diff --git a/.bazelrc b/.bazelrc
index 8687f4406cb9..e34a363a16fc 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -11,6 +11,9 @@ build --compilation_mode opt
 common --override_module=semmle_code=%workspace%/misc/bazel/semmle_code_stub
 
 build --repo_env=CC=clang --repo_env=CXX=clang++
+# The standalone Linux toolchain uses gold, which does not support the
+# LLD-specific -z nostart-stop-gc workaround enabled by rules_swift.
+build:linux --features=-swift.lld_gc_workaround
 # Disable Android SDK auto-detection (we don't use it, and rules_android has Bazel 9 compatibility issues)
 build --repo_env=ANDROID_HOME=
 
diff --git a/.bazelversion b/.bazelversion
index f7ee06693c17..3b74042132a6 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-9.0.0
+9.3.1
diff --git a/.gitattributes b/.gitattributes
index 610342ef78b1..a46131cc4cdf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -75,6 +75,9 @@
 /ruby/extractor/cargo-bazel-lock.json linguist-generated=true
 /ruby/extractor/cargo-bazel-lock.json -merge
 
+# GitHub Agentic Workflows compiled output
+.github/workflows/*.lock.yml linguist-generated=true
+
 # auto-generated files for the C# build
 /csharp/paket.lock linguist-generated=true
 # needs eol=crlf, as `paket` touches this file and saves it as crlf
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 30cb9833a6a4..ba6cb914193f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,16 +4,22 @@ updates:
     directory: "ruby"
     schedule:
       interval: "daily"
+    cooldown:
+      default-days: 7
 
   - package-ecosystem: "cargo"
     directory: "ql"
     schedule:
       interval: "daily"
+    cooldown:
+      default-days: 7
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
+    cooldown:
+      default-days: 7
     ignore:
       - dependency-name: '*'
         update-types: ['version-update:semver-patch', 'version-update:semver-minor']
@@ -22,6 +28,8 @@ updates:
     directory: "go/extractor"
     schedule:
       interval: "daily"
+    cooldown:
+      default-days: 7
     allow:
       - dependency-name: "golang.org/x/mod"
       - dependency-name: "golang.org/x/tools"
@@ -36,6 +44,8 @@ updates:
     directory: "go/ql/test"
     schedule:
       interval: "monthly"
+    cooldown:
+      default-days: 7
     ignore:
       - dependency-name: "*"
     reviewers:
@@ -45,5 +55,7 @@ updates:
     directory: "/"
     schedule:
       interval: weekly
+    cooldown:
+      default-days: 7
     exclude-paths:
       - "misc/bazel/registry/**"
diff --git a/.github/instructions/expected-files.instructions.md b/.github/instructions/expected-files.instructions.md
index b76119d70282..17cf22f93a03 100644
--- a/.github/instructions/expected-files.instructions.md
+++ b/.github/instructions/expected-files.instructions.md
@@ -1,4 +1,4 @@
 ---
 applyTo: "**/*.expected"
 ---
-Ignore these files. These are generated to be correct by running the tests, and should not be edited manually.
+Do not edit these files directly. They are generated by running the tests. If a `.expected` file has a non-empty `testFailures `section it should not be committed - you may want to update the inline expectation comments in the corresponding test source file (e.g. marking expected results as `MISSING` / `SPURIOUS`) then re-run the test.
diff --git a/.github/instructions/ql-files.instructions.md b/.github/instructions/ql-files.instructions.md
deleted file mode 100644
index 4d331807e06e..000000000000
--- a/.github/instructions/ql-files.instructions.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-applyTo: "**/*.ql,**/*.qll"
----
-When reviewing these QL files, do not make any comment on the code itself. You don't understand the QL programming language well enough yet. You can only make comments about the following aspects:
-* comments (lines starting with `//` or block comments enclosed in `/* ... */`): you can suggest improvements to the clarity of comments, or point out spelling mistakes
-* typos in identifiers
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 65f820799716..83dabb7302dd 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -38,6 +38,10 @@ Swift:
   - swift/**/*
   - change-notes/**/*swift*
 
+Unified:
+  - unified/**/*
+  - change-notes/**/*unified*
+
 Actions:
   - actions/**/*
   - change-notes/**/*actions*
diff --git a/.github/skills/bazel/SKILL.md b/.github/skills/bazel/SKILL.md
new file mode 100644
index 000000000000..af5d1ab82359
--- /dev/null
+++ b/.github/skills/bazel/SKILL.md
@@ -0,0 +1,174 @@
+---
+name: bazel
+description: Conventions for editing Bazel files in the github/codeql repository: the shared `misc/bazel` helpers, `codeql_platform_select` and the `{CODEQL_PLATFORM}` packaging placeholder, adding `MODULE.bazel` dependencies, and the `semmle_code` stub that keeps the standalone build working. Use when editing any `BUILD.bazel`, `*.bzl`, `MODULE.bazel` or `.bazelrc` here, and before validating such an edit.
+---
+
+# Bazel in the codeql repository
+
+A bzlmod module named `ql`, repo name `@codeql` ([`MODULE.bazel`](../../../MODULE.bazel)). It builds standalone, and is
+also consumed by an internal module; standalone builds replace that module with a stub.
+
+## Traps
+
+Things that will waste your time or produce a wrong edit here. Read this section even if you skip the rest.
+
+* **`//...` does not work.** `bazel build //...`, and even `bazel query //...`, fail at the repo root: the patched
+  modules under [`misc/bazel/registry`](../../../misc/bazel/registry) are real packages referencing repos that are not
+  visible from the main repo, and [`.bazelrc`](../../../.bazelrc) notes separately that transitions break `...` builds.
+  The error names a registry directory unrelated to your edit, so it is easy to misdiagnose. **Validate the specific
+  target or package you changed**, not a recursive pattern.
+* **There is no `MODULE.bazel.lock`, deliberately.** [`.bazelrc`](../../../.bazelrc) sets `--lockfile_mode=off` because
+  the workspace-relative module override makes a lockfile unstable. Do not add one, and do not "fix" its absence.
+* **`linux_arm64` vs `linux-arm64`.** The keyword argument and config setting use an underscore; the platform *string*
+  substituted into paths and zip names uses a hyphen. They are not interchangeable.
+* **Do not stub your way out of a missing internal dependency.** See [Building standalone](#building-standalone) for the
+  one narrow case where extending the stub is correct.
+
+## Conventions
+
+* **Copy a neighboring target rather than inventing a shape.** Packaging is not uniform: some packages use the
+  `codeql_*` wrappers, others still use `pkg_files` directly. Copy the closest *working* neighbor, and prefer the
+  wrapper for new code.
+* **Pin anything fetched over the network** with `sha256` or `integrity`. Bazel only *warns* on an unpinned download, so
+  nothing fails loudly, but the build stops being reproducible and a retagged upstream release silently changes what you
+  build. `lfs_archive` is the exception: content is pinned by git object.
+* **Format with `bazel run //misc/bazel/buildifier`.** It rewrites in place, so do not hand-tune formatting. Also wired
+  as a `pre-commit` hook ([`.pre-commit-config.yaml`](../../../.pre-commit-config.yaml)).
+
+## Where new code goes
+
+Bazel's own macro / rule / repository-rule distinction applies as usual. What is repo-specific:
+
+| Adding | Goes in |
+| --- | --- |
+| a new packaging shape | extend [`misc/bazel/pkg.bzl`](../../../misc/bazel/pkg.bzl), do not fork `pkg_files` |
+| a new OS or arch split | [`misc/bazel/os.bzl`](../../../misc/bazel/os.bzl), do not hand-roll a `select()` over `@platforms//` |
+| a fetch of something external | a repository rule ([`lfs.bzl`](../../../misc/bazel/lfs.bzl), [`ripunzip.bzl`](../../../misc/ripunzip/ripunzip.bzl)), not a `genrule` |
+| a wrapper used by one language | next to that language ([`swift/rules.bzl`](../../../swift/rules.bzl)) |
+| a wrapper used across languages | `misc/bazel/` |
+
+Prefer inline rules in `BUILD.bazel`. A `.bzl` file earns its `load()` only when the shape repeats across packages or a
+value must be computed: [`rust.bzl`](../../../misc/bazel/rust.bzl) is worth it because every Rust binary that ships in a
+pack must get the same universal-binary wrapper and symbols test, and forgetting either is a release bug. A local
+debugging aid opts out and declares a plain `rust_binary`; see `swift-syntax-parse` in
+[`unified/swift-syntax-rs/BUILD.bazel`](../../../unified/swift-syntax-rs/BUILD.bazel). The `_gen_binaries` list in
+[`go/BUILD.bazel`](../../../go/BUILD.bazel) does not earn a `.bzl`, because it is shared within a single file, where a
+local variable does the job.
+
+Macros here are typically a thin public wrapper around a private rule (`codeql_csharp_binary`, `swift_cc_binary`). Keep
+the rule narrow and the ergonomics in the macro. Each macro decorates the caller's `name` to mint its helper targets,
+for example `internal/<name>` or `single_arch/<name>`. Their visibility is that macro's choice (private, package
+default, or the caller's own), so read the macro instead of assuming. When an error names a target you cannot find in
+any source file, a macro minted it: grep the suffix under `misc/bazel/`.
+
+## Shared helpers
+
+Frequently-used pieces, so you load the existing one instead of rewriting it. Read the file for its actual exports.
+
+| `load()` path | Covers |
+| --- | --- |
+| `//misc/bazel:pkg.bzl` | CodeQL packs and packaging |
+| `//misc/bazel:os.bzl` | platform and architecture selection |
+| `//misc/bazel:lfs.bzl` | on-demand git-LFS repositories |
+| `//misc/bazel:rust.bzl` | Rust binary wrapper |
+| `//misc/bazel:csharp.bzl` | C# binary/library/test wrappers |
+| `//misc/bazel:utils.bzl` | `select_os`; prefer `os.bzl`'s `os_select` in new code |
+
+[`defs.bzl`](../../../defs.bzl) at the root exports `codeql_platform` for *dependent* modules. It is not the way to get
+the platform string here; use `os.bzl`.
+
+## Platform selection
+
+[`codeql_platform_select`](../../../misc/bazel/os.bzl) takes one keyword argument per CodeQL platform: `linux64`,
+`linux_arm64`, `osx64` and `win64`. `otherwise` supplies the value for whichever of those you leave unset; it is **not**
+a `//conditions:default`. If you only care about the OS, use `os_select`, which gives Linux the same value on both
+architectures and has a `posix` shorthand for the shared Linux/macOS value.
+
+In a macro (no `ctx`) it returns a `select()`:
+
+```python
+load("//misc/bazel:os.bzl", "codeql_platform_select")
+load("//misc/bazel:pkg.bzl", "codeql_pkg_files")
+
+codeql_pkg_files(
+    name = "extractor-arch",
+    exes = codeql_platform_select(
+        otherwise = ["//unified/extractor"],
+        win64 = ["//unified/extractor-unsupported-os:extractor"],
+    ),
+    prefix = "tools/{CODEQL_PLATFORM}",
+)
+```
+
+If implementation code needs to *branch* on the value rather than pass it through, pass `ctx` and add
+`OS_DETECTION_ATTRS` to the rule's attributes. The value is then resolved eagerly instead of being an opaque `select()`:
+
+```python
+load("//misc/bazel:os.bzl", "OS_DETECTION_ATTRS", "os_select")
+
+def _impl(ctx):
+    ext = os_select(ctx, windows = ".exe", posix = "")
+    ...
+
+my_rule = rule(
+    implementation = _impl,
+    attrs = {"src": attr.label()} | OS_DETECTION_ATTRS,
+)
+```
+
+## Packs
+
+`codeql_pack` assembles the files that become an extractor pack. See [`unified/BUILD.bazel`](../../../unified/BUILD.bazel)
+for a minimal complete example and [`pkg.bzl`](../../../misc/bazel/pkg.bzl) for the arguments. The non-obvious parts:
+
+* **`{CODEQL_PLATFORM}` in a destination path is the routing mechanism**, not just a substitution. A path containing it
+  is *arch-specific* and lands in the per-architecture zip; every other path is *common*. So `prefix =
+  "tools/{CODEQL_PLATFORM}"` both places the file and marks it arch-specific. `arch_overrides` forces named
+  destinations into the arch-specific part without a placeholder.
+* **`codeql_pkg_files` splits `srcs` (plain) from `exes` (mode 755)** and **rejects `attributes =`** with an explicit
+  error. Use `exes` rather than hand-rolling `pkg_attributes(mode = "755")`.
+* **`pkg_dirs` and `pkg_symlinks` are unsupported** and fail at analysis time.
+* `codeql_pack` also generates an installer and an `install` alias, hence `bazel run //unified:install`. Pass
+  `installer_alias = None` if one package defines several packs.
+* `codeql_pack_group` exists for bundling packs into distribution zips, but nothing in this repo instantiates it.
+
+## Adding a dependency
+
+In order of preference:
+
+1. **A [Bazel Central Registry](https://registry.bazel.build/) module.** Add a `bazel_dep` in
+   [`MODULE.bazel`](../../../MODULE.bazel).
+2. **A patched upstream module.** Add it under [`misc/bazel/registry`](../../../misc/bazel/registry), which `.bazelrc`
+   puts ahead of the BCR. Put patches in `modules/<repo>/<version>/patches`, rename the version with a `-codeql.N`
+   suffix, and run [`fix.py`](../../../misc/bazel/registry/fix.py) to realign the metadata.
+3. **A raw archive.** Use `http_archive` via `use_repo_rule`, or a repository rule. Copy an adjacent declaration and
+   keep its checksum field populated.
+
+Vendored Rust crates under [`misc/bazel/3rdparty`](../../../misc/bazel/3rdparty) are generated. Regenerate with
+[`update_cargo_deps.sh`](../../../misc/bazel/3rdparty/update_cargo_deps.sh) rather than editing, and keep the
+`use_repo` lists in sync, which `bazel mod tidy` does for module extensions.
+
+## Building standalone
+
+[`MODULE.bazel`](../../../MODULE.bazel) declares `semmle_code` with a `local_path_override` pointing at `..`, which
+resolves when this repo is checked out inside the internal module. [`.bazelrc`](../../../.bazelrc), which Bazel reads
+when invoked in *this* workspace, overrides that with a stub. This line is the whole reason a standalone build resolves:
+
+```
+common --override_module=semmle_code=%workspace%/misc/bazel/semmle_code_stub
+```
+
+Do not change either the override path or the `local_path_override`; they work as a pair.
+
+[`misc/bazel/semmle_code_stub`](../../../misc/bazel/semmle_code_stub) is an otherwise empty module supplying no-op
+versions of the internal helpers that shared `.bzl` files load *unconditionally*. That is its only job, and it is small
+enough to read.
+
+**Extend the stub only when a `.bzl` file every standalone target loads gains a new internal `load()`**, which breaks
+package loading outright, for everyone. Prefer not needing one. **Never add a stub so that an internal-only target
+appears to build**: some targets depend on internal libraries (`grep -rl @semmle_code --include=*.bazel` finds them) and
+are correctly unbuildable here. Unlike a `load()`, such a dependency only fails when that target is actually requested.
+
+[`.bazelrc.internal`](../../../.bazelrc.internal) is **not** read here; it carries settings for the internal build. A
+setting needed by both has to be written in both files, with paths differing because this repo sits at a different depth
+there.
diff --git a/.github/workflows/check-change-note.yml b/.github/workflows/check-change-note.yml
index 70b78ce72944..d29bd00486be 100644
--- a/.github/workflows/check-change-note.yml
+++ b/.github/workflows/check-change-note.yml
@@ -1,10 +1,11 @@
 name: Check change note
 
 permissions:
+  contents: read
   pull-requests: read
 
 on:
-  pull_request_target:
+  pull_request:
     types: [labeled, unlabeled, opened, synchronize, reopened, ready_for_review]
     paths:
       - "*/ql/src/**/*.ql"
@@ -23,7 +24,7 @@ jobs:
     env:
       REPO: ${{ github.repository }}
       PULL_REQUEST_NUMBER: ${{ github.event.number }}
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_TOKEN: ${{ github.token }}
     runs-on: ubuntu-latest
     steps:
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 64b46b00a228..99028b8011cb 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 10.0.100
+        dotnet-version: 10.0.201
 
     - name: Checkout repository
       uses: actions/checkout@v5
diff --git a/.github/workflows/csharp-qltest.yml b/.github/workflows/csharp-qltest.yml
index fc8bc218fe76..38ba6b9afacf 100644
--- a/.github/workflows/csharp-qltest.yml
+++ b/.github/workflows/csharp-qltest.yml
@@ -5,6 +5,10 @@ on:
     paths:
       - "csharp/**"
       - "shared/**"
+      - "!shared/tree-sitter-extractor/**"
+      - "!shared/yeast/**"
+      - "!shared/yeast-macros/**"
+      - "!shared/yeast-schema/**"
       - "misc/bazel/**"
       - .github/actions/fetch-codeql/action.yml
       - codeql-workspace.yml
@@ -16,6 +20,10 @@ on:
     paths:
       - "csharp/**"
       - "shared/**"
+      - "!shared/tree-sitter-extractor/**"
+      - "!shared/yeast/**"
+      - "!shared/yeast-macros/**"
+      - "!shared/yeast-schema/**"
       - "misc/bazel/**"
       - .github/workflows/csharp-qltest.yml
       - .github/actions/fetch-codeql/action.yml
@@ -43,14 +51,14 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 10.0.100
+          dotnet-version: 10.0.201
       - name: Extractor unit tests
         run: |
           dotnet tool restore
-          dotnet test -p:RuntimeFrameworkVersion=10.0.0 extractor/Semmle.Util.Tests
-          dotnet test -p:RuntimeFrameworkVersion=10.0.0 extractor/Semmle.Extraction.Tests
-          dotnet test -p:RuntimeFrameworkVersion=10.0.0 autobuilder/Semmle.Autobuild.CSharp.Tests
-          dotnet test -p:RuntimeFrameworkVersion=10.0.0 autobuilder/Semmle.Autobuild.Cpp.Tests
+          dotnet test -p:RuntimeFrameworkVersion=10.0.5 extractor/Semmle.Util.Tests
+          dotnet test -p:RuntimeFrameworkVersion=10.0.5 extractor/Semmle.Extraction.Tests
+          dotnet test -p:RuntimeFrameworkVersion=10.0.5 autobuilder/Semmle.Autobuild.CSharp.Tests
+          dotnet test -p:RuntimeFrameworkVersion=10.0.5 autobuilder/Semmle.Autobuild.Cpp.Tests
         shell: bash
   stubgentest:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/csv-coverage-pr-artifacts.yml b/.github/workflows/csv-coverage-pr-artifacts.yml
index c62de00535e2..e27ccc7312cb 100644
--- a/.github/workflows/csv-coverage-pr-artifacts.yml
+++ b/.github/workflows/csv-coverage-pr-artifacts.yml
@@ -47,10 +47,10 @@ jobs:
           git checkout HEAD^1
           git log -1 --format='%H'
         working-directory: base
-      - name: Set up Python 3.8
+      - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: "3.12"
       - name: Download CodeQL CLI
         uses: ./merge/.github/actions/fetch-codeql
       - name: Generate CSV files on merge commit of the PR
diff --git a/.github/workflows/csv-coverage-pr-comment.yml b/.github/workflows/csv-coverage-pr-comment.yml
index 534725815b4b..ba07ccd5fc4c 100644
--- a/.github/workflows/csv-coverage-pr-comment.yml
+++ b/.github/workflows/csv-coverage-pr-comment.yml
@@ -25,10 +25,10 @@ jobs:
       run: echo "$GITHUB_CONTEXT"
     - name: Clone self (github/codeql)
       uses: actions/checkout@v5
-    - name: Set up Python 3.8
+    - name: Set up Python 3.12
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: "3.12"
 
     - name: Check coverage difference file and comment
       env:
diff --git a/.github/workflows/csv-coverage-timeseries.yml b/.github/workflows/csv-coverage-timeseries.yml
index 11bc06bee602..1433aaa41758 100644
--- a/.github/workflows/csv-coverage-timeseries.yml
+++ b/.github/workflows/csv-coverage-timeseries.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           path: codeqlModels
           fetch-depth: 0
-      - name: Set up Python 3.8
+      - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: "3.12"
       - name: Download CodeQL CLI
         uses: ./script/.github/actions/fetch-codeql
       - name: Build modeled package list
diff --git a/.github/workflows/csv-coverage-update.yml b/.github/workflows/csv-coverage-update.yml
index 9f7a0b778dab..3bab9977ccd3 100644
--- a/.github/workflows/csv-coverage-update.yml
+++ b/.github/workflows/csv-coverage-update.yml
@@ -25,10 +25,10 @@ jobs:
         with:
           path: ql
           fetch-depth: 0
-      - name: Set up Python 3.8
+      - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: "3.12"
       - name: Download CodeQL CLI
         uses: ./ql/.github/actions/fetch-codeql
       - name: Generate coverage files
diff --git a/.github/workflows/csv-coverage.yml b/.github/workflows/csv-coverage.yml
index a1224456410a..9a51710a7115 100644
--- a/.github/workflows/csv-coverage.yml
+++ b/.github/workflows/csv-coverage.yml
@@ -24,10 +24,10 @@ jobs:
         with:
           path: codeqlModels
           ref: ${{ github.event.inputs.qlModelShaOverride || github.ref }}
-      - name: Set up Python 3.8
+      - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: "3.12"
       - name: Download CodeQL CLI
         uses: ./script/.github/actions/fetch-codeql
       - name: Build modeled package list
diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml
index 6578f09b8dfc..5a3bc9342855 100644
--- a/.github/workflows/go-tests.yml
+++ b/.github/workflows/go-tests.yml
@@ -5,6 +5,10 @@ on:
       - "go/**"
       - "!go/documentation/**"
       - "shared/**"
+      - "!shared/tree-sitter-extractor/**"
+      - "!shared/yeast/**"
+      - "!shared/yeast-macros/**"
+      - "!shared/yeast-schema/**"
       - .github/workflows/go-tests.yml
       - .github/actions/**
       - codeql-workspace.yml
diff --git a/.github/workflows/label-external-contributions.yml b/.github/workflows/label-external-contributions.yml
new file mode 100644
index 000000000000..81ed030b94fc
--- /dev/null
+++ b/.github/workflows/label-external-contributions.yml
@@ -0,0 +1,122 @@
+name: Label external contributions
+
+on:
+  schedule:
+    - cron: "7,22,37,52 * * * *"
+  workflow_dispatch:
+
+permissions: {}
+
+concurrency:
+  group: label-external-contributions
+  cancel-in-progress: false
+
+jobs:
+  label:
+    if: >-
+      github.repository == 'github/codeql' &&
+      github.ref_name == github.event.repository.default_branch
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    permissions:
+      pull-requests: write
+
+    steps:
+      - name: Create organization membership token
+        id: membership-token
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        with:
+          client-id: ${{ vars.CODEQL_ORG_MEMBERS_APP_CLIENT_ID }}
+          private-key: ${{ secrets.CODEQL_ORG_MEMBERS_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          permission-members: read
+
+      - name: Label external contributions
+        env:
+          API_URL: ${{ github.api_url }}
+          GH_TOKEN: ${{ github.token }}
+          MEMBERS_TOKEN: ${{ steps.membership-token.outputs.token }}
+          ORG: ${{ github.repository_owner }}
+          REPO: ${{ github.repository }}
+        run: |
+          set -euo pipefail
+
+          label="external-contribution"
+          updated_cutoff=$(date -u -d "1 hour ago" "+%Y-%m-%dT%H:%M:%SZ")
+
+          while IFS= read -r pr_number; do
+            if [[ ! "$pr_number" =~ ^[1-9][0-9]*$ ]]; then
+              echo "Skipping malformed pull request number."
+              continue
+            fi
+
+            pr_json=$(gh api "repos/$REPO/pulls/$pr_number")
+            if ! jq -e \
+              --arg repo "$REPO" \
+              --arg label "$label" \
+              '.state == "open" and
+               .draft == false and
+               .base.repo.full_name == $repo and
+               (.head.repo.full_name | type == "string") and
+               .head.repo.full_name != $repo and
+               .user.type == "User" and
+               (.user.login | type == "string" and length > 0) and
+               (any(.labels[]?; .name == $label) | not)' \
+              >/dev/null <<<"$pr_json"; then
+              continue
+            fi
+
+            author=$(jq -r '.user.login' <<<"$pr_json")
+            events=$(gh api --paginate \
+              "repos/$REPO/issues/$pr_number/events?per_page=100" |
+              jq -cs 'add')
+
+            if jq -e --arg label "$label" \
+              'any(.[]; .event == "labeled" and .label.name == $label)' \
+              >/dev/null <<<"$events"; then
+              continue
+            fi
+
+            if ! membership_status=$(curl \
+              --silent \
+              --show-error \
+              --output /dev/null \
+              --write-out '%{http_code}' \
+              --connect-timeout 10 \
+              --max-time 30 \
+              --header "Accept: application/vnd.github+json" \
+              --header "Authorization: Bearer $MEMBERS_TOKEN" \
+              --header "X-GitHub-Api-Version: 2022-11-28" \
+              "$API_URL/orgs/$ORG/members/$author"); then
+              echo "::error::Membership check failed for pull request #$pr_number."
+              exit 1
+            fi
+
+            case "$membership_status" in
+              204)
+                echo "Pull request #$pr_number was opened by an organization member; skipping."
+                continue
+                ;;
+              404)
+                ;;
+              *)
+                echo "::error::Membership check for pull request #$pr_number returned HTTP $membership_status."
+                exit 1
+                ;;
+            esac
+
+            jq -n --arg label "$label" '{labels: [$label]}' |
+              gh api --method POST \
+                "repos/$REPO/issues/$pr_number/labels" \
+                --input - \
+                >/dev/null
+            echo "Labelled pull request #$pr_number."
+          done < <(
+            gh api --method GET --paginate "repos/$REPO/issues" \
+              -f state=open \
+              -f since="$updated_cutoff" \
+              -f sort=updated \
+              -f direction=desc \
+              -f per_page=100 |
+              jq -r '.[] | select(.pull_request != null) | .number'
+          )
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 512fa40d2e3a..e3f464331790 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -1,15 +1,144 @@
 name: "Pull Request Labeler"
+
 on:
-- pull_request_target
+  schedule:
+    # Reconcile recently updated PRs promptly, including unapproved forks and
+    # conflicted PRs for which pull_request workflows do not run.
+    - cron: "7,22,37,52 * * * *"
+    # Reconcile one stable shard of all open PRs each hour to recover from
+    # delayed or missed scheduled runs.
+    - cron: "12 * * * *"
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: "Open pull request number to reconcile"
+        required: true
+        type: string
+
+permissions: {}
 
-permissions:
-  contents: read
-  pull-requests: write
+concurrency:
+  group: pull-request-labeler
+  cancel-in-progress: false
 
 jobs:
   triage:
+    if: github.ref_name == github.event.repository.default_branch
     runs-on: ubuntu-latest
+    timeout-minutes: 30
+    permissions:
+      contents: read
+      pull-requests: write
     steps:
-    - uses: actions/labeler@v4
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
+          sparse-checkout: .github/labeler.yml
+          sparse-checkout-cone-mode: false
+
+      - name: Collect pull requests to reconcile
+        id: collect
+        env:
+          GH_TOKEN: ${{ github.token }}
+          REPO: ${{ github.repository }}
+          EVENT_NAME: ${{ github.event_name }}
+          SCHEDULE: ${{ github.event.schedule }}
+          REQUESTED_PR: ${{ inputs.pr_number }}
+        run: |
+          set -euo pipefail
+
+          if [ "$EVENT_NAME" = "workflow_dispatch" ]; then
+            if [[ ! "$REQUESTED_PR" =~ ^[1-9][0-9]*$ ]]; then
+              echo "Invalid pull request number: $REQUESTED_PR"
+              exit 1
+            fi
+
+            pr_json=$(gh api "repos/$REPO/pulls/$REQUESTED_PR")
+            candidates=$(jq -c '[{
+              number: .number,
+              head_sha: .head.sha
+            }]' <<<"$pr_json")
+          else
+            pulls_json=$(gh api --paginate \
+              "repos/$REPO/pulls?state=open&sort=updated&direction=desc&per_page=100" |
+              jq -cs 'add')
+
+            if [ "$SCHEDULE" = "12 * * * *" ]; then
+              shard=$(( ($(date -u +%s) / 3600) % 6 ))
+              candidates=$(jq -c --argjson shard "$shard" \
+                '[.[] | select((.number % 6) == $shard) | {
+                  number: .number,
+                  head_sha: .head.sha
+                }]' <<<"$pulls_json")
+            else
+              cutoff=$(date -u -d "1 hour ago" "+%Y-%m-%dT%H:%M:%SZ")
+              # Hourly shards reconcile any candidates beyond this API budget.
+              candidates=$(jq -c --arg cutoff "$cutoff" \
+                '[.[] | select(.updated_at >= $cutoff) | {
+                  number: .number,
+                  head_sha: .head.sha
+                }][0:100]' <<<"$pulls_json")
+            fi
+          fi
+
+          echo "Collected $(jq 'length' <<<"$candidates") pull request(s)."
+          {
+            echo "candidates<<EOF"
+            echo "$candidates"
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Validate pull request state
+        id: validate
+        env:
+          GH_TOKEN: ${{ github.token }}
+          REPO: ${{ github.repository }}
+          CANDIDATES: ${{ steps.collect.outputs.candidates }}
+        run: |
+          set -euo pipefail
+
+          valid_numbers=()
+          while IFS=$'\t' read -r pr_number expected_sha; do
+            if [[ ! "$pr_number" =~ ^[1-9][0-9]*$ ]] ||
+              [[ ! "$expected_sha" =~ ^[0-9a-f]{40}$ ]]; then
+              echo "Skipping malformed pull request candidate."
+              continue
+            fi
+
+            if ! pr_json=$(gh api "repos/$REPO/pulls/$pr_number"); then
+              echo "Pull request #$pr_number could not be fetched; skipping."
+              continue
+            fi
+
+            if ! jq -e \
+              --arg repo "$REPO" \
+              --arg sha "$expected_sha" \
+              '.state == "open" and
+               .base.repo.full_name == $repo and
+               .head.sha == $sha and
+               (.head.repo.full_name | type == "string")' \
+              >/dev/null <<<"$pr_json"; then
+              echo "Pull request #$pr_number changed or is no longer open; skipping."
+              continue
+            fi
+
+            valid_numbers+=("$pr_number")
+          done < <(jq -r '.[] | [.number, .head_sha] | @tsv' <<<"$CANDIDATES")
+
+          if [ "${#valid_numbers[@]}" -eq 0 ]; then
+            echo "has_prs=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          {
+            echo "has_prs=true"
+            echo "pr_numbers<<EOF"
+            printf '%s\n' "${valid_numbers[@]}"
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+      - uses: actions/labeler@v4
+        if: steps.validate.outputs.has_prs == 'true'
+        with:
+          repo-token: "${{ github.token }}"
+          pr-number: ${{ steps.validate.outputs.pr_numbers }}
diff --git a/.github/workflows/ql-for-ql-build.yml b/.github/workflows/ql-for-ql-build.yml
index e05a7c39c4b8..4885b614fb56 100644
--- a/.github/workflows/ql-for-ql-build.yml
+++ b/.github/workflows/ql-for-ql-build.yml
@@ -24,9 +24,8 @@ jobs:
           fetch-depth: 0
       - name: Find codeql
         id: find-codeql
-        uses: github/codeql-action/init@main
+        uses: github/codeql-action/setup-codeql@main
         with:
-          languages: javascript # does not matter
           tools: nightly
       - uses: ./.github/actions/os-version
         id: os_version
@@ -61,7 +60,7 @@ jobs:
       - name: Make database and analyze
         run: |
           ./ql/target/release/buramu | tee deprecated.blame # Add a blame file for the extractor to parse.
-          ${CODEQL} database create -l=ql ${DB} --search-path "${{ github.workspace }}"
+          ${CODEQL} database create --threads=0 -l=ql ${DB} --search-path "${{ github.workspace }}"
           ${CODEQL} database analyze -j0 --format=sarif-latest --output=ql-for-ql.sarif ${DB} ql/ql/src/codeql-suites/ql-code-scanning.qls  --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
         env:
           CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
diff --git a/.github/workflows/ql-for-ql-dataset_measure.yml b/.github/workflows/ql-for-ql-dataset_measure.yml
index b4561c04a965..21c27b9efb79 100644
--- a/.github/workflows/ql-for-ql-dataset_measure.yml
+++ b/.github/workflows/ql-for-ql-dataset_measure.yml
@@ -17,8 +17,6 @@ permissions:
 
 jobs:
   measure:
-    env:
-      CODEQL_THREADS: 4 # TODO: remove this once it's set by the CLI
     strategy:
       matrix:
         repo:
@@ -29,9 +27,7 @@ jobs:
 
       - name: Find codeql
         id: find-codeql
-        uses: github/codeql-action/init@main
-        with:
-          languages: javascript # does not matter
+        uses: github/codeql-action/setup-codeql@main
       - uses: ./.github/actions/os-version
         id: os_version
       - uses: actions/cache@v3
diff --git a/.github/workflows/ql-for-ql-tests.yml b/.github/workflows/ql-for-ql-tests.yml
index e21860519041..0454fe043fd3 100644
--- a/.github/workflows/ql-for-ql-tests.yml
+++ b/.github/workflows/ql-for-ql-tests.yml
@@ -27,9 +27,8 @@ jobs:
       - uses: actions/checkout@v5
       - name: Find codeql
         id: find-codeql
-        uses: github/codeql-action/init@main
+        uses: github/codeql-action/setup-codeql@main
         with:
-          languages: javascript # does not matter
           tools: nightly
       - uses: ./.github/actions/os-version
         id: os_version
@@ -54,7 +53,7 @@ jobs:
           key: ql-for-ql-tests
       - name: Run QL tests
         run: |
-          "${CODEQL}" test run --check-databases --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --search-path "${{ github.workspace }}" --consistency-queries ql/ql/consistency-queries --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" ql/ql/test
+          "${CODEQL}" test run --threads=0 --check-databases --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --search-path "${{ github.workspace }}" --consistency-queries ql/ql/consistency-queries --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" ql/ql/test
         env:
           CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
 
@@ -73,9 +72,8 @@ jobs:
           echo "/usr/local/opt/gnu-tar/libexec/gnubin" >> $GITHUB_PATH
       - name: Find codeql
         id: find-codeql
-        uses: github/codeql-action/init@main
+        uses: github/codeql-action/setup-codeql@main
         with:
-          languages: javascript # does not matter
           tools: nightly
       - uses: ./.github/actions/os-version
         id: os_version
@@ -102,7 +100,7 @@ jobs:
       - name: Run a single QL tests - Unix
         if: runner.os != 'Windows'
         run: |
-          "${CODEQL}" test run --check-databases --search-path "${{ github.workspace }}" ql/ql/test/queries/style/DeadCode/DeadCode.qlref
+          "${CODEQL}" test run --threads=0 --check-databases --search-path "${{ github.workspace }}" ql/ql/test/queries/style/DeadCode/DeadCode.qlref
         env:
           CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
       - name: Run a single QL tests - Windows
@@ -110,4 +108,4 @@ jobs:
         shell: pwsh
         run: |
           $Env:PATH += ";$(dirname ${{ steps.find-codeql.outputs.codeql-path }})"
-          codeql test run --check-databases --search-path "${{ github.workspace }}" ql/ql/test/queries/style/DeadCode/DeadCode.qlref
+          codeql test run --threads=0 --check-databases --search-path "${{ github.workspace }}" ql/ql/test/queries/style/DeadCode/DeadCode.qlref
diff --git a/.github/workflows/query-list.yml b/.github/workflows/query-list.yml
index 8c736379f8a6..53857b5ae12c 100644
--- a/.github/workflows/query-list.yml
+++ b/.github/workflows/query-list.yml
@@ -26,10 +26,10 @@ jobs:
       uses: actions/checkout@v5
       with:
         path: codeql 
-    - name: Set up Python 3.8
+    - name: Set up Python 3.12
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: "3.12"
     - name: Download CodeQL CLI
       # Look under the `codeql` directory, as this is where we checked out the `github/codeql` repo
       uses: ./codeql/.github/actions/fetch-codeql
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 34f5efb74ba6..6782733f7d2d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -7,6 +7,9 @@ on:
       - "misc/bazel/**"
       - "misc/codegen/**"
       - "shared/**"
+      - "!shared/yeast/**"
+      - "!shared/yeast-macros/**"
+      - "!shared/yeast-schema/**"
       - "MODULE.bazel"
       - .github/workflows/rust.yml
       - .github/actions/**
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index 4a5613f988e5..968015606401 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -7,6 +7,10 @@ on:
       - "misc/bazel/**"
       - "misc/codegen/**"
       - "shared/**"
+      - "!shared/tree-sitter-extractor/**"
+      - "!shared/yeast/**"
+      - "!shared/yeast-macros/**"
+      - "!shared/yeast-schema/**"
       - "*.bazel*"
       - .github/workflows/swift.yml
       - .github/actions/**
@@ -54,6 +58,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
       - uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
         name: Check that python code is properly formatted
         with:
diff --git a/.github/workflows/update-rust-analyzer.lock.yml b/.github/workflows/update-rust-analyzer.lock.yml
new file mode 100644
index 000000000000..6a403c04f04c
--- /dev/null
+++ b/.github/workflows/update-rust-analyzer.lock.yml
@@ -0,0 +1,1824 @@
+# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"89825e14c90fc1af478d2ac55eb66b5a0df973d37da033c508e957ec5cea2543","body_hash":"ba6be270b77cdf21fed3489d4d8178200f5de7cfbab7ab7c273de57ad45f2383","compiler_version":"v0.88.7","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.80"}}
+# gh-aw-manifest: {"version":1,"secrets":["GH_AW_CI_TRIGGER_TOKEN","GH_AW_DEFAULT_OTLP_HEADERS","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/cache/restore","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/cache/save","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/checkout","sha":"3d3c42e5aac5ba805825da76410c181273ba90b1","version":"v7.0.1"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"820762786026740c76f36085b0efc47a31fe5020","version":"v7.0.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"5e508589e03a7757a7e05b26e834292f5445bfb6","version":"v0.88.7"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.28.14","digest":"sha256:f7df036c86575527b61f3f7df91c4412349a12b2a74988d929eafa2999230c98","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.28.14@sha256:f7df036c86575527b61f3f7df91c4412349a12b2a74988d929eafa2999230c98"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.28.14","digest":"sha256:6f95e2234dd9bd6333a8ff28ccea7ecf0204acd4a09108723844dbd2bf6268c5","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.28.14@sha256:6f95e2234dd9bd6333a8ff28ccea7ecf0204acd4a09108723844dbd2bf6268c5"},{"image":"ghcr.io/github/gh-aw-firewall/cli-proxy:0.28.14","digest":"sha256:3a379c5e96e29499c815e9dd2a71334d01c326a9b73991c76544fda9cae35c34","pinned_image":"ghcr.io/github/gh-aw-firewall/cli-proxy:0.28.14@sha256:3a379c5e96e29499c815e9dd2a71334d01c326a9b73991c76544fda9cae35c34"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.28.14","digest":"sha256:2ce8df3abf3e9b76e9c0cf5863da41f1ab3f89b20ad14b988806ab89e7bf2cd5","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.28.14@sha256:2ce8df3abf3e9b76e9c0cf5863da41f1ab3f89b20ad14b988806ab89e7bf2cd5"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.4.18","digest":"sha256:85b940556a8faa4e1fdbef124bfd75f2c4ebd855a10b88a1c3b6f3e97f6f1a53","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.4.18@sha256:85b940556a8faa4e1fdbef124bfd75f2c4ebd855a10b88a1c3b6f3e97f6f1a53"},{"image":"ghcr.io/github/gh-aw-node","digest":"sha256:0daa8971fa4732b647150cb6524a6b0804b68d5d24f6f58b5dd1af23bd63fb23","pinned_image":"ghcr.io/github/gh-aw-node@sha256:0daa8971fa4732b647150cb6524a6b0804b68d5d24f6f58b5dd1af23bd63fb23"},{"image":"ghcr.io/github/github-mcp-server:v1.11.0","digest":"sha256:fbec75de11c255213fa08d80fb166abe73d851fff631c51c0079872967720699","pinned_image":"ghcr.io/github/github-mcp-server:v1.11.0@sha256:fbec75de11c255213fa08d80fb166abe73d851fff631c51c0079872967720699"}],"mcp_servers":[{"name":"safeoutputs","tools":["create_pull_request","missing_data","missing_tool","noop"]}]}
+# This file was automatically generated by gh-aw (v0.88.7). DO NOT EDIT. To debug this workflow, load the skill at https://github.com/github/gh-aw/blob/main/debug.md
+#
+#    ___                   _   _
+#   / _ \                 | | (_)
+#  | |_| | __ _  ___ _ __ | |_ _  ___
+#  |  _  |/ _` |/ _ \ '_ \| __| |/ __|
+#  | | | | (_| |  __/ | | | |_| | (__
+#  \_| |_/\__, |\___|_| |_|\__|_|\___|
+#          __/ |
+#  _    _ |___/
+# | |  | |                / _| |
+# | |  | | ___ _ __ _  __| |_| | _____      ____
+# | |/\| |/ _ \ '__| |/ /|  _| |/ _ \ \ /\ / / ___|
+# \  /\  / (_) | | | | ( | | | | (_) \ V  V /\__ \
+#  \/  \/ \___/|_| |_|\_\|_| |_|\___/ \_/\_/ |___/
+#
+#
+# To update this file, edit the corresponding .md file and run:
+#   gh aw compile
+# Not all edits will cause changes to this file.
+#
+# For more information: https://github.github.com/gh-aw/introduction/overview/
+#
+# Update the rust-analyzer version used by the Rust extractor and prepare a pull request.
+#
+# Intent: Keep the Rust extractor on the latest compatible rust-analyzer version with a reviewable, validated pull request.
+#
+# Secrets used:
+#   - GH_AW_CI_TRIGGER_TOKEN
+#   - GH_AW_DEFAULT_OTLP_HEADERS
+#   - GH_AW_GITHUB_MCP_SERVER_TOKEN
+#   - GH_AW_GITHUB_TOKEN
+#   - GITHUB_TOKEN
+#
+# Custom actions used:
+#   - actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+#   - actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+#   - actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+#   - actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+#   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+#   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 (source v9)
+#   - actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+#   - actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+#   - github/gh-aw-actions/setup@5e508589e03a7757a7e05b26e834292f5445bfb6 # v0.88.7
+#
+# Container images used:
+#   - ghcr.io/github/gh-aw-firewall/agent:0.28.14@sha256:f7df036c86575527b61f3f7df91c4412349a12b2a74988d929eafa2999230c98
+#   - ghcr.io/github/gh-aw-firewall/api-proxy:0.28.14@sha256:6f95e2234dd9bd6333a8ff28ccea7ecf0204acd4a09108723844dbd2bf6268c5
+#   - ghcr.io/github/gh-aw-firewall/cli-proxy:0.28.14@sha256:3a379c5e96e29499c815e9dd2a71334d01c326a9b73991c76544fda9cae35c34
+#   - ghcr.io/github/gh-aw-firewall/squid:0.28.14@sha256:2ce8df3abf3e9b76e9c0cf5863da41f1ab3f89b20ad14b988806ab89e7bf2cd5
+#   - ghcr.io/github/gh-aw-mcpg:v0.4.18@sha256:85b940556a8faa4e1fdbef124bfd75f2c4ebd855a10b88a1c3b6f3e97f6f1a53
+#   - ghcr.io/github/gh-aw-node@sha256:0daa8971fa4732b647150cb6524a6b0804b68d5d24f6f58b5dd1af23bd63fb23
+#   - ghcr.io/github/github-mcp-server:v1.11.0@sha256:fbec75de11c255213fa08d80fb166abe73d851fff631c51c0079872967720699
+
+name: "Update rust-analyzer"
+on:
+  # roles: # Roles processed as role check in pre-activation job
+  # - admin # Roles processed as role check in pre-activation job
+  # - maintainer # Roles processed as role check in pre-activation job
+  # - write # Roles processed as role check in pre-activation job
+  workflow_dispatch:
+    inputs:
+      aw_context:
+        default: ""
+        description: "Agent caller context (used internally by Agentic Workflows)."
+        required: false
+        type: string
+
+permissions: {}
+
+concurrency:
+  cancel-in-progress: false
+  group: update-rust-analyzer
+
+run-name: "Update rust-analyzer"
+
+env:
+  OTEL_EXPORTER_OTLP_ENDPOINT: ${{ vars.GH_AW_DEFAULT_OTLP_ENDPOINT }}
+  OTEL_SERVICE_NAME: gh-aw.update-rust-analyzer
+  OTEL_RESOURCE_ATTRIBUTES: 'gh-aw.workflow.name=Update%20rust-analyzer,gh-aw.repository=${{ github.repository }},gh-aw.run.id=${{ github.run_id }},github.run_id=${{ github.run_id }},gh-aw.engine.id=copilot'
+  OTEL_EXPORTER_OTLP_HEADERS: ${{ secrets.GH_AW_DEFAULT_OTLP_HEADERS }}
+  GH_AW_OTLP_ENDPOINTS: '[{"url":"${{ vars.GH_AW_DEFAULT_OTLP_ENDPOINT }}","headers":"${{ secrets.GH_AW_DEFAULT_OTLP_HEADERS }}"}]'
+  GH_AW_OTLP_IF_MISSING: ignore
+
+jobs:
+  activation:
+    runs-on: ubuntu-slim
+    permissions:
+      actions: read
+      contents: read
+    env:
+      GH_AW_MAX_DAILY_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_MAX_DAILY_AI_CREDITS || '5000' }}
+      GH_AW_RUNTIME_FEATURES: ${{ vars.GH_AW_RUNTIME_FEATURES }}
+    outputs:
+      comment_id: ""
+      comment_repo: ""
+      daily_ai_credits_exceeded: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_ai_credits_exceeded == 'true' }}
+      daily_ai_credits_guardrail_status: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_ai_credits_guardrail_status || '' }}
+      daily_ai_credits_threshold: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_ai_credits_threshold || '' }}
+      daily_ai_credits_total_effective_tokens: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_ai_credits_total_effective_tokens || '' }}
+      engine_id: ${{ steps.generate_aw_info.outputs.engine_id }}
+      lockdown_check_failed: ${{ steps.generate_aw_info.outputs.lockdown_check_failed == 'true' }}
+      model: ${{ steps.generate_aw_info.outputs.model }}
+      oauth_token_check_failed: ${{ steps.check-oauth-tokens.outputs.oauth_token_check_failed == 'true' }}
+      setup-parent-span-id: ${{ steps.setup.outputs.parent-span-id || steps.setup.outputs.span-id }}
+      setup-span-id: ${{ steps.setup.outputs.span-id }}
+      setup-trace-id: ${{ steps.setup.outputs.trace-id }}
+      stale_lock_file_failed: ${{ steps.check-lock-file.outputs.stale_lock_file_failed == 'true' }}
+    steps:
+      - name: Setup Scripts
+        id: setup
+        uses: github/gh-aw-actions/setup@5e508589e03a7757a7e05b26e834292f5445bfb6 # v0.88.7
+        with:
+          destination: ${{ runner.temp }}/gh-aw/actions
+          job-name: ${{ github.job }}
+          safe-output-artifact-client: ${{ env.GH_AW_MAX_DAILY_AI_CREDITS != '' }}
+        env:
+          GH_AW_SETUP_WORKFLOW_NAME: "Update rust-analyzer"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/update-rust-analyzer.lock.yml@${{ github.ref }}
+          GH_AW_INFO_VERSION: "1.0.80"
+          GH_AW_INFO_AWF_VERSION: "v0.28.14"
+          GH_AW_INFO_ENGINE_ID: "copilot"
+      - name: Mask OTLP telemetry headers
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/mask_otlp_headers.sh"
+      - name: Generate agentic run info
+        id: generate_aw_info
+        env:
+          GH_AW_INFO_ENGINE_ID: "copilot"
+          GH_AW_INFO_ENGINE_NAME: "GitHub Copilot CLI"
+          GH_AW_INFO_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || vars.GH_AW_DEFAULT_MODEL_COPILOT || 'auto' }}
+          GH_AW_INFO_VERSION: "1.0.80"
+          GH_AW_INFO_AGENT_VERSION: "1.0.80"
+          GH_AW_INFO_CLI_VERSION: "v0.88.7"
+          GH_AW_INFO_WORKFLOW_NAME: "Update rust-analyzer"
+          GH_AW_INFO_EXPERIMENTAL: "false"
+          GH_AW_INFO_SUPPORTS_TOOLS_ALLOWLIST: "true"
+          GH_AW_INFO_STAGED: "false"
+          GH_AW_INFO_ALLOWED_DOMAINS: '["defaults","github","github-actions","rust","bazel","python"]'
+          GH_AW_INFO_FIREWALL_ENABLED: "true"
+          GH_AW_INFO_AWF_VERSION: "v0.28.14"
+          GH_AW_INFO_AWMG_VERSION: ""
+          GH_AW_INFO_FIREWALL_TYPE: "squid"
+          GH_AW_INFO_AGENT_RUNTIME: ""
+          GH_AW_INFO_FRONTMATTER_EMOJI: "🦀"
+          GH_AW_COMPILED_STRICT: "true"
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'generate_aw_info.cjs'));
+            await main(core, context);
+      - name: Restore daily AIC usage cache
+        id: restore-daily-aic-cache
+        if: ${{ env.GH_AW_MAX_DAILY_AI_CREDITS != '' }}
+        continue-on-error: true
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          key: agentic-workflow-usage-updaterustanalyzer-${{ github.run_id }}
+          restore-keys: agentic-workflow-usage-updaterustanalyzer-
+          path: /tmp/gh-aw/agentic-workflow-usage-cache.jsonl
+      - name: Restore daily AIC usage cache (artifact fallback)
+        id: restore-daily-aic-cache-fallback
+        if: ${{ env.GH_AW_MAX_DAILY_AI_CREDITS != '' }}
+        continue-on-error: true
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_RESTORE_DAILY_AIC_CACHE_HIT: ${{ steps.restore-daily-aic-cache.outputs.cache-hit }}
+          GH_AW_RESTORE_DAILY_AIC_CACHE_MATCHED_KEY: ${{ steps.restore-daily-aic-cache.outputs.cache-matched-key }}
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'restore_aic_usage_cache_fallback.cjs'));
+            await main();
+      - name: Check daily workflow token guardrail
+        id: daily-effective-workflow-guardrail
+        if: ${{ env.GH_AW_MAX_DAILY_AI_CREDITS != '' }}
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_WORKFLOW_NAME: "Update rust-analyzer"
+          GH_AW_WORKFLOW_ID: "update-rust-analyzer"
+          GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          GH_AW_WORKFLOW_DISPATCH_AW_CONTEXT: ${{ github.event.inputs.aw_context || '' }}
+          GH_AW_HAS_SLASH_COMMAND: "false"
+          GH_AW_HAS_LABEL_COMMAND: "false"
+          GH_AW_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_AW_MAX_DAILY_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_MAX_DAILY_AI_CREDITS || '5000' }}
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'check_daily_aic_workflow_guardrail.cjs'));
+            await main();
+      - name: Check for OAuth tokens
+        id: check-oauth-tokens
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/check_oauth_tokens.sh"
+        env:
+          GH_AW_GITHUB_TOKEN: ${{ secrets.GH_AW_GITHUB_TOKEN }}
+          GH_AW_GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN }}
+      - name: Checkout .github and .agents folders
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+          sparse-checkout: |
+            .github
+            .agents
+            .claude
+            .codex
+            .gemini
+            .pi
+          sparse-checkout-cone-mode: true
+          fetch-depth: 1
+      - name: Save agent config folders for base branch restoration
+        env:
+          GH_AW_AGENT_FOLDERS: ".agents .github"
+          GH_AW_AGENT_FILES: "AGENTS.md"
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/save_base_github_folders.sh"
+      - name: Check workflow lock file
+        id: check-lock-file
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_WORKFLOW_FILE: "update-rust-analyzer.lock.yml"
+          GH_AW_CONTEXT_WORKFLOW_REF: "${{ github.workflow_ref }}"
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'check_workflow_timestamp_api.cjs'));
+            await main();
+      - name: Check compile-agentic version
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_COMPILED_VERSION: "v0.88.7"
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'check_version_updates.cjs'));
+            await main();
+      - name: Log runtime features
+        if: ${{ contains(toJSON(vars), '"GH_AW_RUNTIME_FEATURES":') }}
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/log_runtime_features_summary.sh"
+      - name: Create prompt with built-in context
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_ACTIONS_DIR: ${{ runner.temp }}/gh-aw/actions
+          GH_AW_PROMPT: ${{ runner.temp }}/gh-aw/aw-prompts/prompt.txt
+          GH_AW_SAFE_OUTPUTS: ${{ runner.temp }}/gh-aw/safeoutputs/outputs.jsonl
+          GH_AW_PROMPT_CONFIG: "{\"items\":[{\"content_env\":\"GH_AW_PROMPT_CONTENT_0000\"},{\"file\":\"xpia.md\"},{\"file\":\"temp_folder_prompt.md\"},{\"file\":\"markdown.md\"},{\"file\":\"safe_outputs_prompt.md\"},{\"content_env\":\"GH_AW_PROMPT_CONTENT_0001\"},{\"file\":\"safe_outputs_create_pull_request.md\"},{\"content_env\":\"GH_AW_PROMPT_CONTENT_0002\"},{\"file\":\"mcp_cli_tools_with_safeoutputs_prompt.md\"},{\"content_env\":\"GH_AW_PROMPT_CONTENT_0003\"},{\"file\":\"cli_proxy_with_safeoutputs_prompt.md\"},{\"content_env\":\"GH_AW_PROMPT_CONTENT_0004\"},{\"content_env\":\"GH_AW_PROMPT_CONTENT_0005\"}]}"
+          GH_AW_EXPR_1A3A194A: ${{ github.event.discussion.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'discussion' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
+          GH_AW_EXPR_463A214A: ${{ github.event.pull_request.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'pull_request' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
+          GH_AW_EXPR_802A9F6A: ${{ github.event.issue.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'issue' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
+          GH_AW_EXPR_FF1D34CE: ${{ github.event.comment.id || fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').comment_id }}
+          GH_AW_GITHUB_ACTOR: ${{ github.actor }}
+          GH_AW_GITHUB_REPOSITORY: ${{ github.repository }}
+          GH_AW_GITHUB_RUN_ID: ${{ github.run_id }}
+          GH_AW_GITHUB_WORKSPACE: ${{ github.workspace }}
+          GH_AW_PROMPT_CONTENT_0000: "<system>\n"
+          GH_AW_PROMPT_CONTENT_0001: "<safe-output-tools>\nTools: create_pull_request, missing_tool, missing_data, noop\n"
+          GH_AW_PROMPT_CONTENT_0002: "</safe-output-tools>\n"
+          GH_AW_PROMPT_CONTENT_0003: "<github-context>\nThe following GitHub context information is available for this workflow:\n{{#if github.actor}}\n- **actor**: __GH_AW_GITHUB_ACTOR__\n{{/if}}\n{{#if github.repository}}\n- **repository**: __GH_AW_GITHUB_REPOSITORY__\n{{/if}}\n{{#if github.workspace}}\n- **workspace**: __GH_AW_GITHUB_WORKSPACE__\n{{/if}}\n{{#if github.event.issue.number || (github.aw.context.item_type == 'issue' && github.aw.context.item_number)}}\n- **issue-number**: #__GH_AW_EXPR_802A9F6A__\n{{/if}}\n{{#if github.event.discussion.number || (github.aw.context.item_type == 'discussion' && github.aw.context.item_number)}}\n- **discussion-number**: #__GH_AW_EXPR_1A3A194A__\n{{/if}}\n{{#if github.event.pull_request.number || (github.aw.context.item_type == 'pull_request' && github.aw.context.item_number)}}\n- **pull-request-number**: #__GH_AW_EXPR_463A214A__\n{{/if}}\n{{#if github.event.comment.id || github.aw.context.comment_id}}\n- **comment-id**: __GH_AW_EXPR_FF1D34CE__\n{{/if}}\n{{#if github.run_id}}\n- **workflow-run-id**: __GH_AW_GITHUB_RUN_ID__\n{{/if}}\n- **checkouts**: The following repositories have been checked out and are available in the workspace:\n  - repo `__GH_AW_GITHUB_REPOSITORY__` → `$GITHUB_WORKSPACE` (cwd) [full history, all branches available as remote-tracking refs]\n  - **Note**: If a branch you need is not in the list above and is not listed as an additional fetched ref, it has NOT been checked out. For private repositories you cannot fetch it. If the branch is required and not available, exit with an error and ask the user to add it to the `fetch:` option of the `checkout:` configuration (e.g., `fetch: [\"refs/pulls/open/*\"]` for all open PR refs, or `fetch: [\"main\", \"feature/my-branch\"]` for specific branches).\n  - **Warning: No git credentials are available to the agent.** Credentials are\n    intentionally removed after the checkout step for security. This means any git\n    operation that needs to authenticate to the remote will fail. In private repositories, that includes:\n    - `git fetch`, `git pull`, `git clone`, and `git push` (direct push, not via safe-output tools)\n    - Checking out or switching to a remote branch that is not already fetched\n    - Deepening a shallow clone (`git fetch --unshallow`)\n    - On-demand blob fetches in partial/blobless clones (operations on files not in the initial checkout)\n    Do NOT attempt to configure credentials, run `git credential fill`, or modify `.gitconfig` —\n    authentication will not succeed. If you encounter credential prompts or authentication errors,\n    stop immediately and report the limitation rather than spending turns trying to work around it.\n</github-context>\n\n"
+          GH_AW_PROMPT_CONTENT_0004: "</system>\n"
+          GH_AW_PROMPT_CONTENT_0005: "{{#runtime-import .github/workflows/update-rust-analyzer.md}}\n"
+        with:
+          script: |
+            const { setupGlobals } = require(process.env.GH_AW_ACTIONS_DIR + '/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(process.env.GH_AW_ACTIONS_DIR + '/create_prompt.cjs');
+            await main(core);
+      - name: Interpolate variables and render templates
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_PROMPT: ${{ runner.temp }}/gh-aw/aw-prompts/prompt.txt
+          GH_AW_ENGINE_ID: "copilot"
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'interpolate_prompt.cjs'));
+            await main();
+      - name: Substitute placeholders
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_PROMPT: ${{ runner.temp }}/gh-aw/aw-prompts/prompt.txt
+          GH_AW_EXPR_1A3A194A: ${{ github.event.discussion.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'discussion' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
+          GH_AW_EXPR_463A214A: ${{ github.event.pull_request.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'pull_request' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
+          GH_AW_EXPR_802A9F6A: ${{ github.event.issue.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'issue' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
+          GH_AW_EXPR_FF1D34CE: ${{ github.event.comment.id || fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').comment_id }}
+          GH_AW_GITHUB_ACTOR: ${{ github.actor }}
+          GH_AW_GITHUB_REPOSITORY: ${{ github.repository }}
+          GH_AW_GITHUB_RUN_ID: ${{ github.run_id }}
+          GH_AW_GITHUB_WORKSPACE: ${{ github.workspace }}
+          GH_AW_MCP_CLI_SERVERS_LIST: '- `safeoutputs` — run `safeoutputs --help` to see available tools'
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+
+            const substitutePlaceholders = require(path.join(actionsDir, 'substitute_placeholders.cjs'));
+
+            // Call the substitution function
+            return await substitutePlaceholders({
+              file: process.env.GH_AW_PROMPT,
+              substitutions: {
+                GH_AW_EXPR_1A3A194A: process.env.GH_AW_EXPR_1A3A194A,
+                GH_AW_EXPR_463A214A: process.env.GH_AW_EXPR_463A214A,
+                GH_AW_EXPR_802A9F6A: process.env.GH_AW_EXPR_802A9F6A,
+                GH_AW_EXPR_FF1D34CE: process.env.GH_AW_EXPR_FF1D34CE,
+                GH_AW_GITHUB_ACTOR: process.env.GH_AW_GITHUB_ACTOR,
+                GH_AW_GITHUB_REPOSITORY: process.env.GH_AW_GITHUB_REPOSITORY,
+                GH_AW_GITHUB_RUN_ID: process.env.GH_AW_GITHUB_RUN_ID,
+                GH_AW_GITHUB_WORKSPACE: process.env.GH_AW_GITHUB_WORKSPACE,
+                GH_AW_MCP_CLI_SERVERS_LIST: process.env.GH_AW_MCP_CLI_SERVERS_LIST
+              }
+            });
+      - name: Validate prompt placeholders
+        env:
+          GH_AW_PROMPT: ${{ runner.temp }}/gh-aw/aw-prompts/prompt.txt
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/validate_prompt_placeholders.sh"
+      - name: Print prompt
+        env:
+          GH_AW_PROMPT: ${{ runner.temp }}/gh-aw/aw-prompts/prompt.txt
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/print_prompt_summary.sh"
+      - name: Stage prompt files for artifact upload
+        run: |
+          mkdir -p /tmp/gh-aw/aw-prompts
+          cp -a "${RUNNER_TEMP}/gh-aw/aw-prompts/." /tmp/gh-aw/aw-prompts/
+      - name: Upload activation artifact
+        if: success() || failure()
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: activation
+          include-hidden-files: true
+          path: |
+            /tmp/gh-aw/aw_info.json
+            /tmp/gh-aw/models.json
+            /tmp/gh-aw/aw-prompts/prompt.txt
+            /tmp/gh-aw/aw-prompts/prompt-template.txt
+            /tmp/gh-aw/aw-prompts/prompt-import-tree.json
+            /tmp/gh-aw/github_rate_limits.jsonl
+            /tmp/gh-aw/base
+            /tmp/gh-aw/.github/agents
+            /tmp/gh-aw/.github/skills
+          if-no-files-found: ignore
+          retention-days: 1
+
+  agent:
+    needs: activation
+    if: needs.activation.outputs.daily_ai_credits_exceeded != 'true'
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      copilot-requests: write
+      pull-requests: read
+    timeout-minutes: 180
+    env:
+      DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+      GH_AW_ASSETS_ALLOWED_EXTS: ""
+      GH_AW_ASSETS_BRANCH: ""
+      GH_AW_ASSETS_MAX_SIZE_KB: 0
+      GH_AW_MCP_LOG_DIR: /tmp/gh-aw/mcp-logs/safeoutputs
+      GH_AW_PR_HEAD_BASE_BRANCH: ""
+      GH_AW_PR_HEAD_BASE_PR_NUMBER: ""
+      GH_AW_PR_HEAD_BASE_REF: ""
+      GH_AW_PR_HEAD_BASE_REPO: ""
+      GH_AW_PR_HEAD_BASE_SHA: ""
+      GH_AW_PR_HEAD_REPO: ""
+      GH_AW_RUNTIME_FEATURES: ${{ vars.GH_AW_RUNTIME_FEATURES }}
+      GH_AW_WORKFLOW_ID_SANITIZED: updaterustanalyzer
+    outputs:
+      agentic_engine_timeout: ${{ steps.detect-agent-errors.outputs.agentic_engine_timeout || 'false' }}
+      ai_credits_rate_limit_error: ${{ steps.parse-mcp-gateway.outputs.ai_credits_rate_limit_error || 'false' }}
+      aic: ${{ steps.parse-mcp-gateway.outputs.aic }}
+      ambient_context: ${{ steps.parse-mcp-gateway.outputs.ambient_context }}
+      checkout_pr_success: ${{ steps.checkout-pr.outputs.checkout_pr_success || 'true' }}
+      effective_tokens: ${{ steps.parse-mcp-gateway.outputs.effective_tokens }}
+      has_patch: ${{ steps.collect_output.outputs.has_patch }}
+      http_400_response_error: ${{ steps.detect-agent-errors.outputs.http_400_response_error || 'false' }}
+      inference_access_error: ${{ steps.detect-agent-errors.outputs.inference_access_error || 'false' }}
+      invocation_cap_exceeded: ${{ steps.detect-agent-errors.outputs.invocation_cap_exceeded || 'false' }}
+      max_cache_misses_exceeded: ${{ steps.detect-agent-errors.outputs.max_cache_misses_exceeded || 'false' }}
+      mcp_policy_error: ${{ steps.detect-agent-errors.outputs.mcp_policy_error || 'false' }}
+      missing_model_pricing_error: ${{ steps.detect-agent-errors.outputs.missing_model_pricing_error || 'false' }}
+      missing_model_pricing_model_name: ${{ steps.detect-agent-errors.outputs.missing_model_pricing_model_name || '' }}
+      model: ${{ needs.activation.outputs.model }}
+      model_not_supported_error: ${{ steps.detect-agent-errors.outputs.model_not_supported_error || 'false' }}
+      output: ${{ steps.collect_output.outputs.output }}
+      output_types: ${{ steps.collect_output.outputs.output_types }}
+      setup-parent-span-id: ${{ steps.setup.outputs.parent-span-id || steps.setup.outputs.span-id }}
+      setup-span-id: ${{ steps.setup.outputs.span-id }}
+      setup-trace-id: ${{ steps.setup.outputs.trace-id }}
+      shell_expansion_guard_rejected: ${{ steps.detect-agent-errors.outputs.shell_expansion_guard_rejected || 'false' }}
+      unknown_model_ai_credits: ${{ steps.parse-mcp-gateway.outputs.unknown_model_ai_credits || 'false' }}
+    steps:
+      - name: Setup Scripts
+        id: setup
+        uses: github/gh-aw-actions/setup@5e508589e03a7757a7e05b26e834292f5445bfb6 # v0.88.7
+        with:
+          destination: ${{ runner.temp }}/gh-aw/actions
+          job-name: ${{ github.job }}
+          trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+          parent-span-id: ${{ needs.activation.outputs.setup-parent-span-id || needs.activation.outputs.setup-span-id }}
+        env:
+          GH_AW_SETUP_WORKFLOW_NAME: "Update rust-analyzer"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/update-rust-analyzer.lock.yml@${{ github.ref }}
+          GH_AW_INFO_VERSION: "1.0.80"
+          GH_AW_INFO_AWF_VERSION: "v0.28.14"
+          GH_AW_INFO_ENGINE_ID: "copilot"
+      - name: Set runtime paths
+        id: set-runtime-paths
+        env:
+          GH_AW_RUNNER_TOOL_CACHE: ${{ runner.tool_cache }}
+        run: |
+          if [ -z "${RUNNER_TOOL_CACHE:-}" ]; then
+            echo "RUNNER_TOOL_CACHE=${GH_AW_RUNNER_TOOL_CACHE}" >> "$GITHUB_ENV"
+          fi
+          {
+            echo "GH_AW_SAFE_OUTPUTS=${RUNNER_TEMP}/gh-aw/safeoutputs/outputs.jsonl"
+            echo "GH_AW_SAFE_OUTPUTS_CONFIG_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/config.json"
+            echo "GH_AW_SAFE_OUTPUTS_TOOLS_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/tools.json"
+          } >> "$GITHUB_OUTPUT"
+      - name: Mask OTLP telemetry headers
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/mask_otlp_headers.sh"
+      - name: Check OTLP telemetry configuration
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/check_otlp_default_credentials.sh"
+      - name: Checkout repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+          fetch-depth: 0
+      - name: Create gh-aw temp directory
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/create_gh_aw_tmp_dir.sh"
+      - name: Configure gh CLI for GitHub Enterprise
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/configure_gh_for_ghe.sh"
+        env:
+          GH_TOKEN: ${{ github.token }}
+      - name: Download activation artifact
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: activation
+          path: /tmp/gh-aw
+      - name: Set up CodeQL
+        uses: ./.github/actions/fetch-codeql
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - continue-on-error: true
+        name: Install cargo-edit
+        run: cargo install cargo-edit@0.13.0 --locked
+      - name: Run rust-analyzer updater script
+        run: "mkdir -p /tmp/gh-aw/agent\nset +e\npython3 rust/scripts/update_rust_analyzer.py \\\n  2>&1 | tee /tmp/gh-aw/agent/rust-analyzer-update.log\nstatus=${PIPESTATUS[0]}\nset -e\n\nprintf '%s\\n' \"$status\" > /tmp/gh-aw/agent/rust-analyzer-update-status.txt\nif grep -Fxq \"No new rust-analyzer version available.\" \\\n  /tmp/gh-aw/agent/rust-analyzer-update.log; then\n  printf '%s\\n' \"no-update\" > /tmp/gh-aw/agent/rust-analyzer-update-result.txt\nelse\n  printf '%s\\n' \"update\" > /tmp/gh-aw/agent/rust-analyzer-update-result.txt\nfi"
+
+      - name: Configure Git credentials
+        env:
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          GITHUB_SERVER_URL: ${{ github.server_url }}
+          GITHUB_TOKEN: ${{ github.token }}
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/configure_git_credentials.sh"
+      - name: Checkout PR branch
+        id: checkout-pr
+        if: |
+          github.event.pull_request || github.event.issue.pull_request || github.event_name == 'workflow_dispatch' && fromJSON(github.event.inputs.aw_context || '{}').item_type == 'pull_request'
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'checkout_pr_branch.cjs'));
+            await main();
+      - name: Install GitHub Copilot CLI
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh"
+        env:
+          GH_HOST: github.com
+          GH_AW_COMPILED_VERSION: v0.88.7
+      - name: Install AWF binary
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.28.14 --rootless
+      - name: Determine automatic lockdown mode for GitHub MCP Server
+        id: determine-automatic-lockdown
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 (source v9)
+        env:
+          GH_AW_GITHUB_TOKEN: ${{ secrets.GH_AW_GITHUB_TOKEN }}
+          GH_AW_GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN }}
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const determineAutomaticLockdown = require(path.join(actionsDir, 'determine_automatic_lockdown.cjs'));
+            await determineAutomaticLockdown(github, context, core);
+      - name: Restore agent config folders from base branch
+        if: steps.checkout-pr.outcome == 'success'
+        env:
+          GH_AW_AGENT_FOLDERS: ".agents .github"
+          GH_AW_AGENT_FILES: "AGENTS.md"
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_base_github_folders.sh"
+      - name: Restore inline sub-agents from activation artifact
+        env:
+          GH_AW_SUB_AGENT_DIR: ".github/agents"
+          GH_AW_SUB_AGENT_EXT: ".agent.md"
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_inline_sub_agents.sh"
+      - name: Restore inline skills from activation artifact
+        env:
+          GH_AW_SKILL_DIR: ".github/skills"
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_inline_skills.sh"
+      - name: Download container images
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.28.14@sha256:f7df036c86575527b61f3f7df91c4412349a12b2a74988d929eafa2999230c98 ghcr.io/github/gh-aw-firewall/api-proxy:0.28.14@sha256:6f95e2234dd9bd6333a8ff28ccea7ecf0204acd4a09108723844dbd2bf6268c5 ghcr.io/github/gh-aw-firewall/cli-proxy:0.28.14@sha256:3a379c5e96e29499c815e9dd2a71334d01c326a9b73991c76544fda9cae35c34 ghcr.io/github/gh-aw-firewall/squid:0.28.14@sha256:2ce8df3abf3e9b76e9c0cf5863da41f1ab3f89b20ad14b988806ab89e7bf2cd5 ghcr.io/github/gh-aw-mcpg:v0.4.18@sha256:85b940556a8faa4e1fdbef124bfd75f2c4ebd855a10b88a1c3b6f3e97f6f1a53 ghcr.io/github/gh-aw-node@sha256:0daa8971fa4732b647150cb6524a6b0804b68d5d24f6f58b5dd1af23bd63fb23 ghcr.io/github/github-mcp-server:v1.11.0@sha256:fbec75de11c255213fa08d80fb166abe73d851fff631c51c0079872967720699
+      - name: Prepare Safe Outputs Directories
+        run: |
+          mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
+          mkdir -p /tmp/gh-aw/safeoutputs
+          mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
+      - name: Generate Safe Outputs Config
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_FILE_ROOT: "${{ runner.temp }}/gh-aw"
+          GH_AW_FILE_CONFIG: "{\"files\":[{\"path\":\"safeoutputs/config.json\",\"content_env\":\"GH_AW_SAFE_OUTPUTS_CONFIG\"}]}"
+          GH_AW_SAFE_OUTPUTS_CONFIG: "{\"create_pull_request\":{\"allowed_files\":[\"Cargo.lock\",\"shared/tree-sitter-extractor/Cargo.toml\",\"shared/yeast/Cargo.toml\",\"shared/yeast-macros/Cargo.toml\",\"shared/yeast-schema/Cargo.toml\",\"ruby/extractor/Cargo.toml\",\"unified/extractor/Cargo.toml\",\"unified/swift-syntax-rs/Cargo.toml\",\"shared/yeast/src/**\",\"shared/yeast-macros/src/**\",\"shared/yeast-schema/src/**\",\"shared/tree-sitter-extractor/src/**\",\"MODULE.bazel\",\"MODULE.bazel.lock\",\"rust-toolchain.toml\",\"rust/**\",\"misc/bazel/3rdparty/**\"],\"branch_prefix\":\"automation/update-rust-analyzer/\",\"draft\":true,\"max\":1,\"max_patch_files\":1000,\"max_patch_size\":10240,\"protect_top_level_dot_folders\":true,\"protected_files\":[\"package.json\",\"bun.lockb\",\"bunfig.toml\",\"deno.json\",\"deno.jsonc\",\"deno.lock\",\"global.json\",\"NuGet.Config\",\"Directory.Packages.props\",\"mix.exs\",\"mix.lock\",\"go.mod\",\"go.sum\",\"stack.yaml\",\"stack.yaml.lock\",\"pom.xml\",\"build.gradle\",\"build.gradle.kts\",\"settings.gradle\",\"settings.gradle.kts\",\"gradle.properties\",\"package-lock.json\",\"yarn.lock\",\"pnpm-lock.yaml\",\"npm-shrinkwrap.json\",\"requirements.txt\",\"Pipfile\",\"Pipfile.lock\",\"pyproject.toml\",\"setup.py\",\"setup.cfg\",\"Gemfile\",\"Gemfile.lock\",\"uv.lock\",\"CODEOWNERS\",\"DESIGN.md\",\"README.md\",\"CONTRIBUTING.md\",\"CHANGELOG.md\",\"SECURITY.md\",\"CODE_OF_CONDUCT.md\",\"AGENTS.md\"],\"protected_files_policy\":\"request_review\",\"title_prefix\":\"Rust: \"},\"create_report_incomplete_issue\":{\"title-prefix\":\"[incomplete]\"},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"false\"},\"report_incomplete\":{}}"
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'create_files.cjs'));
+            await main();
+      - name: Generate Safe Outputs Tools
+        env:
+          GH_AW_TOOLS_META_JSON: |
+            {
+              "description_suffixes": {
+                "create_pull_request": " CONSTRAINTS: Maximum 1 pull request(s) can be created. Branch name will be prefixed with \"automation/update-rust-analyzer/\". Title will be prefixed with \"Rust: \". PRs will be created as drafts."
+              },
+              "repo_params": {},
+              "dynamic_tools": []
+            }
+          GH_AW_VALIDATION_JSON: |
+            {
+              "create_pull_request": {
+                "defaultMax": 1,
+                "fields": {
+                  "base": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 128
+                  },
+                  "body": {
+                    "required": true,
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 65000
+                  },
+                  "branch": {
+                    "required": true,
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 256
+                  },
+                  "dependencies": {
+                    "type": "array",
+                    "itemType": "string",
+                    "itemSanitize": true,
+                    "itemMaxLength": 256
+                  },
+                  "draft": {
+                    "type": "boolean"
+                  },
+                  "labels": {
+                    "type": "array",
+                    "itemType": "string",
+                    "itemSanitize": true,
+                    "itemMaxLength": 128
+                  },
+                  "repo": {
+                    "type": "string",
+                    "maxLength": 256
+                  },
+                  "stack_position": {
+                    "optionalPositiveInteger": true
+                  },
+                  "stack_root": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 256
+                  },
+                  "temporary_id": {
+                    "type": "string",
+                    "pattern": "^#?aw_[A-Za-z0-9_]{3,12}$"
+                  },
+                  "title": {
+                    "required": true,
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 128
+                  }
+                }
+              },
+              "missing_data": {
+                "defaultMax": 20,
+                "fields": {
+                  "alternatives": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 256
+                  },
+                  "context": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 256
+                  },
+                  "data_type": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 128
+                  },
+                  "reason": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 256
+                  }
+                }
+              },
+              "missing_tool": {
+                "defaultMax": 20,
+                "fields": {
+                  "alternatives": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 512
+                  },
+                  "reason": {
+                    "required": true,
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 256
+                  },
+                  "tool": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 128
+                  }
+                }
+              },
+              "noop": {
+                "defaultMax": 1,
+                "fields": {
+                  "message": {
+                    "required": true,
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 65000
+                  }
+                }
+              },
+              "report_incomplete": {
+                "defaultMax": 5,
+                "fields": {
+                  "details": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 65000
+                  },
+                  "reason": {
+                    "required": true,
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 1024
+                  }
+                }
+              }
+            }
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'generate_safe_outputs_tools.cjs'));
+            await main();
+      - name: Start MCP Gateway
+        id: start-mcp-gateway
+        env:
+          GH_AW_POLICY_ALLOW_CREATE_PULL_REQUEST: ${{ vars.GH_AW_POLICY_ALLOW_CREATE_PULL_REQUEST || 'true' }}
+          GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
+          GH_AW_SAFE_OUTPUTS_CONFIG_PATH: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS_CONFIG_PATH }}
+          GH_AW_SAFE_OUTPUTS_TOOLS_PATH: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS_TOOLS_PATH }}
+          GH_AW_SINK_VISIBILITY: ${{ steps.determine-automatic-lockdown.outputs.visibility }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          set -eo pipefail
+          mkdir -p "${RUNNER_TEMP}/gh-aw/mcp-config"
+          if [ -n "${GITHUB_EVENT_PATH:-}" ] && [ -r "${GITHUB_EVENT_PATH}" ]; then
+            GH_AW_SAFEOUTPUTS_EVENT_PATH="${RUNNER_TEMP}/gh-aw/safeoutputs/github_event.json"
+            cp "${GITHUB_EVENT_PATH}" "${GH_AW_SAFEOUTPUTS_EVENT_PATH}"
+            export GITHUB_EVENT_PATH="${GH_AW_SAFEOUTPUTS_EVENT_PATH}"
+          fi
+
+          # Export gateway environment variables for MCP config and gateway script
+          export MCP_GATEWAY_PORT="8080"
+          export MCP_GATEWAY_DOMAIN="awmg-mcpg"
+          export MCP_GATEWAY_HOST_DOMAIN="localhost"
+          MCP_GATEWAY_AGENT_ID=$(openssl rand -base64 45 | tr -d '/+=')
+          echo "::add-mask::${MCP_GATEWAY_AGENT_ID}"
+          export MCP_GATEWAY_AGENT_ID
+          export MCP_GATEWAY_PAYLOAD_DIR="/tmp/gh-aw/mcp-payloads"
+          mkdir -p "${MCP_GATEWAY_PAYLOAD_DIR}"
+          export MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD="524288"
+          export MCP_GATEWAY_ALLOWED_MOUNT_ROOTS="${GITHUB_WORKSPACE}:rw,${RUNNER_TEMP}/gh-aw:ro,${RUNNER_TEMP}/gh-aw/safeoutputs:rw,/opt:ro,/tmp:rw,/usr/bin/gh:ro"
+          export GH_AW_PR_HEAD_BASE_BRANCH="${GH_AW_PR_HEAD_BASE_BRANCH:-}"
+          export GH_AW_PR_HEAD_BASE_SHA="${GH_AW_PR_HEAD_BASE_SHA:-}"
+          export GH_AW_PR_HEAD_BASE_REPO="${GH_AW_PR_HEAD_BASE_REPO:-}"
+          export GH_AW_PR_HEAD_BASE_PR_NUMBER="${GH_AW_PR_HEAD_BASE_PR_NUMBER:-}"
+          export GH_AW_PR_HEAD_BASE_REF="${GH_AW_PR_HEAD_BASE_REF:-}"
+          export GH_AW_PR_HEAD_REPO="${GH_AW_PR_HEAD_REPO:-}"
+          export DEBUG="*"
+
+          export GH_AW_ENGINE="copilot"
+          MCP_GATEWAY_UID=$(id -u 2>/dev/null || echo '0')
+          MCP_GATEWAY_GID=$(id -g 2>/dev/null || echo '0')
+          source "${RUNNER_TEMP}/gh-aw/actions/resolve_docker_socket_gid.sh"
+          export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network bridge -p 127.0.0.1:'"${MCP_GATEWAY_PORT}"':'"${MCP_GATEWAY_PORT}"' --name awmg-mcpg --add-host host.docker.internal:host-gateway --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v '"${DOCKER_SOCK_PATH}"':/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_AGENT_ID -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DOCKER_HOST=unix:///var/run/docker.sock -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_PR_HEAD_BASE_BRANCH -e GH_AW_PR_HEAD_BASE_SHA -e GH_AW_PR_HEAD_BASE_REPO -e GH_AW_PR_HEAD_BASE_PR_NUMBER -e GH_AW_PR_HEAD_BASE_REF -e GH_AW_PR_HEAD_REPO -e GH_AW_POLICY_ALLOW_CREATE_PULL_REQUEST -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GH_AW_SINK_VISIBILITY -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e RUNNER_TEMP -e RUNNER_TOOL_CACHE -e MCP_GATEWAY_ALLOWED_MOUNT_ROOTS -e GITHUB_AW_OTEL_TRACE_ID -e GITHUB_AW_OTEL_PARENT_SPAN_ID -e OTEL_EXPORTER_OTLP_HEADERS -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw -v '"${RUNNER_TEMP}"'/gh-aw/safeoutputs:'"${RUNNER_TEMP}"'/gh-aw/safeoutputs:rw ghcr.io/github/gh-aw-mcpg:v0.4.18'
+
+          mkdir -p "$HOME/.copilot"
+          GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
+          cat << GH_AW_MCP_CONFIG_da213146dab3586b_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          {
+            "mcpServers": {
+              "safeoutputs": {
+                "type": "stdio",
+                "container": "ghcr.io/github/gh-aw-node",
+                "mounts": ["\${GITHUB_WORKSPACE}:\${GITHUB_WORKSPACE}:rw", "${RUNNER_TEMP}/gh-aw/safeoutputs:${RUNNER_TEMP}/gh-aw/safeoutputs:rw", "/tmp/gh-aw:/tmp/gh-aw:rw"],
+                "args": ["-w", "\${GITHUB_WORKSPACE}"],
+                "entrypoint": "sh",
+                "entrypointArgs": ["-c", "sh ${RUNNER_TEMP}/gh-aw/safeoutputs/start_safe_outputs_mcp.sh"],
+                "env": {
+                  "DEBUG": "*",
+                  "DEFAULT_BRANCH": "\${DEFAULT_BRANCH}",
+                  "GH_AW_ASSETS_ALLOWED_EXTS": "\${GH_AW_ASSETS_ALLOWED_EXTS}",
+                  "GH_AW_ASSETS_BRANCH": "\${GH_AW_ASSETS_BRANCH}",
+                  "GH_AW_ASSETS_MAX_SIZE_KB": "\${GH_AW_ASSETS_MAX_SIZE_KB}",
+                  "GH_AW_MCP_LOG_DIR": "\${GH_AW_MCP_LOG_DIR}",
+                  "GH_AW_SAFE_OUTPUTS": "\${GH_AW_SAFE_OUTPUTS}",
+                  "GH_AW_SAFE_OUTPUTS_CONFIG_PATH": "\${GH_AW_SAFE_OUTPUTS_CONFIG_PATH}",
+                  "GH_AW_SAFE_OUTPUTS_TOOLS_PATH": "\${GH_AW_SAFE_OUTPUTS_TOOLS_PATH}",
+                  "GH_AW_POLICY_ALLOW_CREATE_PULL_REQUEST": "\${GH_AW_POLICY_ALLOW_CREATE_PULL_REQUEST}",
+                  "GH_AW_PR_HEAD_BASE_BRANCH": "\${GH_AW_PR_HEAD_BASE_BRANCH}",
+                  "GH_AW_PR_HEAD_BASE_SHA": "\${GH_AW_PR_HEAD_BASE_SHA}",
+                  "GH_AW_PR_HEAD_BASE_REPO": "\${GH_AW_PR_HEAD_BASE_REPO}",
+                  "GH_AW_PR_HEAD_BASE_PR_NUMBER": "\${GH_AW_PR_HEAD_BASE_PR_NUMBER}",
+                  "GH_AW_PR_HEAD_BASE_REF": "\${GH_AW_PR_HEAD_BASE_REF}",
+                  "GH_AW_PR_HEAD_REPO": "\${GH_AW_PR_HEAD_REPO}",
+                  "GITHUB_EVENT_NAME": "\${GITHUB_EVENT_NAME}",
+                  "GITHUB_EVENT_PATH": "\${GITHUB_EVENT_PATH}",
+                  "GITHUB_REPOSITORY": "\${GITHUB_REPOSITORY}",
+                  "GITHUB_SHA": "\${GITHUB_SHA}",
+                  "GITHUB_TOKEN": "\${GITHUB_TOKEN}",
+                  "GITHUB_WORKSPACE": "\${GITHUB_WORKSPACE}",
+                  "RUNNER_TEMP": "\${RUNNER_TEMP}"
+                },
+                "guard-policies": {
+                  "write-sink": {
+                    "accept": [
+                      "*"
+                    ],
+                    "sink-visibility": "${GH_AW_SINK_VISIBILITY}"
+                  }
+                }
+              }
+            },
+            "gateway": {
+              "port": $MCP_GATEWAY_PORT,
+              "domain": "${MCP_GATEWAY_DOMAIN}",
+              "agentId": "${MCP_GATEWAY_AGENT_ID}",
+              "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}",
+              "startupTimeout": 120,
+              "opentelemetry": {
+                "endpoint": "${OTEL_EXPORTER_OTLP_ENDPOINT}",
+                "traceId": "${GITHUB_AW_OTEL_TRACE_ID}",
+                "spanId": "${GITHUB_AW_OTEL_PARENT_SPAN_ID}"
+              }
+            }
+          }
+          GH_AW_MCP_CONFIG_da213146dab3586b_EOF
+      - name: Mount MCP servers as CLIs
+        id: mount-mcp-clis
+        continue-on-error: true
+        env:
+          MCP_GATEWAY_AGENT_ID: ${{ steps.start-mcp-gateway.outputs.gateway-agent-id }}
+          MCP_GATEWAY_DOMAIN: ${{ steps.start-mcp-gateway.outputs.gateway-domain }}
+          MCP_GATEWAY_PORT: ${{ steps.start-mcp-gateway.outputs.gateway-port }}
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io);
+            const { main } = require(path.join(actionsDir, 'mount_mcp_as_cli.cjs'));
+            await main();
+      - name: Clean credentials
+        continue-on-error: true
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/clean_git_credentials.sh"
+      - name: Audit pre-agent workspace
+        id: pre_agent_audit
+        continue-on-error: true
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/audit_pre_agent_workspace.sh"
+      - name: Start CLI Proxy
+        env:
+          GH_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          GITHUB_SERVER_URL: ${{ github.server_url }}
+          GITHUB_API_URL: ${{ github.api_url }}
+          GH_HOST: ${{ env.GH_HOST }}
+          GITHUB_HOST: ${{ env.GITHUB_HOST }}
+          GITHUB_ENTERPRISE_HOST: ${{ env.GITHUB_ENTERPRISE_HOST }}
+          GITHUB_GRAPHQL_URL: ${{ env.GITHUB_GRAPHQL_URL }}
+          GITHUB_COPILOT_BASE_URL: ${{ env.GITHUB_COPILOT_BASE_URL }}
+          GH_AW_NETWORK_ISOLATION: 'true'
+          CLI_PROXY_POLICY: '{"allow-only":{"repos":"${{ steps.determine-automatic-lockdown.outputs.repos }}","min-integrity":"${{ steps.determine-automatic-lockdown.outputs.min_integrity }}"}}'
+          CLI_PROXY_IMAGE: 'ghcr.io/github/gh-aw-mcpg:v0.4.18'
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/start_cli_proxy.sh"
+      - name: Execute GitHub Copilot CLI
+        id: agentic_execution
+        # Copilot CLI tool arguments (sorted):
+        timeout-minutes: 180
+        run: |
+          set -o pipefail
+          printf '%s' "$(date +%s%3N)" > /tmp/gh-aw/agent_cli_start_ms.txt
+          trap 'gh_aw_exit_code=$?; mkdir -p /tmp/gh-aw >/dev/null 2>&1 || true; printf "%s" "$gh_aw_exit_code" > /tmp/gh-aw/agent_execution_exit_code.txt || true; rm -f "$HOME/.copilot/settings.json"; if [ "$gh_aw_exit_code" -ne 0 ]; then echo "::error::Agent execution exited with code $gh_aw_exit_code"; fi' EXIT
+          mkdir -p "$HOME/.copilot"
+          printf '%s' '{"builtInAgents":{"rubberDuck":false}}' > "$HOME/.copilot/settings.json"
+          export XDG_CONFIG_HOME="$HOME"
+          export GH_AW_MCP_CONFIG="$HOME/.copilot/mcp-config.json"
+          GH_AW_COPILOT_SRC="$(command -v copilot 2>/dev/null || true)"
+          if [ -z "$GH_AW_COPILOT_SRC" ] || [ ! -x "$GH_AW_COPILOT_SRC" ]; then
+            echo "GitHub Copilot CLI executable not found on PATH after installation" >&2
+            exit 127
+          fi
+          GH_AW_COPILOT_BIN="${RUNNER_TEMP}/gh-aw/bin/copilot"
+          mkdir -p "${RUNNER_TEMP}/gh-aw/bin"
+          if [ "$GH_AW_COPILOT_SRC" != "$GH_AW_COPILOT_BIN" ]; then
+            cp "$GH_AW_COPILOT_SRC" "$GH_AW_COPILOT_BIN"
+          fi
+          chmod 755 "$GH_AW_COPILOT_BIN"
+
+          touch /tmp/gh-aw/agent-step-summary.md
+          GH_AW_NODE_BIN=$(command -v node 2>/dev/null || true)
+          export GH_AW_NODE_BIN
+          export COPILOT_API_KEY="$COPILOT_DUMMY_BYOK"
+          (umask 177 && touch /tmp/gh-aw/agent-stdio.log)
+          GH_AW_MAX_AI_CREDITS="${GH_AW_MAX_AI_CREDITS:-1000}"
+          if [[ ! "$GH_AW_MAX_AI_CREDITS" =~ ^[0-9]+$ ]]; then
+            GH_AW_MAX_AI_CREDITS="1000"
+          fi
+          printf '%s\n' "{\"\$schema\":\"https://github.com/github/gh-aw-firewall/releases/download/v0.28.14/awf-config.schema.json\",\"network\":{\"allowDomains\":[\"*.githubusercontent.com\",\"*.pythonhosted.org\",\"anaconda.org\",\"api.snapcraft.io\",\"archive.ubuntu.com\",\"azure.archive.ubuntu.com\",\"bcr.bazel.build\",\"binstar.org\",\"blog.bazel.build\",\"bootstrap.pypa.io\",\"codeload.github.com\",\"conda.anaconda.org\",\"conda.binstar.org\",\"crates.io\",\"crl.geotrust.com\",\"crl.globalsign.com\",\"crl.identrust.com\",\"crl.sectigo.com\",\"crl.thawte.com\",\"crl.usertrust.com\",\"crl.verisign.com\",\"crl3.digicert.com\",\"crl4.digicert.com\",\"crls.ssl.com\",\"docs.github.com\",\"files.pythonhosted.org\",\"github-cloud.githubusercontent.com\",\"github-cloud.s3.amazonaws.com\",\"github.blog\",\"github.com\",\"github.githubassets.com\",\"index.crates.io\",\"json-schema.org\",\"json.schemastore.org\",\"keyserver.ubuntu.com\",\"lfs.github.com\",\"mirror.bazel.build\",\"objects.githubusercontent.com\",\"ocsp.digicert.com\",\"ocsp.geotrust.com\",\"ocsp.globalsign.com\",\"ocsp.identrust.com\",\"ocsp.sectigo.com\",\"ocsp.ssl.com\",\"ocsp.thawte.com\",\"ocsp.usertrust.com\",\"ocsp.verisign.com\",\"packagecloud.io\",\"packages.cloud.google.com\",\"packages.microsoft.com\",\"patch-diff.githubusercontent.com\",\"patchdiff.githubusercontent.com\",\"pip.pypa.io\",\"ppa.launchpad.net\",\"productionresultssa0.blob.core.windows.net\",\"productionresultssa1.blob.core.windows.net\",\"productionresultssa10.blob.core.windows.net\",\"productionresultssa11.blob.core.windows.net\",\"productionresultssa12.blob.core.windows.net\",\"productionresultssa13.blob.core.windows.net\",\"productionresultssa14.blob.core.windows.net\",\"productionresultssa15.blob.core.windows.net\",\"productionresultssa16.blob.core.windows.net\",\"productionresultssa17.blob.core.windows.net\",\"productionresultssa18.blob.core.windows.net\",\"productionresultssa19.blob.core.windows.net\",\"productionresultssa2.blob.core.windows.net\",\"productionresultssa3.blob.core.windows.net\",\"productionresultssa4.blob.core.windows.net\",\"productionresultssa5.blob.core.windows.net\",\"productionresultssa6.blob.core.windows.net\",\"productionresultssa7.blob.core.windows.net\",\"productionresultssa8.blob.core.windows.net\",\"productionresultssa9.blob.core.windows.net\",\"pypi.org\",\"pypi.python.org\",\"raw.githubusercontent.com\",\"releases.bazel.build\",\"repo.anaconda.com\",\"repo.continuum.io\",\"s.symcb.com\",\"s.symcd.com\",\"security.ubuntu.com\",\"sh.rustup.rs\",\"static.crates.io\",\"static.rust-lang.org\",\"ts-crl.ws.symantec.com\",\"ts-ocsp.ws.symantec.com\",\"www.googleapis.com\"],\"isolation\":true,\"topologyAttach\":[\"awmg-mcpg\",\"awmg-cli-proxy\"]},\"apiProxy\":{\"enabled\":true,\"enableTokenSteering\":true,\"maxRuns\":500,\"maxAiCredits\":${GH_AW_MAX_AI_CREDITS},\"maxCacheMisses\":5,\"models\":{\"agent\":[\"sonnet-6x\",\"gpt-5.4\",\"gpt-5.5\",\"gpt-5.6\",\"gpt-5.3\",\"gemini-pro\",\"any\"],\"antigravity\":[\"copilot/antigravity*\",\"google/antigravity*\",\"gemini/antigravity*\"],\"any\":[\"copilot/*\",\"anthropic/*\",\"openai/*\",\"google/*\",\"gemini/*\"],\"auto\":[\"copilot/auto\",\"large\"],\"claude\":[\"agent\"],\"codex\":[\"agent\"],\"coding\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\",\"gpt-5-codex\",\"kimi\"],\"computer-use\":[\"copilot/*computer-use*\",\"google/*computer-use*\",\"gemini/*computer-use*\",\"openai/*computer-use*\"],\"copilot\":[\"agent\"],\"deep-research\":[\"copilot/deep-research*\",\"copilot/o3-deep-research*\",\"copilot/o4-mini-deep-research*\",\"google/deep-research*\",\"gemini/deep-research*\",\"openai/o3-deep-research*\",\"openai/o4-mini-deep-research*\"],\"detection\":[\"small\"],\"evals\":[\"small\"],\"fable\":[\"copilot/*fable*\",\"anthropic/*fable*\"],\"gemini\":[\"agent\"],\"gemini-3-flash\":[\"copilot/gemini-3*flash*\",\"google/gemini-3*flash*\",\"gemini/gemini-3*flash*\"],\"gemini-3-pro\":[\"copilot/gemini-3*pro*\",\"google/gemini-3*pro*\",\"google/nano-banana*\",\"gemini/gemini-3*pro*\"],\"gemini-3.1-flash\":[\"copilot/gemini-3.1*flash*\",\"google/gemini-3.1*flash*\",\"gemini/gemini-3.1*flash*\"],\"gemini-3.1-pro\":[\"copilot/gemini-3.1*pro*\",\"google/gemini-3.1*pro*\",\"gemini/gemini-3.1*pro*\"],\"gemini-3.5-flash\":[\"copilot/gemini-3.5*flash*\",\"google/gemini-3.5*flash*\",\"gemini/gemini-3.5*flash*\"],\"gemini-3.6-flash\":[\"copilot/gemini-3.6*flash*\",\"google/gemini-3.6*flash*\",\"gemini/gemini-3.6*flash*\"],\"gemini-3.7-flash\":[\"copilot/gemini-3.7*flash*\",\"google/gemini-3.7*flash*\",\"gemini/gemini-3.7*flash*\"],\"gemini-flash\":[\"copilot/gemini-*flash*\",\"google/gemini-*flash*\",\"gemini/gemini-*flash*\"],\"gemini-flash-lite\":[\"copilot/gemini-*flash*lite*\",\"google/gemini-*flash*lite*\",\"gemini/gemini-*flash*lite*\"],\"gemini-omni\":[\"copilot/gemini-omni*\",\"google/gemini-omni*\",\"gemini/gemini-omni*\"],\"gemini-pro\":[\"copilot/gemini-*pro*\",\"google/gemini-*pro*\",\"gemini/gemini-*pro*\"],\"gemma\":[\"copilot/gemma*\",\"google/gemma*\",\"gemini/gemma*\"],\"gpt-5\":[\"copilot/gpt-5*\",\"openai/gpt-5*\"],\"gpt-5-codex\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\"],\"gpt-5-mini\":[\"copilot/gpt-5*mini*\",\"openai/gpt-5*mini*\"],\"gpt-5-nano\":[\"copilot/gpt-5*nano*\",\"openai/gpt-5*nano*\"],\"gpt-5-pro\":[\"copilot/gpt-5*pro*\",\"openai/gpt-5*pro*\"],\"gpt-5.1\":[\"copilot/gpt-5.1*\",\"openai/gpt-5.1*\"],\"gpt-5.2\":[\"copilot/gpt-5.2*\",\"openai/gpt-5.2*\"],\"gpt-5.3\":[\"copilot/gpt-5.3*\",\"openai/gpt-5.3*\"],\"gpt-5.4\":[\"copilot/gpt-5.4*\",\"openai/gpt-5.4*\"],\"gpt-5.5\":[\"copilot/gpt-5.5*\",\"openai/gpt-5.5*\"],\"gpt-5.6\":[\"copilot/gpt-5.6*\",\"openai/gpt-5.6*\"],\"grok\":[\"copilot/*grok*\",\"openai/*grok*\"],\"haiku\":[\"copilot/*haiku*\",\"anthropic/*haiku*\"],\"image-generation\":[\"copilot/gpt-image*\",\"openai/gpt-image*\",\"openai/chatgpt-image*\",\"copilot/gemini-*image*\",\"google/gemini-*image*\",\"gemini/gemini-*image*\",\"google/imagen*\"],\"kimi\":[\"copilot/kimi*\",\"openai/kimi*\"],\"kiwi\":[\"copilot/kiwi*\",\"openai/kiwi*\"],\"large\":[\"sonnet\",\"gpt-5-pro\",\"gpt-5\",\"gemini-pro\"],\"lyria\":[\"google/lyria*\",\"gemini/lyria*\",\"copilot/lyria*\"],\"mai-code\":[\"copilot/MAI-Code*\",\"copilot/mai-code*\",\"openai/MAI-Code*\"],\"mai-code-1-flash-picker\":[\"copilot/MAI-Code-1-Flash-picker*\",\"copilot/mai-code-1-flash-picker*\",\"openai/MAI-Code-1-Flash-picker*\"],\"mini\":[\"haiku\",\"gpt-5-mini\",\"gpt-5-nano\",\"gemini-flash-lite\"],\"nano-banana\":[\"copilot/nano-banana*\",\"google/nano-banana*\",\"gemini/nano-banana*\"],\"opus\":[\"copilot/*opus*\",\"anthropic/*opus*\"],\"opusplan\":[\"opus?effort=high\"],\"raptor-mini\":[\"copilot/raptor*\",\"openai/raptor*\"],\"reasoning\":[\"copilot/o1*\",\"copilot/o3*\",\"copilot/o4*\",\"openai/o1*\",\"openai/o3*\",\"openai/o4*\"],\"robotics\":[\"copilot/*robotics*\",\"google/*robotics*\",\"gemini/*robotics*\"],\"small\":[\"mini\"],\"small-agent\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash\"],\"sonnet\":[\"copilot/*sonnet*\",\"anthropic/*sonnet*\"],\"sonnet-6x\":[\"copilot/*sonnet-4.5*\",\"copilot/*sonnet-4.6*\",\"copilot/*sonnet-5*\",\"copilot/*sonnet-4-5-*\",\"anthropic/*sonnet-4-5-*\",\"copilot/*sonnet-4-6*\",\"anthropic/*sonnet-4-6*\",\"anthropic/*sonnet-5*\"],\"summarization\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash-lite\",\"mini\"],\"veo\":[\"google/veo*\",\"gemini/veo*\"],\"vision\":[\"copilot/gemini-*image*\",\"google/gemini-*image*\",\"gemini/gemini-*image*\",\"copilot/gemini-*flash*\",\"google/gemini-*flash*\",\"gemini/gemini-*flash*\"]}},\"container\":{\"imageTag\":\"0.28.14,squid=sha256:2ce8df3abf3e9b76e9c0cf5863da41f1ab3f89b20ad14b988806ab89e7bf2cd5,agent=sha256:f7df036c86575527b61f3f7df91c4412349a12b2a74988d929eafa2999230c98,api-proxy=sha256:6f95e2234dd9bd6333a8ff28ccea7ecf0204acd4a09108723844dbd2bf6268c5,cli-proxy=sha256:3a379c5e96e29499c815e9dd2a71334d01c326a9b73991c76544fda9cae35c34\"},\"logging\":{\"proxyLogsDir\":\"/tmp/gh-aw/sandbox/firewall/logs\",\"auditDir\":\"/tmp/gh-aw/sandbox/firewall/audit\"}}" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
+          cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
+          export GH_AW_MODELS_JSON_PATH="/tmp/gh-aw/models.json"
+          GH_AW_DOCKER_HOST=""
+          if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
+            GH_AW_DOCKER_HOST="${DOCKER_HOST}"
+          fi
+          if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
+            GH_AW_CHROOT_BINARIES_SOURCE_PATH="${RUNNER_TEMP}/gh-aw" GH_AW_CHROOT_IDENTITY_HOME="${RUNNER_TEMP}/gh-aw/home" node "${RUNNER_TEMP}/gh-aw/actions/patch_awf_chroot_config.cjs"
+          fi
+          GH_AW_TOOL_CACHE_MOUNT=""
+          GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"
+          if [ -d "$GH_AW_TOOL_CACHE" ]; then
+            if [[ "$GH_AW_TOOL_CACHE" != /opt/* ]]; then
+              GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro"
+            fi
+          fi
+          # shellcheck disable=SC1003,SC2016,SC2086
+          GH_AW_AWF_ENGINE_NAME=copilot \
+          GH_AW_AWF_HARNESS_MARKER='[copilot-harness]' \
+          GH_AW_AWF_LOG_FILE=/tmp/gh-aw/agent-stdio.log \
+          GH_AW_AWF_ATTEMPT_LOG_NAME=copilot \
+          bash "${RUNNER_TEMP}/gh-aw/actions/run_awf_with_startup_retries.sh" -- \
+            awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" ${GH_AW_TOOL_CACHE_MOUNT:+--mount "$GH_AW_TOOL_CACHE_MOUNT"} ${GH_AW_DOCKER_HOST:+--docker-host "$GH_AW_DOCKER_HOST"} --env-all --exclude-env ACTIONS_ID_TOKEN_REQUEST_TOKEN --exclude-env ACTIONS_ID_TOKEN_REQUEST_URL --exclude-env COPILOT_GITHUB_TOKEN --exclude-env GH_TOKEN --exclude-env GITHUB_MCP_SERVER_TOKEN --exclude-env MCP_GATEWAY_AGENT_ID --mount /tmp/gh-aw:/tmp/gh-aw:rw --log-level info --skip-pull --difc-proxy-host awmg-cli-proxy:18443 --difc-proxy-ca-cert /tmp/gh-aw/difc-proxy-tls/ca.crt \
+            -- /bin/bash -c 'set +o histexpand; export PATH="${RUNNER_TEMP}/gh-aw/mcp-cli/bin:$PATH" && : "${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"; GH_AW_TOOL_CACHE="$RUNNER_TOOL_CACHE"; GH_AW_TOOL_BINS="$(find "$GH_AW_TOOL_CACHE" -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')"; GH_AW_TOOL_BINS="${GH_AW_TOOL_BINS%:}"; export PATH="$PATH${GH_AW_TOOL_BINS:+:}$GH_AW_TOOL_BINS"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true; [ -n "$ERLANG_HOME" ] && export PATH="$ERLANG_HOME/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || true)"; fi; if [ -z "$GH_AW_NODE_EXEC" ]; then echo "node runtime missing on this runner — check runtimes.node in workflow YAML" >&2; exit 127; fi; GH_AW_NPM_GLOBAL_ROOT="$(npm root -g 2>/dev/null || true)"; if [ -n "$GH_AW_NPM_GLOBAL_ROOT" ]; then export NODE_PATH="${GH_AW_NPM_GLOBAL_ROOT}${NODE_PATH:+:${NODE_PATH}}"; fi; "$GH_AW_NODE_EXEC" "${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs" "${RUNNER_TEMP}/gh-aw/bin/copilot" --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-all-tools --allow-all-paths --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt'
+        env:
+          AWF_REFLECT_ENABLED: 1
+          COPILOT_AGENT_RUNNER_TYPE: STANDALONE
+          COPILOT_DUMMY_BYOK: dummy-byok-key-for-offline-mode
+          COPILOT_GITHUB_TOKEN: ${{ github.token }}
+          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || vars.GH_AW_DEFAULT_MODEL_COPILOT || 'auto' }}
+          GH_AW_LLM_PROVIDER: github
+          GH_AW_MAX_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_MAX_AI_CREDITS || '1000' }}
+          GH_AW_MAX_TURNS: ${{ vars.GH_AW_DEFAULT_MAX_TURNS || '' }}
+          GH_AW_PHASE: agent
+          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+          GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
+          GH_AW_TIMEOUT_MINUTES: 180
+          GH_AW_VERSION: v0.88.7
+          GH_TOKEN: ${{ secrets.GH_AW_GITHUB_TOKEN || github.token }}
+          GITHUB_API_URL: ${{ github.api_url }}
+          GITHUB_AW: true
+          GITHUB_COPILOT_INTEGRATION_ID: agentic-workflows
+          GITHUB_HEAD_REF: ${{ github.head_ref }}
+          GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          GITHUB_REF_NAME: ${{ github.ref_name }}
+          GITHUB_SERVER_URL: ${{ github.server_url }}
+          GITHUB_STEP_SUMMARY: /tmp/gh-aw/agent-step-summary.md
+          GITHUB_WORKSPACE: ${{ github.workspace }}
+          GIT_AUTHOR_EMAIL: github-actions[bot]@users.noreply.github.com
+          GIT_AUTHOR_NAME: github-actions[bot]
+          GIT_COMMITTER_EMAIL: github-actions[bot]@users.noreply.github.com
+          GIT_COMMITTER_NAME: github-actions[bot]
+          RUNNER_TEMP: ${{ runner.temp }}
+          S2STOKENS: true
+          TRACEPARENT: ${{ env.GITHUB_AW_OTEL_TRACE_ID != '' && env.GITHUB_AW_OTEL_PARENT_SPAN_ID != '' && format('00-{0}-{1}-01', env.GITHUB_AW_OTEL_TRACE_ID, env.GITHUB_AW_OTEL_PARENT_SPAN_ID) || '' }}
+      - name: Stop CLI Proxy
+        if: always()
+        continue-on-error: true
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/stop_cli_proxy.sh"
+      - name: Detect agent errors
+        if: always()
+        id: detect-agent-errors
+        continue-on-error: true
+        env:
+          GH_AW_AGENTIC_EXECUTION_OUTCOME: ${{ steps.agentic_execution.outcome }}
+          GH_AW_ENGINE_STEP_TIMEOUT_MINUTES: 180
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'detect_agent_errors.cjs'));
+            await main();
+      - name: Configure Git credentials
+        env:
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          GITHUB_SERVER_URL: ${{ github.server_url }}
+          GITHUB_TOKEN: ${{ github.token }}
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/configure_git_credentials.sh"
+      - name: Copy Copilot session state files to logs
+        if: always()
+        continue-on-error: true
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/copy_copilot_session_state.sh"
+      - name: Stop MCP Gateway
+        if: always()
+        continue-on-error: true
+        env:
+          MCP_GATEWAY_PORT: ${{ steps.start-mcp-gateway.outputs.gateway-port }}
+          MCP_GATEWAY_AGENT_ID: ${{ steps.start-mcp-gateway.outputs.gateway-agent-id }}
+          GATEWAY_PID: ${{ steps.start-mcp-gateway.outputs.gateway-pid }}
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/stop_mcp_gateway.sh" "$GATEWAY_PID"
+      - name: Redact secrets in logs
+        if: always()
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'redact_secrets.cjs'));
+            await main();
+        env:
+          GH_AW_SECRET_NAMES: 'GH_AW_GITHUB_MCP_SERVER_TOKEN,GH_AW_GITHUB_TOKEN,GITHUB_TOKEN'
+          SECRET_GH_AW_GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN }}
+          SECRET_GH_AW_GITHUB_TOKEN: ${{ secrets.GH_AW_GITHUB_TOKEN }}
+          SECRET_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Append agent step summary
+        if: always()
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/append_agent_step_summary.sh"
+      - name: Copy Safe Outputs
+        if: always()
+        env:
+          GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
+        run: |
+          mkdir -p /tmp/gh-aw
+          cp "$GH_AW_SAFE_OUTPUTS" /tmp/gh-aw/safeoutputs.jsonl 2>/dev/null || true
+      - name: Ingest agent output
+        id: collect_output
+        if: always()
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
+          GH_AW_ALLOWED_DOMAINS: "*.githubusercontent.com,*.pythonhosted.org,anaconda.org,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,bcr.bazel.build,binstar.org,blog.bazel.build,bootstrap.pypa.io,codeload.github.com,conda.anaconda.org,conda.binstar.org,crates.io,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,docs.github.com,files.pythonhosted.org,github-cloud.githubusercontent.com,github-cloud.s3.amazonaws.com,github.blog,github.com,github.githubassets.com,index.crates.io,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,lfs.github.com,mirror.bazel.build,objects.githubusercontent.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,patch-diff.githubusercontent.com,patchdiff.githubusercontent.com,pip.pypa.io,ppa.launchpad.net,productionresultssa0.blob.core.windows.net,productionresultssa1.blob.core.windows.net,productionresultssa10.blob.core.windows.net,productionresultssa11.blob.core.windows.net,productionresultssa12.blob.core.windows.net,productionresultssa13.blob.core.windows.net,productionresultssa14.blob.core.windows.net,productionresultssa15.blob.core.windows.net,productionresultssa16.blob.core.windows.net,productionresultssa17.blob.core.windows.net,productionresultssa18.blob.core.windows.net,productionresultssa19.blob.core.windows.net,productionresultssa2.blob.core.windows.net,productionresultssa3.blob.core.windows.net,productionresultssa4.blob.core.windows.net,productionresultssa5.blob.core.windows.net,productionresultssa6.blob.core.windows.net,productionresultssa7.blob.core.windows.net,productionresultssa8.blob.core.windows.net,productionresultssa9.blob.core.windows.net,pypi.org,pypi.python.org,raw.githubusercontent.com,releases.bazel.build,repo.anaconda.com,repo.continuum.io,s.symcb.com,s.symcd.com,security.ubuntu.com,sh.rustup.rs,static.crates.io,static.rust-lang.org,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
+          GITHUB_SERVER_URL: ${{ github.server_url }}
+          GITHUB_API_URL: ${{ github.api_url }}
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'collect_ndjson_output.cjs'));
+            await main();
+      - name: Parse agent logs for step summary
+        if: always()
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_AGENT_OUTPUT: /tmp/gh-aw/sandbox/agent/logs/
+          GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'parse_copilot_log.cjs'));
+            await main();
+      - name: Parse MCP Gateway logs for step summary
+        if: always()
+        id: parse-mcp-gateway
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'parse_mcp_gateway_log.cjs'));
+            await main();
+      - name: Print firewall logs
+        if: always()
+        continue-on-error: true
+        env:
+          AWF_LOGS_DIR: /tmp/gh-aw/sandbox/firewall/logs
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/print_firewall_logs.sh" --rootless
+      - name: Parse token usage for step summary
+        if: always()
+        continue-on-error: true
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'parse_token_usage.cjs'));
+            await main();
+      - name: Print AWF reflect summary
+        if: always()
+        continue-on-error: true
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'awf_reflect_summary.cjs'));
+            await main();
+      - name: Generate observability summary
+        if: always()
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'generate_observability_summary.cjs'));
+            await main(core);
+      - name: Write agent output placeholder if missing
+        if: always()
+        run: |
+          if [ ! -f /tmp/gh-aw/agent_output.json ]; then
+            echo '{"items":[]}' > /tmp/gh-aw/agent_output.json
+          fi
+      # Small dedicated copy of the agent output so safe-output processing
+      # survives a failed or timed-out upload of the larger agent artifact
+      - name: Upload agent output fallback artifact
+        if: always()
+        continue-on-error: true
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: agent-output-fallback
+          path: |
+            /tmp/gh-aw/agent_output.json
+            /tmp/gh-aw/safeoutputs.jsonl
+          if-no-files-found: ignore
+      - name: Upload agent artifacts
+        if: always()
+        continue-on-error: true
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: agent
+          path: |
+            /tmp/gh-aw/aw-prompts/prompt.txt
+            /tmp/gh-aw/sandbox/agent/logs/
+            /tmp/gh-aw/redacted-urls.log
+            /tmp/gh-aw/mcp-logs/
+            /tmp/gh-aw/agent_usage.json
+            /tmp/gh-aw/agent-stdio.log
+            /tmp/gh-aw/pre-agent-audit.txt
+            /tmp/gh-aw/github_rate_limits.jsonl
+            /tmp/gh-aw/otel.jsonl
+            /tmp/gh-aw/otlp-export-errors.jsonl
+            /tmp/gh-aw/safeoutputs.jsonl
+            /tmp/gh-aw/agent_output.json
+            /tmp/gh-aw/aw-*.patch
+            /tmp/gh-aw/aw-*.bundle
+            /tmp/gh-aw/awf-config.json
+            /tmp/gh-aw/sandbox/firewall/logs/
+            /tmp/gh-aw/sandbox/firewall/audit/
+            /tmp/gh-aw/sandbox/firewall/awf-reflect.json
+          if-no-files-found: ignore
+
+  conclusion:
+    needs:
+      - activation
+      - agent
+      - detection
+      - safe_outputs
+    if: >
+      always() && (needs.agent.result != 'skipped' || needs.activation.outputs.lockdown_check_failed == 'true' ||
+      needs.activation.outputs.oauth_token_check_failed == 'true' || needs.activation.outputs.stale_lock_file_failed == 'true' ||
+      needs.activation.outputs.daily_ai_credits_exceeded == 'true')
+    runs-on: ubuntu-slim
+    permissions:
+      actions: read
+      contents: write
+      issues: write
+      pull-requests: write
+    concurrency:
+      group: "gh-aw-conclusion-update-rust-analyzer"
+      cancel-in-progress: false
+      queue: max
+    env:
+      GH_AW_RUNTIME_FEATURES: ${{ vars.GH_AW_RUNTIME_FEATURES }}
+    outputs:
+      incomplete_count: ${{ steps.report_incomplete.outputs.incomplete_count }}
+      noop_message: ${{ steps.noop.outputs.noop_message }}
+      tools_reported: ${{ steps.missing_tool.outputs.tools_reported }}
+      total_count: ${{ steps.missing_tool.outputs.total_count }}
+    steps:
+      - name: Setup Scripts
+        id: setup
+        uses: github/gh-aw-actions/setup@5e508589e03a7757a7e05b26e834292f5445bfb6 # v0.88.7
+        with:
+          destination: ${{ runner.temp }}/gh-aw/actions
+          job-name: ${{ github.job }}
+          trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+          parent-span-id: ${{ needs.activation.outputs.setup-parent-span-id || needs.activation.outputs.setup-span-id }}
+        env:
+          GH_AW_SETUP_WORKFLOW_NAME: "Update rust-analyzer"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/update-rust-analyzer.lock.yml@${{ github.ref }}
+          GH_AW_INFO_VERSION: "1.0.80"
+          GH_AW_INFO_AWF_VERSION: "v0.28.14"
+          GH_AW_INFO_ENGINE_ID: "copilot"
+      - name: Download agent output artifact
+        id: download-agent-output
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          pattern: "{agent,agent-output-fallback}"
+          merge-multiple: true
+          path: /tmp/gh-aw/
+      - name: Setup agent output environment variable
+        id: setup-agent-output-env
+        if: steps.download-agent-output.outcome == 'success'
+        run: |
+          mkdir -p /tmp/gh-aw/
+          find "/tmp/gh-aw/" -type f -print
+          if [ -f "/tmp/gh-aw/agent_output.json" ]; then
+            echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Download detection artifact
+        id: download-detection-artifact
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: detection
+          path: /tmp/gh-aw/threat-detection/
+      - name: Download Safe Outputs Items Manifest
+        id: download-safe-outputs-manifest
+        if: always()
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          pattern: safe-outputs-items
+          merge-multiple: true
+          path: /tmp/gh-aw/
+      - name: Collect usage artifact files
+        if: always()
+        continue-on-error: true
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/collect_usage_artifact_files.sh"
+      - name: Upload usage artifact
+        if: always()
+        continue-on-error: true
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: usage
+          path: |
+            /tmp/gh-aw/usage/aw_info.json
+            /tmp/gh-aw/usage/aw-info.jsonl
+            /tmp/gh-aw/usage/agent_usage.json
+            /tmp/gh-aw/usage/agent_usage.jsonl
+            /tmp/gh-aw/usage/detection_usage.jsonl
+            /tmp/gh-aw/usage/evals.jsonl
+            /tmp/gh-aw/usage/graders/grader_manifest.json
+            /tmp/gh-aw/usage/graders/grader_results.json
+            /tmp/gh-aw/usage/github_rate_limits.jsonl
+            /tmp/gh-aw/usage/agent/token_usage.jsonl
+            /tmp/gh-aw/usage/detection/token_usage.jsonl
+            /tmp/gh-aw/usage/activity/summary.json
+          if-no-files-found: ignore
+      - name: Restore daily AIC usage cache
+        id: restore-daily-aic-cache-conclusion
+        if: always()
+        continue-on-error: true
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          key: agentic-workflow-usage-updaterustanalyzer-${{ github.run_id }}
+          restore-keys: agentic-workflow-usage-updaterustanalyzer-
+          path: /tmp/gh-aw/agentic-workflow-usage-cache.jsonl
+      - name: Write daily AIC usage cache entry
+        id: write-daily-aic-cache
+        if: always()
+        continue-on-error: true
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          github-token: ${{ github.token }}
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context);
+            const { main } = require(path.join(actionsDir, 'write_daily_aic_usage_cache.cjs'));
+            await main();
+      - name: Save daily AIC usage cache
+        id: save-daily-aic-cache
+        if: always()
+        continue-on-error: true
+        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          key: agentic-workflow-usage-updaterustanalyzer-${{ github.run_id }}
+          path: /tmp/gh-aw/agentic-workflow-usage-cache.jsonl
+      - name: Upload daily AIC usage cache artifact
+        id: upload-daily-aic-cache
+        if: always()
+        continue-on-error: true
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: aic-usage-cache
+          path: /tmp/gh-aw/agentic-workflow-usage-cache.jsonl
+          if-no-files-found: ignore
+          retention-days: 7
+      - name: Process no-op messages
+        id: noop
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_NOOP_MAX: "1"
+          GH_AW_WORKFLOW_NAME: "Update rust-analyzer"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/update-rust-analyzer.md"
+          GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
+          GH_AW_NOOP_REPORT_AS_ISSUE: "false"
+          GH_AW_AIC: ${{ needs.agent.outputs.aic }}
+          GH_AW_THREAT_DETECTION_AIC: ${{ needs.detection.outputs.aic }}
+          GH_AW_AMBIENT_CONTEXT: ${{ needs.agent.outputs.ambient_context }}
+          GH_AW_WORKFLOW_ID: "update-rust-analyzer"
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'handle_noop_message.cjs'));
+            await main();
+      - name: Log detection run
+        id: detection_runs
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_WORKFLOW_NAME: "Update rust-analyzer"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/update-rust-analyzer.md"
+          GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          GH_AW_DETECTION_CONCLUSION: ${{ needs.detection.outputs.detection_conclusion }}
+          GH_AW_DETECTION_REASON: ${{ needs.detection.outputs.detection_reason }}
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'handle_detection_runs.cjs'));
+            await main();
+      - name: Record missing tool
+        id: missing_tool
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_MISSING_TOOL_CREATE_ISSUE: "true"
+          GH_AW_WORKFLOW_NAME: "Update rust-analyzer"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/update-rust-analyzer.md"
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'missing_tool.cjs'));
+            await main();
+      - name: Record incomplete
+        id: report_incomplete
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_REPORT_INCOMPLETE_CREATE_ISSUE: "true"
+          GH_AW_REPORT_INCOMPLETE_TITLE_PREFIX: "[incomplete]"
+          GH_AW_WORKFLOW_NAME: "Update rust-analyzer"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/update-rust-analyzer.md"
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'report_incomplete_handler.cjs'));
+            await main();
+      - name: Handle agent failure
+        id: handle_agent_failure
+        if: always()
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_WORKFLOW_NAME: "Update rust-analyzer"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/update-rust-analyzer.md"
+          GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
+          GH_AW_WORKFLOW_ID: "update-rust-analyzer"
+          GH_AW_ACTION_FAILURE_ISSUE_EXPIRES_HOURS: "0"
+          GH_AW_ENGINE_ID: "copilot"
+          GH_AW_CHECKOUT_PR_SUCCESS: ${{ needs.agent.outputs.checkout_pr_success }}
+          GH_AW_EFFECTIVE_TOKENS: ${{ needs.agent.outputs.effective_tokens || '' }}
+          GH_AW_AI_CREDITS_RATE_LIMIT_ERROR: ${{ needs.agent.outputs.ai_credits_rate_limit_error || 'false' }}
+          GH_AW_UNKNOWN_MODEL_AI_CREDITS: ${{ needs.agent.outputs.unknown_model_ai_credits || 'false' }}
+          GH_AW_AIC: ${{ needs.agent.outputs.aic }}
+          GH_AW_THREAT_DETECTION_AIC: ${{ needs.detection.outputs.aic }}
+          GH_AW_MAX_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_MAX_AI_CREDITS || '1000' }}
+          GH_AW_INFERENCE_ACCESS_ERROR: ${{ needs.agent.outputs.inference_access_error }}
+          GH_AW_MCP_POLICY_ERROR: ${{ needs.agent.outputs.mcp_policy_error }}
+          GH_AW_AGENTIC_ENGINE_TIMEOUT: ${{ needs.agent.outputs.agentic_engine_timeout }}
+          GH_AW_MODEL_NOT_SUPPORTED_ERROR: ${{ needs.agent.outputs.model_not_supported_error }}
+          GH_AW_HTTP_400_RESPONSE_ERROR: ${{ needs.agent.outputs.http_400_response_error }}
+          GH_AW_MAX_CACHE_MISSES_EXCEEDED: ${{ needs.agent.outputs.max_cache_misses_exceeded }}
+          GH_AW_MISSING_MODEL_PRICING_ERROR: ${{ needs.agent.outputs.missing_model_pricing_error }}
+          GH_AW_MISSING_MODEL_PRICING_MODEL_NAME: ${{ needs.agent.outputs.missing_model_pricing_model_name }}
+          GH_AW_SHELL_EXPANSION_GUARD_REJECTED: ${{ needs.agent.outputs.shell_expansion_guard_rejected }}
+          GH_AW_ENGINE_API_HOSTS: "api.enterprise.githubcopilot.com,api.githubcopilot.com,api.business.githubcopilot.com,api.individual.githubcopilot.com"
+          GH_AW_CODE_PUSH_FAILURE_ERRORS: ${{ needs.safe_outputs.outputs.code_push_failure_errors }}
+          GH_AW_CODE_PUSH_FAILURE_COUNT: ${{ needs.safe_outputs.outputs.code_push_failure_count }}
+          GH_AW_LOCKDOWN_CHECK_FAILED: ${{ needs.activation.outputs.lockdown_check_failed }}
+          GH_AW_OAUTH_TOKEN_CHECK_FAILED: ${{ needs.activation.outputs.oauth_token_check_failed }}
+          GH_AW_STALE_LOCK_FILE_FAILED: ${{ needs.activation.outputs.stale_lock_file_failed }}
+          GH_AW_DAILY_AI_CREDITS_EXCEEDED: ${{ needs.activation.outputs.daily_ai_credits_exceeded }}
+          GH_AW_DAILY_AI_CREDITS_TOTAL_EFFECTIVE_TOKENS: ${{ needs.activation.outputs.daily_ai_credits_total_effective_tokens }}
+          GH_AW_DAILY_AI_CREDITS_THRESHOLD: ${{ needs.activation.outputs.daily_ai_credits_threshold }}
+          GH_AW_GROUP_REPORTS: "false"
+          GH_AW_FAILURE_REPORT_AS_ISSUE: "true"
+          GH_AW_MISSING_TOOL_REPORT_AS_FAILURE: "true"
+          GH_AW_MISSING_DATA_REPORT_AS_FAILURE: "true"
+          GH_AW_TIMEOUT_MINUTES: "180"
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'handle_agent_failure.cjs'));
+            await main();
+      - name: Report failed jobs
+        id: report_failed_jobs
+        if: always()
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_WORKFLOW_NAME: "Update rust-analyzer"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/update-rust-analyzer.md"
+          GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          GH_AW_REPORT_FAILED_JOBS: "true"
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'report_failed_jobs.cjs'));
+            await main();
+
+  detection:
+    needs:
+      - activation
+      - agent
+    if: always() && needs.agent.result != 'skipped'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      copilot-requests: write
+    timeout-minutes: 10
+    env:
+      GH_AW_RUNTIME_FEATURES: ${{ vars.GH_AW_RUNTIME_FEATURES }}
+    outputs:
+      aic: ${{ steps.parse_detection_token_usage.outputs.aic }}
+      detection_conclusion: ${{ steps.detection_conclusion.outputs.conclusion }}
+      detection_reason: ${{ steps.detection_conclusion.outputs.reason }}
+      detection_success: ${{ steps.detection_conclusion.outputs.success }}
+    steps:
+      - name: Setup Scripts
+        id: setup
+        uses: github/gh-aw-actions/setup@5e508589e03a7757a7e05b26e834292f5445bfb6 # v0.88.7
+        with:
+          destination: ${{ runner.temp }}/gh-aw/actions
+          job-name: ${{ github.job }}
+          trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+          parent-span-id: ${{ needs.activation.outputs.setup-parent-span-id || needs.activation.outputs.setup-span-id }}
+        env:
+          GH_AW_SETUP_WORKFLOW_NAME: "Update rust-analyzer"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/update-rust-analyzer.lock.yml@${{ github.ref }}
+          GH_AW_INFO_VERSION: "1.0.80"
+          GH_AW_INFO_AWF_VERSION: "v0.28.14"
+          GH_AW_INFO_ENGINE_ID: "copilot"
+      - name: Download activation artifact
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: activation
+          path: /tmp/gh-aw
+      - name: Download agent output artifact
+        id: download-agent-output
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          pattern: "{agent,agent-output-fallback}"
+          merge-multiple: true
+          path: /tmp/gh-aw/
+      - name: Setup agent output environment variable
+        id: setup-agent-output-env
+        if: steps.download-agent-output.outcome == 'success'
+        run: |
+          mkdir -p /tmp/gh-aw/
+          find "/tmp/gh-aw/" -type f -print
+          if [ -f "/tmp/gh-aw/agent_output.json" ]; then
+            echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Checkout repository for patch context
+        if: needs.agent.outputs.has_patch == 'true'
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+      # --- Threat Detection ---
+      - name: Clean stale firewall files from agent artifact
+        run: |
+          rm -rf /tmp/gh-aw/sandbox/firewall/logs
+          rm -rf /tmp/gh-aw/sandbox/firewall/audit
+      - name: Download container images
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.28.14@sha256:f7df036c86575527b61f3f7df91c4412349a12b2a74988d929eafa2999230c98 ghcr.io/github/gh-aw-firewall/api-proxy:0.28.14@sha256:6f95e2234dd9bd6333a8ff28ccea7ecf0204acd4a09108723844dbd2bf6268c5 ghcr.io/github/gh-aw-firewall/squid:0.28.14@sha256:2ce8df3abf3e9b76e9c0cf5863da41f1ab3f89b20ad14b988806ab89e7bf2cd5
+      - name: Check if detection needed
+        id: detection_guard
+        if: always()
+        env:
+          OUTPUT_TYPES: ${{ needs.agent.outputs.output_types }}
+          HAS_PATCH: ${{ needs.agent.outputs.has_patch }}
+        run: |
+          if [[ -n "$OUTPUT_TYPES" || "$HAS_PATCH" == "true" ]]; then
+            echo "run_detection=true" >> "$GITHUB_OUTPUT"
+            echo "Detection will run: output_types=$OUTPUT_TYPES, has_patch=$HAS_PATCH"
+          else
+            echo "run_detection=false" >> "$GITHUB_OUTPUT"
+            echo "Detection skipped: no agent outputs or patches to analyze"
+          fi
+      - name: Clear MCP Config for detection
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        run: |
+          rm -f "${RUNNER_TEMP}/gh-aw/mcp-config/mcp-servers.json"
+          rm -f "$HOME/.copilot/mcp-config.json"
+          rm -f "$GITHUB_WORKSPACE/.gemini/settings.json"
+      - name: Prepare threat detection files
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/prepare_threat_detection_files.sh"
+      - name: Setup threat detection
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          WORKFLOW_NAME: "Update rust-analyzer"
+          WORKFLOW_DESCRIPTION: "Update the rust-analyzer version used by the Rust extractor and prepare a pull request."
+          HAS_PATCH: ${{ needs.agent.outputs.has_patch }}
+          GH_AW_DETECTION_CONTINUE_ON_ERROR: "true"
+          GH_AW_DETECTION_SKIP_PROMPT_SUMMARY: "true"
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'setup_threat_detection.cjs'));
+            await main();
+      - name: Ensure threat-detection directory and log
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        run: |
+          mkdir -p /tmp/gh-aw/threat-detection
+          touch /tmp/gh-aw/threat-detection/detection.log
+      - name: Install AWF binary
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.28.14 --rootless
+      - name: Setup Node.js
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        with:
+          node-version: '24'
+          package-manager-cache: false
+      - name: Install GitHub Copilot CLI
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh"
+        env:
+          GH_HOST: github.com
+          GH_AW_COMPILED_VERSION: v0.88.7
+      - name: Install threat-detect binary
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        continue-on-error: true
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/install_threat_detect_binary.sh" v0.5.1
+      - name: Execute threat detection with AWF
+        id: detection_agentic_execution
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        continue-on-error: true
+        timeout-minutes: 10
+        env:
+          AWF_REFLECT_ENABLED: 1
+          COPILOT_AGENT_RUNNER_TYPE: STANDALONE
+          COPILOT_DUMMY_BYOK: dummy-byok-key-for-offline-mode
+          COPILOT_GITHUB_TOKEN: ${{ github.token }}
+          COPILOT_MODEL: detection
+          GH_AW_HARNESS_MAX_RETRIES: 0
+          GH_AW_LLM_PROVIDER: github
+          GH_AW_MAX_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_DETECTION_MAX_AI_CREDITS || '400' }}
+          GH_AW_MAX_TURNS: ${{ vars.GH_AW_DEFAULT_MAX_TURNS || '' }}
+          GH_AW_PHASE: detection
+          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+          GH_AW_TIMEOUT_MINUTES: 10
+          GH_AW_VERSION: v0.88.7
+          GITHUB_API_URL: ${{ github.api_url }}
+          GITHUB_AW: true
+          GITHUB_COPILOT_INTEGRATION_ID: agentic-workflows
+          GITHUB_HEAD_REF: ${{ github.head_ref }}
+          GITHUB_REF_NAME: ${{ github.ref_name }}
+          GITHUB_SERVER_URL: ${{ github.server_url }}
+          GITHUB_STEP_SUMMARY: /tmp/gh-aw/agent-step-summary.md
+          GITHUB_WORKSPACE: ${{ github.workspace }}
+          GIT_AUTHOR_EMAIL: github-actions[bot]@users.noreply.github.com
+          GIT_AUTHOR_NAME: github-actions[bot]
+          GIT_COMMITTER_EMAIL: github-actions[bot]@users.noreply.github.com
+          GIT_COMMITTER_NAME: github-actions[bot]
+          RUNNER_TEMP: ${{ runner.temp }}
+          S2STOKENS: true
+          TRACEPARENT: ${{ env.GITHUB_AW_OTEL_TRACE_ID != '' && env.GITHUB_AW_OTEL_PARENT_SPAN_ID != '' && format('00-{0}-{1}-01', env.GITHUB_AW_OTEL_TRACE_ID, env.GITHUB_AW_OTEL_PARENT_SPAN_ID) || '' }}
+          WORKFLOW_NAME: "Update rust-analyzer"
+          WORKFLOW_DESCRIPTION: "Update the rust-analyzer version used by the Rust extractor and prepare a pull request."
+          HAS_PATCH: ${{ needs.agent.outputs.has_patch }}
+          GH_AW_DETECTION_CONTINUE_ON_ERROR: "true"
+        run: |
+          set -o pipefail
+          printf '%s' "$(date +%s%3N)" > /tmp/gh-aw/agent_cli_start_ms.txt
+          GH_AW_COPILOT_SRC="$(command -v copilot 2>/dev/null || true)"
+          if [ -z "$GH_AW_COPILOT_SRC" ] || [ ! -x "$GH_AW_COPILOT_SRC" ]; then
+            echo "GitHub Copilot CLI executable not found on PATH after installation" >&2
+            exit 127
+          fi
+          GH_AW_COPILOT_BIN="${RUNNER_TEMP}/gh-aw/bin/copilot"
+          mkdir -p "${RUNNER_TEMP}/gh-aw/bin"
+          if [ "$GH_AW_COPILOT_SRC" != "$GH_AW_COPILOT_BIN" ]; then
+            cp "$GH_AW_COPILOT_SRC" "$GH_AW_COPILOT_BIN"
+          fi
+          chmod 755 "$GH_AW_COPILOT_BIN"
+
+          (umask 177 && touch /tmp/gh-aw/threat-detection/detection.log)
+          GH_AW_MAX_AI_CREDITS="${GH_AW_MAX_AI_CREDITS:-400}"
+          if [[ ! "$GH_AW_MAX_AI_CREDITS" =~ ^[0-9]+$ ]]; then
+            GH_AW_MAX_AI_CREDITS="400"
+          fi
+          printf '%s\n' "{\"\$schema\":\"https://github.com/github/gh-aw-firewall/releases/download/v0.28.14/awf-config.schema.json\",\"apiProxy\":{\"enabled\":true,\"enableTokenSteering\":true,\"maxRuns\":500,\"maxAiCredits\":${GH_AW_MAX_AI_CREDITS},\"maxCacheMisses\":5,\"models\":{\"agent\":[\"sonnet-6x\",\"gpt-5.4\",\"gpt-5.5\",\"gpt-5.6\",\"gpt-5.3\",\"gemini-pro\",\"any\"],\"antigravity\":[\"copilot/antigravity*\",\"google/antigravity*\",\"gemini/antigravity*\"],\"any\":[\"copilot/*\",\"anthropic/*\",\"openai/*\",\"google/*\",\"gemini/*\"],\"auto\":[\"copilot/auto\",\"large\"],\"claude\":[\"agent\"],\"codex\":[\"agent\"],\"coding\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\",\"gpt-5-codex\",\"kimi\"],\"computer-use\":[\"copilot/*computer-use*\",\"google/*computer-use*\",\"gemini/*computer-use*\",\"openai/*computer-use*\"],\"copilot\":[\"agent\"],\"deep-research\":[\"copilot/deep-research*\",\"copilot/o3-deep-research*\",\"copilot/o4-mini-deep-research*\",\"google/deep-research*\",\"gemini/deep-research*\",\"openai/o3-deep-research*\",\"openai/o4-mini-deep-research*\"],\"detection\":[\"small\"],\"evals\":[\"small\"],\"fable\":[\"copilot/*fable*\",\"anthropic/*fable*\"],\"gemini\":[\"agent\"],\"gemini-3-flash\":[\"copilot/gemini-3*flash*\",\"google/gemini-3*flash*\",\"gemini/gemini-3*flash*\"],\"gemini-3-pro\":[\"copilot/gemini-3*pro*\",\"google/gemini-3*pro*\",\"google/nano-banana*\",\"gemini/gemini-3*pro*\"],\"gemini-3.1-flash\":[\"copilot/gemini-3.1*flash*\",\"google/gemini-3.1*flash*\",\"gemini/gemini-3.1*flash*\"],\"gemini-3.1-pro\":[\"copilot/gemini-3.1*pro*\",\"google/gemini-3.1*pro*\",\"gemini/gemini-3.1*pro*\"],\"gemini-3.5-flash\":[\"copilot/gemini-3.5*flash*\",\"google/gemini-3.5*flash*\",\"gemini/gemini-3.5*flash*\"],\"gemini-3.6-flash\":[\"copilot/gemini-3.6*flash*\",\"google/gemini-3.6*flash*\",\"gemini/gemini-3.6*flash*\"],\"gemini-3.7-flash\":[\"copilot/gemini-3.7*flash*\",\"google/gemini-3.7*flash*\",\"gemini/gemini-3.7*flash*\"],\"gemini-flash\":[\"copilot/gemini-*flash*\",\"google/gemini-*flash*\",\"gemini/gemini-*flash*\"],\"gemini-flash-lite\":[\"copilot/gemini-*flash*lite*\",\"google/gemini-*flash*lite*\",\"gemini/gemini-*flash*lite*\"],\"gemini-omni\":[\"copilot/gemini-omni*\",\"google/gemini-omni*\",\"gemini/gemini-omni*\"],\"gemini-pro\":[\"copilot/gemini-*pro*\",\"google/gemini-*pro*\",\"gemini/gemini-*pro*\"],\"gemma\":[\"copilot/gemma*\",\"google/gemma*\",\"gemini/gemma*\"],\"gpt-5\":[\"copilot/gpt-5*\",\"openai/gpt-5*\"],\"gpt-5-codex\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\"],\"gpt-5-mini\":[\"copilot/gpt-5*mini*\",\"openai/gpt-5*mini*\"],\"gpt-5-nano\":[\"copilot/gpt-5*nano*\",\"openai/gpt-5*nano*\"],\"gpt-5-pro\":[\"copilot/gpt-5*pro*\",\"openai/gpt-5*pro*\"],\"gpt-5.1\":[\"copilot/gpt-5.1*\",\"openai/gpt-5.1*\"],\"gpt-5.2\":[\"copilot/gpt-5.2*\",\"openai/gpt-5.2*\"],\"gpt-5.3\":[\"copilot/gpt-5.3*\",\"openai/gpt-5.3*\"],\"gpt-5.4\":[\"copilot/gpt-5.4*\",\"openai/gpt-5.4*\"],\"gpt-5.5\":[\"copilot/gpt-5.5*\",\"openai/gpt-5.5*\"],\"gpt-5.6\":[\"copilot/gpt-5.6*\",\"openai/gpt-5.6*\"],\"grok\":[\"copilot/*grok*\",\"openai/*grok*\"],\"haiku\":[\"copilot/*haiku*\",\"anthropic/*haiku*\"],\"image-generation\":[\"copilot/gpt-image*\",\"openai/gpt-image*\",\"openai/chatgpt-image*\",\"copilot/gemini-*image*\",\"google/gemini-*image*\",\"gemini/gemini-*image*\",\"google/imagen*\"],\"kimi\":[\"copilot/kimi*\",\"openai/kimi*\"],\"kiwi\":[\"copilot/kiwi*\",\"openai/kiwi*\"],\"large\":[\"sonnet\",\"gpt-5-pro\",\"gpt-5\",\"gemini-pro\"],\"lyria\":[\"google/lyria*\",\"gemini/lyria*\",\"copilot/lyria*\"],\"mai-code\":[\"copilot/MAI-Code*\",\"copilot/mai-code*\",\"openai/MAI-Code*\"],\"mai-code-1-flash-picker\":[\"copilot/MAI-Code-1-Flash-picker*\",\"copilot/mai-code-1-flash-picker*\",\"openai/MAI-Code-1-Flash-picker*\"],\"mini\":[\"haiku\",\"gpt-5-mini\",\"gpt-5-nano\",\"gemini-flash-lite\"],\"nano-banana\":[\"copilot/nano-banana*\",\"google/nano-banana*\",\"gemini/nano-banana*\"],\"opus\":[\"copilot/*opus*\",\"anthropic/*opus*\"],\"opusplan\":[\"opus?effort=high\"],\"raptor-mini\":[\"copilot/raptor*\",\"openai/raptor*\"],\"reasoning\":[\"copilot/o1*\",\"copilot/o3*\",\"copilot/o4*\",\"openai/o1*\",\"openai/o3*\",\"openai/o4*\"],\"robotics\":[\"copilot/*robotics*\",\"google/*robotics*\",\"gemini/*robotics*\"],\"small\":[\"mini\"],\"small-agent\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash\"],\"sonnet\":[\"copilot/*sonnet*\",\"anthropic/*sonnet*\"],\"sonnet-6x\":[\"copilot/*sonnet-4.5*\",\"copilot/*sonnet-4.6*\",\"copilot/*sonnet-5*\",\"copilot/*sonnet-4-5-*\",\"anthropic/*sonnet-4-5-*\",\"copilot/*sonnet-4-6*\",\"anthropic/*sonnet-4-6*\",\"anthropic/*sonnet-5*\"],\"summarization\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash-lite\",\"mini\"],\"veo\":[\"google/veo*\",\"gemini/veo*\"],\"vision\":[\"copilot/gemini-*image*\",\"google/gemini-*image*\",\"gemini/gemini-*image*\",\"copilot/gemini-*flash*\",\"google/gemini-*flash*\",\"gemini/gemini-*flash*\"]}},\"container\":{\"imageTag\":\"0.28.14,squid=sha256:2ce8df3abf3e9b76e9c0cf5863da41f1ab3f89b20ad14b988806ab89e7bf2cd5,agent=sha256:f7df036c86575527b61f3f7df91c4412349a12b2a74988d929eafa2999230c98,api-proxy=sha256:6f95e2234dd9bd6333a8ff28ccea7ecf0204acd4a09108723844dbd2bf6268c5,cli-proxy=sha256:3a379c5e96e29499c815e9dd2a71334d01c326a9b73991c76544fda9cae35c34\"},\"logging\":{\"proxyLogsDir\":\"/tmp/gh-aw/sandbox/firewall/logs\",\"auditDir\":\"/tmp/gh-aw/sandbox/firewall/audit\"}}" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
+          cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
+          export GH_AW_MODELS_JSON_PATH="/tmp/gh-aw/models.json"
+          GH_AW_DOCKER_HOST=""
+          if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
+            GH_AW_DOCKER_HOST="${DOCKER_HOST}"
+          fi
+          if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
+            _GH_AW_CHROOT_JSON=$(jq -c --arg src "${RUNNER_TEMP}/gh-aw" --arg user "$(id -un)" --argjson uid "$(id -u)" --argjson gid "$(id -g)" --arg home "${RUNNER_TEMP}/gh-aw/home" '.chroot={"binariesSourcePath":$src,"identity":{"user":$user,"uid":$uid,"gid":$gid,"home":$home}}' "${RUNNER_TEMP}/gh-aw/awf-config.json") || { echo "chroot config patch failed" >&2; exit 1; }
+            printf '%s\n' "$_GH_AW_CHROOT_JSON" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
+          fi
+          GH_AW_TOOL_CACHE_MOUNT=""
+          GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"
+          if [ -d "$GH_AW_TOOL_CACHE" ]; then
+            if [[ "$GH_AW_TOOL_CACHE" != /opt/* ]]; then
+              GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro"
+            fi
+          fi
+          # shellcheck disable=SC1003,SC2016,SC2086
+          awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" ${GH_AW_TOOL_CACHE_MOUNT:+--mount "$GH_AW_TOOL_CACHE_MOUNT"} ${GH_AW_DOCKER_HOST:+--docker-host "$GH_AW_DOCKER_HOST"} --env-all --exclude-env ACTIONS_ID_TOKEN_REQUEST_TOKEN --exclude-env ACTIONS_ID_TOKEN_REQUEST_URL --exclude-env COPILOT_GITHUB_TOKEN --mount /tmp/gh-aw:/tmp/gh-aw:rw --mount /tmp/gh-aw/threat-detection:/tmp/gh-aw/threat-detection:rw --log-level info --skip-pull \
+            -- /bin/bash -c 'set +o histexpand; export PATH="${RUNNER_TEMP}/gh-aw/bin:$PATH" && : "${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"; GH_AW_TOOL_CACHE="$RUNNER_TOOL_CACHE"; GH_AW_TOOL_BINS="$(find "$GH_AW_TOOL_CACHE" -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')"; GH_AW_TOOL_BINS="${GH_AW_TOOL_BINS%:}"; export PATH="$PATH${GH_AW_TOOL_BINS:+:}$GH_AW_TOOL_BINS"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true; [ -n "$ERLANG_HOME" ] && export PATH="$ERLANG_HOME/bin:$PATH" || true && threat-detect --engine copilot --output /tmp/gh-aw/threat-detection/detection_result.json /tmp/gh-aw/threat-detection' 2>&1 | tee -a /tmp/gh-aw/threat-detection/detection.log
+      - name: Render detection log
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        continue-on-error: true
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'render_detection_log.cjs'));
+            await main();
+      - name: Copy detection firewall logs
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        continue-on-error: true
+        run: |
+          mkdir -p /tmp/gh-aw/threat-detection/sandbox/firewall
+          if [ -d /tmp/gh-aw/sandbox/firewall/logs ]; then mkdir -p /tmp/gh-aw/threat-detection/sandbox/firewall/logs && cp -r /tmp/gh-aw/sandbox/firewall/logs/. /tmp/gh-aw/threat-detection/sandbox/firewall/logs/; fi
+          if [ -d /tmp/gh-aw/sandbox/firewall/audit ]; then mkdir -p /tmp/gh-aw/threat-detection/sandbox/firewall/audit && cp -r /tmp/gh-aw/sandbox/firewall/audit/. /tmp/gh-aw/threat-detection/sandbox/firewall/audit/; fi
+      - name: Upload threat detection artifact
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: detection
+          path: |
+            /tmp/gh-aw/threat-detection/detection_result.json
+            /tmp/gh-aw/threat-detection/sandbox/firewall/logs/
+            /tmp/gh-aw/threat-detection/sandbox/firewall/audit/
+          if-no-files-found: ignore
+      - name: Parse threat detection token usage for step summary
+        id: parse_detection_token_usage
+        if: always()
+        continue-on-error: true
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_TOKEN_USAGE_SUMMARY_TITLE: Threat Detection Token Usage
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'parse_token_usage.cjs'));
+            await main();
+      - name: Conclude threat detection
+        id: detection_conclusion
+        if: always()
+        continue-on-error: true
+        env:
+          RUN_DETECTION: ${{ steps.detection_guard.outputs.run_detection }}
+          DETECTION_AGENTIC_EXECUTION_OUTCOME: ${{ steps.detection_agentic_execution.outcome }}
+          GH_AW_DETECTION_CONTINUE_ON_ERROR: "true"
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/conclude_threat_detection.sh" /tmp/gh-aw/threat-detection/detection_result.json
+
+  safe_outputs:
+    needs:
+      - activation
+      - agent
+      - detection
+    if: (!cancelled()) && needs.agent.result != 'skipped' && needs.detection.result == 'success'
+    runs-on: ubuntu-slim
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
+    timeout-minutes: 45
+    env:
+      GH_AW_AGENT_AIC: ${{ needs.agent.outputs.aic }}
+      GH_AW_AIC: ${{ needs.agent.outputs.aic }}
+      GH_AW_AMBIENT_CONTEXT: ${{ needs.agent.outputs.ambient_context }}
+      GH_AW_CALLER_WORKFLOW_ID: "${{ github.repository }}/update-rust-analyzer"
+      GH_AW_DETECTION_CONCLUSION: ${{ needs.detection.outputs.detection_conclusion }}
+      GH_AW_DETECTION_REASON: ${{ needs.detection.outputs.detection_reason }}
+      GH_AW_EFFECTIVE_TOKENS: ${{ needs.agent.outputs.effective_tokens }}
+      GH_AW_ENGINE_ID: "copilot"
+      GH_AW_ENGINE_MODEL: ${{ needs.agent.outputs.model }}
+      GH_AW_RUNTIME_FEATURES: ${{ vars.GH_AW_RUNTIME_FEATURES }}
+      GH_AW_THREAT_DETECTION_AIC: ${{ needs.detection.outputs.aic }}
+      GH_AW_WORKFLOW_EMOJI: "🦀"
+      GH_AW_WORKFLOW_ID: "update-rust-analyzer"
+      GH_AW_WORKFLOW_NAME: "Update rust-analyzer"
+      GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/update-rust-analyzer.md"
+    outputs:
+      code_push_failure_count: ${{ steps.process_safe_outputs.outputs.code_push_failure_count }}
+      code_push_failure_errors: ${{ steps.process_safe_outputs.outputs.code_push_failure_errors }}
+      create_discussion_error_count: ${{ steps.process_safe_outputs.outputs.create_discussion_error_count }}
+      create_discussion_errors: ${{ steps.process_safe_outputs.outputs.create_discussion_errors }}
+      created_pr_number: ${{ steps.process_safe_outputs.outputs.created_pr_number }}
+      created_pr_url: ${{ steps.process_safe_outputs.outputs.created_pr_url }}
+      process_safe_outputs_items_applied: ${{ steps.process_safe_outputs.outputs.items_applied }}
+      process_safe_outputs_items_cancelled: ${{ steps.process_safe_outputs.outputs.items_cancelled }}
+      process_safe_outputs_items_deferred: ${{ steps.process_safe_outputs.outputs.items_deferred }}
+      process_safe_outputs_items_failed: ${{ steps.process_safe_outputs.outputs.items_failed }}
+      process_safe_outputs_items_skipped: ${{ steps.process_safe_outputs.outputs.items_skipped }}
+      process_safe_outputs_items_succeeded: ${{ steps.process_safe_outputs.outputs.items_succeeded }}
+      process_safe_outputs_items_warnings: ${{ steps.process_safe_outputs.outputs.items_warnings }}
+      process_safe_outputs_processed_count: ${{ steps.process_safe_outputs.outputs.processed_count }}
+      process_safe_outputs_status: ${{ steps.process_safe_outputs.outputs.status }}
+      process_safe_outputs_temporary_id_map: ${{ steps.process_safe_outputs.outputs.temporary_id_map }}
+    steps:
+      - name: Setup Scripts
+        id: setup
+        uses: github/gh-aw-actions/setup@5e508589e03a7757a7e05b26e834292f5445bfb6 # v0.88.7
+        with:
+          destination: ${{ runner.temp }}/gh-aw/actions
+          job-name: ${{ github.job }}
+          trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+          parent-span-id: ${{ needs.activation.outputs.setup-parent-span-id || needs.activation.outputs.setup-span-id }}
+        env:
+          GH_AW_SETUP_WORKFLOW_NAME: "Update rust-analyzer"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/update-rust-analyzer.lock.yml@${{ github.ref }}
+          GH_AW_INFO_VERSION: "1.0.80"
+          GH_AW_INFO_AWF_VERSION: "v0.28.14"
+          GH_AW_INFO_ENGINE_ID: "copilot"
+      - name: Mask OTLP telemetry headers
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/mask_otlp_headers.sh"
+      - name: Download agent output artifact
+        id: download-agent-output
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          pattern: "{agent,agent-output-fallback}"
+          merge-multiple: true
+          path: /tmp/gh-aw/
+      - name: Setup agent output environment variable
+        id: setup-agent-output-env
+        if: steps.download-agent-output.outcome == 'success'
+        run: |
+          mkdir -p /tmp/gh-aw/
+          find "/tmp/gh-aw/" -type f -print
+          if [ -f "/tmp/gh-aw/agent_output.json" ]; then
+            echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Download patch artifact
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: agent
+          path: /tmp/gh-aw/
+      - name: Checkout repository
+        if: (!cancelled()) && needs.agent.result != 'skipped' && contains(needs.agent.outputs.output_types, 'create_pull_request')
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: true
+          fetch-depth: 0
+          token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+      - name: Configure Git credentials
+        if: (!cancelled()) && needs.agent.result != 'skipped' && contains(needs.agent.outputs.output_types, 'create_pull_request')
+        env:
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          GITHUB_SERVER_URL: ${{ github.server_url }}
+          GIT_TOKEN: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/configure_git_credentials.sh"
+      - name: Configure GH_HOST for enterprise compatibility
+        id: ghes-host-config
+        shell: bash
+        run: | # zizmor: ignore[github-env] - GITHUB_SERVER_URL is set by GitHub Actions, not user input.
+          # Derive GH_HOST from GITHUB_SERVER_URL so the gh CLI targets the correct
+          # GitHub instance (GHES/GHEC). On github.com this is a harmless no-op.
+          GH_HOST="${GITHUB_SERVER_URL#https://}"
+          GH_HOST="${GH_HOST#http://}"
+          echo "GH_HOST=${GH_HOST}" >> "$GITHUB_ENV"
+      - name: Process Safe Outputs
+        id: process_safe_outputs
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_COMMENT_ID: ${{ needs.activation.outputs.comment_id }}
+          GH_AW_ALLOWED_DOMAINS: "*.githubusercontent.com,*.pythonhosted.org,anaconda.org,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,bcr.bazel.build,binstar.org,blog.bazel.build,bootstrap.pypa.io,codeload.github.com,conda.anaconda.org,conda.binstar.org,crates.io,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,docs.github.com,files.pythonhosted.org,github-cloud.githubusercontent.com,github-cloud.s3.amazonaws.com,github.blog,github.com,github.githubassets.com,index.crates.io,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,lfs.github.com,mirror.bazel.build,objects.githubusercontent.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,patch-diff.githubusercontent.com,patchdiff.githubusercontent.com,pip.pypa.io,ppa.launchpad.net,productionresultssa0.blob.core.windows.net,productionresultssa1.blob.core.windows.net,productionresultssa10.blob.core.windows.net,productionresultssa11.blob.core.windows.net,productionresultssa12.blob.core.windows.net,productionresultssa13.blob.core.windows.net,productionresultssa14.blob.core.windows.net,productionresultssa15.blob.core.windows.net,productionresultssa16.blob.core.windows.net,productionresultssa17.blob.core.windows.net,productionresultssa18.blob.core.windows.net,productionresultssa19.blob.core.windows.net,productionresultssa2.blob.core.windows.net,productionresultssa3.blob.core.windows.net,productionresultssa4.blob.core.windows.net,productionresultssa5.blob.core.windows.net,productionresultssa6.blob.core.windows.net,productionresultssa7.blob.core.windows.net,productionresultssa8.blob.core.windows.net,productionresultssa9.blob.core.windows.net,pypi.org,pypi.python.org,raw.githubusercontent.com,releases.bazel.build,repo.anaconda.com,repo.continuum.io,s.symcb.com,s.symcd.com,security.ubuntu.com,sh.rustup.rs,static.crates.io,static.rust-lang.org,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
+          GITHUB_SERVER_URL: ${{ github.server_url }}
+          GITHUB_API_URL: ${{ github.api_url }}
+          GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: "{\"create_pull_request\":{\"allowed_files\":[\"Cargo.lock\",\"shared/tree-sitter-extractor/Cargo.toml\",\"shared/yeast/Cargo.toml\",\"shared/yeast-macros/Cargo.toml\",\"shared/yeast-schema/Cargo.toml\",\"ruby/extractor/Cargo.toml\",\"unified/extractor/Cargo.toml\",\"unified/swift-syntax-rs/Cargo.toml\",\"shared/yeast/src/**\",\"shared/yeast-macros/src/**\",\"shared/yeast-schema/src/**\",\"shared/tree-sitter-extractor/src/**\",\"MODULE.bazel\",\"MODULE.bazel.lock\",\"rust-toolchain.toml\",\"rust/**\",\"misc/bazel/3rdparty/**\"],\"branch_prefix\":\"automation/update-rust-analyzer/\",\"draft\":true,\"max\":1,\"max_patch_files\":1000,\"max_patch_size\":10240,\"protect_top_level_dot_folders\":true,\"protected_files\":[\"package.json\",\"bun.lockb\",\"bunfig.toml\",\"deno.json\",\"deno.jsonc\",\"deno.lock\",\"global.json\",\"NuGet.Config\",\"Directory.Packages.props\",\"mix.exs\",\"mix.lock\",\"go.mod\",\"go.sum\",\"stack.yaml\",\"stack.yaml.lock\",\"pom.xml\",\"build.gradle\",\"build.gradle.kts\",\"settings.gradle\",\"settings.gradle.kts\",\"gradle.properties\",\"package-lock.json\",\"yarn.lock\",\"pnpm-lock.yaml\",\"npm-shrinkwrap.json\",\"requirements.txt\",\"Pipfile\",\"Pipfile.lock\",\"pyproject.toml\",\"setup.py\",\"setup.cfg\",\"Gemfile\",\"Gemfile.lock\",\"uv.lock\",\"CODEOWNERS\",\"DESIGN.md\",\"README.md\",\"CONTRIBUTING.md\",\"CHANGELOG.md\",\"SECURITY.md\",\"CODE_OF_CONDUCT.md\",\"AGENTS.md\"],\"protected_files_policy\":\"request_review\",\"title_prefix\":\"Rust: \"},\"create_report_incomplete_issue\":{\"title-prefix\":\"[incomplete]\"},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"false\"},\"report_incomplete\":{}}"
+          GH_AW_CI_TRIGGER_TOKEN: ${{ secrets.GH_AW_CI_TRIGGER_TOKEN }}
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'process_safe_outputs.cjs'));
+            await main();
+      - name: Upload Safe Outputs Items
+        if: always()
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: safe-outputs-items
+          path: |
+            /tmp/gh-aw/safe-output-items.jsonl
+            /tmp/gh-aw/temporary-id-map.json
+            /tmp/gh-aw/safe-output-errors.json
+          if-no-files-found: ignore
diff --git a/.github/workflows/update-rust-analyzer.md b/.github/workflows/update-rust-analyzer.md
new file mode 100644
index 000000000000..23c6aebb4e44
--- /dev/null
+++ b/.github/workflows/update-rust-analyzer.md
@@ -0,0 +1,129 @@
+---
+name: Update rust-analyzer
+emoji: 🦀
+description: Update the rust-analyzer version used by the Rust extractor and prepare a pull request.
+intent: Keep the Rust extractor on the latest compatible rust-analyzer version with a reviewable, validated pull request.
+on:
+  workflow_dispatch:
+  roles: [admin, maintainer, write]
+permissions:
+  contents: read
+  actions: read
+  pull-requests: read
+  copilot-requests: write
+strict: true
+checkout:
+  fetch-depth: 0
+concurrency:
+  group: update-rust-analyzer
+  cancel-in-progress: false
+timeout-minutes: 180
+tools:
+  github:
+    mode: gh-proxy
+    toolsets: [repos, pull_requests, actions]
+  bash: ["*"]
+  edit: true
+network:
+  allowed:
+    - defaults
+    - github
+    - github-actions
+    - rust
+    - bazel
+    - python
+steps:
+  - name: Set up CodeQL
+    uses: ./.github/actions/fetch-codeql
+
+  - name: Configure Git
+    run: |
+      git config user.name "github-actions[bot]"
+      git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+  - name: Install cargo-edit
+    continue-on-error: true
+    run: cargo install cargo-edit@0.13.0 --locked
+
+  - name: Run rust-analyzer updater script
+    run: |
+      mkdir -p /tmp/gh-aw/agent
+      set +e
+      python3 rust/scripts/update_rust_analyzer.py \
+        2>&1 | tee /tmp/gh-aw/agent/rust-analyzer-update.log
+      status=${PIPESTATUS[0]}
+      set -e
+
+      printf '%s\n' "$status" > /tmp/gh-aw/agent/rust-analyzer-update-status.txt
+      if grep -Fxq "No new rust-analyzer version available." \
+        /tmp/gh-aw/agent/rust-analyzer-update.log; then
+        printf '%s\n' "no-update" > /tmp/gh-aw/agent/rust-analyzer-update-result.txt
+      else
+        printf '%s\n' "update" > /tmp/gh-aw/agent/rust-analyzer-update-result.txt
+      fi
+safe-outputs:
+  report-incomplete: {}
+  create-pull-request:
+    title-prefix: "Rust: "
+    branch-prefix: "automation/update-rust-analyzer/"
+    draft: true
+    max-patch-size: 10240
+    max-patch-files: 1000
+    allowed-files:
+      - "Cargo.lock"
+      - "shared/tree-sitter-extractor/Cargo.toml"
+      - "shared/yeast/Cargo.toml"
+      - "shared/yeast-macros/Cargo.toml"
+      - "shared/yeast-schema/Cargo.toml"
+      - "ruby/extractor/Cargo.toml"
+      - "unified/extractor/Cargo.toml"
+      - "unified/swift-syntax-rs/Cargo.toml"
+      # A rust-analyzer update can require a newer Rust toolchain whose Clippy
+      # lints require compatibility fixes in any of the Rust sources.
+      # rust-analyzer dependency updates can also update tree-sitter APIs,
+      # requiring compatibility fixes in the shared extractor implementation.
+      - "shared/yeast/src/**"
+      - "shared/yeast-macros/src/**"
+      - "shared/yeast-schema/src/**"
+      - "shared/tree-sitter-extractor/src/**"
+      - "MODULE.bazel"
+      - "MODULE.bazel.lock"
+      - "rust-toolchain.toml"
+      - "rust/**"
+      - "misc/bazel/3rdparty/**"
+---
+
+# Update rust-analyzer
+
+## Task
+
+The workflow has already run `rust/scripts/update_rust_analyzer.py`. Read:
+
+- `/tmp/gh-aw/agent/rust-analyzer-update.log` for its complete output.
+- `/tmp/gh-aw/agent/rust-analyzer-update-status.txt` for its exit status.
+- `/tmp/gh-aw/agent/rust-analyzer-update-result.txt` for the deterministic result classification.
+
+If the result is `no-update`, call `noop` with the reason
+`No new rust-analyzer version available.` and stop immediately. Do not inspect
+CI, modify files, or create a pull request.
+
+Otherwise, continue the update from the existing working tree and commits:
+
+1. Review the updater log, exit status, commits, and working tree. Do not rerun
+   the updater script or undo changes that it successfully made.
+2. Read `rust/updating-rust-analyzer.md` and all applicable repository
+   instructions, then complete the remaining update steps.
+3. Review the complete diff and commits. Do not include secrets. Do not refer
+   to private repositories, internal issues, or internal pull requests in the
+   public pull request.
+4. Use `create_pull_request` exactly once. Summarize the updater output,
+   changes, and validation. If the update cannot be finished, still create a
+   partial draft pull request when
+   there are useful changes, and clearly list failures, missing work, and the
+   next commands for a maintainer.
+
+The pull request is created after this agent execution, so its newly triggered
+CI cannot be awaited in this run. Compensate with the strongest practical
+local validation and state this limitation accurately in the pull request.
+If the updater did not report `no-update` but no useful patch can be produced,
+call `report_incomplete` with the updater failure and exact blocker.
diff --git a/.github/workflows/yeast-test.yml b/.github/workflows/yeast-test.yml
new file mode 100644
index 000000000000..48e0ca01498f
--- /dev/null
+++ b/.github/workflows/yeast-test.yml
@@ -0,0 +1,32 @@
+name: Test Yeast
+
+on:
+  push:
+    paths:
+      - "shared/yeast/**"
+      - "shared/yeast-macros/**"
+      - "shared/yeast-schema/**"
+      - .github/workflows/yeast-test.yml
+    branches:
+      - main
+      - "rc/*"
+  pull_request:
+    paths:
+      - "shared/yeast/**"
+      - "shared/yeast-macros/**"
+      - "shared/yeast-schema/**"
+      - .github/workflows/yeast-test.yml
+
+env:
+  CARGO_TERM_COLOR: always
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: Run tests
+        run: cargo test --verbose --package codeql-extractor --package yeast --package yeast-macros --package yeast-schema
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0f2906dab310..1c8d6a8d2c94 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ default_language_version:
   python: python3.12
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
         exclude: /test([^/]*)/.*$(?<!\.qlref)|.*\.patch$|.*\.qll?$
@@ -12,7 +12,7 @@ repos:
         exclude: Cargo.lock$|/test([^/]*)/.*$(?<!\.qlref)|.*\.patch$|.*\.qll?$
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v17.0.6
+    rev: v23.1.3
     hooks:
       - id: clang-format
 
diff --git a/BUILD.bazel b/BUILD.bazel
index b2e4ea806785..07027f4ad9a7 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -3,3 +3,11 @@ exports_files([
     "Cargo.lock",
     "Cargo.toml",
 ])
+
+constraint_setting(name = "swift_runtime_linkage")
+
+constraint_value(
+    name = "static_swift_runtime",
+    constraint_setting = ":swift_runtime_linkage",
+    visibility = ["//visibility:public"],
+)
diff --git a/CODEOWNERS b/CODEOWNERS
index 9cbda8244467..4b5bfd124d2a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -11,7 +11,6 @@
 /go/codeql-tools/ @github/codeql-go @github/code-scanning-language-coverage
 /go/downgrades/ @github/codeql-go @github/code-scanning-language-coverage
 /go/extractor/ @github/codeql-go @github/code-scanning-language-coverage
-/go/extractor-smoke-test/ @github/codeql-go @github/code-scanning-language-coverage
 /go/ql/test/extractor-tests/ @github/codeql-go @github/code-scanning-language-coverage
 /java/ @github/codeql-java
 /javascript/ @github/codeql-javascript
@@ -24,8 +23,14 @@
 /rust/ @github/codeql-rust
 /rust/extractor/ @github/codeql-rust @github/code-scanning-language-coverage
 /shared/ @github/codeql-shared-libraries-reviewers
+/shared/cpp/ @github/code-scanning-language-coverage
+/shared/yeast/ @github/code-scanning-language-coverage
+/shared/yeast-macros/ @github/code-scanning-language-coverage
+/shared/yeast-schema/ @github/code-scanning-language-coverage
 /swift/ @github/codeql-swift
 /swift/extractor/ @github/codeql-swift @github/code-scanning-language-coverage
+/unified/extractor/ @github/code-scanning-language-coverage
+/unified/swift-syntax-rs/ @github/code-scanning-language-coverage
 /misc/codegen/ @github/codeql-swift
 /java/kotlin-extractor/ @github/codeql-kotlin @github/code-scanning-language-coverage
 /java/ql/test-kotlin1/ @github/codeql-kotlin
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a0efca6dec93..81980359600a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,8 +16,9 @@ If you have an idea for a query that you would like to share with other CodeQL u
 
 1. **Directory structure**
 
-    There are eight language-specific query directories in this repository:
+    There are ten language-specific query directories in this repository:
 
+      * Actions: `actions/ql/src`
       * C/C++: `cpp/ql/src`
       * C#: `csharp/ql/src`
       * Go: `go/ql/src`
@@ -25,6 +26,7 @@ If you have an idea for a query that you would like to share with other CodeQL u
       * JavaScript: `javascript/ql/src`
       * Python: `python/ql/src`
       * Ruby: `ruby/ql/src`
+      * Rust: `rust/ql/src`
       * Swift: `swift/ql/src`
 
     Each language-specific directory contains further subdirectories that group queries based on their `@tags` or purpose.
@@ -75,7 +77,3 @@ After the experimental query is merged, we welcome pull requests to improve it.
 If you contribute to this project, we will record your name and email address (as provided by you with your contributions) as part of the code repositories, which are public. We might also use this information to contact you in relation to your contributions, as well as in the normal course of software development. We also store records of CLA agreements signed in the past, but no longer require contributors to sign a CLA. Under GDPR legislation, we do this on the basis of our legitimate interest in creating the CodeQL product.
 
 Please do get in touch (privacy@github.com) if you have any questions about this or our data protection policies.
-
-## Bazel
-Please notice that any bazel targets and definitions in this repository are currently experimental
-and for internal use only.
diff --git a/Cargo.lock b/Cargo.lock
index 24479c721561..b1b6a340f664 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba"
 dependencies = [
  "memchr",
 ]
@@ -34,9 +34,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.20"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -49,60 +49,50 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.7"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.10"
+version = "3.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
-
-[[package]]
-name = "argfile"
-version = "0.2.1"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1cc0ba69de57db40674c66f7cf2caee3981ddef084388482c95c0e2133e5e8"
-dependencies = [
- "fs-err",
- "os_str_bytes",
-]
+checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
 
 [[package]]
 name = "ast-generator"
@@ -110,7 +100,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "either",
- "itertools 0.14.0",
+ "itertools",
  "mustache",
  "proc-macro2",
  "quote",
@@ -130,15 +120,15 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "base64"
-version = "0.22.1"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
 
 [[package]]
 name = "bitflags"
@@ -148,16 +138,17 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.4"
+version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
 
 [[package]]
 name = "borsh"
-version = "1.5.7"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
+checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a"
 dependencies = [
+ "bytes",
  "cfg_aliases",
 ]
 
@@ -167,11 +158,20 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36f64beae40a84da1b4b26ff2761a5b895c12adc41dc25aaee1c4f2bbfe97a6e"
 
+[[package]]
+name = "bs58"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
+dependencies = [
+ "tinyvec",
+]
+
 [[package]]
 name = "bstr"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
+checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
 dependencies = [
  "memchr",
  "serde",
@@ -179,59 +179,49 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.19.0"
+version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "bytemuck"
-version = "1.23.2"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677"
+checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
 
 [[package]]
-name = "camino"
-version = "1.1.12"
+name = "bytes"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0b03af37dad7a14518b7691d81acb0f8222604ad3d1b02f6b4bed5188c0cd5"
-dependencies = [
- "serde",
-]
+checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
 
 [[package]]
-name = "cargo-platform"
-version = "0.2.0"
+name = "camino"
+version = "1.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84982c6c0ae343635a3a4ee6dedef965513735c8b183caa7289fa6e27399ebd4"
+checksum = "bbbad30e4b4c14a39e3cc8aed085a12a327257c316619c93581e017bc52be591"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
-name = "cargo-util-schemas"
-version = "0.8.2"
+name = "cargo-platform"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dc1a6f7b5651af85774ae5a34b4e8be397d9cf4bc063b7e6dbd99a841837830"
+checksum = "dd0061da739915fae12ea00e16397555ed4371a6bb285431aab930f61b0aa4ba"
 dependencies = [
- "semver",
  "serde",
- "serde-untagged",
- "serde-value",
- "thiserror",
- "toml 0.8.23",
- "unicode-xid",
- "url",
+ "serde_core",
 ]
 
 [[package]]
 name = "cargo_metadata"
-version = "0.21.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cfca2aaa699835ba88faf58a06342a314a950d2b9686165e038286c30316868"
+checksum = "ef987d17b0a113becdd19d3d0022d04d7ef41f9efe4f3fb63ac44ba61df3ade9"
 dependencies = [
  "camino",
  "cargo-platform",
- "cargo-util-schemas",
  "semver",
  "serde",
  "serde_json",
@@ -240,9 +230,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.61"
+version = "1.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d"
+checksum = "a3eb0f42d6c360dc3f8a821f6bf2fdea7f72bfd36b3076eb0e6d1e9e0752fff4"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -252,26 +242,25 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "cfg_aliases"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527"
 
 [[package]]
-name = "chalk-derive"
-version = "0.103.0"
+name = "chacha20"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb4899682de915ca7c0b025bdd0a3d34c75fe12184122fda6805a7baddaa293c"
+checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
+ "cfg-if",
+ "cpufeatures",
+ "rand_core",
 ]
 
 [[package]]
@@ -282,78 +271,39 @@ checksum = "9ea9b1e80910f66ae87c772247591432032ef3f6a67367ff17f8343db05beafa"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.119",
  "synstructure",
 ]
 
-[[package]]
-name = "chalk-ir"
-version = "0.103.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90a37d2ab99352b4caca135061e7b4ac67024b648c28ed0b787feec4bea4caed"
-dependencies = [
- "bitflags 2.9.4",
- "chalk-derive 0.103.0",
-]
-
 [[package]]
 name = "chalk-ir"
 version = "0.104.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7047a516de16226cd17344d41a319d0ea1064bf9e60bd612ab341ab4a34bbfa8"
 dependencies = [
- "bitflags 2.9.4",
- "chalk-derive 0.104.0",
-]
-
-[[package]]
-name = "chalk-recursive"
-version = "0.103.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c855be60e646664bc37c2496d3dc81ca5ef60520930e5e0f0057a0575aff6c19"
-dependencies = [
- "chalk-derive 0.103.0",
- "chalk-ir 0.103.0",
- "chalk-solve",
- "rustc-hash 1.1.0",
- "tracing",
-]
-
-[[package]]
-name = "chalk-solve"
-version = "0.103.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "477ac6cdfd2013e9f93b09b036c2b607a67b2e728f4777b8422d55a79e9e3a34"
-dependencies = [
- "chalk-derive 0.103.0",
- "chalk-ir 0.103.0",
- "ena",
- "indexmap 2.14.0",
- "itertools 0.12.1",
- "petgraph",
- "rustc-hash 1.1.0",
- "tracing",
+ "bitflags 2.13.2",
+ "chalk-derive",
 ]
 
 [[package]]
 name = "chrono"
-version = "0.4.42"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
 dependencies = [
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-link 0.2.0",
+ "windows-link",
 ]
 
 [[package]]
 name = "clap"
-version = "4.5.48"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae"
+checksum = "aa8876b300ab35ba921adea3dfd70157a46249b33f95c9084ae5709785478946"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -361,9 +311,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.48"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9"
+checksum = "ec0797fb7aeb1406c84efac526901f7ec3ead2124f946b494e72879d4b54704d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -373,21 +323,30 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.47"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
+checksum = "f9c751b79415d4e559e3d1fcf128e09e720eb673a06d26cf6f392d37d75b66e0"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.5"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486"
+
+[[package]]
+name = "cobs"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1"
+dependencies = [
+ "thiserror",
+]
 
 [[package]]
 name = "codeql-autobuilder-rust"
@@ -448,7 +407,9 @@ dependencies = [
  "lazy_static",
  "rayon",
  "regex",
+ "serde",
  "serde_json",
+ "swift-syntax-rs",
  "tracing",
  "tracing-subscriber",
  "yeast",
@@ -459,15 +420,14 @@ name = "codeql-rust"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "argfile",
- "chalk-ir 0.104.0",
+ "chalk-ir",
  "chrono",
  "clap",
  "codeql-extractor",
  "dunce",
  "figment",
  "glob",
- "itertools 0.14.0",
+ "itertools",
  "mustache",
  "num-traits",
  "ra_ap_base_db",
@@ -484,12 +444,14 @@ dependencies = [
  "ra_ap_project_model",
  "ra_ap_span",
  "ra_ap_syntax",
+ "ra_ap_syntax-bridge",
+ "ra_ap_toolchain",
  "ra_ap_vfs",
  "rust-extractor-macros",
  "serde",
  "serde_json",
  "serde_with",
- "toml 0.9.7",
+ "toml",
  "tracing",
  "tracing-flame",
  "tracing-subscriber",
@@ -498,9 +460,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
 
 [[package]]
 name = "core-foundation-sys"
@@ -516,9 +478,18 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
 
 [[package]]
 name = "cov-mark"
-version = "2.1.0"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90863d8442510cddf7f46618c4f92413774635771a3e80830c8b30d183420b14"
+
+[[package]]
+name = "cpufeatures"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f1d92727879fb4f24cec33a35e3bff74035541326cbc12ad44ba8886d1927b0"
+checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "crc32fast"
@@ -531,18 +502,18 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.15"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+checksum = "98b0cc327b5bc766e7fda9c9260cc0fa81b43a8e240440422dff70788e3f9ef1"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+checksum = "622f3fc73690be383c7214310406f28a90e6edeadc3cea882f9d71e495b9711a"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -550,33 +521,33 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.18"
+version = "0.9.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.12"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+checksum = "03e8bd762f7479489c70ed6c768ddca99d7296857de437a68dcb2a94365b3fae"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.21"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6"
 
 [[package]]
 name = "darling"
-version = "0.21.3"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+checksum = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -584,34 +555,33 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.21.3"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+checksum = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff"
 dependencies = [
- "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim",
- "syn",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.21.3"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785"
 dependencies = [
  "darling_core",
  "quote",
- "syn",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "dashmap"
-version = "6.1.0"
+version = "6.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
+checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -621,27 +591,63 @@ dependencies = [
  "parking_lot_core",
 ]
 
+[[package]]
+name = "defmt"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1"
+dependencies = [
+ "bitflags 1.3.2",
+ "defmt-macros",
+]
+
+[[package]]
+name = "defmt-macros"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8"
+dependencies = [
+ "defmt-parser",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "defmt-parser"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e"
+dependencies = [
+ "thiserror",
+]
+
 [[package]]
 name = "deranged"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 dependencies = [
- "powerfmt",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
-name = "displaydoc"
-version = "0.2.5"
+name = "derive-where"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.119",
 ]
 
+[[package]]
+name = "dissimilar"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aeda16ab4059c5fd2a83f2b9c9e9c981327b18aa8e3b313f7e6563799d4f093e"
+
 [[package]]
 name = "drop_bomb"
 version = "0.1.5"
@@ -662,17 +668,29 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
 [[package]]
 name = "either"
-version = "1.15.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be"
+
+[[package]]
+name = "embedded-io"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced"
+
+[[package]]
+name = "embedded-io"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
 
 [[package]]
 name = "ena"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5"
+checksum = "eabffdaee24bd1bf95c5ef7cec31260444317e72ea56c4c91750e8b7ee58d5f1"
 dependencies = [
- "log 0.4.28",
+ "log 0.4.34",
 ]
 
 [[package]]
@@ -745,16 +763,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
-[[package]]
-name = "erased-serde"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7"
-dependencies = [
- "serde",
- "typeid",
-]
-
 [[package]]
 name = "figment"
 version = "0.10.19"
@@ -771,32 +779,26 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.9"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+checksum = "3e0f1c7c3a72c66fd80abe965175f7523475c0489a87d3ff9d6e8c87d87a9d2d"
 
 [[package]]
 name = "fixedbitset"
-version = "0.4.2"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "flate2"
-version = "1.1.2"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
 ]
 
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
 [[package]]
 name = "foldhash"
 version = "0.1.5"
@@ -804,22 +806,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
 [[package]]
-name = "form_urlencoded"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fs-err"
-version = "2.11.0"
+name = "foldhash"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41"
-dependencies = [
- "autocfg",
-]
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
 [[package]]
 name = "fsevent-sys"
@@ -836,33 +826,57 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a"
 
+[[package]]
+name = "futures-core"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
+
+[[package]]
+name = "futures-task"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd"
+
+[[package]]
+name = "futures-util"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "pin-project-lite",
+ "slab",
+]
+
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
 dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
- "wasi 0.14.5+wasi-0.2.4",
+ "rand_core",
 ]
 
 [[package]]
 name = "glob"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+checksum = "e4eba85ea1d0a966a983acd07deee566e67395d2d96b6fb39e62b5a833f1eb0b"
 
 [[package]]
 name = "globset"
-version = "0.4.16"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
+checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3"
 dependencies = [
  "aho-corasick",
  "bstr",
- "log 0.4.28",
+ "log 0.4.34",
  "regex-automata",
  "regex-syntax",
 ]
@@ -885,9 +899,7 @@ version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
- "allocator-api2",
- "equivalent",
- "foldhash",
+ "foldhash 0.1.5",
 ]
 
 [[package]]
@@ -895,14 +907,19 @@ name = "hashbrown"
 version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.2.0",
+]
 
 [[package]]
 name = "hashlink"
-version = "0.10.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
+checksum = "32069d97bb81e38fa67eab65e3393bf804bb85969f2bc06bf13f64aef5aba248"
 dependencies = [
- "hashbrown 0.15.5",
+ "hashbrown 0.17.1",
 ]
 
 [[package]]
@@ -923,26 +940,17 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "home"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "iana-time-zone"
-version = "0.1.63"
+version = "0.1.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
- "log 0.4.28",
+ "log 0.4.34",
  "wasm-bindgen",
  "windows-core",
 ]
@@ -956,119 +964,12 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "icu_collections"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
-dependencies = [
- "displaydoc",
- "potential_utf",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locale_core"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
-
-[[package]]
-name = "icu_properties"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locale_core",
- "icu_properties_data",
- "icu_provider",
- "potential_utf",
- "zerotrie",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
-
-[[package]]
-name = "icu_provider"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
-dependencies = [
- "displaydoc",
- "icu_locale_core",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "zerotrie",
- "zerovec",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
-[[package]]
-name = "idna"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
-dependencies = [
- "idna_adapter",
- "smallvec",
- "utf8_iter",
-]
-
-[[package]]
-name = "idna_adapter"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
-dependencies = [
- "icu_normalizer",
- "icu_properties",
-]
-
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -1082,9 +983,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.14.0"
+version = "2.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
+checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855"
 dependencies = [
  "equivalent",
  "hashbrown 0.17.1",
@@ -1100,94 +1001,146 @@ checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
 
 [[package]]
 name = "inotify"
-version = "0.11.0"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
+checksum = "4cc00ea907cab49550b7da656f80ebb97be1b997d931fbcd28d39734e17ce592"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.13.2",
  "inotify-sys",
  "libc",
 ]
 
 [[package]]
 name = "inotify-sys"
-version = "0.1.5"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+checksum = "c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "intrusive-collections"
-version = "0.9.7"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "189d0897e4cbe8c75efedf3502c18c887b05046e59d28404d4d8e46cbc4d1e86"
+checksum = "4275b20e6057cd7733fd8df8a5a31701e4fe44497dad0f3fa0e1c4fb971506be"
+
+[[package]]
+name = "inventory"
+version = "0.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4f0c30c76f2f4ccee3fe55a2435f691ca00c0e4bd87abe4f4a851b1d4dac39b"
 dependencies = [
- "memoffset",
+ "rustversion",
 ]
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.1"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
 [[package]]
 name = "itertools"
-version = "0.12.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc"
 dependencies = [
  "either",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.14.0"
+name = "itoa"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "jiff"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab1baf72f08796de0260609515130699b890ac25f30e610ad894bc5856cafdb"
 dependencies = [
- "either",
+ "defmt",
+ "jiff-core",
+ "jiff-static",
+ "jiff-tzdb-platform",
+ "log 0.4.34",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde_core",
+ "windows-link",
 ]
 
 [[package]]
-name = "itoa"
-version = "1.0.15"
+name = "jiff-core"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "5e52fe76043ccecc9005d2305ebaadf7d7fc0cc89ca6baa10a94d6bc68c7128c"
+dependencies = [
+ "defmt",
+ "log 0.4.34",
+]
 
 [[package]]
-name = "jobserver"
-version = "0.1.34"
+name = "jiff-static"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+checksum = "378268a1116ad67ae6228701118ac9f491d78fda38a40a1f1a9e1348de6f7212"
 dependencies = [
- "getrandom",
- "libc",
+ "jiff-core",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
 ]
 
 [[package]]
-name = "jod-thread"
+name = "jiff-tzdb"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "142bd39932ad231f10513df9ab62661fead8719872150b7ad02a2df79f4e141e"
+
+[[package]]
+name = "jiff-tzdb-platform"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8"
+dependencies = [
+ "jiff-tzdb",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3"
+dependencies = [
+ "getrandom",
+ "libc",
+]
+
+[[package]]
+name = "jod-thread"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a037eddb7d28de1d0fc42411f501b53b75838d313908078d6698d064f3029b24"
 
 [[package]]
 name = "js-sys"
-version = "0.3.78"
+version = "0.3.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738"
+checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
 dependencies = [
- "once_cell",
+ "cfg-if",
+ "futures-util",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "kqueue"
-version = "1.1.1"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
+checksum = "8d763e5b24120b4ddf50de6c92308156765aabfbbccebf401da7cff2d70a41ea"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -1195,11 +1148,11 @@ dependencies = [
 
 [[package]]
 name = "kqueue-sys"
-version = "1.0.4"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.13.2",
  "libc",
 ]
 
@@ -1211,15 +1164,15 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306"
 
 [[package]]
 name = "lazy_static"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb"
 
 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
 
 [[package]]
 name = "line-index"
@@ -1231,19 +1184,12 @@ dependencies = [
  "text-size",
 ]
 
-[[package]]
-name = "litemap"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
-
 [[package]]
 name = "lock_api"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
@@ -1253,14 +1199,14 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 dependencies = [
- "log 0.4.28",
+ "log 0.4.34",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.28"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
 
 [[package]]
 name = "matchers"
@@ -1273,9 +1219,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
 [[package]]
 name = "memoffset"
@@ -1293,18 +1239,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.4"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+checksum = "4b18443e9c262bfe8fa82f51666e2642c53393f7e5c27b3e1aeab922cff5b9d8"
 dependencies = [
  "libc",
- "log 0.4.28",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.59.0",
+ "log 0.4.34",
+ "wasi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1313,7 +1260,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "536bfad37a309d62069485248eeaba1e8d9853aaf951caaeaed0585a95346f08"
 dependencies = [
- "windows-sys 0.61.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1338,12 +1285,12 @@ version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.13.2",
  "fsevent-sys",
  "inotify",
  "kqueue",
  "libc",
- "log 0.4.28",
+ "log 0.4.34",
  "mio",
  "notify-types",
  "walkdir",
@@ -1352,24 +1299,27 @@ dependencies = [
 
 [[package]]
 name = "notify-types"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
+checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
+dependencies = [
+ "bitflags 2.13.2",
+]
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.50.1"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "num-conv"
-version = "0.1.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
 
 [[package]]
 name = "num-traits"
@@ -1390,17 +1340,26 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "once_cell_polyfill"
-version = "1.70.1"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
 name = "oorandom"
@@ -1408,39 +1367,11 @@ version = "11.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
-[[package]]
-name = "ordered-float"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "os_str_bytes"
-version = "7.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63eceb7b5d757011a87d08eb2123db15d87fb0c281f65d101ce30a1e96c3ad5c"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "papaya"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92dd0b07c53a0a0c764db2ace8c541dc47320dad97c2200c2a637ab9dd2328f"
-dependencies = [
- "equivalent",
- "seize",
-]
-
 [[package]]
 name = "parking_lot"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -1448,15 +1379,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -1479,20 +1410,14 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn",
+ "syn 2.0.119",
 ]
 
-[[package]]
-name = "percent-encoding"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
-
 [[package]]
 name = "perf-event"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5396562cd2eaa828445d6d34258ae21ee1eb9d40fe626ca7f51c8dccb4af9d66"
+checksum = "b4d6393d9238342159080d79b78cb59c67399a8e7ecfa5d410bd614169e4e823"
 dependencies = [
  "libc",
  "perf-event-open-sys",
@@ -1500,70 +1425,74 @@ dependencies = [
 
 [[package]]
 name = "perf-event-open-sys"
-version = "1.0.1"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce9bedf5da2c234fdf2391ede2b90fabf585355f33100689bc364a3ea558561a"
+checksum = "7c44fb1c7651a45a3652c4afc6e754e40b3d6e6556f1487e2b230bfc4f33c2a8"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "petgraph"
-version = "0.6.5"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
 dependencies = [
  "fixedbitset",
- "indexmap 2.14.0",
+ "hashbrown 0.15.5",
+ "indexmap 2.14.2",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548"
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85"
 
 [[package]]
-name = "potential_utf"
-version = "0.1.3"
+name = "portable-atomic-util"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
+checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618"
 dependencies = [
- "zerovec",
+ "portable-atomic",
 ]
 
 [[package]]
-name = "powerfmt"
-version = "0.2.0"
+name = "postcard"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24"
+dependencies = [
+ "cobs",
+ "embedded-io 0.4.0",
+ "embedded-io 0.6.1",
+ "serde",
+]
 
 [[package]]
-name = "ppv-lite86"
-version = "0.2.21"
+name = "powerfmt"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
 dependencies = [
  "unicode-ident",
 ]
@@ -1576,131 +1505,169 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.119",
  "version_check",
  "yansi",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.41"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "r-efi"
-version = "5.3.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
 [[package]]
 name = "ra-ap-rustc_abi"
-version = "0.123.0"
+version = "0.166.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f18c877575c259d127072e9bfc41d985202262fb4d6bfdae3d1252147c2562c2"
+checksum = "e2cf1b1ffe31b6226c00b40cddfda65002b7729f9f4ed2d547b5856cdab0011c"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.13.2",
  "ra-ap-rustc_hashes",
  "ra-ap-rustc_index",
  "tracing",
 ]
 
+[[package]]
+name = "ra-ap-rustc_ast_ir"
+version = "0.166.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ef42605e36e1305e815ccfc8830eb870f74d78534bca19a61629149536d8e98"
+
 [[package]]
 name = "ra-ap-rustc_hashes"
-version = "0.123.0"
+version = "0.166.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2439ed1df3472443133b66949f81080dff88089b42f825761455463709ee1cad"
+checksum = "b9f5542968215c17275920791b2fa13a43014287506ed0450777c79845102e86"
 dependencies = [
  "rustc-stable-hash",
 ]
 
 [[package]]
 name = "ra-ap-rustc_index"
-version = "0.123.0"
+version = "0.166.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a24fe0be21be1f8ebc21dcb40129214fb4cefb0f2753f3d46b6dbe656a1a45"
+checksum = "1d9e47b9ca7d92cfb0d6653503adbabd41938b84474317397a664326b208d6c6"
 dependencies = [
  "ra-ap-rustc_index_macros",
- "smallvec",
 ]
 
 [[package]]
 name = "ra-ap-rustc_index_macros"
-version = "0.123.0"
+version = "0.166.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "844a27ddcad0116facae2df8e741fd788662cf93dc13029cd864f2b8013b81f9"
+checksum = "4d744a7a2852a22f06210bcff9e4667ed0cacbfbe94894cc294044d25e876341"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.119",
 ]
 
 [[package]]
 name = "ra-ap-rustc_lexer"
-version = "0.121.0"
+version = "0.166.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22944e31fb91e9b3e75bcbc91e37d958b8c0825a6160927f2856831d2ce83b36"
+checksum = "527c12b3731b7d0692498012810b85b2b8dfdb8b514321ed6afc434bd1c70191"
 dependencies = [
  "memchr",
+ "unicode-ident",
  "unicode-properties",
- "unicode-xid",
 ]
 
 [[package]]
-name = "ra-ap-rustc_lexer"
-version = "0.123.0"
+name = "ra-ap-rustc_next_trait_solver"
+version = "0.166.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b734cfcb577d09877799a22742f1bd398be6c00bc428d9de56d48d11ece5771"
+checksum = "a7a9663a8d7c369e934aac2b74a638537ad7eb4be75b4530d765384dc071c936"
 dependencies = [
- "memchr",
- "unicode-properties",
- "unicode-xid",
+ "derive-where",
+ "ra-ap-rustc_index",
+ "ra-ap-rustc_type_ir",
+ "ra-ap-rustc_type_ir_macros",
+ "tracing",
 ]
 
 [[package]]
 name = "ra-ap-rustc_parse_format"
-version = "0.121.0"
+version = "0.166.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81057891bc2063ad9e353f29462fbc47a0f5072560af34428ae9313aaa5e9d97"
+checksum = "2c038b7a8b0f784d4e441ad8ab991fbbdaa5e0be482e59c639a846a1c8126951"
 dependencies = [
- "ra-ap-rustc_lexer 0.121.0",
+ "ra-ap-rustc_lexer",
  "rustc-literal-escaper",
 ]
 
 [[package]]
 name = "ra-ap-rustc_pattern_analysis"
-version = "0.123.0"
+version = "0.166.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b0ee1f059b9dea0818c6c7267478926eee95ba4c7dcf89c8db32fa165d3904"
+checksum = "42ca286f90e99bb97cd9274c088f3c874a05d1ee90cabf40a3928afedabe99fd"
 dependencies = [
  "ra-ap-rustc_index",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "rustc_apfloat",
  "smallvec",
  "tracing",
 ]
 
+[[package]]
+name = "ra-ap-rustc_type_ir"
+version = "0.166.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d6efb6008f665a9485e0afecf9f4950a6c4bedd8ddd330a9df8986a6c0160b"
+dependencies = [
+ "arrayvec",
+ "bitflags 2.13.2",
+ "derive-where",
+ "ena",
+ "indexmap 2.14.2",
+ "ra-ap-rustc_abi",
+ "ra-ap-rustc_ast_ir",
+ "ra-ap-rustc_index",
+ "ra-ap-rustc_type_ir_macros",
+ "rustc-hash 2.1.3",
+ "smallvec",
+ "thin-vec",
+ "tracing",
+]
+
+[[package]]
+name = "ra-ap-rustc_type_ir_macros"
+version = "0.166.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f4fd2355e2bbf1f343c730f623596efc6e465b5e3685b606a437567ebb75bf8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "synstructure",
+]
+
 [[package]]
 name = "ra_ap_base_db"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e876bb2c3e52a8d4e6684526a2d4e81f9d028b939ee4dc5dc775fe10deb44d59"
+checksum = "8a5bf74ba5606b902ada6b8964ac4f22080ac6d73c297f8d4981885843b25fa4"
 dependencies = [
  "dashmap",
- "indexmap 2.14.0",
+ "indexmap 2.14.2",
  "la-arena",
  "ra_ap_cfg",
  "ra_ap_intern",
- "ra_ap_query-group-macro",
  "ra_ap_span",
  "ra_ap_syntax",
  "ra_ap_vfs",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "salsa",
- "salsa-macros",
  "semver",
  "tracing",
  "triomphe",
@@ -1708,32 +1675,34 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_cfg"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a0b56eb4536ce6d2431932c4d337aeeaf7bb22c9249b38cbe80677b5881228f"
+checksum = "1dc63ce4a2acd1591cac5d5ad1d4f0549bd9069f4aad59acbf600a4d4881a8c9"
 dependencies = [
  "ra_ap_intern",
+ "ra_ap_syntax",
  "ra_ap_tt",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "tracing",
 ]
 
 [[package]]
 name = "ra_ap_edition"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bdc6cbe42c63ca78611bae82bfc8db24864f33dccc813697c5fde43a0907285"
+checksum = "1e95437d4702879e3851c80580524f36025589b3eeaec3f7798cdf88671c130b"
 
 [[package]]
 name = "ra_ap_hir"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebffdc134eccabc17209d7760cfff7fd12ed18ab6e21188c5e084b97aa38504c"
+checksum = "9464cf1121d47a72dffa58c31603b5f06139747b3d848c3b87f63a6da283abb5"
 dependencies = [
  "arrayvec",
  "either",
- "indexmap 2.14.0",
- "itertools 0.14.0",
+ "itertools",
+ "la-arena",
+ "ra-ap-rustc_type_ir",
  "ra_ap_base_db",
  "ra_ap_cfg",
  "ra_ap_hir_def",
@@ -1744,7 +1713,9 @@ dependencies = [
  "ra_ap_stdx",
  "ra_ap_syntax",
  "ra_ap_tt",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
+ "salsa",
+ "serde_json",
  "smallvec",
  "tracing",
  "triomphe",
@@ -1752,18 +1723,18 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_hir_def"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81d2337ef59550392d42aa997aa1105a3d6d1c2b3a583c777786bc4a0a074fd5"
+checksum = "7ef811f35ed1c394d27a7e0d79869aa4891108496736597b87bbc632a4eee1ec"
 dependencies = [
  "arrayvec",
- "bitflags 2.9.4",
+ "bitflags 2.13.2",
  "cov-mark",
  "drop_bomb",
  "either",
  "fst",
- "indexmap 2.14.0",
- "itertools 0.14.0",
+ "indexmap 2.14.2",
+ "itertools",
  "la-arena",
  "ra-ap-rustc_abi",
  "ra-ap-rustc_parse_format",
@@ -1771,147 +1742,150 @@ dependencies = [
  "ra_ap_cfg",
  "ra_ap_hir_expand",
  "ra_ap_intern",
- "ra_ap_mbe",
- "ra_ap_query-group-macro",
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_syntax",
+ "ra_ap_syntax-bridge",
  "ra_ap_tt",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "rustc_apfloat",
  "salsa",
- "salsa-macros",
  "smallvec",
- "text-size",
  "thin-vec",
  "tracing",
  "triomphe",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "ra_ap_hir_expand"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97cf8ececb2743a819d8299a408e17f164dd1a1004d65936b3d5493b55330326"
+checksum = "f8ffb0602b9cc8b4647b902db5c4fca4a8a37ba7a20f28424aed64c7dd2866d6"
 dependencies = [
  "cov-mark",
  "either",
- "itertools 0.14.0",
+ "itertools",
  "ra_ap_base_db",
  "ra_ap_cfg",
  "ra_ap_intern",
  "ra_ap_mbe",
  "ra_ap_parser",
- "ra_ap_query-group-macro",
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_syntax",
  "ra_ap_syntax-bridge",
  "ra_ap_tt",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "salsa",
- "salsa-macros",
  "smallvec",
+ "thin-vec",
  "tracing",
  "triomphe",
 ]
 
 [[package]]
 name = "ra_ap_hir_ty"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc004e1099ba766a61500c27d34eb5cd336430d0a89a9620315a90d7a202a73a"
+checksum = "725f913d562b8d794035bc3bcc3e62adf09b843e11b443750bf8a7027ec1d3bf"
 dependencies = [
  "arrayvec",
- "bitflags 2.9.4",
- "chalk-derive 0.103.0",
- "chalk-ir 0.103.0",
- "chalk-recursive",
- "chalk-solve",
+ "bitflags 2.13.2",
  "cov-mark",
  "either",
  "ena",
- "indexmap 2.14.0",
- "itertools 0.14.0",
+ "indexmap 2.14.2",
+ "itertools",
  "la-arena",
  "oorandom",
+ "petgraph",
  "ra-ap-rustc_abi",
+ "ra-ap-rustc_ast_ir",
  "ra-ap-rustc_index",
+ "ra-ap-rustc_next_trait_solver",
  "ra-ap-rustc_pattern_analysis",
+ "ra-ap-rustc_type_ir",
  "ra_ap_base_db",
  "ra_ap_hir_def",
  "ra_ap_hir_expand",
  "ra_ap_intern",
- "ra_ap_query-group-macro",
+ "ra_ap_macros",
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_syntax",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "rustc_apfloat",
  "salsa",
- "salsa-macros",
- "scoped-tls",
+ "serde",
+ "serde_derive",
  "smallvec",
+ "thin-vec",
  "tracing",
+ "tracing-subscriber",
+ "tracing-tree",
  "triomphe",
  "typed-arena",
 ]
 
 [[package]]
 name = "ra_ap_ide_db"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2acb572d6dbeb1c96d0339890ba91298b8f5f0ab22648da4ee2b4ab77dbc3fe"
+checksum = "f08b0f04a8fecbe4a1b04cd0b03d5b0c8495a2a5de50638c6d66b5c3aba133ac"
 dependencies = [
  "arrayvec",
- "bitflags 2.9.4",
+ "bitflags 2.13.2",
  "cov-mark",
  "crossbeam-channel",
  "either",
  "fst",
- "indexmap 2.14.0",
- "itertools 0.14.0",
+ "itertools",
  "line-index",
  "memchr",
  "nohash-hasher",
  "ra_ap_base_db",
  "ra_ap_hir",
+ "ra_ap_macros",
  "ra_ap_parser",
  "ra_ap_profile",
- "ra_ap_query-group-macro",
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_syntax",
+ "ra_ap_test_fixture",
+ "ra_ap_test_utils",
  "ra_ap_vfs",
  "rayon",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "salsa",
- "salsa-macros",
+ "smallvec",
  "tracing",
  "triomphe",
 ]
 
 [[package]]
 name = "ra_ap_intern"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14586c2c4781b69fdd0c505972d9bff8c162a8740537a3ee506faff686d9a20d"
+checksum = "51fddd20c482af576865ab697077cbf1b61b7d30214ab250ce3aa83f0af41eb2"
 dependencies = [
+ "arrayvec",
  "dashmap",
  "hashbrown 0.14.5",
- "rustc-hash 2.1.1",
+ "rayon",
+ "rustc-hash 2.1.3",
  "triomphe",
 ]
 
 [[package]]
 name = "ra_ap_load-cargo"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50ce5546b3e3414507ab4d12348d0a28748062e33a1448895c68466d0b015503"
+checksum = "ee8bbf755a6d81544cd576150986601069918ab46fa5677275ce3b9cc875bc73"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
- "itertools 0.14.0",
+ "itertools",
  "ra_ap_hir_expand",
  "ra_ap_ide_db",
  "ra_ap_intern",
@@ -1924,60 +1898,78 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "ra_ap_macros"
+version = "0.0.358"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea5d97f56b9082903327327d70a45f6df69f8fb02880c0040f0e21f1b4983093"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "synstructure",
+]
+
 [[package]]
 name = "ra_ap_mbe"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67333c6405797cb64aafb994b9a179157b30beeda2352e203e800be2b184a22d"
+checksum = "e2b58d33d66aa5ae520204e9920063dcd78a60a610726be70a2c2a9cb1cbe563"
 dependencies = [
  "arrayvec",
+ "bitflags 2.13.2",
  "cov-mark",
- "ra-ap-rustc_lexer 0.123.0",
+ "ra-ap-rustc_lexer",
  "ra_ap_intern",
  "ra_ap_parser",
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_syntax-bridge",
  "ra_ap_tt",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
+ "salsa",
  "smallvec",
 ]
 
 [[package]]
 name = "ra_ap_parser"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a3b92b8b147c0826b83e70ad44e3c98e94201fc93e1f09396c43b4d7958c22a"
+checksum = "64b1543d3639a969f5cb4d55a94154ef672f5e1c873b6161407f5705e3164bbc"
 dependencies = [
  "drop_bomb",
- "ra-ap-rustc_lexer 0.123.0",
+ "ra-ap-rustc_lexer",
  "ra_ap_edition",
  "rustc-literal-escaper",
  "tracing",
+ "winnow 0.7.13",
 ]
 
 [[package]]
 name = "ra_ap_paths"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4991f3d57fac0def7822bebfeb159c8d7b58c824bf82044b765c54f2c0971e2"
+checksum = "781f81610b0333e60fabdcf4f9ea8a76a7eeff2cda2be6d8f8ad7b9b53985488"
 dependencies = [
  "camino",
 ]
 
 [[package]]
 name = "ra_ap_proc_macro_api"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45db9e2df587d56f0738afa89fb2c100ff7c1e9cbe49e07f6a8b62342832211b"
+checksum = "d312f10722d4fa59b93cdbfa534d36a0d2d4a3b18dfad6825d5146afccb41223"
 dependencies = [
- "indexmap 2.14.0",
+ "indexmap 2.14.2",
+ "postcard",
  "ra_ap_intern",
  "ra_ap_paths",
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_tt",
- "rustc-hash 2.1.1",
+ "rayon",
+ "rustc-hash 2.1.3",
+ "semver",
  "serde",
  "serde_derive",
  "serde_json",
@@ -1986,25 +1978,24 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_profile"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19981637b8ee4160e228c815a7fef3944b5c0555d6af41a931be92d68978bc6c"
+checksum = "72f43ed3bd40c9f338192cbcaf7169d68d1bb69c66667e127e0ac368bb1bdb68"
 dependencies = [
- "cfg-if",
  "libc",
  "perf-event",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "ra_ap_project_model"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bda0769fd6ca949fdd5917acb68ddc2c143745614ddd94ef38b376838611cf8"
+checksum = "f41727333563bc6cd3299ae5e389d6c1d7f11821b01aa1026aead8c161487de8"
 dependencies = [
  "anyhow",
  "cargo_metadata",
- "itertools 0.14.0",
+ "itertools",
  "la-arena",
  "ra_ap_base_db",
  "ra_ap_cfg",
@@ -2013,72 +2004,63 @@ dependencies = [
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_toolchain",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "semver",
  "serde",
  "serde_derive",
  "serde_json",
- "temp-dir",
+ "toml",
  "tracing",
  "triomphe",
 ]
 
-[[package]]
-name = "ra_ap_query-group-macro"
-version = "0.0.301"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f182a4b05f004eabaa83250a5de7ea3a13a92c88f3cbe98bfa1880cd9fbce0a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "ra_ap_span"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6f9fa2de07f5cccf431674b90e82c1fe1ea2339db3b3869eec44d135de09a4"
+checksum = "98543730b25d99687b95ca1bd4a0f326366eb7a55caf6e847b70ee3c2ac89206"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown 0.17.1",
  "la-arena",
  "ra_ap_stdx",
  "ra_ap_syntax",
  "ra_ap_vfs",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "salsa",
  "text-size",
 ]
 
 [[package]]
 name = "ra_ap_stdx"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa770adb32896fcba934b464ac3bd179163ba2b0766e275eed5b4e262e08492b"
+checksum = "60c564fa8518154e983d5c49be54bfc970cd91ba5b7fd9be07289e1965aa42cc"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-utils",
- "itertools 0.14.0",
+ "itertools",
  "jod-thread",
  "libc",
  "miow",
  "tracing",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "ra_ap_syntax"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e9e1393281ad5c635239d353ed3cfbf28c8d0af03d0c61a3b24b31d1143b17f"
+checksum = "e3b6f7b5310d58d302b6e654b7b7013676a94c462e9e21ae2152d49e5d067ae1"
 dependencies = [
  "either",
- "itertools 0.14.0",
+ "itertools",
+ "ra-ap-rustc_lexer",
  "ra_ap_parser",
  "ra_ap_stdx",
  "rowan",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "rustc-literal-escaper",
+ "smallvec",
  "smol_str",
  "tracing",
  "triomphe",
@@ -2086,9 +2068,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_syntax-bridge"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684e6ff1008ee5340335888f0453d94bb38950f110059a51f1818c7f6a56a807"
+checksum = "e1ab9a9f42057119efdc9b17530bcd12a5ca7feda2a3cca07cc2ab7e58fd9840"
 dependencies = [
  "ra_ap_intern",
  "ra_ap_parser",
@@ -2096,53 +2078,87 @@ dependencies = [
  "ra_ap_stdx",
  "ra_ap_syntax",
  "ra_ap_tt",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
+]
+
+[[package]]
+name = "ra_ap_test_fixture"
+version = "0.0.358"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd1102bb800326b4d872487d1cbff8c8dfda9951c2c18185a49b927a2fd21bf7"
+dependencies = [
+ "ra_ap_base_db",
+ "ra_ap_cfg",
+ "ra_ap_hir_expand",
+ "ra_ap_intern",
+ "ra_ap_paths",
+ "ra_ap_span",
+ "ra_ap_stdx",
+ "ra_ap_test_utils",
+ "ra_ap_tt",
+ "triomphe",
+]
+
+[[package]]
+name = "ra_ap_test_utils"
+version = "0.0.358"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e950ae6ab036ed2d85694222c9ac6c167fd470588af47c354f08c8381787f90"
+dependencies = [
+ "dissimilar",
+ "ra_ap_paths",
+ "ra_ap_profile",
+ "ra_ap_stdx",
+ "rustc-hash 2.1.3",
+ "text-size",
 ]
 
 [[package]]
 name = "ra_ap_toolchain"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61969c5f72af03a9837e077c2d939d87a5c863623725c461777c352664a3bb03"
+checksum = "aa57909e3770cfb80af82bc502aaf1f8041219244923828fb3dccb93e39fd9e3"
 dependencies = [
  "camino",
- "home",
+ "semver",
 ]
 
 [[package]]
 name = "ra_ap_tt"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb87c7b35572c18a580ea811e970b94875fad5ac7cfa8644266a59081044f959"
+checksum = "6767bfe5e71541eef3b764098e0a9ec77864978f610900f8bedfa85151dd58b1"
 dependencies = [
  "arrayvec",
- "ra-ap-rustc_lexer 0.123.0",
+ "ra-ap-rustc_lexer",
  "ra_ap_intern",
+ "ra_ap_span",
  "ra_ap_stdx",
+ "rustc-hash 2.1.3",
  "text-size",
 ]
 
 [[package]]
 name = "ra_ap_vfs"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c174d6b9b7a7f54687df7e00c3e75ed6f082a7943a9afb1d54f33c0c12773de"
+checksum = "613e9b9ce9dfb085c980497b712624eca7ec7312c41bc2855ef8cdc245c33dab"
 dependencies = [
  "crossbeam-channel",
  "fst",
- "indexmap 2.14.0",
+ "indexmap 2.14.2",
  "nohash-hasher",
  "ra_ap_paths",
  "ra_ap_stdx",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "tracing",
 ]
 
 [[package]]
 name = "ra_ap_vfs-notify"
-version = "0.0.301"
+version = "0.0.358"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f6fce8d47c7ce9b8f2cd0e5a55f8fc4878d6043e61f46cde4391d3a5c6086f"
+checksum = "fd876ebc2872e591cb525395877fc2f3b826fc5a71907dc5e449ab0614b184f3"
 dependencies = [
  "crossbeam-channel",
  "notify",
@@ -2150,45 +2166,33 @@ dependencies = [
  "ra_ap_stdx",
  "ra_ap_vfs",
  "rayon",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "tracing",
  "walkdir",
 ]
 
 [[package]]
 name = "rand"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
-dependencies = [
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.9.0"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af"
 dependencies = [
- "ppv-lite86",
+ "chacha20",
+ "getrandom",
  "rand_core",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.9.3"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
-dependencies = [
- "getrandom",
-]
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
 [[package]]
 name = "rayon"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
 dependencies = [
  "either",
  "rayon-core",
@@ -2206,38 +2210,38 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.17"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.13.2",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
+checksum = "216e8f773d7923bcba9ceb86a86c93cabb3903a11872fc3f138c49630e50b96d"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
+checksum = "2c9283685feec7d69af75fb0e858d5e7378f33fe4fc699383b2916ab9273e03c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.3"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
+checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2247,9 +2251,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.11"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"
+checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2258,15 +2262,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.6"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "rowan"
-version = "0.15.15"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49"
+checksum = "14b574c58582fa59fa43a2feb6608b8744184659f08a2e0117e4b8224d95ed61"
 dependencies = [
  "countme",
  "hashbrown 0.14.5",
@@ -2280,7 +2284,7 @@ name = "rust-extractor-macros"
 version = "0.1.0"
 dependencies = [
  "quote",
- "syn",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -2291,15 +2295,15 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.1"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
 
 [[package]]
 name = "rustc-literal-escaper"
-version = "0.0.4"
+version = "0.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab03008eb631b703dd16978282ae36c73282e7922fe101a4bd072a40ecea7b8b"
+checksum = "8be87abb9e40db7466e0681dc8ecd9dcfd40360cb10b4c8fe24a7c4c3669b198"
 
 [[package]]
 name = "rustc-stable-hash"
@@ -2313,63 +2317,64 @@ version = "0.2.3+llvm-462a31f5a5ab"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "486c2179b4796f65bfe2ee33679acf0927ac83ecf583ad6c91c3b4570911b9ad"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.13.2",
  "smallvec",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
 
 [[package]]
 name = "salsa"
-version = "0.23.0"
+version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e235afdb8e510f38a07138fbe5a0b64691894358a9c0cbd813b1aade110efc9"
+checksum = "27d2e6e19e39591cd99c01ac4141544b4d012cfd0831348629b8187fa9fe6d34"
 dependencies = [
  "boxcar",
  "crossbeam-queue",
  "crossbeam-utils",
- "hashbrown 0.15.5",
+ "hashbrown 0.17.1",
  "hashlink",
- "indexmap 2.14.0",
+ "indexmap 2.14.2",
  "intrusive-collections",
- "papaya",
+ "inventory",
  "parking_lot",
  "portable-atomic",
  "rayon",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "salsa-macro-rules",
  "salsa-macros",
  "smallvec",
  "thin-vec",
  "tracing",
+ "triomphe",
+ "typeid",
 ]
 
 [[package]]
 name = "salsa-macro-rules"
-version = "0.23.0"
+version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2edb86a7e9c91f6d30c9ce054312721dbe773a162db27bbfae834d16177b30ce"
+checksum = "baf90a551c38f25ed8489111d3d5827aa18e1b85963f5e6a298505b1d1e2cb7e"
 
 [[package]]
 name = "salsa-macros"
-version = "0.23.0"
+version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0778d6e209051bc4e75acfe83bcd7848601ec3dbe9c3dbb982829020e9128af"
+checksum = "69dd77f86ec10e72e314f4ddf7c44c8d349e73cdff1aad524ba9668603fb0549"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
- "synstructure",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -2395,9 +2400,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "1.0.4"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
+checksum = "687274d293b6cdc6e73e0fee520bf2049650090d7164f87672d212a3c530cf4a"
 dependencies = [
  "dyn-clone",
  "ref-cast",
@@ -2405,28 +2410,12 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "seize"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4b8d813387d566f627f3ea1b914c068aac94c40ae27ec43f5f33bde65abefe7"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.28"
@@ -2439,102 +2428,74 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.228"
+version = "1.0.229"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
 dependencies = [
  "serde_core",
  "serde_derive",
 ]
 
-[[package]]
-name = "serde-untagged"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34836a629bcbc6f1afdf0907a744870039b1e14c0561cb26094fa683b158eff3"
-dependencies = [
- "erased-serde",
- "serde",
- "typeid",
-]
-
-[[package]]
-name = "serde-value"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
-dependencies = [
- "ordered-float",
- "serde",
-]
-
 [[package]]
 name = "serde_core"
-version = "1.0.228"
+version = "1.0.229"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.228"
+version = "1.0.229"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.145"
+version = "1.0.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
 dependencies = [
- "indexmap 2.14.0",
+ "foldhash 0.2.0",
+ "indexmap 2.14.2",
  "itoa",
  "memchr",
- "ryu",
  "serde",
  "serde_core",
+ "zmij",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "1.0.2"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee"
+checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "serde_with"
-version = "3.14.1"
+version = "3.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e"
+checksum = "df9adc193c780ef8f159aee8b61e2d5801aaa555e6eb0947fe45530ec506296f"
 dependencies = [
  "base64",
+ "bs58",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.14.0",
+ "indexmap 2.14.2",
+ "jiff",
  "schemars 0.9.0",
- "schemars 1.0.4",
- "serde",
- "serde_derive",
+ "schemars 1.2.2",
+ "serde_core",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -2542,14 +2503,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.14.1"
+version = "3.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e"
+checksum = "3e17bbc68e28663bbbb90df47e058aa7eda4fb445b89fe70457bb94fbccf6e49"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -2558,7 +2519,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.14.0",
+ "indexmap 2.14.2",
  "itoa",
  "ryu",
  "serde",
@@ -2576,31 +2537,43 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.3.0"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+
+[[package]]
+name = "slab"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "ba467056f1b547ed52077911161fc86985becbc60e8e1857c8a144dab0def891"
 
 [[package]]
 name = "smol_str"
-version = "0.3.2"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9676b89cd56310a87b93dec47b11af744f34d5fc9f367b829474eec0a891350d"
+checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523"
 dependencies = [
  "borsh",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "streaming-iterator"
@@ -2620,9 +2593,9 @@ version = "0.1.0"
 
 [[package]]
 name = "syn"
-version = "2.0.106"
+version = "2.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2630,21 +2603,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "synstructure"
-version = "0.13.2"
+name = "syn"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "unicode-ident",
 ]
 
 [[package]]
-name = "temp-dir"
-version = "0.1.16"
+name = "synstructure"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
 
 [[package]]
 name = "text-size"
@@ -2654,164 +2632,121 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233"
 
 [[package]]
 name = "thin-vec"
-version = "0.2.14"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d"
+checksum = "79def32ffcd477db1ff26f76dab9e3a91f0bd42a85ca96577089b24623056f9d"
 
 [[package]]
 name = "thiserror"
-version = "2.0.18"
+version = "2.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.18"
+version = "2.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.9"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.43"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
+checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134"
 dependencies = [
  "deranged",
+ "libc",
  "num-conv",
+ "num_threads",
  "powerfmt",
- "serde",
+ "serde_core",
  "time-core",
  "time-macros",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.6"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
 
 [[package]]
 name = "time-macros"
-version = "0.2.24"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
 [[package]]
-name = "tinystr"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.23"
+name = "tinyvec"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
-dependencies = [
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
- "toml_edit",
-]
+checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee"
 
 [[package]]
 name = "toml"
-version = "0.9.7"
+version = "1.1.8+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0"
+checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d"
 dependencies = [
- "indexmap 2.14.0",
+ "indexmap 2.14.2",
  "serde_core",
- "serde_spanned 1.0.2",
- "toml_datetime 0.7.2",
+ "serde_spanned",
+ "toml_datetime",
  "toml_parser",
  "toml_writer",
- "winnow 0.7.13",
+ "winnow 1.0.4",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.7.2"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1"
+checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053"
 dependencies = [
  "serde_core",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.22.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
-dependencies = [
- "indexmap 2.14.0",
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
- "toml_write",
- "winnow 0.7.13",
-]
-
 [[package]]
 name = "toml_parser"
-version = "1.1.2+spec-1.1.0"
+version = "1.1.5+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
+checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c"
 dependencies = [
- "winnow 1.0.2",
+ "winnow 1.0.4",
 ]
 
-[[package]]
-name = "toml_write"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
-
 [[package]]
 name = "toml_writer"
-version = "1.0.3"
+version = "1.1.3+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d163a63c116ce562a22cda521fcc4d79152e7aba014456fb5eb442f6d6a10109"
+checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770"
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -2820,20 +2755,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.30"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.119",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.34"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
 dependencies = [
  "once_cell",
  "valuable",
@@ -2856,16 +2791,16 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "log 0.4.28",
+ "log 0.4.34",
  "once_cell",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.20"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -2874,16 +2809,29 @@ dependencies = [
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "time",
  "tracing",
  "tracing-core",
  "tracing-log",
 ]
 
+[[package]]
+name = "tracing-tree"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac87aa03b6a4d5a7e4810d1a80c19601dbe0f8a837e9177f23af721c7ba7beec"
+dependencies = [
+ "nu-ansi-term",
+ "tracing-core",
+ "tracing-log",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "tree-sitter"
-version = "0.26.8"
+version = "0.26.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "887bd495d0582c5e3e0d8ece2233666169fa56a9644d172fc22ad179ab2d0538"
+checksum = "4dab76d0b724ba557954125188cf0633a1ca43199ced82d95c7b9c32cc3de1f3"
 dependencies = [
  "cc",
  "regex",
@@ -2915,15 +2863,15 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-language"
-version = "0.1.5"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8"
+checksum = "009994f150cc0cd50ff54917d5bc8bffe8cad10ca10d81c34da2ec421ae61782"
 
 [[package]]
 name = "tree-sitter-python"
-version = "0.23.6"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d065aaa27f3aaceaf60c1f0e0ac09e1cb9eb8ed28e7bcdaa52129cffc7f4b04"
+checksum = "6bf85fd39652e740bf60f46f4cda9492c3a9ad75880575bf14960f775cb74a1c"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -2951,9 +2899,9 @@ dependencies = [
 
 [[package]]
 name = "triomphe"
-version = "0.1.14"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
+checksum = "0d15f4f5898bcfc5d8a8e45ed30b2f108d710c1a2e5489dbf80e078f707181bc"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -2988,21 +2936,15 @@ checksum = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.19"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-properties"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.6"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
 
 [[package]]
 name = "unsafe-libyaml"
@@ -3010,24 +2952,6 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
-[[package]]
-name = "url"
-version = "2.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -3062,29 +2986,11 @@ version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
-[[package]]
-name = "wasi"
-version = "0.14.5+wasi-0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4494f6290a82f5fe584817a676a34b9d6763e8d9d18204009fb31dceca98fd4"
-dependencies = [
- "wasip2",
-]
-
-[[package]]
-name = "wasip2"
-version = "1.0.0+wasi-0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03fa2761397e5bd52002cd7e73110c71af2109aca4e521a9f40473fe685b0a24"
-dependencies = [
- "wit-bindgen",
-]
-
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.101"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b"
+checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3093,25 +2999,11 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.101"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb"
-dependencies = [
- "bumpalo",
- "log 0.4.28",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.101"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d"
+checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3119,22 +3011,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.101"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa"
+checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
- "syn",
- "wasm-bindgen-backend",
+ "syn 2.0.119",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.101"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1"
+checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
 dependencies = [
  "unicode-ident",
 ]
@@ -3145,90 +3037,66 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.61.2"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-link 0.1.3",
+ "windows-link",
  "windows-result",
  "windows-strings",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.60.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.119",
 ]
 
 [[package]]
 name = "windows-interface"
-version = "0.59.1"
+version = "0.59.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.119",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
-[[package]]
-name = "windows-link"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-result"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
 dependencies = [
- "windows-link 0.1.3",
+ "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
-dependencies = [
- "windows-link 0.1.3",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -3237,173 +3105,94 @@ version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.53.3",
+ "windows-targets",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.61.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa"
-dependencies = [
- "windows-link 0.2.0",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.53.3"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows-link 0.1.3",
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
+ "windows-link",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
 version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
-dependencies = [
- "memchr",
-]
 
 [[package]]
 name = "winnow"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0"
-
-[[package]]
-name = "wit-bindgen"
-version = "0.45.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36"
-
-[[package]]
-name = "writeable"
-version = "0.6.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
 
 [[package]]
 name = "yansi"
@@ -3432,7 +3221,8 @@ version = "0.1.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 3.0.9",
+ "yeast-schema",
 ]
 
 [[package]]
@@ -3445,126 +3235,34 @@ dependencies = [
 ]
 
 [[package]]
-name = "yoke"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.8.0"
+name = "zmij"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "zerofrom"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "zerotrie"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
 
 [[package]]
 name = "zstd"
-version = "0.13.3"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
+checksum = "057cfd910cfac363a0ada849592624b4c9ff2e10bef504c3433810d78ed96f93"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "7.2.4"
+version = "8.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
+checksum = "bdd44c6a7284e91f3717755b24315a302edd9153a01f753c3cba3d765e8eafac"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.16+zstd.1.5.7"
+version = "2.1.1+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
+checksum = "aeec9eaf2dffbbd09201e23bd0ffcbaa33bb8e9266a10734fd7ed90a85eca078"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/MODULE.bazel b/MODULE.bazel
index e8d49c11bcb4..cbc76799eaa1 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -14,33 +14,49 @@ local_path_override(
 
 # see https://registry.bazel.build/ for a list of available packages
 
-bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "rules_cc", version = "0.2.17")
-bazel_dep(name = "rules_go", version = "0.60.0")
-bazel_dep(name = "rules_java", version = "9.6.1")
+bazel_dep(name = "platforms", version = "1.1.0")
+bazel_dep(name = "rules_cc", version = "0.2.27")
+bazel_dep(name = "rules_go", version = "0.65.0")
+bazel_dep(name = "rules_java", version = "9.9.0")
 bazel_dep(name = "rules_pkg", version = "1.2.0")
-bazel_dep(name = "rules_nodejs", version = "6.7.5")
-bazel_dep(name = "rules_python", version = "1.9.0")
-bazel_dep(name = "rules_shell", version = "0.7.1")
-bazel_dep(name = "bazel_skylib", version = "1.9.0")
-bazel_dep(name = "abseil-cpp", version = "20260107.1", repo_name = "absl")
-bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1", repo_name = "json")
-bazel_dep(name = "fmt", version = "12.1.0-codeql.1")
-bazel_dep(name = "rules_kotlin", version = "2.2.2-codeql.1")
-bazel_dep(name = "gazelle", version = "0.50.0")
-bazel_dep(name = "rules_dotnet", version = "0.21.5-codeql.1")
-bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
-bazel_dep(name = "rules_rust", version = "0.69.0")
-bazel_dep(name = "rules_swift", version = "4.0.0-rc4")
-bazel_dep(name = "swift-syntax", version = "603.0.2")
-
-# Needed so we can `use_repo` `local_config_xcode` and
-# `local_config_apple_cc_toolchains` below (referenced by the per-target
-# Xcode-config transition in `unified/swift-syntax-rs/xcode_transition.bzl`).
-bazel_dep(name = "apple_support", version = "2.6.1")
-bazel_dep(name = "zstd", version = "1.5.7.bcr.1")
-
-bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
+bazel_dep(name = "rules_nodejs", version = "6.7.7")
+bazel_dep(name = "rules_python", version = "2.4.6")
+bazel_dep(name = "rules_shell", version = "0.8.0")
+bazel_dep(name = "bazel_skylib", version = "1.9.2")
+bazel_dep(name = "abseil-cpp", version = "20260817.0", repo_name = "absl")
+bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.2", repo_name = "json")
+bazel_dep(name = "fmt", version = "12.2.0.bcr.1-codeql.1")
+bazel_dep(name = "rules_kotlin", version = "2.4.21-codeql.1")
+bazel_dep(name = "gazelle", version = "0.54.0")
+bazel_dep(name = "rules_dotnet", version = "0.22.2-codeql.1")
+bazel_dep(name = "googletest", version = "1.18.0.bcr.1")
+bazel_dep(name = "rules_rust", version = "0.75.0")
+bazel_dep(name = "rules_swift", version = "4.0.0-rc5-codeql.3")
+bazel_dep(name = "swift-syntax", version = "604.0.0")
+bazel_dep(name = "zstd", version = "1.5.7.bcr.3")
+
+bazel_dep(name = "buildifier_prebuilt", version = "10.1.0", dev_dependency = True)
+
+# Pin the compiler to support the Kotlin 1.8 and 1.9 language versions required by older extractors.
+kotlin = use_extension("@rules_kotlin//src/main/starlark/core/repositories:bzlmod_setup.bzl", "rules_kotlin_extensions")
+kotlin.kotlinc_version(
+    sha256 = "a623871f1cd9c938946948b70ef9170879f0758043885bbd30c32f024e511714",
+    version = "2.2.21",
+)
+use_repo(
+    kotlin,
+    "btapi_impl",
+    "com_github_google_ksp",
+    "com_github_jetbrains_kotlin",
+    "com_github_jetbrains_kotlin_git",
+    "com_github_pinterest_ktlint",
+    "jarjar",
+    "kotlin_build_tools_api",
+    "kotlinx_coroutines_core_jvm",
+    "kotlinx_serialization_core_jvm",
+    "kotlinx_serialization_json",
+    "kotlinx_serialization_json_jvm",
+)
 
 # Keep edition and version approximately in sync with internal repo.
 # the versions there are canonical, the versions here are used for CI in github/codeql, as well as for the vendoring of dependencies.
@@ -50,7 +66,7 @@ RUST_EDITION = "2024"
 # a nightly toolchain is required to enable experimental_use_cc_common_link, which we require internally
 # we prefer to run the same version as internally, even if experimental_use_cc_common_link is not really
 # required in this repo
-RUST_VERSION = "nightly/2026-01-22"
+RUST_VERSION = "nightly/2026-09-03"
 
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(
@@ -62,26 +78,26 @@ rust.toolchain(
     ],
     # generated by buildutils-internal/scripts/fill-rust-sha256s.py (internal repo)
     sha256s = {
-        "2026-01-22/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "88db619323cc1321630d124efa51ed02fabc5e020f08cfa0eda2c0ac1afbe69a",
-        "2026-01-22/rustc-nightly-x86_64-apple-darwin.tar.xz": "08484da3fa38db56f93629aeabdc0ae9ff8ed9704c0792d35259cbc849b3f54c",
-        "2026-01-22/rustc-nightly-aarch64-apple-darwin.tar.xz": "a39c0b21b7058e364ea1bd43144e42e4bf1efade036b2e82455f2afce194ee81",
-        "2026-01-22/rustc-nightly-x86_64-pc-windows-msvc.tar.xz": "d00248ee9850dbb6932b2578e32ff74fc7c429854c1aa071066ca31b65385a3b",
-        "2026-01-22/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "70656a0ce994ffff16d5a35a7b170a0acd41e9bb54a589c96ed45bf97b094a4d",
-        "2026-01-22/clippy-nightly-x86_64-apple-darwin.tar.xz": "fe242519fa961522734733009705aec3c2d9a20cc57291f2aa614e5e6262c88f",
-        "2026-01-22/clippy-nightly-aarch64-apple-darwin.tar.xz": "38bb226363ec97c9722edf966cd58774a683e19fd2ff2a6030094445d51e06f9",
-        "2026-01-22/clippy-nightly-x86_64-pc-windows-msvc.tar.xz": "6da9b4470beea67abfebf046f141eee0d2a8db7c7a9e4e2294478734fd477228",
-        "2026-01-22/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "99004e9d10c43a01499642f53bb3184d41137a95d65bfb217098840a9e79e892",
-        "2026-01-22/cargo-nightly-x86_64-apple-darwin.tar.xz": "6e021394cf8d8400ac6cfdfcef24e4d74f988e91eb8028b36de3a64ce3502990",
-        "2026-01-22/cargo-nightly-aarch64-apple-darwin.tar.xz": "4b2494cb69ab64132cddbc411a38ea9f1105e54d6f986e43168d54f79510c673",
-        "2026-01-22/cargo-nightly-x86_64-pc-windows-msvc.tar.xz": "c36613cf57407212d10d37b76e49a60ff42336e953cdff9e177283f530a83fc1",
-        "2026-01-22/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "0b123c5027dbd833aae6845ffe9bd07d309bf798746a7176aadaea68fbcbd05d",
-        "2026-01-22/llvm-tools-nightly-x86_64-apple-darwin.tar.xz": "a47864491ad5619158c950ab7570fb6e487d5117338585c27334d45824b406d8",
-        "2026-01-22/llvm-tools-nightly-aarch64-apple-darwin.tar.xz": "db9bc826d6e2e7e914505d50157682e516ceb90357e83d77abddc32c2d962f41",
-        "2026-01-22/llvm-tools-nightly-x86_64-pc-windows-msvc.tar.xz": "ffaa406932b2fe62e01dad61cf4ed34860a5d2a6f9306ca340d79e630d930039",
-        "2026-01-22/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "e9c0d5e06e18a4b509391b3088f29293e310cdc8ccc865be8fa3f09733326925",
-        "2026-01-22/rust-std-nightly-x86_64-apple-darwin.tar.xz": "25d75995cee679a4828ca9fe48c5a31a67c3b0846018440ef912e5a6208f53f6",
-        "2026-01-22/rust-std-nightly-aarch64-apple-darwin.tar.xz": "e4132bf3f2eed4684c86756a02315bcf481c23e675e3e25630fc604c9cb4594c",
-        "2026-01-22/rust-std-nightly-x86_64-pc-windows-msvc.tar.xz": "961bb535ef95ae8a5fa4e224cb94aff190f155c45a9bcf7a53e184b024aa41b1",
+        "2026-09-03/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "bd1f0986150596835e808635d81786c60ab9da3981687dfb00918329925e837a",
+        "2026-09-03/rustc-nightly-x86_64-apple-darwin.tar.xz": "8f3da4fcdaf5c8574f723ee0dab80c0e47e59e97fb55c1b84a1dc96dc2b90f6b",
+        "2026-09-03/rustc-nightly-aarch64-apple-darwin.tar.xz": "ef4e9dda67ee052fb60b506f76a5dbd2f1c45822aec878b31b98c2fe75ab6f84",
+        "2026-09-03/rustc-nightly-x86_64-pc-windows-msvc.tar.xz": "b2feb930850f69c40c4fc4658a054676de9a3c263b6e1afbdad86b61ab0940ef",
+        "2026-09-03/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "9715b53a8e80261f85eeddc6096e82e6038218ddd81e9fd8d7d5d558d076191b",
+        "2026-09-03/clippy-nightly-x86_64-apple-darwin.tar.xz": "83b26f9becd27e65b822a70d2f0ca1b676e0bad3d7a99597adf65326692744bb",
+        "2026-09-03/clippy-nightly-aarch64-apple-darwin.tar.xz": "51708a4c7399d2a71e5fcaa491a9e233e63c98f67dcad7bbe11fd164ba604690",
+        "2026-09-03/clippy-nightly-x86_64-pc-windows-msvc.tar.xz": "2990517d181ffe467505070d8842ae63089b781addedffa296100d018b746979",
+        "2026-09-03/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "a60615509715996b8d4d54b30a7db8a1cd62400d06206dbeeb20b223ad1e6b34",
+        "2026-09-03/cargo-nightly-x86_64-apple-darwin.tar.xz": "1650d406de2cef5d7b0d573fa131937a09559c33b03766380fb3b97eb30b2493",
+        "2026-09-03/cargo-nightly-aarch64-apple-darwin.tar.xz": "058ced0d2b26cde728a0553a572c0895cbbc5bdaaf23dc995649737cb2dd043d",
+        "2026-09-03/cargo-nightly-x86_64-pc-windows-msvc.tar.xz": "1ce268af2f3e143b4a4aa114cfcead7091659af7b36660b007652b1f34329dff",
+        "2026-09-03/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "c4557aaddd0b4a65593bd1f8474322fe3d91e5cc41a0221f383a8780256ad102",
+        "2026-09-03/llvm-tools-nightly-x86_64-apple-darwin.tar.xz": "47d0e8184d270c223c298a227b0485afcfa5dc70429f5454b472a8b69ca03e9c",
+        "2026-09-03/llvm-tools-nightly-aarch64-apple-darwin.tar.xz": "141b1f097db3a292f8641fe6e4ec1e48edb758154a2defa2dbd4a088af72caf7",
+        "2026-09-03/llvm-tools-nightly-x86_64-pc-windows-msvc.tar.xz": "f6bb9e1cabc5b790bd419b7fe18c7ff132a40d0ff2db794efd2d5f4c0b535ba0",
+        "2026-09-03/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "7bfd37eda0920b04ef50b4785475c5fa2cea8df19c24f3879d0b5cac6e4dcdbc",
+        "2026-09-03/rust-std-nightly-x86_64-apple-darwin.tar.xz": "462e83115594799aff5d77a221b29a59d5e166435773c8eae37d047a8a5f39e1",
+        "2026-09-03/rust-std-nightly-aarch64-apple-darwin.tar.xz": "79f676f8265e332ece71eea226a3a9b124506c9460e758ca1f669f80e0336eb0",
+        "2026-09-03/rust-std-nightly-x86_64-pc-windows-msvc.tar.xz": "075661d74da5a65b8d5c8adb9375a868fea80d5b0e5c131af6f4cd059d6b3113",
     },
     versions = [RUST_VERSION],
 )
@@ -94,10 +110,12 @@ register_toolchains("@rust_toolchains//:all")
 py_deps = use_extension("//misc/bazel/3rdparty:py_deps_extension.bzl", "p")
 use_repo(
     py_deps,
+    "vendor_py",
     "vendor_py__anyhow-1.0.95",
     "vendor_py__cc-1.2.14",
     "vendor_py__clap-4.5.30",
     "vendor_py__regex-1.11.1",
+    "vendor_py__serde_json-1.0.138",
     "vendor_py__tree-sitter-0.24.7",
     "vendor_py__tree-sitter-graph-0.12.0",
 )
@@ -107,73 +125,78 @@ use_repo(
 tree_sitter_extractors_deps = use_extension("//misc/bazel/3rdparty:tree_sitter_extractors_extension.bzl", "r")
 use_repo(
     tree_sitter_extractors_deps,
-    "vendor_ts__anyhow-1.0.100",
-    "vendor_ts__argfile-0.2.1",
+    "vendor_ts",
+    "vendor_ts__anyhow-1.0.104",
     "vendor_ts__chalk-ir-0.104.0",
-    "vendor_ts__chrono-0.4.42",
-    "vendor_ts__clap-4.5.48",
+    "vendor_ts__chrono-0.4.45",
+    "vendor_ts__clap-4.6.7",
     "vendor_ts__dunce-1.0.5",
-    "vendor_ts__either-1.15.0",
+    "vendor_ts__either-1.19.0",
     "vendor_ts__encoding-0.2.33",
     "vendor_ts__figment-0.10.19",
-    "vendor_ts__flate2-1.1.2",
-    "vendor_ts__glob-0.3.3",
-    "vendor_ts__globset-0.4.16",
-    "vendor_ts__itertools-0.14.0",
-    "vendor_ts__lazy_static-1.5.0",
+    "vendor_ts__flate2-1.1.9",
+    "vendor_ts__glob-0.3.4",
+    "vendor_ts__globset-0.4.18",
+    "vendor_ts__itertools-0.15.0",
+    "vendor_ts__lazy_static-1.5.1",
     "vendor_ts__mustache-0.9.0",
     "vendor_ts__num-traits-0.2.19",
     "vendor_ts__num_cpus-1.17.0",
-    "vendor_ts__proc-macro2-1.0.101",
-    "vendor_ts__quote-1.0.41",
-    "vendor_ts__ra_ap_base_db-0.0.301",
-    "vendor_ts__ra_ap_cfg-0.0.301",
-    "vendor_ts__ra_ap_hir-0.0.301",
-    "vendor_ts__ra_ap_hir_def-0.0.301",
-    "vendor_ts__ra_ap_hir_expand-0.0.301",
-    "vendor_ts__ra_ap_hir_ty-0.0.301",
-    "vendor_ts__ra_ap_ide_db-0.0.301",
-    "vendor_ts__ra_ap_intern-0.0.301",
-    "vendor_ts__ra_ap_load-cargo-0.0.301",
-    "vendor_ts__ra_ap_parser-0.0.301",
-    "vendor_ts__ra_ap_paths-0.0.301",
-    "vendor_ts__ra_ap_project_model-0.0.301",
-    "vendor_ts__ra_ap_span-0.0.301",
-    "vendor_ts__ra_ap_stdx-0.0.301",
-    "vendor_ts__ra_ap_syntax-0.0.301",
-    "vendor_ts__ra_ap_vfs-0.0.301",
-    "vendor_ts__rand-0.9.2",
-    "vendor_ts__rayon-1.11.0",
-    "vendor_ts__regex-1.11.3",
-    "vendor_ts__serde-1.0.228",
-    "vendor_ts__serde_json-1.0.145",
-    "vendor_ts__serde_with-3.14.1",
+    "vendor_ts__proc-macro2-1.0.107",
+    "vendor_ts__quote-1.0.47",
+    "vendor_ts__ra_ap_base_db-0.0.358",
+    "vendor_ts__ra_ap_cfg-0.0.358",
+    "vendor_ts__ra_ap_hir-0.0.358",
+    "vendor_ts__ra_ap_hir_def-0.0.358",
+    "vendor_ts__ra_ap_hir_expand-0.0.358",
+    "vendor_ts__ra_ap_hir_ty-0.0.358",
+    "vendor_ts__ra_ap_ide_db-0.0.358",
+    "vendor_ts__ra_ap_intern-0.0.358",
+    "vendor_ts__ra_ap_load-cargo-0.0.358",
+    "vendor_ts__ra_ap_parser-0.0.358",
+    "vendor_ts__ra_ap_paths-0.0.358",
+    "vendor_ts__ra_ap_project_model-0.0.358",
+    "vendor_ts__ra_ap_span-0.0.358",
+    "vendor_ts__ra_ap_stdx-0.0.358",
+    "vendor_ts__ra_ap_syntax-0.0.358",
+    "vendor_ts__ra_ap_syntax-bridge-0.0.358",
+    "vendor_ts__ra_ap_toolchain-0.0.358",
+    "vendor_ts__ra_ap_vfs-0.0.358",
+    "vendor_ts__rand-0.10.3",
+    "vendor_ts__rayon-1.12.0",
+    "vendor_ts__regex-1.13.1",
+    "vendor_ts__serde-1.0.229",
+    "vendor_ts__serde_json-1.0.154",
+    "vendor_ts__serde_with-3.24.0",
     "vendor_ts__serde_yaml-0.9.34-deprecated",
-    "vendor_ts__syn-2.0.106",
-    "vendor_ts__toml-0.9.7",
-    "vendor_ts__tracing-0.1.41",
+    "vendor_ts__syn-3.0.9",
+    "vendor_ts__toml-1.1.8-spec-1.1.0",
+    "vendor_ts__tracing-0.1.44",
     "vendor_ts__tracing-flame-0.2.0",
-    "vendor_ts__tracing-subscriber-0.3.20",
-    "vendor_ts__tree-sitter-0.26.8",
+    "vendor_ts__tracing-subscriber-0.3.23",
+    "vendor_ts__tree-sitter-0.26.9",
     "vendor_ts__tree-sitter-embedded-template-0.25.0",
     "vendor_ts__tree-sitter-json-0.24.8",
-    "vendor_ts__tree-sitter-python-0.23.6",
+    "vendor_ts__tree-sitter-python-0.25.0",
     "vendor_ts__tree-sitter-ql-0.23.1",
     "vendor_ts__tree-sitter-ruby-0.23.1",
-    "vendor_ts__triomphe-0.1.14",
+    "vendor_ts__triomphe-0.1.17",
     "vendor_ts__ungrammar-1.16.1",
-    "vendor_ts__zstd-0.13.3",
+    "vendor_ts__zstd-0.14.2",
 )
 
 http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-# rust-analyzer sources needed by the rust ast-generator (see `rust/ast-generator/README.md`)
-RUST_ANALYZER_SRC_TAG = "2025-01-07"
+# rust-analyzer sources needed by the rust ast-generator (see `rust/ast-generator/README.md`).
+# These should be updated through the `rust/scripts/update_rust_analyzer.py` script.
+RUST_ANALYZER_SRC_TAG = "2026-10-12"
+
+RUST_ANALYZER_SRC_INTEGRITY = "sha256-S9tGdGw7wrZjiMVx+/tZ0RE39Uw/wvO6GKDkGNvAZCA="
 
 http_archive(
     name = "rust-analyzer-src",
     build_file = "//rust/ast-generator:BUILD.rust-analyzer-src.bazel",
-    integrity = "sha256-eo8mIaUafZL8LOM65bDIIIXw1rNQ/P/x5RK/XUtgo5g=",
+    integrity = RUST_ANALYZER_SRC_INTEGRITY,
     patch_args = ["-p1"],
     patches = [
         "//rust/ast-generator:patches/rust-analyzer.patch",
@@ -183,7 +206,7 @@ http_archive(
 )
 
 dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
-dotnet.toolchain(dotnet_version = "10.0.100")
+dotnet.toolchain(dotnet_version = "10.0.201")
 use_repo(dotnet, "dotnet_toolchains")
 
 register_toolchains("@dotnet_toolchains//:all")
@@ -223,10 +246,7 @@ use_repo(
     "swift-resource-dir-macos",
 )
 
-# Swift toolchain for building `unified/swift-syntax-rs`. On Linux we register
-# a hermetic swift.org toolchain as the exec toolchain; on macOS `rules_swift`
-# auto-registers `xcode_swift_toolchain` (host Xcode + OS-provided Swift
-# runtime), which is not hermetic.
+# Hermetic swift.org toolchain for building `unified/swift-syntax-rs`.
 #
 # The version is pinned as a literal rather than read from
 # `unified/swift-syntax-rs/.swift-version` via `swift_version_file`: the latter
@@ -235,29 +255,26 @@ use_repo(
 # `unified/swift-syntax-rs` package is not loadable in that context. Keep this
 # in sync with `unified/swift-syntax-rs/.swift-version` (used by the `cargo`
 # build) and the `swift-syntax` release in `swift/Package.swift`.
-swift = use_extension("@rules_swift//swift:extensions.bzl", "swift")
+swift = use_extension("@rules_swift//swift:extensions.bzl", "swift", dev_dependency = True)
 swift.toolchain(
     name = "swift_toolchain",
-    swift_version = "6.3.2",
+    swift_version = "6.3.3",
 )
 use_repo(
     swift,
     "swift_toolchain",
     "swift_toolchain_ubuntu22.04",
+    "swift_toolchain_ubuntu22.04-aarch64",
+    "swift_toolchain_xcode",
 )
 
 register_toolchains(
     "@swift_toolchain//:swift_toolchain_exec_ubuntu22.04",
+    "@swift_toolchain//:swift_toolchain_exec_ubuntu22.04-aarch64",
+    "@swift_toolchain//:swift_toolchain_exec_xcode",
+    dev_dependency = True,
 )
 
-# `apple_support`'s xcode_config and CC toolchains, needed by the Xcode
-# transition in `unified/swift-syntax-rs/xcode_transition.bzl`.
-xcode_configure = use_extension("@apple_support//xcode:xcode_configure.bzl", "xcode_configure_extension")
-use_repo(xcode_configure, "local_config_xcode")
-
-apple_cc_configure = use_extension("@apple_support//crosstool:setup.bzl", "apple_cc_configure_extension")
-use_repo(apple_cc_configure, "local_config_apple_cc_toolchains")
-
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 node.toolchain(
     name = "nodejs",
@@ -288,6 +305,7 @@ use_repo(
     "kotlin-compiler-2.3.0",
     "kotlin-compiler-2.3.20",
     "kotlin-compiler-2.4.0",
+    "kotlin-compiler-2.4.20",
     "kotlin-compiler-embeddable-1.8.0",
     "kotlin-compiler-embeddable-1.9.0-Beta",
     "kotlin-compiler-embeddable-1.9.20-Beta",
@@ -300,6 +318,7 @@ use_repo(
     "kotlin-compiler-embeddable-2.3.0",
     "kotlin-compiler-embeddable-2.3.20",
     "kotlin-compiler-embeddable-2.4.0",
+    "kotlin-compiler-embeddable-2.4.20",
     "kotlin-stdlib-1.8.0",
     "kotlin-stdlib-1.9.0-Beta",
     "kotlin-stdlib-1.9.20-Beta",
@@ -312,10 +331,11 @@ use_repo(
     "kotlin-stdlib-2.3.0",
     "kotlin-stdlib-2.3.20",
     "kotlin-stdlib-2.4.0",
+    "kotlin-stdlib-2.4.20",
 )
 
 go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
-go_sdk.download(version = "1.26.5")
+go_sdk.download(version = "1.27.3")
 
 go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//go/extractor:go.mod")
diff --git a/actions/extractor/tools/autobuild-impl.ps1 b/actions/extractor/tools/autobuild-impl.ps1
index e232cd3cc545..6f04a28520d3 100644
--- a/actions/extractor/tools/autobuild-impl.ps1
+++ b/actions/extractor/tools/autobuild-impl.ps1
@@ -9,7 +9,8 @@ $DefaultPathFilters = @(
     'include:.github/reusable_workflows/**/*.yml',
     'include:.github/reusable_workflows/**/*.yaml',
     'include:**/action.yml',
-    'include:**/action.yaml'
+    'include:**/action.yaml',
+    'include:**/actions.lock'
 )
 
 if ($null -ne $env:LGTM_INDEX_FILTERS) {
diff --git a/actions/extractor/tools/autobuild.sh b/actions/extractor/tools/autobuild.sh
index f2cbb7ddfa7e..c2794044ee64 100755
--- a/actions/extractor/tools/autobuild.sh
+++ b/actions/extractor/tools/autobuild.sh
@@ -14,6 +14,7 @@ include:.github/reusable_workflows/**/*.yml
 include:.github/reusable_workflows/**/*.yaml
 include:**/action.yml
 include:**/action.yaml
+include:**/actions.lock
 END
 )
 
diff --git a/actions/extractor/tools/baseline-config.json b/actions/extractor/tools/baseline-config.json
index fde0bd1ecdff..5c0044c8d9d8 100644
--- a/actions/extractor/tools/baseline-config.json
+++ b/actions/extractor/tools/baseline-config.json
@@ -5,6 +5,7 @@
         ".github/reusable_workflows/**/*.yml",
         ".github/reusable_workflows/**/*.yaml",
         "**/action.yml",
-        "**/action.yaml"
+        "**/action.yaml",
+        "**/actions.lock"
     ]
 }
diff --git a/actions/ql/consistency-queries/CfgConsistency.ql b/actions/ql/consistency-queries/CfgConsistency.ql
new file mode 100644
index 000000000000..76d0384ce010
--- /dev/null
+++ b/actions/ql/consistency-queries/CfgConsistency.ql
@@ -0,0 +1,2 @@
+import codeql.actions.Cfg
+import ControlFlow::Consistency
diff --git a/actions/ql/consistency-queries/qlpack.yml b/actions/ql/consistency-queries/qlpack.yml
new file mode 100644
index 000000000000..41594962c859
--- /dev/null
+++ b/actions/ql/consistency-queries/qlpack.yml
@@ -0,0 +1,5 @@
+name: codeql/actions-consistency-queries
+groups: [actions, test, consistency-queries]
+dependencies:
+  codeql/actions-all: ${workspace}
+warnOnImplicitThis: true
diff --git a/actions/ql/integration-tests/actions-lock/query/actions.ql b/actions/ql/integration-tests/actions-lock/query/actions.ql
new file mode 100644
index 000000000000..03451f476fcd
--- /dev/null
+++ b/actions/ql/integration-tests/actions-lock/query/actions.ql
@@ -0,0 +1,4 @@
+import codeql.actions.Lock
+
+from ActionsLock lock
+select lock.getFile()
diff --git a/actions/ql/integration-tests/actions-lock/query/qlpack.yml b/actions/ql/integration-tests/actions-lock/query/qlpack.yml
new file mode 100644
index 000000000000..03c0b4e9a3af
--- /dev/null
+++ b/actions/ql/integration-tests/actions-lock/query/qlpack.yml
@@ -0,0 +1,4 @@
+name: codeql/actions-lock-integration-test
+dependencies:
+  codeql/actions-all: "*"
+warnOnImplicitThis: true
diff --git a/actions/ql/integration-tests/actions-lock/src/.github/workflows/actions.lock b/actions/ql/integration-tests/actions-lock/src/.github/workflows/actions.lock
new file mode 100644
index 000000000000..bb91aa093d86
--- /dev/null
+++ b/actions/ql/integration-tests/actions-lock/src/.github/workflows/actions.lock
@@ -0,0 +1,19 @@
+# This file is machine-generated by `gh actions-lock`.
+# Do not edit by hand; run `gh actions-lock` to update.
+# Docs: https://gh.io/actions-lockfile
+version: 'v0.0.2'
+workflows:
+    '.github/workflows/test.yml':
+        - 'actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1'
+        - 'github/codeql-action@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28'
+dependencies:
+    'actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1':
+        ref: '3d3c42e5aac5ba805825da76410c181273ba90b1'
+        commit: 'sha1-3d3c42e5aac5ba805825da76410c181273ba90b1'
+        owner_id: 44036562
+        repo_id: 197814629
+    'github/codeql-action@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28':
+        ref: 'v4.37.8'
+        commit: 'sha1-db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28'
+        owner_id: 9919
+        repo_id: 259445878
diff --git a/actions/ql/integration-tests/actions-lock/src/.github/workflows/test.yml b/actions/ql/integration-tests/actions-lock/src/.github/workflows/test.yml
new file mode 100644
index 000000000000..79afdcdf7006
--- /dev/null
+++ b/actions/ql/integration-tests/actions-lock/src/.github/workflows/test.yml
@@ -0,0 +1,6 @@
+on: push
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo test
diff --git a/actions/ql/integration-tests/actions-lock/test.py b/actions/ql/integration-tests/actions-lock/test.py
new file mode 100644
index 000000000000..3d63143dc1c2
--- /dev/null
+++ b/actions/ql/integration-tests/actions-lock/test.py
@@ -0,0 +1,4 @@
+def test_actions_lock(codeql, actions, javascript):
+    codeql.database.create(source_root="src", language="actions")
+    output = codeql.query.run("query/actions.ql", database="test-db", _capture=True)
+    assert "actions.lock" in output
diff --git a/actions/ql/lib/CHANGELOG.md b/actions/ql/lib/CHANGELOG.md
index 630b089310b9..ba1dabc81f1c 100644
--- a/actions/ql/lib/CHANGELOG.md
+++ b/actions/ql/lib/CHANGELOG.md
@@ -1,3 +1,55 @@
+## 0.7.1
+
+No user-facing changes.
+
+## 0.7.0
+
+### Breaking Changes
+
+* The GitHub Actions control flow graph (CFG) now uses the shared CFG library. The CFG includes explicit before and after nodes and uses the shared entry and exit node representations. Existing code that relies on specific CFG nodes, edges, textual representations, or basic block boundaries may need to be updated. The legacy `Completion`, `NormalCompletion`, `SimpleCompletion`, `BooleanCompletion`, and `ReturnCompletion` classes have been removed because completions are no longer part of the Actions CFG API. Code that inspected completions should inspect CFG edge labels such as `DirectSuccessor`, `BooleanSuccessor`, and `ReturnSuccessor` instead.
+
+## 0.6.3
+
+### Minor Analysis Improvements
+
+* The `trustedActionsOwnerDataModel` extensible predicate, used by the `actions/unpinned-tag` query, now supports removing an owner from the trusted set by adding an entry prefixed with `!` (for example, `!github`). This makes it possible to distrust first-party owners (`actions`, `github`, `advanced-security`) so that unpinned tags for their Actions are reported.
+
+## 0.6.2
+
+No user-facing changes.
+
+## 0.6.1
+
+### New Features
+
+* GitHub Actions databases now extract `actions.lock` files. The new `ActionsLock` class
+  provides access to their YAML abstract syntax trees.
+
+### Minor Analysis Improvements
+
+* Checks on author association fields read from the event payload (e.g. `github.event.pull_request.author_association`) now only count as protection for events whose payload actually populates that field. Previously, a condition such as `github.event.pull_request.author_association != 'NONE'` on a workflow triggered by `issues` events was treated as a protective check even though `github.event.pull_request` is not populated for `issues` events, which makes the condition vacuous. This change may result in more alerts for queries using the `ControlCheck` class.
+
+## 0.6.0
+
+### Breaking Changes
+
+* Checks on actor fields read from the event payload (e.g. `github.event.pull_request.user.login`) were split out of `ActorIfCheck` into a new class `EventActorIfCheck`. The `ActorIfCheck` class now only covers `github.actor` and `github.triggering_actor`.
+
+### Minor Analysis Improvements
+
+* Checks on actor fields read from the event payload (e.g. `github.event.pull_request.user.login`) now only count as protection for events whose payload actually populates that field. Previously, a condition such as `github.event.pull_request.user.login != 'name'` on a workflow triggered by `issues` events was treated as a protective check even though `github.event.pull_request` is not populated for `issues` events, which makes the condition vacuous. This change may result in more alerts for queries using the `ControlCheck` class.
+* Added an option to `EnvironmentCheck` to become specified by a MaD model, otherwise it will continue as the default it previously was. Without adding models to `actions/ql/lib/ext/config/deployment_environment.yml` the behavior of every query will be unchanged. When models are added queries using `ControlCheck` may find more results in cases where an environment is no longer a sufficient sanitizer.
+
+## 0.5.0
+
+### Breaking Changes
+
+* The `codeql.actions.security.SelfHostedQuery` module has been removed because runner labels do not reliably distinguish self-hosted runners from managed runners.
+
+### Minor Analysis Improvements
+
+* GitHub Actions analysis now recognizes untrusted data in `github.event.merge_group` for workflows triggered by the `merge_group` event.
+
 ## 0.4.40
 
 ### Minor Analysis Improvements
diff --git a/actions/ql/lib/actions.qll b/actions/ql/lib/actions.qll
index 2c1d1cee9259..f57127b0f031 100644
--- a/actions/ql/lib/actions.qll
+++ b/actions/ql/lib/actions.qll
@@ -1 +1,2 @@
 import codeql.actions.Ast
+import codeql.actions.Lock
diff --git a/actions/ql/lib/change-notes/2026-07-27-merge-group-event-source.md b/actions/ql/lib/change-notes/2026-07-27-merge-group-event-source.md
deleted file mode 100644
index 41b39b6c452f..000000000000
--- a/actions/ql/lib/change-notes/2026-07-27-merge-group-event-source.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* GitHub Actions analysis now recognizes untrusted data in `github.event.merge_group` for workflows triggered by the `merge_group` event.
\ No newline at end of file
diff --git a/actions/ql/lib/change-notes/2026-08-03-deprecate-self-hosted-query.md b/actions/ql/lib/change-notes/2026-08-03-deprecate-self-hosted-query.md
deleted file mode 100644
index 932a9e7ca49a..000000000000
--- a/actions/ql/lib/change-notes/2026-08-03-deprecate-self-hosted-query.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: deprecated
----
-* The `codeql.actions.security.SelfHostedQuery` module has been deprecated because runner labels do not reliably distinguish self-hosted runners from managed runners.
\ No newline at end of file
diff --git a/actions/ql/lib/change-notes/released/0.5.0.md b/actions/ql/lib/change-notes/released/0.5.0.md
new file mode 100644
index 000000000000..3e89301899bd
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.5.0.md
@@ -0,0 +1,9 @@
+## 0.5.0
+
+### Breaking Changes
+
+* The `codeql.actions.security.SelfHostedQuery` module has been removed because runner labels do not reliably distinguish self-hosted runners from managed runners.
+
+### Minor Analysis Improvements
+
+* GitHub Actions analysis now recognizes untrusted data in `github.event.merge_group` for workflows triggered by the `merge_group` event.
diff --git a/actions/ql/lib/change-notes/released/0.6.0.md b/actions/ql/lib/change-notes/released/0.6.0.md
new file mode 100644
index 000000000000..3fd465a31cf3
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.6.0.md
@@ -0,0 +1,10 @@
+## 0.6.0
+
+### Breaking Changes
+
+* Checks on actor fields read from the event payload (e.g. `github.event.pull_request.user.login`) were split out of `ActorIfCheck` into a new class `EventActorIfCheck`. The `ActorIfCheck` class now only covers `github.actor` and `github.triggering_actor`.
+
+### Minor Analysis Improvements
+
+* Checks on actor fields read from the event payload (e.g. `github.event.pull_request.user.login`) now only count as protection for events whose payload actually populates that field. Previously, a condition such as `github.event.pull_request.user.login != 'name'` on a workflow triggered by `issues` events was treated as a protective check even though `github.event.pull_request` is not populated for `issues` events, which makes the condition vacuous. This change may result in more alerts for queries using the `ControlCheck` class.
+* Added an option to `EnvironmentCheck` to become specified by a MaD model, otherwise it will continue as the default it previously was. Without adding models to `actions/ql/lib/ext/config/deployment_environment.yml` the behavior of every query will be unchanged. When models are added queries using `ControlCheck` may find more results in cases where an environment is no longer a sufficient sanitizer.
diff --git a/actions/ql/lib/change-notes/released/0.6.1.md b/actions/ql/lib/change-notes/released/0.6.1.md
new file mode 100644
index 000000000000..19f7f95948ad
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.6.1.md
@@ -0,0 +1,10 @@
+## 0.6.1
+
+### New Features
+
+* GitHub Actions databases now extract `actions.lock` files. The new `ActionsLock` class
+  provides access to their YAML abstract syntax trees.
+
+### Minor Analysis Improvements
+
+* Checks on author association fields read from the event payload (e.g. `github.event.pull_request.author_association`) now only count as protection for events whose payload actually populates that field. Previously, a condition such as `github.event.pull_request.author_association != 'NONE'` on a workflow triggered by `issues` events was treated as a protective check even though `github.event.pull_request` is not populated for `issues` events, which makes the condition vacuous. This change may result in more alerts for queries using the `ControlCheck` class.
diff --git a/actions/ql/lib/change-notes/released/0.6.2.md b/actions/ql/lib/change-notes/released/0.6.2.md
new file mode 100644
index 000000000000..43f80640fc5e
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.6.2.md
@@ -0,0 +1,3 @@
+## 0.6.2
+
+No user-facing changes.
diff --git a/actions/ql/lib/change-notes/released/0.6.3.md b/actions/ql/lib/change-notes/released/0.6.3.md
new file mode 100644
index 000000000000..8042ffbad0db
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.6.3.md
@@ -0,0 +1,5 @@
+## 0.6.3
+
+### Minor Analysis Improvements
+
+* The `trustedActionsOwnerDataModel` extensible predicate, used by the `actions/unpinned-tag` query, now supports removing an owner from the trusted set by adding an entry prefixed with `!` (for example, `!github`). This makes it possible to distrust first-party owners (`actions`, `github`, `advanced-security`) so that unpinned tags for their Actions are reported.
diff --git a/actions/ql/lib/change-notes/released/0.7.0.md b/actions/ql/lib/change-notes/released/0.7.0.md
new file mode 100644
index 000000000000..184995edd711
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.7.0.md
@@ -0,0 +1,5 @@
+## 0.7.0
+
+### Breaking Changes
+
+* The GitHub Actions control flow graph (CFG) now uses the shared CFG library. The CFG includes explicit before and after nodes and uses the shared entry and exit node representations. Existing code that relies on specific CFG nodes, edges, textual representations, or basic block boundaries may need to be updated. The legacy `Completion`, `NormalCompletion`, `SimpleCompletion`, `BooleanCompletion`, and `ReturnCompletion` classes have been removed because completions are no longer part of the Actions CFG API. Code that inspected completions should inspect CFG edge labels such as `DirectSuccessor`, `BooleanSuccessor`, and `ReturnSuccessor` instead.
diff --git a/actions/ql/lib/change-notes/released/0.7.1.md b/actions/ql/lib/change-notes/released/0.7.1.md
new file mode 100644
index 000000000000..86973d360428
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.7.1.md
@@ -0,0 +1,3 @@
+## 0.7.1
+
+No user-facing changes.
diff --git a/actions/ql/lib/codeql-pack.release.yml b/actions/ql/lib/codeql-pack.release.yml
index 8f5be10acbe6..e007a9aec3e9 100644
--- a/actions/ql/lib/codeql-pack.release.yml
+++ b/actions/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.4.40
+lastReleaseVersion: 0.7.1
diff --git a/actions/ql/lib/codeql/actions/Cfg.qll b/actions/ql/lib/codeql/actions/Cfg.qll
index 8ccc8de1d445..695dc55bd1ee 100644
--- a/actions/ql/lib/codeql/actions/Cfg.qll
+++ b/actions/ql/lib/codeql/actions/Cfg.qll
@@ -1,6 +1,3 @@
 /** Provides classes representing the control flow graph. */
 
-private import codeql.actions.controlflow.internal.Cfg as CfgInternal
-import CfgInternal::Completion
-import CfgInternal::CfgScope
-import CfgInternal::CfgImpl
+import codeql.actions.controlflow.internal.Cfg::CfgImpl
diff --git a/actions/ql/lib/codeql/actions/Lock.qll b/actions/ql/lib/codeql/actions/Lock.qll
new file mode 100644
index 000000000000..b1cc14530746
--- /dev/null
+++ b/actions/ql/lib/codeql/actions/Lock.qll
@@ -0,0 +1,45 @@
+/**
+ * Provides classes for working with GitHub Actions lockfiles.
+ */
+
+private import actions
+private import codeql.actions.ast.internal.Yaml
+
+/** A `.github/workflows/actions.lock` file. */
+class ActionsLock extends YamlDocument, YamlMapping {
+  ActionsLock() { this.getFile().getRelativePath() = ".github/workflows/actions.lock" }
+
+  pragma[nomagic]
+  private predicate pins0(string workflowPath, string pinnedNwo, string ref) {
+    exists(YamlSequence workflowPins, YamlScalar pinNode, YamlMapping dependency, string pin |
+      this.lookup("workflows").(YamlMapping).lookup(workflowPath) = workflowPins and
+      workflowPins.getElement(_) = pinNode and
+      pin = pinNode.getValue() and
+      pinnedNwo = pin.regexpCapture("^([^/@:]+/[^/@:]+)@([^:]+)$", 1) and
+      ref = pin.regexpCapture("^([^/@:]+/[^/@:]+)@([^:]+)$", 2) and
+      this.lookup("dependencies").(YamlMapping).lookup(pin) = dependency and
+      dependency.lookup("ref").(YamlScalar).getValue() = ref and
+      dependency
+          .lookup("commit")
+          .(YamlScalar)
+          .getValue()
+          .regexpMatch("^(sha1-[A-Fa-f0-9]{40}|sha256-[A-Fa-f0-9]{64})$")
+    )
+  }
+
+  /**
+   * Holds if this lockfile pins the use at `uses` to `ref` with a full commit digest.
+   * Repository pins also cover sub-actions such as `actions/cache/save`.
+   */
+  predicate pins(UsesStep uses, string ref) {
+    exists(string workflowPath, string pinnedNwo, string nwo |
+      this.pins0(workflowPath, pinnedNwo, ref) and
+      workflowPath = uses.getLocation().getFile().getRelativePath() and
+      nwo = uses.getCallee()
+    |
+      nwo.toLowerCase() = pinnedNwo.toLowerCase()
+      or
+      nwo.toLowerCase().prefix(pinnedNwo.length() + 1) = pinnedNwo.toLowerCase() + "/"
+    )
+  }
+}
diff --git a/actions/ql/lib/codeql/actions/config/Config.qll b/actions/ql/lib/codeql/actions/config/Config.qll
index e6359c142582..f6b8d0c979f3 100644
--- a/actions/ql/lib/codeql/actions/config/Config.qll
+++ b/actions/ql/lib/codeql/actions/config/Config.qll
@@ -130,9 +130,16 @@ predicate immutableActionsDataModel(string action) { Extensions::immutableAction
  * MaD models for trusted actions owners
  * Fields:
  *    - owner: owner name
+ *
+ * An entry may be prefixed with `!` to remove an owner from the trusted set,
+ * overriding any plain entry for the same owner (for example, `!github` distrusts
+ * the first-party `github` owner). This is unambiguous because GitHub owner names
+ * can never start with `!`.
  */
 predicate trustedActionsOwnerDataModel(string owner) {
-  Extensions::trustedActionsOwnerDataModel(owner)
+  Extensions::trustedActionsOwnerDataModel(owner) and
+  not owner.matches("!%") and
+  not Extensions::trustedActionsOwnerDataModel("!" + owner)
 }
 
 /**
@@ -164,3 +171,12 @@ predicate untrustedGhCommandDataModel(string cmd_regex, string flag) {
 predicate actionsPermissionsDataModel(string action, string permission) {
   Extensions::actionsPermissionsDataModel(action, permission)
 }
+
+/**
+ * MaD models for deployment environments
+ * Fields:
+ *    - name: deployment environment name, e.g. `Public CI`
+ */
+predicate enabledDeploymentEnvironmentDataModel(string name) {
+  Extensions::enabledDeploymentEnvironmentDataModel(name)
+}
diff --git a/actions/ql/lib/codeql/actions/config/ConfigExtensions.qll b/actions/ql/lib/codeql/actions/config/ConfigExtensions.qll
index 87a919359404..4ee438fc63cb 100644
--- a/actions/ql/lib/codeql/actions/config/ConfigExtensions.qll
+++ b/actions/ql/lib/codeql/actions/config/ConfigExtensions.qll
@@ -88,3 +88,12 @@ extensible predicate untrustedGhCommandDataModel(string cmd_regex, string flag);
  * - see https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/controlling-permissions-for-github_token for documentation of token permissions.
  */
 extensible predicate actionsPermissionsDataModel(string action, string permission);
+
+/**
+ * Holds for deployment environments that exist with `name` for a given repository.
+ * * - 'name' is the name of the environment defined.
+ *   E.g. for the deployment environment `environment: EnvironmentInRepo`, `name` is `EnvironmentInRepo`.
+ * Requires this to be externally supplied but once done can be used to
+ * toggle precision of whether that suffices or not as a control check by contributing to `EnvironmentCheck`.
+ */
+extensible predicate enabledDeploymentEnvironmentDataModel(string name);
diff --git a/actions/ql/lib/codeql/actions/controlflow/BasicBlocks.qll b/actions/ql/lib/codeql/actions/controlflow/BasicBlocks.qll
deleted file mode 100644
index 2dcfd81a47dc..000000000000
--- a/actions/ql/lib/codeql/actions/controlflow/BasicBlocks.qll
+++ /dev/null
@@ -1,444 +0,0 @@
-/** Provides classes representing basic blocks. */
-
-private import codeql.actions.Cfg
-private import codeql.actions.Ast
-private import codeql.Locations
-
-/**
- * A basic block, that is, a maximal straight-line sequence of control flow nodes
- * without branches or joins.
- */
-class BasicBlock extends TBasicBlockStart {
-  /** Gets the scope of this basic block. */
-  final CfgScope getScope() { result = this.getFirstNode().getScope() }
-
-  /** Gets an immediate successor of this basic block, if any. */
-  BasicBlock getASuccessor() { result = this.getASuccessor(_) }
-
-  /** Gets an immediate successor of this basic block of a given type, if any. */
-  BasicBlock getASuccessor(SuccessorType t) {
-    result.getFirstNode() = this.getLastNode().getASuccessor(t)
-  }
-
-  /** Gets an immediate predecessor of this basic block, if any. */
-  BasicBlock getAPredecessor() { result.getASuccessor() = this }
-
-  /** Gets an immediate predecessor of this basic block of a given type, if any. */
-  BasicBlock getAPredecessor(SuccessorType t) { result.getASuccessor(t) = this }
-
-  /** Gets the control flow node at a specific (zero-indexed) position in this basic block. */
-  Node getNode(int pos) { bbIndex(this.getFirstNode(), result, pos) }
-
-  /** Gets a control flow node in this basic block. */
-  Node getANode() { result = this.getNode(_) }
-
-  /** Gets the first control flow node in this basic block. */
-  Node getFirstNode() { this = TBasicBlockStart(result) }
-
-  /** Gets the last control flow node in this basic block. */
-  Node getLastNode() { result = this.getNode(this.length() - 1) }
-
-  /** Gets the length of this basic block. */
-  int length() { result = strictcount(this.getANode()) }
-
-  /**
-   * Holds if this basic block immediately dominates basic block `bb`.
-   *
-   * That is, all paths reaching basic block `bb` from some entry point
-   * basic block must go through this basic block (which is an immediate
-   * predecessor of `bb`).
-   *
-   * Example:
-   *
-   * ```rb
-   * def m b
-   *   if b
-   *     return 0
-   *   end
-   *   return 1
-   * end
-   * ```
-   *
-   * The basic block starting on line 2 immediately dominates the
-   * basic block on line 5 (all paths from the entry point of `m`
-   * to `return 1` must go through the `if` block).
-   */
-  predicate immediatelyDominates(BasicBlock bb) { bbIDominates(this, bb) }
-
-  /**
-   * Holds if this basic block strictly dominates basic block `bb`.
-   *
-   * That is, all paths reaching basic block `bb` from some entry point
-   * basic block must go through this basic block (which must be different
-   * from `bb`).
-   *
-   * Example:
-   *
-   * ```rb
-   * def m b
-   *   if b
-   *     return 0
-   *   end
-   *   return 1
-   * end
-   * ```
-   *
-   * The basic block starting on line 2 strictly dominates the
-   * basic block on line 5 (all paths from the entry point of `m`
-   * to `return 1` must go through the `if` block).
-   */
-  predicate strictlyDominates(BasicBlock bb) { bbIDominates+(this, bb) }
-
-  /**
-   * Holds if this basic block dominates basic block `bb`.
-   *
-   * That is, all paths reaching basic block `bb` from some entry point
-   * basic block must go through this basic block.
-   *
-   * Example:
-   *
-   * ```rb
-   * def m b
-   *   if b
-   *     return 0
-   *   end
-   *   return 1
-   * end
-   * ```
-   *
-   * The basic block starting on line 2 dominates the basic
-   * basic block on line 5 (all paths from the entry point of `m`
-   * to `return 1` must go through the `if` block).
-   */
-  predicate dominates(BasicBlock bb) {
-    bb = this or
-    this.strictlyDominates(bb)
-  }
-
-  /**
-   * Holds if `df` is in the dominance frontier of this basic block.
-   * That is, this basic block dominates a predecessor of `df`, but
-   * does not dominate `df` itself.
-   *
-   * Example:
-   *
-   * ```rb
-   * def m x
-   *   if x < 0
-   *     x = -x
-   *     if x > 10
-   *       x = x - 1
-   *     end
-   *   end
-   *   puts x
-   * end
-   * ```
-   *
-   * The basic block on line 8 is in the dominance frontier
-   * of the basic block starting on line 3 because that block
-   * dominates the basic block on line 4, which is a predecessor of
-   * `puts x`. Also, the basic block starting on line 3 does not
-   * dominate the basic block on line 8.
-   */
-  predicate inDominanceFrontier(BasicBlock df) {
-    this.dominatesPredecessor(df) and
-    not this.strictlyDominates(df)
-  }
-
-  /**
-   * Holds if this basic block dominates a predecessor of `df`.
-   */
-  private predicate dominatesPredecessor(BasicBlock df) { this.dominates(df.getAPredecessor()) }
-
-  /**
-   * Gets the basic block that immediately dominates this basic block, if any.
-   *
-   * That is, all paths reaching this basic block from some entry point
-   * basic block must go through the result, which is an immediate basic block
-   * predecessor of this basic block.
-   *
-   * Example:
-   *
-   * ```rb
-   * def m b
-   *   if b
-   *     return 0
-   *   end
-   *   return 1
-   * end
-   * ```
-   *
-   * The basic block starting on line 2 is an immediate dominator of
-   * the basic block on line 5 (all paths from the entry point of `m`
-   * to `return 1` must go through the `if` block, and the `if` block
-   * is an immediate predecessor of `return 1`).
-   */
-  BasicBlock getImmediateDominator() { bbIDominates(result, this) }
-
-  /**
-   * Holds if this basic block strictly post-dominates basic block `bb`.
-   *
-   * That is, all paths reaching a normal exit point basic block from basic
-   * block `bb` must go through this basic block (which must be different
-   * from `bb`).
-   *
-   * Example:
-   *
-   * ```rb
-   * def m b
-   *   if b
-   *     puts "b"
-   *   end
-   *   puts "m"
-   * end
-   * ```
-   *
-   * The basic block on line 5 strictly post-dominates the basic block on
-   * line 3 (all paths to the exit point of `m` from `puts "b"` must go
-   * through `puts "m"`).
-   */
-  predicate strictlyPostDominates(BasicBlock bb) { bbIPostDominates+(this, bb) }
-
-  /**
-   * Holds if this basic block post-dominates basic block `bb`.
-   *
-   * That is, all paths reaching a normal exit point basic block from basic
-   * block `bb` must go through this basic block.
-   *
-   * Example:
-   *
-   * ```rb
-   * def m b
-   *   if b
-   *     puts "b"
-   *   end
-   *   puts "m"
-   * end
-   * ```
-   *
-   * The basic block on line 5 post-dominates the basic block on line 3
-   * (all paths to the exit point of `m` from `puts "b"` must go through
-   * `puts "m"`).
-   */
-  predicate postDominates(BasicBlock bb) {
-    this.strictlyPostDominates(bb) or
-    this = bb
-  }
-
-  /** Holds if this basic block is in a loop in the control flow graph. */
-  predicate inLoop() { this.getASuccessor+() = this }
-
-  /** Gets a textual representation of this basic block. */
-  string toString() { result = this.getFirstNode().toString() }
-
-  /** Gets the location of this basic block. */
-  Location getLocation() { result = this.getFirstNode().getLocation() }
-}
-
-cached
-private module Cached {
-  /** Internal representation of basic blocks. */
-  cached
-  newtype TBasicBlock = TBasicBlockStart(Node cfn) { startsBB(cfn) }
-
-  /** Holds if `cfn` starts a new basic block. */
-  private predicate startsBB(Node cfn) {
-    not exists(cfn.getAPredecessor()) and exists(cfn.getASuccessor())
-    or
-    cfn.isJoin()
-    or
-    cfn.getAPredecessor().isBranch()
-    or
-    /*
-     * In cases such as
-     *
-     * ```rb
-     * if x or y
-     *     foo
-     * else
-     *     bar
-     * ```
-     *
-     * we have a CFG that looks like
-     *
-     * x --false--> [false] x or y --false--> bar
-     * \                    |
-     *  --true--> y --false--
-     *            \
-     *             --true--> [true] x or y --true--> foo
-     *
-     * and we want to ensure that both `foo` and `bar` start a new basic block,
-     * in order to get a `ConditionalBlock` out of the disjunction.
-     */
-
-    exists(cfn.getAPredecessor(any(BooleanSuccessor s)))
-  }
-
-  /**
-   * Holds if `succ` is a control flow successor of `pred` within
-   * the same basic block.
-   */
-  private predicate intraBBSucc(Node pred, Node succ) {
-    succ = pred.getASuccessor() and
-    not startsBB(succ)
-  }
-
-  /**
-   * Holds if `cfn` is the `i`th node in basic block `bb`.
-   *
-   * In other words, `i` is the shortest distance from a node `bbStart`
-   * that starts a basic block to `cfn` along the `intraBBSucc` relation.
-   */
-  cached
-  predicate bbIndex(Node bbStart, Node cfn, int i) =
-    shortestDistances(startsBB/1, intraBBSucc/2)(bbStart, cfn, i)
-
-  /**
-   * Holds if the first node of basic block `succ` is a control flow
-   * successor of the last node of basic block `pred`.
-   */
-  private predicate succBB(BasicBlock pred, BasicBlock succ) { succ = pred.getASuccessor() }
-
-  /** Holds if `dom` is an immediate dominator of `bb`. */
-  cached
-  predicate bbIDominates(BasicBlock dom, BasicBlock bb) =
-    idominance(entryBB/1, succBB/2)(_, dom, bb)
-
-  /** Holds if `pred` is a basic block predecessor of `succ`. */
-  private predicate predBB(BasicBlock succ, BasicBlock pred) { succBB(pred, succ) }
-
-  /** Holds if `bb` is an exit basic block that represents normal exit. */
-  private predicate normalExitBB(BasicBlock bb) { bb.getANode().(AnnotatedExitNode).isNormal() }
-
-  /** Holds if `dom` is an immediate post-dominator of `bb`. */
-  cached
-  predicate bbIPostDominates(BasicBlock dom, BasicBlock bb) =
-    idominance(normalExitBB/1, predBB/2)(_, dom, bb)
-
-  /**
-   * Gets the `i`th predecessor of join block `jb`, with respect to some
-   * arbitrary order.
-   */
-  cached
-  JoinBlockPredecessor getJoinBlockPredecessor(JoinBlock jb, int i) {
-    none()
-    /*
-     *    result =
-     *      rank[i + 1](JoinBlockPredecessor jbp |
-     *        jbp = jb.getAPredecessor()
-     *      |
-     *        jbp order by JoinBlockPredecessors::getId(jbp), JoinBlockPredecessors::getSplitString(jbp)
-     *      )
-     */
-
-    }
-
-  cached
-  predicate immediatelyControls(ConditionBlock cb, BasicBlock succ, BooleanSuccessor s) {
-    succ = cb.getASuccessor(s) and
-    forall(BasicBlock pred | pred = succ.getAPredecessor() and pred != cb | succ.dominates(pred))
-  }
-
-  cached
-  predicate controls(ConditionBlock cb, BasicBlock controlled, BooleanSuccessor s) {
-    exists(BasicBlock succ | cb.immediatelyControls(succ, s) | succ.dominates(controlled))
-  }
-}
-
-private import Cached
-
-/** Holds if `bb` is an entry basic block. */
-private predicate entryBB(BasicBlock bb) { bb.getFirstNode() instanceof EntryNode }
-
-/**
- * An entry basic block, that is, a basic block whose first node is
- * an entry node.
- */
-class EntryBasicBlock extends BasicBlock {
-  EntryBasicBlock() { entryBB(this) }
-}
-
-/**
- * An annotated exit basic block, that is, a basic block whose last node is
- * an annotated exit node.
- */
-class AnnotatedExitBasicBlock extends BasicBlock {
-  private boolean normal;
-
-  AnnotatedExitBasicBlock() {
-    exists(AnnotatedExitNode n |
-      n = this.getANode() and
-      if n.isNormal() then normal = true else normal = false
-    )
-  }
-
-  /** Holds if this block represent a normal exit. */
-  final predicate isNormal() { normal = true }
-}
-
-/**
- * An exit basic block, that is, a basic block whose last node is
- * an exit node.
- */
-class ExitBasicBlock extends BasicBlock {
-  ExitBasicBlock() { this.getLastNode() instanceof ExitNode }
-}
-
-/*
- * private module JoinBlockPredecessors {
- *  private predicate id(AstNode x, AstNode y) { x = y }
- *
- *  private predicate idOf(AstNode x, int y) = equivalenceRelation(id/2)(x, y)
- *
- *  int getId(JoinBlockPredecessor jbp) {
- *    idOf(Ast::toTreeSitter(jbp.getFirstNode().(AstCfgNode).getAstNode()), result)
- *    or
- *    idOf(Ast::toTreeSitter(jbp.(EntryBasicBlock).getScope()), result)
- *  }
- *
- *  string getSplitString(JoinBlockPredecessor jbp) {
- *    result = jbp.getFirstNode().(AstCfgNode).getSplitsString()
- *    or
- *    not exists(jbp.getFirstNode().(AstCfgNode).getSplitsString()) and
- *    result = ""
- *  }
- * }
- */
-
-/** A basic block with more than one predecessor. */
-class JoinBlock extends BasicBlock {
-  JoinBlock() { this.getFirstNode().isJoin() }
-
-  /**
-   * Gets the `i`th predecessor of this join block, with respect to some
-   * arbitrary order.
-   */
-  JoinBlockPredecessor getJoinBlockPredecessor(int i) { result = getJoinBlockPredecessor(this, i) }
-}
-
-/** A basic block that is an immediate predecessor of a join block. */
-class JoinBlockPredecessor extends BasicBlock {
-  JoinBlockPredecessor() { this.getASuccessor() instanceof JoinBlock }
-}
-
-/** A basic block that terminates in a condition, splitting the subsequent control flow. */
-class ConditionBlock extends BasicBlock {
-  ConditionBlock() { this.getLastNode().isCondition() }
-
-  /**
-   * Holds if basic block `succ` is immediately controlled by this basic
-   * block with conditional value `s`. That is, `succ` is an immediate
-   * successor of this block, and `succ` can only be reached from
-   * the callable entry point by going via the `s` edge out of this basic block.
-   */
-  predicate immediatelyControls(BasicBlock succ, BooleanSuccessor s) {
-    immediatelyControls(this, succ, s)
-  }
-
-  /**
-   * Holds if basic block `controlled` is controlled by this basic block with
-   * conditional value `s`. That is, `controlled` can only be reached from
-   * the callable entry point by going via the `s` edge out of this basic block.
-   */
-  predicate controls(BasicBlock controlled, BooleanSuccessor s) { controls(this, controlled, s) }
-}
diff --git a/actions/ql/lib/codeql/actions/controlflow/internal/Cfg.qll b/actions/ql/lib/codeql/actions/controlflow/internal/Cfg.qll
index 38ce9e7e03db..f01fdbd0e4a1 100644
--- a/actions/ql/lib/codeql/actions/controlflow/internal/Cfg.qll
+++ b/actions/ql/lib/codeql/actions/controlflow/internal/Cfg.qll
@@ -1,288 +1,418 @@
 private import codeql.actions.Ast
-private import codeql.controlflow.Cfg as CfgShared
+private import codeql.controlflow.ControlFlowGraph as CfgShared
 private import codeql.Locations
+private import codeql.util.Void
 
-module Completion {
-  import codeql.controlflow.SuccessorType
+private class ActionsAstNode = AstNode;
 
-  private newtype TCompletion =
-    TSimpleCompletion() or
-    TBooleanCompletion(boolean b) { b in [false, true] } or
-    TReturnCompletion()
+module CfgImpl {
+  private predicate isDeclaredEnvExpr(AstNode parent, AstNode child) {
+    exists(Workflow workflow | parent = workflow and child = workflow.getEnv().getAnEnvVarExpr())
+    or
+    exists(Job job | parent = job and child = job.getEnv().getAnEnvVarExpr())
+    or
+    exists(Step step | parent = step and child = step.getEnv().getAnEnvVarExpr())
+  }
 
-  abstract class Completion extends TCompletion {
-    abstract string toString();
+  private predicate isCfgChild(AstNode parent, AstNode child) {
+    isDeclaredEnvExpr(parent, child)
+    or
+    exists(CompositeAction action |
+      parent = action and
+      (child = action.getAnInput() or child = action.getOutputs() or child = action.getRuns())
+    )
+    or
+    exists(ReusableWorkflow workflow |
+      parent = workflow and
+      (
+        child = workflow.getAnInput() or
+        child = workflow.getOutputs() or
+        child = workflow.getStrategy() or
+        child = workflow.getAJob()
+      )
+    )
+    or
+    exists(Workflow workflow |
+      parent = workflow and
+      not workflow instanceof ReusableWorkflow and
+      (child = workflow.getStrategy() or child = workflow.getAJob())
+    )
+    or
+    exists(Runs runs | parent = runs and child = runs.getStep(_))
+    or
+    exists(Outputs outputs | parent = outputs and child = outputs.getAnOutputExpr())
+    or
+    exists(Strategy strategy | parent = strategy and child = strategy.getAMatrixVarExpr())
+    or
+    exists(LocalJob job |
+      parent = job and
+      (child = job.getAStep() or child = job.getOutputs() or child = job.getStrategy())
+    )
+    or
+    exists(ExternalJob job |
+      parent = job and
+      (
+        child = job.getArgumentExpr(_) or
+        child = job.getOutputs() or
+        child = job.getStrategy()
+      )
+    )
+    or
+    exists(UsesStep uses | parent = uses and child = uses.getArgumentExpr(_))
+    or
+    exists(Run run |
+      parent = run and
+      (child = run.getAnScriptExpr() or child = run.getScript())
+    )
+  }
 
-    predicate isValidForSpecific(AstNode e) { none() }
+  private AstNode getCfgChild(AstNode parent, int index) {
+    result =
+      rank[index](AstNode child, Location l |
+        isCfgChild(parent, child) and l = child.getLocation()
+      |
+        child
+        order by
+          l.getStartLine(), l.getStartColumn(), l.getEndColumn(), l.getEndLine(), child.toString()
+      )
+  }
 
-    predicate isValidFor(AstNode e) { this.isValidForSpecific(e) }
+  private module CfgAst implements CfgShared::AstSig<Location> {
+    class AstNode = ActionsAstNode;
+
+    AstNode getChild(AstNode node, int index) { result = getCfgChild(node, index) }
+
+    class Callable extends AstNode {
+      Callable() {
+        this instanceof CompositeAction
+        or
+        this instanceof Workflow and
+        not exists(CompositeAction action | action.getLocation() = this.getLocation())
+      }
+    }
+
+    AstNode callableGetBody(Callable callable) { result = callable }
+
+    /**
+     * Gets the unique callable containing `node`.
+     *
+     * An Actions AST node may have multiple parent paths, but they converge on
+     * the same root.
+     */
+    Callable getEnclosingCallable(AstNode node) {
+      result = node
+      or
+      not node instanceof Callable and
+      result = getEnclosingCallable(node.getParentNode())
+    }
 
-    abstract SuccessorType getAMatchingSuccessorType();
-  }
+    class Parameter extends AstNode {
+      Parameter() { none() }
 
-  abstract class NormalCompletion extends Completion { }
+      AstNode getPattern() { none() }
 
-  class SimpleCompletion extends NormalCompletion, TSimpleCompletion {
-    override string toString() { result = "SimpleCompletion" }
+      Expr getDefaultValue() { none() }
+    }
 
-    override predicate isValidFor(AstNode e) { not any(Completion c).isValidForSpecific(e) }
+    Parameter callableGetParameter(Callable callable, int index) { none() }
 
-    override DirectSuccessor getAMatchingSuccessorType() { any() }
-  }
+    class Stmt extends AstNode {
+      Stmt() { none() }
+    }
 
-  class BooleanCompletion extends NormalCompletion, TBooleanCompletion {
-    boolean value;
+    class LabeledStmt extends Stmt {
+      LabeledStmt() { none() }
 
-    BooleanCompletion() { this = TBooleanCompletion(value) }
+      Stmt getStmt() { none() }
+    }
 
-    override string toString() { result = "BooleanCompletion(" + value + ")" }
+    class Expr extends AstNode {
+      Expr() { none() }
+    }
 
-    override predicate isValidForSpecific(AstNode e) { none() }
+    class BlockStmt extends Stmt {
+      BlockStmt() { none() }
 
-    override BooleanSuccessor getAMatchingSuccessorType() { result.getValue() = value }
+      Stmt getStmt(int index) { none() }
 
-    final boolean getValue() { result = value }
-  }
+      Stmt getLastStmt() { none() }
+    }
 
-  class ReturnCompletion extends Completion, TReturnCompletion {
-    override string toString() { result = "ReturnCompletion" }
+    class ExprStmt extends Stmt {
+      ExprStmt() { none() }
 
-    override predicate isValidForSpecific(AstNode e) { none() }
+      Expr getExpr() { none() }
+    }
 
-    override ReturnSuccessor getAMatchingSuccessorType() { any() }
-  }
-}
+    class IfStmt extends Stmt {
+      IfStmt() { none() }
 
-module CfgScope {
-  abstract class CfgScope extends AstNode { }
+      Expr getCondition() { none() }
 
-  class WorkflowScope extends CfgScope instanceof Workflow { }
+      Stmt getThen() { none() }
 
-  class CompositeActionScope extends CfgScope instanceof CompositeAction { }
-}
+      Stmt getElse() { none() }
+    }
 
-private module Implementation implements CfgShared::InputSig<Location> {
-  import codeql.actions.Ast
-  import Completion
-  import CfgScope
+    class LoopStmt extends Stmt {
+      LoopStmt() { none() }
 
-  predicate completionIsNormal(Completion c) { not c instanceof ReturnCompletion }
+      Stmt getBody() { none() }
+    }
 
-  // Not using CFG splitting, so the following are just dummy types.
-  private newtype TUnit = Unit()
+    class WhileStmt extends LoopStmt {
+      WhileStmt() { none() }
 
-  additional class SplitKindBase = TUnit;
+      Expr getCondition() { none() }
+    }
 
-  additional class Split extends TUnit {
-    abstract string toString();
-  }
+    class DoStmt extends LoopStmt {
+      DoStmt() { none() }
 
-  predicate completionIsSimple(Completion c) { c instanceof SimpleCompletion }
+      Expr getCondition() { none() }
+    }
 
-  predicate completionIsValidFor(Completion c, AstNode e) { c.isValidFor(e) }
+    class UntilStmt extends LoopStmt {
+      UntilStmt() { none() }
 
-  CfgScope getCfgScope(AstNode e) {
-    exists(AstNode p | p = e.getParentNode() |
-      result = p
-      or
-      not p instanceof CfgScope and result = getCfgScope(p)
-    )
-  }
+      Expr getCondition() { none() }
+    }
 
-  additional int maxSplits() { result = 0 }
+    class ForStmt extends LoopStmt {
+      ForStmt() { none() }
 
-  predicate scopeFirst(CfgScope scope, AstNode e) {
-    first(scope.(Workflow), e) or
-    first(scope.(CompositeAction), e)
-  }
+      AstNode getInit(int index) { none() }
 
-  predicate scopeLast(CfgScope scope, AstNode e, Completion c) {
-    last(scope.(Workflow), e, c) or
-    last(scope.(CompositeAction), e, c)
-  }
+      Expr getCondition() { none() }
 
-  SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
+      AstNode getUpdate(int index) { none() }
+    }
 
-  int idOfAstNode(AstNode node) { none() }
+    class ForEachStmt extends LoopStmt {
+      ForEachStmt() { none() }
 
-  int idOfCfgScope(CfgScope scope) { none() }
-}
+      Expr getVariable() { none() }
 
-module CfgImpl = CfgShared::Make<Location, Implementation>;
+      Expr getCollection() { none() }
+    }
 
-private import CfgImpl
-private import Completion
-private import CfgScope
+    class BreakStmt extends Stmt {
+      BreakStmt() { none() }
+    }
 
-private class CompositeActionTree extends StandardPreOrderTree instanceof CompositeAction {
-  override ControlFlowTree getChildNode(int i) {
-    result =
-      rank[i](AstNode child, Location l |
-        (
-          child = this.(CompositeAction).getAnInput() or
-          child = this.(CompositeAction).getOutputs() or
-          child = this.(CompositeAction).getRuns()
-        ) and
-        l = child.getLocation()
-      |
-        child
-        order by
-          l.getStartLine(), l.getStartColumn(), l.getEndColumn(), l.getEndLine(), child.toString()
-      )
-  }
-}
+    class ContinueStmt extends Stmt {
+      ContinueStmt() { none() }
+    }
 
-private class RunsTree extends StandardPreOrderTree instanceof Runs {
-  override ControlFlowTree getChildNode(int i) { result = super.getStep(i) }
-}
+    class GotoStmt extends Stmt {
+      GotoStmt() { none() }
+    }
 
-private class WorkflowTree extends StandardPreOrderTree instanceof Workflow {
-  override ControlFlowTree getChildNode(int i) {
-    if this instanceof ReusableWorkflow
-    then
-      result =
-        rank[i](AstNode child, Location l |
-          (
-            child = this.(ReusableWorkflow).getAnInput() or
-            child = this.(ReusableWorkflow).getOutputs() or
-            child = this.(ReusableWorkflow).getStrategy() or
-            child = this.(ReusableWorkflow).getAJob()
-          ) and
-          l = child.getLocation()
-        |
-          child
-          order by
-            l.getStartLine(), l.getStartColumn(), l.getEndColumn(), l.getEndLine(), child.toString()
-        )
-    else
-      result =
-        rank[i](AstNode child, Location l |
-          (
-            child = super.getStrategy() or
-            child = super.getAJob()
-          ) and
-          l = child.getLocation()
-        |
-          child
-          order by
-            l.getStartLine(), l.getStartColumn(), l.getEndColumn(), l.getEndLine(), child.toString()
-        )
-  }
-}
+    class ReturnStmt extends Stmt {
+      ReturnStmt() { none() }
 
-private class OutputsTree extends StandardPreOrderTree instanceof Outputs {
-  override ControlFlowTree getChildNode(int i) {
-    result =
-      rank[i](AstNode child, Location l |
-        child = super.getAnOutputExpr() and l = child.getLocation()
-      |
-        child
-        order by
-          l.getStartLine(), l.getStartColumn(), l.getEndColumn(), l.getEndLine(), child.toString()
-      )
-  }
-}
+      Expr getExpr() { none() }
+    }
 
-private class StrategyTree extends StandardPreOrderTree instanceof Strategy {
-  override ControlFlowTree getChildNode(int i) {
-    result =
-      rank[i](AstNode child, Location l |
-        child = super.getAMatrixVarExpr() and l = child.getLocation()
-      |
-        child
-        order by
-          l.getStartLine(), l.getStartColumn(), l.getEndColumn(), l.getEndLine(), child.toString()
-      )
-  }
-}
+    class Throw extends AstNode {
+      Throw() { none() }
 
-private class JobTree extends StandardPreOrderTree instanceof LocalJob {
-  override ControlFlowTree getChildNode(int i) {
-    result =
-      rank[i](AstNode child, Location l |
-        (
-          child = super.getAStep() or
-          child = super.getOutputs() or
-          child = super.getStrategy()
-        ) and
-        l = child.getLocation()
-      |
-        child
-        order by
-          l.getStartLine(), l.getStartColumn(), l.getEndColumn(), l.getEndLine(), child.toString()
-      )
-  }
-}
+      Expr getExpr() { none() }
+    }
 
-private class ExternalJobTree extends StandardPreOrderTree instanceof ExternalJob {
-  override ControlFlowTree getChildNode(int i) {
-    result =
-      rank[i](AstNode child, Location l |
-        (
-          child = super.getArgumentExpr(_) or
-          child = super.getInScopeEnvVarExpr(_) or
-          child = super.getOutputs() or
-          child = super.getStrategy()
-        ) and
-        l = child.getLocation()
-      |
-        child
-        order by
-          l.getStartLine(), l.getStartColumn(), l.getEndColumn(), l.getEndLine(), child.toString()
-      )
-  }
-}
+    class TryStmt extends Stmt {
+      TryStmt() { none() }
 
-private class UsesTree extends StandardPreOrderTree instanceof UsesStep {
-  override ControlFlowTree getChildNode(int i) {
-    result =
-      rank[i](AstNode child, Location l |
-        (child = super.getArgumentExpr(_) or child = super.getInScopeEnvVarExpr(_)) and
-        l = child.getLocation()
-      |
-        child
-        order by
-          l.getStartLine(), l.getStartColumn(), l.getEndColumn(), l.getEndLine(), child.toString()
-      )
+      AstNode getBody(int index) { none() }
+
+      CatchClause getCatch(int index) { none() }
+
+      Stmt getFinally() { none() }
+    }
+
+    class CatchClause extends AstNode {
+      CatchClause() { none() }
+
+      AstNode getPattern() { none() }
+
+      AstNode getVariable() { none() }
+
+      Expr getCondition() { none() }
+
+      Stmt getBody() { none() }
+    }
+
+    class Switch extends AstNode {
+      Switch() { none() }
+
+      Expr getExpr() { none() }
+
+      Case getCase(int index) { none() }
+
+      Stmt getStmt(int index) { none() }
+    }
+
+    class Case extends AstNode {
+      Case() { none() }
+
+      AstNode getPattern(int index) { none() }
+
+      Expr getGuard() { none() }
+
+      AstNode getBody() { none() }
+    }
+
+    class DefaultCase extends Case {
+      DefaultCase() { none() }
+    }
+
+    class ConditionalExpr extends Expr {
+      ConditionalExpr() { none() }
+
+      Expr getCondition() { none() }
+
+      Expr getThen() { none() }
+
+      Expr getElse() { none() }
+    }
+
+    class BinaryExpr extends Expr {
+      BinaryExpr() { none() }
+
+      Expr getLeftOperand() { none() }
+
+      Expr getRightOperand() { none() }
+    }
+
+    class LogicalAndExpr extends BinaryExpr {
+      LogicalAndExpr() { none() }
+    }
+
+    class LogicalOrExpr extends BinaryExpr {
+      LogicalOrExpr() { none() }
+    }
+
+    class NullCoalescingExpr extends BinaryExpr {
+      NullCoalescingExpr() { none() }
+    }
+
+    class UnaryExpr extends Expr {
+      UnaryExpr() { none() }
+
+      Expr getOperand() { none() }
+    }
+
+    class LogicalNotExpr extends UnaryExpr {
+      LogicalNotExpr() { none() }
+    }
+
+    class Assignment extends BinaryExpr {
+      Assignment() { none() }
+    }
+
+    class AssignExpr extends Assignment {
+      AssignExpr() { none() }
+    }
+
+    class CompoundAssignment extends Assignment {
+      CompoundAssignment() { none() }
+    }
+
+    class AssignLogicalAndExpr extends CompoundAssignment {
+      AssignLogicalAndExpr() { none() }
+    }
+
+    class AssignLogicalOrExpr extends CompoundAssignment {
+      AssignLogicalOrExpr() { none() }
+    }
+
+    class AssignNullCoalescingExpr extends CompoundAssignment {
+      AssignNullCoalescingExpr() { none() }
+    }
+
+    class BooleanLiteral extends Expr {
+      BooleanLiteral() { none() }
+
+      boolean getValue() { none() }
+    }
+
+    class PatternMatchExpr extends Expr {
+      PatternMatchExpr() { none() }
+
+      Expr getExpr() { none() }
+
+      AstNode getPattern() { none() }
+    }
   }
-}
 
-private class RunTree extends StandardPreOrderTree instanceof Run {
-  override ControlFlowTree getChildNode(int i) {
-    result =
-      rank[i](AstNode child, Location l |
-        (
-          child = super.getInScopeEnvVarExpr(_) or
-          child = super.getAnScriptExpr() or
-          child = super.getScript()
-        ) and
-        l = child.getLocation()
-      |
-        child
-        order by
-          l.getStartLine(), l.getStartColumn(), l.getEndColumn(), l.getEndLine(), child.toString()
-      )
+  private module Cfg0 = CfgShared::Make0<Location, CfgAst>;
+
+  private module Input1 implements Cfg0::InputSig1 {
+    predicate cfgCachedStageRef() { CfgCachedStage::ref() }
+
+    class Label = Void;
+
+    class CallableContext = Void;
   }
-}
 
-private class ScalarValueTree extends StandardPreOrderTree instanceof ScalarValue {
-  override ControlFlowTree getChildNode(int i) {
-    result =
-      rank[i](Expression child, Location l |
-        child = super.getAChildNode() and
-        l = child.getLocation()
-      |
-        child
-        order by
-          l.getStartLine(), l.getStartColumn(), l.getEndColumn(), l.getEndLine(), child.toString()
-      )
+  private module Cfg1 = Cfg0::Make1<Input1>;
+
+  private module Input2 implements Cfg1::InputSig2 {
+    predicate beginAbruptCompletion(
+      AstNode ast, PreControlFlowNode node, AbruptCompletion completion, boolean always
+    ) {
+      none()
+    }
+
+    predicate endAbruptCompletion(AstNode ast, PreControlFlowNode node, AbruptCompletion completion) {
+      none()
+    }
+
+    predicate step(PreControlFlowNode predecessor, PreControlFlowNode successor) { none() }
   }
-}
 
-private class UsesLeaf extends LeafTree instanceof Uses { }
+  private module Cfg2 = Cfg1::Make2<Input2>;
+
+  private import Cfg0
+  private import Cfg1
+  private import Cfg2
+  import Public
+  import ControlFlow
 
-private class InputTree extends LeafTree instanceof Input { }
+  class CfgScope = CfgAst::Callable;
 
-private class ScalarValueLeaf extends LeafTree instanceof ScalarValue { }
+  /** A CFG scope for a workflow. */
+  class WorkflowScope extends CfgScope instanceof Workflow { }
+
+  /** A CFG scope for a composite action. */
+  class CompositeActionScope extends CfgScope instanceof CompositeAction { }
 
-private class ExpressionLeaf extends LeafTree instanceof Expression { }
+  /** A control flow node. */
+  class Node = ControlFlowNode;
+
+  /** The control flow node at the entry point of a scope. */
+  class EntryNode = ControlFlow::EntryNode;
+
+  /** A control flow node indicating normal or exceptional termination of a scope. */
+  class AnnotatedExitNode = ControlFlow::AnnotatedExitNode;
+
+  /** A control flow node indicating normal termination of a scope. */
+  class NormalExitNode = ControlFlow::NormalExitNode;
+
+  /** A control flow node indicating exceptional termination of a scope. */
+  class ExceptionalExitNode = ControlFlow::ExceptionalExitNode;
+
+  /** A control flow node indicating the termination of a scope. */
+  class ExitNode = ControlFlow::ExitNode;
+
+  /**
+   * A node that uniquely represents an AST node.
+   *
+   * Unreachable AST nodes do not have an `AstCfgNode`.
+   */
+  class AstCfgNode extends Node {
+    AstCfgNode() { this.injects(_) }
+
+    AstNode getAstNode() { this.injects(result) }
+  }
+}
diff --git a/actions/ql/lib/codeql/actions/dataflow/FlowSources.qll b/actions/ql/lib/codeql/actions/dataflow/FlowSources.qll
index 18cc4322c81b..8b0a2a33eb55 100644
--- a/actions/ql/lib/codeql/actions/dataflow/FlowSources.qll
+++ b/actions/ql/lib/codeql/actions/dataflow/FlowSources.qll
@@ -52,29 +52,43 @@ class GitHubCtxSource extends RemoteFlowSource {
   override string getEventName() { result = event }
 }
 
+bindingset[expression]
+pragma[inline_late]
+private predicate untrustedEventProperty(Expression expression, string kind) {
+  exists(string regexp |
+    untrustedEventPropertiesDataModel(regexp, kind) and
+    kind != "json" and
+    normalizeExpr(expression.getExpression()).regexpMatch("(?i)\\s*" + wrapRegexp(regexp) + ".*")
+  )
+}
+
+bindingset[expression, event]
+pragma[inline_late]
+private predicate expressionContainsEventContext(Expression expression, string event) {
+  exists(string contextPrefix |
+    contextTriggerDataModel(event, contextPrefix) and
+    normalizeExpr(expression.getExpression()).matches("%" + contextPrefix + "%")
+  )
+}
+
 class GitHubEventCtxSource extends RemoteFlowSource {
   string flag;
   string context;
   string event;
 
   GitHubEventCtxSource() {
-    exists(Expression e, string regexp |
+    exists(Expression e |
       this.asExpr() = e and
       context = e.getExpression() and
       (
         // the context is available for the job trigger events
         event = e.getATriggerEvent().getName() and
-        exists(string context_prefix |
-          contextTriggerDataModel(event, context_prefix) and
-          normalizeExpr(context).matches("%" + context_prefix + "%")
-        )
+        expressionContainsEventContext(e, event)
         or
         not exists(e.getATriggerEvent()) and
         event = "unknown"
       ) and
-      untrustedEventPropertiesDataModel(regexp, flag) and
-      not flag = "json" and
-      normalizeExpr(context).regexpMatch("(?i)\\s*" + wrapRegexp(regexp) + ".*")
+      untrustedEventProperty(e, flag)
     )
   }
 
@@ -177,32 +191,41 @@ class GitHubEventPathSource extends RemoteFlowSource, CommandSource {
   override Run getEnclosingRun() { result = run }
 }
 
+bindingset[expression, event]
+pragma[inline_late]
+private predicate jsonSourceForEvent(Expression expression, string event) {
+  exists(string context, string regexp, string contextPrefix |
+    context = expression.getExpression() and
+    untrustedEventPropertiesDataModel(regexp, _) and
+    contextTriggerDataModel(event, contextPrefix) and
+    normalizeExpr(context).matches("%" + contextPrefix + "%") and
+    normalizeExpr(context).regexpMatch("(?i).*" + wrapJsonRegexp(regexp) + ".*")
+  )
+  or
+  exists(string context |
+    context = expression.getExpression() and
+    untrustedEventPropertiesDataModel(_, _) and
+    contextTriggerDataModel(event, _) and
+    normalizeExpr(context).regexpMatch("(?i).*" + wrapJsonRegexp("\\bgithub.event\\b") + ".*")
+  )
+}
+
 class GitHubEventJsonSource extends RemoteFlowSource {
   string flag;
   string event;
 
   GitHubEventJsonSource() {
-    exists(Expression e, string context, string regexp |
+    exists(Expression e |
       this.asExpr() = e and
-      context = e.getExpression() and
-      untrustedEventPropertiesDataModel(regexp, _) and
       (
         // only contexts for the triggering events are considered tainted.
         // eg: for `pull_request`, we only consider `github.event.pull_request`
         event = e.getEnclosingWorkflow().getATriggerEvent().getName() and
-        exists(string context_prefix |
-          contextTriggerDataModel(event, context_prefix) and
-          normalizeExpr(context).matches("%" + context_prefix + "%")
-        ) and
-        normalizeExpr(context).regexpMatch("(?i).*" + wrapJsonRegexp(regexp) + ".*")
-        or
-        // github.event is tainted for all triggers
-        event = e.getEnclosingWorkflow().getATriggerEvent().getName() and
-        contextTriggerDataModel(e.getEnclosingWorkflow().getATriggerEvent().getName(), _) and
-        normalizeExpr(context).regexpMatch("(?i).*" + wrapJsonRegexp("\\bgithub.event\\b") + ".*")
+        jsonSourceForEvent(e, event)
         or
         not exists(e.getATriggerEvent()) and
-        event = "unknown"
+        event = "unknown" and
+        untrustedEventPropertiesDataModel(_, _)
       ) and
       flag = "json"
     )
diff --git a/actions/ql/lib/codeql/actions/dataflow/internal/DataFlowPrivate.qll b/actions/ql/lib/codeql/actions/dataflow/internal/DataFlowPrivate.qll
index cf95292588c3..1576377e0804 100644
--- a/actions/ql/lib/codeql/actions/dataflow/internal/DataFlowPrivate.qll
+++ b/actions/ql/lib/codeql/actions/dataflow/internal/DataFlowPrivate.qll
@@ -3,7 +3,6 @@ private import codeql.dataflow.DataFlow
 private import codeql.actions.Ast
 private import codeql.actions.Cfg as Cfg
 private import codeql.Locations
-private import codeql.actions.controlflow.BasicBlocks
 private import DataFlowPublic
 private import codeql.actions.dataflow.ExternalFlow
 private import codeql.actions.dataflow.FlowSteps
@@ -50,7 +49,7 @@ predicate isArgumentNode(ArgumentNode arg, DataFlowCall call, ArgumentPosition p
 }
 
 DataFlowCallable nodeGetEnclosingCallable(Node node) {
-  node = TExprNode(any(DataFlowExpr e | result = e.getScope()))
+  node = TExprNode(any(DataFlowExpr e | result = e.getEnclosingCallable()))
 }
 
 DataFlowType getNodeType(Node node) { any() }
@@ -59,13 +58,16 @@ predicate nodeIsHidden(Node node) { none() }
 
 class DataFlowExpr extends Cfg::Node {
   DataFlowExpr() {
-    this.getAstNode() instanceof Job or
-    this.getAstNode() instanceof Expression or
-    this.getAstNode() instanceof Uses or
-    this.getAstNode() instanceof Run or
-    this.getAstNode() instanceof Outputs or
-    this.getAstNode() instanceof Input or
-    this.getAstNode() instanceof ScalarValue
+    this.injects(this.getAstNode()) and
+    (
+      this.getAstNode() instanceof Job or
+      this.getAstNode() instanceof Expression or
+      this.getAstNode() instanceof Uses or
+      this.getAstNode() instanceof Run or
+      this.getAstNode() instanceof Outputs or
+      this.getAstNode() instanceof Input or
+      this.getAstNode() instanceof ScalarValue
+    )
   }
 }
 
@@ -73,14 +75,17 @@ class DataFlowExpr extends Cfg::Node {
  * A call corresponds to a Uses steps where a composite action or a reusable workflow get called
  */
 class DataFlowCall instanceof Cfg::Node {
-  DataFlowCall() { super.getAstNode() instanceof Uses }
+  DataFlowCall() {
+    this.injects(this.getAstNode()) and
+    super.getAstNode() instanceof Uses
+  }
 
   /** Gets a textual representation of this element. */
   string toString() { result = super.toString() }
 
   string getName() { result = super.getAstNode().(Uses).getCallee() }
 
-  DataFlowCallable getEnclosingCallable() { result = super.getScope() }
+  DataFlowCallable getEnclosingCallable() { result = super.getEnclosingCallable() }
 
   /** Gets a best-effort total ordering. */
   int totalorder() { none() }
diff --git a/actions/ql/lib/codeql/actions/security/CachePoisoningQuery.qll b/actions/ql/lib/codeql/actions/security/CachePoisoningQuery.qll
index e5c5a3655101..41529c489ff0 100644
--- a/actions/ql/lib/codeql/actions/security/CachePoisoningQuery.qll
+++ b/actions/ql/lib/codeql/actions/security/CachePoisoningQuery.qll
@@ -5,8 +5,8 @@ string defaultBranchTriggerEvent() {
     [
       "check_run", "check_suite", "delete", "discussion", "discussion_comment", "fork", "gollum",
       "issue_comment", "issues", "label", "milestone", "project", "project_card", "project_column",
-      "public", "pull_request_comment", "pull_request_target", "repository_dispatch", "schedule",
-      "watch", "workflow_run"
+      "public", "pull_request_comment", "pull_request_target", "repository_dispatch",
+      "registry_package", "page_build", "schedule", "watch", "workflow_dispatch", "workflow_run"
     ]
 }
 
@@ -42,6 +42,27 @@ predicate runsOnDefaultBranch(Event e) {
   )
 }
 
+private string defaultBranchCacheWriteEvent() {
+  result =
+    [
+      "push", "workflow_dispatch", "repository_dispatch", "delete", "registry_package",
+      "page_build", "schedule"
+    ]
+}
+
+private predicate eventHasDefaultBranchCacheWriteAccess(Event event) {
+  runsOnDefaultBranch(event) and event.getName() = defaultBranchCacheWriteEvent()
+}
+
+/**
+ * Holds if `job` can write to the cache scope of the default branch for `event`.
+ * Reusable workflow jobs inherit their caller's trigger event.
+ */
+predicate hasDefaultBranchCacheWriteAccess(LocalJob job, Event event) {
+  job.getATriggerEvent() = event and
+  eventHasDefaultBranchCacheWriteAccess(event)
+}
+
 abstract class CacheWritingStep extends Step {
   abstract string getPath();
 }
diff --git a/actions/ql/lib/codeql/actions/security/CodeInjectionQuery.qll b/actions/ql/lib/codeql/actions/security/CodeInjectionQuery.qll
index 3d5b8852b850..2afa68244091 100644
--- a/actions/ql/lib/codeql/actions/security/CodeInjectionQuery.qll
+++ b/actions/ql/lib/codeql/actions/security/CodeInjectionQuery.qll
@@ -29,22 +29,10 @@ Event getRelevantCachePoisoningEventForSink(DataFlow::Node sink) {
   exists(LocalJob job |
     job = sink.asExpr().getEnclosingJob() and
     job.getATriggerEvent() = result and
-    // job can be triggered by an external user
-    result.isExternallyTriggerable() and
     // excluding privileged workflows since they can be exploited in easier circumstances
     // which is covered by `actions/code-injection/critical`
     not job.isPrivilegedExternallyTriggerable(result) and
-    (
-      // the workflow runs in the context of the default branch
-      runsOnDefaultBranch(result)
-      or
-      // the workflow caller runs in the context of the default branch
-      result.getName() = "workflow_call" and
-      exists(ExternalJob caller |
-        caller.getCallee() = job.getLocation().getFile().getRelativePath() and
-        runsOnDefaultBranch(caller.getATriggerEvent())
-      )
-    )
+    hasDefaultBranchCacheWriteAccess(job, result)
   )
 }
 
diff --git a/actions/ql/lib/codeql/actions/security/ControlChecks.qll b/actions/ql/lib/codeql/actions/security/ControlChecks.qll
index 3f76010bd5a3..733c92559d70 100644
--- a/actions/ql/lib/codeql/actions/security/ControlChecks.qll
+++ b/actions/ql/lib/codeql/actions/security/ControlChecks.qll
@@ -276,7 +276,24 @@ abstract class LabelCheck extends ControlCheck {
   }
 }
 
+/**
+ * A deployment environment that may serve as a sanitizer for
+ * various vulnerabilities.
+ *
+ * It is possible to customize which deployment environments apply. The default behavior
+ * of this model is for any environment to be considered a sanitizer.
+ * If values are provided then those names
+ * will be used to define the valid sanitizer set.
+ * To describe the situation where there is no acceptable sanitizer environment
+ * populate the predicate `enabledDeploymentEnvironmentDataModel` to contain a single empty string.
+ */
 class EnvironmentCheck extends ControlCheck instanceof Environment {
+  EnvironmentCheck() {
+    if enabledDeploymentEnvironmentDataModel(_)
+    then enabledDeploymentEnvironmentDataModel(this.(Environment).getName())
+    else this instanceof Environment
+  }
+
   // Environment checks are not effective against any mutable attacks
   // they do actually protect against untrusted code execution (sha)
   override predicate protectsCategoryAndEvent(string category, string event) {
@@ -307,17 +324,6 @@ class LabelIfCheck extends LabelCheck instanceof If {
 
 class ActorIfCheck extends ActorCheck instanceof If {
   ActorIfCheck() {
-    // eg: github.event.pull_request.user.login == 'admin'
-    exists(
-      normalizeExpr(this.getCondition())
-          .regexpFind([
-              "\\bgithub\\.event\\.pull_request\\.user\\.login\\b",
-              "\\bgithub\\.event\\.head_commit\\.author\\.name\\b",
-              "\\bgithub\\.event\\.commits.*\\.author\\.name\\b",
-              "\\bgithub\\.event\\.sender\\.login\\b"
-            ], _, _)
-    )
-    or
     // eg: github.actor == 'admin'
     // eg: github.triggering_actor == 'admin'
     exists(
@@ -328,6 +334,51 @@ class ActorIfCheck extends ActorCheck instanceof If {
   }
 }
 
+/**
+ * Gets a regular expression matching a condition on an actor field that is
+ * only populated for events whose payload contains the `context_prefix` context.
+ */
+private string eventPayloadActorFieldRegex(string context_prefix) {
+  context_prefix = "github.event.pull_request" and
+  result = "\\bgithub\\.event\\.pull_request\\.user\\.login\\b"
+  or
+  context_prefix = "github.event.head_commit" and
+  result = "\\bgithub\\.event\\.head_commit\\.author\\.name\\b"
+  or
+  context_prefix = "github.event.commits" and
+  result = "\\bgithub\\.event\\.commits.*\\.author\\.name\\b"
+  or
+  context_prefix = "github.event.sender" and
+  result = "\\bgithub\\.event\\.sender\\.login\\b"
+}
+
+/** An If node that checks an actor field from the event payload */
+class EventActorIfCheck extends ActorCheck instanceof If {
+  string context_prefix;
+
+  EventActorIfCheck() {
+    // eg: github.event.pull_request.user.login == 'admin'
+    exists(
+      normalizeExpr(this.getCondition())
+          .regexpFind(eventPayloadActorFieldRegex(context_prefix), _, _)
+    )
+  }
+
+  override predicate protectsCategoryAndEvent(string category, string event) {
+    ActorCheck.super.protectsCategoryAndEvent(category, event) and
+    (
+      // the `sender` object is part of every webhook event payload
+      context_prefix = "github.event.sender"
+      or
+      // other actor fields only restrict events whose payload populates them.
+      // eg: `github.event.pull_request.user.login` cannot restrict the actor
+      // of an `issues` event since `github.event.pull_request` is not
+      // populated there, which makes the condition vacuous
+      contextTriggerDataModel(event, context_prefix)
+    )
+  }
+}
+
 class PullRequestTargetRepositoryIfCheck extends RepositoryCheck instanceof If {
   PullRequestTargetRepositoryIfCheck() {
     // eg: github.event.pull_request.head.repo.full_name == github.repository
@@ -367,16 +418,37 @@ class WorkflowRunRepositoryIfCheck extends RepositoryCheck instanceof If {
   }
 }
 
+/**
+ * Gets a regular expression matching a condition on an author association field
+ * that is only populated for events whose payload contains the `context_prefix`
+ * context.
+ */
+private string eventPayloadAssociationFieldRegex(string context_prefix) {
+  context_prefix = "github.event.comment" and
+  result = "\\bgithub\\.event\\.comment\\.author_association\\b"
+  or
+  context_prefix = "github.event.issue" and
+  result = "\\bgithub\\.event\\.issue\\.author_association\\b"
+  or
+  context_prefix = "github.event.pull_request" and
+  result = "\\bgithub\\.event\\.pull_request\\.author_association\\b"
+}
+
 class AssociationIfCheck extends AssociationCheck instanceof If {
+  string context_prefix;
+
   AssociationIfCheck() {
     // eg: contains(fromJson('["MEMBER", "OWNER"]'), github.event.comment.author_association)
-    normalizeExpr(this.getCondition())
-        .splitAt("\n")
-        .regexpMatch([
-            ".*\\bgithub\\.event\\.comment\\.author_association\\b.*",
-            ".*\\bgithub\\.event\\.issue\\.author_association\\b.*",
-            ".*\\bgithub\\.event\\.pull_request\\.author_association\\b.*",
-          ])
+    exists(
+      normalizeExpr(this.getCondition())
+          .regexpFind(eventPayloadAssociationFieldRegex(context_prefix), _, _)
+    )
+  }
+
+  override predicate protectsCategoryAndEvent(string category, string event) {
+    AssociationCheck.super.protectsCategoryAndEvent(category, event) and
+    // association fields only restrict events whose payload populates them
+    contextTriggerDataModel(event, context_prefix)
   }
 }
 
diff --git a/actions/ql/lib/codeql/actions/security/SelfHostedQuery.qll b/actions/ql/lib/codeql/actions/security/SelfHostedQuery.qll
deleted file mode 100644
index b3f7bdaf24d3..000000000000
--- a/actions/ql/lib/codeql/actions/security/SelfHostedQuery.qll
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * DEPRECATED: Runner labels do not reliably distinguish self-hosted runners from managed runners.
- */
-deprecated module;
-
-import actions
-
-bindingset[runner]
-predicate isGithubHostedRunner(string runner) {
-  // The list of github hosted repos:
-  // https://github.com/actions/runner-images/blob/main/README.md#available-images
-  // https://docs.github.com/en/enterprise-cloud@latest/actions/how-tos/write-workflows/choose-where-workflows-run/choose-the-runner-for-a-job#standard-github-hosted-runners-for-public-repositories
-  runner.toLowerCase().regexpMatch("^ubuntu-([0-9.]+|latest|slim)(-arm)?$") or
-  runner.toLowerCase().regexpMatch("^macos-([0-9]+|latest)(-x?large|-intel)?$") or
-  runner.toLowerCase().regexpMatch("^windows-([0-9.]+|latest)(-vs[0-9.]+)?(-arm)?$")
-}
-
-bindingset[runner]
-predicate is3rdPartyHostedRunner(string runner) {
-  runner.toLowerCase().regexpMatch("^(buildjet|warp)-[a-z0-9-]+$")
-}
-
-/**
- * This predicate uses data available in the workflow file to identify self-hosted runners.
- * It does not know if the repository is public or private.
- * It is a best-effort approach to identify self-hosted runners.
- */
-predicate staticallyIdentifiedSelfHostedRunner(Job job) {
-  exists(string label |
-    job.getATriggerEvent().getName() =
-      [
-        "issue_comment", "pull_request", "pull_request_review", "pull_request_review_comment",
-        "pull_request_target", "workflow_run"
-      ] and
-    label = job.getARunsOnLabel() and
-    not isGithubHostedRunner(label) and
-    not is3rdPartyHostedRunner(label)
-  )
-}
-
-/**
- * This predicate uses data available in the job log files to identify self-hosted runners.
- * It is a best-effort approach to identify self-hosted runners.
- */
-predicate dynamicallyIdentifiedSelfHostedRunner(Job job) {
-  exists(string runner_info |
-    repositoryDataModel("public", _) and
-    workflowDataModel(job.getEnclosingWorkflow().getLocation().getFile().getRelativePath(), _,
-      job.getId(), _, _, runner_info) and
-    runner_info.indexOf("self-hosted:true") > 0
-  )
-}
diff --git a/actions/ql/lib/codeql/actions/test/InlineExpectationsTestQuery.ql b/actions/ql/lib/codeql/actions/test/InlineExpectationsTestQuery.ql
new file mode 100644
index 000000000000..deb797b553e6
--- /dev/null
+++ b/actions/ql/lib/codeql/actions/test/InlineExpectationsTestQuery.ql
@@ -0,0 +1,9 @@
+/**
+ * @kind test-postprocess
+ */
+
+private import actions
+private import codeql.util.test.InlineExpectationsTest as T
+private import codeql.actions.test.internal.InlineExpectationsTestImpl
+import T::TestPostProcessing
+import T::TestPostProcessing::Make<Impl>
diff --git a/actions/ql/lib/codeql/actions/test/internal/InlineExpectationsTestImpl.qll b/actions/ql/lib/codeql/actions/test/internal/InlineExpectationsTestImpl.qll
new file mode 100644
index 000000000000..f1f275fa136a
--- /dev/null
+++ b/actions/ql/lib/codeql/actions/test/internal/InlineExpectationsTestImpl.qll
@@ -0,0 +1,24 @@
+private import codeql.Locations as L
+private import codeql.actions.ast.internal.Yaml as Yaml
+private import codeql.util.test.InlineExpectationsTest
+
+/** Provides the Actions implementation of inline expectation parsing. */
+module Impl implements InlineExpectationsTestSig {
+  /** A class representing YAML comments that may contain inline expectations. */
+  class ExpectationComment extends Yaml::YamlComment {
+    /** Gets the contents of this comment. */
+    string getContents() { result = this.getText() }
+  }
+
+  class Location = L::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(int startLine, int startColumn, int endLine, int endColumn |
+      location.hasLocationInfo(_, startLine, startColumn, endLine, endColumn)
+    |
+      result =
+        location.getFile().getRelativePath() + ":" + startLine + ":" + startColumn + ":" + endLine +
+          ":" + endColumn
+    )
+  }
+}
diff --git a/actions/ql/lib/ext/config/deployment_environment.yml b/actions/ql/lib/ext/config/deployment_environment.yml
new file mode 100644
index 000000000000..eed2911c2758
--- /dev/null
+++ b/actions/ql/lib/ext/config/deployment_environment.yml
@@ -0,0 +1,5 @@
+extensions:
+  - addsTo:
+      pack: codeql/actions-all
+      extensible: enabledDeploymentEnvironmentDataModel
+    data: []
\ No newline at end of file
diff --git a/actions/ql/lib/qlpack.yml b/actions/ql/lib/qlpack.yml
index 5111dd27cc89..3e209144f22c 100644
--- a/actions/ql/lib/qlpack.yml
+++ b/actions/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-all
-version: 0.4.41-dev
+version: 0.7.2-dev
 library: true
 warnOnImplicitThis: true
 dependencies:
diff --git a/actions/ql/src/CHANGELOG.md b/actions/ql/src/CHANGELOG.md
index bc013b962f80..359d69214641 100644
--- a/actions/ql/src/CHANGELOG.md
+++ b/actions/ql/src/CHANGELOG.md
@@ -1,3 +1,51 @@
+## 0.6.39
+
+No user-facing changes.
+
+## 0.6.38
+
+No user-facing changes.
+
+## 0.6.37
+
+No user-facing changes.
+
+## 0.6.36
+
+### Minor Analysis Improvements
+
+* The `actions/unpinned-tag` query no longer reports action references pinned by a structurally valid `.github/workflows/actions.lock` entry for the enclosing workflow.
+* The `actions/unpinned-tag` query no longer reports `$/` self repository references (e.g. `uses: $/path/to/action`), which resolve to the same repository at the running commit and are therefore inherently pinned, just like `./` self workspace (local) references.
+
+## 0.6.35
+
+No user-facing changes.
+
+## 0.6.34
+
+### Minor Analysis Improvements
+
+* The `actions/unpinned-tag` query now detects mutable references to reusable workflows.
+
+## 0.6.33
+
+### Query Metadata Changes
+
+* The name and alert message of the `actions/cache-poisoning/code-injection` query have been reworded for clarity.
+
+### Minor Analysis Improvements
+
+* The `actions/output-clobbering/high` query no longer reports simple `jq` path filters when their output remains JSON-encoded. Raw-output modes, complex filters, and unrecognized options remain reportable.
+* GitHub Actions queries now correctly classify the `schedule` event when determining whether a workflow is externally triggerable.
+* The `actions/envvar-injection/critical` query now requires the untrusted source and privileged context to originate from the same trigger event. The environment variable injection queries also no longer treat pull request head labels as injection-capable because they cannot contain newlines.
+* The `actions/cache-poisoning/code-injection`, `actions/cache-poisoning/direct-cache`, and `actions/cache-poisoning/poisonable-step` queries now account for read-only cache access on low-trust triggers that run in the default branch scope. Results are retained for triggers that GitHub allows to write to that cache scope.
+
+### Bug Fixes
+
+* The `actions/output-clobbering/high` query now provides messages tailored to the affected output channel and includes expanded documentation and recommendations.
+* The `actions/cache-poisoning/poisonable-step` and `actions/untrusted-checkout/critical` queries now start paths at the expressions that control untrusted checkouts and link their alert messages to those expressions.
+* Fixed a performance issue in the `actions/output-clobbering/high` query caused by using unescaped source-code input in a regular expression.
+
 ## 0.6.32
 
 No user-facing changes.
diff --git a/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.md b/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.md
index f75028a27e61..0ef3199e0fd9 100644
--- a/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.md
+++ b/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.md
@@ -34,48 +34,55 @@ Due to the above design, if something is cached in the context of the default br
 
 ## Example
 
+GitHub gives workflows triggered by low-trust events, such as `issue_comment`,
+`pull_request_target`, and `workflow_run`, read-only access to the default branch cache scope.
+This query therefore reports only workflows whose trigger can write to that scope.
+
 ### Incorrect Usage
 
-The following workflow is vulnerable to code injection in a non-privileged job but in the context of the default branch.
+The following workflow interpolates a commit message directly into a script on a push to the
+default branch. A commit message originating from a merged contribution may contain shell syntax,
+which can expose the cache write token and allow the default branch cache to be poisoned.
 
 ```yaml
 name: Vulnerable Workflow
 on:
-  issue_comment:
-    types: [created]
+  push:
+    branches: [main]
 
 jobs:
-  pr-comment:
+  build:
     permissions: {}
     runs-on: ubuntu-latest
     steps:
       - run: |
-          echo ${{ github.event.comment.body }}
+          echo ${{ github.event.head_commit.message }}
 ```
 
 ### Correct Usage
 
-The following workflow is not vulnerable to code injections even if it runs in the context of the default branch.
+The following workflow passes the commit message through an environment variable, so the shell
+does not interpret its contents as code.
 
 ```yaml
 name: Secure Workflow
 on:
-  issue_comment:
-    types: [created]
+  push:
+    branches: [main]
 
 jobs:
-  pr-comment:
+  build:
     permissions: {}
     runs-on: ubuntu-latest
     steps:
       - env:
-          BODY: ${{ github.event.comment.body }}
+          MESSAGE: ${{ github.event.head_commit.message }}
         run: |
-          echo "$BODY"
+          echo "$MESSAGE"
 ```
 
 ## References
 
 - Adnan Khan's Blog: [The Monsters in Your Build Cache – GitHub Actions Cache Poisoning](https://adnanthekhan.com/2024/05/06/the-monsters-in-your-build-cache-github-actions-cache-poisoning/).
-- GitHub Docs: [GitHub Actions Caching Documentation](https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows).
+- GitHub Docs: [Cache access for low-trust workflow triggers](https://docs.github.com/actions/reference/workflows-and-actions/dependency-caching#cache-access-for-low-trust-workflow-triggers).
 - Scribe Security Blog: [Cache Poisoning in GitHub Actions](https://scribesecurity.com/blog/github-cache-poisoning/).
diff --git a/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.ql b/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.ql
index 8ff02c5ee288..c6d7ea9ccec3 100644
--- a/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.ql
+++ b/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.ql
@@ -22,6 +22,7 @@ from CodeInjectionFlow::PathNode source, CodeInjectionFlow::PathNode sink, Event
 where
   CodeInjectionFlow::flowPath(source, sink) and
   event = getRelevantCachePoisoningEventForSink(sink.getNode()) and
+  source.getNode().(RemoteFlowSource).getEventName() = event.getName() and
   // the checkout is not controlled by an access check
   not exists(ControlCheck check |
     check.protects(source.getNode().asExpr(), event, "code-injection")
diff --git a/actions/ql/src/Security/CWE-349/CachePoisoningViaDirectCache.md b/actions/ql/src/Security/CWE-349/CachePoisoningViaDirectCache.md
index 849b771a8ff0..a22c41ad3e3a 100644
--- a/actions/ql/src/Security/CWE-349/CachePoisoningViaDirectCache.md
+++ b/actions/ql/src/Security/CWE-349/CachePoisoningViaDirectCache.md
@@ -34,35 +34,39 @@ Due to the above design, if something is cached in the context of the default br
 
 ## Example
 
+GitHub gives workflows triggered by low-trust events, such as `issue_comment`,
+`pull_request_target`, and `workflow_run`, read-only access to the default branch cache scope.
+This query therefore reports only workflows whose trigger can write to that scope.
+
 ### Incorrect Usage
 
-The following workflow is caching an attacker-controlled file (`large_file`) in the context of the default branch.
+The following write-capable manually dispatched workflow accepts a revision without validation,
+fetches files from it, and saves those files in the default branch cache. This is unsafe if an
+untrusted integration or automation can influence the dispatch input.
 
 ```yaml
 name: Vulnerable Workflow
 on:
-  issue_comment:
-    types: [created]
+  workflow_dispatch:
+    inputs:
+      head_sha:
+        required: true
 
 jobs:
-  pr-comment:
+  cache:
     permissions: read-all
     runs-on: ubuntu-latest
     steps:
-      - uses: xt0rted/pull-request-comment-branch@v2
-        id: comment-branch
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ steps.comment-branch.outputs.head_sha }}
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v5
-      - name: Cache pip dependencies
+      - env:
+          HEAD_SHA: ${{ github.event.inputs.head_sha }}
+        run: |
+          git fetch origin "$HEAD_SHA"
+          git checkout "$HEAD_SHA"
+      - name: Cache fetched files
         uses: actions/cache@v4
-        id: cache-pip
         with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml') }}
-          restore-keys: ${{ runner.os }}-pip-
+          path: .
+          key: dispatched-${{ github.event.inputs.head_sha }}
 ```
 
 ### Correct Usage
@@ -91,36 +95,8 @@ jobs:
           restore-keys: ${{ runner.os }}-pip-
 ```
 
-Note, that the example above doesn't allow using secrets if the Pull Request originates from a fork. In case secrets are needed, `pull_request_target` with labels as `safe to test` can be used, but the code in Pull Request must be manually reviewed before applying the label.
-
-```yaml
-name: Secure Workflow
-on:
-  pull_request_target:
-    types: [labeled]
-
-jobs:
-  pr-comment:
-    if: contains(github.event.pull_request.labels.*.name, 'safe to test')
-    permissions: read-all
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha}}
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v5
-      - name: Cache pip dependencies
-        uses: actions/cache@v4
-        id: cache-pip
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml') }}
-          restore-keys: ${{ runner.os }}-pip-
-```
-
 ## References
 
 - Adnan Khan's Blog: [The Monsters in Your Build Cache – GitHub Actions Cache Poisoning](https://adnanthekhan.com/2024/05/06/the-monsters-in-your-build-cache-github-actions-cache-poisoning/).
-- GitHub Docs: [GitHub Actions Caching Documentation](https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows).
+- GitHub Docs: [Cache access for low-trust workflow triggers](https://docs.github.com/actions/reference/workflows-and-actions/dependency-caching#cache-access-for-low-trust-workflow-triggers).
 - Scribe Security Blog: [Cache Poisoning in GitHub Actions](https://scribesecurity.com/blog/github-cache-poisoning/).
diff --git a/actions/ql/src/Security/CWE-349/CachePoisoningViaDirectCache.ql b/actions/ql/src/Security/CWE-349/CachePoisoningViaDirectCache.ql
index 85a0f53df1dc..b410f92b68a1 100644
--- a/actions/ql/src/Security/CWE-349/CachePoisoningViaDirectCache.ql
+++ b/actions/ql/src/Security/CWE-349/CachePoisoningViaDirectCache.ql
@@ -40,17 +40,7 @@ where
   job.getATriggerEvent() = event and
   // job can be triggered by an external user
   event.isExternallyTriggerable() and
-  (
-    // the workflow runs in the context of the default branch
-    runsOnDefaultBranch(event)
-    or
-    // the workflow's caller runs in the context of the default branch
-    event.getName() = "workflow_call" and
-    exists(ExternalJob caller |
-      caller.getCallee() = job.getLocation().getFile().getRelativePath() and
-      runsOnDefaultBranch(caller.getATriggerEvent())
-    )
-  ) and
+  hasDefaultBranchCacheWriteAccess(job, event) and
   // the job writes to the cache
   // (No need to follow the checkout/download step since the cache is normally write after the job completes)
   job.getAStep() = step and
diff --git a/actions/ql/src/Security/CWE-349/CachePoisoningViaPoisonableStep.md b/actions/ql/src/Security/CWE-349/CachePoisoningViaPoisonableStep.md
index fefd6d61a44d..e5fd868609c4 100644
--- a/actions/ql/src/Security/CWE-349/CachePoisoningViaPoisonableStep.md
+++ b/actions/ql/src/Security/CWE-349/CachePoisoningViaPoisonableStep.md
@@ -34,25 +34,35 @@ Due to the above design, if something is cached in the context of the default br
 
 ## Example
 
+GitHub gives workflows triggered by low-trust events, such as `issue_comment`,
+`pull_request_target`, and `workflow_run`, read-only access to the default branch cache scope.
+This query therefore reports only workflows whose trigger can write to that scope.
+
 ### Incorrect Usage
 
-The following workflow runs untrusted code in a non-privileged job but in the context of the default branch.
+The following write-capable manually dispatched workflow fetches an unvalidated revision and then
+executes code from it. The executed code can use the cache token to poison the default branch cache
+if an untrusted integration or automation can influence the dispatch input.
 
 ```yaml
 name: Vulnerable Workflow
 on:
-  pull_request_target:
-    branches: [main]
-permissions: {}
+  workflow_dispatch:
+    inputs:
+      head_sha:
+        required: true
 jobs:
   test:
+    permissions: {}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
+      - env:
+          HEAD_SHA: ${{ github.event.inputs.head_sha }}
+        run: |
+          git fetch origin "$HEAD_SHA"
+          git checkout "$HEAD_SHA"
       - name: Run tests
-        run: ./run_tests.sh
+        run: npm install
 ```
 
 ### Correct Usage
@@ -79,5 +89,5 @@ jobs:
 ## References
 
 - Adnan Khan's Blog: [The Monsters in Your Build Cache – GitHub Actions Cache Poisoning](https://adnanthekhan.com/2024/05/06/the-monsters-in-your-build-cache-github-actions-cache-poisoning/).
-- GitHub Docs: [GitHub Actions Caching Documentation](https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows).
+- GitHub Docs: [Cache access for low-trust workflow triggers](https://docs.github.com/actions/reference/workflows-and-actions/dependency-caching#cache-access-for-low-trust-workflow-triggers).
 - Scribe Security Blog: [Cache Poisoning in GitHub Actions](https://scribesecurity.com/blog/github-cache-poisoning/).
diff --git a/actions/ql/src/Security/CWE-349/CachePoisoningViaPoisonableStep.ql b/actions/ql/src/Security/CWE-349/CachePoisoningViaPoisonableStep.ql
index e26f309ce531..35dcb390e131 100644
--- a/actions/ql/src/Security/CWE-349/CachePoisoningViaPoisonableStep.ql
+++ b/actions/ql/src/Security/CWE-349/CachePoisoningViaPoisonableStep.ql
@@ -50,17 +50,7 @@ where
   job.getATriggerEvent() = event and
   // job can be triggered by an external user
   event.isExternallyTriggerable() and
-  (
-    // the workflow runs in the context of the default branch
-    runsOnDefaultBranch(event)
-    or
-    // the workflow's caller runs in the context of the default branch
-    event.getName() = "workflow_call" and
-    exists(ExternalJob caller |
-      caller.getCallee() = job.getLocation().getFile().getRelativePath() and
-      runsOnDefaultBranch(caller.getATriggerEvent())
-    )
-  ) and
+  hasDefaultBranchCacheWriteAccess(job, event) and
   // the job executes checked-out code
   // (The cache specific token can be leaked even for non-privileged workflows)
   source.getAFollowingStep() = step and
diff --git a/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.md b/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.md
index 16551e9c89a7..b8c7435adddf 100644
--- a/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.md
+++ b/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.md
@@ -1,10 +1,10 @@
 ## Overview
 
-Using a tag for a 3rd party Action that is not pinned to a commit can lead to executing an untrusted Action through a supply chain attack.
+Using a mutable tag or branch for an Action or reusable workflow can lead to executing untrusted code through a supply chain attack.
 
 ## Recommendation
 
-Pinning an action to a full length commit SHA is currently the only way to use a non-immutable action as an immutable release. Pinning to a particular SHA helps mitigate the risk of a bad actor adding a backdoor to the action's repository, as they would need to generate a SHA-1 collision for a valid Git object payload. When selecting a SHA, you should verify it is from the action's repository and not a repository fork.
+Pinning an Action or reusable workflow to a full length commit SHA is currently the only way to use a mutable reference as an immutable release. Pinning to a particular SHA helps mitigate the risk of a bad actor adding a backdoor to the referenced repository, as they would need to generate a SHA-1 collision for a valid Git object payload. When selecting a SHA, you should verify it is from the intended repository and not a repository fork.
 
 ## Example
 
@@ -14,12 +14,26 @@ Pinning an action to a full length commit SHA is currently the only way to use a
 - uses: tj-actions/changed-files@v44
 ```
 
+```yaml
+jobs:
+  call-workflow:
+    uses: example/actions/.github/workflows/build.yml@main
+```
+
 ### Correct Usage
 
 ```yaml
 - uses: tj-actions/changed-files@c65cd883420fd2eb864698a825fc4162dd94482c # v44
 ```
 
+```yaml
+jobs:
+  call-workflow:
+    uses: example/actions/.github/workflows/build.yml@25b062c917b0c75f8b47d8469aff6c94ffd89abb
+```
+
 ## References
 
 - GitHub Docs: [Using third-party actions](https://docs.github.com/en/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions#using-third-party-actions).
+- GitHub Docs: [Reusing third-party workflows](https://docs.github.com/en/actions/reference/security/secure-use#reusing-third-party-workflows).
+- GitHub Docs: [Workflow syntax for reusable workflow calls](https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#jobsjob_iduses).
diff --git a/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.ql b/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.ql
index 530b8e48e0f5..8a1f821d073a 100644
--- a/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.ql
+++ b/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.ql
@@ -1,6 +1,6 @@
 /**
- * @name Unpinned tag for a non-immutable Action in workflow or composite action
- * @description Using a tag for a non-immutable Action that is not pinned to a commit can lead to executing an untrusted Action through a supply chain attack.
+ * @name Unpinned tag for a non-immutable Action or reusable workflow
+ * @description Using a mutable reference for a non-immutable Action or reusable workflow can lead to executing untrusted code through a supply chain attack.
  * @kind problem
  * @security-severity 5.0
  * @problem.severity warning
@@ -33,7 +33,13 @@ private predicate isPinnedContainer(string version) {
 bindingset[nwo]
 private predicate isContainerImage(string nwo) { nwo.regexpMatch("^docker://.+") }
 
-private predicate getStepContainerName(UsesStep uses, string name) {
+// A `$/` reference is a same-repository (self repository) reference (e.g. `$/path/to/action`),
+// resolved at the commit the calling workflow is running. Like `./` local (self workspace)
+// references, it is inherently pinned and can never be an unpinned-tag finding, so we never flag it.
+bindingset[nwo]
+private predicate isSelfRepository(string nwo) { nwo.matches("$/%") }
+
+private predicate hasUsesContainerName(Uses uses, string name) {
   exists(Workflow workflow |
     uses.getEnclosingWorkflow() = workflow and
     (
@@ -49,14 +55,27 @@ private predicate getStepContainerName(UsesStep uses, string name) {
   )
 }
 
-from UsesStep uses, string nwo, string version, string name
+from Uses uses, string nwo, string version, string name, string message
 where
   uses.getCallee() = nwo and
-  getStepContainerName(uses, name) and
+  hasUsesContainerName(uses, name) and
   uses.getVersion() = version and
   not isTrustedOwner(nwo) and
-  not (if isContainerImage(nwo) then isPinnedContainer(version) else isPinnedCommit(version)) and
-  not isImmutableAction(uses, nwo)
-select uses.getCalleeNode(),
-  "Unpinned 3rd party Action '" + name + "' step $@ uses '" + nwo + "' with ref '" + version +
-    "', not a pinned commit hash", uses, uses.toString()
+  not isSelfRepository(nwo) and
+  not any(ActionsLock lock).pins(uses, version) and
+  not (
+    if uses instanceof UsesStep and isContainerImage(nwo)
+    then isPinnedContainer(version)
+    else isPinnedCommit(version)
+  ) and
+  not exists(UsesStep step | uses = step and isImmutableAction(step, nwo)) and
+  if uses instanceof ExternalJob
+  then
+    message =
+      "Job $@ in '" + name + "' uses reusable workflow '" + nwo + "' with ref '" + version +
+        "', not a pinned commit hash"
+  else
+    message =
+      "Unpinned 3rd party Action '" + name + "' step $@ uses '" + nwo + "' with ref '" + version +
+        "', not a pinned commit hash"
+select uses.getCalleeNode(), message, uses, uses.toString()
diff --git a/actions/ql/src/change-notes/2026-07-18-envvar-injection-precision.md b/actions/ql/src/change-notes/2026-07-18-envvar-injection-precision.md
deleted file mode 100644
index c5bc9ba79bf1..000000000000
--- a/actions/ql/src/change-notes/2026-07-18-envvar-injection-precision.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The `actions/envvar-injection/critical` query now requires the untrusted source and privileged context to originate from the same trigger event. The environment variable injection queries also no longer treat pull request head labels as injection-capable because they cannot contain newlines.
diff --git a/actions/ql/src/change-notes/2026-07-28-checkout-provenance.md b/actions/ql/src/change-notes/2026-07-28-checkout-provenance.md
deleted file mode 100644
index 9a1bb29be1d9..000000000000
--- a/actions/ql/src/change-notes/2026-07-28-checkout-provenance.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: fix
----
-* The `actions/cache-poisoning/poisonable-step` and `actions/untrusted-checkout/critical` queries now start paths at the expressions that control untrusted checkouts and link their alert messages to those expressions.
diff --git a/actions/ql/src/change-notes/2026-07-28-output-clobbering-regex.md b/actions/ql/src/change-notes/2026-07-28-output-clobbering-regex.md
deleted file mode 100644
index d9e84a447c91..000000000000
--- a/actions/ql/src/change-notes/2026-07-28-output-clobbering-regex.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: fix
----
-* Fixed a performance issue in the `actions/output-clobbering/high` query caused by using unescaped source-code input in a regular expression.
diff --git a/actions/ql/src/change-notes/2026-07-28-schedule-event-mapping.md b/actions/ql/src/change-notes/2026-07-28-schedule-event-mapping.md
deleted file mode 100644
index ff949c266d08..000000000000
--- a/actions/ql/src/change-notes/2026-07-28-schedule-event-mapping.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* GitHub Actions queries now correctly classify the `schedule` event when determining whether a workflow is externally triggerable.
diff --git a/actions/ql/src/change-notes/2026-07-29-output-clobbering-jq-precision.md b/actions/ql/src/change-notes/2026-07-29-output-clobbering-jq-precision.md
deleted file mode 100644
index 9fba403a5715..000000000000
--- a/actions/ql/src/change-notes/2026-07-29-output-clobbering-jq-precision.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The `actions/output-clobbering/high` query no longer reports simple `jq` path filters when their output remains JSON-encoded. Raw-output modes, complex filters, and unrecognized options remain reportable.
diff --git a/actions/ql/src/change-notes/2026-07-29-output-clobbering-messages.md b/actions/ql/src/change-notes/2026-07-29-output-clobbering-messages.md
deleted file mode 100644
index 4abb7a029762..000000000000
--- a/actions/ql/src/change-notes/2026-07-29-output-clobbering-messages.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: fix
----
-* The `actions/output-clobbering/high` query now provides messages tailored to the affected output channel and includes expanded documentation and recommendations.
diff --git a/actions/ql/src/change-notes/2026-07-31-cache-poisoning-code-injection-wording.md b/actions/ql/src/change-notes/2026-07-31-cache-poisoning-code-injection-wording.md
deleted file mode 100644
index 8e2ade04f8b0..000000000000
--- a/actions/ql/src/change-notes/2026-07-31-cache-poisoning-code-injection-wording.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: queryMetadata
----
-* The name and alert message of the `actions/cache-poisoning/code-injection` query have been reworded for clarity.
\ No newline at end of file
diff --git a/actions/ql/src/change-notes/released/0.6.33.md b/actions/ql/src/change-notes/released/0.6.33.md
new file mode 100644
index 000000000000..86351b4c9158
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.33.md
@@ -0,0 +1,18 @@
+## 0.6.33
+
+### Query Metadata Changes
+
+* The name and alert message of the `actions/cache-poisoning/code-injection` query have been reworded for clarity.
+
+### Minor Analysis Improvements
+
+* The `actions/output-clobbering/high` query no longer reports simple `jq` path filters when their output remains JSON-encoded. Raw-output modes, complex filters, and unrecognized options remain reportable.
+* GitHub Actions queries now correctly classify the `schedule` event when determining whether a workflow is externally triggerable.
+* The `actions/envvar-injection/critical` query now requires the untrusted source and privileged context to originate from the same trigger event. The environment variable injection queries also no longer treat pull request head labels as injection-capable because they cannot contain newlines.
+* The `actions/cache-poisoning/code-injection`, `actions/cache-poisoning/direct-cache`, and `actions/cache-poisoning/poisonable-step` queries now account for read-only cache access on low-trust triggers that run in the default branch scope. Results are retained for triggers that GitHub allows to write to that cache scope.
+
+### Bug Fixes
+
+* The `actions/output-clobbering/high` query now provides messages tailored to the affected output channel and includes expanded documentation and recommendations.
+* The `actions/cache-poisoning/poisonable-step` and `actions/untrusted-checkout/critical` queries now start paths at the expressions that control untrusted checkouts and link their alert messages to those expressions.
+* Fixed a performance issue in the `actions/output-clobbering/high` query caused by using unescaped source-code input in a regular expression.
diff --git a/actions/ql/src/change-notes/released/0.6.34.md b/actions/ql/src/change-notes/released/0.6.34.md
new file mode 100644
index 000000000000..cfb871641149
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.34.md
@@ -0,0 +1,5 @@
+## 0.6.34
+
+### Minor Analysis Improvements
+
+* The `actions/unpinned-tag` query now detects mutable references to reusable workflows.
diff --git a/actions/ql/src/change-notes/released/0.6.35.md b/actions/ql/src/change-notes/released/0.6.35.md
new file mode 100644
index 000000000000..aa17e650d404
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.35.md
@@ -0,0 +1,3 @@
+## 0.6.35
+
+No user-facing changes.
diff --git a/actions/ql/src/change-notes/released/0.6.36.md b/actions/ql/src/change-notes/released/0.6.36.md
new file mode 100644
index 000000000000..1dce71ce8b9d
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.36.md
@@ -0,0 +1,6 @@
+## 0.6.36
+
+### Minor Analysis Improvements
+
+* The `actions/unpinned-tag` query no longer reports action references pinned by a structurally valid `.github/workflows/actions.lock` entry for the enclosing workflow.
+* The `actions/unpinned-tag` query no longer reports `$/` self repository references (e.g. `uses: $/path/to/action`), which resolve to the same repository at the running commit and are therefore inherently pinned, just like `./` self workspace (local) references.
diff --git a/actions/ql/src/change-notes/released/0.6.37.md b/actions/ql/src/change-notes/released/0.6.37.md
new file mode 100644
index 000000000000..1740f508517b
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.37.md
@@ -0,0 +1,3 @@
+## 0.6.37
+
+No user-facing changes.
diff --git a/actions/ql/src/change-notes/released/0.6.38.md b/actions/ql/src/change-notes/released/0.6.38.md
new file mode 100644
index 000000000000..2e9de7e7bd69
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.38.md
@@ -0,0 +1,3 @@
+## 0.6.38
+
+No user-facing changes.
diff --git a/actions/ql/src/change-notes/released/0.6.39.md b/actions/ql/src/change-notes/released/0.6.39.md
new file mode 100644
index 000000000000..8b72c9e25164
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.39.md
@@ -0,0 +1,3 @@
+## 0.6.39
+
+No user-facing changes.
diff --git a/actions/ql/src/codeql-pack.release.yml b/actions/ql/src/codeql-pack.release.yml
index 6c5978280b02..8bb51432d803 100644
--- a/actions/ql/src/codeql-pack.release.yml
+++ b/actions/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.6.32
+lastReleaseVersion: 0.6.39
diff --git a/actions/ql/src/qlpack.yml b/actions/ql/src/qlpack.yml
index 6d2a221c1b4a..fd909c917439 100644
--- a/actions/ql/src/qlpack.yml
+++ b/actions/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-queries
-version: 0.6.33-dev
+version: 0.6.40-dev
 library: false
 warnOnImplicitThis: true
 groups: [actions, queries]
diff --git a/actions/ql/test/library-tests/actions-lock/.github/workflows/actions.lock b/actions/ql/test/library-tests/actions-lock/.github/workflows/actions.lock
new file mode 100644
index 000000000000..bb91aa093d86
--- /dev/null
+++ b/actions/ql/test/library-tests/actions-lock/.github/workflows/actions.lock
@@ -0,0 +1,19 @@
+# This file is machine-generated by `gh actions-lock`.
+# Do not edit by hand; run `gh actions-lock` to update.
+# Docs: https://gh.io/actions-lockfile
+version: 'v0.0.2'
+workflows:
+    '.github/workflows/test.yml':
+        - 'actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1'
+        - 'github/codeql-action@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28'
+dependencies:
+    'actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1':
+        ref: '3d3c42e5aac5ba805825da76410c181273ba90b1'
+        commit: 'sha1-3d3c42e5aac5ba805825da76410c181273ba90b1'
+        owner_id: 44036562
+        repo_id: 197814629
+    'github/codeql-action@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28':
+        ref: 'v4.37.8'
+        commit: 'sha1-db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28'
+        owner_id: 9919
+        repo_id: 259445878
diff --git a/actions/ql/test/library-tests/actions-lock/.github/workflows/test.yml b/actions/ql/test/library-tests/actions-lock/.github/workflows/test.yml
new file mode 100644
index 000000000000..79afdcdf7006
--- /dev/null
+++ b/actions/ql/test/library-tests/actions-lock/.github/workflows/test.yml
@@ -0,0 +1,6 @@
+on: push
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo test
diff --git a/actions/ql/test/library-tests/actions-lock/options b/actions/ql/test/library-tests/actions-lock/options
new file mode 100644
index 000000000000..af54d6532407
--- /dev/null
+++ b/actions/ql/test/library-tests/actions-lock/options
@@ -0,0 +1 @@
+semmle-extractor-options: --file-type YAML .github/workflows/actions.lock
diff --git a/actions/ql/test/library-tests/actions-lock/test.expected b/actions/ql/test/library-tests/actions-lock/test.expected
new file mode 100644
index 000000000000..bd9b029ccd89
--- /dev/null
+++ b/actions/ql/test/library-tests/actions-lock/test.expected
@@ -0,0 +1 @@
+| .github/workflows/actions.lock:0:0:0:0 | .github/workflows/actions.lock |
diff --git a/actions/ql/test/library-tests/actions-lock/test.ql b/actions/ql/test/library-tests/actions-lock/test.ql
new file mode 100644
index 000000000000..03451f476fcd
--- /dev/null
+++ b/actions/ql/test/library-tests/actions-lock/test.ql
@@ -0,0 +1,4 @@
+import codeql.actions.Lock
+
+from ActionsLock lock
+select lock.getFile()
diff --git a/actions/ql/test/library-tests/basic/.github/workflows/controlcheck.yml b/actions/ql/test/library-tests/basic/.github/workflows/controlcheck.yml
new file mode 100644
index 000000000000..bd8ba15784b4
--- /dev/null
+++ b/actions/ql/test/library-tests/basic/.github/workflows/controlcheck.yml
@@ -0,0 +1,16 @@
+on:
+  pull_request_target:
+    types: [Created]
+jobs:
+  test1:
+    environment: EnvironmentInRepo
+    runs-on: ubuntu-latest
+    steps:
+      - name: Test 1
+        run: echo "test1"
+  test2:
+    environment: EnvironmentNotInRepo
+    runs-on: ubuntu-latest
+    steps:
+      - name: Test 2
+        run: echo "test2"
\ No newline at end of file
diff --git a/actions/ql/test/library-tests/basic/commands.expected b/actions/ql/test/library-tests/basic/commands.expected
index 82ea1739b28a..adbcdb5a40a7 100644
--- a/actions/ql/test/library-tests/basic/commands.expected
+++ b/actions/ql/test/library-tests/basic/commands.expected
@@ -16,6 +16,8 @@
 | .github/workflows/commands.yml:28:9:31:2 | Run Step | wc -l |
 | .github/workflows/commands.yml:34:9:37:6 | Run Step | command1 |
 | .github/workflows/commands.yml:34:9:37:6 | Run Step | command2 |
+| .github/workflows/controlcheck.yml:9:9:11:2 | Run Step | echo "test1" |
+| .github/workflows/controlcheck.yml:15:9:16:25 | Run Step | echo "test2" |
 | .github/workflows/expression_nodes.yml:7:9:8:6 | Run Step | LINE 1echo '${{ github.event.comment.body }}' |
 | .github/workflows/expression_nodes.yml:8:9:10:6 | Run Step | LINE 1 echo '${{ github.event.comment.body }}' |
 | .github/workflows/expression_nodes.yml:10:9:13:6 | Run Step | LINE 1 echo '${{ github.event.comment.body }}' |
diff --git a/actions/ql/test/library-tests/basic/controlchecktest.expected b/actions/ql/test/library-tests/basic/controlchecktest.expected
new file mode 100644
index 000000000000..ac2f7ac38aa1
--- /dev/null
+++ b/actions/ql/test/library-tests/basic/controlchecktest.expected
@@ -0,0 +1 @@
+| .github/workflows/controlcheck.yml:6:18:6:34 | EnvironmentInRepo |
diff --git a/actions/ql/test/library-tests/basic/controlchecktest.ext.yml b/actions/ql/test/library-tests/basic/controlchecktest.ext.yml
new file mode 100644
index 000000000000..96ded8ff2b2c
--- /dev/null
+++ b/actions/ql/test/library-tests/basic/controlchecktest.ext.yml
@@ -0,0 +1,8 @@
+extensions:
+  - addsTo:
+      pack: codeql/actions-all
+      extensible: enabledDeploymentEnvironmentDataModel
+    data: 
+      # assumed to exist in a repo where controlcheck.yml exists
+      # realistically would need to be manually/externally provided
+      - ["EnvironmentInRepo"]
\ No newline at end of file
diff --git a/actions/ql/test/library-tests/basic/controlchecktest.ql b/actions/ql/test/library-tests/basic/controlchecktest.ql
new file mode 100644
index 000000000000..1daba58fe749
--- /dev/null
+++ b/actions/ql/test/library-tests/basic/controlchecktest.ql
@@ -0,0 +1,5 @@
+import actions
+import codeql.actions.security.ControlChecks
+
+from ControlCheck c
+select c
diff --git a/actions/ql/test/library-tests/basic/test.expected b/actions/ql/test/library-tests/basic/test.expected
index 4de3336aba7b..d29f21b8360a 100644
--- a/actions/ql/test/library-tests/basic/test.expected
+++ b/actions/ql/test/library-tests/basic/test.expected
@@ -1,5 +1,6 @@
 files
 | .github/workflows/commands.yml:0:0:0:0 | .github/workflows/commands.yml |
+| .github/workflows/controlcheck.yml:0:0:0:0 | .github/workflows/controlcheck.yml |
 | .github/workflows/expression_nodes.yml:0:0:0:0 | .github/workflows/expression_nodes.yml |
 | .github/workflows/many_strings.yml:0:0:0:0 | .github/workflows/many_strings.yml |
 | .github/workflows/multiline2.yml:0:0:0:0 | .github/workflows/multiline2.yml |
@@ -7,8 +8,10 @@ files
 | .github/workflows/poisonable_steps.yml:0:0:0:0 | .github/workflows/poisonable_steps.yml |
 | .github/workflows/shell.yml:0:0:0:0 | .github/workflows/shell.yml |
 | .github/workflows/test.yml:0:0:0:0 | .github/workflows/test.yml |
+| controlchecktest.ext.yml:0:0:0:0 | controlchecktest.ext.yml |
 workflows
 | .github/workflows/commands.yml:1:1:39:30 | on: push |
+| .github/workflows/controlcheck.yml:1:1:16:25 | on: |
 | .github/workflows/expression_nodes.yml:1:1:21:47 | on: issue_comment |
 | .github/workflows/many_strings.yml:1:1:18:1211 | on: |
 | .github/workflows/multiline2.yml:1:1:89:35 | on:  |
@@ -21,6 +24,8 @@ compositeActions
 jobs
 | .github/workflows/commands.yml:9:5:31:2 | Job: local_commands |
 | .github/workflows/commands.yml:32:5:39:30 | Job: local_commands2 |
+| .github/workflows/controlcheck.yml:6:5:11:2 | Job: test1 |
+| .github/workflows/controlcheck.yml:12:5:16:25 | Job: test2 |
 | .github/workflows/expression_nodes.yml:5:5:21:47 | Job: echo-chamber |
 | .github/workflows/many_strings.yml:9:5:18:1211 | Job: Test |
 | .github/workflows/multiline2.yml:9:5:89:35 | Job: Test |
@@ -35,6 +40,8 @@ jobs
 localJobs
 | .github/workflows/commands.yml:9:5:31:2 | Job: local_commands |
 | .github/workflows/commands.yml:32:5:39:30 | Job: local_commands2 |
+| .github/workflows/controlcheck.yml:6:5:11:2 | Job: test1 |
+| .github/workflows/controlcheck.yml:12:5:16:25 | Job: test2 |
 | .github/workflows/expression_nodes.yml:5:5:21:47 | Job: echo-chamber |
 | .github/workflows/many_strings.yml:9:5:18:1211 | Job: Test |
 | .github/workflows/multiline2.yml:9:5:89:35 | Job: Test |
@@ -57,6 +64,8 @@ steps
 | .github/workflows/commands.yml:28:9:31:2 | Run Step |
 | .github/workflows/commands.yml:34:9:37:6 | Run Step |
 | .github/workflows/commands.yml:37:9:39:30 | Run Step |
+| .github/workflows/controlcheck.yml:9:9:11:2 | Run Step |
+| .github/workflows/controlcheck.yml:15:9:16:25 | Run Step |
 | .github/workflows/expression_nodes.yml:7:9:8:6 | Run Step |
 | .github/workflows/expression_nodes.yml:8:9:10:6 | Run Step |
 | .github/workflows/expression_nodes.yml:10:9:13:6 | Run Step |
@@ -180,6 +189,10 @@ runStepChildren
 | .github/workflows/commands.yml:34:9:37:6 | Run Step | .github/workflows/commands.yml:35:14:36:30 | command1 ; command2\n |
 | .github/workflows/commands.yml:37:9:39:30 | Run Step | .github/workflows/commands.yml:37:16:37:19 | pwsh |
 | .github/workflows/commands.yml:37:9:39:30 | Run Step | .github/workflows/commands.yml:38:14:39:30 | command3 \| command4\n |
+| .github/workflows/controlcheck.yml:9:9:11:2 | Run Step | .github/workflows/controlcheck.yml:9:15:9:20 | Test 1 |
+| .github/workflows/controlcheck.yml:9:9:11:2 | Run Step | .github/workflows/controlcheck.yml:10:14:10:25 | echo "test1" |
+| .github/workflows/controlcheck.yml:15:9:16:25 | Run Step | .github/workflows/controlcheck.yml:15:15:15:20 | Test 2 |
+| .github/workflows/controlcheck.yml:15:9:16:25 | Run Step | .github/workflows/controlcheck.yml:16:14:16:25 | echo "test2" |
 | .github/workflows/expression_nodes.yml:7:9:8:6 | Run Step | .github/workflows/expression_nodes.yml:7:14:7:58 | LINE 1echo '${{ github.event.comment.body }}' |
 | .github/workflows/expression_nodes.yml:8:9:10:6 | Run Step | .github/workflows/expression_nodes.yml:8:14:9:57 | LINE 1 echo '${{ github.event.comment.body }}'\n |
 | .github/workflows/expression_nodes.yml:10:9:13:6 | Run Step | .github/workflows/expression_nodes.yml:10:14:12:53 | LINE 1 echo '${{ github.event.comment.body }}'\nLINE 2 echo '${{github.event.issue.body}}'\n |
@@ -347,6 +360,43 @@ parentNodes
 | .github/workflows/commands.yml:38:14:39:30 | command3 \| command4\n | .github/workflows/commands.yml:1:1:39:30 | on: push |
 | .github/workflows/commands.yml:38:14:39:30 | command3 \| command4\n | .github/workflows/commands.yml:32:5:39:30 | Job: local_commands2 |
 | .github/workflows/commands.yml:38:14:39:30 | command3 \| command4\n | .github/workflows/commands.yml:37:9:39:30 | Run Step |
+| .github/workflows/controlcheck.yml:2:3:2:21 | pull_request_target | .github/workflows/controlcheck.yml:2:3:3:21 | pull_request_target: |
+| .github/workflows/controlcheck.yml:2:3:3:21 | pull_request_target: | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:3:13:3:19 | Created | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:3:13:3:19 | Created | .github/workflows/controlcheck.yml:2:3:2:21 | pull_request_target |
+| .github/workflows/controlcheck.yml:3:13:3:19 | Created | .github/workflows/controlcheck.yml:2:3:3:21 | pull_request_target: |
+| .github/workflows/controlcheck.yml:6:5:11:2 | Job: test1 | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:6:18:6:34 | EnvironmentInRepo | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:6:18:6:34 | EnvironmentInRepo | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:6:18:6:34 | EnvironmentInRepo | .github/workflows/controlcheck.yml:6:5:11:2 | Job: test1 |
+| .github/workflows/controlcheck.yml:6:18:6:34 | EnvironmentInRepo | .github/workflows/controlcheck.yml:6:5:11:2 | Job: test1 |
+| .github/workflows/controlcheck.yml:6:18:6:34 | EnvironmentInRepo | .github/workflows/controlcheck.yml:6:18:6:34 | EnvironmentInRepo |
+| .github/workflows/controlcheck.yml:6:18:6:34 | EnvironmentInRepo | .github/workflows/controlcheck.yml:6:18:6:34 | EnvironmentInRepo |
+| .github/workflows/controlcheck.yml:7:14:7:26 | ubuntu-latest | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:7:14:7:26 | ubuntu-latest | .github/workflows/controlcheck.yml:6:5:11:2 | Job: test1 |
+| .github/workflows/controlcheck.yml:9:9:11:2 | Run Step | .github/workflows/controlcheck.yml:6:5:11:2 | Job: test1 |
+| .github/workflows/controlcheck.yml:9:15:9:20 | Test 1 | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:9:15:9:20 | Test 1 | .github/workflows/controlcheck.yml:6:5:11:2 | Job: test1 |
+| .github/workflows/controlcheck.yml:9:15:9:20 | Test 1 | .github/workflows/controlcheck.yml:9:9:11:2 | Run Step |
+| .github/workflows/controlcheck.yml:10:14:10:25 | echo "test1" | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:10:14:10:25 | echo "test1" | .github/workflows/controlcheck.yml:6:5:11:2 | Job: test1 |
+| .github/workflows/controlcheck.yml:10:14:10:25 | echo "test1" | .github/workflows/controlcheck.yml:9:9:11:2 | Run Step |
+| .github/workflows/controlcheck.yml:12:5:16:25 | Job: test2 | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:12:18:12:37 | EnvironmentNotInRepo | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:12:18:12:37 | EnvironmentNotInRepo | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:12:18:12:37 | EnvironmentNotInRepo | .github/workflows/controlcheck.yml:12:5:16:25 | Job: test2 |
+| .github/workflows/controlcheck.yml:12:18:12:37 | EnvironmentNotInRepo | .github/workflows/controlcheck.yml:12:5:16:25 | Job: test2 |
+| .github/workflows/controlcheck.yml:12:18:12:37 | EnvironmentNotInRepo | .github/workflows/controlcheck.yml:12:18:12:37 | EnvironmentNotInRepo |
+| .github/workflows/controlcheck.yml:12:18:12:37 | EnvironmentNotInRepo | .github/workflows/controlcheck.yml:12:18:12:37 | EnvironmentNotInRepo |
+| .github/workflows/controlcheck.yml:13:14:13:26 | ubuntu-latest | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:13:14:13:26 | ubuntu-latest | .github/workflows/controlcheck.yml:12:5:16:25 | Job: test2 |
+| .github/workflows/controlcheck.yml:15:9:16:25 | Run Step | .github/workflows/controlcheck.yml:12:5:16:25 | Job: test2 |
+| .github/workflows/controlcheck.yml:15:15:15:20 | Test 2 | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:15:15:15:20 | Test 2 | .github/workflows/controlcheck.yml:12:5:16:25 | Job: test2 |
+| .github/workflows/controlcheck.yml:15:15:15:20 | Test 2 | .github/workflows/controlcheck.yml:15:9:16:25 | Run Step |
+| .github/workflows/controlcheck.yml:16:14:16:25 | echo "test2" | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:16:14:16:25 | echo "test2" | .github/workflows/controlcheck.yml:12:5:16:25 | Job: test2 |
+| .github/workflows/controlcheck.yml:16:14:16:25 | echo "test2" | .github/workflows/controlcheck.yml:15:9:16:25 | Run Step |
 | .github/workflows/expression_nodes.yml:1:5:1:17 | issue_comment | .github/workflows/expression_nodes.yml:1:1:21:47 | on: issue_comment |
 | .github/workflows/expression_nodes.yml:1:5:1:17 | issue_comment | .github/workflows/expression_nodes.yml:1:1:21:47 | on: issue_comment |
 | .github/workflows/expression_nodes.yml:1:5:1:17 | issue_comment | .github/workflows/expression_nodes.yml:1:5:1:17 | issue_comment |
@@ -881,244 +931,368 @@ parentNodes
 | .github/workflows/test.yml:40:14:40:52 | echo ${{needs.job1.outputs.job_output}} | .github/workflows/test.yml:39:9:40:53 | Run Step: sink |
 | .github/workflows/test.yml:40:20:40:53 | needs.job1.outputs.job_output | .github/workflows/test.yml:40:14:40:52 | echo ${{needs.job1.outputs.job_output}} |
 cfgNodes
-| .github/workflows/commands.yml:1:1:39:30 | enter on: push |
-| .github/workflows/commands.yml:1:1:39:30 | exit on: push |
-| .github/workflows/commands.yml:1:1:39:30 | exit on: push (normal) |
+| .github/workflows/commands.yml:1:1:39:30 | After on: push |
+| .github/workflows/commands.yml:1:1:39:30 | Entry |
+| .github/workflows/commands.yml:1:1:39:30 | Exit |
+| .github/workflows/commands.yml:1:1:39:30 | Normal Exit |
 | .github/workflows/commands.yml:1:1:39:30 | on: push |
+| .github/workflows/commands.yml:9:5:31:2 | After Job: local_commands |
 | .github/workflows/commands.yml:9:5:31:2 | Job: local_commands |
+| .github/workflows/commands.yml:15:9:18:6 | After Run Step |
 | .github/workflows/commands.yml:15:9:18:6 | Run Step |
 | .github/workflows/commands.yml:16:14:17:30 | command1 ; command2\n |
+| .github/workflows/commands.yml:18:9:20:6 | After Run Step |
 | .github/workflows/commands.yml:18:9:20:6 | Run Step |
 | .github/workflows/commands.yml:18:14:19:30 | command3 \| command4\n |
+| .github/workflows/commands.yml:20:9:22:6 | After Run Step |
 | .github/workflows/commands.yml:20:9:22:6 | Run Step |
 | .github/workflows/commands.yml:20:14:21:33 | command5 "$(command6)"\n |
+| .github/workflows/commands.yml:22:9:24:6 | After Run Step |
 | .github/workflows/commands.yml:22:9:24:6 | Run Step |
 | .github/workflows/commands.yml:22:14:23:31 | command7 && command8\n |
+| .github/workflows/commands.yml:24:9:26:6 | After Run Step |
 | .github/workflows/commands.yml:24:9:26:6 | Run Step |
 | .github/workflows/commands.yml:24:14:25:32 | command9 \|\| command10\n |
+| .github/workflows/commands.yml:26:9:28:6 | After Run Step |
 | .github/workflows/commands.yml:26:9:28:6 | Run Step |
 | .github/workflows/commands.yml:26:14:27:34 | command11 "`command12`"\n |
+| .github/workflows/commands.yml:28:9:31:2 | After Run Step |
 | .github/workflows/commands.yml:28:9:31:2 | Run Step |
 | .github/workflows/commands.yml:28:14:29:50 | command13 "`command14` $(date \| wc -l)"\n |
+| .github/workflows/commands.yml:32:5:39:30 | After Job: local_commands2 |
 | .github/workflows/commands.yml:32:5:39:30 | Job: local_commands2 |
+| .github/workflows/commands.yml:34:9:37:6 | After Run Step |
 | .github/workflows/commands.yml:34:9:37:6 | Run Step |
 | .github/workflows/commands.yml:35:14:36:30 | command1 ; command2\n |
+| .github/workflows/commands.yml:37:9:39:30 | After Run Step |
 | .github/workflows/commands.yml:37:9:39:30 | Run Step |
 | .github/workflows/commands.yml:38:14:39:30 | command3 \| command4\n |
-| .github/workflows/expression_nodes.yml:1:1:21:47 | enter on: issue_comment |
-| .github/workflows/expression_nodes.yml:1:1:21:47 | exit on: issue_comment |
-| .github/workflows/expression_nodes.yml:1:1:21:47 | exit on: issue_comment (normal) |
+| .github/workflows/controlcheck.yml:1:1:16:25 | After on: |
+| .github/workflows/controlcheck.yml:1:1:16:25 | Entry |
+| .github/workflows/controlcheck.yml:1:1:16:25 | Exit |
+| .github/workflows/controlcheck.yml:1:1:16:25 | Normal Exit |
+| .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/controlcheck.yml:6:5:11:2 | After Job: test1 |
+| .github/workflows/controlcheck.yml:6:5:11:2 | Job: test1 |
+| .github/workflows/controlcheck.yml:9:9:11:2 | After Run Step |
+| .github/workflows/controlcheck.yml:9:9:11:2 | Run Step |
+| .github/workflows/controlcheck.yml:10:14:10:25 | echo "test1" |
+| .github/workflows/controlcheck.yml:12:5:16:25 | After Job: test2 |
+| .github/workflows/controlcheck.yml:12:5:16:25 | Job: test2 |
+| .github/workflows/controlcheck.yml:15:9:16:25 | After Run Step |
+| .github/workflows/controlcheck.yml:15:9:16:25 | Run Step |
+| .github/workflows/controlcheck.yml:16:14:16:25 | echo "test2" |
+| .github/workflows/expression_nodes.yml:1:1:21:47 | After on: issue_comment |
+| .github/workflows/expression_nodes.yml:1:1:21:47 | Entry |
+| .github/workflows/expression_nodes.yml:1:1:21:47 | Exit |
+| .github/workflows/expression_nodes.yml:1:1:21:47 | Normal Exit |
 | .github/workflows/expression_nodes.yml:1:1:21:47 | on: issue_comment |
+| .github/workflows/expression_nodes.yml:5:5:21:47 | After Job: echo-chamber |
 | .github/workflows/expression_nodes.yml:5:5:21:47 | Job: echo-chamber |
+| .github/workflows/expression_nodes.yml:7:9:8:6 | After Run Step |
 | .github/workflows/expression_nodes.yml:7:9:8:6 | Run Step |
 | .github/workflows/expression_nodes.yml:7:14:7:58 | LINE 1echo '${{ github.event.comment.body }}' |
 | .github/workflows/expression_nodes.yml:7:27:7:58 | github.event.comment.body |
+| .github/workflows/expression_nodes.yml:8:9:10:6 | After Run Step |
 | .github/workflows/expression_nodes.yml:8:9:10:6 | Run Step |
 | .github/workflows/expression_nodes.yml:8:14:9:57 | LINE 1 echo '${{ github.event.comment.body }}'\n |
 | .github/workflows/expression_nodes.yml:9:25:9:56 | github.event.comment.body |
+| .github/workflows/expression_nodes.yml:10:9:13:6 | After Run Step |
 | .github/workflows/expression_nodes.yml:10:9:13:6 | Run Step |
 | .github/workflows/expression_nodes.yml:10:14:12:53 | LINE 1 echo '${{ github.event.comment.body }}'\nLINE 2 echo '${{github.event.issue.body}}'\n |
 | .github/workflows/expression_nodes.yml:11:25:11:56 | github.event.comment.body |
 | .github/workflows/expression_nodes.yml:12:24:12:51 | github.event.issue.body |
+| .github/workflows/expression_nodes.yml:13:9:16:6 | After Run Step |
 | .github/workflows/expression_nodes.yml:13:9:16:6 | Run Step |
 | .github/workflows/expression_nodes.yml:13:14:15:46 | LINE 1 echo '${{ github.event.comment.body }}' echo '${{github.event.issue.body}}'\n |
 | .github/workflows/expression_nodes.yml:14:9:15:46 | github.event.comment.body |
 | .github/workflows/expression_nodes.yml:14:9:15:46 | github.event.issue.body |
+| .github/workflows/expression_nodes.yml:16:9:20:6 | After Run Step |
 | .github/workflows/expression_nodes.yml:16:9:20:6 | Run Step |
 | .github/workflows/expression_nodes.yml:16:14:19:57 | LINE 1 echo '${{ github.event.comment.body }}'\nLINE 2 echo '${{github.event.issue.body}}'\nLINE 3 echo '${{ github.event.comment.body }}'\n |
 | .github/workflows/expression_nodes.yml:17:25:17:56 | github.event.comment.body |
 | .github/workflows/expression_nodes.yml:18:24:18:51 | github.event.issue.body |
 | .github/workflows/expression_nodes.yml:19:24:19:55 | github.event.comment.body |
+| .github/workflows/expression_nodes.yml:20:9:21:47 | After Run Step |
 | .github/workflows/expression_nodes.yml:20:9:21:47 | Run Step |
 | .github/workflows/expression_nodes.yml:20:14:21:46 | LINE 1 echo '${{ github.event.comment.body }}' echo '${{github.event.issue.body}}' |
 | .github/workflows/expression_nodes.yml:20:14:21:46 | github.event.comment.body |
 | .github/workflows/expression_nodes.yml:20:14:21:46 | github.event.issue.body |
-| .github/workflows/many_strings.yml:1:1:18:1211 | enter on: |
-| .github/workflows/many_strings.yml:1:1:18:1211 | exit on: |
-| .github/workflows/many_strings.yml:1:1:18:1211 | exit on: (normal) |
+| .github/workflows/many_strings.yml:1:1:18:1211 | After on: |
+| .github/workflows/many_strings.yml:1:1:18:1211 | Entry |
+| .github/workflows/many_strings.yml:1:1:18:1211 | Exit |
+| .github/workflows/many_strings.yml:1:1:18:1211 | Normal Exit |
 | .github/workflows/many_strings.yml:1:1:18:1211 | on: |
+| .github/workflows/many_strings.yml:9:5:18:1211 | After Job: Test |
 | .github/workflows/many_strings.yml:9:5:18:1211 | Job: Test |
+| .github/workflows/many_strings.yml:11:9:18:1211 | After Run Step |
 | .github/workflows/many_strings.yml:11:9:18:1211 | Run Step |
 | .github/workflows/many_strings.yml:11:14:18:1211 | # Avoid choking on large chunks of data containing quotes\necho '["string1", "string2", "string3", "string4", "string5", "string6", "string7", "string8", "string9", "string10", "string11", "string12", "string13", "string14", "string15", "string16", "string17", "string18", "string19", "string20", "string21", "string22", "string23", "string24", "string25", "string26", "string27", "string28", "string29", "string30", "string31", "string32", "string33", "string34", "string35", "string36", "string37", "string38", "string39", "string40", "string41", "string42", "string43", "string44", "string45", "string46", "string47", "string48", "string49", "string50", "string51", "string52", "string53", "string54", "string55", "string56", "string57", "string58", "string59", "string60", "string61", "string62", "string63", "string64", "string65", "string66", "string67", "string68", "string69", "string70", "string71", "string72", "string73", "string74", "string75", "string76", "string77", "string78", "string79", "string80", "string81", "string82", "string83", "string84", "string85", "string86", "string87", "string88", "string89", "string90", "string91", "string92", "string93", "string94", "string95", "string96", "string97", "string98", "string99", "string100"]'\necho "['string1', 'string2', 'string3', 'string4', 'string5', 'string6', 'string7', 'string8', 'string9', 'string10', 'string11', 'string12', 'string13', 'string14', 'string15', 'string16', 'string17', 'string18', 'string19', 'string20', 'string21', 'string22', 'string23', 'string24', 'string25', 'string26', 'string27', 'string28', 'string29', 'string30', 'string31', 'string32', 'string33', 'string34', 'string35', 'string36', 'string37', 'string38', 'string39', 'string40', 'string41', 'string42', 'string43', 'string44', 'string45', 'string46', 'string47', 'string48', 'string49', 'string50', 'string51', 'string52', 'string53', 'string54', 'string55', 'string56', 'string57', 'string58', 'string59', 'string60', 'string61', 'string62', 'string63', 'string64', 'string65', 'string66', 'string67', 'string68', 'string69', 'string70', 'string71', 'string72', 'string73', 'string74', 'string75', 'string76', 'string77', 'string78', 'string79', 'string80', 'string81', 'string82', 'string83', 'string84', 'string85', 'string86', 'string87', 'string88', 'string89', 'string90', 'string91', 'string92', 'string93', 'string94', 'string95', 'string96', 'string97', 'string98', 'string99', 'string100']"\n\n# Same as above but where each line has an unbalanced internal quote near the end\necho '["string1", "string2", "string3", "string4", "string5", "string6", "string7", "string8", "string9", "string10", "string11", "string12", "string13", "string14", "string15", "string16", "string17", "string18", "string19", "string20", "string21", "string22", "string23", "string24", "string25", "string26", "string27", "string28", "string29", "string30", "string31", "string32", "string33", "string34", "string35", "string36", "string37", "string38", "string39", "string40", "string41", "string42", "string43", "string44", "string45", "string46", "string47", "string48", "string49", "string50", "string51", "string52", "string53", "string54", "string55", "string56", "string57", "string58", "string59", "string60", "string61", "string62", "string63", "string64", "string65", "string66", "string67", "string68", "string69", "string70", "string71", "string72", "string73", "string74", "string75", "string76", "string77", "string78", "string79", "string80", "string81", "string82", "string83", "string84", "string85", "string86", "string87", "string88", "string89", "string90", "string91", "string92", "string93", "string94", "string95", "string96", "string97", "string98", "string99", "string100"]"'\necho "['string1', 'string2', 'string3', 'string4', 'string5', 'string6', 'string7', 'string8', 'string9', 'string10', 'string11', 'string12', 'string13', 'string14', 'string15', 'string16', 'string17', 'string18', 'string19', 'string20', 'string21', 'string22', 'string23', 'string24', 'string25', 'string26', 'string27', 'string28', 'string29', 'string30', 'string31', 'string32', 'string33', 'string34', 'string35', 'string36', 'string37', 'string38', 'string39', 'string40', 'string41', 'string42', 'string43', 'string44', 'string45', 'string46', 'string47', 'string48', 'string49', 'string50', 'string51', 'string52', 'string53', 'string54', 'string55', 'string56', 'string57', 'string58', 'string59', 'string60', 'string61', 'string62', 'string63', 'string64', 'string65', 'string66', 'string67', 'string68', 'string69', 'string70', 'string71', 'string72', 'string73', 'string74', 'string75', 'string76', 'string77', 'string78', 'string79', 'string80', 'string81', 'string82', 'string83', 'string84', 'string85', 'string86', 'string87', 'string88', 'string89', 'string90', 'string91', 'string92', 'string93', 'string94', 'string95', 'string96', 'string97', 'string98', 'string99', 'string100']'"\n |
-| .github/workflows/multiline2.yml:1:1:89:35 | enter on:  |
-| .github/workflows/multiline2.yml:1:1:89:35 | exit on:  |
-| .github/workflows/multiline2.yml:1:1:89:35 | exit on:  (normal) |
+| .github/workflows/multiline2.yml:1:1:89:35 | After on:  |
+| .github/workflows/multiline2.yml:1:1:89:35 | Entry |
+| .github/workflows/multiline2.yml:1:1:89:35 | Exit |
+| .github/workflows/multiline2.yml:1:1:89:35 | Normal Exit |
 | .github/workflows/multiline2.yml:1:1:89:35 | on:  |
+| .github/workflows/multiline2.yml:9:5:89:35 | After Job: Test |
 | .github/workflows/multiline2.yml:9:5:89:35 | Job: Test |
+| .github/workflows/multiline2.yml:11:9:15:6 | After Run Step |
 | .github/workflows/multiline2.yml:11:9:15:6 | Run Step |
 | .github/workflows/multiline2.yml:11:14:14:54 | echo "changelog<<CHANGELOGEOF" \| tee -a $GITHUB_OUTPUT\necho -e "$FILTERED_CHANGELOG" \| tee -a $GITHUB_OUTPUT\necho "CHANGELOGEOF" \| tee -a $GITHUB_OUTPUT\n |
+| .github/workflows/multiline2.yml:15:9:20:6 | After Run Step |
 | .github/workflows/multiline2.yml:15:9:20:6 | Run Step |
 | .github/workflows/multiline2.yml:15:14:19:46 | EOF=$(dd if=/dev/urandom bs=15 count=1 status=none \| base64)\necho "status<<$EOF" \| tee -a $GITHUB_OUTPUT\necho "$(cat status.output.json)" \| tee -a $GITHUB_OUTPUT\necho "$EOF" \| tee -a $GITHUB_OUTPUT\n |
+| .github/workflows/multiline2.yml:20:9:24:6 | After Run Step |
 | .github/workflows/multiline2.yml:20:9:24:6 | Run Step |
 | .github/workflows/multiline2.yml:20:14:23:46 | echo "response<<$EOF" \| tee -a $GITHUB_OUTPUT\necho $output \| tee -a $GITHUB_OUTPUT\necho "$EOF" \| tee -a $GITHUB_OUTPUT\n |
+| .github/workflows/multiline2.yml:24:9:30:6 | After Run Step |
 | .github/workflows/multiline2.yml:24:9:30:6 | Run Step |
 | .github/workflows/multiline2.yml:24:14:29:35 | {\n  echo 'JSON_RESPONSE<<EOF'\n  ls \| grep -E "*.(tar.gz\|zip)$"\n  echo EOF\n} \| tee -a "$GITHUB_ENV"\n |
+| .github/workflows/multiline2.yml:30:9:34:6 | After Run Step |
 | .github/workflows/multiline2.yml:30:9:34:6 | Run Step |
 | .github/workflows/multiline2.yml:30:14:33:14 | cat <<-"EOF" > event.json\n  ${{ toJson(github.event) }}\nEOF\n |
 | .github/workflows/multiline2.yml:32:13:32:39 | toJson(github.event) |
+| .github/workflows/multiline2.yml:34:9:40:6 | After Run Step |
 | .github/workflows/multiline2.yml:34:9:40:6 | Run Step |
 | .github/workflows/multiline2.yml:35:14:39:14 | cat \| tee -a $GITHUB_ENV << EOL\n${ISSUE_BODY}\nFOO\nEOL\n |
+| .github/workflows/multiline2.yml:40:9:46:6 | After Run Step |
 | .github/workflows/multiline2.yml:40:9:46:6 | Run Step |
 | .github/workflows/multiline2.yml:41:14:45:14 | cat > issue.txt << EOL\n${ISSUE_BODY}\nFOO\nEOL\n |
+| .github/workflows/multiline2.yml:46:9:52:6 | After Run Step |
 | .github/workflows/multiline2.yml:46:9:52:6 | Run Step |
 | .github/workflows/multiline2.yml:47:14:51:14 | cat << EOL \| tee -a $GITHUB_ENV\n${ISSUE_BODY}\nFOO\nEOL\n |
+| .github/workflows/multiline2.yml:52:9:58:6 | After Run Step |
 | .github/workflows/multiline2.yml:52:9:58:6 | Run Step |
 | .github/workflows/multiline2.yml:53:14:57:14 | cat <<EOF \|  sed 's/l/e/g' > file.txt\nHello\nWorld\nEOF\n |
+| .github/workflows/multiline2.yml:58:9:63:6 | After Run Step |
 | .github/workflows/multiline2.yml:58:9:63:6 | Run Step |
 | .github/workflows/multiline2.yml:59:14:62:14 | cat <<-EOF \| tee -a "$GITHUB_ENV"\necho "FOO=$TITLE"\nEOF\n |
+| .github/workflows/multiline2.yml:63:9:66:6 | After Run Step |
 | .github/workflows/multiline2.yml:63:9:66:6 | Run Step |
 | .github/workflows/multiline2.yml:64:14:65:142 | echo REPO_NAME=$(cat issue.txt \| sed 's/\\\\r/\\\\n/g' \| grep -ioE '\\\\s*[a-z0-9_-]+/[a-z0-9_-]+\\\\s*$' \| tr -d ' ') \| tee -a $GITHUB_ENV\n |
+| .github/workflows/multiline2.yml:66:9:71:6 | After Run Step |
 | .github/workflows/multiline2.yml:66:9:71:6 | Run Step |
 | .github/workflows/multiline2.yml:67:14:70:42 | echo "PR_TITLE<<EOF" \| tee -a $GITHUB_ENV\necho "$TITLE" \| tee -a $GITHUB_ENV\necho "EOF" \| tee -a $GITHUB_ENV\n |
+| .github/workflows/multiline2.yml:71:9:78:6 | After Run Step |
 | .github/workflows/multiline2.yml:71:9:78:6 | Run Step |
 | .github/workflows/multiline2.yml:72:14:77:35 | {\n  echo 'JSON_RESPONSE<<EOF'\n  echo "$TITLE"\n  echo EOF\n} \| tee -a "$GITHUB_ENV"\n |
+| .github/workflows/multiline2.yml:78:9:85:6 | After Run Step |
 | .github/workflows/multiline2.yml:78:9:85:6 | Run Step |
 | .github/workflows/multiline2.yml:79:14:84:35 | {\n  echo 'JSON_RESPONSE<<EOF'\n  echo '$ISSUE'\n  echo 'EOF'\n} \| tee -a "$GITHUB_ENV"\n |
+| .github/workflows/multiline2.yml:85:9:89:35 | After Run Step |
 | .github/workflows/multiline2.yml:85:9:89:35 | Run Step |
 | .github/workflows/multiline2.yml:86:14:89:35 | {\n  echo 'JSON_RESPONSE<<EOF'\n} \| tee -a "$GITHUB_ENV"\n |
-| .github/workflows/multiline.yml:1:1:89:29 | enter on:  |
-| .github/workflows/multiline.yml:1:1:89:29 | exit on:  |
-| .github/workflows/multiline.yml:1:1:89:29 | exit on:  (normal) |
+| .github/workflows/multiline.yml:1:1:89:29 | After on:  |
+| .github/workflows/multiline.yml:1:1:89:29 | Entry |
+| .github/workflows/multiline.yml:1:1:89:29 | Exit |
+| .github/workflows/multiline.yml:1:1:89:29 | Normal Exit |
 | .github/workflows/multiline.yml:1:1:89:29 | on:  |
+| .github/workflows/multiline.yml:9:5:89:29 | After Job: Test |
 | .github/workflows/multiline.yml:9:5:89:29 | Job: Test |
+| .github/workflows/multiline.yml:11:9:15:6 | After Run Step |
 | .github/workflows/multiline.yml:11:9:15:6 | Run Step |
 | .github/workflows/multiline.yml:11:14:14:48 | echo "changelog<<CHANGELOGEOF" >> $GITHUB_OUTPUT\necho -e "$FILTERED_CHANGELOG" >> $GITHUB_OUTPUT\necho "CHANGELOGEOF" >> $GITHUB_OUTPUT\n |
+| .github/workflows/multiline.yml:15:9:20:6 | After Run Step |
 | .github/workflows/multiline.yml:15:9:20:6 | Run Step |
 | .github/workflows/multiline.yml:15:14:19:40 | EOF=$(dd if=/dev/urandom bs=15 count=1 status=none \| base64)\necho "status<<$EOF" >> $GITHUB_OUTPUT\necho "$(cat status.output.json)" >> $GITHUB_OUTPUT\necho "$EOF" >> $GITHUB_OUTPUT\n |
+| .github/workflows/multiline.yml:20:9:24:6 | After Run Step |
 | .github/workflows/multiline.yml:20:9:24:6 | Run Step |
 | .github/workflows/multiline.yml:20:14:23:40 | echo "response<<$EOF" >> $GITHUB_OUTPUT\necho $output >> $GITHUB_OUTPUT\necho "$EOF" >> $GITHUB_OUTPUT\n |
+| .github/workflows/multiline.yml:24:9:30:6 | After Run Step |
 | .github/workflows/multiline.yml:24:9:30:6 | Run Step |
 | .github/workflows/multiline.yml:24:14:29:29 | {\n  echo 'JSON_RESPONSE<<EOF'\n  ls \| grep -E "*.(tar.gz\|zip)$"\n  echo EOF\n} >> "$GITHUB_ENV"\n |
+| .github/workflows/multiline.yml:30:9:34:6 | After Run Step |
 | .github/workflows/multiline.yml:30:9:34:6 | Run Step |
 | .github/workflows/multiline.yml:30:14:33:14 | cat <<-"EOF" > event.json\n  ${{ toJson(github.event) }}\nEOF\n |
 | .github/workflows/multiline.yml:32:13:32:39 | toJson(github.event) |
+| .github/workflows/multiline.yml:34:9:40:6 | After Run Step |
 | .github/workflows/multiline.yml:34:9:40:6 | Run Step |
 | .github/workflows/multiline.yml:35:14:39:14 | cat >> $GITHUB_ENV << EOL\n${ISSUE_BODY}\nFOO\nEOL\n |
+| .github/workflows/multiline.yml:40:9:46:6 | After Run Step |
 | .github/workflows/multiline.yml:40:9:46:6 | Run Step |
 | .github/workflows/multiline.yml:41:14:45:14 | cat > issue.txt << EOL\n${ISSUE_BODY}\nFOO\nEOL\n |
+| .github/workflows/multiline.yml:46:9:52:6 | After Run Step |
 | .github/workflows/multiline.yml:46:9:52:6 | Run Step |
 | .github/workflows/multiline.yml:47:14:51:14 | cat << EOL >> $GITHUB_ENV\n${ISSUE_BODY}\nFOO\nEOL\n |
+| .github/workflows/multiline.yml:52:9:58:6 | After Run Step |
 | .github/workflows/multiline.yml:52:9:58:6 | Run Step |
 | .github/workflows/multiline.yml:53:14:57:14 | cat <<EOF \|  sed 's/l/e/g' > file.txt\nHello\nWorld\nEOF\n |
+| .github/workflows/multiline.yml:58:9:63:6 | After Run Step |
 | .github/workflows/multiline.yml:58:9:63:6 | Run Step |
 | .github/workflows/multiline.yml:59:14:62:14 | cat <<-EOF >> "$GITHUB_ENV"\necho "FOO=$TITLE"\nEOF\n |
+| .github/workflows/multiline.yml:63:9:66:6 | After Run Step |
 | .github/workflows/multiline.yml:63:9:66:6 | Run Step |
 | .github/workflows/multiline.yml:64:14:65:136 | echo REPO_NAME=$(cat issue.txt \| sed 's/\\\\r/\\\\n/g' \| grep -ioE '\\\\s*[a-z0-9_-]+/[a-z0-9_-]+\\\\s*$' \| tr -d ' ') >> $GITHUB_ENV\n |
+| .github/workflows/multiline.yml:66:9:71:6 | After Run Step |
 | .github/workflows/multiline.yml:66:9:71:6 | Run Step |
 | .github/workflows/multiline.yml:67:14:70:36 | echo "PR_TITLE<<EOF" >> $GITHUB_ENV\necho "$TITLE" >> $GITHUB_ENV\necho "EOF" >> $GITHUB_ENV\n |
+| .github/workflows/multiline.yml:71:9:78:6 | After Run Step |
 | .github/workflows/multiline.yml:71:9:78:6 | Run Step |
 | .github/workflows/multiline.yml:72:14:77:29 | {\n  echo 'JSON_RESPONSE<<EOF'\n  echo "$TITLE"\n  echo EOF\n} >> "$GITHUB_ENV"\n |
+| .github/workflows/multiline.yml:78:9:85:6 | After Run Step |
 | .github/workflows/multiline.yml:78:9:85:6 | Run Step |
 | .github/workflows/multiline.yml:79:14:84:29 | {\n  echo 'JSON_RESPONSE<<EOF'\n  echo '$ISSUE'\n  echo 'EOF'\n} >> "$GITHUB_ENV"\n |
+| .github/workflows/multiline.yml:85:9:89:29 | After Run Step |
 | .github/workflows/multiline.yml:85:9:89:29 | Run Step |
 | .github/workflows/multiline.yml:86:14:89:29 | {\n  echo 'JSON_RESPONSE<<EOF'\n} >> "$GITHUB_ENV"\n |
-| .github/workflows/poisonable_steps.yml:1:1:46:111 | enter on: push |
-| .github/workflows/poisonable_steps.yml:1:1:46:111 | exit on: push |
-| .github/workflows/poisonable_steps.yml:1:1:46:111 | exit on: push (normal) |
+| .github/workflows/poisonable_steps.yml:1:1:46:111 | After on: push |
+| .github/workflows/poisonable_steps.yml:1:1:46:111 | Entry |
+| .github/workflows/poisonable_steps.yml:1:1:46:111 | Exit |
+| .github/workflows/poisonable_steps.yml:1:1:46:111 | Normal Exit |
 | .github/workflows/poisonable_steps.yml:1:1:46:111 | on: push |
+| .github/workflows/poisonable_steps.yml:5:5:46:111 | After Job: local_commands |
 | .github/workflows/poisonable_steps.yml:5:5:46:111 | Job: local_commands |
+| .github/workflows/poisonable_steps.yml:7:9:8:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:7:9:8:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:7:14:7:30 | venv/bin/activate |
+| .github/workflows/poisonable_steps.yml:8:9:13:6 | After Uses Step |
 | .github/workflows/poisonable_steps.yml:8:9:13:6 | Uses Step |
 | .github/workflows/poisonable_steps.yml:11:53:11:75 | github.workspace |
+| .github/workflows/poisonable_steps.yml:13:9:14:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:13:9:14:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:13:14:13:32 | . venv/bin/activate |
+| .github/workflows/poisonable_steps.yml:14:9:15:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:14:9:15:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:14:14:14:42 | echo foo; . venv/bin/activate |
+| .github/workflows/poisonable_steps.yml:15:9:16:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:15:9:16:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:15:14:15:41 | echo foo;. venv/bin/activate |
+| .github/workflows/poisonable_steps.yml:16:9:17:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:16:9:17:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:16:14:16:42 | echo foo \|. venv/bin/activate |
+| .github/workflows/poisonable_steps.yml:17:9:18:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:17:9:18:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:17:14:17:32 | ./venv/bin/activate |
+| .github/workflows/poisonable_steps.yml:18:9:19:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:18:9:19:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:18:14:18:36 | sh venv/bin/activate.sh |
+| .github/workflows/poisonable_steps.yml:19:9:20:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:19:9:20:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:19:14:19:44 | echo $(sh venv/bin/activate.sh) |
+| .github/workflows/poisonable_steps.yml:20:9:21:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:20:9:21:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:20:14:20:56 | echo foo; sh venv/bin/activate.sh; echo bar |
+| .github/workflows/poisonable_steps.yml:21:9:22:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:21:9:22:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:21:14:21:56 | echo foo \| sh venv/bin/activate.sh > output |
+| .github/workflows/poisonable_steps.yml:22:9:23:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:22:9:23:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:22:14:22:40 | python venv/bin/activate.py |
+| .github/workflows/poisonable_steps.yml:23:9:24:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:23:9:24:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:23:14:23:50 | echo foo; python venv/bin/activate.py |
+| .github/workflows/poisonable_steps.yml:24:9:25:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:24:9:25:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:24:14:24:29 | pnpm run test:ct |
+| .github/workflows/poisonable_steps.yml:25:9:26:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:25:9:26:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:25:14:25:73 | pip install nbformat && python scripts/generate_notebooks.py |
+| .github/workflows/poisonable_steps.yml:26:9:27:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:26:9:27:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:26:14:26:78 | python scripts/generate_theme.py --outfile js/storybook/theme.css |
+| .github/workflows/poisonable_steps.yml:27:9:28:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:27:9:28:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:27:14:27:76 | ruby scripts/generate_theme.rb --outfile js/storybook/theme.css |
+| .github/workflows/poisonable_steps.yml:28:9:29:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:28:9:29:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:28:14:28:92 | bundle run exec ruby scripts/generate_theme.rb --outfile js/storybook/theme.css |
+| .github/workflows/poisonable_steps.yml:29:9:30:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:29:9:30:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:29:14:29:42 | xvfb-run ./mvnw clean package |
+| .github/workflows/poisonable_steps.yml:30:9:31:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:30:9:31:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:30:14:30:46 | echo "foo" && npm i && echo "bar" |
+| .github/workflows/poisonable_steps.yml:31:9:32:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:31:9:32:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:31:14:31:44 | echo "foo" \| npm i \| echo "bar" |
+| .github/workflows/poisonable_steps.yml:32:9:33:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:32:9:33:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:32:14:32:44 | echo "foo" \| npm i \| echo "bar" |
+| .github/workflows/poisonable_steps.yml:33:9:34:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:33:9:34:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:33:14:33:35 | echo "foo `npm i` bar" |
+| .github/workflows/poisonable_steps.yml:34:9:35:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:34:9:35:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:34:14:34:52 | dotnet test foo/Tests.csproj -c Release |
+| .github/workflows/poisonable_steps.yml:35:9:36:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:35:9:36:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:35:14:35:26 | go run foo.go |
+| .github/workflows/poisonable_steps.yml:36:9:37:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:36:9:37:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:36:14:36:86 | sed -i "s\|git_branch = .*\|git_branch = \\"$GITHUB_HEAD_REF\\"\|" config.json |
+| .github/workflows/poisonable_steps.yml:37:9:38:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:37:9:38:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:37:14:37:51 | sed -f ./config.sed file.txt > foo.txt |
+| .github/workflows/poisonable_steps.yml:38:9:39:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:38:9:39:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:38:14:38:45 | sed -f config file.txt > foo.txt |
+| .github/workflows/poisonable_steps.yml:39:9:40:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:39:9:40:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:39:14:39:55 | echo "foo" \| awk -f ./config.awk > foo.txt |
+| .github/workflows/poisonable_steps.yml:40:9:41:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:40:9:41:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:40:14:40:73 | gcloud builds submit --quiet --substitutions="COMMIT_SHA=foo |
+| .github/workflows/poisonable_steps.yml:41:9:42:6 | After Run Step |
 | .github/workflows/poisonable_steps.yml:41:9:42:6 | Run Step |
 | .github/workflows/poisonable_steps.yml:41:14:41:22 | ./foo/cmd |
+| .github/workflows/poisonable_steps.yml:42:9:46:111 | After Run Step |
 | .github/workflows/poisonable_steps.yml:42:9:46:111 | Run Step |
 | .github/workflows/poisonable_steps.yml:42:14:46:111 | sed -e 's#<branch_to_sync>#TITLE#' \\\n    -e 's#<sot_repo>#${{ env.sot_repo }}#' \\\n    -e 's#<destination_repo>#${TITLE}#' \\\n    .github/workflows/common-copybara.bara.sky.template > .github/workflows/common-copybara.bara.sky\n |
 | .github/workflows/poisonable_steps.yml:44:32:44:50 | env.sot_repo |
-| .github/workflows/shell.yml:1:1:22:32 | enter on: push |
-| .github/workflows/shell.yml:1:1:22:32 | exit on: push |
-| .github/workflows/shell.yml:1:1:22:32 | exit on: push (normal) |
+| .github/workflows/shell.yml:1:1:22:32 | After on: push |
+| .github/workflows/shell.yml:1:1:22:32 | Entry |
+| .github/workflows/shell.yml:1:1:22:32 | Exit |
+| .github/workflows/shell.yml:1:1:22:32 | Normal Exit |
 | .github/workflows/shell.yml:1:1:22:32 | on: push |
+| .github/workflows/shell.yml:5:5:9:2 | After Job: job1 |
 | .github/workflows/shell.yml:5:5:9:2 | Job: job1 |
+| .github/workflows/shell.yml:7:9:9:2 | After Run Step |
 | .github/workflows/shell.yml:7:9:9:2 | Run Step |
 | .github/workflows/shell.yml:8:14:8:31 | Write-Output "foo" |
+| .github/workflows/shell.yml:10:5:14:2 | After Job: job2 |
 | .github/workflows/shell.yml:10:5:14:2 | Job: job2 |
+| .github/workflows/shell.yml:12:9:14:2 | After Run Step |
 | .github/workflows/shell.yml:12:9:14:2 | Run Step |
 | .github/workflows/shell.yml:12:14:12:23 | echo "foo" |
+| .github/workflows/shell.yml:15:5:19:2 | After Job: job3 |
 | .github/workflows/shell.yml:15:5:19:2 | Job: job3 |
+| .github/workflows/shell.yml:17:9:19:2 | After Run Step |
 | .github/workflows/shell.yml:17:9:19:2 | Run Step |
 | .github/workflows/shell.yml:18:14:18:23 | echo "foo" |
+| .github/workflows/shell.yml:20:5:22:32 | After Job: job4 |
 | .github/workflows/shell.yml:20:5:22:32 | Job: job4 |
+| .github/workflows/shell.yml:22:9:22:32 | After Run Step |
 | .github/workflows/shell.yml:22:9:22:32 | Run Step |
 | .github/workflows/shell.yml:22:14:22:31 | Write-Output "foo" |
-| .github/workflows/test.yml:1:1:40:53 | enter on: push |
-| .github/workflows/test.yml:1:1:40:53 | exit on: push |
-| .github/workflows/test.yml:1:1:40:53 | exit on: push (normal) |
+| .github/workflows/test.yml:1:1:40:53 | After on: push |
+| .github/workflows/test.yml:1:1:40:53 | Entry |
+| .github/workflows/test.yml:1:1:40:53 | Exit |
+| .github/workflows/test.yml:1:1:40:53 | Normal Exit |
 | .github/workflows/test.yml:1:1:40:53 | on: push |
+| .github/workflows/test.yml:5:5:31:2 | After Job: job1 |
 | .github/workflows/test.yml:5:5:31:2 | Job: job1 |
+| .github/workflows/test.yml:8:7:10:4 | After Job outputs node |
 | .github/workflows/test.yml:8:7:10:4 | Job outputs node |
 | .github/workflows/test.yml:8:20:8:50 | steps.step.outputs.value |
 | .github/workflows/test.yml:11:9:15:6 | Uses Step |
 | .github/workflows/test.yml:15:9:19:6 | Uses Step: source |
+| .github/workflows/test.yml:19:9:26:6 | After Uses Step: step |
 | .github/workflows/test.yml:19:9:26:6 | Uses Step: step |
 | .github/workflows/test.yml:23:20:23:64 | steps.source.outputs.all_changed_files |
+| .github/workflows/test.yml:26:9:28:6 | After Run Step: simplesink1 |
 | .github/workflows/test.yml:26:9:28:6 | Run Step: simplesink1 |
 | .github/workflows/test.yml:27:14:27:63 | echo ${{ steps.source.outputs.all_changed_files }} |
 | .github/workflows/test.yml:27:20:27:64 | steps.source.outputs.all_changed_files |
+| .github/workflows/test.yml:28:9:31:2 | After Run Step: simplesink2 |
 | .github/workflows/test.yml:28:9:31:2 | Run Step: simplesink2 |
 | .github/workflows/test.yml:29:14:29:54 | ${{ github.event.pull_request.head.ref }} |
 | .github/workflows/test.yml:29:15:29:55 | github.event.pull_request.head.ref |
+| .github/workflows/test.yml:32:5:40:53 | After Job: job2 |
 | .github/workflows/test.yml:32:5:40:53 | Job: job2 |
+| .github/workflows/test.yml:39:9:40:53 | After Run Step: sink |
 | .github/workflows/test.yml:39:9:40:53 | Run Step: sink |
 | .github/workflows/test.yml:40:14:40:52 | echo ${{needs.job1.outputs.job_output}} |
 | .github/workflows/test.yml:40:20:40:53 | needs.job1.outputs.job_output |
+cfgCycles
 dfNodes
 | .github/workflows/commands.yml:9:5:31:2 | Job: local_commands |
 | .github/workflows/commands.yml:15:9:18:6 | Run Step |
@@ -1140,6 +1314,12 @@ dfNodes
 | .github/workflows/commands.yml:35:14:36:30 | command1 ; command2\n |
 | .github/workflows/commands.yml:37:9:39:30 | Run Step |
 | .github/workflows/commands.yml:38:14:39:30 | command3 \| command4\n |
+| .github/workflows/controlcheck.yml:6:5:11:2 | Job: test1 |
+| .github/workflows/controlcheck.yml:9:9:11:2 | Run Step |
+| .github/workflows/controlcheck.yml:10:14:10:25 | echo "test1" |
+| .github/workflows/controlcheck.yml:12:5:16:25 | Job: test2 |
+| .github/workflows/controlcheck.yml:15:9:16:25 | Run Step |
+| .github/workflows/controlcheck.yml:16:14:16:25 | echo "test2" |
 | .github/workflows/expression_nodes.yml:5:5:21:47 | Job: echo-chamber |
 | .github/workflows/expression_nodes.yml:7:9:8:6 | Run Step |
 | .github/workflows/expression_nodes.yml:7:14:7:58 | LINE 1echo '${{ github.event.comment.body }}' |
@@ -1353,6 +1533,12 @@ nodeLocations
 | .github/workflows/commands.yml:35:14:36:30 | command1 ; command2\n | .github/workflows/commands.yml:35:14:36:30 | .github/workflows/commands.yml@35:14:36:30 |
 | .github/workflows/commands.yml:37:9:39:30 | Run Step | .github/workflows/commands.yml:37:9:39:30 | .github/workflows/commands.yml@37:9:39:30 |
 | .github/workflows/commands.yml:38:14:39:30 | command3 \| command4\n | .github/workflows/commands.yml:38:14:39:30 | .github/workflows/commands.yml@38:14:39:30 |
+| .github/workflows/controlcheck.yml:6:5:11:2 | Job: test1 | .github/workflows/controlcheck.yml:6:5:11:2 | .github/workflows/controlcheck.yml@6:5:11:2 |
+| .github/workflows/controlcheck.yml:9:9:11:2 | Run Step | .github/workflows/controlcheck.yml:9:9:11:2 | .github/workflows/controlcheck.yml@9:9:11:2 |
+| .github/workflows/controlcheck.yml:10:14:10:25 | echo "test1" | .github/workflows/controlcheck.yml:10:14:10:25 | .github/workflows/controlcheck.yml@10:14:10:25 |
+| .github/workflows/controlcheck.yml:12:5:16:25 | Job: test2 | .github/workflows/controlcheck.yml:12:5:16:25 | .github/workflows/controlcheck.yml@12:5:16:25 |
+| .github/workflows/controlcheck.yml:15:9:16:25 | Run Step | .github/workflows/controlcheck.yml:15:9:16:25 | .github/workflows/controlcheck.yml@15:9:16:25 |
+| .github/workflows/controlcheck.yml:16:14:16:25 | echo "test2" | .github/workflows/controlcheck.yml:16:14:16:25 | .github/workflows/controlcheck.yml@16:14:16:25 |
 | .github/workflows/expression_nodes.yml:5:5:21:47 | Job: echo-chamber | .github/workflows/expression_nodes.yml:5:5:21:47 | .github/workflows/expression_nodes.yml@5:5:21:47 |
 | .github/workflows/expression_nodes.yml:7:9:8:6 | Run Step | .github/workflows/expression_nodes.yml:7:9:8:6 | .github/workflows/expression_nodes.yml@7:9:8:6 |
 | .github/workflows/expression_nodes.yml:7:14:7:58 | LINE 1echo '${{ github.event.comment.body }}' | .github/workflows/expression_nodes.yml:7:14:7:58 | .github/workflows/expression_nodes.yml@7:14:7:58 |
@@ -1541,6 +1727,7 @@ nodeLocations
 | .github/workflows/test.yml:40:20:40:53 | needs.job1.outputs.job_output | .github/workflows/test.yml:40:20:40:53 | .github/workflows/test.yml@40:20:40:53 |
 scopes
 | .github/workflows/commands.yml:1:1:39:30 | on: push |
+| .github/workflows/controlcheck.yml:1:1:16:25 | on: |
 | .github/workflows/expression_nodes.yml:1:1:21:47 | on: issue_comment |
 | .github/workflows/many_strings.yml:1:1:18:1211 | on: |
 | .github/workflows/multiline2.yml:1:1:89:35 | on:  |
@@ -1548,6 +1735,47 @@ scopes
 | .github/workflows/poisonable_steps.yml:1:1:46:111 | on: push |
 | .github/workflows/shell.yml:1:1:22:32 | on: push |
 | .github/workflows/test.yml:1:1:40:53 | on: push |
+workflowScopes
+| .github/workflows/commands.yml:1:1:39:30 | on: push |
+| .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/expression_nodes.yml:1:1:21:47 | on: issue_comment |
+| .github/workflows/many_strings.yml:1:1:18:1211 | on: |
+| .github/workflows/multiline2.yml:1:1:89:35 | on:  |
+| .github/workflows/multiline.yml:1:1:89:29 | on:  |
+| .github/workflows/poisonable_steps.yml:1:1:46:111 | on: push |
+| .github/workflows/shell.yml:1:1:22:32 | on: push |
+| .github/workflows/test.yml:1:1:40:53 | on: push |
+compositeActionScopes
+workflowCfgNodes
+| .github/workflows/commands.yml:1:1:39:30 | on: push |
+| .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/expression_nodes.yml:1:1:21:47 | on: issue_comment |
+| .github/workflows/many_strings.yml:1:1:18:1211 | on: |
+| .github/workflows/multiline2.yml:1:1:89:35 | on:  |
+| .github/workflows/multiline.yml:1:1:89:29 | on:  |
+| .github/workflows/poisonable_steps.yml:1:1:46:111 | on: push |
+| .github/workflows/shell.yml:1:1:22:32 | on: push |
+| .github/workflows/test.yml:1:1:40:53 | on: push |
+entryScopes
+| .github/workflows/commands.yml:1:1:39:30 | Entry | .github/workflows/commands.yml:1:1:39:30 | on: push |
+| .github/workflows/controlcheck.yml:1:1:16:25 | Entry | .github/workflows/controlcheck.yml:1:1:16:25 | on: |
+| .github/workflows/expression_nodes.yml:1:1:21:47 | Entry | .github/workflows/expression_nodes.yml:1:1:21:47 | on: issue_comment |
+| .github/workflows/many_strings.yml:1:1:18:1211 | Entry | .github/workflows/many_strings.yml:1:1:18:1211 | on: |
+| .github/workflows/multiline2.yml:1:1:89:35 | Entry | .github/workflows/multiline2.yml:1:1:89:35 | on:  |
+| .github/workflows/multiline.yml:1:1:89:29 | Entry | .github/workflows/multiline.yml:1:1:89:29 | on:  |
+| .github/workflows/poisonable_steps.yml:1:1:46:111 | Entry | .github/workflows/poisonable_steps.yml:1:1:46:111 | on: push |
+| .github/workflows/shell.yml:1:1:22:32 | Entry | .github/workflows/shell.yml:1:1:22:32 | on: push |
+| .github/workflows/test.yml:1:1:40:53 | Entry | .github/workflows/test.yml:1:1:40:53 | on: push |
+normalExitNodes
+| .github/workflows/commands.yml:1:1:39:30 | Normal Exit |
+| .github/workflows/controlcheck.yml:1:1:16:25 | Normal Exit |
+| .github/workflows/expression_nodes.yml:1:1:21:47 | Normal Exit |
+| .github/workflows/many_strings.yml:1:1:18:1211 | Normal Exit |
+| .github/workflows/multiline2.yml:1:1:89:35 | Normal Exit |
+| .github/workflows/multiline.yml:1:1:89:29 | Normal Exit |
+| .github/workflows/poisonable_steps.yml:1:1:46:111 | Normal Exit |
+| .github/workflows/shell.yml:1:1:22:32 | Normal Exit |
+| .github/workflows/test.yml:1:1:40:53 | Normal Exit |
 sources
 | AvraamMavridis/files-changed-action | * | output.CHANGED_FILES | filename | manual |
 | AvraamMavridis/files-changed-action | * | output.CHANGED_FILES_EXTENSIONS | filename | manual |
diff --git a/actions/ql/test/library-tests/basic/test.ql b/actions/ql/test/library-tests/basic/test.ql
index e4c1d9e443d0..fe44a0f4dcf5 100644
--- a/actions/ql/test/library-tests/basic/test.ql
+++ b/actions/ql/test/library-tests/basic/test.ql
@@ -37,6 +37,8 @@ query predicate parentNodes(AstNode child, AstNode parent) { child.getParentNode
 
 query predicate cfgNodes(Cfg::Node n) { any() }
 
+query predicate cfgCycles(Cfg::Node n) { n.getASuccessor+() = n }
+
 query predicate dfNodes(DataFlow::Node e) { any() }
 
 query predicate argumentNodes(DataFlow::ArgumentNode e) { any() }
@@ -47,6 +49,21 @@ query predicate nodeLocations(DataFlow::Node n, Location l) { n.getLocation() =
 
 query predicate scopes(Cfg::CfgScope c) { any() }
 
+query predicate workflowScopes(Cfg::WorkflowScope c) { any() }
+
+query predicate compositeActionScopes(Cfg::CompositeActionScope c) { any() }
+
+query predicate workflowCfgNodes(Cfg::AstCfgNode node) {
+  node.getAstNode() instanceof Workflow and
+  node.getEnclosingCallable() = node.getAstNode()
+}
+
+query predicate entryScopes(Cfg::EntryNode entry, Cfg::CfgScope scope) {
+  scope = entry.getEnclosingCallable()
+}
+
+query predicate normalExitNodes(Cfg::AnnotatedExitNode exit) { exit instanceof Cfg::NormalExitNode }
+
 query predicate sources(string action, string version, string output, string kind, string provenance) {
   actionsSourceModel(action, version, output, kind, provenance)
 }
diff --git a/actions/ql/test/library-tests/cfg-callable/action.yml b/actions/ql/test/library-tests/cfg-callable/action.yml
new file mode 100644
index 000000000000..81aa1df95a00
--- /dev/null
+++ b/actions/ql/test/library-tests/cfg-callable/action.yml
@@ -0,0 +1,12 @@
+name: Ambiguous root
+
+runs:
+  using: composite
+  steps:
+    - run: echo "${{ github.actor }}"
+
+jobs:
+  unexpected:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "This must not make action.yml a workflow"
diff --git a/actions/ql/test/library-tests/cfg-callable/test.expected b/actions/ql/test/library-tests/cfg-callable/test.expected
new file mode 100644
index 000000000000..17687b33ef7d
--- /dev/null
+++ b/actions/ql/test/library-tests/cfg-callable/test.expected
@@ -0,0 +1,4 @@
+roots
+| 1 | 1 |
+cfgScopes
+| action.yml:1:1:12:61 | name: Ambiguous root | composite action |
diff --git a/actions/ql/test/library-tests/cfg-callable/test.ql b/actions/ql/test/library-tests/cfg-callable/test.ql
new file mode 100644
index 000000000000..5b66c1c4d314
--- /dev/null
+++ b/actions/ql/test/library-tests/cfg-callable/test.ql
@@ -0,0 +1,18 @@
+import codeql.actions.Ast
+import codeql.actions.Cfg as Cfg
+
+query predicate roots(int workflows, int compositeActions) {
+  workflows =
+    strictcount(Workflow workflow | workflow.getLocation().getFile().getBaseName() = "action.yml") and
+  compositeActions =
+    strictcount(CompositeAction action | action.getLocation().getFile().getBaseName() = "action.yml")
+}
+
+query predicate cfgScopes(Cfg::CfgScope scope, string kind) {
+  scope.getLocation().getFile().getBaseName() = "action.yml" and
+  (
+    scope instanceof Cfg::WorkflowScope and kind = "workflow"
+    or
+    scope instanceof Cfg::CompositeActionScope and kind = "composite action"
+  )
+}
diff --git a/actions/ql/test/library-tests/cfg-environment/.github/workflows/test.yml b/actions/ql/test/library-tests/cfg-environment/.github/workflows/test.yml
new file mode 100644
index 000000000000..1bd23112154a
--- /dev/null
+++ b/actions/ql/test/library-tests/cfg-environment/.github/workflows/test.yml
@@ -0,0 +1,21 @@
+on: issues
+
+env:
+  GLOBAL_VALUE: ${{ github.event.issue.title }}
+
+jobs:
+  local:
+    runs-on: ubuntu-latest
+    env:
+      JOB_VALUE: ${{ github.event.issue.body }}
+    steps:
+      - uses: actions/checkout@v4
+      - run: echo "$GLOBAL_VALUE $JOB_VALUE"
+      - run: echo "$GLOBAL_VALUE $JOB_VALUE $STEP_VALUE"
+        env:
+          STEP_VALUE: ${{ github.actor }}
+
+  external:
+    uses: octo/example/.github/workflows/reusable.yml@main
+    with:
+      value: ${{ github.event.issue.number }}
diff --git a/actions/ql/test/library-tests/cfg-environment/test.expected b/actions/ql/test/library-tests/cfg-environment/test.expected
new file mode 100644
index 000000000000..21d55030e278
--- /dev/null
+++ b/actions/ql/test/library-tests/cfg-environment/test.expected
@@ -0,0 +1,5 @@
+envCfgNodes
+| .github/workflows/test.yml:4:18:4:48 | github.event.issue.title |
+| .github/workflows/test.yml:10:19:10:48 | github.event.issue.body |
+| .github/workflows/test.yml:16:24:16:42 | github.actor |
+cfgCycles
diff --git a/actions/ql/test/library-tests/cfg-environment/test.ql b/actions/ql/test/library-tests/cfg-environment/test.ql
new file mode 100644
index 000000000000..b4a94fa80bc6
--- /dev/null
+++ b/actions/ql/test/library-tests/cfg-environment/test.ql
@@ -0,0 +1,9 @@
+import codeql.actions.Ast
+import codeql.actions.Cfg as Cfg
+
+query predicate envCfgNodes(Expression expression) {
+  expression = any(Env env).getAnEnvVarExpr() and
+  exists(Cfg::AstCfgNode node | node.getAstNode() = expression)
+}
+
+query predicate cfgCycles(Cfg::Node node) { node.getASuccessor+() = node }
diff --git a/actions/ql/test/library-tests/reusable-workflow-callers/.github/workflows/caller.yml b/actions/ql/test/library-tests/reusable-workflow-callers/.github/workflows/caller.yml
new file mode 100644
index 000000000000..12f3016f5d07
--- /dev/null
+++ b/actions/ql/test/library-tests/reusable-workflow-callers/.github/workflows/caller.yml
@@ -0,0 +1,5 @@
+on: workflow_dispatch
+
+jobs:
+  call-reusable:
+    uses: ./.github/workflows/reusable.yml
\ No newline at end of file
diff --git a/actions/ql/test/library-tests/reusable-workflow-callers/.github/workflows/reusable.yml b/actions/ql/test/library-tests/reusable-workflow-callers/.github/workflows/reusable.yml
new file mode 100644
index 000000000000..f27aeb584fbd
--- /dev/null
+++ b/actions/ql/test/library-tests/reusable-workflow-callers/.github/workflows/reusable.yml
@@ -0,0 +1,7 @@
+on: workflow_call
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo build
\ No newline at end of file
diff --git a/actions/ql/test/library-tests/reusable-workflow-callers/test.expected b/actions/ql/test/library-tests/reusable-workflow-callers/test.expected
new file mode 100644
index 000000000000..4d2bad7a2bf1
--- /dev/null
+++ b/actions/ql/test/library-tests/reusable-workflow-callers/test.expected
@@ -0,0 +1 @@
+| .github/workflows/reusable.yml:1:1:7:23 | on: workflow_call | .github/workflows/caller.yml:5:5:5:42 | Job: call-reusable | .github/workflows/reusable.yml:5:5:7:23 | Job: build | workflow_dispatch |
diff --git a/actions/ql/test/library-tests/reusable-workflow-callers/test.ql b/actions/ql/test/library-tests/reusable-workflow-callers/test.ql
new file mode 100644
index 000000000000..544db1647332
--- /dev/null
+++ b/actions/ql/test/library-tests/reusable-workflow-callers/test.ql
@@ -0,0 +1,9 @@
+import actions
+
+from ReusableWorkflow workflow, ExternalJob caller, LocalJob job, Event event
+where
+  workflow.getACaller() = caller and
+  job.getEnclosingWorkflow() = workflow and
+  caller.getATriggerEvent() = event and
+  job.getATriggerEvent() = event
+select workflow, caller, job, event.getName()
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/CONSISTENCY/PathResolutionConsistency.expected b/actions/ql/test/query-tests/Security/CWE-078/CONSISTENCY/CfgConsistency.expected
similarity index 100%
rename from rust/ql/test/library-tests/dataflow/sources/net/CONSISTENCY/PathResolutionConsistency.expected
rename to actions/ql/test/query-tests/Security/CWE-078/CONSISTENCY/CfgConsistency.expected
diff --git a/actions/ql/test/query-tests/Security/CWE-088/CONSISTENCY/CfgConsistency.expected b/actions/ql/test/query-tests/Security/CWE-088/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/actor_check_valid_event.yml b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/actor_check_valid_event.yml
new file mode 100644
index 000000000000..cd139700f078
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/actor_check_valid_event.yml
@@ -0,0 +1,12 @@
+on:
+  pull_request_target:
+    types: [opened]
+
+jobs:
+  # The `if:` condition checks an actor field that is populated for
+  # `pull_request_target` events, so the injectable step is protected.
+  valid-actor-check:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'trusted-user'
+    steps:
+      - run: echo '${{ github.event.pull_request.title }}'
diff --git a/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/actor_check_wrong_event.yml b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/actor_check_wrong_event.yml
new file mode 100644
index 000000000000..982956b3d953
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/actor_check_wrong_event.yml
@@ -0,0 +1,46 @@
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  # The `if:` condition compares an actor field that is never populated for
+  # `issues` events, so it is always true and does not protect the injectable step.
+  vacuous-actor-check:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login != 'some-bot[bot]'
+    steps:
+      - run: echo '${{ github.event.issue.title }}'
+
+  # The `if:` condition checks an actor context that is populated for every
+  # event, so the injectable step is protected.
+  valid-actor-check:
+    runs-on: ubuntu-latest
+    if: github.actor == 'trusted-user'
+    steps:
+      - run: echo '${{ github.event.issue.title }}'
+
+  # The `sender` object is part of every webhook event payload, so this
+  # check is effective and the injectable step is protected.
+  valid-sender-check:
+    runs-on: ubuntu-latest
+    if: github.event.sender.login == 'trusted-user'
+    steps:
+      - run: echo '${{ github.event.issue.title }}'
+
+  # `github.event.head_commit` is only populated for `push` events, so this
+  # condition is always true for `issues` events and does not protect the
+  # injectable step.
+  vacuous-head-commit-check:
+    runs-on: ubuntu-latest
+    if: github.event.head_commit.author.name != 'some-bot'
+    steps:
+      - run: echo '${{ github.event.issue.title }}'
+
+  # `github.event.commits` is only populated for `push` events, so this
+  # condition is always true for `issues` events and does not protect the
+  # injectable step.
+  vacuous-commits-check:
+    runs-on: ubuntu-latest
+    if: github.event.commits[0].author.name != 'some-bot'
+    steps:
+      - run: echo '${{ github.event.issue.title }}'
diff --git a/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/association_check_wrong_event.yml b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/association_check_wrong_event.yml
new file mode 100644
index 000000000000..b1cef25955dd
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/association_check_wrong_event.yml
@@ -0,0 +1,21 @@
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  # The `if:` condition compares an association field that is never populated
+  # for `issues` events, so it is always true and does not protect the
+  # injectable step.
+  vacuous-association-check:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.author_association != 'NONE'
+    steps:
+      - run: echo '${{ github.event.issue.title }}'
+
+  # `github.event.issue` is populated for `issues` events, so this check is
+  # effective and the injectable step is protected.
+  valid-association-check:
+    runs-on: ubuntu-latest
+    if: github.event.issue.author_association == 'MEMBER'
+    steps:
+      - run: echo '${{ github.event.issue.title }}'
diff --git a/actions/ql/test/query-tests/Security/CWE-094/CONSISTENCY/CfgConsistency.expected b/actions/ql/test/query-tests/Security/CWE-094/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionCritical.expected b/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionCritical.expected
index 02f7f68c05f4..e32155dffe93 100644
--- a/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionCritical.expected
+++ b/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionCritical.expected
@@ -270,6 +270,12 @@ nodes
 | .github/actions/external/ultralytics/actions/action.yaml:66:3:66:6 | input body | semmle.label | input body |
 | .github/actions/external/ultralytics/actions/action.yaml:96:16:96:33 | inputs.body | semmle.label | inputs.body |
 | .github/actions/external/ultralytics/actions/action.yaml:223:25:223:60 | github.head_ref \|\| github.ref | semmle.label | github.head_ref \|\| github.ref |
+| .github/workflows/actor_check_valid_event.yml:12:21:12:58 | github.event.pull_request.title | semmle.label | github.event.pull_request.title |
+| .github/workflows/actor_check_wrong_event.yml:12:21:12:51 | github.event.issue.title | semmle.label | github.event.issue.title |
+| .github/workflows/actor_check_wrong_event.yml:20:21:20:51 | github.event.issue.title | semmle.label | github.event.issue.title |
+| .github/workflows/actor_check_wrong_event.yml:28:21:28:51 | github.event.issue.title | semmle.label | github.event.issue.title |
+| .github/workflows/actor_check_wrong_event.yml:37:21:37:51 | github.event.issue.title | semmle.label | github.event.issue.title |
+| .github/workflows/actor_check_wrong_event.yml:46:21:46:51 | github.event.issue.title | semmle.label | github.event.issue.title |
 | .github/workflows/argus_case_study.yml:15:9:24:6 | Uses Step: remove_quotations [replaced] | semmle.label | Uses Step: remove_quotations [replaced] |
 | .github/workflows/argus_case_study.yml:17:25:17:53 | github.event.issue.title | semmle.label | github.event.issue.title |
 | .github/workflows/argus_case_study.yml:22:20:22:39 | env.ISSUE_TITLE | semmle.label | env.ISSUE_TITLE |
@@ -306,6 +312,8 @@ nodes
 | .github/workflows/artifactpoisoning8.yml:17:9:21:6 | Run Step: artifact [id] | semmle.label | Run Step: artifact [id] |
 | .github/workflows/artifactpoisoning8.yml:19:14:19:58 | echo "::set-output name=id::$(<artifact.txt)" | semmle.label | echo "::set-output name=id::$(<artifact.txt)" |
 | .github/workflows/artifactpoisoning8.yml:22:20:22:51 | steps.artifact.outputs.id | semmle.label | steps.artifact.outputs.id |
+| .github/workflows/association_check_wrong_event.yml:13:21:13:51 | github.event.issue.title | semmle.label | github.event.issue.title |
+| .github/workflows/association_check_wrong_event.yml:21:21:21:51 | github.event.issue.title | semmle.label | github.event.issue.title |
 | .github/workflows/changed-files.yml:15:9:18:6 | Uses Step: changed-files1 | semmle.label | Uses Step: changed-files1 |
 | .github/workflows/changed-files.yml:20:24:20:76 | steps.changed-files1.outputs.all_changed_files | semmle.label | steps.changed-files1.outputs.all_changed_files |
 | .github/workflows/changed-files.yml:33:9:38:6 | Uses Step: changed-files3 | semmle.label | Uses Step: changed-files3 |
@@ -710,6 +718,9 @@ subpaths
 | .github/actions/external/TestOrg/TestRepo/.github/actions/clone-repo/action.yaml:22:19:22:37 | inputs.title | .github/workflows/composite-action-caller-4.yml:14:19:14:56 | github.event.pull_request.title | .github/actions/external/TestOrg/TestRepo/.github/actions/clone-repo/action.yaml:22:19:22:37 | inputs.title | Potential code injection in $@, which may be controlled by an external user ($@). | .github/actions/external/TestOrg/TestRepo/.github/actions/clone-repo/action.yaml:22:19:22:37 | inputs.title | ${{ inputs.title }} | .github/workflows/composite-action-caller-4.yml:4:3:4:21 | pull_request_target | pull_request_target |
 | .github/actions/external/ultralytics/actions/action.yaml:96:16:96:33 | inputs.body | .github/workflows/test29.yml:35:18:35:54 | github.event.pull_request.body | .github/actions/external/ultralytics/actions/action.yaml:96:16:96:33 | inputs.body | Potential code injection in $@, which may be controlled by an external user ($@). | .github/actions/external/ultralytics/actions/action.yaml:96:16:96:33 | inputs.body | ${{ inputs.body }} | .github/workflows/test29.yml:12:3:12:21 | pull_request_target | pull_request_target |
 | .github/actions/external/ultralytics/actions/action.yaml:223:25:223:60 | github.head_ref \|\| github.ref | .github/actions/external/ultralytics/actions/action.yaml:223:25:223:60 | github.head_ref \|\| github.ref | .github/actions/external/ultralytics/actions/action.yaml:223:25:223:60 | github.head_ref \|\| github.ref | Potential code injection in $@, which may be controlled by an external user ($@). | .github/actions/external/ultralytics/actions/action.yaml:223:25:223:60 | github.head_ref \|\| github.ref | ${{ github.head_ref \|\| github.ref }} | .github/workflows/test29.yml:12:3:12:21 | pull_request_target | pull_request_target |
+| .github/workflows/actor_check_wrong_event.yml:12:21:12:51 | github.event.issue.title | .github/workflows/actor_check_wrong_event.yml:12:21:12:51 | github.event.issue.title | .github/workflows/actor_check_wrong_event.yml:12:21:12:51 | github.event.issue.title | Potential code injection in $@, which may be controlled by an external user ($@). | .github/workflows/actor_check_wrong_event.yml:12:21:12:51 | github.event.issue.title | ${{ github.event.issue.title }} | .github/workflows/actor_check_wrong_event.yml:2:3:2:8 | issues | issues |
+| .github/workflows/actor_check_wrong_event.yml:37:21:37:51 | github.event.issue.title | .github/workflows/actor_check_wrong_event.yml:37:21:37:51 | github.event.issue.title | .github/workflows/actor_check_wrong_event.yml:37:21:37:51 | github.event.issue.title | Potential code injection in $@, which may be controlled by an external user ($@). | .github/workflows/actor_check_wrong_event.yml:37:21:37:51 | github.event.issue.title | ${{ github.event.issue.title }} | .github/workflows/actor_check_wrong_event.yml:2:3:2:8 | issues | issues |
+| .github/workflows/actor_check_wrong_event.yml:46:21:46:51 | github.event.issue.title | .github/workflows/actor_check_wrong_event.yml:46:21:46:51 | github.event.issue.title | .github/workflows/actor_check_wrong_event.yml:46:21:46:51 | github.event.issue.title | Potential code injection in $@, which may be controlled by an external user ($@). | .github/workflows/actor_check_wrong_event.yml:46:21:46:51 | github.event.issue.title | ${{ github.event.issue.title }} | .github/workflows/actor_check_wrong_event.yml:2:3:2:8 | issues | issues |
 | .github/workflows/argus_case_study.yml:27:33:27:77 | steps.remove_quotations.outputs.replaced | .github/workflows/argus_case_study.yml:17:25:17:53 | github.event.issue.title | .github/workflows/argus_case_study.yml:27:33:27:77 | steps.remove_quotations.outputs.replaced | Potential code injection in $@, which may be controlled by an external user ($@). | .github/workflows/argus_case_study.yml:27:33:27:77 | steps.remove_quotations.outputs.replaced | ${{steps.remove_quotations.outputs.replaced}} | .github/workflows/argus_case_study.yml:4:3:4:8 | issues | issues |
 | .github/workflows/artifactpoisoning1.yml:27:67:27:92 | steps.pr.outputs.id | .github/workflows/artifactpoisoning1.yml:14:9:20:6 | Uses Step | .github/workflows/artifactpoisoning1.yml:27:67:27:92 | steps.pr.outputs.id | Potential code injection in $@, which may be controlled by an external user ($@). | .github/workflows/artifactpoisoning1.yml:27:67:27:92 | steps.pr.outputs.id | ${{ steps.pr.outputs.id }} | .github/workflows/artifactpoisoning1.yml:4:3:4:14 | workflow_run | workflow_run |
 | .github/workflows/artifactpoisoning2.yml:22:17:22:42 | steps.pr.outputs.id | .github/workflows/artifactpoisoning2.yml:13:9:19:6 | Uses Step: pr | .github/workflows/artifactpoisoning2.yml:22:17:22:42 | steps.pr.outputs.id | Potential code injection in $@, which may be controlled by an external user ($@). | .github/workflows/artifactpoisoning2.yml:22:17:22:42 | steps.pr.outputs.id | ${{ steps.pr.outputs.id }} | .github/workflows/artifactpoisoning2.yml:4:3:4:14 | workflow_run | workflow_run |
@@ -720,6 +731,7 @@ subpaths
 | .github/workflows/artifactpoisoning6.yml:29:20:29:59 | steps.artifact2.outputs.pr_number | .github/workflows/artifactpoisoning6.yml:8:9:15:6 | Uses Step | .github/workflows/artifactpoisoning6.yml:29:20:29:59 | steps.artifact2.outputs.pr_number | Potential code injection in $@, which may be controlled by an external user ($@). | .github/workflows/artifactpoisoning6.yml:29:20:29:59 | steps.artifact2.outputs.pr_number | ${{ steps.artifact2.outputs.pr_number }} | .github/workflows/artifactpoisoning6.yml:3:5:3:16 | workflow_run | workflow_run |
 | .github/workflows/artifactpoisoning7.yml:30:20:30:58 | steps.artifact.outputs.pr_number | .github/workflows/artifactpoisoning7.yml:8:9:15:6 | Uses Step | .github/workflows/artifactpoisoning7.yml:30:20:30:58 | steps.artifact.outputs.pr_number | Potential code injection in $@, which may be controlled by an external user ($@). | .github/workflows/artifactpoisoning7.yml:30:20:30:58 | steps.artifact.outputs.pr_number | ${{ steps.artifact.outputs.pr_number }} | .github/workflows/artifactpoisoning7.yml:3:5:3:16 | workflow_run | workflow_run |
 | .github/workflows/artifactpoisoning8.yml:22:20:22:51 | steps.artifact.outputs.id | .github/workflows/artifactpoisoning8.yml:9:9:17:6 | Uses Step | .github/workflows/artifactpoisoning8.yml:22:20:22:51 | steps.artifact.outputs.id | Potential code injection in $@, which may be controlled by an external user ($@). | .github/workflows/artifactpoisoning8.yml:22:20:22:51 | steps.artifact.outputs.id | ${{ steps.artifact.outputs.id }} | .github/workflows/artifactpoisoning8.yml:4:5:4:16 | workflow_run | workflow_run |
+| .github/workflows/association_check_wrong_event.yml:13:21:13:51 | github.event.issue.title | .github/workflows/association_check_wrong_event.yml:13:21:13:51 | github.event.issue.title | .github/workflows/association_check_wrong_event.yml:13:21:13:51 | github.event.issue.title | Potential code injection in $@, which may be controlled by an external user ($@). | .github/workflows/association_check_wrong_event.yml:13:21:13:51 | github.event.issue.title | ${{ github.event.issue.title }} | .github/workflows/association_check_wrong_event.yml:2:3:2:8 | issues | issues |
 | .github/workflows/comment_issue.yml:9:15:9:46 | github.event.comment.body | .github/workflows/comment_issue.yml:9:15:9:46 | github.event.comment.body | .github/workflows/comment_issue.yml:9:15:9:46 | github.event.comment.body | Potential code injection in $@, which may be controlled by an external user ($@). | .github/workflows/comment_issue.yml:9:15:9:46 | github.event.comment.body | ${{ github.event.comment.body }} | .github/workflows/comment_issue.yml:1:5:1:17 | issue_comment | issue_comment |
 | .github/workflows/comment_issue.yml:15:19:15:50 | github.event.comment.body | .github/workflows/comment_issue.yml:15:19:15:50 | github.event.comment.body | .github/workflows/comment_issue.yml:15:19:15:50 | github.event.comment.body | Potential code injection in $@, which may be controlled by an external user ($@). | .github/workflows/comment_issue.yml:15:19:15:50 | github.event.comment.body | ${{ github.event.comment.body }} | .github/workflows/comment_issue.yml:1:5:1:17 | issue_comment | issue_comment |
 | .github/workflows/comment_issue.yml:16:19:16:48 | github.event.issue.body | .github/workflows/comment_issue.yml:16:19:16:48 | github.event.issue.body | .github/workflows/comment_issue.yml:16:19:16:48 | github.event.issue.body | Potential code injection in $@, which may be controlled by an external user ($@). | .github/workflows/comment_issue.yml:16:19:16:48 | github.event.issue.body | ${{ github.event.issue.body }} | .github/workflows/comment_issue.yml:1:5:1:17 | issue_comment | issue_comment |
diff --git a/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionMedium.expected b/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionMedium.expected
index 231d41bc2518..8ed3ce95387b 100644
--- a/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionMedium.expected
+++ b/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionMedium.expected
@@ -270,6 +270,12 @@ nodes
 | .github/actions/external/ultralytics/actions/action.yaml:66:3:66:6 | input body | semmle.label | input body |
 | .github/actions/external/ultralytics/actions/action.yaml:96:16:96:33 | inputs.body | semmle.label | inputs.body |
 | .github/actions/external/ultralytics/actions/action.yaml:223:25:223:60 | github.head_ref \|\| github.ref | semmle.label | github.head_ref \|\| github.ref |
+| .github/workflows/actor_check_valid_event.yml:12:21:12:58 | github.event.pull_request.title | semmle.label | github.event.pull_request.title |
+| .github/workflows/actor_check_wrong_event.yml:12:21:12:51 | github.event.issue.title | semmle.label | github.event.issue.title |
+| .github/workflows/actor_check_wrong_event.yml:20:21:20:51 | github.event.issue.title | semmle.label | github.event.issue.title |
+| .github/workflows/actor_check_wrong_event.yml:28:21:28:51 | github.event.issue.title | semmle.label | github.event.issue.title |
+| .github/workflows/actor_check_wrong_event.yml:37:21:37:51 | github.event.issue.title | semmle.label | github.event.issue.title |
+| .github/workflows/actor_check_wrong_event.yml:46:21:46:51 | github.event.issue.title | semmle.label | github.event.issue.title |
 | .github/workflows/argus_case_study.yml:15:9:24:6 | Uses Step: remove_quotations [replaced] | semmle.label | Uses Step: remove_quotations [replaced] |
 | .github/workflows/argus_case_study.yml:17:25:17:53 | github.event.issue.title | semmle.label | github.event.issue.title |
 | .github/workflows/argus_case_study.yml:22:20:22:39 | env.ISSUE_TITLE | semmle.label | env.ISSUE_TITLE |
@@ -306,6 +312,8 @@ nodes
 | .github/workflows/artifactpoisoning8.yml:17:9:21:6 | Run Step: artifact [id] | semmle.label | Run Step: artifact [id] |
 | .github/workflows/artifactpoisoning8.yml:19:14:19:58 | echo "::set-output name=id::$(<artifact.txt)" | semmle.label | echo "::set-output name=id::$(<artifact.txt)" |
 | .github/workflows/artifactpoisoning8.yml:22:20:22:51 | steps.artifact.outputs.id | semmle.label | steps.artifact.outputs.id |
+| .github/workflows/association_check_wrong_event.yml:13:21:13:51 | github.event.issue.title | semmle.label | github.event.issue.title |
+| .github/workflows/association_check_wrong_event.yml:21:21:21:51 | github.event.issue.title | semmle.label | github.event.issue.title |
 | .github/workflows/changed-files.yml:15:9:18:6 | Uses Step: changed-files1 | semmle.label | Uses Step: changed-files1 |
 | .github/workflows/changed-files.yml:20:24:20:76 | steps.changed-files1.outputs.all_changed_files | semmle.label | steps.changed-files1.outputs.all_changed_files |
 | .github/workflows/changed-files.yml:33:9:38:6 | Uses Step: changed-files3 | semmle.label | Uses Step: changed-files3 |
@@ -709,6 +717,10 @@ subpaths
 | .github/actions/action7/action.yml:214:41:214:69 | inputs.github_username | .github/actions/action7/action.yml:214:41:214:69 | inputs.github_username | .github/actions/action7/action.yml:214:41:214:69 | inputs.github_username | Potential code injection in $@, which may be controlled by an external user. | .github/actions/action7/action.yml:214:41:214:69 | inputs.github_username | ${{ inputs.github_username }} |
 | .github/actions/action7/action.yml:215:41:215:66 | inputs.github_email | .github/actions/action7/action.yml:215:41:215:66 | inputs.github_email | .github/actions/action7/action.yml:215:41:215:66 | inputs.github_email | Potential code injection in $@, which may be controlled by an external user. | .github/actions/action7/action.yml:215:41:215:66 | inputs.github_email | ${{ inputs.github_email }} |
 | .github/actions/action7/action.yml:217:25:217:60 | github.head_ref \|\| github.ref | .github/actions/action7/action.yml:217:25:217:60 | github.head_ref \|\| github.ref | .github/actions/action7/action.yml:217:25:217:60 | github.head_ref \|\| github.ref | Potential code injection in $@, which may be controlled by an external user. | .github/actions/action7/action.yml:217:25:217:60 | github.head_ref \|\| github.ref | ${{ github.head_ref \|\| github.ref }} |
+| .github/workflows/actor_check_valid_event.yml:12:21:12:58 | github.event.pull_request.title | .github/workflows/actor_check_valid_event.yml:12:21:12:58 | github.event.pull_request.title | .github/workflows/actor_check_valid_event.yml:12:21:12:58 | github.event.pull_request.title | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/actor_check_valid_event.yml:12:21:12:58 | github.event.pull_request.title | ${{ github.event.pull_request.title }} |
+| .github/workflows/actor_check_wrong_event.yml:20:21:20:51 | github.event.issue.title | .github/workflows/actor_check_wrong_event.yml:20:21:20:51 | github.event.issue.title | .github/workflows/actor_check_wrong_event.yml:20:21:20:51 | github.event.issue.title | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/actor_check_wrong_event.yml:20:21:20:51 | github.event.issue.title | ${{ github.event.issue.title }} |
+| .github/workflows/actor_check_wrong_event.yml:28:21:28:51 | github.event.issue.title | .github/workflows/actor_check_wrong_event.yml:28:21:28:51 | github.event.issue.title | .github/workflows/actor_check_wrong_event.yml:28:21:28:51 | github.event.issue.title | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/actor_check_wrong_event.yml:28:21:28:51 | github.event.issue.title | ${{ github.event.issue.title }} |
+| .github/workflows/association_check_wrong_event.yml:21:21:21:51 | github.event.issue.title | .github/workflows/association_check_wrong_event.yml:21:21:21:51 | github.event.issue.title | .github/workflows/association_check_wrong_event.yml:21:21:21:51 | github.event.issue.title | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/association_check_wrong_event.yml:21:21:21:51 | github.event.issue.title | ${{ github.event.issue.title }} |
 | .github/workflows/changed-files.yml:20:24:20:76 | steps.changed-files1.outputs.all_changed_files | .github/workflows/changed-files.yml:15:9:18:6 | Uses Step: changed-files1 | .github/workflows/changed-files.yml:20:24:20:76 | steps.changed-files1.outputs.all_changed_files | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/changed-files.yml:20:24:20:76 | steps.changed-files1.outputs.all_changed_files | ${{ steps.changed-files1.outputs.all_changed_files }} |
 | .github/workflows/changed-files.yml:40:24:40:76 | steps.changed-files3.outputs.all_changed_files | .github/workflows/changed-files.yml:33:9:38:6 | Uses Step: changed-files3 | .github/workflows/changed-files.yml:40:24:40:76 | steps.changed-files3.outputs.all_changed_files | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/changed-files.yml:40:24:40:76 | steps.changed-files3.outputs.all_changed_files | ${{ steps.changed-files3.outputs.all_changed_files }} |
 | .github/workflows/changed-files.yml:58:24:58:76 | steps.changed-files5.outputs.all_changed_files | .github/workflows/changed-files.yml:53:9:56:6 | Uses Step: changed-files5 | .github/workflows/changed-files.yml:58:24:58:76 | steps.changed-files5.outputs.all_changed_files | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/changed-files.yml:58:24:58:76 | steps.changed-files5.outputs.all_changed_files | ${{ steps.changed-files5.outputs.all_changed_files }} |
diff --git a/actions/ql/test/query-tests/Security/CWE-349/.github/workflows/cache_write_capable_push.yml b/actions/ql/test/query-tests/Security/CWE-349/.github/workflows/cache_write_capable_push.yml
new file mode 100644
index 000000000000..b9fbe2d2d0b4
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-349/.github/workflows/cache_write_capable_push.yml
@@ -0,0 +1,10 @@
+on:
+  push:
+    branches: [main]
+
+jobs:
+  injection:
+    permissions: {}
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "${{ github.event.head_commit.message }}"
\ No newline at end of file
diff --git a/actions/ql/test/query-tests/Security/CWE-349/.github/workflows/cache_write_capable_reusable_workflow.yml b/actions/ql/test/query-tests/Security/CWE-349/.github/workflows/cache_write_capable_reusable_workflow.yml
new file mode 100644
index 000000000000..99a474f99508
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-349/.github/workflows/cache_write_capable_reusable_workflow.yml
@@ -0,0 +1,45 @@
+on:
+  workflow_call:
+    inputs:
+      head_sha:
+        required: false
+        type: string
+
+jobs:
+  direct-cache:
+    if: github.event_name == 'workflow_dispatch'
+    permissions: {}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - env:
+          HEAD_SHA: ${{ inputs.head_sha }}
+        run: |
+          [[ "$HEAD_SHA" =~ ^[0-9a-fA-F]{40}$ ]] || exit 1
+          git fetch origin "$HEAD_SHA"
+          git checkout --detach "$HEAD_SHA"
+      - uses: actions/cache@v4
+        with:
+          path: .npm
+          key: reusable-direct-cache
+
+  poisonable-step:
+    if: github.event_name == 'workflow_dispatch'
+    permissions: {}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - env:
+          HEAD_SHA: ${{ inputs.head_sha }}
+        run: |
+          [[ "$HEAD_SHA" =~ ^[0-9a-fA-F]{40}$ ]] || exit 1
+          git fetch origin "$HEAD_SHA"
+          git checkout --detach "$HEAD_SHA"
+      - run: npm install
+
+  code-injection:
+    if: github.event_name == 'push'
+    permissions: {}
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "${{ github.event.head_commit.message }}"
\ No newline at end of file
diff --git a/actions/ql/test/query-tests/Security/CWE-349/.github/workflows/cache_write_capable_reusable_workflow_caller.yml b/actions/ql/test/query-tests/Security/CWE-349/.github/workflows/cache_write_capable_reusable_workflow_caller.yml
new file mode 100644
index 000000000000..9f0f5841f89e
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-349/.github/workflows/cache_write_capable_reusable_workflow_caller.yml
@@ -0,0 +1,16 @@
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+    inputs:
+      head_sha:
+        description: Commit SHA to test
+        required: true
+        type: string
+
+jobs:
+  reusable:
+    permissions: {}
+    uses: ./.github/workflows/cache_write_capable_reusable_workflow.yml
+    with:
+      head_sha: ${{ github.event.inputs.head_sha }}
\ No newline at end of file
diff --git a/actions/ql/test/query-tests/Security/CWE-349/.github/workflows/cache_write_capable_workflow_dispatch_validated.yml b/actions/ql/test/query-tests/Security/CWE-349/.github/workflows/cache_write_capable_workflow_dispatch_validated.yml
new file mode 100644
index 000000000000..0af4ad59ba4f
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-349/.github/workflows/cache_write_capable_workflow_dispatch_validated.yml
@@ -0,0 +1,25 @@
+on:
+  workflow_dispatch:
+    inputs:
+      head_sha:
+        description: Commit SHA to test
+        required: true
+        type: string
+
+jobs:
+  cache:
+    permissions: {}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - env:
+          HEAD_SHA: ${{ github.event.inputs.head_sha }}
+        run: |
+          [[ "$HEAD_SHA" =~ ^[0-9a-fA-F]{40}$ ]] || exit 1
+          git fetch origin "$HEAD_SHA"
+          git checkout --detach "$HEAD_SHA"
+      - run: npm install
+      - uses: actions/cache@v4
+        with:
+          path: .npm
+          key: workflow-dispatch
\ No newline at end of file
diff --git a/actions/ql/test/query-tests/Security/CWE-349/CachePoisoningViaCodeInjection.expected b/actions/ql/test/query-tests/Security/CWE-349/CachePoisoningViaCodeInjection.expected
index 76a95eb204f9..86b2e48c25e0 100644
--- a/actions/ql/test/query-tests/Security/CWE-349/CachePoisoningViaCodeInjection.expected
+++ b/actions/ql/test/query-tests/Security/CWE-349/CachePoisoningViaCodeInjection.expected
@@ -1,10 +1,13 @@
 edges
 | .github/workflows/code_injection2.yml:12:9:16:6 | Uses Step: modified_files | .github/workflows/code_injection2.yml:16:21:16:70 | steps.modified_files.outputs.files_modified | provenance |  |
 nodes
+| .github/workflows/cache_write_capable_push.yml:10:21:10:59 | github.event.head_commit.message | semmle.label | github.event.head_commit.message |
+| .github/workflows/cache_write_capable_reusable_workflow.yml:45:21:45:59 | github.event.head_commit.message | semmle.label | github.event.head_commit.message |
 | .github/workflows/code_injection1.yml:11:17:11:48 | github.event.comment.body | semmle.label | github.event.comment.body |
 | .github/workflows/code_injection2.yml:12:9:16:6 | Uses Step: modified_files | semmle.label | Uses Step: modified_files |
 | .github/workflows/code_injection2.yml:16:21:16:70 | steps.modified_files.outputs.files_modified | semmle.label | steps.modified_files.outputs.files_modified |
 | .github/workflows/neg_code_injection1.yml:11:17:11:48 | github.event.comment.body | semmle.label | github.event.comment.body |
 subpaths
 #select
-| .github/workflows/code_injection1.yml:11:17:11:48 | github.event.comment.body | .github/workflows/code_injection1.yml:11:17:11:48 | github.event.comment.body | .github/workflows/code_injection1.yml:11:17:11:48 | github.event.comment.body | Code injection in $@ may allow poisoning the default-branch cache (event trigger: $@). | .github/workflows/code_injection1.yml:11:17:11:48 | github.event.comment.body | ${{ github.event.comment.body }} | .github/workflows/code_injection1.yml:2:3:2:15 | issue_comment | issue_comment |
+| .github/workflows/cache_write_capable_push.yml:10:21:10:59 | github.event.head_commit.message | .github/workflows/cache_write_capable_push.yml:10:21:10:59 | github.event.head_commit.message | .github/workflows/cache_write_capable_push.yml:10:21:10:59 | github.event.head_commit.message | Code injection in $@ may allow poisoning the default-branch cache (event trigger: $@). | .github/workflows/cache_write_capable_push.yml:10:21:10:59 | github.event.head_commit.message | ${{ github.event.head_commit.message }} | .github/workflows/cache_write_capable_push.yml:2:3:2:6 | push | push |
+| .github/workflows/cache_write_capable_reusable_workflow.yml:45:21:45:59 | github.event.head_commit.message | .github/workflows/cache_write_capable_reusable_workflow.yml:45:21:45:59 | github.event.head_commit.message | .github/workflows/cache_write_capable_reusable_workflow.yml:45:21:45:59 | github.event.head_commit.message | Code injection in $@ may allow poisoning the default-branch cache (event trigger: $@). | .github/workflows/cache_write_capable_reusable_workflow.yml:45:21:45:59 | github.event.head_commit.message | ${{ github.event.head_commit.message }} | .github/workflows/cache_write_capable_reusable_workflow_caller.yml:2:3:2:6 | push | push |
diff --git a/actions/ql/test/query-tests/Security/CWE-349/CachePoisoningViaDirectCache.expected b/actions/ql/test/query-tests/Security/CWE-349/CachePoisoningViaDirectCache.expected
index e89db92356f2..7c7fc96dae52 100644
--- a/actions/ql/test/query-tests/Security/CWE-349/CachePoisoningViaDirectCache.expected
+++ b/actions/ql/test/query-tests/Security/CWE-349/CachePoisoningViaDirectCache.expected
@@ -1,7 +1,14 @@
 edges
+| .github/workflows/cache_write_capable_reusable_workflow.yml:14:9:15:6 | Uses Step | .github/workflows/cache_write_capable_reusable_workflow.yml:15:9:21:6 | Run Step |
+| .github/workflows/cache_write_capable_reusable_workflow.yml:15:9:21:6 | Run Step | .github/workflows/cache_write_capable_reusable_workflow.yml:21:9:26:2 | Uses Step |
+| .github/workflows/cache_write_capable_reusable_workflow.yml:31:9:32:6 | Uses Step | .github/workflows/cache_write_capable_reusable_workflow.yml:32:9:38:6 | Run Step |
+| .github/workflows/cache_write_capable_reusable_workflow.yml:32:9:38:6 | Run Step | .github/workflows/cache_write_capable_reusable_workflow.yml:38:9:40:2 | Run Step |
 | .github/workflows/cache_write_capable_workflow_dispatch.yml:8:9:14:6 | Run Step: pr | .github/workflows/cache_write_capable_workflow_dispatch.yml:14:9:19:6 | Run Step |
 | .github/workflows/cache_write_capable_workflow_dispatch.yml:14:9:19:6 | Run Step | .github/workflows/cache_write_capable_workflow_dispatch.yml:19:9:20:6 | Run Step |
 | .github/workflows/cache_write_capable_workflow_dispatch.yml:19:9:20:6 | Run Step | .github/workflows/cache_write_capable_workflow_dispatch.yml:20:9:23:33 | Uses Step |
+| .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:14:9:15:6 | Uses Step | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:15:9:21:6 | Run Step |
+| .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:15:9:21:6 | Run Step | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:21:9:22:6 | Run Step |
+| .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:21:9:22:6 | Run Step | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:22:9:25:32 | Uses Step |
 | .github/workflows/code_injection2.yml:12:9:16:6 | Uses Step: modified_files | .github/workflows/code_injection2.yml:16:9:16:71 | Run Step |
 | .github/workflows/direct_cache1.yml:10:9:13:6 | Uses Step: comment-branch | .github/workflows/direct_cache1.yml:13:9:18:6 | Uses Step |
 | .github/workflows/direct_cache1.yml:13:9:18:6 | Uses Step | .github/workflows/direct_cache1.yml:18:9:22:6 | Uses Step |
@@ -47,9 +54,6 @@ edges
 | .github/workflows/poisonable_step5.yml:17:9:22:6 | Uses Step | .github/workflows/poisonable_step5.yml:22:9:24:6 | Uses Step |
 | .github/workflows/poisonable_step5.yml:22:9:24:6 | Uses Step | .github/workflows/poisonable_step5.yml:24:9:28:31 | Uses Step |
 #select
-| .github/workflows/direct_cache1.yml:18:9:22:6 | Uses Step | .github/workflows/direct_cache1.yml:13:9:18:6 | Uses Step | .github/workflows/direct_cache1.yml:18:9:22:6 | Uses Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code. ($@). | .github/workflows/direct_cache1.yml:2:3:2:15 | issue_comment | issue_comment |
-| .github/workflows/direct_cache2.yml:14:9:18:6 | Uses Step | .github/workflows/direct_cache2.yml:11:9:14:6 | Uses Step | .github/workflows/direct_cache2.yml:14:9:18:6 | Uses Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code. ($@). | .github/workflows/direct_cache2.yml:3:5:3:23 | pull_request_target | pull_request_target |
-| .github/workflows/direct_cache3.yml:19:9:23:6 | Uses Step | .github/workflows/direct_cache3.yml:14:9:19:6 | Uses Step | .github/workflows/direct_cache3.yml:19:9:23:6 | Uses Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code. ($@). | .github/workflows/direct_cache3.yml:2:3:2:15 | issue_comment | issue_comment |
-| .github/workflows/direct_cache4.yml:17:9:21:6 | Uses Step | .github/workflows/direct_cache4.yml:14:9:17:6 | Uses Step | .github/workflows/direct_cache4.yml:17:9:21:6 | Uses Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code. ($@). | .github/workflows/direct_cache4.yml:4:3:4:21 | pull_request_target | pull_request_target |
-| .github/workflows/direct_cache5.yml:17:9:21:6 | Uses Step | .github/workflows/direct_cache5.yml:14:9:17:6 | Uses Step | .github/workflows/direct_cache5.yml:17:9:21:6 | Uses Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code. ($@). | .github/workflows/direct_cache5.yml:4:3:4:21 | pull_request_target | pull_request_target |
-| .github/workflows/direct_cache6.yml:20:9:26:46 | Uses Step: cache-pip | .github/workflows/direct_cache6.yml:13:9:16:6 | Uses Step | .github/workflows/direct_cache6.yml:20:9:26:46 | Uses Step: cache-pip | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code. ($@). | .github/workflows/direct_cache6.yml:4:3:4:21 | pull_request_target | pull_request_target |
+| .github/workflows/cache_write_capable_reusable_workflow.yml:21:9:26:2 | Uses Step | .github/workflows/cache_write_capable_reusable_workflow.yml:15:9:21:6 | Run Step | .github/workflows/cache_write_capable_reusable_workflow.yml:21:9:26:2 | Uses Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code. ($@). | .github/workflows/cache_write_capable_reusable_workflow_caller.yml:4:3:4:19 | workflow_dispatch | workflow_dispatch |
+| .github/workflows/cache_write_capable_workflow_dispatch.yml:20:9:23:33 | Uses Step | .github/workflows/cache_write_capable_workflow_dispatch.yml:14:9:19:6 | Run Step | .github/workflows/cache_write_capable_workflow_dispatch.yml:20:9:23:33 | Uses Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code. ($@). | .github/workflows/cache_write_capable_workflow_dispatch.yml:1:5:1:21 | workflow_dispatch | workflow_dispatch |
+| .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:22:9:25:32 | Uses Step | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:15:9:21:6 | Run Step | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:22:9:25:32 | Uses Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code. ($@). | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:2:3:2:19 | workflow_dispatch | workflow_dispatch |
diff --git a/actions/ql/test/query-tests/Security/CWE-349/CachePoisoningViaPoisonableStep.expected b/actions/ql/test/query-tests/Security/CWE-349/CachePoisoningViaPoisonableStep.expected
index 9a5bbb48384e..59ad18242986 100644
--- a/actions/ql/test/query-tests/Security/CWE-349/CachePoisoningViaPoisonableStep.expected
+++ b/actions/ql/test/query-tests/Security/CWE-349/CachePoisoningViaPoisonableStep.expected
@@ -1,8 +1,18 @@
 edges
+| .github/workflows/cache_write_capable_reusable_workflow.yml:14:9:15:6 | Uses Step | .github/workflows/cache_write_capable_reusable_workflow.yml:15:9:21:6 | Run Step |
+| .github/workflows/cache_write_capable_reusable_workflow.yml:15:9:21:6 | Run Step | .github/workflows/cache_write_capable_reusable_workflow.yml:21:9:26:2 | Uses Step |
+| .github/workflows/cache_write_capable_reusable_workflow.yml:16:22:16:43 | inputs.head_sha | .github/workflows/cache_write_capable_reusable_workflow.yml:15:9:21:6 | Run Step |
+| .github/workflows/cache_write_capable_reusable_workflow.yml:31:9:32:6 | Uses Step | .github/workflows/cache_write_capable_reusable_workflow.yml:32:9:38:6 | Run Step |
+| .github/workflows/cache_write_capable_reusable_workflow.yml:32:9:38:6 | Run Step | .github/workflows/cache_write_capable_reusable_workflow.yml:38:9:40:2 | Run Step |
+| .github/workflows/cache_write_capable_reusable_workflow.yml:33:22:33:43 | inputs.head_sha | .github/workflows/cache_write_capable_reusable_workflow.yml:32:9:38:6 | Run Step |
 | .github/workflows/cache_write_capable_workflow_dispatch.yml:8:9:14:6 | Run Step: pr | .github/workflows/cache_write_capable_workflow_dispatch.yml:14:9:19:6 | Run Step |
 | .github/workflows/cache_write_capable_workflow_dispatch.yml:14:9:19:6 | Run Step | .github/workflows/cache_write_capable_workflow_dispatch.yml:19:9:20:6 | Run Step |
 | .github/workflows/cache_write_capable_workflow_dispatch.yml:15:22:15:68 | fromJSON(steps.pr.outputs.json).head.sha | .github/workflows/cache_write_capable_workflow_dispatch.yml:14:9:19:6 | Run Step |
 | .github/workflows/cache_write_capable_workflow_dispatch.yml:19:9:20:6 | Run Step | .github/workflows/cache_write_capable_workflow_dispatch.yml:20:9:23:33 | Uses Step |
+| .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:14:9:15:6 | Uses Step | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:15:9:21:6 | Run Step |
+| .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:15:9:21:6 | Run Step | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:21:9:22:6 | Run Step |
+| .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:16:22:16:56 | github.event.inputs.head_sha | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:15:9:21:6 | Run Step |
+| .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:21:9:22:6 | Run Step | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:22:9:25:32 | Uses Step |
 | .github/workflows/code_injection2.yml:12:9:16:6 | Uses Step: modified_files | .github/workflows/code_injection2.yml:16:9:16:71 | Run Step |
 | .github/workflows/direct_cache1.yml:10:9:13:6 | Uses Step: comment-branch | .github/workflows/direct_cache1.yml:13:9:18:6 | Uses Step |
 | .github/workflows/direct_cache1.yml:13:9:18:6 | Uses Step | .github/workflows/direct_cache1.yml:18:9:22:6 | Uses Step |
@@ -66,10 +76,6 @@ edges
 | .github/workflows/poisonable_step5.yml:20:17:20:57 | github.event.pull_request.head.ref | .github/workflows/poisonable_step5.yml:17:9:22:6 | Uses Step |
 | .github/workflows/poisonable_step5.yml:22:9:24:6 | Uses Step | .github/workflows/poisonable_step5.yml:24:9:28:31 | Uses Step |
 #select
-| .github/workflows/poisonable_step1.yml:15:9:17:2 | Run Step | .github/workflows/poisonable_step1.yml:14:17:14:60 | steps.comment-branch.outputs.head_sha | .github/workflows/poisonable_step1.yml:15:9:17:2 | Run Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code from $@. ($@). | .github/workflows/poisonable_step1.yml:14:17:14:60 | steps.comment-branch.outputs.head_sha | steps.comment-branch.outputs.head_sha | .github/workflows/poisonable_step1.yml:2:3:2:15 | issue_comment | issue_comment |
-| .github/workflows/poisonable_step1.yml:26:9:28:2 | Uses Step | .github/workflows/poisonable_step1.yml:25:17:25:60 | steps.comment-branch.outputs.head_sha | .github/workflows/poisonable_step1.yml:26:9:28:2 | Uses Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code from $@. ($@). | .github/workflows/poisonable_step1.yml:25:17:25:60 | steps.comment-branch.outputs.head_sha | steps.comment-branch.outputs.head_sha | .github/workflows/poisonable_step1.yml:2:3:2:15 | issue_comment | issue_comment |
-| .github/workflows/poisonable_step1.yml:37:9:37:75 | Run Step | .github/workflows/poisonable_step1.yml:36:17:36:60 | steps.comment-branch.outputs.head_sha | .github/workflows/poisonable_step1.yml:37:9:37:75 | Run Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code from $@. ($@). | .github/workflows/poisonable_step1.yml:36:17:36:60 | steps.comment-branch.outputs.head_sha | steps.comment-branch.outputs.head_sha | .github/workflows/poisonable_step1.yml:2:3:2:15 | issue_comment | issue_comment |
-| .github/workflows/poisonable_step2.yml:22:9:26:31 | Uses Step | .github/workflows/poisonable_step2.yml:18:17:18:57 | github.event.pull_request.head.ref | .github/workflows/poisonable_step2.yml:22:9:26:31 | Uses Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code from $@. ($@). | .github/workflows/poisonable_step2.yml:18:17:18:57 | github.event.pull_request.head.ref | github.event.pull_request.head.ref | .github/workflows/poisonable_step2.yml:5:3:5:21 | pull_request_target | pull_request_target |
-| .github/workflows/poisonable_step3.yml:19:7:19:32 | Run Step | .github/workflows/poisonable_step3.yml:16:15:16:55 | github.event.pull_request.head.ref | .github/workflows/poisonable_step3.yml:19:7:19:32 | Run Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code from $@. ($@). | .github/workflows/poisonable_step3.yml:16:15:16:55 | github.event.pull_request.head.ref | github.event.pull_request.head.ref | .github/workflows/poisonable_step3.yml:4:3:4:21 | pull_request_target | pull_request_target |
-| .github/workflows/poisonable_step4.yml:18:9:18:19 | Run Step | .github/workflows/poisonable_step4.yml:16:17:16:57 | github.event.pull_request.head.sha | .github/workflows/poisonable_step4.yml:18:9:18:19 | Run Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code from $@. ($@). | .github/workflows/poisonable_step4.yml:16:17:16:57 | github.event.pull_request.head.sha | github.event.pull_request.head.sha | .github/workflows/poisonable_step4.yml:3:3:3:21 | pull_request_target | pull_request_target |
-| .github/workflows/poisonable_step5.yml:24:9:28:31 | Uses Step | .github/workflows/poisonable_step5.yml:20:17:20:57 | github.event.pull_request.head.ref | .github/workflows/poisonable_step5.yml:24:9:28:31 | Uses Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code from $@. ($@). | .github/workflows/poisonable_step5.yml:20:17:20:57 | github.event.pull_request.head.ref | github.event.pull_request.head.ref | .github/workflows/poisonable_step5.yml:3:3:3:21 | pull_request_target | pull_request_target |
+| .github/workflows/cache_write_capable_reusable_workflow.yml:38:9:40:2 | Run Step | .github/workflows/cache_write_capable_reusable_workflow.yml:33:22:33:43 | inputs.head_sha | .github/workflows/cache_write_capable_reusable_workflow.yml:38:9:40:2 | Run Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code from $@. ($@). | .github/workflows/cache_write_capable_reusable_workflow.yml:33:22:33:43 | inputs.head_sha | inputs.head_sha | .github/workflows/cache_write_capable_reusable_workflow_caller.yml:4:3:4:19 | workflow_dispatch | workflow_dispatch |
+| .github/workflows/cache_write_capable_workflow_dispatch.yml:19:9:20:6 | Run Step | .github/workflows/cache_write_capable_workflow_dispatch.yml:15:22:15:68 | fromJSON(steps.pr.outputs.json).head.sha | .github/workflows/cache_write_capable_workflow_dispatch.yml:19:9:20:6 | Run Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code from $@. ($@). | .github/workflows/cache_write_capable_workflow_dispatch.yml:15:22:15:68 | fromJSON(steps.pr.outputs.json).head.sha | fromJSON(steps.pr.outputs.json).head.sha | .github/workflows/cache_write_capable_workflow_dispatch.yml:1:5:1:21 | workflow_dispatch | workflow_dispatch |
+| .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:21:9:22:6 | Run Step | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:16:22:16:56 | github.event.inputs.head_sha | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:21:9:22:6 | Run Step | Potential cache poisoning in the context of the default branch due to privilege checkout of untrusted code from $@. ($@). | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:16:22:16:56 | github.event.inputs.head_sha | github.event.inputs.head_sha | .github/workflows/cache_write_capable_workflow_dispatch_validated.yml:2:3:2:19 | workflow_dispatch | workflow_dispatch |
diff --git a/actions/ql/test/query-tests/Security/CWE-367/UntrustedCheckoutTOCTOUCritical.expected b/actions/ql/test/query-tests/Security/CWE-367/UntrustedCheckoutTOCTOUCritical.expected
index 4f0bd967c2b0..78a25f6c212a 100644
--- a/actions/ql/test/query-tests/Security/CWE-367/UntrustedCheckoutTOCTOUCritical.expected
+++ b/actions/ql/test/query-tests/Security/CWE-367/UntrustedCheckoutTOCTOUCritical.expected
@@ -104,8 +104,3 @@ edges
 | .github/workflows/test0.yml:58:9:60:2 | Run Step | .github/workflows/test0.yml:54:9:58:6 | Uses Step | .github/workflows/test0.yml:58:9:60:2 | Run Step | Insufficient protection against execution of untrusted code on a privileged workflow ($@). | .github/workflows/test0.yml:4:3:4:15 | issue_comment | issue_comment |
 | .github/workflows/test0.yml:68:9:68:43 | Run Step | .github/workflows/test0.yml:64:9:68:6 | Uses Step | .github/workflows/test0.yml:68:9:68:43 | Run Step | Insufficient protection against execution of untrusted code on a privileged workflow ($@). | .github/workflows/test0.yml:4:3:4:15 | issue_comment | issue_comment |
 | .github/workflows/test4.yml:85:7:88:54 | Uses Step | .github/workflows/test4.yml:79:7:85:4 | Uses Step | .github/workflows/test4.yml:85:7:88:54 | Uses Step | Insufficient protection against execution of untrusted code on a privileged workflow ($@). | .github/workflows/test4.yml:5:3:5:15 | issue_comment | issue_comment |
-| .github/workflows/test5.yml:151:7:156:4 | Uses Step | .github/workflows/test5.yml:87:7:93:4 | Uses Step | .github/workflows/test5.yml:151:7:156:4 | Uses Step | Insufficient protection against execution of untrusted code on a privileged workflow ($@). | .github/workflows/test5.yml:5:3:5:15 | issue_comment | issue_comment |
-| .github/workflows/test5.yml:156:7:169:4 | Run Step | .github/workflows/test5.yml:87:7:93:4 | Uses Step | .github/workflows/test5.yml:156:7:169:4 | Run Step | Insufficient protection against execution of untrusted code on a privileged workflow ($@). | .github/workflows/test5.yml:5:3:5:15 | issue_comment | issue_comment |
-| .github/workflows/test5.yml:169:7:180:4 | Run Step | .github/workflows/test5.yml:87:7:93:4 | Uses Step | .github/workflows/test5.yml:169:7:180:4 | Run Step | Insufficient protection against execution of untrusted code on a privileged workflow ($@). | .github/workflows/test5.yml:5:3:5:15 | issue_comment | issue_comment |
-| .github/workflows/test6.yml:213:7:218:4 | Uses Step | .github/workflows/test6.yml:162:7:167:4 | Uses Step | .github/workflows/test6.yml:213:7:218:4 | Uses Step | Insufficient protection against execution of untrusted code on a privileged workflow ($@). | .github/workflows/test6.yml:5:3:5:15 | issue_comment | issue_comment |
-| .github/workflows/test6.yml:218:7:224:4 | Run Step | .github/workflows/test6.yml:162:7:167:4 | Uses Step | .github/workflows/test6.yml:218:7:224:4 | Run Step | Insufficient protection against execution of untrusted code on a privileged workflow ($@). | .github/workflows/test6.yml:5:3:5:15 | issue_comment | issue_comment |
diff --git a/actions/ql/test/query-tests/Security/CWE-367/UntrustedCheckoutTOCTOUHigh.expected b/actions/ql/test/query-tests/Security/CWE-367/UntrustedCheckoutTOCTOUHigh.expected
index 4f7149b69803..e69de29bb2d1 100644
--- a/actions/ql/test/query-tests/Security/CWE-367/UntrustedCheckoutTOCTOUHigh.expected
+++ b/actions/ql/test/query-tests/Security/CWE-367/UntrustedCheckoutTOCTOUHigh.expected
@@ -1,2 +0,0 @@
-| .github/workflows/test6.yml:42:7:47:4 | Uses Step | Insufficient protection against execution of untrusted code on a privileged workflow ($@). | .github/workflows/test6.yml:5:3:5:15 | issue_comment | issue_comment |
-| .github/workflows/test6.yml:92:7:97:4 | Uses Step | Insufficient protection against execution of untrusted code on a privileged workflow ($@). | .github/workflows/test6.yml:5:3:5:15 | issue_comment | issue_comment |
diff --git a/actions/ql/test/query-tests/Security/CWE-829-Lockfile/.github/workflows/actions.lock b/actions/ql/test/query-tests/Security/CWE-829-Lockfile/.github/workflows/actions.lock
new file mode 100644
index 000000000000..8f42f6f8181f
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-829-Lockfile/.github/workflows/actions.lock
@@ -0,0 +1,30 @@
+version: future-version
+workflows:
+  .github/workflows/rust-ci.yml:
+    - DToLnAy/RuSt-ToOlChAiN@v1
+    - mismatched/action@v1
+    - malformed/action@v1
+    - missing/action@v1
+  .github/workflows/other.yml:
+    - other-workflow/action@v1
+dependencies:
+  DToLnAy/RuSt-ToOlChAiN@v1:
+    ref: v1
+    commit: sha1-6c977a6ca4077a0ceb28ffbe03f59d46e9ac8772
+    owner_id: 1940490
+    repo_id: 260749683
+  other-workflow/action@v1:
+    ref: v1
+    commit: sha1-1111111111111111111111111111111111111111
+    owner_id: 1
+    repo_id: 2
+  mismatched/action@v1:
+    ref: V1
+    commit: sha1-2222222222222222222222222222222222222222
+    owner_id: 3
+    repo_id: 4
+  malformed/action@v1:
+    ref: v1
+    commit: 6c977a6ca4077a0ceb28ffbe03f59d46e9ac8772
+    owner_id: 5
+    repo_id: 6
diff --git a/actions/ql/test/query-tests/Security/CWE-829-Lockfile/.github/workflows/rust-ci.yml b/actions/ql/test/query-tests/Security/CWE-829-Lockfile/.github/workflows/rust-ci.yml
new file mode 100644
index 000000000000..3838b3589dc5
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-829-Lockfile/.github/workflows/rust-ci.yml
@@ -0,0 +1,16 @@
+on:
+  pull_request
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: dtolnay/rust-toolchain@v1
+    - uses: DToLnAy/RuSt-ToOlChAiN/save@v1
+    - uses: dtolnay/rust-toolchain@V1 # $ Alert
+    - uses: other-workflow/action@v1 # $ Alert
+    - uses: mismatched/action@v1 # $ Alert
+    - uses: malformed/action@v1 # $ Alert
+    - uses: missing/action@v1 # $ Alert
+  reusable:
+    uses: dtolnay/rust-toolchain/.github/workflows/reusable.yml@v1 # $ Alert
diff --git a/actions/ql/test/query-tests/Security/CWE-829-Lockfile/UnpinnedActionsTag.expected b/actions/ql/test/query-tests/Security/CWE-829-Lockfile/UnpinnedActionsTag.expected
new file mode 100644
index 000000000000..98fd715f4a81
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-829-Lockfile/UnpinnedActionsTag.expected
@@ -0,0 +1,6 @@
+| .github/workflows/rust-ci.yml:10:13:10:37 | dtolnay/rust-toolchain@V1 | Unpinned 3rd party Action 'rust-ci.yml' step $@ uses 'dtolnay/rust-toolchain' with ref 'V1', not a pinned commit hash | .github/workflows/rust-ci.yml:10:7:11:4 | Uses Step | Uses Step |
+| .github/workflows/rust-ci.yml:11:13:11:36 | other-workflow/action@v1 | Unpinned 3rd party Action 'rust-ci.yml' step $@ uses 'other-workflow/action' with ref 'v1', not a pinned commit hash | .github/workflows/rust-ci.yml:11:7:12:4 | Uses Step | Uses Step |
+| .github/workflows/rust-ci.yml:12:13:12:32 | mismatched/action@v1 | Unpinned 3rd party Action 'rust-ci.yml' step $@ uses 'mismatched/action' with ref 'v1', not a pinned commit hash | .github/workflows/rust-ci.yml:12:7:13:4 | Uses Step | Uses Step |
+| .github/workflows/rust-ci.yml:13:13:13:31 | malformed/action@v1 | Unpinned 3rd party Action 'rust-ci.yml' step $@ uses 'malformed/action' with ref 'v1', not a pinned commit hash | .github/workflows/rust-ci.yml:13:7:14:4 | Uses Step | Uses Step |
+| .github/workflows/rust-ci.yml:14:13:14:29 | missing/action@v1 | Unpinned 3rd party Action 'rust-ci.yml' step $@ uses 'missing/action' with ref 'v1', not a pinned commit hash | .github/workflows/rust-ci.yml:14:7:15:2 | Uses Step | Uses Step |
+| .github/workflows/rust-ci.yml:16:11:16:66 | dtolnay/rust-toolchain/.github/workflows/reusable.yml@v1 | Job $@ in 'rust-ci.yml' uses reusable workflow 'dtolnay/rust-toolchain/.github/workflows/reusable.yml' with ref 'v1', not a pinned commit hash | .github/workflows/rust-ci.yml:16:5:16:77 | Job: reusable | Job: reusable |
diff --git a/actions/ql/test/query-tests/Security/CWE-829-Lockfile/UnpinnedActionsTag.qlref b/actions/ql/test/query-tests/Security/CWE-829-Lockfile/UnpinnedActionsTag.qlref
new file mode 100644
index 000000000000..d33a5b380859
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-829-Lockfile/UnpinnedActionsTag.qlref
@@ -0,0 +1,2 @@
+query: Security/CWE-829/UnpinnedActionsTag.ql
+postprocess: utils/ActionsInlineExpectationsTestQuery.ql
diff --git a/actions/ql/test/query-tests/Security/CWE-829-Lockfile/options b/actions/ql/test/query-tests/Security/CWE-829-Lockfile/options
new file mode 100644
index 000000000000..af54d6532407
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-829-Lockfile/options
@@ -0,0 +1 @@
+semmle-extractor-options: --file-type YAML .github/workflows/actions.lock
diff --git a/actions/ql/test/query-tests/Security/CWE-829-untrusted-owner/.github/workflows/unpinned_first_party.yml b/actions/ql/test/query-tests/Security/CWE-829-untrusted-owner/.github/workflows/unpinned_first_party.yml
new file mode 100644
index 000000000000..6617f509693d
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-829-untrusted-owner/.github/workflows/unpinned_first_party.yml
@@ -0,0 +1,13 @@
+name: Unpinned first-party actions
+on: push
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      # `actions` is distrusted via `!actions`, and this action is not immutable,
+      # so this unpinned tag is reported.
+      - uses: actions/first-interaction@v1 # $ Alert
+      # `github` remains trusted, so this unpinned tag is not reported.
+      - uses: github/issue-labeler@v3.0
+      # Third-party owner is always reported.
+      - uses: foo/bar@v1 # $ Alert
diff --git a/actions/ql/test/query-tests/Security/CWE-829-untrusted-owner/UnpinnedActionsTag.expected b/actions/ql/test/query-tests/Security/CWE-829-untrusted-owner/UnpinnedActionsTag.expected
new file mode 100644
index 000000000000..a047196d85fa
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-829-untrusted-owner/UnpinnedActionsTag.expected
@@ -0,0 +1,2 @@
+| .github/workflows/unpinned_first_party.yml:9:15:9:42 | actions/first-interaction@v1 | Unpinned 3rd party Action 'Unpinned first-party actions' step $@ uses 'actions/first-interaction' with ref 'v1', not a pinned commit hash | .github/workflows/unpinned_first_party.yml:9:9:11:6 | Uses Step | Uses Step |
+| .github/workflows/unpinned_first_party.yml:13:15:13:24 | foo/bar@v1 | Unpinned 3rd party Action 'Unpinned first-party actions' step $@ uses 'foo/bar' with ref 'v1', not a pinned commit hash | .github/workflows/unpinned_first_party.yml:13:9:13:35 | Uses Step | Uses Step |
diff --git a/actions/ql/test/query-tests/Security/CWE-829-untrusted-owner/UnpinnedActionsTag.ext.yml b/actions/ql/test/query-tests/Security/CWE-829-untrusted-owner/UnpinnedActionsTag.ext.yml
new file mode 100644
index 000000000000..45aea89e7186
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-829-untrusted-owner/UnpinnedActionsTag.ext.yml
@@ -0,0 +1,8 @@
+extensions:
+  - addsTo:
+      pack: codeql/actions-all
+      extensible: trustedActionsOwnerDataModel
+    data:
+      # Distrust the first-party `actions` owner so unpinned tags for its
+      # Actions are reported. `github` is intentionally left trusted.
+      - ["!actions"]
diff --git a/actions/ql/test/query-tests/Security/CWE-829-untrusted-owner/UnpinnedActionsTag.qlref b/actions/ql/test/query-tests/Security/CWE-829-untrusted-owner/UnpinnedActionsTag.qlref
new file mode 100644
index 000000000000..9d46bb88b264
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-829-untrusted-owner/UnpinnedActionsTag.qlref
@@ -0,0 +1,2 @@
+query: Security/CWE-829/UnpinnedActionsTag.ql
+postprocess: codeql/actions/test/InlineExpectationsTestQuery.ql
diff --git a/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/self_ref_dollar.yml b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/self_ref_dollar.yml
new file mode 100644
index 000000000000..0d651b0bb0f6
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/self_ref_dollar.yml
@@ -0,0 +1,15 @@
+on:
+  pull_request
+
+jobs:
+  build:
+    name: Build and test
+    runs-on: ubuntu-latest
+    steps:
+    # `$/` is a same-repository (self repository) reference resolved at the running commit. It is
+    # inherently pinned (like `./` self workspace refs) and must never be reported as an unpinned tag.
+    - uses: $/actions/foo
+    # `$/…@ref` is rejected by the `$/` rule, but a user could still write it. It must also
+    # never be flagged; this case exercises the `not isSelfRepository(nwo)` suppression, since
+    # without it `$/actions/foo@v1` would otherwise be reported as an unpinned tag.
+    - uses: $/actions/foo@v1
diff --git a/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/unpinned_reusable_workflows.yml b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/unpinned_reusable_workflows.yml
new file mode 100644
index 000000000000..72ce6b4dd05b
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/unpinned_reusable_workflows.yml
@@ -0,0 +1,35 @@
+name: Reusable workflow pinning
+
+on:
+  pull_request:
+
+jobs:
+  unpinned-tag:
+    uses: example/actions/.github/workflows/build.yml@v2
+
+  unpinned-branch:
+    uses: example/actions/.github/workflows/build.yml@main
+
+  unpinned-branch-with-slash:
+    uses: example/actions/.github/workflows/build.yml@release/v2
+
+  unpinned-short-sha:
+    uses: example/actions/.github/workflows/build.yml@25b062c917b0c75f8b47d8469aff6c94ffd89ab
+
+  pinned-sha1:
+    uses: example/actions/.github/workflows/build.yml@25b062c917b0c75f8b47d8469aff6c94ffd89abb
+
+  pinned-sha256:
+    uses: example/actions/.github/workflows/build.yml@25b062c917b0c75f8b47d8469aff6c94ffd89abb25b062c917b0c75f8b47d84d
+
+  pinned-uppercase-sha1:
+    uses: example/actions/.github/workflows/build.yml@25B062C917B0C75F8B47D8469AFF6C94FFD89ABB
+
+  trusted-owner:
+    uses: actions/reusable-workflows/.github/workflows/build.yml@main
+
+  local-workflow:
+    uses: ./.github/workflows/reusable_local.yml
+
+  local-workflow-dollar:
+    uses: $/.github/workflows/reusable_local.yml
diff --git a/actions/ql/test/query-tests/Security/CWE-829/CONSISTENCY/CfgConsistency.expected b/actions/ql/test/query-tests/Security/CWE-829/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/actions/ql/test/query-tests/Security/CWE-829/UnpinnedActionsTag.expected b/actions/ql/test/query-tests/Security/CWE-829/UnpinnedActionsTag.expected
index 14cff70c3804..05f9cf3d8fd5 100644
--- a/actions/ql/test/query-tests/Security/CWE-829/UnpinnedActionsTag.expected
+++ b/actions/ql/test/query-tests/Security/CWE-829/UnpinnedActionsTag.expected
@@ -8,6 +8,10 @@
 | .github/workflows/auto_ci.yml:94:15:94:39 | codecov/codecov-action@v3 | Unpinned 3rd party Action 'Python CI' step $@ uses 'codecov/codecov-action' with ref 'v3', not a pinned commit hash | .github/workflows/auto_ci.yml:93:9:96:6 | Uses Step | Uses Step |
 | .github/workflows/auto_ci.yml:111:15:111:48 | peter-evans/create-pull-request@v5 | Unpinned 3rd party Action 'Python CI' step $@ uses 'peter-evans/create-pull-request' with ref 'v5', not a pinned commit hash | .github/workflows/auto_ci.yml:108:9:119:6 | Uses Step: create_pr | Uses Step: create_pr |
 | .github/workflows/auto_ci.yml:127:15:127:56 | thollander/actions-comment-pull-request@v2 | Unpinned 3rd party Action 'Python CI' step $@ uses 'thollander/actions-comment-pull-request' with ref 'v2', not a pinned commit hash | .github/workflows/auto_ci.yml:125:9:133:6 | Uses Step | Uses Step |
+| .github/workflows/external/TestOrg/TestRepo/.github/workflows/build_nested.yml:9:11:9:59 | TestOrg/TestRepo/.github/workflows/build.yml@main | Job $@ in 'build_nested.yml' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/build.yml' with ref 'main', not a pinned commit hash | .github/workflows/external/TestOrg/TestRepo/.github/workflows/build_nested.yml:9:5:13:7 | Job: build | Job: build |
+| .github/workflows/external/TestOrg/TestRepo/.github/workflows/build_nested_branching.yml:27:11:27:66 | TestOrg/TestRepo/.github/workflows/build_nested.yml@main | Job $@ in 'build_nested_branching.yml' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/build_nested.yml' with ref 'main', not a pinned commit hash | .github/workflows/external/TestOrg/TestRepo/.github/workflows/build_nested_branching.yml:26:5:30:2 | Job: build_safe | Job: build_safe |
+| .github/workflows/external/TestOrg/TestRepo/.github/workflows/build_nested_branching.yml:31:11:31:66 | TestOrg/TestRepo/.github/workflows/build_nested.yml@main | Job $@ in 'build_nested_branching.yml' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/build_nested.yml' with ref 'main', not a pinned commit hash | .github/workflows/external/TestOrg/TestRepo/.github/workflows/build_nested_branching.yml:31:5:33:43 | Job: build_unsafe | Job: build_unsafe |
+| .github/workflows/formal.yml:12:11:12:60 | TestOrg/TestRepo/.github/workflows/formal.yml@main | Job $@ in 'Test Formalities' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/formal.yml' with ref 'main', not a pinned commit hash | .github/workflows/formal.yml:11:5:12:61 | Job: build | Job: build |
 | .github/workflows/issue_comment_3rd_party_action.yml:14:15:14:52 | xt0rted/pull-request-comment-branch@v2 | Unpinned 3rd party Action 'PR head from 3rd party action' step $@ uses 'xt0rted/pull-request-comment-branch' with ref 'v2', not a pinned commit hash | .github/workflows/issue_comment_3rd_party_action.yml:12:9:16:6 | Uses Step: comment-branch | Uses Step: comment-branch |
 | .github/workflows/issue_comment_3rd_party_action.yml:27:15:27:52 | xt0rted/pull-request-comment-branch@v2 | Unpinned 3rd party Action 'PR head from 3rd party action' step $@ uses 'xt0rted/pull-request-comment-branch' with ref 'v2', not a pinned commit hash | .github/workflows/issue_comment_3rd_party_action.yml:25:9:30:6 | Uses Step: comment-branch | Uses Step: comment-branch |
 | .github/workflows/issue_comment_3rd_party_action.yml:41:15:41:42 | eficode/resolve-pr-refs@main | Unpinned 3rd party Action 'PR head from 3rd party action' step $@ uses 'eficode/resolve-pr-refs' with ref 'main', not a pinned commit hash | .github/workflows/issue_comment_3rd_party_action.yml:39:9:45:6 | Uses Step: refs | Uses Step: refs |
@@ -28,10 +32,24 @@
 | .github/workflows/pr-workflow.yml:449:15:449:43 | cachix/install-nix-action@v20 | Unpinned 3rd party Action 'pr-workflow' step $@ uses 'cachix/install-nix-action' with ref 'v20', not a pinned commit hash | .github/workflows/pr-workflow.yml:449:9:452:6 | Uses Step | Uses Step |
 | .github/workflows/pr-workflow.yml:452:15:452:60 | DeterminateSystems/magic-nix-cache-action@main | Unpinned 3rd party Action 'pr-workflow' step $@ uses 'DeterminateSystems/magic-nix-cache-action' with ref 'main', not a pinned commit hash | .github/workflows/pr-workflow.yml:452:9:453:6 | Uses Step | Uses Step |
 | .github/workflows/pr-workflow.yml:453:15:453:41 | cachix/cachix-action@master | Unpinned 3rd party Action 'pr-workflow' step $@ uses 'cachix/cachix-action' with ref 'master', not a pinned commit hash | .github/workflows/pr-workflow.yml:453:9:459:6 | Uses Step | Uses Step |
+| .github/workflows/reusable_caller1.yaml:8:11:8:62 | TestOrg/TestRepo/.github/workflows/reusable.yml@main | Job $@ in 'assets-test' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/reusable.yml' with ref 'main', not a pinned commit hash | .github/workflows/reusable_caller1.yaml:8:5:10:56 | Job: check-execution-context | Job: check-execution-context |
+| .github/workflows/reusable_caller2.yaml:8:11:8:62 | TestOrg/TestRepo/.github/workflows/reusable.yml@main | Job $@ in 'assets-test' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/reusable.yml' with ref 'main', not a pinned commit hash | .github/workflows/reusable_caller2.yaml:8:5:10:56 | Job: check-execution-context | Job: check-execution-context |
 | .github/workflows/test7.yml:25:15:25:34 | pnpm/action-setup@v3 | Unpinned 3rd party Action 'Benchmark' step $@ uses 'pnpm/action-setup' with ref 'v3', not a pinned commit hash | .github/workflows/test7.yml:24:9:27:6 | Uses Step | Uses Step |
 | .github/workflows/test13.yml:15:13:15:53 | sushichop/action-repository-permission@v2 | Unpinned 3rd party Action 'test13.yml' step $@ uses 'sushichop/action-repository-permission' with ref 'v2', not a pinned commit hash | .github/workflows/test13.yml:14:7:20:4 | Uses Step | Uses Step |
 | .github/workflows/test17.yml:20:21:20:63 | sonarsource/sonarcloud-github-action@master | Unpinned 3rd party Action 'Sonar' step $@ uses 'sonarsource/sonarcloud-github-action' with ref 'master', not a pinned commit hash | .github/workflows/test17.yml:19:15:23:58 | Uses Step | Uses Step |
 | .github/workflows/test18.yml:37:21:37:63 | sonarsource/sonarcloud-github-action@master | Unpinned 3rd party Action 'Sonar' step $@ uses 'sonarsource/sonarcloud-github-action' with ref 'master', not a pinned commit hash | .github/workflows/test18.yml:36:15:40:58 | Uses Step | Uses Step |
+| .github/workflows/unpinned_reusable_workflows.yml:8:11:8:56 | example/actions/.github/workflows/build.yml@v2 | Job $@ in 'Reusable workflow pinning' uses reusable workflow 'example/actions/.github/workflows/build.yml' with ref 'v2', not a pinned commit hash | .github/workflows/unpinned_reusable_workflows.yml:8:5:10:2 | Job: unpinned-tag | Job: unpinned-tag |
+| .github/workflows/unpinned_reusable_workflows.yml:11:11:11:58 | example/actions/.github/workflows/build.yml@main | Job $@ in 'Reusable workflow pinning' uses reusable workflow 'example/actions/.github/workflows/build.yml' with ref 'main', not a pinned commit hash | .github/workflows/unpinned_reusable_workflows.yml:11:5:13:2 | Job: unpinned-branch | Job: unpinned-branch |
+| .github/workflows/unpinned_reusable_workflows.yml:14:11:14:64 | example/actions/.github/workflows/build.yml@release/v2 | Job $@ in 'Reusable workflow pinning' uses reusable workflow 'example/actions/.github/workflows/build.yml' with ref 'release/v2', not a pinned commit hash | .github/workflows/unpinned_reusable_workflows.yml:14:5:16:2 | Job: unpinned-branch-with-slash | Job: unpinned-branch-with-slash |
+| .github/workflows/unpinned_reusable_workflows.yml:17:11:17:93 | example/actions/.github/workflows/build.yml@25b062c917b0c75f8b47d8469aff6c94ffd89ab | Job $@ in 'Reusable workflow pinning' uses reusable workflow 'example/actions/.github/workflows/build.yml' with ref '25b062c917b0c75f8b47d8469aff6c94ffd89ab', not a pinned commit hash | .github/workflows/unpinned_reusable_workflows.yml:17:5:19:2 | Job: unpinned-short-sha | Job: unpinned-short-sha |
 | .github/workflows/unpinned_tags.yml:10:13:10:22 | foo/bar@v1 | Unpinned 3rd party Action 'unpinned_tags.yml' step $@ uses 'foo/bar' with ref 'v1', not a pinned commit hash | .github/workflows/unpinned_tags.yml:10:7:11:4 | Uses Step | Uses Step |
 | .github/workflows/unpinned_tags.yml:12:13:12:35 | docker://foo/bar@latest | Unpinned 3rd party Action 'unpinned_tags.yml' step $@ uses 'docker://foo/bar' with ref 'latest', not a pinned commit hash | .github/workflows/unpinned_tags.yml:12:7:13:4 | Uses Step | Uses Step |
 | .github/workflows/unpinned_tags.yml:19:13:19:70 | foo/bar@a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2a1b2c3d4e5 | Unpinned 3rd party Action 'unpinned_tags.yml' step $@ uses 'foo/bar' with ref 'a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2a1b2c3d4e5', not a pinned commit hash | .github/workflows/unpinned_tags.yml:19:7:19:71 | Uses Step | Uses Step |
+| .github/workflows/untrusted_checkout_permission_check_reusable2.yml:24:11:24:59 | TestOrg/TestRepo/.github/workflows/build.yml@main | Job $@ in 'untrusted_checkout_permission_check_reusable2.yml' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/build.yml' with ref 'main', not a pinned commit hash | .github/workflows/untrusted_checkout_permission_check_reusable2.yml:24:5:27:2 | Job: build_unsafe | Job: build_unsafe |
+| .github/workflows/untrusted_checkout_permission_check_reusable2.yml:29:11:29:59 | TestOrg/TestRepo/.github/workflows/build.yml@main | Job $@ in 'untrusted_checkout_permission_check_reusable2.yml' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/build.yml' with ref 'main', not a pinned commit hash | .github/workflows/untrusted_checkout_permission_check_reusable2.yml:28:5:31:101 | Job: build_safe | Job: build_safe |
+| .github/workflows/untrusted_checkout_permission_check_reusable.yml:24:11:24:59 | TestOrg/TestRepo/.github/workflows/build.yml@main | Job $@ in 'untrusted_checkout_permission_check_reusable.yml' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/build.yml' with ref 'main', not a pinned commit hash | .github/workflows/untrusted_checkout_permission_check_reusable.yml:23:5:26:101 | Job: build | Job: build |
+| .github/workflows/untrusted_checkout_permission_check_reusable_branching_nested.yml:6:11:6:76 | TestOrg/TestRepo/.github/workflows/build_nested_branching.yml@main | Job $@ in 'untrusted_checkout_permission_check_reusable_branching_nested.yml' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/build_nested_branching.yml' with ref 'main', not a pinned commit hash | .github/workflows/untrusted_checkout_permission_check_reusable_branching_nested.yml:6:5:8:60 | Job: build | Job: build |
+| .github/workflows/untrusted_checkout_permission_check_reusable_level2.yml:24:11:24:66 | TestOrg/TestRepo/.github/workflows/build_nested.yml@main | Job $@ in 'untrusted_checkout_permission_check_reusable_level2.yml' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/build_nested.yml' with ref 'main', not a pinned commit hash | .github/workflows/untrusted_checkout_permission_check_reusable_level2.yml:23:5:26:101 | Job: build | Job: build |
+| .github/workflows/untrusted_checkout_permission_check_reusable_no_needs.yml:24:11:24:66 | TestOrg/TestRepo/.github/workflows/build_nested.yml@main | Job $@ in 'untrusted_checkout_permission_check_reusable_no_needs.yml' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/build_nested.yml' with ref 'main', not a pinned commit hash | .github/workflows/untrusted_checkout_permission_check_reusable_no_needs.yml:24:5:26:60 | Job: build | Job: build |
+| .github/workflows/untrusted_checkout_two_callers_both_protected.yml:24:11:24:59 | TestOrg/TestRepo/.github/workflows/build.yml@main | Job $@ in 'untrusted_checkout_two_callers_both_protected.yml' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/build.yml' with ref 'main', not a pinned commit hash | .github/workflows/untrusted_checkout_two_callers_both_protected.yml:23:5:27:2 | Job: caller-a | Job: caller-a |
+| .github/workflows/untrusted_checkout_two_callers_both_protected.yml:46:11:46:59 | TestOrg/TestRepo/.github/workflows/build.yml@main | Job $@ in 'untrusted_checkout_two_callers_both_protected.yml' uses reusable workflow 'TestOrg/TestRepo/.github/workflows/build.yml' with ref 'main', not a pinned commit hash | .github/workflows/untrusted_checkout_two_callers_both_protected.yml:45:5:48:60 | Job: caller-b | Job: caller-b |
diff --git a/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutCritical.expected b/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutCritical.expected
index 910d5742e572..381ca41243f1 100644
--- a/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutCritical.expected
+++ b/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutCritical.expected
@@ -241,6 +241,7 @@ edges
 | .github/workflows/resolve-args.yml:20:9:22:6 | Uses Step | .github/workflows/resolve-args.yml:22:9:36:13 | Run Step: resolve-step |
 | .github/workflows/reusable_local.yml:23:9:26:6 | Uses Step | .github/workflows/reusable_local.yml:26:9:29:7 | Run Step |
 | .github/workflows/reusable_local.yml:25:17:25:36 | inputs.branch | .github/workflows/reusable_local.yml:23:9:26:6 | Uses Step |
+| .github/workflows/self_ref_dollar.yml:11:7:15:4 | Uses Step | .github/workflows/self_ref_dollar.yml:15:7:15:29 | Uses Step |
 | .github/workflows/test1.yml:18:9:21:6 | Uses Step | .github/workflows/test1.yml:21:9:24:6 | Run Step |
 | .github/workflows/test1.yml:21:9:24:6 | Run Step | .github/workflows/test1.yml:24:9:25:39 | Run Step |
 | .github/workflows/test2.yml:13:9:16:6 | Uses Step | .github/workflows/test2.yml:16:9:20:52 | Uses Step |
@@ -472,6 +473,11 @@ edges
 | .github/workflows/test7.yml:19:9:24:6 | Uses Step | .github/workflows/test7.yml:22:27:22:58 | github.event.issue.number | .github/workflows/test7.yml:60:9:60:37 | Run Step | Checkout of untrusted code from $@ in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test7.yml:22:27:22:58 | github.event.issue.number | github.event.issue.number | .github/workflows/test7.yml:4:3:4:15 | issue_comment | issue_comment |
 | .github/workflows/test10.yml:20:9:25:6 | Uses Step | .github/workflows/test10.yml:23:17:23:79 | github.event.after \|\| github.event.pull_request.head.sha | .github/workflows/test10.yml:25:9:30:2 | Run Step | Checkout of untrusted code from $@ in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test10.yml:23:17:23:79 | github.event.after \|\| github.event.pull_request.head.sha | github.event.after \|\| github.event.pull_request.head.sha | .github/workflows/test10.yml:8:3:8:21 | pull_request_target | pull_request_target |
 | .github/workflows/test11.yml:84:7:90:4 | Uses Step | .github/workflows/test11.yml:88:15:88:55 | steps.environment.outputs.head_sha | .github/workflows/test11.yml:90:7:93:54 | Uses Step | Checkout of untrusted code from $@ in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test11.yml:88:15:88:55 | steps.environment.outputs.head_sha | steps.environment.outputs.head_sha | .github/workflows/test11.yml:5:3:5:15 | issue_comment | issue_comment |
+| .github/workflows/test14.yml:105:7:111:4 | Uses Step | .github/workflows/test14.yml:109:15:109:58 | steps.comment-branch.outputs.head_ref | .github/workflows/test14.yml:169:7:174:4 | Uses Step | Checkout of untrusted code from $@ in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test14.yml:109:15:109:58 | steps.comment-branch.outputs.head_ref | steps.comment-branch.outputs.head_ref | .github/workflows/test14.yml:5:3:5:15 | issue_comment | issue_comment |
+| .github/workflows/test14.yml:105:7:111:4 | Uses Step | .github/workflows/test14.yml:109:15:109:58 | steps.comment-branch.outputs.head_ref | .github/workflows/test14.yml:174:7:187:4 | Run Step | Checkout of untrusted code from $@ in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test14.yml:109:15:109:58 | steps.comment-branch.outputs.head_ref | steps.comment-branch.outputs.head_ref | .github/workflows/test14.yml:5:3:5:15 | issue_comment | issue_comment |
+| .github/workflows/test14.yml:105:7:111:4 | Uses Step | .github/workflows/test14.yml:109:15:109:58 | steps.comment-branch.outputs.head_ref | .github/workflows/test14.yml:187:7:198:4 | Run Step | Checkout of untrusted code from $@ in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test14.yml:109:15:109:58 | steps.comment-branch.outputs.head_ref | steps.comment-branch.outputs.head_ref | .github/workflows/test14.yml:5:3:5:15 | issue_comment | issue_comment |
+| .github/workflows/test15.yml:180:7:185:4 | Uses Step | .github/workflows/test15.yml:183:15:183:58 | steps.comment-branch.outputs.head_ref | .github/workflows/test15.yml:231:7:236:4 | Uses Step | Checkout of untrusted code from $@ in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test15.yml:183:15:183:58 | steps.comment-branch.outputs.head_ref | steps.comment-branch.outputs.head_ref | .github/workflows/test15.yml:5:3:5:15 | issue_comment | issue_comment |
+| .github/workflows/test15.yml:180:7:185:4 | Uses Step | .github/workflows/test15.yml:183:15:183:58 | steps.comment-branch.outputs.head_ref | .github/workflows/test15.yml:236:7:242:4 | Run Step | Checkout of untrusted code from $@ in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test15.yml:183:15:183:58 | steps.comment-branch.outputs.head_ref | steps.comment-branch.outputs.head_ref | .github/workflows/test15.yml:5:3:5:15 | issue_comment | issue_comment |
 | .github/workflows/test17.yml:12:15:19:12 | Uses Step | .github/workflows/test17.yml:16:25:16:68 | github.event.workflow_run.head_branch | .github/workflows/test17.yml:19:15:23:58 | Uses Step | Checkout of untrusted code from $@ in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test17.yml:16:25:16:68 | github.event.workflow_run.head_branch | github.event.workflow_run.head_branch | .github/workflows/test17.yml:3:5:3:16 | workflow_run | workflow_run |
 | .github/workflows/test27.yml:18:9:21:6 | Uses Step | .github/workflows/test27.yml:20:17:20:37 | inputs.git_ref | .github/workflows/test27.yml:21:9:22:16 | Run Step | Checkout of untrusted code from $@ in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test27.yml:20:17:20:37 | inputs.git_ref | inputs.git_ref | .github/workflows/test26.yml:4:3:4:14 | workflow_run | workflow_run |
 | .github/workflows/test29.yml:8:7:14:4 | Uses Step | .github/workflows/test29.yml:11:15:11:55 | github.event.pull_request.head.sha | .github/workflows/test29.yml:14:7:21:11 | Uses Step | Checkout of untrusted code from $@ in a privileged workflow with later potential execution (event trigger: $@). | .github/workflows/test29.yml:11:15:11:55 | github.event.pull_request.head.sha | github.event.pull_request.head.sha | .github/workflows/test29.yml:1:5:1:23 | pull_request_target | pull_request_target |
diff --git a/actions/ql/test/utils/ActionsInlineExpectationsTestQuery.ql b/actions/ql/test/utils/ActionsInlineExpectationsTestQuery.ql
new file mode 100644
index 000000000000..cf23944f553d
--- /dev/null
+++ b/actions/ql/test/utils/ActionsInlineExpectationsTestQuery.ql
@@ -0,0 +1,28 @@
+/**
+ * @kind test-postprocess
+ */
+
+private import codeql.Locations as Locations
+private import codeql.actions.ast.internal.Yaml as Yaml
+private import codeql.util.test.InlineExpectationsTest as T
+import T::TestPostProcessing
+
+private module Impl implements T::InlineExpectationsTestSig {
+  class Location = Locations::Location;
+
+  string getRelativeUrl(Locations::Location location) {
+    exists(int startLine, int startColumn, int endLine, int endColumn |
+      location.hasLocationInfo(_, startLine, startColumn, endLine, endColumn)
+    |
+      result =
+        location.getFile().getRelativePath() + ":" + startLine + ":" + startColumn + ":" + endLine +
+          ":" + endColumn
+    )
+  }
+
+  class ExpectationComment extends Yaml::YamlComment {
+    string getContents() { result = this.getText() }
+  }
+}
+
+import T::TestPostProcessing::Make<Impl>
diff --git a/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/exprs.ql b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/exprs.ql
new file mode 100644
index 000000000000..3af03b1d60b2
--- /dev/null
+++ b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/exprs.ql
@@ -0,0 +1,17 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+predicate isExprWithNewBuiltin(Expr expr) {
+  exists(int kind | exprs(expr, kind, _) | 397 <= kind and kind <= 403)
+}
+
+from Expr expr, int kind, int kind_new, Location location
+where
+  exprs(expr, kind, location) and
+  if isExprWithNewBuiltin(expr) then kind_new = 1 else kind_new = kind
+select expr, kind_new, location
diff --git a/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/old.dbscheme b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/old.dbscheme
new file mode 100644
index 000000000000..293904928d85
--- /dev/null
+++ b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/old.dbscheme
@@ -0,0 +1,2602 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(
+    unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+| 397 = @isvirtualbaseof
+| 398 = @isimplicitlifetime
+| 399 = @ltsynthesizesfromspaceship
+| 400 = @gtsynthesizesfromspaceship
+| 401 = @lesynthesizesfromspaceship
+| 402 = @gesynthesizesfromspaceship
+| 403 = @isstructural
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            | @isvirtualbaseof
+            | @isimplicitlifetime
+            | @ltsynthesizesfromspaceship
+            | @gtsynthesizesfromspaceship
+            | @lesynthesizesfromspaceship
+            | @gesynthesizesfromspaceship
+            | @isstructural
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/semmlecode.cpp.dbscheme b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..6aec212e408f
--- /dev/null
+++ b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/semmlecode.cpp.dbscheme
@@ -0,0 +1,2588 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(
+    unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/upgrade.properties b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/upgrade.properties
new file mode 100644
index 000000000000..d697a16a42fd
--- /dev/null
+++ b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/upgrade.properties
@@ -0,0 +1,3 @@
+description: Add new builtin operations
+compatibility: partial
+exprs.rel: run exprs.qlo
diff --git a/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/builtintypes.ql b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/builtintypes.ql
new file mode 100644
index 000000000000..2ad09def291c
--- /dev/null
+++ b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/builtintypes.ql
@@ -0,0 +1,9 @@
+class BuiltInType extends @builtintype {
+  string toString() { none() }
+}
+
+from BuiltInType type, string name, int kind, int kind_new, int size, int sign, int alignment
+where
+  builtintypes(type, name, kind, size, sign, alignment) and
+  if kind in [67, 68, 69] then kind_new = 1 else kind_new = kind
+select type, name, kind_new, size, sign, alignment
diff --git a/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/old.dbscheme b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/old.dbscheme
new file mode 100644
index 000000000000..6aec212e408f
--- /dev/null
+++ b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/old.dbscheme
@@ -0,0 +1,2588 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(
+    unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/semmlecode.cpp.dbscheme b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..0853f43dc8c0
--- /dev/null
+++ b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/semmlecode.cpp.dbscheme
@@ -0,0 +1,2578 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/upgrade.properties b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/upgrade.properties
new file mode 100644
index 000000000000..f387b03144f0
--- /dev/null
+++ b/cpp/downgrades/6aec212e408fad907b19368a3376a4d9837783d2/upgrade.properties
@@ -0,0 +1,4 @@
+description: Support C23 _BitInt
+compatibility: full
+bit_precise_int_types.rel: delete
+builtintypes.rel: run builtintypes.qlo
diff --git a/cpp/ql/integration-tests/query-suite/cpp-code-quality-extended.qls.expected b/cpp/ql/integration-tests/query-suite/cpp-code-quality-extended.qls.expected
index 8b137891791f..207617d4ac06 100644
--- a/cpp/ql/integration-tests/query-suite/cpp-code-quality-extended.qls.expected
+++ b/cpp/ql/integration-tests/query-suite/cpp-code-quality-extended.qls.expected
@@ -1 +1,45 @@
-
+ql/cpp/ql/src/Best Practices/BlockWithTooManyStatements.ql
+ql/cpp/ql/src/Best Practices/ComplexCondition.ql
+ql/cpp/ql/src/Best Practices/Exceptions/AccidentalRethrow.ql
+ql/cpp/ql/src/Best Practices/Exceptions/CatchingByValue.ql
+ql/cpp/ql/src/Best Practices/Exceptions/LeakyCatch.ql
+ql/cpp/ql/src/Best Practices/Exceptions/ThrowingPointers.ql
+ql/cpp/ql/src/Best Practices/GuardedFree.ql
+ql/cpp/ql/src/Best Practices/Hiding/DeclarationHidesParameter.ql
+ql/cpp/ql/src/Best Practices/Hiding/DeclarationHidesVariable.ql
+ql/cpp/ql/src/Best Practices/Likely Errors/Slicing.ql
+ql/cpp/ql/src/Best Practices/RuleOfTwo.ql
+ql/cpp/ql/src/Best Practices/UseOfGoto.ql
+ql/cpp/ql/src/Critical/LargeParameter.ql
+ql/cpp/ql/src/Critical/NewArrayDeleteMismatch.ql
+ql/cpp/ql/src/Critical/NewDeleteArrayMismatch.ql
+ql/cpp/ql/src/Documentation/FixmeComments.ql
+ql/cpp/ql/src/Header Cleanup/Cleanup-DuplicateIncludeGuard.ql
+ql/cpp/ql/src/Likely Bugs/Arithmetic/BitwiseSignCheck.ql
+ql/cpp/ql/src/Likely Bugs/Arithmetic/ComparisonPrecedence.ql
+ql/cpp/ql/src/Likely Bugs/Arithmetic/FloatComparison.ql
+ql/cpp/ql/src/Likely Bugs/Arithmetic/PointlessSelfComparison.ql
+ql/cpp/ql/src/Likely Bugs/Arithmetic/UnsignedGEZero.ql
+ql/cpp/ql/src/Likely Bugs/ContinueInFalseLoop.ql
+ql/cpp/ql/src/Likely Bugs/Conversion/ArrayArgSizeMismatch.ql
+ql/cpp/ql/src/Likely Bugs/Conversion/ImplicitDowncastFromBitfield.ql
+ql/cpp/ql/src/Likely Bugs/Format/TooManyFormatArguments.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/AssignWhereCompareMeant.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/CompareWhereAssignMeant.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/DubiousNullCheck.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/FutileConditional.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/ShortCircuitBitMask.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/UsingStrcpyAsBoolean.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/inconsistentLoopDirection.ql
+ql/cpp/ql/src/Likely Bugs/Memory Management/ReturnCstrOfLocalStdString.ql
+ql/cpp/ql/src/Likely Bugs/OO/IncorrectConstructorDelegation.ql
+ql/cpp/ql/src/Likely Bugs/OO/NonVirtualDestructorInBaseClass.ql
+ql/cpp/ql/src/Likely Bugs/OO/ThrowInDestructor.ql
+ql/cpp/ql/src/Likely Bugs/ReturnConstTypeMember.ql
+ql/cpp/ql/src/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.ql
+ql/cpp/ql/src/Likely Bugs/Underspecified Functions/TooManyArguments.ql
+ql/cpp/ql/src/jsf/4.07 Header Files/AV Rule 35.ql
+ql/cpp/ql/src/jsf/4.10 Classes/AV Rule 71.1.ql
+ql/cpp/ql/src/jsf/4.10 Classes/AV Rule 79.ql
+ql/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 197.ql
diff --git a/cpp/ql/integration-tests/query-suite/cpp-code-quality.qls.expected b/cpp/ql/integration-tests/query-suite/cpp-code-quality.qls.expected
index 8b137891791f..207617d4ac06 100644
--- a/cpp/ql/integration-tests/query-suite/cpp-code-quality.qls.expected
+++ b/cpp/ql/integration-tests/query-suite/cpp-code-quality.qls.expected
@@ -1 +1,45 @@
-
+ql/cpp/ql/src/Best Practices/BlockWithTooManyStatements.ql
+ql/cpp/ql/src/Best Practices/ComplexCondition.ql
+ql/cpp/ql/src/Best Practices/Exceptions/AccidentalRethrow.ql
+ql/cpp/ql/src/Best Practices/Exceptions/CatchingByValue.ql
+ql/cpp/ql/src/Best Practices/Exceptions/LeakyCatch.ql
+ql/cpp/ql/src/Best Practices/Exceptions/ThrowingPointers.ql
+ql/cpp/ql/src/Best Practices/GuardedFree.ql
+ql/cpp/ql/src/Best Practices/Hiding/DeclarationHidesParameter.ql
+ql/cpp/ql/src/Best Practices/Hiding/DeclarationHidesVariable.ql
+ql/cpp/ql/src/Best Practices/Likely Errors/Slicing.ql
+ql/cpp/ql/src/Best Practices/RuleOfTwo.ql
+ql/cpp/ql/src/Best Practices/UseOfGoto.ql
+ql/cpp/ql/src/Critical/LargeParameter.ql
+ql/cpp/ql/src/Critical/NewArrayDeleteMismatch.ql
+ql/cpp/ql/src/Critical/NewDeleteArrayMismatch.ql
+ql/cpp/ql/src/Documentation/FixmeComments.ql
+ql/cpp/ql/src/Header Cleanup/Cleanup-DuplicateIncludeGuard.ql
+ql/cpp/ql/src/Likely Bugs/Arithmetic/BitwiseSignCheck.ql
+ql/cpp/ql/src/Likely Bugs/Arithmetic/ComparisonPrecedence.ql
+ql/cpp/ql/src/Likely Bugs/Arithmetic/FloatComparison.ql
+ql/cpp/ql/src/Likely Bugs/Arithmetic/PointlessSelfComparison.ql
+ql/cpp/ql/src/Likely Bugs/Arithmetic/UnsignedGEZero.ql
+ql/cpp/ql/src/Likely Bugs/ContinueInFalseLoop.ql
+ql/cpp/ql/src/Likely Bugs/Conversion/ArrayArgSizeMismatch.ql
+ql/cpp/ql/src/Likely Bugs/Conversion/ImplicitDowncastFromBitfield.ql
+ql/cpp/ql/src/Likely Bugs/Format/TooManyFormatArguments.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/AssignWhereCompareMeant.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/CompareWhereAssignMeant.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/DubiousNullCheck.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/FutileConditional.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/ShortCircuitBitMask.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/UsingStrcpyAsBoolean.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/inconsistentLoopDirection.ql
+ql/cpp/ql/src/Likely Bugs/Memory Management/ReturnCstrOfLocalStdString.ql
+ql/cpp/ql/src/Likely Bugs/OO/IncorrectConstructorDelegation.ql
+ql/cpp/ql/src/Likely Bugs/OO/NonVirtualDestructorInBaseClass.ql
+ql/cpp/ql/src/Likely Bugs/OO/ThrowInDestructor.ql
+ql/cpp/ql/src/Likely Bugs/ReturnConstTypeMember.ql
+ql/cpp/ql/src/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.ql
+ql/cpp/ql/src/Likely Bugs/Underspecified Functions/TooManyArguments.ql
+ql/cpp/ql/src/jsf/4.07 Header Files/AV Rule 35.ql
+ql/cpp/ql/src/jsf/4.10 Classes/AV Rule 71.1.ql
+ql/cpp/ql/src/jsf/4.10 Classes/AV Rule 79.ql
+ql/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 197.ql
diff --git a/cpp/ql/integration-tests/query-suite/cpp-security-and-quality.qls.expected b/cpp/ql/integration-tests/query-suite/cpp-security-and-quality.qls.expected
index cb4e5f7b305a..17ebac8ee50c 100644
--- a/cpp/ql/integration-tests/query-suite/cpp-security-and-quality.qls.expected
+++ b/cpp/ql/integration-tests/query-suite/cpp-security-and-quality.qls.expected
@@ -65,6 +65,7 @@ ql/cpp/ql/src/Likely Bugs/InconsistentCheckReturnNull.ql
 ql/cpp/ql/src/Likely Bugs/Leap Year/Adding365DaysPerYear.ql
 ql/cpp/ql/src/Likely Bugs/Leap Year/UncheckedLeapYearAfterYearModification.ql
 ql/cpp/ql/src/Likely Bugs/Leap Year/UncheckedReturnValueForTimeFunctions.ql
+ql/cpp/ql/src/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison.ql
 ql/cpp/ql/src/Likely Bugs/Likely Typos/AssignWhereCompareMeant.ql
 ql/cpp/ql/src/Likely Bugs/Likely Typos/CompareWhereAssignMeant.ql
 ql/cpp/ql/src/Likely Bugs/Likely Typos/DubiousNullCheck.ql
diff --git a/cpp/ql/integration-tests/query-suite/not_included_in_qls.expected b/cpp/ql/integration-tests/query-suite/not_included_in_qls.expected
index 20ffa7c40c0d..70affad11648 100644
--- a/cpp/ql/integration-tests/query-suite/not_included_in_qls.expected
+++ b/cpp/ql/integration-tests/query-suite/not_included_in_qls.expected
@@ -242,6 +242,7 @@ ql/cpp/ql/src/experimental/Security/CWE/CWE-078/WordexpTainted.ql
 ql/cpp/ql/src/experimental/Security/CWE/CWE-1041/FindWrapperFunctions.ql
 ql/cpp/ql/src/experimental/Security/CWE/CWE-1126/DeclarationOfVariableWithUnnecessarilyWideScope.ql
 ql/cpp/ql/src/experimental/Security/CWE/CWE-120/MemoryUnsafeFunctionScan.ql
+ql/cpp/ql/src/experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpy.ql
 ql/cpp/ql/src/experimental/Security/CWE/CWE-1240/CustomCryptographicPrimitive.ql
 ql/cpp/ql/src/experimental/Security/CWE/CWE-125/DangerousWorksWithMultibyteOrWideCharacters.ql
 ql/cpp/ql/src/experimental/Security/CWE/CWE-190/AllocMultiplicationOverflow.ql
diff --git a/cpp/ql/lib/CHANGELOG.md b/cpp/ql/lib/CHANGELOG.md
index f5f7d195fa61..512af6062bf3 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,3 +1,61 @@
+## 12.4.0
+
+### New Features
+
+* Added support for the `__builtin_lt_synthesizes_from_spaceship`, `__builtin_gt_synthesizes_from_spaceship`, `__builtin_le_synthesizes_from_spaceship`, `__builtin_ge_synthesizes_from_spaceship`, `__builtin_is_implicit_lifetime`, `__builtin_is_structural`, and `__builtin_is_virtual_base_of` builtin operations.
+* Added a new predicate `getBitWidth` to the `Type` class, which yields the bit-width of the type.
+
+## 12.3.0
+
+### New Features
+
+* Added support for C23 bit-precise integers (`_BitInt(N)`).
+
+### Minor Analysis Improvements
+
+* Added flow summaries for the BlazingMQ `BloombergLP::bmqa::Message` and `MessageProperties` classes and their iterators.
+
+## 12.2.0
+
+### New Features
+
+* Added a C++ regular-expression parser for the ECMAScript grammar used by `std::regex`.
+
+### Minor Analysis Improvements
+
+* Added SQL-injection sink models for the Comdb2 C API functions `cdb2_run_statement` and `cdb2_run_statement_typed`.
+* Added flow summaries for the BDE codecs `BloombergLP::balber::BerDecoder`/`BerEncoder`, `BloombergLP::baljsn::Decoder`/`Encoder` and `BloombergLP::balxml::Decoder`/`Encoder`.
+* Added taint flow summaries for the BDE `bslx` byte-stream deserializers `BloombergLP::bslx::ByteInStream`, `BloombergLP::bslx::GenericInStream`, and `BloombergLP::bslx::InStreamFunctions::bdexStreamIn`.
+
+## 12.1.1
+
+### Minor Analysis Improvements
+
+* Added taint flow models for the `boost::asio::ip::basic_resolver::resolve` function.
+* Added flow summaries for the BDE `BloombergLP::bdlbb::Blob` segmented byte buffer.
+* Added flow summaries for the Protocol Buffers `google::protobuf::MessageLite` C++ API.
+
+## 12.1.0
+
+### New Features
+
+* Sources and sinks defined using models-as-data now support access paths with fields. For example, the path `ReturnValue.Field[S::f]` makes the field `S::f` a flow source when it is returned by a call.
+
+### Minor Analysis Improvements
+
+* Added the PostgreSQL libpq (asynchronous) query-execution functions `PQexec`, `PQexecParams`, `PQprepare`, `PQsendQuery`, `PQsendQueryParams`, `PQsendPrepare` as `sql-injection` sinks.
+* Initializers of compiler-generated variables are now recognized as compiler-generated. A new predicate `isCompilerGenerated` on `Initializer` has been added to reflect this.
+
+## 12.0.3
+
+No user-facing changes.
+
+## 12.0.2
+
+### Minor Analysis Improvements
+
+* Added flow source models for `RegQueryValue` and related functions from the `winreg.h` Windows header.
+
 ## 12.0.1
 
 No user-facing changes.
diff --git a/cpp/ql/lib/change-notes/2026-07-28-winreg-sources.md b/cpp/ql/lib/change-notes/2026-07-28-winreg-sources.md
deleted file mode 100644
index 9a70926b9984..000000000000
--- a/cpp/ql/lib/change-notes/2026-07-28-winreg-sources.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added flow source models for `RegQueryValue` and related functions from the `winreg.h` Windows header.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/released/12.0.2.md b/cpp/ql/lib/change-notes/released/12.0.2.md
new file mode 100644
index 000000000000..cecfb536211f
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/12.0.2.md
@@ -0,0 +1,5 @@
+## 12.0.2
+
+### Minor Analysis Improvements
+
+* Added flow source models for `RegQueryValue` and related functions from the `winreg.h` Windows header.
diff --git a/cpp/ql/lib/change-notes/released/12.0.3.md b/cpp/ql/lib/change-notes/released/12.0.3.md
new file mode 100644
index 000000000000..b86eecea8b6d
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/12.0.3.md
@@ -0,0 +1,3 @@
+## 12.0.3
+
+No user-facing changes.
diff --git a/cpp/ql/lib/change-notes/released/12.1.0.md b/cpp/ql/lib/change-notes/released/12.1.0.md
new file mode 100644
index 000000000000..a56939e92a70
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/12.1.0.md
@@ -0,0 +1,10 @@
+## 12.1.0
+
+### New Features
+
+* Sources and sinks defined using models-as-data now support access paths with fields. For example, the path `ReturnValue.Field[S::f]` makes the field `S::f` a flow source when it is returned by a call.
+
+### Minor Analysis Improvements
+
+* Added the PostgreSQL libpq (asynchronous) query-execution functions `PQexec`, `PQexecParams`, `PQprepare`, `PQsendQuery`, `PQsendQueryParams`, `PQsendPrepare` as `sql-injection` sinks.
+* Initializers of compiler-generated variables are now recognized as compiler-generated. A new predicate `isCompilerGenerated` on `Initializer` has been added to reflect this.
diff --git a/cpp/ql/lib/change-notes/released/12.1.1.md b/cpp/ql/lib/change-notes/released/12.1.1.md
new file mode 100644
index 000000000000..9f0cb4c5ad36
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/12.1.1.md
@@ -0,0 +1,7 @@
+## 12.1.1
+
+### Minor Analysis Improvements
+
+* Added taint flow models for the `boost::asio::ip::basic_resolver::resolve` function.
+* Added flow summaries for the BDE `BloombergLP::bdlbb::Blob` segmented byte buffer.
+* Added flow summaries for the Protocol Buffers `google::protobuf::MessageLite` C++ API.
diff --git a/cpp/ql/lib/change-notes/released/12.2.0.md b/cpp/ql/lib/change-notes/released/12.2.0.md
new file mode 100644
index 000000000000..63340c0ee4a4
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/12.2.0.md
@@ -0,0 +1,11 @@
+## 12.2.0
+
+### New Features
+
+* Added a C++ regular-expression parser for the ECMAScript grammar used by `std::regex`.
+
+### Minor Analysis Improvements
+
+* Added SQL-injection sink models for the Comdb2 C API functions `cdb2_run_statement` and `cdb2_run_statement_typed`.
+* Added flow summaries for the BDE codecs `BloombergLP::balber::BerDecoder`/`BerEncoder`, `BloombergLP::baljsn::Decoder`/`Encoder` and `BloombergLP::balxml::Decoder`/`Encoder`.
+* Added taint flow summaries for the BDE `bslx` byte-stream deserializers `BloombergLP::bslx::ByteInStream`, `BloombergLP::bslx::GenericInStream`, and `BloombergLP::bslx::InStreamFunctions::bdexStreamIn`.
diff --git a/cpp/ql/lib/change-notes/released/12.3.0.md b/cpp/ql/lib/change-notes/released/12.3.0.md
new file mode 100644
index 000000000000..d2527bb761f2
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/12.3.0.md
@@ -0,0 +1,9 @@
+## 12.3.0
+
+### New Features
+
+* Added support for C23 bit-precise integers (`_BitInt(N)`).
+
+### Minor Analysis Improvements
+
+* Added flow summaries for the BlazingMQ `BloombergLP::bmqa::Message` and `MessageProperties` classes and their iterators.
diff --git a/cpp/ql/lib/change-notes/released/12.4.0.md b/cpp/ql/lib/change-notes/released/12.4.0.md
new file mode 100644
index 000000000000..6467dc2b9381
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/12.4.0.md
@@ -0,0 +1,6 @@
+## 12.4.0
+
+### New Features
+
+* Added support for the `__builtin_lt_synthesizes_from_spaceship`, `__builtin_gt_synthesizes_from_spaceship`, `__builtin_le_synthesizes_from_spaceship`, `__builtin_ge_synthesizes_from_spaceship`, `__builtin_is_implicit_lifetime`, `__builtin_is_structural`, and `__builtin_is_virtual_base_of` builtin operations.
+* Added a new predicate `getBitWidth` to the `Type` class, which yields the bit-width of the type.
diff --git a/cpp/ql/lib/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
index 95ce69d8d492..6514beb79b03 100644
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 12.0.1
+lastReleaseVersion: 12.4.0
diff --git a/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/extensions/ConstantShiftExprRange.qll b/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/extensions/ConstantShiftExprRange.qll
index 3f300d7aa8d6..0f7e1ce5ed40 100644
--- a/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/extensions/ConstantShiftExprRange.qll
+++ b/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/extensions/ConstantShiftExprRange.qll
@@ -21,7 +21,7 @@ bindingset[val]
 private predicate isValidShiftExprShift(float val, Expr l) {
   val >= 0 and
   // We use getFullyConverted because the spec says to use the *promoted* left operand
-  val < (l.getFullyConverted().getUnderlyingType().getSize() * 8)
+  val < l.getFullyConverted().getUnderlyingType().getBitWidth()
 }
 
 bindingset[val, shift, max_val]
diff --git a/cpp/ql/lib/ext/Boost.Asio.model.yml b/cpp/ql/lib/ext/Boost.Asio.model.yml
index f6ba957d2596..eb6728af4124 100644
--- a/cpp/ql/lib/ext/Boost.Asio.model.yml
+++ b/cpp/ql/lib/ext/Boost.Asio.model.yml
@@ -23,3 +23,19 @@ extensions:
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
       - ["boost::asio", "", False, "buffer", "", "", "Argument[*0]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(const string &,const string &)", "", "Argument[*0..1]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(const string &,const string &,error_code &)", "", "Argument[*0..1]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(const string &,const string &,flags)", "", "Argument[*0..1]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(const string &,const string &,flags,error_code &)", "", "Argument[*0..1]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(string_view,string_view)", "", "Argument[0..1]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(string_view,string_view,error_code &)", "", "Argument[0..1]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(string_view,string_view,flags)", "", "Argument[0..1]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(string_view,string_view,flags,error_code &)", "", "Argument[0..1]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(const InternetProtocol &,const string &,const string &)", "", "Argument[*1..2]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(const InternetProtocol &,const string &,const string &,error_code &)", "", "Argument[*1..2]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(const InternetProtocol &,const string &,const string &,flags)", "", "Argument[*1..2]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(const InternetProtocol &,const string &,const string &,flags,error_code &)", "", "Argument[*1..2]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(const InternetProtocol &,string_view,string_view)", "", "Argument[1..2]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(const InternetProtocol &,string_view,string_view,error_code &)", "", "Argument[1..2]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(const InternetProtocol &,string_view,string_view,flags)", "", "Argument[1..2]", "ReturnValue", "taint", "manual"]
+      - ["boost::asio::ip", "basic_resolver<InternetProtocol>", False, "resolve", "(const InternetProtocol &,string_view,string_view,flags,error_code &)", "", "Argument[1..2]", "ReturnValue", "taint", "manual"]
\ No newline at end of file
diff --git a/cpp/ql/lib/ext/Comdb2.model.yml b/cpp/ql/lib/ext/Comdb2.model.yml
new file mode 100644
index 000000000000..7edcab128ce2
--- /dev/null
+++ b/cpp/ql/lib/ext/Comdb2.model.yml
@@ -0,0 +1,11 @@
+# Partial model of the Comdb2 C API.
+# https://bloomberg.github.io/comdb2/c_api.html
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: sinkModel
+    data: # namespace, type, subtypes, name, signature, ext, input, kind, provenance
+      # Both functions interpret the second argument as SQL. The typed variant
+      # specifies result-column types; bound parameter values are passed separately.
+      - ["", "", False, "cdb2_run_statement", "", "", "Argument[*1]", "sql-injection", "manual"]
+      - ["", "", False, "cdb2_run_statement_typed", "", "", "Argument[*1]", "sql-injection", "manual"]
diff --git a/cpp/ql/lib/ext/Postgres.model.yml b/cpp/ql/lib/ext/Postgres.model.yml
new file mode 100644
index 000000000000..5c977ebc5756
--- /dev/null
+++ b/cpp/ql/lib/ext/Postgres.model.yml
@@ -0,0 +1,16 @@
+# partial model of the PostgreSQL libpq C API
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: sinkModel
+    data: # namespace, type, subtypes, name, signature, ext, input, kind, provenance
+      # The `*Params`/`*Prepare` functions interpret their command/query text as SQL,
+      # so injection into that text is a sink even though the parameter values are
+      # passed separately. The `*Prepared` functions take a prepared-statement name
+      # rather than SQL text and are therefore not modeled here.
+      - ["", "", False, "PQexec", "", "", "Argument[*1]", "sql-injection", "manual"]
+      - ["", "", False, "PQexecParams", "", "", "Argument[*1]", "sql-injection", "manual"]
+      - ["", "", False, "PQprepare", "", "", "Argument[*2]", "sql-injection", "manual"]
+      - ["", "", False, "PQsendQuery", "", "", "Argument[*1]", "sql-injection", "manual"]
+      - ["", "", False, "PQsendQueryParams", "", "", "Argument[*1]", "sql-injection", "manual"]
+      - ["", "", False, "PQsendPrepare", "", "", "Argument[*2]", "sql-injection", "manual"]
diff --git a/cpp/ql/lib/ext/Protobuf.model.yml b/cpp/ql/lib/ext/Protobuf.model.yml
new file mode 100644
index 000000000000..02bbad0b1282
--- /dev/null
+++ b/cpp/ql/lib/ext/Protobuf.model.yml
@@ -0,0 +1,59 @@
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      # File-descriptor variants (`{Parse,Serialize}*FromFileDescriptor`) are intentionally omitted:
+      # the descriptor is an `int`, not a data buffer, so there is no buffer argument to model.
+
+      # Deserialization
+      - ["google::protobuf", "MessageLite", True, "ParseFromString", "(string_view)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParseFromString", "(const Cord &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParsePartialFromString", "(string_view)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParsePartialFromString", "(const Cord &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "MergeFromString", "(string_view)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "MergeFromString", "(const Cord &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "MergePartialFromString", "(string_view)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "MergePartialFromString", "(const Cord &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParseFromArray", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParsePartialFromArray", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParseFromCord", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParsePartialFromCord", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "MergeFromCord", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "MergePartialFromCord", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParseFromIstream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParsePartialFromIstream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParseFromZeroCopyStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParsePartialFromZeroCopyStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParseFromBoundedZeroCopyStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParsePartialFromBoundedZeroCopyStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "MergeFromBoundedZeroCopyStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "MergePartialFromBoundedZeroCopyStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParseFromCodedStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "ParsePartialFromCodedStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "MergeFromCodedStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "MergePartialFromCodedStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+
+      # Serialization
+      - ["google::protobuf", "MessageLite", True, "SerializeToString", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializePartialToString", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "AppendToString", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "AppendPartialToString", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializeToArray", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializePartialToArray", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializeToCord", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializePartialToCord", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "AppendToCord", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "AppendPartialToCord", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializeToOstream", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializePartialToOstream", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializeToZeroCopyStream", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializePartialToZeroCopyStream", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializeToCodedStream", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializePartialToCodedStream", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+
+      # Serialization returning bytes
+      - ["google::protobuf", "MessageLite", True, "SerializeAsString", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializePartialAsString", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializeAsCord", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["google::protobuf", "MessageLite", True, "SerializePartialAsCord", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
diff --git a/cpp/ql/lib/ext/balber.model.yml b/cpp/ql/lib/ext/balber.model.yml
new file mode 100644
index 000000000000..5cbc6fa71a27
--- /dev/null
+++ b/cpp/ql/lib/ext/balber.model.yml
@@ -0,0 +1,13 @@
+# Model of the BDE balber BER codec (BloombergLP::balber).
+# All overloads take the stream at argument 0 and the object at argument 1 and return int.
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      # Decoding: stream -> object
+      - ["BloombergLP::balber", "BerDecoder", true, "decode", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      - ["BloombergLP::balber", "BerDecoder", true, "decodeAny", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      # Encoding: object -> stream
+      - ["BloombergLP::balber", "BerEncoder", true, "encode", "", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::balber", "BerEncoder", true, "encodeAny", "", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
diff --git a/cpp/ql/lib/ext/baljsn.model.yml b/cpp/ql/lib/ext/baljsn.model.yml
new file mode 100644
index 000000000000..b85463dbbb2e
--- /dev/null
+++ b/cpp/ql/lib/ext/baljsn.model.yml
@@ -0,0 +1,14 @@
+# Model of the BDE baljsn JSON codec (BloombergLP::baljsn).
+# All overloads, including those taking DecoderOptions/EncoderOptions, take the stream at
+# argument 0 and the object at argument 1 and return int.
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      # Decoding: stream -> object
+      - ["BloombergLP::baljsn", "Decoder", true, "decode", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      - ["BloombergLP::baljsn", "Decoder", true, "decodeAny", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      # Encoding: object -> stream
+      - ["BloombergLP::baljsn", "Encoder", true, "encode", "", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::baljsn", "Encoder", true, "encodeAny", "", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
diff --git a/cpp/ql/lib/ext/balxml.model.yml b/cpp/ql/lib/ext/balxml.model.yml
new file mode 100644
index 000000000000..ec563089d794
--- /dev/null
+++ b/cpp/ql/lib/ext/balxml.model.yml
@@ -0,0 +1,32 @@
+# Model of the BDE balxml XML codec (BloombergLP::balxml).
+# Rows name their overload where the overloads differ in argument layout. Not modelled:
+# decode(const char *filename, TYPE *), the two-step open() + decode(TYPE *) form, and the
+# Formatter overloads.
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      # Decoding: stream -> object; the istream overloads also return the stream
+      - ["BloombergLP::balxml", "Decoder", true, "decode<TYPE>", "(istream &,TYPE *,const char *)", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Decoder", true, "decode<TYPE>", "(istream &,TYPE *,const char *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Decoder", true, "decode<TYPE>", "(streambuf *,TYPE *,const char *)", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Decoder", true, "decode<TYPE>", "(const char *,size_t,TYPE *,const char *)", "", "Argument[*0]", "Argument[*2]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Decoder", true, "decodeAny<TYPE>", "(istream &,TYPE *,const char *)", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Decoder", true, "decodeAny<TYPE>", "(istream &,TYPE *,const char *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Decoder", true, "decodeAny<TYPE>", "(streambuf *,TYPE *,const char *)", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Decoder", true, "decodeAny", "(istream &,AnyRef *,const char *)", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Decoder", true, "decodeAny", "(istream &,AnyRef *,const char *)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Decoder", true, "decodeAny", "(streambuf *,AnyRef *,const char *)", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      # Encoding: object -> stream; the ostream overloads also return the stream
+      - ["BloombergLP::balxml", "Encoder", true, "encode<TYPE>", "(streambuf *,const TYPE &)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Encoder", true, "encode<TYPE>", "(ostream &,const TYPE &)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Encoder", true, "encode<TYPE>", "(ostream &,const TYPE &)", "", "Argument[*0..1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Encoder", true, "encodeToStream", "", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Encoder", true, "encodeAny<TYPE>", "(streambuf *,const TYPE &)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Encoder", true, "encodeAny<TYPE>", "(ostream &,const TYPE &)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Encoder", true, "encodeAny<TYPE>", "(ostream &,const TYPE &)", "", "Argument[*0..1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Encoder", true, "encodeAnyToStream", "", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Encoder", true, "encodeAny", "(streambuf *,const AnyConstRef &)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Encoder", true, "encodeAny", "(ostream &,const AnyConstRef &)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::balxml", "Encoder", true, "encodeAny", "(ostream &,const AnyConstRef &)", "", "Argument[*0..1]", "ReturnValue[*]", "taint", "manual"]
diff --git a/cpp/ql/lib/ext/bdlbb.model.yml b/cpp/ql/lib/ext/bdlbb.model.yml
new file mode 100644
index 000000000000..e5c50207c464
--- /dev/null
+++ b/cpp/ql/lib/ext/bdlbb.model.yml
@@ -0,0 +1,18 @@
+# Model of the BDE bdlbb::Blob segmented byte buffer (BloombergLP::bdlbb).
+# Lets taint reach a blob's payload bytes, e.g. a message body filled by bmqa::Message::getData.
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      # Accessor chain
+      - ["BloombergLP::bdlbb", "Blob", true, "buffer", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bdlbb", "BlobBuffer", true, "data", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bdlbb", "BlobBuffer", true, "buffer", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      # BlobUtil read-out
+      - ["BloombergLP::bdlbb", "BlobUtil", true, "copy", "(char *,const Blob &,int,int)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bdlbb", "BlobUtil", true, "getContiguousRangeOrCopy", "", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bdlbb", "BlobUtil", true, "getContiguousRangeOrCopy", "", "", "Argument[*1]", "ReturnValue[*]", "taint", "manual"]
+      # BlobUtil write-in
+      - ["BloombergLP::bdlbb", "BlobUtil", true, "copy", "(Blob *,int,const char *,int)", "", "Argument[*2]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bdlbb", "BlobUtil", true, "copy", "(Blob *,int,const Blob &,int,int)", "", "Argument[*2]", "Argument[*0]", "taint", "manual"]
diff --git a/cpp/ql/lib/ext/bmqa.model.yml b/cpp/ql/lib/ext/bmqa.model.yml
new file mode 100644
index 000000000000..d5bfbf675e18
--- /dev/null
+++ b/cpp/ql/lib/ext/bmqa.model.yml
@@ -0,0 +1,51 @@
+# Model of the BlazingMQ client API (BloombergLP::bmqa). Scalar property getters are not modelled.
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      # Message payload
+      - ["BloombergLP::bmqa", "Message", true, "getData", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "Message", true, "setData", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "Message", true, "setData", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "Message", true, "setData", "", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "Message", true, "setDataRef", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "Message", true, "setDataRef", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "Message", true, "setDataRef", "", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "Message", true, "clone", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      # Message properties
+      - ["BloombergLP::bmqa", "Message", true, "loadProperties", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "Message", true, "setPropertiesRef", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "Message", true, "setPropertiesRef", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "Message", true, "setPropertiesRef", "", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "MessageProperties", "(const MessageProperties &,Allocator *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "operator=", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "operator=", "", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "getPropertyAsString", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "getPropertyAsBinary", "", "", "Argument[-1]", "ReturnValue[*].Element", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "getPropertyAsStringOr", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "getPropertyAsStringOr", "", "", "Argument[*1]", "ReturnValue[*]", "value", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "getPropertyAsBinaryOr", "", "", "Argument[-1]", "ReturnValue[*].Element", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "getPropertyAsBinaryOr", "", "", "Argument[*1].Element[@]", "ReturnValue[*].Element[@]", "value", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "setPropertyAsString", "", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "setPropertyAsBinary", "", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
+      # Property names are stored and exposed by MessagePropertiesIterator::name
+      - ["BloombergLP::bmqa", "MessageProperties", true, "setPropertyAsBool", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "setPropertyAsChar", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "setPropertyAsShort", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "setPropertyAsInt32", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "setPropertyAsInt64", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "setPropertyAsString", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "setPropertyAsBinary", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "streamIn", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageProperties", true, "streamOut", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      # Property iteration
+      - ["BloombergLP::bmqa", "MessagePropertiesIterator", true, "MessagePropertiesIterator", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessagePropertiesIterator", true, "operator=", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["BloombergLP::bmqa", "MessagePropertiesIterator", true, "operator=", "", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
+      - ["BloombergLP::bmqa", "MessagePropertiesIterator", true, "name", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessagePropertiesIterator", true, "getAsString", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessagePropertiesIterator", true, "getAsBinary", "", "", "Argument[-1]", "ReturnValue[*].Element", "taint", "manual"]
+      # Event -> iterator -> message
+      - ["BloombergLP::bmqa", "MessageEvent", true, "messageIterator", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["BloombergLP::bmqa", "MessageIterator", true, "message", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
diff --git a/cpp/ql/lib/ext/bslx.model.yml b/cpp/ql/lib/ext/bslx.model.yml
new file mode 100644
index 000000000000..11732ff5e4b2
--- /dev/null
+++ b/cpp/ql/lib/ext/bslx.model.yml
@@ -0,0 +1,140 @@
+# Model of the BDE `bslx` byte-stream deserializers (BloombergLP::bslx).
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      # bslx::ByteInStream
+      - ["BloombergLP::bslx", "ByteInStream", true, "ByteInStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      # Input-taking resets replace the buffer; reset() only rewinds it.
+      - ["BloombergLP::bslx", "ByteInStream", true, "reset", "(const char *,size_t)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "reset", "(const StringRef &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      # bslx::ByteInStream getters.
+      # Scalar getters (getLength, getVersion, getInt*, getUint*, getFloat*) are not modeled,
+      # as we are generally not interested in tainted scalar values.
+      - ["BloombergLP::bslx", "ByteInStream", true, "getString", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt8", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint8", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt16", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint16", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt24", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint24", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt32", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint32", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt40", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint40", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt48", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint48", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt56", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint56", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt64", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint64", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayFloat32", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayFloat64", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      # bslx::ByteInStream fluent interface
+      - ["BloombergLP::bslx", "ByteInStream", true, "getLength", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getVersion", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getInt8", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getUint8", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getInt16", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getUint16", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getInt24", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getUint24", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getInt32", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getUint32", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getInt40", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getUint40", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getInt48", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getUint48", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getInt56", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getUint56", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getInt64", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getUint64", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getFloat32", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getFloat64", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getString", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt8", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint8", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt16", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint16", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt24", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint24", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt32", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint32", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt40", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint40", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt48", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint48", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt56", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint56", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayInt64", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayUint64", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayFloat32", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "ByteInStream", true, "getArrayFloat64", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      # bslx::GenericInStream
+      - ["BloombergLP::bslx", "GenericInStream", true, "GenericInStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      # bslx::GenericInStream getters.
+      # Scalar getters (getLength, getVersion, getInt*, getUint*, getFloat*) are not modeled,
+      # as we are generally not interested in tainted scalar values.
+      - ["BloombergLP::bslx", "GenericInStream", true, "getString", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt8", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint8", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt16", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint16", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt24", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint24", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt32", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint32", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt40", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint40", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt48", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint48", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt56", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint56", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt64", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint64", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayFloat32", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayFloat64", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      # bslx::GenericInStream fluent interface
+      - ["BloombergLP::bslx", "GenericInStream", true, "getLength", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getVersion", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getInt8", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getUint8", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getInt16", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getUint16", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getInt24", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getUint24", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getInt32", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getUint32", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getInt40", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getUint40", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getInt48", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getUint48", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getInt56", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getUint56", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getInt64", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getUint64", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getFloat32", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getFloat64", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getString", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt8", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint8", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt16", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint16", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt24", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint24", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt32", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint32", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt40", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint40", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt48", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint48", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt56", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint56", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayInt64", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayUint64", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayFloat32", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["BloombergLP::bslx", "GenericInStream", true, "getArrayFloat64", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      # bslx::InStreamFunctions::bdexStreamIn
+      - ["BloombergLP::bslx::InStreamFunctions", "", false, "bdexStreamIn", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      - ["BloombergLP::bslx::InStreamFunctions", "", false, "bdexStreamIn", "", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
diff --git a/cpp/ql/lib/ext/empty.model.yml b/cpp/ql/lib/ext/empty.model.yml
index e5202b5ad73c..9c2921cfef1b 100644
--- a/cpp/ql/lib/ext/empty.model.yml
+++ b/cpp/ql/lib/ext/empty.model.yml
@@ -21,3 +21,7 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: []
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: forwardsModel
+    data: []
\ No newline at end of file
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index 2932987ec152..9d3f8acde278 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 12.0.2-dev
+version: 12.4.1-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
@@ -10,6 +10,7 @@ dependencies:
   codeql/mad: ${workspace}
   codeql/quantum: ${workspace}
   codeql/rangeanalysis: ${workspace}
+  codeql/regex: ${workspace}
   codeql/ssa: ${workspace}
   codeql/typeflow: ${workspace}
   codeql/tutorial: ${workspace}
diff --git a/cpp/ql/lib/semmle/code/cpp/Enum.qll b/cpp/ql/lib/semmle/code/cpp/Enum.qll
index 38263dacf7ac..6b30d7921157 100644
--- a/cpp/ql/lib/semmle/code/cpp/Enum.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Enum.qll
@@ -55,6 +55,12 @@ class Enum extends UserType, IntegralOrEnumType {
     not exists(UserType.super.getSize()) and result = 4
   }
 
+  override int getBitWidth() {
+    result = UserType.super.getBitWidth()
+    or
+    not exists(UserType.super.getBitWidth()) and result = 32
+  }
+
   /** See `Type.isDeeplyConst` and `Type.isDeeplyConstBelow`. Internal. */
   override predicate isDeeplyConstBelow() { any() } // No subparts
 
diff --git a/cpp/ql/lib/semmle/code/cpp/Initializer.qll b/cpp/ql/lib/semmle/code/cpp/Initializer.qll
index 5748ab505e7c..6f03ec84116b 100644
--- a/cpp/ql/lib/semmle/code/cpp/Initializer.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Initializer.qll
@@ -54,4 +54,15 @@ class Initializer extends ControlFlowNode, @initialiser {
 
   /** Holds if the initializer used the C++ braced initializer notation. */
   predicate isBraced() { braced_initialisers(underlyingElement(this)) }
+
+  /** Holds if this initializer is generated by the compiler. */
+  predicate isCompilerGenerated() {
+    exists(Variable v |
+      v = this.getDeclaration() and
+      // We require the variable to be an orphan to not mark the initializer
+      // from a desugared ranged for loop as compiler generated.
+      orphaned_variables(unresolveElement(v), _) and
+      v.isCompilerGenerated()
+    )
+  }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/Type.qll b/cpp/ql/lib/semmle/code/cpp/Type.qll
index 4069b58134be..78367dbf7be4 100644
--- a/cpp/ql/lib/semmle/code/cpp/Type.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Type.qll
@@ -123,6 +123,16 @@ class Type extends Locatable, @type {
     usertypesize(underlyingElement(this), result, _)
   }
 
+  /**
+   * Gets the bit width of this type.
+   */
+  int getBitWidth() {
+    not bit_precise_int_types(underlyingElement(this), _) and
+    result = this.getSize() * 8
+    or
+    bit_precise_int_types(underlyingElement(this), result)
+  }
+
   /**
    * Gets the alignment of this type in bytes.
    */
@@ -398,6 +408,8 @@ private predicate isIntegralType(@builtintype type, int kind) {
     kind = 44
     or
     kind = 51
+    or
+    67 <= kind and kind <= 69
   )
 }
 
@@ -484,6 +496,12 @@ private predicate integralTypeMapping(int original, int canonical, int unsigned,
   original = 44 and canonical = 44 and unsigned = -1 and signed = -1 // char32_t
   or
   original = 51 and canonical = 51 and unsigned = -1 and signed = -1 // char8_t
+  or
+  original = 67 and canonical = 67 and unsigned = 68 and signed = 69 // _BitInt(N)
+  or
+  original = 68 and canonical = 68 and unsigned = 68 and signed = 69 // unsigned _BitInt(N)
+  or
+  original = 69 and canonical = 67 and unsigned = 68 and signed = 69 // signed _BitInt(N)
 }
 
 /**
@@ -517,7 +535,8 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
     builtintypes(underlyingElement(this), _, 13, _, _, _) or
     builtintypes(underlyingElement(this), _, 16, _, _, _) or
     builtintypes(underlyingElement(this), _, 19, _, _, _) or
-    builtintypes(underlyingElement(this), _, 37, _, _, _)
+    builtintypes(underlyingElement(this), _, 37, _, _, _) or
+    builtintypes(underlyingElement(this), _, 69, _, _, _)
   }
 
   /** Holds if this integral type is explicitly unsigned. */
@@ -527,7 +546,8 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
     builtintypes(underlyingElement(this), _, 12, _, _, _) or
     builtintypes(underlyingElement(this), _, 15, _, _, _) or
     builtintypes(underlyingElement(this), _, 18, _, _, _) or
-    builtintypes(underlyingElement(this), _, 36, _, _, _)
+    builtintypes(underlyingElement(this), _, 36, _, _, _) or
+    builtintypes(underlyingElement(this), _, 68, _, _, _)
   }
 
   /** Holds if this integral type is implicitly signed. */
@@ -537,7 +557,8 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
     builtintypes(underlyingElement(this), _, 11, _, -1, _) or
     builtintypes(underlyingElement(this), _, 14, _, -1, _) or
     builtintypes(underlyingElement(this), _, 17, _, -1, _) or
-    builtintypes(underlyingElement(this), _, 35, _, -1, _)
+    builtintypes(underlyingElement(this), _, 35, _, -1, _) or
+    builtintypes(underlyingElement(this), _, 67, _, -1, _)
   }
 
   /**
@@ -547,7 +568,14 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
   IntegralType getUnsigned() {
     exists(int unsignedKind |
       integralTypeMapping(kind, _, unsignedKind, _) and
-      builtintypes(unresolveElement(result), _, unsignedKind, _, _, _)
+      builtintypes(unresolveElement(result), _, unsignedKind, _, _, _) and
+      (
+        not kind in [67, 68, 69]
+        or
+        exists(int bitWidth | bit_precise_int_types(underlyingElement(this), bitWidth) |
+          bit_precise_int_types(unresolveElement(result), bitWidth)
+        )
+      )
     )
   }
 
@@ -562,7 +590,14 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
   IntegralType getCanonicalArithmeticType() {
     exists(int canonicalKind |
       integralTypeMapping(kind, canonicalKind, _, _) and
-      builtintypes(unresolveElement(result), _, canonicalKind, _, _, _)
+      builtintypes(unresolveElement(result), _, canonicalKind, _, _, _) and
+      (
+        not kind in [67, 68, 69]
+        or
+        exists(int bitWidth | bit_precise_int_types(underlyingElement(this), bitWidth) |
+          bit_precise_int_types(unresolveElement(result), bitWidth)
+        )
+      )
     )
   }
 }
@@ -1045,6 +1080,15 @@ class Char32Type extends IntegralType {
   override string getAPrimaryQlClass() { result = "Char32Type" }
 }
 
+/**
+ * A C23 bit-precise integer type `_BitInt(N)`.
+ */
+class BitPreciseIntType extends IntegralType {
+  BitPreciseIntType() { builtintypes(underlyingElement(this), _, [67, 68, 69], _, _, _) }
+
+  override string getAPrimaryQlClass() { result = "BitPreciseIntType" }
+}
+
 /**
  * The (primitive) type of the C++11 `nullptr` constant.  It is a
  * distinct type, denoted by `decltype(nullptr)`, that is not itself a pointer
@@ -1145,6 +1189,8 @@ class Decltype extends Type, NameQualifyingElement {
 
   override int getSize() { result = this.getBaseType().getSize() }
 
+  override int getBitWidth() { result = this.getBaseType().getBitWidth() }
+
   override int getAlignment() { result = this.getBaseType().getAlignment() }
 
   override int getPointerIndirectionLevel() {
@@ -1205,6 +1251,8 @@ class TypeofType extends Type {
 
   override int getSize() { result = this.getBaseType().getSize() }
 
+  override int getBitWidth() { result = this.getBaseType().getBitWidth() }
+
   override int getAlignment() { result = this.getBaseType().getAlignment() }
 
   override int getPointerIndirectionLevel() {
@@ -1350,6 +1398,8 @@ class IntrinsicTransformedType extends Type {
 
   override int getSize() { result = this.getBaseType().getSize() }
 
+  override int getBitWidth() { result = this.getBaseType().getBitWidth() }
+
   override int getAlignment() { result = this.getBaseType().getAlignment() }
 
   override int getPointerIndirectionLevel() {
@@ -1475,6 +1525,8 @@ class SpecifiedType extends DerivedType {
 
   override int getSize() { result = this.getBaseType().getSize() }
 
+  override int getBitWidth() { result = this.getBaseType().getBitWidth() }
+
   override int getAlignment() { result = this.getBaseType().getAlignment() }
 
   override int getPointerIndirectionLevel() {
@@ -1550,6 +1602,8 @@ class ArrayType extends DerivedType {
    */
   override int getSize() { result = this.getByteSize() }
 
+  override int getBitWidth() { result = this.getByteSize() * 8 }
+
   override string explain() {
     if exists(this.getArraySize())
     then
diff --git a/cpp/ql/lib/semmle/code/cpp/TypedefType.qll b/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
index 69eb8f881d29..70aa933d6a2d 100644
--- a/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
+++ b/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
@@ -26,6 +26,8 @@ class TypedefType extends UserType {
 
   override int getSize() { result = this.getBaseType().getSize() }
 
+  override int getBitWidth() { result = this.getBaseType().getBitWidth() }
+
   override int getAlignment() { result = this.getBaseType().getAlignment() }
 
   override int getPointerIndirectionLevel() {
diff --git a/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll b/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll
index 624465761c2c..dfda2f4796c5 100644
--- a/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll
+++ b/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll
@@ -1193,7 +1193,7 @@ class FormatLiteral extends Literal instanceof StringLiteral {
           // Subtract one in the exponent because one bit is for the sign.
           // Add 1 to account for the possible sign in the output.
           typeBasedBound =
-            1 + lengthInBase10(2.pow(this.getIntegralDisplayType(n).getSize() * 8 - 1)) and
+            1 + lengthInBase10(2.pow(this.getIntegralDisplayType(n).getBitWidth() - 1)) and
           // The second case uses range analysis to deduce a length that's shorter than the length
           // of the number -2^31.
           exists(Expr arg, float lower, float upper |
@@ -1227,7 +1227,7 @@ class FormatLiteral extends Literal instanceof StringLiteral {
         // e.g. 2^32 - 1 = "4294967295"
         exists(float typeBasedBound, float valueBasedBound |
           // The first case handles length sub-specifiers
-          typeBasedBound = lengthInBase10(2.pow(this.getIntegralDisplayType(n).getSize() * 8) - 1) and
+          typeBasedBound = lengthInBase10(2.pow(this.getIntegralDisplayType(n).getBitWidth()) - 1) and
           // The second case uses range analysis to deduce a length that's shorter than
           // the length of the number 2^31 - 1.
           exists(Expr arg, float lower, float upper |
@@ -1239,7 +1239,7 @@ class FormatLiteral extends Literal instanceof StringLiteral {
               lengthInBase10(max(float cand |
                   // If lower can be negative we use `(unsigned)-1` as the candidate value.
                   lower < 0 and
-                  cand = 2.pow(any(IntType t | t.isUnsigned()).getSize() * 8)
+                  cand = 2.pow(any(IntType t | t.isUnsigned()).getBitWidth())
                   or
                   cand = upper
                 )) and
@@ -1275,7 +1275,7 @@ class FormatLiteral extends Literal instanceof StringLiteral {
               lengthInBase16(max(float cand |
                   // If lower can be negative we use `(unsigned)-1` as the candidate value.
                   lower < 0 and
-                  cand = 2.pow(any(IntType t | t.isUnsigned()).getSize() * 8)
+                  cand = 2.pow(any(IntType t | t.isUnsigned()).getBitWidth())
                   or
                   cand = upper
                 )) and
@@ -1304,12 +1304,12 @@ class FormatLiteral extends Literal instanceof StringLiteral {
         exists(int sizeBits, int baseLen |
           sizeBits =
             min(int bits |
-              bits = this.getIntegralDisplayType(n).getSize() * 8
+              bits = this.getIntegralDisplayType(n).getBitWidth()
               or
               exists(IntegralType t |
                 t = this.getUse().getConversionArgument(n).getType().getUnderlyingType()
               |
-                t.isUnsigned() and bits = t.getSize() * 8
+                t.isUnsigned() and bits = t.getBitWidth()
               )
             ) and
           baseLen = (sizeBits / 3.0).ceil() and
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll
index 84e96fa9c468..5329fb92a5a4 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll
@@ -344,12 +344,12 @@ private int convertIntToType(int val, IntegralType t) {
   then if val = 0 then result = 0 else result = 1
   else
     if t.isUnsigned()
-    then val >= 0 and val.bitShiftRight(t.getSize() * 8) = 0 and result = val
+    then val >= 0 and val.bitShiftRight(t.getBitWidth()) = 0 and result = val
     else
-      if val >= 0 and val.bitShiftRight(t.getSize() * 8 - 1) = 0
+      if val >= 0 and val.bitShiftRight(t.getBitWidth() - 1) = 0
       then result = val
       else (
-        (-(val + 1)).bitShiftRight(t.getSize() * 8 - 1) = 0 and result = val
+        (-(val + 1)).bitShiftRight(t.getBitWidth() - 1) = 0 and result = val
       )
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
index 29da7f7204c0..ee894f95648f 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
@@ -15,6 +15,8 @@
  *   `namespace; type; subtypes; name; signature; ext; output; kind; provenance`
  * - BarrierGuards:
  *   `namespace; type; subtypes; name; signature; ext; input; acceptingValue; kind; provenance`
+ * - Forwards:
+ *   `namespace; type; subtypes; name; signature; ext; start; constructor; output; provenance`
  *
  * The interpretation of a row is similar to API-graphs with a left-to-right
  * reading.
@@ -108,12 +110,23 @@
  *    - "manual": The model has been written by hand.
  *    This information is used in a heuristic for dataflow analysis to determine, if a
  *    model or source code should be used for determining flow.
+ *
+ * The "Forwards" relation allows modeling of function that perform C++11-style "perfect
+ * forwarding" where a function receives a number of arguments and forwards those arguments
+ * to a constructor of another type. For example, the row:
+ * `"std"; "vector<T>"; "True"; "emplace"; ""; ""; "1"; T; Argument[-1].Element; manual`
+ * says that `std::vector<T>::emplace(arg0, arg1, ..., argn)` forwards arguments
+ * `arg1, ..., argn` to a constructor for `T`, and the result of `T(arg1, ..., argn)`
+ * flows to `Argument[-1].Element` (see information about the semantics of the `output`
+ * column further above).
  */
 
 import cpp
 private import new.DataFlow
 private import semmle.code.cpp.controlflow.IRGuards
+private import semmle.code.cpp.ir.dataflow.internal.DataFlowNodes as Nodes
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate as Private
+private import semmle.code.cpp.ir.dataflow.internal.SsaImpl as SsaImpl
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowUtil
 private import internal.FlowSummaryImpl
 private import internal.FlowSummaryImpl::Public
@@ -159,6 +172,20 @@ predicate summaryModel(
   )
 }
 
+/**
+ * Holds if a forward model exists for the given parameters.
+ */
+predicate forwardsModel(
+  string namespace, string type, boolean subtypes, string name, string signature, string ext,
+  string start, string constructor, string output, string provenance, string model
+) {
+  exists(QlBuiltins::ExtensionId madId |
+    Extensions::forwardsModel(namespace, type, subtypes, name, signature, ext, start, constructor,
+      output, provenance, madId) and
+    model = "MaD:" + madId.toString()
+  )
+}
+
 /** Provides a query predicate to check the data for validation errors. */
 module ModelValidation {
   private string getInvalidModelInput() {
@@ -185,6 +212,8 @@ module ModelValidation {
       sourceModel(_, _, _, _, _, _, output, _, _, _) and pred = "source"
       or
       summaryModel(_, _, _, _, _, _, _, output, _, _, _) and pred = "summary"
+      or
+      forwardsModel(_, _, _, _, _, _, _, _, output, _, _) and pred = "forwards"
     |
       invalidSpecComponent(output, part) and
       not part = "" and
@@ -258,7 +287,8 @@ private predicate elementSpec(
   sinkModel(namespace, type, subtypes, name, signature, ext, _, _, _, _) or
   barrierModel(namespace, type, subtypes, name, signature, ext, _, _, _, _) or
   barrierGuardModel(namespace, type, subtypes, name, signature, ext, _, _, _, _, _) or
-  summaryModel(namespace, type, subtypes, name, signature, ext, _, _, _, _, _)
+  summaryModel(namespace, type, subtypes, name, signature, ext, _, _, _, _, _) or
+  forwardsModel(namespace, type, subtypes, name, signature, ext, _, _, _, _, _)
 }
 
 /**
@@ -595,6 +625,14 @@ private string getAtIndex(string s, int i) {
   not (s = "" and i = 0)
 }
 
+/** Gets the number of comma-separated arguments in `s`. */
+bindingset[s]
+private int getNumberOfArguments(string s) {
+  s = "" and result = 0
+  or
+  s != "" and result = count(s.indexOf(",")) + 1
+}
+
 /**
  * Normalizes `partiallyNormalizedSignature` by replacing the `remaining`
  * number of template arguments in `partiallyNormalizedSignature` with their
@@ -604,7 +642,7 @@ private string getSignatureWithoutClassTemplateNames(
   string partiallyNormalizedSignature, string typeArgs, string nameArgs, int remaining
 ) {
   elementSpecWithArguments0(_, _, _, partiallyNormalizedSignature, typeArgs, nameArgs) and
-  remaining = count(partiallyNormalizedSignature.indexOf(",")) + 1 and
+  remaining = getNumberOfArguments(typeArgs) and
   result = partiallyNormalizedSignature
   or
   exists(string mid |
@@ -618,7 +656,7 @@ private string getSignatureWithoutClassTemplateNames(
     )
     or
     // Make sure `remaining` is properly bound
-    remaining = [0 .. count(partiallyNormalizedSignature.indexOf(",")) + 1] and
+    remaining = [0 .. getNumberOfArguments(typeArgs)] and
     not exists(getAtIndex(typeArgs, remaining)) and
     result = mid
   )
@@ -635,7 +673,7 @@ pragma[nomagic]
 private string getSignatureWithoutFunctionTemplateNames(
   string partiallyNormalizedSignature, string typeArgs, string nameArgs, int remaining
 ) {
-  remaining = count(partiallyNormalizedSignature.indexOf(",")) + 1 and
+  remaining = getNumberOfArguments(nameArgs) and
   result =
     getSignatureWithoutClassTemplateNames(partiallyNormalizedSignature, typeArgs, nameArgs, 0)
   or
@@ -650,7 +688,7 @@ private string getSignatureWithoutFunctionTemplateNames(
     )
     or
     // Make sure `remaining` is properly bound
-    remaining = [0 .. count(partiallyNormalizedSignature.indexOf(",")) + 1] and
+    remaining = [0 .. getNumberOfArguments(nameArgs)] and
     not exists(getAtIndex(nameArgs, remaining)) and
     result = mid
   )
@@ -952,9 +990,7 @@ private module Cached {
    */
   cached
   predicate sourceNode(DataFlow::Node node, string kind, string model) {
-    exists(SourceSinkInterpretationInput::InterpretNode n |
-      isSourceNode(n, kind, model) and n.asNode() = node
-    )
+    node.(Nodes::FlowSummaryNode).isSource(kind, model)
   }
 
   /**
@@ -963,9 +999,7 @@ private module Cached {
    */
   cached
   predicate sinkNode(DataFlow::Node node, string kind, string model) {
-    exists(SourceSinkInterpretationInput::InterpretNode n |
-      isSinkNode(n, kind, model) and n.asNode() = node
-    )
+    node.(Nodes::FlowSummaryNode).isSink(kind, model)
   }
 
   private newtype TKindModelPair =
@@ -1049,6 +1083,538 @@ private module Cached {
 
 import Cached
 
+/** Gets the constructor type selected by `constructorType` in a forwarding model. */
+private Type getForwardedConstructorType(
+  Function forwarder, string namespace, string type, boolean subtypes, string name,
+  string signature, string ext, string constructorType
+) {
+  forwardsModel(namespace, type, subtypes, name, signature, ext, _, constructorType, _, _, _) and
+  forwarder = interpretElement(namespace, type, subtypes, name, signature, ext) and
+  (
+    exists(string typeArguments, int index |
+      parseAngles(type, _, typeArguments, "") and
+      constructorType = getAtIndex(typeArguments, index) and
+      result = forwarder.getDeclaringType().getTemplateArgument(index)
+    )
+    or
+    exists(string nameArguments, int index |
+      parseAngles(name, _, nameArguments, "") and
+      constructorType = getAtIndex(nameArguments, index) and
+      result = forwarder.getTemplateArgument(index)
+    )
+    or
+    exists(TypedefType member |
+      member = forwarder.getDeclaringType().getAMember() and
+      member.hasName(constructorType) and
+      result = member.getUnderlyingType()
+    )
+  )
+}
+
+/** Interprets a forwarding model, retaining its constructed type, output, and provenance. */
+private predicate interpretForwardsModelType(
+  Function forwarder, Type constructedType, int start, string output, string provenance,
+  string model
+) {
+  exists(
+    string namespace, string type, boolean subtypes, string name, string signature, string ext,
+    string startString, string constructorType
+  |
+    forwardsModel(namespace, type, subtypes, name, signature, ext, startString, constructorType,
+      output, provenance, model) and
+    forwarder = interpretElement(namespace, type, subtypes, name, signature, ext) and
+    start = startString.toInt()
+  |
+    // Either the row specifies forwarding to a type given by the type or
+    // function template, in which case we need to resolve that from the type
+    // or function name.
+    constructedType =
+      getForwardedConstructorType(forwarder, namespace, type, subtypes, name, signature, ext,
+        constructorType).getUnspecifiedType()
+    or
+    // Or the row specifies forwarding to a specific type.
+    not exists(
+      getForwardedConstructorType(forwarder, namespace, type, subtypes, name, signature, ext,
+        constructorType)
+    ) and
+    classHasQualifiedName(constructedType, namespace, constructorType)
+  )
+}
+
+/**
+ * Holds if `forwarder` may forward its arguments starting at `start` to a
+ * constructor of `c`. The actual constructor being forwarded to depends on the
+ * types of arguments from `start` at calls to `forwarder`.
+ */
+private predicate interpretForwardsModel(
+  Function forwarder, Class c, int start, string output, string provenance, string model
+) {
+  interpretForwardsModelType(forwarder, c, start, output, provenance, model)
+}
+
+/**
+ * Holds if `forwarder` forwards its arguments starting at `start` to a
+ * constructor of `c`.
+ */
+predicate forwards(Function forwarder, Class c, int start) {
+  interpretForwardsModel(forwarder, c, start, _, _, _)
+}
+
+private int referenceIndirection(Type unspecified) {
+  if unspecified instanceof ReferenceType then result = 1 else result = 0
+}
+
+/** Gets `unspecified`, but with its outermost reference removed, if any. */
+private Type stripReference(Type unspecified) {
+  result = unspecified.(ReferenceType).getBaseType().getUnspecifiedType()
+  or
+  not unspecified instanceof ReferenceType and
+  result = unspecified
+}
+
+/**
+ * Encapsulates predicates used to compute which constructor a perfect
+ * forwarding function targets.
+ */
+module ConstructorForwarding {
+  private import codeql.util.Boolean
+
+  private class ConvertingConstructor extends Constructor {
+    Type fromType;
+
+    ConvertingConstructor() {
+      not this.isFromUninstantiatedTemplate(_) and
+      not this.isExplicit() and
+      not this.isDeleted() and
+      not this instanceof CopyConstructor and
+      not this instanceof MoveConstructor and
+      fromType = this.getParameter(0).getUnderlyingType() and
+      forall(int index | index > 0 and exists(this.getParameter(index)) |
+        this.getParameter(index).hasInitializer()
+      )
+    }
+
+    Type getUnderlyingFromType() { result = fromType }
+  }
+
+  private Type getForwardedArgumentType(Function forwarder, int start, int i) {
+    forwards(forwarder, _, start) and
+    i = [0 .. forwarder.getNumberOfParameters() - start - 1] and
+    result = forwarder.getParameter(start + i).getUnderlyingType()
+  }
+
+  private Type getConstructorParameterType(Cpp::Constructor constructor, int i) {
+    forwards(_, constructor.getDeclaringType(), _) and
+    result = constructor.getParameter(i).getUnderlyingType()
+  }
+
+  private newtype ValueCategory =
+    LValue() or
+    XValue() or
+    PRValue()
+
+  bindingset[t1, t2]
+  pragma[inline_late]
+  private predicate preservesQualifiers(Type t1, Type t2) {
+    (t1.isConst() implies t2.isConst()) and
+    (t1.isVolatile() implies t2.isVolatile())
+  }
+
+  private predicate baseTypeCompatible(Type arg, Type param) {
+    param.stripTopLevelSpecifiers() = arg.stripTopLevelSpecifiers().(Class).getABaseClass+() and
+    preservesQualifiers(arg, param)
+  }
+
+  private predicate voidType(Type t) { t.stripTopLevelSpecifiers() instanceof VoidType }
+
+  private predicate routineType(Type t) { t.stripTopLevelSpecifiers() instanceof RoutineType }
+
+  private predicate pointerConversion(Cpp::PointerType arg, Cpp::PointerType param) {
+    exists(Type argBase, Type paramBase |
+      argBase = arg.getBaseType() and
+      paramBase = param.getBaseType()
+    |
+      baseTypeCompatible(argBase, paramBase)
+      or
+      voidType(paramBase) and
+      not routineType(argBase) and
+      preservesQualifiers(argBase, paramBase)
+    )
+  }
+
+  private predicate nullPointerConversion(Type t) {
+    t instanceof Cpp::PointerType or t instanceof FunctionPointerType
+  }
+
+  private predicate booleanConversion(Type t) {
+    t instanceof Cpp::PointerType
+    or
+    t instanceof FunctionPointerType
+    or
+    t instanceof Cpp::ArrayType
+    or
+    t instanceof RoutineType
+  }
+
+  private predicate referenceAcceptsCategory(Cpp::ReferenceType t, ValueCategory category) {
+    if t instanceof Cpp::LValueReferenceType
+    then
+      category = LValue()
+      or
+      exists(Type base |
+        base = t.getBaseType() and
+        base.isConst() and
+        not base.isVolatile()
+      )
+    else category != LValue()
+  }
+
+  /**
+   * Tracks the ordering of standard conversions. All phases allow parameter matching
+   * and, if none has been used, a user-defined conversion that resets to `Initial()`.
+   */
+  private newtype Phase =
+    // Allows array/function decay, a value or base-class conversion, or pointer qualification.
+    Initial() or
+    // Allows a value or base-class conversion or pointer qualification, but no further decay.
+    AfterTransformation() or
+    // Allows only pointer qualification among the remaining conversion steps.
+    AfterValueConversion() or
+    // Allows no further conversion steps.
+    AfterQualification()
+
+  private predicate isUnderlyingType(Type type) { type = type.getUnderlyingType() }
+
+  private newtype TTypeState =
+    MkTypeState(Type type, ValueCategory category, Boolean conversionUsed, Phase phase) {
+      not type instanceof Cpp::ReferenceType and
+      not type instanceof FunctionReferenceType and
+      isUnderlyingType(type)
+    }
+
+  private ValueCategory getCategoryForRef(Cpp::ReferenceType reference) {
+    reference instanceof Cpp::LValueReferenceType and result = LValue()
+    or
+    reference instanceof Cpp::RValueReferenceType and result = XValue()
+  }
+
+  private Type getValueType(Type t, ValueCategory category) {
+    result = t.(FunctionReferenceType).getBaseType().getUnderlyingType() and
+    category = LValue()
+    or
+    result = t.(Cpp::ReferenceType).getBaseType().getUnderlyingType() and
+    category = getCategoryForRef(t)
+    or
+    not t instanceof FunctionReferenceType and
+    not t instanceof Cpp::ReferenceType and
+    result = t and
+    category = PRValue()
+  }
+
+  bindingset[arg, param]
+  pragma[inline_late]
+  private predicate qualificationCompatible(Type arg, Type param) {
+    arg.stripTopLevelSpecifiers() = param.stripTopLevelSpecifiers() and
+    preservesQualifiers(arg, param)
+  }
+
+  private class TypeState extends TTypeState {
+    Type getType() { this = MkTypeState(result, _, _, _) }
+
+    ValueCategory getCategory() { this = MkTypeState(_, result, _, _) }
+
+    Phase getPhase() { this = MkTypeState(_, _, _, result) }
+
+    /** Holds if this state's phase permits a value or base-class conversion. */
+    predicate canConvertValue() {
+      this.getPhase() = Initial() or this.getPhase() = AfterTransformation()
+    }
+
+    predicate hasNotUsedConversion() { this = MkTypeState(_, _, false, _) }
+
+    string toString() { result = this.getType().toString() }
+
+    predicate isSource(Type argType) {
+      argType = getForwardedArgumentType(_, _, _) and
+      exists(ValueCategory category |
+        this = MkTypeState(getValueType(argType, category), category, false, Initial())
+      )
+    }
+
+    predicate matchesParameter(Type paramType) {
+      exists(Type base | base = paramType.(Cpp::ReferenceType).getBaseType() |
+        qualificationCompatible(this.getType(), base) and
+        referenceAcceptsCategory(paramType, this.getCategory())
+      )
+      or
+      not paramType instanceof Cpp::ReferenceType and
+      this.getType().stripTopLevelSpecifiers() = paramType.stripTopLevelSpecifiers()
+    }
+
+    predicate isSink(Type paramType, Cpp::Constructor constructor) {
+      paramType = getConstructorParameterType(constructor, _) and
+      this.matchesParameter(paramType)
+    }
+  }
+
+  private Cpp::PointerType pointerType(Type base) {
+    result.getBaseType() = base.getUnderlyingType()
+  }
+
+  private predicate arrayToPointerStep(TypeState argState, TypeState paramState) {
+    exists(Cpp::ArrayType array, boolean conversionUsed |
+      argState = MkTypeState(array, _, conversionUsed, Initial()) and
+      paramState =
+        MkTypeState(pointerType(array.getBaseType()), PRValue(), conversionUsed,
+          AfterTransformation())
+    )
+  }
+
+  private predicate functionToPointerStep(TypeState argState, TypeState paramState) {
+    exists(RoutineType routine, FunctionPointerType pointer, boolean conversionUsed |
+      argState = MkTypeState(routine, _, conversionUsed, Initial()) and
+      routine = pointer.getBaseType().getUnderlyingType() and
+      paramState = MkTypeState(pointer, PRValue(), conversionUsed, AfterTransformation())
+    )
+  }
+
+  private predicate arithmeticConversion(Type t) {
+    t instanceof ArithmeticType
+    or
+    t instanceof Enum and not t instanceof ScopedEnum
+  }
+
+  private predicate hasNoTopLevelSpecifiers(Type type) { type = type.stripTopLevelSpecifiers() }
+
+  private predicate valueConversionStep(TypeState argState, TypeState paramState) {
+    exists(Type argType, Type paramType, boolean conversionUsed |
+      argState = MkTypeState(_, _, conversionUsed, _) and
+      argState.canConvertValue() and
+      argType = argState.getType().stripTopLevelSpecifiers() and
+      hasNoTopLevelSpecifiers(paramType) and
+      argType != paramType and
+      paramState = MkTypeState(paramType, PRValue(), conversionUsed, AfterValueConversion())
+    |
+      paramType instanceof ArithmeticType and
+      arithmeticConversion(argType)
+      or
+      pointerConversion(argType, paramType)
+      or
+      argType instanceof NullPointerType and
+      nullPointerConversion(paramType)
+      or
+      booleanConversion(argType) and
+      paramType instanceof BoolType
+    )
+  }
+
+  private newtype PtrKind =
+    NormalPtrKind() or
+    FunPtrKind()
+
+  private Type pointerBase(Type pointer, PtrKind k) {
+    result = pointer.(Cpp::PointerType).getBaseType() and
+    k = NormalPtrKind()
+    or
+    result = pointer.(FunctionPointerType).getBaseType() and
+    k = FunPtrKind()
+  }
+
+  private predicate pointerQualificationStep(TypeState argState, TypeState paramState) {
+    exists(Type argType, Type paramType, boolean conversionUsed, PtrKind k |
+      argState = MkTypeState(_, _, conversionUsed, _) and
+      argState.getPhase() != AfterQualification() and
+      argType = argState.getType().stripTopLevelSpecifiers() and
+      hasNoTopLevelSpecifiers(paramType) and
+      argType != paramType and
+      qualificationCompatible(pointerBase(argType, k), pointerBase(paramType, k)) and
+      paramState = MkTypeState(paramType, PRValue(), conversionUsed, AfterQualification())
+    )
+  }
+
+  private predicate baseClassStep(TypeState argState, TypeState paramState) {
+    exists(Type arg, Type param, ValueCategory category, boolean conversionUsed |
+      argState = MkTypeState(arg, category, conversionUsed, _) and
+      argState.canConvertValue() and
+      baseTypeCompatible(arg, param) and
+      paramState = MkTypeState(param, category, conversionUsed, AfterValueConversion())
+    )
+  }
+
+  private predicate convertingConstructorStep(TypeState argState, TypeState paramState) {
+    exists(ConvertingConstructor constructor |
+      argState.hasNotUsedConversion() and
+      argState.matchesParameter(constructor.getUnderlyingFromType()) and
+      paramState = MkTypeState(constructor.getDeclaringType(), PRValue(), true, Initial())
+    )
+  }
+
+  private predicate conversionOperatorStep(TypeState argState, TypeState paramState) {
+    exists(ConversionOperator conversion, ValueCategory category |
+      not conversion.isFromUninstantiatedTemplate(_) and
+      not conversion.isExplicit() and
+      not conversion.isDeleted() and
+      argState.hasNotUsedConversion() and
+      conversion.getSourceType() =
+        argState.getType().stripTopLevelSpecifiers().(Class).getABaseClass*() and
+      paramState =
+        MkTypeState(getValueType(conversion.getDestType().getUnderlyingType(), category), category,
+          true, Initial())
+    )
+  }
+
+  private predicate step(TypeState argState, TypeState paramState) {
+    arrayToPointerStep(argState, paramState)
+    or
+    functionToPointerStep(argState, paramState)
+    or
+    valueConversionStep(argState, paramState)
+    or
+    pointerQualificationStep(argState, paramState)
+    or
+    baseClassStep(argState, paramState)
+    or
+    convertingConstructorStep(argState, paramState)
+    or
+    conversionOperatorStep(argState, paramState)
+  }
+
+  private predicate typeFwd(TypeState state) {
+    state.isSource(_)
+    or
+    exists(TypeState previous |
+      typeFwd(previous) and
+      step(previous, state)
+    )
+  }
+
+  private predicate typeRev(TypeState state, Cpp::Constructor constructor) {
+    typeFwd(state) and
+    (
+      state.isSink(_, constructor)
+      or
+      exists(TypeState next |
+        typeRev(next, constructor) and
+        step(state, next)
+      )
+    )
+  }
+
+  private predicate prunedStep(TypeState argState, TypeState paramState) {
+    exists(Cpp::Constructor constructor |
+      typeRev(argState, constructor) and
+      typeRev(paramState, constructor) and
+      step(argState, paramState)
+    )
+  }
+
+  private predicate compatible(Function forwarder, int start, int i, Cpp::Constructor constructor) {
+    exists(TypeState argState, TypeState paramState |
+      argState.isSource(getForwardedArgumentType(forwarder, start, i)) and
+      paramState.isSink(getConstructorParameterType(constructor, i), constructor) and
+      prunedStep*(argState, paramState)
+    )
+  }
+
+  /**
+   * Gets the `Constructor` that should be invoked with arguments `0 .. n`
+   * when `forwarder` is called with arguments `start + 0 .. start + n`.
+   */
+  Cpp::Constructor getForwardingConstructor(Function forwarder, int start) {
+    exists(int numberOfForwardedArguments |
+      numberOfForwardedArguments <= result.getNumberOfParameters()
+      or
+      result.isVarargs()
+    |
+      forwards(forwarder, result.getDeclaringType(), start) and
+      forwarder.getNumberOfParameters() = start + numberOfForwardedArguments and
+      forex(int i | i = [0 .. result.getNumberOfParameters() - 1] |
+        // If we are still processing the forwarded arguments then we need to
+        // check that the argument types match the parameter types.
+        // Functions that perform perfect forwarding are always written as:
+        // ```
+        // template<typename... Args> void emplace(Args&&... args) { ... }
+        // ```
+        // and so all the arguments will be reference typed (lvalue or rvalued).
+        // However, the constructor may not specify all the arguments by
+        // reference.
+        i < numberOfForwardedArguments and
+        compatible(forwarder, start, i, result)
+        or
+        // If the constructor has a default argument and we have processed all
+        // the forwarded arguments then we don't need to check the types.
+        i >= numberOfForwardedArguments and result.getParameter(i).hasInitializer()
+      )
+    )
+  }
+
+  /** Holds if `call` is a call that forwards arguments to a constructor call. */
+  predicate isForwarderConstructorArgumentNodeImpl(CallInstruction call) {
+    exists(getForwardingConstructor(call.getStaticCallTarget(), _))
+  }
+}
+
+/**
+ * In order to support flow summaries for functions that perform "perfect
+ * forwarding" we interpret a call such as:
+ * ```cpp
+ * struct Foo { Foo(int) };
+ * std::vector<Foo> v;
+ * v.emplace_back(42);
+ * ```
+ * as:
+ * ```cpp
+ * v.emplace_back(42, &Foo);
+ * ```
+ * and add two summaries:
+ * (1) One flow from `42` to the first argument of a call to `Foo`
+ * (2) One flow from the return value of `Foo` to the `this` argument of the call
+ * to `emplace_back` (with a sequence of output `Content`s).
+ *
+ * These two summaries are automatically generated when a forwarding model
+ * for `emplace_back` exists.
+ */
+private predicate interpretForwardingSummary(
+  Function forwarder, string input, string output, string provenance, string model
+) {
+  exists(Class c, int start, string constructorOutput |
+    interpretForwardsModel(forwarder, c, start, constructorOutput, provenance, model)
+  |
+    // Generate the (1) summary
+    exists(int index, Parameter arg, Parameter p, int indirection, Cpp::Constructor constructor |
+      arg = forwarder.getParameter(start + index) and
+      constructor = ConstructorForwarding::getForwardingConstructor(forwarder, start) and
+      constructor.getDeclaringType() = c and
+      p = constructor.getParameter(index) and
+      indirection = [0 .. SsaImpl::getMaxIndirectionsForPRType(p.getUnspecifiedType())] and
+      input =
+        "Argument[" + repeatStars(indirection + referenceIndirection(arg.getUnspecifiedType())) +
+          (start + index) + "]" and
+      output =
+        "Argument[forward].Parameter[" +
+          repeatStars(indirection + referenceIndirection(p.getUnspecifiedType())) + index + "]"
+    )
+    or
+    // Generate the (2) summary
+    input = "Argument[forward].Parameter[-1]" and
+    output = constructorOutput
+  )
+  or
+  // Scalar types have no constructor to synthesize. In this case, directly
+  // preserve the value of the single forwarded argument at the modeled output.
+  exists(Type constructedType, int start, Parameter p, int indirection |
+    interpretForwardsModelType(forwarder, constructedType, start, output, provenance, model) and
+    not constructedType instanceof Class and
+    forwarder.getNumberOfParameters() = start + 1 and
+    p = forwarder.getParameter(start) and
+    stripReference(p.getUnspecifiedType()) = constructedType and
+    indirection = [0 .. SsaImpl::getMaxIndirectionsForPRType(constructedType)] and
+    input =
+      "Argument[" + repeatStars(indirection + referenceIndirection(p.getUnspecifiedType())) + start +
+        "]"
+  )
+}
+
 /**
  * Holds if `node` is specified as a source with the given kind in a MaD flow
  * model.
@@ -1077,6 +1643,9 @@ private predicate interpretSummary(
       model) and
     f = interpretElement(namespace, type, subtypes, name, signature, ext)
   )
+  or
+  interpretForwardingSummary(f, input, output, provenance, model) and
+  kind = "value"
 }
 
 // adapter class for converting Mad summaries to `SummarizedCallable`s
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/ExternalFlowExtensions.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/ExternalFlowExtensions.qll
index 22c74c2aa714..e05c1bb2b810 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/ExternalFlowExtensions.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/ExternalFlowExtensions.qll
@@ -51,6 +51,14 @@ extensible predicate neutralModel(
   string namespace, string type, string name, string signature, string kind, string provenance
 );
 
+/**
+ * Holds if a constructor forwarding model exists for the given parameters.
+ */
+extensible predicate forwardsModel(
+  string namespace, string type, boolean subtypes, string name, string signature, string ext,
+  string start, string constructor, string output, string provenance, QlBuiltins::ExtensionId madId
+);
+
 module Extensions implements SharedMaD::ExtensionsSig {
   import ExternalFlowExtensions
 
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll
index 66b33b1ed522..6c613308d5f4 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll
@@ -17,10 +17,6 @@ module Input implements InputSig<Location, DataFlowImplSpecific::CppDataFlow> {
 
   class SummarizedCallableBase = Function;
 
-  class SourceBase = Void;
-
-  class SinkBase = Void;
-
   class FlowSummaryCallBase = CallInstruction;
 
   predicate callableFromSource(SummarizedCallableBase c) { exists(c.getBlock()) }
@@ -115,6 +111,9 @@ module Input implements InputSig<Location, DataFlowImplSpecific::CppDataFlow> {
         pos = -1 and result = TIndirectionPosition(pos, indirection + 1)
       )
     )
+    or
+    argString = "forward" and
+    result = TForwardPosition()
   }
 
   bindingset[token]
@@ -132,11 +131,216 @@ module Input implements InputSig<Location, DataFlowImplSpecific::CppDataFlow> {
 
 private import Make<Location, DataFlowImplSpecific::CppDataFlow, Input> as Impl
 
-private module StepsInput implements Impl::Private::StepsInputSig {
-  Impl::Private::SummaryNode getSummaryNode(Node n) {
-    result = n.(FlowSummaryNode).getSummaryNode()
+private class ConversionCall extends Call {
+  ConversionCall() { this.getTarget() instanceof ConversionOperator }
+}
+
+private module Input2 implements Impl::Private::InputSig2 {
+  private import codeql.util.Void
+
+  pragma[nomagic]
+  private predicate hasFunctionAndIndirectionIndex(
+    Function f, int indirectionIndex, Ssa::ExplicitDefinition def
+  ) {
+    def.getFunction() = f and
+    def.getSourceVariable().getIRVariable() instanceof IRReturnVariable and
+    def.getIndirectionIndex() = indirectionIndex
+  }
+
+  /** Holds if `def` defines `e` as a returned value with return kind `rk`. */
+  bindingset[rk, e]
+  private predicate isReturnExpr(Function f, ReturnKind rk, Expr e) {
+    exists(Ssa::ExplicitDefinition def |
+      hasFunctionAndIndirectionIndex(f, rk.getIndirectionIndex(), def) and
+      e =
+        def.getAssignedInstruction()
+            .(StoreInstruction)
+            .getSourceValue()
+            .getUnconvertedResultExpression()
+    )
+  }
+
+  private MemberFunction getFunctionFromType(Expr e) {
+    result.getClassAndName("operator()").getADerivedClass*() = e.getUnspecifiedType()
+  }
+
+  private Function getFunctionFromExpr(Expr e) {
+    result = e.(FunctionAccess).getTarget()
+    or
+    result = e.(ConversionCall).getQualifier().(LambdaExpression).getLambdaFunction()
+  }
+
+  private predicate isRelevantUltimateDefinition(Ssa::DirectExplicitDefinition def, Function f) {
+    f =
+      getFunctionFromExpr(def.getAssignedInstruction()
+            .(StoreInstruction)
+            .getSourceValue()
+            .getUnconvertedResultExpression())
+  }
+
+  private module GetAnUltimateDefinitionInput implements Ssa::GetAnUltimateDefinitionSig {
+    predicate isRelevantUltimateDefinition(Ssa::Definition def) {
+      isRelevantUltimateDefinition(def, _)
+    }
+  }
+
+  private predicate hasAnUltimateFunctionAccessDefinition(Ssa::Definition def, Function f) {
+    exists(Ssa::Definition ultimate |
+      ultimate =
+        Ssa::GetAnUltimateDefinition<GetAnUltimateDefinitionInput>::getAnUltimateDefinition(def) and
+      isRelevantUltimateDefinition(ultimate, f)
+    )
   }
 
+  class SourceSinkReportingElement extends Element {
+    SourceSinkReportingElement() { this instanceof Expr or this instanceof Parameter }
+
+    DataFlowCallable getEnclosingCallable() {
+      result.asSourceCallable() =
+        [this.(Expr).getEnclosingFunction(), this.(Parameter).getFunction()]
+    }
+
+    /** Gets the function invoked when this element is used as a callback. */
+    private Function getCallable() {
+      // The expression is a struct which implements `operator()`.
+      result = getFunctionFromType(this)
+      or
+      // The expression is a function pointer
+      result = getFunctionFromExpr(this)
+      or
+      // The expression is an SSA read of an assignment of a callable
+      exists(Ssa::Definition def |
+        def.getAUse().getDef().getUnconvertedResultExpression() = this and
+        hasAnUltimateFunctionAccessDefinition(def, result)
+      )
+    }
+
+    SourceSinkReportingElement getASuccessor(Impl::Private::SummaryComponent sc) {
+      exists(Function f | f = this.getCallable() |
+        exists(ParameterPosition pos | sc = Impl::Private::SummaryComponent::parameter(pos) |
+          result = pos.getParameter(f)
+        )
+        or
+        exists(ReturnKind rk |
+          sc = Impl::Private::SummaryComponent::return(rk) and
+          isReturnExpr(f, rk, result)
+        )
+      )
+    }
+  }
+
+  bindingset[source, sc]
+  SourceSinkReportingElement getASourceReportingElement(
+    Input::SummarizedCallableBase source, Impl::Private::SummaryComponent sc
+  ) {
+    exists(Call call | call.getTarget() = source |
+      sc = Impl::Private::SummaryComponent::return(_) and
+      result = call
+      or
+      exists(ArgumentPosition pos |
+        sc = Impl::Private::SummaryComponent::argument(pos) and
+        result = pos.getArgument(call)
+      )
+    )
+    or
+    exists(ParameterPosition pos |
+      sc = Impl::Private::SummaryComponent::parameter(pos) and
+      result = pos.getParameter(source)
+    )
+  }
+
+  pragma[nomagic]
+  private IndirectReturnOutNode getIndirectReturn(CallInstruction call, NormalReturnKind rk) {
+    result.getCallInstruction() = call and
+    pragma[only_bind_out](result.getIndirectionIndex()) =
+      pragma[only_bind_out](rk.getIndirectionIndex())
+  }
+
+  pragma[nomagic]
+  private predicate hasKindAndEnclosingFunction(Function f, ReturnKind rk, ReturnNode r) {
+    r.getEnclosingCallable().asSourceCallable() = f and
+    pragma[only_bind_into](r).getKind() = rk
+  }
+
+  pragma[nomagic]
+  private predicate hasParameterAndIndirectionIndex(
+    Parameter p, int indirectionIndex, ParameterNode n
+  ) {
+    n.getParameter() = p and
+    n.getIndirectionIndex() = indirectionIndex
+  }
+
+  bindingset[e, sc]
+  Node getSourceDataFlowNode(SourceSinkReportingElement e, Impl::Private::SummaryComponent sc) {
+    exists(DataFlowCall call |
+      exists(ArgumentPosition pos |
+        sc = Impl::Private::SummaryComponent::argument(pos) and
+        pos.getArgument(call.asCallInstruction().getUnconvertedResultExpression()) = e
+      |
+        pos.getIndirectionIndex() = 0 and
+        result.(PostUpdateNode).getPreUpdateNode().asExpr() = e
+        or
+        result.(PostUpdateNode).getPreUpdateNode().asIndirectExpr(pos.getIndirectionIndex()) = e
+      )
+      or
+      exists(ReturnKind rk |
+        sc = Impl::Private::SummaryComponent::return(rk) and
+        // When `e` is a call the node becomes an `OutNode`.
+        e = call.asCallInstruction().getUnconvertedResultExpression()
+      |
+        rk.getIndirectionIndex() = 0 and
+        simpleOutNode(result, call.asCallInstruction())
+        or
+        result = getIndirectReturn(call.asCallInstruction(), rk)
+      )
+    )
+    or
+    exists(ParameterPosition pos |
+      sc = Impl::Private::SummaryComponent::parameter(pos) and
+      hasParameterAndIndirectionIndex(e, pos.getIndirectionIndex(), result)
+    )
+    or
+    exists(Function f, ReturnKind rk |
+      sc = Impl::Private::SummaryComponent::return(rk) and
+      // When `e` is the returned expression from a function the node is
+      // the `ReturnNode`.
+      isReturnExpr(f, rk, e) and
+      hasKindAndEnclosingFunction(f, rk, result)
+    )
+  }
+
+  bindingset[sink, sc]
+  SourceSinkReportingElement getASinkReportingElement(
+    Input::SummarizedCallableBase sink, Impl::Private::SummaryComponent sc
+  ) {
+    exists(Call call, ArgumentPosition pos |
+      call.getTarget() = sink and
+      sc = Impl::Private::SummaryComponent::argument(pos) and
+      result = pos.getArgument(call)
+    )
+  }
+
+  bindingset[e, sc]
+  Node getSinkDataFlowNode(SourceSinkReportingElement e, Impl::Private::SummaryComponent sc) {
+    exists(ArgumentPosition pos, CallInstruction call |
+      sc = Impl::Private::SummaryComponent::argument(pos) and
+      pos.getArgument(call.getUnconvertedResultExpression()) = e and
+      result.(ArgumentNode).sourceArgumentOf(call, pos)
+    )
+    or
+    exists(Function f, ReturnKind rk |
+      sc = Impl::Private::SummaryComponent::return(rk) and
+      isReturnExpr(f, rk, e) and
+      hasKindAndEnclosingFunction(f, rk, result)
+    )
+  }
+}
+
+private import Impl::Private::Make2<Input2> as Impl2
+
+private module StepsInput implements Impl2::StepsInputSig {
+  Impl2::SummaryNode getSummaryNode(Node n) { result = n.(FlowSummaryNode).getSummaryNode() }
+
   DataFlowCall getACall(Public::SummarizedCallable sc) {
     result.getStaticCallTarget().getUnderlyingCallable() = sc
   }
@@ -148,12 +352,6 @@ private module StepsInput implements Impl::Private::StepsInputSig {
         pragma[only_bind_out](out.getIndirectionIndex())
     )
   }
-
-  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
-
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
-
-  Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
 
 module SourceSinkInterpretationInput implements
@@ -270,8 +468,9 @@ module SourceSinkInterpretationInput implements
 
 module Private {
   import Impl::Private
+  import Impl2
 
-  module Steps = Impl::Private::Steps<StepsInput>;
+  module Steps = Impl2::Steps<StepsInput>;
 
   module External {
     import Impl::Private::External
@@ -310,3 +509,45 @@ module Private {
 }
 
 module Public = Impl::Public;
+
+private class SourceModelFunction extends Public::SourceElement instanceof Function {
+  private string namespace;
+  private string type;
+  private boolean subtypes;
+  private string name;
+  private string signature;
+  private string ext;
+
+  SourceModelFunction() {
+    sourceModel(namespace, type, subtypes, name, signature, ext, _, _, _, _) and
+    this = interpretElement(namespace, type, subtypes, name, signature, ext)
+  }
+
+  override predicate isSource(
+    string output, string kind, Public::Provenance provenance, boolean isExact, string model
+  ) {
+    sourceModel(namespace, type, subtypes, name, signature, ext, output, kind, provenance, model) and
+    isExact = true
+  }
+}
+
+private class SinkModelFunction extends Public::SinkElement instanceof Function {
+  private string namespace;
+  private string type;
+  private boolean subtypes;
+  private string name;
+  private string signature;
+  private string ext;
+
+  SinkModelFunction() {
+    sinkModel(namespace, type, subtypes, name, signature, ext, _, _, _, _) and
+    this = interpretElement(namespace, type, subtypes, name, signature, ext)
+  }
+
+  override predicate isSink(
+    string input, string kind, Public::Provenance provenance, boolean isExact, string model
+  ) {
+    sinkModel(namespace, type, subtypes, name, signature, ext, input, kind, provenance, model) and
+    isExact = true
+  }
+}
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll b/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
index 2246a887b9c1..be7636fdadee 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
@@ -353,6 +353,21 @@ class BuiltInOperationIsBaseOf extends BuiltInOperation, @isbaseofexpr {
   override string getAPrimaryQlClass() { result = "BuiltInOperationIsBaseOf" }
 }
 
+/**
+ * A C++ `__builtin_is_virtual_base_of` built-in operation (used by some implementations of the
+ * `<type_traits>` header).
+ *
+ * Returns `true` if the first type is a virtual base class of the second type.
+ * ```
+ * bool v = __builtin_is_virtual_base_of(MyType, OtherType);
+ * ```
+ */
+class BuiltInOperationIsVirtualBaseOf extends BuiltInOperation, @isvirtualbaseof {
+  override string toString() { result = "__builtin_is_virtual_base_of" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationIsVirtualBaseOf" }
+}
+
 /**
  * A C++ `__is_class` built-in operation (used by some implementations of the
  * `<type_traits>` header).
@@ -1999,3 +2014,105 @@ class BuiltInOperationIsNothrowInvocable extends BuiltInOperation, @isnothrowinv
 
   override string getAPrimaryQlClass() { result = "BuiltInOperationIsNothrowInvocable" }
 }
+
+/**
+ * A C++ `__builtin_is_implicit_lifetime` built-in operation (used by some implementations
+ * of the `<type_traits>` header).
+ *
+ * Returns `true` if a type `_Tp` is an implicit lifetime type.
+ *
+ * ```
+ * template<typename _Tp>
+ * constexpr bool is_implicit_lifetime = __builtin_is_implicit_lifetime(_Tp);
+ * ```
+ */
+class BuiltInOperationIsImplicitLifetime extends BuiltInOperation, @isimplicitlifetime {
+  override string toString() { result = "__builtin_is_implicit_lifetime" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationIsImplicitLifetime" }
+}
+
+/**
+ * A C++ `__builtin_is_structural` built-in operation (used by some implementations
+ * of the `<type_traits>` header).
+ *
+ * Returns `true` if a type `_Tp` is structural type.
+ *
+ * ```
+ * template<typename _Tp>
+ * constexpr bool is_structural = __builtin_is_structural(_Tp);
+ * ```
+ */
+class BuiltInOperationIsStructural extends BuiltInOperation, @isstructural {
+  override string toString() { result = "__builtin_is_structural" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationIsStructural" }
+}
+
+/**
+ * A C++ `__builtin_lt_synthesizes_from_spaceship` built-in operation (used by some container
+ * implementations).
+ *
+ * Returns `true` if the `<` operator is synthesized from the spaceship operator `<=>`.
+ *
+ * ```
+ * bool v = __builtin_lt_synthesizes_from_spaceship(MyType, OtherType);
+ */
+class BuiltInOperationLtSynthesizesFromSpaceship extends BuiltInOperation,
+  @ltsynthesizesfromspaceship
+{
+  override string toString() { result = "__builtin_lt_synthesizes_from_spaceship" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationLtSynthesizesFromSpaceship" }
+}
+
+/**
+ * A C++ `__builtin_gt_synthesizes_from_spaceship` built-in operation (used by some container
+ * implementations).
+ *
+ * Returns `true` if the `>` operator is synthesized from the spaceship operator `<=>`.
+ *
+ *  ```
+ * bool v = __builtin_gt_synthesizes_from_spaceship(MyType, OtherType);
+ */
+class BuiltInOperationGtSynthesizesFromSpaceship extends BuiltInOperation,
+  @gtsynthesizesfromspaceship
+{
+  override string toString() { result = "__builtin_gt_synthesizes_from_spaceship" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationGtSynthesizesFromSpaceship" }
+}
+
+/**
+ * A C++ `__builtin_le_synthesizes_from_spaceship` built-in operation (used by some container
+ * implementations).
+ *
+ * Returns `true` if the `<=` operator is synthesized from the spaceship operator `<=>`.
+ *
+ * ```
+ * bool v = __builtin_le_synthesizes_from_spaceship(MyType, OtherType);
+ */
+class BuiltInOperationLeSynthesizesFromSpaceship extends BuiltInOperation,
+  @lesynthesizesfromspaceship
+{
+  override string toString() { result = "__builtin_le_synthesizes_from_spaceship" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationLeSynthesizesFromSpaceship" }
+}
+
+/**
+ * A C++ `__builtin_ge_synthesizes_from_spaceship` built-in operation (used by some container
+ * implementations).
+ *
+ * Returns `true` if the `>=` operator is synthesized from the spaceship operator `<=>`.
+ *
+ * ```
+ * bool v = __builtin_ge_synthesizes_from_spaceship(MyType, OtherType);
+ */
+class BuiltInOperationGeSynthesizesFromSpaceship extends BuiltInOperation,
+  @gesynthesizesfromspaceship
+{
+  override string toString() { result = "__builtin_ge_synthesizes_from_spaceship" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationGeSynthesizesFromSpaceship" }
+}
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
index 851d987b1fd6..82824445ccf2 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
@@ -108,7 +108,8 @@ class Expr extends StmtParent, @expr {
   /** Holds if this is an auxiliary expression generated by the compiler. */
   predicate isCompilerGenerated() {
     compgenerated(underlyingElement(this)) or
-    this.getParent().(ConstructorFieldInit).isCompilerGenerated()
+    this.getParent().(ConstructorFieldInit).isCompilerGenerated() or
+    this.getParent().(Initializer).isCompilerGenerated()
   }
 
   /**
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll
index 31e2b5135b42..7238ea2a35ed 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll
@@ -133,6 +133,19 @@ class StringLiteral extends TextLiteral {
   override string getAPrimaryQlClass() { result = "StringLiteral" }
 }
 
+/**
+ * A C++ raw string literal. For example:
+ * ```
+ * const char *s1 = R"(abcdef)";
+ * const wchar_t *s2 = LR"x(123456)x";
+ * ```
+ */
+class RawStringLiteral extends StringLiteral {
+  RawStringLiteral() { this.getValueText().regexpMatch("[^\"]*R\".*\\(.*") }
+
+  override string getAPrimaryQlClass() { result = "RawStringLiteral" }
+}
+
 /**
  * An octal literal. For example:
  * ```
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
index bce936552768..03a565ef946d 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
@@ -131,6 +131,15 @@ private predicate qualifierSourceImpl(RelevantNode n, Class c) {
   )
 }
 
+pragma[nomagic]
+private predicate hasKindAndEnclosingCallable(
+  DataFlowPrivate::DataFlowCallable callable, DataFlowPrivate::ReturnKind kind,
+  DataFlowPrivate::ReturnNode return
+) {
+  return.getEnclosingCallable() = callable and
+  return.getKind() = kind
+}
+
 private module TrackVirtualDispatch<methodDispatchSig/1 virtualDispatch0> {
   /**
    * Gets a possible runtime target of `c` using both static call-target
@@ -197,11 +206,21 @@ private module TrackVirtualDispatch<methodDispatchSig/1 virtualDispatch0> {
       )
     }
 
+    pragma[nomagic]
+    private predicate hasDispatchWithKind(
+      DataFlowPrivate::DataFlowCallable callable, DataFlowPrivate::ReturnKind kind,
+      LocalSourceNode n2
+    ) {
+      exists(DataFlowPrivate::DataFlowCall call |
+        n2 = DataFlowPrivate::getAnOutNode(call, kind) and
+        callable = dispatch(call)
+      )
+    }
+
     predicate returnStep(Node n1, LocalSourceNode n2) {
-      exists(DataFlowPrivate::DataFlowCallable callable, DataFlowPrivate::DataFlowCall call |
-        n1.(DataFlowPrivate::ReturnNode).getEnclosingCallable() = callable and
-        callable = dispatch(call) and
-        n2 = DataFlowPrivate::getAnOutNode(call, n1.(DataFlowPrivate::ReturnNode).getKind())
+      exists(DataFlowPrivate::DataFlowCallable callable, DataFlowPrivate::ReturnKind kind |
+        hasKindAndEnclosingCallable(callable, kind, n1) and
+        hasDispatchWithKind(callable, kind, n2)
       )
     }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll
index 6b0de326d114..3b900320882b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll
@@ -6,6 +6,8 @@
 private import cpp
 private import DataFlowImplSpecific
 private import TaintTrackingImplSpecific
+private import DataFlowNodes as Nodes
+private import semmle.code.cpp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 private import codeql.dataflow.internal.DataFlowImplConsistency
 
 private module Input implements InputSig<Location, CppDataFlow> {
@@ -14,6 +16,12 @@ private module Input implements InputSig<Location, CppDataFlow> {
     // complex to model here.
     any()
   }
+
+  predicate postWithInFlowExclude(CppDataFlow::Node n) {
+    n instanceof Nodes::FlowSummaryNode
+    or
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(_, n, _, _)
+  }
 }
 
 module Consistency = MakeConsistency<Location, CppDataFlow, CppTaintTracking, Input>;
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowNodes.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowNodes.qll
index abcff398420c..9dbf7f8e73c5 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowNodes.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowNodes.qll
@@ -3,6 +3,7 @@ private import semmle.code.cpp.ir.ValueNumbering
 private import semmle.code.cpp.ir.IR
 private import semmle.code.cpp.models.interfaces.DataFlow
 private import semmle.code.cpp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
+private import semmle.code.cpp.dataflow.ExternalFlow as External
 private import DataFlowPrivate
 private import DataFlowUtil
 private import ModelUtil
@@ -144,7 +145,7 @@ private module Cached {
     TNonUnionContent(CanonicalField f, int indirectionIndex) {
       // the indirection index for field content starts at 1 (because `TNonUnionContent` is thought of as
       // the address of the field, `FieldAddress` in the IR).
-      indirectionIndex = [1 .. max(SsaImpl::getMaxIndirectionsForType(f.getAnUnspecifiedType()))] and
+      indirectionIndex = [1 .. max(SsaImpl::getMaxIndirectionsForGLType(f.getAnUnspecifiedType()))] and
       // Reads and writes of union fields are tracked using `UnionContent`.
       not f.getDeclaringType() instanceof Union
     } or
@@ -156,7 +157,7 @@ private module Cached {
         // field can be read by any read of the union's fields. Again, the indirection index
         // is 1-based (because 0 is considered the address).
         indirectionIndex =
-          [1 .. max(SsaImpl::getMaxIndirectionsForType(getAFieldWithSize(u, bytes)
+          [1 .. max(SsaImpl::getMaxIndirectionsForGLType(getAFieldWithSize(u, bytes)
                       .getAnUnspecifiedType())
             )]
       )
@@ -184,13 +185,16 @@ private module Cached {
     TNode0(Node0Impl node) { DataFlowImplCommon::forceCachingInSameStage() } or
     TGlobalLikeVariableNode(GlobalLikeVariable var, int indirectionIndex) {
       indirectionIndex =
-        [getMinIndirectionsForType(var.getUnspecifiedType()) .. SsaImpl::getMaxIndirectionsForType(var.getUnspecifiedType())]
+        [getMinIndirectionsForType(var.getUnspecifiedType()) .. SsaImpl::getMaxIndirectionsForGLType(var.getUnspecifiedType())]
     } or
     TPostUpdateNodeImpl(Operand operand, int indirectionIndex) {
       isPostUpdateNodeImpl(operand, indirectionIndex)
     } or
     TSsaSynthNode(SsaImpl::SynthNode n) or
     TSsaIteratorNode(IteratorFlow::IteratorFlowNode n) or
+    TForwarderConstructorArgumentNode(CallInstruction call) {
+      External::ConstructorForwarding::isForwarderConstructorArgumentNodeImpl(call)
+    } or
     TRawIndirectOperand0(Node0Impl node, int indirectionIndex) {
       SsaImpl::hasRawIndirectOperand(node.asOperand(), indirectionIndex)
     } or
@@ -209,10 +213,7 @@ private module Cached {
     TBodyLessParameterNodeImpl(Parameter p, int indirectionIndex) {
       // Rule out parameters of catch blocks.
       not exists(p.getCatchBlock()) and
-      // We subtract one because `getMaxIndirectionsForType` returns the maximum
-      // indirection for a glvalue of a given type, and this doesn't apply to
-      // parameters.
-      indirectionIndex = [0 .. SsaImpl::getMaxIndirectionsForType(p.getUnspecifiedType()) - 1] and
+      indirectionIndex = [0 .. SsaImpl::getMaxIndirectionsForPRType(p.getUnspecifiedType())] and
       not any(InitializeParameterInstruction init).getParameter() = p
     } or
     TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn)
@@ -1535,12 +1536,49 @@ class FlowSummaryNode extends Node, TFlowSummaryNode {
   }
 
   override DataFlowCallable getEnclosingCallable() {
-    result = FlowSummaryImpl::Private::getEnclosingCallable(this.getSummaryNode())
+    result = this.getSummaryNode().getEnclosingCallable()
   }
 
-  override Location getLocationImpl() { result = this.getSummarizedCallable().getLocation() }
+  override Location getLocationImpl() { result = this.getSummaryNode().getLocation() }
 
   override string toStringImpl() { result = this.getSummaryNode().toString() }
+
+  /** Gets the source element that this node belongs to, if any. */
+  FlowSummaryImpl::Public::SourceElement getSourceElement() {
+    result = this.getSummaryNode().getSourceElement()
+  }
+
+  /** Gets the sink element that this node belongs to, if any. */
+  FlowSummaryImpl::Public::SinkElement getSinkElement() {
+    result = this.getSummaryNode().getSinkElement()
+  }
+
+  /** Holds if this node is a source node of kind `kind`. */
+  predicate isSource(string kind, string model) {
+    this.getSummaryNode().(FlowSummaryImpl::Private::SourceOutputNode).isEntry(kind, model)
+  }
+
+  /** Holds if this node is a sink node of kind `kind`. */
+  predicate isSink(string kind, string model) {
+    this.getSummaryNode().(FlowSummaryImpl::Private::SinkInputNode).isExit(kind, model)
+  }
+}
+
+private class SourceOutputNode extends FlowSummaryImpl::Private::SourceOutputNode {
+  final override string toString() {
+    exists(Call call |
+      this.isOutArgument(call) and
+      result = call.getTarget() + " output argument"
+    )
+    or
+    not this.isOutArgument(_) and
+    result = super.toString()
+  }
+
+  private predicate isOutArgument(Call call) {
+    call.getTarget() = this.getSourceElement() and
+    [call.getAnArgument(), call.getQualifier()] = this.getSourceSinkReportingElement()
+  }
 }
 
 /**
@@ -1655,13 +1693,13 @@ abstract private class AbstractParameterNode extends Node {
    * Holds if this node represents an implicit `this` parameter, if it exists.
    */
   predicate isThis() { none() } // overridden by subclasses
-}
 
-abstract private class AbstractIndirectParameterNode extends AbstractParameterNode {
   /** Gets the indirection index of this parameter node. */
-  abstract int getIndirectionIndex();
+  int getIndirectionIndex() { none() }
 }
 
+abstract private class AbstractIndirectParameterNode extends AbstractParameterNode { }
+
 pragma[noinline]
 private predicate indirectParameterNodeHasArgumentIndexAndIndex(
   IndirectInstructionParameterNode node, int argumentIndex, int indirectionIndex
@@ -1725,7 +1763,9 @@ private class IndirectInstructionParameterNode extends AbstractIndirectParameter
   final override int getIndirectionIndex() { this.hasInstructionAndIndirectionIndex(init, result) }
 }
 
-abstract private class AbstractDirectParameterNode extends AbstractParameterNode { }
+abstract private class AbstractDirectParameterNode extends AbstractParameterNode {
+  override int getIndirectionIndex() { result = 0 }
+}
 
 /**
  * A non-indirect parameter node that is represented as an `Instruction`.
@@ -1796,6 +1836,8 @@ private class DirectBodyLessParameterNode extends AbstractExplicitParameterNode,
   }
 
   override Parameter getParameter() { result = p }
+
+  final override int getIndirectionIndex() { result = 0 }
 }
 
 private class IndirectBodyLessParameterNode extends AbstractIndirectParameterNode,
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
index cdcbaa438d3a..492e2ca1c022 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
@@ -119,8 +119,48 @@ private module Cached {
     )
     or
     // models-as-data summarized flow
-    FlowSummaryImpl::Private::Steps::summaryJumpStep(n1.(FlowSummaryNode).getSummaryNode(),
-      n2.(FlowSummaryNode).getSummaryNode())
+    FlowSummaryImpl::Private::Steps::summaryJumpStep(n1, n2)
+  }
+
+  bindingset[store]
+  pragma[inline_late]
+  private predicate nodeHasInstructionLate(Node node, StoreInstruction store, int indirectionIndex) {
+    nodeHasInstruction(node, store, indirectionIndex)
+  }
+
+  pragma[nomagic]
+  private predicate storeStepSource(
+    Operand fieldAddress, int contentIndirectionIndex, Node node, boolean certain
+  ) {
+    exists(int indirectionIndex, int numberOfLoads, StoreInstruction store |
+      nodeHasInstructionLate(node, store, indirectionIndex) and
+      numberOfLoadsFromOperand(fieldAddress, store.getDestinationAddressOperand(), numberOfLoads,
+        certain) and
+      contentIndirectionIndex = 1 + indirectionIndex + numberOfLoads
+    )
+  }
+
+  pragma[nomagic]
+  private predicate hasFieldAddressAndField(Field f, PostFieldUpdateNode pfu, Operand fieldAddress) {
+    pfu.getIndirectionIndex() = 1 and
+    pfu.getUpdatedField() = f and
+    pfu.getFieldAddress() = fieldAddress
+  }
+
+  pragma[nomagic]
+  private predicate hasFieldAndIndirectionIndex(Field f, int indirectionIndex, FieldContent fc) {
+    fc.getAField() = f and
+    fc.getIndirectionIndex() = indirectionIndex
+  }
+
+  pragma[nomagic]
+  private predicate storeStepTarget(
+    Operand address, int indirectionIndex, PostFieldUpdateNode pfu, FieldContent fc
+  ) {
+    exists(Field f |
+      hasFieldAddressAndField(f, pfu, address) and
+      hasFieldAndIndirectionIndex(f, indirectionIndex, fc)
+    )
   }
 
   /**
@@ -133,19 +173,9 @@ private module Cached {
    */
   cached
   predicate storeStepImpl(Node node1, Content c, Node node2, boolean certain) {
-    exists(
-      PostFieldUpdateNode postFieldUpdate, int indirectionIndex1, int numberOfLoads,
-      StoreInstruction store, FieldContent fc
-    |
-      postFieldUpdate = node2 and
-      fc = c and
-      nodeHasInstruction(node1, pragma[only_bind_into](store),
-        pragma[only_bind_into](indirectionIndex1)) and
-      postFieldUpdate.getIndirectionIndex() = 1 and
-      numberOfLoadsFromOperand(postFieldUpdate.getFieldAddress(),
-        store.getDestinationAddressOperand(), numberOfLoads, certain) and
-      fc.getAField() = postFieldUpdate.getUpdatedField() and
-      getIndirectionIndexLate(fc) = 1 + indirectionIndex1 + numberOfLoads
+    exists(Operand fieldAddress, int indirectionIndex |
+      storeStepSource(fieldAddress, indirectionIndex, node1, certain) and
+      storeStepTarget(fieldAddress, indirectionIndex, node2, c)
     )
     or
     // models-as-data summarized flow
@@ -509,11 +539,31 @@ predicate isArgumentNode(ArgumentNode arg, DataFlowCall c, ArgumentPosition pos)
  * on parameters are also included.
  */
 abstract class ArgumentNode extends Node {
+  /**
+   * Holds if this argument occurs at the given position in the given call,
+   * and this call is represented in the source code.
+   * The instance argument is considered to have index `-1`.
+   */
+  predicate sourceArgumentOf(CallInstruction call, ArgumentPosition pos) { none() }
+
+  /**
+   * Holds if this argument occurs at the given position in the given call,
+   * and this call is part of a summary.
+   * The instance argument is considered to have index `-1`.
+   */
+  predicate summaryArgumentOf(FlowSummaryImpl::Public::SummarizedCallable call, ArgumentPosition pos) {
+    none()
+  }
+
   /**
    * Holds if this argument occurs at the given position in the given call.
    * The instance argument is considered to have index `-1`.
    */
-  abstract predicate argumentOf(DataFlowCall call, ArgumentPosition pos);
+  final predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
+    this.sourceArgumentOf(call.asCallInstruction(), pos)
+    or
+    this.summaryArgumentOf(call.asSummaryCall(), pos)
+  }
 
   /** Gets the call in which this node is an argument. */
   DataFlowCall getCall() { this.argumentOf(result, _) }
@@ -528,21 +578,77 @@ private class PrimaryArgumentNode extends ArgumentNode, OperandNode {
 
   PrimaryArgumentNode() { exists(CallInstruction call | op = call.getAnArgumentOperand()) }
 
-  override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
+  override predicate sourceArgumentOf(CallInstruction call, ArgumentPosition pos) {
     op = call.getArgumentOperand(pos.(DirectPosition).getArgumentIndex())
   }
 }
 
 private class SideEffectArgumentNode extends ArgumentNode, SideEffectOperandNode {
-  override predicate argumentOf(DataFlowCall dfCall, ArgumentPosition pos) {
+  override predicate sourceArgumentOf(CallInstruction c, ArgumentPosition pos) {
     exists(int indirectionIndex |
       pos = TIndirectionPosition(argumentIndex, pragma[only_bind_into](indirectionIndex)) and
-      this.getCallInstruction() = dfCall.asCallInstruction() and
+      this.getCallInstruction() = c and
       super.hasAddressOperandAndIndirectionIndex(arg, pragma[only_bind_into](indirectionIndex))
     )
   }
 }
 
+/**
+ * In order to implement a MaD summary for a flow such as:
+ * ```
+ * struct Foo {
+ *   int x;
+ *   Foo(int x) { // (2)
+ *     this->x = x;
+ *   }
+ * }
+ *
+ * std::vector<Foo> v;
+ * int x = source();
+ * v.emplace_back(x); // (1)
+ * sink(v.back());
+ * ```
+ * we model it as if the code was:
+ * ```
+ * v.__emplace_back(x, &Foo)
+ * ```
+ * (never mind that this is not real C++ since you cannot take the address of a
+ * constructor.)
+ * where `__emplace_back` invokes `Foo` with the `x` argument and returns the
+ * result.
+ *
+ * This class serves as the argument node for `&Foo`.
+ */
+private class ForwarderConstructorArgumentNode extends ArgumentNode,
+  TForwarderConstructorArgumentNode
+{
+  private CallInstruction call;
+
+  ForwarderConstructorArgumentNode() { this = TForwarderConstructorArgumentNode(call) }
+
+  override predicate sourceArgumentOf(CallInstruction c, ArgumentPosition pos) {
+    c = call and pos = TForwardPosition()
+  }
+
+  /**
+   * Gets a constructor which may be targeted by this forwarding call.
+   */
+  Cpp::Constructor getAConstructor() {
+    result =
+      External::ConstructorForwarding::getForwardingConstructor(call.getStaticCallTarget(), _)
+  }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asSourceCallable() = this.getFunction()
+  }
+
+  override Declaration getFunction() { result = call.getEnclosingFunction() }
+
+  override Location getLocationImpl() { result = call.getLocation() }
+
+  override string toStringImpl() { result = "forwarder for " + call.toString() }
+}
+
 /**
  * An argument node that is part of a summary. These only occur when the
  * summary contains a synthesized call.
@@ -555,8 +661,10 @@ class SummaryArgumentNode extends ArgumentNode, FlowSummaryNode {
     FlowSummaryImpl::Private::summaryArgumentNode(call_.getReceiver(), this.getSummaryNode(), pos_)
   }
 
-  override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
-    call = call_ and
+  override predicate summaryArgumentOf(
+    FlowSummaryImpl::Public::SummarizedCallable call, ArgumentPosition pos
+  ) {
+    call = call_.asSummaryCall() and
     pos = pos_
   }
 }
@@ -570,8 +678,8 @@ private class FlowSummaryArgumentNode extends ArgumentNode, FlowSummaryNode {
     this.getSummaryNode() = FlowSummaryImpl::Private::summaryArgumentNode(callInstruction, rk)
   }
 
-  override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
-    call.asCallInstruction() = callInstruction and
+  override predicate sourceArgumentOf(CallInstruction call, ArgumentPosition pos) {
+    call = callInstruction and
     pos = TFlowSummaryPosition(rk)
   }
 }
@@ -594,6 +702,38 @@ abstract class Position extends TPosition {
 
   /** Gets the indirection index of this position. */
   abstract int getIndirectionIndex();
+
+  /**
+   * Gets the parameter of `f` associated with this position, if any.
+   *
+   * Since a `Position` is defined by both an argument index and an
+   * indirection multiple `Position`s can be associated with the
+   * same `Parameter`.
+   */
+  Parameter getParameter(Function f) {
+    result.getFunction() = f and
+    this.getArgumentIndex() = result.getIndex()
+  }
+
+  /**
+   * Gets the argument (or qualifier) of `call` associated with this position, if any.
+   *
+   * Since a `Position` is defined by both an argument index and an
+   * indirection multiple `Position`s can be associated with the
+   * same argument/qualifier.
+   */
+  Expr getArgument(Cpp::Call call) {
+    result = call.getArgument(this.getArgumentIndex())
+    or
+    this.getArgumentIndex() = -1 and
+    result = call.getQualifier()
+  }
+
+  /**
+   * Holds if this position is the synthetic argument for an address of a
+   * constructor used for functions which perform "perfect forwarding".
+   */
+  predicate isForward() { none() }
 }
 
 class DirectPosition extends Position, TDirectPosition {
@@ -643,6 +783,16 @@ class FlowSummaryPosition extends Position, TFlowSummaryPosition {
   final override int getIndirectionIndex() { result = rk.getIndirectionIndex() }
 }
 
+class ForwardPosition extends Position, TForwardPosition {
+  final override predicate isForward() { any() }
+
+  override int getArgumentIndex() { none() }
+
+  final override int getIndirectionIndex() { result = 0 }
+
+  override string toString() { result = "forward" }
+}
+
 newtype TPosition =
   TDirectPosition(int argumentIndex) {
     exists(any(CallInstruction c).getArgument(argumentIndex))
@@ -659,9 +809,10 @@ newtype TPosition =
     // the function.
     exists(Cpp::Function f, Cpp::Parameter p |
       p = f.getParameter(argumentIndex) and
-      indirectionIndex = [1 .. Ssa::getMaxIndirectionsForType(p.getUnspecifiedType()) - 1]
+      indirectionIndex = [1 .. Ssa::getMaxIndirectionsForPRType(p.getUnspecifiedType())]
     )
   } or
+  TForwardPosition() or
   TFlowSummaryPosition(ReturnKind rk) { FlowSummaryImpl::Private::relevantFlowSummaryPosition(rk) }
 
 private newtype TReturnKind =
@@ -677,7 +828,7 @@ private newtype TReturnKind =
       [0 .. max(Cpp::Function f |
           not exists(f.getBlock())
         |
-          Ssa::getMaxIndirectionsForType(f.getUnspecifiedType()) - 1 // -1 because a returned value is a prvalue not a glvalue
+          Ssa::getMaxIndirectionsForPRType(f.getUnspecifiedType())
         )]
   } or
   TIndirectReturnKind(int argumentIndex, int indirectionIndex) {
@@ -692,7 +843,7 @@ private newtype TReturnKind =
       [0 .. max(Cpp::Function f |
           not exists(f.getBlock())
         |
-          Ssa::getMaxIndirectionsForType(f.getParameter(argumentIndex).getUnspecifiedType()) - 1 // -1 because an argument is a prvalue not a glvalue
+          Ssa::getMaxIndirectionsForPRType(f.getParameter(argumentIndex).getUnspecifiedType())
         )]
   }
 
@@ -1180,6 +1331,19 @@ private predicate summarizedCallableIsManual(SummarizedCallable sc) {
   sc.asSummarizedCallable().hasManualModel()
 }
 
+private DataFlowCallable getTarget(Declaration target) {
+  // Don't use the source callable if there is a manual model for the target.
+  not exists(SummarizedCallable sc |
+    sc.asSummarizedCallable() = target and
+    summarizedCallableIsManual(sc)
+  ) and
+  result.asSourceCallable() = target
+  or
+  // When there is no function body, or when we have a manual model, dispatch to the summary.
+  (not target.hasDefinition() or summarizedCallableIsManual(result)) and
+  result.asSummarizedCallable() = target
+}
+
 /**
  * A function call relevant for data flow. This includes calls from source
  * code and calls inside library callables with a flow summary.
@@ -1190,6 +1354,11 @@ class DataFlowCall extends TDataFlowCall {
    */
   CallInstruction asCallInstruction() { none() }
 
+  /**
+   * Gets the underlying summarized call, if any.
+   */
+  FlowSummaryImpl::Public::SummarizedCallable asSummaryCall() { none() }
+
   /**
    * Gets the operand the specifies the target function of the call.
    */
@@ -1210,20 +1379,7 @@ class DataFlowCall extends TDataFlowCall {
    * whether is it manual or generated.
    */
   final DataFlowCallable getStaticCallTarget() {
-    exists(Declaration target | target = this.getStaticCallSourceTarget() |
-      // Don't use the source callable if there is a manual model for the
-      // target
-      not exists(SummarizedCallable sc |
-        sc.asSummarizedCallable() = target and
-        summarizedCallableIsManual(sc)
-      ) and
-      result.asSourceCallable() = target
-      or
-      // When there is no function body, or when we have a manual model then
-      // we dispatch to the summary.
-      (not target.hasDefinition() or summarizedCallableIsManual(result)) and
-      result.asSummarizedCallable() = target
-    )
+    result = getTarget(this.getStaticCallSourceTarget())
   }
 
   /**
@@ -1307,6 +1463,8 @@ class SummaryCall extends DataFlowCall, TSummaryCall {
    */
   FlowSummaryImpl::Private::SummaryNode getReceiver() { result = receiver }
 
+  final override FlowSummaryImpl::Public::SummarizedCallable asSummaryCall() { result = c }
+
   // no implementation for `getCallTargetOperand()`, `getStaticCallTarget()`
   // or `getArgumentOperand(int index)`. This is because the flow summary
   // library is responsible for finding the call target, and there are no
@@ -1408,6 +1566,8 @@ predicate nodeIsHidden(Node n) {
   n instanceof SsaSynthNode
   or
   n.(FlowSummaryNode).getSummaryNode().isHidden()
+  or
+  n instanceof ForwarderConstructorArgumentNode
 }
 
 predicate neverSkipInPathGraph(Node n) {
@@ -1489,6 +1649,9 @@ predicate lambdaCreation(Node creation, LambdaCallKind kind, DataFlowCallable c)
   kind.isFunctionPointer() and
   creation.asInstruction().(FunctionAddressInstruction).getFunctionSymbol() = c.asSourceCallable()
   or
+  kind.isFunctionPointer() and
+  c = getTarget(creation.(ForwarderConstructorArgumentNode).getAConstructor())
+  or
   kind.isFunctor() and
   exists(OperatorCall operator | operator = c.asSourceCallable() |
     isFunctorCreationWithoutConstructor(creation, operator)
@@ -1923,13 +2086,23 @@ module IteratorFlow {
     }
 
     /**
-     * Gets an ultimate definition of `def`.
-     *
-     * Note: Unlike `def.getAnUltimateDefinition()` this predicate also
-     * traverses back through iterator increment and decrement operations.
+     * Holds if `write` is an instruction that writes to address `address`
      */
-    private Ssa::Definition getAnUltimateDefinition(Ssa::Definition def) {
-      result = def.getAnUltimateDefinition()
+    private predicate isIteratorWrite(Instruction write, Operand address) {
+      exists(Ssa::DefImpl writeDef, IRBlock bb, int i |
+        writeDef.hasIndexInBlock(_, bb, i) and
+        bb.getInstruction(i) = write and
+        address = writeDef.getAddressOperand()
+      )
+    }
+
+    private module GetAnUltimateDefinitionInput implements Ssa::GetAnUltimateDefinitionSig {
+      predicate isRelevantUltimateDefinition(Ssa::Definition def) { fwd(_, def) }
+    }
+
+    private Ssa::Definition getAnUltimateDefinitionStep(Ssa::Definition def) {
+      result =
+        Ssa::GetAnUltimateDefinition<GetAnUltimateDefinitionInput>::getAnUltimateDefinition(def)
       or
       exists(IRBlock bb, int i, IteratorCrementCall crementCall, Ssa::SourceVariable sv |
         crementCall = def.getValue().asInstruction().(StoreInstruction).getSourceValue() and
@@ -1939,14 +2112,28 @@ module IteratorFlow {
       )
     }
 
-    /**
-     * Holds if `write` is an instruction that writes to address `address`
-     */
-    private predicate isIteratorWrite(Instruction write, Operand address) {
-      exists(Ssa::DefImpl writeDef, IRBlock bb, int i |
-        writeDef.hasIndexInBlock(_, bb, i) and
-        bb.getInstruction(i) = write and
-        address = writeDef.getAddressOperand()
+    private predicate isSource(GetsIteratorCall beginCall, Ssa::Definition def) {
+      exists(StoreInstruction beginStore |
+        beginStore = def.getValue().asInstruction() and
+        operandForFullyConvertedCall(beginStore.getSourceValueOperand(), beginCall)
+      )
+    }
+
+    private predicate isSink(Instruction writeToDeref, Ssa::Definition def) {
+      exists(IteratorPointerDereferenceCall starCall, Operand address, IRBlock bbStar, int iStar |
+        isIteratorWrite(writeToDeref, address) and
+        operandForFullyConvertedCall(address, starCall) and
+        bbStar.getInstruction(iStar) = starCall and
+        Ssa::ssaDefReachesRead(_, def, bbStar, iStar)
+      )
+    }
+
+    private predicate fwd(GetsIteratorCall beginCall, Ssa::Definition def) {
+      isSource(beginCall, def)
+      or
+      exists(Ssa::Definition def0 |
+        fwd(beginCall, def0) and
+        def0 = getAnUltimateDefinitionStep(def)
       )
     }
 
@@ -1962,17 +2149,9 @@ module IteratorFlow {
     private predicate isIteratorStoreInstruction(
       GetsIteratorCall beginCall, Instruction writeToDeref
     ) {
-      exists(
-        StoreInstruction beginStore, IRBlock bbStar, int iStar, Ssa::Definition def,
-        IteratorPointerDereferenceCall starCall, Ssa::Definition ultimate, Operand address
-      |
-        isIteratorWrite(writeToDeref, address) and
-        operandForFullyConvertedCall(address, starCall) and
-        bbStar.getInstruction(iStar) = starCall and
-        Ssa::ssaDefReachesRead(_, def, bbStar, iStar) and
-        ultimate = getAnUltimateDefinition*(def) and
-        beginStore = ultimate.getValue().asInstruction() and
-        operandForFullyConvertedCall(beginStore.getSourceValueOperand(), beginCall)
+      exists(Ssa::Definition def |
+        fwd(beginCall, def) and
+        isSink(writeToDeref, def)
       )
     }
 
@@ -2113,7 +2292,10 @@ module IteratorFlow {
   predicate localFlowStep(Node nodeFrom, Node nodeTo) {
     exists(SourceVariable v |
       nodeFrom != nodeTo and
-      DataFlowIntegrationImpl::localFlowStep(v, fromDfNode(nodeFrom, v), fromDfNode(nodeTo, v), _)
+      // Skip use-use steps. These are already accounted for by regular SSA
+      // flow including proper handling of `modeledFlowBarrier`.
+      DataFlowIntegrationImpl::localFlowStep(v, fromDfNode(nodeFrom, v), fromDfNode(nodeTo, v),
+        false)
     )
   }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
index 2e3274c82c7c..17c3438f098a 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -158,8 +158,7 @@ private module Cached {
     model = ""
     or
     // models-as-data summarized flow
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-      nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, true, model)
   }
 
   private predicate simpleInstructionLocalFlowStep(Operand opFrom, Instruction iTo) {
@@ -1019,4 +1018,6 @@ module Ssa {
   class IndirectExplicitDefinition = SsaImpl::IndirectExplicitDefinition;
 
   class PhiNode = SsaImpl::PhiNode;
+
+  import SsaImpl::Public
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll
index 432261dfe278..8f17c3c9a136 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll
@@ -1243,14 +1243,6 @@ private module IntWithParam<ParamSig P> {
 }
 
 module BarrierGuardWithIntParam<ParamSig P, IntWithParam<P>::guardChecksNodeSig/5 guardChecksNode> {
-  private predicate ssaDefReachesCertainUse(Definition def, UseImpl use) {
-    exists(SourceVariable v, IRBlock bb, int i |
-      use.hasIndexInBlock(bb, i, v) and
-      variableRead(bb, i, v, true) and
-      ssaDefReachesRead(v, def, bb, i)
-    )
-  }
-
   private predicate guardChecksInstr(
     IRGuards::Guards_v1::Guard g, IRGuards::GuardsInput::Expr instr, IRGuards::GuardValue gv,
     ParamIntPair<P>::TPair pair
@@ -1279,24 +1271,9 @@ module BarrierGuardWithIntParam<ParamSig P, IntWithParam<P>::guardChecksNodeSig/
   }
 
   Node getABarrierNode(int indirectionIndex, P p) {
-    // Only get the SynthNodes from the shared implementation, as the ExprNodes cannot
-    // be matched on SourceVariable.
-    result.(SsaSynthNode).getSynthNode() =
+    fromDfNode(result) =
       DataFlowIntegrationImpl::BarrierGuardDefWithState<ParamIntPair<P>::MkPair, guardChecksWithWrappers/4>::getABarrierNode(ParamIntPair<P>::MkPair(p,
           indirectionIndex))
-    or
-    // Calculate the guarded UseImpls corresponding to ExprNodes directly.
-    exists(
-      DataFlowIntegrationInput::Guard g, IRGuards::GuardValue branch, Definition def, IRBlock bb
-    |
-      exists(UseImpl use |
-        guardChecksWithWrappers(g, def, branch, ParamIntPair<P>::MkPair(p, indirectionIndex)) and
-        ssaDefReachesCertainUse(def, use) and
-        use.getBlock() = bb and
-        DataFlowIntegrationInput::guardControlsBlock(g, bb, branch) and
-        result = use.getNode()
-      )
-    )
   }
 }
 
@@ -1313,13 +1290,12 @@ module BarrierGuard<ParamSig P, WithParam<P>::guardChecksNodeSig/4 guardChecksNo
   }
 }
 
-bindingset[result, v]
-pragma[inline_late]
-private DataFlowIntegrationImpl::Node fromDfNode(Node n, SourceVariable v) {
+pragma[nomagic]
+private DataFlowIntegrationImpl::Node fromDfNode(Node n) {
   result = n.(SsaSynthNode).getSynthNode()
   or
-  exists(UseImpl use, IRBlock bb, int i |
-    result.(DataFlowIntegrationImpl::ExprNode).getExpr().hasCfgNode(bb, i) and
+  exists(UseImpl use, IRBlock bb, int i, SourceVariable v |
+    result.(DataFlowIntegrationImpl::ReadNode).readsAt(bb, i, v) and
     use.hasIndexInBlock(bb, i, v) and
     use.isCertain() and
     use.getNode() = n
@@ -1329,10 +1305,8 @@ private DataFlowIntegrationImpl::Node fromDfNode(Node n, SourceVariable v) {
 }
 
 private predicate ssaFlowImpl(Node nodeFrom, Node nodeTo) {
-  exists(SourceVariable v |
-    nodeFrom != nodeTo and
-    DataFlowIntegrationImpl::localFlowStep(v, fromDfNode(nodeFrom, v), fromDfNode(nodeTo, v), _)
-  )
+  nodeFrom != nodeTo and
+  DataFlowIntegrationImpl::localFlowStep(_, fromDfNode(nodeFrom), fromDfNode(nodeTo), _)
 }
 
 /** Holds if there is def-use or use-use flow from `nodeFrom` to `nodeTo`. */
@@ -1405,14 +1379,96 @@ private class PhiCycle extends PhiCycleEquivalence::EquivalenceClass {
   }
 }
 
-/** An static single assignment (SSA) definition. */
-class Definition extends SsaImpl::Definition {
-  private Definition getAPhiInputOrPriorDefinition() {
-    result = this.(PhiNode).getAnInput()
-    or
-    uncertainWriteDefinitionInput(this, result)
+private Definition getAPhiInputOrPriorDefinition(Definition def) {
+  result = def.(PhiNode).getAnInput()
+  or
+  uncertainWriteDefinitionInput(def, result)
+}
+
+module Public {
+  /**
+   * A module signature to define relevant ultimate definitions for an
+   * optimized version of `Definition.getAnUltimateDefinition`.
+   */
+  signature module GetAnUltimateDefinitionSig {
+    /**
+     * Holds if `def` is a relevant definition. This defines the set
+     * of `Definition`s which may be returned by
+     * `GetAnUltimateDefinition::getAnUltimateDefinition`.
+     */
+    predicate isRelevantUltimateDefinition(Definition def);
   }
 
+  /**
+   * A module which constructs an optimized version of
+   * ```
+   * Definition.getAnUltimateDefinition
+   * ```
+   * by restricting the set of possible ultimate definitions.
+   *
+   * Use this module by defining a module `M` which implements
+   * `GetAnUltimateDefinitionSig` and then call:
+   * ```
+   * GetAnUltimateDefinition<M>::getAnUltimateDefinition
+   * ```
+   */
+  module GetAnUltimateDefinition<GetAnUltimateDefinitionSig Sig> {
+    private import Sig
+
+    private predicate relevantUltimateDefinition(Definition def) {
+      isRelevantUltimateDefinition(def) and
+      not def instanceof PhiNode
+    }
+
+    /**
+     * The `getAnUltimateDefinition` predicate uses an optimized step relation
+     * which is pruned to only those uncertain steps which lead back to a
+     * definition which satisfies `relevantUltimateDefinition`. This predicate
+     * computes the subset of `Definition`s which can lead back to definitions
+     * which satisfy `relevantUltimateDefinition`.
+     */
+    private predicate fwd(Definition def) {
+      // Base case: This definition is a relevant definition
+      relevantUltimateDefinition(def)
+      or
+      exists(Definition def0 |
+        // Recursive case: `def0` is a relevant definition, and
+        // `def` is an uncertain step which takes us back to `def0`.
+        fwd(def0) and
+        def0 = getAPhiInputOrPriorDefinition(def)
+      )
+    }
+
+    /**
+     * Holds if `def1 = getAPhiInputOrPriorDefinition(def2)`, and
+     * both `def1` and `def2` are part of a sequence of uncertain
+     * steps which lead back to a `Definition` which
+     * satisfies `relevantUltimateDefinition`.
+     */
+    private predicate step(Definition def1, Definition def2) {
+      fwd(def1) and
+      fwd(def2) and
+      def1 = getAPhiInputOrPriorDefinition(def2)
+    }
+
+    /**
+     * Gets a definition that ultimately defines this SSA definition and is
+     * not itself a phi node.
+     *
+     * This predicate is restricted to ultimate definitions which
+     * satisfy `isRelevantUltimateDefinition`.
+     */
+    Definition getAnUltimateDefinition(Definition def) {
+      step*(result, def) and
+      relevantUltimateDefinition(result)
+    }
+  }
+}
+
+import Public
+
+/** A static single assignment (SSA) definition. */
+class Definition extends SsaImpl::Definition {
   /**
    * Holds if this SSA definition is live at the end of basic block `bb`.
    * That is, this definition reaches the end of basic block `bb`, at which
@@ -1424,9 +1480,13 @@ class Definition extends SsaImpl::Definition {
   /**
    * Gets a definition that ultimately defines this SSA definition and is
    * not itself a phi node.
+   *
+   * Note: A more efficient implementation of this predicate exists. See the
+   * `GetAnUltimateDefinition` module for a description of how to access
+   * the more efficient implementation.
    */
   final Definition getAnUltimateDefinition() {
-    result = this.getAPhiInputOrPriorDefinition*() and
+    result = getAPhiInputOrPriorDefinition*(this) and
     not result instanceof PhiNode
   }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
index 31931189003c..2fdac4649fd7 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
@@ -40,10 +40,21 @@ CppType getLanguageType(Operand operand) { result = getResultLanguageType(operan
  * - If `type = MyStruct`, the result is 1
  * - If `type = char*`, the result is 2
  */
-int getMaxIndirectionsForType(Type type) {
+int getMaxIndirectionsForGLType(Type type) {
   result = countIndirectionsForCppType(getTypeForGLValue(type))
 }
 
+/**
+ * Gets the maximum number of indirections a prvalue of type `type` can have.
+ * For example:
+ * - If `type = int`, the result is 0
+ * - If `type = MyStruct`, the result is 0
+ * - If `type = char*`, the result is 1
+ */
+int getMaxIndirectionsForPRType(Type type) {
+  result = countIndirectionsForCppType(getTypeForPRValue(type))
+}
+
 private class PointerOrArrayOrReferenceType extends Cpp::DerivedType {
   PointerOrArrayOrReferenceType() {
     this instanceof Cpp::PointerType
@@ -206,6 +217,16 @@ private module IteratorIndirections {
       )
     }
 
+    // A by-value crement result loads the iterator, rather than aliasing its address.
+    override predicate isAdditionalDereference(Instruction deref, Operand address) {
+      exists(CallInstruction call |
+        deref = call and
+        call.getStaticCallTarget() instanceof Iterator::IteratorCrementMemberOperator and
+        not call.getResultType() instanceof Cpp::ReferenceType and
+        address = call.getThisArgumentOperand()
+      )
+    }
+
     override predicate isAdditionalConversionFlow(Operand opFrom, Instruction instrTo) {
       // This is a bit annoying: Consider the following snippet:
       // ```
@@ -244,11 +265,11 @@ private module IteratorIndirections {
         store.getDestinationAddress() = var
       )
       or
-      // A call to `operator++` or `operator--` is the iterator equivalent version of a
-      // pointer arithmetic instruction.
+      // A reference-returning `operator++` or `operator--` preserves the iterator's address.
       exists(CallInstruction call |
         instrTo = call and
         call.getStaticCallTarget() instanceof Iterator::IteratorCrementMemberOperator and
+        call.getResultType() instanceof Cpp::ReferenceType and
         opFrom = call.getThisArgumentOperand()
       )
     }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
index e4e0adf5897b..84c0a92ec8e6 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
@@ -67,8 +67,7 @@ private module Cached {
     model = ""
     or
     // models-as-data summarized flow
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-      nodeTo.(FlowSummaryNode).getSummaryNode(), false, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, false, model)
     or
     // object->field conflation for content that is a `TaintInheritingContent`.
     exists(DataFlow::ContentSet f |
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
index b7dcd4d8f754..5205e8d3f0ba 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
@@ -1706,6 +1706,13 @@ class CallInstruction extends Instruction {
     result.getIndex() = index
   }
 
+  /**
+   * Gets a positional argument operand, if any.
+   */
+  final PositionalArgumentOperand getAPositionalArgumentOperand() {
+    result = this.getPositionalArgumentOperand(_)
+  }
+
   /**
    * Gets the argument at the specified index.
    */
@@ -1714,6 +1721,11 @@ class CallInstruction extends Instruction {
     result = this.getPositionalArgumentOperand(index).getDef()
   }
 
+  /**
+   * Gets a positional argument, if any.
+   */
+  final Instruction getAPositionalArgument() { result = this.getPositionalArgument(_) }
+
   /**
    * Gets the argument operand at the specified index, or `this` if `index` is `-1`.
    */
@@ -1735,6 +1747,13 @@ class CallInstruction extends Instruction {
    */
   final int getNumberOfArguments() { result = count(this.getAnArgumentOperand()) }
 
+  /**
+   * Gets the number of positional arguments of the call.
+   */
+  final int getNumberOfPositionalArguments() {
+    result = count(this.getAPositionalArgumentOperand())
+  }
+
   /**
    * Holds if the result is a side effect for the argument at the specified index, or `this` if
    * `index` is `-1`.
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
index 41e1a4c3082d..7871ddb16189 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
@@ -396,9 +396,7 @@ private int maxColumnWidth() {
 }
 
 private string getPaddingString(int n) {
-  n = 0 and result = ""
-  or
-  n > 0 and n <= maxColumnWidth() and result = getPaddingString(n - 1) + " "
+  n = [0 .. maxColumnWidth()] and result = concat(int i | i in [1 .. n] | " ")
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
index 522cd393081e..59ee08973e1a 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
@@ -295,6 +295,11 @@ abstract class MemoryLocation0 extends TMemoryLocation {
  */
 abstract class VirtualVariable extends MemoryLocation0 { }
 
+pragma[nomagic]
+private VirtualVariable getAllocationMemoryLocation(Allocation alloc) {
+  result.getAnAllocation() = alloc
+}
+
 abstract class AllocationMemoryLocation extends MemoryLocation0 {
   Allocation var;
   boolean isMayAccess;
@@ -313,7 +318,7 @@ abstract class AllocationMemoryLocation extends MemoryLocation0 {
       result = getGroupedMemoryLocation(var, false, false).getVirtualVariable()
       or
       not exists(getGroupedMemoryLocation(var, false, false)) and
-      result.(AllocationMemoryLocation).getAnAllocation() = var
+      result = getAllocationMemoryLocation(var)
     )
   }
 
@@ -815,6 +820,7 @@ private predicate isRelatableMemoryLocation(VariableMemoryLocation vml) {
   vml.getStartBitOffset() != Ints::unknown()
 }
 
+pragma[no_dynamic_join_order]
 private predicate isCoveredOffset(Allocation var, int offsetRank, VariableMemoryLocation vml) {
   exists(int startRank, int endRank, VirtualVariable vvar |
     vml.getStartBitOffset() = rank[startRank](IntValue offset_ | isRelevantOffset(vvar, offset_)) and
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
index b7dcd4d8f754..5205e8d3f0ba 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
@@ -1706,6 +1706,13 @@ class CallInstruction extends Instruction {
     result.getIndex() = index
   }
 
+  /**
+   * Gets a positional argument operand, if any.
+   */
+  final PositionalArgumentOperand getAPositionalArgumentOperand() {
+    result = this.getPositionalArgumentOperand(_)
+  }
+
   /**
    * Gets the argument at the specified index.
    */
@@ -1714,6 +1721,11 @@ class CallInstruction extends Instruction {
     result = this.getPositionalArgumentOperand(index).getDef()
   }
 
+  /**
+   * Gets a positional argument, if any.
+   */
+  final Instruction getAPositionalArgument() { result = this.getPositionalArgument(_) }
+
   /**
    * Gets the argument operand at the specified index, or `this` if `index` is `-1`.
    */
@@ -1735,6 +1747,13 @@ class CallInstruction extends Instruction {
    */
   final int getNumberOfArguments() { result = count(this.getAnArgumentOperand()) }
 
+  /**
+   * Gets the number of positional arguments of the call.
+   */
+  final int getNumberOfPositionalArguments() {
+    result = count(this.getAPositionalArgumentOperand())
+  }
+
   /**
    * Holds if the result is a side effect for the argument at the specified index, or `this` if
    * `index` is `-1`.
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
index 41e1a4c3082d..7871ddb16189 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
@@ -396,9 +396,7 @@ private int maxColumnWidth() {
 }
 
 private string getPaddingString(int n) {
-  n = 0 and result = ""
-  or
-  n > 0 and n <= maxColumnWidth() and result = getPaddingString(n - 1) + " "
+  n = [0 .. maxColumnWidth()] and result = concat(int i | i in [1 .. n] | " ")
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
index 58456476f6a2..8103f64a5144 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
@@ -303,7 +303,7 @@ private predicate isInConditionalEvaluation(Expr e) {
   isInConditionalEvaluation(getRealParent(e))
 }
 
-private predicate isConditionalTemporaryDestructorCall(DestructorCall dc) {
+predicate isConditionalTemporaryDestructorCall(DestructorCall dc) {
   exists(TemporaryObjectExpr temp |
     temp = dc.getQualifier().(ReuseExpr).getReusedExpr() and
     isInConditionalEvaluation(temp)
@@ -430,14 +430,18 @@ private predicate mustTransformToGLValue(Expr expr) {
 }
 
 /**
- * Holds if `expr` has an lvalue-to-rvalue conversion that should be ignored
- * when generating IR. This occurs for conversion from an lvalue of function type
- * to an rvalue of function pointer type. The conversion is represented in the
- * AST as an lvalue-to-rvalue conversion, but the IR represents both a function
+ * Holds if `expr` has an explicit or implicit load that should be ignored
+ * when generating IR. For example, this occurs for conversion from an lvalue of
+ * function type to an rvalue of function pointer type. The conversion is represented
+ * in the AST as an lvalue-to-rvalue conversion, but the IR represents both a function
  * lvalue and a function pointer prvalue the same.
  */
 predicate ignoreLoad(Expr expr) {
-  expr.hasLValueToRValueConversion() and
+  (
+    expr.hasLValueToRValueConversion()
+    or
+    isPRValueFieldAccessWithImplicitLoad(expr)
+  ) and
   (
     expr instanceof ThisExpr
     or
@@ -517,8 +521,11 @@ predicate hasTranslatedLoad(Expr expr) {
 predicate hasTranslatedSyntheticTemporaryObject(Expr expr) {
   not ignoreExpr(expr) and
   mustTransformToGLValue(expr) and
-  // If it's a load, we'll just ignore the load in `ignoreLoad()`.
-  not expr.hasLValueToRValueConversion()
+  // If it's an explicit or implicit field load, reuse the existing address by
+  // ignoring the load in `ignoreLoad` instead of materializing another
+  // temporary.
+  not expr.hasLValueToRValueConversion() and
+  not isPRValueFieldAccessWithImplicitLoad(expr)
 }
 
 Opcode comparisonOpcode(ComparisonOperation expr) {
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
index 9a437b905381..5605e4857f7b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
@@ -107,7 +107,12 @@ abstract class TranslatedExpr extends TranslatedElement {
   }
 
   final private TranslatedExpr getImplicitDestructorCall(int index) {
-    result.getExpr() = expr.getImplicitDestructorCall(index)
+    result.getExpr() =
+      rank[index + 1](DestructorCall dc, int i |
+        dc = expr.getImplicitDestructorCall(i) and not isConditionalTemporaryDestructorCall(dc)
+      |
+        dc order by i
+      )
   }
 
   final override predicate hasAnImplicitDestructorCall() {
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll
index 10c033131225..c24cb98d2bd9 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll
@@ -618,6 +618,11 @@ class TranslatedExplicitFieldInitialization extends TranslatedNonDefaultFieldIni
   override int getPosition() { result = position }
 }
 
+pragma[nomagic]
+private Instruction getCallInstruction(TranslatedDefaultFieldInitialization tdfi) {
+  result = tdfi.getInstruction(CallTag())
+}
+
 /**
  * The IR translation of the initialization of a field from an element of an initializer
  * list where default initialization is used.
@@ -642,7 +647,7 @@ class TranslatedDefaultFieldInitialization extends TranslatedFieldInitialization
 
   override Instruction getInstructionSuccessorInternal(InstructionTag tag, EdgeKind kind) {
     tag = CallTargetTag() and
-    result = this.getInstruction(CallTag())
+    result = getCallInstruction(this)
     or
     tag = CallTag() and
     result = this.getSideEffects().getFirstInstruction(kind)
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
index 7dfebc56fe18..9ffa132c7eab 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
@@ -297,11 +297,20 @@ abstract class TranslatedStmt extends TranslatedElement, TTranslatedStmt {
 
   abstract TranslatedElement getChildInternal(int id);
 
+  DestructorCall getImplicitDestructorCall(int index) {
+    result =
+      rank[index + 1](DestructorCall dc, int i |
+        dc = stmt.getImplicitDestructorCall(i) and not isConditionalTemporaryDestructorCall(dc)
+      |
+        dc order by i
+      )
+  }
+
   final override TranslatedElement getChild(int id) {
     result = this.getChildInternal(id)
     or
     exists(int destructorIndex |
-      result.(TranslatedExpr).getExpr() = stmt.getImplicitDestructorCall(destructorIndex) and
+      result.(TranslatedExpr).getExpr() = this.getImplicitDestructorCall(destructorIndex) and
       id = this.getFirstDestructorCallIndex() + destructorIndex
     )
   }
@@ -313,7 +322,7 @@ abstract class TranslatedStmt extends TranslatedElement, TTranslatedStmt {
   }
 
   final override predicate hasAnImplicitDestructorCall() {
-    exists(stmt.getAnImplicitDestructorCall())
+    exists(this.getImplicitDestructorCall(_))
   }
 
   final override string toString() { result = stmt.toString() }
@@ -1227,7 +1236,7 @@ class TranslatedWhileStmt extends TranslatedLoop {
     id = 1 and result = this.getBody()
     or
     exists(int n |
-      result.getAst() = stmt.getImplicitDestructorCall(n) and
+      result.getAst() = this.getImplicitDestructorCall(n) and
       id = 2 + n
     )
   }
@@ -1289,7 +1298,7 @@ class TranslatedForStmt extends TranslatedLoop {
     id = 3 and result = this.getBody()
     or
     exists(int n |
-      result.getAst() = stmt.getImplicitDestructorCall(n) and
+      result.getAst() = this.getImplicitDestructorCall(n) and
       id = 4 + n
     )
   }
@@ -1492,13 +1501,13 @@ class TranslatedJumpStmt extends TranslatedStmt {
   }
 
   private TranslatedCall getTranslatedImplicitDestructorCall(int id) {
-    result.getExpr() = stmt.getImplicitDestructorCall(id)
+    result.getExpr() = this.getImplicitDestructorCall(id)
   }
 
   override TranslatedElement getLastChild() {
     result =
       this.getTranslatedImplicitDestructorCall(max(int id |
-          exists(stmt.getImplicitDestructorCall(id))
+          exists(this.getImplicitDestructorCall(id))
         ))
   }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
index b7dcd4d8f754..5205e8d3f0ba 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
@@ -1706,6 +1706,13 @@ class CallInstruction extends Instruction {
     result.getIndex() = index
   }
 
+  /**
+   * Gets a positional argument operand, if any.
+   */
+  final PositionalArgumentOperand getAPositionalArgumentOperand() {
+    result = this.getPositionalArgumentOperand(_)
+  }
+
   /**
    * Gets the argument at the specified index.
    */
@@ -1714,6 +1721,11 @@ class CallInstruction extends Instruction {
     result = this.getPositionalArgumentOperand(index).getDef()
   }
 
+  /**
+   * Gets a positional argument, if any.
+   */
+  final Instruction getAPositionalArgument() { result = this.getPositionalArgument(_) }
+
   /**
    * Gets the argument operand at the specified index, or `this` if `index` is `-1`.
    */
@@ -1735,6 +1747,13 @@ class CallInstruction extends Instruction {
    */
   final int getNumberOfArguments() { result = count(this.getAnArgumentOperand()) }
 
+  /**
+   * Gets the number of positional arguments of the call.
+   */
+  final int getNumberOfPositionalArguments() {
+    result = count(this.getAPositionalArgumentOperand())
+  }
+
   /**
    * Holds if the result is a side effect for the argument at the specified index, or `this` if
    * `index` is `-1`.
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
index 41e1a4c3082d..7871ddb16189 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
@@ -396,9 +396,7 @@ private int maxColumnWidth() {
 }
 
 private string getPaddingString(int n) {
-  n = 0 and result = ""
-  or
-  n > 0 and n <= maxColumnWidth() and result = getPaddingString(n - 1) + " "
+  n = [0 .. maxColumnWidth()] and result = concat(int i | i in [1 .. n] | " ")
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeAnalysisUtils.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeAnalysisUtils.qll
index 03dbc56dc99c..3b316f5bce5c 100644
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeAnalysisUtils.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeAnalysisUtils.qll
@@ -406,7 +406,7 @@ predicate cmpWithLinearBound(
  */
 private predicate typeBounds0(ArithmeticType t, float lb, float ub) {
   exists(IntegralType integralType, float limit |
-    integralType = t and limit = 2.pow(8 * integralType.getSize())
+    integralType = t and limit = 2.pow(integralType.getBitWidth())
   |
     if integralType instanceof BoolType
     then lb = 0 and ub = 1
@@ -438,7 +438,7 @@ private IntegralType getUnderlyingTypeForEnum(Enum e) {
   not e.hasExplicitUnderlyingType() and
   result.isSigned() and
   exists(IntType intType |
-    if max(e.getAnEnumConstant().getValue().toFloat()) >= 2.pow(8 * intType.getSize() - 1)
+    if max(e.getAnEnumConstant().getValue().toFloat()) >= 2.pow(intType.getBitWidth() - 1)
     then result instanceof LongType
     else result = intType
   )
diff --git a/cpp/ql/lib/semmle/code/cpp/regex/RegexTreeView.qll b/cpp/ql/lib/semmle/code/cpp/regex/RegexTreeView.qll
new file mode 100644
index 000000000000..4d7176c14b75
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/regex/RegexTreeView.qll
@@ -0,0 +1,1254 @@
+/**
+ * Provides a class hierarchy corresponding to a parse tree of C++ regular expressions.
+ */
+
+private import internal.ParseRegExp
+private import codeql.util.Numbers
+private import semmle.code.cpp.exprs.Literal
+private import codeql.regex.RegexTreeView
+// exporting as RegexTreeView, and in the top-level scope.
+import Impl as RegexTreeView
+import Impl
+
+/** Gets the parse tree resulting from parsing `re`, if such has been constructed. */
+RegExpTerm getParsedRegExp(StringLiteral re) { result.getRegExp() = re and result.isRootTerm() }
+
+/**
+ * An element containing a regular expression term, that is, either
+ * a string literal (parsed as a regular expression)
+ * or another regular expression term.
+ *
+ * For sequences and alternations, we require at least one child.
+ * Otherwise, we wish to represent the term differently.
+ * This avoids multiple representations of the same term.
+ */
+private newtype TRegExpParent =
+  /** A string literal used as a regular expression */
+  TRegExpLiteral(RegExp re) or
+  /** A quantified term */
+  TRegExpQuantifier(RegExp re, int start, int end) { re.qualifiedItem(start, end, _, _) } or
+  /** A sequence term */
+  TRegExpSequence(RegExp re, int start, int end) { re.sequence(start, end) } or
+  /** An alternation term */
+  TRegExpAlt(RegExp re, int start, int end) { re.alternation(start, end) } or
+  /** A character class term */
+  TRegExpCharacterClass(RegExp re, int start, int end) { re.charSet(start, end) } or
+  /** A character range term */
+  TRegExpCharacterRange(RegExp re, int start, int end) { re.charRange(_, start, _, _, end) } or
+  /** A group term */
+  TRegExpGroup(RegExp re, int start, int end) { re.group(start, end) } or
+  /** A special character */
+  TRegExpSpecialChar(RegExp re, int start, int end) { re.specialCharacter(start, end, _) } or
+  /** A normal character */
+  TRegExpNormalChars(RegExp re, int start, int end) {
+    re.normalCharacterSequence(start, end)
+    or
+    re.escapedCharacter(start, end) and
+    not re.specialCharacter(start, end, _)
+  } or
+  /** A back reference */
+  TRegExpBackRef(RegExp re, int start, int end) { re.backreference(start, end) } or
+  /** A named character property */
+  TRegExpNamedCharacterProperty(RegExp re, int start, int end) {
+    re.namedCharacterProperty(start, end, _, _)
+  }
+
+/** An implementation that satisfies the RegexTreeView signature. */
+private module Impl implements RegexTreeViewSig {
+  /**
+   * An element containing a regular expression term, that is, either
+   * a string literal (parsed as a regular expression)
+   * or another regular expression term.
+   */
+  class RegExpParent extends TRegExpParent {
+    /** Gets a textual representation of this element. */
+    string toString() { result = "RegExpParent" }
+
+    /** Gets the `i`th child term. */
+    RegExpTerm getChild(int i) { none() }
+
+    /** Gets a child term . */
+    final RegExpTerm getAChild() { result = this.getChild(_) }
+
+    /** Gets the number of child terms. */
+    int getNumChild() { result = count(this.getAChild()) }
+
+    /** Gets the last child term of this element. */
+    RegExpTerm getLastChild() { result = this.getChild(this.getNumChild() - 1) }
+
+    /**
+     * Gets the name of a primary CodeQL class to which this regular
+     * expression term belongs.
+     */
+    string getAPrimaryQlClass() { result = "RegExpParent" }
+
+    /**
+     * Gets a comma-separated list of the names of the primary CodeQL classes to
+     * which this regular expression term belongs.
+     */
+    final string getPrimaryQlClasses() { result = concat(this.getAPrimaryQlClass(), ",") }
+  }
+
+  /** A string literal used as a regular expression */
+  class RegExpLiteral extends TRegExpLiteral, RegExpParent {
+    RegExp re;
+
+    RegExpLiteral() { this = TRegExpLiteral(re) }
+
+    override RegExpTerm getChild(int i) {
+      i = 0 and result.getRegExp() = re and result.isRootTerm()
+    }
+
+    /** Holds if dot, `.`, matches all characters, including newlines. */
+    predicate isDotAll() { re.isDotAll() }
+
+    /** Holds if this regex matching is case-insensitive for this regex. */
+    predicate isIgnoreCase() { re.isIgnoreCase() }
+
+    /** Get a string representing all modes for this regex. */
+    string getFlags() { result = re.getFlags() }
+
+    /** Gets the primary QL class for this regex. */
+    override string getAPrimaryQlClass() { result = "RegExpLiteral" }
+  }
+
+  /**
+   * A regular expression term, that is, a syntactic part of a regular expression.
+   */
+  class RegExpTerm extends RegExpParent {
+    RegExp re;
+    int start;
+    int end;
+
+    RegExpTerm() {
+      this = TRegExpAlt(re, start, end)
+      or
+      this = TRegExpBackRef(re, start, end)
+      or
+      this = TRegExpCharacterClass(re, start, end)
+      or
+      this = TRegExpCharacterRange(re, start, end)
+      or
+      this = TRegExpNormalChars(re, start, end)
+      or
+      this = TRegExpGroup(re, start, end)
+      or
+      this = TRegExpQuantifier(re, start, end)
+      or
+      this = TRegExpSequence(re, start, end) and
+      exists(seqChild(re, start, end, 1)) // if a sequence does not have more than one element, it should be treated as that element instead.
+      or
+      this = TRegExpSpecialChar(re, start, end)
+      or
+      this = TRegExpNamedCharacterProperty(re, start, end)
+    }
+
+    /**
+     * Gets the outermost term of this regular expression.
+     */
+    RegExpTerm getRootTerm() {
+      this.isRootTerm() and result = this
+      or
+      result = this.getParent().(RegExpTerm).getRootTerm()
+    }
+
+    /**
+     * Holds if this term is part of a string literal
+     * that is interpreted as a regular expression.
+     */
+    predicate isUsedAsRegExp() { any() }
+
+    /**
+     * Holds if this is the root term of a regular expression.
+     */
+    predicate isRootTerm() { start = 0 and end = re.getText().length() }
+
+    override RegExpTerm getChild(int i) {
+      result = this.(RegExpAlt).getChild(i)
+      or
+      result = this.(RegExpBackRef).getChild(i)
+      or
+      result = this.(RegExpCharacterClass).getChild(i)
+      or
+      result = this.(RegExpCharacterRange).getChild(i)
+      or
+      result = this.(RegExpNormalChars).getChild(i)
+      or
+      result = this.(RegExpGroup).getChild(i)
+      or
+      result = this.(RegExpQuantifier).getChild(i)
+      or
+      result = this.(RegExpSequence).getChild(i)
+      or
+      result = this.(RegExpSpecialChar).getChild(i)
+      or
+      result = this.(RegExpNamedCharacterProperty).getChild(i)
+    }
+
+    /**
+     * Gets the parent term of this regular expression term, or the
+     * regular expression literal if this is the root term.
+     */
+    RegExpParent getParent() { result.getAChild() = this }
+
+    /** Gets the associated `RegExp`. */
+    RegExp getRegExp() { result = re }
+
+    /** Gets the offset at which this term starts. */
+    int getStart() { result = start }
+
+    /** Gets the offset at which this term ends. */
+    int getEnd() { result = end }
+
+    override string toString() { result = re.getText().substring(start, end) }
+
+    /**
+     * Gets the location of the surrounding regex, as locations inside the regex do not exist.
+     * To get location information corresponding to the term inside the regex,
+     * use `hasLocationInfo`.
+     */
+    Location getLocation() { result = re.getLocation() }
+
+    /**
+     * Gets the number of source characters from the start of the string literal
+     * to the first content character (i.e., past the opening delimiter).
+     */
+    private int regexpContentOffset() {
+      exists(string vt | vt = re.getValueText() |
+        // Find the '(' that opens the raw content.
+        re instanceof RawStringLiteral and
+        result = 1 + min(int i | vt.charAt(i) = "(")
+        or
+        // Find the opening '"'.
+        not re instanceof RawStringLiteral and
+        result = 1 + min(int i | vt.charAt(i) = "\"")
+        or
+        // No opening '"'.
+        not re instanceof RawStringLiteral and
+        not vt.charAt(_) = "\"" and
+        result = 0
+      )
+    }
+
+    /**
+     * Holds if this term is found at the specified location offsets.
+     *
+     * Note: these locations may not be accurate when the regex was not defined as a raw string
+     * and contains `\`-escaped characters, or when macros were used to define the regex.
+     */
+    predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
+      exists(int re_start, int offset |
+        re.getLocation().hasLocationInfo(filepath, startline, re_start, endline, _) and
+        offset = this.regexpContentOffset() and
+        startcolumn = re_start + offset + start and
+        endcolumn = re_start + offset + end - 1
+      )
+    }
+
+    /** Gets the file in which this term is found. */
+    File getFile() { result = this.getLocation().getFile() }
+
+    /** Gets the raw source text of this term. */
+    string getRawValue() { result = this.toString() }
+
+    /** Gets the string literal in which this term is found. */
+    RegExpLiteral getLiteral() { result = TRegExpLiteral(re) }
+
+    /** Gets the regular expression term that is matched (textually) before this one, if any. */
+    RegExpTerm getPredecessor() {
+      exists(RegExpTerm parent | parent = this.getParent() |
+        result = parent.(RegExpSequence).previousElement(this)
+        or
+        not exists(parent.(RegExpSequence).previousElement(this)) and
+        not parent instanceof RegExpSubPattern and
+        result = parent.getPredecessor()
+      )
+    }
+
+    /** Gets the regular expression term that is matched (textually) after this one, if any. */
+    RegExpTerm getSuccessor() {
+      exists(RegExpTerm parent | parent = this.getParent() |
+        result = parent.(RegExpSequence).nextElement(this)
+        or
+        not exists(parent.(RegExpSequence).nextElement(this)) and
+        not parent instanceof RegExpSubPattern and
+        result = parent.getSuccessor()
+      )
+    }
+
+    /**
+     * Gets the single string this regular-expression term matches.
+     *
+     * This predicate is only defined for (sequences/groups of) constant regular
+     * expressions.  In particular, terms involving zero-width assertions like `^`
+     * or `\b` are not considered to have a constant value.
+     *
+     * Note that this predicate does not take flags of the enclosing
+     * regular-expression literal into account.
+     */
+    string getConstantValue() { none() }
+
+    /**
+     * Gets a string that is matched by this regular-expression term.
+     */
+    string getAMatchedString() { result = this.getConstantValue() }
+
+    /** Gets the primary QL class for this term. */
+    override string getAPrimaryQlClass() { result = "RegExpTerm" }
+
+    /** Holds if this regular expression term can match the empty string. */
+    predicate isNullable() { none() }
+  }
+
+  /**
+   * A quantified regular expression term.
+   *
+   * Example:
+   *
+   * ```
+   * ((ECMA|Java)[sS]cript)*
+   * ```
+   */
+  class RegExpQuantifier extends RegExpTerm, TRegExpQuantifier {
+    int part_end;
+    boolean may_repeat_forever;
+
+    RegExpQuantifier() {
+      this = TRegExpQuantifier(re, start, end) and
+      re.qualifiedPart(start, part_end, end, _, may_repeat_forever)
+    }
+
+    override RegExpTerm getChild(int i) {
+      i = 0 and
+      result.getRegExp() = re and
+      result.getStart() = start and
+      result.getEnd() = part_end
+    }
+
+    /** Holds if this term may match an unlimited number of times. */
+    predicate mayRepeatForever() { may_repeat_forever = true }
+
+    /** Gets the qualifier for this term. That is e.g "?" for "a?". */
+    string getQualifier() { result = re.getText().substring(part_end, end) }
+
+    override string getAPrimaryQlClass() { result = "RegExpQuantifier" }
+  }
+
+  /**
+   * A regular expression term that permits unlimited repetitions.
+   */
+  class InfiniteRepetitionQuantifier extends RegExpQuantifier {
+    InfiniteRepetitionQuantifier() { this.mayRepeatForever() }
+
+    override string getAPrimaryQlClass() { result = "InfiniteRepetitionQuantifier" }
+  }
+
+  /**
+   * A star-quantified term.
+   *
+   * Example:
+   *
+   * ```
+   * \w*
+   * ```
+   */
+  class RegExpStar extends InfiniteRepetitionQuantifier {
+    RegExpStar() { this.getQualifier().charAt(0) = "*" }
+
+    override string getAPrimaryQlClass() { result = "RegExpStar" }
+
+    override predicate isNullable() { any() }
+  }
+
+  /**
+   * A plus-quantified term.
+   *
+   * Example:
+   *
+   * ```
+   * \w+
+   * ```
+   */
+  class RegExpPlus extends InfiniteRepetitionQuantifier {
+    RegExpPlus() { this.getQualifier().charAt(0) = "+" }
+
+    override string getAPrimaryQlClass() { result = "RegExpPlus" }
+
+    override predicate isNullable() { this.getAChild().isNullable() }
+  }
+
+  /**
+   * An optional term.
+   *
+   * Example:
+   *
+   * ```
+   * ;?
+   * ```
+   */
+  class RegExpOpt extends RegExpQuantifier {
+    RegExpOpt() { this.getQualifier().charAt(0) = "?" }
+
+    override string getAPrimaryQlClass() { result = "RegExpOpt" }
+
+    override predicate isNullable() { any() }
+  }
+
+  /**
+   * A range-quantified term
+   *
+   * Examples:
+   *
+   * ```
+   * \w{2,4}
+   * \w{2,}
+   * \w{2}
+   * ```
+   */
+  class RegExpRange extends RegExpQuantifier {
+    string upper;
+    string lower;
+
+    RegExpRange() { re.multiples(part_end, end, lower, upper) }
+
+    override string getAPrimaryQlClass() { result = "RegExpRange" }
+
+    /** Gets the string defining the upper bound of this range, if any. */
+    string getUpper() { result = upper }
+
+    /** Gets the string defining the lower bound of this range, if any. */
+    string getLower() { result = lower }
+
+    /**
+     * Gets the upper bound of the range, if any.
+     *
+     * If there is no upper bound, any number of repetitions is allowed.
+     * For a term of the form `r{lo}`, both the lower and the upper bound
+     * are `lo`.
+     */
+    int getUpperBound() { result = this.getUpper().toInt() }
+
+    /** Gets the lower bound of the range. */
+    int getLowerBound() { result = this.getLower().toInt() }
+
+    override predicate isNullable() { this.getAChild().isNullable() or this.getLowerBound() = 0 }
+  }
+
+  /**
+   * A sequence term.
+   *
+   * Example:
+   *
+   * ```
+   * (ECMA|Java)Script
+   * ```
+   *
+   * This is a sequence with the elements `(ECMA|Java)` and `Script`.
+   */
+  class RegExpSequence extends RegExpTerm, TRegExpSequence {
+    RegExpSequence() {
+      this = TRegExpSequence(re, start, end) and
+      exists(seqChild(re, start, end, 1)) // if a sequence does not have more than one element, it should be treated as that element instead.
+    }
+
+    override RegExpTerm getChild(int i) { result = seqChild(re, start, end, i) }
+
+    /** Gets the element preceding `element` in this sequence. */
+    RegExpTerm previousElement(RegExpTerm element) { element = this.nextElement(result) }
+
+    /** Gets the element following `element` in this sequence. */
+    RegExpTerm nextElement(RegExpTerm element) {
+      exists(int i |
+        element = this.getChild(i) and
+        result = this.getChild(i + 1)
+      )
+    }
+
+    override string getConstantValue() { result = this.getConstantValue(0) }
+
+    /**
+     * Gets the single string matched by the `i`th child and all following
+     * children of this sequence, if any.
+     */
+    private string getConstantValue(int i) {
+      i = this.getNumChild() and
+      result = ""
+      or
+      result = this.getChild(i).getConstantValue() + this.getConstantValue(i + 1)
+    }
+
+    override string getAPrimaryQlClass() { result = "RegExpSequence" }
+
+    override predicate isNullable() {
+      forall(RegExpTerm child | child = this.getAChild() | child.isNullable())
+    }
+  }
+
+  pragma[nomagic]
+  private int seqChildEnd(RegExp re, int start, int end, int i) {
+    result = seqChild(re, start, end, i).getEnd()
+  }
+
+  // moved out so we can use it in the charpred
+  private RegExpTerm seqChild(RegExp re, int start, int end, int i) {
+    re.sequence(start, end) and
+    (
+      i = 0 and
+      result.getRegExp() = re and
+      result.getStart() = start and
+      exists(int itemEnd |
+        re.item(start, itemEnd) and
+        result.getEnd() = itemEnd
+      )
+      or
+      i > 0 and
+      result.getRegExp() = re and
+      exists(int itemStart | itemStart = seqChildEnd(re, start, end, i - 1) |
+        result.getStart() = itemStart and
+        re.item(itemStart, result.getEnd())
+      )
+    )
+  }
+
+  /**
+   * An alternative term, that is, a term of the form `a|b`.
+   *
+   * Example:
+   *
+   * ```
+   * ECMA|Java
+   * ```
+   */
+  class RegExpAlt extends RegExpTerm, TRegExpAlt {
+    RegExpAlt() { this = TRegExpAlt(re, start, end) }
+
+    override RegExpTerm getChild(int i) {
+      i = 0 and
+      result.getRegExp() = re and
+      result.getStart() = start and
+      exists(int part_end |
+        re.alternationOption(start, end, start, part_end) and
+        result.getEnd() = part_end
+      )
+      or
+      i > 0 and
+      result.getRegExp() = re and
+      exists(int part_start |
+        part_start = this.getChild(i - 1).getEnd() + 1 // allow for the |
+      |
+        result.getStart() = part_start and
+        re.alternationOption(start, end, part_start, result.getEnd())
+      )
+    }
+
+    /** Gets an alternative of this term. */
+    RegExpTerm getAlternative() { result = this.getAChild() }
+
+    override string getAMatchedString() { result = this.getAlternative().getAMatchedString() }
+
+    override string getAPrimaryQlClass() { result = "RegExpAlt" }
+
+    override predicate isNullable() { this.getAChild().isNullable() }
+  }
+
+  /**
+   * A character escape in a regular expression.
+   *
+   * Example:
+   *
+   * ```
+   * \.
+   * ```
+   */
+  class RegExpCharEscape = RegExpEscape;
+
+  /**
+   * An escaped regular expression term, that is, a regular expression
+   * term starting with a backslash, which is not a backreference.
+   *
+   * Example:
+   *
+   * ```
+   * \.
+   * \w
+   * ```
+   */
+  class RegExpEscape extends RegExpNormalChars {
+    RegExpEscape() { re.escapedCharacter(start, end) }
+
+    /**
+     * Gets the name of the escaped; for example, `w` for `\w`.
+     * TODO: Handle named escapes.
+     */
+    override string getValue() {
+      this.isIdentityEscape() and
+      result = this.getUnescaped()
+      or
+      this.getUnescaped() = "n" and result = "\n"
+      or
+      this.getUnescaped() = "r" and result = "\r"
+      or
+      this.getUnescaped() = "t" and result = "\t"
+      or
+      this.getUnescaped() = "f" and result = 12.toUnicode()
+      or
+      this.getUnescaped() = "v" and result = 11.toUnicode()
+      or
+      this.getUnescaped() = "0" and result = 0.toUnicode()
+      or
+      this.isUnicode() and
+      result = this.getUnicode()
+      or
+      this.isHex() and
+      result = this.getHex()
+      or
+      this.isControl() and
+      result = this.getControl()
+    }
+
+    /** Holds if this terms name is given by the part following the escape character. */
+    predicate isIdentityEscape() {
+      not this.getUnescaped() in ["n", "r", "t", "f", "v", "0"] and
+      not this.isUnicode() and
+      not this.isHex() and
+      not this.isControl()
+    }
+
+    override string getAPrimaryQlClass() { result = "RegExpEscape" }
+
+    /** Gets the part of the term following the escape character. That is e.g. "w" if the term is "\w". */
+    string getUnescaped() { result = this.getText().suffix(1) }
+
+    /**
+     * Gets the text for this escape. That is e.g. "\w".
+     */
+    private string getText() { result = re.getText().substring(start, end) }
+
+    /**
+     * Holds if this is a unicode escape.
+     */
+    private predicate isUnicode() { this.getText().matches("\\u%") }
+
+    /**
+     * Gets the unicode char for this escape.
+     * E.g. for `\u0061` this returns "a".
+     */
+    private string getUnicode() {
+      this.isUnicode() and
+      result = parseHexInt(this.getText().suffix(2)).toUnicode()
+    }
+
+    /**
+     * Holds if this is a hex escape.
+     */
+    private predicate isHex() { this.getText().matches("\\x%") }
+
+    /**
+     * Gets the unicode char for this escape.
+     * E.g. for `\x61` this returns "a".
+     */
+    private string getHex() {
+      this.isHex() and
+      result = parseHexInt(this.getText().suffix(2)).toUnicode()
+    }
+
+    /**
+     * Holds if this is a `\cX` escape.
+     */
+    private predicate isControl() { this.getText().matches("\\c%") }
+
+    /**
+     * Gets the unicode char for this escape.
+     * E.g. for `\cA` this returns `0x01`.
+     */
+    private string getControl() {
+      this.isControl() and
+      exists(string letter | letter = this.getText().suffix(2).toUpperCase() |
+        result = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(letter) + 1).toUnicode()
+      )
+    }
+  }
+
+  /**
+   * A word boundary, that is, a regular expression term of the form `\b`.
+   */
+  class RegExpWordBoundary extends RegExpSpecialChar {
+    RegExpWordBoundary() { this.getChar() = "\\b" }
+
+    override predicate isNullable() { none() }
+  }
+
+  /**
+   * A non-word boundary, that is, a regular expression term of the form `\B`.
+   */
+  class RegExpNonWordBoundary extends RegExpSpecialChar {
+    RegExpNonWordBoundary() { this.getChar() = "\\B" }
+
+    override string getAPrimaryQlClass() { result = "RegExpNonWordBoundary" }
+  }
+
+  /**
+   * A character class escape in a regular expression.
+   * That is, an escaped character that denotes multiple characters.
+   *
+   * Examples:
+   *
+   * ```
+   * \w
+   * \S
+   * ```
+   */
+  class RegExpCharacterClassEscape extends RegExpEscape {
+    RegExpCharacterClassEscape() { this.getValue() in ["d", "D", "s", "S", "w", "W"] }
+
+    override RegExpTerm getChild(int i) { none() }
+
+    override string getAPrimaryQlClass() { result = "RegExpCharacterClassEscape" }
+
+    override predicate isNullable() { none() }
+  }
+
+  /**
+   * A character class in a regular expression.
+   *
+   * Examples:
+   *
+   * ```cpp
+   * "[a-fA-F0-9]"
+   * "[^abc]"
+   * ```
+   */
+  class RegExpCharacterClass extends RegExpTerm, TRegExpCharacterClass {
+    RegExpCharacterClass() { this = TRegExpCharacterClass(re, start, end) }
+
+    /** Holds if this character class is inverted, matching the opposite of its content. */
+    predicate isInverted() { re.getChar(start + 1) = "^" }
+
+    /** Holds if this character class can match anything. */
+    predicate isUniversalClass() {
+      // [^]
+      this.isInverted() and not exists(this.getAChild())
+      or
+      // [\w\W] and similar
+      not this.isInverted() and
+      exists(string cce1, string cce2 |
+        cce1 = this.getAChild().(RegExpCharacterClassEscape).getValue() and
+        cce2 = this.getAChild().(RegExpCharacterClassEscape).getValue()
+      |
+        cce1 != cce2 and cce1.toLowerCase() = cce2.toLowerCase()
+      )
+    }
+
+    override RegExpTerm getChild(int i) {
+      i = 0 and
+      result.getRegExp() = re and
+      exists(int itemStart, int itemEnd |
+        result.getStart() = itemStart and
+        re.charSetStart(start, itemStart) and
+        re.charSetChild(start, itemStart, itemEnd) and
+        result.getEnd() = itemEnd
+      )
+      or
+      i > 0 and
+      result.getRegExp() = re and
+      exists(int itemStart | itemStart = this.getChild(i - 1).getEnd() |
+        result.getStart() = itemStart and
+        re.charSetChild(start, itemStart, result.getEnd())
+      )
+    }
+
+    override string getAMatchedString() {
+      not this.isInverted() and result = this.getAChild().getAMatchedString()
+    }
+
+    override string getAPrimaryQlClass() { result = "RegExpCharacterClass" }
+
+    override predicate isNullable() { none() }
+  }
+
+  /**
+   * A character range in a character class in a regular expression.
+   *
+   * Example:
+   *
+   * ```
+   * a-z
+   * ```
+   */
+  class RegExpCharacterRange extends RegExpTerm, TRegExpCharacterRange {
+    int lower_end;
+    int upper_start;
+
+    RegExpCharacterRange() {
+      this = TRegExpCharacterRange(re, start, end) and
+      re.charRange(_, start, lower_end, upper_start, end)
+    }
+
+    /** Holds if this range goes from `lo` to `hi`, in effect is `lo-hi`. */
+    predicate isRange(string lo, string hi) {
+      lo = re.getText().substring(start, lower_end) and
+      hi = re.getText().substring(upper_start, end)
+    }
+
+    override RegExpTerm getChild(int i) {
+      i = 0 and
+      result.getRegExp() = re and
+      result.getStart() = start and
+      result.getEnd() = lower_end
+      or
+      i = 1 and
+      result.getRegExp() = re and
+      result.getStart() = upper_start and
+      result.getEnd() = end
+    }
+
+    override string getAPrimaryQlClass() { result = "RegExpCharacterRange" }
+
+    override predicate isNullable() { none() }
+  }
+
+  /**
+   * A normal-character term in a regular expression, that is, a sequence
+   * of characters without special meaning or a single escaped character.
+   *
+   * Examples:
+   * ```
+   * abc
+   * \t
+   * ```
+   */
+  additional class RegExpNormalChars extends RegExpTerm, TRegExpNormalChars {
+    RegExpNormalChars() { this = TRegExpNormalChars(re, start, end) }
+
+    /**
+     * Holds if this constant consists of a valid Unicode character (as opposed
+     * to a surrogate code point that does not correspond to a character by itself.)
+     */
+    predicate isCharacter() { any() }
+
+    /** Gets the string representation of this term. */
+    string getValue() { result = re.getText().substring(start, end) }
+
+    override RegExpTerm getChild(int i) { none() }
+
+    override string getAPrimaryQlClass() { result = "RegExpNormalChars" }
+  }
+
+  /**
+   * A constant regular expression term, that is, a regular expression
+   * term matching a single string. Currently, this will always be a single character.
+   *
+   * Example:
+   *
+   * ```
+   * a
+   * ```
+   */
+  class RegExpConstant extends RegExpTerm {
+    string value;
+
+    RegExpConstant() {
+      this = TRegExpNormalChars(re, start, end) and
+      not this instanceof RegExpCharacterClassEscape and
+      // exclude chars in qualifiers
+      // TODO: push this into regex library
+      not exists(int qstart, int qend | re.qualifiedPart(_, qstart, qend, _, _) |
+        qstart <= start and end <= qend
+      ) and
+      value = this.(RegExpNormalChars).getValue()
+      or
+      this = TRegExpSpecialChar(re, start, end) and
+      re.inCharSet(start) and
+      value = this.(RegExpSpecialChar).getChar()
+    }
+
+    /**
+     * Holds if this constant represents a valid Unicode character (as opposed
+     * to a surrogate code point that does not correspond to a character by itself.)
+     */
+    predicate isCharacter() { any() }
+
+    /** Gets the string matched by this constant term. */
+    string getValue() { result = value }
+
+    override RegExpTerm getChild(int i) { none() }
+
+    override string getConstantValue() { result = this.getValue() }
+
+    override string getAPrimaryQlClass() { result = "RegExpConstant" }
+
+    override predicate isNullable() { none() }
+  }
+
+  /**
+   * A grouped regular expression.
+   *
+   * Examples:
+   *
+   * ```
+   * (ECMA|Java)
+   * (?:ECMA|Java)
+   * (?<quote>['"])
+   * ```
+   */
+  class RegExpGroup extends RegExpTerm, TRegExpGroup {
+    RegExpGroup() { this = TRegExpGroup(re, start, end) }
+
+    /**
+     * Gets the index of this capture group within the enclosing regular
+     * expression literal.
+     *
+     * For example, in the regular expression `/((a?).)(?:b)/`, the
+     * group `((a?).)` has index 1, the group `(a?)` nested inside it
+     * has index 2, and the group `(?:b)` has no index, since it is
+     * not a capture group.
+     */
+    int getNumber() { result = re.getGroupNumber(start, end) }
+
+    /** Holds if this is a capture group. */
+    predicate isCapture() { exists(this.getNumber()) }
+
+    override RegExpTerm getChild(int i) {
+      result.getRegExp() = re and
+      i = 0 and
+      re.groupContents(start, end, result.getStart(), result.getEnd())
+    }
+
+    override string getConstantValue() { result = this.getAChild().getConstantValue() }
+
+    override string getAMatchedString() { result = this.getAChild().getAMatchedString() }
+
+    override string getAPrimaryQlClass() { result = "RegExpGroup" }
+
+    override predicate isNullable() { this.getAChild().isNullable() }
+  }
+
+  /**
+   * A special character in a regular expression.
+   *
+   * Examples:
+   * ```
+   * ^
+   * $
+   * .
+   * ```
+   */
+  additional class RegExpSpecialChar extends RegExpTerm, TRegExpSpecialChar {
+    string char;
+
+    RegExpSpecialChar() {
+      this = TRegExpSpecialChar(re, start, end) and
+      re.specialCharacter(start, end, char)
+    }
+
+    /**
+     * Holds if this constant represents a valid Unicode character (as opposed
+     * to a surrogate code point that does not correspond to a character by itself.)
+     */
+    predicate isCharacter() { any() }
+
+    /** Gets the char for this term. */
+    string getChar() { result = char }
+
+    override RegExpTerm getChild(int i) { none() }
+
+    override string getAPrimaryQlClass() { result = "RegExpSpecialChar" }
+  }
+
+  /**
+   * A dot regular expression.
+   *
+   * Example:
+   *
+   * ```
+   * .
+   * ```
+   */
+  class RegExpDot extends RegExpSpecialChar {
+    RegExpDot() { this.getChar() = "." }
+
+    override string getAPrimaryQlClass() { result = "RegExpDot" }
+
+    override predicate isNullable() { none() }
+  }
+
+  /**
+   * A term that matches a specific position between characters in the string.
+   *
+   * Example:
+   *
+   * ```
+   * ^
+   * ```
+   */
+  class RegExpAnchor extends RegExpSpecialChar {
+    RegExpAnchor() { this.getChar() = ["^", "$"] }
+
+    override string getAPrimaryQlClass() { result = "RegExpAnchor" }
+  }
+
+  /**
+   * A dollar assertion `$` matching the end of a line.
+   *
+   * Example:
+   *
+   * ```
+   * $
+   * ```
+   */
+  class RegExpDollar extends RegExpAnchor {
+    RegExpDollar() { this.getChar() = "$" }
+
+    override string getAPrimaryQlClass() { result = "RegExpDollar" }
+
+    override predicate isNullable() { any() }
+  }
+
+  /**
+   * A caret assertion `^` matching the beginning of a line.
+   *
+   * Example:
+   *
+   * ```
+   * ^
+   * ```
+   */
+  class RegExpCaret extends RegExpAnchor {
+    RegExpCaret() { this.getChar() = "^" }
+
+    override string getAPrimaryQlClass() { result = "RegExpCaret" }
+
+    override predicate isNullable() { any() }
+  }
+
+  /**
+   * A zero-width match, that is, either an empty group or an assertion.
+   *
+   * Examples:
+   * ```
+   * ()
+   * (?=\w)
+   * ```
+   */
+  additional class RegExpZeroWidthMatch extends RegExpGroup {
+    RegExpZeroWidthMatch() { re.zeroWidthMatch(start, end) }
+
+    override RegExpTerm getChild(int i) { none() }
+
+    override string getAPrimaryQlClass() { result = "RegExpZeroWidthMatch" }
+
+    override predicate isNullable() { any() }
+  }
+
+  /**
+   * A zero-width lookahead assertion.
+   *
+   * Examples:
+   *
+   * ```
+   * (?=\w)
+   * (?!\n)
+   * ```
+   */
+  class RegExpSubPattern extends RegExpZeroWidthMatch {
+    RegExpSubPattern() { not re.emptyGroup(start, end) }
+
+    /** Gets the lookahead term. */
+    RegExpTerm getOperand() {
+      exists(int in_start, int in_end | re.groupContents(start, end, in_start, in_end) |
+        result.getRegExp() = re and
+        result.getStart() = in_start and
+        result.getEnd() = in_end
+      )
+    }
+
+    override predicate isNullable() { any() }
+  }
+
+  /**
+   * A zero-width lookahead assertion.
+   *
+   * Examples:
+   *
+   * ```
+   * (?=\w)
+   * (?!\n)
+   * ```
+   */
+  abstract class RegExpLookahead extends RegExpSubPattern { }
+
+  /**
+   * A positive-lookahead assertion.
+   *
+   * Examples:
+   *
+   * ```
+   * (?=\w)
+   * ```
+   */
+  class RegExpPositiveLookahead extends RegExpLookahead {
+    RegExpPositiveLookahead() { re.positiveLookaheadAssertionGroup(start, end) }
+
+    override string getAPrimaryQlClass() { result = "RegExpPositiveLookahead" }
+
+    override predicate isNullable() { any() }
+  }
+
+  /**
+   * A negative-lookahead assertion.
+   *
+   * Examples:
+   *
+   * ```
+   * (?!\n)
+   * ```
+   */
+  additional class RegExpNegativeLookahead extends RegExpLookahead {
+    RegExpNegativeLookahead() { re.negativeLookaheadAssertionGroup(start, end) }
+
+    override string getAPrimaryQlClass() { result = "RegExpNegativeLookahead" }
+  }
+
+  abstract class RegExpLookbehind extends RegExpSubPattern { }
+
+  abstract class RegExpPositiveLookbehind extends RegExpLookbehind { }
+
+  /**
+   * A back reference, that is, a term of the form `\i` in a regular
+   * expression.
+   *
+   * Examples:
+   *
+   * ```
+   * \1
+   * ```
+   */
+  class RegExpBackRef extends RegExpTerm, TRegExpBackRef {
+    RegExpBackRef() { this = TRegExpBackRef(re, start, end) }
+
+    /**
+     * Gets the number of the capture group this back reference refers to, if any.
+     */
+    int getNumber() { result = re.getBackRefNumber(start, end) }
+
+    /** Gets the capture group this back reference refers to. */
+    RegExpGroup getGroup() {
+      result.getLiteral() = this.getLiteral() and
+      result.getNumber() = this.getNumber()
+    }
+
+    override RegExpTerm getChild(int i) { none() }
+
+    override string getAPrimaryQlClass() { result = "RegExpBackRef" }
+
+    override predicate isNullable() { this.getGroup().isNullable() }
+  }
+
+  /**
+   * A named character property. For example, the POSIX bracket expression
+   * `[:digit:]`.
+   */
+  additional class RegExpNamedCharacterProperty extends RegExpTerm, TRegExpNamedCharacterProperty {
+    RegExpNamedCharacterProperty() { this = TRegExpNamedCharacterProperty(re, start, end) }
+
+    override RegExpTerm getChild(int i) { none() }
+
+    override string getAPrimaryQlClass() { result = "RegExpNamedCharacterProperty" }
+
+    /**
+     * Gets the property name. For example, in `[:digit:]`, the result is
+     * `"digit"`.
+     */
+    string getName() { result = re.getCharacterPropertyName(start, end) }
+
+    /**
+     * Gets the property symbol. For example, in `[:digit:]`, the result is
+     * `":"`.
+     */
+    string getSymbol() { result = re.getCharacterPropertySymbol(start, end) }
+  }
+
+  /**
+   * A named POSIX character class. For example, `[:digit:]`.
+   */
+  additional class RegExpNamedCharacterClass extends RegExpNamedCharacterProperty {
+    RegExpNamedCharacterClass() { ":" = re.getCharacterPropertySymbol(start, end) }
+  }
+
+  /**
+   * A named POSIX collating element. For example, `[.tilde.]`.
+   */
+  additional class RegExpNamedCollatingElement extends RegExpNamedCharacterProperty {
+    RegExpNamedCollatingElement() { "." = re.getCharacterPropertySymbol(start, end) }
+  }
+
+  /**
+   * A POSIX character equivalence class. For example, `[=a=]`.
+   */
+  additional class RegExpCharacterEquivalenceClass extends RegExpNamedCharacterProperty {
+    RegExpCharacterEquivalenceClass() { "=" = re.getCharacterPropertySymbol(start, end) }
+  }
+
+  class Top = RegExpParent;
+
+  /**
+   * Holds if `term` is an escape class representing e.g. `\d`.
+   * `clazz` is which character class it represents, e.g. "d" for `\d`.
+   */
+  predicate isEscapeClass(RegExpTerm term, string clazz) {
+    exists(RegExpCharacterClassEscape escape | term = escape | escape.getValue() = clazz)
+    or
+    // TODO: expand to cover more properties
+    exists(RegExpNamedCharacterClass escape | term = escape |
+      escape.getName().toLowerCase() = "digit" and
+      clazz = "d"
+      or
+      escape.getName().toLowerCase() = "space" and
+      clazz = "s"
+      or
+      escape.getName().toLowerCase() = "word" and
+      clazz = "w"
+    )
+  }
+
+  /**
+   * Holds if the regular expression should not be considered.
+   */
+  predicate isExcluded(RegExpParent parent) { none() }
+
+  /**
+   * Holds if `term` is a possessive quantifier.
+   * Not currently implemented, but is used by the shared library.
+   */
+  predicate isPossessive(RegExpQuantifier term) { none() }
+
+  /**
+   * Holds if the regex that `term` is part of is used in a way that ignores any leading prefix of the input it's matched against.
+   * Not yet implemented for C++.
+   */
+  predicate matchesAnyPrefix(RegExpTerm term) { any() }
+
+  /**
+   * Holds if the regex that `term` is part of is used in a way that ignores any trailing suffix of the input it's matched against.
+   * Not yet implemented for C++.
+   */
+  predicate matchesAnySuffix(RegExpTerm term) { any() }
+
+  /**
+   * Holds if `root` has the `i` flag for case-insensitive matching.
+   */
+  predicate isIgnoreCase(RegExpTerm root) {
+    root.isRootTerm() and
+    root.getLiteral().isIgnoreCase()
+  }
+
+  /**
+   * Holds if `root` has the `s` flag for dot-all matching.
+   */
+  predicate isDotAll(RegExpTerm root) {
+    root.isRootTerm() and
+    root.getLiteral().isDotAll()
+  }
+}
diff --git a/cpp/ql/lib/semmle/code/cpp/regex/internal/ParseRegExp.qll b/cpp/ql/lib/semmle/code/cpp/regex/internal/ParseRegExp.qll
new file mode 100644
index 000000000000..c90826d95c8c
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/regex/internal/ParseRegExp.qll
@@ -0,0 +1,871 @@
+/**
+ * Library for parsing C++ regular expressions.
+ *
+ * N.B. does not yet handle stripping whitespace and comments in regexes with
+ * the `x` (free-spacing) flag.
+ */
+
+private import semmle.code.cpp.exprs.Literal
+
+/**
+ * A C++ string literal containing a regular expression term, that is, either
+ * a regular expression literal, or a string literal used in a context where
+ * it is parsed as a regular expression.
+ */
+abstract class RegExp extends StringLiteral {
+  /**
+   * Holds if this `RegExp` has the `s` flag for dot-all matching.
+   */
+  predicate isDotAll() { none() }
+
+  /**
+   * Holds if this `RegExp` has the `i` flag for case-insensitive matching.
+   */
+  predicate isIgnoreCase() { none() }
+
+  /**
+   * Gets the flags for this `RegExp`, or the empty string if it has no flags.
+   */
+  string getFlags() { result = "" }
+
+  /**
+   * Helper predicate for `charSetStart(int start, int end)`.
+   *
+   * In order to identify left brackets ('[') which actually start a character class,
+   * we perform a left to right scan of the string.
+   *
+   * To avoid negative recursion we return a boolean. See `escaping`,
+   * the helper for `escapingChar`, for a clean use of this pattern.
+   *
+   * result is true for those start chars that actually mark a start of a char set.
+   */
+  boolean charSetStart(int pos) {
+    exists(int index |
+      // is opening bracket
+      this.charSetDelimiter(index, pos) = true and
+      (
+        // if this is the first bracket, `pos` starts a char set
+        index = 1 and result = true
+        or
+        // if the previous char set delimiter was not a closing bracket, `pos` does
+        // not start a char set. This is needed to handle cases such as `[[]` (a
+        // char set that matches the `[` char)
+        index > 1 and
+        not this.charSetDelimiter(index - 1, _) = false and
+        result = false
+        or
+        // special handling of cases such as `[][]` (the character-set of the characters `]` and `[`).
+        exists(int prevClosingBracketPos |
+          // previous bracket is a closing bracket
+          this.charSetDelimiter(index - 1, prevClosingBracketPos) = false and
+          if
+            // check if the character that comes before the previous closing bracket
+            // is an opening bracket (taking `^` into account)
+            // check if the character that comes before the previous closing bracket
+            // is an opening bracket (taking `^` into account)
+            exists(int posBeforePrevClosingBracket |
+              if this.getChar(prevClosingBracketPos - 1) = "^"
+              then posBeforePrevClosingBracket = prevClosingBracketPos - 2
+              else posBeforePrevClosingBracket = prevClosingBracketPos - 1
+            |
+              this.charSetDelimiter(index - 2, posBeforePrevClosingBracket) = true
+            )
+          then
+            // brackets without anything in between is not valid character ranges, so
+            // the first closing bracket in `[]]` and `[^]]` does not count,
+            //
+            // and we should _not_ mark the second opening bracket in `[][]` and `[^][]`
+            // as starting a new char set.                               ^           ^
+            exists(int posBeforePrevClosingBracket |
+              this.charSetDelimiter(index - 2, posBeforePrevClosingBracket) = true
+            |
+              result = this.charSetStart(posBeforePrevClosingBracket).booleanNot()
+            )
+          else
+            // if not, `pos` does in fact mark a real start of a character range
+            result = true
+        )
+      )
+    )
+  }
+
+  /**
+   * Helper predicate for chars that could be character-set delimiters.
+   * Holds if the (non-escaped) char at `pos` in the string, is the (one-based) `index` occurrence of a bracket (`[` or `]`) in the string.
+   * Result if `true` is the char is `[`, and `false` if the char is `]`.
+   */
+  boolean charSetDelimiter(int index, int pos) {
+    pos =
+      rank[index](int p |
+        (this.nonEscapedCharAt(p) = "[" or this.nonEscapedCharAt(p) = "]") and
+        // Brackets that are part of POSIX expressions should not count as
+        // char-set delimiters.
+        not exists(int x, int y | this.posixStyleProperty(x, y, _, _) and pos >= x and pos < y)
+      ) and
+    (
+      this.nonEscapedCharAt(pos) = "[" and result = true
+      or
+      this.nonEscapedCharAt(pos) = "]" and result = false
+    )
+  }
+
+  /** Holds if a character set starts between `start` and `end`. */
+  predicate charSetStart(int start, int end) {
+    this.charSetStart(start) = true and
+    (
+      this.getChar(start + 1) = "^" and end = start + 2
+      or
+      not this.getChar(start + 1) = "^" and end = start + 1
+    )
+  }
+
+  /** Whether there is a character class, between start (inclusive) and end (exclusive) */
+  predicate charSet(int start, int end) {
+    exists(int innerStart, int innerEnd |
+      this.charSetStart(start, innerStart) and
+      not this.charSetStart(_, start)
+    |
+      end = innerEnd + 1 and
+      innerEnd =
+        min(int e |
+          e > innerStart and
+          this.nonEscapedCharAt(e) = "]" and
+          not exists(int x, int y | this.posixStyleProperty(x, y, _, _) and e >= x and e < y)
+        |
+          e
+        )
+    )
+  }
+
+  /**
+   * Holds if the character set starting at `charsetStart` contains either
+   * a character or a `-` found between `start` and `end`.
+   */
+  private predicate charSetToken(int charsetStart, int index, int tokenStart, int tokenEnd) {
+    tokenStart =
+      rank[index](int start, int end | this.charSetToken(charsetStart, start, end) | start) and
+    this.charSetToken(charsetStart, tokenStart, tokenEnd)
+  }
+
+  /**
+   * Holds if the character set starting at `charsetStart` contains either
+   * a character or a `-` found between `start` and `end`.
+   */
+  private predicate charSetToken(int charsetStart, int start, int end) {
+    this.charSetStart(charsetStart, start) and
+    (
+      this.escapedCharacter(start, end)
+      or
+      this.namedCharacterProperty(start, end, _, _)
+      or
+      exists(this.nonEscapedCharAt(start)) and end = start + 1
+    )
+    or
+    this.charSetToken(charsetStart, _, start) and
+    (
+      this.escapedCharacter(start, end)
+      or
+      this.namedCharacterProperty(start, end, _, _)
+      or
+      exists(this.nonEscapedCharAt(start)) and
+      end = start + 1 and
+      not this.getChar(start) = "]"
+    )
+  }
+
+  /**
+   * Holds if the character set starting at `charsetStart` contains either
+   * a character or a range found between `start` and `end`.
+   */
+  predicate charSetChild(int charsetStart, int start, int end) {
+    this.charSetToken(charsetStart, start, end) and
+    not exists(int rangeStart, int rangeEnd |
+      this.charRange(charsetStart, rangeStart, _, _, rangeEnd) and
+      rangeStart <= start and
+      rangeEnd >= end
+    )
+    or
+    this.charRange(charsetStart, start, _, _, end)
+  }
+
+  /**
+   * Holds if the character set starting at `charsetStart` contains a character range
+   * with lower bound found between `start` and `lowerEnd`
+   * and upper bound found between `upperStart` and `end`.
+   */
+  predicate charRange(int charsetStart, int start, int lowerEnd, int upperStart, int end) {
+    exists(int index |
+      this.charRangeEnd(charsetStart, index) = true and
+      this.charSetToken(charsetStart, index - 2, start, lowerEnd) and
+      this.charSetToken(charsetStart, index, upperStart, end)
+    )
+  }
+
+  /**
+   * Helper predicate for `charRange`.
+   * We can determine where character ranges end by a left to right sweep.
+   *
+   * To avoid negative recursion we return a boolean. See `escaping`,
+   * the helper for `escapingChar`, for a clean use of this pattern.
+   */
+  private boolean charRangeEnd(int charsetStart, int index) {
+    this.charSetToken(charsetStart, index, _, _) and
+    (
+      index in [1, 2] and result = false
+      or
+      index > 2 and
+      exists(int connectorStart |
+        this.charSetToken(charsetStart, index - 1, connectorStart, _) and
+        this.nonEscapedCharAt(connectorStart) = "-" and
+        result =
+          this.charRangeEnd(charsetStart, index - 2)
+              .booleanNot()
+              .booleanAnd(this.charRangeEnd(charsetStart, index - 1).booleanNot())
+      )
+      or
+      not exists(int connectorStart |
+        this.charSetToken(charsetStart, index - 1, connectorStart, _) and
+        this.nonEscapedCharAt(connectorStart) = "-"
+      ) and
+      result = false
+    )
+  }
+
+  /** Holds if the character at `pos` is a "\" that is actually escaping what comes after. */
+  predicate escapingChar(int pos) { this.escaping(pos) = true }
+
+  /**
+   * Helper predicate for `escapingChar`.
+   * In order to avoid negative recursion, we return a boolean.
+   * This way, we can refer to `escaping(pos - 1).booleanNot()`
+   * rather than to a negated version of `escaping(pos)`.
+   */
+  private boolean escaping(int pos) {
+    pos = -1 and result = false
+    or
+    this.getChar(pos) = "\\" and result = this.escaping(pos - 1).booleanNot()
+    or
+    this.getChar(pos) != "\\" and result = false
+  }
+
+  /** Gets the text of this regex */
+  string getText() { result = this.getValue() }
+
+  /** Gets the `i`th character of this regex */
+  string getChar(int i) { result = this.getText().charAt(i) }
+
+  /** Gets the `i`th character of this regex, unless it is part of a character escape sequence. */
+  string nonEscapedCharAt(int i) {
+    result = this.getText().charAt(i) and
+    not exists(int x, int y | this.escapedCharacter(x, y) and i in [x .. y - 1])
+  }
+
+  private predicate isOptionDivider(int i) { this.nonEscapedCharAt(i) = "|" }
+
+  private predicate isGroupEnd(int i) { this.nonEscapedCharAt(i) = ")" and not this.inCharSet(i) }
+
+  private predicate isGroupStart(int i) { this.nonEscapedCharAt(i) = "(" and not this.inCharSet(i) }
+
+  /**
+   * Holds if the `i`th character could not be parsed.
+   */
+  predicate failedToParse(int i) {
+    exists(this.getChar(i)) and
+    not exists(int start, int end |
+      this.topLevel(start, end) and
+      start <= i and
+      end > i
+    )
+  }
+
+  /** Matches named character properties such as `[:digit:]`. */
+  predicate namedCharacterProperty(int start, int end, string symbol, string name) {
+    this.posixStyleProperty(start, end, symbol, name)
+  }
+
+  /** Gets the name of the character property in start,end */
+  string getCharacterPropertyName(int start, int end) {
+    this.namedCharacterProperty(start, end, _, result)
+  }
+
+  /** Gets the symbol of the character property in start,end */
+  string getCharacterPropertySymbol(int start, int end) {
+    this.namedCharacterProperty(start, end, result, _)
+  }
+
+  /** Matches a POSIX bracket expression such as `[:alnum:]` within a character class. */
+  private predicate posixStyleProperty(int start, int end, string symbol, string name) {
+    this.getChar(start) = "[" and
+    this.getChar(start + 1) = symbol and
+    end =
+      min(int e |
+        e > start and
+        this.getChar(e - 2) = symbol and
+        this.getChar(e - 1) = "]"
+      |
+        e
+      ) and
+    symbol in [":", ".", "="] and
+    name = this.getText().substring(start + 2, end - 2)
+  }
+
+  /**
+   * Holds if an escaped character is found between `start` and `end`.
+   * Escaped characters include hex values, octal values and named escapes,
+   * but excludes backreferences.
+   */
+  predicate escapedCharacter(int start, int end) {
+    this.escapingChar(start) and
+    not this.numberedBackreference(start, _, _) and
+    (
+      // hex char \xhh
+      this.getChar(start + 1) = "x" and end = start + 4
+      or
+      // wide hex char \uhhhh
+      this.getChar(start + 1) = "u" and end = start + 6
+      or
+      // control char \cX
+      this.getChar(start + 1) = "c" and end = start + 3
+      or
+      // nul escape \0 (when not followed by a digit)
+      this.getChar(start + 1) = "0" and
+      end = start + 2 and
+      not exists(this.getChar(start + 2).toInt())
+      or
+      // escape not handled above; update when adding a new case
+      not this.getChar(start + 1) in ["x", "u", "c"] and
+      not exists(this.getChar(start + 1).toInt()) and
+      end = start + 2
+    )
+  }
+
+  /**
+   * Holds if the character at `index` is inside a character set.
+   */
+  predicate inCharSet(int index) {
+    exists(int x, int y | this.charSet(x, y) and index in [x + 1 .. y - 2])
+  }
+
+  /**
+   * Holds if the character at `index` is inside a posix bracket.
+   */
+  predicate inPosixBracket(int index) {
+    exists(int x, int y | this.posixStyleProperty(x, y, _, _) and index in [x + 1 .. y - 2])
+  }
+
+  /**
+   * 'simple' characters are any that don't alter the parsing of the regex.
+   */
+  private predicate simpleCharacter(int start, int end) {
+    end = start + 1 and
+    not this.charSet(start, _) and
+    not this.charSet(_, start + 1) and
+    not exists(int x, int y |
+      this.posixStyleProperty(x, y, _, _) and
+      start >= x and
+      end <= y
+    ) and
+    exists(string c | c = this.getChar(start) |
+      exists(int x, int y, int z |
+        this.charSet(x, z) and
+        this.charSetStart(x, y)
+      |
+        start = y
+        or
+        start = z - 2
+        or
+        start > y and start < z - 2 and not this.charRange(_, _, start, end, _)
+      )
+      or
+      not this.inCharSet(start) and
+      not c = "(" and
+      not c = "[" and
+      not c = ")" and
+      not c = "|" and
+      not this.qualifier(start, _, _, _)
+    )
+  }
+
+  /**
+   * Holds if a simple or escaped character is found between `start` and `end`.
+   */
+  predicate character(int start, int end) {
+    (
+      this.simpleCharacter(start, end) and
+      not exists(int x, int y | this.escapedCharacter(x, y) and x <= start and y >= end)
+      or
+      this.escapedCharacter(start, end)
+    ) and
+    not exists(int x, int y | this.groupStart(x, y) and x <= start and y >= end) and
+    not exists(int x, int y | this.backreference(x, y) and x <= start and y >= end) and
+    not exists(int x, int y | this.multiples(x, y, _, _) and x <= start and y >= end)
+  }
+
+  /**
+   * Holds if a normal character is found between `start` and `end`.
+   */
+  predicate normalCharacter(int start, int end) {
+    end = start + 1 and
+    this.character(start, end) and
+    not this.specialCharacter(start, end, _)
+  }
+
+  /**
+   * Holds if a special character is found between `start` and `end`.
+   */
+  predicate specialCharacter(int start, int end, string char) {
+    this.character(start, end) and
+    not this.inCharSet(start) and
+    (
+      end = start + 1 and
+      char = this.getChar(start) and
+      (char = "$" or char = "^" or char = ".")
+      or
+      end = start + 2 and
+      this.escapingChar(start) and
+      char = this.getText().substring(start, end) and
+      char = ["\\b", "\\B"]
+    )
+  }
+
+  /**
+   * Holds if the range [start:end) consists of only 'normal' characters.
+   */
+  predicate normalCharacterSequence(int start, int end) {
+    // a normal character inside a character set is interpreted on its own
+    this.normalCharacter(start, end) and
+    this.inCharSet(start)
+    or
+    // a maximal run of normal characters is considered as one constant
+    exists(int s, int e |
+      e = max(int i | this.normalCharacterRun(s, i)) and
+      not this.inCharSet(s)
+    |
+      // 'abc' can be considered one constant, but
+      // 'abc+' has to be broken up into 'ab' and 'c+',
+      // as the qualifier only applies to 'c'.
+      if this.qualifier(e, _, _, _)
+      then
+        end = e and start = e - 1
+        or
+        end = e - 1 and start = s and start < end
+      else (
+        end = e and
+        start = s
+      )
+    )
+  }
+
+  private predicate normalCharacterRun(int start, int end) {
+    (
+      this.normalCharacterRun(start, end - 1)
+      or
+      start = end - 1 and not this.normalCharacter(start - 1, start)
+    ) and
+    this.normalCharacter(end - 1, end)
+  }
+
+  private predicate characterItem(int start, int end) {
+    this.normalCharacterSequence(start, end) or
+    this.escapedCharacter(start, end) or
+    this.specialCharacter(start, end, _)
+  }
+
+  /** Whether the text in the range `start,end` is a group */
+  predicate group(int start, int end) {
+    this.groupContents(start, end, _, _)
+    or
+    this.emptyGroup(start, end)
+  }
+
+  /** Gets the number of the group in start,end */
+  int getGroupNumber(int start, int end) {
+    this.group(start, end) and
+    not this.nonCapturingGroupStart(start, _) and
+    result =
+      count(int i | this.group(i, _) and i < start and not this.nonCapturingGroupStart(i, _)) + 1
+  }
+
+  /** Whether the text in the range start, end is a group and can match the empty string. */
+  predicate zeroWidthMatch(int start, int end) {
+    this.emptyGroup(start, end)
+    or
+    this.negativeAssertionGroup(start, end)
+    or
+    this.positiveLookaheadAssertionGroup(start, end)
+  }
+
+  /** Holds if an empty group is found between `start` and `end`. */
+  predicate emptyGroup(int start, int end) {
+    exists(int endm1 | end = endm1 + 1 |
+      this.groupStart(start, endm1) and
+      this.isGroupEnd(endm1)
+    )
+  }
+
+  private predicate emptyMatchAtStartGroup(int start, int end) {
+    this.emptyGroup(start, end)
+    or
+    this.negativeAssertionGroup(start, end)
+    or
+    this.positiveLookaheadAssertionGroup(start, end)
+  }
+
+  private predicate emptyMatchAtEndGroup(int start, int end) {
+    this.emptyGroup(start, end)
+    or
+    this.negativeAssertionGroup(start, end)
+  }
+
+  private predicate negativeAssertionGroup(int start, int end) {
+    exists(int inStart | this.negativeLookaheadAssertionStart(start, inStart) |
+      this.groupContents(start, end, inStart, _)
+    )
+  }
+
+  /** Holds if a negative lookahead is found between `start` and `end` */
+  predicate negativeLookaheadAssertionGroup(int start, int end) {
+    exists(int inStart | this.negativeLookaheadAssertionStart(start, inStart) |
+      this.groupContents(start, end, inStart, _)
+    )
+  }
+
+  /** Holds if a positive lookahead is found between `start` and `end` */
+  predicate positiveLookaheadAssertionGroup(int start, int end) {
+    exists(int inStart | this.lookaheadAssertionStart(start, inStart) |
+      this.groupContents(start, end, inStart, _)
+    )
+  }
+
+  private predicate groupStart(int start, int end) {
+    this.nonCapturingGroupStart(start, end)
+    or
+    this.lookaheadAssertionStart(start, end)
+    or
+    this.negativeLookaheadAssertionStart(start, end)
+    or
+    this.simpleGroupStart(start, end)
+  }
+
+  /** Matches the start of a non-capturing group, e.g. `(?:` */
+  private predicate nonCapturingGroupStart(int start, int end) {
+    this.isGroupStart(start) and
+    this.getChar(start + 1) = "?" and
+    this.getChar(start + 2) = [":", "=", "!"] and
+    end = start + 3
+  }
+
+  /** Matches the start of a simple group, e.g. `(a+)`. */
+  private predicate simpleGroupStart(int start, int end) {
+    this.isGroupStart(start) and
+    this.getChar(start + 1) != "?" and
+    end = start + 1
+  }
+
+  /** Matches the start of a positive lookahead assertion, i.e. `(?=`. */
+  private predicate lookaheadAssertionStart(int start, int end) {
+    this.isGroupStart(start) and
+    this.getChar(start + 1) = "?" and
+    this.getChar(start + 2) = "=" and
+    end = start + 3
+  }
+
+  /** Matches the start of a negative lookahead assertion, i.e. `(?!`. */
+  private predicate negativeLookaheadAssertionStart(int start, int end) {
+    this.isGroupStart(start) and
+    this.getChar(start + 1) = "?" and
+    this.getChar(start + 2) = "!" and
+    end = start + 3
+  }
+
+  /** Matches the contents of a group. */
+  predicate groupContents(int start, int end, int inStart, int inEnd) {
+    this.groupStart(start, inStart) and
+    end = inEnd + 1 and
+    this.topLevel(inStart, inEnd) and
+    this.isGroupEnd(inEnd)
+  }
+
+  /** Matches a numbered backreference, e.g. `\1`. */
+  predicate numberedBackreference(int start, int end, int value) {
+    this.escapingChar(start) and
+    not this.getChar(start + 1) = "0" and
+    exists(string text, string svalue, int len |
+      end = start + len and
+      text = this.getText() and
+      len in [2 .. 3]
+    |
+      svalue = text.substring(start + 1, start + len) and
+      value = svalue.toInt() and
+      not exists(text.substring(start + 1, start + len + 1).toInt()) and
+      value > 0
+    )
+  }
+
+  /** Whether the text in the range `start,end` is a back reference */
+  predicate backreference(int start, int end) { this.numberedBackreference(start, end, _) }
+
+  /** Gets the number of the back reference in start,end */
+  int getBackRefNumber(int start, int end) { this.numberedBackreference(start, end, result) }
+
+  private predicate baseItem(int start, int end) {
+    this.characterItem(start, end) and
+    not exists(int x, int y | this.charSet(x, y) and x <= start and y >= end)
+    or
+    this.group(start, end)
+    or
+    this.charSet(start, end)
+    or
+    this.backreference(start, end)
+  }
+
+  private predicate qualifier(int start, int end, boolean maybeEmpty, boolean mayRepeatForever) {
+    this.shortQualifier(start, end, maybeEmpty, mayRepeatForever) and
+    not this.getChar(end) = "?"
+    or
+    exists(int shortEnd | this.shortQualifier(start, shortEnd, maybeEmpty, mayRepeatForever) |
+      if this.getChar(shortEnd) = "?" then end = shortEnd + 1 else end = shortEnd
+    )
+  }
+
+  private predicate shortQualifier(int start, int end, boolean maybeEmpty, boolean mayRepeatForever) {
+    (
+      this.getChar(start) = "+" and maybeEmpty = false and mayRepeatForever = true
+      or
+      this.getChar(start) = "*" and maybeEmpty = true and mayRepeatForever = true
+      or
+      this.getChar(start) = "?" and maybeEmpty = true and mayRepeatForever = false
+    ) and
+    end = start + 1
+    or
+    exists(string lower, string upper |
+      this.multiples(start, end, lower, upper) and
+      (if lower = "" or lower.toInt() = 0 then maybeEmpty = true else maybeEmpty = false) and
+      if upper = "" then mayRepeatForever = true else mayRepeatForever = false
+    )
+  }
+
+  /**
+   * Holds if a repetition quantifier is found between `start` and `end`,
+   * with the given lower and upper bounds. If a bound is omitted, the corresponding
+   * string is empty.
+   */
+  predicate multiples(int start, int end, string lower, string upper) {
+    exists(string text, string match, string inner |
+      text = this.getText() and
+      end = start + match.length() and
+      inner = match.substring(1, match.length() - 1)
+    |
+      match = text.regexpFind("\\{[0-9]+\\}", _, start) and
+      lower = inner and
+      upper = lower
+      or
+      match = text.regexpFind("\\{[0-9]+,[0-9]*\\}", _, start) and
+      exists(int commaIndex |
+        commaIndex = inner.indexOf(",") and
+        lower = inner.prefix(commaIndex) and
+        upper = inner.suffix(commaIndex + 1)
+      )
+    )
+  }
+
+  /**
+   * Whether the text in the range start,end is a qualified item, where item is a character,
+   * a character set or a group.
+   */
+  predicate qualifiedItem(int start, int end, boolean maybeEmpty, boolean mayRepeatForever) {
+    this.qualifiedPart(start, _, end, maybeEmpty, mayRepeatForever)
+  }
+
+  /**
+   * Holds if a qualified part is found between `start` and `partEnd` and the qualifier is
+   * found between `partEnd` and `end`.
+   *
+   * `maybeEmpty` is true if the part is optional.
+   * `mayRepeatForever` is true if the part may be repeated unboundedly.
+   */
+  predicate qualifiedPart(
+    int start, int partEnd, int end, boolean maybeEmpty, boolean mayRepeatForever
+  ) {
+    this.baseItem(start, partEnd) and
+    this.qualifier(partEnd, end, maybeEmpty, mayRepeatForever)
+  }
+
+  /** Holds if the range `start`, `end` contains a character, a quantifier, a character set or a group. */
+  predicate item(int start, int end) {
+    this.qualifiedItem(start, end, _, _)
+    or
+    this.baseItem(start, end) and not this.qualifier(end, _, _, _)
+  }
+
+  private predicate subsequence(int start, int end) {
+    (
+      start = 0 or
+      this.groupStart(_, start) or
+      this.isOptionDivider(start - 1)
+    ) and
+    this.item(start, end)
+    or
+    exists(int mid |
+      this.subsequence(start, mid) and
+      this.item(mid, end)
+    )
+  }
+
+  /**
+   * Whether the text in the range start,end is a sequence of 1 or more items, where an item is a character,
+   * a character set or a group.
+   */
+  predicate sequence(int start, int end) {
+    this.sequenceOrQualified(start, end) and
+    not this.qualifiedItem(start, end, _, _)
+  }
+
+  private predicate sequenceOrQualified(int start, int end) {
+    this.subsequence(start, end) and
+    not this.itemStart(end)
+  }
+
+  private predicate itemStart(int start) {
+    this.characterItem(start, _) or
+    this.isGroupStart(start) or
+    this.charSet(start, _) or
+    this.backreference(start, _) or
+    this.namedCharacterProperty(start, _, _, _)
+  }
+
+  private predicate itemEnd(int end) {
+    this.characterItem(_, end)
+    or
+    exists(int endm1 | this.isGroupEnd(endm1) and end = endm1 + 1)
+    or
+    this.charSet(_, end)
+    or
+    this.qualifier(_, end, _, _)
+  }
+
+  private predicate topLevel(int start, int end) {
+    this.subalternation(start, end, _) and
+    not this.isOptionDivider(end)
+  }
+
+  private predicate subalternation(int start, int end, int itemStart) {
+    this.sequenceOrQualified(start, end) and
+    not this.isOptionDivider(start - 1) and
+    itemStart = start
+    or
+    start = end and
+    not this.itemEnd(start) and
+    this.isOptionDivider(end) and
+    itemStart = start
+    or
+    exists(int mid |
+      this.subalternation(start, mid, _) and
+      this.isOptionDivider(mid) and
+      itemStart = mid + 1
+    |
+      this.sequenceOrQualified(itemStart, end)
+      or
+      not this.itemStart(end) and end = itemStart
+    )
+  }
+
+  /**
+   * Whether the text in the range start,end is an alternation
+   */
+  predicate alternation(int start, int end) {
+    not this.inCharSet(start) and
+    this.topLevel(start, end) and
+    exists(int less | this.subalternation(start, less, _) and less < end)
+  }
+
+  /**
+   * Whether the text in the range start,end is an alternation and the text in partStart, partEnd is one of the
+   * options in that alternation.
+   */
+  predicate alternationOption(int start, int end, int partStart, int partEnd) {
+    this.alternation(start, end) and
+    this.subalternation(start, partEnd, partStart)
+  }
+
+  /** A part of the regex that may match the start of the string. */
+  private predicate firstPart(int start, int end) {
+    start = 0 and end = this.getText().length()
+    or
+    exists(int x | this.firstPart(x, end) |
+      this.emptyMatchAtStartGroup(x, start)
+      or
+      this.qualifiedItem(x, start, true, _)
+      or
+      // ^ matches the start of the string
+      this.specialCharacter(x, start, "^")
+    )
+    or
+    exists(int y | this.firstPart(start, y) |
+      this.item(start, end)
+      or
+      this.qualifiedPart(start, end, y, _, _)
+    )
+    or
+    exists(int x, int y | this.firstPart(x, y) |
+      this.groupContents(x, y, start, end)
+      or
+      this.alternationOption(x, y, start, end)
+    )
+  }
+
+  /** A part of the regex that may match the end of the string. */
+  private predicate lastPart(int start, int end) {
+    start = 0 and end = this.getText().length()
+    or
+    exists(int y | this.lastPart(start, y) |
+      this.emptyMatchAtEndGroup(end, y)
+      or
+      this.qualifiedItem(end, y, true, _)
+      or
+      // $ matches the end of the string.
+      this.specialCharacter(end, y, "$")
+    )
+    or
+    this.lastPart(_, end) and
+    this.item(start, end)
+    or
+    exists(int y | this.lastPart(start, y) | this.qualifiedPart(start, end, y, _, _))
+    or
+    exists(int x, int y | this.lastPart(x, y) |
+      this.groupContents(x, y, start, end)
+      or
+      this.alternationOption(x, y, start, end)
+    )
+  }
+
+  /**
+   * Whether the item at [start, end) is one of the first items
+   * to be matched.
+   */
+  predicate firstItem(int start, int end) {
+    (
+      this.characterItem(start, end)
+      or
+      this.qualifiedItem(start, end, _, _)
+      or
+      this.charSet(start, end)
+    ) and
+    this.firstPart(start, end)
+  }
+
+  /**
+   * Whether the item at [start, end) is one of the last items
+   * to be matched.
+   */
+  predicate lastItem(int start, int end) {
+    (
+      this.characterItem(start, end)
+      or
+      this.qualifiedItem(start, end, _, _)
+      or
+      this.charSet(start, end)
+    ) and
+    this.lastPart(start, end)
+  }
+}
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 0853f43dc8c0..293904928d85 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -660,46 +660,49 @@ case @builtintype.kind of
 | 24 = @float
 | 25 = @double
 | 26 = @long_double
-| 27 = @complex_float         // C99-specific _Complex float
-| 28 = @complex_double        // C99-specific _Complex double
-| 29 = @complex_long_double   // C99-specific _Complex long double
-| 30 = @imaginary_float       // C99-specific _Imaginary float
-| 31 = @imaginary_double      // C99-specific _Imaginary double
-| 32 = @imaginary_long_double // C99-specific _Imaginary long double
-| 33 = @wchar_t               // Microsoft-specific
-| 34 = @decltype_nullptr      // C++11
-| 35 = @int128                // __int128
-| 36 = @unsigned_int128       // unsigned __int128
-| 37 = @signed_int128         // signed __int128
-| 38 = @float128              // __float128
-| 39 = @complex_float128      // _Complex __float128
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
 // ... 40 _Decimal32
 // ... 41 _Decimal64
 // ... 42 _Decimal128
 | 43 = @char16_t
 | 44 = @char32_t
-| 45 = @std_float32           // _Float32
-| 46 = @float32x              // _Float32x
-| 47 = @std_float64           // _Float64
-| 48 = @float64x              // _Float64x
-| 49 = @std_float128          // _Float128
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
 // ... 50 _Float128x
 | 51 = @char8_t
-| 52 = @float16               // _Float16
-| 53 = @complex_float16       // _Complex _Float16
-| 54 = @fp16                  // __fp16
-| 55 = @std_bfloat16          // __bf16
-| 56 = @std_float16           // std::float16_t
-| 57 = @complex_std_float32   // _Complex _Float32
-| 58 = @complex_float32x      // _Complex _Float32x
-| 59 = @complex_std_float64   // _Complex _Float64
-| 60 = @complex_float64x      // _Complex _Float64x
-| 61 = @complex_std_float128  // _Complex _Float128
-| 62 = @mfp8                  // __mfp8
-| 63 = @scalable_vector_count // __SVCount_t
-| 64 = @complex_fp16          // _Complex __fp16
-| 65 = @complex_std_bfloat16  // _Complex __bf16
-| 66 = @complex_std_float16   // _Complex std::float16_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
 ;
 
 builtintypes(
@@ -711,6 +714,11 @@ builtintypes(
     int alignment: int ref
 );
 
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
 /**
  * Derived types are types that are directly derived from existing types and
  * point to, refer to, transform type data to return a new type.
@@ -736,9 +744,11 @@ derivedtypes(
     int type_id: @type ref
 );
 
-pointerishsize(unique int id: @derivedtype ref,
+pointerishsize(
+    unique int id: @derivedtype ref,
     int size: int ref,
-    int alignment: int ref);
+    int alignment: int ref
+);
 
 arraysizes(
     unique int id: @derivedtype ref,
@@ -1994,6 +2004,13 @@ case @expr.kind of
 | 394 = @isinvocable
 | 395 = @isnothrowinvocable
 | 396 = @isbitwisecloneable
+| 397 = @isvirtualbaseof
+| 398 = @isimplicitlifetime
+| 399 = @ltsynthesizesfromspaceship
+| 400 = @gtsynthesizesfromspaceship
+| 401 = @lesynthesizesfromspaceship
+| 402 = @gesynthesizesfromspaceship
+| 403 = @isstructural
 ;
 
 @var_args_expr = @vastartexpr
@@ -2113,6 +2130,13 @@ case @expr.kind of
             | @isinvocable
             | @isnothrowinvocable
             | @isbitwisecloneable
+            | @isvirtualbaseof
+            | @isimplicitlifetime
+            | @ltsynthesizesfromspaceship
+            | @gtsynthesizesfromspaceship
+            | @lesynthesizesfromspaceship
+            | @gesynthesizesfromspaceship
+            | @isstructural
             ;
 
 compound_requirement_is_noexcept(
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 54cdc7a85081..90a3250189fb 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -2,7 +2,7 @@
     <typesizes>
         <e>
             <k>@compilation</k>
-            <v>12556</v>
+            <v>12794</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -10,19 +10,19 @@
         </e>
         <e>
             <k>@file</k>
-            <v>64766</v>
+            <v>65994</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>12305</v>
+            <v>12538</v>
         </e>
         <e>
             <k>@diagnostic</k>
-            <v>356</v>
+            <v>363</v>
         </e>
         <e>
             <k>@location_default</k>
-            <v>46362405</v>
+            <v>46368911</v>
         </e>
         <e>
             <k>@trap</k>
@@ -42,15 +42,15 @@
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40315722</v>
+            <v>40292268</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>300696</v>
+            <v>300521</v>
         </e>
         <e>
             <k>@normal_function</k>
-            <v>2699010</v>
+            <v>2699581</v>
         </e>
         <e>
             <k>@unknown_function</k>
@@ -58,19 +58,19 @@
         </e>
         <e>
             <k>@constructor</k>
-            <v>688614</v>
+            <v>692574</v>
         </e>
         <e>
             <k>@destructor</k>
-            <v>84823</v>
+            <v>84841</v>
         </e>
         <e>
             <k>@conversion_function</k>
-            <v>10188</v>
+            <v>10190</v>
         </e>
         <e>
             <k>@operator</k>
-            <v>647163</v>
+            <v>647300</v>
         </e>
         <e>
             <k>@user_defined_literal</k>
@@ -78,31 +78,31 @@
         </e>
         <e>
             <k>@deduction_guide</k>
-            <v>5769</v>
+            <v>5770</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4148376</v>
+            <v>4149377</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9436285</v>
+            <v>9411026</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1639390</v>
+            <v>1639737</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>405513</v>
+            <v>406672</v>
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>265844</v>
+            <v>271344</v>
         </e>
         <e>
             <k>@using_directive</k>
-            <v>6377</v>
+            <v>6415</v>
         </e>
         <e>
             <k>@using_enum_declaration</k>
@@ -110,27 +110,27 @@
         </e>
         <e>
             <k>@static_assert</k>
-            <v>171628</v>
+            <v>172118</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>6930613</v>
+            <v>6932082</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1503078</v>
+            <v>1502203</v>
         </e>
         <e>
             <k>@globalvariable</k>
-            <v>661280</v>
+            <v>634531</v>
         </e>
         <e>
             <k>@localvariable</k>
-            <v>725852</v>
+            <v>733187</v>
         </e>
         <e>
             <k>@enumconstant</k>
-            <v>348112</v>
+            <v>347910</v>
         </e>
         <e>
             <k>@errortype</k>
@@ -364,37 +364,49 @@
             <k>@complex_std_float16</k>
             <v>122</v>
         </e>
+        <e>
+            <k>@bit_precise_int</k>
+            <v>4</v>
+        </e>
+        <e>
+            <k>@unsigned_bit_precise_int</k>
+            <v>6</v>
+        </e>
+        <e>
+            <k>@signed_bit_precise_int</k>
+            <v>1</v>
+        </e>
         <e>
             <k>@pointer</k>
-            <v>449159</v>
+            <v>449255</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>686813</v>
+            <v>686958</v>
         </e>
         <e>
             <k>@array</k>
-            <v>89611</v>
+            <v>89629</v>
         </e>
         <e>
             <k>@routineptr</k>
-            <v>674281</v>
+            <v>678157</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>958837</v>
+            <v>959040</v>
         </e>
         <e>
             <k>@gnu_vector</k>
-            <v>671</v>
+            <v>684</v>
         </e>
         <e>
             <k>@routinereference</k>
-            <v>369</v>
+            <v>371</v>
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>286877</v>
+            <v>286938</v>
         </e>
         <e>
             <k>@block</k>
@@ -406,7 +418,7 @@
         </e>
         <e>
             <k>@typeof</k>
-            <v>812</v>
+            <v>811</v>
         </e>
         <e>
             <k>@underlying_type</k>
@@ -454,7 +466,7 @@
         </e>
         <e>
             <k>@remove_cv</k>
-            <v>2095</v>
+            <v>2098</v>
         </e>
         <e>
             <k>@remove_cvref</k>
@@ -482,31 +494,31 @@
         </e>
         <e>
             <k>@remove_reference</k>
-            <v>5688</v>
+            <v>5695</v>
         </e>
         <e>
             <k>@decltype</k>
-            <v>101861</v>
+            <v>101802</v>
         </e>
         <e>
             <k>@struct</k>
-            <v>1039206</v>
+            <v>1056347</v>
         </e>
         <e>
             <k>@union</k>
-            <v>20745</v>
+            <v>20749</v>
         </e>
         <e>
             <k>@enum</k>
-            <v>41614</v>
+            <v>41590</v>
         </e>
         <e>
             <k>@template_parameter</k>
-            <v>863096</v>
+            <v>879462</v>
         </e>
         <e>
             <k>@alias</k>
-            <v>1757610</v>
+            <v>1791463</v>
         </e>
         <e>
             <k>@unknown_usertype</k>
@@ -514,27 +526,27 @@
         </e>
         <e>
             <k>@class</k>
-            <v>320881</v>
+            <v>320949</v>
         </e>
         <e>
             <k>@template_template_parameter</k>
-            <v>6073</v>
+            <v>6189</v>
         </e>
         <e>
             <k>@proxy_class</k>
-            <v>50227</v>
+            <v>51179</v>
         </e>
         <e>
             <k>@scoped_enum</k>
-            <v>11416</v>
+            <v>11418</v>
         </e>
         <e>
             <k>@template_struct</k>
-            <v>210581</v>
+            <v>214585</v>
         </e>
         <e>
             <k>@template_class</k>
-            <v>28847</v>
+            <v>28853</v>
         </e>
         <e>
             <k>@template_union</k>
@@ -542,27 +554,27 @@
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6352070</v>
+            <v>6345435</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5941339</v>
+            <v>5937883</v>
         </e>
         <e>
             <k>@concept_template</k>
-            <v>3592</v>
+            <v>3596</v>
         </e>
         <e>
             <k>@routinetype</k>
-            <v>595664</v>
+            <v>599081</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>9651</v>
+            <v>9834</v>
         </e>
         <e>
             <k>@specifier</k>
-            <v>7610</v>
+            <v>7612</v>
         </e>
         <e>
             <k>@gnuattribute</k>
@@ -570,11 +582,11 @@
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>347764</v>
+            <v>347838</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>330464</v>
+            <v>330272</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -582,19 +594,19 @@
         </e>
         <e>
             <k>@alignas</k>
-            <v>2164</v>
+            <v>2186</v>
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>16448</v>
+            <v>16544</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>71688</v>
+            <v>72665</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
-            <v>1582</v>
+            <v>1584</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -606,23 +618,23 @@
         </e>
         <e>
             <k>@attribute_arg_type</k>
-            <v>460</v>
+            <v>464</v>
         </e>
         <e>
             <k>@derivation</k>
-            <v>492610</v>
+            <v>494850</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>761457</v>
+            <v>765911</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11056034</v>
+            <v>11058376</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>8591</v>
+            <v>8754</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -630,15 +642,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3050545</v>
+            <v>3044942</v>
         </e>
         <e>
             <k>@value</k>
-            <v>13547098</v>
+            <v>13539217</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2289023</v>
+            <v>2292672</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -646,131 +658,131 @@
         </e>
         <e>
             <k>@indirect</k>
-            <v>401998</v>
+            <v>401764</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1954311</v>
+            <v>1953174</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4916613</v>
+            <v>4913752</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
-            <v>586702</v>
+            <v>586361</v>
         </e>
         <e>
             <k>@unaryplusexpr</k>
-            <v>4117</v>
+            <v>4158</v>
         </e>
         <e>
             <k>@complementexpr</k>
-            <v>38195</v>
+            <v>38172</v>
         </e>
         <e>
             <k>@notexpr</k>
-            <v>355868</v>
+            <v>355661</v>
         </e>
         <e>
             <k>@postincrexpr</k>
-            <v>84590</v>
+            <v>84541</v>
         </e>
         <e>
             <k>@postdecrexpr</k>
-            <v>57409</v>
+            <v>57375</v>
         </e>
         <e>
             <k>@preincrexpr</k>
-            <v>96742</v>
+            <v>96685</v>
         </e>
         <e>
             <k>@predecrexpr</k>
-            <v>35831</v>
+            <v>35810</v>
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>898137</v>
+            <v>897615</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>581041</v>
+            <v>580703</v>
         </e>
         <e>
             <k>@subexpr</k>
-            <v>466933</v>
+            <v>466661</v>
         </e>
         <e>
             <k>@mulexpr</k>
-            <v>445548</v>
+            <v>445289</v>
         </e>
         <e>
             <k>@divexpr</k>
-            <v>52399</v>
+            <v>52368</v>
         </e>
         <e>
             <k>@remexpr</k>
-            <v>15776</v>
+            <v>15869</v>
         </e>
         <e>
             <k>@paddexpr</k>
-            <v>118654</v>
+            <v>118585</v>
         </e>
         <e>
             <k>@psubexpr</k>
-            <v>68032</v>
+            <v>67992</v>
         </e>
         <e>
             <k>@pdiffexpr</k>
-            <v>42841</v>
+            <v>43832</v>
         </e>
         <e>
             <k>@lshiftexpr</k>
-            <v>552490</v>
+            <v>552169</v>
         </e>
         <e>
             <k>@rshiftexpr</k>
-            <v>201483</v>
+            <v>201365</v>
         </e>
         <e>
             <k>@andexpr</k>
-            <v>483730</v>
+            <v>483448</v>
         </e>
         <e>
             <k>@orexpr</k>
-            <v>194110</v>
+            <v>193997</v>
         </e>
         <e>
             <k>@xorexpr</k>
-            <v>73969</v>
+            <v>73926</v>
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>643558</v>
+            <v>643183</v>
         </e>
         <e>
             <k>@neexpr</k>
-            <v>411988</v>
+            <v>411749</v>
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>111181</v>
+            <v>111116</v>
         </e>
         <e>
             <k>@ltexpr</k>
-            <v>139469</v>
+            <v>139388</v>
         </e>
         <e>
             <k>@geexpr</k>
-            <v>81322</v>
+            <v>81275</v>
         </e>
         <e>
             <k>@leexpr</k>
-            <v>291998</v>
+            <v>291828</v>
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>1281515</v>
+            <v>1280769</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -778,15 +790,15 @@
         </e>
         <e>
             <k>@assignsubexpr</k>
-            <v>15312</v>
+            <v>15303</v>
         </e>
         <e>
             <k>@assignmulexpr</k>
-            <v>11109</v>
+            <v>11319</v>
         </e>
         <e>
             <k>@assigndivexpr</k>
-            <v>6808</v>
+            <v>6804</v>
         </e>
         <e>
             <k>@assignremexpr</k>
@@ -794,7 +806,7 @@
         </e>
         <e>
             <k>@assignlshiftexpr</k>
-            <v>3703</v>
+            <v>3701</v>
         </e>
         <e>
             <k>@assignrshiftexpr</k>
@@ -802,127 +814,127 @@
         </e>
         <e>
             <k>@assignandexpr</k>
-            <v>6530</v>
+            <v>6526</v>
         </e>
         <e>
             <k>@assignorexpr</k>
-            <v>19612</v>
+            <v>19601</v>
         </e>
         <e>
             <k>@assignxorexpr</k>
-            <v>29905</v>
+            <v>29888</v>
         </e>
         <e>
             <k>@assignpaddexpr</k>
-            <v>18633</v>
+            <v>18622</v>
         </e>
         <e>
             <k>@assignpsubexpr</k>
-            <v>1576</v>
+            <v>1575</v>
         </e>
         <e>
             <k>@andlogicalexpr</k>
-            <v>346689</v>
+            <v>346487</v>
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>1103855</v>
+            <v>1103212</v>
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>165227</v>
+            <v>165262</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>435268</v>
+            <v>435015</v>
         </e>
         <e>
             <k>@callexpr</k>
-            <v>261260</v>
+            <v>263463</v>
         </e>
         <e>
             <k>@vastartexpr</k>
-            <v>5007</v>
+            <v>5021</v>
         </e>
         <e>
             <k>@vaargexpr</k>
-            <v>1303</v>
+            <v>1302</v>
         </e>
         <e>
             <k>@vaendexpr</k>
-            <v>2941</v>
+            <v>2939</v>
         </e>
         <e>
             <k>@vacopyexpr</k>
-            <v>134</v>
+            <v>135</v>
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8257017</v>
+            <v>8252213</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
-            <v>401820</v>
+            <v>401586</v>
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>50352</v>
+            <v>50646</v>
         </e>
         <e>
             <k>@expr_stmt</k>
-            <v>147669</v>
+            <v>147583</v>
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>5708356</v>
+            <v>5708855</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1405785</v>
+            <v>1404968</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
-            <v>148579</v>
+            <v>148493</v>
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>702145</v>
+            <v>701736</v>
         </e>
         <e>
             <k>@literal</k>
-            <v>8057470</v>
+            <v>8036394</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
-            <v>1397495</v>
+            <v>1400988</v>
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6028638</v>
+            <v>6023782</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>974536</v>
+            <v>985294</v>
         </e>
         <e>
             <k>@errorexpr</k>
-            <v>44841</v>
+            <v>45075</v>
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1869126</v>
+            <v>1890439</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2079573</v>
+            <v>2091838</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
-            <v>7720</v>
+            <v>7765</v>
         </e>
         <e>
             <k>@assume</k>
-            <v>4150</v>
+            <v>4162</v>
         </e>
         <e>
             <k>@conjugation</k>
@@ -930,11 +942,11 @@
         </e>
         <e>
             <k>@realpartexpr</k>
-            <v>73</v>
+            <v>74</v>
         </e>
         <e>
             <k>@imagpartexpr</k>
-            <v>73</v>
+            <v>74</v>
         </e>
         <e>
             <k>@jmulexpr</k>
@@ -974,31 +986,31 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1549814</v>
+            <v>1554373</v>
         </e>
         <e>
             <k>@new_expr</k>
-            <v>45518</v>
+            <v>45784</v>
         </e>
         <e>
             <k>@delete_expr</k>
-            <v>11312</v>
+            <v>11378</v>
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>23607</v>
+            <v>23918</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>406398</v>
+            <v>406893</v>
         </e>
         <e>
             <k>@braced_init_list</k>
-            <v>2092</v>
+            <v>2115</v>
         </e>
         <e>
             <k>@type_id</k>
-            <v>47196</v>
+            <v>47472</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
@@ -1030,7 +1042,7 @@
         </e>
         <e>
             <k>@hastrivialconstr</k>
-            <v>7</v>
+            <v>3</v>
         </e>
         <e>
             <k>@hastrivialcopy</k>
@@ -1054,7 +1066,7 @@
         </e>
         <e>
             <k>@isclassexpr</k>
-            <v>2374</v>
+            <v>2381</v>
         </e>
         <e>
             <k>@isconvtoexpr</k>
@@ -1062,15 +1074,15 @@
         </e>
         <e>
             <k>@isemptyexpr</k>
-            <v>8715</v>
+            <v>8717</v>
         </e>
         <e>
             <k>@isenumexpr</k>
-            <v>2946</v>
+            <v>2332</v>
         </e>
         <e>
             <k>@ispodexpr</k>
-            <v>828</v>
+            <v>844</v>
         </e>
         <e>
             <k>@ispolyexpr</k>
@@ -1086,83 +1098,83 @@
         </e>
         <e>
             <k>@hastrivialdestructor</k>
-            <v>2752</v>
+            <v>776</v>
         </e>
         <e>
             <k>@uuidof</k>
-            <v>26214</v>
+            <v>26289</v>
         </e>
         <e>
             <k>@delete_array_expr</k>
-            <v>1237</v>
+            <v>1261</v>
         </e>
         <e>
             <k>@new_array_expr</k>
-            <v>6597</v>
+            <v>6616</v>
         </e>
         <e>
             <k>@foldexpr</k>
-            <v>1261</v>
+            <v>1263</v>
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>111177</v>
+            <v>111793</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
-            <v>3961</v>
+            <v>3984</v>
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>202913</v>
+            <v>204061</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
-            <v>3559</v>
+            <v>3560</v>
         </e>
         <e>
             <k>@dtordirectdestruct</k>
-            <v>38871</v>
+            <v>39099</v>
         </e>
         <e>
             <k>@dtorvirtualdestruct</k>
-            <v>3927</v>
+            <v>3950</v>
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>39241</v>
+            <v>39470</v>
         </e>
         <e>
             <k>@static_cast</k>
-            <v>346536</v>
+            <v>348329</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
-            <v>39434</v>
+            <v>39547</v>
         </e>
         <e>
             <k>@const_cast</k>
-            <v>24101</v>
+            <v>24242</v>
         </e>
         <e>
             <k>@dynamic_cast</k>
-            <v>786</v>
+            <v>801</v>
         </e>
         <e>
             <k>@lambdaexpr</k>
-            <v>18970</v>
+            <v>19024</v>
         </e>
         <e>
             <k>@param_ref</k>
-            <v>163542</v>
+            <v>165342</v>
         </e>
         <e>
             <k>@noopexpr</k>
-            <v>80</v>
+            <v>89</v>
         </e>
         <e>
             <k>@istriviallyconstructibleexpr</k>
-            <v>3682</v>
+            <v>2332</v>
         </e>
         <e>
             <k>@isdestructibleexpr</k>
@@ -1178,15 +1190,15 @@
         </e>
         <e>
             <k>@istriviallyassignableexpr</k>
-            <v>3682</v>
+            <v>2332</v>
         </e>
         <e>
             <k>@isnothrowassignableexpr</k>
-            <v>5032</v>
+            <v>5034</v>
         </e>
         <e>
             <k>@istrivialexpr</k>
-            <v>3310</v>
+            <v>1249</v>
         </e>
         <e>
             <k>@isstandardlayoutexpr</k>
@@ -1214,11 +1226,11 @@
         </e>
         <e>
             <k>@isconstructibleexpr</k>
-            <v>3559</v>
+            <v>3560</v>
         </e>
         <e>
             <k>@isnothrowconstructibleexpr</k>
-            <v>20377</v>
+            <v>20381</v>
         </e>
         <e>
             <k>@hasfinalizerexpr</k>
@@ -1254,11 +1266,11 @@
         </e>
         <e>
             <k>@isfinalexpr</k>
-            <v>9264</v>
+            <v>9318</v>
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>30169</v>
+            <v>30501</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1266,11 +1278,11 @@
         </e>
         <e>
             <k>@builtinchooseexpr</k>
-            <v>20614</v>
+            <v>20602</v>
         </e>
         <e>
             <k>@builtinaddressof</k>
-            <v>15221</v>
+            <v>15224</v>
         </e>
         <e>
             <k>@vec_fill</k>
@@ -1286,7 +1298,7 @@
         </e>
         <e>
             <k>@spaceshipexpr</k>
-            <v>1347</v>
+            <v>1348</v>
         </e>
         <e>
             <k>@co_await</k>
@@ -1314,7 +1326,7 @@
         </e>
         <e>
             <k>@builtinshuffle</k>
-            <v>608</v>
+            <v>619</v>
         </e>
         <e>
             <k>@blockassignexpr</k>
@@ -1322,7 +1334,7 @@
         </e>
         <e>
             <k>@issame</k>
-            <v>4511</v>
+            <v>4517</v>
         </e>
         <e>
             <k>@isfunction</k>
@@ -1430,7 +1442,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>841815</v>
+            <v>842839</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1526,23 +1538,23 @@
         </e>
         <e>
             <k>@c11_generic</k>
-            <v>29973</v>
+            <v>29956</v>
         </e>
         <e>
             <k>@requires_expr</k>
-            <v>16401</v>
+            <v>16421</v>
         </e>
         <e>
             <k>@nested_requirement</k>
-            <v>684</v>
+            <v>685</v>
         </e>
         <e>
             <k>@compound_requirement</k>
-            <v>10884</v>
+            <v>10897</v>
         </e>
         <e>
             <k>@concept_id</k>
-            <v>90068</v>
+            <v>90178</v>
         </e>
         <e>
             <k>@isinvocable</k>
@@ -1556,81 +1568,109 @@
             <k>@isbitwisecloneable</k>
             <v>2</v>
         </e>
+        <e>
+            <k>@isvirtualbaseof</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@isimplicitlifetime</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@ltsynthesizesfromspaceship</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@gtsynthesizesfromspaceship</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@lesynthesizesfromspaceship</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@gesynthesizesfromspaceship</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@isstructural</k>
+            <v>2</v>
+        </e>
         <e>
             <k>@lambdacapture</k>
-            <v>31810</v>
+            <v>31901</v>
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>2032201</v>
+            <v>2031019</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>990500</v>
+            <v>989924</v>
         </e>
         <e>
             <k>@stmt_while</k>
-            <v>39659</v>
+            <v>39636</v>
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>156829</v>
+            <v>159803</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>77512</v>
+            <v>78982</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1233370</v>
+            <v>1257325</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1695980</v>
+            <v>1707512</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
-            <v>232528</v>
+            <v>232393</v>
         </e>
         <e>
             <k>@stmt_for</k>
-            <v>84413</v>
+            <v>84364</v>
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>830952</v>
+            <v>831962</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>409306</v>
+            <v>409804</v>
         </e>
         <e>
             <k>@stmt_asm</k>
-            <v>63893</v>
+            <v>63856</v>
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>770162</v>
+            <v>772371</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>426756</v>
+            <v>427275</v>
         </e>
         <e>
             <k>@stmt_continue</k>
-            <v>28099</v>
+            <v>28083</v>
         </e>
         <e>
             <k>@stmt_break</k>
-            <v>137217</v>
+            <v>137609</v>
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>26230</v>
+            <v>26569</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
-            <v>209</v>
+            <v>210</v>
         </e>
         <e>
             <k>@stmt_set_vla_size</k>
@@ -1642,19 +1682,19 @@
         </e>
         <e>
             <k>@stmt_assigned_goto</k>
-            <v>12425</v>
+            <v>12418</v>
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>6157</v>
+            <v>6225</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>42985</v>
+            <v>43502</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>103236</v>
+            <v>103258</v>
         </e>
         <e>
             <k>@stmt_co_return</k>
@@ -1674,51 +1714,51 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>581489</v>
+            <v>581612</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
-            <v>214425</v>
+            <v>214300</v>
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>160411</v>
+            <v>160318</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>21767</v>
+            <v>22180</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>231147</v>
+            <v>231196</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>874750</v>
+            <v>874936</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>316386</v>
+            <v>322385</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2706007</v>
+            <v>2706580</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>98817</v>
+            <v>98838</v>
         </e>
         <e>
             <k>@ppd_pragma</k>
-            <v>399689</v>
+            <v>399774</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
-            <v>167</v>
+            <v>168</v>
         </e>
         <e>
             <k>@ppd_line</k>
-            <v>18810</v>
+            <v>19000</v>
         </e>
         <e>
             <k>@ppd_error</k>
@@ -1750,7 +1790,7 @@
         </e>
         <e>
             <k>@link_target</k>
-            <v>817</v>
+            <v>816</v>
         </e>
         <e>
             <k>@xmldtd</k>
@@ -1780,11 +1820,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>12556</cardinality>
+            <cardinality>12794</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12556</v>
+                    <v>12794</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1802,7 +1842,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12556</v>
+                                    <v>12794</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1828,19 +1868,19 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1005291</cardinality>
+            <cardinality>1024354</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12556</v>
+                    <v>12794</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>1458</v>
+                    <v>1485</v>
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29068</v>
+                    <v>29619</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1854,77 +1894,77 @@
                                 <b>
                                     <a>36</a>
                                     <b>42</b>
-                                    <v>996</v>
+                                    <v>1015</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>43</b>
-                                    <v>1090</v>
+                                    <v>1111</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>44</b>
-                                    <v>713</v>
+                                    <v>726</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>45</b>
-                                    <v>503</v>
+                                    <v>513</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>51</b>
-                                    <v>944</v>
+                                    <v>962</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>70</b>
-                                    <v>482</v>
+                                    <v>491</v>
                                 </b>
                                 <b>
                                     <a>71</a>
                                     <b>72</b>
-                                    <v>702</v>
+                                    <v>716</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>90</b>
-                                    <v>891</v>
+                                    <v>908</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>96</b>
-                                    <v>388</v>
+                                    <v>395</v>
                                 </b>
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1332</v>
+                                    <v>1357</v>
                                 </b>
                                 <b>
                                     <a>100</a>
                                     <b>102</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>103</a>
                                     <b>104</b>
-                                    <v>1982</v>
+                                    <v>2020</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>119</b>
-                                    <v>1059</v>
+                                    <v>1079</v>
                                 </b>
                                 <b>
                                     <a>120</a>
                                     <b>138</b>
-                                    <v>923</v>
+                                    <v>940</v>
                                 </b>
                                 <b>
                                     <a>139</a>
                                     <b>140</b>
-                                    <v>451</v>
+                                    <v>459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1940,67 +1980,67 @@
                                 <b>
                                     <a>34</a>
                                     <b>38</b>
-                                    <v>587</v>
+                                    <v>598</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>39</b>
-                                    <v>1489</v>
+                                    <v>1517</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>40</b>
-                                    <v>975</v>
+                                    <v>994</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>42</b>
-                                    <v>1080</v>
+                                    <v>1100</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>53</b>
-                                    <v>597</v>
+                                    <v>609</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>54</b>
-                                    <v>702</v>
+                                    <v>716</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>63</b>
-                                    <v>891</v>
+                                    <v>908</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>67</b>
-                                    <v>398</v>
+                                    <v>406</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>68</b>
-                                    <v>1395</v>
+                                    <v>1421</v>
                                 </b>
                                 <b>
                                     <a>68</a>
                                     <b>70</b>
-                                    <v>965</v>
+                                    <v>983</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>71</b>
-                                    <v>1395</v>
+                                    <v>1421</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>79</b>
-                                    <v>944</v>
+                                    <v>962</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>89</b>
-                                    <v>1122</v>
+                                    <v>1143</v>
                                 </b>
                                 <b>
                                     <a>89</a>
@@ -2021,57 +2061,57 @@
                                 <b>
                                     <a>43</a>
                                     <b>90</b>
-                                    <v>62</v>
+                                    <v>64</v>
                                 </b>
                                 <b>
                                     <a>90</a>
                                     <b>108</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>183</b>
-                                    <v>104</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>198</a>
                                     <b>422</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>422</a>
                                     <b>595</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>595</a>
                                     <b>605</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>605</a>
                                     <b>749</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>750</a>
                                     <b>778</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>781</a>
                                     <b>883</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>930</a>
                                     <b>1190</b>
-                                    <v>83</v>
+                                    <v>85</v>
                                 </b>
                                 <b>
                                     <a>1197</a>
                                     <b>1198</b>
-                                    <v>377</v>
+                                    <v>384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2087,72 +2127,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>73</v>
+                                    <v>74</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>15</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>18</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>22</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>27</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>29</b>
-                                    <v>83</v>
+                                    <v>85</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>34</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>44</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>63</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>94</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>164</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>171</a>
                                     <b>199</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2168,22 +2208,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13312</v>
+                                    <v>13564</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12598</v>
+                                    <v>12837</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>103</b>
-                                    <v>2181</v>
+                                    <v>2223</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>1198</b>
-                                    <v>975</v>
+                                    <v>994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2199,17 +2239,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19249</v>
+                                    <v>19614</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8664</v>
+                                    <v>8829</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>62</b>
-                                    <v>1153</v>
+                                    <v>1175</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2219,19 +2259,19 @@
         </relation>
         <relation>
             <name>compilation_expanded_args</name>
-            <cardinality>1005291</cardinality>
+            <cardinality>1024354</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12556</v>
+                    <v>12794</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>1458</v>
+                    <v>1485</v>
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29068</v>
+                    <v>29619</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2245,77 +2285,77 @@
                                 <b>
                                     <a>36</a>
                                     <b>42</b>
-                                    <v>996</v>
+                                    <v>1015</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>43</b>
-                                    <v>1090</v>
+                                    <v>1111</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>44</b>
-                                    <v>713</v>
+                                    <v>726</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>45</b>
-                                    <v>503</v>
+                                    <v>513</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>51</b>
-                                    <v>944</v>
+                                    <v>962</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>70</b>
-                                    <v>482</v>
+                                    <v>491</v>
                                 </b>
                                 <b>
                                     <a>71</a>
                                     <b>72</b>
-                                    <v>702</v>
+                                    <v>716</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>90</b>
-                                    <v>891</v>
+                                    <v>908</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>96</b>
-                                    <v>388</v>
+                                    <v>395</v>
                                 </b>
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1332</v>
+                                    <v>1357</v>
                                 </b>
                                 <b>
                                     <a>100</a>
                                     <b>102</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>103</a>
                                     <b>104</b>
-                                    <v>1982</v>
+                                    <v>2020</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>119</b>
-                                    <v>1059</v>
+                                    <v>1079</v>
                                 </b>
                                 <b>
                                     <a>120</a>
                                     <b>138</b>
-                                    <v>923</v>
+                                    <v>940</v>
                                 </b>
                                 <b>
                                     <a>139</a>
                                     <b>140</b>
-                                    <v>451</v>
+                                    <v>459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2331,67 +2371,67 @@
                                 <b>
                                     <a>34</a>
                                     <b>38</b>
-                                    <v>587</v>
+                                    <v>598</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>39</b>
-                                    <v>1489</v>
+                                    <v>1517</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>40</b>
-                                    <v>975</v>
+                                    <v>994</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>42</b>
-                                    <v>1080</v>
+                                    <v>1100</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>53</b>
-                                    <v>597</v>
+                                    <v>609</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>54</b>
-                                    <v>702</v>
+                                    <v>716</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>63</b>
-                                    <v>891</v>
+                                    <v>908</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>67</b>
-                                    <v>398</v>
+                                    <v>406</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>68</b>
-                                    <v>1395</v>
+                                    <v>1421</v>
                                 </b>
                                 <b>
                                     <a>68</a>
                                     <b>70</b>
-                                    <v>965</v>
+                                    <v>983</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>71</b>
-                                    <v>1395</v>
+                                    <v>1421</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>79</b>
-                                    <v>944</v>
+                                    <v>962</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>89</b>
-                                    <v>1122</v>
+                                    <v>1143</v>
                                 </b>
                                 <b>
                                     <a>89</a>
@@ -2412,57 +2452,57 @@
                                 <b>
                                     <a>43</a>
                                     <b>90</b>
-                                    <v>62</v>
+                                    <v>64</v>
                                 </b>
                                 <b>
                                     <a>90</a>
                                     <b>108</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>183</b>
-                                    <v>104</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>198</a>
                                     <b>422</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>422</a>
                                     <b>595</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>595</a>
                                     <b>605</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>605</a>
                                     <b>749</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>750</a>
                                     <b>778</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>781</a>
                                     <b>883</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>930</a>
                                     <b>1190</b>
-                                    <v>83</v>
+                                    <v>85</v>
                                 </b>
                                 <b>
                                     <a>1197</a>
                                     <b>1198</b>
-                                    <v>377</v>
+                                    <v>384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2478,72 +2518,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>73</v>
+                                    <v>74</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>15</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>18</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>22</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>27</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>29</b>
-                                    <v>83</v>
+                                    <v>85</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>34</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>44</b>
-                                    <v>125</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>63</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>94</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>164</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>171</a>
                                     <b>199</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2559,22 +2599,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13312</v>
+                                    <v>13564</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12598</v>
+                                    <v>12837</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>103</b>
-                                    <v>2181</v>
+                                    <v>2223</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>1198</b>
-                                    <v>975</v>
+                                    <v>994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2590,17 +2630,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19249</v>
+                                    <v>19614</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8664</v>
+                                    <v>8829</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>62</b>
-                                    <v>1153</v>
+                                    <v>1175</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2658,19 +2698,19 @@
         </relation>
         <relation>
             <name>compilation_compiling_files</name>
-            <cardinality>15741</cardinality>
+            <cardinality>15732</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2723</v>
+                    <v>2721</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>4520</v>
+                    <v>4518</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>13671</v>
+                    <v>13663</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2684,7 +2724,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1361</v>
+                                    <v>1360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2735,7 +2775,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1361</v>
+                                    <v>1360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2786,17 +2826,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2396</v>
+                                    <v>2395</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>490</v>
+                                    <v>489</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -2822,17 +2862,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2396</v>
+                                    <v>2395</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>490</v>
+                                    <v>489</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -2858,7 +2898,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12310</v>
+                                    <v>12302</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2884,12 +2924,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12527</v>
+                                    <v>12520</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -2904,15 +2944,15 @@
         </relation>
         <relation>
             <name>compilation_time</name>
-            <cardinality>62966</cardinality>
+            <cardinality>62929</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2723</v>
+                    <v>2721</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>4520</v>
+                    <v>4518</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -2920,7 +2960,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>18682</v>
+                    <v>19434</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2934,7 +2974,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1361</v>
+                                    <v>1360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2985,7 +3025,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2723</v>
+                                    <v>2721</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2998,20 +3038,15 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>54</v>
-                                </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>544</v>
+                                    <v>381</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>762</v>
+                                    <v>979</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -3020,34 +3055,34 @@
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>10</b>
-                                    <v>108</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
                                     <b>11</b>
-                                    <v>163</v>
+                                    <v>217</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>13</b>
+                                    <b>12</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>17</b>
+                                    <a>13</a>
+                                    <b>18</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>22</b>
-                                    <v>217</v>
+                                    <a>18</a>
+                                    <b>21</b>
+                                    <v>163</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>121</b>
+                                    <a>21</a>
+                                    <b>45</b>
                                     <v>217</v>
                                 </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>137</b>
+                                    <v>108</v>
+                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -3062,17 +3097,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2396</v>
+                                    <v>2395</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>490</v>
+                                    <v>489</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -3098,7 +3133,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4520</v>
+                                    <v>4518</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3114,12 +3149,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>925</v>
+                                    <v>1034</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1525</v>
+                                    <v>1415</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -3129,12 +3164,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>490</v>
+                                    <v>272</v>
                                 </b>
                                 <b>
                                     <a>7</a>
+                                    <b>8</b>
+                                    <v>435</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
                                     <b>9</b>
-                                    <v>381</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -3143,12 +3183,12 @@
                                 </b>
                                 <b>
                                     <a>13</a>
-                                    <b>41</b>
+                                    <b>43</b>
                                     <v>381</v>
                                 </b>
                                 <b>
                                     <a>44</a>
-                                    <b>100</b>
+                                    <b>95</b>
                                     <v>163</v>
                                 </b>
                             </bs>
@@ -3195,18 +3235,18 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>5</a>
+                                    <b>6</b>
                                     <v>108</v>
                                 </b>
                                 <b>
-                                    <a>189</a>
-                                    <b>190</b>
+                                    <a>198</a>
+                                    <b>199</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>198</a>
-                                    <b>199</b>
+                                    <a>201</a>
+                                    <b>202</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -3223,22 +3263,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12854</v>
+                                    <v>13446</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3921</v>
+                                    <v>3919</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1688</v>
+                                    <v>1578</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>42</b>
-                                    <v>217</v>
+                                    <a>5</a>
+                                    <b>45</b>
+                                    <v>489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3254,22 +3294,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11765</v>
+                                    <v>12738</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3867</v>
+                                    <v>3701</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1743</v>
+                                    <v>1687</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>67</b>
-                                    <v>1307</v>
+                                    <b>65</b>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3285,12 +3325,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15850</v>
+                                    <v>16603</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2832</v>
+                                    <v>2830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3300,15 +3340,15 @@
         </relation>
         <relation>
             <name>diagnostic_for</name>
-            <cardinality>503</cardinality>
+            <cardinality>513</cardinality>
             <columnsizes>
                 <e>
                     <k>diagnostic</k>
-                    <v>356</v>
+                    <v>363</v>
                 </e>
                 <e>
                     <k>compilation</k>
-                    <v>188</v>
+                    <v>192</v>
                 </e>
                 <e>
                     <k>file_number</k>
@@ -3316,7 +3356,7 @@
                 </e>
                 <e>
                     <k>file_number_diagnostic_number</k>
-                    <v>52</v>
+                    <v>53</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3330,12 +3370,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>209</v>
+                                    <v>213</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>146</v>
+                                    <v>149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3351,7 +3391,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3367,7 +3407,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3383,17 +3423,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>104</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>62</v>
+                                    <v>64</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3409,7 +3449,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>188</v>
+                                    <v>192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3425,17 +3465,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>104</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>62</v>
+                                    <v>64</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3499,7 +3539,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -3530,7 +3570,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -3540,7 +3580,7 @@
                                 <b>
                                     <a>18</a>
                                     <b>19</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3556,7 +3596,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3566,19 +3606,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>12556</cardinality>
+            <cardinality>12794</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12556</v>
+                    <v>12794</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>9420</v>
+                    <v>9791</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>199</v>
+                    <v>256</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3592,7 +3632,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12556</v>
+                                    <v>12794</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3608,7 +3648,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12556</v>
+                                    <v>12794</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3624,17 +3664,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7930</v>
+                                    <v>8316</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>996</v>
+                                    <v>1004</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>28</b>
-                                    <v>493</v>
+                                    <b>20</b>
+                                    <v>470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3650,12 +3690,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8843</v>
+                                    <v>9182</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>576</v>
+                                    <v>609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3671,12 +3711,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31</v>
+                                    <v>74</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31</v>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -3684,54 +3724,39 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>10</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>10</v>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>52</b>
-                                    <v>10</v>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>159</a>
-                                    <b>160</b>
-                                    <v>10</v>
+                                    <a>16</a>
+                                    <b>30</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>260</a>
-                                    <b>261</b>
-                                    <v>10</v>
+                                    <a>41</a>
+                                    <b>98</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>286</a>
-                                    <b>287</b>
-                                    <v>10</v>
+                                    <a>157</a>
+                                    <b>229</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>322</a>
-                                    <b>323</b>
-                                    <v>10</v>
+                                    <a>268</a>
+                                    <b>290</b>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3747,12 +3772,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31</v>
+                                    <v>74</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31</v>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -3760,54 +3785,39 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>31</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>10</v>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>10</v>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>10</v>
+                                    <a>16</a>
+                                    <b>30</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>52</b>
-                                    <v>10</v>
+                                    <a>41</a>
+                                    <b>96</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>134</a>
-                                    <b>135</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>155</a>
-                                    <b>156</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>234</a>
-                                    <b>235</b>
-                                    <v>10</v>
+                                    <b>152</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>261</a>
-                                    <b>262</b>
-                                    <v>10</v>
+                                    <a>204</a>
+                                    <b>232</b>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4044,31 +4054,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>46362405</cardinality>
+            <cardinality>46368911</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>46362405</v>
+                    <v>46368911</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>40263</v>
+                    <v>40272</v>
                 </e>
                 <e>
                     <k>beginLine</k>
-                    <v>7381369</v>
+                    <v>7382933</v>
                 </e>
                 <e>
                     <k>beginColumn</k>
-                    <v>21604</v>
+                    <v>21609</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7382351</v>
+                    <v>7383915</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>52907</v>
+                    <v>52918</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4082,7 +4092,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46362405</v>
+                                    <v>46368911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4098,7 +4108,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46362405</v>
+                                    <v>46368911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4114,7 +4124,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46362405</v>
+                                    <v>46368911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4130,7 +4140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46362405</v>
+                                    <v>46368911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4146,7 +4156,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46362405</v>
+                                    <v>46368911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4162,67 +4172,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>15</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>41</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>72</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>114</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>114</a>
                                     <b>142</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>143</a>
                                     <b>212</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>213</a>
                                     <b>307</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>310</a>
                                     <b>435</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>437</a>
                                     <b>596</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>607</a>
                                     <b>846</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>848</a>
                                     <b>1304</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>1354</a>
                                     <b>2855</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>3114</a>
                                     <b>30788</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>57880</a>
@@ -4243,62 +4253,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>13</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>31</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>47</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>64</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>84</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>85</a>
                                     <b>115</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>116</a>
                                     <b>160</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>206</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>206</a>
                                     <b>291</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>298</a>
                                     <b>388</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>395</a>
                                     <b>527</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>561</a>
                                     <b>1339</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>1385</a>
@@ -4319,62 +4329,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>3682</v>
+                                    <v>3683</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>20</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>28</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>36</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>43</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>53</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>62</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>62</a>
                                     <b>80</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>95</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>111</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>112</a>
@@ -4395,62 +4405,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>13</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>31</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>46</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>63</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>63</a>
                                     <b>84</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>84</a>
                                     <b>114</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>118</a>
                                     <b>160</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>206</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>207</a>
                                     <b>291</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>300</a>
                                     <b>390</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>395</a>
                                     <b>562</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>564</a>
                                     <b>1350</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>1430</a>
@@ -4471,7 +4481,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>12</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -4481,27 +4491,27 @@
                                 <b>
                                     <a>26</a>
                                     <b>34</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>42</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>50</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>61</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>67</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>67</a>
@@ -4511,27 +4521,27 @@
                                 <b>
                                     <a>76</a>
                                     <b>88</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>89</a>
                                     <b>102</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>116</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>116</a>
                                     <b>132</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>132</a>
                                     <b>364</b>
-                                    <v>1595</v>
+                                    <v>1596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4547,32 +4557,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4878521</v>
+                                    <v>4879555</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>768076</v>
+                                    <v>768239</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>535333</v>
+                                    <v>535447</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>558043</v>
+                                    <v>558161</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>97</b>
-                                    <v>555220</v>
+                                    <v>555337</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>639</b>
-                                    <v>86173</v>
+                                    <v>86192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4588,27 +4598,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4939899</v>
+                                    <v>4940945</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1200296</v>
+                                    <v>1200550</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>629609</v>
+                                    <v>629742</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>56</b>
-                                    <v>554851</v>
+                                    <v>554969</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>329</b>
-                                    <v>56712</v>
+                                    <v>56724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4624,27 +4634,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5552936</v>
+                                    <v>5554112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>476534</v>
+                                    <v>476635</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>568968</v>
+                                    <v>569089</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>556938</v>
+                                    <v>557056</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>94</b>
-                                    <v>225991</v>
+                                    <v>226039</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4660,12 +4670,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6921775</v>
+                                    <v>6923241</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>85</b>
-                                    <v>459594</v>
+                                    <v>459691</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4681,32 +4691,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4946036</v>
+                                    <v>4947084</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>731004</v>
+                                    <v>731159</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>528091</v>
+                                    <v>528203</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>576088</v>
+                                    <v>576210</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>71</b>
-                                    <v>554483</v>
+                                    <v>554600</v>
                                 </b>
                                 <b>
                                     <a>71</a>
                                     <b>252</b>
-                                    <v>45664</v>
+                                    <v>45674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4903,7 +4913,7 @@
                                 </b>
                                 <b>
                                     <a>226</a>
-                                    <b>548</b>
+                                    <b>547</b>
                                     <v>1718</v>
                                 </b>
                                 <b>
@@ -4979,7 +4989,7 @@
                                 </b>
                                 <b>
                                     <a>225</a>
-                                    <b>550</b>
+                                    <b>549</b>
                                     <v>1718</v>
                                 </b>
                                 <b>
@@ -5026,7 +5036,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2086</v>
+                                    <v>2087</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5036,7 +5046,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>1595</v>
+                                    <v>1596</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -5070,23 +5080,23 @@
                                 </b>
                                 <b>
                                     <a>74</a>
-                                    <b>87</b>
-                                    <v>1964</v>
+                                    <b>85</b>
+                                    <v>1718</v>
                                 </b>
                                 <b>
-                                    <a>87</a>
-                                    <b>99</b>
+                                    <a>85</a>
+                                    <b>97</b>
                                     <v>1718</v>
                                 </b>
                                 <b>
-                                    <a>100</a>
-                                    <b>160</b>
+                                    <a>98</a>
+                                    <b>155</b>
                                     <v>1718</v>
                                 </b>
                                 <b>
-                                    <a>261</a>
+                                    <a>155</a>
                                     <b>299</b>
-                                    <v>245</v>
+                                    <v>491</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5102,32 +5112,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4876312</v>
+                                    <v>4877345</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>771391</v>
+                                    <v>771554</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>534597</v>
+                                    <v>534710</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>556938</v>
+                                    <v>557056</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>94</b>
-                                    <v>553746</v>
+                                    <v>553864</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>622</b>
-                                    <v>89365</v>
+                                    <v>89384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5143,27 +5153,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4936952</v>
+                                    <v>4937998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1203856</v>
+                                    <v>1204111</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>622121</v>
+                                    <v>622253</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>51</b>
-                                    <v>554728</v>
+                                    <v>554846</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>329</b>
-                                    <v>64691</v>
+                                    <v>64705</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5179,12 +5189,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6938592</v>
+                                    <v>6940062</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>443758</v>
+                                    <v>443852</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5200,27 +5210,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5551586</v>
+                                    <v>5552762</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>475061</v>
+                                    <v>475161</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>573019</v>
+                                    <v>573263</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>559761</v>
+                                    <v>559757</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>89</b>
-                                    <v>222922</v>
+                                    <v>222969</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5236,32 +5246,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4944563</v>
+                                    <v>4945611</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>736160</v>
+                                    <v>736316</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>526495</v>
+                                    <v>526606</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>577929</v>
+                                    <v>578052</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>72</b>
-                                    <v>554237</v>
+                                    <v>554355</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>252</b>
-                                    <v>42964</v>
+                                    <v>42973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5277,52 +5287,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15344</v>
+                                    <v>15347</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5646</v>
+                                    <v>5647</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>4173</v>
+                                    <v>4420</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>16</b>
-                                    <v>4050</v>
+                                    <b>17</b>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>31</b>
-                                    <v>4173</v>
+                                    <a>17</a>
+                                    <b>32</b>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>31</a>
-                                    <b>93</b>
-                                    <v>4050</v>
+                                    <a>32</a>
+                                    <b>97</b>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>96</a>
-                                    <b>660</b>
-                                    <v>4050</v>
+                                    <a>107</a>
+                                    <b>663</b>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>662</a>
-                                    <b>2411</b>
-                                    <v>4050</v>
+                                    <a>699</a>
+                                    <b>2462</b>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>2462</a>
-                                    <b>4702</b>
-                                    <v>4050</v>
+                                    <a>2469</a>
+                                    <b>4721</b>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>4720</a>
+                                    <a>4757</a>
                                     <b>33780</b>
-                                    <v>3314</v>
+                                    <v>3192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5338,47 +5348,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17922</v>
+                                    <v>18048</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6014</v>
+                                    <v>6016</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3437</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>4541</v>
+                                    <v>4542</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4173</v>
+                                    <v>4174</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>84</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>88</a>
                                     <b>160</b>
-                                    <v>4173</v>
+                                    <v>4174</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>214</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>215</a>
                                     <b>267</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>267</a>
@@ -5399,50 +5409,50 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15589</v>
+                                    <v>15593</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6014</v>
+                                    <v>6139</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>4173</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>18</b>
-                                    <v>4419</v>
+                                    <v>4420</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>40</b>
-                                    <v>4173</v>
+                                    <v>4174</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>188</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>217</a>
                                     <b>747</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>766</a>
+                                    <a>765</a>
                                     <b>2171</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>2171</a>
                                     <b>2881</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>2891</a>
+                                    <a>2892</a>
                                     <b>30763</b>
                                     <v>2332</v>
                                 </b>
@@ -5460,47 +5470,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16571</v>
+                                    <v>16575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6628</v>
+                                    <v>6630</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4787</v>
+                                    <v>4788</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>4296</v>
+                                    <v>4297</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>20</b>
-                                    <v>4173</v>
+                                    <v>4174</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>32</b>
-                                    <v>4296</v>
+                                    <v>4297</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>57</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>76</b>
-                                    <v>4296</v>
+                                    <v>4297</v>
                                 </b>
                                 <b>
                                     <a>76</a>
                                     <b>117</b>
-                                    <v>3805</v>
+                                    <v>3806</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5516,47 +5526,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15589</v>
+                                    <v>15593</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6014</v>
+                                    <v>6139</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>4173</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>17</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>30</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>102</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>621</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>628</a>
                                     <b>1958</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
-                                    <a>1967</a>
+                                    <a>1966</a>
                                     <b>2836</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>2841</a>
@@ -5571,15 +5581,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>64766</cardinality>
+            <cardinality>65994</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>64766</v>
+                    <v>65994</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>64766</v>
+                    <v>65994</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5593,7 +5603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64766</v>
+                                    <v>65994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5609,7 +5619,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64766</v>
+                                    <v>65994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5619,15 +5629,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>12305</cardinality>
+            <cardinality>12538</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12305</v>
+                    <v>12538</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>12305</v>
+                    <v>12538</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5641,7 +5651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12305</v>
+                                    <v>12538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5657,7 +5667,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12305</v>
+                                    <v>12538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5667,15 +5677,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>77050</cardinality>
+            <cardinality>78512</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>12305</v>
+                    <v>12538</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>77050</v>
+                    <v>78512</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5689,42 +5699,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5989</v>
+                                    <v>6103</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1510</v>
+                                    <v>1539</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>660</v>
+                                    <v>673</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>996</v>
+                                    <v>1015</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>965</v>
+                                    <v>983</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>996</v>
+                                    <v>1015</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>44</b>
-                                    <v>923</v>
+                                    <v>940</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>151</b>
-                                    <v>262</v>
+                                    <v>267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5740,7 +5750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77050</v>
+                                    <v>78512</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5750,23 +5760,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>794223</cardinality>
+            <cardinality>794391</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>793118</v>
+                    <v>793286</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>38790</v>
+                    <v>38798</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>33512</v>
+                    <v>33519</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>18044</v>
+                    <v>18048</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5780,12 +5790,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>792014</v>
+                                    <v>792181</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5801,12 +5811,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>792014</v>
+                                    <v>792181</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5822,7 +5832,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>792873</v>
+                                    <v>793041</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5843,17 +5853,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26269</v>
+                                    <v>26275</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3682</v>
+                                    <v>3683</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -5863,7 +5873,7 @@
                                 <b>
                                     <a>39</a>
                                     <b>1981</b>
-                                    <v>2577</v>
+                                    <v>2578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5879,12 +5889,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26760</v>
+                                    <v>26766</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -5899,7 +5909,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>2086</v>
+                                    <v>2087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5915,12 +5925,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26392</v>
+                                    <v>26397</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4050</v>
+                                    <v>4051</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -5930,7 +5940,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -5951,12 +5961,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21482</v>
+                                    <v>21486</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3559</v>
+                                    <v>3560</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -5966,12 +5976,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>2577</v>
+                                    <v>2578</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>157</b>
-                                    <v>2577</v>
+                                    <v>2578</v>
                                 </b>
                                 <b>
                                     <a>172</a>
@@ -5992,17 +6002,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21850</v>
+                                    <v>21854</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3559</v>
+                                    <v>3560</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2086</v>
+                                    <v>2087</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -6012,7 +6022,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>2700</v>
+                                    <v>2701</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -6033,12 +6043,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21604</v>
+                                    <v>21609</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4173</v>
+                                    <v>4174</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -6048,7 +6058,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -6069,7 +6079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11170</v>
+                                    <v>11173</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6079,7 +6089,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -6110,7 +6120,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11170</v>
+                                    <v>11173</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6120,12 +6130,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1595</v>
+                                    <v>1596</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -6151,7 +6161,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11170</v>
+                                    <v>11173</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6186,31 +6196,31 @@
         </relation>
         <relation>
             <name>diagnostics</name>
-            <cardinality>356</cardinality>
+            <cardinality>363</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>356</v>
+                    <v>363</v>
                 </e>
                 <e>
                     <k>severity</k>
-                    <v>20</v>
+                    <v>21</v>
                 </e>
                 <e>
                     <k>error_tag</k>
-                    <v>73</v>
+                    <v>74</v>
                 </e>
                 <e>
                     <k>error_message</k>
-                    <v>146</v>
+                    <v>149</v>
                 </e>
                 <e>
                     <k>full_error_message</k>
-                    <v>178</v>
+                    <v>181</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>178</v>
+                    <v>181</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -6224,7 +6234,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6240,7 +6250,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6256,7 +6266,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6272,7 +6282,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6288,7 +6298,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>356</v>
+                                    <v>363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6409,7 +6419,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41</v>
+                                    <v>42</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -6440,7 +6450,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73</v>
+                                    <v>74</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6456,7 +6466,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6482,7 +6492,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -6508,7 +6518,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -6534,12 +6544,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>104</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31</v>
+                                    <v>32</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -6560,7 +6570,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>146</v>
+                                    <v>149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6576,7 +6586,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>146</v>
+                                    <v>149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6592,12 +6602,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31</v>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6613,12 +6623,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31</v>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6634,7 +6644,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>167</v>
+                                    <v>171</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -6655,7 +6665,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6671,7 +6681,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6687,7 +6697,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6703,7 +6713,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6719,7 +6729,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>167</v>
+                                    <v>171</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -6740,7 +6750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6756,7 +6766,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6772,7 +6782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6788,7 +6798,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7134,7 +7144,7 @@
         </relation>
         <relation>
             <name>pch_uses</name>
-            <cardinality>4118</cardinality>
+            <cardinality>4130</cardinality>
             <columnsizes>
                 <e>
                     <k>pch</k>
@@ -7142,11 +7152,11 @@
                 </e>
                 <e>
                     <k>compilation</k>
-                    <v>4118</v>
+                    <v>4130</v>
                 </e>
                 <e>
                     <k>id</k>
-                    <v>4118</v>
+                    <v>4130</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7342,7 +7352,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4118</v>
+                                    <v>4130</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7358,7 +7368,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4118</v>
+                                    <v>4130</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7374,7 +7384,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4118</v>
+                                    <v>4130</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7390,7 +7400,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4118</v>
+                                    <v>4130</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7516,23 +7526,23 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>4171827</cardinality>
+            <cardinality>4250935</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5727</v>
+                    <v>5836</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>20</v>
+                    <v>21</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>58315</v>
+                    <v>59421</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>39244</v>
+                    <v>39988</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7546,12 +7556,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>199</v>
+                                    <v>203</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5528</v>
+                                    <v>5633</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7567,62 +7577,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>86</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>88</a>
                                     <b>206</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>212</a>
                                     <b>291</b>
-                                    <v>440</v>
+                                    <v>448</v>
                                 </b>
                                 <b>
                                     <a>291</a>
                                     <b>359</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>362</a>
                                     <b>401</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>402</a>
                                     <b>479</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>480</a>
                                     <b>549</b>
-                                    <v>251</v>
+                                    <v>256</v>
                                 </b>
                                 <b>
                                     <a>550</a>
                                     <b>551</b>
-                                    <v>1321</v>
+                                    <v>1346</v>
                                 </b>
                                 <b>
                                     <a>553</a>
                                     <b>628</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>631</a>
                                     <b>753</b>
-                                    <v>451</v>
+                                    <v>459</v>
                                 </b>
                                 <b>
                                     <a>753</a>
                                     <b>1231</b>
-                                    <v>440</v>
+                                    <v>448</v>
                                 </b>
                                 <b>
                                     <a>1234</a>
                                     <b>2155</b>
-                                    <v>241</v>
+                                    <v>245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7638,67 +7648,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>98</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>244</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>244</a>
                                     <b>351</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>352</a>
                                     <b>434</b>
-                                    <v>440</v>
+                                    <v>448</v>
                                 </b>
                                 <b>
                                     <a>434</a>
                                     <b>490</b>
-                                    <v>440</v>
+                                    <v>448</v>
                                 </b>
                                 <b>
                                     <a>490</a>
                                     <b>628</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>632</a>
                                     <b>702</b>
-                                    <v>62</v>
+                                    <v>64</v>
                                 </b>
                                 <b>
                                     <a>706</a>
                                     <b>707</b>
-                                    <v>1321</v>
+                                    <v>1346</v>
                                 </b>
                                 <b>
                                     <a>710</a>
                                     <b>939</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>939</a>
                                     <b>1038</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>1066</a>
                                     <b>1853</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>1853</a>
                                     <b>3292</b>
-                                    <v>430</v>
+                                    <v>438</v>
                                 </b>
                                 <b>
                                     <a>3423</a>
                                     <b>3742</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7777,62 +7787,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10951</v>
+                                    <v>11159</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4332</v>
+                                    <v>4414</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>5024</v>
+                                    <v>5120</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>4070</v>
+                                    <v>4147</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>4563</v>
+                                    <v>4649</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>4301</v>
+                                    <v>4382</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>19</b>
-                                    <v>4856</v>
+                                    <v>4949</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>27</b>
-                                    <v>4227</v>
+                                    <v>4307</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>47</b>
-                                    <v>4804</v>
+                                    <v>4895</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>128</b>
-                                    <v>4888</v>
+                                    <v>4981</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>459</b>
-                                    <v>4594</v>
+                                    <v>4681</v>
                                 </b>
                                 <b>
                                     <a>459</a>
                                     <b>546</b>
-                                    <v>1699</v>
+                                    <v>1731</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7848,7 +7858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58315</v>
+                                    <v>59421</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7864,57 +7874,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11507</v>
+                                    <v>11726</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7636</v>
+                                    <v>7781</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4070</v>
+                                    <v>4147</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4038</v>
+                                    <v>4115</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>3398</v>
+                                    <v>3463</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>4710</v>
+                                    <v>4799</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>5360</v>
+                                    <v>5462</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>23</b>
-                                    <v>4668</v>
+                                    <v>4756</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>41</b>
-                                    <v>4647</v>
+                                    <v>4735</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>95</b>
-                                    <v>4437</v>
+                                    <v>4521</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>1726</b>
-                                    <v>3839</v>
+                                    <v>3912</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7930,72 +7940,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3335</v>
+                                    <v>3399</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1625</v>
+                                    <v>1656</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3168</v>
+                                    <v>3228</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>2444</v>
+                                    <v>2490</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>2947</v>
+                                    <v>3003</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>17</b>
-                                    <v>1919</v>
+                                    <v>1956</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>24</b>
-                                    <v>3021</v>
+                                    <v>3078</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>51</b>
-                                    <v>3514</v>
+                                    <v>3580</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>58</b>
-                                    <v>3010</v>
+                                    <v>3067</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>80</b>
-                                    <v>2958</v>
+                                    <v>3014</v>
                                 </b>
                                 <b>
                                     <a>81</a>
                                     <b>151</b>
-                                    <v>3063</v>
+                                    <v>3121</v>
                                 </b>
                                 <b>
                                     <a>151</a>
                                     <b>334</b>
-                                    <v>2958</v>
+                                    <v>3014</v>
                                 </b>
                                 <b>
                                     <a>334</a>
                                     <b>473</b>
-                                    <v>2979</v>
+                                    <v>3035</v>
                                 </b>
                                 <b>
                                     <a>473</a>
                                     <b>547</b>
-                                    <v>2297</v>
+                                    <v>2340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8011,7 +8021,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39233</v>
+                                    <v>39977</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8032,72 +8042,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3377</v>
+                                    <v>3441</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1898</v>
+                                    <v>1934</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3031</v>
+                                    <v>3089</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>2465</v>
+                                    <v>2511</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>3461</v>
+                                    <v>3527</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>3430</v>
+                                    <v>3495</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>28</b>
-                                    <v>3178</v>
+                                    <v>3238</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>3126</v>
+                                    <v>3185</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>41</b>
-                                    <v>3178</v>
+                                    <v>3238</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>66</b>
-                                    <v>2968</v>
+                                    <v>3025</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>92</b>
-                                    <v>3052</v>
+                                    <v>3110</v>
                                 </b>
                                 <b>
                                     <a>92</a>
                                     <b>113</b>
-                                    <v>2968</v>
+                                    <v>3025</v>
                                 </b>
                                 <b>
                                     <a>113</a>
                                     <b>145</b>
-                                    <v>3010</v>
+                                    <v>3067</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>172</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8107,15 +8117,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>150039073</cardinality>
+            <cardinality>149972783</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24678024</v>
+                    <v>24663663</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3706403</v>
+                    <v>3704566</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8129,37 +8139,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>2210101</v>
+                                    <v>2207711</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1475401</v>
+                                    <v>1468674</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1620834</v>
+                                    <v>1626688</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6584434</v>
+                                    <v>6580777</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8721502</v>
+                                    <v>8716427</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3558069</v>
+                                    <v>3555999</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>22</b>
-                                    <v>507680</v>
+                                    <v>507385</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8175,57 +8185,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>531859</v>
+                                    <v>529073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>743444</v>
+                                    <v>740941</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>481650</v>
+                                    <v>480811</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>275382</v>
+                                    <v>280649</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>282234</v>
+                                    <v>282069</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>330341</v>
+                                    <v>330153</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3047</v>
+                                    <v>3041</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>444778</v>
+                                    <v>444519</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>307886</v>
+                                    <v>307705</v>
                                 </b>
                                 <b>
                                     <a>339</a>
                                     <b>423</b>
-                                    <v>281836</v>
+                                    <v>281672</v>
                                 </b>
                                 <b>
                                     <a>423</a>
                                     <b>7616</b>
-                                    <v>23941</v>
+                                    <v>23927</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8235,15 +8245,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48749819</cardinality>
+            <cardinality>48637440</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7046758</v>
+                    <v>7021656</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3804211</v>
+                    <v>3802004</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8257,37 +8267,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3847809</v>
+                                    <v>3845572</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>766524</v>
+                                    <v>766078</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>361945</v>
+                                    <v>361735</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>772958</v>
+                                    <v>751505</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>535313</v>
+                                    <v>535002</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>50</b>
-                                    <v>556427</v>
+                                    <v>556103</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>9900</b>
-                                    <v>205778</v>
+                                    <v>205658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8303,67 +8313,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>313336</v>
+                                    <v>313740</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>316698</v>
+                                    <v>319101</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>301174</v>
+                                    <v>300104</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>343037</v>
+                                    <v>342540</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>456135</v>
+                                    <v>460444</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>226164</v>
+                                    <v>224631</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>408155</v>
+                                    <v>409400</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>166476</v>
+                                    <v>165315</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>377786</v>
+                                    <v>377184</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>200694</v>
+                                    <v>202387</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>344354</v>
+                                    <v>342016</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>25</b>
-                                    <v>285475</v>
+                                    <b>26</b>
+                                    <v>297272</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
+                                    <a>26</a>
                                     <b>207</b>
-                                    <v>64720</v>
+                                    <v>47865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8373,19 +8383,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40397045</cardinality>
+            <cardinality>40373543</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40397045</v>
+                    <v>40373543</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>182471</v>
+                    <v>182365</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5926523</v>
+                    <v>5923076</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -8403,7 +8413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40397045</v>
+                                    <v>40373543</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8419,7 +8429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40397045</v>
+                                    <v>40373543</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8435,7 +8445,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40397045</v>
+                                    <v>40373543</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8451,47 +8461,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61114</v>
+                                    <v>61078</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27615</v>
+                                    <v>27599</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18083</v>
+                                    <v>18073</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>10022</v>
+                                    <v>10016</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>13835</v>
+                                    <v>13827</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>13</b>
-                                    <v>14597</v>
+                                    <v>14589</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>33</b>
-                                    <v>13726</v>
+                                    <v>13718</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>187</b>
-                                    <v>13726</v>
+                                    <v>13718</v>
                                 </b>
                                 <b>
                                     <a>190</a>
                                     <b>72214</b>
-                                    <v>9749</v>
+                                    <v>9744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8507,42 +8517,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77673</v>
+                                    <v>77627</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30666</v>
+                                    <v>30648</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>14379</v>
+                                    <v>14371</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>10294</v>
+                                    <v>10288</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>14053</v>
+                                    <v>14044</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>18</b>
-                                    <v>14107</v>
+                                    <v>14099</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>90</b>
-                                    <v>13726</v>
+                                    <v>13718</v>
                                 </b>
                                 <b>
                                     <a>90</a>
                                     <b>12207</b>
-                                    <v>7571</v>
+                                    <v>7566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8558,12 +8568,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>177950</v>
+                                    <v>177847</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4520</v>
+                                    <v>4518</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8579,17 +8589,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5262380</v>
+                                    <v>5259319</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>429653</v>
+                                    <v>429403</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72214</b>
-                                    <v>234490</v>
+                                    <v>234353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8605,12 +8615,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5904354</v>
+                                    <v>5900919</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>37</b>
-                                    <v>22168</v>
+                                    <v>22156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8626,7 +8636,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5926523</v>
+                                    <v>5923076</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8699,15 +8709,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>33692864</cardinality>
+            <cardinality>33673263</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33692864</v>
+                    <v>33673263</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>15944993</v>
+                    <v>15935717</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8721,7 +8731,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33692864</v>
+                                    <v>33673263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8737,27 +8747,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7816769</v>
+                                    <v>7812221</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1596166</v>
+                                    <v>1595237</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4708483</v>
+                                    <v>4705743</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1297402</v>
+                                    <v>1296647</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>205</b>
-                                    <v>526172</v>
+                                    <v>525866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8767,15 +8777,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>6005206</cardinality>
+            <cardinality>6014113</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4196566</v>
+                    <v>4203558</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2266167</v>
+                    <v>2268486</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8789,27 +8799,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3275759</v>
+                                    <v>3281808</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>487614</v>
+                                    <v>488113</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8639</v>
+                                    <v>8647</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>411573</v>
+                                    <v>411994</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>12979</v>
+                                    <v>12993</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8825,27 +8835,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1328980</v>
+                                    <v>1330319</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>479787</v>
+                                    <v>480278</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7805</v>
+                                    <v>7813</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>425601</v>
+                                    <v>426058</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>522</b>
-                                    <v>23992</v>
+                                    <v>24017</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8855,19 +8865,19 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>81936815</cardinality>
+            <cardinality>83492408</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26104126</v>
+                    <v>26600368</v>
                 </e>
                 <e>
                     <k>argument_index</k>
-                    <v>692</v>
+                    <v>705</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>340922</v>
+                    <v>347387</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8881,22 +8891,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9611464</v>
+                                    <v>9794310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9706317</v>
+                                    <v>9891058</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4968887</v>
+                                    <v>5063078</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1817457</v>
+                                    <v>1851921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8912,22 +8922,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9792851</v>
+                                    <v>9979137</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9723783</v>
+                                    <v>9908855</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4813253</v>
+                                    <v>4904493</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1774237</v>
+                                    <v>1807881</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8943,17 +8953,17 @@
                                 <b>
                                     <a>46457</a>
                                     <b>46458</b>
-                                    <v>608</v>
+                                    <v>619</v>
                                 </b>
                                 <b>
                                     <a>46659</a>
                                     <b>173253</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
-                                    <a>646919</a>
-                                    <b>2488418</b>
-                                    <v>31</v>
+                                    <a>646916</a>
+                                    <b>2488534</b>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8969,17 +8979,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>608</v>
+                                    <v>619</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>1115</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
                                     <a>7702</a>
                                     <b>22873</b>
-                                    <v>31</v>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8995,57 +9005,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39432</v>
+                                    <v>40180</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>61882</v>
+                                    <v>63055</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20844</v>
+                                    <v>21239</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>34449</v>
+                                    <v>35113</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>38992</v>
+                                    <v>39731</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>30600</v>
+                                    <v>31180</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>28774</v>
+                                    <v>29320</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>25711</v>
+                                    <v>26188</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>57</b>
-                                    <v>26959</v>
+                                    <v>27471</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>517</b>
-                                    <v>25837</v>
+                                    <v>26327</v>
                                 </b>
                                 <b>
                                     <a>518</a>
                                     <b>486640</b>
-                                    <v>7437</v>
+                                    <v>7578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9061,17 +9071,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241517</v>
+                                    <v>246096</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>89261</v>
+                                    <v>90954</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10144</v>
+                                    <v>10336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9081,19 +9091,19 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>81936815</cardinality>
+            <cardinality>83492408</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26104126</v>
+                    <v>26600368</v>
                 </e>
                 <e>
                     <k>argument_index</k>
-                    <v>692</v>
+                    <v>705</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>206479</v>
+                    <v>210395</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9107,22 +9117,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9611464</v>
+                                    <v>9794310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9706317</v>
+                                    <v>9891058</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4968887</v>
+                                    <v>5063078</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1817457</v>
+                                    <v>1851921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9138,22 +9148,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12550907</v>
+                                    <v>12789770</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8372817</v>
+                                    <v>8531993</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4196783</v>
+                                    <v>4276333</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>983618</v>
+                                    <v>1002270</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9169,17 +9179,17 @@
                                 <b>
                                     <a>46457</a>
                                     <b>46458</b>
-                                    <v>608</v>
+                                    <v>619</v>
                                 </b>
                                 <b>
                                     <a>46659</a>
                                     <b>173253</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
-                                    <a>646919</a>
-                                    <b>2488418</b>
-                                    <v>31</v>
+                                    <a>646916</a>
+                                    <b>2488534</b>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9195,17 +9205,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>597</v>
+                                    <v>609</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>96</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                                 <b>
                                     <a>950</a>
                                     <b>16173</b>
-                                    <v>41</v>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9221,57 +9231,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21683</v>
+                                    <v>22094</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26634</v>
+                                    <v>27129</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43167</v>
+                                    <v>43996</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15924</v>
+                                    <v>16247</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>3251</v>
+                                    <v>3313</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>18169</v>
+                                    <v>18513</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>18830</v>
+                                    <v>19187</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>18211</v>
+                                    <v>18535</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>51</b>
-                                    <v>15661</v>
+                                    <v>15958</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>251</b>
-                                    <v>15494</v>
+                                    <v>15787</v>
                                 </b>
                                 <b>
                                     <a>251</a>
-                                    <b>1169168</b>
-                                    <v>9451</v>
+                                    <b>1169174</b>
+                                    <v>9630</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9287,17 +9297,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>104336</v>
+                                    <v>106314</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>88306</v>
+                                    <v>89981</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>13836</v>
+                                    <v>14099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9307,15 +9317,15 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>3994932</cardinality>
+            <cardinality>3995778</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3994932</v>
+                    <v>3995778</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1666273</v>
+                    <v>1666626</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -9333,7 +9343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3994932</v>
+                                    <v>3995778</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9349,7 +9359,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3994932</v>
+                                    <v>3995778</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9365,17 +9375,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1421746</v>
+                                    <v>1422047</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>138467</v>
+                                    <v>138496</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>106060</v>
+                                    <v>106082</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9391,7 +9401,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1663450</v>
+                                    <v>1663802</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9498,26 +9508,26 @@
         </relation>
         <relation>
             <name>builtin_functions</name>
-            <cardinality>30715</cardinality>
+            <cardinality>31201</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30715</v>
+                    <v>31201</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1124932</cardinality>
+            <cardinality>1131444</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1121608</v>
+                    <v>1128067</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1124932</v>
+                    <v>1131444</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9531,12 +9541,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1118822</v>
+                                    <v>1125231</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>2786</v>
+                                    <v>2836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9552,7 +9562,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1124932</v>
+                                    <v>1131444</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9562,15 +9572,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4011995</cardinality>
+            <cardinality>4012845</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3994932</v>
+                    <v>3995778</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>610950</v>
+                    <v>611080</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9584,12 +9594,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3977869</v>
+                                    <v>3978712</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17062</v>
+                                    <v>17066</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9605,22 +9615,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>304800</v>
+                                    <v>304864</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>211874</v>
+                                    <v>211919</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>47506</v>
+                                    <v>47516</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>464</b>
-                                    <v>45910</v>
+                                    <v>45920</v>
                                 </b>
                                 <b>
                                     <a>475</a>
@@ -9905,59 +9915,59 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>130740</cardinality>
+            <cardinality>131113</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>130740</v>
+                    <v>131113</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>87523</cardinality>
+            <cardinality>87630</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>87523</v>
+                    <v>87630</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>51363</cardinality>
+            <cardinality>51426</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>51363</v>
+                    <v>51426</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>3993459</cardinality>
+            <cardinality>3994305</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3993459</v>
+                    <v>3994305</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>deduction_guide_for_class</name>
-            <cardinality>5769</cardinality>
+            <cardinality>5770</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5769</v>
+                    <v>5770</v>
                 </e>
                 <e>
                     <k>class_template</k>
-                    <v>2209</v>
+                    <v>2210</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9971,7 +9981,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5769</v>
+                                    <v>5770</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9987,7 +9997,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10022,15 +10032,15 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>662507</cardinality>
+            <cardinality>671002</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>662507</v>
+                    <v>671002</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>173084</v>
+                    <v>227957</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10044,7 +10054,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>662507</v>
+                                    <v>671002</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10060,37 +10070,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46524</v>
+                                    <v>100146</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36335</v>
+                                    <v>59164</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>31916</v>
+                                    <v>22137</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>19763</v>
+                                    <v>13853</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6</b>
-                                    <v>12643</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>10</b>
-                                    <v>14362</v>
+                                    <b>8</b>
+                                    <v>18535</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>65</b>
-                                    <v>11538</v>
+                                    <a>8</a>
+                                    <b>152</b>
+                                    <v>14120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10100,27 +10105,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4154268</cardinality>
+            <cardinality>4155271</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4148376</v>
+                    <v>4149377</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3974186</v>
+                    <v>3975028</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>604076</v>
+                    <v>604204</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1664800</v>
+                    <v>1665153</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2768243</v>
+                    <v>2768830</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10134,7 +10139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4148376</v>
+                                    <v>4149377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10150,12 +10155,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4142483</v>
+                                    <v>4143484</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5892</v>
+                                    <v>5893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10171,7 +10176,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4148376</v>
+                                    <v>4149377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10187,7 +10192,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4148376</v>
+                                    <v>4149377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10203,12 +10208,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3814851</v>
+                                    <v>3815536</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>159335</v>
+                                    <v>159492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10224,12 +10229,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3956142</v>
+                                    <v>3956980</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18044</v>
+                                    <v>18048</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10245,7 +10250,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3974186</v>
+                                    <v>3975028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10261,12 +10266,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3835842</v>
+                                    <v>3836532</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>138344</v>
+                                    <v>138496</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10282,26 +10287,26 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>290192</v>
+                                    <v>290253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>219240</v>
+                                    <v>219286</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48365</v>
+                                    <v>48375</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>506</b>
-                                    <v>45419</v>
+                                    <v>45428</v>
                                 </b>
                                 <b>
                                     <a>555</a>
-                                    <b>10332</b>
+                                    <b>10333</b>
                                     <v>859</v>
                                 </b>
                             </bs>
@@ -10318,22 +10323,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>300749</v>
+                                    <v>300812</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>210401</v>
+                                    <v>210446</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>47628</v>
+                                    <v>47638</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9941</b>
-                                    <v>45296</v>
+                                    <v>45306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10349,22 +10354,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>485986</v>
+                                    <v>486089</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52293</v>
+                                    <v>52304</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>49347</v>
+                                    <v>49357</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2238</b>
-                                    <v>16449</v>
+                                    <v>16452</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10380,22 +10385,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>449159</v>
+                                    <v>449255</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>69356</v>
+                                    <v>69371</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>55239</v>
+                                    <v>55251</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4756</b>
-                                    <v>30320</v>
+                                    <v>30326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10411,22 +10416,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1310039</v>
+                                    <v>1310316</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>190883</v>
+                                    <v>190924</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>127787</v>
+                                    <v>127692</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3169</b>
-                                    <v>36089</v>
+                                    <v>36220</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10442,17 +10447,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1421255</v>
+                                    <v>1421556</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>138958</v>
+                                    <v>138987</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>104587</v>
+                                    <v>104609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10468,12 +10473,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1576417</v>
+                                    <v>1576751</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1596</b>
-                                    <v>88383</v>
+                                    <v>88402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10489,17 +10494,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1345392</v>
+                                    <v>1345677</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>205000</v>
+                                    <v>205043</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>1592</b>
-                                    <v>114407</v>
+                                    <v>114431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10515,17 +10520,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2376164</v>
+                                    <v>2376545</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>251770</v>
+                                    <v>251946</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>140308</v>
+                                    <v>140338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10541,17 +10546,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2395928</v>
+                                    <v>2396313</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>232497</v>
+                                    <v>232669</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>139817</v>
+                                    <v>139847</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10567,12 +10572,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2655309</v>
+                                    <v>2655871</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>211</b>
-                                    <v>112934</v>
+                                    <v>112958</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10588,12 +10593,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2729698</v>
+                                    <v>2730276</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>38545</v>
+                                    <v>38553</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10603,22 +10608,22 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1397440</cardinality>
+            <cardinality>1397736</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1397440</v>
+                    <v>1397736</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_specialized</name>
-            <cardinality>7841</cardinality>
+            <cardinality>7864</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7841</v>
+                    <v>7864</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10636,11 +10641,11 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>4214909</cardinality>
+            <cardinality>4215802</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1723968</v>
+                    <v>1724333</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -10658,22 +10663,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>360776</v>
+                                    <v>360852</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>258030</v>
+                                    <v>258085</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1082574</v>
+                                    <v>1082804</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>22586</v>
+                                    <v>22591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10870,26 +10875,26 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>433439</cardinality>
+            <cardinality>434678</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>433439</v>
+                    <v>434678</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>139743</cardinality>
+            <cardinality>140561</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>139743</v>
+                    <v>140561</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>139307</v>
+                    <v>140122</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10903,7 +10908,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>139743</v>
+                                    <v>140561</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10919,12 +10924,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>138870</v>
+                                    <v>139683</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>436</v>
+                                    <v>438</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10934,26 +10939,26 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>1156104</cardinality>
+            <cardinality>1156472</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1156104</v>
+                    <v>1156472</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_typedef_type</name>
-            <cardinality>2760</cardinality>
+            <cardinality>2788</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>2760</v>
+                    <v>2788</v>
                 </e>
                 <e>
                     <k>typedeftype_id</k>
-                    <v>124</v>
+                    <v>125</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10967,7 +10972,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2760</v>
+                                    <v>2788</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11043,11 +11048,11 @@
         </relation>
         <relation>
             <name>fun_requires</name>
-            <cardinality>28932</cardinality>
+            <cardinality>28967</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10050</v>
+                    <v>10062</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -11055,7 +11060,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>28697</v>
+                    <v>28731</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11069,7 +11074,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9986</v>
+                                    <v>9998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11090,27 +11095,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7227</v>
+                                    <v>7236</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>491</v>
+                                    <v>492</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>855</v>
+                                    <v>856</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>320</v>
+                                    <v>321</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>1133</v>
+                                    <v>1134</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -11173,7 +11178,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28461</v>
+                                    <v>28496</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11194,7 +11199,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28697</v>
+                                    <v>28731</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11204,19 +11209,19 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7218351</cardinality>
+            <cardinality>7220248</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7218351</v>
+                    <v>7220248</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7856</v>
+                    <v>7857</v>
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3488446</v>
+                    <v>3489307</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11230,7 +11235,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218351</v>
+                                    <v>7220248</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11246,7 +11251,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7218351</v>
+                                    <v>7220248</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11281,12 +11286,12 @@
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16310</b>
+                                    <b>16311</b>
                                     <v>613</v>
                                 </b>
                                 <b>
-                                    <a>28418</a>
-                                    <b>28419</b>
+                                    <a>28419</a>
+                                    <b>28420</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -11322,12 +11327,12 @@
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16310</b>
+                                    <b>16311</b>
                                     <v>613</v>
                                 </b>
                                 <b>
-                                    <a>28418</a>
-                                    <b>28419</b>
+                                    <a>28419</a>
+                                    <b>28420</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -11344,27 +11349,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1486438</v>
+                                    <v>1486752</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>972463</v>
+                                    <v>972669</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>592291</v>
+                                    <v>592540</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>285895</v>
+                                    <v>285956</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>151356</v>
+                                    <v>151388</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11380,27 +11385,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1486438</v>
+                                    <v>1486752</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>972463</v>
+                                    <v>972669</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>592291</v>
+                                    <v>592540</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>285895</v>
+                                    <v>285956</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>151356</v>
+                                    <v>151388</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11410,27 +11415,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9442668</cardinality>
+            <cardinality>9417411</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9436285</v>
+                    <v>9411026</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>9098463</v>
+                    <v>9072765</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1440773</v>
+                    <v>1441078</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>838906</v>
+                    <v>839084</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6175671</v>
+                    <v>6176980</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11444,7 +11449,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9436285</v>
+                                    <v>9411026</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11460,12 +11465,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9429901</v>
+                                    <v>9404642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6383</v>
+                                    <v>6384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11481,7 +11486,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9436285</v>
+                                    <v>9411026</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11497,7 +11502,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9436285</v>
+                                    <v>9411026</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11513,12 +11518,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8778319</v>
+                                    <v>8752184</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>320144</v>
+                                    <v>320580</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11534,12 +11539,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9046170</v>
+                                    <v>9020460</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52293</v>
+                                    <v>52304</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11555,12 +11560,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8994735</v>
+                                    <v>8969015</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>103727</v>
+                                    <v>103749</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11576,12 +11581,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8857496</v>
+                                    <v>8831378</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>240967</v>
+                                    <v>241387</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11597,27 +11602,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>839151</v>
+                                    <v>839206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>280617</v>
+                                    <v>280554</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>127296</v>
+                                    <v>127569</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>112934</v>
+                                    <v>112835</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>2963</b>
-                                    <v>80772</v>
+                                    <b>2786</b>
+                                    <v>80912</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11633,27 +11638,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>860388</v>
+                                    <v>860447</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>265764</v>
+                                    <v>265697</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>122141</v>
+                                    <v>122412</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>112566</v>
+                                    <v>112467</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>2886</b>
-                                    <v>79913</v>
+                                    <b>2709</b>
+                                    <v>80053</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11669,22 +11674,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1104793</v>
+                                    <v>1105027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>191006</v>
+                                    <v>191046</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>116371</v>
+                                    <v>116396</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>1038</b>
-                                    <v>28601</v>
+                                    <v>28607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11700,27 +11705,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>974304</v>
+                                    <v>974511</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>215189</v>
+                                    <v>215234</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>104587</v>
+                                    <v>104609</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>15</b>
-                                    <v>109865</v>
+                                    <v>109888</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>2622</b>
-                                    <v>36826</v>
+                                    <v>36834</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11736,32 +11741,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>457507</v>
+                                    <v>457235</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>161668</v>
+                                    <v>162193</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>59290</v>
+                                    <v>59303</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>64814</v>
+                                    <v>64582</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>24</b>
-                                    <v>63341</v>
+                                    <v>63968</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>27139</b>
-                                    <v>32284</v>
+                                    <v>31800</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11777,32 +11782,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>468432</v>
+                                    <v>468163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>161668</v>
+                                    <v>162193</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>55116</v>
+                                    <v>55128</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>71197</v>
+                                    <v>70844</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>44</b>
-                                    <v>63586</v>
+                                    <b>43</b>
+                                    <v>63354</v>
                                 </b>
                                 <b>
-                                    <a>44</a>
+                                    <a>43</a>
                                     <b>26704</b>
-                                    <v>18904</v>
+                                    <v>19399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11818,22 +11823,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>642744</v>
+                                    <v>642880</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>110847</v>
+                                    <v>110871</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>64078</v>
+                                    <v>64091</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3463</b>
-                                    <v>21236</v>
+                                    <v>21241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11849,27 +11854,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>484758</v>
+                                    <v>484861</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>180940</v>
+                                    <v>180978</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>51311</v>
+                                    <v>51322</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>63955</v>
+                                    <v>63968</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>22619</b>
-                                    <v>57940</v>
+                                    <v>57952</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11885,17 +11890,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5670781</v>
+                                    <v>5668544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>16</b>
-                                    <v>465117</v>
+                                    <v>468777</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>2943</b>
-                                    <v>39772</v>
+                                    <v>39658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11911,12 +11916,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5751431</v>
+                                    <v>5749211</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2935</b>
-                                    <v>424240</v>
+                                    <v>427768</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11932,12 +11937,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5874922</v>
+                                    <v>5876167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2555</b>
-                                    <v>300749</v>
+                                    <v>300812</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11953,12 +11958,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6163519</v>
+                                    <v>6164824</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>12152</v>
+                                    <v>12155</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11968,33 +11973,33 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3707686</cardinality>
+            <cardinality>3684775</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3707686</v>
+                    <v>3684775</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_specialized</name>
-            <cardinality>641</cardinality>
+            <cardinality>642</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>641</v>
+                    <v>642</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>481567</cardinality>
+            <cardinality>481669</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>481567</v>
+                    <v>481669</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -12012,7 +12017,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>481567</v>
+                                    <v>481669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12053,18 +12058,18 @@
         </relation>
         <relation>
             <name>is_structured_binding</name>
-            <cardinality>940</cardinality>
+            <cardinality>942</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>940</v>
+                    <v>942</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_requires</name>
-            <cardinality>384</cardinality>
+            <cardinality>385</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -12072,7 +12077,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>384</v>
+                    <v>385</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12112,7 +12117,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>384</v>
+                                    <v>385</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12122,19 +12127,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1639390</cardinality>
+            <cardinality>1639737</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1639390</v>
+                    <v>1639737</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1620731</v>
+                    <v>1621075</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1543273</v>
+                    <v>1543600</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12148,7 +12153,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1639390</v>
+                                    <v>1639737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12164,7 +12169,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1639390</v>
+                                    <v>1639737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12180,12 +12185,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1604650</v>
+                                    <v>1604990</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>16080</v>
+                                    <v>16084</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12201,12 +12206,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1604773</v>
+                                    <v>1605113</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>15958</v>
+                                    <v>15961</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12222,12 +12227,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513198</v>
+                                    <v>1513519</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>64</b>
-                                    <v>30074</v>
+                                    <v>30081</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12243,12 +12248,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513321</v>
+                                    <v>1513641</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>64</b>
-                                    <v>29952</v>
+                                    <v>29958</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12258,37 +12263,37 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>1092272</cardinality>
+            <cardinality>1092503</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1092272</v>
+                    <v>1092503</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>676616</cardinality>
+            <cardinality>676223</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>676616</v>
+                    <v>676223</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_requires</name>
-            <cardinality>7634</cardinality>
+            <cardinality>7643</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2031</v>
+                    <v>2033</v>
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>7612</v>
+                    <v>7621</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12302,17 +12307,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1005</v>
+                                    <v>1006</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>106</v>
+                                    <v>107</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>598</v>
+                                    <v>599</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -12338,7 +12343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7591</v>
+                                    <v>7600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12353,23 +12358,23 @@
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>405513</cardinality>
+            <cardinality>406672</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>405513</v>
+                    <v>406672</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
-                    <v>1768</v>
+                    <v>1773</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>405513</v>
+                    <v>406672</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>405513</v>
+                    <v>406672</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12383,7 +12388,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12399,7 +12404,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12415,7 +12420,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12431,12 +12436,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>363</v>
+                                    <v>364</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>185</v>
+                                    <v>186</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12497,12 +12502,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>363</v>
+                                    <v>364</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>185</v>
+                                    <v>186</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12563,12 +12568,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>363</v>
+                                    <v>364</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>185</v>
+                                    <v>186</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12629,7 +12634,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12645,7 +12650,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12661,7 +12666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12677,7 +12682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12693,7 +12698,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12709,7 +12714,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>405513</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12719,23 +12724,23 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>269966</cardinality>
+            <cardinality>275545</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>269966</v>
+                    <v>275545</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>58399</v>
+                    <v>59966</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>26666</v>
+                    <v>27171</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>20</v>
+                    <v>21</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12749,7 +12754,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>269966</v>
+                                    <v>275545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12765,7 +12770,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>269966</v>
+                                    <v>275545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12781,7 +12786,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>269966</v>
+                                    <v>275545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12797,17 +12802,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50730</v>
+                                    <v>52152</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5339</v>
+                                    <v>5440</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>134</b>
-                                    <v>2328</v>
+                                    <v>2372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12823,17 +12828,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50730</v>
+                                    <v>52152</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5339</v>
+                                    <v>5440</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>134</b>
-                                    <v>2328</v>
+                                    <v>2372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12849,7 +12854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58399</v>
+                                    <v>59966</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12865,22 +12870,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21043</v>
+                                    <v>21442</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2276</v>
+                                    <v>2319</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1930</v>
+                                    <v>1966</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>364</b>
-                                    <v>1416</v>
+                                    <b>370</b>
+                                    <v>1443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12896,22 +12901,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21043</v>
+                                    <v>21442</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2276</v>
+                                    <v>2319</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1930</v>
+                                    <v>1966</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>364</b>
-                                    <v>1416</v>
+                                    <b>370</b>
+                                    <v>1443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12927,7 +12932,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26666</v>
+                                    <v>27171</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12946,8 +12951,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>25342</a>
-                                    <b>25343</b>
+                                    <a>25385</a>
+                                    <b>25386</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -12967,8 +12972,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>5353</a>
-                                    <b>5354</b>
+                                    <a>5396</a>
+                                    <b>5397</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -13000,15 +13005,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>571131</cardinality>
+            <cardinality>582421</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>20151</v>
+                    <v>20619</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>269966</v>
+                    <v>275545</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13022,42 +13027,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8958</v>
+                                    <v>9139</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1584</v>
+                                    <v>1614</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>1762</v>
+                                    <v>1795</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2244</v>
+                                    <v>2362</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>26</b>
-                                    <v>1521</v>
+                                    <v>1549</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>136</b>
-                                    <v>797</v>
+                                    <v>812</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>146</b>
-                                    <v>2601</v>
+                                    <v>2650</v>
                                 </b>
                                 <b>
                                     <a>146</a>
                                     <b>437</b>
-                                    <v>681</v>
+                                    <v>694</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13073,27 +13078,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96332</v>
+                                    <v>98618</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>119536</v>
+                                    <v>121803</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>19585</v>
+                                    <v>19956</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>26330</v>
+                                    <v>26829</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>8182</v>
+                                    <v>8337</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13103,27 +13108,27 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>171628</cardinality>
+            <cardinality>172118</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>171628</v>
+                    <v>172118</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>171628</v>
+                    <v>172118</v>
                 </e>
                 <e>
                     <k>message</k>
-                    <v>38481</v>
+                    <v>38591</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>22434</v>
+                    <v>22498</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>6202</v>
+                    <v>6219</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13137,7 +13142,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13153,7 +13158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13169,7 +13174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13185,7 +13190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13201,7 +13206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13217,7 +13222,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13233,7 +13238,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13249,7 +13254,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171628</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13265,32 +13270,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28330</v>
+                                    <v>28411</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>662</v>
+                                    <v>664</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3585</v>
+                                    <v>3595</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>2043</v>
+                                    <v>2049</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>17</b>
-                                    <v>3101</v>
+                                    <v>3109</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>513</b>
-                                    <v>759</v>
+                                    <v>761</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13306,32 +13311,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28330</v>
+                                    <v>28411</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>662</v>
+                                    <v>664</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3585</v>
+                                    <v>3595</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>2043</v>
+                                    <v>2049</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>17</b>
-                                    <v>3101</v>
+                                    <v>3109</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>513</b>
-                                    <v>759</v>
+                                    <v>761</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13347,12 +13352,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35679</v>
+                                    <v>35781</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>33</b>
-                                    <v>2802</v>
+                                    <v>2810</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13368,27 +13373,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30147</v>
+                                    <v>30233</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>355</v>
+                                    <v>356</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3351</v>
+                                    <v>3361</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>1865</v>
+                                    <v>1870</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>43</b>
-                                    <v>2761</v>
+                                    <v>2769</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13404,37 +13409,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4255</v>
+                                    <v>4268</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3690</v>
+                                    <v>3701</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1720</v>
+                                    <v>1725</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>104</v>
+                                    <v>105</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4692</v>
+                                    <v>4705</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>428</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>2632</v>
+                                    <v>2640</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -13444,12 +13449,12 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>4369</v>
+                                    <v>4381</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>52</b>
-                                    <v>492</v>
+                                    <v>494</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13465,37 +13470,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4255</v>
+                                    <v>4268</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3690</v>
+                                    <v>3701</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1720</v>
+                                    <v>1725</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>104</v>
+                                    <v>105</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4692</v>
+                                    <v>4705</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>428</v>
+                                    <v>429</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>2632</v>
+                                    <v>2640</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -13505,12 +13510,12 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>4369</v>
+                                    <v>4381</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>52</b>
-                                    <v>492</v>
+                                    <v>494</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13526,17 +13531,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6832</v>
+                                    <v>6851</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7631</v>
+                                    <v>7653</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7736</v>
+                                    <v>7758</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -13557,32 +13562,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5055</v>
+                                    <v>5069</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8019</v>
+                                    <v>8042</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1461</v>
+                                    <v>1465</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4716</v>
+                                    <v>4729</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>13</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>2632</v>
+                                    <v>2640</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -13603,22 +13608,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5152</v>
+                                    <v>5167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>210</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>223</a>
                                     <b>11052</b>
-                                    <v>96</v>
+                                    <v>97</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13634,22 +13639,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5152</v>
+                                    <v>5167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>210</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>223</a>
                                     <b>11052</b>
-                                    <v>96</v>
+                                    <v>97</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13665,17 +13670,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5305</v>
+                                    <v>5321</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>2936</b>
-                                    <v>419</v>
+                                    <v>421</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13691,17 +13696,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5289</v>
+                                    <v>5304</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>492</v>
+                                    <v>494</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>1929</b>
-                                    <v>419</v>
+                                    <v>421</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13711,23 +13716,23 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6970509</cardinality>
+            <cardinality>6971985</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6930613</v>
+                    <v>6932082</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3361394</v>
+                    <v>3362107</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7856</v>
+                    <v>7857</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1206679</v>
+                    <v>1206935</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13741,7 +13746,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6930613</v>
+                                    <v>6932082</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13757,7 +13762,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6930613</v>
+                                    <v>6932082</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13773,12 +13778,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6890718</v>
+                                    <v>6892178</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39895</v>
+                                    <v>39903</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13794,27 +13799,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1450593</v>
+                                    <v>1450900</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>920292</v>
+                                    <v>920487</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>570073</v>
+                                    <v>570194</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>276443</v>
+                                    <v>276502</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>143991</v>
+                                    <v>144021</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13830,27 +13835,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1450593</v>
+                                    <v>1450900</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>920292</v>
+                                    <v>920487</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>570073</v>
+                                    <v>570194</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>276443</v>
+                                    <v>276502</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>143991</v>
+                                    <v>144021</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13866,22 +13871,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1757357</v>
+                                    <v>1757730</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1019846</v>
+                                    <v>1020063</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>431360</v>
+                                    <v>431451</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
-                                    <v>152829</v>
+                                    <v>152862</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14020,27 +14025,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>728672</v>
+                                    <v>728826</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>237039</v>
+                                    <v>237089</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>92925</v>
+                                    <v>92945</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>13</b>
-                                    <v>93539</v>
+                                    <v>93558</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>2574</b>
-                                    <v>54503</v>
+                                    <v>54514</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14056,27 +14061,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>810672</v>
+                                    <v>810844</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>175784</v>
+                                    <v>175822</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>107042</v>
+                                    <v>107064</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>27</b>
-                                    <v>90838</v>
+                                    <v>90857</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>2562</b>
-                                    <v>22341</v>
+                                    <v>22346</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14092,17 +14097,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>981670</v>
+                                    <v>981878</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>167683</v>
+                                    <v>167718</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>65</b>
-                                    <v>57326</v>
+                                    <v>57338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14112,15 +14117,15 @@
         </relation>
         <relation>
             <name>overrides</name>
-            <cardinality>159700</cardinality>
+            <cardinality>160156</cardinality>
             <columnsizes>
                 <e>
                     <k>new</k>
-                    <v>150954</v>
+                    <v>151385</v>
                 </e>
                 <e>
                     <k>old</k>
-                    <v>17451</v>
+                    <v>17501</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14134,12 +14139,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>142215</v>
+                                    <v>142622</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>8738</v>
+                                    <v>8763</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14155,32 +14160,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9392</v>
+                                    <v>9419</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2366</v>
+                                    <v>2372</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1647</v>
+                                    <v>1652</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1437</v>
+                                    <v>1441</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>1332</v>
+                                    <v>1336</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>230</b>
-                                    <v>1275</v>
+                                    <v>1279</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14190,19 +14195,19 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1505529</cardinality>
+            <cardinality>1504653</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1503078</v>
+                    <v>1502203</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>458086</v>
+                    <v>457819</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>644370</v>
+                    <v>643996</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14216,12 +14221,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1500736</v>
+                                    <v>1499862</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2342</v>
+                                    <v>2340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14237,7 +14242,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1503078</v>
+                                    <v>1502203</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14253,22 +14258,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>339887</v>
+                                    <v>339690</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>72607</v>
+                                    <v>72565</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>35404</v>
+                                    <v>35384</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>4445</b>
-                                    <v>10185</v>
+                                    <v>10179</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14284,22 +14289,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>357481</v>
+                                    <v>357273</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64763</v>
+                                    <v>64726</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>57</b>
-                                    <v>34370</v>
+                                    <v>34350</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>2186</b>
-                                    <v>1470</v>
+                                    <v>1469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14315,22 +14320,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>423443</v>
+                                    <v>423197</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>122610</v>
+                                    <v>122538</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>58118</v>
+                                    <v>58084</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>664</b>
-                                    <v>40198</v>
+                                    <v>40174</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14346,17 +14351,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>526499</v>
+                                    <v>526193</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>73315</v>
+                                    <v>73272</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>668</b>
-                                    <v>44555</v>
+                                    <v>44529</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14366,19 +14371,19 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>661280</cardinality>
+            <cardinality>634531</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>661280</v>
+                    <v>634531</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>10188</v>
+                    <v>10190</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>110724</v>
+                    <v>110748</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14392,7 +14397,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>661280</v>
+                                    <v>634531</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14408,7 +14413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>661280</v>
+                                    <v>634531</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14424,7 +14429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6874</v>
+                                    <v>6875</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14443,7 +14448,7 @@
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>80</b>
+                                    <b>74</b>
                                     <v>859</v>
                                 </b>
                                 <b>
@@ -14465,7 +14470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6997</v>
+                                    <v>6998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14506,22 +14511,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>92679</v>
+                                    <v>92699</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>9329</v>
+                                    <v>9454</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>139</b>
-                                    <v>8347</v>
+                                    <b>182</b>
+                                    <v>8349</v>
                                 </b>
                                 <b>
-                                    <a>181</a>
+                                    <a>632</a>
                                     <b>1156</b>
-                                    <v>368</v>
+                                    <v>245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14537,12 +14542,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>93907</v>
+                                    <v>93927</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16571</v>
+                                    <v>16575</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14557,19 +14562,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>725852</cardinality>
+            <cardinality>733187</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>725852</v>
+                    <v>733187</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53389</v>
+                    <v>53924</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>101620</v>
+                    <v>102647</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14583,7 +14588,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725852</v>
+                                    <v>733187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14599,7 +14604,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725852</v>
+                                    <v>733187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14615,37 +14620,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28869</v>
+                                    <v>29156</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7802</v>
+                                    <v>7881</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4041</v>
+                                    <v>4082</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4065</v>
+                                    <v>4106</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>4113</v>
+                                    <v>4154</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>162</b>
-                                    <v>4005</v>
+                                    <v>4045</v>
                                 </b>
                                 <b>
                                     <a>162</a>
                                     <b>19347</b>
-                                    <v>492</v>
+                                    <v>497</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14661,22 +14666,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38308</v>
+                                    <v>38691</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6718</v>
+                                    <v>6786</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4477</v>
+                                    <v>4522</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>3509</b>
-                                    <v>3885</v>
+                                    <v>3924</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14692,32 +14697,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62532</v>
+                                    <v>63163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16037</v>
+                                    <v>16199</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6538</v>
+                                    <v>6604</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>8154</v>
+                                    <v>8237</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>137</b>
-                                    <v>7630</v>
+                                    <v>7707</v>
                                 </b>
                                 <b>
                                     <a>137</a>
                                     <b>7546</b>
-                                    <v>728</v>
+                                    <v>735</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14733,22 +14738,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84575</v>
+                                    <v>85429</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8410</v>
+                                    <v>8495</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>7682</v>
+                                    <v>7760</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>1509</b>
-                                    <v>952</v>
+                                    <v>961</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14758,11 +14763,11 @@
         </relation>
         <relation>
             <name>autoderivation</name>
-            <cardinality>223904</cardinality>
+            <cardinality>224074</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>223904</v>
+                    <v>224074</v>
                 </e>
                 <e>
                     <k>derivation_type</k>
@@ -14780,7 +14785,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>223904</v>
+                                    <v>224074</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14809,8 +14814,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>527</a>
-                                    <b>528</b>
+                                    <a>528</a>
+                                    <b>529</b>
                                     <v>122</v>
                                 </b>
                                 <b>
@@ -14826,15 +14831,15 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>43672</cardinality>
+            <cardinality>43927</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>43672</v>
+                    <v>43927</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>40449</v>
+                    <v>40686</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14848,7 +14853,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43672</v>
+                                    <v>43927</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14864,12 +14869,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39610</v>
+                                    <v>39841</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>47</b>
-                                    <v>839</v>
+                                    <v>844</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14879,19 +14884,19 @@
         </relation>
         <relation>
             <name>enumconstants</name>
-            <cardinality>348112</cardinality>
+            <cardinality>347910</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>348112</v>
+                    <v>347910</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>41614</v>
+                    <v>41590</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>13944</v>
+                    <v>13936</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -14899,11 +14904,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>347731</v>
+                    <v>347529</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>320714</v>
+                    <v>320528</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14917,7 +14922,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348112</v>
+                                    <v>347910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14933,7 +14938,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348112</v>
+                                    <v>347910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14949,7 +14954,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348112</v>
+                                    <v>347910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14965,7 +14970,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348112</v>
+                                    <v>347910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14981,7 +14986,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348112</v>
+                                    <v>347910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14997,57 +15002,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1525</v>
+                                    <v>1524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5828</v>
+                                    <v>5824</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8715</v>
+                                    <v>8710</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5555</v>
+                                    <v>5552</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4575</v>
+                                    <v>4572</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2560</v>
+                                    <v>2558</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1960</v>
+                                    <v>1959</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2995</v>
+                                    <v>2994</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3431</v>
+                                    <v>3429</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>33</b>
-                                    <v>3159</v>
+                                    <v>3157</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>257</b>
-                                    <v>1307</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15063,57 +15068,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1525</v>
+                                    <v>1524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5828</v>
+                                    <v>5824</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8715</v>
+                                    <v>8710</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5555</v>
+                                    <v>5552</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4575</v>
+                                    <v>4572</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2560</v>
+                                    <v>2558</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1960</v>
+                                    <v>1959</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2995</v>
+                                    <v>2994</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3431</v>
+                                    <v>3429</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>33</b>
-                                    <v>3159</v>
+                                    <v>3157</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>257</b>
-                                    <v>1307</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15129,7 +15134,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41614</v>
+                                    <v>41590</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15145,57 +15150,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1525</v>
+                                    <v>1524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5828</v>
+                                    <v>5824</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8715</v>
+                                    <v>8710</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5555</v>
+                                    <v>5552</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4575</v>
+                                    <v>4572</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2560</v>
+                                    <v>2558</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1960</v>
+                                    <v>1959</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2995</v>
+                                    <v>2994</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3431</v>
+                                    <v>3429</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>33</b>
-                                    <v>3159</v>
+                                    <v>3157</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>257</b>
-                                    <v>1307</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15211,52 +15216,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2124</v>
+                                    <v>2123</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6046</v>
+                                    <v>6042</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8769</v>
+                                    <v>8764</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5501</v>
+                                    <v>5498</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4575</v>
+                                    <v>4572</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2505</v>
+                                    <v>2504</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1851</v>
+                                    <v>1850</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>3812</v>
+                                    <v>3810</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>3213</v>
+                                    <v>3211</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>165</b>
-                                    <v>3159</v>
+                                    <v>3157</v>
                                 </b>
                                 <b>
                                     <a>256</a>
@@ -15277,22 +15282,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2777</v>
+                                    <v>2776</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2233</v>
+                                    <v>2231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2287</v>
+                                    <v>2286</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1198</v>
+                                    <v>1197</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -15302,7 +15307,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -15312,12 +15317,12 @@
                                 <b>
                                     <a>20</a>
                                     <b>59</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>765</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15333,22 +15338,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2777</v>
+                                    <v>2776</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2233</v>
+                                    <v>2231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2287</v>
+                                    <v>2286</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1198</v>
+                                    <v>1197</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -15358,7 +15363,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -15368,12 +15373,12 @@
                                 <b>
                                     <a>20</a>
                                     <b>59</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>765</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15389,7 +15394,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13944</v>
+                                    <v>13936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15405,22 +15410,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2777</v>
+                                    <v>2776</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2233</v>
+                                    <v>2231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2287</v>
+                                    <v>2286</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1198</v>
+                                    <v>1197</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -15430,7 +15435,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -15440,12 +15445,12 @@
                                 <b>
                                     <a>20</a>
                                     <b>59</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>762</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15461,22 +15466,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2777</v>
+                                    <v>2776</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2233</v>
+                                    <v>2231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2287</v>
+                                    <v>2286</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1198</v>
+                                    <v>1197</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -15486,7 +15491,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -15496,12 +15501,12 @@
                                 <b>
                                     <a>20</a>
                                     <b>59</b>
-                                    <v>1089</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>765</b>
-                                    <v>980</v>
+                                    <v>979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15597,7 +15602,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347350</v>
+                                    <v>347148</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15618,7 +15623,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347350</v>
+                                    <v>347148</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15639,7 +15644,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347731</v>
+                                    <v>347529</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15655,7 +15660,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347731</v>
+                                    <v>347529</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15671,7 +15676,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347350</v>
+                                    <v>347148</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15692,7 +15697,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319679</v>
+                                    <v>319493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15713,7 +15718,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>320714</v>
+                                    <v>320528</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15729,7 +15734,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319679</v>
+                                    <v>319493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15750,7 +15755,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>320714</v>
+                                    <v>320528</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15766,7 +15771,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319679</v>
+                                    <v>319493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15781,19 +15786,19 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>7119</cardinality>
+            <cardinality>7121</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7119</v>
+                    <v>7121</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>7119</v>
+                    <v>7121</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>7119</v>
+                    <v>7121</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -15819,7 +15824,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15835,7 +15840,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15851,7 +15856,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15867,7 +15872,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15883,7 +15888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15899,7 +15904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15915,7 +15920,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15931,7 +15936,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15947,7 +15952,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15963,7 +15968,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15979,7 +15984,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15995,7 +16000,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16011,7 +16016,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16027,7 +16032,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16043,7 +16048,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7119</v>
+                                    <v>7121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16471,17 +16476,75 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>bit_precise_int_types</name>
+            <cardinality>11</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>11</v>
+                </e>
+                <e>
+                    <k>bit_width</k>
+                    <v>6</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>bit_width</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bit_width</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>2997672</cardinality>
+            <cardinality>2998307</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2997672</v>
+                    <v>2998307</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1445315</v>
+                    <v>1445621</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16489,7 +16552,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1925654</v>
+                    <v>1926062</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16503,7 +16566,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2997672</v>
+                                    <v>2998307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16519,7 +16582,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2997672</v>
+                                    <v>2998307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16535,7 +16598,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2997672</v>
+                                    <v>2998307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16551,17 +16614,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1327838</v>
+                                    <v>1328120</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>23</b>
-                                    <v>108760</v>
+                                    <v>108783</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>4289</b>
-                                    <v>8715</v>
+                                    <v>8717</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16577,7 +16640,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1445315</v>
+                                    <v>1445621</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16593,17 +16656,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1327961</v>
+                                    <v>1328242</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>23</b>
-                                    <v>108638</v>
+                                    <v>108661</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>4289</b>
-                                    <v>8715</v>
+                                    <v>8717</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16742,22 +16805,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1302919</v>
+                                    <v>1303195</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372438</v>
+                                    <v>372516</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>121650</v>
+                                    <v>121675</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>137</b>
-                                    <v>128647</v>
+                                    <v>128674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16773,22 +16836,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1304392</v>
+                                    <v>1304668</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372438</v>
+                                    <v>372516</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>120176</v>
+                                    <v>120202</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>137</b>
-                                    <v>128647</v>
+                                    <v>128674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16804,22 +16867,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1304760</v>
+                                    <v>1305037</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>373051</v>
+                                    <v>373130</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>121895</v>
+                                    <v>121921</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>125946</v>
+                                    <v>125973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16829,11 +16892,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2221248</cardinality>
+            <cardinality>2221718</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2221248</v>
+                    <v>2221718</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -16855,7 +16918,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2221248</v>
+                                    <v>2221718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16871,7 +16934,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2221248</v>
+                                    <v>2221718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16955,19 +17018,19 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>79299</cardinality>
+            <cardinality>79316</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>79299</v>
+                    <v>79316</v>
                 </e>
                 <e>
                     <k>num_elements</k>
-                    <v>17553</v>
+                    <v>17557</v>
                 </e>
                 <e>
                     <k>bytesize</k>
-                    <v>19886</v>
+                    <v>19890</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -16985,7 +17048,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79299</v>
+                                    <v>79316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17001,7 +17064,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79299</v>
+                                    <v>79316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17017,7 +17080,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79299</v>
+                                    <v>79316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17038,7 +17101,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10679</v>
+                                    <v>10681</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17079,7 +17142,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11538</v>
+                                    <v>11541</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17094,7 +17157,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17110,7 +17173,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11538</v>
+                                    <v>11541</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17146,7 +17209,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12520</v>
+                                    <v>12523</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17156,7 +17219,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2700</v>
+                                    <v>2701</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -17166,7 +17229,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>17</b>
-                                    <v>1595</v>
+                                    <v>1596</v>
                                 </b>
                                 <b>
                                     <a>24</a>
@@ -17187,12 +17250,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14362</v>
+                                    <v>14365</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3559</v>
+                                    <v>3560</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17218,17 +17281,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14607</v>
+                                    <v>14610</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3314</v>
+                                    <v>3315</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1595</v>
+                                    <v>1596</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -17394,15 +17457,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1757610</cardinality>
+            <cardinality>1791463</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1757610</v>
+                    <v>1791463</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>835234</v>
+                    <v>851307</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17416,7 +17479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1757610</v>
+                                    <v>1791463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17432,22 +17495,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>660833</v>
+                                    <v>673460</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80512</v>
+                                    <v>82124</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>63707</v>
+                                    <v>64968</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4525</b>
-                                    <v>30180</v>
+                                    <v>30752</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17457,15 +17520,15 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>814720</cardinality>
+            <cardinality>814246</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>27572</v>
+                    <v>27556</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>814720</v>
+                    <v>814246</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17473,7 +17536,7 @@
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>3342</v>
+                    <v>3340</v>
                 </e>
                 <e>
                     <k>parentheses_would_change_meaning</k>
@@ -17491,17 +17554,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9740</v>
+                                    <v>9734</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3649</v>
+                                    <v>3647</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3627</v>
+                                    <v>3625</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -17511,12 +17574,12 @@
                                 <b>
                                     <a>23</a>
                                     <b>24</b>
-                                    <v>3254</v>
+                                    <v>3252</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>30</b>
-                                    <v>3144</v>
+                                    <v>3142</v>
                                 </b>
                                 <b>
                                     <a>32</a>
@@ -17526,7 +17589,7 @@
                                 <b>
                                     <a>171</a>
                                     <b>172</b>
-                                    <v>3078</v>
+                                    <v>3076</v>
                                 </b>
                                 <b>
                                     <a>173</a>
@@ -17547,7 +17610,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27572</v>
+                                    <v>27556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17563,7 +17626,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27572</v>
+                                    <v>27556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17579,7 +17642,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27572</v>
+                                    <v>27556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17595,7 +17658,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814720</v>
+                                    <v>814246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17611,7 +17674,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814720</v>
+                                    <v>814246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17627,7 +17690,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814720</v>
+                                    <v>814246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17643,7 +17706,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814720</v>
+                                    <v>814246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17723,12 +17786,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1209</v>
+                                    <v>1208</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1033</v>
+                                    <v>1032</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17769,7 +17832,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1165</v>
+                                    <v>1164</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17815,7 +17878,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3342</v>
+                                    <v>3340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17831,7 +17894,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3342</v>
+                                    <v>3340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17905,15 +17968,15 @@
         </relation>
         <relation>
             <name>type_operators</name>
-            <cardinality>7954</cardinality>
+            <cardinality>7964</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7954</v>
+                    <v>7964</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>7184</v>
+                    <v>7193</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17921,7 +17984,7 @@
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>5217</v>
+                    <v>5223</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17935,7 +17998,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7954</v>
+                                    <v>7964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17951,7 +18014,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7954</v>
+                                    <v>7964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17967,7 +18030,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7954</v>
+                                    <v>7964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17983,12 +18046,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6415</v>
+                                    <v>6422</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>769</v>
+                                    <v>770</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18004,12 +18067,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6415</v>
+                                    <v>6422</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>769</v>
+                                    <v>770</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18025,7 +18088,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7163</v>
+                                    <v>7171</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18139,12 +18202,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3571</v>
+                                    <v>3575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>940</v>
+                                    <v>941</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18170,12 +18233,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3720</v>
+                                    <v>3725</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1026</v>
+                                    <v>1027</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18201,12 +18264,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4020</v>
+                                    <v>4024</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1176</v>
+                                    <v>1177</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18221,19 +18284,19 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4203790</cardinality>
+            <cardinality>4280384</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4203790</v>
+                    <v>4280384</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>950343</v>
+                    <v>966130</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>125</v>
+                    <v>128</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18247,7 +18310,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4203790</v>
+                                    <v>4280384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18263,7 +18326,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4203790</v>
+                                    <v>4280384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18279,22 +18342,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>681205</v>
+                                    <v>692231</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>160794</v>
+                                    <v>163458</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>72561</v>
+                                    <v>74001</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>33452</b>
-                                    <v>35782</v>
+                                    <b>33429</b>
+                                    <v>36439</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18310,12 +18373,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898500</v>
+                                    <v>913304</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>51842</v>
+                                    <v>52825</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18349,8 +18412,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>1662</a>
-                                    <b>1663</b>
+                                    <a>1559</a>
+                                    <b>1560</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18364,13 +18427,13 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>20074</a>
-                                    <b>20075</b>
+                                    <a>20075</a>
+                                    <b>20076</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>21723</a>
-                                    <b>21724</b>
+                                    <a>21724</a>
+                                    <b>21725</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18379,13 +18442,13 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>99064</a>
-                                    <b>99065</b>
+                                    <a>98824</a>
+                                    <b>98825</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>167547</a>
-                                    <b>167548</b>
+                                    <a>167596</a>
+                                    <b>167597</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18450,13 +18513,13 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>12272</a>
-                                    <b>12273</b>
+                                    <a>12260</a>
+                                    <b>12261</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>61190</a>
-                                    <b>61191</b>
+                                    <a>60993</a>
+                                    <b>60994</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18467,19 +18530,19 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1421775</cardinality>
+            <cardinality>1444984</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1421775</v>
+                    <v>1444984</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>1468</v>
+                    <v>1496</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>83</v>
+                    <v>85</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18493,7 +18556,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1421775</v>
+                                    <v>1444984</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18509,7 +18572,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1421775</v>
+                                    <v>1444984</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18525,52 +18588,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>461</v>
+                                    <v>470</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>188</v>
+                                    <v>192</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>19</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>30</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>115</b>
-                                    <v>115</v>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>118</a>
-                                    <b>1731</b>
-                                    <v>115</v>
+                                    <b>1735</b>
+                                    <v>117</v>
                                 </b>
                                 <b>
                                     <a>1840</a>
-                                    <b>106128</b>
-                                    <v>52</v>
+                                    <b>105871</b>
+                                    <v>53</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18586,17 +18649,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1195</v>
+                                    <v>1218</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18635,18 +18698,18 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>2147</a>
-                                    <b>2148</b>
+                                    <a>2044</a>
+                                    <b>2045</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>11942</a>
-                                    <b>11943</b>
+                                    <a>11951</a>
+                                    <b>11952</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>121323</a>
-                                    <b>121324</b>
+                                    <a>121066</a>
+                                    <b>121067</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18663,7 +18726,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18703,26 +18766,26 @@
         </relation>
         <relation>
             <name>usertype_final</name>
-            <cardinality>11293</cardinality>
+            <cardinality>11295</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11293</v>
+                    <v>11295</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>usertype_uuid</name>
-            <cardinality>47615</cardinality>
+            <cardinality>47751</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>47615</v>
+                    <v>47751</v>
                 </e>
                 <e>
                     <k>uuid</k>
-                    <v>47074</v>
+                    <v>47208</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18736,7 +18799,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47615</v>
+                                    <v>47751</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18752,12 +18815,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46533</v>
+                                    <v>46666</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>541</v>
+                                    <v>542</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18767,15 +18830,15 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>1757610</cardinality>
+            <cardinality>1791463</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1757610</v>
+                    <v>1791463</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
-                    <v>20</v>
+                    <v>21</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18789,7 +18852,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1757610</v>
+                                    <v>1791463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18803,13 +18866,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>36943</a>
-                                    <b>36944</b>
+                                    <a>36949</a>
+                                    <b>36950</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>130604</a>
-                                    <b>130605</b>
+                                    <a>130647</a>
+                                    <b>130648</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18820,26 +18883,26 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>754374</cardinality>
+            <cardinality>758786</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>754374</v>
+                    <v>758786</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_template_type_constraint</name>
-            <cardinality>26986</cardinality>
+            <cardinality>27019</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13300</v>
+                    <v>13316</v>
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>25852</v>
+                    <v>25884</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18853,27 +18916,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10157</v>
+                                    <v>10169</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>898</v>
+                                    <v>899</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1026</v>
+                                    <v>1027</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>14</b>
-                                    <v>1111</v>
+                                    <v>1113</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>17</b>
-                                    <v>106</v>
+                                    <v>107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18889,12 +18952,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24719</v>
+                                    <v>24749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1133</v>
+                                    <v>1134</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18904,15 +18967,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>8184676</cardinality>
+            <cardinality>8178430</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8184676</v>
+                    <v>8178430</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6352070</v>
+                    <v>6345435</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -18930,7 +18993,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8184676</v>
+                                    <v>8178430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18946,7 +19009,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8184676</v>
+                                    <v>8178430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18962,12 +19025,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5997431</v>
+                                    <v>5990721</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1120</b>
-                                    <v>354638</v>
+                                    <v>354713</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18983,7 +19046,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6352070</v>
+                                    <v>6345435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19002,8 +19065,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>66669</a>
-                                    <b>66670</b>
+                                    <a>66604</a>
+                                    <b>66605</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -19023,8 +19086,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>51740</a>
-                                    <b>51741</b>
+                                    <a>51675</a>
+                                    <b>51676</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -19035,59 +19098,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>608655</cardinality>
+            <cardinality>611169</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>608655</v>
+                    <v>611169</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1183332</cardinality>
+            <cardinality>1203088</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1183332</v>
+                    <v>1203088</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1403669</cardinality>
+            <cardinality>1427635</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1403669</v>
+                    <v>1427635</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>230554</cardinality>
+            <cardinality>234937</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>230554</v>
+                    <v>234937</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1183835</cardinality>
+            <cardinality>1203697</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1180845</v>
+                    <v>1200629</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>71774</v>
+                    <v>73103</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19101,12 +19164,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1178758</v>
+                                    <v>1198481</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2087</v>
+                                    <v>2148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19122,47 +19185,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20340</v>
+                                    <v>20779</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12777</v>
+                                    <v>13030</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7101</v>
+                                    <v>7215</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4657</v>
+                                    <v>4756</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>6189</v>
+                                    <v>6327</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>5685</v>
+                                    <v>5750</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>5864</v>
+                                    <v>5964</v>
                                 </b>
                                 <b>
                                     <a>17</a>
-                                    <b>52</b>
-                                    <v>5402</v>
+                                    <b>53</b>
+                                    <v>5547</v>
                                 </b>
                                 <b>
-                                    <a>52</a>
+                                    <a>53</a>
                                     <b>4358</b>
-                                    <v>3755</v>
+                                    <v>3730</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19172,19 +19235,19 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>3001639</cardinality>
+            <cardinality>3053715</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1423558</v>
+                    <v>1447923</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1174</v>
+                    <v>1197</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>844622</v>
+                    <v>860596</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19198,27 +19261,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599423</v>
+                                    <v>609806</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>434747</v>
+                                    <v>441933</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>263557</v>
+                                    <v>267956</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>107724</v>
+                                    <v>109777</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>113</b>
-                                    <v>18106</v>
+                                    <v>18449</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19234,22 +19297,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>628313</v>
+                                    <v>638860</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>448888</v>
+                                    <v>456705</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>263630</v>
+                                    <v>268052</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>82726</v>
+                                    <v>84305</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19270,32 +19333,32 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>744</v>
+                                    <v>758</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>30</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>90</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>453</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>643</a>
-                                    <b>7142</b>
-                                    <v>94</v>
+                                    <b>7143</b>
+                                    <v>96</v>
                                 </b>
                                 <b>
-                                    <a>11996</a>
-                                    <b>135692</b>
-                                    <v>41</v>
+                                    <a>11997</a>
+                                    <b>135446</b>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19316,32 +19379,32 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>744</v>
+                                    <v>758</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>104</v>
+                                    <v>106</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>35</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>155</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
                                     <a>196</a>
                                     <b>3290</b>
-                                    <v>94</v>
+                                    <v>96</v>
                                 </b>
                                 <b>
-                                    <a>11129</a>
-                                    <b>46222</b>
-                                    <v>31</v>
+                                    <a>11131</a>
+                                    <b>46221</b>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19357,27 +19420,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>524281</v>
+                                    <v>534234</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>174662</v>
+                                    <v>177964</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>77711</v>
+                                    <v>79356</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>44</b>
-                                    <v>63413</v>
+                                    <b>46</b>
+                                    <v>64680</v>
                                 </b>
                                 <b>
-                                    <a>44</a>
-                                    <b>13910</b>
-                                    <v>4552</v>
+                                    <a>46</a>
+                                    <b>13877</b>
+                                    <v>4361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19393,17 +19456,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>737475</v>
+                                    <v>751823</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>87866</v>
+                                    <v>89137</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>19281</v>
+                                    <v>19636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19413,19 +19476,19 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>508958</cardinality>
+            <cardinality>511935</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>209162</v>
+                    <v>210385</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>302</v>
+                    <v>303</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>508824</v>
+                    <v>511800</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19439,17 +19502,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>159884</v>
+                                    <v>160819</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42732</v>
+                                    <v>42982</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>6545</v>
+                                    <v>6584</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19465,22 +19528,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>152130</v>
+                                    <v>153020</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39878</v>
+                                    <v>40112</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>52</b>
-                                    <v>15911</v>
+                                    <v>16004</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>154</b>
-                                    <v>1242</v>
+                                    <v>1249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19608,12 +19671,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>508690</v>
+                                    <v>511665</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19629,7 +19692,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>508824</v>
+                                    <v>511800</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19639,15 +19702,15 @@
         </relation>
         <relation>
             <name>class_template_generated_from</name>
-            <cardinality>61420</cardinality>
+            <cardinality>62595</cardinality>
             <columnsizes>
                 <e>
                     <k>template</k>
-                    <v>61420</v>
+                    <v>62595</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>3734</v>
+                    <v>3805</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19661,7 +19724,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61420</v>
+                                    <v>62595</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19677,47 +19740,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1510</v>
+                                    <v>1539</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>472</v>
+                                    <v>481</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>209</v>
+                                    <v>213</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>178</v>
+                                    <v>181</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>262</v>
+                                    <v>267</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>262</v>
+                                    <v>267</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>283</v>
+                                    <v>288</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>63</b>
-                                    <v>335</v>
+                                    <v>342</v>
                                 </b>
                                 <b>
                                     <a>63</a>
                                     <b>603</b>
-                                    <v>220</v>
+                                    <v>224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19727,15 +19790,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>50227</cardinality>
+            <cardinality>51179</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>50227</v>
+                    <v>51179</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>46922</v>
+                    <v>47812</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19749,7 +19812,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50227</v>
+                                    <v>51179</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19765,12 +19828,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46167</v>
+                                    <v>47043</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>82</b>
-                                    <v>755</v>
+                                    <v>769</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19780,19 +19843,19 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5941339</cardinality>
+            <cardinality>5937883</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5941339</v>
+                    <v>5937883</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>278065</v>
+                    <v>277903</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5885018</v>
+                    <v>5881594</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -19810,7 +19873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5941339</v>
+                                    <v>5937883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19826,7 +19889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5941339</v>
+                                    <v>5937883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19842,7 +19905,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5941339</v>
+                                    <v>5937883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19858,42 +19921,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137480</v>
+                                    <v>137400</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31210</v>
+                                    <v>31192</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11656</v>
+                                    <v>11649</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14979</v>
+                                    <v>14970</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19935</v>
+                                    <v>19924</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21787</v>
+                                    <v>21775</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21025</v>
+                                    <v>21012</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>8941</b>
-                                    <v>19990</v>
+                                    <v>19978</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19909,42 +19972,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137480</v>
+                                    <v>137400</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31210</v>
+                                    <v>31192</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11656</v>
+                                    <v>11649</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14979</v>
+                                    <v>14970</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19935</v>
+                                    <v>19924</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21787</v>
+                                    <v>21775</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21025</v>
+                                    <v>21012</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>8941</b>
-                                    <v>19990</v>
+                                    <v>19978</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19960,7 +20023,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>278065</v>
+                                    <v>277903</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19976,12 +20039,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5839318</v>
+                                    <v>5835921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>45699</v>
+                                    <v>45673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19997,12 +20060,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5839318</v>
+                                    <v>5835921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>45699</v>
+                                    <v>45673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20018,7 +20081,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5885018</v>
+                                    <v>5881594</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20076,26 +20139,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1311389</cardinality>
+            <cardinality>1311667</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1311389</v>
+                    <v>1311667</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>959643</cardinality>
+            <cardinality>965154</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>959643</v>
+                    <v>965154</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>180058</v>
+                    <v>181044</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20109,7 +20172,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>959643</v>
+                                    <v>965154</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20125,27 +20188,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>108961</v>
+                                    <v>109531</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42195</v>
+                                    <v>42441</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>14232</v>
+                                    <v>14316</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>104</b>
-                                    <v>13527</v>
+                                    <v>13607</v>
                                 </b>
                                 <b>
                                     <a>119</a>
-                                    <b>1532</b>
-                                    <v>1141</v>
+                                    <b>1531</b>
+                                    <v>1147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20155,19 +20218,19 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2464632</cardinality>
+            <cardinality>2478845</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1448091</v>
+                    <v>1456460</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>469</v>
+                    <v>472</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>293619</v>
+                    <v>295303</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20181,22 +20244,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>787539</v>
+                                    <v>792112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>407146</v>
+                                    <v>409494</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>169350</v>
+                                    <v>170307</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>84054</v>
+                                    <v>84546</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20212,22 +20275,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>806405</v>
+                                    <v>811087</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>405266</v>
+                                    <v>407603</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>167202</v>
+                                    <v>168146</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>69217</v>
+                                    <v>69622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20243,7 +20306,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>167</v>
+                                    <v>168</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -20276,18 +20339,18 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>7549</a>
-                                    <b>7550</b>
+                                    <a>7548</a>
+                                    <b>7549</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>19678</a>
-                                    <b>19679</b>
+                                    <a>19676</a>
+                                    <b>19677</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>43139</a>
-                                    <b>43140</b>
+                                    <a>43136</a>
+                                    <b>43137</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -20304,7 +20367,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>167</v>
+                                    <v>168</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -20347,8 +20410,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>6081</a>
-                                    <b>6082</b>
+                                    <a>6080</a>
+                                    <b>6081</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -20365,37 +20428,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172204</v>
+                                    <v>173211</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>25914</v>
+                                    <v>26032</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>19536</v>
+                                    <v>19650</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>22457</v>
+                                    <v>22588</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>22960</v>
+                                    <v>23094</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>76</b>
-                                    <v>22960</v>
+                                    <v>23094</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>2452</b>
-                                    <v>7586</v>
+                                    <v>7630</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20411,17 +20474,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>253002</v>
+                                    <v>254448</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31688</v>
+                                    <v>31873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>8929</v>
+                                    <v>8981</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20431,19 +20494,19 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>453873</cardinality>
+            <cardinality>456460</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>193888</v>
+                    <v>194955</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>469</v>
+                    <v>472</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>451221</v>
+                    <v>453793</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20457,17 +20520,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>149176</v>
+                                    <v>149981</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42262</v>
+                                    <v>42509</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>2450</v>
+                                    <v>2464</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20483,22 +20546,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>142362</v>
+                                    <v>143127</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36085</v>
+                                    <v>36296</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>54</b>
-                                    <v>14669</v>
+                                    <v>14755</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>166</b>
-                                    <v>772</v>
+                                    <v>776</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20514,7 +20577,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>167</v>
+                                    <v>168</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20552,13 +20615,13 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>1850</a>
-                                    <b>1851</b>
+                                    <a>1849</a>
+                                    <b>1850</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>2547</a>
-                                    <b>2548</b>
+                                    <a>2546</a>
+                                    <b>2547</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -20575,7 +20638,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>167</v>
+                                    <v>168</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20613,13 +20676,13 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>3813</a>
-                                    <b>3814</b>
+                                    <a>3812</a>
+                                    <b>3813</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>4291</a>
-                                    <b>4292</b>
+                                    <a>4290</a>
+                                    <b>4291</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -20636,12 +20699,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>448569</v>
+                                    <v>451125</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2651</v>
+                                    <v>2667</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20657,7 +20720,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>451221</v>
+                                    <v>453793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20667,15 +20730,15 @@
         </relation>
         <relation>
             <name>function_template_generated_from</name>
-            <cardinality>864410</cardinality>
+            <cardinality>869466</cardinality>
             <columnsizes>
                 <e>
                     <k>template</k>
-                    <v>864410</v>
+                    <v>869466</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>22154</v>
+                    <v>22284</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20689,7 +20752,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>864410</v>
+                                    <v>869466</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20705,62 +20768,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3591</v>
+                                    <v>3612</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1174</v>
+                                    <v>1181</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1678</v>
+                                    <v>1688</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>1779</v>
+                                    <v>1789</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>1678</v>
+                                    <v>1688</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>1577</v>
+                                    <v>1586</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>23</b>
-                                    <v>1678</v>
+                                    <v>1688</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>32</b>
-                                    <v>1846</v>
+                                    <v>1857</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>66</b>
-                                    <v>2047</v>
+                                    <v>2059</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>79</b>
-                                    <v>1376</v>
+                                    <v>1384</v>
                                 </b>
                                 <b>
                                     <a>83</a>
                                     <b>110</b>
-                                    <v>1846</v>
+                                    <v>1857</v>
                                 </b>
                                 <b>
                                     <a>111</a>
                                     <b>370</b>
-                                    <v>1879</v>
+                                    <v>1890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20770,26 +20833,26 @@
         </relation>
         <relation>
             <name>is_variable_template</name>
-            <cardinality>57694</cardinality>
+            <cardinality>57706</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>57694</v>
+                    <v>57706</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>596956</cardinality>
+            <cardinality>566265</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>596956</v>
+                    <v>566265</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>36089</v>
+                    <v>36097</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20803,7 +20866,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>596956</v>
+                                    <v>566265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20819,12 +20882,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14362</v>
+                                    <v>14733</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3928</v>
+                                    <v>3683</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20834,7 +20897,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>2700</v>
+                                    <v>2701</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -20844,22 +20907,22 @@
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>3191</v>
+                                    <v>3192</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>30</b>
+                                    <b>25</b>
                                     <v>2823</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
+                                    <a>25</a>
                                     <b>94</b>
                                     <v>2823</v>
                                 </b>
                                 <b>
                                     <a>103</a>
                                     <b>1155</b>
-                                    <v>982</v>
+                                    <v>859</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20869,11 +20932,11 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>1128116</cardinality>
+            <cardinality>1073718</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>575474</v>
+                    <v>548707</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20881,7 +20944,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>463276</v>
+                    <v>461778</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20895,22 +20958,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>189165</v>
+                                    <v>179996</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>288964</v>
+                                    <v>272696</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>77703</v>
+                                    <v>77720</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>19640</v>
+                                    <v>18294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20926,22 +20989,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>206841</v>
+                                    <v>196203</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>276198</v>
+                                    <v>261400</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>75616</v>
+                                    <v>75632</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>16817</v>
+                                    <v>15470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20955,43 +21018,43 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>27</a>
-                                    <b>28</b>
+                                    <a>22</a>
+                                    <b>23</b>
                                     <v>859</v>
                                 </b>
                                 <b>
-                                    <a>33</a>
-                                    <b>34</b>
+                                    <a>28</a>
+                                    <b>29</b>
                                     <v>368</v>
                                 </b>
                                 <b>
-                                    <a>40</a>
-                                    <b>41</b>
+                                    <a>35</a>
+                                    <b>36</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>72</a>
-                                    <b>73</b>
+                                    <a>67</a>
+                                    <b>68</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>160</a>
-                                    <b>161</b>
+                                    <a>149</a>
+                                    <b>150</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>793</a>
-                                    <b>794</b>
+                                    <a>782</a>
+                                    <b>783</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>3147</a>
-                                    <b>3148</b>
+                                    <a>3003</a>
+                                    <b>3004</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>4688</a>
-                                    <b>4689</b>
+                                    <a>4469</a>
+                                    <b>4470</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -21036,13 +21099,13 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>1465</a>
-                                    <b>1466</b>
+                                    <a>1448</a>
+                                    <b>1449</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>2164</a>
-                                    <b>2165</b>
+                                    <a>2157</a>
+                                    <b>2158</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -21059,22 +21122,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>359671</v>
+                                    <v>361098</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>57694</v>
+                                    <v>56233</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>16</b>
-                                    <v>35476</v>
+                                    <b>17</b>
+                                    <v>35606</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
+                                    <a>17</a>
                                     <b>227</b>
-                                    <v>10434</v>
+                                    <v>8840</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21090,12 +21153,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>429887</v>
+                                    <v>429364</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>33389</v>
+                                    <v>32414</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21105,11 +21168,11 @@
         </relation>
         <relation>
             <name>variable_template_argument_value</name>
-            <cardinality>19763</cardinality>
+            <cardinality>19767</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>14730</v>
+                    <v>14733</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21117,7 +21180,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>19763</v>
+                    <v>19767</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21131,7 +21194,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13257</v>
+                                    <v>13260</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21152,7 +21215,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10434</v>
+                                    <v>10436</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21240,7 +21303,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19763</v>
+                                    <v>19767</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21256,7 +21319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19763</v>
+                                    <v>19767</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21314,26 +21377,26 @@
         </relation>
         <relation>
             <name>is_alias_template</name>
-            <cardinality>107518</cardinality>
+            <cardinality>108147</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>107518</v>
+                    <v>108147</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>alias_instantiation</name>
-            <cardinality>460184</cardinality>
+            <cardinality>462875</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>460184</v>
+                    <v>462875</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>92312</v>
+                    <v>92852</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21347,7 +21410,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>460184</v>
+                                    <v>462875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21363,47 +21426,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16549</v>
+                                    <v>16645</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16817</v>
+                                    <v>16915</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20040</v>
+                                    <v>20157</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>12487</v>
+                                    <v>12560</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>6713</v>
+                                    <v>6752</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>4800</v>
+                                    <v>4828</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>7821</v>
+                                    <v>7867</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>143</b>
-                                    <v>6948</v>
+                                    <v>6989</v>
                                 </b>
                                 <b>
                                     <a>163</a>
                                     <b>795</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21413,19 +21476,19 @@
         </relation>
         <relation>
             <name>alias_template_argument</name>
-            <cardinality>994218</cardinality>
+            <cardinality>1000033</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>567635</v>
+                    <v>570955</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>302</v>
+                    <v>303</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>127860</v>
+                    <v>128608</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21439,22 +21502,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>276499</v>
+                                    <v>278117</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>182542</v>
+                                    <v>183610</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>87008</v>
+                                    <v>87517</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>21584</v>
+                                    <v>21710</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21470,22 +21533,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>277741</v>
+                                    <v>279366</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>181334</v>
+                                    <v>182395</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>88451</v>
+                                    <v>88969</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>20107</v>
+                                    <v>20224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21613,32 +21676,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>78247</v>
+                                    <v>78704</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20308</v>
+                                    <v>20427</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5438</v>
+                                    <v>5469</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>10473</v>
+                                    <v>10534</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>76</b>
-                                    <v>10842</v>
+                                    <v>10905</v>
                                 </b>
                                 <b>
                                     <a>84</a>
                                     <b>4474</b>
-                                    <v>2551</v>
+                                    <v>2566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21654,17 +21717,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>108928</v>
+                                    <v>109565</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17321</v>
+                                    <v>17422</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>1611</v>
+                                    <v>1620</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21674,19 +21737,19 @@
         </relation>
         <relation>
             <name>alias_template_argument_value</name>
-            <cardinality>173378</cardinality>
+            <cardinality>174393</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>160790</v>
+                    <v>161731</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>134</v>
+                    <v>135</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>173378</v>
+                    <v>174393</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21700,12 +21763,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>159548</v>
+                                    <v>160482</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1242</v>
+                                    <v>1249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21721,12 +21784,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>158877</v>
+                                    <v>159806</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>42</b>
-                                    <v>1913</v>
+                                    <v>1924</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21804,7 +21867,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173378</v>
+                                    <v>174393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21820,7 +21883,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173378</v>
+                                    <v>174393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21830,15 +21893,15 @@
         </relation>
         <relation>
             <name>alias_template_generated_from</name>
-            <cardinality>99932</cardinality>
+            <cardinality>100516</cardinality>
             <columnsizes>
                 <e>
                     <k>template</k>
-                    <v>99932</v>
+                    <v>100516</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>1913</v>
+                    <v>1924</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21852,7 +21915,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99932</v>
+                                    <v>100516</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21868,42 +21931,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>18</b>
-                                    <v>167</v>
+                                    <v>168</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>21</b>
-                                    <v>201</v>
+                                    <v>202</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>32</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>50</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>64</a>
@@ -21913,22 +21976,22 @@
                                 <b>
                                     <a>65</a>
                                     <b>66</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>74</a>
                                     <b>84</b>
-                                    <v>167</v>
+                                    <v>168</v>
                                 </b>
                                 <b>
                                     <a>111</a>
                                     <b>112</b>
-                                    <v>268</v>
+                                    <v>270</v>
                                 </b>
                                 <b>
                                     <a>150</a>
                                     <b>294</b>
-                                    <v>100</v>
+                                    <v>101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21938,15 +22001,15 @@
         </relation>
         <relation>
             <name>template_template_instantiation</name>
-            <cardinality>6014</cardinality>
+            <cardinality>6114</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>4664</v>
+                    <v>5718</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>1104</v>
+                    <v>3976</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21960,12 +22023,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3314</v>
+                                    <v>5601</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>1350</v>
+                                    <b>18</b>
+                                    <v>117</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21981,22 +22044,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>736</v>
+                                    <v>2490</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>122</v>
+                                    <v>1325</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>122</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>28</b>
-                                    <v>122</v>
+                                    <a>3</a>
+                                    <b>20</b>
+                                    <v>160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22006,19 +22064,19 @@
         </relation>
         <relation>
             <name>template_template_argument</name>
-            <cardinality>9609</cardinality>
+            <cardinality>9791</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>6073</v>
+                    <v>6189</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>104</v>
+                    <v>106</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>9021</v>
+                    <v>9192</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22032,22 +22090,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4982</v>
+                                    <v>5077</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>419</v>
+                                    <v>427</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>503</v>
+                                    <v>513</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>167</v>
+                                    <v>171</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22063,22 +22121,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5003</v>
+                                    <v>5098</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>555</v>
+                                    <v>566</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>461</v>
+                                    <v>470</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>52</v>
+                                    <v>53</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22216,12 +22274,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8990</v>
+                                    <v>9160</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>43</b>
-                                    <v>31</v>
+                                    <v>32</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22237,12 +22295,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9000</v>
+                                    <v>9171</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>11</b>
-                                    <v>20</v>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22252,7 +22310,7 @@
         </relation>
         <relation>
             <name>template_template_argument_value</name>
-            <cardinality>1104</cardinality>
+            <cardinality>1105</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
@@ -22264,7 +22322,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>1104</v>
+                    <v>1105</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22342,7 +22400,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22358,7 +22416,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1104</v>
+                                    <v>1105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22368,19 +22426,19 @@
         </relation>
         <relation>
             <name>concept_templates</name>
-            <cardinality>3592</cardinality>
+            <cardinality>3596</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>3592</v>
+                    <v>3596</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>3592</v>
+                    <v>3596</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3592</v>
+                    <v>3596</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22394,7 +22452,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3592</v>
+                                    <v>3596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22410,7 +22468,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3592</v>
+                                    <v>3596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22426,7 +22484,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3592</v>
+                                    <v>3596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22442,7 +22500,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3592</v>
+                                    <v>3596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22458,7 +22516,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3592</v>
+                                    <v>3596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22474,7 +22532,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3592</v>
+                                    <v>3596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22484,15 +22542,15 @@
         </relation>
         <relation>
             <name>concept_instantiation</name>
-            <cardinality>90068</cardinality>
+            <cardinality>90178</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>90068</v>
+                    <v>90178</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>3421</v>
+                    <v>3425</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22506,7 +22564,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>90068</v>
+                                    <v>90178</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22527,7 +22585,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>106</v>
+                                    <v>107</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22547,7 +22605,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>213</v>
+                                    <v>214</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -22557,17 +22615,17 @@
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>277</v>
+                                    <v>278</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>15</b>
-                                    <v>213</v>
+                                    <v>214</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>19</b>
-                                    <v>213</v>
+                                    <v>214</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -22592,7 +22650,7 @@
                                 <b>
                                     <a>79</a>
                                     <b>387</b>
-                                    <v>213</v>
+                                    <v>214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22602,22 +22660,22 @@
         </relation>
         <relation>
             <name>is_type_constraint</name>
-            <cardinality>36673</cardinality>
+            <cardinality>36717</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>36673</v>
+                    <v>36717</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>112649</cardinality>
+            <cardinality>112786</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>76104</v>
+                    <v>76197</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22625,7 +22683,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>21490</v>
+                    <v>21516</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22639,17 +22697,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46295</v>
+                                    <v>46352</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24612</v>
+                                    <v>24642</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>5196</v>
+                                    <v>5202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22665,17 +22723,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49888</v>
+                                    <v>49949</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22324</v>
+                                    <v>22351</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>3891</v>
+                                    <v>3896</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22773,42 +22831,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10542</v>
+                                    <v>10555</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2908</v>
+                                    <v>2911</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1069</v>
+                                    <v>1070</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1347</v>
+                                    <v>1348</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1133</v>
+                                    <v>1134</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>1625</v>
+                                    <v>1627</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>1945</v>
+                                    <v>1948</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>259</b>
-                                    <v>919</v>
+                                    <v>920</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22824,12 +22882,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18090</v>
+                                    <v>18112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3271</v>
+                                    <v>3275</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22844,19 +22902,19 @@
         </relation>
         <relation>
             <name>concept_template_argument_value</name>
-            <cardinality>104</cardinality>
+            <cardinality>105</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>82</v>
+                    <v>83</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>14</v>
+                    <v>15</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>104</v>
+                    <v>105</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22870,7 +22928,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82</v>
+                                    <v>83</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22886,7 +22944,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59</v>
+                                    <v>60</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22949,7 +23007,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>104</v>
+                                    <v>105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22965,7 +23023,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>104</v>
+                                    <v>105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22975,15 +23033,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>595664</cardinality>
+            <cardinality>599081</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>595664</v>
+                    <v>599081</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>279722</v>
+                    <v>281324</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22997,7 +23055,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>595664</v>
+                                    <v>599081</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23013,17 +23071,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230679</v>
+                                    <v>231995</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34709</v>
+                                    <v>34912</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4677</b>
-                                    <v>14333</v>
+                                    <b>4676</b>
+                                    <v>14417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23033,19 +23091,19 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>1178768</cardinality>
+            <cardinality>1178082</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>416090</v>
+                    <v>415848</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>980</v>
+                    <v>979</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>112097</v>
+                    <v>112032</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23059,32 +23117,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82956</v>
+                                    <v>82908</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>126096</v>
+                                    <v>126022</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>107903</v>
+                                    <v>107840</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>49294</v>
+                                    <v>49265</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>33171</v>
+                                    <v>33152</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>19</b>
-                                    <v>16667</v>
+                                    <v>16657</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23100,27 +23158,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88948</v>
+                                    <v>88896</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>138733</v>
+                                    <v>138652</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>114657</v>
+                                    <v>114591</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>40742</v>
+                                    <v>40719</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>32899</v>
+                                    <v>32880</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -23318,47 +23376,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33280</v>
+                                    <v>33261</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15578</v>
+                                    <v>15569</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>13290</v>
+                                    <v>13282</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>6372</v>
+                                    <v>6369</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>9477</v>
+                                    <v>9472</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9532</v>
+                                    <v>9526</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>26</b>
-                                    <v>8660</v>
+                                    <v>8655</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>926</b>
-                                    <v>6100</v>
+                                    <v>6097</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23374,22 +23432,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79416</v>
+                                    <v>79369</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17539</v>
+                                    <v>17528</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>9477</v>
+                                    <v>9472</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>5664</v>
+                                    <v>5661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23399,19 +23457,19 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>9651</cardinality>
+            <cardinality>9834</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9651</v>
+                    <v>9834</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>7920</v>
+                    <v>8070</v>
                 </e>
                 <e>
                     <k>class_id</k>
-                    <v>4836</v>
+                    <v>4927</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23425,7 +23483,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9651</v>
+                                    <v>9834</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23441,7 +23499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9651</v>
+                                    <v>9834</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23457,12 +23515,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7710</v>
+                                    <v>7856</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>84</b>
-                                    <v>209</v>
+                                    <v>213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23478,12 +23536,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7710</v>
+                                    <v>7856</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>84</b>
-                                    <v>209</v>
+                                    <v>213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23499,22 +23557,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3881</v>
+                                    <v>3954</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>514</v>
+                                    <v>523</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>398</v>
+                                    <v>406</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>65</b>
-                                    <v>41</v>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23530,22 +23588,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3881</v>
+                                    <v>3954</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>514</v>
+                                    <v>523</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>398</v>
+                                    <v>406</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>65</b>
-                                    <v>41</v>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23555,15 +23613,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>7610</cardinality>
+            <cardinality>7612</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7610</v>
+                    <v>7612</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>7610</v>
+                    <v>7612</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23577,7 +23635,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7610</v>
+                                    <v>7612</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23593,7 +23651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7610</v>
+                                    <v>7612</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23603,15 +23661,15 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>853570</cardinality>
+            <cardinality>868944</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>848462</v>
+                    <v>863749</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>94</v>
+                    <v>96</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23625,12 +23683,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>843353</v>
+                                    <v>858554</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5108</v>
+                                    <v>5194</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23659,13 +23717,13 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>530</a>
-                                    <b>531</b>
+                                    <a>533</a>
+                                    <b>534</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>821</a>
-                                    <b>822</b>
+                                    <a>820</a>
+                                    <b>821</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -23674,18 +23732,18 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>4192</a>
-                                    <b>4193</b>
+                                    <a>4195</a>
+                                    <b>4196</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>18435</a>
-                                    <b>18436</b>
+                                    <a>18331</a>
+                                    <b>18332</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>55214</a>
-                                    <b>55215</b>
+                                    <a>55237</a>
+                                    <b>55238</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -23696,11 +23754,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9569842</cardinality>
+            <cardinality>9572483</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>3954300</v>
+                    <v>3955752</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -23718,27 +23776,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1510375</v>
+                                    <v>1511309</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>500471</v>
+                                    <v>500822</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1019724</v>
+                                    <v>1019694</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>682148</v>
+                                    <v>682047</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>241581</v>
+                                    <v>241878</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23827,8 +23885,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>6170</a>
-                                    <b>6171</b>
+                                    <a>6172</a>
+                                    <b>6173</b>
                                     <v>122</v>
                                 </b>
                                 <b>
@@ -23842,8 +23900,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>22794</a>
-                                    <b>22795</b>
+                                    <a>22797</a>
+                                    <b>22798</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -23854,15 +23912,15 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>3209301</cardinality>
+            <cardinality>3148468</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2456201</v>
+                    <v>2429095</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>1104</v>
+                    <v>1105</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23876,17 +23934,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1805109</v>
+                                    <v>1807824</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>549573</v>
+                                    <v>523660</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>101518</v>
+                                    <v>97610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23905,8 +23963,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>240</a>
-                                    <b>241</b>
+                                    <a>242</a>
+                                    <b>243</b>
                                     <v>122</v>
                                 </b>
                                 <b>
@@ -23920,28 +23978,28 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>2749</a>
-                                    <b>2750</b>
+                                    <a>2566</a>
+                                    <b>2567</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>2812</a>
-                                    <b>2813</b>
+                                    <a>2749</a>
+                                    <b>2750</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>3506</a>
-                                    <b>3507</b>
+                                    <a>3255</a>
+                                    <b>3256</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>4918</a>
-                                    <b>4919</b>
+                                    <a>4944</a>
+                                    <b>4945</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>8493</a>
-                                    <b>8494</b>
+                                    <a>8461</a>
+                                    <b>8462</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -23952,15 +24010,15 @@
         </relation>
         <relation>
             <name>explicit_specifier_exprs</name>
-            <cardinality>40631</cardinality>
+            <cardinality>40640</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>40631</v>
+                    <v>40640</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>40631</v>
+                    <v>40640</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23974,7 +24032,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40631</v>
+                                    <v>40640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23990,7 +24048,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40631</v>
+                                    <v>40640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24000,11 +24058,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>643971</cardinality>
+            <cardinality>644108</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>643971</v>
+                    <v>644108</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -24012,7 +24070,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2086</v>
+                    <v>2087</v>
                 </e>
                 <e>
                     <k>name_space</k>
@@ -24020,7 +24078,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>637956</v>
+                    <v>638091</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24034,7 +24092,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>643971</v>
+                                    <v>644108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24050,7 +24108,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>643971</v>
+                                    <v>644108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24066,7 +24124,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>643971</v>
+                                    <v>644108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24082,7 +24140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>643971</v>
+                                    <v>644108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24299,7 +24357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2086</v>
+                                    <v>2087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24485,12 +24543,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>632187</v>
+                                    <v>632321</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5769</v>
+                                    <v>5770</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24506,7 +24564,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>637956</v>
+                                    <v>638091</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24522,12 +24580,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>632923</v>
+                                    <v>633057</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5032</v>
+                                    <v>5034</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24543,7 +24601,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>637956</v>
+                                    <v>638091</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24553,11 +24611,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>82169</cardinality>
+            <cardinality>82121</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>82169</v>
+                    <v>82121</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -24565,7 +24623,7 @@
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>70920</v>
+                    <v>70879</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -24573,7 +24631,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>56912</v>
+                    <v>56879</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24587,7 +24645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82169</v>
+                                    <v>82121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24603,7 +24661,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82169</v>
+                                    <v>82121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24619,7 +24677,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82169</v>
+                                    <v>82121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24635,7 +24693,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82169</v>
+                                    <v>82121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24755,12 +24813,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65477</v>
+                                    <v>65439</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>5322</v>
+                                    <v>5318</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -24781,12 +24839,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>69411</v>
+                                    <v>69370</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1509</v>
+                                    <v>1508</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24802,12 +24860,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67890</v>
+                                    <v>67851</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3029</v>
+                                    <v>3027</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24823,12 +24881,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68420</v>
+                                    <v>68380</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>2499</v>
+                                    <v>2498</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25008,17 +25066,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41309</v>
+                                    <v>41285</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>11801</v>
+                                    <v>11794</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>25</b>
-                                    <v>3801</v>
+                                    <v>3799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25034,12 +25092,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47426</v>
+                                    <v>47398</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9486</v>
+                                    <v>9480</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25055,17 +25113,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42656</v>
+                                    <v>42632</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12239</v>
+                                    <v>12232</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>2015</v>
+                                    <v>2014</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25081,7 +25139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>56664</v>
+                                    <v>56631</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25096,15 +25154,15 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>16448</cardinality>
+            <cardinality>16544</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>16448</v>
+                    <v>16544</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>503</v>
+                    <v>506</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25118,7 +25176,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16448</v>
+                                    <v>16544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25134,7 +25192,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>201</v>
+                                    <v>202</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -25189,11 +25247,11 @@
         </relation>
         <relation>
             <name>attribute_arg_type</name>
-            <cardinality>460</cardinality>
+            <cardinality>464</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>460</v>
+                    <v>464</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -25211,7 +25269,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>460</v>
+                                    <v>464</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25252,15 +25310,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>71688</cardinality>
+            <cardinality>72665</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>71688</v>
+                    <v>72665</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>71688</v>
+                    <v>72665</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25274,7 +25332,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71688</v>
+                                    <v>72665</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25290,7 +25348,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71688</v>
+                                    <v>72665</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25300,15 +25358,15 @@
         </relation>
         <relation>
             <name>attribute_arg_expr</name>
-            <cardinality>1582</cardinality>
+            <cardinality>1584</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>1582</v>
+                    <v>1584</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>1582</v>
+                    <v>1584</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25322,7 +25380,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1582</v>
+                                    <v>1584</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25338,7 +25396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1582</v>
+                                    <v>1584</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25401,15 +25459,15 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>94766</cardinality>
+            <cardinality>94786</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>93048</v>
+                    <v>93067</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>31916</v>
+                    <v>31923</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25423,7 +25481,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>91329</v>
+                                    <v>91348</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25444,7 +25502,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27497</v>
+                                    <v>27502</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25464,15 +25522,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>834364</cardinality>
+            <cardinality>834541</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>788699</v>
+                    <v>788866</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>607513</v>
+                    <v>607642</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25486,12 +25544,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>747454</v>
+                                    <v>747612</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>41245</v>
+                                    <v>41254</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25507,12 +25565,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561234</v>
+                                    <v>561353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>45</b>
-                                    <v>45787</v>
+                                    <v>45797</v>
                                 </b>
                                 <b>
                                     <a>55</a>
@@ -25590,15 +25648,15 @@
         </relation>
         <relation>
             <name>namespaceattributes</name>
-            <cardinality>5907</cardinality>
+            <cardinality>5942</cardinality>
             <columnsizes>
                 <e>
                     <k>namespace_id</k>
-                    <v>134</v>
+                    <v>135</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>5907</v>
+                    <v>5942</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25638,7 +25696,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5907</v>
+                                    <v>5942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25648,15 +25706,15 @@
         </relation>
         <relation>
             <name>stmtattributes</name>
-            <cardinality>2223</cardinality>
+            <cardinality>2226</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt_id</k>
-                    <v>2223</v>
+                    <v>2226</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>577</v>
+                    <v>578</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25670,7 +25728,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2223</v>
+                                    <v>2226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25701,7 +25759,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>106</v>
+                                    <v>107</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -25716,15 +25774,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>7371180</cardinality>
+            <cardinality>7365375</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7371180</v>
+                    <v>7365375</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>4135732</v>
+                    <v>4133170</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25738,7 +25796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7371180</v>
+                                    <v>7365375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25754,22 +25812,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2670039</v>
+                                    <v>2667167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1104793</v>
+                                    <v>1105027</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>311674</v>
+                                    <v>311740</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>895</b>
-                                    <v>49224</v>
+                                    <v>49235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25779,19 +25837,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4123947</cardinality>
+            <cardinality>4121629</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>534719</v>
+                    <v>532868</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>29215</v>
+                    <v>29221</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4119405</v>
+                    <v>4117086</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25805,57 +25863,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>127419</v>
+                                    <v>126709</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81754</v>
+                                    <v>80544</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>31916</v>
+                                    <v>31923</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>44191</v>
+                                    <v>44201</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>41613</v>
+                                    <v>41622</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>33389</v>
+                                    <v>33396</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>41613</v>
+                                    <v>41622</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>40509</v>
+                                    <v>40517</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>40631</v>
+                                    <v>40640</v>
                                 </b>
                                 <b>
                                     <a>18</a>
-                                    <b>42</b>
-                                    <v>40140</v>
+                                    <b>41</b>
+                                    <v>40026</v>
                                 </b>
                                 <b>
-                                    <a>42</a>
+                                    <a>41</a>
                                     <b>239</b>
-                                    <v>11538</v>
+                                    <v>11664</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25871,57 +25929,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>127173</v>
+                                    <v>126464</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81877</v>
+                                    <v>80666</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>31670</v>
+                                    <v>31677</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>44437</v>
+                                    <v>44446</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>41613</v>
+                                    <v>41622</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>32284</v>
+                                    <v>32291</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>41982</v>
+                                    <v>41991</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>40877</v>
+                                    <v>40886</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>40754</v>
+                                    <v>40763</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>42</b>
-                                    <v>40140</v>
+                                    <v>40149</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>265</b>
-                                    <v>11907</v>
+                                    <v>11909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25937,12 +25995,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6383</v>
+                                    <v>6384</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2577</v>
+                                    <v>2578</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25957,12 +26015,12 @@
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>26</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -25972,22 +26030,22 @@
                                 <b>
                                     <a>36</a>
                                     <b>50</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>141</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>150</a>
                                     <b>468</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>480</a>
-                                    <b>4311</b>
-                                    <v>2086</v>
+                                    <b>4295</b>
+                                    <v>2087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26003,12 +26061,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5401</v>
+                                    <v>5402</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3559</v>
+                                    <v>3560</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26023,17 +26081,17 @@
                                 <b>
                                     <a>10</a>
                                     <b>20</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>27</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>37</b>
-                                    <v>2577</v>
+                                    <v>2578</v>
                                 </b>
                                 <b>
                                     <a>37</a>
@@ -26043,16 +26101,16 @@
                                 <b>
                                     <a>58</a>
                                     <b>155</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>164</a>
                                     <b>528</b>
-                                    <v>2209</v>
+                                    <v>2210</v>
                                 </b>
                                 <b>
                                     <a>548</a>
-                                    <b>4332</b>
+                                    <b>4316</b>
                                     <v>1841</v>
                                 </b>
                             </bs>
@@ -26069,7 +26127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4119405</v>
+                                    <v>4117086</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26085,12 +26143,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4114864</v>
+                                    <v>4112543</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4541</v>
+                                    <v>4542</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26100,15 +26158,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>114616</cardinality>
+            <cardinality>116832</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>114616</v>
+                    <v>116832</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>68858</v>
+                    <v>70206</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26122,7 +26180,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>114616</v>
+                                    <v>116832</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26138,22 +26196,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37324</v>
+                                    <v>38074</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24410</v>
+                                    <v>24873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>6042</v>
+                                    <v>6156</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>45</b>
-                                    <v>1080</v>
+                                    <v>1100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26163,27 +26221,27 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>492610</cardinality>
+            <cardinality>494850</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>492610</v>
+                    <v>494850</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>471194</v>
+                    <v>473309</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>234</v>
+                    <v>236</v>
                 </e>
                 <e>
                     <k>super</k>
-                    <v>239877</v>
+                    <v>240908</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>34877</v>
+                    <v>35081</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26197,7 +26255,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492610</v>
+                                    <v>494850</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26213,7 +26271,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492610</v>
+                                    <v>494850</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26229,7 +26287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492610</v>
+                                    <v>494850</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26245,7 +26303,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492610</v>
+                                    <v>494850</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26261,12 +26319,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>454914</v>
+                                    <v>456933</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>16280</v>
+                                    <v>16375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26282,12 +26340,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>454914</v>
+                                    <v>456933</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>16280</v>
+                                    <v>16375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26303,12 +26361,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>454914</v>
+                                    <v>456933</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>16280</v>
+                                    <v>16375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26324,12 +26382,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>454914</v>
+                                    <v>456933</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>16280</v>
+                                    <v>16375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26345,7 +26403,7 @@
                                 <b>
                                     <a>25</a>
                                     <b>26</b>
-                                    <v>100</v>
+                                    <v>101</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -26363,8 +26421,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>14037</a>
-                                    <b>14038</b>
+                                    <a>14018</a>
+                                    <b>14019</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -26381,7 +26439,7 @@
                                 <b>
                                     <a>25</a>
                                     <b>26</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>52</a>
@@ -26394,8 +26452,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>14037</a>
-                                    <b>14038</b>
+                                    <a>14018</a>
+                                    <b>14019</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -26435,8 +26493,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>6742</a>
-                                    <b>6743</b>
+                                    <a>6731</a>
+                                    <b>6732</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -26453,7 +26511,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -26484,12 +26542,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230108</v>
+                                    <v>231252</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1758</b>
-                                    <v>9768</v>
+                                    <v>9656</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26505,12 +26563,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230108</v>
+                                    <v>231252</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1758</b>
-                                    <v>9768</v>
+                                    <v>9656</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26526,12 +26584,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>239440</v>
+                                    <v>240469</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>436</v>
+                                    <v>438</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26547,12 +26605,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>234506</v>
+                                    <v>235641</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>81</b>
-                                    <v>5370</v>
+                                    <v>5267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26568,27 +26626,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25847</v>
+                                    <v>25998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>5</b>
-                                    <v>3188</v>
+                                    <b>4</b>
+                                    <v>2498</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>21</b>
-                                    <v>2618</v>
+                                    <a>4</a>
+                                    <b>12</b>
+                                    <v>2633</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>186</b>
-                                    <v>2618</v>
+                                    <a>13</a>
+                                    <b>85</b>
+                                    <v>2633</v>
                                 </b>
                                 <b>
-                                    <a>205</a>
+                                    <a>87</a>
                                     <b>985</b>
-                                    <v>604</v>
+                                    <v>1316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26604,27 +26662,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25847</v>
+                                    <v>25998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>5</b>
-                                    <v>3188</v>
+                                    <b>4</b>
+                                    <v>2498</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>21</b>
-                                    <v>2618</v>
+                                    <a>4</a>
+                                    <b>12</b>
+                                    <v>2633</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>186</b>
-                                    <v>2618</v>
+                                    <a>13</a>
+                                    <b>85</b>
+                                    <v>2633</v>
                                 </b>
                                 <b>
-                                    <a>205</a>
+                                    <a>87</a>
                                     <b>985</b>
-                                    <v>604</v>
+                                    <v>1316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26640,7 +26698,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34877</v>
+                                    <v>35081</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26656,22 +26714,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28163</v>
+                                    <v>28328</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2551</v>
+                                    <v>2599</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>24</b>
-                                    <v>2651</v>
+                                    <v>2633</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>933</b>
-                                    <v>1510</v>
+                                    <v>1519</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26681,15 +26739,15 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>494356</cardinality>
+            <cardinality>496606</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>492174</v>
+                    <v>494411</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>134</v>
+                    <v>135</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26703,12 +26761,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>489992</v>
+                                    <v>492217</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2181</v>
+                                    <v>2194</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26737,8 +26795,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>13466</a>
-                                    <b>13467</b>
+                                    <a>13447</a>
+                                    <b>13448</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -26749,15 +26807,15 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>466092</cardinality>
+            <cardinality>468176</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>466092</v>
+                    <v>468176</v>
                 </e>
                 <e>
                     <k>offset</k>
-                    <v>503</v>
+                    <v>506</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26771,7 +26829,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466092</v>
+                                    <v>468176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26787,17 +26845,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100</v>
+                                    <v>101</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>100</v>
+                                    <v>101</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -26820,8 +26878,8 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>13735</a>
-                                    <b>13736</b>
+                                    <a>13716</a>
+                                    <b>13717</b>
                                     <v>33</v>
                                 </b>
                             </bs>
@@ -26832,19 +26890,19 @@
         </relation>
         <relation>
             <name>virtual_base_offsets</name>
-            <cardinality>5740</cardinality>
+            <cardinality>5773</cardinality>
             <columnsizes>
                 <e>
                     <k>sub</k>
-                    <v>5740</v>
+                    <v>5773</v>
                 </e>
                 <e>
                     <k>super</k>
-                    <v>100</v>
+                    <v>101</v>
                 </e>
                 <e>
                     <k>offset</k>
-                    <v>335</v>
+                    <v>337</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26858,7 +26916,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5740</v>
+                                    <v>5773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26874,7 +26932,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5740</v>
+                                    <v>5773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26932,7 +26990,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>302</v>
+                                    <v>303</v>
                                 </b>
                                 <b>
                                     <a>153</a>
@@ -26958,7 +27016,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>302</v>
+                                    <v>303</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26968,23 +27026,23 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>761457</cardinality>
+            <cardinality>765911</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>761457</v>
+                    <v>765911</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53910</v>
+                    <v>54225</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>99898</v>
+                    <v>100482</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6008</v>
+                    <v>6043</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26998,7 +27056,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>761457</v>
+                                    <v>765911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27014,7 +27072,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>761457</v>
+                                    <v>765911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27030,7 +27088,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>761457</v>
+                                    <v>765911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27046,42 +27104,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5538</v>
+                                    <v>5571</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24806</v>
+                                    <v>24951</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4733</v>
+                                    <v>4760</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4699</v>
+                                    <v>4727</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>27</b>
-                                    <v>4430</v>
+                                    <v>4456</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>45</b>
-                                    <v>4263</v>
+                                    <v>4288</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>81</b>
-                                    <v>4699</v>
+                                    <v>4727</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>121</b>
-                                    <v>738</v>
+                                    <v>742</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27097,42 +27155,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5538</v>
+                                    <v>5571</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24806</v>
+                                    <v>24951</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4733</v>
+                                    <v>4760</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4699</v>
+                                    <v>4727</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>27</b>
-                                    <v>4430</v>
+                                    <v>4456</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>45</b>
-                                    <v>4263</v>
+                                    <v>4288</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>81</b>
-                                    <v>4699</v>
+                                    <v>4727</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>121</b>
-                                    <v>738</v>
+                                    <v>742</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27148,12 +27206,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52567</v>
+                                    <v>52875</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>1342</v>
+                                    <v>1350</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27169,32 +27227,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>66968</v>
+                                    <v>67359</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8056</v>
+                                    <v>8103</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>9130</v>
+                                    <v>9183</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>24</b>
-                                    <v>7552</v>
+                                    <v>7596</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>136</b>
-                                    <v>7586</v>
+                                    <v>7630</v>
                                 </b>
                                 <b>
-                                    <a>136</a>
+                                    <a>137</a>
                                     <b>191</b>
-                                    <v>604</v>
+                                    <v>607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27210,32 +27268,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>66968</v>
+                                    <v>67359</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8056</v>
+                                    <v>8103</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>9130</v>
+                                    <v>9183</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>24</b>
-                                    <v>7552</v>
+                                    <v>7596</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>136</b>
-                                    <v>7586</v>
+                                    <v>7630</v>
                                 </b>
                                 <b>
-                                    <a>136</a>
+                                    <a>137</a>
                                     <b>191</b>
-                                    <v>604</v>
+                                    <v>607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27251,12 +27309,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>98690</v>
+                                    <v>99267</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1208</v>
+                                    <v>1215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27272,12 +27330,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5639</v>
+                                    <v>5672</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>22495</b>
-                                    <v>369</v>
+                                    <v>371</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27293,12 +27351,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5874</v>
+                                    <v>5908</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1509</b>
-                                    <v>134</v>
+                                    <v>135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27314,12 +27372,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5672</v>
+                                    <v>5706</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2844</b>
-                                    <v>335</v>
+                                    <v>337</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27329,19 +27387,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11056034</cardinality>
+            <cardinality>11058376</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11056034</v>
+                    <v>11058376</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4236514</v>
+                    <v>4237411</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11056034</v>
+                    <v>11058376</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27355,7 +27413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11056034</v>
+                                    <v>11058376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27371,7 +27429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11056034</v>
+                                    <v>11058376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27387,17 +27445,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3867144</v>
+                                    <v>3867964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>318425</v>
+                                    <v>318493</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>34447</b>
-                                    <v>50943</v>
+                                    <v>50954</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27413,17 +27471,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3867144</v>
+                                    <v>3867964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>318425</v>
+                                    <v>318493</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>34447</b>
-                                    <v>50943</v>
+                                    <v>50954</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27439,7 +27497,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11056034</v>
+                                    <v>11058376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27455,7 +27513,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11056034</v>
+                                    <v>11058376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27465,15 +27523,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3852168</cardinality>
+            <cardinality>3859983</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3297194</v>
+                    <v>3297892</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3689273</v>
+                    <v>3697053</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27487,12 +27545,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3236553</v>
+                                    <v>3230240</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1706</b>
-                                    <v>60640</v>
+                                    <v>67652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27508,12 +27566,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3526377</v>
+                                    <v>3534122</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>162895</v>
+                                    <v>162930</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27523,15 +27581,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9635850</cardinality>
+            <cardinality>9630246</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9635744</v>
+                    <v>9630141</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9635850</v>
+                    <v>9630246</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27545,7 +27603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9635639</v>
+                                    <v>9630035</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27566,7 +27624,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9635850</v>
+                                    <v>9630246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27576,30 +27634,30 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>9880588</cardinality>
+            <cardinality>9855321</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9880588</v>
+                    <v>9855321</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1661391</cardinality>
+            <cardinality>1663283</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1237286</v>
+                    <v>1238727</v>
                 </e>
                 <e>
                     <k>i</k>
-                    <v>384</v>
+                    <v>385</v>
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1661391</v>
+                    <v>1663283</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27613,17 +27671,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>823574</v>
+                                    <v>824576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406954</v>
+                                    <v>407385</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6757</v>
+                                    <v>6765</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27639,17 +27697,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>823574</v>
+                                    <v>824576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406954</v>
+                                    <v>407385</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6757</v>
+                                    <v>6765</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27708,13 +27766,13 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>19347</a>
-                                    <b>19348</b>
+                                    <a>19344</a>
+                                    <b>19345</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>57861</a>
-                                    <b>57862</b>
+                                    <a>57858</a>
+                                    <b>57859</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -27774,13 +27832,13 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>19347</a>
-                                    <b>19348</b>
+                                    <a>19344</a>
+                                    <b>19345</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>57861</a>
-                                    <b>57862</b>
+                                    <a>57858</a>
+                                    <b>57859</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -27797,7 +27855,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1661391</v>
+                                    <v>1663283</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27813,7 +27871,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1661391</v>
+                                    <v>1663283</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27823,15 +27881,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>8591</cardinality>
+            <cardinality>8754</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8591</v>
+                    <v>8754</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>4542</v>
+                    <v>4628</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27845,7 +27903,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8591</v>
+                                    <v>8754</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27861,17 +27919,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3713</v>
+                                    <v>3783</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>524</v>
+                                    <v>534</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>149</b>
-                                    <v>304</v>
+                                    <v>309</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27892,7 +27950,7 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2487871</cardinality>
+            <cardinality>2457335</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
@@ -27900,7 +27958,7 @@
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2487871</v>
+                    <v>2457335</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27972,8 +28030,8 @@
                                     <v>245</v>
                                 </b>
                                 <b>
-                                    <a>19521</a>
-                                    <b>19522</b>
+                                    <a>19268</a>
+                                    <b>19269</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -27990,7 +28048,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2487871</v>
+                                    <v>2457335</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28000,19 +28058,19 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19459867</cardinality>
+            <cardinality>19448545</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19459867</v>
+                    <v>19448545</v>
                 </e>
                 <e>
                     <k>child_index</k>
-                    <v>20040</v>
+                    <v>20029</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12943755</v>
+                    <v>12936225</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28026,7 +28084,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19459867</v>
+                                    <v>19448545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28042,7 +28100,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19459867</v>
+                                    <v>19448545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28058,7 +28116,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3856</v>
+                                    <v>3853</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28073,17 +28131,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>8978</v>
+                                    <v>8973</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>1660</v>
+                                    <v>1659</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>1632</v>
+                                    <v>1631</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -28109,7 +28167,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3856</v>
+                                    <v>3853</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28124,17 +28182,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>8978</v>
+                                    <v>8973</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>1660</v>
+                                    <v>1659</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>1632</v>
+                                    <v>1631</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -28160,17 +28218,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7396922</v>
+                                    <v>7392619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5084149</v>
+                                    <v>5081191</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>462684</v>
+                                    <v>462414</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28186,17 +28244,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7396922</v>
+                                    <v>7392619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5084149</v>
+                                    <v>5081191</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>462684</v>
+                                    <v>462414</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28206,22 +28264,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6902994</cardinality>
+            <cardinality>6890582</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6902994</v>
+                    <v>6890582</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6052094</cardinality>
+            <cardinality>6047238</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6052094</v>
+                    <v>6047238</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -28239,7 +28297,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6052094</v>
+                                    <v>6047238</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28268,8 +28326,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>40990</a>
-                                    <b>40991</b>
+                                    <a>40996</a>
+                                    <b>40997</b>
                                     <v>1</v>
                                 </b>
                                 <b>
@@ -28278,13 +28336,13 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>92949</a>
-                                    <b>92950</b>
+                                    <a>92848</a>
+                                    <b>92849</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5833488</a>
-                                    <b>5833489</b>
+                                    <a>5828727</a>
+                                    <b>5828728</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -28295,11 +28353,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>5772743</cardinality>
+            <cardinality>5777774</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>5772743</v>
+                    <v>5777774</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -28317,7 +28375,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5772743</v>
+                                    <v>5777774</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28341,8 +28399,8 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>268245</a>
-                                    <b>268246</b>
+                                    <a>268152</a>
+                                    <b>268153</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -28353,11 +28411,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>729040</cardinality>
+            <cardinality>684871</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>729040</v>
+                    <v>684871</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -28375,7 +28433,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>729040</v>
+                                    <v>684871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28399,8 +28457,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>27</a>
-                                    <b>28</b>
+                                    <a>22</a>
+                                    <b>23</b>
                                     <v>122</v>
                                 </b>
                                 <b>
@@ -28409,8 +28467,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>68</a>
-                                    <b>69</b>
+                                    <a>62</a>
+                                    <b>63</b>
                                     <v>122</v>
                                 </b>
                                 <b>
@@ -28419,13 +28477,13 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>2001</a>
-                                    <b>2002</b>
+                                    <a>1843</a>
+                                    <b>1844</b>
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>3393</a>
-                                    <b>3394</b>
+                                    <a>3201</a>
+                                    <b>3202</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -28484,23 +28542,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3050545</cardinality>
+            <cardinality>3044942</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3050545</v>
+                    <v>3044942</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3050545</v>
+                    <v>3044942</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>54656</v>
+                    <v>54380</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>558950</v>
+                    <v>557018</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28514,7 +28572,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3050545</v>
+                                    <v>3044942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28530,7 +28588,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3050545</v>
+                                    <v>3044942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28546,7 +28604,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3050545</v>
+                                    <v>3044942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28562,7 +28620,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3050545</v>
+                                    <v>3044942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28578,7 +28636,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3050545</v>
+                                    <v>3044942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28594,7 +28652,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3050545</v>
+                                    <v>3044942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28610,27 +28668,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37913</v>
+                                    <v>37916</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8382</v>
+                                    <v>8435</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4127</v>
+                                    <v>4132</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>476</b>
-                                    <v>4105</v>
-                                </b>
-                                <b>
-                                    <a>1600</a>
                                     <b>41956</b>
-                                    <v>128</v>
+                                    <v>3896</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28646,27 +28699,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37913</v>
+                                    <v>37916</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8382</v>
+                                    <v>8435</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4127</v>
+                                    <v>4132</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>476</b>
-                                    <v>4105</v>
-                                </b>
-                                <b>
-                                    <a>1600</a>
                                     <b>41956</b>
-                                    <v>128</v>
+                                    <v>3896</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28682,22 +28730,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41441</v>
+                                    <v>41235</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7420</v>
+                                    <v>7407</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>4148</v>
+                                    <v>4132</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>20059</b>
-                                    <v>1646</v>
+                                    <v>1605</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28713,22 +28761,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83311</v>
+                                    <v>84418</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>42339</v>
+                                    <v>39008</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>396669</v>
+                                    <v>397215</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36630</v>
+                                    <v>36375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28744,22 +28792,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83311</v>
+                                    <v>84418</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>42339</v>
+                                    <v>39008</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>396669</v>
+                                    <v>397215</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36630</v>
+                                    <v>36375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28775,22 +28823,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>119492</v>
+                                    <v>117047</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>14070</v>
+                                    <v>14066</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>412920</v>
+                                    <v>413487</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>60</b>
-                                    <v>12466</v>
+                                    <v>12417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28800,15 +28848,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8257017</cardinality>
+            <cardinality>8252213</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8257017</v>
+                    <v>8252213</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>1050679</v>
+                    <v>1050068</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28822,7 +28870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8257017</v>
+                                    <v>8252213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28838,52 +28886,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171585</v>
+                                    <v>171485</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>188755</v>
+                                    <v>188645</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>145690</v>
+                                    <v>145605</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>116670</v>
+                                    <v>116602</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>83175</v>
+                                    <v>83126</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>65836</v>
+                                    <v>65798</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>80838</v>
+                                    <v>80791</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>81598</v>
+                                    <v>81551</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>27</b>
-                                    <v>79150</v>
+                                    <v>79103</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>5137</b>
-                                    <v>37379</v>
+                                    <v>37357</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28893,15 +28941,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>5787669</cardinality>
+            <cardinality>5788371</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>5785316</v>
+                    <v>5785909</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>274909</v>
+                    <v>275051</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28915,12 +28963,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5782964</v>
+                                    <v>5783447</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2352</v>
+                                    <v>2462</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28936,27 +28984,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>180650</v>
+                                    <v>180848</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>38212</v>
+                                    <v>38237</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>16764</v>
+                                    <v>17127</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>23286</v>
+                                    <v>23229</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>37798</b>
-                                    <v>15995</v>
+                                    <v>15607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28966,19 +29014,19 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>44756</cardinality>
+            <cardinality>44839</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>44756</v>
+                    <v>44839</v>
                 </e>
                 <e>
                     <k>func</k>
-                    <v>64</v>
+                    <v>101</v>
                 </e>
                 <e>
                     <k>form</k>
-                    <v>21</v>
+                    <v>33</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28992,7 +29040,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44756</v>
+                                    <v>44839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29008,7 +29056,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44756</v>
+                                    <v>44839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29022,19 +29070,19 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>21</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>369</a>
-                                    <b>370</b>
-                                    <v>21</v>
+                                    <a>591</a>
+                                    <b>592</b>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>1722</a>
-                                    <b>1723</b>
-                                    <v>21</v>
+                                    <a>736</a>
+                                    <b>737</b>
+                                    <v>33</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29050,7 +29098,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64</v>
+                                    <v>101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29064,9 +29112,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2093</a>
-                                    <b>2094</b>
-                                    <v>21</v>
+                                    <a>1328</a>
+                                    <b>1329</b>
+                                    <v>33</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29082,7 +29130,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>21</v>
+                                    <v>33</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29092,15 +29140,15 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>53037</cardinality>
+            <cardinality>53347</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>53037</v>
+                    <v>53347</v>
                 </e>
                 <e>
                     <k>func</k>
-                    <v>100</v>
+                    <v>101</v>
                 </e>
                 <e>
                     <k>form</k>
@@ -29118,7 +29166,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53037</v>
+                                    <v>53347</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29134,7 +29182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53037</v>
+                                    <v>53347</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29176,7 +29224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100</v>
+                                    <v>101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29239,15 +29287,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>898137</cardinality>
+            <cardinality>897615</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>898137</v>
+                    <v>897615</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>898137</v>
+                    <v>897615</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29261,7 +29309,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898137</v>
+                                    <v>897615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29277,7 +29325,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898137</v>
+                                    <v>897615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29287,15 +29335,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>898134</cardinality>
+            <cardinality>897611</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>898134</v>
+                    <v>897611</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>898134</v>
+                    <v>897611</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29309,7 +29357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898134</v>
+                                    <v>897611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29325,7 +29373,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898134</v>
+                                    <v>897611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29335,15 +29383,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>898137</cardinality>
+            <cardinality>897615</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>898137</v>
+                    <v>897615</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>898137</v>
+                    <v>897615</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29357,7 +29405,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898137</v>
+                                    <v>897615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29373,7 +29421,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>898137</v>
+                                    <v>897615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29383,15 +29431,15 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13547098</cardinality>
+            <cardinality>13539217</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13547098</v>
+                    <v>13539217</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>114026</v>
+                    <v>113960</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29405,7 +29453,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13547098</v>
+                                    <v>13539217</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29421,27 +29469,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77935</v>
+                                    <v>77890</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15228</v>
+                                    <v>15220</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>8841</v>
+                                    <v>8836</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>52</b>
-                                    <v>8587</v>
+                                    <v>8582</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>681857</b>
-                                    <v>3432</v>
+                                    <v>3430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29451,15 +29499,15 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6647904</cardinality>
+            <cardinality>6631932</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6647904</v>
+                    <v>6631932</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>1095330</v>
+                    <v>1095191</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29473,7 +29521,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6647904</v>
+                                    <v>6631932</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29489,22 +29537,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>833965</v>
+                                    <v>833960</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>146908</v>
+                                    <v>146907</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>86571</v>
+                                    <v>86513</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>593706</b>
-                                    <v>27886</v>
+                                    <b>594510</b>
+                                    <v>27811</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29514,15 +29562,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>13655359</cardinality>
+            <cardinality>13647415</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13547098</v>
+                    <v>13539217</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>13655359</v>
+                    <v>13647415</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29536,12 +29584,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13456848</v>
+                                    <v>13449020</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>90250</v>
+                                    <v>90197</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29557,7 +29605,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13655359</v>
+                                    <v>13647415</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29567,15 +29615,15 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1503078</cardinality>
+            <cardinality>1502203</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1503078</v>
+                    <v>1502203</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
-                    <v>31374</v>
+                    <v>31356</v>
                 </e>
                 <e>
                     <k>bitoffset</k>
@@ -29593,7 +29641,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1503078</v>
+                                    <v>1502203</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29609,7 +29657,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1503078</v>
+                                    <v>1502203</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29625,32 +29673,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17702</v>
+                                    <v>17692</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2451</v>
+                                    <v>2449</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2668</v>
+                                    <v>2667</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>2614</v>
+                                    <v>2613</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>35</b>
-                                    <v>2396</v>
+                                    <v>2395</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>200</b>
-                                    <v>2396</v>
+                                    <v>2395</v>
                                 </b>
                                 <b>
                                     <a>210</a>
@@ -29671,7 +29719,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30339</v>
+                                    <v>30321</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29773,11 +29821,11 @@
         </relation>
         <relation>
             <name>bitfield</name>
-            <cardinality>29829</cardinality>
+            <cardinality>29835</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29829</v>
+                    <v>29835</v>
                 </e>
                 <e>
                     <k>bits</k>
@@ -29799,7 +29847,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29829</v>
+                                    <v>29835</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29815,7 +29863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29829</v>
+                                    <v>29835</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29959,23 +30007,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2289023</cardinality>
+            <cardinality>2292672</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2289023</v>
+                    <v>2292672</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>998370</v>
+                    <v>998332</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2289023</v>
+                    <v>2292672</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>525173</v>
+                    <v>526641</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29989,7 +30037,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2289023</v>
+                                    <v>2292672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30005,7 +30053,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2289023</v>
+                                    <v>2292672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30021,7 +30069,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2289023</v>
+                                    <v>2292672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30037,17 +30085,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>874745</v>
+                                    <v>874353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>51071</v>
+                                    <v>51217</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72553</v>
+                                    <v>72760</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30063,17 +30111,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>874745</v>
+                                    <v>874353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>51071</v>
+                                    <v>51217</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72553</v>
+                                    <v>72760</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30089,7 +30137,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>998362</v>
+                                    <v>998324</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30110,7 +30158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2289023</v>
+                                    <v>2292672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30126,7 +30174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2289023</v>
+                                    <v>2292672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30142,7 +30190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2289023</v>
+                                    <v>2292672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30158,22 +30206,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414711</v>
+                                    <v>415896</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33393</v>
+                                    <v>33497</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>41518</v>
+                                    <v>41612</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>113696</b>
-                                    <v>35549</v>
+                                    <v>35635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30189,17 +30237,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>453031</v>
+                                    <v>454326</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34225</v>
+                                    <v>34331</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>12835</b>
-                                    <v>37916</v>
+                                    <v>37984</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30215,22 +30263,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414711</v>
+                                    <v>415896</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33393</v>
+                                    <v>33497</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>41518</v>
+                                    <v>41612</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>113696</b>
-                                    <v>35549</v>
+                                    <v>35635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30240,26 +30288,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>67191</cardinality>
+            <cardinality>67930</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>67191</v>
+                    <v>67930</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1667335</cardinality>
+            <cardinality>1669235</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1667335</v>
+                    <v>1669235</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>834480</v>
+                    <v>835495</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30273,7 +30321,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1667335</v>
+                                    <v>1669235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30289,17 +30337,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16978</v>
+                                    <v>16999</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>807494</v>
+                                    <v>808519</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>10007</v>
+                                    <v>9976</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30309,19 +30357,19 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25217889</cardinality>
+            <cardinality>25203218</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25217889</v>
+                    <v>25203218</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1451</v>
+                    <v>1450</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>10588753</v>
+                    <v>10582593</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30335,7 +30383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25217889</v>
+                                    <v>25203218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30351,7 +30399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25217889</v>
+                                    <v>25203218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30529,22 +30577,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8906278</v>
+                                    <v>8901097</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>820855</v>
+                                    <v>820377</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>16</b>
-                                    <v>797438</v>
+                                    <v>796974</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>71733</b>
-                                    <v>64181</v>
+                                    <v>64143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30560,17 +30608,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9045722</v>
+                                    <v>9040460</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>774505</v>
+                                    <v>774055</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>32</b>
-                                    <v>768525</v>
+                                    <v>768078</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30580,15 +30628,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>841815</cardinality>
+            <cardinality>842839</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>841815</v>
+                    <v>842839</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>841815</v>
+                    <v>842839</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -30606,7 +30654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>841815</v>
+                                    <v>842839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30622,7 +30670,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>841815</v>
+                                    <v>842839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30638,7 +30686,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>841815</v>
+                                    <v>842839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30654,7 +30702,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>841815</v>
+                                    <v>842839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30706,15 +30754,15 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25217889</cardinality>
+            <cardinality>25203218</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25217889</v>
+                    <v>25203218</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>214267</v>
+                    <v>214142</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -30732,7 +30780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25217889</v>
+                                    <v>25203218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30748,7 +30796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25217889</v>
+                                    <v>25203218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30764,52 +30812,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52527</v>
+                                    <v>52497</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>35201</v>
+                                    <v>35181</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>14511</v>
+                                    <v>14503</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14533</v>
+                                    <v>14525</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>17567</v>
+                                    <v>17557</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>17392</v>
+                                    <v>17381</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>24</b>
-                                    <v>16446</v>
+                                    <v>16437</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>49</b>
-                                    <v>16072</v>
+                                    <v>16063</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>134</b>
-                                    <v>16182</v>
+                                    <v>16173</v>
                                 </b>
                                 <b>
                                     <a>134</a>
                                     <b>441492</b>
-                                    <v>13830</v>
+                                    <v>13822</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30825,12 +30873,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>185969</v>
+                                    <v>185861</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>28297</v>
+                                    <v>28281</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30893,15 +30941,15 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>45518</cardinality>
+            <cardinality>45784</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>45518</v>
+                    <v>45784</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>26988</v>
+                    <v>27146</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30915,7 +30963,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45518</v>
+                                    <v>45784</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30931,17 +30979,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11345</v>
+                                    <v>11412</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14266</v>
+                                    <v>14349</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>1376</v>
+                                    <v>1384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30951,15 +30999,15 @@
         </relation>
         <relation>
             <name>new_array_allocated_type</name>
-            <cardinality>6597</cardinality>
+            <cardinality>6616</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6597</v>
+                    <v>6616</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2834</v>
+                    <v>2842</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30973,7 +31021,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6597</v>
+                                    <v>6616</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30994,7 +31042,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2503</v>
+                                    <v>2510</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31014,30 +31062,30 @@
         </relation>
         <relation>
             <name>param_ref_to_this</name>
-            <cardinality>25020</cardinality>
+            <cardinality>25272</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>25020</v>
+                    <v>25272</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>aggregate_field_init</name>
-            <cardinality>5717385</cardinality>
+            <cardinality>5720718</cardinality>
             <columnsizes>
                 <e>
                     <k>aggregate</k>
-                    <v>1243071</v>
+                    <v>1245402</v>
                 </e>
                 <e>
                     <k>initializer</k>
-                    <v>5717207</v>
+                    <v>5720540</v>
                 </e>
                 <e>
                     <k>field</k>
-                    <v>3229</v>
+                    <v>3236</v>
                 </e>
                 <e>
                     <k>position</k>
@@ -31059,12 +31107,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19692</v>
+                                    <v>21021</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>669033</v>
+                                    <v>670035</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31110,12 +31158,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19688</v>
+                                    <v>21017</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>668965</v>
+                                    <v>669967</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31161,12 +31209,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19692</v>
+                                    <v>21021</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>669033</v>
+                                    <v>670035</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31212,7 +31260,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1242989</v>
+                                    <v>1245320</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31233,7 +31281,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5717207</v>
+                                    <v>5720540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31249,7 +31297,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5717029</v>
+                                    <v>5720362</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31270,7 +31318,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5717207</v>
+                                    <v>5720540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31286,7 +31334,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5717207</v>
+                                    <v>5720540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31307,12 +31355,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>272</v>
+                                    <v>273</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>274</v>
+                                    <v>275</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -31331,18 +31379,18 @@
                                 </b>
                                 <b>
                                     <a>74</a>
-                                    <b>339</b>
-                                    <v>243</v>
+                                    <b>316</b>
+                                    <v>244</v>
                                 </b>
                                 <b>
-                                    <a>353</a>
-                                    <b>252555</b>
-                                    <v>252</v>
+                                    <a>338</a>
+                                    <b>252258</b>
+                                    <v>244</v>
                                 </b>
                                 <b>
-                                    <a>392631</a>
+                                    <a>252554</a>
                                     <b>392632</b>
-                                    <v>2</v>
+                                    <v>14</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31363,12 +31411,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>272</v>
+                                    <v>273</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>274</v>
+                                    <v>275</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -31387,18 +31435,18 @@
                                 </b>
                                 <b>
                                     <a>74</a>
-                                    <b>339</b>
-                                    <v>243</v>
+                                    <b>316</b>
+                                    <v>244</v>
                                 </b>
                                 <b>
-                                    <a>353</a>
-                                    <b>252555</b>
-                                    <v>252</v>
+                                    <a>338</a>
+                                    <b>252258</b>
+                                    <v>244</v>
                                 </b>
                                 <b>
-                                    <a>392631</a>
+                                    <a>252554</a>
                                     <b>392632</b>
-                                    <v>2</v>
+                                    <v>14</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31414,7 +31462,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3215</v>
+                                    <v>3222</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31435,7 +31483,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3203</v>
+                                    <v>3210</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31505,12 +31553,12 @@
                                 </b>
                                 <b>
                                     <a>554346</a>
-                                    <b>1223380</b>
+                                    <b>1224382</b>
                                     <v>2</v>
                                 </b>
                                 <b>
-                                    <a>1243071</a>
-                                    <b>1243072</b>
+                                    <a>1245402</a>
+                                    <b>1245403</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31576,12 +31624,12 @@
                                 </b>
                                 <b>
                                     <a>554346</a>
-                                    <b>1223380</b>
+                                    <b>1224382</b>
                                     <v>2</v>
                                 </b>
                                 <b>
-                                    <a>1243071</a>
-                                    <b>1243072</b>
+                                    <a>1245402</a>
+                                    <b>1245403</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31647,12 +31695,12 @@
                                 </b>
                                 <b>
                                     <a>318</a>
-                                    <b>885</b>
+                                    <b>886</b>
                                     <v>2</v>
                                 </b>
                                 <b>
-                                    <a>1285</a>
-                                    <b>1286</b>
+                                    <a>1291</a>
+                                    <b>1292</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31688,13 +31736,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>480</a>
-                                    <b>481</b>
+                                    <a>1482</a>
+                                    <b>1483</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>1242673</a>
-                                    <b>1242674</b>
+                                    <a>1244002</a>
+                                    <b>1244003</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31709,13 +31757,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>710</a>
-                                    <b>711</b>
+                                    <a>1712</a>
+                                    <b>1713</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5716497</a>
-                                    <b>5716498</b>
+                                    <a>5718828</a>
+                                    <b>5718829</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31730,13 +31778,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>218</a>
-                                    <b>219</b>
+                                    <a>219</a>
+                                    <b>220</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>3037</a>
-                                    <b>3038</b>
+                                    <a>3043</a>
+                                    <b>3044</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31768,15 +31816,15 @@
         </relation>
         <relation>
             <name>aggregate_array_init</name>
-            <cardinality>1349502</cardinality>
+            <cardinality>1353666</cardinality>
             <columnsizes>
                 <e>
                     <k>aggregate</k>
-                    <v>152357</v>
+                    <v>153359</v>
                 </e>
                 <e>
                     <k>initializer</k>
-                    <v>1349502</v>
+                    <v>1353666</v>
                 </e>
                 <e>
                     <k>element_index</k>
@@ -31802,27 +31850,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14696</v>
+                                    <v>14702</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13903</v>
+                                    <v>13963</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>61677</v>
+                                    <v>61827</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>17014</v>
+                                    <v>17356</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>19009</v>
+                                    <v>19453</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -31831,13 +31879,13 @@
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>58</b>
-                                    <v>11429</v>
+                                    <b>61</b>
+                                    <v>11514</v>
                                 </b>
                                 <b>
-                                    <a>58</a>
+                                    <a>61</a>
                                     <b>62923</b>
-                                    <v>1763</v>
+                                    <v>1678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31853,27 +31901,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14696</v>
+                                    <v>14702</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13903</v>
+                                    <v>13963</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>61677</v>
+                                    <v>61827</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>17014</v>
+                                    <v>17356</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>19009</v>
+                                    <v>19453</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -31882,13 +31930,13 @@
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>58</b>
-                                    <v>11429</v>
+                                    <b>61</b>
+                                    <v>11514</v>
                                 </b>
                                 <b>
-                                    <a>58</a>
+                                    <a>61</a>
                                     <b>62923</b>
-                                    <v>1763</v>
+                                    <v>1678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31904,27 +31952,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14696</v>
+                                    <v>14702</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13903</v>
+                                    <v>13963</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>61677</v>
+                                    <v>61827</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>17014</v>
+                                    <v>17356</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>19009</v>
+                                    <v>19453</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -31933,13 +31981,13 @@
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>58</b>
-                                    <v>11429</v>
+                                    <b>61</b>
+                                    <v>11514</v>
                                 </b>
                                 <b>
-                                    <a>58</a>
+                                    <a>61</a>
                                     <b>62923</b>
-                                    <v>1763</v>
+                                    <v>1678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31955,7 +32003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>152357</v>
+                                    <v>153359</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31971,7 +32019,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349502</v>
+                                    <v>1353666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31987,7 +32035,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349502</v>
+                                    <v>1353666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32003,7 +32051,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349502</v>
+                                    <v>1353666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32019,7 +32067,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349502</v>
+                                    <v>1353666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32059,7 +32107,7 @@
                                 </b>
                                 <b>
                                     <a>37</a>
-                                    <b>152357</b>
+                                    <b>153359</b>
                                     <v>2151</v>
                                 </b>
                             </bs>
@@ -32100,7 +32148,7 @@
                                 </b>
                                 <b>
                                     <a>37</a>
-                                    <b>152357</b>
+                                    <b>153359</b>
                                     <v>2151</v>
                                 </b>
                             </bs>
@@ -32183,7 +32231,7 @@
                                 </b>
                                 <b>
                                     <a>37</a>
-                                    <b>152358</b>
+                                    <b>153360</b>
                                     <v>2151</v>
                                 </b>
                             </bs>
@@ -32224,7 +32272,7 @@
                                 </b>
                                 <b>
                                     <a>37</a>
-                                    <b>152358</b>
+                                    <b>153360</b>
                                     <v>2151</v>
                                 </b>
                             </bs>
@@ -32286,8 +32334,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>152354</a>
-                                    <b>152355</b>
+                                    <a>153356</a>
+                                    <b>153357</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -32307,8 +32355,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>1349486</a>
-                                    <b>1349487</b>
+                                    <a>1353650</a>
+                                    <b>1353651</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -32361,15 +32409,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>406398</cardinality>
+            <cardinality>406893</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>406398</v>
+                    <v>406893</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>406398</v>
+                    <v>406893</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32383,7 +32431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406398</v>
+                                    <v>406893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32399,7 +32447,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406398</v>
+                                    <v>406893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32409,15 +32457,15 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>47196</cardinality>
+            <cardinality>47472</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>47196</v>
+                    <v>47472</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>15709</v>
+                    <v>15801</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32431,7 +32479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47196</v>
+                                    <v>47472</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32447,17 +32495,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2920</v>
+                                    <v>2937</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12386</v>
+                                    <v>12459</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>328</b>
-                                    <v>402</v>
+                                    <v>405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32467,15 +32515,15 @@
         </relation>
         <relation>
             <name>uuidof_bind</name>
-            <cardinality>26214</cardinality>
+            <cardinality>26289</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>26214</v>
+                    <v>26289</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>26214</v>
+                    <v>26289</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32489,7 +32537,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26214</v>
+                                    <v>26289</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32505,7 +32553,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26214</v>
+                                    <v>26289</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32515,15 +32563,15 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>242078</cardinality>
+            <cardinality>241937</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>242078</v>
+                    <v>241937</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>11156</v>
+                    <v>11150</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32537,7 +32585,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>242078</v>
+                                    <v>241937</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32553,17 +32601,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3859</v>
+                                    <v>3856</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2753</v>
+                                    <v>2751</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1019</v>
+                                    <v>1018</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -32578,17 +32626,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1117</v>
+                                    <v>1116</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>42</b>
-                                    <v>852</v>
+                                    <v>851</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>6061</b>
-                                    <v>167</v>
+                                    <v>166</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32646,11 +32694,11 @@
         </relation>
         <relation>
             <name>lambdas</name>
-            <cardinality>18970</cardinality>
+            <cardinality>19024</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>18970</v>
+                    <v>19024</v>
                 </e>
                 <e>
                     <k>default_capture</k>
@@ -32676,7 +32724,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18970</v>
+                                    <v>19024</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32692,7 +32740,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18970</v>
+                                    <v>19024</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32708,7 +32756,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18970</v>
+                                    <v>19024</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32892,15 +32940,15 @@
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>31810</cardinality>
+            <cardinality>31901</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>31810</v>
+                    <v>31901</v>
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>15424</v>
+                    <v>15468</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -32908,7 +32956,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>31810</v>
+                    <v>31901</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
@@ -32920,7 +32968,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>17888</v>
+                    <v>17939</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32934,7 +32982,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32950,7 +32998,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32966,7 +33014,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32982,7 +33030,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32998,7 +33046,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33014,7 +33062,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33030,27 +33078,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8156</v>
+                                    <v>8179</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3545</v>
+                                    <v>3555</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1663</v>
+                                    <v>1668</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1251</v>
+                                    <v>1255</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>18</b>
-                                    <v>807</v>
+                                    <v>809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33066,27 +33114,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8156</v>
+                                    <v>8179</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3545</v>
+                                    <v>3555</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1663</v>
+                                    <v>1668</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1251</v>
+                                    <v>1255</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>18</b>
-                                    <v>807</v>
+                                    <v>809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33102,27 +33150,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8156</v>
+                                    <v>8179</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3545</v>
+                                    <v>3555</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1663</v>
+                                    <v>1668</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1251</v>
+                                    <v>1255</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>18</b>
-                                    <v>807</v>
+                                    <v>809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33138,12 +33186,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14189</v>
+                                    <v>14229</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1235</v>
+                                    <v>1239</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33159,7 +33207,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15303</v>
+                                    <v>15347</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33180,27 +33228,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8746</v>
+                                    <v>8771</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3698</v>
+                                    <v>3709</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1397</v>
+                                    <v>1401</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1284</v>
+                                    <v>1287</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>18</b>
-                                    <v>298</v>
+                                    <v>299</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33509,7 +33557,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>104</v>
+                                    <v>105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33525,7 +33573,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88</v>
+                                    <v>89</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33642,7 +33690,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33658,7 +33706,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33674,7 +33722,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33690,7 +33738,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33706,7 +33754,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33722,7 +33770,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31810</v>
+                                    <v>31901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33980,17 +34028,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15667</v>
+                                    <v>15711</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1413</v>
+                                    <v>1417</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>68</b>
-                                    <v>807</v>
+                                    <v>809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34006,17 +34054,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16240</v>
+                                    <v>16286</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>1445</v>
+                                    <v>1449</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>68</b>
-                                    <v>201</v>
+                                    <v>202</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34032,12 +34080,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17201</v>
+                                    <v>17250</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>686</v>
+                                    <v>688</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34053,17 +34101,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15667</v>
+                                    <v>15711</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1413</v>
+                                    <v>1417</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>68</b>
-                                    <v>807</v>
+                                    <v>809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34079,7 +34127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17863</v>
+                                    <v>17914</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34100,7 +34148,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17888</v>
+                                    <v>17939</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34110,11 +34158,11 @@
         </relation>
         <relation>
             <name>fold</name>
-            <cardinality>1261</cardinality>
+            <cardinality>1263</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>1261</v>
+                    <v>1263</v>
                 </e>
                 <e>
                     <k>operator</k>
@@ -34136,7 +34184,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1261</v>
+                                    <v>1263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34152,7 +34200,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1261</v>
+                                    <v>1263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34236,11 +34284,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6310367</cardinality>
+            <cardinality>6328585</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6310367</v>
+                    <v>6328585</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -34248,7 +34296,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2668742</v>
+                    <v>2676368</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34262,7 +34310,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6310367</v>
+                                    <v>6328585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34278,7 +34326,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6310367</v>
+                                    <v>6328585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34367,28 +34415,28 @@
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>74923</a>
-                                    <b>74924</b>
+                                    <a>74926</a>
+                                    <b>74927</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>95366</a>
-                                    <b>95367</b>
+                                    <a>95367</a>
+                                    <b>95368</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>117878</a>
-                                    <b>117879</b>
+                                    <a>117880</a>
+                                    <b>117881</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>198406</a>
-                                    <b>198407</b>
+                                    <a>198412</a>
+                                    <b>198413</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>213672</a>
-                                    <b>213673</b>
+                                    <a>213683</a>
+                                    <b>213684</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -34516,22 +34564,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2218981</v>
+                                    <v>2225135</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>177039</v>
+                                    <v>177731</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>202889</v>
+                                    <v>203469</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>1816</b>
-                                    <v>69832</v>
+                                    <v>70031</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34547,12 +34595,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2592497</v>
+                                    <v>2599906</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>76244</v>
+                                    <v>76462</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34717,15 +34765,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>990500</cardinality>
+            <cardinality>989924</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>990500</v>
+                    <v>989924</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>990500</v>
+                    <v>989924</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34739,7 +34787,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990500</v>
+                                    <v>989924</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34755,7 +34803,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990500</v>
+                                    <v>989924</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34765,15 +34813,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>434390</cardinality>
+            <cardinality>434918</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>434390</v>
+                    <v>434918</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>434390</v>
+                    <v>434918</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34787,7 +34835,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>434390</v>
+                                    <v>434918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34803,7 +34851,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>434390</v>
+                                    <v>434918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34861,15 +34909,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>103236</cardinality>
+            <cardinality>103258</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>103236</v>
+                    <v>103258</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>103236</v>
+                    <v>103258</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34883,7 +34931,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>103236</v>
+                                    <v>103258</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34899,7 +34947,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>103236</v>
+                                    <v>103258</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34909,15 +34957,15 @@
         </relation>
         <relation>
             <name>constexpr_if_else</name>
-            <cardinality>74021</cardinality>
+            <cardinality>74036</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>74021</v>
+                    <v>74036</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>74021</v>
+                    <v>74036</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34931,7 +34979,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>74021</v>
+                                    <v>74036</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34947,7 +34995,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>74021</v>
+                                    <v>74036</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35053,15 +35101,15 @@
         </relation>
         <relation>
             <name>while_body</name>
-            <cardinality>39659</cardinality>
+            <cardinality>39636</cardinality>
             <columnsizes>
                 <e>
                     <k>while_stmt</k>
-                    <v>39659</v>
+                    <v>39636</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>39659</v>
+                    <v>39636</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35075,7 +35123,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39659</v>
+                                    <v>39636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35091,7 +35139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39659</v>
+                                    <v>39636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35101,15 +35149,15 @@
         </relation>
         <relation>
             <name>do_body</name>
-            <cardinality>232528</cardinality>
+            <cardinality>232393</cardinality>
             <columnsizes>
                 <e>
                     <k>do_stmt</k>
-                    <v>232528</v>
+                    <v>232393</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>232528</v>
+                    <v>232393</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35123,7 +35171,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232528</v>
+                                    <v>232393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35139,7 +35187,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232528</v>
+                                    <v>232393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35197,19 +35245,19 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>830952</cardinality>
+            <cardinality>831962</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>409306</v>
+                    <v>409804</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>384</v>
+                    <v>385</v>
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>830952</v>
+                    <v>831962</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35228,12 +35276,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406441</v>
+                                    <v>406935</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>2844</v>
+                                    <v>2847</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35254,12 +35302,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406441</v>
+                                    <v>406935</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>2844</v>
+                                    <v>2847</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35417,7 +35465,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>830952</v>
+                                    <v>831962</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35433,7 +35481,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>830952</v>
+                                    <v>831962</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35443,15 +35491,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>409306</cardinality>
+            <cardinality>409804</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>409306</v>
+                    <v>409804</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>409306</v>
+                    <v>409804</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35465,7 +35513,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409306</v>
+                                    <v>409804</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35481,7 +35529,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409306</v>
+                                    <v>409804</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35491,15 +35539,15 @@
         </relation>
         <relation>
             <name>for_initialization</name>
-            <cardinality>73267</cardinality>
+            <cardinality>73224</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>73267</v>
+                    <v>73224</v>
                 </e>
                 <e>
                     <k>init_id</k>
-                    <v>73267</v>
+                    <v>73224</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35513,7 +35561,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73267</v>
+                                    <v>73224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35529,7 +35577,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73267</v>
+                                    <v>73224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35539,15 +35587,15 @@
         </relation>
         <relation>
             <name>for_condition</name>
-            <cardinality>76363</cardinality>
+            <cardinality>76319</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>76363</v>
+                    <v>76319</v>
                 </e>
                 <e>
                     <k>condition_id</k>
-                    <v>76363</v>
+                    <v>76319</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35561,7 +35609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76363</v>
+                                    <v>76319</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35577,7 +35625,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76363</v>
+                                    <v>76319</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35587,15 +35635,15 @@
         </relation>
         <relation>
             <name>for_update</name>
-            <cardinality>73407</cardinality>
+            <cardinality>73365</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>73407</v>
+                    <v>73365</v>
                 </e>
                 <e>
                     <k>update_id</k>
-                    <v>73407</v>
+                    <v>73365</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35609,7 +35657,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73407</v>
+                                    <v>73365</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35625,7 +35673,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73407</v>
+                                    <v>73365</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35635,15 +35683,15 @@
         </relation>
         <relation>
             <name>for_body</name>
-            <cardinality>84413</cardinality>
+            <cardinality>84364</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>84413</v>
+                    <v>84364</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>84413</v>
+                    <v>84364</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35657,7 +35705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84413</v>
+                                    <v>84364</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35673,7 +35721,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84413</v>
+                                    <v>84364</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35683,19 +35731,19 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5589515</cardinality>
+            <cardinality>5605658</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5589515</v>
+                    <v>5605658</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>15683</v>
+                    <v>15728</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2355552</v>
+                    <v>2362355</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35709,7 +35757,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5589515</v>
+                                    <v>5605658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35725,7 +35773,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5589515</v>
+                                    <v>5605658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35741,52 +35789,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5152</v>
+                                    <v>5167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1284</v>
+                                    <v>1287</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>266</v>
+                                    <v>267</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2010</v>
+                                    <v>2016</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1308</v>
+                                    <v>1312</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>1017</v>
+                                    <v>1020</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>29</b>
-                                    <v>1380</v>
+                                    <v>1384</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>39</b>
-                                    <v>1179</v>
+                                    <v>1182</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>78</b>
-                                    <v>1187</v>
+                                    <v>1190</v>
                                 </b>
                                 <b>
                                     <a>78</a>
-                                    <b>207977</b>
-                                    <v>896</v>
+                                    <b>207983</b>
+                                    <v>898</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35802,52 +35850,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5152</v>
+                                    <v>5167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1284</v>
+                                    <v>1287</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>266</v>
+                                    <v>267</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2010</v>
+                                    <v>2016</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1308</v>
+                                    <v>1312</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>1017</v>
+                                    <v>1020</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>29</b>
-                                    <v>1380</v>
+                                    <v>1384</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>39</b>
-                                    <v>1179</v>
+                                    <v>1182</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>78</b>
-                                    <v>1187</v>
+                                    <v>1190</v>
                                 </b>
                                 <b>
                                     <a>78</a>
-                                    <b>207977</b>
-                                    <v>896</v>
+                                    <b>207983</b>
+                                    <v>898</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35863,32 +35911,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1338178</v>
+                                    <v>1342027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>514505</v>
+                                    <v>516007</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>150687</v>
+                                    <v>151118</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>154814</v>
+                                    <v>155272</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>178500</v>
+                                    <v>179010</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>1943</b>
-                                    <v>18865</v>
+                                    <v>18919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35904,32 +35952,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1338178</v>
+                                    <v>1342027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>514505</v>
+                                    <v>516007</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>150687</v>
+                                    <v>151118</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>154814</v>
+                                    <v>155272</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>178500</v>
+                                    <v>179010</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>1943</b>
-                                    <v>18865</v>
+                                    <v>18919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35939,30 +35987,30 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>42985</cardinality>
+            <cardinality>43502</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>42985</v>
+                    <v>43502</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>724033</cardinality>
+            <cardinality>728652</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>713534</v>
+                    <v>688271</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>72</v>
+                    <v>125</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>724033</v>
+                    <v>728583</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35976,12 +36024,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706121</v>
+                                    <v>666111</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>10</b>
-                                    <v>7413</v>
+                                    <b>32</b>
+                                    <v>22160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35997,12 +36045,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706121</v>
+                                    <v>666111</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>10</b>
-                                    <v>7413</v>
+                                    <b>32</b>
+                                    <v>22160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36016,48 +36064,53 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>52</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>3</a>
+                                    <b>5</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>7</a>
+                                    <b>11</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
+                                    <a>11</a>
+                                    <b>15</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>26</b>
+                                    <a>21</a>
+                                    <b>45</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>60</a>
-                                    <b>61</b>
+                                    <a>86</a>
+                                    <b>121</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>229</a>
-                                    <b>230</b>
+                                    <a>205</a>
+                                    <b>357</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>918</a>
-                                    <b>919</b>
+                                    <a>1067</a>
+                                    <b>2544</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>88354</a>
-                                    <b>88355</b>
+                                    <a>5483</a>
+                                    <b>170293</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -36072,48 +36125,53 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>52</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>3</a>
+                                    <b>5</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>7</a>
+                                    <b>11</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
+                                    <a>11</a>
+                                    <b>15</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>26</b>
+                                    <a>21</a>
+                                    <b>45</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>60</a>
-                                    <b>61</b>
+                                    <a>86</a>
+                                    <b>121</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>229</a>
-                                    <b>230</b>
+                                    <a>205</a>
+                                    <b>357</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>918</a>
-                                    <b>919</b>
+                                    <a>1067</a>
+                                    <b>2544</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>88354</a>
-                                    <b>88355</b>
+                                    <a>5483</a>
+                                    <b>170276</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -36130,7 +36188,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724033</v>
+                                    <v>728559</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>8</b>
+                                    <v>24</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36146,7 +36209,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724033</v>
+                                    <v>728583</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36156,19 +36219,19 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>724033</cardinality>
+            <cardinality>728652</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>713534</v>
+                    <v>688271</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>72</v>
+                    <v>125</v>
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>724033</v>
+                    <v>728652</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36182,12 +36245,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706121</v>
+                                    <v>666111</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>10</b>
-                                    <v>7413</v>
+                                    <b>32</b>
+                                    <v>22160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36203,12 +36266,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706121</v>
+                                    <v>666111</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>10</b>
-                                    <v>7413</v>
+                                    <b>32</b>
+                                    <v>22160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36222,48 +36285,53 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>52</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>3</a>
+                                    <b>5</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>7</a>
+                                    <b>11</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
+                                    <a>11</a>
+                                    <b>15</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>26</b>
+                                    <a>21</a>
+                                    <b>45</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>60</a>
-                                    <b>61</b>
+                                    <a>86</a>
+                                    <b>121</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>229</a>
-                                    <b>230</b>
+                                    <a>205</a>
+                                    <b>357</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>918</a>
-                                    <b>919</b>
+                                    <a>1067</a>
+                                    <b>2544</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>88354</a>
-                                    <b>88355</b>
+                                    <a>5483</a>
+                                    <b>170293</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -36278,48 +36346,53 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>52</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>3</a>
+                                    <b>5</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>7</a>
+                                    <b>11</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
+                                    <a>11</a>
+                                    <b>15</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>26</b>
+                                    <a>21</a>
+                                    <b>45</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>60</a>
-                                    <b>61</b>
+                                    <a>86</a>
+                                    <b>121</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>229</a>
-                                    <b>230</b>
+                                    <a>205</a>
+                                    <b>357</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>918</a>
-                                    <b>919</b>
+                                    <a>1067</a>
+                                    <b>2544</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>88354</a>
-                                    <b>88355</b>
+                                    <a>5483</a>
+                                    <b>170293</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -36336,7 +36409,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724033</v>
+                                    <v>728652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36352,7 +36425,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724033</v>
+                                    <v>728652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36362,15 +36435,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1614225</cardinality>
+            <cardinality>1625740</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1614225</v>
+                    <v>1625740</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1400877</v>
+                    <v>1404735</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36384,7 +36457,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1614225</v>
+                                    <v>1625740</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36400,17 +36473,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1270635</v>
+                                    <v>1267589</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>115144</v>
+                                    <v>122044</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>29</b>
-                                    <v>15098</v>
+                                    <v>15102</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36420,19 +36493,19 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>348275</cardinality>
+            <cardinality>348073</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>348275</v>
+                    <v>348073</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>28944</v>
+                    <v>28928</v>
                 </e>
                 <e>
                     <k>target</k>
-                    <v>72696</v>
+                    <v>72654</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36446,7 +36519,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348275</v>
+                                    <v>348073</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36462,7 +36535,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348275</v>
+                                    <v>348073</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36478,32 +36551,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13595</v>
+                                    <v>13587</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6058</v>
+                                    <v>6054</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2013</v>
+                                    <v>2012</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1888</v>
+                                    <v>1887</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>2197</v>
+                                    <v>2196</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>25</b>
-                                    <v>2189</v>
+                                    <v>2187</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -36524,17 +36597,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23187</v>
+                                    <v>23174</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3626</v>
+                                    <v>3624</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>3321</b>
-                                    <v>2130</v>
+                                    <v>2129</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36555,27 +36628,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36206</v>
+                                    <v>36185</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17631</v>
+                                    <v>17620</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7378</v>
+                                    <v>7374</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>6417</v>
+                                    <v>6413</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>2124</b>
-                                    <v>5030</v>
+                                    <v>5027</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36591,7 +36664,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72696</v>
+                                    <v>72654</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36601,11 +36674,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5321789</cardinality>
+            <cardinality>5322916</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5321789</v>
+                    <v>5322916</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -36613,7 +36686,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5318720</v>
+                    <v>5319847</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36627,7 +36700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5321789</v>
+                                    <v>5322916</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36643,7 +36716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5321789</v>
+                                    <v>5322916</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36791,7 +36864,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5318597</v>
+                                    <v>5319724</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -36812,7 +36885,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5318720</v>
+                                    <v>5319847</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36822,15 +36895,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1122961</cardinality>
+            <cardinality>1123198</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>874750</v>
+                    <v>874936</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1122961</v>
+                    <v>1123198</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36844,17 +36917,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>639184</v>
+                                    <v>639319</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>226728</v>
+                                    <v>226776</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>8838</v>
+                                    <v>8840</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36870,7 +36943,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1122961</v>
+                                    <v>1123198</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36880,41 +36953,41 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>432219</cardinality>
+            <cardinality>432311</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>432219</v>
+                    <v>432311</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>280740</cardinality>
+            <cardinality>280799</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>280740</v>
+                    <v>280799</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4282669</cardinality>
+            <cardinality>4283577</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4282669</v>
+                    <v>4283577</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2907815</v>
+                    <v>2908431</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1656453</v>
+                    <v>1656804</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36928,7 +37001,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4282669</v>
+                                    <v>4283577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36944,7 +37017,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4282669</v>
+                                    <v>4283577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36960,12 +37033,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2712390</v>
+                                    <v>2712964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>798</b>
-                                    <v>195425</v>
+                                    <v>195467</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36981,12 +37054,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2827902</v>
+                                    <v>2828501</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>79913</v>
+                                    <v>79930</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37002,17 +37075,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1510620</v>
+                                    <v>1510940</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>125209</v>
+                                    <v>125236</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>13605</b>
-                                    <v>20622</v>
+                                    <v>20627</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37028,17 +37101,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1514794</v>
+                                    <v>1515115</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>12</b>
-                                    <v>124841</v>
+                                    <v>124868</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>3246</b>
-                                    <v>16817</v>
+                                    <v>16820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37048,15 +37121,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>316459</cardinality>
+            <cardinality>322460</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>316459</v>
+                    <v>322460</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>58294</v>
+                    <v>59399</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37070,7 +37143,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>316459</v>
+                                    <v>322460</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37086,37 +37159,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28848</v>
+                                    <v>29395</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9378</v>
+                                    <v>9556</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4919</v>
+                                    <v>5013</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>5318</v>
+                                    <v>5419</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>4489</v>
+                                    <v>4574</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>47</b>
-                                    <v>4374</v>
+                                    <v>4457</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>793</b>
-                                    <v>965</v>
+                                    <v>983</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37174,15 +37247,15 @@
         </relation>
         <relation>
             <name>link_targets</name>
-            <cardinality>817</cardinality>
+            <cardinality>816</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>817</v>
+                    <v>816</v>
                 </e>
                 <e>
                     <k>binary</k>
-                    <v>817</v>
+                    <v>816</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37196,7 +37269,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>817</v>
+                                    <v>816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37212,7 +37285,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>817</v>
+                                    <v>816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37222,15 +37295,15 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>30993807</cardinality>
+            <cardinality>31162056</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3938571</v>
+                    <v>3960190</v>
                 </e>
                 <e>
                     <k>link_target</k>
-                    <v>335</v>
+                    <v>337</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37244,17 +37317,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>537390</v>
+                                    <v>540567</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>27022</v>
+                                    <v>27180</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3374158</v>
+                                    <v>3392442</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37273,48 +37346,48 @@
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>100775</a>
-                                    <b>100776</b>
+                                    <a>100732</a>
+                                    <b>100733</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>100895</a>
-                                    <b>100896</b>
+                                    <a>100852</a>
+                                    <b>100853</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>100953</a>
-                                    <b>100954</b>
+                                    <a>100910</a>
+                                    <b>100911</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>100974</a>
-                                    <b>100975</b>
+                                    <a>100931</a>
+                                    <b>100932</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>100996</a>
-                                    <b>100997</b>
+                                    <a>100953</a>
+                                    <b>100954</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>101038</a>
-                                    <b>101039</b>
+                                    <a>100995</a>
+                                    <b>100996</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>103041</a>
-                                    <b>103042</b>
+                                    <a>102998</a>
+                                    <b>102999</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>106539</a>
-                                    <b>106540</b>
+                                    <a>106496</a>
+                                    <b>106497</b>
                                     <v>33</v>
                                 </b>
                                 <b>
-                                    <a>108099</a>
-                                    <b>108100</b>
+                                    <a>108057</a>
+                                    <b>108058</b>
                                     <v>33</v>
                                 </b>
                             </bs>
diff --git a/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/old.dbscheme b/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/old.dbscheme
new file mode 100644
index 000000000000..0853f43dc8c0
--- /dev/null
+++ b/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/old.dbscheme
@@ -0,0 +1,2578 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..6aec212e408f
--- /dev/null
+++ b/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/semmlecode.cpp.dbscheme
@@ -0,0 +1,2588 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(
+    unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/upgrade.properties b/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/upgrade.properties
new file mode 100644
index 000000000000..92084ebe9ad6
--- /dev/null
+++ b/cpp/ql/lib/upgrades/0853f43dc8c08deecb473c54a2b70da8597f1ab5/upgrade.properties
@@ -0,0 +1,2 @@
+description: Support C23 _BitInt
+compatibility: partial
diff --git a/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/old.dbscheme b/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/old.dbscheme
new file mode 100644
index 000000000000..6aec212e408f
--- /dev/null
+++ b/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/old.dbscheme
@@ -0,0 +1,2588 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(
+    unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..293904928d85
--- /dev/null
+++ b/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/semmlecode.cpp.dbscheme
@@ -0,0 +1,2602 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(
+    unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+| 397 = @isvirtualbaseof
+| 398 = @isimplicitlifetime
+| 399 = @ltsynthesizesfromspaceship
+| 400 = @gtsynthesizesfromspaceship
+| 401 = @lesynthesizesfromspaceship
+| 402 = @gesynthesizesfromspaceship
+| 403 = @isstructural
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            | @isvirtualbaseof
+            | @isimplicitlifetime
+            | @ltsynthesizesfromspaceship
+            | @gtsynthesizesfromspaceship
+            | @lesynthesizesfromspaceship
+            | @gesynthesizesfromspaceship
+            | @isstructural
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/upgrade.properties b/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/upgrade.properties
new file mode 100644
index 000000000000..db0e7e92d0e9
--- /dev/null
+++ b/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add new builtin operations
+compatibility: backwards
diff --git a/cpp/ql/lib/utils/test/InlineExpectationsTestQuery.ql b/cpp/ql/lib/utils/test/InlineExpectationsTestQuery.ql
index 8e6977ba5321..e71d67bc528c 100644
--- a/cpp/ql/lib/utils/test/InlineExpectationsTestQuery.ql
+++ b/cpp/ql/lib/utils/test/InlineExpectationsTestQuery.ql
@@ -6,16 +6,4 @@ private import cpp
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>
diff --git a/cpp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll b/cpp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
index d2c8efbf3165..18493c8ad19c 100644
--- a/cpp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/cpp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
@@ -25,4 +25,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = C::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(C::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }
diff --git a/cpp/ql/src/Best Practices/BlockWithTooManyStatements.ql b/cpp/ql/src/Best Practices/BlockWithTooManyStatements.ql
index be175660bd9c..a35ec36837b1 100644
--- a/cpp/ql/src/Best Practices/BlockWithTooManyStatements.ql	
+++ b/cpp/ql/src/Best Practices/BlockWithTooManyStatements.ql	
@@ -5,9 +5,11 @@
  * @problem.severity recommendation
  * @precision high
  * @id cpp/complex-block
- * @tags testability
+ * @tags quality
+ *       testability
  *       readability
  *       maintainability
+ *       complexity
  */
 
 import cpp
diff --git a/cpp/ql/src/Best Practices/ComplexCondition.ql b/cpp/ql/src/Best Practices/ComplexCondition.ql
index 20ecd1b1adeb..b93d0b371e0b 100644
--- a/cpp/ql/src/Best Practices/ComplexCondition.ql	
+++ b/cpp/ql/src/Best Practices/ComplexCondition.ql	
@@ -5,9 +5,11 @@
  * @problem.severity recommendation
  * @precision high
  * @id cpp/complex-condition
- * @tags testability
+ * @tags quality
+ *       testability
  *       readability
  *       maintainability
+ *       complexity
  *       statistical
  *       non-attributable
  */
diff --git a/cpp/ql/src/Best Practices/Exceptions/AccidentalRethrow.ql b/cpp/ql/src/Best Practices/Exceptions/AccidentalRethrow.ql
index 1e902579a495..be5a04fedb96 100644
--- a/cpp/ql/src/Best Practices/Exceptions/AccidentalRethrow.ql	
+++ b/cpp/ql/src/Best Practices/Exceptions/AccidentalRethrow.ql	
@@ -5,8 +5,10 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/rethrow-no-exception
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
+ *       error-handling
  *       exceptions
  */
 
diff --git a/cpp/ql/src/Best Practices/Exceptions/CatchingByValue.qhelp b/cpp/ql/src/Best Practices/Exceptions/CatchingByValue.qhelp
index 3c60845c4a54..82bed0bc088e 100644
--- a/cpp/ql/src/Best Practices/Exceptions/CatchingByValue.qhelp	
+++ b/cpp/ql/src/Best Practices/Exceptions/CatchingByValue.qhelp	
@@ -43,7 +43,7 @@ void good() {
   <li>C++ FAQ: <a href="https://isocpp.org/wiki/faq/exceptions#what-to-throw">
     What should I throw?</a>, <a href="https://isocpp.org/wiki/faq/exceptions#what-to-catch">
     What should I catch?</a>.</li>
-  <li>Wikibooks: <a href="http://en.wikibooks.org/wiki/C%2B%2B_Programming/Exception_Handling#Throwing_objects">
+  <li>Wikibooks: <a href="https://en.wikibooks.org/wiki/C%2B%2B_Programming/Exception_Handling#Throwing_objects">
     Throwing objects</a>.</li>
 
 
diff --git a/cpp/ql/src/Best Practices/Exceptions/CatchingByValue.ql b/cpp/ql/src/Best Practices/Exceptions/CatchingByValue.ql
index 28e7541fc744..9ac27287ae3b 100644
--- a/cpp/ql/src/Best Practices/Exceptions/CatchingByValue.ql	
+++ b/cpp/ql/src/Best Practices/Exceptions/CatchingByValue.ql	
@@ -5,8 +5,11 @@
  * @problem.severity warning
  * @precision very-high
  * @id cpp/catch-by-value
- * @tags efficiency
+ * @tags quality
+ *       reliability
+ *       efficiency
  *       correctness
+ *       error-handling
  *       exceptions
  */
 
diff --git a/cpp/ql/src/Best Practices/Exceptions/LeakyCatch.ql b/cpp/ql/src/Best Practices/Exceptions/LeakyCatch.ql
index d3848962abda..97ccbdc63e07 100644
--- a/cpp/ql/src/Best Practices/Exceptions/LeakyCatch.ql	
+++ b/cpp/ql/src/Best Practices/Exceptions/LeakyCatch.ql	
@@ -5,8 +5,11 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/catch-missing-free
- * @tags efficiency
+ * @tags quality
+ *       reliability
+ *       efficiency
  *       correctness
+ *       error-handling
  *       exceptions
  *       external/cwe/cwe-401
  */
diff --git a/cpp/ql/src/Best Practices/Exceptions/ThrowingPointers.qhelp b/cpp/ql/src/Best Practices/Exceptions/ThrowingPointers.qhelp
index a05903bd350e..cbbe423c647d 100644
--- a/cpp/ql/src/Best Practices/Exceptions/ThrowingPointers.qhelp	
+++ b/cpp/ql/src/Best Practices/Exceptions/ThrowingPointers.qhelp	
@@ -36,7 +36,7 @@ void good() {
   <li>C++ FAQ: <a href="https://isocpp.org/wiki/faq/exceptions#what-to-throw">
     What should I throw?</a>, <a href="https://isocpp.org/wiki/faq/exceptions#what-to-catch">
     What should I catch?</a>.</li>
-  <li>Wikibooks: <a href="http://en.wikibooks.org/wiki/C%2B%2B_Programming/Exception_Handling#Throwing_objects">
+  <li>Wikibooks: <a href="https://en.wikibooks.org/wiki/C%2B%2B_Programming/Exception_Handling#Throwing_objects">
     Throwing objects</a>.</li>
 
 
diff --git a/cpp/ql/src/Best Practices/Exceptions/ThrowingPointers.ql b/cpp/ql/src/Best Practices/Exceptions/ThrowingPointers.ql
index 85c21a28f560..ad73b220868c 100644
--- a/cpp/ql/src/Best Practices/Exceptions/ThrowingPointers.ql	
+++ b/cpp/ql/src/Best Practices/Exceptions/ThrowingPointers.ql	
@@ -5,8 +5,11 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/throwing-pointer
- * @tags efficiency
+ * @tags quality
+ *       reliability
+ *       efficiency
  *       correctness
+ *       error-handling
  *       exceptions
  */
 
diff --git a/cpp/ql/src/Best Practices/GuardedFree.ql b/cpp/ql/src/Best Practices/GuardedFree.ql
index 3afe1a92e954..76b921e56688 100644
--- a/cpp/ql/src/Best Practices/GuardedFree.ql	
+++ b/cpp/ql/src/Best Practices/GuardedFree.ql	
@@ -6,8 +6,10 @@
  * @problem.severity recommendation
  * @precision very-high
  * @id cpp/guarded-free
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
+ *       useless-code
  */
 
 import cpp
diff --git a/cpp/ql/src/Best Practices/Hiding/DeclarationHidesParameter.ql b/cpp/ql/src/Best Practices/Hiding/DeclarationHidesParameter.ql
index 64e5760ed2b4..b4c0e7854605 100644
--- a/cpp/ql/src/Best Practices/Hiding/DeclarationHidesParameter.ql	
+++ b/cpp/ql/src/Best Practices/Hiding/DeclarationHidesParameter.ql	
@@ -5,7 +5,8 @@
  * @problem.severity recommendation
  * @precision very-high
  * @id cpp/declaration-hides-parameter
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
  */
 
diff --git a/cpp/ql/src/Best Practices/Hiding/DeclarationHidesVariable.ql b/cpp/ql/src/Best Practices/Hiding/DeclarationHidesVariable.ql
index d10d346c5135..b5d40675c823 100644
--- a/cpp/ql/src/Best Practices/Hiding/DeclarationHidesVariable.ql	
+++ b/cpp/ql/src/Best Practices/Hiding/DeclarationHidesVariable.ql	
@@ -5,7 +5,8 @@
  * @problem.severity recommendation
  * @precision high
  * @id cpp/declaration-hides-variable
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
  */
 
diff --git a/cpp/ql/src/Best Practices/Likely Errors/OffsetUseBeforeRangeCheck.qhelp b/cpp/ql/src/Best Practices/Likely Errors/OffsetUseBeforeRangeCheck.qhelp
index 6ffb30be5840..d12e1821b2d7 100644
--- a/cpp/ql/src/Best Practices/Likely Errors/OffsetUseBeforeRangeCheck.qhelp	
+++ b/cpp/ql/src/Best Practices/Likely Errors/OffsetUseBeforeRangeCheck.qhelp	
@@ -21,7 +21,7 @@
 
 <li>cplusplus.com: <a href="http://www.cplusplus.com/reference/array/array/">
   C++: array</a>.</li>
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Bounds_checking">
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Bounds_checking">
   Bounds checking</a>.</li>
 
 
diff --git a/cpp/ql/src/Best Practices/Likely Errors/Slicing.qhelp b/cpp/ql/src/Best Practices/Likely Errors/Slicing.qhelp
index 576d77c8839c..282f592e0f61 100644
--- a/cpp/ql/src/Best Practices/Likely Errors/Slicing.qhelp	
+++ b/cpp/ql/src/Best Practices/Likely Errors/Slicing.qhelp	
@@ -20,7 +20,7 @@ These assignments slice off all the fields added by the derived type, and can ca
 <references>
 
 <li>
-  Wikipedia: <a href="http://en.wikipedia.org/wiki/Object_slicing">Object slicing</a>.
+  Wikipedia: <a href="https://en.wikipedia.org/wiki/Object_slicing">Object slicing</a>.
 </li>
 <li>
   DevX.com: <a href="http://www.devx.com/tips/Tip/14570">Slicing in C++</a>.
diff --git a/cpp/ql/src/Best Practices/Likely Errors/Slicing.ql b/cpp/ql/src/Best Practices/Likely Errors/Slicing.ql
index 52fec3ccbba8..ab9f5a27f0d5 100644
--- a/cpp/ql/src/Best Practices/Likely Errors/Slicing.ql	
+++ b/cpp/ql/src/Best Practices/Likely Errors/Slicing.ql	
@@ -5,7 +5,8 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/slicing
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       types
  */
diff --git a/cpp/ql/src/Best Practices/Magic Constants/MagicConstantsNumbers.qhelp b/cpp/ql/src/Best Practices/Magic Constants/MagicConstantsNumbers.qhelp
index aa97965996f2..4a5e0cff636e 100644
--- a/cpp/ql/src/Best Practices/Magic Constants/MagicConstantsNumbers.qhelp	
+++ b/cpp/ql/src/Best Practices/Magic Constants/MagicConstantsNumbers.qhelp	
@@ -35,7 +35,7 @@ then replace all the relevant occurrences in the code.</p>
 <references>
 
 <li>
-<a href="http://en.wikipedia.org/wiki/Magic_number_%28programming%29#Unnamed_numerical_constants">Magic number (Wikipedia)</a>
+<a href="https://en.wikipedia.org/wiki/Magic_number_%28programming%29#Unnamed_numerical_constants">Magic number (Wikipedia)</a>
 </li>
 <li>
   Mats Henricson and Erik Nyquist, <i>Industrial Strength C++</i>, published by Prentice Hall PTR (1997). 
diff --git a/cpp/ql/src/Best Practices/Magic Constants/MagicConstantsString.qhelp b/cpp/ql/src/Best Practices/Magic Constants/MagicConstantsString.qhelp
index 19182fe5b19d..c1ccb94f59ea 100644
--- a/cpp/ql/src/Best Practices/Magic Constants/MagicConstantsString.qhelp	
+++ b/cpp/ql/src/Best Practices/Magic Constants/MagicConstantsString.qhelp	
@@ -34,7 +34,7 @@ constant.</p>
 
 
 <li>
-<a href="http://en.wikipedia.org/wiki/Magic_string">Magic string (Wikipedia)</a>
+<a href="https://en.wikipedia.org/wiki/Magic_string">Magic string (Wikipedia)</a>
 </li>
 <li>
   Mats Henricson and Erik Nyquist, <i>Industrial Strength C++</i>, published by Prentice Hall PTR (1997). 
diff --git a/cpp/ql/src/Best Practices/RuleOfThree.qhelp b/cpp/ql/src/Best Practices/RuleOfThree.qhelp
index f9ac2b396b9b..1c8eace82f76 100644
--- a/cpp/ql/src/Best Practices/RuleOfThree.qhelp	
+++ b/cpp/ql/src/Best Practices/RuleOfThree.qhelp	
@@ -15,6 +15,6 @@
 </recommendation>
 
 <references>
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Rule_of_three_(C%2B%2B_programming)">Rule of three (C++ programming)</a></li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Rule_of_three_(C%2B%2B_programming)">Rule of three (C++ programming)</a></li>
 </references>
 </qhelp>
diff --git a/cpp/ql/src/Best Practices/RuleOfTwo.qhelp b/cpp/ql/src/Best Practices/RuleOfTwo.qhelp
index b8d4e13d283e..167740b03d97 100644
--- a/cpp/ql/src/Best Practices/RuleOfTwo.qhelp	
+++ b/cpp/ql/src/Best Practices/RuleOfTwo.qhelp	
@@ -38,7 +38,7 @@ should never be called.
 <references>
 
 <li>
-  <a href="http://en.wikipedia.org/wiki/Rule_of_three_(C%2B%2B_programming)">Rule of Three [Wikipedia]</a>
+  <a href="https://en.wikipedia.org/wiki/Rule_of_three_(C%2B%2B_programming)">Rule of Three [Wikipedia]</a>
 </li>
 <li>
   <a href="http://www.artima.com/cppsource/bigtwo.html">The Law of The Big Two</a>
diff --git a/cpp/ql/src/Best Practices/RuleOfTwo.ql b/cpp/ql/src/Best Practices/RuleOfTwo.ql
index efc30c0829ee..c519bc4043ad 100644
--- a/cpp/ql/src/Best Practices/RuleOfTwo.ql	
+++ b/cpp/ql/src/Best Practices/RuleOfTwo.ql	
@@ -7,8 +7,9 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/rule-of-two
- * @tags reliability
- *       readability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       language-features
  */
 
diff --git a/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql b/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql
index 4ba1ad93f565..6d5948300db1 100644
--- a/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql	
+++ b/cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql	
@@ -46,6 +46,8 @@ predicate declarationHasSideEffects(Variable v) {
   )
   or
   v.getType() instanceof TemplateDependentType // may have a constructor/destructor
+  or
+  v.getInitializer().getExpr().mayBeImpure()
 }
 
 from LocalVariable v, Function f
@@ -57,5 +59,6 @@ where
   not declarationHasSideEffects(v) and
   not exists(AsmStmt s | f = s.getEnclosingFunction()) and
   not v.getAnAttribute().getName() = "unused" and
+  not v.getAnAttribute().getName() = "maybe_unused" and
   not f.hasErrors() // Unextracted expressions may use `v`
 select v, "Variable " + v.getName() + " is not used."
diff --git a/cpp/ql/src/Best Practices/Unused Entities/UnusedStaticVariables.ql b/cpp/ql/src/Best Practices/Unused Entities/UnusedStaticVariables.ql
index 03176b8a7791..442f75027d82 100644
--- a/cpp/ql/src/Best Practices/Unused Entities/UnusedStaticVariables.ql	
+++ b/cpp/ql/src/Best Practices/Unused Entities/UnusedStaticVariables.ql	
@@ -15,16 +15,20 @@ import cpp
 
 predicate declarationHasSideEffects(Variable v) {
   exists(Class c | c = v.getUnspecifiedType() | c.hasConstructor() or c.hasDestructor())
+  or
+  v.getInitializer().getExpr().mayBeImpure()
 }
 
 from Variable v
 where
   v.isStatic() and
+  not v.isCompilerGenerated() and
   v.hasDefinition() and
   not v.isConstexpr() and
   not exists(VariableAccess a | a.getTarget() = v) and
   not v instanceof MemberVariable and
   not declarationHasSideEffects(v) and
   not v.getAnAttribute().hasName("used") and
-  not v.getAnAttribute().hasName("unused")
+  not v.getAnAttribute().hasName("unused") and
+  not v.getAnAttribute().hasName("maybe_unused")
 select v, "Static variable " + v.getName() + " is never read."
diff --git a/cpp/ql/src/Best Practices/UseOfGoto.ql b/cpp/ql/src/Best Practices/UseOfGoto.ql
index 26d72d69a0a2..5f360f72b869 100644
--- a/cpp/ql/src/Best Practices/UseOfGoto.ql	
+++ b/cpp/ql/src/Best Practices/UseOfGoto.ql	
@@ -6,8 +6,10 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/use-of-goto
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
+ *       complexity
  *       language-features
  */
 
diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index 945a605d7e3d..59508a4a2044 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,3 +1,46 @@
+## 1.10.0
+
+### Query Metadata Changes
+
+* Added a new `cpp-code-quality` query suite containing queries that identify maintainability and reliability issues in C and C++ code.
+
+### Minor Analysis Improvements
+
+* The `cpp/suspicious-pointer-scaling` query no longer reports false positives for intentional pointer arithmetic from `std::byte*` buffers.
+* The `cpp/unused-local-variable` and `cpp/unused-static-variable` queries no longer report variables marked with the C++17 `[[maybe_unused]]` attribute.
+
+## 1.9.2
+
+### Minor Analysis Improvements
+
+* The `cpp/resource-not-released-in-destructor` query now recognizes resources released through local aliases, reducing false-positive results.
+
+## 1.9.1
+
+No user-facing changes.
+
+## 1.9.0
+
+### New Queries
+
+* Added a new query, `cpp/ambiguous-assignment-of-comparison`, to detect potentially
+  ambiguous expressions where a comparison result is assigned to a variable and the
+  assignment is used as a truth value.
+
+## 1.8.3
+
+### Minor Analysis Improvements
+
+* The `cpp/leap-year/unsafe-array-for-days-of-the-year` query ("Unsafe array for days of the year") no longer reports an alert on the `__PRETTY_FUNCTION__` variable (and related variables) when the enclosing function has a signature that is exactly 364 characters.
+
+## 1.8.2
+
+No user-facing changes.
+
+## 1.8.1
+
+No user-facing changes.
+
 ## 1.8.0
 
 ### Query Metadata Changes
diff --git a/cpp/ql/src/Critical/LargeParameter.ql b/cpp/ql/src/Critical/LargeParameter.ql
index 2df622a4c81c..42fd8215369a 100644
--- a/cpp/ql/src/Critical/LargeParameter.ql
+++ b/cpp/ql/src/Critical/LargeParameter.ql
@@ -5,7 +5,10 @@
  * @problem.severity recommendation
  * @precision very-high
  * @id cpp/large-parameter
- * @tags efficiency
+ * @tags quality
+ *       reliability
+ *       performance
+ *       efficiency
  *       readability
  *       statistical
  *       non-attributable
diff --git a/cpp/ql/src/Critical/NewArrayDeleteMismatch.ql b/cpp/ql/src/Critical/NewArrayDeleteMismatch.ql
index c41a8c5ce29c..d91db6a5a5a6 100644
--- a/cpp/ql/src/Critical/NewArrayDeleteMismatch.ql
+++ b/cpp/ql/src/Critical/NewArrayDeleteMismatch.ql
@@ -5,7 +5,9 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/new-array-delete-mismatch
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import NewDelete
diff --git a/cpp/ql/src/Critical/NewDeleteArrayMismatch.ql b/cpp/ql/src/Critical/NewDeleteArrayMismatch.ql
index 497ddfe19c4a..c449828da804 100644
--- a/cpp/ql/src/Critical/NewDeleteArrayMismatch.ql
+++ b/cpp/ql/src/Critical/NewDeleteArrayMismatch.ql
@@ -5,7 +5,9 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/new-delete-array-mismatch
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import NewDelete
diff --git a/cpp/ql/src/Documentation/DocumentApi.qhelp b/cpp/ql/src/Documentation/DocumentApi.qhelp
index 4154e5cebc4e..80225102cc9b 100644
--- a/cpp/ql/src/Documentation/DocumentApi.qhelp
+++ b/cpp/ql/src/Documentation/DocumentApi.qhelp
@@ -22,10 +22,10 @@ Add comments to document the purpose of the function. In particular, ensure that
 <references>
 
 <li>
-  C++ Programming Wikibook: <a href="http://en.wikibooks.org/wiki/C%2B%2B_Programming/Programming_Languages/C%2B%2B/Code/Style_Conventions#Comments">Comments</a>
+  C++ Programming Wikibook: <a href="https://en.wikibooks.org/wiki/C%2B%2B_Programming/Programming_Languages/C%2B%2B/Code/Style_Conventions#Comments">Comments</a>
 </li>
 <li>
-  Wikipedia: <a href="http://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Need_for_comments">Need for comments</a>
+  Wikipedia: <a href="https://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Need_for_comments">Need for comments</a>
 </li>
 
 
diff --git a/cpp/ql/src/Documentation/FixmeComments.qhelp b/cpp/ql/src/Documentation/FixmeComments.qhelp
index a4a0b9966a15..a884aee2bc8b 100644
--- a/cpp/ql/src/Documentation/FixmeComments.qhelp
+++ b/cpp/ql/src/Documentation/FixmeComments.qhelp
@@ -25,7 +25,7 @@ Fix the functionality indicated by the comment. If the comment no longer applies
 <references>
 
 <li>
-  <a href="http://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Tags">Wikipedia: Comment tags</a>
+  <a href="https://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Tags">Wikipedia: Comment tags</a>
 </li>
 <li>
   <a href="http://wordaligned.org/articles/todo">The case against TODO (and FIXME)</a>
diff --git a/cpp/ql/src/Documentation/FixmeComments.ql b/cpp/ql/src/Documentation/FixmeComments.ql
index 5ccbf1292758..0699e1852279 100644
--- a/cpp/ql/src/Documentation/FixmeComments.ql
+++ b/cpp/ql/src/Documentation/FixmeComments.ql
@@ -5,7 +5,8 @@
  * @problem.severity recommendation
  * @precision very-high
  * @id cpp/fixme-comment
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       documentation
  *       external/cwe/cwe-546
  */
diff --git a/cpp/ql/src/Documentation/TodoComments.qhelp b/cpp/ql/src/Documentation/TodoComments.qhelp
index ad246ebf358f..30eb359cd972 100644
--- a/cpp/ql/src/Documentation/TodoComments.qhelp
+++ b/cpp/ql/src/Documentation/TodoComments.qhelp
@@ -25,7 +25,7 @@ Implement the functionality indicated by the comment. If the comment no longer a
 <references>
 
 <li>
-  <a href="http://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Tags">Wikipedia: Comment tags</a>
+  <a href="https://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Tags">Wikipedia: Comment tags</a>
 </li>
 <li>
   <a href="http://www.approxion.com/?p=39">TODO or not TODO</a>
diff --git a/cpp/ql/src/Documentation/UncommentedFunction.qhelp b/cpp/ql/src/Documentation/UncommentedFunction.qhelp
index 7fe5c61d9da3..1604ca496de3 100644
--- a/cpp/ql/src/Documentation/UncommentedFunction.qhelp
+++ b/cpp/ql/src/Documentation/UncommentedFunction.qhelp
@@ -23,10 +23,10 @@ cohesive functions.
 <references>
 
 <li>
-  <a href="http://en.wikibooks.org/wiki/C%2B%2B_Programming/Programming_Languages/C%2B%2B/Code/Style_Conventions#Comments">C++ Programming, Coding style conventions</a>
+  <a href="https://en.wikibooks.org/wiki/C%2B%2B_Programming/Programming_Languages/C%2B%2B/Code/Style_Conventions#Comments">C++ Programming, Coding style conventions</a>
 </li>
 <li>
-  <a href="http://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Need_for_comments">Wikipedia: Need for comments</a>
+  <a href="https://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Need_for_comments">Wikipedia: Need for comments</a>
 </li>
 
 
diff --git a/cpp/ql/src/Header Cleanup/Cleanup-DuplicateIncludeGuard.qhelp b/cpp/ql/src/Header Cleanup/Cleanup-DuplicateIncludeGuard.qhelp
index 20cb7ebe94fc..43e11ff20e8c 100644
--- a/cpp/ql/src/Header Cleanup/Cleanup-DuplicateIncludeGuard.qhelp	
+++ b/cpp/ql/src/Header Cleanup/Cleanup-DuplicateIncludeGuard.qhelp	
@@ -44,7 +44,7 @@ the second file, for example to ANOTHER_HEADER_FILE_H.</p>
 <references>
 
 <li>
-  Wikipedia: <a href="http://en.wikipedia.org/wiki/Include_guard">Include guard</a>
+  Wikipedia: <a href="https://en.wikipedia.org/wiki/Include_guard">Include guard</a>
 </li>
 
 </references>
diff --git a/cpp/ql/src/Header Cleanup/Cleanup-DuplicateIncludeGuard.ql b/cpp/ql/src/Header Cleanup/Cleanup-DuplicateIncludeGuard.ql
index c06cfeabe0d0..7b2a8bb1d1de 100644
--- a/cpp/ql/src/Header Cleanup/Cleanup-DuplicateIncludeGuard.ql	
+++ b/cpp/ql/src/Header Cleanup/Cleanup-DuplicateIncludeGuard.ql	
@@ -5,7 +5,7 @@
  * @problem.severity error
  * @precision high
  * @id cpp/duplicate-include-guard
- * @tags reliability
+ * @tags quality
  *       maintainability
  *       modularity
  */
diff --git a/cpp/ql/src/Likely Bugs/AmbiguouslySignedBitField.ql b/cpp/ql/src/Likely Bugs/AmbiguouslySignedBitField.ql
index 1fabf449ab35..3244d6748e9f 100644
--- a/cpp/ql/src/Likely Bugs/AmbiguouslySignedBitField.ql	
+++ b/cpp/ql/src/Likely Bugs/AmbiguouslySignedBitField.ql	
@@ -29,7 +29,7 @@ where
   // GLib's gboolean is a typedef for a type representing BoolType.
   not bf.getType().hasName("gboolean") and
   // If this is true, then there cannot be unsigned sign extension or overflow.
-  not bf.getDeclaredNumBits() = bf.getType().getSize() * 8 and
+  not bf.getDeclaredNumBits() = bf.getType().getBitWidth() and
   not bf.isAnonymous() and
   not bf.isFromUninstantiatedTemplate(_)
 select bf,
diff --git a/cpp/ql/src/Likely Bugs/Arithmetic/BadCheckOdd.qhelp b/cpp/ql/src/Likely Bugs/Arithmetic/BadCheckOdd.qhelp
index 13df1938bc3a..6d36cc6230f2 100644
--- a/cpp/ql/src/Likely Bugs/Arithmetic/BadCheckOdd.qhelp	
+++ b/cpp/ql/src/Likely Bugs/Arithmetic/BadCheckOdd.qhelp	
@@ -26,7 +26,7 @@ As a result, this check incorrectly considers all negative numbers as even.
   MSDN Library: <a href="https://docs.microsoft.com/en-us/cpp/cpp/multiplicative-operators-and-the-modulus-operator">Multiplicative Operators and the Modulus Operator</a>.
 </li>
 <li>
-  Wikipedia: <a href="http://en.wikipedia.org/wiki/Modulo_operation#Common_pitfalls">Modulo Operation - Common pitfalls</a>.
+  Wikipedia: <a href="https://en.wikipedia.org/wiki/Modulo_operation#Common_pitfalls">Modulo Operation - Common pitfalls</a>.
 </li>
 
 
diff --git a/cpp/ql/src/Likely Bugs/Arithmetic/BitwiseSignCheck.ql b/cpp/ql/src/Likely Bugs/Arithmetic/BitwiseSignCheck.ql
index dd27e4b7aee2..fba2fcf3f022 100644
--- a/cpp/ql/src/Likely Bugs/Arithmetic/BitwiseSignCheck.ql	
+++ b/cpp/ql/src/Likely Bugs/Arithmetic/BitwiseSignCheck.ql	
@@ -5,7 +5,8 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/bitwise-sign-check
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  */
 
diff --git a/cpp/ql/src/Likely Bugs/Arithmetic/ComparisonPrecedence.ql b/cpp/ql/src/Likely Bugs/Arithmetic/ComparisonPrecedence.ql
index d4b23265eed5..cd893ca705ee 100644
--- a/cpp/ql/src/Likely Bugs/Arithmetic/ComparisonPrecedence.ql	
+++ b/cpp/ql/src/Likely Bugs/Arithmetic/ComparisonPrecedence.ql	
@@ -7,7 +7,8 @@
  * @problem.severity warning
  * @precision very-high
  * @id cpp/comparison-precedence
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
  */
 
diff --git a/cpp/ql/src/Likely Bugs/Arithmetic/FloatComparison.ql b/cpp/ql/src/Likely Bugs/Arithmetic/FloatComparison.ql
index 1f2a7ca506fd..7f1dfad0c6cf 100644
--- a/cpp/ql/src/Likely Bugs/Arithmetic/FloatComparison.ql	
+++ b/cpp/ql/src/Likely Bugs/Arithmetic/FloatComparison.ql	
@@ -7,7 +7,8 @@
  * @problem.severity recommendation
  * @precision high
  * @id cpp/equality-on-floats
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  */
 
diff --git a/cpp/ql/src/Likely Bugs/Arithmetic/PointlessSelfComparison.ql b/cpp/ql/src/Likely Bugs/Arithmetic/PointlessSelfComparison.ql
index d2602c5bd28a..1ab9ee67c404 100644
--- a/cpp/ql/src/Likely Bugs/Arithmetic/PointlessSelfComparison.ql	
+++ b/cpp/ql/src/Likely Bugs/Arithmetic/PointlessSelfComparison.ql	
@@ -7,7 +7,8 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/comparison-of-identical-expressions
- * @tags readability
+ * @tags quality
+ *       readability
  *       maintainability
  */
 
diff --git a/cpp/ql/src/Likely Bugs/Arithmetic/UnsignedGEZero.ql b/cpp/ql/src/Likely Bugs/Arithmetic/UnsignedGEZero.ql
index 7f89569c3ba5..ff2ad98085e3 100644
--- a/cpp/ql/src/Likely Bugs/Arithmetic/UnsignedGEZero.ql	
+++ b/cpp/ql/src/Likely Bugs/Arithmetic/UnsignedGEZero.ql	
@@ -7,7 +7,9 @@
  * @problem.severity warning
  * @precision very-high
  * @id cpp/unsigned-comparison-zero
- * @tags maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       readability
  */
 
diff --git a/cpp/ql/src/Likely Bugs/ContinueInFalseLoop.ql b/cpp/ql/src/Likely Bugs/ContinueInFalseLoop.ql
index 5b16fc7cf8f0..b83392c4dfb6 100644
--- a/cpp/ql/src/Likely Bugs/ContinueInFalseLoop.ql	
+++ b/cpp/ql/src/Likely Bugs/ContinueInFalseLoop.ql	
@@ -7,7 +7,9 @@
  * @id cpp/continue-in-false-loop
  * @problem.severity warning
  * @precision high
- * @tags correctness
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import cpp
diff --git a/cpp/ql/src/Likely Bugs/Conversion/ArrayArgSizeMismatch.ql b/cpp/ql/src/Likely Bugs/Conversion/ArrayArgSizeMismatch.ql
index 924b5d87f90f..b50460262134 100644
--- a/cpp/ql/src/Likely Bugs/Conversion/ArrayArgSizeMismatch.ql	
+++ b/cpp/ql/src/Likely Bugs/Conversion/ArrayArgSizeMismatch.ql	
@@ -6,7 +6,9 @@
  * @id cpp/array-arg-size-mismatch
  * @problem.severity warning
  * @precision high
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import cpp
diff --git a/cpp/ql/src/Likely Bugs/Conversion/ConversionChangesSign.ql b/cpp/ql/src/Likely Bugs/Conversion/ConversionChangesSign.ql
index c89c71fb50b7..35843512ac05 100644
--- a/cpp/ql/src/Likely Bugs/Conversion/ConversionChangesSign.ql	
+++ b/cpp/ql/src/Likely Bugs/Conversion/ConversionChangesSign.ql	
@@ -23,7 +23,7 @@ where
   not (
     e1.isConstant() and
     0 <= e1.getValue().toInt() and
-    e1.getValue().toInt() <= ((it2.getSize() * 8 - 1) * 2.log()).exp()
+    e1.getValue().toInt() <= ((it2.getBitWidth() - 1) * 2.log()).exp()
   ) and
   not e1.isConstant()
 select e1,
diff --git a/cpp/ql/src/Likely Bugs/Conversion/ImplicitDowncastFromBitfield.ql b/cpp/ql/src/Likely Bugs/Conversion/ImplicitDowncastFromBitfield.ql
index 237d20c8f628..b9fb6b970b88 100644
--- a/cpp/ql/src/Likely Bugs/Conversion/ImplicitDowncastFromBitfield.ql	
+++ b/cpp/ql/src/Likely Bugs/Conversion/ImplicitDowncastFromBitfield.ql	
@@ -6,7 +6,8 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/implicit-bitfield-downcast
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       types
  */
@@ -20,8 +21,8 @@ where
     then fct = va.getFullyConverted().getType().(ReferenceType).getBaseType()
     else fct = va.getFullyConverted().getType()
   ) and
-  fi.getNumBits() > fct.getSize() * 8 and
-  va.getExplicitlyConverted().getType().getSize() > fct.getSize() and
+  fi.getNumBits() > fct.getBitWidth() and
+  va.getExplicitlyConverted().getType().getBitWidth() > fct.getBitWidth() and
   va.getTarget() = fi and
   not fct.getUnspecifiedType() instanceof BoolType
 select va, "Implicit downcast of bitfield $@.", fi, fi.toString()
diff --git a/cpp/ql/src/Likely Bugs/Format/TooManyFormatArguments.ql b/cpp/ql/src/Likely Bugs/Format/TooManyFormatArguments.ql
index 5b539faa5b4e..5a8fa0b8fa96 100644
--- a/cpp/ql/src/Likely Bugs/Format/TooManyFormatArguments.ql	
+++ b/cpp/ql/src/Likely Bugs/Format/TooManyFormatArguments.ql	
@@ -7,7 +7,8 @@
  * @problem.severity recommendation
  * @precision high
  * @id cpp/too-many-format-arguments
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  */
 
diff --git a/cpp/ql/src/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear.ql b/cpp/ql/src/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear.ql
index b27db937b577..e6b1ccaa6687 100644
--- a/cpp/ql/src/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear.ql	
+++ b/cpp/ql/src/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear.ql	
@@ -26,6 +26,7 @@ where
   or
   exists(Variable var |
     var = element and
+    not var.isCompilerGenerated() and
     var.getType() instanceof LeapYearUnsafeDaysOfTheYearArrayType and
     allocType = "an array allocation"
   )
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison.cpp b/cpp/ql/src/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison.cpp
new file mode 100644
index 000000000000..c99ee284346c
--- /dev/null
+++ b/cpp/ql/src/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison.cpp	
@@ -0,0 +1,12 @@
+int read_status();
+
+int check_status() {
+  int status;
+  if (status = read_status() < 0) // BAD: assigns the comparison result.
+    return status;
+
+  if ((status = read_status()) < 0) // GOOD: assigns first, then compares.
+    return status;
+
+  return 0;
+}
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison.qhelp b/cpp/ql/src/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison.qhelp
new file mode 100644
index 000000000000..e8404940bfe9
--- /dev/null
+++ b/cpp/ql/src/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison.qhelp	
@@ -0,0 +1,31 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>Assignment operators have lower precedence than comparison operators. For example,
+<code>status = read_status() &lt; 0</code> assigns the comparison result (zero or one) to
+<code>status</code>. This can be unintended when the programmer meant to assign the return value
+first and then compare it with zero.</p>
+</overview>
+
+<recommendation>
+<p>Use parentheses to make the intended order of operations explicit. To assign first and compare the
+assigned value, parenthesize the assignment. To intentionally assign the comparison result,
+parenthesize the comparison. An explicit cast around the comparison also makes that order clear.</p>
+</recommendation>
+
+<example>
+<p>In the first condition, <code>status</code> receives either zero or one instead of the value
+returned by <code>read_status()</code>. The second condition explicitly performs the assignment
+before the comparison.</p>
+<sample src="AmbiguousAssignmentOfComparison.cpp" />
+</example>
+
+<references>
+<li>SEI CERT C Coding Standard: <a href="https://wiki.sei.cmu.edu/confluence/display/c/EXP00-C.+Use+parentheses+for+precedence+of+operation">EXP00-C. Use parentheses for precedence of operation</a>.</li>
+<li>C++ reference: <a href="https://en.cppreference.com/w/cpp/language/operator_precedence.html">Operator precedence</a>.</li>
+</references>
+
+</qhelp>
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison.ql b/cpp/ql/src/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison.ql
new file mode 100644
index 000000000000..2bfe9f7159f5
--- /dev/null
+++ b/cpp/ql/src/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison.ql	
@@ -0,0 +1,71 @@
+/**
+ * @name Ambiguous assignment of comparison result used as truth value
+ * @description Using an assignment of an unparenthesized comparison as
+ *              a truth value may indicate unintended operator grouping.
+ * @kind problem
+ * @problem.severity warning
+ * @precision high
+ * @id cpp/ambiguous-assignment-of-comparison
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       external/cwe/cwe-783
+ */
+
+import cpp
+
+/** Holds if the value of `expression` is directly used as a truth value. */
+private predicate isDirectlyUsedAsTruthValue(Expr expression) {
+  expression.isCondition()
+  or
+  expression = any(UnaryLogicalOperation operation).getAnOperand()
+  or
+  expression = any(BinaryLogicalOperation operation).getAnOperand()
+}
+
+/**
+ * Holds if the value of `expression` is used as a truth value, possibly after contributing to a
+ * comma, conditional, or comparison expression.
+ */
+private predicate isUsedAsTruthValue(Expr expression) {
+  isDirectlyUsedAsTruthValue(expression)
+  or
+  exists(CommaExpr comma |
+    expression = comma.getRightOperand() and
+    isUsedAsTruthValue(comma)
+  )
+  or
+  exists(ConditionalExpr conditional |
+    expression = [conditional.getThen(), conditional.getElse()] and
+    isUsedAsTruthValue(conditional)
+  )
+  or
+  exists(ComparisonOperation comparison |
+    expression = comparison.getAnOperand() and
+    isUsedAsTruthValue(comparison)
+  )
+}
+
+/**
+ * Holds if `comparison` is explicitly grouped using parentheses or an explicit cast.
+ */
+private predicate isExplicitlyGrouped(ComparisonOperation comparison) {
+  comparison.isParenthesised()
+  or
+  exists(Cast cast | cast = comparison.getConversion+() and not cast.isImplicit())
+}
+
+from Assignment assignment, ComparisonOperation comparison
+where
+  assignment.getRValue() = comparison and
+  not isExplicitlyGrouped(comparison) and
+  isUsedAsTruthValue(assignment) and
+  // A Boolean lvalue makes assigning the comparison result type-appropriate and normally
+  // intentional.
+  not assignment.getLValue().getUnspecifiedType() instanceof BoolType and
+  not assignment.isUnevaluated() and
+  not assignment.isFromUninstantiatedTemplate(_)
+select assignment,
+  "The '" + assignment.getOperator() +
+    "' operation assigns the result of an unparenthesized comparison, and its result is used as " +
+    "a truth value."
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/AssignWhereCompareMeant.qhelp b/cpp/ql/src/Likely Bugs/Likely Typos/AssignWhereCompareMeant.qhelp
index 91ae1ce665b1..bef47aecc51c 100644
--- a/cpp/ql/src/Likely Bugs/Likely Typos/AssignWhereCompareMeant.qhelp	
+++ b/cpp/ql/src/Likely Bugs/Likely Typos/AssignWhereCompareMeant.qhelp	
@@ -30,7 +30,7 @@ An assignment is only flagged if its right hand side is a compile-time constant.
   Tutorialspoint - The C++ Programming Language: <a href="http://www.tutorialspoint.com/cplusplus/cpp_operators.htm">Operators in C++</a>
 </li>
 <li>
-  Wikipedia: <a href="http://en.wikipedia.org/wiki/Operators_in_C_and_C%2B%2B#Comparison_operators.2Frelational_operators">Operators in C and C++</a>
+  Wikipedia: <a href="https://en.wikipedia.org/wiki/Operators_in_C_and_C%2B%2B#Comparison_operators.2Frelational_operators">Operators in C and C++</a>
 </li>
 
 
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/AssignWhereCompareMeant.ql b/cpp/ql/src/Likely Bugs/Likely Typos/AssignWhereCompareMeant.ql
index 3d2f6830bf54..6e71233672e2 100644
--- a/cpp/ql/src/Likely Bugs/Likely Typos/AssignWhereCompareMeant.ql	
+++ b/cpp/ql/src/Likely Bugs/Likely Typos/AssignWhereCompareMeant.ql	
@@ -6,7 +6,8 @@
  * @problem.severity error
  * @precision high
  * @id cpp/assign-where-compare-meant
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       external/cwe/cwe-481
  */
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/CompareWhereAssignMeant.qhelp b/cpp/ql/src/Likely Bugs/Likely Typos/CompareWhereAssignMeant.qhelp
index 6c1921cda991..437db4cb05c1 100644
--- a/cpp/ql/src/Likely Bugs/Likely Typos/CompareWhereAssignMeant.qhelp	
+++ b/cpp/ql/src/Likely Bugs/Likely Typos/CompareWhereAssignMeant.qhelp	
@@ -28,7 +28,7 @@ The rule flags every occurrence of an equality operator in a position where its
   Tutorialspoint - The C++ Programming Language: <a href="http://www.tutorialspoint.com/cplusplus/cpp_operators.htm">Operators in C++</a>
 </li>
 <li>
-  Wikipedia: <a href="http://en.wikipedia.org/wiki/Operators_in_C_and_C%2B%2B#Comparison_operators.2Frelational_operators">Operators in C and C++</a>
+  Wikipedia: <a href="https://en.wikipedia.org/wiki/Operators_in_C_and_C%2B%2B#Comparison_operators.2Frelational_operators">Operators in C and C++</a>
 </li>
 
 
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/CompareWhereAssignMeant.ql b/cpp/ql/src/Likely Bugs/Likely Typos/CompareWhereAssignMeant.ql
index 46c271b11d7e..709545af661e 100644
--- a/cpp/ql/src/Likely Bugs/Likely Typos/CompareWhereAssignMeant.ql	
+++ b/cpp/ql/src/Likely Bugs/Likely Typos/CompareWhereAssignMeant.ql	
@@ -6,7 +6,8 @@
  * @problem.severity error
  * @precision high
  * @id cpp/compare-where-assign-meant
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       external/cwe/cwe-482
  */
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/DubiousNullCheck.ql b/cpp/ql/src/Likely Bugs/Likely Typos/DubiousNullCheck.ql
index 819ecbae8ec8..99c7753fa3bc 100644
--- a/cpp/ql/src/Likely Bugs/Likely Typos/DubiousNullCheck.ql	
+++ b/cpp/ql/src/Likely Bugs/Likely Typos/DubiousNullCheck.ql	
@@ -6,8 +6,9 @@
  * @problem.severity warning
  * @precision very-high
  * @id cpp/dubious-null-check
- * @tags reliability
- *       readability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import cpp
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/FutileConditional.ql b/cpp/ql/src/Likely Bugs/Likely Typos/FutileConditional.ql
index bf724de3d70c..137ae31d4d8d 100644
--- a/cpp/ql/src/Likely Bugs/Likely Typos/FutileConditional.ql	
+++ b/cpp/ql/src/Likely Bugs/Likely Typos/FutileConditional.ql	
@@ -6,8 +6,9 @@
  * @problem.severity recommendation
  * @precision high
  * @id cpp/empty-if
- * @tags reliability
- *       readability
+ * @tags quality
+ *       maintainability
+ *       useless-code
  */
 
 import cpp
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/ShortCircuitBitMask.ql b/cpp/ql/src/Likely Bugs/Likely Typos/ShortCircuitBitMask.ql
index a1b5d7b8f358..dea16e9606d5 100644
--- a/cpp/ql/src/Likely Bugs/Likely Typos/ShortCircuitBitMask.ql	
+++ b/cpp/ql/src/Likely Bugs/Likely Typos/ShortCircuitBitMask.ql	
@@ -6,7 +6,8 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/logical-operator-applied-to-flag
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       external/cwe/cwe-480
  */
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/UsingStrcpyAsBoolean.ql b/cpp/ql/src/Likely Bugs/Likely Typos/UsingStrcpyAsBoolean.ql
index 5b1d54b51f8f..3f633600667a 100644
--- a/cpp/ql/src/Likely Bugs/Likely Typos/UsingStrcpyAsBoolean.ql	
+++ b/cpp/ql/src/Likely Bugs/Likely Typos/UsingStrcpyAsBoolean.ql	
@@ -7,7 +7,9 @@
  * @problem.severity error
  * @precision high
  * @id cpp/string-copy-return-value-as-boolean
- * @tags correctness
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import cpp
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/inconsistentLoopDirection.ql b/cpp/ql/src/Likely Bugs/Likely Typos/inconsistentLoopDirection.ql
index 958d7aa3c559..7173dfb70c58 100644
--- a/cpp/ql/src/Likely Bugs/Likely Typos/inconsistentLoopDirection.ql	
+++ b/cpp/ql/src/Likely Bugs/Likely Typos/inconsistentLoopDirection.ql	
@@ -5,7 +5,9 @@
  * @problem.severity error
  * @precision high
  * @id cpp/inconsistent-loop-direction
- * @tags correctness
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-835
  * @msrc.severity important
  */
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/Padding/Suboptimal64BitType.ql b/cpp/ql/src/Likely Bugs/Memory Management/Padding/Suboptimal64BitType.ql
index f2cf4367d86d..5393c17b3ea3 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/Padding/Suboptimal64BitType.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/Padding/Suboptimal64BitType.ql	
@@ -14,7 +14,7 @@ from
   PaddedType t, Architecture arch, WideCharType wc, int holes, int size, int percentage, int optimum
 where
   arch.pointerSize() = 64 and // Select 64-bit architecture
-  arch.wideCharSize() = (wc.getSize() * 8) and // Select Windows(sizeof(wchar_t == 2)) or non-Windows(sizeof(wchar_t == 4))
+  arch.wideCharSize() = wc.getBitWidth() and // Select Windows(sizeof(wchar_t == 2)) or non-Windows(sizeof(wchar_t == 4))
   t.isPrecise() and
   optimum = t.optimalSize(arch) and
   size = arch.paddedSize(t) and
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/ReturnCstrOfLocalStdString.ql b/cpp/ql/src/Likely Bugs/Memory Management/ReturnCstrOfLocalStdString.ql
index feca6558ef6e..e028fc8219e1 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/ReturnCstrOfLocalStdString.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/ReturnCstrOfLocalStdString.ql	
@@ -8,7 +8,8 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/return-c-str-of-std-string
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  */
 
diff --git a/cpp/ql/src/Likely Bugs/OO/IncorrectConstructorDelegation.qhelp b/cpp/ql/src/Likely Bugs/OO/IncorrectConstructorDelegation.qhelp
index 88af1203ef9e..3c3c615cd1d6 100644
--- a/cpp/ql/src/Likely Bugs/OO/IncorrectConstructorDelegation.qhelp	
+++ b/cpp/ql/src/Likely Bugs/OO/IncorrectConstructorDelegation.qhelp	
@@ -60,7 +60,7 @@ public:
 
   <li>Dr Dobb's Journal: <a href="http://www.drdobbs.com/delegating-constructors/184401647">
     Delegating constructors?</a></li>
-  <li>Wikipedia: <a href="http://en.wikipedia.org/wiki/C%2B%2B11#Object_construction_improvement">
+  <li>Wikipedia: <a href="https://en.wikipedia.org/wiki/C%2B%2B11#Object_construction_improvement">
     Object construction improvement in C++11</a>.</li>
 
 
diff --git a/cpp/ql/src/Likely Bugs/OO/IncorrectConstructorDelegation.ql b/cpp/ql/src/Likely Bugs/OO/IncorrectConstructorDelegation.ql
index 38cd86a594d9..55d2d620e015 100644
--- a/cpp/ql/src/Likely Bugs/OO/IncorrectConstructorDelegation.ql	
+++ b/cpp/ql/src/Likely Bugs/OO/IncorrectConstructorDelegation.ql	
@@ -7,8 +7,9 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/constructor-delegation
- * @tags maintainability
- *       readability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       language-features
  */
 
diff --git a/cpp/ql/src/Likely Bugs/OO/NonVirtualDestructorInBaseClass.ql b/cpp/ql/src/Likely Bugs/OO/NonVirtualDestructorInBaseClass.ql
index 7a223f56f57b..366118513aa3 100644
--- a/cpp/ql/src/Likely Bugs/OO/NonVirtualDestructorInBaseClass.ql	
+++ b/cpp/ql/src/Likely Bugs/OO/NonVirtualDestructorInBaseClass.ql	
@@ -5,8 +5,9 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/virtual-destructor
- * @tags reliability
- *       readability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       language-features
  */
 
diff --git a/cpp/ql/src/Likely Bugs/OO/ThrowInDestructor.ql b/cpp/ql/src/Likely Bugs/OO/ThrowInDestructor.ql
index 75252eb45097..2b702d814e58 100644
--- a/cpp/ql/src/Likely Bugs/OO/ThrowInDestructor.ql	
+++ b/cpp/ql/src/Likely Bugs/OO/ThrowInDestructor.ql	
@@ -6,8 +6,10 @@
  * @problem.severity warning
  * @precision very-high
  * @id cpp/throw-in-destructor
- * @tags reliability
- *       readability
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       error-handling
  *       language-features
  */
 
diff --git a/cpp/ql/src/Likely Bugs/ReturnConstTypeMember.ql b/cpp/ql/src/Likely Bugs/ReturnConstTypeMember.ql
index 661abfd07e9c..45a65d3ea44e 100644
--- a/cpp/ql/src/Likely Bugs/ReturnConstTypeMember.ql	
+++ b/cpp/ql/src/Likely Bugs/ReturnConstTypeMember.ql	
@@ -5,8 +5,10 @@
  * @problem.severity warning
  * @precision very-high
  * @id cpp/member-const-no-effect
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
+ *       useless-code
  *       language-features
  */
 
diff --git a/cpp/ql/src/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.ql b/cpp/ql/src/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.ql
index 8e921faf2117..18b3799003b7 100644
--- a/cpp/ql/src/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.ql	
+++ b/cpp/ql/src/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.ql	
@@ -7,8 +7,9 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/implicit-function-declaration
- * @tags correctness
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import cpp
diff --git a/cpp/ql/src/Likely Bugs/Underspecified Functions/TooManyArguments.ql b/cpp/ql/src/Likely Bugs/Underspecified Functions/TooManyArguments.ql
index 4e7f85097b8e..59f745b14956 100644
--- a/cpp/ql/src/Likely Bugs/Underspecified Functions/TooManyArguments.ql	
+++ b/cpp/ql/src/Likely Bugs/Underspecified Functions/TooManyArguments.ql	
@@ -7,8 +7,9 @@
  * @problem.severity warning
  * @precision very-high
  * @id cpp/futile-params
- * @tags correctness
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import cpp
diff --git a/cpp/ql/src/Metrics/Files/FCommentRatio.qhelp b/cpp/ql/src/Metrics/Files/FCommentRatio.qhelp
index 4a5c928f5cd4..33829320b3e1 100644
--- a/cpp/ql/src/Metrics/Files/FCommentRatio.qhelp
+++ b/cpp/ql/src/Metrics/Files/FCommentRatio.qhelp
@@ -18,10 +18,10 @@ documenting the public functions first.</p>
 <references>
 
 <li>
-  <a href="http://en.wikibooks.org/wiki/C%2B%2B_Programming/Programming_Languages/C%2B%2B/Code/Style_Conventions#Comments">C++ Programming, Coding style conventions</a>
+  <a href="https://en.wikibooks.org/wiki/C%2B%2B_Programming/Programming_Languages/C%2B%2B/Code/Style_Conventions#Comments">C++ Programming, Coding style conventions</a>
 </li>
 <li>
-  <a href="http://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Need_for_comments">Wikipedia: Need for comments</a>
+  <a href="https://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Need_for_comments">Wikipedia: Need for comments</a>
 </li>
 
 
diff --git a/cpp/ql/src/Metrics/Files/FCyclomaticComplexity.qhelp b/cpp/ql/src/Metrics/Files/FCyclomaticComplexity.qhelp
index be463857db9a..6bd6e7b47183 100644
--- a/cpp/ql/src/Metrics/Files/FCyclomaticComplexity.qhelp
+++ b/cpp/ql/src/Metrics/Files/FCyclomaticComplexity.qhelp
@@ -67,10 +67,10 @@ T. J. McCabe, <em>A Complexity Measure</em>. IEEE Transactions on Software Engin
 Dave Thomas, <a href="http://www.jot.fm/issues/issue_2005_01/column1/">Refactoring as Meta Programming?</a>, in Journal of Object Technology, vol. 4, no. 1, January-February 2005, pp. 7-11.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Code_refactoring">Code refactoring</a>
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Code_refactoring">Code refactoring</a>
 </li>
 
 </references>
diff --git a/cpp/ql/src/Metrics/Files/FLinesOfCode.qhelp b/cpp/ql/src/Metrics/Files/FLinesOfCode.qhelp
index 4eb6c1c5b009..b8dfc4e70f24 100644
--- a/cpp/ql/src/Metrics/Files/FLinesOfCode.qhelp
+++ b/cpp/ql/src/Metrics/Files/FLinesOfCode.qhelp
@@ -19,7 +19,7 @@
   M. Fowler. <em>Refactoring</em>. Addison-Wesley, 1999.
 </li>
 <li>
-  <a href="http://en.wikipedia.org/wiki/Code_refactoring">Wikipedia: Code refactoring</a>
+  <a href="https://en.wikipedia.org/wiki/Code_refactoring">Wikipedia: Code refactoring</a>
 </li>
 <li>
   <a href="http://www.jot.fm/issues/issue_2005_01/column1/">Refactoring as Meta Programming?</a>
diff --git a/cpp/ql/src/Metrics/Files/FLinesOfComments.qhelp b/cpp/ql/src/Metrics/Files/FLinesOfComments.qhelp
index d1b1d9849181..ed7aabe9971c 100644
--- a/cpp/ql/src/Metrics/Files/FLinesOfComments.qhelp
+++ b/cpp/ql/src/Metrics/Files/FLinesOfComments.qhelp
@@ -18,10 +18,10 @@ should be given to long files.</p>
 <references>
 
 <li>
-  <a href="http://en.wikibooks.org/wiki/C%2B%2B_Programming/Programming_Languages/C%2B%2B/Code/Style_Conventions#Comments">C++ Programming, Coding style conventions</a>
+  <a href="https://en.wikibooks.org/wiki/C%2B%2B_Programming/Programming_Languages/C%2B%2B/Code/Style_Conventions#Comments">C++ Programming, Coding style conventions</a>
 </li>
 <li>
-  <a href="http://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Need_for_comments">Wikipedia: Need for comments</a>
+  <a href="https://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Need_for_comments">Wikipedia: Need for comments</a>
 </li>
 
 
diff --git a/cpp/ql/src/Metrics/Files/FTodoComments.qhelp b/cpp/ql/src/Metrics/Files/FTodoComments.qhelp
index a0906beb799e..7eb47a72c156 100644
--- a/cpp/ql/src/Metrics/Files/FTodoComments.qhelp
+++ b/cpp/ql/src/Metrics/Files/FTodoComments.qhelp
@@ -21,7 +21,7 @@ for fixing them.</p>
 <references>
 
 <li>
-  <a href="http://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Tags">Wikipedia: Comment tags</a>
+  <a href="https://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Tags">Wikipedia: Comment tags</a>
 </li>
 <li>
   <a href="http://www.approxion.com/?p=39">TODO or not TODO</a>
diff --git a/cpp/ql/src/Metrics/Functions/FunLinesOfComments.qhelp b/cpp/ql/src/Metrics/Functions/FunLinesOfComments.qhelp
index 6232b6bd4418..05728eb3ad33 100644
--- a/cpp/ql/src/Metrics/Functions/FunLinesOfComments.qhelp
+++ b/cpp/ql/src/Metrics/Functions/FunLinesOfComments.qhelp
@@ -18,10 +18,10 @@ should be given to long, complex functions.</p>
 <references>
 
 <li>
-  <a href="http://en.wikibooks.org/wiki/C%2B%2B_Programming/Programming_Languages/C%2B%2B/Code/Style_Conventions#Comments">C++ Programming, Coding style conventions</a>
+  <a href="https://en.wikibooks.org/wiki/C%2B%2B_Programming/Programming_Languages/C%2B%2B/Code/Style_Conventions#Comments">C++ Programming, Coding style conventions</a>
 </li>
 <li>
-  <a href="http://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Need_for_comments">Wikipedia: Need for comments</a>
+  <a href="https://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Need_for_comments">Wikipedia: Need for comments</a>
 </li>
 
 </references>
diff --git a/cpp/ql/src/Metrics/Functions/FunPercentageOfComments.qhelp b/cpp/ql/src/Metrics/Functions/FunPercentageOfComments.qhelp
index 5f998e3e476d..92bb1dc7e41f 100644
--- a/cpp/ql/src/Metrics/Functions/FunPercentageOfComments.qhelp
+++ b/cpp/ql/src/Metrics/Functions/FunPercentageOfComments.qhelp
@@ -17,10 +17,10 @@ documentation.</p>
 <references>
 
 <li>
-  <a href="http://en.wikibooks.org/wiki/C%2B%2B_Programming/Programming_Languages/C%2B%2B/Code/Style_Conventions#Comments">C++ Programming, Coding style conventions</a>
+  <a href="https://en.wikibooks.org/wiki/C%2B%2B_Programming/Programming_Languages/C%2B%2B/Code/Style_Conventions#Comments">C++ Programming, Coding style conventions</a>
 </li>
 <li>
-  <a href="http://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Need_for_comments">Wikipedia: Need for comments</a>
+  <a href="https://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Need_for_comments">Wikipedia: Need for comments</a>
 </li>
 
 </references>
diff --git a/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.qhelp b/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.qhelp
index 2e888bf80df5..f9153b95700e 100644
--- a/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.qhelp
+++ b/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.qhelp
@@ -34,7 +34,7 @@ should be safe against command injection.</p>
 Sanitize data passed to complex subsystems</a>.</li>
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 
 
diff --git a/cpp/ql/src/Security/CWE/CWE-079/CgiXss.qhelp b/cpp/ql/src/Security/CWE/CWE-079/CgiXss.qhelp
index 4ad7a40fed60..bfbc7c32746b 100644
--- a/cpp/ql/src/Security/CWE/CWE-079/CgiXss.qhelp
+++ b/cpp/ql/src/Security/CWE/CWE-079/CgiXss.qhelp
@@ -38,7 +38,7 @@ OWASP:
 (Cross Site Scripting) Prevention Cheat Sheet</a>.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 </li>
 <li>
 IETF Tools: <a href="http://tools.ietf.org/html/draft-robinson-www-interface-00">The Common Gateway Specification (CGI)</a>.</li>
diff --git a/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql b/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql
index 802888be271a..eb5d23b5fd6a 100644
--- a/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql
+++ b/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql
@@ -33,15 +33,20 @@ Expr asSinkExpr(DataFlow::Node node) {
   result = node.asExpr()
 }
 
+private predicate isSink(DataFlow::Node sink, string extraText) {
+  exists(SqlLikeFunction runSql, string callChain |
+    runSql.outermostWrapperFunctionCall(asSinkExpr(sink), callChain) and
+    extraText = " and then passed to " + callChain
+  )
+  or
+  // sink defined using models-as-data
+  sinkNode(sink, "sql-injection") and extraText = ""
+}
+
 module SqlTaintedConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) { node instanceof FlowSource }
 
-  predicate isSink(DataFlow::Node node) {
-    exists(SqlLikeFunction runSql | runSql.outermostWrapperFunctionCall(asSinkExpr(node), _))
-    or
-    // sink defined using models-as-data
-    sinkNode(node, "sql-injection")
-  }
+  predicate isSink(DataFlow::Node node) { isSink(node, _) }
 
   predicate isBarrier(DataFlow::Node node) {
     node.asExpr().getUnspecifiedType() instanceof IntegralType
@@ -57,32 +62,17 @@ module SqlTaintedConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(Expr taintedArg | result = [taintedArg.getLocation(), sink.getLocation()] |
-      taintedArg = asSinkExpr(sink)
-    )
-  }
 }
 
 module SqlTainted = TaintTracking::Global<SqlTaintedConfig>;
 
 from
-  Expr taintedArg, FlowSource taintSource, SqlTainted::PathNode sourceNode,
-  SqlTainted::PathNode sinkNode, string extraText
+  FlowSource taintSource, SqlTainted::PathNode sourceNode, SqlTainted::PathNode sinkNode,
+  string extraText
 where
-  (
-    exists(SqlLikeFunction runSql, string callChain |
-      runSql.outermostWrapperFunctionCall(taintedArg, callChain) and
-      extraText = " and then passed to " + callChain
-    )
-    or
-    sinkNode(sinkNode.getNode(), "sql-injection") and
-    extraText = ""
-  ) and
   SqlTainted::flowPath(sourceNode, sinkNode) and
-  taintedArg = asSinkExpr(sinkNode.getNode()) and
+  isSink(sinkNode.getNode(), extraText) and
   taintSource = sourceNode.getNode()
-select taintedArg, sourceNode, sinkNode,
+select sinkNode.getNode(), sourceNode, sinkNode,
   "This argument to a SQL query function is derived from $@" + extraText + ".", taintSource,
   "user input (" + taintSource.getSourceType() + ")"
diff --git a/cpp/ql/src/Security/CWE/CWE-311/ClearText.qll b/cpp/ql/src/Security/CWE/CWE-311/ClearText.qll
new file mode 100644
index 000000000000..32e7f24301ac
--- /dev/null
+++ b/cpp/ql/src/Security/CWE/CWE-311/ClearText.qll
@@ -0,0 +1,37 @@
+private import cpp
+private import semmle.code.cpp.dataflow.new.DataFlow
+
+/**
+ * Holds if `node` should be a barrier for the CWE-311 queries
+ * because it is of a non-char integral type.
+ */
+predicate isBarrier(DataFlow::Node node) {
+  exists(IntegralType type |
+    type = node.asCertainDefinition().getUnspecifiedType() and
+    not type instanceof CharType and
+    not type instanceof WideCharType and
+    not type instanceof Char8Type and
+    not type instanceof Char16Type and
+    not type instanceof Char32Type
+  )
+}
+
+private Expr asExprOrIndirectExpr(DataFlow::Node node, int indirectionIndex) {
+  indirectionIndex = 0 and
+  result = node.asExpr()
+  or
+  result = node.asIndirectExpr(indirectionIndex)
+}
+
+/**
+ * Holds if `source` is the relevant `DataFlow::Node` for
+ * expression `e`.
+ */
+predicate isSource(DataFlow::Node source, Expr e) {
+  exists(int indirectionIndex |
+    e = asExprOrIndirectExpr(source, indirectionIndex) and
+    if e.getUnspecifiedType() instanceof ReferenceType
+    then indirectionIndex = 1
+    else indirectionIndex = 0
+  )
+}
diff --git a/cpp/ql/src/Security/CWE/CWE-311/CleartextFileWrite.ql b/cpp/ql/src/Security/CWE/CWE-311/CleartextFileWrite.ql
index 17f4b7ae0fdb..83220002e29c 100644
--- a/cpp/ql/src/Security/CWE/CWE-311/CleartextFileWrite.ql
+++ b/cpp/ql/src/Security/CWE/CWE-311/CleartextFileWrite.ql
@@ -19,6 +19,7 @@ import semmle.code.cpp.ir.dataflow.DataFlow
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 import semmle.code.cpp.ir.dataflow.TaintTracking
 import FromSensitiveFlow::PathGraph
+import ClearText as ClearText
 
 /**
  * A taint flow configuration for flow from a sensitive expression to a `FileWrite` sink.
@@ -28,9 +29,7 @@ module FromSensitiveConfig implements DataFlow::ConfigSig {
 
   predicate isSink(DataFlow::Node sink) { isSinkImpl(sink, _, _) }
 
-  predicate isBarrier(DataFlow::Node node) {
-    node.asExpr().getUnspecifiedType() instanceof IntegralType
-  }
+  predicate isBarrier = ClearText::isBarrier/1;
 
   predicate observeDiffInformedIncrementalMode() { any() }
 
@@ -61,7 +60,7 @@ predicate isSinkImpl(DataFlow::Node sink, FileWrite w, Expr dest) {
 
 predicate isSourceImpl(DataFlow::Node source, SensitiveExpr sensitive) {
   not isFileName(globalValueNumber(sensitive)) and // file names are not passwords
-  source.asExpr() = sensitive
+  ClearText::isSource(source, sensitive)
 }
 
 /**
diff --git a/cpp/ql/src/Security/CWE/CWE-311/CleartextTransmission.ql b/cpp/ql/src/Security/CWE/CWE-311/CleartextTransmission.ql
index 207aec189b2e..1182628cc837 100644
--- a/cpp/ql/src/Security/CWE/CWE-311/CleartextTransmission.ql
+++ b/cpp/ql/src/Security/CWE/CWE-311/CleartextTransmission.ql
@@ -19,6 +19,7 @@ import semmle.code.cpp.ir.dataflow.TaintTracking
 import semmle.code.cpp.models.interfaces.FlowSource
 import semmle.code.cpp.commons.File
 import FromSensitiveFlow::PathGraph
+import ClearText as ClearText
 
 class SourceVariable extends Variable {
   SourceVariable() {
@@ -218,12 +219,12 @@ predicate isSinkEncrypt(DataFlow::Node sink, Encrypted enc) { sink.asExpr() = en
  * function returning sensitive data.
  */
 predicate isSourceImpl(DataFlow::Node source) {
-  exists(VariableAccess e |
-    e = source.asExpr() and
-    e.getTarget() instanceof SourceVariable
+  exists(Expr e |
+    e.(VariableAccess).getTarget() instanceof SourceVariable or
+    e.(FunctionCall).getTarget() instanceof SourceFunction
+  |
+    ClearText::isSource(source, e)
   )
-  or
-  source.asExpr().(FunctionCall).getTarget() instanceof SourceFunction
 }
 
 /**
@@ -235,9 +236,7 @@ module FromSensitiveConfig implements DataFlow::ConfigSig {
 
   predicate isSink(DataFlow::Node sink) { isSinkSendRecv(sink, _) }
 
-  predicate isBarrier(DataFlow::Node node) {
-    node.asExpr().getUnspecifiedType() instanceof IntegralType
-  }
+  predicate isBarrier = ClearText::isBarrier/1;
 
   predicate isBarrierIn(DataFlow::Node node) {
     // As any use of a sensitive variable is a potential source, we need to block flow into
@@ -266,9 +265,7 @@ module ToEncryptionConfig implements DataFlow::ConfigSig {
 
   predicate isSink(DataFlow::Node sink) { isSinkEncrypt(sink, _) }
 
-  predicate isBarrier(DataFlow::Node node) {
-    node.asExpr().getUnspecifiedType() instanceof IntegralType
-  }
+  predicate isBarrier = ClearText::isBarrier/1;
 
   predicate isBarrierIn(DataFlow::Node node) {
     // As any use of a sensitive variable is a potential source, we need to block flow into
@@ -291,9 +288,7 @@ module FromEncryptionConfig implements DataFlow::ConfigSig {
 
   predicate isSink(DataFlow::Node sink) { FromSensitiveFlow::flowTo(sink) }
 
-  predicate isBarrier(DataFlow::Node node) {
-    node.asExpr().getUnspecifiedType() instanceof IntegralType
-  }
+  predicate isBarrier = ClearText::isBarrier/1;
 
   predicate observeDiffInformedIncrementalMode() {
     none() // only used negatively
diff --git a/cpp/ql/src/Security/CWE/CWE-319/UseOfHttp.ql b/cpp/ql/src/Security/CWE/CWE-319/UseOfHttp.ql
index 682d83874333..1cb3be1f0c91 100644
--- a/cpp/ql/src/Security/CWE/CWE-319/UseOfHttp.ql
+++ b/cpp/ql/src/Security/CWE/CWE-319/UseOfHttp.ql
@@ -35,22 +35,25 @@ predicate privateHostNameFlowsToExpr(Expr e) {
   TaintTracking::localExprTaint(any(StringLiteral p | p.getValue() instanceof PrivateHostName), e)
 }
 
-/**
- * A string containing an HTTP URL not in a private domain.
- */
-class HttpStringLiteral extends StringLiteral {
-  HttpStringLiteral() {
+private class HttpStringLiteralCandidate extends StringLiteral {
+  HttpStringLiteralCandidate() {
     exists(string s | this.getValue() = s |
       s = "http"
       or
       exists(string tail |
         tail = s.regexpCapture("http://(.*)", 1) and not tail instanceof PrivateHostName
       )
-    ) and
-    not privateHostNameFlowsToExpr(this.getParent*())
+    )
   }
 }
 
+/**
+ * A string containing an HTTP URL not in a private domain.
+ */
+class HttpStringLiteral extends HttpStringLiteralCandidate {
+  HttpStringLiteral() { not privateHostNameFlowsToExpr(this.getParent*()) }
+}
+
 /**
  * Taint tracking configuration for HTTP connections.
  */
diff --git a/cpp/ql/src/Security/CWE/CWE-468/IncorrectPointerScaling.ql b/cpp/ql/src/Security/CWE/CWE-468/IncorrectPointerScaling.ql
index a8f71c4e1d0d..49ab69ff2490 100644
--- a/cpp/ql/src/Security/CWE/CWE-468/IncorrectPointerScaling.ql
+++ b/cpp/ql/src/Security/CWE/CWE-468/IncorrectPointerScaling.ql
@@ -22,11 +22,12 @@ where
   destBase = baseType(destType) and
   destBase.getSize() != sourceBase.getSize() and
   not dest.isInMacroExpansion() and
-  // If the source type is a `char*` or `void*` then don't
+  // If the source type is a `char*`, `void*` or `std::byte*` then don't
   // produce a result, because it is likely to be a false
   // positive.
   not sourceBase instanceof CharType and
   not sourceBase instanceof VoidType and
+  not sourceBase.(Enum).hasQualifiedName("std", "byte") and
   // Low-level pointer tricks often involve casting a struct pointer to a
   // char pointer, then accessing it at byte offsets. For example, this can
   // be necessary in order to resume an interrupted `write(2)`.
diff --git a/cpp/ql/src/Security/CWE/CWE-676/DangerousFunctionOverflow.qhelp b/cpp/ql/src/Security/CWE/CWE-676/DangerousFunctionOverflow.qhelp
index 17b34f1f37e7..72a559d43e2b 100644
--- a/cpp/ql/src/Security/CWE/CWE-676/DangerousFunctionOverflow.qhelp
+++ b/cpp/ql/src/Security/CWE/CWE-676/DangerousFunctionOverflow.qhelp
@@ -36,7 +36,7 @@ rules for the following CWEs:</p>
 
 </section>
 <references>
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Morris_worm">Morris worm</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Morris_worm">Morris worm</a>.</li>
 <li>E. Spafford. <i>The Internet Worm Program: An Analysis</i>. Purdue Technical Report CSD-TR-823, <a href="http://www.textfiles.com/100/tr823.txt">(online)</a>, 1988.</li>
 </references>
 </qhelp>
diff --git a/cpp/ql/src/change-notes/2026-10-29-unused-variable-initializers.md b/cpp/ql/src/change-notes/2026-10-29-unused-variable-initializers.md
new file mode 100644
index 000000000000..1cc9f421d377
--- /dev/null
+++ b/cpp/ql/src/change-notes/2026-10-29-unused-variable-initializers.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `cpp/unused-local-variable` and `cpp/unused-static-variable` queries no longer report variables whose initializers may have side effects.
diff --git a/cpp/ql/src/change-notes/2026-10-30-unused-static-compiler-generated.md b/cpp/ql/src/change-notes/2026-10-30-unused-static-compiler-generated.md
new file mode 100644
index 000000000000..4ede33c64a12
--- /dev/null
+++ b/cpp/ql/src/change-notes/2026-10-30-unused-static-compiler-generated.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `cpp/unused-static-variable` query no longer reports compiler-generated variables, such as placeholders for empty function parameter packs.
diff --git a/cpp/ql/src/change-notes/2026-11-04-char-types-cwe-311.md b/cpp/ql/src/change-notes/2026-11-04-char-types-cwe-311.md
new file mode 100644
index 000000000000..f23f0f3b005e
--- /dev/null
+++ b/cpp/ql/src/change-notes/2026-11-04-char-types-cwe-311.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `cpp/cleartext-transmission` and `cpp/cleartext-storage-file` queries now track flow through character types. As a result, these queries may find additional results.
\ No newline at end of file
diff --git a/cpp/ql/src/change-notes/released/1.10.0.md b/cpp/ql/src/change-notes/released/1.10.0.md
new file mode 100644
index 000000000000..17b337e8419f
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.10.0.md
@@ -0,0 +1,10 @@
+## 1.10.0
+
+### Query Metadata Changes
+
+* Added a new `cpp-code-quality` query suite containing queries that identify maintainability and reliability issues in C and C++ code.
+
+### Minor Analysis Improvements
+
+* The `cpp/suspicious-pointer-scaling` query no longer reports false positives for intentional pointer arithmetic from `std::byte*` buffers.
+* The `cpp/unused-local-variable` and `cpp/unused-static-variable` queries no longer report variables marked with the C++17 `[[maybe_unused]]` attribute.
diff --git a/cpp/ql/src/change-notes/released/1.8.1.md b/cpp/ql/src/change-notes/released/1.8.1.md
new file mode 100644
index 000000000000..0b1a7cdad10a
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.8.1.md
@@ -0,0 +1,3 @@
+## 1.8.1
+
+No user-facing changes.
diff --git a/cpp/ql/src/change-notes/released/1.8.2.md b/cpp/ql/src/change-notes/released/1.8.2.md
new file mode 100644
index 000000000000..12e641fd7205
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.8.2.md
@@ -0,0 +1,3 @@
+## 1.8.2
+
+No user-facing changes.
diff --git a/cpp/ql/src/change-notes/released/1.8.3.md b/cpp/ql/src/change-notes/released/1.8.3.md
new file mode 100644
index 000000000000..46bddcbc40ea
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.8.3.md
@@ -0,0 +1,5 @@
+## 1.8.3
+
+### Minor Analysis Improvements
+
+* The `cpp/leap-year/unsafe-array-for-days-of-the-year` query ("Unsafe array for days of the year") no longer reports an alert on the `__PRETTY_FUNCTION__` variable (and related variables) when the enclosing function has a signature that is exactly 364 characters.
diff --git a/cpp/ql/src/change-notes/released/1.9.0.md b/cpp/ql/src/change-notes/released/1.9.0.md
new file mode 100644
index 000000000000..61431fce84ed
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.9.0.md
@@ -0,0 +1,7 @@
+## 1.9.0
+
+### New Queries
+
+* Added a new query, `cpp/ambiguous-assignment-of-comparison`, to detect potentially
+  ambiguous expressions where a comparison result is assigned to a variable and the
+  assignment is used as a truth value.
diff --git a/cpp/ql/src/change-notes/released/1.9.1.md b/cpp/ql/src/change-notes/released/1.9.1.md
new file mode 100644
index 000000000000..bc5c4bd30411
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.9.1.md
@@ -0,0 +1,3 @@
+## 1.9.1
+
+No user-facing changes.
diff --git a/cpp/ql/src/change-notes/released/1.9.2.md b/cpp/ql/src/change-notes/released/1.9.2.md
new file mode 100644
index 000000000000..297a6627e0b5
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.9.2.md
@@ -0,0 +1,5 @@
+## 1.9.2
+
+### Minor Analysis Improvements
+
+* The `cpp/resource-not-released-in-destructor` query now recognizes resources released through local aliases, reducing false-positive results.
diff --git a/cpp/ql/src/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
index dc8a37cc443d..753e9ac28449 100644
--- a/cpp/ql/src/codeql-pack.release.yml
+++ b/cpp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.8.0
+lastReleaseVersion: 1.10.0
diff --git a/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls b/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls
index b4f85c4e306e..d6df483208da 100644
--- a/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls
+++ b/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls
@@ -1,5 +1,92 @@
 - description: Security-and-quality queries for C and C++
 - queries: .
-- apply: security-and-quality-selectors.yml
+- apply: security-and-frozen-quality-selectors.yml
   from: codeql/suite-helpers
+- include:
+    id:
+      - cpp/ambiguous-assignment-of-comparison
+      - cpp/ambiguously-signed-bit-field
+      - cpp/array-arg-size-mismatch
+      - cpp/array-in-interface
+      - cpp/assign-where-compare-meant
+      - cpp/assignment-does-not-return-this
+      - cpp/bitwise-sign-check
+      - cpp/catch-by-value
+      - cpp/catch-missing-free
+      - cpp/commented-out-code
+      - cpp/compare-where-assign-meant
+      - cpp/comparison-of-identical-expressions
+      - cpp/comparison-precedence
+      - cpp/complex-block
+      - cpp/complex-condition
+      - cpp/constant-comparison
+      - cpp/constructor-delegation
+      - cpp/continue-in-false-loop
+      - cpp/dead-code-goto
+      - cpp/declaration-hides-parameter
+      - cpp/declaration-hides-variable
+      - cpp/dubious-null-check
+      - cpp/duplicate-include-guard
+      - cpp/empty-block
+      - cpp/empty-if
+      - cpp/equality-on-floats
+      - cpp/fixme-comment
+      - cpp/function-in-block
+      - cpp/futile-params
+      - cpp/guarded-free
+      - cpp/implicit-bitfield-downcast
+      - cpp/implicit-function-declaration
+      - cpp/include-non-header
+      - cpp/incomplete-parity-check
+      - cpp/inconsistent-call-on-result
+      - cpp/inconsistent-loop-direction
+      - cpp/inconsistent-null-check
+      - cpp/inconsistent-virtual-inheritance
+      - cpp/integer-used-for-enum
+      - cpp/irregular-enum-init
+      - cpp/large-parameter
+      - cpp/leap-year/adding-365-days-per-year
+      - cpp/leap-year/unchecked-after-arithmetic-year-modification
+      - cpp/leap-year/unchecked-return-value-for-time-conversion-function
+      - cpp/local-variable-hides-global-variable
+      - cpp/logical-operator-applied-to-flag
+      - cpp/long-switch
+      - cpp/loop-variable-changed
+      - cpp/loop-variable-float
+      - cpp/lossy-function-result-cast
+      - cpp/lossy-pointer-cast
+      - cpp/member-const-no-effect
+      - cpp/missing-case-in-switch
+      - cpp/missing-header-guard
+      - cpp/missing-return
+      - cpp/mistyped-function-arguments
+      - cpp/nested-loops-with-same-variable
+      - cpp/new-array-delete-mismatch
+      - cpp/new-delete-array-mismatch
+      - cpp/non-member-const-no-effect
+      - cpp/poorly-documented-function
+      - cpp/redefined-default-parameter
+      - cpp/resource-not-released-in-destructor
+      - cpp/rethrow-no-exception
+      - cpp/return-c-str-of-std-string
+      - cpp/rule-of-two
+      - cpp/short-global-name
+      - cpp/sizeof-side-effect
+      - cpp/slicing
+      - cpp/stack-address-escape
+      - cpp/string-copy-return-value-as-boolean
+      - cpp/throw-in-destructor
+      - cpp/throwing-pointer
+      - cpp/too-many-format-arguments
+      - cpp/trivial-switch
+      - cpp/undisciplined-multiple-inheritance
+      - cpp/unsigned-comparison-zero
+      - cpp/unused-local-variable
+      - cpp/unused-static-function
+      - cpp/unused-static-variable
+      - cpp/use-in-own-initializer
+      - cpp/use-of-goto
+      - cpp/useless-expression
+      - cpp/virtual-call-in-constructor
+      - cpp/virtual-destructor
 - apply: codeql-suites/exclude-slow-queries.yml
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-078/WordexpTainted.qhelp b/cpp/ql/src/experimental/Security/CWE/CWE-078/WordexpTainted.qhelp
index 6dd9662c57d5..eb13e3785542 100644
--- a/cpp/ql/src/experimental/Security/CWE/CWE-078/WordexpTainted.qhelp
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-078/WordexpTainted.qhelp
@@ -31,7 +31,7 @@ is performed, making this safe from command injection.</p>
 Sanitize data passed to complex subsystems</a>.</li>
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 
 
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpy.qhelp b/cpp/ql/src/experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpy.qhelp
new file mode 100644
index 000000000000..9b1dcdc4cdf4
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpy.qhelp
@@ -0,0 +1,28 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p>
+Firmware and embedded drivers often copy data into buffers using lengths read from
+allowlisted MMIO register macros such as <code>READ_REG</code> or <code>GET_MMIO</code>.
+When those lengths are not validated against the destination buffer size, an attacker who
+can influence hardware registers or DMA metadata can trigger buffer overflows.
+</p>
+</overview>
+<recommendation>
+<p>
+Always validate MMIO/DMA-derived lengths before passing them to <code>memcpy</code>,
+<code>memmove</code>, or <code>strncpy</code>. Compare against a compile-time maximum
+and reject or clamp out-of-range values before copying.
+</p>
+</recommendation>
+<example>
+<p>Bad: length from an MMIO register used directly as the copy size.</p>
+<sample src="MmioUnsanitizedMemcpyBad.c" />
+<p>Good: defensive bounds check before the copy.</p>
+<sample src="MmioUnsanitizedMemcpyGood.c" />
+</example>
+<references>
+</references>
+</qhelp>
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpy.ql b/cpp/ql/src/experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpy.ql
new file mode 100644
index 000000000000..67a0c98e2db4
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpy.ql
@@ -0,0 +1,64 @@
+/**
+ * @name MMIO/DMA unsanitized memory copy
+ * @description Memory copy sizes derived from allowlisted MMIO/DMA register-read
+ *              macros without bounds validation may overflow destination buffers.
+ * @kind path-problem
+ * @problem.severity error
+ * @precision low
+ * @id cpp/mmio-unsanitized-memcpy
+ * @tags security
+ *       experimental
+ *       external/cwe/cwe-120
+ *       external/cwe/cwe-787
+ */
+
+import cpp
+import semmle.code.cpp.dataflow.new.TaintTracking
+import semmle.code.cpp.controlflow.IRGuards
+import MmioFlow::PathGraph
+
+/** Holds if `source` reads MMIO/DMA state through an allowlisted register macro. */
+predicate isMmioSource(DataFlow::Node source) {
+  exists(MacroInvocation mi |
+    mi.getMacro().hasName(["READ_REG", "GET_MMIO", "REG_READ", "DMA_READ"]) and
+    source.asExpr() = mi.getExpr()
+  )
+}
+
+predicate isMemcpySizeSink(DataFlow::Node sink, FunctionCall fc) {
+  fc.getTarget().hasName(["memcpy", "memmove", "strncpy", "wmemcpy", "wmemmove"]) and
+  sink.asExpr() = fc.getArgument(2)
+}
+
+/** Recognizes relational comparison bounds checks using public IRGuards API. */
+predicate lessThanOrEqual(IRGuardCondition g, Expr e, boolean branch) {
+  exists(Operand left |
+    g.comparesLt(left, _, _, true, branch) or
+    g.comparesEq(left, _, _, true, branch)
+  |
+    left.getDef().getConvertedResultExpression() = e
+  )
+}
+
+module MmioConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { isMmioSource(source) }
+
+  predicate isSink(DataFlow::Node sink) { isMemcpySizeSink(sink, _) }
+
+  predicate isBarrier(DataFlow::Node node) {
+    node = DataFlow::BarrierGuard<lessThanOrEqual/3>::getABarrierNode() or
+    node = DataFlow::BarrierGuard<lessThanOrEqual/3>::getAnIndirectBarrierNode()
+  }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+}
+
+module MmioFlow = TaintTracking::Global<MmioConfig>;
+
+from FunctionCall memcpyCall, MmioFlow::PathNode source, MmioFlow::PathNode sink
+where
+  MmioFlow::flowPath(source, sink) and
+  isMemcpySizeSink(sink.getNode(), memcpyCall)
+select sink.getNode(), source, sink,
+  "Memory copy size argument is derived from $@ without sufficient bounds validation.",
+  source.getNode(), "an MMIO/DMA hardware register read"
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpyBad.c b/cpp/ql/src/experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpyBad.c
new file mode 100644
index 000000000000..13e68fc7561d
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpyBad.c
@@ -0,0 +1,9 @@
+#define READ_REG(addr) (*(volatile unsigned int *)(addr))
+#define MAX_DMA_LEN 64
+
+void *memcpy(void *dest, const void *src, unsigned long n);
+
+void bad_mmio_memcpy(char *dst, char *src) {
+  unsigned int len = READ_REG(0x40001000);
+  memcpy(dst, src, len);
+}
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpyGood.c b/cpp/ql/src/experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpyGood.c
new file mode 100644
index 000000000000..38c37a3f3c64
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpyGood.c
@@ -0,0 +1,10 @@
+#define READ_REG(addr) (*(volatile unsigned int *)(addr))
+#define MAX_DMA_LEN 64
+
+void *memcpy(void *dest, const void *src, unsigned long n);
+
+void good_mmio_memcpy(char *dst, char *src) {
+  unsigned int len = READ_REG(0x40001000);
+  if (len <= MAX_DMA_LEN)
+    memcpy(dst, src, len);
+}
diff --git a/cpp/ql/src/jsf/4.07 Header Files/AV Rule 35.ql b/cpp/ql/src/jsf/4.07 Header Files/AV Rule 35.ql
index 59a6838c23e3..4f86f64bc435 100644
--- a/cpp/ql/src/jsf/4.07 Header Files/AV Rule 35.ql	
+++ b/cpp/ql/src/jsf/4.07 Header Files/AV Rule 35.ql	
@@ -7,7 +7,8 @@
  * @problem.severity recommendation
  * @precision high
  * @id cpp/missing-header-guard
- * @tags efficiency
+ * @tags quality
+ *       efficiency
  *       maintainability
  *       modularity
  *       external/jsf
diff --git a/cpp/ql/src/jsf/4.10 Classes/AV Rule 71.1.ql b/cpp/ql/src/jsf/4.10 Classes/AV Rule 71.1.ql
index ec7d446ac58a..761879c98702 100644
--- a/cpp/ql/src/jsf/4.10 Classes/AV Rule 71.1.ql	
+++ b/cpp/ql/src/jsf/4.10 Classes/AV Rule 71.1.ql	
@@ -5,7 +5,9 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/virtual-call-in-constructor
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       readability
  *       language-features
  *       external/jsf
diff --git a/cpp/ql/src/jsf/4.10 Classes/AV Rule 79.qhelp b/cpp/ql/src/jsf/4.10 Classes/AV Rule 79.qhelp
index a5b94460d43b..aa58cc17cbc7 100644
--- a/cpp/ql/src/jsf/4.10 Classes/AV Rule 79.qhelp	
+++ b/cpp/ql/src/jsf/4.10 Classes/AV Rule 79.qhelp	
@@ -87,7 +87,7 @@ to a straightforward RAII pattern. This can be achieved in several steps:</p>
   S. Meyers. <em>Effective C++ 3d ed.</em> pp 61-66. Addison-Wesley Professional, 2005.
 </li>
 <li>
-  <a href="http://en.wikipedia.org/wiki/Resource_Acquisition_Is_Initialization">Resource Acquisition Is Initialization</a>
+  <a href="https://en.wikipedia.org/wiki/Resource_Acquisition_Is_Initialization">Resource Acquisition Is Initialization</a>
 </li>
 
 
diff --git a/cpp/ql/src/jsf/4.10 Classes/AV Rule 79.ql b/cpp/ql/src/jsf/4.10 Classes/AV Rule 79.ql
index 85b779903ebf..c0014f5f3464 100644
--- a/cpp/ql/src/jsf/4.10 Classes/AV Rule 79.ql	
+++ b/cpp/ql/src/jsf/4.10 Classes/AV Rule 79.ql	
@@ -5,8 +5,10 @@
  * @problem.severity warning
  * @precision high
  * @id cpp/resource-not-released-in-destructor
- * @tags efficiency
- *       readability
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       efficiency
  *       external/cwe/cwe-404
  *       external/jsf
  */
@@ -89,7 +91,7 @@ Expr exprOrDereference(Expr e) {
  */
 private predicate exprReleases(Expr e, Expr released, string kind) {
   // `e` is a call to a release function and `released` is the released argument
-  releaseExpr(e, released, kind)
+  releaseExpr(e, pragma[only_bind_into](globalValueNumber(released).getAnExpr()), kind)
   or
   exists(int arg, VariableAccess access, Function f |
     // `e` is a call to a function that releases one of it's parameters,
diff --git a/cpp/ql/src/jsf/4.20 Unions and Bit Fields/AV Rule 154.ql b/cpp/ql/src/jsf/4.20 Unions and Bit Fields/AV Rule 154.ql
index cd08362ad35a..87086db9e9a9 100644
--- a/cpp/ql/src/jsf/4.20 Unions and Bit Fields/AV Rule 154.ql	
+++ b/cpp/ql/src/jsf/4.20 Unions and Bit Fields/AV Rule 154.ql	
@@ -22,7 +22,7 @@ where
   not bf.getUnderlyingType() instanceof Enum and
   not bf.getUnspecifiedType() instanceof BoolType and
   not bf.getType().hasName("BOOL") and // At least for C programs on Windows, BOOL is a common typedef for a type representing BoolType.
-  not bf.getDeclaredNumBits() = bf.getType().getSize() * 8 and // If this is true, then there cannot be unsigned sign extension or overflow.
+  not bf.getDeclaredNumBits() = bf.getType().getBitWidth() and // If this is true, then there cannot be unsigned sign extension or overflow.
   not bf.isAnonymous()
 select bf,
   "Bit field " + bf.getName() + " of type " + bf.getUnderlyingType().getName() +
diff --git a/cpp/ql/src/jsf/4.23 Type Conversions/AV Rule 180.ql b/cpp/ql/src/jsf/4.23 Type Conversions/AV Rule 180.ql
index 16727add3fff..7e03caef0b91 100644
--- a/cpp/ql/src/jsf/4.23 Type Conversions/AV Rule 180.ql	
+++ b/cpp/ql/src/jsf/4.23 Type Conversions/AV Rule 180.ql	
@@ -61,10 +61,10 @@ class ImplicitConversion extends Expr {
   int getSourceSize() {
     if this instanceof IntConstantExpr
     then result = this.(IntConstantExpr).getRequiredSizeBits()
-    else result = this.getUnderlyingSourceType().getSize() * 8
+    else result = this.getUnderlyingSourceType().getBitWidth()
   }
 
-  int getTargetSize() { result = this.getUnderlyingTargetType().getSize() * 8 }
+  int getTargetSize() { result = this.getUnderlyingTargetType().getBitWidth() }
 
   predicate isSourceSignedInt() {
     if this instanceof IntConstantExpr
diff --git a/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 197.ql b/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 197.ql
index 4f76b4c10eaa..17f6b41b5c7d 100644
--- a/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 197.ql	
+++ b/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 197.ql	
@@ -5,7 +5,8 @@
  * @problem.severity recommendation
  * @precision high
  * @id cpp/loop-variable-float
- * @tags correctness
+ * @tags quality
+ *       correctness
  *       reliability
  *       external/jsf
  */
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index ad0a0cd8943b..0bc1233931a4 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.8.1-dev
+version: 1.10.1-dev
 groups:
   - cpp
   - queries
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-120/MmioUnsanitizedMemcpy/MmioUnsanitizedMemcpy.expected b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-120/MmioUnsanitizedMemcpy/MmioUnsanitizedMemcpy.expected
new file mode 100644
index 000000000000..322b2ef7c419
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-120/MmioUnsanitizedMemcpy/MmioUnsanitizedMemcpy.expected
@@ -0,0 +1,28 @@
+#select
+| test.c:26:20:26:22 | len | test.c:25:18:25:37 | * ... | test.c:26:20:26:22 | len | Memory copy size argument is derived from $@ without sufficient bounds validation. | test.c:25:18:25:37 | * ... | an MMIO/DMA hardware register read |
+| test.c:31:21:31:23 | len | test.c:30:18:30:37 | * ... | test.c:31:21:31:23 | len | Memory copy size argument is derived from $@ without sufficient bounds validation. | test.c:30:18:30:37 | * ... | an MMIO/DMA hardware register read |
+| test.c:36:21:36:23 | len | test.c:35:18:35:37 | * ... | test.c:36:21:36:23 | len | Memory copy size argument is derived from $@ without sufficient bounds validation. | test.c:35:18:35:37 | * ... | an MMIO/DMA hardware register read |
+| test.c:41:20:41:22 | len | test.c:40:18:40:37 | * ... | test.c:41:20:41:22 | len | Memory copy size argument is derived from $@ without sufficient bounds validation. | test.c:40:18:40:37 | * ... | an MMIO/DMA hardware register read |
+edges
+| test.c:25:18:25:37 | * ... | test.c:25:18:25:37 | * ... | provenance |  |
+| test.c:25:18:25:37 | * ... | test.c:26:20:26:22 | len | provenance |  |
+| test.c:30:18:30:37 | * ... | test.c:30:18:30:37 | * ... | provenance |  |
+| test.c:30:18:30:37 | * ... | test.c:31:21:31:23 | len | provenance |  |
+| test.c:35:18:35:37 | * ... | test.c:35:18:35:37 | * ... | provenance |  |
+| test.c:35:18:35:37 | * ... | test.c:36:21:36:23 | len | provenance |  |
+| test.c:40:18:40:37 | * ... | test.c:40:18:40:37 | * ... | provenance |  |
+| test.c:40:18:40:37 | * ... | test.c:41:20:41:22 | len | provenance |  |
+nodes
+| test.c:25:18:25:37 | * ... | semmle.label | * ... |
+| test.c:25:18:25:37 | * ... | semmle.label | * ... |
+| test.c:26:20:26:22 | len | semmle.label | len |
+| test.c:30:18:30:37 | * ... | semmle.label | * ... |
+| test.c:30:18:30:37 | * ... | semmle.label | * ... |
+| test.c:31:21:31:23 | len | semmle.label | len |
+| test.c:35:18:35:37 | * ... | semmle.label | * ... |
+| test.c:35:18:35:37 | * ... | semmle.label | * ... |
+| test.c:36:21:36:23 | len | semmle.label | len |
+| test.c:40:18:40:37 | * ... | semmle.label | * ... |
+| test.c:40:18:40:37 | * ... | semmle.label | * ... |
+| test.c:41:20:41:22 | len | semmle.label | len |
+subpaths
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-120/MmioUnsanitizedMemcpy/MmioUnsanitizedMemcpy.qlref b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-120/MmioUnsanitizedMemcpy/MmioUnsanitizedMemcpy.qlref
new file mode 100644
index 000000000000..671ab2524272
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-120/MmioUnsanitizedMemcpy/MmioUnsanitizedMemcpy.qlref
@@ -0,0 +1,2 @@
+query: experimental/Security/CWE/CWE-120/MmioUnsanitizedMemcpy.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-120/MmioUnsanitizedMemcpy/test.c b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-120/MmioUnsanitizedMemcpy/test.c
new file mode 100644
index 000000000000..bf5c1bb583f4
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-120/MmioUnsanitizedMemcpy/test.c
@@ -0,0 +1,83 @@
+/* Test case for MmioUnsanitizedMemcpy.ql
+ * Allowlisted MMIO/DMA register macros flowing into memcpy/memmove/strncpy size parameters.
+ */
+
+typedef unsigned int uint32_t;
+
+void *memcpy(void *dest, const void *src, unsigned long n);
+void *memmove(void *dest, const void *src, unsigned long n);
+char *strncpy(char *dest, const char *src, unsigned long n);
+
+#define READ_REG(addr) (*(volatile uint32_t *)(addr))
+#define GET_MMIO(addr) (*(volatile uint32_t *)(addr))
+#define REG_READ(addr) (*(volatile uint32_t *)(addr))
+#define DMA_READ(addr) (*(volatile uint32_t *)(addr))
+#define MAX_DMA_LEN 64
+
+struct VolatileField {
+  volatile uint32_t len;
+};
+
+volatile uint32_t mmio_len_reg;
+struct VolatileField vf;
+
+static void bad_read_reg(char *dst, char *src) {
+  uint32_t len = READ_REG(0x40001000); // $ Source
+  memcpy(dst, src, len); // $ Alert
+}
+
+static void bad_get_mmio(char *dst, char *src) {
+  uint32_t len = GET_MMIO(0x50000000); // $ Source
+  memmove(dst, src, len); // $ Alert
+}
+
+static void bad_reg_read(char *dst, char *src) {
+  uint32_t len = REG_READ(0x51000000); // $ Source
+  strncpy(dst, src, len); // $ Alert
+}
+
+static void bad_dma_read(char *dst, char *src) {
+  uint32_t len = DMA_READ(0x60000000); // $ Source
+  memcpy(dst, src, len); // $ Alert
+}
+
+static void good_bounded(char *dst, char *src) {
+  uint32_t len = READ_REG(0x40001000);
+  if (len <= MAX_DMA_LEN)
+    memcpy(dst, src, len); // GOOD
+}
+
+static void good_early_return(char *dst, char *src) {
+  uint32_t len = DMA_READ(0x60000000);
+  if (len > MAX_DMA_LEN)
+    return;
+  memcpy(dst, src, len); // GOOD
+}
+
+static void good_constant_size(char *dst, char *src) {
+  uint32_t len = READ_REG(0x40001000);
+  memcpy(dst, src, 32); // GOOD
+}
+
+static void negative_volatile_global(char *dst, char *src) {
+  uint32_t len = mmio_len_reg;
+  memcpy(dst, src, len); // GOOD
+}
+
+static void negative_volatile_field(char *dst, char *src) {
+  uint32_t len = vf.len;
+  memcpy(dst, src, len); // GOOD
+}
+
+static void negative_volatile_deref(char *dst, char *src) {
+  volatile uint32_t *reg = (volatile uint32_t *)0x40001000;
+  uint32_t len = *reg;
+  memcpy(dst, src, len); // GOOD
+}
+
+static uint32_t GET_MMIO_fn(unsigned long addr);
+
+static void negative_get_mmio_function(char *dst, char *src) {
+  uint32_t len = GET_MMIO_fn(0x50000000);
+  memcpy(dst, src, len); // GOOD
+}
diff --git a/cpp/ql/test/include/iterator.h b/cpp/ql/test/include/iterator.h
index 5cd7f2312842..77758bfa8da6 100644
--- a/cpp/ql/test/include/iterator.h
+++ b/cpp/ql/test/include/iterator.h
@@ -65,7 +65,7 @@ namespace std {
 	};
 
 	template<class Container>
-	constexpr back_insert_iterator<Container> back_inserter(Container& x) { // $ ir-def=*x
+	constexpr back_insert_iterator<Container> back_inserter(Container& x) {
 		return back_insert_iterator<Container>(x);
 	}
 
@@ -89,7 +89,7 @@ namespace std {
 		constexpr front_insert_iterator operator++(int);
 	};
 	template<class Container>
-	constexpr front_insert_iterator<Container> front_inserter(Container& x) { // $ ir-def=*x
+	constexpr front_insert_iterator<Container> front_inserter(Container& x) {
 		return front_insert_iterator<Container>(x);
 	}
 }
diff --git a/cpp/ql/test/include/type_traits.h b/cpp/ql/test/include/type_traits.h
index dba04f36cad6..421ae3bd50cc 100644
--- a/cpp/ql/test/include/type_traits.h
+++ b/cpp/ql/test/include/type_traits.h
@@ -1,9 +1,10 @@
 #if !defined(CODEQL_TYPE_TRAITS_H)
 #define CODEQL_TYPE_TRAITS_H
 
-typedef unsigned long size_t;
+using size_t = decltype(sizeof(0));
 
 namespace std {
+    using size_t = decltype(sizeof(0));
     template<class T>
     struct remove_const { typedef T type; };
 
diff --git a/cpp/ql/test/library-tests/blocks/c/code_blocks.ql b/cpp/ql/test/library-tests/blocks/c/code_blocks.ql
index 1662525cae6e..647923eea563 100644
--- a/cpp/ql/test/library-tests/blocks/c/code_blocks.ql
+++ b/cpp/ql/test/library-tests/blocks/c/code_blocks.ql
@@ -1,20 +1,16 @@
 import cpp
 
-predicate paramsString(Function f, int n, string res) {
-  if n = -1
-  then res = ""
-  else
-    exists(string sep |
-      (if n = 0 then sep = "" else sep = ", ") and
-      exists(string prefixRes |
-        paramsString(f, n - 1, prefixRes) and
-        res = prefixRes + sep + f.getParameter(n) + "(" + f.getParameter(n).getType() + ")"
-      )
+string paramsString(Function f) {
+  result =
+    concat(int i |
+      exists(f.getParameter(i))
+    |
+      f.getParameter(i) + "(" + f.getParameter(i).getType() + ")", ", " order by i
     )
 }
 
 from BlockExpr e, Function f, string params
 where
   f = e.getFunction() and
-  paramsString(f, f.getNumberOfParameters() - 1, params)
+  params = paramsString(f)
 select e, e.getType() as te, te.explain(), e.getFunction(), f.getType() as tf, tf.explain(), params
diff --git a/cpp/ql/test/library-tests/blocks/cpp/code_blocks.ql b/cpp/ql/test/library-tests/blocks/cpp/code_blocks.ql
index 1662525cae6e..647923eea563 100644
--- a/cpp/ql/test/library-tests/blocks/cpp/code_blocks.ql
+++ b/cpp/ql/test/library-tests/blocks/cpp/code_blocks.ql
@@ -1,20 +1,16 @@
 import cpp
 
-predicate paramsString(Function f, int n, string res) {
-  if n = -1
-  then res = ""
-  else
-    exists(string sep |
-      (if n = 0 then sep = "" else sep = ", ") and
-      exists(string prefixRes |
-        paramsString(f, n - 1, prefixRes) and
-        res = prefixRes + sep + f.getParameter(n) + "(" + f.getParameter(n).getType() + ")"
-      )
+string paramsString(Function f) {
+  result =
+    concat(int i |
+      exists(f.getParameter(i))
+    |
+      f.getParameter(i) + "(" + f.getParameter(i).getType() + ")", ", " order by i
     )
 }
 
 from BlockExpr e, Function f, string params
 where
   f = e.getFunction() and
-  paramsString(f, f.getNumberOfParameters() - 1, params)
+  params = paramsString(f)
 select e, e.getType() as te, te.explain(), e.getFunction(), f.getType() as tf, tf.explain(), params
diff --git a/cpp/ql/test/library-tests/builtins/builtins/builtins.expected b/cpp/ql/test/library-tests/builtins/builtins/builtins.expected
index 48007d6b0e18..2e8e7fd247d6 100644
--- a/cpp/ql/test/library-tests/builtins/builtins/builtins.expected
+++ b/cpp/ql/test/library-tests/builtins/builtins/builtins.expected
@@ -1,4 +1,12 @@
 | choose_expr.c:3:13:3:42 | __builtin_choose_expr |
+| spaceship.cpp:22:41:22:101 | __builtin_lt_synthesizes_from_spaceship |
+| spaceship.cpp:23:41:23:89 | __builtin_lt_synthesizes_from_spaceship |
+| spaceship.cpp:24:41:24:101 | __builtin_gt_synthesizes_from_spaceship |
+| spaceship.cpp:25:41:25:89 | __builtin_gt_synthesizes_from_spaceship |
+| spaceship.cpp:26:41:26:101 | __builtin_le_synthesizes_from_spaceship |
+| spaceship.cpp:27:41:27:89 | __builtin_le_synthesizes_from_spaceship |
+| spaceship.cpp:28:41:28:101 | __builtin_ge_synthesizes_from_spaceship |
+| spaceship.cpp:29:41:29:89 | __builtin_ge_synthesizes_from_spaceship |
 | types.c:4:9:4:57 | __builtin_types_compatible_p |
 | types.c:6:16:6:65 | __builtin_types_compatible_p |
 | varargs.c:7:5:7:32 | __builtin_va_start |
diff --git a/cpp/ql/test/library-tests/builtins/builtins/expr.expected b/cpp/ql/test/library-tests/builtins/builtins/expr.expected
new file mode 100644
index 000000000000..a642c211d5c5
--- /dev/null
+++ b/cpp/ql/test/library-tests/builtins/builtins/expr.expected
@@ -0,0 +1,106 @@
+| atomic.cpp:3:10:3:27 | call to __atomic_fetch_add_4 | ptr,1,0 | <none> |
+| atomic.cpp:3:10:3:38 | (int)... |  | <none> |
+| atomic.cpp:3:29:3:31 | (volatile void *)... |  | <none> |
+| atomic.cpp:3:29:3:31 | ptr |  | <none> |
+| atomic.cpp:3:34:3:34 | 1 |  | 1 |
+| atomic.cpp:3:34:3:34 | (unsigned int)... |  | 1 |
+| atomic.cpp:3:37:3:37 | 0 |  | 0 |
+| atomic.cpp:8:10:8:27 | call to __atomic_fetch_add_1 | ptr,1,0 | <none> |
+| atomic.cpp:8:10:8:38 | (char)... |  | <none> |
+| atomic.cpp:8:10:8:38 | (double)... |  | <none> |
+| atomic.cpp:8:29:8:31 | (volatile void *)... |  | <none> |
+| atomic.cpp:8:29:8:31 | ptr |  | <none> |
+| atomic.cpp:8:34:8:34 | 1 |  | 1 |
+| atomic.cpp:8:34:8:34 | (unsigned char)... |  | 1 |
+| atomic.cpp:8:37:8:37 | 0 |  | 0 |
+| atomic.cpp:13:10:13:29 | call to __atomic_fetch_add_4 | ptr,1,0 | <none> |
+| atomic.cpp:13:10:13:40 | (int)... |  | <none> |
+| atomic.cpp:13:31:13:33 | (volatile void *)... |  | <none> |
+| atomic.cpp:13:31:13:33 | ptr |  | <none> |
+| atomic.cpp:13:36:13:36 | 1 |  | 1 |
+| atomic.cpp:13:36:13:36 | (unsigned int)... |  | 1 |
+| atomic.cpp:13:39:13:39 | 0 |  | 0 |
+| atomic.cpp:18:10:18:29 | call to __atomic_fetch_add_1 | ptr,1,0 | <none> |
+| atomic.cpp:18:10:18:40 | (char)... |  | <none> |
+| atomic.cpp:18:31:18:33 | (volatile void *)... |  | <none> |
+| atomic.cpp:18:31:18:33 | ptr |  | <none> |
+| atomic.cpp:18:36:18:36 | 1 |  | 1 |
+| atomic.cpp:18:36:18:36 | (unsigned char)... |  | 1 |
+| atomic.cpp:18:39:18:39 | 0 |  | 0 |
+| choose_expr.c:3:13:3:42 | __builtin_choose_expr | 1,5,6 | <none> |
+| choose_expr.c:3:35:3:35 | 1 |  | 1 |
+| choose_expr.c:3:38:3:38 | 5 |  | 5 |
+| choose_expr.c:3:41:3:41 | 6 |  | 6 |
+| spaceship.cpp:6:45:6:45 | n | this | <none> |
+| spaceship.cpp:6:45:6:45 | this |  | <none> |
+| spaceship.cpp:9:53:9:56 | {...} | - ... | <none> |
+| spaceship.cpp:9:54:9:55 | - ... | 1 | -1 |
+| spaceship.cpp:9:55:9:55 | 1 |  | 1 |
+| spaceship.cpp:10:54:10:56 | {...} | 0 | <none> |
+| spaceship.cpp:10:55:10:55 | 0 |  | 0 |
+| spaceship.cpp:11:56:11:58 | {...} | 1 | <none> |
+| spaceship.cpp:11:57:11:57 | 1 |  | 1 |
+| spaceship.cpp:18:12:18:14 | rhs |  | <none> |
+| spaceship.cpp:18:12:18:24 | ... <=> ... | rhs,i | <none> |
+| spaceship.cpp:18:20:18:22 | lhs |  | <none> |
+| spaceship.cpp:18:24:18:24 | i | lhs | <none> |
+| spaceship.cpp:22:41:22:101 | __builtin_lt_synthesizes_from_spaceship | const S &,const int & | 1 |
+| spaceship.cpp:22:41:22:101 | const S & |  | <none> |
+| spaceship.cpp:22:41:22:101 | const int & |  | <none> |
+| spaceship.cpp:23:41:23:89 | __builtin_lt_synthesizes_from_spaceship | int,int | 0 |
+| spaceship.cpp:23:41:23:89 | int |  | <none> |
+| spaceship.cpp:23:41:23:89 | int |  | <none> |
+| spaceship.cpp:24:41:24:101 | __builtin_gt_synthesizes_from_spaceship | const S &,const int & | 1 |
+| spaceship.cpp:24:41:24:101 | const S & |  | <none> |
+| spaceship.cpp:24:41:24:101 | const int & |  | <none> |
+| spaceship.cpp:25:41:25:89 | __builtin_gt_synthesizes_from_spaceship | int,int | 0 |
+| spaceship.cpp:25:41:25:89 | int |  | <none> |
+| spaceship.cpp:25:41:25:89 | int |  | <none> |
+| spaceship.cpp:26:41:26:101 | __builtin_le_synthesizes_from_spaceship | const S &,const int & | 1 |
+| spaceship.cpp:26:41:26:101 | const S & |  | <none> |
+| spaceship.cpp:26:41:26:101 | const int & |  | <none> |
+| spaceship.cpp:27:41:27:89 | __builtin_le_synthesizes_from_spaceship | int,int | 0 |
+| spaceship.cpp:27:41:27:89 | int |  | <none> |
+| spaceship.cpp:27:41:27:89 | int |  | <none> |
+| spaceship.cpp:28:41:28:101 | __builtin_ge_synthesizes_from_spaceship | const S &,const int & | 1 |
+| spaceship.cpp:28:41:28:101 | const S & |  | <none> |
+| spaceship.cpp:28:41:28:101 | const int & |  | <none> |
+| spaceship.cpp:29:41:29:89 | __builtin_ge_synthesizes_from_spaceship | int,int | 0 |
+| spaceship.cpp:29:41:29:89 | int |  | <none> |
+| spaceship.cpp:29:41:29:89 | int |  | <none> |
+| types.c:4:9:4:57 | __builtin_types_compatible_p | typeof(...),long | 0 |
+| types.c:4:9:4:57 | long |  | <none> |
+| types.c:4:9:4:57 | typeof(...) |  | <none> |
+| types.c:4:49:4:49 | s |  | <none> |
+| types.c:5:9:5:12 | call to puts | long | <none> |
+| types.c:5:14:5:19 | array to pointer conversion |  | <none> |
+| types.c:5:14:5:19 | long |  | long |
+| types.c:6:16:6:65 | __builtin_types_compatible_p | typeof(...),char * | 1 |
+| types.c:6:16:6:65 | char * |  | <none> |
+| types.c:6:16:6:65 | typeof(...) |  | <none> |
+| types.c:6:56:6:56 | s |  | <none> |
+| types.c:7:9:7:12 | call to puts | str | <none> |
+| types.c:7:14:7:18 | array to pointer conversion |  | <none> |
+| types.c:7:14:7:18 | str |  | str |
+| types.c:9:12:9:14 | (...) |  | 0 |
+| types.c:9:13:9:13 | 0 |  | 0 |
+| varargs.c:7:5:7:32 | __builtin_va_start | ap,args | <none> |
+| varargs.c:7:24:7:25 | ap |  | <none> |
+| varargs.c:7:24:7:25 | array to pointer conversion |  | <none> |
+| varargs.c:7:28:7:31 | args |  | <none> |
+| varargs.c:8:10:8:10 | i |  | <none> |
+| varargs.c:8:10:8:14 | ... = ... | i,0 | <none> |
+| varargs.c:8:14:8:14 | 0 |  | 0 |
+| varargs.c:8:17:8:17 | i |  | <none> |
+| varargs.c:8:17:8:24 | ... < ... | i,args | <none> |
+| varargs.c:8:21:8:24 | args |  | <none> |
+| varargs.c:8:27:8:27 | i |  | <none> |
+| varargs.c:8:27:8:29 | ... ++ | i | <none> |
+| varargs.c:9:9:9:9 | j |  | <none> |
+| varargs.c:9:9:9:37 | ... = ... | j,__builtin_va_arg | <none> |
+| varargs.c:9:13:9:37 | __builtin_va_arg | ap | <none> |
+| varargs.c:9:30:9:31 | ap |  | <none> |
+| varargs.c:9:30:9:31 | array to pointer conversion |  | <none> |
+| varargs.c:11:5:11:24 | __builtin_va_end | ap | <none> |
+| varargs.c:11:22:11:23 | ap |  | <none> |
+| varargs.c:11:22:11:23 | array to pointer conversion |  | <none> |
diff --git a/cpp/ql/test/library-tests/builtins/builtins/expr.ql b/cpp/ql/test/library-tests/builtins/builtins/expr.ql
new file mode 100644
index 000000000000..c638cf501562
--- /dev/null
+++ b/cpp/ql/test/library-tests/builtins/builtins/expr.ql
@@ -0,0 +1,5 @@
+import cpp
+
+from Expr e, string value
+where if exists(e.getValue()) then value = e.getValue().toString() else value = "<none>"
+select e, concat(int i | | e.getChild(i).toString(), "," order by i), value
diff --git a/cpp/ql/test/library-tests/builtins/builtins/spaceship.cpp b/cpp/ql/test/library-tests/builtins/builtins/spaceship.cpp
new file mode 100644
index 000000000000..94f978587b1f
--- /dev/null
+++ b/cpp/ql/test/library-tests/builtins/builtins/spaceship.cpp
@@ -0,0 +1,29 @@
+// semmle-extractor-options: --clang --clang_version 240000 -std=c++23
+
+namespace std {
+  struct strong_ordering {
+    int n;
+    constexpr operator int() const { return n; }
+    static const strong_ordering less, equal, greater;
+  };
+  constexpr strong_ordering strong_ordering::less = {-1};
+  constexpr strong_ordering strong_ordering::equal = {0};
+  constexpr strong_ordering strong_ordering::greater = {1};
+}
+
+struct S {
+  int i;
+
+  friend auto operator<=>(S lhs, int rhs) {
+    return rhs <=> lhs.i;
+  }
+};
+
+bool b_lt_synthesizes_from_spaceship1 = __builtin_lt_synthesizes_from_spaceship(const S&, const int&);
+bool b_lt_synthesizes_from_spaceship2 = __builtin_lt_synthesizes_from_spaceship(int, int);
+bool b_gt_synthesizes_from_spaceship1 = __builtin_gt_synthesizes_from_spaceship(const S&, const int&);
+bool b_gt_synthesizes_from_spaceship2 = __builtin_gt_synthesizes_from_spaceship(int, int);
+bool b_le_synthesizes_from_spaceship1 = __builtin_le_synthesizes_from_spaceship(const S&, const int&);
+bool b_le_synthesizes_from_spaceship2 = __builtin_le_synthesizes_from_spaceship(int, int);
+bool b_ge_synthesizes_from_spaceship1 = __builtin_ge_synthesizes_from_spaceship(const S&, const int&);
+bool b_ge_synthesizes_from_spaceship2 = __builtin_ge_synthesizes_from_spaceship(int, int);
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp b/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp
index 3db47a824ede..67664754f4e5 100644
--- a/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp
+++ b/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp
@@ -122,10 +122,20 @@ bool b_is_scoped_enum2 = __is_scoped_enum(int);
 bool b_is_trivially_relocatable1 = __is_trivially_relocatable(int);
 bool b_is_trivially_relocatable2 = __is_trivially_relocatable(void);
 
-struct S3{
+struct S3 {
     S3(S3 &);
     S3& operator=(S3&);
 };
 
-bool bok_is_bitwise_cloneable1 = __is_bitwise_cloneable(int);
-bool bok_is_bitwise_cloneable2 = __is_bitwise_cloneable(S3);
+bool b_is_bitwise_cloneable1 = __is_bitwise_cloneable(int);
+bool b_is_bitwise_cloneable2 = __is_bitwise_cloneable(S3);
+
+struct S4 : virtual S3 {
+    ~S4() = delete;
+};
+
+bool b_is_virtual_base_of1 = __builtin_is_virtual_base_of(int, S4);
+bool b_is_virtual_base_of2 = __builtin_is_virtual_base_of(S3, S4);
+
+bool b_is_implicit_lifetime1 = __builtin_is_implicit_lifetime(int);
+bool b_is_implicit_lifetime2 = __builtin_is_implicit_lifetime(S4);
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/expr.expected b/cpp/ql/test/library-tests/builtins/type_traits/expr.expected
index 1728a48f4237..1580d5dba959 100644
--- a/cpp/ql/test/library-tests/builtins/type_traits/expr.expected
+++ b/cpp/ql/test/library-tests/builtins/type_traits/expr.expected
@@ -165,10 +165,20 @@
 | clang.cpp:122:36:122:66 | int |  | <none> |
 | clang.cpp:123:36:123:67 | __is_trivially_relocatable | void | 0 |
 | clang.cpp:123:36:123:67 | void |  | <none> |
-| clang.cpp:130:34:130:60 | __is_bitwise_cloneable | int | 1 |
-| clang.cpp:130:34:130:60 | int |  | <none> |
-| clang.cpp:131:34:131:59 | S3 |  | <none> |
-| clang.cpp:131:34:131:59 | __is_bitwise_cloneable | S3 | 0 |
+| clang.cpp:130:32:130:58 | __is_bitwise_cloneable | int | 1 |
+| clang.cpp:130:32:130:58 | int |  | <none> |
+| clang.cpp:131:32:131:57 | S3 |  | <none> |
+| clang.cpp:131:32:131:57 | __is_bitwise_cloneable | S3 | 0 |
+| clang.cpp:137:30:137:66 | S4 |  | <none> |
+| clang.cpp:137:30:137:66 | __builtin_is_virtual_base_of | int,S4 | 0 |
+| clang.cpp:137:30:137:66 | int |  | <none> |
+| clang.cpp:138:30:138:65 | S3 |  | <none> |
+| clang.cpp:138:30:138:65 | S4 |  | <none> |
+| clang.cpp:138:30:138:65 | __builtin_is_virtual_base_of | S3,S4 | 1 |
+| clang.cpp:140:32:140:66 | __builtin_is_implicit_lifetime | int | 1 |
+| clang.cpp:140:32:140:66 | int |  | <none> |
+| clang.cpp:141:32:141:65 | S4 |  | <none> |
+| clang.cpp:141:32:141:65 | __builtin_is_implicit_lifetime | S4 | 0 |
 | file://:0:0:0:0 | 0 |  | 0 |
 | file://:0:0:0:0 | 0 |  | 0 |
 | file://:0:0:0:0 | 1 |  | 1 |
@@ -225,6 +235,10 @@
 | gcc.cpp:37:32:37:67 | __is_nothrow_invocable | f_type,bool | 0 |
 | gcc.cpp:37:32:37:67 | bool |  | <none> |
 | gcc.cpp:37:32:37:67 | f_type |  | <none> |
+| gcc.cpp:39:25:39:52 | __builtin_is_structural | int | 1 |
+| gcc.cpp:39:25:39:52 | int |  | <none> |
+| gcc.cpp:40:25:40:54 | __builtin_is_structural | int && | 0 |
+| gcc.cpp:40:25:40:54 | int && |  | <none> |
 | ms.cpp:38:41:38:45 | 0 |  | 0 |
 | ms.cpp:88:27:88:45 | __has_assign | empty | 0 |
 | ms.cpp:88:27:88:45 | empty |  | <none> |
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/expr.ql b/cpp/ql/test/library-tests/builtins/type_traits/expr.ql
index a7d2b436ebde..c638cf501562 100644
--- a/cpp/ql/test/library-tests/builtins/type_traits/expr.ql
+++ b/cpp/ql/test/library-tests/builtins/type_traits/expr.ql
@@ -1,15 +1,5 @@
 import cpp
 
-string childrenFrom(Expr e, int i) {
-  (
-    if i = 0
-    then result = e.getChild(i).toString() + childrenFrom(e, i + 1)
-    else result = "," + e.getChild(i).toString() + childrenFrom(e, i + 1)
-  )
-  or
-  i = e.getNumChild() and result = ""
-}
-
 from Expr e, string value
 where if exists(e.getValue()) then value = e.getValue().toString() else value = "<none>"
-select e, childrenFrom(e, 0), value
+select e, concat(int i | | e.getChild(i).toString(), "," order by i), value
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/gcc.cpp b/cpp/ql/test/library-tests/builtins/type_traits/gcc.cpp
index 15f59812d2e9..7c6189b81aff 100644
--- a/cpp/ql/test/library-tests/builtins/type_traits/gcc.cpp
+++ b/cpp/ql/test/library-tests/builtins/type_traits/gcc.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --gnu_version 150000
+// semmle-extractor-options: --gnu_version 170000
 
 __attribute__ ((aligned(8))) int v;
 bool b_has_attribute1 = __builtin_has_attribute(v, aligned);
@@ -35,3 +35,6 @@ bool b_is_invocable2 = __is_invocable(f_type, bool);
 
 bool b_is_nothrow_invocable1 = __is_nothrow_invocable(f_type);
 bool b_is_nothrow_invocable2 = __is_nothrow_invocable(f_type, bool);
+
+bool b_is_structural1 = __builtin_is_structural(int);
+bool b_is_structural2 = __builtin_is_structural(int&&);
diff --git a/cpp/ql/test/library-tests/compiler_generated/compilerGenerated.expected b/cpp/ql/test/library-tests/compiler_generated/compilerGenerated.expected
index b61085ff7c69..c78e4af1d6a4 100644
--- a/cpp/ql/test/library-tests/compiler_generated/compilerGenerated.expected
+++ b/cpp/ql/test/library-tests/compiler_generated/compilerGenerated.expected
@@ -16,5 +16,31 @@
 | cpp.cpp:15:5:15:12 | call to ~MyClass | Expr |
 | cpp.cpp:15:12:15:12 | reuse of m | Expr |
 | cpp.cpp:16:1:16:1 | return ... | Stmt |
+| cpp.cpp:19:26:19:44 | __PRETTY_FUNCTION__ | Variable |
+| cpp.cpp:19:26:19:44 | array to pointer conversion | Expr |
+| cpp.cpp:19:26:19:44 | initializer for __PRETTY_FUNCTION__ | Initializer |
+| cpp.cpp:19:26:19:44 | void uses_pretty_function() | Expr |
+| cpp.cpp:20:1:20:1 | return ... | Stmt |
+| cpp.cpp:23:29:23:32 | args | Variable |
+| cpp.cpp:23:37:23:37 | return ... | Stmt |
+| cpp.cpp:23:37:23:37 | return ... | Stmt |
+| cpp.cpp:27:1:27:1 | return ... | Stmt |
+| cpp.cpp:31:5:31:5 | (__begin) | Variable |
+| cpp.cpp:31:5:31:5 | (__end) | Variable |
+| cpp.cpp:31:5:31:5 | (__range) | Variable |
+| cpp.cpp:31:5:33:5 | declaration | Stmt |
+| cpp.cpp:31:5:33:5 | declaration | Stmt |
+| cpp.cpp:31:5:33:5 | declaration | Stmt |
+| cpp.cpp:31:17:31:18 | (reference to) | Expr |
+| cpp.cpp:34:1:34:1 | return ... | Stmt |
+| file://:0:0:0:0 | (__begin) | Expr |
+| file://:0:0:0:0 | (__begin) | Expr |
+| file://:0:0:0:0 | (__begin) | Expr |
+| file://:0:0:0:0 | (__end) | Expr |
+| file://:0:0:0:0 | (reference dereference) | Expr |
+| file://:0:0:0:0 | (reference dereference) | Expr |
+| file://:0:0:0:0 | * ... | Expr |
+| file://:0:0:0:0 | array to pointer conversion | Expr |
+| file://:0:0:0:0 | array to pointer conversion | Expr |
 | file://:0:0:0:0 | operator delete | Function |
 | file://:0:0:0:0 | operator new | Function |
diff --git a/cpp/ql/test/library-tests/compiler_generated/compilerGenerated.ql b/cpp/ql/test/library-tests/compiler_generated/compilerGenerated.ql
index 0eb620f0c792..1ed4a9395e19 100644
--- a/cpp/ql/test/library-tests/compiler_generated/compilerGenerated.ql
+++ b/cpp/ql/test/library-tests/compiler_generated/compilerGenerated.ql
@@ -9,4 +9,6 @@ where
   e.(Variable).isCompilerGenerated() and type = "Variable"
   or
   e.(Stmt).isCompilerGenerated() and type = "Stmt"
+  or
+  e.(Initializer).isCompilerGenerated() and type = "Initializer"
 select e, type
diff --git a/cpp/ql/test/library-tests/compiler_generated/cpp.cpp b/cpp/ql/test/library-tests/compiler_generated/cpp.cpp
index 058bba7ba411..7525be8d40e8 100644
--- a/cpp/ql/test/library-tests/compiler_generated/cpp.cpp
+++ b/cpp/ql/test/library-tests/compiler_generated/cpp.cpp
@@ -15,3 +15,20 @@ void g1(void) {
     delete m;
 }
 
+void uses_pretty_function() {
+    const char* pretty = __PRETTY_FUNCTION__;
+}
+
+template <typename... Args>
+void parameter_pack(Args... args) { }
+
+void test_parameter_pack() {
+  parameter_pack();
+}
+
+void ranged_for() {
+    int vs[] = {1, 2, 3};
+    for(int i : vs) {
+
+    }
+}
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/cpp11_g/cfg.ql b/cpp/ql/test/library-tests/cpp11_g/cfg.ql
index 105b4e709ee7..f4df06adde03 100644
--- a/cpp/ql/test/library-tests/cpp11_g/cfg.ql
+++ b/cpp/ql/test/library-tests/cpp11_g/cfg.ql
@@ -1,16 +1,12 @@
 import cpp
 
-string arguments(Function f, int i) {
-  result = "," and i = -1
-  or
-  result = "" and i = min(int j | function_template_argument(unresolveElement(f), j, _)) - 1
-  or
-  result = arguments(f, i - 1) + "," + f.getTemplateArgument(i).toString()
+string arguments(Function f) {
+  result = concat(int i | | f.getTemplateArgument(i).toString(), "," order by i)
 }
 
 string name(Function f) {
   if f.isConstructedFrom(_)
-  then result = f.toString() + "<" + max(arguments(f, _)).suffix(1) + ">"
+  then result = f.toString() + "<" + arguments(f) + ">"
   else
     if f instanceof TemplateFunction
     then result = f.toString() + " prototype instantiation"
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql
index 8f534be558d7..a7118463d96a 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql
@@ -27,7 +27,7 @@ module IRTest {
 
   private string stars(int k) {
     k = [0 .. max(DataFlow::Node n, int i | n.isFinalValueOfParameter(_, i) | i)] and
-    (if k = 0 then result = "" else result = "*" + stars(k - 1))
+    result = concat(int i | i in [1 .. k] | "*")
   }
 
   module IRParameterDefTest implements TestSig {
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/asio_streams.cpp b/cpp/ql/test/library-tests/dataflow/external-models/asio_streams.cpp
index 401091122b8e..8e6440df98a1 100644
--- a/cpp/ql/test/library-tests/dataflow/external-models/asio_streams.cpp
+++ b/cpp/ql/test/library-tests/dataflow/external-models/asio_streams.cpp
@@ -1,24 +1,9 @@
 
 // --- stub library headers ---
 
-namespace std {
-	typedef unsigned long size_t;
-	#define SIZE_MAX 0xFFFFFFFF
+#include "../taint-tests/stl.h"
 
-	template <class T> class allocator {
-	};
-
-	template<class charT> struct char_traits {
-	};
-
-	template<class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-	class basic_string {
-	public:
-		basic_string(const charT* s, const Allocator& a = Allocator());
-	};
-
-	typedef basic_string<char> string;
-};
+#define SIZE_MAX 0xFFFFFFFF
 
 namespace boost {
 	namespace system {
@@ -29,14 +14,50 @@ namespace boost {
 	};
 	
 	namespace asio {
-		template<typename Protocol/*, typename Executor*/>
-		class basic_stream_socket /*: public basic_socket<Protocol, Executor>*/ {
-		};
+		class any_io_executor { };
+
+		class socket_base { };
+
+		template <typename Protocol, typename Executor>
+		class basic_socket : public socket_base { };
+
+		template<typename Protocol, typename Executor = any_io_executor>
+		class basic_stream_socket : public basic_socket<Protocol, Executor> { };
 
 		namespace ip {
+			class resolver_base {
+			public:
+				enum flags { passive = 1 };
+			};
+
+			template<typename InternetProtocol, typename Executor = any_io_executor>
+			class basic_resolver {
+			public:
+				class results_type {
+				};
+
+				results_type resolve(const std::string &host, const std::string &service);
+				results_type resolve(const std::string &host, const std::string &service, boost::system::error_code &ec);
+				results_type resolve(const std::string &host, const std::string &service, resolver_base::flags resolve_flags);
+				results_type resolve(const std::string &host, const std::string &service, resolver_base::flags resolve_flags, boost::system::error_code &ec);
+				results_type resolve(std::string_view host, std::string_view service);
+				results_type resolve(std::string_view host, std::string_view service, boost::system::error_code &ec);
+				results_type resolve(std::string_view host, std::string_view service, resolver_base::flags resolve_flags);
+				results_type resolve(std::string_view host, std::string_view service, resolver_base::flags resolve_flags, boost::system::error_code &ec);
+				results_type resolve(const InternetProtocol &protocol, const std::string &host, const std::string &service);
+				results_type resolve(const InternetProtocol &protocol, const std::string &host, const std::string &service, boost::system::error_code &ec);
+				results_type resolve(const InternetProtocol &protocol, const std::string &host, const std::string &service, resolver_base::flags resolve_flags);
+				results_type resolve(const InternetProtocol &protocol, const std::string &host, const std::string &service, resolver_base::flags resolve_flags, boost::system::error_code &ec);
+				results_type resolve(const InternetProtocol &protocol, std::string_view host, std::string_view service);
+				results_type resolve(const InternetProtocol &protocol, std::string_view host, std::string_view service, boost::system::error_code &ec);
+				results_type resolve(const InternetProtocol &protocol, std::string_view host, std::string_view service, resolver_base::flags resolve_flags);
+				results_type resolve(const InternetProtocol &protocol, std::string_view host, std::string_view service, resolver_base::flags resolve_flags, boost::system::error_code &ec);
+			};
+
 			class tcp {
 			public:
 				typedef basic_stream_socket<tcp> socket;
+				typedef basic_resolver<tcp> resolver;
 			};
 		};
 
@@ -76,6 +97,7 @@ void sink(char *);
 void sink(std::string);
 void sink(boost::asio::streambuf);
 void sink(boost::asio::mutable_buffer);
+void sink(boost::asio::ip::tcp::resolver::results_type);
 
 char *getenv(const char *name);
 int send(int, const void*, int, int);
@@ -105,3 +127,65 @@ void test(boost::asio::ip::tcp::socket &socket) {
 		// ...
 	}
 }
+
+void test_resolve_host() {
+	boost::asio::ip::tcp::resolver resolver;
+	boost::asio::ip::tcp protocol;
+	boost::asio::ip::resolver_base::flags flags = boost::asio::ip::resolver_base::passive;
+	boost::system::error_code error;
+	std::string host(source());
+	std::string service("");
+	std::string_view host_view(source());
+	std::string_view service_view("");
+
+	sink(resolver.resolve(host, service)); // $ ir
+	sink(resolver.resolve(host, service, error)); // $ ir
+	sink(resolver.resolve(host, service, flags)); // $ ir
+	sink(resolver.resolve(host, service, flags, error)); // $ ir
+
+	sink(resolver.resolve(host_view, service_view)); // $ MISSING: ir
+	sink(resolver.resolve(host_view, service_view, error)); // $ MISSING: ir
+	sink(resolver.resolve(host_view, service_view, flags)); // $ MISSING: ir
+	sink(resolver.resolve(host_view, service_view, flags, error)); // $ MISSING: ir
+
+	sink(resolver.resolve(protocol, host, service)); // $ ir
+	sink(resolver.resolve(protocol, host, service, error)); // $ ir
+	sink(resolver.resolve(protocol, host, service, flags)); // $ ir
+	sink(resolver.resolve(protocol, host, service, flags, error)); // $ ir
+
+	sink(resolver.resolve(protocol, host_view, service_view)); // $ MISSING: ir
+	sink(resolver.resolve(protocol, host_view, service_view, error)); // $ MISSING: ir
+	sink(resolver.resolve(protocol, host_view, service_view, flags)); // $ MISSING: ir
+	sink(resolver.resolve(protocol, host_view, service_view, flags, error)); // $ MISSING: ir
+}
+
+void test_resolve_service() {
+	boost::asio::ip::tcp::resolver resolver;
+	boost::asio::ip::tcp protocol;
+	boost::asio::ip::resolver_base::flags flags = boost::asio::ip::resolver_base::passive;
+	boost::system::error_code error;
+	std::string host("");
+	std::string service(source());
+	std::string_view host_view("");
+	std::string_view service_view(source());
+
+	sink(resolver.resolve(host, service)); // $ ir
+	sink(resolver.resolve(host, service, error)); // $ ir
+	sink(resolver.resolve(host, service, flags)); // $ ir
+	sink(resolver.resolve(host, service, flags, error)); // $ ir
+
+	sink(resolver.resolve(host_view, service_view)); // $ MISSING: ir
+	sink(resolver.resolve(host_view, service_view, error)); // $ MISSING: ir
+	sink(resolver.resolve(host_view, service_view, flags)); // $ MISSING: ir
+	sink(resolver.resolve(host_view, service_view, flags, error)); // $ MISSING: ir
+
+	sink(resolver.resolve(protocol, host, service)); // $ ir
+	sink(resolver.resolve(protocol, host, service, error)); // $ ir
+	sink(resolver.resolve(protocol, host, service, flags)); // $ ir
+	sink(resolver.resolve(protocol, host, service, flags, error)); // $ ir
+
+	sink(resolver.resolve(protocol, host_view, service_view)); // $ MISSING: ir
+	sink(resolver.resolve(protocol, host_view, service_view, error)); // $ MISSING: ir
+	sink(resolver.resolve(protocol, host_view, service_view, flags)); // $ MISSING: ir
+	sink(resolver.resolve(protocol, host_view, service_view, flags, error)); // $ MISSING: ir
+}
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/azure.cpp b/cpp/ql/test/library-tests/dataflow/external-models/azure.cpp
index 14407a8b5bed..512fbeeb5203 100644
--- a/cpp/ql/test/library-tests/dataflow/external-models/azure.cpp
+++ b/cpp/ql/test/library-tests/dataflow/external-models/azure.cpp
@@ -1,3 +1,4 @@
+#include "../taint-tests/stl.h"
 using uint16_t = unsigned short;
 using int64_t = long long;
 using size_t = unsigned long;
@@ -5,51 +6,13 @@ using uint8_t = unsigned char;
 using int32_t = int;
 using uint32_t = unsigned int;
 
-namespace std
-{
-  class string
-  {
-  public:
-    string();
-    string(const char *);
-    ~string();
-  };
-
-  template <typename K, typename V>
-  class map
-  {
-  public:
-    map();
-    ~map();
-
-    V& operator[](const K& key);
-  };
-
-  template <typename T>
-  class vector
-  {
-  public:
-    vector();
-    ~vector();
-
-    T& operator[](size_t);
-  };
-
-  template<typename T>
-  class unique_ptr {
-  public:
-    unique_ptr();
-    ~unique_ptr();
-
-    T* get();
-  };
-}
-
 namespace Azure
 {
   template <typename T>
     class Nullable
     {
+      T m_value;
+
     public:
       Nullable();
       Nullable(const T);
@@ -284,6 +247,9 @@ void test_RawResponse(Azure::Core::Http::RawResponse& resp) {
 }
 
 void test_GetHeader() {
+  // We instantiate the `std::pair` class since we need the `FieldContent` for
+  // `std::pair::second` to be present in the test DB.
+  std::pair<std::string, std::string>();
   Azure::Core::Http::Request request(Azure::Core::Http::Get, Azure::Core::Url("http://example.com"));
   {
     auto headerValue = request.GetHeader("Content-Type").Value();
@@ -294,4 +260,11 @@ void test_GetHeader() {
     std::string contentType = headers["Content-Type"];
     sink(contentType); // $ ir
   }
+}
+
+void test_QueryParameters() {
+  Azure::Core::Http::Request request(Azure::Core::Http::Get, Azure::Core::Url("http://example.com"));
+  Azure::Core::Url url;
+  url.SetQueryParameters(request.GetHeaders());
+  sink(url.GetQueryParameters()["query"]); // $ ir
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/bal.cpp b/cpp/ql/test/library-tests/dataflow/external-models/bal.cpp
new file mode 100644
index 000000000000..ad72d3321c80
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/external-models/bal.cpp
@@ -0,0 +1,467 @@
+#include "bsl.h"
+
+// --- stub library headers ---
+
+namespace BloombergLP {
+namespace bdlar {
+	class AnyRef {};
+	class AnyConstRef {};
+}
+
+namespace balber {
+	class BerDecoder {
+	public:
+		template <typename TYPE> int decode(bsl::streambuf *streamBuf, TYPE *variable);
+		template <typename TYPE> int decode(bsl::istream& stream, TYPE *variable);
+		template <typename TYPE> int decodeAny(bsl::streambuf *streamBuf, TYPE *variable);
+		int decodeAny(bsl::streambuf *streamBuf, bdlar::AnyRef *variable);
+		template <typename TYPE> int decodeAny(bsl::istream& stream, TYPE *variable);
+		int decodeAny(bsl::istream& stream, bdlar::AnyRef *variable);
+	};
+	class BerEncoder {
+	public:
+		template <typename TYPE> int encode(bsl::streambuf *streamBuf, const TYPE& value);
+		template <typename TYPE> int encode(bsl::ostream& stream, const TYPE& value);
+		template <typename TYPE> int encodeAny(bsl::streambuf *streamBuf, const TYPE& value);
+		int encodeAny(bsl::streambuf *streamBuf, const bdlar::AnyConstRef& any);
+		template <typename TYPE> int encodeAny(bsl::ostream& stream, const TYPE& value);
+		int encodeAny(bsl::ostream& stream, const bdlar::AnyConstRef& any);
+	};
+}
+
+namespace baljsn {
+	class DecoderOptions {};
+	class EncoderOptions {};
+	class Decoder {
+	public:
+		template <class TYPE> int decode(bsl::streambuf *streamBuf, TYPE *value, const DecoderOptions& options);
+		template <class TYPE> int decode(bsl::streambuf *streamBuf, TYPE *value, const DecoderOptions *options);
+		template <class TYPE> int decode(bsl::istream& stream, TYPE *value, const DecoderOptions& options);
+		template <class TYPE> int decode(bsl::istream& stream, TYPE *value, const DecoderOptions *options);
+		template <class TYPE> int decode(bsl::streambuf *streamBuf, TYPE *value);
+		template <class TYPE> int decode(bsl::istream& stream, TYPE *value);
+		template <class TYPE> int decodeAny(bsl::streambuf *streamBuf, TYPE *value, const DecoderOptions& options);
+		template <class TYPE> int decodeAny(bsl::streambuf *streamBuf, TYPE *value, const DecoderOptions *options = 0);
+		int decodeAny(bsl::streambuf *streamBuf, bdlar::AnyRef *value, const DecoderOptions& options);
+		template <class TYPE> int decodeAny(bsl::istream& stream, TYPE *value, const DecoderOptions& options);
+		template <class TYPE> int decodeAny(bsl::istream& stream, TYPE *value, const DecoderOptions *options = 0);
+		int decodeAny(bsl::istream& stream, bdlar::AnyRef *value, const DecoderOptions& options);
+	};
+	class Encoder {
+	public:
+		template <class TYPE> int encode(bsl::streambuf *streamBuf, const TYPE& value, const EncoderOptions& options);
+		template <class TYPE> int encode(bsl::streambuf *streamBuf, const TYPE& value, const EncoderOptions *options);
+		template <class TYPE> int encode(bsl::ostream& stream, const TYPE& value, const EncoderOptions& options);
+		template <class TYPE> int encode(bsl::ostream& stream, const TYPE& value, const EncoderOptions *options);
+		template <class TYPE> int encode(bsl::streambuf *streamBuf, const TYPE& value);
+		template <class TYPE> int encode(bsl::ostream& stream, const TYPE& value);
+		template <class TYPE> int encodeAny(bsl::streambuf *streamBuf, const TYPE& value, const EncoderOptions& options);
+		template <class TYPE> int encodeAny(bsl::streambuf *streamBuf, const TYPE& value, const EncoderOptions *options = 0);
+		int encodeAny(bsl::streambuf *streamBuf, const bdlar::AnyConstRef& any, const EncoderOptions& options);
+		int encodeAny(bsl::streambuf *streamBuf, const bdlar::AnyConstRef& any, const EncoderOptions *options = 0);
+		template <class TYPE> int encodeAny(bsl::ostream& stream, const TYPE& value, const EncoderOptions& options);
+		template <class TYPE> int encodeAny(bsl::ostream& stream, const TYPE& value, const EncoderOptions *options = 0);
+		int encodeAny(bsl::ostream& stream, const bdlar::AnyConstRef& any, const EncoderOptions& options);
+		int encodeAny(bsl::ostream& stream, const bdlar::AnyConstRef& any, const EncoderOptions *options = 0);
+	};
+}
+
+namespace balxml {
+	class Formatter {};
+	class Decoder {
+	public:
+		int open(bsl::istream& stream, const char *uri = 0);
+		int open(bsl::streambuf *buffer, const char *uri = 0);
+		int open(const char *buffer, bsl::size_t length, const char *uri = 0);
+		int open(const char *filename);
+		template <class TYPE> bsl::istream& decode(bsl::istream& stream, TYPE *object, const char *uri = 0);
+		template <class TYPE> int decode(bsl::streambuf *buffer, TYPE *object, const char *uri = 0);
+		template <class TYPE> int decode(const char *buffer, bsl::size_t length, TYPE *object, const char *uri = 0);
+		template <class TYPE> int decode(const char *filename, TYPE *object);
+		template <class TYPE> int decode(TYPE *object);
+		template <class TYPE> bsl::istream& decodeAny(bsl::istream& stream, TYPE *object, const char *uri = 0);
+		bsl::istream& decodeAny(bsl::istream& stream, bdlar::AnyRef *object, const char *uri = 0);
+		template <class TYPE> int decodeAny(bsl::streambuf *buffer, TYPE *object, const char *uri = 0);
+		int decodeAny(bsl::streambuf *buffer, bdlar::AnyRef *object, const char *uri = 0);
+		template <class TYPE> int decodeAny(TYPE *object);
+		int decodeAny(bdlar::AnyRef *object);
+	};
+	class Encoder {
+	public:
+		template <class TYPE> int encode(bsl::streambuf *buffer, const TYPE& object);
+		template <class TYPE> int encodeToStream(bsl::ostream& stream, const TYPE& object);
+		template <class TYPE> bsl::ostream& encode(bsl::ostream& stream, const TYPE& object);
+		template <class TYPE> int encode(Formatter& formatter, const TYPE& object);
+		template <class TYPE> int encodeAny(bsl::streambuf *buffer, const TYPE& object);
+		int encodeAny(bsl::streambuf *buffer, const bdlar::AnyConstRef& object);
+		template <class TYPE> int encodeAnyToStream(bsl::ostream& stream, const TYPE& object);
+		int encodeAnyToStream(bsl::ostream& stream, const bdlar::AnyConstRef& object);
+		template <class TYPE> bsl::ostream& encodeAny(bsl::ostream& stream, const TYPE& object);
+		bsl::ostream& encodeAny(bsl::ostream& stream, const bdlar::AnyConstRef& object);
+		template <class TYPE> int encodeAny(Formatter& formatter, const TYPE& object);
+		int encodeAny(Formatter& formatter, const bdlar::AnyConstRef& object);
+	};
+}
+}
+
+// --- test code ---
+
+char *source();
+void sink(char);
+void sink(bsl::string s);
+
+// Stand-in for a bdlat sequence type.
+struct Record {
+	char name[16];
+};
+
+// A tainted stream is made by reinterpreting a tainted bsl::string, as in bslx.cpp. baljsn
+// and balxml only accept bdlat sequence/choice types; the stubs do not enforce that, and
+// most tests decode into a bsl::string so the result can be read back. The *_struct_* tests
+// show whole-object taint without general object-to-field flow. TaintInheritingContent
+// (FlowSteps.qll) enables inheritance for selected fields; Record::name is not modeled this way.
+
+// ===== balber (BER) =====
+
+// Decoding a tainted stream taints the decoded object.
+void test_balber_decode() {
+	bsl::string data(source());
+	bsl::streambuf *sb = (bsl::streambuf *)data.data();
+	bsl::string out;
+	BloombergLP::balber::BerDecoder decoder;
+	decoder.decode(sb, &out);
+	sink(*out.data()); // $ ir
+}
+
+void test_balber_decode_istream() {
+	bsl::string data(source());
+	bsl::istream *is = (bsl::istream *)data.data();
+	bsl::string out;
+	BloombergLP::balber::BerDecoder decoder;
+	decoder.decode(*is, &out);
+	sink(*out.data()); // $ ir
+}
+
+void test_balber_decodeAny() {
+	bsl::string data(source());
+	bsl::streambuf *sb = (bsl::streambuf *)data.data();
+	bsl::string out;
+	BloombergLP::balber::BerDecoder decoder;
+	decoder.decodeAny(sb, &out);
+	sink(*out.data()); // $ ir
+}
+
+// Encoding a tainted object taints the destination stream.
+void test_balber_encode() {
+	bsl::string obj(source());
+	char buf[16];
+	BloombergLP::balber::BerEncoder encoder;
+	encoder.encode((bsl::streambuf *)buf, obj);
+	sink(buf[0]); // $ ir
+}
+
+void test_balber_encodeAny() {
+	bsl::string obj(source());
+	char buf[16];
+	BloombergLP::balber::BerEncoder encoder;
+	encoder.encodeAny((bsl::streambuf *)buf, obj);
+	sink(buf[0]); // $ ir
+}
+
+// ===== baljsn (JSON) =====
+
+// The non-deprecated overloads take a trailing DecoderOptions/EncoderOptions.
+void test_baljsn_decode_options() {
+	bsl::string data(source());
+	bsl::streambuf *sb = (bsl::streambuf *)data.data();
+	bsl::string out;
+	BloombergLP::baljsn::DecoderOptions options;
+	BloombergLP::baljsn::Decoder decoder;
+	decoder.decode(sb, &out, options);
+	sink(*out.data()); // $ ir
+}
+
+void test_baljsn_decode_istream_options_ptr() {
+	bsl::string data(source());
+	bsl::istream *is = (bsl::istream *)data.data();
+	bsl::string out;
+	BloombergLP::baljsn::DecoderOptions options;
+	BloombergLP::baljsn::Decoder decoder;
+	decoder.decode(*is, &out, &options);
+	sink(*out.data()); // $ ir
+}
+
+void test_baljsn_decodeAny() {
+	bsl::string data(source());
+	bsl::streambuf *sb = (bsl::streambuf *)data.data();
+	bsl::string out;
+	BloombergLP::baljsn::Decoder decoder;
+	decoder.decodeAny(sb, &out);
+	sink(*out.data()); // $ ir
+}
+
+void test_baljsn_encode_options() {
+	bsl::string obj(source());
+	char buf[16];
+	BloombergLP::baljsn::EncoderOptions options;
+	BloombergLP::baljsn::Encoder encoder;
+	encoder.encode((bsl::streambuf *)buf, obj, options);
+	sink(buf[0]); // $ ir
+}
+
+void test_baljsn_encodeAny() {
+	bsl::string obj(source());
+	char buf[16];
+	BloombergLP::baljsn::Encoder encoder;
+	encoder.encodeAny((bsl::streambuf *)buf, obj);
+	sink(buf[0]); // $ ir
+}
+
+// A decoded struct carries taint as a whole: re-encoding it taints the output stream.
+void test_baljsn_struct_round_trip() {
+	bsl::string data(source());
+	bsl::streambuf *sb = (bsl::streambuf *)data.data();
+	Record rec;
+	BloombergLP::baljsn::Decoder decoder;
+	decoder.decode(sb, &rec);
+	char buf[16];
+	BloombergLP::baljsn::Encoder encoder;
+	encoder.encode((bsl::streambuf *)buf, rec);
+	sink(buf[0]); // $ ir
+}
+
+void test_baljsn_struct_field_no_flow() {
+	bsl::string data(source());
+	bsl::streambuf *sb = (bsl::streambuf *)data.data();
+	Record rec;
+	BloombergLP::baljsn::Decoder decoder;
+	decoder.decode(sb, &rec);
+	sink(rec.name[0]); // no flow: Record::name does not inherit whole-object taint
+}
+
+// ===== balxml (XML) =====
+
+void test_balxml_decode_istream() {
+	bsl::string data(source());
+	bsl::istream *is = (bsl::istream *)data.data();
+	bsl::string out;
+	BloombergLP::balxml::Decoder decoder;
+	decoder.decode(*is, &out);
+	sink(*out.data()); // $ ir
+}
+
+void test_balxml_decode_istream_return() {
+	bsl::string data(source());
+	bsl::istream *is = (bsl::istream *)data.data();
+	bsl::string out;
+	BloombergLP::balxml::Decoder decoder;
+	bsl::istream &r = decoder.decode(*is, &out, "uri");
+	sink(*(char *)&r); // $ ir
+	sink(out); // $ ir
+}
+
+void test_balxml_decode_streambuf() {
+	bsl::string data(source());
+	bsl::streambuf *sb = (bsl::streambuf *)data.data();
+	bsl::string out;
+	BloombergLP::balxml::Decoder decoder;
+	decoder.decode(sb, &out);
+	sink(*out.data()); // $ ir
+}
+
+void test_balxml_decode_buffer_length() {
+	bsl::string data(source());
+	bsl::string out;
+	BloombergLP::balxml::Decoder decoder;
+	decoder.decode(data.data(), data.size(), &out);
+	sink(*out.data()); // $ ir
+}
+
+// decode(const char *filename, TYPE *) is not modelled.
+void test_balxml_decode_filename_no_flow() {
+	bsl::string filename(source());
+	bsl::string out;
+	BloombergLP::balxml::Decoder decoder;
+	decoder.decode(filename.data(), &out);
+	sink(*out.data()); // no flow: the input is a path, not data
+}
+
+// The two-step open() + decode(TYPE *) form is not modelled.
+void test_balxml_open_decode_no_flow() {
+	bsl::string data(source());
+	bsl::streambuf *sb = (bsl::streambuf *)data.data();
+	bsl::string out;
+	BloombergLP::balxml::Decoder decoder;
+	decoder.open(sb);
+	decoder.decode(&out);
+	sink(*out.data()); // $ MISSING: ir (not modelled)
+}
+
+void test_balxml_decodeAny_istream() {
+	bsl::string data(source());
+	bsl::istream *is = (bsl::istream *)data.data();
+	bsl::string out;
+	BloombergLP::balxml::Decoder decoder;
+	decoder.decodeAny(*is, &out);
+	sink(*out.data()); // $ ir
+}
+
+void test_balxml_decodeAny_istream_return() {
+	bsl::string data(source());
+	bsl::istream *is = (bsl::istream *)data.data();
+	bsl::string out;
+	BloombergLP::balxml::Decoder decoder;
+	bsl::istream &r = decoder.decodeAny(*is, &out);
+	sink(*(char *)&r); // $ ir
+	sink(out); // $ ir
+}
+
+void test_balxml_decodeAny_streambuf() {
+	bsl::string data(source());
+	bsl::streambuf *sb = (bsl::streambuf *)data.data();
+	bsl::string out;
+	BloombergLP::balxml::Decoder decoder;
+	decoder.decodeAny(sb, &out);
+	sink(*out.data()); // $ ir
+}
+
+void test_balxml_decodeAny_AnyRef_istream() {
+	bsl::string data(source());
+	bsl::istream *is = (bsl::istream *)data.data();
+	BloombergLP::bdlar::AnyRef any;
+	BloombergLP::balxml::Decoder decoder;
+	decoder.decodeAny(*is, &any);
+	sink(*(char *)&any); // $ ir
+}
+
+void test_balxml_decodeAny_AnyRef_istream_return() {
+	bsl::string data(source());
+	bsl::istream *is = (bsl::istream *)data.data();
+	BloombergLP::bdlar::AnyRef any;
+	BloombergLP::balxml::Decoder decoder;
+	bsl::istream &r = decoder.decodeAny(*is, &any);
+	sink(*(char *)&r); // $ ir
+	sink(*(char *)&any); // $ ir
+}
+
+void test_balxml_decodeAny_AnyRef_streambuf() {
+	bsl::string data(source());
+	bsl::streambuf *sb = (bsl::streambuf *)data.data();
+	BloombergLP::bdlar::AnyRef any;
+	BloombergLP::balxml::Decoder decoder;
+	decoder.decodeAny(sb, &any);
+	sink(*(char *)&any); // $ ir
+}
+
+void test_balxml_encode_streambuf() {
+	bsl::string obj(source());
+	char buf[16];
+	BloombergLP::balxml::Encoder encoder;
+	encoder.encode((bsl::streambuf *)buf, obj);
+	sink(buf[0]); // $ ir
+}
+
+void test_balxml_encode_ostream() {
+	bsl::string obj(source());
+	char buf[16];
+	BloombergLP::balxml::Encoder encoder;
+	encoder.encode(*(bsl::ostream *)buf, obj);
+	sink(buf[0]); // $ ir
+}
+
+void test_balxml_encode_ostream_return_from_object() {
+	bsl::string obj(source());
+	char buf[16];
+	BloombergLP::balxml::Encoder encoder;
+	bsl::ostream &r = encoder.encode(*(bsl::ostream *)buf, obj);
+	sink(*(char *)&r); // $ ir
+	sink(buf[0]); // $ ir
+}
+
+void test_balxml_encode_ostream_return_from_stream() {
+	bsl::string data(source());
+	bsl::ostream *os = (bsl::ostream *)data.data();
+	bsl::string obj;
+	BloombergLP::balxml::Encoder encoder;
+	bsl::ostream &r = encoder.encode(*os, obj);
+	sink(*(char *)&r); // $ ir
+}
+
+void test_balxml_encodeToStream() {
+	bsl::string obj(source());
+	char buf[16];
+	BloombergLP::balxml::Encoder encoder;
+	encoder.encodeToStream(*(bsl::ostream *)buf, obj);
+	sink(buf[0]); // $ ir
+}
+
+// encode(Formatter &, const TYPE &) is not modelled.
+void test_balxml_encode_formatter_no_flow() {
+	bsl::string obj(source());
+	char buf[16];
+	BloombergLP::balxml::Formatter *formatter = (BloombergLP::balxml::Formatter *)buf;
+	BloombergLP::balxml::Encoder encoder;
+	encoder.encode(*formatter, obj);
+	sink(buf[0]); // no flow: not modelled
+}
+
+void test_balxml_encodeAny_streambuf() {
+	bsl::string obj(source());
+	char buf[16];
+	BloombergLP::balxml::Encoder encoder;
+	encoder.encodeAny((bsl::streambuf *)buf, obj);
+	sink(buf[0]); // $ ir
+}
+
+void test_balxml_encodeAny_ostream() {
+	bsl::string obj(source());
+	char buf[16];
+	BloombergLP::balxml::Encoder encoder;
+	encoder.encodeAny(*(bsl::ostream *)buf, obj);
+	sink(buf[0]); // $ ir
+}
+
+void test_balxml_encodeAny_ostream_return_from_object() {
+	bsl::string obj(source());
+	char buf[16];
+	BloombergLP::balxml::Encoder encoder;
+	bsl::ostream &r = encoder.encodeAny(*(bsl::ostream *)buf, obj);
+	sink(*(char *)&r); // $ ir
+	sink(buf[0]); // $ ir
+}
+
+void test_balxml_encodeAnyToStream() {
+	bsl::string obj(source());
+	char buf[16];
+	BloombergLP::balxml::Encoder encoder;
+	encoder.encodeAnyToStream(*(bsl::ostream *)buf, obj);
+	sink(buf[0]); // $ ir
+}
+
+void test_balxml_encodeAny_AnyConstRef_streambuf() {
+	bsl::string data(source());
+	BloombergLP::bdlar::AnyConstRef *any = (BloombergLP::bdlar::AnyConstRef *)data.data();
+	char buf[16];
+	BloombergLP::balxml::Encoder encoder;
+	encoder.encodeAny((bsl::streambuf *)buf, *any);
+	sink(buf[0]); // $ ir
+}
+
+void test_balxml_encodeAny_AnyConstRef_ostream() {
+	bsl::string data(source());
+	BloombergLP::bdlar::AnyConstRef *any = (BloombergLP::bdlar::AnyConstRef *)data.data();
+	char buf[16];
+	BloombergLP::balxml::Encoder encoder;
+	encoder.encodeAny(*(bsl::ostream *)buf, *any);
+	sink(buf[0]); // $ ir
+}
+
+void test_balxml_encodeAny_AnyConstRef_ostream_return_from_object() {
+	bsl::string data(source());
+	BloombergLP::bdlar::AnyConstRef *any = (BloombergLP::bdlar::AnyConstRef *)data.data();
+	char buf[16];
+	BloombergLP::balxml::Encoder encoder;
+	bsl::ostream &r = encoder.encodeAny(*(bsl::ostream *)buf, *any);
+	sink(*(char *)&r); // $ ir
+	sink(buf[0]); // $ ir
+}
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/bdlbb.cpp b/cpp/ql/test/library-tests/dataflow/external-models/bdlbb.cpp
new file mode 100644
index 000000000000..6d600dd9c1a4
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/external-models/bdlbb.cpp
@@ -0,0 +1,81 @@
+#include "bsl.h"
+
+// --- stub library headers ---
+
+namespace BloombergLP {
+namespace bdlbb {
+	class BlobBuffer {
+	public:
+		char *data() const;
+		bsl::shared_ptr<char> &buffer();
+		const bsl::shared_ptr<char> &buffer() const;
+	};
+
+	class Blob {
+	public:
+		const BlobBuffer &buffer(int index) const;
+	};
+
+	struct BlobUtil {
+		static void copy(char *dstBuffer, const Blob &srcBlob, int position, int length);
+		static void copy(Blob *dstBlob, int dstOffset, const char *srcBuffer, int length);
+		static void copy(Blob *dstBlob, int dstOffset, const Blob &srcBlob, int srcOffset,
+		                 int length);
+		static char *getContiguousRangeOrCopy(char *dstBuffer, const Blob &srcBlob, int position,
+		                                      int length, int alignment);
+	};
+}
+}
+
+// --- test code ---
+
+char *source();
+void sink(char);
+
+// A blob populated from a tainted buffer taints the bytes read back out of it.
+void test_BlobUtil_copy() {
+	bsl::string s(source());
+	BloombergLP::bdlbb::Blob blob;
+	BloombergLP::bdlbb::BlobUtil::copy(&blob, 0, s.data(), s.size());
+	char dst[16];
+	BloombergLP::bdlbb::BlobUtil::copy(dst, blob, 0, 16);
+	sink(*dst); // $ ir
+}
+
+void test_accessor_chain() {
+	bsl::string s(source());
+	BloombergLP::bdlbb::Blob blob;
+	BloombergLP::bdlbb::BlobUtil::copy(&blob, 0, s.data(), s.size());
+	const char *p = blob.buffer(0).data();
+	sink(*p); // $ ir
+}
+
+// The get() step comes from the built-in smart pointer model, not from bdlbb.model.yml.
+void test_accessor_chain_shared_ptr() {
+	bsl::string s(source());
+	BloombergLP::bdlbb::Blob blob;
+	BloombergLP::bdlbb::BlobUtil::copy(&blob, 0, s.data(), s.size());
+	const char *p = blob.buffer(0).buffer().get();
+	sink(*p); // $ ir
+}
+
+void test_getContiguousRangeOrCopy() {
+	bsl::string s(source());
+	BloombergLP::bdlbb::Blob blob;
+	BloombergLP::bdlbb::BlobUtil::copy(&blob, 0, s.data(), s.size());
+	char dst[16];
+	char *r = BloombergLP::bdlbb::BlobUtil::getContiguousRangeOrCopy(dst, blob, 0, 16, 1);
+	sink(*r); // $ ir
+}
+
+// A blob copied into another blob carries the taint across.
+void test_BlobUtil_copy_blob_to_blob() {
+	bsl::string s(source());
+	BloombergLP::bdlbb::Blob src;
+	BloombergLP::bdlbb::BlobUtil::copy(&src, 0, s.data(), s.size());
+	BloombergLP::bdlbb::Blob dst;
+	BloombergLP::bdlbb::BlobUtil::copy(&dst, 0, src, 0, 16);
+	char out[16];
+	BloombergLP::bdlbb::BlobUtil::copy(out, dst, 0, 16);
+	sink(*out); // $ ir
+}
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/bmqa.cpp b/cpp/ql/test/library-tests/dataflow/external-models/bmqa.cpp
new file mode 100644
index 000000000000..2cd303489c00
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/external-models/bmqa.cpp
@@ -0,0 +1,394 @@
+#include "bsl.h"
+
+// --- stub library headers ---
+
+namespace BloombergLP {
+namespace bslma {
+	class Allocator {};
+}
+namespace bsls {
+	struct Types { typedef long long Int64; };
+}
+
+namespace bdlbb {
+	class Blob {};
+	class BlobBufferFactory {};
+	struct BlobUtil {
+		static void copy(char *dstBuffer, const Blob &srcBlob, int position, int length);
+		static void copy(Blob *dstBlob, int dstOffset, const char *srcBuffer, int length);
+	};
+}
+
+namespace bmqa {
+	class MessageProperties;
+	class Message {
+	public:
+		Message& setData(const bdlbb::Blob* data);
+		Message& setData(const char* data, bsl::size_t length);
+		Message& setDataRef(const bdlbb::Blob* data);
+		Message& setDataRef(const char* data, bsl::size_t length);
+		Message& setPropertiesRef(const MessageProperties* properties);
+		Message clone(bslma::Allocator* basicAllocator = 0) const;
+		int getData(bdlbb::Blob* blob) const;
+		int loadProperties(MessageProperties* buffer) const;
+	};
+	class MessageProperties {
+	public:
+		explicit MessageProperties(bslma::Allocator* basicAllocator = 0);
+		MessageProperties(const MessageProperties& other, bslma::Allocator* basicAllocator = 0);
+		MessageProperties& operator=(const MessageProperties& rhs);
+		int setPropertyAsBool(bsl::string_view name, bool value);
+		int setPropertyAsChar(bsl::string_view name, char value);
+		int setPropertyAsShort(bsl::string_view name, short value);
+		int setPropertyAsInt32(bsl::string_view name, bsl::int32_t value);
+		int setPropertyAsInt64(bsl::string_view name, bsls::Types::Int64 value);
+		int setPropertyAsString(bsl::string_view name, bsl::string_view value);
+		int setPropertyAsBinary(bsl::string_view name, bsl::span<const char> value);
+		int streamIn(const bdlbb::Blob& blob);
+		const bdlbb::Blob& streamOut(bdlbb::BlobBufferFactory* bufferFactory) const;
+		bsl::int32_t getPropertyAsInt32(bsl::string_view name) const;
+		const bsl::string& getPropertyAsString(bsl::string_view name) const;
+		const bsl::vector<char>& getPropertyAsBinary(bsl::string_view name) const;
+		const bsl::string& getPropertyAsStringOr(bsl::string_view name, const bsl::string& value) const;
+		const bsl::vector<char>& getPropertyAsBinaryOr(bsl::string_view name, const bsl::vector<char>& value) const;
+	};
+	class MessagePropertiesIterator {
+	public:
+		MessagePropertiesIterator();
+		explicit MessagePropertiesIterator(const MessageProperties* properties);
+		MessagePropertiesIterator& operator=(const MessagePropertiesIterator& rhs);
+		bool hasNext();
+		const bsl::string& name() const;
+		bsl::int32_t getAsInt32() const;
+		const bsl::string& getAsString() const;
+		const bsl::vector<char>& getAsBinary() const;
+	};
+	class MessageIterator {
+	public:
+		bool nextMessage();
+		const Message& message() const;
+	};
+	class MessageEvent {
+	public:
+		MessageIterator messageIterator() const;
+	};
+}
+}
+
+// --- test code ---
+
+char *source();
+void sink(char);
+void sink(int);
+
+// A received message or event is made by reinterpreting a tainted bsl::string.
+
+void test_getData() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bdlbb::Blob blob;
+	msg->getData(&blob);
+	char dst[16];
+	BloombergLP::bdlbb::BlobUtil::copy(dst, blob, 0, 16);
+	sink(*dst); // $ ir
+}
+
+void test_event_iterator_message_getData() {
+	bsl::string data(source());
+	BloombergLP::bmqa::MessageEvent *event = (BloombergLP::bmqa::MessageEvent *)data.data();
+	BloombergLP::bmqa::MessageIterator it = event->messageIterator();
+	while (it.nextMessage()) {
+		const BloombergLP::bmqa::Message &msg = it.message();
+		BloombergLP::bdlbb::Blob blob;
+		msg.getData(&blob);
+		char dst[16];
+		BloombergLP::bdlbb::BlobUtil::copy(dst, blob, 0, 16);
+		sink(*dst); // $ ir
+	}
+}
+
+void test_setDataRef_getData_round_trip() {
+	bsl::string s(source());
+	BloombergLP::bdlbb::Blob in;
+	BloombergLP::bdlbb::BlobUtil::copy(&in, 0, s.data(), s.size());
+	BloombergLP::bmqa::Message msg;
+	msg.setDataRef(&in);
+	BloombergLP::bdlbb::Blob out;
+	msg.getData(&out);
+	char dst[16];
+	BloombergLP::bdlbb::BlobUtil::copy(dst, out, 0, 16);
+	sink(*dst); // $ ir
+}
+
+void test_setDataRef_chars_getData() {
+	bsl::string s(source());
+	BloombergLP::bmqa::Message msg;
+	msg.setDataRef(s.data(), s.size());
+	BloombergLP::bdlbb::Blob out;
+	msg.getData(&out);
+	char dst[16];
+	BloombergLP::bdlbb::BlobUtil::copy(dst, out, 0, 16);
+	sink(*dst); // $ ir
+}
+
+void test_setData_getData() {
+	bsl::string s(source());
+	BloombergLP::bmqa::Message msg;
+	msg.setData(s.data(), s.size());
+	BloombergLP::bdlbb::Blob out;
+	msg.getData(&out);
+	char dst[16];
+	BloombergLP::bdlbb::BlobUtil::copy(dst, out, 0, 16);
+	sink(*dst); // $ ir
+}
+
+void test_clone_getData() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bmqa::Message copy = msg->clone();
+	BloombergLP::bdlbb::Blob blob;
+	copy.getData(&blob);
+	char dst[16];
+	BloombergLP::bdlbb::BlobUtil::copy(dst, blob, 0, 16);
+	sink(*dst); // $ ir
+}
+
+void test_loadProperties_getPropertyAsString() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	msg->loadProperties(&props);
+	const bsl::string &value = props.getPropertyAsString("key");
+	sink(value.data()[0]); // $ ir
+}
+
+void test_loadProperties_getPropertyAsBinary() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	msg->loadProperties(&props);
+	const bsl::vector<char> &value = props.getPropertyAsBinary("key");
+	sink(value.data()[0]); // $ ir
+}
+
+void test_loadProperties_getPropertyAsBinary_index() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	msg->loadProperties(&props);
+	const bsl::vector<char> &value = props.getPropertyAsBinary("key");
+	sink(value[0]); // $ ir
+}
+
+void test_getPropertyAsStringOr() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	msg->loadProperties(&props);
+	bsl::string dflt;
+	const bsl::string &value = props.getPropertyAsStringOr("key", dflt);
+	sink(*value.data()); // $ ir
+}
+
+// The default value is returned when the property is absent.
+void test_getPropertyAsStringOr_default() {
+	bsl::string dflt(source());
+	BloombergLP::bmqa::MessageProperties props;
+	const bsl::string &value = props.getPropertyAsStringOr("key", dflt);
+	sink(*value.data()); // $ ir
+}
+
+void test_getPropertyAsBinaryOr() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	msg->loadProperties(&props);
+	bsl::vector<char> dflt;
+	const bsl::vector<char> &value = props.getPropertyAsBinaryOr("key", dflt);
+	sink(*value.data()); // $ ir
+}
+
+void test_getPropertyAsBinaryOr_default() {
+	char c = *source();
+	bsl::vector<char> dflt;
+	dflt.push_back(c);
+	BloombergLP::bmqa::MessageProperties props;
+	const bsl::vector<char> &value = props.getPropertyAsBinaryOr("key", dflt);
+	sink(*value.data()); // $ ir
+}
+
+void test_getPropertyAsInt32_no_flow() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	msg->loadProperties(&props);
+	sink(props.getPropertyAsInt32("key")); // no flow: scalar getters are not modelled
+}
+
+void test_streamIn_getPropertyAsString() {
+	bsl::string s(source());
+	BloombergLP::bdlbb::Blob blob;
+	BloombergLP::bdlbb::BlobUtil::copy(&blob, 0, s.data(), s.size());
+	BloombergLP::bmqa::MessageProperties props;
+	props.streamIn(blob);
+	sink(*props.getPropertyAsString("key").data()); // $ ir
+}
+
+void test_setPropertiesRef_loadProperties() {
+	bsl::string s(source());
+	BloombergLP::bdlbb::Blob blob;
+	BloombergLP::bdlbb::BlobUtil::copy(&blob, 0, s.data(), s.size());
+	BloombergLP::bmqa::MessageProperties in;
+	in.streamIn(blob);
+	BloombergLP::bmqa::Message msg;
+	msg.setPropertiesRef(&in);
+	BloombergLP::bmqa::MessageProperties out;
+	msg.loadProperties(&out);
+	sink(*out.getPropertyAsString("key").data()); // $ ir
+}
+
+void test_streamOut() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	msg->loadProperties(&props);
+	BloombergLP::bdlbb::BlobBufferFactory factory;
+	const BloombergLP::bdlbb::Blob &blob = props.streamOut(&factory);
+	char dst[16];
+	BloombergLP::bdlbb::BlobUtil::copy(dst, blob, 0, 16);
+	sink(*dst); // $ ir
+}
+
+void test_copy_constructor() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	msg->loadProperties(&props);
+	BloombergLP::bmqa::MessageProperties copy(props);
+	sink(*copy.getPropertyAsString("key").data()); // $ ir
+}
+
+void test_assignment() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	msg->loadProperties(&props);
+	BloombergLP::bmqa::MessageProperties copy;
+	copy = props;
+	sink(*copy.getPropertyAsString("key").data()); // $ ir
+}
+
+void test_assignment_result() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	msg->loadProperties(&props);
+	BloombergLP::bmqa::MessageProperties copy;
+	sink(*(copy = props).getPropertyAsString("key").data()); // $ ir
+}
+
+void test_setPropertyAsString() {
+	bsl::string data(source());
+	bsl::string_view *value = (bsl::string_view *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	props.setPropertyAsString("key", *value);
+	sink(*props.getPropertyAsString("key").data()); // $ ir
+}
+
+void test_setPropertyAsString_from_chars() {
+	bsl::string_view value(source());
+	BloombergLP::bmqa::MessageProperties props;
+	props.setPropertyAsString("key", value);
+	sink(*props.getPropertyAsString("key").data()); // $ ir
+}
+
+void test_setPropertyAsBinary() {
+	bsl::string data(source());
+	bsl::span<const char> *value = (bsl::span<const char> *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	props.setPropertyAsBinary("key", *value);
+	sink(*props.getPropertyAsBinary("key").data()); // $ ir
+}
+
+// A stored property name is exposed again by the iterator.
+void test_setPropertyAsBool_name() {
+	bsl::string_view name(source());
+	BloombergLP::bmqa::MessageProperties props;
+	props.setPropertyAsBool(name, true);
+	BloombergLP::bmqa::MessagePropertiesIterator it(&props);
+	sink(*it.name().data()); // $ ir
+}
+
+void test_setPropertyAsChar_name() {
+	bsl::string_view name(source());
+	BloombergLP::bmqa::MessageProperties props;
+	props.setPropertyAsChar(name, 'c');
+	BloombergLP::bmqa::MessagePropertiesIterator it(&props);
+	sink(*it.name().data()); // $ ir
+}
+
+void test_setPropertyAsShort_name() {
+	bsl::string_view name(source());
+	BloombergLP::bmqa::MessageProperties props;
+	props.setPropertyAsShort(name, 1);
+	BloombergLP::bmqa::MessagePropertiesIterator it(&props);
+	sink(*it.name().data()); // $ ir
+}
+
+void test_setPropertyAsInt32_name() {
+	bsl::string_view name(source());
+	BloombergLP::bmqa::MessageProperties props;
+	props.setPropertyAsInt32(name, 1);
+	BloombergLP::bmqa::MessagePropertiesIterator it(&props);
+	sink(*it.name().data()); // $ ir
+}
+
+void test_setPropertyAsInt64_name() {
+	bsl::string_view name(source());
+	BloombergLP::bmqa::MessageProperties props;
+	props.setPropertyAsInt64(name, 1);
+	BloombergLP::bmqa::MessagePropertiesIterator it(&props);
+	sink(*it.name().data()); // $ ir
+}
+
+void test_setPropertyAsString_name() {
+	bsl::string_view name(source());
+	BloombergLP::bmqa::MessageProperties props;
+	props.setPropertyAsString(name, "value");
+	BloombergLP::bmqa::MessagePropertiesIterator it(&props);
+	sink(*it.name().data()); // $ ir
+}
+
+void test_setPropertyAsBinary_name() {
+	bsl::string_view name(source());
+	BloombergLP::bmqa::MessageProperties props;
+	props.setPropertyAsBinary(name, bsl::span<const char>());
+	BloombergLP::bmqa::MessagePropertiesIterator it(&props);
+	sink(*it.name().data()); // $ ir
+}
+
+void test_iterator() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	msg->loadProperties(&props);
+	BloombergLP::bmqa::MessagePropertiesIterator it(&props);
+	while (it.hasNext()) {
+		sink(*it.name().data()); // $ ir
+		sink(*it.getAsString().data()); // $ ir
+		sink(*it.getAsBinary().data()); // $ ir
+		sink(it.getAsInt32()); // no flow: scalar getters are not modelled
+	}
+}
+
+void test_iterator_assignment() {
+	bsl::string data(source());
+	BloombergLP::bmqa::Message *msg = (BloombergLP::bmqa::Message *)data.data();
+	BloombergLP::bmqa::MessageProperties props;
+	msg->loadProperties(&props);
+	BloombergLP::bmqa::MessagePropertiesIterator it(&props);
+	BloombergLP::bmqa::MessagePropertiesIterator copy;
+	copy = it;
+	sink(*copy.getAsString().data()); // $ ir
+	sink(*(copy = it).name().data()); // $ ir
+}
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/bsl.h b/cpp/ql/test/library-tests/dataflow/external-models/bsl.h
new file mode 100644
index 000000000000..2183b996faa6
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/external-models/bsl.h
@@ -0,0 +1,49 @@
+#ifndef CODEQL_TEST_BSL_STRING_H
+#define CODEQL_TEST_BSL_STRING_H
+
+namespace bsl {
+	typedef unsigned long size_t;
+	typedef int int32_t;
+	template <class T> class allocator {};
+	template<class charT> struct char_traits {};
+	template<class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
+	class basic_string {
+	public:
+		basic_string();
+		basic_string(const charT* s, const Allocator& a = Allocator());
+		const charT* data() const;
+		size_t size() const;
+	};
+	typedef basic_string<char> string;
+	template<class charT, class traits = char_traits<charT> >
+	class basic_string_view {
+	public:
+		basic_string_view();
+		basic_string_view(const charT* s);
+		const charT* data() const;
+	};
+	typedef basic_string_view<char> string_view;
+	template <class T, class Allocator = allocator<T> >
+	class vector {
+	public:
+		vector();
+		const T* data() const;
+		const T& operator[](size_t i) const;
+		void push_back(const T& value);
+	};
+	template <class T> class span {
+	public:
+		span();
+		span(T* p, size_t n);
+		T* data() const;
+	};
+	template <class T> class shared_ptr {
+	public:
+		T *get() const;
+	};
+	class streambuf {};
+	class istream {};
+	class ostream {};
+}
+
+#endif
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/bslx.cpp b/cpp/ql/test/library-tests/dataflow/external-models/bslx.cpp
new file mode 100644
index 000000000000..22178f3c3e49
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/external-models/bslx.cpp
@@ -0,0 +1,341 @@
+#include "../taint-tests/stl.h"
+
+// BDE spells the standard string as `bsl::string`; alias it onto the stub above.
+namespace bsl {
+	using std::string;
+}
+
+// BDE wraps every package-group namespace in `BloombergLP`; this stub reproduces that.
+namespace BloombergLP {
+namespace bslstl {
+	template <class CHAR_TYPE> class StringRefImp {};
+	typedef StringRefImp<char> StringRef;
+}
+namespace bsls {
+	// `bsls::Types` provides the fixed-width integer aliases used by the stream API.
+	struct Types {
+		typedef long long Int64;
+		typedef unsigned long long Uint64;
+	};
+}
+namespace bslx {
+	class ByteInStream {
+	public:
+		ByteInStream();
+		ByteInStream(const char *buffer, std::size_t numBytes);
+		void reset();
+		void reset(const char *buffer, std::size_t numBytes);
+		void reset(const bslstl::StringRef &srcData);
+		ByteInStream &getLength(int &variable);
+		ByteInStream &getVersion(int &variable);
+		ByteInStream &getInt8(char &variable);
+		ByteInStream &getUint8(unsigned char &variable);
+		ByteInStream &getInt16(short &variable);
+		ByteInStream &getUint16(unsigned short &variable);
+		ByteInStream &getInt24(int &variable);
+		ByteInStream &getUint24(unsigned int &variable);
+		ByteInStream &getInt32(int &variable);
+		ByteInStream &getUint32(unsigned int &variable);
+		ByteInStream &getInt40(bsls::Types::Int64 &variable);
+		ByteInStream &getUint40(bsls::Types::Uint64 &variable);
+		ByteInStream &getInt48(bsls::Types::Int64 &variable);
+		ByteInStream &getUint48(bsls::Types::Uint64 &variable);
+		ByteInStream &getInt56(bsls::Types::Int64 &variable);
+		ByteInStream &getUint56(bsls::Types::Uint64 &variable);
+		ByteInStream &getInt64(bsls::Types::Int64 &variable);
+		ByteInStream &getUint64(bsls::Types::Uint64 &variable);
+		ByteInStream &getFloat32(float &variable);
+		ByteInStream &getFloat64(double &variable);
+		ByteInStream &getString(bsl::string &variable);
+		ByteInStream &getArrayInt8(char *variables, int numVariables);
+		ByteInStream &getArrayUint8(unsigned char *variables, int numVariables);
+		ByteInStream &getArrayInt16(short *variables, int numVariables);
+		ByteInStream &getArrayUint16(unsigned short *variables, int numVariables);
+		ByteInStream &getArrayInt24(int *variables, int numVariables);
+		ByteInStream &getArrayUint24(unsigned int *variables, int numVariables);
+		ByteInStream &getArrayInt32(int *variables, int numVariables);
+		ByteInStream &getArrayUint32(unsigned int *variables, int numVariables);
+		ByteInStream &getArrayInt40(bsls::Types::Int64 *variables, int numVariables);
+		ByteInStream &getArrayUint40(bsls::Types::Uint64 *variables, int numVariables);
+		ByteInStream &getArrayInt48(bsls::Types::Int64 *variables, int numVariables);
+		ByteInStream &getArrayUint48(bsls::Types::Uint64 *variables, int numVariables);
+		ByteInStream &getArrayInt56(bsls::Types::Int64 *variables, int numVariables);
+		ByteInStream &getArrayUint56(bsls::Types::Uint64 *variables, int numVariables);
+		ByteInStream &getArrayInt64(bsls::Types::Int64 *variables, int numVariables);
+		ByteInStream &getArrayUint64(bsls::Types::Uint64 *variables, int numVariables);
+		ByteInStream &getArrayFloat32(float *variables, int numVariables);
+		ByteInStream &getArrayFloat64(double *variables, int numVariables);
+	};
+
+	template <class STREAMBUF>
+	class GenericInStream {
+	public:
+		GenericInStream(STREAMBUF *streamBuf);
+		GenericInStream &getLength(int &variable);
+		GenericInStream &getVersion(int &variable);
+		GenericInStream &getInt8(char &variable);
+		GenericInStream &getUint8(unsigned char &variable);
+		GenericInStream &getInt16(short &variable);
+		GenericInStream &getUint16(unsigned short &variable);
+		GenericInStream &getInt24(int &variable);
+		GenericInStream &getUint24(unsigned int &variable);
+		GenericInStream &getInt32(int &variable);
+		GenericInStream &getUint32(unsigned int &variable);
+		GenericInStream &getInt40(bsls::Types::Int64 &variable);
+		GenericInStream &getUint40(bsls::Types::Uint64 &variable);
+		GenericInStream &getInt48(bsls::Types::Int64 &variable);
+		GenericInStream &getUint48(bsls::Types::Uint64 &variable);
+		GenericInStream &getInt56(bsls::Types::Int64 &variable);
+		GenericInStream &getUint56(bsls::Types::Uint64 &variable);
+		GenericInStream &getInt64(bsls::Types::Int64 &variable);
+		GenericInStream &getUint64(bsls::Types::Uint64 &variable);
+		GenericInStream &getFloat32(float &variable);
+		GenericInStream &getFloat64(double &variable);
+		GenericInStream &getString(bsl::string &variable);
+		GenericInStream &getArrayInt8(char *variables, int numVariables);
+		GenericInStream &getArrayUint8(unsigned char *variables, int numVariables);
+		GenericInStream &getArrayInt16(short *variables, int numVariables);
+		GenericInStream &getArrayUint16(unsigned short *variables, int numVariables);
+		GenericInStream &getArrayInt24(int *variables, int numVariables);
+		GenericInStream &getArrayUint24(unsigned int *variables, int numVariables);
+		GenericInStream &getArrayInt32(int *variables, int numVariables);
+		GenericInStream &getArrayUint32(unsigned int *variables, int numVariables);
+		GenericInStream &getArrayInt40(bsls::Types::Int64 *variables, int numVariables);
+		GenericInStream &getArrayUint40(bsls::Types::Uint64 *variables, int numVariables);
+		GenericInStream &getArrayInt48(bsls::Types::Int64 *variables, int numVariables);
+		GenericInStream &getArrayUint48(bsls::Types::Uint64 *variables, int numVariables);
+		GenericInStream &getArrayInt56(bsls::Types::Int64 *variables, int numVariables);
+		GenericInStream &getArrayUint56(bsls::Types::Uint64 *variables, int numVariables);
+		GenericInStream &getArrayInt64(bsls::Types::Int64 *variables, int numVariables);
+		GenericInStream &getArrayUint64(bsls::Types::Uint64 *variables, int numVariables);
+		GenericInStream &getArrayFloat32(float *variables, int numVariables);
+		GenericInStream &getArrayFloat64(double *variables, int numVariables);
+	};
+
+	namespace InStreamFunctions {
+		template <class STREAM, class TYPE>
+		STREAM &bdexStreamIn(STREAM &stream, TYPE &variable);
+		template <class STREAM, class TYPE>
+		STREAM &bdexStreamIn(STREAM &stream, TYPE &variable, int version);
+		template <class STREAM>
+		STREAM &bdexStreamIn(STREAM &stream, int &variable, int version = 0) {
+			return stream.getInt32(variable);
+		}
+	}
+}
+}
+
+struct MyStreamBuf {};
+
+char *source();
+void sink(int);
+void sink(char);
+
+// --- flow tests (source -> sink) ---
+
+void test_ByteInStream_getInt32_no_flow() {
+	std::string data = std::string(source());
+	BloombergLP::bslx::ByteInStream stream(data.data(), data.size());
+	int x = 0;
+	stream.getInt32(x);
+	sink(x); // no flow: scalar outputs are deliberately not modeled
+}
+
+void test_ByteInStream_getArrayInt8() {
+	std::string data = std::string(source());
+	BloombergLP::bslx::ByteInStream stream(data.data(), data.size());
+	char buf[16];
+	stream.getArrayInt8(buf, 16);
+	sink(*buf); // $ ir
+}
+
+void test_ByteInStream_getString() {
+	std::string data = std::string(source());
+	BloombergLP::bslx::ByteInStream stream(data.data(), data.size());
+	std::string out;
+	stream.getString(out);
+	sink(*out.data()); // $ ir
+}
+
+void test_ByteInStream_chained() {
+	std::string data = std::string(source());
+	BloombergLP::bslx::ByteInStream stream(data.data(), data.size());
+	int a = 0;
+	bsl::string out;
+	stream.getInt32(a).getString(out);
+	sink(*out.data()); // $ ir
+}
+
+void test_ByteInStream_reset() {
+	BloombergLP::bslx::ByteInStream stream;
+	std::string data = std::string(source());
+	stream.reset(data.data(), data.size());
+	bsl::string out;
+	stream.getString(out);
+	sink(*out.data()); // $ ir
+}
+
+void test_GenericInStream_flow() {
+	std::string data = std::string(source());
+	MyStreamBuf *sb = (MyStreamBuf *)data.data();
+	BloombergLP::bslx::GenericInStream<MyStreamBuf> stream(sb);
+	bsl::string out;
+	stream.getString(out);
+	sink(*out.data()); // $ ir
+}
+
+void test_GenericInStream_getInt32_no_flow() {
+	std::string data = std::string(source());
+	MyStreamBuf *sb = (MyStreamBuf *)data.data();
+	BloombergLP::bslx::GenericInStream<MyStreamBuf> stream(sb);
+	int x = 0;
+	stream.getInt32(x);
+	sink(x); // no flow: scalar outputs are deliberately not modeled
+}
+
+void test_bdexStreamIn() {
+	std::string data = std::string(source());
+	BloombergLP::bslx::ByteInStream stream(data.data(), data.size());
+	bsl::string obj;
+	BloombergLP::bslx::InStreamFunctions::bdexStreamIn(stream, obj);
+	sink(*obj.data()); // $ ir
+}
+
+// --- coverage: verify flow through every modeled getter in a fluent chain ---
+
+void coverage_ByteInStream() {
+	std::string data = std::string(source());
+	BloombergLP::bslx::ByteInStream stream(data.data(), data.size());
+	int i = 0;
+	unsigned int ui = 0;
+	char c = 0;
+	unsigned char uc = 0;
+	short s = 0;
+	unsigned short us = 0;
+	BloombergLP::bsls::Types::Int64 ll = 0;
+	BloombergLP::bsls::Types::Uint64 ull = 0;
+	float f = 0;
+	double d = 0;
+	bsl::string str;
+	char cbuf[16];
+	unsigned char ucbuf[16];
+	short sbuf[16];
+	unsigned short usbuf[16];
+	int ibuf[16];
+	unsigned int uibuf[16];
+	BloombergLP::bsls::Types::Int64 llbuf[16];
+	BloombergLP::bsls::Types::Uint64 ullbuf[16];
+	float fbuf[16];
+	double dbuf[16];
+	bsl::string out;
+	stream.getLength(i).getVersion(i).getInt8(c).getUint8(uc).getInt16(s).getUint16(us).getInt24(i).getUint24(ui).getInt32(i).getUint32(ui).getInt40(ll).getUint40(ull).getInt48(ll).getUint48(ull).getInt56(ll).getUint56(ull).getInt64(ll).getUint64(ull).getFloat32(f).getFloat64(d).getString(str).getArrayInt8(cbuf, 16).getArrayUint8(ucbuf, 16).getArrayInt16(sbuf, 16).getArrayUint16(usbuf, 16).getArrayInt24(ibuf, 16).getArrayUint24(uibuf, 16).getArrayInt32(ibuf, 16).getArrayUint32(uibuf, 16).getArrayInt40(llbuf, 16).getArrayUint40(ullbuf, 16).getArrayInt48(llbuf, 16).getArrayUint48(ullbuf, 16).getArrayInt56(llbuf, 16).getArrayUint56(ullbuf, 16).getArrayInt64(llbuf, 16).getArrayUint64(ullbuf, 16).getArrayFloat32(fbuf, 16).getArrayFloat64(dbuf, 16).getString(out);
+	sink(*out.data()); // $ ir
+}
+
+void coverage_GenericInStream() {
+	std::string data = std::string(source());
+	MyStreamBuf *sb = (MyStreamBuf *)data.data();
+	BloombergLP::bslx::GenericInStream<MyStreamBuf> stream(sb);
+	int i = 0;
+	unsigned int ui = 0;
+	char c = 0;
+	unsigned char uc = 0;
+	short s = 0;
+	unsigned short us = 0;
+	BloombergLP::bsls::Types::Int64 ll = 0;
+	BloombergLP::bsls::Types::Uint64 ull = 0;
+	float f = 0;
+	double d = 0;
+	bsl::string str;
+	char cbuf[16];
+	unsigned char ucbuf[16];
+	short sbuf[16];
+	unsigned short usbuf[16];
+	int ibuf[16];
+	unsigned int uibuf[16];
+	BloombergLP::bsls::Types::Int64 llbuf[16];
+	BloombergLP::bsls::Types::Uint64 ullbuf[16];
+	float fbuf[16];
+	double dbuf[16];
+	bsl::string out;
+	stream.getLength(i).getVersion(i).getInt8(c).getUint8(uc).getInt16(s).getUint16(us).getInt24(i).getUint24(ui).getInt32(i).getUint32(ui).getInt40(ll).getUint40(ull).getInt48(ll).getUint48(ull).getInt56(ll).getUint56(ull).getInt64(ll).getUint64(ull).getFloat32(f).getFloat64(d).getString(str).getArrayInt8(cbuf, 16).getArrayUint8(ucbuf, 16).getArrayInt16(sbuf, 16).getArrayUint16(usbuf, 16).getArrayInt24(ibuf, 16).getArrayUint24(uibuf, 16).getArrayInt32(ibuf, 16).getArrayUint32(uibuf, 16).getArrayInt40(llbuf, 16).getArrayUint40(ullbuf, 16).getArrayInt48(llbuf, 16).getArrayUint48(ullbuf, 16).getArrayInt56(llbuf, 16).getArrayUint56(ullbuf, 16).getArrayInt64(llbuf, 16).getArrayUint64(ullbuf, 16).getArrayFloat32(fbuf, 16).getArrayFloat64(dbuf, 16).getString(out);
+	sink(*out.data()); // $ ir
+}
+
+void test_bdexStreamIn_integer() {
+	std::string data = std::string(source());
+	BloombergLP::bslx::ByteInStream stream(data.data(), data.size());
+	int x = 0;
+	BloombergLP::bslx::InStreamFunctions::bdexStreamIn(stream, x);
+	sink(x); // $ ir
+	BloombergLP::bslx::InStreamFunctions::bdexStreamIn(stream, x, 0);
+	sink(x); // $ ir
+	bsl::string out;
+	BloombergLP::bslx::InStreamFunctions::bdexStreamIn(stream, x, 0).getString(out);
+	sink(*out.data()); // $ ir
+}
+
+void test_bdexStreamIn_versioned_string() {
+	std::string data = std::string(source());
+	BloombergLP::bslx::ByteInStream stream(data.data(), data.size());
+	bsl::string out;
+	BloombergLP::bslx::InStreamFunctions::bdexStreamIn(stream, out, 1);
+	sink(*out.data()); // $ ir
+}
+
+struct BdexObject {
+	int value;
+};
+
+void sink(BdexObject);
+
+void test_bdexStreamIn_object() {
+	std::string data = std::string(source());
+	BloombergLP::bslx::ByteInStream stream(data.data(), data.size());
+	BdexObject out;
+	BloombergLP::bslx::InStreamFunctions::bdexStreamIn(stream, out, 1);
+	sink(out); // $ ir
+}
+
+namespace StringRefTest {
+	BloombergLP::bslstl::StringRef source();
+}
+
+void test_ByteInStream_reset_stringref() {
+	BloombergLP::bslx::ByteInStream stream;
+	BloombergLP::bslstl::StringRef data = StringRefTest::source();
+	stream.reset(data);
+	bsl::string out;
+	stream.getString(out);
+	sink(*out.data()); // $ ir
+}
+
+void test_ByteInStream_reset_rewind() {
+	std::string data = std::string(source());
+	BloombergLP::bslx::ByteInStream stream(data.data(), data.size());
+	stream.reset();
+	bsl::string out;
+	stream.getString(out);
+	sink(*out.data()); // $ ir
+}
+
+void test_ByteInStream_reset_clean_buffer() {
+	BloombergLP::bslx::ByteInStream stream;
+	const char data[] = "clean";
+	stream.reset(data, *source());
+	stream.reset();
+	bsl::string out;
+	stream.getString(out);
+	sink(*out.data()); // no flow: the tainted length does not taint the buffer
+}
+
+void test_ByteInStream_reset_replaces_buffer() {
+	std::string data = std::string(source());
+	BloombergLP::bslx::ByteInStream stream(data.data(), data.size());
+	const char clean[] = "clean";
+	stream.reset(clean, sizeof(clean));
+	bsl::string out;
+	stream.getString(out);
+	// Known false positive: this summary does not kill taint from the old buffer.
+	sink(*out.data()); // $ SPURIOUS: ir
+}
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/flow.expected b/cpp/ql/test/library-tests/dataflow/external-models/flow.expected
index 24ba3b2aa686..e4d8ca07ccf0 100644
--- a/cpp/ql/test/library-tests/dataflow/external-models/flow.expected
+++ b/cpp/ql/test/library-tests/dataflow/external-models/flow.expected
@@ -1,239 +1,1482 @@
 models
-| 1 | Sink: ; ; false; ymlSink; ; ; Argument[0]; test-sink; manual |
-| 2 | Sink: boost::asio; ; false; write; ; ; Argument[*1]; remote-sink; manual |
-| 3 | Source: ; ; false; GetCommandLineA; ; ; ReturnValue[*]; local; manual |
-| 4 | Source: ; ; false; GetEnvironmentStringsA; ; ; ReturnValue[*]; local; manual |
-| 5 | Source: ; ; false; GetEnvironmentVariableA; ; ; Argument[*1]; local; manual |
-| 6 | Source: ; ; false; HttpReceiveClientCertificate; ; ; Argument[*3]; remote; manual |
-| 7 | Source: ; ; false; HttpReceiveHttpRequest; ; ; Argument[*3]; remote; manual |
-| 8 | Source: ; ; false; HttpReceiveRequestEntityBody; ; ; Argument[*3]; remote; manual |
-| 9 | Source: ; ; false; MapViewOfFile2; ; ; ReturnValue[*]; local; manual |
-| 10 | Source: ; ; false; MapViewOfFile3; ; ; ReturnValue[*]; local; manual |
-| 11 | Source: ; ; false; MapViewOfFile3FromApp; ; ; ReturnValue[*]; local; manual |
-| 12 | Source: ; ; false; MapViewOfFile; ; ; ReturnValue[*]; local; manual |
-| 13 | Source: ; ; false; MapViewOfFileEx; ; ; ReturnValue[*]; local; manual |
-| 14 | Source: ; ; false; MapViewOfFileFromApp; ; ; ReturnValue[*]; local; manual |
-| 15 | Source: ; ; false; MapViewOfFileNuma2; ; ; ReturnValue[*]; local; manual |
-| 16 | Source: ; ; false; NtReadFile; ; ; Argument[*5]; local; manual |
-| 17 | Source: ; ; false; ReadFile; ; ; Argument[*1]; local; manual |
-| 18 | Source: ; ; false; ReadFileEx; ; ; Argument[*1]; local; manual |
-| 19 | Source: ; ; false; RegEnumValueA; ; ; Argument[*2,*6]; windows-registry; manual |
-| 20 | Source: ; ; false; RegEnumValueW; ; ; Argument[*2,*6]; windows-registry; manual |
-| 21 | Source: ; ; false; RegGetValueA; ; ; Argument[*5]; windows-registry; manual |
-| 22 | Source: ; ; false; RegGetValueW; ; ; Argument[*5]; windows-registry; manual |
-| 23 | Source: ; ; false; RegQueryMultipleValuesA; ; ; Argument[*3]; windows-registry; manual |
-| 24 | Source: ; ; false; RegQueryMultipleValuesW; ; ; Argument[*3]; windows-registry; manual |
-| 25 | Source: ; ; false; RegQueryValueA; ; ; Argument[*2]; windows-registry; manual |
-| 26 | Source: ; ; false; RegQueryValueExA; ; ; Argument[*4]; windows-registry; manual |
-| 27 | Source: ; ; false; RegQueryValueExW; ; ; Argument[*4]; windows-registry; manual |
-| 28 | Source: ; ; false; RegQueryValueW; ; ; Argument[*2]; windows-registry; manual |
-| 29 | Source: ; ; false; WinHttpQueryHeaders; ; ; Argument[*3]; remote; manual |
-| 30 | Source: ; ; false; WinHttpQueryHeadersEx; ; ; Argument[**8]; remote; manual |
-| 31 | Source: ; ; false; WinHttpQueryHeadersEx; ; ; Argument[*5]; remote; manual |
-| 32 | Source: ; ; false; WinHttpQueryHeadersEx; ; ; Argument[*6]; remote; manual |
-| 33 | Source: ; ; false; WinHttpReadData; ; ; Argument[*1]; remote; manual |
-| 34 | Source: ; ; false; WinHttpReadDataEx; ; ; Argument[*1]; remote; manual |
-| 35 | Source: ; ; false; ymlSource; ; ; ReturnValue; local; manual |
-| 36 | Source: Azure::Core::Http; RawResponse; true; ExtractBodyStream; ; ; ReturnValue[*]; remote; manual |
-| 37 | Source: Azure::Core::Http; RawResponse; true; GetBody; ; ; ReturnValue[*]; remote; manual |
-| 38 | Source: Azure::Core::Http; RawResponse; true; GetHeaders; ; ; ReturnValue[*]; remote; manual |
-| 39 | Source: Azure::Core::Http; Request; true; GetBodyStream; ; ; ReturnValue[*]; remote; manual |
-| 40 | Source: Azure::Core::Http; Request; true; GetHeader; ; ; ReturnValue; remote; manual |
-| 41 | Source: Azure::Core::Http; Request; true; GetHeaders; ; ; ReturnValue; remote; manual |
-| 42 | Source: boost::asio; ; false; read_until; ; ; Argument[*1]; remote; manual |
-| 43 | Summary: ; ; false; CLSIDFromProgID; ; ; Argument[*0]; Argument[*1]; taint; manual |
-| 44 | Summary: ; ; false; CLSIDFromString; ; ; Argument[*0]; Argument[*1]; taint; manual |
-| 45 | Summary: ; ; false; CommandLineToArgvA; ; ; Argument[*0]; ReturnValue[**]; taint; manual |
-| 46 | Summary: ; ; false; CreateRemoteThread; ; ; Argument[@4]; Argument[3].Parameter[@0]; value; manual |
-| 47 | Summary: ; ; false; CreateRemoteThreadEx; ; ; Argument[@4]; Argument[3].Parameter[@0]; value; manual |
-| 48 | Summary: ; ; false; CreateThread; ; ; Argument[@3]; Argument[2].Parameter[@0]; value; manual |
-| 49 | Summary: ; ; false; GUIDFromString; ; ; Argument[*0]; Argument[*1]; taint; manual |
-| 50 | Summary: ; ; false; IIDFromString; ; ; Argument[*0]; Argument[*1]; taint; manual |
-| 51 | Summary: ; ; false; ProgIDFromCLSID; ; ; Argument[*0]; Argument[**1]; taint; manual |
-| 52 | Summary: ; ; false; ReadFileEx; ; ; Argument[*3].Field[@hEvent]; Argument[4].Parameter[*2].Field[@hEvent]; value; manual |
-| 53 | Summary: ; ; false; RtlCopyDeviceMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
-| 54 | Summary: ; ; false; RtlCopyMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
-| 55 | Summary: ; ; false; RtlCopyMemoryNonTemporal; ; ; Argument[*@1]; Argument[*@0]; value; manual |
-| 56 | Summary: ; ; false; RtlCopyUnicodeString; ; ; Argument[*1].Field[*Buffer]; Argument[*0].Field[*Buffer]; value; manual |
-| 57 | Summary: ; ; false; RtlCopyVolatileMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
-| 58 | Summary: ; ; false; RtlInitUnicodeString; ; ; Argument[*1]; Argument[*0].Field[*Buffer]; value; manual |
-| 59 | Summary: ; ; false; RtlMoveMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
-| 60 | Summary: ; ; false; RtlMoveVolatileMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
-| 61 | Summary: ; ; false; StringFromCLSID; ; ; Argument[*0]; Argument[**1]; taint; manual |
-| 62 | Summary: ; ; false; StringFromGUID2; ; ; Argument[*0]; Argument[*1]; taint; manual |
-| 63 | Summary: ; ; false; StringFromIID; ; ; Argument[*0]; Argument[**1]; taint; manual |
-| 64 | Summary: ; ; false; WinHttpCrackUrl; ; ; Argument[*0]; Argument[*3]; taint; manual |
-| 65 | Summary: ; ; false; callWithArgument; ; ; Argument[1]; Argument[0].Parameter[0]; value; manual |
-| 66 | Summary: ; ; false; callWithNonTypeTemplate<T>; (const T &); ; Argument[*0]; ReturnValue; value; manual |
-| 67 | Summary: ; ; false; pthread_create; ; ; Argument[@3]; Argument[2].Parameter[@0]; value; manual |
-| 68 | Summary: ; ; false; read_field_from_struct; ; ; Argument[*0].Field[MyNamespace::MyStructInNamespace::myField]; ReturnValue; value; manual |
-| 69 | Summary: ; ; false; read_field_from_struct_2; ; ; Argument[*0].Field[MyGlobalStruct::myField]; ReturnValue; value; manual |
-| 70 | Summary: ; ; false; ymlStepGenerated; ; ; Argument[0]; ReturnValue; taint; df-generated |
-| 71 | Summary: ; ; false; ymlStepManual; ; ; Argument[0]; ReturnValue; taint; manual |
-| 72 | Summary: ; ; false; ymlStepManual_with_body; ; ; Argument[0]; ReturnValue; taint; manual |
-| 73 | Summary: ; MyString; true; operator[]; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
-| 74 | Summary: ; MyString; true; operator[]; ; ; ReturnValue[*]; Argument[-1]; taint; manual |
-| 75 | Summary: ; ReverseFlow; true; get_ptr; ; ; ReturnValue[*]; Argument[-1].Field[ReverseFlow::value]; value; manual |
-| 76 | Summary: ; TemplateClass1; true; templateFunction2<U,V>; (U,V); ; Argument[1]; ReturnValue; value; manual |
-| 77 | Summary: ; TemplateClass1<T>; false; templateFunction<U>; (T,U); ; Argument[0]; ReturnValue; value; manual |
-| 78 | Summary: ; TemplateClass2<T,U>; true; function; (U,T); ; Argument[1]; ReturnValue; value; manual |
-| 79 | Summary: Azure::Core::IO; BodyStream; true; Read; ; ; Argument[-1]; Argument[*0]; taint; manual |
-| 80 | Summary: Azure::Core::IO; BodyStream; true; ReadToCount; ; ; Argument[-1]; Argument[*0]; taint; manual |
-| 81 | Summary: Azure::Core::IO; BodyStream; true; ReadToEnd; ; ; Argument[-1]; ReturnValue.Element; taint; manual |
-| 82 | Summary: Azure; Nullable; true; Value; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
-| 83 | Summary: boost::asio; ; false; buffer; ; ; Argument[*0]; ReturnValue; taint; manual |
+| 1 | Sink: ; ; false; sink_from_callback_return_template; ; ; Argument[0].ReturnValue; test-sink; manual |
+| 2 | Sink: ; ; false; sink_ptr_from_callback_return_ptr; ; ; Argument[0].ReturnValue[*]; test-sink; manual |
+| 3 | Sink: ; ; false; ymlSink; ; ; Argument[0]; test-sink; manual |
+| 4 | Sink: boost::asio; ; false; write; ; ; Argument[*1]; remote-sink; manual |
+| 5 | Source: ; ; false; GetCommandLineA; ; ; ReturnValue[*]; local; manual |
+| 6 | Source: ; ; false; GetEnvironmentStringsA; ; ; ReturnValue[*]; local; manual |
+| 7 | Source: ; ; false; GetEnvironmentVariableA; ; ; Argument[*1]; local; manual |
+| 8 | Source: ; ; false; HttpReceiveClientCertificate; ; ; Argument[*3]; remote; manual |
+| 9 | Source: ; ; false; HttpReceiveHttpRequest; ; ; Argument[*3]; remote; manual |
+| 10 | Source: ; ; false; HttpReceiveRequestEntityBody; ; ; Argument[*3]; remote; manual |
+| 11 | Source: ; ; false; MapViewOfFile2; ; ; ReturnValue[*]; local; manual |
+| 12 | Source: ; ; false; MapViewOfFile3; ; ; ReturnValue[*]; local; manual |
+| 13 | Source: ; ; false; MapViewOfFile3FromApp; ; ; ReturnValue[*]; local; manual |
+| 14 | Source: ; ; false; MapViewOfFile; ; ; ReturnValue[*]; local; manual |
+| 15 | Source: ; ; false; MapViewOfFileEx; ; ; ReturnValue[*]; local; manual |
+| 16 | Source: ; ; false; MapViewOfFileFromApp; ; ; ReturnValue[*]; local; manual |
+| 17 | Source: ; ; false; MapViewOfFileNuma2; ; ; ReturnValue[*]; local; manual |
+| 18 | Source: ; ; false; NtReadFile; ; ; Argument[*5]; local; manual |
+| 19 | Source: ; ; false; ReadFile; ; ; Argument[*1]; local; manual |
+| 20 | Source: ; ; false; ReadFileEx; ; ; Argument[*1]; local; manual |
+| 21 | Source: ; ; false; RegEnumValueA; ; ; Argument[*2,*6]; windows-registry; manual |
+| 22 | Source: ; ; false; RegEnumValueW; ; ; Argument[*2,*6]; windows-registry; manual |
+| 23 | Source: ; ; false; RegGetValueA; ; ; Argument[*5]; windows-registry; manual |
+| 24 | Source: ; ; false; RegGetValueW; ; ; Argument[*5]; windows-registry; manual |
+| 25 | Source: ; ; false; RegQueryMultipleValuesA; ; ; Argument[*3]; windows-registry; manual |
+| 26 | Source: ; ; false; RegQueryMultipleValuesW; ; ; Argument[*3]; windows-registry; manual |
+| 27 | Source: ; ; false; RegQueryValueA; ; ; Argument[*2]; windows-registry; manual |
+| 28 | Source: ; ; false; RegQueryValueExA; ; ; Argument[*4]; windows-registry; manual |
+| 29 | Source: ; ; false; RegQueryValueExW; ; ; Argument[*4]; windows-registry; manual |
+| 30 | Source: ; ; false; RegQueryValueW; ; ; Argument[*2]; windows-registry; manual |
+| 31 | Source: ; ; false; WinHttpQueryHeaders; ; ; Argument[*3]; remote; manual |
+| 32 | Source: ; ; false; WinHttpQueryHeadersEx; ; ; Argument[**8]; remote; manual |
+| 33 | Source: ; ; false; WinHttpQueryHeadersEx; ; ; Argument[*5]; remote; manual |
+| 34 | Source: ; ; false; WinHttpQueryHeadersEx; ; ; Argument[*6]; remote; manual |
+| 35 | Source: ; ; false; WinHttpReadData; ; ; Argument[*1]; remote; manual |
+| 36 | Source: ; ; false; WinHttpReadDataEx; ; ; Argument[*1]; remote; manual |
+| 37 | Source: ; ; false; source_from_callback_ptr; ; ; Argument[0].Parameter[*0].Field[SourceWrapper::value]; local; manual |
+| 38 | Source: ; ; false; source_from_callback_return_ptr; ; ; Argument[0].ReturnValue; local; manual |
+| 39 | Source: ; ; false; source_from_callback_return_template; ; ; Argument[0].ReturnValue; local; manual |
+| 40 | Source: ; ; false; source_from_callback_template; ; ; Argument[0].Parameter[*0].Field[SourceWrapper::value]; local; manual |
+| 41 | Source: ; ; false; source_ptr_from_callback_return_ptr; ; ; Argument[0].ReturnValue[*]; local; manual |
+| 42 | Source: ; ; false; test_parameter; ; ; Parameter[*0].Field[*SourceWrapper::pointer]; local; manual |
+| 43 | Source: ; ; false; test_parameter; ; ; Parameter[*0].Field[SourceWrapper::value]; local; manual |
+| 44 | Source: ; ; false; test_parameter; ; ; Parameter[*2]; local; manual |
+| 45 | Source: ; ; false; test_parameter; ; ; Parameter[1].Field[*SourceWrapper::pointer]; local; manual |
+| 46 | Source: ; ; false; test_parameter; ; ; Parameter[1].Field[SourceWrapper::value]; local; manual |
+| 47 | Source: ; ; false; ymlFieldSource; ; ; ReturnValue.Field[SourceWrapper::value]; local; manual |
+| 48 | Source: ; ; false; ymlSource; ; ; ReturnValue; local; manual |
+| 49 | Source: ; ; false; ymlSourcePtr; ; ; ReturnValue[*]; local; manual |
+| 50 | Source: Azure::Core::Http; RawResponse; true; ExtractBodyStream; ; ; ReturnValue[*]; remote; manual |
+| 51 | Source: Azure::Core::Http; RawResponse; true; GetBody; ; ; ReturnValue[*]; remote; manual |
+| 52 | Source: Azure::Core::Http; RawResponse; true; GetHeaders; ; ; ReturnValue[*]; remote; manual |
+| 53 | Source: Azure::Core::Http; Request; true; GetBodyStream; ; ; ReturnValue[*]; remote; manual |
+| 54 | Source: Azure::Core::Http; Request; true; GetHeader; ; ; ReturnValue; remote; manual |
+| 55 | Source: Azure::Core::Http; Request; true; GetHeaders; ; ; ReturnValue; remote; manual |
+| 56 | Source: boost::asio; ; false; read_until; ; ; Argument[*1]; remote; manual |
+| 57 | Summary: ; ; false; CLSIDFromProgID; ; ; Argument[*0]; Argument[*1]; taint; manual |
+| 58 | Summary: ; ; false; CLSIDFromString; ; ; Argument[*0]; Argument[*1]; taint; manual |
+| 59 | Summary: ; ; false; CommandLineToArgvA; ; ; Argument[*0]; ReturnValue[**]; taint; manual |
+| 60 | Summary: ; ; false; CreateRemoteThread; ; ; Argument[@4]; Argument[3].Parameter[@0]; value; manual |
+| 61 | Summary: ; ; false; CreateRemoteThreadEx; ; ; Argument[@4]; Argument[3].Parameter[@0]; value; manual |
+| 62 | Summary: ; ; false; CreateThread; ; ; Argument[@3]; Argument[2].Parameter[@0]; value; manual |
+| 63 | Summary: ; ; false; GUIDFromString; ; ; Argument[*0]; Argument[*1]; taint; manual |
+| 64 | Summary: ; ; false; IIDFromString; ; ; Argument[*0]; Argument[*1]; taint; manual |
+| 65 | Summary: ; ; false; ProgIDFromCLSID; ; ; Argument[*0]; Argument[**1]; taint; manual |
+| 66 | Summary: ; ; false; ReadFileEx; ; ; Argument[*3].Field[@hEvent]; Argument[4].Parameter[*2].Field[@hEvent]; value; manual |
+| 67 | Summary: ; ; false; RtlCopyDeviceMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
+| 68 | Summary: ; ; false; RtlCopyMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
+| 69 | Summary: ; ; false; RtlCopyMemoryNonTemporal; ; ; Argument[*@1]; Argument[*@0]; value; manual |
+| 70 | Summary: ; ; false; RtlCopyUnicodeString; ; ; Argument[*1].Field[*Buffer]; Argument[*0].Field[*Buffer]; value; manual |
+| 71 | Summary: ; ; false; RtlCopyVolatileMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
+| 72 | Summary: ; ; false; RtlInitUnicodeString; ; ; Argument[*1]; Argument[*0].Field[*Buffer]; value; manual |
+| 73 | Summary: ; ; false; RtlMoveMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
+| 74 | Summary: ; ; false; RtlMoveVolatileMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
+| 75 | Summary: ; ; false; StringFromCLSID; ; ; Argument[*0]; Argument[**1]; taint; manual |
+| 76 | Summary: ; ; false; StringFromGUID2; ; ; Argument[*0]; Argument[*1]; taint; manual |
+| 77 | Summary: ; ; false; StringFromIID; ; ; Argument[*0]; Argument[**1]; taint; manual |
+| 78 | Summary: ; ; false; WinHttpCrackUrl; ; ; Argument[*0]; Argument[*3]; taint; manual |
+| 79 | Summary: ; ; false; callWithArgument; ; ; Argument[1]; Argument[0].Parameter[0]; value; manual |
+| 80 | Summary: ; ; false; callWithNonTypeTemplate<T>; (const T &); ; Argument[*0]; ReturnValue; value; manual |
+| 81 | Summary: ; ; false; pthread_create; ; ; Argument[@3]; Argument[2].Parameter[@0]; value; manual |
+| 82 | Summary: ; ; false; read_field_from_struct; ; ; Argument[*0].Field[MyNamespace::MyStructInNamespace::myField]; ReturnValue; value; manual |
+| 83 | Summary: ; ; false; read_field_from_struct_2; ; ; Argument[*0].Field[MyGlobalStruct::myField]; ReturnValue; value; manual |
+| 84 | Summary: ; ; false; ymlStepGenerated; ; ; Argument[0]; ReturnValue; taint; df-generated |
+| 85 | Summary: ; ; false; ymlStepManual; ; ; Argument[0]; ReturnValue; taint; manual |
+| 86 | Summary: ; ; false; ymlStepManual_with_body; ; ; Argument[0]; ReturnValue; taint; manual |
+| 87 | Summary: ; Container; true; get; ; ; Argument[-1].Element; ReturnValue[*]; value; manual |
+| 88 | Summary: ; Forwarder; true; get; ; ; Argument[-1]; ReturnValue; value; manual |
+| 89 | Summary: ; MyString; true; operator[]; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 90 | Summary: ; MyString; true; operator[]; ; ; ReturnValue[*]; Argument[-1]; taint; manual |
+| 91 | Summary: ; ReverseFlow; true; get_ptr; ; ; ReturnValue[*]; Argument[-1].Field[ReverseFlow::value]; value; manual |
+| 92 | Summary: ; TemplateClass1; true; templateFunction2<U,V>; (U,V); ; Argument[1]; ReturnValue; value; manual |
+| 93 | Summary: ; TemplateClass1<T>; false; templateFunction<U>; (T,U); ; Argument[0]; ReturnValue; value; manual |
+| 94 | Summary: ; TemplateClass2<T,U>; true; function; (U,T); ; Argument[1]; ReturnValue; value; manual |
+| 95 | Summary: Azure::Core::IO; BodyStream; true; Read; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 96 | Summary: Azure::Core::IO; BodyStream; true; ReadToCount; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 97 | Summary: Azure::Core::IO; BodyStream; true; ReadToEnd; ; ; Argument[-1]; ReturnValue.Element; taint; manual |
+| 98 | Summary: Azure::Core; Url; true; GetQueryParameters; ; ; Argument[-1]; ReturnValue; taint; manual |
+| 99 | Summary: Azure::Core; Url; true; SetQueryParameters; ; ; Argument[0]; Argument[-1]; taint; manual |
+| 100 | Summary: Azure; Nullable; true; Value; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 101 | Summary: BloombergLP::balber; BerDecoder; true; decode; ; ; Argument[*0]; Argument[*1]; taint; manual |
+| 102 | Summary: BloombergLP::balber; BerDecoder; true; decodeAny; ; ; Argument[*0]; Argument[*1]; taint; manual |
+| 103 | Summary: BloombergLP::balber; BerEncoder; true; encode; ; ; Argument[*1]; Argument[*0]; taint; manual |
+| 104 | Summary: BloombergLP::balber; BerEncoder; true; encodeAny; ; ; Argument[*1]; Argument[*0]; taint; manual |
+| 105 | Summary: BloombergLP::baljsn; Decoder; true; decode; ; ; Argument[*0]; Argument[*1]; taint; manual |
+| 106 | Summary: BloombergLP::baljsn; Decoder; true; decodeAny; ; ; Argument[*0]; Argument[*1]; taint; manual |
+| 107 | Summary: BloombergLP::baljsn; Encoder; true; encode; ; ; Argument[*1]; Argument[*0]; taint; manual |
+| 108 | Summary: BloombergLP::baljsn; Encoder; true; encodeAny; ; ; Argument[*1]; Argument[*0]; taint; manual |
+| 109 | Summary: BloombergLP::balxml; Decoder; true; decode<TYPE>; (const char *,size_t,TYPE *,const char *); ; Argument[*0]; Argument[*2]; taint; manual |
+| 110 | Summary: BloombergLP::balxml; Decoder; true; decode<TYPE>; (istream &,TYPE *,const char *); ; Argument[*0]; Argument[*1]; taint; manual |
+| 111 | Summary: BloombergLP::balxml; Decoder; true; decode<TYPE>; (istream &,TYPE *,const char *); ; Argument[*0]; ReturnValue[*]; taint; manual |
+| 112 | Summary: BloombergLP::balxml; Decoder; true; decode<TYPE>; (streambuf *,TYPE *,const char *); ; Argument[*0]; Argument[*1]; taint; manual |
+| 113 | Summary: BloombergLP::balxml; Decoder; true; decodeAny; (istream &,AnyRef *,const char *); ; Argument[*0]; Argument[*1]; taint; manual |
+| 114 | Summary: BloombergLP::balxml; Decoder; true; decodeAny; (istream &,AnyRef *,const char *); ; Argument[*0]; ReturnValue[*]; taint; manual |
+| 115 | Summary: BloombergLP::balxml; Decoder; true; decodeAny; (streambuf *,AnyRef *,const char *); ; Argument[*0]; Argument[*1]; taint; manual |
+| 116 | Summary: BloombergLP::balxml; Decoder; true; decodeAny<TYPE>; (istream &,TYPE *,const char *); ; Argument[*0]; Argument[*1]; taint; manual |
+| 117 | Summary: BloombergLP::balxml; Decoder; true; decodeAny<TYPE>; (istream &,TYPE *,const char *); ; Argument[*0]; ReturnValue[*]; taint; manual |
+| 118 | Summary: BloombergLP::balxml; Decoder; true; decodeAny<TYPE>; (streambuf *,TYPE *,const char *); ; Argument[*0]; Argument[*1]; taint; manual |
+| 119 | Summary: BloombergLP::balxml; Encoder; true; encode<TYPE>; (ostream &,const TYPE &); ; Argument[*0..1]; ReturnValue[*]; taint; manual |
+| 120 | Summary: BloombergLP::balxml; Encoder; true; encode<TYPE>; (ostream &,const TYPE &); ; Argument[*1]; Argument[*0]; taint; manual |
+| 121 | Summary: BloombergLP::balxml; Encoder; true; encode<TYPE>; (streambuf *,const TYPE &); ; Argument[*1]; Argument[*0]; taint; manual |
+| 122 | Summary: BloombergLP::balxml; Encoder; true; encodeAny; (ostream &,const AnyConstRef &); ; Argument[*0..1]; ReturnValue[*]; taint; manual |
+| 123 | Summary: BloombergLP::balxml; Encoder; true; encodeAny; (ostream &,const AnyConstRef &); ; Argument[*1]; Argument[*0]; taint; manual |
+| 124 | Summary: BloombergLP::balxml; Encoder; true; encodeAny; (streambuf *,const AnyConstRef &); ; Argument[*1]; Argument[*0]; taint; manual |
+| 125 | Summary: BloombergLP::balxml; Encoder; true; encodeAny<TYPE>; (ostream &,const TYPE &); ; Argument[*0..1]; ReturnValue[*]; taint; manual |
+| 126 | Summary: BloombergLP::balxml; Encoder; true; encodeAny<TYPE>; (ostream &,const TYPE &); ; Argument[*1]; Argument[*0]; taint; manual |
+| 127 | Summary: BloombergLP::balxml; Encoder; true; encodeAny<TYPE>; (streambuf *,const TYPE &); ; Argument[*1]; Argument[*0]; taint; manual |
+| 128 | Summary: BloombergLP::balxml; Encoder; true; encodeAnyToStream; ; ; Argument[*1]; Argument[*0]; taint; manual |
+| 129 | Summary: BloombergLP::balxml; Encoder; true; encodeToStream; ; ; Argument[*1]; Argument[*0]; taint; manual |
+| 130 | Summary: BloombergLP::bdlbb; Blob; true; buffer; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 131 | Summary: BloombergLP::bdlbb; BlobBuffer; true; buffer; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 132 | Summary: BloombergLP::bdlbb; BlobBuffer; true; data; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 133 | Summary: BloombergLP::bdlbb; BlobUtil; true; copy; (Blob *,int,const Blob &,int,int); ; Argument[*2]; Argument[*0]; taint; manual |
+| 134 | Summary: BloombergLP::bdlbb; BlobUtil; true; copy; (Blob *,int,const char *,int); ; Argument[*2]; Argument[*0]; taint; manual |
+| 135 | Summary: BloombergLP::bdlbb; BlobUtil; true; copy; (char *,const Blob &,int,int); ; Argument[*1]; Argument[*0]; taint; manual |
+| 136 | Summary: BloombergLP::bdlbb; BlobUtil; true; getContiguousRangeOrCopy; ; ; Argument[*1]; ReturnValue[*]; taint; manual |
+| 137 | Summary: BloombergLP::bmqa; Message; true; clone; ; ; Argument[-1]; ReturnValue; taint; manual |
+| 138 | Summary: BloombergLP::bmqa; Message; true; getData; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 139 | Summary: BloombergLP::bmqa; Message; true; loadProperties; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 140 | Summary: BloombergLP::bmqa; Message; true; setData; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 141 | Summary: BloombergLP::bmqa; Message; true; setDataRef; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 142 | Summary: BloombergLP::bmqa; Message; true; setPropertiesRef; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 143 | Summary: BloombergLP::bmqa; MessageEvent; true; messageIterator; ; ; Argument[-1]; ReturnValue; taint; manual |
+| 144 | Summary: BloombergLP::bmqa; MessageIterator; true; message; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 145 | Summary: BloombergLP::bmqa; MessageProperties; true; MessageProperties; (const MessageProperties &,Allocator *); ; Argument[*0]; Argument[-1]; value; manual |
+| 146 | Summary: BloombergLP::bmqa; MessageProperties; true; getPropertyAsBinary; ; ; Argument[-1]; ReturnValue[*].Element; taint; manual |
+| 147 | Summary: BloombergLP::bmqa; MessageProperties; true; getPropertyAsBinaryOr; ; ; Argument[*1].Element[@]; ReturnValue[*].Element[@]; value; manual |
+| 148 | Summary: BloombergLP::bmqa; MessageProperties; true; getPropertyAsBinaryOr; ; ; Argument[-1]; ReturnValue[*].Element; taint; manual |
+| 149 | Summary: BloombergLP::bmqa; MessageProperties; true; getPropertyAsString; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 150 | Summary: BloombergLP::bmqa; MessageProperties; true; getPropertyAsStringOr; ; ; Argument[*1]; ReturnValue[*]; value; manual |
+| 151 | Summary: BloombergLP::bmqa; MessageProperties; true; getPropertyAsStringOr; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 152 | Summary: BloombergLP::bmqa; MessageProperties; true; operator=; ; ; Argument[*0]; Argument[-1]; value; manual |
+| 153 | Summary: BloombergLP::bmqa; MessageProperties; true; operator=; ; ; Argument[*0]; ReturnValue[*]; value; manual |
+| 154 | Summary: BloombergLP::bmqa; MessageProperties; true; setPropertyAsBinary; ; ; Argument[0]; Argument[-1]; taint; manual |
+| 155 | Summary: BloombergLP::bmqa; MessageProperties; true; setPropertyAsBinary; ; ; Argument[1]; Argument[-1]; taint; manual |
+| 156 | Summary: BloombergLP::bmqa; MessageProperties; true; setPropertyAsBool; ; ; Argument[0]; Argument[-1]; taint; manual |
+| 157 | Summary: BloombergLP::bmqa; MessageProperties; true; setPropertyAsChar; ; ; Argument[0]; Argument[-1]; taint; manual |
+| 158 | Summary: BloombergLP::bmqa; MessageProperties; true; setPropertyAsInt32; ; ; Argument[0]; Argument[-1]; taint; manual |
+| 159 | Summary: BloombergLP::bmqa; MessageProperties; true; setPropertyAsInt64; ; ; Argument[0]; Argument[-1]; taint; manual |
+| 160 | Summary: BloombergLP::bmqa; MessageProperties; true; setPropertyAsShort; ; ; Argument[0]; Argument[-1]; taint; manual |
+| 161 | Summary: BloombergLP::bmqa; MessageProperties; true; setPropertyAsString; ; ; Argument[0]; Argument[-1]; taint; manual |
+| 162 | Summary: BloombergLP::bmqa; MessageProperties; true; setPropertyAsString; ; ; Argument[1]; Argument[-1]; taint; manual |
+| 163 | Summary: BloombergLP::bmqa; MessageProperties; true; streamIn; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 164 | Summary: BloombergLP::bmqa; MessageProperties; true; streamOut; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 165 | Summary: BloombergLP::bmqa; MessagePropertiesIterator; true; MessagePropertiesIterator; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 166 | Summary: BloombergLP::bmqa; MessagePropertiesIterator; true; getAsBinary; ; ; Argument[-1]; ReturnValue[*].Element; taint; manual |
+| 167 | Summary: BloombergLP::bmqa; MessagePropertiesIterator; true; getAsString; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 168 | Summary: BloombergLP::bmqa; MessagePropertiesIterator; true; name; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 169 | Summary: BloombergLP::bmqa; MessagePropertiesIterator; true; operator=; ; ; Argument[*0]; Argument[-1]; value; manual |
+| 170 | Summary: BloombergLP::bmqa; MessagePropertiesIterator; true; operator=; ; ; Argument[*0]; ReturnValue[*]; value; manual |
+| 171 | Summary: BloombergLP::bslx::InStreamFunctions; ; false; bdexStreamIn; ; ; Argument[*0]; Argument[*1]; taint; manual |
+| 172 | Summary: BloombergLP::bslx::InStreamFunctions; ; false; bdexStreamIn; ; ; Argument[*0]; ReturnValue[*]; taint; manual |
+| 173 | Summary: BloombergLP::bslx; ByteInStream; true; ByteInStream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 174 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayFloat32; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 175 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayFloat64; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 176 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayInt16; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 177 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayInt24; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 178 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayInt32; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 179 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayInt40; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 180 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayInt48; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 181 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayInt56; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 182 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayInt64; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 183 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayInt8; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 184 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayInt8; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 185 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayUint16; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 186 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayUint24; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 187 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayUint32; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 188 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayUint40; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 189 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayUint48; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 190 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayUint56; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 191 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayUint64; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 192 | Summary: BloombergLP::bslx; ByteInStream; true; getArrayUint8; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 193 | Summary: BloombergLP::bslx; ByteInStream; true; getFloat32; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 194 | Summary: BloombergLP::bslx; ByteInStream; true; getFloat64; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 195 | Summary: BloombergLP::bslx; ByteInStream; true; getInt16; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 196 | Summary: BloombergLP::bslx; ByteInStream; true; getInt24; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 197 | Summary: BloombergLP::bslx; ByteInStream; true; getInt32; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 198 | Summary: BloombergLP::bslx; ByteInStream; true; getInt40; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 199 | Summary: BloombergLP::bslx; ByteInStream; true; getInt48; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 200 | Summary: BloombergLP::bslx; ByteInStream; true; getInt56; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 201 | Summary: BloombergLP::bslx; ByteInStream; true; getInt64; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 202 | Summary: BloombergLP::bslx; ByteInStream; true; getInt8; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 203 | Summary: BloombergLP::bslx; ByteInStream; true; getLength; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 204 | Summary: BloombergLP::bslx; ByteInStream; true; getString; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 205 | Summary: BloombergLP::bslx; ByteInStream; true; getString; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 206 | Summary: BloombergLP::bslx; ByteInStream; true; getUint16; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 207 | Summary: BloombergLP::bslx; ByteInStream; true; getUint24; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 208 | Summary: BloombergLP::bslx; ByteInStream; true; getUint32; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 209 | Summary: BloombergLP::bslx; ByteInStream; true; getUint40; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 210 | Summary: BloombergLP::bslx; ByteInStream; true; getUint48; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 211 | Summary: BloombergLP::bslx; ByteInStream; true; getUint56; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 212 | Summary: BloombergLP::bslx; ByteInStream; true; getUint64; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 213 | Summary: BloombergLP::bslx; ByteInStream; true; getUint8; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 214 | Summary: BloombergLP::bslx; ByteInStream; true; getVersion; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 215 | Summary: BloombergLP::bslx; ByteInStream; true; reset; (const StringRef &); ; Argument[*0]; Argument[-1]; taint; manual |
+| 216 | Summary: BloombergLP::bslx; ByteInStream; true; reset; (const char *,size_t); ; Argument[*0]; Argument[-1]; taint; manual |
+| 217 | Summary: BloombergLP::bslx; GenericInStream; true; GenericInStream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 218 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayFloat32; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 219 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayFloat64; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 220 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayInt16; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 221 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayInt24; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 222 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayInt32; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 223 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayInt40; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 224 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayInt48; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 225 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayInt56; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 226 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayInt64; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 227 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayInt8; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 228 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayUint16; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 229 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayUint24; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 230 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayUint32; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 231 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayUint40; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 232 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayUint48; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 233 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayUint56; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 234 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayUint64; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 235 | Summary: BloombergLP::bslx; GenericInStream; true; getArrayUint8; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 236 | Summary: BloombergLP::bslx; GenericInStream; true; getFloat32; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 237 | Summary: BloombergLP::bslx; GenericInStream; true; getFloat64; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 238 | Summary: BloombergLP::bslx; GenericInStream; true; getInt16; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 239 | Summary: BloombergLP::bslx; GenericInStream; true; getInt24; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 240 | Summary: BloombergLP::bslx; GenericInStream; true; getInt32; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 241 | Summary: BloombergLP::bslx; GenericInStream; true; getInt40; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 242 | Summary: BloombergLP::bslx; GenericInStream; true; getInt48; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 243 | Summary: BloombergLP::bslx; GenericInStream; true; getInt56; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 244 | Summary: BloombergLP::bslx; GenericInStream; true; getInt64; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 245 | Summary: BloombergLP::bslx; GenericInStream; true; getInt8; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 246 | Summary: BloombergLP::bslx; GenericInStream; true; getLength; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 247 | Summary: BloombergLP::bslx; GenericInStream; true; getString; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 248 | Summary: BloombergLP::bslx; GenericInStream; true; getString; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 249 | Summary: BloombergLP::bslx; GenericInStream; true; getUint16; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 250 | Summary: BloombergLP::bslx; GenericInStream; true; getUint24; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 251 | Summary: BloombergLP::bslx; GenericInStream; true; getUint32; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 252 | Summary: BloombergLP::bslx; GenericInStream; true; getUint40; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 253 | Summary: BloombergLP::bslx; GenericInStream; true; getUint48; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 254 | Summary: BloombergLP::bslx; GenericInStream; true; getUint56; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 255 | Summary: BloombergLP::bslx; GenericInStream; true; getUint64; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 256 | Summary: BloombergLP::bslx; GenericInStream; true; getUint8; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 257 | Summary: BloombergLP::bslx; GenericInStream; true; getVersion; ; ; Argument[-1]; ReturnValue[*]; taint; manual |
+| 258 | Summary: boost::asio::ip; basic_resolver<InternetProtocol>; false; resolve; (const InternetProtocol &,const string &,const string &); ; Argument[*1..2]; ReturnValue; taint; manual |
+| 259 | Summary: boost::asio::ip; basic_resolver<InternetProtocol>; false; resolve; (const InternetProtocol &,const string &,const string &,error_code &); ; Argument[*1..2]; ReturnValue; taint; manual |
+| 260 | Summary: boost::asio::ip; basic_resolver<InternetProtocol>; false; resolve; (const InternetProtocol &,const string &,const string &,flags); ; Argument[*1..2]; ReturnValue; taint; manual |
+| 261 | Summary: boost::asio::ip; basic_resolver<InternetProtocol>; false; resolve; (const InternetProtocol &,const string &,const string &,flags,error_code &); ; Argument[*1..2]; ReturnValue; taint; manual |
+| 262 | Summary: boost::asio::ip; basic_resolver<InternetProtocol>; false; resolve; (const string &,const string &); ; Argument[*0..1]; ReturnValue; taint; manual |
+| 263 | Summary: boost::asio::ip; basic_resolver<InternetProtocol>; false; resolve; (const string &,const string &,error_code &); ; Argument[*0..1]; ReturnValue; taint; manual |
+| 264 | Summary: boost::asio::ip; basic_resolver<InternetProtocol>; false; resolve; (const string &,const string &,flags); ; Argument[*0..1]; ReturnValue; taint; manual |
+| 265 | Summary: boost::asio::ip; basic_resolver<InternetProtocol>; false; resolve; (const string &,const string &,flags,error_code &); ; Argument[*0..1]; ReturnValue; taint; manual |
+| 266 | Summary: boost::asio; ; false; buffer; ; ; Argument[*0]; ReturnValue; taint; manual |
+| 267 | Summary: bsl; vector; true; data; ; ; Argument[-1].Element[@]; ReturnValue[*@]; value; manual |
+| 268 | Summary: bsl; vector; true; operator[]; ; ; Argument[-1].Element[@]; ReturnValue[*@]; value; manual |
+| 269 | Summary: bsl; vector; true; push_back; ; ; Argument[*@0]; Argument[-1].Element[@]; value; manual |
+| 270 | Summary: google::protobuf; MessageLite; true; AppendPartialToCord; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 271 | Summary: google::protobuf; MessageLite; true; AppendPartialToString; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 272 | Summary: google::protobuf; MessageLite; true; AppendToCord; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 273 | Summary: google::protobuf; MessageLite; true; AppendToString; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 274 | Summary: google::protobuf; MessageLite; true; MergeFromBoundedZeroCopyStream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 275 | Summary: google::protobuf; MessageLite; true; MergeFromCodedStream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 276 | Summary: google::protobuf; MessageLite; true; MergeFromCord; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 277 | Summary: google::protobuf; MessageLite; true; MergeFromString; (const Cord &); ; Argument[*0]; Argument[-1]; taint; manual |
+| 278 | Summary: google::protobuf; MessageLite; true; MergeFromString; (string_view); ; Argument[0]; Argument[-1]; taint; manual |
+| 279 | Summary: google::protobuf; MessageLite; true; MergePartialFromBoundedZeroCopyStream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 280 | Summary: google::protobuf; MessageLite; true; MergePartialFromCodedStream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 281 | Summary: google::protobuf; MessageLite; true; MergePartialFromCord; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 282 | Summary: google::protobuf; MessageLite; true; MergePartialFromString; (const Cord &); ; Argument[*0]; Argument[-1]; taint; manual |
+| 283 | Summary: google::protobuf; MessageLite; true; MergePartialFromString; (string_view); ; Argument[0]; Argument[-1]; taint; manual |
+| 284 | Summary: google::protobuf; MessageLite; true; ParseFromArray; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 285 | Summary: google::protobuf; MessageLite; true; ParseFromBoundedZeroCopyStream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 286 | Summary: google::protobuf; MessageLite; true; ParseFromCodedStream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 287 | Summary: google::protobuf; MessageLite; true; ParseFromCord; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 288 | Summary: google::protobuf; MessageLite; true; ParseFromIstream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 289 | Summary: google::protobuf; MessageLite; true; ParseFromString; (const Cord &); ; Argument[*0]; Argument[-1]; taint; manual |
+| 290 | Summary: google::protobuf; MessageLite; true; ParseFromString; (string_view); ; Argument[0]; Argument[-1]; taint; manual |
+| 291 | Summary: google::protobuf; MessageLite; true; ParseFromZeroCopyStream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 292 | Summary: google::protobuf; MessageLite; true; ParsePartialFromArray; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 293 | Summary: google::protobuf; MessageLite; true; ParsePartialFromBoundedZeroCopyStream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 294 | Summary: google::protobuf; MessageLite; true; ParsePartialFromCodedStream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 295 | Summary: google::protobuf; MessageLite; true; ParsePartialFromCord; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 296 | Summary: google::protobuf; MessageLite; true; ParsePartialFromIstream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 297 | Summary: google::protobuf; MessageLite; true; ParsePartialFromString; (const Cord &); ; Argument[*0]; Argument[-1]; taint; manual |
+| 298 | Summary: google::protobuf; MessageLite; true; ParsePartialFromString; (string_view); ; Argument[0]; Argument[-1]; taint; manual |
+| 299 | Summary: google::protobuf; MessageLite; true; ParsePartialFromZeroCopyStream; ; ; Argument[*0]; Argument[-1]; taint; manual |
+| 300 | Summary: google::protobuf; MessageLite; true; SerializeAsCord; ; ; Argument[-1]; ReturnValue; taint; manual |
+| 301 | Summary: google::protobuf; MessageLite; true; SerializeAsString; ; ; Argument[-1]; ReturnValue; taint; manual |
+| 302 | Summary: google::protobuf; MessageLite; true; SerializePartialAsCord; ; ; Argument[-1]; ReturnValue; taint; manual |
+| 303 | Summary: google::protobuf; MessageLite; true; SerializePartialAsString; ; ; Argument[-1]; ReturnValue; taint; manual |
+| 304 | Summary: google::protobuf; MessageLite; true; SerializePartialToArray; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 305 | Summary: google::protobuf; MessageLite; true; SerializePartialToCodedStream; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 306 | Summary: google::protobuf; MessageLite; true; SerializePartialToCord; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 307 | Summary: google::protobuf; MessageLite; true; SerializePartialToOstream; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 308 | Summary: google::protobuf; MessageLite; true; SerializePartialToString; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 309 | Summary: google::protobuf; MessageLite; true; SerializePartialToZeroCopyStream; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 310 | Summary: google::protobuf; MessageLite; true; SerializeToArray; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 311 | Summary: google::protobuf; MessageLite; true; SerializeToCodedStream; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 312 | Summary: google::protobuf; MessageLite; true; SerializeToCord; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 313 | Summary: google::protobuf; MessageLite; true; SerializeToOstream; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 314 | Summary: google::protobuf; MessageLite; true; SerializeToString; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 315 | Summary: google::protobuf; MessageLite; true; SerializeToZeroCopyStream; ; ; Argument[-1]; Argument[*0]; taint; manual |
+| 316 | Summary: std; vector; true; vector; (const vector &); ; Argument[*0].Element[@]; Argument[-1].Element[@]; value; manual |
 edges
-| asio_streams.cpp:87:34:87:44 | read_until output argument | asio_streams.cpp:91:7:91:17 | recv_buffer | provenance | Src:MaD:42  |
-| asio_streams.cpp:87:34:87:44 | read_until output argument | asio_streams.cpp:93:29:93:39 | *recv_buffer | provenance | Src:MaD:42 Sink:MaD:2 |
-| asio_streams.cpp:97:37:97:44 | call to source | asio_streams.cpp:98:7:98:14 | send_str | provenance | TaintFunction |
-| asio_streams.cpp:97:37:97:44 | call to source | asio_streams.cpp:100:64:100:71 | *send_str | provenance | TaintFunction |
-| asio_streams.cpp:100:44:100:62 | call to buffer | asio_streams.cpp:100:44:100:62 | call to buffer | provenance |  |
-| asio_streams.cpp:100:44:100:62 | call to buffer | asio_streams.cpp:101:7:101:17 | send_buffer | provenance |  |
-| asio_streams.cpp:100:44:100:62 | call to buffer | asio_streams.cpp:103:29:103:39 | *send_buffer | provenance | Sink:MaD:2 |
-| asio_streams.cpp:100:64:100:71 | *send_str | asio_streams.cpp:100:44:100:62 | call to buffer | provenance | MaD:83 |
-| azure.cpp:253:48:253:60 | *call to GetBodyStream | azure.cpp:253:48:253:60 | *call to GetBodyStream | provenance | Src:MaD:39  |
-| azure.cpp:253:48:253:60 | *call to GetBodyStream | azure.cpp:257:5:257:8 | *resp | provenance |  |
-| azure.cpp:253:48:253:60 | *call to GetBodyStream | azure.cpp:262:5:262:8 | *resp | provenance |  |
-| azure.cpp:253:48:253:60 | *call to GetBodyStream | azure.cpp:266:38:266:41 | *resp | provenance |  |
-| azure.cpp:257:5:257:8 | *resp | azure.cpp:257:16:257:21 | Read output argument | provenance | MaD:79 |
-| azure.cpp:257:16:257:21 | Read output argument | azure.cpp:258:10:258:16 | * ... | provenance |  |
-| azure.cpp:262:5:262:8 | *resp | azure.cpp:262:23:262:28 | ReadToCount output argument | provenance | MaD:80 |
-| azure.cpp:262:23:262:28 | ReadToCount output argument | azure.cpp:263:10:263:16 | * ... | provenance |  |
-| azure.cpp:266:38:266:41 | *resp | azure.cpp:266:44:266:52 | call to ReadToEnd [element] | provenance | MaD:81 |
-| azure.cpp:266:44:266:52 | call to ReadToEnd [element] | azure.cpp:266:44:266:52 | call to ReadToEnd [element] | provenance |  |
-| azure.cpp:266:44:266:52 | call to ReadToEnd [element] | azure.cpp:267:10:267:12 | vec [element] | provenance |  |
-| azure.cpp:267:10:267:12 | vec [element] | azure.cpp:267:10:267:12 | vec | provenance |  |
-| azure.cpp:273:62:273:64 | call to GetHeaders | azure.cpp:273:62:273:64 | call to GetHeaders | provenance | Src:MaD:38  |
-| azure.cpp:273:62:273:64 | call to GetHeaders | azure.cpp:274:14:274:29 | call to operator[] | provenance | TaintFunction |
-| azure.cpp:273:62:273:64 | call to GetHeaders | azure.cpp:274:14:274:29 | call to operator[] | provenance | TaintFunction |
-| azure.cpp:273:62:273:64 | call to GetHeaders | azure.cpp:274:14:274:29 | call to operator[] | provenance | TaintFunction |
-| azure.cpp:274:14:274:29 | call to operator[] | azure.cpp:274:10:274:29 | call to operator[] | provenance |  |
-| azure.cpp:274:14:274:29 | call to operator[] | azure.cpp:274:14:274:29 | call to operator[] | provenance |  |
-| azure.cpp:277:45:277:47 | call to GetBody | azure.cpp:277:45:277:47 | call to GetBody | provenance | Src:MaD:37  |
-| azure.cpp:277:45:277:47 | call to GetBody | azure.cpp:278:10:278:13 | body | provenance |  |
-| azure.cpp:277:45:277:47 | call to GetBody | azure.cpp:278:10:278:13 | body | provenance |  |
-| azure.cpp:278:10:278:13 | body | azure.cpp:278:10:278:13 | body | provenance |  |
-| azure.cpp:281:68:281:84 | *call to ExtractBodyStream | azure.cpp:281:68:281:84 | *call to ExtractBodyStream | provenance | Src:MaD:36  |
-| azure.cpp:281:68:281:84 | *call to ExtractBodyStream | azure.cpp:282:21:282:23 | *call to get | provenance |  |
-| azure.cpp:282:21:282:23 | *call to get | azure.cpp:282:28:282:36 | call to ReadToEnd [element] | provenance | MaD:81 |
-| azure.cpp:282:28:282:36 | call to ReadToEnd [element] | azure.cpp:282:10:282:38 | call to ReadToEnd | provenance |  |
-| azure.cpp:282:28:282:36 | call to ReadToEnd [element] | azure.cpp:282:28:282:36 | call to ReadToEnd [element] | provenance |  |
-| azure.cpp:289:24:289:56 | call to GetHeader | azure.cpp:289:63:289:65 | call to Value | provenance | MaD:82 |
-| azure.cpp:289:32:289:40 | call to GetHeader | azure.cpp:289:24:289:56 | call to GetHeader | provenance |  |
-| azure.cpp:289:32:289:40 | call to GetHeader | azure.cpp:289:32:289:40 | call to GetHeader | provenance | Src:MaD:40  |
-| azure.cpp:289:63:289:65 | call to Value | azure.cpp:289:63:289:65 | call to Value | provenance |  |
-| azure.cpp:289:63:289:65 | call to Value | azure.cpp:290:10:290:20 | headerValue | provenance |  |
-| azure.cpp:289:63:289:65 | call to Value | azure.cpp:290:10:290:20 | headerValue | provenance |  |
-| azure.cpp:290:10:290:20 | headerValue | azure.cpp:290:10:290:20 | headerValue | provenance |  |
-| azure.cpp:293:58:293:67 | call to GetHeaders | azure.cpp:293:58:293:67 | call to GetHeaders | provenance | Src:MaD:41  |
-| azure.cpp:293:58:293:67 | call to GetHeaders | azure.cpp:294:38:294:53 | call to operator[] | provenance | TaintFunction |
-| azure.cpp:294:38:294:53 | call to operator[] | azure.cpp:295:10:295:20 | contentType | provenance |  |
-| azure.cpp:294:38:294:53 | call to operator[] | azure.cpp:295:10:295:20 | contentType | provenance |  |
-| azure.cpp:295:10:295:20 | contentType | azure.cpp:295:10:295:20 | contentType | provenance |  |
+| asio_streams.cpp:109:34:109:44 | read_until output argument | asio_streams.cpp:113:7:113:17 | recv_buffer | provenance | Src:MaD:56  |
+| asio_streams.cpp:109:34:109:44 | read_until output argument | asio_streams.cpp:115:29:115:39 | recv_buffer | provenance | Src:MaD:56 Sink:MaD:4 |
+| asio_streams.cpp:119:37:119:44 | call to source | asio_streams.cpp:120:7:120:14 | send_str | provenance | TaintFunction |
+| asio_streams.cpp:119:37:119:44 | call to source | asio_streams.cpp:122:64:122:71 | *send_str | provenance | TaintFunction |
+| asio_streams.cpp:122:44:122:62 | call to buffer | asio_streams.cpp:122:44:122:62 | call to buffer | provenance |  |
+| asio_streams.cpp:122:44:122:62 | call to buffer | asio_streams.cpp:123:7:123:17 | send_buffer | provenance |  |
+| asio_streams.cpp:122:44:122:62 | call to buffer | asio_streams.cpp:125:29:125:39 | send_buffer | provenance | Sink:MaD:4 |
+| asio_streams.cpp:122:64:122:71 | *send_str | asio_streams.cpp:122:44:122:62 | call to buffer | provenance | MaD:266 |
+| asio_streams.cpp:136:19:136:26 | call to source | asio_streams.cpp:141:24:141:27 | *host | provenance | TaintFunction |
+| asio_streams.cpp:136:19:136:26 | call to source | asio_streams.cpp:142:24:142:27 | *host | provenance | TaintFunction |
+| asio_streams.cpp:136:19:136:26 | call to source | asio_streams.cpp:143:24:143:27 | *host | provenance | TaintFunction |
+| asio_streams.cpp:136:19:136:26 | call to source | asio_streams.cpp:144:24:144:27 | *host | provenance | TaintFunction |
+| asio_streams.cpp:136:19:136:26 | call to source | asio_streams.cpp:151:34:151:37 | *host | provenance | TaintFunction |
+| asio_streams.cpp:136:19:136:26 | call to source | asio_streams.cpp:152:34:152:37 | *host | provenance | TaintFunction |
+| asio_streams.cpp:136:19:136:26 | call to source | asio_streams.cpp:153:34:153:37 | *host | provenance | TaintFunction |
+| asio_streams.cpp:136:19:136:26 | call to source | asio_streams.cpp:154:34:154:37 | *host | provenance | TaintFunction |
+| asio_streams.cpp:141:24:141:27 | *host | asio_streams.cpp:141:16:141:22 | call to resolve | provenance | MaD:262 |
+| asio_streams.cpp:142:24:142:27 | *host | asio_streams.cpp:142:16:142:22 | call to resolve | provenance | MaD:263 |
+| asio_streams.cpp:143:24:143:27 | *host | asio_streams.cpp:143:16:143:22 | call to resolve | provenance | MaD:264 |
+| asio_streams.cpp:144:24:144:27 | *host | asio_streams.cpp:144:16:144:22 | call to resolve | provenance | MaD:265 |
+| asio_streams.cpp:151:34:151:37 | *host | asio_streams.cpp:151:16:151:22 | call to resolve | provenance | MaD:258 |
+| asio_streams.cpp:152:34:152:37 | *host | asio_streams.cpp:152:16:152:22 | call to resolve | provenance | MaD:259 |
+| asio_streams.cpp:153:34:153:37 | *host | asio_streams.cpp:153:16:153:22 | call to resolve | provenance | MaD:260 |
+| asio_streams.cpp:154:34:154:37 | *host | asio_streams.cpp:154:16:154:22 | call to resolve | provenance | MaD:261 |
+| asio_streams.cpp:168:22:168:29 | call to source | asio_streams.cpp:172:30:172:36 | *service | provenance | TaintFunction |
+| asio_streams.cpp:168:22:168:29 | call to source | asio_streams.cpp:173:30:173:36 | *service | provenance | TaintFunction |
+| asio_streams.cpp:168:22:168:29 | call to source | asio_streams.cpp:174:30:174:36 | *service | provenance | TaintFunction |
+| asio_streams.cpp:168:22:168:29 | call to source | asio_streams.cpp:175:30:175:36 | *service | provenance | TaintFunction |
+| asio_streams.cpp:168:22:168:29 | call to source | asio_streams.cpp:182:40:182:46 | *service | provenance | TaintFunction |
+| asio_streams.cpp:168:22:168:29 | call to source | asio_streams.cpp:183:40:183:46 | *service | provenance | TaintFunction |
+| asio_streams.cpp:168:22:168:29 | call to source | asio_streams.cpp:184:40:184:46 | *service | provenance | TaintFunction |
+| asio_streams.cpp:168:22:168:29 | call to source | asio_streams.cpp:185:40:185:46 | *service | provenance | TaintFunction |
+| asio_streams.cpp:172:30:172:36 | *service | asio_streams.cpp:172:16:172:22 | call to resolve | provenance | MaD:262 |
+| asio_streams.cpp:173:30:173:36 | *service | asio_streams.cpp:173:16:173:22 | call to resolve | provenance | MaD:263 |
+| asio_streams.cpp:174:30:174:36 | *service | asio_streams.cpp:174:16:174:22 | call to resolve | provenance | MaD:264 |
+| asio_streams.cpp:175:30:175:36 | *service | asio_streams.cpp:175:16:175:22 | call to resolve | provenance | MaD:265 |
+| asio_streams.cpp:182:40:182:46 | *service | asio_streams.cpp:182:16:182:22 | call to resolve | provenance | MaD:258 |
+| asio_streams.cpp:183:40:183:46 | *service | asio_streams.cpp:183:16:183:22 | call to resolve | provenance | MaD:259 |
+| asio_streams.cpp:184:40:184:46 | *service | asio_streams.cpp:184:16:184:22 | call to resolve | provenance | MaD:260 |
+| asio_streams.cpp:185:40:185:46 | *service | asio_streams.cpp:185:16:185:22 | call to resolve | provenance | MaD:261 |
+| azure.cpp:216:48:216:60 | *call to GetBodyStream | azure.cpp:220:5:220:8 | *resp | provenance |  |
+| azure.cpp:216:48:216:60 | *call to GetBodyStream | azure.cpp:225:5:225:8 | *resp | provenance |  |
+| azure.cpp:216:48:216:60 | *call to GetBodyStream | azure.cpp:229:38:229:41 | *resp | provenance |  |
+| azure.cpp:216:48:216:60 | call to GetBodyStream | azure.cpp:216:48:216:60 | *call to GetBodyStream | provenance | Src:MaD:53  |
+| azure.cpp:220:5:220:8 | *resp | azure.cpp:220:16:220:21 | Read output argument | provenance | MaD:95 |
+| azure.cpp:220:16:220:21 | Read output argument | azure.cpp:221:10:221:16 | * ... | provenance |  |
+| azure.cpp:225:5:225:8 | *resp | azure.cpp:225:23:225:28 | ReadToCount output argument | provenance | MaD:96 |
+| azure.cpp:225:23:225:28 | ReadToCount output argument | azure.cpp:226:10:226:16 | * ... | provenance |  |
+| azure.cpp:229:38:229:41 | *resp | azure.cpp:229:44:229:52 | call to ReadToEnd [element] | provenance | MaD:97 |
+| azure.cpp:229:44:229:52 | call to ReadToEnd [element] | azure.cpp:229:44:229:52 | call to ReadToEnd [element] | provenance |  |
+| azure.cpp:229:44:229:52 | call to ReadToEnd [element] | azure.cpp:230:10:230:12 | *vec [element] | provenance |  |
+| azure.cpp:229:44:229:52 | call to ReadToEnd [element] | azure.cpp:230:10:230:12 | call to vector | provenance | DataFlowFunction |
+| azure.cpp:230:10:230:12 | *vec [element] | azure.cpp:230:10:230:12 | call to vector [element] | provenance | MaD:316 |
+| azure.cpp:230:10:230:12 | call to vector [element] | azure.cpp:230:10:230:12 | call to vector | provenance |  |
+| azure.cpp:236:52:236:61 | call to GetHeaders | azure.cpp:237:14:237:29 | call to operator[] | provenance | Src:MaD:52 DataFlowFunction |
+| azure.cpp:236:52:236:61 | call to GetHeaders | azure.cpp:237:14:237:29 | call to operator[] | provenance | Src:MaD:52 TaintFunction |
+| azure.cpp:240:38:240:44 | call to GetBody | azure.cpp:241:10:241:13 | call to vector | provenance | Src:MaD:51 DataFlowFunction |
+| azure.cpp:240:38:240:44 | call to GetBody | azure.cpp:241:10:241:13 | call to vector | provenance | Src:MaD:51 DataFlowFunction |
+| azure.cpp:240:38:240:44 | call to GetBody | azure.cpp:241:10:241:13 | call to vector | provenance | Src:MaD:51 DataFlowFunction |
+| azure.cpp:240:38:240:44 | call to GetBody | azure.cpp:241:10:241:13 | call to vector | provenance | Src:MaD:51 TaintFunction |
+| azure.cpp:240:38:240:44 | call to GetBody | azure.cpp:241:10:241:13 | call to vector | provenance | Src:MaD:51 TaintFunction |
+| azure.cpp:240:38:240:44 | call to GetBody | azure.cpp:241:10:241:13 | call to vector | provenance | Src:MaD:51 TaintFunction |
+| azure.cpp:241:10:241:13 | call to vector | azure.cpp:241:10:241:13 | call to vector | provenance |  |
+| azure.cpp:244:68:244:84 | *call to ExtractBodyStream | azure.cpp:245:21:245:23 | *call to get | provenance |  |
+| azure.cpp:244:68:244:84 | call to ExtractBodyStream | azure.cpp:244:68:244:84 | *call to ExtractBodyStream | provenance | Src:MaD:50  |
+| azure.cpp:245:21:245:23 | *call to get | azure.cpp:245:28:245:36 | call to ReadToEnd [element] | provenance | MaD:97 |
+| azure.cpp:245:28:245:36 | call to ReadToEnd [element] | azure.cpp:245:10:245:38 | call to ReadToEnd | provenance |  |
+| azure.cpp:245:28:245:36 | call to ReadToEnd [element] | azure.cpp:245:28:245:36 | call to ReadToEnd [element] | provenance |  |
+| azure.cpp:255:24:255:56 | call to GetHeader | azure.cpp:255:63:255:65 | call to Value | provenance | MaD:100 |
+| azure.cpp:255:32:255:40 | call to GetHeader | azure.cpp:255:24:255:56 | call to GetHeader | provenance |  |
+| azure.cpp:255:32:255:40 | call to GetHeader | azure.cpp:255:32:255:40 | call to GetHeader | provenance | Src:MaD:54  |
+| azure.cpp:255:63:255:65 | call to Value | azure.cpp:255:63:255:65 | call to Value | provenance |  |
+| azure.cpp:255:63:255:65 | call to Value | azure.cpp:256:10:256:20 | headerValue | provenance |  |
+| azure.cpp:259:58:259:67 | call to GetHeaders | azure.cpp:259:58:259:67 | call to GetHeaders | provenance | Src:MaD:55  |
+| azure.cpp:259:58:259:67 | call to GetHeaders | azure.cpp:260:38:260:53 | call to operator[] | provenance | TaintFunction |
+| azure.cpp:260:38:260:53 | call to operator[] | azure.cpp:261:10:261:20 | contentType | provenance |  |
+| azure.cpp:268:3:268:5 | SetQueryParameters output argument | azure.cpp:269:8:269:10 | *url | provenance |  |
+| azure.cpp:268:26:268:45 | call to GetHeaders | azure.cpp:268:3:268:5 | SetQueryParameters output argument | provenance | MaD:99 |
+| azure.cpp:268:34:268:43 | call to GetHeaders | azure.cpp:268:26:268:45 | call to GetHeaders | provenance |  |
+| azure.cpp:268:34:268:43 | call to GetHeaders | azure.cpp:268:34:268:43 | call to GetHeaders | provenance | Src:MaD:55  |
+| azure.cpp:269:8:269:10 | *url | azure.cpp:269:12:269:29 | call to GetQueryParameters | provenance | MaD:98 |
+| azure.cpp:269:12:269:29 | call to GetQueryParameters | azure.cpp:269:12:269:29 | call to GetQueryParameters | provenance |  |
+| azure.cpp:269:12:269:29 | call to GetQueryParameters | azure.cpp:269:32:269:40 | call to operator[] | provenance | TaintFunction |
+| bal.cpp:128:19:128:26 | call to source | bal.cpp:129:23:129:51 | *call to data | provenance | TaintFunction |
+| bal.cpp:129:23:129:51 | *call to data | bal.cpp:132:17:132:18 | *sb | provenance |  |
+| bal.cpp:132:17:132:18 | *sb | bal.cpp:132:21:132:24 | decode output argument | provenance | MaD:101 |
+| bal.cpp:132:21:132:24 | decode output argument | bal.cpp:133:7:133:17 | * ... | provenance | TaintFunction |
+| bal.cpp:137:19:137:26 | call to source | bal.cpp:138:21:138:47 | *call to data | provenance | TaintFunction |
+| bal.cpp:138:21:138:47 | *call to data | bal.cpp:141:17:141:19 | ** ... | provenance |  |
+| bal.cpp:141:17:141:19 | ** ... | bal.cpp:141:22:141:25 | decode output argument | provenance | MaD:101 |
+| bal.cpp:141:22:141:25 | decode output argument | bal.cpp:142:7:142:17 | * ... | provenance | TaintFunction |
+| bal.cpp:146:19:146:26 | call to source | bal.cpp:147:23:147:51 | *call to data | provenance | TaintFunction |
+| bal.cpp:147:23:147:51 | *call to data | bal.cpp:150:20:150:21 | *sb | provenance |  |
+| bal.cpp:150:20:150:21 | *sb | bal.cpp:150:24:150:27 | decodeAny output argument | provenance | MaD:102 |
+| bal.cpp:150:24:150:27 | decodeAny output argument | bal.cpp:151:7:151:17 | * ... | provenance | TaintFunction |
+| bal.cpp:156:18:156:25 | call to source | bal.cpp:159:40:159:42 | *obj | provenance | TaintFunction |
+| bal.cpp:159:17:159:37 | encode output argument | bal.cpp:160:7:160:12 | access to array | provenance |  |
+| bal.cpp:159:40:159:42 | *obj | bal.cpp:159:17:159:37 | encode output argument | provenance | MaD:103 |
+| bal.cpp:164:18:164:25 | call to source | bal.cpp:167:43:167:45 | *obj | provenance | TaintFunction |
+| bal.cpp:167:20:167:40 | encodeAny output argument | bal.cpp:168:7:168:12 | access to array | provenance |  |
+| bal.cpp:167:43:167:45 | *obj | bal.cpp:167:20:167:40 | encodeAny output argument | provenance | MaD:104 |
+| bal.cpp:175:19:175:26 | call to source | bal.cpp:176:23:176:51 | *call to data | provenance | TaintFunction |
+| bal.cpp:176:23:176:51 | *call to data | bal.cpp:180:17:180:18 | *sb | provenance |  |
+| bal.cpp:180:17:180:18 | *sb | bal.cpp:180:21:180:24 | decode output argument | provenance | MaD:105 |
+| bal.cpp:180:21:180:24 | decode output argument | bal.cpp:181:7:181:17 | * ... | provenance | TaintFunction |
+| bal.cpp:185:19:185:26 | call to source | bal.cpp:186:21:186:47 | *call to data | provenance | TaintFunction |
+| bal.cpp:186:21:186:47 | *call to data | bal.cpp:190:17:190:19 | ** ... | provenance |  |
+| bal.cpp:190:17:190:19 | ** ... | bal.cpp:190:22:190:25 | decode output argument | provenance | MaD:105 |
+| bal.cpp:190:22:190:25 | decode output argument | bal.cpp:191:7:191:17 | * ... | provenance | TaintFunction |
+| bal.cpp:195:19:195:26 | call to source | bal.cpp:196:23:196:51 | *call to data | provenance | TaintFunction |
+| bal.cpp:196:23:196:51 | *call to data | bal.cpp:199:20:199:21 | *sb | provenance |  |
+| bal.cpp:199:20:199:21 | *sb | bal.cpp:199:24:199:27 | decodeAny output argument | provenance | MaD:106 |
+| bal.cpp:199:24:199:27 | decodeAny output argument | bal.cpp:200:7:200:17 | * ... | provenance | TaintFunction |
+| bal.cpp:204:18:204:25 | call to source | bal.cpp:208:40:208:42 | *obj | provenance | TaintFunction |
+| bal.cpp:208:17:208:37 | encode output argument | bal.cpp:209:7:209:12 | access to array | provenance |  |
+| bal.cpp:208:40:208:42 | *obj | bal.cpp:208:17:208:37 | encode output argument | provenance | MaD:107 |
+| bal.cpp:213:18:213:25 | call to source | bal.cpp:216:43:216:45 | *obj | provenance | TaintFunction |
+| bal.cpp:216:20:216:40 | encodeAny output argument | bal.cpp:217:7:217:12 | access to array | provenance |  |
+| bal.cpp:216:43:216:45 | *obj | bal.cpp:216:20:216:40 | encodeAny output argument | provenance | MaD:108 |
+| bal.cpp:222:19:222:26 | call to source | bal.cpp:223:23:223:51 | *call to data | provenance | TaintFunction |
+| bal.cpp:223:23:223:51 | *call to data | bal.cpp:226:17:226:18 | *sb | provenance |  |
+| bal.cpp:226:17:226:18 | *sb | bal.cpp:226:21:226:24 | decode output argument | provenance | MaD:105 |
+| bal.cpp:226:21:226:24 | decode output argument | bal.cpp:229:40:229:42 | *rec | provenance |  |
+| bal.cpp:229:17:229:37 | encode output argument | bal.cpp:230:7:230:12 | access to array | provenance |  |
+| bal.cpp:229:40:229:42 | *rec | bal.cpp:229:17:229:37 | encode output argument | provenance | MaD:107 |
+| bal.cpp:245:19:245:26 | call to source | bal.cpp:246:21:246:47 | *call to data | provenance | TaintFunction |
+| bal.cpp:246:21:246:47 | *call to data | bal.cpp:249:17:249:19 | ** ... | provenance |  |
+| bal.cpp:249:17:249:19 | ** ... | bal.cpp:249:22:249:25 | decode output argument | provenance | MaD:110 |
+| bal.cpp:249:22:249:25 | decode output argument | bal.cpp:250:7:250:17 | * ... | provenance | TaintFunction |
+| bal.cpp:254:19:254:26 | call to source | bal.cpp:255:21:255:47 | *call to data | provenance | TaintFunction |
+| bal.cpp:255:21:255:47 | *call to data | bal.cpp:258:35:258:37 | ** ... | provenance |  |
+| bal.cpp:258:34:258:52 | *call to decode | bal.cpp:258:34:258:52 | *call to decode | provenance |  |
+| bal.cpp:258:34:258:52 | *call to decode | bal.cpp:259:7:259:17 | * ... | provenance |  |
+| bal.cpp:258:35:258:37 | ** ... | bal.cpp:258:34:258:52 | *call to decode | provenance | MaD:111 |
+| bal.cpp:258:35:258:37 | ** ... | bal.cpp:258:40:258:43 | decode output argument | provenance | MaD:110 |
+| bal.cpp:258:40:258:43 | decode output argument | bal.cpp:260:7:260:9 | out | provenance |  |
+| bal.cpp:264:19:264:26 | call to source | bal.cpp:265:23:265:51 | *call to data | provenance | TaintFunction |
+| bal.cpp:265:23:265:51 | *call to data | bal.cpp:268:17:268:18 | *sb | provenance |  |
+| bal.cpp:268:17:268:18 | *sb | bal.cpp:268:21:268:24 | decode output argument | provenance | MaD:112 |
+| bal.cpp:268:21:268:24 | decode output argument | bal.cpp:269:7:269:17 | * ... | provenance | TaintFunction |
+| bal.cpp:273:19:273:26 | call to source | bal.cpp:276:22:276:25 | *call to data | provenance | TaintFunction |
+| bal.cpp:276:22:276:25 | *call to data | bal.cpp:276:43:276:46 | decode output argument | provenance | MaD:109 |
+| bal.cpp:276:43:276:46 | decode output argument | bal.cpp:277:7:277:17 | * ... | provenance | TaintFunction |
+| bal.cpp:301:19:301:26 | call to source | bal.cpp:302:21:302:47 | *call to data | provenance | TaintFunction |
+| bal.cpp:302:21:302:47 | *call to data | bal.cpp:305:20:305:22 | ** ... | provenance |  |
+| bal.cpp:305:20:305:22 | ** ... | bal.cpp:305:25:305:28 | decodeAny output argument | provenance | MaD:116 |
+| bal.cpp:305:25:305:28 | decodeAny output argument | bal.cpp:306:7:306:17 | * ... | provenance | TaintFunction |
+| bal.cpp:310:19:310:26 | call to source | bal.cpp:311:21:311:47 | *call to data | provenance | TaintFunction |
+| bal.cpp:311:21:311:47 | *call to data | bal.cpp:314:38:314:40 | ** ... | provenance |  |
+| bal.cpp:314:37:314:48 | *call to decodeAny | bal.cpp:314:37:314:48 | *call to decodeAny | provenance |  |
+| bal.cpp:314:37:314:48 | *call to decodeAny | bal.cpp:315:7:315:17 | * ... | provenance |  |
+| bal.cpp:314:38:314:40 | ** ... | bal.cpp:314:37:314:48 | *call to decodeAny | provenance | MaD:117 |
+| bal.cpp:314:38:314:40 | ** ... | bal.cpp:314:43:314:46 | decodeAny output argument | provenance | MaD:116 |
+| bal.cpp:314:43:314:46 | decodeAny output argument | bal.cpp:316:7:316:9 | out | provenance |  |
+| bal.cpp:320:19:320:26 | call to source | bal.cpp:321:23:321:51 | *call to data | provenance | TaintFunction |
+| bal.cpp:321:23:321:51 | *call to data | bal.cpp:324:20:324:21 | *sb | provenance |  |
+| bal.cpp:324:20:324:21 | *sb | bal.cpp:324:24:324:27 | decodeAny output argument | provenance | MaD:118 |
+| bal.cpp:324:24:324:27 | decodeAny output argument | bal.cpp:325:7:325:17 | * ... | provenance | TaintFunction |
+| bal.cpp:329:19:329:26 | call to source | bal.cpp:330:21:330:47 | *call to data | provenance | TaintFunction |
+| bal.cpp:330:21:330:47 | *call to data | bal.cpp:333:20:333:22 | ** ... | provenance |  |
+| bal.cpp:333:20:333:22 | ** ... | bal.cpp:333:25:333:28 | decodeAny output argument | provenance | MaD:113 |
+| bal.cpp:333:25:333:28 | decodeAny output argument | bal.cpp:334:7:334:19 | * ... | provenance |  |
+| bal.cpp:338:19:338:26 | call to source | bal.cpp:339:21:339:47 | *call to data | provenance | TaintFunction |
+| bal.cpp:339:21:339:47 | *call to data | bal.cpp:342:38:342:40 | ** ... | provenance |  |
+| bal.cpp:342:37:342:48 | *call to decodeAny | bal.cpp:342:37:342:48 | *call to decodeAny | provenance |  |
+| bal.cpp:342:37:342:48 | *call to decodeAny | bal.cpp:343:7:343:17 | * ... | provenance |  |
+| bal.cpp:342:38:342:40 | ** ... | bal.cpp:342:37:342:48 | *call to decodeAny | provenance | MaD:114 |
+| bal.cpp:342:38:342:40 | ** ... | bal.cpp:342:43:342:46 | decodeAny output argument | provenance | MaD:113 |
+| bal.cpp:342:43:342:46 | decodeAny output argument | bal.cpp:344:7:344:19 | * ... | provenance |  |
+| bal.cpp:348:19:348:26 | call to source | bal.cpp:349:23:349:51 | *call to data | provenance | TaintFunction |
+| bal.cpp:349:23:349:51 | *call to data | bal.cpp:352:20:352:21 | *sb | provenance |  |
+| bal.cpp:352:20:352:21 | *sb | bal.cpp:352:24:352:27 | decodeAny output argument | provenance | MaD:115 |
+| bal.cpp:352:24:352:27 | decodeAny output argument | bal.cpp:353:7:353:19 | * ... | provenance |  |
+| bal.cpp:357:18:357:25 | call to source | bal.cpp:360:40:360:42 | *obj | provenance | TaintFunction |
+| bal.cpp:360:17:360:37 | encode output argument | bal.cpp:361:7:361:12 | access to array | provenance |  |
+| bal.cpp:360:40:360:42 | *obj | bal.cpp:360:17:360:37 | encode output argument | provenance | MaD:121 |
+| bal.cpp:365:18:365:25 | call to source | bal.cpp:368:39:368:41 | *obj | provenance | TaintFunction |
+| bal.cpp:368:17:368:36 | encode output argument | bal.cpp:369:7:369:12 | access to array | provenance |  |
+| bal.cpp:368:39:368:41 | *obj | bal.cpp:368:17:368:36 | encode output argument | provenance | MaD:120 |
+| bal.cpp:373:18:373:25 | call to source | bal.cpp:376:57:376:59 | *obj | provenance | TaintFunction |
+| bal.cpp:376:34:376:61 | *call to encode | bal.cpp:376:34:376:61 | *call to encode | provenance |  |
+| bal.cpp:376:34:376:61 | *call to encode | bal.cpp:377:7:377:17 | * ... | provenance |  |
+| bal.cpp:376:35:376:54 | encode output argument | bal.cpp:378:7:378:12 | access to array | provenance |  |
+| bal.cpp:376:57:376:59 | *obj | bal.cpp:376:34:376:61 | *call to encode | provenance | MaD:119 |
+| bal.cpp:376:57:376:59 | *obj | bal.cpp:376:35:376:54 | encode output argument | provenance | MaD:120 |
+| bal.cpp:382:19:382:26 | call to source | bal.cpp:383:21:383:47 | *call to data | provenance | TaintFunction |
+| bal.cpp:383:21:383:47 | *call to data | bal.cpp:386:35:386:37 | ** ... | provenance |  |
+| bal.cpp:386:34:386:44 | *call to encode | bal.cpp:386:34:386:44 | *call to encode | provenance |  |
+| bal.cpp:386:34:386:44 | *call to encode | bal.cpp:387:7:387:17 | * ... | provenance |  |
+| bal.cpp:386:35:386:37 | ** ... | bal.cpp:386:34:386:44 | *call to encode | provenance | MaD:119 |
+| bal.cpp:391:18:391:25 | call to source | bal.cpp:394:47:394:49 | *obj | provenance | TaintFunction |
+| bal.cpp:394:25:394:44 | encodeToStream output argument | bal.cpp:395:7:395:12 | access to array | provenance |  |
+| bal.cpp:394:47:394:49 | *obj | bal.cpp:394:25:394:44 | encodeToStream output argument | provenance | MaD:129 |
+| bal.cpp:409:18:409:25 | call to source | bal.cpp:412:43:412:45 | *obj | provenance | TaintFunction |
+| bal.cpp:412:20:412:40 | encodeAny output argument | bal.cpp:413:7:413:12 | access to array | provenance |  |
+| bal.cpp:412:43:412:45 | *obj | bal.cpp:412:20:412:40 | encodeAny output argument | provenance | MaD:127 |
+| bal.cpp:417:18:417:25 | call to source | bal.cpp:420:42:420:44 | *obj | provenance | TaintFunction |
+| bal.cpp:420:20:420:39 | encodeAny output argument | bal.cpp:421:7:421:12 | access to array | provenance |  |
+| bal.cpp:420:42:420:44 | *obj | bal.cpp:420:20:420:39 | encodeAny output argument | provenance | MaD:126 |
+| bal.cpp:425:18:425:25 | call to source | bal.cpp:428:60:428:62 | *obj | provenance | TaintFunction |
+| bal.cpp:428:37:428:64 | *call to encodeAny | bal.cpp:428:37:428:64 | *call to encodeAny | provenance |  |
+| bal.cpp:428:37:428:64 | *call to encodeAny | bal.cpp:429:7:429:17 | * ... | provenance |  |
+| bal.cpp:428:38:428:57 | encodeAny output argument | bal.cpp:430:7:430:12 | access to array | provenance |  |
+| bal.cpp:428:60:428:62 | *obj | bal.cpp:428:37:428:64 | *call to encodeAny | provenance | MaD:125 |
+| bal.cpp:428:60:428:62 | *obj | bal.cpp:428:38:428:57 | encodeAny output argument | provenance | MaD:126 |
+| bal.cpp:434:18:434:25 | call to source | bal.cpp:437:50:437:52 | *obj | provenance | TaintFunction |
+| bal.cpp:437:28:437:47 | encodeAnyToStream output argument | bal.cpp:438:7:438:12 | access to array | provenance |  |
+| bal.cpp:437:50:437:52 | *obj | bal.cpp:437:28:437:47 | encodeAnyToStream output argument | provenance | MaD:128 |
+| bal.cpp:442:19:442:26 | call to source | bal.cpp:443:41:443:86 | *call to data | provenance | TaintFunction |
+| bal.cpp:443:41:443:86 | *call to data | bal.cpp:446:43:446:46 | ** ... | provenance |  |
+| bal.cpp:446:20:446:40 | encodeAny output argument | bal.cpp:447:7:447:12 | access to array | provenance |  |
+| bal.cpp:446:43:446:46 | ** ... | bal.cpp:446:20:446:40 | encodeAny output argument | provenance | MaD:124 |
+| bal.cpp:451:19:451:26 | call to source | bal.cpp:452:41:452:86 | *call to data | provenance | TaintFunction |
+| bal.cpp:452:41:452:86 | *call to data | bal.cpp:455:42:455:45 | ** ... | provenance |  |
+| bal.cpp:455:20:455:39 | encodeAny output argument | bal.cpp:456:7:456:12 | access to array | provenance |  |
+| bal.cpp:455:42:455:45 | ** ... | bal.cpp:455:20:455:39 | encodeAny output argument | provenance | MaD:123 |
+| bal.cpp:460:19:460:26 | call to source | bal.cpp:461:41:461:86 | *call to data | provenance | TaintFunction |
+| bal.cpp:461:41:461:86 | *call to data | bal.cpp:464:60:464:63 | ** ... | provenance |  |
+| bal.cpp:464:37:464:65 | *call to encodeAny | bal.cpp:464:37:464:65 | *call to encodeAny | provenance |  |
+| bal.cpp:464:37:464:65 | *call to encodeAny | bal.cpp:465:7:465:17 | * ... | provenance |  |
+| bal.cpp:464:38:464:57 | encodeAny output argument | bal.cpp:466:7:466:12 | access to array | provenance |  |
+| bal.cpp:464:60:464:63 | ** ... | bal.cpp:464:37:464:65 | *call to encodeAny | provenance | MaD:122 |
+| bal.cpp:464:60:464:63 | ** ... | bal.cpp:464:38:464:57 | encodeAny output argument | provenance | MaD:123 |
+| bdlbb.cpp:37:16:37:23 | call to source | bdlbb.cpp:39:49:39:52 | *call to data | provenance | TaintFunction |
+| bdlbb.cpp:39:37:39:41 | copy output argument | bdlbb.cpp:41:42:41:45 | *blob | provenance |  |
+| bdlbb.cpp:39:49:39:52 | *call to data | bdlbb.cpp:39:37:39:41 | copy output argument | provenance | MaD:134 |
+| bdlbb.cpp:41:37:41:39 | copy output argument | bdlbb.cpp:42:7:42:10 | * ... | provenance |  |
+| bdlbb.cpp:41:42:41:45 | *blob | bdlbb.cpp:41:37:41:39 | copy output argument | provenance | MaD:135 |
+| bdlbb.cpp:46:16:46:23 | call to source | bdlbb.cpp:48:49:48:52 | *call to data | provenance | TaintFunction |
+| bdlbb.cpp:48:37:48:41 | copy output argument | bdlbb.cpp:49:18:49:21 | *blob | provenance |  |
+| bdlbb.cpp:48:49:48:52 | *call to data | bdlbb.cpp:48:37:48:41 | copy output argument | provenance | MaD:134 |
+| bdlbb.cpp:49:18:49:21 | *blob | bdlbb.cpp:49:29:49:32 | *call to buffer | provenance | MaD:130 |
+| bdlbb.cpp:49:18:49:38 | *call to data | bdlbb.cpp:49:18:49:38 | *call to data | provenance |  |
+| bdlbb.cpp:49:18:49:38 | *call to data | bdlbb.cpp:50:7:50:8 | * ... | provenance |  |
+| bdlbb.cpp:49:29:49:32 | *call to buffer | bdlbb.cpp:49:18:49:38 | *call to data | provenance | MaD:132 |
+| bdlbb.cpp:55:16:55:23 | call to source | bdlbb.cpp:57:49:57:52 | *call to data | provenance | TaintFunction |
+| bdlbb.cpp:57:37:57:41 | copy output argument | bdlbb.cpp:58:18:58:21 | *blob | provenance |  |
+| bdlbb.cpp:57:49:57:52 | *call to data | bdlbb.cpp:57:37:57:41 | copy output argument | provenance | MaD:134 |
+| bdlbb.cpp:58:18:58:21 | *blob | bdlbb.cpp:58:29:58:32 | *call to buffer | provenance | MaD:130 |
+| bdlbb.cpp:58:18:58:46 | call to get | bdlbb.cpp:59:7:59:8 | * ... | provenance |  |
+| bdlbb.cpp:58:29:58:32 | *call to buffer | bdlbb.cpp:58:39:58:41 | *call to buffer | provenance | MaD:131 |
+| bdlbb.cpp:58:39:58:41 | *call to buffer | bdlbb.cpp:58:18:58:46 | call to get | provenance | DataFlowFunction |
+| bdlbb.cpp:63:16:63:23 | call to source | bdlbb.cpp:65:49:65:52 | *call to data | provenance | TaintFunction |
+| bdlbb.cpp:65:37:65:41 | copy output argument | bdlbb.cpp:67:72:67:75 | *blob | provenance |  |
+| bdlbb.cpp:65:49:65:52 | *call to data | bdlbb.cpp:65:37:65:41 | copy output argument | provenance | MaD:134 |
+| bdlbb.cpp:67:12:67:65 | *call to getContiguousRangeOrCopy | bdlbb.cpp:67:12:67:65 | *call to getContiguousRangeOrCopy | provenance |  |
+| bdlbb.cpp:67:12:67:65 | *call to getContiguousRangeOrCopy | bdlbb.cpp:68:7:68:8 | * ... | provenance |  |
+| bdlbb.cpp:67:72:67:75 | *blob | bdlbb.cpp:67:12:67:65 | *call to getContiguousRangeOrCopy | provenance | MaD:136 |
+| bdlbb.cpp:73:16:73:23 | call to source | bdlbb.cpp:75:48:75:51 | *call to data | provenance | TaintFunction |
+| bdlbb.cpp:75:37:75:40 | copy output argument | bdlbb.cpp:77:46:77:48 | *src | provenance |  |
+| bdlbb.cpp:75:48:75:51 | *call to data | bdlbb.cpp:75:37:75:40 | copy output argument | provenance | MaD:134 |
+| bdlbb.cpp:77:37:77:40 | copy output argument | bdlbb.cpp:79:42:79:44 | *dst | provenance |  |
+| bdlbb.cpp:77:46:77:48 | *src | bdlbb.cpp:77:37:77:40 | copy output argument | provenance | MaD:133 |
+| bdlbb.cpp:79:37:79:39 | copy output argument | bdlbb.cpp:80:7:80:10 | * ... | provenance |  |
+| bdlbb.cpp:79:42:79:44 | *dst | bdlbb.cpp:79:37:79:39 | copy output argument | provenance | MaD:135 |
+| bmqa.cpp:87:19:87:26 | call to source | bmqa.cpp:88:36:88:76 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:88:36:88:76 | *call to data | bmqa.cpp:90:2:90:4 | *msg | provenance |  |
+| bmqa.cpp:90:2:90:4 | *msg | bmqa.cpp:90:15:90:19 | getData output argument | provenance | MaD:138 |
+| bmqa.cpp:90:15:90:19 | getData output argument | bmqa.cpp:92:42:92:45 | *blob | provenance |  |
+| bmqa.cpp:92:37:92:39 | copy output argument | bmqa.cpp:93:7:93:10 | * ... | provenance |  |
+| bmqa.cpp:92:42:92:45 | *blob | bmqa.cpp:92:37:92:39 | copy output argument | provenance | MaD:135 |
+| bmqa.cpp:97:19:97:26 | call to source | bmqa.cpp:98:43:98:88 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:98:43:98:88 | *call to data | bmqa.cpp:99:42:99:46 | *event | provenance |  |
+| bmqa.cpp:99:42:99:46 | *event | bmqa.cpp:99:49:99:63 | call to messageIterator | provenance | MaD:143 |
+| bmqa.cpp:99:49:99:63 | call to messageIterator | bmqa.cpp:99:49:99:63 | call to messageIterator | provenance |  |
+| bmqa.cpp:99:49:99:63 | call to messageIterator | bmqa.cpp:101:43:101:44 | *it | provenance |  |
+| bmqa.cpp:101:43:101:44 | *it | bmqa.cpp:101:53:101:55 | *call to message | provenance | MaD:144 |
+| bmqa.cpp:101:53:101:55 | *call to message | bmqa.cpp:101:53:101:55 | *call to message | provenance |  |
+| bmqa.cpp:101:53:101:55 | *call to message | bmqa.cpp:103:3:103:5 | *msg | provenance |  |
+| bmqa.cpp:103:3:103:5 | *msg | bmqa.cpp:103:15:103:19 | getData output argument | provenance | MaD:138 |
+| bmqa.cpp:103:15:103:19 | getData output argument | bmqa.cpp:105:43:105:46 | *blob | provenance |  |
+| bmqa.cpp:105:38:105:40 | copy output argument | bmqa.cpp:106:8:106:11 | * ... | provenance |  |
+| bmqa.cpp:105:43:105:46 | *blob | bmqa.cpp:105:38:105:40 | copy output argument | provenance | MaD:135 |
+| bmqa.cpp:111:16:111:23 | call to source | bmqa.cpp:113:47:113:50 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:113:37:113:39 | copy output argument | bmqa.cpp:115:17:115:19 | *& ... | provenance |  |
+| bmqa.cpp:113:47:113:50 | *call to data | bmqa.cpp:113:37:113:39 | copy output argument | provenance | MaD:134 |
+| bmqa.cpp:115:2:115:4 | setDataRef output argument | bmqa.cpp:117:2:117:4 | *msg | provenance |  |
+| bmqa.cpp:115:17:115:19 | *& ... | bmqa.cpp:115:2:115:4 | setDataRef output argument | provenance | MaD:141 |
+| bmqa.cpp:117:2:117:4 | *msg | bmqa.cpp:117:14:117:17 | getData output argument | provenance | MaD:138 |
+| bmqa.cpp:117:14:117:17 | getData output argument | bmqa.cpp:119:42:119:44 | *out | provenance |  |
+| bmqa.cpp:119:37:119:39 | copy output argument | bmqa.cpp:120:7:120:10 | * ... | provenance |  |
+| bmqa.cpp:119:42:119:44 | *out | bmqa.cpp:119:37:119:39 | copy output argument | provenance | MaD:135 |
+| bmqa.cpp:124:16:124:23 | call to source | bmqa.cpp:126:19:126:22 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:126:2:126:4 | setDataRef output argument | bmqa.cpp:128:2:128:4 | *msg | provenance |  |
+| bmqa.cpp:126:19:126:22 | *call to data | bmqa.cpp:126:2:126:4 | setDataRef output argument | provenance | MaD:141 |
+| bmqa.cpp:128:2:128:4 | *msg | bmqa.cpp:128:14:128:17 | getData output argument | provenance | MaD:138 |
+| bmqa.cpp:128:14:128:17 | getData output argument | bmqa.cpp:130:42:130:44 | *out | provenance |  |
+| bmqa.cpp:130:37:130:39 | copy output argument | bmqa.cpp:131:7:131:10 | * ... | provenance |  |
+| bmqa.cpp:130:42:130:44 | *out | bmqa.cpp:130:37:130:39 | copy output argument | provenance | MaD:135 |
+| bmqa.cpp:135:16:135:23 | call to source | bmqa.cpp:137:16:137:19 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:137:2:137:4 | setData output argument | bmqa.cpp:139:2:139:4 | *msg | provenance |  |
+| bmqa.cpp:137:16:137:19 | *call to data | bmqa.cpp:137:2:137:4 | setData output argument | provenance | MaD:140 |
+| bmqa.cpp:139:2:139:4 | *msg | bmqa.cpp:139:14:139:17 | getData output argument | provenance | MaD:138 |
+| bmqa.cpp:139:14:139:17 | getData output argument | bmqa.cpp:141:42:141:44 | *out | provenance |  |
+| bmqa.cpp:141:37:141:39 | copy output argument | bmqa.cpp:142:7:142:10 | * ... | provenance |  |
+| bmqa.cpp:141:42:141:44 | *out | bmqa.cpp:141:37:141:39 | copy output argument | provenance | MaD:135 |
+| bmqa.cpp:146:19:146:26 | call to source | bmqa.cpp:147:36:147:76 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:147:36:147:76 | *call to data | bmqa.cpp:148:36:148:38 | *msg | provenance |  |
+| bmqa.cpp:148:36:148:38 | *msg | bmqa.cpp:148:41:148:45 | call to clone | provenance | MaD:137 |
+| bmqa.cpp:148:41:148:45 | call to clone | bmqa.cpp:148:41:148:45 | call to clone | provenance |  |
+| bmqa.cpp:148:41:148:45 | call to clone | bmqa.cpp:150:2:150:5 | *copy | provenance |  |
+| bmqa.cpp:150:2:150:5 | *copy | bmqa.cpp:150:15:150:19 | getData output argument | provenance | MaD:138 |
+| bmqa.cpp:150:15:150:19 | getData output argument | bmqa.cpp:152:42:152:45 | *blob | provenance |  |
+| bmqa.cpp:152:37:152:39 | copy output argument | bmqa.cpp:153:7:153:10 | * ... | provenance |  |
+| bmqa.cpp:152:42:152:45 | *blob | bmqa.cpp:152:37:152:39 | copy output argument | provenance | MaD:135 |
+| bmqa.cpp:157:19:157:26 | call to source | bmqa.cpp:158:36:158:76 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:158:36:158:76 | *call to data | bmqa.cpp:160:2:160:4 | *msg | provenance |  |
+| bmqa.cpp:160:2:160:4 | *msg | bmqa.cpp:160:22:160:27 | loadProperties output argument | provenance | MaD:139 |
+| bmqa.cpp:160:22:160:27 | loadProperties output argument | bmqa.cpp:161:29:161:33 | *props | provenance |  |
+| bmqa.cpp:161:29:161:33 | *props | bmqa.cpp:161:54:161:61 | *call to getPropertyAsString | provenance | MaD:149 |
+| bmqa.cpp:161:54:161:61 | *call to getPropertyAsString | bmqa.cpp:161:54:161:61 | *call to getPropertyAsString | provenance |  |
+| bmqa.cpp:161:54:161:61 | *call to getPropertyAsString | bmqa.cpp:162:7:162:21 | access to array | provenance | TaintFunction |
+| bmqa.cpp:166:19:166:26 | call to source | bmqa.cpp:167:36:167:76 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:167:36:167:76 | *call to data | bmqa.cpp:169:2:169:4 | *msg | provenance |  |
+| bmqa.cpp:169:2:169:4 | *msg | bmqa.cpp:169:22:169:27 | loadProperties output argument | provenance | MaD:139 |
+| bmqa.cpp:169:22:169:27 | loadProperties output argument | bmqa.cpp:170:35:170:39 | *props | provenance |  |
+| bmqa.cpp:170:35:170:39 | *props | bmqa.cpp:170:60:170:67 | *call to getPropertyAsBinary [element] | provenance | MaD:146 |
+| bmqa.cpp:170:60:170:67 | *call to getPropertyAsBinary [element] | bmqa.cpp:170:60:170:67 | *call to getPropertyAsBinary [element] | provenance |  |
+| bmqa.cpp:170:60:170:67 | *call to getPropertyAsBinary [element] | bmqa.cpp:171:7:171:11 | *value [element] | provenance |  |
+| bmqa.cpp:171:7:171:11 | *value [element] | bmqa.cpp:171:7:171:21 | access to array | provenance | MaD:267 |
+| bmqa.cpp:175:19:175:26 | call to source | bmqa.cpp:176:36:176:76 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:176:36:176:76 | *call to data | bmqa.cpp:178:2:178:4 | *msg | provenance |  |
+| bmqa.cpp:178:2:178:4 | *msg | bmqa.cpp:178:22:178:27 | loadProperties output argument | provenance | MaD:139 |
+| bmqa.cpp:178:22:178:27 | loadProperties output argument | bmqa.cpp:179:35:179:39 | *props | provenance |  |
+| bmqa.cpp:179:35:179:39 | *props | bmqa.cpp:179:60:179:67 | *call to getPropertyAsBinary [element] | provenance | MaD:146 |
+| bmqa.cpp:179:60:179:67 | *call to getPropertyAsBinary [element] | bmqa.cpp:179:60:179:67 | *call to getPropertyAsBinary [element] | provenance |  |
+| bmqa.cpp:179:60:179:67 | *call to getPropertyAsBinary [element] | bmqa.cpp:180:7:180:11 | *value [element] | provenance |  |
+| bmqa.cpp:180:7:180:11 | *value [element] | bmqa.cpp:180:12:180:14 | call to operator[] | provenance | MaD:268 |
+| bmqa.cpp:184:19:184:26 | call to source | bmqa.cpp:185:36:185:76 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:185:36:185:76 | *call to data | bmqa.cpp:187:2:187:4 | *msg | provenance |  |
+| bmqa.cpp:187:2:187:4 | *msg | bmqa.cpp:187:22:187:27 | loadProperties output argument | provenance | MaD:139 |
+| bmqa.cpp:187:22:187:27 | loadProperties output argument | bmqa.cpp:189:29:189:33 | *props | provenance |  |
+| bmqa.cpp:189:29:189:33 | *props | bmqa.cpp:189:56:189:69 | *call to getPropertyAsStringOr | provenance | MaD:151 |
+| bmqa.cpp:189:56:189:69 | *call to getPropertyAsStringOr | bmqa.cpp:189:56:189:69 | *call to getPropertyAsStringOr | provenance |  |
+| bmqa.cpp:189:56:189:69 | *call to getPropertyAsStringOr | bmqa.cpp:190:7:190:19 | * ... | provenance | TaintFunction |
+| bmqa.cpp:195:19:195:26 | call to source | bmqa.cpp:197:64:197:67 | *dflt | provenance | TaintFunction |
+| bmqa.cpp:197:56:197:69 | *call to getPropertyAsStringOr | bmqa.cpp:197:56:197:69 | *call to getPropertyAsStringOr | provenance |  |
+| bmqa.cpp:197:56:197:69 | *call to getPropertyAsStringOr | bmqa.cpp:198:7:198:19 | * ... | provenance | TaintFunction |
+| bmqa.cpp:197:64:197:67 | *dflt | bmqa.cpp:197:56:197:69 | *call to getPropertyAsStringOr | provenance | MaD:150 |
+| bmqa.cpp:202:19:202:26 | call to source | bmqa.cpp:203:36:203:76 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:203:36:203:76 | *call to data | bmqa.cpp:205:2:205:4 | *msg | provenance |  |
+| bmqa.cpp:205:2:205:4 | *msg | bmqa.cpp:205:22:205:27 | loadProperties output argument | provenance | MaD:139 |
+| bmqa.cpp:205:22:205:27 | loadProperties output argument | bmqa.cpp:207:35:207:39 | *props | provenance |  |
+| bmqa.cpp:207:35:207:39 | *props | bmqa.cpp:207:62:207:75 | *call to getPropertyAsBinaryOr [element] | provenance | MaD:148 |
+| bmqa.cpp:207:62:207:75 | *call to getPropertyAsBinaryOr [element] | bmqa.cpp:207:62:207:75 | *call to getPropertyAsBinaryOr [element] | provenance |  |
+| bmqa.cpp:207:62:207:75 | *call to getPropertyAsBinaryOr [element] | bmqa.cpp:208:8:208:12 | *value [element] | provenance |  |
+| bmqa.cpp:208:8:208:12 | *value [element] | bmqa.cpp:208:7:208:19 | * ... | provenance | MaD:267 |
+| bmqa.cpp:212:11:212:19 | * ... | bmqa.cpp:214:17:214:17 | *c | provenance |  |
+| bmqa.cpp:212:12:212:17 | call to source | bmqa.cpp:212:11:212:19 | * ... | provenance |  |
+| bmqa.cpp:214:2:214:5 | push_back output argument [element] | bmqa.cpp:216:70:216:73 | *dflt [element] | provenance |  |
+| bmqa.cpp:214:17:214:17 | *c | bmqa.cpp:214:2:214:5 | push_back output argument [element] | provenance | MaD:269 |
+| bmqa.cpp:216:62:216:75 | *call to getPropertyAsBinaryOr [element] | bmqa.cpp:216:62:216:75 | *call to getPropertyAsBinaryOr [element] | provenance |  |
+| bmqa.cpp:216:62:216:75 | *call to getPropertyAsBinaryOr [element] | bmqa.cpp:217:8:217:12 | *value [element] | provenance |  |
+| bmqa.cpp:216:70:216:73 | *dflt [element] | bmqa.cpp:216:62:216:75 | *call to getPropertyAsBinaryOr [element] | provenance | MaD:147 |
+| bmqa.cpp:217:8:217:12 | *value [element] | bmqa.cpp:217:7:217:19 | * ... | provenance | MaD:267 |
+| bmqa.cpp:229:16:229:23 | call to source | bmqa.cpp:231:49:231:52 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:231:37:231:41 | copy output argument | bmqa.cpp:233:17:233:20 | *blob | provenance |  |
+| bmqa.cpp:231:49:231:52 | *call to data | bmqa.cpp:231:37:231:41 | copy output argument | provenance | MaD:134 |
+| bmqa.cpp:233:2:233:6 | streamIn output argument | bmqa.cpp:234:8:234:12 | *props | provenance |  |
+| bmqa.cpp:233:17:233:20 | *blob | bmqa.cpp:233:2:233:6 | streamIn output argument | provenance | MaD:163 |
+| bmqa.cpp:234:8:234:12 | *props | bmqa.cpp:234:33:234:40 | *call to getPropertyAsString | provenance | MaD:149 |
+| bmqa.cpp:234:33:234:40 | *call to getPropertyAsString | bmqa.cpp:234:7:234:46 | * ... | provenance | TaintFunction |
+| bmqa.cpp:238:16:238:23 | call to source | bmqa.cpp:240:49:240:52 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:240:37:240:41 | copy output argument | bmqa.cpp:242:14:242:17 | *blob | provenance |  |
+| bmqa.cpp:240:49:240:52 | *call to data | bmqa.cpp:240:37:240:41 | copy output argument | provenance | MaD:134 |
+| bmqa.cpp:242:2:242:3 | streamIn output argument | bmqa.cpp:244:23:244:25 | *& ... | provenance |  |
+| bmqa.cpp:242:14:242:17 | *blob | bmqa.cpp:242:2:242:3 | streamIn output argument | provenance | MaD:163 |
+| bmqa.cpp:244:2:244:4 | setPropertiesRef output argument | bmqa.cpp:246:2:246:4 | *msg | provenance |  |
+| bmqa.cpp:244:23:244:25 | *& ... | bmqa.cpp:244:2:244:4 | setPropertiesRef output argument | provenance | MaD:142 |
+| bmqa.cpp:246:2:246:4 | *msg | bmqa.cpp:246:21:246:24 | loadProperties output argument | provenance | MaD:139 |
+| bmqa.cpp:246:21:246:24 | loadProperties output argument | bmqa.cpp:247:8:247:10 | *out | provenance |  |
+| bmqa.cpp:247:8:247:10 | *out | bmqa.cpp:247:31:247:38 | *call to getPropertyAsString | provenance | MaD:149 |
+| bmqa.cpp:247:31:247:38 | *call to getPropertyAsString | bmqa.cpp:247:7:247:44 | * ... | provenance | TaintFunction |
+| bmqa.cpp:251:19:251:26 | call to source | bmqa.cpp:252:36:252:76 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:252:36:252:76 | *call to data | bmqa.cpp:254:2:254:4 | *msg | provenance |  |
+| bmqa.cpp:254:2:254:4 | *msg | bmqa.cpp:254:22:254:27 | loadProperties output argument | provenance | MaD:139 |
+| bmqa.cpp:254:22:254:27 | loadProperties output argument | bmqa.cpp:256:41:256:45 | *props | provenance |  |
+| bmqa.cpp:256:41:256:45 | *props | bmqa.cpp:256:56:256:66 | *call to streamOut | provenance | MaD:164 |
+| bmqa.cpp:256:56:256:66 | *call to streamOut | bmqa.cpp:256:56:256:66 | *call to streamOut | provenance |  |
+| bmqa.cpp:256:56:256:66 | *call to streamOut | bmqa.cpp:258:42:258:45 | *blob | provenance |  |
+| bmqa.cpp:258:37:258:39 | copy output argument | bmqa.cpp:259:7:259:10 | * ... | provenance |  |
+| bmqa.cpp:258:42:258:45 | *blob | bmqa.cpp:258:37:258:39 | copy output argument | provenance | MaD:135 |
+| bmqa.cpp:263:19:263:26 | call to source | bmqa.cpp:264:36:264:76 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:264:36:264:76 | *call to data | bmqa.cpp:266:2:266:4 | *msg | provenance |  |
+| bmqa.cpp:266:2:266:4 | *msg | bmqa.cpp:266:22:266:27 | loadProperties output argument | provenance | MaD:139 |
+| bmqa.cpp:266:22:266:27 | loadProperties output argument | bmqa.cpp:267:44:267:48 | *props | provenance |  |
+| bmqa.cpp:266:22:266:27 | loadProperties output argument | bmqa.cpp:268:8:268:11 | *copy | provenance | DataFlowFunction |
+| bmqa.cpp:266:22:266:27 | loadProperties output argument | bmqa.cpp:268:8:268:11 | *copy | provenance | TaintFunction |
+| bmqa.cpp:267:39:267:42 | call to MessageProperties | bmqa.cpp:268:8:268:11 | *copy | provenance |  |
+| bmqa.cpp:267:44:267:48 | *props | bmqa.cpp:267:39:267:42 | call to MessageProperties | provenance | MaD:145 |
+| bmqa.cpp:268:8:268:11 | *copy | bmqa.cpp:268:32:268:39 | *call to getPropertyAsString | provenance | MaD:149 |
+| bmqa.cpp:268:32:268:39 | *call to getPropertyAsString | bmqa.cpp:268:7:268:45 | * ... | provenance | TaintFunction |
+| bmqa.cpp:272:19:272:26 | call to source | bmqa.cpp:273:36:273:76 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:273:36:273:76 | *call to data | bmqa.cpp:275:2:275:4 | *msg | provenance |  |
+| bmqa.cpp:275:2:275:4 | *msg | bmqa.cpp:275:22:275:27 | loadProperties output argument | provenance | MaD:139 |
+| bmqa.cpp:275:22:275:27 | loadProperties output argument | bmqa.cpp:277:9:277:13 | *props | provenance |  |
+| bmqa.cpp:275:22:275:27 | loadProperties output argument | bmqa.cpp:278:8:278:11 | *copy | provenance | TaintFunction |
+| bmqa.cpp:277:2:277:5 | operator= output argument | bmqa.cpp:278:8:278:11 | *copy | provenance |  |
+| bmqa.cpp:277:9:277:13 | *props | bmqa.cpp:277:2:277:5 | operator= output argument | provenance | MaD:152 |
+| bmqa.cpp:278:8:278:11 | *copy | bmqa.cpp:278:32:278:39 | *call to getPropertyAsString | provenance | MaD:149 |
+| bmqa.cpp:278:32:278:39 | *call to getPropertyAsString | bmqa.cpp:278:7:278:45 | * ... | provenance | TaintFunction |
+| bmqa.cpp:282:19:282:26 | call to source | bmqa.cpp:283:36:283:76 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:283:36:283:76 | *call to data | bmqa.cpp:285:2:285:4 | *msg | provenance |  |
+| bmqa.cpp:285:2:285:4 | *msg | bmqa.cpp:285:22:285:27 | loadProperties output argument | provenance | MaD:139 |
+| bmqa.cpp:285:22:285:27 | loadProperties output argument | bmqa.cpp:287:8:287:21 | *call to operator= | provenance | TaintFunction |
+| bmqa.cpp:285:22:285:27 | loadProperties output argument | bmqa.cpp:287:16:287:20 | *props | provenance |  |
+| bmqa.cpp:287:8:287:21 | *call to operator= | bmqa.cpp:287:42:287:49 | *call to getPropertyAsString | provenance | MaD:149 |
+| bmqa.cpp:287:16:287:20 | *props | bmqa.cpp:287:8:287:21 | *call to operator= | provenance | MaD:153 |
+| bmqa.cpp:287:42:287:49 | *call to getPropertyAsString | bmqa.cpp:287:7:287:55 | * ... | provenance | TaintFunction |
+| bmqa.cpp:291:19:291:26 | call to source | bmqa.cpp:292:28:292:58 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:292:28:292:58 | *call to data | bmqa.cpp:294:35:294:40 | * ... | provenance |  |
+| bmqa.cpp:294:2:294:6 | setPropertyAsString output argument | bmqa.cpp:295:8:295:12 | *props | provenance |  |
+| bmqa.cpp:294:35:294:40 | * ... | bmqa.cpp:294:2:294:6 | setPropertyAsString output argument | provenance | MaD:162 |
+| bmqa.cpp:295:8:295:12 | *props | bmqa.cpp:295:33:295:40 | *call to getPropertyAsString | provenance | MaD:149 |
+| bmqa.cpp:295:33:295:40 | *call to getPropertyAsString | bmqa.cpp:295:7:295:46 | * ... | provenance | TaintFunction |
+| bmqa.cpp:299:25:299:32 | call to source | bmqa.cpp:301:35:301:39 | value | provenance | TaintFunction |
+| bmqa.cpp:301:2:301:6 | setPropertyAsString output argument | bmqa.cpp:302:8:302:12 | *props | provenance |  |
+| bmqa.cpp:301:35:301:39 | value | bmqa.cpp:301:2:301:6 | setPropertyAsString output argument | provenance | MaD:162 |
+| bmqa.cpp:302:8:302:12 | *props | bmqa.cpp:302:33:302:40 | *call to getPropertyAsString | provenance | MaD:149 |
+| bmqa.cpp:302:33:302:40 | *call to getPropertyAsString | bmqa.cpp:302:7:302:46 | * ... | provenance | TaintFunction |
+| bmqa.cpp:306:19:306:26 | call to source | bmqa.cpp:307:33:307:68 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:307:33:307:68 | *call to data | bmqa.cpp:309:35:309:40 | * ... | provenance |  |
+| bmqa.cpp:309:2:309:6 | setPropertyAsBinary output argument | bmqa.cpp:310:8:310:12 | *props | provenance |  |
+| bmqa.cpp:309:35:309:40 | * ... | bmqa.cpp:309:2:309:6 | setPropertyAsBinary output argument | provenance | MaD:155 |
+| bmqa.cpp:310:8:310:12 | *props | bmqa.cpp:310:33:310:40 | *call to getPropertyAsBinary [element] | provenance | MaD:146 |
+| bmqa.cpp:310:33:310:40 | *call to getPropertyAsBinary [element] | bmqa.cpp:310:7:310:46 | * ... | provenance | MaD:267 |
+| bmqa.cpp:315:24:315:31 | call to source | bmqa.cpp:317:26:317:29 | name | provenance | TaintFunction |
+| bmqa.cpp:317:2:317:6 | setPropertyAsBool output argument | bmqa.cpp:318:50:318:55 | *& ... | provenance |  |
+| bmqa.cpp:317:26:317:29 | name | bmqa.cpp:317:2:317:6 | setPropertyAsBool output argument | provenance | MaD:156 |
+| bmqa.cpp:318:47:318:48 | call to MessagePropertiesIterator | bmqa.cpp:319:8:319:9 | *it | provenance |  |
+| bmqa.cpp:318:50:318:55 | *& ... | bmqa.cpp:318:47:318:48 | call to MessagePropertiesIterator | provenance | MaD:165 |
+| bmqa.cpp:319:8:319:9 | *it | bmqa.cpp:319:15:319:17 | *call to name | provenance | MaD:168 |
+| bmqa.cpp:319:15:319:17 | *call to name | bmqa.cpp:319:7:319:23 | * ... | provenance | TaintFunction |
+| bmqa.cpp:323:24:323:31 | call to source | bmqa.cpp:325:26:325:29 | name | provenance | TaintFunction |
+| bmqa.cpp:325:2:325:6 | setPropertyAsChar output argument | bmqa.cpp:326:50:326:55 | *& ... | provenance |  |
+| bmqa.cpp:325:26:325:29 | name | bmqa.cpp:325:2:325:6 | setPropertyAsChar output argument | provenance | MaD:157 |
+| bmqa.cpp:326:47:326:48 | call to MessagePropertiesIterator | bmqa.cpp:327:8:327:9 | *it | provenance |  |
+| bmqa.cpp:326:50:326:55 | *& ... | bmqa.cpp:326:47:326:48 | call to MessagePropertiesIterator | provenance | MaD:165 |
+| bmqa.cpp:327:8:327:9 | *it | bmqa.cpp:327:15:327:17 | *call to name | provenance | MaD:168 |
+| bmqa.cpp:327:15:327:17 | *call to name | bmqa.cpp:327:7:327:23 | * ... | provenance | TaintFunction |
+| bmqa.cpp:331:24:331:31 | call to source | bmqa.cpp:333:27:333:30 | name | provenance | TaintFunction |
+| bmqa.cpp:333:2:333:6 | setPropertyAsShort output argument | bmqa.cpp:334:50:334:55 | *& ... | provenance |  |
+| bmqa.cpp:333:27:333:30 | name | bmqa.cpp:333:2:333:6 | setPropertyAsShort output argument | provenance | MaD:160 |
+| bmqa.cpp:334:47:334:48 | call to MessagePropertiesIterator | bmqa.cpp:335:8:335:9 | *it | provenance |  |
+| bmqa.cpp:334:50:334:55 | *& ... | bmqa.cpp:334:47:334:48 | call to MessagePropertiesIterator | provenance | MaD:165 |
+| bmqa.cpp:335:8:335:9 | *it | bmqa.cpp:335:15:335:17 | *call to name | provenance | MaD:168 |
+| bmqa.cpp:335:15:335:17 | *call to name | bmqa.cpp:335:7:335:23 | * ... | provenance | TaintFunction |
+| bmqa.cpp:339:24:339:31 | call to source | bmqa.cpp:341:27:341:30 | name | provenance | TaintFunction |
+| bmqa.cpp:341:2:341:6 | setPropertyAsInt32 output argument | bmqa.cpp:342:50:342:55 | *& ... | provenance |  |
+| bmqa.cpp:341:27:341:30 | name | bmqa.cpp:341:2:341:6 | setPropertyAsInt32 output argument | provenance | MaD:158 |
+| bmqa.cpp:342:47:342:48 | call to MessagePropertiesIterator | bmqa.cpp:343:8:343:9 | *it | provenance |  |
+| bmqa.cpp:342:50:342:55 | *& ... | bmqa.cpp:342:47:342:48 | call to MessagePropertiesIterator | provenance | MaD:165 |
+| bmqa.cpp:343:8:343:9 | *it | bmqa.cpp:343:15:343:17 | *call to name | provenance | MaD:168 |
+| bmqa.cpp:343:15:343:17 | *call to name | bmqa.cpp:343:7:343:23 | * ... | provenance | TaintFunction |
+| bmqa.cpp:347:24:347:31 | call to source | bmqa.cpp:349:27:349:30 | name | provenance | TaintFunction |
+| bmqa.cpp:349:2:349:6 | setPropertyAsInt64 output argument | bmqa.cpp:350:50:350:55 | *& ... | provenance |  |
+| bmqa.cpp:349:27:349:30 | name | bmqa.cpp:349:2:349:6 | setPropertyAsInt64 output argument | provenance | MaD:159 |
+| bmqa.cpp:350:47:350:48 | call to MessagePropertiesIterator | bmqa.cpp:351:8:351:9 | *it | provenance |  |
+| bmqa.cpp:350:50:350:55 | *& ... | bmqa.cpp:350:47:350:48 | call to MessagePropertiesIterator | provenance | MaD:165 |
+| bmqa.cpp:351:8:351:9 | *it | bmqa.cpp:351:15:351:17 | *call to name | provenance | MaD:168 |
+| bmqa.cpp:351:15:351:17 | *call to name | bmqa.cpp:351:7:351:23 | * ... | provenance | TaintFunction |
+| bmqa.cpp:355:24:355:31 | call to source | bmqa.cpp:357:28:357:31 | name | provenance | TaintFunction |
+| bmqa.cpp:357:2:357:6 | setPropertyAsString output argument | bmqa.cpp:358:50:358:55 | *& ... | provenance |  |
+| bmqa.cpp:357:28:357:31 | name | bmqa.cpp:357:2:357:6 | setPropertyAsString output argument | provenance | MaD:161 |
+| bmqa.cpp:358:47:358:48 | call to MessagePropertiesIterator | bmqa.cpp:359:8:359:9 | *it | provenance |  |
+| bmqa.cpp:358:50:358:55 | *& ... | bmqa.cpp:358:47:358:48 | call to MessagePropertiesIterator | provenance | MaD:165 |
+| bmqa.cpp:359:8:359:9 | *it | bmqa.cpp:359:15:359:17 | *call to name | provenance | MaD:168 |
+| bmqa.cpp:359:15:359:17 | *call to name | bmqa.cpp:359:7:359:23 | * ... | provenance | TaintFunction |
+| bmqa.cpp:363:24:363:31 | call to source | bmqa.cpp:365:28:365:31 | name | provenance | TaintFunction |
+| bmqa.cpp:365:2:365:6 | setPropertyAsBinary output argument | bmqa.cpp:366:50:366:55 | *& ... | provenance |  |
+| bmqa.cpp:365:28:365:31 | name | bmqa.cpp:365:2:365:6 | setPropertyAsBinary output argument | provenance | MaD:154 |
+| bmqa.cpp:366:47:366:48 | call to MessagePropertiesIterator | bmqa.cpp:367:8:367:9 | *it | provenance |  |
+| bmqa.cpp:366:50:366:55 | *& ... | bmqa.cpp:366:47:366:48 | call to MessagePropertiesIterator | provenance | MaD:165 |
+| bmqa.cpp:367:8:367:9 | *it | bmqa.cpp:367:15:367:17 | *call to name | provenance | MaD:168 |
+| bmqa.cpp:367:15:367:17 | *call to name | bmqa.cpp:367:7:367:23 | * ... | provenance | TaintFunction |
+| bmqa.cpp:371:19:371:26 | call to source | bmqa.cpp:372:36:372:76 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:372:36:372:76 | *call to data | bmqa.cpp:374:2:374:4 | *msg | provenance |  |
+| bmqa.cpp:374:2:374:4 | *msg | bmqa.cpp:374:22:374:27 | loadProperties output argument | provenance | MaD:139 |
+| bmqa.cpp:374:22:374:27 | loadProperties output argument | bmqa.cpp:375:50:375:55 | *& ... | provenance |  |
+| bmqa.cpp:375:47:375:48 | call to MessagePropertiesIterator | bmqa.cpp:377:9:377:10 | *it | provenance |  |
+| bmqa.cpp:375:47:375:48 | call to MessagePropertiesIterator | bmqa.cpp:378:9:378:10 | *it | provenance |  |
+| bmqa.cpp:375:47:375:48 | call to MessagePropertiesIterator | bmqa.cpp:379:9:379:10 | *it | provenance |  |
+| bmqa.cpp:375:50:375:55 | *& ... | bmqa.cpp:375:47:375:48 | call to MessagePropertiesIterator | provenance | MaD:165 |
+| bmqa.cpp:377:9:377:10 | *it | bmqa.cpp:377:16:377:18 | *call to name | provenance | MaD:168 |
+| bmqa.cpp:377:16:377:18 | *call to name | bmqa.cpp:377:8:377:24 | * ... | provenance | TaintFunction |
+| bmqa.cpp:378:9:378:10 | *it | bmqa.cpp:378:23:378:25 | *call to getAsString | provenance | MaD:167 |
+| bmqa.cpp:378:23:378:25 | *call to getAsString | bmqa.cpp:378:8:378:31 | * ... | provenance | TaintFunction |
+| bmqa.cpp:379:9:379:10 | *it | bmqa.cpp:379:23:379:25 | *call to getAsBinary [element] | provenance | MaD:166 |
+| bmqa.cpp:379:23:379:25 | *call to getAsBinary [element] | bmqa.cpp:379:8:379:31 | * ... | provenance | MaD:267 |
+| bmqa.cpp:385:19:385:26 | call to source | bmqa.cpp:386:36:386:76 | *call to data | provenance | TaintFunction |
+| bmqa.cpp:386:36:386:76 | *call to data | bmqa.cpp:388:2:388:4 | *msg | provenance |  |
+| bmqa.cpp:388:2:388:4 | *msg | bmqa.cpp:388:22:388:27 | loadProperties output argument | provenance | MaD:139 |
+| bmqa.cpp:388:22:388:27 | loadProperties output argument | bmqa.cpp:389:50:389:55 | *& ... | provenance |  |
+| bmqa.cpp:389:47:389:48 | call to MessagePropertiesIterator | bmqa.cpp:391:9:391:10 | *it | provenance |  |
+| bmqa.cpp:389:47:389:48 | call to MessagePropertiesIterator | bmqa.cpp:392:8:392:11 | *copy | provenance | TaintFunction |
+| bmqa.cpp:389:47:389:48 | call to MessagePropertiesIterator | bmqa.cpp:393:8:393:18 | *call to operator= | provenance | TaintFunction |
+| bmqa.cpp:389:47:389:48 | call to MessagePropertiesIterator | bmqa.cpp:393:16:393:17 | *it | provenance |  |
+| bmqa.cpp:389:50:389:55 | *& ... | bmqa.cpp:389:47:389:48 | call to MessagePropertiesIterator | provenance | MaD:165 |
+| bmqa.cpp:391:2:391:5 | operator= output argument | bmqa.cpp:392:8:392:11 | *copy | provenance |  |
+| bmqa.cpp:391:9:391:10 | *it | bmqa.cpp:391:2:391:5 | operator= output argument | provenance | MaD:169 |
+| bmqa.cpp:392:8:392:11 | *copy | bmqa.cpp:392:24:392:26 | *call to getAsString | provenance | MaD:167 |
+| bmqa.cpp:392:24:392:26 | *call to getAsString | bmqa.cpp:392:7:392:32 | * ... | provenance | TaintFunction |
+| bmqa.cpp:393:8:393:18 | *call to operator= | bmqa.cpp:393:24:393:26 | *call to name | provenance | MaD:168 |
+| bmqa.cpp:393:16:393:17 | *it | bmqa.cpp:393:8:393:18 | *call to operator= | provenance | MaD:170 |
+| bmqa.cpp:393:24:393:26 | *call to name | bmqa.cpp:393:7:393:32 | * ... | provenance | TaintFunction |
+| bslx.cpp:145:33:145:40 | call to source | bslx.cpp:146:41:146:51 | *call to data | provenance | TaintFunction |
+| bslx.cpp:146:34:146:39 | call to ByteInStream | bslx.cpp:148:2:148:7 | *stream | provenance |  |
+| bslx.cpp:146:41:146:51 | *call to data | bslx.cpp:146:34:146:39 | call to ByteInStream | provenance | MaD:173 |
+| bslx.cpp:148:2:148:7 | *stream | bslx.cpp:148:22:148:24 | getArrayInt8 output argument | provenance | MaD:183 |
+| bslx.cpp:148:22:148:24 | getArrayInt8 output argument | bslx.cpp:149:7:149:10 | * ... | provenance |  |
+| bslx.cpp:153:33:153:40 | call to source | bslx.cpp:154:41:154:51 | *call to data | provenance | TaintFunction |
+| bslx.cpp:154:34:154:39 | call to ByteInStream | bslx.cpp:156:2:156:7 | *stream | provenance |  |
+| bslx.cpp:154:41:154:51 | *call to data | bslx.cpp:154:34:154:39 | call to ByteInStream | provenance | MaD:173 |
+| bslx.cpp:156:2:156:7 | *stream | bslx.cpp:156:19:156:21 | getString output argument | provenance | MaD:204 |
+| bslx.cpp:156:19:156:21 | getString output argument | bslx.cpp:157:7:157:17 | * ... | provenance | TaintFunction |
+| bslx.cpp:161:33:161:40 | call to source | bslx.cpp:162:41:162:51 | *call to data | provenance | TaintFunction |
+| bslx.cpp:162:34:162:39 | call to ByteInStream | bslx.cpp:165:2:165:7 | *stream | provenance |  |
+| bslx.cpp:162:41:162:51 | *call to data | bslx.cpp:162:34:162:39 | call to ByteInStream | provenance | MaD:173 |
+| bslx.cpp:165:2:165:7 | *stream | bslx.cpp:165:17:165:20 | *call to getInt32 | provenance | MaD:197 |
+| bslx.cpp:165:17:165:20 | *call to getInt32 | bslx.cpp:165:31:165:33 | getString output argument | provenance | MaD:204 |
+| bslx.cpp:165:31:165:33 | getString output argument | bslx.cpp:166:7:166:17 | * ... | provenance | TaintFunction |
+| bslx.cpp:171:33:171:40 | call to source | bslx.cpp:172:15:172:25 | *call to data | provenance | TaintFunction |
+| bslx.cpp:172:2:172:7 | reset output argument | bslx.cpp:174:2:174:7 | *stream | provenance |  |
+| bslx.cpp:172:15:172:25 | *call to data | bslx.cpp:172:2:172:7 | reset output argument | provenance | MaD:216 |
+| bslx.cpp:174:2:174:7 | *stream | bslx.cpp:174:19:174:21 | getString output argument | provenance | MaD:204 |
+| bslx.cpp:174:19:174:21 | getString output argument | bslx.cpp:175:7:175:17 | * ... | provenance | TaintFunction |
+| bslx.cpp:179:33:179:40 | call to source | bslx.cpp:180:20:180:45 | *call to data | provenance | TaintFunction |
+| bslx.cpp:180:20:180:45 | *call to data | bslx.cpp:181:57:181:58 | *sb | provenance |  |
+| bslx.cpp:180:20:180:45 | *call to data | bslx.cpp:183:2:183:7 | *stream | provenance | TaintFunction |
+| bslx.cpp:181:50:181:55 | call to GenericInStream | bslx.cpp:183:2:183:7 | *stream | provenance |  |
+| bslx.cpp:181:57:181:58 | *sb | bslx.cpp:181:50:181:55 | call to GenericInStream | provenance | MaD:217 |
+| bslx.cpp:183:2:183:7 | *stream | bslx.cpp:183:19:183:21 | getString output argument | provenance | MaD:247 |
+| bslx.cpp:183:19:183:21 | getString output argument | bslx.cpp:184:7:184:17 | * ... | provenance | TaintFunction |
+| bslx.cpp:197:33:197:40 | call to source | bslx.cpp:198:41:198:51 | *call to data | provenance | TaintFunction |
+| bslx.cpp:198:34:198:39 | call to ByteInStream | bslx.cpp:200:53:200:58 | *stream | provenance |  |
+| bslx.cpp:198:41:198:51 | *call to data | bslx.cpp:198:34:198:39 | call to ByteInStream | provenance | MaD:173 |
+| bslx.cpp:200:53:200:58 | *stream | bslx.cpp:200:61:200:63 | bdexStreamIn output argument | provenance | MaD:171 |
+| bslx.cpp:200:61:200:63 | bdexStreamIn output argument | bslx.cpp:201:7:201:17 | * ... | provenance | TaintFunction |
+| bslx.cpp:207:33:207:40 | call to source | bslx.cpp:208:41:208:51 | *call to data | provenance | TaintFunction |
+| bslx.cpp:208:34:208:39 | call to ByteInStream | bslx.cpp:231:2:231:7 | *stream | provenance |  |
+| bslx.cpp:208:41:208:51 | *call to data | bslx.cpp:208:34:208:39 | call to ByteInStream | provenance | MaD:173 |
+| bslx.cpp:231:2:231:7 | *stream | bslx.cpp:231:18:231:21 | *call to getLength | provenance | MaD:203 |
+| bslx.cpp:231:18:231:21 | *call to getLength | bslx.cpp:231:32:231:35 | *call to getVersion | provenance | MaD:214 |
+| bslx.cpp:231:32:231:35 | *call to getVersion | bslx.cpp:231:43:231:46 | *call to getInt8 | provenance | MaD:202 |
+| bslx.cpp:231:43:231:46 | *call to getInt8 | bslx.cpp:231:55:231:59 | *call to getUint8 | provenance | MaD:213 |
+| bslx.cpp:231:55:231:59 | *call to getUint8 | bslx.cpp:231:68:231:71 | *call to getInt16 | provenance | MaD:195 |
+| bslx.cpp:231:68:231:71 | *call to getInt16 | bslx.cpp:231:81:231:85 | *call to getUint16 | provenance | MaD:206 |
+| bslx.cpp:231:81:231:85 | *call to getUint16 | bslx.cpp:231:94:231:97 | *call to getInt24 | provenance | MaD:196 |
+| bslx.cpp:231:94:231:97 | *call to getInt24 | bslx.cpp:231:107:231:111 | *call to getUint24 | provenance | MaD:207 |
+| bslx.cpp:231:107:231:111 | *call to getUint24 | bslx.cpp:231:120:231:123 | *call to getInt32 | provenance | MaD:197 |
+| bslx.cpp:231:120:231:123 | *call to getInt32 | bslx.cpp:231:133:231:137 | *call to getUint32 | provenance | MaD:208 |
+| bslx.cpp:231:133:231:137 | *call to getUint32 | bslx.cpp:231:146:231:150 | *call to getInt40 | provenance | MaD:198 |
+| bslx.cpp:231:146:231:150 | *call to getInt40 | bslx.cpp:231:160:231:165 | *call to getUint40 | provenance | MaD:209 |
+| bslx.cpp:231:160:231:165 | *call to getUint40 | bslx.cpp:231:174:231:178 | *call to getInt48 | provenance | MaD:199 |
+| bslx.cpp:231:174:231:178 | *call to getInt48 | bslx.cpp:231:188:231:193 | *call to getUint48 | provenance | MaD:210 |
+| bslx.cpp:231:188:231:193 | *call to getUint48 | bslx.cpp:231:202:231:206 | *call to getInt56 | provenance | MaD:200 |
+| bslx.cpp:231:202:231:206 | *call to getInt56 | bslx.cpp:231:216:231:221 | *call to getUint56 | provenance | MaD:211 |
+| bslx.cpp:231:216:231:221 | *call to getUint56 | bslx.cpp:231:230:231:234 | *call to getInt64 | provenance | MaD:201 |
+| bslx.cpp:231:230:231:234 | *call to getInt64 | bslx.cpp:231:244:231:249 | *call to getUint64 | provenance | MaD:212 |
+| bslx.cpp:231:244:231:249 | *call to getUint64 | bslx.cpp:231:260:231:263 | *call to getFloat32 | provenance | MaD:193 |
+| bslx.cpp:231:260:231:263 | *call to getFloat32 | bslx.cpp:231:274:231:277 | *call to getFloat64 | provenance | MaD:194 |
+| bslx.cpp:231:274:231:277 | *call to getFloat64 | bslx.cpp:231:287:231:292 | *call to getString | provenance | MaD:205 |
+| bslx.cpp:231:287:231:292 | *call to getString | bslx.cpp:231:305:231:315 | *call to getArrayInt8 | provenance | MaD:184 |
+| bslx.cpp:231:305:231:315 | *call to getArrayInt8 | bslx.cpp:231:329:231:340 | *call to getArrayUint8 | provenance | MaD:192 |
+| bslx.cpp:231:329:231:340 | *call to getArrayUint8 | bslx.cpp:231:354:231:364 | *call to getArrayInt16 | provenance | MaD:176 |
+| bslx.cpp:231:354:231:364 | *call to getArrayInt16 | bslx.cpp:231:379:231:390 | *call to getArrayUint16 | provenance | MaD:185 |
+| bslx.cpp:231:379:231:390 | *call to getArrayUint16 | bslx.cpp:231:404:231:414 | *call to getArrayInt24 | provenance | MaD:177 |
+| bslx.cpp:231:404:231:414 | *call to getArrayInt24 | bslx.cpp:231:429:231:440 | *call to getArrayUint24 | provenance | MaD:186 |
+| bslx.cpp:231:429:231:440 | *call to getArrayUint24 | bslx.cpp:231:454:231:464 | *call to getArrayInt32 | provenance | MaD:178 |
+| bslx.cpp:231:454:231:464 | *call to getArrayInt32 | bslx.cpp:231:479:231:490 | *call to getArrayUint32 | provenance | MaD:187 |
+| bslx.cpp:231:479:231:490 | *call to getArrayUint32 | bslx.cpp:231:504:231:515 | *call to getArrayInt40 | provenance | MaD:179 |
+| bslx.cpp:231:504:231:515 | *call to getArrayInt40 | bslx.cpp:231:530:231:542 | *call to getArrayUint40 | provenance | MaD:188 |
+| bslx.cpp:231:530:231:542 | *call to getArrayUint40 | bslx.cpp:231:556:231:567 | *call to getArrayInt48 | provenance | MaD:180 |
+| bslx.cpp:231:556:231:567 | *call to getArrayInt48 | bslx.cpp:231:582:231:594 | *call to getArrayUint48 | provenance | MaD:189 |
+| bslx.cpp:231:582:231:594 | *call to getArrayUint48 | bslx.cpp:231:608:231:619 | *call to getArrayInt56 | provenance | MaD:181 |
+| bslx.cpp:231:608:231:619 | *call to getArrayInt56 | bslx.cpp:231:634:231:646 | *call to getArrayUint56 | provenance | MaD:190 |
+| bslx.cpp:231:634:231:646 | *call to getArrayUint56 | bslx.cpp:231:660:231:671 | *call to getArrayInt64 | provenance | MaD:182 |
+| bslx.cpp:231:660:231:671 | *call to getArrayInt64 | bslx.cpp:231:686:231:698 | *call to getArrayUint64 | provenance | MaD:191 |
+| bslx.cpp:231:686:231:698 | *call to getArrayUint64 | bslx.cpp:231:714:231:724 | *call to getArrayFloat32 | provenance | MaD:174 |
+| bslx.cpp:231:714:231:724 | *call to getArrayFloat32 | bslx.cpp:231:740:231:750 | *call to getArrayFloat64 | provenance | MaD:175 |
+| bslx.cpp:231:740:231:750 | *call to getArrayFloat64 | bslx.cpp:231:761:231:763 | getString output argument | provenance | MaD:204 |
+| bslx.cpp:231:761:231:763 | getString output argument | bslx.cpp:232:7:232:17 | * ... | provenance | TaintFunction |
+| bslx.cpp:236:33:236:40 | call to source | bslx.cpp:237:20:237:45 | *call to data | provenance | TaintFunction |
+| bslx.cpp:237:20:237:45 | *call to data | bslx.cpp:238:57:238:58 | *sb | provenance |  |
+| bslx.cpp:237:20:237:45 | *call to data | bslx.cpp:261:2:261:7 | *stream | provenance | TaintFunction |
+| bslx.cpp:238:50:238:55 | call to GenericInStream | bslx.cpp:261:2:261:7 | *stream | provenance |  |
+| bslx.cpp:238:57:238:58 | *sb | bslx.cpp:238:50:238:55 | call to GenericInStream | provenance | MaD:217 |
+| bslx.cpp:261:2:261:7 | *stream | bslx.cpp:261:18:261:21 | *call to getLength | provenance | MaD:246 |
+| bslx.cpp:261:18:261:21 | *call to getLength | bslx.cpp:261:32:261:35 | *call to getVersion | provenance | MaD:257 |
+| bslx.cpp:261:32:261:35 | *call to getVersion | bslx.cpp:261:43:261:46 | *call to getInt8 | provenance | MaD:245 |
+| bslx.cpp:261:43:261:46 | *call to getInt8 | bslx.cpp:261:55:261:59 | *call to getUint8 | provenance | MaD:256 |
+| bslx.cpp:261:55:261:59 | *call to getUint8 | bslx.cpp:261:68:261:71 | *call to getInt16 | provenance | MaD:238 |
+| bslx.cpp:261:68:261:71 | *call to getInt16 | bslx.cpp:261:81:261:85 | *call to getUint16 | provenance | MaD:249 |
+| bslx.cpp:261:81:261:85 | *call to getUint16 | bslx.cpp:261:94:261:97 | *call to getInt24 | provenance | MaD:239 |
+| bslx.cpp:261:94:261:97 | *call to getInt24 | bslx.cpp:261:107:261:111 | *call to getUint24 | provenance | MaD:250 |
+| bslx.cpp:261:107:261:111 | *call to getUint24 | bslx.cpp:261:120:261:123 | *call to getInt32 | provenance | MaD:240 |
+| bslx.cpp:261:120:261:123 | *call to getInt32 | bslx.cpp:261:133:261:137 | *call to getUint32 | provenance | MaD:251 |
+| bslx.cpp:261:133:261:137 | *call to getUint32 | bslx.cpp:261:146:261:150 | *call to getInt40 | provenance | MaD:241 |
+| bslx.cpp:261:146:261:150 | *call to getInt40 | bslx.cpp:261:160:261:165 | *call to getUint40 | provenance | MaD:252 |
+| bslx.cpp:261:160:261:165 | *call to getUint40 | bslx.cpp:261:174:261:178 | *call to getInt48 | provenance | MaD:242 |
+| bslx.cpp:261:174:261:178 | *call to getInt48 | bslx.cpp:261:188:261:193 | *call to getUint48 | provenance | MaD:253 |
+| bslx.cpp:261:188:261:193 | *call to getUint48 | bslx.cpp:261:202:261:206 | *call to getInt56 | provenance | MaD:243 |
+| bslx.cpp:261:202:261:206 | *call to getInt56 | bslx.cpp:261:216:261:221 | *call to getUint56 | provenance | MaD:254 |
+| bslx.cpp:261:216:261:221 | *call to getUint56 | bslx.cpp:261:230:261:234 | *call to getInt64 | provenance | MaD:244 |
+| bslx.cpp:261:230:261:234 | *call to getInt64 | bslx.cpp:261:244:261:249 | *call to getUint64 | provenance | MaD:255 |
+| bslx.cpp:261:244:261:249 | *call to getUint64 | bslx.cpp:261:260:261:263 | *call to getFloat32 | provenance | MaD:236 |
+| bslx.cpp:261:260:261:263 | *call to getFloat32 | bslx.cpp:261:274:261:277 | *call to getFloat64 | provenance | MaD:237 |
+| bslx.cpp:261:274:261:277 | *call to getFloat64 | bslx.cpp:261:287:261:292 | *call to getString | provenance | MaD:248 |
+| bslx.cpp:261:287:261:292 | *call to getString | bslx.cpp:261:305:261:315 | *call to getArrayInt8 | provenance | MaD:227 |
+| bslx.cpp:261:305:261:315 | *call to getArrayInt8 | bslx.cpp:261:329:261:340 | *call to getArrayUint8 | provenance | MaD:235 |
+| bslx.cpp:261:329:261:340 | *call to getArrayUint8 | bslx.cpp:261:354:261:364 | *call to getArrayInt16 | provenance | MaD:220 |
+| bslx.cpp:261:354:261:364 | *call to getArrayInt16 | bslx.cpp:261:379:261:390 | *call to getArrayUint16 | provenance | MaD:228 |
+| bslx.cpp:261:379:261:390 | *call to getArrayUint16 | bslx.cpp:261:404:261:414 | *call to getArrayInt24 | provenance | MaD:221 |
+| bslx.cpp:261:404:261:414 | *call to getArrayInt24 | bslx.cpp:261:429:261:440 | *call to getArrayUint24 | provenance | MaD:229 |
+| bslx.cpp:261:429:261:440 | *call to getArrayUint24 | bslx.cpp:261:454:261:464 | *call to getArrayInt32 | provenance | MaD:222 |
+| bslx.cpp:261:454:261:464 | *call to getArrayInt32 | bslx.cpp:261:479:261:490 | *call to getArrayUint32 | provenance | MaD:230 |
+| bslx.cpp:261:479:261:490 | *call to getArrayUint32 | bslx.cpp:261:504:261:515 | *call to getArrayInt40 | provenance | MaD:223 |
+| bslx.cpp:261:504:261:515 | *call to getArrayInt40 | bslx.cpp:261:530:261:542 | *call to getArrayUint40 | provenance | MaD:231 |
+| bslx.cpp:261:530:261:542 | *call to getArrayUint40 | bslx.cpp:261:556:261:567 | *call to getArrayInt48 | provenance | MaD:224 |
+| bslx.cpp:261:556:261:567 | *call to getArrayInt48 | bslx.cpp:261:582:261:594 | *call to getArrayUint48 | provenance | MaD:232 |
+| bslx.cpp:261:582:261:594 | *call to getArrayUint48 | bslx.cpp:261:608:261:619 | *call to getArrayInt56 | provenance | MaD:225 |
+| bslx.cpp:261:608:261:619 | *call to getArrayInt56 | bslx.cpp:261:634:261:646 | *call to getArrayUint56 | provenance | MaD:233 |
+| bslx.cpp:261:634:261:646 | *call to getArrayUint56 | bslx.cpp:261:660:261:671 | *call to getArrayInt64 | provenance | MaD:226 |
+| bslx.cpp:261:660:261:671 | *call to getArrayInt64 | bslx.cpp:261:686:261:698 | *call to getArrayUint64 | provenance | MaD:234 |
+| bslx.cpp:261:686:261:698 | *call to getArrayUint64 | bslx.cpp:261:714:261:724 | *call to getArrayFloat32 | provenance | MaD:218 |
+| bslx.cpp:261:714:261:724 | *call to getArrayFloat32 | bslx.cpp:261:740:261:750 | *call to getArrayFloat64 | provenance | MaD:219 |
+| bslx.cpp:261:740:261:750 | *call to getArrayFloat64 | bslx.cpp:261:761:261:763 | getString output argument | provenance | MaD:247 |
+| bslx.cpp:261:761:261:763 | getString output argument | bslx.cpp:262:7:262:17 | * ... | provenance | TaintFunction |
+| bslx.cpp:266:33:266:40 | call to source | bslx.cpp:267:41:267:51 | *call to data | provenance | TaintFunction |
+| bslx.cpp:267:34:267:39 | call to ByteInStream | bslx.cpp:269:53:269:58 | *stream | provenance |  |
+| bslx.cpp:267:34:267:39 | call to ByteInStream | bslx.cpp:271:53:271:58 | *stream | provenance |  |
+| bslx.cpp:267:34:267:39 | call to ByteInStream | bslx.cpp:274:53:274:58 | *stream | provenance |  |
+| bslx.cpp:267:41:267:51 | *call to data | bslx.cpp:267:34:267:39 | call to ByteInStream | provenance | MaD:173 |
+| bslx.cpp:269:53:269:58 | *stream | bslx.cpp:269:61:269:61 | bdexStreamIn output argument | provenance | MaD:171 |
+| bslx.cpp:269:61:269:61 | bdexStreamIn output argument | bslx.cpp:270:7:270:7 | x | provenance |  |
+| bslx.cpp:269:61:269:61 | bdexStreamIn output argument | bslx.cpp:272:7:272:7 | x | provenance |  |
+| bslx.cpp:271:53:271:58 | *stream | bslx.cpp:271:61:271:61 | bdexStreamIn output argument | provenance | MaD:171 |
+| bslx.cpp:271:61:271:61 | bdexStreamIn output argument | bslx.cpp:272:7:272:7 | x | provenance |  |
+| bslx.cpp:274:52:274:66 | *call to bdexStreamIn | bslx.cpp:274:77:274:79 | getString output argument | provenance | MaD:204 |
+| bslx.cpp:274:53:274:58 | *stream | bslx.cpp:274:52:274:66 | *call to bdexStreamIn | provenance | MaD:172 |
+| bslx.cpp:274:77:274:79 | getString output argument | bslx.cpp:275:7:275:17 | * ... | provenance | TaintFunction |
+| bslx.cpp:279:33:279:40 | call to source | bslx.cpp:280:41:280:51 | *call to data | provenance | TaintFunction |
+| bslx.cpp:280:34:280:39 | call to ByteInStream | bslx.cpp:282:53:282:58 | *stream | provenance |  |
+| bslx.cpp:280:41:280:51 | *call to data | bslx.cpp:280:34:280:39 | call to ByteInStream | provenance | MaD:173 |
+| bslx.cpp:282:53:282:58 | *stream | bslx.cpp:282:61:282:63 | bdexStreamIn output argument | provenance | MaD:171 |
+| bslx.cpp:282:61:282:63 | bdexStreamIn output argument | bslx.cpp:283:7:283:17 | * ... | provenance | TaintFunction |
+| bslx.cpp:293:33:293:40 | call to source | bslx.cpp:294:41:294:51 | *call to data | provenance | TaintFunction |
+| bslx.cpp:294:34:294:39 | call to ByteInStream | bslx.cpp:296:53:296:58 | *stream | provenance |  |
+| bslx.cpp:294:41:294:51 | *call to data | bslx.cpp:294:34:294:39 | call to ByteInStream | provenance | MaD:173 |
+| bslx.cpp:296:53:296:58 | *stream | bslx.cpp:296:61:296:63 | bdexStreamIn output argument | provenance | MaD:171 |
+| bslx.cpp:296:61:296:63 | bdexStreamIn output argument | bslx.cpp:297:7:297:9 | out | provenance |  |
+| bslx.cpp:306:40:306:60 | call to source | bslx.cpp:306:40:306:60 | call to source | provenance |  |
+| bslx.cpp:306:40:306:60 | call to source | bslx.cpp:307:15:307:18 | *data | provenance |  |
+| bslx.cpp:307:2:307:7 | reset output argument | bslx.cpp:309:2:309:7 | *stream | provenance |  |
+| bslx.cpp:307:15:307:18 | *data | bslx.cpp:307:2:307:7 | reset output argument | provenance | MaD:215 |
+| bslx.cpp:309:2:309:7 | *stream | bslx.cpp:309:19:309:21 | getString output argument | provenance | MaD:204 |
+| bslx.cpp:309:19:309:21 | getString output argument | bslx.cpp:310:7:310:17 | * ... | provenance | TaintFunction |
+| bslx.cpp:314:33:314:40 | call to source | bslx.cpp:315:41:315:51 | *call to data | provenance | TaintFunction |
+| bslx.cpp:315:34:315:39 | call to ByteInStream | bslx.cpp:318:2:318:7 | *stream | provenance |  |
+| bslx.cpp:315:41:315:51 | *call to data | bslx.cpp:315:34:315:39 | call to ByteInStream | provenance | MaD:173 |
+| bslx.cpp:318:2:318:7 | *stream | bslx.cpp:318:19:318:21 | getString output argument | provenance | MaD:204 |
+| bslx.cpp:318:19:318:21 | getString output argument | bslx.cpp:319:7:319:17 | * ... | provenance | TaintFunction |
+| bslx.cpp:333:33:333:40 | call to source | bslx.cpp:334:41:334:51 | *call to data | provenance | TaintFunction |
+| bslx.cpp:334:34:334:39 | call to ByteInStream | bslx.cpp:338:2:338:7 | *stream | provenance |  |
+| bslx.cpp:334:41:334:51 | *call to data | bslx.cpp:334:34:334:39 | call to ByteInStream | provenance | MaD:173 |
+| bslx.cpp:338:2:338:7 | *stream | bslx.cpp:338:19:338:21 | getString output argument | provenance | MaD:204 |
+| bslx.cpp:338:19:338:21 | getString output argument | bslx.cpp:340:7:340:17 | * ... | provenance | TaintFunction |
+| protobuf.cpp:105:27:105:51 | call to source | protobuf.cpp:105:27:105:51 | call to source | provenance |  |
+| protobuf.cpp:105:27:105:51 | call to source | protobuf.cpp:106:22:106:25 | data | provenance |  |
+| protobuf.cpp:106:2:106:4 | ParseFromString output argument | protobuf.cpp:107:7:107:9 | msg | provenance |  |
+| protobuf.cpp:106:22:106:25 | data | protobuf.cpp:106:2:106:4 | ParseFromString output argument | provenance | MaD:290 |
+| protobuf.cpp:112:20:112:37 | call to source | protobuf.cpp:112:20:112:37 | call to source | provenance |  |
+| protobuf.cpp:112:20:112:37 | call to source | protobuf.cpp:113:22:113:25 | *data | provenance |  |
+| protobuf.cpp:113:2:113:4 | ParseFromString output argument | protobuf.cpp:114:7:114:9 | msg | provenance |  |
+| protobuf.cpp:113:22:113:25 | *data | protobuf.cpp:113:2:113:4 | ParseFromString output argument | provenance | MaD:289 |
+| protobuf.cpp:119:27:119:51 | call to source | protobuf.cpp:119:27:119:51 | call to source | provenance |  |
+| protobuf.cpp:119:27:119:51 | call to source | protobuf.cpp:120:29:120:32 | data | provenance |  |
+| protobuf.cpp:120:2:120:4 | ParsePartialFromString output argument | protobuf.cpp:121:7:121:9 | msg | provenance |  |
+| protobuf.cpp:120:29:120:32 | data | protobuf.cpp:120:2:120:4 | ParsePartialFromString output argument | provenance | MaD:298 |
+| protobuf.cpp:126:20:126:37 | call to source | protobuf.cpp:126:20:126:37 | call to source | provenance |  |
+| protobuf.cpp:126:20:126:37 | call to source | protobuf.cpp:127:29:127:32 | *data | provenance |  |
+| protobuf.cpp:127:2:127:4 | ParsePartialFromString output argument | protobuf.cpp:128:7:128:9 | msg | provenance |  |
+| protobuf.cpp:127:29:127:32 | *data | protobuf.cpp:127:2:127:4 | ParsePartialFromString output argument | provenance | MaD:297 |
+| protobuf.cpp:133:27:133:51 | call to source | protobuf.cpp:133:27:133:51 | call to source | provenance |  |
+| protobuf.cpp:133:27:133:51 | call to source | protobuf.cpp:134:22:134:25 | data | provenance |  |
+| protobuf.cpp:134:2:134:4 | MergeFromString output argument | protobuf.cpp:135:7:135:9 | msg | provenance |  |
+| protobuf.cpp:134:22:134:25 | data | protobuf.cpp:134:2:134:4 | MergeFromString output argument | provenance | MaD:278 |
+| protobuf.cpp:140:20:140:37 | call to source | protobuf.cpp:140:20:140:37 | call to source | provenance |  |
+| protobuf.cpp:140:20:140:37 | call to source | protobuf.cpp:141:22:141:25 | *data | provenance |  |
+| protobuf.cpp:141:2:141:4 | MergeFromString output argument | protobuf.cpp:142:7:142:9 | msg | provenance |  |
+| protobuf.cpp:141:22:141:25 | *data | protobuf.cpp:141:2:141:4 | MergeFromString output argument | provenance | MaD:277 |
+| protobuf.cpp:147:27:147:51 | call to source | protobuf.cpp:147:27:147:51 | call to source | provenance |  |
+| protobuf.cpp:147:27:147:51 | call to source | protobuf.cpp:148:29:148:32 | data | provenance |  |
+| protobuf.cpp:148:2:148:4 | MergePartialFromString output argument | protobuf.cpp:149:7:149:9 | msg | provenance |  |
+| protobuf.cpp:148:29:148:32 | data | protobuf.cpp:148:2:148:4 | MergePartialFromString output argument | provenance | MaD:283 |
+| protobuf.cpp:154:20:154:37 | call to source | protobuf.cpp:154:20:154:37 | call to source | provenance |  |
+| protobuf.cpp:154:20:154:37 | call to source | protobuf.cpp:155:29:155:32 | *data | provenance |  |
+| protobuf.cpp:155:2:155:4 | MergePartialFromString output argument | protobuf.cpp:156:7:156:9 | msg | provenance |  |
+| protobuf.cpp:155:29:155:32 | *data | protobuf.cpp:155:2:155:4 | MergePartialFromString output argument | provenance | MaD:282 |
+| protobuf.cpp:161:19:161:38 | call to source | protobuf.cpp:162:21:162:31 | *call to data | provenance | TaintFunction |
+| protobuf.cpp:162:2:162:4 | ParseFromArray output argument | protobuf.cpp:163:7:163:9 | msg | provenance |  |
+| protobuf.cpp:162:21:162:31 | *call to data | protobuf.cpp:162:2:162:4 | ParseFromArray output argument | provenance | MaD:284 |
+| protobuf.cpp:168:19:168:38 | call to source | protobuf.cpp:169:28:169:38 | *call to data | provenance | TaintFunction |
+| protobuf.cpp:169:2:169:4 | ParsePartialFromArray output argument | protobuf.cpp:170:7:170:9 | msg | provenance |  |
+| protobuf.cpp:169:28:169:38 | *call to data | protobuf.cpp:169:2:169:4 | ParsePartialFromArray output argument | provenance | MaD:292 |
+| protobuf.cpp:175:20:175:37 | call to source | protobuf.cpp:175:20:175:37 | call to source | provenance |  |
+| protobuf.cpp:175:20:175:37 | call to source | protobuf.cpp:176:20:176:23 | *data | provenance |  |
+| protobuf.cpp:176:2:176:4 | ParseFromCord output argument | protobuf.cpp:177:7:177:9 | msg | provenance |  |
+| protobuf.cpp:176:20:176:23 | *data | protobuf.cpp:176:2:176:4 | ParseFromCord output argument | provenance | MaD:287 |
+| protobuf.cpp:182:20:182:37 | call to source | protobuf.cpp:182:20:182:37 | call to source | provenance |  |
+| protobuf.cpp:182:20:182:37 | call to source | protobuf.cpp:183:27:183:30 | *data | provenance |  |
+| protobuf.cpp:183:2:183:4 | ParsePartialFromCord output argument | protobuf.cpp:184:7:184:9 | msg | provenance |  |
+| protobuf.cpp:183:27:183:30 | *data | protobuf.cpp:183:2:183:4 | ParsePartialFromCord output argument | provenance | MaD:295 |
+| protobuf.cpp:189:20:189:37 | call to source | protobuf.cpp:189:20:189:37 | call to source | provenance |  |
+| protobuf.cpp:189:20:189:37 | call to source | protobuf.cpp:190:20:190:23 | *data | provenance |  |
+| protobuf.cpp:190:2:190:4 | MergeFromCord output argument | protobuf.cpp:191:7:191:9 | msg | provenance |  |
+| protobuf.cpp:190:20:190:23 | *data | protobuf.cpp:190:2:190:4 | MergeFromCord output argument | provenance | MaD:276 |
+| protobuf.cpp:196:20:196:37 | call to source | protobuf.cpp:196:20:196:37 | call to source | provenance |  |
+| protobuf.cpp:196:20:196:37 | call to source | protobuf.cpp:197:27:197:30 | *data | provenance |  |
+| protobuf.cpp:197:2:197:4 | MergePartialFromCord output argument | protobuf.cpp:198:7:198:9 | msg | provenance |  |
+| protobuf.cpp:197:27:197:30 | *data | protobuf.cpp:197:2:197:4 | MergePartialFromCord output argument | provenance | MaD:281 |
+| protobuf.cpp:203:20:203:39 | call to source | protobuf.cpp:203:20:203:39 | call to source | provenance |  |
+| protobuf.cpp:203:20:203:39 | call to source | protobuf.cpp:204:23:204:25 | *& ... | provenance |  |
+| protobuf.cpp:204:2:204:4 | ParseFromIstream output argument | protobuf.cpp:205:7:205:9 | msg | provenance |  |
+| protobuf.cpp:204:23:204:25 | *& ... | protobuf.cpp:204:2:204:4 | ParseFromIstream output argument | provenance | MaD:288 |
+| protobuf.cpp:210:20:210:39 | call to source | protobuf.cpp:210:20:210:39 | call to source | provenance |  |
+| protobuf.cpp:210:20:210:39 | call to source | protobuf.cpp:211:30:211:32 | *& ... | provenance |  |
+| protobuf.cpp:211:2:211:4 | ParsePartialFromIstream output argument | protobuf.cpp:212:7:212:9 | msg | provenance |  |
+| protobuf.cpp:211:30:211:32 | *& ... | protobuf.cpp:211:2:211:4 | ParsePartialFromIstream output argument | provenance | MaD:296 |
+| protobuf.cpp:217:27:217:53 | call to source | protobuf.cpp:217:27:217:53 | call to source | provenance |  |
+| protobuf.cpp:217:27:217:53 | call to source | protobuf.cpp:218:30:218:32 | *& ... | provenance |  |
+| protobuf.cpp:218:2:218:4 | ParseFromZeroCopyStream output argument | protobuf.cpp:219:7:219:9 | msg | provenance |  |
+| protobuf.cpp:218:30:218:32 | *& ... | protobuf.cpp:218:2:218:4 | ParseFromZeroCopyStream output argument | provenance | MaD:291 |
+| protobuf.cpp:224:27:224:53 | call to source | protobuf.cpp:224:27:224:53 | call to source | provenance |  |
+| protobuf.cpp:224:27:224:53 | call to source | protobuf.cpp:225:37:225:39 | *& ... | provenance |  |
+| protobuf.cpp:225:2:225:4 | ParsePartialFromZeroCopyStream output argument | protobuf.cpp:226:7:226:9 | msg | provenance |  |
+| protobuf.cpp:225:37:225:39 | *& ... | protobuf.cpp:225:2:225:4 | ParsePartialFromZeroCopyStream output argument | provenance | MaD:299 |
+| protobuf.cpp:231:27:231:53 | call to source | protobuf.cpp:231:27:231:53 | call to source | provenance |  |
+| protobuf.cpp:231:27:231:53 | call to source | protobuf.cpp:232:37:232:39 | *& ... | provenance |  |
+| protobuf.cpp:232:2:232:4 | ParseFromBoundedZeroCopyStream output argument | protobuf.cpp:233:7:233:9 | msg | provenance |  |
+| protobuf.cpp:232:37:232:39 | *& ... | protobuf.cpp:232:2:232:4 | ParseFromBoundedZeroCopyStream output argument | provenance | MaD:285 |
+| protobuf.cpp:238:27:238:53 | call to source | protobuf.cpp:238:27:238:53 | call to source | provenance |  |
+| protobuf.cpp:238:27:238:53 | call to source | protobuf.cpp:239:44:239:46 | *& ... | provenance |  |
+| protobuf.cpp:239:2:239:4 | ParsePartialFromBoundedZeroCopyStream output argument | protobuf.cpp:240:7:240:9 | msg | provenance |  |
+| protobuf.cpp:239:44:239:46 | *& ... | protobuf.cpp:239:2:239:4 | ParsePartialFromBoundedZeroCopyStream output argument | provenance | MaD:293 |
+| protobuf.cpp:245:27:245:53 | call to source | protobuf.cpp:245:27:245:53 | call to source | provenance |  |
+| protobuf.cpp:245:27:245:53 | call to source | protobuf.cpp:246:37:246:39 | *& ... | provenance |  |
+| protobuf.cpp:246:2:246:4 | MergeFromBoundedZeroCopyStream output argument | protobuf.cpp:247:7:247:9 | msg | provenance |  |
+| protobuf.cpp:246:37:246:39 | *& ... | protobuf.cpp:246:2:246:4 | MergeFromBoundedZeroCopyStream output argument | provenance | MaD:274 |
+| protobuf.cpp:252:27:252:53 | call to source | protobuf.cpp:252:27:252:53 | call to source | provenance |  |
+| protobuf.cpp:252:27:252:53 | call to source | protobuf.cpp:253:44:253:46 | *& ... | provenance |  |
+| protobuf.cpp:253:2:253:4 | MergePartialFromBoundedZeroCopyStream output argument | protobuf.cpp:254:7:254:9 | msg | provenance |  |
+| protobuf.cpp:253:44:253:46 | *& ... | protobuf.cpp:253:2:253:4 | MergePartialFromBoundedZeroCopyStream output argument | provenance | MaD:279 |
+| protobuf.cpp:259:24:259:47 | call to source | protobuf.cpp:259:24:259:47 | call to source | provenance |  |
+| protobuf.cpp:259:24:259:47 | call to source | protobuf.cpp:260:27:260:29 | *& ... | provenance |  |
+| protobuf.cpp:260:2:260:4 | ParseFromCodedStream output argument | protobuf.cpp:261:7:261:9 | msg | provenance |  |
+| protobuf.cpp:260:27:260:29 | *& ... | protobuf.cpp:260:2:260:4 | ParseFromCodedStream output argument | provenance | MaD:286 |
+| protobuf.cpp:266:24:266:47 | call to source | protobuf.cpp:266:24:266:47 | call to source | provenance |  |
+| protobuf.cpp:266:24:266:47 | call to source | protobuf.cpp:267:34:267:36 | *& ... | provenance |  |
+| protobuf.cpp:267:2:267:4 | ParsePartialFromCodedStream output argument | protobuf.cpp:268:7:268:9 | msg | provenance |  |
+| protobuf.cpp:267:34:267:36 | *& ... | protobuf.cpp:267:2:267:4 | ParsePartialFromCodedStream output argument | provenance | MaD:294 |
+| protobuf.cpp:273:24:273:47 | call to source | protobuf.cpp:273:24:273:47 | call to source | provenance |  |
+| protobuf.cpp:273:24:273:47 | call to source | protobuf.cpp:274:27:274:29 | *& ... | provenance |  |
+| protobuf.cpp:274:2:274:4 | MergeFromCodedStream output argument | protobuf.cpp:275:7:275:9 | msg | provenance |  |
+| protobuf.cpp:274:27:274:29 | *& ... | protobuf.cpp:274:2:274:4 | MergeFromCodedStream output argument | provenance | MaD:275 |
+| protobuf.cpp:280:24:280:47 | call to source | protobuf.cpp:280:24:280:47 | call to source | provenance |  |
+| protobuf.cpp:280:24:280:47 | call to source | protobuf.cpp:281:34:281:36 | *& ... | provenance |  |
+| protobuf.cpp:281:2:281:4 | MergePartialFromCodedStream output argument | protobuf.cpp:282:7:282:9 | msg | provenance |  |
+| protobuf.cpp:281:34:281:36 | *& ... | protobuf.cpp:281:2:281:4 | MergePartialFromCodedStream output argument | provenance | MaD:280 |
+| protobuf.cpp:295:15:295:28 | call to source | protobuf.cpp:295:15:295:28 | call to source | provenance |  |
+| protobuf.cpp:295:15:295:28 | call to source | protobuf.cpp:297:2:297:4 | *msg | provenance |  |
+| protobuf.cpp:297:2:297:4 | *msg | protobuf.cpp:297:24:297:27 | SerializeToString output argument | provenance | MaD:314 |
+| protobuf.cpp:297:24:297:27 | SerializeToString output argument | protobuf.cpp:298:7:298:9 | out | provenance |  |
+| protobuf.cpp:302:15:302:28 | call to source | protobuf.cpp:302:15:302:28 | call to source | provenance |  |
+| protobuf.cpp:302:15:302:28 | call to source | protobuf.cpp:304:2:304:4 | *msg | provenance |  |
+| protobuf.cpp:304:2:304:4 | *msg | protobuf.cpp:304:31:304:34 | SerializePartialToString output argument | provenance | MaD:308 |
+| protobuf.cpp:304:31:304:34 | SerializePartialToString output argument | protobuf.cpp:305:7:305:9 | out | provenance |  |
+| protobuf.cpp:309:15:309:28 | call to source | protobuf.cpp:309:15:309:28 | call to source | provenance |  |
+| protobuf.cpp:309:15:309:28 | call to source | protobuf.cpp:311:2:311:4 | *msg | provenance |  |
+| protobuf.cpp:311:2:311:4 | *msg | protobuf.cpp:311:21:311:24 | AppendToString output argument | provenance | MaD:273 |
+| protobuf.cpp:311:21:311:24 | AppendToString output argument | protobuf.cpp:312:7:312:9 | out | provenance |  |
+| protobuf.cpp:316:15:316:28 | call to source | protobuf.cpp:316:15:316:28 | call to source | provenance |  |
+| protobuf.cpp:316:15:316:28 | call to source | protobuf.cpp:318:2:318:4 | *msg | provenance |  |
+| protobuf.cpp:318:2:318:4 | *msg | protobuf.cpp:318:28:318:31 | AppendPartialToString output argument | provenance | MaD:271 |
+| protobuf.cpp:318:28:318:31 | AppendPartialToString output argument | protobuf.cpp:319:7:319:9 | out | provenance |  |
+| protobuf.cpp:323:15:323:28 | call to source | protobuf.cpp:323:15:323:28 | call to source | provenance |  |
+| protobuf.cpp:323:15:323:28 | call to source | protobuf.cpp:325:2:325:4 | *msg | provenance |  |
+| protobuf.cpp:325:2:325:4 | *msg | protobuf.cpp:325:24:325:27 | SerializeToString output argument | provenance | MaD:314 |
+| protobuf.cpp:325:24:325:27 | SerializeToString output argument | protobuf.cpp:326:7:326:9 | out | provenance |  |
+| protobuf.cpp:330:15:330:28 | call to source | protobuf.cpp:330:15:330:28 | call to source | provenance |  |
+| protobuf.cpp:330:15:330:28 | call to source | protobuf.cpp:332:2:332:4 | *msg | provenance |  |
+| protobuf.cpp:332:2:332:4 | *msg | protobuf.cpp:332:31:332:34 | SerializePartialToString output argument | provenance | MaD:308 |
+| protobuf.cpp:332:31:332:34 | SerializePartialToString output argument | protobuf.cpp:333:7:333:9 | out | provenance |  |
+| protobuf.cpp:337:15:337:28 | call to source | protobuf.cpp:337:15:337:28 | call to source | provenance |  |
+| protobuf.cpp:337:15:337:28 | call to source | protobuf.cpp:339:2:339:4 | *msg | provenance |  |
+| protobuf.cpp:339:2:339:4 | *msg | protobuf.cpp:339:21:339:24 | AppendToString output argument | provenance | MaD:273 |
+| protobuf.cpp:339:21:339:24 | AppendToString output argument | protobuf.cpp:340:7:340:9 | out | provenance |  |
+| protobuf.cpp:344:15:344:28 | call to source | protobuf.cpp:344:15:344:28 | call to source | provenance |  |
+| protobuf.cpp:344:15:344:28 | call to source | protobuf.cpp:346:2:346:4 | *msg | provenance |  |
+| protobuf.cpp:346:2:346:4 | *msg | protobuf.cpp:346:28:346:31 | AppendPartialToString output argument | provenance | MaD:271 |
+| protobuf.cpp:346:28:346:31 | AppendPartialToString output argument | protobuf.cpp:347:7:347:9 | out | provenance |  |
+| protobuf.cpp:351:15:351:28 | call to source | protobuf.cpp:351:15:351:28 | call to source | provenance |  |
+| protobuf.cpp:351:15:351:28 | call to source | protobuf.cpp:353:2:353:4 | *msg | provenance |  |
+| protobuf.cpp:353:2:353:4 | *msg | protobuf.cpp:353:23:353:25 | SerializeToArray output argument | provenance | MaD:310 |
+| protobuf.cpp:353:23:353:25 | SerializeToArray output argument | protobuf.cpp:354:7:354:10 | * ... | provenance |  |
+| protobuf.cpp:358:15:358:28 | call to source | protobuf.cpp:358:15:358:28 | call to source | provenance |  |
+| protobuf.cpp:358:15:358:28 | call to source | protobuf.cpp:360:2:360:4 | *msg | provenance |  |
+| protobuf.cpp:360:2:360:4 | *msg | protobuf.cpp:360:30:360:32 | SerializePartialToArray output argument | provenance | MaD:304 |
+| protobuf.cpp:360:30:360:32 | SerializePartialToArray output argument | protobuf.cpp:361:7:361:10 | * ... | provenance |  |
+| protobuf.cpp:365:15:365:28 | call to source | protobuf.cpp:365:15:365:28 | call to source | provenance |  |
+| protobuf.cpp:365:15:365:28 | call to source | protobuf.cpp:367:2:367:4 | *msg | provenance |  |
+| protobuf.cpp:367:2:367:4 | *msg | protobuf.cpp:367:22:367:25 | SerializeToCord output argument | provenance | MaD:312 |
+| protobuf.cpp:367:22:367:25 | SerializeToCord output argument | protobuf.cpp:368:7:368:9 | out | provenance |  |
+| protobuf.cpp:372:15:372:28 | call to source | protobuf.cpp:372:15:372:28 | call to source | provenance |  |
+| protobuf.cpp:372:15:372:28 | call to source | protobuf.cpp:374:2:374:4 | *msg | provenance |  |
+| protobuf.cpp:374:2:374:4 | *msg | protobuf.cpp:374:29:374:32 | SerializePartialToCord output argument | provenance | MaD:306 |
+| protobuf.cpp:374:29:374:32 | SerializePartialToCord output argument | protobuf.cpp:375:7:375:9 | out | provenance |  |
+| protobuf.cpp:379:15:379:28 | call to source | protobuf.cpp:379:15:379:28 | call to source | provenance |  |
+| protobuf.cpp:379:15:379:28 | call to source | protobuf.cpp:381:2:381:4 | *msg | provenance |  |
+| protobuf.cpp:381:2:381:4 | *msg | protobuf.cpp:381:19:381:22 | AppendToCord output argument | provenance | MaD:272 |
+| protobuf.cpp:381:19:381:22 | AppendToCord output argument | protobuf.cpp:382:7:382:9 | out | provenance |  |
+| protobuf.cpp:386:15:386:28 | call to source | protobuf.cpp:386:15:386:28 | call to source | provenance |  |
+| protobuf.cpp:386:15:386:28 | call to source | protobuf.cpp:388:2:388:4 | *msg | provenance |  |
+| protobuf.cpp:388:2:388:4 | *msg | protobuf.cpp:388:26:388:29 | AppendPartialToCord output argument | provenance | MaD:270 |
+| protobuf.cpp:388:26:388:29 | AppendPartialToCord output argument | protobuf.cpp:389:7:389:9 | out | provenance |  |
+| protobuf.cpp:393:15:393:28 | call to source | protobuf.cpp:393:15:393:28 | call to source | provenance |  |
+| protobuf.cpp:393:15:393:28 | call to source | protobuf.cpp:395:2:395:4 | *msg | provenance |  |
+| protobuf.cpp:395:2:395:4 | *msg | protobuf.cpp:395:25:395:28 | SerializeToOstream output argument | provenance | MaD:313 |
+| protobuf.cpp:395:25:395:28 | SerializeToOstream output argument | protobuf.cpp:396:7:396:9 | out | provenance |  |
+| protobuf.cpp:400:15:400:28 | call to source | protobuf.cpp:400:15:400:28 | call to source | provenance |  |
+| protobuf.cpp:400:15:400:28 | call to source | protobuf.cpp:402:2:402:4 | *msg | provenance |  |
+| protobuf.cpp:402:2:402:4 | *msg | protobuf.cpp:402:32:402:35 | SerializePartialToOstream output argument | provenance | MaD:307 |
+| protobuf.cpp:402:32:402:35 | SerializePartialToOstream output argument | protobuf.cpp:403:7:403:9 | out | provenance |  |
+| protobuf.cpp:407:15:407:28 | call to source | protobuf.cpp:407:15:407:28 | call to source | provenance |  |
+| protobuf.cpp:407:15:407:28 | call to source | protobuf.cpp:409:2:409:4 | *msg | provenance |  |
+| protobuf.cpp:409:2:409:4 | *msg | protobuf.cpp:409:32:409:35 | SerializeToZeroCopyStream output argument | provenance | MaD:315 |
+| protobuf.cpp:409:32:409:35 | SerializeToZeroCopyStream output argument | protobuf.cpp:410:7:410:9 | out | provenance |  |
+| protobuf.cpp:414:15:414:28 | call to source | protobuf.cpp:414:15:414:28 | call to source | provenance |  |
+| protobuf.cpp:414:15:414:28 | call to source | protobuf.cpp:416:2:416:4 | *msg | provenance |  |
+| protobuf.cpp:416:2:416:4 | *msg | protobuf.cpp:416:39:416:42 | SerializePartialToZeroCopyStream output argument | provenance | MaD:309 |
+| protobuf.cpp:416:39:416:42 | SerializePartialToZeroCopyStream output argument | protobuf.cpp:417:7:417:9 | out | provenance |  |
+| protobuf.cpp:421:15:421:28 | call to source | protobuf.cpp:421:15:421:28 | call to source | provenance |  |
+| protobuf.cpp:421:15:421:28 | call to source | protobuf.cpp:423:2:423:4 | *msg | provenance |  |
+| protobuf.cpp:423:2:423:4 | *msg | protobuf.cpp:423:29:423:32 | SerializeToCodedStream output argument | provenance | MaD:311 |
+| protobuf.cpp:423:29:423:32 | SerializeToCodedStream output argument | protobuf.cpp:424:7:424:9 | out | provenance |  |
+| protobuf.cpp:428:15:428:28 | call to source | protobuf.cpp:428:15:428:28 | call to source | provenance |  |
+| protobuf.cpp:428:15:428:28 | call to source | protobuf.cpp:430:2:430:4 | *msg | provenance |  |
+| protobuf.cpp:430:2:430:4 | *msg | protobuf.cpp:430:36:430:39 | SerializePartialToCodedStream output argument | provenance | MaD:305 |
+| protobuf.cpp:430:36:430:39 | SerializePartialToCodedStream output argument | protobuf.cpp:431:7:431:9 | out | provenance |  |
+| protobuf.cpp:437:15:437:28 | call to source | protobuf.cpp:437:15:437:28 | call to source | provenance |  |
+| protobuf.cpp:437:15:437:28 | call to source | protobuf.cpp:438:7:438:9 | *msg | provenance |  |
+| protobuf.cpp:438:7:438:9 | *msg | protobuf.cpp:438:11:438:27 | call to SerializeAsString | provenance | MaD:301 |
+| protobuf.cpp:442:15:442:28 | call to source | protobuf.cpp:442:15:442:28 | call to source | provenance |  |
+| protobuf.cpp:442:15:442:28 | call to source | protobuf.cpp:443:7:443:9 | *msg | provenance |  |
+| protobuf.cpp:443:7:443:9 | *msg | protobuf.cpp:443:11:443:34 | call to SerializePartialAsString | provenance | MaD:303 |
+| protobuf.cpp:447:15:447:28 | call to source | protobuf.cpp:447:15:447:28 | call to source | provenance |  |
+| protobuf.cpp:447:15:447:28 | call to source | protobuf.cpp:448:7:448:9 | *msg | provenance |  |
+| protobuf.cpp:448:7:448:9 | *msg | protobuf.cpp:448:11:448:25 | call to SerializeAsCord | provenance | MaD:300 |
+| protobuf.cpp:452:15:452:28 | call to source | protobuf.cpp:452:15:452:28 | call to source | provenance |  |
+| protobuf.cpp:452:15:452:28 | call to source | protobuf.cpp:453:7:453:9 | *msg | provenance |  |
+| protobuf.cpp:453:7:453:9 | *msg | protobuf.cpp:453:11:453:32 | call to SerializePartialAsCord | provenance | MaD:302 |
 | test.cpp:7:47:7:52 | value2 | test.cpp:7:64:7:69 | value2 | provenance |  |
 | test.cpp:7:64:7:69 | value2 | test.cpp:7:5:7:30 | *ymlStepGenerated_with_body | provenance |  |
-| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:10:10:10:18 | call to ymlSource | provenance | Src:MaD:35  |
-| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:14:10:14:10 | x | provenance | Sink:MaD:1 |
+| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:10:10:10:18 | call to ymlSource | provenance | Src:MaD:48  |
+| test.cpp:10:10:10:18 | call to ymlSource | test.cpp:14:10:14:10 | x | provenance | Sink:MaD:3 |
 | test.cpp:10:10:10:18 | call to ymlSource | test.cpp:17:24:17:24 | x | provenance |  |
 | test.cpp:10:10:10:18 | call to ymlSource | test.cpp:21:27:21:27 | x | provenance |  |
 | test.cpp:10:10:10:18 | call to ymlSource | test.cpp:25:35:25:35 | x | provenance |  |
 | test.cpp:10:10:10:18 | call to ymlSource | test.cpp:32:41:32:41 | x | provenance |  |
 | test.cpp:17:10:17:22 | call to ymlStepManual | test.cpp:17:10:17:22 | call to ymlStepManual | provenance |  |
-| test.cpp:17:10:17:22 | call to ymlStepManual | test.cpp:18:10:18:10 | y | provenance | Sink:MaD:1 |
-| test.cpp:17:24:17:24 | x | test.cpp:17:10:17:22 | call to ymlStepManual | provenance | MaD:71 |
+| test.cpp:17:10:17:22 | call to ymlStepManual | test.cpp:18:10:18:10 | y | provenance | Sink:MaD:3 |
+| test.cpp:17:24:17:24 | x | test.cpp:17:10:17:22 | call to ymlStepManual | provenance | MaD:85 |
 | test.cpp:21:10:21:25 | call to ymlStepGenerated | test.cpp:21:10:21:25 | call to ymlStepGenerated | provenance |  |
-| test.cpp:21:10:21:25 | call to ymlStepGenerated | test.cpp:22:10:22:10 | z | provenance | Sink:MaD:1 |
-| test.cpp:21:27:21:27 | x | test.cpp:21:10:21:25 | call to ymlStepGenerated | provenance | MaD:70 |
+| test.cpp:21:10:21:25 | call to ymlStepGenerated | test.cpp:22:10:22:10 | z | provenance | Sink:MaD:3 |
+| test.cpp:21:27:21:27 | x | test.cpp:21:10:21:25 | call to ymlStepGenerated | provenance | MaD:84 |
 | test.cpp:25:11:25:33 | call to ymlStepManual_with_body | test.cpp:25:11:25:33 | call to ymlStepManual_with_body | provenance |  |
-| test.cpp:25:11:25:33 | call to ymlStepManual_with_body | test.cpp:26:10:26:11 | y2 | provenance | Sink:MaD:1 |
-| test.cpp:25:35:25:35 | x | test.cpp:25:11:25:33 | call to ymlStepManual_with_body | provenance | MaD:72 |
+| test.cpp:25:11:25:33 | call to ymlStepManual_with_body | test.cpp:26:10:26:11 | y2 | provenance | Sink:MaD:3 |
+| test.cpp:25:35:25:35 | x | test.cpp:25:11:25:33 | call to ymlStepManual_with_body | provenance | MaD:86 |
 | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | provenance |  |
-| test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | test.cpp:33:10:33:11 | z2 | provenance | Sink:MaD:1 |
+| test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | test.cpp:33:10:33:11 | z2 | provenance | Sink:MaD:3 |
 | test.cpp:32:41:32:41 | x | test.cpp:7:47:7:52 | value2 | provenance |  |
 | test.cpp:32:41:32:41 | x | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | provenance |  |
 | test.cpp:46:30:46:32 | *arg [x] | test.cpp:47:12:47:19 | *arg [x] | provenance |  |
 | test.cpp:47:12:47:19 | *arg [x] | test.cpp:48:13:48:13 | *s [x] | provenance |  |
-| test.cpp:48:13:48:13 | *s [x] | test.cpp:48:16:48:16 | x | provenance | Sink:MaD:1 |
+| test.cpp:48:13:48:13 | *s [x] | test.cpp:48:16:48:16 | x | provenance |  |
+| test.cpp:48:16:48:16 | x | test.cpp:48:16:48:16 | x | provenance | Sink:MaD:3 |
 | test.cpp:56:2:56:2 | *s [post update] [x] | test.cpp:59:55:59:64 | *& ... [x] | provenance |  |
 | test.cpp:56:2:56:18 | ... = ... | test.cpp:56:2:56:2 | *s [post update] [x] | provenance |  |
-| test.cpp:56:8:56:16 | call to ymlSource | test.cpp:56:2:56:18 | ... = ... | provenance | Src:MaD:35  |
-| test.cpp:59:55:59:64 | *& ... [x] | test.cpp:46:30:46:32 | *arg [x] | provenance | MaD:67 |
-| test.cpp:68:22:68:22 | y | test.cpp:69:11:69:11 | y | provenance | Sink:MaD:1 |
-| test.cpp:74:22:74:22 | y | test.cpp:75:11:75:11 | y | provenance | Sink:MaD:1 |
-| test.cpp:82:22:82:22 | y | test.cpp:83:11:83:11 | y | provenance | Sink:MaD:1 |
-| test.cpp:88:22:88:22 | y | test.cpp:89:11:89:11 | y | provenance | Sink:MaD:1 |
-| test.cpp:94:10:94:18 | call to ymlSource | test.cpp:94:10:94:18 | call to ymlSource | provenance | Src:MaD:35  |
+| test.cpp:56:8:56:16 | call to ymlSource | test.cpp:56:2:56:18 | ... = ... | provenance | Src:MaD:48  |
+| test.cpp:59:55:59:64 | *& ... [x] | test.cpp:46:30:46:32 | *arg [x] | provenance | MaD:81 |
+| test.cpp:68:22:68:22 | y | test.cpp:69:11:69:11 | y | provenance | Sink:MaD:3 |
+| test.cpp:74:22:74:22 | y | test.cpp:75:11:75:11 | y | provenance | Sink:MaD:3 |
+| test.cpp:82:22:82:22 | y | test.cpp:83:11:83:11 | y | provenance | Sink:MaD:3 |
+| test.cpp:88:22:88:22 | y | test.cpp:89:11:89:11 | y | provenance | Sink:MaD:3 |
+| test.cpp:94:10:94:18 | call to ymlSource | test.cpp:94:10:94:18 | call to ymlSource | provenance | Src:MaD:48  |
 | test.cpp:94:10:94:18 | call to ymlSource | test.cpp:97:26:97:26 | x | provenance |  |
 | test.cpp:94:10:94:18 | call to ymlSource | test.cpp:101:26:101:26 | x | provenance |  |
 | test.cpp:94:10:94:18 | call to ymlSource | test.cpp:103:63:103:63 | x | provenance |  |
 | test.cpp:94:10:94:18 | call to ymlSource | test.cpp:104:62:104:62 | x | provenance |  |
-| test.cpp:97:26:97:26 | x | test.cpp:68:22:68:22 | y | provenance | MaD:65 |
-| test.cpp:101:26:101:26 | x | test.cpp:74:22:74:22 | y | provenance | MaD:65 |
-| test.cpp:103:63:103:63 | x | test.cpp:82:22:82:22 | y | provenance | MaD:65 |
-| test.cpp:104:62:104:62 | x | test.cpp:88:22:88:22 | y | provenance | MaD:65 |
-| test.cpp:114:10:114:18 | call to ymlSource | test.cpp:114:10:114:18 | call to ymlSource | provenance | Src:MaD:35  |
+| test.cpp:97:26:97:26 | x | test.cpp:68:22:68:22 | y | provenance | MaD:79 |
+| test.cpp:101:26:101:26 | x | test.cpp:74:22:74:22 | y | provenance | MaD:79 |
+| test.cpp:103:63:103:63 | x | test.cpp:82:22:82:22 | y | provenance | MaD:79 |
+| test.cpp:104:62:104:62 | x | test.cpp:88:22:88:22 | y | provenance | MaD:79 |
+| test.cpp:114:10:114:18 | call to ymlSource | test.cpp:114:10:114:18 | call to ymlSource | provenance | Src:MaD:48  |
 | test.cpp:114:10:114:18 | call to ymlSource | test.cpp:118:44:118:44 | *x | provenance |  |
 | test.cpp:118:11:118:42 | call to callWithNonTypeTemplate | test.cpp:118:11:118:42 | call to callWithNonTypeTemplate | provenance |  |
-| test.cpp:118:11:118:42 | call to callWithNonTypeTemplate | test.cpp:119:10:119:11 | y2 | provenance | Sink:MaD:1 |
-| test.cpp:118:44:118:44 | *x | test.cpp:118:11:118:42 | call to callWithNonTypeTemplate | provenance | MaD:66 |
-| test.cpp:133:10:133:18 | call to ymlSource | test.cpp:133:10:133:18 | call to ymlSource | provenance | Src:MaD:35  |
+| test.cpp:118:11:118:42 | call to callWithNonTypeTemplate | test.cpp:119:10:119:11 | y2 | provenance | Sink:MaD:3 |
+| test.cpp:118:44:118:44 | *x | test.cpp:118:11:118:42 | call to callWithNonTypeTemplate | provenance | MaD:80 |
+| test.cpp:133:10:133:18 | call to ymlSource | test.cpp:133:10:133:18 | call to ymlSource | provenance | Src:MaD:48  |
 | test.cpp:133:10:133:18 | call to ymlSource | test.cpp:134:45:134:45 | x | provenance |  |
 | test.cpp:134:13:134:43 | call to templateFunction | test.cpp:134:13:134:43 | call to templateFunction | provenance |  |
-| test.cpp:134:13:134:43 | call to templateFunction | test.cpp:135:10:135:10 | y | provenance | Sink:MaD:1 |
-| test.cpp:134:45:134:45 | x | test.cpp:134:13:134:43 | call to templateFunction | provenance | MaD:77 |
-| test.cpp:146:10:146:18 | call to ymlSource | test.cpp:146:10:146:18 | call to ymlSource | provenance | Src:MaD:35  |
+| test.cpp:134:13:134:43 | call to templateFunction | test.cpp:135:10:135:10 | y | provenance | Sink:MaD:3 |
+| test.cpp:134:45:134:45 | x | test.cpp:134:13:134:43 | call to templateFunction | provenance | MaD:93 |
+| test.cpp:146:10:146:18 | call to ymlSource | test.cpp:146:10:146:18 | call to ymlSource | provenance | Src:MaD:48  |
 | test.cpp:146:10:146:18 | call to ymlSource | test.cpp:148:26:148:26 | x | provenance |  |
 | test.cpp:148:10:148:27 | call to function | test.cpp:148:10:148:27 | call to function | provenance |  |
-| test.cpp:148:10:148:27 | call to function | test.cpp:149:10:149:10 | z | provenance | Sink:MaD:1 |
-| test.cpp:148:26:148:26 | x | test.cpp:148:10:148:27 | call to function | provenance | MaD:78 |
-| test.cpp:155:10:155:18 | call to ymlSource | test.cpp:155:10:155:18 | call to ymlSource | provenance | Src:MaD:35  |
+| test.cpp:148:10:148:27 | call to function | test.cpp:149:10:149:10 | z | provenance | Sink:MaD:3 |
+| test.cpp:148:26:148:26 | x | test.cpp:148:10:148:27 | call to function | provenance | MaD:94 |
+| test.cpp:155:10:155:18 | call to ymlSource | test.cpp:155:10:155:18 | call to ymlSource | provenance | Src:MaD:48  |
 | test.cpp:155:10:155:18 | call to ymlSource | test.cpp:157:26:157:26 | x | provenance |  |
 | test.cpp:157:13:157:20 | call to function | test.cpp:157:13:157:20 | call to function | provenance |  |
-| test.cpp:157:13:157:20 | call to function | test.cpp:158:10:158:10 | z | provenance | Sink:MaD:1 |
-| test.cpp:157:26:157:26 | x | test.cpp:157:13:157:20 | call to function | provenance | MaD:78 |
+| test.cpp:157:13:157:20 | call to function | test.cpp:158:10:158:10 | z | provenance | Sink:MaD:3 |
+| test.cpp:157:26:157:26 | x | test.cpp:157:13:157:20 | call to function | provenance | MaD:94 |
 | test.cpp:164:34:164:34 | x | test.cpp:165:69:165:69 | x | provenance |  |
 | test.cpp:165:12:165:64 | call to templateFunction2 | test.cpp:164:7:164:7 | *templateFunction3 | provenance |  |
 | test.cpp:165:12:165:64 | call to templateFunction2 | test.cpp:165:12:165:64 | call to templateFunction2 | provenance |  |
-| test.cpp:165:69:165:69 | x | test.cpp:165:12:165:64 | call to templateFunction2 | provenance | MaD:76 |
-| test.cpp:170:10:170:18 | call to ymlSource | test.cpp:170:10:170:18 | call to ymlSource | provenance | Src:MaD:35  |
+| test.cpp:165:69:165:69 | x | test.cpp:165:12:165:64 | call to templateFunction2 | provenance | MaD:92 |
+| test.cpp:170:10:170:18 | call to ymlSource | test.cpp:170:10:170:18 | call to ymlSource | provenance | Src:MaD:48  |
 | test.cpp:170:10:170:18 | call to ymlSource | test.cpp:172:51:172:51 | x | provenance |  |
 | test.cpp:172:13:172:44 | call to templateFunction3 | test.cpp:172:13:172:44 | call to templateFunction3 | provenance |  |
-| test.cpp:172:13:172:44 | call to templateFunction3 | test.cpp:173:10:173:10 | y | provenance | Sink:MaD:1 |
+| test.cpp:172:13:172:44 | call to templateFunction3 | test.cpp:173:10:173:10 | y | provenance | Sink:MaD:3 |
 | test.cpp:172:51:172:51 | x | test.cpp:164:34:164:34 | x | provenance |  |
-| test.cpp:172:51:172:51 | x | test.cpp:172:13:172:44 | call to templateFunction3 | provenance | MaD:76 |
+| test.cpp:172:51:172:51 | x | test.cpp:172:13:172:44 | call to templateFunction3 | provenance | MaD:92 |
 | test.cpp:186:2:186:2 | *s [post update] [myField] | test.cpp:187:33:187:34 | *& ... [myField] | provenance |  |
 | test.cpp:186:2:186:24 | ... = ... | test.cpp:186:2:186:2 | *s [post update] [myField] | provenance |  |
-| test.cpp:186:14:186:22 | call to ymlSource | test.cpp:186:2:186:24 | ... = ... | provenance | Src:MaD:35  |
+| test.cpp:186:14:186:22 | call to ymlSource | test.cpp:186:2:186:24 | ... = ... | provenance | Src:MaD:48  |
 | test.cpp:187:10:187:31 | call to read_field_from_struct | test.cpp:187:10:187:31 | call to read_field_from_struct | provenance |  |
-| test.cpp:187:10:187:31 | call to read_field_from_struct | test.cpp:188:10:188:10 | x | provenance | Sink:MaD:1 |
-| test.cpp:187:33:187:34 | *& ... [myField] | test.cpp:187:10:187:31 | call to read_field_from_struct | provenance | MaD:68 |
+| test.cpp:187:10:187:31 | call to read_field_from_struct | test.cpp:188:10:188:10 | x | provenance | Sink:MaD:3 |
+| test.cpp:187:33:187:34 | *& ... [myField] | test.cpp:187:10:187:31 | call to read_field_from_struct | provenance | MaD:82 |
 | test.cpp:199:2:199:2 | *s [post update] [myField] | test.cpp:200:35:200:36 | *& ... [myField] | provenance |  |
 | test.cpp:199:2:199:24 | ... = ... | test.cpp:199:2:199:2 | *s [post update] [myField] | provenance |  |
-| test.cpp:199:14:199:22 | call to ymlSource | test.cpp:199:2:199:24 | ... = ... | provenance | Src:MaD:35  |
+| test.cpp:199:14:199:22 | call to ymlSource | test.cpp:199:2:199:24 | ... = ... | provenance | Src:MaD:48  |
 | test.cpp:200:10:200:33 | call to read_field_from_struct_2 | test.cpp:200:10:200:33 | call to read_field_from_struct_2 | provenance |  |
-| test.cpp:200:10:200:33 | call to read_field_from_struct_2 | test.cpp:201:10:201:10 | x | provenance | Sink:MaD:1 |
-| test.cpp:200:35:200:36 | *& ... [myField] | test.cpp:200:10:200:33 | call to read_field_from_struct_2 | provenance | MaD:69 |
+| test.cpp:200:10:200:33 | call to read_field_from_struct_2 | test.cpp:201:10:201:10 | x | provenance | Sink:MaD:3 |
+| test.cpp:200:35:200:36 | *& ... [myField] | test.cpp:200:10:200:33 | call to read_field_from_struct_2 | provenance | MaD:83 |
 | test.cpp:216:3:216:4 | get_ptr output argument [value] | test.cpp:217:11:217:12 | *rf [value] | provenance |  |
-| test.cpp:216:3:216:28 | ... = ... | test.cpp:216:3:216:4 | get_ptr output argument [value] | provenance | MaD:75 |
-| test.cpp:216:18:216:26 | call to ymlSource | test.cpp:216:3:216:28 | ... = ... | provenance | Src:MaD:35  |
+| test.cpp:216:3:216:28 | ... = ... | test.cpp:216:3:216:4 | get_ptr output argument [value] | provenance | MaD:91 |
+| test.cpp:216:18:216:26 | call to ymlSource | test.cpp:216:3:216:28 | ... = ... | provenance | Src:MaD:48  |
 | test.cpp:217:11:217:12 | *rf [value] | test.cpp:217:14:217:18 | value | provenance |  |
 | test.cpp:217:14:217:18 | value | test.cpp:217:14:217:18 | value | provenance |  |
-| test.cpp:217:14:217:18 | value | test.cpp:218:11:218:11 | x | provenance | Sink:MaD:1 |
+| test.cpp:217:14:217:18 | value | test.cpp:218:11:218:11 | x | provenance | Sink:MaD:3 |
 | test.cpp:222:3:222:3 | operator[] output argument | test.cpp:223:12:223:12 | *s | provenance |  |
-| test.cpp:222:3:222:20 | ... = ... | test.cpp:222:3:222:3 | operator[] output argument | provenance | MaD:74 |
-| test.cpp:222:10:222:20 | call to ymlSource | test.cpp:222:3:222:20 | ... = ... | provenance | Src:MaD:35  |
-| test.cpp:223:12:223:12 | *s | test.cpp:223:13:223:15 | call to operator[] | provenance | MaD:73 |
+| test.cpp:222:3:222:20 | ... = ... | test.cpp:222:3:222:3 | operator[] output argument | provenance | MaD:90 |
+| test.cpp:222:10:222:18 | call to ymlSource | test.cpp:222:3:222:20 | ... = ... | provenance | Src:MaD:48  |
+| test.cpp:223:12:223:12 | *s | test.cpp:223:13:223:15 | call to operator[] | provenance | MaD:89 |
 | test.cpp:223:13:223:15 | call to operator[] | test.cpp:223:13:223:15 | call to operator[] | provenance |  |
-| test.cpp:223:13:223:15 | call to operator[] | test.cpp:224:11:224:11 | c | provenance | Sink:MaD:1 |
-| windows.cpp:22:15:22:29 | *call to GetCommandLineA | windows.cpp:22:15:22:29 | *call to GetCommandLineA | provenance | Src:MaD:3  |
+| test.cpp:223:13:223:15 | call to operator[] | test.cpp:224:11:224:11 | c | provenance | Sink:MaD:3 |
+| test.cpp:242:29:242:29 | *s [value] | test.cpp:243:10:243:10 | *s [value] | provenance |  |
+| test.cpp:243:10:243:10 | *s [value] | test.cpp:243:13:243:17 | value | provenance |  |
+| test.cpp:243:13:243:17 | value | test.cpp:243:13:243:17 | value | provenance | Sink:MaD:3 |
+| test.cpp:247:26:247:39 | call to ymlFieldSource | test.cpp:247:26:247:39 | call to ymlFieldSource [value] | provenance | Src:MaD:47  |
+| test.cpp:247:26:247:39 | call to ymlFieldSource [value] | test.cpp:248:10:248:16 | *wrapper [value] | provenance |  |
+| test.cpp:248:10:248:16 | *wrapper [value] | test.cpp:248:18:248:22 | value | provenance |  |
+| test.cpp:248:18:248:22 | value | test.cpp:248:18:248:22 | value | provenance | Sink:MaD:3 |
+| test.cpp:250:32:250:32 | source_from_callback_template output argument | test.cpp:250:32:250:32 | source_from_callback_template output argument [value] | provenance | Src:MaD:40  |
+| test.cpp:250:32:250:32 | source_from_callback_template output argument [value] | test.cpp:242:29:242:29 | *s [value] | provenance |  |
+| test.cpp:251:27:251:27 | source_from_callback_ptr output argument | test.cpp:251:27:251:27 | source_from_callback_ptr output argument [value] | provenance | Src:MaD:37  |
+| test.cpp:251:27:251:27 | source_from_callback_ptr output argument [value] | test.cpp:242:29:242:29 | *s [value] | provenance |  |
+| test.cpp:257:35:257:35 | *s [value] | test.cpp:258:12:258:12 | *s [value] | provenance |  |
+| test.cpp:258:12:258:12 | *s [value] | test.cpp:258:15:258:19 | value | provenance |  |
+| test.cpp:258:15:258:19 | value | test.cpp:258:15:258:19 | value | provenance | Sink:MaD:3 |
+| test.cpp:262:27:262:31 | source_from_callback_ptr output argument | test.cpp:262:27:262:31 | source_from_callback_ptr output argument [value] | provenance | Src:MaD:37  |
+| test.cpp:262:27:262:31 | source_from_callback_ptr output argument [value] | test.cpp:242:29:242:29 | *s [value] | provenance |  |
+| test.cpp:262:27:262:31 | source_from_callback_ptr output argument [value] | test.cpp:257:35:257:35 | *s [value] | provenance |  |
+| test.cpp:264:32:266:2 | source_from_callback_template output argument | test.cpp:264:32:266:2 | source_from_callback_template output argument [value] | provenance | Src:MaD:40  |
+| test.cpp:264:32:266:2 | source_from_callback_template output argument [value] | test.cpp:264:56:264:56 | *s [value] | provenance |  |
+| test.cpp:264:56:264:56 | *s [value] | test.cpp:265:11:265:11 | *s [value] | provenance |  |
+| test.cpp:265:11:265:11 | *s [value] | test.cpp:265:14:265:18 | value | provenance |  |
+| test.cpp:265:14:265:18 | value | test.cpp:265:14:265:18 | value | provenance | Sink:MaD:3 |
+| test.cpp:268:27:268:27 | source_from_callback_ptr output argument | test.cpp:268:27:268:27 | source_from_callback_ptr output argument [value] | provenance | Src:MaD:37  |
+| test.cpp:268:27:268:27 | source_from_callback_ptr output argument [value] | test.cpp:268:51:268:51 | *s [value] | provenance |  |
+| test.cpp:268:51:268:51 | *s [value] | test.cpp:269:11:269:11 | *s [value] | provenance |  |
+| test.cpp:269:11:269:11 | *s [value] | test.cpp:269:14:269:18 | value | provenance |  |
+| test.cpp:269:14:269:18 | value | test.cpp:269:14:269:18 | value | provenance | Sink:MaD:3 |
+| test.cpp:273:40:273:40 | *s [value] | test.cpp:274:12:274:12 | *s [value] | provenance |  |
+| test.cpp:274:12:274:12 | *s [value] | test.cpp:274:15:274:19 | value | provenance |  |
+| test.cpp:274:15:274:19 | value | test.cpp:274:15:274:19 | value | provenance | Sink:MaD:3 |
+| test.cpp:278:32:278:34 | source_from_callback_template output argument | test.cpp:278:32:278:34 | source_from_callback_template output argument [value] | provenance | Src:MaD:40  |
+| test.cpp:278:32:278:34 | source_from_callback_template output argument [value] | test.cpp:273:40:273:40 | *s [value] | provenance |  |
+| test.cpp:293:5:293:26 | *callback_returning_int | test.cpp:307:10:307:31 | call to callback_returning_int | provenance |  |
+| test.cpp:294:5:294:28 | *callback_returning_int_2 | test.cpp:310:10:310:33 | call to callback_returning_int_2 | provenance |  |
+| test.cpp:295:6:295:31 | **callback_returning_ptr_int | test.cpp:313:13:313:38 | *call to callback_returning_ptr_int | provenance |  |
+| test.cpp:297:5:297:20 | *return_ymlSource | test.cpp:318:37:318:52 | return_ymlSource | provenance | Sink:MaD:1 |
+| test.cpp:297:33:297:41 | call to ymlSource | test.cpp:297:5:297:20 | *return_ymlSource | provenance |  |
+| test.cpp:297:33:297:41 | call to ymlSource | test.cpp:297:5:297:20 | *return_ymlSource | provenance | Src:MaD:48  |
+| test.cpp:297:33:297:41 | call to ymlSource | test.cpp:297:33:297:41 | call to ymlSource | provenance | Src:MaD:48  |
+| test.cpp:299:6:299:28 | **return_ptr_to_ymlSource | test.cpp:321:36:321:58 | return_ptr_to_ymlSource | provenance | Sink:MaD:2 |
+| test.cpp:299:41:299:52 | *call to ymlSourcePtr | test.cpp:299:6:299:28 | **return_ptr_to_ymlSource | provenance |  |
+| test.cpp:299:41:299:52 | call to ymlSourcePtr | test.cpp:299:6:299:28 | **return_ptr_to_ymlSource | provenance | Src:MaD:49  |
+| test.cpp:299:41:299:52 | call to ymlSourcePtr | test.cpp:299:41:299:52 | *call to ymlSourcePtr | provenance | Src:MaD:49  |
+| test.cpp:304:11:304:22 | call to ymlSourcePtr | test.cpp:304:10:304:24 | * ... | provenance | Src:MaD:49 Sink:MaD:3 |
+| test.cpp:306:39:306:60 | source_from_callback_return_template output argument | test.cpp:293:5:293:26 | *callback_returning_int | provenance | Src:MaD:39  |
+| test.cpp:307:10:307:31 | call to callback_returning_int | test.cpp:307:10:307:31 | call to callback_returning_int | provenance | Sink:MaD:3 |
+| test.cpp:309:34:309:57 | source_from_callback_return_ptr output argument | test.cpp:294:5:294:28 | *callback_returning_int_2 | provenance | Src:MaD:38  |
+| test.cpp:310:10:310:33 | call to callback_returning_int_2 | test.cpp:310:10:310:33 | call to callback_returning_int_2 | provenance | Sink:MaD:3 |
+| test.cpp:312:38:312:63 | source_ptr_from_callback_return_ptr output argument | test.cpp:295:6:295:31 | **callback_returning_ptr_int | provenance | Src:MaD:41  |
+| test.cpp:313:13:313:38 | *call to callback_returning_ptr_int | test.cpp:313:13:313:38 | *call to callback_returning_ptr_int | provenance |  |
+| test.cpp:313:13:313:38 | *call to callback_returning_ptr_int | test.cpp:315:10:315:13 | * ... | provenance | Sink:MaD:3 |
+| test.cpp:317:39:317:39 | *operator() | test.cpp:317:37:317:64 | [...](...){...} | provenance | Sink:MaD:1 |
+| test.cpp:317:51:317:59 | call to ymlSource | test.cpp:317:39:317:39 | *operator() | provenance |  |
+| test.cpp:317:51:317:59 | call to ymlSource | test.cpp:317:39:317:39 | *operator() | provenance | Src:MaD:48  |
+| test.cpp:317:51:317:59 | call to ymlSource | test.cpp:317:51:317:59 | call to ymlSource | provenance | Src:MaD:48  |
+| test.cpp:320:38:320:38 | **operator() | test.cpp:320:36:320:36 | call to operator int *(*)() | provenance | Sink:MaD:2 |
+| test.cpp:320:50:320:61 | *call to ymlSourcePtr | test.cpp:320:38:320:38 | **operator() | provenance |  |
+| test.cpp:320:50:320:61 | call to ymlSourcePtr | test.cpp:320:38:320:38 | **operator() | provenance | Src:MaD:49  |
+| test.cpp:320:50:320:61 | call to ymlSourcePtr | test.cpp:320:50:320:61 | *call to ymlSourcePtr | provenance | Src:MaD:49  |
+| test.cpp:324:36:324:36 | p | test.cpp:325:10:325:10 | *p [value] | provenance | Src:MaD:43  |
+| test.cpp:324:36:324:36 | p | test.cpp:327:11:327:11 | *p [*pointer] | provenance | Src:MaD:42  |
+| test.cpp:324:53:324:53 | s | test.cpp:329:10:329:10 | *s [value] | provenance | Src:MaD:46  |
+| test.cpp:324:53:324:53 | s | test.cpp:331:11:331:11 | *s [*pointer] | provenance | Src:MaD:45  |
+| test.cpp:324:61:324:66 | source | test.cpp:334:10:334:16 | * ... | provenance | Src:MaD:44 Sink:MaD:3 |
+| test.cpp:325:10:325:10 | *p [value] | test.cpp:325:13:325:17 | value | provenance |  |
+| test.cpp:325:13:325:17 | value | test.cpp:325:13:325:17 | value | provenance | Sink:MaD:3 |
+| test.cpp:327:10:327:20 | * ... | test.cpp:327:10:327:20 | * ... | provenance | Sink:MaD:3 |
+| test.cpp:327:11:327:11 | *p [*pointer] | test.cpp:327:10:327:20 | * ... | provenance |  |
+| test.cpp:329:10:329:10 | *s [value] | test.cpp:329:12:329:16 | value | provenance |  |
+| test.cpp:329:12:329:16 | value | test.cpp:329:12:329:16 | value | provenance | Sink:MaD:3 |
+| test.cpp:331:10:331:19 | * ... | test.cpp:331:10:331:19 | * ... | provenance | Sink:MaD:3 |
+| test.cpp:331:11:331:11 | *s [*pointer] | test.cpp:331:10:331:19 | * ... | provenance |  |
+| test.cpp:341:30:341:32 | arg | test.cpp:342:5:342:17 | ... = ... | provenance |  |
+| test.cpp:342:5:342:8 | *this [post update] [s] | test.cpp:341:3:341:22 | *this [Return] [s] | provenance |  |
+| test.cpp:342:5:342:17 | ... = ... | test.cpp:342:5:342:8 | *this [post update] [s] | provenance |  |
+| test.cpp:345:38:345:40 | arg | test.cpp:346:5:346:18 | ... = ... | provenance |  |
+| test.cpp:346:5:346:8 | *this [post update] [ul] | test.cpp:345:3:345:22 | *this [Return] [ul] | provenance |  |
+| test.cpp:346:5:346:18 | ... = ... | test.cpp:346:5:346:8 | *this [post update] [ul] | provenance |  |
+| test.cpp:362:15:362:23 | call to ymlSource | test.cpp:362:15:362:25 | call to ymlSource | provenance | Src:MaD:48  |
+| test.cpp:362:15:362:25 | call to ymlSource | test.cpp:363:15:363:15 | *x | provenance |  |
+| test.cpp:363:5:363:5 | forward output argument [s] | test.cpp:365:30:365:30 | *f [s] | provenance |  |
+| test.cpp:363:5:363:5 | forward output argument [ul] | test.cpp:365:30:365:30 | *f [ul] | provenance |  |
+| test.cpp:363:15:363:15 | *x | test.cpp:341:30:341:32 | arg | provenance |  |
+| test.cpp:363:15:363:15 | *x | test.cpp:345:38:345:40 | arg | provenance |  |
+| test.cpp:363:15:363:15 | *x | test.cpp:363:5:363:5 | forward output argument [s] | provenance |  |
+| test.cpp:363:15:363:15 | *x | test.cpp:363:5:363:5 | forward output argument [ul] | provenance |  |
+| test.cpp:365:30:365:30 | *f [s] | test.cpp:365:32:365:34 | call to get [s] | provenance | MaD:88 |
+| test.cpp:365:30:365:30 | *f [ul] | test.cpp:365:32:365:34 | call to get [ul] | provenance | MaD:88 |
+| test.cpp:365:32:365:34 | call to get [s] | test.cpp:365:32:365:34 | call to get [s] | provenance |  |
+| test.cpp:365:32:365:34 | call to get [s] | test.cpp:366:13:366:13 | *c [s] | provenance |  |
+| test.cpp:365:32:365:34 | call to get [ul] | test.cpp:365:32:365:34 | call to get [ul] | provenance |  |
+| test.cpp:365:32:365:34 | call to get [ul] | test.cpp:367:13:367:13 | *c [ul] | provenance |  |
+| test.cpp:366:13:366:13 | *c [s] | test.cpp:366:13:366:15 | s | provenance |  |
+| test.cpp:366:13:366:13 | *c [s] | test.cpp:366:15:366:15 | s | provenance | Sink:MaD:3 |
+| test.cpp:366:13:366:15 | s | test.cpp:366:15:366:15 | s | provenance | Sink:MaD:3 |
+| test.cpp:367:13:367:13 | *c [ul] | test.cpp:367:13:367:16 | ul | provenance |  |
+| test.cpp:367:13:367:13 | *c [ul] | test.cpp:367:15:367:16 | ul | provenance | Sink:MaD:3 |
+| test.cpp:367:13:367:16 | ul | test.cpp:367:15:367:16 | ul | provenance | Sink:MaD:3 |
+| test.cpp:371:24:371:32 | call to ymlSource | test.cpp:371:24:371:34 | call to ymlSource | provenance | Src:MaD:48  |
+| test.cpp:371:24:371:34 | call to ymlSource | test.cpp:372:15:372:16 | *ul | provenance |  |
+| test.cpp:372:5:372:5 | forward output argument [s] | test.cpp:374:30:374:30 | *f [s] | provenance |  |
+| test.cpp:372:5:372:5 | forward output argument [ul] | test.cpp:374:30:374:30 | *f [ul] | provenance |  |
+| test.cpp:372:15:372:16 | *ul | test.cpp:341:30:341:32 | arg | provenance |  |
+| test.cpp:372:15:372:16 | *ul | test.cpp:345:38:345:40 | arg | provenance |  |
+| test.cpp:372:15:372:16 | *ul | test.cpp:372:5:372:5 | forward output argument [s] | provenance |  |
+| test.cpp:372:15:372:16 | *ul | test.cpp:372:5:372:5 | forward output argument [ul] | provenance |  |
+| test.cpp:374:30:374:30 | *f [s] | test.cpp:374:32:374:34 | call to get [s] | provenance | MaD:88 |
+| test.cpp:374:30:374:30 | *f [ul] | test.cpp:374:32:374:34 | call to get [ul] | provenance | MaD:88 |
+| test.cpp:374:32:374:34 | call to get [s] | test.cpp:374:32:374:34 | call to get [s] | provenance |  |
+| test.cpp:374:32:374:34 | call to get [s] | test.cpp:375:13:375:13 | *c [s] | provenance |  |
+| test.cpp:374:32:374:34 | call to get [ul] | test.cpp:374:32:374:34 | call to get [ul] | provenance |  |
+| test.cpp:374:32:374:34 | call to get [ul] | test.cpp:376:13:376:13 | *c [ul] | provenance |  |
+| test.cpp:375:13:375:13 | *c [s] | test.cpp:375:13:375:15 | s | provenance |  |
+| test.cpp:375:13:375:13 | *c [s] | test.cpp:375:15:375:15 | s | provenance | Sink:MaD:3 |
+| test.cpp:375:13:375:15 | s | test.cpp:375:15:375:15 | s | provenance | Sink:MaD:3 |
+| test.cpp:376:13:376:13 | *c [ul] | test.cpp:376:13:376:16 | ul | provenance |  |
+| test.cpp:376:13:376:13 | *c [ul] | test.cpp:376:15:376:16 | ul | provenance | Sink:MaD:3 |
+| test.cpp:376:13:376:16 | ul | test.cpp:376:15:376:16 | ul | provenance | Sink:MaD:3 |
+| test.cpp:398:11:398:19 | call to ymlSource | test.cpp:398:11:398:19 | call to ymlSource | provenance | Src:MaD:48  |
+| test.cpp:398:11:398:19 | call to ymlSource | test.cpp:399:38:399:38 | x | provenance |  |
+| test.cpp:399:15:399:36 | call to makeForwarded [x] | test.cpp:399:15:399:36 | call to makeForwarded [x] | provenance |  |
+| test.cpp:399:15:399:36 | call to makeForwarded [x] | test.cpp:400:11:400:11 | *e [x] | provenance |  |
+| test.cpp:399:38:399:38 | x | test.cpp:399:15:399:36 | call to makeForwarded [x] | provenance |  |
+| test.cpp:400:11:400:11 | *e [x] | test.cpp:400:13:400:13 | x | provenance |  |
+| test.cpp:400:13:400:13 | x | test.cpp:400:13:400:13 | x | provenance | Sink:MaD:3 |
+| test.cpp:405:11:405:19 | call to ymlSource | test.cpp:405:11:405:19 | call to ymlSource | provenance | Src:MaD:48  |
+| test.cpp:405:11:405:19 | call to ymlSource | test.cpp:406:22:406:22 | x | provenance |  |
+| test.cpp:406:3:406:3 | forwardToElement output argument [x] | test.cpp:407:15:407:15 | *f [x] | provenance |  |
+| test.cpp:406:22:406:22 | x | test.cpp:406:3:406:3 | forwardToElement output argument [x] | provenance |  |
+| test.cpp:407:15:407:15 | *f [x] | test.cpp:407:17:407:19 | call to get [x] | provenance | MaD:88 |
+| test.cpp:407:17:407:19 | call to get [x] | test.cpp:407:17:407:19 | call to get [x] | provenance |  |
+| test.cpp:407:17:407:19 | call to get [x] | test.cpp:408:11:408:11 | *e [x] | provenance |  |
+| test.cpp:408:11:408:11 | *e [x] | test.cpp:408:13:408:13 | x | provenance |  |
+| test.cpp:408:13:408:13 | x | test.cpp:408:13:408:13 | x | provenance | Sink:MaD:3 |
+| test.cpp:413:11:413:19 | call to ymlSource | test.cpp:413:11:413:19 | call to ymlSource | provenance | Src:MaD:48  |
+| test.cpp:413:11:413:19 | call to ymlSource | test.cpp:414:16:414:16 | *x | provenance |  |
+| test.cpp:414:3:414:3 | emplace output argument [element, x] | test.cpp:416:15:416:15 | *c [element, x] | provenance |  |
+| test.cpp:414:16:414:16 | *x | test.cpp:414:3:414:3 | emplace output argument [element, x] | provenance |  |
+| test.cpp:416:15:416:15 | *c [element, x] | test.cpp:416:20:416:22 | call to get [x] | provenance | MaD:87 |
+| test.cpp:416:20:416:22 | call to get [x] | test.cpp:416:20:416:22 | call to get [x] | provenance |  |
+| test.cpp:416:20:416:22 | call to get [x] | test.cpp:417:11:417:11 | *e [x] | provenance |  |
+| test.cpp:417:11:417:11 | *e [x] | test.cpp:417:13:417:13 | x | provenance |  |
+| test.cpp:417:13:417:13 | x | test.cpp:417:13:417:13 | x | provenance | Sink:MaD:3 |
+| test.cpp:422:3:422:8 | emplace output argument [element] | test.cpp:423:11:423:16 | *scalar [element] | provenance |  |
+| test.cpp:422:21:422:29 | call to ymlSource | test.cpp:422:21:422:29 | call to ymlSource | provenance | Src:MaD:48  |
+| test.cpp:422:21:422:29 | call to ymlSource | test.cpp:422:21:422:31 | call to ymlSource | provenance |  |
+| test.cpp:422:21:422:31 | call to ymlSource | test.cpp:422:3:422:8 | emplace output argument [element] | provenance |  |
+| test.cpp:423:11:423:16 | *scalar [element] | test.cpp:423:21:423:23 | call to get | provenance | MaD:87 |
+| test.cpp:423:21:423:23 | call to get | test.cpp:423:18:423:20 | call to get | provenance | Sink:MaD:3 |
+| test.cpp:426:3:426:9 | emplace output argument [element] | test.cpp:427:12:427:18 | *pointer [element] | provenance |  |
+| test.cpp:426:22:426:33 | *call to ymlSourcePtr | test.cpp:426:22:426:35 | **call to ymlSourcePtr | provenance |  |
+| test.cpp:426:22:426:33 | call to ymlSourcePtr | test.cpp:426:22:426:33 | *call to ymlSourcePtr | provenance | Src:MaD:49  |
+| test.cpp:426:22:426:35 | **call to ymlSourcePtr | test.cpp:426:3:426:9 | emplace output argument [element] | provenance |  |
+| test.cpp:427:12:427:18 | *pointer [element] | test.cpp:427:11:427:24 | * ... | provenance | MaD:87 Sink:MaD:3 |
+| test.cpp:437:11:437:19 | call to ymlSource | test.cpp:437:11:437:19 | call to ymlSource | provenance | Src:MaD:48  |
+| test.cpp:437:11:437:19 | call to ymlSource | test.cpp:438:16:438:16 | *x | provenance |  |
+| test.cpp:438:3:438:3 | emplace output argument [element, x] | test.cpp:440:34:440:34 | *c [element, x] | provenance |  |
+| test.cpp:438:16:438:16 | *x | test.cpp:438:3:438:3 | emplace output argument [element, x] | provenance |  |
+| test.cpp:440:34:440:34 | *c [element, x] | test.cpp:440:39:440:41 | call to get [x] | provenance | MaD:87 |
+| test.cpp:440:39:440:41 | call to get [x] | test.cpp:440:39:440:41 | call to get [x] | provenance |  |
+| test.cpp:440:39:440:41 | call to get [x] | test.cpp:441:11:441:11 | *e [x] | provenance |  |
+| test.cpp:441:11:441:11 | *e [x] | test.cpp:441:13:441:13 | x | provenance |  |
+| test.cpp:441:13:441:13 | x | test.cpp:441:13:441:13 | x | provenance | Sink:MaD:3 |
+| test.cpp:446:3:446:28 | *ElementWithOverloadedArity [post update] [x] | test.cpp:446:3:446:28 | *this [Return] [x] | provenance |  |
+| test.cpp:446:34:446:38 | first | test.cpp:446:45:446:49 | first | provenance |  |
+| test.cpp:446:45:446:49 | first | test.cpp:446:3:446:28 | *ElementWithOverloadedArity [post update] [x] | provenance |  |
+| test.cpp:447:3:447:28 | *ElementWithOverloadedArity [post update] [x] | test.cpp:447:3:447:28 | *this [Return] [x] | provenance |  |
+| test.cpp:447:39:447:44 | second | test.cpp:447:51:447:56 | second | provenance |  |
+| test.cpp:447:51:447:56 | second | test.cpp:447:3:447:28 | *ElementWithOverloadedArity [post update] [x] | provenance |  |
+| test.cpp:451:11:451:19 | call to ymlSource | test.cpp:451:11:451:19 | call to ymlSource | provenance | Src:MaD:48  |
+| test.cpp:451:11:451:19 | call to ymlSource | test.cpp:454:18:454:18 | *x | provenance |  |
+| test.cpp:451:11:451:19 | call to ymlSource | test.cpp:464:21:464:21 | *x | provenance |  |
+| test.cpp:454:5:454:5 | emplace output argument [element, x] | test.cpp:455:13:455:13 | *c [element, x] | provenance |  |
+| test.cpp:454:18:454:18 | *x | test.cpp:446:34:446:38 | first | provenance |  |
+| test.cpp:454:18:454:18 | *x | test.cpp:454:5:454:5 | emplace output argument [element, x] | provenance |  |
+| test.cpp:455:13:455:13 | *c [element, x] | test.cpp:455:18:455:20 | *call to get [x] | provenance | MaD:87 |
+| test.cpp:455:18:455:20 | *call to get [x] | test.cpp:455:21:455:21 | x | provenance |  |
+| test.cpp:455:21:455:21 | x | test.cpp:455:21:455:21 | x | provenance | Sink:MaD:3 |
+| test.cpp:464:5:464:5 | emplace output argument [element, x] | test.cpp:465:13:465:13 | *c [element, x] | provenance |  |
+| test.cpp:464:21:464:21 | *x | test.cpp:447:39:447:44 | second | provenance |  |
+| test.cpp:464:21:464:21 | *x | test.cpp:464:5:464:5 | emplace output argument [element, x] | provenance |  |
+| test.cpp:465:13:465:13 | *c [element, x] | test.cpp:465:18:465:20 | *call to get [x] | provenance | MaD:87 |
+| test.cpp:465:18:465:20 | *call to get [x] | test.cpp:465:21:465:21 | x | provenance |  |
+| test.cpp:465:21:465:21 | x | test.cpp:465:21:465:21 | x | provenance | Sink:MaD:3 |
+| test.cpp:472:5:472:5 | forward output argument | test.cpp:473:13:473:13 | *f | provenance |  |
+| test.cpp:472:15:472:23 | call to ymlSource | test.cpp:472:15:472:23 | call to ymlSource | provenance | Src:MaD:48  |
+| test.cpp:472:15:472:23 | call to ymlSource | test.cpp:472:15:472:25 | call to ymlSource | provenance |  |
+| test.cpp:472:15:472:25 | call to ymlSource | test.cpp:472:5:472:5 | forward output argument | provenance |  |
+| test.cpp:473:13:473:13 | *f | test.cpp:473:15:473:17 | call to get | provenance | MaD:88 |
+| test.cpp:473:15:473:17 | call to get | test.cpp:473:15:473:17 | call to get | provenance | Sink:MaD:3 |
+| test.cpp:477:5:477:5 | forward output argument | test.cpp:478:14:478:14 | *f | provenance |  |
+| test.cpp:477:15:477:26 | *call to ymlSourcePtr | test.cpp:477:15:477:28 | **call to ymlSourcePtr | provenance |  |
+| test.cpp:477:15:477:26 | call to ymlSourcePtr | test.cpp:477:15:477:26 | *call to ymlSourcePtr | provenance | Src:MaD:49  |
+| test.cpp:477:15:477:28 | **call to ymlSourcePtr | test.cpp:477:5:477:5 | forward output argument | provenance |  |
+| test.cpp:478:14:478:14 | *f | test.cpp:478:13:478:20 | * ... | provenance | MaD:88 Sink:MaD:3 |
 | windows.cpp:22:15:22:29 | *call to GetCommandLineA | windows.cpp:24:8:24:11 | * ... | provenance |  |
 | windows.cpp:22:15:22:29 | *call to GetCommandLineA | windows.cpp:27:36:27:38 | *cmd | provenance |  |
+| windows.cpp:22:15:22:29 | call to GetCommandLineA | windows.cpp:22:15:22:29 | *call to GetCommandLineA | provenance | Src:MaD:5  |
 | windows.cpp:27:17:27:34 | **call to CommandLineToArgvA | windows.cpp:27:17:27:34 | **call to CommandLineToArgvA | provenance |  |
 | windows.cpp:27:17:27:34 | **call to CommandLineToArgvA | windows.cpp:30:8:30:15 | * ... | provenance |  |
-| windows.cpp:27:36:27:38 | *cmd | windows.cpp:27:17:27:34 | **call to CommandLineToArgvA | provenance | MaD:45 |
-| windows.cpp:34:17:34:38 | *call to GetEnvironmentStringsA | windows.cpp:34:17:34:38 | *call to GetEnvironmentStringsA | provenance | Src:MaD:4  |
+| windows.cpp:27:36:27:38 | *cmd | windows.cpp:27:17:27:34 | **call to CommandLineToArgvA | provenance | MaD:59 |
 | windows.cpp:34:17:34:38 | *call to GetEnvironmentStringsA | windows.cpp:36:10:36:13 | * ... | provenance |  |
-| windows.cpp:39:36:39:38 | GetEnvironmentVariableA output argument | windows.cpp:41:10:41:13 | * ... | provenance | Src:MaD:5  |
+| windows.cpp:34:17:34:38 | call to GetEnvironmentStringsA | windows.cpp:34:17:34:38 | *call to GetEnvironmentStringsA | provenance | Src:MaD:6  |
+| windows.cpp:39:36:39:38 | GetEnvironmentVariableA output argument | windows.cpp:41:10:41:13 | * ... | provenance | Src:MaD:7  |
 | windows.cpp:147:16:147:27 | *lpOverlapped [*hEvent] | windows.cpp:149:42:149:53 | *lpOverlapped [*hEvent] | provenance |  |
 | windows.cpp:149:18:149:62 | *hEvent | windows.cpp:149:18:149:62 | *hEvent | provenance |  |
 | windows.cpp:149:18:149:62 | *hEvent | windows.cpp:151:8:151:14 | * ... | provenance |  |
@@ -245,37 +1488,37 @@ edges
 | windows.cpp:159:12:159:55 | hEvent | windows.cpp:160:8:160:8 | c | provenance |  |
 | windows.cpp:159:35:159:46 | *lpOverlapped [hEvent] | windows.cpp:159:12:159:55 | hEvent | provenance |  |
 | windows.cpp:159:35:159:46 | *lpOverlapped [hEvent] | windows.cpp:159:12:159:55 | hEvent | provenance |  |
-| windows.cpp:168:35:168:40 | ReadFile output argument | windows.cpp:170:10:170:16 | * ... | provenance | Src:MaD:17  |
-| windows.cpp:177:23:177:28 | ReadFileEx output argument | windows.cpp:179:10:179:16 | * ... | provenance | Src:MaD:18  |
-| windows.cpp:189:21:189:26 | ReadFile output argument | windows.cpp:190:5:190:56 | *... = ... | provenance | Src:MaD:17  |
+| windows.cpp:168:35:168:40 | ReadFile output argument | windows.cpp:170:10:170:16 | * ... | provenance | Src:MaD:19  |
+| windows.cpp:177:23:177:28 | ReadFileEx output argument | windows.cpp:179:10:179:16 | * ... | provenance | Src:MaD:20  |
+| windows.cpp:189:21:189:26 | ReadFile output argument | windows.cpp:190:5:190:56 | *... = ... | provenance | Src:MaD:19  |
 | windows.cpp:190:5:190:14 | *overlapped [post update] [*hEvent] | windows.cpp:192:53:192:63 | *& ... [*hEvent] | provenance |  |
 | windows.cpp:190:5:190:56 | *... = ... | windows.cpp:190:5:190:14 | *overlapped [post update] [*hEvent] | provenance |  |
-| windows.cpp:192:53:192:63 | *& ... [*hEvent] | windows.cpp:147:16:147:27 | *lpOverlapped [*hEvent] | provenance | MaD:52 |
-| windows.cpp:198:21:198:26 | ReadFile output argument | windows.cpp:199:5:199:57 | ... = ... | provenance | Src:MaD:17  |
+| windows.cpp:192:53:192:63 | *& ... [*hEvent] | windows.cpp:147:16:147:27 | *lpOverlapped [*hEvent] | provenance | MaD:66 |
+| windows.cpp:198:21:198:26 | ReadFile output argument | windows.cpp:199:5:199:57 | ... = ... | provenance | Src:MaD:19  |
 | windows.cpp:199:5:199:14 | *overlapped [post update] [hEvent] | windows.cpp:201:53:201:63 | *& ... [hEvent] | provenance |  |
 | windows.cpp:199:5:199:57 | ... = ... | windows.cpp:199:5:199:14 | *overlapped [post update] [hEvent] | provenance |  |
-| windows.cpp:201:53:201:63 | *& ... [hEvent] | windows.cpp:157:16:157:27 | *lpOverlapped [hEvent] | provenance | MaD:52 |
-| windows.cpp:209:84:209:89 | NtReadFile output argument | windows.cpp:211:10:211:16 | * ... | provenance | Src:MaD:16  |
-| windows.cpp:286:23:286:35 | *call to MapViewOfFile | windows.cpp:286:23:286:35 | *call to MapViewOfFile | provenance | Src:MaD:12  |
+| windows.cpp:201:53:201:63 | *& ... [hEvent] | windows.cpp:157:16:157:27 | *lpOverlapped [hEvent] | provenance | MaD:66 |
+| windows.cpp:209:84:209:89 | NtReadFile output argument | windows.cpp:211:10:211:16 | * ... | provenance | Src:MaD:18  |
 | windows.cpp:286:23:286:35 | *call to MapViewOfFile | windows.cpp:287:20:287:52 | *pMapView | provenance |  |
+| windows.cpp:286:23:286:35 | call to MapViewOfFile | windows.cpp:286:23:286:35 | *call to MapViewOfFile | provenance | Src:MaD:14  |
 | windows.cpp:287:20:287:52 | *pMapView | windows.cpp:289:10:289:16 | * ... | provenance |  |
-| windows.cpp:293:23:293:36 | *call to MapViewOfFile2 | windows.cpp:293:23:293:36 | *call to MapViewOfFile2 | provenance | Src:MaD:9  |
 | windows.cpp:293:23:293:36 | *call to MapViewOfFile2 | windows.cpp:294:20:294:52 | *pMapView | provenance |  |
+| windows.cpp:293:23:293:36 | call to MapViewOfFile2 | windows.cpp:293:23:293:36 | *call to MapViewOfFile2 | provenance | Src:MaD:11  |
 | windows.cpp:294:20:294:52 | *pMapView | windows.cpp:296:10:296:16 | * ... | provenance |  |
-| windows.cpp:302:23:302:36 | *call to MapViewOfFile3 | windows.cpp:302:23:302:36 | *call to MapViewOfFile3 | provenance | Src:MaD:10  |
 | windows.cpp:302:23:302:36 | *call to MapViewOfFile3 | windows.cpp:303:20:303:52 | *pMapView | provenance |  |
+| windows.cpp:302:23:302:36 | call to MapViewOfFile3 | windows.cpp:302:23:302:36 | *call to MapViewOfFile3 | provenance | Src:MaD:12  |
 | windows.cpp:303:20:303:52 | *pMapView | windows.cpp:305:10:305:16 | * ... | provenance |  |
-| windows.cpp:311:23:311:43 | *call to MapViewOfFile3FromApp | windows.cpp:311:23:311:43 | *call to MapViewOfFile3FromApp | provenance | Src:MaD:11  |
 | windows.cpp:311:23:311:43 | *call to MapViewOfFile3FromApp | windows.cpp:312:20:312:52 | *pMapView | provenance |  |
+| windows.cpp:311:23:311:43 | call to MapViewOfFile3FromApp | windows.cpp:311:23:311:43 | *call to MapViewOfFile3FromApp | provenance | Src:MaD:13  |
 | windows.cpp:312:20:312:52 | *pMapView | windows.cpp:314:10:314:16 | * ... | provenance |  |
-| windows.cpp:318:23:318:37 | *call to MapViewOfFileEx | windows.cpp:318:23:318:37 | *call to MapViewOfFileEx | provenance | Src:MaD:13  |
 | windows.cpp:318:23:318:37 | *call to MapViewOfFileEx | windows.cpp:319:20:319:52 | *pMapView | provenance |  |
+| windows.cpp:318:23:318:37 | call to MapViewOfFileEx | windows.cpp:318:23:318:37 | *call to MapViewOfFileEx | provenance | Src:MaD:15  |
 | windows.cpp:319:20:319:52 | *pMapView | windows.cpp:321:10:321:16 | * ... | provenance |  |
-| windows.cpp:325:23:325:42 | *call to MapViewOfFileFromApp | windows.cpp:325:23:325:42 | *call to MapViewOfFileFromApp | provenance | Src:MaD:14  |
 | windows.cpp:325:23:325:42 | *call to MapViewOfFileFromApp | windows.cpp:326:20:326:52 | *pMapView | provenance |  |
+| windows.cpp:325:23:325:42 | call to MapViewOfFileFromApp | windows.cpp:325:23:325:42 | *call to MapViewOfFileFromApp | provenance | Src:MaD:16  |
 | windows.cpp:326:20:326:52 | *pMapView | windows.cpp:328:10:328:16 | * ... | provenance |  |
-| windows.cpp:332:23:332:40 | *call to MapViewOfFileNuma2 | windows.cpp:332:23:332:40 | *call to MapViewOfFileNuma2 | provenance | Src:MaD:15  |
 | windows.cpp:332:23:332:40 | *call to MapViewOfFileNuma2 | windows.cpp:333:20:333:52 | *pMapView | provenance |  |
+| windows.cpp:332:23:332:40 | call to MapViewOfFileNuma2 | windows.cpp:332:23:332:40 | *call to MapViewOfFileNuma2 | provenance | Src:MaD:17  |
 | windows.cpp:333:20:333:52 | *pMapView | windows.cpp:335:10:335:16 | * ... | provenance |  |
 | windows.cpp:403:26:403:36 | *lpParameter [x] | windows.cpp:405:10:405:25 | *lpParameter [x] | provenance |  |
 | windows.cpp:405:10:405:25 | *lpParameter [x] | windows.cpp:406:8:406:8 | *s [x] | provenance |  |
@@ -291,9 +1534,9 @@ edges
 | windows.cpp:431:3:431:3 | *s [post update] [x] | windows.cpp:464:7:464:8 | *& ... [x] | provenance |  |
 | windows.cpp:431:3:431:16 | ... = ... | windows.cpp:431:3:431:3 | *s [post update] [x] | provenance |  |
 | windows.cpp:431:9:431:14 | call to source | windows.cpp:431:3:431:16 | ... = ... | provenance |  |
-| windows.cpp:439:7:439:8 | *& ... [x] | windows.cpp:403:26:403:36 | *lpParameter [x] | provenance | MaD:48 |
-| windows.cpp:451:7:451:8 | *& ... [x] | windows.cpp:410:26:410:36 | *lpParameter [x] | provenance | MaD:46 |
-| windows.cpp:464:7:464:8 | *& ... [x] | windows.cpp:417:26:417:36 | *lpParameter [x] | provenance | MaD:47 |
+| windows.cpp:439:7:439:8 | *& ... [x] | windows.cpp:403:26:403:36 | *lpParameter [x] | provenance | MaD:62 |
+| windows.cpp:451:7:451:8 | *& ... [x] | windows.cpp:410:26:410:36 | *lpParameter [x] | provenance | MaD:60 |
+| windows.cpp:464:7:464:8 | *& ... [x] | windows.cpp:417:26:417:36 | *lpParameter [x] | provenance | MaD:61 |
 | windows.cpp:533:11:533:16 | call to source | windows.cpp:533:11:533:16 | call to source | provenance |  |
 | windows.cpp:533:11:533:16 | call to source | windows.cpp:537:40:537:41 | *& ... | provenance |  |
 | windows.cpp:533:11:533:16 | call to source | windows.cpp:542:38:542:39 | *& ... | provenance |  |
@@ -302,158 +1545,1094 @@ edges
 | windows.cpp:533:11:533:16 | call to source | windows.cpp:568:32:568:33 | *& ... | provenance |  |
 | windows.cpp:533:11:533:16 | call to source | windows.cpp:573:40:573:41 | *& ... | provenance |  |
 | windows.cpp:537:27:537:37 | RtlCopyVolatileMemory output argument | windows.cpp:538:10:538:23 | access to array | provenance |  |
-| windows.cpp:537:40:537:41 | *& ... | windows.cpp:537:27:537:37 | RtlCopyVolatileMemory output argument | provenance | MaD:57 |
+| windows.cpp:537:40:537:41 | *& ... | windows.cpp:537:27:537:37 | RtlCopyVolatileMemory output argument | provenance | MaD:71 |
 | windows.cpp:542:25:542:35 | RtlCopyDeviceMemory output argument | windows.cpp:543:10:543:23 | access to array | provenance |  |
-| windows.cpp:542:38:542:39 | *& ... | windows.cpp:542:25:542:35 | RtlCopyDeviceMemory output argument | provenance | MaD:53 |
+| windows.cpp:542:38:542:39 | *& ... | windows.cpp:542:25:542:35 | RtlCopyDeviceMemory output argument | provenance | MaD:67 |
 | windows.cpp:547:19:547:29 | RtlCopyMemory output argument | windows.cpp:548:10:548:23 | access to array | provenance |  |
-| windows.cpp:547:32:547:33 | *& ... | windows.cpp:547:19:547:29 | RtlCopyMemory output argument | provenance | MaD:54 |
+| windows.cpp:547:32:547:33 | *& ... | windows.cpp:547:19:547:29 | RtlCopyMemory output argument | provenance | MaD:68 |
 | windows.cpp:552:30:552:40 | RtlCopyMemoryNonTemporal output argument | windows.cpp:553:10:553:23 | access to array | provenance |  |
-| windows.cpp:552:43:552:44 | *& ... | windows.cpp:552:30:552:40 | RtlCopyMemoryNonTemporal output argument | provenance | MaD:55 |
+| windows.cpp:552:43:552:44 | *& ... | windows.cpp:552:30:552:40 | RtlCopyMemoryNonTemporal output argument | provenance | MaD:69 |
 | windows.cpp:559:5:559:24 | ... = ... | windows.cpp:561:39:561:44 | *buffer | provenance |  |
 | windows.cpp:559:17:559:24 | call to source | windows.cpp:559:5:559:24 | ... = ... | provenance |  |
 | windows.cpp:561:26:561:36 | RtlInitUnicodeString output argument [*Buffer] | windows.cpp:562:10:562:19 | *src_string [*Buffer] | provenance |  |
 | windows.cpp:561:26:561:36 | RtlInitUnicodeString output argument [*Buffer] | windows.cpp:563:40:563:50 | *& ... [*Buffer] | provenance |  |
-| windows.cpp:561:39:561:44 | *buffer | windows.cpp:561:26:561:36 | RtlInitUnicodeString output argument [*Buffer] | provenance | MaD:58 |
+| windows.cpp:561:39:561:44 | *buffer | windows.cpp:561:26:561:36 | RtlInitUnicodeString output argument [*Buffer] | provenance | MaD:72 |
 | windows.cpp:562:10:562:19 | *src_string [*Buffer] | windows.cpp:562:10:562:29 | access to array | provenance |  |
 | windows.cpp:562:10:562:19 | *src_string [*Buffer] | windows.cpp:562:21:562:26 | *Buffer | provenance |  |
 | windows.cpp:562:21:562:26 | *Buffer | windows.cpp:562:10:562:29 | access to array | provenance |  |
 | windows.cpp:563:26:563:37 | RtlCopyUnicodeString output argument [*Buffer] | windows.cpp:564:10:564:20 | *dest_string [*Buffer] | provenance |  |
-| windows.cpp:563:40:563:50 | *& ... [*Buffer] | windows.cpp:563:26:563:37 | RtlCopyUnicodeString output argument [*Buffer] | provenance | MaD:56 |
+| windows.cpp:563:40:563:50 | *& ... [*Buffer] | windows.cpp:563:26:563:37 | RtlCopyUnicodeString output argument [*Buffer] | provenance | MaD:70 |
 | windows.cpp:564:10:564:20 | *dest_string [*Buffer] | windows.cpp:564:10:564:30 | access to array | provenance |  |
 | windows.cpp:564:10:564:20 | *dest_string [*Buffer] | windows.cpp:564:22:564:27 | *Buffer | provenance |  |
 | windows.cpp:564:22:564:27 | *Buffer | windows.cpp:564:10:564:30 | access to array | provenance |  |
 | windows.cpp:568:19:568:29 | RtlMoveMemory output argument | windows.cpp:569:10:569:23 | access to array | provenance |  |
-| windows.cpp:568:32:568:33 | *& ... | windows.cpp:568:19:568:29 | RtlMoveMemory output argument | provenance | MaD:59 |
+| windows.cpp:568:32:568:33 | *& ... | windows.cpp:568:19:568:29 | RtlMoveMemory output argument | provenance | MaD:73 |
 | windows.cpp:573:27:573:37 | RtlMoveVolatileMemory output argument | windows.cpp:574:10:574:23 | access to array | provenance |  |
-| windows.cpp:573:40:573:41 | *& ... | windows.cpp:573:27:573:37 | RtlMoveVolatileMemory output argument | provenance | MaD:60 |
-| windows.cpp:645:45:645:50 | WinHttpReadData output argument | windows.cpp:647:10:647:16 | * ... | provenance | Src:MaD:33  |
-| windows.cpp:652:48:652:53 | WinHttpReadDataEx output argument | windows.cpp:654:10:654:16 | * ... | provenance | Src:MaD:34  |
-| windows.cpp:659:47:659:52 | WinHttpQueryHeaders output argument | windows.cpp:661:10:661:16 | * ... | provenance | Src:MaD:29  |
-| windows.cpp:669:70:669:79 | WinHttpQueryHeadersEx output argument | windows.cpp:673:10:673:29 | * ... | provenance | Src:MaD:31  |
-| windows.cpp:669:82:669:87 | WinHttpQueryHeadersEx output argument | windows.cpp:671:10:671:16 | * ... | provenance | Src:MaD:32  |
-| windows.cpp:669:105:669:112 | WinHttpQueryHeadersEx output argument | windows.cpp:675:10:675:27 | * ... | provenance | Src:MaD:30  |
+| windows.cpp:573:40:573:41 | *& ... | windows.cpp:573:27:573:37 | RtlMoveVolatileMemory output argument | provenance | MaD:74 |
+| windows.cpp:645:45:645:50 | WinHttpReadData output argument | windows.cpp:647:10:647:16 | * ... | provenance | Src:MaD:35  |
+| windows.cpp:652:48:652:53 | WinHttpReadDataEx output argument | windows.cpp:654:10:654:16 | * ... | provenance | Src:MaD:36  |
+| windows.cpp:659:47:659:52 | WinHttpQueryHeaders output argument | windows.cpp:661:10:661:16 | * ... | provenance | Src:MaD:31  |
+| windows.cpp:669:70:669:79 | WinHttpQueryHeadersEx output argument | windows.cpp:673:10:673:29 | * ... | provenance | Src:MaD:33  |
+| windows.cpp:669:82:669:87 | WinHttpQueryHeadersEx output argument | windows.cpp:671:10:671:16 | * ... | provenance | Src:MaD:34  |
+| windows.cpp:669:105:669:112 | WinHttpQueryHeadersEx output argument | windows.cpp:675:10:675:27 | * ... | provenance | Src:MaD:32  |
 | windows.cpp:728:5:728:28 | ... = ... | windows.cpp:729:35:729:35 | *x | provenance |  |
 | windows.cpp:728:12:728:28 | call to source | windows.cpp:728:5:728:28 | ... = ... | provenance |  |
-| windows.cpp:729:35:729:35 | *x | windows.cpp:729:44:729:57 | WinHttpCrackUrl output argument | provenance | MaD:64 |
+| windows.cpp:729:35:729:35 | *x | windows.cpp:729:44:729:57 | WinHttpCrackUrl output argument | provenance | MaD:78 |
 | windows.cpp:729:44:729:57 | WinHttpCrackUrl output argument | windows.cpp:731:10:731:36 | * ... | provenance |  |
 | windows.cpp:729:44:729:57 | WinHttpCrackUrl output argument | windows.cpp:733:10:733:35 | * ... | provenance |  |
 | windows.cpp:729:44:729:57 | WinHttpCrackUrl output argument | windows.cpp:735:10:735:37 | * ... | provenance |  |
-| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:901:15:901:53 | *& ... | provenance | Src:MaD:7  |
-| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:905:10:905:31 | * ... | provenance | Src:MaD:7  |
-| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:907:10:907:42 | * ... | provenance | Src:MaD:7  |
-| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:909:10:909:57 | * ... | provenance | Src:MaD:7  |
-| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:911:10:911:60 | * ... | provenance | Src:MaD:7  |
-| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:912:54:912:63 | FileHandle | provenance | Src:MaD:7  |
-| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:914:10:914:70 | * ... | provenance | Src:MaD:7  |
-| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:916:10:916:72 | * ... | provenance | Src:MaD:7  |
-| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:918:10:918:64 | * ... | provenance | Src:MaD:7  |
-| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:920:10:920:51 | * ... | provenance | Src:MaD:7  |
-| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:922:10:922:52 | * ... | provenance | Src:MaD:7  |
-| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:924:10:924:63 | * ... | provenance | Src:MaD:7  |
+| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:901:15:901:53 | *& ... | provenance | Src:MaD:9  |
+| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:905:10:905:31 | * ... | provenance | Src:MaD:9  |
+| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:907:10:907:42 | * ... | provenance | Src:MaD:9  |
+| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:909:10:909:57 | * ... | provenance | Src:MaD:9  |
+| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:911:10:911:60 | * ... | provenance | Src:MaD:9  |
+| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:912:54:912:63 | FileHandle | provenance | Src:MaD:9  |
+| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:914:10:914:70 | * ... | provenance | Src:MaD:9  |
+| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:916:10:916:72 | * ... | provenance | Src:MaD:9  |
+| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:918:10:918:64 | * ... | provenance | Src:MaD:9  |
+| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:920:10:920:51 | * ... | provenance | Src:MaD:9  |
+| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:922:10:922:52 | * ... | provenance | Src:MaD:9  |
+| windows.cpp:900:64:900:77 | HttpReceiveHttpRequest output argument | windows.cpp:924:10:924:63 | * ... | provenance | Src:MaD:9  |
 | windows.cpp:901:15:901:53 | *& ... | windows.cpp:903:10:903:11 | * ... | provenance |  |
-| windows.cpp:929:70:929:75 | HttpReceiveRequestEntityBody output argument | windows.cpp:931:10:931:16 | * ... | provenance | Src:MaD:8  |
-| windows.cpp:936:70:936:78 | HttpReceiveClientCertificate output argument | windows.cpp:937:15:937:48 | *& ... | provenance | Src:MaD:6  |
-| windows.cpp:936:70:936:78 | HttpReceiveClientCertificate output argument | windows.cpp:941:10:941:31 | * ... | provenance | Src:MaD:6  |
+| windows.cpp:929:70:929:75 | HttpReceiveRequestEntityBody output argument | windows.cpp:931:10:931:16 | * ... | provenance | Src:MaD:10  |
+| windows.cpp:936:70:936:78 | HttpReceiveClientCertificate output argument | windows.cpp:937:15:937:48 | *& ... | provenance | Src:MaD:8  |
+| windows.cpp:936:70:936:78 | HttpReceiveClientCertificate output argument | windows.cpp:941:10:941:31 | * ... | provenance | Src:MaD:8  |
 | windows.cpp:937:15:937:48 | *& ... | windows.cpp:939:10:939:11 | * ... | provenance |  |
-| windows.cpp:1009:35:1009:38 | RegQueryValueA output argument | windows.cpp:1011:10:1011:14 | * ... | provenance | Src:MaD:25  |
-| windows.cpp:1016:36:1016:39 | RegQueryValueW output argument | windows.cpp:1018:10:1018:14 | * ... | provenance | Src:MaD:28  |
-| windows.cpp:1024:53:1024:56 | RegQueryValueExA output argument | windows.cpp:1026:10:1026:14 | * ... | provenance | Src:MaD:26  |
-| windows.cpp:1032:54:1032:57 | RegQueryValueExW output argument | windows.cpp:1034:10:1034:14 | * ... | provenance | Src:MaD:27  |
-| windows.cpp:1040:46:1040:49 | RegQueryMultipleValuesA output argument | windows.cpp:1042:10:1042:14 | * ... | provenance | Src:MaD:23  |
-| windows.cpp:1048:46:1048:49 | RegQueryMultipleValuesW output argument | windows.cpp:1050:10:1050:14 | * ... | provenance | Src:MaD:24  |
-| windows.cpp:1056:53:1056:56 | RegGetValueA output argument | windows.cpp:1058:10:1058:14 | * ... | provenance | Src:MaD:21  |
-| windows.cpp:1065:55:1065:58 | RegGetValueW output argument | windows.cpp:1067:10:1067:14 | * ... | provenance | Src:MaD:22  |
-| windows.cpp:1075:28:1075:36 | RegEnumValueA output argument | windows.cpp:1079:10:1079:19 | * ... | provenance | Src:MaD:19  |
-| windows.cpp:1075:71:1075:74 | RegEnumValueA output argument | windows.cpp:1077:10:1077:14 | * ... | provenance | Src:MaD:19  |
-| windows.cpp:1087:28:1087:36 | RegEnumValueW output argument | windows.cpp:1091:10:1091:19 | * ... | provenance | Src:MaD:20  |
-| windows.cpp:1087:71:1087:74 | RegEnumValueW output argument | windows.cpp:1089:10:1089:14 | * ... | provenance | Src:MaD:20  |
+| windows.cpp:1009:35:1009:38 | RegQueryValueA output argument | windows.cpp:1011:10:1011:14 | * ... | provenance | Src:MaD:27  |
+| windows.cpp:1016:36:1016:39 | RegQueryValueW output argument | windows.cpp:1018:10:1018:14 | * ... | provenance | Src:MaD:30  |
+| windows.cpp:1024:53:1024:56 | RegQueryValueExA output argument | windows.cpp:1026:10:1026:14 | * ... | provenance | Src:MaD:28  |
+| windows.cpp:1032:54:1032:57 | RegQueryValueExW output argument | windows.cpp:1034:10:1034:14 | * ... | provenance | Src:MaD:29  |
+| windows.cpp:1040:46:1040:49 | RegQueryMultipleValuesA output argument | windows.cpp:1042:10:1042:14 | * ... | provenance | Src:MaD:25  |
+| windows.cpp:1048:46:1048:49 | RegQueryMultipleValuesW output argument | windows.cpp:1050:10:1050:14 | * ... | provenance | Src:MaD:26  |
+| windows.cpp:1056:53:1056:56 | RegGetValueA output argument | windows.cpp:1058:10:1058:14 | * ... | provenance | Src:MaD:23  |
+| windows.cpp:1065:55:1065:58 | RegGetValueW output argument | windows.cpp:1067:10:1067:14 | * ... | provenance | Src:MaD:24  |
+| windows.cpp:1075:28:1075:36 | RegEnumValueA output argument | windows.cpp:1079:10:1079:19 | * ... | provenance | Src:MaD:21  |
+| windows.cpp:1075:71:1075:74 | RegEnumValueA output argument | windows.cpp:1077:10:1077:14 | * ... | provenance | Src:MaD:21  |
+| windows.cpp:1087:28:1087:36 | RegEnumValueW output argument | windows.cpp:1091:10:1091:19 | * ... | provenance | Src:MaD:22  |
+| windows.cpp:1087:71:1087:74 | RegEnumValueW output argument | windows.cpp:1089:10:1089:14 | * ... | provenance | Src:MaD:22  |
 | windows.cpp:1122:5:1122:27 | ... = ... | windows.cpp:1124:19:1124:21 | *str | provenance |  |
 | windows.cpp:1122:14:1122:27 | call to source | windows.cpp:1122:5:1122:27 | ... = ... | provenance |  |
-| windows.cpp:1124:19:1124:21 | *str | windows.cpp:1124:24:1124:27 | IIDFromString output argument | provenance | MaD:50 |
+| windows.cpp:1124:19:1124:21 | *str | windows.cpp:1124:24:1124:27 | IIDFromString output argument | provenance | MaD:64 |
 | windows.cpp:1124:24:1124:27 | IIDFromString output argument | windows.cpp:1125:10:1125:12 | iid | provenance |  |
 | windows.cpp:1128:15:1128:20 | call to source | windows.cpp:1128:15:1128:20 | call to source | provenance |  |
 | windows.cpp:1128:15:1128:20 | call to source | windows.cpp:1130:19:1130:21 | *iid | provenance |  |
-| windows.cpp:1130:19:1130:21 | *iid | windows.cpp:1130:24:1130:27 | StringFromIID output argument | provenance | MaD:63 |
+| windows.cpp:1130:19:1130:21 | *iid | windows.cpp:1130:24:1130:27 | StringFromIID output argument | provenance | MaD:77 |
 | windows.cpp:1130:24:1130:27 | StringFromIID output argument | windows.cpp:1132:10:1132:13 | * ... | provenance |  |
 | windows.cpp:1135:19:1135:24 | call to source | windows.cpp:1135:19:1135:24 | call to source | provenance |  |
 | windows.cpp:1135:19:1135:24 | call to source | windows.cpp:1137:21:1137:25 | *clsid | provenance |  |
-| windows.cpp:1137:21:1137:25 | *clsid | windows.cpp:1137:28:1137:31 | ProgIDFromCLSID output argument | provenance | MaD:51 |
+| windows.cpp:1137:21:1137:25 | *clsid | windows.cpp:1137:28:1137:31 | ProgIDFromCLSID output argument | provenance | MaD:65 |
 | windows.cpp:1137:28:1137:31 | ProgIDFromCLSID output argument | windows.cpp:1139:10:1139:13 | * ... | provenance |  |
 | windows.cpp:1143:5:1143:30 | ... = ... | windows.cpp:1145:21:1145:26 | *progID | provenance |  |
 | windows.cpp:1143:17:1143:30 | call to source | windows.cpp:1143:5:1143:30 | ... = ... | provenance |  |
-| windows.cpp:1145:21:1145:26 | *progID | windows.cpp:1145:29:1145:34 | CLSIDFromProgID output argument | provenance | MaD:43 |
+| windows.cpp:1145:21:1145:26 | *progID | windows.cpp:1145:29:1145:34 | CLSIDFromProgID output argument | provenance | MaD:57 |
 | windows.cpp:1145:29:1145:34 | CLSIDFromProgID output argument | windows.cpp:1146:10:1146:14 | clsid | provenance |  |
 | windows.cpp:1150:5:1150:27 | ... = ... | windows.cpp:1152:21:1152:23 | *str | provenance |  |
 | windows.cpp:1150:14:1150:27 | call to source | windows.cpp:1150:5:1150:27 | ... = ... | provenance |  |
-| windows.cpp:1152:21:1152:23 | *str | windows.cpp:1152:26:1152:31 | CLSIDFromString output argument | provenance | MaD:44 |
+| windows.cpp:1152:21:1152:23 | *str | windows.cpp:1152:26:1152:31 | CLSIDFromString output argument | provenance | MaD:58 |
 | windows.cpp:1152:26:1152:31 | CLSIDFromString output argument | windows.cpp:1153:10:1153:14 | clsid | provenance |  |
 | windows.cpp:1156:19:1156:24 | call to source | windows.cpp:1156:19:1156:24 | call to source | provenance |  |
 | windows.cpp:1156:19:1156:24 | call to source | windows.cpp:1158:21:1158:25 | *clsid | provenance |  |
-| windows.cpp:1158:21:1158:25 | *clsid | windows.cpp:1158:28:1158:31 | StringFromCLSID output argument | provenance | MaD:61 |
+| windows.cpp:1158:21:1158:25 | *clsid | windows.cpp:1158:28:1158:31 | StringFromCLSID output argument | provenance | MaD:75 |
 | windows.cpp:1158:28:1158:31 | StringFromCLSID output argument | windows.cpp:1160:10:1160:13 | * ... | provenance |  |
 | windows.cpp:1164:5:1164:27 | ... = ... | windows.cpp:1166:20:1166:22 | *str | provenance |  |
 | windows.cpp:1164:14:1164:27 | call to source | windows.cpp:1164:5:1164:27 | ... = ... | provenance |  |
-| windows.cpp:1166:20:1166:22 | *str | windows.cpp:1166:25:1166:29 | GUIDFromString output argument | provenance | MaD:49 |
+| windows.cpp:1166:20:1166:22 | *str | windows.cpp:1166:25:1166:29 | GUIDFromString output argument | provenance | MaD:63 |
 | windows.cpp:1166:25:1166:29 | GUIDFromString output argument | windows.cpp:1167:10:1167:13 | guid | provenance |  |
 | windows.cpp:1170:17:1170:22 | call to source | windows.cpp:1170:17:1170:22 | call to source | provenance |  |
 | windows.cpp:1170:17:1170:22 | call to source | windows.cpp:1172:21:1172:24 | *guid | provenance |  |
-| windows.cpp:1172:21:1172:24 | *guid | windows.cpp:1172:27:1172:29 | StringFromGUID2 output argument | provenance | MaD:62 |
+| windows.cpp:1172:21:1172:24 | *guid | windows.cpp:1172:27:1172:29 | StringFromGUID2 output argument | provenance | MaD:76 |
 | windows.cpp:1172:27:1172:29 | StringFromGUID2 output argument | windows.cpp:1174:10:1174:13 | * ... | provenance |  |
 nodes
-| asio_streams.cpp:87:34:87:44 | read_until output argument | semmle.label | read_until output argument |
-| asio_streams.cpp:91:7:91:17 | recv_buffer | semmle.label | recv_buffer |
-| asio_streams.cpp:93:29:93:39 | *recv_buffer | semmle.label | *recv_buffer |
-| asio_streams.cpp:97:37:97:44 | call to source | semmle.label | call to source |
-| asio_streams.cpp:98:7:98:14 | send_str | semmle.label | send_str |
-| asio_streams.cpp:100:44:100:62 | call to buffer | semmle.label | call to buffer |
-| asio_streams.cpp:100:44:100:62 | call to buffer | semmle.label | call to buffer |
-| asio_streams.cpp:100:64:100:71 | *send_str | semmle.label | *send_str |
-| asio_streams.cpp:101:7:101:17 | send_buffer | semmle.label | send_buffer |
-| asio_streams.cpp:103:29:103:39 | *send_buffer | semmle.label | *send_buffer |
-| azure.cpp:253:48:253:60 | *call to GetBodyStream | semmle.label | *call to GetBodyStream |
-| azure.cpp:253:48:253:60 | *call to GetBodyStream | semmle.label | *call to GetBodyStream |
-| azure.cpp:257:5:257:8 | *resp | semmle.label | *resp |
-| azure.cpp:257:16:257:21 | Read output argument | semmle.label | Read output argument |
-| azure.cpp:258:10:258:16 | * ... | semmle.label | * ... |
-| azure.cpp:262:5:262:8 | *resp | semmle.label | *resp |
-| azure.cpp:262:23:262:28 | ReadToCount output argument | semmle.label | ReadToCount output argument |
-| azure.cpp:263:10:263:16 | * ... | semmle.label | * ... |
-| azure.cpp:266:38:266:41 | *resp | semmle.label | *resp |
-| azure.cpp:266:44:266:52 | call to ReadToEnd [element] | semmle.label | call to ReadToEnd [element] |
-| azure.cpp:266:44:266:52 | call to ReadToEnd [element] | semmle.label | call to ReadToEnd [element] |
-| azure.cpp:267:10:267:12 | vec | semmle.label | vec |
-| azure.cpp:267:10:267:12 | vec [element] | semmle.label | vec [element] |
-| azure.cpp:273:62:273:64 | call to GetHeaders | semmle.label | call to GetHeaders |
-| azure.cpp:273:62:273:64 | call to GetHeaders | semmle.label | call to GetHeaders |
-| azure.cpp:274:10:274:29 | call to operator[] | semmle.label | call to operator[] |
-| azure.cpp:274:14:274:29 | call to operator[] | semmle.label | call to operator[] |
-| azure.cpp:274:14:274:29 | call to operator[] | semmle.label | call to operator[] |
-| azure.cpp:274:14:274:29 | call to operator[] | semmle.label | call to operator[] |
-| azure.cpp:277:45:277:47 | call to GetBody | semmle.label | call to GetBody |
-| azure.cpp:277:45:277:47 | call to GetBody | semmle.label | call to GetBody |
-| azure.cpp:278:10:278:13 | body | semmle.label | body |
-| azure.cpp:278:10:278:13 | body | semmle.label | body |
-| azure.cpp:278:10:278:13 | body | semmle.label | body |
-| azure.cpp:281:68:281:84 | *call to ExtractBodyStream | semmle.label | *call to ExtractBodyStream |
-| azure.cpp:281:68:281:84 | *call to ExtractBodyStream | semmle.label | *call to ExtractBodyStream |
-| azure.cpp:282:10:282:38 | call to ReadToEnd | semmle.label | call to ReadToEnd |
-| azure.cpp:282:21:282:23 | *call to get | semmle.label | *call to get |
-| azure.cpp:282:28:282:36 | call to ReadToEnd [element] | semmle.label | call to ReadToEnd [element] |
-| azure.cpp:282:28:282:36 | call to ReadToEnd [element] | semmle.label | call to ReadToEnd [element] |
-| azure.cpp:289:24:289:56 | call to GetHeader | semmle.label | call to GetHeader |
-| azure.cpp:289:32:289:40 | call to GetHeader | semmle.label | call to GetHeader |
-| azure.cpp:289:32:289:40 | call to GetHeader | semmle.label | call to GetHeader |
-| azure.cpp:289:63:289:65 | call to Value | semmle.label | call to Value |
-| azure.cpp:289:63:289:65 | call to Value | semmle.label | call to Value |
-| azure.cpp:290:10:290:20 | headerValue | semmle.label | headerValue |
-| azure.cpp:290:10:290:20 | headerValue | semmle.label | headerValue |
-| azure.cpp:290:10:290:20 | headerValue | semmle.label | headerValue |
-| azure.cpp:293:58:293:67 | call to GetHeaders | semmle.label | call to GetHeaders |
-| azure.cpp:293:58:293:67 | call to GetHeaders | semmle.label | call to GetHeaders |
-| azure.cpp:294:38:294:53 | call to operator[] | semmle.label | call to operator[] |
-| azure.cpp:295:10:295:20 | contentType | semmle.label | contentType |
-| azure.cpp:295:10:295:20 | contentType | semmle.label | contentType |
-| azure.cpp:295:10:295:20 | contentType | semmle.label | contentType |
+| asio_streams.cpp:109:34:109:44 | read_until output argument | semmle.label | read_until output argument |
+| asio_streams.cpp:113:7:113:17 | recv_buffer | semmle.label | recv_buffer |
+| asio_streams.cpp:115:29:115:39 | recv_buffer | semmle.label | recv_buffer |
+| asio_streams.cpp:119:37:119:44 | call to source | semmle.label | call to source |
+| asio_streams.cpp:120:7:120:14 | send_str | semmle.label | send_str |
+| asio_streams.cpp:122:44:122:62 | call to buffer | semmle.label | call to buffer |
+| asio_streams.cpp:122:44:122:62 | call to buffer | semmle.label | call to buffer |
+| asio_streams.cpp:122:64:122:71 | *send_str | semmle.label | *send_str |
+| asio_streams.cpp:123:7:123:17 | send_buffer | semmle.label | send_buffer |
+| asio_streams.cpp:125:29:125:39 | send_buffer | semmle.label | send_buffer |
+| asio_streams.cpp:136:19:136:26 | call to source | semmle.label | call to source |
+| asio_streams.cpp:141:16:141:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:141:24:141:27 | *host | semmle.label | *host |
+| asio_streams.cpp:142:16:142:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:142:24:142:27 | *host | semmle.label | *host |
+| asio_streams.cpp:143:16:143:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:143:24:143:27 | *host | semmle.label | *host |
+| asio_streams.cpp:144:16:144:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:144:24:144:27 | *host | semmle.label | *host |
+| asio_streams.cpp:151:16:151:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:151:34:151:37 | *host | semmle.label | *host |
+| asio_streams.cpp:152:16:152:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:152:34:152:37 | *host | semmle.label | *host |
+| asio_streams.cpp:153:16:153:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:153:34:153:37 | *host | semmle.label | *host |
+| asio_streams.cpp:154:16:154:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:154:34:154:37 | *host | semmle.label | *host |
+| asio_streams.cpp:168:22:168:29 | call to source | semmle.label | call to source |
+| asio_streams.cpp:172:16:172:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:172:30:172:36 | *service | semmle.label | *service |
+| asio_streams.cpp:173:16:173:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:173:30:173:36 | *service | semmle.label | *service |
+| asio_streams.cpp:174:16:174:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:174:30:174:36 | *service | semmle.label | *service |
+| asio_streams.cpp:175:16:175:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:175:30:175:36 | *service | semmle.label | *service |
+| asio_streams.cpp:182:16:182:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:182:40:182:46 | *service | semmle.label | *service |
+| asio_streams.cpp:183:16:183:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:183:40:183:46 | *service | semmle.label | *service |
+| asio_streams.cpp:184:16:184:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:184:40:184:46 | *service | semmle.label | *service |
+| asio_streams.cpp:185:16:185:22 | call to resolve | semmle.label | call to resolve |
+| asio_streams.cpp:185:40:185:46 | *service | semmle.label | *service |
+| azure.cpp:216:48:216:60 | *call to GetBodyStream | semmle.label | *call to GetBodyStream |
+| azure.cpp:216:48:216:60 | call to GetBodyStream | semmle.label | call to GetBodyStream |
+| azure.cpp:220:5:220:8 | *resp | semmle.label | *resp |
+| azure.cpp:220:16:220:21 | Read output argument | semmle.label | Read output argument |
+| azure.cpp:221:10:221:16 | * ... | semmle.label | * ... |
+| azure.cpp:225:5:225:8 | *resp | semmle.label | *resp |
+| azure.cpp:225:23:225:28 | ReadToCount output argument | semmle.label | ReadToCount output argument |
+| azure.cpp:226:10:226:16 | * ... | semmle.label | * ... |
+| azure.cpp:229:38:229:41 | *resp | semmle.label | *resp |
+| azure.cpp:229:44:229:52 | call to ReadToEnd [element] | semmle.label | call to ReadToEnd [element] |
+| azure.cpp:229:44:229:52 | call to ReadToEnd [element] | semmle.label | call to ReadToEnd [element] |
+| azure.cpp:230:10:230:12 | *vec [element] | semmle.label | *vec [element] |
+| azure.cpp:230:10:230:12 | call to vector | semmle.label | call to vector |
+| azure.cpp:230:10:230:12 | call to vector [element] | semmle.label | call to vector [element] |
+| azure.cpp:236:52:236:61 | call to GetHeaders | semmle.label | call to GetHeaders |
+| azure.cpp:237:14:237:29 | call to operator[] | semmle.label | call to operator[] |
+| azure.cpp:240:38:240:44 | call to GetBody | semmle.label | call to GetBody |
+| azure.cpp:241:10:241:13 | call to vector | semmle.label | call to vector |
+| azure.cpp:241:10:241:13 | call to vector | semmle.label | call to vector |
+| azure.cpp:241:10:241:13 | call to vector | semmle.label | call to vector |
+| azure.cpp:244:68:244:84 | *call to ExtractBodyStream | semmle.label | *call to ExtractBodyStream |
+| azure.cpp:244:68:244:84 | call to ExtractBodyStream | semmle.label | call to ExtractBodyStream |
+| azure.cpp:245:10:245:38 | call to ReadToEnd | semmle.label | call to ReadToEnd |
+| azure.cpp:245:21:245:23 | *call to get | semmle.label | *call to get |
+| azure.cpp:245:28:245:36 | call to ReadToEnd [element] | semmle.label | call to ReadToEnd [element] |
+| azure.cpp:245:28:245:36 | call to ReadToEnd [element] | semmle.label | call to ReadToEnd [element] |
+| azure.cpp:255:24:255:56 | call to GetHeader | semmle.label | call to GetHeader |
+| azure.cpp:255:32:255:40 | call to GetHeader | semmle.label | call to GetHeader |
+| azure.cpp:255:32:255:40 | call to GetHeader | semmle.label | call to GetHeader |
+| azure.cpp:255:63:255:65 | call to Value | semmle.label | call to Value |
+| azure.cpp:255:63:255:65 | call to Value | semmle.label | call to Value |
+| azure.cpp:256:10:256:20 | headerValue | semmle.label | headerValue |
+| azure.cpp:259:58:259:67 | call to GetHeaders | semmle.label | call to GetHeaders |
+| azure.cpp:259:58:259:67 | call to GetHeaders | semmle.label | call to GetHeaders |
+| azure.cpp:260:38:260:53 | call to operator[] | semmle.label | call to operator[] |
+| azure.cpp:261:10:261:20 | contentType | semmle.label | contentType |
+| azure.cpp:268:3:268:5 | SetQueryParameters output argument | semmle.label | SetQueryParameters output argument |
+| azure.cpp:268:26:268:45 | call to GetHeaders | semmle.label | call to GetHeaders |
+| azure.cpp:268:34:268:43 | call to GetHeaders | semmle.label | call to GetHeaders |
+| azure.cpp:268:34:268:43 | call to GetHeaders | semmle.label | call to GetHeaders |
+| azure.cpp:269:8:269:10 | *url | semmle.label | *url |
+| azure.cpp:269:12:269:29 | call to GetQueryParameters | semmle.label | call to GetQueryParameters |
+| azure.cpp:269:12:269:29 | call to GetQueryParameters | semmle.label | call to GetQueryParameters |
+| azure.cpp:269:32:269:40 | call to operator[] | semmle.label | call to operator[] |
+| bal.cpp:128:19:128:26 | call to source | semmle.label | call to source |
+| bal.cpp:129:23:129:51 | *call to data | semmle.label | *call to data |
+| bal.cpp:132:17:132:18 | *sb | semmle.label | *sb |
+| bal.cpp:132:21:132:24 | decode output argument | semmle.label | decode output argument |
+| bal.cpp:133:7:133:17 | * ... | semmle.label | * ... |
+| bal.cpp:137:19:137:26 | call to source | semmle.label | call to source |
+| bal.cpp:138:21:138:47 | *call to data | semmle.label | *call to data |
+| bal.cpp:141:17:141:19 | ** ... | semmle.label | ** ... |
+| bal.cpp:141:22:141:25 | decode output argument | semmle.label | decode output argument |
+| bal.cpp:142:7:142:17 | * ... | semmle.label | * ... |
+| bal.cpp:146:19:146:26 | call to source | semmle.label | call to source |
+| bal.cpp:147:23:147:51 | *call to data | semmle.label | *call to data |
+| bal.cpp:150:20:150:21 | *sb | semmle.label | *sb |
+| bal.cpp:150:24:150:27 | decodeAny output argument | semmle.label | decodeAny output argument |
+| bal.cpp:151:7:151:17 | * ... | semmle.label | * ... |
+| bal.cpp:156:18:156:25 | call to source | semmle.label | call to source |
+| bal.cpp:159:17:159:37 | encode output argument | semmle.label | encode output argument |
+| bal.cpp:159:40:159:42 | *obj | semmle.label | *obj |
+| bal.cpp:160:7:160:12 | access to array | semmle.label | access to array |
+| bal.cpp:164:18:164:25 | call to source | semmle.label | call to source |
+| bal.cpp:167:20:167:40 | encodeAny output argument | semmle.label | encodeAny output argument |
+| bal.cpp:167:43:167:45 | *obj | semmle.label | *obj |
+| bal.cpp:168:7:168:12 | access to array | semmle.label | access to array |
+| bal.cpp:175:19:175:26 | call to source | semmle.label | call to source |
+| bal.cpp:176:23:176:51 | *call to data | semmle.label | *call to data |
+| bal.cpp:180:17:180:18 | *sb | semmle.label | *sb |
+| bal.cpp:180:21:180:24 | decode output argument | semmle.label | decode output argument |
+| bal.cpp:181:7:181:17 | * ... | semmle.label | * ... |
+| bal.cpp:185:19:185:26 | call to source | semmle.label | call to source |
+| bal.cpp:186:21:186:47 | *call to data | semmle.label | *call to data |
+| bal.cpp:190:17:190:19 | ** ... | semmle.label | ** ... |
+| bal.cpp:190:22:190:25 | decode output argument | semmle.label | decode output argument |
+| bal.cpp:191:7:191:17 | * ... | semmle.label | * ... |
+| bal.cpp:195:19:195:26 | call to source | semmle.label | call to source |
+| bal.cpp:196:23:196:51 | *call to data | semmle.label | *call to data |
+| bal.cpp:199:20:199:21 | *sb | semmle.label | *sb |
+| bal.cpp:199:24:199:27 | decodeAny output argument | semmle.label | decodeAny output argument |
+| bal.cpp:200:7:200:17 | * ... | semmle.label | * ... |
+| bal.cpp:204:18:204:25 | call to source | semmle.label | call to source |
+| bal.cpp:208:17:208:37 | encode output argument | semmle.label | encode output argument |
+| bal.cpp:208:40:208:42 | *obj | semmle.label | *obj |
+| bal.cpp:209:7:209:12 | access to array | semmle.label | access to array |
+| bal.cpp:213:18:213:25 | call to source | semmle.label | call to source |
+| bal.cpp:216:20:216:40 | encodeAny output argument | semmle.label | encodeAny output argument |
+| bal.cpp:216:43:216:45 | *obj | semmle.label | *obj |
+| bal.cpp:217:7:217:12 | access to array | semmle.label | access to array |
+| bal.cpp:222:19:222:26 | call to source | semmle.label | call to source |
+| bal.cpp:223:23:223:51 | *call to data | semmle.label | *call to data |
+| bal.cpp:226:17:226:18 | *sb | semmle.label | *sb |
+| bal.cpp:226:21:226:24 | decode output argument | semmle.label | decode output argument |
+| bal.cpp:229:17:229:37 | encode output argument | semmle.label | encode output argument |
+| bal.cpp:229:40:229:42 | *rec | semmle.label | *rec |
+| bal.cpp:230:7:230:12 | access to array | semmle.label | access to array |
+| bal.cpp:245:19:245:26 | call to source | semmle.label | call to source |
+| bal.cpp:246:21:246:47 | *call to data | semmle.label | *call to data |
+| bal.cpp:249:17:249:19 | ** ... | semmle.label | ** ... |
+| bal.cpp:249:22:249:25 | decode output argument | semmle.label | decode output argument |
+| bal.cpp:250:7:250:17 | * ... | semmle.label | * ... |
+| bal.cpp:254:19:254:26 | call to source | semmle.label | call to source |
+| bal.cpp:255:21:255:47 | *call to data | semmle.label | *call to data |
+| bal.cpp:258:34:258:52 | *call to decode | semmle.label | *call to decode |
+| bal.cpp:258:34:258:52 | *call to decode | semmle.label | *call to decode |
+| bal.cpp:258:35:258:37 | ** ... | semmle.label | ** ... |
+| bal.cpp:258:40:258:43 | decode output argument | semmle.label | decode output argument |
+| bal.cpp:259:7:259:17 | * ... | semmle.label | * ... |
+| bal.cpp:260:7:260:9 | out | semmle.label | out |
+| bal.cpp:264:19:264:26 | call to source | semmle.label | call to source |
+| bal.cpp:265:23:265:51 | *call to data | semmle.label | *call to data |
+| bal.cpp:268:17:268:18 | *sb | semmle.label | *sb |
+| bal.cpp:268:21:268:24 | decode output argument | semmle.label | decode output argument |
+| bal.cpp:269:7:269:17 | * ... | semmle.label | * ... |
+| bal.cpp:273:19:273:26 | call to source | semmle.label | call to source |
+| bal.cpp:276:22:276:25 | *call to data | semmle.label | *call to data |
+| bal.cpp:276:43:276:46 | decode output argument | semmle.label | decode output argument |
+| bal.cpp:277:7:277:17 | * ... | semmle.label | * ... |
+| bal.cpp:301:19:301:26 | call to source | semmle.label | call to source |
+| bal.cpp:302:21:302:47 | *call to data | semmle.label | *call to data |
+| bal.cpp:305:20:305:22 | ** ... | semmle.label | ** ... |
+| bal.cpp:305:25:305:28 | decodeAny output argument | semmle.label | decodeAny output argument |
+| bal.cpp:306:7:306:17 | * ... | semmle.label | * ... |
+| bal.cpp:310:19:310:26 | call to source | semmle.label | call to source |
+| bal.cpp:311:21:311:47 | *call to data | semmle.label | *call to data |
+| bal.cpp:314:37:314:48 | *call to decodeAny | semmle.label | *call to decodeAny |
+| bal.cpp:314:37:314:48 | *call to decodeAny | semmle.label | *call to decodeAny |
+| bal.cpp:314:38:314:40 | ** ... | semmle.label | ** ... |
+| bal.cpp:314:43:314:46 | decodeAny output argument | semmle.label | decodeAny output argument |
+| bal.cpp:315:7:315:17 | * ... | semmle.label | * ... |
+| bal.cpp:316:7:316:9 | out | semmle.label | out |
+| bal.cpp:320:19:320:26 | call to source | semmle.label | call to source |
+| bal.cpp:321:23:321:51 | *call to data | semmle.label | *call to data |
+| bal.cpp:324:20:324:21 | *sb | semmle.label | *sb |
+| bal.cpp:324:24:324:27 | decodeAny output argument | semmle.label | decodeAny output argument |
+| bal.cpp:325:7:325:17 | * ... | semmle.label | * ... |
+| bal.cpp:329:19:329:26 | call to source | semmle.label | call to source |
+| bal.cpp:330:21:330:47 | *call to data | semmle.label | *call to data |
+| bal.cpp:333:20:333:22 | ** ... | semmle.label | ** ... |
+| bal.cpp:333:25:333:28 | decodeAny output argument | semmle.label | decodeAny output argument |
+| bal.cpp:334:7:334:19 | * ... | semmle.label | * ... |
+| bal.cpp:338:19:338:26 | call to source | semmle.label | call to source |
+| bal.cpp:339:21:339:47 | *call to data | semmle.label | *call to data |
+| bal.cpp:342:37:342:48 | *call to decodeAny | semmle.label | *call to decodeAny |
+| bal.cpp:342:37:342:48 | *call to decodeAny | semmle.label | *call to decodeAny |
+| bal.cpp:342:38:342:40 | ** ... | semmle.label | ** ... |
+| bal.cpp:342:43:342:46 | decodeAny output argument | semmle.label | decodeAny output argument |
+| bal.cpp:343:7:343:17 | * ... | semmle.label | * ... |
+| bal.cpp:344:7:344:19 | * ... | semmle.label | * ... |
+| bal.cpp:348:19:348:26 | call to source | semmle.label | call to source |
+| bal.cpp:349:23:349:51 | *call to data | semmle.label | *call to data |
+| bal.cpp:352:20:352:21 | *sb | semmle.label | *sb |
+| bal.cpp:352:24:352:27 | decodeAny output argument | semmle.label | decodeAny output argument |
+| bal.cpp:353:7:353:19 | * ... | semmle.label | * ... |
+| bal.cpp:357:18:357:25 | call to source | semmle.label | call to source |
+| bal.cpp:360:17:360:37 | encode output argument | semmle.label | encode output argument |
+| bal.cpp:360:40:360:42 | *obj | semmle.label | *obj |
+| bal.cpp:361:7:361:12 | access to array | semmle.label | access to array |
+| bal.cpp:365:18:365:25 | call to source | semmle.label | call to source |
+| bal.cpp:368:17:368:36 | encode output argument | semmle.label | encode output argument |
+| bal.cpp:368:39:368:41 | *obj | semmle.label | *obj |
+| bal.cpp:369:7:369:12 | access to array | semmle.label | access to array |
+| bal.cpp:373:18:373:25 | call to source | semmle.label | call to source |
+| bal.cpp:376:34:376:61 | *call to encode | semmle.label | *call to encode |
+| bal.cpp:376:34:376:61 | *call to encode | semmle.label | *call to encode |
+| bal.cpp:376:35:376:54 | encode output argument | semmle.label | encode output argument |
+| bal.cpp:376:57:376:59 | *obj | semmle.label | *obj |
+| bal.cpp:377:7:377:17 | * ... | semmle.label | * ... |
+| bal.cpp:378:7:378:12 | access to array | semmle.label | access to array |
+| bal.cpp:382:19:382:26 | call to source | semmle.label | call to source |
+| bal.cpp:383:21:383:47 | *call to data | semmle.label | *call to data |
+| bal.cpp:386:34:386:44 | *call to encode | semmle.label | *call to encode |
+| bal.cpp:386:34:386:44 | *call to encode | semmle.label | *call to encode |
+| bal.cpp:386:35:386:37 | ** ... | semmle.label | ** ... |
+| bal.cpp:387:7:387:17 | * ... | semmle.label | * ... |
+| bal.cpp:391:18:391:25 | call to source | semmle.label | call to source |
+| bal.cpp:394:25:394:44 | encodeToStream output argument | semmle.label | encodeToStream output argument |
+| bal.cpp:394:47:394:49 | *obj | semmle.label | *obj |
+| bal.cpp:395:7:395:12 | access to array | semmle.label | access to array |
+| bal.cpp:409:18:409:25 | call to source | semmle.label | call to source |
+| bal.cpp:412:20:412:40 | encodeAny output argument | semmle.label | encodeAny output argument |
+| bal.cpp:412:43:412:45 | *obj | semmle.label | *obj |
+| bal.cpp:413:7:413:12 | access to array | semmle.label | access to array |
+| bal.cpp:417:18:417:25 | call to source | semmle.label | call to source |
+| bal.cpp:420:20:420:39 | encodeAny output argument | semmle.label | encodeAny output argument |
+| bal.cpp:420:42:420:44 | *obj | semmle.label | *obj |
+| bal.cpp:421:7:421:12 | access to array | semmle.label | access to array |
+| bal.cpp:425:18:425:25 | call to source | semmle.label | call to source |
+| bal.cpp:428:37:428:64 | *call to encodeAny | semmle.label | *call to encodeAny |
+| bal.cpp:428:37:428:64 | *call to encodeAny | semmle.label | *call to encodeAny |
+| bal.cpp:428:38:428:57 | encodeAny output argument | semmle.label | encodeAny output argument |
+| bal.cpp:428:60:428:62 | *obj | semmle.label | *obj |
+| bal.cpp:429:7:429:17 | * ... | semmle.label | * ... |
+| bal.cpp:430:7:430:12 | access to array | semmle.label | access to array |
+| bal.cpp:434:18:434:25 | call to source | semmle.label | call to source |
+| bal.cpp:437:28:437:47 | encodeAnyToStream output argument | semmle.label | encodeAnyToStream output argument |
+| bal.cpp:437:50:437:52 | *obj | semmle.label | *obj |
+| bal.cpp:438:7:438:12 | access to array | semmle.label | access to array |
+| bal.cpp:442:19:442:26 | call to source | semmle.label | call to source |
+| bal.cpp:443:41:443:86 | *call to data | semmle.label | *call to data |
+| bal.cpp:446:20:446:40 | encodeAny output argument | semmle.label | encodeAny output argument |
+| bal.cpp:446:43:446:46 | ** ... | semmle.label | ** ... |
+| bal.cpp:447:7:447:12 | access to array | semmle.label | access to array |
+| bal.cpp:451:19:451:26 | call to source | semmle.label | call to source |
+| bal.cpp:452:41:452:86 | *call to data | semmle.label | *call to data |
+| bal.cpp:455:20:455:39 | encodeAny output argument | semmle.label | encodeAny output argument |
+| bal.cpp:455:42:455:45 | ** ... | semmle.label | ** ... |
+| bal.cpp:456:7:456:12 | access to array | semmle.label | access to array |
+| bal.cpp:460:19:460:26 | call to source | semmle.label | call to source |
+| bal.cpp:461:41:461:86 | *call to data | semmle.label | *call to data |
+| bal.cpp:464:37:464:65 | *call to encodeAny | semmle.label | *call to encodeAny |
+| bal.cpp:464:37:464:65 | *call to encodeAny | semmle.label | *call to encodeAny |
+| bal.cpp:464:38:464:57 | encodeAny output argument | semmle.label | encodeAny output argument |
+| bal.cpp:464:60:464:63 | ** ... | semmle.label | ** ... |
+| bal.cpp:465:7:465:17 | * ... | semmle.label | * ... |
+| bal.cpp:466:7:466:12 | access to array | semmle.label | access to array |
+| bdlbb.cpp:37:16:37:23 | call to source | semmle.label | call to source |
+| bdlbb.cpp:39:37:39:41 | copy output argument | semmle.label | copy output argument |
+| bdlbb.cpp:39:49:39:52 | *call to data | semmle.label | *call to data |
+| bdlbb.cpp:41:37:41:39 | copy output argument | semmle.label | copy output argument |
+| bdlbb.cpp:41:42:41:45 | *blob | semmle.label | *blob |
+| bdlbb.cpp:42:7:42:10 | * ... | semmle.label | * ... |
+| bdlbb.cpp:46:16:46:23 | call to source | semmle.label | call to source |
+| bdlbb.cpp:48:37:48:41 | copy output argument | semmle.label | copy output argument |
+| bdlbb.cpp:48:49:48:52 | *call to data | semmle.label | *call to data |
+| bdlbb.cpp:49:18:49:21 | *blob | semmle.label | *blob |
+| bdlbb.cpp:49:18:49:38 | *call to data | semmle.label | *call to data |
+| bdlbb.cpp:49:18:49:38 | *call to data | semmle.label | *call to data |
+| bdlbb.cpp:49:29:49:32 | *call to buffer | semmle.label | *call to buffer |
+| bdlbb.cpp:50:7:50:8 | * ... | semmle.label | * ... |
+| bdlbb.cpp:55:16:55:23 | call to source | semmle.label | call to source |
+| bdlbb.cpp:57:37:57:41 | copy output argument | semmle.label | copy output argument |
+| bdlbb.cpp:57:49:57:52 | *call to data | semmle.label | *call to data |
+| bdlbb.cpp:58:18:58:21 | *blob | semmle.label | *blob |
+| bdlbb.cpp:58:18:58:46 | call to get | semmle.label | call to get |
+| bdlbb.cpp:58:29:58:32 | *call to buffer | semmle.label | *call to buffer |
+| bdlbb.cpp:58:39:58:41 | *call to buffer | semmle.label | *call to buffer |
+| bdlbb.cpp:59:7:59:8 | * ... | semmle.label | * ... |
+| bdlbb.cpp:63:16:63:23 | call to source | semmle.label | call to source |
+| bdlbb.cpp:65:37:65:41 | copy output argument | semmle.label | copy output argument |
+| bdlbb.cpp:65:49:65:52 | *call to data | semmle.label | *call to data |
+| bdlbb.cpp:67:12:67:65 | *call to getContiguousRangeOrCopy | semmle.label | *call to getContiguousRangeOrCopy |
+| bdlbb.cpp:67:12:67:65 | *call to getContiguousRangeOrCopy | semmle.label | *call to getContiguousRangeOrCopy |
+| bdlbb.cpp:67:72:67:75 | *blob | semmle.label | *blob |
+| bdlbb.cpp:68:7:68:8 | * ... | semmle.label | * ... |
+| bdlbb.cpp:73:16:73:23 | call to source | semmle.label | call to source |
+| bdlbb.cpp:75:37:75:40 | copy output argument | semmle.label | copy output argument |
+| bdlbb.cpp:75:48:75:51 | *call to data | semmle.label | *call to data |
+| bdlbb.cpp:77:37:77:40 | copy output argument | semmle.label | copy output argument |
+| bdlbb.cpp:77:46:77:48 | *src | semmle.label | *src |
+| bdlbb.cpp:79:37:79:39 | copy output argument | semmle.label | copy output argument |
+| bdlbb.cpp:79:42:79:44 | *dst | semmle.label | *dst |
+| bdlbb.cpp:80:7:80:10 | * ... | semmle.label | * ... |
+| bmqa.cpp:87:19:87:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:88:36:88:76 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:90:2:90:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:90:15:90:19 | getData output argument | semmle.label | getData output argument |
+| bmqa.cpp:92:37:92:39 | copy output argument | semmle.label | copy output argument |
+| bmqa.cpp:92:42:92:45 | *blob | semmle.label | *blob |
+| bmqa.cpp:93:7:93:10 | * ... | semmle.label | * ... |
+| bmqa.cpp:97:19:97:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:98:43:98:88 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:99:42:99:46 | *event | semmle.label | *event |
+| bmqa.cpp:99:49:99:63 | call to messageIterator | semmle.label | call to messageIterator |
+| bmqa.cpp:99:49:99:63 | call to messageIterator | semmle.label | call to messageIterator |
+| bmqa.cpp:101:43:101:44 | *it | semmle.label | *it |
+| bmqa.cpp:101:53:101:55 | *call to message | semmle.label | *call to message |
+| bmqa.cpp:101:53:101:55 | *call to message | semmle.label | *call to message |
+| bmqa.cpp:103:3:103:5 | *msg | semmle.label | *msg |
+| bmqa.cpp:103:15:103:19 | getData output argument | semmle.label | getData output argument |
+| bmqa.cpp:105:38:105:40 | copy output argument | semmle.label | copy output argument |
+| bmqa.cpp:105:43:105:46 | *blob | semmle.label | *blob |
+| bmqa.cpp:106:8:106:11 | * ... | semmle.label | * ... |
+| bmqa.cpp:111:16:111:23 | call to source | semmle.label | call to source |
+| bmqa.cpp:113:37:113:39 | copy output argument | semmle.label | copy output argument |
+| bmqa.cpp:113:47:113:50 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:115:2:115:4 | setDataRef output argument | semmle.label | setDataRef output argument |
+| bmqa.cpp:115:17:115:19 | *& ... | semmle.label | *& ... |
+| bmqa.cpp:117:2:117:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:117:14:117:17 | getData output argument | semmle.label | getData output argument |
+| bmqa.cpp:119:37:119:39 | copy output argument | semmle.label | copy output argument |
+| bmqa.cpp:119:42:119:44 | *out | semmle.label | *out |
+| bmqa.cpp:120:7:120:10 | * ... | semmle.label | * ... |
+| bmqa.cpp:124:16:124:23 | call to source | semmle.label | call to source |
+| bmqa.cpp:126:2:126:4 | setDataRef output argument | semmle.label | setDataRef output argument |
+| bmqa.cpp:126:19:126:22 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:128:2:128:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:128:14:128:17 | getData output argument | semmle.label | getData output argument |
+| bmqa.cpp:130:37:130:39 | copy output argument | semmle.label | copy output argument |
+| bmqa.cpp:130:42:130:44 | *out | semmle.label | *out |
+| bmqa.cpp:131:7:131:10 | * ... | semmle.label | * ... |
+| bmqa.cpp:135:16:135:23 | call to source | semmle.label | call to source |
+| bmqa.cpp:137:2:137:4 | setData output argument | semmle.label | setData output argument |
+| bmqa.cpp:137:16:137:19 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:139:2:139:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:139:14:139:17 | getData output argument | semmle.label | getData output argument |
+| bmqa.cpp:141:37:141:39 | copy output argument | semmle.label | copy output argument |
+| bmqa.cpp:141:42:141:44 | *out | semmle.label | *out |
+| bmqa.cpp:142:7:142:10 | * ... | semmle.label | * ... |
+| bmqa.cpp:146:19:146:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:147:36:147:76 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:148:36:148:38 | *msg | semmle.label | *msg |
+| bmqa.cpp:148:41:148:45 | call to clone | semmle.label | call to clone |
+| bmqa.cpp:148:41:148:45 | call to clone | semmle.label | call to clone |
+| bmqa.cpp:150:2:150:5 | *copy | semmle.label | *copy |
+| bmqa.cpp:150:15:150:19 | getData output argument | semmle.label | getData output argument |
+| bmqa.cpp:152:37:152:39 | copy output argument | semmle.label | copy output argument |
+| bmqa.cpp:152:42:152:45 | *blob | semmle.label | *blob |
+| bmqa.cpp:153:7:153:10 | * ... | semmle.label | * ... |
+| bmqa.cpp:157:19:157:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:158:36:158:76 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:160:2:160:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:160:22:160:27 | loadProperties output argument | semmle.label | loadProperties output argument |
+| bmqa.cpp:161:29:161:33 | *props | semmle.label | *props |
+| bmqa.cpp:161:54:161:61 | *call to getPropertyAsString | semmle.label | *call to getPropertyAsString |
+| bmqa.cpp:161:54:161:61 | *call to getPropertyAsString | semmle.label | *call to getPropertyAsString |
+| bmqa.cpp:162:7:162:21 | access to array | semmle.label | access to array |
+| bmqa.cpp:166:19:166:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:167:36:167:76 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:169:2:169:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:169:22:169:27 | loadProperties output argument | semmle.label | loadProperties output argument |
+| bmqa.cpp:170:35:170:39 | *props | semmle.label | *props |
+| bmqa.cpp:170:60:170:67 | *call to getPropertyAsBinary [element] | semmle.label | *call to getPropertyAsBinary [element] |
+| bmqa.cpp:170:60:170:67 | *call to getPropertyAsBinary [element] | semmle.label | *call to getPropertyAsBinary [element] |
+| bmqa.cpp:171:7:171:11 | *value [element] | semmle.label | *value [element] |
+| bmqa.cpp:171:7:171:21 | access to array | semmle.label | access to array |
+| bmqa.cpp:175:19:175:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:176:36:176:76 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:178:2:178:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:178:22:178:27 | loadProperties output argument | semmle.label | loadProperties output argument |
+| bmqa.cpp:179:35:179:39 | *props | semmle.label | *props |
+| bmqa.cpp:179:60:179:67 | *call to getPropertyAsBinary [element] | semmle.label | *call to getPropertyAsBinary [element] |
+| bmqa.cpp:179:60:179:67 | *call to getPropertyAsBinary [element] | semmle.label | *call to getPropertyAsBinary [element] |
+| bmqa.cpp:180:7:180:11 | *value [element] | semmle.label | *value [element] |
+| bmqa.cpp:180:12:180:14 | call to operator[] | semmle.label | call to operator[] |
+| bmqa.cpp:184:19:184:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:185:36:185:76 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:187:2:187:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:187:22:187:27 | loadProperties output argument | semmle.label | loadProperties output argument |
+| bmqa.cpp:189:29:189:33 | *props | semmle.label | *props |
+| bmqa.cpp:189:56:189:69 | *call to getPropertyAsStringOr | semmle.label | *call to getPropertyAsStringOr |
+| bmqa.cpp:189:56:189:69 | *call to getPropertyAsStringOr | semmle.label | *call to getPropertyAsStringOr |
+| bmqa.cpp:190:7:190:19 | * ... | semmle.label | * ... |
+| bmqa.cpp:195:19:195:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:197:56:197:69 | *call to getPropertyAsStringOr | semmle.label | *call to getPropertyAsStringOr |
+| bmqa.cpp:197:56:197:69 | *call to getPropertyAsStringOr | semmle.label | *call to getPropertyAsStringOr |
+| bmqa.cpp:197:64:197:67 | *dflt | semmle.label | *dflt |
+| bmqa.cpp:198:7:198:19 | * ... | semmle.label | * ... |
+| bmqa.cpp:202:19:202:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:203:36:203:76 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:205:2:205:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:205:22:205:27 | loadProperties output argument | semmle.label | loadProperties output argument |
+| bmqa.cpp:207:35:207:39 | *props | semmle.label | *props |
+| bmqa.cpp:207:62:207:75 | *call to getPropertyAsBinaryOr [element] | semmle.label | *call to getPropertyAsBinaryOr [element] |
+| bmqa.cpp:207:62:207:75 | *call to getPropertyAsBinaryOr [element] | semmle.label | *call to getPropertyAsBinaryOr [element] |
+| bmqa.cpp:208:7:208:19 | * ... | semmle.label | * ... |
+| bmqa.cpp:208:8:208:12 | *value [element] | semmle.label | *value [element] |
+| bmqa.cpp:212:11:212:19 | * ... | semmle.label | * ... |
+| bmqa.cpp:212:12:212:17 | call to source | semmle.label | call to source |
+| bmqa.cpp:214:2:214:5 | push_back output argument [element] | semmle.label | push_back output argument [element] |
+| bmqa.cpp:214:17:214:17 | *c | semmle.label | *c |
+| bmqa.cpp:216:62:216:75 | *call to getPropertyAsBinaryOr [element] | semmle.label | *call to getPropertyAsBinaryOr [element] |
+| bmqa.cpp:216:62:216:75 | *call to getPropertyAsBinaryOr [element] | semmle.label | *call to getPropertyAsBinaryOr [element] |
+| bmqa.cpp:216:70:216:73 | *dflt [element] | semmle.label | *dflt [element] |
+| bmqa.cpp:217:7:217:19 | * ... | semmle.label | * ... |
+| bmqa.cpp:217:8:217:12 | *value [element] | semmle.label | *value [element] |
+| bmqa.cpp:229:16:229:23 | call to source | semmle.label | call to source |
+| bmqa.cpp:231:37:231:41 | copy output argument | semmle.label | copy output argument |
+| bmqa.cpp:231:49:231:52 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:233:2:233:6 | streamIn output argument | semmle.label | streamIn output argument |
+| bmqa.cpp:233:17:233:20 | *blob | semmle.label | *blob |
+| bmqa.cpp:234:7:234:46 | * ... | semmle.label | * ... |
+| bmqa.cpp:234:8:234:12 | *props | semmle.label | *props |
+| bmqa.cpp:234:33:234:40 | *call to getPropertyAsString | semmle.label | *call to getPropertyAsString |
+| bmqa.cpp:238:16:238:23 | call to source | semmle.label | call to source |
+| bmqa.cpp:240:37:240:41 | copy output argument | semmle.label | copy output argument |
+| bmqa.cpp:240:49:240:52 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:242:2:242:3 | streamIn output argument | semmle.label | streamIn output argument |
+| bmqa.cpp:242:14:242:17 | *blob | semmle.label | *blob |
+| bmqa.cpp:244:2:244:4 | setPropertiesRef output argument | semmle.label | setPropertiesRef output argument |
+| bmqa.cpp:244:23:244:25 | *& ... | semmle.label | *& ... |
+| bmqa.cpp:246:2:246:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:246:21:246:24 | loadProperties output argument | semmle.label | loadProperties output argument |
+| bmqa.cpp:247:7:247:44 | * ... | semmle.label | * ... |
+| bmqa.cpp:247:8:247:10 | *out | semmle.label | *out |
+| bmqa.cpp:247:31:247:38 | *call to getPropertyAsString | semmle.label | *call to getPropertyAsString |
+| bmqa.cpp:251:19:251:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:252:36:252:76 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:254:2:254:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:254:22:254:27 | loadProperties output argument | semmle.label | loadProperties output argument |
+| bmqa.cpp:256:41:256:45 | *props | semmle.label | *props |
+| bmqa.cpp:256:56:256:66 | *call to streamOut | semmle.label | *call to streamOut |
+| bmqa.cpp:256:56:256:66 | *call to streamOut | semmle.label | *call to streamOut |
+| bmqa.cpp:258:37:258:39 | copy output argument | semmle.label | copy output argument |
+| bmqa.cpp:258:42:258:45 | *blob | semmle.label | *blob |
+| bmqa.cpp:259:7:259:10 | * ... | semmle.label | * ... |
+| bmqa.cpp:263:19:263:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:264:36:264:76 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:266:2:266:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:266:22:266:27 | loadProperties output argument | semmle.label | loadProperties output argument |
+| bmqa.cpp:267:39:267:42 | call to MessageProperties | semmle.label | call to MessageProperties |
+| bmqa.cpp:267:44:267:48 | *props | semmle.label | *props |
+| bmqa.cpp:268:7:268:45 | * ... | semmle.label | * ... |
+| bmqa.cpp:268:8:268:11 | *copy | semmle.label | *copy |
+| bmqa.cpp:268:32:268:39 | *call to getPropertyAsString | semmle.label | *call to getPropertyAsString |
+| bmqa.cpp:272:19:272:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:273:36:273:76 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:275:2:275:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:275:22:275:27 | loadProperties output argument | semmle.label | loadProperties output argument |
+| bmqa.cpp:277:2:277:5 | operator= output argument | semmle.label | operator= output argument |
+| bmqa.cpp:277:9:277:13 | *props | semmle.label | *props |
+| bmqa.cpp:278:7:278:45 | * ... | semmle.label | * ... |
+| bmqa.cpp:278:8:278:11 | *copy | semmle.label | *copy |
+| bmqa.cpp:278:32:278:39 | *call to getPropertyAsString | semmle.label | *call to getPropertyAsString |
+| bmqa.cpp:282:19:282:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:283:36:283:76 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:285:2:285:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:285:22:285:27 | loadProperties output argument | semmle.label | loadProperties output argument |
+| bmqa.cpp:287:7:287:55 | * ... | semmle.label | * ... |
+| bmqa.cpp:287:8:287:21 | *call to operator= | semmle.label | *call to operator= |
+| bmqa.cpp:287:16:287:20 | *props | semmle.label | *props |
+| bmqa.cpp:287:42:287:49 | *call to getPropertyAsString | semmle.label | *call to getPropertyAsString |
+| bmqa.cpp:291:19:291:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:292:28:292:58 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:294:2:294:6 | setPropertyAsString output argument | semmle.label | setPropertyAsString output argument |
+| bmqa.cpp:294:35:294:40 | * ... | semmle.label | * ... |
+| bmqa.cpp:295:7:295:46 | * ... | semmle.label | * ... |
+| bmqa.cpp:295:8:295:12 | *props | semmle.label | *props |
+| bmqa.cpp:295:33:295:40 | *call to getPropertyAsString | semmle.label | *call to getPropertyAsString |
+| bmqa.cpp:299:25:299:32 | call to source | semmle.label | call to source |
+| bmqa.cpp:301:2:301:6 | setPropertyAsString output argument | semmle.label | setPropertyAsString output argument |
+| bmqa.cpp:301:35:301:39 | value | semmle.label | value |
+| bmqa.cpp:302:7:302:46 | * ... | semmle.label | * ... |
+| bmqa.cpp:302:8:302:12 | *props | semmle.label | *props |
+| bmqa.cpp:302:33:302:40 | *call to getPropertyAsString | semmle.label | *call to getPropertyAsString |
+| bmqa.cpp:306:19:306:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:307:33:307:68 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:309:2:309:6 | setPropertyAsBinary output argument | semmle.label | setPropertyAsBinary output argument |
+| bmqa.cpp:309:35:309:40 | * ... | semmle.label | * ... |
+| bmqa.cpp:310:7:310:46 | * ... | semmle.label | * ... |
+| bmqa.cpp:310:8:310:12 | *props | semmle.label | *props |
+| bmqa.cpp:310:33:310:40 | *call to getPropertyAsBinary [element] | semmle.label | *call to getPropertyAsBinary [element] |
+| bmqa.cpp:315:24:315:31 | call to source | semmle.label | call to source |
+| bmqa.cpp:317:2:317:6 | setPropertyAsBool output argument | semmle.label | setPropertyAsBool output argument |
+| bmqa.cpp:317:26:317:29 | name | semmle.label | name |
+| bmqa.cpp:318:47:318:48 | call to MessagePropertiesIterator | semmle.label | call to MessagePropertiesIterator |
+| bmqa.cpp:318:50:318:55 | *& ... | semmle.label | *& ... |
+| bmqa.cpp:319:7:319:23 | * ... | semmle.label | * ... |
+| bmqa.cpp:319:8:319:9 | *it | semmle.label | *it |
+| bmqa.cpp:319:15:319:17 | *call to name | semmle.label | *call to name |
+| bmqa.cpp:323:24:323:31 | call to source | semmle.label | call to source |
+| bmqa.cpp:325:2:325:6 | setPropertyAsChar output argument | semmle.label | setPropertyAsChar output argument |
+| bmqa.cpp:325:26:325:29 | name | semmle.label | name |
+| bmqa.cpp:326:47:326:48 | call to MessagePropertiesIterator | semmle.label | call to MessagePropertiesIterator |
+| bmqa.cpp:326:50:326:55 | *& ... | semmle.label | *& ... |
+| bmqa.cpp:327:7:327:23 | * ... | semmle.label | * ... |
+| bmqa.cpp:327:8:327:9 | *it | semmle.label | *it |
+| bmqa.cpp:327:15:327:17 | *call to name | semmle.label | *call to name |
+| bmqa.cpp:331:24:331:31 | call to source | semmle.label | call to source |
+| bmqa.cpp:333:2:333:6 | setPropertyAsShort output argument | semmle.label | setPropertyAsShort output argument |
+| bmqa.cpp:333:27:333:30 | name | semmle.label | name |
+| bmqa.cpp:334:47:334:48 | call to MessagePropertiesIterator | semmle.label | call to MessagePropertiesIterator |
+| bmqa.cpp:334:50:334:55 | *& ... | semmle.label | *& ... |
+| bmqa.cpp:335:7:335:23 | * ... | semmle.label | * ... |
+| bmqa.cpp:335:8:335:9 | *it | semmle.label | *it |
+| bmqa.cpp:335:15:335:17 | *call to name | semmle.label | *call to name |
+| bmqa.cpp:339:24:339:31 | call to source | semmle.label | call to source |
+| bmqa.cpp:341:2:341:6 | setPropertyAsInt32 output argument | semmle.label | setPropertyAsInt32 output argument |
+| bmqa.cpp:341:27:341:30 | name | semmle.label | name |
+| bmqa.cpp:342:47:342:48 | call to MessagePropertiesIterator | semmle.label | call to MessagePropertiesIterator |
+| bmqa.cpp:342:50:342:55 | *& ... | semmle.label | *& ... |
+| bmqa.cpp:343:7:343:23 | * ... | semmle.label | * ... |
+| bmqa.cpp:343:8:343:9 | *it | semmle.label | *it |
+| bmqa.cpp:343:15:343:17 | *call to name | semmle.label | *call to name |
+| bmqa.cpp:347:24:347:31 | call to source | semmle.label | call to source |
+| bmqa.cpp:349:2:349:6 | setPropertyAsInt64 output argument | semmle.label | setPropertyAsInt64 output argument |
+| bmqa.cpp:349:27:349:30 | name | semmle.label | name |
+| bmqa.cpp:350:47:350:48 | call to MessagePropertiesIterator | semmle.label | call to MessagePropertiesIterator |
+| bmqa.cpp:350:50:350:55 | *& ... | semmle.label | *& ... |
+| bmqa.cpp:351:7:351:23 | * ... | semmle.label | * ... |
+| bmqa.cpp:351:8:351:9 | *it | semmle.label | *it |
+| bmqa.cpp:351:15:351:17 | *call to name | semmle.label | *call to name |
+| bmqa.cpp:355:24:355:31 | call to source | semmle.label | call to source |
+| bmqa.cpp:357:2:357:6 | setPropertyAsString output argument | semmle.label | setPropertyAsString output argument |
+| bmqa.cpp:357:28:357:31 | name | semmle.label | name |
+| bmqa.cpp:358:47:358:48 | call to MessagePropertiesIterator | semmle.label | call to MessagePropertiesIterator |
+| bmqa.cpp:358:50:358:55 | *& ... | semmle.label | *& ... |
+| bmqa.cpp:359:7:359:23 | * ... | semmle.label | * ... |
+| bmqa.cpp:359:8:359:9 | *it | semmle.label | *it |
+| bmqa.cpp:359:15:359:17 | *call to name | semmle.label | *call to name |
+| bmqa.cpp:363:24:363:31 | call to source | semmle.label | call to source |
+| bmqa.cpp:365:2:365:6 | setPropertyAsBinary output argument | semmle.label | setPropertyAsBinary output argument |
+| bmqa.cpp:365:28:365:31 | name | semmle.label | name |
+| bmqa.cpp:366:47:366:48 | call to MessagePropertiesIterator | semmle.label | call to MessagePropertiesIterator |
+| bmqa.cpp:366:50:366:55 | *& ... | semmle.label | *& ... |
+| bmqa.cpp:367:7:367:23 | * ... | semmle.label | * ... |
+| bmqa.cpp:367:8:367:9 | *it | semmle.label | *it |
+| bmqa.cpp:367:15:367:17 | *call to name | semmle.label | *call to name |
+| bmqa.cpp:371:19:371:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:372:36:372:76 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:374:2:374:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:374:22:374:27 | loadProperties output argument | semmle.label | loadProperties output argument |
+| bmqa.cpp:375:47:375:48 | call to MessagePropertiesIterator | semmle.label | call to MessagePropertiesIterator |
+| bmqa.cpp:375:50:375:55 | *& ... | semmle.label | *& ... |
+| bmqa.cpp:377:8:377:24 | * ... | semmle.label | * ... |
+| bmqa.cpp:377:9:377:10 | *it | semmle.label | *it |
+| bmqa.cpp:377:16:377:18 | *call to name | semmle.label | *call to name |
+| bmqa.cpp:378:8:378:31 | * ... | semmle.label | * ... |
+| bmqa.cpp:378:9:378:10 | *it | semmle.label | *it |
+| bmqa.cpp:378:23:378:25 | *call to getAsString | semmle.label | *call to getAsString |
+| bmqa.cpp:379:8:379:31 | * ... | semmle.label | * ... |
+| bmqa.cpp:379:9:379:10 | *it | semmle.label | *it |
+| bmqa.cpp:379:23:379:25 | *call to getAsBinary [element] | semmle.label | *call to getAsBinary [element] |
+| bmqa.cpp:385:19:385:26 | call to source | semmle.label | call to source |
+| bmqa.cpp:386:36:386:76 | *call to data | semmle.label | *call to data |
+| bmqa.cpp:388:2:388:4 | *msg | semmle.label | *msg |
+| bmqa.cpp:388:22:388:27 | loadProperties output argument | semmle.label | loadProperties output argument |
+| bmqa.cpp:389:47:389:48 | call to MessagePropertiesIterator | semmle.label | call to MessagePropertiesIterator |
+| bmqa.cpp:389:50:389:55 | *& ... | semmle.label | *& ... |
+| bmqa.cpp:391:2:391:5 | operator= output argument | semmle.label | operator= output argument |
+| bmqa.cpp:391:9:391:10 | *it | semmle.label | *it |
+| bmqa.cpp:392:7:392:32 | * ... | semmle.label | * ... |
+| bmqa.cpp:392:8:392:11 | *copy | semmle.label | *copy |
+| bmqa.cpp:392:24:392:26 | *call to getAsString | semmle.label | *call to getAsString |
+| bmqa.cpp:393:7:393:32 | * ... | semmle.label | * ... |
+| bmqa.cpp:393:8:393:18 | *call to operator= | semmle.label | *call to operator= |
+| bmqa.cpp:393:16:393:17 | *it | semmle.label | *it |
+| bmqa.cpp:393:24:393:26 | *call to name | semmle.label | *call to name |
+| bslx.cpp:145:33:145:40 | call to source | semmle.label | call to source |
+| bslx.cpp:146:34:146:39 | call to ByteInStream | semmle.label | call to ByteInStream |
+| bslx.cpp:146:41:146:51 | *call to data | semmle.label | *call to data |
+| bslx.cpp:148:2:148:7 | *stream | semmle.label | *stream |
+| bslx.cpp:148:22:148:24 | getArrayInt8 output argument | semmle.label | getArrayInt8 output argument |
+| bslx.cpp:149:7:149:10 | * ... | semmle.label | * ... |
+| bslx.cpp:153:33:153:40 | call to source | semmle.label | call to source |
+| bslx.cpp:154:34:154:39 | call to ByteInStream | semmle.label | call to ByteInStream |
+| bslx.cpp:154:41:154:51 | *call to data | semmle.label | *call to data |
+| bslx.cpp:156:2:156:7 | *stream | semmle.label | *stream |
+| bslx.cpp:156:19:156:21 | getString output argument | semmle.label | getString output argument |
+| bslx.cpp:157:7:157:17 | * ... | semmle.label | * ... |
+| bslx.cpp:161:33:161:40 | call to source | semmle.label | call to source |
+| bslx.cpp:162:34:162:39 | call to ByteInStream | semmle.label | call to ByteInStream |
+| bslx.cpp:162:41:162:51 | *call to data | semmle.label | *call to data |
+| bslx.cpp:165:2:165:7 | *stream | semmle.label | *stream |
+| bslx.cpp:165:17:165:20 | *call to getInt32 | semmle.label | *call to getInt32 |
+| bslx.cpp:165:31:165:33 | getString output argument | semmle.label | getString output argument |
+| bslx.cpp:166:7:166:17 | * ... | semmle.label | * ... |
+| bslx.cpp:171:33:171:40 | call to source | semmle.label | call to source |
+| bslx.cpp:172:2:172:7 | reset output argument | semmle.label | reset output argument |
+| bslx.cpp:172:15:172:25 | *call to data | semmle.label | *call to data |
+| bslx.cpp:174:2:174:7 | *stream | semmle.label | *stream |
+| bslx.cpp:174:19:174:21 | getString output argument | semmle.label | getString output argument |
+| bslx.cpp:175:7:175:17 | * ... | semmle.label | * ... |
+| bslx.cpp:179:33:179:40 | call to source | semmle.label | call to source |
+| bslx.cpp:180:20:180:45 | *call to data | semmle.label | *call to data |
+| bslx.cpp:181:50:181:55 | call to GenericInStream | semmle.label | call to GenericInStream |
+| bslx.cpp:181:57:181:58 | *sb | semmle.label | *sb |
+| bslx.cpp:183:2:183:7 | *stream | semmle.label | *stream |
+| bslx.cpp:183:19:183:21 | getString output argument | semmle.label | getString output argument |
+| bslx.cpp:184:7:184:17 | * ... | semmle.label | * ... |
+| bslx.cpp:197:33:197:40 | call to source | semmle.label | call to source |
+| bslx.cpp:198:34:198:39 | call to ByteInStream | semmle.label | call to ByteInStream |
+| bslx.cpp:198:41:198:51 | *call to data | semmle.label | *call to data |
+| bslx.cpp:200:53:200:58 | *stream | semmle.label | *stream |
+| bslx.cpp:200:61:200:63 | bdexStreamIn output argument | semmle.label | bdexStreamIn output argument |
+| bslx.cpp:201:7:201:17 | * ... | semmle.label | * ... |
+| bslx.cpp:207:33:207:40 | call to source | semmle.label | call to source |
+| bslx.cpp:208:34:208:39 | call to ByteInStream | semmle.label | call to ByteInStream |
+| bslx.cpp:208:41:208:51 | *call to data | semmle.label | *call to data |
+| bslx.cpp:231:2:231:7 | *stream | semmle.label | *stream |
+| bslx.cpp:231:18:231:21 | *call to getLength | semmle.label | *call to getLength |
+| bslx.cpp:231:32:231:35 | *call to getVersion | semmle.label | *call to getVersion |
+| bslx.cpp:231:43:231:46 | *call to getInt8 | semmle.label | *call to getInt8 |
+| bslx.cpp:231:55:231:59 | *call to getUint8 | semmle.label | *call to getUint8 |
+| bslx.cpp:231:68:231:71 | *call to getInt16 | semmle.label | *call to getInt16 |
+| bslx.cpp:231:81:231:85 | *call to getUint16 | semmle.label | *call to getUint16 |
+| bslx.cpp:231:94:231:97 | *call to getInt24 | semmle.label | *call to getInt24 |
+| bslx.cpp:231:107:231:111 | *call to getUint24 | semmle.label | *call to getUint24 |
+| bslx.cpp:231:120:231:123 | *call to getInt32 | semmle.label | *call to getInt32 |
+| bslx.cpp:231:133:231:137 | *call to getUint32 | semmle.label | *call to getUint32 |
+| bslx.cpp:231:146:231:150 | *call to getInt40 | semmle.label | *call to getInt40 |
+| bslx.cpp:231:160:231:165 | *call to getUint40 | semmle.label | *call to getUint40 |
+| bslx.cpp:231:174:231:178 | *call to getInt48 | semmle.label | *call to getInt48 |
+| bslx.cpp:231:188:231:193 | *call to getUint48 | semmle.label | *call to getUint48 |
+| bslx.cpp:231:202:231:206 | *call to getInt56 | semmle.label | *call to getInt56 |
+| bslx.cpp:231:216:231:221 | *call to getUint56 | semmle.label | *call to getUint56 |
+| bslx.cpp:231:230:231:234 | *call to getInt64 | semmle.label | *call to getInt64 |
+| bslx.cpp:231:244:231:249 | *call to getUint64 | semmle.label | *call to getUint64 |
+| bslx.cpp:231:260:231:263 | *call to getFloat32 | semmle.label | *call to getFloat32 |
+| bslx.cpp:231:274:231:277 | *call to getFloat64 | semmle.label | *call to getFloat64 |
+| bslx.cpp:231:287:231:292 | *call to getString | semmle.label | *call to getString |
+| bslx.cpp:231:305:231:315 | *call to getArrayInt8 | semmle.label | *call to getArrayInt8 |
+| bslx.cpp:231:329:231:340 | *call to getArrayUint8 | semmle.label | *call to getArrayUint8 |
+| bslx.cpp:231:354:231:364 | *call to getArrayInt16 | semmle.label | *call to getArrayInt16 |
+| bslx.cpp:231:379:231:390 | *call to getArrayUint16 | semmle.label | *call to getArrayUint16 |
+| bslx.cpp:231:404:231:414 | *call to getArrayInt24 | semmle.label | *call to getArrayInt24 |
+| bslx.cpp:231:429:231:440 | *call to getArrayUint24 | semmle.label | *call to getArrayUint24 |
+| bslx.cpp:231:454:231:464 | *call to getArrayInt32 | semmle.label | *call to getArrayInt32 |
+| bslx.cpp:231:479:231:490 | *call to getArrayUint32 | semmle.label | *call to getArrayUint32 |
+| bslx.cpp:231:504:231:515 | *call to getArrayInt40 | semmle.label | *call to getArrayInt40 |
+| bslx.cpp:231:530:231:542 | *call to getArrayUint40 | semmle.label | *call to getArrayUint40 |
+| bslx.cpp:231:556:231:567 | *call to getArrayInt48 | semmle.label | *call to getArrayInt48 |
+| bslx.cpp:231:582:231:594 | *call to getArrayUint48 | semmle.label | *call to getArrayUint48 |
+| bslx.cpp:231:608:231:619 | *call to getArrayInt56 | semmle.label | *call to getArrayInt56 |
+| bslx.cpp:231:634:231:646 | *call to getArrayUint56 | semmle.label | *call to getArrayUint56 |
+| bslx.cpp:231:660:231:671 | *call to getArrayInt64 | semmle.label | *call to getArrayInt64 |
+| bslx.cpp:231:686:231:698 | *call to getArrayUint64 | semmle.label | *call to getArrayUint64 |
+| bslx.cpp:231:714:231:724 | *call to getArrayFloat32 | semmle.label | *call to getArrayFloat32 |
+| bslx.cpp:231:740:231:750 | *call to getArrayFloat64 | semmle.label | *call to getArrayFloat64 |
+| bslx.cpp:231:761:231:763 | getString output argument | semmle.label | getString output argument |
+| bslx.cpp:232:7:232:17 | * ... | semmle.label | * ... |
+| bslx.cpp:236:33:236:40 | call to source | semmle.label | call to source |
+| bslx.cpp:237:20:237:45 | *call to data | semmle.label | *call to data |
+| bslx.cpp:238:50:238:55 | call to GenericInStream | semmle.label | call to GenericInStream |
+| bslx.cpp:238:57:238:58 | *sb | semmle.label | *sb |
+| bslx.cpp:261:2:261:7 | *stream | semmle.label | *stream |
+| bslx.cpp:261:18:261:21 | *call to getLength | semmle.label | *call to getLength |
+| bslx.cpp:261:32:261:35 | *call to getVersion | semmle.label | *call to getVersion |
+| bslx.cpp:261:43:261:46 | *call to getInt8 | semmle.label | *call to getInt8 |
+| bslx.cpp:261:55:261:59 | *call to getUint8 | semmle.label | *call to getUint8 |
+| bslx.cpp:261:68:261:71 | *call to getInt16 | semmle.label | *call to getInt16 |
+| bslx.cpp:261:81:261:85 | *call to getUint16 | semmle.label | *call to getUint16 |
+| bslx.cpp:261:94:261:97 | *call to getInt24 | semmle.label | *call to getInt24 |
+| bslx.cpp:261:107:261:111 | *call to getUint24 | semmle.label | *call to getUint24 |
+| bslx.cpp:261:120:261:123 | *call to getInt32 | semmle.label | *call to getInt32 |
+| bslx.cpp:261:133:261:137 | *call to getUint32 | semmle.label | *call to getUint32 |
+| bslx.cpp:261:146:261:150 | *call to getInt40 | semmle.label | *call to getInt40 |
+| bslx.cpp:261:160:261:165 | *call to getUint40 | semmle.label | *call to getUint40 |
+| bslx.cpp:261:174:261:178 | *call to getInt48 | semmle.label | *call to getInt48 |
+| bslx.cpp:261:188:261:193 | *call to getUint48 | semmle.label | *call to getUint48 |
+| bslx.cpp:261:202:261:206 | *call to getInt56 | semmle.label | *call to getInt56 |
+| bslx.cpp:261:216:261:221 | *call to getUint56 | semmle.label | *call to getUint56 |
+| bslx.cpp:261:230:261:234 | *call to getInt64 | semmle.label | *call to getInt64 |
+| bslx.cpp:261:244:261:249 | *call to getUint64 | semmle.label | *call to getUint64 |
+| bslx.cpp:261:260:261:263 | *call to getFloat32 | semmle.label | *call to getFloat32 |
+| bslx.cpp:261:274:261:277 | *call to getFloat64 | semmle.label | *call to getFloat64 |
+| bslx.cpp:261:287:261:292 | *call to getString | semmle.label | *call to getString |
+| bslx.cpp:261:305:261:315 | *call to getArrayInt8 | semmle.label | *call to getArrayInt8 |
+| bslx.cpp:261:329:261:340 | *call to getArrayUint8 | semmle.label | *call to getArrayUint8 |
+| bslx.cpp:261:354:261:364 | *call to getArrayInt16 | semmle.label | *call to getArrayInt16 |
+| bslx.cpp:261:379:261:390 | *call to getArrayUint16 | semmle.label | *call to getArrayUint16 |
+| bslx.cpp:261:404:261:414 | *call to getArrayInt24 | semmle.label | *call to getArrayInt24 |
+| bslx.cpp:261:429:261:440 | *call to getArrayUint24 | semmle.label | *call to getArrayUint24 |
+| bslx.cpp:261:454:261:464 | *call to getArrayInt32 | semmle.label | *call to getArrayInt32 |
+| bslx.cpp:261:479:261:490 | *call to getArrayUint32 | semmle.label | *call to getArrayUint32 |
+| bslx.cpp:261:504:261:515 | *call to getArrayInt40 | semmle.label | *call to getArrayInt40 |
+| bslx.cpp:261:530:261:542 | *call to getArrayUint40 | semmle.label | *call to getArrayUint40 |
+| bslx.cpp:261:556:261:567 | *call to getArrayInt48 | semmle.label | *call to getArrayInt48 |
+| bslx.cpp:261:582:261:594 | *call to getArrayUint48 | semmle.label | *call to getArrayUint48 |
+| bslx.cpp:261:608:261:619 | *call to getArrayInt56 | semmle.label | *call to getArrayInt56 |
+| bslx.cpp:261:634:261:646 | *call to getArrayUint56 | semmle.label | *call to getArrayUint56 |
+| bslx.cpp:261:660:261:671 | *call to getArrayInt64 | semmle.label | *call to getArrayInt64 |
+| bslx.cpp:261:686:261:698 | *call to getArrayUint64 | semmle.label | *call to getArrayUint64 |
+| bslx.cpp:261:714:261:724 | *call to getArrayFloat32 | semmle.label | *call to getArrayFloat32 |
+| bslx.cpp:261:740:261:750 | *call to getArrayFloat64 | semmle.label | *call to getArrayFloat64 |
+| bslx.cpp:261:761:261:763 | getString output argument | semmle.label | getString output argument |
+| bslx.cpp:262:7:262:17 | * ... | semmle.label | * ... |
+| bslx.cpp:266:33:266:40 | call to source | semmle.label | call to source |
+| bslx.cpp:267:34:267:39 | call to ByteInStream | semmle.label | call to ByteInStream |
+| bslx.cpp:267:41:267:51 | *call to data | semmle.label | *call to data |
+| bslx.cpp:269:53:269:58 | *stream | semmle.label | *stream |
+| bslx.cpp:269:61:269:61 | bdexStreamIn output argument | semmle.label | bdexStreamIn output argument |
+| bslx.cpp:270:7:270:7 | x | semmle.label | x |
+| bslx.cpp:271:53:271:58 | *stream | semmle.label | *stream |
+| bslx.cpp:271:61:271:61 | bdexStreamIn output argument | semmle.label | bdexStreamIn output argument |
+| bslx.cpp:272:7:272:7 | x | semmle.label | x |
+| bslx.cpp:274:52:274:66 | *call to bdexStreamIn | semmle.label | *call to bdexStreamIn |
+| bslx.cpp:274:53:274:58 | *stream | semmle.label | *stream |
+| bslx.cpp:274:77:274:79 | getString output argument | semmle.label | getString output argument |
+| bslx.cpp:275:7:275:17 | * ... | semmle.label | * ... |
+| bslx.cpp:279:33:279:40 | call to source | semmle.label | call to source |
+| bslx.cpp:280:34:280:39 | call to ByteInStream | semmle.label | call to ByteInStream |
+| bslx.cpp:280:41:280:51 | *call to data | semmle.label | *call to data |
+| bslx.cpp:282:53:282:58 | *stream | semmle.label | *stream |
+| bslx.cpp:282:61:282:63 | bdexStreamIn output argument | semmle.label | bdexStreamIn output argument |
+| bslx.cpp:283:7:283:17 | * ... | semmle.label | * ... |
+| bslx.cpp:293:33:293:40 | call to source | semmle.label | call to source |
+| bslx.cpp:294:34:294:39 | call to ByteInStream | semmle.label | call to ByteInStream |
+| bslx.cpp:294:41:294:51 | *call to data | semmle.label | *call to data |
+| bslx.cpp:296:53:296:58 | *stream | semmle.label | *stream |
+| bslx.cpp:296:61:296:63 | bdexStreamIn output argument | semmle.label | bdexStreamIn output argument |
+| bslx.cpp:297:7:297:9 | out | semmle.label | out |
+| bslx.cpp:306:40:306:60 | call to source | semmle.label | call to source |
+| bslx.cpp:306:40:306:60 | call to source | semmle.label | call to source |
+| bslx.cpp:307:2:307:7 | reset output argument | semmle.label | reset output argument |
+| bslx.cpp:307:15:307:18 | *data | semmle.label | *data |
+| bslx.cpp:309:2:309:7 | *stream | semmle.label | *stream |
+| bslx.cpp:309:19:309:21 | getString output argument | semmle.label | getString output argument |
+| bslx.cpp:310:7:310:17 | * ... | semmle.label | * ... |
+| bslx.cpp:314:33:314:40 | call to source | semmle.label | call to source |
+| bslx.cpp:315:34:315:39 | call to ByteInStream | semmle.label | call to ByteInStream |
+| bslx.cpp:315:41:315:51 | *call to data | semmle.label | *call to data |
+| bslx.cpp:318:2:318:7 | *stream | semmle.label | *stream |
+| bslx.cpp:318:19:318:21 | getString output argument | semmle.label | getString output argument |
+| bslx.cpp:319:7:319:17 | * ... | semmle.label | * ... |
+| bslx.cpp:333:33:333:40 | call to source | semmle.label | call to source |
+| bslx.cpp:334:34:334:39 | call to ByteInStream | semmle.label | call to ByteInStream |
+| bslx.cpp:334:41:334:51 | *call to data | semmle.label | *call to data |
+| bslx.cpp:338:2:338:7 | *stream | semmle.label | *stream |
+| bslx.cpp:338:19:338:21 | getString output argument | semmle.label | getString output argument |
+| bslx.cpp:340:7:340:17 | * ... | semmle.label | * ... |
+| protobuf.cpp:105:27:105:51 | call to source | semmle.label | call to source |
+| protobuf.cpp:105:27:105:51 | call to source | semmle.label | call to source |
+| protobuf.cpp:106:2:106:4 | ParseFromString output argument | semmle.label | ParseFromString output argument |
+| protobuf.cpp:106:22:106:25 | data | semmle.label | data |
+| protobuf.cpp:107:7:107:9 | msg | semmle.label | msg |
+| protobuf.cpp:112:20:112:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:112:20:112:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:113:2:113:4 | ParseFromString output argument | semmle.label | ParseFromString output argument |
+| protobuf.cpp:113:22:113:25 | *data | semmle.label | *data |
+| protobuf.cpp:114:7:114:9 | msg | semmle.label | msg |
+| protobuf.cpp:119:27:119:51 | call to source | semmle.label | call to source |
+| protobuf.cpp:119:27:119:51 | call to source | semmle.label | call to source |
+| protobuf.cpp:120:2:120:4 | ParsePartialFromString output argument | semmle.label | ParsePartialFromString output argument |
+| protobuf.cpp:120:29:120:32 | data | semmle.label | data |
+| protobuf.cpp:121:7:121:9 | msg | semmle.label | msg |
+| protobuf.cpp:126:20:126:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:126:20:126:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:127:2:127:4 | ParsePartialFromString output argument | semmle.label | ParsePartialFromString output argument |
+| protobuf.cpp:127:29:127:32 | *data | semmle.label | *data |
+| protobuf.cpp:128:7:128:9 | msg | semmle.label | msg |
+| protobuf.cpp:133:27:133:51 | call to source | semmle.label | call to source |
+| protobuf.cpp:133:27:133:51 | call to source | semmle.label | call to source |
+| protobuf.cpp:134:2:134:4 | MergeFromString output argument | semmle.label | MergeFromString output argument |
+| protobuf.cpp:134:22:134:25 | data | semmle.label | data |
+| protobuf.cpp:135:7:135:9 | msg | semmle.label | msg |
+| protobuf.cpp:140:20:140:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:140:20:140:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:141:2:141:4 | MergeFromString output argument | semmle.label | MergeFromString output argument |
+| protobuf.cpp:141:22:141:25 | *data | semmle.label | *data |
+| protobuf.cpp:142:7:142:9 | msg | semmle.label | msg |
+| protobuf.cpp:147:27:147:51 | call to source | semmle.label | call to source |
+| protobuf.cpp:147:27:147:51 | call to source | semmle.label | call to source |
+| protobuf.cpp:148:2:148:4 | MergePartialFromString output argument | semmle.label | MergePartialFromString output argument |
+| protobuf.cpp:148:29:148:32 | data | semmle.label | data |
+| protobuf.cpp:149:7:149:9 | msg | semmle.label | msg |
+| protobuf.cpp:154:20:154:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:154:20:154:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:155:2:155:4 | MergePartialFromString output argument | semmle.label | MergePartialFromString output argument |
+| protobuf.cpp:155:29:155:32 | *data | semmle.label | *data |
+| protobuf.cpp:156:7:156:9 | msg | semmle.label | msg |
+| protobuf.cpp:161:19:161:38 | call to source | semmle.label | call to source |
+| protobuf.cpp:162:2:162:4 | ParseFromArray output argument | semmle.label | ParseFromArray output argument |
+| protobuf.cpp:162:21:162:31 | *call to data | semmle.label | *call to data |
+| protobuf.cpp:163:7:163:9 | msg | semmle.label | msg |
+| protobuf.cpp:168:19:168:38 | call to source | semmle.label | call to source |
+| protobuf.cpp:169:2:169:4 | ParsePartialFromArray output argument | semmle.label | ParsePartialFromArray output argument |
+| protobuf.cpp:169:28:169:38 | *call to data | semmle.label | *call to data |
+| protobuf.cpp:170:7:170:9 | msg | semmle.label | msg |
+| protobuf.cpp:175:20:175:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:175:20:175:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:176:2:176:4 | ParseFromCord output argument | semmle.label | ParseFromCord output argument |
+| protobuf.cpp:176:20:176:23 | *data | semmle.label | *data |
+| protobuf.cpp:177:7:177:9 | msg | semmle.label | msg |
+| protobuf.cpp:182:20:182:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:182:20:182:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:183:2:183:4 | ParsePartialFromCord output argument | semmle.label | ParsePartialFromCord output argument |
+| protobuf.cpp:183:27:183:30 | *data | semmle.label | *data |
+| protobuf.cpp:184:7:184:9 | msg | semmle.label | msg |
+| protobuf.cpp:189:20:189:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:189:20:189:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:190:2:190:4 | MergeFromCord output argument | semmle.label | MergeFromCord output argument |
+| protobuf.cpp:190:20:190:23 | *data | semmle.label | *data |
+| protobuf.cpp:191:7:191:9 | msg | semmle.label | msg |
+| protobuf.cpp:196:20:196:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:196:20:196:37 | call to source | semmle.label | call to source |
+| protobuf.cpp:197:2:197:4 | MergePartialFromCord output argument | semmle.label | MergePartialFromCord output argument |
+| protobuf.cpp:197:27:197:30 | *data | semmle.label | *data |
+| protobuf.cpp:198:7:198:9 | msg | semmle.label | msg |
+| protobuf.cpp:203:20:203:39 | call to source | semmle.label | call to source |
+| protobuf.cpp:203:20:203:39 | call to source | semmle.label | call to source |
+| protobuf.cpp:204:2:204:4 | ParseFromIstream output argument | semmle.label | ParseFromIstream output argument |
+| protobuf.cpp:204:23:204:25 | *& ... | semmle.label | *& ... |
+| protobuf.cpp:205:7:205:9 | msg | semmle.label | msg |
+| protobuf.cpp:210:20:210:39 | call to source | semmle.label | call to source |
+| protobuf.cpp:210:20:210:39 | call to source | semmle.label | call to source |
+| protobuf.cpp:211:2:211:4 | ParsePartialFromIstream output argument | semmle.label | ParsePartialFromIstream output argument |
+| protobuf.cpp:211:30:211:32 | *& ... | semmle.label | *& ... |
+| protobuf.cpp:212:7:212:9 | msg | semmle.label | msg |
+| protobuf.cpp:217:27:217:53 | call to source | semmle.label | call to source |
+| protobuf.cpp:217:27:217:53 | call to source | semmle.label | call to source |
+| protobuf.cpp:218:2:218:4 | ParseFromZeroCopyStream output argument | semmle.label | ParseFromZeroCopyStream output argument |
+| protobuf.cpp:218:30:218:32 | *& ... | semmle.label | *& ... |
+| protobuf.cpp:219:7:219:9 | msg | semmle.label | msg |
+| protobuf.cpp:224:27:224:53 | call to source | semmle.label | call to source |
+| protobuf.cpp:224:27:224:53 | call to source | semmle.label | call to source |
+| protobuf.cpp:225:2:225:4 | ParsePartialFromZeroCopyStream output argument | semmle.label | ParsePartialFromZeroCopyStream output argument |
+| protobuf.cpp:225:37:225:39 | *& ... | semmle.label | *& ... |
+| protobuf.cpp:226:7:226:9 | msg | semmle.label | msg |
+| protobuf.cpp:231:27:231:53 | call to source | semmle.label | call to source |
+| protobuf.cpp:231:27:231:53 | call to source | semmle.label | call to source |
+| protobuf.cpp:232:2:232:4 | ParseFromBoundedZeroCopyStream output argument | semmle.label | ParseFromBoundedZeroCopyStream output argument |
+| protobuf.cpp:232:37:232:39 | *& ... | semmle.label | *& ... |
+| protobuf.cpp:233:7:233:9 | msg | semmle.label | msg |
+| protobuf.cpp:238:27:238:53 | call to source | semmle.label | call to source |
+| protobuf.cpp:238:27:238:53 | call to source | semmle.label | call to source |
+| protobuf.cpp:239:2:239:4 | ParsePartialFromBoundedZeroCopyStream output argument | semmle.label | ParsePartialFromBoundedZeroCopyStream output argument |
+| protobuf.cpp:239:44:239:46 | *& ... | semmle.label | *& ... |
+| protobuf.cpp:240:7:240:9 | msg | semmle.label | msg |
+| protobuf.cpp:245:27:245:53 | call to source | semmle.label | call to source |
+| protobuf.cpp:245:27:245:53 | call to source | semmle.label | call to source |
+| protobuf.cpp:246:2:246:4 | MergeFromBoundedZeroCopyStream output argument | semmle.label | MergeFromBoundedZeroCopyStream output argument |
+| protobuf.cpp:246:37:246:39 | *& ... | semmle.label | *& ... |
+| protobuf.cpp:247:7:247:9 | msg | semmle.label | msg |
+| protobuf.cpp:252:27:252:53 | call to source | semmle.label | call to source |
+| protobuf.cpp:252:27:252:53 | call to source | semmle.label | call to source |
+| protobuf.cpp:253:2:253:4 | MergePartialFromBoundedZeroCopyStream output argument | semmle.label | MergePartialFromBoundedZeroCopyStream output argument |
+| protobuf.cpp:253:44:253:46 | *& ... | semmle.label | *& ... |
+| protobuf.cpp:254:7:254:9 | msg | semmle.label | msg |
+| protobuf.cpp:259:24:259:47 | call to source | semmle.label | call to source |
+| protobuf.cpp:259:24:259:47 | call to source | semmle.label | call to source |
+| protobuf.cpp:260:2:260:4 | ParseFromCodedStream output argument | semmle.label | ParseFromCodedStream output argument |
+| protobuf.cpp:260:27:260:29 | *& ... | semmle.label | *& ... |
+| protobuf.cpp:261:7:261:9 | msg | semmle.label | msg |
+| protobuf.cpp:266:24:266:47 | call to source | semmle.label | call to source |
+| protobuf.cpp:266:24:266:47 | call to source | semmle.label | call to source |
+| protobuf.cpp:267:2:267:4 | ParsePartialFromCodedStream output argument | semmle.label | ParsePartialFromCodedStream output argument |
+| protobuf.cpp:267:34:267:36 | *& ... | semmle.label | *& ... |
+| protobuf.cpp:268:7:268:9 | msg | semmle.label | msg |
+| protobuf.cpp:273:24:273:47 | call to source | semmle.label | call to source |
+| protobuf.cpp:273:24:273:47 | call to source | semmle.label | call to source |
+| protobuf.cpp:274:2:274:4 | MergeFromCodedStream output argument | semmle.label | MergeFromCodedStream output argument |
+| protobuf.cpp:274:27:274:29 | *& ... | semmle.label | *& ... |
+| protobuf.cpp:275:7:275:9 | msg | semmle.label | msg |
+| protobuf.cpp:280:24:280:47 | call to source | semmle.label | call to source |
+| protobuf.cpp:280:24:280:47 | call to source | semmle.label | call to source |
+| protobuf.cpp:281:2:281:4 | MergePartialFromCodedStream output argument | semmle.label | MergePartialFromCodedStream output argument |
+| protobuf.cpp:281:34:281:36 | *& ... | semmle.label | *& ... |
+| protobuf.cpp:282:7:282:9 | msg | semmle.label | msg |
+| protobuf.cpp:295:15:295:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:295:15:295:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:297:2:297:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:297:24:297:27 | SerializeToString output argument | semmle.label | SerializeToString output argument |
+| protobuf.cpp:298:7:298:9 | out | semmle.label | out |
+| protobuf.cpp:302:15:302:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:302:15:302:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:304:2:304:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:304:31:304:34 | SerializePartialToString output argument | semmle.label | SerializePartialToString output argument |
+| protobuf.cpp:305:7:305:9 | out | semmle.label | out |
+| protobuf.cpp:309:15:309:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:309:15:309:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:311:2:311:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:311:21:311:24 | AppendToString output argument | semmle.label | AppendToString output argument |
+| protobuf.cpp:312:7:312:9 | out | semmle.label | out |
+| protobuf.cpp:316:15:316:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:316:15:316:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:318:2:318:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:318:28:318:31 | AppendPartialToString output argument | semmle.label | AppendPartialToString output argument |
+| protobuf.cpp:319:7:319:9 | out | semmle.label | out |
+| protobuf.cpp:323:15:323:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:323:15:323:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:325:2:325:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:325:24:325:27 | SerializeToString output argument | semmle.label | SerializeToString output argument |
+| protobuf.cpp:326:7:326:9 | out | semmle.label | out |
+| protobuf.cpp:330:15:330:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:330:15:330:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:332:2:332:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:332:31:332:34 | SerializePartialToString output argument | semmle.label | SerializePartialToString output argument |
+| protobuf.cpp:333:7:333:9 | out | semmle.label | out |
+| protobuf.cpp:337:15:337:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:337:15:337:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:339:2:339:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:339:21:339:24 | AppendToString output argument | semmle.label | AppendToString output argument |
+| protobuf.cpp:340:7:340:9 | out | semmle.label | out |
+| protobuf.cpp:344:15:344:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:344:15:344:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:346:2:346:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:346:28:346:31 | AppendPartialToString output argument | semmle.label | AppendPartialToString output argument |
+| protobuf.cpp:347:7:347:9 | out | semmle.label | out |
+| protobuf.cpp:351:15:351:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:351:15:351:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:353:2:353:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:353:23:353:25 | SerializeToArray output argument | semmle.label | SerializeToArray output argument |
+| protobuf.cpp:354:7:354:10 | * ... | semmle.label | * ... |
+| protobuf.cpp:358:15:358:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:358:15:358:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:360:2:360:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:360:30:360:32 | SerializePartialToArray output argument | semmle.label | SerializePartialToArray output argument |
+| protobuf.cpp:361:7:361:10 | * ... | semmle.label | * ... |
+| protobuf.cpp:365:15:365:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:365:15:365:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:367:2:367:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:367:22:367:25 | SerializeToCord output argument | semmle.label | SerializeToCord output argument |
+| protobuf.cpp:368:7:368:9 | out | semmle.label | out |
+| protobuf.cpp:372:15:372:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:372:15:372:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:374:2:374:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:374:29:374:32 | SerializePartialToCord output argument | semmle.label | SerializePartialToCord output argument |
+| protobuf.cpp:375:7:375:9 | out | semmle.label | out |
+| protobuf.cpp:379:15:379:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:379:15:379:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:381:2:381:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:381:19:381:22 | AppendToCord output argument | semmle.label | AppendToCord output argument |
+| protobuf.cpp:382:7:382:9 | out | semmle.label | out |
+| protobuf.cpp:386:15:386:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:386:15:386:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:388:2:388:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:388:26:388:29 | AppendPartialToCord output argument | semmle.label | AppendPartialToCord output argument |
+| protobuf.cpp:389:7:389:9 | out | semmle.label | out |
+| protobuf.cpp:393:15:393:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:393:15:393:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:395:2:395:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:395:25:395:28 | SerializeToOstream output argument | semmle.label | SerializeToOstream output argument |
+| protobuf.cpp:396:7:396:9 | out | semmle.label | out |
+| protobuf.cpp:400:15:400:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:400:15:400:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:402:2:402:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:402:32:402:35 | SerializePartialToOstream output argument | semmle.label | SerializePartialToOstream output argument |
+| protobuf.cpp:403:7:403:9 | out | semmle.label | out |
+| protobuf.cpp:407:15:407:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:407:15:407:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:409:2:409:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:409:32:409:35 | SerializeToZeroCopyStream output argument | semmle.label | SerializeToZeroCopyStream output argument |
+| protobuf.cpp:410:7:410:9 | out | semmle.label | out |
+| protobuf.cpp:414:15:414:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:414:15:414:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:416:2:416:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:416:39:416:42 | SerializePartialToZeroCopyStream output argument | semmle.label | SerializePartialToZeroCopyStream output argument |
+| protobuf.cpp:417:7:417:9 | out | semmle.label | out |
+| protobuf.cpp:421:15:421:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:421:15:421:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:423:2:423:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:423:29:423:32 | SerializeToCodedStream output argument | semmle.label | SerializeToCodedStream output argument |
+| protobuf.cpp:424:7:424:9 | out | semmle.label | out |
+| protobuf.cpp:428:15:428:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:428:15:428:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:430:2:430:4 | *msg | semmle.label | *msg |
+| protobuf.cpp:430:36:430:39 | SerializePartialToCodedStream output argument | semmle.label | SerializePartialToCodedStream output argument |
+| protobuf.cpp:431:7:431:9 | out | semmle.label | out |
+| protobuf.cpp:437:15:437:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:437:15:437:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:438:7:438:9 | *msg | semmle.label | *msg |
+| protobuf.cpp:438:11:438:27 | call to SerializeAsString | semmle.label | call to SerializeAsString |
+| protobuf.cpp:442:15:442:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:442:15:442:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:443:7:443:9 | *msg | semmle.label | *msg |
+| protobuf.cpp:443:11:443:34 | call to SerializePartialAsString | semmle.label | call to SerializePartialAsString |
+| protobuf.cpp:447:15:447:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:447:15:447:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:448:7:448:9 | *msg | semmle.label | *msg |
+| protobuf.cpp:448:11:448:25 | call to SerializeAsCord | semmle.label | call to SerializeAsCord |
+| protobuf.cpp:452:15:452:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:452:15:452:28 | call to source | semmle.label | call to source |
+| protobuf.cpp:453:7:453:9 | *msg | semmle.label | *msg |
+| protobuf.cpp:453:11:453:32 | call to SerializePartialAsCord | semmle.label | call to SerializePartialAsCord |
 | test.cpp:7:5:7:30 | *ymlStepGenerated_with_body | semmle.label | *ymlStepGenerated_with_body |
 | test.cpp:7:47:7:52 | value2 | semmle.label | value2 |
 | test.cpp:7:64:7:69 | value2 | semmle.label | value2 |
@@ -480,6 +2659,7 @@ nodes
 | test.cpp:47:12:47:19 | *arg [x] | semmle.label | *arg [x] |
 | test.cpp:48:13:48:13 | *s [x] | semmle.label | *s [x] |
 | test.cpp:48:16:48:16 | x | semmle.label | x |
+| test.cpp:48:16:48:16 | x | semmle.label | x |
 | test.cpp:56:2:56:2 | *s [post update] [x] | semmle.label | *s [post update] [x] |
 | test.cpp:56:2:56:18 | ... = ... | semmle.label | ... = ... |
 | test.cpp:56:8:56:16 | call to ymlSource | semmle.label | call to ymlSource |
@@ -556,20 +2736,234 @@ nodes
 | test.cpp:218:11:218:11 | x | semmle.label | x |
 | test.cpp:222:3:222:3 | operator[] output argument | semmle.label | operator[] output argument |
 | test.cpp:222:3:222:20 | ... = ... | semmle.label | ... = ... |
-| test.cpp:222:10:222:20 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:222:10:222:18 | call to ymlSource | semmle.label | call to ymlSource |
 | test.cpp:223:12:223:12 | *s | semmle.label | *s |
 | test.cpp:223:13:223:15 | call to operator[] | semmle.label | call to operator[] |
 | test.cpp:223:13:223:15 | call to operator[] | semmle.label | call to operator[] |
 | test.cpp:224:11:224:11 | c | semmle.label | c |
+| test.cpp:242:29:242:29 | *s [value] | semmle.label | *s [value] |
+| test.cpp:243:10:243:10 | *s [value] | semmle.label | *s [value] |
+| test.cpp:243:13:243:17 | value | semmle.label | value |
+| test.cpp:243:13:243:17 | value | semmle.label | value |
+| test.cpp:247:26:247:39 | call to ymlFieldSource | semmle.label | call to ymlFieldSource |
+| test.cpp:247:26:247:39 | call to ymlFieldSource [value] | semmle.label | call to ymlFieldSource [value] |
+| test.cpp:248:10:248:16 | *wrapper [value] | semmle.label | *wrapper [value] |
+| test.cpp:248:18:248:22 | value | semmle.label | value |
+| test.cpp:248:18:248:22 | value | semmle.label | value |
+| test.cpp:250:32:250:32 | source_from_callback_template output argument | semmle.label | source_from_callback_template output argument |
+| test.cpp:250:32:250:32 | source_from_callback_template output argument [value] | semmle.label | source_from_callback_template output argument [value] |
+| test.cpp:251:27:251:27 | source_from_callback_ptr output argument | semmle.label | source_from_callback_ptr output argument |
+| test.cpp:251:27:251:27 | source_from_callback_ptr output argument [value] | semmle.label | source_from_callback_ptr output argument [value] |
+| test.cpp:257:35:257:35 | *s [value] | semmle.label | *s [value] |
+| test.cpp:258:12:258:12 | *s [value] | semmle.label | *s [value] |
+| test.cpp:258:15:258:19 | value | semmle.label | value |
+| test.cpp:258:15:258:19 | value | semmle.label | value |
+| test.cpp:262:27:262:31 | source_from_callback_ptr output argument | semmle.label | source_from_callback_ptr output argument |
+| test.cpp:262:27:262:31 | source_from_callback_ptr output argument [value] | semmle.label | source_from_callback_ptr output argument [value] |
+| test.cpp:264:32:266:2 | source_from_callback_template output argument | semmle.label | source_from_callback_template output argument |
+| test.cpp:264:32:266:2 | source_from_callback_template output argument [value] | semmle.label | source_from_callback_template output argument [value] |
+| test.cpp:264:56:264:56 | *s [value] | semmle.label | *s [value] |
+| test.cpp:265:11:265:11 | *s [value] | semmle.label | *s [value] |
+| test.cpp:265:14:265:18 | value | semmle.label | value |
+| test.cpp:265:14:265:18 | value | semmle.label | value |
+| test.cpp:268:27:268:27 | source_from_callback_ptr output argument | semmle.label | source_from_callback_ptr output argument |
+| test.cpp:268:27:268:27 | source_from_callback_ptr output argument [value] | semmle.label | source_from_callback_ptr output argument [value] |
+| test.cpp:268:51:268:51 | *s [value] | semmle.label | *s [value] |
+| test.cpp:269:11:269:11 | *s [value] | semmle.label | *s [value] |
+| test.cpp:269:14:269:18 | value | semmle.label | value |
+| test.cpp:269:14:269:18 | value | semmle.label | value |
+| test.cpp:273:40:273:40 | *s [value] | semmle.label | *s [value] |
+| test.cpp:274:12:274:12 | *s [value] | semmle.label | *s [value] |
+| test.cpp:274:15:274:19 | value | semmle.label | value |
+| test.cpp:274:15:274:19 | value | semmle.label | value |
+| test.cpp:278:32:278:34 | source_from_callback_template output argument | semmle.label | source_from_callback_template output argument |
+| test.cpp:278:32:278:34 | source_from_callback_template output argument [value] | semmle.label | source_from_callback_template output argument [value] |
+| test.cpp:293:5:293:26 | *callback_returning_int | semmle.label | *callback_returning_int |
+| test.cpp:294:5:294:28 | *callback_returning_int_2 | semmle.label | *callback_returning_int_2 |
+| test.cpp:295:6:295:31 | **callback_returning_ptr_int | semmle.label | **callback_returning_ptr_int |
+| test.cpp:297:5:297:20 | *return_ymlSource | semmle.label | *return_ymlSource |
+| test.cpp:297:33:297:41 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:297:33:297:41 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:299:6:299:28 | **return_ptr_to_ymlSource | semmle.label | **return_ptr_to_ymlSource |
+| test.cpp:299:41:299:52 | *call to ymlSourcePtr | semmle.label | *call to ymlSourcePtr |
+| test.cpp:299:41:299:52 | call to ymlSourcePtr | semmle.label | call to ymlSourcePtr |
+| test.cpp:304:10:304:24 | * ... | semmle.label | * ... |
+| test.cpp:304:11:304:22 | call to ymlSourcePtr | semmle.label | call to ymlSourcePtr |
+| test.cpp:306:39:306:60 | source_from_callback_return_template output argument | semmle.label | source_from_callback_return_template output argument |
+| test.cpp:307:10:307:31 | call to callback_returning_int | semmle.label | call to callback_returning_int |
+| test.cpp:307:10:307:31 | call to callback_returning_int | semmle.label | call to callback_returning_int |
+| test.cpp:309:34:309:57 | source_from_callback_return_ptr output argument | semmle.label | source_from_callback_return_ptr output argument |
+| test.cpp:310:10:310:33 | call to callback_returning_int_2 | semmle.label | call to callback_returning_int_2 |
+| test.cpp:310:10:310:33 | call to callback_returning_int_2 | semmle.label | call to callback_returning_int_2 |
+| test.cpp:312:38:312:63 | source_ptr_from_callback_return_ptr output argument | semmle.label | source_ptr_from_callback_return_ptr output argument |
+| test.cpp:313:13:313:38 | *call to callback_returning_ptr_int | semmle.label | *call to callback_returning_ptr_int |
+| test.cpp:313:13:313:38 | *call to callback_returning_ptr_int | semmle.label | *call to callback_returning_ptr_int |
+| test.cpp:315:10:315:13 | * ... | semmle.label | * ... |
+| test.cpp:317:37:317:64 | [...](...){...} | semmle.label | [...](...){...} |
+| test.cpp:317:39:317:39 | *operator() | semmle.label | *operator() |
+| test.cpp:317:51:317:59 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:317:51:317:59 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:318:37:318:52 | return_ymlSource | semmle.label | return_ymlSource |
+| test.cpp:320:36:320:36 | call to operator int *(*)() | semmle.label | call to operator int *(*)() |
+| test.cpp:320:38:320:38 | **operator() | semmle.label | **operator() |
+| test.cpp:320:50:320:61 | *call to ymlSourcePtr | semmle.label | *call to ymlSourcePtr |
+| test.cpp:320:50:320:61 | call to ymlSourcePtr | semmle.label | call to ymlSourcePtr |
+| test.cpp:321:36:321:58 | return_ptr_to_ymlSource | semmle.label | return_ptr_to_ymlSource |
+| test.cpp:324:36:324:36 | p | semmle.label | p |
+| test.cpp:324:36:324:36 | p | semmle.label | p |
+| test.cpp:324:53:324:53 | s | semmle.label | s |
+| test.cpp:324:53:324:53 | s | semmle.label | s |
+| test.cpp:324:61:324:66 | source | semmle.label | source |
+| test.cpp:325:10:325:10 | *p [value] | semmle.label | *p [value] |
+| test.cpp:325:13:325:17 | value | semmle.label | value |
+| test.cpp:325:13:325:17 | value | semmle.label | value |
+| test.cpp:327:10:327:20 | * ... | semmle.label | * ... |
+| test.cpp:327:10:327:20 | * ... | semmle.label | * ... |
+| test.cpp:327:11:327:11 | *p [*pointer] | semmle.label | *p [*pointer] |
+| test.cpp:329:10:329:10 | *s [value] | semmle.label | *s [value] |
+| test.cpp:329:12:329:16 | value | semmle.label | value |
+| test.cpp:329:12:329:16 | value | semmle.label | value |
+| test.cpp:331:10:331:19 | * ... | semmle.label | * ... |
+| test.cpp:331:10:331:19 | * ... | semmle.label | * ... |
+| test.cpp:331:11:331:11 | *s [*pointer] | semmle.label | *s [*pointer] |
+| test.cpp:334:10:334:16 | * ... | semmle.label | * ... |
+| test.cpp:341:3:341:22 | *this [Return] [s] | semmle.label | *this [Return] [s] |
+| test.cpp:341:30:341:32 | arg | semmle.label | arg |
+| test.cpp:342:5:342:8 | *this [post update] [s] | semmle.label | *this [post update] [s] |
+| test.cpp:342:5:342:17 | ... = ... | semmle.label | ... = ... |
+| test.cpp:345:3:345:22 | *this [Return] [ul] | semmle.label | *this [Return] [ul] |
+| test.cpp:345:38:345:40 | arg | semmle.label | arg |
+| test.cpp:346:5:346:8 | *this [post update] [ul] | semmle.label | *this [post update] [ul] |
+| test.cpp:346:5:346:18 | ... = ... | semmle.label | ... = ... |
+| test.cpp:362:15:362:23 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:362:15:362:25 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:363:5:363:5 | forward output argument [s] | semmle.label | forward output argument [s] |
+| test.cpp:363:5:363:5 | forward output argument [ul] | semmle.label | forward output argument [ul] |
+| test.cpp:363:15:363:15 | *x | semmle.label | *x |
+| test.cpp:365:30:365:30 | *f [s] | semmle.label | *f [s] |
+| test.cpp:365:30:365:30 | *f [ul] | semmle.label | *f [ul] |
+| test.cpp:365:32:365:34 | call to get [s] | semmle.label | call to get [s] |
+| test.cpp:365:32:365:34 | call to get [s] | semmle.label | call to get [s] |
+| test.cpp:365:32:365:34 | call to get [ul] | semmle.label | call to get [ul] |
+| test.cpp:365:32:365:34 | call to get [ul] | semmle.label | call to get [ul] |
+| test.cpp:366:13:366:13 | *c [s] | semmle.label | *c [s] |
+| test.cpp:366:13:366:15 | s | semmle.label | s |
+| test.cpp:366:15:366:15 | s | semmle.label | s |
+| test.cpp:367:13:367:13 | *c [ul] | semmle.label | *c [ul] |
+| test.cpp:367:13:367:16 | ul | semmle.label | ul |
+| test.cpp:367:15:367:16 | ul | semmle.label | ul |
+| test.cpp:371:24:371:32 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:371:24:371:34 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:372:5:372:5 | forward output argument [s] | semmle.label | forward output argument [s] |
+| test.cpp:372:5:372:5 | forward output argument [ul] | semmle.label | forward output argument [ul] |
+| test.cpp:372:15:372:16 | *ul | semmle.label | *ul |
+| test.cpp:374:30:374:30 | *f [s] | semmle.label | *f [s] |
+| test.cpp:374:30:374:30 | *f [ul] | semmle.label | *f [ul] |
+| test.cpp:374:32:374:34 | call to get [s] | semmle.label | call to get [s] |
+| test.cpp:374:32:374:34 | call to get [s] | semmle.label | call to get [s] |
+| test.cpp:374:32:374:34 | call to get [ul] | semmle.label | call to get [ul] |
+| test.cpp:374:32:374:34 | call to get [ul] | semmle.label | call to get [ul] |
+| test.cpp:375:13:375:13 | *c [s] | semmle.label | *c [s] |
+| test.cpp:375:13:375:15 | s | semmle.label | s |
+| test.cpp:375:15:375:15 | s | semmle.label | s |
+| test.cpp:376:13:376:13 | *c [ul] | semmle.label | *c [ul] |
+| test.cpp:376:13:376:16 | ul | semmle.label | ul |
+| test.cpp:376:15:376:16 | ul | semmle.label | ul |
+| test.cpp:398:11:398:19 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:398:11:398:19 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:399:15:399:36 | call to makeForwarded [x] | semmle.label | call to makeForwarded [x] |
+| test.cpp:399:15:399:36 | call to makeForwarded [x] | semmle.label | call to makeForwarded [x] |
+| test.cpp:399:38:399:38 | x | semmle.label | x |
+| test.cpp:400:11:400:11 | *e [x] | semmle.label | *e [x] |
+| test.cpp:400:13:400:13 | x | semmle.label | x |
+| test.cpp:400:13:400:13 | x | semmle.label | x |
+| test.cpp:405:11:405:19 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:405:11:405:19 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:406:3:406:3 | forwardToElement output argument [x] | semmle.label | forwardToElement output argument [x] |
+| test.cpp:406:22:406:22 | x | semmle.label | x |
+| test.cpp:407:15:407:15 | *f [x] | semmle.label | *f [x] |
+| test.cpp:407:17:407:19 | call to get [x] | semmle.label | call to get [x] |
+| test.cpp:407:17:407:19 | call to get [x] | semmle.label | call to get [x] |
+| test.cpp:408:11:408:11 | *e [x] | semmle.label | *e [x] |
+| test.cpp:408:13:408:13 | x | semmle.label | x |
+| test.cpp:408:13:408:13 | x | semmle.label | x |
+| test.cpp:413:11:413:19 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:413:11:413:19 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:414:3:414:3 | emplace output argument [element, x] | semmle.label | emplace output argument [element, x] |
+| test.cpp:414:16:414:16 | *x | semmle.label | *x |
+| test.cpp:416:15:416:15 | *c [element, x] | semmle.label | *c [element, x] |
+| test.cpp:416:20:416:22 | call to get [x] | semmle.label | call to get [x] |
+| test.cpp:416:20:416:22 | call to get [x] | semmle.label | call to get [x] |
+| test.cpp:417:11:417:11 | *e [x] | semmle.label | *e [x] |
+| test.cpp:417:13:417:13 | x | semmle.label | x |
+| test.cpp:417:13:417:13 | x | semmle.label | x |
+| test.cpp:422:3:422:8 | emplace output argument [element] | semmle.label | emplace output argument [element] |
+| test.cpp:422:21:422:29 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:422:21:422:29 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:422:21:422:31 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:423:11:423:16 | *scalar [element] | semmle.label | *scalar [element] |
+| test.cpp:423:18:423:20 | call to get | semmle.label | call to get |
+| test.cpp:423:21:423:23 | call to get | semmle.label | call to get |
+| test.cpp:426:3:426:9 | emplace output argument [element] | semmle.label | emplace output argument [element] |
+| test.cpp:426:22:426:33 | *call to ymlSourcePtr | semmle.label | *call to ymlSourcePtr |
+| test.cpp:426:22:426:33 | call to ymlSourcePtr | semmle.label | call to ymlSourcePtr |
+| test.cpp:426:22:426:35 | **call to ymlSourcePtr | semmle.label | **call to ymlSourcePtr |
+| test.cpp:427:11:427:24 | * ... | semmle.label | * ... |
+| test.cpp:427:12:427:18 | *pointer [element] | semmle.label | *pointer [element] |
+| test.cpp:437:11:437:19 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:437:11:437:19 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:438:3:438:3 | emplace output argument [element, x] | semmle.label | emplace output argument [element, x] |
+| test.cpp:438:16:438:16 | *x | semmle.label | *x |
+| test.cpp:440:34:440:34 | *c [element, x] | semmle.label | *c [element, x] |
+| test.cpp:440:39:440:41 | call to get [x] | semmle.label | call to get [x] |
+| test.cpp:440:39:440:41 | call to get [x] | semmle.label | call to get [x] |
+| test.cpp:441:11:441:11 | *e [x] | semmle.label | *e [x] |
+| test.cpp:441:13:441:13 | x | semmle.label | x |
+| test.cpp:441:13:441:13 | x | semmle.label | x |
+| test.cpp:446:3:446:28 | *ElementWithOverloadedArity [post update] [x] | semmle.label | *ElementWithOverloadedArity [post update] [x] |
+| test.cpp:446:3:446:28 | *this [Return] [x] | semmle.label | *this [Return] [x] |
+| test.cpp:446:34:446:38 | first | semmle.label | first |
+| test.cpp:446:45:446:49 | first | semmle.label | first |
+| test.cpp:447:3:447:28 | *ElementWithOverloadedArity [post update] [x] | semmle.label | *ElementWithOverloadedArity [post update] [x] |
+| test.cpp:447:3:447:28 | *this [Return] [x] | semmle.label | *this [Return] [x] |
+| test.cpp:447:39:447:44 | second | semmle.label | second |
+| test.cpp:447:51:447:56 | second | semmle.label | second |
+| test.cpp:451:11:451:19 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:451:11:451:19 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:454:5:454:5 | emplace output argument [element, x] | semmle.label | emplace output argument [element, x] |
+| test.cpp:454:18:454:18 | *x | semmle.label | *x |
+| test.cpp:455:13:455:13 | *c [element, x] | semmle.label | *c [element, x] |
+| test.cpp:455:18:455:20 | *call to get [x] | semmle.label | *call to get [x] |
+| test.cpp:455:21:455:21 | x | semmle.label | x |
+| test.cpp:455:21:455:21 | x | semmle.label | x |
+| test.cpp:464:5:464:5 | emplace output argument [element, x] | semmle.label | emplace output argument [element, x] |
+| test.cpp:464:21:464:21 | *x | semmle.label | *x |
+| test.cpp:465:13:465:13 | *c [element, x] | semmle.label | *c [element, x] |
+| test.cpp:465:18:465:20 | *call to get [x] | semmle.label | *call to get [x] |
+| test.cpp:465:21:465:21 | x | semmle.label | x |
+| test.cpp:465:21:465:21 | x | semmle.label | x |
+| test.cpp:472:5:472:5 | forward output argument | semmle.label | forward output argument |
+| test.cpp:472:15:472:23 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:472:15:472:23 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:472:15:472:25 | call to ymlSource | semmle.label | call to ymlSource |
+| test.cpp:473:13:473:13 | *f | semmle.label | *f |
+| test.cpp:473:15:473:17 | call to get | semmle.label | call to get |
+| test.cpp:473:15:473:17 | call to get | semmle.label | call to get |
+| test.cpp:477:5:477:5 | forward output argument | semmle.label | forward output argument |
+| test.cpp:477:15:477:26 | *call to ymlSourcePtr | semmle.label | *call to ymlSourcePtr |
+| test.cpp:477:15:477:26 | call to ymlSourcePtr | semmle.label | call to ymlSourcePtr |
+| test.cpp:477:15:477:28 | **call to ymlSourcePtr | semmle.label | **call to ymlSourcePtr |
+| test.cpp:478:13:478:20 | * ... | semmle.label | * ... |
+| test.cpp:478:14:478:14 | *f | semmle.label | *f |
 | windows.cpp:22:15:22:29 | *call to GetCommandLineA | semmle.label | *call to GetCommandLineA |
-| windows.cpp:22:15:22:29 | *call to GetCommandLineA | semmle.label | *call to GetCommandLineA |
+| windows.cpp:22:15:22:29 | call to GetCommandLineA | semmle.label | call to GetCommandLineA |
 | windows.cpp:24:8:24:11 | * ... | semmle.label | * ... |
 | windows.cpp:27:17:27:34 | **call to CommandLineToArgvA | semmle.label | **call to CommandLineToArgvA |
 | windows.cpp:27:17:27:34 | **call to CommandLineToArgvA | semmle.label | **call to CommandLineToArgvA |
 | windows.cpp:27:36:27:38 | *cmd | semmle.label | *cmd |
 | windows.cpp:30:8:30:15 | * ... | semmle.label | * ... |
 | windows.cpp:34:17:34:38 | *call to GetEnvironmentStringsA | semmle.label | *call to GetEnvironmentStringsA |
-| windows.cpp:34:17:34:38 | *call to GetEnvironmentStringsA | semmle.label | *call to GetEnvironmentStringsA |
+| windows.cpp:34:17:34:38 | call to GetEnvironmentStringsA | semmle.label | call to GetEnvironmentStringsA |
 | windows.cpp:36:10:36:13 | * ... | semmle.label | * ... |
 | windows.cpp:39:36:39:38 | GetEnvironmentVariableA output argument | semmle.label | GetEnvironmentVariableA output argument |
 | windows.cpp:41:10:41:13 | * ... | semmle.label | * ... |
@@ -599,31 +2993,31 @@ nodes
 | windows.cpp:209:84:209:89 | NtReadFile output argument | semmle.label | NtReadFile output argument |
 | windows.cpp:211:10:211:16 | * ... | semmle.label | * ... |
 | windows.cpp:286:23:286:35 | *call to MapViewOfFile | semmle.label | *call to MapViewOfFile |
-| windows.cpp:286:23:286:35 | *call to MapViewOfFile | semmle.label | *call to MapViewOfFile |
+| windows.cpp:286:23:286:35 | call to MapViewOfFile | semmle.label | call to MapViewOfFile |
 | windows.cpp:287:20:287:52 | *pMapView | semmle.label | *pMapView |
 | windows.cpp:289:10:289:16 | * ... | semmle.label | * ... |
 | windows.cpp:293:23:293:36 | *call to MapViewOfFile2 | semmle.label | *call to MapViewOfFile2 |
-| windows.cpp:293:23:293:36 | *call to MapViewOfFile2 | semmle.label | *call to MapViewOfFile2 |
+| windows.cpp:293:23:293:36 | call to MapViewOfFile2 | semmle.label | call to MapViewOfFile2 |
 | windows.cpp:294:20:294:52 | *pMapView | semmle.label | *pMapView |
 | windows.cpp:296:10:296:16 | * ... | semmle.label | * ... |
 | windows.cpp:302:23:302:36 | *call to MapViewOfFile3 | semmle.label | *call to MapViewOfFile3 |
-| windows.cpp:302:23:302:36 | *call to MapViewOfFile3 | semmle.label | *call to MapViewOfFile3 |
+| windows.cpp:302:23:302:36 | call to MapViewOfFile3 | semmle.label | call to MapViewOfFile3 |
 | windows.cpp:303:20:303:52 | *pMapView | semmle.label | *pMapView |
 | windows.cpp:305:10:305:16 | * ... | semmle.label | * ... |
 | windows.cpp:311:23:311:43 | *call to MapViewOfFile3FromApp | semmle.label | *call to MapViewOfFile3FromApp |
-| windows.cpp:311:23:311:43 | *call to MapViewOfFile3FromApp | semmle.label | *call to MapViewOfFile3FromApp |
+| windows.cpp:311:23:311:43 | call to MapViewOfFile3FromApp | semmle.label | call to MapViewOfFile3FromApp |
 | windows.cpp:312:20:312:52 | *pMapView | semmle.label | *pMapView |
 | windows.cpp:314:10:314:16 | * ... | semmle.label | * ... |
 | windows.cpp:318:23:318:37 | *call to MapViewOfFileEx | semmle.label | *call to MapViewOfFileEx |
-| windows.cpp:318:23:318:37 | *call to MapViewOfFileEx | semmle.label | *call to MapViewOfFileEx |
+| windows.cpp:318:23:318:37 | call to MapViewOfFileEx | semmle.label | call to MapViewOfFileEx |
 | windows.cpp:319:20:319:52 | *pMapView | semmle.label | *pMapView |
 | windows.cpp:321:10:321:16 | * ... | semmle.label | * ... |
 | windows.cpp:325:23:325:42 | *call to MapViewOfFileFromApp | semmle.label | *call to MapViewOfFileFromApp |
-| windows.cpp:325:23:325:42 | *call to MapViewOfFileFromApp | semmle.label | *call to MapViewOfFileFromApp |
+| windows.cpp:325:23:325:42 | call to MapViewOfFileFromApp | semmle.label | call to MapViewOfFileFromApp |
 | windows.cpp:326:20:326:52 | *pMapView | semmle.label | *pMapView |
 | windows.cpp:328:10:328:16 | * ... | semmle.label | * ... |
 | windows.cpp:332:23:332:40 | *call to MapViewOfFileNuma2 | semmle.label | *call to MapViewOfFileNuma2 |
-| windows.cpp:332:23:332:40 | *call to MapViewOfFileNuma2 | semmle.label | *call to MapViewOfFileNuma2 |
+| windows.cpp:332:23:332:40 | call to MapViewOfFileNuma2 | semmle.label | call to MapViewOfFileNuma2 |
 | windows.cpp:333:20:333:52 | *pMapView | semmle.label | *pMapView |
 | windows.cpp:335:10:335:16 | * ... | semmle.label | * ... |
 | windows.cpp:403:26:403:36 | *lpParameter [x] | semmle.label | *lpParameter [x] |
@@ -782,4 +3176,10 @@ nodes
 subpaths
 | test.cpp:32:41:32:41 | x | test.cpp:7:47:7:52 | value2 | test.cpp:7:5:7:30 | *ymlStepGenerated_with_body | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body |
 | test.cpp:172:51:172:51 | x | test.cpp:164:34:164:34 | x | test.cpp:164:7:164:7 | *templateFunction3 | test.cpp:172:13:172:44 | call to templateFunction3 |
+| test.cpp:363:15:363:15 | *x | test.cpp:341:30:341:32 | arg | test.cpp:341:3:341:22 | *this [Return] [s] | test.cpp:363:5:363:5 | forward output argument [s] |
+| test.cpp:363:15:363:15 | *x | test.cpp:345:38:345:40 | arg | test.cpp:345:3:345:22 | *this [Return] [ul] | test.cpp:363:5:363:5 | forward output argument [ul] |
+| test.cpp:372:15:372:16 | *ul | test.cpp:341:30:341:32 | arg | test.cpp:341:3:341:22 | *this [Return] [s] | test.cpp:372:5:372:5 | forward output argument [s] |
+| test.cpp:372:15:372:16 | *ul | test.cpp:345:38:345:40 | arg | test.cpp:345:3:345:22 | *this [Return] [ul] | test.cpp:372:5:372:5 | forward output argument [ul] |
+| test.cpp:454:18:454:18 | *x | test.cpp:446:34:446:38 | first | test.cpp:446:3:446:28 | *this [Return] [x] | test.cpp:454:5:454:5 | emplace output argument [element, x] |
+| test.cpp:464:21:464:21 | *x | test.cpp:447:39:447:44 | second | test.cpp:447:3:447:28 | *this [Return] [x] | test.cpp:464:5:464:5 | emplace output argument [element, x] |
 testFailures
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/flow.ext.yml b/cpp/ql/test/library-tests/dataflow/external-models/flow.ext.yml
index 130e13a92571..77f168112bb5 100644
--- a/cpp/ql/test/library-tests/dataflow/external-models/flow.ext.yml
+++ b/cpp/ql/test/library-tests/dataflow/external-models/flow.ext.yml
@@ -4,11 +4,26 @@ extensions:
       extensible: sourceModel
     data: # namespace, type, subtypes, name, signature, ext, output, kind, provenance
       - ["", "", False, "ymlSource", "", "", "ReturnValue", "local", "manual"]
+      - ["", "", False, "ymlSourcePtr", "", "", "ReturnValue[*]", "local", "manual"]
+      - ["", "", False, "ymlFieldSource", "", "", "ReturnValue.Field[SourceWrapper::value]", "local", "manual"]
+      - ["", "", False, "source_from_callback_template", "", "", "Argument[0].Parameter[*0].Field[SourceWrapper::value]", "local", "manual"]
+      - ["", "", False, "source_from_callback_ptr", "", "", "Argument[0].Parameter[*0].Field[SourceWrapper::value]", "local", "manual"]
+      - ["", "", False, "source_from_callback_return_template", "", "", "Argument[0].ReturnValue", "local", "manual"]
+      - ["", "", False, "source_from_callback_return_ptr", "", "", "Argument[0].ReturnValue", "local", "manual"]
+      - ["", "", False, "source_ptr_from_callback_return_ptr", "", "", "Argument[0].ReturnValue[*]", "local", "manual"]
+      - ["", "", False, "test_parameter", "", "", "Parameter[*0].Field[SourceWrapper::value]", "local", "manual"]
+      - ["", "", False, "test_parameter", "", "", "Parameter[*0].Field[*SourceWrapper::pointer]", "local", "manual"]
+      - ["", "", False, "test_parameter", "", "", "Parameter[1].Field[*SourceWrapper::pointer]", "local", "manual"]
+      - ["", "", False, "test_parameter", "", "", "Parameter[1].Field[SourceWrapper::value]", "local", "manual"]
+      - ["", "", False, "test_parameter", "", "", "Parameter[*2]", "local", "manual"]
   - addsTo:
       pack: codeql/cpp-all
       extensible: sinkModel
     data: # namespace, type, subtypes, name, signature, ext, input, kind, provenance
       - ["", "", False, "ymlSink", "", "", "Argument[0]", "test-sink", "manual"]
+      - ["", "", False, "sink_from_callback_return_template", "", "", "Argument[0].ReturnValue", "test-sink", "manual"]
+      - ["", "", False, "sink_from_callback_return_ptr", "", "", "Argument[0].ReturnValue", "test-sink", "manual"]
+      - ["", "", False, "sink_ptr_from_callback_return_ptr", "", "", "Argument[0].ReturnValue[*]", "test-sink", "manual"]
   - addsTo:
       pack: codeql/cpp-all
       extensible: summaryModel
@@ -27,3 +42,15 @@ extensions:
       - ["", "ReverseFlow", True, "get_ptr", "", "", "ReturnValue[*]", "Argument[-1].Field[ReverseFlow::value]", "value", "manual"]
       - ["", "MyString", True, "operator[]", "", "", "ReturnValue[*]", "Argument[-1]", "taint", "manual"]
       - ["", "MyString", True, "operator[]", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["", "Forwarder", True, "get", "", "", "Argument[-1]", "ReturnValue", "value", "manual"]
+      - ["", "Container", True, "get", "", "", "Argument[-1].Element", "ReturnValue[*]", "value", "manual"]
+      - ["", "Element", True, "Element", "", "", "Argument[0]", "Argument[-1].Field[Element::x]", "value", "manual"]
+      - ["", "ElementWithDefaultArgument", True, "ElementWithDefaultArgument", "", "", "Argument[0]", "Argument[-1].Field[ElementWithDefaultArgument::x]", "value", "manual"]
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: forwardsModel
+    data: # namespace, type, subtypes, name, signature, ext, start, constructor, output, provenance
+      - ["", "Forwarder<T>", True, "forward<Args>", "(Args &&)", "", "0", "T", "Argument[-1]", "manual"]
+      - ["", "", False, "makeForwarded<T>", "(int)", "", "0", "T", "ReturnValue", "manual"]
+      - ["", "Forwarder", True, "forwardToElement", "(int)", "", "0", "Element", "Argument[-1]", "manual"]
+      - ["", "Container<T>", True, "emplace<Args>", "(int,Args &&)", "", "1", "value_type", "Argument[-1].Element", "manual"]
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/protobuf.cpp b/cpp/ql/test/library-tests/dataflow/external-models/protobuf.cpp
new file mode 100644
index 000000000000..ec8043218255
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/external-models/protobuf.cpp
@@ -0,0 +1,459 @@
+
+// --- stub library headers ---
+
+#include "../taint-tests/stl.h"
+
+namespace absl {
+	class string_view {
+	public:
+		string_view();
+		string_view(const char *s);
+		string_view(const std::string &s);
+	};
+
+	class Cord {
+	public:
+		Cord();
+	};
+}
+
+namespace google {
+namespace protobuf {
+	namespace io {
+		class ZeroCopyInputStream {};
+		class ZeroCopyOutputStream {};
+		class CodedInputStream {};
+		class CodedOutputStream {};
+	}
+
+	class MessageLite {
+	public:
+		bool ParseFromString(absl::string_view data);
+		bool ParseFromString(const absl::Cord &data);
+		bool ParsePartialFromString(absl::string_view data);
+		bool ParsePartialFromString(const absl::Cord &data);
+		bool MergeFromString(absl::string_view data);
+		bool MergeFromString(const absl::Cord &data);
+		bool MergePartialFromString(absl::string_view data);
+		bool MergePartialFromString(const absl::Cord &data);
+		bool ParseFromArray(const void *data, int size);
+		bool ParsePartialFromArray(const void *data, int size);
+		bool ParseFromCord(const absl::Cord &data);
+		bool ParsePartialFromCord(const absl::Cord &data);
+		bool MergeFromCord(const absl::Cord &data);
+		bool MergePartialFromCord(const absl::Cord &data);
+		bool ParseFromIstream(std::istream *input);
+		bool ParsePartialFromIstream(std::istream *input);
+		bool ParseFromZeroCopyStream(io::ZeroCopyInputStream *input);
+		bool ParsePartialFromZeroCopyStream(io::ZeroCopyInputStream *input);
+		bool ParseFromBoundedZeroCopyStream(io::ZeroCopyInputStream *input, int size);
+		bool ParsePartialFromBoundedZeroCopyStream(io::ZeroCopyInputStream *input, int size);
+		bool MergeFromBoundedZeroCopyStream(io::ZeroCopyInputStream *input, int size);
+		bool MergePartialFromBoundedZeroCopyStream(io::ZeroCopyInputStream *input, int size);
+		bool ParseFromCodedStream(io::CodedInputStream *input);
+		bool ParsePartialFromCodedStream(io::CodedInputStream *input);
+		bool MergeFromCodedStream(io::CodedInputStream *input);
+		bool MergePartialFromCodedStream(io::CodedInputStream *input);
+
+		bool SerializeToString(std::string *output) const;
+		bool SerializePartialToString(std::string *output) const;
+		bool AppendToString(std::string *output) const;
+		bool AppendPartialToString(std::string *output) const;
+		bool SerializeToString(absl::Cord *output) const;
+		bool SerializePartialToString(absl::Cord *output) const;
+		bool AppendToString(absl::Cord *output) const;
+		bool AppendPartialToString(absl::Cord *output) const;
+		bool SerializeToArray(void *data, int size) const;
+		bool SerializePartialToArray(void *data, int size) const;
+		bool SerializeToCord(absl::Cord *output) const;
+		bool SerializePartialToCord(absl::Cord *output) const;
+		bool AppendToCord(absl::Cord *output) const;
+		bool AppendPartialToCord(absl::Cord *output) const;
+		bool SerializeToOstream(std::ostream *output) const;
+		bool SerializePartialToOstream(std::ostream *output) const;
+		bool SerializeToZeroCopyStream(io::ZeroCopyOutputStream *output) const;
+		bool SerializePartialToZeroCopyStream(io::ZeroCopyOutputStream *output) const;
+		bool SerializeToCodedStream(io::CodedOutputStream *output) const;
+		bool SerializePartialToCodedStream(io::CodedOutputStream *output) const;
+
+		std::string SerializeAsString() const;
+		std::string SerializePartialAsString() const;
+		absl::Cord SerializeAsCord() const;
+		absl::Cord SerializePartialAsCord() const;
+	};
+
+	class Message : public MessageLite {
+	};
+}
+}
+
+// A generated message type derives from `Message`.
+class Person : public google::protobuf::Message {
+};
+
+// --- test code ---
+
+template<typename T> T source();
+void sink(...);
+
+using namespace google::protobuf::io;
+
+// Deserialization: the input taints the message.
+
+void test_ParseFromString_string_view() {
+	Person msg;
+	absl::string_view data = source<absl::string_view>();
+	msg.ParseFromString(data);
+	sink(msg); // $ ir
+}
+
+void test_ParseFromString_Cord() {
+	Person msg;
+	absl::Cord data = source<absl::Cord>();
+	msg.ParseFromString(data);
+	sink(msg); // $ ir
+}
+
+void test_ParsePartialFromString_string_view() {
+	Person msg;
+	absl::string_view data = source<absl::string_view>();
+	msg.ParsePartialFromString(data);
+	sink(msg); // $ ir
+}
+
+void test_ParsePartialFromString_Cord() {
+	Person msg;
+	absl::Cord data = source<absl::Cord>();
+	msg.ParsePartialFromString(data);
+	sink(msg); // $ ir
+}
+
+void test_MergeFromString_string_view() {
+	Person msg;
+	absl::string_view data = source<absl::string_view>();
+	msg.MergeFromString(data);
+	sink(msg); // $ ir
+}
+
+void test_MergeFromString_Cord() {
+	Person msg;
+	absl::Cord data = source<absl::Cord>();
+	msg.MergeFromString(data);
+	sink(msg); // $ ir
+}
+
+void test_MergePartialFromString_string_view() {
+	Person msg;
+	absl::string_view data = source<absl::string_view>();
+	msg.MergePartialFromString(data);
+	sink(msg); // $ ir
+}
+
+void test_MergePartialFromString_Cord() {
+	Person msg;
+	absl::Cord data = source<absl::Cord>();
+	msg.MergePartialFromString(data);
+	sink(msg); // $ ir
+}
+
+void test_ParseFromArray() {
+	Person msg;
+	std::string data(source<const char *>());
+	msg.ParseFromArray(data.data(), data.size());
+	sink(msg); // $ ir
+}
+
+void test_ParsePartialFromArray() {
+	Person msg;
+	std::string data(source<const char *>());
+	msg.ParsePartialFromArray(data.data(), data.size());
+	sink(msg); // $ ir
+}
+
+void test_ParseFromCord() {
+	Person msg;
+	absl::Cord data = source<absl::Cord>();
+	msg.ParseFromCord(data);
+	sink(msg); // $ ir
+}
+
+void test_ParsePartialFromCord() {
+	Person msg;
+	absl::Cord data = source<absl::Cord>();
+	msg.ParsePartialFromCord(data);
+	sink(msg); // $ ir
+}
+
+void test_MergeFromCord() {
+	Person msg;
+	absl::Cord data = source<absl::Cord>();
+	msg.MergeFromCord(data);
+	sink(msg); // $ ir
+}
+
+void test_MergePartialFromCord() {
+	Person msg;
+	absl::Cord data = source<absl::Cord>();
+	msg.MergePartialFromCord(data);
+	sink(msg); // $ ir
+}
+
+void test_ParseFromIstream() {
+	Person msg;
+	std::istream in = source<std::istream>();
+	msg.ParseFromIstream(&in);
+	sink(msg); // $ ir
+}
+
+void test_ParsePartialFromIstream() {
+	Person msg;
+	std::istream in = source<std::istream>();
+	msg.ParsePartialFromIstream(&in);
+	sink(msg); // $ ir
+}
+
+void test_ParseFromZeroCopyStream() {
+	Person msg;
+	ZeroCopyInputStream in = source<ZeroCopyInputStream>();
+	msg.ParseFromZeroCopyStream(&in);
+	sink(msg); // $ ir
+}
+
+void test_ParsePartialFromZeroCopyStream() {
+	Person msg;
+	ZeroCopyInputStream in = source<ZeroCopyInputStream>();
+	msg.ParsePartialFromZeroCopyStream(&in);
+	sink(msg); // $ ir
+}
+
+void test_ParseFromBoundedZeroCopyStream() {
+	Person msg;
+	ZeroCopyInputStream in = source<ZeroCopyInputStream>();
+	msg.ParseFromBoundedZeroCopyStream(&in, 1);
+	sink(msg); // $ ir
+}
+
+void test_ParsePartialFromBoundedZeroCopyStream() {
+	Person msg;
+	ZeroCopyInputStream in = source<ZeroCopyInputStream>();
+	msg.ParsePartialFromBoundedZeroCopyStream(&in, 1);
+	sink(msg); // $ ir
+}
+
+void test_MergeFromBoundedZeroCopyStream() {
+	Person msg;
+	ZeroCopyInputStream in = source<ZeroCopyInputStream>();
+	msg.MergeFromBoundedZeroCopyStream(&in, 1);
+	sink(msg); // $ ir
+}
+
+void test_MergePartialFromBoundedZeroCopyStream() {
+	Person msg;
+	ZeroCopyInputStream in = source<ZeroCopyInputStream>();
+	msg.MergePartialFromBoundedZeroCopyStream(&in, 1);
+	sink(msg); // $ ir
+}
+
+void test_ParseFromCodedStream() {
+	Person msg;
+	CodedInputStream in = source<CodedInputStream>();
+	msg.ParseFromCodedStream(&in);
+	sink(msg); // $ ir
+}
+
+void test_ParsePartialFromCodedStream() {
+	Person msg;
+	CodedInputStream in = source<CodedInputStream>();
+	msg.ParsePartialFromCodedStream(&in);
+	sink(msg); // $ ir
+}
+
+void test_MergeFromCodedStream() {
+	Person msg;
+	CodedInputStream in = source<CodedInputStream>();
+	msg.MergeFromCodedStream(&in);
+	sink(msg); // $ ir
+}
+
+void test_MergePartialFromCodedStream() {
+	Person msg;
+	CodedInputStream in = source<CodedInputStream>();
+	msg.MergePartialFromCodedStream(&in);
+	sink(msg); // $ ir
+}
+
+void test_untainted_input() {
+	Person msg;
+	absl::Cord data;
+	msg.ParseFromString(data);
+	sink(msg); // clean
+}
+
+// Serialization: the message taints the output argument.
+
+void test_SerializeToString() {
+	Person msg = source<Person>();
+	std::string out;
+	msg.SerializeToString(&out);
+	sink(out); // $ ir
+}
+
+void test_SerializePartialToString() {
+	Person msg = source<Person>();
+	std::string out;
+	msg.SerializePartialToString(&out);
+	sink(out); // $ ir
+}
+
+void test_AppendToString() {
+	Person msg = source<Person>();
+	std::string out;
+	msg.AppendToString(&out);
+	sink(out); // $ ir
+}
+
+void test_AppendPartialToString() {
+	Person msg = source<Person>();
+	std::string out;
+	msg.AppendPartialToString(&out);
+	sink(out); // $ ir
+}
+
+void test_SerializeToString_Cord() {
+	Person msg = source<Person>();
+	absl::Cord out;
+	msg.SerializeToString(&out);
+	sink(out); // $ ir
+}
+
+void test_SerializePartialToString_Cord() {
+	Person msg = source<Person>();
+	absl::Cord out;
+	msg.SerializePartialToString(&out);
+	sink(out); // $ ir
+}
+
+void test_AppendToString_Cord() {
+	Person msg = source<Person>();
+	absl::Cord out;
+	msg.AppendToString(&out);
+	sink(out); // $ ir
+}
+
+void test_AppendPartialToString_Cord() {
+	Person msg = source<Person>();
+	absl::Cord out;
+	msg.AppendPartialToString(&out);
+	sink(out); // $ ir
+}
+
+void test_SerializeToArray() {
+	Person msg = source<Person>();
+	char buf[64];
+	msg.SerializeToArray(buf, sizeof(buf));
+	sink(*buf); // $ ir
+}
+
+void test_SerializePartialToArray() {
+	Person msg = source<Person>();
+	char buf[64];
+	msg.SerializePartialToArray(buf, sizeof(buf));
+	sink(*buf); // $ ir
+}
+
+void test_SerializeToCord() {
+	Person msg = source<Person>();
+	absl::Cord out;
+	msg.SerializeToCord(&out);
+	sink(out); // $ ir
+}
+
+void test_SerializePartialToCord() {
+	Person msg = source<Person>();
+	absl::Cord out;
+	msg.SerializePartialToCord(&out);
+	sink(out); // $ ir
+}
+
+void test_AppendToCord() {
+	Person msg = source<Person>();
+	absl::Cord out;
+	msg.AppendToCord(&out);
+	sink(out); // $ ir
+}
+
+void test_AppendPartialToCord() {
+	Person msg = source<Person>();
+	absl::Cord out;
+	msg.AppendPartialToCord(&out);
+	sink(out); // $ ir
+}
+
+void test_SerializeToOstream() {
+	Person msg = source<Person>();
+	std::ostream out;
+	msg.SerializeToOstream(&out);
+	sink(out); // $ ir
+}
+
+void test_SerializePartialToOstream() {
+	Person msg = source<Person>();
+	std::ostream out;
+	msg.SerializePartialToOstream(&out);
+	sink(out); // $ ir
+}
+
+void test_SerializeToZeroCopyStream() {
+	Person msg = source<Person>();
+	ZeroCopyOutputStream out;
+	msg.SerializeToZeroCopyStream(&out);
+	sink(out); // $ ir
+}
+
+void test_SerializePartialToZeroCopyStream() {
+	Person msg = source<Person>();
+	ZeroCopyOutputStream out;
+	msg.SerializePartialToZeroCopyStream(&out);
+	sink(out); // $ ir
+}
+
+void test_SerializeToCodedStream() {
+	Person msg = source<Person>();
+	CodedOutputStream out;
+	msg.SerializeToCodedStream(&out);
+	sink(out); // $ ir
+}
+
+void test_SerializePartialToCodedStream() {
+	Person msg = source<Person>();
+	CodedOutputStream out;
+	msg.SerializePartialToCodedStream(&out);
+	sink(out); // $ ir
+}
+
+// Serialization: the message taints the returned bytes.
+
+void test_SerializeAsString() {
+	Person msg = source<Person>();
+	sink(msg.SerializeAsString()); // $ ir
+}
+
+void test_SerializePartialAsString() {
+	Person msg = source<Person>();
+	sink(msg.SerializePartialAsString()); // $ ir
+}
+
+void test_SerializeAsCord() {
+	Person msg = source<Person>();
+	sink(msg.SerializeAsCord()); // $ ir
+}
+
+void test_SerializePartialAsCord() {
+	Person msg = source<Person>();
+	sink(msg.SerializePartialAsCord()); // $ ir
+}
+
+void test_untainted_message() {
+	Person msg;
+	sink(msg.SerializeAsString()); // clean
+}
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/sinks.expected b/cpp/ql/test/library-tests/dataflow/external-models/sinks.expected
index a1f44de81589..7c498739e150 100644
--- a/cpp/ql/test/library-tests/dataflow/external-models/sinks.expected
+++ b/cpp/ql/test/library-tests/dataflow/external-models/sinks.expected
@@ -1,5 +1,5 @@
-| asio_streams.cpp:93:29:93:39 | *recv_buffer | remote-sink |
-| asio_streams.cpp:103:29:103:39 | *send_buffer | remote-sink |
+| asio_streams.cpp:115:29:115:39 | recv_buffer | remote-sink |
+| asio_streams.cpp:125:29:125:39 | send_buffer | remote-sink |
 | test.cpp:12:10:12:10 | 0 | test-sink |
 | test.cpp:14:10:14:10 | x | test-sink |
 | test.cpp:18:10:18:10 | y | test-sink |
@@ -23,3 +23,38 @@
 | test.cpp:201:10:201:10 | x | test-sink |
 | test.cpp:218:11:218:11 | x | test-sink |
 | test.cpp:224:11:224:11 | c | test-sink |
+| test.cpp:243:13:243:17 | value | test-sink |
+| test.cpp:248:18:248:22 | value | test-sink |
+| test.cpp:258:15:258:19 | value | test-sink |
+| test.cpp:265:14:265:18 | value | test-sink |
+| test.cpp:269:14:269:18 | value | test-sink |
+| test.cpp:274:15:274:19 | value | test-sink |
+| test.cpp:303:15:303:26 | call to ymlSourcePtr | test-sink |
+| test.cpp:304:10:304:24 | * ... | test-sink |
+| test.cpp:307:10:307:31 | call to callback_returning_int | test-sink |
+| test.cpp:310:10:310:33 | call to callback_returning_int_2 | test-sink |
+| test.cpp:314:15:314:17 | ptr | test-sink |
+| test.cpp:315:10:315:13 | * ... | test-sink |
+| test.cpp:325:13:325:17 | value | test-sink |
+| test.cpp:326:18:326:24 | pointer | test-sink |
+| test.cpp:327:10:327:20 | * ... | test-sink |
+| test.cpp:329:12:329:16 | value | test-sink |
+| test.cpp:330:17:330:23 | pointer | test-sink |
+| test.cpp:331:10:331:19 | * ... | test-sink |
+| test.cpp:333:15:333:20 | source | test-sink |
+| test.cpp:334:10:334:16 | * ... | test-sink |
+| test.cpp:366:15:366:15 | s | test-sink |
+| test.cpp:367:15:367:16 | ul | test-sink |
+| test.cpp:375:15:375:15 | s | test-sink |
+| test.cpp:376:15:376:16 | ul | test-sink |
+| test.cpp:400:13:400:13 | x | test-sink |
+| test.cpp:408:13:408:13 | x | test-sink |
+| test.cpp:417:13:417:13 | x | test-sink |
+| test.cpp:423:18:423:20 | call to get | test-sink |
+| test.cpp:427:11:427:24 | * ... | test-sink |
+| test.cpp:441:13:441:13 | x | test-sink |
+| test.cpp:455:21:455:21 | x | test-sink |
+| test.cpp:460:21:460:21 | x | test-sink |
+| test.cpp:465:21:465:21 | x | test-sink |
+| test.cpp:473:15:473:17 | call to get | test-sink |
+| test.cpp:478:13:478:20 | * ... | test-sink |
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/sources.expected b/cpp/ql/test/library-tests/dataflow/external-models/sources.expected
index 3556bd9d51dd..9589477847a9 100644
--- a/cpp/ql/test/library-tests/dataflow/external-models/sources.expected
+++ b/cpp/ql/test/library-tests/dataflow/external-models/sources.expected
@@ -1,10 +1,11 @@
-| asio_streams.cpp:87:34:87:44 | read_until output argument | remote |
-| azure.cpp:253:48:253:60 | *call to GetBodyStream | remote |
-| azure.cpp:273:62:273:64 | call to GetHeaders | remote |
-| azure.cpp:277:45:277:47 | call to GetBody | remote |
-| azure.cpp:281:68:281:84 | *call to ExtractBodyStream | remote |
-| azure.cpp:289:32:289:40 | call to GetHeader | remote |
-| azure.cpp:293:58:293:67 | call to GetHeaders | remote |
+| asio_streams.cpp:109:34:109:44 | read_until output argument | remote |
+| azure.cpp:216:48:216:60 | call to GetBodyStream | remote |
+| azure.cpp:236:52:236:61 | call to GetHeaders | remote |
+| azure.cpp:240:38:240:44 | call to GetBody | remote |
+| azure.cpp:244:68:244:84 | call to ExtractBodyStream | remote |
+| azure.cpp:255:32:255:40 | call to GetHeader | remote |
+| azure.cpp:259:58:259:67 | call to GetHeaders | remote |
+| azure.cpp:268:34:268:43 | call to GetHeaders | remote |
 | test.cpp:10:10:10:18 | call to ymlSource | local |
 | test.cpp:56:8:56:16 | call to ymlSource | local |
 | test.cpp:94:10:94:18 | call to ymlSource | local |
@@ -16,9 +17,20 @@
 | test.cpp:186:14:186:22 | call to ymlSource | local |
 | test.cpp:199:14:199:22 | call to ymlSource | local |
 | test.cpp:216:18:216:26 | call to ymlSource | local |
-| test.cpp:222:10:222:20 | call to ymlSource | local |
-| windows.cpp:22:15:22:29 | *call to GetCommandLineA | local |
-| windows.cpp:34:17:34:38 | *call to GetEnvironmentStringsA | local |
+| test.cpp:222:10:222:18 | call to ymlSource | local |
+| test.cpp:297:33:297:41 | call to ymlSource | local |
+| test.cpp:317:51:317:59 | call to ymlSource | local |
+| test.cpp:362:15:362:23 | call to ymlSource | local |
+| test.cpp:371:24:371:32 | call to ymlSource | local |
+| test.cpp:398:11:398:19 | call to ymlSource | local |
+| test.cpp:405:11:405:19 | call to ymlSource | local |
+| test.cpp:413:11:413:19 | call to ymlSource | local |
+| test.cpp:422:21:422:29 | call to ymlSource | local |
+| test.cpp:437:11:437:19 | call to ymlSource | local |
+| test.cpp:451:11:451:19 | call to ymlSource | local |
+| test.cpp:472:15:472:23 | call to ymlSource | local |
+| windows.cpp:22:15:22:29 | call to GetCommandLineA | local |
+| windows.cpp:34:17:34:38 | call to GetEnvironmentStringsA | local |
 | windows.cpp:39:36:39:38 | GetEnvironmentVariableA output argument | local |
 | windows.cpp:168:35:168:40 | ReadFile output argument | local |
 | windows.cpp:177:23:177:28 | ReadFileEx output argument | local |
@@ -27,13 +39,13 @@
 | windows.cpp:198:21:198:26 | ReadFile output argument | local |
 | windows.cpp:201:23:201:29 | ReadFileEx output argument | local |
 | windows.cpp:209:84:209:89 | NtReadFile output argument | local |
-| windows.cpp:286:23:286:35 | *call to MapViewOfFile | local |
-| windows.cpp:293:23:293:36 | *call to MapViewOfFile2 | local |
-| windows.cpp:302:23:302:36 | *call to MapViewOfFile3 | local |
-| windows.cpp:311:23:311:43 | *call to MapViewOfFile3FromApp | local |
-| windows.cpp:318:23:318:37 | *call to MapViewOfFileEx | local |
-| windows.cpp:325:23:325:42 | *call to MapViewOfFileFromApp | local |
-| windows.cpp:332:23:332:40 | *call to MapViewOfFileNuma2 | local |
+| windows.cpp:286:23:286:35 | call to MapViewOfFile | local |
+| windows.cpp:293:23:293:36 | call to MapViewOfFile2 | local |
+| windows.cpp:302:23:302:36 | call to MapViewOfFile3 | local |
+| windows.cpp:311:23:311:43 | call to MapViewOfFile3FromApp | local |
+| windows.cpp:318:23:318:37 | call to MapViewOfFileEx | local |
+| windows.cpp:325:23:325:42 | call to MapViewOfFileFromApp | local |
+| windows.cpp:332:23:332:40 | call to MapViewOfFileNuma2 | local |
 | windows.cpp:645:45:645:50 | WinHttpReadData output argument | remote |
 | windows.cpp:652:48:652:53 | WinHttpReadDataEx output argument | remote |
 | windows.cpp:659:47:659:52 | WinHttpQueryHeaders output argument | remote |
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/steps.expected b/cpp/ql/test/library-tests/dataflow/external-models/steps.expected
index 0fe13460cfbf..fffcf5a89fbb 100644
--- a/cpp/ql/test/library-tests/dataflow/external-models/steps.expected
+++ b/cpp/ql/test/library-tests/dataflow/external-models/steps.expected
@@ -1,9 +1,463 @@
-| asio_streams.cpp:100:64:100:71 | *send_str | asio_streams.cpp:100:44:100:62 | call to buffer |
-| azure.cpp:252:79:252:98 | call to string | azure.cpp:252:62:252:99 | call to Url |
-| azure.cpp:257:5:257:8 | *resp | azure.cpp:257:16:257:21 | Read output argument |
-| azure.cpp:262:5:262:8 | *resp | azure.cpp:262:23:262:28 | ReadToCount output argument |
-| azure.cpp:287:79:287:98 | call to string | azure.cpp:287:62:287:99 | call to Url |
-| azure.cpp:289:24:289:56 | call to GetHeader | azure.cpp:289:63:289:65 | call to Value |
+| asio_streams.cpp:122:64:122:71 | *send_str | asio_streams.cpp:122:44:122:62 | call to buffer |
+| asio_streams.cpp:141:24:141:27 | *host | asio_streams.cpp:141:16:141:22 | call to resolve |
+| asio_streams.cpp:141:30:141:36 | *service | asio_streams.cpp:141:16:141:22 | call to resolve |
+| asio_streams.cpp:142:24:142:27 | *host | asio_streams.cpp:142:16:142:22 | call to resolve |
+| asio_streams.cpp:142:30:142:36 | *service | asio_streams.cpp:142:16:142:22 | call to resolve |
+| asio_streams.cpp:143:24:143:27 | *host | asio_streams.cpp:143:16:143:22 | call to resolve |
+| asio_streams.cpp:143:30:143:36 | *service | asio_streams.cpp:143:16:143:22 | call to resolve |
+| asio_streams.cpp:144:24:144:27 | *host | asio_streams.cpp:144:16:144:22 | call to resolve |
+| asio_streams.cpp:144:30:144:36 | *service | asio_streams.cpp:144:16:144:22 | call to resolve |
+| asio_streams.cpp:146:24:146:32 | call to basic_string_view | asio_streams.cpp:146:16:146:22 | call to resolve |
+| asio_streams.cpp:146:35:146:46 | call to basic_string_view | asio_streams.cpp:146:16:146:22 | call to resolve |
+| asio_streams.cpp:147:24:147:32 | call to basic_string_view | asio_streams.cpp:147:16:147:22 | call to resolve |
+| asio_streams.cpp:147:35:147:46 | call to basic_string_view | asio_streams.cpp:147:16:147:22 | call to resolve |
+| asio_streams.cpp:148:24:148:32 | call to basic_string_view | asio_streams.cpp:148:16:148:22 | call to resolve |
+| asio_streams.cpp:148:35:148:46 | call to basic_string_view | asio_streams.cpp:148:16:148:22 | call to resolve |
+| asio_streams.cpp:149:24:149:32 | call to basic_string_view | asio_streams.cpp:149:16:149:22 | call to resolve |
+| asio_streams.cpp:149:35:149:46 | call to basic_string_view | asio_streams.cpp:149:16:149:22 | call to resolve |
+| asio_streams.cpp:151:34:151:37 | *host | asio_streams.cpp:151:16:151:22 | call to resolve |
+| asio_streams.cpp:151:40:151:46 | *service | asio_streams.cpp:151:16:151:22 | call to resolve |
+| asio_streams.cpp:152:34:152:37 | *host | asio_streams.cpp:152:16:152:22 | call to resolve |
+| asio_streams.cpp:152:40:152:46 | *service | asio_streams.cpp:152:16:152:22 | call to resolve |
+| asio_streams.cpp:153:34:153:37 | *host | asio_streams.cpp:153:16:153:22 | call to resolve |
+| asio_streams.cpp:153:40:153:46 | *service | asio_streams.cpp:153:16:153:22 | call to resolve |
+| asio_streams.cpp:154:34:154:37 | *host | asio_streams.cpp:154:16:154:22 | call to resolve |
+| asio_streams.cpp:154:40:154:46 | *service | asio_streams.cpp:154:16:154:22 | call to resolve |
+| asio_streams.cpp:156:34:156:42 | call to basic_string_view | asio_streams.cpp:156:16:156:22 | call to resolve |
+| asio_streams.cpp:156:45:156:56 | call to basic_string_view | asio_streams.cpp:156:16:156:22 | call to resolve |
+| asio_streams.cpp:157:34:157:42 | call to basic_string_view | asio_streams.cpp:157:16:157:22 | call to resolve |
+| asio_streams.cpp:157:45:157:56 | call to basic_string_view | asio_streams.cpp:157:16:157:22 | call to resolve |
+| asio_streams.cpp:158:34:158:42 | call to basic_string_view | asio_streams.cpp:158:16:158:22 | call to resolve |
+| asio_streams.cpp:158:45:158:56 | call to basic_string_view | asio_streams.cpp:158:16:158:22 | call to resolve |
+| asio_streams.cpp:159:34:159:42 | call to basic_string_view | asio_streams.cpp:159:16:159:22 | call to resolve |
+| asio_streams.cpp:159:45:159:56 | call to basic_string_view | asio_streams.cpp:159:16:159:22 | call to resolve |
+| asio_streams.cpp:172:24:172:27 | *host | asio_streams.cpp:172:16:172:22 | call to resolve |
+| asio_streams.cpp:172:30:172:36 | *service | asio_streams.cpp:172:16:172:22 | call to resolve |
+| asio_streams.cpp:173:24:173:27 | *host | asio_streams.cpp:173:16:173:22 | call to resolve |
+| asio_streams.cpp:173:30:173:36 | *service | asio_streams.cpp:173:16:173:22 | call to resolve |
+| asio_streams.cpp:174:24:174:27 | *host | asio_streams.cpp:174:16:174:22 | call to resolve |
+| asio_streams.cpp:174:30:174:36 | *service | asio_streams.cpp:174:16:174:22 | call to resolve |
+| asio_streams.cpp:175:24:175:27 | *host | asio_streams.cpp:175:16:175:22 | call to resolve |
+| asio_streams.cpp:175:30:175:36 | *service | asio_streams.cpp:175:16:175:22 | call to resolve |
+| asio_streams.cpp:177:24:177:32 | call to basic_string_view | asio_streams.cpp:177:16:177:22 | call to resolve |
+| asio_streams.cpp:177:35:177:46 | call to basic_string_view | asio_streams.cpp:177:16:177:22 | call to resolve |
+| asio_streams.cpp:178:24:178:32 | call to basic_string_view | asio_streams.cpp:178:16:178:22 | call to resolve |
+| asio_streams.cpp:178:35:178:46 | call to basic_string_view | asio_streams.cpp:178:16:178:22 | call to resolve |
+| asio_streams.cpp:179:24:179:32 | call to basic_string_view | asio_streams.cpp:179:16:179:22 | call to resolve |
+| asio_streams.cpp:179:35:179:46 | call to basic_string_view | asio_streams.cpp:179:16:179:22 | call to resolve |
+| asio_streams.cpp:180:24:180:32 | call to basic_string_view | asio_streams.cpp:180:16:180:22 | call to resolve |
+| asio_streams.cpp:180:35:180:46 | call to basic_string_view | asio_streams.cpp:180:16:180:22 | call to resolve |
+| asio_streams.cpp:182:34:182:37 | *host | asio_streams.cpp:182:16:182:22 | call to resolve |
+| asio_streams.cpp:182:40:182:46 | *service | asio_streams.cpp:182:16:182:22 | call to resolve |
+| asio_streams.cpp:183:34:183:37 | *host | asio_streams.cpp:183:16:183:22 | call to resolve |
+| asio_streams.cpp:183:40:183:46 | *service | asio_streams.cpp:183:16:183:22 | call to resolve |
+| asio_streams.cpp:184:34:184:37 | *host | asio_streams.cpp:184:16:184:22 | call to resolve |
+| asio_streams.cpp:184:40:184:46 | *service | asio_streams.cpp:184:16:184:22 | call to resolve |
+| asio_streams.cpp:185:34:185:37 | *host | asio_streams.cpp:185:16:185:22 | call to resolve |
+| asio_streams.cpp:185:40:185:46 | *service | asio_streams.cpp:185:16:185:22 | call to resolve |
+| asio_streams.cpp:187:34:187:42 | call to basic_string_view | asio_streams.cpp:187:16:187:22 | call to resolve |
+| asio_streams.cpp:187:45:187:56 | call to basic_string_view | asio_streams.cpp:187:16:187:22 | call to resolve |
+| asio_streams.cpp:188:34:188:42 | call to basic_string_view | asio_streams.cpp:188:16:188:22 | call to resolve |
+| asio_streams.cpp:188:45:188:56 | call to basic_string_view | asio_streams.cpp:188:16:188:22 | call to resolve |
+| asio_streams.cpp:189:34:189:42 | call to basic_string_view | asio_streams.cpp:189:16:189:22 | call to resolve |
+| asio_streams.cpp:189:45:189:56 | call to basic_string_view | asio_streams.cpp:189:16:189:22 | call to resolve |
+| asio_streams.cpp:190:34:190:42 | call to basic_string_view | asio_streams.cpp:190:16:190:22 | call to resolve |
+| asio_streams.cpp:190:45:190:56 | call to basic_string_view | asio_streams.cpp:190:16:190:22 | call to resolve |
+| azure.cpp:215:79:215:98 | call to basic_string | azure.cpp:215:62:215:99 | call to Url |
+| azure.cpp:220:5:220:8 | *resp | azure.cpp:220:16:220:21 | Read output argument |
+| azure.cpp:225:5:225:8 | *resp | azure.cpp:225:23:225:28 | ReadToCount output argument |
+| azure.cpp:253:79:253:98 | call to basic_string | azure.cpp:253:62:253:99 | call to Url |
+| azure.cpp:255:24:255:56 | call to GetHeader | azure.cpp:255:63:255:65 | call to Value |
+| azure.cpp:266:79:266:98 | call to basic_string | azure.cpp:266:62:266:99 | call to Url |
+| azure.cpp:268:26:268:45 | call to GetHeaders | azure.cpp:268:3:268:5 | SetQueryParameters output argument |
+| azure.cpp:269:8:269:10 | *url | azure.cpp:269:12:269:29 | call to GetQueryParameters |
+| bal.cpp:132:17:132:18 | *sb | bal.cpp:132:21:132:24 | decode output argument |
+| bal.cpp:141:17:141:19 | ** ... | bal.cpp:141:22:141:25 | decode output argument |
+| bal.cpp:150:20:150:21 | *sb | bal.cpp:150:24:150:27 | decodeAny output argument |
+| bal.cpp:159:40:159:42 | *obj | bal.cpp:159:17:159:37 | encode output argument |
+| bal.cpp:167:43:167:45 | *obj | bal.cpp:167:20:167:40 | encodeAny output argument |
+| bal.cpp:180:17:180:18 | *sb | bal.cpp:180:21:180:24 | decode output argument |
+| bal.cpp:190:17:190:19 | ** ... | bal.cpp:190:22:190:25 | decode output argument |
+| bal.cpp:199:20:199:21 | *sb | bal.cpp:199:24:199:27 | decodeAny output argument |
+| bal.cpp:208:40:208:42 | *obj | bal.cpp:208:17:208:37 | encode output argument |
+| bal.cpp:216:43:216:45 | *obj | bal.cpp:216:20:216:40 | encodeAny output argument |
+| bal.cpp:226:17:226:18 | *sb | bal.cpp:226:21:226:24 | decode output argument |
+| bal.cpp:229:40:229:42 | *rec | bal.cpp:229:17:229:37 | encode output argument |
+| bal.cpp:238:17:238:18 | *sb | bal.cpp:238:21:238:24 | decode output argument |
+| bal.cpp:249:17:249:19 | ** ... | bal.cpp:249:16:249:27 | *call to decode |
+| bal.cpp:249:17:249:19 | ** ... | bal.cpp:249:22:249:25 | decode output argument |
+| bal.cpp:258:35:258:37 | ** ... | bal.cpp:258:34:258:52 | *call to decode |
+| bal.cpp:258:35:258:37 | ** ... | bal.cpp:258:40:258:43 | decode output argument |
+| bal.cpp:268:17:268:18 | *sb | bal.cpp:268:21:268:24 | decode output argument |
+| bal.cpp:276:22:276:25 | *call to data | bal.cpp:276:43:276:46 | decode output argument |
+| bal.cpp:305:20:305:22 | ** ... | bal.cpp:305:19:305:30 | *call to decodeAny |
+| bal.cpp:305:20:305:22 | ** ... | bal.cpp:305:25:305:28 | decodeAny output argument |
+| bal.cpp:314:38:314:40 | ** ... | bal.cpp:314:37:314:48 | *call to decodeAny |
+| bal.cpp:314:38:314:40 | ** ... | bal.cpp:314:43:314:46 | decodeAny output argument |
+| bal.cpp:324:20:324:21 | *sb | bal.cpp:324:24:324:27 | decodeAny output argument |
+| bal.cpp:333:20:333:22 | ** ... | bal.cpp:333:19:333:30 | *call to decodeAny |
+| bal.cpp:333:20:333:22 | ** ... | bal.cpp:333:25:333:28 | decodeAny output argument |
+| bal.cpp:342:38:342:40 | ** ... | bal.cpp:342:37:342:48 | *call to decodeAny |
+| bal.cpp:342:38:342:40 | ** ... | bal.cpp:342:43:342:46 | decodeAny output argument |
+| bal.cpp:352:20:352:21 | *sb | bal.cpp:352:24:352:27 | decodeAny output argument |
+| bal.cpp:360:40:360:42 | *obj | bal.cpp:360:17:360:37 | encode output argument |
+| bal.cpp:368:17:368:36 | ** ... | bal.cpp:368:16:368:43 | *call to encode |
+| bal.cpp:368:39:368:41 | *obj | bal.cpp:368:16:368:43 | *call to encode |
+| bal.cpp:368:39:368:41 | *obj | bal.cpp:368:17:368:36 | encode output argument |
+| bal.cpp:376:35:376:54 | ** ... | bal.cpp:376:34:376:61 | *call to encode |
+| bal.cpp:376:57:376:59 | *obj | bal.cpp:376:34:376:61 | *call to encode |
+| bal.cpp:376:57:376:59 | *obj | bal.cpp:376:35:376:54 | encode output argument |
+| bal.cpp:386:35:386:37 | ** ... | bal.cpp:386:34:386:44 | *call to encode |
+| bal.cpp:386:40:386:42 | *obj | bal.cpp:386:34:386:44 | *call to encode |
+| bal.cpp:386:40:386:42 | *obj | bal.cpp:386:35:386:37 | encode output argument |
+| bal.cpp:394:47:394:49 | *obj | bal.cpp:394:25:394:44 | encodeToStream output argument |
+| bal.cpp:412:43:412:45 | *obj | bal.cpp:412:20:412:40 | encodeAny output argument |
+| bal.cpp:420:20:420:39 | ** ... | bal.cpp:420:19:420:46 | *call to encodeAny |
+| bal.cpp:420:42:420:44 | *obj | bal.cpp:420:19:420:46 | *call to encodeAny |
+| bal.cpp:420:42:420:44 | *obj | bal.cpp:420:20:420:39 | encodeAny output argument |
+| bal.cpp:428:38:428:57 | ** ... | bal.cpp:428:37:428:64 | *call to encodeAny |
+| bal.cpp:428:60:428:62 | *obj | bal.cpp:428:37:428:64 | *call to encodeAny |
+| bal.cpp:428:60:428:62 | *obj | bal.cpp:428:38:428:57 | encodeAny output argument |
+| bal.cpp:437:50:437:52 | *obj | bal.cpp:437:28:437:47 | encodeAnyToStream output argument |
+| bal.cpp:446:43:446:46 | ** ... | bal.cpp:446:20:446:40 | encodeAny output argument |
+| bal.cpp:455:20:455:39 | ** ... | bal.cpp:455:19:455:47 | *call to encodeAny |
+| bal.cpp:455:42:455:45 | ** ... | bal.cpp:455:19:455:47 | *call to encodeAny |
+| bal.cpp:455:42:455:45 | ** ... | bal.cpp:455:20:455:39 | encodeAny output argument |
+| bal.cpp:464:38:464:57 | ** ... | bal.cpp:464:37:464:65 | *call to encodeAny |
+| bal.cpp:464:60:464:63 | ** ... | bal.cpp:464:37:464:65 | *call to encodeAny |
+| bal.cpp:464:60:464:63 | ** ... | bal.cpp:464:38:464:57 | encodeAny output argument |
+| bdlbb.cpp:39:49:39:52 | *call to data | bdlbb.cpp:39:37:39:41 | copy output argument |
+| bdlbb.cpp:41:42:41:45 | *blob | bdlbb.cpp:41:37:41:39 | copy output argument |
+| bdlbb.cpp:48:49:48:52 | *call to data | bdlbb.cpp:48:37:48:41 | copy output argument |
+| bdlbb.cpp:49:18:49:21 | *blob | bdlbb.cpp:49:29:49:32 | *call to buffer |
+| bdlbb.cpp:49:29:49:32 | *call to buffer | bdlbb.cpp:49:18:49:38 | *call to data |
+| bdlbb.cpp:57:49:57:52 | *call to data | bdlbb.cpp:57:37:57:41 | copy output argument |
+| bdlbb.cpp:58:18:58:21 | *blob | bdlbb.cpp:58:29:58:32 | *call to buffer |
+| bdlbb.cpp:58:29:58:32 | *call to buffer | bdlbb.cpp:58:39:58:41 | *call to buffer |
+| bdlbb.cpp:65:49:65:52 | *call to data | bdlbb.cpp:65:37:65:41 | copy output argument |
+| bdlbb.cpp:67:72:67:75 | *blob | bdlbb.cpp:67:12:67:65 | *call to getContiguousRangeOrCopy |
+| bdlbb.cpp:67:72:67:75 | *blob | bdlbb.cpp:67:67:67:69 | getContiguousRangeOrCopy output argument |
+| bdlbb.cpp:75:48:75:51 | *call to data | bdlbb.cpp:75:37:75:40 | copy output argument |
+| bdlbb.cpp:77:46:77:48 | *src | bdlbb.cpp:77:37:77:40 | copy output argument |
+| bdlbb.cpp:79:42:79:44 | *dst | bdlbb.cpp:79:37:79:39 | copy output argument |
+| bmqa.cpp:90:2:90:4 | *msg | bmqa.cpp:90:15:90:19 | getData output argument |
+| bmqa.cpp:92:42:92:45 | *blob | bmqa.cpp:92:37:92:39 | copy output argument |
+| bmqa.cpp:99:42:99:46 | *event | bmqa.cpp:99:49:99:63 | call to messageIterator |
+| bmqa.cpp:101:43:101:44 | *it | bmqa.cpp:101:53:101:55 | *call to message |
+| bmqa.cpp:103:3:103:5 | *msg | bmqa.cpp:103:15:103:19 | getData output argument |
+| bmqa.cpp:105:43:105:46 | *blob | bmqa.cpp:105:38:105:40 | copy output argument |
+| bmqa.cpp:113:47:113:50 | *call to data | bmqa.cpp:113:37:113:39 | copy output argument |
+| bmqa.cpp:115:2:115:4 | *msg | bmqa.cpp:115:16:115:21 | *call to setDataRef |
+| bmqa.cpp:115:17:115:19 | *& ... | bmqa.cpp:115:2:115:4 | setDataRef output argument |
+| bmqa.cpp:115:17:115:19 | *& ... | bmqa.cpp:115:16:115:21 | *call to setDataRef |
+| bmqa.cpp:117:2:117:4 | *msg | bmqa.cpp:117:14:117:17 | getData output argument |
+| bmqa.cpp:119:42:119:44 | *out | bmqa.cpp:119:37:119:39 | copy output argument |
+| bmqa.cpp:126:2:126:4 | *msg | bmqa.cpp:126:16:126:36 | *call to setDataRef |
+| bmqa.cpp:126:19:126:22 | *call to data | bmqa.cpp:126:2:126:4 | setDataRef output argument |
+| bmqa.cpp:126:19:126:22 | *call to data | bmqa.cpp:126:16:126:36 | *call to setDataRef |
+| bmqa.cpp:128:2:128:4 | *msg | bmqa.cpp:128:14:128:17 | getData output argument |
+| bmqa.cpp:130:42:130:44 | *out | bmqa.cpp:130:37:130:39 | copy output argument |
+| bmqa.cpp:137:2:137:4 | *msg | bmqa.cpp:137:13:137:33 | *call to setData |
+| bmqa.cpp:137:16:137:19 | *call to data | bmqa.cpp:137:2:137:4 | setData output argument |
+| bmqa.cpp:137:16:137:19 | *call to data | bmqa.cpp:137:13:137:33 | *call to setData |
+| bmqa.cpp:139:2:139:4 | *msg | bmqa.cpp:139:14:139:17 | getData output argument |
+| bmqa.cpp:141:42:141:44 | *out | bmqa.cpp:141:37:141:39 | copy output argument |
+| bmqa.cpp:148:36:148:38 | *msg | bmqa.cpp:148:41:148:45 | call to clone |
+| bmqa.cpp:150:2:150:5 | *copy | bmqa.cpp:150:15:150:19 | getData output argument |
+| bmqa.cpp:152:42:152:45 | *blob | bmqa.cpp:152:37:152:39 | copy output argument |
+| bmqa.cpp:160:2:160:4 | *msg | bmqa.cpp:160:22:160:27 | loadProperties output argument |
+| bmqa.cpp:161:29:161:33 | *props | bmqa.cpp:161:54:161:61 | *call to getPropertyAsString |
+| bmqa.cpp:169:2:169:4 | *msg | bmqa.cpp:169:22:169:27 | loadProperties output argument |
+| bmqa.cpp:178:2:178:4 | *msg | bmqa.cpp:178:22:178:27 | loadProperties output argument |
+| bmqa.cpp:187:2:187:4 | *msg | bmqa.cpp:187:22:187:27 | loadProperties output argument |
+| bmqa.cpp:189:29:189:33 | *props | bmqa.cpp:189:56:189:69 | *call to getPropertyAsStringOr |
+| bmqa.cpp:197:29:197:33 | *props | bmqa.cpp:197:56:197:69 | *call to getPropertyAsStringOr |
+| bmqa.cpp:205:2:205:4 | *msg | bmqa.cpp:205:22:205:27 | loadProperties output argument |
+| bmqa.cpp:224:2:224:4 | *msg | bmqa.cpp:224:22:224:27 | loadProperties output argument |
+| bmqa.cpp:231:49:231:52 | *call to data | bmqa.cpp:231:37:231:41 | copy output argument |
+| bmqa.cpp:233:17:233:20 | *blob | bmqa.cpp:233:2:233:6 | streamIn output argument |
+| bmqa.cpp:234:8:234:12 | *props | bmqa.cpp:234:33:234:40 | *call to getPropertyAsString |
+| bmqa.cpp:240:49:240:52 | *call to data | bmqa.cpp:240:37:240:41 | copy output argument |
+| bmqa.cpp:242:14:242:17 | *blob | bmqa.cpp:242:2:242:3 | streamIn output argument |
+| bmqa.cpp:244:2:244:4 | *msg | bmqa.cpp:244:22:244:27 | *call to setPropertiesRef |
+| bmqa.cpp:244:23:244:25 | *& ... | bmqa.cpp:244:2:244:4 | setPropertiesRef output argument |
+| bmqa.cpp:244:23:244:25 | *& ... | bmqa.cpp:244:22:244:27 | *call to setPropertiesRef |
+| bmqa.cpp:246:2:246:4 | *msg | bmqa.cpp:246:21:246:24 | loadProperties output argument |
+| bmqa.cpp:247:8:247:10 | *out | bmqa.cpp:247:31:247:38 | *call to getPropertyAsString |
+| bmqa.cpp:254:2:254:4 | *msg | bmqa.cpp:254:22:254:27 | loadProperties output argument |
+| bmqa.cpp:256:41:256:45 | *props | bmqa.cpp:256:56:256:66 | *call to streamOut |
+| bmqa.cpp:258:42:258:45 | *blob | bmqa.cpp:258:37:258:39 | copy output argument |
+| bmqa.cpp:266:2:266:4 | *msg | bmqa.cpp:266:22:266:27 | loadProperties output argument |
+| bmqa.cpp:268:8:268:11 | *copy | bmqa.cpp:268:32:268:39 | *call to getPropertyAsString |
+| bmqa.cpp:275:2:275:4 | *msg | bmqa.cpp:275:22:275:27 | loadProperties output argument |
+| bmqa.cpp:278:8:278:11 | *copy | bmqa.cpp:278:32:278:39 | *call to getPropertyAsString |
+| bmqa.cpp:285:2:285:4 | *msg | bmqa.cpp:285:22:285:27 | loadProperties output argument |
+| bmqa.cpp:287:8:287:21 | *call to operator= | bmqa.cpp:287:42:287:49 | *call to getPropertyAsString |
+| bmqa.cpp:294:28:294:32 | call to basic_string_view | bmqa.cpp:294:2:294:6 | setPropertyAsString output argument |
+| bmqa.cpp:294:35:294:40 | * ... | bmqa.cpp:294:2:294:6 | setPropertyAsString output argument |
+| bmqa.cpp:295:8:295:12 | *props | bmqa.cpp:295:33:295:40 | *call to getPropertyAsString |
+| bmqa.cpp:301:28:301:32 | call to basic_string_view | bmqa.cpp:301:2:301:6 | setPropertyAsString output argument |
+| bmqa.cpp:301:35:301:39 | value | bmqa.cpp:301:2:301:6 | setPropertyAsString output argument |
+| bmqa.cpp:302:8:302:12 | *props | bmqa.cpp:302:33:302:40 | *call to getPropertyAsString |
+| bmqa.cpp:309:28:309:32 | call to basic_string_view | bmqa.cpp:309:2:309:6 | setPropertyAsBinary output argument |
+| bmqa.cpp:309:35:309:40 | * ... | bmqa.cpp:309:2:309:6 | setPropertyAsBinary output argument |
+| bmqa.cpp:317:26:317:29 | name | bmqa.cpp:317:2:317:6 | setPropertyAsBool output argument |
+| bmqa.cpp:318:50:318:55 | *& ... | bmqa.cpp:318:47:318:48 | call to MessagePropertiesIterator |
+| bmqa.cpp:319:8:319:9 | *it | bmqa.cpp:319:15:319:17 | *call to name |
+| bmqa.cpp:325:26:325:29 | name | bmqa.cpp:325:2:325:6 | setPropertyAsChar output argument |
+| bmqa.cpp:326:50:326:55 | *& ... | bmqa.cpp:326:47:326:48 | call to MessagePropertiesIterator |
+| bmqa.cpp:327:8:327:9 | *it | bmqa.cpp:327:15:327:17 | *call to name |
+| bmqa.cpp:333:27:333:30 | name | bmqa.cpp:333:2:333:6 | setPropertyAsShort output argument |
+| bmqa.cpp:334:50:334:55 | *& ... | bmqa.cpp:334:47:334:48 | call to MessagePropertiesIterator |
+| bmqa.cpp:335:8:335:9 | *it | bmqa.cpp:335:15:335:17 | *call to name |
+| bmqa.cpp:341:27:341:30 | name | bmqa.cpp:341:2:341:6 | setPropertyAsInt32 output argument |
+| bmqa.cpp:342:50:342:55 | *& ... | bmqa.cpp:342:47:342:48 | call to MessagePropertiesIterator |
+| bmqa.cpp:343:8:343:9 | *it | bmqa.cpp:343:15:343:17 | *call to name |
+| bmqa.cpp:349:27:349:30 | name | bmqa.cpp:349:2:349:6 | setPropertyAsInt64 output argument |
+| bmqa.cpp:350:50:350:55 | *& ... | bmqa.cpp:350:47:350:48 | call to MessagePropertiesIterator |
+| bmqa.cpp:351:8:351:9 | *it | bmqa.cpp:351:15:351:17 | *call to name |
+| bmqa.cpp:357:28:357:31 | name | bmqa.cpp:357:2:357:6 | setPropertyAsString output argument |
+| bmqa.cpp:357:34:357:40 | call to basic_string_view | bmqa.cpp:357:2:357:6 | setPropertyAsString output argument |
+| bmqa.cpp:358:50:358:55 | *& ... | bmqa.cpp:358:47:358:48 | call to MessagePropertiesIterator |
+| bmqa.cpp:359:8:359:9 | *it | bmqa.cpp:359:15:359:17 | *call to name |
+| bmqa.cpp:365:28:365:31 | name | bmqa.cpp:365:2:365:6 | setPropertyAsBinary output argument |
+| bmqa.cpp:365:34:365:56 | call to span | bmqa.cpp:365:2:365:6 | setPropertyAsBinary output argument |
+| bmqa.cpp:366:50:366:55 | *& ... | bmqa.cpp:366:47:366:48 | call to MessagePropertiesIterator |
+| bmqa.cpp:367:8:367:9 | *it | bmqa.cpp:367:15:367:17 | *call to name |
+| bmqa.cpp:374:2:374:4 | *msg | bmqa.cpp:374:22:374:27 | loadProperties output argument |
+| bmqa.cpp:375:50:375:55 | *& ... | bmqa.cpp:375:47:375:48 | call to MessagePropertiesIterator |
+| bmqa.cpp:377:9:377:10 | *it | bmqa.cpp:377:16:377:18 | *call to name |
+| bmqa.cpp:378:9:378:10 | *it | bmqa.cpp:378:23:378:25 | *call to getAsString |
+| bmqa.cpp:388:2:388:4 | *msg | bmqa.cpp:388:22:388:27 | loadProperties output argument |
+| bmqa.cpp:389:50:389:55 | *& ... | bmqa.cpp:389:47:389:48 | call to MessagePropertiesIterator |
+| bmqa.cpp:392:8:392:11 | *copy | bmqa.cpp:392:24:392:26 | *call to getAsString |
+| bmqa.cpp:393:8:393:18 | *call to operator= | bmqa.cpp:393:24:393:26 | *call to name |
+| bslx.cpp:122:11:122:16 | *stream | bslx.cpp:122:26:122:36 | *call to getInt32 |
+| bslx.cpp:138:41:138:51 | *call to data | bslx.cpp:138:34:138:39 | call to ByteInStream |
+| bslx.cpp:140:2:140:7 | *stream | bslx.cpp:140:17:140:20 | *call to getInt32 |
+| bslx.cpp:146:41:146:51 | *call to data | bslx.cpp:146:34:146:39 | call to ByteInStream |
+| bslx.cpp:148:2:148:7 | *stream | bslx.cpp:148:21:148:30 | *call to getArrayInt8 |
+| bslx.cpp:148:2:148:7 | *stream | bslx.cpp:148:22:148:24 | getArrayInt8 output argument |
+| bslx.cpp:154:41:154:51 | *call to data | bslx.cpp:154:34:154:39 | call to ByteInStream |
+| bslx.cpp:156:2:156:7 | *stream | bslx.cpp:156:18:156:23 | *call to getString |
+| bslx.cpp:156:2:156:7 | *stream | bslx.cpp:156:19:156:21 | getString output argument |
+| bslx.cpp:162:41:162:51 | *call to data | bslx.cpp:162:34:162:39 | call to ByteInStream |
+| bslx.cpp:165:2:165:7 | *stream | bslx.cpp:165:17:165:20 | *call to getInt32 |
+| bslx.cpp:165:17:165:20 | *call to getInt32 | bslx.cpp:165:30:165:35 | *call to getString |
+| bslx.cpp:165:17:165:20 | *call to getInt32 | bslx.cpp:165:31:165:33 | getString output argument |
+| bslx.cpp:172:15:172:25 | *call to data | bslx.cpp:172:2:172:7 | reset output argument |
+| bslx.cpp:174:2:174:7 | *stream | bslx.cpp:174:18:174:23 | *call to getString |
+| bslx.cpp:174:2:174:7 | *stream | bslx.cpp:174:19:174:21 | getString output argument |
+| bslx.cpp:181:57:181:58 | *sb | bslx.cpp:181:50:181:55 | call to GenericInStream |
+| bslx.cpp:183:2:183:7 | *stream | bslx.cpp:183:18:183:23 | *call to getString |
+| bslx.cpp:183:2:183:7 | *stream | bslx.cpp:183:19:183:21 | getString output argument |
+| bslx.cpp:190:57:190:58 | *sb | bslx.cpp:190:50:190:55 | call to GenericInStream |
+| bslx.cpp:192:2:192:7 | *stream | bslx.cpp:192:17:192:20 | *call to getInt32 |
+| bslx.cpp:198:41:198:51 | *call to data | bslx.cpp:198:34:198:39 | call to ByteInStream |
+| bslx.cpp:200:53:200:58 | *stream | bslx.cpp:200:52:200:65 | *call to bdexStreamIn |
+| bslx.cpp:200:53:200:58 | *stream | bslx.cpp:200:61:200:63 | bdexStreamIn output argument |
+| bslx.cpp:208:41:208:51 | *call to data | bslx.cpp:208:34:208:39 | call to ByteInStream |
+| bslx.cpp:231:2:231:7 | *stream | bslx.cpp:231:18:231:21 | *call to getLength |
+| bslx.cpp:231:18:231:21 | *call to getLength | bslx.cpp:231:32:231:35 | *call to getVersion |
+| bslx.cpp:231:32:231:35 | *call to getVersion | bslx.cpp:231:43:231:46 | *call to getInt8 |
+| bslx.cpp:231:43:231:46 | *call to getInt8 | bslx.cpp:231:55:231:59 | *call to getUint8 |
+| bslx.cpp:231:55:231:59 | *call to getUint8 | bslx.cpp:231:68:231:71 | *call to getInt16 |
+| bslx.cpp:231:68:231:71 | *call to getInt16 | bslx.cpp:231:81:231:85 | *call to getUint16 |
+| bslx.cpp:231:81:231:85 | *call to getUint16 | bslx.cpp:231:94:231:97 | *call to getInt24 |
+| bslx.cpp:231:94:231:97 | *call to getInt24 | bslx.cpp:231:107:231:111 | *call to getUint24 |
+| bslx.cpp:231:107:231:111 | *call to getUint24 | bslx.cpp:231:120:231:123 | *call to getInt32 |
+| bslx.cpp:231:120:231:123 | *call to getInt32 | bslx.cpp:231:133:231:137 | *call to getUint32 |
+| bslx.cpp:231:133:231:137 | *call to getUint32 | bslx.cpp:231:146:231:150 | *call to getInt40 |
+| bslx.cpp:231:146:231:150 | *call to getInt40 | bslx.cpp:231:160:231:165 | *call to getUint40 |
+| bslx.cpp:231:160:231:165 | *call to getUint40 | bslx.cpp:231:174:231:178 | *call to getInt48 |
+| bslx.cpp:231:174:231:178 | *call to getInt48 | bslx.cpp:231:188:231:193 | *call to getUint48 |
+| bslx.cpp:231:188:231:193 | *call to getUint48 | bslx.cpp:231:202:231:206 | *call to getInt56 |
+| bslx.cpp:231:202:231:206 | *call to getInt56 | bslx.cpp:231:216:231:221 | *call to getUint56 |
+| bslx.cpp:231:216:231:221 | *call to getUint56 | bslx.cpp:231:230:231:234 | *call to getInt64 |
+| bslx.cpp:231:230:231:234 | *call to getInt64 | bslx.cpp:231:244:231:249 | *call to getUint64 |
+| bslx.cpp:231:244:231:249 | *call to getUint64 | bslx.cpp:231:260:231:263 | *call to getFloat32 |
+| bslx.cpp:231:260:231:263 | *call to getFloat32 | bslx.cpp:231:274:231:277 | *call to getFloat64 |
+| bslx.cpp:231:274:231:277 | *call to getFloat64 | bslx.cpp:231:287:231:292 | *call to getString |
+| bslx.cpp:231:274:231:277 | *call to getFloat64 | bslx.cpp:231:288:231:290 | getString output argument |
+| bslx.cpp:231:287:231:292 | *call to getString | bslx.cpp:231:305:231:315 | *call to getArrayInt8 |
+| bslx.cpp:231:287:231:292 | *call to getString | bslx.cpp:231:306:231:309 | getArrayInt8 output argument |
+| bslx.cpp:231:305:231:315 | *call to getArrayInt8 | bslx.cpp:231:329:231:340 | *call to getArrayUint8 |
+| bslx.cpp:231:305:231:315 | *call to getArrayInt8 | bslx.cpp:231:330:231:334 | getArrayUint8 output argument |
+| bslx.cpp:231:329:231:340 | *call to getArrayUint8 | bslx.cpp:231:354:231:364 | *call to getArrayInt16 |
+| bslx.cpp:231:329:231:340 | *call to getArrayUint8 | bslx.cpp:231:355:231:358 | getArrayInt16 output argument |
+| bslx.cpp:231:354:231:364 | *call to getArrayInt16 | bslx.cpp:231:379:231:390 | *call to getArrayUint16 |
+| bslx.cpp:231:354:231:364 | *call to getArrayInt16 | bslx.cpp:231:380:231:384 | getArrayUint16 output argument |
+| bslx.cpp:231:379:231:390 | *call to getArrayUint16 | bslx.cpp:231:404:231:414 | *call to getArrayInt24 |
+| bslx.cpp:231:379:231:390 | *call to getArrayUint16 | bslx.cpp:231:405:231:408 | getArrayInt24 output argument |
+| bslx.cpp:231:404:231:414 | *call to getArrayInt24 | bslx.cpp:231:429:231:440 | *call to getArrayUint24 |
+| bslx.cpp:231:404:231:414 | *call to getArrayInt24 | bslx.cpp:231:430:231:434 | getArrayUint24 output argument |
+| bslx.cpp:231:429:231:440 | *call to getArrayUint24 | bslx.cpp:231:454:231:464 | *call to getArrayInt32 |
+| bslx.cpp:231:429:231:440 | *call to getArrayUint24 | bslx.cpp:231:455:231:458 | getArrayInt32 output argument |
+| bslx.cpp:231:454:231:464 | *call to getArrayInt32 | bslx.cpp:231:479:231:490 | *call to getArrayUint32 |
+| bslx.cpp:231:454:231:464 | *call to getArrayInt32 | bslx.cpp:231:480:231:484 | getArrayUint32 output argument |
+| bslx.cpp:231:479:231:490 | *call to getArrayUint32 | bslx.cpp:231:504:231:515 | *call to getArrayInt40 |
+| bslx.cpp:231:479:231:490 | *call to getArrayUint32 | bslx.cpp:231:505:231:509 | getArrayInt40 output argument |
+| bslx.cpp:231:504:231:515 | *call to getArrayInt40 | bslx.cpp:231:530:231:542 | *call to getArrayUint40 |
+| bslx.cpp:231:504:231:515 | *call to getArrayInt40 | bslx.cpp:231:531:231:536 | getArrayUint40 output argument |
+| bslx.cpp:231:530:231:542 | *call to getArrayUint40 | bslx.cpp:231:556:231:567 | *call to getArrayInt48 |
+| bslx.cpp:231:530:231:542 | *call to getArrayUint40 | bslx.cpp:231:557:231:561 | getArrayInt48 output argument |
+| bslx.cpp:231:556:231:567 | *call to getArrayInt48 | bslx.cpp:231:582:231:594 | *call to getArrayUint48 |
+| bslx.cpp:231:556:231:567 | *call to getArrayInt48 | bslx.cpp:231:583:231:588 | getArrayUint48 output argument |
+| bslx.cpp:231:582:231:594 | *call to getArrayUint48 | bslx.cpp:231:608:231:619 | *call to getArrayInt56 |
+| bslx.cpp:231:582:231:594 | *call to getArrayUint48 | bslx.cpp:231:609:231:613 | getArrayInt56 output argument |
+| bslx.cpp:231:608:231:619 | *call to getArrayInt56 | bslx.cpp:231:634:231:646 | *call to getArrayUint56 |
+| bslx.cpp:231:608:231:619 | *call to getArrayInt56 | bslx.cpp:231:635:231:640 | getArrayUint56 output argument |
+| bslx.cpp:231:634:231:646 | *call to getArrayUint56 | bslx.cpp:231:660:231:671 | *call to getArrayInt64 |
+| bslx.cpp:231:634:231:646 | *call to getArrayUint56 | bslx.cpp:231:661:231:665 | getArrayInt64 output argument |
+| bslx.cpp:231:660:231:671 | *call to getArrayInt64 | bslx.cpp:231:686:231:698 | *call to getArrayUint64 |
+| bslx.cpp:231:660:231:671 | *call to getArrayInt64 | bslx.cpp:231:687:231:692 | getArrayUint64 output argument |
+| bslx.cpp:231:686:231:698 | *call to getArrayUint64 | bslx.cpp:231:714:231:724 | *call to getArrayFloat32 |
+| bslx.cpp:231:686:231:698 | *call to getArrayUint64 | bslx.cpp:231:715:231:718 | getArrayFloat32 output argument |
+| bslx.cpp:231:714:231:724 | *call to getArrayFloat32 | bslx.cpp:231:740:231:750 | *call to getArrayFloat64 |
+| bslx.cpp:231:714:231:724 | *call to getArrayFloat32 | bslx.cpp:231:741:231:744 | getArrayFloat64 output argument |
+| bslx.cpp:231:740:231:750 | *call to getArrayFloat64 | bslx.cpp:231:760:231:765 | *call to getString |
+| bslx.cpp:231:740:231:750 | *call to getArrayFloat64 | bslx.cpp:231:761:231:763 | getString output argument |
+| bslx.cpp:238:57:238:58 | *sb | bslx.cpp:238:50:238:55 | call to GenericInStream |
+| bslx.cpp:261:2:261:7 | *stream | bslx.cpp:261:18:261:21 | *call to getLength |
+| bslx.cpp:261:18:261:21 | *call to getLength | bslx.cpp:261:32:261:35 | *call to getVersion |
+| bslx.cpp:261:32:261:35 | *call to getVersion | bslx.cpp:261:43:261:46 | *call to getInt8 |
+| bslx.cpp:261:43:261:46 | *call to getInt8 | bslx.cpp:261:55:261:59 | *call to getUint8 |
+| bslx.cpp:261:55:261:59 | *call to getUint8 | bslx.cpp:261:68:261:71 | *call to getInt16 |
+| bslx.cpp:261:68:261:71 | *call to getInt16 | bslx.cpp:261:81:261:85 | *call to getUint16 |
+| bslx.cpp:261:81:261:85 | *call to getUint16 | bslx.cpp:261:94:261:97 | *call to getInt24 |
+| bslx.cpp:261:94:261:97 | *call to getInt24 | bslx.cpp:261:107:261:111 | *call to getUint24 |
+| bslx.cpp:261:107:261:111 | *call to getUint24 | bslx.cpp:261:120:261:123 | *call to getInt32 |
+| bslx.cpp:261:120:261:123 | *call to getInt32 | bslx.cpp:261:133:261:137 | *call to getUint32 |
+| bslx.cpp:261:133:261:137 | *call to getUint32 | bslx.cpp:261:146:261:150 | *call to getInt40 |
+| bslx.cpp:261:146:261:150 | *call to getInt40 | bslx.cpp:261:160:261:165 | *call to getUint40 |
+| bslx.cpp:261:160:261:165 | *call to getUint40 | bslx.cpp:261:174:261:178 | *call to getInt48 |
+| bslx.cpp:261:174:261:178 | *call to getInt48 | bslx.cpp:261:188:261:193 | *call to getUint48 |
+| bslx.cpp:261:188:261:193 | *call to getUint48 | bslx.cpp:261:202:261:206 | *call to getInt56 |
+| bslx.cpp:261:202:261:206 | *call to getInt56 | bslx.cpp:261:216:261:221 | *call to getUint56 |
+| bslx.cpp:261:216:261:221 | *call to getUint56 | bslx.cpp:261:230:261:234 | *call to getInt64 |
+| bslx.cpp:261:230:261:234 | *call to getInt64 | bslx.cpp:261:244:261:249 | *call to getUint64 |
+| bslx.cpp:261:244:261:249 | *call to getUint64 | bslx.cpp:261:260:261:263 | *call to getFloat32 |
+| bslx.cpp:261:260:261:263 | *call to getFloat32 | bslx.cpp:261:274:261:277 | *call to getFloat64 |
+| bslx.cpp:261:274:261:277 | *call to getFloat64 | bslx.cpp:261:287:261:292 | *call to getString |
+| bslx.cpp:261:274:261:277 | *call to getFloat64 | bslx.cpp:261:288:261:290 | getString output argument |
+| bslx.cpp:261:287:261:292 | *call to getString | bslx.cpp:261:305:261:315 | *call to getArrayInt8 |
+| bslx.cpp:261:287:261:292 | *call to getString | bslx.cpp:261:306:261:309 | getArrayInt8 output argument |
+| bslx.cpp:261:305:261:315 | *call to getArrayInt8 | bslx.cpp:261:329:261:340 | *call to getArrayUint8 |
+| bslx.cpp:261:305:261:315 | *call to getArrayInt8 | bslx.cpp:261:330:261:334 | getArrayUint8 output argument |
+| bslx.cpp:261:329:261:340 | *call to getArrayUint8 | bslx.cpp:261:354:261:364 | *call to getArrayInt16 |
+| bslx.cpp:261:329:261:340 | *call to getArrayUint8 | bslx.cpp:261:355:261:358 | getArrayInt16 output argument |
+| bslx.cpp:261:354:261:364 | *call to getArrayInt16 | bslx.cpp:261:379:261:390 | *call to getArrayUint16 |
+| bslx.cpp:261:354:261:364 | *call to getArrayInt16 | bslx.cpp:261:380:261:384 | getArrayUint16 output argument |
+| bslx.cpp:261:379:261:390 | *call to getArrayUint16 | bslx.cpp:261:404:261:414 | *call to getArrayInt24 |
+| bslx.cpp:261:379:261:390 | *call to getArrayUint16 | bslx.cpp:261:405:261:408 | getArrayInt24 output argument |
+| bslx.cpp:261:404:261:414 | *call to getArrayInt24 | bslx.cpp:261:429:261:440 | *call to getArrayUint24 |
+| bslx.cpp:261:404:261:414 | *call to getArrayInt24 | bslx.cpp:261:430:261:434 | getArrayUint24 output argument |
+| bslx.cpp:261:429:261:440 | *call to getArrayUint24 | bslx.cpp:261:454:261:464 | *call to getArrayInt32 |
+| bslx.cpp:261:429:261:440 | *call to getArrayUint24 | bslx.cpp:261:455:261:458 | getArrayInt32 output argument |
+| bslx.cpp:261:454:261:464 | *call to getArrayInt32 | bslx.cpp:261:479:261:490 | *call to getArrayUint32 |
+| bslx.cpp:261:454:261:464 | *call to getArrayInt32 | bslx.cpp:261:480:261:484 | getArrayUint32 output argument |
+| bslx.cpp:261:479:261:490 | *call to getArrayUint32 | bslx.cpp:261:504:261:515 | *call to getArrayInt40 |
+| bslx.cpp:261:479:261:490 | *call to getArrayUint32 | bslx.cpp:261:505:261:509 | getArrayInt40 output argument |
+| bslx.cpp:261:504:261:515 | *call to getArrayInt40 | bslx.cpp:261:530:261:542 | *call to getArrayUint40 |
+| bslx.cpp:261:504:261:515 | *call to getArrayInt40 | bslx.cpp:261:531:261:536 | getArrayUint40 output argument |
+| bslx.cpp:261:530:261:542 | *call to getArrayUint40 | bslx.cpp:261:556:261:567 | *call to getArrayInt48 |
+| bslx.cpp:261:530:261:542 | *call to getArrayUint40 | bslx.cpp:261:557:261:561 | getArrayInt48 output argument |
+| bslx.cpp:261:556:261:567 | *call to getArrayInt48 | bslx.cpp:261:582:261:594 | *call to getArrayUint48 |
+| bslx.cpp:261:556:261:567 | *call to getArrayInt48 | bslx.cpp:261:583:261:588 | getArrayUint48 output argument |
+| bslx.cpp:261:582:261:594 | *call to getArrayUint48 | bslx.cpp:261:608:261:619 | *call to getArrayInt56 |
+| bslx.cpp:261:582:261:594 | *call to getArrayUint48 | bslx.cpp:261:609:261:613 | getArrayInt56 output argument |
+| bslx.cpp:261:608:261:619 | *call to getArrayInt56 | bslx.cpp:261:634:261:646 | *call to getArrayUint56 |
+| bslx.cpp:261:608:261:619 | *call to getArrayInt56 | bslx.cpp:261:635:261:640 | getArrayUint56 output argument |
+| bslx.cpp:261:634:261:646 | *call to getArrayUint56 | bslx.cpp:261:660:261:671 | *call to getArrayInt64 |
+| bslx.cpp:261:634:261:646 | *call to getArrayUint56 | bslx.cpp:261:661:261:665 | getArrayInt64 output argument |
+| bslx.cpp:261:660:261:671 | *call to getArrayInt64 | bslx.cpp:261:686:261:698 | *call to getArrayUint64 |
+| bslx.cpp:261:660:261:671 | *call to getArrayInt64 | bslx.cpp:261:687:261:692 | getArrayUint64 output argument |
+| bslx.cpp:261:686:261:698 | *call to getArrayUint64 | bslx.cpp:261:714:261:724 | *call to getArrayFloat32 |
+| bslx.cpp:261:686:261:698 | *call to getArrayUint64 | bslx.cpp:261:715:261:718 | getArrayFloat32 output argument |
+| bslx.cpp:261:714:261:724 | *call to getArrayFloat32 | bslx.cpp:261:740:261:750 | *call to getArrayFloat64 |
+| bslx.cpp:261:714:261:724 | *call to getArrayFloat32 | bslx.cpp:261:741:261:744 | getArrayFloat64 output argument |
+| bslx.cpp:261:740:261:750 | *call to getArrayFloat64 | bslx.cpp:261:760:261:765 | *call to getString |
+| bslx.cpp:261:740:261:750 | *call to getArrayFloat64 | bslx.cpp:261:761:261:763 | getString output argument |
+| bslx.cpp:267:41:267:51 | *call to data | bslx.cpp:267:34:267:39 | call to ByteInStream |
+| bslx.cpp:269:53:269:58 | *stream | bslx.cpp:269:52:269:63 | *call to bdexStreamIn |
+| bslx.cpp:269:53:269:58 | *stream | bslx.cpp:269:61:269:61 | bdexStreamIn output argument |
+| bslx.cpp:271:53:271:58 | *stream | bslx.cpp:271:52:271:66 | *call to bdexStreamIn |
+| bslx.cpp:271:53:271:58 | *stream | bslx.cpp:271:61:271:61 | bdexStreamIn output argument |
+| bslx.cpp:274:52:274:66 | *call to bdexStreamIn | bslx.cpp:274:76:274:81 | *call to getString |
+| bslx.cpp:274:52:274:66 | *call to bdexStreamIn | bslx.cpp:274:77:274:79 | getString output argument |
+| bslx.cpp:274:53:274:58 | *stream | bslx.cpp:274:52:274:66 | *call to bdexStreamIn |
+| bslx.cpp:274:53:274:58 | *stream | bslx.cpp:274:61:274:61 | bdexStreamIn output argument |
+| bslx.cpp:280:41:280:51 | *call to data | bslx.cpp:280:34:280:39 | call to ByteInStream |
+| bslx.cpp:282:53:282:58 | *stream | bslx.cpp:282:52:282:68 | *call to bdexStreamIn |
+| bslx.cpp:282:53:282:58 | *stream | bslx.cpp:282:61:282:63 | bdexStreamIn output argument |
+| bslx.cpp:294:41:294:51 | *call to data | bslx.cpp:294:34:294:39 | call to ByteInStream |
+| bslx.cpp:296:53:296:58 | *stream | bslx.cpp:296:52:296:68 | *call to bdexStreamIn |
+| bslx.cpp:296:53:296:58 | *stream | bslx.cpp:296:61:296:63 | bdexStreamIn output argument |
+| bslx.cpp:307:15:307:18 | *data | bslx.cpp:307:2:307:7 | reset output argument |
+| bslx.cpp:309:2:309:7 | *stream | bslx.cpp:309:18:309:23 | *call to getString |
+| bslx.cpp:309:2:309:7 | *stream | bslx.cpp:309:19:309:21 | getString output argument |
+| bslx.cpp:315:41:315:51 | *call to data | bslx.cpp:315:34:315:39 | call to ByteInStream |
+| bslx.cpp:318:2:318:7 | *stream | bslx.cpp:318:18:318:23 | *call to getString |
+| bslx.cpp:318:2:318:7 | *stream | bslx.cpp:318:19:318:21 | getString output argument |
+| bslx.cpp:325:15:325:18 | *data | bslx.cpp:325:2:325:7 | reset output argument |
+| bslx.cpp:328:2:328:7 | *stream | bslx.cpp:328:18:328:23 | *call to getString |
+| bslx.cpp:328:2:328:7 | *stream | bslx.cpp:328:19:328:21 | getString output argument |
+| bslx.cpp:334:41:334:51 | *call to data | bslx.cpp:334:34:334:39 | call to ByteInStream |
+| bslx.cpp:336:15:336:19 | *clean | bslx.cpp:336:2:336:7 | reset output argument |
+| bslx.cpp:338:2:338:7 | *stream | bslx.cpp:338:18:338:23 | *call to getString |
+| bslx.cpp:338:2:338:7 | *stream | bslx.cpp:338:19:338:21 | getString output argument |
+| protobuf.cpp:106:22:106:25 | data | protobuf.cpp:106:2:106:4 | ParseFromString output argument |
+| protobuf.cpp:113:22:113:25 | *data | protobuf.cpp:113:2:113:4 | ParseFromString output argument |
+| protobuf.cpp:120:29:120:32 | data | protobuf.cpp:120:2:120:4 | ParsePartialFromString output argument |
+| protobuf.cpp:127:29:127:32 | *data | protobuf.cpp:127:2:127:4 | ParsePartialFromString output argument |
+| protobuf.cpp:134:22:134:25 | data | protobuf.cpp:134:2:134:4 | MergeFromString output argument |
+| protobuf.cpp:141:22:141:25 | *data | protobuf.cpp:141:2:141:4 | MergeFromString output argument |
+| protobuf.cpp:148:29:148:32 | data | protobuf.cpp:148:2:148:4 | MergePartialFromString output argument |
+| protobuf.cpp:155:29:155:32 | *data | protobuf.cpp:155:2:155:4 | MergePartialFromString output argument |
+| protobuf.cpp:162:21:162:31 | *call to data | protobuf.cpp:162:2:162:4 | ParseFromArray output argument |
+| protobuf.cpp:169:28:169:38 | *call to data | protobuf.cpp:169:2:169:4 | ParsePartialFromArray output argument |
+| protobuf.cpp:176:20:176:23 | *data | protobuf.cpp:176:2:176:4 | ParseFromCord output argument |
+| protobuf.cpp:183:27:183:30 | *data | protobuf.cpp:183:2:183:4 | ParsePartialFromCord output argument |
+| protobuf.cpp:190:20:190:23 | *data | protobuf.cpp:190:2:190:4 | MergeFromCord output argument |
+| protobuf.cpp:197:27:197:30 | *data | protobuf.cpp:197:2:197:4 | MergePartialFromCord output argument |
+| protobuf.cpp:204:23:204:25 | *& ... | protobuf.cpp:204:2:204:4 | ParseFromIstream output argument |
+| protobuf.cpp:211:30:211:32 | *& ... | protobuf.cpp:211:2:211:4 | ParsePartialFromIstream output argument |
+| protobuf.cpp:218:30:218:32 | *& ... | protobuf.cpp:218:2:218:4 | ParseFromZeroCopyStream output argument |
+| protobuf.cpp:225:37:225:39 | *& ... | protobuf.cpp:225:2:225:4 | ParsePartialFromZeroCopyStream output argument |
+| protobuf.cpp:232:37:232:39 | *& ... | protobuf.cpp:232:2:232:4 | ParseFromBoundedZeroCopyStream output argument |
+| protobuf.cpp:239:44:239:46 | *& ... | protobuf.cpp:239:2:239:4 | ParsePartialFromBoundedZeroCopyStream output argument |
+| protobuf.cpp:246:37:246:39 | *& ... | protobuf.cpp:246:2:246:4 | MergeFromBoundedZeroCopyStream output argument |
+| protobuf.cpp:253:44:253:46 | *& ... | protobuf.cpp:253:2:253:4 | MergePartialFromBoundedZeroCopyStream output argument |
+| protobuf.cpp:260:27:260:29 | *& ... | protobuf.cpp:260:2:260:4 | ParseFromCodedStream output argument |
+| protobuf.cpp:267:34:267:36 | *& ... | protobuf.cpp:267:2:267:4 | ParsePartialFromCodedStream output argument |
+| protobuf.cpp:274:27:274:29 | *& ... | protobuf.cpp:274:2:274:4 | MergeFromCodedStream output argument |
+| protobuf.cpp:281:34:281:36 | *& ... | protobuf.cpp:281:2:281:4 | MergePartialFromCodedStream output argument |
+| protobuf.cpp:288:22:288:25 | *data | protobuf.cpp:288:2:288:4 | ParseFromString output argument |
+| protobuf.cpp:297:2:297:4 | *msg | protobuf.cpp:297:24:297:27 | SerializeToString output argument |
+| protobuf.cpp:304:2:304:4 | *msg | protobuf.cpp:304:31:304:34 | SerializePartialToString output argument |
+| protobuf.cpp:311:2:311:4 | *msg | protobuf.cpp:311:21:311:24 | AppendToString output argument |
+| protobuf.cpp:318:2:318:4 | *msg | protobuf.cpp:318:28:318:31 | AppendPartialToString output argument |
+| protobuf.cpp:325:2:325:4 | *msg | protobuf.cpp:325:24:325:27 | SerializeToString output argument |
+| protobuf.cpp:332:2:332:4 | *msg | protobuf.cpp:332:31:332:34 | SerializePartialToString output argument |
+| protobuf.cpp:339:2:339:4 | *msg | protobuf.cpp:339:21:339:24 | AppendToString output argument |
+| protobuf.cpp:346:2:346:4 | *msg | protobuf.cpp:346:28:346:31 | AppendPartialToString output argument |
+| protobuf.cpp:353:2:353:4 | *msg | protobuf.cpp:353:23:353:25 | SerializeToArray output argument |
+| protobuf.cpp:360:2:360:4 | *msg | protobuf.cpp:360:30:360:32 | SerializePartialToArray output argument |
+| protobuf.cpp:367:2:367:4 | *msg | protobuf.cpp:367:22:367:25 | SerializeToCord output argument |
+| protobuf.cpp:374:2:374:4 | *msg | protobuf.cpp:374:29:374:32 | SerializePartialToCord output argument |
+| protobuf.cpp:381:2:381:4 | *msg | protobuf.cpp:381:19:381:22 | AppendToCord output argument |
+| protobuf.cpp:388:2:388:4 | *msg | protobuf.cpp:388:26:388:29 | AppendPartialToCord output argument |
+| protobuf.cpp:395:2:395:4 | *msg | protobuf.cpp:395:25:395:28 | SerializeToOstream output argument |
+| protobuf.cpp:402:2:402:4 | *msg | protobuf.cpp:402:32:402:35 | SerializePartialToOstream output argument |
+| protobuf.cpp:409:2:409:4 | *msg | protobuf.cpp:409:32:409:35 | SerializeToZeroCopyStream output argument |
+| protobuf.cpp:416:2:416:4 | *msg | protobuf.cpp:416:39:416:42 | SerializePartialToZeroCopyStream output argument |
+| protobuf.cpp:423:2:423:4 | *msg | protobuf.cpp:423:29:423:32 | SerializeToCodedStream output argument |
+| protobuf.cpp:430:2:430:4 | *msg | protobuf.cpp:430:36:430:39 | SerializePartialToCodedStream output argument |
+| protobuf.cpp:438:7:438:9 | *msg | protobuf.cpp:438:11:438:27 | call to SerializeAsString |
+| protobuf.cpp:443:7:443:9 | *msg | protobuf.cpp:443:11:443:34 | call to SerializePartialAsString |
+| protobuf.cpp:448:7:448:9 | *msg | protobuf.cpp:448:11:448:25 | call to SerializeAsCord |
+| protobuf.cpp:453:7:453:9 | *msg | protobuf.cpp:453:11:453:32 | call to SerializePartialAsCord |
+| protobuf.cpp:458:7:458:9 | *msg | protobuf.cpp:458:11:458:27 | call to SerializeAsString |
 | test.cpp:17:24:17:24 | x | test.cpp:17:10:17:22 | call to ymlStepManual |
 | test.cpp:21:27:21:27 | x | test.cpp:21:10:21:25 | call to ymlStepGenerated |
 | test.cpp:25:35:25:35 | x | test.cpp:25:11:25:33 | call to ymlStepManual_with_body |
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/test.cpp b/cpp/ql/test/library-tests/dataflow/external-models/test.cpp
index ebb20bab6497..b0e5016e4697 100644
--- a/cpp/ql/test/library-tests/dataflow/external-models/test.cpp
+++ b/cpp/ql/test/library-tests/dataflow/external-models/test.cpp
@@ -1,5 +1,5 @@
 
-int ymlSource();
+int ymlSource(); int* ymlSourcePtr();
 void ymlSink(int value);
 int ymlStepManual(int value);
 int ymlStepGenerated(int value);
@@ -223,4 +223,258 @@ void test_reverse_flow(unsigned i, unsigned j) {
 		char c = s[j];
 		ymlSink(c); // $ ir
 	}
+}
+
+
+struct SourceWrapper {
+	int value; int* pointer;
+};
+
+SourceWrapper ymlFieldSource();
+
+template<typename F>
+void source_from_callback_template(F);
+
+using Callback = void(*)(const SourceWrapper*);
+
+void source_from_callback_ptr(Callback);
+
+void f(const SourceWrapper* s) {
+	ymlSink(s->value); // $ ir=250:32 ir=251:27 ir=262:27
+}
+
+void test_source_access_path(bool b) {
+	SourceWrapper wrapper = ymlFieldSource();
+	ymlSink(wrapper.value); // $ ir
+
+	source_from_callback_template(f);
+	source_from_callback_ptr(f);
+
+	Callback f_var;
+	if(b) {
+		f_var = f;
+	} else {
+		f_var = [](const SourceWrapper* s) {
+			ymlSink(s->value); // $ ir
+		};
+	}
+
+	source_from_callback_ptr(f_var);
+
+	source_from_callback_template([](const SourceWrapper* s) {
+		ymlSink(s->value); // $ ir
+	});
+
+	source_from_callback_ptr([](const SourceWrapper* s) {
+		ymlSink(s->value); // $ ir
+	});
+
+	struct S {
+		void operator()(const SourceWrapper* s) {
+			ymlSink(s->value); // $ ir
+		}
+	};
+
+	source_from_callback_template(S());
+}
+
+template<typename F> void source_from_callback_return_template(F);
+template<typename F> void sink_from_callback_return_template(F);
+
+using IntCallback = int(*)(void);
+using IntPtrCallback = int*(*)(void);
+
+void source_from_callback_return_ptr(IntCallback);
+void sink_from_callback_return_ptr(IntCallback);
+
+void source_ptr_from_callback_return_ptr(IntPtrCallback);
+void sink_ptr_from_callback_return_ptr(IntPtrCallback);
+
+int callback_returning_int() { return 0; }
+int callback_returning_int_2() { return 0; }
+int* callback_returning_ptr_int() { return nullptr; }
+
+int return_ymlSource() { return ymlSource(); }
+
+int* return_ptr_to_ymlSource() { return ymlSourcePtr(); }
+
+void test_callback_return_access_paths() {
+	
+	ymlSink((int)ymlSourcePtr()); // clean
+	ymlSink(*ymlSourcePtr()); // $ ir
+
+	source_from_callback_return_template(callback_returning_int);
+	ymlSink(callback_returning_int()); // $ ir
+
+	source_from_callback_return_ptr(callback_returning_int_2);
+	ymlSink(callback_returning_int_2()); // $ ir
+
+	source_ptr_from_callback_return_ptr(callback_returning_ptr_int);
+	int *ptr = callback_returning_ptr_int();
+	ymlSink((int)ptr); // clean
+	ymlSink(*ptr); // $ ir
+
+	sink_from_callback_return_template([]() { return ymlSource(); }); // $ ir
+	sink_from_callback_return_template(return_ymlSource); // $ ir
+
+	sink_ptr_from_callback_return_ptr([]() { return ymlSourcePtr(); }); // $ ir
+	sink_ptr_from_callback_return_ptr(return_ptr_to_ymlSource); // $ ir
+}
+
+void test_parameter(SourceWrapper* p, SourceWrapper s, int* source) {
+	ymlSink(p->value); // $ ir
+	ymlSink((int)p->pointer); // clean
+	ymlSink(*p->pointer); // $ ir
+
+	ymlSink(s.value); // $ ir
+	ymlSink((int)s.pointer); // clean
+	ymlSink(*s.pointer); // $ ir
+
+	ymlSink((int)source); // clean
+	ymlSink(*source); // $ ir
+}
+
+
+struct ConstructableFromInt {
+  short s;
+  unsigned long ul;
+  ConstructableFromInt(short arg) {
+    this->s = arg;
+  }
+
+  ConstructableFromInt(unsigned long arg) {
+    this->ul = arg;
+  }
+};
+
+template<typename T>
+struct Forwarder {
+  template<typename... Args>
+  void forward(Args&&... args);
+  void forwardToElement(int arg);
+
+  T get();
+};
+
+void forward_test() {
+  {
+    Forwarder<ConstructableFromInt> f;
+    short x = ymlSource();
+    f.forward(x);
+
+    ConstructableFromInt c = f.get();
+    ymlSink(c.s); // $ ir
+    ymlSink(c.ul); // $ SPURIOUS: ir
+  }
+  {
+    Forwarder<ConstructableFromInt> f;
+    unsigned long ul = ymlSource();
+    f.forward(ul);
+
+    ConstructableFromInt c = f.get();
+    ymlSink(c.s); // $ SPURIOUS: ir
+    ymlSink(c.ul); // $ ir
+  }
+}
+
+template<typename T>
+struct Container {
+	using value_type = T;
+  template<typename... Args>
+  void emplace(int pos, Args&&... args);
+
+  T& get();
+};
+
+struct Element {
+  int x;
+  Element(int);
+};
+
+template<typename T>
+T makeForwarded(int arg);
+
+void forward_test_function_template_constructor() {
+  int x = ymlSource();
+  Element e = makeForwarded<Element>(x);
+  ymlSink(e.x); // $ ir
+}
+
+void forward_test_named_constructor() {
+  Forwarder<Element> f;
+  int x = ymlSource();
+  f.forwardToElement(x);
+  Element e = f.get();
+  ymlSink(e.x); // $ ir
+}
+
+void forward_test_model() {
+  Container<Element> c;
+  int x = ymlSource();
+  c.emplace(0, x);
+
+  Element e = c.get();
+  ymlSink(e.x); // $ ir
+}
+
+void forward_test_member_alias_scalar() {
+  Container<int> scalar;
+  scalar.emplace(0, ymlSource());
+  ymlSink(scalar.get()); // $ ir
+
+  Container<int*> pointer;
+  pointer.emplace(0, ymlSourcePtr());
+  ymlSink(*pointer.get()); // $ ir
+}
+
+struct ElementWithDefaultArgument {
+  int x;
+  ElementWithDefaultArgument(int x, int = 0);
+};
+
+void forward_test_model_with_default_argument() {
+  Container<ElementWithDefaultArgument> c;
+  int x = ymlSource();
+  c.emplace(0, x);
+
+  ElementWithDefaultArgument e = c.get();
+  ymlSink(e.x); // $ ir
+}
+
+struct ElementWithOverloadedArity {
+  int x;
+  ElementWithOverloadedArity(int first) : x(first) {}
+  ElementWithOverloadedArity(int, int second) : x(second) {}
+};
+
+void forward_test_constructor_arity() {
+  int x = ymlSource();
+  {
+    Container<ElementWithOverloadedArity> c;
+    c.emplace(0, x);
+    ymlSink(c.get().x); // $ ir
+  }
+  {
+    Container<ElementWithOverloadedArity> c;
+    c.emplace(0, x, 0);
+    ymlSink(c.get().x); // clean
+  }
+  {
+    Container<ElementWithOverloadedArity> c;
+    c.emplace(0, 0, x);
+    ymlSink(c.get().x); // $ ir
+  }
+}
+
+void forward_test_without_constructor() {
+  {
+    Forwarder<int> f;
+    f.forward(ymlSource());
+    ymlSink(f.get()); // $ ir
+  }
+  {
+    Forwarder<int*> f;
+    f.forward(ymlSourcePtr());
+    ymlSink(*f.get()); // $ ir
+  }
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected b/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected
index 15ae50bddc26..b1c411ea7c7e 100644
--- a/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected
+++ b/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected
@@ -370,6 +370,8 @@
 | Dubious signature "(BN_MONT_CTX *,const BIGNUM *,int,const unsigned char *,size_t,uint32_t,uint32_t)" in summary model. |
 | Dubious signature "(BN_RECP_CTX *,const BIGNUM *,BN_CTX *)" in summary model. |
 | Dubious signature "(BUF_MEM *,size_t)" in summary model. |
+| Dubious signature "(Blob *,int,const Blob &,int,int)" in summary model. |
+| Dubious signature "(Blob *,int,const char *,int)" in summary model. |
 | Dubious signature "(BrotliBitReader *const,uint64_t,uint64_t *)" in summary model. |
 | Dubious signature "(BrotliDecoderState *,BrotliDecoderStateInternal *,BrotliSharedDictionaryType,size_t,const uint8_t[])" in summary model. |
 | Dubious signature "(BrotliDecoderState *,BrotliDecoderStateInternal *,brotli_decoder_metadata_start_func,brotli_decoder_metadata_chunk_func,void *)" in summary model. |
@@ -2948,6 +2950,7 @@
 | Dubious signature "(char *,char *__restrict__,int,FILE *,FILE *__restrict__)" in summary model. |
 | Dubious signature "(char *,char *__restrict__,size_t,const char *,const char *__restrict__,const tm *,const tm *__restrict__,locale_t)" in summary model. |
 | Dubious signature "(char *,char,char **)" in summary model. |
+| Dubious signature "(char *,const Blob &,int,int)" in summary model. |
 | Dubious signature "(char *,const char *)" in summary model. |
 | Dubious signature "(char *,const char **,const char **,const char **,const char **,const char **)" in summary model. |
 | Dubious signature "(char *,const char *,char **)" in summary model. |
@@ -3164,6 +3167,7 @@
 | Dubious signature "(const CURLU *,CURLUPart,char **,unsigned int)" in summary model. |
 | Dubious signature "(const ComPtr &)" in summary model. |
 | Dubious signature "(const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *)" in summary model. |
+| Dubious signature "(const Cord &)" in summary model. |
 | Dubious signature "(const Curl_easy *,const connectdata *,int)" in summary model. |
 | Dubious signature "(const DH *)" in summary model. |
 | Dubious signature "(const DH *,const BIGNUM *)" in summary model. |
@@ -3347,6 +3351,14 @@
 | Dubious signature "(const IPAddressRange *,unsigned char **)" in summary model. |
 | Dubious signature "(const ISSUER_SIGN_TOOL *,unsigned char **)" in summary model. |
 | Dubious signature "(const ISSUING_DIST_POINT *,unsigned char **)" in summary model. |
+| Dubious signature "(const InternetProtocol &,const string &,const string &)" in summary model. |
+| Dubious signature "(const InternetProtocol &,const string &,const string &,error_code &)" in summary model. |
+| Dubious signature "(const InternetProtocol &,const string &,const string &,flags)" in summary model. |
+| Dubious signature "(const InternetProtocol &,const string &,const string &,flags,error_code &)" in summary model. |
+| Dubious signature "(const InternetProtocol &,string_view,string_view)" in summary model. |
+| Dubious signature "(const InternetProtocol &,string_view,string_view,error_code &)" in summary model. |
+| Dubious signature "(const InternetProtocol &,string_view,string_view,flags)" in summary model. |
+| Dubious signature "(const InternetProtocol &,string_view,string_view,flags,error_code &)" in summary model. |
 | Dubious signature "(const MATRIX *,const VECTOR *,VECTOR *)" in summary model. |
 | Dubious signature "(const MD5_params *)" in summary model. |
 | Dubious signature "(const ML_DSA_KEY *)" in summary model. |
@@ -3357,6 +3369,7 @@
 | Dubious signature "(const ML_KEM_KEY *,const ML_KEM_KEY *)" in summary model. |
 | Dubious signature "(const ML_KEM_KEY *,int)" in summary model. |
 | Dubious signature "(const ML_KEM_KEY *,unsigned char **)" in summary model. |
+| Dubious signature "(const MessageProperties &,Allocator *)" in summary model. |
 | Dubious signature "(const NAMING_AUTHORITY *)" in summary model. |
 | Dubious signature "(const NAMING_AUTHORITY *,unsigned char **)" in summary model. |
 | Dubious signature "(const NETSCAPE_CERT_SEQUENCE *,unsigned char **)" in summary model. |
@@ -3679,6 +3692,7 @@
 | Dubious signature "(const SSL_SESSION *,unsigned int *)" in summary model. |
 | Dubious signature "(const SXNET *,unsigned char **)" in summary model. |
 | Dubious signature "(const SXNETID *,unsigned char **)" in summary model. |
+| Dubious signature "(const StringRef &)" in summary model. |
 | Dubious signature "(const T &,BOOL)" in summary model. |
 | Dubious signature "(const TS_ACCURACY *)" in summary model. |
 | Dubious signature "(const TS_ACCURACY *,unsigned char **)" in summary model. |
@@ -4005,6 +4019,7 @@
 | Dubious signature "(const char *,size_t *)" in summary model. |
 | Dubious signature "(const char *,size_t *,int)" in summary model. |
 | Dubious signature "(const char *,size_t)" in summary model. |
+| Dubious signature "(const char *,size_t,TYPE *,const char *)" in summary model. |
 | Dubious signature "(const char *,size_t,char **,size_t *,urlreject)" in summary model. |
 | Dubious signature "(const char *,size_t,const char *)" in summary model. |
 | Dubious signature "(const char *,size_t,const char *,const char *,bool,iconv_ilseq_handler,size_t *,char **,size_t *)" in summary model. |
@@ -4150,6 +4165,10 @@
 | Dubious signature "(const stack_st_X509_EXTENSION *,int,int)" in summary model. |
 | Dubious signature "(const stack_st_X509_NAME *)" in summary model. |
 | Dubious signature "(const stat *)" in summary model. |
+| Dubious signature "(const string &,const string &)" in summary model. |
+| Dubious signature "(const string &,const string &,error_code &)" in summary model. |
+| Dubious signature "(const string &,const string &,flags)" in summary model. |
+| Dubious signature "(const string &,const string &,flags,error_code &)" in summary model. |
 | Dubious signature "(const td_thragent_t *,lwpid_t,td_thrhandle_t *)" in summary model. |
 | Dubious signature "(const td_thragent_t *,ps_prochandle **)" in summary model. |
 | Dubious signature "(const td_thragent_t *,pthread_t,td_thrhandle_t *)" in summary model. |
@@ -4662,6 +4681,8 @@
 | Dubious signature "(int,void *)" in summary model. |
 | Dubious signature "(int,void *,size_t)" in summary model. |
 | Dubious signature "(int_dhx942_dh **,const unsigned char **,long)" in summary model. |
+| Dubious signature "(istream &,AnyRef *,const char *)" in summary model. |
+| Dubious signature "(istream &,TYPE *,const char *)" in summary model. |
 | Dubious signature "(lemon *)" in summary model. |
 | Dubious signature "(lemon *,action *)" in summary model. |
 | Dubious signature "(lemon *,const char *)" in summary model. |
@@ -4910,6 +4931,8 @@
 | Dubious signature "(obstack *,int,int,..(*)(..),..(*)(..),void *)" in summary model. |
 | Dubious signature "(obstack *,void *)" in summary model. |
 | Dubious signature "(old_termios_t *,speed_t)" in summary model. |
+| Dubious signature "(ostream &,const AnyConstRef &)" in summary model. |
+| Dubious signature "(ostream &,const TYPE &)" in summary model. |
 | Dubious signature "(passwd *,char *,size_t,int *)" in summary model. |
 | Dubious signature "(passwd *,char *,size_t,passwd **)" in summary model. |
 | Dubious signature "(pgrs_dir *,curl_off_t,curltime)" in summary model. |
@@ -5173,10 +5196,16 @@
 | Dubious signature "(statvfs64 *,const statfs64 *)" in summary model. |
 | Dubious signature "(store_netrc *)" in summary model. |
 | Dubious signature "(store_netrc *,const char *,char **,char **,char *)" in summary model. |
+| Dubious signature "(streambuf *,AnyRef *,const char *)" in summary model. |
+| Dubious signature "(streambuf *,TYPE *,const char *)" in summary model. |
+| Dubious signature "(streambuf *,const AnyConstRef &)" in summary model. |
+| Dubious signature "(streambuf *,const TYPE &)" in summary model. |
 | Dubious signature "(string_buf *,libssh2_uint64_t *)" in summary model. |
 | Dubious signature "(string_buf *,uint32_t *)" in summary model. |
 | Dubious signature "(string_buf *,unsigned char *)" in summary model. |
 | Dubious signature "(string_buf *,unsigned char **,size_t *)" in summary model. |
+| Dubious signature "(string_view,string_view,error_code &)" in summary model. |
+| Dubious signature "(string_view,string_view,flags,error_code &)" in summary model. |
 | Dubious signature "(stringtable *,const char *)" in summary model. |
 | Dubious signature "(stringtable *,stringtable_finalized *)" in summary model. |
 | Dubious signature "(support_descriptors *,const char *,FILE *)" in summary model. |
@@ -5566,18 +5595,27 @@
 | Dubious signature "(z_streamp,unsigned int)" in summary model. |
 | Unrecognized input specification "Argument[***0]" in summary model. |
 | Unrecognized input specification "Argument[***1]" in summary model. |
+| Unrecognized input specification "Argument[***2]" in summary model. |
 | Unrecognized input specification "Argument[***3]" in summary model. |
 | Unrecognized input specification "Argument[***4]" in summary model. |
+| Unrecognized input specification "Argument[***5]" in summary model. |
 | Unrecognized input specification "Argument[****0]" in summary model. |
 | Unrecognized input specification "Argument[****1]" in summary model. |
+| Unrecognized input specification "Argument[****2]" in summary model. |
 | Unrecognized input specification "Argument[****3]" in summary model. |
 | Unrecognized input specification "Argument[****4]" in summary model. |
+| Unrecognized input specification "Argument[****5]" in summary model. |
 | Unrecognized input specification "Argument[*****0]" in summary model. |
 | Unrecognized input specification "Argument[*****1]" in summary model. |
+| Unrecognized input specification "Argument[*****2]" in summary model. |
+| Unrecognized input specification "Argument[*****3]" in summary model. |
+| Unrecognized input specification "Argument[*****4]" in summary model. |
+| Unrecognized input specification "Argument[*****5]" in summary model. |
 | Unrecognized input specification "Field[****hEvent]" in summary model. |
 | Unrecognized input specification "Field[***hEvent]" in summary model. |
 | Unrecognized output specification "Argument[***0]" in summary model. |
 | Unrecognized output specification "Argument[***1]" in summary model. |
+| Unrecognized output specification "Argument[***2]" in summary model. |
 | Unrecognized output specification "Argument[****0]" in summary model. |
 | Unrecognized output specification "Argument[****1]" in summary model. |
 | Unrecognized output specification "Argument[*****0]" in summary model. |
@@ -5585,7 +5623,15 @@
 | Unrecognized output specification "Field[****hEvent]" in summary model. |
 | Unrecognized output specification "Field[***hEvent]" in summary model. |
 | Unrecognized output specification "Parameter[***0]" in summary model. |
+| Unrecognized output specification "Parameter[***1]" in summary model. |
+| Unrecognized output specification "Parameter[***2]" in summary model. |
+| Unrecognized output specification "Parameter[***3]" in summary model. |
+| Unrecognized output specification "Parameter[***4]" in summary model. |
 | Unrecognized output specification "Parameter[****0]" in summary model. |
+| Unrecognized output specification "Parameter[****1]" in summary model. |
+| Unrecognized output specification "Parameter[****2]" in summary model. |
+| Unrecognized output specification "Parameter[****3]" in summary model. |
+| Unrecognized output specification "Parameter[****4]" in summary model. |
 | Unrecognized output specification "ReturnValue[*****]" in summary model. |
 | Unrecognized output specification "ReturnValue[****]" in summary model. |
 | Unrecognized output specification "ReturnValue[***]" in summary model. |
diff --git a/cpp/ql/test/library-tests/dataflow/forwarding/test.cpp b/cpp/ql/test/library-tests/dataflow/forwarding/test.cpp
new file mode 100644
index 000000000000..f00a473a5276
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/forwarding/test.cpp
@@ -0,0 +1,531 @@
+template<typename T>
+struct Container {
+  template<typename... Args>
+  void emplace(Args&&... args);
+};
+
+struct Element {
+  int x;
+  Element(int); // element_int
+  Element(short); // element_short
+  Element(unsigned long); // element_ul
+  Element(const char*, int x); // element_const_char_ptr_int
+  Element(char*, int x); // element_char_ptr_int
+};
+
+struct RefElement {
+  RefElement(int&& x); // element_ref_int_rref
+  RefElement(int& x); // element_ref_int_lref
+  RefElement(const int& x); // element_ref_const_int_ref
+  RefElement(const char* const&, int x); // element_ref_const_char_ptr_const_ref_int
+  RefElement(const char* const volatile&, int x); // element_ref_const_char_ptr_const_volatile_ref_int
+  RefElement(const char*&&, int, int); // element_ref_pointer_rref
+  RefElement(const char*&, int, int, int); // element_ref_pointer_lref
+};
+
+struct ElementWithDefaultArgument {
+  int x;
+  ElementWithDefaultArgument(int x, int = 0); // element_default_int
+};
+
+struct ElementWithOverloadedArity {
+  int x;
+  ElementWithOverloadedArity(int first); // element_overload_arith_1
+  ElementWithOverloadedArity(int, int second); // element_overload_arith_2
+};
+
+struct ElementFromMutablePointer {
+  ElementFromMutablePointer(char*, int); // element_from_mutable_ptr
+};
+
+void test() {
+  {
+    Container<Element> c;
+    c.emplace(42); // $ targets=element_int SPURIOUS: targets=element_short targets=element_ul
+  }
+  {
+    Container<ElementWithDefaultArgument> c;
+    c.emplace(42); // $ targets=element_default_int
+    c.emplace(42, 1); // $ targets=element_default_int
+  }
+  {
+    Container<ElementWithOverloadedArity> c;
+    c.emplace(42); // $ targets=element_overload_arith_1
+    c.emplace(42, 1); // $ targets=element_overload_arith_2
+  }
+  {
+    Container<Element> c;
+    c.emplace("abc", 42); // $ targets=element_const_char_ptr_int
+    c.emplace((char*)nullptr, 42); // $ targets=element_char_ptr_int SPURIOUS: targets=element_const_char_ptr_int
+  }
+  {
+    Container<Element> c;
+    Container<RefElement> cr;
+    {
+      const int x = 42;
+      c.emplace(x); // $ targets=element_int SPURIOUS: targets=element_short targets=element_ul
+      cr.emplace(x); // $ targets=element_ref_const_int_ref
+    }
+    {
+      int x = 42;
+      c.emplace(x); // $ targets=element_int SPURIOUS: targets=element_short targets=element_ul
+      cr.emplace(x); // $ targets=element_ref_int_lref SPURIOUS: targets=element_ref_const_int_ref
+    }
+    c.emplace(42); // $ targets=element_int SPURIOUS: targets=element_short targets=element_ul
+    cr.emplace(42); // $ targets=element_ref_int_rref SPURIOUS: targets=element_ref_const_int_ref
+    cr.emplace("abc", 42); // $ targets=element_ref_const_char_ptr_const_ref_int
+    const char buffer[] = "abc";
+    cr.emplace(buffer, 42); // $ targets=element_ref_const_char_ptr_const_ref_int
+  }
+  {
+  	Container<Element> container;
+    short shortValue = 42;
+    unsigned long longValue = 42;
+    container.emplace(shortValue); // $ targets=element_short SPURIOUS: targets=element_int targets=element_ul
+    container.emplace(longValue); // $ targets=element_ul SPURIOUS: targets=element_int targets=element_short
+  }
+}
+
+
+void test_invalid_pointer_conversion() {
+  Container<ElementFromMutablePointer> container;
+  container.emplace("abc", 42); // no targets
+}
+
+void test_volatile_reference_binding() {
+  Container<RefElement> container;
+  const char* volatile pointer = "abc";
+  container.emplace(pointer, 42); // $ targets=element_ref_const_char_ptr_const_volatile_ref_int
+  container.emplace("abc", 42); // $ targets=element_ref_const_char_ptr_const_ref_int
+}
+
+struct ImplicitConversion {
+  ImplicitConversion(int = 0, int = 0);
+  ImplicitConversion(const char* const&);
+};
+
+struct ExplicitConversion {
+  explicit ExplicitConversion(int);
+};
+
+struct DeletedConversion {
+  DeletedConversion(int) = delete;
+};
+
+struct RequiredArgumentConversion {
+  RequiredArgumentConversion(int, int);
+};
+
+struct LvalueConversion {
+  LvalueConversion(int&);
+};
+
+struct RvalueConversion {
+  RvalueConversion(int&&);
+};
+
+struct ChainedConversion {
+  ChainedConversion(ImplicitConversion);
+};
+
+struct ElementFromImplicitConversion {
+  explicit ElementFromImplicitConversion(ImplicitConversion); // element_conversion_value
+  ElementFromImplicitConversion(const ImplicitConversion&, int); // element_conversion_const_ref
+  ElementFromImplicitConversion(ImplicitConversion&&, int, int); // element_conversion_rref
+  ElementFromImplicitConversion(ImplicitConversion&, int, int, int); // element_conversion_lref
+  ElementFromImplicitConversion(const volatile ImplicitConversion&, int, int, int, int); // element_conversion_const_volatile_ref
+};
+
+struct ElementFromUnavailableConversion {
+  ElementFromUnavailableConversion(ExplicitConversion); // element_explicit_conversion
+  ElementFromUnavailableConversion(DeletedConversion, int); // element_deleted_conversion
+  ElementFromUnavailableConversion(RequiredArgumentConversion, int, int); // element_required_argument_conversion
+};
+
+struct ElementFromReferenceConversion {
+  ElementFromReferenceConversion(LvalueConversion); // element_lvalue_conversion
+  ElementFromReferenceConversion(RvalueConversion, int); // element_rvalue_conversion
+};
+
+struct ElementFromChainedConversion {
+  ElementFromChainedConversion(ChainedConversion); // element_chained_conversion
+  ElementFromChainedConversion(ImplicitConversion, ImplicitConversion); // element_two_conversions
+};
+
+void test_implicit_conversion() {
+  Container<ElementFromImplicitConversion> container;
+  container.emplace(42); // $ targets=element_conversion_value
+  container.emplace("abc"); // $ targets=element_conversion_value
+  container.emplace(42, 0); // $ targets=element_conversion_const_ref
+  container.emplace(42, 0, 0); // $ targets=element_conversion_rref
+  container.emplace(42, 0, 0, 0); // no targets
+  container.emplace(42, 0, 0, 0, 0); // no targets
+}
+
+void test_unavailable_implicit_conversion() {
+  Container<ElementFromUnavailableConversion> container;
+  container.emplace(42); // no targets
+  container.emplace(42, 0); // no targets
+  container.emplace(42, 0, 0); // no targets
+}
+
+void test_implicit_conversion_input_references() {
+  Container<ElementFromReferenceConversion> container;
+  int value = 42;
+  const int constValue = 42;
+  volatile int volatileValue = 42;
+  container.emplace(value); // $ targets=element_lvalue_conversion
+  container.emplace(42); // no targets
+  container.emplace(constValue); // no targets
+  container.emplace(volatileValue); // no targets
+  container.emplace(42, 0); // $ targets=element_rvalue_conversion
+  container.emplace(value, 0); // no targets
+  container.emplace(static_cast<const int&&>(constValue), 0); // no targets
+  container.emplace(static_cast<volatile int&&>(volatileValue), 0); // no targets
+}
+
+void test_implicit_conversion_limit() {
+  Container<ElementFromChainedConversion> container;
+  container.emplace(42); // no targets
+  ImplicitConversion converted(42);
+  container.emplace(converted); // $ targets=element_chained_conversion
+  container.emplace(42, 42); // $ targets=element_two_conversions
+
+  Container<ElementFromImplicitConversion> references;
+  references.emplace(converted, 0, 0); // no target
+  const ImplicitConversion constConverted(42);
+  references.emplace(constConverted, 0, 0, 0); // no target
+}
+
+struct ValueConversionOperator {
+  operator int();
+};
+
+struct LvalueConversionOperator {
+  operator int&() &;
+};
+
+struct RvalueConversionOperator {
+  operator int&&() &&;
+};
+
+struct ConstConversionOperator {
+  operator const int&() const &;
+};
+
+struct VolatileConversionOperator {
+  operator const volatile int&() const volatile;
+};
+
+struct ExplicitConversionOperator {
+  explicit operator int();
+};
+
+struct DeletedConversionOperator {
+  operator int() = delete;
+};
+
+struct ChainedConversionOperator {
+  operator ValueConversionOperator&();
+};
+
+struct ArrayConversionOperator {
+  using Buffer = const char[4];
+  operator Buffer&() const;
+};
+
+struct ElementFromConversionOperator {
+  explicit ElementFromConversionOperator(int); // element_operator_value
+  ElementFromConversionOperator(int&, int); // element_operator_lref
+  ElementFromConversionOperator(const int&, int, int); // element_operator_const_ref
+  ElementFromConversionOperator(int&&, int, int, int); // element_operator_rref
+  ElementFromConversionOperator(const volatile int&, int, int, int, int); // element_operator_const_volatile_ref
+};
+
+void test_value_conversion_operator() {
+  Container<ElementFromConversionOperator> container;
+  ValueConversionOperator value;
+  const ValueConversionOperator constValue;
+  volatile ValueConversionOperator volatileValue;
+  container.emplace(value); // $ targets=element_operator_value
+  container.emplace(ValueConversionOperator()); // $ targets=element_operator_value
+  container.emplace(constValue); // $ SPURIOUS: targets=element_operator_value
+  container.emplace(volatileValue); // $ SPURIOUS: targets=element_operator_value
+  container.emplace(value, 0); // no targets
+  container.emplace(value, 0, 0); // $ targets=element_operator_const_ref
+  container.emplace(value, 0, 0, 0); // $ targets=element_operator_rref
+  container.emplace(value, 0, 0, 0, 0); // no targets
+}
+
+void test_lvalue_conversion_operator() {
+  Container<ElementFromConversionOperator> container;
+  LvalueConversionOperator value;
+  const LvalueConversionOperator constValue;
+  volatile LvalueConversionOperator volatileValue;
+  container.emplace(value); // $ targets=element_operator_value
+  container.emplace(value, 0); // $ targets=element_operator_lref
+  container.emplace(value, 0, 0); // $ targets=element_operator_const_ref
+  container.emplace(value, 0, 0, 0); // no targets
+  container.emplace(value, 0, 0, 0, 0); // $ targets=element_operator_const_volatile_ref
+  container.emplace(value, ValueConversionOperator()); // $ targets=element_operator_lref
+  container.emplace(LvalueConversionOperator()); // $ SPURIOUS: targets=element_operator_value
+  container.emplace(constValue);  // $ SPURIOUS: targets=element_operator_value
+  container.emplace(volatileValue); // $ SPURIOUS: targets=element_operator_value
+}
+
+void test_rvalue_conversion_operator() {
+  Container<ElementFromConversionOperator> container;
+  RvalueConversionOperator value;
+  const RvalueConversionOperator constValue;
+  container.emplace(value);  // $ SPURIOUS: targets=element_operator_value
+  container.emplace(static_cast<const RvalueConversionOperator&&>(constValue)); // $ SPURIOUS: targets=element_operator_value
+  container.emplace(RvalueConversionOperator()); // $ targets=element_operator_value
+  container.emplace(RvalueConversionOperator(), 0); // no targets
+  container.emplace(RvalueConversionOperator(), 0, 0); // $ targets=element_operator_const_ref
+  container.emplace(RvalueConversionOperator(), 0, 0, 0); // $ targets=element_operator_rref
+  container.emplace(RvalueConversionOperator(), 0, 0, 0, 0); // no targets
+}
+
+void test_conversion_operator_qualification() {
+  Container<ElementFromConversionOperator> container;
+  const ConstConversionOperator constValue;
+  volatile ConstConversionOperator volatileValue;
+  container.emplace(constValue, 0, 0); // $ targets=element_operator_const_ref
+  container.emplace(ConstConversionOperator(), 0, 0); // $ targets=element_operator_const_ref
+  container.emplace(constValue, 0); // no targets
+  container.emplace(constValue, 0, 0, 0); // no targets
+  container.emplace(volatileValue); // $ SPURIOUS: targets=element_operator_value
+
+  const volatile VolatileConversionOperator constVolatileValue;
+  container.emplace(constVolatileValue, 0, 0, 0, 0); // $ targets=element_operator_const_volatile_ref
+  container.emplace(constVolatileValue, 0, 0); // no targets
+  container.emplace(constVolatileValue, 0); // no targets
+}
+
+void test_conversion_operator_limit() {
+  Container<ElementFromConversionOperator> container;
+  container.emplace(ExplicitConversionOperator()); // no targets
+  container.emplace(DeletedConversionOperator()); // no targets
+  container.emplace(ChainedConversionOperator()); // no targets
+
+  Container<ElementFromImplicitConversion> converted;
+  converted.emplace(ValueConversionOperator()); // no targets
+}
+
+void test_array_conversion_operator() {
+  Container<RefElement> container;
+  container.emplace(ArrayConversionOperator(), 42); // $ targets=element_ref_const_char_ptr_const_ref_int
+  container.emplace(ArrayConversionOperator(), 0, 0); // $ SPURIOUS: targets=element_ref_pointer_rref
+  container.emplace(ArrayConversionOperator(), 0, 0, 0); // no targets
+}
+
+void test_pointer_value_categories() {
+  Container<RefElement> container;
+  const char buffer[] = "abc";
+  const char* pointer = buffer;
+  const char* const constPointer = buffer;
+  container.emplace(buffer, 0, 0); // $ targets=element_ref_pointer_rref
+  container.emplace(pointer, 0, 0); // no target
+  container.emplace(static_cast<const char*&&>(pointer), 0, 0); // $ targets=element_ref_pointer_rref
+  container.emplace(static_cast<const char* const&&>(constPointer), 0, 0); // no target
+  container.emplace(buffer, 0, 0, 0); // no targets
+  container.emplace(pointer, 0, 0, 0); // $ targets=element_ref_pointer_lref
+  container.emplace(constPointer, 0, 0, 0); // no target
+  container.emplace(static_cast<const char*&&>(pointer), 0, 0, 0); // no target
+}
+
+enum ArithmeticEnum { arithmeticValue = 42 };
+enum class ScopedArithmeticEnum { value = 42 };
+
+struct ElementFromArithmetic {
+  ElementFromArithmetic(long); // element_arithmetic_long
+  ElementFromArithmetic(double, int); // element_arithmetic_double
+  ElementFromArithmetic(bool, int, int); // element_arithmetic_bool
+  ElementFromArithmetic(const long&, int, int, int); // element_arithmetic_const_ref
+  ElementFromArithmetic(long&&, int, int, int, int); // element_arithmetic_rref
+};
+
+void test_arithmetic_conversions() {
+  Container<ElementFromArithmetic> container;
+  short value = 42;
+  long longValue = 42;
+  container.emplace(value); // $ targets=element_arithmetic_long
+  container.emplace(1.5f, 0); // $ targets=element_arithmetic_double
+  container.emplace(arithmeticValue); // $ targets=element_arithmetic_long
+  container.emplace(42, 0, 0); // $ targets=element_arithmetic_bool
+  container.emplace(value, 0, 0, 0); // $ targets=element_arithmetic_const_ref
+  container.emplace(value, 0, 0, 0, 0); // $ targets=element_arithmetic_rref
+  container.emplace(longValue, 0, 0, 0, 0); // no target
+  container.emplace(ScopedArithmeticEnum::value); // no targets
+}
+
+void test_standard_and_user_defined_conversions() {
+  short value = 42;
+  Container<ElementFromImplicitConversion> before;
+  before.emplace(value); // $ targets=element_conversion_value
+  Container<ElementFromArithmetic> after;
+  after.emplace(ValueConversionOperator()); // $ targets=element_arithmetic_long
+  after.emplace(ValueConversionOperator(), 0, 0, 0); // $ targets=element_arithmetic_const_ref
+}
+
+struct ElementFromQualifiedPointer {
+  ElementFromQualifiedPointer(const char*); // element_qualified_pointer
+  ElementFromQualifiedPointer(const char* const&, int); // element_qualified_pointer_const_ref
+  ElementFromQualifiedPointer(const char*&&, int, int); // element_qualified_pointer_rref
+  ElementFromQualifiedPointer(const char*&, int, int, int); // element_qualified_pointer_lref
+  ElementFromQualifiedPointer(const char**, int, int, int, int); // element_qualified_double_pointer
+  ElementFromQualifiedPointer(const char* const*, int, int, int, int, int); // element_qualified_const_double_pointer
+};
+
+void test_pointer_qualification_conversions() {
+  Container<ElementFromQualifiedPointer> container;
+  char buffer[] = "abc";
+  char* pointer = buffer;
+  char** doublePointer = &pointer;
+  const char* constPointer = buffer;
+  container.emplace(buffer); // $ targets=element_qualified_pointer
+  container.emplace(pointer); // $ targets=element_qualified_pointer
+  container.emplace(pointer, 0); // $ targets=element_qualified_pointer_const_ref
+  container.emplace(buffer, 0, 0); // $ targets=element_qualified_pointer_rref
+  container.emplace(static_cast<char*&&>(pointer), 0, 0); // $ targets=element_qualified_pointer_rref
+  container.emplace(pointer, 0, 0, 0); // no target
+  container.emplace(doublePointer, 0, 0, 0, 0); // no target
+  container.emplace(doublePointer, 0, 0, 0, 0, 0); // $ MISSING: targets=element_qualified_const_double_pointer
+  Container<ElementFromMutablePointer> mutableContainer;
+  mutableContainer.emplace(constPointer, 42); // no target
+}
+
+struct ConversionBase {
+  operator int() const;
+};
+
+struct ConversionDerived : ConversionBase {};
+struct ConversionFurtherDerived : ConversionDerived {};
+
+struct ElementFromBase {
+  ElementFromBase(ConversionBase); // element_base_value
+  ElementFromBase(ConversionBase&, int); // element_base_lref
+  ElementFromBase(const ConversionBase&, int, int); // element_base_const_ref
+  ElementFromBase(ConversionBase&&, int, int, int); // element_base_rref
+  ElementFromBase(ConversionBase*, int, int, int, int); // element_base_pointer
+  ElementFromBase(const ConversionBase*, int, int, int, int, int); // element_const_base_pointer
+};
+
+struct ElementFromDerived {
+  ElementFromDerived(ConversionDerived&); // element_derived_lref
+  ElementFromDerived(ConversionDerived*, int); // element_derived_pointer
+};
+
+void test_inheritance_conversions() {
+  ConversionFurtherDerived derived;
+  const ConversionDerived constDerived{};
+  ConversionBase base;
+  Container<ElementFromBase> container;
+  container.emplace(derived); // $ targets=element_base_value
+  container.emplace(derived, 0); // $ targets=element_base_lref
+  container.emplace(constDerived, 0, 0); // $ targets=element_base_const_ref
+  container.emplace(ConversionDerived(), 0, 0, 0); // $ targets=element_base_rref
+  container.emplace(derived, 0, 0, 0); // no targets
+  container.emplace(constDerived, 0); // no targets
+  container.emplace(&derived, 0, 0, 0, 0); // $ targets=element_base_pointer
+  container.emplace(&constDerived, 0, 0, 0, 0); // no targets
+  container.emplace(&constDerived, 0, 0, 0, 0, 0); // $ targets=element_const_base_pointer
+  Container<ElementFromDerived> downcast;
+  downcast.emplace(base); // no targets
+  downcast.emplace(&base, 0); // no targets
+  Container<ElementFromConversionOperator> inherited;
+  inherited.emplace(derived); // $ targets=element_operator_value
+}
+
+struct ElementFromStandardPointer {
+  ElementFromStandardPointer(void*); // element_void_pointer
+  ElementFromStandardPointer(const void*, int); // element_const_void_pointer
+  ElementFromStandardPointer(int*, int, int); // element_int_pointer
+  ElementFromStandardPointer(bool, int, int, int, int); // element_pointer_bool
+};
+
+void test_standard_pointer_conversions() {
+  Container<ElementFromStandardPointer> container;
+  int value = 42;
+  const int constValue = 42;
+  container.emplace(&value); // $ targets=element_void_pointer
+  container.emplace(&constValue); // no targets
+  container.emplace(&constValue, 0); // $ targets=element_const_void_pointer
+  container.emplace(nullptr); // $ targets=element_void_pointer
+  container.emplace(nullptr, 0, 0); // $ targets=element_int_pointer
+  container.emplace(0, 0, 0); // no targets
+  container.emplace(&value, 0, 0, 0, 0); // $ targets=element_pointer_bool
+  container.emplace(nullptr, 0, 0, 0, 0); // no targets
+  void* opaque = &value;
+  container.emplace(opaque, 0, 0); // no targets
+}
+
+using Callback = int (*)(int);
+using NothrowCallback = int (*)(int) noexcept;
+int callback(int);
+int nothrowCallback(int) noexcept;
+double differentCallback(int);
+
+struct ElementFromCallback {
+  ElementFromCallback(Callback); // element_callback
+  ElementFromCallback(NothrowCallback, int); // element_nothrow_callback
+  ElementFromCallback(const Callback&, int, int); // element_callback_const_ref
+};
+
+void test_function_conversions() {
+  Container<ElementFromCallback> container;
+  Callback pointer = callback;
+  NothrowCallback nothrowPointer = nothrowCallback;
+  container.emplace(callback); // $ targets=element_callback
+  container.emplace(nothrowCallback); // $ targets=element_callback
+  container.emplace(nothrowPointer); // $ targets=element_callback
+  container.emplace(nothrowCallback, 0); // $ targets=element_nothrow_callback
+  container.emplace(pointer, 0); // $ SPURIOUS: targets=element_nothrow_callback
+  container.emplace(callback, 0); // $ SPURIOUS: targets=element_nothrow_callback
+  container.emplace(callback, 0, 0); // $ targets=element_callback_const_ref
+  container.emplace(nullptr); // $ targets=element_callback
+  container.emplace(differentCallback); // no targets
+  Container<ElementFromStandardPointer> boolean;
+  boolean.emplace(callback, 0, 0, 0, 0); // $ targets=element_pointer_bool
+  boolean.emplace(callback); // no targets
+}
+
+void test_standard_conversion_phases() {
+  Container<ElementFromArithmetic> arithmetic;
+  long value = 42;
+  arithmetic.emplace(value, 0, 0, 0, 0); // no targets
+  arithmetic.emplace(&value); // no targets
+  arithmetic.emplace(nullptr, 0, 0); // no targets
+  arithmetic.emplace(ValueConversionOperator(), 0, 0, 0, 0); // $ targets=element_arithmetic_rref
+
+  Container<ElementFromImplicitConversion> converted;
+  char buffer[] = "abc";
+  converted.emplace(buffer); // $ targets=element_conversion_value
+  converted.emplace(&value); // no targets
+  converted.emplace(ScopedArithmeticEnum::value); // no targets
+}
+
+void test_pointer_aliases() {
+  using Character = const char;
+  using Pointer = Character*;
+  using NestedPointer = Pointer*;
+  Pointer pointer = "abc";
+  NestedPointer nested = &pointer;
+  Pointer const constPointer = pointer;
+  Pointer volatile volatilePointer = pointer;
+  Container<ElementFromQualifiedPointer> container;
+  container.emplace(pointer); // $ targets=element_qualified_pointer
+  container.emplace(nested, 0, 0, 0, 0); // $ targets=element_qualified_double_pointer
+  container.emplace(&constPointer, 0, 0, 0, 0, 0); // $ targets=element_qualified_const_double_pointer
+  container.emplace(&constPointer, 0, 0, 0, 0); // no targets
+  container.emplace(&volatilePointer, 0, 0, 0, 0); // no targets
+  container.emplace(&volatilePointer, 0, 0, 0, 0, 0); // $ MISSING: targets=element_qualified_const_double_pointer
+
+  using CallbackAlias = Callback;
+  CallbackAlias callbackPointer = callback;
+  Container<ElementFromCallback> callbacks;
+  callbacks.emplace(callbackPointer); // $ targets=element_callback
+  callbacks.emplace(callbackPointer, 0, 0); // $ targets=element_callback_const_ref
+  Container<ElementFromStandardPointer> pointers;
+  pointers.emplace(callbackPointer); // no targets
+}
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/forwarding/test.expected b/cpp/ql/test/library-tests/dataflow/forwarding/test.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/cpp/ql/test/library-tests/dataflow/forwarding/test.ext.yml b/cpp/ql/test/library-tests/dataflow/forwarding/test.ext.yml
new file mode 100644
index 000000000000..44ba9a609803
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/forwarding/test.ext.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: forwardsModel
+    data: # namespace, type, subtypes, name, signature, ext, start, constructor, output, provenance
+      - ["", "Container<T>", True, "emplace<Args>", "(Args &&)", "", "0", "T", "Argument[-1].Element", "manual"]
diff --git a/cpp/ql/test/library-tests/dataflow/forwarding/test.ql b/cpp/ql/test/library-tests/dataflow/forwarding/test.ql
new file mode 100644
index 000000000000..e625769b0224
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/forwarding/test.ql
@@ -0,0 +1,31 @@
+import cpp
+import utils.test.InlineExpectationsTest
+import semmle.code.cpp.dataflow.ExternalFlow
+import semmle.code.cpp.ir.IR
+
+bindingset[s]
+string quote(string s) { if s.matches("% %") then result = "\"" + s + "\"" else result = s }
+
+string getConstructorId(Constructor constructor) {
+  exists(CppStyleComment comment, string filepath, int startline, int endline |
+    comment.getLocation().hasLocationInfo(filepath, startline, _, endline, _) and
+    constructor.getLocation().hasLocationInfo(filepath, startline, _, endline, _) and
+    result = comment.getContents().suffix(2).trim()
+  )
+}
+
+module AsDefinitionTest implements TestSig {
+  string getARelevantTag() { result = "targets" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(CallInstruction call, Constructor constructor |
+      constructor = ConstructorForwarding::getForwardingConstructor(call.getStaticCallTarget(), _) and
+      element = call.toString() and
+      tag = "targets" and
+      value = quote(getConstructorId(constructor)) and
+      location = call.getLocation()
+    )
+  }
+}
+
+import MakeTest<AsDefinitionTest>
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/testModels.expected b/cpp/ql/test/library-tests/dataflow/models-as-data/testModels.expected
index 7d1e2bc9327a..ee106e24edb1 100644
--- a/cpp/ql/test/library-tests/dataflow/models-as-data/testModels.expected
+++ b/cpp/ql/test/library-tests/dataflow/models-as-data/testModels.expected
@@ -283,6 +283,42 @@ sourceCallables
 | tests.cpp:433:6:433:10 | array |
 | tests.cpp:434:6:434:6 | y |
 flowSummaryNode
+| tests.cpp:36:7:36:20 | call to localMadSource |  |  | test_sources |
+| tests.cpp:37:7:37:21 | call to remoteMadSource |  |  | test_sources |
+| tests.cpp:39:7:39:24 | call to localMadSourceVoid |  |  | test_sources |
+| tests.cpp:40:7:40:27 | call to localMadSourceHasBody |  |  | test_sources |
+| tests.cpp:45:10:45:23 | call to localMadSource |  |  | test_sources |
+| tests.cpp:53:7:53:29 | call to remoteMadSourceIndirect |  |  | test_sources |
+| tests.cpp:54:8:54:30 | call to remoteMadSourceIndirect |  |  | test_sources |
+| tests.cpp:55:8:55:36 | call to remoteMadSourceDoubleIndirect |  |  | test_sources |
+| tests.cpp:56:9:56:37 | call to remoteMadSourceDoubleIndirect |  |  | test_sources |
+| tests.cpp:60:30:60:31 | remoteMadSourceIndirectArg0 output argument |  |  | test_sources |
+| tests.cpp:63:33:63:33 | remoteMadSourceIndirectArg1 output argument |  |  | test_sources |
+| tests.cpp:67:10:67:23 | call to localMadSource |  |  | test_sources |
+| tests.cpp:70:7:70:57 | call to namespace2LocalMadSource |  |  | test_sources |
+| tests.cpp:75:32:75:32 | x |  |  | remoteMadSourceParam0 |
+| tests.cpp:95:14:95:19 | call to source |  |  | test_sinks |
+| tests.cpp:97:24:97:24 | 0 |  |  | test_sinks |
+| tests.cpp:98:17:98:22 | call to source |  |  | test_sinks |
+| tests.cpp:99:15:99:20 | call to source |  |  | test_sinks |
+| tests.cpp:99:25:99:25 | 0 |  |  | test_sinks |
+| tests.cpp:100:15:100:15 | 0 |  |  | test_sinks |
+| tests.cpp:100:18:100:23 | call to source |  |  | test_sinks |
+| tests.cpp:101:15:101:15 | 0 |  |  | test_sinks |
+| tests.cpp:101:18:101:18 | 0 |  |  | test_sinks |
+| tests.cpp:102:15:102:20 | call to source |  |  | test_sinks |
+| tests.cpp:102:28:102:28 | 0 |  |  | test_sinks |
+| tests.cpp:103:15:103:15 | 0 |  |  | test_sinks |
+| tests.cpp:103:28:103:28 | 0 |  |  | test_sinks |
+| tests.cpp:104:15:104:15 | 0 |  |  | test_sinks |
+| tests.cpp:104:21:104:26 | call to source |  |  | test_sinks |
+| tests.cpp:108:22:108:23 | & ... |  |  | test_sinks |
+| tests.cpp:109:22:109:26 | a_ptr |  |  | test_sinks |
+| tests.cpp:110:28:110:33 | & ... |  |  | test_sinks |
+| tests.cpp:111:14:111:27 | call to localMadSource |  |  | test_sinks |
+| tests.cpp:111:14:111:27 | call to localMadSource |  |  | test_sinks |
+| tests.cpp:112:22:112:44 | call to remoteMadSourceIndirect |  |  | test_sinks |
+| tests.cpp:112:22:112:44 | call to remoteMadSourceIndirect |  |  | test_sinks |
 | tests.cpp:127:5:127:19 | [summary param] 0 in madArg0ToReturn | ParameterNode | madArg0ToReturn | madArg0ToReturn |
 | tests.cpp:127:5:127:19 | [summary] to write: ReturnValue in madArg0ToReturn | ReturnNode | madArg0ToReturn | madArg0ToReturn |
 | tests.cpp:128:6:128:28 | [summary param] 0 in madArg0ToReturnIndirect | ParameterNode | madArg0ToReturnIndirect | madArg0ToReturnIndirect |
@@ -325,6 +361,12 @@ flowSummaryNode
 | tests.cpp:148:13:148:40 | [summary param] 0 in madArg0ToReturnFieldIndirect | ParameterNode | madArg0ToReturnFieldIndirect | madArg0ToReturnFieldIndirect |
 | tests.cpp:148:13:148:40 | [summary] to write: ReturnValue in madArg0ToReturnFieldIndirect | ReturnNode | madArg0ToReturnFieldIndirect | madArg0ToReturnFieldIndirect |
 | tests.cpp:148:13:148:40 | [summary] to write: ReturnValue.Field[*MyContainer::ptr]/Field[*ptr] in madArg0ToReturnFieldIndirect |  | madArg0ToReturnFieldIndirect | madArg0ToReturnFieldIndirect |
+| tests.cpp:225:14:225:28 | call to madArg0ToReturn |  |  | test_summaries |
+| tests.cpp:225:30:225:44 | call to remoteMadSource |  |  | test_summaries |
+| tests.cpp:226:14:226:37 | call to madArg0ToReturnValueFlow |  |  | test_summaries |
+| tests.cpp:226:39:226:53 | call to remoteMadSource |  |  | test_summaries |
+| tests.cpp:227:14:227:36 | call to madArg0IndirectToReturn |  |  | test_summaries |
+| tests.cpp:228:14:228:36 | call to madArg0IndirectToReturn |  |  | test_summaries |
 | tests.cpp:250:7:250:19 | [summary param] 0 in madArg0ToSelf | ParameterNode | madArg0ToSelf | madArg0ToSelf |
 | tests.cpp:250:7:250:19 | [summary param] this in madArg0ToSelf | ParameterNode | madArg0ToSelf | madArg0ToSelf |
 | tests.cpp:250:7:250:19 | [summary] to write: Argument[this] in madArg0ToSelf | PostUpdateNode | madArg0ToSelf | madArg0ToSelf |
@@ -339,6 +381,27 @@ flowSummaryNode
 | tests.cpp:254:6:254:21 | [summary] to write: ReturnValue in madFieldToReturn | ReturnNode | madFieldToReturn | madFieldToReturn |
 | tests.cpp:277:7:277:30 | [summary param] this in namespaceMadSelfToReturn | ParameterNode | namespaceMadSelfToReturn | namespaceMadSelfToReturn |
 | tests.cpp:277:7:277:30 | [summary] to write: ReturnValue in namespaceMadSelfToReturn | ReturnNode | namespaceMadSelfToReturn | namespaceMadSelfToReturn |
+| tests.cpp:292:10:292:30 | call to memberRemoteMadSource |  |  | test_class_members |
+| tests.cpp:295:39:295:40 | memberRemoteMadSourceIndirectArg0 output argument |  |  | test_class_members |
+| tests.cpp:300:11:300:31 | call to memberRemoteMadSource |  |  | test_class_members |
+| tests.cpp:301:11:301:33 | call to subtypeRemoteMadSource1 |  |  | test_class_members |
+| tests.cpp:303:11:303:33 | call to subtypeRemoteMadSource2 |  |  | test_class_members |
+| tests.cpp:307:23:307:28 | call to source |  |  | test_class_members |
+| tests.cpp:309:33:309:38 | call to source |  |  | test_class_members |
+| tests.cpp:310:57:310:62 | call to source |  |  | test_class_members |
+| tests.cpp:351:26:351:46 | call to memberRemoteMadSource |  |  | test_class_members |
+| tests.cpp:351:26:351:46 | call to memberRemoteMadSource |  |  | test_class_members |
+| tests.cpp:362:2:362:4 | mc8 |  |  | test_class_members |
+| tests.cpp:362:24:362:24 | 0 |  |  | test_class_members |
+| tests.cpp:363:2:363:4 | mc8 |  |  | test_class_members |
+| tests.cpp:363:24:363:29 | call to source |  |  | test_class_members |
+| tests.cpp:366:2:366:4 | mc9 |  |  | test_class_members |
+| tests.cpp:367:2:367:4 | mc9 |  |  | test_class_members |
+| tests.cpp:367:24:367:24 | 0 |  |  | test_class_members |
+| tests.cpp:369:2:369:4 | qualifierSource output argument |  |  | test_class_members |
+| tests.cpp:371:2:371:4 | mc8 |  |  | test_class_members |
+| tests.cpp:372:2:372:4 | mc9 |  |  | test_class_members |
+| tests.cpp:372:24:372:24 | 0 |  |  | test_class_members |
 | tests.cpp:392:5:392:29 | [summary param] 0 in madCallArg0ReturnToReturn | ParameterNode | madCallArg0ReturnToReturn | madCallArg0ReturnToReturn |
 | tests.cpp:392:5:392:29 | [summary] read: Argument[0].Parameter[this pointer] in madCallArg0ReturnToReturn | PostUpdateNode | madCallArg0ReturnToReturn | madCallArg0ReturnToReturn |
 | tests.cpp:392:5:392:29 | [summary] read: Argument[0].ReturnValue in madCallArg0ReturnToReturn | OutNode | madCallArg0ReturnToReturn | madCallArg0ReturnToReturn |
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
index d4d961a3a048..2a68efe3eb97 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
@@ -1809,109 +1809,77 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | format.cpp:169:30:169:30 | s | format.cpp:171:60:171:60 | s |  |
 | format.cpp:170:11:170:16 | call to source | format.cpp:171:63:171:63 | x |  |
 | format.cpp:171:11:171:58 | call to same_signature_as_format_but_different_name | format.cpp:172:8:172:8 | y |  |
-| map.cpp:21:28:21:28 | call to pair | map.cpp:23:2:23:2 | a |  |
-| map.cpp:21:28:21:28 | call to pair | map.cpp:24:7:24:7 | a |  |
-| map.cpp:21:28:21:28 | call to pair | map.cpp:25:7:25:7 | a |  |
-| map.cpp:21:28:21:28 | call to pair | map.cpp:26:7:26:7 | a |  |
-| map.cpp:21:31:21:31 | call to pair | map.cpp:28:2:28:2 | b |  |
-| map.cpp:21:31:21:31 | call to pair | map.cpp:29:7:29:7 | b |  |
-| map.cpp:21:31:21:31 | call to pair | map.cpp:30:7:30:7 | b |  |
-| map.cpp:21:31:21:31 | call to pair | map.cpp:31:7:31:7 | b |  |
-| map.cpp:21:34:21:34 | call to pair | map.cpp:33:2:33:2 | c |  |
-| map.cpp:21:34:21:34 | call to pair | map.cpp:34:7:34:7 | c |  |
-| map.cpp:21:34:21:34 | call to pair | map.cpp:35:7:35:7 | c |  |
-| map.cpp:21:34:21:34 | call to pair | map.cpp:36:7:36:7 | c |  |
+| map.cpp:21:40:21:40 | call to pair | map.cpp:23:2:23:2 | a |  |
+| map.cpp:21:40:21:40 | call to pair | map.cpp:24:7:24:7 | a |  |
+| map.cpp:21:40:21:40 | call to pair | map.cpp:25:7:25:7 | a |  |
+| map.cpp:21:40:21:40 | call to pair | map.cpp:26:7:26:7 | a |  |
+| map.cpp:21:43:21:43 | call to pair | map.cpp:28:2:28:2 | b |  |
+| map.cpp:21:43:21:43 | call to pair | map.cpp:29:7:29:7 | b |  |
+| map.cpp:21:43:21:43 | call to pair | map.cpp:30:7:30:7 | b |  |
+| map.cpp:21:43:21:43 | call to pair | map.cpp:31:7:31:7 | b |  |
+| map.cpp:21:46:21:46 | call to pair | map.cpp:33:2:33:2 | c |  |
+| map.cpp:21:46:21:46 | call to pair | map.cpp:34:7:34:7 | c |  |
+| map.cpp:21:46:21:46 | call to pair | map.cpp:35:7:35:7 | c |  |
+| map.cpp:21:46:21:46 | call to pair | map.cpp:36:7:36:7 | c |  |
 | map.cpp:23:2:23:2 | a [post update] | map.cpp:24:7:24:7 | a |  |
 | map.cpp:23:2:23:2 | a [post update] | map.cpp:25:7:25:7 | a |  |
 | map.cpp:23:2:23:2 | a [post update] | map.cpp:26:7:26:7 | a |  |
 | map.cpp:23:2:23:16 | ... = ... | map.cpp:23:4:23:8 | first [post update] |  |
 | map.cpp:23:2:23:16 | ... = ... | map.cpp:24:9:24:13 | first |  |
 | map.cpp:23:12:23:16 | 123 | map.cpp:23:2:23:16 | ... = ... |  |
-| map.cpp:24:7:24:7 | a [post update] | map.cpp:25:7:25:7 | a |  |
-| map.cpp:24:7:24:7 | a [post update] | map.cpp:26:7:26:7 | a |  |
-| map.cpp:25:7:25:7 | a [post update] | map.cpp:26:7:26:7 | a |  |
 | map.cpp:28:2:28:2 | b [post update] | map.cpp:29:7:29:7 | b |  |
 | map.cpp:28:2:28:2 | b [post update] | map.cpp:30:7:30:7 | b |  |
 | map.cpp:28:2:28:2 | b [post update] | map.cpp:31:7:31:7 | b |  |
 | map.cpp:28:2:28:19 | ... = ... | map.cpp:28:4:28:8 | first [post update] |  |
 | map.cpp:28:2:28:19 | ... = ... | map.cpp:29:9:29:13 | first |  |
 | map.cpp:28:12:28:17 | call to source | map.cpp:28:2:28:19 | ... = ... |  |
-| map.cpp:29:7:29:7 | b [post update] | map.cpp:30:7:30:7 | b |  |
-| map.cpp:29:7:29:7 | b [post update] | map.cpp:31:7:31:7 | b |  |
-| map.cpp:30:7:30:7 | b [post update] | map.cpp:31:7:31:7 | b |  |
 | map.cpp:33:2:33:2 | c [post update] | map.cpp:34:7:34:7 | c |  |
 | map.cpp:33:2:33:2 | c [post update] | map.cpp:35:7:35:7 | c |  |
 | map.cpp:33:2:33:2 | c [post update] | map.cpp:36:7:36:7 | c |  |
 | map.cpp:33:2:33:20 | ... = ... | map.cpp:33:4:33:9 | second [post update] |  |
 | map.cpp:33:2:33:20 | ... = ... | map.cpp:35:9:35:14 | second |  |
 | map.cpp:33:13:33:18 | call to source | map.cpp:33:2:33:20 | ... = ... |  |
-| map.cpp:34:7:34:7 | c [post update] | map.cpp:35:7:35:7 | c |  |
-| map.cpp:34:7:34:7 | c [post update] | map.cpp:36:7:36:7 | c |  |
-| map.cpp:35:7:35:7 | c [post update] | map.cpp:36:7:36:7 | c |  |
-| map.cpp:38:30:38:42 | call to pair | map.cpp:39:7:39:7 | d |  |
-| map.cpp:38:30:38:42 | call to pair | map.cpp:40:7:40:7 | d |  |
-| map.cpp:38:30:38:42 | call to pair | map.cpp:41:7:41:7 | d |  |
-| map.cpp:38:37:38:41 | 456 | map.cpp:38:30:38:42 | call to pair | TAINT |
-| map.cpp:39:7:39:7 | d [post update] | map.cpp:40:7:40:7 | d |  |
-| map.cpp:39:7:39:7 | d [post update] | map.cpp:41:7:41:7 | d |  |
-| map.cpp:40:7:40:7 | d [post update] | map.cpp:41:7:41:7 | d |  |
-| map.cpp:43:30:43:45 | call to pair | map.cpp:44:7:44:7 | e |  |
-| map.cpp:43:30:43:45 | call to pair | map.cpp:45:7:45:7 | e |  |
-| map.cpp:43:30:43:45 | call to pair | map.cpp:46:7:46:7 | e |  |
-| map.cpp:43:40:43:44 | 456 | map.cpp:43:30:43:45 | call to pair | TAINT |
-| map.cpp:44:7:44:7 | e [post update] | map.cpp:45:7:45:7 | e |  |
-| map.cpp:44:7:44:7 | e [post update] | map.cpp:46:7:46:7 | e |  |
-| map.cpp:45:7:45:7 | e [post update] | map.cpp:46:7:46:7 | e |  |
-| map.cpp:48:30:48:45 | call to pair | map.cpp:49:7:49:7 | f |  |
-| map.cpp:48:30:48:45 | call to pair | map.cpp:50:7:50:7 | f |  |
-| map.cpp:48:30:48:45 | call to pair | map.cpp:51:7:51:7 | f |  |
-| map.cpp:48:30:48:45 | call to pair | map.cpp:53:30:53:30 | f |  |
-| map.cpp:48:30:48:45 | call to pair | map.cpp:59:6:59:6 | f |  |
-| map.cpp:48:37:48:42 | call to source | map.cpp:48:30:48:45 | call to pair | TAINT |
-| map.cpp:49:7:49:7 | f [post update] | map.cpp:50:7:50:7 | f |  |
-| map.cpp:49:7:49:7 | f [post update] | map.cpp:51:7:51:7 | f |  |
-| map.cpp:49:7:49:7 | f [post update] | map.cpp:53:30:53:30 | f |  |
-| map.cpp:49:7:49:7 | f [post update] | map.cpp:59:6:59:6 | f |  |
-| map.cpp:49:9:49:13 | ref arg first | map.cpp:54:9:54:13 | first |  |
-| map.cpp:49:9:49:13 | ref arg first | map.cpp:60:9:60:13 | first |  |
-| map.cpp:50:7:50:7 | f [post update] | map.cpp:51:7:51:7 | f |  |
-| map.cpp:50:7:50:7 | f [post update] | map.cpp:53:30:53:30 | f |  |
-| map.cpp:50:7:50:7 | f [post update] | map.cpp:59:6:59:6 | f |  |
-| map.cpp:50:9:50:14 | ref arg second | map.cpp:55:9:55:14 | second |  |
-| map.cpp:50:9:50:14 | ref arg second | map.cpp:61:9:61:14 | second |  |
-| map.cpp:53:30:53:30 | f | map.cpp:54:7:54:7 | g |  |
-| map.cpp:53:30:53:30 | f | map.cpp:55:7:55:7 | g |  |
-| map.cpp:53:30:53:30 | f | map.cpp:56:7:56:7 | g |  |
-| map.cpp:54:7:54:7 | g [post update] | map.cpp:55:7:55:7 | g |  |
-| map.cpp:54:7:54:7 | g [post update] | map.cpp:56:7:56:7 | g |  |
-| map.cpp:55:7:55:7 | g [post update] | map.cpp:56:7:56:7 | g |  |
+| map.cpp:38:42:38:54 | call to pair | map.cpp:39:7:39:7 | d |  |
+| map.cpp:38:42:38:54 | call to pair | map.cpp:40:7:40:7 | d |  |
+| map.cpp:38:42:38:54 | call to pair | map.cpp:41:7:41:7 | d |  |
+| map.cpp:38:49:38:53 | 456 | map.cpp:38:42:38:54 | call to pair | TAINT |
+| map.cpp:43:42:43:57 | call to pair | map.cpp:44:7:44:7 | e |  |
+| map.cpp:43:42:43:57 | call to pair | map.cpp:45:7:45:7 | e |  |
+| map.cpp:43:42:43:57 | call to pair | map.cpp:46:7:46:7 | e |  |
+| map.cpp:43:52:43:56 | 456 | map.cpp:43:42:43:57 | call to pair | TAINT |
+| map.cpp:48:42:48:57 | call to pair | map.cpp:49:7:49:7 | f |  |
+| map.cpp:48:42:48:57 | call to pair | map.cpp:50:7:50:7 | f |  |
+| map.cpp:48:42:48:57 | call to pair | map.cpp:51:7:51:7 | f |  |
+| map.cpp:48:42:48:57 | call to pair | map.cpp:53:42:53:42 | f |  |
+| map.cpp:48:42:48:57 | call to pair | map.cpp:59:6:59:6 | f |  |
+| map.cpp:48:49:48:54 | call to source | map.cpp:48:42:48:57 | call to pair | TAINT |
+| map.cpp:53:42:53:42 | f | map.cpp:54:7:54:7 | g |  |
+| map.cpp:53:42:53:42 | f | map.cpp:55:7:55:7 | g |  |
+| map.cpp:53:42:53:42 | f | map.cpp:56:7:56:7 | g |  |
 | map.cpp:59:6:59:6 | f | map.cpp:59:2:59:6 | ... = ... |  |
 | map.cpp:59:6:59:6 | f | map.cpp:60:7:60:7 | h |  |
 | map.cpp:59:6:59:6 | f | map.cpp:61:7:61:7 | h |  |
 | map.cpp:59:6:59:6 | f | map.cpp:62:7:62:7 | h |  |
-| map.cpp:60:7:60:7 | h [post update] | map.cpp:61:7:61:7 | h |  |
-| map.cpp:60:7:60:7 | h [post update] | map.cpp:62:7:62:7 | h |  |
-| map.cpp:61:7:61:7 | h [post update] | map.cpp:62:7:62:7 | h |  |
-| map.cpp:64:30:64:42 | call to pair | map.cpp:68:3:68:3 | i |  |
-| map.cpp:64:30:64:42 | call to pair | map.cpp:70:7:70:7 | i |  |
-| map.cpp:64:30:64:42 | call to pair | map.cpp:71:7:71:7 | i |  |
-| map.cpp:64:30:64:42 | call to pair | map.cpp:72:7:72:7 | i |  |
-| map.cpp:64:37:64:41 | 456 | map.cpp:64:30:64:42 | call to pair | TAINT |
-| map.cpp:65:30:65:45 | call to pair | map.cpp:68:10:68:10 | j |  |
-| map.cpp:65:30:65:45 | call to pair | map.cpp:73:7:73:7 | j |  |
-| map.cpp:65:30:65:45 | call to pair | map.cpp:74:7:74:7 | j |  |
-| map.cpp:65:30:65:45 | call to pair | map.cpp:75:7:75:7 | j |  |
-| map.cpp:65:37:65:42 | call to source | map.cpp:65:30:65:45 | call to pair | TAINT |
-| map.cpp:66:30:66:45 | call to pair | map.cpp:69:2:69:2 | k |  |
-| map.cpp:66:30:66:45 | call to pair | map.cpp:76:7:76:7 | k |  |
-| map.cpp:66:30:66:45 | call to pair | map.cpp:77:7:77:7 | k |  |
-| map.cpp:66:30:66:45 | call to pair | map.cpp:78:7:78:7 | k |  |
-| map.cpp:66:37:66:42 | call to source | map.cpp:66:30:66:45 | call to pair | TAINT |
-| map.cpp:67:30:67:42 | call to pair | map.cpp:69:9:69:9 | l |  |
-| map.cpp:67:30:67:42 | call to pair | map.cpp:79:7:79:7 | l |  |
-| map.cpp:67:30:67:42 | call to pair | map.cpp:80:7:80:7 | l |  |
-| map.cpp:67:30:67:42 | call to pair | map.cpp:81:7:81:7 | l |  |
-| map.cpp:67:37:67:41 | 456 | map.cpp:67:30:67:42 | call to pair | TAINT |
+| map.cpp:64:42:64:54 | call to pair | map.cpp:68:3:68:3 | i |  |
+| map.cpp:64:42:64:54 | call to pair | map.cpp:70:7:70:7 | i |  |
+| map.cpp:64:42:64:54 | call to pair | map.cpp:71:7:71:7 | i |  |
+| map.cpp:64:42:64:54 | call to pair | map.cpp:72:7:72:7 | i |  |
+| map.cpp:64:49:64:53 | 456 | map.cpp:64:42:64:54 | call to pair | TAINT |
+| map.cpp:65:42:65:57 | call to pair | map.cpp:68:10:68:10 | j |  |
+| map.cpp:65:42:65:57 | call to pair | map.cpp:73:7:73:7 | j |  |
+| map.cpp:65:42:65:57 | call to pair | map.cpp:74:7:74:7 | j |  |
+| map.cpp:65:42:65:57 | call to pair | map.cpp:75:7:75:7 | j |  |
+| map.cpp:65:49:65:54 | call to source | map.cpp:65:42:65:57 | call to pair | TAINT |
+| map.cpp:66:42:66:57 | call to pair | map.cpp:69:2:69:2 | k |  |
+| map.cpp:66:42:66:57 | call to pair | map.cpp:76:7:76:7 | k |  |
+| map.cpp:66:42:66:57 | call to pair | map.cpp:77:7:77:7 | k |  |
+| map.cpp:66:42:66:57 | call to pair | map.cpp:78:7:78:7 | k |  |
+| map.cpp:66:49:66:54 | call to source | map.cpp:66:42:66:57 | call to pair | TAINT |
+| map.cpp:67:42:67:54 | call to pair | map.cpp:69:9:69:9 | l |  |
+| map.cpp:67:42:67:54 | call to pair | map.cpp:79:7:79:7 | l |  |
+| map.cpp:67:42:67:54 | call to pair | map.cpp:80:7:80:7 | l |  |
+| map.cpp:67:42:67:54 | call to pair | map.cpp:81:7:81:7 | l |  |
+| map.cpp:67:49:67:53 | 456 | map.cpp:67:42:67:54 | call to pair | TAINT |
 | map.cpp:68:3:68:3 | ref arg i | map.cpp:70:7:70:7 | i |  |
 | map.cpp:68:3:68:3 | ref arg i | map.cpp:71:7:71:7 | i |  |
 | map.cpp:68:3:68:3 | ref arg i | map.cpp:72:7:72:7 | i |  |
@@ -1924,21 +1892,6 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:69:9:69:9 | ref arg l | map.cpp:79:7:79:7 | l |  |
 | map.cpp:69:9:69:9 | ref arg l | map.cpp:80:7:80:7 | l |  |
 | map.cpp:69:9:69:9 | ref arg l | map.cpp:81:7:81:7 | l |  |
-| map.cpp:70:7:70:7 | i [post update] | map.cpp:71:7:71:7 | i |  |
-| map.cpp:70:7:70:7 | i [post update] | map.cpp:72:7:72:7 | i |  |
-| map.cpp:71:7:71:7 | i [post update] | map.cpp:72:7:72:7 | i |  |
-| map.cpp:73:7:73:7 | j [post update] | map.cpp:74:7:74:7 | j |  |
-| map.cpp:73:7:73:7 | j [post update] | map.cpp:75:7:75:7 | j |  |
-| map.cpp:74:7:74:7 | j [post update] | map.cpp:75:7:75:7 | j |  |
-| map.cpp:76:7:76:7 | k [post update] | map.cpp:77:7:77:7 | k |  |
-| map.cpp:76:7:76:7 | k [post update] | map.cpp:78:7:78:7 | k |  |
-| map.cpp:77:7:77:7 | k [post update] | map.cpp:78:7:78:7 | k |  |
-| map.cpp:79:7:79:7 | l [post update] | map.cpp:80:7:80:7 | l |  |
-| map.cpp:79:7:79:7 | l [post update] | map.cpp:81:7:81:7 | l |  |
-| map.cpp:80:7:80:7 | l [post update] | map.cpp:81:7:81:7 | l |  |
-| map.cpp:83:7:83:15 | call to make_pair | map.cpp:83:7:83:29 | call to pair | TAINT |
-| map.cpp:86:7:86:15 | call to make_pair | map.cpp:86:7:86:32 | call to pair | TAINT |
-| map.cpp:89:7:89:15 | call to make_pair | map.cpp:89:7:89:32 | call to pair | TAINT |
 | map.cpp:94:6:94:14 | call to make_pair | map.cpp:94:6:94:49 | call to pair | TAINT |
 | map.cpp:94:6:94:49 | call to pair | map.cpp:94:2:94:49 | ... = ... |  |
 | map.cpp:94:6:94:49 | call to pair | map.cpp:95:7:95:7 | m |  |
@@ -1946,73 +1899,67 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:94:6:94:49 | call to pair | map.cpp:97:7:97:7 | m |  |
 | map.cpp:94:6:94:49 | call to pair | map.cpp:98:7:98:7 | m |  |
 | map.cpp:94:6:94:49 | call to pair | map.cpp:99:7:99:7 | m |  |
-| map.cpp:95:7:95:7 | m | map.cpp:95:7:95:7 | call to pair | TAINT |
-| map.cpp:97:7:97:7 | m [post update] | map.cpp:98:7:98:7 | m |  |
-| map.cpp:97:7:97:7 | m [post update] | map.cpp:99:7:99:7 | m |  |
-| map.cpp:98:7:98:7 | m [post update] | map.cpp:99:7:99:7 | m |  |
-| map.cpp:105:27:105:28 | call to map | map.cpp:107:7:107:8 | m1 |  |
-| map.cpp:105:27:105:28 | call to map | map.cpp:113:7:113:8 | m1 |  |
-| map.cpp:105:27:105:28 | call to map | map.cpp:119:7:119:8 | m1 |  |
-| map.cpp:105:27:105:28 | call to map | map.cpp:125:7:125:8 | m1 |  |
-| map.cpp:105:27:105:28 | call to map | map.cpp:146:12:146:13 | m1 |  |
-| map.cpp:105:27:105:28 | call to map | map.cpp:146:30:146:31 | m1 |  |
-| map.cpp:105:27:105:28 | call to map | map.cpp:252:1:252:1 | m1 |  |
-| map.cpp:105:31:105:32 | call to map | map.cpp:108:7:108:8 | m2 |  |
-| map.cpp:105:31:105:32 | call to map | map.cpp:114:7:114:8 | m2 |  |
-| map.cpp:105:31:105:32 | call to map | map.cpp:120:7:120:8 | m2 |  |
-| map.cpp:105:31:105:32 | call to map | map.cpp:126:7:126:8 | m2 |  |
-| map.cpp:105:31:105:32 | call to map | map.cpp:133:30:133:31 | m2 |  |
-| map.cpp:105:31:105:32 | call to map | map.cpp:134:32:134:33 | m2 |  |
-| map.cpp:105:31:105:32 | call to map | map.cpp:136:7:136:8 | m2 |  |
-| map.cpp:105:31:105:32 | call to map | map.cpp:152:12:152:13 | m2 |  |
-| map.cpp:105:31:105:32 | call to map | map.cpp:152:30:152:31 | m2 |  |
-| map.cpp:105:31:105:32 | call to map | map.cpp:252:1:252:1 | m2 |  |
-| map.cpp:105:35:105:36 | call to map | map.cpp:109:7:109:8 | m3 |  |
-| map.cpp:105:35:105:36 | call to map | map.cpp:115:7:115:8 | m3 |  |
-| map.cpp:105:35:105:36 | call to map | map.cpp:121:7:121:8 | m3 |  |
-| map.cpp:105:35:105:36 | call to map | map.cpp:127:7:127:8 | m3 |  |
-| map.cpp:105:35:105:36 | call to map | map.cpp:158:12:158:13 | m3 |  |
-| map.cpp:105:35:105:36 | call to map | map.cpp:158:30:158:31 | m3 |  |
-| map.cpp:105:35:105:36 | call to map | map.cpp:252:1:252:1 | m3 |  |
-| map.cpp:105:39:105:40 | call to map | map.cpp:110:7:110:8 | m4 |  |
-| map.cpp:105:39:105:40 | call to map | map.cpp:110:17:110:18 | m4 |  |
-| map.cpp:105:39:105:40 | call to map | map.cpp:116:7:116:8 | m4 |  |
-| map.cpp:105:39:105:40 | call to map | map.cpp:122:7:122:8 | m4 |  |
-| map.cpp:105:39:105:40 | call to map | map.cpp:128:7:128:8 | m4 |  |
-| map.cpp:105:39:105:40 | call to map | map.cpp:252:1:252:1 | m4 |  |
-| map.cpp:105:43:105:44 | call to map | map.cpp:111:7:111:8 | m5 |  |
-| map.cpp:105:43:105:44 | call to map | map.cpp:117:7:117:8 | m5 |  |
-| map.cpp:105:43:105:44 | call to map | map.cpp:123:7:123:8 | m5 |  |
-| map.cpp:105:43:105:44 | call to map | map.cpp:129:7:129:8 | m5 |  |
-| map.cpp:105:43:105:44 | call to map | map.cpp:252:1:252:1 | m5 |  |
-| map.cpp:105:47:105:48 | call to map | map.cpp:112:7:112:8 | m6 |  |
-| map.cpp:105:47:105:48 | call to map | map.cpp:112:27:112:28 | m6 |  |
-| map.cpp:105:47:105:48 | call to map | map.cpp:118:7:118:8 | m6 |  |
-| map.cpp:105:47:105:48 | call to map | map.cpp:124:7:124:8 | m6 |  |
-| map.cpp:105:47:105:48 | call to map | map.cpp:130:7:130:8 | m6 |  |
-| map.cpp:105:47:105:48 | call to map | map.cpp:252:1:252:1 | m6 |  |
+| map.cpp:105:39:105:40 | call to map | map.cpp:107:7:107:8 | m1 |  |
+| map.cpp:105:39:105:40 | call to map | map.cpp:113:7:113:8 | m1 |  |
+| map.cpp:105:39:105:40 | call to map | map.cpp:119:7:119:8 | m1 |  |
+| map.cpp:105:39:105:40 | call to map | map.cpp:125:7:125:8 | m1 |  |
+| map.cpp:105:39:105:40 | call to map | map.cpp:146:12:146:13 | m1 |  |
+| map.cpp:105:39:105:40 | call to map | map.cpp:146:30:146:31 | m1 |  |
+| map.cpp:105:39:105:40 | call to map | map.cpp:252:1:252:1 | m1 |  |
+| map.cpp:105:43:105:44 | call to map | map.cpp:108:7:108:8 | m2 |  |
+| map.cpp:105:43:105:44 | call to map | map.cpp:114:7:114:8 | m2 |  |
+| map.cpp:105:43:105:44 | call to map | map.cpp:120:7:120:8 | m2 |  |
+| map.cpp:105:43:105:44 | call to map | map.cpp:126:7:126:8 | m2 |  |
+| map.cpp:105:43:105:44 | call to map | map.cpp:133:42:133:43 | m2 |  |
+| map.cpp:105:43:105:44 | call to map | map.cpp:134:44:134:45 | m2 |  |
+| map.cpp:105:43:105:44 | call to map | map.cpp:136:7:136:8 | m2 |  |
+| map.cpp:105:43:105:44 | call to map | map.cpp:152:12:152:13 | m2 |  |
+| map.cpp:105:43:105:44 | call to map | map.cpp:152:30:152:31 | m2 |  |
+| map.cpp:105:43:105:44 | call to map | map.cpp:252:1:252:1 | m2 |  |
+| map.cpp:105:47:105:48 | call to map | map.cpp:109:7:109:8 | m3 |  |
+| map.cpp:105:47:105:48 | call to map | map.cpp:115:7:115:8 | m3 |  |
+| map.cpp:105:47:105:48 | call to map | map.cpp:121:7:121:8 | m3 |  |
+| map.cpp:105:47:105:48 | call to map | map.cpp:127:7:127:8 | m3 |  |
+| map.cpp:105:47:105:48 | call to map | map.cpp:158:12:158:13 | m3 |  |
+| map.cpp:105:47:105:48 | call to map | map.cpp:158:30:158:31 | m3 |  |
+| map.cpp:105:47:105:48 | call to map | map.cpp:252:1:252:1 | m3 |  |
+| map.cpp:105:51:105:52 | call to map | map.cpp:110:7:110:8 | m4 |  |
+| map.cpp:105:51:105:52 | call to map | map.cpp:110:17:110:18 | m4 |  |
+| map.cpp:105:51:105:52 | call to map | map.cpp:116:7:116:8 | m4 |  |
+| map.cpp:105:51:105:52 | call to map | map.cpp:122:7:122:8 | m4 |  |
+| map.cpp:105:51:105:52 | call to map | map.cpp:128:7:128:8 | m4 |  |
+| map.cpp:105:51:105:52 | call to map | map.cpp:252:1:252:1 | m4 |  |
+| map.cpp:105:55:105:56 | call to map | map.cpp:111:7:111:8 | m5 |  |
+| map.cpp:105:55:105:56 | call to map | map.cpp:117:7:117:8 | m5 |  |
+| map.cpp:105:55:105:56 | call to map | map.cpp:123:7:123:8 | m5 |  |
+| map.cpp:105:55:105:56 | call to map | map.cpp:129:7:129:8 | m5 |  |
+| map.cpp:105:55:105:56 | call to map | map.cpp:252:1:252:1 | m5 |  |
+| map.cpp:105:59:105:60 | call to map | map.cpp:112:7:112:8 | m6 |  |
+| map.cpp:105:59:105:60 | call to map | map.cpp:112:27:112:28 | m6 |  |
+| map.cpp:105:59:105:60 | call to map | map.cpp:118:7:118:8 | m6 |  |
+| map.cpp:105:59:105:60 | call to map | map.cpp:124:7:124:8 | m6 |  |
+| map.cpp:105:59:105:60 | call to map | map.cpp:130:7:130:8 | m6 |  |
+| map.cpp:105:59:105:60 | call to map | map.cpp:252:1:252:1 | m6 |  |
 | map.cpp:107:7:107:8 | ref arg m1 | map.cpp:113:7:113:8 | m1 |  |
 | map.cpp:107:7:107:8 | ref arg m1 | map.cpp:119:7:119:8 | m1 |  |
 | map.cpp:107:7:107:8 | ref arg m1 | map.cpp:125:7:125:8 | m1 |  |
 | map.cpp:107:7:107:8 | ref arg m1 | map.cpp:146:12:146:13 | m1 |  |
 | map.cpp:107:7:107:8 | ref arg m1 | map.cpp:146:30:146:31 | m1 |  |
 | map.cpp:107:7:107:8 | ref arg m1 | map.cpp:252:1:252:1 | m1 |  |
-| map.cpp:107:17:107:30 | call to make_pair | map.cpp:107:17:107:44 | call to pair | TAINT |
-| map.cpp:107:17:107:44 | call to pair | map.cpp:107:7:107:8 | ref arg m1 | TAINT |
-| map.cpp:107:17:107:44 | call to pair | map.cpp:107:10:107:15 | call to insert | TAINT |
+| map.cpp:107:17:107:30 | call to make_pair | map.cpp:107:7:107:8 | ref arg m1 | TAINT |
+| map.cpp:107:17:107:30 | call to make_pair | map.cpp:107:10:107:15 | call to insert | TAINT |
 | map.cpp:107:47:107:51 | first | map.cpp:107:7:107:51 | call to iterator |  |
 | map.cpp:108:7:108:8 | ref arg m2 | map.cpp:114:7:114:8 | m2 |  |
 | map.cpp:108:7:108:8 | ref arg m2 | map.cpp:120:7:120:8 | m2 |  |
 | map.cpp:108:7:108:8 | ref arg m2 | map.cpp:126:7:126:8 | m2 |  |
-| map.cpp:108:7:108:8 | ref arg m2 | map.cpp:133:30:133:31 | m2 |  |
-| map.cpp:108:7:108:8 | ref arg m2 | map.cpp:134:32:134:33 | m2 |  |
+| map.cpp:108:7:108:8 | ref arg m2 | map.cpp:133:42:133:43 | m2 |  |
+| map.cpp:108:7:108:8 | ref arg m2 | map.cpp:134:44:134:45 | m2 |  |
 | map.cpp:108:7:108:8 | ref arg m2 | map.cpp:136:7:136:8 | m2 |  |
 | map.cpp:108:7:108:8 | ref arg m2 | map.cpp:152:12:152:13 | m2 |  |
 | map.cpp:108:7:108:8 | ref arg m2 | map.cpp:152:30:152:31 | m2 |  |
 | map.cpp:108:7:108:8 | ref arg m2 | map.cpp:252:1:252:1 | m2 |  |
-| map.cpp:108:17:108:30 | call to make_pair | map.cpp:108:17:108:47 | call to pair | TAINT |
-| map.cpp:108:17:108:47 | call to pair | map.cpp:108:7:108:8 | ref arg m2 | TAINT |
-| map.cpp:108:17:108:47 | call to pair | map.cpp:108:10:108:15 | call to insert | TAINT |
+| map.cpp:108:17:108:30 | call to make_pair | map.cpp:108:7:108:8 | ref arg m2 | TAINT |
+| map.cpp:108:17:108:30 | call to make_pair | map.cpp:108:10:108:15 | call to insert | TAINT |
 | map.cpp:108:50:108:54 | first | map.cpp:108:7:108:54 | call to iterator |  |
 | map.cpp:109:7:109:8 | ref arg m3 | map.cpp:115:7:115:8 | m3 |  |
 | map.cpp:109:7:109:8 | ref arg m3 | map.cpp:121:7:121:8 | m3 |  |
@@ -2020,9 +1967,8 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:109:7:109:8 | ref arg m3 | map.cpp:158:12:158:13 | m3 |  |
 | map.cpp:109:7:109:8 | ref arg m3 | map.cpp:158:30:158:31 | m3 |  |
 | map.cpp:109:7:109:8 | ref arg m3 | map.cpp:252:1:252:1 | m3 |  |
-| map.cpp:109:17:109:30 | call to make_pair | map.cpp:109:17:109:47 | call to pair | TAINT |
-| map.cpp:109:17:109:47 | call to pair | map.cpp:109:7:109:8 | ref arg m3 | TAINT |
-| map.cpp:109:17:109:47 | call to pair | map.cpp:109:10:109:15 | call to insert | TAINT |
+| map.cpp:109:17:109:30 | call to make_pair | map.cpp:109:7:109:8 | ref arg m3 | TAINT |
+| map.cpp:109:17:109:30 | call to make_pair | map.cpp:109:10:109:15 | call to insert | TAINT |
 | map.cpp:109:50:109:54 | first | map.cpp:109:7:109:54 | call to iterator |  |
 | map.cpp:110:7:110:8 | ref arg m4 | map.cpp:116:7:116:8 | m4 |  |
 | map.cpp:110:7:110:8 | ref arg m4 | map.cpp:122:7:122:8 | m4 |  |
@@ -2035,10 +1981,9 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:110:17:110:18 | ref arg m4 | map.cpp:128:7:128:8 | m4 |  |
 | map.cpp:110:17:110:18 | ref arg m4 | map.cpp:252:1:252:1 | m4 |  |
 | map.cpp:110:20:110:24 | call to begin | map.cpp:110:17:110:26 | call to iterator | TAINT |
-| map.cpp:110:29:110:70 | call to pair | map.cpp:110:7:110:8 | ref arg m4 | TAINT |
-| map.cpp:110:29:110:70 | call to pair | map.cpp:110:10:110:15 | call to insert | TAINT |
-| map.cpp:110:29:110:70 | call to pair | map.cpp:110:29:110:70 | call to pair | TAINT |
-| map.cpp:110:62:110:67 | call to source | map.cpp:110:29:110:70 | call to pair | TAINT |
+| map.cpp:110:29:110:82 | call to pair | map.cpp:110:7:110:8 | ref arg m4 | TAINT |
+| map.cpp:110:29:110:82 | call to pair | map.cpp:110:10:110:15 | call to insert | TAINT |
+| map.cpp:110:74:110:79 | call to source | map.cpp:110:29:110:82 | call to pair | TAINT |
 | map.cpp:111:7:111:8 | ref arg m5 | map.cpp:117:7:117:8 | m5 |  |
 | map.cpp:111:7:111:8 | ref arg m5 | map.cpp:123:7:123:8 | m5 |  |
 | map.cpp:111:7:111:8 | ref arg m5 | map.cpp:129:7:129:8 | m5 |  |
@@ -2072,8 +2017,8 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:119:7:119:8 | ref arg m1 | map.cpp:252:1:252:1 | m1 |  |
 | map.cpp:120:7:120:8 | m2 | map.cpp:120:10:120:13 | call to find | TAINT |
 | map.cpp:120:7:120:8 | ref arg m2 | map.cpp:126:7:126:8 | m2 |  |
-| map.cpp:120:7:120:8 | ref arg m2 | map.cpp:133:30:133:31 | m2 |  |
-| map.cpp:120:7:120:8 | ref arg m2 | map.cpp:134:32:134:33 | m2 |  |
+| map.cpp:120:7:120:8 | ref arg m2 | map.cpp:133:42:133:43 | m2 |  |
+| map.cpp:120:7:120:8 | ref arg m2 | map.cpp:134:44:134:45 | m2 |  |
 | map.cpp:120:7:120:8 | ref arg m2 | map.cpp:136:7:136:8 | m2 |  |
 | map.cpp:120:7:120:8 | ref arg m2 | map.cpp:152:12:152:13 | m2 |  |
 | map.cpp:120:7:120:8 | ref arg m2 | map.cpp:152:30:152:31 | m2 |  |
@@ -2097,8 +2042,8 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:125:7:125:8 | ref arg m1 | map.cpp:146:30:146:31 | m1 |  |
 | map.cpp:125:7:125:8 | ref arg m1 | map.cpp:252:1:252:1 | m1 |  |
 | map.cpp:126:7:126:8 | m2 | map.cpp:126:10:126:13 | call to find | TAINT |
-| map.cpp:126:7:126:8 | ref arg m2 | map.cpp:133:30:133:31 | m2 |  |
-| map.cpp:126:7:126:8 | ref arg m2 | map.cpp:134:32:134:33 | m2 |  |
+| map.cpp:126:7:126:8 | ref arg m2 | map.cpp:133:42:133:43 | m2 |  |
+| map.cpp:126:7:126:8 | ref arg m2 | map.cpp:134:44:134:45 | m2 |  |
 | map.cpp:126:7:126:8 | ref arg m2 | map.cpp:136:7:136:8 | m2 |  |
 | map.cpp:126:7:126:8 | ref arg m2 | map.cpp:152:12:152:13 | m2 |  |
 | map.cpp:126:7:126:8 | ref arg m2 | map.cpp:152:30:152:31 | m2 |  |
@@ -2113,18 +2058,18 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:129:7:129:8 | ref arg m5 | map.cpp:252:1:252:1 | m5 |  |
 | map.cpp:130:7:130:8 | m6 | map.cpp:130:10:130:13 | call to find | TAINT |
 | map.cpp:130:7:130:8 | ref arg m6 | map.cpp:252:1:252:1 | m6 |  |
-| map.cpp:133:30:133:31 | m2 | map.cpp:133:30:133:32 | call to map |  |
-| map.cpp:133:30:133:32 | call to map | map.cpp:137:7:137:8 | m7 |  |
-| map.cpp:133:30:133:32 | call to map | map.cpp:140:7:140:8 | m7 |  |
-| map.cpp:133:30:133:32 | call to map | map.cpp:252:1:252:1 | m7 |  |
-| map.cpp:134:31:134:33 | call to map | map.cpp:138:7:138:8 | m8 |  |
-| map.cpp:134:31:134:33 | call to map | map.cpp:141:7:141:8 | m8 |  |
-| map.cpp:134:31:134:33 | call to map | map.cpp:252:1:252:1 | m8 |  |
-| map.cpp:134:32:134:33 | m2 | map.cpp:134:31:134:33 | call to map |  |
-| map.cpp:135:27:135:28 | call to map | map.cpp:136:2:136:3 | m9 |  |
-| map.cpp:135:27:135:28 | call to map | map.cpp:139:7:139:8 | m9 |  |
-| map.cpp:135:27:135:28 | call to map | map.cpp:142:7:142:8 | m9 |  |
-| map.cpp:135:27:135:28 | call to map | map.cpp:252:1:252:1 | m9 |  |
+| map.cpp:133:42:133:43 | m2 | map.cpp:133:42:133:44 | call to map |  |
+| map.cpp:133:42:133:44 | call to map | map.cpp:137:7:137:8 | m7 |  |
+| map.cpp:133:42:133:44 | call to map | map.cpp:140:7:140:8 | m7 |  |
+| map.cpp:133:42:133:44 | call to map | map.cpp:252:1:252:1 | m7 |  |
+| map.cpp:134:43:134:45 | call to map | map.cpp:138:7:138:8 | m8 |  |
+| map.cpp:134:43:134:45 | call to map | map.cpp:141:7:141:8 | m8 |  |
+| map.cpp:134:43:134:45 | call to map | map.cpp:252:1:252:1 | m8 |  |
+| map.cpp:134:44:134:45 | m2 | map.cpp:134:43:134:45 | call to map |  |
+| map.cpp:135:39:135:40 | call to map | map.cpp:136:2:136:3 | m9 |  |
+| map.cpp:135:39:135:40 | call to map | map.cpp:139:7:139:8 | m9 |  |
+| map.cpp:135:39:135:40 | call to map | map.cpp:142:7:142:8 | m9 |  |
+| map.cpp:135:39:135:40 | call to map | map.cpp:252:1:252:1 | m9 |  |
 | map.cpp:136:2:136:3 | ref arg m9 | map.cpp:139:7:139:8 | m9 |  |
 | map.cpp:136:2:136:3 | ref arg m9 | map.cpp:142:7:142:8 | m9 |  |
 | map.cpp:136:2:136:3 | ref arg m9 | map.cpp:252:1:252:1 | m9 |  |
@@ -2157,7 +2102,6 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:146:40:146:41 | ref arg i1 | map.cpp:148:9:148:10 | i1 |  |
 | map.cpp:146:40:146:41 | ref arg i1 | map.cpp:149:8:149:9 | i1 |  |
 | map.cpp:146:40:146:41 | ref arg i1 | map.cpp:150:8:150:9 | i1 |  |
-| map.cpp:148:8:148:8 | call to operator* | map.cpp:148:8:148:10 | call to pair | TAINT |
 | map.cpp:148:9:148:10 | i1 | map.cpp:148:8:148:8 | call to operator* | TAINT |
 | map.cpp:148:9:148:10 | ref arg i1 | map.cpp:146:24:146:25 | i1 |  |
 | map.cpp:148:9:148:10 | ref arg i1 | map.cpp:146:40:146:41 | i1 |  |
@@ -2194,7 +2138,6 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:152:40:152:41 | ref arg i2 | map.cpp:154:9:154:10 | i2 |  |
 | map.cpp:152:40:152:41 | ref arg i2 | map.cpp:155:8:155:9 | i2 |  |
 | map.cpp:152:40:152:41 | ref arg i2 | map.cpp:156:8:156:9 | i2 |  |
-| map.cpp:154:8:154:8 | call to operator* | map.cpp:154:8:154:10 | call to pair | TAINT |
 | map.cpp:154:9:154:10 | i2 | map.cpp:154:8:154:8 | call to operator* | TAINT |
 | map.cpp:154:9:154:10 | ref arg i2 | map.cpp:152:24:152:25 | i2 |  |
 | map.cpp:154:9:154:10 | ref arg i2 | map.cpp:152:40:152:41 | i2 |  |
@@ -2231,7 +2174,6 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:158:40:158:41 | ref arg i3 | map.cpp:160:9:160:10 | i3 |  |
 | map.cpp:158:40:158:41 | ref arg i3 | map.cpp:161:8:161:9 | i3 |  |
 | map.cpp:158:40:158:41 | ref arg i3 | map.cpp:162:8:162:9 | i3 |  |
-| map.cpp:160:8:160:8 | call to operator* | map.cpp:160:8:160:10 | call to pair | TAINT |
 | map.cpp:160:9:160:10 | i3 | map.cpp:160:8:160:8 | call to operator* | TAINT |
 | map.cpp:160:9:160:10 | ref arg i3 | map.cpp:158:24:158:25 | i3 |  |
 | map.cpp:160:9:160:10 | ref arg i3 | map.cpp:158:40:158:41 | i3 |  |
@@ -2250,18 +2192,18 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:162:8:162:9 | ref arg i3 | map.cpp:160:9:160:10 | i3 |  |
 | map.cpp:162:8:162:9 | ref arg i3 | map.cpp:161:8:161:9 | i3 |  |
 | map.cpp:162:8:162:9 | ref arg i3 | map.cpp:162:8:162:9 | i3 |  |
-| map.cpp:166:27:166:29 | call to map | map.cpp:167:7:167:9 | m10 |  |
-| map.cpp:166:27:166:29 | call to map | map.cpp:171:7:171:9 | m10 |  |
-| map.cpp:166:27:166:29 | call to map | map.cpp:252:1:252:1 | m10 |  |
-| map.cpp:166:32:166:34 | call to map | map.cpp:168:7:168:9 | m11 |  |
-| map.cpp:166:32:166:34 | call to map | map.cpp:172:7:172:9 | m11 |  |
-| map.cpp:166:32:166:34 | call to map | map.cpp:252:1:252:1 | m11 |  |
-| map.cpp:166:37:166:39 | call to map | map.cpp:169:7:169:9 | m12 |  |
-| map.cpp:166:37:166:39 | call to map | map.cpp:173:7:173:9 | m12 |  |
-| map.cpp:166:37:166:39 | call to map | map.cpp:252:1:252:1 | m12 |  |
-| map.cpp:166:42:166:44 | call to map | map.cpp:170:7:170:9 | m13 |  |
-| map.cpp:166:42:166:44 | call to map | map.cpp:174:7:174:9 | m13 |  |
-| map.cpp:166:42:166:44 | call to map | map.cpp:252:1:252:1 | m13 |  |
+| map.cpp:166:39:166:41 | call to map | map.cpp:167:7:167:9 | m10 |  |
+| map.cpp:166:39:166:41 | call to map | map.cpp:171:7:171:9 | m10 |  |
+| map.cpp:166:39:166:41 | call to map | map.cpp:252:1:252:1 | m10 |  |
+| map.cpp:166:44:166:46 | call to map | map.cpp:168:7:168:9 | m11 |  |
+| map.cpp:166:44:166:46 | call to map | map.cpp:172:7:172:9 | m11 |  |
+| map.cpp:166:44:166:46 | call to map | map.cpp:252:1:252:1 | m11 |  |
+| map.cpp:166:49:166:51 | call to map | map.cpp:169:7:169:9 | m12 |  |
+| map.cpp:166:49:166:51 | call to map | map.cpp:173:7:173:9 | m12 |  |
+| map.cpp:166:49:166:51 | call to map | map.cpp:252:1:252:1 | m12 |  |
+| map.cpp:166:54:166:56 | call to map | map.cpp:170:7:170:9 | m13 |  |
+| map.cpp:166:54:166:56 | call to map | map.cpp:174:7:174:9 | m13 |  |
+| map.cpp:166:54:166:56 | call to map | map.cpp:252:1:252:1 | m13 |  |
 | map.cpp:167:7:167:9 | m10 | map.cpp:167:10:167:10 | call to operator[] | TAINT |
 | map.cpp:167:7:167:9 | ref arg m10 | map.cpp:171:7:171:9 | m10 |  |
 | map.cpp:167:7:167:9 | ref arg m10 | map.cpp:252:1:252:1 | m10 |  |
@@ -2294,17 +2236,17 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:173:7:173:9 | ref arg m12 | map.cpp:252:1:252:1 | m12 |  |
 | map.cpp:174:7:174:9 | m13 | map.cpp:174:10:174:10 | call to operator[] | TAINT |
 | map.cpp:174:7:174:9 | ref arg m13 | map.cpp:252:1:252:1 | m13 |  |
-| map.cpp:177:27:177:29 | call to map | map.cpp:178:2:178:4 | m14 |  |
-| map.cpp:177:27:177:29 | call to map | map.cpp:179:2:179:4 | m14 |  |
-| map.cpp:177:27:177:29 | call to map | map.cpp:180:2:180:4 | m14 |  |
-| map.cpp:177:27:177:29 | call to map | map.cpp:181:2:181:4 | m14 |  |
-| map.cpp:177:27:177:29 | call to map | map.cpp:182:7:182:9 | m14 |  |
-| map.cpp:177:27:177:29 | call to map | map.cpp:183:7:183:9 | m14 |  |
-| map.cpp:177:27:177:29 | call to map | map.cpp:184:7:184:9 | m14 |  |
-| map.cpp:177:27:177:29 | call to map | map.cpp:185:7:185:9 | m14 |  |
-| map.cpp:177:27:177:29 | call to map | map.cpp:186:7:186:9 | m14 |  |
-| map.cpp:177:27:177:29 | call to map | map.cpp:187:7:187:9 | m14 |  |
-| map.cpp:177:27:177:29 | call to map | map.cpp:252:1:252:1 | m14 |  |
+| map.cpp:177:39:177:41 | call to map | map.cpp:178:2:178:4 | m14 |  |
+| map.cpp:177:39:177:41 | call to map | map.cpp:179:2:179:4 | m14 |  |
+| map.cpp:177:39:177:41 | call to map | map.cpp:180:2:180:4 | m14 |  |
+| map.cpp:177:39:177:41 | call to map | map.cpp:181:2:181:4 | m14 |  |
+| map.cpp:177:39:177:41 | call to map | map.cpp:182:7:182:9 | m14 |  |
+| map.cpp:177:39:177:41 | call to map | map.cpp:183:7:183:9 | m14 |  |
+| map.cpp:177:39:177:41 | call to map | map.cpp:184:7:184:9 | m14 |  |
+| map.cpp:177:39:177:41 | call to map | map.cpp:185:7:185:9 | m14 |  |
+| map.cpp:177:39:177:41 | call to map | map.cpp:186:7:186:9 | m14 |  |
+| map.cpp:177:39:177:41 | call to map | map.cpp:187:7:187:9 | m14 |  |
+| map.cpp:177:39:177:41 | call to map | map.cpp:252:1:252:1 | m14 |  |
 | map.cpp:178:2:178:4 | ref arg m14 | map.cpp:179:2:179:4 | m14 |  |
 | map.cpp:178:2:178:4 | ref arg m14 | map.cpp:180:2:180:4 | m14 |  |
 | map.cpp:178:2:178:4 | ref arg m14 | map.cpp:181:2:181:4 | m14 |  |
@@ -2315,9 +2257,8 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:178:2:178:4 | ref arg m14 | map.cpp:186:7:186:9 | m14 |  |
 | map.cpp:178:2:178:4 | ref arg m14 | map.cpp:187:7:187:9 | m14 |  |
 | map.cpp:178:2:178:4 | ref arg m14 | map.cpp:252:1:252:1 | m14 |  |
-| map.cpp:178:13:178:26 | call to make_pair | map.cpp:178:13:178:36 | call to pair | TAINT |
-| map.cpp:178:13:178:36 | call to pair | map.cpp:178:2:178:4 | ref arg m14 | TAINT |
-| map.cpp:178:13:178:36 | call to pair | map.cpp:178:6:178:11 | call to insert | TAINT |
+| map.cpp:178:13:178:26 | call to make_pair | map.cpp:178:2:178:4 | ref arg m14 | TAINT |
+| map.cpp:178:13:178:26 | call to make_pair | map.cpp:178:6:178:11 | call to insert | TAINT |
 | map.cpp:179:2:179:4 | ref arg m14 | map.cpp:180:2:180:4 | m14 |  |
 | map.cpp:179:2:179:4 | ref arg m14 | map.cpp:181:2:181:4 | m14 |  |
 | map.cpp:179:2:179:4 | ref arg m14 | map.cpp:182:7:182:9 | m14 |  |
@@ -2327,9 +2268,8 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:179:2:179:4 | ref arg m14 | map.cpp:186:7:186:9 | m14 |  |
 | map.cpp:179:2:179:4 | ref arg m14 | map.cpp:187:7:187:9 | m14 |  |
 | map.cpp:179:2:179:4 | ref arg m14 | map.cpp:252:1:252:1 | m14 |  |
-| map.cpp:179:13:179:26 | call to make_pair | map.cpp:179:13:179:41 | call to pair | TAINT |
-| map.cpp:179:13:179:41 | call to pair | map.cpp:179:2:179:4 | ref arg m14 | TAINT |
-| map.cpp:179:13:179:41 | call to pair | map.cpp:179:6:179:11 | call to insert | TAINT |
+| map.cpp:179:13:179:26 | call to make_pair | map.cpp:179:2:179:4 | ref arg m14 | TAINT |
+| map.cpp:179:13:179:26 | call to make_pair | map.cpp:179:6:179:11 | call to insert | TAINT |
 | map.cpp:180:2:180:4 | ref arg m14 | map.cpp:181:2:181:4 | m14 |  |
 | map.cpp:180:2:180:4 | ref arg m14 | map.cpp:182:7:182:9 | m14 |  |
 | map.cpp:180:2:180:4 | ref arg m14 | map.cpp:183:7:183:9 | m14 |  |
@@ -2338,9 +2278,8 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:180:2:180:4 | ref arg m14 | map.cpp:186:7:186:9 | m14 |  |
 | map.cpp:180:2:180:4 | ref arg m14 | map.cpp:187:7:187:9 | m14 |  |
 | map.cpp:180:2:180:4 | ref arg m14 | map.cpp:252:1:252:1 | m14 |  |
-| map.cpp:180:13:180:26 | call to make_pair | map.cpp:180:13:180:41 | call to pair | TAINT |
-| map.cpp:180:13:180:41 | call to pair | map.cpp:180:2:180:4 | ref arg m14 | TAINT |
-| map.cpp:180:13:180:41 | call to pair | map.cpp:180:6:180:11 | call to insert | TAINT |
+| map.cpp:180:13:180:26 | call to make_pair | map.cpp:180:2:180:4 | ref arg m14 | TAINT |
+| map.cpp:180:13:180:26 | call to make_pair | map.cpp:180:6:180:11 | call to insert | TAINT |
 | map.cpp:181:2:181:4 | ref arg m14 | map.cpp:182:7:182:9 | m14 |  |
 | map.cpp:181:2:181:4 | ref arg m14 | map.cpp:183:7:183:9 | m14 |  |
 | map.cpp:181:2:181:4 | ref arg m14 | map.cpp:184:7:184:9 | m14 |  |
@@ -2348,9 +2287,8 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:181:2:181:4 | ref arg m14 | map.cpp:186:7:186:9 | m14 |  |
 | map.cpp:181:2:181:4 | ref arg m14 | map.cpp:187:7:187:9 | m14 |  |
 | map.cpp:181:2:181:4 | ref arg m14 | map.cpp:252:1:252:1 | m14 |  |
-| map.cpp:181:13:181:26 | call to make_pair | map.cpp:181:13:181:36 | call to pair | TAINT |
-| map.cpp:181:13:181:36 | call to pair | map.cpp:181:2:181:4 | ref arg m14 | TAINT |
-| map.cpp:181:13:181:36 | call to pair | map.cpp:181:6:181:11 | call to insert | TAINT |
+| map.cpp:181:13:181:26 | call to make_pair | map.cpp:181:2:181:4 | ref arg m14 | TAINT |
+| map.cpp:181:13:181:26 | call to make_pair | map.cpp:181:6:181:11 | call to insert | TAINT |
 | map.cpp:182:7:182:9 | m14 | map.cpp:182:11:182:21 | call to lower_bound | TAINT |
 | map.cpp:182:7:182:9 | ref arg m14 | map.cpp:183:7:183:9 | m14 |  |
 | map.cpp:182:7:182:9 | ref arg m14 | map.cpp:184:7:184:9 | m14 |  |
@@ -2381,40 +2319,38 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:187:7:187:9 | m14 | map.cpp:187:11:187:21 | call to equal_range | TAINT |
 | map.cpp:187:7:187:9 | ref arg m14 | map.cpp:252:1:252:1 | m14 |  |
 | map.cpp:187:28:187:33 | second | map.cpp:187:7:187:33 | call to iterator |  |
-| map.cpp:190:27:190:29 | call to map | map.cpp:191:2:191:4 | m15 |  |
-| map.cpp:190:27:190:29 | call to map | map.cpp:193:7:193:9 | m15 |  |
-| map.cpp:190:27:190:29 | call to map | map.cpp:197:2:197:4 | m15 |  |
-| map.cpp:190:27:190:29 | call to map | map.cpp:199:7:199:9 | m15 |  |
-| map.cpp:190:27:190:29 | call to map | map.cpp:252:1:252:1 | m15 |  |
-| map.cpp:190:32:190:34 | call to map | map.cpp:194:7:194:9 | m16 |  |
-| map.cpp:190:32:190:34 | call to map | map.cpp:197:11:197:13 | m16 |  |
-| map.cpp:190:32:190:34 | call to map | map.cpp:200:7:200:9 | m16 |  |
-| map.cpp:190:32:190:34 | call to map | map.cpp:252:1:252:1 | m16 |  |
-| map.cpp:190:37:190:39 | call to map | map.cpp:195:7:195:9 | m17 |  |
-| map.cpp:190:37:190:39 | call to map | map.cpp:198:2:198:4 | m17 |  |
-| map.cpp:190:37:190:39 | call to map | map.cpp:201:7:201:9 | m17 |  |
-| map.cpp:190:37:190:39 | call to map | map.cpp:252:1:252:1 | m17 |  |
-| map.cpp:190:42:190:44 | call to map | map.cpp:192:2:192:4 | m18 |  |
-| map.cpp:190:42:190:44 | call to map | map.cpp:196:7:196:9 | m18 |  |
-| map.cpp:190:42:190:44 | call to map | map.cpp:198:11:198:13 | m18 |  |
-| map.cpp:190:42:190:44 | call to map | map.cpp:202:7:202:9 | m18 |  |
-| map.cpp:190:42:190:44 | call to map | map.cpp:252:1:252:1 | m18 |  |
+| map.cpp:190:39:190:41 | call to map | map.cpp:191:2:191:4 | m15 |  |
+| map.cpp:190:39:190:41 | call to map | map.cpp:193:7:193:9 | m15 |  |
+| map.cpp:190:39:190:41 | call to map | map.cpp:197:2:197:4 | m15 |  |
+| map.cpp:190:39:190:41 | call to map | map.cpp:199:7:199:9 | m15 |  |
+| map.cpp:190:39:190:41 | call to map | map.cpp:252:1:252:1 | m15 |  |
+| map.cpp:190:44:190:46 | call to map | map.cpp:194:7:194:9 | m16 |  |
+| map.cpp:190:44:190:46 | call to map | map.cpp:197:11:197:13 | m16 |  |
+| map.cpp:190:44:190:46 | call to map | map.cpp:200:7:200:9 | m16 |  |
+| map.cpp:190:44:190:46 | call to map | map.cpp:252:1:252:1 | m16 |  |
+| map.cpp:190:49:190:51 | call to map | map.cpp:195:7:195:9 | m17 |  |
+| map.cpp:190:49:190:51 | call to map | map.cpp:198:2:198:4 | m17 |  |
+| map.cpp:190:49:190:51 | call to map | map.cpp:201:7:201:9 | m17 |  |
+| map.cpp:190:49:190:51 | call to map | map.cpp:252:1:252:1 | m17 |  |
+| map.cpp:190:54:190:56 | call to map | map.cpp:192:2:192:4 | m18 |  |
+| map.cpp:190:54:190:56 | call to map | map.cpp:196:7:196:9 | m18 |  |
+| map.cpp:190:54:190:56 | call to map | map.cpp:198:11:198:13 | m18 |  |
+| map.cpp:190:54:190:56 | call to map | map.cpp:202:7:202:9 | m18 |  |
+| map.cpp:190:54:190:56 | call to map | map.cpp:252:1:252:1 | m18 |  |
 | map.cpp:191:2:191:4 | ref arg m15 | map.cpp:193:7:193:9 | m15 |  |
 | map.cpp:191:2:191:4 | ref arg m15 | map.cpp:197:2:197:4 | m15 |  |
 | map.cpp:191:2:191:4 | ref arg m15 | map.cpp:199:7:199:9 | m15 |  |
 | map.cpp:191:2:191:4 | ref arg m15 | map.cpp:252:1:252:1 | m15 |  |
-| map.cpp:191:13:191:57 | call to pair | map.cpp:191:2:191:4 | ref arg m15 | TAINT |
-| map.cpp:191:13:191:57 | call to pair | map.cpp:191:6:191:11 | call to insert | TAINT |
-| map.cpp:191:13:191:57 | call to pair | map.cpp:191:13:191:57 | call to pair | TAINT |
-| map.cpp:191:49:191:54 | call to source | map.cpp:191:13:191:57 | call to pair | TAINT |
+| map.cpp:191:13:191:69 | call to pair | map.cpp:191:2:191:4 | ref arg m15 | TAINT |
+| map.cpp:191:13:191:69 | call to pair | map.cpp:191:6:191:11 | call to insert | TAINT |
+| map.cpp:191:61:191:66 | call to source | map.cpp:191:13:191:69 | call to pair | TAINT |
 | map.cpp:192:2:192:4 | ref arg m18 | map.cpp:196:7:196:9 | m18 |  |
 | map.cpp:192:2:192:4 | ref arg m18 | map.cpp:198:11:198:13 | m18 |  |
 | map.cpp:192:2:192:4 | ref arg m18 | map.cpp:202:7:202:9 | m18 |  |
 | map.cpp:192:2:192:4 | ref arg m18 | map.cpp:252:1:252:1 | m18 |  |
-| map.cpp:192:13:192:57 | call to pair | map.cpp:192:2:192:4 | ref arg m18 | TAINT |
-| map.cpp:192:13:192:57 | call to pair | map.cpp:192:6:192:11 | call to insert | TAINT |
-| map.cpp:192:13:192:57 | call to pair | map.cpp:192:13:192:57 | call to pair | TAINT |
-| map.cpp:192:49:192:54 | call to source | map.cpp:192:13:192:57 | call to pair | TAINT |
+| map.cpp:192:13:192:69 | call to pair | map.cpp:192:2:192:4 | ref arg m18 | TAINT |
+| map.cpp:192:13:192:69 | call to pair | map.cpp:192:6:192:11 | call to insert | TAINT |
+| map.cpp:192:61:192:66 | call to source | map.cpp:192:13:192:69 | call to pair | TAINT |
 | map.cpp:193:7:193:9 | m15 | map.cpp:193:7:193:9 | call to map |  |
 | map.cpp:194:7:194:9 | m16 | map.cpp:194:7:194:9 | call to map |  |
 | map.cpp:195:7:195:9 | m17 | map.cpp:195:7:195:9 | call to map |  |
@@ -2431,58 +2367,54 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:200:7:200:9 | m16 | map.cpp:200:7:200:9 | call to map |  |
 | map.cpp:201:7:201:9 | m17 | map.cpp:201:7:201:9 | call to map |  |
 | map.cpp:202:7:202:9 | m18 | map.cpp:202:7:202:9 | call to map |  |
-| map.cpp:205:27:205:29 | call to map | map.cpp:206:2:206:4 | m19 |  |
-| map.cpp:205:27:205:29 | call to map | map.cpp:210:7:210:9 | m19 |  |
-| map.cpp:205:27:205:29 | call to map | map.cpp:214:2:214:4 | m19 |  |
-| map.cpp:205:27:205:29 | call to map | map.cpp:216:7:216:9 | m19 |  |
-| map.cpp:205:27:205:29 | call to map | map.cpp:252:1:252:1 | m19 |  |
-| map.cpp:205:32:205:34 | call to map | map.cpp:207:2:207:4 | m20 |  |
-| map.cpp:205:32:205:34 | call to map | map.cpp:211:7:211:9 | m20 |  |
-| map.cpp:205:32:205:34 | call to map | map.cpp:214:12:214:14 | m20 |  |
-| map.cpp:205:32:205:34 | call to map | map.cpp:217:7:217:9 | m20 |  |
-| map.cpp:205:32:205:34 | call to map | map.cpp:252:1:252:1 | m20 |  |
-| map.cpp:205:37:205:39 | call to map | map.cpp:208:2:208:4 | m21 |  |
-| map.cpp:205:37:205:39 | call to map | map.cpp:212:7:212:9 | m21 |  |
-| map.cpp:205:37:205:39 | call to map | map.cpp:215:2:215:4 | m21 |  |
-| map.cpp:205:37:205:39 | call to map | map.cpp:218:7:218:9 | m21 |  |
-| map.cpp:205:37:205:39 | call to map | map.cpp:252:1:252:1 | m21 |  |
-| map.cpp:205:42:205:44 | call to map | map.cpp:209:2:209:4 | m22 |  |
-| map.cpp:205:42:205:44 | call to map | map.cpp:213:7:213:9 | m22 |  |
-| map.cpp:205:42:205:44 | call to map | map.cpp:215:12:215:14 | m22 |  |
-| map.cpp:205:42:205:44 | call to map | map.cpp:219:7:219:9 | m22 |  |
-| map.cpp:205:42:205:44 | call to map | map.cpp:252:1:252:1 | m22 |  |
+| map.cpp:205:39:205:41 | call to map | map.cpp:206:2:206:4 | m19 |  |
+| map.cpp:205:39:205:41 | call to map | map.cpp:210:7:210:9 | m19 |  |
+| map.cpp:205:39:205:41 | call to map | map.cpp:214:2:214:4 | m19 |  |
+| map.cpp:205:39:205:41 | call to map | map.cpp:216:7:216:9 | m19 |  |
+| map.cpp:205:39:205:41 | call to map | map.cpp:252:1:252:1 | m19 |  |
+| map.cpp:205:44:205:46 | call to map | map.cpp:207:2:207:4 | m20 |  |
+| map.cpp:205:44:205:46 | call to map | map.cpp:211:7:211:9 | m20 |  |
+| map.cpp:205:44:205:46 | call to map | map.cpp:214:12:214:14 | m20 |  |
+| map.cpp:205:44:205:46 | call to map | map.cpp:217:7:217:9 | m20 |  |
+| map.cpp:205:44:205:46 | call to map | map.cpp:252:1:252:1 | m20 |  |
+| map.cpp:205:49:205:51 | call to map | map.cpp:208:2:208:4 | m21 |  |
+| map.cpp:205:49:205:51 | call to map | map.cpp:212:7:212:9 | m21 |  |
+| map.cpp:205:49:205:51 | call to map | map.cpp:215:2:215:4 | m21 |  |
+| map.cpp:205:49:205:51 | call to map | map.cpp:218:7:218:9 | m21 |  |
+| map.cpp:205:49:205:51 | call to map | map.cpp:252:1:252:1 | m21 |  |
+| map.cpp:205:54:205:56 | call to map | map.cpp:209:2:209:4 | m22 |  |
+| map.cpp:205:54:205:56 | call to map | map.cpp:213:7:213:9 | m22 |  |
+| map.cpp:205:54:205:56 | call to map | map.cpp:215:12:215:14 | m22 |  |
+| map.cpp:205:54:205:56 | call to map | map.cpp:219:7:219:9 | m22 |  |
+| map.cpp:205:54:205:56 | call to map | map.cpp:252:1:252:1 | m22 |  |
 | map.cpp:206:2:206:4 | ref arg m19 | map.cpp:210:7:210:9 | m19 |  |
 | map.cpp:206:2:206:4 | ref arg m19 | map.cpp:214:2:214:4 | m19 |  |
 | map.cpp:206:2:206:4 | ref arg m19 | map.cpp:216:7:216:9 | m19 |  |
 | map.cpp:206:2:206:4 | ref arg m19 | map.cpp:252:1:252:1 | m19 |  |
-| map.cpp:206:13:206:57 | call to pair | map.cpp:206:2:206:4 | ref arg m19 | TAINT |
-| map.cpp:206:13:206:57 | call to pair | map.cpp:206:6:206:11 | call to insert | TAINT |
-| map.cpp:206:13:206:57 | call to pair | map.cpp:206:13:206:57 | call to pair | TAINT |
-| map.cpp:206:49:206:54 | call to source | map.cpp:206:13:206:57 | call to pair | TAINT |
+| map.cpp:206:13:206:69 | call to pair | map.cpp:206:2:206:4 | ref arg m19 | TAINT |
+| map.cpp:206:13:206:69 | call to pair | map.cpp:206:6:206:11 | call to insert | TAINT |
+| map.cpp:206:61:206:66 | call to source | map.cpp:206:13:206:69 | call to pair | TAINT |
 | map.cpp:207:2:207:4 | ref arg m20 | map.cpp:211:7:211:9 | m20 |  |
 | map.cpp:207:2:207:4 | ref arg m20 | map.cpp:214:12:214:14 | m20 |  |
 | map.cpp:207:2:207:4 | ref arg m20 | map.cpp:217:7:217:9 | m20 |  |
 | map.cpp:207:2:207:4 | ref arg m20 | map.cpp:252:1:252:1 | m20 |  |
-| map.cpp:207:13:207:51 | call to pair | map.cpp:207:2:207:4 | ref arg m20 | TAINT |
-| map.cpp:207:13:207:51 | call to pair | map.cpp:207:6:207:11 | call to insert | TAINT |
-| map.cpp:207:13:207:51 | call to pair | map.cpp:207:13:207:51 | call to pair | TAINT |
-| map.cpp:207:46:207:50 | def | map.cpp:207:13:207:51 | call to pair | TAINT |
+| map.cpp:207:13:207:63 | call to pair | map.cpp:207:2:207:4 | ref arg m20 | TAINT |
+| map.cpp:207:13:207:63 | call to pair | map.cpp:207:6:207:11 | call to insert | TAINT |
+| map.cpp:207:58:207:62 | def | map.cpp:207:13:207:63 | call to pair | TAINT |
 | map.cpp:208:2:208:4 | ref arg m21 | map.cpp:212:7:212:9 | m21 |  |
 | map.cpp:208:2:208:4 | ref arg m21 | map.cpp:215:2:215:4 | m21 |  |
 | map.cpp:208:2:208:4 | ref arg m21 | map.cpp:218:7:218:9 | m21 |  |
 | map.cpp:208:2:208:4 | ref arg m21 | map.cpp:252:1:252:1 | m21 |  |
-| map.cpp:208:13:208:51 | call to pair | map.cpp:208:2:208:4 | ref arg m21 | TAINT |
-| map.cpp:208:13:208:51 | call to pair | map.cpp:208:6:208:11 | call to insert | TAINT |
-| map.cpp:208:13:208:51 | call to pair | map.cpp:208:13:208:51 | call to pair | TAINT |
-| map.cpp:208:46:208:50 | def | map.cpp:208:13:208:51 | call to pair | TAINT |
+| map.cpp:208:13:208:63 | call to pair | map.cpp:208:2:208:4 | ref arg m21 | TAINT |
+| map.cpp:208:13:208:63 | call to pair | map.cpp:208:6:208:11 | call to insert | TAINT |
+| map.cpp:208:58:208:62 | def | map.cpp:208:13:208:63 | call to pair | TAINT |
 | map.cpp:209:2:209:4 | ref arg m22 | map.cpp:213:7:213:9 | m22 |  |
 | map.cpp:209:2:209:4 | ref arg m22 | map.cpp:215:12:215:14 | m22 |  |
 | map.cpp:209:2:209:4 | ref arg m22 | map.cpp:219:7:219:9 | m22 |  |
 | map.cpp:209:2:209:4 | ref arg m22 | map.cpp:252:1:252:1 | m22 |  |
-| map.cpp:209:13:209:57 | call to pair | map.cpp:209:2:209:4 | ref arg m22 | TAINT |
-| map.cpp:209:13:209:57 | call to pair | map.cpp:209:6:209:11 | call to insert | TAINT |
-| map.cpp:209:13:209:57 | call to pair | map.cpp:209:13:209:57 | call to pair | TAINT |
-| map.cpp:209:49:209:54 | call to source | map.cpp:209:13:209:57 | call to pair | TAINT |
+| map.cpp:209:13:209:69 | call to pair | map.cpp:209:2:209:4 | ref arg m22 | TAINT |
+| map.cpp:209:13:209:69 | call to pair | map.cpp:209:6:209:11 | call to insert | TAINT |
+| map.cpp:209:61:209:66 | call to source | map.cpp:209:13:209:69 | call to pair | TAINT |
 | map.cpp:210:7:210:9 | m19 | map.cpp:210:7:210:9 | call to map |  |
 | map.cpp:211:7:211:9 | m20 | map.cpp:211:7:211:9 | call to map |  |
 | map.cpp:212:7:212:9 | m21 | map.cpp:212:7:212:9 | call to map |  |
@@ -2501,15 +2433,16 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:217:7:217:9 | m20 | map.cpp:217:7:217:9 | call to map |  |
 | map.cpp:218:7:218:9 | m21 | map.cpp:218:7:218:9 | call to map |  |
 | map.cpp:219:7:219:9 | m22 | map.cpp:219:7:219:9 | call to map |  |
-| map.cpp:222:27:222:29 | call to map | map.cpp:223:2:223:4 | m23 |  |
-| map.cpp:222:27:222:29 | call to map | map.cpp:224:2:224:4 | m23 |  |
-| map.cpp:222:27:222:29 | call to map | map.cpp:225:7:225:9 | m23 |  |
-| map.cpp:222:27:222:29 | call to map | map.cpp:226:7:226:9 | m23 |  |
-| map.cpp:222:27:222:29 | call to map | map.cpp:226:17:226:19 | m23 |  |
-| map.cpp:222:27:222:29 | call to map | map.cpp:227:7:227:9 | m23 |  |
-| map.cpp:222:27:222:29 | call to map | map.cpp:228:2:228:4 | m23 |  |
-| map.cpp:222:27:222:29 | call to map | map.cpp:229:7:229:9 | m23 |  |
-| map.cpp:222:27:222:29 | call to map | map.cpp:252:1:252:1 | m23 |  |
+| map.cpp:222:39:222:41 | call to map | map.cpp:223:2:223:4 | m23 |  |
+| map.cpp:222:39:222:41 | call to map | map.cpp:224:2:224:4 | m23 |  |
+| map.cpp:222:39:222:41 | call to map | map.cpp:225:7:225:9 | m23 |  |
+| map.cpp:222:39:222:41 | call to map | map.cpp:226:7:226:9 | m23 |  |
+| map.cpp:222:39:222:41 | call to map | map.cpp:226:17:226:19 | m23 |  |
+| map.cpp:222:39:222:41 | call to map | map.cpp:227:7:227:9 | m23 |  |
+| map.cpp:222:39:222:41 | call to map | map.cpp:228:2:228:4 | m23 |  |
+| map.cpp:222:39:222:41 | call to map | map.cpp:229:7:229:9 | m23 |  |
+| map.cpp:222:39:222:41 | call to map | map.cpp:252:1:252:1 | m23 |  |
+| map.cpp:222:103:222:108 | call to source | map.cpp:222:44:222:111 | call to pair | TAINT |
 | map.cpp:223:2:223:4 | ref arg m23 | map.cpp:224:2:224:4 | m23 |  |
 | map.cpp:223:2:223:4 | ref arg m23 | map.cpp:225:7:225:9 | m23 |  |
 | map.cpp:223:2:223:4 | ref arg m23 | map.cpp:226:7:226:9 | m23 |  |
@@ -2518,10 +2451,9 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:223:2:223:4 | ref arg m23 | map.cpp:228:2:228:4 | m23 |  |
 | map.cpp:223:2:223:4 | ref arg m23 | map.cpp:229:7:229:9 | m23 |  |
 | map.cpp:223:2:223:4 | ref arg m23 | map.cpp:252:1:252:1 | m23 |  |
-| map.cpp:223:13:223:57 | call to pair | map.cpp:223:2:223:4 | ref arg m23 | TAINT |
-| map.cpp:223:13:223:57 | call to pair | map.cpp:223:6:223:11 | call to insert | TAINT |
-| map.cpp:223:13:223:57 | call to pair | map.cpp:223:13:223:57 | call to pair | TAINT |
-| map.cpp:223:49:223:54 | call to source | map.cpp:223:13:223:57 | call to pair | TAINT |
+| map.cpp:223:13:223:69 | call to pair | map.cpp:223:2:223:4 | ref arg m23 | TAINT |
+| map.cpp:223:13:223:69 | call to pair | map.cpp:223:6:223:11 | call to insert | TAINT |
+| map.cpp:223:61:223:66 | call to source | map.cpp:223:13:223:69 | call to pair | TAINT |
 | map.cpp:224:2:224:4 | ref arg m23 | map.cpp:225:7:225:9 | m23 |  |
 | map.cpp:224:2:224:4 | ref arg m23 | map.cpp:226:7:226:9 | m23 |  |
 | map.cpp:224:2:224:4 | ref arg m23 | map.cpp:226:17:226:19 | m23 |  |
@@ -2529,10 +2461,9 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:224:2:224:4 | ref arg m23 | map.cpp:228:2:228:4 | m23 |  |
 | map.cpp:224:2:224:4 | ref arg m23 | map.cpp:229:7:229:9 | m23 |  |
 | map.cpp:224:2:224:4 | ref arg m23 | map.cpp:252:1:252:1 | m23 |  |
-| map.cpp:224:13:224:57 | call to pair | map.cpp:224:2:224:4 | ref arg m23 | TAINT |
-| map.cpp:224:13:224:57 | call to pair | map.cpp:224:6:224:11 | call to insert | TAINT |
-| map.cpp:224:13:224:57 | call to pair | map.cpp:224:13:224:57 | call to pair | TAINT |
-| map.cpp:224:49:224:54 | call to source | map.cpp:224:13:224:57 | call to pair | TAINT |
+| map.cpp:224:13:224:69 | call to pair | map.cpp:224:2:224:4 | ref arg m23 | TAINT |
+| map.cpp:224:13:224:69 | call to pair | map.cpp:224:6:224:11 | call to insert | TAINT |
+| map.cpp:224:61:224:66 | call to source | map.cpp:224:13:224:69 | call to pair | TAINT |
 | map.cpp:225:7:225:9 | m23 | map.cpp:225:7:225:9 | call to map |  |
 | map.cpp:226:7:226:9 | m23 | map.cpp:226:11:226:15 | call to erase | TAINT |
 | map.cpp:226:7:226:9 | ref arg m23 | map.cpp:227:7:227:9 | m23 |  |
@@ -2549,18 +2480,19 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:228:2:228:4 | ref arg m23 | map.cpp:229:7:229:9 | m23 |  |
 | map.cpp:228:2:228:4 | ref arg m23 | map.cpp:252:1:252:1 | m23 |  |
 | map.cpp:229:7:229:9 | m23 | map.cpp:229:7:229:9 | call to map |  |
-| map.cpp:232:27:232:29 | call to map | map.cpp:233:7:233:9 | m24 |  |
-| map.cpp:232:27:232:29 | call to map | map.cpp:234:7:234:9 | m24 |  |
-| map.cpp:232:27:232:29 | call to map | map.cpp:235:7:235:9 | m24 |  |
-| map.cpp:232:27:232:29 | call to map | map.cpp:236:7:236:9 | m24 |  |
-| map.cpp:232:27:232:29 | call to map | map.cpp:252:1:252:1 | m24 |  |
-| map.cpp:232:32:232:34 | call to map | map.cpp:237:7:237:9 | m25 |  |
-| map.cpp:232:32:232:34 | call to map | map.cpp:237:24:237:26 | m25 |  |
-| map.cpp:232:32:232:34 | call to map | map.cpp:238:7:238:9 | m25 |  |
-| map.cpp:232:32:232:34 | call to map | map.cpp:239:7:239:9 | m25 |  |
-| map.cpp:232:32:232:34 | call to map | map.cpp:239:24:239:26 | m25 |  |
-| map.cpp:232:32:232:34 | call to map | map.cpp:240:7:240:9 | m25 |  |
-| map.cpp:232:32:232:34 | call to map | map.cpp:252:1:252:1 | m25 |  |
+| map.cpp:232:39:232:41 | call to map | map.cpp:233:7:233:9 | m24 |  |
+| map.cpp:232:39:232:41 | call to map | map.cpp:234:7:234:9 | m24 |  |
+| map.cpp:232:39:232:41 | call to map | map.cpp:235:7:235:9 | m24 |  |
+| map.cpp:232:39:232:41 | call to map | map.cpp:236:7:236:9 | m24 |  |
+| map.cpp:232:39:232:41 | call to map | map.cpp:252:1:252:1 | m24 |  |
+| map.cpp:232:44:232:46 | call to map | map.cpp:237:7:237:9 | m25 |  |
+| map.cpp:232:44:232:46 | call to map | map.cpp:237:24:237:26 | m25 |  |
+| map.cpp:232:44:232:46 | call to map | map.cpp:238:7:238:9 | m25 |  |
+| map.cpp:232:44:232:46 | call to map | map.cpp:239:7:239:9 | m25 |  |
+| map.cpp:232:44:232:46 | call to map | map.cpp:239:24:239:26 | m25 |  |
+| map.cpp:232:44:232:46 | call to map | map.cpp:240:7:240:9 | m25 |  |
+| map.cpp:232:44:232:46 | call to map | map.cpp:252:1:252:1 | m25 |  |
+| map.cpp:232:105:232:110 | call to source | map.cpp:232:49:232:113 | call to pair | TAINT |
 | map.cpp:233:7:233:9 | m24 | map.cpp:233:11:233:17 | call to emplace | TAINT |
 | map.cpp:233:7:233:9 | ref arg m24 | map.cpp:234:7:234:9 | m24 |  |
 | map.cpp:233:7:233:9 | ref arg m24 | map.cpp:235:7:235:9 | m24 |  |
@@ -2605,18 +2537,18 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:239:44:239:49 | call to source | map.cpp:239:7:239:9 | ref arg m25 | TAINT |
 | map.cpp:239:44:239:49 | call to source | map.cpp:239:11:239:22 | call to emplace_hint | TAINT |
 | map.cpp:240:7:240:9 | m25 | map.cpp:240:7:240:9 | call to map |  |
-| map.cpp:243:27:243:29 | call to map | map.cpp:244:7:244:9 | m26 |  |
-| map.cpp:243:27:243:29 | call to map | map.cpp:245:7:245:9 | m26 |  |
-| map.cpp:243:27:243:29 | call to map | map.cpp:246:7:246:9 | m26 |  |
-| map.cpp:243:27:243:29 | call to map | map.cpp:247:7:247:9 | m26 |  |
-| map.cpp:243:27:243:29 | call to map | map.cpp:252:1:252:1 | m26 |  |
-| map.cpp:243:32:243:34 | call to map | map.cpp:248:7:248:9 | m27 |  |
-| map.cpp:243:32:243:34 | call to map | map.cpp:248:23:248:25 | m27 |  |
-| map.cpp:243:32:243:34 | call to map | map.cpp:249:7:249:9 | m27 |  |
-| map.cpp:243:32:243:34 | call to map | map.cpp:250:7:250:9 | m27 |  |
-| map.cpp:243:32:243:34 | call to map | map.cpp:250:23:250:25 | m27 |  |
-| map.cpp:243:32:243:34 | call to map | map.cpp:251:7:251:9 | m27 |  |
-| map.cpp:243:32:243:34 | call to map | map.cpp:252:1:252:1 | m27 |  |
+| map.cpp:243:39:243:41 | call to map | map.cpp:244:7:244:9 | m26 |  |
+| map.cpp:243:39:243:41 | call to map | map.cpp:245:7:245:9 | m26 |  |
+| map.cpp:243:39:243:41 | call to map | map.cpp:246:7:246:9 | m26 |  |
+| map.cpp:243:39:243:41 | call to map | map.cpp:247:7:247:9 | m26 |  |
+| map.cpp:243:39:243:41 | call to map | map.cpp:252:1:252:1 | m26 |  |
+| map.cpp:243:44:243:46 | call to map | map.cpp:248:7:248:9 | m27 |  |
+| map.cpp:243:44:243:46 | call to map | map.cpp:248:23:248:25 | m27 |  |
+| map.cpp:243:44:243:46 | call to map | map.cpp:249:7:249:9 | m27 |  |
+| map.cpp:243:44:243:46 | call to map | map.cpp:250:7:250:9 | m27 |  |
+| map.cpp:243:44:243:46 | call to map | map.cpp:250:23:250:25 | m27 |  |
+| map.cpp:243:44:243:46 | call to map | map.cpp:251:7:251:9 | m27 |  |
+| map.cpp:243:44:243:46 | call to map | map.cpp:252:1:252:1 | m27 |  |
 | map.cpp:244:7:244:9 | m26 | map.cpp:244:11:244:21 | call to try_emplace | TAINT |
 | map.cpp:244:7:244:9 | ref arg m26 | map.cpp:245:7:245:9 | m26 |  |
 | map.cpp:244:7:244:9 | ref arg m26 | map.cpp:246:7:246:9 | m26 |  |
@@ -2661,47 +2593,47 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:250:43:250:48 | call to source | map.cpp:250:7:250:9 | ref arg m27 | TAINT |
 | map.cpp:250:43:250:48 | call to source | map.cpp:250:11:250:21 | call to try_emplace | TAINT |
 | map.cpp:251:7:251:9 | m27 | map.cpp:251:7:251:9 | call to map |  |
-| map.cpp:257:37:257:38 | call to unordered_map | map.cpp:259:7:259:8 | m1 |  |
-| map.cpp:257:37:257:38 | call to unordered_map | map.cpp:265:7:265:8 | m1 |  |
-| map.cpp:257:37:257:38 | call to unordered_map | map.cpp:271:7:271:8 | m1 |  |
-| map.cpp:257:37:257:38 | call to unordered_map | map.cpp:277:7:277:8 | m1 |  |
-| map.cpp:257:37:257:38 | call to unordered_map | map.cpp:298:12:298:13 | m1 |  |
-| map.cpp:257:37:257:38 | call to unordered_map | map.cpp:298:30:298:31 | m1 |  |
-| map.cpp:257:37:257:38 | call to unordered_map | map.cpp:438:1:438:1 | m1 |  |
-| map.cpp:257:41:257:42 | call to unordered_map | map.cpp:260:7:260:8 | m2 |  |
-| map.cpp:257:41:257:42 | call to unordered_map | map.cpp:266:7:266:8 | m2 |  |
-| map.cpp:257:41:257:42 | call to unordered_map | map.cpp:272:7:272:8 | m2 |  |
-| map.cpp:257:41:257:42 | call to unordered_map | map.cpp:278:7:278:8 | m2 |  |
-| map.cpp:257:41:257:42 | call to unordered_map | map.cpp:285:40:285:41 | m2 |  |
-| map.cpp:257:41:257:42 | call to unordered_map | map.cpp:286:42:286:43 | m2 |  |
-| map.cpp:257:41:257:42 | call to unordered_map | map.cpp:288:7:288:8 | m2 |  |
-| map.cpp:257:41:257:42 | call to unordered_map | map.cpp:304:12:304:13 | m2 |  |
-| map.cpp:257:41:257:42 | call to unordered_map | map.cpp:304:30:304:31 | m2 |  |
-| map.cpp:257:41:257:42 | call to unordered_map | map.cpp:438:1:438:1 | m2 |  |
-| map.cpp:257:45:257:46 | call to unordered_map | map.cpp:261:7:261:8 | m3 |  |
-| map.cpp:257:45:257:46 | call to unordered_map | map.cpp:267:7:267:8 | m3 |  |
-| map.cpp:257:45:257:46 | call to unordered_map | map.cpp:273:7:273:8 | m3 |  |
-| map.cpp:257:45:257:46 | call to unordered_map | map.cpp:279:7:279:8 | m3 |  |
-| map.cpp:257:45:257:46 | call to unordered_map | map.cpp:310:12:310:13 | m3 |  |
-| map.cpp:257:45:257:46 | call to unordered_map | map.cpp:310:30:310:31 | m3 |  |
-| map.cpp:257:45:257:46 | call to unordered_map | map.cpp:438:1:438:1 | m3 |  |
-| map.cpp:257:49:257:50 | call to unordered_map | map.cpp:262:7:262:8 | m4 |  |
-| map.cpp:257:49:257:50 | call to unordered_map | map.cpp:262:17:262:18 | m4 |  |
-| map.cpp:257:49:257:50 | call to unordered_map | map.cpp:268:7:268:8 | m4 |  |
-| map.cpp:257:49:257:50 | call to unordered_map | map.cpp:274:7:274:8 | m4 |  |
-| map.cpp:257:49:257:50 | call to unordered_map | map.cpp:280:7:280:8 | m4 |  |
-| map.cpp:257:49:257:50 | call to unordered_map | map.cpp:438:1:438:1 | m4 |  |
-| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:263:7:263:8 | m5 |  |
-| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:269:7:269:8 | m5 |  |
-| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:275:7:275:8 | m5 |  |
-| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:281:7:281:8 | m5 |  |
-| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:438:1:438:1 | m5 |  |
-| map.cpp:257:57:257:58 | call to unordered_map | map.cpp:264:7:264:8 | m6 |  |
-| map.cpp:257:57:257:58 | call to unordered_map | map.cpp:264:27:264:28 | m6 |  |
-| map.cpp:257:57:257:58 | call to unordered_map | map.cpp:270:7:270:8 | m6 |  |
-| map.cpp:257:57:257:58 | call to unordered_map | map.cpp:276:7:276:8 | m6 |  |
-| map.cpp:257:57:257:58 | call to unordered_map | map.cpp:282:7:282:8 | m6 |  |
-| map.cpp:257:57:257:58 | call to unordered_map | map.cpp:438:1:438:1 | m6 |  |
+| map.cpp:257:49:257:50 | call to unordered_map | map.cpp:259:7:259:8 | m1 |  |
+| map.cpp:257:49:257:50 | call to unordered_map | map.cpp:265:7:265:8 | m1 |  |
+| map.cpp:257:49:257:50 | call to unordered_map | map.cpp:271:7:271:8 | m1 |  |
+| map.cpp:257:49:257:50 | call to unordered_map | map.cpp:277:7:277:8 | m1 |  |
+| map.cpp:257:49:257:50 | call to unordered_map | map.cpp:298:12:298:13 | m1 |  |
+| map.cpp:257:49:257:50 | call to unordered_map | map.cpp:298:30:298:31 | m1 |  |
+| map.cpp:257:49:257:50 | call to unordered_map | map.cpp:438:1:438:1 | m1 |  |
+| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:260:7:260:8 | m2 |  |
+| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:266:7:266:8 | m2 |  |
+| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:272:7:272:8 | m2 |  |
+| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:278:7:278:8 | m2 |  |
+| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:285:52:285:53 | m2 |  |
+| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:286:54:286:55 | m2 |  |
+| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:288:7:288:8 | m2 |  |
+| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:304:12:304:13 | m2 |  |
+| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:304:30:304:31 | m2 |  |
+| map.cpp:257:53:257:54 | call to unordered_map | map.cpp:438:1:438:1 | m2 |  |
+| map.cpp:257:57:257:58 | call to unordered_map | map.cpp:261:7:261:8 | m3 |  |
+| map.cpp:257:57:257:58 | call to unordered_map | map.cpp:267:7:267:8 | m3 |  |
+| map.cpp:257:57:257:58 | call to unordered_map | map.cpp:273:7:273:8 | m3 |  |
+| map.cpp:257:57:257:58 | call to unordered_map | map.cpp:279:7:279:8 | m3 |  |
+| map.cpp:257:57:257:58 | call to unordered_map | map.cpp:310:12:310:13 | m3 |  |
+| map.cpp:257:57:257:58 | call to unordered_map | map.cpp:310:30:310:31 | m3 |  |
+| map.cpp:257:57:257:58 | call to unordered_map | map.cpp:438:1:438:1 | m3 |  |
+| map.cpp:257:61:257:62 | call to unordered_map | map.cpp:262:7:262:8 | m4 |  |
+| map.cpp:257:61:257:62 | call to unordered_map | map.cpp:262:17:262:18 | m4 |  |
+| map.cpp:257:61:257:62 | call to unordered_map | map.cpp:268:7:268:8 | m4 |  |
+| map.cpp:257:61:257:62 | call to unordered_map | map.cpp:274:7:274:8 | m4 |  |
+| map.cpp:257:61:257:62 | call to unordered_map | map.cpp:280:7:280:8 | m4 |  |
+| map.cpp:257:61:257:62 | call to unordered_map | map.cpp:438:1:438:1 | m4 |  |
+| map.cpp:257:65:257:66 | call to unordered_map | map.cpp:263:7:263:8 | m5 |  |
+| map.cpp:257:65:257:66 | call to unordered_map | map.cpp:269:7:269:8 | m5 |  |
+| map.cpp:257:65:257:66 | call to unordered_map | map.cpp:275:7:275:8 | m5 |  |
+| map.cpp:257:65:257:66 | call to unordered_map | map.cpp:281:7:281:8 | m5 |  |
+| map.cpp:257:65:257:66 | call to unordered_map | map.cpp:438:1:438:1 | m5 |  |
+| map.cpp:257:69:257:70 | call to unordered_map | map.cpp:264:7:264:8 | m6 |  |
+| map.cpp:257:69:257:70 | call to unordered_map | map.cpp:264:27:264:28 | m6 |  |
+| map.cpp:257:69:257:70 | call to unordered_map | map.cpp:270:7:270:8 | m6 |  |
+| map.cpp:257:69:257:70 | call to unordered_map | map.cpp:276:7:276:8 | m6 |  |
+| map.cpp:257:69:257:70 | call to unordered_map | map.cpp:282:7:282:8 | m6 |  |
+| map.cpp:257:69:257:70 | call to unordered_map | map.cpp:438:1:438:1 | m6 |  |
 | map.cpp:259:7:259:8 | ref arg m1 | map.cpp:265:7:265:8 | m1 |  |
 | map.cpp:259:7:259:8 | ref arg m1 | map.cpp:271:7:271:8 | m1 |  |
 | map.cpp:259:7:259:8 | ref arg m1 | map.cpp:277:7:277:8 | m1 |  |
@@ -2715,8 +2647,8 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:260:7:260:8 | ref arg m2 | map.cpp:266:7:266:8 | m2 |  |
 | map.cpp:260:7:260:8 | ref arg m2 | map.cpp:272:7:272:8 | m2 |  |
 | map.cpp:260:7:260:8 | ref arg m2 | map.cpp:278:7:278:8 | m2 |  |
-| map.cpp:260:7:260:8 | ref arg m2 | map.cpp:285:40:285:41 | m2 |  |
-| map.cpp:260:7:260:8 | ref arg m2 | map.cpp:286:42:286:43 | m2 |  |
+| map.cpp:260:7:260:8 | ref arg m2 | map.cpp:285:52:285:53 | m2 |  |
+| map.cpp:260:7:260:8 | ref arg m2 | map.cpp:286:54:286:55 | m2 |  |
 | map.cpp:260:7:260:8 | ref arg m2 | map.cpp:288:7:288:8 | m2 |  |
 | map.cpp:260:7:260:8 | ref arg m2 | map.cpp:304:12:304:13 | m2 |  |
 | map.cpp:260:7:260:8 | ref arg m2 | map.cpp:304:30:304:31 | m2 |  |
@@ -2746,10 +2678,10 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:262:17:262:18 | ref arg m4 | map.cpp:280:7:280:8 | m4 |  |
 | map.cpp:262:17:262:18 | ref arg m4 | map.cpp:438:1:438:1 | m4 |  |
 | map.cpp:262:20:262:24 | call to begin | map.cpp:262:17:262:26 | call to iterator | TAINT |
-| map.cpp:262:29:262:70 | call to pair | map.cpp:262:7:262:8 | ref arg m4 | TAINT |
-| map.cpp:262:29:262:70 | call to pair | map.cpp:262:10:262:15 | call to insert | TAINT |
-| map.cpp:262:29:262:70 | call to pair | map.cpp:262:29:262:70 | call to pair | TAINT |
-| map.cpp:262:62:262:67 | call to source | map.cpp:262:29:262:70 | call to pair | TAINT |
+| map.cpp:262:29:262:82 | call to pair | map.cpp:262:7:262:8 | ref arg m4 | TAINT |
+| map.cpp:262:29:262:82 | call to pair | map.cpp:262:10:262:15 | call to insert | TAINT |
+| map.cpp:262:29:262:82 | call to pair | map.cpp:262:29:262:82 | call to pair | TAINT |
+| map.cpp:262:74:262:79 | call to source | map.cpp:262:29:262:82 | call to pair | TAINT |
 | map.cpp:263:7:263:8 | ref arg m5 | map.cpp:269:7:269:8 | m5 |  |
 | map.cpp:263:7:263:8 | ref arg m5 | map.cpp:275:7:275:8 | m5 |  |
 | map.cpp:263:7:263:8 | ref arg m5 | map.cpp:281:7:281:8 | m5 |  |
@@ -2783,8 +2715,8 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:271:7:271:8 | ref arg m1 | map.cpp:438:1:438:1 | m1 |  |
 | map.cpp:272:7:272:8 | m2 | map.cpp:272:10:272:13 | call to find | TAINT |
 | map.cpp:272:7:272:8 | ref arg m2 | map.cpp:278:7:278:8 | m2 |  |
-| map.cpp:272:7:272:8 | ref arg m2 | map.cpp:285:40:285:41 | m2 |  |
-| map.cpp:272:7:272:8 | ref arg m2 | map.cpp:286:42:286:43 | m2 |  |
+| map.cpp:272:7:272:8 | ref arg m2 | map.cpp:285:52:285:53 | m2 |  |
+| map.cpp:272:7:272:8 | ref arg m2 | map.cpp:286:54:286:55 | m2 |  |
 | map.cpp:272:7:272:8 | ref arg m2 | map.cpp:288:7:288:8 | m2 |  |
 | map.cpp:272:7:272:8 | ref arg m2 | map.cpp:304:12:304:13 | m2 |  |
 | map.cpp:272:7:272:8 | ref arg m2 | map.cpp:304:30:304:31 | m2 |  |
@@ -2808,8 +2740,8 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:277:7:277:8 | ref arg m1 | map.cpp:298:30:298:31 | m1 |  |
 | map.cpp:277:7:277:8 | ref arg m1 | map.cpp:438:1:438:1 | m1 |  |
 | map.cpp:278:7:278:8 | m2 | map.cpp:278:10:278:13 | call to find | TAINT |
-| map.cpp:278:7:278:8 | ref arg m2 | map.cpp:285:40:285:41 | m2 |  |
-| map.cpp:278:7:278:8 | ref arg m2 | map.cpp:286:42:286:43 | m2 |  |
+| map.cpp:278:7:278:8 | ref arg m2 | map.cpp:285:52:285:53 | m2 |  |
+| map.cpp:278:7:278:8 | ref arg m2 | map.cpp:286:54:286:55 | m2 |  |
 | map.cpp:278:7:278:8 | ref arg m2 | map.cpp:288:7:288:8 | m2 |  |
 | map.cpp:278:7:278:8 | ref arg m2 | map.cpp:304:12:304:13 | m2 |  |
 | map.cpp:278:7:278:8 | ref arg m2 | map.cpp:304:30:304:31 | m2 |  |
@@ -2824,18 +2756,18 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:281:7:281:8 | ref arg m5 | map.cpp:438:1:438:1 | m5 |  |
 | map.cpp:282:7:282:8 | m6 | map.cpp:282:10:282:13 | call to find | TAINT |
 | map.cpp:282:7:282:8 | ref arg m6 | map.cpp:438:1:438:1 | m6 |  |
-| map.cpp:285:40:285:41 | m2 | map.cpp:285:40:285:42 | call to unordered_map |  |
-| map.cpp:285:40:285:42 | call to unordered_map | map.cpp:289:7:289:8 | m7 |  |
-| map.cpp:285:40:285:42 | call to unordered_map | map.cpp:292:7:292:8 | m7 |  |
-| map.cpp:285:40:285:42 | call to unordered_map | map.cpp:438:1:438:1 | m7 |  |
-| map.cpp:286:41:286:43 | call to unordered_map | map.cpp:290:7:290:8 | m8 |  |
-| map.cpp:286:41:286:43 | call to unordered_map | map.cpp:293:7:293:8 | m8 |  |
-| map.cpp:286:41:286:43 | call to unordered_map | map.cpp:438:1:438:1 | m8 |  |
-| map.cpp:286:42:286:43 | m2 | map.cpp:286:41:286:43 | call to unordered_map |  |
-| map.cpp:287:37:287:38 | call to unordered_map | map.cpp:288:2:288:3 | m9 |  |
-| map.cpp:287:37:287:38 | call to unordered_map | map.cpp:291:7:291:8 | m9 |  |
-| map.cpp:287:37:287:38 | call to unordered_map | map.cpp:294:7:294:8 | m9 |  |
-| map.cpp:287:37:287:38 | call to unordered_map | map.cpp:438:1:438:1 | m9 |  |
+| map.cpp:285:52:285:53 | m2 | map.cpp:285:52:285:54 | call to unordered_map |  |
+| map.cpp:285:52:285:54 | call to unordered_map | map.cpp:289:7:289:8 | m7 |  |
+| map.cpp:285:52:285:54 | call to unordered_map | map.cpp:292:7:292:8 | m7 |  |
+| map.cpp:285:52:285:54 | call to unordered_map | map.cpp:438:1:438:1 | m7 |  |
+| map.cpp:286:53:286:55 | call to unordered_map | map.cpp:290:7:290:8 | m8 |  |
+| map.cpp:286:53:286:55 | call to unordered_map | map.cpp:293:7:293:8 | m8 |  |
+| map.cpp:286:53:286:55 | call to unordered_map | map.cpp:438:1:438:1 | m8 |  |
+| map.cpp:286:54:286:55 | m2 | map.cpp:286:53:286:55 | call to unordered_map |  |
+| map.cpp:287:49:287:50 | call to unordered_map | map.cpp:288:2:288:3 | m9 |  |
+| map.cpp:287:49:287:50 | call to unordered_map | map.cpp:291:7:291:8 | m9 |  |
+| map.cpp:287:49:287:50 | call to unordered_map | map.cpp:294:7:294:8 | m9 |  |
+| map.cpp:287:49:287:50 | call to unordered_map | map.cpp:438:1:438:1 | m9 |  |
 | map.cpp:288:2:288:3 | ref arg m9 | map.cpp:291:7:291:8 | m9 |  |
 | map.cpp:288:2:288:3 | ref arg m9 | map.cpp:294:7:294:8 | m9 |  |
 | map.cpp:288:2:288:3 | ref arg m9 | map.cpp:438:1:438:1 | m9 |  |
@@ -2868,7 +2800,6 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:298:40:298:41 | ref arg i1 | map.cpp:300:9:300:10 | i1 |  |
 | map.cpp:298:40:298:41 | ref arg i1 | map.cpp:301:8:301:9 | i1 |  |
 | map.cpp:298:40:298:41 | ref arg i1 | map.cpp:302:8:302:9 | i1 |  |
-| map.cpp:300:8:300:8 | call to operator* | map.cpp:300:8:300:10 | call to pair | TAINT |
 | map.cpp:300:9:300:10 | i1 | map.cpp:300:8:300:8 | call to operator* | TAINT |
 | map.cpp:300:9:300:10 | ref arg i1 | map.cpp:298:24:298:25 | i1 |  |
 | map.cpp:300:9:300:10 | ref arg i1 | map.cpp:298:40:298:41 | i1 |  |
@@ -2905,7 +2836,6 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:304:40:304:41 | ref arg i2 | map.cpp:306:9:306:10 | i2 |  |
 | map.cpp:304:40:304:41 | ref arg i2 | map.cpp:307:8:307:9 | i2 |  |
 | map.cpp:304:40:304:41 | ref arg i2 | map.cpp:308:8:308:9 | i2 |  |
-| map.cpp:306:8:306:8 | call to operator* | map.cpp:306:8:306:10 | call to pair | TAINT |
 | map.cpp:306:9:306:10 | i2 | map.cpp:306:8:306:8 | call to operator* | TAINT |
 | map.cpp:306:9:306:10 | ref arg i2 | map.cpp:304:24:304:25 | i2 |  |
 | map.cpp:306:9:306:10 | ref arg i2 | map.cpp:304:40:304:41 | i2 |  |
@@ -2942,7 +2872,6 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:310:40:310:41 | ref arg i3 | map.cpp:312:9:312:10 | i3 |  |
 | map.cpp:310:40:310:41 | ref arg i3 | map.cpp:313:8:313:9 | i3 |  |
 | map.cpp:310:40:310:41 | ref arg i3 | map.cpp:314:8:314:9 | i3 |  |
-| map.cpp:312:8:312:8 | call to operator* | map.cpp:312:8:312:10 | call to pair | TAINT |
 | map.cpp:312:9:312:10 | i3 | map.cpp:312:8:312:8 | call to operator* | TAINT |
 | map.cpp:312:9:312:10 | ref arg i3 | map.cpp:310:24:310:25 | i3 |  |
 | map.cpp:312:9:312:10 | ref arg i3 | map.cpp:310:40:310:41 | i3 |  |
@@ -2961,18 +2890,18 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:314:8:314:9 | ref arg i3 | map.cpp:312:9:312:10 | i3 |  |
 | map.cpp:314:8:314:9 | ref arg i3 | map.cpp:313:8:313:9 | i3 |  |
 | map.cpp:314:8:314:9 | ref arg i3 | map.cpp:314:8:314:9 | i3 |  |
-| map.cpp:318:37:318:39 | call to unordered_map | map.cpp:319:7:319:9 | m10 |  |
-| map.cpp:318:37:318:39 | call to unordered_map | map.cpp:323:7:323:9 | m10 |  |
-| map.cpp:318:37:318:39 | call to unordered_map | map.cpp:438:1:438:1 | m10 |  |
-| map.cpp:318:42:318:44 | call to unordered_map | map.cpp:320:7:320:9 | m11 |  |
-| map.cpp:318:42:318:44 | call to unordered_map | map.cpp:324:7:324:9 | m11 |  |
-| map.cpp:318:42:318:44 | call to unordered_map | map.cpp:438:1:438:1 | m11 |  |
-| map.cpp:318:47:318:49 | call to unordered_map | map.cpp:321:7:321:9 | m12 |  |
-| map.cpp:318:47:318:49 | call to unordered_map | map.cpp:325:7:325:9 | m12 |  |
-| map.cpp:318:47:318:49 | call to unordered_map | map.cpp:438:1:438:1 | m12 |  |
-| map.cpp:318:52:318:54 | call to unordered_map | map.cpp:322:7:322:9 | m13 |  |
-| map.cpp:318:52:318:54 | call to unordered_map | map.cpp:326:7:326:9 | m13 |  |
-| map.cpp:318:52:318:54 | call to unordered_map | map.cpp:438:1:438:1 | m13 |  |
+| map.cpp:318:49:318:51 | call to unordered_map | map.cpp:319:7:319:9 | m10 |  |
+| map.cpp:318:49:318:51 | call to unordered_map | map.cpp:323:7:323:9 | m10 |  |
+| map.cpp:318:49:318:51 | call to unordered_map | map.cpp:438:1:438:1 | m10 |  |
+| map.cpp:318:54:318:56 | call to unordered_map | map.cpp:320:7:320:9 | m11 |  |
+| map.cpp:318:54:318:56 | call to unordered_map | map.cpp:324:7:324:9 | m11 |  |
+| map.cpp:318:54:318:56 | call to unordered_map | map.cpp:438:1:438:1 | m11 |  |
+| map.cpp:318:59:318:61 | call to unordered_map | map.cpp:321:7:321:9 | m12 |  |
+| map.cpp:318:59:318:61 | call to unordered_map | map.cpp:325:7:325:9 | m12 |  |
+| map.cpp:318:59:318:61 | call to unordered_map | map.cpp:438:1:438:1 | m12 |  |
+| map.cpp:318:64:318:66 | call to unordered_map | map.cpp:322:7:322:9 | m13 |  |
+| map.cpp:318:64:318:66 | call to unordered_map | map.cpp:326:7:326:9 | m13 |  |
+| map.cpp:318:64:318:66 | call to unordered_map | map.cpp:438:1:438:1 | m13 |  |
 | map.cpp:319:7:319:9 | m10 | map.cpp:319:10:319:10 | call to operator[] | TAINT |
 | map.cpp:319:7:319:9 | ref arg m10 | map.cpp:323:7:323:9 | m10 |  |
 | map.cpp:319:7:319:9 | ref arg m10 | map.cpp:438:1:438:1 | m10 |  |
@@ -3005,14 +2934,14 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:325:7:325:9 | ref arg m12 | map.cpp:438:1:438:1 | m12 |  |
 | map.cpp:326:7:326:9 | m13 | map.cpp:326:10:326:10 | call to operator[] | TAINT |
 | map.cpp:326:7:326:9 | ref arg m13 | map.cpp:438:1:438:1 | m13 |  |
-| map.cpp:329:37:329:39 | call to unordered_map | map.cpp:330:2:330:4 | m14 |  |
-| map.cpp:329:37:329:39 | call to unordered_map | map.cpp:331:2:331:4 | m14 |  |
-| map.cpp:329:37:329:39 | call to unordered_map | map.cpp:332:2:332:4 | m14 |  |
-| map.cpp:329:37:329:39 | call to unordered_map | map.cpp:333:2:333:4 | m14 |  |
-| map.cpp:329:37:329:39 | call to unordered_map | map.cpp:334:7:334:9 | m14 |  |
-| map.cpp:329:37:329:39 | call to unordered_map | map.cpp:335:7:335:9 | m14 |  |
-| map.cpp:329:37:329:39 | call to unordered_map | map.cpp:336:7:336:9 | m14 |  |
-| map.cpp:329:37:329:39 | call to unordered_map | map.cpp:438:1:438:1 | m14 |  |
+| map.cpp:329:49:329:51 | call to unordered_map | map.cpp:330:2:330:4 | m14 |  |
+| map.cpp:329:49:329:51 | call to unordered_map | map.cpp:331:2:331:4 | m14 |  |
+| map.cpp:329:49:329:51 | call to unordered_map | map.cpp:332:2:332:4 | m14 |  |
+| map.cpp:329:49:329:51 | call to unordered_map | map.cpp:333:2:333:4 | m14 |  |
+| map.cpp:329:49:329:51 | call to unordered_map | map.cpp:334:7:334:9 | m14 |  |
+| map.cpp:329:49:329:51 | call to unordered_map | map.cpp:335:7:335:9 | m14 |  |
+| map.cpp:329:49:329:51 | call to unordered_map | map.cpp:336:7:336:9 | m14 |  |
+| map.cpp:329:49:329:51 | call to unordered_map | map.cpp:438:1:438:1 | m14 |  |
 | map.cpp:330:2:330:4 | ref arg m14 | map.cpp:331:2:331:4 | m14 |  |
 | map.cpp:330:2:330:4 | ref arg m14 | map.cpp:332:2:332:4 | m14 |  |
 | map.cpp:330:2:330:4 | ref arg m14 | map.cpp:333:2:333:4 | m14 |  |
@@ -3059,40 +2988,40 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:336:7:336:9 | m14 | map.cpp:336:11:336:21 | call to equal_range | TAINT |
 | map.cpp:336:7:336:9 | ref arg m14 | map.cpp:438:1:438:1 | m14 |  |
 | map.cpp:336:28:336:33 | second | map.cpp:336:7:336:33 | call to iterator |  |
-| map.cpp:339:37:339:39 | call to unordered_map | map.cpp:340:2:340:4 | m15 |  |
-| map.cpp:339:37:339:39 | call to unordered_map | map.cpp:342:7:342:9 | m15 |  |
-| map.cpp:339:37:339:39 | call to unordered_map | map.cpp:346:2:346:4 | m15 |  |
-| map.cpp:339:37:339:39 | call to unordered_map | map.cpp:348:7:348:9 | m15 |  |
-| map.cpp:339:37:339:39 | call to unordered_map | map.cpp:438:1:438:1 | m15 |  |
-| map.cpp:339:42:339:44 | call to unordered_map | map.cpp:343:7:343:9 | m16 |  |
-| map.cpp:339:42:339:44 | call to unordered_map | map.cpp:346:11:346:13 | m16 |  |
-| map.cpp:339:42:339:44 | call to unordered_map | map.cpp:349:7:349:9 | m16 |  |
-| map.cpp:339:42:339:44 | call to unordered_map | map.cpp:438:1:438:1 | m16 |  |
-| map.cpp:339:47:339:49 | call to unordered_map | map.cpp:344:7:344:9 | m17 |  |
-| map.cpp:339:47:339:49 | call to unordered_map | map.cpp:347:2:347:4 | m17 |  |
-| map.cpp:339:47:339:49 | call to unordered_map | map.cpp:350:7:350:9 | m17 |  |
-| map.cpp:339:47:339:49 | call to unordered_map | map.cpp:438:1:438:1 | m17 |  |
-| map.cpp:339:52:339:54 | call to unordered_map | map.cpp:341:2:341:4 | m18 |  |
-| map.cpp:339:52:339:54 | call to unordered_map | map.cpp:345:7:345:9 | m18 |  |
-| map.cpp:339:52:339:54 | call to unordered_map | map.cpp:347:11:347:13 | m18 |  |
-| map.cpp:339:52:339:54 | call to unordered_map | map.cpp:351:7:351:9 | m18 |  |
-| map.cpp:339:52:339:54 | call to unordered_map | map.cpp:438:1:438:1 | m18 |  |
+| map.cpp:339:49:339:51 | call to unordered_map | map.cpp:340:2:340:4 | m15 |  |
+| map.cpp:339:49:339:51 | call to unordered_map | map.cpp:342:7:342:9 | m15 |  |
+| map.cpp:339:49:339:51 | call to unordered_map | map.cpp:346:2:346:4 | m15 |  |
+| map.cpp:339:49:339:51 | call to unordered_map | map.cpp:348:7:348:9 | m15 |  |
+| map.cpp:339:49:339:51 | call to unordered_map | map.cpp:438:1:438:1 | m15 |  |
+| map.cpp:339:54:339:56 | call to unordered_map | map.cpp:343:7:343:9 | m16 |  |
+| map.cpp:339:54:339:56 | call to unordered_map | map.cpp:346:11:346:13 | m16 |  |
+| map.cpp:339:54:339:56 | call to unordered_map | map.cpp:349:7:349:9 | m16 |  |
+| map.cpp:339:54:339:56 | call to unordered_map | map.cpp:438:1:438:1 | m16 |  |
+| map.cpp:339:59:339:61 | call to unordered_map | map.cpp:344:7:344:9 | m17 |  |
+| map.cpp:339:59:339:61 | call to unordered_map | map.cpp:347:2:347:4 | m17 |  |
+| map.cpp:339:59:339:61 | call to unordered_map | map.cpp:350:7:350:9 | m17 |  |
+| map.cpp:339:59:339:61 | call to unordered_map | map.cpp:438:1:438:1 | m17 |  |
+| map.cpp:339:64:339:66 | call to unordered_map | map.cpp:341:2:341:4 | m18 |  |
+| map.cpp:339:64:339:66 | call to unordered_map | map.cpp:345:7:345:9 | m18 |  |
+| map.cpp:339:64:339:66 | call to unordered_map | map.cpp:347:11:347:13 | m18 |  |
+| map.cpp:339:64:339:66 | call to unordered_map | map.cpp:351:7:351:9 | m18 |  |
+| map.cpp:339:64:339:66 | call to unordered_map | map.cpp:438:1:438:1 | m18 |  |
 | map.cpp:340:2:340:4 | ref arg m15 | map.cpp:342:7:342:9 | m15 |  |
 | map.cpp:340:2:340:4 | ref arg m15 | map.cpp:346:2:346:4 | m15 |  |
 | map.cpp:340:2:340:4 | ref arg m15 | map.cpp:348:7:348:9 | m15 |  |
 | map.cpp:340:2:340:4 | ref arg m15 | map.cpp:438:1:438:1 | m15 |  |
-| map.cpp:340:13:340:57 | call to pair | map.cpp:340:2:340:4 | ref arg m15 | TAINT |
-| map.cpp:340:13:340:57 | call to pair | map.cpp:340:6:340:11 | call to insert | TAINT |
-| map.cpp:340:13:340:57 | call to pair | map.cpp:340:13:340:57 | call to pair | TAINT |
-| map.cpp:340:49:340:54 | call to source | map.cpp:340:13:340:57 | call to pair | TAINT |
+| map.cpp:340:13:340:69 | call to pair | map.cpp:340:2:340:4 | ref arg m15 | TAINT |
+| map.cpp:340:13:340:69 | call to pair | map.cpp:340:6:340:11 | call to insert | TAINT |
+| map.cpp:340:13:340:69 | call to pair | map.cpp:340:13:340:69 | call to pair | TAINT |
+| map.cpp:340:61:340:66 | call to source | map.cpp:340:13:340:69 | call to pair | TAINT |
 | map.cpp:341:2:341:4 | ref arg m18 | map.cpp:345:7:345:9 | m18 |  |
 | map.cpp:341:2:341:4 | ref arg m18 | map.cpp:347:11:347:13 | m18 |  |
 | map.cpp:341:2:341:4 | ref arg m18 | map.cpp:351:7:351:9 | m18 |  |
 | map.cpp:341:2:341:4 | ref arg m18 | map.cpp:438:1:438:1 | m18 |  |
-| map.cpp:341:13:341:57 | call to pair | map.cpp:341:2:341:4 | ref arg m18 | TAINT |
-| map.cpp:341:13:341:57 | call to pair | map.cpp:341:6:341:11 | call to insert | TAINT |
-| map.cpp:341:13:341:57 | call to pair | map.cpp:341:13:341:57 | call to pair | TAINT |
-| map.cpp:341:49:341:54 | call to source | map.cpp:341:13:341:57 | call to pair | TAINT |
+| map.cpp:341:13:341:69 | call to pair | map.cpp:341:2:341:4 | ref arg m18 | TAINT |
+| map.cpp:341:13:341:69 | call to pair | map.cpp:341:6:341:11 | call to insert | TAINT |
+| map.cpp:341:13:341:69 | call to pair | map.cpp:341:13:341:69 | call to pair | TAINT |
+| map.cpp:341:61:341:66 | call to source | map.cpp:341:13:341:69 | call to pair | TAINT |
 | map.cpp:342:7:342:9 | m15 | map.cpp:342:7:342:9 | call to unordered_map |  |
 | map.cpp:343:7:343:9 | m16 | map.cpp:343:7:343:9 | call to unordered_map |  |
 | map.cpp:344:7:344:9 | m17 | map.cpp:344:7:344:9 | call to unordered_map |  |
@@ -3109,58 +3038,58 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:349:7:349:9 | m16 | map.cpp:349:7:349:9 | call to unordered_map |  |
 | map.cpp:350:7:350:9 | m17 | map.cpp:350:7:350:9 | call to unordered_map |  |
 | map.cpp:351:7:351:9 | m18 | map.cpp:351:7:351:9 | call to unordered_map |  |
-| map.cpp:354:37:354:39 | call to unordered_map | map.cpp:355:2:355:4 | m19 |  |
-| map.cpp:354:37:354:39 | call to unordered_map | map.cpp:359:7:359:9 | m19 |  |
-| map.cpp:354:37:354:39 | call to unordered_map | map.cpp:363:2:363:4 | m19 |  |
-| map.cpp:354:37:354:39 | call to unordered_map | map.cpp:365:7:365:9 | m19 |  |
-| map.cpp:354:37:354:39 | call to unordered_map | map.cpp:438:1:438:1 | m19 |  |
-| map.cpp:354:42:354:44 | call to unordered_map | map.cpp:356:2:356:4 | m20 |  |
-| map.cpp:354:42:354:44 | call to unordered_map | map.cpp:360:7:360:9 | m20 |  |
-| map.cpp:354:42:354:44 | call to unordered_map | map.cpp:363:12:363:14 | m20 |  |
-| map.cpp:354:42:354:44 | call to unordered_map | map.cpp:366:7:366:9 | m20 |  |
-| map.cpp:354:42:354:44 | call to unordered_map | map.cpp:438:1:438:1 | m20 |  |
-| map.cpp:354:47:354:49 | call to unordered_map | map.cpp:357:2:357:4 | m21 |  |
-| map.cpp:354:47:354:49 | call to unordered_map | map.cpp:361:7:361:9 | m21 |  |
-| map.cpp:354:47:354:49 | call to unordered_map | map.cpp:364:2:364:4 | m21 |  |
-| map.cpp:354:47:354:49 | call to unordered_map | map.cpp:367:7:367:9 | m21 |  |
-| map.cpp:354:47:354:49 | call to unordered_map | map.cpp:438:1:438:1 | m21 |  |
-| map.cpp:354:52:354:54 | call to unordered_map | map.cpp:358:2:358:4 | m22 |  |
-| map.cpp:354:52:354:54 | call to unordered_map | map.cpp:362:7:362:9 | m22 |  |
-| map.cpp:354:52:354:54 | call to unordered_map | map.cpp:364:12:364:14 | m22 |  |
-| map.cpp:354:52:354:54 | call to unordered_map | map.cpp:368:7:368:9 | m22 |  |
-| map.cpp:354:52:354:54 | call to unordered_map | map.cpp:438:1:438:1 | m22 |  |
+| map.cpp:354:49:354:51 | call to unordered_map | map.cpp:355:2:355:4 | m19 |  |
+| map.cpp:354:49:354:51 | call to unordered_map | map.cpp:359:7:359:9 | m19 |  |
+| map.cpp:354:49:354:51 | call to unordered_map | map.cpp:363:2:363:4 | m19 |  |
+| map.cpp:354:49:354:51 | call to unordered_map | map.cpp:365:7:365:9 | m19 |  |
+| map.cpp:354:49:354:51 | call to unordered_map | map.cpp:438:1:438:1 | m19 |  |
+| map.cpp:354:54:354:56 | call to unordered_map | map.cpp:356:2:356:4 | m20 |  |
+| map.cpp:354:54:354:56 | call to unordered_map | map.cpp:360:7:360:9 | m20 |  |
+| map.cpp:354:54:354:56 | call to unordered_map | map.cpp:363:12:363:14 | m20 |  |
+| map.cpp:354:54:354:56 | call to unordered_map | map.cpp:366:7:366:9 | m20 |  |
+| map.cpp:354:54:354:56 | call to unordered_map | map.cpp:438:1:438:1 | m20 |  |
+| map.cpp:354:59:354:61 | call to unordered_map | map.cpp:357:2:357:4 | m21 |  |
+| map.cpp:354:59:354:61 | call to unordered_map | map.cpp:361:7:361:9 | m21 |  |
+| map.cpp:354:59:354:61 | call to unordered_map | map.cpp:364:2:364:4 | m21 |  |
+| map.cpp:354:59:354:61 | call to unordered_map | map.cpp:367:7:367:9 | m21 |  |
+| map.cpp:354:59:354:61 | call to unordered_map | map.cpp:438:1:438:1 | m21 |  |
+| map.cpp:354:64:354:66 | call to unordered_map | map.cpp:358:2:358:4 | m22 |  |
+| map.cpp:354:64:354:66 | call to unordered_map | map.cpp:362:7:362:9 | m22 |  |
+| map.cpp:354:64:354:66 | call to unordered_map | map.cpp:364:12:364:14 | m22 |  |
+| map.cpp:354:64:354:66 | call to unordered_map | map.cpp:368:7:368:9 | m22 |  |
+| map.cpp:354:64:354:66 | call to unordered_map | map.cpp:438:1:438:1 | m22 |  |
 | map.cpp:355:2:355:4 | ref arg m19 | map.cpp:359:7:359:9 | m19 |  |
 | map.cpp:355:2:355:4 | ref arg m19 | map.cpp:363:2:363:4 | m19 |  |
 | map.cpp:355:2:355:4 | ref arg m19 | map.cpp:365:7:365:9 | m19 |  |
 | map.cpp:355:2:355:4 | ref arg m19 | map.cpp:438:1:438:1 | m19 |  |
-| map.cpp:355:13:355:57 | call to pair | map.cpp:355:2:355:4 | ref arg m19 | TAINT |
-| map.cpp:355:13:355:57 | call to pair | map.cpp:355:6:355:11 | call to insert | TAINT |
-| map.cpp:355:13:355:57 | call to pair | map.cpp:355:13:355:57 | call to pair | TAINT |
-| map.cpp:355:49:355:54 | call to source | map.cpp:355:13:355:57 | call to pair | TAINT |
+| map.cpp:355:13:355:69 | call to pair | map.cpp:355:2:355:4 | ref arg m19 | TAINT |
+| map.cpp:355:13:355:69 | call to pair | map.cpp:355:6:355:11 | call to insert | TAINT |
+| map.cpp:355:13:355:69 | call to pair | map.cpp:355:13:355:69 | call to pair | TAINT |
+| map.cpp:355:61:355:66 | call to source | map.cpp:355:13:355:69 | call to pair | TAINT |
 | map.cpp:356:2:356:4 | ref arg m20 | map.cpp:360:7:360:9 | m20 |  |
 | map.cpp:356:2:356:4 | ref arg m20 | map.cpp:363:12:363:14 | m20 |  |
 | map.cpp:356:2:356:4 | ref arg m20 | map.cpp:366:7:366:9 | m20 |  |
 | map.cpp:356:2:356:4 | ref arg m20 | map.cpp:438:1:438:1 | m20 |  |
-| map.cpp:356:13:356:51 | call to pair | map.cpp:356:2:356:4 | ref arg m20 | TAINT |
-| map.cpp:356:13:356:51 | call to pair | map.cpp:356:6:356:11 | call to insert | TAINT |
-| map.cpp:356:13:356:51 | call to pair | map.cpp:356:13:356:51 | call to pair | TAINT |
-| map.cpp:356:46:356:50 | def | map.cpp:356:13:356:51 | call to pair | TAINT |
+| map.cpp:356:13:356:63 | call to pair | map.cpp:356:2:356:4 | ref arg m20 | TAINT |
+| map.cpp:356:13:356:63 | call to pair | map.cpp:356:6:356:11 | call to insert | TAINT |
+| map.cpp:356:13:356:63 | call to pair | map.cpp:356:13:356:63 | call to pair | TAINT |
+| map.cpp:356:58:356:62 | def | map.cpp:356:13:356:63 | call to pair | TAINT |
 | map.cpp:357:2:357:4 | ref arg m21 | map.cpp:361:7:361:9 | m21 |  |
 | map.cpp:357:2:357:4 | ref arg m21 | map.cpp:364:2:364:4 | m21 |  |
 | map.cpp:357:2:357:4 | ref arg m21 | map.cpp:367:7:367:9 | m21 |  |
 | map.cpp:357:2:357:4 | ref arg m21 | map.cpp:438:1:438:1 | m21 |  |
-| map.cpp:357:13:357:51 | call to pair | map.cpp:357:2:357:4 | ref arg m21 | TAINT |
-| map.cpp:357:13:357:51 | call to pair | map.cpp:357:6:357:11 | call to insert | TAINT |
-| map.cpp:357:13:357:51 | call to pair | map.cpp:357:13:357:51 | call to pair | TAINT |
-| map.cpp:357:46:357:50 | def | map.cpp:357:13:357:51 | call to pair | TAINT |
+| map.cpp:357:13:357:63 | call to pair | map.cpp:357:2:357:4 | ref arg m21 | TAINT |
+| map.cpp:357:13:357:63 | call to pair | map.cpp:357:6:357:11 | call to insert | TAINT |
+| map.cpp:357:13:357:63 | call to pair | map.cpp:357:13:357:63 | call to pair | TAINT |
+| map.cpp:357:58:357:62 | def | map.cpp:357:13:357:63 | call to pair | TAINT |
 | map.cpp:358:2:358:4 | ref arg m22 | map.cpp:362:7:362:9 | m22 |  |
 | map.cpp:358:2:358:4 | ref arg m22 | map.cpp:364:12:364:14 | m22 |  |
 | map.cpp:358:2:358:4 | ref arg m22 | map.cpp:368:7:368:9 | m22 |  |
 | map.cpp:358:2:358:4 | ref arg m22 | map.cpp:438:1:438:1 | m22 |  |
-| map.cpp:358:13:358:57 | call to pair | map.cpp:358:2:358:4 | ref arg m22 | TAINT |
-| map.cpp:358:13:358:57 | call to pair | map.cpp:358:6:358:11 | call to insert | TAINT |
-| map.cpp:358:13:358:57 | call to pair | map.cpp:358:13:358:57 | call to pair | TAINT |
-| map.cpp:358:49:358:54 | call to source | map.cpp:358:13:358:57 | call to pair | TAINT |
+| map.cpp:358:13:358:69 | call to pair | map.cpp:358:2:358:4 | ref arg m22 | TAINT |
+| map.cpp:358:13:358:69 | call to pair | map.cpp:358:6:358:11 | call to insert | TAINT |
+| map.cpp:358:13:358:69 | call to pair | map.cpp:358:13:358:69 | call to pair | TAINT |
+| map.cpp:358:61:358:66 | call to source | map.cpp:358:13:358:69 | call to pair | TAINT |
 | map.cpp:359:7:359:9 | m19 | map.cpp:359:7:359:9 | call to unordered_map |  |
 | map.cpp:360:7:360:9 | m20 | map.cpp:360:7:360:9 | call to unordered_map |  |
 | map.cpp:361:7:361:9 | m21 | map.cpp:361:7:361:9 | call to unordered_map |  |
@@ -3179,15 +3108,15 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:366:7:366:9 | m20 | map.cpp:366:7:366:9 | call to unordered_map |  |
 | map.cpp:367:7:367:9 | m21 | map.cpp:367:7:367:9 | call to unordered_map |  |
 | map.cpp:368:7:368:9 | m22 | map.cpp:368:7:368:9 | call to unordered_map |  |
-| map.cpp:371:37:371:39 | call to unordered_map | map.cpp:372:2:372:4 | m23 |  |
-| map.cpp:371:37:371:39 | call to unordered_map | map.cpp:373:2:373:4 | m23 |  |
-| map.cpp:371:37:371:39 | call to unordered_map | map.cpp:374:7:374:9 | m23 |  |
-| map.cpp:371:37:371:39 | call to unordered_map | map.cpp:375:7:375:9 | m23 |  |
-| map.cpp:371:37:371:39 | call to unordered_map | map.cpp:375:17:375:19 | m23 |  |
-| map.cpp:371:37:371:39 | call to unordered_map | map.cpp:376:7:376:9 | m23 |  |
-| map.cpp:371:37:371:39 | call to unordered_map | map.cpp:377:2:377:4 | m23 |  |
-| map.cpp:371:37:371:39 | call to unordered_map | map.cpp:378:7:378:9 | m23 |  |
-| map.cpp:371:37:371:39 | call to unordered_map | map.cpp:438:1:438:1 | m23 |  |
+| map.cpp:371:49:371:51 | call to unordered_map | map.cpp:372:2:372:4 | m23 |  |
+| map.cpp:371:49:371:51 | call to unordered_map | map.cpp:373:2:373:4 | m23 |  |
+| map.cpp:371:49:371:51 | call to unordered_map | map.cpp:374:7:374:9 | m23 |  |
+| map.cpp:371:49:371:51 | call to unordered_map | map.cpp:375:7:375:9 | m23 |  |
+| map.cpp:371:49:371:51 | call to unordered_map | map.cpp:375:17:375:19 | m23 |  |
+| map.cpp:371:49:371:51 | call to unordered_map | map.cpp:376:7:376:9 | m23 |  |
+| map.cpp:371:49:371:51 | call to unordered_map | map.cpp:377:2:377:4 | m23 |  |
+| map.cpp:371:49:371:51 | call to unordered_map | map.cpp:378:7:378:9 | m23 |  |
+| map.cpp:371:49:371:51 | call to unordered_map | map.cpp:438:1:438:1 | m23 |  |
 | map.cpp:372:2:372:4 | ref arg m23 | map.cpp:373:2:373:4 | m23 |  |
 | map.cpp:372:2:372:4 | ref arg m23 | map.cpp:374:7:374:9 | m23 |  |
 | map.cpp:372:2:372:4 | ref arg m23 | map.cpp:375:7:375:9 | m23 |  |
@@ -3196,10 +3125,10 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:372:2:372:4 | ref arg m23 | map.cpp:377:2:377:4 | m23 |  |
 | map.cpp:372:2:372:4 | ref arg m23 | map.cpp:378:7:378:9 | m23 |  |
 | map.cpp:372:2:372:4 | ref arg m23 | map.cpp:438:1:438:1 | m23 |  |
-| map.cpp:372:13:372:57 | call to pair | map.cpp:372:2:372:4 | ref arg m23 | TAINT |
-| map.cpp:372:13:372:57 | call to pair | map.cpp:372:6:372:11 | call to insert | TAINT |
-| map.cpp:372:13:372:57 | call to pair | map.cpp:372:13:372:57 | call to pair | TAINT |
-| map.cpp:372:49:372:54 | call to source | map.cpp:372:13:372:57 | call to pair | TAINT |
+| map.cpp:372:13:372:69 | call to pair | map.cpp:372:2:372:4 | ref arg m23 | TAINT |
+| map.cpp:372:13:372:69 | call to pair | map.cpp:372:6:372:11 | call to insert | TAINT |
+| map.cpp:372:13:372:69 | call to pair | map.cpp:372:13:372:69 | call to pair | TAINT |
+| map.cpp:372:61:372:66 | call to source | map.cpp:372:13:372:69 | call to pair | TAINT |
 | map.cpp:373:2:373:4 | ref arg m23 | map.cpp:374:7:374:9 | m23 |  |
 | map.cpp:373:2:373:4 | ref arg m23 | map.cpp:375:7:375:9 | m23 |  |
 | map.cpp:373:2:373:4 | ref arg m23 | map.cpp:375:17:375:19 | m23 |  |
@@ -3207,10 +3136,10 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:373:2:373:4 | ref arg m23 | map.cpp:377:2:377:4 | m23 |  |
 | map.cpp:373:2:373:4 | ref arg m23 | map.cpp:378:7:378:9 | m23 |  |
 | map.cpp:373:2:373:4 | ref arg m23 | map.cpp:438:1:438:1 | m23 |  |
-| map.cpp:373:13:373:57 | call to pair | map.cpp:373:2:373:4 | ref arg m23 | TAINT |
-| map.cpp:373:13:373:57 | call to pair | map.cpp:373:6:373:11 | call to insert | TAINT |
-| map.cpp:373:13:373:57 | call to pair | map.cpp:373:13:373:57 | call to pair | TAINT |
-| map.cpp:373:49:373:54 | call to source | map.cpp:373:13:373:57 | call to pair | TAINT |
+| map.cpp:373:13:373:69 | call to pair | map.cpp:373:2:373:4 | ref arg m23 | TAINT |
+| map.cpp:373:13:373:69 | call to pair | map.cpp:373:6:373:11 | call to insert | TAINT |
+| map.cpp:373:13:373:69 | call to pair | map.cpp:373:13:373:69 | call to pair | TAINT |
+| map.cpp:373:61:373:66 | call to source | map.cpp:373:13:373:69 | call to pair | TAINT |
 | map.cpp:374:7:374:9 | m23 | map.cpp:374:7:374:9 | call to unordered_map |  |
 | map.cpp:375:7:375:9 | m23 | map.cpp:375:11:375:15 | call to erase | TAINT |
 | map.cpp:375:7:375:9 | ref arg m23 | map.cpp:376:7:376:9 | m23 |  |
@@ -3227,18 +3156,18 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:377:2:377:4 | ref arg m23 | map.cpp:378:7:378:9 | m23 |  |
 | map.cpp:377:2:377:4 | ref arg m23 | map.cpp:438:1:438:1 | m23 |  |
 | map.cpp:378:7:378:9 | m23 | map.cpp:378:7:378:9 | call to unordered_map |  |
-| map.cpp:381:37:381:39 | call to unordered_map | map.cpp:382:7:382:9 | m24 |  |
-| map.cpp:381:37:381:39 | call to unordered_map | map.cpp:383:7:383:9 | m24 |  |
-| map.cpp:381:37:381:39 | call to unordered_map | map.cpp:384:7:384:9 | m24 |  |
-| map.cpp:381:37:381:39 | call to unordered_map | map.cpp:385:7:385:9 | m24 |  |
-| map.cpp:381:37:381:39 | call to unordered_map | map.cpp:438:1:438:1 | m24 |  |
-| map.cpp:381:42:381:44 | call to unordered_map | map.cpp:386:7:386:9 | m25 |  |
-| map.cpp:381:42:381:44 | call to unordered_map | map.cpp:386:24:386:26 | m25 |  |
-| map.cpp:381:42:381:44 | call to unordered_map | map.cpp:387:7:387:9 | m25 |  |
-| map.cpp:381:42:381:44 | call to unordered_map | map.cpp:388:7:388:9 | m25 |  |
-| map.cpp:381:42:381:44 | call to unordered_map | map.cpp:388:24:388:26 | m25 |  |
-| map.cpp:381:42:381:44 | call to unordered_map | map.cpp:389:7:389:9 | m25 |  |
-| map.cpp:381:42:381:44 | call to unordered_map | map.cpp:438:1:438:1 | m25 |  |
+| map.cpp:381:49:381:51 | call to unordered_map | map.cpp:382:7:382:9 | m24 |  |
+| map.cpp:381:49:381:51 | call to unordered_map | map.cpp:383:7:383:9 | m24 |  |
+| map.cpp:381:49:381:51 | call to unordered_map | map.cpp:384:7:384:9 | m24 |  |
+| map.cpp:381:49:381:51 | call to unordered_map | map.cpp:385:7:385:9 | m24 |  |
+| map.cpp:381:49:381:51 | call to unordered_map | map.cpp:438:1:438:1 | m24 |  |
+| map.cpp:381:54:381:56 | call to unordered_map | map.cpp:386:7:386:9 | m25 |  |
+| map.cpp:381:54:381:56 | call to unordered_map | map.cpp:386:24:386:26 | m25 |  |
+| map.cpp:381:54:381:56 | call to unordered_map | map.cpp:387:7:387:9 | m25 |  |
+| map.cpp:381:54:381:56 | call to unordered_map | map.cpp:388:7:388:9 | m25 |  |
+| map.cpp:381:54:381:56 | call to unordered_map | map.cpp:388:24:388:26 | m25 |  |
+| map.cpp:381:54:381:56 | call to unordered_map | map.cpp:389:7:389:9 | m25 |  |
+| map.cpp:381:54:381:56 | call to unordered_map | map.cpp:438:1:438:1 | m25 |  |
 | map.cpp:382:7:382:9 | m24 | map.cpp:382:11:382:17 | call to emplace | TAINT |
 | map.cpp:382:7:382:9 | ref arg m24 | map.cpp:383:7:383:9 | m24 |  |
 | map.cpp:382:7:382:9 | ref arg m24 | map.cpp:384:7:384:9 | m24 |  |
@@ -3283,27 +3212,27 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:388:44:388:49 | call to source | map.cpp:388:7:388:9 | ref arg m25 | TAINT |
 | map.cpp:388:44:388:49 | call to source | map.cpp:388:11:388:22 | call to emplace_hint | TAINT |
 | map.cpp:389:7:389:9 | m25 | map.cpp:389:7:389:9 | call to unordered_map |  |
-| map.cpp:392:37:392:39 | call to unordered_map | map.cpp:393:7:393:9 | m26 |  |
-| map.cpp:392:37:392:39 | call to unordered_map | map.cpp:394:7:394:9 | m26 |  |
-| map.cpp:392:37:392:39 | call to unordered_map | map.cpp:395:7:395:9 | m26 |  |
-| map.cpp:392:37:392:39 | call to unordered_map | map.cpp:396:7:396:9 | m26 |  |
-| map.cpp:392:37:392:39 | call to unordered_map | map.cpp:397:7:397:9 | m26 |  |
-| map.cpp:392:37:392:39 | call to unordered_map | map.cpp:398:7:398:9 | m26 |  |
-| map.cpp:392:37:392:39 | call to unordered_map | map.cpp:438:1:438:1 | m26 |  |
-| map.cpp:392:42:392:44 | call to unordered_map | map.cpp:399:7:399:9 | m27 |  |
-| map.cpp:392:42:392:44 | call to unordered_map | map.cpp:399:23:399:25 | m27 |  |
-| map.cpp:392:42:392:44 | call to unordered_map | map.cpp:400:7:400:9 | m27 |  |
-| map.cpp:392:42:392:44 | call to unordered_map | map.cpp:401:7:401:9 | m27 |  |
-| map.cpp:392:42:392:44 | call to unordered_map | map.cpp:401:23:401:25 | m27 |  |
-| map.cpp:392:42:392:44 | call to unordered_map | map.cpp:402:7:402:9 | m27 |  |
-| map.cpp:392:42:392:44 | call to unordered_map | map.cpp:438:1:438:1 | m27 |  |
-| map.cpp:392:47:392:49 | call to unordered_map | map.cpp:403:7:403:9 | m28 |  |
-| map.cpp:392:47:392:49 | call to unordered_map | map.cpp:403:23:403:25 | m28 |  |
-| map.cpp:392:47:392:49 | call to unordered_map | map.cpp:404:7:404:9 | m28 |  |
-| map.cpp:392:47:392:49 | call to unordered_map | map.cpp:405:7:405:9 | m28 |  |
-| map.cpp:392:47:392:49 | call to unordered_map | map.cpp:405:23:405:25 | m28 |  |
-| map.cpp:392:47:392:49 | call to unordered_map | map.cpp:406:7:406:9 | m28 |  |
-| map.cpp:392:47:392:49 | call to unordered_map | map.cpp:438:1:438:1 | m28 |  |
+| map.cpp:392:49:392:51 | call to unordered_map | map.cpp:393:7:393:9 | m26 |  |
+| map.cpp:392:49:392:51 | call to unordered_map | map.cpp:394:7:394:9 | m26 |  |
+| map.cpp:392:49:392:51 | call to unordered_map | map.cpp:395:7:395:9 | m26 |  |
+| map.cpp:392:49:392:51 | call to unordered_map | map.cpp:396:7:396:9 | m26 |  |
+| map.cpp:392:49:392:51 | call to unordered_map | map.cpp:397:7:397:9 | m26 |  |
+| map.cpp:392:49:392:51 | call to unordered_map | map.cpp:398:7:398:9 | m26 |  |
+| map.cpp:392:49:392:51 | call to unordered_map | map.cpp:438:1:438:1 | m26 |  |
+| map.cpp:392:54:392:56 | call to unordered_map | map.cpp:399:7:399:9 | m27 |  |
+| map.cpp:392:54:392:56 | call to unordered_map | map.cpp:399:23:399:25 | m27 |  |
+| map.cpp:392:54:392:56 | call to unordered_map | map.cpp:400:7:400:9 | m27 |  |
+| map.cpp:392:54:392:56 | call to unordered_map | map.cpp:401:7:401:9 | m27 |  |
+| map.cpp:392:54:392:56 | call to unordered_map | map.cpp:401:23:401:25 | m27 |  |
+| map.cpp:392:54:392:56 | call to unordered_map | map.cpp:402:7:402:9 | m27 |  |
+| map.cpp:392:54:392:56 | call to unordered_map | map.cpp:438:1:438:1 | m27 |  |
+| map.cpp:392:59:392:61 | call to unordered_map | map.cpp:403:7:403:9 | m28 |  |
+| map.cpp:392:59:392:61 | call to unordered_map | map.cpp:403:23:403:25 | m28 |  |
+| map.cpp:392:59:392:61 | call to unordered_map | map.cpp:404:7:404:9 | m28 |  |
+| map.cpp:392:59:392:61 | call to unordered_map | map.cpp:405:7:405:9 | m28 |  |
+| map.cpp:392:59:392:61 | call to unordered_map | map.cpp:405:23:405:25 | m28 |  |
+| map.cpp:392:59:392:61 | call to unordered_map | map.cpp:406:7:406:9 | m28 |  |
+| map.cpp:392:59:392:61 | call to unordered_map | map.cpp:438:1:438:1 | m28 |  |
 | map.cpp:393:7:393:9 | m26 | map.cpp:393:11:393:21 | call to try_emplace | TAINT |
 | map.cpp:393:7:393:9 | ref arg m26 | map.cpp:394:7:394:9 | m26 |  |
 | map.cpp:393:7:393:9 | ref arg m26 | map.cpp:395:7:395:9 | m26 |  |
@@ -3392,27 +3321,30 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:405:46:405:50 | def | map.cpp:405:7:405:9 | ref arg m28 | TAINT |
 | map.cpp:405:46:405:50 | def | map.cpp:405:11:405:21 | call to try_emplace | TAINT |
 | map.cpp:406:7:406:9 | m28 | map.cpp:406:7:406:9 | call to unordered_map |  |
-| map.cpp:409:50:409:52 | call to unordered_map | map.cpp:410:7:410:9 | m29 |  |
-| map.cpp:409:50:409:52 | call to unordered_map | map.cpp:411:7:411:9 | m29 |  |
-| map.cpp:409:50:409:52 | call to unordered_map | map.cpp:412:7:412:9 | m29 |  |
-| map.cpp:409:50:409:52 | call to unordered_map | map.cpp:438:1:438:1 | m29 |  |
-| map.cpp:409:55:409:57 | call to unordered_map | map.cpp:413:7:413:9 | m30 |  |
-| map.cpp:409:55:409:57 | call to unordered_map | map.cpp:414:7:414:9 | m30 |  |
-| map.cpp:409:55:409:57 | call to unordered_map | map.cpp:415:7:415:9 | m30 |  |
-| map.cpp:409:55:409:57 | call to unordered_map | map.cpp:438:1:438:1 | m30 |  |
-| map.cpp:409:60:409:62 | call to unordered_map | map.cpp:416:7:416:9 | m31 |  |
-| map.cpp:409:60:409:62 | call to unordered_map | map.cpp:417:7:417:9 | m31 |  |
-| map.cpp:409:60:409:62 | call to unordered_map | map.cpp:418:7:418:9 | m31 |  |
-| map.cpp:409:60:409:62 | call to unordered_map | map.cpp:438:1:438:1 | m31 |  |
-| map.cpp:409:65:409:67 | call to unordered_map | map.cpp:419:7:419:9 | m32 |  |
-| map.cpp:409:65:409:67 | call to unordered_map | map.cpp:420:7:420:9 | m32 |  |
-| map.cpp:409:65:409:67 | call to unordered_map | map.cpp:421:7:421:9 | m32 |  |
-| map.cpp:409:65:409:67 | call to unordered_map | map.cpp:438:1:438:1 | m32 |  |
+| map.cpp:409:56:409:58 | call to unordered_map | map.cpp:410:7:410:9 | m29 |  |
+| map.cpp:409:56:409:58 | call to unordered_map | map.cpp:411:7:411:9 | m29 |  |
+| map.cpp:409:56:409:58 | call to unordered_map | map.cpp:412:7:412:9 | m29 |  |
+| map.cpp:409:56:409:58 | call to unordered_map | map.cpp:438:1:438:1 | m29 |  |
+| map.cpp:409:61:409:63 | call to unordered_map | map.cpp:413:7:413:9 | m30 |  |
+| map.cpp:409:61:409:63 | call to unordered_map | map.cpp:414:7:414:9 | m30 |  |
+| map.cpp:409:61:409:63 | call to unordered_map | map.cpp:415:7:415:9 | m30 |  |
+| map.cpp:409:61:409:63 | call to unordered_map | map.cpp:438:1:438:1 | m30 |  |
+| map.cpp:409:66:409:68 | call to unordered_map | map.cpp:416:7:416:9 | m31 |  |
+| map.cpp:409:66:409:68 | call to unordered_map | map.cpp:417:7:417:9 | m31 |  |
+| map.cpp:409:66:409:68 | call to unordered_map | map.cpp:418:7:418:9 | m31 |  |
+| map.cpp:409:66:409:68 | call to unordered_map | map.cpp:438:1:438:1 | m31 |  |
+| map.cpp:409:71:409:73 | call to unordered_map | map.cpp:419:7:419:9 | m32 |  |
+| map.cpp:409:71:409:73 | call to unordered_map | map.cpp:420:7:420:9 | m32 |  |
+| map.cpp:409:71:409:73 | call to unordered_map | map.cpp:421:7:421:9 | m32 |  |
+| map.cpp:409:71:409:73 | call to unordered_map | map.cpp:438:1:438:1 | m32 |  |
+| map.cpp:409:105:409:105 | 0 | map.cpp:409:102:409:106 | call to pair | TAINT |
+| map.cpp:409:113:409:113 | x | map.cpp:409:142:409:142 | x |  |
+| map.cpp:409:113:409:113 | x | map.cpp:409:145:409:145 | x |  |
+| map.cpp:409:145:409:145 | x | map.cpp:409:142:409:146 | call to pair | TAINT |
 | map.cpp:410:7:410:9 | m29 | map.cpp:410:11:410:21 | call to try_emplace | TAINT |
 | map.cpp:410:7:410:9 | ref arg m29 | map.cpp:411:7:411:9 | m29 |  |
 | map.cpp:410:7:410:9 | ref arg m29 | map.cpp:412:7:412:9 | m29 |  |
 | map.cpp:410:7:410:9 | ref arg m29 | map.cpp:438:1:438:1 | m29 |  |
-| map.cpp:410:11:410:21 | call to try_emplace | map.cpp:410:7:410:34 | call to pair | TAINT |
 | map.cpp:410:30:410:30 | 1 | map.cpp:410:7:410:9 | ref arg m29 | TAINT |
 | map.cpp:410:30:410:30 | 1 | map.cpp:410:11:410:21 | call to try_emplace | TAINT |
 | map.cpp:410:33:410:33 | 2 | map.cpp:410:7:410:9 | ref arg m29 | TAINT |
@@ -3420,12 +3352,10 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:411:7:411:9 | m29 | map.cpp:411:7:411:9 | call to unordered_map |  |
 | map.cpp:412:7:412:9 | m29 | map.cpp:412:10:412:10 | call to operator[] | TAINT |
 | map.cpp:412:7:412:9 | ref arg m29 | map.cpp:438:1:438:1 | m29 |  |
-| map.cpp:412:10:412:10 | call to operator[] | map.cpp:412:7:412:16 | call to pair | TAINT |
 | map.cpp:413:7:413:9 | m30 | map.cpp:413:11:413:21 | call to try_emplace | TAINT |
 | map.cpp:413:7:413:9 | ref arg m30 | map.cpp:414:7:414:9 | m30 |  |
 | map.cpp:413:7:413:9 | ref arg m30 | map.cpp:415:7:415:9 | m30 |  |
 | map.cpp:413:7:413:9 | ref arg m30 | map.cpp:438:1:438:1 | m30 |  |
-| map.cpp:413:11:413:21 | call to try_emplace | map.cpp:413:7:413:37 | call to pair | TAINT |
 | map.cpp:413:33:413:33 | 1 | map.cpp:413:7:413:9 | ref arg m30 | TAINT |
 | map.cpp:413:33:413:33 | 1 | map.cpp:413:11:413:21 | call to try_emplace | TAINT |
 | map.cpp:413:36:413:36 | 2 | map.cpp:413:7:413:9 | ref arg m30 | TAINT |
@@ -3433,25 +3363,21 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:414:7:414:9 | m30 | map.cpp:414:7:414:9 | call to unordered_map |  |
 | map.cpp:415:7:415:9 | m30 | map.cpp:415:10:415:10 | call to operator[] | TAINT |
 | map.cpp:415:7:415:9 | ref arg m30 | map.cpp:438:1:438:1 | m30 |  |
-| map.cpp:415:10:415:10 | call to operator[] | map.cpp:415:7:415:16 | call to pair | TAINT |
 | map.cpp:416:7:416:9 | m31 | map.cpp:416:11:416:21 | call to try_emplace | TAINT |
 | map.cpp:416:7:416:9 | ref arg m31 | map.cpp:417:7:417:9 | m31 |  |
 | map.cpp:416:7:416:9 | ref arg m31 | map.cpp:418:7:418:9 | m31 |  |
 | map.cpp:416:7:416:9 | ref arg m31 | map.cpp:438:1:438:1 | m31 |  |
-| map.cpp:416:11:416:21 | call to try_emplace | map.cpp:416:7:416:41 | call to pair | TAINT |
 | map.cpp:416:30:416:35 | call to source | map.cpp:416:7:416:9 | ref arg m31 | TAINT |
 | map.cpp:416:30:416:35 | call to source | map.cpp:416:11:416:21 | call to try_emplace | TAINT |
-| map.cpp:416:40:416:40 | 2 | map.cpp:416:7:416:9 | ref arg m31 | TAINT |
-| map.cpp:416:40:416:40 | 2 | map.cpp:416:11:416:21 | call to try_emplace | TAINT |
+| map.cpp:416:41:416:41 | 2 | map.cpp:416:7:416:9 | ref arg m31 | TAINT |
+| map.cpp:416:41:416:41 | 2 | map.cpp:416:11:416:21 | call to try_emplace | TAINT |
 | map.cpp:417:7:417:9 | m31 | map.cpp:417:7:417:9 | call to unordered_map |  |
 | map.cpp:418:7:418:9 | m31 | map.cpp:418:10:418:10 | call to operator[] | TAINT |
 | map.cpp:418:7:418:9 | ref arg m31 | map.cpp:438:1:438:1 | m31 |  |
-| map.cpp:418:10:418:10 | call to operator[] | map.cpp:418:7:418:16 | call to pair | TAINT |
 | map.cpp:419:7:419:9 | m32 | map.cpp:419:11:419:21 | call to try_emplace | TAINT |
 | map.cpp:419:7:419:9 | ref arg m32 | map.cpp:420:7:420:9 | m32 |  |
 | map.cpp:419:7:419:9 | ref arg m32 | map.cpp:421:7:421:9 | m32 |  |
 | map.cpp:419:7:419:9 | ref arg m32 | map.cpp:438:1:438:1 | m32 |  |
-| map.cpp:419:11:419:21 | call to try_emplace | map.cpp:419:7:419:41 | call to pair | TAINT |
 | map.cpp:419:30:419:30 | 1 | map.cpp:419:7:419:9 | ref arg m32 | TAINT |
 | map.cpp:419:30:419:30 | 1 | map.cpp:419:11:419:21 | call to try_emplace | TAINT |
 | map.cpp:419:33:419:38 | call to source | map.cpp:419:7:419:9 | ref arg m32 | TAINT |
@@ -3459,10 +3385,9 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:420:7:420:9 | m32 | map.cpp:420:7:420:9 | call to unordered_map |  |
 | map.cpp:421:7:421:9 | m32 | map.cpp:421:10:421:10 | call to operator[] | TAINT |
 | map.cpp:421:7:421:9 | ref arg m32 | map.cpp:438:1:438:1 | m32 |  |
-| map.cpp:421:10:421:10 | call to operator[] | map.cpp:421:7:421:16 | call to pair | TAINT |
-| map.cpp:424:37:424:39 | call to unordered_map | map.cpp:425:7:425:9 | m33 |  |
-| map.cpp:424:37:424:39 | call to unordered_map | map.cpp:426:7:426:9 | m33 |  |
-| map.cpp:424:37:424:39 | call to unordered_map | map.cpp:438:1:438:1 | m33 |  |
+| map.cpp:424:49:424:51 | call to unordered_map | map.cpp:425:7:425:9 | m33 |  |
+| map.cpp:424:49:424:51 | call to unordered_map | map.cpp:426:7:426:9 | m33 |  |
+| map.cpp:424:49:424:51 | call to unordered_map | map.cpp:438:1:438:1 | m33 |  |
 | map.cpp:425:7:425:9 | m33 | map.cpp:425:11:425:17 | call to emplace | TAINT |
 | map.cpp:425:7:425:9 | ref arg m33 | map.cpp:426:7:426:9 | m33 |  |
 | map.cpp:425:7:425:9 | ref arg m33 | map.cpp:438:1:438:1 | m33 |  |
@@ -3470,18 +3395,18 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:425:29:425:33 | def | map.cpp:425:11:425:17 | call to emplace | TAINT |
 | map.cpp:425:36:425:40 | first | map.cpp:425:7:425:40 | call to iterator |  |
 | map.cpp:426:7:426:9 | m33 | map.cpp:426:7:426:9 | call to unordered_map |  |
-| map.cpp:428:37:428:39 | call to unordered_map | map.cpp:429:7:429:9 | m34 |  |
-| map.cpp:428:37:428:39 | call to unordered_map | map.cpp:430:7:430:9 | m34 |  |
-| map.cpp:428:37:428:39 | call to unordered_map | map.cpp:431:7:431:9 | m34 |  |
-| map.cpp:428:37:428:39 | call to unordered_map | map.cpp:432:7:432:9 | m34 |  |
-| map.cpp:428:37:428:39 | call to unordered_map | map.cpp:433:7:433:9 | m34 |  |
-| map.cpp:428:37:428:39 | call to unordered_map | map.cpp:433:24:433:26 | m34 |  |
-| map.cpp:428:37:428:39 | call to unordered_map | map.cpp:438:1:438:1 | m34 |  |
-| map.cpp:428:42:428:44 | call to unordered_map | map.cpp:434:7:434:9 | m35 |  |
-| map.cpp:428:42:428:44 | call to unordered_map | map.cpp:435:7:435:9 | m35 |  |
-| map.cpp:428:42:428:44 | call to unordered_map | map.cpp:436:7:436:9 | m35 |  |
-| map.cpp:428:42:428:44 | call to unordered_map | map.cpp:437:7:437:9 | m35 |  |
-| map.cpp:428:42:428:44 | call to unordered_map | map.cpp:438:1:438:1 | m35 |  |
+| map.cpp:428:49:428:51 | call to unordered_map | map.cpp:429:7:429:9 | m34 |  |
+| map.cpp:428:49:428:51 | call to unordered_map | map.cpp:430:7:430:9 | m34 |  |
+| map.cpp:428:49:428:51 | call to unordered_map | map.cpp:431:7:431:9 | m34 |  |
+| map.cpp:428:49:428:51 | call to unordered_map | map.cpp:432:7:432:9 | m34 |  |
+| map.cpp:428:49:428:51 | call to unordered_map | map.cpp:433:7:433:9 | m34 |  |
+| map.cpp:428:49:428:51 | call to unordered_map | map.cpp:433:24:433:26 | m34 |  |
+| map.cpp:428:49:428:51 | call to unordered_map | map.cpp:438:1:438:1 | m34 |  |
+| map.cpp:428:54:428:56 | call to unordered_map | map.cpp:434:7:434:9 | m35 |  |
+| map.cpp:428:54:428:56 | call to unordered_map | map.cpp:435:7:435:9 | m35 |  |
+| map.cpp:428:54:428:56 | call to unordered_map | map.cpp:436:7:436:9 | m35 |  |
+| map.cpp:428:54:428:56 | call to unordered_map | map.cpp:437:7:437:9 | m35 |  |
+| map.cpp:428:54:428:56 | call to unordered_map | map.cpp:438:1:438:1 | m35 |  |
 | map.cpp:429:7:429:9 | m34 | map.cpp:429:11:429:17 | call to emplace | TAINT |
 | map.cpp:429:7:429:9 | ref arg m34 | map.cpp:430:7:430:9 | m34 |  |
 | map.cpp:429:7:429:9 | ref arg m34 | map.cpp:431:7:431:9 | m34 |  |
@@ -3489,20 +3414,20 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:429:7:429:9 | ref arg m34 | map.cpp:433:7:433:9 | m34 |  |
 | map.cpp:429:7:429:9 | ref arg m34 | map.cpp:433:24:433:26 | m34 |  |
 | map.cpp:429:7:429:9 | ref arg m34 | map.cpp:438:1:438:1 | m34 |  |
-| map.cpp:429:19:429:57 | call to pair | map.cpp:429:7:429:9 | ref arg m34 | TAINT |
-| map.cpp:429:19:429:57 | call to pair | map.cpp:429:11:429:17 | call to emplace | TAINT |
-| map.cpp:429:52:429:56 | def | map.cpp:429:19:429:57 | call to pair | TAINT |
-| map.cpp:429:60:429:64 | first | map.cpp:429:7:429:64 | call to iterator |  |
+| map.cpp:429:19:429:69 | call to pair | map.cpp:429:7:429:9 | ref arg m34 | TAINT |
+| map.cpp:429:19:429:69 | call to pair | map.cpp:429:11:429:17 | call to emplace | TAINT |
+| map.cpp:429:64:429:68 | def | map.cpp:429:19:429:69 | call to pair | TAINT |
+| map.cpp:429:72:429:76 | first | map.cpp:429:7:429:76 | call to iterator |  |
 | map.cpp:430:7:430:9 | m34 | map.cpp:430:7:430:9 | call to unordered_map |  |
 | map.cpp:431:7:431:9 | m34 | map.cpp:431:11:431:17 | call to emplace | TAINT |
 | map.cpp:431:7:431:9 | ref arg m34 | map.cpp:432:7:432:9 | m34 |  |
 | map.cpp:431:7:431:9 | ref arg m34 | map.cpp:433:7:433:9 | m34 |  |
 | map.cpp:431:7:431:9 | ref arg m34 | map.cpp:433:24:433:26 | m34 |  |
 | map.cpp:431:7:431:9 | ref arg m34 | map.cpp:438:1:438:1 | m34 |  |
-| map.cpp:431:19:431:60 | call to pair | map.cpp:431:7:431:9 | ref arg m34 | TAINT |
-| map.cpp:431:19:431:60 | call to pair | map.cpp:431:11:431:17 | call to emplace | TAINT |
-| map.cpp:431:52:431:57 | call to source | map.cpp:431:19:431:60 | call to pair | TAINT |
-| map.cpp:431:63:431:67 | first | map.cpp:431:7:431:67 | call to iterator |  |
+| map.cpp:431:19:431:72 | call to pair | map.cpp:431:7:431:9 | ref arg m34 | TAINT |
+| map.cpp:431:19:431:72 | call to pair | map.cpp:431:11:431:17 | call to emplace | TAINT |
+| map.cpp:431:64:431:69 | call to source | map.cpp:431:19:431:72 | call to pair | TAINT |
+| map.cpp:431:75:431:79 | first | map.cpp:431:7:431:79 | call to iterator |  |
 | map.cpp:432:7:432:9 | m34 | map.cpp:432:7:432:9 | call to unordered_map |  |
 | map.cpp:433:7:433:9 | m34 | map.cpp:433:11:433:22 | call to emplace_hint | TAINT |
 | map.cpp:433:7:433:9 | ref arg m34 | map.cpp:438:1:438:1 | m34 |  |
@@ -3523,10 +3448,10 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | map.cpp:436:7:436:9 | m35 | map.cpp:436:11:436:17 | call to emplace | TAINT |
 | map.cpp:436:7:436:9 | ref arg m35 | map.cpp:437:7:437:9 | m35 |  |
 | map.cpp:436:7:436:9 | ref arg m35 | map.cpp:438:1:438:1 | m35 |  |
-| map.cpp:436:19:436:60 | call to pair | map.cpp:436:7:436:9 | ref arg m35 | TAINT |
-| map.cpp:436:19:436:60 | call to pair | map.cpp:436:11:436:17 | call to emplace | TAINT |
-| map.cpp:436:55:436:59 | def | map.cpp:436:19:436:60 | call to pair | TAINT |
-| map.cpp:436:63:436:67 | first | map.cpp:436:7:436:67 | call to iterator |  |
+| map.cpp:436:19:436:72 | call to pair | map.cpp:436:7:436:9 | ref arg m35 | TAINT |
+| map.cpp:436:19:436:72 | call to pair | map.cpp:436:11:436:17 | call to emplace | TAINT |
+| map.cpp:436:67:436:71 | def | map.cpp:436:19:436:72 | call to pair | TAINT |
+| map.cpp:436:75:436:79 | first | map.cpp:436:7:436:79 | call to iterator |  |
 | map.cpp:437:7:437:9 | m35 | map.cpp:437:7:437:9 | call to unordered_map |  |
 | map.cpp:446:23:446:23 | call to map | map.cpp:448:3:448:3 | m |  |
 | map.cpp:446:23:446:23 | call to map | map.cpp:449:12:449:12 | m |  |
@@ -4920,1047 +4845,1270 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | standalone_iterators.cpp:128:2:128:3 | it | standalone_iterators.cpp:128:5:128:5 | call to operator+= | TAINT |
 | standalone_iterators.cpp:128:2:128:3 | ref arg it | standalone_iterators.cpp:129:7:129:8 | it |  |
 | standalone_iterators.cpp:128:8:128:13 | call to source | standalone_iterators.cpp:128:2:128:3 | ref arg it | TAINT |
-| stl.h:95:69:95:69 | x | stl.h:95:69:95:69 | x |  |
-| stl.h:95:69:95:69 | x | stl.h:95:69:95:69 | x |  |
-| stl.h:95:69:95:69 | x | stl.h:95:69:95:69 | x |  |
-| stl.h:95:69:95:69 | x | stl.h:96:42:96:42 | x |  |
-| stl.h:95:69:95:69 | x | stl.h:96:42:96:42 | x |  |
-| stl.h:95:69:95:69 | x | stl.h:96:42:96:42 | x |  |
-| stl.h:96:42:96:42 | ref arg x | stl.h:95:69:95:69 | x |  |
-| stl.h:96:42:96:42 | ref arg x | stl.h:95:69:95:69 | x |  |
-| stl.h:292:30:292:40 | 0 | file://:0:0:0:0 | noexcept(...) | TAINT |
-| stl.h:292:30:292:40 | 0 | file://:0:0:0:0 | noexcept(...) | TAINT |
-| stl.h:292:30:292:40 | call to allocator | stl.h:292:21:292:41 | noexcept(...) | TAINT |
-| stl.h:292:30:292:40 | call to allocator | stl.h:292:21:292:41 | noexcept(...) | TAINT |
-| stl.h:292:30:292:40 | call to allocator | stl.h:292:21:292:41 | noexcept(...) | TAINT |
-| stl.h:292:30:292:40 | call to allocator | stl.h:292:21:292:41 | noexcept(...) | TAINT |
-| stl.h:292:30:292:40 | call to allocator | stl.h:292:21:292:41 | noexcept(...) | TAINT |
-| stl.h:292:30:292:40 | call to allocator | stl.h:292:21:292:41 | noexcept(...) | TAINT |
-| stl.h:292:53:292:63 | 0 | stl.h:292:46:292:64 | constructor init | TAINT |
-| stl.h:396:3:396:3 | this | stl.h:396:36:396:43 | constructor init of field first [pre-this] |  |
-| stl.h:396:3:396:3 | this | stl.h:396:36:396:43 | constructor init of field first [pre-this] |  |
-| stl.h:396:3:396:3 | this | stl.h:396:36:396:43 | constructor init of field first [pre-this] |  |
-| stl.h:396:3:396:3 | this | stl.h:396:36:396:43 | constructor init of field first [pre-this] |  |
-| stl.h:396:3:396:3 | this | stl.h:396:36:396:43 | constructor init of field first [pre-this] |  |
-| stl.h:396:3:396:6 | this | stl.h:396:36:396:43 | constructor init of field first [pre-this] |  |
-| stl.h:396:18:396:18 | x | stl.h:396:42:396:42 | x |  |
-| stl.h:396:18:396:18 | x | stl.h:396:42:396:42 | x |  |
-| stl.h:396:18:396:18 | x | stl.h:396:42:396:42 | x |  |
-| stl.h:396:18:396:18 | x | stl.h:396:42:396:42 | x |  |
-| stl.h:396:18:396:18 | x | stl.h:396:42:396:42 | x |  |
-| stl.h:396:18:396:18 | x | stl.h:396:42:396:42 | x |  |
-| stl.h:396:31:396:31 | y | stl.h:396:53:396:53 | y |  |
-| stl.h:396:31:396:31 | y | stl.h:396:53:396:53 | y |  |
-| stl.h:396:31:396:31 | y | stl.h:396:53:396:53 | y |  |
-| stl.h:396:31:396:31 | y | stl.h:396:53:396:53 | y |  |
-| stl.h:396:31:396:31 | y | stl.h:396:53:396:53 | y |  |
-| stl.h:396:31:396:31 | y | stl.h:396:53:396:53 | y |  |
-| stl.h:396:36:396:43 | call to unknown function | stl.h:396:36:396:43 | constructor init of field first | TAINT |
-| stl.h:396:36:396:43 | constructor init of field first [post-this] | stl.h:396:46:396:54 | constructor init of field second [pre-this] |  |
-| stl.h:396:36:396:43 | constructor init of field first [post-this] | stl.h:396:46:396:54 | constructor init of field second [pre-this] |  |
-| stl.h:396:36:396:43 | constructor init of field first [post-this] | stl.h:396:46:396:54 | constructor init of field second [pre-this] |  |
-| stl.h:396:36:396:43 | constructor init of field first [post-this] | stl.h:396:46:396:54 | constructor init of field second [pre-this] |  |
-| stl.h:396:36:396:43 | constructor init of field first [post-this] | stl.h:396:46:396:54 | constructor init of field second [pre-this] |  |
-| stl.h:396:36:396:43 | constructor init of field first [post-this] | stl.h:396:46:396:54 | constructor init of field second [pre-this] |  |
-| stl.h:396:36:396:43 | constructor init of field first [pre-this] | stl.h:396:46:396:54 | constructor init of field second [pre-this] |  |
-| stl.h:396:36:396:43 | constructor init of field first [pre-this] | stl.h:396:46:396:54 | constructor init of field second [pre-this] |  |
-| stl.h:396:36:396:43 | constructor init of field first [pre-this] | stl.h:396:46:396:54 | constructor init of field second [pre-this] |  |
-| stl.h:396:36:396:43 | constructor init of field first [pre-this] | stl.h:396:46:396:54 | constructor init of field second [pre-this] |  |
-| stl.h:396:36:396:43 | constructor init of field first [pre-this] | stl.h:396:46:396:54 | constructor init of field second [pre-this] |  |
-| stl.h:396:36:396:43 | constructor init of field first [pre-this] | stl.h:396:46:396:54 | constructor init of field second [pre-this] |  |
-| stl.h:396:42:396:42 | x | stl.h:396:36:396:43 | constructor init of field first | TAINT |
-| stl.h:396:42:396:42 | x | stl.h:396:36:396:43 | constructor init of field first | TAINT |
-| stl.h:396:42:396:42 | x | stl.h:396:36:396:43 | constructor init of field first | TAINT |
-| stl.h:396:42:396:42 | x | stl.h:396:36:396:43 | constructor init of field first | TAINT |
-| stl.h:396:42:396:42 | x | stl.h:396:36:396:43 | constructor init of field first | TAINT |
-| stl.h:396:46:396:54 | call to unknown function | stl.h:396:46:396:54 | constructor init of field second | TAINT |
-| stl.h:396:53:396:53 | y | stl.h:396:46:396:54 | constructor init of field second | TAINT |
-| stl.h:396:53:396:53 | y | stl.h:396:46:396:54 | constructor init of field second | TAINT |
-| stl.h:396:53:396:53 | y | stl.h:396:46:396:54 | constructor init of field second | TAINT |
-| stl.h:396:53:396:53 | y | stl.h:396:46:396:54 | constructor init of field second | TAINT |
-| stl.h:396:53:396:53 | y | stl.h:396:46:396:54 | constructor init of field second | TAINT |
-| stl.h:402:87:402:87 | x | stl.h:402:87:402:87 | x |  |
-| stl.h:402:87:402:87 | x | stl.h:402:87:402:87 | x |  |
-| stl.h:402:87:402:87 | x | stl.h:402:87:402:87 | x |  |
-| stl.h:402:87:402:87 | x | stl.h:402:87:402:87 | x |  |
-| stl.h:402:87:402:87 | x | stl.h:402:87:402:87 | x |  |
-| stl.h:402:87:402:87 | x | stl.h:402:87:402:87 | x |  |
-| stl.h:402:87:402:87 | x | stl.h:402:87:402:87 | x |  |
-| stl.h:402:87:402:87 | x | stl.h:403:58:403:58 | x |  |
-| stl.h:402:87:402:87 | x | stl.h:403:58:403:58 | x |  |
-| stl.h:402:87:402:87 | x | stl.h:403:58:403:58 | x |  |
-| stl.h:402:87:402:87 | x | stl.h:403:58:403:58 | x |  |
-| stl.h:402:87:402:87 | x | stl.h:403:58:403:58 | x |  |
-| stl.h:402:87:402:87 | x | stl.h:403:58:403:58 | x |  |
-| stl.h:402:87:402:87 | x | stl.h:403:58:403:58 | x |  |
-| stl.h:402:95:402:95 | y | stl.h:402:95:402:95 | y |  |
-| stl.h:402:95:402:95 | y | stl.h:402:95:402:95 | y |  |
-| stl.h:402:95:402:95 | y | stl.h:402:95:402:95 | y |  |
-| stl.h:402:95:402:95 | y | stl.h:402:95:402:95 | y |  |
-| stl.h:402:95:402:95 | y | stl.h:402:95:402:95 | y |  |
-| stl.h:402:95:402:95 | y | stl.h:402:95:402:95 | y |  |
-| stl.h:402:95:402:95 | y | stl.h:402:95:402:95 | y |  |
-| stl.h:402:95:402:95 | y | stl.h:403:79:403:79 | y |  |
-| stl.h:402:95:402:95 | y | stl.h:403:79:403:79 | y |  |
-| stl.h:402:95:402:95 | y | stl.h:403:79:403:79 | y |  |
-| stl.h:402:95:402:95 | y | stl.h:403:79:403:79 | y |  |
-| stl.h:402:95:402:95 | y | stl.h:403:79:403:79 | y |  |
-| stl.h:402:95:402:95 | y | stl.h:403:79:403:79 | y |  |
-| stl.h:402:95:402:95 | y | stl.h:403:79:403:79 | y |  |
-| stl.h:403:58:403:58 | x | stl.h:403:41:403:56 | call to forward | TAINT |
-| stl.h:403:58:403:58 | x | stl.h:403:41:403:56 | call to forward | TAINT |
-| stl.h:403:58:403:58 | x | stl.h:403:41:403:56 | call to forward | TAINT |
-| stl.h:403:58:403:58 | x | stl.h:403:41:403:56 | call to forward | TAINT |
-| stl.h:403:58:403:58 | x | stl.h:403:41:403:56 | call to forward | TAINT |
-| stl.h:403:58:403:58 | x | stl.h:403:41:403:56 | call to forward | TAINT |
-| stl.h:403:62:403:77 | call to forward | stl.h:403:3:403:82 | call to pair | TAINT |
-| stl.h:403:62:403:77 | call to forward | stl.h:403:3:403:82 | call to pair | TAINT |
-| stl.h:403:62:403:77 | call to forward | stl.h:403:3:403:82 | call to pair | TAINT |
-| stl.h:403:62:403:77 | call to forward | stl.h:403:3:403:82 | call to pair | TAINT |
-| stl.h:403:62:403:77 | call to forward | stl.h:403:3:403:82 | call to pair | TAINT |
-| stl.h:403:62:403:77 | call to forward | stl.h:403:3:403:82 | call to pair | TAINT |
-| stl.h:403:79:403:79 | y | stl.h:403:3:403:82 | call to pair | TAINT |
-| stl.h:403:79:403:79 | y | stl.h:403:3:403:82 | call to pair | TAINT |
-| stl.h:403:79:403:79 | y | stl.h:403:3:403:82 | call to pair | TAINT |
-| stl.h:403:79:403:79 | y | stl.h:403:3:403:82 | call to pair | TAINT |
-| stl.h:403:79:403:79 | y | stl.h:403:3:403:82 | call to pair | TAINT |
-| stl.h:403:79:403:79 | y | stl.h:403:3:403:82 | call to pair | TAINT |
-| stl.h:403:79:403:79 | y | stl.h:403:62:403:77 | call to forward | TAINT |
-| stl.h:403:79:403:79 | y | stl.h:403:62:403:77 | call to forward | TAINT |
-| stl.h:403:79:403:79 | y | stl.h:403:62:403:77 | call to forward | TAINT |
-| stl.h:403:79:403:79 | y | stl.h:403:62:403:77 | call to forward | TAINT |
-| stl.h:403:79:403:79 | y | stl.h:403:62:403:77 | call to forward | TAINT |
-| stl.h:403:79:403:79 | y | stl.h:403:62:403:77 | call to forward | TAINT |
-| string.cpp:25:12:25:17 | call to source | string.cpp:29:7:29:7 | a |  |
-| string.cpp:26:16:26:20 | 123 | string.cpp:26:16:26:21 | call to basic_string | TAINT |
-| string.cpp:26:16:26:21 | call to basic_string | string.cpp:30:7:30:7 | b |  |
-| string.cpp:26:16:26:21 | call to basic_string | string.cpp:32:7:32:7 | b |  |
-| string.cpp:27:16:27:21 | call to source | string.cpp:27:16:27:24 | call to basic_string | TAINT |
-| string.cpp:27:16:27:24 | call to basic_string | string.cpp:31:7:31:7 | c |  |
-| string.cpp:27:16:27:24 | call to basic_string | string.cpp:33:7:33:7 | c |  |
-| string.cpp:32:7:32:7 | b | string.cpp:32:9:32:13 | call to c_str | TAINT |
-| string.cpp:33:7:33:7 | c | string.cpp:33:9:33:13 | call to c_str | TAINT |
-| string.cpp:38:16:38:28 | call to basic_string | string.cpp:39:7:39:11 | path1 |  |
-| string.cpp:38:17:38:26 | call to user_input | string.cpp:38:16:38:28 | call to basic_string | TAINT |
-| string.cpp:39:7:39:11 | path1 | string.cpp:39:13:39:17 | call to c_str | TAINT |
-| string.cpp:42:10:42:19 | call to user_input | string.cpp:42:10:42:21 | call to basic_string | TAINT |
-| string.cpp:42:10:42:21 | call to basic_string | string.cpp:42:2:42:21 | ... = ... |  |
-| string.cpp:42:10:42:21 | call to basic_string | string.cpp:43:7:43:11 | path2 |  |
-| string.cpp:43:7:43:11 | path2 | string.cpp:43:13:43:17 | call to c_str | TAINT |
-| string.cpp:45:15:45:24 | call to user_input | string.cpp:45:15:45:27 | call to basic_string | TAINT |
-| string.cpp:45:15:45:27 | call to basic_string | string.cpp:46:7:46:11 | path3 |  |
-| string.cpp:46:7:46:11 | path3 | string.cpp:46:13:46:17 | call to c_str | TAINT |
-| string.cpp:51:19:51:24 | call to source | string.cpp:54:17:54:18 | cs |  |
-| string.cpp:51:19:51:24 | call to source | string.cpp:56:7:56:8 | cs |  |
-| string.cpp:54:17:54:18 | cs | string.cpp:54:17:54:19 | call to basic_string | TAINT |
-| string.cpp:54:17:54:19 | call to basic_string | string.cpp:57:7:57:8 | ss |  |
-| string.cpp:62:19:62:24 | call to source | string.cpp:65:17:65:18 | cs |  |
-| string.cpp:65:17:65:18 | cs | string.cpp:65:17:65:19 | call to basic_string | TAINT |
-| string.cpp:65:17:65:19 | call to basic_string | string.cpp:68:7:68:8 | ss |  |
-| string.cpp:65:17:65:19 | call to basic_string | string.cpp:71:7:71:8 | ss |  |
-| string.cpp:68:7:68:8 | ss | string.cpp:68:10:68:14 | call to c_str | TAINT |
-| string.cpp:68:10:68:14 | call to c_str | string.cpp:68:2:68:16 | ... = ... |  |
-| string.cpp:68:10:68:14 | call to c_str | string.cpp:70:7:70:8 | cs |  |
-| string.cpp:77:18:77:24 | hello | string.cpp:77:18:77:25 | call to basic_string | TAINT |
-| string.cpp:77:18:77:25 | call to basic_string | string.cpp:82:8:82:9 | s1 |  |
-| string.cpp:78:19:78:26 | call to basic_string | string.cpp:83:8:83:9 | s2 |  |
-| string.cpp:78:20:78:26 | hello | string.cpp:78:19:78:26 | call to basic_string | TAINT |
-| string.cpp:80:8:80:14 | call to basic_string | string.cpp:80:3:80:14 | ... = ... |  |
-| string.cpp:80:8:80:14 | call to basic_string | string.cpp:84:8:84:9 | s3 |  |
-| string.cpp:80:8:80:14 | hello | string.cpp:80:8:80:14 | call to basic_string | TAINT |
-| string.cpp:88:18:88:23 | call to source | string.cpp:88:18:88:26 | call to basic_string | TAINT |
-| string.cpp:88:18:88:26 | call to basic_string | string.cpp:93:8:93:9 | s1 |  |
-| string.cpp:89:19:89:27 | call to basic_string | string.cpp:94:8:94:9 | s2 |  |
-| string.cpp:89:20:89:25 | call to source | string.cpp:89:19:89:27 | call to basic_string | TAINT |
-| string.cpp:91:8:91:13 | call to source | string.cpp:91:8:91:15 | call to basic_string | TAINT |
-| string.cpp:91:8:91:15 | call to basic_string | string.cpp:91:3:91:15 | ... = ... |  |
-| string.cpp:91:8:91:15 | call to basic_string | string.cpp:95:8:95:9 | s3 |  |
-| string.cpp:99:15:99:16 | call to basic_string | string.cpp:100:20:100:21 | s1 |  |
-| string.cpp:99:15:99:16 | call to basic_string | string.cpp:102:8:102:9 | s1 |  |
-| string.cpp:99:15:99:16 | call to basic_string | string.cpp:104:8:104:9 | s1 |  |
-| string.cpp:100:20:100:21 | s1 | string.cpp:105:8:105:9 | s2 |  |
-| string.cpp:102:8:102:9 | s1 | string.cpp:102:3:102:9 | ... = ... |  |
-| string.cpp:102:8:102:9 | s1 | string.cpp:106:8:106:9 | s3 |  |
-| string.cpp:110:19:110:40 | call to basic_string | string.cpp:114:8:114:9 | s1 |  |
-| string.cpp:110:32:110:37 | call to source | string.cpp:110:19:110:40 | call to basic_string | TAINT |
-| string.cpp:112:8:112:28 | call to basic_string | string.cpp:112:3:112:28 | ... = ... |  |
-| string.cpp:112:8:112:28 | call to basic_string | string.cpp:115:8:115:9 | s2 |  |
-| string.cpp:112:20:112:25 | call to source | string.cpp:112:8:112:28 | call to basic_string | TAINT |
-| string.cpp:120:16:120:21 | call to source | string.cpp:120:16:120:24 | call to basic_string | TAINT |
-| string.cpp:120:16:120:24 | call to basic_string | string.cpp:121:15:121:15 | s |  |
-| string.cpp:120:16:120:24 | call to basic_string | string.cpp:125:33:125:33 | s |  |
-| string.cpp:120:16:120:24 | call to basic_string | string.cpp:125:50:125:50 | s |  |
-| string.cpp:120:16:120:24 | call to basic_string | string.cpp:129:16:129:16 | s |  |
-| string.cpp:121:15:121:15 | (__begin) | string.cpp:121:15:121:15 | call to operator* | TAINT |
-| string.cpp:121:15:121:15 | (__begin) | string.cpp:121:15:121:15 | call to operator++ |  |
-| string.cpp:121:15:121:15 | (__end) | string.cpp:121:15:121:15 | call to iterator |  |
-| string.cpp:121:15:121:15 | (__range) | string.cpp:121:15:121:15 | call to begin | TAINT |
-| string.cpp:121:15:121:15 | (__range) | string.cpp:121:15:121:15 | call to end | TAINT |
-| string.cpp:121:15:121:15 | call to begin | string.cpp:121:15:121:15 | (__begin) |  |
-| string.cpp:121:15:121:15 | call to begin | string.cpp:121:15:121:15 | (__begin) |  |
-| string.cpp:121:15:121:15 | call to begin | string.cpp:121:15:121:15 | (__begin) |  |
-| string.cpp:121:15:121:15 | call to end | string.cpp:121:15:121:15 | (__end) |  |
-| string.cpp:121:15:121:15 | call to operator* | string.cpp:122:8:122:8 | c |  |
-| string.cpp:121:15:121:15 | ref arg (__begin) | string.cpp:121:15:121:15 | (__begin) |  |
-| string.cpp:121:15:121:15 | ref arg (__begin) | string.cpp:121:15:121:15 | (__begin) |  |
-| string.cpp:121:15:121:15 | ref arg (__begin) | string.cpp:121:15:121:15 | (__begin) |  |
-| string.cpp:121:15:121:15 | ref arg (__begin) | string.cpp:121:15:121:15 | (__begin) |  |
-| string.cpp:121:15:121:15 | ref arg (__begin) | string.cpp:121:15:121:15 | (__begin) |  |
-| string.cpp:121:15:121:15 | ref arg (__begin) | string.cpp:121:15:121:15 | (__begin) |  |
-| string.cpp:121:15:121:15 | ref arg (__range) | string.cpp:121:15:121:15 | (__range) |  |
-| string.cpp:121:15:121:15 | s | string.cpp:121:15:121:15 | (__range) |  |
-| string.cpp:121:15:121:15 | s | string.cpp:121:15:121:15 | (__range) |  |
-| string.cpp:121:15:121:15 | s | string.cpp:121:15:121:15 | call to operator* | TAINT |
-| string.cpp:125:33:125:33 | ref arg s | string.cpp:125:50:125:50 | s |  |
-| string.cpp:125:33:125:33 | ref arg s | string.cpp:129:16:129:16 | s |  |
-| string.cpp:125:33:125:33 | s | string.cpp:125:35:125:39 | call to begin | TAINT |
-| string.cpp:125:35:125:39 | call to begin | string.cpp:125:44:125:45 | it |  |
-| string.cpp:125:35:125:39 | call to begin | string.cpp:125:61:125:62 | it |  |
-| string.cpp:125:35:125:39 | call to begin | string.cpp:126:9:126:10 | it |  |
-| string.cpp:125:50:125:50 | ref arg s | string.cpp:125:50:125:50 | s |  |
-| string.cpp:125:50:125:50 | ref arg s | string.cpp:129:16:129:16 | s |  |
-| string.cpp:125:50:125:50 | s | string.cpp:125:52:125:54 | call to end | TAINT |
-| string.cpp:125:61:125:62 | it | string.cpp:125:59:125:59 | call to operator++ |  |
-| string.cpp:125:61:125:62 | ref arg it | string.cpp:125:44:125:45 | it |  |
-| string.cpp:125:61:125:62 | ref arg it | string.cpp:125:61:125:62 | it |  |
-| string.cpp:125:61:125:62 | ref arg it | string.cpp:126:9:126:10 | it |  |
-| string.cpp:126:9:126:10 | it | string.cpp:126:8:126:8 | call to operator* | TAINT |
-| string.cpp:126:9:126:10 | ref arg it | string.cpp:125:44:125:45 | it |  |
-| string.cpp:126:9:126:10 | ref arg it | string.cpp:125:61:125:62 | it |  |
-| string.cpp:126:9:126:10 | ref arg it | string.cpp:126:9:126:10 | it |  |
-| string.cpp:129:16:129:16 | (__begin) | string.cpp:129:16:129:16 | call to operator* | TAINT |
-| string.cpp:129:16:129:16 | (__begin) | string.cpp:129:16:129:16 | call to operator++ |  |
-| string.cpp:129:16:129:16 | (__end) | string.cpp:129:16:129:16 | call to iterator |  |
-| string.cpp:129:16:129:16 | (__range) | string.cpp:129:16:129:16 | call to begin | TAINT |
-| string.cpp:129:16:129:16 | (__range) | string.cpp:129:16:129:16 | call to end | TAINT |
-| string.cpp:129:16:129:16 | call to begin | string.cpp:129:16:129:16 | (__begin) |  |
-| string.cpp:129:16:129:16 | call to begin | string.cpp:129:16:129:16 | (__begin) |  |
-| string.cpp:129:16:129:16 | call to begin | string.cpp:129:16:129:16 | (__begin) |  |
-| string.cpp:129:16:129:16 | call to end | string.cpp:129:16:129:16 | (__end) |  |
-| string.cpp:129:16:129:16 | call to operator* | string.cpp:130:8:130:8 | c |  |
-| string.cpp:129:16:129:16 | ref arg (__begin) | string.cpp:129:16:129:16 | (__begin) |  |
-| string.cpp:129:16:129:16 | ref arg (__begin) | string.cpp:129:16:129:16 | (__begin) |  |
-| string.cpp:129:16:129:16 | ref arg (__begin) | string.cpp:129:16:129:16 | (__begin) |  |
-| string.cpp:129:16:129:16 | ref arg (__begin) | string.cpp:129:16:129:16 | (__begin) |  |
-| string.cpp:129:16:129:16 | ref arg (__begin) | string.cpp:129:16:129:16 | (__begin) |  |
-| string.cpp:129:16:129:16 | ref arg (__begin) | string.cpp:129:16:129:16 | (__begin) |  |
-| string.cpp:129:16:129:16 | ref arg (__range) | string.cpp:129:16:129:16 | (__range) |  |
-| string.cpp:129:16:129:16 | s | string.cpp:129:16:129:16 | (__range) |  |
-| string.cpp:129:16:129:16 | s | string.cpp:129:16:129:16 | (__range) |  |
-| string.cpp:129:16:129:16 | s | string.cpp:129:16:129:16 | call to operator* | TAINT |
-| string.cpp:133:28:133:33 | call to source | string.cpp:133:28:133:36 | call to basic_string | TAINT |
-| string.cpp:133:28:133:36 | call to basic_string | string.cpp:134:22:134:28 | const_s |  |
-| string.cpp:134:22:134:22 | (__begin) | string.cpp:134:22:134:22 | call to operator* | TAINT |
-| string.cpp:134:22:134:22 | (__begin) | string.cpp:134:22:134:22 | call to operator++ |  |
-| string.cpp:134:22:134:22 | (__range) | string.cpp:134:22:134:22 | call to begin | TAINT |
-| string.cpp:134:22:134:22 | (__range) | string.cpp:134:22:134:22 | call to end | TAINT |
-| string.cpp:134:22:134:22 | call to begin | string.cpp:134:22:134:22 | (__begin) |  |
-| string.cpp:134:22:134:22 | call to begin | string.cpp:134:22:134:22 | (__begin) |  |
-| string.cpp:134:22:134:22 | call to begin | string.cpp:134:22:134:22 | (__begin) |  |
-| string.cpp:134:22:134:22 | call to end | string.cpp:134:22:134:22 | (__end) |  |
-| string.cpp:134:22:134:22 | call to operator* | string.cpp:135:8:135:8 | c |  |
-| string.cpp:134:22:134:22 | ref arg (__begin) | string.cpp:134:22:134:22 | (__begin) |  |
-| string.cpp:134:22:134:22 | ref arg (__begin) | string.cpp:134:22:134:22 | (__begin) |  |
-| string.cpp:134:22:134:22 | ref arg (__begin) | string.cpp:134:22:134:22 | (__begin) |  |
-| string.cpp:134:22:134:28 | const_s | string.cpp:134:22:134:22 | (__range) |  |
-| string.cpp:134:22:134:28 | const_s | string.cpp:134:22:134:22 | (__range) |  |
-| string.cpp:134:22:134:28 | const_s | string.cpp:134:22:134:22 | call to operator* | TAINT |
-| string.cpp:141:18:141:24 | hello | string.cpp:141:18:141:25 | call to basic_string | TAINT |
-| string.cpp:141:18:141:25 | call to basic_string | string.cpp:144:8:144:9 | s1 |  |
-| string.cpp:141:18:141:25 | call to basic_string | string.cpp:144:13:144:14 | s1 |  |
-| string.cpp:141:18:141:25 | call to basic_string | string.cpp:145:8:145:9 | s1 |  |
-| string.cpp:141:18:141:25 | call to basic_string | string.cpp:146:13:146:14 | s1 |  |
-| string.cpp:141:18:141:25 | call to basic_string | string.cpp:149:8:149:9 | s1 |  |
-| string.cpp:141:18:141:25 | call to basic_string | string.cpp:150:8:150:9 | s1 |  |
-| string.cpp:142:18:142:23 | call to source | string.cpp:142:18:142:26 | call to basic_string | TAINT |
-| string.cpp:142:18:142:26 | call to basic_string | string.cpp:145:13:145:14 | s2 |  |
-| string.cpp:142:18:142:26 | call to basic_string | string.cpp:146:8:146:9 | s2 |  |
-| string.cpp:142:18:142:26 | call to basic_string | string.cpp:147:8:147:9 | s2 |  |
-| string.cpp:142:18:142:26 | call to basic_string | string.cpp:147:13:147:14 | s2 |  |
-| string.cpp:144:8:144:9 | s1 | string.cpp:144:11:144:11 | call to operator+ | TAINT |
-| string.cpp:144:13:144:14 | s1 | string.cpp:144:11:144:11 | call to operator+ | TAINT |
+| stl.h:71:69:71:69 | x | stl.h:71:69:71:69 | x |  |
+| stl.h:71:69:71:69 | x | stl.h:71:69:71:69 | x |  |
+| stl.h:71:69:71:69 | x | stl.h:71:69:71:69 | x |  |
+| stl.h:71:69:71:69 | x | stl.h:72:42:72:42 | x |  |
+| stl.h:71:69:71:69 | x | stl.h:72:42:72:42 | x |  |
+| stl.h:71:69:71:69 | x | stl.h:72:42:72:42 | x |  |
+| stl.h:72:42:72:42 | ref arg x | stl.h:71:69:71:69 | x |  |
+| stl.h:72:42:72:42 | ref arg x | stl.h:71:69:71:69 | x |  |
+| stl.h:323:30:323:40 | 0 | file://:0:0:0:0 | noexcept(...) | TAINT |
+| stl.h:429:3:429:3 | this | stl.h:429:36:429:43 | constructor init of field first [pre-this] |  |
+| stl.h:429:3:429:3 | this | stl.h:429:36:429:43 | constructor init of field first [pre-this] |  |
+| stl.h:429:3:429:3 | this | stl.h:429:36:429:43 | constructor init of field first [pre-this] |  |
+| stl.h:429:3:429:3 | this | stl.h:429:36:429:43 | constructor init of field first [pre-this] |  |
+| stl.h:429:3:429:3 | this | stl.h:429:36:429:43 | constructor init of field first [pre-this] |  |
+| stl.h:429:3:429:3 | this | stl.h:429:36:429:43 | constructor init of field first [pre-this] |  |
+| stl.h:429:3:429:6 | this | stl.h:429:36:429:43 | constructor init of field first [pre-this] |  |
+| stl.h:429:18:429:18 | x | stl.h:429:42:429:42 | x |  |
+| stl.h:429:18:429:18 | x | stl.h:429:42:429:42 | x |  |
+| stl.h:429:18:429:18 | x | stl.h:429:42:429:42 | x |  |
+| stl.h:429:18:429:18 | x | stl.h:429:42:429:42 | x |  |
+| stl.h:429:18:429:18 | x | stl.h:429:42:429:42 | x |  |
+| stl.h:429:18:429:18 | x | stl.h:429:42:429:42 | x |  |
+| stl.h:429:18:429:18 | x | stl.h:429:42:429:42 | x |  |
+| stl.h:429:31:429:31 | y | stl.h:429:53:429:53 | y |  |
+| stl.h:429:31:429:31 | y | stl.h:429:53:429:53 | y |  |
+| stl.h:429:31:429:31 | y | stl.h:429:53:429:53 | y |  |
+| stl.h:429:31:429:31 | y | stl.h:429:53:429:53 | y |  |
+| stl.h:429:31:429:31 | y | stl.h:429:53:429:53 | y |  |
+| stl.h:429:31:429:31 | y | stl.h:429:53:429:53 | y |  |
+| stl.h:429:31:429:31 | y | stl.h:429:53:429:53 | y |  |
+| stl.h:429:36:429:43 | call to unknown function | stl.h:429:36:429:43 | constructor init of field first | TAINT |
+| stl.h:429:36:429:43 | constructor init of field first [post-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:36:429:43 | constructor init of field first [post-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:36:429:43 | constructor init of field first [post-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:36:429:43 | constructor init of field first [post-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:36:429:43 | constructor init of field first [post-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:36:429:43 | constructor init of field first [post-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:36:429:43 | constructor init of field first [post-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:36:429:43 | constructor init of field first [pre-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:36:429:43 | constructor init of field first [pre-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:36:429:43 | constructor init of field first [pre-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:36:429:43 | constructor init of field first [pre-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:36:429:43 | constructor init of field first [pre-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:36:429:43 | constructor init of field first [pre-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:36:429:43 | constructor init of field first [pre-this] | stl.h:429:46:429:54 | constructor init of field second [pre-this] |  |
+| stl.h:429:42:429:42 | x | stl.h:429:36:429:43 | constructor init of field first | TAINT |
+| stl.h:429:42:429:42 | x | stl.h:429:36:429:43 | constructor init of field first | TAINT |
+| stl.h:429:42:429:42 | x | stl.h:429:36:429:43 | constructor init of field first | TAINT |
+| stl.h:429:42:429:42 | x | stl.h:429:36:429:43 | constructor init of field first | TAINT |
+| stl.h:429:42:429:42 | x | stl.h:429:36:429:43 | constructor init of field first | TAINT |
+| stl.h:429:42:429:42 | x | stl.h:429:36:429:43 | constructor init of field first | TAINT |
+| stl.h:429:46:429:54 | call to unknown function | stl.h:429:46:429:54 | constructor init of field second | TAINT |
+| stl.h:429:53:429:53 | y | stl.h:429:46:429:54 | constructor init of field second | TAINT |
+| stl.h:429:53:429:53 | y | stl.h:429:46:429:54 | constructor init of field second | TAINT |
+| stl.h:429:53:429:53 | y | stl.h:429:46:429:54 | constructor init of field second | TAINT |
+| stl.h:429:53:429:53 | y | stl.h:429:46:429:54 | constructor init of field second | TAINT |
+| stl.h:429:53:429:53 | y | stl.h:429:46:429:54 | constructor init of field second | TAINT |
+| stl.h:429:53:429:53 | y | stl.h:429:46:429:54 | constructor init of field second | TAINT |
+| stl.h:435:87:435:87 | x | stl.h:435:87:435:87 | x |  |
+| stl.h:435:87:435:87 | x | stl.h:435:87:435:87 | x |  |
+| stl.h:435:87:435:87 | x | stl.h:435:87:435:87 | x |  |
+| stl.h:435:87:435:87 | x | stl.h:435:87:435:87 | x |  |
+| stl.h:435:87:435:87 | x | stl.h:435:87:435:87 | x |  |
+| stl.h:435:87:435:87 | x | stl.h:435:87:435:87 | x |  |
+| stl.h:435:87:435:87 | x | stl.h:435:87:435:87 | x |  |
+| stl.h:435:87:435:87 | x | stl.h:436:58:436:58 | x |  |
+| stl.h:435:87:435:87 | x | stl.h:436:58:436:58 | x |  |
+| stl.h:435:87:435:87 | x | stl.h:436:58:436:58 | x |  |
+| stl.h:435:87:435:87 | x | stl.h:436:58:436:58 | x |  |
+| stl.h:435:87:435:87 | x | stl.h:436:58:436:58 | x |  |
+| stl.h:435:87:435:87 | x | stl.h:436:58:436:58 | x |  |
+| stl.h:435:87:435:87 | x | stl.h:436:58:436:58 | x |  |
+| stl.h:435:95:435:95 | y | stl.h:435:95:435:95 | y |  |
+| stl.h:435:95:435:95 | y | stl.h:435:95:435:95 | y |  |
+| stl.h:435:95:435:95 | y | stl.h:435:95:435:95 | y |  |
+| stl.h:435:95:435:95 | y | stl.h:435:95:435:95 | y |  |
+| stl.h:435:95:435:95 | y | stl.h:435:95:435:95 | y |  |
+| stl.h:435:95:435:95 | y | stl.h:435:95:435:95 | y |  |
+| stl.h:435:95:435:95 | y | stl.h:435:95:435:95 | y |  |
+| stl.h:435:95:435:95 | y | stl.h:436:79:436:79 | y |  |
+| stl.h:435:95:435:95 | y | stl.h:436:79:436:79 | y |  |
+| stl.h:435:95:435:95 | y | stl.h:436:79:436:79 | y |  |
+| stl.h:435:95:435:95 | y | stl.h:436:79:436:79 | y |  |
+| stl.h:435:95:435:95 | y | stl.h:436:79:436:79 | y |  |
+| stl.h:435:95:435:95 | y | stl.h:436:79:436:79 | y |  |
+| stl.h:435:95:435:95 | y | stl.h:436:79:436:79 | y |  |
+| stl.h:436:58:436:58 | x | stl.h:436:41:436:56 | call to forward | TAINT |
+| stl.h:436:58:436:58 | x | stl.h:436:41:436:56 | call to forward | TAINT |
+| stl.h:436:58:436:58 | x | stl.h:436:41:436:56 | call to forward | TAINT |
+| stl.h:436:58:436:58 | x | stl.h:436:41:436:56 | call to forward | TAINT |
+| stl.h:436:58:436:58 | x | stl.h:436:41:436:56 | call to forward | TAINT |
+| stl.h:436:58:436:58 | x | stl.h:436:41:436:56 | call to forward | TAINT |
+| stl.h:436:62:436:77 | call to forward | stl.h:436:3:436:82 | call to pair | TAINT |
+| stl.h:436:62:436:77 | call to forward | stl.h:436:3:436:82 | call to pair | TAINT |
+| stl.h:436:62:436:77 | call to forward | stl.h:436:3:436:82 | call to pair | TAINT |
+| stl.h:436:62:436:77 | call to forward | stl.h:436:3:436:82 | call to pair | TAINT |
+| stl.h:436:62:436:77 | call to forward | stl.h:436:3:436:82 | call to pair | TAINT |
+| stl.h:436:62:436:77 | call to forward | stl.h:436:3:436:82 | call to pair | TAINT |
+| stl.h:436:79:436:79 | y | stl.h:436:3:436:82 | call to pair | TAINT |
+| stl.h:436:79:436:79 | y | stl.h:436:3:436:82 | call to pair | TAINT |
+| stl.h:436:79:436:79 | y | stl.h:436:3:436:82 | call to pair | TAINT |
+| stl.h:436:79:436:79 | y | stl.h:436:3:436:82 | call to pair | TAINT |
+| stl.h:436:79:436:79 | y | stl.h:436:3:436:82 | call to pair | TAINT |
+| stl.h:436:79:436:79 | y | stl.h:436:3:436:82 | call to pair | TAINT |
+| stl.h:436:79:436:79 | y | stl.h:436:62:436:77 | call to forward | TAINT |
+| stl.h:436:79:436:79 | y | stl.h:436:62:436:77 | call to forward | TAINT |
+| stl.h:436:79:436:79 | y | stl.h:436:62:436:77 | call to forward | TAINT |
+| stl.h:436:79:436:79 | y | stl.h:436:62:436:77 | call to forward | TAINT |
+| stl.h:436:79:436:79 | y | stl.h:436:62:436:77 | call to forward | TAINT |
+| stl.h:436:79:436:79 | y | stl.h:436:62:436:77 | call to forward | TAINT |
+| string.cpp:26:12:26:17 | call to source | string.cpp:30:7:30:7 | a |  |
+| string.cpp:27:16:27:20 | 123 | string.cpp:27:16:27:21 | call to basic_string | TAINT |
+| string.cpp:27:16:27:21 | call to basic_string | string.cpp:31:7:31:7 | b |  |
+| string.cpp:27:16:27:21 | call to basic_string | string.cpp:33:7:33:7 | b |  |
+| string.cpp:28:16:28:21 | call to source | string.cpp:28:16:28:24 | call to basic_string | TAINT |
+| string.cpp:28:16:28:24 | call to basic_string | string.cpp:32:7:32:7 | c |  |
+| string.cpp:28:16:28:24 | call to basic_string | string.cpp:34:7:34:7 | c |  |
+| string.cpp:33:7:33:7 | b | string.cpp:33:9:33:13 | call to c_str | TAINT |
+| string.cpp:34:7:34:7 | c | string.cpp:34:9:34:13 | call to c_str | TAINT |
+| string.cpp:39:16:39:28 | call to basic_string | string.cpp:40:7:40:11 | path1 |  |
+| string.cpp:39:17:39:26 | call to user_input | string.cpp:39:16:39:28 | call to basic_string | TAINT |
+| string.cpp:40:7:40:11 | path1 | string.cpp:40:13:40:17 | call to c_str | TAINT |
+| string.cpp:43:10:43:19 | call to user_input | string.cpp:43:10:43:21 | call to basic_string | TAINT |
+| string.cpp:43:10:43:21 | call to basic_string | string.cpp:43:2:43:21 | ... = ... |  |
+| string.cpp:43:10:43:21 | call to basic_string | string.cpp:44:7:44:11 | path2 |  |
+| string.cpp:44:7:44:11 | path2 | string.cpp:44:13:44:17 | call to c_str | TAINT |
+| string.cpp:46:15:46:24 | call to user_input | string.cpp:46:15:46:27 | call to basic_string | TAINT |
+| string.cpp:46:15:46:27 | call to basic_string | string.cpp:47:7:47:11 | path3 |  |
+| string.cpp:47:7:47:11 | path3 | string.cpp:47:13:47:17 | call to c_str | TAINT |
+| string.cpp:52:19:52:24 | call to source | string.cpp:55:17:55:18 | cs |  |
+| string.cpp:52:19:52:24 | call to source | string.cpp:57:7:57:8 | cs |  |
+| string.cpp:55:17:55:18 | cs | string.cpp:55:17:55:19 | call to basic_string | TAINT |
+| string.cpp:55:17:55:19 | call to basic_string | string.cpp:58:7:58:8 | ss |  |
+| string.cpp:63:19:63:24 | call to source | string.cpp:66:17:66:18 | cs |  |
+| string.cpp:66:17:66:18 | cs | string.cpp:66:17:66:19 | call to basic_string | TAINT |
+| string.cpp:66:17:66:19 | call to basic_string | string.cpp:69:7:69:8 | ss |  |
+| string.cpp:66:17:66:19 | call to basic_string | string.cpp:72:7:72:8 | ss |  |
+| string.cpp:69:7:69:8 | ss | string.cpp:69:10:69:14 | call to c_str | TAINT |
+| string.cpp:69:10:69:14 | call to c_str | string.cpp:69:2:69:16 | ... = ... |  |
+| string.cpp:69:10:69:14 | call to c_str | string.cpp:71:7:71:8 | cs |  |
+| string.cpp:78:18:78:24 | hello | string.cpp:78:18:78:25 | call to basic_string | TAINT |
+| string.cpp:78:18:78:25 | call to basic_string | string.cpp:83:8:83:9 | s1 |  |
+| string.cpp:79:19:79:26 | call to basic_string | string.cpp:84:8:84:9 | s2 |  |
+| string.cpp:79:20:79:26 | hello | string.cpp:79:19:79:26 | call to basic_string | TAINT |
+| string.cpp:81:8:81:14 | call to basic_string | string.cpp:81:3:81:14 | ... = ... |  |
+| string.cpp:81:8:81:14 | call to basic_string | string.cpp:85:8:85:9 | s3 |  |
+| string.cpp:81:8:81:14 | hello | string.cpp:81:8:81:14 | call to basic_string | TAINT |
+| string.cpp:89:18:89:23 | call to source | string.cpp:89:18:89:26 | call to basic_string | TAINT |
+| string.cpp:89:18:89:26 | call to basic_string | string.cpp:94:8:94:9 | s1 |  |
+| string.cpp:90:19:90:27 | call to basic_string | string.cpp:95:8:95:9 | s2 |  |
+| string.cpp:90:20:90:25 | call to source | string.cpp:90:19:90:27 | call to basic_string | TAINT |
+| string.cpp:92:8:92:13 | call to source | string.cpp:92:8:92:15 | call to basic_string | TAINT |
+| string.cpp:92:8:92:15 | call to basic_string | string.cpp:92:3:92:15 | ... = ... |  |
+| string.cpp:92:8:92:15 | call to basic_string | string.cpp:96:8:96:9 | s3 |  |
+| string.cpp:100:15:100:16 | call to basic_string | string.cpp:101:20:101:21 | s1 |  |
+| string.cpp:100:15:100:16 | call to basic_string | string.cpp:103:8:103:9 | s1 |  |
+| string.cpp:100:15:100:16 | call to basic_string | string.cpp:105:8:105:9 | s1 |  |
+| string.cpp:101:20:101:21 | s1 | string.cpp:106:8:106:9 | s2 |  |
+| string.cpp:103:8:103:9 | s1 | string.cpp:103:3:103:9 | ... = ... |  |
+| string.cpp:103:8:103:9 | s1 | string.cpp:107:8:107:9 | s3 |  |
+| string.cpp:111:19:111:40 | call to basic_string | string.cpp:115:8:115:9 | s1 |  |
+| string.cpp:111:32:111:37 | call to source | string.cpp:111:19:111:40 | call to basic_string | TAINT |
+| string.cpp:113:8:113:28 | call to basic_string | string.cpp:113:3:113:28 | ... = ... |  |
+| string.cpp:113:8:113:28 | call to basic_string | string.cpp:116:8:116:9 | s2 |  |
+| string.cpp:113:20:113:25 | call to source | string.cpp:113:8:113:28 | call to basic_string | TAINT |
+| string.cpp:121:16:121:21 | call to source | string.cpp:121:16:121:24 | call to basic_string | TAINT |
+| string.cpp:121:16:121:24 | call to basic_string | string.cpp:122:15:122:15 | s |  |
+| string.cpp:121:16:121:24 | call to basic_string | string.cpp:126:33:126:33 | s |  |
+| string.cpp:121:16:121:24 | call to basic_string | string.cpp:126:50:126:50 | s |  |
+| string.cpp:121:16:121:24 | call to basic_string | string.cpp:130:16:130:16 | s |  |
+| string.cpp:122:15:122:15 | (__begin) | string.cpp:122:15:122:15 | call to operator* | TAINT |
+| string.cpp:122:15:122:15 | (__begin) | string.cpp:122:15:122:15 | call to operator++ |  |
+| string.cpp:122:15:122:15 | (__end) | string.cpp:122:15:122:15 | call to iterator |  |
+| string.cpp:122:15:122:15 | (__range) | string.cpp:122:15:122:15 | call to begin | TAINT |
+| string.cpp:122:15:122:15 | (__range) | string.cpp:122:15:122:15 | call to end | TAINT |
+| string.cpp:122:15:122:15 | call to begin | string.cpp:122:15:122:15 | (__begin) |  |
+| string.cpp:122:15:122:15 | call to begin | string.cpp:122:15:122:15 | (__begin) |  |
+| string.cpp:122:15:122:15 | call to begin | string.cpp:122:15:122:15 | (__begin) |  |
+| string.cpp:122:15:122:15 | call to end | string.cpp:122:15:122:15 | (__end) |  |
+| string.cpp:122:15:122:15 | call to operator* | string.cpp:123:8:123:8 | c |  |
+| string.cpp:122:15:122:15 | ref arg (__begin) | string.cpp:122:15:122:15 | (__begin) |  |
+| string.cpp:122:15:122:15 | ref arg (__begin) | string.cpp:122:15:122:15 | (__begin) |  |
+| string.cpp:122:15:122:15 | ref arg (__begin) | string.cpp:122:15:122:15 | (__begin) |  |
+| string.cpp:122:15:122:15 | ref arg (__begin) | string.cpp:122:15:122:15 | (__begin) |  |
+| string.cpp:122:15:122:15 | ref arg (__begin) | string.cpp:122:15:122:15 | (__begin) |  |
+| string.cpp:122:15:122:15 | ref arg (__begin) | string.cpp:122:15:122:15 | (__begin) |  |
+| string.cpp:122:15:122:15 | ref arg (__range) | string.cpp:122:15:122:15 | (__range) |  |
+| string.cpp:122:15:122:15 | s | string.cpp:122:15:122:15 | (__range) |  |
+| string.cpp:122:15:122:15 | s | string.cpp:122:15:122:15 | (__range) |  |
+| string.cpp:122:15:122:15 | s | string.cpp:122:15:122:15 | call to operator* | TAINT |
+| string.cpp:126:33:126:33 | ref arg s | string.cpp:126:50:126:50 | s |  |
+| string.cpp:126:33:126:33 | ref arg s | string.cpp:130:16:130:16 | s |  |
+| string.cpp:126:33:126:33 | s | string.cpp:126:35:126:39 | call to begin | TAINT |
+| string.cpp:126:35:126:39 | call to begin | string.cpp:126:44:126:45 | it |  |
+| string.cpp:126:35:126:39 | call to begin | string.cpp:126:61:126:62 | it |  |
+| string.cpp:126:35:126:39 | call to begin | string.cpp:127:9:127:10 | it |  |
+| string.cpp:126:50:126:50 | ref arg s | string.cpp:126:50:126:50 | s |  |
+| string.cpp:126:50:126:50 | ref arg s | string.cpp:130:16:130:16 | s |  |
+| string.cpp:126:50:126:50 | s | string.cpp:126:52:126:54 | call to end | TAINT |
+| string.cpp:126:61:126:62 | it | string.cpp:126:59:126:59 | call to operator++ |  |
+| string.cpp:126:61:126:62 | ref arg it | string.cpp:126:44:126:45 | it |  |
+| string.cpp:126:61:126:62 | ref arg it | string.cpp:126:61:126:62 | it |  |
+| string.cpp:126:61:126:62 | ref arg it | string.cpp:127:9:127:10 | it |  |
+| string.cpp:127:9:127:10 | it | string.cpp:127:8:127:8 | call to operator* | TAINT |
+| string.cpp:127:9:127:10 | ref arg it | string.cpp:126:44:126:45 | it |  |
+| string.cpp:127:9:127:10 | ref arg it | string.cpp:126:61:126:62 | it |  |
+| string.cpp:127:9:127:10 | ref arg it | string.cpp:127:9:127:10 | it |  |
+| string.cpp:130:16:130:16 | (__begin) | string.cpp:130:16:130:16 | call to operator* | TAINT |
+| string.cpp:130:16:130:16 | (__begin) | string.cpp:130:16:130:16 | call to operator++ |  |
+| string.cpp:130:16:130:16 | (__end) | string.cpp:130:16:130:16 | call to iterator |  |
+| string.cpp:130:16:130:16 | (__range) | string.cpp:130:16:130:16 | call to begin | TAINT |
+| string.cpp:130:16:130:16 | (__range) | string.cpp:130:16:130:16 | call to end | TAINT |
+| string.cpp:130:16:130:16 | call to begin | string.cpp:130:16:130:16 | (__begin) |  |
+| string.cpp:130:16:130:16 | call to begin | string.cpp:130:16:130:16 | (__begin) |  |
+| string.cpp:130:16:130:16 | call to begin | string.cpp:130:16:130:16 | (__begin) |  |
+| string.cpp:130:16:130:16 | call to end | string.cpp:130:16:130:16 | (__end) |  |
+| string.cpp:130:16:130:16 | call to operator* | string.cpp:131:8:131:8 | c |  |
+| string.cpp:130:16:130:16 | ref arg (__begin) | string.cpp:130:16:130:16 | (__begin) |  |
+| string.cpp:130:16:130:16 | ref arg (__begin) | string.cpp:130:16:130:16 | (__begin) |  |
+| string.cpp:130:16:130:16 | ref arg (__begin) | string.cpp:130:16:130:16 | (__begin) |  |
+| string.cpp:130:16:130:16 | ref arg (__begin) | string.cpp:130:16:130:16 | (__begin) |  |
+| string.cpp:130:16:130:16 | ref arg (__begin) | string.cpp:130:16:130:16 | (__begin) |  |
+| string.cpp:130:16:130:16 | ref arg (__begin) | string.cpp:130:16:130:16 | (__begin) |  |
+| string.cpp:130:16:130:16 | ref arg (__range) | string.cpp:130:16:130:16 | (__range) |  |
+| string.cpp:130:16:130:16 | s | string.cpp:130:16:130:16 | (__range) |  |
+| string.cpp:130:16:130:16 | s | string.cpp:130:16:130:16 | (__range) |  |
+| string.cpp:130:16:130:16 | s | string.cpp:130:16:130:16 | call to operator* | TAINT |
+| string.cpp:134:28:134:33 | call to source | string.cpp:134:28:134:36 | call to basic_string | TAINT |
+| string.cpp:134:28:134:36 | call to basic_string | string.cpp:135:22:135:28 | const_s |  |
+| string.cpp:135:22:135:22 | (__begin) | string.cpp:135:22:135:22 | call to operator* | TAINT |
+| string.cpp:135:22:135:22 | (__begin) | string.cpp:135:22:135:22 | call to operator++ |  |
+| string.cpp:135:22:135:22 | (__range) | string.cpp:135:22:135:22 | call to begin | TAINT |
+| string.cpp:135:22:135:22 | (__range) | string.cpp:135:22:135:22 | call to end | TAINT |
+| string.cpp:135:22:135:22 | call to begin | string.cpp:135:22:135:22 | (__begin) |  |
+| string.cpp:135:22:135:22 | call to begin | string.cpp:135:22:135:22 | (__begin) |  |
+| string.cpp:135:22:135:22 | call to begin | string.cpp:135:22:135:22 | (__begin) |  |
+| string.cpp:135:22:135:22 | call to end | string.cpp:135:22:135:22 | (__end) |  |
+| string.cpp:135:22:135:22 | call to operator* | string.cpp:136:8:136:8 | c |  |
+| string.cpp:135:22:135:22 | ref arg (__begin) | string.cpp:135:22:135:22 | (__begin) |  |
+| string.cpp:135:22:135:22 | ref arg (__begin) | string.cpp:135:22:135:22 | (__begin) |  |
+| string.cpp:135:22:135:22 | ref arg (__begin) | string.cpp:135:22:135:22 | (__begin) |  |
+| string.cpp:135:22:135:28 | const_s | string.cpp:135:22:135:22 | (__range) |  |
+| string.cpp:135:22:135:28 | const_s | string.cpp:135:22:135:22 | (__range) |  |
+| string.cpp:135:22:135:28 | const_s | string.cpp:135:22:135:22 | call to operator* | TAINT |
+| string.cpp:142:18:142:24 | hello | string.cpp:142:18:142:25 | call to basic_string | TAINT |
+| string.cpp:142:18:142:25 | call to basic_string | string.cpp:145:8:145:9 | s1 |  |
+| string.cpp:142:18:142:25 | call to basic_string | string.cpp:145:13:145:14 | s1 |  |
+| string.cpp:142:18:142:25 | call to basic_string | string.cpp:146:8:146:9 | s1 |  |
+| string.cpp:142:18:142:25 | call to basic_string | string.cpp:147:13:147:14 | s1 |  |
+| string.cpp:142:18:142:25 | call to basic_string | string.cpp:150:8:150:9 | s1 |  |
+| string.cpp:142:18:142:25 | call to basic_string | string.cpp:151:8:151:9 | s1 |  |
+| string.cpp:143:18:143:23 | call to source | string.cpp:143:18:143:26 | call to basic_string | TAINT |
+| string.cpp:143:18:143:26 | call to basic_string | string.cpp:146:13:146:14 | s2 |  |
+| string.cpp:143:18:143:26 | call to basic_string | string.cpp:147:8:147:9 | s2 |  |
+| string.cpp:143:18:143:26 | call to basic_string | string.cpp:148:8:148:9 | s2 |  |
+| string.cpp:143:18:143:26 | call to basic_string | string.cpp:148:13:148:14 | s2 |  |
 | string.cpp:145:8:145:9 | s1 | string.cpp:145:11:145:11 | call to operator+ | TAINT |
-| string.cpp:145:13:145:14 | s2 | string.cpp:145:11:145:11 | call to operator+ | TAINT |
-| string.cpp:146:8:146:9 | s2 | string.cpp:146:11:146:11 | call to operator+ | TAINT |
-| string.cpp:146:13:146:14 | s1 | string.cpp:146:11:146:11 | call to operator+ | TAINT |
+| string.cpp:145:13:145:14 | s1 | string.cpp:145:11:145:11 | call to operator+ | TAINT |
+| string.cpp:146:8:146:9 | s1 | string.cpp:146:11:146:11 | call to operator+ | TAINT |
+| string.cpp:146:13:146:14 | s2 | string.cpp:146:11:146:11 | call to operator+ | TAINT |
 | string.cpp:147:8:147:9 | s2 | string.cpp:147:11:147:11 | call to operator+ | TAINT |
-| string.cpp:147:13:147:14 | s2 | string.cpp:147:11:147:11 | call to operator+ | TAINT |
-| string.cpp:149:8:149:9 | s1 | string.cpp:149:11:149:11 | call to operator+ | TAINT |
-| string.cpp:149:13:149:20 |  world | string.cpp:149:11:149:11 | call to operator+ | TAINT |
+| string.cpp:147:13:147:14 | s1 | string.cpp:147:11:147:11 | call to operator+ | TAINT |
+| string.cpp:148:8:148:9 | s2 | string.cpp:148:11:148:11 | call to operator+ | TAINT |
+| string.cpp:148:13:148:14 | s2 | string.cpp:148:11:148:11 | call to operator+ | TAINT |
 | string.cpp:150:8:150:9 | s1 | string.cpp:150:11:150:11 | call to operator+ | TAINT |
-| string.cpp:150:13:150:18 | call to source | string.cpp:150:11:150:11 | call to operator+ | TAINT |
-| string.cpp:154:18:154:22 | abc | string.cpp:154:18:154:23 | call to basic_string | TAINT |
-| string.cpp:154:18:154:23 | call to basic_string | string.cpp:158:8:158:9 | s3 |  |
-| string.cpp:154:18:154:23 | call to basic_string | string.cpp:161:8:161:9 | s3 |  |
-| string.cpp:154:18:154:23 | call to basic_string | string.cpp:165:8:165:9 | s3 |  |
-| string.cpp:154:18:154:23 | call to basic_string | string.cpp:170:8:170:9 | s3 |  |
-| string.cpp:154:18:154:23 | call to basic_string | string.cpp:174:8:174:9 | s3 |  |
-| string.cpp:155:18:155:23 | call to source | string.cpp:155:18:155:26 | call to basic_string | TAINT |
-| string.cpp:155:18:155:26 | call to basic_string | string.cpp:158:13:158:14 | s4 |  |
-| string.cpp:155:18:155:26 | call to basic_string | string.cpp:162:14:162:15 | s4 |  |
-| string.cpp:155:18:155:26 | call to basic_string | string.cpp:171:13:171:14 | s4 |  |
-| string.cpp:158:8:158:9 | s3 | string.cpp:158:11:158:11 | call to operator+ | TAINT |
-| string.cpp:158:11:158:11 | call to operator+ | string.cpp:158:3:158:14 | ... = ... |  |
-| string.cpp:158:11:158:11 | call to operator+ | string.cpp:159:8:159:9 | s5 |  |
-| string.cpp:158:13:158:14 | s4 | string.cpp:158:11:158:11 | call to operator+ | TAINT |
-| string.cpp:161:8:161:9 | s3 | string.cpp:161:3:161:9 | ... = ... |  |
-| string.cpp:161:8:161:9 | s3 | string.cpp:162:8:162:9 | s6 |  |
-| string.cpp:161:8:161:9 | s3 | string.cpp:163:8:163:9 | s6 |  |
-| string.cpp:162:8:162:9 | ref arg s6 | string.cpp:163:8:163:9 | s6 |  |
-| string.cpp:162:8:162:9 | s6 | string.cpp:162:11:162:11 | call to operator+= | TAINT |
-| string.cpp:162:14:162:15 | s4 | string.cpp:162:8:162:9 | ref arg s6 | TAINT |
-| string.cpp:162:14:162:15 | s4 | string.cpp:162:11:162:11 | call to operator+= | TAINT |
-| string.cpp:165:8:165:9 | s3 | string.cpp:165:3:165:9 | ... = ... |  |
-| string.cpp:165:8:165:9 | s3 | string.cpp:166:8:166:9 | s7 |  |
-| string.cpp:165:8:165:9 | s3 | string.cpp:167:8:167:9 | s7 |  |
-| string.cpp:165:8:165:9 | s3 | string.cpp:168:8:168:9 | s7 |  |
-| string.cpp:166:8:166:9 | ref arg s7 | string.cpp:167:8:167:9 | s7 |  |
-| string.cpp:166:8:166:9 | ref arg s7 | string.cpp:168:8:168:9 | s7 |  |
-| string.cpp:166:8:166:9 | s7 | string.cpp:166:11:166:11 | call to operator+= | TAINT |
-| string.cpp:166:14:166:19 | call to source | string.cpp:166:8:166:9 | ref arg s7 | TAINT |
-| string.cpp:166:14:166:19 | call to source | string.cpp:166:11:166:11 | call to operator+= | TAINT |
+| string.cpp:150:13:150:20 |  world | string.cpp:150:11:150:11 | call to operator+ | TAINT |
+| string.cpp:151:8:151:9 | s1 | string.cpp:151:11:151:11 | call to operator+ | TAINT |
+| string.cpp:151:13:151:18 | call to source | string.cpp:151:11:151:11 | call to operator+ | TAINT |
+| string.cpp:155:18:155:22 | abc | string.cpp:155:18:155:23 | call to basic_string | TAINT |
+| string.cpp:155:18:155:23 | call to basic_string | string.cpp:159:8:159:9 | s3 |  |
+| string.cpp:155:18:155:23 | call to basic_string | string.cpp:162:8:162:9 | s3 |  |
+| string.cpp:155:18:155:23 | call to basic_string | string.cpp:166:8:166:9 | s3 |  |
+| string.cpp:155:18:155:23 | call to basic_string | string.cpp:171:8:171:9 | s3 |  |
+| string.cpp:155:18:155:23 | call to basic_string | string.cpp:175:8:175:9 | s3 |  |
+| string.cpp:156:18:156:23 | call to source | string.cpp:156:18:156:26 | call to basic_string | TAINT |
+| string.cpp:156:18:156:26 | call to basic_string | string.cpp:159:13:159:14 | s4 |  |
+| string.cpp:156:18:156:26 | call to basic_string | string.cpp:163:14:163:15 | s4 |  |
+| string.cpp:156:18:156:26 | call to basic_string | string.cpp:172:13:172:14 | s4 |  |
+| string.cpp:159:8:159:9 | s3 | string.cpp:159:11:159:11 | call to operator+ | TAINT |
+| string.cpp:159:11:159:11 | call to operator+ | string.cpp:159:3:159:14 | ... = ... |  |
+| string.cpp:159:11:159:11 | call to operator+ | string.cpp:160:8:160:9 | s5 |  |
+| string.cpp:159:13:159:14 | s4 | string.cpp:159:11:159:11 | call to operator+ | TAINT |
+| string.cpp:162:8:162:9 | s3 | string.cpp:162:3:162:9 | ... = ... |  |
+| string.cpp:162:8:162:9 | s3 | string.cpp:163:8:163:9 | s6 |  |
+| string.cpp:162:8:162:9 | s3 | string.cpp:164:8:164:9 | s6 |  |
+| string.cpp:163:8:163:9 | ref arg s6 | string.cpp:164:8:164:9 | s6 |  |
+| string.cpp:163:8:163:9 | s6 | string.cpp:163:11:163:11 | call to operator+= | TAINT |
+| string.cpp:163:14:163:15 | s4 | string.cpp:163:8:163:9 | ref arg s6 | TAINT |
+| string.cpp:163:14:163:15 | s4 | string.cpp:163:11:163:11 | call to operator+= | TAINT |
+| string.cpp:166:8:166:9 | s3 | string.cpp:166:3:166:9 | ... = ... |  |
+| string.cpp:166:8:166:9 | s3 | string.cpp:167:8:167:9 | s7 |  |
+| string.cpp:166:8:166:9 | s3 | string.cpp:168:8:168:9 | s7 |  |
+| string.cpp:166:8:166:9 | s3 | string.cpp:169:8:169:9 | s7 |  |
 | string.cpp:167:8:167:9 | ref arg s7 | string.cpp:168:8:168:9 | s7 |  |
+| string.cpp:167:8:167:9 | ref arg s7 | string.cpp:169:8:169:9 | s7 |  |
 | string.cpp:167:8:167:9 | s7 | string.cpp:167:11:167:11 | call to operator+= | TAINT |
-| string.cpp:167:14:167:16 |   | string.cpp:167:8:167:9 | ref arg s7 | TAINT |
-| string.cpp:167:14:167:16 |   | string.cpp:167:11:167:11 | call to operator+= | TAINT |
-| string.cpp:170:8:170:9 | s3 | string.cpp:170:3:170:9 | ... = ... |  |
-| string.cpp:170:8:170:9 | s3 | string.cpp:171:3:171:4 | s8 |  |
-| string.cpp:170:8:170:9 | s3 | string.cpp:172:8:172:9 | s8 |  |
-| string.cpp:171:3:171:4 | ref arg s8 | string.cpp:172:8:172:9 | s8 |  |
-| string.cpp:171:3:171:4 | s8 | string.cpp:171:6:171:11 | call to append | TAINT |
-| string.cpp:171:13:171:14 | s4 | string.cpp:171:3:171:4 | ref arg s8 | TAINT |
-| string.cpp:171:13:171:14 | s4 | string.cpp:171:6:171:11 | call to append | TAINT |
-| string.cpp:174:8:174:9 | s3 | string.cpp:174:3:174:9 | ... = ... |  |
-| string.cpp:174:8:174:9 | s3 | string.cpp:175:3:175:4 | s9 |  |
-| string.cpp:174:8:174:9 | s3 | string.cpp:176:3:176:4 | s9 |  |
-| string.cpp:174:8:174:9 | s3 | string.cpp:177:8:177:9 | s9 |  |
-| string.cpp:175:3:175:4 | ref arg s9 | string.cpp:176:3:176:4 | s9 |  |
-| string.cpp:175:3:175:4 | ref arg s9 | string.cpp:177:8:177:9 | s9 |  |
-| string.cpp:175:3:175:4 | s9 | string.cpp:175:6:175:11 | call to append | TAINT |
-| string.cpp:175:13:175:18 | call to source | string.cpp:175:3:175:4 | ref arg s9 | TAINT |
-| string.cpp:175:13:175:18 | call to source | string.cpp:175:6:175:11 | call to append | TAINT |
-| string.cpp:176:3:176:4 | ref arg s9 | string.cpp:177:8:177:9 | s9 |  |
+| string.cpp:167:14:167:19 | call to source | string.cpp:167:8:167:9 | ref arg s7 | TAINT |
+| string.cpp:167:14:167:19 | call to source | string.cpp:167:11:167:11 | call to operator+= | TAINT |
+| string.cpp:168:8:168:9 | ref arg s7 | string.cpp:169:8:169:9 | s7 |  |
+| string.cpp:168:8:168:9 | s7 | string.cpp:168:11:168:11 | call to operator+= | TAINT |
+| string.cpp:168:14:168:16 |   | string.cpp:168:8:168:9 | ref arg s7 | TAINT |
+| string.cpp:168:14:168:16 |   | string.cpp:168:11:168:11 | call to operator+= | TAINT |
+| string.cpp:171:8:171:9 | s3 | string.cpp:171:3:171:9 | ... = ... |  |
+| string.cpp:171:8:171:9 | s3 | string.cpp:172:3:172:4 | s8 |  |
+| string.cpp:171:8:171:9 | s3 | string.cpp:173:8:173:9 | s8 |  |
+| string.cpp:172:3:172:4 | ref arg s8 | string.cpp:173:8:173:9 | s8 |  |
+| string.cpp:172:3:172:4 | s8 | string.cpp:172:6:172:11 | call to append | TAINT |
+| string.cpp:172:13:172:14 | s4 | string.cpp:172:3:172:4 | ref arg s8 | TAINT |
+| string.cpp:172:13:172:14 | s4 | string.cpp:172:6:172:11 | call to append | TAINT |
+| string.cpp:175:8:175:9 | s3 | string.cpp:175:3:175:9 | ... = ... |  |
+| string.cpp:175:8:175:9 | s3 | string.cpp:176:3:176:4 | s9 |  |
+| string.cpp:175:8:175:9 | s3 | string.cpp:177:3:177:4 | s9 |  |
+| string.cpp:175:8:175:9 | s3 | string.cpp:178:8:178:9 | s9 |  |
+| string.cpp:176:3:176:4 | ref arg s9 | string.cpp:177:3:177:4 | s9 |  |
+| string.cpp:176:3:176:4 | ref arg s9 | string.cpp:178:8:178:9 | s9 |  |
 | string.cpp:176:3:176:4 | s9 | string.cpp:176:6:176:11 | call to append | TAINT |
-| string.cpp:176:13:176:15 |   | string.cpp:176:3:176:4 | ref arg s9 | TAINT |
-| string.cpp:176:13:176:15 |   | string.cpp:176:6:176:11 | call to append | TAINT |
-| string.cpp:181:19:181:23 | abc | string.cpp:181:19:181:24 | call to basic_string | TAINT |
-| string.cpp:181:19:181:24 | call to basic_string | string.cpp:184:3:184:5 | s10 |  |
-| string.cpp:181:19:181:24 | call to basic_string | string.cpp:185:8:185:10 | s10 |  |
-| string.cpp:182:12:182:26 | call to source | string.cpp:184:17:184:17 | c |  |
-| string.cpp:184:3:184:5 | ref arg s10 | string.cpp:185:8:185:10 | s10 |  |
-| string.cpp:184:3:184:5 | s10 | string.cpp:184:7:184:12 | call to append | TAINT |
-| string.cpp:184:17:184:17 | c | string.cpp:184:3:184:5 | ref arg s10 | TAINT |
-| string.cpp:184:17:184:17 | c | string.cpp:184:7:184:12 | call to append | TAINT |
-| string.cpp:190:17:190:23 | hello | string.cpp:190:17:190:24 | call to basic_string | TAINT |
-| string.cpp:190:17:190:24 | call to basic_string | string.cpp:196:17:196:18 | s1 |  |
-| string.cpp:190:17:190:24 | call to basic_string | string.cpp:205:17:205:18 | s1 |  |
-| string.cpp:191:17:191:22 | call to source | string.cpp:191:17:191:25 | call to basic_string | TAINT |
-| string.cpp:191:17:191:25 | call to basic_string | string.cpp:199:17:199:18 | s2 |  |
-| string.cpp:192:11:192:25 | call to source | string.cpp:202:21:202:21 | c |  |
-| string.cpp:193:14:193:15 | call to basic_string | string.cpp:196:7:196:8 | s3 |  |
-| string.cpp:193:14:193:15 | call to basic_string | string.cpp:197:7:197:8 | s3 |  |
-| string.cpp:193:18:193:19 | call to basic_string | string.cpp:199:7:199:8 | s4 |  |
-| string.cpp:193:18:193:19 | call to basic_string | string.cpp:200:7:200:8 | s4 |  |
-| string.cpp:193:22:193:23 | call to basic_string | string.cpp:202:7:202:8 | s5 |  |
-| string.cpp:193:22:193:23 | call to basic_string | string.cpp:203:7:203:8 | s5 |  |
-| string.cpp:194:17:194:22 | call to source | string.cpp:194:17:194:25 | call to basic_string | TAINT |
-| string.cpp:194:17:194:25 | call to basic_string | string.cpp:205:7:205:8 | s6 |  |
-| string.cpp:194:17:194:25 | call to basic_string | string.cpp:206:7:206:8 | s6 |  |
-| string.cpp:196:7:196:8 | ref arg s3 | string.cpp:197:7:197:8 | s3 |  |
-| string.cpp:196:17:196:18 | s1 | string.cpp:196:7:196:8 | ref arg s3 | TAINT |
-| string.cpp:196:17:196:18 | s1 | string.cpp:196:10:196:15 | call to assign | TAINT |
-| string.cpp:199:7:199:8 | ref arg s4 | string.cpp:200:7:200:8 | s4 |  |
-| string.cpp:199:17:199:18 | s2 | string.cpp:199:7:199:8 | ref arg s4 | TAINT |
-| string.cpp:199:17:199:18 | s2 | string.cpp:199:10:199:15 | call to assign | TAINT |
-| string.cpp:202:7:202:8 | ref arg s5 | string.cpp:203:7:203:8 | s5 |  |
-| string.cpp:202:21:202:21 | c | string.cpp:202:7:202:8 | ref arg s5 | TAINT |
-| string.cpp:202:21:202:21 | c | string.cpp:202:10:202:15 | call to assign | TAINT |
-| string.cpp:205:7:205:8 | ref arg s6 | string.cpp:206:7:206:8 | s6 |  |
-| string.cpp:205:17:205:18 | s1 | string.cpp:205:7:205:8 | ref arg s6 | TAINT |
-| string.cpp:205:17:205:18 | s1 | string.cpp:205:10:205:15 | call to assign | TAINT |
-| string.cpp:210:17:210:23 | hello | string.cpp:210:17:210:24 | call to basic_string | TAINT |
-| string.cpp:210:17:210:24 | call to basic_string | string.cpp:215:7:215:8 | s1 |  |
-| string.cpp:210:17:210:24 | call to basic_string | string.cpp:216:20:216:21 | s1 |  |
-| string.cpp:210:17:210:24 | call to basic_string | string.cpp:220:20:220:21 | s1 |  |
-| string.cpp:210:17:210:24 | call to basic_string | string.cpp:223:7:223:8 | s1 |  |
-| string.cpp:210:17:210:24 | call to basic_string | string.cpp:227:7:227:8 | s1 |  |
-| string.cpp:211:17:211:22 | call to source | string.cpp:211:17:211:25 | call to basic_string | TAINT |
-| string.cpp:211:17:211:25 | call to basic_string | string.cpp:219:7:219:8 | s2 |  |
-| string.cpp:211:17:211:25 | call to basic_string | string.cpp:224:20:224:21 | s2 |  |
-| string.cpp:212:11:212:25 | call to source | string.cpp:228:24:228:24 | c |  |
-| string.cpp:215:7:215:8 | s1 | string.cpp:215:2:215:8 | ... = ... |  |
-| string.cpp:215:7:215:8 | s1 | string.cpp:216:7:216:8 | s3 |  |
-| string.cpp:215:7:215:8 | s1 | string.cpp:217:7:217:8 | s3 |  |
-| string.cpp:216:7:216:8 | ref arg s3 | string.cpp:217:7:217:8 | s3 |  |
-| string.cpp:216:7:216:8 | s3 | string.cpp:216:10:216:15 | call to insert | TAINT |
-| string.cpp:216:20:216:21 | s1 | string.cpp:216:7:216:8 | ref arg s3 | TAINT |
-| string.cpp:216:20:216:21 | s1 | string.cpp:216:10:216:15 | call to insert | TAINT |
-| string.cpp:219:7:219:8 | s2 | string.cpp:219:2:219:8 | ... = ... |  |
-| string.cpp:219:7:219:8 | s2 | string.cpp:220:7:220:8 | s4 |  |
-| string.cpp:219:7:219:8 | s2 | string.cpp:221:7:221:8 | s4 |  |
-| string.cpp:220:7:220:8 | ref arg s4 | string.cpp:221:7:221:8 | s4 |  |
-| string.cpp:220:7:220:8 | s4 | string.cpp:220:10:220:15 | call to insert | TAINT |
-| string.cpp:220:20:220:21 | s1 | string.cpp:220:7:220:8 | ref arg s4 | TAINT |
-| string.cpp:220:20:220:21 | s1 | string.cpp:220:10:220:15 | call to insert | TAINT |
-| string.cpp:223:7:223:8 | s1 | string.cpp:223:2:223:8 | ... = ... |  |
-| string.cpp:223:7:223:8 | s1 | string.cpp:224:7:224:8 | s5 |  |
-| string.cpp:223:7:223:8 | s1 | string.cpp:225:7:225:8 | s5 |  |
-| string.cpp:224:7:224:8 | ref arg s5 | string.cpp:225:7:225:8 | s5 |  |
-| string.cpp:224:7:224:8 | s5 | string.cpp:224:10:224:15 | call to insert | TAINT |
-| string.cpp:224:20:224:21 | s2 | string.cpp:224:7:224:8 | ref arg s5 | TAINT |
-| string.cpp:224:20:224:21 | s2 | string.cpp:224:10:224:15 | call to insert | TAINT |
-| string.cpp:227:7:227:8 | s1 | string.cpp:227:2:227:8 | ... = ... |  |
-| string.cpp:227:7:227:8 | s1 | string.cpp:228:7:228:8 | s6 |  |
-| string.cpp:227:7:227:8 | s1 | string.cpp:229:7:229:8 | s6 |  |
-| string.cpp:228:7:228:8 | ref arg s6 | string.cpp:229:7:229:8 | s6 |  |
-| string.cpp:228:7:228:8 | s6 | string.cpp:228:10:228:15 | call to insert | TAINT |
-| string.cpp:228:24:228:24 | c | string.cpp:228:7:228:8 | ref arg s6 | TAINT |
-| string.cpp:228:24:228:24 | c | string.cpp:228:10:228:15 | call to insert | TAINT |
-| string.cpp:233:17:233:23 | hello | string.cpp:233:17:233:24 | call to basic_string | TAINT |
-| string.cpp:233:17:233:24 | call to basic_string | string.cpp:238:7:238:8 | s1 |  |
-| string.cpp:233:17:233:24 | call to basic_string | string.cpp:239:24:239:25 | s1 |  |
-| string.cpp:233:17:233:24 | call to basic_string | string.cpp:243:24:243:25 | s1 |  |
-| string.cpp:233:17:233:24 | call to basic_string | string.cpp:246:7:246:8 | s1 |  |
-| string.cpp:233:17:233:24 | call to basic_string | string.cpp:250:7:250:8 | s1 |  |
-| string.cpp:234:17:234:22 | call to source | string.cpp:234:17:234:25 | call to basic_string | TAINT |
-| string.cpp:234:17:234:25 | call to basic_string | string.cpp:242:7:242:8 | s2 |  |
-| string.cpp:234:17:234:25 | call to basic_string | string.cpp:247:24:247:25 | s2 |  |
-| string.cpp:235:11:235:25 | call to source | string.cpp:251:28:251:28 | c |  |
-| string.cpp:238:7:238:8 | s1 | string.cpp:238:2:238:8 | ... = ... |  |
-| string.cpp:238:7:238:8 | s1 | string.cpp:239:7:239:8 | s3 |  |
-| string.cpp:238:7:238:8 | s1 | string.cpp:240:7:240:8 | s3 |  |
-| string.cpp:239:7:239:8 | ref arg s3 | string.cpp:240:7:240:8 | s3 |  |
-| string.cpp:239:7:239:8 | s3 | string.cpp:239:10:239:16 | call to replace | TAINT |
-| string.cpp:239:24:239:25 | s1 | string.cpp:239:7:239:8 | ref arg s3 | TAINT |
-| string.cpp:239:24:239:25 | s1 | string.cpp:239:10:239:16 | call to replace | TAINT |
-| string.cpp:242:7:242:8 | s2 | string.cpp:242:2:242:8 | ... = ... |  |
-| string.cpp:242:7:242:8 | s2 | string.cpp:243:7:243:8 | s4 |  |
-| string.cpp:242:7:242:8 | s2 | string.cpp:244:7:244:8 | s4 |  |
-| string.cpp:243:7:243:8 | ref arg s4 | string.cpp:244:7:244:8 | s4 |  |
-| string.cpp:243:7:243:8 | s4 | string.cpp:243:10:243:16 | call to replace | TAINT |
-| string.cpp:243:24:243:25 | s1 | string.cpp:243:7:243:8 | ref arg s4 | TAINT |
-| string.cpp:243:24:243:25 | s1 | string.cpp:243:10:243:16 | call to replace | TAINT |
-| string.cpp:246:7:246:8 | s1 | string.cpp:246:2:246:8 | ... = ... |  |
-| string.cpp:246:7:246:8 | s1 | string.cpp:247:7:247:8 | s5 |  |
-| string.cpp:246:7:246:8 | s1 | string.cpp:248:7:248:8 | s5 |  |
-| string.cpp:247:7:247:8 | ref arg s5 | string.cpp:248:7:248:8 | s5 |  |
-| string.cpp:247:7:247:8 | s5 | string.cpp:247:10:247:16 | call to replace | TAINT |
-| string.cpp:247:24:247:25 | s2 | string.cpp:247:7:247:8 | ref arg s5 | TAINT |
-| string.cpp:247:24:247:25 | s2 | string.cpp:247:10:247:16 | call to replace | TAINT |
-| string.cpp:250:7:250:8 | s1 | string.cpp:250:2:250:8 | ... = ... |  |
-| string.cpp:250:7:250:8 | s1 | string.cpp:251:7:251:8 | s6 |  |
-| string.cpp:250:7:250:8 | s1 | string.cpp:252:7:252:8 | s6 |  |
-| string.cpp:251:7:251:8 | ref arg s6 | string.cpp:252:7:252:8 | s6 |  |
-| string.cpp:251:7:251:8 | s6 | string.cpp:251:10:251:16 | call to replace | TAINT |
-| string.cpp:251:28:251:28 | c | string.cpp:251:7:251:8 | ref arg s6 | TAINT |
-| string.cpp:251:28:251:28 | c | string.cpp:251:10:251:16 | call to replace | TAINT |
-| string.cpp:256:17:256:20 | {...} | string.cpp:261:10:261:11 | b1 |  |
-| string.cpp:256:17:256:20 | {...} | string.cpp:262:7:262:8 | b1 |  |
-| string.cpp:256:19:256:19 | 0 | string.cpp:256:17:256:20 | {...} | TAINT |
-| string.cpp:257:17:257:20 | {...} | string.cpp:264:10:264:11 | b2 |  |
-| string.cpp:257:17:257:20 | {...} | string.cpp:265:7:265:8 | b2 |  |
+| string.cpp:176:13:176:18 | call to source | string.cpp:176:3:176:4 | ref arg s9 | TAINT |
+| string.cpp:176:13:176:18 | call to source | string.cpp:176:6:176:11 | call to append | TAINT |
+| string.cpp:177:3:177:4 | ref arg s9 | string.cpp:178:8:178:9 | s9 |  |
+| string.cpp:177:3:177:4 | s9 | string.cpp:177:6:177:11 | call to append | TAINT |
+| string.cpp:177:13:177:15 |   | string.cpp:177:3:177:4 | ref arg s9 | TAINT |
+| string.cpp:177:13:177:15 |   | string.cpp:177:6:177:11 | call to append | TAINT |
+| string.cpp:182:19:182:23 | abc | string.cpp:182:19:182:24 | call to basic_string | TAINT |
+| string.cpp:182:19:182:24 | call to basic_string | string.cpp:185:3:185:5 | s10 |  |
+| string.cpp:182:19:182:24 | call to basic_string | string.cpp:186:8:186:10 | s10 |  |
+| string.cpp:183:12:183:26 | call to source | string.cpp:185:17:185:17 | c |  |
+| string.cpp:185:3:185:5 | ref arg s10 | string.cpp:186:8:186:10 | s10 |  |
+| string.cpp:185:3:185:5 | s10 | string.cpp:185:7:185:12 | call to append | TAINT |
+| string.cpp:185:17:185:17 | c | string.cpp:185:3:185:5 | ref arg s10 | TAINT |
+| string.cpp:185:17:185:17 | c | string.cpp:185:7:185:12 | call to append | TAINT |
+| string.cpp:191:17:191:23 | hello | string.cpp:191:17:191:24 | call to basic_string | TAINT |
+| string.cpp:191:17:191:24 | call to basic_string | string.cpp:197:17:197:18 | s1 |  |
+| string.cpp:191:17:191:24 | call to basic_string | string.cpp:206:17:206:18 | s1 |  |
+| string.cpp:192:17:192:22 | call to source | string.cpp:192:17:192:25 | call to basic_string | TAINT |
+| string.cpp:192:17:192:25 | call to basic_string | string.cpp:200:17:200:18 | s2 |  |
+| string.cpp:193:11:193:25 | call to source | string.cpp:203:21:203:21 | c |  |
+| string.cpp:194:14:194:15 | call to basic_string | string.cpp:197:7:197:8 | s3 |  |
+| string.cpp:194:14:194:15 | call to basic_string | string.cpp:198:7:198:8 | s3 |  |
+| string.cpp:194:18:194:19 | call to basic_string | string.cpp:200:7:200:8 | s4 |  |
+| string.cpp:194:18:194:19 | call to basic_string | string.cpp:201:7:201:8 | s4 |  |
+| string.cpp:194:22:194:23 | call to basic_string | string.cpp:203:7:203:8 | s5 |  |
+| string.cpp:194:22:194:23 | call to basic_string | string.cpp:204:7:204:8 | s5 |  |
+| string.cpp:195:17:195:22 | call to source | string.cpp:195:17:195:25 | call to basic_string | TAINT |
+| string.cpp:195:17:195:25 | call to basic_string | string.cpp:206:7:206:8 | s6 |  |
+| string.cpp:195:17:195:25 | call to basic_string | string.cpp:207:7:207:8 | s6 |  |
+| string.cpp:197:7:197:8 | ref arg s3 | string.cpp:198:7:198:8 | s3 |  |
+| string.cpp:197:17:197:18 | s1 | string.cpp:197:7:197:8 | ref arg s3 | TAINT |
+| string.cpp:197:17:197:18 | s1 | string.cpp:197:10:197:15 | call to assign | TAINT |
+| string.cpp:200:7:200:8 | ref arg s4 | string.cpp:201:7:201:8 | s4 |  |
+| string.cpp:200:17:200:18 | s2 | string.cpp:200:7:200:8 | ref arg s4 | TAINT |
+| string.cpp:200:17:200:18 | s2 | string.cpp:200:10:200:15 | call to assign | TAINT |
+| string.cpp:203:7:203:8 | ref arg s5 | string.cpp:204:7:204:8 | s5 |  |
+| string.cpp:203:21:203:21 | c | string.cpp:203:7:203:8 | ref arg s5 | TAINT |
+| string.cpp:203:21:203:21 | c | string.cpp:203:10:203:15 | call to assign | TAINT |
+| string.cpp:206:7:206:8 | ref arg s6 | string.cpp:207:7:207:8 | s6 |  |
+| string.cpp:206:17:206:18 | s1 | string.cpp:206:7:206:8 | ref arg s6 | TAINT |
+| string.cpp:206:17:206:18 | s1 | string.cpp:206:10:206:15 | call to assign | TAINT |
+| string.cpp:211:17:211:23 | hello | string.cpp:211:17:211:24 | call to basic_string | TAINT |
+| string.cpp:211:17:211:24 | call to basic_string | string.cpp:216:7:216:8 | s1 |  |
+| string.cpp:211:17:211:24 | call to basic_string | string.cpp:217:20:217:21 | s1 |  |
+| string.cpp:211:17:211:24 | call to basic_string | string.cpp:221:20:221:21 | s1 |  |
+| string.cpp:211:17:211:24 | call to basic_string | string.cpp:224:7:224:8 | s1 |  |
+| string.cpp:211:17:211:24 | call to basic_string | string.cpp:228:7:228:8 | s1 |  |
+| string.cpp:212:17:212:22 | call to source | string.cpp:212:17:212:25 | call to basic_string | TAINT |
+| string.cpp:212:17:212:25 | call to basic_string | string.cpp:220:7:220:8 | s2 |  |
+| string.cpp:212:17:212:25 | call to basic_string | string.cpp:225:20:225:21 | s2 |  |
+| string.cpp:213:11:213:25 | call to source | string.cpp:229:24:229:24 | c |  |
+| string.cpp:216:7:216:8 | s1 | string.cpp:216:2:216:8 | ... = ... |  |
+| string.cpp:216:7:216:8 | s1 | string.cpp:217:7:217:8 | s3 |  |
+| string.cpp:216:7:216:8 | s1 | string.cpp:218:7:218:8 | s3 |  |
+| string.cpp:217:7:217:8 | ref arg s3 | string.cpp:218:7:218:8 | s3 |  |
+| string.cpp:217:7:217:8 | s3 | string.cpp:217:10:217:15 | call to insert | TAINT |
+| string.cpp:217:20:217:21 | s1 | string.cpp:217:7:217:8 | ref arg s3 | TAINT |
+| string.cpp:217:20:217:21 | s1 | string.cpp:217:10:217:15 | call to insert | TAINT |
+| string.cpp:220:7:220:8 | s2 | string.cpp:220:2:220:8 | ... = ... |  |
+| string.cpp:220:7:220:8 | s2 | string.cpp:221:7:221:8 | s4 |  |
+| string.cpp:220:7:220:8 | s2 | string.cpp:222:7:222:8 | s4 |  |
+| string.cpp:221:7:221:8 | ref arg s4 | string.cpp:222:7:222:8 | s4 |  |
+| string.cpp:221:7:221:8 | s4 | string.cpp:221:10:221:15 | call to insert | TAINT |
+| string.cpp:221:20:221:21 | s1 | string.cpp:221:7:221:8 | ref arg s4 | TAINT |
+| string.cpp:221:20:221:21 | s1 | string.cpp:221:10:221:15 | call to insert | TAINT |
+| string.cpp:224:7:224:8 | s1 | string.cpp:224:2:224:8 | ... = ... |  |
+| string.cpp:224:7:224:8 | s1 | string.cpp:225:7:225:8 | s5 |  |
+| string.cpp:224:7:224:8 | s1 | string.cpp:226:7:226:8 | s5 |  |
+| string.cpp:225:7:225:8 | ref arg s5 | string.cpp:226:7:226:8 | s5 |  |
+| string.cpp:225:7:225:8 | s5 | string.cpp:225:10:225:15 | call to insert | TAINT |
+| string.cpp:225:20:225:21 | s2 | string.cpp:225:7:225:8 | ref arg s5 | TAINT |
+| string.cpp:225:20:225:21 | s2 | string.cpp:225:10:225:15 | call to insert | TAINT |
+| string.cpp:228:7:228:8 | s1 | string.cpp:228:2:228:8 | ... = ... |  |
+| string.cpp:228:7:228:8 | s1 | string.cpp:229:7:229:8 | s6 |  |
+| string.cpp:228:7:228:8 | s1 | string.cpp:230:7:230:8 | s6 |  |
+| string.cpp:229:7:229:8 | ref arg s6 | string.cpp:230:7:230:8 | s6 |  |
+| string.cpp:229:7:229:8 | s6 | string.cpp:229:10:229:15 | call to insert | TAINT |
+| string.cpp:229:24:229:24 | c | string.cpp:229:7:229:8 | ref arg s6 | TAINT |
+| string.cpp:229:24:229:24 | c | string.cpp:229:10:229:15 | call to insert | TAINT |
+| string.cpp:234:17:234:23 | hello | string.cpp:234:17:234:24 | call to basic_string | TAINT |
+| string.cpp:234:17:234:24 | call to basic_string | string.cpp:239:7:239:8 | s1 |  |
+| string.cpp:234:17:234:24 | call to basic_string | string.cpp:240:24:240:25 | s1 |  |
+| string.cpp:234:17:234:24 | call to basic_string | string.cpp:244:24:244:25 | s1 |  |
+| string.cpp:234:17:234:24 | call to basic_string | string.cpp:247:7:247:8 | s1 |  |
+| string.cpp:234:17:234:24 | call to basic_string | string.cpp:251:7:251:8 | s1 |  |
+| string.cpp:235:17:235:22 | call to source | string.cpp:235:17:235:25 | call to basic_string | TAINT |
+| string.cpp:235:17:235:25 | call to basic_string | string.cpp:243:7:243:8 | s2 |  |
+| string.cpp:235:17:235:25 | call to basic_string | string.cpp:248:24:248:25 | s2 |  |
+| string.cpp:236:11:236:25 | call to source | string.cpp:252:28:252:28 | c |  |
+| string.cpp:239:7:239:8 | s1 | string.cpp:239:2:239:8 | ... = ... |  |
+| string.cpp:239:7:239:8 | s1 | string.cpp:240:7:240:8 | s3 |  |
+| string.cpp:239:7:239:8 | s1 | string.cpp:241:7:241:8 | s3 |  |
+| string.cpp:240:7:240:8 | ref arg s3 | string.cpp:241:7:241:8 | s3 |  |
+| string.cpp:240:7:240:8 | s3 | string.cpp:240:10:240:16 | call to replace | TAINT |
+| string.cpp:240:24:240:25 | s1 | string.cpp:240:7:240:8 | ref arg s3 | TAINT |
+| string.cpp:240:24:240:25 | s1 | string.cpp:240:10:240:16 | call to replace | TAINT |
+| string.cpp:243:7:243:8 | s2 | string.cpp:243:2:243:8 | ... = ... |  |
+| string.cpp:243:7:243:8 | s2 | string.cpp:244:7:244:8 | s4 |  |
+| string.cpp:243:7:243:8 | s2 | string.cpp:245:7:245:8 | s4 |  |
+| string.cpp:244:7:244:8 | ref arg s4 | string.cpp:245:7:245:8 | s4 |  |
+| string.cpp:244:7:244:8 | s4 | string.cpp:244:10:244:16 | call to replace | TAINT |
+| string.cpp:244:24:244:25 | s1 | string.cpp:244:7:244:8 | ref arg s4 | TAINT |
+| string.cpp:244:24:244:25 | s1 | string.cpp:244:10:244:16 | call to replace | TAINT |
+| string.cpp:247:7:247:8 | s1 | string.cpp:247:2:247:8 | ... = ... |  |
+| string.cpp:247:7:247:8 | s1 | string.cpp:248:7:248:8 | s5 |  |
+| string.cpp:247:7:247:8 | s1 | string.cpp:249:7:249:8 | s5 |  |
+| string.cpp:248:7:248:8 | ref arg s5 | string.cpp:249:7:249:8 | s5 |  |
+| string.cpp:248:7:248:8 | s5 | string.cpp:248:10:248:16 | call to replace | TAINT |
+| string.cpp:248:24:248:25 | s2 | string.cpp:248:7:248:8 | ref arg s5 | TAINT |
+| string.cpp:248:24:248:25 | s2 | string.cpp:248:10:248:16 | call to replace | TAINT |
+| string.cpp:251:7:251:8 | s1 | string.cpp:251:2:251:8 | ... = ... |  |
+| string.cpp:251:7:251:8 | s1 | string.cpp:252:7:252:8 | s6 |  |
+| string.cpp:251:7:251:8 | s1 | string.cpp:253:7:253:8 | s6 |  |
+| string.cpp:252:7:252:8 | ref arg s6 | string.cpp:253:7:253:8 | s6 |  |
+| string.cpp:252:7:252:8 | s6 | string.cpp:252:10:252:16 | call to replace | TAINT |
+| string.cpp:252:28:252:28 | c | string.cpp:252:7:252:8 | ref arg s6 | TAINT |
+| string.cpp:252:28:252:28 | c | string.cpp:252:10:252:16 | call to replace | TAINT |
+| string.cpp:257:17:257:20 | {...} | string.cpp:262:10:262:11 | b1 |  |
+| string.cpp:257:17:257:20 | {...} | string.cpp:263:7:263:8 | b1 |  |
 | string.cpp:257:19:257:19 | 0 | string.cpp:257:17:257:20 | {...} | TAINT |
-| string.cpp:258:17:258:23 | hello | string.cpp:258:17:258:24 | call to basic_string | TAINT |
-| string.cpp:258:17:258:24 | call to basic_string | string.cpp:261:2:261:3 | s1 |  |
-| string.cpp:258:17:258:24 | call to basic_string | string.cpp:261:14:261:15 | s1 |  |
-| string.cpp:258:17:258:24 | call to basic_string | string.cpp:264:14:264:15 | s1 |  |
-| string.cpp:259:17:259:22 | call to source | string.cpp:259:17:259:25 | call to basic_string | TAINT |
-| string.cpp:259:17:259:25 | call to basic_string | string.cpp:264:2:264:3 | s2 |  |
-| string.cpp:261:2:261:3 | s1 | string.cpp:261:10:261:11 | ref arg b1 | TAINT |
-| string.cpp:261:10:261:11 | ref arg b1 | string.cpp:262:7:262:8 | b1 |  |
-| string.cpp:264:2:264:3 | s2 | string.cpp:264:10:264:11 | ref arg b2 | TAINT |
-| string.cpp:264:10:264:11 | ref arg b2 | string.cpp:265:7:265:8 | b2 |  |
-| string.cpp:269:17:269:23 | hello | string.cpp:269:17:269:24 | call to basic_string | TAINT |
-| string.cpp:269:17:269:24 | call to basic_string | string.cpp:274:7:274:8 | s1 |  |
-| string.cpp:269:17:269:24 | call to basic_string | string.cpp:279:2:279:3 | s1 |  |
-| string.cpp:269:17:269:24 | call to basic_string | string.cpp:282:7:282:8 | s1 |  |
-| string.cpp:270:17:270:22 | call to source | string.cpp:270:17:270:25 | call to basic_string | TAINT |
-| string.cpp:270:17:270:25 | call to basic_string | string.cpp:275:7:275:8 | s2 |  |
-| string.cpp:270:17:270:25 | call to basic_string | string.cpp:279:10:279:11 | s2 |  |
-| string.cpp:270:17:270:25 | call to basic_string | string.cpp:283:7:283:8 | s2 |  |
-| string.cpp:271:17:271:23 | world | string.cpp:271:17:271:24 | call to basic_string | TAINT |
-| string.cpp:271:17:271:24 | call to basic_string | string.cpp:276:7:276:8 | s3 |  |
-| string.cpp:271:17:271:24 | call to basic_string | string.cpp:280:10:280:11 | s3 |  |
-| string.cpp:271:17:271:24 | call to basic_string | string.cpp:284:7:284:8 | s3 |  |
-| string.cpp:272:17:272:22 | call to source | string.cpp:272:17:272:25 | call to basic_string | TAINT |
-| string.cpp:272:17:272:25 | call to basic_string | string.cpp:277:7:277:8 | s4 |  |
-| string.cpp:272:17:272:25 | call to basic_string | string.cpp:280:2:280:3 | s4 |  |
-| string.cpp:272:17:272:25 | call to basic_string | string.cpp:285:7:285:8 | s4 |  |
-| string.cpp:279:2:279:3 | ref arg s1 | string.cpp:282:7:282:8 | s1 |  |
-| string.cpp:279:10:279:11 | ref arg s2 | string.cpp:283:7:283:8 | s2 |  |
-| string.cpp:280:2:280:3 | ref arg s4 | string.cpp:285:7:285:8 | s4 |  |
-| string.cpp:280:10:280:11 | ref arg s3 | string.cpp:284:7:284:8 | s3 |  |
-| string.cpp:289:17:289:22 | call to source | string.cpp:289:17:289:25 | call to basic_string | TAINT |
-| string.cpp:289:17:289:25 | call to basic_string | string.cpp:293:7:293:8 | s1 |  |
-| string.cpp:289:17:289:25 | call to basic_string | string.cpp:297:2:297:3 | s1 |  |
-| string.cpp:289:17:289:25 | call to basic_string | string.cpp:301:7:301:8 | s1 |  |
+| string.cpp:258:17:258:20 | {...} | string.cpp:265:10:265:11 | b2 |  |
+| string.cpp:258:17:258:20 | {...} | string.cpp:266:7:266:8 | b2 |  |
+| string.cpp:258:19:258:19 | 0 | string.cpp:258:17:258:20 | {...} | TAINT |
+| string.cpp:259:17:259:23 | hello | string.cpp:259:17:259:24 | call to basic_string | TAINT |
+| string.cpp:259:17:259:24 | call to basic_string | string.cpp:262:2:262:3 | s1 |  |
+| string.cpp:259:17:259:24 | call to basic_string | string.cpp:262:14:262:15 | s1 |  |
+| string.cpp:259:17:259:24 | call to basic_string | string.cpp:265:14:265:15 | s1 |  |
+| string.cpp:260:17:260:22 | call to source | string.cpp:260:17:260:25 | call to basic_string | TAINT |
+| string.cpp:260:17:260:25 | call to basic_string | string.cpp:265:2:265:3 | s2 |  |
+| string.cpp:262:2:262:3 | s1 | string.cpp:262:10:262:11 | ref arg b1 | TAINT |
+| string.cpp:262:10:262:11 | ref arg b1 | string.cpp:263:7:263:8 | b1 |  |
+| string.cpp:265:2:265:3 | s2 | string.cpp:265:10:265:11 | ref arg b2 | TAINT |
+| string.cpp:265:10:265:11 | ref arg b2 | string.cpp:266:7:266:8 | b2 |  |
+| string.cpp:270:17:270:23 | hello | string.cpp:270:17:270:24 | call to basic_string | TAINT |
+| string.cpp:270:17:270:24 | call to basic_string | string.cpp:275:7:275:8 | s1 |  |
+| string.cpp:270:17:270:24 | call to basic_string | string.cpp:280:2:280:3 | s1 |  |
+| string.cpp:270:17:270:24 | call to basic_string | string.cpp:283:7:283:8 | s1 |  |
+| string.cpp:271:17:271:22 | call to source | string.cpp:271:17:271:25 | call to basic_string | TAINT |
+| string.cpp:271:17:271:25 | call to basic_string | string.cpp:276:7:276:8 | s2 |  |
+| string.cpp:271:17:271:25 | call to basic_string | string.cpp:280:10:280:11 | s2 |  |
+| string.cpp:271:17:271:25 | call to basic_string | string.cpp:284:7:284:8 | s2 |  |
+| string.cpp:272:17:272:23 | world | string.cpp:272:17:272:24 | call to basic_string | TAINT |
+| string.cpp:272:17:272:24 | call to basic_string | string.cpp:277:7:277:8 | s3 |  |
+| string.cpp:272:17:272:24 | call to basic_string | string.cpp:281:10:281:11 | s3 |  |
+| string.cpp:272:17:272:24 | call to basic_string | string.cpp:285:7:285:8 | s3 |  |
+| string.cpp:273:17:273:22 | call to source | string.cpp:273:17:273:25 | call to basic_string | TAINT |
+| string.cpp:273:17:273:25 | call to basic_string | string.cpp:278:7:278:8 | s4 |  |
+| string.cpp:273:17:273:25 | call to basic_string | string.cpp:281:2:281:3 | s4 |  |
+| string.cpp:273:17:273:25 | call to basic_string | string.cpp:286:7:286:8 | s4 |  |
+| string.cpp:280:2:280:3 | ref arg s1 | string.cpp:283:7:283:8 | s1 |  |
+| string.cpp:280:10:280:11 | ref arg s2 | string.cpp:284:7:284:8 | s2 |  |
+| string.cpp:281:2:281:3 | ref arg s4 | string.cpp:286:7:286:8 | s4 |  |
+| string.cpp:281:10:281:11 | ref arg s3 | string.cpp:285:7:285:8 | s3 |  |
 | string.cpp:290:17:290:22 | call to source | string.cpp:290:17:290:25 | call to basic_string | TAINT |
-| string.cpp:290:17:290:25 | call to basic_string | string.cpp:294:7:294:8 | s2 |  |
+| string.cpp:290:17:290:25 | call to basic_string | string.cpp:294:7:294:8 | s1 |  |
+| string.cpp:290:17:290:25 | call to basic_string | string.cpp:298:2:298:3 | s1 |  |
+| string.cpp:290:17:290:25 | call to basic_string | string.cpp:302:7:302:8 | s1 |  |
 | string.cpp:291:17:291:22 | call to source | string.cpp:291:17:291:25 | call to basic_string | TAINT |
-| string.cpp:291:17:291:25 | call to basic_string | string.cpp:295:7:295:8 | s3 |  |
-| string.cpp:291:17:291:25 | call to basic_string | string.cpp:299:7:299:8 | s3 |  |
-| string.cpp:297:2:297:3 | ref arg s1 | string.cpp:301:7:301:8 | s1 |  |
-| string.cpp:298:7:298:8 |  | string.cpp:298:7:298:8 | call to basic_string | TAINT |
-| string.cpp:298:7:298:8 | call to basic_string | string.cpp:298:2:298:8 | ... = ... |  |
-| string.cpp:298:7:298:8 | call to basic_string | string.cpp:302:7:302:8 | s2 |  |
-| string.cpp:299:7:299:8 | s3 | string.cpp:299:2:299:8 | ... = ... |  |
-| string.cpp:299:7:299:8 | s3 | string.cpp:303:7:303:8 | s3 |  |
-| string.cpp:308:16:308:20 | 123 | string.cpp:308:16:308:21 | call to basic_string | TAINT |
-| string.cpp:308:16:308:21 | call to basic_string | string.cpp:311:7:311:7 | a |  |
-| string.cpp:308:16:308:21 | call to basic_string | string.cpp:313:7:313:7 | a |  |
-| string.cpp:309:16:309:21 | call to source | string.cpp:309:16:309:24 | call to basic_string | TAINT |
-| string.cpp:309:16:309:24 | call to basic_string | string.cpp:312:7:312:7 | b |  |
-| string.cpp:309:16:309:24 | call to basic_string | string.cpp:314:7:314:7 | b |  |
-| string.cpp:311:7:311:7 | a | string.cpp:311:9:311:12 | call to data | TAINT |
-| string.cpp:311:7:311:7 | ref arg a | string.cpp:313:7:313:7 | a |  |
-| string.cpp:312:7:312:7 | b | string.cpp:312:9:312:12 | call to data | TAINT |
-| string.cpp:312:7:312:7 | ref arg b | string.cpp:314:7:314:7 | b |  |
-| string.cpp:319:16:319:20 | 123 | string.cpp:319:16:319:21 | call to basic_string | TAINT |
-| string.cpp:319:16:319:21 | call to basic_string | string.cpp:322:7:322:7 | a |  |
-| string.cpp:319:16:319:21 | call to basic_string | string.cpp:322:19:322:19 | a |  |
-| string.cpp:320:16:320:21 | call to source | string.cpp:320:16:320:24 | call to basic_string | TAINT |
-| string.cpp:320:16:320:24 | call to basic_string | string.cpp:323:7:323:7 | b |  |
-| string.cpp:320:16:320:24 | call to basic_string | string.cpp:323:19:323:19 | b |  |
-| string.cpp:322:7:322:7 | a | string.cpp:322:9:322:14 | call to substr | TAINT |
-| string.cpp:323:7:323:7 | b | string.cpp:323:9:323:14 | call to substr | TAINT |
-| string.cpp:328:16:328:20 | 123 | string.cpp:328:16:328:21 | call to basic_string | TAINT |
-| string.cpp:328:16:328:21 | call to basic_string | string.cpp:332:7:332:7 | a |  |
-| string.cpp:328:16:328:21 | call to basic_string | string.cpp:336:2:336:2 | a |  |
-| string.cpp:328:16:328:21 | call to basic_string | string.cpp:338:9:338:9 | a |  |
-| string.cpp:328:16:328:21 | call to basic_string | string.cpp:340:7:340:7 | a |  |
+| string.cpp:291:17:291:25 | call to basic_string | string.cpp:295:7:295:8 | s2 |  |
+| string.cpp:292:17:292:22 | call to source | string.cpp:292:17:292:25 | call to basic_string | TAINT |
+| string.cpp:292:17:292:25 | call to basic_string | string.cpp:296:7:296:8 | s3 |  |
+| string.cpp:292:17:292:25 | call to basic_string | string.cpp:300:7:300:8 | s3 |  |
+| string.cpp:298:2:298:3 | ref arg s1 | string.cpp:302:7:302:8 | s1 |  |
+| string.cpp:299:7:299:8 |  | string.cpp:299:7:299:8 | call to basic_string | TAINT |
+| string.cpp:299:7:299:8 | call to basic_string | string.cpp:299:2:299:8 | ... = ... |  |
+| string.cpp:299:7:299:8 | call to basic_string | string.cpp:303:7:303:8 | s2 |  |
+| string.cpp:300:7:300:8 | s3 | string.cpp:300:2:300:8 | ... = ... |  |
+| string.cpp:300:7:300:8 | s3 | string.cpp:304:7:304:8 | s3 |  |
+| string.cpp:309:16:309:20 | 123 | string.cpp:309:16:309:21 | call to basic_string | TAINT |
+| string.cpp:309:16:309:21 | call to basic_string | string.cpp:312:7:312:7 | a |  |
+| string.cpp:309:16:309:21 | call to basic_string | string.cpp:314:7:314:7 | a |  |
+| string.cpp:310:16:310:21 | call to source | string.cpp:310:16:310:24 | call to basic_string | TAINT |
+| string.cpp:310:16:310:24 | call to basic_string | string.cpp:313:7:313:7 | b |  |
+| string.cpp:310:16:310:24 | call to basic_string | string.cpp:315:7:315:7 | b |  |
+| string.cpp:312:7:312:7 | a | string.cpp:312:9:312:12 | call to data | TAINT |
+| string.cpp:312:7:312:7 | ref arg a | string.cpp:314:7:314:7 | a |  |
+| string.cpp:313:7:313:7 | b | string.cpp:313:9:313:12 | call to data | TAINT |
+| string.cpp:313:7:313:7 | ref arg b | string.cpp:315:7:315:7 | b |  |
+| string.cpp:320:16:320:20 | 123 | string.cpp:320:16:320:21 | call to basic_string | TAINT |
+| string.cpp:320:16:320:21 | call to basic_string | string.cpp:323:7:323:7 | a |  |
+| string.cpp:320:16:320:21 | call to basic_string | string.cpp:323:19:323:19 | a |  |
+| string.cpp:321:16:321:21 | call to source | string.cpp:321:16:321:24 | call to basic_string | TAINT |
+| string.cpp:321:16:321:24 | call to basic_string | string.cpp:324:7:324:7 | b |  |
+| string.cpp:321:16:321:24 | call to basic_string | string.cpp:324:19:324:19 | b |  |
+| string.cpp:323:7:323:7 | a | string.cpp:323:9:323:14 | call to substr | TAINT |
+| string.cpp:324:7:324:7 | b | string.cpp:324:9:324:14 | call to substr | TAINT |
 | string.cpp:329:16:329:20 | 123 | string.cpp:329:16:329:21 | call to basic_string | TAINT |
-| string.cpp:329:16:329:21 | call to basic_string | string.cpp:333:7:333:7 | b |  |
-| string.cpp:329:16:329:21 | call to basic_string | string.cpp:337:2:337:2 | b |  |
-| string.cpp:329:16:329:21 | call to basic_string | string.cpp:341:7:341:7 | b |  |
+| string.cpp:329:16:329:21 | call to basic_string | string.cpp:333:7:333:7 | a |  |
+| string.cpp:329:16:329:21 | call to basic_string | string.cpp:337:2:337:2 | a |  |
+| string.cpp:329:16:329:21 | call to basic_string | string.cpp:339:9:339:9 | a |  |
+| string.cpp:329:16:329:21 | call to basic_string | string.cpp:341:7:341:7 | a |  |
 | string.cpp:330:16:330:20 | 123 | string.cpp:330:16:330:21 | call to basic_string | TAINT |
-| string.cpp:330:16:330:21 | call to basic_string | string.cpp:334:7:334:7 | c |  |
-| string.cpp:330:16:330:21 | call to basic_string | string.cpp:338:2:338:2 | c |  |
-| string.cpp:330:16:330:21 | call to basic_string | string.cpp:342:7:342:7 | c |  |
-| string.cpp:336:2:336:2 | a | string.cpp:336:3:336:3 | call to operator[] | TAINT |
-| string.cpp:336:2:336:2 | ref arg a | string.cpp:338:9:338:9 | a |  |
-| string.cpp:336:2:336:2 | ref arg a | string.cpp:340:7:340:7 | a |  |
-| string.cpp:336:2:336:25 | ... = ... | string.cpp:336:3:336:3 | call to operator[] [post update] |  |
-| string.cpp:336:3:336:3 | call to operator[] [post update] | string.cpp:336:2:336:2 | ref arg a | TAINT |
-| string.cpp:336:9:336:23 | call to source | string.cpp:336:2:336:25 | ... = ... |  |
-| string.cpp:337:2:337:2 | b | string.cpp:337:4:337:5 | call to at | TAINT |
-| string.cpp:337:2:337:2 | ref arg b | string.cpp:341:7:341:7 | b |  |
-| string.cpp:337:2:337:28 | ... = ... | string.cpp:337:4:337:5 | call to at [post update] |  |
-| string.cpp:337:4:337:5 | call to at [post update] | string.cpp:337:2:337:2 | ref arg b | TAINT |
-| string.cpp:337:12:337:26 | call to source | string.cpp:337:2:337:28 | ... = ... |  |
-| string.cpp:338:2:338:2 | c | string.cpp:338:3:338:3 | call to operator[] | TAINT |
-| string.cpp:338:2:338:2 | ref arg c | string.cpp:342:7:342:7 | c |  |
-| string.cpp:338:2:338:12 | ... = ... | string.cpp:338:3:338:3 | call to operator[] [post update] |  |
-| string.cpp:338:3:338:3 | call to operator[] [post update] | string.cpp:338:2:338:2 | ref arg c | TAINT |
-| string.cpp:338:9:338:9 | a | string.cpp:338:10:338:10 | call to operator[] | TAINT |
-| string.cpp:338:9:338:9 | ref arg a | string.cpp:340:7:340:7 | a |  |
-| string.cpp:338:10:338:10 | call to operator[] | string.cpp:338:2:338:12 | ... = ... |  |
-| string.cpp:347:18:347:22 | 123 | string.cpp:347:18:347:23 | call to basic_string | TAINT |
-| string.cpp:347:18:347:23 | call to basic_string | string.cpp:349:2:349:4 | str |  |
-| string.cpp:347:18:347:23 | call to basic_string | string.cpp:350:7:350:9 | str |  |
-| string.cpp:347:18:347:23 | call to basic_string | string.cpp:351:7:351:9 | str |  |
-| string.cpp:349:2:349:4 | ref arg str | string.cpp:350:7:350:9 | str |  |
-| string.cpp:349:2:349:4 | ref arg str | string.cpp:351:7:351:9 | str |  |
-| string.cpp:349:2:349:4 | str | string.cpp:349:6:349:9 | call to data | TAINT |
-| string.cpp:349:2:349:14 | access to array [post update] | string.cpp:349:6:349:9 | call to data [inner post update] |  |
-| string.cpp:349:2:349:34 | ... = ... | string.cpp:349:2:349:14 | access to array [post update] |  |
-| string.cpp:349:6:349:9 | call to data | string.cpp:349:2:349:14 | access to array | TAINT |
-| string.cpp:349:6:349:9 | call to data [inner post update] | string.cpp:349:2:349:4 | ref arg str | TAINT |
-| string.cpp:349:13:349:13 | 1 | string.cpp:349:2:349:14 | access to array | TAINT |
-| string.cpp:349:18:349:32 | call to source | string.cpp:349:2:349:34 | ... = ... |  |
-| string.cpp:351:7:351:9 | str | string.cpp:351:11:351:14 | call to data | TAINT |
-| string.cpp:357:18:357:24 | hello | string.cpp:357:18:357:25 | call to basic_string | TAINT |
-| string.cpp:357:18:357:25 | call to basic_string | string.cpp:362:8:362:9 | s1 |  |
-| string.cpp:357:18:357:25 | call to basic_string | string.cpp:363:8:363:9 | s1 |  |
-| string.cpp:357:18:357:25 | call to basic_string | string.cpp:364:8:364:9 | s1 |  |
-| string.cpp:358:18:358:23 | call to source | string.cpp:358:18:358:26 | call to basic_string | TAINT |
-| string.cpp:358:18:358:26 | call to basic_string | string.cpp:363:18:363:19 | s2 |  |
-| string.cpp:358:18:358:26 | call to basic_string | string.cpp:363:30:363:31 | s2 |  |
-| string.cpp:359:18:359:24 | hello | string.cpp:359:18:359:25 | call to basic_string | TAINT |
-| string.cpp:359:18:359:25 | call to basic_string | string.cpp:366:8:366:9 | s3 |  |
-| string.cpp:359:18:359:25 | call to basic_string | string.cpp:367:8:367:9 | s3 |  |
-| string.cpp:359:18:359:25 | call to basic_string | string.cpp:368:8:368:9 | s3 |  |
-| string.cpp:360:18:360:24 | world | string.cpp:360:18:360:25 | call to basic_string | TAINT |
-| string.cpp:360:18:360:25 | call to basic_string | string.cpp:367:18:367:19 | s4 |  |
-| string.cpp:360:18:360:25 | call to basic_string | string.cpp:367:30:367:31 | s4 |  |
-| string.cpp:363:8:363:9 | ref arg s1 | string.cpp:364:8:364:9 | s1 |  |
-| string.cpp:363:8:363:9 | s1 | string.cpp:363:11:363:16 | call to append | TAINT |
-| string.cpp:363:18:363:19 | ref arg s2 | string.cpp:363:30:363:31 | s2 |  |
-| string.cpp:363:18:363:19 | s2 | string.cpp:363:21:363:25 | call to begin | TAINT |
-| string.cpp:363:21:363:25 | call to begin | string.cpp:363:8:363:9 | ref arg s1 | TAINT |
-| string.cpp:363:21:363:25 | call to begin | string.cpp:363:11:363:16 | call to append | TAINT |
-| string.cpp:363:30:363:31 | s2 | string.cpp:363:33:363:35 | call to end | TAINT |
-| string.cpp:363:33:363:35 | call to end | string.cpp:363:8:363:9 | ref arg s1 | TAINT |
-| string.cpp:363:33:363:35 | call to end | string.cpp:363:11:363:16 | call to append | TAINT |
-| string.cpp:367:8:367:9 | ref arg s3 | string.cpp:368:8:368:9 | s3 |  |
-| string.cpp:367:8:367:9 | s3 | string.cpp:367:11:367:16 | call to append | TAINT |
-| string.cpp:367:18:367:19 | ref arg s4 | string.cpp:367:30:367:31 | s4 |  |
-| string.cpp:367:18:367:19 | s4 | string.cpp:367:21:367:25 | call to begin | TAINT |
-| string.cpp:367:21:367:25 | call to begin | string.cpp:367:8:367:9 | ref arg s3 | TAINT |
-| string.cpp:367:21:367:25 | call to begin | string.cpp:367:11:367:16 | call to append | TAINT |
-| string.cpp:367:30:367:31 | s4 | string.cpp:367:33:367:35 | call to end | TAINT |
-| string.cpp:367:33:367:35 | call to end | string.cpp:367:8:367:9 | ref arg s3 | TAINT |
-| string.cpp:367:33:367:35 | call to end | string.cpp:367:11:367:16 | call to append | TAINT |
-| string.cpp:373:18:373:24 | hello | string.cpp:373:18:373:25 | call to basic_string | TAINT |
-| string.cpp:373:18:373:25 | call to basic_string | string.cpp:376:28:376:29 | s1 |  |
-| string.cpp:374:18:374:23 | call to source | string.cpp:374:18:374:26 | call to basic_string | TAINT |
-| string.cpp:374:18:374:26 | call to basic_string | string.cpp:380:28:380:29 | s2 |  |
-| string.cpp:376:28:376:29 | s1 | string.cpp:376:31:376:35 | call to begin | TAINT |
-| string.cpp:376:31:376:35 | call to begin | string.cpp:378:9:378:13 | iter1 |  |
-| string.cpp:376:31:376:35 | call to begin | string.cpp:379:8:379:12 | iter1 |  |
-| string.cpp:378:9:378:13 | iter1 | string.cpp:378:8:378:8 | call to operator* | TAINT |
-| string.cpp:378:9:378:13 | ref arg iter1 | string.cpp:379:8:379:12 | iter1 |  |
-| string.cpp:379:8:379:12 | iter1 | string.cpp:379:13:379:13 | call to operator[] | TAINT |
-| string.cpp:380:28:380:29 | s2 | string.cpp:380:31:380:35 | call to begin | TAINT |
-| string.cpp:380:31:380:35 | call to begin | string.cpp:382:9:382:13 | iter2 |  |
-| string.cpp:380:31:380:35 | call to begin | string.cpp:383:8:383:12 | iter2 |  |
-| string.cpp:382:9:382:13 | iter2 | string.cpp:382:8:382:8 | call to operator* | TAINT |
-| string.cpp:382:9:382:13 | ref arg iter2 | string.cpp:383:8:383:12 | iter2 |  |
-| string.cpp:383:8:383:12 | iter2 | string.cpp:383:13:383:13 | call to operator[] | TAINT |
-| string.cpp:388:18:388:24 | hello | string.cpp:388:18:388:25 | call to basic_string | TAINT |
-| string.cpp:388:18:388:25 | call to basic_string | string.cpp:391:25:391:26 | s1 |  |
-| string.cpp:389:18:389:23 | call to source | string.cpp:389:18:389:26 | call to basic_string | TAINT |
-| string.cpp:389:18:389:26 | call to basic_string | string.cpp:393:25:393:26 | s2 |  |
-| string.cpp:389:18:389:26 | call to basic_string | string.cpp:413:8:413:9 | s2 |  |
-| string.cpp:391:25:391:26 | s1 | string.cpp:391:28:391:32 | call to begin | TAINT |
-| string.cpp:393:25:393:26 | ref arg s2 | string.cpp:413:8:413:9 | s2 |  |
-| string.cpp:393:25:393:26 | s2 | string.cpp:393:28:393:32 | call to begin | TAINT |
-| string.cpp:393:28:393:32 | call to begin | string.cpp:396:10:396:11 | i2 |  |
-| string.cpp:393:28:393:32 | call to begin | string.cpp:397:10:397:11 | i2 |  |
-| string.cpp:393:28:393:32 | call to begin | string.cpp:398:8:398:9 | i2 |  |
-| string.cpp:393:28:393:32 | call to begin | string.cpp:400:8:400:9 | i2 |  |
-| string.cpp:393:28:393:32 | call to begin | string.cpp:402:8:402:9 | i2 |  |
-| string.cpp:393:28:393:32 | call to begin | string.cpp:405:8:405:9 | i2 |  |
-| string.cpp:393:28:393:32 | call to begin | string.cpp:408:8:408:9 | i2 |  |
-| string.cpp:393:28:393:32 | call to begin | string.cpp:410:8:410:9 | i2 |  |
-| string.cpp:393:28:393:32 | call to begin | string.cpp:417:9:417:10 | i2 |  |
-| string.cpp:393:28:393:32 | call to begin | string.cpp:420:9:420:10 | i2 |  |
-| string.cpp:396:10:396:11 | i2 | string.cpp:396:12:396:12 | call to operator+ | TAINT |
-| string.cpp:396:10:396:11 | ref arg i2 | string.cpp:397:10:397:11 | i2 |  |
-| string.cpp:396:10:396:11 | ref arg i2 | string.cpp:398:8:398:9 | i2 |  |
-| string.cpp:396:10:396:11 | ref arg i2 | string.cpp:400:8:400:9 | i2 |  |
-| string.cpp:396:10:396:11 | ref arg i2 | string.cpp:402:8:402:9 | i2 |  |
-| string.cpp:396:10:396:11 | ref arg i2 | string.cpp:405:8:405:9 | i2 |  |
-| string.cpp:396:10:396:11 | ref arg i2 | string.cpp:408:8:408:9 | i2 |  |
-| string.cpp:396:10:396:11 | ref arg i2 | string.cpp:410:8:410:9 | i2 |  |
-| string.cpp:396:10:396:11 | ref arg i2 | string.cpp:417:9:417:10 | i2 |  |
-| string.cpp:396:10:396:11 | ref arg i2 | string.cpp:420:9:420:10 | i2 |  |
-| string.cpp:396:12:396:12 | call to operator+ | string.cpp:396:8:396:8 | call to operator* | TAINT |
-| string.cpp:397:10:397:11 | i2 | string.cpp:397:12:397:12 | call to operator- | TAINT |
-| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:398:8:398:9 | i2 |  |
-| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:400:8:400:9 | i2 |  |
-| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:402:8:402:9 | i2 |  |
-| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:405:8:405:9 | i2 |  |
-| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:408:8:408:9 | i2 |  |
-| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:410:8:410:9 | i2 |  |
-| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:417:9:417:10 | i2 |  |
-| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:420:9:420:10 | i2 |  |
-| string.cpp:397:12:397:12 | call to operator- | string.cpp:397:8:397:8 | call to operator* | TAINT |
-| string.cpp:398:8:398:9 | i2 | string.cpp:398:3:398:9 | ... = ... |  |
-| string.cpp:398:8:398:9 | i2 | string.cpp:399:12:399:13 | i3 |  |
-| string.cpp:399:10:399:10 | call to operator++ | string.cpp:399:8:399:8 | call to operator* | TAINT |
-| string.cpp:399:10:399:10 | ref arg call to operator++ | string.cpp:399:12:399:13 | ref arg i3 |  |
-| string.cpp:399:12:399:13 | i3 | string.cpp:399:10:399:10 | call to operator++ |  |
-| string.cpp:400:8:400:9 | i2 | string.cpp:400:3:400:9 | ... = ... |  |
-| string.cpp:400:8:400:9 | i2 | string.cpp:401:12:401:13 | i4 |  |
-| string.cpp:401:10:401:10 | call to operator-- | string.cpp:401:8:401:8 | call to operator* | TAINT |
-| string.cpp:401:10:401:10 | ref arg call to operator-- | string.cpp:401:12:401:13 | ref arg i4 |  |
-| string.cpp:401:12:401:13 | i4 | string.cpp:401:10:401:10 | call to operator-- |  |
-| string.cpp:402:8:402:9 | i2 | string.cpp:402:3:402:9 | ... = ... |  |
-| string.cpp:402:8:402:9 | i2 | string.cpp:403:3:403:4 | i5 |  |
-| string.cpp:402:8:402:9 | i2 | string.cpp:404:9:404:10 | i5 |  |
-| string.cpp:403:3:403:4 | i5 | string.cpp:403:5:403:5 | call to operator++ |  |
-| string.cpp:403:3:403:4 | ref arg i5 | string.cpp:404:9:404:10 | i5 |  |
-| string.cpp:404:9:404:10 | i5 | string.cpp:404:8:404:8 | call to operator* | TAINT |
-| string.cpp:405:8:405:9 | i2 | string.cpp:405:3:405:9 | ... = ... |  |
-| string.cpp:405:8:405:9 | i2 | string.cpp:406:3:406:4 | i6 |  |
-| string.cpp:405:8:405:9 | i2 | string.cpp:407:9:407:10 | i6 |  |
-| string.cpp:406:3:406:4 | i6 | string.cpp:406:5:406:5 | call to operator-- |  |
-| string.cpp:406:3:406:4 | ref arg i6 | string.cpp:407:9:407:10 | i6 |  |
-| string.cpp:407:9:407:10 | i6 | string.cpp:407:8:407:8 | call to operator* | TAINT |
-| string.cpp:408:8:408:9 | i2 | string.cpp:408:3:408:9 | ... = ... |  |
-| string.cpp:408:8:408:9 | i2 | string.cpp:409:10:409:11 | i7 |  |
-| string.cpp:409:10:409:11 | i7 | string.cpp:409:12:409:12 | call to operator+= | TAINT |
-| string.cpp:409:12:409:12 | call to operator+= | string.cpp:409:8:409:8 | call to operator* | TAINT |
-| string.cpp:409:12:409:12 | ref arg call to operator+= | string.cpp:409:10:409:11 | ref arg i7 | TAINT |
-| string.cpp:409:14:409:14 | 1 | string.cpp:409:10:409:11 | ref arg i7 | TAINT |
-| string.cpp:410:8:410:9 | i2 | string.cpp:410:3:410:9 | ... = ... |  |
-| string.cpp:410:8:410:9 | i2 | string.cpp:411:10:411:11 | i8 |  |
-| string.cpp:411:10:411:11 | i8 | string.cpp:411:12:411:12 | call to operator-= | TAINT |
-| string.cpp:411:12:411:12 | call to operator-= | string.cpp:411:8:411:8 | call to operator* | TAINT |
-| string.cpp:411:12:411:12 | ref arg call to operator-= | string.cpp:411:10:411:11 | ref arg i8 | TAINT |
-| string.cpp:411:14:411:14 | 1 | string.cpp:411:10:411:11 | ref arg i8 | TAINT |
-| string.cpp:413:8:413:9 | s2 | string.cpp:413:11:413:13 | call to end | TAINT |
-| string.cpp:413:11:413:13 | call to end | string.cpp:413:3:413:15 | ... = ... |  |
-| string.cpp:413:11:413:13 | call to end | string.cpp:414:5:414:6 | i9 |  |
-| string.cpp:413:11:413:13 | call to end | string.cpp:415:9:415:10 | i9 |  |
-| string.cpp:414:5:414:6 | i9 | string.cpp:414:3:414:3 | call to operator-- |  |
-| string.cpp:414:5:414:6 | ref arg i9 | string.cpp:415:9:415:10 | i9 |  |
-| string.cpp:415:9:415:10 | i9 | string.cpp:415:8:415:8 | call to operator* | TAINT |
-| string.cpp:417:9:417:10 | i2 | string.cpp:417:3:417:10 | ... = ... |  |
-| string.cpp:417:9:417:10 | i2 | string.cpp:418:10:418:12 | i10 |  |
-| string.cpp:417:9:417:10 | i2 | string.cpp:419:8:419:10 | i10 |  |
-| string.cpp:418:10:418:12 | i10 | string.cpp:418:13:418:13 | call to operator++ |  |
-| string.cpp:418:10:418:12 | ref arg i10 | string.cpp:419:8:419:10 | i10 |  |
-| string.cpp:418:13:418:13 | call to operator++ | string.cpp:418:8:418:8 | call to operator* | TAINT |
-| string.cpp:419:8:419:10 | i10 | string.cpp:419:8:419:10 | call to iterator |  |
-| string.cpp:420:9:420:10 | i2 | string.cpp:420:3:420:10 | ... = ... |  |
-| string.cpp:420:9:420:10 | i2 | string.cpp:421:10:421:12 | i11 |  |
-| string.cpp:420:9:420:10 | i2 | string.cpp:422:8:422:10 | i11 |  |
-| string.cpp:421:10:421:12 | i11 | string.cpp:421:13:421:13 | call to operator-- |  |
-| string.cpp:421:10:421:12 | ref arg i11 | string.cpp:422:8:422:10 | i11 |  |
-| string.cpp:421:13:421:13 | call to operator-- | string.cpp:421:8:421:8 | call to operator* | TAINT |
-| string.cpp:422:8:422:10 | i11 | string.cpp:422:8:422:10 | call to iterator |  |
-| string.cpp:428:17:428:20 | aa | string.cpp:428:17:428:21 | call to basic_string | TAINT |
-| string.cpp:428:17:428:21 | call to basic_string | string.cpp:433:7:433:8 | s1 |  |
-| string.cpp:428:17:428:21 | call to basic_string | string.cpp:434:7:434:8 | s1 |  |
-| string.cpp:429:17:429:20 | bb | string.cpp:429:17:429:21 | call to basic_string | TAINT |
-| string.cpp:429:17:429:21 | call to basic_string | string.cpp:436:7:436:8 | s2 |  |
-| string.cpp:429:17:429:21 | call to basic_string | string.cpp:437:7:437:8 | s2 |  |
-| string.cpp:430:14:430:17 | cc | string.cpp:433:20:433:22 | cs1 |  |
-| string.cpp:431:14:431:19 | call to source | string.cpp:436:20:436:22 | cs2 |  |
-| string.cpp:433:7:433:8 | ref arg s1 | string.cpp:434:7:434:8 | s1 |  |
-| string.cpp:433:7:433:8 | s1 | string.cpp:433:10:433:15 | call to insert | TAINT |
-| string.cpp:433:20:433:22 | cs1 | string.cpp:433:7:433:8 | ref arg s1 | TAINT |
-| string.cpp:433:20:433:22 | cs1 | string.cpp:433:10:433:15 | call to insert | TAINT |
-| string.cpp:436:7:436:8 | ref arg s2 | string.cpp:437:7:437:8 | s2 |  |
-| string.cpp:436:7:436:8 | s2 | string.cpp:436:10:436:15 | call to insert | TAINT |
-| string.cpp:436:20:436:22 | cs2 | string.cpp:436:7:436:8 | ref arg s2 | TAINT |
-| string.cpp:436:20:436:22 | cs2 | string.cpp:436:10:436:15 | call to insert | TAINT |
-| string.cpp:443:17:443:20 | aa | string.cpp:443:17:443:21 | call to basic_string | TAINT |
-| string.cpp:443:17:443:21 | call to basic_string | string.cpp:446:8:446:8 | a |  |
-| string.cpp:443:17:443:21 | call to basic_string | string.cpp:446:17:446:17 | a |  |
-| string.cpp:443:17:443:21 | call to basic_string | string.cpp:447:8:447:8 | a |  |
-| string.cpp:444:17:444:20 | bb | string.cpp:444:17:444:21 | call to basic_string | TAINT |
-| string.cpp:444:17:444:21 | call to basic_string | string.cpp:449:8:449:8 | b |  |
-| string.cpp:444:17:444:21 | call to basic_string | string.cpp:449:17:449:17 | b |  |
-| string.cpp:444:17:444:21 | call to basic_string | string.cpp:450:8:450:8 | b |  |
-| string.cpp:446:8:446:8 | a | string.cpp:446:10:446:15 | call to insert | TAINT |
-| string.cpp:446:8:446:8 | ref arg a | string.cpp:447:8:447:8 | a |  |
-| string.cpp:446:17:446:17 | a | string.cpp:446:19:446:23 | call to begin | TAINT |
-| string.cpp:446:17:446:17 | ref arg a | string.cpp:446:8:446:8 | a |  |
-| string.cpp:446:17:446:17 | ref arg a | string.cpp:447:8:447:8 | a |  |
-| string.cpp:446:17:446:25 | call to iterator | string.cpp:446:8:446:8 | ref arg a | TAINT |
-| string.cpp:446:17:446:25 | call to iterator | string.cpp:446:10:446:15 | call to insert | TAINT |
-| string.cpp:446:19:446:23 | call to begin | string.cpp:446:17:446:25 | call to iterator | TAINT |
-| string.cpp:446:32:446:34 | 120 | string.cpp:446:8:446:8 | ref arg a | TAINT |
-| string.cpp:446:32:446:34 | 120 | string.cpp:446:10:446:15 | call to insert | TAINT |
-| string.cpp:449:8:449:8 | b | string.cpp:449:10:449:15 | call to insert | TAINT |
-| string.cpp:449:8:449:8 | ref arg b | string.cpp:450:8:450:8 | b |  |
-| string.cpp:449:17:449:17 | b | string.cpp:449:19:449:23 | call to begin | TAINT |
-| string.cpp:449:17:449:17 | ref arg b | string.cpp:449:8:449:8 | b |  |
-| string.cpp:449:17:449:17 | ref arg b | string.cpp:450:8:450:8 | b |  |
-| string.cpp:449:17:449:25 | call to iterator | string.cpp:449:8:449:8 | ref arg b | TAINT |
-| string.cpp:449:17:449:25 | call to iterator | string.cpp:449:10:449:15 | call to insert | TAINT |
-| string.cpp:449:19:449:23 | call to begin | string.cpp:449:17:449:25 | call to iterator | TAINT |
-| string.cpp:449:32:449:46 | call to source | string.cpp:449:8:449:8 | ref arg b | TAINT |
-| string.cpp:449:32:449:46 | call to source | string.cpp:449:10:449:15 | call to insert | TAINT |
-| string.cpp:454:17:454:20 | cc | string.cpp:454:17:454:21 | call to basic_string | TAINT |
-| string.cpp:454:17:454:21 | call to basic_string | string.cpp:459:8:459:8 | c |  |
-| string.cpp:454:17:454:21 | call to basic_string | string.cpp:459:17:459:17 | c |  |
-| string.cpp:454:17:454:21 | call to basic_string | string.cpp:460:8:460:8 | c |  |
-| string.cpp:455:17:455:20 | dd | string.cpp:455:17:455:21 | call to basic_string | TAINT |
-| string.cpp:455:17:455:21 | call to basic_string | string.cpp:462:8:462:8 | d |  |
-| string.cpp:455:17:455:21 | call to basic_string | string.cpp:462:17:462:17 | d |  |
-| string.cpp:455:17:455:21 | call to basic_string | string.cpp:463:8:463:8 | d |  |
-| string.cpp:456:18:456:21 | 11 | string.cpp:456:18:456:22 | call to basic_string | TAINT |
-| string.cpp:456:18:456:22 | call to basic_string | string.cpp:459:26:459:27 | s1 |  |
-| string.cpp:456:18:456:22 | call to basic_string | string.cpp:459:38:459:39 | s1 |  |
-| string.cpp:456:18:456:22 | call to basic_string | string.cpp:465:28:465:29 | s1 |  |
-| string.cpp:456:18:456:22 | call to basic_string | string.cpp:465:40:465:41 | s1 |  |
-| string.cpp:457:18:457:23 | call to source | string.cpp:457:18:457:26 | call to basic_string | TAINT |
-| string.cpp:457:18:457:26 | call to basic_string | string.cpp:462:26:462:27 | s2 |  |
-| string.cpp:457:18:457:26 | call to basic_string | string.cpp:462:38:462:39 | s2 |  |
-| string.cpp:457:18:457:26 | call to basic_string | string.cpp:465:8:465:9 | s2 |  |
-| string.cpp:457:18:457:26 | call to basic_string | string.cpp:465:18:465:19 | s2 |  |
-| string.cpp:457:18:457:26 | call to basic_string | string.cpp:466:8:466:9 | s2 |  |
-| string.cpp:459:8:459:8 | c | string.cpp:459:10:459:15 | call to insert | TAINT |
-| string.cpp:459:8:459:8 | ref arg c | string.cpp:460:8:460:8 | c |  |
-| string.cpp:459:17:459:17 | c | string.cpp:459:19:459:21 | call to end | TAINT |
-| string.cpp:459:17:459:17 | ref arg c | string.cpp:459:8:459:8 | c |  |
-| string.cpp:459:17:459:17 | ref arg c | string.cpp:460:8:460:8 | c |  |
-| string.cpp:459:17:459:23 | call to iterator | string.cpp:459:8:459:8 | ref arg c | TAINT |
-| string.cpp:459:17:459:23 | call to iterator | string.cpp:459:10:459:15 | call to insert | TAINT |
-| string.cpp:459:19:459:21 | call to end | string.cpp:459:17:459:23 | call to iterator | TAINT |
-| string.cpp:459:26:459:27 | ref arg s1 | string.cpp:459:38:459:39 | s1 |  |
-| string.cpp:459:26:459:27 | ref arg s1 | string.cpp:465:28:465:29 | s1 |  |
-| string.cpp:459:26:459:27 | ref arg s1 | string.cpp:465:40:465:41 | s1 |  |
-| string.cpp:459:26:459:27 | s1 | string.cpp:459:29:459:33 | call to begin | TAINT |
-| string.cpp:459:29:459:33 | call to begin | string.cpp:459:8:459:8 | ref arg c | TAINT |
-| string.cpp:459:29:459:33 | call to begin | string.cpp:459:10:459:15 | call to insert | TAINT |
-| string.cpp:459:38:459:39 | ref arg s1 | string.cpp:465:28:465:29 | s1 |  |
-| string.cpp:459:38:459:39 | ref arg s1 | string.cpp:465:40:465:41 | s1 |  |
-| string.cpp:459:38:459:39 | s1 | string.cpp:459:41:459:43 | call to end | TAINT |
-| string.cpp:459:41:459:43 | call to end | string.cpp:459:8:459:8 | ref arg c | TAINT |
-| string.cpp:459:41:459:43 | call to end | string.cpp:459:10:459:15 | call to insert | TAINT |
-| string.cpp:462:8:462:8 | d | string.cpp:462:10:462:15 | call to insert | TAINT |
-| string.cpp:462:8:462:8 | ref arg d | string.cpp:463:8:463:8 | d |  |
-| string.cpp:462:17:462:17 | d | string.cpp:462:19:462:21 | call to end | TAINT |
-| string.cpp:462:17:462:17 | ref arg d | string.cpp:462:8:462:8 | d |  |
-| string.cpp:462:17:462:17 | ref arg d | string.cpp:463:8:463:8 | d |  |
-| string.cpp:462:17:462:23 | call to iterator | string.cpp:462:8:462:8 | ref arg d | TAINT |
-| string.cpp:462:17:462:23 | call to iterator | string.cpp:462:10:462:15 | call to insert | TAINT |
-| string.cpp:462:19:462:21 | call to end | string.cpp:462:17:462:23 | call to iterator | TAINT |
-| string.cpp:462:26:462:27 | ref arg s2 | string.cpp:462:38:462:39 | s2 |  |
-| string.cpp:462:26:462:27 | ref arg s2 | string.cpp:465:8:465:9 | s2 |  |
-| string.cpp:462:26:462:27 | ref arg s2 | string.cpp:465:18:465:19 | s2 |  |
-| string.cpp:462:26:462:27 | ref arg s2 | string.cpp:466:8:466:9 | s2 |  |
-| string.cpp:462:26:462:27 | s2 | string.cpp:462:29:462:33 | call to begin | TAINT |
-| string.cpp:462:29:462:33 | call to begin | string.cpp:462:8:462:8 | ref arg d | TAINT |
-| string.cpp:462:29:462:33 | call to begin | string.cpp:462:10:462:15 | call to insert | TAINT |
-| string.cpp:462:38:462:39 | ref arg s2 | string.cpp:465:8:465:9 | s2 |  |
-| string.cpp:462:38:462:39 | ref arg s2 | string.cpp:465:18:465:19 | s2 |  |
-| string.cpp:462:38:462:39 | ref arg s2 | string.cpp:466:8:466:9 | s2 |  |
-| string.cpp:462:38:462:39 | s2 | string.cpp:462:41:462:43 | call to end | TAINT |
-| string.cpp:462:41:462:43 | call to end | string.cpp:462:8:462:8 | ref arg d | TAINT |
-| string.cpp:462:41:462:43 | call to end | string.cpp:462:10:462:15 | call to insert | TAINT |
-| string.cpp:465:8:465:9 | ref arg s2 | string.cpp:466:8:466:9 | s2 |  |
-| string.cpp:465:8:465:9 | s2 | string.cpp:465:11:465:16 | call to insert | TAINT |
-| string.cpp:465:18:465:19 | ref arg s2 | string.cpp:465:8:465:9 | s2 |  |
-| string.cpp:465:18:465:19 | ref arg s2 | string.cpp:466:8:466:9 | s2 |  |
-| string.cpp:465:18:465:19 | s2 | string.cpp:465:21:465:23 | call to end | TAINT |
-| string.cpp:465:18:465:25 | call to iterator | string.cpp:465:8:465:9 | ref arg s2 | TAINT |
-| string.cpp:465:18:465:25 | call to iterator | string.cpp:465:11:465:16 | call to insert | TAINT |
-| string.cpp:465:21:465:23 | call to end | string.cpp:465:18:465:25 | call to iterator | TAINT |
-| string.cpp:465:28:465:29 | ref arg s1 | string.cpp:465:40:465:41 | s1 |  |
-| string.cpp:465:28:465:29 | s1 | string.cpp:465:31:465:35 | call to begin | TAINT |
-| string.cpp:465:31:465:35 | call to begin | string.cpp:465:8:465:9 | ref arg s2 | TAINT |
-| string.cpp:465:31:465:35 | call to begin | string.cpp:465:11:465:16 | call to insert | TAINT |
-| string.cpp:465:40:465:41 | s1 | string.cpp:465:43:465:45 | call to end | TAINT |
-| string.cpp:465:43:465:45 | call to end | string.cpp:465:8:465:9 | ref arg s2 | TAINT |
-| string.cpp:465:43:465:45 | call to end | string.cpp:465:11:465:16 | call to insert | TAINT |
-| string.cpp:470:17:470:20 | ee | string.cpp:470:17:470:21 | call to basic_string | TAINT |
-| string.cpp:470:17:470:21 | call to basic_string | string.cpp:475:8:475:8 | e |  |
-| string.cpp:470:17:470:21 | call to basic_string | string.cpp:476:8:476:8 | e |  |
-| string.cpp:471:17:471:20 | ff | string.cpp:471:17:471:21 | call to basic_string | TAINT |
-| string.cpp:471:17:471:21 | call to basic_string | string.cpp:478:8:478:8 | f |  |
-| string.cpp:471:17:471:21 | call to basic_string | string.cpp:479:8:479:8 | f |  |
-| string.cpp:472:18:472:21 | 33 | string.cpp:472:18:472:22 | call to basic_string | TAINT |
-| string.cpp:472:18:472:22 | call to basic_string | string.cpp:475:17:475:18 | s3 |  |
-| string.cpp:472:18:472:22 | call to basic_string | string.cpp:475:29:475:30 | s3 |  |
-| string.cpp:472:18:472:22 | call to basic_string | string.cpp:481:18:481:19 | s3 |  |
-| string.cpp:472:18:472:22 | call to basic_string | string.cpp:481:30:481:31 | s3 |  |
-| string.cpp:473:18:473:23 | call to source | string.cpp:473:18:473:26 | call to basic_string | TAINT |
-| string.cpp:473:18:473:26 | call to basic_string | string.cpp:478:17:478:18 | s4 |  |
-| string.cpp:473:18:473:26 | call to basic_string | string.cpp:478:29:478:30 | s4 |  |
-| string.cpp:473:18:473:26 | call to basic_string | string.cpp:481:8:481:9 | s4 |  |
-| string.cpp:473:18:473:26 | call to basic_string | string.cpp:482:8:482:9 | s4 |  |
-| string.cpp:475:8:475:8 | e | string.cpp:475:10:475:15 | call to append | TAINT |
-| string.cpp:475:8:475:8 | ref arg e | string.cpp:476:8:476:8 | e |  |
-| string.cpp:475:17:475:18 | ref arg s3 | string.cpp:475:29:475:30 | s3 |  |
-| string.cpp:475:17:475:18 | ref arg s3 | string.cpp:481:18:481:19 | s3 |  |
-| string.cpp:475:17:475:18 | ref arg s3 | string.cpp:481:30:481:31 | s3 |  |
-| string.cpp:475:17:475:18 | s3 | string.cpp:475:20:475:24 | call to begin | TAINT |
-| string.cpp:475:20:475:24 | call to begin | string.cpp:475:8:475:8 | ref arg e | TAINT |
-| string.cpp:475:20:475:24 | call to begin | string.cpp:475:10:475:15 | call to append | TAINT |
-| string.cpp:475:29:475:30 | ref arg s3 | string.cpp:481:18:481:19 | s3 |  |
-| string.cpp:475:29:475:30 | ref arg s3 | string.cpp:481:30:481:31 | s3 |  |
-| string.cpp:475:29:475:30 | s3 | string.cpp:475:32:475:34 | call to end | TAINT |
-| string.cpp:475:32:475:34 | call to end | string.cpp:475:8:475:8 | ref arg e | TAINT |
-| string.cpp:475:32:475:34 | call to end | string.cpp:475:10:475:15 | call to append | TAINT |
-| string.cpp:478:8:478:8 | f | string.cpp:478:10:478:15 | call to append | TAINT |
-| string.cpp:478:8:478:8 | ref arg f | string.cpp:479:8:479:8 | f |  |
-| string.cpp:478:17:478:18 | ref arg s4 | string.cpp:478:29:478:30 | s4 |  |
-| string.cpp:478:17:478:18 | ref arg s4 | string.cpp:481:8:481:9 | s4 |  |
-| string.cpp:478:17:478:18 | ref arg s4 | string.cpp:482:8:482:9 | s4 |  |
-| string.cpp:478:17:478:18 | s4 | string.cpp:478:20:478:24 | call to begin | TAINT |
-| string.cpp:478:20:478:24 | call to begin | string.cpp:478:8:478:8 | ref arg f | TAINT |
-| string.cpp:478:20:478:24 | call to begin | string.cpp:478:10:478:15 | call to append | TAINT |
-| string.cpp:478:29:478:30 | ref arg s4 | string.cpp:481:8:481:9 | s4 |  |
-| string.cpp:478:29:478:30 | ref arg s4 | string.cpp:482:8:482:9 | s4 |  |
-| string.cpp:478:29:478:30 | s4 | string.cpp:478:32:478:34 | call to end | TAINT |
-| string.cpp:478:32:478:34 | call to end | string.cpp:478:8:478:8 | ref arg f | TAINT |
-| string.cpp:478:32:478:34 | call to end | string.cpp:478:10:478:15 | call to append | TAINT |
-| string.cpp:481:8:481:9 | ref arg s4 | string.cpp:482:8:482:9 | s4 |  |
-| string.cpp:481:8:481:9 | s4 | string.cpp:481:11:481:16 | call to append | TAINT |
-| string.cpp:481:18:481:19 | ref arg s3 | string.cpp:481:30:481:31 | s3 |  |
-| string.cpp:481:18:481:19 | s3 | string.cpp:481:21:481:25 | call to begin | TAINT |
-| string.cpp:481:21:481:25 | call to begin | string.cpp:481:8:481:9 | ref arg s4 | TAINT |
-| string.cpp:481:21:481:25 | call to begin | string.cpp:481:11:481:16 | call to append | TAINT |
-| string.cpp:481:30:481:31 | s3 | string.cpp:481:33:481:35 | call to end | TAINT |
-| string.cpp:481:33:481:35 | call to end | string.cpp:481:8:481:9 | ref arg s4 | TAINT |
-| string.cpp:481:33:481:35 | call to end | string.cpp:481:11:481:16 | call to append | TAINT |
-| string.cpp:486:17:486:20 | gg | string.cpp:486:17:486:21 | call to basic_string | TAINT |
-| string.cpp:486:17:486:21 | call to basic_string | string.cpp:491:8:491:8 | g |  |
-| string.cpp:486:17:486:21 | call to basic_string | string.cpp:492:8:492:8 | g |  |
-| string.cpp:487:17:487:20 | hh | string.cpp:487:17:487:21 | call to basic_string | TAINT |
-| string.cpp:487:17:487:21 | call to basic_string | string.cpp:494:8:494:8 | h |  |
-| string.cpp:487:17:487:21 | call to basic_string | string.cpp:495:8:495:8 | h |  |
-| string.cpp:488:18:488:21 | 55 | string.cpp:488:18:488:22 | call to basic_string | TAINT |
-| string.cpp:488:18:488:22 | call to basic_string | string.cpp:491:17:491:18 | s5 |  |
-| string.cpp:488:18:488:22 | call to basic_string | string.cpp:491:30:491:31 | s5 |  |
-| string.cpp:488:18:488:22 | call to basic_string | string.cpp:497:18:497:19 | s5 |  |
-| string.cpp:488:18:488:22 | call to basic_string | string.cpp:497:31:497:32 | s5 |  |
-| string.cpp:489:18:489:23 | call to source | string.cpp:489:18:489:26 | call to basic_string | TAINT |
-| string.cpp:489:18:489:26 | call to basic_string | string.cpp:494:17:494:18 | s6 |  |
-| string.cpp:489:18:489:26 | call to basic_string | string.cpp:494:30:494:31 | s6 |  |
-| string.cpp:489:18:489:26 | call to basic_string | string.cpp:497:8:497:9 | s6 |  |
-| string.cpp:489:18:489:26 | call to basic_string | string.cpp:498:8:498:9 | s6 |  |
-| string.cpp:491:8:491:8 | ref arg g | string.cpp:492:8:492:8 | g |  |
-| string.cpp:491:17:491:18 | s5 | string.cpp:491:20:491:25 | call to cbegin | TAINT |
-| string.cpp:491:20:491:25 | call to cbegin | string.cpp:491:8:491:8 | ref arg g | TAINT |
-| string.cpp:491:20:491:25 | call to cbegin | string.cpp:491:10:491:15 | call to assign | TAINT |
-| string.cpp:491:30:491:31 | s5 | string.cpp:491:33:491:36 | call to cend | TAINT |
-| string.cpp:491:33:491:36 | call to cend | string.cpp:491:8:491:8 | ref arg g | TAINT |
-| string.cpp:491:33:491:36 | call to cend | string.cpp:491:10:491:15 | call to assign | TAINT |
-| string.cpp:494:8:494:8 | ref arg h | string.cpp:495:8:495:8 | h |  |
-| string.cpp:494:17:494:18 | s6 | string.cpp:494:20:494:25 | call to cbegin | TAINT |
-| string.cpp:494:20:494:25 | call to cbegin | string.cpp:494:8:494:8 | ref arg h | TAINT |
-| string.cpp:494:20:494:25 | call to cbegin | string.cpp:494:10:494:15 | call to assign | TAINT |
-| string.cpp:494:30:494:31 | s6 | string.cpp:494:33:494:36 | call to cend | TAINT |
-| string.cpp:494:33:494:36 | call to cend | string.cpp:494:8:494:8 | ref arg h | TAINT |
-| string.cpp:494:33:494:36 | call to cend | string.cpp:494:10:494:15 | call to assign | TAINT |
-| string.cpp:497:8:497:9 | ref arg s6 | string.cpp:498:8:498:9 | s6 |  |
-| string.cpp:497:18:497:19 | s5 | string.cpp:497:21:497:26 | call to cbegin | TAINT |
-| string.cpp:497:21:497:26 | call to cbegin | string.cpp:497:8:497:9 | ref arg s6 | TAINT |
-| string.cpp:497:21:497:26 | call to cbegin | string.cpp:497:11:497:16 | call to assign | TAINT |
-| string.cpp:497:31:497:32 | s5 | string.cpp:497:34:497:37 | call to cend | TAINT |
-| string.cpp:497:34:497:37 | call to cend | string.cpp:497:8:497:9 | ref arg s6 | TAINT |
-| string.cpp:497:34:497:37 | call to cend | string.cpp:497:11:497:16 | call to assign | TAINT |
-| string.cpp:503:14:503:18 | abc | string.cpp:505:17:505:19 | cs1 |  |
-| string.cpp:504:14:504:19 | call to source | string.cpp:506:17:506:19 | cs2 |  |
-| string.cpp:505:17:505:19 | cs1 | string.cpp:505:17:505:20 | call to basic_string | TAINT |
-| string.cpp:505:17:505:20 | call to basic_string | string.cpp:507:17:507:18 | s1 |  |
-| string.cpp:505:17:505:20 | call to basic_string | string.cpp:507:29:507:30 | s1 |  |
-| string.cpp:505:17:505:20 | call to basic_string | string.cpp:510:7:510:8 | s1 |  |
-| string.cpp:506:17:506:19 | cs2 | string.cpp:506:17:506:20 | call to basic_string | TAINT |
-| string.cpp:506:17:506:20 | call to basic_string | string.cpp:508:17:508:18 | s2 |  |
-| string.cpp:506:17:506:20 | call to basic_string | string.cpp:508:29:508:30 | s2 |  |
-| string.cpp:506:17:506:20 | call to basic_string | string.cpp:511:7:511:8 | s2 |  |
-| string.cpp:507:17:507:18 | ref arg s1 | string.cpp:507:29:507:30 | s1 |  |
-| string.cpp:507:17:507:18 | ref arg s1 | string.cpp:510:7:510:8 | s1 |  |
-| string.cpp:507:17:507:18 | s1 | string.cpp:507:20:507:24 | call to begin | TAINT |
-| string.cpp:507:17:507:37 | call to basic_string | string.cpp:512:7:512:8 | s3 |  |
-| string.cpp:507:20:507:24 | call to begin | string.cpp:507:17:507:37 | call to basic_string | TAINT |
-| string.cpp:507:29:507:30 | ref arg s1 | string.cpp:510:7:510:8 | s1 |  |
-| string.cpp:507:29:507:30 | s1 | string.cpp:507:32:507:34 | call to end | TAINT |
-| string.cpp:507:32:507:34 | call to end | string.cpp:507:17:507:37 | call to basic_string | TAINT |
-| string.cpp:508:17:508:18 | ref arg s2 | string.cpp:508:29:508:30 | s2 |  |
-| string.cpp:508:17:508:18 | ref arg s2 | string.cpp:511:7:511:8 | s2 |  |
-| string.cpp:508:17:508:18 | s2 | string.cpp:508:20:508:24 | call to begin | TAINT |
-| string.cpp:508:17:508:37 | call to basic_string | string.cpp:513:7:513:8 | s4 |  |
+| string.cpp:330:16:330:21 | call to basic_string | string.cpp:334:7:334:7 | b |  |
+| string.cpp:330:16:330:21 | call to basic_string | string.cpp:338:2:338:2 | b |  |
+| string.cpp:330:16:330:21 | call to basic_string | string.cpp:342:7:342:7 | b |  |
+| string.cpp:331:16:331:20 | 123 | string.cpp:331:16:331:21 | call to basic_string | TAINT |
+| string.cpp:331:16:331:21 | call to basic_string | string.cpp:335:7:335:7 | c |  |
+| string.cpp:331:16:331:21 | call to basic_string | string.cpp:339:2:339:2 | c |  |
+| string.cpp:331:16:331:21 | call to basic_string | string.cpp:343:7:343:7 | c |  |
+| string.cpp:337:2:337:2 | a | string.cpp:337:3:337:3 | call to operator[] | TAINT |
+| string.cpp:337:2:337:2 | ref arg a | string.cpp:339:9:339:9 | a |  |
+| string.cpp:337:2:337:2 | ref arg a | string.cpp:341:7:341:7 | a |  |
+| string.cpp:337:2:337:25 | ... = ... | string.cpp:337:3:337:3 | call to operator[] [post update] |  |
+| string.cpp:337:3:337:3 | call to operator[] [post update] | string.cpp:337:2:337:2 | ref arg a | TAINT |
+| string.cpp:337:9:337:23 | call to source | string.cpp:337:2:337:25 | ... = ... |  |
+| string.cpp:338:2:338:2 | b | string.cpp:338:4:338:5 | call to at | TAINT |
+| string.cpp:338:2:338:2 | ref arg b | string.cpp:342:7:342:7 | b |  |
+| string.cpp:338:2:338:28 | ... = ... | string.cpp:338:4:338:5 | call to at [post update] |  |
+| string.cpp:338:4:338:5 | call to at [post update] | string.cpp:338:2:338:2 | ref arg b | TAINT |
+| string.cpp:338:12:338:26 | call to source | string.cpp:338:2:338:28 | ... = ... |  |
+| string.cpp:339:2:339:2 | c | string.cpp:339:3:339:3 | call to operator[] | TAINT |
+| string.cpp:339:2:339:2 | ref arg c | string.cpp:343:7:343:7 | c |  |
+| string.cpp:339:2:339:12 | ... = ... | string.cpp:339:3:339:3 | call to operator[] [post update] |  |
+| string.cpp:339:3:339:3 | call to operator[] [post update] | string.cpp:339:2:339:2 | ref arg c | TAINT |
+| string.cpp:339:9:339:9 | a | string.cpp:339:10:339:10 | call to operator[] | TAINT |
+| string.cpp:339:9:339:9 | ref arg a | string.cpp:341:7:341:7 | a |  |
+| string.cpp:339:10:339:10 | call to operator[] | string.cpp:339:2:339:12 | ... = ... |  |
+| string.cpp:348:18:348:22 | 123 | string.cpp:348:18:348:23 | call to basic_string | TAINT |
+| string.cpp:348:18:348:23 | call to basic_string | string.cpp:350:2:350:4 | str |  |
+| string.cpp:348:18:348:23 | call to basic_string | string.cpp:351:7:351:9 | str |  |
+| string.cpp:348:18:348:23 | call to basic_string | string.cpp:352:7:352:9 | str |  |
+| string.cpp:350:2:350:4 | ref arg str | string.cpp:351:7:351:9 | str |  |
+| string.cpp:350:2:350:4 | ref arg str | string.cpp:352:7:352:9 | str |  |
+| string.cpp:350:2:350:4 | str | string.cpp:350:6:350:9 | call to data | TAINT |
+| string.cpp:350:2:350:14 | access to array [post update] | string.cpp:350:6:350:9 | call to data [inner post update] |  |
+| string.cpp:350:2:350:34 | ... = ... | string.cpp:350:2:350:14 | access to array [post update] |  |
+| string.cpp:350:6:350:9 | call to data | string.cpp:350:2:350:14 | access to array | TAINT |
+| string.cpp:350:6:350:9 | call to data [inner post update] | string.cpp:350:2:350:4 | ref arg str | TAINT |
+| string.cpp:350:13:350:13 | 1 | string.cpp:350:2:350:14 | access to array | TAINT |
+| string.cpp:350:18:350:32 | call to source | string.cpp:350:2:350:34 | ... = ... |  |
+| string.cpp:352:7:352:9 | str | string.cpp:352:11:352:14 | call to data | TAINT |
+| string.cpp:358:18:358:24 | hello | string.cpp:358:18:358:25 | call to basic_string | TAINT |
+| string.cpp:358:18:358:25 | call to basic_string | string.cpp:363:8:363:9 | s1 |  |
+| string.cpp:358:18:358:25 | call to basic_string | string.cpp:364:8:364:9 | s1 |  |
+| string.cpp:358:18:358:25 | call to basic_string | string.cpp:365:8:365:9 | s1 |  |
+| string.cpp:359:18:359:23 | call to source | string.cpp:359:18:359:26 | call to basic_string | TAINT |
+| string.cpp:359:18:359:26 | call to basic_string | string.cpp:364:18:364:19 | s2 |  |
+| string.cpp:359:18:359:26 | call to basic_string | string.cpp:364:30:364:31 | s2 |  |
+| string.cpp:360:18:360:24 | hello | string.cpp:360:18:360:25 | call to basic_string | TAINT |
+| string.cpp:360:18:360:25 | call to basic_string | string.cpp:367:8:367:9 | s3 |  |
+| string.cpp:360:18:360:25 | call to basic_string | string.cpp:368:8:368:9 | s3 |  |
+| string.cpp:360:18:360:25 | call to basic_string | string.cpp:369:8:369:9 | s3 |  |
+| string.cpp:361:18:361:24 | world | string.cpp:361:18:361:25 | call to basic_string | TAINT |
+| string.cpp:361:18:361:25 | call to basic_string | string.cpp:368:18:368:19 | s4 |  |
+| string.cpp:361:18:361:25 | call to basic_string | string.cpp:368:30:368:31 | s4 |  |
+| string.cpp:364:8:364:9 | ref arg s1 | string.cpp:365:8:365:9 | s1 |  |
+| string.cpp:364:8:364:9 | s1 | string.cpp:364:11:364:16 | call to append | TAINT |
+| string.cpp:364:18:364:19 | ref arg s2 | string.cpp:364:30:364:31 | s2 |  |
+| string.cpp:364:18:364:19 | s2 | string.cpp:364:21:364:25 | call to begin | TAINT |
+| string.cpp:364:21:364:25 | call to begin | string.cpp:364:8:364:9 | ref arg s1 | TAINT |
+| string.cpp:364:21:364:25 | call to begin | string.cpp:364:11:364:16 | call to append | TAINT |
+| string.cpp:364:30:364:31 | s2 | string.cpp:364:33:364:35 | call to end | TAINT |
+| string.cpp:364:33:364:35 | call to end | string.cpp:364:8:364:9 | ref arg s1 | TAINT |
+| string.cpp:364:33:364:35 | call to end | string.cpp:364:11:364:16 | call to append | TAINT |
+| string.cpp:368:8:368:9 | ref arg s3 | string.cpp:369:8:369:9 | s3 |  |
+| string.cpp:368:8:368:9 | s3 | string.cpp:368:11:368:16 | call to append | TAINT |
+| string.cpp:368:18:368:19 | ref arg s4 | string.cpp:368:30:368:31 | s4 |  |
+| string.cpp:368:18:368:19 | s4 | string.cpp:368:21:368:25 | call to begin | TAINT |
+| string.cpp:368:21:368:25 | call to begin | string.cpp:368:8:368:9 | ref arg s3 | TAINT |
+| string.cpp:368:21:368:25 | call to begin | string.cpp:368:11:368:16 | call to append | TAINT |
+| string.cpp:368:30:368:31 | s4 | string.cpp:368:33:368:35 | call to end | TAINT |
+| string.cpp:368:33:368:35 | call to end | string.cpp:368:8:368:9 | ref arg s3 | TAINT |
+| string.cpp:368:33:368:35 | call to end | string.cpp:368:11:368:16 | call to append | TAINT |
+| string.cpp:374:18:374:24 | hello | string.cpp:374:18:374:25 | call to basic_string | TAINT |
+| string.cpp:374:18:374:25 | call to basic_string | string.cpp:377:28:377:29 | s1 |  |
+| string.cpp:375:18:375:23 | call to source | string.cpp:375:18:375:26 | call to basic_string | TAINT |
+| string.cpp:375:18:375:26 | call to basic_string | string.cpp:381:28:381:29 | s2 |  |
+| string.cpp:377:28:377:29 | s1 | string.cpp:377:31:377:35 | call to begin | TAINT |
+| string.cpp:377:31:377:35 | call to begin | string.cpp:379:9:379:13 | iter1 |  |
+| string.cpp:377:31:377:35 | call to begin | string.cpp:380:8:380:12 | iter1 |  |
+| string.cpp:379:9:379:13 | iter1 | string.cpp:379:8:379:8 | call to operator* | TAINT |
+| string.cpp:379:9:379:13 | ref arg iter1 | string.cpp:380:8:380:12 | iter1 |  |
+| string.cpp:380:8:380:12 | iter1 | string.cpp:380:13:380:13 | call to operator[] | TAINT |
+| string.cpp:381:28:381:29 | s2 | string.cpp:381:31:381:35 | call to begin | TAINT |
+| string.cpp:381:31:381:35 | call to begin | string.cpp:383:9:383:13 | iter2 |  |
+| string.cpp:381:31:381:35 | call to begin | string.cpp:384:8:384:12 | iter2 |  |
+| string.cpp:383:9:383:13 | iter2 | string.cpp:383:8:383:8 | call to operator* | TAINT |
+| string.cpp:383:9:383:13 | ref arg iter2 | string.cpp:384:8:384:12 | iter2 |  |
+| string.cpp:384:8:384:12 | iter2 | string.cpp:384:13:384:13 | call to operator[] | TAINT |
+| string.cpp:389:18:389:24 | hello | string.cpp:389:18:389:25 | call to basic_string | TAINT |
+| string.cpp:389:18:389:25 | call to basic_string | string.cpp:392:25:392:26 | s1 |  |
+| string.cpp:390:18:390:23 | call to source | string.cpp:390:18:390:26 | call to basic_string | TAINT |
+| string.cpp:390:18:390:26 | call to basic_string | string.cpp:394:25:394:26 | s2 |  |
+| string.cpp:390:18:390:26 | call to basic_string | string.cpp:414:8:414:9 | s2 |  |
+| string.cpp:392:25:392:26 | s1 | string.cpp:392:28:392:32 | call to begin | TAINT |
+| string.cpp:394:25:394:26 | ref arg s2 | string.cpp:414:8:414:9 | s2 |  |
+| string.cpp:394:25:394:26 | s2 | string.cpp:394:28:394:32 | call to begin | TAINT |
+| string.cpp:394:28:394:32 | call to begin | string.cpp:397:10:397:11 | i2 |  |
+| string.cpp:394:28:394:32 | call to begin | string.cpp:398:10:398:11 | i2 |  |
+| string.cpp:394:28:394:32 | call to begin | string.cpp:399:8:399:9 | i2 |  |
+| string.cpp:394:28:394:32 | call to begin | string.cpp:401:8:401:9 | i2 |  |
+| string.cpp:394:28:394:32 | call to begin | string.cpp:403:8:403:9 | i2 |  |
+| string.cpp:394:28:394:32 | call to begin | string.cpp:406:8:406:9 | i2 |  |
+| string.cpp:394:28:394:32 | call to begin | string.cpp:409:8:409:9 | i2 |  |
+| string.cpp:394:28:394:32 | call to begin | string.cpp:411:8:411:9 | i2 |  |
+| string.cpp:394:28:394:32 | call to begin | string.cpp:418:9:418:10 | i2 |  |
+| string.cpp:394:28:394:32 | call to begin | string.cpp:421:9:421:10 | i2 |  |
+| string.cpp:397:10:397:11 | i2 | string.cpp:397:12:397:12 | call to operator+ | TAINT |
+| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:398:10:398:11 | i2 |  |
+| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:399:8:399:9 | i2 |  |
+| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:401:8:401:9 | i2 |  |
+| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:403:8:403:9 | i2 |  |
+| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:406:8:406:9 | i2 |  |
+| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:409:8:409:9 | i2 |  |
+| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:411:8:411:9 | i2 |  |
+| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:418:9:418:10 | i2 |  |
+| string.cpp:397:10:397:11 | ref arg i2 | string.cpp:421:9:421:10 | i2 |  |
+| string.cpp:397:12:397:12 | call to operator+ | string.cpp:397:8:397:8 | call to operator* | TAINT |
+| string.cpp:398:10:398:11 | i2 | string.cpp:398:12:398:12 | call to operator- | TAINT |
+| string.cpp:398:10:398:11 | ref arg i2 | string.cpp:399:8:399:9 | i2 |  |
+| string.cpp:398:10:398:11 | ref arg i2 | string.cpp:401:8:401:9 | i2 |  |
+| string.cpp:398:10:398:11 | ref arg i2 | string.cpp:403:8:403:9 | i2 |  |
+| string.cpp:398:10:398:11 | ref arg i2 | string.cpp:406:8:406:9 | i2 |  |
+| string.cpp:398:10:398:11 | ref arg i2 | string.cpp:409:8:409:9 | i2 |  |
+| string.cpp:398:10:398:11 | ref arg i2 | string.cpp:411:8:411:9 | i2 |  |
+| string.cpp:398:10:398:11 | ref arg i2 | string.cpp:418:9:418:10 | i2 |  |
+| string.cpp:398:10:398:11 | ref arg i2 | string.cpp:421:9:421:10 | i2 |  |
+| string.cpp:398:12:398:12 | call to operator- | string.cpp:398:8:398:8 | call to operator* | TAINT |
+| string.cpp:399:8:399:9 | i2 | string.cpp:399:3:399:9 | ... = ... |  |
+| string.cpp:399:8:399:9 | i2 | string.cpp:400:12:400:13 | i3 |  |
+| string.cpp:400:10:400:10 | call to operator++ | string.cpp:400:8:400:8 | call to operator* | TAINT |
+| string.cpp:400:10:400:10 | ref arg call to operator++ | string.cpp:400:12:400:13 | ref arg i3 |  |
+| string.cpp:400:12:400:13 | i3 | string.cpp:400:10:400:10 | call to operator++ |  |
+| string.cpp:401:8:401:9 | i2 | string.cpp:401:3:401:9 | ... = ... |  |
+| string.cpp:401:8:401:9 | i2 | string.cpp:402:12:402:13 | i4 |  |
+| string.cpp:402:10:402:10 | call to operator-- | string.cpp:402:8:402:8 | call to operator* | TAINT |
+| string.cpp:402:10:402:10 | ref arg call to operator-- | string.cpp:402:12:402:13 | ref arg i4 |  |
+| string.cpp:402:12:402:13 | i4 | string.cpp:402:10:402:10 | call to operator-- |  |
+| string.cpp:403:8:403:9 | i2 | string.cpp:403:3:403:9 | ... = ... |  |
+| string.cpp:403:8:403:9 | i2 | string.cpp:404:3:404:4 | i5 |  |
+| string.cpp:403:8:403:9 | i2 | string.cpp:405:9:405:10 | i5 |  |
+| string.cpp:404:3:404:4 | i5 | string.cpp:404:5:404:5 | call to operator++ |  |
+| string.cpp:404:3:404:4 | ref arg i5 | string.cpp:405:9:405:10 | i5 |  |
+| string.cpp:405:9:405:10 | i5 | string.cpp:405:8:405:8 | call to operator* | TAINT |
+| string.cpp:406:8:406:9 | i2 | string.cpp:406:3:406:9 | ... = ... |  |
+| string.cpp:406:8:406:9 | i2 | string.cpp:407:3:407:4 | i6 |  |
+| string.cpp:406:8:406:9 | i2 | string.cpp:408:9:408:10 | i6 |  |
+| string.cpp:407:3:407:4 | i6 | string.cpp:407:5:407:5 | call to operator-- |  |
+| string.cpp:407:3:407:4 | ref arg i6 | string.cpp:408:9:408:10 | i6 |  |
+| string.cpp:408:9:408:10 | i6 | string.cpp:408:8:408:8 | call to operator* | TAINT |
+| string.cpp:409:8:409:9 | i2 | string.cpp:409:3:409:9 | ... = ... |  |
+| string.cpp:409:8:409:9 | i2 | string.cpp:410:10:410:11 | i7 |  |
+| string.cpp:410:10:410:11 | i7 | string.cpp:410:12:410:12 | call to operator+= | TAINT |
+| string.cpp:410:12:410:12 | call to operator+= | string.cpp:410:8:410:8 | call to operator* | TAINT |
+| string.cpp:410:12:410:12 | ref arg call to operator+= | string.cpp:410:10:410:11 | ref arg i7 | TAINT |
+| string.cpp:410:14:410:14 | 1 | string.cpp:410:10:410:11 | ref arg i7 | TAINT |
+| string.cpp:411:8:411:9 | i2 | string.cpp:411:3:411:9 | ... = ... |  |
+| string.cpp:411:8:411:9 | i2 | string.cpp:412:10:412:11 | i8 |  |
+| string.cpp:412:10:412:11 | i8 | string.cpp:412:12:412:12 | call to operator-= | TAINT |
+| string.cpp:412:12:412:12 | call to operator-= | string.cpp:412:8:412:8 | call to operator* | TAINT |
+| string.cpp:412:12:412:12 | ref arg call to operator-= | string.cpp:412:10:412:11 | ref arg i8 | TAINT |
+| string.cpp:412:14:412:14 | 1 | string.cpp:412:10:412:11 | ref arg i8 | TAINT |
+| string.cpp:414:8:414:9 | s2 | string.cpp:414:11:414:13 | call to end | TAINT |
+| string.cpp:414:11:414:13 | call to end | string.cpp:414:3:414:15 | ... = ... |  |
+| string.cpp:414:11:414:13 | call to end | string.cpp:415:5:415:6 | i9 |  |
+| string.cpp:414:11:414:13 | call to end | string.cpp:416:9:416:10 | i9 |  |
+| string.cpp:415:5:415:6 | i9 | string.cpp:415:3:415:3 | call to operator-- |  |
+| string.cpp:415:5:415:6 | ref arg i9 | string.cpp:416:9:416:10 | i9 |  |
+| string.cpp:416:9:416:10 | i9 | string.cpp:416:8:416:8 | call to operator* | TAINT |
+| string.cpp:418:9:418:10 | i2 | string.cpp:418:3:418:10 | ... = ... |  |
+| string.cpp:418:9:418:10 | i2 | string.cpp:419:10:419:12 | i10 |  |
+| string.cpp:418:9:418:10 | i2 | string.cpp:420:8:420:10 | i10 |  |
+| string.cpp:419:10:419:12 | i10 | string.cpp:419:13:419:13 | call to operator++ |  |
+| string.cpp:419:10:419:12 | ref arg i10 | string.cpp:420:8:420:10 | i10 |  |
+| string.cpp:419:13:419:13 | call to operator++ | string.cpp:419:8:419:8 | call to operator* | TAINT |
+| string.cpp:420:8:420:10 | i10 | string.cpp:420:8:420:10 | call to iterator |  |
+| string.cpp:421:9:421:10 | i2 | string.cpp:421:3:421:10 | ... = ... |  |
+| string.cpp:421:9:421:10 | i2 | string.cpp:422:10:422:12 | i11 |  |
+| string.cpp:421:9:421:10 | i2 | string.cpp:423:8:423:10 | i11 |  |
+| string.cpp:422:10:422:12 | i11 | string.cpp:422:13:422:13 | call to operator-- |  |
+| string.cpp:422:10:422:12 | ref arg i11 | string.cpp:423:8:423:10 | i11 |  |
+| string.cpp:422:13:422:13 | call to operator-- | string.cpp:422:8:422:8 | call to operator* | TAINT |
+| string.cpp:423:8:423:10 | i11 | string.cpp:423:8:423:10 | call to iterator |  |
+| string.cpp:429:17:429:20 | aa | string.cpp:429:17:429:21 | call to basic_string | TAINT |
+| string.cpp:429:17:429:21 | call to basic_string | string.cpp:434:7:434:8 | s1 |  |
+| string.cpp:429:17:429:21 | call to basic_string | string.cpp:435:7:435:8 | s1 |  |
+| string.cpp:430:17:430:20 | bb | string.cpp:430:17:430:21 | call to basic_string | TAINT |
+| string.cpp:430:17:430:21 | call to basic_string | string.cpp:437:7:437:8 | s2 |  |
+| string.cpp:430:17:430:21 | call to basic_string | string.cpp:438:7:438:8 | s2 |  |
+| string.cpp:431:14:431:17 | cc | string.cpp:434:20:434:22 | cs1 |  |
+| string.cpp:432:14:432:19 | call to source | string.cpp:437:20:437:22 | cs2 |  |
+| string.cpp:434:7:434:8 | ref arg s1 | string.cpp:435:7:435:8 | s1 |  |
+| string.cpp:434:7:434:8 | s1 | string.cpp:434:10:434:15 | call to insert | TAINT |
+| string.cpp:434:20:434:22 | cs1 | string.cpp:434:7:434:8 | ref arg s1 | TAINT |
+| string.cpp:434:20:434:22 | cs1 | string.cpp:434:10:434:15 | call to insert | TAINT |
+| string.cpp:437:7:437:8 | ref arg s2 | string.cpp:438:7:438:8 | s2 |  |
+| string.cpp:437:7:437:8 | s2 | string.cpp:437:10:437:15 | call to insert | TAINT |
+| string.cpp:437:20:437:22 | cs2 | string.cpp:437:7:437:8 | ref arg s2 | TAINT |
+| string.cpp:437:20:437:22 | cs2 | string.cpp:437:10:437:15 | call to insert | TAINT |
+| string.cpp:444:17:444:20 | aa | string.cpp:444:17:444:21 | call to basic_string | TAINT |
+| string.cpp:444:17:444:21 | call to basic_string | string.cpp:447:8:447:8 | a |  |
+| string.cpp:444:17:444:21 | call to basic_string | string.cpp:447:17:447:17 | a |  |
+| string.cpp:444:17:444:21 | call to basic_string | string.cpp:448:8:448:8 | a |  |
+| string.cpp:445:17:445:20 | bb | string.cpp:445:17:445:21 | call to basic_string | TAINT |
+| string.cpp:445:17:445:21 | call to basic_string | string.cpp:450:8:450:8 | b |  |
+| string.cpp:445:17:445:21 | call to basic_string | string.cpp:450:17:450:17 | b |  |
+| string.cpp:445:17:445:21 | call to basic_string | string.cpp:451:8:451:8 | b |  |
+| string.cpp:447:8:447:8 | a | string.cpp:447:10:447:15 | call to insert | TAINT |
+| string.cpp:447:8:447:8 | ref arg a | string.cpp:448:8:448:8 | a |  |
+| string.cpp:447:17:447:17 | a | string.cpp:447:19:447:23 | call to begin | TAINT |
+| string.cpp:447:17:447:17 | ref arg a | string.cpp:447:8:447:8 | a |  |
+| string.cpp:447:17:447:17 | ref arg a | string.cpp:448:8:448:8 | a |  |
+| string.cpp:447:17:447:25 | call to iterator | string.cpp:447:8:447:8 | ref arg a | TAINT |
+| string.cpp:447:17:447:25 | call to iterator | string.cpp:447:10:447:15 | call to insert | TAINT |
+| string.cpp:447:19:447:23 | call to begin | string.cpp:447:17:447:25 | call to iterator | TAINT |
+| string.cpp:447:32:447:34 | 120 | string.cpp:447:8:447:8 | ref arg a | TAINT |
+| string.cpp:447:32:447:34 | 120 | string.cpp:447:10:447:15 | call to insert | TAINT |
+| string.cpp:450:8:450:8 | b | string.cpp:450:10:450:15 | call to insert | TAINT |
+| string.cpp:450:8:450:8 | ref arg b | string.cpp:451:8:451:8 | b |  |
+| string.cpp:450:17:450:17 | b | string.cpp:450:19:450:23 | call to begin | TAINT |
+| string.cpp:450:17:450:17 | ref arg b | string.cpp:450:8:450:8 | b |  |
+| string.cpp:450:17:450:17 | ref arg b | string.cpp:451:8:451:8 | b |  |
+| string.cpp:450:17:450:25 | call to iterator | string.cpp:450:8:450:8 | ref arg b | TAINT |
+| string.cpp:450:17:450:25 | call to iterator | string.cpp:450:10:450:15 | call to insert | TAINT |
+| string.cpp:450:19:450:23 | call to begin | string.cpp:450:17:450:25 | call to iterator | TAINT |
+| string.cpp:450:32:450:46 | call to source | string.cpp:450:8:450:8 | ref arg b | TAINT |
+| string.cpp:450:32:450:46 | call to source | string.cpp:450:10:450:15 | call to insert | TAINT |
+| string.cpp:455:17:455:20 | cc | string.cpp:455:17:455:21 | call to basic_string | TAINT |
+| string.cpp:455:17:455:21 | call to basic_string | string.cpp:460:8:460:8 | c |  |
+| string.cpp:455:17:455:21 | call to basic_string | string.cpp:460:17:460:17 | c |  |
+| string.cpp:455:17:455:21 | call to basic_string | string.cpp:461:8:461:8 | c |  |
+| string.cpp:456:17:456:20 | dd | string.cpp:456:17:456:21 | call to basic_string | TAINT |
+| string.cpp:456:17:456:21 | call to basic_string | string.cpp:463:8:463:8 | d |  |
+| string.cpp:456:17:456:21 | call to basic_string | string.cpp:463:17:463:17 | d |  |
+| string.cpp:456:17:456:21 | call to basic_string | string.cpp:464:8:464:8 | d |  |
+| string.cpp:457:18:457:21 | 11 | string.cpp:457:18:457:22 | call to basic_string | TAINT |
+| string.cpp:457:18:457:22 | call to basic_string | string.cpp:460:26:460:27 | s1 |  |
+| string.cpp:457:18:457:22 | call to basic_string | string.cpp:460:38:460:39 | s1 |  |
+| string.cpp:457:18:457:22 | call to basic_string | string.cpp:466:28:466:29 | s1 |  |
+| string.cpp:457:18:457:22 | call to basic_string | string.cpp:466:40:466:41 | s1 |  |
+| string.cpp:458:18:458:23 | call to source | string.cpp:458:18:458:26 | call to basic_string | TAINT |
+| string.cpp:458:18:458:26 | call to basic_string | string.cpp:463:26:463:27 | s2 |  |
+| string.cpp:458:18:458:26 | call to basic_string | string.cpp:463:38:463:39 | s2 |  |
+| string.cpp:458:18:458:26 | call to basic_string | string.cpp:466:8:466:9 | s2 |  |
+| string.cpp:458:18:458:26 | call to basic_string | string.cpp:466:18:466:19 | s2 |  |
+| string.cpp:458:18:458:26 | call to basic_string | string.cpp:467:8:467:9 | s2 |  |
+| string.cpp:460:8:460:8 | c | string.cpp:460:10:460:15 | call to insert | TAINT |
+| string.cpp:460:8:460:8 | ref arg c | string.cpp:461:8:461:8 | c |  |
+| string.cpp:460:17:460:17 | c | string.cpp:460:19:460:21 | call to end | TAINT |
+| string.cpp:460:17:460:17 | ref arg c | string.cpp:460:8:460:8 | c |  |
+| string.cpp:460:17:460:17 | ref arg c | string.cpp:461:8:461:8 | c |  |
+| string.cpp:460:17:460:23 | call to iterator | string.cpp:460:8:460:8 | ref arg c | TAINT |
+| string.cpp:460:17:460:23 | call to iterator | string.cpp:460:10:460:15 | call to insert | TAINT |
+| string.cpp:460:19:460:21 | call to end | string.cpp:460:17:460:23 | call to iterator | TAINT |
+| string.cpp:460:26:460:27 | ref arg s1 | string.cpp:460:38:460:39 | s1 |  |
+| string.cpp:460:26:460:27 | ref arg s1 | string.cpp:466:28:466:29 | s1 |  |
+| string.cpp:460:26:460:27 | ref arg s1 | string.cpp:466:40:466:41 | s1 |  |
+| string.cpp:460:26:460:27 | s1 | string.cpp:460:29:460:33 | call to begin | TAINT |
+| string.cpp:460:29:460:33 | call to begin | string.cpp:460:8:460:8 | ref arg c | TAINT |
+| string.cpp:460:29:460:33 | call to begin | string.cpp:460:10:460:15 | call to insert | TAINT |
+| string.cpp:460:38:460:39 | ref arg s1 | string.cpp:466:28:466:29 | s1 |  |
+| string.cpp:460:38:460:39 | ref arg s1 | string.cpp:466:40:466:41 | s1 |  |
+| string.cpp:460:38:460:39 | s1 | string.cpp:460:41:460:43 | call to end | TAINT |
+| string.cpp:460:41:460:43 | call to end | string.cpp:460:8:460:8 | ref arg c | TAINT |
+| string.cpp:460:41:460:43 | call to end | string.cpp:460:10:460:15 | call to insert | TAINT |
+| string.cpp:463:8:463:8 | d | string.cpp:463:10:463:15 | call to insert | TAINT |
+| string.cpp:463:8:463:8 | ref arg d | string.cpp:464:8:464:8 | d |  |
+| string.cpp:463:17:463:17 | d | string.cpp:463:19:463:21 | call to end | TAINT |
+| string.cpp:463:17:463:17 | ref arg d | string.cpp:463:8:463:8 | d |  |
+| string.cpp:463:17:463:17 | ref arg d | string.cpp:464:8:464:8 | d |  |
+| string.cpp:463:17:463:23 | call to iterator | string.cpp:463:8:463:8 | ref arg d | TAINT |
+| string.cpp:463:17:463:23 | call to iterator | string.cpp:463:10:463:15 | call to insert | TAINT |
+| string.cpp:463:19:463:21 | call to end | string.cpp:463:17:463:23 | call to iterator | TAINT |
+| string.cpp:463:26:463:27 | ref arg s2 | string.cpp:463:38:463:39 | s2 |  |
+| string.cpp:463:26:463:27 | ref arg s2 | string.cpp:466:8:466:9 | s2 |  |
+| string.cpp:463:26:463:27 | ref arg s2 | string.cpp:466:18:466:19 | s2 |  |
+| string.cpp:463:26:463:27 | ref arg s2 | string.cpp:467:8:467:9 | s2 |  |
+| string.cpp:463:26:463:27 | s2 | string.cpp:463:29:463:33 | call to begin | TAINT |
+| string.cpp:463:29:463:33 | call to begin | string.cpp:463:8:463:8 | ref arg d | TAINT |
+| string.cpp:463:29:463:33 | call to begin | string.cpp:463:10:463:15 | call to insert | TAINT |
+| string.cpp:463:38:463:39 | ref arg s2 | string.cpp:466:8:466:9 | s2 |  |
+| string.cpp:463:38:463:39 | ref arg s2 | string.cpp:466:18:466:19 | s2 |  |
+| string.cpp:463:38:463:39 | ref arg s2 | string.cpp:467:8:467:9 | s2 |  |
+| string.cpp:463:38:463:39 | s2 | string.cpp:463:41:463:43 | call to end | TAINT |
+| string.cpp:463:41:463:43 | call to end | string.cpp:463:8:463:8 | ref arg d | TAINT |
+| string.cpp:463:41:463:43 | call to end | string.cpp:463:10:463:15 | call to insert | TAINT |
+| string.cpp:466:8:466:9 | ref arg s2 | string.cpp:467:8:467:9 | s2 |  |
+| string.cpp:466:8:466:9 | s2 | string.cpp:466:11:466:16 | call to insert | TAINT |
+| string.cpp:466:18:466:19 | ref arg s2 | string.cpp:466:8:466:9 | s2 |  |
+| string.cpp:466:18:466:19 | ref arg s2 | string.cpp:467:8:467:9 | s2 |  |
+| string.cpp:466:18:466:19 | s2 | string.cpp:466:21:466:23 | call to end | TAINT |
+| string.cpp:466:18:466:25 | call to iterator | string.cpp:466:8:466:9 | ref arg s2 | TAINT |
+| string.cpp:466:18:466:25 | call to iterator | string.cpp:466:11:466:16 | call to insert | TAINT |
+| string.cpp:466:21:466:23 | call to end | string.cpp:466:18:466:25 | call to iterator | TAINT |
+| string.cpp:466:28:466:29 | ref arg s1 | string.cpp:466:40:466:41 | s1 |  |
+| string.cpp:466:28:466:29 | s1 | string.cpp:466:31:466:35 | call to begin | TAINT |
+| string.cpp:466:31:466:35 | call to begin | string.cpp:466:8:466:9 | ref arg s2 | TAINT |
+| string.cpp:466:31:466:35 | call to begin | string.cpp:466:11:466:16 | call to insert | TAINT |
+| string.cpp:466:40:466:41 | s1 | string.cpp:466:43:466:45 | call to end | TAINT |
+| string.cpp:466:43:466:45 | call to end | string.cpp:466:8:466:9 | ref arg s2 | TAINT |
+| string.cpp:466:43:466:45 | call to end | string.cpp:466:11:466:16 | call to insert | TAINT |
+| string.cpp:471:17:471:20 | ee | string.cpp:471:17:471:21 | call to basic_string | TAINT |
+| string.cpp:471:17:471:21 | call to basic_string | string.cpp:476:8:476:8 | e |  |
+| string.cpp:471:17:471:21 | call to basic_string | string.cpp:477:8:477:8 | e |  |
+| string.cpp:472:17:472:20 | ff | string.cpp:472:17:472:21 | call to basic_string | TAINT |
+| string.cpp:472:17:472:21 | call to basic_string | string.cpp:479:8:479:8 | f |  |
+| string.cpp:472:17:472:21 | call to basic_string | string.cpp:480:8:480:8 | f |  |
+| string.cpp:473:18:473:21 | 33 | string.cpp:473:18:473:22 | call to basic_string | TAINT |
+| string.cpp:473:18:473:22 | call to basic_string | string.cpp:476:17:476:18 | s3 |  |
+| string.cpp:473:18:473:22 | call to basic_string | string.cpp:476:29:476:30 | s3 |  |
+| string.cpp:473:18:473:22 | call to basic_string | string.cpp:482:18:482:19 | s3 |  |
+| string.cpp:473:18:473:22 | call to basic_string | string.cpp:482:30:482:31 | s3 |  |
+| string.cpp:474:18:474:23 | call to source | string.cpp:474:18:474:26 | call to basic_string | TAINT |
+| string.cpp:474:18:474:26 | call to basic_string | string.cpp:479:17:479:18 | s4 |  |
+| string.cpp:474:18:474:26 | call to basic_string | string.cpp:479:29:479:30 | s4 |  |
+| string.cpp:474:18:474:26 | call to basic_string | string.cpp:482:8:482:9 | s4 |  |
+| string.cpp:474:18:474:26 | call to basic_string | string.cpp:483:8:483:9 | s4 |  |
+| string.cpp:476:8:476:8 | e | string.cpp:476:10:476:15 | call to append | TAINT |
+| string.cpp:476:8:476:8 | ref arg e | string.cpp:477:8:477:8 | e |  |
+| string.cpp:476:17:476:18 | ref arg s3 | string.cpp:476:29:476:30 | s3 |  |
+| string.cpp:476:17:476:18 | ref arg s3 | string.cpp:482:18:482:19 | s3 |  |
+| string.cpp:476:17:476:18 | ref arg s3 | string.cpp:482:30:482:31 | s3 |  |
+| string.cpp:476:17:476:18 | s3 | string.cpp:476:20:476:24 | call to begin | TAINT |
+| string.cpp:476:20:476:24 | call to begin | string.cpp:476:8:476:8 | ref arg e | TAINT |
+| string.cpp:476:20:476:24 | call to begin | string.cpp:476:10:476:15 | call to append | TAINT |
+| string.cpp:476:29:476:30 | ref arg s3 | string.cpp:482:18:482:19 | s3 |  |
+| string.cpp:476:29:476:30 | ref arg s3 | string.cpp:482:30:482:31 | s3 |  |
+| string.cpp:476:29:476:30 | s3 | string.cpp:476:32:476:34 | call to end | TAINT |
+| string.cpp:476:32:476:34 | call to end | string.cpp:476:8:476:8 | ref arg e | TAINT |
+| string.cpp:476:32:476:34 | call to end | string.cpp:476:10:476:15 | call to append | TAINT |
+| string.cpp:479:8:479:8 | f | string.cpp:479:10:479:15 | call to append | TAINT |
+| string.cpp:479:8:479:8 | ref arg f | string.cpp:480:8:480:8 | f |  |
+| string.cpp:479:17:479:18 | ref arg s4 | string.cpp:479:29:479:30 | s4 |  |
+| string.cpp:479:17:479:18 | ref arg s4 | string.cpp:482:8:482:9 | s4 |  |
+| string.cpp:479:17:479:18 | ref arg s4 | string.cpp:483:8:483:9 | s4 |  |
+| string.cpp:479:17:479:18 | s4 | string.cpp:479:20:479:24 | call to begin | TAINT |
+| string.cpp:479:20:479:24 | call to begin | string.cpp:479:8:479:8 | ref arg f | TAINT |
+| string.cpp:479:20:479:24 | call to begin | string.cpp:479:10:479:15 | call to append | TAINT |
+| string.cpp:479:29:479:30 | ref arg s4 | string.cpp:482:8:482:9 | s4 |  |
+| string.cpp:479:29:479:30 | ref arg s4 | string.cpp:483:8:483:9 | s4 |  |
+| string.cpp:479:29:479:30 | s4 | string.cpp:479:32:479:34 | call to end | TAINT |
+| string.cpp:479:32:479:34 | call to end | string.cpp:479:8:479:8 | ref arg f | TAINT |
+| string.cpp:479:32:479:34 | call to end | string.cpp:479:10:479:15 | call to append | TAINT |
+| string.cpp:482:8:482:9 | ref arg s4 | string.cpp:483:8:483:9 | s4 |  |
+| string.cpp:482:8:482:9 | s4 | string.cpp:482:11:482:16 | call to append | TAINT |
+| string.cpp:482:18:482:19 | ref arg s3 | string.cpp:482:30:482:31 | s3 |  |
+| string.cpp:482:18:482:19 | s3 | string.cpp:482:21:482:25 | call to begin | TAINT |
+| string.cpp:482:21:482:25 | call to begin | string.cpp:482:8:482:9 | ref arg s4 | TAINT |
+| string.cpp:482:21:482:25 | call to begin | string.cpp:482:11:482:16 | call to append | TAINT |
+| string.cpp:482:30:482:31 | s3 | string.cpp:482:33:482:35 | call to end | TAINT |
+| string.cpp:482:33:482:35 | call to end | string.cpp:482:8:482:9 | ref arg s4 | TAINT |
+| string.cpp:482:33:482:35 | call to end | string.cpp:482:11:482:16 | call to append | TAINT |
+| string.cpp:487:17:487:20 | gg | string.cpp:487:17:487:21 | call to basic_string | TAINT |
+| string.cpp:487:17:487:21 | call to basic_string | string.cpp:492:8:492:8 | g |  |
+| string.cpp:487:17:487:21 | call to basic_string | string.cpp:493:8:493:8 | g |  |
+| string.cpp:488:17:488:20 | hh | string.cpp:488:17:488:21 | call to basic_string | TAINT |
+| string.cpp:488:17:488:21 | call to basic_string | string.cpp:495:8:495:8 | h |  |
+| string.cpp:488:17:488:21 | call to basic_string | string.cpp:496:8:496:8 | h |  |
+| string.cpp:489:18:489:21 | 55 | string.cpp:489:18:489:22 | call to basic_string | TAINT |
+| string.cpp:489:18:489:22 | call to basic_string | string.cpp:492:17:492:18 | s5 |  |
+| string.cpp:489:18:489:22 | call to basic_string | string.cpp:492:30:492:31 | s5 |  |
+| string.cpp:489:18:489:22 | call to basic_string | string.cpp:498:18:498:19 | s5 |  |
+| string.cpp:489:18:489:22 | call to basic_string | string.cpp:498:31:498:32 | s5 |  |
+| string.cpp:490:18:490:23 | call to source | string.cpp:490:18:490:26 | call to basic_string | TAINT |
+| string.cpp:490:18:490:26 | call to basic_string | string.cpp:495:17:495:18 | s6 |  |
+| string.cpp:490:18:490:26 | call to basic_string | string.cpp:495:30:495:31 | s6 |  |
+| string.cpp:490:18:490:26 | call to basic_string | string.cpp:498:8:498:9 | s6 |  |
+| string.cpp:490:18:490:26 | call to basic_string | string.cpp:499:8:499:9 | s6 |  |
+| string.cpp:492:8:492:8 | ref arg g | string.cpp:493:8:493:8 | g |  |
+| string.cpp:492:17:492:18 | s5 | string.cpp:492:20:492:25 | call to cbegin | TAINT |
+| string.cpp:492:20:492:25 | call to cbegin | string.cpp:492:8:492:8 | ref arg g | TAINT |
+| string.cpp:492:20:492:25 | call to cbegin | string.cpp:492:10:492:15 | call to assign | TAINT |
+| string.cpp:492:30:492:31 | s5 | string.cpp:492:33:492:36 | call to cend | TAINT |
+| string.cpp:492:33:492:36 | call to cend | string.cpp:492:8:492:8 | ref arg g | TAINT |
+| string.cpp:492:33:492:36 | call to cend | string.cpp:492:10:492:15 | call to assign | TAINT |
+| string.cpp:495:8:495:8 | ref arg h | string.cpp:496:8:496:8 | h |  |
+| string.cpp:495:17:495:18 | s6 | string.cpp:495:20:495:25 | call to cbegin | TAINT |
+| string.cpp:495:20:495:25 | call to cbegin | string.cpp:495:8:495:8 | ref arg h | TAINT |
+| string.cpp:495:20:495:25 | call to cbegin | string.cpp:495:10:495:15 | call to assign | TAINT |
+| string.cpp:495:30:495:31 | s6 | string.cpp:495:33:495:36 | call to cend | TAINT |
+| string.cpp:495:33:495:36 | call to cend | string.cpp:495:8:495:8 | ref arg h | TAINT |
+| string.cpp:495:33:495:36 | call to cend | string.cpp:495:10:495:15 | call to assign | TAINT |
+| string.cpp:498:8:498:9 | ref arg s6 | string.cpp:499:8:499:9 | s6 |  |
+| string.cpp:498:18:498:19 | s5 | string.cpp:498:21:498:26 | call to cbegin | TAINT |
+| string.cpp:498:21:498:26 | call to cbegin | string.cpp:498:8:498:9 | ref arg s6 | TAINT |
+| string.cpp:498:21:498:26 | call to cbegin | string.cpp:498:11:498:16 | call to assign | TAINT |
+| string.cpp:498:31:498:32 | s5 | string.cpp:498:34:498:37 | call to cend | TAINT |
+| string.cpp:498:34:498:37 | call to cend | string.cpp:498:8:498:9 | ref arg s6 | TAINT |
+| string.cpp:498:34:498:37 | call to cend | string.cpp:498:11:498:16 | call to assign | TAINT |
+| string.cpp:504:14:504:18 | abc | string.cpp:506:17:506:19 | cs1 |  |
+| string.cpp:505:14:505:19 | call to source | string.cpp:507:17:507:19 | cs2 |  |
+| string.cpp:506:17:506:19 | cs1 | string.cpp:506:17:506:20 | call to basic_string | TAINT |
+| string.cpp:506:17:506:20 | call to basic_string | string.cpp:508:17:508:18 | s1 |  |
+| string.cpp:506:17:506:20 | call to basic_string | string.cpp:508:29:508:30 | s1 |  |
+| string.cpp:506:17:506:20 | call to basic_string | string.cpp:511:7:511:8 | s1 |  |
+| string.cpp:507:17:507:19 | cs2 | string.cpp:507:17:507:20 | call to basic_string | TAINT |
+| string.cpp:507:17:507:20 | call to basic_string | string.cpp:509:17:509:18 | s2 |  |
+| string.cpp:507:17:507:20 | call to basic_string | string.cpp:509:29:509:30 | s2 |  |
+| string.cpp:507:17:507:20 | call to basic_string | string.cpp:512:7:512:8 | s2 |  |
+| string.cpp:508:17:508:18 | ref arg s1 | string.cpp:508:29:508:30 | s1 |  |
+| string.cpp:508:17:508:18 | ref arg s1 | string.cpp:511:7:511:8 | s1 |  |
+| string.cpp:508:17:508:18 | s1 | string.cpp:508:20:508:24 | call to begin | TAINT |
+| string.cpp:508:17:508:37 | call to basic_string | string.cpp:513:7:513:8 | s3 |  |
 | string.cpp:508:20:508:24 | call to begin | string.cpp:508:17:508:37 | call to basic_string | TAINT |
-| string.cpp:508:29:508:30 | ref arg s2 | string.cpp:511:7:511:8 | s2 |  |
-| string.cpp:508:29:508:30 | s2 | string.cpp:508:32:508:34 | call to end | TAINT |
+| string.cpp:508:29:508:30 | ref arg s1 | string.cpp:511:7:511:8 | s1 |  |
+| string.cpp:508:29:508:30 | s1 | string.cpp:508:32:508:34 | call to end | TAINT |
 | string.cpp:508:32:508:34 | call to end | string.cpp:508:17:508:37 | call to basic_string | TAINT |
-| string.cpp:517:16:517:19 | aa | string.cpp:517:16:517:20 | call to basic_string | TAINT |
-| string.cpp:517:16:517:20 | call to basic_string | string.cpp:519:7:519:7 | a |  |
-| string.cpp:517:16:517:20 | call to basic_string | string.cpp:520:7:520:7 | a |  |
-| string.cpp:517:16:517:20 | call to basic_string | string.cpp:521:2:521:2 | a |  |
-| string.cpp:517:16:517:20 | call to basic_string | string.cpp:522:7:522:7 | a |  |
-| string.cpp:517:16:517:20 | call to basic_string | string.cpp:523:7:523:7 | a |  |
-| string.cpp:519:7:519:7 | a | string.cpp:519:9:519:13 | call to front | TAINT |
-| string.cpp:519:7:519:7 | ref arg a | string.cpp:520:7:520:7 | a |  |
-| string.cpp:519:7:519:7 | ref arg a | string.cpp:521:2:521:2 | a |  |
-| string.cpp:519:7:519:7 | ref arg a | string.cpp:522:7:522:7 | a |  |
-| string.cpp:519:7:519:7 | ref arg a | string.cpp:523:7:523:7 | a |  |
-| string.cpp:520:7:520:7 | a | string.cpp:520:9:520:12 | call to back | TAINT |
-| string.cpp:520:7:520:7 | ref arg a | string.cpp:521:2:521:2 | a |  |
-| string.cpp:520:7:520:7 | ref arg a | string.cpp:522:7:522:7 | a |  |
+| string.cpp:509:17:509:18 | ref arg s2 | string.cpp:509:29:509:30 | s2 |  |
+| string.cpp:509:17:509:18 | ref arg s2 | string.cpp:512:7:512:8 | s2 |  |
+| string.cpp:509:17:509:18 | s2 | string.cpp:509:20:509:24 | call to begin | TAINT |
+| string.cpp:509:17:509:37 | call to basic_string | string.cpp:514:7:514:8 | s4 |  |
+| string.cpp:509:20:509:24 | call to begin | string.cpp:509:17:509:37 | call to basic_string | TAINT |
+| string.cpp:509:29:509:30 | ref arg s2 | string.cpp:512:7:512:8 | s2 |  |
+| string.cpp:509:29:509:30 | s2 | string.cpp:509:32:509:34 | call to end | TAINT |
+| string.cpp:509:32:509:34 | call to end | string.cpp:509:17:509:37 | call to basic_string | TAINT |
+| string.cpp:518:16:518:19 | aa | string.cpp:518:16:518:20 | call to basic_string | TAINT |
+| string.cpp:518:16:518:20 | call to basic_string | string.cpp:520:7:520:7 | a |  |
+| string.cpp:518:16:518:20 | call to basic_string | string.cpp:521:7:521:7 | a |  |
+| string.cpp:518:16:518:20 | call to basic_string | string.cpp:522:2:522:2 | a |  |
+| string.cpp:518:16:518:20 | call to basic_string | string.cpp:523:7:523:7 | a |  |
+| string.cpp:518:16:518:20 | call to basic_string | string.cpp:524:7:524:7 | a |  |
+| string.cpp:520:7:520:7 | a | string.cpp:520:9:520:13 | call to front | TAINT |
+| string.cpp:520:7:520:7 | ref arg a | string.cpp:521:7:521:7 | a |  |
+| string.cpp:520:7:520:7 | ref arg a | string.cpp:522:2:522:2 | a |  |
 | string.cpp:520:7:520:7 | ref arg a | string.cpp:523:7:523:7 | a |  |
-| string.cpp:521:2:521:2 | ref arg a | string.cpp:522:7:522:7 | a |  |
-| string.cpp:521:2:521:2 | ref arg a | string.cpp:523:7:523:7 | a |  |
-| string.cpp:521:14:521:28 | call to source | string.cpp:521:2:521:2 | ref arg a | TAINT |
-| string.cpp:522:7:522:7 | a | string.cpp:522:9:522:13 | call to front | TAINT |
-| string.cpp:522:7:522:7 | ref arg a | string.cpp:523:7:523:7 | a |  |
-| string.cpp:523:7:523:7 | a | string.cpp:523:9:523:12 | call to back | TAINT |
-| string.cpp:528:17:528:20 | aa | string.cpp:528:17:528:21 | call to basic_string | TAINT |
-| string.cpp:528:17:528:21 | call to basic_string | string.cpp:535:9:535:9 | a |  |
-| string.cpp:528:17:528:21 | call to basic_string | string.cpp:539:8:539:8 | a |  |
-| string.cpp:529:17:529:20 | bb | string.cpp:529:17:529:21 | call to basic_string | TAINT |
-| string.cpp:529:17:529:21 | call to basic_string | string.cpp:535:15:535:15 | b |  |
-| string.cpp:529:17:529:21 | call to basic_string | string.cpp:540:8:540:8 | b |  |
-| string.cpp:530:17:530:20 | cc | string.cpp:530:17:530:21 | call to basic_string | TAINT |
-| string.cpp:530:17:530:21 | call to basic_string | string.cpp:536:9:536:9 | c |  |
-| string.cpp:530:17:530:21 | call to basic_string | string.cpp:541:8:541:8 | c |  |
-| string.cpp:531:17:531:20 | dd | string.cpp:531:17:531:21 | call to basic_string | TAINT |
-| string.cpp:531:17:531:21 | call to basic_string | string.cpp:536:15:536:15 | d |  |
-| string.cpp:531:17:531:21 | call to basic_string | string.cpp:542:8:542:8 | d |  |
-| string.cpp:532:17:532:20 | ee | string.cpp:532:17:532:21 | call to basic_string | TAINT |
-| string.cpp:532:17:532:21 | call to basic_string | string.cpp:537:10:537:10 | e |  |
-| string.cpp:532:17:532:21 | call to basic_string | string.cpp:543:8:543:8 | e |  |
-| string.cpp:533:17:533:20 | ff | string.cpp:533:17:533:21 | call to basic_string | TAINT |
-| string.cpp:533:17:533:21 | call to basic_string | string.cpp:538:10:538:10 | f |  |
-| string.cpp:533:17:533:21 | call to basic_string | string.cpp:544:8:544:8 | f |  |
-| string.cpp:535:9:535:9 | a | string.cpp:535:11:535:11 | call to operator+= | TAINT |
-| string.cpp:535:9:535:9 | ref arg a | string.cpp:539:8:539:8 | a |  |
-| string.cpp:535:15:535:15 | b | string.cpp:535:17:535:17 | call to operator+= | TAINT |
-| string.cpp:535:15:535:15 | ref arg b | string.cpp:540:8:540:8 | b |  |
-| string.cpp:535:17:535:17 | call to operator+= | string.cpp:535:9:535:9 | ref arg a | TAINT |
-| string.cpp:535:17:535:17 | call to operator+= | string.cpp:535:11:535:11 | call to operator+= | TAINT |
-| string.cpp:535:20:535:23 | bb | string.cpp:535:15:535:15 | ref arg b | TAINT |
-| string.cpp:535:20:535:23 | bb | string.cpp:535:17:535:17 | call to operator+= | TAINT |
-| string.cpp:536:9:536:9 | c | string.cpp:536:11:536:11 | call to operator+= | TAINT |
-| string.cpp:536:9:536:9 | ref arg c | string.cpp:541:8:541:8 | c |  |
-| string.cpp:536:15:536:15 | d | string.cpp:536:17:536:17 | call to operator+= | TAINT |
-| string.cpp:536:15:536:15 | ref arg d | string.cpp:542:8:542:8 | d |  |
-| string.cpp:536:17:536:17 | call to operator+= | string.cpp:536:9:536:9 | ref arg c | TAINT |
+| string.cpp:520:7:520:7 | ref arg a | string.cpp:524:7:524:7 | a |  |
+| string.cpp:521:7:521:7 | a | string.cpp:521:9:521:12 | call to back | TAINT |
+| string.cpp:521:7:521:7 | ref arg a | string.cpp:522:2:522:2 | a |  |
+| string.cpp:521:7:521:7 | ref arg a | string.cpp:523:7:523:7 | a |  |
+| string.cpp:521:7:521:7 | ref arg a | string.cpp:524:7:524:7 | a |  |
+| string.cpp:522:2:522:2 | ref arg a | string.cpp:523:7:523:7 | a |  |
+| string.cpp:522:2:522:2 | ref arg a | string.cpp:524:7:524:7 | a |  |
+| string.cpp:522:14:522:28 | call to source | string.cpp:522:2:522:2 | ref arg a | TAINT |
+| string.cpp:523:7:523:7 | a | string.cpp:523:9:523:13 | call to front | TAINT |
+| string.cpp:523:7:523:7 | ref arg a | string.cpp:524:7:524:7 | a |  |
+| string.cpp:524:7:524:7 | a | string.cpp:524:9:524:12 | call to back | TAINT |
+| string.cpp:529:17:529:20 | aa | string.cpp:529:17:529:21 | call to basic_string | TAINT |
+| string.cpp:529:17:529:21 | call to basic_string | string.cpp:536:9:536:9 | a |  |
+| string.cpp:529:17:529:21 | call to basic_string | string.cpp:540:8:540:8 | a |  |
+| string.cpp:530:17:530:20 | bb | string.cpp:530:17:530:21 | call to basic_string | TAINT |
+| string.cpp:530:17:530:21 | call to basic_string | string.cpp:536:15:536:15 | b |  |
+| string.cpp:530:17:530:21 | call to basic_string | string.cpp:541:8:541:8 | b |  |
+| string.cpp:531:17:531:20 | cc | string.cpp:531:17:531:21 | call to basic_string | TAINT |
+| string.cpp:531:17:531:21 | call to basic_string | string.cpp:537:9:537:9 | c |  |
+| string.cpp:531:17:531:21 | call to basic_string | string.cpp:542:8:542:8 | c |  |
+| string.cpp:532:17:532:20 | dd | string.cpp:532:17:532:21 | call to basic_string | TAINT |
+| string.cpp:532:17:532:21 | call to basic_string | string.cpp:537:15:537:15 | d |  |
+| string.cpp:532:17:532:21 | call to basic_string | string.cpp:543:8:543:8 | d |  |
+| string.cpp:533:17:533:20 | ee | string.cpp:533:17:533:21 | call to basic_string | TAINT |
+| string.cpp:533:17:533:21 | call to basic_string | string.cpp:538:10:538:10 | e |  |
+| string.cpp:533:17:533:21 | call to basic_string | string.cpp:544:8:544:8 | e |  |
+| string.cpp:534:17:534:20 | ff | string.cpp:534:17:534:21 | call to basic_string | TAINT |
+| string.cpp:534:17:534:21 | call to basic_string | string.cpp:539:10:539:10 | f |  |
+| string.cpp:534:17:534:21 | call to basic_string | string.cpp:545:8:545:8 | f |  |
+| string.cpp:536:9:536:9 | a | string.cpp:536:11:536:11 | call to operator+= | TAINT |
+| string.cpp:536:9:536:9 | ref arg a | string.cpp:540:8:540:8 | a |  |
+| string.cpp:536:15:536:15 | b | string.cpp:536:17:536:17 | call to operator+= | TAINT |
+| string.cpp:536:15:536:15 | ref arg b | string.cpp:541:8:541:8 | b |  |
+| string.cpp:536:17:536:17 | call to operator+= | string.cpp:536:9:536:9 | ref arg a | TAINT |
 | string.cpp:536:17:536:17 | call to operator+= | string.cpp:536:11:536:11 | call to operator+= | TAINT |
-| string.cpp:536:20:536:25 | call to source | string.cpp:536:15:536:15 | ref arg d | TAINT |
-| string.cpp:536:20:536:25 | call to source | string.cpp:536:17:536:17 | call to operator+= | TAINT |
-| string.cpp:537:10:537:10 | e | string.cpp:537:12:537:12 | call to operator+= | TAINT |
-| string.cpp:537:10:537:10 | ref arg e | string.cpp:543:8:543:8 | e |  |
-| string.cpp:537:12:537:12 | call to operator+= | string.cpp:537:21:537:21 | call to operator+= | TAINT |
-| string.cpp:537:12:537:12 | ref arg call to operator+= | string.cpp:537:10:537:10 | ref arg e | TAINT |
-| string.cpp:537:15:537:18 | ee | string.cpp:537:10:537:10 | ref arg e | TAINT |
-| string.cpp:537:15:537:18 | ee | string.cpp:537:12:537:12 | call to operator+= | TAINT |
-| string.cpp:537:24:537:29 | call to source | string.cpp:537:12:537:12 | ref arg call to operator+= | TAINT |
-| string.cpp:537:24:537:29 | call to source | string.cpp:537:21:537:21 | call to operator+= | TAINT |
-| string.cpp:538:10:538:10 | f | string.cpp:538:12:538:12 | call to operator+= | TAINT |
-| string.cpp:538:10:538:10 | ref arg f | string.cpp:544:8:544:8 | f |  |
-| string.cpp:538:12:538:12 | call to operator+= | string.cpp:538:25:538:25 | call to operator+= | TAINT |
-| string.cpp:538:12:538:12 | ref arg call to operator+= | string.cpp:538:10:538:10 | ref arg f | TAINT |
-| string.cpp:538:15:538:20 | call to source | string.cpp:538:10:538:10 | ref arg f | TAINT |
-| string.cpp:538:15:538:20 | call to source | string.cpp:538:12:538:12 | call to operator+= | TAINT |
-| string.cpp:538:28:538:31 | ff | string.cpp:538:12:538:12 | ref arg call to operator+= | TAINT |
-| string.cpp:538:28:538:31 | ff | string.cpp:538:25:538:25 | call to operator+= | TAINT |
-| string.cpp:548:17:548:20 | aa | string.cpp:548:17:548:21 | call to basic_string | TAINT |
-| string.cpp:548:17:548:21 | call to basic_string | string.cpp:555:9:555:9 | a |  |
-| string.cpp:548:17:548:21 | call to basic_string | string.cpp:559:8:559:8 | a |  |
-| string.cpp:549:17:549:20 | bb | string.cpp:549:17:549:21 | call to basic_string | TAINT |
-| string.cpp:549:17:549:21 | call to basic_string | string.cpp:555:18:555:18 | b |  |
-| string.cpp:549:17:549:21 | call to basic_string | string.cpp:560:8:560:8 | b |  |
-| string.cpp:550:17:550:20 | cc | string.cpp:550:17:550:21 | call to basic_string | TAINT |
-| string.cpp:550:17:550:21 | call to basic_string | string.cpp:556:9:556:9 | c |  |
-| string.cpp:550:17:550:21 | call to basic_string | string.cpp:561:8:561:8 | c |  |
-| string.cpp:551:17:551:20 | dd | string.cpp:551:17:551:21 | call to basic_string | TAINT |
-| string.cpp:551:17:551:21 | call to basic_string | string.cpp:556:18:556:18 | d |  |
-| string.cpp:551:17:551:21 | call to basic_string | string.cpp:562:8:562:8 | d |  |
-| string.cpp:552:17:552:20 | ee | string.cpp:552:17:552:21 | call to basic_string | TAINT |
-| string.cpp:552:17:552:21 | call to basic_string | string.cpp:557:9:557:9 | e |  |
-| string.cpp:552:17:552:21 | call to basic_string | string.cpp:563:8:563:8 | e |  |
-| string.cpp:553:17:553:20 | ff | string.cpp:553:17:553:21 | call to basic_string | TAINT |
-| string.cpp:553:17:553:21 | call to basic_string | string.cpp:558:9:558:9 | f |  |
-| string.cpp:553:17:553:21 | call to basic_string | string.cpp:564:8:564:8 | f |  |
-| string.cpp:555:9:555:9 | ref arg a | string.cpp:559:8:559:8 | a |  |
-| string.cpp:555:18:555:18 | ref arg b | string.cpp:560:8:560:8 | b |  |
-| string.cpp:555:20:555:25 | call to assign | string.cpp:555:9:555:9 | ref arg a | TAINT |
-| string.cpp:555:20:555:25 | call to assign | string.cpp:555:11:555:16 | call to assign | TAINT |
-| string.cpp:555:27:555:30 | bb | string.cpp:555:27:555:30 | call to basic_string | TAINT |
-| string.cpp:555:27:555:30 | call to basic_string | string.cpp:555:18:555:18 | ref arg b | TAINT |
-| string.cpp:555:27:555:30 | call to basic_string | string.cpp:555:20:555:25 | call to assign | TAINT |
-| string.cpp:556:9:556:9 | ref arg c | string.cpp:561:8:561:8 | c |  |
-| string.cpp:556:18:556:18 | ref arg d | string.cpp:562:8:562:8 | d |  |
-| string.cpp:556:20:556:25 | call to assign | string.cpp:556:9:556:9 | ref arg c | TAINT |
+| string.cpp:536:20:536:23 | bb | string.cpp:536:15:536:15 | ref arg b | TAINT |
+| string.cpp:536:20:536:23 | bb | string.cpp:536:17:536:17 | call to operator+= | TAINT |
+| string.cpp:537:9:537:9 | c | string.cpp:537:11:537:11 | call to operator+= | TAINT |
+| string.cpp:537:9:537:9 | ref arg c | string.cpp:542:8:542:8 | c |  |
+| string.cpp:537:15:537:15 | d | string.cpp:537:17:537:17 | call to operator+= | TAINT |
+| string.cpp:537:15:537:15 | ref arg d | string.cpp:543:8:543:8 | d |  |
+| string.cpp:537:17:537:17 | call to operator+= | string.cpp:537:9:537:9 | ref arg c | TAINT |
+| string.cpp:537:17:537:17 | call to operator+= | string.cpp:537:11:537:11 | call to operator+= | TAINT |
+| string.cpp:537:20:537:25 | call to source | string.cpp:537:15:537:15 | ref arg d | TAINT |
+| string.cpp:537:20:537:25 | call to source | string.cpp:537:17:537:17 | call to operator+= | TAINT |
+| string.cpp:538:10:538:10 | e | string.cpp:538:12:538:12 | call to operator+= | TAINT |
+| string.cpp:538:10:538:10 | ref arg e | string.cpp:544:8:544:8 | e |  |
+| string.cpp:538:12:538:12 | call to operator+= | string.cpp:538:21:538:21 | call to operator+= | TAINT |
+| string.cpp:538:12:538:12 | ref arg call to operator+= | string.cpp:538:10:538:10 | ref arg e | TAINT |
+| string.cpp:538:15:538:18 | ee | string.cpp:538:10:538:10 | ref arg e | TAINT |
+| string.cpp:538:15:538:18 | ee | string.cpp:538:12:538:12 | call to operator+= | TAINT |
+| string.cpp:538:24:538:29 | call to source | string.cpp:538:12:538:12 | ref arg call to operator+= | TAINT |
+| string.cpp:538:24:538:29 | call to source | string.cpp:538:21:538:21 | call to operator+= | TAINT |
+| string.cpp:539:10:539:10 | f | string.cpp:539:12:539:12 | call to operator+= | TAINT |
+| string.cpp:539:10:539:10 | ref arg f | string.cpp:545:8:545:8 | f |  |
+| string.cpp:539:12:539:12 | call to operator+= | string.cpp:539:25:539:25 | call to operator+= | TAINT |
+| string.cpp:539:12:539:12 | ref arg call to operator+= | string.cpp:539:10:539:10 | ref arg f | TAINT |
+| string.cpp:539:15:539:20 | call to source | string.cpp:539:10:539:10 | ref arg f | TAINT |
+| string.cpp:539:15:539:20 | call to source | string.cpp:539:12:539:12 | call to operator+= | TAINT |
+| string.cpp:539:28:539:31 | ff | string.cpp:539:12:539:12 | ref arg call to operator+= | TAINT |
+| string.cpp:539:28:539:31 | ff | string.cpp:539:25:539:25 | call to operator+= | TAINT |
+| string.cpp:549:17:549:20 | aa | string.cpp:549:17:549:21 | call to basic_string | TAINT |
+| string.cpp:549:17:549:21 | call to basic_string | string.cpp:556:9:556:9 | a |  |
+| string.cpp:549:17:549:21 | call to basic_string | string.cpp:560:8:560:8 | a |  |
+| string.cpp:550:17:550:20 | bb | string.cpp:550:17:550:21 | call to basic_string | TAINT |
+| string.cpp:550:17:550:21 | call to basic_string | string.cpp:556:18:556:18 | b |  |
+| string.cpp:550:17:550:21 | call to basic_string | string.cpp:561:8:561:8 | b |  |
+| string.cpp:551:17:551:20 | cc | string.cpp:551:17:551:21 | call to basic_string | TAINT |
+| string.cpp:551:17:551:21 | call to basic_string | string.cpp:557:9:557:9 | c |  |
+| string.cpp:551:17:551:21 | call to basic_string | string.cpp:562:8:562:8 | c |  |
+| string.cpp:552:17:552:20 | dd | string.cpp:552:17:552:21 | call to basic_string | TAINT |
+| string.cpp:552:17:552:21 | call to basic_string | string.cpp:557:18:557:18 | d |  |
+| string.cpp:552:17:552:21 | call to basic_string | string.cpp:563:8:563:8 | d |  |
+| string.cpp:553:17:553:20 | ee | string.cpp:553:17:553:21 | call to basic_string | TAINT |
+| string.cpp:553:17:553:21 | call to basic_string | string.cpp:558:9:558:9 | e |  |
+| string.cpp:553:17:553:21 | call to basic_string | string.cpp:564:8:564:8 | e |  |
+| string.cpp:554:17:554:20 | ff | string.cpp:554:17:554:21 | call to basic_string | TAINT |
+| string.cpp:554:17:554:21 | call to basic_string | string.cpp:559:9:559:9 | f |  |
+| string.cpp:554:17:554:21 | call to basic_string | string.cpp:565:8:565:8 | f |  |
+| string.cpp:556:9:556:9 | ref arg a | string.cpp:560:8:560:8 | a |  |
+| string.cpp:556:18:556:18 | ref arg b | string.cpp:561:8:561:8 | b |  |
+| string.cpp:556:20:556:25 | call to assign | string.cpp:556:9:556:9 | ref arg a | TAINT |
 | string.cpp:556:20:556:25 | call to assign | string.cpp:556:11:556:16 | call to assign | TAINT |
-| string.cpp:556:27:556:32 | call to source | string.cpp:556:27:556:34 | call to basic_string | TAINT |
-| string.cpp:556:27:556:34 | call to basic_string | string.cpp:556:18:556:18 | ref arg d | TAINT |
-| string.cpp:556:27:556:34 | call to basic_string | string.cpp:556:20:556:25 | call to assign | TAINT |
-| string.cpp:557:9:557:9 | ref arg e | string.cpp:563:8:563:8 | e |  |
-| string.cpp:557:11:557:16 | ref arg call to assign | string.cpp:557:9:557:9 | ref arg e | TAINT |
-| string.cpp:557:18:557:21 | call to basic_string | string.cpp:557:9:557:9 | ref arg e | TAINT |
-| string.cpp:557:18:557:21 | call to basic_string | string.cpp:557:11:557:16 | call to assign | TAINT |
-| string.cpp:557:18:557:21 | ee | string.cpp:557:18:557:21 | call to basic_string | TAINT |
-| string.cpp:557:31:557:36 | call to source | string.cpp:557:31:557:38 | call to basic_string | TAINT |
-| string.cpp:557:31:557:38 | call to basic_string | string.cpp:557:11:557:16 | ref arg call to assign | TAINT |
-| string.cpp:557:31:557:38 | call to basic_string | string.cpp:557:24:557:29 | call to assign | TAINT |
-| string.cpp:558:9:558:9 | ref arg f | string.cpp:564:8:564:8 | f |  |
-| string.cpp:558:11:558:16 | ref arg call to assign | string.cpp:558:9:558:9 | ref arg f | TAINT |
-| string.cpp:558:18:558:23 | call to source | string.cpp:558:18:558:25 | call to basic_string | TAINT |
-| string.cpp:558:18:558:25 | call to basic_string | string.cpp:558:9:558:9 | ref arg f | TAINT |
-| string.cpp:558:18:558:25 | call to basic_string | string.cpp:558:11:558:16 | call to assign | TAINT |
-| string.cpp:558:35:558:38 | call to basic_string | string.cpp:558:11:558:16 | ref arg call to assign | TAINT |
-| string.cpp:558:35:558:38 | call to basic_string | string.cpp:558:28:558:33 | call to assign | TAINT |
-| string.cpp:558:35:558:38 | ff | string.cpp:558:35:558:38 | call to basic_string | TAINT |
+| string.cpp:556:27:556:30 | bb | string.cpp:556:27:556:30 | call to basic_string | TAINT |
+| string.cpp:556:27:556:30 | call to basic_string | string.cpp:556:18:556:18 | ref arg b | TAINT |
+| string.cpp:556:27:556:30 | call to basic_string | string.cpp:556:20:556:25 | call to assign | TAINT |
+| string.cpp:557:9:557:9 | ref arg c | string.cpp:562:8:562:8 | c |  |
+| string.cpp:557:18:557:18 | ref arg d | string.cpp:563:8:563:8 | d |  |
+| string.cpp:557:20:557:25 | call to assign | string.cpp:557:9:557:9 | ref arg c | TAINT |
+| string.cpp:557:20:557:25 | call to assign | string.cpp:557:11:557:16 | call to assign | TAINT |
+| string.cpp:557:27:557:32 | call to source | string.cpp:557:27:557:34 | call to basic_string | TAINT |
+| string.cpp:557:27:557:34 | call to basic_string | string.cpp:557:18:557:18 | ref arg d | TAINT |
+| string.cpp:557:27:557:34 | call to basic_string | string.cpp:557:20:557:25 | call to assign | TAINT |
+| string.cpp:558:9:558:9 | ref arg e | string.cpp:564:8:564:8 | e |  |
+| string.cpp:558:11:558:16 | ref arg call to assign | string.cpp:558:9:558:9 | ref arg e | TAINT |
+| string.cpp:558:18:558:21 | call to basic_string | string.cpp:558:9:558:9 | ref arg e | TAINT |
+| string.cpp:558:18:558:21 | call to basic_string | string.cpp:558:11:558:16 | call to assign | TAINT |
+| string.cpp:558:18:558:21 | ee | string.cpp:558:18:558:21 | call to basic_string | TAINT |
+| string.cpp:558:31:558:36 | call to source | string.cpp:558:31:558:38 | call to basic_string | TAINT |
+| string.cpp:558:31:558:38 | call to basic_string | string.cpp:558:11:558:16 | ref arg call to assign | TAINT |
+| string.cpp:558:31:558:38 | call to basic_string | string.cpp:558:24:558:29 | call to assign | TAINT |
+| string.cpp:559:9:559:9 | ref arg f | string.cpp:565:8:565:8 | f |  |
+| string.cpp:559:11:559:16 | ref arg call to assign | string.cpp:559:9:559:9 | ref arg f | TAINT |
+| string.cpp:559:18:559:23 | call to source | string.cpp:559:18:559:25 | call to basic_string | TAINT |
+| string.cpp:559:18:559:25 | call to basic_string | string.cpp:559:9:559:9 | ref arg f | TAINT |
+| string.cpp:559:18:559:25 | call to basic_string | string.cpp:559:11:559:16 | call to assign | TAINT |
+| string.cpp:559:35:559:38 | call to basic_string | string.cpp:559:11:559:16 | ref arg call to assign | TAINT |
+| string.cpp:559:35:559:38 | call to basic_string | string.cpp:559:28:559:33 | call to assign | TAINT |
+| string.cpp:559:35:559:38 | ff | string.cpp:559:35:559:38 | call to basic_string | TAINT |
+| string.cpp:574:26:574:47 | call to source | string.cpp:575:26:575:29 | view |  |
+| string.cpp:574:26:574:47 | call to source | string.cpp:575:40:575:43 | view |  |
+| string.cpp:574:26:574:47 | call to source | string.cpp:580:23:580:26 | view |  |
+| string.cpp:574:26:574:47 | call to source | string.cpp:581:23:581:26 | view |  |
+| string.cpp:574:26:574:47 | call to source | string.cpp:582:26:582:29 | view |  |
+| string.cpp:574:26:574:47 | call to source | string.cpp:583:30:583:33 | view |  |
+| string.cpp:575:26:575:29 | view | string.cpp:575:26:575:30 | call to basic_string | TAINT |
+| string.cpp:575:26:575:30 | call to basic_string | string.cpp:576:7:576:17 | constructed |  |
+| string.cpp:575:40:575:43 | view | string.cpp:575:40:575:50 | call to basic_string | TAINT |
+| string.cpp:575:40:575:50 | call to basic_string | string.cpp:577:7:577:12 | sliced |  |
+| string.cpp:579:14:579:21 | call to basic_string | string.cpp:580:7:580:14 | assigned |  |
+| string.cpp:579:24:579:31 | call to basic_string | string.cpp:581:7:581:14 | appended |  |
+| string.cpp:579:34:579:41 | call to basic_string | string.cpp:582:7:582:14 | inserted |  |
+| string.cpp:579:44:579:51 | call to basic_string | string.cpp:583:7:583:14 | replaced |  |
+| string.cpp:580:23:580:26 | view | string.cpp:580:7:580:14 | ref arg assigned | TAINT |
+| string.cpp:580:23:580:26 | view | string.cpp:580:16:580:21 | call to assign | TAINT |
+| string.cpp:581:7:581:14 | appended | string.cpp:581:16:581:21 | call to append | TAINT |
+| string.cpp:581:23:581:26 | view | string.cpp:581:7:581:14 | ref arg appended | TAINT |
+| string.cpp:581:23:581:26 | view | string.cpp:581:16:581:21 | call to append | TAINT |
+| string.cpp:582:7:582:14 | inserted | string.cpp:582:16:582:21 | call to insert | TAINT |
+| string.cpp:582:26:582:29 | view | string.cpp:582:7:582:14 | ref arg inserted | TAINT |
+| string.cpp:582:26:582:29 | view | string.cpp:582:16:582:21 | call to insert | TAINT |
+| string.cpp:583:7:583:14 | replaced | string.cpp:583:16:583:22 | call to replace | TAINT |
+| string.cpp:583:30:583:33 | view | string.cpp:583:7:583:14 | ref arg replaced | TAINT |
+| string.cpp:583:30:583:33 | view | string.cpp:583:16:583:22 | call to replace | TAINT |
+| string.cpp:585:17:585:31 | call to source | string.cpp:586:7:586:13 | tainted |  |
+| string.cpp:586:7:586:13 | tainted | string.cpp:586:15:586:15 | call to operator+ | TAINT |
+| string.cpp:586:17:586:36 | call to basic_string | string.cpp:586:15:586:15 | call to operator+ | TAINT |
+| string.cpp:586:29:586:35 | clean | string.cpp:586:17:586:36 | call to basic_string | TAINT |
+| string.cpp:602:21:602:26 | call to source | string.cpp:603:30:603:33 | data |  |
+| string.cpp:602:21:602:26 | call to source | string.cpp:607:27:607:30 | data |  |
+| string.cpp:602:21:602:26 | call to source | string.cpp:611:29:611:32 | data |  |
+| string.cpp:602:21:602:26 | call to source | string.cpp:611:35:611:38 | data |  |
+| string.cpp:603:30:603:33 | data | string.cpp:603:30:603:34 | call to basic_string_view | TAINT |
+| string.cpp:603:30:603:34 | call to basic_string_view | string.cpp:604:7:604:16 | terminated |  |
+| string.cpp:603:30:603:34 | call to basic_string_view | string.cpp:605:7:605:16 | terminated |  |
+| string.cpp:604:7:604:16 | terminated | string.cpp:604:7:604:16 | call to basic_string_view |  |
+| string.cpp:607:27:607:34 | call to basic_string_view | string.cpp:608:7:608:13 | counted |  |
+| string.cpp:607:27:607:34 | call to basic_string_view | string.cpp:609:7:609:13 | counted |  |
+| string.cpp:608:7:608:13 | counted | string.cpp:608:7:608:13 | call to basic_string_view |  |
+| string.cpp:611:29:611:43 | call to basic_string_view | string.cpp:612:7:612:15 | iterators |  |
+| string.cpp:611:35:611:38 | data | string.cpp:611:35:611:42 | ... + ... | TAINT |
+| string.cpp:611:42:611:42 | 5 | string.cpp:611:35:611:42 | ... + ... | TAINT |
+| string.cpp:612:7:612:15 | iterators | string.cpp:612:7:612:15 | call to basic_string_view |  |
+| string.cpp:616:24:616:45 | call to source | string.cpp:617:26:617:33 | original |  |
+| string.cpp:616:24:616:45 | call to source | string.cpp:620:63:620:70 | original |  |
+| string.cpp:616:24:616:45 | call to source | string.cpp:624:18:624:25 | original |  |
+| string.cpp:616:24:616:45 | call to source | string.cpp:629:22:629:29 | original |  |
+| string.cpp:617:26:617:33 | original | string.cpp:617:26:617:34 | call to basic_string_view |  |
+| string.cpp:617:26:617:34 | call to basic_string_view | string.cpp:618:7:618:12 | copied |  |
+| string.cpp:617:26:617:34 | call to basic_string_view | string.cpp:619:7:619:12 | copied |  |
+| string.cpp:617:26:617:34 | call to basic_string_view | string.cpp:632:2:632:7 | copied |  |
+| string.cpp:617:26:617:34 | call to basic_string_view | string.cpp:633:7:633:12 | copied |  |
+| string.cpp:618:7:618:12 | copied | string.cpp:618:7:618:12 | call to basic_string_view |  |
+| string.cpp:620:25:620:72 | call to basic_string_view | string.cpp:621:7:621:11 | moved |  |
+| string.cpp:620:63:620:70 | original | string.cpp:620:25:620:72 | call to basic_string_view | TAINT |
+| string.cpp:621:7:621:11 | moved | string.cpp:621:7:621:11 | call to basic_string_view |  |
+| string.cpp:623:19:623:26 | call to basic_string_view | string.cpp:624:7:624:14 | assigned |  |
+| string.cpp:623:19:623:26 | call to basic_string_view | string.cpp:625:7:625:14 | assigned |  |
+| string.cpp:624:7:624:14 | ref arg assigned | string.cpp:625:7:625:14 | assigned |  |
+| string.cpp:624:16:624:16 | call to operator= | string.cpp:624:7:624:25 | call to basic_string_view | TAINT |
+| string.cpp:624:18:624:25 | original | string.cpp:624:7:624:14 | ref arg assigned | TAINT |
+| string.cpp:624:18:624:25 | original | string.cpp:624:16:624:16 | call to operator= | TAINT |
+| string.cpp:625:7:625:14 | assigned | string.cpp:625:7:625:14 | call to basic_string_view |  |
+| string.cpp:627:25:627:29 | call to basic_string_view | string.cpp:629:13:629:17 | clean |  |
+| string.cpp:627:25:627:29 | call to basic_string_view | string.cpp:632:11:632:15 | clean |  |
+| string.cpp:628:19:628:25 | call to basic_string_view | string.cpp:629:3:629:9 | chained |  |
+| string.cpp:628:19:628:25 | call to basic_string_view | string.cpp:630:7:630:13 | chained |  |
+| string.cpp:629:3:629:9 | ref arg chained | string.cpp:630:7:630:13 | chained |  |
+| string.cpp:629:13:629:17 | clean | string.cpp:629:3:629:9 | ref arg chained | TAINT |
+| string.cpp:629:13:629:17 | clean | string.cpp:629:11:629:11 | call to operator= | TAINT |
+| string.cpp:629:22:629:29 | original | string.cpp:629:11:629:11 | ref arg call to operator= | TAINT |
+| string.cpp:629:22:629:29 | original | string.cpp:629:20:629:20 | call to operator= | TAINT |
+| string.cpp:630:7:630:13 | chained | string.cpp:630:7:630:13 | call to basic_string_view |  |
+| string.cpp:632:2:632:7 | ref arg copied | string.cpp:633:7:633:12 | copied |  |
+| string.cpp:632:11:632:15 | clean | string.cpp:632:2:632:7 | ref arg copied | TAINT |
+| string.cpp:632:11:632:15 | clean | string.cpp:632:9:632:9 | call to operator= | TAINT |
+| string.cpp:633:7:633:12 | copied | string.cpp:633:7:633:12 | call to basic_string_view |  |
+| string.cpp:637:27:637:43 | call to source | string.cpp:638:29:638:30 | it |  |
+| string.cpp:637:27:637:43 | call to source | string.cpp:638:33:638:34 | it |  |
+| string.cpp:638:29:638:35 | call to basic_string_view | string.cpp:639:7:639:15 | iterators |  |
+| string.cpp:639:7:639:15 | iterators | string.cpp:639:7:639:15 | call to basic_string_view |  |
+| string.cpp:641:24:641:37 | call to source | string.cpp:642:30:642:34 | range |  |
+| string.cpp:642:30:642:35 | call to basic_string_view | string.cpp:643:7:643:16 | from_range |  |
+| string.cpp:643:7:643:16 | from_range | string.cpp:643:7:643:16 | call to basic_string_view |  |
+| string.cpp:645:20:645:28 | call to vector | string.cpp:646:2:646:10 | container |  |
+| string.cpp:645:20:645:28 | call to vector | string.cpp:647:34:647:42 | container |  |
+| string.cpp:645:20:645:28 | call to vector | string.cpp:649:44:649:52 | container |  |
+| string.cpp:645:20:645:28 | call to vector | string.cpp:649:63:649:71 | container |  |
+| string.cpp:645:20:645:28 | call to vector | string.cpp:651:1:651:1 | container |  |
+| string.cpp:646:2:646:10 | ref arg container | string.cpp:647:34:647:42 | container |  |
+| string.cpp:646:2:646:10 | ref arg container | string.cpp:649:44:649:52 | container |  |
+| string.cpp:646:2:646:10 | ref arg container | string.cpp:649:63:649:71 | container |  |
+| string.cpp:646:2:646:10 | ref arg container | string.cpp:651:1:651:1 | container |  |
+| string.cpp:647:34:647:42 | ref arg container | string.cpp:649:44:649:52 | container |  |
+| string.cpp:647:34:647:42 | ref arg container | string.cpp:649:63:649:71 | container |  |
+| string.cpp:647:34:647:42 | ref arg container | string.cpp:651:1:651:1 | container |  |
+| string.cpp:647:34:647:43 | call to basic_string_view | string.cpp:648:7:648:20 | from_container |  |
+| string.cpp:648:7:648:20 | from_container | string.cpp:648:7:648:20 | call to basic_string_view |  |
+| string.cpp:649:44:649:52 | container | string.cpp:649:54:649:58 | call to begin | TAINT |
+| string.cpp:649:44:649:52 | ref arg container | string.cpp:649:63:649:71 | container |  |
+| string.cpp:649:44:649:52 | ref arg container | string.cpp:651:1:651:1 | container |  |
+| string.cpp:649:44:649:78 | call to basic_string_view | string.cpp:650:7:650:30 | from_container_iterators |  |
+| string.cpp:649:63:649:71 | container | string.cpp:649:73:649:75 | call to end | TAINT |
+| string.cpp:649:63:649:71 | ref arg container | string.cpp:651:1:651:1 | container |  |
+| string.cpp:650:7:650:30 | from_container_iterators | string.cpp:650:7:650:30 | call to basic_string_view |  |
+| string.cpp:654:14:654:35 | call to source | string.cpp:655:7:655:10 | view |  |
+| string.cpp:654:14:654:35 | call to source | string.cpp:656:7:656:10 | view |  |
+| string.cpp:654:14:654:35 | call to source | string.cpp:657:7:657:10 | view |  |
+| string.cpp:654:14:654:35 | call to source | string.cpp:658:7:658:10 | view |  |
+| string.cpp:654:14:654:35 | call to source | string.cpp:659:7:659:10 | view |  |
+| string.cpp:654:14:654:35 | call to source | string.cpp:660:8:660:11 | view |  |
+| string.cpp:654:14:654:35 | call to source | string.cpp:661:8:661:11 | view |  |
+| string.cpp:660:8:660:11 | view | string.cpp:660:13:660:17 | call to begin | TAINT |
+| string.cpp:660:13:660:17 | call to begin | string.cpp:660:7:660:19 | * ... | TAINT |
+| string.cpp:661:8:661:11 | view | string.cpp:661:13:661:18 | call to cbegin | TAINT |
+| string.cpp:661:13:661:18 | call to cbegin | string.cpp:661:7:661:20 | * ... | TAINT |
+| string.cpp:665:16:665:37 | call to source | string.cpp:666:2:666:7 | prefix |  |
+| string.cpp:665:16:665:37 | call to source | string.cpp:667:7:667:12 | prefix |  |
+| string.cpp:665:16:665:37 | call to source | string.cpp:668:7:668:12 | prefix |  |
+| string.cpp:666:2:666:7 | ref arg prefix | string.cpp:667:7:667:12 | prefix |  |
+| string.cpp:666:2:666:7 | ref arg prefix | string.cpp:668:7:668:12 | prefix |  |
+| string.cpp:667:7:667:12 | prefix | string.cpp:667:7:667:12 | call to basic_string_view |  |
+| string.cpp:670:16:670:37 | call to source | string.cpp:671:2:671:7 | suffix |  |
+| string.cpp:670:16:670:37 | call to source | string.cpp:672:7:672:12 | suffix |  |
+| string.cpp:670:16:670:37 | call to source | string.cpp:673:7:673:12 | suffix |  |
+| string.cpp:671:2:671:7 | ref arg suffix | string.cpp:672:7:672:12 | suffix |  |
+| string.cpp:671:2:671:7 | ref arg suffix | string.cpp:673:7:673:12 | suffix |  |
+| string.cpp:672:7:672:12 | suffix | string.cpp:672:7:672:12 | call to basic_string_view |  |
+| string.cpp:677:14:677:35 | call to source | string.cpp:678:7:678:10 | view |  |
+| string.cpp:677:14:677:35 | call to source | string.cpp:679:7:679:10 | view |  |
+| string.cpp:677:14:677:35 | call to source | string.cpp:682:7:682:10 | view |  |
+| string.cpp:677:14:677:35 | call to source | string.cpp:686:2:686:5 | view |  |
+| string.cpp:677:14:677:35 | call to source | string.cpp:687:7:687:10 | view |  |
+| string.cpp:681:19:681:21 | {...} | string.cpp:682:17:682:22 | buffer |  |
+| string.cpp:681:19:681:21 | {...} | string.cpp:683:7:683:12 | buffer |  |
+| string.cpp:682:17:682:22 | ref arg buffer | string.cpp:683:7:683:12 | buffer |  |
+| string.cpp:685:19:685:23 | call to basic_string_view | string.cpp:686:12:686:16 | clean |  |
+| string.cpp:685:19:685:23 | call to basic_string_view | string.cpp:688:7:688:11 | clean |  |
+| string.cpp:686:2:686:5 | ref arg view | string.cpp:687:7:687:10 | view |  |
+| string.cpp:686:12:686:16 | ref arg clean | string.cpp:688:7:688:11 | clean |  |
+| string.cpp:687:7:687:10 | view | string.cpp:687:7:687:10 | call to basic_string_view |  |
+| string.cpp:688:7:688:11 | clean | string.cpp:688:7:688:11 | call to basic_string_view |  |
+| string.cpp:694:17:694:20 | aa | string.cpp:694:17:694:21 | call to basic_string | TAINT |
+| string.cpp:695:4:695:4 | s | string.cpp:695:4:695:11 | ... = ... |  |
+| string.cpp:695:4:695:11 | ... = ... | string.cpp:695:4:695:4 | s [inner post update] |  |
+| string.cpp:695:4:695:11 | ... = ... | string.cpp:695:14:695:14 | call to operator+= | TAINT |
+| string.cpp:695:4:695:11 | ref arg ... = ... | string.cpp:695:4:695:4 | s [inner post update] |  |
+| string.cpp:695:4:695:11 | ref arg ... = ... | string.cpp:696:8:696:8 | s |  |
+| string.cpp:695:8:695:11 | bb | string.cpp:695:8:695:11 | call to basic_string | TAINT |
+| string.cpp:695:8:695:11 | call to basic_string | string.cpp:695:4:695:11 | ... = ... |  |
+| string.cpp:695:8:695:11 | call to basic_string | string.cpp:696:8:696:8 | s |  |
+| string.cpp:695:17:695:22 | call to source | string.cpp:695:4:695:11 | ref arg ... = ... | TAINT |
+| string.cpp:695:17:695:22 | call to source | string.cpp:695:14:695:14 | call to operator+= | TAINT |
+| string.cpp:700:17:700:20 | aa | string.cpp:700:17:700:21 | call to basic_string | TAINT |
+| string.cpp:700:17:700:21 | call to basic_string | string.cpp:701:3:701:3 | s |  |
+| string.cpp:700:17:700:21 | call to basic_string | string.cpp:702:8:702:8 | s |  |
+| string.cpp:701:3:701:3 | ref arg s | string.cpp:702:8:702:8 | s |  |
+| string.cpp:701:3:701:3 | s | string.cpp:701:5:701:9 | call to front | TAINT |
+| string.cpp:701:3:701:31 | ... = ... | string.cpp:701:5:701:9 | call to front [post update] |  |
+| string.cpp:701:15:701:29 | call to source | string.cpp:701:3:701:31 | ... = ... |  |
+| string.cpp:706:17:706:20 | aa | string.cpp:706:17:706:21 | call to basic_string | TAINT |
+| string.cpp:706:17:706:21 | call to basic_string | string.cpp:707:3:707:3 | s |  |
+| string.cpp:706:17:706:21 | call to basic_string | string.cpp:708:8:708:8 | s |  |
+| string.cpp:707:3:707:3 | ref arg s | string.cpp:708:8:708:8 | s |  |
+| string.cpp:707:3:707:3 | s | string.cpp:707:5:707:8 | call to back | TAINT |
+| string.cpp:707:3:707:30 | ... = ... | string.cpp:707:5:707:8 | call to back [post update] |  |
+| string.cpp:707:14:707:28 | call to source | string.cpp:707:3:707:30 | ... = ... |  |
+| string.cpp:712:17:712:20 | aa | string.cpp:712:17:712:21 | call to basic_string | TAINT |
+| string.cpp:712:17:712:21 | call to basic_string | string.cpp:713:3:713:3 | s |  |
+| string.cpp:712:17:712:21 | call to basic_string | string.cpp:714:8:714:8 | s |  |
+| string.cpp:713:3:713:3 | ref arg s | string.cpp:714:8:714:8 | s |  |
+| string.cpp:713:3:713:3 | s | string.cpp:713:5:713:8 | call to data | TAINT |
+| string.cpp:713:3:713:13 | access to array [post update] | string.cpp:713:5:713:8 | call to data [inner post update] |  |
+| string.cpp:713:3:713:33 | ... = ... | string.cpp:713:3:713:13 | access to array [post update] |  |
+| string.cpp:713:5:713:8 | call to data | string.cpp:713:3:713:13 | access to array | TAINT |
+| string.cpp:713:5:713:8 | call to data [inner post update] | string.cpp:713:3:713:3 | ref arg s | TAINT |
+| string.cpp:713:12:713:12 | 0 | string.cpp:713:3:713:13 | access to array | TAINT |
+| string.cpp:713:17:713:31 | call to source | string.cpp:713:3:713:33 | ... = ... |  |
+| string.cpp:718:17:718:20 | aa | string.cpp:718:17:718:21 | call to basic_string | TAINT |
+| string.cpp:718:17:718:21 | call to basic_string | string.cpp:719:3:719:3 | s |  |
+| string.cpp:718:17:718:21 | call to basic_string | string.cpp:720:8:720:8 | s |  |
+| string.cpp:719:3:719:3 | ref arg s | string.cpp:720:8:720:8 | s |  |
+| string.cpp:719:3:719:3 | s | string.cpp:719:5:719:10 | call to insert | TAINT |
+| string.cpp:719:3:719:30 | ... = ... | string.cpp:719:5:719:10 | call to insert [post update] |  |
+| string.cpp:719:5:719:10 | call to insert [post update] | string.cpp:719:3:719:3 | ref arg s | TAINT |
+| string.cpp:719:15:719:18 | bb | string.cpp:719:3:719:3 | ref arg s | TAINT |
+| string.cpp:719:15:719:18 | bb | string.cpp:719:5:719:10 | call to insert | TAINT |
+| string.cpp:719:23:719:28 | call to source | string.cpp:719:23:719:30 | call to basic_string | TAINT |
+| string.cpp:719:23:719:30 | call to basic_string | string.cpp:719:3:719:30 | ... = ... |  |
+| string.cpp:724:17:724:20 | aa | string.cpp:724:17:724:21 | call to basic_string | TAINT |
+| string.cpp:724:17:724:21 | call to basic_string | string.cpp:725:3:725:3 | s |  |
+| string.cpp:724:17:724:21 | call to basic_string | string.cpp:726:8:726:8 | s |  |
+| string.cpp:725:3:725:3 | ref arg s | string.cpp:726:8:726:8 | s |  |
+| string.cpp:725:3:725:3 | s | string.cpp:725:5:725:10 | call to append | TAINT |
+| string.cpp:725:3:725:27 | ... = ... | string.cpp:725:5:725:10 | call to append [post update] |  |
+| string.cpp:725:5:725:10 | call to append [post update] | string.cpp:725:3:725:3 | ref arg s | TAINT |
+| string.cpp:725:12:725:15 | bb | string.cpp:725:3:725:3 | ref arg s | TAINT |
+| string.cpp:725:12:725:15 | bb | string.cpp:725:5:725:10 | call to append | TAINT |
+| string.cpp:725:20:725:25 | call to source | string.cpp:725:20:725:27 | call to basic_string | TAINT |
+| string.cpp:725:20:725:27 | call to basic_string | string.cpp:725:3:725:27 | ... = ... |  |
+| string.cpp:730:17:730:20 | aa | string.cpp:730:17:730:21 | call to basic_string | TAINT |
+| string.cpp:730:17:730:21 | call to basic_string | string.cpp:731:4:731:4 | s |  |
+| string.cpp:730:17:730:21 | call to basic_string | string.cpp:732:8:732:8 | s |  |
+| string.cpp:731:3:731:24 | ... = ... | string.cpp:731:6:731:6 | call to operator+= [post update] |  |
+| string.cpp:731:4:731:4 | ref arg s | string.cpp:732:8:732:8 | s |  |
+| string.cpp:731:4:731:4 | s | string.cpp:731:6:731:6 | call to operator+= | TAINT |
+| string.cpp:731:6:731:6 | call to operator+= [post update] | string.cpp:731:4:731:4 | ref arg s | TAINT |
+| string.cpp:731:9:731:12 | bb | string.cpp:731:4:731:4 | ref arg s | TAINT |
+| string.cpp:731:9:731:12 | bb | string.cpp:731:6:731:6 | call to operator+= | TAINT |
+| string.cpp:731:17:731:22 | call to source | string.cpp:731:17:731:24 | call to basic_string | TAINT |
+| string.cpp:731:17:731:24 | call to basic_string | string.cpp:731:3:731:24 | ... = ... |  |
+| string.cpp:736:17:736:20 | aa | string.cpp:736:17:736:21 | call to basic_string | TAINT |
+| string.cpp:736:17:736:21 | call to basic_string | string.cpp:737:3:737:3 | s |  |
+| string.cpp:736:17:736:21 | call to basic_string | string.cpp:738:8:738:8 | s |  |
+| string.cpp:737:3:737:3 | ref arg s | string.cpp:738:8:738:8 | s |  |
+| string.cpp:737:3:737:3 | s | string.cpp:737:5:737:11 | call to replace | TAINT |
+| string.cpp:737:3:737:34 | ... = ... | string.cpp:737:5:737:11 | call to replace [post update] |  |
+| string.cpp:737:5:737:11 | call to replace [post update] | string.cpp:737:3:737:3 | ref arg s | TAINT |
+| string.cpp:737:19:737:22 | bb | string.cpp:737:19:737:22 | call to basic_string | TAINT |
+| string.cpp:737:19:737:22 | call to basic_string | string.cpp:737:3:737:3 | ref arg s | TAINT |
+| string.cpp:737:19:737:22 | call to basic_string | string.cpp:737:5:737:11 | call to replace | TAINT |
+| string.cpp:737:27:737:32 | call to source | string.cpp:737:27:737:34 | call to basic_string | TAINT |
+| string.cpp:737:27:737:34 | call to basic_string | string.cpp:737:3:737:34 | ... = ... |  |
 | stringstream.cpp:26:35:26:40 | amount | stringstream.cpp:64:46:64:51 | amount |  |
 | stringstream.cpp:28:20:28:22 | call to basic_stringstream | stringstream.cpp:31:7:31:9 | ss1 |  |
 | stringstream.cpp:28:20:28:22 | call to basic_stringstream | stringstream.cpp:37:7:37:9 | ss1 |  |
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/map.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/map.cpp
index 0c6bcedc88bc..0de9de46479f 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/map.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/map.cpp
@@ -3,22 +3,22 @@
 
 using namespace std;
 namespace {
-char *source();
+char *source(); int source(int);
 }
 void sink(char *);
 void sink(const char *);
 void sink(bool);
-void sink(std::pair<char *, char *>);
-void sink(std::map<char *, char *>);
-void sink(std::map<char *, char *>::iterator);
-void sink(std::unordered_map<char *, char *>);
-void sink(std::unordered_map<char *, char *>::iterator);
-void sink(std::unordered_map<char *, std::pair<int, int> >);
-void sink(std::unordered_map<char *, std::pair<int, int> >::iterator);
+template<typename T, typename U> void sink(std::pair<T, U>);
+void sink(std::map<const char *, const char *>);
+void sink(std::map<const char *, const char *>::iterator);
+void sink(std::unordered_map<const char *, const char *>);
+void sink(std::unordered_map<const char *, const char *>::iterator);
+void sink(std::unordered_map<const char *, std::pair<int, int> >);
+void sink(std::unordered_map<const char *, std::pair<int, int> >::iterator);
 
 void test_pair()
 {
-	std::pair<char *, char *> a, b, c;
+	std::pair<const char *, const char *> a, b, c;
 
 	a.first = "123";
 	sink(a.first);
@@ -35,36 +35,36 @@ void test_pair()
 	sink(c.second); // $ ast,ir
 	sink(c); // $ ir MISSING: ast
 
-	std::pair<char *, char *> d("123", "456");
+	std::pair<const char *, const char *> d("123", "456");
 	sink(d.first);
 	sink(d.second);
 	sink(d);
 
-	std::pair<char *, char *> e(source(), "456");
+	std::pair<const char *, const char *> e(source(), "456");
 	sink(e.first); // $ ast,ir
 	sink(e.second);
 	sink(e); // $ ir MISSING: ast
 
-	std::pair<char *, char *> f("123", source());
+	std::pair<const char *, const char *> f("123", source());
 	sink(f.first);
 	sink(f.second); // $ ast,ir
 	sink(f); // $ ast,ir
 
-	std::pair<char *, char *> g(f);
+	std::pair<const char *, const char *> g(f);
 	sink(g.first);
 	sink(g.second); // $ ast,ir
 	sink(g); // $ ast,ir
 
-	std::pair<char *, char *> h;
+	std::pair<const char *, const char *> h;
 	h = f;
 	sink(h.first);
 	sink(h.second); // $ ast,ir
 	sink(h); // $ ast,ir
 
-	std::pair<char *, char *> i("123", "456");
-	std::pair<char *, char *> j("123", source());
-	std::pair<char *, char *> k("123", source());
-	std::pair<char *, char *> l("123", "456");
+	std::pair<const char *, const char *> i("123", "456");
+	std::pair<const char *, const char *> j("123", source());
+	std::pair<const char *, const char *> k("123", source());
+	std::pair<const char *, const char *> l("123", "456");
  	i.swap(j);
 	k.swap(l);
 	sink(i.first);
@@ -83,14 +83,14 @@ void test_pair()
 	sink(make_pair("123", "456"));
 	sink(make_pair("123", "456").first);
 	sink(make_pair("123", "456").second);
-	sink(make_pair(source(), "456")); // $ MISSING: ast,ir
+	sink(make_pair(source(), "456")); // $ ir MISSING: ast
 	sink(make_pair(source(), "456").first); // $ ast,ir
 	sink(make_pair(source(), "456").second);
 	sink(make_pair("123", source())); // $ ast,ir
 	sink(make_pair("123", source()).first);
 	sink(make_pair("123", source()).second); // $ ast,ir
 
-	std::pair<std::pair<char *, char *>, char *> m;
+	std::pair<std::pair<const char *, const char *>, const char *> m;
 	m = make_pair(make_pair("123", source()), "789");
 	sink(m); // $ MISSING: ast,ir
 	sink(m.first); // $ MISSING: ast,ir
@@ -102,12 +102,12 @@ void test_pair()
 void test_map()
 {
 	// insert
-	std::map<char *, char *> m1, m2, m3, m4, m5, m6;
+	std::map<const char *, const char *> m1, m2, m3, m4, m5, m6;
 
 	sink(m1.insert(std::make_pair("abc", "def")).first);
 	sink(m2.insert(std::make_pair("abc", source())).first);
 	sink(m3.insert(std::make_pair(source(), "def")).first); // $ MISSING: ast,ir
-	sink(m4.insert(m4.begin(), std::pair<char *, char *>("abc", source()))); // $ ast,ir
+	sink(m4.insert(m4.begin(), std::pair<const char *, const char *>("abc", source()))); // $ ast,ir
 	sink(m5.insert_or_assign("abc", source()).first);
 	sink(m6.insert_or_assign(m6.begin(), "abc", source())); // $ ast,ir
 	sink(m1);
@@ -130,9 +130,9 @@ void test_map()
 	sink(m6.find("def")); // $ SPURIOUS: ast,ir
 
 	// copy constructors and assignment
-	std::map<char *, char *> m7(m2);
-	std::map<char *, char *> m8 = m2;
-	std::map<char *, char *> m9;
+	std::map<const char *, const char *> m7(m2);
+	std::map<const char *, const char *> m8 = m2;
+	std::map<const char *, const char *> m9;
 	m9 = m2;
 	sink(m7); // $ ast,ir
 	sink(m8); // $ ast,ir
@@ -142,7 +142,7 @@ void test_map()
 	sink(m9.find("abc")); // $ ast,ir
 
 	// iterators
-	std::map<char *, char *>::iterator i1, i2, i3;
+	std::map<const char *, const char *>::iterator i1, i2, i3;
 	for (i1 = m1.begin(); i1 != m1.end(); i1++)
 	{
 		sink(*i1);
@@ -163,7 +163,7 @@ void test_map()
 	}
 
 	// array-like access
-	std::map<char *, char *> m10, m11, m12, m13;
+	std::map<const char *, const char *> m10, m11, m12, m13;
 	sink(m10["abc"] = "def");
 	sink(m11["abc"] = source()); // $ ast,ir
 	sink(m12.at("abc") = "def");
@@ -174,7 +174,7 @@ void test_map()
 	sink(m13["abc"]); // $ ast,ir
 
 	// ranges
-	std::map<char *, char *> m14;
+	std::map<const char *, const char *> m14;
 	m14.insert(std::make_pair("a", "a"));
 	m14.insert(std::make_pair("b", source()));
 	m14.insert(std::make_pair("c", source()));
@@ -187,9 +187,9 @@ void test_map()
 	sink(m14.equal_range("c").second);
 
 	// swap
-	std::map<char *, char *> m15, m16, m17, m18;
-	m15.insert(std::pair<char *, char *>(source(), source()));
-	m18.insert(std::pair<char *, char *>(source(), source()));
+	std::map<const char *, const char *> m15, m16, m17, m18;
+	m15.insert(std::pair<const char *, const char *>(source(), source()));
+	m18.insert(std::pair<const char *, const char *>(source(), source()));
 	sink(m15); // $ ast,ir
 	sink(m16);
 	sink(m17);
@@ -202,11 +202,11 @@ void test_map()
 	sink(m18); // $ SPURIOUS: ast
 
 	// merge
-	std::map<char *, char *> m19, m20, m21, m22;
-	m19.insert(std::pair<char *, char *>(source(), source()));
-	m20.insert(std::pair<char *, char *>("abc", "def"));
-	m21.insert(std::pair<char *, char *>("abc", "def"));
-	m22.insert(std::pair<char *, char *>(source(), source()));
+	std::map<const char *, const char *> m19, m20, m21, m22;
+	m19.insert(std::pair<const char *, const char *>(source(), source()));
+	m20.insert(std::pair<const char *, const char *>("abc", "def"));
+	m21.insert(std::pair<const char *, const char *>("abc", "def"));
+	m22.insert(std::pair<const char *, const char *>(source(), source()));
 	sink(m19); // $ ast,ir
 	sink(m20);
 	sink(m21);
@@ -219,17 +219,17 @@ void test_map()
 	sink(m22); // $ ast,ir
 
 	// erase, clear
-	std::map<char *, char *> m23;
-	m23.insert(std::pair<char *, char *>(source(), source()));
-	m23.insert(std::pair<char *, char *>(source(), source()));
-	sink(m23); // $ ast,ir=223:49 ast,ir=224:49
-	sink(m23.erase(m23.begin())); // $ ast,ir=223:49 ast,ir=224:49
-	sink(m23); // $ ast,ir=223:49 ast,ir=224:49
+	std::map<const char *, const char *> m23; std::map<const char *, const char *>::value_type(source(), source()); // ensure instantiation
+	m23.insert(std::pair<const char *, const char *>(source(), source()));
+	m23.insert(std::pair<const char *, const char *>(source(), source()));
+	sink(m23); // $ ast,ir=223:61 ast,ir=224:61
+	sink(m23.erase(m23.begin())); // $ ast,ir=223:61 ast,ir=224:61
+	sink(m23); // $ ast,ir=223:61 ast,ir=224:61
 	m23.clear();
-	sink(m23); // $ SPURIOUS: ast,ir=223:49 ast,ir=224:49
+	sink(m23); // $ SPURIOUS: ast,ir=223:61 ast,ir=224:61
 
 	// emplace, emplace_hint
-	std::map<char *, char *> m24, m25;
+	std::map<const char *, const char *> m24, m25; std::map<const char *, const char *>::value_type("abc", source()); // force the template instantiation
 	sink(m24.emplace("abc", "def").first);
 	sink(m24);
 	sink(m24.emplace("abc", source()).first);
@@ -240,7 +240,7 @@ void test_map()
 	sink(m25); // $ ast,ir
 	
 	// try_emplace
-	std::map<char *, char *> m26, m27;
+	std::map<const char *, const char *> m26, m27;
 	sink(m26.try_emplace("abc", "def").first);
 	sink(m26);
 	sink(m26.try_emplace("abc", source()).first);
@@ -254,12 +254,12 @@ void test_map()
 void test_unordered_map()
 {
 	// insert
-	std::unordered_map<char *, char *> m1, m2, m3, m4, m5, m6;
+	std::unordered_map<const char *, const char *> m1, m2, m3, m4, m5, m6;
 
 	sink(m1.insert(std::make_pair("abc", "def")).first);
 	sink(m2.insert(std::make_pair("abc", source())).first);
 	sink(m3.insert(std::make_pair(source(), "def")).first); // $ MISSING: ast,ir
-	sink(m4.insert(m4.begin(), std::pair<char *, char *>("abc", source()))); // $ ast,ir
+	sink(m4.insert(m4.begin(), std::pair<const char *, const char *>("abc", source()))); // $ ast,ir
 	sink(m5.insert_or_assign("abc", source()).first);
 	sink(m6.insert_or_assign(m6.begin(), "abc", source())); // $ ast,ir
 	sink(m1);
@@ -282,9 +282,9 @@ void test_unordered_map()
 	sink(m6.find("def")); // $ SPURIOUS: ast,ir
 
 	// copy constructors and assignment
-	std::unordered_map<char *, char *> m7(m2);
-	std::unordered_map<char *, char *> m8 = m2;
-	std::unordered_map<char *, char *> m9;
+	std::unordered_map<const char *, const char *> m7(m2);
+	std::unordered_map<const char *, const char *> m8 = m2;
+	std::unordered_map<const char *, const char *> m9;
 	m9 = m2;
 	sink(m7); // $ ast,ir
 	sink(m8); // $ ast,ir
@@ -294,7 +294,7 @@ void test_unordered_map()
 	sink(m9.find("abc")); // $ ast,ir
 
 	// iterators
-	std::unordered_map<char *, char *>::iterator i1, i2, i3;
+	std::unordered_map<const char *, const char *>::iterator i1, i2, i3;
 	for (i1 = m1.begin(); i1 != m1.end(); i1++)
 	{
 		sink(*i1);
@@ -315,7 +315,7 @@ void test_unordered_map()
 	}
 
 	// array-like access
-	std::unordered_map<char *, char *> m10, m11, m12, m13;
+	std::unordered_map<const char *, const char *> m10, m11, m12, m13;
 	sink(m10["abc"] = "def");
 	sink(m11["abc"] = source()); // $ ast,ir
 	sink(m12.at("abc") = "def");
@@ -326,7 +326,7 @@ void test_unordered_map()
 	sink(m13["abc"]); // $ ast,ir
 
 	// ranges
-	std::unordered_map<char *, char *> m14;
+	std::unordered_map<const char *, const char *> m14;
 	m14.insert(std::make_pair("a", "a"));
 	m14.insert(std::make_pair("b", source()));
 	m14.insert(std::make_pair("c", source()));
@@ -336,9 +336,9 @@ void test_unordered_map()
 	sink(m14.equal_range("c").second);
 
 	// swap
-	std::unordered_map<char *, char *> m15, m16, m17, m18;
-	m15.insert(std::pair<char *, char *>(source(), source()));
-	m18.insert(std::pair<char *, char *>(source(), source()));
+	std::unordered_map<const char *, const char *> m15, m16, m17, m18;
+	m15.insert(std::pair<const char *, const char *>(source(), source()));
+	m18.insert(std::pair<const char *, const char *>(source(), source()));
 	sink(m15); // $ ast,ir
 	sink(m16);
 	sink(m17);
@@ -351,11 +351,11 @@ void test_unordered_map()
 	sink(m18); // $ SPURIOUS: ast
 
 	// merge
-	std::unordered_map<char *, char *> m19, m20, m21, m22;
-	m19.insert(std::pair<char *, char *>(source(), source()));
-	m20.insert(std::pair<char *, char *>("abc", "def"));
-	m21.insert(std::pair<char *, char *>("abc", "def"));
-	m22.insert(std::pair<char *, char *>(source(), source()));
+	std::unordered_map<const char *, const char *> m19, m20, m21, m22;
+	m19.insert(std::pair<const char *, const char *>(source(), source()));
+	m20.insert(std::pair<const char *, const char *>("abc", "def"));
+	m21.insert(std::pair<const char *, const char *>("abc", "def"));
+	m22.insert(std::pair<const char *, const char *>(source(), source()));
 	sink(m19); // $ ast,ir
 	sink(m20);
 	sink(m21);
@@ -368,17 +368,17 @@ void test_unordered_map()
 	sink(m22); // $ ast,ir
 
 	// erase, clear
-	std::unordered_map<char *, char *> m23;
-	m23.insert(std::pair<char *, char *>(source(), source()));
-	m23.insert(std::pair<char *, char *>(source(), source()));
-	sink(m23); // $ ast,ir=372:49 ast,ir=373:49
-	sink(m23.erase(m23.begin())); // $ ast,ir=372:49 ast,ir=373:49
-	sink(m23); // $ ast,ir=372:49 ast,ir=373:49
+	std::unordered_map<const char *, const char *> m23;
+	m23.insert(std::pair<const char *, const char *>(source(), source()));
+	m23.insert(std::pair<const char *, const char *>(source(), source()));
+	sink(m23); // $ ast,ir=372:61 ast,ir=373:61
+	sink(m23.erase(m23.begin())); // $ ast,ir=372:61 ast,ir=373:61
+	sink(m23); // $ ast,ir=372:61 ast,ir=373:61
 	m23.clear();
-	sink(m23); // $ SPURIOUS: ast,ir=372:49 ast,ir=373:49
+	sink(m23); // $ SPURIOUS: ast,ir=372:61 ast,ir=373:61
 
 	// emplace, emplace_hint
-	std::unordered_map<char *, char *> m24, m25;
+	std::unordered_map<const char *, const char *> m24, m25;
 	sink(m24.emplace("abc", "def").first);
 	sink(m24);
 	sink(m24.emplace("abc", source()).first);
@@ -389,7 +389,7 @@ void test_unordered_map()
 	sink(m25); // $ ast,ir
 
 	// try_emplace
-	std::unordered_map<char *, char *> m26, m27, m28;
+	std::unordered_map<const char *, const char *> m26, m27, m28;
 	sink(m26.try_emplace("abc", "def").first);
 	sink(m26.try_emplace("abc", "def").second);
 	sink(m26);
@@ -406,34 +406,34 @@ void test_unordered_map()
 	sink(m28); // $ MISSING: ast,ir
 
 	// additional try_emplace test cases
-	std::unordered_map<char *, std::pair<int, int>> m29, m30, m31, m32;
+	std::unordered_map<const char *, std::pair<int, int>> m29, m30, m31, m32; std::pair<int, int> inst1(0, 0); int x; std::pair<int, int> inst2(x, x);
 	sink(m29.try_emplace("abc", 1, 2));
 	sink(m29);
 	sink(m29["abc"]);
 	sink(m30.try_emplace(source(), 1, 2)); // $ MISSING: ast,ir
 	sink(m30); // $ MISSING: ast,ir
 	sink(m30["abc"]);
-	sink(m31.try_emplace("abc", source(), 2)); // $ ast,ir
+	sink(m31.try_emplace("abc", source(0), 2)); // $ ast,ir
 	sink(m31); // $ ast,ir
 	sink(m31["abc"]); // $ ast,ir
-	sink(m32.try_emplace("abc", 1, source())); // $ ast,ir
+	sink(m32.try_emplace("abc", 1, source(0))); // $ ast,ir
 	sink(m32); // $ ast,ir
 	sink(m32["abc"]); // $ ast,ir
 
 	// additional emplace test cases
-	std::unordered_map<char *, char *> m33;
+	std::unordered_map<const char *, const char *> m33;
 	sink(m33.emplace(source(), "def").first); // $ MISSING: ast,ir
 	sink(m33); // $ MISSING: ast,ir
 
-	std::unordered_map<char *, char *> m34, m35;
-	sink(m34.emplace(std::pair<char *, char *>("abc", "def")).first);
+	std::unordered_map<const char *, const char *> m34, m35;
+	sink(m34.emplace(std::pair<const char *, const char *>("abc", "def")).first);
 	sink(m34);
-	sink(m34.emplace(std::pair<char *, char *>("abc", source())).first);
+	sink(m34.emplace(std::pair<const char *, const char *>("abc", source())).first);
 	sink(m34); // $ ast,ir
 	sink(m34.emplace_hint(m34.begin(), "abc", "def")); // $ ast,ir
 	sink(m35.emplace().first);
 	sink(m35);
-	sink(m35.emplace(std::pair<char *, char *>(source(), "def")).first); // $ MISSING: ast,ir
+	sink(m35.emplace(std::pair<const char *, const char *>(source(), "def")).first); // $ MISSING: ast,ir
 	sink(m35); // $ MISSING: ast,ir
 }
 
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/stl.h b/cpp/ql/test/library-tests/dataflow/taint-tests/stl.h
index 57be2e9769af..5aa3e10feadc 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/stl.h
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/stl.h
@@ -1,28 +1,4 @@
-
-typedef unsigned long size_t;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#include "type_traits.h"
+#include "../../../include/type_traits.h"
 
 namespace std
 {
@@ -135,6 +111,25 @@ namespace std
 		typedef size_t size_type;
 	};
 
+	template<bool, class T = void>
+	struct enable_if {};
+	
+	template<class T>
+	struct enable_if<true, T> { typedef T type; };
+	
+	template<class CharT, class Traits>
+	class basic_string_view;
+	
+	template<class T>
+	struct is_string_view_like {
+		static const bool value = false; 
+	};
+	
+	template<class CharT, class Traits>
+	struct is_string_view_like<basic_string_view<CharT, Traits>> {
+		static const bool value = true;
+	};
+
 	template<class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
 	class basic_string {
 	public:
@@ -147,10 +142,17 @@ namespace std
 		explicit basic_string(const Allocator& a = Allocator());
 		basic_string(const charT* s, const Allocator& a = Allocator());
 		template<class InputIterator> basic_string(InputIterator begin, InputIterator end, const Allocator& a = Allocator());
+		
+		template<class StringViewLike, typename enable_if<is_string_view_like<StringViewLike>::value>::type* = nullptr>
+		explicit basic_string(const StringViewLike&, const Allocator& = Allocator());
+		
+		template<class StringViewLike, typename enable_if<is_string_view_like<StringViewLike>::value>::type* = nullptr>
+		basic_string(const StringViewLike&, size_type, size_type, const Allocator& = Allocator());
 
 		const charT* c_str() const;
 		charT* data() noexcept;
 		size_t length() const;
+		size_t size() const;
 
 		typedef std::iterator<random_access_iterator_tag, charT> iterator;
 		typedef std::iterator<random_access_iterator_tag, const charT> const_iterator;
@@ -176,18 +178,41 @@ namespace std
 		template<class T> basic_string& operator+=(const T& t);
 		basic_string& operator+=(const charT* s);
 		basic_string& append(const basic_string& str);
+		
+		template<class StringViewLike, typename enable_if<is_string_view_like<StringViewLike>::value>::type* = nullptr>
+		basic_string& append(const StringViewLike&); template<class StringViewLike, typename enable_if<is_string_view_like<StringViewLike>::value>::type* = nullptr> basic_string& append(const StringViewLike&, size_type, size_type);
+		
 		basic_string& append(const charT* s);
 		basic_string& append(size_type n, charT c);
 		template<class InputIterator> basic_string& append(InputIterator first, InputIterator last); 
 		basic_string& assign(const basic_string& str);
+		
+		template<class StringViewLike, typename enable_if<is_string_view_like<StringViewLike>::value>::type* = nullptr>
+		basic_string& assign(const StringViewLike&); template<class StringViewLike, typename enable_if<is_string_view_like<StringViewLike>::value>::type* = nullptr>
+		
+		basic_string& assign(const StringViewLike&, size_type, size_type);
+		
 		basic_string& assign(size_type n, charT c);
 		template<class InputIterator> basic_string& assign(InputIterator first, InputIterator last);
 		basic_string& insert(size_type pos, const basic_string& str);
+		
+		template<class StringViewLike, typename enable_if<is_string_view_like<StringViewLike>::value>::type* = nullptr>
+		basic_string& insert(size_type, const StringViewLike&); template<class StringViewLike, typename enable_if<is_string_view_like<StringViewLike>::value>::type* = nullptr>
+		basic_string& insert(size_type, const StringViewLike&, size_type, size_type);
+
 		basic_string& insert(size_type pos, size_type n, charT c);
 		basic_string& insert(size_type pos, const charT* s);
 		iterator insert(const_iterator p, size_type n, charT c);
 		template<class InputIterator> iterator insert(const_iterator p, InputIterator first, InputIterator last); 
 		basic_string& replace(size_type pos1, size_type n1, const basic_string& str);
+
+		template<class StringViewLike, typename enable_if<is_string_view_like<StringViewLike>::value>::type* = nullptr>
+		basic_string& replace(size_type, size_type, const StringViewLike&); template<class StringViewLike, typename enable_if<is_string_view_like<StringViewLike>::value>::type* = nullptr>
+		
+		basic_string& replace(const_iterator, const_iterator, const StringViewLike&);
+		
+		template<class StringViewLike, typename enable_if<is_string_view_like<StringViewLike>::value>::type* = nullptr>
+		basic_string& replace(size_type, size_type, const StringViewLike&, size_type, size_type);
 		basic_string& replace(size_type pos1, size_type n1, size_type n2, charT c);
 		size_type copy(charT* s, size_type n, size_type pos = 0) const;
 		void clear() noexcept;
@@ -197,6 +222,12 @@ namespace std
 
 	template<class charT, class traits, class Allocator> basic_string<charT, traits, Allocator> operator+(const basic_string<charT, traits, Allocator>& lhs, const basic_string<charT, traits, Allocator>& rhs);
 	template<class charT, class traits, class Allocator> basic_string<charT, traits, Allocator> operator+(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs);
+	
+	template<class charT, class traits, class Allocator>
+	basic_string<charT, traits, Allocator> operator+(charT, const basic_string<charT, traits, Allocator>&);
+	
+	template<class charT, class traits, class Allocator>
+	basic_string<charT, traits, Allocator> operator+(charT, basic_string<charT, traits, Allocator>&&);
 
 	typedef basic_string<char> string;
 }
@@ -289,7 +320,9 @@ namespace std {
 		using iterator = std::iterator<random_access_iterator_tag, T>;
 		using const_iterator = std::iterator<random_access_iterator_tag, const T>;
 
-		vector() noexcept(noexcept(Allocator())) : vector(Allocator()) { }
+		vector() noexcept(noexcept(Allocator()));
+		vector(const vector& x);
+		vector(vector&& x) noexcept;
 		explicit vector(const Allocator&) noexcept;
 		explicit vector(size_type n, const Allocator& = Allocator());
 		vector(size_type n, const T& value, const Allocator& = Allocator());
@@ -419,6 +452,11 @@ namespace std {
 		using const_iterator = std::iterator<random_access_iterator_tag, const value_type >;
 
 		map() /*: map(Compare()) { }*/;
+		template<class InputIt> map(InputIt, InputIt);
+		
+		template<class InputIt> map(InputIt, InputIt, const Compare&);
+		
+		template<class InputIt> map(InputIt, InputIt, const Compare&, const Allocator&);
 		map(const map& x);
 		map(map&& x);
 		~map();
@@ -433,6 +471,7 @@ namespace std {
 
 		T& operator[](const key_type& x);
 		T& operator[](key_type&& x);
+		template<class K> T& operator[](K&& x);
 		T& at(const key_type& x);
 		const T& at(const key_type& x) const;
 
@@ -441,9 +480,10 @@ namespace std {
 
 		pair<iterator, bool> insert(const value_type& x);
 		pair<iterator, bool> insert(value_type&& x);
+		template<class P> pair<iterator, bool> insert(P&& x);
 		iterator insert(const_iterator position, const value_type& x);
 		iterator insert(const_iterator position, value_type&& x);
-
+		template<class P> iterator insert(const_iterator position, P&& x);
 		template<class... Args> pair<iterator, bool> try_emplace(const key_type& k, Args&&... args);
 		template<class... Args> pair<iterator, bool> try_emplace(key_type&& k, Args&&... args);
 		template<class... Args> iterator try_emplace(const_iterator hint, const key_type& k, Args&&... args);
@@ -650,14 +690,43 @@ namespace std {
 	class basic_string_view {
 	public:
 		using size_type = size_t;
+		using const_iterator = const CharT*;
 
 		basic_string_view() noexcept;
 		basic_string_view(const basic_string_view&) noexcept;
 		basic_string_view(const CharT*, size_type);
 		basic_string_view(const CharT*);
 		template<class It, class End> basic_string_view(It, End);
-		template<class R> explicit basic_string_view(R&&);
+		template<class R, typename enable_if<!is_string_view_like<remove_const_t<remove_reference_t<R>>>::value>::type* = nullptr>
+		explicit basic_string_view(R&&);
 		basic_string_view& operator=(const basic_string_view&) noexcept;
+
+		const_iterator begin() const;
+		const_iterator end() const;
+		const_iterator cbegin() const;
+		const_iterator cend() const;
+		const CharT& operator[](size_type) const;
+		const CharT& at(size_type) const;
+		const CharT& front() const;
+		const CharT& back() const;
+		const CharT* data() const;
+		void remove_prefix(size_type);
+		void remove_suffix(size_type);
+		void swap(basic_string_view&);
+		size_type copy(CharT*, size_type, size_type = 0) const;
+		basic_string_view substr(size_type = 0, size_type = -1) const;
+		basic_string_view subview(size_type = 0, size_type = -1) const;
+
+		size_type size() const;
+		size_type length() const;
+		size_type max_size() const;
+		bool empty() const;
+		int compare(basic_string_view) const;
+		bool starts_with(basic_string_view) const;
+		bool ends_with(basic_string_view) const;
+		bool contains(basic_string_view) const;
+		size_type find(basic_string_view) const;
+		size_type rfind(basic_string_view) const;
 	};
 
 	using string_view = basic_string_view<char>;
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/string.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/string.cpp
index 4da4d3f3fe7a..251b050b262e 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/string.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/string.cpp
@@ -19,6 +19,7 @@ void sink(const std::string &s);
 void sink(const char *filename, const char *mode);
 void sink(char);
 void sink(std::string::iterator);
+void sink(std::string_view);
 
 void test_string()
 {
@@ -564,3 +565,176 @@ void test_string_return_assign() {
 		sink(f); // $ SPURIOUS: ast,ir
 	}
 }
+
+namespace ns_string_view {
+	std::string_view source();
+}
+
+void test_string_view_like() {
+	std::string_view view = ns_string_view::source();
+	std::string constructed(view), sliced(view, 0, 1);
+	sink(constructed); // $ ir,ast
+	sink(sliced); // $ ir,ast
+
+	std::string assigned, appended, inserted, replaced;
+	sink(assigned.assign(view)); // $ ir,ast
+	sink(appended.append(view, 0, 1)); // $ ir,ast
+	sink(inserted.insert(0, view)); // $ ir,ast
+	sink(replaced.replace(0, 0, view)); // $ ir,ast
+
+	char tainted = ns_char::source();
+	sink(tainted + std::string("clean")); // $ ast MISSING: ir
+}
+
+namespace string_view_tests {
+
+namespace iterators {
+struct Iterator {};
+Iterator source();
+}
+
+namespace ranges {
+	struct Range {};
+	Range source();
+}
+
+void constructors() {
+	const char* data = source();
+	std::string_view terminated(data);
+	sink(terminated); // $ ast,ir
+	sink(terminated.data()); // $ MISSING: ir,ast
+
+	std::string_view counted(data, 5);
+	sink(counted); // $ MISSING: ir,ast
+	sink(counted.data()); // $ MISSING: ir,ast
+
+	std::string_view iterators(data, data + 5);
+	sink(iterators); // $ MISSING: ir,ast
+}
+
+void copy_and_assignment() {
+	const auto original = ns_string_view::source();
+	std::string_view copied(original);
+	sink(copied); // $ ast,ir
+	sink(copied.data()); // $ MISSING: ir,ast
+	std::string_view moved(static_cast<const std::string_view&&>(original));
+	sink(moved); // $ ast,ir
+
+	std::string_view assigned;
+	sink(assigned = original); // $ ast,ir
+	sink(assigned); // $ ast,ir
+
+	const std::string_view clean;
+	std::string_view chained;
+	(chained = clean) = original;
+	sink(chained); // $ MISSING: ast,ir
+
+	copied = clean;
+	sink(copied); // $ SPURIOUS: ast
+}
+
+void iterator_and_range_constructors() {
+	iterators::Iterator it = iterators::source();
+	std::string_view iterators(it, it);
+	sink(iterators); // $ MISSING: ir,ast
+
+	ranges::Range range = ranges::source();
+	std::string_view from_range(range);
+	sink(from_range); // $ MISSING: ir,ast
+
+	std::vector<char> container;
+	container.push_back(ns_char::source());
+	std::string_view from_container(container);
+	sink(from_container); // $ MISSING: ir
+	std::string_view from_container_iterators(container.begin(), container.end());
+	sink(from_container_iterators); // $ MISSING: ir
+}
+
+void accessors() {
+	auto view = ns_string_view::source();
+	sink(view.data()); // $ MISSING: ir,ast
+	sink(view[0]); // $ MISSING: ir,ast
+	sink(view.at(0)); // $ MISSING: ir,ast
+	sink(view.front()); // $ MISSING: ir,ast
+	sink(view.back()); // $ MISSING: ir,ast
+	sink(*view.begin()); // $ ast,ir
+	sink(*view.cbegin()); // $ ast,ir
+}
+
+void trimming() {
+	auto prefix = ns_string_view::source();
+	prefix.remove_prefix(1);
+	sink(prefix); // $ ast,ir
+	sink(prefix.data()); // $ MISSING: ir,ast
+
+	auto suffix = ns_string_view::source();
+	suffix.remove_suffix(1);
+	sink(suffix); // $ ast,ir
+	sink(suffix.data()); // $ MISSING: ir,ast
+}
+
+void operations() {
+	auto view = ns_string_view::source();
+	sink(view.substr(1, 2)); // $ MISSING: ast,ir
+	sink(view.subview(1, 2)); // $ MISSING: ast,ir
+
+	char buffer[10] = {};
+	sink(view.copy(buffer, 2));
+	sink(buffer); // $ MISSING: ast,ir
+
+	std::string_view clean;
+	view.swap(clean);
+	sink(view); // $ SPURIOUS: ast
+	sink(clean); // $ ir MISSING: ast
+}
+}
+
+void test_string_reverse_flow() {
+	{
+		std::string s("aa");
+		(s = "bb") += source();
+		sink(s); // $ ast ir
+	}
+
+	{
+		std::string s("aa");
+		s.front() = ns_char::source();
+		sink(s); // $ MISSING: ir,ast
+	}
+
+	{
+		std::string s("aa");
+		s.back() = ns_char::source();
+		sink(s); // $ MISSING: ir,ast
+	}
+
+	{
+		std::string s("aa");
+		s.data()[0] = ns_char::source();
+		sink(s); // $ ast,ir
+	}
+
+	{
+		std::string s("aa");
+		s.insert(0, "bb") = source();
+		sink(s); // $ ast,ir
+	}
+
+	{
+		std::string s("aa");
+		s.append("bb") = source();
+		sink(s); // $ ast,ir
+	}
+
+	{
+		std::string s("aa");
+		(s += "bb") = source();
+		sink(s); // $ ast,ir
+	}
+
+	{
+		std::string s("aa");
+		s.replace(0, 1, "bb") = source();
+		sink(s); // $ ast,ir
+	}
+}
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.expected
index d494c09e71d5..25cc727930d0 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.expected
@@ -97,44 +97,44 @@ signatureMatches
 | atl.cpp:1333:13:1333:21 | operator= | Microsoft::WRL | (const ComPtr &) | ComPtr | operator= | 0 |
 | atl.cpp:1334:13:1334:21 | operator= | Microsoft::WRL | (ComPtr &&) | ComPtr | operator= | 0 |
 | atl.cpp:1336:13:1336:21 | operator= | Microsoft::WRL | (ComPtr &&) | ComPtr | operator= | 0 |
-| stl.h:294:12:294:17 | vector | std | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:294:12:294:17 | vector | std | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:294:12:294:17 | vector | std | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:294:12:294:17 | vector | std | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:294:12:294:17 | vector | std | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:294:12:294:17 | vector | std | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:295:3:295:8 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
-| stl.h:295:3:295:8 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
-| stl.h:295:3:295:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 0 |
-| stl.h:295:3:295:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 0 |
-| stl.h:295:3:295:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:295:3:295:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:295:3:295:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
-| stl.h:295:3:295:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
-| stl.h:296:101:296:106 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 0 |
-| stl.h:296:101:296:106 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 1 |
-| stl.h:296:101:296:106 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
-| stl.h:296:101:296:106 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
-| stl.h:303:106:303:111 | assign | std | (InputIt,InputIt) | vector | assign<InputIt> | 0 |
-| stl.h:303:106:303:111 | assign | std | (InputIt,InputIt) | vector | assign<InputIt> | 1 |
-| stl.h:306:8:306:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 1 |
-| stl.h:306:8:306:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 1 |
-| stl.h:306:8:306:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 1 |
-| stl.h:331:12:331:17 | insert | std | (const_iterator,T &&) | vector<T> | insert | 0 |
-| stl.h:331:12:331:17 | insert | std | (const_iterator,T &&) | vector<T> | insert | 1 |
-| stl.h:333:42:333:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 0 |
-| stl.h:333:42:333:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 0 |
-| stl.h:333:42:333:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 1 |
-| stl.h:333:42:333:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 1 |
-| stl.h:333:42:333:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
-| stl.h:333:42:333:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
-| stl.h:678:33:678:38 | format | std | (format_string,Args &&) |  | format<Args> | 0 |
-| stl.h:678:33:678:38 | format | std | (format_string,Args &&) |  | format<Args> | 0 |
-| stl.h:678:33:678:38 | format | std | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:678:33:678:38 | format | std | (format_string,Args &&) |  | format<Args> | 1 |
+| stl.h:327:12:327:17 | vector | std | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:327:12:327:17 | vector | std | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:327:12:327:17 | vector | std | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:327:12:327:17 | vector | std | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:327:12:327:17 | vector | std | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:327:12:327:17 | vector | std | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:328:3:328:8 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
+| stl.h:328:3:328:8 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
+| stl.h:328:3:328:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 0 |
+| stl.h:328:3:328:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 0 |
+| stl.h:328:3:328:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:328:3:328:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:328:3:328:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
+| stl.h:328:3:328:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
+| stl.h:329:101:329:106 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 0 |
+| stl.h:329:101:329:106 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 1 |
+| stl.h:329:101:329:106 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
+| stl.h:329:101:329:106 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
+| stl.h:336:106:336:111 | assign | std | (InputIt,InputIt) | vector | assign<InputIt> | 0 |
+| stl.h:336:106:336:111 | assign | std | (InputIt,InputIt) | vector | assign<InputIt> | 1 |
+| stl.h:339:8:339:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 0 |
+| stl.h:339:8:339:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 0 |
+| stl.h:339:8:339:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 0 |
+| stl.h:339:8:339:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 1 |
+| stl.h:339:8:339:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 1 |
+| stl.h:339:8:339:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 1 |
+| stl.h:364:12:364:17 | insert | std | (const_iterator,T &&) | vector<T> | insert | 0 |
+| stl.h:364:12:364:17 | insert | std | (const_iterator,T &&) | vector<T> | insert | 1 |
+| stl.h:366:42:366:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 0 |
+| stl.h:366:42:366:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 0 |
+| stl.h:366:42:366:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 1 |
+| stl.h:366:42:366:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 1 |
+| stl.h:366:42:366:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
+| stl.h:366:42:366:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
+| stl.h:747:33:747:38 | format | std | (format_string,Args &&) |  | format<Args> | 0 |
+| stl.h:747:33:747:38 | format | std | (format_string,Args &&) |  | format<Args> | 0 |
+| stl.h:747:33:747:38 | format | std | (format_string,Args &&) |  | format<Args> | 1 |
+| stl.h:747:33:747:38 | format | std | (format_string,Args &&) |  | format<Args> | 1 |
 | taint.cpp:847:5:847:11 | toupper |  | (int) |  | toupper | 0 |
 | taint.cpp:848:5:848:11 | tolower |  | (int) |  | tolower | 0 |
 getSignatureParameterName
@@ -1962,6 +1962,15 @@ getSignatureParameterName
 | (BUF_MEM *,size_t) |  | BUF_MEM_grow | 1 | size_t |
 | (BUF_MEM *,size_t) |  | BUF_MEM_grow_clean | 0 | BUF_MEM * |
 | (BUF_MEM *,size_t) |  | BUF_MEM_grow_clean | 1 | size_t |
+| (Blob *,int,const Blob &,int,int) | BlobUtil | copy | 0 | Blob * |
+| (Blob *,int,const Blob &,int,int) | BlobUtil | copy | 1 | int |
+| (Blob *,int,const Blob &,int,int) | BlobUtil | copy | 2 | const Blob & |
+| (Blob *,int,const Blob &,int,int) | BlobUtil | copy | 3 | int |
+| (Blob *,int,const Blob &,int,int) | BlobUtil | copy | 4 | int |
+| (Blob *,int,const char *,int) | BlobUtil | copy | 0 | Blob * |
+| (Blob *,int,const char *,int) | BlobUtil | copy | 1 | int |
+| (Blob *,int,const char *,int) | BlobUtil | copy | 2 | const char * |
+| (Blob *,int,const char *,int) | BlobUtil | copy | 3 | int |
 | (BrotliBitReader *const,uint64_t,uint64_t *) |  | BrotliSafeReadBits32Slow | 0 | BrotliBitReader *const |
 | (BrotliBitReader *const,uint64_t,uint64_t *) |  | BrotliSafeReadBits32Slow | 1 | uint64_t |
 | (BrotliBitReader *const,uint64_t,uint64_t *) |  | BrotliSafeReadBits32Slow | 2 | uint64_t * |
@@ -13127,6 +13136,10 @@ getSignatureParameterName
 | (char *,char,char **) |  | __old_strtok_r_1c | 0 | char * |
 | (char *,char,char **) |  | __old_strtok_r_1c | 1 | char |
 | (char *,char,char **) |  | __old_strtok_r_1c | 2 | char ** |
+| (char *,const Blob &,int,int) | BlobUtil | copy | 0 | char * |
+| (char *,const Blob &,int,int) | BlobUtil | copy | 1 | const Blob & |
+| (char *,const Blob &,int,int) | BlobUtil | copy | 2 | int |
+| (char *,const Blob &,int,int) | BlobUtil | copy | 3 | int |
 | (char *,const char *) |  | xstrdup | 0 | char * |
 | (char *,const char *) |  | xstrdup | 1 | const char * |
 | (char *,const char **,const char **,const char **,const char **,const char **) |  | _nl_explode_name | 0 | char * |
@@ -14051,6 +14064,10 @@ getSignatureParameterName
 | (const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *) |  | BrotliBuildHistogramsWithContext | 11 | HistogramLiteral * |
 | (const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *) |  | BrotliBuildHistogramsWithContext | 12 | HistogramCommand * |
 | (const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *) |  | BrotliBuildHistogramsWithContext | 13 | HistogramDistance * |
+| (const Cord &) | MessageLite | MergeFromString | 0 | const Cord & |
+| (const Cord &) | MessageLite | MergePartialFromString | 0 | const Cord & |
+| (const Cord &) | MessageLite | ParseFromString | 0 | const Cord & |
+| (const Cord &) | MessageLite | ParsePartialFromString | 0 | const Cord & |
 | (const Curl_easy *,const connectdata *,int) |  | Curl_conn_is_http2 | 0 | const Curl_easy * |
 | (const Curl_easy *,const connectdata *,int) |  | Curl_conn_is_http2 | 1 | const connectdata * |
 | (const Curl_easy *,const connectdata *,int) |  | Curl_conn_is_http2 | 2 | int |
@@ -15027,6 +15044,38 @@ getSignatureParameterName
 | (const ISSUER_SIGN_TOOL *,unsigned char **) |  | i2d_ISSUER_SIGN_TOOL | 1 | unsigned char ** |
 | (const ISSUING_DIST_POINT *,unsigned char **) |  | i2d_ISSUING_DIST_POINT | 0 | const ISSUING_DIST_POINT * |
 | (const ISSUING_DIST_POINT *,unsigned char **) |  | i2d_ISSUING_DIST_POINT | 1 | unsigned char ** |
+| (const InternetProtocol &,const string &,const string &) | basic_resolver<InternetProtocol> | resolve | 0 | const class:0 & |
+| (const InternetProtocol &,const string &,const string &) | basic_resolver<InternetProtocol> | resolve | 1 | const string & |
+| (const InternetProtocol &,const string &,const string &) | basic_resolver<InternetProtocol> | resolve | 2 | const string & |
+| (const InternetProtocol &,const string &,const string &,error_code &) | basic_resolver<InternetProtocol> | resolve | 0 | const class:0 & |
+| (const InternetProtocol &,const string &,const string &,error_code &) | basic_resolver<InternetProtocol> | resolve | 1 | const string & |
+| (const InternetProtocol &,const string &,const string &,error_code &) | basic_resolver<InternetProtocol> | resolve | 2 | const string & |
+| (const InternetProtocol &,const string &,const string &,error_code &) | basic_resolver<InternetProtocol> | resolve | 3 | error_code & |
+| (const InternetProtocol &,const string &,const string &,flags) | basic_resolver<InternetProtocol> | resolve | 0 | const class:0 & |
+| (const InternetProtocol &,const string &,const string &,flags) | basic_resolver<InternetProtocol> | resolve | 1 | const string & |
+| (const InternetProtocol &,const string &,const string &,flags) | basic_resolver<InternetProtocol> | resolve | 2 | const string & |
+| (const InternetProtocol &,const string &,const string &,flags) | basic_resolver<InternetProtocol> | resolve | 3 | flags |
+| (const InternetProtocol &,const string &,const string &,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 0 | const class:0 & |
+| (const InternetProtocol &,const string &,const string &,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 1 | const string & |
+| (const InternetProtocol &,const string &,const string &,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 2 | const string & |
+| (const InternetProtocol &,const string &,const string &,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 3 | flags |
+| (const InternetProtocol &,const string &,const string &,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 4 | error_code & |
+| (const InternetProtocol &,string_view,string_view) | basic_resolver<InternetProtocol> | resolve | 0 | const class:0 & |
+| (const InternetProtocol &,string_view,string_view) | basic_resolver<InternetProtocol> | resolve | 1 | string_view |
+| (const InternetProtocol &,string_view,string_view) | basic_resolver<InternetProtocol> | resolve | 2 | string_view |
+| (const InternetProtocol &,string_view,string_view,error_code &) | basic_resolver<InternetProtocol> | resolve | 0 | const class:0 & |
+| (const InternetProtocol &,string_view,string_view,error_code &) | basic_resolver<InternetProtocol> | resolve | 1 | string_view |
+| (const InternetProtocol &,string_view,string_view,error_code &) | basic_resolver<InternetProtocol> | resolve | 2 | string_view |
+| (const InternetProtocol &,string_view,string_view,error_code &) | basic_resolver<InternetProtocol> | resolve | 3 | error_code & |
+| (const InternetProtocol &,string_view,string_view,flags) | basic_resolver<InternetProtocol> | resolve | 0 | const class:0 & |
+| (const InternetProtocol &,string_view,string_view,flags) | basic_resolver<InternetProtocol> | resolve | 1 | string_view |
+| (const InternetProtocol &,string_view,string_view,flags) | basic_resolver<InternetProtocol> | resolve | 2 | string_view |
+| (const InternetProtocol &,string_view,string_view,flags) | basic_resolver<InternetProtocol> | resolve | 3 | flags |
+| (const InternetProtocol &,string_view,string_view,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 0 | const class:0 & |
+| (const InternetProtocol &,string_view,string_view,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 1 | string_view |
+| (const InternetProtocol &,string_view,string_view,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 2 | string_view |
+| (const InternetProtocol &,string_view,string_view,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 3 | flags |
+| (const InternetProtocol &,string_view,string_view,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 4 | error_code & |
 | (const MATRIX *,const VECTOR *,VECTOR *) |  | ossl_ml_dsa_matrix_mult_vector | 0 | const MATRIX * |
 | (const MATRIX *,const VECTOR *,VECTOR *) |  | ossl_ml_dsa_matrix_mult_vector | 1 | const VECTOR * |
 | (const MATRIX *,const VECTOR *,VECTOR *) |  | ossl_ml_dsa_matrix_mult_vector | 2 | VECTOR * |
@@ -15068,6 +15117,8 @@ getSignatureParameterName
 | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 | int |
 | (const ML_KEM_KEY *,unsigned char **) |  | ossl_ml_kem_i2d_pubkey | 0 | const ML_KEM_KEY * |
 | (const ML_KEM_KEY *,unsigned char **) |  | ossl_ml_kem_i2d_pubkey | 1 | unsigned char ** |
+| (const MessageProperties &,Allocator *) | MessageProperties | MessageProperties | 0 | const MessageProperties & |
+| (const MessageProperties &,Allocator *) | MessageProperties | MessageProperties | 1 | Allocator * |
 | (const NAMING_AUTHORITY *) |  | NAMING_AUTHORITY_get0_authorityId | 0 | const NAMING_AUTHORITY * |
 | (const NAMING_AUTHORITY *) |  | NAMING_AUTHORITY_get0_authorityText | 0 | const NAMING_AUTHORITY * |
 | (const NAMING_AUTHORITY *) |  | NAMING_AUTHORITY_get0_authorityURL | 0 | const NAMING_AUTHORITY * |
@@ -16050,6 +16101,7 @@ getSignatureParameterName
 | (const SXNET *,unsigned char **) |  | i2d_SXNET | 1 | unsigned char ** |
 | (const SXNETID *,unsigned char **) |  | i2d_SXNETID | 0 | const SXNETID * |
 | (const SXNETID *,unsigned char **) |  | i2d_SXNETID | 1 | unsigned char ** |
+| (const StringRef &) | ByteInStream | reset | 0 | const StringRef & |
 | (const T &,BOOL) | CComSafeArray<T> | Add | 0 | const class:0 & |
 | (const T &,BOOL) | CComSafeArray<T> | Add | 1 | BOOL |
 | (const TS_ACCURACY *) |  | TS_ACCURACY_dup | 0 | const TS_ACCURACY * |
@@ -18026,6 +18078,12 @@ getSignatureParameterName
 | (const char *,size_t) |  | uv__strndup | 1 | size_t |
 | (const char *,size_t) |  | xstrndup | 0 | const char * |
 | (const char *,size_t) |  | xstrndup | 1 | size_t |
+| (const char *,size_t) | ByteInStream | reset | 0 | const char * |
+| (const char *,size_t) | ByteInStream | reset | 1 | size_t |
+| (const char *,size_t,TYPE *,const char *) | Decoder | decode<TYPE> | 0 | const char * |
+| (const char *,size_t,TYPE *,const char *) | Decoder | decode<TYPE> | 1 | size_t |
+| (const char *,size_t,TYPE *,const char *) | Decoder | decode<TYPE> | 2 | func:0 * |
+| (const char *,size_t,TYPE *,const char *) | Decoder | decode<TYPE> | 3 | const char * |
 | (const char *,size_t,char **,size_t *,urlreject) |  | Curl_urldecode | 0 | const char * |
 | (const char *,size_t,char **,size_t *,urlreject) |  | Curl_urldecode | 1 | size_t |
 | (const char *,size_t,char **,size_t *,urlreject) |  | Curl_urldecode | 2 | char ** |
@@ -18539,6 +18597,18 @@ getSignatureParameterName
 | (const stat *) |  | get_stat_ctime_ns | 0 | const stat * |
 | (const stat *) |  | get_stat_mtime | 0 | const stat * |
 | (const stat *) |  | get_stat_mtime_ns | 0 | const stat * |
+| (const string &,const string &) | basic_resolver<InternetProtocol> | resolve | 0 | const string & |
+| (const string &,const string &) | basic_resolver<InternetProtocol> | resolve | 1 | const string & |
+| (const string &,const string &,error_code &) | basic_resolver<InternetProtocol> | resolve | 0 | const string & |
+| (const string &,const string &,error_code &) | basic_resolver<InternetProtocol> | resolve | 1 | const string & |
+| (const string &,const string &,error_code &) | basic_resolver<InternetProtocol> | resolve | 2 | error_code & |
+| (const string &,const string &,flags) | basic_resolver<InternetProtocol> | resolve | 0 | const string & |
+| (const string &,const string &,flags) | basic_resolver<InternetProtocol> | resolve | 1 | const string & |
+| (const string &,const string &,flags) | basic_resolver<InternetProtocol> | resolve | 2 | flags |
+| (const string &,const string &,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 0 | const string & |
+| (const string &,const string &,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 1 | const string & |
+| (const string &,const string &,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 2 | flags |
+| (const string &,const string &,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 3 | error_code & |
 | (const td_thragent_t *,lwpid_t,td_thrhandle_t *) |  | __td_ta_lookup_th_unique | 0 | const td_thragent_t * |
 | (const td_thragent_t *,lwpid_t,td_thrhandle_t *) |  | __td_ta_lookup_th_unique | 1 | lwpid_t |
 | (const td_thragent_t *,lwpid_t,td_thrhandle_t *) |  | __td_ta_lookup_th_unique | 2 | td_thrhandle_t * |
@@ -22089,6 +22159,15 @@ getSignatureParameterName
 | (int_dhx942_dh **,const unsigned char **,long) |  | d2i_int_dhx | 1 | const unsigned char ** |
 | (int_dhx942_dh **,const unsigned char **,long) |  | d2i_int_dhx | 2 | long |
 | (intptr_t) |  | __sbrk | 0 | intptr_t |
+| (istream &,AnyRef *,const char *) | Decoder | decodeAny | 0 | istream & |
+| (istream &,AnyRef *,const char *) | Decoder | decodeAny | 1 | AnyRef * |
+| (istream &,AnyRef *,const char *) | Decoder | decodeAny | 2 | const char * |
+| (istream &,TYPE *,const char *) | Decoder | decode<TYPE> | 0 | istream & |
+| (istream &,TYPE *,const char *) | Decoder | decode<TYPE> | 1 | func:0 * |
+| (istream &,TYPE *,const char *) | Decoder | decode<TYPE> | 2 | const char * |
+| (istream &,TYPE *,const char *) | Decoder | decodeAny<TYPE> | 0 | istream & |
+| (istream &,TYPE *,const char *) | Decoder | decodeAny<TYPE> | 1 | func:0 * |
+| (istream &,TYPE *,const char *) | Decoder | decodeAny<TYPE> | 2 | const char * |
 | (lemon *) |  | ResortStates | 0 | lemon * |
 | (lemon *) |  | getstate | 0 | lemon * |
 | (lemon *,action *) |  | compute_action | 0 | lemon * |
@@ -23378,6 +23457,12 @@ getSignatureParameterName
 | (old_termios_t *,speed_t) |  | __old_cfsetospeed | 1 | speed_t |
 | (old_termios_t *,speed_t) |  | __old_cfsetspeed | 0 | old_termios_t * |
 | (old_termios_t *,speed_t) |  | __old_cfsetspeed | 1 | speed_t |
+| (ostream &,const AnyConstRef &) | Encoder | encodeAny | 0 | ostream & |
+| (ostream &,const AnyConstRef &) | Encoder | encodeAny | 1 | const AnyConstRef & |
+| (ostream &,const TYPE &) | Encoder | encode<TYPE> | 0 | ostream & |
+| (ostream &,const TYPE &) | Encoder | encode<TYPE> | 1 | const func:0 & |
+| (ostream &,const TYPE &) | Encoder | encodeAny<TYPE> | 0 | ostream & |
+| (ostream &,const TYPE &) | Encoder | encodeAny<TYPE> | 1 | const func:0 & |
 | (passwd *,char *,size_t,int *) |  | _nss_compat_getpwent_r | 0 | passwd * |
 | (passwd *,char *,size_t,int *) |  | _nss_compat_getpwent_r | 1 | char * |
 | (passwd *,char *,size_t,int *) |  | _nss_compat_getpwent_r | 2 | size_t |
@@ -24677,6 +24762,21 @@ getSignatureParameterName
 | (store_netrc *,const char *,char **,char **,char *) |  | Curl_parsenetrc | 2 | char ** |
 | (store_netrc *,const char *,char **,char **,char *) |  | Curl_parsenetrc | 3 | char ** |
 | (store_netrc *,const char *,char **,char **,char *) |  | Curl_parsenetrc | 4 | char * |
+| (streambuf *,AnyRef *,const char *) | Decoder | decodeAny | 0 | streambuf * |
+| (streambuf *,AnyRef *,const char *) | Decoder | decodeAny | 1 | AnyRef * |
+| (streambuf *,AnyRef *,const char *) | Decoder | decodeAny | 2 | const char * |
+| (streambuf *,TYPE *,const char *) | Decoder | decode<TYPE> | 0 | streambuf * |
+| (streambuf *,TYPE *,const char *) | Decoder | decode<TYPE> | 1 | func:0 * |
+| (streambuf *,TYPE *,const char *) | Decoder | decode<TYPE> | 2 | const char * |
+| (streambuf *,TYPE *,const char *) | Decoder | decodeAny<TYPE> | 0 | streambuf * |
+| (streambuf *,TYPE *,const char *) | Decoder | decodeAny<TYPE> | 1 | func:0 * |
+| (streambuf *,TYPE *,const char *) | Decoder | decodeAny<TYPE> | 2 | const char * |
+| (streambuf *,const AnyConstRef &) | Encoder | encodeAny | 0 | streambuf * |
+| (streambuf *,const AnyConstRef &) | Encoder | encodeAny | 1 | const AnyConstRef & |
+| (streambuf *,const TYPE &) | Encoder | encode<TYPE> | 0 | streambuf * |
+| (streambuf *,const TYPE &) | Encoder | encode<TYPE> | 1 | const func:0 & |
+| (streambuf *,const TYPE &) | Encoder | encodeAny<TYPE> | 0 | streambuf * |
+| (streambuf *,const TYPE &) | Encoder | encodeAny<TYPE> | 1 | const func:0 & |
 | (string_buf *,libssh2_uint64_t *) |  | _libssh2_get_u64 | 0 | string_buf * |
 | (string_buf *,libssh2_uint64_t *) |  | _libssh2_get_u64 | 1 | libssh2_uint64_t * |
 | (string_buf *,uint32_t *) |  | _libssh2_get_u32 | 0 | string_buf * |
@@ -24689,6 +24789,22 @@ getSignatureParameterName
 | (string_buf *,unsigned char **,size_t *) |  | _libssh2_get_string | 0 | string_buf * |
 | (string_buf *,unsigned char **,size_t *) |  | _libssh2_get_string | 1 | unsigned char ** |
 | (string_buf *,unsigned char **,size_t *) |  | _libssh2_get_string | 2 | size_t * |
+| (string_view) | MessageLite | MergeFromString | 0 | string_view |
+| (string_view) | MessageLite | MergePartialFromString | 0 | string_view |
+| (string_view) | MessageLite | ParseFromString | 0 | string_view |
+| (string_view) | MessageLite | ParsePartialFromString | 0 | string_view |
+| (string_view,string_view) | basic_resolver<InternetProtocol> | resolve | 0 | string_view |
+| (string_view,string_view) | basic_resolver<InternetProtocol> | resolve | 1 | string_view |
+| (string_view,string_view,error_code &) | basic_resolver<InternetProtocol> | resolve | 0 | string_view |
+| (string_view,string_view,error_code &) | basic_resolver<InternetProtocol> | resolve | 1 | string_view |
+| (string_view,string_view,error_code &) | basic_resolver<InternetProtocol> | resolve | 2 | error_code & |
+| (string_view,string_view,flags) | basic_resolver<InternetProtocol> | resolve | 0 | string_view |
+| (string_view,string_view,flags) | basic_resolver<InternetProtocol> | resolve | 1 | string_view |
+| (string_view,string_view,flags) | basic_resolver<InternetProtocol> | resolve | 2 | flags |
+| (string_view,string_view,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 0 | string_view |
+| (string_view,string_view,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 1 | string_view |
+| (string_view,string_view,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 2 | flags |
+| (string_view,string_view,flags,error_code &) | basic_resolver<InternetProtocol> | resolve | 3 | error_code & |
 | (stringtable *,const char *) |  | stringtable_add | 0 | stringtable * |
 | (stringtable *,const char *) |  | stringtable_add | 1 | const char * |
 | (stringtable *,stringtable_finalized *) |  | stringtable_finalize | 0 | stringtable * |
@@ -27225,27 +27341,27 @@ getParameterTypeName
 | format.cpp:3:16:3:16 | operator= | 0 | FILE && |
 | format.cpp:3:16:3:16 | operator= | 0 | const FILE & |
 | format.cpp:5:5:5:12 | snprintf | 0 | char * |
+| format.cpp:5:5:5:12 | snprintf | 1 | decltype(...) |
 | format.cpp:5:5:5:12 | snprintf | 1 | size_t |
-| format.cpp:5:5:5:12 | snprintf | 1 | unsigned long |
 | format.cpp:5:5:5:12 | snprintf | 2 | const char * |
 | format.cpp:5:5:5:12 | snprintf | 3 | ... |
 | format.cpp:6:5:6:11 | sprintf | 0 | char * |
 | format.cpp:6:5:6:11 | sprintf | 1 | const char * |
 | format.cpp:6:5:6:11 | sprintf | 2 | ... |
 | format.cpp:7:5:7:12 | swprintf | 0 | wchar_t * |
+| format.cpp:7:5:7:12 | swprintf | 1 | decltype(...) |
 | format.cpp:7:5:7:12 | swprintf | 1 | size_t |
-| format.cpp:7:5:7:12 | swprintf | 1 | unsigned long |
 | format.cpp:7:5:7:12 | swprintf | 2 | const wchar_t * |
 | format.cpp:7:5:7:12 | swprintf | 3 | ... |
 | format.cpp:14:5:14:13 | vsnprintf | 0 | char * |
+| format.cpp:14:5:14:13 | vsnprintf | 1 | decltype(...) |
 | format.cpp:14:5:14:13 | vsnprintf | 1 | size_t |
-| format.cpp:14:5:14:13 | vsnprintf | 1 | unsigned long |
 | format.cpp:14:5:14:13 | vsnprintf | 2 | const char * |
 | format.cpp:14:5:14:13 | vsnprintf | 3 | va_list |
 | format.cpp:14:5:14:13 | vsnprintf | 3 | void * |
 | format.cpp:16:5:16:13 | mysprintf | 0 | char * |
+| format.cpp:16:5:16:13 | mysprintf | 1 | decltype(...) |
 | format.cpp:16:5:16:13 | mysprintf | 1 | size_t |
-| format.cpp:16:5:16:13 | mysprintf | 1 | unsigned long |
 | format.cpp:16:5:16:13 | mysprintf | 2 | const char * |
 | format.cpp:16:5:16:13 | mysprintf | 3 | ... |
 | format.cpp:28:5:28:10 | sscanf | 0 | const char * |
@@ -27254,15 +27370,22 @@ getParameterTypeName
 | format.cpp:142:8:142:13 | strlen | 0 | const char * |
 | format.cpp:143:8:143:13 | wcslen | 0 | const wchar_t * |
 | format.cpp:169:6:169:9 | test | 0 | format_string |
+| map.cpp:6:21:6:26 | source | 0 | int |
 | map.cpp:8:6:8:9 | sink | 0 | char * |
 | map.cpp:9:6:9:9 | sink | 0 | const char * |
 | map.cpp:10:6:10:9 | sink | 0 | bool |
-| map.cpp:11:6:11:9 | sink | 0 | pair |
-| map.cpp:12:6:12:9 | sink | 0 | map, allocator<pair<char *const, char *>>> |
+| map.cpp:11:39:11:42 | sink | 0 | pair |
+| map.cpp:11:39:11:42 | sink | 0 | pair |
+| map.cpp:11:39:11:42 | sink | 0 | pair |
+| map.cpp:11:39:11:42 | sink | 0 | pair |
+| map.cpp:11:39:11:42 | sink | 0 | pair |
+| map.cpp:11:39:11:42 | sink | 0 | pair |
+| map.cpp:11:39:11:42 | sink | 0 | pair |
+| map.cpp:12:6:12:9 | sink | 0 | map, allocator<pair<const char *const, const char *>>> |
 | map.cpp:13:6:13:9 | sink | 0 | iterator |
-| map.cpp:14:6:14:9 | sink | 0 | unordered_map, equal_to<char *>, allocator<pair<char *const, char *>>> |
+| map.cpp:14:6:14:9 | sink | 0 | unordered_map, equal_to<const char *>, allocator<pair<const char *const, const char *>>> |
 | map.cpp:15:6:15:9 | sink | 0 | iterator |
-| map.cpp:16:6:16:9 | sink | 0 | unordered_map, hash<char *>, equal_to<char *>, allocator<pair<char *const, pair<int, int>>>> |
+| map.cpp:16:6:16:9 | sink | 0 | unordered_map, hash<const char *>, equal_to<const char *>, allocator<pair<const char *const, pair<int, int>>>> |
 | map.cpp:17:6:17:9 | sink | 0 | iterator |
 | map.cpp:442:7:442:19 | indirect_sink | 0 | int * |
 | movableclass.cpp:3:6:3:9 | sink | 0 | ... |
@@ -27331,460 +27454,502 @@ getParameterTypeName
 | standalone_iterators.cpp:102:6:102:9 | sink | 0 | insert_iterator_by_trait |
 | standalone_iterators.cpp:103:27:103:36 | operator+= | 0 | insert_iterator_by_trait & |
 | standalone_iterators.cpp:103:27:103:36 | operator+= | 1 | int |
-| stl.h:29:34:29:40 | forward | 0 | remove_reference_t & |
-| stl.h:29:34:29:40 | forward | 0 | remove_reference_t & |
-| stl.h:29:34:29:40 | forward | 0 | remove_reference_t & |
-| stl.h:29:34:29:40 | forward | 0 | remove_reference_t & |
-| stl.h:29:34:29:40 | forward | 0 | type & |
-| stl.h:29:34:29:40 | forward | 0 | type & |
-| stl.h:29:34:29:40 | forward | 0 | type & |
-| stl.h:29:34:29:40 | forward | 0 | type & |
-| stl.h:49:3:49:10 | iterator | 0 | const iterator & |
-| stl.h:49:3:49:10 | iterator | 0 | const iterator & |
-| stl.h:49:3:49:10 | iterator | 0 | const iterator & |
-| stl.h:49:3:49:10 | iterator | 0 | const iterator & |
-| stl.h:49:3:49:10 | iterator | 0 | const iterator & |
-| stl.h:49:3:49:10 | iterator | 0 | const iterator & |
-| stl.h:49:3:49:10 | iterator | 0 | const iterator & |
-| stl.h:49:3:49:10 | iterator | 0 | const iterator & |
-| stl.h:52:12:52:21 | operator++ | 0 | int |
-| stl.h:52:12:52:21 | operator++ | 0 | int |
-| stl.h:52:12:52:21 | operator++ | 0 | int |
-| stl.h:52:12:52:21 | operator++ | 0 | int |
-| stl.h:52:12:52:21 | operator++ | 0 | int |
-| stl.h:54:12:54:21 | operator-- | 0 | int |
-| stl.h:56:8:56:17 | operator!= | 0 | iterator |
-| stl.h:56:8:56:17 | operator!= | 0 | iterator |
-| stl.h:56:8:56:17 | operator!= | 0 | iterator |
-| stl.h:56:8:56:17 | operator!= | 0 | iterator |
-| stl.h:56:8:56:17 | operator!= | 0 | iterator |
-| stl.h:56:8:56:17 | operator!= | 0 | iterator |
-| stl.h:59:12:59:20 | operator+ | 0 | int |
-| stl.h:60:12:60:20 | operator- | 0 | int |
-| stl.h:61:13:61:22 | operator+= | 0 | int |
-| stl.h:61:13:61:22 | operator+= | 0 | int |
-| stl.h:62:13:62:22 | operator-= | 0 | int |
-| stl.h:64:18:64:27 | operator[] | 0 | int |
-| stl.h:67:9:67:9 | operator= | 0 | const input_iterator_tag & |
-| stl.h:67:9:67:9 | operator= | 0 | input_iterator_tag && |
-| stl.h:68:9:68:9 | operator= | 0 | const forward_iterator_tag & |
-| stl.h:68:9:68:9 | operator= | 0 | forward_iterator_tag && |
-| stl.h:69:9:69:9 | operator= | 0 | bidirectional_iterator_tag && |
-| stl.h:69:9:69:9 | operator= | 0 | const bidirectional_iterator_tag & |
-| stl.h:70:9:70:9 | operator= | 0 | const random_access_iterator_tag & |
-| stl.h:70:9:70:9 | operator= | 0 | random_access_iterator_tag && |
-| stl.h:72:9:72:9 | operator= | 0 | const output_iterator_tag & |
-| stl.h:72:9:72:9 | operator= | 0 | output_iterator_tag && |
-| stl.h:86:22:86:41 | back_insert_iterator | 0 | class:0 & |
-| stl.h:86:22:86:41 | back_insert_iterator | 0 | class:0 & |
-| stl.h:88:25:88:33 | operator= | 0 | value_type && |
-| stl.h:88:25:88:33 | operator= | 0 | value_type && |
-| stl.h:91:24:91:33 | operator++ | 0 | int |
-| stl.h:91:24:91:33 | operator++ | 0 | int |
-| stl.h:95:44:95:44 | back_inserter | 0 | func:0 & |
-| stl.h:95:44:95:44 | back_inserter | 0 | func:0 & |
-| stl.h:147:12:147:23 | basic_string | 0 | const class:2 & |
-| stl.h:148:3:148:14 | basic_string | 0 | const class:0 * |
-| stl.h:148:3:148:14 | basic_string | 1 | const class:2 & |
-| stl.h:149:33:149:44 | basic_string | 0 | func:0 |
-| stl.h:149:33:149:44 | basic_string | 1 | func:0 |
-| stl.h:149:33:149:44 | basic_string | 2 | const class:2 & |
-| stl.h:165:8:165:16 | push_back | 0 | class:0 |
-| stl.h:173:13:173:22 | operator[] | 0 | size_type |
-| stl.h:175:13:175:14 | at | 0 | size_type |
-| stl.h:176:35:176:44 | operator+= | 0 | const func:0 & |
-| stl.h:176:35:176:44 | operator+= | 0 | const func:0 & |
-| stl.h:177:17:177:26 | operator+= | 0 | const class:0 * |
-| stl.h:178:17:178:22 | append | 0 | const basic_string & |
-| stl.h:179:17:179:22 | append | 0 | const class:0 * |
-| stl.h:180:17:180:22 | append | 0 | size_type |
-| stl.h:180:17:180:22 | append | 1 | class:0 |
-| stl.h:181:47:181:52 | append | 0 | func:0 |
-| stl.h:181:47:181:52 | append | 1 | func:0 |
-| stl.h:182:17:182:22 | assign | 0 | const basic_string & |
-| stl.h:183:17:183:22 | assign | 0 | size_type |
-| stl.h:183:17:183:22 | assign | 1 | class:0 |
-| stl.h:184:47:184:52 | assign | 0 | func:0 |
-| stl.h:184:47:184:52 | assign | 1 | func:0 |
-| stl.h:185:17:185:22 | insert | 0 | size_type |
-| stl.h:185:17:185:22 | insert | 1 | const basic_string & |
-| stl.h:186:17:186:22 | insert | 0 | size_type |
-| stl.h:186:17:186:22 | insert | 1 | size_type |
-| stl.h:186:17:186:22 | insert | 2 | class:0 |
-| stl.h:187:17:187:22 | insert | 0 | size_type |
-| stl.h:187:17:187:22 | insert | 1 | const class:0 * |
-| stl.h:188:12:188:17 | insert | 0 | const_iterator |
-| stl.h:188:12:188:17 | insert | 1 | size_type |
-| stl.h:188:12:188:17 | insert | 2 | class:0 |
-| stl.h:189:42:189:47 | insert | 0 | const_iterator |
-| stl.h:189:42:189:47 | insert | 1 | func:0 |
-| stl.h:189:42:189:47 | insert | 2 | func:0 |
-| stl.h:190:17:190:23 | replace | 0 | size_type |
-| stl.h:190:17:190:23 | replace | 1 | size_type |
-| stl.h:190:17:190:23 | replace | 2 | const basic_string & |
-| stl.h:191:17:191:23 | replace | 0 | size_type |
-| stl.h:191:17:191:23 | replace | 1 | size_type |
-| stl.h:191:17:191:23 | replace | 2 | size_type |
-| stl.h:191:17:191:23 | replace | 3 | class:0 |
-| stl.h:192:13:192:16 | copy | 0 | class:0 * |
-| stl.h:192:13:192:16 | copy | 1 | size_type |
-| stl.h:192:13:192:16 | copy | 2 | size_type |
-| stl.h:194:16:194:21 | substr | 0 | size_type |
-| stl.h:194:16:194:21 | substr | 1 | size_type |
-| stl.h:195:8:195:11 | swap | 0 | basic_string & |
-| stl.h:198:94:198:102 | operator+ | 0 | const basic_string & |
-| stl.h:198:94:198:102 | operator+ | 1 | const basic_string & |
-| stl.h:199:94:199:102 | operator+ | 0 | const basic_string & |
-| stl.h:199:94:199:102 | operator+ | 1 | const func:0 * |
-| stl.h:214:33:214:42 | operator>> | 0 | int & |
-| stl.h:217:33:217:35 | get | 0 | char_type & |
-| stl.h:217:33:217:35 | get | 0 | class:0 & |
-| stl.h:218:33:218:35 | get | 0 | char_type * |
-| stl.h:218:33:218:35 | get | 0 | class:0 * |
-| stl.h:218:33:218:35 | get | 1 | streamsize |
-| stl.h:218:33:218:35 | get | 1 | unsigned long |
-| stl.h:220:33:220:36 | read | 0 | char_type * |
-| stl.h:220:33:220:36 | read | 0 | class:0 * |
-| stl.h:220:33:220:36 | read | 1 | streamsize |
-| stl.h:220:33:220:36 | read | 1 | unsigned long |
-| stl.h:221:14:221:21 | readsome | 0 | char_type * |
-| stl.h:221:14:221:21 | readsome | 0 | class:0 * |
-| stl.h:221:14:221:21 | readsome | 1 | streamsize |
-| stl.h:221:14:221:21 | readsome | 1 | unsigned long |
-| stl.h:222:33:222:39 | putback | 0 | char_type |
-| stl.h:222:33:222:39 | putback | 0 | class:0 |
-| stl.h:225:32:225:38 | getline | 0 | char_type * |
-| stl.h:225:32:225:38 | getline | 0 | class:0 * |
-| stl.h:225:32:225:38 | getline | 1 | streamsize |
-| stl.h:225:32:225:38 | getline | 1 | unsigned long |
-| stl.h:226:32:226:38 | getline | 0 | char_type * |
-| stl.h:226:32:226:38 | getline | 0 | class:0 * |
-| stl.h:226:32:226:38 | getline | 1 | streamsize |
-| stl.h:226:32:226:38 | getline | 1 | unsigned long |
-| stl.h:226:32:226:38 | getline | 2 | char_type |
-| stl.h:226:32:226:38 | getline | 2 | class:0 |
-| stl.h:229:68:229:77 | operator>> | 0 | basic_istream & |
-| stl.h:229:68:229:77 | operator>> | 1 | func:0 * |
-| stl.h:230:85:230:94 | operator>> | 0 | basic_istream & |
-| stl.h:230:85:230:94 | operator>> | 1 | basic_string & |
-| stl.h:232:84:232:90 | getline | 0 | basic_istream & |
-| stl.h:232:84:232:90 | getline | 1 | basic_string & |
-| stl.h:232:84:232:90 | getline | 2 | func:0 |
-| stl.h:233:84:233:90 | getline | 0 | basic_istream & |
-| stl.h:233:84:233:90 | getline | 1 | basic_string & |
-| stl.h:240:33:240:42 | operator<< | 0 | int |
-| stl.h:242:33:242:35 | put | 0 | char_type |
-| stl.h:242:33:242:35 | put | 0 | class:0 |
-| stl.h:243:33:243:37 | write | 0 | const char_type * |
-| stl.h:243:33:243:37 | write | 0 | const class:0 * |
-| stl.h:243:33:243:37 | write | 1 | streamsize |
-| stl.h:243:33:243:37 | write | 1 | unsigned long |
-| stl.h:247:67:247:76 | operator<< | 0 | basic_ostream & |
-| stl.h:247:67:247:76 | operator<< | 1 | const func:0 * |
-| stl.h:248:85:248:94 | operator<< | 0 | basic_ostream & |
-| stl.h:248:85:248:94 | operator<< | 1 | const basic_string & |
-| stl.h:259:12:259:29 | basic_stringstream | 0 | const basic_string & |
-| stl.h:263:23:263:31 | operator= | 0 | basic_stringstream && |
-| stl.h:265:8:265:11 | swap | 0 | basic_stringstream & |
-| stl.h:268:8:268:10 | str | 0 | const basic_string & |
-| stl.h:293:12:293:17 | vector | 0 | const class:1 & |
-| stl.h:293:12:293:17 | vector | 0 | const class:1 & |
-| stl.h:293:12:293:17 | vector | 0 | const class:1 & |
-| stl.h:293:12:293:17 | vector | 0 | const class:1 & |
-| stl.h:293:12:293:17 | vector | 0 | const class:1 & |
-| stl.h:293:12:293:17 | vector | 0 | const class:1 & |
-| stl.h:294:12:294:17 | vector | 0 | size_type |
-| stl.h:294:12:294:17 | vector | 0 | size_type |
-| stl.h:294:12:294:17 | vector | 0 | size_type |
-| stl.h:294:12:294:17 | vector | 0 | unsigned int |
-| stl.h:294:12:294:17 | vector | 0 | unsigned int |
-| stl.h:294:12:294:17 | vector | 0 | unsigned int |
-| stl.h:294:12:294:17 | vector | 1 | const class:1 & |
-| stl.h:294:12:294:17 | vector | 1 | const class:1 & |
-| stl.h:294:12:294:17 | vector | 1 | const class:1 & |
-| stl.h:295:3:295:8 | vector | 0 | size_type |
-| stl.h:295:3:295:8 | vector | 0 | size_type |
-| stl.h:295:3:295:8 | vector | 0 | unsigned int |
-| stl.h:295:3:295:8 | vector | 0 | unsigned int |
-| stl.h:295:3:295:8 | vector | 1 | const class:0 & |
-| stl.h:295:3:295:8 | vector | 1 | const class:0 & |
-| stl.h:295:3:295:8 | vector | 2 | const class:1 & |
-| stl.h:295:3:295:8 | vector | 2 | const class:1 & |
-| stl.h:296:101:296:106 | vector | 0 | func:0 |
-| stl.h:296:101:296:106 | vector | 1 | func:0 |
-| stl.h:296:101:296:106 | vector | 2 | const class:1 & |
-| stl.h:301:11:301:19 | operator= | 0 | const vector & |
-| stl.h:302:11:302:19 | operator= | 0 | vector && |
-| stl.h:303:106:303:111 | assign | 0 | func:0 |
-| stl.h:303:106:303:111 | assign | 1 | func:0 |
-| stl.h:306:8:306:13 | assign | 0 | size_type |
-| stl.h:306:8:306:13 | assign | 0 | size_type |
-| stl.h:306:8:306:13 | assign | 0 | size_type |
-| stl.h:306:8:306:13 | assign | 0 | unsigned int |
-| stl.h:306:8:306:13 | assign | 0 | unsigned int |
-| stl.h:306:8:306:13 | assign | 0 | unsigned int |
-| stl.h:306:8:306:13 | assign | 1 | const class:0 & |
-| stl.h:306:8:306:13 | assign | 1 | const class:0 & |
-| stl.h:306:8:306:13 | assign | 1 | const class:0 & |
-| stl.h:315:13:315:22 | operator[] | 0 | size_type |
-| stl.h:315:13:315:22 | operator[] | 0 | size_type |
-| stl.h:315:13:315:22 | operator[] | 0 | size_type |
-| stl.h:315:13:315:22 | operator[] | 0 | size_type |
-| stl.h:315:13:315:22 | operator[] | 0 | size_type |
-| stl.h:315:13:315:22 | operator[] | 0 | size_type |
-| stl.h:315:13:315:22 | operator[] | 0 | unsigned int |
-| stl.h:315:13:315:22 | operator[] | 0 | unsigned int |
-| stl.h:315:13:315:22 | operator[] | 0 | unsigned int |
-| stl.h:315:13:315:22 | operator[] | 0 | unsigned int |
-| stl.h:315:13:315:22 | operator[] | 0 | unsigned int |
-| stl.h:315:13:315:22 | operator[] | 0 | unsigned int |
-| stl.h:318:13:318:14 | at | 0 | size_type |
-| stl.h:318:13:318:14 | at | 0 | unsigned int |
-| stl.h:327:8:327:16 | push_back | 0 | const class:0 & |
-| stl.h:327:8:327:16 | push_back | 0 | const class:0 & |
-| stl.h:328:8:328:16 | push_back | 0 | class:0 && |
-| stl.h:331:12:331:17 | insert | 0 | const_iterator |
-| stl.h:331:12:331:17 | insert | 1 | class:0 && |
-| stl.h:333:42:333:47 | insert | 0 | const_iterator |
-| stl.h:333:42:333:47 | insert | 0 | const_iterator |
-| stl.h:333:42:333:47 | insert | 1 | func:0 |
-| stl.h:333:42:333:47 | insert | 1 | func:0 |
-| stl.h:333:42:333:47 | insert | 2 | func:0 |
-| stl.h:333:42:333:47 | insert | 2 | func:0 |
-| stl.h:335:37:335:43 | emplace | 0 | const_iterator |
-| stl.h:335:37:335:43 | emplace | 1 | func:0 && |
-| stl.h:336:33:336:44 | emplace_back | 0 | func:0 && |
-| stl.h:338:8:338:11 | swap | 0 | vector & |
-| stl.h:351:12:351:21 | shared_ptr | 0 | class:0 * |
-| stl.h:352:3:352:12 | shared_ptr | 0 | const shared_ptr & |
-| stl.h:352:3:352:12 | shared_ptr | 0 | const shared_ptr & |
-| stl.h:369:12:369:21 | unique_ptr | 0 | class:0 * |
-| stl.h:380:52:380:62 | make_unique | 0 | func:1 && |
-| stl.h:380:52:380:62 | make_unique | 0 | func:1 && |
-| stl.h:380:52:380:62 | make_unique | 0 | func:1 && |
-| stl.h:382:52:382:62 | make_shared | 0 | func:1 && |
-| stl.h:382:52:382:62 | make_shared | 0 | func:1 && |
-| stl.h:382:52:382:62 | make_shared | 0 | func:1 && |
-| stl.h:396:3:396:3 | pair | 0 | const class:0 & |
-| stl.h:396:3:396:3 | pair | 0 | const class:0 & |
-| stl.h:396:3:396:3 | pair | 0 | const class:0 & |
-| stl.h:396:3:396:3 | pair | 0 | const class:0 & |
-| stl.h:396:3:396:3 | pair | 0 | const class:0 & |
-| stl.h:396:3:396:3 | pair | 1 | const class:1 & |
-| stl.h:396:3:396:3 | pair | 1 | const class:1 & |
-| stl.h:396:3:396:3 | pair | 1 | const class:1 & |
-| stl.h:396:3:396:3 | pair | 1 | const class:1 & |
-| stl.h:396:3:396:3 | pair | 1 | const class:1 & |
-| stl.h:397:30:397:33 | pair | 0 | const pair & |
-| stl.h:397:30:397:33 | pair | 0 | const pair & |
-| stl.h:397:30:397:33 | pair | 0 | const pair & |
-| stl.h:397:30:397:33 | pair | 0 | const pair & |
-| stl.h:397:30:397:33 | pair | 0 | const pair & |
-| stl.h:397:30:397:33 | pair | 0 | const pair & |
-| stl.h:397:30:397:33 | pair | 0 | const pair & |
-| stl.h:397:30:397:33 | pair | 0 | const pair & |
-| stl.h:397:30:397:33 | pair | 0 | const pair & |
-| stl.h:397:30:397:33 | pair | 0 | const pair & |
-| stl.h:397:30:397:33 | pair | 0 | const pair & |
-| stl.h:397:30:397:33 | pair | 0 | const pair & |
-| stl.h:399:8:399:11 | swap | 0 | pair & |
-| stl.h:402:72:402:72 | make_pair | 0 | func:0 && |
-| stl.h:402:72:402:72 | make_pair | 0 | func:0 && |
-| stl.h:402:72:402:72 | make_pair | 0 | func:0 && |
-| stl.h:402:72:402:72 | make_pair | 0 | func:0 && |
-| stl.h:402:72:402:72 | make_pair | 0 | func:0 && |
-| stl.h:402:72:402:72 | make_pair | 0 | func:0 && |
-| stl.h:402:72:402:72 | make_pair | 1 | func:1 && |
-| stl.h:402:72:402:72 | make_pair | 1 | func:1 && |
-| stl.h:402:72:402:72 | make_pair | 1 | func:1 && |
-| stl.h:402:72:402:72 | make_pair | 1 | func:1 && |
-| stl.h:402:72:402:72 | make_pair | 1 | func:1 && |
-| stl.h:402:72:402:72 | make_pair | 1 | func:1 && |
-| stl.h:422:3:422:5 | map | 0 | const map & |
-| stl.h:426:8:426:16 | operator= | 0 | const map & |
-| stl.h:435:6:435:15 | operator[] | 0 | class:0 && |
-| stl.h:435:6:435:15 | operator[] | 0 | class:0 && |
-| stl.h:435:6:435:15 | operator[] | 0 | key_type && |
-| stl.h:435:6:435:15 | operator[] | 0 | key_type && |
-| stl.h:436:6:436:7 | at | 0 | const class:0 & |
-| stl.h:436:6:436:7 | at | 0 | const key_type & |
-| stl.h:439:48:439:54 | emplace | 0 | func:0 && |
-| stl.h:439:48:439:54 | emplace | 0 | func:0 && |
-| stl.h:440:36:440:47 | emplace_hint | 0 | const_iterator |
-| stl.h:440:36:440:47 | emplace_hint | 0 | const_iterator |
-| stl.h:440:36:440:47 | emplace_hint | 1 | func:0 && |
-| stl.h:440:36:440:47 | emplace_hint | 1 | func:0 && |
-| stl.h:443:24:443:29 | insert | 0 | value_type && |
-| stl.h:445:12:445:17 | insert | 0 | const_iterator |
-| stl.h:445:12:445:17 | insert | 1 | value_type && |
-| stl.h:448:48:448:58 | try_emplace | 0 | class:0 && |
-| stl.h:448:48:448:58 | try_emplace | 0 | class:0 && |
-| stl.h:448:48:448:58 | try_emplace | 0 | key_type && |
-| stl.h:448:48:448:58 | try_emplace | 0 | key_type && |
-| stl.h:448:48:448:58 | try_emplace | 1 | func:0 && |
-| stl.h:448:48:448:58 | try_emplace | 1 | func:0 && |
-| stl.h:450:36:450:46 | try_emplace | 0 | const_iterator |
-| stl.h:450:36:450:46 | try_emplace | 0 | const_iterator |
-| stl.h:450:36:450:46 | try_emplace | 1 | class:0 && |
-| stl.h:450:36:450:46 | try_emplace | 1 | class:0 && |
-| stl.h:450:36:450:46 | try_emplace | 1 | key_type && |
-| stl.h:450:36:450:46 | try_emplace | 1 | key_type && |
-| stl.h:450:36:450:46 | try_emplace | 2 | func:0 && |
-| stl.h:450:36:450:46 | try_emplace | 2 | func:0 && |
-| stl.h:452:42:452:57 | insert_or_assign | 0 | class:0 && |
-| stl.h:452:42:452:57 | insert_or_assign | 0 | key_type && |
-| stl.h:452:42:452:57 | insert_or_assign | 1 | func:0 && |
-| stl.h:454:30:454:45 | insert_or_assign | 0 | const_iterator |
-| stl.h:454:30:454:45 | insert_or_assign | 1 | class:0 && |
-| stl.h:454:30:454:45 | insert_or_assign | 1 | key_type && |
-| stl.h:454:30:454:45 | insert_or_assign | 2 | func:0 && |
-| stl.h:456:12:456:16 | erase | 0 | iterator |
-| stl.h:459:8:459:11 | swap | 0 | map & |
-| stl.h:462:27:462:31 | merge | 0 | map & |
-| stl.h:465:12:465:15 | find | 0 | const class:0 & |
-| stl.h:465:12:465:15 | find | 0 | const key_type & |
-| stl.h:468:12:468:22 | lower_bound | 0 | const class:0 & |
-| stl.h:468:12:468:22 | lower_bound | 0 | const key_type & |
-| stl.h:470:12:470:22 | upper_bound | 0 | const class:0 & |
-| stl.h:470:12:470:22 | upper_bound | 0 | const key_type & |
-| stl.h:473:28:473:38 | equal_range | 0 | const class:0 & |
-| stl.h:473:28:473:38 | equal_range | 0 | const key_type & |
-| stl.h:490:3:490:15 | unordered_map | 0 | const unordered_map & |
-| stl.h:490:3:490:15 | unordered_map | 0 | const unordered_map & |
-| stl.h:494:18:494:26 | operator= | 0 | const unordered_map & |
-| stl.h:503:16:503:25 | operator[] | 0 | class:0 && |
-| stl.h:503:16:503:25 | operator[] | 0 | class:0 && |
-| stl.h:503:16:503:25 | operator[] | 0 | key_type && |
-| stl.h:503:16:503:25 | operator[] | 0 | key_type && |
-| stl.h:504:16:504:17 | at | 0 | const class:0 & |
-| stl.h:504:16:504:17 | at | 0 | const key_type & |
-| stl.h:507:48:507:54 | emplace | 0 | func:0 && |
-| stl.h:507:48:507:54 | emplace | 0 | func:0 && |
-| stl.h:507:48:507:54 | emplace | 0 | func:0 && |
-| stl.h:507:48:507:54 | emplace | 0 | func:0 && |
-| stl.h:507:48:507:54 | emplace | 0 | func:0 && |
-| stl.h:508:36:508:47 | emplace_hint | 0 | const_iterator |
-| stl.h:508:36:508:47 | emplace_hint | 0 | const_iterator |
-| stl.h:508:36:508:47 | emplace_hint | 1 | func:0 && |
-| stl.h:508:36:508:47 | emplace_hint | 1 | func:0 && |
-| stl.h:511:24:511:29 | insert | 0 | value_type && |
-| stl.h:513:12:513:17 | insert | 0 | const_iterator |
-| stl.h:513:12:513:17 | insert | 1 | value_type && |
-| stl.h:516:48:516:58 | try_emplace | 0 | class:0 && |
-| stl.h:516:48:516:58 | try_emplace | 0 | class:0 && |
-| stl.h:516:48:516:58 | try_emplace | 0 | class:0 && |
-| stl.h:516:48:516:58 | try_emplace | 0 | class:0 && |
-| stl.h:516:48:516:58 | try_emplace | 0 | class:0 && |
-| stl.h:516:48:516:58 | try_emplace | 0 | key_type && |
-| stl.h:516:48:516:58 | try_emplace | 0 | key_type && |
-| stl.h:516:48:516:58 | try_emplace | 0 | key_type && |
-| stl.h:516:48:516:58 | try_emplace | 0 | key_type && |
-| stl.h:516:48:516:58 | try_emplace | 0 | key_type && |
-| stl.h:516:48:516:58 | try_emplace | 1 | func:0 && |
-| stl.h:516:48:516:58 | try_emplace | 1 | func:0 && |
-| stl.h:516:48:516:58 | try_emplace | 1 | func:0 && |
-| stl.h:516:48:516:58 | try_emplace | 1 | func:0 && |
-| stl.h:516:48:516:58 | try_emplace | 1 | func:0 && |
-| stl.h:518:36:518:46 | try_emplace | 0 | const_iterator |
-| stl.h:518:36:518:46 | try_emplace | 0 | const_iterator |
-| stl.h:518:36:518:46 | try_emplace | 1 | class:0 && |
-| stl.h:518:36:518:46 | try_emplace | 1 | class:0 && |
-| stl.h:518:36:518:46 | try_emplace | 1 | key_type && |
-| stl.h:518:36:518:46 | try_emplace | 1 | key_type && |
-| stl.h:518:36:518:46 | try_emplace | 2 | func:0 && |
-| stl.h:518:36:518:46 | try_emplace | 2 | func:0 && |
-| stl.h:520:42:520:57 | insert_or_assign | 0 | class:0 && |
-| stl.h:520:42:520:57 | insert_or_assign | 0 | key_type && |
-| stl.h:520:42:520:57 | insert_or_assign | 1 | func:0 && |
-| stl.h:522:30:522:45 | insert_or_assign | 0 | const_iterator |
-| stl.h:522:30:522:45 | insert_or_assign | 1 | class:0 && |
-| stl.h:522:30:522:45 | insert_or_assign | 1 | key_type && |
-| stl.h:522:30:522:45 | insert_or_assign | 2 | func:0 && |
-| stl.h:524:12:524:16 | erase | 0 | iterator |
-| stl.h:527:8:527:11 | swap | 0 | unordered_map & |
-| stl.h:530:37:530:41 | merge | 0 | unordered_map & |
-| stl.h:533:12:533:15 | find | 0 | const class:0 & |
-| stl.h:533:12:533:15 | find | 0 | const key_type & |
-| stl.h:536:28:536:38 | equal_range | 0 | const class:0 & |
-| stl.h:536:28:536:38 | equal_range | 0 | const key_type & |
-| stl.h:555:3:555:5 | set | 0 | const set & |
-| stl.h:557:33:557:35 | set | 0 | func:0 |
-| stl.h:557:33:557:35 | set | 1 | func:0 |
-| stl.h:560:8:560:16 | operator= | 0 | const set & |
-| stl.h:568:48:568:54 | emplace | 0 | func:0 && |
-| stl.h:568:48:568:54 | emplace | 0 | func:0 && |
-| stl.h:569:36:569:47 | emplace_hint | 0 | const_iterator |
-| stl.h:569:36:569:47 | emplace_hint | 0 | const_iterator |
-| stl.h:569:36:569:47 | emplace_hint | 1 | func:0 && |
-| stl.h:569:36:569:47 | emplace_hint | 1 | func:0 && |
-| stl.h:571:23:571:28 | insert | 0 | class:0 && |
-| stl.h:571:23:571:28 | insert | 0 | value_type && |
-| stl.h:573:12:573:17 | insert | 0 | const_iterator |
-| stl.h:573:12:573:17 | insert | 1 | class:0 && |
-| stl.h:573:12:573:17 | insert | 1 | value_type && |
-| stl.h:574:38:574:43 | insert | 0 | func:0 |
-| stl.h:574:38:574:43 | insert | 1 | func:0 |
-| stl.h:576:12:576:16 | erase | 0 | iterator |
-| stl.h:579:8:579:11 | swap | 0 | set & |
-| stl.h:582:27:582:31 | merge | 0 | set & |
-| stl.h:585:12:585:15 | find | 0 | const class:0 & |
-| stl.h:585:12:585:15 | find | 0 | const key_type & |
-| stl.h:588:12:588:22 | lower_bound | 0 | const class:0 & |
-| stl.h:588:12:588:22 | lower_bound | 0 | const key_type & |
-| stl.h:590:12:590:22 | upper_bound | 0 | const class:0 & |
-| stl.h:590:12:590:22 | upper_bound | 0 | const key_type & |
-| stl.h:592:28:592:38 | equal_range | 0 | const class:0 & |
-| stl.h:592:28:592:38 | equal_range | 0 | const key_type & |
-| stl.h:609:3:609:15 | unordered_set | 0 | const unordered_set & |
-| stl.h:611:33:611:45 | unordered_set | 0 | func:0 |
-| stl.h:611:33:611:45 | unordered_set | 1 | func:0 |
-| stl.h:611:33:611:45 | unordered_set | 2 | size_type |
-| stl.h:611:33:611:45 | unordered_set | 2 | unsigned long |
-| stl.h:614:18:614:26 | operator= | 0 | const unordered_set & |
-| stl.h:622:48:622:54 | emplace | 0 | func:0 && |
-| stl.h:622:48:622:54 | emplace | 0 | func:0 && |
-| stl.h:623:36:623:47 | emplace_hint | 0 | const_iterator |
-| stl.h:623:36:623:47 | emplace_hint | 0 | const_iterator |
-| stl.h:623:36:623:47 | emplace_hint | 1 | func:0 && |
-| stl.h:623:36:623:47 | emplace_hint | 1 | func:0 && |
-| stl.h:625:24:625:29 | insert | 0 | class:0 && |
-| stl.h:625:24:625:29 | insert | 0 | value_type && |
-| stl.h:627:12:627:17 | insert | 0 | const_iterator |
-| stl.h:627:12:627:17 | insert | 1 | class:0 && |
-| stl.h:627:12:627:17 | insert | 1 | value_type && |
-| stl.h:628:38:628:43 | insert | 0 | func:0 |
-| stl.h:628:38:628:43 | insert | 1 | func:0 |
-| stl.h:630:12:630:16 | erase | 0 | iterator |
-| stl.h:633:8:633:11 | swap | 0 | unordered_set & |
-| stl.h:636:37:636:41 | merge | 0 | unordered_set & |
-| stl.h:639:12:639:15 | find | 0 | const class:0 & |
-| stl.h:639:12:639:15 | find | 0 | const key_type & |
-| stl.h:641:28:641:38 | equal_range | 0 | const class:0 & |
-| stl.h:641:28:641:38 | equal_range | 0 | const key_type & |
-| stl.h:671:21:671:39 | basic_format_string | 0 | const func:0 & |
-| stl.h:671:21:671:39 | basic_format_string | 0 | const func:0 & |
-| stl.h:678:33:678:38 | format | 0 | format_string |
-| stl.h:678:33:678:38 | format | 0 | format_string |
-| stl.h:678:33:678:38 | format | 1 | func:0 && |
-| stl.h:678:33:678:38 | format | 1 | func:0 && |
-| stl.h:683:6:683:48 | same_signature_as_format_but_different_name | 0 | format_string |
-| stl.h:683:6:683:48 | same_signature_as_format_but_different_name | 1 | func:0 && |
-| stl.h:687:8:687:8 | operator= | 0 | const thread & |
-| stl.h:687:8:687:8 | thread | 0 | const thread & |
-| stl.h:690:12:690:17 | thread | 0 | func:0 && |
-| stl.h:690:12:690:17 | thread | 0 | func:0 && |
-| stl.h:690:12:690:17 | thread | 0 | func:0 && |
-| stl.h:690:12:690:17 | thread | 0 | func:0 && |
-| stl.h:690:12:690:17 | thread | 1 | func:1 && |
-| stl.h:690:12:690:17 | thread | 1 | func:1 && |
-| stl.h:690:12:690:17 | thread | 1 | func:1 && |
-| stl.h:690:12:690:17 | thread | 1 | func:1 && |
+| stl.h:5:34:5:40 | forward | 0 | remove_reference_t & |
+| stl.h:5:34:5:40 | forward | 0 | remove_reference_t & |
+| stl.h:5:34:5:40 | forward | 0 | remove_reference_t & |
+| stl.h:5:34:5:40 | forward | 0 | remove_reference_t & |
+| stl.h:5:34:5:40 | forward | 0 | type & |
+| stl.h:5:34:5:40 | forward | 0 | type & |
+| stl.h:5:34:5:40 | forward | 0 | type & |
+| stl.h:5:34:5:40 | forward | 0 | type & |
+| stl.h:25:3:25:10 | iterator | 0 | const iterator & |
+| stl.h:25:3:25:10 | iterator | 0 | const iterator & |
+| stl.h:25:3:25:10 | iterator | 0 | const iterator & |
+| stl.h:25:3:25:10 | iterator | 0 | const iterator & |
+| stl.h:25:3:25:10 | iterator | 0 | const iterator & |
+| stl.h:25:3:25:10 | iterator | 0 | const iterator & |
+| stl.h:25:3:25:10 | iterator | 0 | const iterator & |
+| stl.h:25:3:25:10 | iterator | 0 | const iterator & |
+| stl.h:28:12:28:21 | operator++ | 0 | int |
+| stl.h:28:12:28:21 | operator++ | 0 | int |
+| stl.h:28:12:28:21 | operator++ | 0 | int |
+| stl.h:28:12:28:21 | operator++ | 0 | int |
+| stl.h:28:12:28:21 | operator++ | 0 | int |
+| stl.h:30:12:30:21 | operator-- | 0 | int |
+| stl.h:32:8:32:17 | operator!= | 0 | iterator |
+| stl.h:32:8:32:17 | operator!= | 0 | iterator |
+| stl.h:32:8:32:17 | operator!= | 0 | iterator |
+| stl.h:32:8:32:17 | operator!= | 0 | iterator |
+| stl.h:32:8:32:17 | operator!= | 0 | iterator |
+| stl.h:32:8:32:17 | operator!= | 0 | iterator |
+| stl.h:35:12:35:20 | operator+ | 0 | int |
+| stl.h:36:12:36:20 | operator- | 0 | int |
+| stl.h:37:13:37:22 | operator+= | 0 | int |
+| stl.h:37:13:37:22 | operator+= | 0 | int |
+| stl.h:38:13:38:22 | operator-= | 0 | int |
+| stl.h:40:18:40:27 | operator[] | 0 | int |
+| stl.h:43:9:43:9 | operator= | 0 | const input_iterator_tag & |
+| stl.h:43:9:43:9 | operator= | 0 | input_iterator_tag && |
+| stl.h:44:9:44:9 | operator= | 0 | const forward_iterator_tag & |
+| stl.h:44:9:44:9 | operator= | 0 | forward_iterator_tag && |
+| stl.h:45:9:45:9 | operator= | 0 | bidirectional_iterator_tag && |
+| stl.h:45:9:45:9 | operator= | 0 | const bidirectional_iterator_tag & |
+| stl.h:46:9:46:9 | operator= | 0 | const random_access_iterator_tag & |
+| stl.h:46:9:46:9 | operator= | 0 | random_access_iterator_tag && |
+| stl.h:48:9:48:9 | operator= | 0 | const output_iterator_tag & |
+| stl.h:48:9:48:9 | operator= | 0 | output_iterator_tag && |
+| stl.h:62:22:62:41 | back_insert_iterator | 0 | class:0 & |
+| stl.h:62:22:62:41 | back_insert_iterator | 0 | class:0 & |
+| stl.h:64:25:64:33 | operator= | 0 | value_type && |
+| stl.h:64:25:64:33 | operator= | 0 | value_type && |
+| stl.h:67:24:67:33 | operator++ | 0 | int |
+| stl.h:67:24:67:33 | operator++ | 0 | int |
+| stl.h:71:44:71:44 | back_inserter | 0 | func:0 & |
+| stl.h:71:44:71:44 | back_inserter | 0 | func:0 & |
+| stl.h:142:12:142:23 | basic_string | 0 | const class:2 & |
+| stl.h:143:3:143:14 | basic_string | 0 | const class:0 * |
+| stl.h:143:3:143:14 | basic_string | 1 | const class:2 & |
+| stl.h:144:33:144:44 | basic_string | 0 | func:0 |
+| stl.h:144:33:144:44 | basic_string | 1 | func:0 |
+| stl.h:144:33:144:44 | basic_string | 2 | const class:2 & |
+| stl.h:147:12:147:23 | basic_string | 0 | const func:0 & |
+| stl.h:147:12:147:23 | basic_string | 1 | const class:2 & |
+| stl.h:150:3:150:14 | basic_string | 0 | const func:0 & |
+| stl.h:150:3:150:14 | basic_string | 1 | size_type |
+| stl.h:150:3:150:14 | basic_string | 2 | size_type |
+| stl.h:150:3:150:14 | basic_string | 3 | const class:2 & |
+| stl.h:167:8:167:16 | push_back | 0 | class:0 |
+| stl.h:175:13:175:22 | operator[] | 0 | size_type |
+| stl.h:177:13:177:14 | at | 0 | size_type |
+| stl.h:178:35:178:44 | operator+= | 0 | const func:0 & |
+| stl.h:178:35:178:44 | operator+= | 0 | const func:0 & |
+| stl.h:179:17:179:26 | operator+= | 0 | const class:0 * |
+| stl.h:180:17:180:22 | append | 0 | const basic_string & |
+| stl.h:183:174:183:179 | append | 0 | const func:0 & |
+| stl.h:183:174:183:179 | append | 1 | size_type |
+| stl.h:183:174:183:179 | append | 2 | size_type |
+| stl.h:185:17:185:22 | append | 0 | const class:0 * |
+| stl.h:186:17:186:22 | append | 0 | size_type |
+| stl.h:186:17:186:22 | append | 1 | class:0 |
+| stl.h:187:47:187:52 | append | 0 | func:0 |
+| stl.h:187:47:187:52 | append | 1 | func:0 |
+| stl.h:188:17:188:22 | assign | 0 | const basic_string & |
+| stl.h:191:17:191:22 | assign | 0 | const func:0 & |
+| stl.h:195:17:195:22 | assign | 0 | size_type |
+| stl.h:195:17:195:22 | assign | 1 | class:0 |
+| stl.h:196:47:196:52 | assign | 0 | func:0 |
+| stl.h:196:47:196:52 | assign | 1 | func:0 |
+| stl.h:197:17:197:22 | insert | 0 | size_type |
+| stl.h:197:17:197:22 | insert | 1 | const basic_string & |
+| stl.h:200:17:200:22 | insert | 0 | size_type |
+| stl.h:200:17:200:22 | insert | 1 | const func:0 & |
+| stl.h:203:17:203:22 | insert | 0 | size_type |
+| stl.h:203:17:203:22 | insert | 1 | size_type |
+| stl.h:203:17:203:22 | insert | 2 | class:0 |
+| stl.h:204:17:204:22 | insert | 0 | size_type |
+| stl.h:204:17:204:22 | insert | 1 | const class:0 * |
+| stl.h:205:12:205:17 | insert | 0 | const_iterator |
+| stl.h:205:12:205:17 | insert | 1 | size_type |
+| stl.h:205:12:205:17 | insert | 2 | class:0 |
+| stl.h:206:42:206:47 | insert | 0 | const_iterator |
+| stl.h:206:42:206:47 | insert | 1 | func:0 |
+| stl.h:206:42:206:47 | insert | 2 | func:0 |
+| stl.h:207:17:207:23 | replace | 0 | size_type |
+| stl.h:207:17:207:23 | replace | 1 | size_type |
+| stl.h:207:17:207:23 | replace | 2 | const basic_string & |
+| stl.h:210:17:210:23 | replace | 0 | size_type |
+| stl.h:210:17:210:23 | replace | 1 | size_type |
+| stl.h:210:17:210:23 | replace | 2 | const func:0 & |
+| stl.h:216:17:216:23 | replace | 0 | size_type |
+| stl.h:216:17:216:23 | replace | 1 | size_type |
+| stl.h:216:17:216:23 | replace | 2 | size_type |
+| stl.h:216:17:216:23 | replace | 3 | class:0 |
+| stl.h:217:13:217:16 | copy | 0 | class:0 * |
+| stl.h:217:13:217:16 | copy | 1 | size_type |
+| stl.h:217:13:217:16 | copy | 2 | size_type |
+| stl.h:219:16:219:21 | substr | 0 | size_type |
+| stl.h:219:16:219:21 | substr | 1 | size_type |
+| stl.h:220:8:220:11 | swap | 0 | basic_string & |
+| stl.h:223:94:223:102 | operator+ | 0 | const basic_string & |
+| stl.h:223:94:223:102 | operator+ | 1 | const basic_string & |
+| stl.h:224:94:224:102 | operator+ | 0 | const basic_string & |
+| stl.h:224:94:224:102 | operator+ | 1 | const func:0 * |
+| stl.h:230:41:230:49 | operator+ | 0 | func:0 |
+| stl.h:230:41:230:49 | operator+ | 1 | basic_string && |
+| stl.h:245:33:245:42 | operator>> | 0 | int & |
+| stl.h:248:33:248:35 | get | 0 | char_type & |
+| stl.h:248:33:248:35 | get | 0 | class:0 & |
+| stl.h:249:33:249:35 | get | 0 | char_type * |
+| stl.h:249:33:249:35 | get | 0 | class:0 * |
+| stl.h:249:33:249:35 | get | 1 | decltype(...) |
+| stl.h:249:33:249:35 | get | 1 | streamsize |
+| stl.h:251:33:251:36 | read | 0 | char_type * |
+| stl.h:251:33:251:36 | read | 0 | class:0 * |
+| stl.h:251:33:251:36 | read | 1 | decltype(...) |
+| stl.h:251:33:251:36 | read | 1 | streamsize |
+| stl.h:252:14:252:21 | readsome | 0 | char_type * |
+| stl.h:252:14:252:21 | readsome | 0 | class:0 * |
+| stl.h:252:14:252:21 | readsome | 1 | decltype(...) |
+| stl.h:252:14:252:21 | readsome | 1 | streamsize |
+| stl.h:253:33:253:39 | putback | 0 | char_type |
+| stl.h:253:33:253:39 | putback | 0 | class:0 |
+| stl.h:256:32:256:38 | getline | 0 | char_type * |
+| stl.h:256:32:256:38 | getline | 0 | class:0 * |
+| stl.h:256:32:256:38 | getline | 1 | decltype(...) |
+| stl.h:256:32:256:38 | getline | 1 | streamsize |
+| stl.h:257:32:257:38 | getline | 0 | char_type * |
+| stl.h:257:32:257:38 | getline | 0 | class:0 * |
+| stl.h:257:32:257:38 | getline | 1 | decltype(...) |
+| stl.h:257:32:257:38 | getline | 1 | streamsize |
+| stl.h:257:32:257:38 | getline | 2 | char_type |
+| stl.h:257:32:257:38 | getline | 2 | class:0 |
+| stl.h:260:68:260:77 | operator>> | 0 | basic_istream & |
+| stl.h:260:68:260:77 | operator>> | 1 | func:0 * |
+| stl.h:261:85:261:94 | operator>> | 0 | basic_istream & |
+| stl.h:261:85:261:94 | operator>> | 1 | basic_string & |
+| stl.h:263:84:263:90 | getline | 0 | basic_istream & |
+| stl.h:263:84:263:90 | getline | 1 | basic_string & |
+| stl.h:263:84:263:90 | getline | 2 | func:0 |
+| stl.h:264:84:264:90 | getline | 0 | basic_istream & |
+| stl.h:264:84:264:90 | getline | 1 | basic_string & |
+| stl.h:271:33:271:42 | operator<< | 0 | int |
+| stl.h:273:33:273:35 | put | 0 | char_type |
+| stl.h:273:33:273:35 | put | 0 | class:0 |
+| stl.h:274:33:274:37 | write | 0 | const char_type * |
+| stl.h:274:33:274:37 | write | 0 | const class:0 * |
+| stl.h:274:33:274:37 | write | 1 | decltype(...) |
+| stl.h:274:33:274:37 | write | 1 | streamsize |
+| stl.h:278:67:278:76 | operator<< | 0 | basic_ostream & |
+| stl.h:278:67:278:76 | operator<< | 1 | const func:0 * |
+| stl.h:279:85:279:94 | operator<< | 0 | basic_ostream & |
+| stl.h:279:85:279:94 | operator<< | 1 | const basic_string & |
+| stl.h:290:12:290:29 | basic_stringstream | 0 | const basic_string & |
+| stl.h:294:23:294:31 | operator= | 0 | basic_stringstream && |
+| stl.h:296:8:296:11 | swap | 0 | basic_stringstream & |
+| stl.h:299:8:299:10 | str | 0 | const basic_string & |
+| stl.h:327:12:327:17 | vector | 0 | size_type |
+| stl.h:327:12:327:17 | vector | 0 | size_type |
+| stl.h:327:12:327:17 | vector | 0 | size_type |
+| stl.h:327:12:327:17 | vector | 0 | unsigned int |
+| stl.h:327:12:327:17 | vector | 0 | unsigned int |
+| stl.h:327:12:327:17 | vector | 0 | unsigned int |
+| stl.h:327:12:327:17 | vector | 1 | const class:1 & |
+| stl.h:327:12:327:17 | vector | 1 | const class:1 & |
+| stl.h:327:12:327:17 | vector | 1 | const class:1 & |
+| stl.h:328:3:328:8 | vector | 0 | size_type |
+| stl.h:328:3:328:8 | vector | 0 | size_type |
+| stl.h:328:3:328:8 | vector | 0 | unsigned int |
+| stl.h:328:3:328:8 | vector | 0 | unsigned int |
+| stl.h:328:3:328:8 | vector | 1 | const class:0 & |
+| stl.h:328:3:328:8 | vector | 1 | const class:0 & |
+| stl.h:328:3:328:8 | vector | 2 | const class:1 & |
+| stl.h:328:3:328:8 | vector | 2 | const class:1 & |
+| stl.h:329:101:329:106 | vector | 0 | func:0 |
+| stl.h:329:101:329:106 | vector | 1 | func:0 |
+| stl.h:329:101:329:106 | vector | 2 | const class:1 & |
+| stl.h:334:11:334:19 | operator= | 0 | const vector & |
+| stl.h:335:11:335:19 | operator= | 0 | vector && |
+| stl.h:336:106:336:111 | assign | 0 | func:0 |
+| stl.h:336:106:336:111 | assign | 1 | func:0 |
+| stl.h:339:8:339:13 | assign | 0 | size_type |
+| stl.h:339:8:339:13 | assign | 0 | size_type |
+| stl.h:339:8:339:13 | assign | 0 | size_type |
+| stl.h:339:8:339:13 | assign | 0 | unsigned int |
+| stl.h:339:8:339:13 | assign | 0 | unsigned int |
+| stl.h:339:8:339:13 | assign | 0 | unsigned int |
+| stl.h:339:8:339:13 | assign | 1 | const class:0 & |
+| stl.h:339:8:339:13 | assign | 1 | const class:0 & |
+| stl.h:339:8:339:13 | assign | 1 | const class:0 & |
+| stl.h:348:13:348:22 | operator[] | 0 | size_type |
+| stl.h:348:13:348:22 | operator[] | 0 | size_type |
+| stl.h:348:13:348:22 | operator[] | 0 | size_type |
+| stl.h:348:13:348:22 | operator[] | 0 | size_type |
+| stl.h:348:13:348:22 | operator[] | 0 | size_type |
+| stl.h:348:13:348:22 | operator[] | 0 | size_type |
+| stl.h:348:13:348:22 | operator[] | 0 | unsigned int |
+| stl.h:348:13:348:22 | operator[] | 0 | unsigned int |
+| stl.h:348:13:348:22 | operator[] | 0 | unsigned int |
+| stl.h:348:13:348:22 | operator[] | 0 | unsigned int |
+| stl.h:348:13:348:22 | operator[] | 0 | unsigned int |
+| stl.h:348:13:348:22 | operator[] | 0 | unsigned int |
+| stl.h:351:13:351:14 | at | 0 | size_type |
+| stl.h:351:13:351:14 | at | 0 | unsigned int |
+| stl.h:360:8:360:16 | push_back | 0 | const class:0 & |
+| stl.h:360:8:360:16 | push_back | 0 | const class:0 & |
+| stl.h:361:8:361:16 | push_back | 0 | class:0 && |
+| stl.h:361:8:361:16 | push_back | 0 | class:0 && |
+| stl.h:364:12:364:17 | insert | 0 | const_iterator |
+| stl.h:364:12:364:17 | insert | 1 | class:0 && |
+| stl.h:366:42:366:47 | insert | 0 | const_iterator |
+| stl.h:366:42:366:47 | insert | 0 | const_iterator |
+| stl.h:366:42:366:47 | insert | 1 | func:0 |
+| stl.h:366:42:366:47 | insert | 1 | func:0 |
+| stl.h:366:42:366:47 | insert | 2 | func:0 |
+| stl.h:366:42:366:47 | insert | 2 | func:0 |
+| stl.h:368:37:368:43 | emplace | 0 | const_iterator |
+| stl.h:368:37:368:43 | emplace | 1 | func:0 && |
+| stl.h:369:33:369:44 | emplace_back | 0 | func:0 && |
+| stl.h:371:8:371:11 | swap | 0 | vector & |
+| stl.h:384:12:384:21 | shared_ptr | 0 | class:0 * |
+| stl.h:385:3:385:12 | shared_ptr | 0 | const shared_ptr & |
+| stl.h:385:3:385:12 | shared_ptr | 0 | const shared_ptr & |
+| stl.h:402:12:402:21 | unique_ptr | 0 | class:0 * |
+| stl.h:413:52:413:62 | make_unique | 0 | func:1 && |
+| stl.h:413:52:413:62 | make_unique | 0 | func:1 && |
+| stl.h:413:52:413:62 | make_unique | 0 | func:1 && |
+| stl.h:415:52:415:62 | make_shared | 0 | func:1 && |
+| stl.h:415:52:415:62 | make_shared | 0 | func:1 && |
+| stl.h:415:52:415:62 | make_shared | 0 | func:1 && |
+| stl.h:429:3:429:3 | pair | 0 | const class:0 & |
+| stl.h:429:3:429:3 | pair | 0 | const class:0 & |
+| stl.h:429:3:429:3 | pair | 0 | const class:0 & |
+| stl.h:429:3:429:3 | pair | 0 | const class:0 & |
+| stl.h:429:3:429:3 | pair | 0 | const class:0 & |
+| stl.h:429:3:429:3 | pair | 0 | const class:0 & |
+| stl.h:429:3:429:3 | pair | 1 | const class:1 & |
+| stl.h:429:3:429:3 | pair | 1 | const class:1 & |
+| stl.h:429:3:429:3 | pair | 1 | const class:1 & |
+| stl.h:429:3:429:3 | pair | 1 | const class:1 & |
+| stl.h:429:3:429:3 | pair | 1 | const class:1 & |
+| stl.h:429:3:429:3 | pair | 1 | const class:1 & |
+| stl.h:430:30:430:33 | pair | 0 | const pair & |
+| stl.h:430:30:430:33 | pair | 0 | const pair & |
+| stl.h:430:30:430:33 | pair | 0 | const pair & |
+| stl.h:430:30:430:33 | pair | 0 | const pair & |
+| stl.h:432:8:432:11 | swap | 0 | pair & |
+| stl.h:435:72:435:72 | make_pair | 0 | func:0 && |
+| stl.h:435:72:435:72 | make_pair | 0 | func:0 && |
+| stl.h:435:72:435:72 | make_pair | 0 | func:0 && |
+| stl.h:435:72:435:72 | make_pair | 0 | func:0 && |
+| stl.h:435:72:435:72 | make_pair | 0 | func:0 && |
+| stl.h:435:72:435:72 | make_pair | 0 | func:0 && |
+| stl.h:435:72:435:72 | make_pair | 1 | func:1 && |
+| stl.h:435:72:435:72 | make_pair | 1 | func:1 && |
+| stl.h:435:72:435:72 | make_pair | 1 | func:1 && |
+| stl.h:435:72:435:72 | make_pair | 1 | func:1 && |
+| stl.h:435:72:435:72 | make_pair | 1 | func:1 && |
+| stl.h:435:72:435:72 | make_pair | 1 | func:1 && |
+| stl.h:460:3:460:5 | map | 0 | const map & |
+| stl.h:464:8:464:16 | operator= | 0 | const map & |
+| stl.h:473:6:473:15 | operator[] | 0 | class:0 && |
+| stl.h:473:6:473:15 | operator[] | 0 | class:0 && |
+| stl.h:473:6:473:15 | operator[] | 0 | key_type && |
+| stl.h:473:6:473:15 | operator[] | 0 | key_type && |
+| stl.h:475:6:475:7 | at | 0 | const class:0 & |
+| stl.h:475:6:475:7 | at | 0 | const key_type & |
+| stl.h:478:48:478:54 | emplace | 0 | func:0 && |
+| stl.h:478:48:478:54 | emplace | 0 | func:0 && |
+| stl.h:479:36:479:47 | emplace_hint | 0 | const_iterator |
+| stl.h:479:36:479:47 | emplace_hint | 0 | const_iterator |
+| stl.h:479:36:479:47 | emplace_hint | 1 | func:0 && |
+| stl.h:479:36:479:47 | emplace_hint | 1 | func:0 && |
+| stl.h:483:42:483:47 | insert | 0 | func:0 && |
+| stl.h:483:42:483:47 | insert | 0 | func:0 && |
+| stl.h:483:42:483:47 | insert | 0 | func:0 && |
+| stl.h:486:30:486:35 | insert | 0 | const_iterator |
+| stl.h:486:30:486:35 | insert | 1 | func:0 && |
+| stl.h:488:48:488:58 | try_emplace | 0 | class:0 && |
+| stl.h:488:48:488:58 | try_emplace | 0 | class:0 && |
+| stl.h:488:48:488:58 | try_emplace | 0 | key_type && |
+| stl.h:488:48:488:58 | try_emplace | 0 | key_type && |
+| stl.h:488:48:488:58 | try_emplace | 1 | func:0 && |
+| stl.h:488:48:488:58 | try_emplace | 1 | func:0 && |
+| stl.h:490:36:490:46 | try_emplace | 0 | const_iterator |
+| stl.h:490:36:490:46 | try_emplace | 0 | const_iterator |
+| stl.h:490:36:490:46 | try_emplace | 1 | class:0 && |
+| stl.h:490:36:490:46 | try_emplace | 1 | class:0 && |
+| stl.h:490:36:490:46 | try_emplace | 1 | key_type && |
+| stl.h:490:36:490:46 | try_emplace | 1 | key_type && |
+| stl.h:490:36:490:46 | try_emplace | 2 | func:0 && |
+| stl.h:490:36:490:46 | try_emplace | 2 | func:0 && |
+| stl.h:492:42:492:57 | insert_or_assign | 0 | class:0 && |
+| stl.h:492:42:492:57 | insert_or_assign | 0 | key_type && |
+| stl.h:492:42:492:57 | insert_or_assign | 1 | func:0 && |
+| stl.h:494:30:494:45 | insert_or_assign | 0 | const_iterator |
+| stl.h:494:30:494:45 | insert_or_assign | 1 | class:0 && |
+| stl.h:494:30:494:45 | insert_or_assign | 1 | key_type && |
+| stl.h:494:30:494:45 | insert_or_assign | 2 | func:0 && |
+| stl.h:496:12:496:16 | erase | 0 | iterator |
+| stl.h:499:8:499:11 | swap | 0 | map & |
+| stl.h:502:27:502:31 | merge | 0 | map & |
+| stl.h:505:12:505:15 | find | 0 | const class:0 & |
+| stl.h:505:12:505:15 | find | 0 | const key_type & |
+| stl.h:508:12:508:22 | lower_bound | 0 | const class:0 & |
+| stl.h:508:12:508:22 | lower_bound | 0 | const key_type & |
+| stl.h:510:12:510:22 | upper_bound | 0 | const class:0 & |
+| stl.h:510:12:510:22 | upper_bound | 0 | const key_type & |
+| stl.h:513:28:513:38 | equal_range | 0 | const class:0 & |
+| stl.h:513:28:513:38 | equal_range | 0 | const key_type & |
+| stl.h:530:3:530:15 | unordered_map | 0 | const unordered_map & |
+| stl.h:530:3:530:15 | unordered_map | 0 | const unordered_map & |
+| stl.h:534:18:534:26 | operator= | 0 | const unordered_map & |
+| stl.h:543:16:543:25 | operator[] | 0 | class:0 && |
+| stl.h:543:16:543:25 | operator[] | 0 | class:0 && |
+| stl.h:543:16:543:25 | operator[] | 0 | key_type && |
+| stl.h:543:16:543:25 | operator[] | 0 | key_type && |
+| stl.h:544:16:544:17 | at | 0 | const class:0 & |
+| stl.h:544:16:544:17 | at | 0 | const key_type & |
+| stl.h:547:48:547:54 | emplace | 0 | func:0 && |
+| stl.h:547:48:547:54 | emplace | 0 | func:0 && |
+| stl.h:547:48:547:54 | emplace | 0 | func:0 && |
+| stl.h:547:48:547:54 | emplace | 0 | func:0 && |
+| stl.h:547:48:547:54 | emplace | 0 | func:0 && |
+| stl.h:548:36:548:47 | emplace_hint | 0 | const_iterator |
+| stl.h:548:36:548:47 | emplace_hint | 0 | const_iterator |
+| stl.h:548:36:548:47 | emplace_hint | 1 | func:0 && |
+| stl.h:548:36:548:47 | emplace_hint | 1 | func:0 && |
+| stl.h:551:24:551:29 | insert | 0 | value_type && |
+| stl.h:553:12:553:17 | insert | 0 | const_iterator |
+| stl.h:553:12:553:17 | insert | 1 | value_type && |
+| stl.h:556:48:556:58 | try_emplace | 0 | class:0 && |
+| stl.h:556:48:556:58 | try_emplace | 0 | class:0 && |
+| stl.h:556:48:556:58 | try_emplace | 0 | class:0 && |
+| stl.h:556:48:556:58 | try_emplace | 0 | key_type && |
+| stl.h:556:48:556:58 | try_emplace | 0 | key_type && |
+| stl.h:556:48:556:58 | try_emplace | 0 | key_type && |
+| stl.h:556:48:556:58 | try_emplace | 1 | func:0 && |
+| stl.h:556:48:556:58 | try_emplace | 1 | func:0 && |
+| stl.h:556:48:556:58 | try_emplace | 1 | func:0 && |
+| stl.h:558:36:558:46 | try_emplace | 0 | const_iterator |
+| stl.h:558:36:558:46 | try_emplace | 0 | const_iterator |
+| stl.h:558:36:558:46 | try_emplace | 1 | class:0 && |
+| stl.h:558:36:558:46 | try_emplace | 1 | class:0 && |
+| stl.h:558:36:558:46 | try_emplace | 1 | key_type && |
+| stl.h:558:36:558:46 | try_emplace | 1 | key_type && |
+| stl.h:558:36:558:46 | try_emplace | 2 | func:0 && |
+| stl.h:558:36:558:46 | try_emplace | 2 | func:0 && |
+| stl.h:560:42:560:57 | insert_or_assign | 0 | class:0 && |
+| stl.h:560:42:560:57 | insert_or_assign | 0 | key_type && |
+| stl.h:560:42:560:57 | insert_or_assign | 1 | func:0 && |
+| stl.h:562:30:562:45 | insert_or_assign | 0 | const_iterator |
+| stl.h:562:30:562:45 | insert_or_assign | 1 | class:0 && |
+| stl.h:562:30:562:45 | insert_or_assign | 1 | key_type && |
+| stl.h:562:30:562:45 | insert_or_assign | 2 | func:0 && |
+| stl.h:564:12:564:16 | erase | 0 | iterator |
+| stl.h:567:8:567:11 | swap | 0 | unordered_map & |
+| stl.h:570:37:570:41 | merge | 0 | unordered_map & |
+| stl.h:573:12:573:15 | find | 0 | const class:0 & |
+| stl.h:573:12:573:15 | find | 0 | const key_type & |
+| stl.h:576:28:576:38 | equal_range | 0 | const class:0 & |
+| stl.h:576:28:576:38 | equal_range | 0 | const key_type & |
+| stl.h:595:3:595:5 | set | 0 | const set & |
+| stl.h:597:33:597:35 | set | 0 | func:0 |
+| stl.h:597:33:597:35 | set | 1 | func:0 |
+| stl.h:600:8:600:16 | operator= | 0 | const set & |
+| stl.h:608:48:608:54 | emplace | 0 | func:0 && |
+| stl.h:608:48:608:54 | emplace | 0 | func:0 && |
+| stl.h:609:36:609:47 | emplace_hint | 0 | const_iterator |
+| stl.h:609:36:609:47 | emplace_hint | 0 | const_iterator |
+| stl.h:609:36:609:47 | emplace_hint | 1 | func:0 && |
+| stl.h:609:36:609:47 | emplace_hint | 1 | func:0 && |
+| stl.h:611:23:611:28 | insert | 0 | class:0 && |
+| stl.h:611:23:611:28 | insert | 0 | value_type && |
+| stl.h:613:12:613:17 | insert | 0 | const_iterator |
+| stl.h:613:12:613:17 | insert | 1 | class:0 && |
+| stl.h:613:12:613:17 | insert | 1 | value_type && |
+| stl.h:614:38:614:43 | insert | 0 | func:0 |
+| stl.h:614:38:614:43 | insert | 1 | func:0 |
+| stl.h:616:12:616:16 | erase | 0 | iterator |
+| stl.h:619:8:619:11 | swap | 0 | set & |
+| stl.h:622:27:622:31 | merge | 0 | set & |
+| stl.h:625:12:625:15 | find | 0 | const class:0 & |
+| stl.h:625:12:625:15 | find | 0 | const key_type & |
+| stl.h:628:12:628:22 | lower_bound | 0 | const class:0 & |
+| stl.h:628:12:628:22 | lower_bound | 0 | const key_type & |
+| stl.h:630:12:630:22 | upper_bound | 0 | const class:0 & |
+| stl.h:630:12:630:22 | upper_bound | 0 | const key_type & |
+| stl.h:632:28:632:38 | equal_range | 0 | const class:0 & |
+| stl.h:632:28:632:38 | equal_range | 0 | const key_type & |
+| stl.h:649:3:649:15 | unordered_set | 0 | const unordered_set & |
+| stl.h:651:33:651:45 | unordered_set | 0 | func:0 |
+| stl.h:651:33:651:45 | unordered_set | 1 | func:0 |
+| stl.h:651:33:651:45 | unordered_set | 2 | decltype(...) |
+| stl.h:651:33:651:45 | unordered_set | 2 | size_type |
+| stl.h:654:18:654:26 | operator= | 0 | const unordered_set & |
+| stl.h:662:48:662:54 | emplace | 0 | func:0 && |
+| stl.h:662:48:662:54 | emplace | 0 | func:0 && |
+| stl.h:663:36:663:47 | emplace_hint | 0 | const_iterator |
+| stl.h:663:36:663:47 | emplace_hint | 0 | const_iterator |
+| stl.h:663:36:663:47 | emplace_hint | 1 | func:0 && |
+| stl.h:663:36:663:47 | emplace_hint | 1 | func:0 && |
+| stl.h:665:24:665:29 | insert | 0 | class:0 && |
+| stl.h:665:24:665:29 | insert | 0 | value_type && |
+| stl.h:667:12:667:17 | insert | 0 | const_iterator |
+| stl.h:667:12:667:17 | insert | 1 | class:0 && |
+| stl.h:667:12:667:17 | insert | 1 | value_type && |
+| stl.h:668:38:668:43 | insert | 0 | func:0 |
+| stl.h:668:38:668:43 | insert | 1 | func:0 |
+| stl.h:670:12:670:16 | erase | 0 | iterator |
+| stl.h:673:8:673:11 | swap | 0 | unordered_set & |
+| stl.h:676:37:676:41 | merge | 0 | unordered_set & |
+| stl.h:679:12:679:15 | find | 0 | const class:0 & |
+| stl.h:679:12:679:15 | find | 0 | const key_type & |
+| stl.h:681:28:681:38 | equal_range | 0 | const class:0 & |
+| stl.h:681:28:681:38 | equal_range | 0 | const key_type & |
+| stl.h:696:3:696:19 | basic_string_view | 0 | const basic_string_view & |
+| stl.h:698:3:698:19 | basic_string_view | 0 | const class:0 * |
+| stl.h:699:33:699:49 | basic_string_view | 0 | func:0 |
+| stl.h:699:33:699:49 | basic_string_view | 0 | func:0 |
+| stl.h:699:33:699:49 | basic_string_view | 0 | func:0 |
+| stl.h:699:33:699:49 | basic_string_view | 0 | func:0 |
+| stl.h:699:33:699:49 | basic_string_view | 1 | func:1 |
+| stl.h:699:33:699:49 | basic_string_view | 1 | func:1 |
+| stl.h:699:33:699:49 | basic_string_view | 1 | func:1 |
+| stl.h:699:33:699:49 | basic_string_view | 1 | func:1 |
+| stl.h:701:12:701:28 | basic_string_view | 0 | func:0 && |
+| stl.h:701:12:701:28 | basic_string_view | 0 | func:0 && |
+| stl.h:702:22:702:30 | operator= | 0 | const basic_string_view & |
+| stl.h:708:16:708:25 | operator[] | 0 | decltype(...) |
+| stl.h:708:16:708:25 | operator[] | 0 | size_type |
+| stl.h:709:16:709:17 | at | 0 | decltype(...) |
+| stl.h:709:16:709:17 | at | 0 | size_type |
+| stl.h:713:8:713:20 | remove_prefix | 0 | decltype(...) |
+| stl.h:713:8:713:20 | remove_prefix | 0 | size_type |
+| stl.h:714:8:714:20 | remove_suffix | 0 | decltype(...) |
+| stl.h:714:8:714:20 | remove_suffix | 0 | size_type |
+| stl.h:715:8:715:11 | swap | 0 | basic_string_view & |
+| stl.h:716:13:716:16 | copy | 0 | class:0 * |
+| stl.h:716:13:716:16 | copy | 1 | decltype(...) |
+| stl.h:716:13:716:16 | copy | 1 | size_type |
+| stl.h:716:13:716:16 | copy | 2 | decltype(...) |
+| stl.h:716:13:716:16 | copy | 2 | size_type |
+| stl.h:717:21:717:26 | substr | 0 | decltype(...) |
+| stl.h:717:21:717:26 | substr | 0 | size_type |
+| stl.h:717:21:717:26 | substr | 1 | decltype(...) |
+| stl.h:717:21:717:26 | substr | 1 | size_type |
+| stl.h:718:21:718:27 | subview | 0 | decltype(...) |
+| stl.h:718:21:718:27 | subview | 0 | size_type |
+| stl.h:718:21:718:27 | subview | 1 | decltype(...) |
+| stl.h:718:21:718:27 | subview | 1 | size_type |
+| stl.h:740:21:740:39 | basic_format_string | 0 | const func:0 & |
+| stl.h:740:21:740:39 | basic_format_string | 0 | const func:0 & |
+| stl.h:747:33:747:38 | format | 0 | format_string |
+| stl.h:747:33:747:38 | format | 0 | format_string |
+| stl.h:747:33:747:38 | format | 1 | func:0 && |
+| stl.h:747:33:747:38 | format | 1 | func:0 && |
+| stl.h:752:6:752:48 | same_signature_as_format_but_different_name | 0 | format_string |
+| stl.h:752:6:752:48 | same_signature_as_format_but_different_name | 1 | func:0 && |
+| stl.h:756:8:756:8 | operator= | 0 | const thread & |
+| stl.h:756:8:756:8 | thread | 0 | const thread & |
+| stl.h:759:12:759:17 | thread | 0 | func:0 && |
+| stl.h:759:12:759:17 | thread | 0 | func:0 && |
+| stl.h:759:12:759:17 | thread | 0 | func:0 && |
+| stl.h:759:12:759:17 | thread | 0 | func:0 && |
+| stl.h:759:12:759:17 | thread | 1 | func:1 && |
+| stl.h:759:12:759:17 | thread | 1 | func:1 && |
+| stl.h:759:12:759:17 | thread | 1 | func:1 && |
+| stl.h:759:12:759:17 | thread | 1 | func:1 && |
 | string.cpp:17:6:17:9 | sink | 0 | const char * |
 | string.cpp:18:6:18:9 | sink | 0 | const string & |
 | string.cpp:19:6:19:9 | sink | 0 | const char * |
 | string.cpp:19:6:19:9 | sink | 1 | const char * |
 | string.cpp:20:6:20:9 | sink | 0 | char |
 | string.cpp:21:6:21:9 | sink | 0 | iterator |
+| string.cpp:22:6:22:9 | sink | 0 | string_view |
+| string.cpp:592:8:592:8 | operator= | 0 | Iterator && |
+| string.cpp:592:8:592:8 | operator= | 0 | const Iterator & |
+| string.cpp:597:9:597:9 | operator= | 0 | Range && |
+| string.cpp:597:9:597:9 | operator= | 0 | const Range & |
 | stringstream.cpp:13:6:13:9 | sink | 0 | int |
 | stringstream.cpp:15:6:15:9 | sink | 0 | const string & |
 | stringstream.cpp:18:6:18:9 | sink | 0 | const basic_ostream> & |
@@ -28164,9 +28329,9 @@ getParameterTypeName
 | thread.cpp:14:6:14:22 | thread_function_2 | 0 | S |
 | thread.cpp:18:6:18:22 | thread_function_3 | 0 | S * |
 | thread.cpp:18:6:18:22 | thread_function_3 | 1 | int |
-| thread.cpp:30:18:30:18 | (unnamed constructor) | 0 | const lambda [] type at line 762, col. 18 & |
-| thread.cpp:30:18:30:18 | (unnamed constructor) | 0 | lambda [] type at line 762, col. 18 && |
-| thread.cpp:30:18:30:18 | operator= | 0 | const lambda [] type at line 762, col. 18 & |
+| thread.cpp:30:18:30:18 | (unnamed constructor) | 0 | const lambda [] type at line 841, col. 18 & |
+| thread.cpp:30:18:30:18 | (unnamed constructor) | 0 | lambda [] type at line 841, col. 18 && |
+| thread.cpp:30:18:30:18 | operator= | 0 | const lambda [] type at line 841, col. 18 & |
 | thread.cpp:30:20:30:20 | _FUN | 0 | S * |
 | thread.cpp:30:20:30:20 | operator() | 0 | S * |
 | vector.cpp:13:6:13:9 | sink | 0 | int |
@@ -28176,6 +28341,7 @@ getParameterTypeName
 | vector.cpp:37:6:37:23 | test_element_taint | 0 | int |
 | vector.cpp:145:8:145:8 | operator= | 0 | MyPair && |
 | vector.cpp:145:8:145:8 | operator= | 0 | const MyPair & |
+| vector.cpp:150:8:150:8 | MyVectorContainer | 0 | MyVectorContainer && |
 | vector.cpp:150:8:150:8 | MyVectorContainer | 0 | const MyVectorContainer & |
 | vector.cpp:150:8:150:8 | operator= | 0 | MyVectorContainer && |
 | vector.cpp:150:8:150:8 | operator= | 0 | const MyVectorContainer & |
@@ -28191,8 +28357,8 @@ getParameterTypeName
 | vector.cpp:417:6:417:25 | test_vector_inserter | 0 | char * |
 | vector.cpp:454:7:454:12 | memcpy | 0 | void * |
 | vector.cpp:454:7:454:12 | memcpy | 1 | const void * |
+| vector.cpp:454:7:454:12 | memcpy | 2 | decltype(...) |
 | vector.cpp:454:7:454:12 | memcpy | 2 | size_t |
-| vector.cpp:454:7:454:12 | memcpy | 2 | unsigned long |
 | vector.cpp:461:6:461:9 | sink | 0 | vector> & |
 | vector.cpp:462:6:462:9 | sink | 0 | string & |
 | zmq.cpp:9:8:9:8 | operator= | 0 | const zmq_msg_t & |
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/type_traits.h b/cpp/ql/test/library-tests/dataflow/taint-tests/type_traits.h
index 448b6e85acb9..e69de29bb2d1 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/type_traits.h
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/type_traits.h
@@ -1,35 +0,0 @@
-template<class T>
-struct remove_const { typedef T type; };
-
-template<class T>
-struct remove_const<const T> { typedef T type; };
-
-// `remove_const_t<T>` removes any `const` specifier from `T`
-template<class T>
-using remove_const_t = typename remove_const<T>::type;
-
-template<class T>
-struct remove_reference { typedef T type; };
-
-template<class T>
-struct remove_reference<T &> { typedef T type; };
-
-template<class T>
-struct remove_reference<T &&> { typedef T type; };
-
-// `remove_reference_t<T>` removes any `&` from `T`
-template<class T>
-using remove_reference_t = typename remove_reference<T>::type;
-
-template<class T>
-struct decay_impl {
-    typedef T type;
-};
-
-template<class T, size_t t_size>
-struct decay_impl<T[t_size]> {
-    typedef T* type;
-};
-
-template<class T>
-using decay_t = typename decay_impl<remove_reference_t<T>>::type;
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
index f8a9e70fec7c..a1f9668c9339 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -4304,6 +4304,89 @@ destructors_for_temps.cpp:
 #  103|             Type = [IntType] int
 #  103|             ValueCategory = prvalue
 #  104|     getStmt(1): [ReturnStmt] return ...
+#  106| [CopyAssignmentOperator] ClassWithArrayAndDestructor& ClassWithArrayAndDestructor::operator=(ClassWithArrayAndDestructor const&)
+#  106|   <params>: 
+#-----|     getParameter(0): [Parameter] (unnamed parameter 0)
+#-----|         Type = [LValueReferenceType] const ClassWithArrayAndDestructor &
+#  106| [Constructor] void ClassWithArrayAndDestructor::ClassWithArrayAndDestructor()
+#  106|   <params>: 
+#  106| [Destructor] void ClassWithArrayAndDestructor::~ClassWithArrayAndDestructor()
+#  106|   <params>: 
+#  108| [TopLevelFunction] void temp_test13(bool)
+#  108|   <params>: 
+#  108|     getParameter(0): [Parameter] b
+#  108|         Type = [BoolType] bool
+#  108|   getEntryPoint(): [BlockStmt] { ... }
+#  109|     getStmt(0): [DeclStmt] declaration
+#  109|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of t
+#  109|           Type = [LValueReferenceType] const int &
+#  109|         getVariable().getInitializer(): [Initializer] initializer for t
+#  109|           getExpr(): [ConditionalExpr] ... ? ... : ...
+#  109|               Type = [IntType] int
+#  109|               ValueCategory = lvalue
+#  109|             getCondition(): [VariableAccess] b
+#  109|                 Type = [BoolType] bool
+#  109|                 ValueCategory = prvalue(load)
+#  109|             getThen(): [ArrayExpr] access to array
+#  109|                 Type = [IntType] int
+#  109|                 ValueCategory = lvalue
+#  109|               getArrayBase(): [ValueFieldAccess] a
+#  109|                   Type = [ArrayType] int[2]
+#  109|                   ValueCategory = prvalue
+#  109|                 getQualifier(): [Literal] 0
+#  109|                     Type = [Struct] ClassWithArrayAndDestructor
+#  109|                     Value = [Literal] 0
+#  109|                     ValueCategory = prvalue
+#  109|                 getQualifier().getFullyConverted(): [TemporaryObjectExpr] temporary object
+#  109|                     Type = [Struct] ClassWithArrayAndDestructor
+#  109|                     ValueCategory = prvalue(load)
+#  109|               getArrayOffset(): [Literal] 0
+#  109|                   Type = [IntType] int
+#  109|                   Value = [Literal] 0
+#  109|                   ValueCategory = prvalue
+#  109|               getArrayBase().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+#  109|                   Type = [IntPointerType] int *
+#  109|                   ValueCategory = prvalue
+#  109|             getElse(): [ArrayExpr] access to array
+#  109|                 Type = [IntType] int
+#  109|                 ValueCategory = lvalue
+#  109|               getArrayBase(): [ValueFieldAccess] a
+#  109|                   Type = [ArrayType] int[2]
+#  109|                   ValueCategory = prvalue
+#  109|                 getQualifier(): [Literal] 0
+#  109|                     Type = [Struct] ClassWithArrayAndDestructor
+#  109|                     Value = [Literal] 0
+#  109|                     ValueCategory = prvalue
+#  109|                 getQualifier().getFullyConverted(): [TemporaryObjectExpr] temporary object
+#  109|                     Type = [Struct] ClassWithArrayAndDestructor
+#  109|                     ValueCategory = prvalue(load)
+#  109|               getArrayOffset(): [Literal] 1
+#  109|                   Type = [IntType] int
+#  109|                   Value = [Literal] 1
+#  109|                   ValueCategory = prvalue
+#  109|               getArrayBase().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+#  109|                   Type = [IntPointerType] int *
+#  109|                   ValueCategory = prvalue
+#  109|           getExpr().getFullyConverted(): [ReferenceToExpr] (reference to)
+#  109|               Type = [LValueReferenceType] const int &
+#  109|               ValueCategory = prvalue
+#  109|             getExpr(): [CStyleCast] (const int)...
+#  109|                 Conversion = [GlvalueConversion] glvalue conversion
+#  109|                 Type = [SpecifiedType] const int
+#  109|                 ValueCategory = lvalue
+#  110|     getStmt(1): [ReturnStmt] return ...
+#  111|       getImplicitDestructorCall(0): [DestructorCall] call to ~ClassWithArrayAndDestructor
+#  111|           Type = [VoidType] void
+#  111|           ValueCategory = prvalue
+#  111|         getQualifier(): [ReuseExpr] reuse of temporary object
+#  111|             Type = [Struct] ClassWithArrayAndDestructor
+#  111|             ValueCategory = xvalue
+#  111|       getImplicitDestructorCall(1): [DestructorCall] call to ~ClassWithArrayAndDestructor
+#  111|           Type = [VoidType] void
+#  111|           ValueCategory = prvalue
+#  111|         getQualifier(): [ReuseExpr] reuse of temporary object
+#  111|             Type = [Struct] ClassWithArrayAndDestructor
+#  111|             ValueCategory = xvalue
 generic.c:
 #    1| [TopLevelFunction] void c11_generic_test_with_load(unsigned int, int)
 #    1|   <params>: 
@@ -14999,6 +15082,9 @@ ir.cpp:
 # 1476|               getQualifier(): [FunctionCall] call to returnValue
 # 1476|                   Type = [Struct] UnusualFields
 # 1476|                   ValueCategory = prvalue
+#-----|               getQualifier().getFullyConverted(): [TemporaryObjectExpr] temporary object
+#-----|                   Type = [Struct] UnusualFields
+#-----|                   ValueCategory = prvalue(load)
 # 1476|             getArrayOffset(): [Literal] 3
 # 1476|                 Type = [IntType] int
 # 1476|                 Value = [Literal] 3
@@ -25804,6 +25890,30 @@ ir.cpp:
 # 2919|         Conversion = [FloatingPointToIntegralConversion] floating point to integral conversion
 # 2919|         Type = [IntType] int
 # 2919|         ValueCategory = prvalue
+# 2921| [CopyAssignmentOperator] PointerWrapper& PointerWrapper::operator=(PointerWrapper const&)
+# 2921|   <params>: 
+#-----|     getParameter(0): [Parameter] (unnamed parameter 0)
+#-----|         Type = [LValueReferenceType] const PointerWrapper &
+# 2921| [MoveAssignmentOperator] PointerWrapper& PointerWrapper::operator=(PointerWrapper&&)
+# 2921|   <params>: 
+#-----|     getParameter(0): [Parameter] (unnamed parameter 0)
+#-----|         Type = [RValueReferenceType] PointerWrapper &&
+# 2925| [TopLevelFunction] PointerWrapper get_wrapper()
+# 2925|   <params>: 
+# 2927| [TopLevelFunction] void test()
+# 2927|   <params>: 
+# 2927|   getEntryPoint(): [BlockStmt] { ... }
+# 2928|     getStmt(0): [ExprStmt] ExprStmt
+# 2928|       getExpr(): [ValueFieldAccess] x
+# 2928|           Type = [IntType] int
+# 2928|           ValueCategory = prvalue
+# 2928|         getQualifier(): [ValueFieldAccess] point
+# 2928|             Type = [Struct] Point
+# 2928|             ValueCategory = prvalue
+# 2928|           getQualifier(): [FunctionCall] call to get_wrapper
+# 2928|               Type = [Struct] PointerWrapper
+# 2928|               ValueCategory = prvalue
+# 2929|     getStmt(1): [ReturnStmt] return ...
 ir23.cpp:
 #    1| [TopLevelFunction] bool consteval_1()
 #    1|   <params>: 
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
index 96035c165331..3e7afc7ed5ed 100644
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
@@ -3280,6 +3280,57 @@ destructors_for_temps.cpp:
 #  102|     v102_9(void)                         = AliasedUse                               : ~m103_26
 #  102|     v102_10(void)                        = ExitFunction                             : 
 
+#  108| void temp_test13(bool)
+#  108|   Block 0
+#  108|     v108_1(void)         = EnterFunction          : 
+#  108|     m108_2(unknown)      = AliasedDefinition      : 
+#  108|     m108_3(unknown)      = InitializeNonLocal     : 
+#  108|     m108_4(unknown)      = Chi                    : total:m108_2, partial:m108_3
+#  108|     r108_5(glval<bool>)  = VariableAddress[b]     : 
+#  108|     m108_6(bool)         = InitializeParameter[b] : &:r108_5
+#  109|     r109_1(glval<int &>) = VariableAddress[t]     : 
+#  109|     r109_2(glval<bool>)  = VariableAddress[b]     : 
+#  109|     r109_3(bool)         = Load[b]                : &:r109_2, m108_6
+#  109|     v109_4(void)         = ConditionalBranch      : r109_3
+#-----|   False -> Block 3
+#-----|   True -> Block 2
+
+#  109|   Block 1
+#  109|     m109_5(glval<int>)     = Phi                          : from 2:m109_19, from 3:m109_28
+#  109|     r109_6(glval<unknown>) = VariableAddress[#temp109:18] : 
+#  109|     r109_7(glval<int>)     = Load[#temp109:18]            : &:r109_6, m109_5
+#  109|     r109_8(glval<int>)     = Convert                      : r109_7
+#  109|     r109_9(int &)          = CopyValue                    : r109_8
+#  109|     m109_10(int &)         = Store[t]                     : &:r109_1, r109_9
+#  110|     v110_1(void)           = NoOp                         : 
+#  108|     v108_7(void)           = ReturnVoid                   : 
+#  108|     v108_8(void)           = AliasedUse                   : m108_3
+#  108|     v108_9(void)           = ExitFunction                 : 
+
+#  109|   Block 2
+#  109|     r109_11(glval<ClassWithArrayAndDestructor>) = VariableAddress[#temp109:22] : 
+#  109|     r109_12(ClassWithArrayAndDestructor)        = Constant[0]                  : 
+#  109|     m109_13(ClassWithArrayAndDestructor)        = Store[#temp109:22]           : &:r109_11, r109_12
+#  109|     r109_14(glval<int[2]>)                      = FieldAddress[a]              : r109_11
+#  109|     r109_15(int *)                              = Convert                      : r109_14
+#  109|     r109_16(int)                                = Constant[0]                  : 
+#  109|     r109_17(glval<int>)                         = PointerAdd[4]                : r109_15, r109_16
+#  109|     r109_18(glval<unknown>)                     = VariableAddress[#temp109:18] : 
+#  109|     m109_19(glval<int>)                         = Store[#temp109:18]           : &:r109_18, r109_17
+#-----|   Goto -> Block 1
+
+#  109|   Block 3
+#  109|     r109_20(glval<ClassWithArrayAndDestructor>) = VariableAddress[#temp109:59] : 
+#  109|     r109_21(ClassWithArrayAndDestructor)        = Constant[0]                  : 
+#  109|     m109_22(ClassWithArrayAndDestructor)        = Store[#temp109:59]           : &:r109_20, r109_21
+#  109|     r109_23(glval<int[2]>)                      = FieldAddress[a]              : r109_20
+#  109|     r109_24(int *)                              = Convert                      : r109_23
+#  109|     r109_25(int)                                = Constant[1]                  : 
+#  109|     r109_26(glval<int>)                         = PointerAdd[4]                : r109_24, r109_25
+#  109|     r109_27(glval<unknown>)                     = VariableAddress[#temp109:18] : 
+#  109|     m109_28(glval<int>)                         = Store[#temp109:18]           : &:r109_27, r109_26
+#-----|   Goto -> Block 1
+
 generic.c:
 #    1| void c11_generic_test_with_load(unsigned int, int)
 #    1|   Block 0
@@ -12128,19 +12179,19 @@ ir.cpp:
 # 1474|     r1474_10(int)                 = Load[?]                       : &:r1474_9, ~m1474_5
 # 1474|     m1474_11(int)                 = Store[x]                      : &:r1474_1, r1474_10
 # 1476|     r1476_1(glval<float &>)       = VariableAddress[rf]           : 
+#-----|     r0_1(glval<UnusualFields>)    = VariableAddress[#temp0:0]     : 
 # 1476|     r1476_2(glval<unknown>)       = FunctionAddress[returnValue]  : 
 # 1476|     r1476_3(UnusualFields)        = Call[returnValue]             : func:r1476_2
 # 1476|     m1476_4(unknown)              = ^CallSideEffect               : ~m1474_5
 # 1476|     m1476_5(unknown)              = Chi                           : total:m1474_5, partial:m1476_4
-# 1476|     r1476_6(glval<UnusualFields>) = VariableAddress[#temp1476:23] : 
-# 1476|     m1476_7(UnusualFields)        = Store[#temp1476:23]           : &:r1476_6, r1476_3
-# 1476|     r1476_8(glval<float[10]>)     = FieldAddress[a]               : r1476_6
-# 1476|     r1476_9(float *)              = Convert                       : r1476_8
-# 1476|     r1476_10(int)                 = Constant[3]                   : 
-# 1476|     r1476_11(glval<float>)        = PointerAdd[4]                 : r1476_9, r1476_10
-# 1476|     r1476_12(glval<float>)        = Convert                       : r1476_11
-# 1476|     r1476_13(float &)             = CopyValue                     : r1476_12
-# 1476|     m1476_14(float &)             = Store[rf]                     : &:r1476_1, r1476_13
+# 1476|     m1476_6(UnusualFields)        = Store[#temp0:0]               : &:r0_1, r1476_3
+# 1476|     r1476_7(glval<float[10]>)     = FieldAddress[a]               : r0_1
+# 1476|     r1476_8(float *)              = Convert                       : r1476_7
+# 1476|     r1476_9(int)                  = Constant[3]                   : 
+# 1476|     r1476_10(glval<float>)        = PointerAdd[4]                 : r1476_8, r1476_9
+# 1476|     r1476_11(glval<float>)        = Convert                       : r1476_10
+# 1476|     r1476_12(float &)             = CopyValue                     : r1476_11
+# 1476|     m1476_13(float &)             = Store[rf]                     : &:r1476_1, r1476_12
 # 1477|     r1477_1(glval<float>)         = VariableAddress[f]            : 
 # 1477|     r1477_2(glval<unknown>)       = FunctionAddress[returnValue]  : 
 # 1477|     r1477_3(UnusualFields)        = Call[returnValue]             : func:r1477_2
@@ -21772,6 +21823,26 @@ ir.cpp:
 # 2919|     v2919_13(void)          = AliasedUse                               : ~m2919_11
 # 2919|     v2919_14(void)          = ExitFunction                             : 
 
+# 2927| void test()
+# 2927|   Block 0
+# 2927|     v2927_1(void)                  = EnterFunction                : 
+# 2927|     m2927_2(unknown)               = AliasedDefinition            : 
+# 2927|     m2927_3(unknown)               = InitializeNonLocal           : 
+# 2927|     m2927_4(unknown)               = Chi                          : total:m2927_2, partial:m2927_3
+# 2928|     r2928_1(glval<unknown>)        = FunctionAddress[get_wrapper] : 
+# 2928|     r2928_2(PointerWrapper)        = Call[get_wrapper]            : func:r2928_1
+# 2928|     m2928_3(unknown)               = ^CallSideEffect              : ~m2927_4
+# 2928|     m2928_4(unknown)               = Chi                          : total:m2927_4, partial:m2928_3
+# 2928|     r2928_5(glval<PointerWrapper>) = VariableAddress[#temp2928:3] : 
+# 2928|     m2928_6(PointerWrapper)        = Store[#temp2928:3]           : &:r2928_5, r2928_2
+# 2928|     r2928_7(glval<Point>)          = FieldAddress[point]          : r2928_5
+# 2928|     r2928_8(glval<int>)            = FieldAddress[x]              : r2928_7
+# 2928|     r2928_9(int)                   = Load[?]                      : &:r2928_8, ~m2928_6
+# 2929|     v2929_1(void)                  = NoOp                         : 
+# 2927|     v2927_5(void)                  = ReturnVoid                   : 
+# 2927|     v2927_6(void)                  = AliasedUse                   : ~m2928_4
+# 2927|     v2927_7(void)                  = ExitFunction                 : 
+
 ir23.cpp:
 #    1| bool consteval_1()
 #    1|   Block 0
diff --git a/cpp/ql/test/library-tests/ir/ir/destructors_for_temps.cpp b/cpp/ql/test/library-tests/ir/ir/destructors_for_temps.cpp
index aefbc27173ac..eaeb222121f0 100644
--- a/cpp/ql/test/library-tests/ir/ir/destructors_for_temps.cpp
+++ b/cpp/ql/test/library-tests/ir/ir/destructors_for_temps.cpp
@@ -101,4 +101,11 @@ void temp_test11() {
 
 void temp_test12(ClassWithDestructor3 x) {
     x.getClassWithDestructor2().get_x() + 5;
+}
+
+struct ClassWithArrayAndDestructor { int a[2]; ~ClassWithArrayAndDestructor(); };
+
+void temp_test13(bool b) {
+  const int &t = b ? ClassWithArrayAndDestructor().a[0] : ClassWithArrayAndDestructor().a[1];
+  return;
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/ir/ir/ir.cpp b/cpp/ql/test/library-tests/ir/ir/ir.cpp
index 1d2d4d5a79e3..7bab60fbb21e 100644
--- a/cpp/ql/test/library-tests/ir/ir/ir.cpp
+++ b/cpp/ql/test/library-tests/ir/ir/ir.cpp
@@ -2918,4 +2918,14 @@ T VariableTemplateFunc(T x) {
 
 int VariableTemplateFuncUse = VariableTemplateFunc(2.3);
 
+struct PointerWrapper {
+  Point point;
+};
+
+PointerWrapper get_wrapper();
+
+void test() {
+  get_wrapper().point.x;
+}
+
 // semmle-extractor-options: -std=c++20 --clang
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
index 05ab6c50d703..7fbcdb9fd2c1 100644
--- a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -2901,6 +2901,55 @@ destructors_for_temps.cpp:
 #  102|     v102_7(void)                         = AliasedUse                               : ~m?
 #  102|     v102_8(void)                         = ExitFunction                             : 
 
+#  108| void temp_test13(bool)
+#  108|   Block 0
+#  108|     v108_1(void)         = EnterFunction          : 
+#  108|     mu108_2(unknown)     = AliasedDefinition      : 
+#  108|     mu108_3(unknown)     = InitializeNonLocal     : 
+#  108|     r108_4(glval<bool>)  = VariableAddress[b]     : 
+#  108|     mu108_5(bool)        = InitializeParameter[b] : &:r108_4
+#  109|     r109_1(glval<int &>) = VariableAddress[t]     : 
+#  109|     r109_2(glval<bool>)  = VariableAddress[b]     : 
+#  109|     r109_3(bool)         = Load[b]                : &:r109_2, ~m?
+#  109|     v109_4(void)         = ConditionalBranch      : r109_3
+#-----|   False -> Block 3
+#-----|   True -> Block 2
+
+#  109|   Block 1
+#  109|     r109_5(glval<unknown>) = VariableAddress[#temp109:18] : 
+#  109|     r109_6(glval<int>)     = Load[#temp109:18]            : &:r109_5, ~m?
+#  109|     r109_7(glval<int>)     = Convert                      : r109_6
+#  109|     r109_8(int &)          = CopyValue                    : r109_7
+#  109|     mu109_9(int &)         = Store[t]                     : &:r109_1, r109_8
+#  110|     v110_1(void)           = NoOp                         : 
+#  108|     v108_6(void)           = ReturnVoid                   : 
+#  108|     v108_7(void)           = AliasedUse                   : ~m?
+#  108|     v108_8(void)           = ExitFunction                 : 
+
+#  109|   Block 2
+#  109|     r109_10(glval<ClassWithArrayAndDestructor>) = VariableAddress[#temp109:22] : 
+#  109|     r109_11(ClassWithArrayAndDestructor)        = Constant[0]                  : 
+#  109|     mu109_12(ClassWithArrayAndDestructor)       = Store[#temp109:22]           : &:r109_10, r109_11
+#  109|     r109_13(glval<int[2]>)                      = FieldAddress[a]              : r109_10
+#  109|     r109_14(int *)                              = Convert                      : r109_13
+#  109|     r109_15(int)                                = Constant[0]                  : 
+#  109|     r109_16(glval<int>)                         = PointerAdd[4]                : r109_14, r109_15
+#  109|     r109_17(glval<unknown>)                     = VariableAddress[#temp109:18] : 
+#  109|     mu109_18(glval<int>)                        = Store[#temp109:18]           : &:r109_17, r109_16
+#-----|   Goto -> Block 1
+
+#  109|   Block 3
+#  109|     r109_19(glval<ClassWithArrayAndDestructor>) = VariableAddress[#temp109:59] : 
+#  109|     r109_20(ClassWithArrayAndDestructor)        = Constant[0]                  : 
+#  109|     mu109_21(ClassWithArrayAndDestructor)       = Store[#temp109:59]           : &:r109_19, r109_20
+#  109|     r109_22(glval<int[2]>)                      = FieldAddress[a]              : r109_19
+#  109|     r109_23(int *)                              = Convert                      : r109_22
+#  109|     r109_24(int)                                = Constant[1]                  : 
+#  109|     r109_25(glval<int>)                         = PointerAdd[4]                : r109_23, r109_24
+#  109|     r109_26(glval<unknown>)                     = VariableAddress[#temp109:18] : 
+#  109|     mu109_27(glval<int>)                        = Store[#temp109:18]           : &:r109_26, r109_25
+#-----|   Goto -> Block 1
+
 generic.c:
 #    1| void c11_generic_test_with_load(unsigned int, int)
 #    1|   Block 0
@@ -11124,18 +11173,18 @@ ir.cpp:
 # 1474|     r1474_9(int)                  = Load[?]                       : &:r1474_8, ~m?
 # 1474|     mu1474_10(int)                = Store[x]                      : &:r1474_1, r1474_9
 # 1476|     r1476_1(glval<float &>)       = VariableAddress[rf]           : 
+#-----|     r0_1(glval<UnusualFields>)    = VariableAddress[#temp0:0]     : 
 # 1476|     r1476_2(glval<unknown>)       = FunctionAddress[returnValue]  : 
 # 1476|     r1476_3(UnusualFields)        = Call[returnValue]             : func:r1476_2
 # 1476|     mu1476_4(unknown)             = ^CallSideEffect               : ~m?
-# 1476|     r1476_5(glval<UnusualFields>) = VariableAddress[#temp1476:23] : 
-# 1476|     mu1476_6(UnusualFields)       = Store[#temp1476:23]           : &:r1476_5, r1476_3
-# 1476|     r1476_7(glval<float[10]>)     = FieldAddress[a]               : r1476_5
-# 1476|     r1476_8(float *)              = Convert                       : r1476_7
-# 1476|     r1476_9(int)                  = Constant[3]                   : 
-# 1476|     r1476_10(glval<float>)        = PointerAdd[4]                 : r1476_8, r1476_9
-# 1476|     r1476_11(glval<float>)        = Convert                       : r1476_10
-# 1476|     r1476_12(float &)             = CopyValue                     : r1476_11
-# 1476|     mu1476_13(float &)            = Store[rf]                     : &:r1476_1, r1476_12
+# 1476|     mu1476_5(UnusualFields)       = Store[#temp0:0]               : &:r0_1, r1476_3
+# 1476|     r1476_6(glval<float[10]>)     = FieldAddress[a]               : r0_1
+# 1476|     r1476_7(float *)              = Convert                       : r1476_6
+# 1476|     r1476_8(int)                  = Constant[3]                   : 
+# 1476|     r1476_9(glval<float>)         = PointerAdd[4]                 : r1476_7, r1476_8
+# 1476|     r1476_10(glval<float>)        = Convert                       : r1476_9
+# 1476|     r1476_11(float &)             = CopyValue                     : r1476_10
+# 1476|     mu1476_12(float &)            = Store[rf]                     : &:r1476_1, r1476_11
 # 1477|     r1477_1(glval<float>)         = VariableAddress[f]            : 
 # 1477|     r1477_2(glval<unknown>)       = FunctionAddress[returnValue]  : 
 # 1477|     r1477_3(UnusualFields)        = Call[returnValue]             : func:r1477_2
@@ -19777,6 +19826,24 @@ ir.cpp:
 # 2919|     v2919_11(void)          = AliasedUse                               : ~m?
 # 2919|     v2919_12(void)          = ExitFunction                             : 
 
+# 2927| void test()
+# 2927|   Block 0
+# 2927|     v2927_1(void)                  = EnterFunction                : 
+# 2927|     mu2927_2(unknown)              = AliasedDefinition            : 
+# 2927|     mu2927_3(unknown)              = InitializeNonLocal           : 
+# 2928|     r2928_1(glval<unknown>)        = FunctionAddress[get_wrapper] : 
+# 2928|     r2928_2(PointerWrapper)        = Call[get_wrapper]            : func:r2928_1
+# 2928|     mu2928_3(unknown)              = ^CallSideEffect              : ~m?
+# 2928|     r2928_4(glval<PointerWrapper>) = VariableAddress[#temp2928:3] : 
+# 2928|     mu2928_5(PointerWrapper)       = Store[#temp2928:3]           : &:r2928_4, r2928_2
+# 2928|     r2928_6(glval<Point>)          = FieldAddress[point]          : r2928_4
+# 2928|     r2928_7(glval<int>)            = FieldAddress[x]              : r2928_6
+# 2928|     r2928_8(int)                   = Load[?]                      : &:r2928_7, ~m?
+# 2929|     v2929_1(void)                  = NoOp                         : 
+# 2927|     v2927_4(void)                  = ReturnVoid                   : 
+# 2927|     v2927_5(void)                  = AliasedUse                   : ~m?
+# 2927|     v2927_6(void)                  = ExitFunction                 : 
+
 ir23.cpp:
 #    1| bool consteval_1()
 #    1|   Block 0
diff --git a/cpp/ql/test/library-tests/preprocessor/macroinvocations/getanaffectedelement.ql b/cpp/ql/test/library-tests/preprocessor/macroinvocations/getanaffectedelement.ql
index 83ab99ccdfd7..a3ff56942431 100644
--- a/cpp/ql/test/library-tests/preprocessor/macroinvocations/getanaffectedelement.ql
+++ b/cpp/ql/test/library-tests/preprocessor/macroinvocations/getanaffectedelement.ql
@@ -14,20 +14,8 @@ predicate reason(MacroInvocation mi, Element e, string reason) {
   mi.getEnclosingFunction() = e and reason = "getEnclosingFunction()"
 }
 
-string reasonspart(MacroInvocation mi, Element e) {
-  reason(mi, e, result)
-  or
-  exists(string a, string b |
-    a = reasonspart(mi, e) and
-    reason(mi, e, b) and
-    not a.splitAt(" ") >= b and
-    result = a + " " + b
-  )
-}
-
 string reasons(MacroInvocation mi, Element e) {
-  result = reasonspart(mi, e) and
-  not reasonspart(mi, e).length() > result.length()
+  result = concat(string reason | reason(mi, e, reason) | reason, " " order by reason)
 }
 
 from MacroInvocation mi, Element e
diff --git a/cpp/ql/test/library-tests/regex/locations.expected b/cpp/ql/test/library-tests/regex/locations.expected
new file mode 100644
index 000000000000..faac1198b943
--- /dev/null
+++ b/cpp/ql/test/library-tests/regex/locations.expected
@@ -0,0 +1,68 @@
+| regexp.cpp:19:19:19:21 | abc | regexp.cpp | 19 | 19 | 19 | 21 |
+| regexp.cpp:22:20:22:26 | a*b+c?d | regexp.cpp | 22 | 20 | 22 | 26 |
+| regexp.cpp:23:20:23:25 | a{4,8} | regexp.cpp | 23 | 20 | 23 | 25 |
+| regexp.cpp:24:20:24:24 | a{3,} | regexp.cpp | 24 | 20 | 24 | 24 |
+| regexp.cpp:25:20:25:23 | a{7} | regexp.cpp | 25 | 20 | 25 | 23 |
+| regexp.cpp:28:19:28:25 | foo\|bar | regexp.cpp | 28 | 19 | 28 | 25 |
+| regexp.cpp:31:19:31:23 | [abc] | regexp.cpp | 31 | 19 | 31 | 23 |
+| regexp.cpp:32:19:32:30 | [a-fA-F0-9_] | regexp.cpp | 32 | 19 | 32 | 30 |
+| regexp.cpp:33:19:33:23 | [\\w]+ | regexp.cpp | 33 | 19 | 33 | 23 |
+| regexp.cpp:34:19:34:27 | \\[\\][123] | regexp.cpp | 34 | 19 | 34 | 27 |
+| regexp.cpp:35:19:35:24 | [^A-Z] | regexp.cpp | 35 | 19 | 35 | 24 |
+| regexp.cpp:36:19:36:21 | []] | regexp.cpp | 36 | 19 | 36 | 21 |
+| regexp.cpp:37:19:37:22 | [^]] | regexp.cpp | 37 | 19 | 37 | 22 |
+| regexp.cpp:38:19:38:22 | [^-] | regexp.cpp | 38 | 19 | 38 | 22 |
+| regexp.cpp:39:19:39:21 | [\|] | regexp.cpp | 39 | 19 | 39 | 21 |
+| regexp.cpp:40:20:40:23 | [\\b] | regexp.cpp | 40 | 20 | 40 | 23 |
+| regexp.cpp:43:22:43:31 | [[a-f]A-F] | regexp.cpp | 43 | 22 | 43 | 31 |
+| regexp.cpp:46:21:46:22 | .* | regexp.cpp | 46 | 21 | 46 | 22 |
+| regexp.cpp:47:21:47:25 | \\w+\\W | regexp.cpp | 47 | 21 | 47 | 25 |
+| regexp.cpp:48:21:48:24 | \\s\\S | regexp.cpp | 48 | 21 | 48 | 24 |
+| regexp.cpp:49:21:49:24 | \\d\\D | regexp.cpp | 49 | 21 | 49 | 24 |
+| regexp.cpp:50:21:50:26 | \\n\\r\\t | regexp.cpp | 50 | 21 | 50 | 26 |
+| regexp.cpp:53:20:53:25 | \\b!a\\B | regexp.cpp | 53 | 20 | 53 | 25 |
+| regexp.cpp:56:20:56:28 | (foo)*bar | regexp.cpp | 56 | 20 | 56 | 28 |
+| regexp.cpp:57:20:57:28 | fo(o\|b)ar | regexp.cpp | 57 | 20 | 57 | 28 |
+| regexp.cpp:58:20:58:28 | (a\|b\|cd)e | regexp.cpp | 58 | 20 | 58 | 28 |
+| regexp.cpp:59:20:59:27 | (?::+)\\w | regexp.cpp | 59 | 20 | 59 | 27 |
+| regexp.cpp:62:21:62:28 | (a+)b+\\1 | regexp.cpp | 62 | 21 | 62 | 28 |
+| regexp.cpp:65:21:65:32 | [[:alnum:]]* | regexp.cpp | 65 | 21 | 65 | 32 |
+| regexp.cpp:66:21:66:32 | [[:digit:]]+ | regexp.cpp | 66 | 21 | 66 | 32 |
+| regexp.cpp:67:21:67:36 | [[:alnum:]]{2,3} | regexp.cpp | 67 | 21 | 67 | 36 |
+| regexp.cpp:68:21:68:35 | [a-f[:digit:]]+ | regexp.cpp | 68 | 21 | 68 | 35 |
+| regexp.cpp:69:21:69:32 | [^[:digit:]] | regexp.cpp | 69 | 21 | 69 | 32 |
+| regexp.cpp:72:22:72:43 | [[:alpha:]][[:digit:]] | regexp.cpp | 72 | 22 | 72 | 43 |
+| regexp.cpp:75:22:75:41 | [[:alpha:][:digit:]] | regexp.cpp | 75 | 22 | 75 | 41 |
+| regexp.cpp:78:22:78:38 | [A-F[:digit:]a-f] | regexp.cpp | 78 | 22 | 78 | 38 |
+| regexp.cpp:81:27:81:33 | [[.a.]] | regexp.cpp | 81 | 27 | 81 | 33 |
+| regexp.cpp:82:27:82:39 | [A-F[.b.]a-f] | regexp.cpp | 82 | 27 | 82 | 39 |
+| regexp.cpp:83:27:83:34 | [[.ch.]] | regexp.cpp | 83 | 27 | 83 | 34 |
+| regexp.cpp:86:28:86:34 | [[=a=]] | regexp.cpp | 86 | 28 | 86 | 34 |
+| regexp.cpp:87:28:87:40 | [A-F[=b=]a-f] | regexp.cpp | 87 | 28 | 87 | 40 |
+| regexp.cpp:90:22:90:30 | [:digit:] | regexp.cpp | 90 | 22 | 90 | 30 |
+| regexp.cpp:93:19:93:24 | \\u0061 | regexp.cpp | 93 | 19 | 93 | 24 |
+| regexp.cpp:96:19:96:22 | \\x61 | regexp.cpp | 96 | 19 | 96 | 22 |
+| regexp.cpp:99:21:99:23 | \\cA | regexp.cpp | 99 | 21 | 99 | 23 |
+| regexp.cpp:100:21:100:25 | [\\cz] | regexp.cpp | 100 | 21 | 100 | 25 |
+| regexp.cpp:103:20:103:21 | \\0 | regexp.cpp | 103 | 20 | 103 | 21 |
+| regexp.cpp:104:20:104:23 | [\\0] | regexp.cpp | 104 | 20 | 104 | 23 |
+| regexp.cpp:107:21:107:23 | a*? | regexp.cpp | 107 | 21 | 107 | 23 |
+| regexp.cpp:108:21:108:23 | b+? | regexp.cpp | 108 | 21 | 108 | 23 |
+| regexp.cpp:109:21:109:23 | c?? | regexp.cpp | 109 | 21 | 109 | 23 |
+| regexp.cpp:110:21:110:27 | d{2,3}? | regexp.cpp | 110 | 21 | 110 | 27 |
+| regexp.cpp:111:18:111:21 | \\f\\v | regexp.cpp | 111 | 18 | 111 | 21 |
+| regexp.cpp:114:25:114:28 | a\\nb | regexp.cpp | 114 | 25 | 114 | 28 |
+| regexp.cpp:115:37:115:40 | a\\nc | regexp.cpp | 115 | 37 | 115 | 40 |
+| regexp.cpp:116:39:116:42 | a\\nc | regexp.cpp | 116 | 39 | 116 | 42 |
+| regexp.cpp:117:38:117:41 | a\\nc | regexp.cpp | 117 | 38 | 117 | 41 |
+| regexp.cpp:118:38:118:41 | a\\nc | regexp.cpp | 118 | 38 | 118 | 41 |
+| regexp.cpp:119:23:119:26 | a\\nc | regexp.cpp | 119 | 23 | 119 | 26 |
+| regexp.cpp:120:26:120:29 | a\\nc | regexp.cpp | 120 | 26 | 120 | 29 |
+| regexp.cpp:121:42:121:45 | a\\nc | regexp.cpp | 121 | 42 | 121 | 45 |
+| regexp.cpp:122:41:122:44 | a\\nc | regexp.cpp | 122 | 41 | 122 | 44 |
+| regexp.cpp:123:41:123:44 | a\\nc | regexp.cpp | 123 | 41 | 123 | 44 |
+| regexp.cpp:124:25:124:28 | a\\nc | regexp.cpp | 124 | 25 | 124 | 28 |
+| regexp.cpp:125:29:125:32 | a\\nc | regexp.cpp | 125 | 29 | 125 | 32 |
+| regexp.cpp:130:29:130:32 | abc1 | regexp.cpp | 130 | 29 | 130 | 32 |
+| regexp.cpp:131:35:131:38 | abc2 | regexp.cpp | 131 | 35 | 131 | 38 |
+| regexp.cpp:132:25:132:30 | xabc3x | regexp.cpp | 132 | 25 | 132 | 30 |
diff --git a/cpp/ql/test/library-tests/regex/locations.ql b/cpp/ql/test/library-tests/regex/locations.ql
new file mode 100644
index 000000000000..0b6e23f2b79a
--- /dev/null
+++ b/cpp/ql/test/library-tests/regex/locations.ql
@@ -0,0 +1,11 @@
+import semmle.code.cpp.regex.internal.ParseRegExp
+import semmle.code.cpp.regex.RegexTreeView
+
+// Stop gap for missing flow configs
+class RegExpTest extends RegExp {
+  RegExpTest() { any() }
+}
+
+from RegExpTerm t, string file, int sl, int sc, int el, int ec
+where t.isRootTerm() and t.hasLocationInfo(file, sl, sc, el, ec)
+select t, file, sl, sc, el, ec
diff --git a/cpp/ql/test/library-tests/regex/parse.expected b/cpp/ql/test/library-tests/regex/parse.expected
new file mode 100644
index 000000000000..35ee14d13119
--- /dev/null
+++ b/cpp/ql/test/library-tests/regex/parse.expected
@@ -0,0 +1,655 @@
+regexp.cpp:
+#   19| [RegExpConstant, RegExpNormalChars] abc
+
+#   22| [RegExpConstant, RegExpNormalChars] a
+
+#   22| [RegExpStar] a*
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+
+#   22| [RegExpSequence] a*b+c?d
+#-----| 0 -> [RegExpStar] a*
+#-----| 1 -> [RegExpPlus] b+
+#-----| 2 -> [RegExpOpt] c?
+#-----| 3 -> [RegExpConstant, RegExpNormalChars] d
+
+#   22| [RegExpConstant, RegExpNormalChars] b
+
+#   22| [RegExpPlus] b+
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] b
+
+#   22| [RegExpConstant, RegExpNormalChars] c
+
+#   22| [RegExpOpt] c?
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] c
+
+#   22| [RegExpConstant, RegExpNormalChars] d
+
+#   23| [RegExpConstant, RegExpNormalChars] a
+
+#   23| [RegExpRange] a{4,8}
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+
+#   24| [RegExpConstant, RegExpNormalChars] a
+
+#   24| [InfiniteRepetitionQuantifier, RegExpRange] a{3,}
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+
+#   25| [RegExpConstant, RegExpNormalChars] a
+
+#   25| [RegExpRange] a{7}
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+
+#   28| [RegExpConstant, RegExpNormalChars] foo
+
+#   28| [RegExpAlt] foo|bar
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] foo
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] bar
+
+#   28| [RegExpConstant, RegExpNormalChars] bar
+
+#   31| [RegExpCharacterClass] [abc]
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] b
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] c
+
+#   31| [RegExpConstant, RegExpNormalChars] a
+
+#   31| [RegExpConstant, RegExpNormalChars] b
+
+#   31| [RegExpConstant, RegExpNormalChars] c
+
+#   32| [RegExpCharacterClass] [a-fA-F0-9_]
+#-----| 0 -> [RegExpCharacterRange] a-f
+#-----| 1 -> [RegExpCharacterRange] A-F
+#-----| 2 -> [RegExpCharacterRange] 0-9
+#-----| 3 -> [RegExpConstant, RegExpNormalChars] _
+
+#   32| [RegExpConstant, RegExpNormalChars] a
+
+#   32| [RegExpCharacterRange] a-f
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] f
+
+#   32| [RegExpConstant, RegExpNormalChars] f
+
+#   32| [RegExpConstant, RegExpNormalChars] A
+
+#   32| [RegExpCharacterRange] A-F
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] A
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] F
+
+#   32| [RegExpConstant, RegExpNormalChars] F
+
+#   32| [RegExpConstant, RegExpNormalChars] 0
+
+#   32| [RegExpCharacterRange] 0-9
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] 0
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] 9
+
+#   32| [RegExpConstant, RegExpNormalChars] 9
+
+#   32| [RegExpConstant, RegExpNormalChars] _
+
+#   33| [RegExpCharacterClass] [\w]
+#-----| 0 -> [RegExpCharacterClassEscape] \w
+
+#   33| [RegExpPlus] [\w]+
+#-----| 0 -> [RegExpCharacterClass] [\w]
+
+#   33| [RegExpCharacterClassEscape] \w
+
+#   34| [RegExpConstant, RegExpEscape] \[
+
+#   34| [RegExpSequence] \[\][123]
+#-----| 0 -> [RegExpConstant, RegExpEscape] \[
+#-----| 1 -> [RegExpConstant, RegExpEscape] \]
+#-----| 2 -> [RegExpCharacterClass] [123]
+
+#   34| [RegExpConstant, RegExpEscape] \]
+
+#   34| [RegExpCharacterClass] [123]
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] 1
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] 2
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] 3
+
+#   34| [RegExpConstant, RegExpNormalChars] 1
+
+#   34| [RegExpConstant, RegExpNormalChars] 2
+
+#   34| [RegExpConstant, RegExpNormalChars] 3
+
+#   35| [RegExpCharacterClass] [^A-Z]
+#-----| 0 -> [RegExpCharacterRange] A-Z
+
+#   35| [RegExpConstant, RegExpNormalChars] A
+
+#   35| [RegExpCharacterRange] A-Z
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] A
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] Z
+
+#   35| [RegExpConstant, RegExpNormalChars] Z
+
+#   36| [RegExpCharacterClass] []]
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] ]
+
+#   36| [RegExpConstant, RegExpNormalChars] ]
+
+#   37| [RegExpCharacterClass] [^]]
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] ]
+
+#   37| [RegExpConstant, RegExpNormalChars] ]
+
+#   38| [RegExpCharacterClass] [^-]
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] -
+
+#   38| [RegExpConstant, RegExpNormalChars] -
+
+#   39| [RegExpCharacterClass] [|]
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] |
+
+#   39| [RegExpConstant, RegExpNormalChars] |
+
+#   40| [RegExpCharacterClass] [\b]
+#-----| 0 -> [RegExpConstant, RegExpEscape] \b
+
+#   40| [RegExpConstant, RegExpEscape] \b
+
+#   43| [RegExpCharacterClass] [[a-f]
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] [
+#-----| 1 -> [RegExpCharacterRange] a-f
+
+#   43| [RegExpSequence] [[a-f]A-F]
+#-----| 0 -> [RegExpCharacterClass] [[a-f]
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] A-F]
+
+#   43| [RegExpConstant, RegExpNormalChars] [
+
+#   43| [RegExpConstant, RegExpNormalChars] a
+
+#   43| [RegExpCharacterRange] a-f
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] f
+
+#   43| [RegExpConstant, RegExpNormalChars] f
+
+#   43| [RegExpConstant, RegExpNormalChars] A-F]
+
+#   46| [RegExpDot] .
+
+#   46| [RegExpStar] .*
+#-----| 0 -> [RegExpDot] .
+
+#   47| [RegExpCharacterClassEscape] \w
+
+#   47| [RegExpPlus] \w+
+#-----| 0 -> [RegExpCharacterClassEscape] \w
+
+#   47| [RegExpSequence] \w+\W
+#-----| 0 -> [RegExpPlus] \w+
+#-----| 1 -> [RegExpCharacterClassEscape] \W
+
+#   47| [RegExpCharacterClassEscape] \W
+
+#   48| [RegExpCharacterClassEscape] \s
+
+#   48| [RegExpSequence] \s\S
+#-----| 0 -> [RegExpCharacterClassEscape] \s
+#-----| 1 -> [RegExpCharacterClassEscape] \S
+
+#   48| [RegExpCharacterClassEscape] \S
+
+#   49| [RegExpCharacterClassEscape] \d
+
+#   49| [RegExpSequence] \d\D
+#-----| 0 -> [RegExpCharacterClassEscape] \d
+#-----| 1 -> [RegExpCharacterClassEscape] \D
+
+#   49| [RegExpCharacterClassEscape] \D
+
+#   50| [RegExpConstant, RegExpEscape] \n
+
+#   50| [RegExpSequence] \n\r\t
+#-----| 0 -> [RegExpConstant, RegExpEscape] \n
+#-----| 1 -> [RegExpConstant, RegExpEscape] \r
+#-----| 2 -> [RegExpConstant, RegExpEscape] \t
+
+#   50| [RegExpConstant, RegExpEscape] \r
+
+#   50| [RegExpConstant, RegExpEscape] \t
+
+#   53| [RegExpSpecialChar] \b
+
+#   53| [RegExpSequence] \b!a\B
+#-----| 0 -> [RegExpSpecialChar] \b
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] !a
+#-----| 2 -> [RegExpNonWordBoundary] \B
+
+#   53| [RegExpConstant, RegExpNormalChars] !a
+
+#   53| [RegExpNonWordBoundary] \B
+
+#   56| [RegExpGroup] (foo)
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] foo
+
+#   56| [RegExpStar] (foo)*
+#-----| 0 -> [RegExpGroup] (foo)
+
+#   56| [RegExpSequence] (foo)*bar
+#-----| 0 -> [RegExpStar] (foo)*
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] bar
+
+#   56| [RegExpConstant, RegExpNormalChars] foo
+
+#   56| [RegExpConstant, RegExpNormalChars] bar
+
+#   57| [RegExpConstant, RegExpNormalChars] fo
+
+#   57| [RegExpSequence] fo(o|b)ar
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] fo
+#-----| 1 -> [RegExpGroup] (o|b)
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] ar
+
+#   57| [RegExpGroup] (o|b)
+#-----| 0 -> [RegExpAlt] o|b
+
+#   57| [RegExpConstant, RegExpNormalChars] o
+
+#   57| [RegExpAlt] o|b
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] o
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] b
+
+#   57| [RegExpConstant, RegExpNormalChars] b
+
+#   57| [RegExpConstant, RegExpNormalChars] ar
+
+#   58| [RegExpGroup] (a|b|cd)
+#-----| 0 -> [RegExpAlt] a|b|cd
+
+#   58| [RegExpSequence] (a|b|cd)e
+#-----| 0 -> [RegExpGroup] (a|b|cd)
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] e
+
+#   58| [RegExpConstant, RegExpNormalChars] a
+
+#   58| [RegExpAlt] a|b|cd
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] b
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] cd
+
+#   58| [RegExpConstant, RegExpNormalChars] b
+
+#   58| [RegExpConstant, RegExpNormalChars] cd
+
+#   58| [RegExpConstant, RegExpNormalChars] e
+
+#   59| [RegExpGroup] (?::+)
+#-----| 0 -> [RegExpPlus] :+
+
+#   59| [RegExpSequence] (?::+)\w
+#-----| 0 -> [RegExpGroup] (?::+)
+#-----| 1 -> [RegExpCharacterClassEscape] \w
+
+#   59| [RegExpConstant, RegExpNormalChars] :
+
+#   59| [RegExpPlus] :+
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] :
+
+#   59| [RegExpCharacterClassEscape] \w
+
+#   62| [RegExpGroup] (a+)
+#-----| 0 -> [RegExpPlus] a+
+
+#   62| [RegExpSequence] (a+)b+\1
+#-----| 0 -> [RegExpGroup] (a+)
+#-----| 1 -> [RegExpPlus] b+
+#-----| 2 -> [RegExpBackRef] \1
+
+#   62| [RegExpConstant, RegExpNormalChars] a
+
+#   62| [RegExpPlus] a+
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+
+#   62| [RegExpConstant, RegExpNormalChars] b
+
+#   62| [RegExpPlus] b+
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] b
+
+#   62| [RegExpBackRef] \1
+
+#   65| [RegExpCharacterClass] [[:alnum:]]
+#-----| 0 -> [RegExpNamedCharacterProperty] [:alnum:]
+
+#   65| [RegExpStar] [[:alnum:]]*
+#-----| 0 -> [RegExpCharacterClass] [[:alnum:]]
+
+#   65| [RegExpNamedCharacterProperty] [:alnum:]
+
+#   66| [RegExpCharacterClass] [[:digit:]]
+#-----| 0 -> [RegExpNamedCharacterProperty] [:digit:]
+
+#   66| [RegExpPlus] [[:digit:]]+
+#-----| 0 -> [RegExpCharacterClass] [[:digit:]]
+
+#   66| [RegExpNamedCharacterProperty] [:digit:]
+
+#   67| [RegExpCharacterClass] [[:alnum:]]
+#-----| 0 -> [RegExpNamedCharacterProperty] [:alnum:]
+
+#   67| [RegExpRange] [[:alnum:]]{2,3}
+#-----| 0 -> [RegExpCharacterClass] [[:alnum:]]
+
+#   67| [RegExpNamedCharacterProperty] [:alnum:]
+
+#   68| [RegExpCharacterClass] [a-f[:digit:]]
+#-----| 0 -> [RegExpCharacterRange] a-f
+#-----| 1 -> [RegExpNamedCharacterProperty] [:digit:]
+
+#   68| [RegExpPlus] [a-f[:digit:]]+
+#-----| 0 -> [RegExpCharacterClass] [a-f[:digit:]]
+
+#   68| [RegExpConstant, RegExpNormalChars] a
+
+#   68| [RegExpCharacterRange] a-f
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] f
+
+#   68| [RegExpConstant, RegExpNormalChars] f
+
+#   68| [RegExpNamedCharacterProperty] [:digit:]
+
+#   69| [RegExpCharacterClass] [^[:digit:]]
+#-----| 0 -> [RegExpNamedCharacterProperty] [:digit:]
+
+#   69| [RegExpNamedCharacterProperty] [:digit:]
+
+#   72| [RegExpCharacterClass] [[:alpha:]]
+#-----| 0 -> [RegExpNamedCharacterProperty] [:alpha:]
+
+#   72| [RegExpSequence] [[:alpha:]][[:digit:]]
+#-----| 0 -> [RegExpCharacterClass] [[:alpha:]]
+#-----| 1 -> [RegExpCharacterClass] [[:digit:]]
+
+#   72| [RegExpNamedCharacterProperty] [:alpha:]
+
+#   72| [RegExpCharacterClass] [[:digit:]]
+#-----| 0 -> [RegExpNamedCharacterProperty] [:digit:]
+
+#   72| [RegExpNamedCharacterProperty] [:digit:]
+
+#   75| [RegExpCharacterClass] [[:alpha:][:digit:]]
+#-----| 0 -> [RegExpNamedCharacterProperty] [:alpha:]
+#-----| 1 -> [RegExpNamedCharacterProperty] [:digit:]
+
+#   75| [RegExpNamedCharacterProperty] [:alpha:]
+
+#   75| [RegExpNamedCharacterProperty] [:digit:]
+
+#   78| [RegExpCharacterClass] [A-F[:digit:]a-f]
+#-----| 0 -> [RegExpCharacterRange] A-F
+#-----| 1 -> [RegExpNamedCharacterProperty] [:digit:]
+#-----| 2 -> [RegExpCharacterRange] a-f
+
+#   78| [RegExpConstant, RegExpNormalChars] A
+
+#   78| [RegExpCharacterRange] A-F
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] A
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] F
+
+#   78| [RegExpConstant, RegExpNormalChars] F
+
+#   78| [RegExpNamedCharacterProperty] [:digit:]
+
+#   78| [RegExpConstant, RegExpNormalChars] a
+
+#   78| [RegExpCharacterRange] a-f
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] f
+
+#   78| [RegExpConstant, RegExpNormalChars] f
+
+#   81| [RegExpCharacterClass] [[.a.]]
+#-----| 0 -> [RegExpNamedCharacterProperty] [.a.]
+
+#   81| [RegExpNamedCharacterProperty] [.a.]
+
+#   82| [RegExpCharacterClass] [A-F[.b.]a-f]
+#-----| 0 -> [RegExpCharacterRange] A-F
+#-----| 1 -> [RegExpNamedCharacterProperty] [.b.]
+#-----| 2 -> [RegExpCharacterRange] a-f
+
+#   82| [RegExpConstant, RegExpNormalChars] A
+
+#   82| [RegExpCharacterRange] A-F
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] A
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] F
+
+#   82| [RegExpConstant, RegExpNormalChars] F
+
+#   82| [RegExpNamedCharacterProperty] [.b.]
+
+#   82| [RegExpConstant, RegExpNormalChars] a
+
+#   82| [RegExpCharacterRange] a-f
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] f
+
+#   82| [RegExpConstant, RegExpNormalChars] f
+
+#   83| [RegExpCharacterClass] [[.ch.]]
+#-----| 0 -> [RegExpNamedCharacterProperty] [.ch.]
+
+#   83| [RegExpNamedCharacterProperty] [.ch.]
+
+#   86| [RegExpCharacterClass] [[=a=]]
+#-----| 0 -> [RegExpNamedCharacterProperty] [=a=]
+
+#   86| [RegExpNamedCharacterProperty] [=a=]
+
+#   87| [RegExpCharacterClass] [A-F[=b=]a-f]
+#-----| 0 -> [RegExpCharacterRange] A-F
+#-----| 1 -> [RegExpNamedCharacterProperty] [=b=]
+#-----| 2 -> [RegExpCharacterRange] a-f
+
+#   87| [RegExpConstant, RegExpNormalChars] A
+
+#   87| [RegExpCharacterRange] A-F
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] A
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] F
+
+#   87| [RegExpConstant, RegExpNormalChars] F
+
+#   87| [RegExpNamedCharacterProperty] [=b=]
+
+#   87| [RegExpConstant, RegExpNormalChars] a
+
+#   87| [RegExpCharacterRange] a-f
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpNormalChars] f
+
+#   87| [RegExpConstant, RegExpNormalChars] f
+
+#   90| [RegExpNamedCharacterProperty] [:digit:]
+
+#   93| [RegExpConstant, RegExpEscape] \u0061
+
+#   96| [RegExpConstant, RegExpEscape] \x61
+
+#   99| [RegExpConstant, RegExpEscape] \cA
+
+#  100| [RegExpCharacterClass] [\cz]
+#-----| 0 -> [RegExpConstant, RegExpEscape] \cz
+
+#  100| [RegExpConstant, RegExpEscape] \cz
+
+#  103| [RegExpConstant, RegExpEscape] \0
+
+#  104| [RegExpCharacterClass] [\0]
+#-----| 0 -> [RegExpConstant, RegExpEscape] \0
+
+#  104| [RegExpConstant, RegExpEscape] \0
+
+#  107| [RegExpConstant, RegExpNormalChars] a
+
+#  107| [RegExpStar] a*?
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+
+#  108| [RegExpConstant, RegExpNormalChars] b
+
+#  108| [RegExpPlus] b+?
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] b
+
+#  109| [RegExpConstant, RegExpNormalChars] c
+
+#  109| [RegExpOpt] c??
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] c
+
+#  110| [RegExpConstant, RegExpNormalChars] d
+
+#  110| [RegExpQuantifier] d{2,3}?
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] d
+
+#  111| [RegExpConstant, RegExpEscape] \f
+
+#  111| [RegExpSequence] \f\v
+#-----| 0 -> [RegExpConstant, RegExpEscape] \f
+#-----| 1 -> [RegExpConstant, RegExpEscape] \v
+
+#  111| [RegExpConstant, RegExpEscape] \v
+
+#  114| [RegExpConstant, RegExpNormalChars] a
+
+#  114| [RegExpSequence] a\nb
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpEscape] \n
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] b
+
+#  114| [RegExpConstant, RegExpEscape] \n
+
+#  114| [RegExpConstant, RegExpNormalChars] b
+
+#  115| [RegExpConstant, RegExpNormalChars] a
+
+#  115| [RegExpSequence] a\nc
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpEscape] \n
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] c
+
+#  115| [RegExpConstant, RegExpEscape] \n
+
+#  115| [RegExpConstant, RegExpNormalChars] c
+
+#  116| [RegExpConstant, RegExpNormalChars] a
+
+#  116| [RegExpSequence] a\nc
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpEscape] \n
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] c
+
+#  116| [RegExpConstant, RegExpEscape] \n
+
+#  116| [RegExpConstant, RegExpNormalChars] c
+
+#  117| [RegExpConstant, RegExpNormalChars] a
+
+#  117| [RegExpSequence] a\nc
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpEscape] \n
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] c
+
+#  117| [RegExpConstant, RegExpEscape] \n
+
+#  117| [RegExpConstant, RegExpNormalChars] c
+
+#  118| [RegExpConstant, RegExpNormalChars] a
+
+#  118| [RegExpSequence] a\nc
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpEscape] \n
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] c
+
+#  118| [RegExpConstant, RegExpEscape] \n
+
+#  118| [RegExpConstant, RegExpNormalChars] c
+
+#  119| [RegExpConstant, RegExpNormalChars] a
+
+#  119| [RegExpSequence] a\nc
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpEscape] \n
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] c
+
+#  119| [RegExpConstant, RegExpEscape] \n
+
+#  119| [RegExpConstant, RegExpNormalChars] c
+
+#  120| [RegExpConstant, RegExpNormalChars] a
+
+#  120| [RegExpSequence] a\nc
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpEscape] \n
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] c
+
+#  120| [RegExpConstant, RegExpEscape] \n
+
+#  120| [RegExpConstant, RegExpNormalChars] c
+
+#  121| [RegExpConstant, RegExpNormalChars] a
+
+#  121| [RegExpSequence] a\nc
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpEscape] \n
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] c
+
+#  121| [RegExpConstant, RegExpEscape] \n
+
+#  121| [RegExpConstant, RegExpNormalChars] c
+
+#  122| [RegExpConstant, RegExpNormalChars] a
+
+#  122| [RegExpSequence] a\nc
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpEscape] \n
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] c
+
+#  122| [RegExpConstant, RegExpEscape] \n
+
+#  122| [RegExpConstant, RegExpNormalChars] c
+
+#  123| [RegExpConstant, RegExpNormalChars] a
+
+#  123| [RegExpSequence] a\nc
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpEscape] \n
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] c
+
+#  123| [RegExpConstant, RegExpEscape] \n
+
+#  123| [RegExpConstant, RegExpNormalChars] c
+
+#  124| [RegExpConstant, RegExpNormalChars] a
+
+#  124| [RegExpSequence] a\nc
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpEscape] \n
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] c
+
+#  124| [RegExpConstant, RegExpEscape] \n
+
+#  124| [RegExpConstant, RegExpNormalChars] c
+
+#  125| [RegExpConstant, RegExpNormalChars] a
+
+#  125| [RegExpSequence] a\nc
+#-----| 0 -> [RegExpConstant, RegExpNormalChars] a
+#-----| 1 -> [RegExpConstant, RegExpEscape] \n
+#-----| 2 -> [RegExpConstant, RegExpNormalChars] c
+
+#  125| [RegExpConstant, RegExpEscape] \n
+
+#  125| [RegExpConstant, RegExpNormalChars] c
+
+#  130| [RegExpConstant, RegExpNormalChars] abc1
+
+#  131| [RegExpConstant, RegExpNormalChars] abc2
+
+#  132| [RegExpConstant, RegExpNormalChars] xabc3x
diff --git a/cpp/ql/test/library-tests/regex/parse.ql b/cpp/ql/test/library-tests/regex/parse.ql
new file mode 100644
index 000000000000..2e9debf3784a
--- /dev/null
+++ b/cpp/ql/test/library-tests/regex/parse.ql
@@ -0,0 +1,32 @@
+/**
+ * @kind graph
+ */
+
+import semmle.code.cpp.regex.internal.ParseRegExp
+import semmle.code.cpp.regex.RegexTreeView
+
+// Stop gap for missing flow configs
+class RegExpTest extends RegExp {
+  RegExpTest() { any() }
+}
+
+query predicate nodes(RegExpTerm n, string attr, string val) {
+  attr = "semmle.label" and
+  val = "[" + concat(n.getAPrimaryQlClass(), ", ") + "] " + n.toString()
+  or
+  attr = "semmle.order" and
+  val =
+    any(int i |
+      n =
+        rank[i](RegExpTerm t, string fp, int sl, int sc, int el, int ec |
+          t.hasLocationInfo(fp, sl, sc, el, ec)
+        |
+          t order by fp, sl, sc, el, ec, t.toString()
+        )
+    ).toString()
+}
+
+query predicate edges(RegExpTerm pred, RegExpTerm succ, string attr, string val) {
+  attr in ["semmle.label", "semmle.order"] and
+  val = any(int i | succ = pred.getChild(i)).toString()
+}
diff --git a/cpp/ql/test/library-tests/regex/rawstringliteral.expected b/cpp/ql/test/library-tests/regex/rawstringliteral.expected
new file mode 100644
index 000000000000..7eae0eaee6d9
--- /dev/null
+++ b/cpp/ql/test/library-tests/regex/rawstringliteral.expected
@@ -0,0 +1,7 @@
+| regexp.cpp:119:20:119:28 | a\\nc |
+| regexp.cpp:120:22:120:31 | a\\nc |
+| regexp.cpp:121:37:121:47 | a\\nc |
+| regexp.cpp:122:37:122:46 | a\\nc |
+| regexp.cpp:123:37:123:46 | a\\nc |
+| regexp.cpp:124:21:124:31 | a\\nc |
+| regexp.cpp:125:23:125:37 | a\\nc |
diff --git a/cpp/ql/test/library-tests/regex/rawstringliteral.ql b/cpp/ql/test/library-tests/regex/rawstringliteral.ql
new file mode 100644
index 000000000000..17673c29790f
--- /dev/null
+++ b/cpp/ql/test/library-tests/regex/rawstringliteral.ql
@@ -0,0 +1,4 @@
+import cpp
+
+from RawStringLiteral rsl
+select rsl
diff --git a/cpp/ql/test/library-tests/regex/regexp.cpp b/cpp/ql/test/library-tests/regex/regexp.cpp
new file mode 100644
index 000000000000..a7956aa4a21d
--- /dev/null
+++ b/cpp/ql/test/library-tests/regex/regexp.cpp
@@ -0,0 +1,132 @@
+// semmle-extractor-options: -std=c++20
+
+namespace std {
+  template <class CharT>
+  class basic_regex {
+  public:
+    basic_regex(const CharT *s) {}
+    basic_regex(const CharT *s, int flags) {}
+    basic_regex &assign(const CharT *s) { return *this; }
+  };
+  typedef basic_regex<char> regex;
+  typedef basic_regex<wchar_t> wregex;
+} // namespace std
+
+// Empty
+std::regex r_empty("");
+
+// Basic sequence
+std::regex r_abc("abc");
+
+// Repetition
+std::regex r_rep1("a*b+c?d");
+std::regex r_rep2("a{4,8}");
+std::regex r_rep3("a{3,}");
+std::regex r_rep4("a{7}");
+
+// Alternation
+std::regex r_alt("foo|bar");
+
+// Character classes
+std::regex r_cc1("[abc]");
+std::regex r_cc2("[a-fA-F0-9_]");
+std::regex r_cc3("[\\w]+");
+std::regex r_cc4("\\[\\][123]");
+std::regex r_cc5("[^A-Z]");
+std::regex r_cc6("[]]");  // Not a valid regex
+std::regex r_cc7("[^]]"); // Not a valid regex
+std::regex r_cc8("[^-]");
+std::regex r_cc9("[|]");
+std::regex r_cc10("[\\b]");
+
+// Nested character classes (BAD - not parsed correctly)
+std::regex r_nested("[[a-f]A-F]");
+
+// Meta-character classes
+std::regex r_meta1(".*");
+std::regex r_meta2("\\w+\\W");
+std::regex r_meta3("\\s\\S");
+std::regex r_meta4("\\d\\D");
+std::regex r_meta5("\\n\\r\\t");
+
+// Anchors
+std::regex r_anc1("\\b!a\\B");
+
+// Groups
+std::regex r_grp1("(foo)*bar");
+std::regex r_grp2("fo(o|b)ar");
+std::regex r_grp3("(a|b|cd)e");
+std::regex r_grp4("(?::+)\\w"); // Non-capturing group matching colons
+
+// Backreferences
+std::regex r_bref1("(a+)b+\\1");
+
+// Named character properties using a single POSIX bracket expression
+std::regex r_prop1("[[:alnum:]]*");
+std::regex r_prop2("[[:digit:]]+");
+std::regex r_prop3("[[:alnum:]]{2,3}");
+std::regex r_prop4("[a-f[:digit:]]+"); // Also valid inside character classes
+std::regex r_prop5("[^[:digit:]]");
+
+// Two separate character classes, each containing a single POSIX bracket expression
+std::regex r_posix1("[[:alpha:]][[:digit:]]");
+
+// A single character class containing two POSIX bracket expressions
+std::regex r_posix2("[[:alpha:][:digit:]]");
+
+// A single character class containing two ranges and one POSIX bracket expression
+std::regex r_posix3("[A-F[:digit:]a-f]");
+
+// POSIX collating symbols
+std::regex r_posix_coll1("[[.a.]]");
+std::regex r_posix_coll2("[A-F[.b.]a-f]");
+std::regex r_posix_coll3("[[.ch.]]");
+
+// POSIX equivalence classes
+std::regex r_posix_equiv1("[[=a=]]");
+std::regex r_posix_equiv2("[A-F[=b=]a-f]");
+
+// *Not* a POSIX bracket expression; just a regular character class.
+std::regex r_posix4("[:digit:]");
+
+// unicode
+std::regex r_uni("\\u0061");
+
+// hex
+std::regex r_hex("\\x61");
+
+// control escapes
+std::regex r_ctrl1("\\cA");
+std::regex r_ctrl2("[\\cz]");
+
+// NUL escape
+std::regex r_nul1("\\0");
+std::regex r_nul2("[\\0]");
+
+// Lazy quantifiers and additional supported escapes
+std::regex r_lazy1("a*?");
+std::regex r_lazy2("b+?");
+std::regex r_lazy3("c??");
+std::regex r_lazy4("d{2,3}?");
+std::regex r_fv("\\f\\v");
+
+// String literal spellings for location tests
+std::regex r_loc_plain("a\\nb");
+std::basic_regex<wchar_t> r_loc_L(L"a\\nc");
+std::basic_regex<char8_t> r_loc_u8(u8"a\\nc");
+std::basic_regex<char16_t> r_loc_u(u"a\\nc");
+std::basic_regex<char32_t> r_loc_U(U"a\\nc");
+std::regex r_loc_R(R"(a\nc)");
+std::wregex r_loc_LR(LR"(a\nc)");
+std::basic_regex<char8_t> r_loc_u8R(u8R"(a\nc)");
+std::basic_regex<char16_t> r_loc_uR(uR"(a\nc)");
+std::basic_regex<char32_t> r_loc_UR(UR"(a\nc)");
+std::regex r_loc_Rx(R"x(a\nc)x");
+std::regex r_loc_Rfoo(R"foo(a\nc)foo");
+
+// Composite and stringified string literals
+#define STRINGIFY(str) #str
+#define WRAP(str) "x" #str "x"
+std::regex r_loc_composite("ab" "c1");
+std::regex r_loc_macro1(STRINGIFY(abc2));
+std::regex r_loc_macro2(WRAP(abc3));
diff --git a/cpp/ql/test/library-tests/regex/regexp.expected b/cpp/ql/test/library-tests/regex/regexp.expected
new file mode 100644
index 000000000000..a5ce518846a4
--- /dev/null
+++ b/cpp/ql/test/library-tests/regex/regexp.expected
@@ -0,0 +1,374 @@
+groupNumber
+| regexp.cpp:56:20:56:24 | (foo) | 1 |
+| regexp.cpp:57:22:57:26 | (o\|b) | 1 |
+| regexp.cpp:58:20:58:27 | (a\|b\|cd) | 1 |
+| regexp.cpp:62:21:62:24 | (a+) | 1 |
+term
+| regexp.cpp:19:19:19:21 | abc | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:22:20:22:20 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:22:20:22:21 | a* | RegExpStar |
+| regexp.cpp:22:20:22:26 | a*b+c?d | RegExpSequence |
+| regexp.cpp:22:22:22:22 | b | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:22:22:22:23 | b+ | RegExpPlus |
+| regexp.cpp:22:24:22:24 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:22:24:22:25 | c? | RegExpOpt |
+| regexp.cpp:22:26:22:26 | d | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:23:20:23:20 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:23:20:23:25 | a{4,8} | RegExpRange |
+| regexp.cpp:24:20:24:20 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:24:20:24:24 | a{3,} | InfiniteRepetitionQuantifier,RegExpRange |
+| regexp.cpp:25:20:25:20 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:25:20:25:23 | a{7} | RegExpRange |
+| regexp.cpp:28:19:28:21 | foo | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:28:19:28:25 | foo\|bar | RegExpAlt |
+| regexp.cpp:28:23:28:25 | bar | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:31:19:31:23 | [abc] | RegExpCharacterClass |
+| regexp.cpp:31:20:31:20 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:31:21:31:21 | b | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:31:22:31:22 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:32:19:32:30 | [a-fA-F0-9_] | RegExpCharacterClass |
+| regexp.cpp:32:20:32:20 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:32:20:32:22 | a-f | RegExpCharacterRange |
+| regexp.cpp:32:22:32:22 | f | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:32:23:32:23 | A | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:32:23:32:25 | A-F | RegExpCharacterRange |
+| regexp.cpp:32:25:32:25 | F | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:32:26:32:26 | 0 | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:32:26:32:28 | 0-9 | RegExpCharacterRange |
+| regexp.cpp:32:28:32:28 | 9 | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:32:29:32:29 | _ | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:33:19:33:22 | [\\w] | RegExpCharacterClass |
+| regexp.cpp:33:19:33:23 | [\\w]+ | RegExpPlus |
+| regexp.cpp:33:20:33:21 | \\w | RegExpCharacterClassEscape |
+| regexp.cpp:34:19:34:20 | \\[ | RegExpConstant,RegExpEscape |
+| regexp.cpp:34:19:34:27 | \\[\\][123] | RegExpSequence |
+| regexp.cpp:34:21:34:22 | \\] | RegExpConstant,RegExpEscape |
+| regexp.cpp:34:23:34:27 | [123] | RegExpCharacterClass |
+| regexp.cpp:34:24:34:24 | 1 | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:34:25:34:25 | 2 | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:34:26:34:26 | 3 | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:35:19:35:24 | [^A-Z] | RegExpCharacterClass |
+| regexp.cpp:35:21:35:21 | A | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:35:21:35:23 | A-Z | RegExpCharacterRange |
+| regexp.cpp:35:23:35:23 | Z | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:36:19:36:21 | []] | RegExpCharacterClass |
+| regexp.cpp:36:20:36:20 | ] | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:37:19:37:22 | [^]] | RegExpCharacterClass |
+| regexp.cpp:37:21:37:21 | ] | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:38:19:38:22 | [^-] | RegExpCharacterClass |
+| regexp.cpp:38:21:38:21 | - | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:39:19:39:21 | [\|] | RegExpCharacterClass |
+| regexp.cpp:39:20:39:20 | \| | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:40:20:40:23 | [\\b] | RegExpCharacterClass |
+| regexp.cpp:40:21:40:22 | \\b | RegExpConstant,RegExpEscape |
+| regexp.cpp:43:22:43:27 | [[a-f] | RegExpCharacterClass |
+| regexp.cpp:43:22:43:31 | [[a-f]A-F] | RegExpSequence |
+| regexp.cpp:43:23:43:23 | [ | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:43:24:43:24 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:43:24:43:26 | a-f | RegExpCharacterRange |
+| regexp.cpp:43:26:43:26 | f | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:43:28:43:31 | A-F] | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:46:21:46:21 | . | RegExpDot |
+| regexp.cpp:46:21:46:22 | .* | RegExpStar |
+| regexp.cpp:47:21:47:22 | \\w | RegExpCharacterClassEscape |
+| regexp.cpp:47:21:47:23 | \\w+ | RegExpPlus |
+| regexp.cpp:47:21:47:25 | \\w+\\W | RegExpSequence |
+| regexp.cpp:47:24:47:25 | \\W | RegExpCharacterClassEscape |
+| regexp.cpp:48:21:48:22 | \\s | RegExpCharacterClassEscape |
+| regexp.cpp:48:21:48:24 | \\s\\S | RegExpSequence |
+| regexp.cpp:48:23:48:24 | \\S | RegExpCharacterClassEscape |
+| regexp.cpp:49:21:49:22 | \\d | RegExpCharacterClassEscape |
+| regexp.cpp:49:21:49:24 | \\d\\D | RegExpSequence |
+| regexp.cpp:49:23:49:24 | \\D | RegExpCharacterClassEscape |
+| regexp.cpp:50:21:50:22 | \\n | RegExpConstant,RegExpEscape |
+| regexp.cpp:50:21:50:26 | \\n\\r\\t | RegExpSequence |
+| regexp.cpp:50:23:50:24 | \\r | RegExpConstant,RegExpEscape |
+| regexp.cpp:50:25:50:26 | \\t | RegExpConstant,RegExpEscape |
+| regexp.cpp:53:20:53:21 | \\b | RegExpSpecialChar |
+| regexp.cpp:53:20:53:25 | \\b!a\\B | RegExpSequence |
+| regexp.cpp:53:22:53:23 | !a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:53:24:53:25 | \\B | RegExpNonWordBoundary |
+| regexp.cpp:56:20:56:24 | (foo) | RegExpGroup |
+| regexp.cpp:56:20:56:25 | (foo)* | RegExpStar |
+| regexp.cpp:56:20:56:28 | (foo)*bar | RegExpSequence |
+| regexp.cpp:56:21:56:23 | foo | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:56:26:56:28 | bar | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:57:20:57:21 | fo | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:57:20:57:28 | fo(o\|b)ar | RegExpSequence |
+| regexp.cpp:57:22:57:26 | (o\|b) | RegExpGroup |
+| regexp.cpp:57:23:57:23 | o | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:57:23:57:25 | o\|b | RegExpAlt |
+| regexp.cpp:57:25:57:25 | b | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:57:27:57:28 | ar | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:58:20:58:27 | (a\|b\|cd) | RegExpGroup |
+| regexp.cpp:58:20:58:28 | (a\|b\|cd)e | RegExpSequence |
+| regexp.cpp:58:21:58:21 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:58:21:58:26 | a\|b\|cd | RegExpAlt |
+| regexp.cpp:58:23:58:23 | b | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:58:25:58:26 | cd | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:58:28:58:28 | e | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:59:20:59:25 | (?::+) | RegExpGroup |
+| regexp.cpp:59:20:59:27 | (?::+)\\w | RegExpSequence |
+| regexp.cpp:59:23:59:23 | : | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:59:23:59:24 | :+ | RegExpPlus |
+| regexp.cpp:59:26:59:27 | \\w | RegExpCharacterClassEscape |
+| regexp.cpp:62:21:62:24 | (a+) | RegExpGroup |
+| regexp.cpp:62:21:62:28 | (a+)b+\\1 | RegExpSequence |
+| regexp.cpp:62:22:62:22 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:62:22:62:23 | a+ | RegExpPlus |
+| regexp.cpp:62:25:62:25 | b | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:62:25:62:26 | b+ | RegExpPlus |
+| regexp.cpp:62:27:62:28 | \\1 | RegExpBackRef |
+| regexp.cpp:65:21:65:31 | [[:alnum:]] | RegExpCharacterClass |
+| regexp.cpp:65:21:65:32 | [[:alnum:]]* | RegExpStar |
+| regexp.cpp:65:22:65:30 | [:alnum:] | RegExpNamedCharacterProperty |
+| regexp.cpp:66:21:66:31 | [[:digit:]] | RegExpCharacterClass |
+| regexp.cpp:66:21:66:32 | [[:digit:]]+ | RegExpPlus |
+| regexp.cpp:66:22:66:30 | [:digit:] | RegExpNamedCharacterProperty |
+| regexp.cpp:67:21:67:31 | [[:alnum:]] | RegExpCharacterClass |
+| regexp.cpp:67:21:67:36 | [[:alnum:]]{2,3} | RegExpRange |
+| regexp.cpp:67:22:67:30 | [:alnum:] | RegExpNamedCharacterProperty |
+| regexp.cpp:68:21:68:34 | [a-f[:digit:]] | RegExpCharacterClass |
+| regexp.cpp:68:21:68:35 | [a-f[:digit:]]+ | RegExpPlus |
+| regexp.cpp:68:22:68:22 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:68:22:68:24 | a-f | RegExpCharacterRange |
+| regexp.cpp:68:24:68:24 | f | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:68:25:68:33 | [:digit:] | RegExpNamedCharacterProperty |
+| regexp.cpp:69:21:69:32 | [^[:digit:]] | RegExpCharacterClass |
+| regexp.cpp:69:23:69:31 | [:digit:] | RegExpNamedCharacterProperty |
+| regexp.cpp:72:22:72:32 | [[:alpha:]] | RegExpCharacterClass |
+| regexp.cpp:72:22:72:43 | [[:alpha:]][[:digit:]] | RegExpSequence |
+| regexp.cpp:72:23:72:31 | [:alpha:] | RegExpNamedCharacterProperty |
+| regexp.cpp:72:33:72:43 | [[:digit:]] | RegExpCharacterClass |
+| regexp.cpp:72:34:72:42 | [:digit:] | RegExpNamedCharacterProperty |
+| regexp.cpp:75:22:75:41 | [[:alpha:][:digit:]] | RegExpCharacterClass |
+| regexp.cpp:75:23:75:31 | [:alpha:] | RegExpNamedCharacterProperty |
+| regexp.cpp:75:32:75:40 | [:digit:] | RegExpNamedCharacterProperty |
+| regexp.cpp:78:22:78:38 | [A-F[:digit:]a-f] | RegExpCharacterClass |
+| regexp.cpp:78:23:78:23 | A | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:78:23:78:25 | A-F | RegExpCharacterRange |
+| regexp.cpp:78:25:78:25 | F | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:78:26:78:34 | [:digit:] | RegExpNamedCharacterProperty |
+| regexp.cpp:78:35:78:35 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:78:35:78:37 | a-f | RegExpCharacterRange |
+| regexp.cpp:78:37:78:37 | f | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:81:27:81:33 | [[.a.]] | RegExpCharacterClass |
+| regexp.cpp:81:28:81:32 | [.a.] | RegExpNamedCharacterProperty |
+| regexp.cpp:82:27:82:39 | [A-F[.b.]a-f] | RegExpCharacterClass |
+| regexp.cpp:82:28:82:28 | A | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:82:28:82:30 | A-F | RegExpCharacterRange |
+| regexp.cpp:82:30:82:30 | F | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:82:31:82:35 | [.b.] | RegExpNamedCharacterProperty |
+| regexp.cpp:82:36:82:36 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:82:36:82:38 | a-f | RegExpCharacterRange |
+| regexp.cpp:82:38:82:38 | f | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:83:27:83:34 | [[.ch.]] | RegExpCharacterClass |
+| regexp.cpp:83:28:83:33 | [.ch.] | RegExpNamedCharacterProperty |
+| regexp.cpp:86:28:86:34 | [[=a=]] | RegExpCharacterClass |
+| regexp.cpp:86:29:86:33 | [=a=] | RegExpNamedCharacterProperty |
+| regexp.cpp:87:28:87:40 | [A-F[=b=]a-f] | RegExpCharacterClass |
+| regexp.cpp:87:29:87:29 | A | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:87:29:87:31 | A-F | RegExpCharacterRange |
+| regexp.cpp:87:31:87:31 | F | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:87:32:87:36 | [=b=] | RegExpNamedCharacterProperty |
+| regexp.cpp:87:37:87:37 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:87:37:87:39 | a-f | RegExpCharacterRange |
+| regexp.cpp:87:39:87:39 | f | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:90:22:90:30 | [:digit:] | RegExpNamedCharacterProperty |
+| regexp.cpp:93:19:93:24 | \\u0061 | RegExpConstant,RegExpEscape |
+| regexp.cpp:96:19:96:22 | \\x61 | RegExpConstant,RegExpEscape |
+| regexp.cpp:99:21:99:23 | \\cA | RegExpConstant,RegExpEscape |
+| regexp.cpp:100:21:100:25 | [\\cz] | RegExpCharacterClass |
+| regexp.cpp:100:22:100:24 | \\cz | RegExpConstant,RegExpEscape |
+| regexp.cpp:103:20:103:21 | \\0 | RegExpConstant,RegExpEscape |
+| regexp.cpp:104:20:104:23 | [\\0] | RegExpCharacterClass |
+| regexp.cpp:104:21:104:22 | \\0 | RegExpConstant,RegExpEscape |
+| regexp.cpp:107:21:107:21 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:107:21:107:23 | a*? | RegExpStar |
+| regexp.cpp:108:21:108:21 | b | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:108:21:108:23 | b+? | RegExpPlus |
+| regexp.cpp:109:21:109:21 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:109:21:109:23 | c?? | RegExpOpt |
+| regexp.cpp:110:21:110:21 | d | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:110:21:110:27 | d{2,3}? | RegExpQuantifier |
+| regexp.cpp:111:18:111:19 | \\f | RegExpConstant,RegExpEscape |
+| regexp.cpp:111:18:111:21 | \\f\\v | RegExpSequence |
+| regexp.cpp:111:20:111:21 | \\v | RegExpConstant,RegExpEscape |
+| regexp.cpp:114:25:114:25 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:114:25:114:28 | a\\nb | RegExpSequence |
+| regexp.cpp:114:26:114:27 | \\n | RegExpConstant,RegExpEscape |
+| regexp.cpp:114:28:114:28 | b | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:115:37:115:37 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:115:37:115:40 | a\\nc | RegExpSequence |
+| regexp.cpp:115:38:115:39 | \\n | RegExpConstant,RegExpEscape |
+| regexp.cpp:115:40:115:40 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:116:39:116:39 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:116:39:116:42 | a\\nc | RegExpSequence |
+| regexp.cpp:116:40:116:41 | \\n | RegExpConstant,RegExpEscape |
+| regexp.cpp:116:42:116:42 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:117:38:117:38 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:117:38:117:41 | a\\nc | RegExpSequence |
+| regexp.cpp:117:39:117:40 | \\n | RegExpConstant,RegExpEscape |
+| regexp.cpp:117:41:117:41 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:118:38:118:38 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:118:38:118:41 | a\\nc | RegExpSequence |
+| regexp.cpp:118:39:118:40 | \\n | RegExpConstant,RegExpEscape |
+| regexp.cpp:118:41:118:41 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:119:23:119:23 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:119:23:119:26 | a\\nc | RegExpSequence |
+| regexp.cpp:119:24:119:25 | \\n | RegExpConstant,RegExpEscape |
+| regexp.cpp:119:26:119:26 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:120:26:120:26 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:120:26:120:29 | a\\nc | RegExpSequence |
+| regexp.cpp:120:27:120:28 | \\n | RegExpConstant,RegExpEscape |
+| regexp.cpp:120:29:120:29 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:121:42:121:42 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:121:42:121:45 | a\\nc | RegExpSequence |
+| regexp.cpp:121:43:121:44 | \\n | RegExpConstant,RegExpEscape |
+| regexp.cpp:121:45:121:45 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:122:41:122:41 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:122:41:122:44 | a\\nc | RegExpSequence |
+| regexp.cpp:122:42:122:43 | \\n | RegExpConstant,RegExpEscape |
+| regexp.cpp:122:44:122:44 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:123:41:123:41 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:123:41:123:44 | a\\nc | RegExpSequence |
+| regexp.cpp:123:42:123:43 | \\n | RegExpConstant,RegExpEscape |
+| regexp.cpp:123:44:123:44 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:124:25:124:25 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:124:25:124:28 | a\\nc | RegExpSequence |
+| regexp.cpp:124:26:124:27 | \\n | RegExpConstant,RegExpEscape |
+| regexp.cpp:124:28:124:28 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:125:29:125:29 | a | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:125:29:125:32 | a\\nc | RegExpSequence |
+| regexp.cpp:125:30:125:31 | \\n | RegExpConstant,RegExpEscape |
+| regexp.cpp:125:32:125:32 | c | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:130:29:130:32 | abc1 | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:131:35:131:38 | abc2 | RegExpConstant,RegExpNormalChars |
+| regexp.cpp:132:25:132:30 | xabc3x | RegExpConstant,RegExpNormalChars |
+regExpNormalCharValue
+| regexp.cpp:19:19:19:21 | abc | abc |
+| regexp.cpp:22:20:22:20 | a | a |
+| regexp.cpp:22:22:22:22 | b | b |
+| regexp.cpp:22:24:22:24 | c | c |
+| regexp.cpp:22:26:22:26 | d | d |
+| regexp.cpp:23:20:23:20 | a | a |
+| regexp.cpp:24:20:24:20 | a | a |
+| regexp.cpp:25:20:25:20 | a | a |
+| regexp.cpp:28:19:28:21 | foo | foo |
+| regexp.cpp:28:23:28:25 | bar | bar |
+| regexp.cpp:31:20:31:20 | a | a |
+| regexp.cpp:31:21:31:21 | b | b |
+| regexp.cpp:31:22:31:22 | c | c |
+| regexp.cpp:32:20:32:20 | a | a |
+| regexp.cpp:32:22:32:22 | f | f |
+| regexp.cpp:32:23:32:23 | A | A |
+| regexp.cpp:32:25:32:25 | F | F |
+| regexp.cpp:32:26:32:26 | 0 | 0 |
+| regexp.cpp:32:28:32:28 | 9 | 9 |
+| regexp.cpp:32:29:32:29 | _ | _ |
+| regexp.cpp:33:20:33:21 | \\w | w |
+| regexp.cpp:34:19:34:20 | \\[ | [ |
+| regexp.cpp:34:21:34:22 | \\] | ] |
+| regexp.cpp:34:24:34:24 | 1 | 1 |
+| regexp.cpp:34:25:34:25 | 2 | 2 |
+| regexp.cpp:34:26:34:26 | 3 | 3 |
+| regexp.cpp:35:21:35:21 | A | A |
+| regexp.cpp:35:23:35:23 | Z | Z |
+| regexp.cpp:36:20:36:20 | ] | ] |
+| regexp.cpp:37:21:37:21 | ] | ] |
+| regexp.cpp:38:21:38:21 | - | - |
+| regexp.cpp:39:20:39:20 | \| | \| |
+| regexp.cpp:40:21:40:22 | \\b | b |
+| regexp.cpp:43:23:43:23 | [ | [ |
+| regexp.cpp:43:24:43:24 | a | a |
+| regexp.cpp:43:26:43:26 | f | f |
+| regexp.cpp:43:28:43:31 | A-F] | A-F] |
+| regexp.cpp:47:21:47:22 | \\w | w |
+| regexp.cpp:47:24:47:25 | \\W | W |
+| regexp.cpp:48:21:48:22 | \\s | s |
+| regexp.cpp:48:23:48:24 | \\S | S |
+| regexp.cpp:49:21:49:22 | \\d | d |
+| regexp.cpp:49:23:49:24 | \\D | D |
+| regexp.cpp:50:21:50:22 | \\n | \n |
+| regexp.cpp:50:23:50:24 | \\r | \r |
+| regexp.cpp:50:25:50:26 | \\t | \t |
+| regexp.cpp:53:22:53:23 | !a | !a |
+| regexp.cpp:56:21:56:23 | foo | foo |
+| regexp.cpp:56:26:56:28 | bar | bar |
+| regexp.cpp:57:20:57:21 | fo | fo |
+| regexp.cpp:57:23:57:23 | o | o |
+| regexp.cpp:57:25:57:25 | b | b |
+| regexp.cpp:57:27:57:28 | ar | ar |
+| regexp.cpp:58:21:58:21 | a | a |
+| regexp.cpp:58:23:58:23 | b | b |
+| regexp.cpp:58:25:58:26 | cd | cd |
+| regexp.cpp:58:28:58:28 | e | e |
+| regexp.cpp:59:23:59:23 | : | : |
+| regexp.cpp:59:26:59:27 | \\w | w |
+| regexp.cpp:62:22:62:22 | a | a |
+| regexp.cpp:62:25:62:25 | b | b |
+| regexp.cpp:68:22:68:22 | a | a |
+| regexp.cpp:68:24:68:24 | f | f |
+| regexp.cpp:78:23:78:23 | A | A |
+| regexp.cpp:78:25:78:25 | F | F |
+| regexp.cpp:78:35:78:35 | a | a |
+| regexp.cpp:78:37:78:37 | f | f |
+| regexp.cpp:82:28:82:28 | A | A |
+| regexp.cpp:82:30:82:30 | F | F |
+| regexp.cpp:82:36:82:36 | a | a |
+| regexp.cpp:82:38:82:38 | f | f |
+| regexp.cpp:87:29:87:29 | A | A |
+| regexp.cpp:87:31:87:31 | F | F |
+| regexp.cpp:87:37:87:37 | a | a |
+| regexp.cpp:87:39:87:39 | f | f |
+| regexp.cpp:93:19:93:24 | \\u0061 | a |
+| regexp.cpp:96:19:96:22 | \\x61 | a |
+| regexp.cpp:99:21:99:23 | \\cA | \u0001 |
+| regexp.cpp:100:22:100:24 | \\cz | \u001a |
+| regexp.cpp:103:20:103:21 | \\0 | \u0000 |
+| regexp.cpp:104:21:104:22 | \\0 | \u0000 |
+| regexp.cpp:107:21:107:21 | a | a |
+| regexp.cpp:108:21:108:21 | b | b |
+| regexp.cpp:109:21:109:21 | c | c |
+| regexp.cpp:110:21:110:21 | d | d |
+| regexp.cpp:111:18:111:19 | \\f | \u000c |
+| regexp.cpp:111:20:111:21 | \\v | \u000b |
+| regexp.cpp:114:25:114:25 | a | a |
+| regexp.cpp:114:26:114:27 | \\n | \n |
+| regexp.cpp:114:28:114:28 | b | b |
+| regexp.cpp:115:37:115:37 | a | a |
+| regexp.cpp:115:38:115:39 | \\n | \n |
+| regexp.cpp:115:40:115:40 | c | c |
+| regexp.cpp:116:39:116:39 | a | a |
+| regexp.cpp:116:40:116:41 | \\n | \n |
+| regexp.cpp:116:42:116:42 | c | c |
+| regexp.cpp:117:38:117:38 | a | a |
+| regexp.cpp:117:39:117:40 | \\n | \n |
+| regexp.cpp:117:41:117:41 | c | c |
+| regexp.cpp:118:38:118:38 | a | a |
+| regexp.cpp:118:39:118:40 | \\n | \n |
+| regexp.cpp:118:41:118:41 | c | c |
+| regexp.cpp:119:23:119:23 | a | a |
+| regexp.cpp:119:24:119:25 | \\n | \n |
+| regexp.cpp:119:26:119:26 | c | c |
+| regexp.cpp:120:26:120:26 | a | a |
+| regexp.cpp:120:27:120:28 | \\n | \n |
+| regexp.cpp:120:29:120:29 | c | c |
+| regexp.cpp:121:42:121:42 | a | a |
+| regexp.cpp:121:43:121:44 | \\n | \n |
+| regexp.cpp:121:45:121:45 | c | c |
+| regexp.cpp:122:41:122:41 | a | a |
+| regexp.cpp:122:42:122:43 | \\n | \n |
+| regexp.cpp:122:44:122:44 | c | c |
+| regexp.cpp:123:41:123:41 | a | a |
+| regexp.cpp:123:42:123:43 | \\n | \n |
+| regexp.cpp:123:44:123:44 | c | c |
+| regexp.cpp:124:25:124:25 | a | a |
+| regexp.cpp:124:26:124:27 | \\n | \n |
+| regexp.cpp:124:28:124:28 | c | c |
+| regexp.cpp:125:29:125:29 | a | a |
+| regexp.cpp:125:30:125:31 | \\n | \n |
+| regexp.cpp:125:32:125:32 | c | c |
+| regexp.cpp:130:29:130:32 | abc1 | abc1 |
+| regexp.cpp:131:35:131:38 | abc2 | abc2 |
+| regexp.cpp:132:25:132:30 | xabc3x | xabc3x |
diff --git a/cpp/ql/test/library-tests/regex/regexp.ql b/cpp/ql/test/library-tests/regex/regexp.ql
new file mode 100644
index 000000000000..67246e433e9c
--- /dev/null
+++ b/cpp/ql/test/library-tests/regex/regexp.ql
@@ -0,0 +1,15 @@
+import semmle.code.cpp.regex.internal.ParseRegExp
+import semmle.code.cpp.regex.RegexTreeView
+
+// Stop gap for missing flow configs
+class RegExpTest extends RegExp {
+  RegExpTest() { any() }
+}
+
+query predicate groupNumber(RegExpGroup g, int number) { number = g.getNumber() }
+
+query predicate term(RegExpTerm term, string c) { c = term.getPrimaryQlClasses() }
+
+query predicate regExpNormalCharValue(RegExpNormalChars term, string value) {
+  value = term.getValue()
+}
diff --git a/cpp/ql/test/library-tests/sideEffects/functions/sideEffects.ql b/cpp/ql/test/library-tests/sideEffects/functions/sideEffects.ql
index d2705040373a..d749031f7fb3 100644
--- a/cpp/ql/test/library-tests/sideEffects/functions/sideEffects.ql
+++ b/cpp/ql/test/library-tests/sideEffects/functions/sideEffects.ql
@@ -1,13 +1,14 @@
 import cpp
 
-string functionType(Function f, int i) {
-  if exists(f.getParameter(i))
-  then result = f.getParameter(i).getType().toString() + " -> " + functionType(f, i + 1)
-  else (
-    i = f.getNumberOfParameters() and result = f.getType().toString()
-  )
+string functionType(Function f) {
+  if exists(f.getParameter(_))
+  then
+    result =
+      concat(int i | | f.getParameter(i).getType().toString(), " -> " order by i) + " -> " +
+        f.getType().toString()
+  else result = f.getType().toString()
 }
 
 from Function f, boolean b
 where if f.isSideEffectFree() then b = true else b = false
-select f, functionType(f, 0), b
+select f, functionType(f), b
diff --git a/cpp/ql/test/library-tests/syntax-zoo/dataflow-consistency.expected b/cpp/ql/test/library-tests/syntax-zoo/dataflow-consistency.expected
index 76adedb8f054..2b41bcfe0cb4 100644
--- a/cpp/ql/test/library-tests/syntax-zoo/dataflow-consistency.expected
+++ b/cpp/ql/test/library-tests/syntax-zoo/dataflow-consistency.expected
@@ -1,10 +1,4 @@
 uniqueEnclosingCallable
-| builtin.c:14:3:14:16 | ... * ... | Node should have one enclosing callable but has 0. |
-| builtin.c:14:3:14:16 | sizeof(int) | Node should have one enclosing callable but has 0. |
-| builtin.c:14:10:14:10 | 4 | Node should have one enclosing callable but has 0. |
-| builtin.c:15:3:15:16 | ... * ... | Node should have one enclosing callable but has 0. |
-| builtin.c:15:3:15:16 | sizeof(int) | Node should have one enclosing callable but has 0. |
-| builtin.c:15:10:15:10 | 4 | Node should have one enclosing callable but has 0. |
 | enum.c:2:6:2:6 | 1 | Node should have one enclosing callable but has 0. |
 | enum.c:2:6:2:10 | ... + ... | Node should have one enclosing callable but has 0. |
 | enum.c:2:10:2:10 | 1 | Node should have one enclosing callable but has 0. |
diff --git a/cpp/ql/test/query-tests/Best Practices/BlockWithTooManyStatements/BlockWithTooManyStatements.cpp b/cpp/ql/test/query-tests/Best Practices/BlockWithTooManyStatements/BlockWithTooManyStatements.cpp
new file mode 100644
index 000000000000..dacbdc797eee
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/BlockWithTooManyStatements/BlockWithTooManyStatements.cpp	
@@ -0,0 +1,86 @@
+void complex_block() {
+  while (true) {
+    int a = 1;
+    int b = 2;
+    int c = 3;
+    int d = 4;
+    int e = 5;
+    int f = 6;
+    int g = 7;
+    int h = 8;
+    int i = 9;
+    int j = 10;
+  }
+  while (true) {
+    int a = 1;
+    int b = 2;
+    int c = 3;
+    int d = 4;
+    int e = 5;
+    int f = 6;
+    int g = 7;
+    int h = 8;
+    int i = 9;
+    int j = 10;
+  }
+  while (true) {
+    int a = 1;
+    int b = 2;
+    int c = 3;
+    int d = 4;
+    int e = 5;
+    int f = 6;
+    int g = 7;
+    int h = 8;
+    int i = 9;
+    int j = 10;
+  }
+  while (true) {
+    int a = 1;
+    int b = 2;
+    int c = 3;
+    int d = 4;
+    int e = 5;
+    int f = 6;
+    int g = 7;
+    int h = 8;
+    int i = 9;
+    int j = 10;
+  }
+  while (true) {
+    int a = 1;
+    int b = 2;
+    int c = 3;
+    int d = 4;
+    int e = 5;
+    int f = 6;
+    int g = 7;
+    int h = 8;
+    int i = 9;
+    int j = 10;
+  }
+} // $ Alert
+
+void not_complex_block() {
+  while (true) {
+    int a = 1;
+    int b = 2;
+    int c = 3;
+    int d = 4;
+    int e = 5;
+  }
+  while (true) {
+    int a = 1;
+    int b = 2;
+    int c = 3;
+    int d = 4;
+    int e = 5;
+  }
+  while (true) {
+    int a = 1;
+    int b = 2;
+    int c = 3;
+    int d = 4;
+    int e = 5;
+  }
+}
diff --git a/cpp/ql/test/query-tests/Best Practices/BlockWithTooManyStatements/BlockWithTooManyStatements.expected b/cpp/ql/test/query-tests/Best Practices/BlockWithTooManyStatements/BlockWithTooManyStatements.expected
new file mode 100644
index 000000000000..6243b3a32fa7
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/BlockWithTooManyStatements/BlockWithTooManyStatements.expected	
@@ -0,0 +1 @@
+| BlockWithTooManyStatements.cpp:1:22:62:1 | { ... } | Block with too many statements (5 complex statements in the block). |
diff --git a/cpp/ql/test/query-tests/Best Practices/BlockWithTooManyStatements/BlockWithTooManyStatements.qlref b/cpp/ql/test/query-tests/Best Practices/BlockWithTooManyStatements/BlockWithTooManyStatements.qlref
new file mode 100644
index 000000000000..95e8a2612635
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/BlockWithTooManyStatements/BlockWithTooManyStatements.qlref	
@@ -0,0 +1,2 @@
+query: Best Practices/BlockWithTooManyStatements.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Best Practices/ComplexCondition/ComplexCondition.cpp b/cpp/ql/test/query-tests/Best Practices/ComplexCondition/ComplexCondition.cpp
new file mode 100644
index 000000000000..0322cddc2d7a
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/ComplexCondition/ComplexCondition.cpp	
@@ -0,0 +1,10 @@
+void complex_condition(bool a, bool b, bool c, bool d, bool e, bool f, bool g, bool h, bool i, bool j,
+    bool k, bool l, bool m, bool n, bool o) {
+  if (a || b && c || d && e || f && g || h && i || j && k || l && m || n && o) { // $ Alert
+  }
+}
+
+void not_complex_condition(bool a, bool b, bool c, bool d, bool e, bool f) {
+  if (a && b || c && d || e && f) {
+  }
+}
diff --git a/cpp/ql/test/query-tests/Best Practices/ComplexCondition/ComplexCondition.expected b/cpp/ql/test/query-tests/Best Practices/ComplexCondition/ComplexCondition.expected
new file mode 100644
index 000000000000..fc3d8570dc71
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/ComplexCondition/ComplexCondition.expected	
@@ -0,0 +1 @@
+| ComplexCondition.cpp:3:7:3:77 | ... \|\| ... | Complex condition: too many logical operations in this expression. |
diff --git a/cpp/ql/test/query-tests/Best Practices/ComplexCondition/ComplexCondition.qlref b/cpp/ql/test/query-tests/Best Practices/ComplexCondition/ComplexCondition.qlref
new file mode 100644
index 000000000000..156d845994c3
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/ComplexCondition/ComplexCondition.qlref	
@@ -0,0 +1,2 @@
+query: Best Practices/ComplexCondition.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Best Practices/Exceptions/AccidentalRethrow/AccidentalRethrow.expected b/cpp/ql/test/query-tests/Best Practices/Exceptions/AccidentalRethrow/AccidentalRethrow.expected
new file mode 100644
index 000000000000..4d8fe9aa867e
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/Exceptions/AccidentalRethrow/AccidentalRethrow.expected	
@@ -0,0 +1,2 @@
+| test.cpp:2:3:2:7 | re-throw exception  | As there is no current exception, this rethrow expression will terminate the program. |
+| test.cpp:6:3:6:7 | re-throw exception  | As there is no current exception, this rethrow expression will terminate the program. |
diff --git a/cpp/ql/test/query-tests/Best Practices/Exceptions/AccidentalRethrow/AccidentalRethrow.qlref b/cpp/ql/test/query-tests/Best Practices/Exceptions/AccidentalRethrow/AccidentalRethrow.qlref
new file mode 100644
index 000000000000..1f5897c9578c
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/Exceptions/AccidentalRethrow/AccidentalRethrow.qlref	
@@ -0,0 +1,2 @@
+query: Best Practices/Exceptions/AccidentalRethrow.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Best Practices/Exceptions/AccidentalRethrow/test.cpp b/cpp/ql/test/query-tests/Best Practices/Exceptions/AccidentalRethrow/test.cpp
new file mode 100644
index 000000000000..4d96a3c14d4e
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/Exceptions/AccidentalRethrow/test.cpp	
@@ -0,0 +1,34 @@
+void rethrowOutsideCatch() {
+  throw; // $ Alert
+}
+
+void helperRethrow() {
+  throw; // $ Alert
+}
+
+void safeRethrowInCatch() {
+  try {
+  } catch (...) {
+    throw;
+  }
+}
+
+// The function name matches "%exception%", so a rethrow here is assumed to
+// be intentional even though it is lexically and dynamically outside any
+// catch block.
+void rethrowException() {
+  throw;
+}
+
+// Not lexically inside a catch block, but every call to this function is
+// made from within a catch block, so the rethrow is assumed to be safe.
+void calledFromCatch() {
+  throw;
+}
+
+void triggersFromCatch() {
+  try {
+  } catch (...) {
+    calledFromCatch();
+  }
+}
diff --git a/cpp/ql/test/query-tests/Best Practices/Exceptions/CatchingByValue/CatchingByValue.expected b/cpp/ql/test/query-tests/Best Practices/Exceptions/CatchingByValue/CatchingByValue.expected
new file mode 100644
index 000000000000..6e95febc5ce5
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/Exceptions/CatchingByValue/CatchingByValue.expected	
@@ -0,0 +1,2 @@
+| test.cpp:12:32:12:34 | { ... } | This should catch a DerivedException by (const) reference rather than by value. |
+| test.cpp:16:29:16:31 | { ... } | This should catch a BaseException by (const) reference rather than by value. |
diff --git a/cpp/ql/test/query-tests/Best Practices/Exceptions/CatchingByValue/CatchingByValue.qlref b/cpp/ql/test/query-tests/Best Practices/Exceptions/CatchingByValue/CatchingByValue.qlref
new file mode 100644
index 000000000000..0a79c26699a0
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/Exceptions/CatchingByValue/CatchingByValue.qlref	
@@ -0,0 +1,2 @@
+query: Best Practices/Exceptions/CatchingByValue.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Best Practices/Exceptions/CatchingByValue/test.cpp b/cpp/ql/test/query-tests/Best Practices/Exceptions/CatchingByValue/test.cpp
new file mode 100644
index 000000000000..c8c3da5223fa
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/Exceptions/CatchingByValue/test.cpp	
@@ -0,0 +1,33 @@
+class BaseException {
+public:
+  virtual ~BaseException() {}
+};
+
+class DerivedException : public BaseException {
+};
+
+void catchByValueDerived() {
+  try {
+    throw DerivedException();
+  } catch (DerivedException e) { } // $ Alert
+
+  try {
+    throw BaseException();
+  } catch (BaseException e) { } // $ Alert
+
+  try {
+    throw DerivedException();
+  } catch (DerivedException &e) { }
+
+  try {
+    throw DerivedException();
+  } catch (BaseException &e) { }
+
+  try {
+    throw new BaseException();
+  } catch (BaseException *e) { }
+
+  try {
+    throw DerivedException();
+  } catch (...) { }
+}
diff --git a/cpp/ql/test/query-tests/Best Practices/Exceptions/LeakyCatch/LeakyCatch.expected b/cpp/ql/test/query-tests/Best Practices/Exceptions/LeakyCatch/LeakyCatch.expected
new file mode 100644
index 000000000000..0c89ab8d5951
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/Exceptions/LeakyCatch/LeakyCatch.expected	
@@ -0,0 +1,2 @@
+| test.cpp:21:28:21:30 | { ... } | This catch block does not free the caught exception, thereby leaking memory. |
+| test.cpp:27:31:27:51 | { ... } | This catch block does not free the caught exception, thereby leaking memory. |
diff --git a/cpp/ql/test/query-tests/Best Practices/Exceptions/LeakyCatch/LeakyCatch.qlref b/cpp/ql/test/query-tests/Best Practices/Exceptions/LeakyCatch/LeakyCatch.qlref
new file mode 100644
index 000000000000..f25f199c27db
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/Exceptions/LeakyCatch/LeakyCatch.qlref	
@@ -0,0 +1,2 @@
+query: Best Practices/Exceptions/LeakyCatch.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Best Practices/Exceptions/LeakyCatch/test.cpp b/cpp/ql/test/query-tests/Best Practices/Exceptions/LeakyCatch/test.cpp
new file mode 100644
index 000000000000..f37b921d7c71
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/Exceptions/LeakyCatch/test.cpp	
@@ -0,0 +1,60 @@
+// --- definitions ---
+
+class MyException {
+public:
+  void ReportError() {}
+  void Delete() {}
+};
+
+class OtherException {
+public:
+  void ReportError() {}
+};
+
+void handle(OtherException *e) {}
+
+// --- test cases ---
+
+void leakyCatchEmpty() {
+  try {
+    // ...
+  } catch (MyException *e) { } // $ Alert
+}
+
+void leakyCatchNoDelete() {
+  try {
+    // ...
+  } catch (OtherException *e) { e->ReportError(); } // $ Alert
+}
+
+void catchWithDeleteMethodCall() {
+  try {
+    // ...
+  } catch (MyException *e) {
+    e->ReportError();
+    e->Delete();
+  }
+}
+
+void catchWithOperatorDelete() {
+  try {
+    // ...
+  } catch (MyException *e) {
+    e->ReportError();
+    delete e;
+  }
+}
+
+void catchWithPassToFunction() {
+  try {
+    // ...
+  } catch (OtherException *e) {
+    handle(e);
+  }
+}
+
+void catchByValueNotPointer() {
+  try {
+    // ...
+  } catch (MyException e) { }
+}
diff --git a/cpp/ql/test/query-tests/Best Practices/Exceptions/ThrowingPointers/ThrowingPointers.expected b/cpp/ql/test/query-tests/Best Practices/Exceptions/ThrowingPointers/ThrowingPointers.expected
new file mode 100644
index 000000000000..093b60e54d38
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/Exceptions/ThrowingPointers/ThrowingPointers.expected	
@@ -0,0 +1 @@
+| test.cpp:5:3:5:25 | throw ... | This should throw a MyException rather than a pointer to one. |
diff --git a/cpp/ql/test/query-tests/Best Practices/Exceptions/ThrowingPointers/ThrowingPointers.qlref b/cpp/ql/test/query-tests/Best Practices/Exceptions/ThrowingPointers/ThrowingPointers.qlref
new file mode 100644
index 000000000000..03dbfa02a324
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/Exceptions/ThrowingPointers/ThrowingPointers.qlref	
@@ -0,0 +1,2 @@
+query: Best Practices/Exceptions/ThrowingPointers.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Best Practices/Exceptions/ThrowingPointers/test.cpp b/cpp/ql/test/query-tests/Best Practices/Exceptions/ThrowingPointers/test.cpp
new file mode 100644
index 000000000000..11703a59bf8d
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/Exceptions/ThrowingPointers/test.cpp	
@@ -0,0 +1,28 @@
+class MyException {
+};
+
+void throwsPointer1() {
+  throw new MyException(); // $ Alert
+}
+
+void throwsPointer2() {
+  MyException *e = new MyException();
+
+  throw e; // $ MISSING: Alert
+}
+
+void throwsByValue() {
+  throw MyException();
+}
+
+// Microsoft MFC's CException hierarchy is intended to be thrown (and
+// caught) as a pointer, so it should not be flagged.
+class CException {
+};
+
+class CMyFrameworkException : public CException {
+};
+
+void throwsFrameworkExceptionPointer() {
+  throw new CMyFrameworkException();
+}
diff --git a/cpp/ql/test/query-tests/Best Practices/Likely Errors/EmptyBlock/EmptyBlock.expected b/cpp/ql/test/query-tests/Best Practices/Likely Errors/EmptyBlock/EmptyBlock.expected
index dc572fae9bef..d6d9c209c79a 100644
--- a/cpp/ql/test/query-tests/Best Practices/Likely Errors/EmptyBlock/EmptyBlock.expected	
+++ b/cpp/ql/test/query-tests/Best Practices/Likely Errors/EmptyBlock/EmptyBlock.expected	
@@ -1,3 +1,7 @@
 | empty_block.cpp:9:10:9:11 | { ... } | Empty block without comment. |
 | empty_block.cpp:12:10:13:3 | { ... } | Empty block without comment. |
 | empty_block.cpp:20:10:21:3 | { ... } | Empty block without comment. |
+| empty_block.cpp:84:14:85:3 | { ... } | Empty block without comment. |
+| empty_block.cpp:93:10:94:3 | { ... } | Empty block without comment. |
+| empty_block.cpp:99:10:100:3 | { ... } | Empty block without comment. |
+| empty_block.cpp:100:10:101:3 | { ... } | Empty block without comment. |
diff --git a/cpp/ql/test/query-tests/Best Practices/Likely Errors/EmptyBlock/empty_block.cpp b/cpp/ql/test/query-tests/Best Practices/Likely Errors/EmptyBlock/empty_block.cpp
index 8a8714d310f4..905b873c670d 100644
--- a/cpp/ql/test/query-tests/Best Practices/Likely Errors/EmptyBlock/empty_block.cpp	
+++ b/cpp/ql/test/query-tests/Best Practices/Likely Errors/EmptyBlock/empty_block.cpp	
@@ -80,5 +80,25 @@ int f(int x) {
     }
   }
 
+  // BAD
+  if (x > 1) {
+  }
+
+  // GOOD
+  if (x) {
+    ++x;
+  }
+
+  // DUBIOUS (reported)
+  if (x) {
+  } else {
+    ++x;
+  }
+
+  // BAD (x2)
+  if (x) {
+  } else {
+  }
+
   return 1;
 }
diff --git a/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedLocals/UnusedLocals.expected b/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedLocals/UnusedLocals.expected
index 8db9fdb3ec64..cf5058b3cfa8 100644
--- a/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedLocals/UnusedLocals.expected	
+++ b/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedLocals/UnusedLocals.expected	
@@ -4,7 +4,6 @@
 | code2.cpp:26:16:26:17 | v1 | Variable v1 is not used. |
 | code2.cpp:42:11:42:16 | myVar1 | Variable myVar1 is not used. |
 | code2.cpp:64:7:64:8 | v3 | Variable v3 is not used. |
-| code2.cpp:108:11:108:12 | v2 | Variable v2 is not used. |
 | code2.cpp:128:9:128:9 | b | Variable b is not used. |
 | code.c:10:18:10:18 | y | Variable y is not used. |
 | code.c:11:18:11:18 | z | Variable z is not used. |
diff --git a/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedLocals/code2.cpp b/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedLocals/code2.cpp
index b0e00dc8fbe1..e033a69f9610 100644
--- a/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedLocals/code2.cpp	
+++ b/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedLocals/code2.cpp	
@@ -105,7 +105,7 @@ void test_range_based_for()
 		output(v1);
 	}
 
-	for (int v2 : myContainer) // $ Alert // BAD: v2 is not used
+	for (int v2 : myContainer) // GOOD: iterator dereference may have side effects
 	{
 	}
 }
@@ -176,3 +176,20 @@ void test_switch_initializer()
 		// ...
 	}
 }
+
+void test_maybe_unused()
+{
+	[[maybe_unused]] int unused; // GOOD: explicitly marked as maybe_unused
+}
+
+int globalVar;
+
+int initialize()
+{
+	return ++globalVar;
+}
+
+void test_initializer_side_effect()
+{
+	int initialized = initialize(); // GOOD (initializer has a side effect)
+}
diff --git a/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedStaticVariables/test.cpp b/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedStaticVariables/test.cpp
index 3b60a4722d4d..13ab913733bb 100644
--- a/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedStaticVariables/test.cpp	
+++ b/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedStaticVariables/test.cpp	
@@ -1,4 +1,4 @@
-
+// semmle-extractor-options: -std=c++20
 int globalVar; // GOOD (not static)
 static int staticVar1; // GOOD (used)
 static int staticVar2; // GOOD (used)
@@ -10,6 +10,7 @@ static __attribute__((__unused__)) int staticVar7; // GOOD (unused but this is e
 const int constVar8 = 8; // $ Alert // BAD (const defaults to static)
 extern const int constVar9 = 9; // GOOD
 static int staticVar10 = 10; // $ SPURIOUS: Alert // GOOD [FALSE POSITIVE] (referenced in a never instantiated template)
+[[maybe_unused]] static int staticVar11; // GOOD (explicitly marked as maybe_unused)
 
 void f()
 {
@@ -28,3 +29,30 @@ class MyTemplateClass // never instantiated
 		// ...
 	}
 };
+
+int initialize()
+{
+	return ++globalVar;
+}
+
+static int initialized = initialize(); // GOOD (initializer has a side effect)
+
+struct WithConstructor
+{
+	WithConstructor() { ++globalVar; }
+};
+
+struct WithDestructor
+{
+	~WithDestructor() { ++globalVar; }
+};
+
+static WithConstructor constructed; // GOOD (constructor has a side effect)
+static WithDestructor destructed; // GOOD (destructor has a side effect)
+
+static auto sum(auto... values)
+{
+	return (0 + ... + values);
+}
+
+int globalVar2 = sum() + sum(2);
diff --git a/cpp/ql/test/query-tests/Best Practices/UseOfGoto/UseOfGoto.cpp b/cpp/ql/test/query-tests/Best Practices/UseOfGoto/UseOfGoto.cpp
new file mode 100644
index 000000000000..0902ea72ff90
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/UseOfGoto/UseOfGoto.cpp	
@@ -0,0 +1,25 @@
+bool cond();
+
+void multiple_forward_and_backward_goto() { // $ Alert
+backward_one:
+  if (cond()) goto forward_one;
+backward_two:
+  if (cond()) goto forward_two;
+forward_one:
+  if (cond()) goto backward_one;
+forward_two:
+  if (cond()) goto backward_two;
+}
+
+void only_forward_goto() {
+  if (cond()) goto end;
+
+  // ...
+
+  if (cond()) goto end;
+
+  // ...
+
+end:
+  // ...
+}
diff --git a/cpp/ql/test/query-tests/Best Practices/UseOfGoto/UseOfGoto.expected b/cpp/ql/test/query-tests/Best Practices/UseOfGoto/UseOfGoto.expected
new file mode 100644
index 000000000000..9d4c90b7b389
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/UseOfGoto/UseOfGoto.expected	
@@ -0,0 +1 @@
+| UseOfGoto.cpp:3:6:3:39 | definition of multiple_forward_and_backward_goto | Multiple forward and backward goto statements may make function multiple_forward_and_backward_goto hard to understand. |
diff --git a/cpp/ql/test/query-tests/Best Practices/UseOfGoto/UseOfGoto.qlref b/cpp/ql/test/query-tests/Best Practices/UseOfGoto/UseOfGoto.qlref
new file mode 100644
index 000000000000..82c5d4f08266
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/UseOfGoto/UseOfGoto.qlref	
@@ -0,0 +1,2 @@
+query: Best Practices/UseOfGoto.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/PointlessComparison/PointlessComparison.cpp b/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/PointlessComparison/PointlessComparison.cpp
index d6462ea2b991..461a1a2131ce 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/PointlessComparison/PointlessComparison.cpp	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/PointlessComparison/PointlessComparison.cpp	
@@ -43,3 +43,9 @@ int extreme_values(void)
 	if (y >> 1 >= 0x7FFFFFFFFFFF) {} // $ Alert[cpp/constant-comparison] // always true
 	if (y >> 1 >= 0xFFFFFFFFFFF) {} // $ Alert[cpp/constant-comparison] // always true
 }
+
+// Test for overlap between PointlessComparison and PointlessSelfComparison
+// (PointlessComparison should *not* report this)
+bool selfCmp1(int x) {
+  return (x == (int)x);
+}
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/NonConstantFormat/NonConstantFormat.expected b/cpp/ql/test/query-tests/Likely Bugs/Format/NonConstantFormat/NonConstantFormat.expected
index a4395489d4ee..d0784987f322 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Format/NonConstantFormat/NonConstantFormat.expected	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/NonConstantFormat/NonConstantFormat.expected	
@@ -1,3 +1,23 @@
+#select
+| NonConstantFormat.c:30:10:30:16 | *access to array | NonConstantFormat.c:28:27:28:30 | **argv | NonConstantFormat.c:30:10:30:16 | *access to array | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | NonConstantFormat.c:30:3:30:8 | call to printf | printf |
+| NonConstantFormat.c:41:9:41:45 | *call to any_random_function | NonConstantFormat.c:41:9:41:45 | *call to any_random_function | NonConstantFormat.c:41:9:41:45 | *call to any_random_function | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | NonConstantFormat.c:41:2:41:7 | call to printf | printf |
+| NonConstantFormat.c:45:9:45:48 | *call to gettext | NonConstantFormat.c:45:11:45:47 | *call to any_random_function | NonConstantFormat.c:45:9:45:48 | *call to gettext | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | NonConstantFormat.c:45:2:45:7 | call to printf | printf |
+| nested.cpp:21:23:21:26 | *fmt0 | nested.cpp:42:24:42:34 | *call to ext_fmt_str | nested.cpp:21:23:21:26 | *fmt0 | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | nested.cpp:21:5:21:12 | call to snprintf | snprintf |
+| nested.cpp:79:32:79:38 | *call to get_fmt | nested.cpp:79:32:79:38 | *call to get_fmt | nested.cpp:79:32:79:38 | *call to get_fmt | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | nested.cpp:79:5:79:14 | call to diagnostic | diagnostic |
+| nested.cpp:87:18:87:20 | *fmt | nested.cpp:86:19:86:46 | *call to __builtin_alloca | nested.cpp:87:18:87:20 | *fmt | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | nested.cpp:87:7:87:16 | call to diagnostic | diagnostic |
+| test.cpp:130:20:130:26 | *access to array | test.cpp:46:27:46:30 | **argv | test.cpp:130:20:130:26 | *access to array | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:130:2:130:10 | call to sprintf | sprintf |
+| test.cpp:170:12:170:14 | *res | test.cpp:167:31:167:34 | *data | test.cpp:170:12:170:14 | *res | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:170:5:170:10 | call to printf | printf |
+| test.cpp:195:31:195:33 | *str | test.cpp:193:32:193:34 | *str | test.cpp:195:31:195:33 | *str | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:195:3:195:18 | call to StringCchPrintfW | StringCchPrintfW |
+| test.cpp:197:11:197:14 | *wstr | test.cpp:193:32:193:34 | *str | test.cpp:197:11:197:14 | *wstr | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:197:3:197:9 | call to wprintf | wprintf |
+| test.cpp:205:12:205:20 | *... + ... | test.cpp:204:25:204:36 | *call to get_string | test.cpp:205:12:205:20 | *... + ... | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:205:5:205:10 | call to printf | printf |
+| test.cpp:206:12:206:16 | *hello | test.cpp:204:25:204:36 | *call to get_string | test.cpp:206:12:206:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:206:5:206:10 | call to printf | printf |
+| test.cpp:211:12:211:16 | *hello | test.cpp:209:25:209:36 | *call to get_string | test.cpp:211:12:211:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:211:5:211:10 | call to printf | printf |
+| test.cpp:217:12:217:16 | *hello | test.cpp:215:25:215:36 | *call to get_string | test.cpp:217:12:217:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:217:5:217:10 | call to printf | printf |
+| test.cpp:223:12:223:16 | *hello | test.cpp:221:25:221:36 | *call to get_string | test.cpp:223:12:223:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:223:5:223:10 | call to printf | printf |
+| test.cpp:228:12:228:18 | *++ ... | test.cpp:227:25:227:36 | *call to get_string | test.cpp:228:12:228:18 | *++ ... | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:228:5:228:10 | call to printf | printf |
+| test.cpp:235:12:235:16 | *hello | test.cpp:232:25:232:36 | *call to get_string | test.cpp:235:12:235:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:235:5:235:10 | call to printf | printf |
+| test.cpp:242:12:242:16 | *hello | test.cpp:239:25:239:36 | *call to get_string | test.cpp:242:12:242:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:242:5:242:10 | call to printf | printf |
+| test.cpp:247:12:247:16 | *hello | test.cpp:245:25:245:36 | *call to get_string | test.cpp:247:12:247:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:247:5:247:10 | call to printf | printf |
 edges
 | NonConstantFormat.c:28:27:28:30 | **argv | NonConstantFormat.c:30:10:30:16 | *access to array | provenance |  |
 | NonConstantFormat.c:45:11:45:47 | *call to any_random_function | NonConstantFormat.c:45:9:45:48 | *call to gettext | provenance | DataFlowFunction |
@@ -15,7 +35,7 @@ edges
 | test.cpp:193:32:193:34 | *str | test.cpp:195:31:195:33 | *str | provenance |  |
 | test.cpp:193:32:193:34 | *str | test.cpp:197:11:197:14 | *wstr | provenance | TaintFunction |
 | test.cpp:195:20:195:23 | StringCchPrintfW output argument | test.cpp:197:11:197:14 | *wstr | provenance |  |
-| test.cpp:195:31:195:33 | *str | test.cpp:195:20:195:23 | StringCchPrintfW output argument | provenance | MaD:403 |
+| test.cpp:195:31:195:33 | *str | test.cpp:195:20:195:23 | StringCchPrintfW output argument | provenance | MaD:1 |
 | test.cpp:204:25:204:36 | *call to get_string | test.cpp:204:25:204:36 | *call to get_string | provenance |  |
 | test.cpp:204:25:204:36 | *call to get_string | test.cpp:205:12:205:20 | *... + ... | provenance |  |
 | test.cpp:204:25:204:36 | *call to get_string | test.cpp:206:12:206:16 | *hello | provenance |  |
@@ -37,6 +57,8 @@ edges
 | test.cpp:239:25:239:36 | *call to get_string | test.cpp:242:12:242:16 | *hello | provenance |  |
 | test.cpp:245:25:245:36 | *call to get_string | test.cpp:245:25:245:36 | *call to get_string | provenance |  |
 | test.cpp:245:25:245:36 | *call to get_string | test.cpp:247:12:247:16 | *hello | provenance |  |
+models
+| 1 | Summary: ; ; false; StringCchPrintfW; ; ; Argument[*2..8]; Argument[*0]; taint; manual |
 nodes
 | NonConstantFormat.c:28:27:28:30 | **argv | semmle.label | **argv |
 | NonConstantFormat.c:30:10:30:16 | *access to array | semmle.label | *access to array |
@@ -93,23 +115,3 @@ nodes
 | test.cpp:245:25:245:36 | *call to get_string | semmle.label | *call to get_string |
 | test.cpp:247:12:247:16 | *hello | semmle.label | *hello |
 subpaths
-#select
-| NonConstantFormat.c:30:10:30:16 | *access to array | NonConstantFormat.c:28:27:28:30 | **argv | NonConstantFormat.c:30:10:30:16 | *access to array | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | NonConstantFormat.c:30:3:30:8 | call to printf | printf |
-| NonConstantFormat.c:41:9:41:45 | *call to any_random_function | NonConstantFormat.c:41:9:41:45 | *call to any_random_function | NonConstantFormat.c:41:9:41:45 | *call to any_random_function | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | NonConstantFormat.c:41:2:41:7 | call to printf | printf |
-| NonConstantFormat.c:45:9:45:48 | *call to gettext | NonConstantFormat.c:45:11:45:47 | *call to any_random_function | NonConstantFormat.c:45:9:45:48 | *call to gettext | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | NonConstantFormat.c:45:2:45:7 | call to printf | printf |
-| nested.cpp:21:23:21:26 | *fmt0 | nested.cpp:42:24:42:34 | *call to ext_fmt_str | nested.cpp:21:23:21:26 | *fmt0 | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | nested.cpp:21:5:21:12 | call to snprintf | snprintf |
-| nested.cpp:79:32:79:38 | *call to get_fmt | nested.cpp:79:32:79:38 | *call to get_fmt | nested.cpp:79:32:79:38 | *call to get_fmt | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | nested.cpp:79:5:79:14 | call to diagnostic | diagnostic |
-| nested.cpp:87:18:87:20 | *fmt | nested.cpp:86:19:86:46 | *call to __builtin_alloca | nested.cpp:87:18:87:20 | *fmt | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | nested.cpp:87:7:87:16 | call to diagnostic | diagnostic |
-| test.cpp:130:20:130:26 | *access to array | test.cpp:46:27:46:30 | **argv | test.cpp:130:20:130:26 | *access to array | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:130:2:130:10 | call to sprintf | sprintf |
-| test.cpp:170:12:170:14 | *res | test.cpp:167:31:167:34 | *data | test.cpp:170:12:170:14 | *res | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:170:5:170:10 | call to printf | printf |
-| test.cpp:195:31:195:33 | *str | test.cpp:193:32:193:34 | *str | test.cpp:195:31:195:33 | *str | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:195:3:195:18 | call to StringCchPrintfW | StringCchPrintfW |
-| test.cpp:197:11:197:14 | *wstr | test.cpp:193:32:193:34 | *str | test.cpp:197:11:197:14 | *wstr | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:197:3:197:9 | call to wprintf | wprintf |
-| test.cpp:205:12:205:20 | *... + ... | test.cpp:204:25:204:36 | *call to get_string | test.cpp:205:12:205:20 | *... + ... | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:205:5:205:10 | call to printf | printf |
-| test.cpp:206:12:206:16 | *hello | test.cpp:204:25:204:36 | *call to get_string | test.cpp:206:12:206:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:206:5:206:10 | call to printf | printf |
-| test.cpp:211:12:211:16 | *hello | test.cpp:209:25:209:36 | *call to get_string | test.cpp:211:12:211:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:211:5:211:10 | call to printf | printf |
-| test.cpp:217:12:217:16 | *hello | test.cpp:215:25:215:36 | *call to get_string | test.cpp:217:12:217:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:217:5:217:10 | call to printf | printf |
-| test.cpp:223:12:223:16 | *hello | test.cpp:221:25:221:36 | *call to get_string | test.cpp:223:12:223:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:223:5:223:10 | call to printf | printf |
-| test.cpp:228:12:228:18 | *++ ... | test.cpp:227:25:227:36 | *call to get_string | test.cpp:228:12:228:18 | *++ ... | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:228:5:228:10 | call to printf | printf |
-| test.cpp:235:12:235:16 | *hello | test.cpp:232:25:232:36 | *call to get_string | test.cpp:235:12:235:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:235:5:235:10 | call to printf | printf |
-| test.cpp:242:12:242:16 | *hello | test.cpp:239:25:239:36 | *call to get_string | test.cpp:242:12:242:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:242:5:242:10 | call to printf | printf |
-| test.cpp:247:12:247:16 | *hello | test.cpp:245:25:245:36 | *call to get_string | test.cpp:247:12:247:16 | *hello | The format string argument to $@ has a source which cannot be verified to originate from a string literal. | test.cpp:247:5:247:10 | call to printf | printf |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/NonConstantFormat/NonConstantFormat.qlref b/cpp/ql/test/query-tests/Likely Bugs/Format/NonConstantFormat/NonConstantFormat.qlref
index cb71273232ca..e33cbe4e51e1 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Format/NonConstantFormat/NonConstantFormat.qlref	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/NonConstantFormat/NonConstantFormat.qlref	
@@ -1,2 +1,4 @@
 query: Likely Bugs/Format/NonConstantFormat.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+postprocess:
+ - utils/test/PrettyPrintModels.ql
+ - utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear/test.cpp b/cpp/ql/test/query-tests/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear/test.cpp
index f76167c1893b..3994fce4ee88 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear/test.cpp	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear/test.cpp	
@@ -68,3 +68,12 @@ void VectorOfDays_FalsePositive(int dayOfYear, int x)
 
 	items[dayOfYear - 1] = x;
 }
+
+void f_______________________________________________________this_name_must_be_exactly_357_chars__________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________() {
+  // Using this magic compiler variable results in a `const char` array being
+  // initialized with the function signature. Including `void`, a space, and
+  // `()`, the signature adds up to exactly 364 characters in this case.
+  // The initializer for `__PRETTY_FUNCTION__` thus initializes an array of
+  // length 365 (because the null-terminator adds another character).
+  auto x = __PRETTY_FUNCTION__; // clean
+}
\ No newline at end of file
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison/AmbiguousAssignmentOfComparison.expected b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison/AmbiguousAssignmentOfComparison.expected
new file mode 100644
index 000000000000..8b905f48bba2
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison/AmbiguousAssignmentOfComparison.expected	
@@ -0,0 +1,36 @@
+| test.c:6:8:6:31 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.c:13:30:13:54 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.c:20:8:20:33 | ... /= ... | The '/=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.c:27:8:27:33 | ... %= ... | The '%=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.c:34:8:34:32 | ... \|= ... | The '\|=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.c:41:8:41:33 | ... >>= ... | The '>>=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.c:51:3:51:26 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.c:102:28:102:51 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.c:109:15:109:38 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.c:116:49:116:72 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.c:130:11:130:34 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:8:8:8:30 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:15:11:15:34 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:22:7:22:29 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:29:11:29:40 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:36:8:36:30 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:43:11:43:33 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:48:8:48:33 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:55:8:55:32 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:64:13:64:35 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:70:29:70:51 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:77:8:77:30 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:84:8:84:38 | ... <<= ... | The '<<=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:91:9:91:31 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:101:3:101:20 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:253:8:253:24 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:294:27:294:49 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:301:27:301:49 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:308:9:308:31 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:315:15:315:37 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:322:23:322:45 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:329:47:329:69 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:343:47:343:69 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:350:11:350:33 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:355:12:355:34 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
+| test.cpp:360:14:360:36 | ... = ... | The '=' operation assigns the result of an unparenthesized comparison, and its result is used as a truth value. |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison/AmbiguousAssignmentOfComparison.qlref b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison/AmbiguousAssignmentOfComparison.qlref
new file mode 100644
index 000000000000..ffa4d7fb05d8
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison/AmbiguousAssignmentOfComparison.qlref	
@@ -0,0 +1,2 @@
+query: Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison/test.c b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison/test.c
new file mode 100644
index 000000000000..18e7675e40ad
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison/test.c	
@@ -0,0 +1,136 @@
+int read_value(void);
+int read_other_value(void);
+
+int c_direct_condition(void) {
+  int value;
+  if ((value = read_value() < 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int c_logical_condition(void) {
+  int value;
+  if (read_other_value() && (value = read_value() >= 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int c_compound_divide(void) {
+  int value = 8;
+  if ((value /= read_value() != 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int c_compound_remainder(void) {
+  int value = 8;
+  if ((value %= read_value() != 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int c_compound_bitwise_or(void) {
+  int value = 0;
+  if ((value |= read_value() > 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int c_compound_right_shift(void) {
+  int value = 8;
+  if ((value >>= read_value() > 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+#define C_AMBIGUOUS_CHECK(VALUE) \
+  if (((VALUE) = read_value() < 0)) return (VALUE)
+
+int c_macro_condition(void) {
+  int value;
+  C_AMBIGUOUS_CHECK(value); // $ Alert // BAD
+  return 0;
+}
+
+int c_explicit_assign_then_compare(void) {
+  int value;
+  if ((value = read_value()) < 0) // GOOD
+    return value;
+  return 0;
+}
+
+int c_explicit_compare_then_assign(void) {
+  int value;
+  if ((value = (read_value() < 0))) // GOOD
+    return value;
+  return 0;
+}
+
+int c_explicit_cast_of_comparison(void) {
+  int value;
+  if ((value = (int)(read_value() < 0))) // GOOD: The cast explicitly groups the comparison.
+    return value;
+  return 0;
+}
+
+int c_boolean_result_assignment(void) {
+  _Bool negative;
+  if ((negative = read_value() < 0)) // GOOD: Assigning a comparison result to a Boolean is natural.
+    return negative;
+  return 0;
+}
+
+int c_switch_expression(void) {
+  int value;
+  switch (value = read_value() < 0) { // GOOD: The switch operand is not used as a truth value.
+  case 0:
+    return value;
+  default:
+    return 0;
+  }
+}
+
+int c_discarded_assignment_in_comma_expression(void) {
+  int value;
+  if ((value = read_value() < 0, read_other_value())) // GOOD: The assignment result is discarded.
+    return value;
+  return 0;
+}
+
+int c_truth_valued_assignment_in_comma_expression(void) {
+  int value;
+  if ((read_other_value(), value = read_value() < 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int c_truth_valued_conditional_then_arm(int flag) {
+  int value;
+  if (flag ? (value = read_value() < 0) : 0) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int c_nested_truth_valued_comma_expression(void) {
+  int value;
+  if ((read_other_value(), (read_other_value(), value = read_value() < 0))) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int c_nested_discarded_comma_expression(void) {
+  int value;
+  if (((read_other_value(), value = read_value() < 0), read_other_value())) // GOOD: Discarded.
+    return value;
+  return 0;
+}
+
+int c_logical_value_outside_branch(void) {
+  int value;
+  return (value = read_value() < 0) && read_other_value(); // $ Alert // BAD
+}
+
+int c_returned_assignment(void) {
+  int value;
+  return value = read_value() < 0; // GOOD: The assignment result is not used as a truth value.
+}
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison/test.cpp b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison/test.cpp
new file mode 100644
index 000000000000..ac20faf01958
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AmbiguousAssignmentOfComparison/test.cpp	
@@ -0,0 +1,373 @@
+int get_value();
+int get_other_value();
+void *get_pointer();
+bool check(int value);
+
+int direct_if() {
+  int value;
+  if ((value = get_value() < 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int direct_while() {
+  int value;
+  while ((value = get_value() != 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int without_outer_parentheses() {
+  int value;
+  if (value = get_value() < 0) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int for_condition() {
+  int value;
+  for (; (value = get_other_value() <= 0);) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int logical_and() {
+  int value;
+  if ((value = get_value() < 0) && get_other_value()) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int ternary_condition() {
+  int value;
+  return (value = get_value() > 0) ? value : 0; // $ Alert // BAD
+}
+
+int pointer_comparison() {
+  int value;
+  if ((value = get_pointer() == 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int parenthesized_operand_only() {
+  int value;
+  if ((value = (get_value()) < 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int do_while_condition() {
+  int value = 0;
+  do {
+    value++;
+  } while ((value = get_value() < 0)); // $ Alert // BAD
+  return value;
+}
+
+int logical_or() {
+  int value;
+  if (get_other_value() || (value = get_value() > 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int nested_comparison() {
+  int value;
+  if ((value = get_value() < 0) == false) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int compound_shift() {
+  int value = 1;
+  if ((value <<= get_other_value() > 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int under_logical_not() {
+  int value;
+  if (!(value = get_value() < 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+#define CHECK_VALUE(VALUE) \
+  if (((VALUE) = get_value() < 0)) return (VALUE)
+
+int macro_condition() {
+  int value;
+  CHECK_VALUE(value); // $ Alert // BAD
+  return 0;
+}
+
+int explicit_assign_then_compare() {
+  int value;
+  if ((value = get_value()) < 0) // GOOD
+    return value;
+  return 0;
+}
+
+int explicit_compare_then_assign() {
+  int value;
+  if ((value = (get_value() < 0))) // GOOD
+    return value;
+  return 0;
+}
+
+int parenthesized_simple_assignment() {
+  int value;
+  if ((value = get_value())) // GOOD
+    return value;
+  return 0;
+}
+
+int assignment_outside_condition() {
+  int value;
+  value = get_value() < 0; // GOOD: The assignment is not part of a condition.
+  return value;
+}
+
+int plain_comparison() {
+  int value = get_value();
+  if (value < 0) // GOOD
+    return value;
+  return 0;
+}
+
+int explicit_compare_then_assign_without_outer_parentheses() {
+  int value;
+  if (value = (get_value() < 0)) // GOOD
+    return value;
+  return 0;
+}
+
+int explicit_assign_then_compare_in_for() {
+  int value;
+  for (; (value = get_other_value()) >= 0;) // GOOD
+    return value;
+  return 0;
+}
+
+int two_explicit_assignments() {
+  int left, right;
+  if ((left = get_value()) < 0 && (right = get_other_value()) < 0) // GOOD
+    return left + right;
+  return 0;
+}
+
+int explicit_comparison_then_compound_assign() {
+  int value = 0;
+  if ((value += (get_value() < 0))) // GOOD
+    return value;
+  return 0;
+}
+
+int compound_assignment_without_comparison() {
+  int value = ~0;
+  if ((value &= get_value())) // GOOD
+    return value;
+  return 0;
+}
+
+int switch_expression() {
+  int value;
+  switch (value = get_value() < 0) { // GOOD: The switch operand is not used as a truth value.
+  case 0:
+    return value;
+  default:
+    return 0;
+  }
+}
+
+#define EXPLICIT_CHECK(VALUE) \
+  if (((VALUE) = get_value()) < 0) return (VALUE)
+
+int explicit_macro_condition() {
+  int value;
+  EXPLICIT_CHECK(value); // GOOD
+  return 0;
+}
+
+template <typename T>
+int never_instantiated_template(T input) {
+  int value;
+  if ((value = input < 0)) // GOOD: Uninstantiated template code is excluded.
+    return value;
+  return 0;
+}
+
+int unevaluated_assignment() {
+  int value;
+  if (sizeof(value = get_value() < 0)) // GOOD: The assignment is unevaluated.
+    return value;
+  return 0;
+}
+
+int constant_assignment() {
+  int value;
+  if ((value = 0)) // GOOD: The right-hand side is not a comparison.
+    return value;
+  return 0;
+}
+
+int explicit_compound_shift_then_compare() {
+  int value = 1;
+  if ((value <<= get_other_value()) > 0) // GOOD
+    return value;
+  return 0;
+}
+
+int boolean_result_assignment() {
+  bool negative;
+  if ((negative = get_value() < 0)) // GOOD: Assigning a comparison result to a Boolean is natural.
+    return negative;
+  return 0;
+}
+
+int boolean_result_compound_assignment() {
+  bool seen = false;
+  if ((seen |= get_value() < 0)) // GOOD: Accumulating a comparison result in a Boolean is natural.
+    return seen;
+  return 0;
+}
+
+int explicit_static_cast_of_comparison() {
+  int value;
+  if ((value = static_cast<int>(get_value() < 0))) // GOOD: The cast explicitly groups the comparison.
+    return value;
+  return 0;
+}
+
+int explicit_functional_cast_of_comparison() {
+  int value;
+  if ((value = int(get_value() < 0))) // GOOD: The cast explicitly groups the comparison.
+    return value;
+  return 0;
+}
+
+template <typename T>
+int instantiated_template_body(T input) {
+  int value;
+  if ((value = input < 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int instantiate_template() {
+  return instantiated_template_body<int>(get_value());
+}
+
+struct Comparable {
+  int value;
+};
+
+bool operator<(Comparable left, int right) {
+  return left.value < right;
+}
+
+int overloaded_comparison() {
+  Comparable input = {get_value()};
+  int value;
+  if ((value = input < 0)) // $ MISSING: Alert // BAD [NOT DETECTED]: overloaded operators are outside this query's scope.
+    return value;
+  return 0;
+}
+
+int assignment_as_call_argument() {
+  int value;
+  if (check(value = get_value() < 0)) // GOOD: The assignment only computes an integer argument.
+    return value;
+  return 0;
+}
+
+int discarded_assignment_in_comma_expression() {
+  int value;
+  if ((value = get_value() < 0, get_other_value())) // GOOD: The assignment result is discarded.
+    return value;
+  return 0;
+}
+
+int truth_valued_assignment_in_comma_expression() {
+  int value;
+  if ((get_other_value(), value = get_value() < 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int comma_assignment_under_comparison() {
+  int value;
+  if ((get_other_value(), value = get_value() < 0) == false) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int nested_truth_valued_comparisons() {
+  int value;
+  if (((value = get_value() < 0) == false) == false) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int truth_valued_conditional_then_arm(bool flag) {
+  int value;
+  if (flag ? (value = get_value() < 0) : false) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int truth_valued_conditional_else_arm(bool flag) {
+  int value;
+  if (flag ? false : (value = get_value() < 0)) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int nested_truth_valued_comma_expression() {
+  int value;
+  if ((get_other_value(), (get_other_value(), value = get_value() < 0))) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int nested_discarded_comma_expression() {
+  int value;
+  if (((get_other_value(), value = get_value() < 0), get_other_value())) // GOOD: Discarded.
+    return value;
+  return 0;
+}
+
+int nested_comma_assignment_under_comparison() {
+  int value;
+  if ((get_other_value(), (get_other_value(), value = get_value() < 0)) == false) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+bool logical_value_outside_branch() {
+  int value;
+  return (value = get_value() < 0) && get_other_value(); // $ Alert // BAD
+}
+
+bool logical_not_outside_branch() {
+  int value;
+  return !(value = get_value() < 0); // $ Alert // BAD
+}
+
+int truth_valued_assignment_inside_call_argument() {
+  int value;
+  if (check((value = get_value() < 0) && get_other_value())) // $ Alert // BAD
+    return value;
+  return 0;
+}
+
+int assignment_in_lambda_body() {
+  int value;
+  if ([&]() {
+        value = get_value() < 0; // GOOD: The lambda body is not the surrounding condition.
+        return true;
+      }())
+    return value;
+  return 0;
+}
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/FutileConditional/FutileConditional.cpp b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/FutileConditional/FutileConditional.cpp
new file mode 100644
index 000000000000..1635300ac9a9
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/FutileConditional/FutileConditional.cpp	
@@ -0,0 +1,19 @@
+void emptyIfs(int value) {
+  if (value) {} // $ Alert[cpp/empty-if]
+
+  if (value > 1) {
+  } // $ Alert[cpp/empty-if]
+
+  if (value) { // GOOD
+    ++value;
+  }
+
+  if (value) { // GOOD
+  } else {
+    ++value;
+  }
+
+  if (value) { // $ MISSING: Alert[cpp/empty-if]
+  } else {
+  }
+}
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/FutileConditional/FutileConditional.expected b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/FutileConditional/FutileConditional.expected
new file mode 100644
index 000000000000..136258f326a2
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/FutileConditional/FutileConditional.expected	
@@ -0,0 +1,2 @@
+| FutileConditional.cpp:2:3:2:15 | if (...) ...  | If-statement with an empty then-branch and no else-branch. |
+| FutileConditional.cpp:4:3:5:3 | if (...) ...  | If-statement with an empty then-branch and no else-branch. |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/FutileConditional/FutileConditional.qlref b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/FutileConditional/FutileConditional.qlref
new file mode 100644
index 000000000000..a64e5b47b5bf
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/FutileConditional/FutileConditional.qlref	
@@ -0,0 +1,2 @@
+query: Likely Bugs/Likely Typos/FutileConditional.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-078/semmle/ExecTainted/ExecTainted.qlref b/cpp/ql/test/query-tests/Security/CWE/CWE-078/semmle/ExecTainted/ExecTainted.qlref
index 4e996a47ad54..77cdee7b2839 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-078/semmle/ExecTainted/ExecTainted.qlref
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-078/semmle/ExecTainted/ExecTainted.qlref
@@ -1,2 +1,4 @@
 query: Security/CWE/CWE-078/ExecTainted.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-089/SqlTainted/SqlTainted.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-089/SqlTainted/SqlTainted.expected
index df780acdd8d0..253fe0f02e14 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-089/SqlTainted/SqlTainted.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-089/SqlTainted/SqlTainted.expected
@@ -1,11 +1,19 @@
 #select
-| test.c:21:18:21:23 | query1 | test.c:14:27:14:30 | **argv | test.c:21:18:21:23 | *query1 | This argument to a SQL query function is derived from $@ and then passed to mysql_query(sqlArg). | test.c:14:27:14:30 | **argv | user input (a command-line argument) |
-| test.c:51:18:51:23 | query1 | test.c:14:27:14:30 | **argv | test.c:51:18:51:23 | *query1 | This argument to a SQL query function is derived from $@ and then passed to mysql_query(sqlArg). | test.c:14:27:14:30 | **argv | user input (a command-line argument) |
-| test.c:76:17:76:25 | userInput | test.c:75:8:75:16 | gets output argument | test.c:76:17:76:25 | *userInput | This argument to a SQL query function is derived from $@ and then passed to SQLPrepare(StatementText). | test.c:75:8:75:16 | gets output argument | user input (string read by gets) |
-| test.c:77:20:77:28 | userInput | test.c:75:8:75:16 | gets output argument | test.c:77:20:77:28 | *userInput | This argument to a SQL query function is derived from $@ and then passed to SQLExecDirect(StatementText). | test.c:75:8:75:16 | gets output argument | user input (string read by gets) |
-| test.c:106:24:106:29 | query1 | test.c:101:8:101:16 | gets output argument | test.c:106:24:106:29 | *query1 | This argument to a SQL query function is derived from $@. | test.c:101:8:101:16 | gets output argument | user input (string read by gets) |
-| test.c:107:28:107:33 | query1 | test.c:101:8:101:16 | gets output argument | test.c:107:28:107:33 | *query1 | This argument to a SQL query function is derived from $@. | test.c:101:8:101:16 | gets output argument | user input (string read by gets) |
-| test.cpp:43:27:43:33 | access to array | test.cpp:39:27:39:30 | **argv | test.cpp:43:27:43:33 | *access to array | This argument to a SQL query function is derived from $@ and then passed to pqxx::work::exec1((unnamed parameter 0)). | test.cpp:39:27:39:30 | **argv | user input (a command-line argument) |
+| test.c:21:18:21:23 | *query1 | test.c:14:27:14:30 | **argv | test.c:21:18:21:23 | *query1 | This argument to a SQL query function is derived from $@ and then passed to mysql_query(sqlArg). | test.c:14:27:14:30 | **argv | user input (a command-line argument) |
+| test.c:51:18:51:23 | *query1 | test.c:14:27:14:30 | **argv | test.c:51:18:51:23 | *query1 | This argument to a SQL query function is derived from $@ and then passed to mysql_query(sqlArg). | test.c:14:27:14:30 | **argv | user input (a command-line argument) |
+| test.c:76:17:76:25 | *userInput | test.c:75:8:75:16 | gets output argument | test.c:76:17:76:25 | *userInput | This argument to a SQL query function is derived from $@ and then passed to SQLPrepare(StatementText). | test.c:75:8:75:16 | gets output argument | user input (string read by gets) |
+| test.c:77:20:77:28 | *userInput | test.c:75:8:75:16 | gets output argument | test.c:77:20:77:28 | *userInput | This argument to a SQL query function is derived from $@ and then passed to SQLExecDirect(StatementText). | test.c:75:8:75:16 | gets output argument | user input (string read by gets) |
+| test.c:106:24:106:29 | query1 | test.c:101:8:101:16 | gets output argument | test.c:106:24:106:29 | query1 | This argument to a SQL query function is derived from $@. | test.c:101:8:101:16 | gets output argument | user input (string read by gets) |
+| test.c:107:28:107:33 | query1 | test.c:101:8:101:16 | gets output argument | test.c:107:28:107:33 | query1 | This argument to a SQL query function is derived from $@. | test.c:101:8:101:16 | gets output argument | user input (string read by gets) |
+| test.cpp:43:27:43:33 | *access to array | test.cpp:39:27:39:30 | **argv | test.cpp:43:27:43:33 | *access to array | This argument to a SQL query function is derived from $@ and then passed to pqxx::work::exec1((unnamed parameter 0)). | test.cpp:39:27:39:30 | **argv | user input (a command-line argument) |
+| test_comdb2.c:22:28:22:36 | userInput | test_comdb2.c:18:8:18:16 | gets output argument | test_comdb2.c:22:28:22:36 | userInput | This argument to a SQL query function is derived from $@. | test_comdb2.c:18:8:18:16 | gets output argument | user input (string read by gets) |
+| test_comdb2.c:23:34:23:42 | userInput | test_comdb2.c:18:8:18:16 | gets output argument | test_comdb2.c:23:34:23:42 | userInput | This argument to a SQL query function is derived from $@. | test_comdb2.c:18:8:18:16 | gets output argument | user input (string read by gets) |
+| test_libpq.c:26:16:26:24 | userInput | test_libpq.c:23:8:23:16 | gets output argument | test_libpq.c:26:16:26:24 | userInput | This argument to a SQL query function is derived from $@. | test_libpq.c:23:8:23:16 | gets output argument | user input (string read by gets) |
+| test_libpq.c:27:22:27:30 | userInput | test_libpq.c:23:8:23:16 | gets output argument | test_libpq.c:27:22:27:30 | userInput | This argument to a SQL query function is derived from $@. | test_libpq.c:23:8:23:16 | gets output argument | user input (string read by gets) |
+| test_libpq.c:28:27:28:35 | userInput | test_libpq.c:23:8:23:16 | gets output argument | test_libpq.c:28:27:28:35 | userInput | This argument to a SQL query function is derived from $@. | test_libpq.c:23:8:23:16 | gets output argument | user input (string read by gets) |
+| test_libpq.c:29:21:29:29 | userInput | test_libpq.c:23:8:23:16 | gets output argument | test_libpq.c:29:21:29:29 | userInput | This argument to a SQL query function is derived from $@. | test_libpq.c:23:8:23:16 | gets output argument | user input (string read by gets) |
+| test_libpq.c:30:27:30:35 | userInput | test_libpq.c:23:8:23:16 | gets output argument | test_libpq.c:30:27:30:35 | userInput | This argument to a SQL query function is derived from $@. | test_libpq.c:23:8:23:16 | gets output argument | user input (string read by gets) |
+| test_libpq.c:31:31:31:39 | userInput | test_libpq.c:23:8:23:16 | gets output argument | test_libpq.c:31:31:31:39 | userInput | This argument to a SQL query function is derived from $@. | test_libpq.c:23:8:23:16 | gets output argument | user input (string read by gets) |
 edges
 | test.c:14:27:14:30 | **argv | test.c:15:20:15:26 | *access to array | provenance |  |
 | test.c:15:20:15:26 | *access to array | test.c:21:18:21:23 | *query1 | provenance | TaintFunction |
@@ -17,12 +25,28 @@ edges
 | test.c:48:20:48:33 | *globalUsername | test.c:51:18:51:23 | *query1 | provenance | TaintFunction |
 | test.c:75:8:75:16 | gets output argument | test.c:76:17:76:25 | *userInput | provenance |  |
 | test.c:75:8:75:16 | gets output argument | test.c:77:20:77:28 | *userInput | provenance |  |
-| test.c:101:8:101:16 | gets output argument | test.c:106:24:106:29 | *query1 | provenance | TaintFunction Sink:MaD:2 |
-| test.c:101:8:101:16 | gets output argument | test.c:107:28:107:33 | *query1 | provenance | TaintFunction Sink:MaD:1 |
+| test.c:101:8:101:16 | gets output argument | test.c:106:24:106:29 | query1 | provenance | TaintFunction Sink:MaD:2 |
+| test.c:101:8:101:16 | gets output argument | test.c:107:28:107:33 | query1 | provenance | TaintFunction Sink:MaD:1 |
 | test.cpp:39:27:39:30 | **argv | test.cpp:43:27:43:33 | *access to array | provenance |  |
+| test_comdb2.c:18:8:18:16 | gets output argument | test_comdb2.c:22:28:22:36 | userInput | provenance | Sink:MaD:9 |
+| test_comdb2.c:18:8:18:16 | gets output argument | test_comdb2.c:23:34:23:42 | userInput | provenance | Sink:MaD:10 |
+| test_libpq.c:23:8:23:16 | gets output argument | test_libpq.c:26:16:26:24 | userInput | provenance | Sink:MaD:3 |
+| test_libpq.c:23:8:23:16 | gets output argument | test_libpq.c:27:22:27:30 | userInput | provenance | Sink:MaD:4 |
+| test_libpq.c:23:8:23:16 | gets output argument | test_libpq.c:28:27:28:35 | userInput | provenance | Sink:MaD:5 |
+| test_libpq.c:23:8:23:16 | gets output argument | test_libpq.c:29:21:29:29 | userInput | provenance | Sink:MaD:7 |
+| test_libpq.c:23:8:23:16 | gets output argument | test_libpq.c:30:27:30:35 | userInput | provenance | Sink:MaD:8 |
+| test_libpq.c:23:8:23:16 | gets output argument | test_libpq.c:31:31:31:39 | userInput | provenance | Sink:MaD:6 |
 models
 | 1 | Sink: ; ; false; OCIStmtPrepare2; ; ; Argument[*3]; sql-injection; manual |
 | 2 | Sink: ; ; false; OCIStmtPrepare; ; ; Argument[*2]; sql-injection; manual |
+| 3 | Sink: ; ; false; PQexec; ; ; Argument[*1]; sql-injection; manual |
+| 4 | Sink: ; ; false; PQexecParams; ; ; Argument[*1]; sql-injection; manual |
+| 5 | Sink: ; ; false; PQprepare; ; ; Argument[*2]; sql-injection; manual |
+| 6 | Sink: ; ; false; PQsendPrepare; ; ; Argument[*2]; sql-injection; manual |
+| 7 | Sink: ; ; false; PQsendQuery; ; ; Argument[*1]; sql-injection; manual |
+| 8 | Sink: ; ; false; PQsendQueryParams; ; ; Argument[*1]; sql-injection; manual |
+| 9 | Sink: ; ; false; cdb2_run_statement; ; ; Argument[*1]; sql-injection; manual |
+| 10 | Sink: ; ; false; cdb2_run_statement_typed; ; ; Argument[*1]; sql-injection; manual |
 nodes
 | test.c:14:27:14:30 | **argv | semmle.label | **argv |
 | test.c:15:20:15:26 | *access to array | semmle.label | *access to array |
@@ -37,8 +61,18 @@ nodes
 | test.c:76:17:76:25 | *userInput | semmle.label | *userInput |
 | test.c:77:20:77:28 | *userInput | semmle.label | *userInput |
 | test.c:101:8:101:16 | gets output argument | semmle.label | gets output argument |
-| test.c:106:24:106:29 | *query1 | semmle.label | *query1 |
-| test.c:107:28:107:33 | *query1 | semmle.label | *query1 |
+| test.c:106:24:106:29 | query1 | semmle.label | query1 |
+| test.c:107:28:107:33 | query1 | semmle.label | query1 |
 | test.cpp:39:27:39:30 | **argv | semmle.label | **argv |
 | test.cpp:43:27:43:33 | *access to array | semmle.label | *access to array |
+| test_comdb2.c:18:8:18:16 | gets output argument | semmle.label | gets output argument |
+| test_comdb2.c:22:28:22:36 | userInput | semmle.label | userInput |
+| test_comdb2.c:23:34:23:42 | userInput | semmle.label | userInput |
+| test_libpq.c:23:8:23:16 | gets output argument | semmle.label | gets output argument |
+| test_libpq.c:26:16:26:24 | userInput | semmle.label | userInput |
+| test_libpq.c:27:22:27:30 | userInput | semmle.label | userInput |
+| test_libpq.c:28:27:28:35 | userInput | semmle.label | userInput |
+| test_libpq.c:29:21:29:29 | userInput | semmle.label | userInput |
+| test_libpq.c:30:27:30:35 | userInput | semmle.label | userInput |
+| test_libpq.c:31:31:31:39 | userInput | semmle.label | userInput |
 subpaths
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-089/SqlTainted/test_comdb2.c b/cpp/ql/test/query-tests/Security/CWE/CWE-089/SqlTainted/test_comdb2.c
new file mode 100644
index 000000000000..ce30e27700d6
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-089/SqlTainted/test_comdb2.c
@@ -0,0 +1,32 @@
+// Minimal declarations from the public Comdb2 C API:
+// https://github.com/bloomberg/comdb2/blob/dfb15415b48cbe67220d76964243086051813676/cdb2api/cdb2api.h
+typedef struct cdb2_hndl cdb2_hndl_tp;
+
+enum { CDB2_CSTRING = 3 };
+
+int cdb2_run_statement(cdb2_hndl_tp *hndl, const char *sql);
+int cdb2_run_statement_typed(cdb2_hndl_tp *hndl, const char *sql, int ntypes, const int *types);
+int cdb2_bind_param(cdb2_hndl_tp *hndl, const char *name, int type,
+                    const void *varaddr, int length);
+
+char *gets(char *s);
+typedef unsigned long size_t;
+size_t strlen(const char *s);
+
+void comdb2Tests(cdb2_hndl_tp *hndl) {
+  char userInput[1000];
+  gets(userInput); // $ Source
+  int types[] = {CDB2_CSTRING};
+
+  // Both execution functions interpret user-controlled query text as SQL.
+  cdb2_run_statement(hndl, userInput); // $ Alert
+  cdb2_run_statement_typed(hndl, userInput, 1, types); // $ Alert
+
+  cdb2_run_statement(hndl, "SELECT 1"); // GOOD
+  cdb2_run_statement_typed(hndl, "SELECT 'constant'", 1, types); // GOOD
+
+  // Bound values are data, not SQL text, even when controlled by the user.
+  cdb2_bind_param(hndl, "value", CDB2_CSTRING, userInput, strlen(userInput) + 1); // GOOD
+  cdb2_run_statement(hndl, "SELECT @value"); // GOOD
+  cdb2_run_statement_typed(hndl, "SELECT @value", 1, types); // GOOD
+}
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-089/SqlTainted/test_libpq.c b/cpp/ql/test/query-tests/Security/CWE/CWE-089/SqlTainted/test_libpq.c
new file mode 100644
index 000000000000..85ebe943ce62
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-089/SqlTainted/test_libpq.c
@@ -0,0 +1,35 @@
+typedef unsigned long size_t;
+typedef unsigned int Oid;
+typedef struct pg_conn PGconn;
+typedef struct pg_result PGresult;
+
+PGresult *PQexec(PGconn *conn, const char *query);
+PGresult *PQexecParams(PGconn *conn, const char *command, int nParams,
+                       const Oid *paramTypes, const char *const *paramValues,
+                       const int *paramLengths, const int *paramFormats, int resultFormat);
+PGresult *PQprepare(PGconn *conn, const char *stmtName, const char *query, int nParams,
+                    const Oid *paramTypes);
+int PQsendQuery(PGconn *conn, const char *query);
+int PQsendQueryParams(PGconn *conn, const char *command, int nParams, const Oid *paramTypes,
+                      const char *const *paramValues, const int *paramLengths,
+                      const int *paramFormats, int resultFormat);
+int PQsendPrepare(PGconn *conn, const char *stmtName, const char *query, int nParams,
+                  const Oid *paramTypes);
+
+char *gets(char *s);
+
+void libpqTests(PGconn *conn) {
+  char userInput[1000];
+  gets(userInput); // $ Source
+
+  // A user-controlled string is interpreted as SQL.
+  PQexec(conn, userInput);                                // $ Alert
+  PQexecParams(conn, userInput, 0, 0, 0, 0, 0, 0);        // $ Alert
+  PQprepare(conn, "stmt", userInput, 0, 0);               // $ Alert
+  PQsendQuery(conn, userInput);                           // $ Alert
+  PQsendQueryParams(conn, userInput, 0, 0, 0, 0, 0, 0);   // $ Alert
+  PQsendPrepare(conn, "stmt", userInput, 0, 0);           // $ Alert
+
+  // A constant query is safe.
+  PQexec(conn, "SELECT 1");                               // GOOD
+}
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextFileWrite.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextFileWrite.expected
index e283cbeb57bc..0406b6c174a6 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextFileWrite.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextFileWrite.expected
@@ -1,11 +1,52 @@
+#select
+| test2.cpp:43:2:43:8 | call to fprintf | test2.cpp:43:36:43:43 | password | test2.cpp:43:36:43:43 | password | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:43:36:43:43 | password | this source. |
+| test2.cpp:44:2:44:8 | call to fprintf | test2.cpp:44:37:44:45 | thepasswd | test2.cpp:44:37:44:45 | thepasswd | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:44:37:44:45 | thepasswd | this source. |
+| test2.cpp:45:2:45:8 | call to fprintf | test2.cpp:45:38:45:47 | accountkey | test2.cpp:45:38:45:47 | accountkey | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:45:38:45:47 | accountkey | this source. |
+| test2.cpp:50:2:50:8 | call to fprintf | test2.cpp:50:41:50:53 | passwd_config | test2.cpp:50:41:50:53 | passwd_config | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:50:41:50:53 | passwd_config | this source. |
+| test2.cpp:54:2:54:8 | call to fprintf | test2.cpp:54:41:54:52 | widepassword | test2.cpp:54:41:54:52 | widepassword | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:54:41:54:52 | widepassword | this source. |
+| test2.cpp:55:2:55:8 | call to fprintf | test2.cpp:55:40:55:51 | widepassword | test2.cpp:55:40:55:51 | widepassword | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:55:40:55:51 | widepassword | this source. |
+| test2.cpp:57:2:57:8 | call to fprintf | test2.cpp:57:39:57:49 | call to getPassword | test2.cpp:57:39:57:49 | call to getPassword | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:57:39:57:49 | call to getPassword | this source. |
+| test2.cpp:65:3:65:9 | call to fprintf | test2.cpp:62:18:62:25 | password | test2.cpp:65:31:65:34 | cpy1 | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:62:18:62:25 | password | this source. |
+| test2.cpp:73:3:73:9 | call to fprintf | test2.cpp:72:15:72:24 | password | test2.cpp:73:30:73:32 | *buf | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:72:17:72:24 | password | this source. |
+| test2.cpp:99:3:99:9 | call to fprintf | test2.cpp:98:45:98:52 | password | test2.cpp:99:27:99:32 | *buffer | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:98:45:98:52 | password | this source. |
+| test2.cpp:154:2:154:8 | call to fprintf | test2.cpp:153:31:153:38 | password | test2.cpp:154:21:154:22 | *pw | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:153:31:153:38 | password | this source. |
+| test2.cpp:168:2:168:8 | call to fprintf | test2.cpp:167:41:167:60 | password | test2.cpp:168:30:168:34 | *call to c_str | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:167:53:167:60 | password | this source. |
+| test2.cpp:174:2:174:8 | call to fprintf | test2.cpp:173:28:173:35 | *password | test2.cpp:174:26:174:30 | *call to c_str | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:173:28:173:35 | password | this source. |
+| test.cpp:45:3:45:7 | call to fputs | test.cpp:45:9:45:19 | thePassword | test.cpp:45:9:45:19 | thePassword | This write into file 'file' may contain unencrypted data from $@. | test.cpp:45:9:45:19 | thePassword | this source. |
+| test.cpp:70:35:70:35 | call to operator<< | test.cpp:70:38:70:48 | thePassword | test.cpp:70:38:70:48 | thePassword | This write into file 'mystream' may contain unencrypted data from $@. | test.cpp:70:38:70:48 | thePassword | this source. |
+| test.cpp:73:37:73:41 | call to write | test.cpp:70:38:70:48 | thePassword | test.cpp:73:43:73:53 | thePassword | This write into file 'mystream' may contain unencrypted data from $@. | test.cpp:70:38:70:48 | thePassword | this source. |
+| test.cpp:73:37:73:41 | call to write | test.cpp:73:43:73:53 | thePassword | test.cpp:73:43:73:53 | thePassword | This write into file 'mystream' may contain unencrypted data from $@. | test.cpp:73:43:73:53 | thePassword | this source. |
+| test.cpp:73:37:73:41 | call to write | test.cpp:73:63:73:73 | thePassword | test.cpp:73:43:73:53 | thePassword | This write into file 'mystream' may contain unencrypted data from $@. | test.cpp:73:63:73:73 | thePassword | this source. |
 edges
+| file://:0:0:0:0 | * ... | test2.cpp:162:9:162:14 | result | provenance | TaintFunction |
+| file://:0:0:0:0 | *++ ... | file://:0:0:0:0 | * ... | provenance |  |
+| file://:0:0:0:0 | ++ ... | file://:0:0:0:0 | * ... | provenance |  |
+| file://:0:0:0:0 | ++ ... | file://:0:0:0:0 | *++ ... | provenance |  |
 | test2.cpp:62:18:62:25 | password | test2.cpp:62:18:62:25 | password | provenance |  |
 | test2.cpp:62:18:62:25 | password | test2.cpp:65:31:65:34 | cpy1 | provenance |  |
 | test2.cpp:72:15:72:24 | password | test2.cpp:73:30:73:32 | *buf | provenance | DataFlowFunction |
 | test2.cpp:98:45:98:52 | password | test2.cpp:99:27:99:32 | *buffer | provenance | TaintFunction |
+| test2.cpp:153:31:153:38 | password | test2.cpp:153:40:153:44 | *call to c_str | provenance | TaintFunction |
+| test2.cpp:153:40:153:44 | *call to c_str | test2.cpp:154:21:154:22 | *pw | provenance |  |
+| test2.cpp:157:41:157:41 | s | test2.cpp:160:17:160:17 | *s | provenance |  |
+| test2.cpp:160:17:160:17 | *s | test2.cpp:160:17:160:17 | call to begin | provenance | TaintFunction |
+| test2.cpp:160:17:160:17 | call to begin | file://:0:0:0:0 | * ... | provenance |  |
+| test2.cpp:160:17:160:17 | call to begin | file://:0:0:0:0 | *++ ... | provenance |  |
+| test2.cpp:160:17:160:17 | call to begin | file://:0:0:0:0 | ++ ... | provenance |  |
+| test2.cpp:162:9:162:14 | result | test2.cpp:157:13:157:27 | *copy_characters | provenance |  |
+| test2.cpp:167:25:167:39 | call to copy_characters | test2.cpp:167:25:167:39 | call to copy_characters | provenance |  |
+| test2.cpp:167:25:167:39 | call to copy_characters | test2.cpp:168:30:168:34 | *call to c_str | provenance | TaintFunction |
+| test2.cpp:167:41:167:60 | password | test2.cpp:157:41:157:41 | s | provenance |  |
+| test2.cpp:167:41:167:60 | password | test2.cpp:167:25:167:39 | call to copy_characters | provenance | TaintFunction |
+| test2.cpp:167:41:167:60 | password | test2.cpp:167:41:167:60 | password | provenance |  |
+| test2.cpp:173:28:173:35 | *password | test2.cpp:173:28:173:35 | *password | provenance |  |
+| test2.cpp:173:28:173:35 | *password | test2.cpp:174:26:174:30 | *call to c_str | provenance | TaintFunction |
 | test.cpp:70:38:70:48 | thePassword | test.cpp:73:43:73:53 | thePassword | provenance |  |
 | test.cpp:73:63:73:73 | thePassword | test.cpp:73:43:73:53 | thePassword | provenance |  |
 nodes
+| file://:0:0:0:0 | * ... | semmle.label | * ... |
+| file://:0:0:0:0 | *++ ... | semmle.label | *++ ... |
+| file://:0:0:0:0 | ++ ... | semmle.label | ++ ... |
 | test2.cpp:43:36:43:43 | password | semmle.label | password |
 | test2.cpp:44:37:44:45 | thepasswd | semmle.label | thepasswd |
 | test2.cpp:45:38:45:47 | accountkey | semmle.label | accountkey |
@@ -20,25 +61,26 @@ nodes
 | test2.cpp:73:30:73:32 | *buf | semmle.label | *buf |
 | test2.cpp:98:45:98:52 | password | semmle.label | password |
 | test2.cpp:99:27:99:32 | *buffer | semmle.label | *buffer |
+| test2.cpp:153:31:153:38 | password | semmle.label | password |
+| test2.cpp:153:40:153:44 | *call to c_str | semmle.label | *call to c_str |
+| test2.cpp:154:21:154:22 | *pw | semmle.label | *pw |
+| test2.cpp:157:13:157:27 | *copy_characters | semmle.label | *copy_characters |
+| test2.cpp:157:41:157:41 | s | semmle.label | s |
+| test2.cpp:160:17:160:17 | *s | semmle.label | *s |
+| test2.cpp:160:17:160:17 | call to begin | semmle.label | call to begin |
+| test2.cpp:162:9:162:14 | result | semmle.label | result |
+| test2.cpp:167:25:167:39 | call to copy_characters | semmle.label | call to copy_characters |
+| test2.cpp:167:25:167:39 | call to copy_characters | semmle.label | call to copy_characters |
+| test2.cpp:167:41:167:60 | password | semmle.label | password |
+| test2.cpp:167:41:167:60 | password | semmle.label | password |
+| test2.cpp:168:30:168:34 | *call to c_str | semmle.label | *call to c_str |
+| test2.cpp:173:28:173:35 | *password | semmle.label | *password |
+| test2.cpp:173:28:173:35 | *password | semmle.label | *password |
+| test2.cpp:174:26:174:30 | *call to c_str | semmle.label | *call to c_str |
 | test.cpp:45:9:45:19 | thePassword | semmle.label | thePassword |
 | test.cpp:70:38:70:48 | thePassword | semmle.label | thePassword |
 | test.cpp:70:38:70:48 | thePassword | semmle.label | thePassword |
 | test.cpp:73:43:73:53 | thePassword | semmle.label | thePassword |
 | test.cpp:73:63:73:73 | thePassword | semmle.label | thePassword |
 subpaths
-#select
-| test2.cpp:43:2:43:8 | call to fprintf | test2.cpp:43:36:43:43 | password | test2.cpp:43:36:43:43 | password | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:43:36:43:43 | password | this source. |
-| test2.cpp:44:2:44:8 | call to fprintf | test2.cpp:44:37:44:45 | thepasswd | test2.cpp:44:37:44:45 | thepasswd | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:44:37:44:45 | thepasswd | this source. |
-| test2.cpp:45:2:45:8 | call to fprintf | test2.cpp:45:38:45:47 | accountkey | test2.cpp:45:38:45:47 | accountkey | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:45:38:45:47 | accountkey | this source. |
-| test2.cpp:50:2:50:8 | call to fprintf | test2.cpp:50:41:50:53 | passwd_config | test2.cpp:50:41:50:53 | passwd_config | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:50:41:50:53 | passwd_config | this source. |
-| test2.cpp:54:2:54:8 | call to fprintf | test2.cpp:54:41:54:52 | widepassword | test2.cpp:54:41:54:52 | widepassword | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:54:41:54:52 | widepassword | this source. |
-| test2.cpp:55:2:55:8 | call to fprintf | test2.cpp:55:40:55:51 | widepassword | test2.cpp:55:40:55:51 | widepassword | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:55:40:55:51 | widepassword | this source. |
-| test2.cpp:57:2:57:8 | call to fprintf | test2.cpp:57:39:57:49 | call to getPassword | test2.cpp:57:39:57:49 | call to getPassword | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:57:39:57:49 | call to getPassword | this source. |
-| test2.cpp:65:3:65:9 | call to fprintf | test2.cpp:62:18:62:25 | password | test2.cpp:65:31:65:34 | cpy1 | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:62:18:62:25 | password | this source. |
-| test2.cpp:73:3:73:9 | call to fprintf | test2.cpp:72:15:72:24 | password | test2.cpp:73:30:73:32 | *buf | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:72:17:72:24 | password | this source. |
-| test2.cpp:99:3:99:9 | call to fprintf | test2.cpp:98:45:98:52 | password | test2.cpp:99:27:99:32 | *buffer | This write into file 'log' may contain unencrypted data from $@. | test2.cpp:98:45:98:52 | password | this source. |
-| test.cpp:45:3:45:7 | call to fputs | test.cpp:45:9:45:19 | thePassword | test.cpp:45:9:45:19 | thePassword | This write into file 'file' may contain unencrypted data from $@. | test.cpp:45:9:45:19 | thePassword | this source. |
-| test.cpp:70:35:70:35 | call to operator<< | test.cpp:70:38:70:48 | thePassword | test.cpp:70:38:70:48 | thePassword | This write into file 'mystream' may contain unencrypted data from $@. | test.cpp:70:38:70:48 | thePassword | this source. |
-| test.cpp:73:37:73:41 | call to write | test.cpp:70:38:70:48 | thePassword | test.cpp:73:43:73:53 | thePassword | This write into file 'mystream' may contain unencrypted data from $@. | test.cpp:70:38:70:48 | thePassword | this source. |
-| test.cpp:73:37:73:41 | call to write | test.cpp:73:43:73:53 | thePassword | test.cpp:73:43:73:53 | thePassword | This write into file 'mystream' may contain unencrypted data from $@. | test.cpp:73:43:73:53 | thePassword | this source. |
-| test.cpp:73:37:73:41 | call to write | test.cpp:73:63:73:73 | thePassword | test.cpp:73:43:73:53 | thePassword | This write into file 'mystream' may contain unencrypted data from $@. | test.cpp:73:63:73:73 | thePassword | this source. |
+| test2.cpp:167:41:167:60 | password | test2.cpp:157:41:157:41 | s | test2.cpp:157:13:157:27 | *copy_characters | test2.cpp:167:25:167:39 | call to copy_characters |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextFileWrite.qlref b/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextFileWrite.qlref
index 9469736d8c77..bc1d0c4af765 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextFileWrite.qlref
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextFileWrite.qlref
@@ -1,2 +1,4 @@
 query: Security/CWE/CWE-311/CleartextFileWrite.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextTransmission.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextTransmission.expected
index fae3d76599a8..370555e6811b 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextTransmission.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextTransmission.expected
@@ -1,3 +1,44 @@
+#select
+| test3.cpp:22:3:22:6 | call to send | test3.cpp:22:15:22:23 | password1 | test3.cpp:22:15:22:23 | password1 | This operation transmits 'password1', which may contain unencrypted sensitive data from $@. | test3.cpp:22:15:22:23 | password1 | password1 |
+| test3.cpp:26:3:26:6 | call to send | test3.cpp:26:15:26:23 | password2 | test3.cpp:26:15:26:23 | password2 | This operation transmits 'password2', which may contain unencrypted sensitive data from $@. | test3.cpp:26:15:26:23 | password2 | password2 |
+| test3.cpp:47:3:47:6 | call to recv | test3.cpp:47:15:47:22 | password | test3.cpp:47:15:47:22 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:47:15:47:22 | password | password |
+| test3.cpp:55:3:55:6 | call to recv | test3.cpp:55:15:55:22 | password | test3.cpp:55:15:55:22 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:55:15:55:22 | password | password |
+| test3.cpp:76:3:76:6 | call to send | test3.cpp:74:21:74:29 | password1 | test3.cpp:76:15:76:17 | ptr | This operation transmits 'ptr', which may contain unencrypted sensitive data from $@. | test3.cpp:74:21:74:29 | password1 | password1 |
+| test3.cpp:83:3:83:6 | call to recv | test3.cpp:81:15:81:22 | password | test3.cpp:83:15:83:17 | ptr | This operation receives into 'ptr', which may put unencrypted sensitive data into $@. | test3.cpp:81:15:81:22 | password | password |
+| test3.cpp:101:3:101:6 | call to read | test3.cpp:101:12:101:19 | password | test3.cpp:101:12:101:19 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:101:12:101:19 | password | password |
+| test3.cpp:114:2:114:5 | call to recv | test3.cpp:134:11:134:18 | password | test3.cpp:114:14:114:19 | buffer | This operation receives into 'buffer', which may put unencrypted sensitive data into $@. | test3.cpp:134:11:134:18 | password | password |
+| test3.cpp:140:3:140:6 | call to send | test3.cpp:138:24:138:32 | password1 | test3.cpp:140:15:140:17 | ptr | This operation transmits 'ptr', which may contain unencrypted sensitive data from $@. | test3.cpp:138:24:138:32 | password1 | password1 |
+| test3.cpp:146:3:146:6 | call to send | test3.cpp:126:9:126:23 | global_password | test3.cpp:146:15:146:18 | data | This operation transmits 'data', which may contain unencrypted sensitive data from $@. | test3.cpp:126:9:126:23 | global_password | global_password |
+| test3.cpp:159:3:159:6 | call to send | test3.cpp:157:19:157:26 | password | test3.cpp:159:15:159:20 | *buffer | This operation transmits '*buffer', which may contain unencrypted sensitive data from $@. | test3.cpp:157:19:157:26 | password | password |
+| test3.cpp:228:2:228:5 | call to send | test3.cpp:228:26:228:33 | password | test3.cpp:228:26:228:33 | password | This operation transmits 'password', which may contain unencrypted sensitive data from $@. | test3.cpp:228:26:228:33 | password | password |
+| test3.cpp:241:2:241:6 | call to fgets | test3.cpp:241:8:241:15 | password | test3.cpp:241:8:241:15 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:241:8:241:15 | password | password |
+| test3.cpp:272:3:272:6 | call to send | test3.cpp:270:16:270:23 | password | test3.cpp:272:15:272:18 | *data | This operation transmits '*data', which may contain unencrypted sensitive data from $@. | test3.cpp:270:16:270:23 | password | password |
+| test3.cpp:290:2:290:5 | call to send | test3.cpp:317:11:317:19 | password1 | test3.cpp:290:14:290:17 | data | This operation transmits 'data', which may contain unencrypted sensitive data from $@. | test3.cpp:317:11:317:19 | password1 | password1 |
+| test3.cpp:295:2:295:5 | call to send | test3.cpp:322:16:322:24 | password2 | test3.cpp:295:14:295:17 | data | This operation transmits 'data', which may contain unencrypted sensitive data from $@. | test3.cpp:322:16:322:24 | password2 | password2 |
+| test3.cpp:300:2:300:5 | call to send | test3.cpp:322:16:322:24 | password2 | test3.cpp:300:14:300:17 | data | This operation transmits 'data', which may contain unencrypted sensitive data from $@. | test3.cpp:322:16:322:24 | password2 | password2 |
+| test3.cpp:341:4:341:7 | call to recv | test3.cpp:341:16:341:23 | password | test3.cpp:341:16:341:23 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:341:16:341:23 | password | password |
+| test3.cpp:388:3:388:6 | call to recv | test3.cpp:388:15:388:22 | password | test3.cpp:388:15:388:22 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:388:15:388:22 | password | password |
+| test3.cpp:414:3:414:6 | call to recv | test3.cpp:414:15:414:24 | password | test3.cpp:414:15:414:24 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:414:15:414:24 | password | password |
+| test3.cpp:420:3:420:6 | call to recv | test3.cpp:420:15:420:24 | password | test3.cpp:420:15:420:24 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:420:15:420:24 | password | password |
+| test3.cpp:431:2:431:6 | call to fgets | test3.cpp:431:8:431:15 | password | test3.cpp:431:8:431:15 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:431:8:431:15 | password | password |
+| test3.cpp:507:2:507:5 | call to send | test3.cpp:507:14:507:39 | social_security_number | test3.cpp:507:14:507:39 | social_security_number | This operation transmits 'social_security_number', which may contain unencrypted sensitive data from $@. | test3.cpp:507:14:507:39 | social_security_number | social_security_number |
+| test3.cpp:508:2:508:5 | call to send | test3.cpp:508:14:508:33 | socialSecurityNo | test3.cpp:508:14:508:33 | socialSecurityNo | This operation transmits 'socialSecurityNo', which may contain unencrypted sensitive data from $@. | test3.cpp:508:14:508:33 | socialSecurityNo | socialSecurityNo |
+| test3.cpp:509:2:509:5 | call to send | test3.cpp:509:14:509:29 | homePostCode | test3.cpp:509:14:509:29 | homePostCode | This operation transmits 'homePostCode', which may contain unencrypted sensitive data from $@. | test3.cpp:509:14:509:29 | homePostCode | homePostCode |
+| test3.cpp:510:2:510:5 | call to send | test3.cpp:510:14:510:28 | my_zip_code | test3.cpp:510:14:510:28 | my_zip_code | This operation transmits 'my_zip_code', which may contain unencrypted sensitive data from $@. | test3.cpp:510:14:510:28 | my_zip_code | my_zip_code |
+| test3.cpp:511:2:511:5 | call to send | test3.cpp:511:14:511:26 | telephone | test3.cpp:511:14:511:26 | telephone | This operation transmits 'telephone', which may contain unencrypted sensitive data from $@. | test3.cpp:511:14:511:26 | telephone | telephone |
+| test3.cpp:512:2:512:5 | call to send | test3.cpp:512:14:512:36 | mobile_phone_number | test3.cpp:512:14:512:36 | mobile_phone_number | This operation transmits 'mobile_phone_number', which may contain unencrypted sensitive data from $@. | test3.cpp:512:14:512:36 | mobile_phone_number | mobile_phone_number |
+| test3.cpp:513:2:513:5 | call to send | test3.cpp:513:14:513:22 | email | test3.cpp:513:14:513:22 | email | This operation transmits 'email', which may contain unencrypted sensitive data from $@. | test3.cpp:513:14:513:22 | email | email |
+| test3.cpp:514:2:514:5 | call to send | test3.cpp:514:14:514:38 | my_credit_card_number | test3.cpp:514:14:514:38 | my_credit_card_number | This operation transmits 'my_credit_card_number', which may contain unencrypted sensitive data from $@. | test3.cpp:514:14:514:38 | my_credit_card_number | my_credit_card_number |
+| test3.cpp:515:2:515:5 | call to send | test3.cpp:515:14:515:35 | my_bank_account_no | test3.cpp:515:14:515:35 | my_bank_account_no | This operation transmits 'my_bank_account_no', which may contain unencrypted sensitive data from $@. | test3.cpp:515:14:515:35 | my_bank_account_no | my_bank_account_no |
+| test3.cpp:516:2:516:5 | call to send | test3.cpp:516:14:516:29 | employerName | test3.cpp:516:14:516:29 | employerName | This operation transmits 'employerName', which may contain unencrypted sensitive data from $@. | test3.cpp:516:14:516:29 | employerName | employerName |
+| test3.cpp:517:2:517:5 | call to send | test3.cpp:517:14:517:29 | medical_info | test3.cpp:517:14:517:29 | medical_info | This operation transmits 'medical_info', which may contain unencrypted sensitive data from $@. | test3.cpp:517:14:517:29 | medical_info | medical_info |
+| test3.cpp:518:2:518:5 | call to send | test3.cpp:518:14:518:28 | license_key | test3.cpp:518:14:518:28 | license_key | This operation transmits 'license_key', which may contain unencrypted sensitive data from $@. | test3.cpp:518:14:518:28 | license_key | license_key |
+| test3.cpp:527:3:527:6 | call to send | test3.cpp:526:44:526:54 | my_latitude | test3.cpp:527:15:527:20 | *buffer | This operation transmits '*buffer', which may contain unencrypted sensitive data from $@. | test3.cpp:526:44:526:54 | my_latitude | my_latitude |
+| test3.cpp:533:3:533:6 | call to send | test3.cpp:532:45:532:58 | home_longitude | test3.cpp:533:15:533:20 | *buffer | This operation transmits '*buffer', which may contain unencrypted sensitive data from $@. | test3.cpp:532:45:532:58 | home_longitude | home_longitude |
+| test3.cpp:552:3:552:6 | call to send | test3.cpp:551:47:551:58 | salaryString | test3.cpp:552:15:552:20 | *buffer | This operation transmits '*buffer', which may contain unencrypted sensitive data from $@. | test3.cpp:551:47:551:58 | salaryString | salaryString |
+| test3.cpp:559:3:559:6 | call to send | test3.cpp:556:19:556:30 | salaryString | test3.cpp:559:15:559:20 | *buffer | This operation transmits '*buffer', which may contain unencrypted sensitive data from $@. | test3.cpp:556:19:556:30 | salaryString | salaryString |
+| test3.cpp:572:2:572:5 | call to send | test3.cpp:571:8:571:21 | call to get_home_phone | test3.cpp:572:14:572:16 | str | This operation transmits 'str', which may contain unencrypted sensitive data from $@. | test3.cpp:571:8:571:21 | call to get_home_phone | call to get_home_phone |
+| test3.cpp:578:2:578:5 | call to send | test3.cpp:577:8:577:23 | call to get_home_address | test3.cpp:578:14:578:16 | str | This operation transmits 'str', which may contain unencrypted sensitive data from $@. | test3.cpp:577:8:577:23 | call to get_home_address | call to get_home_address |
 edges
 | test3.cpp:74:21:74:29 | password1 | test3.cpp:74:21:74:29 | password1 | provenance |  |
 | test3.cpp:74:21:74:29 | password1 | test3.cpp:76:15:76:17 | ptr | provenance |  |
@@ -140,44 +181,3 @@ nodes
 | test3.cpp:578:14:578:16 | str | semmle.label | str |
 subpaths
 | test3.cpp:138:24:138:32 | password1 | test3.cpp:117:28:117:33 | buffer | test3.cpp:117:13:117:14 | *id | test3.cpp:138:21:138:22 | call to id |
-#select
-| test3.cpp:22:3:22:6 | call to send | test3.cpp:22:15:22:23 | password1 | test3.cpp:22:15:22:23 | password1 | This operation transmits 'password1', which may contain unencrypted sensitive data from $@. | test3.cpp:22:15:22:23 | password1 | password1 |
-| test3.cpp:26:3:26:6 | call to send | test3.cpp:26:15:26:23 | password2 | test3.cpp:26:15:26:23 | password2 | This operation transmits 'password2', which may contain unencrypted sensitive data from $@. | test3.cpp:26:15:26:23 | password2 | password2 |
-| test3.cpp:47:3:47:6 | call to recv | test3.cpp:47:15:47:22 | password | test3.cpp:47:15:47:22 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:47:15:47:22 | password | password |
-| test3.cpp:55:3:55:6 | call to recv | test3.cpp:55:15:55:22 | password | test3.cpp:55:15:55:22 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:55:15:55:22 | password | password |
-| test3.cpp:76:3:76:6 | call to send | test3.cpp:74:21:74:29 | password1 | test3.cpp:76:15:76:17 | ptr | This operation transmits 'ptr', which may contain unencrypted sensitive data from $@. | test3.cpp:74:21:74:29 | password1 | password1 |
-| test3.cpp:83:3:83:6 | call to recv | test3.cpp:81:15:81:22 | password | test3.cpp:83:15:83:17 | ptr | This operation receives into 'ptr', which may put unencrypted sensitive data into $@. | test3.cpp:81:15:81:22 | password | password |
-| test3.cpp:101:3:101:6 | call to read | test3.cpp:101:12:101:19 | password | test3.cpp:101:12:101:19 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:101:12:101:19 | password | password |
-| test3.cpp:114:2:114:5 | call to recv | test3.cpp:134:11:134:18 | password | test3.cpp:114:14:114:19 | buffer | This operation receives into 'buffer', which may put unencrypted sensitive data into $@. | test3.cpp:134:11:134:18 | password | password |
-| test3.cpp:140:3:140:6 | call to send | test3.cpp:138:24:138:32 | password1 | test3.cpp:140:15:140:17 | ptr | This operation transmits 'ptr', which may contain unencrypted sensitive data from $@. | test3.cpp:138:24:138:32 | password1 | password1 |
-| test3.cpp:146:3:146:6 | call to send | test3.cpp:126:9:126:23 | global_password | test3.cpp:146:15:146:18 | data | This operation transmits 'data', which may contain unencrypted sensitive data from $@. | test3.cpp:126:9:126:23 | global_password | global_password |
-| test3.cpp:159:3:159:6 | call to send | test3.cpp:157:19:157:26 | password | test3.cpp:159:15:159:20 | *buffer | This operation transmits '*buffer', which may contain unencrypted sensitive data from $@. | test3.cpp:157:19:157:26 | password | password |
-| test3.cpp:228:2:228:5 | call to send | test3.cpp:228:26:228:33 | password | test3.cpp:228:26:228:33 | password | This operation transmits 'password', which may contain unencrypted sensitive data from $@. | test3.cpp:228:26:228:33 | password | password |
-| test3.cpp:241:2:241:6 | call to fgets | test3.cpp:241:8:241:15 | password | test3.cpp:241:8:241:15 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:241:8:241:15 | password | password |
-| test3.cpp:272:3:272:6 | call to send | test3.cpp:270:16:270:23 | password | test3.cpp:272:15:272:18 | *data | This operation transmits '*data', which may contain unencrypted sensitive data from $@. | test3.cpp:270:16:270:23 | password | password |
-| test3.cpp:290:2:290:5 | call to send | test3.cpp:317:11:317:19 | password1 | test3.cpp:290:14:290:17 | data | This operation transmits 'data', which may contain unencrypted sensitive data from $@. | test3.cpp:317:11:317:19 | password1 | password1 |
-| test3.cpp:295:2:295:5 | call to send | test3.cpp:322:16:322:24 | password2 | test3.cpp:295:14:295:17 | data | This operation transmits 'data', which may contain unencrypted sensitive data from $@. | test3.cpp:322:16:322:24 | password2 | password2 |
-| test3.cpp:300:2:300:5 | call to send | test3.cpp:322:16:322:24 | password2 | test3.cpp:300:14:300:17 | data | This operation transmits 'data', which may contain unencrypted sensitive data from $@. | test3.cpp:322:16:322:24 | password2 | password2 |
-| test3.cpp:341:4:341:7 | call to recv | test3.cpp:341:16:341:23 | password | test3.cpp:341:16:341:23 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:341:16:341:23 | password | password |
-| test3.cpp:388:3:388:6 | call to recv | test3.cpp:388:15:388:22 | password | test3.cpp:388:15:388:22 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:388:15:388:22 | password | password |
-| test3.cpp:414:3:414:6 | call to recv | test3.cpp:414:15:414:24 | password | test3.cpp:414:15:414:24 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:414:15:414:24 | password | password |
-| test3.cpp:420:3:420:6 | call to recv | test3.cpp:420:15:420:24 | password | test3.cpp:420:15:420:24 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:420:15:420:24 | password | password |
-| test3.cpp:431:2:431:6 | call to fgets | test3.cpp:431:8:431:15 | password | test3.cpp:431:8:431:15 | password | This operation receives into 'password', which may put unencrypted sensitive data into $@. | test3.cpp:431:8:431:15 | password | password |
-| test3.cpp:507:2:507:5 | call to send | test3.cpp:507:14:507:39 | social_security_number | test3.cpp:507:14:507:39 | social_security_number | This operation transmits 'social_security_number', which may contain unencrypted sensitive data from $@. | test3.cpp:507:14:507:39 | social_security_number | social_security_number |
-| test3.cpp:508:2:508:5 | call to send | test3.cpp:508:14:508:33 | socialSecurityNo | test3.cpp:508:14:508:33 | socialSecurityNo | This operation transmits 'socialSecurityNo', which may contain unencrypted sensitive data from $@. | test3.cpp:508:14:508:33 | socialSecurityNo | socialSecurityNo |
-| test3.cpp:509:2:509:5 | call to send | test3.cpp:509:14:509:29 | homePostCode | test3.cpp:509:14:509:29 | homePostCode | This operation transmits 'homePostCode', which may contain unencrypted sensitive data from $@. | test3.cpp:509:14:509:29 | homePostCode | homePostCode |
-| test3.cpp:510:2:510:5 | call to send | test3.cpp:510:14:510:28 | my_zip_code | test3.cpp:510:14:510:28 | my_zip_code | This operation transmits 'my_zip_code', which may contain unencrypted sensitive data from $@. | test3.cpp:510:14:510:28 | my_zip_code | my_zip_code |
-| test3.cpp:511:2:511:5 | call to send | test3.cpp:511:14:511:26 | telephone | test3.cpp:511:14:511:26 | telephone | This operation transmits 'telephone', which may contain unencrypted sensitive data from $@. | test3.cpp:511:14:511:26 | telephone | telephone |
-| test3.cpp:512:2:512:5 | call to send | test3.cpp:512:14:512:36 | mobile_phone_number | test3.cpp:512:14:512:36 | mobile_phone_number | This operation transmits 'mobile_phone_number', which may contain unencrypted sensitive data from $@. | test3.cpp:512:14:512:36 | mobile_phone_number | mobile_phone_number |
-| test3.cpp:513:2:513:5 | call to send | test3.cpp:513:14:513:22 | email | test3.cpp:513:14:513:22 | email | This operation transmits 'email', which may contain unencrypted sensitive data from $@. | test3.cpp:513:14:513:22 | email | email |
-| test3.cpp:514:2:514:5 | call to send | test3.cpp:514:14:514:38 | my_credit_card_number | test3.cpp:514:14:514:38 | my_credit_card_number | This operation transmits 'my_credit_card_number', which may contain unencrypted sensitive data from $@. | test3.cpp:514:14:514:38 | my_credit_card_number | my_credit_card_number |
-| test3.cpp:515:2:515:5 | call to send | test3.cpp:515:14:515:35 | my_bank_account_no | test3.cpp:515:14:515:35 | my_bank_account_no | This operation transmits 'my_bank_account_no', which may contain unencrypted sensitive data from $@. | test3.cpp:515:14:515:35 | my_bank_account_no | my_bank_account_no |
-| test3.cpp:516:2:516:5 | call to send | test3.cpp:516:14:516:29 | employerName | test3.cpp:516:14:516:29 | employerName | This operation transmits 'employerName', which may contain unencrypted sensitive data from $@. | test3.cpp:516:14:516:29 | employerName | employerName |
-| test3.cpp:517:2:517:5 | call to send | test3.cpp:517:14:517:29 | medical_info | test3.cpp:517:14:517:29 | medical_info | This operation transmits 'medical_info', which may contain unencrypted sensitive data from $@. | test3.cpp:517:14:517:29 | medical_info | medical_info |
-| test3.cpp:518:2:518:5 | call to send | test3.cpp:518:14:518:28 | license_key | test3.cpp:518:14:518:28 | license_key | This operation transmits 'license_key', which may contain unencrypted sensitive data from $@. | test3.cpp:518:14:518:28 | license_key | license_key |
-| test3.cpp:527:3:527:6 | call to send | test3.cpp:526:44:526:54 | my_latitude | test3.cpp:527:15:527:20 | *buffer | This operation transmits '*buffer', which may contain unencrypted sensitive data from $@. | test3.cpp:526:44:526:54 | my_latitude | my_latitude |
-| test3.cpp:533:3:533:6 | call to send | test3.cpp:532:45:532:58 | home_longitude | test3.cpp:533:15:533:20 | *buffer | This operation transmits '*buffer', which may contain unencrypted sensitive data from $@. | test3.cpp:532:45:532:58 | home_longitude | home_longitude |
-| test3.cpp:552:3:552:6 | call to send | test3.cpp:551:47:551:58 | salaryString | test3.cpp:552:15:552:20 | *buffer | This operation transmits '*buffer', which may contain unencrypted sensitive data from $@. | test3.cpp:551:47:551:58 | salaryString | salaryString |
-| test3.cpp:559:3:559:6 | call to send | test3.cpp:556:19:556:30 | salaryString | test3.cpp:559:15:559:20 | *buffer | This operation transmits '*buffer', which may contain unencrypted sensitive data from $@. | test3.cpp:556:19:556:30 | salaryString | salaryString |
-| test3.cpp:572:2:572:5 | call to send | test3.cpp:571:8:571:21 | call to get_home_phone | test3.cpp:572:14:572:16 | str | This operation transmits 'str', which may contain unencrypted sensitive data from $@. | test3.cpp:571:8:571:21 | call to get_home_phone | call to get_home_phone |
-| test3.cpp:578:2:578:5 | call to send | test3.cpp:577:8:577:23 | call to get_home_address | test3.cpp:578:14:578:16 | str | This operation transmits 'str', which may contain unencrypted sensitive data from $@. | test3.cpp:577:8:577:23 | call to get_home_address | call to get_home_address |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/test2.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/test2.cpp
index 9399a81274ee..950b4c62c745 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/test2.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/test2.cpp
@@ -110,3 +110,66 @@ void test_gets()
 		gets(password); // $ Alert[cpp/cleartext-storage-buffer] // BAD
 	}
 }
+
+namespace std
+{
+	template<class CharT> struct char_traits;
+	template<class T> class allocator;
+
+	template<class CharT, class Traits = char_traits<CharT>>
+	class basic_string_view
+	{
+	public:
+		const CharT* data() const;
+	};
+
+	template<class CharT, class Traits = char_traits<CharT>, class Allocator = allocator<CharT>>
+	class basic_string
+	{
+	public:
+		const CharT* data() const;
+		size_t size() const;
+		basic_string();
+		basic_string& operator+=(CharT);
+		const CharT* c_str() const;
+		const CharT* begin() const;
+		const CharT* end() const;
+
+		operator basic_string_view<CharT, Traits>() const;
+	};
+
+	using string = basic_string<char>;
+	using string_view = basic_string_view<char>;
+}
+
+struct StringCredentials
+{
+	std::string password;
+	std::string username;
+};
+
+void test_source_glvalue(FILE* log, const StringCredentials& credentials)
+{
+	const char* pw = credentials.password.c_str(); // $ Source[cpp/cleartext-storage-file]
+	fprintf(log, "%s", pw); // $ Alert[cpp/cleartext-storage-file]
+}
+
+std::string copy_characters(std::string s)
+{
+	std::string result;
+	for (char ch : s)
+		result += ch;
+	return result;
+}
+
+void test_character_iteration(FILE* log, const StringCredentials& credentials)
+{
+	std::string by_value = copy_characters(credentials.password); // $ Source[cpp/cleartext-storage-file]
+	fprintf(log, "%s", by_value.c_str()); // $ Alert[cpp/cleartext-storage-file]
+}
+
+void test_reference(FILE* log, std::string s) {
+	const std::string& password = s;
+	const std::string& copy = password; // $ Source[cpp/cleartext-storage-file]
+	fprintf(log, "%s", copy.c_str()); // $ Alert[cpp/cleartext-storage-file]
+}
\ No newline at end of file
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/IncorrectPointerScaling/test.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/IncorrectPointerScaling/test.cpp
index 9f6b046a90bd..1011a5ee8fb2 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/IncorrectPointerScaling/test.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/IncorrectPointerScaling/test.cpp
@@ -146,3 +146,25 @@ int test18(int i) {
   // BAD: the pointer arithmetic uses type char*, so the offset is not scaled by sizeof(int).
   return *(int *)(charPointer + i); // $ Alert[cpp/incorrect-pointer-scaling-char]
 }
+
+namespace std {
+enum class byte : unsigned char {};
+}
+
+std::byte* test19(
+  std::byte *x
+) {
+  int *p = (int*)x;
+  // GOOD: like char*, std::byte* is a generic pointer type,
+  // so assume that it is really an int*.
+  return (std::byte *)(p + 1);
+}
+
+std::byte* test20(
+  std::byte *x
+) {
+  int *p = reinterpret_cast<int*>(x);
+  // GOOD: like char*, std::byte* is a generic pointer type,
+  // so assume that it is really an int*.
+  return reinterpret_cast<std::byte*>(p + 1);
+}
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-497/semmle/tests/ExposedSystemData.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-497/semmle/tests/ExposedSystemData.expected
index 6b4be51fd33e..a174000efec8 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-497/semmle/tests/ExposedSystemData.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-497/semmle/tests/ExposedSystemData.expected
@@ -9,11 +9,11 @@
 | tests2.cpp:93:14:93:17 | *str1 | tests2.cpp:91:42:91:45 | *str1 | tests2.cpp:93:14:93:17 | *str1 | This operation exposes system data from $@. | tests2.cpp:91:42:91:45 | *str1 | *str1 |
 | tests2.cpp:102:14:102:15 | *pw | tests2.cpp:101:8:101:15 | *call to getpwuid | tests2.cpp:102:14:102:15 | *pw | This operation exposes system data from $@. | tests2.cpp:101:8:101:15 | *call to getpwuid | *call to getpwuid |
 | tests2.cpp:111:14:111:19 | *ptr | tests2.cpp:109:12:109:17 | *call to getenv | tests2.cpp:111:14:111:19 | *ptr | This operation exposes system data from $@. | tests2.cpp:109:12:109:17 | *call to getenv | *call to getenv |
-| tests2.cpp:138:23:138:34 | *message_data | tests2.cpp:134:17:134:22 | *call to getenv | tests2.cpp:138:23:138:34 | *message_data | This operation exposes system data from $@. | tests2.cpp:134:17:134:22 | *call to getenv | *call to getenv |
-| tests2.cpp:144:33:144:40 | *& ... | tests2.cpp:134:17:134:22 | *call to getenv | tests2.cpp:144:33:144:40 | *& ... | This operation exposes system data from $@. | tests2.cpp:134:17:134:22 | *call to getenv | *call to getenv |
-| tests2.cpp:147:20:147:27 | *& ... | tests2.cpp:134:17:134:22 | *call to getenv | tests2.cpp:147:20:147:27 | *& ... | This operation exposes system data from $@. | tests2.cpp:134:17:134:22 | *call to getenv | *call to getenv |
-| tests2.cpp:155:32:155:39 | *& ... | tests2.cpp:134:17:134:22 | *call to getenv | tests2.cpp:155:32:155:39 | *& ... | This operation exposes system data from $@. | tests2.cpp:134:17:134:22 | *call to getenv | *call to getenv |
-| tests2.cpp:158:20:158:27 | *& ... | tests2.cpp:134:17:134:22 | *call to getenv | tests2.cpp:158:20:158:27 | *& ... | This operation exposes system data from $@. | tests2.cpp:134:17:134:22 | *call to getenv | *call to getenv |
+| tests2.cpp:138:23:138:34 | message_data | tests2.cpp:134:17:134:22 | *call to getenv | tests2.cpp:138:23:138:34 | message_data | This operation exposes system data from $@. | tests2.cpp:134:17:134:22 | *call to getenv | *call to getenv |
+| tests2.cpp:144:33:144:40 | & ... | tests2.cpp:134:17:134:22 | *call to getenv | tests2.cpp:144:33:144:40 | & ... | This operation exposes system data from $@. | tests2.cpp:134:17:134:22 | *call to getenv | *call to getenv |
+| tests2.cpp:147:20:147:27 | & ... | tests2.cpp:134:17:134:22 | *call to getenv | tests2.cpp:147:20:147:27 | & ... | This operation exposes system data from $@. | tests2.cpp:134:17:134:22 | *call to getenv | *call to getenv |
+| tests2.cpp:155:32:155:39 | & ... | tests2.cpp:134:17:134:22 | *call to getenv | tests2.cpp:155:32:155:39 | & ... | This operation exposes system data from $@. | tests2.cpp:134:17:134:22 | *call to getenv | *call to getenv |
+| tests2.cpp:158:20:158:27 | & ... | tests2.cpp:134:17:134:22 | *call to getenv | tests2.cpp:158:20:158:27 | & ... | This operation exposes system data from $@. | tests2.cpp:134:17:134:22 | *call to getenv | *call to getenv |
 | tests_sockets.cpp:39:19:39:22 | *path | tests_sockets.cpp:26:15:26:20 | *call to getenv | tests_sockets.cpp:39:19:39:22 | *path | This operation exposes system data from $@. | tests_sockets.cpp:26:15:26:20 | *call to getenv | *call to getenv |
 | tests_sockets.cpp:43:20:43:23 | *path | tests_sockets.cpp:26:15:26:20 | *call to getenv | tests_sockets.cpp:43:20:43:23 | *path | This operation exposes system data from $@. | tests_sockets.cpp:26:15:26:20 | *call to getenv | *call to getenv |
 | tests_sockets.cpp:76:19:76:22 | *path | tests_sockets.cpp:63:15:63:20 | *call to getenv | tests_sockets.cpp:76:19:76:22 | *path | This operation exposes system data from $@. | tests_sockets.cpp:63:15:63:20 | *call to getenv | *call to getenv |
@@ -33,13 +33,13 @@ edges
 | tests2.cpp:111:14:111:15 | *c1 [*ptr] | tests2.cpp:111:14:111:19 | *ptr | provenance |  |
 | tests2.cpp:111:14:111:15 | *c1 [*ptr] | tests2.cpp:111:17:111:19 | *ptr | provenance |  |
 | tests2.cpp:111:17:111:19 | *ptr | tests2.cpp:111:14:111:19 | *ptr | provenance |  |
-| tests2.cpp:134:2:134:30 | *... = ... | tests2.cpp:138:23:138:34 | *message_data | provenance | Sink:MaD:2 |
+| tests2.cpp:134:2:134:30 | *... = ... | tests2.cpp:138:23:138:34 | message_data | provenance | Sink:MaD:2 |
 | tests2.cpp:134:2:134:30 | *... = ... | tests2.cpp:143:34:143:45 | *message_data | provenance |  |
 | tests2.cpp:134:17:134:22 | *call to getenv | tests2.cpp:134:2:134:30 | *... = ... | provenance |  |
-| tests2.cpp:143:24:143:31 | zmq_msg_init_data output argument | tests2.cpp:144:33:144:40 | *& ... | provenance | Sink:MaD:3 |
-| tests2.cpp:143:24:143:31 | zmq_msg_init_data output argument | tests2.cpp:147:20:147:27 | *& ... | provenance | Sink:MaD:1 |
-| tests2.cpp:143:24:143:31 | zmq_msg_init_data output argument | tests2.cpp:155:32:155:39 | *& ... | provenance | Sink:MaD:3 |
-| tests2.cpp:143:24:143:31 | zmq_msg_init_data output argument | tests2.cpp:158:20:158:27 | *& ... | provenance | Sink:MaD:1 |
+| tests2.cpp:143:24:143:31 | zmq_msg_init_data output argument | tests2.cpp:144:33:144:40 | & ... | provenance | Sink:MaD:3 |
+| tests2.cpp:143:24:143:31 | zmq_msg_init_data output argument | tests2.cpp:147:20:147:27 | & ... | provenance | Sink:MaD:1 |
+| tests2.cpp:143:24:143:31 | zmq_msg_init_data output argument | tests2.cpp:155:32:155:39 | & ... | provenance | Sink:MaD:3 |
+| tests2.cpp:143:24:143:31 | zmq_msg_init_data output argument | tests2.cpp:158:20:158:27 | & ... | provenance | Sink:MaD:1 |
 | tests2.cpp:143:34:143:45 | *message_data | tests2.cpp:143:24:143:31 | zmq_msg_init_data output argument | provenance | MaD:4 |
 | tests_sockets.cpp:26:15:26:20 | *call to getenv | tests_sockets.cpp:26:15:26:20 | *call to getenv | provenance |  |
 | tests_sockets.cpp:26:15:26:20 | *call to getenv | tests_sockets.cpp:39:19:39:22 | *path | provenance |  |
@@ -78,13 +78,13 @@ nodes
 | tests2.cpp:111:17:111:19 | *ptr | semmle.label | *ptr |
 | tests2.cpp:134:2:134:30 | *... = ... | semmle.label | *... = ... |
 | tests2.cpp:134:17:134:22 | *call to getenv | semmle.label | *call to getenv |
-| tests2.cpp:138:23:138:34 | *message_data | semmle.label | *message_data |
+| tests2.cpp:138:23:138:34 | message_data | semmle.label | message_data |
 | tests2.cpp:143:24:143:31 | zmq_msg_init_data output argument | semmle.label | zmq_msg_init_data output argument |
 | tests2.cpp:143:34:143:45 | *message_data | semmle.label | *message_data |
-| tests2.cpp:144:33:144:40 | *& ... | semmle.label | *& ... |
-| tests2.cpp:147:20:147:27 | *& ... | semmle.label | *& ... |
-| tests2.cpp:155:32:155:39 | *& ... | semmle.label | *& ... |
-| tests2.cpp:158:20:158:27 | *& ... | semmle.label | *& ... |
+| tests2.cpp:144:33:144:40 | & ... | semmle.label | & ... |
+| tests2.cpp:147:20:147:27 | & ... | semmle.label | & ... |
+| tests2.cpp:155:32:155:39 | & ... | semmle.label | & ... |
+| tests2.cpp:158:20:158:27 | & ... | semmle.label | & ... |
 | tests_sockets.cpp:26:15:26:20 | *call to getenv | semmle.label | *call to getenv |
 | tests_sockets.cpp:26:15:26:20 | *call to getenv | semmle.label | *call to getenv |
 | tests_sockets.cpp:39:19:39:22 | *path | semmle.label | *path |
diff --git a/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 71.1/AV Rule 71.1.expected b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 71.1/AV Rule 71.1.expected
new file mode 100644
index 000000000000..e25e640f594b
--- /dev/null
+++ b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 71.1/AV Rule 71.1.expected	
@@ -0,0 +1,5 @@
+| test.cpp:4:5:4:8 | call to init | Call to virtual function $@ which is overridden in $@. If you intend to statically call this virtual function, it should be qualified with Base::. | test.cpp:18:16:18:19 | init | init | test.cpp:38:8:38:11 | init | Derived |
+| test.cpp:5:11:5:14 | call to init | Call to virtual function $@ which is overridden in $@. If you intend to statically call this virtual function, it should be qualified with Base::. | test.cpp:18:16:18:19 | init | init | test.cpp:38:8:38:11 | init | Derived |
+| test.cpp:6:13:6:16 | call to init | Call to virtual function $@ which is overridden in $@. If you intend to statically call this virtual function, it should be qualified with Base::. | test.cpp:18:16:18:19 | init | init | test.cpp:38:8:38:11 | init | Derived |
+| test.cpp:7:5:7:10 | call to helper | Call to function helper that calls virtual function $@ (overridden in $@). | test.cpp:18:16:18:19 | init | init | test.cpp:38:8:38:11 | init | Derived |
+| test.cpp:14:5:14:11 | call to cleanup | Call to virtual function $@ which is overridden in $@. If you intend to statically call this virtual function, it should be qualified with Base::. | test.cpp:19:16:19:22 | cleanup | cleanup | test.cpp:39:8:39:14 | cleanup | Derived |
diff --git a/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 71.1/AV Rule 71.1.qlref b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 71.1/AV Rule 71.1.qlref
new file mode 100644
index 000000000000..f8ed7e328584
--- /dev/null
+++ b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 71.1/AV Rule 71.1.qlref	
@@ -0,0 +1,2 @@
+query: jsf/4.10 Classes/AV Rule 71.1.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 71.1/test.cpp b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 71.1/test.cpp
new file mode 100644
index 000000000000..36a7722a402c
--- /dev/null
+++ b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 71.1/test.cpp	
@@ -0,0 +1,47 @@
+class Base {
+public:
+  Base() {
+    init(); // $ Alert
+    this->init(); // $ Alert
+    (*this).init(); // $ Alert
+    helper(); // $ Alert (indirectly calls a virtual function)
+    Base::init(); // GOOD: explicitly qualified, so statically bound
+    notOverridden(); // GOOD: not overridden in any derived class
+    nonVirtual(); // GOOD: not virtual
+  }
+
+  ~Base() {
+    cleanup(); // $ Alert
+    Base::cleanup(); // GOOD: explicitly qualified
+  }
+
+  virtual void init() {}
+  virtual void cleanup() {}
+  virtual void notOverridden() {}
+  void nonVirtual() {}
+
+  void helper() {
+    init();
+  }
+
+  void other() {
+    init(); // GOOD: not in a constructor or destructor
+  }
+};
+
+class Derived : public Base {
+public:
+  Derived() {
+    init(); // GOOD: not overridden in a class derived from Derived
+  }
+
+  void init() override {}
+  void cleanup() override {}
+};
+
+class Unrelated {
+public:
+  Unrelated(Base &b) {
+    b.init(); // GOOD: not a call on `this`
+  }
+};
diff --git a/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 79/AV Rule 79.expected b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 79/AV Rule 79.expected
index 70ee3fb4704f..d7bd43c53ec4 100644
--- a/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 79/AV Rule 79.expected	
+++ b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 79/AV Rule 79.expected	
@@ -14,10 +14,10 @@
 | DeleteThis.cpp:127:3:127:20 | ... = ... | Resource d is acquired by class MyClass9 but not released anywhere in this class. |
 | ExternalOwners.cpp:49:3:49:20 | ... = ... | Resource a is acquired by class MyScreen but not released anywhere in this class. |
 | Lambda.cpp:24:3:24:21 | ... = ... | Resource r4 is acquired by class testLambda but not released anywhere in this class. |
-| ListDelete.cpp:21:3:21:21 | ... = ... | Resource first is acquired by class MyThingColection but not released anywhere in this class. |
 | NoDestructor.cpp:23:3:23:20 | ... = ... | Resource n is acquired by class MyClass5 but not released anywhere in this class. |
 | PlacementNew.cpp:36:3:36:36 | ... = ... | Resource p1 is acquired by class MyTestForPlacementNew but not released anywhere in this class. |
 | SelfRegistering.cpp:25:3:25:24 | ... = ... | Resource side is acquired by class MyOwner but not released anywhere in this class. |
+| TemplateDestructor.cpp:55:5:55:23 | ... = ... | Resource ptr is acquired by class OverwrittenAlias but not released anywhere in this class. |
 | Variants.cpp:26:3:26:13 | ... = ... | Resource f is acquired by class MyClass4 but not released anywhere in this class. |
 | Variants.cpp:69:3:69:17 | ... = ... | Resource a is acquired by class MyClass6 but not released anywhere in this class. |
 | Variants.cpp:70:3:70:36 | ... = ... | Resource b is acquired by class MyClass6 but not released anywhere in this class. |
diff --git a/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 79/ListDelete.cpp b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 79/ListDelete.cpp
index bca36a174b5f..a501dd1fcea8 100644
--- a/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 79/ListDelete.cpp	
+++ b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 79/ListDelete.cpp	
@@ -18,7 +18,7 @@ class MyThingColection
 {
 public:
 	MyThingColection() {
-		first = new MyThing; // $ SPURIOUS: Alert // GOOD (all deleted in destructor) [FALSE POSITIVE]
+		first = new MyThing; // GOOD (all deleted in destructor)
 
 		first->next = new MyThing; // GOOD (all deleted in destructor)
 
diff --git a/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 79/TemplateDestructor.cpp b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 79/TemplateDestructor.cpp
new file mode 100644
index 000000000000..bff1f24b7080
--- /dev/null
+++ b/cpp/ql/test/query-tests/jsf/4.10 Classes/AV Rule 79/TemplateDestructor.cpp	
@@ -0,0 +1,77 @@
+template <typename T>
+class TemplateArray {
+public:
+  TemplateArray() : ptr(nullptr) {}
+
+  ~TemplateArray() {
+    reset();
+  }
+
+  void init(unsigned size) {
+    ptr = new T[size]; // GOOD
+  }
+
+  void reset() {
+    T *tmp = ptr;
+    ptr = nullptr;
+    delete[] tmp;
+  }
+
+private:
+  T *ptr;
+};
+
+class NonTemplateArray {
+public:
+  NonTemplateArray() : ptr(nullptr) {}
+
+  ~NonTemplateArray() {
+    reset();
+  }
+
+  void init(unsigned size) {
+    ptr = new int[size]; // GOOD
+  }
+
+  void reset() {
+    int *tmp = ptr;
+    ptr = nullptr;
+    delete[] tmp;
+  }
+
+private:
+  int *ptr;
+};
+
+class OverwrittenAlias {
+public:
+  OverwrittenAlias() : ptr(nullptr) {}
+
+  ~OverwrittenAlias() {
+    reset();
+  }
+
+  void init(unsigned size) {
+    ptr = new int[size]; // $ Alert
+  }
+
+  void reset() {
+    int *tmp = ptr;
+    tmp = new int[1];
+    delete[] tmp;
+  }
+
+private:
+  int *ptr;
+};
+
+void testArrays() {
+  TemplateArray<int> templateArray;
+  templateArray.init(10);
+
+  NonTemplateArray nonTemplateArray;
+  nonTemplateArray.init(10);
+
+  OverwrittenAlias overwrittenAlias;
+  overwrittenAlias.init(10);
+}
diff --git a/cpp/ql/test/query-tests/jsf/4.24 Control Flow Structures/AV Rule 197/AV Rule 197.expected b/cpp/ql/test/query-tests/jsf/4.24 Control Flow Structures/AV Rule 197/AV Rule 197.expected
new file mode 100644
index 000000000000..49bd7edcc0ac
--- /dev/null
+++ b/cpp/ql/test/query-tests/jsf/4.24 Control Flow Structures/AV Rule 197/AV Rule 197.expected	
@@ -0,0 +1,4 @@
+| test.cpp:5:14:5:14 | f | Floating point variables should not be used as loop counters. |
+| test.cpp:10:15:10:15 | d | Floating point variables should not be used as loop counters. |
+| test.cpp:15:15:15:16 | ld | Floating point variables should not be used as loop counters. |
+| test.cpp:36:13:36:13 | r | Floating point variables should not be used as loop counters. |
diff --git a/cpp/ql/test/query-tests/jsf/4.24 Control Flow Structures/AV Rule 197/AV Rule 197.qlref b/cpp/ql/test/query-tests/jsf/4.24 Control Flow Structures/AV Rule 197/AV Rule 197.qlref
new file mode 100644
index 000000000000..1bf55b3397a0
--- /dev/null
+++ b/cpp/ql/test/query-tests/jsf/4.24 Control Flow Structures/AV Rule 197/AV Rule 197.qlref	
@@ -0,0 +1,2 @@
+query: jsf/4.24 Control Flow Structures/AV Rule 197.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/jsf/4.24 Control Flow Structures/AV Rule 197/test.cpp b/cpp/ql/test/query-tests/jsf/4.24 Control Flow Structures/AV Rule 197/test.cpp
new file mode 100644
index 000000000000..59d85b11a236
--- /dev/null
+++ b/cpp/ql/test/query-tests/jsf/4.24 Control Flow Structures/AV Rule 197/test.cpp	
@@ -0,0 +1,40 @@
+void use(double);
+
+void test()
+{
+  for (float f = 0.0f; f < 1.0f; f = f + 0.1f) // $ Alert
+  {
+    use(f);
+  }
+
+  for (double d = 0.0; d < 10.0; d++) // $ Alert
+  {
+    use(d);
+  }
+
+  long double ld; // $ Alert
+  for (ld = 10.0; ld > 0.0; ld--)
+  {
+    use(ld);
+  }
+
+  for (double c = 0.0; c < 1.0; c += 0.1) // $ MISSING: Alert (compound assignment updates are not recognized)
+  {
+    use(c);
+  }
+
+  for (int i = 0; i < 10; i++) // GOOD: integer loop counter
+  {
+    use(i * 0.1);
+  }
+}
+
+typedef float real;
+
+void test_typedef()
+{
+  for (real r = 0.0f; r < 1.0f; r = r + 0.5f) // $ Alert
+  {
+    use(r);
+  }
+}
diff --git a/csharp/actions/create-extractor-pack/action.yml b/csharp/actions/create-extractor-pack/action.yml
index 36f531f1b744..05b11dad8c3c 100644
--- a/csharp/actions/create-extractor-pack/action.yml
+++ b/csharp/actions/create-extractor-pack/action.yml
@@ -7,7 +7,7 @@ runs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 10.0.100
+        dotnet-version: 10.0.201
     - name: Build Extractor
       shell: bash
       run: scripts/create-extractor-pack.sh
diff --git a/csharp/documentation/library-coverage/coverage.csv b/csharp/documentation/library-coverage/coverage.csv
index a70a91755624..1a2aceca44eb 100644
--- a/csharp/documentation/library-coverage/coverage.csv
+++ b/csharp/documentation/library-coverage/coverage.csv
@@ -10,9 +10,11 @@ Internal.IL,,,68,,,,,,,,,,,,,,,,,,,41,27
 Internal.Pgo,,,9,,,,,,,,,,,,,,,,,,,2,7
 Internal.TypeSystem,,,365,,,,,,,,,,,,,,,,,,,216,149
 Microsoft.ApplicationBlocks.Data,28,,,,,,,,,,,,28,,,,,,,,,,
+Microsoft.AspNet.OData,,,5,,,,,,,,,,,,,,,,,,,5,
 Microsoft.AspNetCore.Components,2,4,2,,,,,,,2,,,,,,,,,4,,,1,1
 Microsoft.AspNetCore.Http,,,1,,,,,,,,,,,,,,,,,,,1,
 Microsoft.AspNetCore.Mvc,,,2,,,,,,,,,,,,,,,,,,,,2
+Microsoft.AspNetCore.OData.Deltas,,,5,,,,,,,,,,,,,,,,,,,5,
 Microsoft.AspNetCore.WebUtilities,,,2,,,,,,,,,,,,,,,,,,,2,
 Microsoft.CSharp,,,2,,,,,,,,,,,,,,,,,,,2,
 Microsoft.Data.SqlClient,7,,4,,,,,,,,,,7,,,,,,,,,4,
@@ -44,5 +46,5 @@ NHibernate,3,,,,,,,,,,,,3,,,,,,,,,,
 Newtonsoft.Json,,,91,,,,,,,,,,,,,,,,,,,73,18
 ServiceStack,194,,7,27,,,,,75,,,,92,,,,,,,,,7,
 SourceGenerators,,,5,,,,,,,,,,,,,,,,,,,,5
-System,59,48,12495,,6,5,12,,,4,1,,31,2,,6,15,17,5,3,,6382,6113
+System,59,48,12500,,6,5,12,,,4,1,,31,2,,6,15,17,5,3,,6387,6113
 Windows.Security.Cryptography.Core,1,,,,,,,1,,,,,,,,,,,,,,,
diff --git a/csharp/documentation/library-coverage/coverage.rst b/csharp/documentation/library-coverage/coverage.rst
index f487850e54b9..a5adcad4314b 100644
--- a/csharp/documentation/library-coverage/coverage.rst
+++ b/csharp/documentation/library-coverage/coverage.rst
@@ -8,7 +8,7 @@ C# framework & library support
 
    Framework / library,Package,Flow sources,Taint & value steps,Sinks (total),`CWE-079` :sub:`Cross-site scripting`
    `ServiceStack <https://servicestack.net/>`_,"``ServiceStack.*``, ``ServiceStack``",,7,194,
-   System,"``System.*``, ``System``",48,12495,59,5
-   Others,"``Amazon.Lambda.APIGatewayEvents``, ``Amazon.Lambda.Core``, ``Dapper``, ``ILCompiler``, ``ILLink.RoslynAnalyzer``, ``ILLink.Shared``, ``ILLink.Tasks``, ``Internal.IL``, ``Internal.Pgo``, ``Internal.TypeSystem``, ``Microsoft.ApplicationBlocks.Data``, ``Microsoft.AspNetCore.Components``, ``Microsoft.AspNetCore.Http``, ``Microsoft.AspNetCore.Mvc``, ``Microsoft.AspNetCore.WebUtilities``, ``Microsoft.CSharp``, ``Microsoft.Data.SqlClient``, ``Microsoft.Diagnostics.Tools.Pgo``, ``Microsoft.DotNet.Build.Tasks``, ``Microsoft.DotNet.PlatformAbstractions``, ``Microsoft.EntityFrameworkCore``, ``Microsoft.Extensions.Caching.Distributed``, ``Microsoft.Extensions.Caching.Memory``, ``Microsoft.Extensions.Configuration``, ``Microsoft.Extensions.DependencyInjection``, ``Microsoft.Extensions.DependencyModel``, ``Microsoft.Extensions.Diagnostics.Metrics``, ``Microsoft.Extensions.FileProviders``, ``Microsoft.Extensions.FileSystemGlobbing``, ``Microsoft.Extensions.Hosting``, ``Microsoft.Extensions.Http``, ``Microsoft.Extensions.Logging``, ``Microsoft.Extensions.Options``, ``Microsoft.Extensions.Primitives``, ``Microsoft.Interop``, ``Microsoft.JSInterop``, ``Microsoft.NET.Build.Tasks``, ``Microsoft.VisualBasic``, ``Microsoft.Win32``, ``Mono.Linker``, ``MySql.Data.MySqlClient``, ``NHibernate``, ``Newtonsoft.Json``, ``SourceGenerators``, ``Windows.Security.Cryptography.Core``",60,2406,162,4
-   Totals,,108,14908,415,9
+   System,"``System.*``, ``System``",48,12500,59,5
+   Others,"``Amazon.Lambda.APIGatewayEvents``, ``Amazon.Lambda.Core``, ``Dapper``, ``ILCompiler``, ``ILLink.RoslynAnalyzer``, ``ILLink.Shared``, ``ILLink.Tasks``, ``Internal.IL``, ``Internal.Pgo``, ``Internal.TypeSystem``, ``Microsoft.ApplicationBlocks.Data``, ``Microsoft.AspNet.OData``, ``Microsoft.AspNetCore.Components``, ``Microsoft.AspNetCore.Http``, ``Microsoft.AspNetCore.Mvc``, ``Microsoft.AspNetCore.OData.Deltas``, ``Microsoft.AspNetCore.WebUtilities``, ``Microsoft.CSharp``, ``Microsoft.Data.SqlClient``, ``Microsoft.Diagnostics.Tools.Pgo``, ``Microsoft.DotNet.Build.Tasks``, ``Microsoft.DotNet.PlatformAbstractions``, ``Microsoft.EntityFrameworkCore``, ``Microsoft.Extensions.Caching.Distributed``, ``Microsoft.Extensions.Caching.Memory``, ``Microsoft.Extensions.Configuration``, ``Microsoft.Extensions.DependencyInjection``, ``Microsoft.Extensions.DependencyModel``, ``Microsoft.Extensions.Diagnostics.Metrics``, ``Microsoft.Extensions.FileProviders``, ``Microsoft.Extensions.FileSystemGlobbing``, ``Microsoft.Extensions.Hosting``, ``Microsoft.Extensions.Http``, ``Microsoft.Extensions.Logging``, ``Microsoft.Extensions.Options``, ``Microsoft.Extensions.Primitives``, ``Microsoft.Interop``, ``Microsoft.JSInterop``, ``Microsoft.NET.Build.Tasks``, ``Microsoft.VisualBasic``, ``Microsoft.Win32``, ``Mono.Linker``, ``MySql.Data.MySqlClient``, ``NHibernate``, ``Newtonsoft.Json``, ``SourceGenerators``, ``Windows.Security.Cryptography.Core``",60,2416,162,4
+   Totals,,108,14923,415,9
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependabotProxy.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependabotProxy.cs
deleted file mode 100644
index e06970141fed..000000000000
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependabotProxy.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Security.Cryptography.X509Certificates;
-using Semmle.Util;
-using Semmle.Util.Logging;
-using Newtonsoft.Json;
-using System.Linq;
-
-namespace Semmle.Extraction.CSharp.DependencyFetching
-{
-    public class DependabotProxy : IDisposable
-    {
-        /// <summary>
-        /// Represents configurations for package registries.
-        /// </summary>
-        /// <param name="Type">The type of package registry.</param>
-        /// <param name="URL">The URL of the package registry.</param>
-        public record class RegistryConfig(string Type, string URL);
-
-        private readonly string host;
-        private readonly string port;
-
-        /// <summary>
-        /// The full address of the Dependabot proxy, if available.
-        /// </summary>
-        internal string Address { get; }
-        /// <summary>
-        /// The URLs of package registries that are configured for the proxy.
-        /// </summary>
-        internal HashSet<string> RegistryURLs { get; }
-        /// <summary>
-        /// The path to the temporary file where the certificate is stored.
-        /// </summary>
-        internal string? CertificatePath { get; private set; }
-        /// <summary>
-        /// The certificate used for the Dependabot proxy.
-        /// </summary>
-        internal X509Certificate2? Certificate { get; private set; }
-
-        internal static DependabotProxy? GetDependabotProxy(
-            ILogger logger, IDiagnosticsWriter diagnosticsWriter, TemporaryDirectory tempWorkingDirectory)
-        {
-            // Setting HTTP(S)_PROXY and SSL_CERT_FILE have no effect on Windows or macOS,
-            // but we would still end up using the Dependabot proxy to check for feed reachability.
-            // This would result in us discovering that the feeds are reachable, but `dotnet` would
-            // fail to connect to them. To prevent this from happening, we do not initialise an
-            // instance of `DependabotProxy` on those platforms.
-            if (SystemBuildActions.Instance.IsWindows() || SystemBuildActions.Instance.IsMacOs()) return null;
-
-            // Obtain and store the address of the Dependabot proxy, if available.
-            var host = Environment.GetEnvironmentVariable(EnvironmentVariableNames.ProxyHost);
-            var port = Environment.GetEnvironmentVariable(EnvironmentVariableNames.ProxyPort);
-
-            if (string.IsNullOrWhiteSpace(host) || string.IsNullOrWhiteSpace(port))
-            {
-                logger.LogInfo("No Dependabot proxy credentials are configured.");
-                return null;
-            }
-
-            var result = new DependabotProxy(host, port);
-            logger.LogInfo($"Dependabot proxy configured at {result.Address}");
-
-            // Obtain and store the proxy's certificate, if available.
-            var cert = Environment.GetEnvironmentVariable(EnvironmentVariableNames.ProxyCertificate);
-
-            if (!string.IsNullOrWhiteSpace(cert))
-            {
-                var certDirPath = new DirectoryInfo(Path.Join(tempWorkingDirectory.DirInfo.FullName, ".dependabot-proxy"));
-                Directory.CreateDirectory(certDirPath.FullName);
-
-                result.CertificatePath = Path.Join(certDirPath.FullName, "proxy.crt");
-                var certFile = new FileInfo(result.CertificatePath);
-
-                using var writer = certFile.CreateText();
-                writer.Write(cert);
-                writer.Close();
-
-                logger.LogInfo($"Stored Dependabot proxy certificate at {result.CertificatePath}");
-
-                result.Certificate = X509Certificate2.CreateFromPem(cert);
-            }
-
-            // Try to obtain the list of private registry URLs.
-            var registryURLs = Environment.GetEnvironmentVariable(EnvironmentVariableNames.ProxyURLs);
-
-            if (!string.IsNullOrWhiteSpace(registryURLs))
-            {
-                try
-                {
-                    // The value of the environment variable should be a JSON array of objects, such as:
-                    // [ { "type": "nuget_feed", "url": "https://nuget.pkg.github.com/org/index.json" } ]
-                    var array = JsonConvert.DeserializeObject<List<RegistryConfig>>(registryURLs);
-                    if (array is not null)
-                    {
-                        foreach (RegistryConfig config in array)
-                        {
-                            // The array contains all configured private registries, not just ones for C#.
-                            // We ignore the non-C# ones here.
-                            if (!config.Type.Equals("nuget_feed"))
-                            {
-                                logger.LogDebug($"Ignoring registry at '{config.URL}' since it is not of type 'nuget_feed'.");
-                                continue;
-                            }
-
-                            logger.LogInfo($"Found private registry at '{config.URL}'");
-                            result.RegistryURLs.Add(config.URL);
-                        }
-                    }
-                }
-                catch (JsonException ex)
-                {
-                    logger.LogError($"Unable to parse '{EnvironmentVariableNames.ProxyURLs}': {ex.Message}");
-                }
-            }
-
-            // Emit a diagnostic for the discovered private registries, so that it is easy
-            // for users to see that they were picked up.
-            if (result.RegistryURLs.Count > 0)
-            {
-                diagnosticsWriter.AddEntry(new DiagnosticMessage(
-                    Language.CSharp,
-                    "buildless/analysis-using-private-registries",
-                    severity: DiagnosticMessage.TspSeverity.Note,
-                    visibility: new DiagnosticMessage.TspVisibility(true, true, true),
-                    name: "C# extraction used private package registries",
-                    markdownMessage: string.Format(
-                        "C# was extracted using the following private package registries:\n\n{0}\n",
-                        string.Join("\n", result.RegistryURLs.Select(url => string.Format("- `{0}`", url)))
-                    )
-                ));
-            }
-
-            return result;
-        }
-
-        private DependabotProxy(string host, string port)
-        {
-            this.host = host;
-            this.port = port;
-            this.Address = $"http://{this.host}:{this.port}";
-            this.RegistryURLs = new HashSet<string>();
-        }
-
-        public void Dispose()
-        {
-            this.Certificate?.Dispose();
-        }
-    }
-}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
index 2706d5262931..8c4fb0c79ea0 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -27,10 +27,10 @@ public sealed partial class DependencyManager : IDisposable, ICompilationInfoCon
         private readonly ILogger logger;
         private readonly IDiagnosticsWriter diagnosticsWriter;
         private readonly NugetPackageRestorer nugetPackageRestorer;
-        private readonly DependabotProxy? dependabotProxy;
+        private readonly IRegistryProxy? registryProxy;
         private readonly IDotNet dotnet;
         private readonly FileContent fileContent;
-        private readonly FileProvider fileProvider;
+        private readonly IFileProvider fileProvider;
 
         // Only used as a set, but ConcurrentDictionary is the only concurrent set in .NET.
         private readonly IDictionary<string, bool> usedReferences = new ConcurrentDictionary<string, bool>();
@@ -106,11 +106,11 @@ void exitCallback(int ret, string msg, bool silent)
                 return BuildScript.Success;
             }).Run(SystemBuildActions.Instance, startCallback, exitCallback);
 
-            dependabotProxy = DependabotProxy.GetDependabotProxy(logger, diagnosticsWriter, tempWorkingDirectory);
+            registryProxy = RegistryProxy.Make(logger, diagnosticsWriter, tempWorkingDirectory);
 
             try
             {
-                this.dotnet = DotNet.Make(logger, dotnetPath, tempWorkingDirectory, dependabotProxy);
+                this.dotnet = DotNet.Make(logger, dotnetPath, tempWorkingDirectory, registryProxy);
                 runtimeLazy = new Lazy<Runtime>(() => new Runtime(dotnet));
             }
             catch
@@ -119,7 +119,7 @@ void exitCallback(int ret, string msg, bool silent)
                 throw;
             }
 
-            nugetPackageRestorer = new NugetPackageRestorer(fileProvider, fileContent, dotnet, dependabotProxy, diagnosticsWriter, logger, this);
+            nugetPackageRestorer = new NugetPackageRestorer(fileProvider, fileContent, dotnet, registryProxy, diagnosticsWriter, logger, this);
 
             var dllLocations = fileProvider.Dlls.Select(x => new AssemblyLookupLocation(x)).ToHashSet();
             dllLocations.UnionWith(nugetPackageRestorer.Restore());
@@ -295,7 +295,7 @@ private void AddNetFrameworkDlls(ISet<AssemblyLookupLocation> dllLocations, ISet
 
             string? runtimeLocation = null;
 
-            if (fileContent.IsNewProjectStructureUsed)
+            if (fileContent.IsSdkProjectStructureUsed)
             {
                 runtimeLocation = Runtime.NetCoreRuntime;
             }
@@ -544,7 +544,7 @@ private void AnalyseProject(FileInfo project)
         public void Dispose()
         {
             nugetPackageRestorer?.Dispose();
-            dependabotProxy?.Dispose();
+            registryProxy?.Dispose();
             if (cleanupTempWorkingDirectory)
             {
                 tempWorkingDirectory?.Dispose();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
index e93a29336126..4bd6f6f94870 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
@@ -31,11 +31,11 @@ private DotNet(IDotNetCliInvoker dotnetCliInvoker, ILogger logger, bool runDotne
             }
         }
 
-        private DotNet(ILogger logger, string? dotNetPath, TemporaryDirectory tempWorkingDirectory, DependabotProxy? dependabotProxy) : this(new DotNetCliInvoker(logger, Path.Join(dotNetPath ?? string.Empty, "dotnet"), dependabotProxy), logger, dotNetPath is null, tempWorkingDirectory) { }
+        private DotNet(ILogger logger, string? dotNetPath, TemporaryDirectory tempWorkingDirectory, IRegistryProxy? registryProxy) : this(new DotNetCliInvoker(logger, Path.Join(dotNetPath ?? string.Empty, "dotnet"), registryProxy), logger, dotNetPath is null, tempWorkingDirectory) { }
 
         internal static IDotNet Make(IDotNetCliInvoker dotnetCliInvoker, ILogger logger, bool runDotnetInfo) => new DotNet(dotnetCliInvoker, logger, runDotnetInfo);
 
-        public static IDotNet Make(ILogger logger, string? dotNetPath, TemporaryDirectory tempWorkingDirectory, DependabotProxy? dependabotProxy) => new DotNet(logger, dotNetPath, tempWorkingDirectory, dependabotProxy);
+        public static IDotNet Make(ILogger logger, string? dotNetPath, TemporaryDirectory tempWorkingDirectory, IRegistryProxy? registryProxy) => new DotNet(logger, dotNetPath, tempWorkingDirectory, registryProxy);
 
         private static void HandleRetryExitCode143(string dotnet, int attempt, ILogger logger)
         {
@@ -49,7 +49,7 @@ private void Info()
             // Allow up to four attempts (with up to three retries) to run `dotnet --info`, to mitigate transient issues
             for (int attempt = 0; attempt < 4; attempt++)
             {
-                var exitCode = dotnetCliInvoker.RunCommandExitCode("--info", silent: false);
+                var exitCode = dotnetCliInvoker.RunCommandExitCode(["--info"], silent: false);
                 switch (exitCode)
                 {
                     case 0:
@@ -63,9 +63,9 @@ private void Info()
             }
         }
 
-        private string GetRestoreArgs(RestoreSettings restoreSettings)
+        private List<string> GetRestoreArgs(RestoreSettings restoreSettings)
         {
-            var args = $"restore --no-dependencies \"{restoreSettings.File}\" --packages \"{restoreSettings.PackageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal";
+            List<string> args = ["restore", "--no-dependencies", restoreSettings.File, "--packages", restoreSettings.PackageDirectory, "/p:DisableImplicitNuGetFallbackFolder=true", "--verbosity", "normal"];
 
             if (restoreSettings.ForceDotnetRefAssemblyFetching)
             {
@@ -77,28 +77,21 @@ private string GetRestoreArgs(RestoreSettings restoreSettings)
                     Directory.CreateDirectory(path);
                 }
 
-                args += $" /p:TargetFrameworkRootPath=\"{path}\" /p:NetCoreTargetingPackRoot=\"{path}\" /p:AllowMissingPrunePackageData=true";
-            }
-
-            if (restoreSettings.PathToNugetConfig != null)
-            {
-                args += $" --configfile \"{restoreSettings.PathToNugetConfig}\"";
+                args.AddRange([$"/p:TargetFrameworkRootPath={path}", $"/p:NetCoreTargetingPackRoot={path}", "/p:AllowMissingPrunePackageData=true"]);
             }
 
             if (restoreSettings.ForceReevaluation)
             {
-                args += " --force";
+                args.Add("--force");
             }
 
             if (restoreSettings.TargetWindows)
             {
-                args += " /p:EnableWindowsTargeting=true";
+                args.Add("/p:EnableWindowsTargeting=true");
             }
 
-            if (restoreSettings.NugetSources is not null)
-            {
-                args += $" {restoreSettings.NugetSources}";
-            }
+            var nugetSources = restoreSettings.NugetSources.SelectMany<string, string>(source => ["-s", source]).ToList();
+            args.AddRange(nugetSources);
 
             return args;
         }
@@ -112,52 +105,52 @@ public RestoreResult Restore(RestoreSettings restoreSettings)
 
         public bool New(string folder)
         {
-            var args = $"new console --no-restore --output \"{folder}\"";
+            List<string> args = ["new", "console", "--no-restore", "--output", folder];
             return dotnetCliInvoker.RunCommand(args);
         }
 
         public bool AddPackage(string folder, string package)
         {
-            var args = $"add \"{folder}\" package \"{package}\" --no-restore";
+            List<string> args = ["add", folder, "package", package, "--no-restore"];
             return dotnetCliInvoker.RunCommand(args);
         }
 
-        public IList<string> GetListedRuntimes() => GetResultList("--list-runtimes");
+        public IList<string> GetListedRuntimes() => GetResultList(["--list-runtimes"]);
 
-        public IList<string> GetListedSdks() => GetResultList("--list-sdks");
+        public IList<string> GetListedSdks() => GetResultList(["--list-sdks"]);
 
-        private IList<string> GetResultList(string args, string? workingDirectory = null, bool silent = true)
+        private IList<string> GetResultList(List<string> args, string? workingDirectory = null, bool silent = true)
         {
             if (dotnetCliInvoker.RunCommand(args, workingDirectory, out var results, silent))
             {
                 return results;
             }
-            logger.LogWarning($"Running 'dotnet {args}' failed.");
+            logger.LogWarning($"Running 'dotnet {string.Join(" ", args)}' failed.");
             return [];
         }
 
-        public bool Exec(string execArgs)
+        public bool Exec(List<string> execArgs)
         {
-            var args = $"exec {execArgs}";
+            List<string> args = ["exec", .. execArgs];
             return dotnetCliInvoker.RunCommand(args);
         }
 
-        private const string nugetListSourceCommand = "nuget list source --format Short";
+        private static readonly IReadOnlyList<string> nugetListSourceCommandArgs = ["nuget", "list", "source", "--format", "Short"];
 
-        public IList<string> GetNugetFeeds(string nugetConfig)
+        public IList<string> GetNugetFeedsFromConfig(string nugetConfig)
         {
             logger.LogInfo($"Getting NuGet feeds from '{nugetConfig}'...");
-            return GetResultList($"{nugetListSourceCommand} --configfile \"{nugetConfig}\"");
+            return GetResultList([.. nugetListSourceCommandArgs, "--configfile", nugetConfig]);
         }
 
         public IList<string> GetNugetFeedsFromFolder(string folderPath)
         {
             logger.LogInfo($"Getting NuGet feeds in folder '{folderPath}'...");
-            return GetResultList(nugetListSourceCommand, folderPath);
+            return GetResultList(nugetListSourceCommandArgs.ToList(), folderPath);
         }
 
         // The version number should be kept in sync with the version .NET version used for building the application.
-        public const string LatestDotNetSdkVersion = "10.0.100";
+        public const string LatestDotNetSdkVersion = "10.0.201";
 
         public static ReadOnlyDictionary<string, string> MinimalEnvironment => IDotNetCliInvoker.MinimalEnvironment;
 
@@ -287,9 +280,16 @@ private static BuildScript DownloadDotNetVersion(IBuildActions actions, ILogger
                     getInstall = version =>
                     {
                         var psCommand = $"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -Version {version} -InstallDir {path}";
+                        var environment = new Dictionary<string, string>
+                        {
+                            // Starting with .NET 11, the installation script uses tar by default. However,
+                            // tar extraction fails in dotnet-install.ps1, so force the script to download
+                            // and extract the ZIP archive instead. This workaround may be removable in the future.
+                            {"DOTNET_INSTALL_SKIP_TAR", "1"}
+                        };
 
                         BuildScript GetInstall(string pwsh) =>
-                            new CommandBuilder(actions).
+                            new CommandBuilder(actions, environment: environment).
                             RunCommand(pwsh).
                             Argument("-NoProfile").
                             Argument("-ExecutionPolicy").
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs
index 4c4e789973ca..467a90ac7288 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Diagnostics;
 using Semmle.Util;
 using Semmle.Util.Logging;
@@ -13,19 +12,19 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
     internal sealed class DotNetCliInvoker : IDotNetCliInvoker
     {
         private readonly ILogger logger;
-        private readonly DependabotProxy? proxy;
+        private readonly IRegistryProxy? proxy;
 
         public string Exec { get; }
 
-        public DotNetCliInvoker(ILogger logger, string exec, DependabotProxy? dependabotProxy)
+        public DotNetCliInvoker(ILogger logger, string exec, IRegistryProxy? registryProxy)
         {
             this.logger = logger;
-            this.proxy = dependabotProxy;
+            this.proxy = registryProxy;
             this.Exec = exec;
             logger.LogInfo($"Using .NET CLI executable: '{Exec}'");
         }
 
-        private ProcessStartInfo MakeDotnetStartInfo(string args, string? workingDirectory)
+        private ProcessStartInfo MakeDotnetStartInfo(List<string> args, string? workingDirectory)
         {
             var startInfo = new ProcessStartInfo(Exec, args)
             {
@@ -45,51 +44,44 @@ private ProcessStartInfo MakeDotnetStartInfo(string args, string? workingDirecto
             }
 
             // Configure the proxy settings, if applicable.
-            if (this.proxy != null)
-            {
-                logger.LogDebug($"Configuring environment variables for the Dependabot proxy at {this.proxy.Address}");
-
-                startInfo.EnvironmentVariables["HTTP_PROXY"] = this.proxy.Address;
-                startInfo.EnvironmentVariables["HTTPS_PROXY"] = this.proxy.Address;
-                startInfo.EnvironmentVariables["SSL_CERT_FILE"] = this.proxy.CertificatePath;
-            }
+            proxy?.SetProcessEnvironment(startInfo);
 
             return startInfo;
         }
 
-        private int RunCommandExitCodeAux(string args, string? workingDirectory, out IList<string> output, out string dirLog, bool silent)
+        private int RunCommandExitCodeAux(List<string> args, string? workingDirectory, out IList<string> output, out string dirLog, bool silent)
         {
             dirLog = string.IsNullOrWhiteSpace(workingDirectory) ? "" : $" in {workingDirectory}";
             var pi = MakeDotnetStartInfo(args, workingDirectory);
             var threadId = Environment.CurrentManagedThreadId;
             void onOut(string s) => logger.Log(silent ? Severity.Debug : Severity.Info, s, threadId);
             void onError(string s) => logger.LogError(s, threadId);
-            logger.LogInfo($"Running '{Exec} {args}'{dirLog}");
+            logger.LogInfo($"Running '{Exec} {string.Join(" ", args)}'{dirLog}");
             var exitCode = pi.ReadOutput(out output, onOut, onError);
             return exitCode;
         }
 
-        private bool RunCommandAux(string args, string? workingDirectory, out IList<string> output, bool silent)
+        private bool RunCommandAux(List<string> args, string? workingDirectory, out IList<string> output, bool silent)
         {
             var exitCode = RunCommandExitCodeAux(args, workingDirectory, out output, out var dirLog, silent);
             if (exitCode != 0)
             {
-                logger.LogError($"Command '{Exec} {args}'{dirLog} failed with exit code {exitCode}");
+                logger.LogError($"Command '{Exec} {string.Join(" ", args)}'{dirLog} failed with exit code {exitCode}");
                 return false;
             }
             return true;
         }
 
-        public bool RunCommand(string args, bool silent = true) =>
+        public bool RunCommand(List<string> args, bool silent = true) =>
             RunCommandAux(args, null, out _, silent);
 
-        public int RunCommandExitCode(string args, bool silent = true) =>
+        public int RunCommandExitCode(List<string> args, bool silent = true) =>
             RunCommandExitCodeAux(args, null, out _, out _, silent);
 
-        public bool RunCommand(string args, out IList<string> output, bool silent = true) =>
+        public bool RunCommand(List<string> args, out IList<string> output, bool silent = true) =>
             RunCommandAux(args, null, out output, silent);
 
-        public bool RunCommand(string args, string? workingDirectory, out IList<string> output, bool silent = true) =>
+        public bool RunCommand(List<string> args, string? workingDirectory, out IList<string> output, bool silent = true) =>
             RunCommandAux(args, workingDirectory, out output, silent);
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
index b1134ad21e24..6b5b35ec03a3 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
@@ -56,7 +56,6 @@ internal static class EnvironmentVariableNames
 
         /// <summary>
         /// Specifies the NuGet feeds to use for fallback NuGet dependency fetching. The value is a space-separated list of feed URLs.
-        /// The default value is `https://api.nuget.org/v3/index.json`.
         /// </summary>
         public const string FallbackNugetFeeds = "CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_FALLBACK";
 
@@ -76,17 +75,17 @@ internal static class EnvironmentVariableNames
         public const string DiagnosticDir = "CODEQL_EXTRACTOR_CSHARP_DIAGNOSTIC_DIR";
 
         /// <summary>
-        /// Specifies the hostname of the Dependabot proxy.
+        /// Specifies the hostname of the registry proxy.
         /// </summary>
         public const string ProxyHost = "CODEQL_PROXY_HOST";
 
         /// <summary>
-        /// Specifies the hostname of the Dependabot proxy.
+        /// Specifies the port of the registry proxy.
         /// </summary>
         public const string ProxyPort = "CODEQL_PROXY_PORT";
 
         /// <summary>
-        /// Contains the certificate used by the Dependabot proxy.
+        /// Contains the certificate used by the registry proxy.
         /// </summary>
         public const string ProxyCertificate = "CODEQL_PROXY_CA_CERTIFICATE";
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs
index 744b60f3d3f5..a0b8977ed87a 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManager.cs
@@ -1,15 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.IO;
 using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
 using Semmle.Util;
 using Semmle.Util.Logging;
 
@@ -17,40 +10,131 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 {
     internal sealed partial class FeedManager : IDisposable
     {
-        internal const string PublicNugetOrgFeed = "https://api.nuget.org/v3/index.json";
+        private const string PublicNugetOrg = "nuget.org";
+        private const string PublicDotNugetOrg = $".{PublicNugetOrg}";
+        internal const string PublicApiNugetOrgFeed = $"https://api{PublicDotNugetOrg}/v3/index.json";
 
         private readonly ILogger logger;
         private readonly IDotNet dotnet;
-        private readonly FileProvider fileProvider;
-        private readonly DependabotProxy? dependabotProxy;
+        private readonly IFileProvider fileProvider;
         private readonly DependencyDirectory emptyPackageDirectory;
+        private readonly ImmutableHashSet<string> privateRegistryFeeds;
+        private readonly bool hasPrivateRegistryBaseFeeds;
+        private readonly ImmutableHashSet<string> privateRegistryBaseFeeds;
+        private readonly IFeedManagerIO feedManagerIo;
 
-        public ImmutableHashSet<string> PrivateRegistryFeeds { get; }
+        /// <summary>
+        /// Gets whether there are private package registries configured for C#.
+        /// </summary>
         public bool HasPrivateRegistryFeeds { get; }
+
+        /// <summary>
+        /// Gets whether the reachability of the NuGet feeds should be checked before using them for restore.
+        /// </summary>
         public bool CheckNugetFeedResponsiveness { get; } = EnvironmentVariables.GetBooleanOptOut(EnvironmentVariableNames.CheckNugetFeedResponsiveness);
 
-        public FeedManager(ILogger logger, IDotNet dotnet, DependabotProxy? dependabotProxy, FileProvider fileProvider)
+        private readonly Lazy<ImmutableHashSet<string>> lazyExplicitFeeds;
+
+        /// <summary>
+        /// Gets the list of NuGet feeds that are explicitly configured
+        /// - NuGet configuration files.
+        /// - Private package registries that are configured for C#.
+        /// </summary>
+        public ImmutableHashSet<string> ExplicitFeeds => lazyExplicitFeeds.Value;
+
+        private readonly Lazy<ImmutableHashSet<string>> lazyAllFeeds;
+
+        /// <summary>
+        /// Gets the list of all NuGet feeds that are configured in the environment. That is
+        /// - Explicit feeds
+        /// - Inherited feeds from the machine and environment (if not explicitly disabled by a
+        /// root directory NuGet configuration).
+        /// </summary>
+        public ImmutableHashSet<string> AllFeeds => lazyAllFeeds.Value;
+
+        /// <summary>
+        /// Gets the list of inherited NuGet feeds that are configured in the environment.
+        /// </summary>
+        public ImmutableHashSet<string> InheritedFeeds => AllFeeds.Except(ExplicitFeeds).ToImmutableHashSet();
+
+        private readonly Lazy<ImmutableHashSet<string>> lazyReachableExplicitFeeds;
+
+        /// <summary>
+        /// Gets the list of reachable NuGet feeds that are explicitly configured.
+        /// </summary>
+        public ImmutableHashSet<string> ReachableExplicitFeeds => lazyReachableExplicitFeeds.Value;
+
+        private readonly Lazy<ImmutableHashSet<string>> lazyReachableFeeds;
+        /// <summary>
+        /// Gets the list of reachable NuGet feeds that are configured in the environment.
+        /// </summary>
+        public ImmutableHashSet<string> ReachableFeeds => lazyReachableFeeds.Value;
+
+        private readonly Lazy<ImmutableHashSet<string>> lazyReachableFallbackFeeds;
+        /// <summary>
+        /// Gets the list of reachable NuGet feeds that are configured as fallback feeds.
+        /// </summary>
+        public ImmutableHashSet<string> ReachableFallbackFeeds => lazyReachableFallbackFeeds.Value;
+
+        private readonly Lazy<ImmutableHashSet<string>> lazyReachableDefaultFeeds;
+
+        /// <summary>
+        /// Gets the list of default NuGet feeds that are configured in the environment.
+        /// This is either the public NuGet feed or a set of feeds specified by the environment.
+        /// </summary>
+        public ImmutableHashSet<string> DefaultFeeds { get; init; }
+
+        /// <summary>
+        /// Gets the list of reachable default NuGet feeds.
+        /// </summary>
+        public ImmutableHashSet<string> ReachableDefaultFeeds => lazyReachableDefaultFeeds.Value;
+
+        public FeedManager(ILogger logger, IDotNet dotnet, IRegistryProxy? registryProxy, IFileProvider fileProvider, IFeedManagerIO feedManagerIo)
         {
             this.logger = logger;
             this.dotnet = dotnet;
-            this.dependabotProxy = dependabotProxy;
             this.fileProvider = fileProvider;
-            PrivateRegistryFeeds = dependabotProxy?.RegistryURLs.ToImmutableHashSet() ?? [];
-            HasPrivateRegistryFeeds = PrivateRegistryFeeds.Count > 0;
+            this.feedManagerIo = feedManagerIo;
+            privateRegistryFeeds = registryProxy?.RegistryURLs ?? [];
+            HasPrivateRegistryFeeds = privateRegistryFeeds.Count > 0;
+            privateRegistryBaseFeeds = registryProxy?.RegistryBaseURLs ?? [];
+            hasPrivateRegistryBaseFeeds = privateRegistryBaseFeeds.Count > 0;
+
+            DefaultFeeds = hasPrivateRegistryBaseFeeds
+                ? privateRegistryBaseFeeds
+                : [PublicApiNugetOrgFeed];
             emptyPackageDirectory = new DependencyDirectory("empty", "empty package", logger);
+
+            lazyExplicitFeeds = new Lazy<ImmutableHashSet<string>>(GetExplicitFeeds);
+            lazyAllFeeds = new Lazy<ImmutableHashSet<string>>(GetAllFeeds);
+            lazyReachableExplicitFeeds = new Lazy<ImmutableHashSet<string>>(() => CheckSpecifiedFeeds(ExplicitFeeds, "explicit"));
+            lazyReachableFeeds = new Lazy<ImmutableHashSet<string>>(() =>
+            {
+                // Inherited feeds should only be used, if they are indeed reachable (as they may be environment specific).
+                var reachableInheritedFeeds = CheckSpecifiedFeeds(InheritedFeeds, "inherited");
+                return ReachableExplicitFeeds.Union(reachableInheritedFeeds).ToImmutableHashSet();
+            });
+            lazyReachableFallbackFeeds = new Lazy<ImmutableHashSet<string>>(GetReachableFallbackNugetFeeds);
+            lazyReachableDefaultFeeds = new Lazy<ImmutableHashSet<string>>(() => CheckSpecifiedFeeds(DefaultFeeds, "default"));
         }
 
-        private string? GetDirectoryName(string path)
+        public FeedManager(ILogger logger, IDotNet dotnet, IRegistryProxy? registryProxy, IFileProvider fileProvider)
+            : this(logger, dotnet, registryProxy, fileProvider, new FeedManagerIO(logger, registryProxy))
+        {
+        }
+
+        private bool IsNugetOrgFeed(string url)
         {
             try
             {
-                return new FileInfo(path).Directory?.FullName;
+                var uri = new Uri(url);
+                return uri.Host.EndsWith(PublicDotNugetOrg, StringComparison.InvariantCultureIgnoreCase) ||
+                    string.Equals(uri.Host, PublicNugetOrg, StringComparison.InvariantCultureIgnoreCase);
             }
-            catch (Exception exc)
+            catch (UriFormatException)
             {
-                logger.LogWarning($"Failed to get directory of '{path}': {exc}");
+                return false;
             }
-            return null;
         }
 
         private IEnumerable<string> GetFeeds(Func<IList<string>> getNugetFeeds)
@@ -74,37 +158,56 @@ private IEnumerable<string> GetFeeds(Func<IList<string>> getNugetFeeds)
                     continue;
                 }
 
-                if (!string.IsNullOrWhiteSpace(url))
+                if (hasPrivateRegistryBaseFeeds && IsNugetOrgFeed(url))
                 {
-                    yield return url;
+                    // Use private registry base feeds.
+                    foreach (var feed in privateRegistryBaseFeeds)
+                    {
+                        logger.LogDebug($"Using private registry base feed '{feed}'.");
+                        yield return feed;
+                    }
+                    continue;
                 }
+
+                yield return url;
             }
         }
 
         private IEnumerable<string> GetFeedsFromFolder(string folderPath) =>
             GetFeeds(() => dotnet.GetNugetFeedsFromFolder(folderPath));
 
-
         private IEnumerable<string> GetFeedsFromNugetConfig(string nugetConfigPath) =>
-            GetFeeds(() => dotnet.GetNugetFeeds(nugetConfigPath));
+            GetFeeds(() => dotnet.GetNugetFeedsFromConfig(nugetConfigPath));
 
-        public string FeedsToRestoreArgument(IEnumerable<string> feeds, string sourceArgumentPrefix)
+        /// <summary>
+        /// Constructs the NuGet sources argument for the restore command based on the given feeds.
+        /// If there are no feeds, a dummy source argument is added to override any default feeds that `restore` would use.
+        /// </summary>
+        /// <param name="feeds">The list of feeds to use for the restore command.</param>
+        /// <returns>The list of NuGet sources arguments for the restore command.</returns>
+        public List<string> RestoreFeeds(IEnumerable<string> feeds)
         {
             // If there are no feeds, we want to override any default feeds that `restore` would use by passing a dummy source argument.
             if (!feeds.Any())
             {
-                return $" {sourceArgumentPrefix} \"{emptyPackageDirectory.DirInfo.FullName}\"";
+                return [emptyPackageDirectory.DirInfo.FullName];
             }
 
-            // Add package sources. If any are present, they override all sources specified in
-            // the configuration file(s).
-            var feedArgs = new StringBuilder();
-            foreach (var feed in feeds)
+            return feeds.ToList();
+        }
+
+        private IEnumerable<string> FeedsToUseAux(HashSet<string> feedsToConsider)
+        {
+            if (HasPrivateRegistryFeeds)
             {
-                feedArgs.Append($" {sourceArgumentPrefix} \"{feed}\"");
+                feedsToConsider.UnionWith(privateRegistryFeeds);
             }
 
-            return feedArgs.ToString();
+            var feedsToUse = CheckNugetFeedResponsiveness
+                ? feedsToConsider.Where(ReachableFeeds.Contains)
+                : feedsToConsider;
+
+            return feedsToUse;
         }
 
         /// <summary>
@@ -113,24 +216,14 @@ public string FeedsToRestoreArgument(IEnumerable<string> feeds, string sourceArg
         /// (2) Use private registries, if they are configured
         /// </summary>
         /// <param name="path">Path to project/solution/packages.config</param>
-        /// <param name="reachableFeeds">The set of reachable NuGet feeds.</param>
         /// <returns>The list of NuGet feeds to use for this restore.</returns>
-        public IEnumerable<string> FeedsToUse(string path, HashSet<string> reachableFeeds)
+        public IEnumerable<string> FeedsToUse(string path)
         {
             // Find the path specific feeds.
-            var folder = GetDirectoryName(path);
+            var folder = feedManagerIo.GetDirectoryName(path);
             var feedsToConsider = folder is not null ? GetFeedsFromFolder(folder).ToHashSet() : new HashSet<string>();
 
-            if (HasPrivateRegistryFeeds)
-            {
-                feedsToConsider.UnionWith(PrivateRegistryFeeds);
-            }
-
-            var feedsToUse = CheckNugetFeedResponsiveness
-                ? feedsToConsider.Where(reachableFeeds.Contains)
-                : feedsToConsider;
-
-            return feedsToUse;
+            return FeedsToUseAux(feedsToConsider);
         }
 
         /// <summary>
@@ -139,19 +232,18 @@ public IEnumerable<string> FeedsToUse(string path, HashSet<string> reachableFeed
         /// (2) Use private registries, if they are configured
         /// </summary>
         /// <param name="path">Path to project/solution</param>
-        /// <param name="reachableFeeds">The set of reachable NuGet feeds.</param>
-        /// <returns>A string representing the NuGet sources argument for the restore command.</returns>
-        public string? MakeDotnetRestoreSourcesArgument(string path, HashSet<string> reachableFeeds)
+        /// <returns>A list representing the NuGet sources arguments for the `dotnet restore` command.</returns>
+        public List<string> MakeRestoreFeeds(string path)
         {
             // Do not construct a set of explicit NuGet sources to use for restore.
             if (!CheckNugetFeedResponsiveness && !HasPrivateRegistryFeeds)
             {
-                return null;
+                return [];
             }
 
-            var feedsToUse = FeedsToUse(path, reachableFeeds);
+            var feedsToUse = FeedsToUse(path);
 
-            return FeedsToRestoreArgument(feedsToUse, "-s");
+            return RestoreFeeds(feedsToUse);
         }
 
         private (int initialTimeout, int tryCount) GetFeedRequestSettings(bool isFallback)
@@ -173,79 +265,6 @@ public IEnumerable<string> FeedsToUse(string path, HashSet<string> reachableFeed
             return (timeoutMilliSeconds, tryCount);
         }
 
-        private static async Task<HttpResponseMessage> ExecuteGetRequest(string address, HttpClient httpClient, CancellationToken cancellationToken)
-        {
-            return await httpClient.GetAsync(address, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
-        }
-
-        private bool IsFeedReachable(string feed, int timeoutMilliSeconds, int tryCount, out bool isTimeout)
-        {
-            logger.LogInfo($"Checking if NuGet feed '{feed}' is reachable...");
-
-            // Configure the HttpClient to be aware of the Dependabot Proxy, if used.
-            HttpClientHandler httpClientHandler = new();
-            if (dependabotProxy != null)
-            {
-                httpClientHandler.Proxy = new WebProxy(dependabotProxy.Address);
-
-                if (dependabotProxy.Certificate != null)
-                {
-                    httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, _) =>
-                    {
-                        if (chain is null || cert is null)
-                        {
-                            var msg = cert is null && chain is null
-                                ? "certificate and chain"
-                                : chain is null
-                                    ? "chain"
-                                    : "certificate";
-                            logger.LogWarning($"Dependabot proxy certificate validation failed due to missing {msg}");
-                            return false;
-                        }
-                        chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
-                        chain.ChainPolicy.CustomTrustStore.Add(dependabotProxy.Certificate);
-                        return chain.Build(cert);
-                    };
-                }
-            }
-
-            using HttpClient client = new(httpClientHandler);
-
-            isTimeout = false;
-
-            for (var i = 0; i < tryCount; i++)
-            {
-                using var cts = new CancellationTokenSource();
-                cts.CancelAfter(timeoutMilliSeconds);
-                try
-                {
-                    logger.LogInfo($"Attempt {i + 1}/{tryCount} to reach NuGet feed '{feed}'.");
-                    using var response = ExecuteGetRequest(feed, client, cts.Token).GetAwaiter().GetResult();
-                    response.EnsureSuccessStatusCode();
-                    logger.LogInfo($"Querying NuGet feed '{feed}' succeeded.");
-                    return true;
-                }
-                catch (Exception exc)
-                {
-                    if (exc is TaskCanceledException tce &&
-                        tce.CancellationToken == cts.Token &&
-                        cts.Token.IsCancellationRequested)
-                    {
-                        logger.LogInfo($"Didn't receive answer from NuGet feed '{feed}' in {timeoutMilliSeconds}ms.");
-                        timeoutMilliSeconds *= 2;
-                        continue;
-                    }
-
-                    logger.LogInfo($"Querying NuGet feed '{feed}' failed. The reason for the failure: {exc.Message}");
-                    return false;
-                }
-            }
-
-            logger.LogWarning($"Didn't receive answer from NuGet feed '{feed}'. Tried it {tryCount} times.");
-            isTimeout = true;
-            return false;
-        }
-
         /// <summary>
         /// Retrieves a list of excluded NuGet feeds from the corresponding environment variable.
         /// </summary>
@@ -266,13 +285,16 @@ private HashSet<string> GetExcludedFeeds()
         /// Checks that we can connect to the specified NuGet feeds.
         /// </summary>
         /// <param name="feeds">The set of package feeds to check.</param>
-        /// <param name="reachableFeeds">The list of feeds that were reachable.</param>
-        /// <returns>
-        /// True if there is a timeout when trying to reach the feeds (excluding any feeds that are configured
-        /// to be excluded from the check) or false otherwise.
-        /// </returns>
-        public bool CheckSpecifiedFeeds(HashSet<string> feeds, out HashSet<string> reachableFeeds)
+        /// <returns>The list of feeds that were reachable.</returns>
+        private ImmutableHashSet<string> CheckSpecifiedFeeds(ImmutableHashSet<string> feeds, string kind)
         {
+            if (feeds.Count == 0)
+            {
+                return [];
+            }
+
+            logger.LogInfo($"Discovering reachable {kind} NuGet feeds.");
+
             // Exclude any feeds from the feed check that are configured by the corresponding environment variable.
             // These feeds are always assumed to be reachable.
             var excludedFeeds = GetExcludedFeeds();
@@ -287,23 +309,10 @@ public bool CheckSpecifiedFeeds(HashSet<string> feeds, out HashSet<string> reach
                 return true;
             }).ToHashSet();
 
-            reachableFeeds = GetReachableNuGetFeeds(feedsToCheck, isFallback: false, out var isTimeout).ToHashSet();
+            var reachable = feedsToCheck.Count > 0 ? GetReachableNuGetFeeds(feedsToCheck, kind, isFallback: false) : [];
 
             // Always consider feeds excluded for the reachability check as reachable.
-            reachableFeeds.UnionWith(feeds.Where(feed => excludedFeeds.Contains(feed)));
-
-            return isTimeout;
-        }
-
-        public bool IsDefaultFeedReachable()
-        {
-            if (CheckNugetFeedResponsiveness)
-            {
-                var (initialTimeout, tryCount) = GetFeedRequestSettings(isFallback: false);
-                return IsFeedReachable(PublicNugetOrgFeed, initialTimeout, tryCount, out var _);
-            }
-
-            return true;
+            return reachable.Union(feeds.Where(feed => excludedFeeds.Contains(feed))).ToImmutableHashSet();
         }
 
         /// <summary>
@@ -311,62 +320,58 @@ public bool IsDefaultFeedReachable()
         /// </summary>
         /// <param name="feedsToCheck">The feeds to check.</param>
         /// <param name="isFallback">Whether the feeds are fallback feeds or not.</param>
-        /// <param name="isTimeout">Whether a timeout occurred while checking the feeds.</param>
         /// <returns>The list of feeds that could be reached.</returns>
-        private List<string> GetReachableNuGetFeeds(HashSet<string> feedsToCheck, bool isFallback, out bool isTimeout)
+        private List<string> GetReachableNuGetFeeds(HashSet<string> feedsToCheck, string kind, bool isFallback)
         {
-            var fallbackStr = isFallback ? "fallback " : "";
-            logger.LogInfo($"Checking {fallbackStr}NuGet feed reachability on feeds: {string.Join(", ", feedsToCheck.OrderBy(f => f))}");
+            logger.LogInfo($"Checking {kind} NuGet feed reachability on feeds: {string.Join(", ", feedsToCheck.OrderBy(f => f))}");
 
             var (initialTimeout, tryCount) = GetFeedRequestSettings(isFallback);
-            var timeout = false;
             var reachableFeeds = feedsToCheck
-                .Where(feed =>
-                {
-                    var reachable = IsFeedReachable(feed, initialTimeout, tryCount, out var feedTimeout);
-                    timeout |= feedTimeout;
-                    return reachable;
-                })
+                .Where(feed => feedManagerIo.IsFeedReachable(feed, initialTimeout, tryCount))
                 .ToList();
 
             if (reachableFeeds.Count == 0)
             {
-                logger.LogWarning($"No {fallbackStr}NuGet feeds are reachable.");
+                logger.LogWarning($"No {kind} NuGet feeds are reachable.");
             }
             else
             {
-                logger.LogInfo($"Reachable {fallbackStr}NuGet feeds: {string.Join(", ", reachableFeeds.OrderBy(f => f))}");
+                logger.LogInfo($"Reachable {kind} NuGet feeds: {string.Join(", ", reachableFeeds.OrderBy(f => f))}");
             }
 
-            isTimeout = timeout;
             return reachableFeeds;
         }
 
-        public List<string> GetReachableFallbackNugetFeeds(HashSet<string>? feedsFromNugetConfigs)
+        private ImmutableHashSet<string> GetReachableFallbackNugetFeeds()
         {
             var fallbackFeeds = EnvironmentVariables.GetURLs(EnvironmentVariableNames.FallbackNugetFeeds).ToHashSet();
             if (fallbackFeeds.Count == 0)
             {
-                fallbackFeeds.Add(PublicNugetOrgFeed);
-                logger.LogInfo($"No fallback NuGet feeds specified. Adding default feed: {PublicNugetOrgFeed}");
+                fallbackFeeds.UnionWith(DefaultFeeds);
+                logger.LogInfo($"No fallback NuGet feeds specified. Adding default feeds: {string.Join(", ", DefaultFeeds.OrderBy(f => f))}");
 
                 var shouldAddNugetConfigFeeds = EnvironmentVariables.GetBooleanOptOut(EnvironmentVariableNames.AddNugetConfigFeedsToFallback);
                 logger.LogInfo($"Adding feeds from nuget.config to fallback restore: {shouldAddNugetConfigFeeds}");
 
-                if (shouldAddNugetConfigFeeds && feedsFromNugetConfigs?.Count > 0)
+                if (shouldAddNugetConfigFeeds && ExplicitFeeds.Count > 0)
                 {
-                    // There are some feeds in `feedsFromNugetConfigs` that have already been checked for reachability, we could skip those.
-                    // But we might use different responsiveness testing settings when we try them in the fallback logic, so checking them again is safer.
-                    fallbackFeeds.UnionWith(feedsFromNugetConfigs);
-                    logger.LogInfo($"Using NuGet feeds from nuget.config files as fallback feeds: {string.Join(", ", feedsFromNugetConfigs.OrderBy(f => f))}");
+                    // Feeds in `ExplicitFeeds` may already have been checked for reachability.
+                    // However, the fallback logic may use different responsiveness settings, so check them again.
+                    fallbackFeeds.UnionWith(ExplicitFeeds);
+                    logger.LogInfo($"Using NuGet feeds from nuget.config files as fallback feeds: {string.Join(", ", ExplicitFeeds.OrderBy(f => f))}");
                 }
             }
+            else
+            {
+                logger.LogInfo($"Using fallback NuGet feeds from environment variable '{EnvironmentVariableNames.FallbackNugetFeeds}'.");
+            }
 
-            return GetReachableNuGetFeeds(fallbackFeeds, isFallback: true, out var _);
+            return GetReachableNuGetFeeds(fallbackFeeds, "fallback", isFallback: true).ToImmutableHashSet();
         }
 
-        public (HashSet<string> explicitFeeds, HashSet<string> allFeeds) GetAllFeeds()
+        private ImmutableHashSet<string> GetExplicitFeeds()
         {
+            logger.LogInfo("Discovering explicit NuGet feeds from nuget.config files and private registries.");
             var nugetConfigs = fileProvider.NugetConfigs;
 
             // Find feeds that are explicitly configured in the NuGet configuration files that we found.
@@ -387,14 +392,23 @@ public List<string> GetReachableFallbackNugetFeeds(HashSet<string>? feedsFromNug
             // in addition to the ones that are configured in `nuget.config` files.
             if (HasPrivateRegistryFeeds)
             {
-                logger.LogInfo($"Found {PrivateRegistryFeeds.Count} private registry feeds configured for C#: {string.Join(", ", PrivateRegistryFeeds.OrderBy(f => f))}");
-                explicitFeeds.UnionWith(PrivateRegistryFeeds);
+                logger.LogInfo($"Found {privateRegistryFeeds.Count} private registry feeds configured for C#: {string.Join(", ", privateRegistryFeeds.OrderBy(f => f))}");
+                explicitFeeds.UnionWith(privateRegistryFeeds);
             }
 
+            return explicitFeeds.ToImmutableHashSet();
+        }
+
+        private ImmutableHashSet<string> GetAllFeeds()
+        {
+            logger.LogInfo("Discovering all NuGet feeds.");
+
+            var nugetConfigs = fileProvider.NugetConfigs;
+
             HashSet<string> allFeeds = [];
 
             // Add all explicitFeeds to the set of all feeds.
-            allFeeds.UnionWith(explicitFeeds);
+            allFeeds.UnionWith(ExplicitFeeds);
 
             // Obtain the list of feeds from the root source directory.
             // If a NuGet file is present it will be respected, otherwise we will just get the machine/environment specific feeds.
@@ -404,7 +418,7 @@ public List<string> GetReachableFallbackNugetFeeds(HashSet<string>? feedsFromNug
             if (nugetConfigs.Count > 0)
             {
                 var nugetConfigFeeds = nugetConfigs
-                    .Select(GetDirectoryName)
+                    .Select(feedManagerIo.GetDirectoryName)
                     .Where(folder => folder != null)
                     .SelectMany(folder => GetFeedsFromFolder(folder!))
                     .ToHashSet();
@@ -414,7 +428,7 @@ public List<string> GetReachableFallbackNugetFeeds(HashSet<string>? feedsFromNug
 
             logger.LogInfo($"Found {allFeeds.Count} NuGet feeds (with inherited ones) in nuget.config files: {string.Join(", ", allFeeds.OrderBy(f => f))}");
 
-            return (explicitFeeds, allFeeds);
+            return allFeeds.ToImmutableHashSet();
         }
 
         [GeneratedRegex(@"^E\s(.*)$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManagerIO.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManagerIO.cs
new file mode 100644
index 000000000000..012781b23276
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FeedManagerIO.cs
@@ -0,0 +1,109 @@
+
+using System;
+using System.IO;
+using Semmle.Util.Logging;
+using System.Net.Http;
+using System.Net;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Semmle.Extraction.CSharp.DependencyFetching
+{
+    public class FeedManagerIO : IFeedManagerIO
+    {
+        private readonly ILogger logger;
+        private readonly IRegistryProxy? registryProxy;
+
+        public FeedManagerIO(ILogger logger, IRegistryProxy? registryProxy)
+        {
+            this.logger = logger;
+            this.registryProxy = registryProxy;
+        }
+
+        public string? GetDirectoryName(string path)
+        {
+            try
+            {
+                return new FileInfo(path).Directory?.FullName;
+            }
+            catch (Exception exc)
+            {
+                logger.LogWarning($"Failed to get directory of '{path}': {exc}");
+            }
+            return null;
+        }
+
+        private static async Task<HttpResponseMessage> ExecuteGetRequest(string address, HttpClient httpClient, CancellationToken cancellationToken)
+        {
+            return await httpClient.GetAsync(address, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+        }
+
+        public bool IsFeedReachable(string feed, int timeoutMilliSeconds, int tryCount)
+        {
+            logger.LogInfo($"Checking if NuGet feed '{feed}' is reachable...");
+
+            // Configure the HttpClient to be aware of the registry proxy, if used.
+            HttpClientHandler httpClientHandler = new();
+            if (registryProxy != null)
+            {
+                httpClientHandler.Proxy = new WebProxy(registryProxy.Address);
+
+                if (registryProxy.Certificate != null)
+                {
+                    httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, _) =>
+                    {
+                        if (chain is null || cert is null)
+                        {
+                            var msg = cert is null && chain is null
+                                ? "certificate and chain"
+                                : chain is null
+                                    ? "chain"
+                                    : "certificate";
+                            logger.LogWarning($"Registry proxy certificate validation failed due to missing {msg}");
+                            return false;
+                        }
+                        chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
+                        chain.ChainPolicy.CustomTrustStore.Add(registryProxy.Certificate);
+                        return chain.Build(cert);
+                    };
+                }
+            }
+
+            using HttpClient client = new(httpClientHandler);
+
+            for (var i = 0; i < tryCount; i++)
+            {
+                using var cts = new CancellationTokenSource();
+                cts.CancelAfter(timeoutMilliSeconds);
+                try
+                {
+                    logger.LogInfo($"Attempt {i + 1}/{tryCount} to reach NuGet feed '{feed}'.");
+                    using var response = ExecuteGetRequest(feed, client, cts.Token).GetAwaiter().GetResult();
+                    response.EnsureSuccessStatusCode();
+                    logger.LogInfo($"Querying NuGet feed '{feed}' succeeded.");
+                    return true;
+                }
+                catch (Exception exc)
+                {
+                    if (exc is TaskCanceledException tce &&
+                        tce.CancellationToken == cts.Token &&
+                        cts.Token.IsCancellationRequested)
+                    {
+                        logger.LogInfo($"Didn't receive answer from NuGet feed '{feed}' in {timeoutMilliSeconds}ms.");
+                        timeoutMilliSeconds *= 2;
+                        continue;
+                    }
+
+                    logger.LogInfo($"Querying NuGet feed '{feed}' failed. The reason for the failure: {exc.Message}");
+                    return false;
+                }
+            }
+
+            logger.LogWarning($"Didn't receive answer from NuGet feed '{feed}'. Tried it {tryCount} times.");
+            return false;
+        }
+
+
+    }
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileContent.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileContent.cs
index f5199de1c13a..7a1a4502ce5e 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileContent.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileContent.cs
@@ -54,7 +54,7 @@ public bool IsAspNetCoreDetected
         {
             get
             {
-                return IsNewProjectStructureUsed && UseAspNetCoreDlls;
+                return IsSdkProjectStructureUsed && UseAspNetCoreDlls;
             }
         }
 
@@ -102,13 +102,13 @@ public bool IsLegacyProjectStructureUsed
             }
         }
 
-        private bool isNewProjectStructureUsed = false;
-        public bool IsNewProjectStructureUsed
+        private bool isSdkProjectStructureUsed = false;
+        public bool IsSdkProjectStructureUsed
         {
             get
             {
                 initialize.Run();
-                return isNewProjectStructureUsed;
+                return isSdkProjectStructureUsed;
             }
         }
 
@@ -228,7 +228,7 @@ private void DoInitialize()
 
                         // Determine project structure:
                         isLegacyProjectStructureUsed = isLegacyProjectStructureUsed || MicrosoftCSharpTargets().IsMatch(line);
-                        isNewProjectStructureUsed = isNewProjectStructureUsed
+                        isSdkProjectStructureUsed = isSdkProjectStructureUsed
                             || ProjectSdk().IsMatch(line)
                             || FrameworkReference().IsMatch(line);
                         // TODO: we could also check `<Sdk Name="Microsoft.NET.Sdk" />`
@@ -240,6 +240,14 @@ private void DoInitialize()
                     logger.LogDebug($"Failed to read file {file}, exception: {ex}");
                 }
             }
+
+            logger.LogInfo("Finished reading project files.");
+            logger.LogInfo($"Legacy project structure usage detected: {isLegacyProjectStructureUsed}");
+            logger.LogInfo($"SDK project structure usage detected: {isSdkProjectStructureUsed}");
+            logger.LogInfo($"ASP.NET usage detected: {useAspNetCoreDlls}");
+            logger.LogInfo($"Windows Forms usage detected: {useWindowsForms}");
+            logger.LogInfo($"WPF usage detected: {useWpf}");
+            logger.LogInfo($"Implicit usings enabled: {useImplicitUsings}");
         }
 
         [GeneratedRegex("(?<!<!--.*)<PackageReference.*\\sInclude=\"(.*?)\".*/?>", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileProvider.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileProvider.cs
index 9e6b810b95ec..4f55bbff7f27 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileProvider.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileProvider.cs
@@ -2,12 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Security.Policy;
 using Semmle.Util.Logging;
 
 namespace Semmle.Extraction.CSharp.DependencyFetching
 {
-    public class FileProvider
+    public class FileProvider : IFileProvider
     {
         private static readonly HashSet<string> binaryFileExtensions = [".dll", ".exe"]; // TODO: add more binary file extensions.
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
index d14dee506524..06186f1a28d3 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
@@ -12,12 +12,12 @@ public interface IDotNet
         bool AddPackage(string folder, string package);
         IList<string> GetListedRuntimes();
         IList<string> GetListedSdks();
-        bool Exec(string execArgs);
-        IList<string> GetNugetFeeds(string nugetConfig);
+        bool Exec(List<string> execArgs);
+        IList<string> GetNugetFeedsFromConfig(string nugetConfig);
         IList<string> GetNugetFeedsFromFolder(string folderPath);
     }
 
-    public record class RestoreSettings(string File, string PackageDirectory, bool ForceDotnetRefAssemblyFetching, string? NugetSources = null, string? PathToNugetConfig = null, bool ForceReevaluation = false, bool TargetWindows = false);
+    public record class RestoreSettings(string File, string PackageDirectory, bool ForceDotnetRefAssemblyFetching, List<string> NugetSources, bool ForceReevaluation = false, bool TargetWindows = false);
 
     public partial record class RestoreResult(bool Success, IList<string> Output)
     {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs
index ef5bcd4753bb..b5400ec63319 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs
@@ -30,26 +30,26 @@ internal interface IDotNetCliInvoker
         /// Execute `dotnet <paramref name="args"/>` and return true if the command succeeded, otherwise false.
         /// If `silent` is true the output of the command is logged as `debug` otherwise as `info`.
         /// </summary>
-        bool RunCommand(string args, bool silent = true);
+        bool RunCommand(List<string> args, bool silent = true);
 
         /// <summary>
         /// Execute `dotnet <paramref name="args"/>` and return the exit code.
         /// If `silent` is true the output of the command is logged as `debug` otherwise as `info`.
         /// </summary>
-        int RunCommandExitCode(string args, bool silent = true);
+        int RunCommandExitCode(List<string> args, bool silent = true);
 
         /// <summary>
         /// Execute `dotnet <paramref name="args"/>` and return true if the command succeeded, otherwise false.
         /// The output of the command is returned in `output`.
         /// If `silent` is true the output of the command is logged as `debug` otherwise as `info`.
         /// </summary>
-        bool RunCommand(string args, out IList<string> output, bool silent = true);
+        bool RunCommand(List<string> args, out IList<string> output, bool silent = true);
 
         /// <summary>
         /// Execute `dotnet <paramref name="args"/>` in `<paramref name="workingDirectory"/>` and return true if the command succeeded, otherwise false.
         /// The output of the command is returned in `output`.
         /// If `silent` is true the output of the command is logged as `debug` otherwise as `info`.
         /// </summary>
-        bool RunCommand(string args, string? workingDirectory, out IList<string> output, bool silent = true);
+        bool RunCommand(List<string> args, string? workingDirectory, out IList<string> output, bool silent = true);
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IFeedManagerIO.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IFeedManagerIO.cs
new file mode 100644
index 000000000000..380c5f3b5f28
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IFeedManagerIO.cs
@@ -0,0 +1,16 @@
+
+namespace Semmle.Extraction.CSharp.DependencyFetching
+{
+    public interface IFeedManagerIO
+    {
+        /// <summary>
+        /// Gets the directory name of the specified path.
+        /// </summary>
+        string? GetDirectoryName(string path);
+
+        /// <summary>
+        /// Returns true if the feed is reachable within the specified timeout and try count.
+        /// </summary>
+        bool IsFeedReachable(string feed, int timeoutMilliSeconds, int tryCount);
+    }
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IFileProvider.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IFileProvider.cs
new file mode 100644
index 000000000000..919be0af61a7
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IFileProvider.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.IO;
+
+namespace Semmle.Extraction.CSharp.DependencyFetching
+{
+    public interface IFileProvider
+    {
+        DirectoryInfo SourceDir { get; }
+        IEnumerable<string> SmallNonBinary { get; }
+        IEnumerable<string> Sources { get; }
+        ICollection<string> Projects { get; }
+        ICollection<string> Solutions { get; }
+        IEnumerable<string> Dlls { get; }
+        ICollection<string> NugetConfigs { get; }
+        ICollection<string> NugetExes { get; }
+        string? RootNugetConfig { get; }
+        IEnumerable<string> GlobalJsons { get; }
+        ICollection<string> PackagesConfigs { get; }
+        ICollection<string> RazorViews { get; }
+        ICollection<string> Resources { get; }
+    }
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IRegistryProxy.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IRegistryProxy.cs
new file mode 100644
index 000000000000..a7f7c1567152
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IRegistryProxy.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Security.Cryptography.X509Certificates;
+
+namespace Semmle.Extraction.CSharp.DependencyFetching
+{
+    public interface IRegistryProxy : IDisposable
+    {
+        /// <summary>
+        /// The full address of the registry proxy, if available.
+        /// </summary>
+        string Address { get; }
+
+        /// <summary>
+        /// The URLs of package registries that are configured for the proxy.
+        /// </summary>
+        ImmutableHashSet<string> RegistryURLs { get; }
+
+        /// <summary>
+        /// The URLs of package registries that replace the base registry.
+        /// </summary>
+        ImmutableHashSet<string> RegistryBaseURLs { get; }
+
+        /// <summary>
+        /// The path to the temporary file where the certificate is stored.
+        /// </summary>
+        string? CertificatePath { get; }
+
+        /// <summary>
+        /// The certificate used for the registry proxy.
+        /// </summary>
+        X509Certificate2? Certificate { get; }
+
+        /// <summary>
+        /// Configures the environment variables for a process to use the registry proxy.
+        /// </summary>
+        /// <param name="pi">The process start info to configure.</param>
+        void SetProcessEnvironment(ProcessStartInfo pi);
+    }
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IRegistryProxyConfiguration.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IRegistryProxyConfiguration.cs
new file mode 100644
index 000000000000..0ca48da995f0
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IRegistryProxyConfiguration.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace Semmle.Extraction.CSharp.DependencyFetching
+{
+    public interface IRegistryProxyConfiguration
+    {
+        // The host of the registry proxy, if available.
+        string? Host { get; }
+
+        // The port of the registry proxy, if available.
+        string? Port { get; }
+
+        // The certificate of the registry proxy, if available.
+        string? Certificate { get; }
+
+        // The list of package registries that are configured for the registry proxy, if any.
+        // The value of the environment variable should be a JSON array of objects, such as:
+        // [ { "type": "nuget_feed", "url": "https://nuget.pkg.github.com/org/index.json" } ]
+        string? RegistryURLs { get; }
+    }
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs
index 9da2018dffbc..3d4972b5637b 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs
@@ -4,7 +4,6 @@
 using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -16,7 +15,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 {
     internal sealed partial class NugetPackageRestorer : IDisposable
     {
-        private readonly FileProvider fileProvider;
+        private readonly IFileProvider fileProvider;
         private readonly FileContent fileContent;
         private readonly IDotNet dotnet;
         private readonly IDiagnosticsWriter diagnosticsWriter;
@@ -30,10 +29,10 @@ internal sealed partial class NugetPackageRestorer : IDisposable
 
 
         public NugetPackageRestorer(
-            FileProvider fileProvider,
+            IFileProvider fileProvider,
             FileContent fileContent,
             IDotNet dotnet,
-            DependabotProxy? dependabotProxy,
+            IRegistryProxy? registryProxy,
             IDiagnosticsWriter diagnosticsWriter,
             ILogger logger,
             ICompilationInfoContainer compilationInfoContainer)
@@ -48,12 +47,14 @@ public NugetPackageRestorer(
             PackageDirectory = new DependencyDirectory("packages", "package", logger);
             legacyPackageDirectory = new DependencyDirectory("legacypackages", "legacy package", logger);
             missingPackageDirectory = new DependencyDirectory("missingpackages", "missing package", logger);
-            feedManager = new FeedManager(logger, dotnet, dependabotProxy, fileProvider);
+            feedManager = new FeedManager(logger, dotnet, registryProxy, fileProvider);
         }
 
         public string? TryRestore(string package)
         {
-            if (TryRestorePackageManually(package))
+            var feeds = feedManager.CheckNugetFeedResponsiveness ? feedManager.ReachableFeeds : feedManager.AllFeeds;
+            var nugetSources = feedManager.RestoreFeeds(feeds);
+            if (TryRestorePackageManually(package, nugetSources))
             {
                 var packageDir = DependencyManager.GetPackageDirectory(package, missingPackageDirectory.DirInfo);
                 if (packageDir is not null)
@@ -110,48 +111,29 @@ public HashSet<AssemblyLookupLocation> Restore()
             logger.LogInfo($"Checking NuGet feed responsiveness: {feedManager.CheckNugetFeedResponsiveness}");
             compilationInfoContainer.CompilationInfos.Add(("NuGet feed responsiveness checked", feedManager.CheckNugetFeedResponsiveness ? "1" : "0"));
 
-            HashSet<string> reachableFeeds = [];
-
             EmitNugetConfigDiagnostics();
 
             // Find feeds that are configured in NuGet.config files and divide them into ones that
             // are explicitly configured for the project or by a private registry, and "all feeds"
             // (including inherited ones) from other locations on the host outside of the working directory.
-            (var explicitFeeds, var allFeeds) = feedManager.GetAllFeeds();
+            var explicitFeeds = feedManager.ExplicitFeeds;
 
             if (feedManager.CheckNugetFeedResponsiveness)
             {
-                var inheritedFeeds = allFeeds.Except(explicitFeeds).ToHashSet();
+                var inheritedFeeds = feedManager.InheritedFeeds;
 
                 if (inheritedFeeds.Count > 0)
                 {
                     compilationInfoContainer.CompilationInfos.Add(("Inherited NuGet feed count", inheritedFeeds.Count.ToString()));
                 }
 
-                var timeout = feedManager.CheckSpecifiedFeeds(explicitFeeds, out var reachableExplicitFeeds);
-                reachableFeeds.UnionWith(reachableExplicitFeeds);
-
-                var allExplicitReachable = explicitFeeds.Count == reachableExplicitFeeds.Count;
-                EmitUnreachableFeedsDiagnostics(allExplicitReachable);
-
-                if (timeout)
-                {
-                    // If we experience a timeout, we use this fallback.
-                    // todo: we could also check the reachability of the inherited nuget feeds, but to use those in the fallback we would need to handle authentication too.
-                    var unresponsiveMissingPackageLocation = DownloadMissingPackagesFromSpecificFeeds([], explicitFeeds);
-                    return unresponsiveMissingPackageLocation is null
-                        ? []
-                        : [unresponsiveMissingPackageLocation];
-                }
-
-                // Inherited feeds should only be used, if they are indeed reachable (as they may be environment specific).
-                feedManager.CheckSpecifiedFeeds(inheritedFeeds, out var reachableInheritedFeeds);
-                reachableFeeds.UnionWith(reachableInheritedFeeds);
+                var unreachableExplicitFeeds = explicitFeeds.Except(feedManager.ReachableExplicitFeeds).ToImmutableHashSet();
+                EmitFeedReachabilityDiagnostics(unreachableExplicitFeeds);
             }
 
             try
             {
-                var packagesConfigRestore = PackagesConfigRestoreFactory.Create(fileProvider, legacyPackageDirectory, logger, feedManager, reachableFeeds);
+                var packagesConfigRestore = PackagesConfigRestoreFactory.Create(fileProvider, legacyPackageDirectory, logger, feedManager);
                 var count = packagesConfigRestore.InstallPackages();
                 if (packagesConfigRestore.PackageCount > 0)
                 {
@@ -166,10 +148,9 @@ public HashSet<AssemblyLookupLocation> Restore()
                     .Where(path => IsPathInSubfolder(path, legacyPackageDirectory.DirInfo.FullName, "tools"))
                     .ToList();
 
-                if (nugetPackageDllPaths.Count > 0)
-                {
-                    logger.LogInfo($"Restored {nugetPackageDllPaths.Count} NuGet DLLs.");
-                }
+
+                logger.LogInfo($"Restored {nugetPackageDllPaths.Count} NuGet DLLs from packages.config files using the NuGet CLI.");
+
                 if (excludedPaths.Count > 0)
                 {
                     logger.LogInfo($"Excluding {excludedPaths.Count} NuGet DLLs.");
@@ -181,6 +162,13 @@ public HashSet<AssemblyLookupLocation> Restore()
                 }
 
                 nugetPackageDllPaths.ExceptWith(excludedPaths);
+
+                logger.LogInfo($"Using {nugetPackageDllPaths.Count} DLLs as dependency candidates from NuGet packages restored via the NuGet CLI based on packages.config files.");
+                foreach (var path in nugetPackageDllPaths)
+                {
+                    logger.LogDebug($"Using NuGet DLL as dependency candidate: {path}");
+                }
+
                 assemblyLookupLocations.UnionWith(nugetPackageDllPaths.Select(p => new AssemblyLookupLocation(p)));
             }
             catch (Exception exc)
@@ -189,9 +177,9 @@ public HashSet<AssemblyLookupLocation> Restore()
             }
 
             // Restore project dependencies with `dotnet restore`.
-            var restoredProjects = RestoreSolutions(reachableFeeds, out var container);
+            var restoredProjects = RestoreSolutions(out var container);
             var projects = fileProvider.Projects.Except(restoredProjects);
-            RestoreProjects(projects, reachableFeeds, out var containers);
+            RestoreProjects(projects, out var containers);
 
             var dependencies = containers.Flatten(container);
 
@@ -203,9 +191,7 @@ public HashSet<AssemblyLookupLocation> Restore()
 
             var usedPackageNames = GetAllUsedPackageDirNames(dependencies);
 
-            var missingPackageLocation = feedManager.CheckNugetFeedResponsiveness
-                ? DownloadMissingPackagesFromSpecificFeeds(usedPackageNames, explicitFeeds)
-                : DownloadMissingPackages(usedPackageNames);
+            var missingPackageLocation = DownloadMissingPackages(usedPackageNames);
 
             if (missingPackageLocation is not null)
             {
@@ -223,7 +209,7 @@ public HashSet<AssemblyLookupLocation> Restore()
         /// Populates dependencies with the relevant dependencies from the assets files generated by the restore.
         /// Returns a list of projects that are up to date with respect to restore.
         /// </summary>
-        private IEnumerable<string> RestoreSolutions(HashSet<string> reachableFeeds, out DependencyContainer dependencies)
+        private IEnumerable<string> RestoreSolutions(out DependencyContainer dependencies)
         {
             var successCount = 0;
             var nugetSourceFailures = 0;
@@ -236,7 +222,7 @@ private IEnumerable<string> RestoreSolutions(HashSet<string> reachableFeeds, out
             var projects = fileProvider.Solutions.SelectMany(solution =>
                 {
                     logger.LogInfo($"Restoring solution {solution}...");
-                    var nugetSources = feedManager.MakeDotnetRestoreSourcesArgument(solution, reachableFeeds);
+                    var nugetSources = feedManager.MakeRestoreFeeds(solution);
                     var res = dotnet.Restore(new(solution, PackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true, NugetSources: nugetSources, TargetWindows: isWindows));
                     if (res.Success)
                     {
@@ -267,8 +253,7 @@ private IEnumerable<string> RestoreSolutions(HashSet<string> reachableFeeds, out
         /// Populates dependencies with the relative paths to the assets files generated by the restore.
         /// </summary>
         /// <param name="projects">A list of paths to project files.</param>
-        /// <param name="reachableFeeds">The set of reachable NuGet feeds.</param>
-        private void RestoreProjects(IEnumerable<string> projects, HashSet<string> reachableFeeds, out ConcurrentBag<DependencyContainer> dependencies)
+        private void RestoreProjects(IEnumerable<string> projects, out ConcurrentBag<DependencyContainer> dependencies)
         {
             var successCount = 0;
             var nugetSourceFailures = 0;
@@ -285,7 +270,7 @@ private void RestoreProjects(IEnumerable<string> projects, HashSet<string> reach
                 foreach (var project in projectGroup)
                 {
                     logger.LogInfo($"Restoring project {project}...");
-                    var nugetSources = feedManager.MakeDotnetRestoreSourcesArgument(project, reachableFeeds);
+                    var nugetSources = feedManager.MakeRestoreFeeds(project);
                     var res = dotnet.Restore(new(project, PackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true, NugetSources: nugetSources, TargetWindows: isWindows));
                     assets.AddDependenciesRange(res.AssetsFilePaths);
                     lock (sync)
@@ -312,22 +297,28 @@ private void RestoreProjects(IEnumerable<string> projects, HashSet<string> reach
             compilationInfoContainer.CompilationInfos.Add(("Failed project restore with missing package error", nugetMissingPackageFailures.ToString()));
         }
 
-        private AssemblyLookupLocation? DownloadMissingPackagesFromSpecificFeeds(IEnumerable<string> usedPackageNames, HashSet<string>? feedsFromNugetConfigs)
+        private AssemblyLookupLocation? DownloadMissingPackages(IEnumerable<string> usedPackageNames)
         {
-            var reachableFallbackFeeds = feedManager.GetReachableFallbackNugetFeeds(feedsFromNugetConfigs);
-            compilationInfoContainer.CompilationInfos.Add(("Reachable fallback NuGet feed count", reachableFallbackFeeds.Count.ToString()));
+            ImmutableHashSet<string> feeds;
+            if (feedManager.CheckNugetFeedResponsiveness)
+            {
+                // Attempt to get the fallback configuration.
+                var reachableFallbackFeeds = feedManager.ReachableFallbackFeeds;
+                compilationInfoContainer.CompilationInfos.Add(("Reachable fallback NuGet feed count", reachableFallbackFeeds.Count.ToString()));
 
-            if (reachableFallbackFeeds.Count > 0)
+                if (reachableFallbackFeeds.Count == 0)
+                {
+                    logger.LogWarning("Skipping download of missing packages from specific feeds as no fallback NuGet feeds are reachable.");
+                    return null;
+                }
+                feeds = reachableFallbackFeeds;
+            }
+            else
             {
-                return DownloadMissingPackages(usedPackageNames, fallbackNugetFeeds: reachableFallbackFeeds);
+                feeds = feedManager.AllFeeds;
             }
 
-            logger.LogWarning("Skipping download of missing packages from specific feeds as no fallback NuGet feeds are reachable.");
-            return null;
-        }
-
-        private AssemblyLookupLocation? DownloadMissingPackages(IEnumerable<string> usedPackageNames, IEnumerable<string>? fallbackNugetFeeds = null)
-        {
+            var nugetSources = feedManager.RestoreFeeds(feeds);
             var alreadyDownloadedPackages = usedPackageNames.Select(p => p.ToLowerInvariant());
             var alreadyDownloadedLegacyPackages = GetRestoredLegacyPackageNames();
 
@@ -359,10 +350,6 @@ private void RestoreProjects(IEnumerable<string> projects, HashSet<string> reach
             }
 
             logger.LogInfo($"Found {notYetDownloadedPackages.Count} packages that are not yet restored");
-            using var tempDir = new TemporaryDirectory(ComputeTempDirectoryPath("nugetconfig"), "generated nuget config", logger);
-            var nugetConfig = fallbackNugetFeeds is null
-                ? GetNugetConfig()
-                : CreateFallbackNugetConfig(fallbackNugetFeeds, tempDir.DirInfo.FullName);
 
             compilationInfoContainer.CompilationInfos.Add(("Fallback nuget restore", notYetDownloadedPackages.Count.ToString()));
 
@@ -371,7 +358,7 @@ private void RestoreProjects(IEnumerable<string> projects, HashSet<string> reach
 
             Parallel.ForEach(notYetDownloadedPackages, new ParallelOptions { MaxDegreeOfParallelism = DependencyManager.Threads }, package =>
             {
-                var success = TryRestorePackageManually(package.Name, nugetConfig, package.PackageReferenceSource, tryWithoutNugetConfig: fallbackNugetFeeds is null);
+                var success = TryRestorePackageManually(package.Name, nugetSources, package.PackageReferenceSource);
                 if (!success)
                 {
                     return;
@@ -388,53 +375,6 @@ private void RestoreProjects(IEnumerable<string> projects, HashSet<string> reach
             return missingPackageDirectory.DirInfo.FullName;
         }
 
-        private string? CreateFallbackNugetConfig(IEnumerable<string> fallbackNugetFeeds, string folderPath)
-        {
-            var sb = new StringBuilder();
-            fallbackNugetFeeds.ForEach((feed, index) => sb.AppendLine($"<add key=\"feed{index}\" value=\"{feed}\" />"));
-
-            var nugetConfigPath = Path.Join(folderPath, "nuget.config");
-            logger.LogInfo($"Creating fallback nuget.config file {nugetConfigPath}.");
-            File.WriteAllText(nugetConfigPath,
-                $"""
-                <?xml version="1.0" encoding="utf-8"?>
-                <configuration>
-                    <packageSources>
-                        <clear />
-                {sb}
-                    </packageSources>
-                </configuration>
-                """);
-
-            return nugetConfigPath;
-        }
-
-        private string? GetNugetConfig()
-        {
-            var nugetConfigs = fileProvider.NugetConfigs;
-            string? nugetConfig;
-            if (nugetConfigs.Count > 1)
-            {
-                logger.LogInfo($"Found multiple nuget.config files: {string.Join(", ", nugetConfigs)}.");
-                nugetConfig = fileProvider.RootNugetConfig;
-                if (nugetConfig == null)
-                {
-                    logger.LogInfo("Could not find a top-level nuget.config file.");
-                }
-            }
-            else
-            {
-                nugetConfig = nugetConfigs.FirstOrDefault();
-            }
-
-            if (nugetConfig != null)
-            {
-                logger.LogInfo($"Using nuget.config file {nugetConfig}.");
-            }
-
-            return nugetConfig;
-        }
-
         private IEnumerable<string> GetAllUsedPackageDirNames(DependencyContainer dependencies)
         {
             var allPackageDirectories = GetAllPackageDirectories();
@@ -498,8 +438,7 @@ private static IEnumerable<string> GetRestoredPackageDirectoryNames(DirectoryInf
                 .Select(d => Path.GetFileName(d).ToLowerInvariant());
         }
 
-        private bool TryRestorePackageManually(string package, string? nugetConfig = null, PackageReferenceSource packageReferenceSource = PackageReferenceSource.SdkCsProj,
-            bool tryWithoutNugetConfig = true, bool tryPrereleaseVersion = true)
+        private bool TryRestorePackageManually(string package, List<string> nugetSources, PackageReferenceSource packageReferenceSource = PackageReferenceSource.SdkCsProj, bool tryPrereleaseVersion = true)
         {
             logger.LogInfo($"Restoring package {package}...");
             using var tempDir = new TemporaryDirectory(
@@ -521,17 +460,17 @@ private bool TryRestorePackageManually(string package, string? nugetConfig = nul
                 return false;
             }
 
-            var res = TryRestorePackageManually(package, nugetConfig, tempDir, tryPrereleaseVersion);
+            var res = TryRestorePackageManually(package, nugetSources, tempDir, tryPrereleaseVersion);
             if (res.Success)
             {
                 return true;
             }
 
-            if (tryWithoutNugetConfig && res.HasNugetPackageSourceError && nugetConfig is not null)
+            if (!feedManager.CheckNugetFeedResponsiveness && !feedManager.HasPrivateRegistryFeeds && res.HasNugetPackageSourceError && nugetSources.Count > 0)
             {
-                logger.LogDebug($"Trying to restore '{package}' without nuget.config.");
-                // Restore could not be completed because the listed source is unavailable. Try without the nuget.config:
-                res = TryRestorePackageManually(package, nugetConfig: null, tempDir, tryPrereleaseVersion);
+                logger.LogDebug($"Trying to restore '{package}' without explicitly providing NuGet sources.");
+                // Restore could not be completed because the listed source is unavailable. Try without an explicit restore source argument.
+                res = TryRestorePackageManually(package, [], tempDir, tryPrereleaseVersion);
                 if (res.Success)
                 {
                     return true;
@@ -542,16 +481,16 @@ private bool TryRestorePackageManually(string package, string? nugetConfig = nul
             return false;
         }
 
-        private RestoreResult TryRestorePackageManually(string package, string? nugetConfig, TemporaryDirectory tempDir, bool tryPrereleaseVersion)
+        private RestoreResult TryRestorePackageManually(string package, List<string> nugetSources, TemporaryDirectory tempDir, bool tryPrereleaseVersion)
         {
-            var res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: nugetConfig, ForceReevaluation: true));
+            var res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, nugetSources, ForceReevaluation: true));
 
             if (!res.Success && tryPrereleaseVersion && res.HasNugetNoStablePackageVersionError)
             {
                 logger.LogDebug($"Failed to restore nuget package {package} because no stable version was found.");
                 TryChangePackageVersion(tempDir.DirInfo, "*-*");
 
-                res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: nugetConfig, ForceReevaluation: true));
+                res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, nugetSources, ForceReevaluation: true));
                 if (!res.Success)
                 {
                     TryChangePackageVersion(tempDir.DirInfo, "*");
@@ -602,26 +541,51 @@ private void TryChangeProjectFile(DirectoryInfo projectDir, Regex pattern, strin
             }
         }
 
+        private string SanitizeFeedForLogging(string feed)
+        {
+
+            try
+            {
+                // If the feed is a URL, log only the scheme, host, port, and absolute path to avoid logging sensitive information such as credentials or tokens.
+                var uri = new Uri(feed);
+                var port = uri.IsDefaultPort ? string.Empty : $":{uri.Port}";
+                return $"{uri.Scheme}://{uri.Host}{port}{uri.AbsolutePath}";
+            }
+            catch
+            {
+                return feed;
+            }
+        }
+
         /// <summary>
-        /// If <paramref name="allFeedsReachable"/> is `false`, logs this and emits a diagnostic.
+        /// If <paramref name="unreachableFeeds"/> is not empty, logs this and emits a diagnostic.
         /// Adds a `CompilationInfos` entry either way.
         /// </summary>
-        /// <param name="allFeedsReachable">Whether all feeds were reachable or not.</param>
-        private void EmitUnreachableFeedsDiagnostics(bool allFeedsReachable)
+        /// <param name="unreachableFeeds">The feeds that were not reachable.</param>
+        private void EmitFeedReachabilityDiagnostics(ImmutableHashSet<string> unreachableFeeds)
         {
-            if (!allFeedsReachable)
+            if (unreachableFeeds.Count > 0)
             {
-                logger.LogWarning("Found unreachable NuGet feed in C# analysis with build-mode 'none'. This may cause missing dependencies in the analysis.");
+                var orderedUnreachableFeeds = unreachableFeeds
+                    .Select(SanitizeFeedForLogging)
+                    .OrderBy(feed => feed)
+                    .ToList();
+                var unreachableFeedList = string.Join(", ", orderedUnreachableFeeds);
+                logger.LogWarning($"Found unreachable NuGet feeds in C# analysis with build-mode 'none': {unreachableFeedList}. This may cause missing dependencies in the analysis.");
+                compilationInfoContainer.CompilationInfos.Add(("Unreachable NuGet feeds", unreachableFeedList));
                 diagnosticsWriter.AddEntry(new DiagnosticMessage(
                     Language.CSharp,
                     "buildless/unreachable-feed",
-                    "Found unreachable NuGet feed in C# analysis with build-mode 'none'",
+                    "Found unreachable NuGet feeds in C# analysis with build-mode 'none'",
                     visibility: new DiagnosticMessage.TspVisibility(statusPage: true, cliSummaryTable: true, telemetry: true),
-                    markdownMessage: "Found unreachable NuGet feed in C# analysis with build-mode 'none'. This may cause missing dependencies in the analysis.",
+                    markdownMessage: string.Format(
+                        "Found unreachable NuGet feeds in C# analysis with build-mode 'none':\n\n{0}\n\nThis may cause missing dependencies in the analysis.",
+                        string.Join("\n", orderedUnreachableFeeds.Select(feed => $"- `{feed}`"))
+                    ),
                     severity: DiagnosticMessage.TspSeverity.Note
                 ));
             }
-            compilationInfoContainer.CompilationInfos.Add(("All NuGet feeds reachable", allFeedsReachable ? "1" : "0"));
+            compilationInfoContainer.CompilationInfos.Add(("All NuGet feeds reachable", unreachableFeeds.Count == 0 ? "1" : "0"));
         }
 
         private void EmitNugetConfigDiagnostics()
@@ -681,14 +645,6 @@ public void Dispose()
             feedManager.Dispose();
         }
 
-        /// <summary>
-        /// Returns the full path to a temporary directory with the given subfolder name.
-        /// </summary>
-        private static string ComputeTempDirectoryPath(string subfolderName)
-        {
-            return Path.Join(FileUtils.GetTemporaryWorkingDirectory(out _), subfolderName);
-        }
-
         /// <summary>
         /// Computes a unique temporary directory path based on the source directory and the subfolder name.
         /// </summary>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs
index af484ba406e4..2348eb809f8c 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/PackagesConfigRestorer.cs
@@ -33,11 +33,11 @@ internal interface IPackagesConfigRestore
     /// </summary>
     internal class PackagesConfigRestoreFactory
     {
-        public static IPackagesConfigRestore Create(FileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager, HashSet<string> reachableFeeds)
+        public static IPackagesConfigRestore Create(IFileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager)
         {
             if (SystemBuildActions.Instance.IsWindows() || SystemBuildActions.Instance.IsMonoInstalled())
             {
-                return new NugetExeWrapper(fileProvider, packageDirectory, logger, feedManager, reachableFeeds);
+                return new NugetExeWrapper(fileProvider, packageDirectory, logger, feedManager);
             }
 
             return new NoOpPackagesConfig(fileProvider.PackagesConfigs, logger);
@@ -55,7 +55,7 @@ private class NugetExeWrapper : IPackagesConfigRestore
 
             public int PackageCount => fileProvider.PackagesConfigs.Count;
 
-            private readonly FileProvider fileProvider;
+            private readonly IFileProvider fileProvider;
 
             /// <summary>
             /// The packages directory.
@@ -64,24 +64,18 @@ private class NugetExeWrapper : IPackagesConfigRestore
             /// </summary>
             private readonly DependencyDirectory packageDirectory;
             private readonly FeedManager feedManager;
-            private readonly HashSet<string> reachableFeeds;
 
             private bool IsWindows => SystemBuildActions.Instance.IsWindows();
 
-            private bool? isDefaultFeedReachable;
-            private bool IsDefaultFeedReachable =>
-                isDefaultFeedReachable ??= feedManager.IsDefaultFeedReachable();
-
             /// <summary>
             /// Create the package manager for a specified source tree.
             /// </summary>
-            public NugetExeWrapper(FileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager, HashSet<string> reachableFeeds)
+            public NugetExeWrapper(IFileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger, FeedManager feedManager)
             {
                 this.fileProvider = fileProvider;
                 this.packageDirectory = packageDirectory;
                 this.logger = logger;
                 this.feedManager = feedManager;
-                this.reachableFeeds = reachableFeeds;
 
                 if (fileProvider.PackagesConfigs.Count > 0)
                 {
@@ -169,19 +163,23 @@ private bool TryRestoreNugetPackage(string packagesConfig)
             {
                 logger.LogInfo($"Restoring file \"{packagesConfig}\"...");
 
-                var sourcesArgument = "";
-                var feedsToUse = feedManager.FeedsToUse(packagesConfig, reachableFeeds).ToList();
-                var useDefaultFeed = feedsToUse.Count == 0 && IsDefaultFeedReachable;
+                List<string> sourcesArgument = [];
+                var feedsToUse = feedManager.FeedsToUse(packagesConfig).ToList();
+                var defaultFeeds = feedManager.CheckNugetFeedResponsiveness
+                    ? feedManager.ReachableDefaultFeeds
+                    : feedManager.DefaultFeeds;
+                var useDefaultFeeds = feedsToUse.Count == 0 && defaultFeeds.Count > 0;
 
                 // Explicitly construct the sources to be used for the restore command when checking feed
-                // responsiveness, using private registries, or falling back to nuget.org.
-                if (feedManager.CheckNugetFeedResponsiveness || feedManager.HasPrivateRegistryFeeds || useDefaultFeed)
+                // responsiveness, using private registries, or falling back to default feeds.
+                if (feedManager.CheckNugetFeedResponsiveness || feedManager.HasPrivateRegistryFeeds || useDefaultFeeds)
                 {
-                    if (useDefaultFeed)
+                    if (useDefaultFeeds)
                     {
-                        feedsToUse.Add(FeedManager.PublicNugetOrgFeed);
+                        feedsToUse.AddRange(defaultFeeds);
                     }
-                    sourcesArgument = feedManager.FeedsToRestoreArgument(feedsToUse, "-Source");
+                    var restoreFeeds = feedManager.RestoreFeeds(feedsToUse);
+                    sourcesArgument = restoreFeeds.SelectMany<string, string>(feed => ["-Source", feed]).ToList();
                 }
 
                 /* Use nuget.exe to install a package.
@@ -190,16 +188,18 @@ private bool TryRestoreNugetPackage(string packagesConfig)
                  * really unwieldy and this solution works for now.
                  */
 
-                string exe, args;
+                string exe;
+                List<string> args;
+
                 if (RunWithMono)
                 {
                     exe = "mono";
-                    args = $"\"{nugetExe}\" install -OutputDirectory \"{packageDirectory}\" {sourcesArgument} \"{packagesConfig}\"";
+                    args = [nugetExe!, "install", "-OutputDirectory", packageDirectory.ToString(), .. sourcesArgument, packagesConfig];
                 }
                 else
                 {
                     exe = nugetExe!;
-                    args = $"install -OutputDirectory \"{packageDirectory}\" {sourcesArgument} \"{packagesConfig}\"";
+                    args = ["install", "-OutputDirectory", packageDirectory.ToString(), .. sourcesArgument, packagesConfig];
                 }
 
                 var pi = new ProcessStartInfo(exe, args)
@@ -212,10 +212,11 @@ private bool TryRestoreNugetPackage(string packagesConfig)
                 var threadId = Environment.CurrentManagedThreadId;
                 void onOut(string s) => logger.LogDebug(s, threadId);
                 void onError(string s) => logger.LogError(s, threadId);
+                logger.LogInfo($"Running '{pi.FileName} {string.Join(" ", pi.ArgumentList)}'");
                 var exitCode = pi.ReadOutput(out _, onOut, onError);
                 if (exitCode != 0)
                 {
-                    logger.LogError($"Command {pi.FileName} {pi.Arguments} failed with exit code {exitCode}");
+                    logger.LogError($"Command {pi.FileName} {string.Join(" ", pi.ArgumentList)} failed with exit code {exitCode}");
                     return false;
                 }
                 else
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/RegistryProxy.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/RegistryProxy.cs
new file mode 100644
index 000000000000..d49d08510a22
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/RegistryProxy.cs
@@ -0,0 +1,210 @@
+using System;
+using System.Collections.Immutable;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Security.Cryptography.X509Certificates;
+using Semmle.Util;
+using Semmle.Util.Logging;
+using Newtonsoft.Json;
+using System.Linq;
+
+namespace Semmle.Extraction.CSharp.DependencyFetching
+{
+    public class RegistryProxy : IRegistryProxy
+    {
+        /// <summary>
+        /// Represents configurations for package registries.
+        /// </summary>
+        public class RegistryConfig
+        {
+            /// <summary>
+            /// The type of the package registry.
+            /// </summary>
+            public string? Type { get; init; }
+
+            /// <summary>
+            /// The URL of the package registry.
+            /// </summary>
+            public string? Url { get; init; }
+
+            /// <summary>
+            /// A boolean indicating whether this registry replaces the base registry.
+            /// </summary>
+            [JsonProperty("replaces-base")]
+            public bool ReplacesBase { get; init; } = false;
+        };
+
+        public string Address { get; }
+
+        private readonly ILogger logger;
+
+        /// <summary>
+        /// A dictionary mapping registry URLs to a boolean indicating whether they replace the base registry.
+        /// </summary>
+        private readonly Dictionary<string, bool> registryMapping = [];
+
+        private ImmutableHashSet<string>? registryURLs;
+        /// <summary>
+        /// Gets the set of registry URLs that have been configured as part of the organization-level
+        /// private registry configuration. This includes all registries, regardless of whether they replace
+        /// the default feeds.
+        /// </summary>
+        public ImmutableHashSet<string> RegistryURLs =>
+            registryURLs ??= registryMapping.Keys.ToImmutableHashSet();
+
+        private ImmutableHashSet<string>? registryBaseURLs;
+        /// <summary>
+        /// Gets the set of registry URLs that have been configured as part of the organization-level
+        /// private registry configuration and that replace the default registry. This is a subset of
+        /// <see cref="RegistryURLs"/>.
+        /// If non-empty, the set should be used as a replacement for the default registry during
+        /// package resolution.
+        /// </summary>
+        public ImmutableHashSet<string> RegistryBaseURLs =>
+            registryBaseURLs ??= registryMapping.Where(kvp => kvp.Value).Select(kvp => kvp.Key).ToImmutableHashSet();
+
+        public string? CertificatePath { get; private set; }
+
+        public X509Certificate2? Certificate { get; private set; }
+
+        private RegistryProxy(IRegistryProxyConfiguration config, ILogger l, TemporaryDirectory tempWorkingDirectory)
+        {
+            logger = l;
+            Address = $"http://{config.Host}:{config.Port}";
+
+            if (!string.IsNullOrWhiteSpace(config.Certificate))
+            {
+                var certDirPath = new DirectoryInfo(Path.Join(tempWorkingDirectory.DirInfo.FullName, ".registry-proxy"));
+                Directory.CreateDirectory(certDirPath.FullName);
+
+                CertificatePath = Path.Join(certDirPath.FullName, "proxy.crt");
+                var certFile = new FileInfo(CertificatePath);
+
+                using var writer = certFile.CreateText();
+                writer.Write(config.Certificate);
+                writer.Close();
+
+                logger.LogInfo($"Stored registry proxy certificate at {CertificatePath}");
+
+                Certificate = X509Certificate2.CreateFromPem(config.Certificate);
+            }
+
+            if (!string.IsNullOrWhiteSpace(config.RegistryURLs))
+            {
+                try
+                {
+                    var array = JsonConvert.DeserializeObject<List<RegistryConfig>>(config.RegistryURLs);
+                    if (array is not null)
+                    {
+                        foreach (RegistryConfig registry in array)
+                        {
+                            if (string.IsNullOrWhiteSpace(registry.Url))
+                            {
+                                logger.LogError("Ignoring registry with empty URL.");
+                                continue;
+                            }
+
+                            if (string.IsNullOrWhiteSpace(registry.Type))
+                            {
+                                logger.LogError($"Ignoring registry at '{registry.Url}' since it has no type.");
+                                continue;
+                            }
+
+                            // The array contains all configured private registries, not just ones for C#.
+                            // We ignore the non-C# ones here.
+                            if (!registry.Type.Equals("nuget_feed"))
+                            {
+                                logger.LogDebug($"Ignoring registry at '{registry.Url}' since it is not of type 'nuget_feed'.");
+                                continue;
+                            }
+
+                            logger.LogInfo($"Found private registry at '{registry.Url}'");
+                            registryMapping.AddOrUpdateToLatest(registry.Url, registry.ReplacesBase);
+                        }
+                    }
+                }
+                catch (JsonException ex)
+                {
+                    logger.LogError($"Unable to parse '{EnvironmentVariableNames.ProxyURLs}': {ex.Message}");
+                }
+            }
+        }
+
+        internal static IRegistryProxy? Make(ILogger logger, IDiagnosticsWriter diagnosticsWriter, TemporaryDirectory tempWorkingDirectory)
+        {
+            // Setting HTTP(S)_PROXY and SSL_CERT_FILE have no effect on Windows or macOS,
+            // but we would still end up using the registry proxy to check for feed reachability.
+            // This would result in us discovering that the feeds are reachable, but `dotnet` would
+            // fail to connect to them. To prevent this from happening, we do not initialise an
+            // instance of `RegistryProxy` on those platforms.
+            if (SystemBuildActions.Instance.IsWindows() || SystemBuildActions.Instance.IsMacOs())
+            {
+                return null;
+            }
+
+            return Make(new RegistryProxyConfiguration(), logger, diagnosticsWriter, tempWorkingDirectory);
+        }
+
+        /// <summary>
+        /// Creates an instance of the registry proxy using the specified configuration.
+        /// Returns null if the proxy cannot be created.
+        /// This overload is exposed primarily to enable platform-independent unit testing.
+        /// </summary>
+        internal static IRegistryProxy? Make(
+            IRegistryProxyConfiguration proxyConfig, ILogger logger, IDiagnosticsWriter diagnosticsWriter, TemporaryDirectory tempWorkingDirectory)
+        {
+            if (string.IsNullOrWhiteSpace(proxyConfig.Host) || string.IsNullOrWhiteSpace(proxyConfig.Port))
+            {
+                logger.LogDebug("No registry proxy credentials are configured.");
+                return null;
+            }
+
+            var result = new RegistryProxy(proxyConfig, logger, tempWorkingDirectory);
+            logger.LogInfo($"Registry proxy configured at {result.Address}");
+
+            // Emit a diagnostic for the discovered private registries, so that it is easy
+            // for users to see that they were picked up.
+            if (result.RegistryURLs.Count > 0)
+            {
+                diagnosticsWriter.AddEntry(new DiagnosticMessage(
+                    Language.CSharp,
+                    "buildless/analysis-using-private-registries",
+                    severity: DiagnosticMessage.TspSeverity.Note,
+                    visibility: new DiagnosticMessage.TspVisibility(true, true, true),
+                    name: "C# extraction used private package registries",
+                    markdownMessage: string.Format(
+                        "C# was extracted using the following private package registries:\n\n{0}\n",
+                        string.Join("\n", result.RegistryURLs.Select(url => string.Format("- `{0}`", url)))
+                    )
+                ));
+            }
+
+            return result;
+        }
+
+        public void SetProcessEnvironment(ProcessStartInfo pi)
+        {
+            logger.LogDebug($"Configuring environment variables for the registry proxy at {Address}");
+
+            pi.EnvironmentVariables["HTTP_PROXY"] = Address;
+            pi.EnvironmentVariables["HTTPS_PROXY"] = Address;
+
+            // Also set the lower case variants of the environment variables
+            // This might be needed on Linux systems.
+            pi.EnvironmentVariables["http_proxy"] = Address;
+            pi.EnvironmentVariables["https_proxy"] = Address;
+
+            if (CertificatePath != null)
+            {
+                logger.LogDebug("Setting the SSL certificate path for the registry proxy.");
+                pi.EnvironmentVariables["SSL_CERT_FILE"] = CertificatePath;
+            }
+        }
+
+        public void Dispose()
+        {
+            Certificate?.Dispose();
+        }
+    }
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/RegistryProxyConfiguration.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/RegistryProxyConfiguration.cs
new file mode 100644
index 000000000000..aeb7e665b62f
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/RegistryProxyConfiguration.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Semmle.Extraction.CSharp.DependencyFetching
+{
+    public class RegistryProxyConfiguration : IRegistryProxyConfiguration
+    {
+        public string? Host { get; } = Environment.GetEnvironmentVariable(EnvironmentVariableNames.ProxyHost);
+
+        public string? Port { get; } = Environment.GetEnvironmentVariable(EnvironmentVariableNames.ProxyPort);
+
+        public string? Certificate { get; } = Environment.GetEnvironmentVariable(EnvironmentVariableNames.ProxyCertificate);
+
+        public string? RegistryURLs { get; } = Environment.GetEnvironmentVariable(EnvironmentVariableNames.ProxyURLs);
+    }
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorBase.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorBase.cs
index c17981803ddb..74f5c40d8198 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorBase.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorBase.cs
@@ -9,14 +9,14 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 {
     internal abstract class DotnetSourceGeneratorBase<T> : SourceGeneratorBase where T : DotnetSourceGeneratorWrapper
     {
-        protected readonly FileProvider fileProvider;
+        protected readonly IFileProvider fileProvider;
         protected readonly FileContent fileContent;
         protected readonly IDotNet dotnet;
         protected readonly ICompilationInfoContainer compilationInfoContainer;
         protected readonly IEnumerable<string> references;
 
         public DotnetSourceGeneratorBase(
-            FileProvider fileProvider,
+            IFileProvider fileProvider,
             FileContent fileContent,
             IDotNet dotnet,
             ICompilationInfoContainer compilationInfoContainer,
@@ -39,7 +39,7 @@ protected override IEnumerable<string> Run()
                 return [];
             }
 
-            if (!fileContent.IsNewProjectStructureUsed)
+            if (!fileContent.IsSdkProjectStructureUsed)
             {
                 logger.LogInfo($"Generating source files from {FileType} files is only supported for new (SDK-style) project files");
                 return [];
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs
index 9518afac4008..8ecf13d53a6a 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs
@@ -79,7 +79,7 @@ public IEnumerable<string> RunSourceGenerator(IEnumerable<string> additionalFile
                     sw.Write(argsString);
                 }
 
-                dotnet.Exec($"\"{cscPath}\" /noconfig @\"{cscArgsPath}\"");
+                dotnet.Exec([cscPath, "/noconfig", $"@{cscArgsPath}"]);
 
                 var files = Directory.GetFiles(outputFolder, "*.*", new EnumerationOptions { RecurseSubdirectories = true });
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/RazorGenerator.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/RazorGenerator.cs
index 3f9a17dc6b30..8d4536b4503c 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/RazorGenerator.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/RazorGenerator.cs
@@ -8,7 +8,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
     internal class RazorGenerator : DotnetSourceGeneratorBase<Razor>
     {
         public RazorGenerator(
-            FileProvider fileProvider,
+            IFileProvider fileProvider,
             FileContent fileContent,
             IDotNet dotnet,
             ICompilationInfoContainer compilationInfoContainer,
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/ResxGenerator.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/ResxGenerator.cs
index da66ef275442..e6e27ea27534 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/ResxGenerator.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/ResxGenerator.cs
@@ -10,7 +10,7 @@ internal class ResxGenerator : DotnetSourceGeneratorBase<Resx>
         private readonly string? sourceGeneratorFolder = null;
 
         public ResxGenerator(
-            FileProvider fileProvider,
+            IFileProvider fileProvider,
             FileContent fileContent,
             IDotNet dotnet,
             ICompilationInfoContainer compilationInfoContainer,
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
index dd7246fa6597..0402c345532e 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
@@ -785,6 +785,18 @@ public static AnnotatedTypeSymbol GetType(this Context cx, Microsoft.CodeAnalysi
             return new AnnotatedTypeSymbol(info.Type.DisambiguateType(), info.Nullability.Annotation);
         }
 
+        /// <summary>
+        /// Gets the converted type of a syntax node, or default if it could not be determined.
+        /// </summary>
+        /// <param name="cx">Extractor context.</param>
+        /// <param name="node">The syntax node to determine the converted type for.</param>
+        /// <returns>The converted type symbol of the node, or default.</returns>
+        public static AnnotatedTypeSymbol GetConvertedType(this Context cx, Microsoft.CodeAnalysis.CSharp.CSharpSyntaxNode node)
+        {
+            var info = GetTypeInfo(cx, node);
+            return new AnnotatedTypeSymbol(info.ConvertedType.DisambiguateType(), info.ConvertedNullability.Annotation);
+        }
+
         /// <summary>
         /// Gets the annotated type arguments of an INamedTypeSymbol.
         /// This has not yet been exposed on the public API.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/BinaryPattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/BinaryPattern.cs
index 3eaf9cc55c3d..e45b53e3cfae 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/BinaryPattern.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/BinaryPattern.cs
@@ -8,7 +8,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
     internal class BinaryPattern : Expression
     {
         public BinaryPattern(Context cx, BinaryPatternSyntax syntax, IExpressionParentEntity parent, int child) :
-            base(new ExpressionInfo(cx, null, cx.CreateLocation(syntax.GetLocation()), GetKind(syntax.OperatorToken, syntax), parent, child, isCompilerGenerated: false, null))
+            base(new ExpressionInfo(cx, cx.GetConvertedType(syntax), cx.CreateLocation(syntax.GetLocation()), GetKind(syntax.OperatorToken, syntax), parent, child, isCompilerGenerated: false, null))
         {
             Pattern.Create(cx, syntax.Left, this, 0);
             Pattern.Create(cx, syntax.Right, this, 1);
@@ -24,4 +24,4 @@ private static ExprKind GetKind(SyntaxToken operatorToken, BinaryPatternSyntax s
             };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/ListPattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/ListPattern.cs
index 492e2bcb1ce0..a28743058e6d 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/ListPattern.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/ListPattern.cs
@@ -7,9 +7,9 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
     internal class ListPattern : Expression
     {
         internal ListPattern(Context cx, ListPatternSyntax syntax, IExpressionParentEntity parent, int child) :
-            base(new ExpressionInfo(cx, null, cx.CreateLocation(syntax.GetLocation()), ExprKind.LIST_PATTERN, parent, child, isCompilerGenerated: false, null))
+            base(new ExpressionInfo(cx, cx.GetConvertedType(syntax), cx.CreateLocation(syntax.GetLocation()), ExprKind.LIST_PATTERN, parent, child, isCompilerGenerated: false, null))
         {
             syntax.Patterns.ForEach((p, i) => Pattern.Create(cx, p, this, i));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/RecursivePattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/RecursivePattern.cs
index febbdacd14c4..5e18169ceb14 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/RecursivePattern.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/RecursivePattern.cs
@@ -15,7 +15,7 @@ internal class RecursivePattern : Expression
         /// <param name="parent">The parent pattern/expression.</param>
         /// <param name="child">The child index of this pattern.</param>
         public RecursivePattern(Context cx, RecursivePatternSyntax syntax, IExpressionParentEntity parent, int child) :
-            base(new ExpressionInfo(cx, null, cx.CreateLocation(syntax.GetLocation()), ExprKind.RECURSIVE_PATTERN, parent, child, isCompilerGenerated: false, null))
+            base(new ExpressionInfo(cx, cx.GetConvertedType(syntax), cx.CreateLocation(syntax.GetLocation()), ExprKind.RECURSIVE_PATTERN, parent, child, isCompilerGenerated: false, null))
         {
             // Extract the type access
             if (syntax.Type is TypeSyntax t)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/RelationalPattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/RelationalPattern.cs
index 4f6c2eac11ff..570f35ac817b 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/RelationalPattern.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/RelationalPattern.cs
@@ -8,7 +8,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
     internal class RelationalPattern : Expression
     {
         public RelationalPattern(Context cx, RelationalPatternSyntax syntax, IExpressionParentEntity parent, int child) :
-             base(new ExpressionInfo(cx, null, cx.CreateLocation(syntax.GetLocation()), GetKind(syntax.OperatorToken), parent, child, isCompilerGenerated: false, null))
+             base(new ExpressionInfo(cx, cx.GetConvertedType(syntax), cx.CreateLocation(syntax.GetLocation()), GetKind(syntax.OperatorToken), parent, child, isCompilerGenerated: false, null))
         {
             Expression.Create(cx, syntax.Expression, this, 0);
         }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/SlicePattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/SlicePattern.cs
index 69d7cc878beb..4ef1ba856f7f 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/SlicePattern.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/SlicePattern.cs
@@ -6,7 +6,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
     internal class SlicePattern : Expression
     {
         public SlicePattern(Context cx, SlicePatternSyntax syntax, IExpressionParentEntity parent, int child) :
-            base(new ExpressionInfo(cx, null, cx.CreateLocation(syntax.GetLocation()), ExprKind.SLICE_PATTERN, parent, child, isCompilerGenerated: false, null))
+            base(new ExpressionInfo(cx, cx.GetConvertedType(syntax), cx.CreateLocation(syntax.GetLocation()), ExprKind.SLICE_PATTERN, parent, child, isCompilerGenerated: false, null))
         {
             if (syntax.Pattern is not null)
             {
@@ -14,4 +14,4 @@ public SlicePattern(Context cx, SlicePatternSyntax syntax, IExpressionParentEnti
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/UnaryPattern.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/UnaryPattern.cs
index 64663c7a6e14..2c7dc32e8f4f 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/UnaryPattern.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/UnaryPattern.cs
@@ -6,9 +6,9 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
     internal class UnaryPattern : Expression
     {
         public UnaryPattern(Context cx, UnaryPatternSyntax syntax, IExpressionParentEntity parent, int child) :
-            base(new ExpressionInfo(cx, null, cx.CreateLocation(syntax.GetLocation()), ExprKind.NOT_PATTERN, parent, child, isCompilerGenerated: false, null))
+            base(new ExpressionInfo(cx, cx.GetConvertedType(syntax), cx.CreateLocation(syntax.GetLocation()), ExprKind.NOT_PATTERN, parent, child, isCompilerGenerated: false, null))
         {
             Pattern.Create(cx, syntax.Pattern, this, 0);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs b/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs
index a2996497e005..1d393a418ca9 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs
+++ b/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs
@@ -8,45 +8,45 @@ namespace Semmle.Extraction.Tests
 {
     internal class DotNetCliInvokerStub : IDotNetCliInvoker
     {
-        private readonly IList<string> output;
-        private string lastArgs = "";
+        private readonly IList<string> returnOutput;
+        private List<string> lastArgs = [];
         public string WorkingDirectory { get; private set; } = "";
         public bool Success { get; set; } = true;
         public int ExitCode { get; set; } = 0;
 
-        public DotNetCliInvokerStub(IList<string> output)
+        public DotNetCliInvokerStub(IList<string> returnOutput)
         {
-            this.output = output;
+            this.returnOutput = returnOutput;
         }
 
         public string Exec => "dotnet";
 
-        public bool RunCommand(string args, bool silent)
+        public bool RunCommand(List<string> args, bool silent)
         {
             lastArgs = args;
             return Success;
         }
 
-        public int RunCommandExitCode(string args, bool silent)
+        public int RunCommandExitCode(List<string> args, bool silent)
         {
             lastArgs = args;
             return ExitCode;
         }
 
-        public bool RunCommand(string args, out IList<string> output, bool silent)
+        public bool RunCommand(List<string> args, out IList<string> output, bool silent)
         {
             lastArgs = args;
-            output = this.output;
+            output = this.returnOutput;
             return Success;
         }
 
-        public bool RunCommand(string args, string? workingDirectory, out IList<string> output, bool silent)
+        public bool RunCommand(List<string> args, string? workingDirectory, out IList<string> output, bool silent)
         {
             WorkingDirectory = workingDirectory ?? "";
             return RunCommand(args, out output, silent);
         }
 
-        public string GetLastArgs() => lastArgs;
+        public List<string> GetLastArgs() => lastArgs;
     }
 
     public class DotNetTests
@@ -83,7 +83,7 @@ public void TestDotnetInfo()
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
-            Assert.Equal("--info", lastArgs);
+            Assert.Equal(["--info"], lastArgs);
         }
 
         [Fact]
@@ -115,11 +115,11 @@ public void TestDotnetRestoreProjectToDirectory1()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.Restore(new("myproject.csproj", "mypackages", false));
+            dotnet.Restore(new("myproject.csproj", "mypackages", false, []));
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
-            Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs);
+            Assert.Equal(["restore", "--no-dependencies", "myproject.csproj", "--packages", "mypackages", "/p:DisableImplicitNuGetFallbackFolder=true", "--verbosity", "normal"], lastArgs);
         }
 
         [Fact]
@@ -130,11 +130,11 @@ public void TestDotnetRestoreProjectToDirectory2()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, null, "myconfig.config"));
+            var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, []));
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
-            Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal --configfile \"myconfig.config\"", lastArgs);
+            Assert.Equal(["restore", "--no-dependencies", "myproject.csproj", "--packages", "mypackages", "/p:DisableImplicitNuGetFallbackFolder=true", "--verbosity", "normal"], lastArgs);
             Assert.Equal(2, res.AssetsFilePaths.Count());
             Assert.Contains("/path/to/project.assets.json", res.AssetsFilePaths);
             Assert.Contains("/path/to/project2.assets.json", res.AssetsFilePaths);
@@ -148,11 +148,11 @@ public void TestDotnetRestoreProjectToDirectory3()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, null, "myconfig.config", true));
+            var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, ["https://my.nuget.source1"], true));
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
-            Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal --configfile \"myconfig.config\" --force", lastArgs);
+            Assert.Equal(["restore", "--no-dependencies", "myproject.csproj", "--packages", "mypackages", "/p:DisableImplicitNuGetFallbackFolder=true", "--verbosity", "normal", "--force", "-s", "https://my.nuget.source1"], lastArgs);
             Assert.Equal(2, res.AssetsFilePaths.Count());
             Assert.Contains("/path/to/project.assets.json", res.AssetsFilePaths);
             Assert.Contains("/path/to/project2.assets.json", res.AssetsFilePaths);
@@ -166,11 +166,11 @@ public void TestDotnetRestoreSolutionToDirectory1()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            var res = dotnet.Restore(new("mysolution.sln", "mypackages", false));
+            var res = dotnet.Restore(new("mysolution.sln", "mypackages", false, ["https://my.nuget.source1", "https://my.nuget.source2"]));
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
-            Assert.Equal("restore --no-dependencies \"mysolution.sln\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs);
+            Assert.Equal(["restore", "--no-dependencies", "mysolution.sln", "--packages", "mypackages", "/p:DisableImplicitNuGetFallbackFolder=true", "--verbosity", "normal", "-s", "https://my.nuget.source1", "-s", "https://my.nuget.source2"], lastArgs);
             Assert.Equal(2, res.RestoredProjects.Count());
             Assert.Contains("/path/to/project.csproj", res.RestoredProjects);
             Assert.Contains("/path/to/project2.csproj", res.RestoredProjects);
@@ -188,11 +188,11 @@ public void TestDotnetRestoreSolutionToDirectory2()
             dotnetCliInvoker.Success = false;
 
             // Execute
-            var res = dotnet.Restore(new("mysolution.sln", "mypackages", false));
+            var res = dotnet.Restore(new("mysolution.sln", "mypackages", false, []));
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
-            Assert.Equal("restore --no-dependencies \"mysolution.sln\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs);
+            Assert.Equal(["restore", "--no-dependencies", "mysolution.sln", "--packages", "mypackages", "/p:DisableImplicitNuGetFallbackFolder=true", "--verbosity", "normal"], lastArgs);
             Assert.Empty(res.RestoredProjects);
             Assert.Empty(res.AssetsFilePaths);
         }
@@ -209,7 +209,7 @@ public void TestDotnetNew()
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
-            Assert.Equal("new console --no-restore --output \"myfolder\"", lastArgs);
+            Assert.Equal(["new", "console", "--no-restore", "--output", "myfolder"], lastArgs);
         }
 
         [Fact]
@@ -224,7 +224,7 @@ public void TestDotnetAddPackage()
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
-            Assert.Equal("add \"myfolder\" package \"mypackage\" --no-restore", lastArgs);
+            Assert.Equal(["add", "myfolder", "package", "mypackage", "--no-restore"], lastArgs);
         }
 
         [Fact]
@@ -239,7 +239,7 @@ public void TestDotnetGetListedRuntimes1()
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
-            Assert.Equal("--list-runtimes", lastArgs);
+            Assert.Equal(["--list-runtimes"], lastArgs);
             Assert.Equal(2, runtimes.Count);
             Assert.Contains("Microsoft.AspNetCore.App 7.0.2 [/path/dotnet/shared/Microsoft.AspNetCore.App]", runtimes);
             Assert.Contains("Microsoft.NETCore.App 7.0.2 [/path/dotnet/shared/Microsoft.NETCore.App]", runtimes);
@@ -258,7 +258,7 @@ public void TestDotnetGetListedRuntimes2()
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
-            Assert.Equal("--list-runtimes", lastArgs);
+            Assert.Equal(["--list-runtimes"], lastArgs);
             Assert.Empty(runtimes);
         }
 
@@ -270,11 +270,11 @@ public void TestDotnetExec()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.Exec("myarg1 myarg2");
+            dotnet.Exec(["myarg1", "myarg2"]);
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
-            Assert.Equal("exec myarg1 myarg2", lastArgs);
+            Assert.Equal(["exec", "myarg1", "myarg2"], lastArgs);
         }
 
         [Fact]
@@ -285,11 +285,11 @@ public void TestNugetFeeds()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.GetNugetFeeds("abc");
+            dotnet.GetNugetFeedsFromConfig("abc");
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
-            Assert.Equal("nuget list source --format Short --configfile \"abc\"", lastArgs);
+            Assert.Equal(["nuget", "list", "source", "--format", "Short", "--configfile", "abc"], lastArgs);
         }
 
         [Fact]
@@ -304,7 +304,7 @@ public void TestNugetFeedsFromFolder()
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
-            Assert.Equal("nuget list source --format Short", lastArgs);
+            Assert.Equal(["nuget", "list", "source", "--format", "Short"], lastArgs);
             Assert.Equal("abc", dotnetCliInvoker.WorkingDirectory);
         }
     }
diff --git a/csharp/extractor/Semmle.Extraction.Tests/DotNetStub.cs b/csharp/extractor/Semmle.Extraction.Tests/DotNetStub.cs
new file mode 100644
index 000000000000..12a131380e41
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.Tests/DotNetStub.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using Semmle.Extraction.CSharp.DependencyFetching;
+
+namespace Semmle.Extraction.Tests
+{
+    internal class DotNetStub : IDotNet
+    {
+        private readonly IList<string> runtimes;
+        private readonly IList<string> sdks;
+        private readonly IList<string> nugetFeedsFromConfig;
+        private readonly IList<string> nugetFeedsFromFolder;
+
+        public DotNetStub(IList<string> runtimes, IList<string> sdks, IList<string> nugetFeedsFromConfig, IList<string> nugetFeedsFromFolder)
+        {
+            this.runtimes = runtimes;
+            this.sdks = sdks;
+            this.nugetFeedsFromConfig = nugetFeedsFromConfig;
+            this.nugetFeedsFromFolder = nugetFeedsFromFolder;
+        }
+        public bool AddPackage(string folder, string package) => true;
+
+        public bool New(string folder) => true;
+
+        public RestoreResult Restore(RestoreSettings restoreSettings) => new(true, Array.Empty<string>());
+
+        public IList<string> GetListedRuntimes() => runtimes;
+
+        public IList<string> GetListedSdks() => sdks;
+
+        public bool Exec(List<string> execArgs) => true;
+
+        public IList<string> GetNugetFeedsFromConfig(string nugetConfig) => nugetFeedsFromConfig;
+
+        public IList<string> GetNugetFeedsFromFolder(string folderPath) => nugetFeedsFromFolder;
+    }
+}
diff --git a/csharp/extractor/Semmle.Extraction.Tests/FeedManager.cs b/csharp/extractor/Semmle.Extraction.Tests/FeedManager.cs
new file mode 100644
index 000000000000..ae97d2e7e346
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.Tests/FeedManager.cs
@@ -0,0 +1,376 @@
+using Xunit;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+using Semmle.Extraction.CSharp.DependencyFetching;
+
+namespace Semmle.Extraction.Tests
+{
+    public class RegistryProxyStub : IRegistryProxy
+    {
+        public string Address { get; } = "";
+        public ImmutableHashSet<string> RegistryURLs { get; } = ["https://example.com/registry1", "https://example.com/registry2"];
+        public ImmutableHashSet<string> RegistryBaseURLs { get; } = [];
+        public string? CertificatePath { get; } = null;
+        public X509Certificate2? Certificate { get; } = null;
+
+        public void SetProcessEnvironment(ProcessStartInfo pi) { }
+
+        public void Dispose() { }
+    }
+
+    public class RegistryProxyStubWithBaseUrls : IRegistryProxy
+    {
+        public string Address { get; } = "";
+        public ImmutableHashSet<string> RegistryURLs { get; } = ["https://example.com/registry1", "https://example.com/registry2", "https://example.com/base1", "https://example.com/base2"];
+        public ImmutableHashSet<string> RegistryBaseURLs { get; } = ["https://example.com/base1", "https://example.com/base2"];
+        public string? CertificatePath { get; } = null;
+        public X509Certificate2? Certificate { get; } = null;
+
+        public void SetProcessEnvironment(ProcessStartInfo pi) { }
+        public void Dispose() { }
+    }
+
+    public class FeedManagerIOStub : IFeedManagerIO
+    {
+        private readonly List<string> unreachableFeeds;
+
+        public FeedManagerIOStub(List<string> unreachableFeeds)
+        {
+            this.unreachableFeeds = unreachableFeeds;
+        }
+
+        public string? GetDirectoryName(string path)
+        {
+            return "/path/to/folder";
+        }
+
+        public bool IsFeedReachable(string feed, int timeoutMilliSeconds, int tryCount)
+        {
+            return !unreachableFeeds.Contains(feed);
+        }
+    }
+
+    public class FileProviderStub : IFileProvider
+    {
+        public DirectoryInfo SourceDir { get; } = new DirectoryInfo("/path/to/source");
+        public IEnumerable<string> SmallNonBinary { get; } = Enumerable.Empty<string>();
+        public IEnumerable<string> Sources { get; } = Enumerable.Empty<string>();
+        public ICollection<string> Projects { get; } = new List<string>();
+        public ICollection<string> Solutions { get; } = new List<string>();
+        public IEnumerable<string> Dlls { get; } = Enumerable.Empty<string>();
+        public ICollection<string> NugetConfigs { get; } = ["/path/to/nuget.config"];
+        public ICollection<string> NugetExes { get; } = new List<string>();
+        public string? RootNugetConfig { get; } = null;
+        public IEnumerable<string> GlobalJsons { get; } = Enumerable.Empty<string>();
+        public ICollection<string> PackagesConfigs { get; } = new List<string>();
+        public ICollection<string> RazorViews { get; } = new List<string>();
+        public ICollection<string> Resources { get; } = new List<string>();
+    }
+
+    /// <summary>
+    /// The purpose of this test class is to verify the behavior of the FeedManager class.
+    /// The tests use stub implementations of the FeedManager's dependencies to control the behavior of the FeedManager
+    /// and verify its behavior.
+    /// </summary>
+    public class FeedManagerTests
+    {
+        private static FeedManager MakeFeedManager()
+        {
+            var logger = new LoggerStub();
+            var dotnet = new DotNetStub([], [], ["E https://feed.from/config"], ["E https://feed.from/folder1", "E https://feed.from/folder2", "D https://feed.from/folder3"]);
+            var registryProxy = new RegistryProxyStub();
+            var fileProvider = new FileProviderStub();
+            var feedManagerIo = new FeedManagerIOStub(["https://example.com/registry1", "https://feed.from/folder2"]);
+            return new FeedManager(logger, dotnet, registryProxy, fileProvider, feedManagerIo);
+        }
+
+        /// <summary>
+        /// Verify that `FeedManager` correctly computes the explicit feeds using feeds discovered in nuget.config files and
+        /// private registries.
+        /// See the initialization of `DotNetStub` and `RegistryProxyStub` in `MakeFeedManager` for the feeds configured
+        /// to be returned and classified as explicit feeds.
+        /// </summary>
+        [Fact]
+        public void TestExplicitFeeds()
+        {
+            // Setup
+            var feedManager = MakeFeedManager();
+
+            // Execute
+            var actualFeeds = feedManager.ExplicitFeeds;
+
+            // Verify
+            Assert.Equal([
+                "https://example.com/registry1",
+                "https://example.com/registry2",
+                "https://feed.from/config"
+            ], actualFeeds);
+        }
+
+        /// <summary>
+        /// Verify that `FeedManager` correctly computes the inherited feeds using feeds discovered from the environment.
+        /// See the initialization of `DotNetStub` in `MakeFeedManager` for the feeds configured
+        /// to be returned and classified as inherited feeds.
+        /// </summary>
+        [Fact]
+        public void TestInheritedFeeds()
+        {
+            // Setup
+            var feedManager = MakeFeedManager();
+
+            // Execute
+            var inherited = feedManager.InheritedFeeds;
+
+            // Verify
+            Assert.Equal([
+                "https://feed.from/folder1",
+                "https://feed.from/folder2"
+            ], inherited);
+        }
+
+        /// <summary>
+        /// Verify that `FeedManager` correctly computes all feeds using feeds discovered in nuget.config files, private registries,
+        /// and the environment.
+        /// See the initialization of `DotNetStub` and `RegistryProxyStub` in `MakeFeedManager` for the feeds configured
+        /// to be returned and included in all feeds.
+        /// </summary>
+        [Fact]
+        public void TestAllFeeds()
+        {
+            // Setup
+            var feedManager = MakeFeedManager();
+
+            // Execute
+            var all = feedManager.AllFeeds;
+
+            // Verify
+            Assert.Equal([
+                "https://example.com/registry1",
+                "https://example.com/registry2",
+                "https://feed.from/config",
+                "https://feed.from/folder1",
+                "https://feed.from/folder2"
+            ], all);
+        }
+
+        /// <summary>
+        /// Verify that `FeedManager` correctly computes the reachable feeds using feeds discovered in
+        /// nuget.config files, private registries, and the environment.
+        /// See the initialization of `FeedManagerIOStub` in `MakeFeedManager` for the feeds configured as unreachable
+        /// and therefore filtered out of the reachable feeds.
+        /// </summary>
+        [Fact]
+        public void TestReachableFeeds()
+        {
+            // Setup
+            var feedManager = MakeFeedManager();
+
+            // Execute
+            var reachableFeeds = feedManager.ReachableFeeds;
+
+            // Verify
+            Assert.Equal([
+                "https://example.com/registry2",
+                "https://feed.from/config",
+                "https://feed.from/folder1"
+            ], reachableFeeds);
+        }
+
+        /// <summary>
+        /// Verify that `FeedManager` correctly computes the reachable explicit feeds using feeds discovered in
+        /// nuget.config files and private registries.
+        /// See the initialization of `FeedManagerIOStub` in `MakeFeedManager` for the feeds configured as unreachable
+        /// and therefore filtered out of the reachable explicit feeds.
+        /// </summary>
+        [Fact]
+        public void TestReachableExplicitFeeds()
+        {
+            // Setup
+            var feedManager = MakeFeedManager();
+
+            // Execute
+            var reachableFeeds = feedManager.ReachableExplicitFeeds;
+
+            // Verify
+            Assert.Equal([
+                "https://example.com/registry2",
+                "https://feed.from/config"
+            ], reachableFeeds);
+        }
+
+        /// <summary>
+        /// Verify that `FeedManager` correctly computes the reachable fallback feeds using feeds discovered in
+        /// nuget.config files and the default NuGet.org feed.
+        /// See the initialization of `FeedManagerIOStub` in `MakeFeedManager` for the feeds configured as unreachable
+        /// and therefore filtered out of the reachable fallback feeds.
+        /// </summary>
+        [Fact]
+        public void TestReachableFallbackFeeds()
+        {
+            // Setup
+            var feedManager = MakeFeedManager();
+
+            // Execute
+            var reachableFallback = feedManager.ReachableFallbackFeeds;
+
+            // Verify
+            Assert.Equal([
+                "https://example.com/registry2",
+                "https://feed.from/config",
+                "https://api.nuget.org/v3/index.json"
+            ], reachableFallback);
+        }
+
+        /// <summary>
+        /// Verify that `FeedManager` correctly computes the feeds to use for a given packages.config file from feeds discovered
+        /// in private registries and the environment.
+        /// See the initialization of `DotNetStub` in `MakeFeedManager` for the feeds configured
+        /// to be returned and selected for use.
+        /// </summary>
+        [Fact]
+        public void TestFeedsToUse()
+        {
+            // Setup
+            var feedManager = MakeFeedManager();
+
+            // Execute
+            var feedsToUse = feedManager.FeedsToUse("/path/to/packages.config").ToHashSet();
+
+            // Verify
+            Assert.Equal([
+                "https://example.com/registry2",
+                "https://feed.from/folder1"
+            ], feedsToUse);
+        }
+
+        /// <summary>
+        /// Verify that `FeedManager` correctly computes the default feeds and reachable default feeds
+        /// when no private registries are configured.
+        /// </summary>
+        [Fact]
+        public void TestDefaultFeedsNugetOrg()
+        {
+            // Setup
+            var feedManager = MakeFeedManager();
+
+            // Execute
+            var defaultFeeds = feedManager.DefaultFeeds;
+            var reachableDefault = feedManager.ReachableDefaultFeeds;
+
+            // Verify
+            Assert.Equal([
+                "https://api.nuget.org/v3/index.json"
+            ], defaultFeeds);
+            Assert.Equal([
+                "https://api.nuget.org/v3/index.json"
+            ], reachableDefault);
+        }
+
+        /// <summary>
+        /// Verify that `FeedManager` correctly computes the default feeds and reachable default feeds
+        /// when private registries are configured to replace the default feeds.
+        /// See the initialization of `RegistryProxyStubWithBaseUrls` for the feeds configured to replace the default feeds.
+        /// </summary>
+        [Fact]
+        public void TestDefaultFeedsPrivateRegistries()
+        {
+            // Setup
+            var logger = new LoggerStub();
+            var dotnet = new DotNetStub([], [], [], []);
+            var registryProxy = new RegistryProxyStubWithBaseUrls();
+            var fileProvider = new FileProviderStub();
+            var feedManagerIo = new FeedManagerIOStub(["https://example.com/registry2", "https://example.com/base1"]);
+            var feedManager = new FeedManager(logger, dotnet, registryProxy, fileProvider, feedManagerIo);
+
+            // Execute
+            var defaultFeeds = feedManager.DefaultFeeds;
+            var reachableDefault = feedManager.ReachableDefaultFeeds;
+            var reachableFallback = feedManager.ReachableFallbackFeeds;
+
+            // Verify
+            Assert.Equal([
+                "https://example.com/base1",
+                "https://example.com/base2"
+            ], defaultFeeds);
+            Assert.Equal([
+                "https://example.com/base2"
+            ], reachableDefault);
+            Assert.Equal([
+                "https://example.com/registry1",
+                "https://example.com/base2"
+            ], reachableFallback);
+        }
+
+        /// <summary>
+        /// Verify that `FeedManager` correctly computes all feeds when https://api.nuget.org/v3/index.json is not replaced
+        /// by a private registry because no private registry is configured to replace the base feed.
+        /// </summary>
+        [Fact]
+        public void TestNugetOrgNotReplaced()
+        {
+            // Setup
+            var logger = new LoggerStub();
+            var dotnet = new DotNetStub([], [], [], ["E https://api.nuget.org/v3/index.json"]);
+            var registryProxy = new RegistryProxyStub();
+            var fileProvider = new FileProviderStub();
+            var feedManagerIo = new FeedManagerIOStub(["https://example.com/registry2", "https://example.com/base1"]);
+            var feedManager = new FeedManager(logger, dotnet, registryProxy, fileProvider, feedManagerIo);
+
+            // Execute
+            var explicitFeeds = feedManager.ExplicitFeeds;
+            var allFeeds = feedManager.AllFeeds;
+
+            // Verify
+            Assert.Equal([
+                "https://example.com/registry1",
+                "https://example.com/registry2",
+            ], explicitFeeds);
+            Assert.Equal([
+                "https://example.com/registry1",
+                "https://example.com/registry2",
+                "https://api.nuget.org/v3/index.json"
+            ], allFeeds);
+
+        }
+
+        /// <summary>
+        /// Verify that `FeedManager` correctly computes the explicit and all feeds when https://api.nuget.org/v3/index.json and
+        /// related NuGet.org URLs are replaced by private registries configured to replace the base feeds.
+        /// See the initialization of `RegistryProxyStubWithBaseUrls` for the feeds configured as default replacements.
+        /// </summary>
+        [Fact]
+        public void TestNugetOrgReplacement()
+        {
+            // Setup
+            var logger = new LoggerStub();
+            var dotnet = new DotNetStub([], [], ["E https://www.nuget.org/api/v2/"], ["E https://api.nuget.org/v3/index.json"]);
+            var registryProxy = new RegistryProxyStubWithBaseUrls();
+            var fileProvider = new FileProviderStub();
+            var feedManagerIo = new FeedManagerIOStub(["https://example.com/registry2", "https://example.com/base1"]);
+            var feedManager = new FeedManager(logger, dotnet, registryProxy, fileProvider, feedManagerIo);
+
+            // Execute
+            var explicitFeeds = feedManager.ExplicitFeeds;
+            var allFeeds = feedManager.AllFeeds;
+
+            // Verify
+            Assert.Equal([
+                "https://example.com/base1",
+                "https://example.com/base2",
+                "https://example.com/registry1",
+                "https://example.com/registry2"
+            ], explicitFeeds);
+            Assert.Equal([
+                "https://example.com/base1",
+                "https://example.com/base2",
+                "https://example.com/registry1",
+                "https://example.com/registry2",
+            ], allFeeds);
+        }
+    }
+}
diff --git a/csharp/extractor/Semmle.Extraction.Tests/FileContent.cs b/csharp/extractor/Semmle.Extraction.Tests/FileContent.cs
index cbbf6ed4d24f..8d042fcc33b2 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/FileContent.cs
+++ b/csharp/extractor/Semmle.Extraction.Tests/FileContent.cs
@@ -179,7 +179,7 @@ public void TestFileContent_LegacyProjectStructure()
 
             // Execute
             var isLegacy = fileContent.IsLegacyProjectStructureUsed;
-            var isNew = fileContent.IsNewProjectStructureUsed;
+            var isNew = fileContent.IsSdkProjectStructureUsed;
 
             // Verify
             Assert.True(isLegacy);
@@ -204,7 +204,7 @@ public void TestFileContent_NewProjectStructure()
 
             // Execute
             var isLegacy = fileContent.IsLegacyProjectStructureUsed;
-            var isNew = fileContent.IsNewProjectStructureUsed;
+            var isNew = fileContent.IsSdkProjectStructureUsed;
 
             // Verify
             Assert.True(isNew);
diff --git a/csharp/extractor/Semmle.Extraction.Tests/RegistryProxy.cs b/csharp/extractor/Semmle.Extraction.Tests/RegistryProxy.cs
new file mode 100644
index 000000000000..f978736416fd
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.Tests/RegistryProxy.cs
@@ -0,0 +1,285 @@
+using Xunit;
+using System;
+using System.Diagnostics;
+using System.IO;
+using Semmle.Extraction.CSharp.DependencyFetching;
+using Semmle.Util;
+
+namespace Semmle.Extraction.Tests
+{
+    public class RegistryConfigurationStub : IRegistryProxyConfiguration
+    {
+        public string? Host { get; set; }
+        public string? Port { get; set; }
+        public string? Certificate { get; set; }
+        public string? RegistryURLs { get; set; }
+    }
+
+    public class DiagnosticsWriterStub : IDiagnosticsWriter
+    {
+        public void AddEntry(Semmle.Util.DiagnosticMessage entry) { }
+        public void Dispose() { }
+    }
+
+    public class RegistryProxyTests
+    {
+        private static TemporaryDirectory MakeTemporaryDirectory()
+        {
+            var tmp = Path.Join(Path.GetTempPath(), "RegistryProxyTests", Guid.NewGuid().ToString());
+            return new TemporaryDirectory(tmp, "testing", new LoggerStub());
+        }
+
+        /// <summary>
+        /// Verify that the registry proxy correctly handles the case where the port is not specified.
+        /// In this case, the registry proxy should not be created.
+        /// </summary>
+        [Fact]
+        public void TestRegistryProxyNoPort()
+        {
+            // Setup
+            var config = new RegistryConfigurationStub
+            {
+                Host = "localhost",
+                Port = "",
+            };
+
+            // Execute
+            using var tempWorkingDirectory = MakeTemporaryDirectory();
+            using var proxy = RegistryProxy.Make(config, new LoggerStub(), new DiagnosticsWriterStub(), tempWorkingDirectory);
+
+            // Verify
+            Assert.Null(proxy);
+        }
+
+        /// <summary>
+        /// Verify that the registry proxy correctly handles the case where the host is not specified.
+        /// In this case, the registry proxy should not be created.
+        /// </summary>
+        [Fact]
+        public void TestRegistryProxyNoHost()
+        {
+            // Setup
+            var config = new RegistryConfigurationStub
+            {
+                Port = "8080",
+            };
+
+            // Execute
+            using var tempWorkingDirectory = MakeTemporaryDirectory();
+            using var proxy = RegistryProxy.Make(config, new LoggerStub(), new DiagnosticsWriterStub(), tempWorkingDirectory);
+
+            // Verify
+            Assert.Null(proxy);
+        }
+
+        private const string ExampleCertificate = """
+        -----BEGIN CERTIFICATE-----
+        MIIFJTCCAw2gAwIBAgIUDImU6YnuAqJ1QuRp+OpJQPnPu6wwDQYJKoZIhvcNAQEL
+        BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI2MDkwMTEyMjUzMVoXDTI3MDkw
+        MTEyMjUzMVowFDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEF
+        AAOCAg8AMIICCgKCAgEAnlp7yQ1VuocMwIZWlCle3bEM86+1ED6BFfPFpIrRhfUT
+        c+5IvPng8TIZPO4mROp5G9YDZfOtXW2bwktyZNUhsBcxqUT1lmXit21vc5W9Gxx5
+        4G8nyF4/FcjFkmxkZifxiUCdBceDcE7+kx2itq/a7gLPlyTzvz5etu1nHEC3Jg/y
+        TVhAwdwysgAo9WymFCczDa2ga6nOPBOaxwLnoPl9041KSu5oIo9QC0Im+US1R18Q
+        /mXa+wkmjf+bYAkE/pZie8z8Q7h9yppTngGzkoDEebFYyaMr8MXlFdWS8f/eMwSp
+        iMFSsmlCqgUbA672APxzOcuSMMYrblzGkvZp23qbNjwQuQKlgAYBTSGltLv4U8JF
+        ePNcgDCY6RG55rNvF1gk1L2h25jcw1LX6fSvQGCOkzNmP03AhqZBUigO1Zt0zLwi
+        K4m0bH7nPLJFEN6tI3tybyZeC2RVyiSHvOkgx35Qj8RQ3XMVkImJNBYOMc2MkmMZ
+        ux6XMiHqXCON4zaWuWSovciZeMAQAspCrzVDLH6p2DWEfw/zDfQNU3iLk21sZGei
+        0GKzs8zrxUcqOU9V4Cnm+7JJ6eqS72f1+wX0ROb3djC6KgCE/NaHqo4apiI3K+CH
+        T0rVRsJIHyT39YO1c1I1vhAKRSH5kQVe3qRfIT/AuaDLQY6WqGPzrOkem78sjtsC
+        AwEAAaNvMG0wHQYDVR0OBBYEFK0DP5MD6mhEcdcm346uwoPL2NFGMB8GA1UdIwQY
+        MBaAFK0DP5MD6mhEcdcm346uwoPL2NFGMA8GA1UdEwEB/wQFMAMBAf8wGgYDVR0R
+        BBMwEYIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3DQEBCwUAA4ICAQCc5u8qNHHG
+        kONjfvq7Denq6QaEt4dZZDDODAvgUzZnnBjEhgrp7zfxtbyU/I0+DWnKQMKA9wPM
+        ktiFGd0lldEqoT+E7b0kN124lBGqZ/uYkhsWZ0Nc5dD+UB9oJszwOc5KNuquOnr6
+        SbsfXVm4yLvVLXl67c0jvqvRgGg9/6Q6eMzohW6abMdbYhS28/DsJhCea/dV3+L1
+        oVJ3O/A8e86m174ZCGE8s9UtnVYylBkAryDqaaQLdOBQ2C7uxdRAUNHSIa2JlqUc
+        5+cod8lFojKb74hbgj6wkXyajsFttqYMh7CeASsnjZXDQ4MC3DqqDVCZuNvJ85Rt
+        ya3Tljp4Ln2AAAoKC3REUeU8PQqpk1vVIj0FSr3RvBTvwzyNfWFVqyBiXTATuV9n
+        6AemqqXo5MZrHHeRaSTF8A70Jxbt9yx75xQxp3O3tdEL1Mxbl9X7c/hizOfLbeHH
+        IkAgzALQgi87Zbf2tOhRwH5NrB4ijyUUfovRHUwzsZOoTNqlVeNzbDRVbegx9V99
+        /3vwNZgpStGl/JYhN9qY5hJKnC64ltMvuNGpLeJCGyFkrtFS8gKkgR7VKrGo7h3+
+        Zo8rz8TFjP7RmSgQbrmFuPqNOGXzPidu2sMMFacKV7Rn4bEtHzW3MDhqVD4w/pGD
+        L0xpnWjzLYltVjz8mo07yh+zQ10G71Cl1w==
+        -----END CERTIFICATE-----
+        """;
+
+        /// <summary>
+        /// Verify that the registry proxy correctly handles the case
+        /// where the port, host, and certificate are specified.
+        /// </summary>
+        [Fact]
+        public void TestRegistryProxyCertificate()
+        {
+            // Setup
+            var config = new RegistryConfigurationStub
+            {
+                Port = "8080",
+                Host = "localhost",
+                Certificate = ExampleCertificate
+            };
+
+            // Execute
+            using var tempWorkingDirectory = MakeTemporaryDirectory();
+            using var proxy = RegistryProxy.Make(config, new LoggerStub(), new DiagnosticsWriterStub(), tempWorkingDirectory);
+
+            // Verify
+            Assert.NotNull(proxy);
+            Assert.Equal("http://localhost:8080", proxy.Address);
+            Assert.NotNull(proxy.Certificate);
+            Assert.NotNull(proxy.CertificatePath);
+        }
+
+        /// <summary>
+        /// Verify that the registry proxy correctly handles the case where the RegistryURLs environment variable
+        /// is not a valid JSON list.
+        /// In this case, the registry proxy should be created, but the list of private registries should be empty.
+        /// </summary>
+        [Fact]
+        public void TestRegistryProxyUrlsParseError()
+        {
+            // Setup
+            var config = new RegistryConfigurationStub
+            {
+                Port = "8080",
+                Host = "localhost",
+                RegistryURLs = "Doesn't parse as a JSON list"
+            };
+
+            // Execute
+            using var tempWorkingDirectory = MakeTemporaryDirectory();
+            using var proxy = RegistryProxy.Make(config, new LoggerStub(), new DiagnosticsWriterStub(), tempWorkingDirectory);
+
+            // Verify
+            Assert.NotNull(proxy);
+            Assert.Empty(proxy.RegistryURLs);
+            Assert.Empty(proxy.RegistryBaseURLs);
+        }
+
+        /// <summary>
+        /// Verify that the registry proxy correctly handles the case where the RegistryURLs environment variable
+        /// is a valid JSON list with a single entry.
+        /// In this case, the registry proxy should be created, and the list of private registries should contain the single entry.
+        /// </summary>
+        [Fact]
+        public void TestRegistryProxyUrlsSingle()
+        {
+            // Setup
+            var config = new RegistryConfigurationStub
+            {
+                Port = "8080",
+                Host = "localhost",
+                RegistryURLs = "[ { \"type\": \"nuget_feed\", \"url\": \"https://nuget.pkg.github.com/org/index.json\" } ]"
+            };
+
+            // Execute
+            using var tempWorkingDirectory = MakeTemporaryDirectory();
+            using var proxy = RegistryProxy.Make(config, new LoggerStub(), new DiagnosticsWriterStub(), tempWorkingDirectory);
+
+            // Verify
+            Assert.NotNull(proxy);
+            Assert.Equal([
+                "https://nuget.pkg.github.com/org/index.json"
+            ], proxy.RegistryURLs);
+            Assert.Empty(proxy.RegistryBaseURLs);
+        }
+
+        /// <summary>
+        /// Verify that the registry proxy correctly handles the case where the RegistryURLs environment variable
+        /// is a valid JSON list with multiple entries, but only one of them is of type "nuget_feed", which is
+        /// relevant for C#.
+        /// In this case, the registry proxy should be created, and the list of private registries should
+        /// contain only the entry of type "nuget_feed".
+        /// </summary>
+        [Fact]
+        public void TestRegistryProxyUrls3()
+        {
+            // Setup
+            var config = new RegistryConfigurationStub
+            {
+                Port = "8080",
+                Host = "localhost",
+                RegistryURLs = "[ { \"type\": \"nuget_feed\", \"url\": \"https://example.com/org/index.json\" }, { \"type\": \"wrong_type\", \"url\": \"https://nuget.pkg.github.com/org/index.json\" } ]"
+            };
+
+            // Execute
+            using var tempWorkingDirectory = MakeTemporaryDirectory();
+            using var proxy = RegistryProxy.Make(config, new LoggerStub(), new DiagnosticsWriterStub(), tempWorkingDirectory);
+
+            // Verify
+            Assert.NotNull(proxy);
+            Assert.Equal([
+                "https://example.com/org/index.json"
+            ], proxy.RegistryURLs);
+            Assert.Empty(proxy.RegistryBaseURLs);
+        }
+
+        /// <summary>
+        /// Verify that the registry proxy correctly handles the case where the RegistryURLs environment variable
+        /// is a valid JSON list with multiple entries and one of them is configured to replace the base feeds.
+        /// In this case, the registry proxy should be created, and the list of private registries should contain all
+        /// entries, while the list of base registries should contain only the entry that replaces the base feeds.
+        /// </summary>
+        [Fact]
+        public void TestRegistryProxyUrlsReplacesBase()
+        {
+            // Setup
+            var config = new RegistryConfigurationStub
+            {
+                Port = "8080",
+                Host = "localhost",
+                RegistryURLs = "[ { \"type\": \"nuget_feed\", \"url\": \"https://example.com/org/index.json\", \"replaces-base\": true }, { \"type\": \"nuget_feed\", \"url\": \"https://example2.com/org/index.json\", \"replaces-base\": false } ]"
+            };
+
+            // Execute
+            using var tempWorkingDirectory = MakeTemporaryDirectory();
+            using var proxy = RegistryProxy.Make(config, new LoggerStub(), new DiagnosticsWriterStub(), tempWorkingDirectory);
+
+            // Verify
+            Assert.NotNull(proxy);
+            Assert.Equal([
+                "https://example.com/org/index.json",
+                "https://example2.com/org/index.json"
+            ], proxy.RegistryURLs);
+            Assert.Equal([
+                "https://example.com/org/index.json",
+            ], proxy.RegistryBaseURLs);
+        }
+
+        /// <summary>
+        /// Verifies that the registry proxy correctly sets the environment variables needed for a .NET process to use the proxy.
+        /// In this case, the environment variables for the HTTP and HTTPS proxies, as well as the SSL certificate file, should be correctly set.
+        /// The http proxies should be set to the proxy address, and the SSL certificate file should point to the certificate path.
+        /// The latter is tested by verifying that the SSL_CERT_FILE environment variable ends with "proxy.crt" as we can't check the absolute path
+        /// due to temporary directories.
+        /// </summary>
+        [Fact]
+        public void TestRegistryProxyProcessEnvironment()
+        {
+            // Setup
+            var config = new RegistryConfigurationStub
+            {
+                Port = "8080",
+                Host = "localhost",
+                Certificate = ExampleCertificate
+            };
+
+            // Execute
+            using var tempWorkingDirectory = MakeTemporaryDirectory();
+            using var proxy = RegistryProxy.Make(config, new LoggerStub(), new DiagnosticsWriterStub(), tempWorkingDirectory);
+
+            var pi = new ProcessStartInfo("nuget");
+            proxy?.SetProcessEnvironment(pi);
+
+            // Verify
+            Assert.NotNull(proxy);
+            Assert.Equal("http://localhost:8080", proxy.Address);
+            Assert.Equal("http://localhost:8080", pi.EnvironmentVariables["HTTP_PROXY"]);
+            Assert.Equal("http://localhost:8080", pi.EnvironmentVariables["HTTPS_PROXY"]);
+            Assert.Equal("http://localhost:8080", pi.EnvironmentVariables["http_proxy"]);
+            Assert.Equal("http://localhost:8080", pi.EnvironmentVariables["https_proxy"]);
+            Assert.EndsWith("proxy.crt", pi.EnvironmentVariables["SSL_CERT_FILE"]);
+        }
+    }
+}
diff --git a/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs b/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs
index 38101420fab2..ea2483f3faf3 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs
+++ b/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs
@@ -5,37 +5,12 @@
 
 namespace Semmle.Extraction.Tests
 {
-    internal class DotNetStub : IDotNet
-    {
-        private readonly IList<string> runtimes;
-        private readonly IList<string> sdks;
-
-        public DotNetStub(IList<string> runtimes, IList<string> sdks)
-        {
-            this.runtimes = runtimes;
-            this.sdks = sdks;
-        }
-        public bool AddPackage(string folder, string package) => true;
-
-        public bool New(string folder) => true;
-
-        public RestoreResult Restore(RestoreSettings restoreSettings) => new(true, Array.Empty<string>());
-
-        public IList<string> GetListedRuntimes() => runtimes;
-
-        public IList<string> GetListedSdks() => sdks;
-
-        public bool Exec(string execArgs) => true;
-
-        public IList<string> GetNugetFeeds(string nugetConfig) => [];
-
-        public IList<string> GetNugetFeedsFromFolder(string folderPath) => [];
-    }
-
     public class RuntimeTests
     {
         private static string FixExpectedPathOnWindows(string path) => path.Replace('\\', '/');
 
+        private static DotNetStub MakeDotNetStub(IList<string> listedRuntimes) => new DotNetStub(listedRuntimes, null!, [], []);
+
         [Fact]
         public void TestRuntime1()
         {
@@ -50,7 +25,7 @@ public void TestRuntime1()
                 "Microsoft.NETCore.App 7.0.0 [/path/dotnet/shared/Microsoft.NETCore.App]",
                 "Microsoft.NETCore.App 7.0.2 [/path/dotnet/shared/Microsoft.NETCore.App]"
                 };
-            var dotnet = new DotNetStub(listedRuntimes, null!);
+            var dotnet = MakeDotNetStub(listedRuntimes);
             var runtime = new Runtime(dotnet);
 
             // Execute
@@ -76,7 +51,7 @@ public void TestRuntime2()
                 "Microsoft.NETCore.App 8.0.0-preview.5.43280.8 [/path/dotnet/shared/Microsoft.NETCore.App]",
                 "Microsoft.NETCore.App 8.0.0-preview.5.23280.8 [/path/dotnet/shared/Microsoft.NETCore.App]"
             };
-            var dotnet = new DotNetStub(listedRuntimes, null!);
+            var dotnet = new DotNetStub(listedRuntimes, null!, [], []);
             var runtime = new Runtime(dotnet);
 
             // Execute
@@ -99,7 +74,7 @@ public void TestRuntime3()
                 "Microsoft.NETCore.App 8.0.0-rc.4.43280.8 [/path/dotnet/shared/Microsoft.NETCore.App]",
                 "Microsoft.NETCore.App 8.0.0-preview.5.23280.8 [/path/dotnet/shared/Microsoft.NETCore.App]"
             };
-            var dotnet = new DotNetStub(listedRuntimes, null!);
+            var dotnet = MakeDotNetStub(listedRuntimes);
             var runtime = new Runtime(dotnet);
 
             // Execute
@@ -128,7 +103,7 @@ public void TestRuntime4()
                 @"Microsoft.WindowsDesktop.App 6.0.20 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]",
                 @"Microsoft.WindowsDesktop.App 7.0.4 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]"
             };
-            var dotnet = new DotNetStub(listedRuntimes, null!);
+            var dotnet = MakeDotNetStub(listedRuntimes);
             var runtime = new Runtime(dotnet);
 
             // Execute
@@ -149,6 +124,7 @@ public class SdkTests
     {
         private static string FixExpectedPathOnWindows(string path) => path.Replace('\\', '/');
 
+        private static DotNetStub MakeDotNetStub(IList<string> listedSdks) => new DotNetStub(null!, listedSdks, [], []);
         [Fact]
         public void TestSdk1()
         {
@@ -163,7 +139,7 @@ public void TestSdk1()
                 "6.0.102 [/usr/local/share/dotnet/sdk6]",
                 "6.0.301 [/usr/local/share/dotnet/sdk7]",
             };
-            var dotnet = new DotNetStub(null!, listedSdks);
+            var dotnet = MakeDotNetStub(listedSdks);
             var sdk = new Sdk(dotnet, new LoggerStub());
 
             // Execute
@@ -185,7 +161,7 @@ public void TestSdk2()
                 "8.0.100-preview.7.23376.3 [/usr/local/share/dotnet/sdk3]",
                 "7.0.400 [/usr/local/share/dotnet/sdk4]",
             };
-            var dotnet = new DotNetStub(null!, listedSdks);
+            var dotnet = MakeDotNetStub(listedSdks);
             var sdk = new Sdk(dotnet, new LoggerStub());
 
             // Execute
diff --git a/csharp/paket.lock b/csharp/paket.lock
index f76a8afa7eb4..332e75f89a6e 100644
--- a/csharp/paket.lock
+++ b/csharp/paket.lock
@@ -12,27 +12,27 @@ NUGET
       Microsoft.Extensions.ObjectPool (>= 10.0.7)
       MSBuild.StructuredLogger (>= 2.3.178)
     Humanizer.Core (3.0.10)
-    MessagePack (3.1.6)
-      MessagePack.Annotations (>= 3.1.6)
-      MessagePackAnalyzer (>= 3.1.6)
+    MessagePack (3.1.8)
+      MessagePack.Annotations (>= 3.1.8)
+      MessagePackAnalyzer (>= 3.1.8)
       Microsoft.NET.StringTools (>= 17.11.4)
-    MessagePack.Annotations (3.1.6)
-    MessagePackAnalyzer (3.1.6)
-    Microsoft.Bcl.AsyncInterfaces (10.0.8)
-    Microsoft.Bcl.Memory (10.0.8)
+    MessagePack.Annotations (3.1.8)
+    MessagePackAnalyzer (3.1.8)
+    Microsoft.Bcl.AsyncInterfaces (10.0.10)
+    Microsoft.Bcl.Memory (10.0.10)
     Microsoft.Build (18.6.3)
       Microsoft.Build.Framework (>= 18.6.3)
       System.Configuration.ConfigurationManager (>= 10.0.3)
       System.Diagnostics.EventLog (>= 10.0.3)
       System.Reflection.MetadataLoadContext (>= 10.0.3)
       System.Security.Cryptography.ProtectedData (>= 10.0.3)
-    Microsoft.Build.Framework (18.6.3)
-      Microsoft.NET.StringTools (>= 18.6.3)
-    Microsoft.Build.Utilities.Core (18.6.3)
-      Microsoft.Build.Framework (>= 18.6.3)
-      System.Configuration.ConfigurationManager (>= 10.0.3)
-      System.Diagnostics.EventLog (>= 10.0.3)
-      System.Security.Cryptography.ProtectedData (>= 10.0.3)
+    Microsoft.Build.Framework (18.8.2)
+      Microsoft.NET.StringTools (>= 18.8.2)
+    Microsoft.Build.Utilities.Core (18.8.2)
+      Microsoft.Build.Framework (>= 18.8.2)
+      System.Configuration.ConfigurationManager (>= 10.0.4)
+      System.Diagnostics.EventLog (>= 10.0.4)
+      System.Security.Cryptography.ProtectedData (>= 10.0.4)
     Microsoft.CodeAnalysis (5.3)
       Humanizer.Core (>= 2.14.1)
       Microsoft.Bcl.AsyncInterfaces (>= 9.0)
@@ -50,7 +50,7 @@ NUGET
       System.Text.Encoding.CodePages (>= 8.0)
       System.Threading.Channels (>= 8.0)
       System.Threading.Tasks.Extensions (>= 4.6)
-    Microsoft.CodeAnalysis.Analyzers (5.3)
+    Microsoft.CodeAnalysis.Analyzers (5.6)
     Microsoft.CodeAnalysis.Common (5.3)
       Microsoft.CodeAnalysis.Analyzers (>= 5.3.0-2.25625.1)
     Microsoft.CodeAnalysis.CSharp (5.3)
@@ -78,55 +78,54 @@ NUGET
       Microsoft.CodeAnalysis.Analyzers (>= 5.3.0-2.25625.1)
       Microsoft.CodeAnalysis.Common (5.3)
       System.Composition (>= 9.0)
-    Microsoft.CodeCoverage (18.5.1)
-    Microsoft.Extensions.ObjectPool (10.0.8)
-    Microsoft.NET.StringTools (18.6.3)
-    Microsoft.NET.Test.Sdk (18.5.1)
-      Microsoft.CodeCoverage (>= 18.5.1)
-      Microsoft.TestPlatform.TestHost (>= 18.5.1)
-    Microsoft.TestPlatform.ObjectModel (18.5.1)
+    Microsoft.CodeCoverage (18.8.1)
+    Microsoft.Extensions.ObjectPool (10.0.10)
+    Microsoft.NET.StringTools (18.8.2)
+    Microsoft.NET.Test.Sdk (18.8.1)
+      Microsoft.CodeCoverage (>= 18.8.1)
+      Microsoft.TestPlatform.TestHost (>= 18.8.1)
+    Microsoft.TestPlatform.ObjectModel (18.8.1)
       System.Reflection.Metadata (>= 8.0)
-    Microsoft.TestPlatform.TestHost (18.5.1)
-      Microsoft.TestPlatform.ObjectModel (>= 18.5.1)
-      Newtonsoft.Json (>= 13.0.3)
+    Microsoft.TestPlatform.TestHost (18.8.1)
+      Microsoft.TestPlatform.ObjectModel (>= 18.8.1)
     Microsoft.VisualStudio.SolutionPersistence (1.0.52)
     Mono.Posix.NETStandard (1.0)
-    MSBuild.StructuredLogger (2.3.204)
+    MSBuild.StructuredLogger (2.3.213)
       Microsoft.Build.Framework (>= 17.5)
       Microsoft.Build.Utilities.Core (>= 17.5)
     Newtonsoft.Json (13.0.4)
     NuGet.Versioning (7.6)
     System.Buffers (4.6.1)
-    System.Collections.Immutable (10.0.8)
-    System.Composition (10.0.8)
-      System.Composition.AttributedModel (>= 10.0.8)
-      System.Composition.Convention (>= 10.0.8)
-      System.Composition.Hosting (>= 10.0.8)
-      System.Composition.Runtime (>= 10.0.8)
-      System.Composition.TypedParts (>= 10.0.8)
-    System.Composition.AttributedModel (10.0.8)
-    System.Composition.Convention (10.0.8)
-      System.Composition.AttributedModel (>= 10.0.8)
-    System.Composition.Hosting (10.0.8)
-      System.Composition.Runtime (>= 10.0.8)
-    System.Composition.Runtime (10.0.8)
-    System.Composition.TypedParts (10.0.8)
-      System.Composition.AttributedModel (>= 10.0.8)
-      System.Composition.Hosting (>= 10.0.8)
-      System.Composition.Runtime (>= 10.0.8)
-    System.Configuration.ConfigurationManager (10.0.8)
-      System.Diagnostics.EventLog (>= 10.0.8)
-      System.Security.Cryptography.ProtectedData (>= 10.0.8)
-    System.Diagnostics.EventLog (10.0.8)
-    System.IO.Pipelines (10.0.8)
+    System.Collections.Immutable (10.0.10)
+    System.Composition (10.0.10)
+      System.Composition.AttributedModel (>= 10.0.10)
+      System.Composition.Convention (>= 10.0.10)
+      System.Composition.Hosting (>= 10.0.10)
+      System.Composition.Runtime (>= 10.0.10)
+      System.Composition.TypedParts (>= 10.0.10)
+    System.Composition.AttributedModel (10.0.10)
+    System.Composition.Convention (10.0.10)
+      System.Composition.AttributedModel (>= 10.0.10)
+    System.Composition.Hosting (10.0.10)
+      System.Composition.Runtime (>= 10.0.10)
+    System.Composition.Runtime (10.0.10)
+    System.Composition.TypedParts (10.0.10)
+      System.Composition.AttributedModel (>= 10.0.10)
+      System.Composition.Hosting (>= 10.0.10)
+      System.Composition.Runtime (>= 10.0.10)
+    System.Configuration.ConfigurationManager (10.0.10)
+      System.Diagnostics.EventLog (>= 10.0.10)
+      System.Security.Cryptography.ProtectedData (>= 10.0.10)
+    System.Diagnostics.EventLog (10.0.10)
+    System.IO.Pipelines (10.0.10)
     System.Memory (4.6.3)
     System.Numerics.Vectors (4.6.1)
-    System.Reflection.Metadata (10.0.8)
-    System.Reflection.MetadataLoadContext (10.0.8)
+    System.Reflection.Metadata (10.0.10)
+    System.Reflection.MetadataLoadContext (10.0.10)
     System.Runtime.CompilerServices.Unsafe (6.1.2)
-    System.Security.Cryptography.ProtectedData (10.0.8)
-    System.Text.Encoding.CodePages (10.0.8)
-    System.Threading.Channels (10.0.8)
+    System.Security.Cryptography.ProtectedData (10.0.10)
+    System.Text.Encoding.CodePages (10.0.10)
+    System.Threading.Channels (10.0.10)
     System.Threading.Tasks.Extensions (4.6.3)
     xunit (2.9.3)
       xunit.analyzers (>= 1.18)
diff --git a/csharp/paket.main.bzl b/csharp/paket.main.bzl
index 0c1b13334243..d153b5f69d36 100644
--- a/csharp/paket.main.bzl
+++ b/csharp/paket.main.bzl
@@ -9,52 +9,52 @@ def main():
         packages = [
             {"name": "Basic.CompilerLog.Util", "id": "Basic.CompilerLog.Util", "version": "0.9.39", "sha512": "sha512-/Kqh12aedOvhOPuFDk/yE8HauuxXFuzB8Qt+NxEUopKnxyXtV0uPIVgBU3mLNC1Dj2E5Yhcz1rtECwnu4Tv1eg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net462": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net47": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net471": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net472": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net48": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net5.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net6.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net7.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net8.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net9.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp2.2": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp3.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp3.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netstandard2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Humanizer.Core", "id": "Humanizer.Core", "version": "3.0.10", "sha512": "sha512-86jRQVvMLU7xxsdHrK87TSqu5kL0lg4EiRjvTBglkrtLw242dMON4vTrFbGKr2CRjqbThBuIpodF2MWbCFKZYA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable", "System.Memory"], "net462": ["System.Collections.Immutable", "System.Memory"], "net47": ["System.Collections.Immutable", "System.Memory"], "net471": ["System.Collections.Immutable", "System.Memory"], "net472": ["System.Collections.Immutable", "System.Memory"], "net48": ["System.Collections.Immutable", "System.Memory"], "net5.0": ["System.Collections.Immutable", "System.Memory"], "net6.0": ["System.Collections.Immutable", "System.Memory"], "net7.0": ["System.Collections.Immutable", "System.Memory"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable", "System.Memory"], "netcoreapp2.1": ["System.Collections.Immutable", "System.Memory"], "netcoreapp2.2": ["System.Collections.Immutable", "System.Memory"], "netcoreapp3.0": ["System.Collections.Immutable", "System.Memory"], "netcoreapp3.1": ["System.Collections.Immutable", "System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable", "System.Memory"], "netstandard2.1": ["System.Collections.Immutable", "System.Memory"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "MessagePack", "id": "MessagePack", "version": "3.1.6", "sha512": "sha512-vkEho7kN4kxlkd238214A0/FGz6DB1Dalexql8CtUpsbtr0DhKmhBLsmZlqc9H6rRiRvG2VJyt+UqUmQxZoqyw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net6.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net7.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net8.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "net9.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netcoreapp3.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "MessagePack.Annotations", "id": "MessagePack.Annotations", "version": "3.1.6", "sha512": "sha512-7uF/iFA6NSB5Eo0HijkyEAHPURQC2ESmzoqNFd2bVqu2opQnuvutGYvcZKV91FXQ6YMDhzYvYbIlSTJ/Jru5+Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "MessagePackAnalyzer", "id": "MessagePackAnalyzer", "version": "3.1.6", "sha512": "sha512-eLmNdEFDwLjBiv3/rv/mBtIu18pu9eujlZ8pb0EsbnMzuNyNUp3GJ0WLL0h4qYRW5N41f8zN1N627h/kChe3oA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.Bcl.AsyncInterfaces", "id": "Microsoft.Bcl.AsyncInterfaces", "version": "10.0.8", "sha512": "sha512-FzE/KnOmwCmg2KMPjuyevkS5fAzNt2DBLSJs3HsJ+I/CoBSW6i0mighH6ryZ8JHQhNLxMK04X7J8BTt0kEG5/g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Threading.Tasks.Extensions"], "net462": ["System.Threading.Tasks.Extensions"], "net47": ["System.Threading.Tasks.Extensions"], "net471": ["System.Threading.Tasks.Extensions"], "net472": ["System.Threading.Tasks.Extensions"], "net48": ["System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["System.Threading.Tasks.Extensions"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Threading.Tasks.Extensions"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.Bcl.Memory", "id": "Microsoft.Bcl.Memory", "version": "10.0.8", "sha512": "sha512-Gd9LaF0vnR5noQP7/LPjSKvXw22b51ejGGs/HJHbzNbMOzT1KqGzW2329gP8DKKMj5iYACBKISwl6nDr32WFWA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "MessagePack", "id": "MessagePack", "version": "3.1.8", "sha512": "sha512-9s6k8RHuot/t6hcvQqYpLCpFY4NY52MApniE+eZsydkhoyvJQL/X1SxUR8Wrurms6xDtj+ZRHGlyfLfBZ9ni7Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net6.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net7.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net8.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "net9.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netcoreapp3.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "MessagePack.Annotations", "id": "MessagePack.Annotations", "version": "3.1.8", "sha512": "sha512-ONyOl+mddCHFvZwsicJ2ubaK7a1O/wBo4KX178TsbLSW57m+P7WNPf8ZhXyCVCJuc/nqGBvuigeb0SP8Hzqssg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "MessagePackAnalyzer", "id": "MessagePackAnalyzer", "version": "3.1.8", "sha512": "sha512-K//7kxEU35BqDkb6obsEKJreQyaN+56tnjddUHvMz9X+nNuurULHihWRjnCt8DsXEgRfFPwn7WYjtOOXSyYxzQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.Bcl.AsyncInterfaces", "id": "Microsoft.Bcl.AsyncInterfaces", "version": "10.0.10", "sha512": "sha512-8Mx8TUFWoK2gH35Cyr0ndO2l9j4XJzo1wsC6ufVD2nlFsVe5NXmbM+vEOILLhdANZKEgN+U8hkPrT1YQsSSBSA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Threading.Tasks.Extensions"], "net462": ["System.Threading.Tasks.Extensions"], "net47": ["System.Threading.Tasks.Extensions"], "net471": ["System.Threading.Tasks.Extensions"], "net472": ["System.Threading.Tasks.Extensions"], "net48": ["System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["System.Threading.Tasks.Extensions"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Threading.Tasks.Extensions"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.Bcl.Memory", "id": "Microsoft.Bcl.Memory", "version": "10.0.10", "sha512": "sha512-dY04r7+oqm5RWWQ5Ncw2BZfz5lWuEmamdZX+sh7ujYPeu6MTTNElaDtW/5JAUF70TMVCZd6tELRFbx10BVvmXw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Microsoft.Build", "id": "Microsoft.Build", "version": "18.6.3", "sha512": "sha512-KC9xCNrucJlKrA0KFXiYUHZI74kNBOaZ/BLHSCm06fS7aoHnlAlRZizti+i4V0AsaJlaIBjtN/Cf6LkcmENi4w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.Build.Framework", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["Microsoft.Build.Framework", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Reflection.MetadataLoadContext", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Build.Framework", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Reflection.MetadataLoadContext", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.Build.Framework", "id": "Microsoft.Build.Framework", "version": "18.6.3", "sha512": "sha512-p11xRx05A+bU2oUIsKKuAEOEPyroo2ygUwQVDLAGV3ZkNtHBsQs9RojvRqr+wiql7KPUXv0qbwKcACUpsbbmcA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.NET.StringTools"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe", "System.Memory", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe", "System.Memory", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.Build.Utilities.Core", "id": "Microsoft.Build.Utilities.Core", "version": "18.6.3", "sha512": "sha512-uB3c5znytjARTsycmhOfnTavdGTYalYWcCtb6RAFqHcXv2y8JxGsdgQQ39n9IqXpt9JyxPSWz2uVuztuG/Oplw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.Build.Framework", "System.Configuration.ConfigurationManager", "System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.Build.Framework", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Build.Framework", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.Build.Framework", "id": "Microsoft.Build.Framework", "version": "18.8.2", "sha512": "sha512-a7GqCWuBTxqVme+L8u5QXSrifzmWEGQuih3E3tOYB/TH+CLKg6iZhOx0jBz8Wc1f2qMnPr3jzJcan0vPI0zBcQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.NET.StringTools"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe", "System.Memory", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe", "System.Memory", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.NET.StringTools", "System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.Build.Utilities.Core", "id": "Microsoft.Build.Utilities.Core", "version": "18.8.2", "sha512": "sha512-o6aoVgjtD37nmsQ1B3IhB9yjBOhFur7EH+CNsIUnBwQUBBLM4qN4Xv11nA5X84GLoxw8SGW0MY6+r04Mhqvfxg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.Build.Framework", "System.Configuration.ConfigurationManager", "System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.Build.Framework", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Build.Framework", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.Build.Framework", "System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Microsoft.CodeAnalysis", "id": "Microsoft.CodeAnalysis", "version": "5.3.0", "sha512": "sha512-gCuN2a/33HYRrRg4P2LvbgSsUaGP/FSHTaz6FapSaEATYnbXBoiR9Nk/ItHAknc6IQPtodkUYKvX78MkBdoOSg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net9.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.CodeAnalysis.Analyzers", "id": "Microsoft.CodeAnalysis.Analyzers", "version": "5.3.0", "sha512": "sha512-v9jPlSs/fE7AU2/eZOw5EUzq0JOaWgP+2gghwIP2XbbTv56PZZZsy1QgEiMa3jjO8hR8SN1+NJvG1xxHL2FDgw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.CodeAnalysis.Analyzers", "id": "Microsoft.CodeAnalysis.Analyzers", "version": "5.6.0", "sha512": "sha512-in3YRkkpGhfekPD9j9G04qzdOoWBjaiGYrl6xy0+8Xp0N3Q1+Du5wkx/THhOTIvqk6Oy1d8RTIQnA8/qFapDNQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Microsoft.CodeAnalysis.Common", "id": "Microsoft.CodeAnalysis.Common", "version": "5.3.0", "sha512": "sha512-lt42ETYkJrzJrf99jQ9n7xnanR/ETh92o6LX03kTjQKfKFrJGm5/+4OQJyIz8Kj4/ClbeZ3kvxytsyds4jQ5Tg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Analyzers"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net462": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net47": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net471": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net472": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net48": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net5.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net6.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net7.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net8.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Analyzers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netstandard2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Microsoft.CodeAnalysis.CSharp", "id": "Microsoft.CodeAnalysis.CSharp", "version": "5.3.0", "sha512": "sha512-TD8ulDx0+qjf3oi5gcToiNaxVGzn0rsPN0hCQOq+skYGgugKGLVl8obs0KxrxAOx2xkjySbOcEBumgJ0uhzzgA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Microsoft.CodeAnalysis.CSharp.Workspaces", "id": "Microsoft.CodeAnalysis.CSharp.Workspaces", "version": "5.3.0", "sha512": "sha512-XwemsUpvFZ8zLvu9QxRdgh4rgoI1WypKHn9D4zrvN5V3p+CSJKmFBS1w09DuBSLe+DIITIu7JQmzmDsHXZow1g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Composition"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Composition"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Microsoft.CodeAnalysis.VisualBasic", "id": "Microsoft.CodeAnalysis.VisualBasic", "version": "5.3.0", "sha512": "sha512-0zqIJspSNg8iBDho82FwYt4ajoBRzMEtzdIPs5KBeisxNIBMpZh8CXJED8RY32HCsIOA5tx870xpgPsXOysMqA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "id": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "version": "5.3.0", "sha512": "sha512-FhpamkHtKiOd/2wlQ4l9K+NQLfAtBniWj2TWjgHp5rY+PNDRsOZpiTVBdrlwRTIR2oe6lz6cKYTxwBKVrPjOzQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Composition"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Composition"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Microsoft.CodeAnalysis.Workspaces.Common", "id": "Microsoft.CodeAnalysis.Workspaces.Common", "version": "5.3.0", "sha512": "sha512-pPJy45QDPFZNUpmgJz7fKL6Tte+CZ7NRw8GyluMBGLRAcwrZNMpWOKkV81MGnkCYOs8UA1b510MrQpevf0iQWw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "Microsoft.CodeAnalysis.Analyzers"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "Microsoft.CodeAnalysis.Analyzers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.CodeCoverage", "id": "Microsoft.CodeCoverage", "version": "18.5.1", "sha512": "sha512-BjoX00WuEWNnHFo591eXZIcl3IYm1iln65ub545zWF1o6pHicSHcX2eUBWEJW9W6GA/9cf/ZgJ2XuGOyDdep2A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.Extensions.ObjectPool", "id": "Microsoft.Extensions.ObjectPool", "version": "10.0.8", "sha512": "sha512-XOzhf+i3nZIyqy5sFaEdnNsPOPEYcEz9tL3YIU8RjK3aKIMLPLMaXDCGoOxKeOTN+03Faaz5le8X1RlKsW9rPQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.NET.StringTools", "id": "Microsoft.NET.StringTools", "version": "18.6.3", "sha512": "sha512-8RtWydTzV9i25v80XBoNxZDxmxuClq0PVejE2dHfpLhD8jFoEEPP2S+q5oS9HdSKOVDurUDTdjMCEWUB+DiGZg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.NET.Test.Sdk", "id": "Microsoft.NET.Test.Sdk", "version": "18.5.1", "sha512": "sha512-5/ucicw/H9/VNCmMTCjCQhNHEJc08ZeSLSrjvdZR/rtVUY8Enw+bi9LQTP1K97aRCqw/BG7cIV+VVFvgj3fKiw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.CodeCoverage"], "net47": ["Microsoft.CodeCoverage"], "net471": ["Microsoft.CodeCoverage"], "net472": ["Microsoft.CodeCoverage"], "net48": ["Microsoft.CodeCoverage"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net9.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.TestPlatform.ObjectModel", "id": "Microsoft.TestPlatform.ObjectModel", "version": "18.5.1", "sha512": "sha512-SJHvdEawgdOUuyN2/eVWZCwe14DKPgQPDsQGiwfeKFgjzYDUvhESRpohG9IvQQuYiCvAv7Tn+ozZ2fDPfpwdzg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Reflection.Metadata"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Reflection.Metadata"], "net462": ["System.Reflection.Metadata"], "net47": ["System.Reflection.Metadata"], "net471": ["System.Reflection.Metadata"], "net472": ["System.Reflection.Metadata"], "net48": ["System.Reflection.Metadata"], "net5.0": ["System.Reflection.Metadata"], "net6.0": ["System.Reflection.Metadata"], "net7.0": ["System.Reflection.Metadata"], "net8.0": ["System.Reflection.Metadata"], "net9.0": ["System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Reflection.Metadata"], "netcoreapp2.1": ["System.Reflection.Metadata"], "netcoreapp2.2": ["System.Reflection.Metadata"], "netcoreapp3.0": ["System.Reflection.Metadata"], "netcoreapp3.1": ["System.Reflection.Metadata"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Reflection.Metadata"], "netstandard2.1": ["System.Reflection.Metadata"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "Microsoft.TestPlatform.TestHost", "id": "Microsoft.TestPlatform.TestHost", "version": "18.5.1", "sha512": "sha512-CbWth1jMU2wVyAy1SVMexSyD3JXG8FYYyyrcY+B1aWhzFzRLh8JdThoibXTqXxZ2NRC9me+N4XIQC75dfLcgiA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net9.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.CodeCoverage", "id": "Microsoft.CodeCoverage", "version": "18.8.1", "sha512": "sha512-8h9rObu86JMC0ouOd7meNjPhjrTYQPEyOT42hshBxdxknvpfYLRzTY13ZBhRAf7tohl7wApqq/aaN6WRxhdwjw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.Extensions.ObjectPool", "id": "Microsoft.Extensions.ObjectPool", "version": "10.0.10", "sha512": "sha512-4Ysvqe0dDLdaPyhHNtTJ1Rk6RpzIv4ysxDT12ujfGCiKJEpXKvumpGvO5fwfQzvNsuGuvVznsmaquCSOf/oePQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.NET.StringTools", "id": "Microsoft.NET.StringTools", "version": "18.8.2", "sha512": "sha512-qJv3HjkTja31DcQpKPyzFJy2cYhzWrFskxtk8sCYptzjp/ZeW0Sr59fEeQbZzz3WpjYPh0DfhmgPcUx3XPPLVA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.NET.Test.Sdk", "id": "Microsoft.NET.Test.Sdk", "version": "18.8.1", "sha512": "sha512-7ZJBYyRfeaV4hDllSLVb7dtLXQb4SpbAhy+s9Sc+dUV2zwDUTTJtPLYTjanS5kqqm+283NNxIY4271uUY0Pvjw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.CodeCoverage"], "net47": ["Microsoft.CodeCoverage"], "net471": ["Microsoft.CodeCoverage"], "net472": ["Microsoft.CodeCoverage"], "net48": ["Microsoft.CodeCoverage"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net9.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.TestPlatform.ObjectModel", "id": "Microsoft.TestPlatform.ObjectModel", "version": "18.8.1", "sha512": "sha512-+ng/tKQNSOlrGQHUc72D3cg62HPViwXXBC0FoeEO6m1u4H4TCjITJy6Ym1bC8Folj0MAT0Y3236hMtY67zGphQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Reflection.Metadata"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Reflection.Metadata"], "net462": ["System.Reflection.Metadata"], "net47": ["System.Reflection.Metadata"], "net471": ["System.Reflection.Metadata"], "net472": ["System.Reflection.Metadata"], "net48": ["System.Reflection.Metadata"], "net5.0": ["System.Reflection.Metadata"], "net6.0": ["System.Reflection.Metadata"], "net7.0": ["System.Reflection.Metadata"], "net8.0": ["System.Reflection.Metadata"], "net9.0": ["System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Reflection.Metadata"], "netcoreapp2.1": ["System.Reflection.Metadata"], "netcoreapp2.2": ["System.Reflection.Metadata"], "netcoreapp3.0": ["System.Reflection.Metadata"], "netcoreapp3.1": ["System.Reflection.Metadata"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Reflection.Metadata"], "netstandard2.1": ["System.Reflection.Metadata"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "Microsoft.TestPlatform.TestHost", "id": "Microsoft.TestPlatform.TestHost", "version": "18.8.1", "sha512": "sha512-RterAFeFkQwnHzCmWBUctxEH/Yenj39954gR5J7IZXQk5okBv6lD3XOv0uGGRe02EpRjhDawHaGUXHpFBKfI3g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.TestPlatform.ObjectModel"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.TestPlatform.ObjectModel"], "net9.0": ["Microsoft.TestPlatform.ObjectModel"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Microsoft.VisualStudio.SolutionPersistence", "id": "Microsoft.VisualStudio.SolutionPersistence", "version": "1.0.52", "sha512": "sha512-lHyMm5j5wRwVaC3vlCWrFH2FGy2SpFUZqLvYhzwf1cEUIQCUChU960h8kteFSf01ZkLSgJwrznmspwjW8kPtrA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["System.Memory", "System.Threading.Tasks.Extensions"], "net48": ["System.Memory", "System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Mono.Posix.NETStandard", "id": "Mono.Posix.NETStandard", "version": "1.0.0", "sha512": "sha512-RtGiutQZJAmajvQ0QvBvh73VJye85iW9f9tjZlzF88idLxNMo4lAktP/4Y9ilCpais0LDO0tpoICt9Hdv6wooA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "MSBuild.StructuredLogger", "id": "MSBuild.StructuredLogger", "version": "2.3.204", "sha512": "sha512-MnrlWYtNUl0db/2lePRJhtOCzbQkJ1L9tyrA4xlKTFqjvpw8wnnX6AQ+PXYhjlMJ8ET9aoXGJOn/3e9j07NSwg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "MSBuild.StructuredLogger", "id": "MSBuild.StructuredLogger", "version": "2.3.213", "sha512": "sha512-C63vcnENTazm2XrczuEkSQRTeX53nYH1bza3k1XQdp6S3FtYTjGTUFP4nqqkNDjwVtBLNioNXRSUkFTvf2Qdtw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Newtonsoft.Json", "id": "Newtonsoft.Json", "version": "13.0.4", "sha512": "sha512-bR+v+E/yJ6g7GV2uXw2OrUSjYYfjLkOLC8JD4kCS23msLapnKtdJPBJA75fwHH++ErIffeIqzYITLxAur4KAXA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "NuGet.Versioning", "id": "NuGet.Versioning", "version": "7.6.0", "sha512": "sha512-JwbvmbG+1EOilFOAtjT2A7p05UgeOqzTZluUJ4mFgPZUSpYcHPPaK15x+RiqpKsVmKy741MaLN0fjOYxhGXr3g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "System.Buffers", "id": "System.Buffers", "version": "4.6.1", "sha512": "sha512-qve/dFwECwehSWlZmpkrrlIeATCvo/Hw2koyMrUVcDBy5gXAQrnwX8pHEoqgj8DgkrWuWW1DrQbFqoMbo+Fvrg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Collections.Immutable", "id": "System.Collections.Immutable", "version": "10.0.8", "sha512": "sha512-C6PSp5YO9fvxcDoBwqDE/2iMPNgzOcrdjQsnpJxWBMDZRMxdpjDe9tzJb14zZwY0dqbVSsoik5un31ZXJ7Fu8Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Composition", "id": "System.Composition", "version": "10.0.8", "sha512": "sha512-h1qUp18nhfGfw3mz8ZxNTUZXm2rVvk7HiPKj0IYdRJIdOAcIBmI/MT4U8Etdi6y0tPb2dNQvfTnj35PgDCpDwg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net462": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net47": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net471": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net472": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net48": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Composition.AttributedModel", "id": "System.Composition.AttributedModel", "version": "10.0.8", "sha512": "sha512-Qy0Ag0tpyGeh7BFgN7Mj2rumQHWoZYuTRE5fo5ice3j97JIMoAKt6uvj3sQqukhNLLPUDY0vz3WA36Fl/AbPRw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Composition.Convention", "id": "System.Composition.Convention", "version": "10.0.8", "sha512": "sha512-TKc99rqqwWNajwl3o40keYyQtYVD+NnWWX1EId4whrwo7wT9KiTS8Q6CJVR7GLxA+9lbGMJyQh6IgwZk3T7YJg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.AttributedModel"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel"], "net462": ["System.Composition.AttributedModel"], "net47": ["System.Composition.AttributedModel"], "net471": ["System.Composition.AttributedModel"], "net472": ["System.Composition.AttributedModel"], "net48": ["System.Composition.AttributedModel"], "net5.0": ["System.Composition.AttributedModel"], "net6.0": ["System.Composition.AttributedModel"], "net7.0": ["System.Composition.AttributedModel"], "net8.0": ["System.Composition.AttributedModel"], "net9.0": ["System.Composition.AttributedModel"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel"], "netcoreapp2.1": ["System.Composition.AttributedModel"], "netcoreapp2.2": ["System.Composition.AttributedModel"], "netcoreapp3.0": ["System.Composition.AttributedModel"], "netcoreapp3.1": ["System.Composition.AttributedModel"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel"], "netstandard2.1": ["System.Composition.AttributedModel"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Composition.Hosting", "id": "System.Composition.Hosting", "version": "10.0.8", "sha512": "sha512-Xx+8iGL7kYmfDwxPZqbFGuVO+JKLqfwBPJpqquFDE1IUsZs7yKFmmP1zg+xVwcEq/wJdYVqs9MTsCU/1AaBW/A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.Runtime"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.Runtime"], "net462": ["System.Composition.Runtime"], "net47": ["System.Composition.Runtime"], "net471": ["System.Composition.Runtime"], "net472": ["System.Composition.Runtime"], "net48": ["System.Composition.Runtime"], "net5.0": ["System.Composition.Runtime"], "net6.0": ["System.Composition.Runtime"], "net7.0": ["System.Composition.Runtime"], "net8.0": ["System.Composition.Runtime"], "net9.0": ["System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.Runtime"], "netstandard2.1": ["System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Composition.Runtime", "id": "System.Composition.Runtime", "version": "10.0.8", "sha512": "sha512-yyACoUVUtVhIcZzApq+ARHwVOkA9PRSQ/gI2y5xXwa6nwqA8doKySyqH1bfpaacHJ3j4zhrRe1lpjffTEhh0+Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Composition.TypedParts", "id": "System.Composition.TypedParts", "version": "10.0.8", "sha512": "sha512-kPWxTNdqjdnYmvDMnEFbjmKsbECPKXCHiusp53sor6xgDcUQNkzNqEKTMVEFbvjIH0DBLXIP9fudSrK886dqeg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net462": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net47": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net471": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net472": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net48": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Configuration.ConfigurationManager", "id": "System.Configuration.ConfigurationManager", "version": "10.0.8", "sha512": "sha512-1Z/h32w5oEjve1mUU5w1aYY9p+wcuNtTxo0RG+cQl+I34XRkjx4iYK9kuz+WYzud9QpPePk6iyjvnay1mWj6/Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Security.Cryptography.ProtectedData"], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Security.Cryptography.ProtectedData"], "net6.0": ["System.Security.Cryptography.ProtectedData"], "net7.0": ["System.Security.Cryptography.ProtectedData"], "net8.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net9.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Security.Cryptography.ProtectedData"], "netcoreapp2.1": ["System.Security.Cryptography.ProtectedData"], "netcoreapp2.2": ["System.Security.Cryptography.ProtectedData"], "netcoreapp3.0": ["System.Security.Cryptography.ProtectedData"], "netcoreapp3.1": ["System.Security.Cryptography.ProtectedData"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Security.Cryptography.ProtectedData"], "netstandard2.1": ["System.Security.Cryptography.ProtectedData"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Diagnostics.EventLog", "id": "System.Diagnostics.EventLog", "version": "10.0.8", "sha512": "sha512-ik2gdaGlYD5S+5wk4WLP43va4G9IW7g5QxW/C1/+DSEH2KNEGWuskgaVhURZxCkstF20I1iwgfMCB9k/5uUBFw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.IO.Pipelines", "id": "System.IO.Pipelines", "version": "10.0.8", "sha512": "sha512-jrBzkIgn/+Ul7ODVXy5uBYhlXpEVHx57VUtLigfw0pq2r+xu3dv/F0aWi7y3C/w3GSk6mhvoX3RfKcWJT372UA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net462": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net47": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net471": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net472": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net48": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net5.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net6.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net7.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Collections.Immutable", "id": "System.Collections.Immutable", "version": "10.0.10", "sha512": "sha512-JH2NYVL3GXOOYI8qrLQO2EvmatmLdtXtMxc9AFv+/XJ76dgTtSeP3VHuobj+xD1FWPhhxMZ0VhyFJoB1s6AHTw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Composition", "id": "System.Composition", "version": "10.0.10", "sha512": "sha512-9YEpcfz4xCbj/b+97hecZ6bzun83fOGbCz3AiSbaVAgkYVt00q1CVNPtwUL4eIQmd60OoTeRd8fhDVs1Vu41AA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net462": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net47": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net471": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net472": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net48": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Composition.AttributedModel", "id": "System.Composition.AttributedModel", "version": "10.0.10", "sha512": "sha512-qpvi6DGQYbcoNiBs0si0uWfZsFNCe7G38rE95/QyuUW1QF9zt9blOqygIhqz7SbAuAYxA/GrFJqdQ2ZLRKYtTA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Composition.Convention", "id": "System.Composition.Convention", "version": "10.0.10", "sha512": "sha512-I89jhR8qtl6yBXa9JPJcdela65JI4WPA4xfL3qauBlOZpSZUPAB5GCryyTKUh6yWzco+fSWO7QXfXUFyG+fAOQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.AttributedModel"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel"], "net462": ["System.Composition.AttributedModel"], "net47": ["System.Composition.AttributedModel"], "net471": ["System.Composition.AttributedModel"], "net472": ["System.Composition.AttributedModel"], "net48": ["System.Composition.AttributedModel"], "net5.0": ["System.Composition.AttributedModel"], "net6.0": ["System.Composition.AttributedModel"], "net7.0": ["System.Composition.AttributedModel"], "net8.0": ["System.Composition.AttributedModel"], "net9.0": ["System.Composition.AttributedModel"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel"], "netcoreapp2.1": ["System.Composition.AttributedModel"], "netcoreapp2.2": ["System.Composition.AttributedModel"], "netcoreapp3.0": ["System.Composition.AttributedModel"], "netcoreapp3.1": ["System.Composition.AttributedModel"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel"], "netstandard2.1": ["System.Composition.AttributedModel"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Composition.Hosting", "id": "System.Composition.Hosting", "version": "10.0.10", "sha512": "sha512-8rY5Z+Owu9AGZ2XnCqRTydhX1xoHz9qiisgpydo3PTETGcbPbGjIYu+Imzr3pHPWYPwtWIWr+5WT4b+abC+qVQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.Runtime"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.Runtime"], "net462": ["System.Composition.Runtime"], "net47": ["System.Composition.Runtime"], "net471": ["System.Composition.Runtime"], "net472": ["System.Composition.Runtime"], "net48": ["System.Composition.Runtime"], "net5.0": ["System.Composition.Runtime"], "net6.0": ["System.Composition.Runtime"], "net7.0": ["System.Composition.Runtime"], "net8.0": ["System.Composition.Runtime"], "net9.0": ["System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.Runtime"], "netstandard2.1": ["System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Composition.Runtime", "id": "System.Composition.Runtime", "version": "10.0.10", "sha512": "sha512-OU44yuMrt7hdqV61A3vh/nY52m1bWR9fUWKI0p8npg3oDggYdicD6RlfxwxOaWR4ZCLIhzuofgKpZdEKTPZFKw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Composition.TypedParts", "id": "System.Composition.TypedParts", "version": "10.0.10", "sha512": "sha512-iSJMibDOvZGigerJF4saJaLQK7piGopzifejMCne4/BmKgmRuMyQ6H/oN9/EGhbMlkr97c1apv62zSCxQke6/w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net462": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net47": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net471": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net472": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net48": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Configuration.ConfigurationManager", "id": "System.Configuration.ConfigurationManager", "version": "10.0.10", "sha512": "sha512-MBt+gvvOcB6YDkikO5AB0KzOkxfhVZ9XSR0NU97DaM98b5E/IFTbRdvflYMKZt7x4qIVlsH/x6WMcTRAw4ZyZg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Security.Cryptography.ProtectedData"], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Security.Cryptography.ProtectedData"], "net6.0": ["System.Security.Cryptography.ProtectedData"], "net7.0": ["System.Security.Cryptography.ProtectedData"], "net8.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net9.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Security.Cryptography.ProtectedData"], "netcoreapp2.1": ["System.Security.Cryptography.ProtectedData"], "netcoreapp2.2": ["System.Security.Cryptography.ProtectedData"], "netcoreapp3.0": ["System.Security.Cryptography.ProtectedData"], "netcoreapp3.1": ["System.Security.Cryptography.ProtectedData"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Security.Cryptography.ProtectedData"], "netstandard2.1": ["System.Security.Cryptography.ProtectedData"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Diagnostics.EventLog", "id": "System.Diagnostics.EventLog", "version": "10.0.10", "sha512": "sha512-+YqSLCCMkPCaJHzywlEEiz663YYzeH+WflcBQndlx3wpj0DlSo0r9ev+9ynv0+jPxcF+/dXyzYAYRTLCS1pIGg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.IO.Pipelines", "id": "System.IO.Pipelines", "version": "10.0.10", "sha512": "sha512-uJchtc574qQrjiemB8P1ChopZAmgr5FOysWQUue0O3OO5KPkTlozvw9Stq/Dvh6cm77FGcmtlLA4VFGZyVC24Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net462": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net47": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net471": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net472": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net48": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net5.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net6.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net7.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "System.Memory", "id": "System.Memory", "version": "4.6.3", "sha512": "sha512-NXcNYlWoXe5cz9sb8Huo6x2dCZVYkhwKtgE00n/MoI8V4ZI/7/t+EI5bOhQFlZfFjjqM8+U6prjU/aARt7H/tA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "System.Numerics.Vectors", "id": "System.Numerics.Vectors", "version": "4.6.1", "sha512": "sha512-/rkvpUeUPlCY/2qYVQKiUsj5IKaXZcy2+SQAGAfemAdyEF5AgIgYOFNSTMWDXo09JWFX9HB+wV1yCyi2Mwi3TA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Reflection.Metadata", "id": "System.Reflection.Metadata", "version": "10.0.8", "sha512": "sha512-wWf/RiVz/UVoMqYGr2X5z1wz1uktkIU0E+aGcFbffDNMU0kN3t5j3Yc+/8xC6GvT4+KjXDXumO/3ddS/cln5Pw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable"], "net462": ["System.Collections.Immutable"], "net47": ["System.Collections.Immutable"], "net471": ["System.Collections.Immutable"], "net472": ["System.Collections.Immutable"], "net48": ["System.Collections.Immutable"], "net5.0": ["System.Collections.Immutable"], "net6.0": ["System.Collections.Immutable"], "net7.0": ["System.Collections.Immutable"], "net8.0": ["System.Collections.Immutable"], "net9.0": ["System.Collections.Immutable"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable"], "netcoreapp2.1": ["System.Collections.Immutable"], "netcoreapp2.2": ["System.Collections.Immutable"], "netcoreapp3.0": ["System.Collections.Immutable"], "netcoreapp3.1": ["System.Collections.Immutable"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable"], "netstandard2.1": ["System.Collections.Immutable"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Reflection.MetadataLoadContext", "id": "System.Reflection.MetadataLoadContext", "version": "10.0.8", "sha512": "sha512-YcFpYWsCdnD5vjpskco7E87TD9g6v6nxow1Qu3/XrBlUEulEZOUfTSV5EP7mSSKMYgT3+fJK7zrijCeg+z3w9g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net462": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net47": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net471": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net472": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net48": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net5.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net6.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net7.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net8.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp2.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp2.2": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp3.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp3.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netstandard2.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Reflection.Metadata", "id": "System.Reflection.Metadata", "version": "10.0.10", "sha512": "sha512-YLol8JpRVrJJ+Me1RQlmXztNO7+O+wMp//h/I3hMQO17VtfEroEsHxkgcAkdBBLxes70sW/j31TrwN5eLbkJ7w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable"], "net462": ["System.Collections.Immutable"], "net47": ["System.Collections.Immutable"], "net471": ["System.Collections.Immutable"], "net472": ["System.Collections.Immutable"], "net48": ["System.Collections.Immutable"], "net5.0": ["System.Collections.Immutable"], "net6.0": ["System.Collections.Immutable"], "net7.0": ["System.Collections.Immutable"], "net8.0": ["System.Collections.Immutable"], "net9.0": ["System.Collections.Immutable"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable"], "netcoreapp2.1": ["System.Collections.Immutable"], "netcoreapp2.2": ["System.Collections.Immutable"], "netcoreapp3.0": ["System.Collections.Immutable"], "netcoreapp3.1": ["System.Collections.Immutable"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable"], "netstandard2.1": ["System.Collections.Immutable"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Reflection.MetadataLoadContext", "id": "System.Reflection.MetadataLoadContext", "version": "10.0.10", "sha512": "sha512-u41t/p9hzAhEDJHN0Uhk++V4lxX6nP4EoF85rdd2GQ8PsW7kinHLYH1/Ent6MHDhsAtfOI1atpCuPiPDh4DAgg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net462": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net47": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net471": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net472": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net48": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net5.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net6.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net7.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net8.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp2.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp2.2": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp3.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp3.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netstandard2.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "System.Runtime.CompilerServices.Unsafe", "id": "System.Runtime.CompilerServices.Unsafe", "version": "6.1.2", "sha512": "sha512-t2aXWJZBkAkRrTOnw31OBELKEVSDD5YvC3O5dXaHFsR66/nRTKm1y3Iq6NwFI5u5IlKrWYfdan66V+GKKkY8hQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Security.Cryptography.ProtectedData", "id": "System.Security.Cryptography.ProtectedData", "version": "10.0.8", "sha512": "sha512-LOVSTFOou3ekg+ou98m8tAC591BuTlTqEbSQv34UIjxcU0HvbZ7qLqCXSp/60Cx40Zd0YmeyXTGeARMgSXlWyg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory"], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Memory"], "net6.0": ["System.Memory"], "net7.0": ["System.Memory"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory"], "netcoreapp2.1": ["System.Memory"], "netcoreapp2.2": ["System.Memory"], "netcoreapp3.0": ["System.Memory"], "netcoreapp3.1": ["System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory"], "netstandard2.1": ["System.Memory"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Text.Encoding.CodePages", "id": "System.Text.Encoding.CodePages", "version": "10.0.8", "sha512": "sha512-xr2qHdT5yx3IOZ4bMkPY+1CGCIqzBC41kk9AHFvl/R3oNrEns5y4OUz4KRXk0UqY4FjiOXW6PtqdvDbSC2iYsQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
-            {"name": "System.Threading.Channels", "id": "System.Threading.Channels", "version": "10.0.8", "sha512": "sha512-DLFQGFJl9TNsW2KansRP+AvSO+HUoV6s8g/d93zw7IbGWm48uC6P0TIdzuJTtwHVwN+oQsQ0ReBdLVr+gL1Eqg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Security.Cryptography.ProtectedData", "id": "System.Security.Cryptography.ProtectedData", "version": "10.0.10", "sha512": "sha512-K2gtxewwwrGeWxClblSZneULZJ7P4Ln7Icrv5NKsn3ymrqbZTaWESJdNLPIWlUEiMrKoTPAcRlpiPUsFdeiv2w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory"], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Memory"], "net6.0": ["System.Memory"], "net7.0": ["System.Memory"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory"], "netcoreapp2.1": ["System.Memory"], "netcoreapp2.2": ["System.Memory"], "netcoreapp3.0": ["System.Memory"], "netcoreapp3.1": ["System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory"], "netstandard2.1": ["System.Memory"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Text.Encoding.CodePages", "id": "System.Text.Encoding.CodePages", "version": "10.0.10", "sha512": "sha512-bFLoXr02I+nK9gfMVVFnbtjAfQ9UlGF271ZyBn89G4XuaphkzIzM+LtEXTAaV1c1/odcTMI3/760LLBXae4AaQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "System.Threading.Channels", "id": "System.Threading.Channels", "version": "10.0.10", "sha512": "sha512-JJc9VdKP1htQGfLIRyVkrm09SJmmcVHJKEIeMyOxV2jjXEiPZpKQIcu4VZe3FLY86mSayIvlFSiPbhmCUOKGSg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "System.Threading.Tasks.Extensions", "id": "System.Threading.Tasks.Extensions", "version": "4.6.3", "sha512": "sha512-zWRHXIBnbfzQE1SamNoW9X5NjEcW/JNAtvVxGKd3bcg71wQVmoI3pDq+WUa2A+temXSNCm7707hmAFwwcYlK0A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Runtime.CompilerServices.Unsafe"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "xunit", "id": "xunit", "version": "2.9.3", "sha512": "sha512-3/ayVPC7NQWQENR5REbOgXYsbhoJsmpnxQa5pO4lxbjGbckOs62nsm4kLErzc8ng7V5Xz08uwVjMqaZGJiXCrg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net11": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net20": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net30": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net35": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net40": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net403": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net45": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net451": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net452": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net46": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net461": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net462": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net47": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net471": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net472": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net48": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net5.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net6.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net7.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net8.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net9.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp1.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp1.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.2": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp3.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp3.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.2": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.3": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.4": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.5": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.6": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard2.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard2.1": ["xunit.core", "xunit.assert", "xunit.analyzers"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "xunit.abstractions", "id": "xunit.abstractions", "version": "2.0.3", "sha512": "sha512-PKJri5f0qEQPFvgY6CZR9XG8JROlWSdC/ZYLkkDQuID++Egn+yWjB+Yf57AZ8U6GRlP7z33uDQ4/r5BZPer2JA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
diff --git a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index a8774769b98c..9c6f1d52bc65 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.7.78
+
+No user-facing changes.
+
+## 1.7.77
+
+No user-facing changes.
+
+## 1.7.76
+
+No user-facing changes.
+
+## 1.7.75
+
+No user-facing changes.
+
+## 1.7.74
+
+No user-facing changes.
+
+## 1.7.73
+
+No user-facing changes.
+
+## 1.7.72
+
+No user-facing changes.
+
 ## 1.7.71
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.72.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.72.md
new file mode 100644
index 000000000000..9ff61fe3c5d3
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.72.md
@@ -0,0 +1,3 @@
+## 1.7.72
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.73.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.73.md
new file mode 100644
index 000000000000..9670f3f83e28
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.73.md
@@ -0,0 +1,3 @@
+## 1.7.73
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.74.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.74.md
new file mode 100644
index 000000000000..3af579633adc
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.74.md
@@ -0,0 +1,3 @@
+## 1.7.74
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.75.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.75.md
new file mode 100644
index 000000000000..0793cd5cd065
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.75.md
@@ -0,0 +1,3 @@
+## 1.7.75
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.76.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.76.md
new file mode 100644
index 000000000000..902eae830166
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.76.md
@@ -0,0 +1,3 @@
+## 1.7.76
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.77.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.77.md
new file mode 100644
index 000000000000..14045aed3dd4
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.77.md
@@ -0,0 +1,3 @@
+## 1.7.77
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.78.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.78.md
new file mode 100644
index 000000000000..bd8bfdf80d16
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.78.md
@@ -0,0 +1,3 @@
+## 1.7.78
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
index 9cb591428908..5143d6ab6b9d 100644
--- a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.71
+lastReleaseVersion: 1.7.78
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index 9968c6570e7d..dd073904894b 100644
--- a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-all
-version: 1.7.72-dev
+version: 1.7.79-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index a8774769b98c..9c6f1d52bc65 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.7.78
+
+No user-facing changes.
+
+## 1.7.77
+
+No user-facing changes.
+
+## 1.7.76
+
+No user-facing changes.
+
+## 1.7.75
+
+No user-facing changes.
+
+## 1.7.74
+
+No user-facing changes.
+
+## 1.7.73
+
+No user-facing changes.
+
+## 1.7.72
+
+No user-facing changes.
+
 ## 1.7.71
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.72.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.72.md
new file mode 100644
index 000000000000..9ff61fe3c5d3
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.72.md
@@ -0,0 +1,3 @@
+## 1.7.72
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.73.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.73.md
new file mode 100644
index 000000000000..9670f3f83e28
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.73.md
@@ -0,0 +1,3 @@
+## 1.7.73
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.74.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.74.md
new file mode 100644
index 000000000000..3af579633adc
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.74.md
@@ -0,0 +1,3 @@
+## 1.7.74
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.75.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.75.md
new file mode 100644
index 000000000000..0793cd5cd065
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.75.md
@@ -0,0 +1,3 @@
+## 1.7.75
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.76.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.76.md
new file mode 100644
index 000000000000..902eae830166
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.76.md
@@ -0,0 +1,3 @@
+## 1.7.76
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.77.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.77.md
new file mode 100644
index 000000000000..14045aed3dd4
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.77.md
@@ -0,0 +1,3 @@
+## 1.7.77
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.78.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.78.md
new file mode 100644
index 000000000000..bd8bfdf80d16
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.78.md
@@ -0,0 +1,3 @@
+## 1.7.78
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
index 9cb591428908..5143d6ab6b9d 100644
--- a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.71
+lastReleaseVersion: 1.7.78
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index 9ccab68881a5..a1cccac9147f 100644
--- a/csharp/ql/campaigns/Solorigate/src/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-queries
-version: 1.7.72-dev
+version: 1.7.79-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/consistency-queries/SsaConsistency.ql b/csharp/ql/consistency-queries/SsaConsistency.ql
index 003e7ddd5e94..152258220a7f 100644
--- a/csharp/ql/consistency-queries/SsaConsistency.ql
+++ b/csharp/ql/consistency-queries/SsaConsistency.ql
@@ -1,6 +1,7 @@
 import csharp
 import semmle.code.csharp.dataflow.internal.SsaImpl as Impl
 import Impl::Consistency
+import Impl::DataFlowIntegration::DfConsistency
 import Ssa
 
 query predicate localDeclWithSsaDef(LocalVariableDeclExpr d) {
@@ -10,7 +11,7 @@ query predicate localDeclWithSsaDef(LocalVariableDeclExpr d) {
   exists(SsaExplicitWrite def |
     d = def.getDefinition().(AssignableDefinitions::LocalVariableDefinition).getDeclaration()
   |
-    not d = any(ForeachStmt fs).getVariableDeclExpr() and
+    not d = any(ForEachStmt fs).getVariableDeclExpr() and
     not d = any(SpecificCatchClause scc).getVariableDeclExpr() and
     not d.getVariable().getType() instanceof Struct and
     not d instanceof PatternExpr and
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/AttributeWebApp/AttributePocoController.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/AttributeWebApp/AttributePocoController.cs
new file mode 100644
index 000000000000..f4427cc21c48
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/AttributeWebApp/AttributePocoController.cs
@@ -0,0 +1,8 @@
+using Microsoft.AspNetCore.Mvc;
+
+[Route("api/attribute")]
+public class AttributePocoController
+{
+    [HttpGet]
+    public void Action(string input) => _ = GetType().Name + input;
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/AttributeWebApp/AttributeWebApp.csproj b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/AttributeWebApp/AttributeWebApp.csproj
new file mode 100644
index 000000000000..bddc74e0c784
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/AttributeWebApp/AttributeWebApp.csproj
@@ -0,0 +1,5 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/AttributeWebApp/ConventionOnlyController.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/AttributeWebApp/ConventionOnlyController.cs
new file mode 100644
index 000000000000..f1222ad5f181
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/AttributeWebApp/ConventionOnlyController.cs
@@ -0,0 +1,4 @@
+public class ConventionOnlyController
+{
+    public void Action(string input) => _ = GetType().Name + input;
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/AttributeWebApp/Program.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/AttributeWebApp/Program.cs
new file mode 100644
index 000000000000..8d74291b16a8
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/AttributeWebApp/Program.cs
@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder(args);
+builder.Services.AddControllers();
+
+var app = builder.Build();
+app.MapControllers();
+app.Run();
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/Controllers.expected b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/Controllers.expected
new file mode 100644
index 000000000000..d6ee73a2694f
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/Controllers.expected
@@ -0,0 +1,7 @@
+| AdminAreaFallbackController.cs | AreaFallbackController |
+| AttributePocoController.cs | AttributePocoController |
+| FallbackOnlyController.cs | FallbackOnlyController |
+| GeneratedController.cs | GeneratedController |
+| IncludedController.cs | IncludedController |
+| StructuralController.cs | StructuralController |
+| WebPocoController.cs | WebPocoController |
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/Controllers.ql b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/Controllers.ql
new file mode 100644
index 000000000000..325f55434f5f
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/Controllers.ql
@@ -0,0 +1,6 @@
+import csharp
+import semmle.code.csharp.frameworks.microsoft.AspNetCore
+
+from MicrosoftAspNetCoreMvcController controller
+where controller.fromSource()
+select controller.getFile().getBaseName(), controller.getName()
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/GeneratedControllers/GeneratedController.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/GeneratedControllers/GeneratedController.cs
new file mode 100644
index 000000000000..0fe26a40d27b
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/GeneratedControllers/GeneratedController.cs
@@ -0,0 +1,6 @@
+namespace GeneratedControllers;
+
+public class GeneratedController
+{
+    public void Action(string input) => _ = GetType().Name + input;
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/GeneratedControllers/GeneratedControllers.csproj b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/GeneratedControllers/GeneratedControllers.csproj
new file mode 100644
index 000000000000..10f1ac4e07e4
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/GeneratedControllers/GeneratedControllers.csproj
@@ -0,0 +1,5 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/IncludedControllers/IncludedController.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/IncludedControllers/IncludedController.cs
new file mode 100644
index 000000000000..04704dd9b064
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/IncludedControllers/IncludedController.cs
@@ -0,0 +1,6 @@
+namespace IncludedControllers;
+
+public class IncludedController
+{
+    public void Action(string input) => _ = GetType().Name + input;
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/IncludedControllers/IncludedControllers.csproj b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/IncludedControllers/IncludedControllers.csproj
new file mode 100644
index 000000000000..10f1ac4e07e4
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/IncludedControllers/IncludedControllers.csproj
@@ -0,0 +1,5 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/AdminAreaFallbackController.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/AdminAreaFallbackController.cs
new file mode 100644
index 000000000000..c64aea73ddd1
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/AdminAreaFallbackController.cs
@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace AdminArea;
+
+[Area("Admin")]
+public class AreaFallbackController
+{
+    public void Index(string input) => _ = GetType().Name + input;
+}
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/FallbackOnlyController.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/FallbackOnlyController.cs
new file mode 100644
index 000000000000..1716d49f2296
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/FallbackOnlyController.cs
@@ -0,0 +1,4 @@
+public class FallbackOnlyController
+{
+    public void Index(string input) => _ = GetType().Name + input;
+}
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/OtherAreaFallbackController.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/OtherAreaFallbackController.cs
new file mode 100644
index 000000000000..10849896f531
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/OtherAreaFallbackController.cs
@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace OtherArea;
+
+[Area("Other")]
+public class AreaFallbackController
+{
+    public void Index(string input) => _ = GetType().Name + input;
+}
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/Program.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/Program.cs
new file mode 100644
index 000000000000..bb27696d84b5
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/Program.cs
@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder(args);
+builder.Services.AddControllers();
+
+var app = builder.Build();
+app.MapFallbackToController("Index", "FallbackOnly");
+app.MapFallbackToAreaController("admin/{*path:nonfile}", "Index", "AreaFallback", "Admin");
+app.Run();
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/StructuralController.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/StructuralController.cs
new file mode 100644
index 000000000000..dd9e5e2534b5
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/StructuralController.cs
@@ -0,0 +1,6 @@
+using Microsoft.AspNetCore.Mvc;
+
+public class StructuralController : ControllerBase
+{
+    public void Action(string input) => _ = GetType().Name + input;
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/UnmappedPocoController.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/UnmappedPocoController.cs
new file mode 100644
index 000000000000..99514ceb2c3f
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/UnmappedPocoController.cs
@@ -0,0 +1,4 @@
+public class UnmappedPocoController
+{
+    public void Action(string input) => _ = GetType().Name + input;
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/UnmappedWebApp.csproj b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/UnmappedWebApp.csproj
new file mode 100644
index 000000000000..bddc74e0c784
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/UnmappedWebApp/UnmappedWebApp.csproj
@@ -0,0 +1,5 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/Unrelated/ThrottlingController.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/Unrelated/ThrottlingController.cs
new file mode 100644
index 000000000000..d4277061e9fa
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/Unrelated/ThrottlingController.cs
@@ -0,0 +1,4 @@
+public class ThrottlingController
+{
+    public void Initialize(string input) => _ = GetType().Name + input;
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/Unrelated/Unrelated.csproj b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/Unrelated/Unrelated.csproj
new file mode 100644
index 000000000000..10f1ac4e07e4
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/Unrelated/Unrelated.csproj
@@ -0,0 +1,5 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/WebApp/ApplicationParts.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/WebApp/ApplicationParts.cs
new file mode 100644
index 000000000000..a7622ef5f9be
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/WebApp/ApplicationParts.cs
@@ -0,0 +1,3 @@
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+
+[assembly: ApplicationPart("GeneratedControllers")]
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/WebApp/Program.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/WebApp/Program.cs
new file mode 100644
index 000000000000..a58be59888d9
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/WebApp/Program.cs
@@ -0,0 +1,12 @@
+using IncludedControllers;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder(args);
+builder.Services
+    .AddControllers()
+    .AddApplicationPart(typeof(IncludedController).Assembly);
+
+var app = builder.Build();
+app.MapControllerRoute("default", "{controller}/{action}");
+app.Run();
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/WebApp/WebApp.csproj b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/WebApp/WebApp.csproj
new file mode 100644
index 000000000000..56bc24531254
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/WebApp/WebApp.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../GeneratedControllers/GeneratedControllers.csproj" />
+    <ProjectReference Include="../IncludedControllers/IncludedControllers.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/WebApp/WebPocoController.cs b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/WebApp/WebPocoController.cs
new file mode 100644
index 000000000000..338ebd5abe67
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/WebApp/WebPocoController.cs
@@ -0,0 +1,4 @@
+public class WebPocoController
+{
+    public void Action(string input) => _ = GetType().Name + input;
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/global.json b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/global.json
new file mode 100644
index 000000000000..7307ac0a4729
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "10.0.201"
+  }
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/test.py b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/test.py
new file mode 100644
index 000000000000..8e705bd10c06
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/aspnetcore_controller_discovery/test.py
@@ -0,0 +1,9 @@
+def test(codeql, csharp):
+    codeql.database.create(
+        command=[
+            "dotnet build -t:Rebuild WebApp/WebApp.csproj",
+            "dotnet build -t:Rebuild AttributeWebApp/AttributeWebApp.csproj",
+            "dotnet build -t:Rebuild UnmappedWebApp/UnmappedWebApp.csproj",
+            "dotnet build -t:Rebuild Unrelated/Unrelated.csproj",
+        ]
+    )
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_11/Program.cs b/csharp/ql/integration-tests/all-platforms/dotnet_11/Program.cs
new file mode 100644
index 000000000000..bd44629f7e23
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_11/Program.cs
@@ -0,0 +1 @@
+Console.WriteLine($"<arguments>{string.Join(",", args)}</arguments>");
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_11/dotnet_build.csproj b/csharp/ql/integration-tests/all-platforms/dotnet_11/dotnet_build.csproj
new file mode 100644
index 000000000000..5bf6c9b8cff2
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_11/dotnet_build.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net11.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_11/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_11/global.json
new file mode 100644
index 000000000000..e17f16502bb0
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_11/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "11.0.100-rc.3.26522.148"
+    }
+}
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_11/test.py b/csharp/ql/integration-tests/all-platforms/dotnet_11/test.py
new file mode 100644
index 000000000000..1f1fe52a4e5e
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_11/test.py
@@ -0,0 +1,7 @@
+import pytest
+
+def test1(codeql, csharp):
+    codeql.database.create()
+
+def test2(codeql, csharp):
+    codeql.database.create(build_mode="none")
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.expected b/csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.expected
index 6d91b2700226..d0b09f83622c 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.expected
+++ b/csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.expected
@@ -1,21 +1,21 @@
-| All NuGet feeds reachable | 1.0 |
-| Failed project restore with missing package error | 0.0 |
-| Failed project restore with package source error | 0.0 |
-| Failed solution restore with missing package error | 0.0 |
-| Failed solution restore with package source error | 0.0 |
-| Inherited NuGet feed count | 1.0 |
-| NuGet feed responsiveness checked | 1.0 |
-| Project files on filesystem | 1.0 |
-| Reachable fallback NuGet feed count | 1.0 |
-| Resource extraction enabled | 1.0 |
-| Restored .NET framework variants | 1.0 |
-| Restored projects through solution files | 0.0 |
-| Solution files on filesystem | 0.0 |
-| Source files generated | 2.0 |
-| Source files on filesystem | 1.0 |
-| Successfully restored project files | 1.0 |
-| Successfully restored solution files | 0.0 |
-| Unresolved references | 0.0 |
-| UseWPF set | 0.0 |
-| UseWindowsForms set | 0.0 |
-| WebView extraction enabled | 1.0 |
+| All NuGet feeds reachable | 1 |
+| Failed project restore with missing package error | 0 |
+| Failed project restore with package source error | 0 |
+| Failed solution restore with missing package error | 0 |
+| Failed solution restore with package source error | 0 |
+| Inherited NuGet feed count | 1 |
+| NuGet feed responsiveness checked | 1 |
+| Project files on filesystem | 1 |
+| Reachable fallback NuGet feed count | 1 |
+| Resource extraction enabled | 1 |
+| Restored .NET framework variants | 1 |
+| Restored projects through solution files | 0 |
+| Solution files on filesystem | 0 |
+| Source files generated | 2 |
+| Source files on filesystem | 1 |
+| Successfully restored project files | 1 |
+| Successfully restored solution files | 0 |
+| Unresolved references | 0 |
+| UseWPF set | 0 |
+| UseWindowsForms set | 0 |
+| WebView extraction enabled | 1 |
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.ql b/csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.ql
index a96c2fd99a69..28898f02fd24 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.ql
+++ b/csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.ql
@@ -1,16 +1,9 @@
 import csharp
 import semmle.code.csharp.commons.Diagnostics
 
-query predicate compilationInfo(string key, float value) {
+query predicate compilationInfo(string key, string value) {
   key != "Resolved references" and
   key != "Resolved assembly conflicts" and
   not key.matches("Compiler diagnostic count for%") and
-  exists(Compilation c, string infoKey, string infoValue | infoValue = c.getInfo(infoKey) |
-    key = infoKey and
-    value = infoValue.toFloat()
-    or
-    not exists(infoValue.toFloat()) and
-    key = infoKey + ": " + infoValue and
-    value = 1
-  )
+  value = any(Compilation c).getInfo(key)
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_slnx/CompilationInfo.expected b/csharp/ql/integration-tests/all-platforms/standalone_slnx/CompilationInfo.expected
index 82cf0509d345..94716c3255ae 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_slnx/CompilationInfo.expected
+++ b/csharp/ql/integration-tests/all-platforms/standalone_slnx/CompilationInfo.expected
@@ -1,21 +1,21 @@
-| All NuGet feeds reachable | 1.0 |
-| Failed project restore with missing package error | 0.0 |
-| Failed project restore with package source error | 0.0 |
-| Failed solution restore with missing package error | 0.0 |
-| Failed solution restore with package source error | 0.0 |
-| Inherited NuGet feed count | 1.0 |
-| NuGet feed responsiveness checked | 1.0 |
-| Project files on filesystem | 2.0 |
-| Reachable fallback NuGet feed count | 1.0 |
-| Resource extraction enabled | 0.0 |
-| Restored .NET framework variants | 1.0 |
-| Restored projects through solution files | 2.0 |
-| Solution files on filesystem | 1.0 |
-| Source files generated | 1.0 |
-| Source files on filesystem | 2.0 |
-| Successfully restored project files | 0.0 |
-| Successfully restored solution files | 1.0 |
-| Unresolved references | 0.0 |
-| UseWPF set | 0.0 |
-| UseWindowsForms set | 0.0 |
-| WebView extraction enabled | 1.0 |
+| All NuGet feeds reachable | 1 |
+| Failed project restore with missing package error | 0 |
+| Failed project restore with package source error | 0 |
+| Failed solution restore with missing package error | 0 |
+| Failed solution restore with package source error | 0 |
+| Inherited NuGet feed count | 1 |
+| NuGet feed responsiveness checked | 1 |
+| Project files on filesystem | 2 |
+| Reachable fallback NuGet feed count | 1 |
+| Resource extraction enabled | 0 |
+| Restored .NET framework variants | 1 |
+| Restored projects through solution files | 2 |
+| Solution files on filesystem | 1 |
+| Source files generated | 1 |
+| Source files on filesystem | 2 |
+| Successfully restored project files | 0 |
+| Successfully restored solution files | 1 |
+| Unresolved references | 0 |
+| UseWPF set | 0 |
+| UseWindowsForms set | 0 |
+| WebView extraction enabled | 1 |
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_slnx/CompilationInfo.ql b/csharp/ql/integration-tests/all-platforms/standalone_slnx/CompilationInfo.ql
index 078e352be4d9..e6dc52674f37 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_slnx/CompilationInfo.ql
+++ b/csharp/ql/integration-tests/all-platforms/standalone_slnx/CompilationInfo.ql
@@ -1,16 +1,9 @@
 import csharp
 import semmle.code.csharp.commons.Diagnostics
 
-query predicate compilationInfo(string key, float value) {
+query predicate compilationInfo(string key, string value) {
   key != "Resolved references" and
   key != "Resolved assembly conflicts" and
   not key.matches(["Compiler diagnostic count for%", "Extractor message count for group%"]) and
-  exists(Compilation c, string infoKey, string infoValue | infoValue = c.getInfo(infoKey) |
-    key = infoKey and
-    value = infoValue.toFloat()
-    or
-    not exists(infoValue.toFloat()) and
-    key = infoKey + ": " + infoValue and
-    value = 1
-  )
+  value = any(Compilation c).getInfo(key)
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.expected b/csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.expected
index 63ddd4903f3e..ee79179d4fae 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.expected
+++ b/csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.expected
@@ -1,21 +1,21 @@
-| All NuGet feeds reachable | 1.0 |
-| Failed project restore with missing package error | 0.0 |
-| Failed project restore with package source error | 0.0 |
-| Failed solution restore with missing package error | 0.0 |
-| Failed solution restore with package source error | 0.0 |
-| Inherited NuGet feed count | 1.0 |
-| NuGet feed responsiveness checked | 1.0 |
-| Project files on filesystem | 1.0 |
-| Reachable fallback NuGet feed count | 1.0 |
-| Resource extraction enabled | 0.0 |
-| Restored .NET framework variants | 1.0 |
-| Restored projects through solution files | 0.0 |
-| Solution files on filesystem | 0.0 |
-| Source files generated | 1.0 |
-| Source files on filesystem | 3.0 |
-| Successfully restored project files | 1.0 |
-| Successfully restored solution files | 0.0 |
-| Unresolved references | 0.0 |
-| UseWPF set | 0.0 |
-| UseWindowsForms set | 1.0 |
-| WebView extraction enabled | 1.0 |
+| All NuGet feeds reachable | 1 |
+| Failed project restore with missing package error | 0 |
+| Failed project restore with package source error | 0 |
+| Failed solution restore with missing package error | 0 |
+| Failed solution restore with package source error | 0 |
+| Inherited NuGet feed count | 1 |
+| NuGet feed responsiveness checked | 1 |
+| Project files on filesystem | 1 |
+| Reachable fallback NuGet feed count | 1 |
+| Resource extraction enabled | 0 |
+| Restored .NET framework variants | 1 |
+| Restored projects through solution files | 0 |
+| Solution files on filesystem | 0 |
+| Source files generated | 1 |
+| Source files on filesystem | 3 |
+| Successfully restored project files | 1 |
+| Successfully restored solution files | 0 |
+| Unresolved references | 0 |
+| UseWPF set | 0 |
+| UseWindowsForms set | 1 |
+| WebView extraction enabled | 1 |
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.ql b/csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.ql
index 078e352be4d9..e6dc52674f37 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.ql
+++ b/csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.ql
@@ -1,16 +1,9 @@
 import csharp
 import semmle.code.csharp.commons.Diagnostics
 
-query predicate compilationInfo(string key, float value) {
+query predicate compilationInfo(string key, string value) {
   key != "Resolved references" and
   key != "Resolved assembly conflicts" and
   not key.matches(["Compiler diagnostic count for%", "Extractor message count for group%"]) and
-  exists(Compilation c, string infoKey, string infoValue | infoValue = c.getInfo(infoKey) |
-    key = infoKey and
-    value = infoValue.toFloat()
-    or
-    not exists(infoValue.toFloat()) and
-    key = infoKey + ": " + infoValue and
-    value = 1
-  )
+  value = any(Compilation c).getInfo(key)
 }
diff --git a/csharp/ql/integration-tests/posix/conftest.py b/csharp/ql/integration-tests/posix/conftest.py
index 543bc046c982..ff1b954d1736 100644
--- a/csharp/ql/integration-tests/posix/conftest.py
+++ b/csharp/ql/integration-tests/posix/conftest.py
@@ -5,15 +5,10 @@ def _supports_mono_nuget():
     """
     Helper function to determine if the current platform supports Mono and nuget.
     
-    Returns True if running on Linux or on macOS x86_64 (excluding macos-15 and macos-26).
-    macOS ARM runners (macos-15 and macos-26) are excluded due to issues with Mono and nuget.
+    Returns True on Ubuntu before 26.04 and on macOS x86_64 before macOS 15. Linux other than
+    Ubuntu is not selected, as we do not test on it.
+    Ubuntu dropped the `mono-complete` package in 26.04, and mono is end-of-life, its own apt
+    repository publishing nothing newer than Ubuntu 20.04, so there is nothing to fall back on.
+    macOS 15 and later are ARM runners, which have issues with Mono and nuget.
     """
-    return (
-        runs_on.linux
-        or (
-            runs_on.macos
-            and runs_on.x86_64
-            and not runs_on.macos_15
-            and not runs_on.macos_26
-        )
-    )
+    return runs_on.ubuntu < 2604 or (runs_on.macos < 15 and runs_on.x86_64)
diff --git a/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality-extended.qls.expected b/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality-extended.qls.expected
index c6361fe69c52..931f5f372d40 100644
--- a/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality-extended.qls.expected
+++ b/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality-extended.qls.expected
@@ -93,6 +93,7 @@ ql/csharp/ql/src/Likely Bugs/UncheckedCastInEquals.ql
 ql/csharp/ql/src/Linq/BadMultipleIteration.ql
 ql/csharp/ql/src/Linq/MissedAllOpportunity.ql
 ql/csharp/ql/src/Linq/MissedCastOpportunity.ql
+ql/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunity.ql
 ql/csharp/ql/src/Linq/MissedOfTypeOpportunity.ql
 ql/csharp/ql/src/Linq/MissedSelectOpportunity.ql
 ql/csharp/ql/src/Linq/MissedWhereOpportunity.ql
diff --git a/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality.qls.expected b/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality.qls.expected
index b944b848df8e..420c53f9f277 100644
--- a/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality.qls.expected
+++ b/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality.qls.expected
@@ -55,6 +55,7 @@ ql/csharp/ql/src/Likely Bugs/StringBuilderCharInit.ql
 ql/csharp/ql/src/Likely Bugs/UncheckedCastInEquals.ql
 ql/csharp/ql/src/Linq/MissedAllOpportunity.ql
 ql/csharp/ql/src/Linq/MissedCastOpportunity.ql
+ql/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunity.ql
 ql/csharp/ql/src/Linq/MissedOfTypeOpportunity.ql
 ql/csharp/ql/src/Linq/MissedSelectOpportunity.ql
 ql/csharp/ql/src/Linq/MissedWhereOpportunity.ql
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_executing_runtime/Assemblies.ql b/csharp/ql/integration-tests/posix/standalone_dependencies_executing_runtime/Assemblies.ql
index b5634fb7b96a..ec5297f39aa4 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_executing_runtime/Assemblies.ql
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_executing_runtime/Assemblies.ql
@@ -3,7 +3,7 @@ import csharp
 private string getPath(Assembly a) {
   not a.getCompilation().getOutputAssembly() = a and
   exists(string s | s = a.getFile().getAbsolutePath() |
-    exists(string sub | sub = "csharp/tools/" + ["osx64", "linux64"] |
+    exists(string sub | sub = "csharp/tools/" + ["osx64", "linux64", "linux-arm64"] |
       result = "[...]/csharp/tools/[...]" + s.substring(s.indexOf(sub) + sub.length(), s.length())
     )
     or
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_clear/CompilationInfo.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_clear/CompilationInfo.expected
index ff0b29da33fa..e8a0b5897082 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_clear/CompilationInfo.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_clear/CompilationInfo.expected
@@ -1,22 +1,22 @@
-| All NuGet feeds reachable | 1.0 |
-| Failed project restore with missing package error | 0.0 |
-| Failed project restore with package source error | 0.0 |
-| Failed solution restore with missing package error | 0.0 |
-| Failed solution restore with package source error | 0.0 |
-| Inherited NuGet feed count | 1.0 |
-| NuGet feed responsiveness checked | 1.0 |
-| Project files on filesystem | 1.0 |
-| Reachable fallback NuGet feed count | 1.0 |
-| Resolved assembly conflicts | 0.0 |
-| Resource extraction enabled | 0.0 |
-| Restored .NET framework variants | 1.0 |
-| Restored projects through solution files | 0.0 |
-| Solution files on filesystem | 0.0 |
-| Source files generated | 0.0 |
-| Source files on filesystem | 1.0 |
-| Successfully restored project files | 1.0 |
-| Successfully restored solution files | 0.0 |
-| Unresolved references | 0.0 |
-| UseWPF set | 0.0 |
-| UseWindowsForms set | 0.0 |
-| WebView extraction enabled | 1.0 |
+| All NuGet feeds reachable | 1 |
+| Failed project restore with missing package error | 0 |
+| Failed project restore with package source error | 0 |
+| Failed solution restore with missing package error | 0 |
+| Failed solution restore with package source error | 0 |
+| Inherited NuGet feed count | 1 |
+| NuGet feed responsiveness checked | 1 |
+| Project files on filesystem | 1 |
+| Reachable fallback NuGet feed count | 1 |
+| Resolved assembly conflicts | 0 |
+| Resource extraction enabled | 0 |
+| Restored .NET framework variants | 1 |
+| Restored projects through solution files | 0 |
+| Solution files on filesystem | 0 |
+| Source files generated | 0 |
+| Source files on filesystem | 1 |
+| Successfully restored project files | 1 |
+| Successfully restored solution files | 0 |
+| Unresolved references | 0 |
+| UseWPF set | 0 |
+| UseWindowsForms set | 0 |
+| WebView extraction enabled | 1 |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_clear/CompilationInfo.ql b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_clear/CompilationInfo.ql
index 073ffe3b224d..ae7505a8b0be 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_clear/CompilationInfo.ql
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_clear/CompilationInfo.ql
@@ -1,15 +1,8 @@
 import csharp
 import semmle.code.csharp.commons.Diagnostics
 
-query predicate compilationInfo(string key, float value) {
+query predicate compilationInfo(string key, string value) {
   key != "Resolved references" and
   not key.matches("Compiler diagnostic count for%") and
-  exists(Compilation c, string infoKey, string infoValue | infoValue = c.getInfo(infoKey) |
-    key = infoKey and
-    value = infoValue.toFloat()
-    or
-    not exists(infoValue.toFloat()) and
-    key = infoKey + ": " + infoValue and
-    value = 1
-  )
+  value = any(Compilation c).getInfo(key)
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/CompilationInfo.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/CompilationInfo.expected
index 4acd4f54e8a6..c5cb911d3731 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/CompilationInfo.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/CompilationInfo.expected
@@ -1,24 +1,25 @@
-| All NuGet feeds reachable | 0.0 |
-| Failed project restore with missing package error | 1.0 |
-| Failed project restore with package source error | 0.0 |
-| Failed solution restore with missing package error | 0.0 |
-| Failed solution restore with package source error | 0.0 |
-| Fallback nuget restore | 1.0 |
-| Inherited NuGet feed count | 1.0 |
-| NuGet feed responsiveness checked | 1.0 |
-| Project files on filesystem | 1.0 |
-| Reachable fallback NuGet feed count | 1.0 |
-| Resolved assembly conflicts | 7.0 |
-| Resource extraction enabled | 0.0 |
-| Restored .NET framework variants | 0.0 |
-| Restored projects through solution files | 0.0 |
-| Solution files on filesystem | 1.0 |
-| Source files generated | 0.0 |
-| Source files on filesystem | 1.0 |
-| Successfully ran fallback nuget restore | 1.0 |
-| Successfully restored project files | 0.0 |
-| Successfully restored solution files | 1.0 |
-| Unresolved references | 0.0 |
-| UseWPF set | 0.0 |
-| UseWindowsForms set | 0.0 |
-| WebView extraction enabled | 1.0 |
+| All NuGet feeds reachable | 0 |
+| Failed project restore with missing package error | 1 |
+| Failed project restore with package source error | 0 |
+| Failed solution restore with missing package error | 0 |
+| Failed solution restore with package source error | 0 |
+| Fallback nuget restore | 1 |
+| Inherited NuGet feed count | 1 |
+| NuGet feed responsiveness checked | 1 |
+| Project files on filesystem | 1 |
+| Reachable fallback NuGet feed count | 1 |
+| Resolved assembly conflicts | 7 |
+| Resource extraction enabled | 0 |
+| Restored .NET framework variants | 0 |
+| Restored projects through solution files | 0 |
+| Solution files on filesystem | 1 |
+| Source files generated | 0 |
+| Source files on filesystem | 1 |
+| Successfully ran fallback nuget restore | 1 |
+| Successfully restored project files | 0 |
+| Successfully restored solution files | 1 |
+| Unreachable NuGet feeds | https://abc.abc/packages/ |
+| Unresolved references | 0 |
+| UseWPF set | 0 |
+| UseWindowsForms set | 0 |
+| WebView extraction enabled | 1 |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/CompilationInfo.ql b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/CompilationInfo.ql
index 073ffe3b224d..ae7505a8b0be 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/CompilationInfo.ql
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/CompilationInfo.ql
@@ -1,15 +1,8 @@
 import csharp
 import semmle.code.csharp.commons.Diagnostics
 
-query predicate compilationInfo(string key, float value) {
+query predicate compilationInfo(string key, string value) {
   key != "Resolved references" and
   not key.matches("Compiler diagnostic count for%") and
-  exists(Compilation c, string infoKey, string infoValue | infoValue = c.getInfo(infoKey) |
-    key = infoKey and
-    value = infoValue.toFloat()
-    or
-    not exists(infoValue.toFloat()) and
-    key = infoKey + ": " + infoValue and
-    value = 1
-  )
+  value = any(Compilation c).getInfo(key)
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.expected
index 5a7abcf543c8..680a7960a06c 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.expected
@@ -1,17 +1,25 @@
-| All NuGet feeds reachable | 0.0 |
-| Fallback nuget restore | 1.0 |
-| Inherited NuGet feed count | 1.0 |
-| NuGet feed responsiveness checked | 1.0 |
-| Project files on filesystem | 1.0 |
-| Reachable fallback NuGet feed count | 1.0 |
-| Resolved assembly conflicts | 7.0 |
-| Resource extraction enabled | 0.0 |
-| Restored .NET framework variants | 0.0 |
-| Solution files on filesystem | 1.0 |
-| Source files generated | 0.0 |
-| Source files on filesystem | 1.0 |
-| Successfully ran fallback nuget restore | 1.0 |
-| Unresolved references | 0.0 |
-| UseWPF set | 0.0 |
-| UseWindowsForms set | 0.0 |
-| WebView extraction enabled | 1.0 |
+| All NuGet feeds reachable | 0 |
+| Failed project restore with missing package error | 1 |
+| Failed project restore with package source error | 0 |
+| Failed solution restore with missing package error | 0 |
+| Failed solution restore with package source error | 0 |
+| Fallback nuget restore | 1 |
+| Inherited NuGet feed count | 1 |
+| NuGet feed responsiveness checked | 1 |
+| Project files on filesystem | 1 |
+| Reachable fallback NuGet feed count | 1 |
+| Resolved assembly conflicts | 7 |
+| Resource extraction enabled | 0 |
+| Restored .NET framework variants | 0 |
+| Restored projects through solution files | 0 |
+| Solution files on filesystem | 1 |
+| Source files generated | 0 |
+| Source files on filesystem | 1 |
+| Successfully ran fallback nuget restore | 1 |
+| Successfully restored project files | 0 |
+| Successfully restored solution files | 1 |
+| Unreachable NuGet feeds | https://localhost:53/packages/, https://localhost:80/packages/ |
+| Unresolved references | 0 |
+| UseWPF set | 0 |
+| UseWindowsForms set | 0 |
+| WebView extraction enabled | 1 |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.ql b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.ql
index 073ffe3b224d..ae7505a8b0be 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.ql
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.ql
@@ -1,15 +1,8 @@
 import csharp
 import semmle.code.csharp.commons.Diagnostics
 
-query predicate compilationInfo(string key, float value) {
+query predicate compilationInfo(string key, string value) {
   key != "Resolved references" and
   not key.matches("Compiler diagnostic count for%") and
-  exists(Compilation c, string infoKey, string infoValue | infoValue = c.getInfo(infoKey) |
-    key = infoKey and
-    value = infoValue.toFloat()
-    or
-    not exists(infoValue.toFloat()) and
-    key = infoKey + ": " + infoValue and
-    value = 1
-  )
+  value = any(Compilation c).getInfo(key)
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/diagnostics.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/diagnostics.expected
index bbd2081f4554..074e4bd48ae9 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/diagnostics.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/diagnostics.expected
@@ -27,12 +27,12 @@
   }
 }
 {
-  "markdownMessage": "Found unreachable NuGet feed in C# analysis with build-mode 'none'. This may cause missing dependencies in the analysis.",
+  "markdownMessage": "Found unreachable NuGet feeds in C# analysis with build-mode 'none':\n\n- `https://localhost:53/packages/`\n- `https://localhost:80/packages/`\n\nThis may cause missing dependencies in the analysis.",
   "severity": "note",
   "source": {
     "extractorName": "csharp",
     "id": "csharp/autobuilder/buildless/unreachable-feed",
-    "name": "Found unreachable NuGet feed in C# analysis with build-mode 'none'"
+    "name": "Found unreachable NuGet feeds in C# analysis with build-mode 'none'"
   },
   "visibility": {
     "cliSummaryTable": true,
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/CompilationInfo.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/CompilationInfo.expected
index 9cc03f2f5372..384d64a59855 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/CompilationInfo.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/CompilationInfo.expected
@@ -1,17 +1,25 @@
-| All NuGet feeds reachable | 0.0 |
-| Fallback nuget restore | 1.0 |
-| Inherited NuGet feed count | 1.0 |
-| NuGet feed responsiveness checked | 1.0 |
-| Project files on filesystem | 1.0 |
-| Reachable fallback NuGet feed count | 2.0 |
-| Resolved assembly conflicts | 7.0 |
-| Resource extraction enabled | 0.0 |
-| Restored .NET framework variants | 0.0 |
-| Solution files on filesystem | 1.0 |
-| Source files generated | 0.0 |
-| Source files on filesystem | 1.0 |
-| Successfully ran fallback nuget restore | 1.0 |
-| Unresolved references | 0.0 |
-| UseWPF set | 0.0 |
-| UseWindowsForms set | 0.0 |
-| WebView extraction enabled | 1.0 |
+| All NuGet feeds reachable | 0 |
+| Failed project restore with missing package error | 1 |
+| Failed project restore with package source error | 0 |
+| Failed solution restore with missing package error | 0 |
+| Failed solution restore with package source error | 0 |
+| Fallback nuget restore | 1 |
+| Inherited NuGet feed count | 1 |
+| NuGet feed responsiveness checked | 1 |
+| Project files on filesystem | 1 |
+| Reachable fallback NuGet feed count | 2 |
+| Resolved assembly conflicts | 7 |
+| Resource extraction enabled | 0 |
+| Restored .NET framework variants | 0 |
+| Restored projects through solution files | 0 |
+| Solution files on filesystem | 1 |
+| Source files generated | 0 |
+| Source files on filesystem | 1 |
+| Successfully ran fallback nuget restore | 1 |
+| Successfully restored project files | 0 |
+| Successfully restored solution files | 1 |
+| Unreachable NuGet feeds | https://www.nuget.org/api/v2/ |
+| Unresolved references | 0 |
+| UseWPF set | 0 |
+| UseWindowsForms set | 0 |
+| WebView extraction enabled | 1 |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/CompilationInfo.ql b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/CompilationInfo.ql
index 073ffe3b224d..ae7505a8b0be 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/CompilationInfo.ql
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/CompilationInfo.ql
@@ -1,15 +1,8 @@
 import csharp
 import semmle.code.csharp.commons.Diagnostics
 
-query predicate compilationInfo(string key, float value) {
+query predicate compilationInfo(string key, string value) {
   key != "Resolved references" and
   not key.matches("Compiler diagnostic count for%") and
-  exists(Compilation c, string infoKey, string infoValue | infoValue = c.getInfo(infoKey) |
-    key = infoKey and
-    value = infoValue.toFloat()
-    or
-    not exists(infoValue.toFloat()) and
-    key = infoKey + ": " + infoValue and
-    value = 1
-  )
+  value = any(Compilation c).getInfo(key)
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/diagnostics.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/diagnostics.expected
index bbd2081f4554..66867fd38eeb 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/diagnostics.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/diagnostics.expected
@@ -27,12 +27,12 @@
   }
 }
 {
-  "markdownMessage": "Found unreachable NuGet feed in C# analysis with build-mode 'none'. This may cause missing dependencies in the analysis.",
+  "markdownMessage": "Found unreachable NuGet feeds in C# analysis with build-mode 'none':\n\n- `https://www.nuget.org/api/v2/`\n\nThis may cause missing dependencies in the analysis.",
   "severity": "note",
   "source": {
     "extractorName": "csharp",
     "id": "csharp/autobuilder/buildless/unreachable-feed",
-    "name": "Found unreachable NuGet feed in C# analysis with build-mode 'none'"
+    "name": "Found unreachable NuGet feeds in C# analysis with build-mode 'none'"
   },
   "visibility": {
     "cliSummaryTable": true,
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index 3ea969a9e9a5..3084acb9f3d2 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,3 +1,59 @@
+## 7.4.2
+
+### Minor Analysis Improvements
+
+* Rolled back the change that set proxy and certificate environment variables for the subprocess that invokes the NuGet CLI because the environment variables were only partially respected by the target process in some cases.
+
+## 7.4.1
+
+### Minor Analysis Improvements
+
+* Avoid logging warnings when there are no explicit or inherited feeds to check for reachability.
+* The subprocess for the NuGet CLI is now provided with the proxy and certificate environment variables needed to access private registries if any are configured.
+* Added support for data flow through positional patterns in `is` expressions and `switch` cases.
+
+## 7.4.0
+
+### Major Analysis Improvements
+
+* Fixed a false positive in `cs/web/xss` for ASP.NET Core Razor Pages/MVC views: `WriteLiteral` calls generated for tag helper attribute values (for example, `asp-for`) capture the value into an internal buffer instead of writing it directly to the response, so they are no longer treated as XSS sinks.
+
+### Bug Fixes
+
+* Fixed an issue where types for pattern expressions were not extracted correctly.
+
+## 7.3.1
+
+### Minor Analysis Improvements
+
+* Private NuGet registries for which the "Replaces base" option is enabled in the organization-level private registry configuration now replace default NuGet feeds whenever dependencies are downloaded, including when default NuGet feeds are configured explicitly for a project.
+
+## 7.3.0
+
+### New Features
+
+* Added taint modeling for OData action parameter binding (`Microsoft.AspNet.OData`/`Microsoft.AspNetCore.OData`). Values cast, `as`-converted, or type-tested out of `ODataActionParameters`, and entities tracked by `Delta<T>` (via `GetInstance`, `Patch`, `Put`, `CopyChangedValues`, and `CopyUnchangedValues`), now taint the members of the target type.
+
+### Minor Analysis Improvements
+
+* In `build-mode: none`, project and solution restoration is now always attempted using the feeds available.
+* C# analysis with build mode `none` now lists unreachable explicitly configured NuGet feeds in both the extraction warning and the tool status page note. This makes it easier to identify feeds that may cause dependencies to be missing from the analysis.
+* Improved ASP.NET Core MVC controller and action discovery to more closely match runtime behavior, including application parts, endpoint mappings, inherited actions, and controller and action exclusions. Service-injected action parameters are no longer modeled as remote input.
+
+## 7.2.0
+
+### New Features
+
+* Added the `AdditionalTaintStep` extension point (`semmle.code.csharp.dataflow.FlowSteps`). Extend this class to add additional taint steps that apply to all taint-tracking configurations.
+
+### Major Analysis Improvements
+
+* Simplified and streamlined the use of NuGet sources when downloading dependencies. In fallback scenarios and specialized package downloads, NuGet sources are now passed directly to `dotnet restore` via the CLI. Furthermore, no `nuget.config` files are created for fallback scenarios, and private registries are used when attempting to download missing packages that were not restored as part of the normal `dotnet restore` process.
+
+## 7.1.2
+
+No user-facing changes.
+
 ## 7.1.1
 
 No user-facing changes.
diff --git a/csharp/ql/lib/Linq/Helpers.qll b/csharp/ql/lib/Linq/Helpers.qll
index 2a4d5c8c27a2..1657e812c268 100644
--- a/csharp/ql/lib/Linq/Helpers.qll
+++ b/csharp/ql/lib/Linq/Helpers.qll
@@ -8,18 +8,68 @@ private import semmle.code.csharp.frameworks.system.collections.Generic as Gener
 private import semmle.code.csharp.frameworks.system.Collections as Collections
 
 //#################### PREDICATES ####################
-private Stmt firstStmt(ForeachStmt fes) {
+private Stmt firstStmt(ForEachStmt fes) {
   if fes.getBody() instanceof BlockStmt
   then result = fes.getBody().(BlockStmt).getStmt(0)
   else result = fes.getBody()
 }
 
-private int numStmts(ForeachStmt fes) {
+private int numStmts(ForEachStmt fes) {
   if fes.getBody() instanceof BlockStmt
   then result = count(fes.getBody().(BlockStmt).getAStmt())
   else result = 1
 }
 
+private predicate returnsLoopVariable(ForEachStmt fes, Stmt s) {
+  exists(ReturnStmt ret |
+    ret = s.stripSingletonBlocks() and
+    ret.getExpr().stripImplicit().(VariableAccess).getTarget() = fes.getVariable()
+  )
+}
+
+private predicate hasNullDefault(Type t) { t.isRefType() or t instanceof NullableType }
+
+private predicate returnsDefaultValueAfterForeach(ForEachStmt fes) {
+  exists(BlockStmt enclosingBlock, int i, Type elementType, ReturnStmt ret |
+    enclosingBlock.getStmt(i) = fes and
+    enclosingBlock.getStmt(i + 1) = ret and
+    elementType = fes.getVariable().getType()
+  |
+    ret.getExpr().stripImplicit() instanceof NullLiteral and
+    hasNullDefault(elementType)
+    or
+    exists(DefaultValueExpr defaultValue |
+      defaultValue = ret.getExpr().stripImplicit() and
+      (
+        defaultValue.getType() = elementType
+        or
+        hasNullDefault(elementType) and
+        hasNullDefault(defaultValue.getType())
+      )
+    )
+  )
+}
+
+private predicate terminatesCallable(Stmt s) {
+  exists(Stmt stripped | stripped = s.stripSingletonBlocks() |
+    stripped instanceof ReturnStmt
+    or
+    stripped instanceof YieldBreakStmt
+    or
+    stripped instanceof ThrowStmt
+    or
+    stripped instanceof BreakStmt
+    or
+    stripped = any(BlockStmt b | terminatesCallable(b.getLastStmt()))
+    or
+    stripped =
+      any(IfStmt nested |
+        terminatesCallable(nested.getThen()) and
+        terminatesCallable(nested.getElse())
+      )
+  )
+}
+
 /** Holds if the type's qualified name is "System.Linq.Enumerable" */
 predicate isEnumerableType(ValueOrRefType t) {
   t.hasFullyQualifiedName("System.Linq", "Enumerable")
@@ -33,12 +83,15 @@ predicate isIEnumerableType(ValueOrRefType t) {
   )
 }
 
+/** DEPRECATED: Use `ForEachStmtGenericEnumerable` instead. */
+deprecated class ForeachStmtGenericEnumerable = ForEachStmtGenericEnumerable;
+
 /**
  * A class of foreach statements where the iterable expression
  * supports the use of the LINQ extension methods on `IEnumerable<T>`.
  */
-class ForeachStmtGenericEnumerable extends ForeachStmt {
-  ForeachStmtGenericEnumerable() {
+class ForEachStmtGenericEnumerable extends ForEachStmt {
+  ForEachStmtGenericEnumerable() {
     exists(ValueOrRefType t | t = this.getIterableExpr().getType() |
       t.getABaseType*().getUnboundDeclaration() instanceof
         GenericCollections::SystemCollectionsGenericIEnumerableTInterface or
@@ -47,12 +100,15 @@ class ForeachStmtGenericEnumerable extends ForeachStmt {
   }
 }
 
+/** DEPRECATED: Use `ForEachStmtEnumerable` instead. */
+deprecated class ForeachStmtEnumerable = ForEachStmtEnumerable;
+
 /**
  * A class of foreach statements where the iterable expression
  * supports the use of the LINQ extension methods on `IEnumerable`.
  */
-class ForeachStmtEnumerable extends ForeachStmt {
-  ForeachStmtEnumerable() {
+class ForEachStmtEnumerable extends ForEachStmt {
+  ForEachStmtEnumerable() {
     exists(ValueOrRefType t | t = this.getIterableExpr().getType() |
       t.getABaseType*() instanceof Collections::SystemCollectionsIEnumerableInterface or
       t.(ArrayType).getRank() = 1
@@ -60,28 +116,79 @@ class ForeachStmtEnumerable extends ForeachStmt {
   }
 }
 
+bindingset[e]
+private predicate acceptableForLinqCapture(Expr e) {
+  not exists(ParameterAccess pa, Parameter p |
+    p = pa.getTarget() and
+    pa = e.getAChildExpr*()
+  |
+    p.isOutOrRef() or p.isIn() or p.isReadonlyRef()
+  )
+}
+
+private signature predicate linqCandidateSig(Stmt s, Expr e);
+
+private module LinqFilterOpportunity<linqCandidateSig/2 linqCandidate> {
+  predicate missed(ForEachStmtGenericEnumerable fes, Stmt s) {
+    s = firstStmt(fes) and
+    // The linq candidate expression accesses the loop variable, and the
+    // candidate doesn't access an in, out, or ref parameter.
+    exists(Expr candidate | linqCandidate(s, candidate) |
+      fes.getVariable().getAnAccess() = candidate.getAChildExpr*() and
+      acceptableForLinqCapture(candidate)
+    )
+  }
+}
+
+private module LinqMapOpportunity<linqCandidateSig/2 linqCandidate> {
+  predicate missed(ForEachStmt fes, Stmt s) {
+    s = firstStmt(fes) and
+    // The linq candidate (and only the candidate) expression accesses the loop variable and the
+    // candidate doesn't access an in, out, or ref parameter.
+    exists(Expr candidate | linqCandidate(s, candidate) |
+      forex(VariableAccess va | va = fes.getVariable().getAnAccess() |
+        va = candidate.getAChildExpr*()
+      ) and
+      acceptableForLinqCapture(candidate)
+    )
+  }
+}
+
+private predicate linqAllCandidate(Stmt s, Expr e) {
+  s =
+    any(IfStmt is |
+      e = is.getCondition() and
+      not exists(is.getElse()) and // The then case of the if assigns false to something and breaks out of the loop.
+      exists(Assignment a, BoolLiteral bl |
+        a = is.getThen().getAChild*() and
+        bl = a.getRightOperand() and
+        bl.toString() = "false"
+      ) and
+      is.getThen().getAChild*() instanceof BreakStmt
+    )
+}
+
 /**
  * Holds if `foreach` statement `fes` could be converted to a `.All()` call.
- * That is, the `ForeachStmt` contains a single `if` with a condition that
+ * That is, the `ForEachStmt` contains a single `if` with a condition that
  * accesses the loop variable and with a body that assigns `false` to a variable
  * and `break`s out of the `foreach`.
  */
-predicate missedAllOpportunity(ForeachStmtGenericEnumerable fes) {
-  exists(IfStmt is |
-    // The loop contains an if statement with no else case, and nothing else.
-    is = firstStmt(fes) and
-    numStmts(fes) = 1 and
-    not exists(is.getElse()) and
-    // The if statement accesses the loop variable.
-    is.getCondition().getAChildExpr*() = fes.getVariable().getAnAccess() and
-    // The then case of the if assigns false to something and breaks out of the loop.
-    exists(Assignment a, BoolLiteral bl |
-      a = is.getThen().getAChild*() and
-      bl = a.getRightOperand() and
-      bl.toString() = "false"
-    ) and
-    is.getThen().getAChild*() instanceof BreakStmt
-  )
+predicate missedAllOpportunity(ForEachStmtGenericEnumerable fes) {
+  // The loop contains an if statement with no else case, and nothing else.
+  LinqFilterOpportunity<linqAllCandidate/2>::missed(fes, _) and
+  numStmts(fes) = 1
+}
+
+private predicate linqCastCandidate(Stmt s, Expr e) {
+  s =
+    any(LocalVariableDeclStmt lvds |
+      exists(CastExpr ce |
+        ce = lvds.getAVariableDeclExpr().getInitializer() and
+        e = ce.getExpr() and
+        e instanceof LocalVariableAccess
+      )
+    )
 }
 
 /**
@@ -90,15 +197,19 @@ predicate missedAllOpportunity(ForeachStmtGenericEnumerable fes) {
  * block, the access is a cast, and the first statement is a
  * local variable declaration statement `s`.
  */
-predicate missedCastOpportunity(ForeachStmtEnumerable fes, LocalVariableDeclStmt s) {
-  s = firstStmt(fes) and
-  forex(VariableAccess va | va = fes.getVariable().getAnAccess() |
-    va = s.getAVariableDeclExpr().getAChildExpr*()
-  ) and
-  exists(CastExpr ce |
-    ce = s.getAVariableDeclExpr().getInitializer() and
-    ce.getExpr() = fes.getVariable().getAnAccess()
-  )
+predicate missedCastOpportunity(ForEachStmtEnumerable fes, LocalVariableDeclStmt s) {
+  LinqMapOpportunity<linqCastCandidate/2>::missed(fes, s)
+}
+
+private predicate linqOfTypeCandidate(Stmt s, Expr e) {
+  s =
+    any(LocalVariableDeclStmt lvds |
+      exists(AsExpr ae |
+        ae = lvds.getAVariableDeclExpr().getInitializer() and
+        e = ae.getExpr() and
+        e instanceof LocalVariableAccess
+      )
+    )
 }
 
 /**
@@ -107,15 +218,17 @@ predicate missedCastOpportunity(ForeachStmtEnumerable fes, LocalVariableDeclStmt
  * block, the access is a cast with the `as` operator, and the first statement
  * is a local variable declaration statement `s`.
  */
-predicate missedOfTypeOpportunity(ForeachStmtEnumerable fes, LocalVariableDeclStmt s) {
-  s = firstStmt(fes) and
-  forex(VariableAccess va | va = fes.getVariable().getAnAccess() |
-    va = s.getAVariableDeclExpr().getAChildExpr*()
-  ) and
-  exists(AsExpr ae |
-    ae = s.getAVariableDeclExpr().getInitializer() and
-    ae.getExpr() = fes.getVariable().getAnAccess()
-  )
+predicate missedOfTypeOpportunity(ForEachStmtEnumerable fes, LocalVariableDeclStmt s) {
+  LinqMapOpportunity<linqOfTypeCandidate/2>::missed(fes, s)
+}
+
+private predicate linqSelectCandidate(Stmt s, Expr e) {
+  s =
+    any(LocalVariableDeclStmt lvds |
+      e = lvds.getAVariableDeclExpr().getInitializer() and
+      not e instanceof Cast and
+      not e.getAChildExpr*() instanceof AwaitExpr
+    )
 }
 
 /**
@@ -125,13 +238,25 @@ predicate missedOfTypeOpportunity(ForeachStmtEnumerable fes, LocalVariableDeclSt
  * local variable declaration statement `s`, and the initializer does not
  * contain an `await` expression (since `Select` does not support async lambdas).
  */
-predicate missedSelectOpportunity(ForeachStmtGenericEnumerable fes, LocalVariableDeclStmt s) {
-  s = firstStmt(fes) and
-  forex(VariableAccess va | va = fes.getVariable().getAnAccess() |
-    va = s.getAVariableDeclExpr().getAChildExpr*()
-  ) and
-  not s.getAVariableDeclExpr().getInitializer() instanceof Cast and
-  not s.getAVariableDeclExpr().getInitializer().getAChildExpr*() instanceof AwaitExpr
+predicate missedSelectOpportunity(ForEachStmtGenericEnumerable fes, LocalVariableDeclStmt s) {
+  LinqMapOpportunity<linqSelectCandidate/2>::missed(fes, s)
+}
+
+private predicate linqWhereCandidateCase1(Stmt s, Expr e) {
+  s =
+    any(IfStmt is |
+      e = is.getCondition() and
+      is.getThen() instanceof ContinueStmt
+    )
+}
+
+private predicate linqWhereCandidateCase2(Stmt s, Expr e) {
+  s =
+    any(IfStmt is |
+      e = is.getCondition() and
+      not exists(is.getElse()) and
+      not terminatesCallable(is.getThen())
+    )
 }
 
 /**
@@ -140,20 +265,38 @@ predicate missedSelectOpportunity(ForeachStmtGenericEnumerable fes, LocalVariabl
  * variable, and the body of the `if` is either a `continue` or there's nothing
  * else in the loop than the `if`.
  */
-predicate missedWhereOpportunity(ForeachStmtGenericEnumerable fes, IfStmt is) {
-  // The very first thing the foreach loop does is test its iteration variable.
-  is = firstStmt(fes) and
-  exists(VariableAccess va |
-    va.getTarget() = fes.getVariable() and
-    va = is.getCondition().getAChildExpr*()
-  ) and
-  // It then either (a) continues, or (b) performs the entire body of the loop within the condition.
-  (
-    is.getThen() instanceof ContinueStmt
-    or
-    not exists(is.getElse()) and
-    numStmts(fes) = 1
-  )
+predicate missedWhereOpportunity(ForEachStmtGenericEnumerable fes, IfStmt is) {
+  // The body of the `if` is a continue.
+  LinqFilterOpportunity<linqWhereCandidateCase1/2>::missed(fes, is)
+  or
+  // There's nothing else in the loop than the `if`.
+  LinqFilterOpportunity<linqWhereCandidateCase2/2>::missed(fes, is) and
+  numStmts(fes) = 1
+}
+
+private predicate linqFirstOrDefaultCandidate(Stmt s, Expr e) {
+  s =
+    any(IfStmt is |
+      e = is.getCondition() and
+      not exists(is.getElse()) and
+      not e.getAChildExpr*() instanceof AwaitExpr
+    )
+}
+
+/**
+ * Holds if `foreach` statement `fes` could be converted to a `.FirstOrDefault()` call.
+ * That is, the loop contains a single `if` statement that accesses the loop variable,
+ * returns the loop variable when the condition matches, and is followed by a default return.
+ */
+predicate missedFirstOrDefaultOpportunity(ForEachStmtGenericEnumerable fes, IfStmt is) {
+  // The loop only checks whether the current element is the first match.
+  LinqFilterOpportunity<linqFirstOrDefaultCandidate/2>::missed(fes, is) and
+  numStmts(fes) = 1 and
+  not fes.isAsync() and
+  not fes.getVariable().isCaptured() and
+  returnsLoopVariable(fes, is.getThen()) and
+  fes.getElementType() = fes.getVariable().getType() and
+  returnsDefaultValueAfterForeach(fes)
 }
 
 //#################### CLASSES ####################
diff --git a/csharp/ql/lib/change-notes/2026-10-06-property-pattern-flow.md b/csharp/ql/lib/change-notes/2026-10-06-property-pattern-flow.md
new file mode 100644
index 000000000000..c8e42dcb6fe3
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2026-10-06-property-pattern-flow.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added support for data flow through property patterns in `is` expressions and `switch` cases.
diff --git a/csharp/ql/lib/change-notes/released/7.1.2.md b/csharp/ql/lib/change-notes/released/7.1.2.md
new file mode 100644
index 000000000000..d55cf91e2492
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/7.1.2.md
@@ -0,0 +1,3 @@
+## 7.1.2
+
+No user-facing changes.
diff --git a/csharp/ql/lib/change-notes/released/7.2.0.md b/csharp/ql/lib/change-notes/released/7.2.0.md
new file mode 100644
index 000000000000..871f5519ab31
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/7.2.0.md
@@ -0,0 +1,9 @@
+## 7.2.0
+
+### New Features
+
+* Added the `AdditionalTaintStep` extension point (`semmle.code.csharp.dataflow.FlowSteps`). Extend this class to add additional taint steps that apply to all taint-tracking configurations.
+
+### Major Analysis Improvements
+
+* Simplified and streamlined the use of NuGet sources when downloading dependencies. In fallback scenarios and specialized package downloads, NuGet sources are now passed directly to `dotnet restore` via the CLI. Furthermore, no `nuget.config` files are created for fallback scenarios, and private registries are used when attempting to download missing packages that were not restored as part of the normal `dotnet restore` process.
diff --git a/csharp/ql/lib/change-notes/released/7.3.0.md b/csharp/ql/lib/change-notes/released/7.3.0.md
new file mode 100644
index 000000000000..2af204c27e3d
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/7.3.0.md
@@ -0,0 +1,11 @@
+## 7.3.0
+
+### New Features
+
+* Added taint modeling for OData action parameter binding (`Microsoft.AspNet.OData`/`Microsoft.AspNetCore.OData`). Values cast, `as`-converted, or type-tested out of `ODataActionParameters`, and entities tracked by `Delta<T>` (via `GetInstance`, `Patch`, `Put`, `CopyChangedValues`, and `CopyUnchangedValues`), now taint the members of the target type.
+
+### Minor Analysis Improvements
+
+* In `build-mode: none`, project and solution restoration is now always attempted using the feeds available.
+* C# analysis with build mode `none` now lists unreachable explicitly configured NuGet feeds in both the extraction warning and the tool status page note. This makes it easier to identify feeds that may cause dependencies to be missing from the analysis.
+* Improved ASP.NET Core MVC controller and action discovery to more closely match runtime behavior, including application parts, endpoint mappings, inherited actions, and controller and action exclusions. Service-injected action parameters are no longer modeled as remote input.
diff --git a/csharp/ql/lib/change-notes/released/7.3.1.md b/csharp/ql/lib/change-notes/released/7.3.1.md
new file mode 100644
index 000000000000..07bdb3c1b643
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/7.3.1.md
@@ -0,0 +1,5 @@
+## 7.3.1
+
+### Minor Analysis Improvements
+
+* Private NuGet registries for which the "Replaces base" option is enabled in the organization-level private registry configuration now replace default NuGet feeds whenever dependencies are downloaded, including when default NuGet feeds are configured explicitly for a project.
diff --git a/csharp/ql/lib/change-notes/released/7.4.0.md b/csharp/ql/lib/change-notes/released/7.4.0.md
new file mode 100644
index 000000000000..232bafc7d9ee
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/7.4.0.md
@@ -0,0 +1,9 @@
+## 7.4.0
+
+### Major Analysis Improvements
+
+* Fixed a false positive in `cs/web/xss` for ASP.NET Core Razor Pages/MVC views: `WriteLiteral` calls generated for tag helper attribute values (for example, `asp-for`) capture the value into an internal buffer instead of writing it directly to the response, so they are no longer treated as XSS sinks.
+
+### Bug Fixes
+
+* Fixed an issue where types for pattern expressions were not extracted correctly.
diff --git a/csharp/ql/lib/change-notes/released/7.4.1.md b/csharp/ql/lib/change-notes/released/7.4.1.md
new file mode 100644
index 000000000000..94e6284215a8
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/7.4.1.md
@@ -0,0 +1,7 @@
+## 7.4.1
+
+### Minor Analysis Improvements
+
+* Avoid logging warnings when there are no explicit or inherited feeds to check for reachability.
+* The subprocess for the NuGet CLI is now provided with the proxy and certificate environment variables needed to access private registries if any are configured.
+* Added support for data flow through positional patterns in `is` expressions and `switch` cases.
diff --git a/csharp/ql/lib/change-notes/released/7.4.2.md b/csharp/ql/lib/change-notes/released/7.4.2.md
new file mode 100644
index 000000000000..df268fb06818
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/7.4.2.md
@@ -0,0 +1,5 @@
+## 7.4.2
+
+### Minor Analysis Improvements
+
+* Rolled back the change that set proxy and certificate environment variables for the subprocess that invokes the NuGet CLI because the environment variables were only partially respected by the target process in some cases.
diff --git a/csharp/ql/lib/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
index 8e970df6cae3..b39446e5526d 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 7.1.1
+lastReleaseVersion: 7.4.2
diff --git a/csharp/ql/lib/ext/Microsoft.AspNet.OData.model.yml b/csharp/ql/lib/ext/Microsoft.AspNet.OData.model.yml
new file mode 100644
index 000000000000..86065b1ca2ea
--- /dev/null
+++ b/csharp/ql/lib/ext/Microsoft.AspNet.OData.model.yml
@@ -0,0 +1,20 @@
+extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: summaryModel
+    data:
+      - ["Microsoft.AspNet.OData", "Delta<TStructuralType>", True, "GetInstance", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["Microsoft.AspNet.OData", "Delta<TStructuralType>", True, "Patch", "(TStructuralType)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["Microsoft.AspNet.OData", "Delta<TStructuralType>", True, "Put", "(TStructuralType)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["Microsoft.AspNet.OData", "Delta<TStructuralType>", True, "CopyChangedValues", "(TStructuralType)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["Microsoft.AspNet.OData", "Delta<TStructuralType>", True, "CopyUnchangedValues", "(TStructuralType)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["Microsoft.AspNetCore.OData.Deltas", "Delta<T>", True, "GetInstance", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["Microsoft.AspNetCore.OData.Deltas", "Delta<T>", True, "Patch", "(T)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["Microsoft.AspNetCore.OData.Deltas", "Delta<T>", True, "Put", "(T)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["Microsoft.AspNetCore.OData.Deltas", "Delta<T>", True, "CopyChangedValues", "(T)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["Microsoft.AspNetCore.OData.Deltas", "Delta<T>", True, "CopyUnchangedValues", "(T)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Web.Http.OData", "Delta<TEntityType>", True, "GetEntity", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Web.Http.OData", "Delta<TEntityType>", True, "Patch", "(TEntityType)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Web.Http.OData", "Delta<TEntityType>", True, "Put", "(TEntityType)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Web.Http.OData", "Delta<TEntityType>", True, "CopyChangedValues", "(TEntityType)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Web.Http.OData", "Delta<TEntityType>", True, "CopyUnchangedValues", "(TEntityType)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index 035a38389157..afcf5b37a610 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 7.1.2-dev
+version: 7.4.3-dev
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
diff --git a/csharp/ql/lib/semmle/code/csharp/Assignable.qll b/csharp/ql/lib/semmle/code/csharp/Assignable.qll
index 89dc594ec3f4..b4014f09f5ce 100644
--- a/csharp/ql/lib/semmle/code/csharp/Assignable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Assignable.qll
@@ -18,6 +18,7 @@ class Assignable extends Declaration, @assignable {
   final AnnotatedType getAnnotatedType() { result.appliesTo(this) }
 
   /** Gets an access to this assignable. */
+  pragma[nomagic]
   AssignableAccess getAnAccess() { result.getTarget() = this }
 
   /** Gets an expression assigned to this assignable, if any. */
@@ -31,6 +32,7 @@ class Assignable extends Declaration, @assignable {
  * property (`Property`), an indexer (`Indexer`), or an event (`Event`).
  */
 class AssignableMember extends Member, Assignable, Attributable {
+  pragma[nomagic]
   override AssignableMemberAccess getAnAccess() { result = Assignable.super.getAnAccess() }
 
   override string toString() { result = Assignable.super.toString() }
@@ -275,15 +277,28 @@ module AssignableInternal {
     def = TParameterDefaultDefinition(_, result)
   }
 
-  /** A local variable declaration at the top-level of a pattern. */
-  class TopLevelPatternDecl extends LocalVariableDeclExpr {
+  /** A pattern containing a local variable declaration. */
+  class LocalVariablePatternDecl extends LocalVariableDeclExpr {
     private PatternMatch pm;
 
-    TopLevelPatternDecl() { this = pm.getPattern().(BindingPatternExpr).getVariableDeclExpr() }
+    LocalVariablePatternDecl() {
+      exists(BindingPatternExpr bpe |
+        this = bpe.getVariableDeclExpr() and pm = bpe.getPatternMatch()
+      )
+    }
 
+    /** Holds if the local variable definition is at the top level of the pattern. */
+    predicate isTopLevel() { this = pm.getPattern().(BindingPatternExpr).getVariableDeclExpr() }
+
+    /** Gets the pattern match that this local variable declaration (pattern) belongs to. */
     PatternMatch getMatch() { result = pm }
   }
 
+  /** A local variable declaration at the top-level of a pattern. */
+  class TopLevelPatternDecl extends LocalVariablePatternDecl {
+    TopLevelPatternDecl() { this.isTopLevel() }
+  }
+
   cached
   private module Cached {
     cached
@@ -303,7 +318,7 @@ module AssignableInternal {
       TLocalVariableDefinition(LocalVariableDeclExpr lvde) {
         not lvde.hasInitializer() and
         not exists(getTupleSource(TTupleAssignmentDefinition(_, lvde))) and
-        not lvde instanceof TopLevelPatternDecl and
+        not lvde instanceof LocalVariablePatternDecl and
         not lvde.isOutArgument()
       } or
       TImplicitParameterDefinition(Parameter p) {
@@ -322,7 +337,7 @@ module AssignableInternal {
         default = p.getDefaultValue()
       } or
       TAddressOfDefinition(AddressOfExpr aoe) or
-      TPatternDefinition(TopLevelPatternDecl tlpd) or
+      TPatternDefinition(LocalVariablePatternDecl lvpd) or
       TAssignOperationDefinition(AssignOperation ao) {
         ao instanceof AssignCallExpr and not ao instanceof CompoundAssignmentOperatorCall
         or
@@ -735,24 +750,31 @@ module AssignableDefinitions {
   }
 
   /**
-   * A local variable definition in a pattern, for example `x is int i`.
+   * A local variable definition in a pattern, for example `int i` in `x is int i`.
    */
   class PatternDefinition extends AssignableDefinition, TPatternDefinition {
-    TopLevelPatternDecl tlpd;
+    LocalVariablePatternDecl lvpd;
 
-    PatternDefinition() { this = TPatternDefinition(tlpd) }
+    PatternDefinition() { this = TPatternDefinition(lvpd) }
 
     /** Gets the element matches against this pattern. */
-    PatternMatch getMatch() { result = tlpd.getMatch() }
+    PatternMatch getMatch() { result = lvpd.getMatch() }
 
     /** Gets the underlying local variable declaration. */
-    LocalVariableDeclExpr getDeclaration() { result = tlpd }
-
-    override Expr getSource() { result = this.getMatch().getExpr() }
+    LocalVariableDeclExpr getDeclaration() { result = lvpd }
 
     override string toString() { result = this.getDeclaration().toString() }
   }
 
+  /**
+   * A local variable definition at the top level of a pattern.
+   */
+  class TopLevelPatternDefinition extends PatternDefinition {
+    TopLevelPatternDefinition() { lvpd.isTopLevel() }
+
+    override Expr getSource() { result = this.getMatch().getExpr() }
+  }
+
   /**
    * An initializer definition for a field or a property, for example
    * line 2 in
diff --git a/csharp/ql/lib/semmle/code/csharp/ExprOrStmtParent.qll b/csharp/ql/lib/semmle/code/csharp/ExprOrStmtParent.qll
index 2cf09707459d..493337a8edd4 100644
--- a/csharp/ql/lib/semmle/code/csharp/ExprOrStmtParent.qll
+++ b/csharp/ql/lib/semmle/code/csharp/ExprOrStmtParent.qll
@@ -6,6 +6,7 @@
 
 import csharp
 private import internal.Location
+private import controlflow.internal.ControlFlowGraph
 
 /**
  * INTERNAL: Do not use.
@@ -145,6 +146,8 @@ private module Cached {
     parent*(cfe, c.(Constructor).getObjectInitializerCall())
     or
     parent*(cfe, any(AssignExpr init | c.(ObjectInitMethod).initializes(init)))
+    or
+    parent*(cfe, any(Expr init | Initializers::staticMemberInitializer(c, init)))
   }
 
   /** Holds if the enclosing statement of expression `e` is `s`. */
diff --git a/csharp/ql/lib/semmle/code/csharp/Member.qll b/csharp/ql/lib/semmle/code/csharp/Member.qll
index b64f408af64c..ac3229351ea3 100644
--- a/csharp/ql/lib/semmle/code/csharp/Member.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Member.qll
@@ -238,6 +238,7 @@ class Modifiable extends Declaration, @modifiable {
 /** A declaration that is a member of a type. */
 class Member extends Modifiable, @member {
   /** Gets an access to this member. */
+  pragma[nomagic]
   MemberAccess getAnAccess() { result.getTarget() = this }
 
   /**
diff --git a/csharp/ql/lib/semmle/code/csharp/Property.qll b/csharp/ql/lib/semmle/code/csharp/Property.qll
index 3a007b0d6e9d..7c048528aaae 100644
--- a/csharp/ql/lib/semmle/code/csharp/Property.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Property.qll
@@ -217,6 +217,7 @@ class Property extends DeclarationWithGetSetAccessors, @property {
     result = DeclarationWithGetSetAccessors.super.getAnUltimateImplementor()
   }
 
+  pragma[nomagic]
   override PropertyAccess getAnAccess() { result.getTarget() = this }
 
   override Location getALocation() { property_location(this.getUnboundDeclaration(), result) }
@@ -326,6 +327,7 @@ class Indexer extends DeclarationWithGetSetAccessors, Parameterizable, @indexer
     indexers(this, _, _, getTypeRef(result), _)
   }
 
+  pragma[nomagic]
   override IndexerAccess getAnAccess() { result.getTarget() = this }
 
   /**
diff --git a/csharp/ql/lib/semmle/code/csharp/Stmt.qll b/csharp/ql/lib/semmle/code/csharp/Stmt.qll
index 3be818e43a50..ebf0e354b9bc 100644
--- a/csharp/ql/lib/semmle/code/csharp/Stmt.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Stmt.qll
@@ -305,7 +305,7 @@ class DefaultCase extends CaseStmt, LabeledStmt {
  *
  * Either a `while` statement (`WhileStmt`), a `do`-`while` statement
  * (`DoStmt`), a `for` statement (`ForStmt`), or a `foreach` statement
- * (`ForeachStmt`).
+ * (`ForEachStmt`).
  */
 class LoopStmt extends Stmt, @loop_stmt {
   /** Gets the body of this loop statement. */
@@ -422,6 +422,9 @@ class ForStmt extends LoopStmt, @for_stmt {
   override string getAPrimaryQlClass() { result = "ForStmt" }
 }
 
+/** DEPRECATED: Use `ForEachStmt` instead. */
+deprecated class ForeachStmt = ForEachStmt;
+
 /**
  * A `foreach` loop, for example
  *
@@ -431,7 +434,7 @@ class ForStmt extends LoopStmt, @for_stmt {
  * }
  * ```
  */
-class ForeachStmt extends LoopStmt, @foreach_stmt {
+class ForEachStmt extends LoopStmt, @foreach_stmt {
   /**
    * Gets the local variable of this `foreach` loop, if any.
    *
@@ -564,7 +567,7 @@ class ForeachStmt extends LoopStmt, @foreach_stmt {
 
   override string toString() { result = "foreach (... ... in ...) ..." }
 
-  override string getAPrimaryQlClass() { result = "ForeachStmt" }
+  override string getAPrimaryQlClass() { result = "ForEachStmt" }
 }
 
 /**
diff --git a/csharp/ql/lib/semmle/code/csharp/Unification.qll b/csharp/ql/lib/semmle/code/csharp/Unification.qll
index c8b78cd07a27..8dabaa8a20a8 100644
--- a/csharp/ql/lib/semmle/code/csharp/Unification.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Unification.qll
@@ -348,6 +348,7 @@ module Gvn {
    *
    * `subsumes` indicates whether `arg1` in fact subsumes `arg2`.
    */
+  pragma[no_dynamic_join_order]
   pragma[nomagic]
   private predicate unifiableTypeArguments(
     CompoundTypeKind k, GvnTypeArgument arg1, GvnTypeArgument arg2, int i, boolean subsumes
diff --git a/csharp/ql/lib/semmle/code/csharp/Variable.qll b/csharp/ql/lib/semmle/code/csharp/Variable.qll
index 2d4cf578436d..b8e3ae0190d6 100644
--- a/csharp/ql/lib/semmle/code/csharp/Variable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Variable.qll
@@ -16,6 +16,7 @@ private import TypeRef
 class Variable extends Assignable, @variable {
   override Variable getUnboundDeclaration() { result = this }
 
+  pragma[nomagic]
   override VariableAccess getAnAccess() { result.getTarget() = this }
 
   /** Gets the type of this variable. */
@@ -438,6 +439,7 @@ class Field extends Variable, AssignableMember, Attributable, TopLevelExprParent
 
   override Field getUnboundDeclaration() { fields(this, _, _, _, _, result) }
 
+  pragma[nomagic]
   override FieldAccess getAnAccess() { result = Variable.super.getAnAccess() }
 
   override ValueOrRefType getDeclaringType() { fields(this, _, _, result, _, _) }
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraph.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraph.qll
index 14bbb0251728..60051b7e6c3c 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraph.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraph.qll
@@ -162,6 +162,8 @@ module Ast implements AstSig<Location> {
 
   class Stmt = CS::Stmt;
 
+  class LabeledStmt = CS::LabelStmt;
+
   class Expr = CS::Expr;
 
   class BlockStmt = CS::BlockStmt;
@@ -188,9 +190,9 @@ module Ast implements AstSig<Location> {
     AstNode getUpdate(int index) { result = super.getUpdate(index) }
   }
 
-  final private class FinalForeachStmt = CS::ForeachStmt;
+  final private class FinalForEachStmt = CS::ForEachStmt;
 
-  class ForeachStmt extends FinalForeachStmt {
+  class ForEachStmt extends FinalForEachStmt {
     Expr getVariable() {
       result = this.getVariableDeclExpr() or result = this.getVariableDeclTuple()
     }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/FlowSteps.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/FlowSteps.qll
new file mode 100644
index 000000000000..6be7cd936ff1
--- /dev/null
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/FlowSteps.qll
@@ -0,0 +1,20 @@
+/**
+ * Provides classes representing various flow steps for taint tracking.
+ */
+
+private import codeql.util.Unit
+private import semmle.code.csharp.dataflow.DataFlow
+
+/**
+ * A unit class for adding additional taint steps.
+ *
+ * Extend this class to add additional taint steps that should apply to all
+ * taint configurations.
+ */
+class AdditionalTaintStep extends Unit {
+  /**
+   * Holds if the step from `node1` to `node2` should be considered a taint
+   * step for all configurations.
+   */
+  abstract predicate step(DataFlow::Node node1, DataFlow::Node node2);
+}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
index 1cd9c71acfc9..4b57930bc378 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
@@ -110,13 +110,13 @@ private predicate nonNullDef(SsaExplicitWrite def) {
   def.getValue() instanceof NonNullExpr
   or
   exists(AssignableDefinition ad | ad = def.getDefinition() |
-    ad instanceof AssignableDefinitions::PatternDefinition
+    ad instanceof AssignableDefinitions::TopLevelPatternDefinition
     or
     ad =
       any(AssignableDefinitions::LocalVariableDefinition d |
         d.getExpr() = any(SpecificCatchClause scc).getVariableDeclExpr()
         or
-        d.getExpr() = any(ForeachStmt fs).getAVariableDeclExpr()
+        d.getExpr() = any(ForEachStmt fs).getAVariableDeclExpr()
       )
   )
 }
@@ -306,7 +306,7 @@ class Dereference extends G::DereferenceableExpr {
       or
       this = any(LockStmt stmt).getExpr()
       or
-      this = any(ForeachStmt stmt).getIterableExpr()
+      this = any(ForEachStmt stmt).getIterableExpr()
       or
       exists(ExtensionMethodCall emc, Parameter p |
         this = emc.getArgumentForParameter(p) and
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
index d12c65c9fffd..df0bef74f0ca 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
@@ -560,10 +560,22 @@ module LocalFlow {
     or
     exists(AssignExpr ae | ae.getLeftOperand().(TupleExpr) = e2 and ae.getRightOperand() = e1)
     or
-    exists(ControlFlowElement cfe | cfe = e2.(TupleExpr).(PatternExpr).getPatternMatch() |
-      cfe.(IsExpr).getExpr() = e1
-      or
-      exists(Switch sw | sw.getACase() = cfe and sw.getExpr() = e1)
+    exists(IsExpr e |
+      e1 = e.getExpr() and
+      e2 = e.getPattern() and
+      (
+        e2 instanceof TuplePatternExpr or
+        e2 instanceof RecursivePatternExpr
+      )
+    )
+    or
+    exists(Switch sw |
+      e1 = sw.getExpr() and
+      e2 = sw.getACase().getPattern() and
+      (
+        e2 instanceof TuplePatternExpr or
+        e2 instanceof RecursivePatternExpr
+      )
     )
   }
 
@@ -714,8 +726,7 @@ predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo, string model) {
   ) and
   model = ""
   or
-  FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-    nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)
+  FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, true, model)
 }
 
 /**
@@ -1778,7 +1789,7 @@ class FlowSummaryNode extends NodeImpl, TFlowSummaryNode {
   }
 
   override DataFlowCallable getEnclosingCallableImpl() {
-    result.asSummarizedCallable() = this.getSummarizedCallable()
+    result = this.getSummaryNode().getEnclosingCallable()
   }
 
   override DataFlowType getDataFlowType() {
@@ -1789,7 +1800,7 @@ class FlowSummaryNode extends NodeImpl, TFlowSummaryNode {
 
   override ControlFlowNode getControlFlowNodeImpl() { none() }
 
-  override Location getLocationImpl() { result = this.getSummarizedCallable().getLocation() }
+  override Location getLocationImpl() { result = this.getSummaryNode().getLocation() }
 
   override string toStringImpl() { result = this.getSummaryNode().toString() }
 }
@@ -1979,16 +1990,22 @@ class FieldOrProperty extends Assignable, Modifiable {
   }
 }
 
-/** A string that is a reference to a late-bound target of a dynamic member access. */
+/** A member name used by a dynamic access or a property pattern without type information. */
 class DynamicProperty extends string {
-  private DynamicMemberAccess dma;
-
-  DynamicProperty() { this = dma.getLateBoundTargetName() }
+  DynamicProperty() {
+    this = any(DynamicMemberAccess dma).getLateBoundTargetName()
+    or
+    exists(PatternExpr qualifier, LabeledPatternExpr label |
+      propertyPatternQualifier(qualifier, label) and
+      qualifier.getType() instanceof NullType and
+      this = label.getLabel()
+    )
+  }
 
   ContentSet getContentSet() { result.isDynamicProperty(this) }
 
   /** Gets an access of this dynamic property. */
-  DynamicMemberAccess getAnAccess() { result = dma }
+  DynamicMemberAccess getAnAccess() { result.getLateBoundTargetName() = this }
 }
 
 private class InstanceFieldOrProperty extends FieldOrProperty {
@@ -2085,8 +2102,7 @@ predicate jumpStep(Node pred, Node succ) {
     )
   )
   or
-  FlowSummaryImpl::Private::Steps::summaryJumpStep(pred.(FlowSummaryNode).getSummaryNode(),
-    succ.(FlowSummaryNode).getSummaryNode())
+  FlowSummaryImpl::Private::Steps::summaryJumpStep(pred, succ)
   or
   succ = pred.(LocalFunctionCreationNode).getAnAccess(false)
 }
@@ -2204,12 +2220,46 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {
   storeStepDelegateCall(node1, c, node2)
 }
 
+private predicate readStepPattern(Node node1, Content c, Node node2) {
+  exists(RecursivePatternExpr pattern, PatternExpr item, int i |
+    node1.asExpr() = pattern and
+    item = pattern.getPositionalPatterns().getPattern(i) and
+    c.(FieldContent).getField() =
+      pattern.getType().(TupleType).getElement(i).getUnboundDeclaration()
+  |
+    // item = { ... } in node1 = (var ..., { ... })
+    item = node2.asExpr().(RecursivePatternExpr)
+    or
+    // item = (...,...) in node1 = (var ..., (..., ...))
+    item = node2.asExpr().(TuplePatternExpr)
+    or
+    // item = variable in node1 = (..., variable, ...) in a case/is (var ..., var ...)
+    exists(AssignableDefinitions::PatternDefinition lvd |
+      node2.(AssignableDefinitionNode).getDefinition() = lvd and
+      item.(BindingPatternExpr).getVariableDeclExpr() = lvd.getDeclaration()
+    )
+  )
+  or
+  // item = variable in node1 = (..., variable, ...) in a case/is var (..., ...)
+  exists(TuplePatternExpr pattern, PatternExpr item, int i |
+    node1.asExpr() = pattern and
+    c.(FieldContent).getField() =
+      pattern.getType().(TupleType).getElement(i).getUnboundDeclaration() and
+    item = pattern.getArgument(i)
+  |
+    exists(AssignableDefinitions::PatternDefinition lvd |
+      node2.(AssignableDefinitionNode).getDefinition() = lvd and
+      item = lvd.getDeclaration()
+    )
+  )
+}
+
 private predicate readContentStep(Node node1, Content c, Node node2) {
   arrayRead(node1.asExpr(), node2.asExpr()) and
   c instanceof ElementContent
   or
   exists(
-    ForeachStmt fs, SsaExplicitWrite def, AssignableDefinitions::LocalVariableDefinition defTo
+    ForEachStmt fs, SsaExplicitWrite def, AssignableDefinitions::LocalVariableDefinition defTo
   |
     node1.asExpr() = fs.getIterableExpr() and
     defTo.getDeclaration() = fs.getVariableDeclExpr() and
@@ -2242,15 +2292,10 @@ private predicate readContentStep(Node node1, Content c, Node node2) {
       node2.(AssignableDefinitionNode).getDefinition() = tad and
       tad.getLeaf() = item
     )
-    or
-    // item = variable in node1 = (..., variable, ...) in a case/is var (..., ...)
-    isPatternExprDescendant(te) and
-    exists(AssignableDefinitions::LocalVariableDefinition lvd |
-      node2.(AssignableDefinitionNode).getDefinition() = lvd and
-      lvd.getDeclaration() = item
-    )
   )
   or
+  readStepPattern(node1, c, node2)
+  or
   VariableCapture::readStep(node1, c, node2)
 }
 
@@ -2269,6 +2314,40 @@ private predicate readStepDelegateCall(Node node1, ContentSet c, OutNode node2)
   )
 }
 
+private predicate propertyPatternQualifier(PatternExpr qualifier, LabeledPatternExpr label) {
+  qualifier.(RecursivePatternExpr).getPropertyPatterns().getPattern(_) = label
+  or
+  qualifier instanceof LabeledPatternExpr and
+  qualifier.(PropertyPatternExpr).getPattern(_) = label
+}
+
+/**
+ * Holds if data can flow from `node1` to `node2` via a property pattern.
+ */
+private predicate fieldOrPropertyPatternRead(Node node1, ContentSet c, Node node2) {
+  exists(PatternExpr pattern, LabeledPatternExpr label |
+    node1.asExpr() = pattern and
+    propertyPatternQualifier(pattern, label) and
+    if pattern.getType() instanceof NullType
+    then c.isDynamicProperty(label.getLabel())
+    else
+      exists(FieldOrProperty f |
+        c = f.getContentSet() and
+        f.getName() = label.getLabel() and
+        pattern.getType().(ValueOrRefType).hasMember(f)
+      )
+  |
+    node2.asExpr() = label.(RecursivePatternExpr)
+    or
+    node2.asExpr() = label.(PropertyPatternExpr)
+    or
+    exists(AssignableDefinitions::PatternDefinition lvd |
+      node2.(AssignableDefinitionNode).getDefinition() = lvd and
+      label.(BindingPatternExpr).getVariableDeclExpr() = lvd.getDeclaration()
+    )
+  )
+}
+
 /**
  * Holds if data can flow from `node1` to `node2` via a read of content `c`.
  */
@@ -2280,6 +2359,8 @@ predicate readStep(Node node1, ContentSet c, Node node2) {
   or
   fieldOrPropertyRead(node1.asExpr(), c, node2.asExpr())
   or
+  fieldOrPropertyPatternRead(node1, c, node2)
+  or
   dynamicPropertyRead(node1.asExpr(), c, node2.asExpr())
   or
   node2.asExpr().(AwaitExpr).getExpr() = node1.asExpr() and
@@ -2679,7 +2760,7 @@ class CastNode extends Node {
     this.asExpr() instanceof Cast
     or
     this.(AssignableDefinitionNode).getDefinition() instanceof
-      AssignableDefinitions::PatternDefinition
+      AssignableDefinitions::TopLevelPatternDefinition
   }
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
index f936a206e2b1..88785012d81b 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
@@ -30,11 +30,13 @@ module Input implements InputSig<Location, DataFlowImplSpecific::CsharpDataFlow>
     )
   }
 
-  class SourceBase = Void;
-
-  class SinkBase = Void;
+  class FlowSummaryCallBase extends Void {
+    Location getLocation() { none() }
+  }
 
-  class FlowSummaryCallBase = Void;
+  DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
+    result.asSummarizedCallable() = c
+  }
 
   predicate neutralElement(SummarizedCallableBase c, string kind, string provenance, boolean isExact) {
     interpretNeutral(c, kind, provenance, isExact)
@@ -122,7 +124,21 @@ module Input implements InputSig<Location, DataFlowImplSpecific::CsharpDataFlow>
 
 private import Make<Location, DataFlowImplSpecific::CsharpDataFlow, Input> as Impl
 
-private module TypesInput implements Impl::Private::TypesInputSig {
+private module Input2 implements Impl::Private::InputSig2 {
+  private import codeql.util.Void
+
+  class SourceSinkReportingElement extends Void {
+    Location getLocation() { none() }
+
+    DataFlowCallable getEnclosingCallable() { none() }
+
+    SourceSinkReportingElement getASuccessor(Impl::Private::SummaryComponent sc) { none() }
+  }
+}
+
+private import Impl::Private::Make2<Input2> as Impl2
+
+private module TypesInput implements Impl2::TypesInputSig {
   DataFlowType getSyntheticGlobalType(Impl::Private::SyntheticGlobal sg) {
     exists(sg) and
     result.asGvnType() = Gvn::getGlobalValueNumber(any(ObjectType t))
@@ -195,27 +211,15 @@ private module TypesInput implements Impl::Private::TypesInputSig {
     )
   }
 
-  DataFlowType getSourceType(Input::SourceBase source, Impl::Private::SummaryComponentStack s) {
-    none()
-  }
-
-  DataFlowType getSinkType(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
+  DataFlowType getSourceSinkType(Input2::SourceSinkReportingElement e) { none() }
 }
 
-private module StepsInput implements Impl::Private::StepsInputSig {
-  Impl::Private::SummaryNode getSummaryNode(Node n) {
-    result = n.(FlowSummaryNode).getSummaryNode()
-  }
+private module StepsInput implements Impl2::StepsInputSig {
+  Impl2::SummaryNode getSummaryNode(Node n) { result = n.(FlowSummaryNode).getSummaryNode() }
 
   DataFlowCall getACall(Public::SummarizedCallable sc) {
     sc = viableCallable(result).asSummarizedCallable()
   }
-
-  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
-
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
-
-  Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
 
 module SourceSinkInterpretationInput implements
@@ -339,9 +343,10 @@ module SourceSinkInterpretationInput implements
 
 module Private {
   import Impl::Private
-  import Impl::Private::Types<TypesInput>
+  import Impl2
+  import Types<TypesInput>
 
-  module Steps = Impl::Private::Steps<StepsInput>;
+  module Steps = Impl2::Steps<StepsInput>;
 
   module External {
     import Impl::Private::External
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
index e51eaf4bbcb4..418573cae8cc 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
@@ -2,12 +2,14 @@ private import csharp
 private import TaintTrackingPublic
 private import FlowSummaryImpl as FlowSummaryImpl
 private import semmle.code.csharp.Caching
+private import semmle.code.csharp.dataflow.FlowSteps
 private import semmle.code.csharp.dataflow.internal.DataFlowDispatch
 private import semmle.code.csharp.dataflow.internal.DataFlowPrivate
 private import semmle.code.csharp.dispatch.Dispatch
 private import semmle.code.csharp.commons.ComparisonTest
 // import `TaintedMember` definitions from other files to avoid potential reevaluation
 private import semmle.code.csharp.frameworks.JsonNET
+private import semmle.code.csharp.frameworks.OData
 private import semmle.code.csharp.frameworks.WCF
 private import semmle.code.csharp.security.dataflow.flowsources.Remote
 
@@ -171,8 +173,9 @@ private module Cached {
     ) and
     model = ""
     or
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-      nodeTo.(FlowSummaryNode).getSummaryNode(), false, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, false, model)
+    or
+    any(AdditionalTaintStep a).step(nodeFrom, nodeTo) and model = "AdditionalTaintStep"
   }
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll b/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll
index 857212f90aac..53e6d359c212 100644
--- a/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll
@@ -547,6 +547,13 @@ class PositionalPatternExpr extends PatternExpr, @positional_pattern_expr {
   override string getAPrimaryQlClass() { result = "PositionalPatternExpr" }
 }
 
+/**
+ * A tuple pattern. For example, `var (x, y)`.
+ */
+class TuplePatternExpr extends TupleExpr, PatternExpr {
+  override string getAPrimaryQlClass() { result = "TuplePatternExpr" }
+}
+
 /** A list pattern. For example `[1, 2, int y]` in `x is [1, 2, int y]`. */
 class ListPatternExpr extends PatternExpr, @list_pattern_expr {
   override string toString() { result = "[ ... ]" }
@@ -1107,7 +1114,7 @@ class QualifiableExpr extends Expr, @qualifiable_expr {
 private Expr getAnAssignOrForeachChild() {
   result = any(AssignExpr e).getLeftOperand()
   or
-  result = any(ForeachStmt fs).getVariableDeclTuple()
+  result = any(ForEachStmt fs).getVariableDeclTuple()
   or
   result = getAnAssignOrForeachChild().getAChildExpr()
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/Microsoft.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/Microsoft.qll
index 261b15cd4440..f8e98f423a3e 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/Microsoft.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/Microsoft.qll
@@ -9,3 +9,16 @@ class MicrosoftNamespace extends Namespace {
     this.hasName("Microsoft")
   }
 }
+
+/** The `Microsoft.Net.Http.Headers.HeaderNames` class. */
+class MicrosoftNetHttpHeadersHeaderNames extends Class {
+  MicrosoftNetHttpHeadersHeaderNames() {
+    this.hasFullyQualifiedName("Microsoft.Net.Http.Headers", "HeaderNames")
+  }
+
+  /** Gets the `XFrameOptions` field. */
+  Field getXFrameOptionsField() { result = this.getField("XFrameOptions") }
+
+  /** Gets the `ContentSecurityPolicy` field. */
+  Field getContentSecurityPolicyField() { result = this.getField("ContentSecurityPolicy") }
+}
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/OData.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/OData.qll
new file mode 100644
index 000000000000..bc0cbb431e3f
--- /dev/null
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/OData.qll
@@ -0,0 +1,115 @@
+/**
+ * Provides taint modeling for `Microsoft.AspNet.OData`/`Microsoft.AspNetCore.OData`
+ * (and the older `System.Web.Http.OData`) OData action parameter binding.
+ *
+ * OData actions receive their untrusted payload in one of two shapes that
+ * bypass the usual "type used as an action-method parameter" taint modeling:
+ *
+ * - `ODataActionParameters`, an untyped `Dictionary<string, object>` whose
+ *   values are cast, `as`-converted, or type-tested to arbitrary model types
+ *   by the action method body.
+ * - `Delta<T>`, a change-tracking wrapper for PATCH/PUT requests, whose
+ *   tracked property values are exposed via `GetInstance()` (`GetEntity()` in
+ *   the older `System.Web.Http.OData`) or copied onto an existing entity via
+ *   `Patch`/`Put`/`CopyChangedValues`/`CopyUnchangedValues`.
+ *
+ * In both cases the type that ends up holding the client-controlled data has
+ * no static relationship to the action method's parameter types, so its
+ * members need to be taint-tracked explicitly.
+ */
+
+import csharp
+private import semmle.code.csharp.commons.Collections
+private import semmle.code.csharp.security.dataflow.flowsources.Remote
+
+/** The `ODataActionParameters` dictionary type, across OData library versions. */
+class ODataActionParametersClass extends Class {
+  ODataActionParametersClass() {
+    this.hasFullyQualifiedName("Microsoft.AspNet.OData", "ODataActionParameters") or
+    this.hasFullyQualifiedName("Microsoft.AspNetCore.OData.Formatter", "ODataActionParameters") or
+    this.hasFullyQualifiedName("System.Web.Http.OData", "ODataActionParameters")
+  }
+}
+
+/**
+ * Holds if `e` is (or, via local flow -- e.g. an upcast to `IDictionary<string, object>`
+ * -- may hold the value of) an `ODataActionParameters` dictionary.
+ */
+private predicate isODataActionParametersValue(Expr e) {
+  exists(ParameterAccess e0 | e0.getType() instanceof ODataActionParametersClass |
+    e0 = e or DataFlow::localExprFlow(e0, e)
+  )
+}
+
+/**
+ * An indexer read on an `ODataActionParameters` dictionary, e.g. `parameters["Foo"]`
+ * (including through an upcast to a base dictionary type/interface).
+ */
+class ODataActionParameterRead extends ElementAccess {
+  ODataActionParameterRead() { isODataActionParametersValue(this.getQualifier()) }
+}
+
+/** Holds if `e` may (locally) hold the value of an `ODataActionParameters` entry. */
+private predicate isODataParameterValue(Expr e) {
+  DataFlow::localExprFlow(any(ODataActionParameterRead r), e)
+}
+
+/** The generic ``Delta`1`` change-tracking class, across OData library versions. */
+class DeltaClass extends UnboundGenericClass {
+  DeltaClass() {
+    this.getNumberOfTypeParameters() = 1 and
+    (
+      this.hasFullyQualifiedName("Microsoft.AspNet.OData", "Delta`1") or
+      this.hasFullyQualifiedName("Microsoft.AspNetCore.OData.Deltas", "Delta`1") or
+      this.hasFullyQualifiedName("System.Web.Http.OData", "Delta`1")
+    )
+  }
+}
+
+/**
+ * A type that a value read out of `ODataActionParameters` is cast, `as`-converted,
+ * or type-tested to -- directly, or wrapped in a collection (`List<T>`,
+ * `IEnumerable<T>`, arrays, ...) -- or a type that is tracked by a `Delta<T>`.
+ */
+class ODataBoundType extends ValueOrRefType {
+  ODataBoundType() {
+    exists(Cast c | isODataParameterValue(c.getExpr()) |
+      this = c.getTargetType() or
+      this = c.getTargetType().(CollectionType).getElementType() or
+      this = c.getTargetType().(ParamsCollectionType).getElementType()
+    )
+    or
+    exists(IsExpr ie, Type t |
+      isODataParameterValue(ie.getExpr()) and
+      t = ie.getPattern().(TypePatternExpr).getCheckedType()
+    |
+      this = t or
+      this = t.(CollectionType).getElementType() or
+      this = t.(ParamsCollectionType).getElementType()
+    )
+    or
+    this = any(ConstructedClass c | c.getUnboundGeneric() instanceof DeltaClass).getTypeArgument(0)
+  }
+}
+
+/**
+ * Taint members (transitively) on types used in
+ * 1. Casts, `as`-conversions, or type tests applied to `ODataActionParameters` values.
+ * 2. The type argument of a `Delta<T>`.
+ *
+ * Note that this also impacts uses of such types in other contexts, the same
+ * trade-off `AspNetRemoteFlowSourceMember` (`Remote.qll`) makes for ASP.NET
+ * action-method parameters.
+ */
+private class ODataBoundMember extends TaintTracking::TaintedMember, CandidateMemberToTaint {
+  ODataBoundMember() {
+    exists(Type t, Type t0 | t = this.getDeclaringType() |
+      (t = t0 or t = t0.(CollectionType).getElementType()) and
+      (
+        t0 = any(ODataBoundMember m).getType()
+        or
+        t0 instanceof ODataBoundType
+      )
+    )
+  }
+}
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/microsoft/AspNetCore.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/microsoft/AspNetCore.qll
index 350465052d1a..1f5060a6ce06 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/microsoft/AspNetCore.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/microsoft/AspNetCore.qll
@@ -2,6 +2,8 @@
 
 import csharp
 import semmle.code.csharp.frameworks.Microsoft
+private import semmle.code.csharp.commons.Compilation
+private import semmle.code.csharp.frameworks.System
 
 /** The `Microsoft.AspNetCore` namespace. */
 class MicrosoftAspNetCoreNamespace extends Namespace {
@@ -142,6 +144,15 @@ class ValidateAntiForgeryAttribute extends Attribute {
   }
 }
 
+/**
+ * The `Microsoft.AspNetCore.Mvc.AutoValidateAntiforgeryTokenAttribute` class.
+ */
+class AutoValidateAntiforgeryTokenAttribute extends Class {
+  AutoValidateAntiforgeryTokenAttribute() {
+    this.hasFullyQualifiedName("Microsoft.AspNetCore.Mvc", "AutoValidateAntiforgeryTokenAttribute")
+  }
+}
+
 /**
  * A class that has a name like `[Auto...]Validate[...]Anti[Ff]orgery[...Token]` and implements `IFilterMetadata` interface
  * This class can be added to a collection of global `MvcOptions.Filters` collection.
@@ -162,8 +173,8 @@ class MicrosoftAspNetCoreMvcFilterCollection extends Class {
 
   /** Gets an `Add` method. */
   Method getAddMethod() {
-    result = this.getAMethod("Add") or
-    result = this.getABaseType().getAMethod("Add")
+    result = this.getAMethod(["Add", "Add`1"]) or
+    result = this.getABaseType().getAMethod(["Add", "Add`1"])
   }
 }
 
@@ -189,49 +200,238 @@ class MicrosoftAspNetCoreMvcControllerBaseClass extends Class {
   }
 }
 
+private predicate isPotentialMicrosoftAspNetCoreMvcController(Class controller) {
+  controller =
+    any(Class c |
+      (
+        exists(Assembly a |
+          a.getName() = ["Microsoft.AspNetCore.Mvc.Core", "Microsoft.AspNetCore.Mvc.ViewFeatures"]
+        ) or
+        exists(UsingNamespaceDirective ns |
+          ns.getImportedNamespace() instanceof MicrosoftAspNetCoreMvcNamespace
+        )
+      ) and
+      c.isPublic() and
+      not c instanceof Generic and
+      (
+        c.getABaseType*() instanceof MicrosoftAspNetCoreMvcControllerBaseClass
+        or
+        c.getABaseType*().getName().matches("%Controller")
+        or
+        c.getABaseType*()
+            .getAnAttribute()
+            .getType()
+            .getABaseType*()
+            // ApiControllerAttribute is derived from ControllerAttribute
+            .hasFullyQualifiedName("Microsoft.AspNetCore.Mvc", "ControllerAttribute")
+      ) and
+      not c.getABaseType*().getAnAttribute() instanceof MicrosoftAspNetCoreMvcNonControllerAttribute
+    )
+}
+
+bindingset[element]
+pragma[inline_late]
+private Compilation getACompilationFor(Element element) {
+  result.getAFileCompiled() = element.getFile()
+}
+
+private Assembly getAnAssemblyFor(Type type) {
+  result = getACompilationFor(type).getOutputAssembly()
+}
+
 /**
- * A valid ASP.NET Core controller according to:
- * https://docs.microsoft.com/en-us/aspnet/core/mvc/controllers/actions?view=aspnetcore-3.1
- * https://github.com/dotnet/aspnetcore/blob/b3c93967ba508b8ef139add27132d9483c1a9eb4/src/Mvc/Mvc.Core/src/Controllers/ControllerFeatureProvider.cs#L39-L75
+ * A method that is a registration of an ASP.NET Core MVC service, i.e. `AddControllers`, `AddControllersWithViews`, `AddMvc`, or `AddMvcCore`.
  */
-class MicrosoftAspNetCoreMvcController extends Class {
-  MicrosoftAspNetCoreMvcController() {
+class MicrosoftAspNetCoreMvcRegistration extends Method {
+  MicrosoftAspNetCoreMvcRegistration() {
+    this.hasFullyQualifiedName("Microsoft.Extensions.DependencyInjection",
+      ["MvcServiceCollectionExtensions", "MvcCoreServiceCollectionExtensions"],
+      ["AddControllers", "AddControllersWithViews", "AddMvc", "AddMvcCore"])
+  }
+}
+
+/** Holds if the method call is a registration of an ASP.NET Core MVC service. */
+predicate isMicrosoftAspNetCoreMvcRegistration(MethodCall call) {
+  call.getTarget() instanceof MicrosoftAspNetCoreMvcRegistration
+}
+
+private predicate isMicrosoftAspNetCoreMvcApplication(Compilation compilation) {
+  exists(MethodCall registration |
+    isMicrosoftAspNetCoreMvcRegistration(registration) and
+    compilation.getAFileCompiled() = registration.getFile()
+  )
+}
+
+private predicate isMicrosoftAspNetCoreMvcAddApplicationPart(MethodCall call) {
+  call.getTarget()
+      .hasFullyQualifiedName("Microsoft.Extensions.DependencyInjection",
+        ["MvcCoreMvcBuilderExtensions", "MvcCoreMvcCoreBuilderExtensions"], "AddApplicationPart")
+}
+
+private predicate isMicrosoftAspNetCoreMvcApplicationPart(Compilation application, Assembly part) {
+  isMicrosoftAspNetCoreMvcApplication(application) and
+  (
+    part = application.getOutputAssembly()
+    or
+    exists(AssemblyAttribute attr, StringLiteral assemblyName |
+      application.getAFileCompiled() = attr.getFile() and
+      attr.getType()
+          .hasFullyQualifiedName("Microsoft.AspNetCore.Mvc.ApplicationParts",
+            "ApplicationPartAttribute") and
+      assemblyName = attr.getArgument(0) and
+      assemblyName.getValue() = part.getName()
+    )
+    or
+    exists(MethodCall addPart, PropertyAccess assemblyAccess, Type partType |
+      application.getAFileCompiled() = addPart.getFile() and
+      isMicrosoftAspNetCoreMvcAddApplicationPart(addPart) and
+      assemblyAccess = addPart.getArgumentForName("assembly") and
+      assemblyAccess.getTarget().hasName("Assembly") and
+      assemblyAccess.getQualifier().(TypeofExpr).getTypeAccess().getTarget() = partType and
+      part = getAnAssemblyFor(partType)
+    )
+  )
+}
+
+private predicate isInMicrosoftAspNetCoreMvcApplication(Class controller, Compilation application) {
+  isMicrosoftAspNetCoreMvcApplicationPart(application, getAnAssemblyFor(controller))
+}
+
+private predicate hasMicrosoftAspNetCoreMvcAttributeRoute(Class controller) {
+  exists(Attribute attr |
     (
-      exists(Assembly a |
-        a.getName() = ["Microsoft.AspNetCore.Mvc.Core", "Microsoft.AspNetCore.Mvc.ViewFeatures"]
-      ) or
-      exists(UsingNamespaceDirective ns |
-        ns.getImportedNamespace() instanceof MicrosoftAspNetCoreMvcNamespace
+      attr = controller.getABaseType*().getAnAttribute()
+      or
+      exists(Method method |
+        controller.hasMember(method) and
+        attr = method.getOverridee*().getAnAttribute()
       )
     ) and
-    this.isPublic() and
-    not this instanceof Generic and
+    attr.getType()
+        .getABaseType*()
+        .getABaseInterface*()
+        .hasFullyQualifiedName("Microsoft.AspNetCore.Mvc.Routing", "IRouteTemplateProvider")
+  )
+}
+
+private predicate isMicrosoftAspNetCoreMvcConventionalEndpointMapping(MethodCall call) {
+  call.getTarget()
+      .hasFullyQualifiedName("Microsoft.AspNetCore.Builder",
+        "ControllerEndpointRouteBuilderExtensions",
+        [
+          "MapAreaControllerRoute", "MapControllerRoute", "MapDefaultControllerRoute",
+          "MapDynamicControllerRoute"
+        ])
+  or
+  call.getTarget()
+      .hasFullyQualifiedName("Microsoft.AspNetCore.Builder", "MvcApplicationBuilderExtensions",
+        "UseMvcWithDefaultRoute")
+  or
+  call.getTarget()
+      .hasFullyQualifiedName("Microsoft.AspNetCore.Builder", "MvcApplicationBuilderExtensions",
+        "UseMvc") and
+  exists(call.getArgumentForName("configureRoutes"))
+  or
+  call.getTarget()
+      .hasFullyQualifiedName("Microsoft.AspNetCore.Builder", "MvcAreaRouteBuilderExtensions",
+        "MapAreaRoute")
+}
+
+private predicate isMicrosoftAspNetCoreMvcAttributeEndpointMapping(MethodCall call) {
+  call.getTarget()
+      .hasFullyQualifiedName("Microsoft.AspNetCore.Builder",
+        "ControllerEndpointRouteBuilderExtensions", "MapControllers")
+  or
+  call.getTarget()
+      .hasFullyQualifiedName("Microsoft.AspNetCore.Builder", "MvcApplicationBuilderExtensions",
+        "UseMvc") and
+  not exists(call.getArgumentForName("configureRoutes"))
+}
+
+private predicate isMicrosoftAspNetCoreMvcFallbackEndpointMapping(MethodCall call, Class controller) {
+  call.getTarget()
+      .hasFullyQualifiedName("Microsoft.AspNetCore.Builder",
+        "ControllerEndpointRouteBuilderExtensions",
+        ["MapFallbackToAreaController", "MapFallbackToController"]) and
+  call.getArgumentForName("controller").getValue().toLowerCase() + "controller" =
+    controller.getName().toLowerCase() and
+  (
+    call.getTarget().hasName("MapFallbackToController")
+    or
+    call.getTarget().hasName("MapFallbackToAreaController") and
+    exists(Attribute area |
+      area = controller.getABaseType*().getAnAttribute() and
+      area.getType().hasFullyQualifiedName("Microsoft.AspNetCore.Mvc", "AreaAttribute") and
+      area.getArgument(0).getValue().toLowerCase() =
+        call.getArgumentForName("area").getValue().toLowerCase()
+    )
+  )
+}
+
+private predicate hasMicrosoftAspNetCoreMvcEndpointMapping(Compilation application, Class controller) {
+  isInMicrosoftAspNetCoreMvcApplication(controller, application) and
+  exists(MethodCall mapping |
+    application = getACompilationFor(mapping) and
     (
-      this.getABaseType*() instanceof MicrosoftAspNetCoreMvcControllerBaseClass
+      isMicrosoftAspNetCoreMvcConventionalEndpointMapping(mapping)
       or
-      this.getABaseType*().getName().matches("%Controller")
+      isMicrosoftAspNetCoreMvcAttributeEndpointMapping(mapping) and
+      hasMicrosoftAspNetCoreMvcAttributeRoute(controller)
       or
-      this.getABaseType*()
-          .getAnAttribute()
-          .getType()
-          .getABaseType*()
-          // ApiControllerAttribute is derived from ControllerAttribute
-          .hasFullyQualifiedName("Microsoft.AspNetCore.Mvc", "ControllerAttribute")
-    ) and
-    not this.getABaseType*().getAnAttribute() instanceof
-      MicrosoftAspNetCoreMvcNonControllerAttribute
-  }
+      isMicrosoftAspNetCoreMvcFallbackEndpointMapping(mapping, controller)
+    )
+  )
+}
+
+private predicate hasMicrosoftAspNetCoreMvcControllerIdentity(Class controller) {
+  controller.getABaseType*() instanceof MicrosoftAspNetCoreMvcControllerBaseClass
+  or
+  controller
+      .getABaseType*()
+      .getAnAttribute()
+      .getType()
+      .getABaseType*()
+      .hasFullyQualifiedName("Microsoft.AspNetCore.Mvc", "ControllerAttribute")
+}
+
+private predicate isDefaultMicrosoftAspNetCoreMvcController(Class controller) {
+  controller instanceof NonNestedType and
+  controller.isPublic() and
+  not controller.isAbstract() and
+  not controller instanceof Generic and
+  (
+    hasMicrosoftAspNetCoreMvcControllerIdentity(controller)
+    or
+    controller.getName().toLowerCase().matches("%controller") and
+    hasMicrosoftAspNetCoreMvcEndpointMapping(_, controller)
+  ) and
+  not controller.getABaseType*().getAnAttribute() instanceof
+    MicrosoftAspNetCoreMvcNonControllerAttribute
+}
+
+private predicate isMicrosoftAspNetCoreMvcIDisposableMethod(Method method) {
+  exists(Method baseMethod |
+    baseMethod = method.getOverridee*() and
+    not exists(baseMethod.getOverridee()) and
+    (
+      baseMethod.getExplicitlyImplementedInterface() instanceof SystemIDisposableInterface
+      or
+      baseMethod.getUndecoratedName() = "Dispose" and
+      baseMethod.getNumberOfParameters() = 0 and
+      baseMethod.getReturnType() instanceof VoidType and
+      baseMethod.getDeclaringType().getABaseInterface*() instanceof SystemIDisposableInterface
+    )
+  )
+}
 
-  /** Gets an action method for this controller. */
-  Method getAnActionMethod() {
-    result = this.getAMethod() and
-    result.isPublic() and
-    not result.isStatic() and
-    not result.getAnAttribute() instanceof MicrosoftAspNetCoreMvcNonActionAttribute
+/** A class treated as an owner of ASP.NET Core MVC controller helper methods. */
+class MicrosoftAspNetCoreMvcControllerHelperClass extends Class {
+  MicrosoftAspNetCoreMvcControllerHelperClass() {
+    isPotentialMicrosoftAspNetCoreMvcController(this)
   }
 
-  /** Gets a `Redirect*` method. */
-  Method getARedirectMethod() {
+  /** Gets a `Redirect*`, `Accepted*`, or `Created*` method. */
+  Method getAResponseMethod() {
     result = this.getAMethod() and
     (
       result.getName().matches("Redirect%")
@@ -243,6 +443,35 @@ class MicrosoftAspNetCoreMvcController extends Class {
   }
 }
 
+/**
+ * An ASP.NET Core MVC controller, as described by:
+ * https://learn.microsoft.com/en-us/aspnet/core/mvc/controllers/actions
+ * https://learn.microsoft.com/en-us/aspnet/core/mvc/advanced/app-parts
+ * https://learn.microsoft.com/en-us/aspnet/core/mvc/controllers/routing
+ * https://github.com/dotnet/aspnetcore/blob/747d2cdb584079a0c7309115979f13c331fb7df7/src/Mvc/Mvc.Core/src/Controllers/ControllerFeatureProvider.cs#L20-L75
+ * https://github.com/dotnet/aspnetcore/blob/747d2cdb584079a0c7309115979f13c331fb7df7/src/Mvc/Mvc.Core/src/ApplicationModels/DefaultApplicationModelProvider.cs#L410-L459
+ */
+class MicrosoftAspNetCoreMvcController extends Class {
+  MicrosoftAspNetCoreMvcController() { isDefaultMicrosoftAspNetCoreMvcController(this) }
+
+  /** Gets an action method for this controller. */
+  Method getAnActionMethod() {
+    this.hasMember(result) and
+    result.isPublic() and
+    not result.isStatic() and
+    not result.isAbstract() and
+    not result instanceof Generic and
+    not result.getOverridee*().getAnAttribute() instanceof MicrosoftAspNetCoreMvcNonActionAttribute and
+    not result.getOverridee*().getDeclaringType() instanceof ObjectType and
+    not isMicrosoftAspNetCoreMvcIDisposableMethod(result)
+  }
+
+  /** Gets a `Redirect*`, `Accepted*`, or `Created*` method. */
+  Method getARedirectMethod() {
+    result = this.(MicrosoftAspNetCoreMvcControllerHelperClass).getAResponseMethod()
+  }
+}
+
 /** The `Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper` interface. */
 class MicrosoftAspNetCoreMvcRenderingIHtmlHelperInterface extends Interface {
   MicrosoftAspNetCoreMvcRenderingIHtmlHelperInterface() {
@@ -262,6 +491,16 @@ class MicrosoftAspNetCoreMvcRazorPageBase extends Class {
 
   /** Gets the `WriteLiteral` method. */
   Method getWriteLiteralMethod() { result = this.getAMethod("WriteLiteral") }
+
+  /** Gets the `BeginWriteTagHelperAttribute` method. */
+  Method getBeginWriteTagHelperAttributeMethod() {
+    result = this.getAMethod("BeginWriteTagHelperAttribute")
+  }
+
+  /** Gets the `EndWriteTagHelperAttribute` method. */
+  Method getEndWriteTagHelperAttributeMethod() {
+    result = this.getAMethod("EndWriteTagHelperAttribute")
+  }
 }
 
 /** A class deriving from `Microsoft.AspNetCore.Http.HttpRequest`, implements `HttpRequest` in ASP.NET Core. */
@@ -336,6 +575,19 @@ class MicrosoftAspNetCoreHttpHeaderDictionaryExtensions extends RefType {
   Method getSetCommaSeparatedValuesMethod() { result = this.getAMethod("SetCommaSeparatedValues") }
 }
 
+/** The `Microsoft.AspNetCore.Http.IHeaderDictionary` interface. */
+class MicrosoftAspNetCoreHttpIHeaderDictionary extends RefType {
+  MicrosoftAspNetCoreHttpIHeaderDictionary() {
+    this.hasFullyQualifiedName("Microsoft.AspNetCore.Http", "IHeaderDictionary")
+  }
+
+  /** Gets the `XFrameOptions` property. */
+  Property getXFrameOptionsProperty() { result = this.getProperty("XFrameOptions") }
+
+  /** Gets the `ContentSecurityPolicy` property. */
+  Property getContentSecurityPolicyProperty() { result = this.getProperty("ContentSecurityPolicy") }
+}
+
 /** The `Microsoft.AspNetCore.Http.CookieOptions` class. */
 class MicrosoftAspNetCoreHttpCookieOptions extends RefType {
   MicrosoftAspNetCoreHttpCookieOptions() {
diff --git a/csharp/ql/lib/semmle/code/csharp/security/MissingXFrameOptionsQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/MissingXFrameOptionsQuery.qll
new file mode 100644
index 000000000000..41192823dafb
--- /dev/null
+++ b/csharp/ql/lib/semmle/code/csharp/security/MissingXFrameOptionsQuery.qll
@@ -0,0 +1,112 @@
+/** Provides predicates for recognizing clickjacking-related response-header configuration. */
+
+import csharp
+import semmle.code.csharp.dataflow.DataFlow
+import semmle.code.csharp.frameworks.microsoft.AspNetCore
+import semmle.code.csharp.frameworks.system.Web
+
+/** Holds if `name` is the `X-Frame-Options` header name, ignoring case. */
+bindingset[name]
+predicate isXFrameOptionsText(string name) { name.toLowerCase() = "x-frame-options" }
+
+/** Holds if `name` is the enforced `Content-Security-Policy` header name, ignoring case. */
+bindingset[name]
+predicate isContentSecurityPolicyText(string name) {
+  name.toLowerCase() = "content-security-policy"
+}
+
+/**
+ * Holds if `value` contains a `frame-ancestors` directive at the start of a CSP policy or
+ * after a directive or policy separator.
+ */
+bindingset[value]
+predicate containsFrameAncestorsDirective(string value) {
+  value.regexpMatch("(?is)(^|.*[;,])\\s*frame-ancestors(\\s|;|$).*")
+}
+
+private predicate isXFrameOptionsHeaderNameExpr(Expr name) {
+  isXFrameOptionsText(name.stripImplicit().getValue())
+  or
+  name.stripImplicit().(FieldAccess).getTarget() =
+    any(MicrosoftNetHttpHeadersHeaderNames f).getXFrameOptionsField()
+}
+
+private predicate isContentSecurityPolicyHeaderNameExpr(Expr name) {
+  isContentSecurityPolicyText(name.stripImplicit().getValue()) or
+  name.stripImplicit().(FieldAccess).getTarget() =
+    any(MicrosoftNetHttpHeadersHeaderNames f).getContentSecurityPolicyField()
+}
+
+private predicate containsFrameAncestorsDirectiveExpr(Expr value) {
+  containsFrameAncestorsDirective(value.stripImplicit().getValue())
+}
+
+private predicate isDirectResponseHeadersAccess(Expr expr) {
+  exists(PropertyAccess headers, MicrosoftAspNetCoreHttpHttpResponse response |
+    expr.stripImplicit() = headers and headers.getProperty() = response.getHeadersProperty()
+  )
+}
+
+private predicate isCallOnResponseHeadersAccess(Call call) {
+  exists(Expr qualifier |
+    call.(MethodCall).getQualifier() = qualifier or
+    call.(ExtensionMethodCall).getArgument(0) = qualifier or
+    call.(AccessorCall).getQualifier() = qualifier
+  |
+    exists(Expr directAccess |
+      isDirectResponseHeadersAccess(directAccess) and
+      DataFlow::localExprFlow(directAccess, qualifier.stripImplicit())
+    )
+  )
+}
+
+private predicate isClickjackingHeaderCall(MethodCall call) {
+  (
+    call.getTarget() = any(SystemWebHttpResponseClass r).getAppendHeaderMethod() or
+    call.getTarget() = any(SystemWebHttpResponseClass r).getAddHeaderMethod()
+  ) and
+  (
+    isXFrameOptionsHeaderNameExpr(call.getArgumentForName("name"))
+    or
+    isContentSecurityPolicyHeaderNameExpr(call.getArgumentForName("name")) and
+    containsFrameAncestorsDirectiveExpr(call.getArgumentForName("value"))
+  )
+}
+
+private predicate isClickjackingHeaderDictionaryLikeWrite(Call call) {
+  (
+    call.getTarget().hasUndecoratedName(["Append", "Add", "TryAdd"])
+    or
+    call.(IndexerCall).getTarget() instanceof Setter
+  ) and
+  (
+    isXFrameOptionsHeaderNameExpr(call.getArgumentForName("key"))
+    or
+    isContentSecurityPolicyHeaderNameExpr(call.getArgumentForName("key")) and
+    containsFrameAncestorsDirectiveExpr(call.getArgumentForName("value"))
+  )
+}
+
+private predicate isClickjackingPropertyWrite(Call c) {
+  c.getTarget() instanceof Setter and
+  (
+    c.(PropertyCall).getProperty() =
+      any(MicrosoftAspNetCoreHttpIHeaderDictionary dic).getXFrameOptionsProperty()
+    or
+    c.(PropertyCall).getProperty() =
+      any(MicrosoftAspNetCoreHttpIHeaderDictionary dic).getContentSecurityPolicyProperty() and
+    containsFrameAncestorsDirectiveExpr(c.getArgumentForName("value"))
+  )
+}
+
+/** Gets an expression that configures a clickjacking-related response header. */
+Call getAClickjackingHeaderWrite() {
+  isClickjackingHeaderCall(result)
+  or
+  isCallOnResponseHeadersAccess(result) and
+  (
+    isClickjackingHeaderDictionaryLikeWrite(result)
+    or
+    isClickjackingPropertyWrite(result)
+  )
+}
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll
index bad6c990fa7b..1e53fccaaea1 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll
@@ -251,7 +251,8 @@ class AspNetCoreRedirectSink extends Sink {
   AspNetCoreRedirectSink() {
     exists(MethodCall mc |
       mc.getTarget() = any(MicrosoftAspNetCoreHttpHttpResponse response).getRedirectMethod() or
-      mc.getTarget() = any(MicrosoftAspNetCoreMvcController response).getARedirectMethod()
+      mc.getTarget() =
+        any(MicrosoftAspNetCoreMvcControllerHelperClass response).getAResponseMethod()
     |
       // Response.Redirect uses 'location' parameter
       this.getExpr() = mc.getArgumentForName("location")
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsinks/Html.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsinks/Html.qll
index 362a993e5321..bcc36a54abad 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsinks/Html.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsinks/Html.qll
@@ -177,14 +177,94 @@ class MicrosoftAspNetCoreMvcHtmlHelperRawSink extends AspNetCoreHtmlSink {
   }
 }
 
+/**
+ * Holds if `writeLiteral` is a call to `RazorPageBase.WriteLiteral` whose argument is captured
+ * between a matching pair of `BeginWriteTagHelperAttribute()`/`EndWriteTagHelperAttribute()`
+ * calls, in the same basic block, with no other such calls in between.
+ *
+ * The Razor source generator emits this bracketing for every literal or expression segment of an
+ * HTML attribute value on an element that also carries a tag helper (for example `asp-for`). Such
+ * a `WriteLiteral` call does not write directly to the response: `WriteLiteral` appends to an
+ * internal string buffer, and `EndWriteTagHelperAttribute()` returns that buffer as a tag helper
+ * attribute value rather than as page markup. This is therefore not a direct-write sink, unlike an
+ * unbracketed `WriteLiteral` call, whose argument is written straight to the response.
+ *
+ * Because a basic block cannot contain a branch, requiring `beginCall`, `writeLiteral`, and
+ * `endCall` to appear (in that order) in the same basic block, with no other
+ * `Begin`/`EndWriteTagHelperAttribute` call strictly between `beginCall` and `endCall`,
+ * guarantees that `beginCall`/`endCall` are the immediately enclosing bracket around
+ * `writeLiteral` on every path that reaches it (that is, the bracket opened by `beginCall` is
+ * still open, and not yet closed by some other `endCall`, at the point `writeLiteral` executes).
+ * No other such call can coincide with `writeLiteral` itself, so checking the whole open interval
+ * between `beginCall` and `endCall` is equivalent to checking it on both sides of `writeLiteral`
+ * separately.
+ *
+ * `beginCall`, `writeLiteral`, and `endCall` are additionally required to have an implicit `this`
+ * qualifier, which is how the Razor source generator always emits these calls. Combined with all
+ * three calls being required to lie in the same basic block (and hence the same method body),
+ * this ensures all three calls act on the same page instance, so a bracket on one page cannot be
+ * mistaken for a bracket around a `WriteLiteral` call on a different page.
+ *
+ * The `WriteLiteral`/`BeginWriteTagHelperAttribute`/`EndWriteTagHelperAttribute` methods are
+ * looked up via `any(MicrosoftAspNetCoreMvcRazorPageBase page).get...Method()` rather than
+ * through a single shared `page` variable bound across `writeLiteral`, `beginCall`, and
+ * `endCall`. These methods are inherited (not overridden) from the shared `RazorPageBase`
+ * framework type, so every generated Razor page class resolves to the same handful of `Method`
+ * entities; binding a single `page` variable across all three calls would force the join to be
+ * repeated once per generated page class in the codebase, rather than once per distinct `Method`,
+ * causing severe performance degradation on codebases with many Razor views.
+ */
+private predicate isBracketedForTagHelperAttribute(Call writeLiteral) {
+  exists(MethodCall beginCall, MethodCall endCall, BasicBlock bb, int i, int j, int k |
+    bb = writeLiteral.getBasicBlock() and
+    writeLiteral = any(MicrosoftAspNetCoreMvcRazorPageBase page).getWriteLiteralMethod().getACall() and
+    beginCall =
+      any(MicrosoftAspNetCoreMvcRazorPageBase page)
+          .getBeginWriteTagHelperAttributeMethod()
+          .getACall() and
+    endCall =
+      any(MicrosoftAspNetCoreMvcRazorPageBase page).getEndWriteTagHelperAttributeMethod().getACall() and
+    writeLiteral.(QualifiableExpr).hasImplicitThisQualifier() and
+    beginCall.hasImplicitThisQualifier() and
+    endCall.hasImplicitThisQualifier() and
+    bb.getNode(i) = beginCall.getControlFlowNode() and
+    bb.getNode(j) = writeLiteral.getControlFlowNode() and
+    bb.getNode(k) = endCall.getControlFlowNode() and
+    i < j and
+    j < k and
+    not exists(int l, Call other |
+      (
+        other =
+          any(MicrosoftAspNetCoreMvcRazorPageBase page)
+              .getBeginWriteTagHelperAttributeMethod()
+              .getACall() or
+        other =
+          any(MicrosoftAspNetCoreMvcRazorPageBase page)
+              .getEndWriteTagHelperAttributeMethod()
+              .getACall()
+      ) and
+      bb.getNode(l) = other.getControlFlowNode() and
+      i < l and
+      l < k
+    )
+  )
+}
+
 /**
  * An expression that is used as an argument to `Page.WriteLiteral` in ASP.NET 6.0 razor page, typically in
  * a `.cshtml` file.
+ *
+ * `WriteLiteral` calls whose argument is captured for a tag helper attribute value (see
+ * `isBracketedForTagHelperAttribute`) are excluded, since such calls buffer the value as a tag
+ * helper attribute rather than writing it directly to the response.
  */
 class MicrosoftAspNetRazorPageWriteLiteralSink extends AspNetCoreHtmlSink {
   MicrosoftAspNetRazorPageWriteLiteralSink() {
-    this.getExpr() =
-      any(MicrosoftAspNetCoreMvcRazorPageBase h).getWriteLiteralMethod().getACall().getAnArgument()
+    exists(Call writeLiteral |
+      writeLiteral = any(MicrosoftAspNetCoreMvcRazorPageBase h).getWriteLiteralMethod().getACall() and
+      this.getExpr() = writeLiteral.getAnArgument() and
+      not isBracketedForTagHelperAttribute(writeLiteral)
+    )
   }
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsources/Remote.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsources/Remote.qll
index 68c06a1828de..2a04d9c24c3d 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsources/Remote.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsources/Remote.qll
@@ -117,7 +117,8 @@ class AspNetServiceRemoteFlowSource extends AspNetRemoteFlowSource, DataFlow::Pa
   override string getSourceType() { result = "ASP.NET web service input" }
 }
 
-private class CandidateMemberToTaint extends Member {
+/** A public, non-static, auto-implemented property or field, candidate for taint-tracking. */
+class CandidateMemberToTaint extends Member {
   CandidateMemberToTaint() {
     this.isPublic() and
     not this.isStatic() and
@@ -306,7 +307,19 @@ class AspNetCoreActionMethodParameter extends AspNetCoreRemoteFlowSource, DataFl
   AspNetCoreActionMethodParameter() {
     exists(Parameter p |
       p = this.getParameter() and
-      p.fromSource()
+      p.fromSource() and
+      not exists(Attribute attr, ValueOrRefType attributeBase | attr = p.getAnAttribute() |
+        attributeBase = attr.getType().getABaseType*() and
+        (
+          attributeBase
+              .getABaseInterface*()
+              .hasFullyQualifiedName("Microsoft.AspNetCore.Http.Metadata", "IFromServiceMetadata")
+          or
+          attributeBase
+              .hasFullyQualifiedName("Microsoft.Extensions.DependencyInjection",
+                "FromKeyedServicesAttribute")
+        )
+      )
     |
       p = any(MicrosoftAspNetCoreMvcController c).getAnActionMethod().getAParameter()
     )
diff --git a/csharp/ql/lib/utils/test/InlineExpectationsTestQuery.ql b/csharp/ql/lib/utils/test/InlineExpectationsTestQuery.ql
index 35901ee64012..1c5be4160ae0 100644
--- a/csharp/ql/lib/utils/test/InlineExpectationsTestQuery.ql
+++ b/csharp/ql/lib/utils/test/InlineExpectationsTestQuery.ql
@@ -6,16 +6,4 @@ private import csharp
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>
diff --git a/csharp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll b/csharp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
index 6916c5f61067..f623d683dca6 100644
--- a/csharp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/csharp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
@@ -49,4 +49,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = CS::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(CS::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }
diff --git a/csharp/ql/src/API Abuse/NoDisposeCallOnLocalIDisposable.ql b/csharp/ql/src/API Abuse/NoDisposeCallOnLocalIDisposable.ql
index 3fc8e07f6afe..e99647939c38 100644
--- a/csharp/ql/src/API Abuse/NoDisposeCallOnLocalIDisposable.ql	
+++ b/csharp/ql/src/API Abuse/NoDisposeCallOnLocalIDisposable.ql	
@@ -59,7 +59,7 @@ module DisposeCallOnLocalIDisposableConfig implements DataFlow::ConfigSig {
       exists(UsingStmt us | us.getAnExpr() = e)
       or
       // Foreach calls Dispose
-      exists(ForeachStmt fs | fs.getIterableExpr() = e)
+      exists(ForEachStmt fs | fs.getIterableExpr() = e)
       or
       // As are disposables on which the Dispose method is called explicitly
       exists(MethodCall mc |
diff --git a/csharp/ql/src/Bad Practices/CallsUnmanagedCode.qhelp b/csharp/ql/src/Bad Practices/CallsUnmanagedCode.qhelp
index d1ceae7b2f36..4d5d99186d7d 100644
--- a/csharp/ql/src/Bad Practices/CallsUnmanagedCode.qhelp	
+++ b/csharp/ql/src/Bad Practices/CallsUnmanagedCode.qhelp	
@@ -28,7 +28,7 @@ the User32.dll library.</p>
 <references>
 
   <li>MSDN, C# Reference <a href="http://msdn.microsoft.com/en-us/library/e59b22c5(v=vs.80).aspx">extern</a>.</li>
-  <li>Wikipedia, <a href="http://en.wikipedia.org/wiki/Managed_code">Managed code</a>.</li>
+  <li>Wikipedia, <a href="https://en.wikipedia.org/wiki/Managed_code">Managed code</a>.</li>
 
 </references>
 </qhelp>
diff --git a/csharp/ql/src/Bad Practices/Comments/TodoComments.qhelp b/csharp/ql/src/Bad Practices/Comments/TodoComments.qhelp
index d8a4359750f3..f65d6809b4a7 100644
--- a/csharp/ql/src/Bad Practices/Comments/TodoComments.qhelp	
+++ b/csharp/ql/src/Bad Practices/Comments/TodoComments.qhelp	
@@ -44,7 +44,7 @@ Approxion:
 </li>
 <li>
 Wikipedia:
-<a href="http://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Tags">Comment tags</a>.
+<a href="https://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Tags">Comment tags</a>.
 </li>
 
 
diff --git a/csharp/ql/src/Bad Practices/Declarations/EmptyInterface.qhelp b/csharp/ql/src/Bad Practices/Declarations/EmptyInterface.qhelp
index b92bf3533b4d..68c9437b84f0 100644
--- a/csharp/ql/src/Bad Practices/Declarations/EmptyInterface.qhelp	
+++ b/csharp/ql/src/Bad Practices/Declarations/EmptyInterface.qhelp	
@@ -24,7 +24,7 @@ being used as a marker.</p>
 </example>
 <references>
 
-  <li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Marker_interface_pattern">Marker interface pattern</a></li>
+  <li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Marker_interface_pattern">Marker interface pattern</a></li>
   <li>Microsoft: <a href="https://docs.microsoft.com/en-us/dotnet/csharp/tutorials/attributes">Using Attributes in C#</a></li>
 
 
diff --git a/csharp/ql/src/Bad Practices/UnmanagedCodeCheck.qhelp b/csharp/ql/src/Bad Practices/UnmanagedCodeCheck.qhelp
index 7c0f24517255..ac13c5bc118b 100644
--- a/csharp/ql/src/Bad Practices/UnmanagedCodeCheck.qhelp	
+++ b/csharp/ql/src/Bad Practices/UnmanagedCodeCheck.qhelp	
@@ -23,7 +23,7 @@ same function being performed by managed code is shown after.</p>
 <references>
 
   <li>MSDN, C# Reference <a href="http://msdn.microsoft.com/en-us/library/e59b22c5(v=vs.80).aspx">extern</a>.</li>
-  <li>Wikipedia, <a href="http://en.wikipedia.org/wiki/Managed_code">Managed code</a>.</li>
+  <li>Wikipedia, <a href="https://en.wikipedia.org/wiki/Managed_code">Managed code</a>.</li>
 
 </references>
 </qhelp>
diff --git a/csharp/ql/src/Bad Practices/VirtualCallInConstructorOrDestructor.ql b/csharp/ql/src/Bad Practices/VirtualCallInConstructorOrDestructor.ql
index a29b39d33a10..5effa2f27650 100644
--- a/csharp/ql/src/Bad Practices/VirtualCallInConstructorOrDestructor.ql	
+++ b/csharp/ql/src/Bad Practices/VirtualCallInConstructorOrDestructor.ql	
@@ -19,6 +19,7 @@ predicate virtualCallToSelfInConstructor(Expr e) {
     (c instanceof Constructor or c instanceof Destructor) and
     t = c.getDeclaringType() and
     virtualAccessWithThisQualifier(e, d) and
+    not e = any(NameOfExpr ne).getAccess().getAChildExpr*() and
     t.getABaseType*() = d.getDeclaringType() and
     not t.isSealed() and
     not overriddenSealed(t.getABaseType*(), d)
@@ -34,17 +35,15 @@ predicate overriddenSealed(RefType t, Virtualizable d) {
 }
 
 predicate virtualAccessWithThisQualifier(Expr e, Member d) {
-  exists(VirtualMethodCall c |
-    c = e and c.getTarget() = d and c.hasThisQualifier() and not c.isImplicit()
-  )
+  e = any(VirtualMethodCall c | c.getTarget() = d and c.hasThisQualifier() and not c.isImplicit())
   or
-  exists(VirtualMethodAccess c | c = e and c.getTarget() = d and c.hasThisQualifier())
+  e = any(VirtualMethodAccess c | c.getTarget() = d and c.hasThisQualifier())
   or
-  exists(VirtualPropertyAccess c | c = e and c.getTarget() = d and c.hasThisQualifier())
+  e = any(VirtualPropertyAccess c | c.getTarget() = d and c.hasThisQualifier())
   or
-  exists(VirtualIndexerAccess c | c = e and c.getTarget() = d and c.hasThisQualifier())
+  e = any(VirtualIndexerAccess c | c.getTarget() = d and c.hasThisQualifier())
   or
-  exists(VirtualEventAccess c | c = e and c.getTarget() = d and c.hasThisQualifier())
+  e = any(VirtualEventAccess c | c.getTarget() = d and c.hasThisQualifier())
 }
 
 from Expr e
diff --git a/csharp/ql/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index f3aee337480f..ca515fcf96cd 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,3 +1,57 @@
+## 1.11.0
+
+### Query Metadata Changes
+
+* The `external/cwe/cwe-730` tag has been removed from `cs/redos` and `cs/regex-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
+
+## 1.10.2
+
+### Minor Analysis Improvements
+
+* The `cs/simplifiable-boolean-expression` query now produces fewer false-positive results when type information is incomplete.
+
+## 1.10.1
+
+### Minor Analysis Improvements
+
+* The `cs/web/missing-x-frame-options` query now recognizes clickjacking protection configured
+  through ASP.NET Core response headers and enforced Content Security Policy `frame-ancestors`
+  directives.
+
+## 1.10.0
+
+### New Queries
+
+* Added a new query, `cs/linq/missed-firstordefault`, that detects `foreach` loops that can be expressed more clearly using LINQ's `FirstOrDefault` method.
+
+### Minor Analysis Improvements
+
+* The `cs/linq/missed-*` queries no longer suggest rewrites that would capture `in`, `out`, or `ref` parameters in a lambda, fixing false-positive results for transformations that would not compile.
+* The `cs/web/missing-token-validation` query now recognizes an ASP.NET Core `AutoValidateAntiforgeryTokenAttribute` registered as a global MVC filter through `AddControllersWithViews` (and friends), avoiding false-positive results for covered actions.
+
+## 1.9.3
+
+### Minor Analysis Improvements
+
+* The `cs/linq/missed-where` query no longer flags `foreach` loops where the matching branch terminates the method, iterator, or loop instead of continuing with filtered loop work.
+
+## 1.9.2
+
+### Minor Analysis Improvements
+
+* The `cs/simplifiable-boolean-expression` query no longer suggests replacing a negated comparison when the replacement could recursively call an enclosing user-defined operator in `build-mode: none` databases.
+* The `cs/web/missing-token-validation` query now recognizes enabled ASP.NET Core `RequireAntiforgeryToken` attributes when antiforgery middleware is used.
+* The query `cs/virtual-call-in-constructor` has been improved. Uses of virtual members in `nameof` expressions are no longer reported, since they are not calls.
+* Static constructors are now used as the enclosing callable for static member initializer expressions. This improves the precision of a range of queries, including `cs/useless-assignment-to-local` and `cs/dereferenced-value-may-be-null`.
+
+### Bug Fixes
+
+* The query `cs/useless-cast-to-self` no longer reports casts when both the expression type and the cast target type are unknown, which can occur in `build-mode: none` databases.
+
+## 1.9.1
+
+No user-facing changes.
+
 ## 1.9.0
 
 ### Query Metadata Changes
diff --git a/csharp/ql/src/Dead Code/DeadStoreOfLocal.qhelp b/csharp/ql/src/Dead Code/DeadStoreOfLocal.qhelp
index 6e4ca17ec6a7..628e683f2ca5 100644
--- a/csharp/ql/src/Dead Code/DeadStoreOfLocal.qhelp	
+++ b/csharp/ql/src/Dead Code/DeadStoreOfLocal.qhelp	
@@ -64,7 +64,7 @@ The revised example eliminates the unread assignments.</p>
 <references>
 
 
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Dead_store">Dead store</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Dead_store">Dead store</a>.</li>
 <li>MSDN, Code Analysis for Managed Code, <a href="http://msdn.microsoft.com/en-us/library/ms182278.aspx">CA1804: Remove unused locals</a>.</li>
 <li>Microsoft: <a href="https://docs.microsoft.com/en-us/dotnet/csharp/whats-new/csharp-7#discards">What's new in C# 7 - Discards</a>.</li>
 
diff --git a/csharp/ql/src/Dead Code/DeadStoreOfLocal.ql b/csharp/ql/src/Dead Code/DeadStoreOfLocal.ql
index 20f522e7b484..dc1647f14f83 100644
--- a/csharp/ql/src/Dead Code/DeadStoreOfLocal.ql	
+++ b/csharp/ql/src/Dead Code/DeadStoreOfLocal.ql	
@@ -31,11 +31,11 @@ class RelevantDefinition extends AssignableDefinition {
       any(LocalVariableDeclExpr lvde |
         lvde = any(SpecificCatchClause scc).getVariableDeclExpr()
         or
-        lvde = any(ForeachStmt fs).getVariableDeclExpr() and
+        lvde = any(ForEachStmt fs).getVariableDeclExpr() and
         not lvde.getName() = "_"
       )
     or
-    this instanceof AssignableDefinitions::PatternDefinition
+    this instanceof AssignableDefinitions::TopLevelPatternDefinition
     or
     this instanceof AssignableDefinitions::AssignOperationDefinition
   }
diff --git a/csharp/ql/src/Language Abuse/ForeachCapture.ql b/csharp/ql/src/Language Abuse/ForeachCapture.ql
index 2ed24b42eba9..77226bdead79 100644
--- a/csharp/ql/src/Language Abuse/ForeachCapture.ql	
+++ b/csharp/ql/src/Language Abuse/ForeachCapture.ql	
@@ -23,17 +23,17 @@ predicate lambdaCaptures(AnonymousFunctionExpr lambda, Variable v) {
   exists(VariableAccess va | va.getEnclosingCallable() = lambda | va.getTarget() = v)
 }
 
-predicate lambdaCapturesLoopVariable(AnonymousFunctionExpr lambda, ForeachStmt loop, Variable v) {
+predicate lambdaCapturesLoopVariable(AnonymousFunctionExpr lambda, ForEachStmt loop, Variable v) {
   lambdaCaptures(lambda, v) and
-  inForeachStmtBody(loop, lambda) and
+  inForEachStmtBody(loop, lambda) and
   loop.getVariable() = v
 }
 
-predicate inForeachStmtBody(ForeachStmt loop, Element e) {
+predicate inForEachStmtBody(ForEachStmt loop, Element e) {
   e = loop.getBody()
   or
   exists(Element mid |
-    inForeachStmtBody(loop, mid) and
+    inForEachStmtBody(loop, mid) and
     e = mid.getAChild()
   )
 }
@@ -53,7 +53,7 @@ module LambdaDataFlow {
     exists(DataFlow::Node sink | flow(DataFlow::exprNode(lambda), sink) |
       storage = getAssignmentTarget(sink.asExpr())
     ) and
-    exists(ForeachStmt loop | lambdaCapturesLoopVariable(lambda, loop, loopVar) |
+    exists(ForEachStmt loop | lambdaCapturesLoopVariable(lambda, loop, loopVar) |
       not declaredInsideLoop(loop, storage)
     )
   }
@@ -103,9 +103,9 @@ Element getCollectionAssignmentTarget(Expr e) {
 }
 
 // Variable v is declared inside the loop body
-predicate declaredInsideLoop(ForeachStmt loop, LocalVariable v) {
+predicate declaredInsideLoop(ForEachStmt loop, LocalVariable v) {
   exists(LocalVariableDeclStmt decl | decl.getVariableDeclExpr(_).getVariable() = v |
-    inForeachStmtBody(loop, decl)
+    inForEachStmtBody(loop, decl)
   )
 }
 
diff --git a/csharp/ql/src/Language Abuse/SimplifyBoolExpr.ql b/csharp/ql/src/Language Abuse/SimplifyBoolExpr.ql
index 8fea284ae317..5656da73af71 100644
--- a/csharp/ql/src/Language Abuse/SimplifyBoolExpr.ql	
+++ b/csharp/ql/src/Language Abuse/SimplifyBoolExpr.ql	
@@ -13,56 +13,88 @@
 import csharp
 
 /**
- * Holds if expression `expr` has Boolean `value` at child `child`.
- * No other child nodes are boolean literals.
+ * Holds if the left operand of a binary operation is a Boolean literal with the specified value
+ * and the right operand is not a Boolean literal.
  */
-predicate literalChild(Expr expr, int child, boolean value) {
-  value = expr.getChild(child).(BoolLiteral).getBoolValue() and
-  forall(int c | c != child | not expr.getChild(c) instanceof BoolLiteral)
+predicate binaryLiteralLeft(BinaryOperation op, boolean value) {
+  value = op.getLeftOperand().(BoolLiteral).getBoolValue() and
+  not op.getRightOperand() instanceof BoolLiteral
 }
 
 /**
- * Expression `expr` has Boolean `value1` at child `child1`, and boolean `value2` at `child2`.
- * No other child nodes are boolean literals.
+ * Holds if the right operand of a binary operation is a Boolean literal with the specified value
+ * and the left operand is not a Boolean literal.
  */
-predicate literalChildren(Expr expr, int child1, boolean value1, int child2, boolean value2) {
-  value1 = expr.getChild(child1).(BoolLiteral).getBoolValue() and
-  value2 = expr.getChild(child2).(BoolLiteral).getBoolValue() and
-  forall(int c | c != child1 and c != child2 | not expr.getChild(c) instanceof BoolLiteral)
+predicate binaryLiteralRight(BinaryOperation op, boolean value) {
+  value = op.getRightOperand().(BoolLiteral).getBoolValue() and
+  not op.getLeftOperand() instanceof BoolLiteral
 }
 
-predicate rewriteBinaryExpr(BinaryOperation op, boolean value, string oldPattern) {
-  literalChild(op, 0, value) and oldPattern = value + " " + op.getOperator() + " A"
-  or
-  literalChild(op, 1, value) and oldPattern = "A " + op.getOperator() + " " + value
+/**
+ * Holds if the 'then' branch of a conditional expression is a Boolean literal with the specified value
+ * and the 'condition' or 'else' branch are not Boolean literals.
+ */
+predicate conditionalThenLiteral(ConditionalExpr cond, boolean value) {
+  value = cond.getThen().(BoolLiteral).getBoolValue() and
+  not cond.getCondition() instanceof BoolLiteral and
+  not cond.getElse() instanceof BoolLiteral
 }
 
-bindingset[withFalseOperand, withTrueOperand]
-predicate rewriteBinaryExpr(
-  BinaryOperation op, string oldPattern, string withFalseOperand, string withTrueOperand,
-  string newPattern
-) {
-  rewriteBinaryExpr(op, false, oldPattern) and newPattern = withFalseOperand
-  or
-  rewriteBinaryExpr(op, true, oldPattern) and newPattern = withTrueOperand
+/**
+ * Holds if the 'else' branch of a conditional expression is a Boolean literal with the specified value
+ * and the 'condition' or 'then' branch are not Boolean literals.
+ */
+predicate conditionalElseLiteral(ConditionalExpr cond, boolean value) {
+  value = cond.getElse().(BoolLiteral).getBoolValue() and
+  not cond.getCondition() instanceof BoolLiteral and
+  not cond.getThen() instanceof BoolLiteral
+}
+
+/**
+ * Holds if both the 'then' and 'else' branches of a conditional expression are Boolean literals with the specified values
+ * and the 'condition' branch is not a Boolean literal.
+ */
+predicate conditionalThenAndElseLiteral(ConditionalExpr cond, boolean thenValue, boolean elseValue) {
+  thenValue = cond.getThen().(BoolLiteral).getBoolValue() and
+  elseValue = cond.getElse().(BoolLiteral).getBoolValue() and
+  not cond.getCondition() instanceof BoolLiteral
+}
+
+predicate rewriteBinaryExpr(BinaryOperation op, boolean value, string oldPattern) {
+  op.getLeftOperand().getType() instanceof BoolType and
+  op.getRightOperand().getType() instanceof BoolType and
+  (
+    binaryLiteralLeft(op, value) and oldPattern = value + " " + op.getOperator() + " A"
+    or
+    binaryLiteralRight(op, value) and oldPattern = "A " + op.getOperator() + " " + value
+  )
 }
 
 predicate rewriteConditionalExpr(ConditionalExpr cond, string oldPattern, string newPattern) {
-  literalChild(cond, 1, false) and oldPattern = "A ? false : B" and newPattern = "!A && B"
-  or
-  literalChild(cond, 1, true) and oldPattern = "A ? true : B" and newPattern = "A || B"
-  or
-  literalChild(cond, 2, false) and oldPattern = "A ? B : false" and newPattern = "A && B"
-  or
-  literalChild(cond, 2, true) and oldPattern = "A ? B : true" and newPattern = "!A || B"
-  or
-  exists(boolean b | literalChildren(cond, 1, b, 2, b) |
-    oldPattern = "A ? " + b + " : " + b and newPattern = b.toString()
+  cond.getCondition().getType() instanceof BoolType and
+  cond.getThen().getType() instanceof BoolType and
+  cond.getElse().getType() instanceof BoolType and
+  (
+    conditionalThenLiteral(cond, false) and oldPattern = "A ? false : B" and newPattern = "!A && B"
+    or
+    conditionalThenLiteral(cond, true) and oldPattern = "A ? true : B" and newPattern = "A || B"
+    or
+    conditionalElseLiteral(cond, false) and oldPattern = "A ? B : false" and newPattern = "A && B"
+    or
+    conditionalElseLiteral(cond, true) and oldPattern = "A ? B : true" and newPattern = "!A || B"
+    or
+    exists(boolean b | conditionalThenAndElseLiteral(cond, b, b) |
+      oldPattern = "A ? " + b + " : " + b and newPattern = b.toString()
+    )
+    or
+    conditionalThenAndElseLiteral(cond, true, false) and
+    oldPattern = "A ? true : false" and
+    newPattern = "A"
+    or
+    conditionalThenAndElseLiteral(cond, false, true) and
+    oldPattern = "A ? false : true" and
+    newPattern = "!A"
   )
-  or
-  literalChildren(cond, 1, true, 2, false) and oldPattern = "A ? true : false" and newPattern = "A"
-  or
-  literalChildren(cond, 1, false, 2, true) and oldPattern = "A ? false : true" and newPattern = "!A"
 }
 
 predicate negatedOperators(string op, string negated) {
@@ -75,6 +107,23 @@ predicate negatedOperators(string op, string negated) {
   negatedOperators(negated, op)
 }
 
+/** Holds if replacing `expr` with `operatorName` could call an enclosing operator. */
+private predicate couldCallEnclosingOperator(LogicalNotExpr expr, string operatorName) {
+  exists(BinaryOperation binary, Operator enclosingOperator |
+    binary = expr.getOperand() and
+    enclosingOperator = expr.getEnclosingCallable().getEnclosingCallable*() and
+    enclosingOperator.getName() = operatorName and
+    binary
+        .getLeftOperand()
+        .getType()
+        .isImplicitlyConvertibleTo(enclosingOperator.getParameter(0).getType()) and
+    binary
+        .getRightOperand()
+        .getType()
+        .isImplicitlyConvertibleTo(enclosingOperator.getParameter(1).getType())
+  )
+}
+
 predicate simplifyBinaryExpr(string op, string withFalseOperand, string withTrueOperand) {
   op = "==" and withTrueOperand = "A" and withFalseOperand = "!A"
   or
@@ -90,19 +139,28 @@ predicate pushNegation(LogicalNotExpr expr, string oldPattern, string newPattern
   or
   exists(string oldOperator, string newOperator |
     oldOperator = expr.getOperand().(BinaryOperation).getOperator() and
-    negatedOperators(oldOperator, newOperator)
+    negatedOperators(oldOperator, newOperator) and
+    not couldCallEnclosingOperator(expr, newOperator)
   |
     oldPattern = "!(A " + oldOperator + " B)" and
     newPattern = "A " + newOperator + " B"
   )
 }
 
-predicate rewrite(Expr expr, string oldPattern, string newPattern) {
+predicate rewriteBinaryOperation(BinaryOperation op, string oldPattern, string newPattern) {
   exists(string withFalseOperand, string withTrueOperand |
-    simplifyBinaryExpr(expr.(BinaryOperation).getOperator(), withFalseOperand, withTrueOperand)
+    simplifyBinaryExpr(op.getOperator(), withFalseOperand, withTrueOperand)
   |
-    rewriteBinaryExpr(expr, oldPattern, withFalseOperand, withTrueOperand, newPattern)
+    rewriteBinaryExpr(op, false, oldPattern) and
+    newPattern = withFalseOperand
+    or
+    rewriteBinaryExpr(op, true, oldPattern) and
+    newPattern = withTrueOperand
   )
+}
+
+predicate rewrite(Expr expr, string oldPattern, string newPattern) {
+  rewriteBinaryOperation(expr, oldPattern, newPattern)
   or
   rewriteConditionalExpr(expr, oldPattern, newPattern)
   or
diff --git a/csharp/ql/src/Language Abuse/UselessCastToSelf.ql b/csharp/ql/src/Language Abuse/UselessCastToSelf.ql
index d1a08e1db1c5..96f93131fa6a 100644
--- a/csharp/ql/src/Language Abuse/UselessCastToSelf.ql	
+++ b/csharp/ql/src/Language Abuse/UselessCastToSelf.ql	
@@ -19,5 +19,6 @@ where
   type = cast.getTargetType() and
   type = e.getType() and
   not type instanceof NullType and
+  not type instanceof UnknownType and
   not e.(ImplicitDelegateCreation).getArgument() instanceof AnonymousFunctionExpr
 select cast, "This cast is redundant because the expression already has type " + type + "."
diff --git a/csharp/ql/src/Likely Bugs/BadCheckOdd.qhelp b/csharp/ql/src/Likely Bugs/BadCheckOdd.qhelp
index e0fc5d6d1ac4..4a87583b0bbe 100644
--- a/csharp/ql/src/Likely Bugs/BadCheckOdd.qhelp	
+++ b/csharp/ql/src/Likely Bugs/BadCheckOdd.qhelp	
@@ -36,7 +36,7 @@ Consider using <code>x % 2 != 0</code> to check for odd and <code>x % 2 == 0</co
   MSDN Library: <a href="http://msdn.microsoft.com/en-us/library/0w4e0fzs.aspx">% Operator (C# Reference)</a>.
 </li>
 <li>
-  Wikipedia: <a href="http://en.wikipedia.org/wiki/Modulo_operation#Common_pitfalls">Modulo Operation - Common pitfalls</a>.
+  Wikipedia: <a href="https://en.wikipedia.org/wiki/Modulo_operation#Common_pitfalls">Modulo Operation - Common pitfalls</a>.
 </li>
 
 
diff --git a/csharp/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql b/csharp/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql
index 046099213cc6..df382ee4b9f7 100644
--- a/csharp/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql	
+++ b/csharp/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql	
@@ -28,7 +28,7 @@ where
       any(LocalVariableDeclAndInitExpr ass | ass.getRightOperand() instanceof ObjectCreation)
           .getLeftOperand()
   ) and
-  not v = any(ForeachStmt fs).getVariable() and
+  not v = any(ForEachStmt fs).getVariable() and
   not v = any(BindingPatternExpr vpe).getVariableDeclExpr().getVariable() and
   not v = any(Attribute a).getTarget()
 select v, "The contents of this container are never accessed."
diff --git a/csharp/ql/src/Likely Bugs/Statements/UseBraces.ql b/csharp/ql/src/Likely Bugs/Statements/UseBraces.ql
index 39f0bfddf6aa..ccac74250dab 100644
--- a/csharp/ql/src/Likely Bugs/Statements/UseBraces.ql	
+++ b/csharp/ql/src/Likely Bugs/Statements/UseBraces.ql	
@@ -36,7 +36,7 @@ class IfThenElseStmt extends IfStmt {
 
 Stmt getTrailingBody(Stmt s) {
   result = s.(ForStmt).getBody() or
-  result = s.(ForeachStmt).getBody() or
+  result = s.(ForEachStmt).getBody() or
   result = s.(WhileStmt).getBody() or
   result = s.(IfThenStmt).getThen() or
   result = s.(IfThenElseStmt).getElse()
diff --git a/csharp/ql/src/Linq/BadMultipleIteration.ql b/csharp/ql/src/Linq/BadMultipleIteration.ql
index 0f9e335e2251..7de0d7f1b6d8 100644
--- a/csharp/ql/src/Linq/BadMultipleIteration.ql
+++ b/csharp/ql/src/Linq/BadMultipleIteration.ql
@@ -38,7 +38,7 @@ predicate likelyNonRepeatableSequence(IEnumerableSequence seq) {
 
 /** An access to an enumerable sequence that potentially consumes sequence elements. */
 predicate potentiallyConsumingAccess(VariableAccess va) {
-  exists(ForeachStmt fes | va = fes.getIterableExpr())
+  exists(ForEachStmt fes | va = fes.getIterableExpr())
   or
   exists(MethodCall mc |
     va = mc.getArgument(0) and
diff --git a/csharp/ql/src/Linq/MissedAllOpportunity.ql b/csharp/ql/src/Linq/MissedAllOpportunity.ql
index 1c03372d23b6..9e84c280c3f5 100644
--- a/csharp/ql/src/Linq/MissedAllOpportunity.ql
+++ b/csharp/ql/src/Linq/MissedAllOpportunity.ql
@@ -32,7 +32,7 @@ import Linq.Helpers
  * bool allEven = lst.All(i => i % 2 == 0);
  */
 
-from ForeachStmtGenericEnumerable fes
+from ForEachStmtGenericEnumerable fes
 where missedAllOpportunity(fes)
 select fes,
   "This foreach loop looks as if it might be testing whether every sequence element satisfies a predicate - consider using '.All(...)'."
diff --git a/csharp/ql/src/Linq/MissedCastOpportunity.ql b/csharp/ql/src/Linq/MissedCastOpportunity.ql
index d40009e24c89..66e920f740e1 100644
--- a/csharp/ql/src/Linq/MissedCastOpportunity.ql
+++ b/csharp/ql/src/Linq/MissedCastOpportunity.ql
@@ -15,7 +15,7 @@
 import csharp
 import Linq.Helpers
 
-from ForeachStmtEnumerable fes, LocalVariableDeclStmt s
+from ForEachStmtEnumerable fes, LocalVariableDeclStmt s
 where missedCastOpportunity(fes, s)
 select fes,
   "This foreach loop immediately $@ - consider casting the sequence explicitly using '.Cast(...)'.",
diff --git a/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunity.cs b/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunity.cs
new file mode 100644
index 000000000000..ef968cc7dfd9
--- /dev/null
+++ b/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunity.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+class MissedFirstOrDefaultOpportunity
+{
+    public static Operation FindOperation(IEnumerable<Operation> operations, string operationId)
+    {
+        foreach (var operation in operations)
+        {
+            if (string.Equals(operation.OperationId, operationId, StringComparison.Ordinal))
+                return operation;
+        }
+
+        return null;
+    }
+}
+
+class Operation
+{
+    public string OperationId { get; set; }
+}
diff --git a/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunity.qhelp b/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunity.qhelp
new file mode 100644
index 000000000000..578b062ca34e
--- /dev/null
+++ b/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunity.qhelp
@@ -0,0 +1,36 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p>Programmers sometimes search a sequence by iterating over each element, testing it, and returning
+the first element that satisfies the test. If the loop completes without finding a match, the method
+then returns a default value such as <code>null</code> or <code>default</code>.</p>
+
+</overview>
+<recommendation>
+<p>This pattern is directly available as the <code>FirstOrDefault</code> method in LINQ. Using the
+library method makes the search intent explicit and avoids manually spelling out the loop and
+fallback return.</p>
+
+</recommendation>
+<example>
+<p>In this example the method searches a list of operations for the first operation with a matching
+identifier, returning <code>null</code> if no match is found.</p>
+<sample src="MissedFirstOrDefaultOpportunity.cs" />
+
+<p>The LINQ <code>FirstOrDefault</code> method can express this search more directly.</p>
+<sample src="MissedFirstOrDefaultOpportunityFix.cs" />
+
+<p>The following examples should not use <code>FirstOrDefault</code>, because they do more than
+return the matching element or because the fallback value is not the default value.</p>
+<sample src="MissedFirstOrDefaultOpportunityGood.cs" />
+
+</example>
+<references>
+
+  <li>MSDN: <a href="https://learn.microsoft.com/dotnet/api/system.linq.enumerable.firstordefault">Enumerable.FirstOrDefault Method</a>.</li>
+
+
+</references>
+</qhelp>
diff --git a/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunity.ql b/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunity.ql
new file mode 100644
index 000000000000..286b653979e3
--- /dev/null
+++ b/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunity.ql
@@ -0,0 +1,22 @@
+/**
+ * @name Missed opportunity to use FirstOrDefault
+ * @description The intent of a foreach loop that returns the first sequence element satisfying a predicate, or a default value otherwise,
+ *              can often be better expressed using LINQ's 'FirstOrDefault' method.
+ * @kind problem
+ * @problem.severity recommendation
+ * @precision high
+ * @id cs/linq/missed-firstordefault
+ * @tags quality
+ *       maintainability
+ *       readability
+ *       language-features
+ */
+
+import csharp
+import Linq.Helpers
+
+from ForEachStmtGenericEnumerable fes, IfStmt is
+where missedFirstOrDefaultOpportunity(fes, is)
+select fes,
+  "This foreach loop returns the first sequence element satisfying a $@ - consider finding the element explicitly using '.FirstOrDefault(...)'.",
+  is.getCondition(), "predicate"
diff --git a/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunityFix.cs b/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunityFix.cs
new file mode 100644
index 000000000000..3d7818fc0db8
--- /dev/null
+++ b/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunityFix.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+class MissedFirstOrDefaultOpportunityFix
+{
+    public static Operation FindOperation(IEnumerable<Operation> operations, string operationId)
+    {
+        return operations.FirstOrDefault(operation =>
+            string.Equals(operation.OperationId, operationId, StringComparison.Ordinal));
+    }
+}
diff --git a/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunityGood.cs b/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunityGood.cs
new file mode 100644
index 000000000000..6c65760416de
--- /dev/null
+++ b/csharp/ql/src/Linq/MissedFirstOrDefaultOpportunityGood.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+
+class MissedFirstOrDefaultOpportunityGood
+{
+    public static Operation FindOperationOrThrow(IEnumerable<Operation> operations, string operationId)
+    {
+        foreach (var operation in operations)
+        {
+            if (string.Equals(operation.OperationId, operationId, StringComparison.Ordinal))
+                throw new InvalidOperationException("Unexpected operation.");
+        }
+
+        return null;
+    }
+
+    public static Operation FindReplacementOperation(IEnumerable<Operation> operations, string operationId)
+    {
+        foreach (var operation in operations)
+        {
+            if (string.Equals(operation.OperationId, operationId, StringComparison.Ordinal))
+                return operation;
+        }
+
+        return new Operation();
+    }
+
+    public static string FindOperationId(IEnumerable<Operation> operations, string operationId)
+    {
+        foreach (var operation in operations)
+        {
+            if (string.Equals(operation.OperationId, operationId, StringComparison.Ordinal))
+                return operation.OperationId;
+        }
+
+        return null;
+    }
+}
diff --git a/csharp/ql/src/Linq/MissedOfTypeOpportunity.ql b/csharp/ql/src/Linq/MissedOfTypeOpportunity.ql
index a4c8dff4b538..d80f9d983a7f 100644
--- a/csharp/ql/src/Linq/MissedOfTypeOpportunity.ql
+++ b/csharp/ql/src/Linq/MissedOfTypeOpportunity.ql
@@ -15,7 +15,7 @@
 import csharp
 import Linq.Helpers
 
-from ForeachStmtEnumerable fes, LocalVariableDeclStmt s
+from ForEachStmtEnumerable fes, LocalVariableDeclStmt s
 where missedOfTypeOpportunity(fes, s)
 select fes,
   "This foreach loop immediately uses 'as' to $@ - consider using '.OfType(...)' instead.", s,
diff --git a/csharp/ql/src/Linq/MissedSelectOpportunity.ql b/csharp/ql/src/Linq/MissedSelectOpportunity.ql
index 8ea2a1c11d73..9e3571f36d54 100644
--- a/csharp/ql/src/Linq/MissedSelectOpportunity.ql
+++ b/csharp/ql/src/Linq/MissedSelectOpportunity.ql
@@ -22,7 +22,7 @@ predicate oversized(LocalVariableDeclStmt s) {
   )
 }
 
-from ForeachStmtGenericEnumerable fes, LocalVariableDeclStmt s
+from ForEachStmtGenericEnumerable fes, LocalVariableDeclStmt s
 where
   missedSelectOpportunity(fes, s) and
   not oversized(s)
diff --git a/csharp/ql/src/Linq/MissedWhereOpportunity.qhelp b/csharp/ql/src/Linq/MissedWhereOpportunity.qhelp
index 6b22d1a14edc..53ac540441c4 100644
--- a/csharp/ql/src/Linq/MissedWhereOpportunity.qhelp
+++ b/csharp/ql/src/Linq/MissedWhereOpportunity.qhelp
@@ -3,29 +3,38 @@
   "qhelp.dtd">
 <qhelp>
 <overview>
-<p>Programmers sometimes need to iterative over a filtered version of a sequence, rather than the 
-sequence itself. For example, you might want to print out only the numbers in the range [1,10] that 
-are even. One standard way of doing this is to write a loop that iterates over the whole sequence, 
-testing the variable each iteration to determine whether or not it is even. This is often written 
-using either <code>if(!condition(var)) continue;</code> as the initial statement in the loop, or by 
+<p>Programmers sometimes need to iterate over a filtered version of a sequence, rather than the
+sequence itself. For example, you might want to print out only the numbers in the range [1,10] that
+are even. One standard way of doing this is to write a loop that iterates over the whole sequence,
+testing the variable each iteration to determine whether or not it is even. This is often written
+using either <code>if(!condition(var)) continue;</code> as the initial statement in the loop, or by
 enclosing the entire loop body with <code>if(condition(var))</code>.</p>
 
+<p>This recommendation does not apply when the matching branch exits the loop without continuing to
+later iterations, such as with <code>return</code>, <code>yield break</code>, or <code>throw</code>.
+In those cases the loop is searching for a terminal condition rather than filtering the remaining
+loop body.</p>
+
 </overview>
 <recommendation>
-<p>This pattern works well and is also available as the <code>Where</code> method in LINQ in C# 3.5 
-and above. It is better to use a library method in preference to writing your own pattern unless you 
-have a specific need for a custom version. In particular, this makes the code easier to read by 
+<p>This pattern works well and is also available as the <code>Where</code> method in LINQ in C# 3.5
+and above. It is better to use a library method in preference to writing your own pattern unless you
+have a specific need for a custom version. In particular, this makes the code easier to read by
 expressing the intent better and by reducing the nesting depth of the code.</p>
 
 </recommendation>
 <example>
-<p>This example shows two ways of iterating over a series of integers and only performing an action 
+<p>This example shows two ways of iterating over a series of integers and only performing an action
 on the even ones.</p>
 <sample src="MissedWhereOpportunity.cs" />
 
 <p>This is far better expressed using the <code>Where</code> method.</p>
 <sample src="MissedWhereOpportunityFix.cs" />
 
+<p>The following example should not use <code>Where</code>, because the matching branch exits the
+method or iterator instead of continuing with filtered loop work.</p>
+<sample src="MissedWhereOpportunityGood.cs" />
+
 </example>
 <references>
 
diff --git a/csharp/ql/src/Linq/MissedWhereOpportunity.ql b/csharp/ql/src/Linq/MissedWhereOpportunity.ql
index 62b34b93305a..e9e82f79baf3 100644
--- a/csharp/ql/src/Linq/MissedWhereOpportunity.ql
+++ b/csharp/ql/src/Linq/MissedWhereOpportunity.ql
@@ -14,7 +14,7 @@
 import csharp
 import Linq.Helpers
 
-from ForeachStmtGenericEnumerable fes, IfStmt is
+from ForEachStmtGenericEnumerable fes, IfStmt is
 where
   missedWhereOpportunity(fes, is) and
   not missedAllOpportunity(fes)
diff --git a/csharp/ql/src/Linq/MissedWhereOpportunityGood.cs b/csharp/ql/src/Linq/MissedWhereOpportunityGood.cs
new file mode 100644
index 000000000000..b96db876583a
--- /dev/null
+++ b/csharp/ql/src/Linq/MissedWhereOpportunityGood.cs
@@ -0,0 +1,13 @@
+class MissedWhereOpportunityGood
+{
+    public int? FindFirstEven(System.Collections.Generic.IEnumerable<int> values)
+    {
+        foreach (int value in values)
+        {
+            if (value % 2 == 0)
+                return value;
+        }
+
+        return null;
+    }
+}
diff --git a/csharp/ql/src/Metrics/Callables/CCyclomaticComplexity.qhelp b/csharp/ql/src/Metrics/Callables/CCyclomaticComplexity.qhelp
index 56419eca6e2f..7bd1be9c8160 100644
--- a/csharp/ql/src/Metrics/Callables/CCyclomaticComplexity.qhelp
+++ b/csharp/ql/src/Metrics/Callables/CCyclomaticComplexity.qhelp
@@ -32,8 +32,8 @@ testing easier because each helper method can be tested individually.</p>
 </recommendation>
 <references>
 
-  <li>Wikipedia. <a href="http://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>.</li>
-  <li>Wikipedia. <a href="http://en.wikipedia.org/wiki/Control_flow_diagram">Control flow diagram</a>.</li>
+  <li>Wikipedia. <a href="https://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>.</li>
+  <li>Wikipedia. <a href="https://en.wikipedia.org/wiki/Control_flow_diagram">Control flow diagram</a>.</li>
   <li>Wolfram MathWorld. <a href="http://mathworld.wolfram.com/LinearlyIndependent.html">Linearly Independent</a>.</li>
 
 </references>
diff --git a/csharp/ql/src/Metrics/Files/FCyclomaticComplexity.qhelp b/csharp/ql/src/Metrics/Files/FCyclomaticComplexity.qhelp
index d9959a9066ec..3859330a1b00 100644
--- a/csharp/ql/src/Metrics/Files/FCyclomaticComplexity.qhelp
+++ b/csharp/ql/src/Metrics/Files/FCyclomaticComplexity.qhelp
@@ -67,10 +67,10 @@ T. J. McCabe, <em>A Complexity Measure</em>. IEEE Transactions on Software Engin
 Dave Thomas, <a href="http://www.jot.fm/issues/issue_2005_01/column1/">Refactoring as Meta Programming?</a>, in Journal of Object Technology, vol. 4, no. 1, January-February 2005, pp. 7-11.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Code_refactoring">Code refactoring</a>
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Code_refactoring">Code refactoring</a>
 </li>
 
 </references>
diff --git a/csharp/ql/src/Metrics/Files/FSelfContainedness.qhelp b/csharp/ql/src/Metrics/Files/FSelfContainedness.qhelp
index d8142ffa8ecd..213ea1cfd3fe 100644
--- a/csharp/ql/src/Metrics/Files/FSelfContainedness.qhelp
+++ b/csharp/ql/src/Metrics/Files/FSelfContainedness.qhelp
@@ -19,7 +19,7 @@ should also try to use libraries with source code available.</p>
 </recommendation>
 <references>
 
-  <li>Wikipedia. <a href="http://en.wikipedia.org/wiki/Software_portability">Software Portability</a>.</li>
+  <li>Wikipedia. <a href="https://en.wikipedia.org/wiki/Software_portability">Software Portability</a>.</li>
 
 </references>
 </qhelp>
diff --git a/csharp/ql/src/Metrics/RefTypes/TUnmanagedCode.qhelp b/csharp/ql/src/Metrics/RefTypes/TUnmanagedCode.qhelp
index 8106b90d7b40..0a4b3a4c5fd4 100644
--- a/csharp/ql/src/Metrics/RefTypes/TUnmanagedCode.qhelp
+++ b/csharp/ql/src/Metrics/RefTypes/TUnmanagedCode.qhelp
@@ -28,7 +28,7 @@ unmanaged code from the <code>User32.dll</code> library.</p>
 <references>
 
   <li>MSDN, C# Reference. <a href="http://msdn.microsoft.com/en-us/library/e59b22c5(v=vs.80).aspx">extern</a>.</li>
-  <li>Wikipedia. <a href="http://en.wikipedia.org/wiki/Managed_code">Managed code</a>.</li>
+  <li>Wikipedia. <a href="https://en.wikipedia.org/wiki/Managed_code">Managed code</a>.</li>
 
 </references>
 </qhelp>
diff --git a/csharp/ql/src/Security Features/CWE-078/CommandInjection.qhelp b/csharp/ql/src/Security Features/CWE-078/CommandInjection.qhelp
index ce5fec7c571a..af8855095325 100644
--- a/csharp/ql/src/Security Features/CWE-078/CommandInjection.qhelp	
+++ b/csharp/ql/src/Security Features/CWE-078/CommandInjection.qhelp	
@@ -33,7 +33,7 @@ without examining it first.</p>
 
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 
 <!--  LocalWords:  CWE untrusted unsanitized Runtime
diff --git a/csharp/ql/src/Security Features/CWE-079/XSS.qhelp b/csharp/ql/src/Security Features/CWE-079/XSS.qhelp
index a6183e13c8ed..e766ef6726eb 100644
--- a/csharp/ql/src/Security Features/CWE-079/XSS.qhelp	
+++ b/csharp/ql/src/Security Features/CWE-079/XSS.qhelp	
@@ -40,7 +40,7 @@ OWASP:
 (Cross Site Scripting) Prevention Cheat Sheet</a>.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 </li>
 
 </references>
diff --git a/csharp/ql/src/Security Features/CWE-352/MissingAntiForgeryTokenValidation.ql b/csharp/ql/src/Security Features/CWE-352/MissingAntiForgeryTokenValidation.ql
index 60a022d43d0f..8a568c6eca57 100644
--- a/csharp/ql/src/Security Features/CWE-352/MissingAntiForgeryTokenValidation.ql	
+++ b/csharp/ql/src/Security Features/CWE-352/MissingAntiForgeryTokenValidation.ql	
@@ -12,6 +12,7 @@
  */
 
 import csharp
+import semmle.code.csharp.commons.Compilation
 import semmle.code.csharp.frameworks.system.Web
 import semmle.code.csharp.frameworks.system.web.Helpers
 import semmle.code.csharp.frameworks.system.web.Mvc
@@ -34,49 +35,170 @@ private Method getAStartedMethod() {
   getAStartedMethod().calls(result)
 }
 
-/**
- * Holds if the project has a global anti forgery filter.
- *
- * No AspNetCore case here as the corresponding class doesn't seem to exist.
- */
-predicate hasGlobalAntiForgeryFilter() {
-  // A global filter added
+private predicate hasGlobalWebMvcAntiforgeryFilter(Compilation compilation) {
   exists(MethodCall addGlobalFilter |
     // addGlobalFilter adds a filter to the global filter collection
     addGlobalFilter.getTarget() = any(GlobalFilterCollection gfc).getAddMethod() and
     // The filter is an antiforgery filter
     addGlobalFilter.getArgumentForName("filter").getType() instanceof AntiForgeryAuthorizationFilter and
     // The filter is added by the Application_Start() method
-    getAStartedMethod() = addGlobalFilter.getEnclosingCallable()
+    getAStartedMethod() = addGlobalFilter.getEnclosingCallable() and
+    addGlobalFilter.getFile() = compilation.getAFileCompiled()
   )
 }
 
-predicate isUnvalidatedPostMethod(Class c, Method m) {
-  c.(Controller).getAPostActionMethod() = m and
-  not m.getAnAttribute() instanceof ValidateAntiForgeryTokenAttribute and
-  not c.getABaseType*().getAnAttribute() instanceof ValidateAntiForgeryTokenAttribute
-  or
-  c.(AspNetCore::MicrosoftAspNetCoreMvcController).getAnActionMethod() = m and
-  m.getAnAttribute() instanceof AspNetCore::MicrosoftAspNetCoreMvcHttpPostAttribute and
-  not m.getAnAttribute() instanceof AspNetCore::ValidateAntiForgeryAttribute and
-  not c.getABaseType*().getAnAttribute() instanceof AspNetCore::ValidateAntiForgeryAttribute
+predicate hasGlobalAspNetMvcAntiForgeryFilter(Compilation compilation) {
+  exists(MethodCall addGlobalFilter, MethodCall registrationCall |
+    (
+      // The filter is the `AutoValidateAntiforgeryTokenAttribute` filter.
+      addGlobalFilter.getTarget() =
+        any(AspNetCore::MicrosoftAspNetCoreMvcFilterCollection collection).getAddMethod() and
+      (
+        addGlobalFilter.getArgument(0).getType() instanceof
+          AspNetCore::AutoValidateAntiforgeryTokenAttribute or
+        addGlobalFilter.getArgument(0).(TypeofExpr).getTypeAccess().getTarget() instanceof
+          AspNetCore::AutoValidateAntiforgeryTokenAttribute
+      )
+      or
+      addGlobalFilter.getTarget().getUnboundDeclaration() =
+        any(AspNetCore::MicrosoftAspNetCoreMvcFilterCollection collection).getAddMethod() and
+      addGlobalFilter.getTarget().(ConstructedGeneric).getTypeArgument(0) instanceof
+        AspNetCore::AutoValidateAntiforgeryTokenAttribute
+    ) and
+    // The filter is added in an ASP.NET Core registration call, which is provided as a lambda argument
+    // to the Mvc registration method.
+    registrationCall.getTarget() instanceof AspNetCore::MicrosoftAspNetCoreMvcRegistration and
+    registrationCall.getAnArgument() = addGlobalFilter.getEnclosingCallable() and
+    addGlobalFilter.getFile() = compilation.getAFileCompiled()
+  )
+}
+
+private class RequireAntiforgeryTokenAttribute extends Attribute {
+  RequireAntiforgeryTokenAttribute() {
+    this.getType()
+        .hasFullyQualifiedName("Microsoft.AspNetCore.Antiforgery",
+          "RequireAntiforgeryTokenAttribute")
+  }
+
+  predicate requiresValidation() {
+    not exists(this.getArgument(0))
+    or
+    this.getArgument(0).isImplicit()
+    or
+    this.getArgument(0).getValue() = "true"
+  }
+}
+
+private predicate hasAspNetCoreAntiForgeryMiddleware(Compilation compilation) {
+  exists(MethodCall call |
+    call.getTarget()
+        .hasFullyQualifiedName("Microsoft.AspNetCore.Builder",
+          "AntiforgeryApplicationBuilderExtensions", "UseAntiforgery") and
+    call.getFile() = compilation.getAFileCompiled()
+  )
+}
+
+private RequireAntiforgeryTokenAttribute getEffectiveRequireAntiforgeryTokenAttributeOnMethod(
+  Method method
+) {
+  exists(Method attributedMethod |
+    attributedMethod = method.getOverridee*() and
+    result = attributedMethod.getAnAttribute() and
+    not exists(Method closerMethod |
+      closerMethod = method.getOverridee*() and
+      closerMethod.getOverridee+() = attributedMethod and
+      closerMethod.getAnAttribute() instanceof RequireAntiforgeryTokenAttribute
+    )
+  )
+}
+
+private RequireAntiforgeryTokenAttribute getEffectiveRequireAntiforgeryTokenAttributeOnClass(
+  Class controller
+) {
+  exists(Class attributedClass |
+    attributedClass = controller.getBaseClass*() and
+    result = attributedClass.getAnAttribute() and
+    not exists(Class closerClass |
+      closerClass = controller.getBaseClass*() and
+      closerClass.getBaseClass+() = attributedClass and
+      closerClass.getAnAttribute() instanceof RequireAntiforgeryTokenAttribute
+    )
+  )
+}
+
+class MvcControllerPostMethod extends Method {
+  private Controller controller;
+
+  MvcControllerPostMethod() {
+    controller.getAPostActionMethod() = this and
+    exists(Compilation compilation | compilation.getAFileCompiled() = this.getFile() |
+      not hasGlobalWebMvcAntiforgeryFilter(compilation)
+    )
+  }
+
+  predicate hasValidateAntiForgeryAttribute() {
+    this.getAnAttribute() instanceof ValidateAntiForgeryTokenAttribute or
+    controller.getABaseType*().getAnAttribute() instanceof ValidateAntiForgeryTokenAttribute
+  }
+}
+
+class AspNetCoreControllerPostMethod extends Method {
+  private AspNetCore::MicrosoftAspNetCoreMvcController controller;
+  private Compilation compilation;
+
+  AspNetCoreControllerPostMethod() {
+    controller.getAnActionMethod() = this and
+    this.getAnAttribute() instanceof AspNetCore::MicrosoftAspNetCoreMvcHttpPostAttribute and
+    compilation.getAFileCompiled() = this.getFile() and
+    not hasGlobalAspNetMvcAntiForgeryFilter(compilation)
+  }
+
+  predicate hasValidateAntiForgeryAttribute() {
+    this.getAnAttribute() instanceof AspNetCore::ValidateAntiForgeryAttribute or
+    controller.getABaseType*().getAnAttribute() instanceof AspNetCore::ValidateAntiForgeryAttribute
+  }
+
+  predicate hasRequireAntiForgeryAttribute() {
+    hasAspNetCoreAntiForgeryMiddleware(compilation) and
+    (
+      getEffectiveRequireAntiforgeryTokenAttributeOnMethod(this).requiresValidation()
+      or
+      not exists(getEffectiveRequireAntiforgeryTokenAttributeOnMethod(this)) and
+      getEffectiveRequireAntiforgeryTokenAttributeOnClass(controller).requiresValidation()
+    )
+  }
+}
+
+predicate isUnvalidatedAspNetCorePostMethod(AspNetCoreControllerPostMethod m) {
+  not m.hasValidateAntiForgeryAttribute() and
+  not m.hasRequireAntiForgeryAttribute()
+}
+
+predicate isUnvalidatedMvcPostMethod(MvcControllerPostMethod m) {
+  not m.hasValidateAntiForgeryAttribute()
+}
+
+predicate isUnvalidatedPostMethod(Method m) {
+  isUnvalidatedMvcPostMethod(m) or
+  isUnvalidatedAspNetCorePostMethod(m)
 }
 
 Element getAValidatedElement() {
   any(ValidateAntiForgeryTokenAttribute a).getTarget() = result
   or
   any(AspNetCore::ValidateAntiForgeryAttribute a).getTarget() = result
+  or
+  hasAspNetCoreAntiForgeryMiddleware(_) and
+  any(RequireAntiforgeryTokenAttribute a | a.requiresValidation()).getTarget() = result
 }
 
-from Class c, Method postMethod
+from Method postMethod
 where
-  isUnvalidatedPostMethod(c, postMethod) and
+  isUnvalidatedPostMethod(postMethod) and
   // Verify that validate anti forgery token attributes are used somewhere within this project, to
   // avoid reporting false positives on projects that use an alternative approach to mitigate CSRF
   // issues.
-  exists(getAValidatedElement()) and
-  // Also ignore cases where a global anti forgery filter is in use.
-  not hasGlobalAntiForgeryFilter()
+  exists(getAValidatedElement())
 select postMethod,
   "Method '" + postMethod.getName() +
     "' handles a POST request without performing CSRF token validation."
diff --git a/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.qhelp b/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.qhelp
index 6d5d298c8e43..5f7dd4f3282f 100644
--- a/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.qhelp	
+++ b/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.qhelp	
@@ -5,9 +5,10 @@
 
 <overview>
 <p>
-Web sites that do not specify the <code>X-Frame-Options</code> HTTP header may be vulnerable to UI
-redress attacks ("clickjacking"). In these attacks, the vulnerable site is loaded in a frame on
-an attacker-controlled site which uses opaque or transparent layers to trick the user into
+Web sites that do not restrict framing using the <code>X-Frame-Options</code> HTTP header or the
+<code>frame-ancestors</code> Content Security Policy directive may be vulnerable to UI redress
+attacks ("clickjacking"). In these attacks, the vulnerable site is loaded in a frame on an
+attacker-controlled site which uses opaque or transparent layers to trick the user into
 unintentionally clicking a button or link on the vulnerable site.
 </p>
 
@@ -17,16 +18,24 @@ unintentionally clicking a button or link on the vulnerable site.
 <p>
 Set the <code>X-Frame-Options</code> HTTP header to <code>DENY</code>, to instruct web browsers to
 block attempts to load the site in a frame. Alternatively, if framing is needed in certain
-circumstances, specify <code>SAMEORIGIN</code> or <code>ALLOW FROM: ...</code> to limit the ability
-to frame the site to pages from the same origin, or from an allowed whitelist of trusted domains.
+circumstances, specify <code>SAMEORIGIN</code> to permit framing by the same origin. The
+<code>frame-ancestors</code> directive in an enforced <code>Content-Security-Policy</code> header
+provides a more flexible alternative. For example, use <code>frame-ancestors 'none'</code> to
+prevent all framing, or use its source list to specify which origins may embed the application.
 </p>
 <p>
-For ASP.NET web applications, the header may be specified either in the <code>Web.config</code>
-file, using the <code>&lt;customHeaders&gt;</code> tag, or within the source code of the
-application using the <code>HttpResponse.AddHeader</code> method. In general, prefer specifying the
-header in the <code>Web.config</code> file to ensure it is added to all requests. If adding it
-to the source code, ensure that it is added unconditionally to all requests. For example, add the
-header in the <code>Application_BeginRequest</code> method in the <code>global.asax</code> file.
+For ASP.NET Framework applications, the header may be specified either in the
+<code>Web.config</code> file, using the <code>&lt;customHeaders&gt;</code> tag, or within the source
+code of the application using the <code>HttpResponse.AddHeader</code> method. In general, prefer
+specifying the header in the <code>Web.config</code> file to ensure it is added to all requests. If
+adding it to the source code, ensure that it is added unconditionally to all requests. For example,
+add the header in the <code>Application_BeginRequest</code> method in the
+<code>global.asax</code> file.
+</p>
+<p>
+For ASP.NET Core applications, set the header on <code>HttpResponse.Headers</code>. This can be
+done using the header dictionary's indexer or its <code>Append</code>, <code>Add</code>, or
+<code>TryAdd</code> methods.
 </p>
 
 </recommendation>
@@ -41,11 +50,17 @@ The following example shows how to specify the <code>X-Frame-Options</code> head
 
 <p>
 This next example shows how to specify the <code>X-Frame-Options</code> header within the
-<code>global.asax</code> file for ASP.NET application:
+<code>global.asax</code> file for an ASP.NET application:
 </p>
 
 <sample src="MissingXFrameOptions.cs" />
 
+<p>
+The following ASP.NET Core example uses an enforced Content Security Policy to disallow framing:
+</p>
+
+<sample src="MissingXFrameOptionsAspNetCore.cs" />
+
 </example>
 <references>
 
@@ -57,6 +72,10 @@ OWASP:
 Mozilla:
 <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options">X-Frame-Options</a>
 </li>
+<li>
+Mozilla:
+<a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/frame-ancestors">Content-Security-Policy: frame-ancestors</a>
+</li>
 
 </references>
 </qhelp>
diff --git a/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql b/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql
index 1b647457e7c8..cc3612ce89c1 100644
--- a/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql	
+++ b/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql	
@@ -1,7 +1,8 @@
 /**
- * @name Missing X-Frame-Options HTTP header
- * @description If the 'X-Frame-Options' setting is not provided, a malicious user may be able to
- *              overlay their own UI on top of the site by using an iframe.
+ * @name Missing clickjacking protection
+ * @description If neither the 'X-Frame-Options' header nor a Content Security Policy
+ *              'frame-ancestors' directive is provided, a malicious user may be able to overlay
+ *              their own UI on top of the site by using an iframe.
  * @kind problem
  * @problem.severity error
  * @security-severity 7.5
@@ -14,7 +15,7 @@
 
 import csharp
 import semmle.code.asp.WebConfig
-import semmle.code.csharp.frameworks.system.Web
+import semmle.code.csharp.security.MissingXFrameOptionsQuery
 
 XmlElement getAWebConfigRoot(WebConfigXml webConfig) {
   result = webConfig.getARootElement()
@@ -28,9 +29,10 @@ XmlElement getAWebConfigRoot(WebConfigXml webConfig) {
 }
 
 /**
- * Holds if the `Web.config` file `webConfig` adds an `X-Frame-Options` header.
+ * Holds if the `Web.config` file `webConfig` adds an `X-Frame-Options` header or a
+ * `Content-Security-Policy` header containing a `frame-ancestors` directive.
  */
-predicate hasWebConfigXFrameOptions(WebConfigXml webConfig) {
+predicate hasWebConfigClickjackingProtection(WebConfigXml webConfig) {
   // Looking for an entry in `webConfig` that looks like this:
   // ```xml
   // <system.webServer>
@@ -42,29 +44,30 @@ predicate hasWebConfigXFrameOptions(WebConfigXml webConfig) {
   // </system.webServer>
   // ```
   // This can also be in a `location`
-  getAWebConfigRoot(webConfig)
-      .getAChild("system.webServer")
-      .getAChild("httpProtocol")
-      .getAChild("customHeaders")
-      .getAChild("add")
-      .getAttributeValue("name") = "X-Frame-Options"
+  exists(XmlElement add, string name |
+    add =
+      getAWebConfigRoot(webConfig)
+          .getAChild("system.webServer")
+          .getAChild("httpProtocol")
+          .getAChild("customHeaders")
+          .getAChild("add") and
+    name = add.getAttributeValue("name") and
+    (
+      isXFrameOptionsText(name)
+      or
+      isContentSecurityPolicyText(name) and
+      containsFrameAncestorsDirective(add.getAttributeValue("value"))
+    )
+  )
 }
 
 /**
- * Holds if there exists a call to `AddHeader` or `AppendHeader` adding the `X-Frame-Options`
- * header.
+ * Holds if code configures a clickjacking protection response header.
  */
-predicate hasCodeXFrameOptions() {
-  exists(MethodCall call |
-    call.getTarget() = any(SystemWebHttpResponseClass r).getAppendHeaderMethod() or
-    call.getTarget() = any(SystemWebHttpResponseClass r).getAddHeaderMethod()
-  |
-    call.getArgumentForName("name").getValue() = "X-Frame-Options"
-  )
-}
+predicate hasCodeClickjackingProtection() { exists(getAClickjackingHeaderWrite()) }
 
 from WebConfigXml webConfig
 where
-  not hasWebConfigXFrameOptions(webConfig) and
-  not hasCodeXFrameOptions()
-select webConfig, "Configuration file is missing the X-Frame-Options setting."
+  not hasWebConfigClickjackingProtection(webConfig) and
+  not hasCodeClickjackingProtection()
+select webConfig, "Configuration file is missing clickjacking protection."
diff --git a/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptionsAspNetCore.cs b/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptionsAspNetCore.cs
new file mode 100644
index 000000000000..f735a8f0ae7c
--- /dev/null
+++ b/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptionsAspNetCore.cs	
@@ -0,0 +1,8 @@
+void Configure(IApplicationBuilder app)
+{
+    app.Use(async (context, next) =>
+    {
+        context.Response.Headers["Content-Security-Policy"] = "frame-ancestors 'none'";
+        await next();
+    });
+}
diff --git a/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.qhelp b/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.qhelp
index f078ff574058..e03cf21a96f0 100644
--- a/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.qhelp	
+++ b/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.qhelp	
@@ -21,13 +21,13 @@ If this configuration may be used in production, remove the <code>directoryBrows
 <example>
 
 <p>
-The following example shows the <code>directoryBrowse</code> <code>enable</code> attribute set to true in a <code>Web.config</code> file for ASP.NET:
+The following example shows the <code>directoryBrowse</code> <code>enabled</code> attribute set to true in a <code>Web.config</code> file for ASP.NET:
 </p>
 
 <sample src="Web.config.bad" />
 
 <p>
-To fix this problem, the <code>enable</code> attribute should be set to <code>false</code>, or the <code>directoryBrowse</code> element should be removed completely:
+To fix this problem, the <code>enabled</code> attribute should be set to <code>false</code>, or the <code>directoryBrowse</code> element should be removed completely:
 </p>
 
 <sample src="Web.config.good" />
@@ -36,8 +36,8 @@ To fix this problem, the <code>enable</code> attribute should be set to <code>fa
 <references>
 
 <li>
-MSDN:
-<a href="https://msdn.microsoft.com/en-us/library/ms691327(v=vs.90).aspx">directoryBrowse element</a>.
+Microsoft Learn: 
+<a href="https://learn.microsoft.com/en-us/iis/configuration/system.webserver/directorybrowse#attributes">directoryBrowse element</a>.
 </li>
 
 
diff --git a/csharp/ql/src/Security Features/CWE-548/Web.config.bad b/csharp/ql/src/Security Features/CWE-548/Web.config.bad
index 24f547103f82..0d579a8d9a06 100644
--- a/csharp/ql/src/Security Features/CWE-548/Web.config.bad	
+++ b/csharp/ql/src/Security Features/CWE-548/Web.config.bad	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <system.webServer>
-    <directoryBrowse enable="true"/>
+    <directoryBrowse enabled="true"/>
    ...
-  </system.web>
-</configuration>
\ No newline at end of file
+  </system.webServer>
+</configuration>
diff --git a/csharp/ql/src/Security Features/CWE-548/Web.config.good b/csharp/ql/src/Security Features/CWE-548/Web.config.good
index 5c0566153c64..b2d3258c5d05 100644
--- a/csharp/ql/src/Security Features/CWE-548/Web.config.good	
+++ b/csharp/ql/src/Security Features/CWE-548/Web.config.good	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <system.webServer>
-    <directoryBrowse enable="false"/>
+    <directoryBrowse enabled="false"/>
    ...
-  </system.web>
-</configuration>
\ No newline at end of file
+  </system.webServer>
+</configuration>
diff --git a/csharp/ql/src/Security Features/CWE-730/ReDoS.ql b/csharp/ql/src/Security Features/CWE-730/ReDoS.ql
index 931e3f4456f3..416cdca27684 100644
--- a/csharp/ql/src/Security Features/CWE-730/ReDoS.ql	
+++ b/csharp/ql/src/Security Features/CWE-730/ReDoS.ql	
@@ -9,7 +9,6 @@
  * @id cs/redos
  * @tags security
  *       external/cwe/cwe-1333
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/csharp/ql/src/Security Features/CWE-730/RegexInjection.ql b/csharp/ql/src/Security Features/CWE-730/RegexInjection.ql
index 5b6d95533113..1fc95f305caf 100644
--- a/csharp/ql/src/Security Features/CWE-730/RegexInjection.ql	
+++ b/csharp/ql/src/Security Features/CWE-730/RegexInjection.ql	
@@ -9,7 +9,6 @@
  * @precision high
  * @id cs/regex-injection
  * @tags security
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/csharp/ql/src/Security Features/InadequateRSAPadding.qhelp b/csharp/ql/src/Security Features/InadequateRSAPadding.qhelp
index cee74515198c..22bad62ea611 100644
--- a/csharp/ql/src/Security Features/InadequateRSAPadding.qhelp	
+++ b/csharp/ql/src/Security Features/InadequateRSAPadding.qhelp	
@@ -12,7 +12,7 @@
 </recommendation>
 <references>
 
-  <li>Wikipedia. <a href="http://en.wikipedia.org/wiki/RSA_(algorithm)#Padding_schemes">RSA. Padding Schemes</a>.</li>
+  <li>Wikipedia. <a href="https://en.wikipedia.org/wiki/RSA_(algorithm)#Padding_schemes">RSA. Padding Schemes</a>.</li>
 
 </references>
 </qhelp>
diff --git a/csharp/ql/src/Security Features/InsecureRandomness.qhelp b/csharp/ql/src/Security Features/InsecureRandomness.qhelp
index 6f9634643ec3..3cecacab77e4 100644
--- a/csharp/ql/src/Security Features/InsecureRandomness.qhelp	
+++ b/csharp/ql/src/Security Features/InsecureRandomness.qhelp	
@@ -57,7 +57,7 @@ library method, which generates a password with a bias, therefore should be avoi
 
 <references>
 
-  <li>Wikipedia. <a href="http://en.wikipedia.org/wiki/Pseudorandom_number_generator">Pseudo-random number generator</a>.</li>
+  <li>Wikipedia. <a href="https://en.wikipedia.org/wiki/Pseudorandom_number_generator">Pseudo-random number generator</a>.</li>
   <li>MSDN. <a href="http://msdn.microsoft.com/en-us/library/system.security.cryptography.randomnumbergenerator.aspx">RandomNumberGenerator</a>.</li>
   <li>MSDN. <a href="https://msdn.microsoft.com/en-us/library/system.web.security.membership.generatepassword(v=vs.110).aspx">Membership.GeneratePassword</a>.</li>
 
diff --git a/csharp/ql/src/Security Features/InsufficientKeySize.qhelp b/csharp/ql/src/Security Features/InsufficientKeySize.qhelp
index 906881cf0c25..da61b8a3200c 100644
--- a/csharp/ql/src/Security Features/InsufficientKeySize.qhelp	
+++ b/csharp/ql/src/Security Features/InsufficientKeySize.qhelp	
@@ -14,7 +14,7 @@ symmetric encryption.</p>
 </recommendation>
 <references>
 
-  <li>Wikipedia. <a href="http://en.wikipedia.org/wiki/Key_size">Key size</a>.</li>
+  <li>Wikipedia. <a href="https://en.wikipedia.org/wiki/Key_size">Key size</a>.</li>
 
 </references>
 </qhelp>
diff --git a/csharp/ql/src/Security Features/WeakEncryption.qhelp b/csharp/ql/src/Security Features/WeakEncryption.qhelp
index 1749144ae8b9..17ddee743501 100644
--- a/csharp/ql/src/Security Features/WeakEncryption.qhelp	
+++ b/csharp/ql/src/Security Features/WeakEncryption.qhelp	
@@ -17,8 +17,8 @@
 </example>
 <references>
 
-  <li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Key_size">Key Size</a></li>
-  <li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Data_Encryption_Standard">DES</a></li>
+  <li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Key_size">Key Size</a></li>
+  <li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Data_Encryption_Standard">DES</a></li>
 
 
 </references>
diff --git a/csharp/ql/src/change-notes/released/1.10.0.md b/csharp/ql/src/change-notes/released/1.10.0.md
new file mode 100644
index 000000000000..55a1dcb12b89
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.10.0.md
@@ -0,0 +1,10 @@
+## 1.10.0
+
+### New Queries
+
+* Added a new query, `cs/linq/missed-firstordefault`, that detects `foreach` loops that can be expressed more clearly using LINQ's `FirstOrDefault` method.
+
+### Minor Analysis Improvements
+
+* The `cs/linq/missed-*` queries no longer suggest rewrites that would capture `in`, `out`, or `ref` parameters in a lambda, fixing false-positive results for transformations that would not compile.
+* The `cs/web/missing-token-validation` query now recognizes an ASP.NET Core `AutoValidateAntiforgeryTokenAttribute` registered as a global MVC filter through `AddControllersWithViews` (and friends), avoiding false-positive results for covered actions.
diff --git a/csharp/ql/src/change-notes/released/1.10.1.md b/csharp/ql/src/change-notes/released/1.10.1.md
new file mode 100644
index 000000000000..ae61f5048922
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.10.1.md
@@ -0,0 +1,7 @@
+## 1.10.1
+
+### Minor Analysis Improvements
+
+* The `cs/web/missing-x-frame-options` query now recognizes clickjacking protection configured
+  through ASP.NET Core response headers and enforced Content Security Policy `frame-ancestors`
+  directives.
diff --git a/csharp/ql/src/change-notes/released/1.10.2.md b/csharp/ql/src/change-notes/released/1.10.2.md
new file mode 100644
index 000000000000..cf530869f0bc
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.10.2.md
@@ -0,0 +1,5 @@
+## 1.10.2
+
+### Minor Analysis Improvements
+
+* The `cs/simplifiable-boolean-expression` query now produces fewer false-positive results when type information is incomplete.
diff --git a/csharp/ql/src/change-notes/released/1.11.0.md b/csharp/ql/src/change-notes/released/1.11.0.md
new file mode 100644
index 000000000000..537a1c73eb2c
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.11.0.md
@@ -0,0 +1,5 @@
+## 1.11.0
+
+### Query Metadata Changes
+
+* The `external/cwe/cwe-730` tag has been removed from `cs/redos` and `cs/regex-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
diff --git a/csharp/ql/src/change-notes/released/1.9.1.md b/csharp/ql/src/change-notes/released/1.9.1.md
new file mode 100644
index 000000000000..bc5c4bd30411
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.9.1.md
@@ -0,0 +1,3 @@
+## 1.9.1
+
+No user-facing changes.
diff --git a/csharp/ql/src/change-notes/released/1.9.2.md b/csharp/ql/src/change-notes/released/1.9.2.md
new file mode 100644
index 000000000000..1beedc8ed107
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.9.2.md
@@ -0,0 +1,12 @@
+## 1.9.2
+
+### Minor Analysis Improvements
+
+* The `cs/simplifiable-boolean-expression` query no longer suggests replacing a negated comparison when the replacement could recursively call an enclosing user-defined operator in `build-mode: none` databases.
+* The `cs/web/missing-token-validation` query now recognizes enabled ASP.NET Core `RequireAntiforgeryToken` attributes when antiforgery middleware is used.
+* The query `cs/virtual-call-in-constructor` has been improved. Uses of virtual members in `nameof` expressions are no longer reported, since they are not calls.
+* Static constructors are now used as the enclosing callable for static member initializer expressions. This improves the precision of a range of queries, including `cs/useless-assignment-to-local` and `cs/dereferenced-value-may-be-null`.
+
+### Bug Fixes
+
+* The query `cs/useless-cast-to-self` no longer reports casts when both the expression type and the cast target type are unknown, which can occur in `build-mode: none` databases.
diff --git a/csharp/ql/src/change-notes/released/1.9.3.md b/csharp/ql/src/change-notes/released/1.9.3.md
new file mode 100644
index 000000000000..675cc4b65718
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.9.3.md
@@ -0,0 +1,5 @@
+## 1.9.3
+
+### Minor Analysis Improvements
+
+* The `cs/linq/missed-where` query no longer flags `foreach` loops where the matching branch terminates the method, iterator, or loop instead of continuing with filtered loop work.
diff --git a/csharp/ql/src/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index df17dc3a3662..276088d81dc8 100644
--- a/csharp/ql/src/codeql-pack.release.yml
+++ b/csharp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.9.0
+lastReleaseVersion: 1.11.0
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index 8d3728935138..ed46836464d2 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.9.1-dev
+version: 1.11.1-dev
 groups:
   - csharp
   - queries
diff --git a/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
index 5b1b9e4ae65c..df030529550a 100644
--- a/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
+++ b/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
@@ -213,7 +213,8 @@ module SummaryModelGeneratorInput implements SummaryModelGeneratorInputSig {
   }
 
   private Callable getARelevantOverrideeOrImplementee(Overridable m) {
-    m.overridesOrImplements(result) and relevant(result)
+    exists(Callable c | m.overridesOrImplements(c) and result = c.getUnboundDeclaration()) and
+    relevant(result)
   }
 
   /**
diff --git a/csharp/ql/test/library-tests/csharp11/patternExprTypes.expected b/csharp/ql/test/library-tests/csharp11/patternExprTypes.expected
new file mode 100644
index 000000000000..c24c0edda27e
--- /dev/null
+++ b/csharp/ql/test/library-tests/csharp11/patternExprTypes.expected
@@ -0,0 +1,58 @@
+| ListPattern.cs:7:18:7:19 | [ ... ] | Int32[] |
+| ListPattern.cs:8:18:8:20 | [ ... ] | Int32[] |
+| ListPattern.cs:8:19:8:19 | 1 | Int32 |
+| ListPattern.cs:9:18:9:23 | [ ... ] | Int32[] |
+| ListPattern.cs:9:19:9:19 | _ | Int32 |
+| ListPattern.cs:9:22:9:22 | 2 | Int32 |
+| ListPattern.cs:10:18:10:30 | [ ... ] | Int32[] |
+| ListPattern.cs:10:19:10:23 | Int32 y | Int32 |
+| ListPattern.cs:10:26:10:26 | 3 | Int32 |
+| ListPattern.cs:10:29:10:29 | 4 | Int32 |
+| ListPattern.cs:11:18:11:31 | [ ... ] | Int32[] |
+| ListPattern.cs:11:19:11:19 | 5 | Int32 |
+| ListPattern.cs:11:19:11:24 | ... or ... | Int32 |
+| ListPattern.cs:11:24:11:24 | 6 | Int32 |
+| ListPattern.cs:11:27:11:27 | _ | Int32 |
+| ListPattern.cs:11:30:11:30 | 7 | Int32 |
+| ListPattern.cs:12:18:12:31 | [ ... ] | Int32[] |
+| ListPattern.cs:12:19:12:23 | Int32 a | Int32 |
+| ListPattern.cs:12:26:12:27 | .. | Int32[] |
+| ListPattern.cs:12:30:12:30 | 2 | Int32 |
+| ListPattern.cs:13:18:13:50 | [ ... ] | Int32[] |
+| ListPattern.cs:13:19:13:23 | Int32 b | Int32 |
+| ListPattern.cs:13:26:13:46 | .. | Int32[] |
+| ListPattern.cs:13:29:13:46 | { ... } | Int32[] |
+| ListPattern.cs:13:29:13:46 | { ... } | null |
+| ListPattern.cs:13:39:13:39 | 2 | Int32 |
+| ListPattern.cs:13:39:13:44 | ... or ... | Int32 |
+| ListPattern.cs:13:44:13:44 | 5 | Int32 |
+| ListPattern.cs:13:49:13:49 | 2 | Int32 |
+| ListPattern.cs:20:18:20:19 | [ ... ] | String[] |
+| ListPattern.cs:22:18:22:22 | [ ... ] | String[] |
+| ListPattern.cs:22:19:22:21 | "A" | String |
+| ListPattern.cs:24:18:24:25 | [ ... ] | String[] |
+| ListPattern.cs:24:19:24:19 | _ | String |
+| ListPattern.cs:24:22:24:24 | "B" | String |
+| ListPattern.cs:26:18:26:34 | [ ... ] | String[] |
+| ListPattern.cs:26:19:26:23 | String y | String |
+| ListPattern.cs:26:26:26:28 | "C" | String |
+| ListPattern.cs:26:31:26:33 | "D" | String |
+| ListPattern.cs:28:18:28:37 | [ ... ] | String[] |
+| ListPattern.cs:28:19:28:21 | "E" | String |
+| ListPattern.cs:28:19:28:28 | ... or ... | String |
+| ListPattern.cs:28:26:28:28 | "F" | String |
+| ListPattern.cs:28:31:28:31 | _ | String |
+| ListPattern.cs:28:34:28:36 | "G" | String |
+| ListPattern.cs:30:18:30:33 | [ ... ] | String[] |
+| ListPattern.cs:30:19:30:23 | String a | String |
+| ListPattern.cs:30:26:30:27 | .. | String[] |
+| ListPattern.cs:30:30:30:32 | "H" | String |
+| ListPattern.cs:32:18:32:39 | [ ... ] | String[] |
+| ListPattern.cs:32:19:32:23 | String b | String |
+| ListPattern.cs:32:26:32:33 | .. | String[] |
+| ListPattern.cs:32:29:32:33 | String[] c | String[] |
+| ListPattern.cs:32:36:32:38 | "I" | String |
+| PatternMatchSpan.cs:8:19:8:23 | "ABC" | String |
+| PatternMatchSpan.cs:15:18:15:22 | "DEF" | String |
+| Strings.cs:10:13:10:14 | 42 | Int32 |
+| Strings.cs:11:13:11:13 | _ | Int32 |
diff --git a/csharp/ql/test/library-tests/csharp11/patternExprTypes.ql b/csharp/ql/test/library-tests/csharp11/patternExprTypes.ql
new file mode 100644
index 000000000000..814019ecc818
--- /dev/null
+++ b/csharp/ql/test/library-tests/csharp11/patternExprTypes.ql
@@ -0,0 +1,4 @@
+import csharp
+
+from PatternExpr pattern
+select pattern, pattern.getType().toString()
diff --git a/csharp/ql/test/library-tests/csharp7/ForEach.ql b/csharp/ql/test/library-tests/csharp7/ForEach.ql
index e42b6f47372f..5391d6b96f8a 100644
--- a/csharp/ql/test/library-tests/csharp7/ForEach.ql
+++ b/csharp/ql/test/library-tests/csharp7/ForEach.ql
@@ -1,5 +1,5 @@
 import csharp
 
-from ForeachStmt stmt, int i
+from ForEachStmt stmt, int i
 select stmt, i, stmt.getVariableDeclExpr(i), stmt.getVariable(i), stmt.getIterableExpr(),
   stmt.getBody()
diff --git a/csharp/ql/test/library-tests/csharp7/PrintAst.expected b/csharp/ql/test/library-tests/csharp7/PrintAst.expected
index 47ab207bb556..6ac8d9d92ac7 100644
--- a/csharp/ql/test/library-tests/csharp7/PrintAst.expected
+++ b/csharp/ql/test/library-tests/csharp7/PrintAst.expected
@@ -864,19 +864,19 @@ CSharp7.cs:
 #  283|                   -1: [ParameterAccess] access to parameter item
 #  283|                 1: [PropertyCall] access to property Value
 #  283|                   -1: [ParameterAccess] access to parameter item
-#  285|       2: [ForeachStmt] foreach (... ... in ...) ...
+#  285|       2: [ForEachStmt] foreach (... ... in ...) ...
 #  285|         0: [TupleExpr] (..., ...)
 #  285|           0: [LocalVariableDeclExpr] Int32 a
 #  285|           1: [LocalVariableDeclExpr] String b
 #  285|         1: [LocalVariableAccess] access to local variable list
 #  285|         2: [BlockStmt] {...}
-#  287|       3: [ForeachStmt] foreach (... ... in ...) ...
+#  287|       3: [ForEachStmt] foreach (... ... in ...) ...
 #  287|         0: [TupleExpr] (..., ...)
 #  287|           0: [LocalVariableDeclExpr] Int32 a
 #  287|           1: [LocalVariableDeclExpr] String b
 #  287|         1: [LocalVariableAccess] access to local variable list
 #  287|         2: [BlockStmt] {...}
-#  289|       4: [ForeachStmt] foreach (... ... in ...) ...
+#  289|       4: [ForEachStmt] foreach (... ... in ...) ...
 #  289|         0: [TupleExpr] (..., ...)
 #  289|           0: [LocalVariableDeclExpr] Int32 a
 #  289|           1: [LocalVariableDeclExpr] String b
diff --git a/csharp/ql/test/library-tests/csharp8/PrintAst.expected b/csharp/ql/test/library-tests/csharp8/PrintAst.expected
index f5eb7caab572..b2471d3ca201 100644
--- a/csharp/ql/test/library-tests/csharp8/PrintAst.expected
+++ b/csharp/ql/test/library-tests/csharp8/PrintAst.expected
@@ -33,7 +33,7 @@ AsyncStreams.cs:
 #   15|   7: [Method] F
 #   15|     -1: [TypeMention] Void
 #   16|     4: [BlockStmt] {...}
-#   17|       0: [ForeachStmt] foreach (... ... in ...) ...
+#   17|       0: [ForEachStmt] foreach (... ... in ...) ...
 #   17|         0: [LocalVariableDeclExpr] Int32 item
 #   17|           0: [TypeMention] int
 #   17|         1: [MethodCall] call to method Items
@@ -929,7 +929,7 @@ patterns.cs:
 #   57|               1: [ConstantPatternExpr,IntLiteral] 2
 #   58|         10: [BreakStmt] break;
 #   59|         11: [CaseStmt] case ...:
-#   59|           0: [TupleExpr] (..., ...)
+#   59|           0: [TuplePatternExpr] (..., ...)
 #   59|             0: [VariablePatternExpr] Int32 x
 #   59|             1: [VariablePatternExpr] Int32 y
 #   60|         12: [BreakStmt] break;
@@ -1156,7 +1156,7 @@ patterns.cs:
 #  130|                   1: [ConstantPatternExpr,IntLiteral] 2
 #  130|               2: [IntLiteral] 2
 #  131|             3: [SwitchCaseExpr] ... => ...
-#  131|               0: [TupleExpr] (..., ...)
+#  131|               0: [TuplePatternExpr] (..., ...)
 #  131|                 0: [VariablePatternExpr] Int32 x
 #  131|                 1: [DiscardPatternExpr] _
 #  131|               2: [IntLiteral] 3
diff --git a/csharp/ql/test/library-tests/csharp8/patterns.expected b/csharp/ql/test/library-tests/csharp8/patterns.expected
index ca4c7f507793..fbfba8a6a825 100644
--- a/csharp/ql/test/library-tests/csharp8/patterns.expected
+++ b/csharp/ql/test/library-tests/csharp8/patterns.expected
@@ -188,16 +188,140 @@ labeledPatternExpr
 | patterns.cs:129:27:129:28 | 10 | X |
 | patterns.cs:142:31:142:32 | 10 | X |
 tupleTypes
-| patterns.cs:59:18:59:27 | (..., ...) | file://:0:0:0:0 | (Int32,Int32) |
-| patterns.cs:86:15:86:19 | (..., ...) | file://:0:0:0:0 | (Int32,Int32) |
-| patterns.cs:91:16:91:20 | (..., ...) | file://:0:0:0:0 | (Int32,Int32) |
-| patterns.cs:108:9:108:20 | (..., ...) | file://:0:0:0:0 | (Int32,Int32) |
-| patterns.cs:108:24:108:31 | (..., ...) | file://:0:0:0:0 | (Int32,Int32) |
-| patterns.cs:110:22:110:26 | (..., ...) | file://:0:0:0:0 | (Int32,Int32) |
-| patterns.cs:111:22:111:26 | (..., ...) | file://:0:0:0:0 | (Int32,Int32) |
-| patterns.cs:115:9:115:16 | (..., ...) | file://:0:0:0:0 | (Int32,Int32) |
-| patterns.cs:115:20:115:27 | (..., ...) | file://:0:0:0:0 | (Int32,Int32) |
-| patterns.cs:117:27:117:33 | (..., ...) | file://:0:0:0:0 | (Int32,Int32) |
-| patterns.cs:118:28:118:34 | (..., ...) | file://:0:0:0:0 | (Int32,Int32) |
-| patterns.cs:119:33:119:38 | (..., ...) | file://:0:0:0:0 | (Int32,Int32) |
-| patterns.cs:131:13:131:22 | (..., ...) | file://:0:0:0:0 | (Int32,Object) |
+| patterns.cs:59:18:59:27 | (..., ...) | (Int32,Int32) |
+| patterns.cs:86:15:86:19 | (..., ...) | (Int32,Int32) |
+| patterns.cs:91:16:91:20 | (..., ...) | (Int32,Int32) |
+| patterns.cs:108:9:108:20 | (..., ...) | (Int32,Int32) |
+| patterns.cs:108:24:108:31 | (..., ...) | (Int32,Int32) |
+| patterns.cs:110:22:110:26 | (..., ...) | (Int32,Int32) |
+| patterns.cs:111:22:111:26 | (..., ...) | (Int32,Int32) |
+| patterns.cs:115:9:115:16 | (..., ...) | (Int32,Int32) |
+| patterns.cs:115:20:115:27 | (..., ...) | (Int32,Int32) |
+| patterns.cs:117:27:117:33 | (..., ...) | (Int32,Int32) |
+| patterns.cs:118:28:118:34 | (..., ...) | (Int32,Int32) |
+| patterns.cs:119:33:119:38 | (..., ...) | (Int32,Int32) |
+| patterns.cs:131:13:131:22 | (..., ...) | (Int32,Object) |
+patternExprTypes
+| patterns.cs:9:18:9:29 | MyStruct ms1 | MyStruct |
+| patterns.cs:13:18:13:25 | access to type MyStruct | MyStruct |
+| patterns.cs:13:18:13:40 | MyStruct s | MyStruct |
+| patterns.cs:13:18:13:40 | { ... } | MyStruct |
+| patterns.cs:13:27:13:38 | { ... } | null |
+| patterns.cs:13:32:13:36 | Int32 x | Int32 |
+| patterns.cs:17:18:17:19 | { ... } | null |
+| patterns.cs:17:18:17:21 | Object p | Object |
+| patterns.cs:17:18:17:21 | { ... } | Object |
+| patterns.cs:22:18:22:25 | access to type MyStruct | MyStruct |
+| patterns.cs:22:18:22:53 | { ... } | MyStruct |
+| patterns.cs:22:27:22:53 | { ... } | null |
+| patterns.cs:22:31:22:32 | 12 | Int32 |
+| patterns.cs:22:38:22:51 | { ... } | MyStruct |
+| patterns.cs:22:38:22:51 | { ... } | null |
+| patterns.cs:22:42:22:49 | Int32 subX | Int32 |
+| patterns.cs:27:18:27:25 | access to type MyStruct | MyStruct |
+| patterns.cs:27:18:27:58 | { ... } | MyStruct |
+| patterns.cs:27:27:27:58 | { ... } | null |
+| patterns.cs:27:31:27:32 | 12 | Int32 |
+| patterns.cs:27:38:27:45 | access to type MyStruct | MyStruct |
+| patterns.cs:27:38:27:56 | MyStruct ms | MyStruct |
+| patterns.cs:27:38:27:56 | { ... } | MyStruct |
+| patterns.cs:27:47:27:53 | { ... } | null |
+| patterns.cs:27:51:27:51 | _ | Int32 |
+| patterns.cs:38:18:38:29 | MyStruct ms1 | MyStruct |
+| patterns.cs:41:18:41:29 | MyStruct ms2 | MyStruct |
+| patterns.cs:48:18:48:25 | access to type MyStruct | MyStruct |
+| patterns.cs:48:18:48:38 | { ... } | MyStruct |
+| patterns.cs:48:27:48:38 | { ... } | null |
+| patterns.cs:48:32:48:36 | Int32 x | Int32 |
+| patterns.cs:51:18:51:25 | access to type MyStruct | MyStruct |
+| patterns.cs:51:18:51:38 | MyStruct ms | MyStruct |
+| patterns.cs:51:18:51:38 | { ... } | MyStruct |
+| patterns.cs:51:27:51:35 | { ... } | null |
+| patterns.cs:51:32:51:33 | 10 | Int32 |
+| patterns.cs:54:18:54:30 | { ... } | MyStruct |
+| patterns.cs:54:18:54:30 | { ... } | null |
+| patterns.cs:54:23:54:28 | Int32 x2 | Int32 |
+| patterns.cs:57:18:57:23 | ( ... ) | null |
+| patterns.cs:57:18:57:23 | { ... } | MyStruct |
+| patterns.cs:57:19:57:19 | 1 | Int32 |
+| patterns.cs:57:22:57:22 | 2 | Int32 |
+| patterns.cs:59:18:59:27 | (..., ...) | (Int32,Int32) |
+| patterns.cs:59:23:59:23 | Int32 x | Int32 |
+| patterns.cs:59:26:59:26 | Int32 y | Int32 |
+| patterns.cs:67:18:67:25 | access to type MyStruct | MyStruct |
+| patterns.cs:67:18:67:38 | { ... } | MyStruct |
+| patterns.cs:67:27:67:38 | { ... } | null |
+| patterns.cs:67:32:67:36 | Int32 x | Int32 |
+| patterns.cs:70:18:70:25 | access to type MyStruct | MyStruct |
+| patterns.cs:70:18:70:38 | MyStruct ms | MyStruct |
+| patterns.cs:70:18:70:38 | { ... } | MyStruct |
+| patterns.cs:70:27:70:35 | { ... } | null |
+| patterns.cs:70:32:70:33 | 10 | Int32 |
+| patterns.cs:78:18:78:33 | ( ... ) | null |
+| patterns.cs:78:18:78:33 | { ... } | ITuple |
+| patterns.cs:78:19:78:23 | Int32 x | Int32 |
+| patterns.cs:78:26:78:32 | Single y | Single |
+| patterns.cs:80:18:80:19 | ( ... ) | null |
+| patterns.cs:80:18:80:19 | { ... } | ITuple |
+| patterns.cs:82:18:82:19 | { ... } | Object |
+| patterns.cs:82:18:82:19 | { ... } | null |
+| patterns.cs:88:18:88:23 | ( ... ) | null |
+| patterns.cs:88:18:88:23 | { ... } | (Int32,Int32) |
+| patterns.cs:88:19:88:19 | 1 | Int32 |
+| patterns.cs:88:22:88:22 | 2 | Int32 |
+| patterns.cs:93:18:93:27 | ( ... ) | null |
+| patterns.cs:93:18:93:27 | { ... } | (Int32,Int32) |
+| patterns.cs:93:19:93:19 | 1 | Int32 |
+| patterns.cs:93:22:93:26 | Int32 x | Int32 |
+| patterns.cs:94:18:94:23 | ( ... ) | null |
+| patterns.cs:94:18:94:23 | { ... } | (Int32,Int32) |
+| patterns.cs:94:19:94:19 | 2 | Int32 |
+| patterns.cs:94:22:94:22 | _ | Int32 |
+| patterns.cs:101:13:101:17 | Int32 y | Int32 |
+| patterns.cs:102:13:102:13 | _ | Int32 |
+| patterns.cs:110:13:110:17 | ( ... ) | null |
+| patterns.cs:110:13:110:17 | { ... } | (Int32,Int32) |
+| patterns.cs:110:14:110:14 | 0 | Int32 |
+| patterns.cs:110:16:110:16 | 1 | Int32 |
+| patterns.cs:111:13:111:17 | ( ... ) | null |
+| patterns.cs:111:13:111:17 | { ... } | (Int32,Int32) |
+| patterns.cs:111:14:111:14 | 1 | Int32 |
+| patterns.cs:111:16:111:16 | 0 | Int32 |
+| patterns.cs:117:13:117:22 | ( ... ) | null |
+| patterns.cs:117:13:117:22 | { ... } | (Int32,Int32) |
+| patterns.cs:117:14:117:14 | 0 | Int32 |
+| patterns.cs:117:16:117:21 | Int32 y2 | Int32 |
+| patterns.cs:118:13:118:23 | ( ... ) | null |
+| patterns.cs:118:13:118:23 | { ... } | (Int32,Int32) |
+| patterns.cs:118:14:118:19 | Int32 x2 | Int32 |
+| patterns.cs:118:22:118:22 | 0 | Int32 |
+| patterns.cs:119:13:119:28 | ( ... ) | null |
+| patterns.cs:119:13:119:28 | { ... } | (Int32,Int32) |
+| patterns.cs:119:14:119:19 | Int32 x2 | Int32 |
+| patterns.cs:119:22:119:27 | Int32 y2 | Int32 |
+| patterns.cs:128:13:128:20 | access to type MyStruct | MyStruct |
+| patterns.cs:128:13:128:33 | { ... } | MyStruct |
+| patterns.cs:128:22:128:33 | { ... } | null |
+| patterns.cs:128:27:128:31 | Int32 x | Int32 |
+| patterns.cs:129:13:129:20 | access to type MyStruct | MyStruct |
+| patterns.cs:129:13:129:33 | MyStruct ms | MyStruct |
+| patterns.cs:129:13:129:33 | { ... } | MyStruct |
+| patterns.cs:129:22:129:30 | { ... } | null |
+| patterns.cs:129:27:129:28 | 10 | Int32 |
+| patterns.cs:130:13:130:18 | ( ... ) | null |
+| patterns.cs:130:13:130:18 | { ... } | MyStruct |
+| patterns.cs:130:14:130:14 | 1 | Int32 |
+| patterns.cs:130:17:130:17 | 2 | Int32 |
+| patterns.cs:131:13:131:22 | (..., ...) | (Int32,Object) |
+| patterns.cs:131:18:131:18 | Int32 x | Int32 |
+| patterns.cs:131:21:131:21 | _ | null |
+| patterns.cs:138:17:138:17 | 1 | Int32 |
+| patterns.cs:139:17:139:17 | 2 | Int32 |
+| patterns.cs:140:17:140:24 | Object y | Object |
+| patterns.cs:140:36:140:37 | { ... } | Object |
+| patterns.cs:140:36:140:37 | { ... } | null |
+| patterns.cs:141:17:141:22 | access to type String | String |
+| patterns.cs:142:17:142:24 | access to type MyStruct | MyStruct |
+| patterns.cs:142:17:142:36 | { ... } | MyStruct |
+| patterns.cs:142:26:142:34 | { ... } | null |
+| patterns.cs:142:31:142:32 | 10 | Int32 |
diff --git a/csharp/ql/test/library-tests/csharp8/patterns.ql b/csharp/ql/test/library-tests/csharp8/patterns.ql
index fc758eb92160..164eea21e09a 100644
--- a/csharp/ql/test/library-tests/csharp8/patterns.ql
+++ b/csharp/ql/test/library-tests/csharp8/patterns.ql
@@ -68,4 +68,8 @@ query predicate isRecursivePatternExprWithDecl(
 
 query predicate labeledPatternExpr(LabeledPatternExpr e, string s) { s = e.getLabel() }
 
-query predicate tupleTypes(TupleExpr te, Type t) { te.getType() = t }
+query predicate tupleTypes(TupleExpr te, string type) { te.getType().toString() = type }
+
+query predicate patternExprTypes(PatternExpr pattern, string type) {
+  pattern.getType().toString() = type
+}
diff --git a/csharp/ql/test/library-tests/csharp9/PrintAst.expected b/csharp/ql/test/library-tests/csharp9/PrintAst.expected
index 459349fb9fc8..f86c98e4c6cf 100644
--- a/csharp/ql/test/library-tests/csharp9/PrintAst.expected
+++ b/csharp/ql/test/library-tests/csharp9/PrintAst.expected
@@ -241,7 +241,7 @@ ForeachExtension.cs:
 #   23|                 0: [TypeMention] Enumerable
 #   23|               0: [IntLiteral] 0
 #   23|               1: [IntLiteral] 10
-#   24|       1: [ForeachStmt] foreach (... ... in ...) ...
+#   24|       1: [ForEachStmt] foreach (... ... in ...) ...
 #   24|         0: [LocalVariableDeclExpr] Int32 item
 #   24|           0: [TypeMention] int
 #   24|         1: [LocalVariableAccess] access to local variable enumerator1
@@ -252,17 +252,17 @@ ForeachExtension.cs:
 #   28|             1: [TypeMention] int
 #   28|           0: [LocalVariableAccess] access to local variable enumerator2
 #   28|           1: [MethodCall] call to method GetAsyncEnumerator
-#   29|       3: [ForeachStmt] foreach (... ... in ...) ...
+#   29|       3: [ForEachStmt] foreach (... ... in ...) ...
 #   29|         0: [LocalVariableDeclExpr] Int32 item
 #   29|           0: [TypeMention] int
 #   29|         1: [LocalVariableAccess] access to local variable enumerator2
 #   30|         2: [BlockStmt] {...}
-#   33|       4: [ForeachStmt] foreach (... ... in ...) ...
+#   33|       4: [ForEachStmt] foreach (... ... in ...) ...
 #   33|         0: [LocalVariableDeclExpr] Int32 item
 #   33|           0: [TypeMention] int
 #   33|         1: [IntLiteral] 42
 #   34|         2: [BlockStmt] {...}
-#   37|       5: [ForeachStmt] foreach (... ... in ...) ...
+#   37|       5: [ForEachStmt] foreach (... ... in ...) ...
 #   37|         0: [LocalVariableDeclExpr] Int32 i
 #   37|           0: [TypeMention] int
 #   37|         1: [ArrayCreation] array creation of type Int32[]
diff --git a/csharp/ql/test/library-tests/csharp9/foreach.ql b/csharp/ql/test/library-tests/csharp9/foreach.ql
index 343ecc556ab8..eae1f44fdd25 100644
--- a/csharp/ql/test/library-tests/csharp9/foreach.ql
+++ b/csharp/ql/test/library-tests/csharp9/foreach.ql
@@ -4,11 +4,11 @@ private string getLocation(Member m) {
   if m.fromSource() then result = m.getALocation().(SourceLocation).toString() else result = "-"
 }
 
-private string getIsAsync(ForeachStmt f) {
+private string getIsAsync(ForEachStmt f) {
   if f.isAsync() then result = "async" else result = "sync"
 }
 
-from ForeachStmt f
+from ForEachStmt f
 select f, f.getElementType().toString(), getIsAsync(f),
   f.getGetEnumerator().getDeclaringType().getFullyQualifiedNameDebug(),
   getLocation(f.getGetEnumerator()), f.getCurrent().getDeclaringType().getFullyQualifiedNameDebug(),
diff --git a/csharp/ql/test/library-tests/csharp9/patternExprTypes.expected b/csharp/ql/test/library-tests/csharp9/patternExprTypes.expected
new file mode 100644
index 000000000000..f85df3d0802d
--- /dev/null
+++ b/csharp/ql/test/library-tests/csharp9/patternExprTypes.expected
@@ -0,0 +1,61 @@
+| BinaryPattern.cs:8:14:8:16 | a | Char |
+| BinaryPattern.cs:8:14:8:23 | ... or ... | Char |
+| BinaryPattern.cs:8:21:8:23 | b | Char |
+| BinaryPattern.cs:10:14:10:21 | Object o | Object |
+| BinaryPattern.cs:10:14:10:51 | ... and ... | BinaryPattern |
+| BinaryPattern.cs:10:27:10:39 | access to type BinaryPattern | BinaryPattern |
+| BinaryPattern.cs:10:27:10:51 | BinaryPattern u | BinaryPattern |
+| BinaryPattern.cs:10:27:10:51 | { ... } | BinaryPattern |
+| BinaryPattern.cs:10:41:10:49 | { ... } | null |
+| BinaryPattern.cs:10:47:10:47 | 1 | Int32 |
+| BinaryPattern.cs:12:14:12:21 | Object o | Object |
+| BinaryPattern.cs:12:14:12:41 | ... and ... | BinaryPattern |
+| BinaryPattern.cs:12:27:12:41 | BinaryPattern u | BinaryPattern |
+| BinaryPattern.cs:18:13:18:13 | 1 | Int32 |
+| BinaryPattern.cs:18:13:18:18 | ... or ... | Int32 |
+| BinaryPattern.cs:18:18:18:18 | 2 | Int32 |
+| BinaryPattern.cs:19:13:19:13 | _ | Int32 |
+| ParenthesizedPattern.cs:9:18:9:19 | { ... } | null |
+| ParenthesizedPattern.cs:9:18:9:22 | Object p1 | Object |
+| ParenthesizedPattern.cs:9:18:9:22 | { ... } | Object |
+| ParenthesizedPattern.cs:13:19:13:20 | { ... } | null |
+| ParenthesizedPattern.cs:13:19:13:23 | Object p2 | Object |
+| ParenthesizedPattern.cs:13:19:13:23 | { ... } | Object |
+| ParenthesizedPattern.cs:22:13:22:13 | 1 | Int32 |
+| ParenthesizedPattern.cs:23:14:23:14 | 2 | Int32 |
+| ParenthesizedPattern.cs:24:13:24:15 | T t | T |
+| ParenthesizedPattern.cs:24:27:24:28 | { ... } | T |
+| ParenthesizedPattern.cs:24:27:24:28 | { ... } | null |
+| ParenthesizedPattern.cs:25:14:25:22 | Object o1 | Object |
+| ParenthesizedPattern.cs:25:37:25:38 | { ... } | Object |
+| ParenthesizedPattern.cs:25:37:25:38 | { ... } | null |
+| ParenthesizedPattern.cs:26:14:26:19 | access to type String | String |
+| RelationalPattern.cs:6:14:6:19 | >= ... | Char |
+| RelationalPattern.cs:8:14:8:18 | > ... | Char |
+| RelationalPattern.cs:10:14:10:19 | <= ... | Char |
+| RelationalPattern.cs:12:14:12:18 | < ... | Char |
+| RelationalPattern.cs:18:13:18:13 | 1 | Int32 |
+| RelationalPattern.cs:19:13:19:14 | > ... | Int32 |
+| RelationalPattern.cs:20:13:20:13 | _ | Int32 |
+| TargetType.cs:31:38:31:41 | null | null |
+| TypePattern.cs:8:18:8:30 | ( ... ) | null |
+| TypePattern.cs:8:18:8:30 | { ... } | (Object,Object) |
+| TypePattern.cs:8:19:8:21 | access to type Int32 | Int32 |
+| TypePattern.cs:8:24:8:29 | access to type String | String |
+| TypePattern.cs:11:13:11:15 | access to type Int32 | Int32 |
+| TypePattern.cs:12:13:12:20 | Double d | Double |
+| TypePattern.cs:13:13:13:25 | access to type String | String |
+| TypePattern.cs:14:13:14:27 | Object o | Object |
+| UnaryPattern.cs:8:14:8:20 | not ... | Char |
+| UnaryPattern.cs:8:18:8:20 | a | Char |
+| UnaryPattern.cs:10:14:10:21 | not ... | Object |
+| UnaryPattern.cs:10:18:10:21 | null | null |
+| UnaryPattern.cs:12:14:12:41 | not ... | Object |
+| UnaryPattern.cs:12:18:12:29 | access to type UnaryPattern | UnaryPattern |
+| UnaryPattern.cs:12:18:12:41 | UnaryPattern u | UnaryPattern |
+| UnaryPattern.cs:12:18:12:41 | { ... } | UnaryPattern |
+| UnaryPattern.cs:12:31:12:39 | { ... } | null |
+| UnaryPattern.cs:12:37:12:37 | 1 | Int32 |
+| UnaryPattern.cs:18:13:18:17 | not ... | Int32 |
+| UnaryPattern.cs:18:17:18:17 | 1 | Int32 |
+| UnaryPattern.cs:19:13:19:13 | _ | Int32 |
diff --git a/csharp/ql/test/library-tests/csharp9/patternExprTypes.ql b/csharp/ql/test/library-tests/csharp9/patternExprTypes.ql
new file mode 100644
index 000000000000..814019ecc818
--- /dev/null
+++ b/csharp/ql/test/library-tests/csharp9/patternExprTypes.ql
@@ -0,0 +1,4 @@
+import csharp
+
+from PatternExpr pattern
+select pattern, pattern.getType().toString()
diff --git a/csharp/ql/test/library-tests/dataflow/additional-taint-step/AdditionalTaintStep.expected b/csharp/ql/test/library-tests/dataflow/additional-taint-step/AdditionalTaintStep.expected
new file mode 100644
index 000000000000..acd241d386f5
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/additional-taint-step/AdditionalTaintStep.expected
@@ -0,0 +1 @@
+| Test.cs:13:35:13:45 | access to parameter taintSource | Test.cs:13:23:13:46 | call to method Step | AdditionalTaintStep |
diff --git a/csharp/ql/test/library-tests/dataflow/additional-taint-step/AdditionalTaintStep.ql b/csharp/ql/test/library-tests/dataflow/additional-taint-step/AdditionalTaintStep.ql
new file mode 100644
index 000000000000..39d9e154b6f7
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/additional-taint-step/AdditionalTaintStep.ql
@@ -0,0 +1,24 @@
+import csharp
+import semmle.code.csharp.dataflow.FlowSteps
+import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate
+
+/**
+ * A test-only additional taint step that treats calls to `Marker.Step` as
+ * propagating taint from the argument to the call result, to verify that
+ * `AdditionalTaintStep` subclasses are picked up by `defaultAdditionalTaintStep`.
+ */
+private class MarkerStepTaintStep extends AdditionalTaintStep {
+  override predicate step(DataFlow::Node node1, DataFlow::Node node2) {
+    exists(MethodCall mc |
+      mc.getTarget().hasName("Step") and
+      mc.getTarget().getDeclaringType().hasName("Marker")
+    |
+      node1.asExpr() = mc.getArgument(0) and
+      node2.asExpr() = mc
+    )
+  }
+}
+
+from DataFlow::Node src, DataFlow::Node sink, string model
+where defaultAdditionalTaintStep(src, sink, model) and model = "AdditionalTaintStep"
+select src, sink, model
diff --git a/csharp/ql/test/library-tests/dataflow/additional-taint-step/Test.cs b/csharp/ql/test/library-tests/dataflow/additional-taint-step/Test.cs
new file mode 100644
index 000000000000..051793e2c855
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/additional-taint-step/Test.cs
@@ -0,0 +1,18 @@
+class Marker
+{
+    // A stand-in for a framework method that isn't otherwise understood by the
+    // taint-tracking library, whose taint behaviour is modelled by a test-only
+    // `AdditionalTaintStep` subclass instead.
+    public static object Step(object x) => new object();
+}
+
+class Test
+{
+    void M(object taintSource)
+    {
+        var tainted = Marker.Step(taintSource);
+        Sink(tainted);
+    }
+
+    static void Sink(object o) { }
+}
diff --git a/csharp/ql/test/library-tests/dataflow/flowsources/aspremote/AspRemoteFlowSource.cs b/csharp/ql/test/library-tests/dataflow/flowsources/aspremote/AspRemoteFlowSource.cs
index 5bc8025f231b..d7b085ef61fd 100644
--- a/csharp/ql/test/library-tests/dataflow/flowsources/aspremote/AspRemoteFlowSource.cs
+++ b/csharp/ql/test/library-tests/dataflow/flowsources/aspremote/AspRemoteFlowSource.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 
 namespace Testing
@@ -21,6 +22,27 @@ public object MyAction(ViewModel viewModel)
         {
             throw null;
         }
+
+        public void BindingSources(
+            string ordinary,
+            [FromQuery] string fromQuery,
+            [FromBody] string fromBody,
+            [FromRoute] string fromRoute,
+            [FromHeader] string fromHeader,
+            [FromServices] IRequestService fromServices,
+            [CustomFromServices] IRequestService customFromServices,
+            [FromKeyedServices("cache")] IRequestService fromKeyedServices,
+            [CustomFromKeyedServices] IRequestService customFromKeyedServices)
+        { }
+    }
+
+    public interface IRequestService { }
+
+    public sealed class CustomFromServicesAttribute : FromServicesAttribute { }
+
+    public sealed class CustomFromKeyedServicesAttribute : FromKeyedServicesAttribute
+    {
+        public CustomFromKeyedServicesAttribute() : base("custom") { }
     }
 
     public class Item
diff --git a/csharp/ql/test/library-tests/dataflow/flowsources/aspremote/aspRemoteFlowSource.expected b/csharp/ql/test/library-tests/dataflow/flowsources/aspremote/aspRemoteFlowSource.expected
index ef7a8f3cd784..6ba2741857b5 100644
--- a/csharp/ql/test/library-tests/dataflow/flowsources/aspremote/aspRemoteFlowSource.expected
+++ b/csharp/ql/test/library-tests/dataflow/flowsources/aspremote/aspRemoteFlowSource.expected
@@ -1,23 +1,27 @@
 remoteFlowSourceMembers
-| AspRemoteFlowSource.cs:10:23:10:31 | RequestId |
-| AspRemoteFlowSource.cs:11:23:11:36 | RequestIdField |
-| AspRemoteFlowSource.cs:28:23:28:29 | Tainted |
+| AspRemoteFlowSource.cs:11:23:11:31 | RequestId |
+| AspRemoteFlowSource.cs:12:23:12:36 | RequestIdField |
+| AspRemoteFlowSource.cs:50:23:50:29 | Tainted |
 remoteFlowSources
-| AspRemoteFlowSource.cs:20:42:20:50 | viewModel |
-| AspRemoteFlowSource.cs:35:42:35:46 | param |
-| AspRemoteFlowSource.cs:43:58:43:63 | newUrl |
-| AspRemoteFlowSource.cs:44:61:44:65 | myApi |
-| AspRemoteFlowSource.cs:44:75:44:79 | myUrl |
-| AspRemoteFlowSource.cs:46:46:46:56 | lambdaParam |
-| AspRemoteFlowSource.cs:52:65:52:76 | mapPostParam |
-| AspRemoteFlowSource.cs:53:63:53:73 | mapPutParam |
-| AspRemoteFlowSource.cs:54:69:54:82 | mapDeleteParam |
-| AspRemoteFlowSource.cs:56:41:56:44 | item |
-| AspRemoteFlowSource.cs:64:43:64:47 | param |
-| AspRemoteFlowSource.cs:71:34:71:35 | id |
-| AspRemoteFlowSource.cs:73:35:73:41 | command |
-| AspRemoteFlowSource.cs:73:48:73:52 | count |
-| AspRemoteFlowSource.cs:75:40:75:43 | data |
-| AspRemoteFlowSource.cs:77:34:77:38 | value |
-| AspRemoteFlowSource.cs:79:37:79:42 | itemId |
-| AspRemoteFlowSource.cs:92:35:92:46 | derivedParam |
+| AspRemoteFlowSource.cs:21:42:21:50 | viewModel |
+| AspRemoteFlowSource.cs:27:20:27:27 | ordinary |
+| AspRemoteFlowSource.cs:28:32:28:40 | fromQuery |
+| AspRemoteFlowSource.cs:29:31:29:38 | fromBody |
+| AspRemoteFlowSource.cs:30:32:30:40 | fromRoute |
+| AspRemoteFlowSource.cs:31:33:31:42 | fromHeader |
+| AspRemoteFlowSource.cs:57:42:57:46 | param |
+| AspRemoteFlowSource.cs:65:58:65:63 | newUrl |
+| AspRemoteFlowSource.cs:66:61:66:65 | myApi |
+| AspRemoteFlowSource.cs:66:75:66:79 | myUrl |
+| AspRemoteFlowSource.cs:68:46:68:56 | lambdaParam |
+| AspRemoteFlowSource.cs:74:65:74:76 | mapPostParam |
+| AspRemoteFlowSource.cs:75:63:75:73 | mapPutParam |
+| AspRemoteFlowSource.cs:76:69:76:82 | mapDeleteParam |
+| AspRemoteFlowSource.cs:78:41:78:44 | item |
+| AspRemoteFlowSource.cs:93:34:93:35 | id |
+| AspRemoteFlowSource.cs:95:35:95:41 | command |
+| AspRemoteFlowSource.cs:95:48:95:52 | count |
+| AspRemoteFlowSource.cs:97:40:97:43 | data |
+| AspRemoteFlowSource.cs:99:34:99:38 | value |
+| AspRemoteFlowSource.cs:101:37:101:42 | itemId |
+| AspRemoteFlowSource.cs:114:35:114:46 | derivedParam |
diff --git a/csharp/ql/test/library-tests/dataflow/patterns/PatternFlow.expected b/csharp/ql/test/library-tests/dataflow/patterns/PatternFlow.expected
index 4e4a41dfc62c..a9b4eb935298 100644
--- a/csharp/ql/test/library-tests/dataflow/patterns/PatternFlow.expected
+++ b/csharp/ql/test/library-tests/dataflow/patterns/PatternFlow.expected
@@ -1,6 +1,350 @@
 models
 edges
+| Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | Patterns.cs:5:21:5:26 | this [Return] : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | Patterns.cs:5:21:5:26 | this [Return] : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:21:13:21:13 | access to local variable o : Object | Patterns.cs:22:33:22:33 | access to local variable o : Object | provenance |  |
+| Patterns.cs:21:13:21:13 | access to local variable o : Object | Patterns.cs:22:33:22:33 | access to local variable o : Object | provenance |  |
+| Patterns.cs:21:17:21:33 | call to method Source<Object> : Object | Patterns.cs:21:13:21:13 | access to local variable o : Object | provenance |  |
+| Patterns.cs:21:17:21:33 | call to method Source<Object> : Object | Patterns.cs:21:13:21:13 | access to local variable o : Object | provenance |  |
+| Patterns.cs:22:13:22:13 | access to local variable r : RecordClass [property Prop] : Object | Patterns.cs:23:18:23:47 | { ... } : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:22:13:22:13 | access to local variable r : RecordClass [property Prop] : Object | Patterns.cs:23:18:23:47 | { ... } : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:22:17:22:34 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:22:13:22:13 | access to local variable r : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:22:17:22:34 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:22:13:22:13 | access to local variable r : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:22:33:22:33 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | provenance |  |
+| Patterns.cs:22:33:22:33 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | provenance |  |
+| Patterns.cs:22:33:22:33 | access to local variable o : Object | Patterns.cs:22:17:22:34 | object creation of type RecordClass : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:22:33:22:33 | access to local variable o : Object | Patterns.cs:22:17:22:34 | object creation of type RecordClass : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:23:18:23:47 | { ... } : RecordClass [property Prop] : Object | Patterns.cs:25:18:25:18 | access to local variable p | provenance |  |
+| Patterns.cs:23:18:23:47 | { ... } : RecordClass [property Prop] : Object | Patterns.cs:25:18:25:18 | access to local variable p | provenance |  |
+| Patterns.cs:31:13:31:13 | access to local variable o : Object | Patterns.cs:32:33:32:33 | access to local variable o : Object | provenance |  |
+| Patterns.cs:31:13:31:13 | access to local variable o : Object | Patterns.cs:32:33:32:33 | access to local variable o : Object | provenance |  |
+| Patterns.cs:31:17:31:33 | call to method Source<Object> : Object | Patterns.cs:31:13:31:13 | access to local variable o : Object | provenance |  |
+| Patterns.cs:31:17:31:33 | call to method Source<Object> : Object | Patterns.cs:31:13:31:13 | access to local variable o : Object | provenance |  |
+| Patterns.cs:32:13:32:13 | access to local variable r : RecordClass [property Prop] : Object | Patterns.cs:35:18:35:47 | { ... } : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:32:13:32:13 | access to local variable r : RecordClass [property Prop] : Object | Patterns.cs:35:18:35:47 | { ... } : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:32:17:32:34 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:32:13:32:13 | access to local variable r : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:32:17:32:34 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:32:13:32:13 | access to local variable r : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:32:33:32:33 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | provenance |  |
+| Patterns.cs:32:33:32:33 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | provenance |  |
+| Patterns.cs:32:33:32:33 | access to local variable o : Object | Patterns.cs:32:17:32:34 | object creation of type RecordClass : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:32:33:32:33 | access to local variable o : Object | Patterns.cs:32:17:32:34 | object creation of type RecordClass : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:35:18:35:47 | { ... } : RecordClass [property Prop] : Object | Patterns.cs:36:22:36:22 | access to local variable p | provenance |  |
+| Patterns.cs:35:18:35:47 | { ... } : RecordClass [property Prop] : Object | Patterns.cs:36:22:36:22 | access to local variable p | provenance |  |
+| Patterns.cs:43:13:43:13 | access to local variable o : Object | Patterns.cs:44:44:44:44 | access to local variable o : Object | provenance |  |
+| Patterns.cs:43:13:43:13 | access to local variable o : Object | Patterns.cs:44:44:44:44 | access to local variable o : Object | provenance |  |
+| Patterns.cs:43:17:43:33 | call to method Source<Object> : Object | Patterns.cs:43:13:43:13 | access to local variable o : Object | provenance |  |
+| Patterns.cs:43:17:43:33 | call to method Source<Object> : Object | Patterns.cs:43:13:43:13 | access to local variable o : Object | provenance |  |
+| Patterns.cs:44:13:44:13 | access to local variable s : Nested [property Record, property Prop] : Object | Patterns.cs:45:18:45:54 | { ... } : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:44:13:44:13 | access to local variable s : Nested [property Record, property Prop] : Object | Patterns.cs:45:18:45:54 | { ... } : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:44:17:44:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | Patterns.cs:44:13:44:13 | access to local variable s : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:44:17:44:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | Patterns.cs:44:13:44:13 | access to local variable s : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:44:28:44:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:44:28:44:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:44:28:44:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:44:17:44:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:44:28:44:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:44:17:44:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:44:44:44:44 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | provenance |  |
+| Patterns.cs:44:44:44:44 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | provenance |  |
+| Patterns.cs:44:44:44:44 | access to local variable o : Object | Patterns.cs:44:28:44:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:44:44:44:44 | access to local variable o : Object | Patterns.cs:44:28:44:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:45:18:45:54 | { ... } : Nested [property Record, property Prop] : Object | Patterns.cs:45:35:45:52 | { ... } : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:45:18:45:54 | { ... } : Nested [property Record, property Prop] : Object | Patterns.cs:45:35:45:52 | { ... } : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:45:35:45:52 | { ... } : RecordClass [property Prop] : Object | Patterns.cs:47:18:47:18 | access to local variable p | provenance |  |
+| Patterns.cs:45:35:45:52 | { ... } : RecordClass [property Prop] : Object | Patterns.cs:47:18:47:18 | access to local variable p | provenance |  |
+| Patterns.cs:53:13:53:13 | access to local variable o : Object | Patterns.cs:54:44:54:44 | access to local variable o : Object | provenance |  |
+| Patterns.cs:53:13:53:13 | access to local variable o : Object | Patterns.cs:54:44:54:44 | access to local variable o : Object | provenance |  |
+| Patterns.cs:53:17:53:33 | call to method Source<Object> : Object | Patterns.cs:53:13:53:13 | access to local variable o : Object | provenance |  |
+| Patterns.cs:53:17:53:33 | call to method Source<Object> : Object | Patterns.cs:53:13:53:13 | access to local variable o : Object | provenance |  |
+| Patterns.cs:54:13:54:13 | access to local variable s : Nested [property Record, property Prop] : Object | Patterns.cs:55:18:55:49 | { ... } : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:54:13:54:13 | access to local variable s : Nested [property Record, property Prop] : Object | Patterns.cs:55:18:55:49 | { ... } : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:54:17:54:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | Patterns.cs:54:13:54:13 | access to local variable s : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:54:17:54:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | Patterns.cs:54:13:54:13 | access to local variable s : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:54:28:54:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:54:28:54:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:54:28:54:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:54:17:54:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:54:28:54:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:54:17:54:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:54:44:54:44 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | provenance |  |
+| Patterns.cs:54:44:54:44 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | provenance |  |
+| Patterns.cs:54:44:54:44 | access to local variable o : Object | Patterns.cs:54:28:54:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:54:44:54:44 | access to local variable o : Object | Patterns.cs:54:28:54:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:55:18:55:49 | { ... } : Nested [property Record, property Prop] : Object | Patterns.cs:55:27:55:32 | { ... } : null [property Prop] : Object | provenance |  |
+| Patterns.cs:55:18:55:49 | { ... } : Nested [property Record, property Prop] : Object | Patterns.cs:55:27:55:32 | { ... } : null [property Prop] : Object | provenance |  |
+| Patterns.cs:55:27:55:32 | { ... } : null [property Prop] : Object | Patterns.cs:57:18:57:18 | access to local variable p | provenance |  |
+| Patterns.cs:55:27:55:32 | { ... } : null [property Prop] : Object | Patterns.cs:57:18:57:18 | access to local variable p | provenance |  |
+| Patterns.cs:63:13:63:13 | access to local variable o : Object | Patterns.cs:64:41:64:41 | access to local variable o : Object | provenance |  |
+| Patterns.cs:63:13:63:13 | access to local variable o : Object | Patterns.cs:64:41:64:41 | access to local variable o : Object | provenance |  |
+| Patterns.cs:63:17:63:33 | call to method Source<Object> : Object | Patterns.cs:63:13:63:13 | access to local variable o : Object | provenance |  |
+| Patterns.cs:63:17:63:33 | call to method Source<Object> : Object | Patterns.cs:63:13:63:13 | access to local variable o : Object | provenance |  |
+| Patterns.cs:64:13:64:13 | access to local variable c : C1<Object> [property Prop] : Object | Patterns.cs:65:18:65:46 | { ... } : C1<Object> [property Prop] : Object | provenance |  |
+| Patterns.cs:64:13:64:13 | access to local variable c : C1<Object> [property Prop] : Object | Patterns.cs:65:18:65:46 | { ... } : C1<Object> [property Prop] : Object | provenance |  |
+| Patterns.cs:64:32:64:43 | { ..., ... } : C1<Object> [property Prop] : Object | Patterns.cs:64:13:64:13 | access to local variable c : C1<Object> [property Prop] : Object | provenance |  |
+| Patterns.cs:64:32:64:43 | { ..., ... } : C1<Object> [property Prop] : Object | Patterns.cs:64:13:64:13 | access to local variable c : C1<Object> [property Prop] : Object | provenance |  |
+| Patterns.cs:64:41:64:41 | access to local variable o : Object | Patterns.cs:64:32:64:43 | { ..., ... } : C1<Object> [property Prop] : Object | provenance |  |
+| Patterns.cs:64:41:64:41 | access to local variable o : Object | Patterns.cs:64:32:64:43 | { ..., ... } : C1<Object> [property Prop] : Object | provenance |  |
+| Patterns.cs:65:18:65:46 | { ... } : C1<Object> [property Prop] : Object | Patterns.cs:67:18:67:18 | access to local variable p | provenance |  |
+| Patterns.cs:65:18:65:46 | { ... } : C1<Object> [property Prop] : Object | Patterns.cs:67:18:67:18 | access to local variable p | provenance |  |
+| Patterns.cs:73:13:73:13 | access to local variable o : Object | Patterns.cs:74:44:74:44 | access to local variable o : Object | provenance |  |
+| Patterns.cs:73:13:73:13 | access to local variable o : Object | Patterns.cs:74:44:74:44 | access to local variable o : Object | provenance |  |
+| Patterns.cs:73:17:73:33 | call to method Source<Object> : Object | Patterns.cs:73:13:73:13 | access to local variable o : Object | provenance |  |
+| Patterns.cs:73:17:73:33 | call to method Source<Object> : Object | Patterns.cs:73:13:73:13 | access to local variable o : Object | provenance |  |
+| Patterns.cs:74:13:74:13 | access to local variable s : Nested [property Record, property Prop] : Object | Patterns.cs:75:18:75:65 | { ... } : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:74:13:74:13 | access to local variable s : Nested [property Record, property Prop] : Object | Patterns.cs:75:18:75:65 | { ... } : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:74:17:74:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | Patterns.cs:74:13:74:13 | access to local variable s : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:74:17:74:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | Patterns.cs:74:13:74:13 | access to local variable s : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:74:28:74:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:74:28:74:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:74:28:74:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:74:17:74:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:74:28:74:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:74:17:74:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:74:44:74:44 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | provenance |  |
+| Patterns.cs:74:44:74:44 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | provenance |  |
+| Patterns.cs:74:44:74:44 | access to local variable o : Object | Patterns.cs:74:28:74:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:74:44:74:44 | access to local variable o : Object | Patterns.cs:74:28:74:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:75:18:75:65 | { ... } : Nested [property Record, property Prop] : Object | Patterns.cs:77:18:77:18 | access to local variable r : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:75:18:75:65 | { ... } : Nested [property Record, property Prop] : Object | Patterns.cs:77:18:77:18 | access to local variable r : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:77:18:77:18 | access to local variable r : RecordClass [property Prop] : Object | Patterns.cs:77:18:77:23 | access to property Prop | provenance |  |
+| Patterns.cs:77:18:77:18 | access to local variable r : RecordClass [property Prop] : Object | Patterns.cs:77:18:77:23 | access to property Prop | provenance |  |
+| Patterns.cs:83:13:83:14 | access to local variable o1 : Object | Patterns.cs:85:45:85:46 | access to local variable o1 : Object | provenance |  |
+| Patterns.cs:83:13:83:14 | access to local variable o1 : Object | Patterns.cs:85:45:85:46 | access to local variable o1 : Object | provenance |  |
+| Patterns.cs:83:18:83:34 | call to method Source<Object> : Object | Patterns.cs:83:13:83:14 | access to local variable o1 : Object | provenance |  |
+| Patterns.cs:83:18:83:34 | call to method Source<Object> : Object | Patterns.cs:83:13:83:14 | access to local variable o1 : Object | provenance |  |
+| Patterns.cs:84:13:84:14 | access to local variable o2 : Object | Patterns.cs:85:51:85:52 | access to local variable o2 : Object | provenance |  |
+| Patterns.cs:84:13:84:14 | access to local variable o2 : Object | Patterns.cs:85:51:85:52 | access to local variable o2 : Object | provenance |  |
+| Patterns.cs:84:18:84:34 | call to method Source<Object> : Object | Patterns.cs:84:13:84:14 | access to local variable o2 : Object | provenance |  |
+| Patterns.cs:84:18:84:34 | call to method Source<Object> : Object | Patterns.cs:84:13:84:14 | access to local variable o2 : Object | provenance |  |
+| Patterns.cs:85:13:85:13 | access to local variable t : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | Patterns.cs:88:18:88:63 | { ... } : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:85:13:85:13 | access to local variable t : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | Patterns.cs:88:18:88:63 | { ... } : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:85:13:85:13 | access to local variable t : ValueTuple<Nested,Object> [field Item2] : Object | Patterns.cs:88:18:88:63 | { ... } : ValueTuple<Nested,Object> [field Item2] : Object | provenance |  |
+| Patterns.cs:85:13:85:13 | access to local variable t : ValueTuple<Nested,Object> [field Item2] : Object | Patterns.cs:88:18:88:63 | { ... } : ValueTuple<Nested,Object> [field Item2] : Object | provenance |  |
+| Patterns.cs:85:17:85:53 | (..., ...) : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | Patterns.cs:85:13:85:13 | access to local variable t : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:85:17:85:53 | (..., ...) : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | Patterns.cs:85:13:85:13 | access to local variable t : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:85:17:85:53 | (..., ...) : ValueTuple<Nested,Object> [field Item2] : Object | Patterns.cs:85:13:85:13 | access to local variable t : ValueTuple<Nested,Object> [field Item2] : Object | provenance |  |
+| Patterns.cs:85:17:85:53 | (..., ...) : ValueTuple<Nested,Object> [field Item2] : Object | Patterns.cs:85:13:85:13 | access to local variable t : ValueTuple<Nested,Object> [field Item2] : Object | provenance |  |
+| Patterns.cs:85:18:85:48 | object creation of type Nested : Nested [property Record, property Prop] : Object | Patterns.cs:85:17:85:53 | (..., ...) : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:85:18:85:48 | object creation of type Nested : Nested [property Record, property Prop] : Object | Patterns.cs:85:17:85:53 | (..., ...) : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:85:29:85:47 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:85:29:85:47 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:85:29:85:47 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:85:18:85:48 | object creation of type Nested : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:85:29:85:47 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:85:18:85:48 | object creation of type Nested : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:85:45:85:46 | access to local variable o1 : Object | Patterns.cs:3:40:3:43 | Prop : Object | provenance |  |
+| Patterns.cs:85:45:85:46 | access to local variable o1 : Object | Patterns.cs:3:40:3:43 | Prop : Object | provenance |  |
+| Patterns.cs:85:45:85:46 | access to local variable o1 : Object | Patterns.cs:85:29:85:47 | object creation of type RecordClass : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:85:45:85:46 | access to local variable o1 : Object | Patterns.cs:85:29:85:47 | object creation of type RecordClass : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:85:51:85:52 | access to local variable o2 : Object | Patterns.cs:85:17:85:53 | (..., ...) : ValueTuple<Nested,Object> [field Item2] : Object | provenance |  |
+| Patterns.cs:85:51:85:52 | access to local variable o2 : Object | Patterns.cs:85:17:85:53 | (..., ...) : ValueTuple<Nested,Object> [field Item2] : Object | provenance |  |
+| Patterns.cs:88:18:88:63 | { ... } : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | Patterns.cs:88:19:88:55 | { ... } : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:88:18:88:63 | { ... } : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | Patterns.cs:88:19:88:55 | { ... } : Nested [property Record, property Prop] : Object | provenance |  |
+| Patterns.cs:88:18:88:63 | { ... } : ValueTuple<Nested,Object> [field Item2] : Object | Patterns.cs:90:22:90:22 | access to local variable o | provenance |  |
+| Patterns.cs:88:18:88:63 | { ... } : ValueTuple<Nested,Object> [field Item2] : Object | Patterns.cs:90:22:90:22 | access to local variable o | provenance |  |
+| Patterns.cs:88:19:88:55 | { ... } : Nested [property Record, property Prop] : Object | Patterns.cs:88:36:88:53 | { ... } : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:88:19:88:55 | { ... } : Nested [property Record, property Prop] : Object | Patterns.cs:88:36:88:53 | { ... } : RecordClass [property Prop] : Object | provenance |  |
+| Patterns.cs:88:36:88:53 | { ... } : RecordClass [property Prop] : Object | Patterns.cs:89:22:89:22 | access to local variable p | provenance |  |
+| Patterns.cs:88:36:88:53 | { ... } : RecordClass [property Prop] : Object | Patterns.cs:89:22:89:22 | access to local variable p | provenance |  |
+| Patterns.cs:97:13:97:13 | access to local variable s : String | Patterns.cs:98:34:98:34 | access to local variable s : String | provenance |  |
+| Patterns.cs:97:13:97:13 | access to local variable s : String | Patterns.cs:98:34:98:34 | access to local variable s : String | provenance |  |
+| Patterns.cs:97:17:97:33 | call to method Source<String> : String | Patterns.cs:97:13:97:13 | access to local variable s : String | provenance |  |
+| Patterns.cs:97:17:97:33 | call to method Source<String> : String | Patterns.cs:97:13:97:13 | access to local variable s : String | provenance |  |
+| Patterns.cs:98:13:98:13 | access to local variable c : C2 [field Field] : String | Patterns.cs:99:18:99:39 | { ... } : C2 [field Field] : String | provenance |  |
+| Patterns.cs:98:13:98:13 | access to local variable c : C2 [field Field] : String | Patterns.cs:99:18:99:39 | { ... } : C2 [field Field] : String | provenance |  |
+| Patterns.cs:98:24:98:36 | { ..., ... } : C2 [field Field] : String | Patterns.cs:98:13:98:13 | access to local variable c : C2 [field Field] : String | provenance |  |
+| Patterns.cs:98:24:98:36 | { ..., ... } : C2 [field Field] : String | Patterns.cs:98:13:98:13 | access to local variable c : C2 [field Field] : String | provenance |  |
+| Patterns.cs:98:34:98:34 | access to local variable s : String | Patterns.cs:98:24:98:36 | { ..., ... } : C2 [field Field] : String | provenance |  |
+| Patterns.cs:98:34:98:34 | access to local variable s : String | Patterns.cs:98:24:98:36 | { ..., ... } : C2 [field Field] : String | provenance |  |
+| Patterns.cs:99:18:99:39 | { ... } : C2 [field Field] : String | Patterns.cs:101:18:101:18 | access to local variable p | provenance |  |
+| Patterns.cs:99:18:99:39 | { ... } : C2 [field Field] : String | Patterns.cs:101:18:101:18 | access to local variable p | provenance |  |
 nodes
+| Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | semmle.label | this [Return] : RecordClass [property Prop] : Object |
+| Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | semmle.label | this [Return] : RecordClass [property Prop] : Object |
+| Patterns.cs:3:40:3:43 | Prop : Object | semmle.label | Prop : Object |
+| Patterns.cs:3:40:3:43 | Prop : Object | semmle.label | Prop : Object |
+| Patterns.cs:5:21:5:26 | this [Return] : Nested [property Record, property Prop] : Object | semmle.label | this [Return] : Nested [property Record, property Prop] : Object |
+| Patterns.cs:5:21:5:26 | this [Return] : Nested [property Record, property Prop] : Object | semmle.label | this [Return] : Nested [property Record, property Prop] : Object |
+| Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | semmle.label | Record : RecordClass [property Prop] : Object |
+| Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | semmle.label | Record : RecordClass [property Prop] : Object |
+| Patterns.cs:21:13:21:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:21:13:21:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:21:17:21:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:21:17:21:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:22:13:22:13 | access to local variable r : RecordClass [property Prop] : Object | semmle.label | access to local variable r : RecordClass [property Prop] : Object |
+| Patterns.cs:22:13:22:13 | access to local variable r : RecordClass [property Prop] : Object | semmle.label | access to local variable r : RecordClass [property Prop] : Object |
+| Patterns.cs:22:17:22:34 | object creation of type RecordClass : RecordClass [property Prop] : Object | semmle.label | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:22:17:22:34 | object creation of type RecordClass : RecordClass [property Prop] : Object | semmle.label | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:22:33:22:33 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:22:33:22:33 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:23:18:23:47 | { ... } : RecordClass [property Prop] : Object | semmle.label | { ... } : RecordClass [property Prop] : Object |
+| Patterns.cs:23:18:23:47 | { ... } : RecordClass [property Prop] : Object | semmle.label | { ... } : RecordClass [property Prop] : Object |
+| Patterns.cs:25:18:25:18 | access to local variable p | semmle.label | access to local variable p |
+| Patterns.cs:25:18:25:18 | access to local variable p | semmle.label | access to local variable p |
+| Patterns.cs:31:13:31:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:31:13:31:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:31:17:31:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:31:17:31:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:32:13:32:13 | access to local variable r : RecordClass [property Prop] : Object | semmle.label | access to local variable r : RecordClass [property Prop] : Object |
+| Patterns.cs:32:13:32:13 | access to local variable r : RecordClass [property Prop] : Object | semmle.label | access to local variable r : RecordClass [property Prop] : Object |
+| Patterns.cs:32:17:32:34 | object creation of type RecordClass : RecordClass [property Prop] : Object | semmle.label | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:32:17:32:34 | object creation of type RecordClass : RecordClass [property Prop] : Object | semmle.label | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:32:33:32:33 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:32:33:32:33 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:35:18:35:47 | { ... } : RecordClass [property Prop] : Object | semmle.label | { ... } : RecordClass [property Prop] : Object |
+| Patterns.cs:35:18:35:47 | { ... } : RecordClass [property Prop] : Object | semmle.label | { ... } : RecordClass [property Prop] : Object |
+| Patterns.cs:36:22:36:22 | access to local variable p | semmle.label | access to local variable p |
+| Patterns.cs:36:22:36:22 | access to local variable p | semmle.label | access to local variable p |
+| Patterns.cs:43:13:43:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:43:13:43:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:43:17:43:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:43:17:43:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:44:13:44:13 | access to local variable s : Nested [property Record, property Prop] : Object | semmle.label | access to local variable s : Nested [property Record, property Prop] : Object |
+| Patterns.cs:44:13:44:13 | access to local variable s : Nested [property Record, property Prop] : Object | semmle.label | access to local variable s : Nested [property Record, property Prop] : Object |
+| Patterns.cs:44:17:44:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | semmle.label | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:44:17:44:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | semmle.label | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:44:28:44:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | semmle.label | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:44:28:44:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | semmle.label | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:44:44:44:44 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:44:44:44:44 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:45:18:45:54 | { ... } : Nested [property Record, property Prop] : Object | semmle.label | { ... } : Nested [property Record, property Prop] : Object |
+| Patterns.cs:45:18:45:54 | { ... } : Nested [property Record, property Prop] : Object | semmle.label | { ... } : Nested [property Record, property Prop] : Object |
+| Patterns.cs:45:35:45:52 | { ... } : RecordClass [property Prop] : Object | semmle.label | { ... } : RecordClass [property Prop] : Object |
+| Patterns.cs:45:35:45:52 | { ... } : RecordClass [property Prop] : Object | semmle.label | { ... } : RecordClass [property Prop] : Object |
+| Patterns.cs:47:18:47:18 | access to local variable p | semmle.label | access to local variable p |
+| Patterns.cs:47:18:47:18 | access to local variable p | semmle.label | access to local variable p |
+| Patterns.cs:53:13:53:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:53:13:53:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:53:17:53:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:53:17:53:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:54:13:54:13 | access to local variable s : Nested [property Record, property Prop] : Object | semmle.label | access to local variable s : Nested [property Record, property Prop] : Object |
+| Patterns.cs:54:13:54:13 | access to local variable s : Nested [property Record, property Prop] : Object | semmle.label | access to local variable s : Nested [property Record, property Prop] : Object |
+| Patterns.cs:54:17:54:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | semmle.label | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:54:17:54:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | semmle.label | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:54:28:54:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | semmle.label | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:54:28:54:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | semmle.label | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:54:44:54:44 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:54:44:54:44 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:55:18:55:49 | { ... } : Nested [property Record, property Prop] : Object | semmle.label | { ... } : Nested [property Record, property Prop] : Object |
+| Patterns.cs:55:18:55:49 | { ... } : Nested [property Record, property Prop] : Object | semmle.label | { ... } : Nested [property Record, property Prop] : Object |
+| Patterns.cs:55:27:55:32 | { ... } : null [property Prop] : Object | semmle.label | { ... } : null [property Prop] : Object |
+| Patterns.cs:55:27:55:32 | { ... } : null [property Prop] : Object | semmle.label | { ... } : null [property Prop] : Object |
+| Patterns.cs:57:18:57:18 | access to local variable p | semmle.label | access to local variable p |
+| Patterns.cs:57:18:57:18 | access to local variable p | semmle.label | access to local variable p |
+| Patterns.cs:63:13:63:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:63:13:63:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:63:17:63:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:63:17:63:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:64:13:64:13 | access to local variable c : C1<Object> [property Prop] : Object | semmle.label | access to local variable c : C1<Object> [property Prop] : Object |
+| Patterns.cs:64:13:64:13 | access to local variable c : C1<Object> [property Prop] : Object | semmle.label | access to local variable c : C1<Object> [property Prop] : Object |
+| Patterns.cs:64:32:64:43 | { ..., ... } : C1<Object> [property Prop] : Object | semmle.label | { ..., ... } : C1<Object> [property Prop] : Object |
+| Patterns.cs:64:32:64:43 | { ..., ... } : C1<Object> [property Prop] : Object | semmle.label | { ..., ... } : C1<Object> [property Prop] : Object |
+| Patterns.cs:64:41:64:41 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:64:41:64:41 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:65:18:65:46 | { ... } : C1<Object> [property Prop] : Object | semmle.label | { ... } : C1<Object> [property Prop] : Object |
+| Patterns.cs:65:18:65:46 | { ... } : C1<Object> [property Prop] : Object | semmle.label | { ... } : C1<Object> [property Prop] : Object |
+| Patterns.cs:67:18:67:18 | access to local variable p | semmle.label | access to local variable p |
+| Patterns.cs:67:18:67:18 | access to local variable p | semmle.label | access to local variable p |
+| Patterns.cs:73:13:73:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:73:13:73:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:73:17:73:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:73:17:73:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:74:13:74:13 | access to local variable s : Nested [property Record, property Prop] : Object | semmle.label | access to local variable s : Nested [property Record, property Prop] : Object |
+| Patterns.cs:74:13:74:13 | access to local variable s : Nested [property Record, property Prop] : Object | semmle.label | access to local variable s : Nested [property Record, property Prop] : Object |
+| Patterns.cs:74:17:74:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | semmle.label | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:74:17:74:46 | object creation of type Nested : Nested [property Record, property Prop] : Object | semmle.label | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:74:28:74:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | semmle.label | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:74:28:74:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | semmle.label | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:74:44:74:44 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:74:44:74:44 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Patterns.cs:75:18:75:65 | { ... } : Nested [property Record, property Prop] : Object | semmle.label | { ... } : Nested [property Record, property Prop] : Object |
+| Patterns.cs:75:18:75:65 | { ... } : Nested [property Record, property Prop] : Object | semmle.label | { ... } : Nested [property Record, property Prop] : Object |
+| Patterns.cs:77:18:77:18 | access to local variable r : RecordClass [property Prop] : Object | semmle.label | access to local variable r : RecordClass [property Prop] : Object |
+| Patterns.cs:77:18:77:18 | access to local variable r : RecordClass [property Prop] : Object | semmle.label | access to local variable r : RecordClass [property Prop] : Object |
+| Patterns.cs:77:18:77:23 | access to property Prop | semmle.label | access to property Prop |
+| Patterns.cs:77:18:77:23 | access to property Prop | semmle.label | access to property Prop |
+| Patterns.cs:83:13:83:14 | access to local variable o1 : Object | semmle.label | access to local variable o1 : Object |
+| Patterns.cs:83:13:83:14 | access to local variable o1 : Object | semmle.label | access to local variable o1 : Object |
+| Patterns.cs:83:18:83:34 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:83:18:83:34 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:84:13:84:14 | access to local variable o2 : Object | semmle.label | access to local variable o2 : Object |
+| Patterns.cs:84:13:84:14 | access to local variable o2 : Object | semmle.label | access to local variable o2 : Object |
+| Patterns.cs:84:18:84:34 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:84:18:84:34 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Patterns.cs:85:13:85:13 | access to local variable t : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | semmle.label | access to local variable t : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object |
+| Patterns.cs:85:13:85:13 | access to local variable t : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | semmle.label | access to local variable t : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object |
+| Patterns.cs:85:13:85:13 | access to local variable t : ValueTuple<Nested,Object> [field Item2] : Object | semmle.label | access to local variable t : ValueTuple<Nested,Object> [field Item2] : Object |
+| Patterns.cs:85:13:85:13 | access to local variable t : ValueTuple<Nested,Object> [field Item2] : Object | semmle.label | access to local variable t : ValueTuple<Nested,Object> [field Item2] : Object |
+| Patterns.cs:85:17:85:53 | (..., ...) : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | semmle.label | (..., ...) : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object |
+| Patterns.cs:85:17:85:53 | (..., ...) : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | semmle.label | (..., ...) : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object |
+| Patterns.cs:85:17:85:53 | (..., ...) : ValueTuple<Nested,Object> [field Item2] : Object | semmle.label | (..., ...) : ValueTuple<Nested,Object> [field Item2] : Object |
+| Patterns.cs:85:17:85:53 | (..., ...) : ValueTuple<Nested,Object> [field Item2] : Object | semmle.label | (..., ...) : ValueTuple<Nested,Object> [field Item2] : Object |
+| Patterns.cs:85:18:85:48 | object creation of type Nested : Nested [property Record, property Prop] : Object | semmle.label | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:85:18:85:48 | object creation of type Nested : Nested [property Record, property Prop] : Object | semmle.label | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:85:29:85:47 | object creation of type RecordClass : RecordClass [property Prop] : Object | semmle.label | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:85:29:85:47 | object creation of type RecordClass : RecordClass [property Prop] : Object | semmle.label | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:85:45:85:46 | access to local variable o1 : Object | semmle.label | access to local variable o1 : Object |
+| Patterns.cs:85:45:85:46 | access to local variable o1 : Object | semmle.label | access to local variable o1 : Object |
+| Patterns.cs:85:51:85:52 | access to local variable o2 : Object | semmle.label | access to local variable o2 : Object |
+| Patterns.cs:85:51:85:52 | access to local variable o2 : Object | semmle.label | access to local variable o2 : Object |
+| Patterns.cs:88:18:88:63 | { ... } : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | semmle.label | { ... } : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object |
+| Patterns.cs:88:18:88:63 | { ... } : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object | semmle.label | { ... } : ValueTuple<Nested,Object> [field Item1, property Record, property Prop] : Object |
+| Patterns.cs:88:18:88:63 | { ... } : ValueTuple<Nested,Object> [field Item2] : Object | semmle.label | { ... } : ValueTuple<Nested,Object> [field Item2] : Object |
+| Patterns.cs:88:18:88:63 | { ... } : ValueTuple<Nested,Object> [field Item2] : Object | semmle.label | { ... } : ValueTuple<Nested,Object> [field Item2] : Object |
+| Patterns.cs:88:19:88:55 | { ... } : Nested [property Record, property Prop] : Object | semmle.label | { ... } : Nested [property Record, property Prop] : Object |
+| Patterns.cs:88:19:88:55 | { ... } : Nested [property Record, property Prop] : Object | semmle.label | { ... } : Nested [property Record, property Prop] : Object |
+| Patterns.cs:88:36:88:53 | { ... } : RecordClass [property Prop] : Object | semmle.label | { ... } : RecordClass [property Prop] : Object |
+| Patterns.cs:88:36:88:53 | { ... } : RecordClass [property Prop] : Object | semmle.label | { ... } : RecordClass [property Prop] : Object |
+| Patterns.cs:89:22:89:22 | access to local variable p | semmle.label | access to local variable p |
+| Patterns.cs:89:22:89:22 | access to local variable p | semmle.label | access to local variable p |
+| Patterns.cs:90:22:90:22 | access to local variable o | semmle.label | access to local variable o |
+| Patterns.cs:90:22:90:22 | access to local variable o | semmle.label | access to local variable o |
+| Patterns.cs:97:13:97:13 | access to local variable s : String | semmle.label | access to local variable s : String |
+| Patterns.cs:97:13:97:13 | access to local variable s : String | semmle.label | access to local variable s : String |
+| Patterns.cs:97:17:97:33 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Patterns.cs:97:17:97:33 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Patterns.cs:98:13:98:13 | access to local variable c : C2 [field Field] : String | semmle.label | access to local variable c : C2 [field Field] : String |
+| Patterns.cs:98:13:98:13 | access to local variable c : C2 [field Field] : String | semmle.label | access to local variable c : C2 [field Field] : String |
+| Patterns.cs:98:24:98:36 | { ..., ... } : C2 [field Field] : String | semmle.label | { ..., ... } : C2 [field Field] : String |
+| Patterns.cs:98:24:98:36 | { ..., ... } : C2 [field Field] : String | semmle.label | { ..., ... } : C2 [field Field] : String |
+| Patterns.cs:98:34:98:34 | access to local variable s : String | semmle.label | access to local variable s : String |
+| Patterns.cs:98:34:98:34 | access to local variable s : String | semmle.label | access to local variable s : String |
+| Patterns.cs:99:18:99:39 | { ... } : C2 [field Field] : String | semmle.label | { ... } : C2 [field Field] : String |
+| Patterns.cs:99:18:99:39 | { ... } : C2 [field Field] : String | semmle.label | { ... } : C2 [field Field] : String |
+| Patterns.cs:101:18:101:18 | access to local variable p | semmle.label | access to local variable p |
+| Patterns.cs:101:18:101:18 | access to local variable p | semmle.label | access to local variable p |
 subpaths
+| Patterns.cs:22:33:22:33 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | Patterns.cs:22:17:22:34 | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:22:33:22:33 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | Patterns.cs:22:17:22:34 | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:32:33:32:33 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | Patterns.cs:32:17:32:34 | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:32:33:32:33 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | Patterns.cs:32:17:32:34 | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:44:28:44:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | Patterns.cs:5:21:5:26 | this [Return] : Nested [property Record, property Prop] : Object | Patterns.cs:44:17:44:46 | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:44:28:44:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | Patterns.cs:5:21:5:26 | this [Return] : Nested [property Record, property Prop] : Object | Patterns.cs:44:17:44:46 | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:44:44:44:44 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | Patterns.cs:44:28:44:45 | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:44:44:44:44 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | Patterns.cs:44:28:44:45 | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:54:28:54:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | Patterns.cs:5:21:5:26 | this [Return] : Nested [property Record, property Prop] : Object | Patterns.cs:54:17:54:46 | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:54:28:54:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | Patterns.cs:5:21:5:26 | this [Return] : Nested [property Record, property Prop] : Object | Patterns.cs:54:17:54:46 | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:54:44:54:44 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | Patterns.cs:54:28:54:45 | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:54:44:54:44 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | Patterns.cs:54:28:54:45 | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:74:28:74:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | Patterns.cs:5:21:5:26 | this [Return] : Nested [property Record, property Prop] : Object | Patterns.cs:74:17:74:46 | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:74:28:74:45 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | Patterns.cs:5:21:5:26 | this [Return] : Nested [property Record, property Prop] : Object | Patterns.cs:74:17:74:46 | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:74:44:74:44 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | Patterns.cs:74:28:74:45 | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:74:44:74:44 | access to local variable o : Object | Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | Patterns.cs:74:28:74:45 | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:85:29:85:47 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | Patterns.cs:5:21:5:26 | this [Return] : Nested [property Record, property Prop] : Object | Patterns.cs:85:18:85:48 | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:85:29:85:47 | object creation of type RecordClass : RecordClass [property Prop] : Object | Patterns.cs:5:40:5:45 | Record : RecordClass [property Prop] : Object | Patterns.cs:5:21:5:26 | this [Return] : Nested [property Record, property Prop] : Object | Patterns.cs:85:18:85:48 | object creation of type Nested : Nested [property Record, property Prop] : Object |
+| Patterns.cs:85:45:85:46 | access to local variable o1 : Object | Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | Patterns.cs:85:29:85:47 | object creation of type RecordClass : RecordClass [property Prop] : Object |
+| Patterns.cs:85:45:85:46 | access to local variable o1 : Object | Patterns.cs:3:40:3:43 | Prop : Object | Patterns.cs:3:21:3:31 | this [Return] : RecordClass [property Prop] : Object | Patterns.cs:85:29:85:47 | object creation of type RecordClass : RecordClass [property Prop] : Object |
 testFailures
 #select
+| Patterns.cs:25:18:25:18 | access to local variable p | Patterns.cs:21:17:21:33 | call to method Source<Object> : Object | Patterns.cs:25:18:25:18 | access to local variable p | $@ | Patterns.cs:21:17:21:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:25:18:25:18 | access to local variable p | Patterns.cs:21:17:21:33 | call to method Source<Object> : Object | Patterns.cs:25:18:25:18 | access to local variable p | $@ | Patterns.cs:21:17:21:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:36:22:36:22 | access to local variable p | Patterns.cs:31:17:31:33 | call to method Source<Object> : Object | Patterns.cs:36:22:36:22 | access to local variable p | $@ | Patterns.cs:31:17:31:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:36:22:36:22 | access to local variable p | Patterns.cs:31:17:31:33 | call to method Source<Object> : Object | Patterns.cs:36:22:36:22 | access to local variable p | $@ | Patterns.cs:31:17:31:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:47:18:47:18 | access to local variable p | Patterns.cs:43:17:43:33 | call to method Source<Object> : Object | Patterns.cs:47:18:47:18 | access to local variable p | $@ | Patterns.cs:43:17:43:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:47:18:47:18 | access to local variable p | Patterns.cs:43:17:43:33 | call to method Source<Object> : Object | Patterns.cs:47:18:47:18 | access to local variable p | $@ | Patterns.cs:43:17:43:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:57:18:57:18 | access to local variable p | Patterns.cs:53:17:53:33 | call to method Source<Object> : Object | Patterns.cs:57:18:57:18 | access to local variable p | $@ | Patterns.cs:53:17:53:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:57:18:57:18 | access to local variable p | Patterns.cs:53:17:53:33 | call to method Source<Object> : Object | Patterns.cs:57:18:57:18 | access to local variable p | $@ | Patterns.cs:53:17:53:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:67:18:67:18 | access to local variable p | Patterns.cs:63:17:63:33 | call to method Source<Object> : Object | Patterns.cs:67:18:67:18 | access to local variable p | $@ | Patterns.cs:63:17:63:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:67:18:67:18 | access to local variable p | Patterns.cs:63:17:63:33 | call to method Source<Object> : Object | Patterns.cs:67:18:67:18 | access to local variable p | $@ | Patterns.cs:63:17:63:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:77:18:77:23 | access to property Prop | Patterns.cs:73:17:73:33 | call to method Source<Object> : Object | Patterns.cs:77:18:77:23 | access to property Prop | $@ | Patterns.cs:73:17:73:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:77:18:77:23 | access to property Prop | Patterns.cs:73:17:73:33 | call to method Source<Object> : Object | Patterns.cs:77:18:77:23 | access to property Prop | $@ | Patterns.cs:73:17:73:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:89:22:89:22 | access to local variable p | Patterns.cs:83:18:83:34 | call to method Source<Object> : Object | Patterns.cs:89:22:89:22 | access to local variable p | $@ | Patterns.cs:83:18:83:34 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:89:22:89:22 | access to local variable p | Patterns.cs:83:18:83:34 | call to method Source<Object> : Object | Patterns.cs:89:22:89:22 | access to local variable p | $@ | Patterns.cs:83:18:83:34 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:90:22:90:22 | access to local variable o | Patterns.cs:84:18:84:34 | call to method Source<Object> : Object | Patterns.cs:90:22:90:22 | access to local variable o | $@ | Patterns.cs:84:18:84:34 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:90:22:90:22 | access to local variable o | Patterns.cs:84:18:84:34 | call to method Source<Object> : Object | Patterns.cs:90:22:90:22 | access to local variable o | $@ | Patterns.cs:84:18:84:34 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Patterns.cs:101:18:101:18 | access to local variable p | Patterns.cs:97:17:97:33 | call to method Source<String> : String | Patterns.cs:101:18:101:18 | access to local variable p | $@ | Patterns.cs:97:17:97:33 | call to method Source<String> : String | call to method Source<String> : String |
+| Patterns.cs:101:18:101:18 | access to local variable p | Patterns.cs:97:17:97:33 | call to method Source<String> : String | Patterns.cs:101:18:101:18 | access to local variable p | $@ | Patterns.cs:97:17:97:33 | call to method Source<String> : String | call to method Source<String> : String |
diff --git a/csharp/ql/test/library-tests/dataflow/patterns/Patterns.cs b/csharp/ql/test/library-tests/dataflow/patterns/Patterns.cs
index d3247e1351b8..7f655a7d620b 100644
--- a/csharp/ql/test/library-tests/dataflow/patterns/Patterns.cs
+++ b/csharp/ql/test/library-tests/dataflow/patterns/Patterns.cs
@@ -1,29 +1,39 @@
 using System;
 
-public record class RecordClass2(object Prop) { }
+public record class RecordClass(object Prop) { }
 
-public record class Nested(RecordClass2 Record) { }
+public record class Nested(RecordClass Record) { }
+
+public class C1<T>
+{
+    public T Prop { get; set; }
+}
+
+public class C2
+{
+    public string Field;
+}
 
 public class RecordPatterns
 {
     private void M1()
     {
         var o = Source<object>(1);
-        var r = new RecordClass2(o);
-        if (r is RecordClass2 { Prop: object p })
+        var r = new RecordClass(o);
+        if (r is RecordClass { Prop: object p })
         {
-            Sink(p); // $ MISSING: hasValueFlow=1
+            Sink(p); // $ hasValueFlow=1
         }
     }
 
     private void M2()
     {
         var o = Source<object>(2);
-        var r = new RecordClass2(o);
+        var r = new RecordClass(o);
         switch (r)
         {
-            case RecordClass2 { Prop: object p }:
-                Sink(p); // $ MISSING: hasValueFlow=2
+            case RecordClass { Prop: object p }:
+                Sink(p); // $ hasValueFlow=2
                 break;
         }
     }
@@ -31,20 +41,64 @@ private void M2()
     private void M3()
     {
         var o = Source<object>(3);
-        var s = new Nested(new RecordClass2(o));
+        var s = new Nested(new RecordClass(o));
         if (s is Nested { Record: { Prop: object p } })
         {
-            Sink(p); // $ MISSING: hasValueFlow=3
+            Sink(p); // $ hasValueFlow=3
         }
     }
 
     private void M4()
     {
         var o = Source<object>(4);
-        var s = new Nested(new RecordClass2(o));
+        var s = new Nested(new RecordClass(o));
         if (s is Nested { Record.Prop: object p })
         {
-            Sink(p); // $ MISSING: hasValueFlow=4
+            Sink(p); // $ hasValueFlow=4
+        }
+    }
+
+    public void M5()
+    {
+        var o = Source<object>(5);
+        var c = new C1<object> { Prop = o };
+        if (c is C1<object> { Prop: object p })
+        {
+            Sink(p); // $ hasValueFlow=5
+        }
+    }
+
+    public void M6()
+    {
+        var o = Source<object>(6);
+        var s = new Nested(new RecordClass(o));
+        if (s is Nested { Record: RecordClass { Prop: var _ } r })
+        {
+            Sink(r.Prop); // $ hasValueFlow=6
+        }
+    }
+
+    public void M7()
+    {
+        var o1 = Source<object>(7);
+        var o2 = Source<object>(8);
+        var t = (new Nested(new RecordClass(o1)), o2);
+        switch (t)
+        {
+            case (Nested { Record: { Prop: object p } }, var o):
+                Sink(p); // $ hasValueFlow=7
+                Sink(o); // $ hasValueFlow=8
+                break;
+        }
+    }
+
+    public void M8()
+    {
+        var s = Source<string>(9);
+        var c = new C2 { Field = s };
+        if (c is C2 { Field: string p })
+        {
+            Sink(p); // $ hasValueFlow=9
         }
     }
 
diff --git a/csharp/ql/test/library-tests/dataflow/tuples/DataFlowStep.expected b/csharp/ql/test/library-tests/dataflow/tuples/DataFlowStep.expected
index 583bae92d93f..615f40e15850 100644
--- a/csharp/ql/test/library-tests/dataflow/tuples/DataFlowStep.expected
+++ b/csharp/ql/test/library-tests/dataflow/tuples/DataFlowStep.expected
@@ -108,7 +108,6 @@
 | Tuples.cs:59:17:59:32 | (..., ...) | Tuples.cs:59:13:59:13 | access to local variable x |
 | Tuples.cs:60:17:60:17 | access to local variable x | Tuples.cs:62:18:62:57 | (String,(Int32,String),Int32) t |
 | Tuples.cs:60:17:60:17 | access to local variable x | Tuples.cs:67:18:67:35 | (..., ...) |
-| Tuples.cs:60:17:60:17 | access to local variable x | Tuples.cs:67:18:67:35 | (..., ...) |
 | Tuples.cs:60:17:60:17 | access to local variable x | Tuples.cs:87:13:87:13 | access to local variable x |
 | Tuples.cs:62:18:62:57 | (String,(Int32,String),Int32) t | Tuples.cs:62:18:62:57 | SSA def(t) |
 | Tuples.cs:62:18:62:57 | SSA def(t) | Tuples.cs:62:64:62:64 | access to local variable t |
@@ -144,7 +143,7 @@
 | Tuples.cs:75:13:75:30 | SSA qualifier def(y.Item2.Item2) | Tuples.cs:80:22:80:34 | access to field Item2 |
 | Tuples.cs:75:17:75:30 | (..., ...) | Tuples.cs:75:13:75:13 | access to local variable y |
 | Tuples.cs:75:18:75:18 | access to parameter s | Tuples.cs:75:25:75:25 | access to parameter s |
-| Tuples.cs:76:17:76:17 | access to local variable y | Tuples.cs:78:26:78:35 | (..., ...) |
+| Tuples.cs:76:17:76:17 | access to local variable y | Tuples.cs:78:18:78:39 | { ... } |
 | Tuples.cs:76:17:76:17 | access to local variable y | Tuples.cs:79:22:79:22 | access to local variable y |
 | Tuples.cs:78:19:78:23 | SSA def(a) | Tuples.cs:78:46:78:46 | access to local variable a |
 | Tuples.cs:78:19:78:23 | String a | Tuples.cs:78:19:78:23 | SSA def(a) |
@@ -161,7 +160,6 @@
 | Tuples.cs:82:22:82:34 | access to field Item1 | Tuples.cs:82:22:82:34 | (...) ... |
 | Tuples.cs:83:22:83:22 | access to local variable b | Tuples.cs:83:22:83:22 | (...) ... |
 | Tuples.cs:87:13:87:13 | access to local variable x | Tuples.cs:87:18:87:35 | (..., ...) |
-| Tuples.cs:87:13:87:13 | access to local variable x | Tuples.cs:87:18:87:35 | (..., ...) |
 | Tuples.cs:87:23:87:23 | SSA def(p) | Tuples.cs:89:18:89:18 | access to local variable p |
 | Tuples.cs:87:23:87:23 | String p | Tuples.cs:87:23:87:23 | SSA def(p) |
 | Tuples.cs:87:27:87:27 | Int32 q | Tuples.cs:87:27:87:27 | SSA def(q) |
@@ -229,4 +227,62 @@
 | Tuples.cs:133:24:133:29 | (..., ...) | Tuples.cs:133:9:133:20 | (..., ...) |
 | Tuples.cs:133:25:133:25 | 1 | Tuples.cs:133:9:133:29 | ... = ... |
 | Tuples.cs:133:28:133:28 | access to local variable o | Tuples.cs:133:18:133:19 | access to local variable y4 |
-| Tuples.cs:144:18:144:31 | this | Tuples.cs:144:18:144:31 | this access |
+| Tuples.cs:139:13:139:14 | access to local variable o1 | Tuples.cs:139:13:139:35 | SSA def(o1) |
+| Tuples.cs:139:13:139:35 | SSA def(o1) | Tuples.cs:141:18:141:19 | access to local variable o1 |
+| Tuples.cs:139:18:139:35 | call to method Source<String> | Tuples.cs:139:13:139:14 | access to local variable o1 |
+| Tuples.cs:139:33:139:34 | 10 | Tuples.cs:139:33:139:34 | (...) ... |
+| Tuples.cs:140:13:140:14 | access to local variable o2 | Tuples.cs:140:13:140:35 | SSA def(o2) |
+| Tuples.cs:140:13:140:35 | SSA def(o2) | Tuples.cs:141:26:141:27 | access to local variable o2 |
+| Tuples.cs:140:18:140:35 | call to method Source<String> | Tuples.cs:140:13:140:14 | access to local variable o2 |
+| Tuples.cs:140:33:140:34 | 11 | Tuples.cs:140:33:140:34 | (...) ... |
+| Tuples.cs:141:13:141:13 | access to local variable x | Tuples.cs:141:13:141:32 | SSA def(x) |
+| Tuples.cs:141:13:141:32 | SSA def(x) | Tuples.cs:142:17:142:17 | access to local variable x |
+| Tuples.cs:141:17:141:32 | (..., ...) | Tuples.cs:141:13:141:13 | access to local variable x |
+| Tuples.cs:142:17:142:17 | access to local variable x | Tuples.cs:144:18:144:46 | { ... } |
+| Tuples.cs:144:19:144:24 | SSA def(a1) | Tuples.cs:145:22:145:23 | access to local variable a1 |
+| Tuples.cs:144:19:144:24 | String a1 | Tuples.cs:144:19:144:24 | SSA def(a1) |
+| Tuples.cs:144:28:144:33 | Int32 b1 | Tuples.cs:144:28:144:33 | SSA def(b1) |
+| Tuples.cs:144:28:144:33 | SSA def(b1) | Tuples.cs:147:22:147:23 | access to local variable b1 |
+| Tuples.cs:144:36:144:41 | SSA def(c1) | Tuples.cs:146:22:146:23 | access to local variable c1 |
+| Tuples.cs:144:36:144:41 | String c1 | Tuples.cs:144:36:144:41 | SSA def(c1) |
+| Tuples.cs:147:22:147:23 | access to local variable b1 | Tuples.cs:147:22:147:23 | (...) ... |
+| Tuples.cs:151:13:151:14 | access to local variable o3 | Tuples.cs:151:13:151:35 | SSA def(o3) |
+| Tuples.cs:151:13:151:35 | SSA def(o3) | Tuples.cs:153:18:153:19 | access to local variable o3 |
+| Tuples.cs:151:18:151:35 | call to method Source<String> | Tuples.cs:151:13:151:14 | access to local variable o3 |
+| Tuples.cs:151:33:151:34 | 12 | Tuples.cs:151:33:151:34 | (...) ... |
+| Tuples.cs:152:13:152:14 | access to local variable o4 | Tuples.cs:152:13:152:35 | SSA def(o4) |
+| Tuples.cs:152:13:152:35 | SSA def(o4) | Tuples.cs:153:26:153:27 | access to local variable o4 |
+| Tuples.cs:152:18:152:35 | call to method Source<String> | Tuples.cs:152:13:152:14 | access to local variable o4 |
+| Tuples.cs:152:33:152:34 | 13 | Tuples.cs:152:33:152:34 | (...) ... |
+| Tuples.cs:153:13:153:13 | access to local variable y | Tuples.cs:153:13:153:32 | SSA def(y) |
+| Tuples.cs:153:13:153:32 | SSA def(y) | Tuples.cs:154:13:154:13 | access to local variable y |
+| Tuples.cs:153:17:153:32 | (..., ...) | Tuples.cs:153:13:153:13 | access to local variable y |
+| Tuples.cs:154:13:154:13 | access to local variable y | Tuples.cs:154:18:154:42 | { ... } |
+| Tuples.cs:154:19:154:24 | SSA def(a2) | Tuples.cs:156:18:156:19 | access to local variable a2 |
+| Tuples.cs:154:19:154:24 | String a2 | Tuples.cs:154:19:154:24 | SSA def(a2) |
+| Tuples.cs:154:32:154:33 | Int32 b2 | Tuples.cs:154:32:154:33 | SSA def(b2) |
+| Tuples.cs:154:32:154:33 | SSA def(b2) | Tuples.cs:158:18:158:19 | access to local variable b2 |
+| Tuples.cs:154:36:154:37 | SSA def(c2) | Tuples.cs:157:18:157:19 | access to local variable c2 |
+| Tuples.cs:154:36:154:37 | String c2 | Tuples.cs:154:36:154:37 | SSA def(c2) |
+| Tuples.cs:158:18:158:19 | access to local variable b2 | Tuples.cs:158:18:158:19 | (...) ... |
+| Tuples.cs:161:13:161:14 | access to local variable o5 | Tuples.cs:161:13:161:35 | SSA def(o5) |
+| Tuples.cs:161:13:161:35 | SSA def(o5) | Tuples.cs:163:18:163:19 | access to local variable o5 |
+| Tuples.cs:161:18:161:35 | call to method Source<String> | Tuples.cs:161:13:161:14 | access to local variable o5 |
+| Tuples.cs:161:33:161:34 | 14 | Tuples.cs:161:33:161:34 | (...) ... |
+| Tuples.cs:162:13:162:14 | access to local variable o6 | Tuples.cs:162:13:162:35 | SSA def(o6) |
+| Tuples.cs:162:13:162:35 | SSA def(o6) | Tuples.cs:163:26:163:27 | access to local variable o6 |
+| Tuples.cs:162:18:162:35 | call to method Source<String> | Tuples.cs:162:13:162:14 | access to local variable o6 |
+| Tuples.cs:162:33:162:34 | 15 | Tuples.cs:162:33:162:34 | (...) ... |
+| Tuples.cs:163:13:163:13 | access to local variable z | Tuples.cs:163:13:163:32 | SSA def(z) |
+| Tuples.cs:163:13:163:32 | SSA def(z) | Tuples.cs:164:13:164:13 | access to local variable z |
+| Tuples.cs:163:17:163:32 | (..., ...) | Tuples.cs:163:13:163:13 | access to local variable z |
+| Tuples.cs:164:13:164:13 | access to local variable z | Tuples.cs:164:18:164:47 | { ... } |
+| Tuples.cs:164:19:164:24 | SSA def(a3) | Tuples.cs:166:18:166:19 | access to local variable a3 |
+| Tuples.cs:164:19:164:24 | String a3 | Tuples.cs:164:19:164:24 | SSA def(a3) |
+| Tuples.cs:164:27:164:43 | (Int32,String) t | Tuples.cs:164:27:164:43 | SSA def(t) |
+| Tuples.cs:164:27:164:43 | SSA def(t) | Tuples.cs:167:18:167:18 | access to local variable t |
+| Tuples.cs:164:27:164:43 | SSA qualifier def(t.Item2) | Tuples.cs:167:18:167:24 | access to field Item2 |
+| Tuples.cs:164:28:164:33 | Int32 b3 | Tuples.cs:164:28:164:33 | SSA def(b3) |
+| Tuples.cs:164:28:164:33 | SSA def(b3) | Tuples.cs:168:18:168:19 | access to local variable b3 |
+| Tuples.cs:168:18:168:19 | access to local variable b3 | Tuples.cs:168:18:168:19 | (...) ... |
+| Tuples.cs:179:18:179:31 | this | Tuples.cs:179:18:179:31 | this access |
diff --git a/csharp/ql/test/library-tests/dataflow/tuples/PrintAst.expected b/csharp/ql/test/library-tests/dataflow/tuples/PrintAst.expected
index 11e14eeb6c59..9e9edd2f5875 100644
--- a/csharp/ql/test/library-tests/dataflow/tuples/PrintAst.expected
+++ b/csharp/ql/test/library-tests/dataflow/tuples/PrintAst.expected
@@ -262,9 +262,9 @@ Tuples.cs:
 #   65|                   -1: [LocalVariableAccess] access to local variable t
 #   66|         4: [BreakStmt] break;
 #   67|         5: [CaseStmt] case ...:
-#   67|           0: [TupleExpr] (..., ...)
+#   67|           0: [TuplePatternExpr] (..., ...)
 #   67|             0: [VariablePatternExpr] String a
-#   67|             1: [TupleExpr] (..., ...)
+#   67|             1: [TuplePatternExpr] (..., ...)
 #   67|               0: [VariablePatternExpr] Int32 b
 #   67|               1: [VariablePatternExpr] String c
 #   67|             2: [DiscardPatternExpr] _
@@ -302,7 +302,7 @@ Tuples.cs:
 #   78|           0: [RecursivePatternExpr] { ... }
 #   78|             2: [PositionalPatternExpr] ( ... )
 #   78|               0: [VariablePatternExpr] String a
-#   78|               1: [TupleExpr] (..., ...)
+#   78|               1: [TuplePatternExpr] (..., ...)
 #   78|                 0: [VariablePatternExpr] Int32 b
 #   78|                 1: [VariablePatternExpr] String c
 #   78|               2: [DiscardPatternExpr] _
@@ -335,9 +335,9 @@ Tuples.cs:
 #   87|       7: [IfStmt] if (...) ...
 #   87|         0: [IsExpr] ... is ...
 #   87|           0: [LocalVariableAccess] access to local variable x
-#   87|           1: [TupleExpr] (..., ...)
+#   87|           1: [TuplePatternExpr] (..., ...)
 #   87|             0: [VariablePatternExpr] String p
-#   87|             1: [TupleExpr] (..., ...)
+#   87|             1: [TuplePatternExpr] (..., ...)
 #   87|               0: [VariablePatternExpr] Int32 q
 #   87|               1: [VariablePatternExpr] String r
 #   87|             2: [DiscardPatternExpr] _
@@ -417,7 +417,7 @@ Tuples.cs:
 #  107|       6: [SwitchStmt] switch (...) {...}
 #  107|         0: [LocalVariableAccess] access to local variable r
 #  109|         0: [CaseStmt] case ...:
-#  109|           0: [TupleExpr] (..., ...)
+#  109|           0: [TuplePatternExpr] (..., ...)
 #  109|             0: [VariablePatternExpr] String x
 #  109|             1: [VariablePatternExpr] Int32 y
 #  110|         1: [ExprStmt] ...;
@@ -504,20 +504,162 @@ Tuples.cs:
 #  134|       12: [ExprStmt] ...;
 #  134|         0: [MethodCall] call to method Sink
 #  134|           0: [LocalVariableAccess] access to local variable y4
-#  137|   13: [Method] Sink
+#  137|   13: [Method] M7
 #  137|     -1: [TypeMention] Void
+#  138|     4: [BlockStmt] {...}
+#  139|       0: [LocalVariableDeclStmt] ... ...;
+#  139|         0: [LocalVariableDeclAndInitExpr] String o1 = ...
+#  139|           -1: [TypeMention] string
+#  139|           0: [LocalVariableAccess] access to local variable o1
+#  139|           1: [MethodCall] call to method Source<String>
+#  139|             0: [CastExpr] (...) ...
+#  139|               1: [IntLiteral] 10
+#  140|       1: [LocalVariableDeclStmt] ... ...;
+#  140|         0: [LocalVariableDeclAndInitExpr] String o2 = ...
+#  140|           -1: [TypeMention] string
+#  140|           0: [LocalVariableAccess] access to local variable o2
+#  140|           1: [MethodCall] call to method Source<String>
+#  140|             0: [CastExpr] (...) ...
+#  140|               1: [IntLiteral] 11
+#  141|       2: [LocalVariableDeclStmt] ... ...;
+#  141|         0: [LocalVariableDeclAndInitExpr] (String,(Int32,String),Int32) x = ...
+#  141|           -1: [TypeMention] (string, (int, string), int)
+#  141|           0: [LocalVariableAccess] access to local variable x
+#  141|           1: [TupleExpr] (..., ...)
+#  141|             0: [LocalVariableAccess] access to local variable o1
+#  141|             1: [TupleExpr] (..., ...)
+#  141|               0: [IntLiteral] 2
+#  141|               1: [LocalVariableAccess] access to local variable o2
+#  141|             2: [IntLiteral] 3
+#  142|       3: [SwitchStmt] switch (...) {...}
+#  142|         0: [LocalVariableAccess] access to local variable x
+#  144|         0: [CaseStmt] case ...:
+#  144|           0: [RecursivePatternExpr] { ... }
+#  144|             2: [PositionalPatternExpr] ( ... )
+#  144|               0: [VariablePatternExpr] String a1
+#  144|               1: [RecursivePatternExpr] { ... }
+#  144|                 2: [PositionalPatternExpr] ( ... )
+#  144|                   0: [VariablePatternExpr] Int32 b1
+#  144|                   1: [VariablePatternExpr] String c1
+#  144|               2: [DiscardPatternExpr] _
+#  145|         1: [ExprStmt] ...;
+#  145|           0: [MethodCall] call to method Sink
+#  145|             0: [LocalVariableAccess] access to local variable a1
+#  146|         2: [ExprStmt] ...;
+#  146|           0: [MethodCall] call to method Sink
+#  146|             0: [LocalVariableAccess] access to local variable c1
+#  147|         3: [ExprStmt] ...;
+#  147|           0: [MethodCall] call to method Sink
+#  147|             0: [CastExpr] (...) ...
+#  147|               1: [LocalVariableAccess] access to local variable b1
+#  148|         4: [BreakStmt] break;
+#  151|       4: [LocalVariableDeclStmt] ... ...;
+#  151|         0: [LocalVariableDeclAndInitExpr] String o3 = ...
+#  151|           -1: [TypeMention] string
+#  151|           0: [LocalVariableAccess] access to local variable o3
+#  151|           1: [MethodCall] call to method Source<String>
+#  151|             0: [CastExpr] (...) ...
+#  151|               1: [IntLiteral] 12
+#  152|       5: [LocalVariableDeclStmt] ... ...;
+#  152|         0: [LocalVariableDeclAndInitExpr] String o4 = ...
+#  152|           -1: [TypeMention] string
+#  152|           0: [LocalVariableAccess] access to local variable o4
+#  152|           1: [MethodCall] call to method Source<String>
+#  152|             0: [CastExpr] (...) ...
+#  152|               1: [IntLiteral] 13
+#  153|       6: [LocalVariableDeclStmt] ... ...;
+#  153|         0: [LocalVariableDeclAndInitExpr] (String,(Int32,String),Int32) y = ...
+#  153|           -1: [TypeMention] (string, (int, string), int)
+#  153|           0: [LocalVariableAccess] access to local variable y
+#  153|           1: [TupleExpr] (..., ...)
+#  153|             0: [LocalVariableAccess] access to local variable o3
+#  153|             1: [TupleExpr] (..., ...)
+#  153|               0: [IntLiteral] 2
+#  153|               1: [LocalVariableAccess] access to local variable o4
+#  153|             2: [IntLiteral] 3
+#  154|       7: [IfStmt] if (...) ...
+#  154|         0: [IsExpr] ... is ...
+#  154|           0: [LocalVariableAccess] access to local variable y
+#  154|           1: [RecursivePatternExpr] { ... }
+#  154|             2: [PositionalPatternExpr] ( ... )
+#  154|               0: [VariablePatternExpr] String a2
+#  154|               1: [TuplePatternExpr] (..., ...)
+#  154|                 0: [VariablePatternExpr] Int32 b2
+#  154|                 1: [VariablePatternExpr] String c2
+#  154|               2: [DiscardPatternExpr] _
+#  155|         1: [BlockStmt] {...}
+#  156|           0: [ExprStmt] ...;
+#  156|             0: [MethodCall] call to method Sink
+#  156|               0: [LocalVariableAccess] access to local variable a2
+#  157|           1: [ExprStmt] ...;
+#  157|             0: [MethodCall] call to method Sink
+#  157|               0: [LocalVariableAccess] access to local variable c2
+#  158|           2: [ExprStmt] ...;
+#  158|             0: [MethodCall] call to method Sink
+#  158|               0: [CastExpr] (...) ...
+#  158|                 1: [LocalVariableAccess] access to local variable b2
+#  161|       8: [LocalVariableDeclStmt] ... ...;
+#  161|         0: [LocalVariableDeclAndInitExpr] String o5 = ...
+#  161|           -1: [TypeMention] string
+#  161|           0: [LocalVariableAccess] access to local variable o5
+#  161|           1: [MethodCall] call to method Source<String>
+#  161|             0: [CastExpr] (...) ...
+#  161|               1: [IntLiteral] 14
+#  162|       9: [LocalVariableDeclStmt] ... ...;
+#  162|         0: [LocalVariableDeclAndInitExpr] String o6 = ...
+#  162|           -1: [TypeMention] string
+#  162|           0: [LocalVariableAccess] access to local variable o6
+#  162|           1: [MethodCall] call to method Source<String>
+#  162|             0: [CastExpr] (...) ...
+#  162|               1: [IntLiteral] 15
+#  163|       10: [LocalVariableDeclStmt] ... ...;
+#  163|         0: [LocalVariableDeclAndInitExpr] (String,(Int32,String),Int32) z = ...
+#  163|           -1: [TypeMention] (string, (int, string), int)
+#  163|           0: [LocalVariableAccess] access to local variable z
+#  163|           1: [TupleExpr] (..., ...)
+#  163|             0: [LocalVariableAccess] access to local variable o5
+#  163|             1: [TupleExpr] (..., ...)
+#  163|               0: [IntLiteral] 2
+#  163|               1: [LocalVariableAccess] access to local variable o6
+#  163|             2: [IntLiteral] 3
+#  164|       11: [IfStmt] if (...) ...
+#  164|         0: [IsExpr] ... is ...
+#  164|           0: [LocalVariableAccess] access to local variable z
+#  164|           1: [RecursivePatternExpr] { ... }
+#  164|             2: [PositionalPatternExpr] ( ... )
+#  164|               0: [VariablePatternExpr] String a3
+#  164|               1: [RecursivePatternExpr] { ... }
+#  164|                 0: [VariablePatternExpr] (Int32,String) t
+#  164|                 2: [PositionalPatternExpr] ( ... )
+#  164|                   0: [VariablePatternExpr] Int32 b3
+#  164|                   1: [DiscardPatternExpr] _
+#  164|               2: [DiscardPatternExpr] _
+#  165|         1: [BlockStmt] {...}
+#  166|           0: [ExprStmt] ...;
+#  166|             0: [MethodCall] call to method Sink
+#  166|               0: [LocalVariableAccess] access to local variable a3
+#  167|           1: [ExprStmt] ...;
+#  167|             0: [MethodCall] call to method Sink
+#  167|               0: [FieldAccess] access to field Item2
+#  167|                 -1: [LocalVariableAccess] access to local variable t
+#  168|           2: [ExprStmt] ...;
+#  168|             0: [MethodCall] call to method Sink
+#  168|               0: [CastExpr] (...) ...
+#  168|                 1: [LocalVariableAccess] access to local variable b3
+#  172|   14: [Method] Sink
+#  172|     -1: [TypeMention] Void
 #-----|     2: (Parameters)
-#  137|       0: [Parameter] o
-#  137|         -1: [TypeMention] object
-#  137|     4: [BlockStmt] {...}
-#  139|   16: [Method] Source`1
-#  139|     -1: [TypeMention] T
+#  172|       0: [Parameter] o
+#  172|         -1: [TypeMention] object
+#  172|     4: [BlockStmt] {...}
+#  174|   17: [Method] Source`1
+#  174|     -1: [TypeMention] T
 #-----|     1: (Type parameters)
-#  139|       0: [TypeParameter] T
+#  174|       0: [TypeParameter] T
 #-----|     2: (Parameters)
-#  139|       0: [Parameter] source
-#  139|         -1: [TypeMention] object
-#  139|     4: [ThrowExpr] throw ...
-#  139|       0: [NullLiteral] null
-#  142| [NamespaceDeclaration] namespace ... { ... }
-#  144|   1: [Class] IsExternalInit
+#  174|       0: [Parameter] source
+#  174|         -1: [TypeMention] object
+#  174|     4: [ThrowExpr] throw ...
+#  174|       0: [NullLiteral] null
+#  177| [NamespaceDeclaration] namespace ... { ... }
+#  179|   1: [Class] IsExternalInit
diff --git a/csharp/ql/test/library-tests/dataflow/tuples/Tuples.cs b/csharp/ql/test/library-tests/dataflow/tuples/Tuples.cs
index a57bd0ccc7af..a3f4a336acd1 100644
--- a/csharp/ql/test/library-tests/dataflow/tuples/Tuples.cs
+++ b/csharp/ql/test/library-tests/dataflow/tuples/Tuples.cs
@@ -134,6 +134,41 @@ static void M6()
         Sink(y4);               // $ hasValueFlow=9
     }
 
+    static void M7()
+    {
+        var o1 = Source<string>(10);
+        var o2 = Source<string>(11);
+        var x = (o1, (2, o2), 3);
+        switch (x)
+        {
+            case (var a1, (var b1, var c1), _):
+                Sink(a1);        // $ hasValueFlow=10
+                Sink(c1);        // $ hasValueFlow=11
+                Sink(b1);
+                break;
+        }
+
+        var o3 = Source<string>(12);
+        var o4 = Source<string>(13);
+        var y = (o3, (2, o4), 3);
+        if (y is (var a2, var (b2, c2), _))
+        {
+            Sink(a2);        // $ hasValueFlow=12
+            Sink(c2);        // $ hasValueFlow=13
+            Sink(b2);
+        }
+
+        var o5 = Source<string>(14);
+        var o6 = Source<string>(15);
+        var z = (o5, (2, o6), 3);
+        if (z is (var a3, (var b3, var _) t, _))
+        {
+            Sink(a3);        // $ hasValueFlow=14
+            Sink(t.Item2);   // $ hasValueFlow=15
+            Sink(b3);
+        }
+    }
+
     public static void Sink(object o) { }
 
     static T Source<T>(object source) => throw null;
@@ -142,4 +177,4 @@ public static void Sink(object o) { }
 namespace System.Runtime.CompilerServices
 {
     public class IsExternalInit { }
-}
\ No newline at end of file
+}
diff --git a/csharp/ql/test/library-tests/dataflow/tuples/Tuples.expected b/csharp/ql/test/library-tests/dataflow/tuples/Tuples.expected
index 41ea12890262..e3b79c4c0eb9 100644
--- a/csharp/ql/test/library-tests/dataflow/tuples/Tuples.expected
+++ b/csharp/ql/test/library-tests/dataflow/tuples/Tuples.expected
@@ -214,6 +214,90 @@ edges
 | Tuples.cs:133:24:133:29 | (..., ...) : ValueTuple<Int32,Object> [field Item2] : Object | Tuples.cs:133:9:133:20 | (..., ...) : ValueTuple<Int32,Object> [field Item2] : Object | provenance |  |
 | Tuples.cs:133:28:133:28 | access to local variable o : Object | Tuples.cs:133:24:133:29 | (..., ...) : ValueTuple<Int32,Object> [field Item2] : Object | provenance |  |
 | Tuples.cs:133:28:133:28 | access to local variable o : Object | Tuples.cs:133:24:133:29 | (..., ...) : ValueTuple<Int32,Object> [field Item2] : Object | provenance |  |
+| Tuples.cs:139:13:139:14 | access to local variable o1 : String | Tuples.cs:141:18:141:19 | access to local variable o1 : String | provenance |  |
+| Tuples.cs:139:13:139:14 | access to local variable o1 : String | Tuples.cs:141:18:141:19 | access to local variable o1 : String | provenance |  |
+| Tuples.cs:139:18:139:35 | call to method Source<String> : String | Tuples.cs:139:13:139:14 | access to local variable o1 : String | provenance |  |
+| Tuples.cs:139:18:139:35 | call to method Source<String> : String | Tuples.cs:139:13:139:14 | access to local variable o1 : String | provenance |  |
+| Tuples.cs:140:13:140:14 | access to local variable o2 : String | Tuples.cs:141:26:141:27 | access to local variable o2 : String | provenance |  |
+| Tuples.cs:140:13:140:14 | access to local variable o2 : String | Tuples.cs:141:26:141:27 | access to local variable o2 : String | provenance |  |
+| Tuples.cs:140:18:140:35 | call to method Source<String> : String | Tuples.cs:140:13:140:14 | access to local variable o2 : String | provenance |  |
+| Tuples.cs:140:18:140:35 | call to method Source<String> : String | Tuples.cs:140:13:140:14 | access to local variable o2 : String | provenance |  |
+| Tuples.cs:141:13:141:13 | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:144:18:144:46 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:141:13:141:13 | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:144:18:144:46 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:141:13:141:13 | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:144:18:144:46 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:141:13:141:13 | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:144:18:144:46 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:141:17:141:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:141:13:141:13 | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:141:17:141:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:141:13:141:13 | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:141:17:141:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:141:13:141:13 | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:141:17:141:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:141:13:141:13 | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:141:18:141:19 | access to local variable o1 : String | Tuples.cs:141:17:141:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:141:18:141:19 | access to local variable o1 : String | Tuples.cs:141:17:141:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:141:22:141:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | Tuples.cs:141:17:141:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:141:22:141:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | Tuples.cs:141:17:141:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:141:26:141:27 | access to local variable o2 : String | Tuples.cs:141:22:141:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | provenance |  |
+| Tuples.cs:141:26:141:27 | access to local variable o2 : String | Tuples.cs:141:22:141:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | provenance |  |
+| Tuples.cs:144:18:144:46 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:145:22:145:23 | access to local variable a1 | provenance |  |
+| Tuples.cs:144:18:144:46 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:145:22:145:23 | access to local variable a1 | provenance |  |
+| Tuples.cs:144:18:144:46 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:144:27:144:42 | { ... } : ValueTuple<Int32,String> [field Item2] : String | provenance |  |
+| Tuples.cs:144:18:144:46 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:144:27:144:42 | { ... } : ValueTuple<Int32,String> [field Item2] : String | provenance |  |
+| Tuples.cs:144:27:144:42 | { ... } : ValueTuple<Int32,String> [field Item2] : String | Tuples.cs:146:22:146:23 | access to local variable c1 | provenance |  |
+| Tuples.cs:144:27:144:42 | { ... } : ValueTuple<Int32,String> [field Item2] : String | Tuples.cs:146:22:146:23 | access to local variable c1 | provenance |  |
+| Tuples.cs:151:13:151:14 | access to local variable o3 : String | Tuples.cs:153:18:153:19 | access to local variable o3 : String | provenance |  |
+| Tuples.cs:151:13:151:14 | access to local variable o3 : String | Tuples.cs:153:18:153:19 | access to local variable o3 : String | provenance |  |
+| Tuples.cs:151:18:151:35 | call to method Source<String> : String | Tuples.cs:151:13:151:14 | access to local variable o3 : String | provenance |  |
+| Tuples.cs:151:18:151:35 | call to method Source<String> : String | Tuples.cs:151:13:151:14 | access to local variable o3 : String | provenance |  |
+| Tuples.cs:152:13:152:14 | access to local variable o4 : String | Tuples.cs:153:26:153:27 | access to local variable o4 : String | provenance |  |
+| Tuples.cs:152:13:152:14 | access to local variable o4 : String | Tuples.cs:153:26:153:27 | access to local variable o4 : String | provenance |  |
+| Tuples.cs:152:18:152:35 | call to method Source<String> : String | Tuples.cs:152:13:152:14 | access to local variable o4 : String | provenance |  |
+| Tuples.cs:152:18:152:35 | call to method Source<String> : String | Tuples.cs:152:13:152:14 | access to local variable o4 : String | provenance |  |
+| Tuples.cs:153:13:153:13 | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:154:18:154:42 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:153:13:153:13 | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:154:18:154:42 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:153:13:153:13 | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:154:18:154:42 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:153:13:153:13 | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:154:18:154:42 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:153:17:153:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:153:13:153:13 | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:153:17:153:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:153:13:153:13 | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:153:17:153:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:153:13:153:13 | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:153:17:153:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:153:13:153:13 | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:153:18:153:19 | access to local variable o3 : String | Tuples.cs:153:17:153:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:153:18:153:19 | access to local variable o3 : String | Tuples.cs:153:17:153:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:153:22:153:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | Tuples.cs:153:17:153:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:153:22:153:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | Tuples.cs:153:17:153:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:153:26:153:27 | access to local variable o4 : String | Tuples.cs:153:22:153:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | provenance |  |
+| Tuples.cs:153:26:153:27 | access to local variable o4 : String | Tuples.cs:153:22:153:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | provenance |  |
+| Tuples.cs:154:18:154:42 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:156:18:156:19 | access to local variable a2 | provenance |  |
+| Tuples.cs:154:18:154:42 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:156:18:156:19 | access to local variable a2 | provenance |  |
+| Tuples.cs:154:18:154:42 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:154:27:154:38 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | provenance |  |
+| Tuples.cs:154:18:154:42 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:154:27:154:38 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | provenance |  |
+| Tuples.cs:154:27:154:38 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | Tuples.cs:157:18:157:19 | access to local variable c2 | provenance |  |
+| Tuples.cs:154:27:154:38 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | Tuples.cs:157:18:157:19 | access to local variable c2 | provenance |  |
+| Tuples.cs:161:13:161:14 | access to local variable o5 : String | Tuples.cs:163:18:163:19 | access to local variable o5 : String | provenance |  |
+| Tuples.cs:161:13:161:14 | access to local variable o5 : String | Tuples.cs:163:18:163:19 | access to local variable o5 : String | provenance |  |
+| Tuples.cs:161:18:161:35 | call to method Source<String> : String | Tuples.cs:161:13:161:14 | access to local variable o5 : String | provenance |  |
+| Tuples.cs:161:18:161:35 | call to method Source<String> : String | Tuples.cs:161:13:161:14 | access to local variable o5 : String | provenance |  |
+| Tuples.cs:162:13:162:14 | access to local variable o6 : String | Tuples.cs:163:26:163:27 | access to local variable o6 : String | provenance |  |
+| Tuples.cs:162:13:162:14 | access to local variable o6 : String | Tuples.cs:163:26:163:27 | access to local variable o6 : String | provenance |  |
+| Tuples.cs:162:18:162:35 | call to method Source<String> : String | Tuples.cs:162:13:162:14 | access to local variable o6 : String | provenance |  |
+| Tuples.cs:162:18:162:35 | call to method Source<String> : String | Tuples.cs:162:13:162:14 | access to local variable o6 : String | provenance |  |
+| Tuples.cs:163:13:163:13 | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:164:18:164:47 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:163:13:163:13 | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:164:18:164:47 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:163:13:163:13 | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:164:18:164:47 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:163:13:163:13 | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:164:18:164:47 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:163:17:163:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:163:13:163:13 | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:163:17:163:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:163:13:163:13 | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:163:17:163:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:163:13:163:13 | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:163:17:163:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:163:13:163:13 | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:163:18:163:19 | access to local variable o5 : String | Tuples.cs:163:17:163:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:163:18:163:19 | access to local variable o5 : String | Tuples.cs:163:17:163:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | provenance |  |
+| Tuples.cs:163:22:163:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | Tuples.cs:163:17:163:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:163:22:163:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | Tuples.cs:163:17:163:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | provenance |  |
+| Tuples.cs:163:26:163:27 | access to local variable o6 : String | Tuples.cs:163:22:163:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | provenance |  |
+| Tuples.cs:163:26:163:27 | access to local variable o6 : String | Tuples.cs:163:22:163:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | provenance |  |
+| Tuples.cs:164:18:164:47 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:166:18:166:19 | access to local variable a3 | provenance |  |
+| Tuples.cs:164:18:164:47 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | Tuples.cs:166:18:166:19 | access to local variable a3 | provenance |  |
+| Tuples.cs:164:18:164:47 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:167:18:167:18 | access to local variable t : ValueTuple<Int32,String> [field Item2] : String | provenance |  |
+| Tuples.cs:164:18:164:47 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | Tuples.cs:167:18:167:18 | access to local variable t : ValueTuple<Int32,String> [field Item2] : String | provenance |  |
+| Tuples.cs:167:18:167:18 | access to local variable t : ValueTuple<Int32,String> [field Item2] : String | Tuples.cs:167:18:167:24 | access to field Item2 | provenance |  |
+| Tuples.cs:167:18:167:18 | access to local variable t : ValueTuple<Int32,String> [field Item2] : String | Tuples.cs:167:18:167:24 | access to field Item2 | provenance |  |
 nodes
 | Tuples.cs:7:13:7:14 | access to local variable o1 : Object | semmle.label | access to local variable o1 : Object |
 | Tuples.cs:7:13:7:14 | access to local variable o1 : Object | semmle.label | access to local variable o1 : Object |
@@ -439,6 +523,102 @@ nodes
 | Tuples.cs:133:28:133:28 | access to local variable o : Object | semmle.label | access to local variable o : Object |
 | Tuples.cs:134:14:134:15 | access to local variable y4 | semmle.label | access to local variable y4 |
 | Tuples.cs:134:14:134:15 | access to local variable y4 | semmle.label | access to local variable y4 |
+| Tuples.cs:139:13:139:14 | access to local variable o1 : String | semmle.label | access to local variable o1 : String |
+| Tuples.cs:139:13:139:14 | access to local variable o1 : String | semmle.label | access to local variable o1 : String |
+| Tuples.cs:139:18:139:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Tuples.cs:139:18:139:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Tuples.cs:140:13:140:14 | access to local variable o2 : String | semmle.label | access to local variable o2 : String |
+| Tuples.cs:140:13:140:14 | access to local variable o2 : String | semmle.label | access to local variable o2 : String |
+| Tuples.cs:140:18:140:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Tuples.cs:140:18:140:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Tuples.cs:141:13:141:13 | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:141:13:141:13 | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:141:13:141:13 | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:141:13:141:13 | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | access to local variable x : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:141:17:141:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:141:17:141:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:141:17:141:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:141:17:141:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:141:18:141:19 | access to local variable o1 : String | semmle.label | access to local variable o1 : String |
+| Tuples.cs:141:18:141:19 | access to local variable o1 : String | semmle.label | access to local variable o1 : String |
+| Tuples.cs:141:22:141:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | semmle.label | (..., ...) : ValueTuple<Int32,String> [field Item2] : String |
+| Tuples.cs:141:22:141:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | semmle.label | (..., ...) : ValueTuple<Int32,String> [field Item2] : String |
+| Tuples.cs:141:26:141:27 | access to local variable o2 : String | semmle.label | access to local variable o2 : String |
+| Tuples.cs:141:26:141:27 | access to local variable o2 : String | semmle.label | access to local variable o2 : String |
+| Tuples.cs:144:18:144:46 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:144:18:144:46 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:144:18:144:46 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:144:18:144:46 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:144:27:144:42 | { ... } : ValueTuple<Int32,String> [field Item2] : String | semmle.label | { ... } : ValueTuple<Int32,String> [field Item2] : String |
+| Tuples.cs:144:27:144:42 | { ... } : ValueTuple<Int32,String> [field Item2] : String | semmle.label | { ... } : ValueTuple<Int32,String> [field Item2] : String |
+| Tuples.cs:145:22:145:23 | access to local variable a1 | semmle.label | access to local variable a1 |
+| Tuples.cs:145:22:145:23 | access to local variable a1 | semmle.label | access to local variable a1 |
+| Tuples.cs:146:22:146:23 | access to local variable c1 | semmle.label | access to local variable c1 |
+| Tuples.cs:146:22:146:23 | access to local variable c1 | semmle.label | access to local variable c1 |
+| Tuples.cs:151:13:151:14 | access to local variable o3 : String | semmle.label | access to local variable o3 : String |
+| Tuples.cs:151:13:151:14 | access to local variable o3 : String | semmle.label | access to local variable o3 : String |
+| Tuples.cs:151:18:151:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Tuples.cs:151:18:151:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Tuples.cs:152:13:152:14 | access to local variable o4 : String | semmle.label | access to local variable o4 : String |
+| Tuples.cs:152:13:152:14 | access to local variable o4 : String | semmle.label | access to local variable o4 : String |
+| Tuples.cs:152:18:152:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Tuples.cs:152:18:152:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Tuples.cs:153:13:153:13 | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:153:13:153:13 | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:153:13:153:13 | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:153:13:153:13 | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | access to local variable y : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:153:17:153:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:153:17:153:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:153:17:153:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:153:17:153:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:153:18:153:19 | access to local variable o3 : String | semmle.label | access to local variable o3 : String |
+| Tuples.cs:153:18:153:19 | access to local variable o3 : String | semmle.label | access to local variable o3 : String |
+| Tuples.cs:153:22:153:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | semmle.label | (..., ...) : ValueTuple<Int32,String> [field Item2] : String |
+| Tuples.cs:153:22:153:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | semmle.label | (..., ...) : ValueTuple<Int32,String> [field Item2] : String |
+| Tuples.cs:153:26:153:27 | access to local variable o4 : String | semmle.label | access to local variable o4 : String |
+| Tuples.cs:153:26:153:27 | access to local variable o4 : String | semmle.label | access to local variable o4 : String |
+| Tuples.cs:154:18:154:42 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:154:18:154:42 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:154:18:154:42 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:154:18:154:42 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:154:27:154:38 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | semmle.label | (..., ...) : ValueTuple<Int32,String> [field Item2] : String |
+| Tuples.cs:154:27:154:38 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | semmle.label | (..., ...) : ValueTuple<Int32,String> [field Item2] : String |
+| Tuples.cs:156:18:156:19 | access to local variable a2 | semmle.label | access to local variable a2 |
+| Tuples.cs:156:18:156:19 | access to local variable a2 | semmle.label | access to local variable a2 |
+| Tuples.cs:157:18:157:19 | access to local variable c2 | semmle.label | access to local variable c2 |
+| Tuples.cs:157:18:157:19 | access to local variable c2 | semmle.label | access to local variable c2 |
+| Tuples.cs:161:13:161:14 | access to local variable o5 : String | semmle.label | access to local variable o5 : String |
+| Tuples.cs:161:13:161:14 | access to local variable o5 : String | semmle.label | access to local variable o5 : String |
+| Tuples.cs:161:18:161:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Tuples.cs:161:18:161:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Tuples.cs:162:13:162:14 | access to local variable o6 : String | semmle.label | access to local variable o6 : String |
+| Tuples.cs:162:13:162:14 | access to local variable o6 : String | semmle.label | access to local variable o6 : String |
+| Tuples.cs:162:18:162:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Tuples.cs:162:18:162:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| Tuples.cs:163:13:163:13 | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:163:13:163:13 | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:163:13:163:13 | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:163:13:163:13 | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | access to local variable z : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:163:17:163:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:163:17:163:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:163:17:163:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:163:17:163:32 | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | (..., ...) : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:163:18:163:19 | access to local variable o5 : String | semmle.label | access to local variable o5 : String |
+| Tuples.cs:163:18:163:19 | access to local variable o5 : String | semmle.label | access to local variable o5 : String |
+| Tuples.cs:163:22:163:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | semmle.label | (..., ...) : ValueTuple<Int32,String> [field Item2] : String |
+| Tuples.cs:163:22:163:28 | (..., ...) : ValueTuple<Int32,String> [field Item2] : String | semmle.label | (..., ...) : ValueTuple<Int32,String> [field Item2] : String |
+| Tuples.cs:163:26:163:27 | access to local variable o6 : String | semmle.label | access to local variable o6 : String |
+| Tuples.cs:163:26:163:27 | access to local variable o6 : String | semmle.label | access to local variable o6 : String |
+| Tuples.cs:164:18:164:47 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:164:18:164:47 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String | semmle.label | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item1] : String |
+| Tuples.cs:164:18:164:47 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:164:18:164:47 | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String | semmle.label | { ... } : ValueTuple<String,ValueTuple<Int32,String>,Int32> [field Item2, field Item2] : String |
+| Tuples.cs:166:18:166:19 | access to local variable a3 | semmle.label | access to local variable a3 |
+| Tuples.cs:166:18:166:19 | access to local variable a3 | semmle.label | access to local variable a3 |
+| Tuples.cs:167:18:167:18 | access to local variable t : ValueTuple<Int32,String> [field Item2] : String | semmle.label | access to local variable t : ValueTuple<Int32,String> [field Item2] : String |
+| Tuples.cs:167:18:167:18 | access to local variable t : ValueTuple<Int32,String> [field Item2] : String | semmle.label | access to local variable t : ValueTuple<Int32,String> [field Item2] : String |
+| Tuples.cs:167:18:167:24 | access to field Item2 | semmle.label | access to field Item2 |
+| Tuples.cs:167:18:167:24 | access to field Item2 | semmle.label | access to field Item2 |
 subpaths
 | Tuples.cs:100:24:100:24 | access to local variable o : String | Tuples.cs:95:22:95:22 | i : String | Tuples.cs:95:12:95:13 | this [Return] : R1 [property i] : String | Tuples.cs:100:17:100:28 | object creation of type R1 : R1 [property i] : String |
 | Tuples.cs:100:24:100:24 | access to local variable o : String | Tuples.cs:95:22:95:22 | i : String | Tuples.cs:95:12:95:13 | this [Return] : R1 [property i] : String | Tuples.cs:100:17:100:28 | object creation of type R1 : R1 [property i] : String |
@@ -490,3 +670,15 @@ testFailures
 | Tuples.cs:130:14:130:15 | access to local variable y3 | Tuples.cs:118:17:118:33 | call to method Source<Object> : Object | Tuples.cs:130:14:130:15 | access to local variable y3 | $@ | Tuples.cs:118:17:118:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
 | Tuples.cs:134:14:134:15 | access to local variable y4 | Tuples.cs:118:17:118:33 | call to method Source<Object> : Object | Tuples.cs:134:14:134:15 | access to local variable y4 | $@ | Tuples.cs:118:17:118:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
 | Tuples.cs:134:14:134:15 | access to local variable y4 | Tuples.cs:118:17:118:33 | call to method Source<Object> : Object | Tuples.cs:134:14:134:15 | access to local variable y4 | $@ | Tuples.cs:118:17:118:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Tuples.cs:145:22:145:23 | access to local variable a1 | Tuples.cs:139:18:139:35 | call to method Source<String> : String | Tuples.cs:145:22:145:23 | access to local variable a1 | $@ | Tuples.cs:139:18:139:35 | call to method Source<String> : String | call to method Source<String> : String |
+| Tuples.cs:145:22:145:23 | access to local variable a1 | Tuples.cs:139:18:139:35 | call to method Source<String> : String | Tuples.cs:145:22:145:23 | access to local variable a1 | $@ | Tuples.cs:139:18:139:35 | call to method Source<String> : String | call to method Source<String> : String |
+| Tuples.cs:146:22:146:23 | access to local variable c1 | Tuples.cs:140:18:140:35 | call to method Source<String> : String | Tuples.cs:146:22:146:23 | access to local variable c1 | $@ | Tuples.cs:140:18:140:35 | call to method Source<String> : String | call to method Source<String> : String |
+| Tuples.cs:146:22:146:23 | access to local variable c1 | Tuples.cs:140:18:140:35 | call to method Source<String> : String | Tuples.cs:146:22:146:23 | access to local variable c1 | $@ | Tuples.cs:140:18:140:35 | call to method Source<String> : String | call to method Source<String> : String |
+| Tuples.cs:156:18:156:19 | access to local variable a2 | Tuples.cs:151:18:151:35 | call to method Source<String> : String | Tuples.cs:156:18:156:19 | access to local variable a2 | $@ | Tuples.cs:151:18:151:35 | call to method Source<String> : String | call to method Source<String> : String |
+| Tuples.cs:156:18:156:19 | access to local variable a2 | Tuples.cs:151:18:151:35 | call to method Source<String> : String | Tuples.cs:156:18:156:19 | access to local variable a2 | $@ | Tuples.cs:151:18:151:35 | call to method Source<String> : String | call to method Source<String> : String |
+| Tuples.cs:157:18:157:19 | access to local variable c2 | Tuples.cs:152:18:152:35 | call to method Source<String> : String | Tuples.cs:157:18:157:19 | access to local variable c2 | $@ | Tuples.cs:152:18:152:35 | call to method Source<String> : String | call to method Source<String> : String |
+| Tuples.cs:157:18:157:19 | access to local variable c2 | Tuples.cs:152:18:152:35 | call to method Source<String> : String | Tuples.cs:157:18:157:19 | access to local variable c2 | $@ | Tuples.cs:152:18:152:35 | call to method Source<String> : String | call to method Source<String> : String |
+| Tuples.cs:166:18:166:19 | access to local variable a3 | Tuples.cs:161:18:161:35 | call to method Source<String> : String | Tuples.cs:166:18:166:19 | access to local variable a3 | $@ | Tuples.cs:161:18:161:35 | call to method Source<String> : String | call to method Source<String> : String |
+| Tuples.cs:166:18:166:19 | access to local variable a3 | Tuples.cs:161:18:161:35 | call to method Source<String> : String | Tuples.cs:166:18:166:19 | access to local variable a3 | $@ | Tuples.cs:161:18:161:35 | call to method Source<String> : String | call to method Source<String> : String |
+| Tuples.cs:167:18:167:24 | access to field Item2 | Tuples.cs:162:18:162:35 | call to method Source<String> : String | Tuples.cs:167:18:167:24 | access to field Item2 | $@ | Tuples.cs:162:18:162:35 | call to method Source<String> : String | call to method Source<String> : String |
+| Tuples.cs:167:18:167:24 | access to field Item2 | Tuples.cs:162:18:162:35 | call to method Source<String> : String | Tuples.cs:167:18:167:24 | access to field Item2 | $@ | Tuples.cs:162:18:162:35 | call to method Source<String> : String | call to method Source<String> : String |
diff --git a/csharp/ql/test/library-tests/definitions/PrintAst.expected b/csharp/ql/test/library-tests/definitions/PrintAst.expected
index 28196c75a857..fd9adbb2bff0 100644
--- a/csharp/ql/test/library-tests/definitions/PrintAst.expected
+++ b/csharp/ql/test/library-tests/definitions/PrintAst.expected
@@ -199,7 +199,7 @@ definitions.cs:
 #   86|             0: [LocalVariableDeclExpr] Exception e
 #   86|               0: [TypeMention] Exception
 #   87|             1: [BlockStmt] {...}
-#   88|               0: [ForeachStmt] foreach (... ... in ...) ...
+#   88|               0: [ForEachStmt] foreach (... ... in ...) ...
 #   88|                 0: [LocalVariableDeclExpr] S1 s
 #   88|                   0: [TypeMention] S1
 #   88|                 1: [ParameterAccess] access to parameter ss
diff --git a/csharp/ql/test/library-tests/frameworks/OData/OData.cs b/csharp/ql/test/library-tests/frameworks/OData/OData.cs
new file mode 100644
index 000000000000..8e63a2dec7d4
--- /dev/null
+++ b/csharp/ql/test/library-tests/frameworks/OData/OData.cs
@@ -0,0 +1,123 @@
+namespace Test
+{
+    using Microsoft.AspNet.OData;
+    using System.Collections.Generic;
+
+    public class EntityMetadata
+    {
+        public string Owner { get; set; }
+    }
+
+    public class BoundEntity1
+    {
+        public string Name { get; set; }
+
+        public string Content { get; set; }
+
+        public EntityMetadata Metadata { get; set; }
+
+        public List<EntityMetadata> Revisions { get; set; }
+    }
+
+    public class BoundEntity2
+    {
+        public string Name { get; set; }
+    }
+
+    public class RelatedItem
+    {
+        public string Label { get; set; }
+
+        public string Category { get; set; }
+    }
+
+    public class Widget
+    {
+        public string Name { get; set; }
+    }
+
+    public class UnrelatedType
+    {
+        // Never reached via an ODataActionParameters/Delta<T> cast, so this
+        // member must stay untainted even though `UnrelatedType` itself is
+        // used elsewhere in the file.
+        public string Name { get; set; }
+    }
+
+    public class SampleController
+    {
+        void Sink(object o) { }
+
+        void CastFromDictionary(ODataActionParameters parameters)
+        {
+            var entity = (BoundEntity1)parameters["Entity"];
+            Sink(entity); // $ hasTaintFlow=line:51
+            Sink(entity.Name); // $ hasTaintFlow=line:51
+            Sink(entity.Content); // $ hasTaintFlow=line:51
+            Sink(entity.Metadata.Owner); // $ hasTaintFlow=line:51
+            foreach (var m in entity.Revisions)
+            {
+                Sink(m.Owner); // $ hasTaintFlow=line:51
+            }
+        }
+
+        void IsAsFromDictionary(ODataActionParameters parameters)
+        {
+            if (parameters["Items"] is IEnumerable<RelatedItem> items1)
+            {
+                foreach (var item in items1)
+                {
+                    Sink(item.Label); // $ hasTaintFlow=line:64
+                }
+            }
+
+            var items2 = parameters["Items"] as IEnumerable<RelatedItem>;
+            foreach (var item in items2)
+            {
+                Sink(item.Category); // $ hasTaintFlow=line:64
+            }
+        }
+
+        void UpcastThenIndex(ODataActionParameters parameters)
+        {
+            var dict = (IDictionary<string, object>)parameters;
+            var entity = (BoundEntity2)dict["Entity"];
+            Sink(entity.Name); // $ hasTaintFlow=line:81
+        }
+
+        void DeltaPatch(Delta<Widget> delta, Widget original)
+        {
+            delta.Patch(original);
+            Sink(original.Name); // $ hasTaintFlow=line:88
+        }
+
+        void DeltaGetInstance(Delta<Widget> delta)
+        {
+            var w = delta.GetInstance();
+            Sink(w.Name); // $ hasTaintFlow=line:94
+        }
+
+        void LegacyDeltaPatch(System.Web.Http.OData.Delta<Widget> delta, Widget original)
+        {
+            delta.Patch(original);
+            Sink(original.Name); // $ hasTaintFlow=line:100
+        }
+
+        void LegacyDeltaGetEntity(System.Web.Http.OData.Delta<Widget> delta)
+        {
+            var w = delta.GetEntity();
+            Sink(w.Name); // $ hasTaintFlow=line:106
+        }
+
+        void Untainted()
+        {
+            var w = new Widget();
+            w.Name = "safe";
+            Sink(w.Name);
+
+            var u = new UnrelatedType();
+            u.Name = "also safe";
+            Sink(u.Name);
+        }
+    }
+}
diff --git a/csharp/ql/test/library-tests/frameworks/OData/OData.expected b/csharp/ql/test/library-tests/frameworks/OData/OData.expected
new file mode 100644
index 000000000000..1c69969e8756
--- /dev/null
+++ b/csharp/ql/test/library-tests/frameworks/OData/OData.expected
@@ -0,0 +1,89 @@
+models
+| 1 | Summary: Microsoft.AspNet.OData; Delta<TStructuralType>; true; GetInstance; (); ; Argument[this]; ReturnValue; taint; manual |
+| 2 | Summary: Microsoft.AspNet.OData; Delta<TStructuralType>; true; Patch; (TStructuralType); ; Argument[this]; Argument[0]; taint; manual |
+| 3 | Summary: System.Web.Http.OData; Delta<TEntityType>; true; GetEntity; (); ; Argument[this]; ReturnValue; taint; manual |
+| 4 | Summary: System.Web.Http.OData; Delta<TEntityType>; true; Patch; (TEntityType); ; Argument[this]; Argument[0]; taint; manual |
+edges
+| OData.cs:51:55:51:64 | parameters : ODataActionParameters | OData.cs:53:26:53:59 | (...) ... : BoundEntity1 | provenance |  |
+| OData.cs:53:17:53:22 | access to local variable entity : BoundEntity1 | OData.cs:54:18:54:23 | access to local variable entity | provenance |  |
+| OData.cs:53:17:53:22 | access to local variable entity : BoundEntity1 | OData.cs:55:18:55:28 | access to property Name | provenance |  |
+| OData.cs:53:17:53:22 | access to local variable entity : BoundEntity1 | OData.cs:56:18:56:31 | access to property Content | provenance |  |
+| OData.cs:53:17:53:22 | access to local variable entity : BoundEntity1 | OData.cs:57:18:57:38 | access to property Owner | provenance |  |
+| OData.cs:53:17:53:22 | access to local variable entity : BoundEntity1 | OData.cs:60:22:60:28 | access to property Owner | provenance |  |
+| OData.cs:53:26:53:59 | (...) ... : BoundEntity1 | OData.cs:53:17:53:22 | access to local variable entity : BoundEntity1 | provenance |  |
+| OData.cs:64:55:64:64 | parameters : ODataActionParameters | OData.cs:70:26:70:35 | access to property Label | provenance |  |
+| OData.cs:64:55:64:64 | parameters : ODataActionParameters | OData.cs:74:26:74:72 | ... as ... : IEnumerable<RelatedItem> | provenance |  |
+| OData.cs:74:17:74:22 | access to local variable items2 : IEnumerable<RelatedItem> | OData.cs:77:22:77:34 | access to property Category | provenance |  |
+| OData.cs:74:26:74:72 | ... as ... : IEnumerable<RelatedItem> | OData.cs:74:17:74:22 | access to local variable items2 : IEnumerable<RelatedItem> | provenance |  |
+| OData.cs:81:52:81:61 | parameters : ODataActionParameters | OData.cs:83:24:83:62 | (...) ... : ODataActionParameters | provenance |  |
+| OData.cs:83:17:83:20 | access to local variable dict : ODataActionParameters | OData.cs:84:26:84:53 | (...) ... : BoundEntity2 | provenance |  |
+| OData.cs:83:24:83:62 | (...) ... : ODataActionParameters | OData.cs:83:17:83:20 | access to local variable dict : ODataActionParameters | provenance |  |
+| OData.cs:84:17:84:22 | access to local variable entity : BoundEntity2 | OData.cs:85:18:85:28 | access to property Name | provenance |  |
+| OData.cs:84:26:84:53 | (...) ... : BoundEntity2 | OData.cs:84:17:84:22 | access to local variable entity : BoundEntity2 | provenance |  |
+| OData.cs:88:39:88:43 | delta : Delta<Widget> | OData.cs:90:13:90:17 | access to parameter delta : Delta<Widget> | provenance |  |
+| OData.cs:90:13:90:17 | access to parameter delta : Delta<Widget> | OData.cs:90:25:90:32 | [post] access to parameter original : Widget | provenance | MaD:2 |
+| OData.cs:90:25:90:32 | [post] access to parameter original : Widget | OData.cs:91:18:91:30 | access to property Name | provenance |  |
+| OData.cs:94:45:94:49 | delta : Delta<Widget> | OData.cs:96:21:96:25 | access to parameter delta : Delta<Widget> | provenance |  |
+| OData.cs:96:17:96:17 | access to local variable w : Widget | OData.cs:97:18:97:23 | access to property Name | provenance |  |
+| OData.cs:96:21:96:25 | access to parameter delta : Delta<Widget> | OData.cs:96:21:96:39 | call to method GetInstance : Widget | provenance | MaD:1 |
+| OData.cs:96:21:96:39 | call to method GetInstance : Widget | OData.cs:96:17:96:17 | access to local variable w : Widget | provenance |  |
+| OData.cs:100:67:100:71 | delta : Delta<Widget> | OData.cs:102:13:102:17 | access to parameter delta : Delta<Widget> | provenance |  |
+| OData.cs:102:13:102:17 | access to parameter delta : Delta<Widget> | OData.cs:102:25:102:32 | [post] access to parameter original : Widget | provenance | MaD:4 |
+| OData.cs:102:25:102:32 | [post] access to parameter original : Widget | OData.cs:103:18:103:30 | access to property Name | provenance |  |
+| OData.cs:106:71:106:75 | delta : Delta<Widget> | OData.cs:108:21:108:25 | access to parameter delta : Delta<Widget> | provenance |  |
+| OData.cs:108:17:108:17 | access to local variable w : Widget | OData.cs:109:18:109:23 | access to property Name | provenance |  |
+| OData.cs:108:21:108:25 | access to parameter delta : Delta<Widget> | OData.cs:108:21:108:37 | call to method GetEntity : Widget | provenance | MaD:3 |
+| OData.cs:108:21:108:37 | call to method GetEntity : Widget | OData.cs:108:17:108:17 | access to local variable w : Widget | provenance |  |
+nodes
+| OData.cs:51:55:51:64 | parameters : ODataActionParameters | semmle.label | parameters : ODataActionParameters |
+| OData.cs:53:17:53:22 | access to local variable entity : BoundEntity1 | semmle.label | access to local variable entity : BoundEntity1 |
+| OData.cs:53:26:53:59 | (...) ... : BoundEntity1 | semmle.label | (...) ... : BoundEntity1 |
+| OData.cs:54:18:54:23 | access to local variable entity | semmle.label | access to local variable entity |
+| OData.cs:55:18:55:28 | access to property Name | semmle.label | access to property Name |
+| OData.cs:56:18:56:31 | access to property Content | semmle.label | access to property Content |
+| OData.cs:57:18:57:38 | access to property Owner | semmle.label | access to property Owner |
+| OData.cs:60:22:60:28 | access to property Owner | semmle.label | access to property Owner |
+| OData.cs:64:55:64:64 | parameters : ODataActionParameters | semmle.label | parameters : ODataActionParameters |
+| OData.cs:70:26:70:35 | access to property Label | semmle.label | access to property Label |
+| OData.cs:74:17:74:22 | access to local variable items2 : IEnumerable<RelatedItem> | semmle.label | access to local variable items2 : IEnumerable<RelatedItem> |
+| OData.cs:74:26:74:72 | ... as ... : IEnumerable<RelatedItem> | semmle.label | ... as ... : IEnumerable<RelatedItem> |
+| OData.cs:77:22:77:34 | access to property Category | semmle.label | access to property Category |
+| OData.cs:81:52:81:61 | parameters : ODataActionParameters | semmle.label | parameters : ODataActionParameters |
+| OData.cs:83:17:83:20 | access to local variable dict : ODataActionParameters | semmle.label | access to local variable dict : ODataActionParameters |
+| OData.cs:83:24:83:62 | (...) ... : ODataActionParameters | semmle.label | (...) ... : ODataActionParameters |
+| OData.cs:84:17:84:22 | access to local variable entity : BoundEntity2 | semmle.label | access to local variable entity : BoundEntity2 |
+| OData.cs:84:26:84:53 | (...) ... : BoundEntity2 | semmle.label | (...) ... : BoundEntity2 |
+| OData.cs:85:18:85:28 | access to property Name | semmle.label | access to property Name |
+| OData.cs:88:39:88:43 | delta : Delta<Widget> | semmle.label | delta : Delta<Widget> |
+| OData.cs:90:13:90:17 | access to parameter delta : Delta<Widget> | semmle.label | access to parameter delta : Delta<Widget> |
+| OData.cs:90:25:90:32 | [post] access to parameter original : Widget | semmle.label | [post] access to parameter original : Widget |
+| OData.cs:91:18:91:30 | access to property Name | semmle.label | access to property Name |
+| OData.cs:94:45:94:49 | delta : Delta<Widget> | semmle.label | delta : Delta<Widget> |
+| OData.cs:96:17:96:17 | access to local variable w : Widget | semmle.label | access to local variable w : Widget |
+| OData.cs:96:21:96:25 | access to parameter delta : Delta<Widget> | semmle.label | access to parameter delta : Delta<Widget> |
+| OData.cs:96:21:96:39 | call to method GetInstance : Widget | semmle.label | call to method GetInstance : Widget |
+| OData.cs:97:18:97:23 | access to property Name | semmle.label | access to property Name |
+| OData.cs:100:67:100:71 | delta : Delta<Widget> | semmle.label | delta : Delta<Widget> |
+| OData.cs:102:13:102:17 | access to parameter delta : Delta<Widget> | semmle.label | access to parameter delta : Delta<Widget> |
+| OData.cs:102:25:102:32 | [post] access to parameter original : Widget | semmle.label | [post] access to parameter original : Widget |
+| OData.cs:103:18:103:30 | access to property Name | semmle.label | access to property Name |
+| OData.cs:106:71:106:75 | delta : Delta<Widget> | semmle.label | delta : Delta<Widget> |
+| OData.cs:108:17:108:17 | access to local variable w : Widget | semmle.label | access to local variable w : Widget |
+| OData.cs:108:21:108:25 | access to parameter delta : Delta<Widget> | semmle.label | access to parameter delta : Delta<Widget> |
+| OData.cs:108:21:108:37 | call to method GetEntity : Widget | semmle.label | call to method GetEntity : Widget |
+| OData.cs:109:18:109:23 | access to property Name | semmle.label | access to property Name |
+subpaths
+testFailures
+#select
+| OData.cs:54:18:54:23 | access to local variable entity | OData.cs:51:55:51:64 | parameters : ODataActionParameters | OData.cs:54:18:54:23 | access to local variable entity | This path depends on an $@. | OData.cs:51:55:51:64 | parameters | ODataParameters value |
+| OData.cs:55:18:55:28 | access to property Name | OData.cs:51:55:51:64 | parameters : ODataActionParameters | OData.cs:55:18:55:28 | access to property Name | This path depends on an $@. | OData.cs:51:55:51:64 | parameters | ODataParameters value |
+| OData.cs:56:18:56:31 | access to property Content | OData.cs:51:55:51:64 | parameters : ODataActionParameters | OData.cs:56:18:56:31 | access to property Content | This path depends on an $@. | OData.cs:51:55:51:64 | parameters | ODataParameters value |
+| OData.cs:57:18:57:38 | access to property Owner | OData.cs:51:55:51:64 | parameters : ODataActionParameters | OData.cs:57:18:57:38 | access to property Owner | This path depends on an $@. | OData.cs:51:55:51:64 | parameters | ODataParameters value |
+| OData.cs:60:22:60:28 | access to property Owner | OData.cs:51:55:51:64 | parameters : ODataActionParameters | OData.cs:60:22:60:28 | access to property Owner | This path depends on an $@. | OData.cs:51:55:51:64 | parameters | ODataParameters value |
+| OData.cs:70:26:70:35 | access to property Label | OData.cs:64:55:64:64 | parameters : ODataActionParameters | OData.cs:70:26:70:35 | access to property Label | This path depends on an $@. | OData.cs:64:55:64:64 | parameters | ODataParameters value |
+| OData.cs:77:22:77:34 | access to property Category | OData.cs:64:55:64:64 | parameters : ODataActionParameters | OData.cs:77:22:77:34 | access to property Category | This path depends on an $@. | OData.cs:64:55:64:64 | parameters | ODataParameters value |
+| OData.cs:85:18:85:28 | access to property Name | OData.cs:81:52:81:61 | parameters : ODataActionParameters | OData.cs:85:18:85:28 | access to property Name | This path depends on an $@. | OData.cs:81:52:81:61 | parameters | ODataParameters value |
+| OData.cs:91:18:91:30 | access to property Name | OData.cs:88:39:88:43 | delta : Delta<Widget> | OData.cs:91:18:91:30 | access to property Name | This path depends on an $@. | OData.cs:88:39:88:43 | delta | ODataParameters value |
+| OData.cs:97:18:97:23 | access to property Name | OData.cs:94:45:94:49 | delta : Delta<Widget> | OData.cs:97:18:97:23 | access to property Name | This path depends on an $@. | OData.cs:94:45:94:49 | delta | ODataParameters value |
+| OData.cs:103:18:103:30 | access to property Name | OData.cs:100:67:100:71 | delta : Delta<Widget> | OData.cs:103:18:103:30 | access to property Name | This path depends on an $@. | OData.cs:100:67:100:71 | delta | ODataParameters value |
+| OData.cs:109:18:109:23 | access to property Name | OData.cs:106:71:106:75 | delta : Delta<Widget> | OData.cs:109:18:109:23 | access to property Name | This path depends on an $@. | OData.cs:106:71:106:75 | delta | ODataParameters value |
diff --git a/csharp/ql/test/library-tests/frameworks/OData/OData.ql b/csharp/ql/test/library-tests/frameworks/OData/OData.ql
new file mode 100644
index 000000000000..df79cc58cdb4
--- /dev/null
+++ b/csharp/ql/test/library-tests/frameworks/OData/OData.ql
@@ -0,0 +1,30 @@
+/**
+ * @kind path-problem
+ */
+
+import csharp
+import utils.test.InlineFlowTest
+import PathGraph
+
+module TaintConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node n) {
+    exists(Parameter p | p = n.asParameter() |
+      p.getType().hasFullyQualifiedName("Microsoft.AspNet.OData", "ODataActionParameters")
+      or
+      p.getType().getUnboundDeclaration().hasFullyQualifiedName("Microsoft.AspNet.OData", "Delta`1")
+      or
+      p.getType().getUnboundDeclaration().hasFullyQualifiedName("System.Web.Http.OData", "Delta`1")
+    )
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(MethodCall c | c.getArgument(0) = sink.asExpr() and c.getTarget().hasName("Sink"))
+  }
+}
+
+import TaintFlowTest<TaintConfig>
+
+from PathNode source, PathNode sink
+where flowPath(source, sink)
+select sink.getNode(), source, sink, "This path depends on an $@.", source.getNode(),
+  "ODataParameters value"
diff --git a/csharp/ql/test/library-tests/frameworks/OData/options b/csharp/ql/test/library-tests/frameworks/OData/options
new file mode 100644
index 000000000000..64d98a3ae94f
--- /dev/null
+++ b/csharp/ql/test/library-tests/frameworks/OData/options
@@ -0,0 +1,4 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
+semmle-extractor-options: ${testdir}/../../../resources/stubs/Microsoft.AspNet.OData.cs
+semmle-extractor-options: ${testdir}/../../../resources/stubs/System.Web.Http.OData.cs
diff --git a/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCore.cs b/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCore.cs
index bcf0c766f340..7808bd841f27 100644
--- a/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCore.cs
+++ b/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCore.cs
@@ -1,4 +1,16 @@
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+public static class MvcRegistration
+{
+    public static void Register(IServiceCollection services, IEndpointRouteBuilder endpoints)
+    {
+        services.AddControllers();
+        endpoints.MapControllerRoute("default", "{controller}/{action}");
+    }
+}
 
 // has sufix "Controller"
 public class HomeController
@@ -101,3 +113,91 @@ public string Index()
         return "This is Home Controller";
     }
 }
+
+// has case-insensitive suffix "Controller"
+public class LowerCasecontroller
+{
+    public void Action() { }
+}
+
+// derives from ControllerBase, whose [Controller] attribute is inherited
+public class Products : ControllerBase
+{
+    public void List() { }
+}
+
+// is a nested type
+public class ControllerContainer
+{
+    public class NestedController
+    {
+        public void Action() { }
+    }
+}
+
+// only this base class has the Controller suffix
+public class PlainController
+{
+    public void BaseAction() { }
+}
+
+public class DerivedFromPlain : PlainController
+{
+    public void DerivedAction() { }
+}
+
+// is a closed subclass of an open generic controller
+public class GenericBaseController<T> : ControllerBase
+{
+    public void GenericBaseAction(string input) { }
+}
+
+public class ClosedGenericController : GenericBaseController<string>
+{
+    public void ClosedAction(string input) { }
+}
+
+[Controller]
+public abstract class AbstractActionBase
+{
+    public abstract void AbstractAction(string input);
+
+    public void InheritedAction(string input) { }
+
+    [NonAction]
+    public virtual void InheritedNonAction(string input) { }
+}
+
+public class ConcreteActionEndpoint : AbstractActionBase
+{
+    public override void AbstractAction(string input) { }
+
+    public override void InheritedNonAction(string input) { }
+}
+
+public class ActionCasesController : ControllerBase, System.IDisposable
+{
+    public void PublicAction(string input) { }
+
+    public static void StaticAction(string input) { }
+
+    public void GenericAction<T>(T input) { }
+
+    [NonAction]
+    public void ExplicitNonAction(string input) { }
+
+    public override string ToString() => "action cases";
+
+    public void Dispose() { }
+
+    protected void ProtectedAction(string input) { }
+
+    internal void InternalAction(string input) { }
+
+    private void PrivateAction(string input) { }
+}
+
+public class NewDisposeController : Controller
+{
+    public new void Dispose() { }
+}
diff --git a/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCore.expected b/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCore.expected
index e9866698ccdc..428c772add9a 100644
--- a/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCore.expected
+++ b/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCore.expected
@@ -1,7 +1,13 @@
-| AspNetCore.cs:4:14:4:27 | HomeController |
-| AspNetCore.cs:13:14:13:28 | HomeController1 |
-| AspNetCore.cs:22:14:22:28 | HomeController2 |
-| AspNetCore.cs:32:14:32:28 | HomeController3 |
-| AspNetCore.cs:42:14:42:28 | HomeController4 |
-| AspNetCore.cs:51:14:51:28 | HomeController5 |
-| AspNetCore.cs:60:23:60:37 | HomeController6 |
+| AspNetCore.cs:16:14:16:27 | HomeController |
+| AspNetCore.cs:25:14:25:28 | HomeController1 |
+| AspNetCore.cs:34:14:34:28 | HomeController2 |
+| AspNetCore.cs:44:14:44:28 | HomeController3 |
+| AspNetCore.cs:54:14:54:28 | HomeController4 |
+| AspNetCore.cs:63:14:63:28 | HomeController5 |
+| AspNetCore.cs:118:14:118:32 | LowerCasecontroller |
+| AspNetCore.cs:124:14:124:21 | Products |
+| AspNetCore.cs:139:14:139:28 | PlainController |
+| AspNetCore.cs:155:14:155:36 | ClosedGenericController |
+| AspNetCore.cs:171:14:171:35 | ConcreteActionEndpoint |
+| AspNetCore.cs:178:14:178:34 | ActionCasesController |
+| AspNetCore.cs:200:14:200:33 | NewDisposeController |
diff --git a/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCoreActions.expected b/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCoreActions.expected
new file mode 100644
index 000000000000..3ee137abc849
--- /dev/null
+++ b/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCoreActions.expected
@@ -0,0 +1,16 @@
+| AspNetCore.cs:16:14:16:27 | HomeController | AspNetCore.cs:18:19:18:23 | Index |
+| AspNetCore.cs:25:14:25:28 | HomeController1 | AspNetCore.cs:27:19:27:23 | Index |
+| AspNetCore.cs:34:14:34:28 | HomeController2 | AspNetCore.cs:36:19:36:23 | Index |
+| AspNetCore.cs:44:14:44:28 | HomeController3 | AspNetCore.cs:46:19:46:23 | Index |
+| AspNetCore.cs:54:14:54:28 | HomeController4 | AspNetCore.cs:56:19:56:23 | Index |
+| AspNetCore.cs:63:14:63:28 | HomeController5 | AspNetCore.cs:56:19:56:23 | Index |
+| AspNetCore.cs:63:14:63:28 | HomeController5 | AspNetCore.cs:65:19:65:23 | Index |
+| AspNetCore.cs:118:14:118:32 | LowerCasecontroller | AspNetCore.cs:120:17:120:22 | Action |
+| AspNetCore.cs:124:14:124:21 | Products | AspNetCore.cs:126:17:126:20 | List |
+| AspNetCore.cs:139:14:139:28 | PlainController | AspNetCore.cs:141:17:141:26 | BaseAction |
+| AspNetCore.cs:155:14:155:36 | ClosedGenericController | AspNetCore.cs:152:17:152:33 | GenericBaseAction |
+| AspNetCore.cs:155:14:155:36 | ClosedGenericController | AspNetCore.cs:157:17:157:28 | ClosedAction |
+| AspNetCore.cs:171:14:171:35 | ConcreteActionEndpoint | AspNetCore.cs:165:17:165:31 | InheritedAction |
+| AspNetCore.cs:171:14:171:35 | ConcreteActionEndpoint | AspNetCore.cs:173:26:173:39 | AbstractAction |
+| AspNetCore.cs:178:14:178:34 | ActionCasesController | AspNetCore.cs:180:17:180:28 | PublicAction |
+| AspNetCore.cs:200:14:200:33 | NewDisposeController | AspNetCore.cs:202:21:202:27 | Dispose |
diff --git a/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCoreActions.ql b/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCoreActions.ql
new file mode 100644
index 000000000000..f4e927cd0b07
--- /dev/null
+++ b/csharp/ql/test/library-tests/frameworks/microsoft/AspNetCoreActions.ql
@@ -0,0 +1,9 @@
+import csharp
+import semmle.code.csharp.frameworks.microsoft.AspNetCore
+
+from MicrosoftAspNetCoreMvcController controller, Method action
+where
+  controller.fromSource() and
+  action = controller.getAnActionMethod() and
+  action.fromSource()
+select controller, action
diff --git a/csharp/ql/test/library-tests/methods/PrintAst.expected b/csharp/ql/test/library-tests/methods/PrintAst.expected
index 4810c6c0b5b7..f8a673575a12 100644
--- a/csharp/ql/test/library-tests/methods/PrintAst.expected
+++ b/csharp/ql/test/library-tests/methods/PrintAst.expected
@@ -323,7 +323,7 @@ methods.cs:
 #  127|                 1: [StringLiteralUtf16] "22"
 #  127|                 2: [StringLiteralUtf16] "333"
 #  127|                 3: [StringLiteralUtf16] "4444"
-#  128|         1: [ForeachStmt] foreach (... ... in ...) ...
+#  128|         1: [ForEachStmt] foreach (... ... in ...) ...
 #  128|           0: [LocalVariableDeclExpr] String s
 #  128|             0: [TypeMention] string
 #  128|           1: [MethodCall] call to method Slice<String>
diff --git a/csharp/ql/test/library-tests/statements/Foreach1.ql b/csharp/ql/test/library-tests/statements/Foreach1.ql
index 3f70956d9ca6..6f52f23fd988 100644
--- a/csharp/ql/test/library-tests/statements/Foreach1.ql
+++ b/csharp/ql/test/library-tests/statements/Foreach1.ql
@@ -4,5 +4,5 @@
 
 import csharp
 
-where forall(ForeachStmt s | exists(s.getBody()) and exists(s.getIterableExpr()))
+where forall(ForEachStmt s | exists(s.getBody()) and exists(s.getIterableExpr()))
 select 1
diff --git a/csharp/ql/test/library-tests/statements/Foreach3.ql b/csharp/ql/test/library-tests/statements/Foreach3.ql
index 9dfe5ba6a4e9..2ff6a0cdbe68 100644
--- a/csharp/ql/test/library-tests/statements/Foreach3.ql
+++ b/csharp/ql/test/library-tests/statements/Foreach3.ql
@@ -4,7 +4,7 @@
 
 import csharp
 
-from Method m, ForeachStmt s
+from Method m, ForEachStmt s
 where
   m.getName() = "MainForeach" and
   s.getEnclosingCallable() = m and
diff --git a/csharp/ql/test/library-tests/statements/PrintAst.expected b/csharp/ql/test/library-tests/statements/PrintAst.expected
index 59af8ce4a2ea..7709f65b7c3c 100644
--- a/csharp/ql/test/library-tests/statements/PrintAst.expected
+++ b/csharp/ql/test/library-tests/statements/PrintAst.expected
@@ -357,7 +357,7 @@ statements.cs:
 #  139|           -1: [TypeMention] String[]
 #  139|             1: [TypeMention] string
 #  140|       4: [BlockStmt] {...}
-#  141|         0: [ForeachStmt] foreach (... ... in ...) ...
+#  141|         0: [ForEachStmt] foreach (... ... in ...) ...
 #  141|           0: [LocalVariableDeclExpr] String s
 #  141|             0: [TypeMention] string
 #  141|           1: [ParameterAccess] access to parameter args
@@ -501,7 +501,7 @@ statements.cs:
 #  192|     24: [Method] MainYield
 #  192|       -1: [TypeMention] Void
 #  193|       4: [BlockStmt] {...}
-#  194|         0: [ForeachStmt] foreach (... ... in ...) ...
+#  194|         0: [ForEachStmt] foreach (... ... in ...) ...
 #  194|           0: [LocalVariableDeclExpr] Int32 x
 #  194|             0: [TypeMention] int
 #  194|           1: [MethodCall] call to method Range
diff --git a/csharp/ql/test/query-tests/Bad Practices/VirtualCallInConstructorOrDestructor/VirtualCallInConstructorOrDestructor.cs b/csharp/ql/test/query-tests/Bad Practices/VirtualCallInConstructorOrDestructor/VirtualCallInConstructorOrDestructor.cs
index 6db005e00cef..f654c1c0a659 100644
--- a/csharp/ql/test/query-tests/Bad Practices/VirtualCallInConstructorOrDestructor/VirtualCallInConstructorOrDestructor.cs	
+++ b/csharp/ql/test/query-tests/Bad Practices/VirtualCallInConstructorOrDestructor/VirtualCallInConstructorOrDestructor.cs	
@@ -15,6 +15,7 @@ public void f_nonvirtual() { }
         public void f_interface() { }
 
         public virtual int p_virtual { get { return 0; } }
+        public virtual string p_virtual_string { get { return ""; } }
         public virtual int p_sealed { get { return 0; } }
         public int p_nonvirtual { get { return 0; } }
 
@@ -55,11 +56,14 @@ class C : B
             a = f_sealed; // GOOD
             a = f_nonvirtual; // GOOD
             a = f_interface;  // GOOD
+            var f_name = nameof(f_virtual); // GOOD
 
             // Property access
             int i = p_virtual;  // $ Alert // BAD
             i = p_sealed;   // GOOD
             i = p_nonvirtual; // GOOD
+            var p_name = nameof(p_virtual_string); // GOOD
+            var p_length_name = nameof(p_virtual_string.Length); // GOOD
 
             // Indexer access
             i = this[0];  // $ Alert // BAD
diff --git a/csharp/ql/test/query-tests/Bad Practices/VirtualCallInConstructorOrDestructor/VirtualCallInConstructorOrDestructor.expected b/csharp/ql/test/query-tests/Bad Practices/VirtualCallInConstructorOrDestructor/VirtualCallInConstructorOrDestructor.expected
index 8a97e61bf8cf..e2925c9cbd7b 100644
--- a/csharp/ql/test/query-tests/Bad Practices/VirtualCallInConstructorOrDestructor/VirtualCallInConstructorOrDestructor.expected	
+++ b/csharp/ql/test/query-tests/Bad Practices/VirtualCallInConstructorOrDestructor/VirtualCallInConstructorOrDestructor.expected	
@@ -1,5 +1,5 @@
-| VirtualCallInConstructorOrDestructor.cs:45:13:45:23 | call to method f_virtual | Avoid virtual calls in a constructor or destructor. |
-| VirtualCallInConstructorOrDestructor.cs:54:17:54:25 | access to method f_virtual | Avoid virtual calls in a constructor or destructor. |
-| VirtualCallInConstructorOrDestructor.cs:60:21:60:29 | access to property p_virtual | Avoid virtual calls in a constructor or destructor. |
-| VirtualCallInConstructorOrDestructor.cs:65:17:65:23 | access to indexer | Avoid virtual calls in a constructor or destructor. |
-| VirtualCallInConstructorOrDestructor.cs:70:13:70:21 | access to event e_virtual | Avoid virtual calls in a constructor or destructor. |
+| VirtualCallInConstructorOrDestructor.cs:46:13:46:23 | call to method f_virtual | Avoid virtual calls in a constructor or destructor. |
+| VirtualCallInConstructorOrDestructor.cs:55:17:55:25 | access to method f_virtual | Avoid virtual calls in a constructor or destructor. |
+| VirtualCallInConstructorOrDestructor.cs:62:21:62:29 | access to property p_virtual | Avoid virtual calls in a constructor or destructor. |
+| VirtualCallInConstructorOrDestructor.cs:69:17:69:23 | access to indexer | Avoid virtual calls in a constructor or destructor. |
+| VirtualCallInConstructorOrDestructor.cs:74:13:74:21 | access to event e_virtual | Avoid virtual calls in a constructor or destructor. |
diff --git a/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.cs b/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.cs
index 03a6644fe800..23ba1a655d05 100644
--- a/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.cs	
+++ b/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.cs	
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 public class DeadStoreOfLocal
 {
@@ -484,3 +485,16 @@ void Pi()
         Console.WriteLine($"Pi, {pi,align:F3}");
     }
 }
+
+class LinqFields
+{
+    private readonly IEnumerable<int> QueryBackedField =
+        from x1 in new[] { 1, 2, 3 }
+        where x1 > 1
+        select x1; // GOOD: The query range variable is used by the LINQ expression.
+
+    public static readonly IEnumerable<int> StaticQueryBackedField =
+        from x2 in new[] { 1, 2, 3 }
+        where x2 > 1
+        select x2; // GOOD: The query range variable is used by the LINQ expression.
+}
diff --git a/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.expected b/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.expected
index 2073fce06a77..27ddb157eca3 100644
--- a/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.expected	
+++ b/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.expected	
@@ -1,19 +1,19 @@
-| DeadStoreOfLocal.cs:12:13:12:20 | Int32 x = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:12:13:12:13 | x | x |
-| DeadStoreOfLocal.cs:19:21:19:25 | ... = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:18:13:18:13 | x | x |
-| DeadStoreOfLocal.cs:44:13:44:20 | Int32 x = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:44:13:44:13 | x | x |
-| DeadStoreOfLocal.cs:50:9:50:14 | ... += ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:49:13:49:13 | x | x |
-| DeadStoreOfLocal.cs:56:9:56:11 | ...++ | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:55:13:55:13 | x | x |
-| DeadStoreOfLocal.cs:82:22:82:24 | String val | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:82:22:82:24 | val | val |
-| DeadStoreOfLocal.cs:101:13:101:37 | ... = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:94:40:94:44 | extra | extra |
-| DeadStoreOfLocal.cs:104:13:104:37 | ... = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:94:16:94:20 | info1 | info1 |
-| DeadStoreOfLocal.cs:142:26:142:27 | Exception ex | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:142:26:142:27 | ex | ex |
-| DeadStoreOfLocal.cs:246:17:246:24 | Int32 y = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:246:17:246:17 | y | y |
-| DeadStoreOfLocal.cs:261:17:261:21 | Int32 x = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:261:17:261:17 | x | x |
-| DeadStoreOfLocal.cs:300:23:300:28 | Object v1 | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:300:27:300:28 | v1 | v1 |
-| DeadStoreOfLocal.cs:314:18:314:23 | Object v2 | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:314:22:314:23 | v2 | v2 |
-| DeadStoreOfLocal.cs:331:9:331:32 | ... = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:327:23:327:23 | b | b |
-| DeadStoreOfLocal.cs:372:13:372:20 | String s = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:372:13:372:13 | s | s |
-| DeadStoreOfLocal.cs:472:20:472:76 | FileStream y = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:472:20:472:20 | y | y |
+| DeadStoreOfLocal.cs:13:13:13:20 | Int32 x = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:13:13:13:13 | x | x |
+| DeadStoreOfLocal.cs:20:21:20:25 | ... = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:19:13:19:13 | x | x |
+| DeadStoreOfLocal.cs:45:13:45:20 | Int32 x = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:45:13:45:13 | x | x |
+| DeadStoreOfLocal.cs:51:9:51:14 | ... += ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:50:13:50:13 | x | x |
+| DeadStoreOfLocal.cs:57:9:57:11 | ...++ | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:56:13:56:13 | x | x |
+| DeadStoreOfLocal.cs:83:22:83:24 | String val | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:83:22:83:24 | val | val |
+| DeadStoreOfLocal.cs:102:13:102:37 | ... = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:95:40:95:44 | extra | extra |
+| DeadStoreOfLocal.cs:105:13:105:37 | ... = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:95:16:95:20 | info1 | info1 |
+| DeadStoreOfLocal.cs:143:26:143:27 | Exception ex | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:143:26:143:27 | ex | ex |
+| DeadStoreOfLocal.cs:247:17:247:24 | Int32 y = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:247:17:247:17 | y | y |
+| DeadStoreOfLocal.cs:262:17:262:21 | Int32 x = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:262:17:262:17 | x | x |
+| DeadStoreOfLocal.cs:301:23:301:28 | Object v1 | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:301:27:301:28 | v1 | v1 |
+| DeadStoreOfLocal.cs:315:18:315:23 | Object v2 | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:315:22:315:23 | v2 | v2 |
+| DeadStoreOfLocal.cs:332:9:332:32 | ... = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:328:23:328:23 | b | b |
+| DeadStoreOfLocal.cs:373:13:373:20 | String s = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:373:13:373:13 | s | s |
+| DeadStoreOfLocal.cs:473:20:473:76 | FileStream y = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:473:20:473:20 | y | y |
 | DeadStoreOfLocalBad.cs:7:13:7:48 | Boolean success = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocalBad.cs:7:13:7:19 | success | success |
 | DeadStoreOfLocalBad.cs:23:32:23:32 | FormatException e | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocalBad.cs:23:32:23:32 | e | e |
 | DeadStoreOfLocalBad.cs:32:22:32:22 | String s | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocalBad.cs:32:22:32:22 | s | s |
diff --git a/csharp/ql/test/query-tests/Language Abuse/SimplifyBoolExpr/SimplifyBoolExpr.cs b/csharp/ql/test/query-tests/Language Abuse/SimplifyBoolExpr/SimplifyBoolExpr.cs
index 175507010a13..388b07a5a8d8 100644
--- a/csharp/ql/test/query-tests/Language Abuse/SimplifyBoolExpr/SimplifyBoolExpr.cs	
+++ b/csharp/ql/test/query-tests/Language Abuse/SimplifyBoolExpr/SimplifyBoolExpr.cs	
@@ -44,5 +44,8 @@ void Fn()
         if (true != false) ;
         if (true && true) ;
         if (true || false) ;
+
+        bool? boption = false;
+        if (boption == true) ; // GOOD. Can't be simplified like a regular bool
     }
 }
diff --git a/csharp/ql/test/query-tests/Linq/MissedAllOpportunity/MissedAllOpportunity.cs b/csharp/ql/test/query-tests/Linq/MissedAllOpportunity/MissedAllOpportunity.cs
new file mode 100644
index 000000000000..4b09d8bd6409
--- /dev/null
+++ b/csharp/ql/test/query-tests/Linq/MissedAllOpportunity/MissedAllOpportunity.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+class MissedAllOpportunity
+{
+    public void M1(List<int> lst)
+    {
+        // BAD: Can be replaced with lst.All(e => e % 2 == 0)
+        var allEven = true;
+        foreach (int i in lst)
+        {
+            if (i % 2 != 0)
+            {
+                allEven = false;
+                break;
+            }
+        } // $ Alert
+    }
+
+    public void M2(NonEnumerableClass nec)
+    {
+        // GOOD: Linq can't be used here.
+        var allEven = true;
+        foreach (int i in nec)
+        {
+            if (i % 2 != 0)
+            {
+                allEven = false;
+                break;
+            }
+        }
+    }
+
+    public void M3(List<int> lst, ref int x)
+    {
+        // GOOD: Linq can't be used here because the condition uses a ref parameter.
+        var allEven = true;
+        foreach (int i in lst)
+        {
+            if (i % 2 != x)
+            {
+                allEven = false;
+                break;
+            }
+        }
+    }
+
+    public class NonEnumerableClass
+    {
+        public IEnumerator<int> GetEnumerator() => throw null;
+    }
+}
diff --git a/csharp/ql/test/query-tests/Linq/MissedAllOpportunity/MissedAllOpportunity.expected b/csharp/ql/test/query-tests/Linq/MissedAllOpportunity/MissedAllOpportunity.expected
new file mode 100644
index 000000000000..b4300f8caf07
--- /dev/null
+++ b/csharp/ql/test/query-tests/Linq/MissedAllOpportunity/MissedAllOpportunity.expected
@@ -0,0 +1 @@
+| MissedAllOpportunity.cs:11:9:18:9 | foreach (... ... in ...) ... | This foreach loop looks as if it might be testing whether every sequence element satisfies a predicate - consider using '.All(...)'. |
diff --git a/csharp/ql/test/query-tests/Linq/MissedAllOpportunity/MissedAllOpportunity.qlref b/csharp/ql/test/query-tests/Linq/MissedAllOpportunity/MissedAllOpportunity.qlref
new file mode 100644
index 000000000000..689d5fbb60a4
--- /dev/null
+++ b/csharp/ql/test/query-tests/Linq/MissedAllOpportunity/MissedAllOpportunity.qlref
@@ -0,0 +1,2 @@
+query: Linq/MissedAllOpportunity.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/csharp/ql/test/query-tests/Linq/MissedAllOpportunity/options b/csharp/ql/test/query-tests/Linq/MissedAllOpportunity/options
new file mode 100644
index 000000000000..75c39b4541ba
--- /dev/null
+++ b/csharp/ql/test/query-tests/Linq/MissedAllOpportunity/options
@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
diff --git a/csharp/ql/test/query-tests/Linq/MissedFirstOrDefaultOpportunity/MissedFirstOrDefaultOpportunity.cs b/csharp/ql/test/query-tests/Linq/MissedFirstOrDefaultOpportunity/MissedFirstOrDefaultOpportunity.cs
new file mode 100644
index 000000000000..84824efee4bc
--- /dev/null
+++ b/csharp/ql/test/query-tests/Linq/MissedFirstOrDefaultOpportunity/MissedFirstOrDefaultOpportunity.cs
@@ -0,0 +1,203 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+class MissedFirstOrDefaultOpportunity
+{
+    public Operation M1(IEnumerable<Operation> operations, string operationId)
+    {
+        // BAD: Can be replaced with operations.FirstOrDefault(operation => ...).
+        foreach (var operation in operations)
+        {
+            if (string.Equals(operation.OperationId, operationId, StringComparison.Ordinal))
+                return operation;
+        } // $ Alert
+
+        return null;
+    }
+
+    public int M2(IEnumerable<int> values)
+    {
+        // BAD: Can be replaced with values.FirstOrDefault(value => ...).
+        foreach (var value in values)
+        {
+            if (value > 0)
+            {
+                return value;
+            }
+        } // $ Alert
+
+        return default;
+    }
+
+    public int? M3(List<int> values)
+    {
+        // BAD: Can be replaced with values.FirstOrDefault(value => ...).
+        foreach (var value in values)
+        {
+            if (value > 0)
+                return value;
+        } // $ Alert
+
+        return default(int);
+    }
+
+    public Operation M4(IEnumerable<Operation> operations, string operationId)
+    {
+        // GOOD: FirstOrDefault does not throw when a match is found.
+        foreach (var operation in operations)
+        {
+            if (string.Equals(operation.OperationId, operationId, StringComparison.Ordinal))
+                throw new InvalidOperationException();
+        }
+
+        return null;
+    }
+
+    public Operation M5(IEnumerable<Operation> operations, string operationId)
+    {
+        // GOOD: FirstOrDefault would return null/default when no match is found.
+        foreach (var operation in operations)
+        {
+            if (string.Equals(operation.OperationId, operationId, StringComparison.Ordinal))
+                return operation;
+        }
+
+        return new Operation();
+    }
+
+    public string M6(IEnumerable<Operation> operations, string operationId)
+    {
+        // GOOD: FirstOrDefault would return the matching operation, not one of its properties.
+        foreach (var operation in operations)
+        {
+            if (string.Equals(operation.OperationId, operationId, StringComparison.Ordinal))
+                return operation.OperationId;
+        }
+
+        return null;
+    }
+
+    public Operation M7(IEnumerable<Operation> operations, string operationId)
+    {
+        // GOOD: The matched case has an additional side effect.
+        foreach (var operation in operations)
+        {
+            if (string.Equals(operation.OperationId, operationId, StringComparison.Ordinal))
+            {
+                Console.WriteLine(operation.OperationId);
+                return operation;
+            }
+        }
+
+        return null;
+    }
+
+    public async Task<Operation> M8(IEnumerable<Operation> operations, string operationId)
+    {
+        // GOOD: FirstOrDefault does not support an async predicate.
+        foreach (var operation in operations)
+        {
+            if (await IsMatch(operation, operationId))
+                return operation;
+        }
+
+        return null;
+    }
+
+    public Operation M9(IEnumerable<Operation> operations, string operationId)
+    {
+        // GOOD: FirstOrDefault does not have an equivalent for an else branch in the loop.
+        foreach (var operation in operations)
+        {
+            if (string.Equals(operation.OperationId, operationId, StringComparison.Ordinal))
+                return operation;
+            else
+                return null;
+        }
+
+        return null;
+    }
+
+    public object M10(IEnumerable<int> values)
+    {
+        // GOOD: FirstOrDefault would return boxed 0 when no match is found, not null.
+        foreach (var value in values)
+        {
+            if (value > 0)
+                return value;
+        }
+
+        return null;
+    }
+
+    public object M11(IEnumerable<int> values)
+    {
+        // GOOD: FirstOrDefault would return boxed 0 when no match is found, not default(object).
+        foreach (var value in values)
+        {
+            if (value > 0)
+                return value;
+        }
+
+        return default(object);
+    }
+
+    public object M12(IEnumerable<string> values)
+    {
+        // BAD: FirstOrDefault returns null for missing reference-type elements, matching the fallback.
+        foreach (var value in values)
+        {
+            if (value.Length > 0)
+                return value;
+        } // $ Alert
+
+        return null;
+    }
+
+    public object M13(IEnumerable<int> values)
+    {
+        // BAD: FirstOrDefault returns 0 for missing int elements, matching the fallback before boxing.
+        foreach (var value in values)
+        {
+            if (value > 0)
+                return value;
+        } // $ Alert
+
+        return default(int);
+    }
+
+    public Operation M14(IEnumerable<Operation> operations, Func<string, bool>[] predicates)
+    {
+        // GOOD: Ignore the corner case where the foreach variable is captured by a nested lambda.
+        foreach (var operation in operations)
+        {
+            if (Array.Exists(predicates, predicate => predicate(operation.OperationId)))
+                return operation;
+        }
+
+        return null;
+    }
+
+    public int M15(IEnumerable<int> values, ref readonly int x)
+    {
+        // GOOD: FirstOrDefault does not support a predicate that captures a ref parameter.
+        foreach (var value in values)
+        {
+            if (value > x)
+            {
+                return value;
+            }
+        }
+
+        return default;
+    }
+
+    private static Task<bool> IsMatch(Operation operation, string operationId) =>
+        Task.FromResult(string.Equals(operation.OperationId, operationId, StringComparison.Ordinal));
+}
+
+class Operation
+{
+    public string OperationId { get; set; }
+}
diff --git a/csharp/ql/test/query-tests/Linq/MissedFirstOrDefaultOpportunity/MissedFirstOrDefaultOpportunity.expected b/csharp/ql/test/query-tests/Linq/MissedFirstOrDefaultOpportunity/MissedFirstOrDefaultOpportunity.expected
new file mode 100644
index 000000000000..b4cfdff5fdd9
--- /dev/null
+++ b/csharp/ql/test/query-tests/Linq/MissedFirstOrDefaultOpportunity/MissedFirstOrDefaultOpportunity.expected
@@ -0,0 +1,5 @@
+| MissedFirstOrDefaultOpportunity.cs:10:9:14:9 | foreach (... ... in ...) ... | This foreach loop returns the first sequence element satisfying a $@ - consider finding the element explicitly using '.FirstOrDefault(...)'. | MissedFirstOrDefaultOpportunity.cs:12:17:12:91 | call to method Equals | predicate |
+| MissedFirstOrDefaultOpportunity.cs:22:9:28:9 | foreach (... ... in ...) ... | This foreach loop returns the first sequence element satisfying a $@ - consider finding the element explicitly using '.FirstOrDefault(...)'. | MissedFirstOrDefaultOpportunity.cs:24:17:24:25 | ... > ... | predicate |
+| MissedFirstOrDefaultOpportunity.cs:36:9:40:9 | foreach (... ... in ...) ... | This foreach loop returns the first sequence element satisfying a $@ - consider finding the element explicitly using '.FirstOrDefault(...)'. | MissedFirstOrDefaultOpportunity.cs:38:17:38:25 | ... > ... | predicate |
+| MissedFirstOrDefaultOpportunity.cs:149:9:153:9 | foreach (... ... in ...) ... | This foreach loop returns the first sequence element satisfying a $@ - consider finding the element explicitly using '.FirstOrDefault(...)'. | MissedFirstOrDefaultOpportunity.cs:151:17:151:32 | ... > ... | predicate |
+| MissedFirstOrDefaultOpportunity.cs:161:9:165:9 | foreach (... ... in ...) ... | This foreach loop returns the first sequence element satisfying a $@ - consider finding the element explicitly using '.FirstOrDefault(...)'. | MissedFirstOrDefaultOpportunity.cs:163:17:163:25 | ... > ... | predicate |
diff --git a/csharp/ql/test/query-tests/Linq/MissedFirstOrDefaultOpportunity/MissedFirstOrDefaultOpportunity.qlref b/csharp/ql/test/query-tests/Linq/MissedFirstOrDefaultOpportunity/MissedFirstOrDefaultOpportunity.qlref
new file mode 100644
index 000000000000..91cc5ae4d348
--- /dev/null
+++ b/csharp/ql/test/query-tests/Linq/MissedFirstOrDefaultOpportunity/MissedFirstOrDefaultOpportunity.qlref
@@ -0,0 +1,2 @@
+query: Linq/MissedFirstOrDefaultOpportunity.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/csharp/ql/test/query-tests/Linq/MissedSelectOpportunity/MissedSelectOpportunity.cs b/csharp/ql/test/query-tests/Linq/MissedSelectOpportunity/MissedSelectOpportunity.cs
index 9655a5a0fa9c..0a958d3e50d8 100644
--- a/csharp/ql/test/query-tests/Linq/MissedSelectOpportunity/MissedSelectOpportunity.cs
+++ b/csharp/ql/test/query-tests/Linq/MissedSelectOpportunity/MissedSelectOpportunity.cs
@@ -25,6 +25,17 @@ public async Task M2(IEnumerable<ICounter> counters)
         }
     }
 
+    public void M3(List<int> lst, out int x)
+    {
+        // GOOD: Linq can't be used here as the Select would capture an out parameter.
+        x = 2;
+        foreach (int i in lst)
+        {
+            int j = i * x;
+            Console.WriteLine(j);
+        }
+    }
+
     public interface ICounter
     {
         Task<int> CountAsync();
diff --git a/csharp/ql/test/query-tests/Linq/MissedWhereOpportunity/MissedWhereOpportunity.cs b/csharp/ql/test/query-tests/Linq/MissedWhereOpportunity/MissedWhereOpportunity.cs
index 0fee1e9c48ff..b3575473eab9 100644
--- a/csharp/ql/test/query-tests/Linq/MissedWhereOpportunity/MissedWhereOpportunity.cs
+++ b/csharp/ql/test/query-tests/Linq/MissedWhereOpportunity/MissedWhereOpportunity.cs
@@ -76,6 +76,116 @@ public void M5(IEnumerable<int> elements)
         } // $ Alert
     }
 
+    public int M6(IEnumerable<int> elements)
+    {
+        // GOOD: The filtered case returns from the method instead of continuing the loop.
+        foreach (var element in elements)
+        {
+            if (element.GetHashCode() % 2 == 0)
+            {
+                return element;
+            }
+        }
+
+        return 0;
+    }
+
+    public IEnumerable<int> M7(IEnumerable<int> elements)
+    {
+        // GOOD: The filtered case exits the iterator instead of continuing the loop.
+        foreach (var element in elements)
+        {
+            if (element.GetHashCode() % 2 == 0)
+            {
+                yield break;
+            }
+        }
+    }
+
+    public void M8(IEnumerable<int> elements)
+    {
+        // GOOD: The filtered case throws instead of continuing the loop.
+        foreach (var element in elements)
+        {
+            if (element.GetHashCode() % 2 == 0)
+            {
+                throw new InvalidOperationException();
+            }
+        }
+    }
+
+    public IEnumerable<int> M9(IEnumerable<int> elements)
+    {
+        // BAD: A yield return does not exit the iterator, so the loop still filters yielded values.
+        foreach (var element in elements)
+        {
+            if (element.GetHashCode() % 2 == 0)
+            {
+                yield return element;
+            }
+        } // $ Alert
+    }
+
+    public int M10(IEnumerable<int> elements)
+    {
+        // GOOD: The filtered case ends with a return from the method instead of continuing the loop.
+        foreach (var element in elements)
+        {
+            if (element.GetHashCode() % 2 == 0)
+            {
+                Console.WriteLine(element);
+                return element;
+            }
+        }
+
+        return 0;
+    }
+
+    public int M11(IEnumerable<int> elements)
+    {
+        // GOOD: Both nested filtered cases return from the method instead of continuing the loop.
+        foreach (var element in elements)
+        {
+            if (element.GetHashCode() % 2 == 0)
+            {
+                if (element > 10)
+                {
+                    return element;
+                }
+                else
+                {
+                    return 10;
+                }
+            }
+        }
+
+        return 0;
+    }
+
+    public void M12(IEnumerable<int> elements)
+    {
+        // GOOD: The filtered case exits the loop instead of continuing with filtered loop work.
+        foreach (var element in elements)
+        {
+            if (element.GetHashCode() % 2 == 0)
+            {
+                break;
+            }
+        }
+    }
+
+    public void M13(List<int> lst, in int x)
+    {
+        // GOOD: Linq can't be used here because the condition uses an in parameter.
+        foreach (int i in lst)
+        {
+            if (i % 2 != x)
+                continue;
+            Console.WriteLine(i);
+            Console.WriteLine((i / 2));
+        }
+    }
+
     public class NonEnumerableClass
     {
         public IEnumerator<int> GetEnumerator() => throw null;
diff --git a/csharp/ql/test/query-tests/Linq/MissedWhereOpportunity/MissedWhereOpportunity.expected b/csharp/ql/test/query-tests/Linq/MissedWhereOpportunity/MissedWhereOpportunity.expected
index 5efde9aebedc..8b9398292ef2 100644
--- a/csharp/ql/test/query-tests/Linq/MissedWhereOpportunity/MissedWhereOpportunity.expected
+++ b/csharp/ql/test/query-tests/Linq/MissedWhereOpportunity/MissedWhereOpportunity.expected
@@ -2,3 +2,4 @@
 | MissedWhereOpportunity.cs:19:9:26:9 | foreach (... ... in ...) ... | This foreach loop $@ - consider filtering the sequence explicitly using '.Where(...)'. | MissedWhereOpportunity.cs:21:17:21:26 | ... == ... | implicitly filters its target sequence |
 | MissedWhereOpportunity.cs:45:9:52:9 | foreach (... ... in ...) ... | This foreach loop $@ - consider filtering the sequence explicitly using '.Where(...)'. | MissedWhereOpportunity.cs:47:17:47:26 | ... == ... | implicitly filters its target sequence |
 | MissedWhereOpportunity.cs:70:9:76:9 | foreach (... ... in ...) ... | This foreach loop $@ - consider filtering the sequence explicitly using '.Where(...)'. | MissedWhereOpportunity.cs:72:17:72:46 | ... == ... | implicitly filters its target sequence |
+| MissedWhereOpportunity.cs:120:9:126:9 | foreach (... ... in ...) ... | This foreach loop $@ - consider filtering the sequence explicitly using '.Where(...)'. | MissedWhereOpportunity.cs:122:17:122:46 | ... == ... | implicitly filters its target sequence |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/RazorTagHelperAttribute.cshtml b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/RazorTagHelperAttribute.cshtml
new file mode 100644
index 000000000000..8b1a393741c9
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/RazorTagHelperAttribute.cshtml	
@@ -0,0 +1 @@
+// empty
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/RazorTagHelperAttribute.cshtml.g.cs b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/RazorTagHelperAttribute.cshtml.g.cs
new file mode 100644
index 000000000000..12c2b389709a
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/RazorTagHelperAttribute.cshtml.g.cs	
@@ -0,0 +1,89 @@
+// A hand-written test file that mimics the output of compiling a `.cshtml` file that has an
+// element with a tag helper (e.g. `asp-for`) and an HTML attribute whose value contains a
+// tainted expression, for example: <input asp-for="Value" value="@Model.Value">
+#pragma checksum "RazorTagHelperAttribute.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "c4ae76542f1958092cebd8f57beef899d20fc548"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(dotnetweb.Pages.Pages_RazorTagHelperAttribute), @"mvc.1.0.razor-page", @"RazorTagHelperAttribute.cshtml")]
+namespace dotnetweb.Pages
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#nullable restore
+using dotnetweb;
+
+#line default
+#line hidden
+#nullable disable
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"c4ae76542f1958092cebd8f57beef899d20fc548", @"RazorTagHelperAttribute.cshtml")]
+    public class Pages_RazorTagHelperAttribute : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#nullable restore
+#line 3 "RazorTagHelperAttribute.cshtml"
+  
+    var model = Request.Query["m"]; // $ Source=model
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("<input type=\"text\" ");
+            // GOOD: this `WriteLiteral` call is generated for the value of an HTML attribute on
+            // an element with a tag helper (e.g. `asp-for`). It writes into an internal string
+            // buffer via `BeginWriteTagHelperAttribute()`/`EndWriteTagHelperAttribute()`, and the
+            // buffered text is HTML-attribute-encoded later, when the tag helper attribute value
+            // is rendered. It is not a direct, unencoded write, so it must not be flagged.
+            BeginWriteTagHelperAttribute();
+            WriteLiteral(model);
+            var __tagHelperAttribute_1 = EndWriteTagHelperAttribute();
+            WriteLiteral(" />");
+
+            // BAD: a `WriteLiteral` call that is not bracketed by
+            // `BeginWriteTagHelperAttribute()`/`EndWriteTagHelperAttribute()` writes directly,
+            // unencoded, to the response and must still be flagged.
+            WriteLiteral(model); // $ Alert=model
+
+            // GOOD: two independent tag helper attribute brackets that occur one after another
+            // in the same basic block must each be matched with their own nearest
+            // `Begin`/`EndWriteTagHelperAttribute` call, and neither should leak into the other.
+            BeginWriteTagHelperAttribute();
+            WriteLiteral("literal-prefix-");
+            var __tagHelperAttribute_2 = EndWriteTagHelperAttribute();
+            BeginWriteTagHelperAttribute();
+            WriteLiteral(model);
+            var __tagHelperAttribute_3 = EndWriteTagHelperAttribute();
+
+            // BAD: a bare `WriteLiteral` call sandwiched between two unrelated tag helper
+            // attribute brackets, in the same basic block, must not be mistaken for being
+            // captured by either neighboring bracket.
+            BeginWriteTagHelperAttribute();
+            WriteLiteral("prefix");
+            var __tagHelperAttribute_4 = EndWriteTagHelperAttribute();
+            WriteLiteral(model); // $ Alert=model
+            BeginWriteTagHelperAttribute();
+            WriteLiteral("suffix");
+            var __tagHelperAttribute_5 = EndWriteTagHelperAttribute();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<string> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<string> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<string>)PageContext?.ViewData;
+    }
+}
+#pragma warning restore 1591
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.expected b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.expected
index fe184fdff75a..f560bb101456 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.expected	
@@ -1,5 +1,7 @@
 #select
 | Index.cshtml:14:16:14:22 | call to operator implicit conversion | Index.cshtml:5:19:5:31 | access to property Query : IQueryCollection | Index.cshtml:14:16:14:22 | call to operator implicit conversion | $@ flows to here and is written to HTML or JavaScript: Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper.Raw() method. | Index.cshtml:5:19:5:31 | access to property Query : IQueryCollection | User-provided value |
+| RazorTagHelperAttribute.cshtml.g.cs:52:26:52:30 | call to operator implicit conversion | RazorTagHelperAttribute.cshtml:4:17:4:29 | access to property Query : IQueryCollection | RazorTagHelperAttribute.cshtml.g.cs:52:26:52:30 | call to operator implicit conversion | $@ flows to here and is written to HTML or JavaScript: Microsoft.AspNetCore.Mvc.Razor.RazorPageBase.WriteLiteral() method. | RazorTagHelperAttribute.cshtml:4:17:4:29 | access to property Query : IQueryCollection | User-provided value |
+| RazorTagHelperAttribute.cshtml.g.cs:70:26:70:30 | call to operator implicit conversion | RazorTagHelperAttribute.cshtml:4:17:4:29 | access to property Query : IQueryCollection | RazorTagHelperAttribute.cshtml.g.cs:70:26:70:30 | call to operator implicit conversion | $@ flows to here and is written to HTML or JavaScript: Microsoft.AspNetCore.Mvc.Razor.RazorPageBase.WriteLiteral() method. | RazorTagHelperAttribute.cshtml:4:17:4:29 | access to property Query : IQueryCollection | User-provided value |
 | XSSAspNet.cs:26:30:26:34 | access to local variable sayHi | XSSAspNet.cs:19:25:19:43 | access to property QueryString : NameValueCollection | XSSAspNet.cs:26:30:26:34 | access to local variable sayHi | $@ flows to here and is written to HTML or JavaScript: System.Web.WebPages.WebPage.WriteLiteral() method. | XSSAspNet.cs:19:25:19:43 | access to property QueryString : NameValueCollection | User-provided value |
 | XSSAspNet.cs:36:40:36:44 | access to local variable sayHi | XSSAspNet.cs:19:25:19:43 | access to property QueryString : NameValueCollection | XSSAspNet.cs:36:40:36:44 | access to local variable sayHi | $@ flows to here and is written to HTML or JavaScript: System.Web.WebPages.WebPage.WriteLiteralTo() method. | XSSAspNet.cs:19:25:19:43 | access to property QueryString : NameValueCollection | User-provided value |
 | XSSAspNet.cs:44:28:44:33 | access to local variable sayHi2 | XSSAspNet.cs:43:26:43:44 | access to property QueryString : NameValueCollection | XSSAspNet.cs:44:28:44:33 | access to local variable sayHi2 | $@ flows to here and is written to HTML or JavaScript. | XSSAspNet.cs:43:26:43:44 | access to property QueryString : NameValueCollection | User-provided value |
@@ -13,6 +15,9 @@
 edges
 | Index.cshtml:5:9:5:15 | access to local variable message : StringValues | Index.cshtml:14:16:14:22 | call to operator implicit conversion | provenance |  |
 | Index.cshtml:5:19:5:31 | access to property Query : IQueryCollection | Index.cshtml:5:9:5:15 | access to local variable message : StringValues | provenance |  |
+| RazorTagHelperAttribute.cshtml:4:9:4:13 | access to local variable model : StringValues | RazorTagHelperAttribute.cshtml.g.cs:52:26:52:30 | call to operator implicit conversion | provenance |  |
+| RazorTagHelperAttribute.cshtml:4:9:4:13 | access to local variable model : StringValues | RazorTagHelperAttribute.cshtml.g.cs:70:26:70:30 | call to operator implicit conversion | provenance |  |
+| RazorTagHelperAttribute.cshtml:4:17:4:29 | access to property Query : IQueryCollection | RazorTagHelperAttribute.cshtml:4:9:4:13 | access to local variable model : StringValues | provenance |  |
 | XSSAspNet.cs:19:17:19:21 | access to local variable sayHi : String | XSSAspNet.cs:26:30:26:34 | access to local variable sayHi | provenance |  |
 | XSSAspNet.cs:19:17:19:21 | access to local variable sayHi : String | XSSAspNet.cs:36:40:36:44 | access to local variable sayHi | provenance |  |
 | XSSAspNet.cs:19:25:19:43 | access to property QueryString : NameValueCollection | XSSAspNet.cs:19:17:19:21 | access to local variable sayHi : String | provenance |  |
@@ -49,6 +54,10 @@ nodes
 | Index.cshtml:5:9:5:15 | access to local variable message : StringValues | semmle.label | access to local variable message : StringValues |
 | Index.cshtml:5:19:5:31 | access to property Query : IQueryCollection | semmle.label | access to property Query : IQueryCollection |
 | Index.cshtml:14:16:14:22 | call to operator implicit conversion | semmle.label | call to operator implicit conversion |
+| RazorTagHelperAttribute.cshtml.g.cs:52:26:52:30 | call to operator implicit conversion | semmle.label | call to operator implicit conversion |
+| RazorTagHelperAttribute.cshtml.g.cs:70:26:70:30 | call to operator implicit conversion | semmle.label | call to operator implicit conversion |
+| RazorTagHelperAttribute.cshtml:4:9:4:13 | access to local variable model : StringValues | semmle.label | access to local variable model : StringValues |
+| RazorTagHelperAttribute.cshtml:4:17:4:29 | access to property Query : IQueryCollection | semmle.label | access to property Query : IQueryCollection |
 | XSSAspNet.cs:19:17:19:21 | access to local variable sayHi : String | semmle.label | access to local variable sayHi : String |
 | XSSAspNet.cs:19:25:19:43 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
 | XSSAspNet.cs:19:25:19:52 | access to indexer : String | semmle.label | access to indexer : String |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-089/SqlInjection.cs b/csharp/ql/test/query-tests/Security Features/CWE-089/SqlInjection.cs
index e7dd2f732603..a35dddb5b662 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-089/SqlInjection.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-089/SqlInjection.cs	
@@ -139,4 +139,6 @@ public async Task<IActionResult> GetUserById([FromRoute] string userId, Cancella
             return Ok();
         }
     }
+
+    public class ConcreteController : MyController { }
 }
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/disabled-require-antiforgery/MissingAntiForgeryTokenValidation.cs b/csharp/ql/test/query-tests/Security Features/CWE-352/disabled-require-antiforgery/MissingAntiForgeryTokenValidation.cs
new file mode 100644
index 000000000000..32a6e8326555
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-352/disabled-require-antiforgery/MissingAntiForgeryTokenValidation.cs	
@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Mvc;
+
+public class HomeController : Controller
+{
+    [HttpPost]
+    [RequireAntiforgeryToken(false)]
+    public ActionResult DisabledValidation()
+    {
+        return View();
+    }
+
+    [HttpPost]
+    public ActionResult MissingValidation()
+    {
+        return View();
+    }
+}
+
+public class Startup
+{
+    public void Configure(IApplicationBuilder app)
+    {
+        app.UseAntiforgery();
+    }
+}
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/disabled-require-antiforgery/MissingAntiForgeryTokenValidation.expected b/csharp/ql/test/query-tests/Security Features/CWE-352/disabled-require-antiforgery/MissingAntiForgeryTokenValidation.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/disabled-require-antiforgery/MissingAntiForgeryTokenValidation.qlref b/csharp/ql/test/query-tests/Security Features/CWE-352/disabled-require-antiforgery/MissingAntiForgeryTokenValidation.qlref
new file mode 100644
index 000000000000..5e1ab2426c65
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-352/disabled-require-antiforgery/MissingAntiForgeryTokenValidation.qlref	
@@ -0,0 +1 @@
+query: Security Features/CWE-352/MissingAntiForgeryTokenValidation.ql
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/disabled-require-antiforgery/options b/csharp/ql/test/query-tests/Security Features/CWE-352/disabled-require-antiforgery/options
new file mode 100644
index 000000000000..698ad488b6d4
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-352/disabled-require-antiforgery/options	
@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/global-aspnetcore/MissingAntiForgeryTokenValidation.cs b/csharp/ql/test/query-tests/Security Features/CWE-352/global-aspnetcore/MissingAntiForgeryTokenValidation.cs
new file mode 100644
index 000000000000..438ad03f3200
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-352/global-aspnetcore/MissingAntiForgeryTokenValidation.cs	
@@ -0,0 +1,39 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+public class HomeController : Controller
+{
+    // GOOD: This is validated by the global filter.
+    [HttpPost]
+    public ActionResult Login()
+    {
+        return View();
+    }
+
+    // GOOD: Antiforgery token is validated explicitly.
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public ActionResult UpdateDetails()
+    {
+        return View();
+    }
+}
+
+public class Program
+{
+    public static void Main(string[] args)
+    {
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Register MVC controllers and Razor views.
+        // The global filter automatically validates antiforgery tokens
+        // for unsafe HTTP methods such as POST, PUT, PATCH, and DELETE.
+        builder.Services.AddControllersWithViews(options =>
+        {
+            options.Filters.Add(new AutoValidateAntiforgeryTokenAttribute());
+        });
+    }
+}
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/global-aspnetcore/MissingAntiForgeryTokenValidation.expected b/csharp/ql/test/query-tests/Security Features/CWE-352/global-aspnetcore/MissingAntiForgeryTokenValidation.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/global-aspnetcore/MissingAntiForgeryTokenValidation.qlref b/csharp/ql/test/query-tests/Security Features/CWE-352/global-aspnetcore/MissingAntiForgeryTokenValidation.qlref
new file mode 100644
index 000000000000..5e1ab2426c65
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-352/global-aspnetcore/MissingAntiForgeryTokenValidation.qlref	
@@ -0,0 +1 @@
+query: Security Features/CWE-352/MissingAntiForgeryTokenValidation.ql
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/global-aspnetcore/options b/csharp/ql/test/query-tests/Security Features/CWE-352/global-aspnetcore/options
new file mode 100644
index 000000000000..698ad488b6d4
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-352/global-aspnetcore/options	
@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/missing-aspnetcore/MissingAntiForgeryTokenValidation.cs b/csharp/ql/test/query-tests/Security Features/CWE-352/missing-aspnetcore/MissingAntiForgeryTokenValidation.cs
index febc12a61255..123ac0f7ec26 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-352/missing-aspnetcore/MissingAntiForgeryTokenValidation.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-352/missing-aspnetcore/MissingAntiForgeryTokenValidation.cs	
@@ -1,7 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Builder;
 
 public class HomeController : Controller
 {
+    private const bool ValidationEnabled = true;
+    private const bool ValidationDisabled = false;
+
     // BAD: Anti forgery token has been forgotten
     [HttpPost]
     public ActionResult Login() // $ Alert
@@ -17,6 +22,46 @@ public ActionResult UpdateDetails()
         return View();
     }
 
+    // GOOD: Anti forgery token is required by ASP.NET Core middleware
+    [HttpPost]
+    [RequireAntiforgeryToken]
+    public ActionResult UpdateProfile()
+    {
+        return View();
+    }
+
+    // GOOD: Explicitly requires anti forgery validation
+    [HttpPost]
+    [RequireAntiforgeryToken(true)]
+    public ActionResult UpdatePreferences()
+    {
+        return View();
+    }
+
+    // GOOD: Named and constant arguments are supported
+    [HttpPost]
+    [RequireAntiforgeryToken(required: ValidationEnabled)]
+    public ActionResult UpdateSettings()
+    {
+        return View();
+    }
+
+    // BAD: Explicitly disables anti forgery validation
+    [HttpPost]
+    [RequireAntiforgeryToken(false)]
+    public ActionResult DisabledValidation() // $ Alert
+    {
+        return View();
+    }
+
+    // BAD: A false constant also disables anti forgery validation
+    [HttpPost]
+    [RequireAntiforgeryToken(ValidationDisabled)]
+    public ActionResult ConstantDisabledValidation() // $ Alert
+    {
+        return View();
+    }
+
     // No validation required, as this is a GET method.
     public ActionResult ShowHelp()
     {
@@ -46,6 +91,110 @@ public ActionResult InheritedValidation()
     }
 }
 
+// GOOD: Base class requires anti forgery validation
+[RequireAntiforgeryToken]
+public abstract class AntiforgeryBaseController : Controller
+{
+}
+
+public abstract class IntermediateAntiforgeryController : AntiforgeryBaseController
+{
+}
+
+public class DerivedAntiforgeryController : IntermediateAntiforgeryController
+{
+    [HttpPost]
+    public ActionResult InheritedRequiredValidation()
+    {
+        return View();
+    }
+}
+
+[RequireAntiforgeryToken]
+public class ProtectedController : Controller
+{
+    // GOOD: Controller requires anti forgery validation
+    [HttpPost]
+    public ActionResult ProtectedAction()
+    {
+        return View();
+    }
+
+    // BAD: Action-level metadata overrides the controller metadata
+    [HttpPost]
+    [RequireAntiforgeryToken(false)]
+    public ActionResult DisabledAction() // $ Alert
+    {
+        return View();
+    }
+}
+
+[RequireAntiforgeryToken(false)]
+public class DisabledController : Controller
+{
+    // BAD: Controller explicitly disables anti forgery validation
+    [HttpPost]
+    public ActionResult DisabledControllerAction() // $ Alert
+    {
+        return View();
+    }
+
+    // GOOD: Action-level metadata overrides the controller metadata
+    [HttpPost]
+    [RequireAntiforgeryToken(true)]
+    public ActionResult EnabledAction()
+    {
+        return View();
+    }
+}
+
+[RequireAntiforgeryToken]
+public abstract class ProtectedBaseController : Controller
+{
+}
+
+[RequireAntiforgeryToken(false)]
+public class DisabledDerivedController : ProtectedBaseController
+{
+    // BAD: Derived controller metadata overrides base controller metadata
+    [HttpPost]
+    public ActionResult DisabledInheritedAction() // $ Alert
+    {
+        return View();
+    }
+}
+
+[AutoValidateAntiforgeryToken]
+public class FilterProtectedController : Controller
+{
+    // GOOD: Disabled middleware metadata does not disable the MVC filter
+    [HttpPost]
+    [RequireAntiforgeryToken(false)]
+    public ActionResult FilterProtectedAction()
+    {
+        return View();
+    }
+}
+
+public abstract class MethodMetadataBaseController : Controller
+{
+    [RequireAntiforgeryToken]
+    public virtual ActionResult InheritedMethodValidation()
+    {
+        return View();
+    }
+}
+
+public class MethodMetadataController : MethodMetadataBaseController
+{
+    // GOOD: Method metadata is inherited by the override
+    [HttpPost]
+    public override ActionResult InheritedMethodValidation()
+    {
+        return View();
+    }
+}
+
 // BAD: Base class without antiforgery attribute
 public abstract class UnprotectedBaseController : Controller
 {
@@ -60,3 +209,29 @@ public ActionResult NoInheritedValidation() // $ Alert
         return View();
     }
 }
+
+namespace Custom
+{
+    public class RequireAntiforgeryTokenAttribute : System.Attribute
+    {
+    }
+
+    public class CustomAttributeController : Controller
+    {
+        // BAD: An unrelated attribute with the same name does not provide validation
+        [HttpPost]
+        [RequireAntiforgeryToken]
+        public ActionResult LookalikeAttribute() // $ Alert
+        {
+            return View();
+        }
+    }
+}
+
+public class Startup
+{
+    public void Configure(IApplicationBuilder app)
+    {
+        app.UseAntiforgery();
+    }
+}
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/missing-aspnetcore/MissingAntiForgeryTokenValidation.expected b/csharp/ql/test/query-tests/Security Features/CWE-352/missing-aspnetcore/MissingAntiForgeryTokenValidation.expected
index 360b909cd0fa..ceb32e94c984 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-352/missing-aspnetcore/MissingAntiForgeryTokenValidation.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-352/missing-aspnetcore/MissingAntiForgeryTokenValidation.expected	
@@ -1,2 +1,8 @@
-| MissingAntiForgeryTokenValidation.cs:7:25:7:29 | Login | Method 'Login' handles a POST request without performing CSRF token validation. |
-| MissingAntiForgeryTokenValidation.cs:58:25:58:45 | NoInheritedValidation | Method 'NoInheritedValidation' handles a POST request without performing CSRF token validation. |
+| MissingAntiForgeryTokenValidation.cs:12:25:12:29 | Login | Method 'Login' handles a POST request without performing CSRF token validation. |
+| MissingAntiForgeryTokenValidation.cs:52:25:52:42 | DisabledValidation | Method 'DisabledValidation' handles a POST request without performing CSRF token validation. |
+| MissingAntiForgeryTokenValidation.cs:60:25:60:50 | ConstantDisabledValidation | Method 'ConstantDisabledValidation' handles a POST request without performing CSRF token validation. |
+| MissingAntiForgeryTokenValidation.cs:126:25:126:38 | DisabledAction | Method 'DisabledAction' handles a POST request without performing CSRF token validation. |
+| MissingAntiForgeryTokenValidation.cs:137:25:137:48 | DisabledControllerAction | Method 'DisabledControllerAction' handles a POST request without performing CSRF token validation. |
+| MissingAntiForgeryTokenValidation.cs:161:25:161:47 | DisabledInheritedAction | Method 'DisabledInheritedAction' handles a POST request without performing CSRF token validation. |
+| MissingAntiForgeryTokenValidation.cs:207:25:207:45 | NoInheritedValidation | Method 'NoInheritedValidation' handles a POST request without performing CSRF token validation. |
+| MissingAntiForgeryTokenValidation.cs:224:29:224:46 | LookalikeAttribute | Method 'LookalikeAttribute' handles a POST request without performing CSRF token validation. |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/require-antiforgery-without-middleware/MissingAntiForgeryTokenValidation.cs b/csharp/ql/test/query-tests/Security Features/CWE-352/require-antiforgery-without-middleware/MissingAntiForgeryTokenValidation.cs
new file mode 100644
index 000000000000..9943c21aff3f
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-352/require-antiforgery-without-middleware/MissingAntiForgeryTokenValidation.cs	
@@ -0,0 +1,19 @@
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Mvc;
+
+public class HomeController : Controller
+{
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public ActionResult FilterValidated()
+    {
+        return View();
+    }
+
+    [HttpPost]
+    [RequireAntiforgeryToken]
+    public ActionResult MetadataWithoutMiddleware() // $ Alert
+    {
+        return View();
+    }
+}
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/require-antiforgery-without-middleware/MissingAntiForgeryTokenValidation.expected b/csharp/ql/test/query-tests/Security Features/CWE-352/require-antiforgery-without-middleware/MissingAntiForgeryTokenValidation.expected
new file mode 100644
index 000000000000..2b5360166026
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-352/require-antiforgery-without-middleware/MissingAntiForgeryTokenValidation.expected	
@@ -0,0 +1 @@
+| MissingAntiForgeryTokenValidation.cs:15:25:15:49 | MetadataWithoutMiddleware | Method 'MetadataWithoutMiddleware' handles a POST request without performing CSRF token validation. |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/require-antiforgery-without-middleware/MissingAntiForgeryTokenValidation.qlref b/csharp/ql/test/query-tests/Security Features/CWE-352/require-antiforgery-without-middleware/MissingAntiForgeryTokenValidation.qlref
new file mode 100644
index 000000000000..5e1ab2426c65
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-352/require-antiforgery-without-middleware/MissingAntiForgeryTokenValidation.qlref	
@@ -0,0 +1 @@
+query: Security Features/CWE-352/MissingAntiForgeryTokenValidation.ql
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-352/require-antiforgery-without-middleware/options b/csharp/ql/test/query-tests/Security Features/CWE-352/require-antiforgery-without-middleware/options
new file mode 100644
index 000000000000..698ad488b6d4
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-352/require-antiforgery-without-middleware/options	
@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/CodeAddedHeader/MissingXFrameOptions.qlref b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/CodeAddedHeader/MissingXFrameOptions.qlref
index d0d38c4b0117..b8a963200e57 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/CodeAddedHeader/MissingXFrameOptions.qlref	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/CodeAddedHeader/MissingXFrameOptions.qlref	
@@ -1,2 +1 @@
-query: Security Features/CWE-451/MissingXFrameOptions.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Security Features/CWE-451/MissingXFrameOptions.ql
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/HeaderWrites.cs b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/HeaderWrites.cs
new file mode 100644
index 000000000000..907de6823982
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/HeaderWrites.cs	
@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Net.Http.Headers;
+using AspNetCoreHttpContext = Microsoft.AspNetCore.Http.HttpContext;
+
+public class HeaderWrites
+{
+    public void AspNetCoreResponseHeaders(AspNetCoreHttpContext context)
+    {
+        context.Response.Headers.Append(HeaderNames.XFrameOptions, "DENY"); // $ Alert
+        context.Response.Headers.Add("x-frame-options", "SAMEORIGIN"); // $ Alert
+        context.Response.Headers.TryAdd(
+            HeaderNames.ContentSecurityPolicy,
+            "default-src 'self'; FrAmE-AnCeStOrS 'none'"); // $ Alert
+
+        context.Response.Headers["X-Frame-Options"] = "DENY"; // $ Alert
+        context.Response.Headers["Content-Security-Policy"] = // $ Alert
+            "default-src 'self'; frame-ancestors 'none'";
+        context.Response.Headers.XFrameOptions = "DENY"; // $ Alert
+        context.Response.Headers.ContentSecurityPolicy = // $ Alert
+            "default-src 'self'; frame-ancestors 'self'";
+        context.Response.Headers["Content-Security-Policy"] = // $ Alert
+            "default-src 'self', frame-ancestors 'none'";
+
+        IHeaderDictionary responseHeaders = context.Response.Headers;
+        responseHeaders.Append("X-Frame-Options", "DENY"); // $ Alert
+    }
+
+    public void IgnoredHeaderWrites(AspNetCoreHttpContext context)
+    {
+        context.Request.Headers["X-Frame-Options"] = "DENY";
+
+        IHeaderDictionary reassignedHeaders = context.Response.Headers;
+        reassignedHeaders = context.Request.Headers;
+        reassignedHeaders["X-Frame-Options"] = "DENY";
+
+        var standaloneHeaders = new HeaderDictionary();
+        standaloneHeaders.Append("X-Frame-Options", "DENY");
+        standaloneHeaders["Content-Security-Policy"] = "frame-ancestors 'none'";
+
+        context.Response.Headers["Content-Security-Policy-Report-Only"] =
+            "frame-ancestors 'none'";
+        context.Response.Headers.ContentSecurityPolicyReportOnly = "frame-ancestors 'none'";
+        context.Response.Headers["X-Content-Security-Policy"] = "frame-ancestors 'none'";
+        context.Response.Headers["Content-Security-Policy"] = "default-src 'self'";
+        context.Response.Headers["Content-Security-Policy"] =
+            "report-uri https://example.test/frame-ancestors";
+        context.Response.Headers["Content-Security-Policy"] =
+            "default-src 'self'; not-frame-ancestors 'none'";
+    }
+}
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/HeaderWrites.expected b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/HeaderWrites.expected
new file mode 100644
index 000000000000..163cdda95910
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/HeaderWrites.expected	
@@ -0,0 +1,9 @@
+| HeaderWrites.cs:10:9:10:74 | call to method Append | A clickjacking-related response header is configured here. |
+| HeaderWrites.cs:11:9:11:69 | call to method Add | A clickjacking-related response header is configured here. |
+| HeaderWrites.cs:12:9:14:57 | call to method TryAdd<String,StringValues> | A clickjacking-related response header is configured here. |
+| HeaderWrites.cs:16:9:16:51 | access to indexer | A clickjacking-related response header is configured here. |
+| HeaderWrites.cs:17:9:17:59 | access to indexer | A clickjacking-related response header is configured here. |
+| HeaderWrites.cs:19:9:19:46 | access to property XFrameOptions | A clickjacking-related response header is configured here. |
+| HeaderWrites.cs:20:9:20:54 | access to property ContentSecurityPolicy | A clickjacking-related response header is configured here. |
+| HeaderWrites.cs:22:9:22:59 | access to indexer | A clickjacking-related response header is configured here. |
+| HeaderWrites.cs:26:9:26:57 | call to method Append | A clickjacking-related response header is configured here. |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/HeaderWrites.ql b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/HeaderWrites.ql
new file mode 100644
index 000000000000..607510cd1111
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/HeaderWrites.ql	
@@ -0,0 +1,12 @@
+/**
+ * @kind problem
+ * @id cs/test/clickjacking-header-write
+ * @problem.severity warning
+ */
+
+import csharp
+import semmle.code.csharp.security.MissingXFrameOptionsQuery
+
+from Expr write
+where write = getAClickjackingHeaderWrite()
+select write, "A clickjacking-related response header is configured here."
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/HeaderWrites.qlref b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/HeaderWrites.qlref
new file mode 100644
index 000000000000..a2d35d0adb5b
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/HeaderWrites.qlref	
@@ -0,0 +1,2 @@
+query: HeaderWrites.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/MissingXFrameOptions.expected b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/MissingXFrameOptions.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/MissingXFrameOptions.qlref b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/MissingXFrameOptions.qlref
new file mode 100644
index 000000000000..b8a963200e57
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/MissingXFrameOptions.qlref	
@@ -0,0 +1 @@
+Security Features/CWE-451/MissingXFrameOptions.ql
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/Web.config b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/Web.config
new file mode 100644
index 000000000000..484daccbf3a4
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/Web.config	
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration />
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/options b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/options
new file mode 100644
index 000000000000..ce3f295ed117
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/HeaderWrites/options	
@@ -0,0 +1,3 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/NoHeader/MissingXFrameOptions.expected b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/NoHeader/MissingXFrameOptions.expected
index 74dfb6fc2f47..d1708140c9d7 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/NoHeader/MissingXFrameOptions.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/NoHeader/MissingXFrameOptions.expected	
@@ -1 +1 @@
-| Web.config:0:0:0:0 | Web.config | Configuration file is missing the X-Frame-Options setting. |
+| Web.config:0:0:0:0 | Web.config | Configuration file is missing clickjacking protection. |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/Csp.Web.config b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/Csp.Web.config
new file mode 100644
index 000000000000..733792aadd8d
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/Csp.Web.config	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <system.webServer>
+    <httpProtocol>
+      <customHeaders>
+        <add name="cOnTeNt-SeCuRiTy-PoLiCy" value="default-src 'self'; FRAME-ANCESTORS 'none'" />
+      </customHeaders>
+    </httpProtocol>
+  </system.webServer>
+</configuration>
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/CspSubstring.Web.config b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/CspSubstring.Web.config
new file mode 100644
index 000000000000..caf093f9ecbe
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/CspSubstring.Web.config	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <system.webServer>
+    <httpProtocol>
+      <customHeaders>
+        <add name="Content-Security-Policy" value="report-uri https://example.test/frame-ancestors" />
+      </customHeaders>
+    </httpProtocol>
+  </system.webServer>
+</configuration>
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/MissingXFrameOptions.expected b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/MissingXFrameOptions.expected
index e69de29bb2d1..31aad4a5216f 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/MissingXFrameOptions.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/MissingXFrameOptions.expected	
@@ -0,0 +1,2 @@
+| CspSubstring.Web.config:0:0:0:0 | CspSubstring.Web.config | Configuration file is missing clickjacking protection. |
+| PrefixedCsp.Web.config:0:0:0:0 | PrefixedCsp.Web.config | Configuration file is missing clickjacking protection. |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/MissingXFrameOptions.qlref b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/MissingXFrameOptions.qlref
index d0d38c4b0117..b8a963200e57 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/MissingXFrameOptions.qlref	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/MissingXFrameOptions.qlref	
@@ -1,2 +1 @@
-query: Security Features/CWE-451/MissingXFrameOptions.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Security Features/CWE-451/MissingXFrameOptions.ql
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/PrefixedCsp.Web.config b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/PrefixedCsp.Web.config
new file mode 100644
index 000000000000..334b63ce5b0e
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/PrefixedCsp.Web.config	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <system.webServer>
+    <httpProtocol>
+      <customHeaders>
+        <add name="X-Content-Security-Policy" value="frame-ancestors 'none'" />
+      </customHeaders>
+    </httpProtocol>
+  </system.webServer>
+</configuration>
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/Web.config b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/Web.config
index 78f6c30a819f..74c0fa10fd27 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/Web.config	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeader/Web.config	
@@ -5,7 +5,7 @@
   <system.webServer>
     <httpProtocol>
       <customHeaders>
-        <add name="X-Frame-Options" value="SAMEORIGIN" />
+        <add name="x-frame-options" value="SAMEORIGIN" />
       </customHeaders>
     </httpProtocol>
   </system.webServer>
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/MissingXFrameOptions.qlref b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/MissingXFrameOptions.qlref
index d0d38c4b0117..b8a963200e57 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/MissingXFrameOptions.qlref	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/MissingXFrameOptions.qlref	
@@ -1,2 +1 @@
-query: Security Features/CWE-451/MissingXFrameOptions.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Security Features/CWE-451/MissingXFrameOptions.ql
diff --git a/csharp/ql/test/query-tests/standalone/Language Abuse/SimplifyBoolExpr/SimplifyBoolExpr.cs b/csharp/ql/test/query-tests/standalone/Language Abuse/SimplifyBoolExpr/SimplifyBoolExpr.cs
new file mode 100644
index 000000000000..c9ce38772a7c
--- /dev/null
+++ b/csharp/ql/test/query-tests/standalone/Language Abuse/SimplifyBoolExpr/SimplifyBoolExpr.cs	
@@ -0,0 +1,82 @@
+using System;
+
+// The missing matching operators deliberately model an incompletely compiled database.
+class IncompleteOperatorTest
+{
+    // GOOD: Rewriting this as `left != right` could recursively call this operator.
+    public static bool operator !=(IncompleteOperatorTest left, IncompleteOperatorTest right)
+    {
+        // BAD: Rewriting this built-in comparison cannot call the enclosing operator.
+        bool valuesDiffer = !(left.Value == right.Value); // $ Alert
+
+        // BAD: Explicitly converting both operands prevents a call to the enclosing operator.
+        bool referencesDiffer = !((object)left == (object)right); // $ Alert
+
+        return valuesDiffer && referencesDiffer && !(left == right);
+    }
+
+    // GOOD: Rewriting this as `left >= right` could recursively call this operator.
+    public static bool operator >=(IncompleteOperatorTest left, IncompleteOperatorTest right) => !(left < right);
+
+    int Value { get; }
+}
+
+class IncompleteReverseOperatorTest
+{
+    // GOOD: Rewriting this as `left == right` could recursively call this operator.
+    public static bool operator ==(IncompleteReverseOperatorTest left, IncompleteReverseOperatorTest right) => !(left != right);
+
+    // GOOD: Rewriting this as `left < right` could recursively call this operator.
+    public static bool operator <(IncompleteReverseOperatorTest left, IncompleteReverseOperatorTest right) => !(left >= right);
+}
+
+class IncompleteGreaterOperatorTest
+{
+    // GOOD: Rewriting this as `left <= right` could recursively call this operator.
+    public static bool operator <=(IncompleteGreaterOperatorTest left, IncompleteGreaterOperatorTest right) => !(left > right);
+
+    // GOOD: Rewriting this as `left > right` could recursively call this operator.
+    public static bool operator >(IncompleteGreaterOperatorTest left, IncompleteGreaterOperatorTest right) => !(left <= right);
+}
+
+class IncompleteDifferentOperatorTest
+{
+    // BAD: The suggested operator differs from the enclosing operator.
+    public static bool operator >(IncompleteDifferentOperatorTest left, IncompleteDifferentOperatorTest right) => !(left == right); // $ Alert
+}
+
+class IncompleteNestedOperatorTest
+{
+    public static bool operator !=(IncompleteNestedOperatorTest left, IncompleteNestedOperatorTest right)
+    {
+        // GOOD: The replacement could call the enclosing operator from this lambda.
+        Func<bool> lambda = () => !(left == right);
+
+        // GOOD: The replacement could call the enclosing operator from this local function.
+        bool Local() => !(left == right);
+
+        return lambda() || Local();
+    }
+}
+
+class Test
+{
+    public class Container
+    {
+        public bool? Field;
+    }
+
+    public void Fn()
+    {
+        bool? boption = false;
+        if (boption == true) ; // GOOD. Can't be simplified like a regular bool
+
+        bool b = false;
+        if (b ? boption : false) ; // GOOD. Can't be simplified like a regular bool
+
+        // Emulating incomplete type information by not declaring container explicitly.
+        if (container.Field == true) ; // GOOD. Can't be simplified like a regular bool
+
+        if (b ? container.Field : false) ; // GOOD. Can't be simplified like a regular bool
+    }
+}
diff --git a/csharp/ql/test/query-tests/standalone/Language Abuse/SimplifyBoolExpr/SimplifyBoolExpr.expected b/csharp/ql/test/query-tests/standalone/Language Abuse/SimplifyBoolExpr/SimplifyBoolExpr.expected
new file mode 100644
index 000000000000..a0b97ee97862
--- /dev/null
+++ b/csharp/ql/test/query-tests/standalone/Language Abuse/SimplifyBoolExpr/SimplifyBoolExpr.expected	
@@ -0,0 +1,3 @@
+| SimplifyBoolExpr.cs:10:29:10:56 | !... | The expression '!(A == B)' can be simplified to 'A != B'. |
+| SimplifyBoolExpr.cs:13:33:13:64 | !... | The expression '!(A == B)' can be simplified to 'A != B'. |
+| SimplifyBoolExpr.cs:45:115:45:130 | !... | The expression '!(A == B)' can be simplified to 'A != B'. |
diff --git a/csharp/ql/test/query-tests/standalone/Language Abuse/SimplifyBoolExpr/SimplifyBoolExpr.qlref b/csharp/ql/test/query-tests/standalone/Language Abuse/SimplifyBoolExpr/SimplifyBoolExpr.qlref
new file mode 100644
index 000000000000..222fc236213b
--- /dev/null
+++ b/csharp/ql/test/query-tests/standalone/Language Abuse/SimplifyBoolExpr/SimplifyBoolExpr.qlref	
@@ -0,0 +1,2 @@
+query: Language Abuse/SimplifyBoolExpr.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/csharp/ql/test/query-tests/standalone/Language Abuse/SimplifyBoolExpr/options b/csharp/ql/test/query-tests/standalone/Language Abuse/SimplifyBoolExpr/options
new file mode 100644
index 000000000000..7ba3811b2afb
--- /dev/null
+++ b/csharp/ql/test/query-tests/standalone/Language Abuse/SimplifyBoolExpr/options	
@@ -0,0 +1 @@
+semmle-extractor-options: --standalone
diff --git a/csharp/ql/test/resources/stubs/Microsoft.AspNet.OData.cs b/csharp/ql/test/resources/stubs/Microsoft.AspNet.OData.cs
new file mode 100644
index 000000000000..2ff03ab13994
--- /dev/null
+++ b/csharp/ql/test/resources/stubs/Microsoft.AspNet.OData.cs
@@ -0,0 +1,17 @@
+namespace Microsoft.AspNet.OData
+{
+    public class ODataActionParameters : System.Collections.Generic.Dictionary<string, object>
+    {
+        public ODataActionParameters() => throw null;
+    }
+
+    public class Delta<TStructuralType> where TStructuralType : class
+    {
+        public Delta() => throw null;
+        public TStructuralType GetInstance() => throw null;
+        public void Patch(TStructuralType original) => throw null;
+        public void Put(TStructuralType original) => throw null;
+        public void CopyChangedValues(TStructuralType original) => throw null;
+        public void CopyUnchangedValues(TStructuralType original) => throw null;
+    }
+}
diff --git a/csharp/ql/test/resources/stubs/System.Web.Http.OData.cs b/csharp/ql/test/resources/stubs/System.Web.Http.OData.cs
new file mode 100644
index 000000000000..e4b9775379c7
--- /dev/null
+++ b/csharp/ql/test/resources/stubs/System.Web.Http.OData.cs
@@ -0,0 +1,15 @@
+namespace System.Web.Http.OData
+{
+    public class ODataActionParameters : System.Collections.Generic.Dictionary<string, object>
+    {
+    }
+
+    public class Delta<TEntityType> where TEntityType : class
+    {
+        public TEntityType GetEntity() => throw null;
+        public void Patch(TEntityType original) { }
+        public void Put(TEntityType original) { }
+        public void CopyChangedValues(TEntityType original) { }
+        public void CopyUnchangedValues(TEntityType original) { }
+    }
+}
diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs b/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
index 4c85b397ac1f..afab366f2158 100644
--- a/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
+++ b/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
@@ -278,6 +278,72 @@ public void AddToGenericList<S>(List<S> input, S data)
     }
 }
 
+public class GenericWithVirtual1<T>
+{
+    // heuristic-summary=Models;GenericWithVirtual1<T>;true;ReturnParam;(T);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;GenericWithVirtual1<T>;true;ReturnParam;(T);;Argument[0];ReturnValue;value;dfc-generated
+    public virtual T ReturnParam(T input)
+    {
+        return input;
+    }
+
+    public virtual T StubImplementation(T input)
+    {
+        throw null;
+    }
+}
+
+public class DerivedGenericWithVirtual : GenericWithVirtual1<string>
+{
+    // heuristic-summary=Models;GenericWithVirtual1<T>;true;ReturnParam;(T);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;GenericWithVirtual1<T>;true;ReturnParam;(T);;Argument[0];ReturnValue;value;dfc-generated
+    public override string ReturnParam(string input)
+    {
+        return input;
+    }
+
+    // heuristic-summary=Models;GenericWithVirtual1<T>;true;StubImplementation;(T);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;GenericWithVirtual1<T>;true;StubImplementation;(T);;Argument[0];ReturnValue;value;dfc-generated
+    public override string StubImplementation(string input)
+    {
+        return input;
+    }
+}
+
+public class GenericWithVirtual2<T>
+{
+    // heuristic-summary=Models;GenericWithVirtual2<T>;true;ReturnParam;(T);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;GenericWithVirtual2<T>;true;ReturnParam;(T);;Argument[0];ReturnValue;value;dfc-generated
+    public virtual T ReturnParam(T input)
+    {
+        return input;
+    }
+
+    public virtual T StubImplementation(T input)
+    {
+        throw null;
+    }
+}
+
+public class NestedGenericWithVirtual<T> : GenericWithVirtual2<string> { }
+
+public class DerivedNestedGenericWithVirtual : NestedGenericWithVirtual<int>
+{
+    // heuristic-summary=Models;GenericWithVirtual2<T>;true;ReturnParam;(T);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;GenericWithVirtual2<T>;true;ReturnParam;(T);;Argument[0];ReturnValue;value;dfc-generated
+    public override string ReturnParam(string input)
+    {
+        return input;
+    }
+
+    // heuristic-summary=Models;GenericWithVirtual2<T>;true;StubImplementation;(T);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=Models;GenericWithVirtual2<T>;true;StubImplementation;(T);;Argument[0];ReturnValue;value;dfc-generated
+    public override string StubImplementation(string input)
+    {
+        return input;
+    }
+}
+
 public abstract class BaseClassFlow
 {
     // heuristic-summary=Models;BaseClassFlow;true;ReturnParam;(System.Object);;Argument[0];ReturnValue;value;df-generated
diff --git a/csharp/scripts/create-extractor-pack.sh b/csharp/scripts/create-extractor-pack.sh
index 3003dd81172d..4fbb866b028e 100755
--- a/csharp/scripts/create-extractor-pack.sh
+++ b/csharp/scripts/create-extractor-pack.sh
@@ -21,7 +21,7 @@ mkdir -p extractor-pack
 mkdir -p extractor-pack/tools/${platform}
 
 function dotnet_publish {
-  dotnet publish --self-contained --configuration Release --runtime ${dotnet_platform} -p:RuntimeFrameworkVersion=10.0.0 $1 --output extractor-pack/tools/${platform}
+  dotnet publish --self-contained --configuration Release --runtime ${dotnet_platform} -p:RuntimeFrameworkVersion=10.0.5 $1 --output extractor-pack/tools/${platform}
 }
 
 dotnet tool restore
diff --git a/csharp/scripts/stubs/helpers.py b/csharp/scripts/stubs/helpers.py
index 28b73258c208..644f24c38cfd 100644
--- a/csharp/scripts/stubs/helpers.py
+++ b/csharp/scripts/stubs/helpers.py
@@ -118,7 +118,7 @@ def make_stubs(self):
         bqrsFile = os.path.join(rawOutputDir, outputName + '.bqrs')
         jsonFile = os.path.join(rawOutputDir, outputName + '.json')
 
-        sdk_version = '10.0.100'
+        sdk_version = '10.0.201'
         print("\n* Creating new global.json file and setting SDK to " + sdk_version)
         self.run_cmd(['dotnet', 'new', 'globaljson', '--force', '--sdk-version', sdk_version, '--output', self.workDir])
 
diff --git a/csharp/tools/autobuild.sh b/csharp/tools/autobuild.sh
index e8e007a10d74..39d10b38f3b5 100755
--- a/csharp/tools/autobuild.sh
+++ b/csharp/tools/autobuild.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-if [ "$CODEQL_PLATFORM" != "linux64" ] && [ "$CODEQL_PLATFORM" != "osx64" ] ; then
+if [ "$CODEQL_PLATFORM" != "linux64" ] && [ "$CODEQL_PLATFORM" != "linux-arm64" ] && [ "$CODEQL_PLATFORM" != "osx64" ] ; then
     echo "Automatic build detection for $CODEQL_PLATFORM is not implemented."
     exit 1
 fi
diff --git a/docs/codeql/README.rst b/docs/codeql/README.rst
index 70686aae436c..2242519c7491 100644
--- a/docs/codeql/README.rst
+++ b/docs/codeql/README.rst
@@ -71,7 +71,7 @@ For example, to generate the HTML output for a project in the
   You can use errors reported during the build to debug problems in your source 
   code, such as broken internal links and malformed tables. You can also check 
   external links using Sphinx's `external link builder 
-  <http://www.sphinx-doc.org/en/master/usage/builders/index.html#sphinx.builders.linkcheck.CheckExternalLinksBuilder>`__.
+  <https://www.sphinx-doc.org/en/master/usage/builders/index.html#sphinx.builders.linkcheck.CheckExternalLinksBuilder>`__.
 
   Add the ``-a`` flag to regenerate all output files. By default, only files that 
   have changed are rebuilt.
diff --git a/docs/codeql/codeql-language-guides/codeql-library-for-javascript.rst b/docs/codeql/codeql-language-guides/codeql-library-for-javascript.rst
index aeaf68aeee4c..60d3054cd8d9 100644
--- a/docs/codeql/codeql-language-guides/codeql-library-for-javascript.rst
+++ b/docs/codeql/codeql-language-guides/codeql-library-for-javascript.rst
@@ -762,7 +762,7 @@ HTTP framework libraries
 
 The library ``semmle.javacript.frameworks.HTTP`` provides classes modeling common concepts from various HTTP frameworks.
 
-Currently supported frameworks are `Express <https://expressjs.com/>`__, the standard Node.js ``http`` and ``https`` modules, `Connect <https://github.com/senchalabs/connect>`__, `Koa <https://koajs.com>`__, `Hapi <https://hapi.dev/>`__ and `Restify <http://restify.com/>`__.
+Currently supported frameworks are `Express <https://expressjs.com/>`__, the standard Node.js ``http`` and ``https`` modules, `Connect <https://github.com/senchalabs/connect>`__, `Koa <https://koajs.com>`__, `Hapi <https://hapi.dev/>`__ and `Restify <https://restify.com/>`__.
 
 The most important classes include (all in module ``HTTP``):
 
@@ -779,7 +779,7 @@ For each framework library, there is a corresponding CodeQL library (for example
 Node.js
 ^^^^^^^
 
-The ``semmle.javascript.NodeJS`` library provides support for working with `Node.js <http://nodejs.org/>`__ modules through the following classes:
+The ``semmle.javascript.NodeJS`` library provides support for working with `Node.js <https://nodejs.org/>`__ modules through the following classes:
 
 -  `NodeModule <https://codeql.github.com/codeql-standard-libraries/javascript/semmle/javascript/NodeJS.qll/type.NodeJS$NodeModule.html>`__: a top-level that defines a Node.js module; see the section on `Modules <#modules>`__ for more information.
 -  `Require <https://codeql.github.com/codeql-standard-libraries/javascript/semmle/javascript/NodeJS.qll/type.NodeJS$Require.html>`__: a call to the special ``require`` function that imports a module.
@@ -927,7 +927,7 @@ However, unlike HTML, JSX is interleaved with JavaScript, hence `JSXElement <htt
 JSON
 ^^^^
 
-The ``semmle.javascript.JSON`` library provides support for working with `JSON <http://json.org/>`__ files that were processed by the JavaScript extractor when building the CodeQL database.
+The ``semmle.javascript.JSON`` library provides support for working with `JSON <https://json.org/>`__ files that were processed by the JavaScript extractor when building the CodeQL database.
 
 JSON files are modeled as trees of JSON values. Each JSON value is represented by an entity of class `JSONValue <https://codeql.github.com/codeql-standard-libraries/javascript/semmle/javascript/JSON.qll/type.JSON$JSONValue.html>`__, which provides the following member predicates:
 
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-actions.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-actions.rst
index 0b78b37359f4..82890f05520d 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-actions.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-actions.rst
@@ -7,7 +7,29 @@ Customizing library models for GitHub Actions
 
 GitHub Actions analysis can be customized by adding library models in data extension files.
 
-A data extension for GitHub Actions is a YAML file of the form:
+A data extension for GitHub Actions can be written using either JSON or YAML. JSON is the preferred format, for performance reasons, and takes the following form:
+
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/actions-all",
+           "extensible": "<name of extensible predicate>"
+         },
+         "data": [
+           ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."],
+           ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
+           // ...
+         ]
+       }
+     ]
+   }
+
+Files in the JSON format must use the ``.json`` file extension. Single-line (``//``) and multi-line (``/* ... */``) comments are supported as a non-standard JSON extension.
+
+A YAML file has the following form:
 
 .. code-block:: yaml
 
@@ -16,8 +38,8 @@ A data extension for GitHub Actions is a YAML file of the form:
         pack: codeql/actions-all
         extensible: <name of extensible predicate>
       data:
-        - <tuple1>
-        - <tuple2>
+        - ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."]
+        - ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
         - ...
 
 The CodeQL library for GitHub Actions exposes the following extensible predicates:
@@ -57,16 +79,23 @@ If there is an Action publisher that you trust, you can include the owner name/o
 
 To allow any Action from the publisher ``octodemo``, such as ``octodemo/3rd-party-action``, follow these steps:
 
-1. Create a data extension file ``/models/trusted-owner.model.yml`` with the following content:
+1. Create a data extension file ``/models/trusted-owner.model.json`` with the following content:
 
-   .. code-block:: yaml
+   .. code-block:: json
 
-      extensions:
-        - addsTo:
-            pack: codeql/actions-all
-            extensible: trustedActionsOwnerDataModel
-          data:
-            - ["octodemo"]
+      {
+        "extensions": [
+          {
+            "addsTo": {
+              "pack": "codeql/actions-all",
+              "extensible": "trustedActionsOwnerDataModel"
+            },
+            "data": [
+              ["octodemo"]
+            ]
+          }
+        ]
+      }
 
 2. Create a model pack file ``/codeql-pack.yml`` with the following content:
 
@@ -78,8 +107,34 @@ To allow any Action from the publisher ``octodemo``, such as ``octodemo/3rd-part
       extensionTargets:
         codeql/actions-all: '*'
       dataExtensions:
-        - models/**/*.yml
+        - models/**/*.json
 
 3. Ensure that the model pack is included in your CodeQL analysis.
 
 By following these steps, you will add ``octodemo`` to the list of trusted Action publishers, and the query will no longer generate security alerts for unpinned tags from this publisher.  For more information, see `Extending CodeQL coverage with CodeQL model packs in default setup <https://docs.github.com/en/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup#extending-codeql-coverage-with-codeql-model-packs-in-default-setup>`_ and `Creating and working with CodeQL packs <https://docs.github.com/en/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/creating-and-working-with-codeql-packs#creating-a-codeql-model-pack>`_.
+
+Example: Remove a trusted Actions publisher for the ``actions/unpinned-tag`` query
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GitHub's own organizations (``actions``, ``github`` and ``advanced-security``) are trusted by default. If you want unpinned tags for these first-party Actions to be reported as well, you can remove an owner from the trusted list by adding an entry prefixed with ``!``. A ``!`` entry always takes precedence over a plain entry for the same owner.
+
+To distrust the first-party ``github`` owner, add a data extension file with the following content:
+
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/actions-all",
+           "extensible": "trustedActionsOwnerDataModel"
+         },
+         "data": [
+           ["!github"]
+         ]
+       }
+     ]
+   }
+
+With this in place, the query will once again report unpinned tags for Actions published by ``github``.
+
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-cpp.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-cpp.rst
index 7ca619632272..0bbf0b1654b1 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-cpp.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-cpp.rst
@@ -25,7 +25,29 @@ Syntax used to define an element in an extension file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Each model of an element is defined using a data extension where each tuple constitutes a model.
-A data extension file to extend the standard CPP queries included with CodeQL is a YAML file with the form:
+A data extension file to extend the standard CPP queries included with CodeQL can be written using either JSON or YAML. JSON is the preferred format, for performance reasons, and takes the following form:
+
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/cpp-all",
+           "extensible": "<name of extensible predicate>"
+         },
+         "data": [
+           ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."],
+           ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
+           // ...
+         ]
+       }
+     ]
+   }
+
+Files in the JSON format must use the ``.json`` file extension. Single-line (``//``) and multi-line (``/* ... */``) comments are supported as a non-standard JSON extension.
+
+A YAML file has the following form:
 
 .. code-block:: yaml
 
@@ -34,11 +56,11 @@ A data extension file to extend the standard CPP queries included with CodeQL is
          pack: codeql/cpp-all
          extensible: <name of extensible predicate>
        data:
-         - <tuple1>
-         - <tuple2>
+         - ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."]
+         - ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
          - ...
 
-Each YAML file may contain one or more top-level extensions.
+Each data extension file may contain one or more top-level extensions.
 
 - ``addsTo`` defines the CodeQL pack name and extensible predicate that the extension is injected into.
 - ``data`` defines one or more rows of tuples that are injected as values into the extensible predicate. The number of columns and their types must match the definition of the extensible predicate.
@@ -79,20 +101,27 @@ This example shows how the CPP query pack models the return value from the ``rea
 
 We need to add a tuple to the ``sourceModel(namespace, type, subtypes, name, signature, ext, output, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/cpp-all
-         extensible: sourceModel
-       data:
-         - ["boost::asio", "", False, "read_until", "", "", "Argument[*1]", "remote", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/cpp-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["boost::asio", "", false, "read_until", "", "", "Argument[*1]", "remote", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the callable (in this case a free function) to be modeled as a source.
 
 - The first value ``"boost::asio"`` is the namespace name.
 - The second value ``""`` is the name of the type (class) that contains the method. Because we're modeling a free function, the type is left blank.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to all overrides of the method. For a free function, this should be ``False``.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to all overrides of the method. For a free function, this should be ``false``.
 - The fourth value ``"read_until"`` is the function name.
 - The fifth value is the function input type signature, which can be used to narrow down between functions that have the same name. In this case, we want the model to include all functions in ``boost::asio`` called ``read_until``.
 
@@ -114,20 +143,27 @@ This example shows how the CPP query pack models the second argument of the ``bo
 
 We need to add a tuple to the ``sinkModel(namespace, type, subtypes, name, signature, ext, input, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/cpp-all
-         extensible: sinkModel
-       data:
-         - ["boost::asio", "", False, "write", "", "", "Argument[*1]", "remote-sink", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/cpp-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["boost::asio", "", false, "write", "", "", "Argument[*1]", "remote-sink", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the callable (in this case a free function) to be modeled as a sink.
 
 - The first value ``"boost::asio"`` is the namespace name.
 - The second value ``""`` is the name of the type (class) that contains the method. Because we're modeling a free function, the type is left blank.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to all overrides of the method. For a free function, this should be ``False``.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to all overrides of the method. For a free function, this should be ``false``.
 - The fourth value ``"write"`` is the function name.
 - The fifth value is the function input type signature, which can be used to narrow down between functions that have the same name. In this case, we want the model to include all functions in ``boost::asio`` called ``write``.
 
@@ -149,20 +185,27 @@ This example shows how the CPP query pack models flow through a function for a s
 
 We need to add tuples to the ``summaryModel(namespace, type, subtypes, name, signature, ext, input, output, kind, provenance)`` extensible predicate by updating a data extension file:
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/cpp-all
-         extensible: summaryModel
-       data:
-         - ["boost::asio", "", False, "buffer", "", "", "Argument[*0]", "ReturnValue", "taint", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/cpp-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["boost::asio", "", false, "buffer", "", "", "Argument[*0]", "ReturnValue", "taint", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the callable (in this case free function) to be modeled as a summary.
 
 - The first value ``"boost::asio"`` is the namespace name.
 - The second value ``""`` is the name of the type (class) that contains the method. Because we're modeling a free function, the type is left blank.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to all overrides of the method. For a free function, this should be ``False``.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to all overrides of the method. For a free function, this should be ``false``.
 - The fourth value ``"buffer"`` is the function name.
 - The fifth value is the function input type signature, which can be used to narrow down between functions that have the same name. In this case, we want the model to include all functions in ``boost::asio`` called ``buffer``.
 
@@ -190,20 +233,27 @@ This function escapes special characters in a string for use in an SQL statement
 
 We need to add a tuple to the ``barrierModel(namespace, type, subtypes, name, signature, ext, output, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/cpp-all
-         extensible: barrierModel
-       data:
-         - ["", "", False, "mysql_real_escape_string", "", "", "Argument[*1]", "sql-injection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/cpp-all",
+           "extensible": "barrierModel"
+         },
+         "data": [
+           ["", "", false, "mysql_real_escape_string", "", "", "Argument[*1]", "sql-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the callable (in this case a free function) to be modeled as a barrier.
 
 - The first value ``""`` is the namespace name.
 - The second value ``""`` is the name of the type (class) that contains the method. Because we're modeling a free function, the type is left blank.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to all overrides of the method. For a free function, this should be ``False``.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to all overrides of the method. For a free function, this should be ``false``.
 - The fourth value ``"mysql_real_escape_string"`` is the function name.
 - The fifth value is the function input type signature, which can be used to narrow down between functions that have the same name.
 
@@ -229,20 +279,27 @@ Consider a function called ``is_safe`` which returns ``true`` when the data is c
 
 We need to add a tuple to the ``barrierGuardModel(namespace, type, subtypes, name, signature, ext, input, acceptingValue, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/cpp-all
-         extensible: barrierGuardModel
-       data:
-         - ["", "", False, "is_safe", "", "", "Argument[*0]", "true", "sql-injection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/cpp-all",
+           "extensible": "barrierGuardModel"
+         },
+         "data": [
+           ["", "", false, "is_safe", "", "", "Argument[*0]", "true", "sql-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the callable (in this case a free function) to be modeled as a barrier guard.
 
 - The first value ``""`` is the namespace name.
 - The second value ``""`` is the name of the type (class) that contains the method. Because we're modeling a free function, the type is left blank.
-- The third value ``False`` is a flag that indicates whether or not the model guard also applies to all overrides of the method. For a free function, this should be ``False``.
+- The third value ``false`` is a flag that indicates whether or not the model guard also applies to all overrides of the method. For a free function, this should be ``false``.
 - The fourth value ``"is_safe"`` is the function name.
 - The fifth value is the function input type signature, which can be used to narrow down between functions that have the same name.
 
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-csharp.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-csharp.rst
index a4b0e26d1bc8..7b053c19c426 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-csharp.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-csharp.rst
@@ -25,7 +25,29 @@ Syntax used to define an element in an extension file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Each model of an element is defined using a data extension where each tuple constitutes a model.
-A data extension file to extend the standard C# queries included with CodeQL is a YAML file with the form:
+A data extension file to extend the standard C# queries included with CodeQL can be written using either JSON or YAML. JSON is the preferred format, for performance reasons, and takes the following form:
+
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/csharp-all",
+           "extensible": "<name of extensible predicate>"
+         },
+         "data": [
+           ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."],
+           ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
+           // ...
+         ]
+       }
+     ]
+   }
+
+Files in the JSON format must use the ``.json`` file extension. Single-line (``//``) and multi-line (``/* ... */``) comments are supported as a non-standard JSON extension.
+
+A YAML file has the following form:
 
 .. code-block:: yaml
 
@@ -34,11 +56,11 @@ A data extension file to extend the standard C# queries included with CodeQL is
          pack: codeql/csharp-all
          extensible: <name of extensible predicate>
        data:
-         - <tuple1>
-         - <tuple2>
+         - ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."]
+         - ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
          - ...
 
-Each YAML file may contain one or more top-level extensions.
+Each data extension file may contain one or more top-level extensions.
 
 - ``addsTo`` defines the CodeQL pack name and extensible predicate that the extension is injected into.
 - ``data`` defines one or more rows of tuples that are injected as values into the extensible predicate. The number of columns and their types must match the definition of the extensible predicate.
@@ -84,20 +106,27 @@ This is the constructor of the ``SqlCommand`` class, which is located in the ``S
 
 We need to add a tuple to the ``sinkModel``\(namespace, type, subtypes, name, signature, ext, input, kind, provenance) extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/csharp-all
-         extensible: sinkModel
-       data:
-         - ["System.Data.SqlClient", "SqlCommand", False, "SqlCommand", "(System.String,System.Data.SqlClient.SqlConnection)", "", "Argument[0]", "sql-injection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/csharp-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["System.Data.SqlClient", "SqlCommand", false, "SqlCommand", "(System.String,System.Data.SqlClient.SqlConnection)", "", "Argument[0]", "sql-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the callable (in this case a method) to be modeled as a sink.
 
 - The first value ``System.Data.SqlClient`` is the namespace name.
 - The second value ``SqlCommand`` is the name of the class (type) that contains the method.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to all overrides of the method.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to all overrides of the method.
 - The fourth value ``SqlCommand`` is the method name. Constructors are named after the class.
 - The fifth value ``(System.String,System.Data.SqlClient.SqlConnection)`` is the method input type signature. The type names must be fully qualified.
 
@@ -122,20 +151,27 @@ This is the ``GetStream`` method in the ``TcpClient`` class, which is located in
 
 We need to add a tuple to the ``sourceModel(namespace, type, subtypes, name, signature, ext, output, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/csharp-all
-         extensible: sourceModel
-       data:
-         - ["System.Net.Sockets", "TcpClient", False, "GetStream", "()", "", "ReturnValue", "remote", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/csharp-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["System.Net.Sockets", "TcpClient", false, "GetStream", "()", "", "ReturnValue", "remote", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the callable (in this case a method) to be modeled as a source.
 
 - The first value ``System.Net.Sockets`` is the namespace name.
 - The second value ``TcpClient`` is the name of the class (type) that contains the source.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to all overrides of the method.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to all overrides of the method.
 - The fourth value ``GetStream`` is the method name.
 - The fifth value ``()`` is the method input type signature.
 
@@ -160,15 +196,22 @@ This pattern covers many of the cases where we need to summarize flow through a
 
 We need to add tuples to the ``summaryModel(namespace, type, subtypes, name, signature, ext, input, output, kind, provenance)`` extensible predicate by updating a data extension file:
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/csharp-all
-         extensible: summaryModel
-       data:
-         - ["System", "String", False, "Concat", "(System.Object,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-         - ["System", "String", False, "Concat", "(System.Object,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/csharp-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["System", "String", false, "Concat", "(System.Object,System.Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"],
+           ["System", "String", false, "Concat", "(System.Object,System.Object)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
+         ]
+       }
+     ]
+   }
 
 Each tuple defines flow from one argument to the return value.
 The first row defines flow from the first argument (``s1`` in the example) to the return value (``t`` in the example) and the second row defines flow from the second argument (``s2`` in the example) to the return value (``t`` in the example).
@@ -178,7 +221,7 @@ These are the same for both of the rows above as we are adding two summaries for
 
 - The first value ``System`` is the namespace name.
 - The second value ``String`` is the class (type) name.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to all overrides of the method.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to all overrides of the method.
 - The fourth value ``Concat`` is the method name.
 - The fifth value ``(System.Object,System.Object)`` is the method input type signature.
 
@@ -192,14 +235,21 @@ The remaining values are used to define the ``access-path``, the ``kind``, and t
 
 It would also be possible to merge the two rows into one by using a comma-separated list in the seventh value. This would be useful if the method has many arguments and the flow is the same for all of them.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/csharp-all
-         extensible: summaryModel
-       data:
-         - ["System", "String", False, "Concat", "(System.Object,System.Object)", "", "Argument[0,1]", "ReturnValue", "taint", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/csharp-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["System", "String", false, "Concat", "(System.Object,System.Object)", "", "Argument[0,1]", "ReturnValue", "taint", "manual"]
+         ]
+       }
+     ]
+   }
 
 This row defines flow from both the first and the second argument to the return value. The seventh value ``Argument[0,1]`` is shorthand for specifying an access path to both ``Argument[0]`` and ``Argument[1]``.
 
@@ -216,14 +266,21 @@ This example shows how the C# query pack models flow through a method for a simp
 
 We need to add a tuple to the ``summaryModel(namespace, type, subtypes, name, signature, ext, input, output, kind, provenance)`` extensible predicate by updating a data extension file:
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/csharp-all
-         extensible: summaryModel
-       data:
-         - ["System", "String", False, "Trim", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/csharp-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["System", "String", false, "Trim", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+         ]
+       }
+     ]
+   }
 
 Each tuple defines flow from one argument to the return value.
 The first row defines flow from the qualifier of the method call (``s1`` in the example) to the return value (``t`` in the example).
@@ -233,7 +290,7 @@ These are the same for both of the rows above as we are adding two summaries for
 
 - The first value ``System`` is the namespace name.
 - The second value ``String`` is the class (type) name.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to all overrides of the method.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to all overrides of the method.
 - The fourth value ``Trim`` is the method name.
 - The fifth value ``()`` is the method input type signature.
 
@@ -259,15 +316,22 @@ Here we model flow through higher order methods and collection types, as well as
 
 We need to add tuples to the ``summaryModel(namespace, type, subtypes, name, signature, ext, input, output, kind, provenance)`` extensible predicate by updating a data extension file:
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/csharp-all
-         extensible: summaryModel
-       data:
-         - ["System.Linq", "Enumerable", False, "Select<TSource,TResult>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "manual"]
-         - ["System.Linq", "Enumerable", False, "Select<TSource,TResult>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>)", "", "Argument[1].ReturnValue", "ReturnValue.Element", "value", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/csharp-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["System.Linq", "Enumerable", false, "Select<TSource,TResult>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "manual"],
+           ["System.Linq", "Enumerable", false, "Select<TSource,TResult>", "(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>)", "", "Argument[1].ReturnValue", "ReturnValue.Element", "value", "manual"]
+         ]
+       }
+     ]
+   }
 
 Each tuple defines part of the flow that comprises the total flow through the ``Select`` method.
 The first five values identify the callable (in this case a method) to be modeled as a summary.
@@ -275,7 +339,7 @@ These are the same for both of the rows above as we are adding two summaries for
 
 - The first value ``System.Linq`` is the namespace name.
 - The second value ``Enumerable`` is the class (type) name.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to all overrides of the method.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to all overrides of the method.
 - The fourth value ``Select<TSource,TResult>`` is the method name, along with the type parameters for the method. The names of the generic type parameters provided in the model must match the names of the generic type parameters in the method signature in the source code.
 - The fifth value ``(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>)`` is the method input type signature. The generics in the signature must match the generics in the method signature in the source code.
 
@@ -318,20 +382,27 @@ The ``RawUrl`` property returns the raw URL of the current request, which is con
 
 We need to add a tuple to the ``barrierModel(namespace, type, subtypes, name, signature, ext, output, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/csharp-all
-         extensible: barrierModel
-       data:
-         - ["System.Web", "HttpRequest", False, "get_RawUrl", "()", "", "ReturnValue", "url-redirection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/csharp-all",
+           "extensible": "barrierModel"
+         },
+         "data": [
+           ["System.Web", "HttpRequest", false, "get_RawUrl", "()", "", "ReturnValue", "url-redirection", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the callable (in this case the getter of a property) to be modeled as a barrier.
 
 - The first value ``System.Web`` is the namespace name.
 - The second value ``HttpRequest`` is the class (type) name.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to all overrides of the method.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to all overrides of the method.
 - The fourth value ``get_RawUrl`` is the method name. Getter and setter methods are named ``get_<name>`` and ``set_<name>`` respectively.
 - The fifth value ``()`` is the method input type signature.
 
@@ -359,20 +430,27 @@ When the ``IsAbsoluteUri`` property returns ``false``, the URL is relative and t
 
 We need to add a tuple to the ``barrierGuardModel(namespace, type, subtypes, name, signature, ext, input, acceptingValue, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/csharp-all
-         extensible: barrierGuardModel
-       data:
-         - ["System", "Uri", False, "get_IsAbsoluteUri", "()", "", "Argument[this]", "false", "url-redirection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/csharp-all",
+           "extensible": "barrierGuardModel"
+         },
+         "data": [
+           ["System", "Uri", false, "get_IsAbsoluteUri", "()", "", "Argument[this]", "false", "url-redirection", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the callable (in this case the getter of a property) to be modeled as a barrier guard.
 
 - The first value ``System`` is the namespace name.
 - The second value ``Uri`` is the class (type) name.
-- The third value ``False`` is a flag that indicates whether or not the model guard also applies to all overrides of the method.
+- The third value ``false`` is a flag that indicates whether or not the model guard also applies to all overrides of the method.
 - The fourth value ``get_IsAbsoluteUri`` is the method name. Getter and setter methods are named ``get_<name>`` and ``set_<name>`` respectively.
 - The fifth value ``()`` is the method input type signature.
 
@@ -398,14 +476,21 @@ A neutral model is used to define that there is no flow through a method.
 
 We need to add a tuple to the ``neutralModel(namespace, type, name, signature, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-   - addsTo:
-       pack: codeql/csharp-all
-       extensible: neutralModel
-     data:
-       - ["System", "DateTime", "get_Now", "()", "summary", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/csharp-all",
+           "extensible": "neutralModel"
+         },
+         "data": [
+           ["System", "DateTime", "get_Now", "()", "summary", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first four values identify the callable (in this case the getter of the ``Now`` property) to be modeled as a neutral, the fifth value is the kind, and the sixth value is the provenance (origin) of the neutral.
 
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-go.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-go.rst
index f8f576b16b16..8ccd8ec935d8 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-go.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-go.rst
@@ -25,7 +25,29 @@ Syntax used to define an element in an extension file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Each model of an element is defined using a data extension where each tuple constitutes a model.
-A data extension file to extend the standard Go queries included with CodeQL is a YAML file with the form:
+A data extension file to extend the standard Go queries included with CodeQL can be written using either JSON or YAML. JSON is the preferred format, for performance reasons, and takes the following form:
+
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "<name of extensible predicate>"
+         },
+         "data": [
+           ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."],
+           ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
+           // ...
+         ]
+       }
+     ]
+   }
+
+Files in the JSON format must use the ``.json`` file extension. Single-line (``//``) and multi-line (``/* ... */``) comments are supported as a non-standard JSON extension.
+
+A YAML file has the following form:
 
 .. code-block:: yaml
 
@@ -34,11 +56,11 @@ A data extension file to extend the standard Go queries included with CodeQL is
          pack: codeql/go-all
          extensible: <name of extensible predicate>
        data:
-         - <tuple1>
-         - <tuple2>
+         - ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."]
+         - ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
          - ...
 
-Each YAML file may contain one or more top-level extensions.
+Each data extension file may contain one or more top-level extensions.
 
 - ``addsTo`` defines the CodeQL pack name and extensible predicate that the extension is injected into.
 - ``data`` defines one or more rows of tuples that are injected as values into the extensible predicate. The number of columns and their types must match the definition of the extensible predicate.
@@ -84,20 +106,27 @@ This is the ``Prepare`` method of the ``DB`` type in the ``database/sql`` packag
 
 We need to add a tuple to the ``sinkModel``\(package, type, subtypes, name, signature, ext, input, kind, provenance) extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/go-all
-         extensible: sinkModel
-       data:
-         - ["database/sql", "DB", True, "Prepare", "", "", "Argument[0]", "sql-injection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["database/sql", "DB", true, "Prepare", "", "", "Argument[0]", "sql-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the function (in this case a method) to be modeled as a sink.
 
 - The first value ``database/sql`` is the package name.
 - The second value ``DB`` is the name of the type that the method is associated with.
-- The third value ``True`` is a flag that indicates whether or not the model also applies to subtypes. This includes when the subtype embeds the given type, so that the method or field is promoted to be a method or field of the subtype. For interface methods it also includes types which implement the interface type.
+- The third value ``true`` is a flag that indicates whether or not the model also applies to subtypes. This includes when the subtype embeds the given type, so that the method or field is promoted to be a method or field of the subtype. For interface methods it also includes types which implement the interface type.
 - The fourth value ``Prepare`` is the method name.
 - The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
 
@@ -123,20 +152,27 @@ This is the ``FormValue`` method of the ``Request`` type which is located in the
 
 We need to add a tuple to the ``sourceModel(package, type, subtypes, name, signature, ext, output, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/go-all
-         extensible: sourceModel
-       data:
-         - ["net/http", "Request", True, "FormValue", "", "", "ReturnValue", "remote", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["net/http", "Request", true, "FormValue", "", "", "ReturnValue", "remote", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the function to be modeled as a source.
 
 - The first value ``net/http`` is the package name.
 - The second value ``Request`` is the type name, since the function is a method of the ``Request`` type.
-- The third value ``True`` is a flag that indicates whether or not the model also applies to subtypes. This includes when the subtype embeds the given type, so that the method or field is promoted to be a method or field of the subtype. For interface methods it also includes types which implement the interface type.
+- The third value ``true`` is a flag that indicates whether or not the model also applies to subtypes. This includes when the subtype embeds the given type, so that the method or field is promoted to be a method or field of the subtype. For interface methods it also includes types which implement the interface type.
 - The fourth value ``FormValue`` is the function name.
 - The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
 
@@ -163,14 +199,21 @@ This pattern covers many of the cases where we need to summarize flow through a
 
 We need to add a tuple to the ``summaryModel(package, type, subtypes, name, signature, ext, input, output, kind, provenance)`` extensible predicate by updating a data extension file:
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/go-all
-         extensible: summaryModel
-       data:
-         - ["slices", "", False, "Max", "", "", "Argument[0].ArrayElement", "ReturnValue", "value", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["slices", "", false, "Max", "", "", "Argument[0].ArrayElement", "ReturnValue", "value", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first row defines flow from the first argument (``a`` in the example) to the return value (``max`` in the example).
 
@@ -178,7 +221,7 @@ The first five values identify the function to be modeled as a summary.
 
 - The first value ``slices`` is the package name.
 - The second value ``""`` is left blank, since the function is not a method of a type.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to subtypes. This has no effect for non-method functions.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to subtypes. This has no effect for non-method functions.
 - The fourth value ``Max`` is the function name.
 - The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
 
@@ -207,14 +250,21 @@ This pattern covers many of the cases where we need to summarize flow through a
 
 We need to add a tuple to the ``summaryModel(package, type, subtypes, name, signature, ext, input, output, kind, provenance)`` extensible predicate by updating a data extension file:
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/go-all
-         extensible: summaryModel
-       data:
-         - ["slices", "", False, "Concat", "", "", "Argument[0].ArrayElement.ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["slices", "", false, "Concat", "", "", "Argument[0].ArrayElement.ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first row defines flow from the arguments (``a`` and ``b`` in the example) to the return value (``c`` in the example).
 
@@ -222,7 +272,7 @@ The first five values identify the function to be modeled as a summary.
 
 - The first value ``slices`` is the package name.
 - The second value ``""`` is left blank, since the function is not a method of a type.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to subtypes. This has no effect for non-method functions.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to subtypes. This has no effect for non-method functions.
 - The fourth value ``Concat`` is the function name.
 - The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
 
@@ -250,15 +300,22 @@ This pattern covers many of the cases where we need to summarize flow through a
 
 We need to add tuples to the ``summaryModel(package, type, subtypes, name, signature, ext, input, output, kind, provenance)`` extensible predicate by updating a data extension file:
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/go-all
-         extensible: summaryModel
-       data:
-         - ["strings", "", False, "Join", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-         - ["strings", "", False, "Join", "", "", "Argument[1]", "ReturnValue", "taint", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["strings", "", false, "Join", "", "", "Argument[0]", "ReturnValue", "taint", "manual"],
+           ["strings", "", false, "Join", "", "", "Argument[1]", "ReturnValue", "taint", "manual"]
+         ]
+       }
+     ]
+   }
 
 Each tuple defines flow from one argument to the return value.
 The first row defines flow from the first argument (``elems`` in the example) to the return value (``t`` in the example) and the second row defines flow from the second argument (``sep`` in the example) to the return value (``t`` in the example).
@@ -268,7 +325,7 @@ These are the same for both of the rows above as we are adding two summaries for
 
 - The first value ``strings`` is the package name.
 - The second value ``""`` is left blank, since the function is not a method of a type.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to subtypes. This has no effect for non-method functions.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to subtypes. This has no effect for non-method functions.
 - The fourth value ``Join`` is the function name.
 - The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
 
@@ -282,14 +339,21 @@ The remaining values are used to define the ``access-path``, the ``kind``, and t
 
 It would also be possible to merge the two rows into one by using ".." to indicate a range in the seventh value. This would be useful if the method has many arguments and the flow is the same for all of them.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/go-all
-         extensible: summaryModel
-       data:
-         - ["strings", "", False, "Join", "", "", "Argument[0..1]", "ReturnValue", "taint", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["strings", "", false, "Join", "", "", "Argument[0..1]", "ReturnValue", "taint", "manual"]
+         ]
+       }
+     ]
+   }
 
 This row defines flow from both the first and the second argument to the return value. The seventh value ``Argument[0..1]`` is shorthand for specifying an access path to both ``Argument[0]`` and ``Argument[1]``.
 
@@ -306,14 +370,21 @@ This example shows how the Go query pack models flow through a method for a simp
 
 We need to add a tuple to the ``summaryModel(package, type, subtypes, name, signature, ext, input, output, kind, provenance)`` extensible predicate by updating a data extension file:
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/go-all
-         extensible: summaryModel
-       data:
-         - ["net/url", "URL", True, "Hostname", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["net/url", "URL", true, "Hostname", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+         ]
+       }
+     ]
+   }
 
 Each tuple defines flow from one argument to the return value.
 The first row defines flow from the qualifier of the method call (``u`` in the example) to the return value (``host`` in the example).
@@ -322,7 +393,7 @@ The first five values identify the function (in this case a method) to be modele
 
 - The first value ``net/url`` is the package name.
 - The second value ``URL`` is the receiver type.
-- The third value ``True`` is a flag that indicates whether or not the model also applies to subtypes. This includes when the subtype embeds the given type, so that the method or field is promoted to be a method or field of the subtype. For interface methods it also includes types which implement the interface type.
+- The third value ``true`` is a flag that indicates whether or not the model also applies to subtypes. This includes when the subtype embeds the given type, so that the method or field is promoted to be a method or field of the subtype. For interface methods it also includes types which implement the interface type.
 - The fourth value ``Hostname`` is the method name.
 - The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
 
@@ -349,20 +420,27 @@ The ``Htmlquote`` function from the `beego` framework HTML-escapes a string, whi
 
 We need to add a tuple to the ``barrierModel(package, type, subtypes, name, signature, ext, output, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/go-all
-         extensible: barrierModel
-       data:
-         - ["group:beego", "", True, "Htmlquote", "", "", "ReturnValue", "html-injection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "barrierModel"
+         },
+         "data": [
+           ["group:beego", "", true, "Htmlquote", "", "", "ReturnValue", "html-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the function to be modeled as a barrier.
 
 - The first value ``group:beego`` is the package group name. The ``group:`` prefix indicates that this is a package group, which is used to match multiple package paths that refer to the same package.
 - The second value ``""`` is left blank since the function is not a method of a type.
-- The third value ``True`` is a flag that indicates whether or not the model also applies to subtypes. This has no effect for non-method functions.
+- The third value ``true`` is a flag that indicates whether or not the model also applies to subtypes. This has no effect for non-method functions.
 - The fourth value ``Htmlquote`` is the function name.
 - The fifth value ``""`` is the input type signature. For Go it should always be an empty string.
 
@@ -389,20 +467,27 @@ Consider a function called ``IsSafe`` which returns ``true`` when the data is co
 
 We need to add a tuple to the ``barrierGuardModel(package, type, subtypes, name, signature, ext, input, acceptingValue, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/go-all
-         extensible: barrierGuardModel
-       data:
-         - ["example.com/example", "", False, "IsSafe", "", "", "Argument[0]", "true", "sql-injection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "barrierGuardModel"
+         },
+         "data": [
+           ["example.com/example", "", false, "IsSafe", "", "", "Argument[0]", "true", "sql-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the function to be modeled as a barrier guard.
 
 - The first value ``example.com/example`` is the package name.
 - The second value ``""`` is left blank since the function is not a method of a type.
-- The third value ``False`` is a flag that indicates whether or not the model guard also applies to subtypes. This has no effect for non-method functions.
+- The third value ``false`` is a flag that indicates whether or not the model guard also applies to subtypes. This has no effect for non-method functions.
 - The fourth value ``IsSafe`` is the function name.
 - The fifth value ``""`` is the input type signature. For Go it should always be an empty string.
 
@@ -427,20 +512,27 @@ This example shows how we can model a field read as a source of tainted data.
 
 We need to add a tuple to the ``sourceModel(package, type, subtypes, name, signature, ext, output, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-  - addsTo:
-      pack: codeql/go-all
-      extensible: sourceModel
-    data:
-      - ["net/http", "Request", True, "Body", "", "", "", "remote", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["net/http", "Request", true, "Body", "", "", "", "remote", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the field to be modeled as a source.
 
 - The first value ``net/http`` is the package name.
 - The second value ``Request`` is the name of the type that the field is associated with.
-- The third value ``True`` is a flag that indicates whether or not the model also applies to subtypes. For fields this means when the field is accessed as a promoted field in another type.
+- The third value ``true`` is a flag that indicates whether or not the model also applies to subtypes. For fields this means when the field is accessed as a promoted field in another type.
 - The fourth value ``Body`` is the field name.
 - The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
 
@@ -460,15 +552,22 @@ Note that packages hosted at ``gopkg.in`` use a slightly different syntax: the m
 
 To write models that only apply to ``github.com/couchbase/gocb/v2``, it is sufficient to include the major version suffix (``/v2``) in the package column. To write models that only apply to ``github.com/couchbase/gocb``, you may prefix the package column with ``fixed-version:``. For example, here are two models for a method that has changed name from v1 to v2.
 
-.. code-block:: yaml
-
-    extensions:
-    - addsTo:
-        pack: codeql/go-all
-        extensible: sinkModel
-      data:
-        - ["fixed-version:github.com/couchbase/gocb", "Cluster", True, "ExecuteAnalyticsQuery", "", "", "Argument[0]", "nosql-injection", "manual"]
-        - ["github.com/couchbase/gocb/v2", "Cluster", True, "AnalyticsQuery", "", "", "Argument[0]", "nosql-injection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["fixed-version:github.com/couchbase/gocb", "Cluster", true, "ExecuteAnalyticsQuery", "", "", "Argument[0]", "nosql-injection", "manual"],
+           ["github.com/couchbase/gocb/v2", "Cluster", true, "AnalyticsQuery", "", "", "Argument[0]", "nosql-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 Package grouping
 ~~~~~~~~~~~~~~~~
@@ -478,20 +577,31 @@ Since Go uses URLs for package identifiers, it is possible for packages to be im
 To handle this, the CodeQL Go library uses a mapping from the package path to a group name for the package. This mapping can be specified using the ``packageGrouping`` extensible predicate, and then the models for the APIs in the package
 will use the the prefix ``group:`` followed by the group name in place of the package path.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/go
-         extensible: packageGrouping
-       data:
-         - ["glog", "github.com/golang/glog"]
-         - ["glog", "gopkg.in/glog"]
-    - addsTo:
-        pack: codeql/go
-        extensible: sinkModel
-      data:
-        - ["group:glog", "", False, "Info", "", "", "Argument[0]", "log-injection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "packageGrouping"
+         },
+         "data": [
+           ["glog", "github.com/golang/glog"],
+           ["glog", "gopkg.in/glog"]
+         ]
+       },
+       {
+         "addsTo": {
+           "pack": "codeql/go-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["group:glog", "", false, "Info", "", "", "Argument[0]", "log-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 .. _threat-models-go:
 
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-java-and-kotlin.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-java-and-kotlin.rst
index a3435002c858..94f8d795732d 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-java-and-kotlin.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-java-and-kotlin.rst
@@ -30,7 +30,29 @@ Syntax used to define an element in an extension file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Each model of an element is defined using a data extension where each tuple constitutes a model.
-A data extension file to extend the standard Java queries included with CodeQL is a YAML file with the form:
+A data extension file to extend the standard Java queries included with CodeQL can be written using either JSON or YAML. JSON is the preferred format, for performance reasons, and takes the following form:
+
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/java-all",
+           "extensible": "<name of extensible predicate>"
+         },
+         "data": [
+           ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."],
+           ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
+           // ...
+         ]
+       }
+     ]
+   }
+
+Files in the JSON format must use the ``.json`` file extension. Single-line (``//``) and multi-line (``/* ... */``) comments are supported as a non-standard JSON extension.
+
+A YAML file has the following form:
 
 .. code-block:: yaml
 
@@ -39,11 +61,11 @@ A data extension file to extend the standard Java queries included with CodeQL i
          pack: codeql/java-all
          extensible: <name of extensible predicate>
        data:
-         - <tuple1>
-         - <tuple2>
+         - ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."]
+         - ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
          - ...
 
-Each YAML file may contain one or more top-level extensions.
+Each data extension file may contain one or more top-level extensions.
 
 - ``addsTo`` defines the CodeQL pack name and extensible predicate that the extension is injected into.
 - ``data`` defines one or more rows of tuples that are injected as values into the extensible predicate. The number of columns and their types must match the definition of the extensible predicate.
@@ -74,9 +96,9 @@ Specifying types in Java and Kotlin models
 
 **Nested and inner classes** are denoted by joining the enclosing type and the nested type with a dollar sign (``$``), for example ``Outer$Inner``. This applies both to the type column and to nested types in a signature. For example, the ``Level`` enum nested inside the ``Logger`` interface, nested inside the ``System`` class, is written as ``System$Logger$Level``:
 
-.. code-block:: yaml
+.. code-block:: json
 
-   - ["java.lang", "System$Logger", True, "log", "(System$Logger$Level,String)", "", "Argument[1]", "log-injection", "manual"]
+   ["java.lang", "System$Logger", true, "log", "(System$Logger$Level,String)", "", "Argument[1]", "log-injection", "manual"]
 
 **Generics** are erased, so type parameters are removed:
 
@@ -85,9 +107,9 @@ Specifying types in Java and Kotlin models
 
 For example, ``forEach`` on ``Iterable<T>`` takes a ``Consumer<? super T>`` argument, so the type is ``Iterable`` and the signature is ``(Consumer)``:
 
-.. code-block:: yaml
+.. code-block:: json
 
-   - ["java.lang", "Iterable", True, "forEach", "(Consumer)", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"]
+   ["java.lang", "Iterable", true, "forEach", "(Consumer)", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"]
 
 Examples of custom model definitions
 ------------------------------------
@@ -109,20 +131,27 @@ This is the ``execute`` method in the ``Statement`` class, which is located in t
 
 We need to add a tuple to the ``sinkModel(package, type, subtypes, name, signature, ext, input, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/java-all
-         extensible: sinkModel
-       data:
-         - ["java.sql", "Statement", True, "execute", "(String)", "", "Argument[0]", "sql-injection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/java-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["java.sql", "Statement", true, "execute", "(String)", "", "Argument[0]", "sql-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the callable (in this case a method) to be modeled as a sink.
 
 - The first value ``java.sql`` is the package name.
 - The second value ``Statement`` is the name of the class (type) that contains the method.
-- The third value ``True`` is a flag that indicates whether or not the model also applies to all overrides of the method.
+- The third value ``true`` is a flag that indicates whether or not the model also applies to all overrides of the method.
 - The fourth value ``execute`` is the method name.
 - The fifth value ``(String)`` is the method input type signature.
 
@@ -147,20 +176,27 @@ This is the ``getInputStream`` method in the ``Socket`` class, which is located
 
 We need to add a tuple to the ``sourceModel(package, type, subtypes, name, signature, ext, output, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/java-all
-         extensible: sourceModel
-       data:
-         - ["java.net", "Socket", False, "getInputStream", "()", "", "ReturnValue", "remote", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/java-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["java.net", "Socket", false, "getInputStream", "()", "", "ReturnValue", "remote", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the callable (in this case a method) to be modeled as a source.
 
 - The first value ``java.net`` is the package name.
 - The second value ``Socket`` is the name of the class (type) that contains the source.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to all overrides of the method.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to all overrides of the method.
 - The fourth value ``getInputStream`` is the method name.
 - The fifth value ``()`` is the method input type signature.
 
@@ -185,15 +221,22 @@ This pattern covers many of the cases where we need to summarize flow through a
 
 We need to add tuples to the ``summaryModel(package, type, subtypes, name, signature, ext, input, output, kind, provenance)`` extensible predicate by updating a data extension file:
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/java-all
-         extensible: summaryModel
-       data:
-         - ["java.lang", "String", False, "concat", "(String)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
-         - ["java.lang", "String", False, "concat", "(String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/java-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["java.lang", "String", false, "concat", "(String)", "", "Argument[this]", "ReturnValue", "taint", "manual"],
+           ["java.lang", "String", false, "concat", "(String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+         ]
+       }
+     ]
+   }
 
 Each tuple defines flow from one argument to the return value.
 The first row defines flow from the qualifier (``s1`` in the example) to the return value (``t`` in the example) and the second row defines flow from the first argument (``s2`` in the example) to the return value (``t`` in the example).
@@ -203,7 +246,7 @@ These are the same for both of the rows above as we are adding two summaries for
 
 - The first value ``java.lang`` is the package name.
 - The second value ``String`` is the class (type) name.
-- The third value ``False`` is a flag that indicates whether or not the model also applies to all overrides of the method.
+- The third value ``false`` is a flag that indicates whether or not the model also applies to all overrides of the method.
 - The fourth value ``concat`` is the method name.
 - The fifth value ``(String)`` is the method input type signature.
 
@@ -229,15 +272,22 @@ Here we model flow through higher order methods and collection types.
 
 We need to add tuples to the ``summaryModel(package, type, subtypes, name, signature, ext, input, output, kind, provenance)`` extensible predicate by updating a data extension file:
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/java-all
-         extensible: summaryModel
-       data:
-         - ["java.util.stream", "Stream", True, "map", "(Function)", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"]
-         - ["java.util.stream", "Stream", True, "map", "(Function)", "", "Argument[0].ReturnValue", "ReturnValue.Element", "value", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/java-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["java.util.stream", "Stream", true, "map", "(Function)", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"],
+           ["java.util.stream", "Stream", true, "map", "(Function)", "", "Argument[0].ReturnValue", "ReturnValue.Element", "value", "manual"]
+         ]
+       }
+     ]
+   }
 
 Each tuple defines part of the flow that comprises the total flow through the ``map`` method.
 The first five values identify the callable (in this case a method) to be modeled as a summary.
@@ -245,7 +295,7 @@ These are the same for both of the rows above as we are adding two summaries for
 
 - The first value ``java.util.stream`` is the package name.
 - The second value ``Stream`` is the class (type) name.
-- The third value ``True`` is a flag that indicates whether or not the model also applies to all overrides of the method.
+- The third value ``true`` is a flag that indicates whether or not the model also applies to all overrides of the method.
 - The fourth value ``map`` is the method name.
 - The fifth value ``Function`` is the method input type signature.
 
@@ -286,20 +336,27 @@ This is the ``getName`` method in the ``File`` class, which is located in the ``
 
 We need to add a tuple to the ``barrierModel(package, type, subtypes, name, signature, ext, output, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/java-all
-         extensible: barrierModel
-       data:
-         - ["java.io", "File", True, "getName", "()", "", "ReturnValue", "path-injection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/java-all",
+           "extensible": "barrierModel"
+         },
+         "data": [
+           ["java.io", "File", true, "getName", "()", "", "ReturnValue", "path-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the callable (in this case a method) to be modeled as a barrier.
 
 - The first value ``java.io`` is the package name.
 - The second value ``File`` is the name of the class (type) that contains the method.
-- The third value ``True`` is a flag that indicates whether or not the model also applies to all overrides of the method.
+- The third value ``true`` is a flag that indicates whether or not the model also applies to all overrides of the method.
 - The fourth value ``getName`` is the method name.
 - The fifth value ``()`` is the method input type signature.
 
@@ -328,20 +385,27 @@ When the ``isAbsolute`` method returns ``false``, the URI is relative and theref
 
 We need to add a tuple to the ``barrierGuardModel(package, type, subtypes, name, signature, ext, input, acceptingValue, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/java-all
-         extensible: barrierGuardModel
-       data:
-         - ["java.net", "URI", True, "isAbsolute", "()", "", "Argument[this]", "false", "request-forgery", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/java-all",
+           "extensible": "barrierGuardModel"
+         },
+         "data": [
+           ["java.net", "URI", true, "isAbsolute", "()", "", "Argument[this]", "false", "request-forgery", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first five values identify the callable (in this case a method) to be modeled as a barrier guard.
 
 - The first value ``java.net`` is the package name.
 - The second value ``URI`` is the name of the class (type) that contains the method.
-- The third value ``True`` is a flag that indicates whether or not the model guard also applies to all overrides of the method.
+- The third value ``true`` is a flag that indicates whether or not the model guard also applies to all overrides of the method.
 - The fourth value ``isAbsolute`` is the method name.
 - The fifth value ``()`` is the method input type signature.
 
@@ -367,14 +431,21 @@ A neutral model is used to define that there is no flow through a method.
 
 We need to add a tuple to the ``neutralModel(package, type, name, signature, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-   extensions:
-   - addsTo:
-       pack: codeql/java-all
-       extensible: neutralModel
-     data:
-       - ["java.time", "Instant", "now", "()", "summary", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/java-all",
+           "extensible": "neutralModel"
+         },
+         "data": [
+           ["java.time", "Instant", "now", "()", "summary", "manual"]
+         ]
+       }
+     ]
+   }
 
 The first four values identify the callable (in this case a method) to be modeled as a neutral, the fifth value is the kind, and the sixth value is the provenance (origin) of the neutral.
 
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst
index 7ede0d0aff3a..865e7de43dec 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst
@@ -7,18 +7,42 @@ Customizing Library Models for JavaScript
 
 JavaScript analysis can be customized by adding library models in data extension files.
 
-A data extension for JavaScript is a YAML file of the form:
+A data extension for JavaScript can be written using either JSON or YAML. JSON is the preferred format, for performance reasons, and takes the following form:
+
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "<name of extensible predicate>"
+         },
+         "data": [
+           ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."],
+           ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
+           // ...
+         ]
+       }
+     ]
+   }
+
+Files in the JSON format must use the ``.json`` file extension. Single-line (``//``) and multi-line (``/* ... */``) comments are supported as a non-standard JSON extension.
+
+A YAML file has the following form:
 
 .. code-block:: yaml
 
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: <name of extensible predicate>
-      data:
-        - <tuple1>
-        - <tuple2>
-        - ...
+   extensions:
+     - addsTo:
+         pack: codeql/javascript-all
+         extensible: <name of extensible predicate>
+       data:
+         - ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."]
+         - ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
+         - ...
+
+Each data extension file may contain one or more top-level extensions.
 
 The CodeQL library for JavaScript exposes the following extensible predicates:
 
@@ -44,14 +68,21 @@ In this example, we'll show how to add the following argument, passed to ``execa
 Note that this sink is already recognized by the CodeQL JS analysis, but for this example, you could add a tuple to the
 ``sinkModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: sinkModel
-      data:
-        - ["execa", "Member[shell].Argument[0]", "command-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["execa", "Member[shell].Argument[0]", "command-injection"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"execa"``, identifies a set of values from which to begin the search for the sink.
   The string ``"execa"`` means we start at the places where the codebase imports the NPM package ``execa``.
@@ -76,18 +107,21 @@ In this example, we'll show how the ``event.data`` expression below could be mar
 Note that this source is already recognized by the CodeQL JS analysis, but for this example, you could add a tuple to the
 ``sourceModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: sourceModel
-      data:
-        - [
-            "global",
-            "Member[addEventListener].Argument[1].Parameter[0].Member[data]",
-            "remote",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["global", "Member[addEventListener].Argument[1].Parameter[0].Member[data]", "remote"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"global"``, begins the search at references to the global object (also known as ``window`` in browser contexts). This is a special JavaScript object that contains all global variables and methods.
 - ``Member[addEventListener]`` selects accesses to the ``addEventListener`` member.
@@ -113,18 +147,21 @@ For example, it would also pick up this irrelevant source:
 
 We can refine the model by adding the ``WithStringArgument`` component to restrict the set of calls being considered:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: sourceModel
-      data:
-        - [
-            "global",
-            "Member[addEventListener].WithStringArgument[0=message].Argument[1].Parameter[0].Member[data]",
-            "remote",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["global", "Member[addEventListener].WithStringArgument[0=message].Argument[1].Parameter[0].Member[data]", "remote"]
+         ]
+       }
+     ]
+   }
 
 The ``WithStringArgument[0=message]`` component here selects the subset of calls to ``addEventListener`` where the first argument is a string literal with the value ``"message"``.
 
@@ -143,14 +180,21 @@ In this example, we'll show how to add the following SQL injection sink:
 
 We need to add a tuple to the ``sinkModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: sinkModel
-      data:
-        - ["mysql.Connection", "Member[query].Argument[0]", "sql-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["mysql.Connection", "Member[query].Argument[0]", "sql-injection"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"mysql.Connection"``, begins the search at any expression whose value is known to be an instance of
   the ``Connection`` type from the ``mysql`` package. This will select the ``connection`` parameter above because of its type annotation.
@@ -162,11 +206,12 @@ This works in this example because the ``connection`` parameter has a type annot
 
 Note that there is a significant difference between the following two rows:
 
-.. code-block:: yaml
+.. code-block:: json
 
-        data:
-        - ["mysql.Connection", "", ...]
-        - ["mysql", "Member[Connection]", ...]
+   "data": [
+     ["mysql.Connection", "" /* ... */],
+     ["mysql", "Member[Connection]" /* ... */]
+   ]
 
 The first row matches instances of ``mysql.Connection``, which are objects that encapsulate a MySQL connection.
 The second row would match something like ``require('mysql').Connection``, which is not itself a connection object.
@@ -188,14 +233,21 @@ There is no type annotation on ``connection``, and there is no indication of wha
 By adding a tuple to the ``typeModel(type1, type2, path)`` extensible predicate we can tell our model that
 this function returns an instance of ``mysql.Connection``:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: typeModel
-      data:
-        - ["mysql.Connection", "@example/db", "Member[getConnection].ReturnValue"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "typeModel"
+         },
+         "data": [
+           ["mysql.Connection", "@example/db", "Member[getConnection].ReturnValue"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"mysql.Connection"``, names the type that we're adding a new definition for.
 - The second column, ``"@example/db"``, begins the search at imports of the hypothetical NPM package ``@example/db``.
@@ -209,9 +261,9 @@ The mechanism used here is how library models work for both TypeScript and plain
 A good library model contains ``typeModel`` tuples to ensure it works even in codebases without type annotations.
 For example, the ``mysql`` model that is included with the CodeQL JS analysis includes this type definition (among many others):
 
-.. code-block:: yaml
+.. code-block:: json
 
-  - ["mysql.Connection", "mysql", "Member[createConnection].ReturnValue"]
+   ["mysql.Connection", "mysql", "Member[createConnection].ReturnValue"]
 
 Example: Using fuzzy models to simplify modeling
 ------------------------------------------------
@@ -228,14 +280,21 @@ In this example, we'll show how to add the following SQL injection sink using a
 
 We need to add a tuple for a fuzzy model to the ``sinkModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: sinkModel
-      data:
-        - ["mysql", "Fuzzy.Member[query].Argument[0]", "sql-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["mysql", "Fuzzy.Member[query].Argument[0]", "sql-injection"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"mysql"``, begins the search at places where the `mysql` package is imported.
 - ``Fuzzy`` selects all objects that appear to originate from the `mysql` package, such as the `pool`, `conn`, `err`, and `rows` objects.
@@ -247,21 +306,31 @@ We need to add a tuple for a fuzzy model to the ``sinkModel(type, path, kind)``
 
 For reference, a more detailed model might look like this, as described in the preceding examples:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: sinkModel
-      data:
-        - ["mysql.Connection", "Member[query].Argument[0]", "sql-injection"]
-
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: typeModel
-      data:
-        - ["mysql.Pool", "mysql", "Member[createPool].ReturnValue"]
-        - ["mysql.Connection", "mysql.Pool", "Member[getConnection].Argument[0].Parameter[1]"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["mysql.Connection", "Member[query].Argument[0]", "sql-injection"]
+         ]
+       },
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "typeModel"
+         },
+         "data": [
+           ["mysql.Pool", "mysql", "Member[createPool].ReturnValue"],
+           ["mysql.Connection", "mysql.Pool", "Member[getConnection].Argument[0].Parameter[1]"]
+         ]
+       }
+     ]
+   }
 
 The model using the ``Fuzzy`` component is simpler, at the cost of being approximate.
 This technique is useful when modeling a large or complex library, where it is difficult to write a detailed model.
@@ -278,20 +347,21 @@ In this example, we'll show how to add flow through calls to `decodeURIComponent
 Note that this flow is already recognized by the CodeQL JS analysis, but for this example, you could add a tuple to the
 ``summaryModel(type, path, input, output, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: summaryModel
-      data:
-        - [
-            "global",
-            "Member[decodeURIComponent]",
-            "Argument[0]",
-            "ReturnValue",
-            "taint",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["global", "Member[decodeURIComponent]", "Argument[0]", "ReturnValue", "taint"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"global"``, begins the search for relevant calls at references to the global object.
   In JavaScript, global variables are properties of the global object, so this lets us access global variables or functions.
@@ -315,20 +385,21 @@ In this example, we'll show how to add flow through calls to ``forEach`` from th
 Note that this flow is already recognized by the CodeQL JS analysis, but for this example, you could add a tuple to the
 ``summaryModel(type, path, input, output, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: summaryModel
-      data:
-        - [
-            "underscore",
-            "Member[forEach]",
-            "Argument[0].ArrayElement",
-            "Argument[1].Parameter[0]",
-            "value",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["underscore", "Member[forEach]", "Argument[0].ArrayElement", "Argument[1].Parameter[0]", "value"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"underscore"``, begins the search for relevant calls at places where the ``underscore`` package is imported.
 - The second column, ``Member[forEach]``, selects references to the ``forEach`` member from the ``underscore`` package.
@@ -365,18 +436,21 @@ on the incoming request objects:
 
 We need to add a tuple to the ``sourceModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: sourceModel
-      data:
-        - [
-            "@example/middleware",
-            "Member[injectData].ReturnValue.GuardedRouteHandler.Parameter[0].Member[data]",
-            "remote",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["@example/middleware", "Member[injectData].ReturnValue.GuardedRouteHandler.Parameter[0].Member[data]", "remote"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"@example/middleware"``, begins the search at imports of the hypothetical NPM package ``@example/middleware``.
 - ``Member[injectData]`` selects accesses to the ``injectData`` member.
@@ -398,14 +472,21 @@ In this example, we'll show how to add the return value of ``encodeURIComponent`
 
 We need to add a tuple to the ``barrierModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: barrierModel
-      data:
-        - ["global", "Member[encodeURIComponent].ReturnValue", "html-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "barrierModel"
+         },
+         "data": [
+           ["global", "Member[encodeURIComponent].ReturnValue", "html-injection"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"global"``, begins the search for relevant calls at references to the global object.
 - The second column, ``Member[encodeURIComponent].ReturnValue``, selects the return value of the ``encodeURIComponent`` function.
@@ -425,14 +506,21 @@ Consider a function called `isValid` which returns `true` when the data is consi
 
 We need to add a tuple to the ``barrierGuardModel(type, path, acceptingValue, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: barrierGuardModel
-      data:
-        - ["my-package", "Member[isValid].Argument[0]", "true", "sql-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "barrierGuardModel"
+         },
+         "data": [
+           ["my-package", "Member[isValid].Argument[0]", "true", "sql-injection"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"my-package"``, begins the search at imports of the hypothetical NPM package ``my-package``.
 - The second column, ``Member[isValid].Argument[0]``, selects the first argument of the `isValid` function. This is the value being validated.
@@ -458,14 +546,21 @@ Adds a new taint source. Most taint-tracking queries will use the new source.
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: sourceModel
-      data:
-        - ["global", "Member[user].Member[name]", "remote"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["global", "Member[user].Member[name]", "remote"]
+         ]
+       }
+     ]
+   }
 
 sinkModel(type, path, kind)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -478,14 +573,21 @@ Adds a new taint sink. Sinks are query-specific and will typically affect one or
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: sinkModel
-      data:
-        - ["global", "Member[eval].Argument[0]", "code-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["global", "Member[eval].Argument[0]", "code-injection"]
+         ]
+       }
+     ]
+   }
 
 summaryModel(type, path, input, output, kind)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -500,20 +602,21 @@ Adds flow through a function call.
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/javascript-all
-        extensible: summaryModel
-      data:
-        - [
-            "global",
-            "Member[decodeURIComponent]",
-            "Argument[0]",
-            "ReturnValue",
-            "taint",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["global", "Member[decodeURIComponent]", "Argument[0]", "ReturnValue", "taint"]
+         ]
+       }
+     ]
+   }
 
 typeModel(type1, type2, path)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -526,18 +629,21 @@ Adds a new definition of a type.
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-  - addsTo:
-      pack: codeql/javascript-all
-      extensible: typeModel
-    data:
-      - [
-          "mysql.Connection",
-          "@example/db",
-          "Member[getConnection].ReturnValue",
-        ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/javascript-all",
+           "extensible": "typeModel"
+         },
+         "data": [
+           ["mysql.Connection", "@example/db", "Member[getConnection].ReturnValue"]
+         ]
+       }
+     ]
+   }
 
 Types
 -----
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-python.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-python.rst
index ee4565caff3e..507fd7ae223f 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-python.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-python.rst
@@ -7,18 +7,42 @@ Customizing Library Models for Python
 
 Python analysis can be customized by adding library models in data extension files.
 
-A data extension for Python is a YAML file of the form:
+A data extension for Python can be written using either JSON or YAML. JSON is the preferred format, for performance reasons, and takes the following form:
+
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "<name of extensible predicate>"
+         },
+         "data": [
+           ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."],
+           ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
+           // ...
+         ]
+       }
+     ]
+   }
+
+Files in the JSON format must use the ``.json`` file extension. Single-line (``//``) and multi-line (``/* ... */``) comments are supported as a non-standard JSON extension.
+
+A YAML file has the following form:
 
 .. code-block:: yaml
 
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: <name of extensible predicate>
-      data:
-        - <tuple1>
-        - <tuple2>
-        - ...
+   extensions:
+     - addsTo:
+         pack: codeql/python-all
+         extensible: <name of extensible predicate>
+       data:
+         - ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."]
+         - ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
+         - ...
+
+Each data extension file may contain one or more top-level extensions.
 
 The CodeQL library for Python exposes the following extensible predicates:
 
@@ -44,14 +68,21 @@ In this example, we'll show how to add the following argument, passed to ``sudo`
 Note that this sink is already recognized by the CodeQL Python analysis, but for this example, you could add a tuple to the
 ``sinkModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: sinkModel
-      data:
-        - ["fabric", "Member[operations].Member[sudo].Argument[0]", "command-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["fabric", "Member[operations].Member[sudo].Argument[0]", "command-injection"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"fabric"``, identifies a set of values from which to begin the search for the sink.
   The string ``"fabric"`` means we start at the places where the codebase imports the package ``fabric``.
@@ -77,14 +108,21 @@ Often sinks are found as arguments to methods rather than functions. In this exa
 Note that this sink is already recognized by the CodeQL Python analysis, but for this example, you could add a tuple to the
 ``sinkModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: sinkModel
-      data:
-        - ["invoke", "Member[Context].Instance.Member[run].Argument[0]", "command-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["invoke", "Member[Context].Instance.Member[run].Argument[0]", "command-injection"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"invoke"``, begins the search at places where the codebase imports the package ``invoke``.
 - The second column is an access path that is evaluated from left to right, starting at the values that were identified by the first column.
@@ -100,14 +138,21 @@ Note that the ``Instance`` component is used to select instances of a class, inc
 Since methods on instances are common targets, we have a more compact syntax for selecting them. The first column, the type, is allowed to contain a dotted path ending in a class name.
 This will begin the search at instances of that class. Using this syntax, the previous example could be written as:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: sinkModel
-      data:
-        - ["invoke.Context", "Member[run].Argument[0]", "command-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["invoke.Context", "Member[run].Argument[0]", "command-injection"]
+         ]
+       }
+     ]
+   }
 
 Continued example: Multiple ways to obtain a type
 -------------------------------------------------
@@ -124,14 +169,21 @@ Comparing to the previous Python snippet, the ``Context`` class is now found as
 We could add a data extension similar to the previous one, but with the type ``invoke.context.Context``.
 However, we can also use the ``typeModel(type1, type2, path)`` extensible predicate to describe how to reach ``invoke.Context`` from ``invoke.context.Context``:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: typeModel
-      data:
-        - ["invoke.Context", "invoke.context.Context", ""]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "typeModel"
+         },
+         "data": [
+           ["invoke.Context", "invoke.context.Context", ""]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"invoke.Context"``, is the name of the type to reach.
 - The second column, ``"invoke.context.Context"``, is the name of the type from which to evaluate the path.
@@ -162,18 +214,21 @@ This filename is what we want to mark as a taint source. An example use looks as
 Note that this source is already recognized by the CodeQL Python analysis, but for this example, you could add a tuple to the
 ``sourceModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: sourceModel
-      data:
-        - [
-            "django.db.models.FileField!",
-            "Call.Argument[0,upload_to:].Parameter[1]",
-            "remote",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["django.db.models.FileField!", "Call.Argument[0,upload_to:].Parameter[1]", "remote"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"django.db.models.FileField!"``, is a dotted path to the ``FileField`` class from the ``django.db.models`` package.
   The ``!`` at the end of the type name indicates that we are looking for the class itself rather than instances of this class.
@@ -201,20 +256,21 @@ In this example, we'll show how to add flow through calls to ``re.compile``.
 Note that this flow is already recognized by the CodeQL Python analysis, but for this example, you could add a tuple to the
 ``summaryModel(type, path, input, output, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: summaryModel
-      data:
-        - [
-            "re",
-            "Member[compile]",
-            "Argument[0,pattern:]",
-            "ReturnValue.Attribute[pattern]",
-            "value",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["re", "Member[compile]", "Argument[0,pattern:]", "ReturnValue.Attribute[pattern]", "value"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"re"``, begins the search for relevant calls at places where the ``re`` package is imported.
 - The second column, ``"Member[compile]"``, is a path leading to the function calls we wish to model.
@@ -236,20 +292,21 @@ In this example, we'll show how to add flow through calls to the built-in functi
 Note that this flow is already recognized by the CodeQL Python analysis, but for this example, you could add a tuple to the
 ``summaryModel(type, path, input, output, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: summaryModel
-      data:
-        - [
-            "builtins",
-            "Member[sorted]",
-            "Argument[0]",
-            "ReturnValue",
-            "taint",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["builtins", "Member[sorted]", "Argument[0]", "ReturnValue", "taint"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"builtins"``, begins the search for relevant calls among references to the built-in names.
   In Python, many built-in functions are available. Technically, most of these are part of the ``builtins`` package, but they can be accessed without an explicit import. When we write ``builtins`` in the first column, we will find both the implicit and explicit references to the built-in functions.
@@ -261,20 +318,21 @@ Note that this flow is already recognized by the CodeQL Python analysis, but for
 
 We might also provide a summary stating that the elements of the input list are preserved in the output list:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: summaryModel
-      data:
-        - [
-            "builtins",
-            "Member[sorted]",
-            "Argument[0].ListElement",
-            "ReturnValue.ListElement",
-            "value",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["builtins", "Member[sorted]", "Argument[0].ListElement", "ReturnValue.ListElement", "value"]
+         ]
+       }
+     ]
+   }
 
 The tracking of list elements is imprecise in that the analysis does not know where in the list the tracked value is found.
 So this summary simply states that if the value is found somewhere in the input list, it will also be found somewhere in the output list, unchanged.
@@ -291,14 +349,21 @@ In this example, we'll show how to add the return value of ``html.escape`` as a
 
 We need to add a tuple to the ``barrierModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: barrierModel
-      data:
-        - ["html", "Member[escape].ReturnValue", "html-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "barrierModel"
+         },
+         "data": [
+           ["html", "Member[escape].ReturnValue", "html-injection"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"html"``, begins the search at places where the ``html`` module is imported.
 - The second column, ``Member[escape].ReturnValue``, selects the return value of the ``escape`` function from the ``html`` module.
@@ -318,19 +383,21 @@ Consider the function ``url_has_allowed_host_and_scheme`` from the ``django.util
 
 We need to add a tuple to the ``barrierGuardModel(type, path, acceptingValue, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: barrierGuardModel
-      data:
-        - [
-            "django",
-            "Member[utils].Member[http].Member[url_has_allowed_host_and_scheme].Argument[0,url:]",
-            "true",
-            "url-redirection",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "barrierGuardModel"
+         },
+         "data": [
+           ["django", "Member[utils].Member[http].Member[url_has_allowed_host_and_scheme].Argument[0,url:]", "true", "url-redirection"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"django"``, begins the search at places where the ``django`` package is imported.
 - The second column, ``Member[utils].Member[http].Member[url_has_allowed_host_and_scheme].Argument[0,url:]``, selects the first argument (or the keyword argument ``url``) of the ``url_has_allowed_host_and_scheme`` function in the ``django.utils.http`` module. This is the value being validated.
@@ -356,14 +423,21 @@ Adds a new taint source. Most taint-tracking queries will use the new source.
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: sourceModel
-      data:
-        - ["flask", "Member[request]", "remote"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["flask", "Member[request]", "remote"]
+         ]
+       }
+     ]
+   }
 
 sinkModel(type, path, kind)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -376,14 +450,21 @@ Adds a new taint sink. Sinks are query-specific and will typically affect one or
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: sinkModel
-      data:
-        - ["builtins", "Member[exec].Argument[0]", "code-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["builtins", "Member[exec].Argument[0]", "code-injection"]
+         ]
+       }
+     ]
+   }
 
 summaryModel(type, path, input, output, kind)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -398,20 +479,21 @@ Adds flow through a function call.
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/python-all
-        extensible: summaryModel
-      data:
-        - [
-            "builtins",
-            "Member[reversed]",
-            "Argument[0]",
-            "ReturnValue",
-            "taint",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["builtins", "Member[reversed]", "Argument[0]", "ReturnValue", "taint"]
+         ]
+       }
+     ]
+   }
 
 typeModel(type1, type2, path)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -426,18 +508,21 @@ In the context of instances, this describes how to obtain an instance of ``type1
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-  - addsTo:
-      pack: codeql/python-all
-      extensible: typeModel
-    data:
-      - [
-          "flask.Response",
-          "flask",
-          "Member[jsonify].ReturnValue",
-        ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/python-all",
+           "extensible": "typeModel"
+         },
+         "data": [
+           ["flask.Response", "flask", "Member[jsonify].ReturnValue"]
+         ]
+       }
+     ]
+   }
 
 Types
 -----
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-ruby.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-ruby.rst
index beccf82327f2..883203c675a5 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-ruby.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-ruby.rst
@@ -8,18 +8,42 @@ Customizing library models for Ruby
 
 Ruby analysis can be customized by adding library models in data extension files.
 
-A data extension for Ruby is a YAML file of the form:
+A data extension for Ruby can be written using either JSON or YAML. JSON is the preferred format, for performance reasons, and takes the following form:
+
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/ruby-all",
+           "extensible": "<name of extensible predicate>"
+         },
+         "data": [
+           ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."],
+           ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
+           // ...
+         ]
+       }
+     ]
+   }
+
+Files in the JSON format must use the ``.json`` file extension. Single-line (``//``) and multi-line (``/* ... */``) comments are supported as a non-standard JSON extension.
+
+A YAML file has the following form:
 
 .. code-block:: yaml
 
-  extensions:
-    - addsTo:
-        pack: codeql/ruby-all
-        extensible: <name of extensible predicate>
-      data:
-        - <tuple1>
-        - <tuple2>
-        - ...
+   extensions:
+     - addsTo:
+         pack: codeql/ruby-all
+         extensible: <name of extensible predicate>
+       data:
+         - ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."]
+         - ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
+         - ...
+
+Each data extension file may contain one or more top-level extensions.
 
 The CodeQL library for Ruby exposes the following extensible predicates:
 
@@ -45,15 +69,21 @@ In this example, we'll show how to add the following argument, passed to ``tty-c
 
 We need to add a tuple to the ``sinkModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/ruby-all
-        extensible: sinkModel
-      data:
-        - ["TTY::Command", "Method[run].Argument[0]", "command-injection"]
-
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/ruby-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["TTY::Command", "Method[run].Argument[0]", "command-injection"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"TTY::Command"``, identifies a set of values from which to begin the search for the sink.
   The string ``"TTY::Command"`` means we start at the places where the codebase constructs instances of the class ``TTY::Command``.
@@ -79,18 +109,21 @@ In this example, we'll show how the 'x' parameter below could be marked as a rem
 
 We need to add a tuple to the ``sourceModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/ruby-all
-        extensible: sourceModel
-      data:
-        - [
-            "Sinatra::Base!",
-            "Method[get].Argument[block].Parameter[0]",
-            "remote",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/ruby-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["Sinatra::Base!", "Method[get].Argument[block].Parameter[0]", "remote"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"Sinatra::Base!"``, begins the search at references to the ``Sinatra::Base`` class.
   The ``!`` suffix indicates that we want to search for references to the class itself, rather than instances of the class.
@@ -113,14 +146,21 @@ In this example, we'll show how to add the following SQL injection sink:
 
 We need to add a tuple to the ``sinkModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/ruby-all
-        extensible: sinkModel
-      data:
-        - ["Mysql2::Client", "Method[query].Argument[0]", "sql-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/ruby-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["Mysql2::Client", "Method[query].Argument[0]", "sql-injection"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"Mysql2::Client"``, begins the search at any instance of the ``Mysql2::Client`` class.
 - ``Method[query]`` selects any call to the ``query`` method on that instance.
@@ -145,14 +185,21 @@ may have many models for the various methods available. Because ``Mysql2::EM::Cl
 Instead of updating all our models to include both classes, we can add a tuple to the ``typeModel(type, subtype, ext)`` extensible predicate to indicate that
 ``Mysql2::EM::Client`` is a subclass of ``Mysql2::Client``:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/ruby-all
-        extensible: typeModel
-      data:
-        - ["Mysql2::Client", "Mysql2::EM::Client", ""]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/ruby-all",
+           "extensible": "typeModel"
+         },
+         "data": [
+           ["Mysql2::Client", "Mysql2::EM::Client", ""]
+         ]
+       }
+     ]
+   }
 
 Example: Adding flow through 'URI.decode_uri_component'
 -------------------------------------------------------
@@ -165,20 +212,21 @@ In this example, we'll show how to add flow through calls to 'URI.decode_uri_com
 
 We need to add a tuple to the ``summaryModel(type, path, input, output, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/ruby-all
-        extensible: summaryModel
-      data:
-        - [
-            "URI!",
-            "Method[decode_uri_component]",
-            "Argument[0]",
-            "ReturnValue",
-            "taint",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/ruby-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["URI!", "Method[decode_uri_component]", "Argument[0]", "ReturnValue", "taint"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"URI!"``, begins the search for relevant calls at references to the ``URI`` class.
   The ``!`` suffix indicates that we are looking for the class itself, rather than instances of the class.
@@ -201,20 +249,21 @@ In this example, we'll show how to add flow through calls to ``File#each`` from
 
 We need to add a tuple to the ``summaryModel(type, path, input, output, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/ruby-all
-        extensible: summaryModel
-      data:
-        - [
-            "File",
-            "Method[each]",
-            "Argument[self]",
-            "Argument[block].Parameter[0]",
-            "taint",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/ruby-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["File", "Method[each]", "Argument[self]", "Argument[block].Parameter[0]", "taint"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"File"``, begins the search for relevant calls at places where the ``File`` class is used.
 - The second column, ``Method[each]``, selects references to the ``each`` method on the ``File`` class.
@@ -240,14 +289,21 @@ In this example, we'll show how to add the return value of ``Mysql2::Client#esca
 
 We need to add a tuple to the ``barrierModel(type, path, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/ruby-all
-        extensible: barrierModel
-      data:
-        - ["Mysql2::Client!", "Method[escape].ReturnValue", "sql-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/ruby-all",
+           "extensible": "barrierModel"
+         },
+         "data": [
+           ["Mysql2::Client!", "Method[escape].ReturnValue", "sql-injection"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"Mysql2::Client!"``, begins the search for relevant calls at references to the ``Mysql2::Client`` class.
   The ``!`` suffix indicates that we want to search for references to the class itself, rather than instances of the class.
@@ -269,14 +325,21 @@ Consider a validation method ``Validator.is_safe`` which returns ``true`` when t
 
 We need to add a tuple to the ``barrierGuardModel(type, path, acceptingValue, kind)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/ruby-all
-        extensible: barrierGuardModel
-      data:
-        - ["Validator!", "Method[is_safe].Argument[0]", "true", "sql-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/ruby-all",
+           "extensible": "barrierGuardModel"
+         },
+         "data": [
+           ["Validator!", "Method[is_safe].Argument[0]", "true", "sql-injection"]
+         ]
+       }
+     ]
+   }
 
 - The first column, ``"Validator!"``, begins the search at references to the ``Validator`` class.
   The ``!`` suffix indicates that we want to search for references to the class itself, rather than instances of the class.
@@ -303,14 +366,21 @@ Adds a new taint source. Most taint-tracking queries will use the new source.
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/ruby-all
-        extensible: sourceModel
-      data:
-        - ["User", "Method[name]", "remote"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/ruby-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["User", "Method[name]", "remote"]
+         ]
+       }
+     ]
+   }
 
 sinkModel(type, path, kind)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -323,14 +393,21 @@ Adds a new taint sink. Sinks are query-specific and will typically affect one or
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/ruby-all
-        extensible: sinkModel
-      data:
-        - ["ExecuteShell", "Method[run].Argument[0]", "command-injection"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/ruby-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["ExecuteShell", "Method[run].Argument[0]", "command-injection"]
+         ]
+       }
+     ]
+   }
 
 summaryModel(type, path, input, output, kind)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -345,20 +422,21 @@ Adds flow through a method call.
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/ruby-all
-        extensible: summaryModel
-      data:
-        - [
-            "URI",
-            "Method[decode_uri_component]",
-            "Argument[0]",
-            "ReturnValue",
-            "taint",
-          ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/ruby-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["URI", "Method[decode_uri_component]", "Argument[0]", "ReturnValue", "taint"]
+         ]
+       }
+     ]
+   }
 
 typeModel(type1, type2, path)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -371,18 +449,21 @@ Adds a new definition of a type.
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-  - addsTo:
-      pack: codeql/ruby-all
-      extensible: typeModel
-    data:
-      - [
-          "Mysql2::Client",
-          "MyDbWrapper",
-          "Method[getConnection].ReturnValue",
-        ]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/ruby-all",
+           "extensible": "typeModel"
+         },
+         "data": [
+           ["Mysql2::Client", "MyDbWrapper", "Method[getConnection].ReturnValue"]
+         ]
+       }
+     ]
+   }
 
 Types
 -----
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-rust.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-rust.rst
index 7057812b31f5..2c2298768aad 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-rust.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-rust.rst
@@ -25,7 +25,29 @@ Syntax used to define an element in an extension file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Each model of an element is defined using a data extension where each tuple constitutes a model.
-A data extension file to extend the standard Rust queries included with CodeQL is a YAML file with the form:
+A data extension file to extend the standard Rust queries included with CodeQL can be written using either JSON or YAML. JSON is the preferred format, for performance reasons, and takes the following form:
+
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "<name of extensible predicate>"
+         },
+         "data": [
+           ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."],
+           ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
+           // ...
+         ]
+       }
+     ]
+   }
+
+Files in the JSON format must use the ``.json`` file extension. Single-line (``//``) and multi-line (``/* ... */``) comments are supported as a non-standard JSON extension.
+
+A YAML file has the following form:
 
 .. code-block:: yaml
 
@@ -34,11 +56,11 @@ A data extension file to extend the standard Rust queries included with CodeQL i
         pack: codeql/rust-all
         extensible: <name of extensible predicate>
       data:
-        - <tuple1>
-        - <tuple2>
+        - ["<value for row 1, column 1>", "<value for row 1, column 2>", "..."]
+        - ["<value for row 2, column 1>", "<value for row 2, column 2>", "..."]
         - ...
 
-Each YAML file may contain one or more top-level extensions.
+Each data extension file may contain one or more top-level extensions.
 
 - ``addsTo`` defines the CodeQL pack name and extensible predicate that the extension is injected into.
 - ``data`` defines one or more rows of tuples that are injected as values into the extensible predicate. The number of columns and their types must match the definition of the extensible predicate.
@@ -74,7 +96,7 @@ Canonical paths take the following forms:
 - **Free functions**: ``crate::module::function``, for example ``std::env::var`` or ``std::fs::read_to_string``.
 - **Inherent methods**: ``<Type>::method``, for example ``<std::fs::File>::open``.
 - **Trait methods with a concrete type**: ``<Type as Trait>::method``, for example ``<std::fs::File as std::io::Read>::read_to_end``.
-- **Trait methods with a wildcard type**: ``<_ as Trait>::method``, for example ``<_ as core::clone::Clone>::clone``. This form matches any type that implements the trait and is useful for modeling broadly applicable trait methods. For a type that has a specific model (<Type as Trait>::method), that model will take precedence over the trait model.
+- **Trait methods**: ``<Trait>::method``, for example ``<core::clone::Clone>::clone``. This form matches any type that implements the trait and is useful for modeling broadly applicable trait methods. For a type that has a specific model (``<Type as Trait>::method``), that model will take precedence over the trait model.
 
 Examples of custom model definitions
 -------------------------------------
@@ -99,15 +121,21 @@ This example shows how the Rust query pack models the first argument of the ``sq
 
 We need to add a tuple to the ``sinkModel(path, input, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: sinkModel
-      data:
-        - ["sqlx_core::query::query", "Argument[0]", "sql-injection", "manual"]
-
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["sqlx_core::query::query", "Argument[0]", "sql-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 - The first value ``sqlx_core::query::query`` is the canonical path of the function to model. Note that this is the internal module path (``sqlx_core::query::query``), not the public re-export path (``sqlx::query``).
 - The second value ``Argument[0]`` is the access path to the first argument of the function call, which is the SQL query string. This is the location of the sink.
@@ -128,15 +156,21 @@ This example shows how the Rust query pack models the return value of the ``reqw
 
 We need to add a tuple to the ``sourceModel(path, output, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: sourceModel
-      data:
-        - ["reqwest::get", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "remote", "manual"]
-
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["reqwest::get", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "remote", "manual"]
+         ]
+       }
+     ]
+   }
 
 - The first value ``reqwest::get`` is the canonical path of the function.
 - The second value ``ReturnValue.Future.Field[core::result::Result::Ok(0)]`` is the access path to the output. This compound path is read left to right:
@@ -162,14 +196,21 @@ This example shows how the Rust query pack models the return value of ``std::env
 
 We need to add a tuple to the ``sourceModel(path, output, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: sourceModel
-      data:
-        - ["std::env::var", "ReturnValue.Field[core::result::Result::Ok(0)]", "environment", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["std::env::var", "ReturnValue.Field[core::result::Result::Ok(0)]", "environment", "manual"]
+         ]
+       }
+     ]
+   }
 
 - The first value ``std::env::var`` is the canonical path to the ``var`` function in the ``std::env`` module.
 - The second value ``ReturnValue.Field[core::result::Result::Ok(0)]`` selects the ``Ok`` variant of the returned ``Result<String, VarError>``.
@@ -190,15 +231,21 @@ This example shows how the Rust query pack models taint flow through the ``text`
 
 We need to add a tuple to the ``summaryModel(path, input, output, kind, provenance)`` extensible predicate by updating a data extension file:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: summaryModel
-      data:
-        - ["<reqwest::response::Response>::text", "Argument[self]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["<reqwest::response::Response>::text", "Argument[self]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+         ]
+       }
+     ]
+   }
 
 - The first value ``<reqwest::response::Response>::text`` is the canonical path. Note the format ``<Type>::method`` used for inherent methods. Also note that the canonical path uses the internal module path ``reqwest::response::Response``, not just ``reqwest::Response``.
 - The second value ``Argument[self]`` is the access path to the input. ``Argument[self]`` refers to the receiver of the method call (``response`` in the example).
@@ -222,15 +269,22 @@ This example shows how the Rust query pack models taint flow through the ``join`
 
 We need to add tuples to the ``summaryModel(path, input, output, kind, provenance)`` extensible predicate by updating a data extension file:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: summaryModel
-      data:
-        - ["<std::path::Path>::join", "Argument[self].Reference", "ReturnValue", "taint", "manual"]
-        - ["<std::path::Path>::join", "Argument[0]", "ReturnValue", "taint", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["<std::path::Path>::join", "Argument[self].Reference", "ReturnValue", "taint", "manual"],
+           ["<std::path::Path>::join", "Argument[0]", "ReturnValue", "taint", "manual"]
+         ]
+       }
+     ]
+   }
 
 Since we are adding flow through a method, we need to add tuples to the ``summaryModel`` extensible predicate. Each tuple defines flow from one input to the output. The first row defines flow from the receiver and the second row defines flow from the first argument.
 
@@ -263,17 +317,23 @@ This example shows how the Rust query pack models a more complex flow through a
 
 We need to add tuples to the ``summaryModel(path, input, output, kind, provenance)`` extensible predicate by updating a data extension file:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: summaryModel
-      data:
-        - ["<_ as core::iter::traits::iterator::Iterator>::map", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
-
-
-- The first value ``<_ as core::iter::traits::iterator::Iterator>::map`` is the canonical path. The ``<_ as Trait>::method`` form uses a wildcard type (``_``) to match any type that implements the ``Iterator`` trait.
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["<core::iter::traits::iterator::Iterator>::map", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
+         ]
+       }
+     ]
+   }
+
+- The first value ``<core::iter::traits::iterator::Iterator>::map`` is the canonical path. The ``<Trait>::method`` form matches any type that implements the ``Iterator`` trait.
 - The second value ``Argument[self].Element`` is the access path to the input — the elements of the iterator (the receiver).
 - The third value ``Argument[0].Parameter[0]`` is the access path to the output:
 
@@ -290,14 +350,21 @@ This example shows how the Rust query pack models the ``Option::map`` method as
 
 A neutral model prevents generated or inherited models of a specific category (``source``, ``sink``, or ``summary``) from being applied to a callable. This is useful when an automatically generated model incorrectly identifies a callable as, for example, a sink.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: neutralModel
-      data:
-        - ["<core::option::Option>::map", "sink", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "neutralModel"
+         },
+         "data": [
+           ["<core::option::Option>::map", "sink", "manual"]
+         ]
+       }
+     ]
+   }
 
 Since we are adding a neutral model, we need to add a tuple to the ``neutralModel`` extensible predicate. The tuple has three values:
 
@@ -322,15 +389,21 @@ Consider a hypothetical function ``my_crate::sanitize::escape_sql`` which escape
 
 We need to add a tuple to the ``barrierModel(path, output, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: barrierModel
-      data:
-        - ["my_crate::sanitize::escape_sql", "ReturnValue", "sql-injection", "manual"]
-
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "barrierModel"
+         },
+         "data": [
+           ["my_crate::sanitize::escape_sql", "ReturnValue", "sql-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 - The first value ``my_crate::sanitize::escape_sql`` is the canonical path of the function.
 - The second value ``ReturnValue`` is the access path to the output of the barrier, which means that the return value is considered sanitized.
@@ -356,15 +429,21 @@ Consider a hypothetical function ``my_crate::validate::is_safe_path`` which retu
 
 We need to add a tuple to the ``barrierGuardModel(path, input, acceptingValue, kind, provenance)`` extensible predicate by updating a data extension file.
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: barrierGuardModel
-      data:
-        - ["my_crate::validate::is_safe_path", "Argument[0]", "true", "path-injection", "manual"]
-
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "barrierGuardModel"
+         },
+         "data": [
+           ["my_crate::validate::is_safe_path", "Argument[0]", "true", "path-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 - The first value ``my_crate::validate::is_safe_path`` is the canonical path of the function.
 - The second value ``Argument[0]`` is the access path to the input whose flow is blocked. In this case, the first argument to the function (``user_path`` in the example).
@@ -399,14 +478,21 @@ Adds a new taint source. Most taint-tracking queries will use the new source.
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: sourceModel
-      data:
-        - ["std::env::var", "ReturnValue.Field[core::result::Result::Ok(0)]", "environment", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "sourceModel"
+         },
+         "data": [
+           ["std::env::var", "ReturnValue.Field[core::result::Result::Ok(0)]", "environment", "manual"]
+         ]
+       }
+     ]
+   }
 
 sinkModel(path, input, kind, provenance)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -420,14 +506,21 @@ Adds a new taint sink. Sinks are query-specific and will typically affect one or
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: sinkModel
-      data:
-        - ["sqlx_core::query::query", "Argument[0]", "sql-injection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "sinkModel"
+         },
+         "data": [
+           ["sqlx_core::query::query", "Argument[0]", "sql-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 summaryModel(path, input, output, kind, provenance)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -442,14 +535,21 @@ Adds flow through a function or method call.
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: summaryModel
-      data:
-        - ["<reqwest::response::Response>::text", "Argument[self]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "summaryModel"
+         },
+         "data": [
+           ["<reqwest::response::Response>::text", "Argument[self]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+         ]
+       }
+     ]
+   }
 
 neutralModel(path, kind, provenance)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -462,14 +562,21 @@ Prevents generated or inherited models of the specified category from being appl
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: neutralModel
-      data:
-        - ["<core::option::Option>::map", "sink", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "neutralModel"
+         },
+         "data": [
+           ["<core::option::Option>::map", "sink", "manual"]
+         ]
+       }
+     ]
+   }
 
 barrierModel(path, output, kind, provenance)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -483,14 +590,21 @@ Adds a new barrier that stops the flow of taint at the specified element.
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: barrierModel
-      data:
-        - ["my_crate::sanitize::escape_sql", "ReturnValue", "sql-injection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "barrierModel"
+         },
+         "data": [
+           ["my_crate::sanitize::escape_sql", "ReturnValue", "sql-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 barrierGuardModel(path, input, acceptingValue, kind, provenance)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -505,14 +619,21 @@ Adds a new barrier guard that stops the flow of taint when a conditional check i
 
 Example:
 
-.. code-block:: yaml
-
-  extensions:
-    - addsTo:
-        pack: codeql/rust-all
-        extensible: barrierGuardModel
-      data:
-        - ["my_crate::validate::is_safe_path", "Argument[0]", "true", "path-injection", "manual"]
+.. code-block:: json
+
+   {
+     "extensions": [
+       {
+         "addsTo": {
+           "pack": "codeql/rust-all",
+           "extensible": "barrierGuardModel"
+         },
+         "data": [
+           ["my_crate::validate::is_safe_path", "Argument[0]", "true", "path-injection", "manual"]
+         ]
+       }
+     ]
+   }
 
 Access paths
 ------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.0.rst
index 0993702172f3..5d8ae0993813 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.0.rst
@@ -295,7 +295,7 @@ New Features
 JavaScript/TypeScript
 """""""""""""""""""""
 
-*   Improved support for `Restify <http://restify.com/>`__ framework, leading to more results when scanning applications developed with this framework.
+*   Improved support for `Restify <https://restify.com/>`__ framework, leading to more results when scanning applications developed with this framework.
 *   Added support for the `Spife <https://github.com/npm/spife>`__ framework.
 
 Shared Libraries
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.26.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.26.3.rst
new file mode 100644
index 000000000000..57a19ae4633a
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.26.3.rst
@@ -0,0 +1,119 @@
+.. _codeql-cli-2.26.3:
+
+==========================
+CodeQL 2.26.3 (2026-08-12)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.26.3 runs a total of 497 security queries when configured with the Default suite (covering 170 CWE). The Extended suite enables an additional 131 queries (covering 32 more CWE).
+
+CodeQL CLI
+----------
+
+Bug Fixes
+~~~~~~~~~
+
+*   Fixed the pack upload format to comply with the OCI-image-manifest specification, by ensuring that all required fields are present/valid, and that no extraneous/non-compliant fields are included.
+*   Fixed path canonicalization on Windows so that paths located on :code:`subst`\ ed drives are always resolved to their underlying target paths. Previously, :code:`subst`\ ed drives were not handled consistently by the CodeQL CLI and the language-specific extractors.
+
+Improvements
+~~~~~~~~~~~~
+
+*   Commands that accept a :code:`--ram` option now report a clear error when given a value that is far too large to be a sensible amount of memory in megabytes (for example, a number of bytes passed by mistake), instead of failing with a cryptic "is not an int" message.
+
+Miscellaneous
+~~~~~~~~~~~~~
+
+*   Upgraded Jackson from 2.18.6 to 2.18.9.
+
+Query Packs
+-----------
+
+Bug Fixes
+~~~~~~~~~
+
+GitHub Actions
+""""""""""""""
+
+*   The :code:`actions/output-clobbering/high` query now provides messages tailored to the affected output channel and includes expanded documentation and recommendations.
+*   The :code:`actions/cache-poisoning/poisonable-step` and :code:`actions/untrusted-checkout/critical` queries now start paths at the expressions that control untrusted checkouts and link their alert messages to those expressions.
+*   Fixed a performance issue in the :code:`actions/output-clobbering/high` query caused by using unescaped source-code input in a regular expression.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   The :code:`js/missing-rate-limiting` query now recognizes the :code:`@fastify/rate-limit` package as a rate limiter.
+
+GitHub Actions
+""""""""""""""
+
+*   The :code:`actions/output-clobbering/high` query no longer reports simple :code:`jq` path filters when their output remains JSON-encoded. Raw-output modes, complex filters, and unrecognized options remain reportable.
+*   GitHub Actions queries now correctly classify the :code:`schedule` event when determining whether a workflow is externally triggerable.
+*   The :code:`actions/envvar-injection/critical` query now requires the untrusted source and privileged context to originate from the same trigger event. The environment variable injection queries also no longer treat pull request head labels as injection-capable because they cannot contain newlines.
+*   The :code:`actions/cache-poisoning/code-injection`, :code:`actions/cache-poisoning/direct-cache`, and :code:`actions/cache-poisoning/poisonable-step` queries now account for read-only cache access on low-trust triggers that run in the default branch scope. Results are retained for triggers that GitHub allows to write to that cache scope.
+
+Query Metadata Changes
+~~~~~~~~~~~~~~~~~~~~~~
+
+GitHub Actions
+""""""""""""""
+
+*   The name and alert message of the :code:`actions/cache-poisoning/code-injection` query have been reworded for clarity.
+
+Language Libraries
+------------------
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+GitHub Actions
+""""""""""""""
+
+*   The :code:`codeql.actions.security.SelfHostedQuery` module has been removed because runner labels do not reliably distinguish self-hosted runners from managed runners.
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   It is now possible for custom models to refer to specific files in the codebase, using a package name of form :code:`file:<path>`. The model should describe the public exports of that file. This can be used to derive sources and sinks in code that imports the file, but note that sources and sinks will not generally be placed within the file itself.
+    For example, a source model :code:`['file:lib/service.js', 'Member[getData].ReturnValue', 'remote']` could identify :code:`require('../lib/service').getData()` as a source.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added flow source models for :code:`RegQueryValue` and related functions from the :code:`winreg.h` Windows header.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   JavaScript security queries using the :code:`response` threat model now track promise-wrapped client response data into promise fulfillment values. This may improve results for queries such as :code:`js/xss` when response data is consumed through :code:`.then(...)` chains.
+*   The route object returned by Vue Router's :code:`useRoute()` Composition API is now recognized as a client-side remote flow source, covering its :code:`query`, :code:`params`, :code:`path`, :code:`fullPath`, and :code:`hash` members. These members are additionally reported under the corresponding :code:`browser-url-query`, :code:`browser-url-path`, and :code:`browser-url-fragment` threat models.
+*   Added flow models for Vue's :code:`ref`, :code:`shallowRef`, :code:`toRef`, :code:`reactive`, and :code:`computed` Composition API helpers.
+*   Added support for treating declared :code:`inputs` properties in Sails Action2 controller files as remote flow sources. This may improve results for security queries such as :code:`js/path-injection`.
+
+Ruby
+""""
+
+*   Removed library input to vendored gems from the set of taint sources. This should reduce false positives for :code:`rb/polynomial-redos`, :code:`rb/regex/badly-anchored-regexp`, :code:`rb/unsafe-code-construction`, :code:`rb/html-constructed-from-input`, and :code:`rb/shell-command-constructed-from-input` whenever vendoring is used.
+
+GitHub Actions
+""""""""""""""
+
+*   GitHub Actions analysis now recognizes untrusted data in :code:`github.event.merge_group` for workflows triggered by the :code:`merge_group` event.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.26.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.26.4.rst
new file mode 100644
index 000000000000..eb01082cee26
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.26.4.rst
@@ -0,0 +1,154 @@
+.. _codeql-cli-2.26.4:
+
+==========================
+CodeQL 2.26.4 (2026-08-26)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.26.4 runs a total of 497 security queries when configured with the Default suite (covering 170 CWE). The Extended suite enables an additional 131 queries (covering 32 more CWE).
+
+CodeQL CLI
+----------
+
+Bug Fixes
+~~~~~~~~~
+
+*   The Java Autobuilder now expands project properties, such as
+    :code:`${maven.version}`, when determining Maven version requirements specified by the Maven Enforcer Plugin. The Java Autobuilder now also supports Maven versions through 3.9.16.
+
+New Features
+~~~~~~~~~~~~
+
+*   :code:`codeql test run` now supports the :code:`--reuse-dataset` option, which reuses an existing test database from a previous run when available,
+    skipping database extraction. This can speed up repeated test runs when only the query under test has changed. The option implies
+    :code:`--keep-databases`.
+
+Query Packs
+-----------
+
+Bug Fixes
+~~~~~~~~~
+
+C#
+""
+
+*   The query :code:`cs/useless-cast-to-self` no longer reports casts when both the expression type and the cast target type are unknown, which can occur in :code:`build-mode: none` databases.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   The :code:`cs/simplifiable-boolean-expression` query no longer suggests replacing a negated comparison when the replacement could recursively call an enclosing user-defined operator in :code:`build-mode: none` databases.
+*   The :code:`cs/web/missing-token-validation` query now recognizes enabled ASP.NET Core :code:`RequireAntiforgeryToken` attributes when antiforgery middleware is used.
+*   The query :code:`cs/virtual-call-in-constructor` has been improved. Uses of virtual members in :code:`nameof` expressions are no longer reported, since they are not calls.
+*   Static constructors are now used as the enclosing callable for static member initializer expressions. This improves the precision of a range of queries, including :code:`cs/useless-assignment-to-local` and :code:`cs/dereferenced-value-may-be-null`.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   The :code:`js/superfluous-trailing-arguments` query no longer reports valid arguments passed to the :code:`TransformStream` constructor.
+
+GitHub Actions
+""""""""""""""
+
+*   The :code:`actions/unpinned-tag` query now detects mutable references to reusable workflows.
+
+Language Libraries
+------------------
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+GitHub Actions
+""""""""""""""
+
+*   Checks on actor fields read from the event payload (e.g. :code:`github.event.pull_request.user.login`) were split out of :code:`ActorIfCheck` into a new class :code:`EventActorIfCheck`. The :code:`ActorIfCheck` class now only covers :code:`github.actor` and :code:`github.triggering_actor`.
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   Simplified and streamlined the use of NuGet sources when downloading dependencies. In fallback scenarios and specialized package downloads, NuGet sources are now passed directly to :code:`dotnet restore` via the CLI. Furthermore, no :code:`nuget.config` files are created for fallback scenarios, and private registries are used when attempting to download missing packages that were not restored as part of the normal :code:`dotnet restore` process.
+
+Golang
+""""""
+
+*   Go 1.27 is now supported.
+
+Rust
+""""
+
+*   The alert locations for data flow queries have been improved. The new locations are more precise and are based on the actual source and sink nodes. Example:
+
+    ..  code-block:: rust
+    
+        let _ = conn.query(
+        //      ^^^^                 old alert location
+            unsafe_query.as_str(),
+        //  ^^^^^^^^^^^^^^^^^^^^^    new alert location
+        )?;
+
+    This means that some alerts will have their locations changed, and hence appear as new alerts (while the old alerts will disappear).
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Java/Kotlin
+"""""""""""
+
+*   Removed the summary model for :code:`String.valueOf(CharSequence)`, which does not exist. Instead, taint is now propagated through calls to :code:`String.valueOf(Object)` when the argument is a :code:`CharSequence`, for example a :code:`String` or a :code:`StringBuilder`.
+*   Added SQL injection sink models for Spring R2DBC :code:`DatabaseClient` and the R2DBC SPI.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Added support for regular expressions using the :code:`d` flag.
+
+Python
+""""""
+
+*   Added taint flow through :code:`list.extend` and :code:`list.insert`, matching the existing taint flow through :code:`list.append`.
+
+Ruby
+""""
+
+*   The algorithm for tracking regexes has been replaced. This can cause result changes in related queries, for example, :code:`rb/polynomial-redos`.
+
+GitHub Actions
+""""""""""""""
+
+*   Checks on actor fields read from the event payload (e.g. :code:`github.event.pull_request.user.login`) now only count as protection for events whose payload actually populates that field. Previously, a condition such as :code:`github.event.pull_request.user.login != 'name'` on a workflow triggered by :code:`issues` events was treated as a protective check even though :code:`github.event.pull_request` is not populated for :code:`issues` events, which makes the condition vacuous. This change may result in more alerts for queries using the :code:`ControlCheck` class.
+*   Added an option to :code:`EnvironmentCheck` to become specified by a MaD model, otherwise it will continue as the default it previously was. Without adding models to :code:`actions/ql/lib/ext/config/deployment_environment.yml` the behavior of every query will be unchanged. When models are added queries using :code:`ControlCheck` may find more results in cases where an environment is no longer a sufficient sanitizer.
+
+Rust
+""""
+
+*   Canonical paths for Rust trait items now use the format :code:`crate::Trait::item` instead of
+    :code:`<_ as crate::Trait>::item`. Custom data extension models that reference trait items must be updated to use the new format.
+*   The Rust extractor has been upgraded to use :code:`rust-analyzer` version 0.0.328. As a result, the AST exposed by the Rust libraries has changed: the :code:`TraitAlias` class has been removed, :code:`cfg` attributes are now modeled by the new :code:`CfgMeta`, :code:`CfgAtom`, :code:`CfgComposite`, :code:`CfgPredicate`, and :code:`CfgAttrMeta` classes, and the :code:`Meta` class has been refined into the :code:`KeyValueMeta`, :code:`PathMeta`, :code:`TokenTreeMeta`, and :code:`UnsafeMeta` subclasses. New :code:`TryBlockModifier` and :code:`FormatArgsArgName` classes have also been added.
+
+New Features
+~~~~~~~~~~~~
+
+C#
+""
+
+*   Added the :code:`AdditionalTaintStep` extension point (:code:`semmle.code.csharp.dataflow.FlowSteps`). Extend this class to add additional taint steps that apply to all taint-tracking configurations.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Added support for recognizing the React Native Worklets :code:`"worklet"` directive as a known directive.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.0.rst
new file mode 100644
index 000000000000..43dd62546243
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.0.rst
@@ -0,0 +1,152 @@
+.. _codeql-cli-2.27.0:
+
+==========================
+CodeQL 2.27.0 (2026-09-09)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.27.0 runs a total of 498 security queries when configured with the Default suite (covering 170 CWE). The Extended suite enables an additional 131 queries (covering 32 more CWE). 1 security query has been added with this release.
+
+CodeQL CLI
+----------
+
+Deprecations
+~~~~~~~~~~~~
+
+*   Language support for Java 9 and 10 has been deprecated and will be removed in January 2027. Java 7 and 8 will continue to be supported.
+*   The generic multi-platform :code:`codeql.zip` CLI distribution is deprecated and will be removed in a future release. Download the per-platform
+    :code:`codeql-PLATFORM.zip` for your platform instead. The CLI now emits a warning when it is run from an all-platforms distribution; set
+    :code:`CODEQL_ALLOW_ALL_PLATFORMS_DIST=true` to suppress it.
+
+New Features
+~~~~~~~~~~~~
+
+*   CodeQL now supports native Linux arm64 (:code:`linux-arm64`) as a first-class platform. The per-platform CLI (:code:`codeql-linux-arm64.zip`) and CodeQL bundle
+    (:code:`codeql-bundle-linux-arm64.tar.gz` and :code:`codeql-bundle-linux-arm64.tar.zst`)
+    are available as release assets. Arm64 binaries are provided as a per-platform download only, and are not included in the combined :code:`codeql.zip`,
+    :code:`codeql-bundle.tar.gz`, or :code:`codeql-bundle.tar.zst`.
+*   CodeQL can now take advantage of an organization's private registry configurations in Code Scanning Default Setup to authenticate to container registries or the GitHub API when trying to fetch custom queries or packs.
+    This allows custom queries or packs to be accessed from private locations in Code Scanning Default Setup as long as suitable "Git Source" or "Docker Registry" private registry configurations are set up for the organization.
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The :code:`cpp/leap-year/unsafe-array-for-days-of-the-year` query ("Unsafe array for days of the year") no longer reports an alert on the :code:`__PRETTY_FUNCTION__` variable (and related variables) when the enclosing function has a signature that is exactly 364 characters.
+
+C#
+""
+
+*   The :code:`cs/linq/missed-where` query no longer flags :code:`foreach` loops where the matching branch terminates the method, iterator, or loop instead of continuing with filtered loop work.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   HTML files are now included in file-coverage stats, and will start showing up on the status page for CodeQL under "Scanned Files".
+
+Rust
+""""
+
+*   The :code:`rust/hard-coded-cryptographic-value` query has been adjusted to produce fewer results in certain situations where many results were being produced with very similar source locations.
+*   The :code:`rust/unused-variable` query no longer reports variables in functions containing the standard :code:`todo!()` or :code:`unimplemented!()` macros.
+
+New Queries
+~~~~~~~~~~~
+
+Rust
+""""
+
+*   Added a new query, :code:`rust/command-line-injection`, to detect uncontrolled command lines.
+
+Language Libraries
+------------------
+
+Bug Fixes
+~~~~~~~~~
+
+Python
+""""""
+
+*   Fixed a bug where a Python file could be silently dropped from the analysis (with a spurious "A parse error occurred" diagnostic) when it contained a string literal, comment, or identifier with a character such as the U+FE0F emoji variation selector, a U+200D zero width joiner, or a combining accent.
+*   Fixed the extraction of PEP 758 :code:`except A, B:` clauses by the default (non-tree-sitter) Python parser. Previously the second exception type was extracted as a Python 2 style alias binding, so it was recorded as a :code:`Store` rather than a use. This caused false positives from queries that reason about whether a name is used, such as :code:`py/unused-import`. When extracting Python 2 (:code:`--lang=2`), :code:`except A, e:` continues to bind :code:`e` as an alias, since that is what the syntax means in that version.
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+Ruby
+""""
+
+*   The Ruby control flow graph implementation has been completely replaced. This affects a number of queries slightly. The CFG now includes additional nodes to more accurately represent certain constructs. This also means that any existing code that implicitly relies on very specific details about the CFG may need to be updated. The CFG no longer uses splitting, which means that AST nodes now have a unique CFG node representation. In particular,
+    :code:`ControlFlowNode.getAstNode` has changed its meaning. The AST-to-CFG mapping remains one-to-many, but now for a different reason. It used to be because of splitting, but now it's because of additional "helper" CFG nodes. To get the
+    (now canonical) CFG node for a given AST node, use
+    :code:`Stmt.getControlFlowNode()` instead.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added the PostgreSQL libpq (asynchronous) query-execution functions :code:`PQexec`, :code:`PQexecParams`, :code:`PQprepare`, :code:`PQsendQuery`, :code:`PQsendQueryParams`, :code:`PQsendPrepare` as :code:`sql-injection` sinks.
+*   Initializers of compiler-generated variables are now recognized as compiler-generated. A new predicate :code:`isCompilerGenerated` on :code:`Initializer` has been added to reflect this.
+
+C#
+""
+
+*   In :code:`build-mode: none`, project and solution restoration is now always attempted using the feeds available.
+*   C# analysis with build mode :code:`none` now lists unreachable explicitly configured NuGet feeds in both the extraction warning and the tool status page note. This makes it easier to identify feeds that may cause dependencies to be missing from the analysis.
+*   Improved ASP.NET Core MVC controller and action discovery to more closely match runtime behavior, including application parts, endpoint mappings, inherited actions, and controller and action exclusions. Service-injected action parameters are no longer modeled as remote input.
+
+Java/Kotlin
+"""""""""""
+
+*   Added modeling for the Micronaut framework, including HTTP controllers, WebSocket endpoints, configuration injection, data access, security annotations, and HTTP client sinks.
+
+GitHub Actions
+""""""""""""""
+
+*   Checks on author association fields read from the event payload (e.g. :code:`github.event.pull_request.author_association`) now only count as protection for events whose payload actually populates that field. Previously, a condition such as :code:`github.event.pull_request.author_association != 'NONE'` on a workflow triggered by :code:`issues` events was treated as a protective check even though :code:`github.event.pull_request` is not populated for :code:`issues` events, which makes the condition vacuous. This change may result in more alerts for queries using the :code:`ControlCheck` class.
+
+Rust
+""""
+
+*   Canonical paths for Rust trait items now use the format :code:`<crate::Trait>::item` instead of
+    :code:`crate::Trait::item`. Custom data extension models that reference trait items must be updated to use the new format.
+
+New Features
+~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Sources and sinks defined using models-as-data now support access paths with fields. For example, the path :code:`ReturnValue.Field[S::f]` makes the field :code:`S::f` a flow source when it is returned by a call.
+
+C#
+""
+
+*   Added taint modeling for OData action parameter binding (:code:`Microsoft.AspNet.OData`\ /\ :code:`Microsoft.AspNetCore.OData`). Values cast, :code:`as`\ -converted, or type-tested out of :code:`ODataActionParameters`, and entities tracked by :code:`Delta<T>` (via :code:`GetInstance`, :code:`Patch`, :code:`Put`, :code:`CopyChangedValues`, and :code:`CopyUnchangedValues`), now taint the members of the target type.
+
+Java/Kotlin
+"""""""""""
+
+*   Factories returned by the Apache Commons Secure XML (:code:`org.apache.commons.xml.secure`) hardening library's :code:`SecureDocumentBuilderFactory`, :code:`SecureSAXParserFactory`, :code:`SecureXMLInputFactory`, :code:`SecureTransformerFactory` and :code:`SecureSchemaFactory` classes are now recognized as safely configured by the XXE query.
+*   A new extensible class :code:`SafeXmlFactorySource` was added to :code:`semmle.code.java.security.XmlParsers` for modeling sources of pre-hardened JAXP factories.
+
+GitHub Actions
+""""""""""""""
+
+*   GitHub Actions databases now extract :code:`actions.lock` files. The new :code:`ActionsLock` class provides access to their YAML abstract syntax trees.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.1.rst
new file mode 100644
index 000000000000..b7ed802b9613
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.1.rst
@@ -0,0 +1,105 @@
+.. _codeql-cli-2.27.1:
+
+==========================
+CodeQL 2.27.1 (2026-09-22)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.27.1 runs a total of 498 security queries when configured with the Default suite (covering 170 CWE). The Extended suite enables an additional 131 queries (covering 32 more CWE).
+
+CodeQL CLI
+----------
+
+Miscellaneous
+~~~~~~~~~~~~~
+
+*   The build of Eclipse Temurin OpenJDK that is used to run the CodeQL CLI has been updated to version 25.0.4.1.
+    
+    New Java releases may not be completely backwards compatible. For example,
+    Java 25 has a known issue that affects symlink resolution on mapped drives on Windows (JDK-8355342). Users impacted by such regressions can run CodeQL with an alternative JDK using the CODEQL_JAVA_HOME environment variable.
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   The :code:`cs/linq/missed-*` queries no longer suggest rewrites that would capture :code:`in`, :code:`out`, or :code:`ref` parameters in a lambda, fixing false-positive results for transformations that would not compile.
+*   The :code:`cs/web/missing-token-validation` query now recognizes an ASP.NET Core :code:`AutoValidateAntiforgeryTokenAttribute` registered as a global MVC filter through :code:`AddControllersWithViews` (and friends), avoiding false-positive results for covered actions.
+
+GitHub Actions
+""""""""""""""
+
+*   The :code:`actions/unpinned-tag` query no longer reports action references pinned by a structurally valid :code:`.github/workflows/actions.lock` entry for the enclosing workflow.
+*   The :code:`actions/unpinned-tag` query no longer reports :code:`$/` self repository references (e.g. :code:`uses: $/path/to/action`), which resolve to the same repository at the running commit and are therefore inherently pinned, just like :code:`./` self workspace (local) references.
+
+New Queries
+~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added a new query, :code:`cpp/ambiguous-assignment-of-comparison`, to detect potentially ambiguous expressions where a comparison result is assigned to a variable and the assignment is used as a truth value.
+
+C#
+""
+
+*   Added a new query, :code:`cs/linq/missed-firstordefault`, that detects :code:`foreach` loops that can be expressed more clearly using LINQ's :code:`FirstOrDefault` method.
+
+Language Libraries
+------------------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added taint flow models for the :code:`boost::asio::ip::basic_resolver::resolve` function.
+*   Added flow summaries for the BDE :code:`BloombergLP::bdlbb::Blob` segmented byte buffer.
+*   Added flow summaries for the Protocol Buffers :code:`google::protobuf::MessageLite` C++ API.
+
+C#
+""
+
+*   Private NuGet registries for which the "Replaces base" option is enabled in the organization-level private registry configuration now replace default NuGet feeds whenever dependencies are downloaded, including when default NuGet feeds are configured explicitly for a project.
+
+Golang
+""""""
+
+*   Added or improved data flow models for the following Go standard-library APIs introduced or updated in Go 1.27:
+
+    *   :code:`bytes.CutLast`, :code:`database/sql.ConvertAssign`, :code:`database/sql/driver.RowsColumnScanner.ScanColumn`, :code:`net/url.URL.Clone`, :code:`net/url.Values.Clone` and :code:`strings.CutLast`.
+    *   The new :code:`encoding/json/jsontext` package.
+    
+*   Added more data flow models for the :code:`strings` package: :code:`strings.Clone`, :code:`Cut`, :code:`CutPrefix`, :code:`CutSuffix`, :code:`Fields`, :code:`FieldsFunc`, and :code:`Join`\ ; :code:`strings.Builder.String`, :code:`Builder.WriteByte`, and :code:`Builder.WriteRune`\ ; :code:`strings.Reader.ReadByte` and :code:`Reader.ReadRune`\ ; and :code:`strings.Replacer.Replace` and :code:`Replacer.WriteString`.
+
+Java/Kotlin
+"""""""""""
+
+*   Support for Kotlin 2.4.20 has been added.
+*   Fixed an issue where :code:`Foo::class.java` arguments were dropped during extraction under the Kotlin K2 compiler, which could cause false positives in queries such as :code:`java/android/implicit-pendingintents`.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Fastify servers reached through a chainable configuration method, such as :code:`fastify().withTypeProvider<T>()` or :code:`fastify().setValidatorCompiler(...)`, are now recognized as the same server instance. Routes registered on such an instance are now attributed to their server, which may add results for queries such as :code:`js/missing-rate-limiting` where routes were previously not recognized at all, and remove false positives where a globally registered plugin guards them.
+
+Rust
+""""
+
+*   Fix path resolution for :code:`m::{self}` paths where :code:`m` is a trait.
+*   Added data-flow models for :code:`core::fmt::Write`. This may improve detection of vulnerabilities where tainted data is written to a formatted output buffer.
+*   The Rust extractor has been upgraded to use :code:`rust-analyzer` version 0.0.347. As a result, the AST exposed by the Rust libraries has changed: new :code:`DerefPat`, :code:`ImplRestriction`, :code:`IncludeBytesExpr`, :code:`MutRestriction`, :code:`NotNull`, :code:`PatternTypeRepr`, and :code:`VisibilityInner` classes have been added; the :code:`FormatArgsArgName` class has been removed in favour of :code:`FormatArgsArg.getName()`, which now returns a :code:`Name`\ ; :code:`Visibility.getPath()` has been moved onto the new :code:`VisibilityInner` class, reachable via :code:`Visibility.getVisibilityInner()`\ ; and :code:`attrs` have been added to the inline assembly nodes, :code:`getMutRestriction()` to :code:`StructField` and :code:`TupleField`, and :code:`getImplRestriction()` to :code:`Trait`.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.2.rst
new file mode 100644
index 000000000000..aab7a5306962
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.2.rst
@@ -0,0 +1,135 @@
+.. _codeql-cli-2.27.2:
+
+==========================
+CodeQL 2.27.2 (2026-10-07)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.27.2 runs a total of 498 security queries when configured with the Default suite (covering 170 CWE). The Extended suite enables an additional 131 queries (covering 32 more CWE).
+
+CodeQL CLI
+----------
+
+Bug Fixes
+~~~~~~~~~
+
+*   Fixed a crash in :code:`codeql resolve queries` (and other commands that resolve query suites) that reported a fatal internal error when a suite entry's :code:`qlpack:` or :code:`from:` value was not a valid QL pack name. Such input now produces a clear, user-facing error instead.
+*   Fixed a bug in the handling of YAML data extensions that would quietly accept integers outside of the signed 64-bit range, truncating them to smaller values. (Values outside of the signed 32-bit range, but inside the signed 64-bit range, were correctly rejected.) Now, all integers outside of the signed 32-bit range are rejected and will cause evaluation to fail.
+
+Improvements
+~~~~~~~~~~~~
+
+*   Error and warning messages printed to standard error are now labelled with an
+    :code:`ERROR:`  or :code:`WARNING:`  prefix. Previously only diagnostics carried such a label, so the severity of other messages was not apparent in plain-text output. Structured output is unaffected: log files, SARIF, and stored diagnostics continue to record severity without the prefix.
+*   The :code:`codeql query compile` command now accepts the :code:`--dil-constants` flag. When specified along with :code:`--dump-dil`, the emitted DIL will include the values of predicates that have been optimized into constant tuple sets. Otherwise, these constants are omitted. This flag also enables pretty-printing of constant tuple sets for higher-level commands that involve query compilation.
+
+Miscellaneous
+~~~~~~~~~~~~~
+
+*   CLI commands that load data extensions, such as :code:`codeql database run-queries`,
+    previously emitted a warning for each file-pattern from the :code:`dataExtensions` list of a :code:`qlpack.yml` manifest that failed to match any extension files.
+    This check has been relaxed, and will now only emit a warning if none of the patterns match any files (i.e. when there is at least one pattern but no extensions are found).
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   The :code:`cs/web/missing-x-frame-options` query now recognizes clickjacking protection configured through ASP.NET Core response headers and enforced Content Security Policy :code:`frame-ancestors` directives.
+
+Language Libraries
+------------------
+
+Bug Fixes
+~~~~~~~~~
+
+C#
+""
+
+*   Fixed an issue where types for pattern expressions were not extracted correctly.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Improved Hapi route handler and request input tracking through custom route registration helpers and higher-order function wrappers.
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+Golang
+""""""
+
+*   The Go control flow graph (CFG) implementation has been completely rewritten to use the shared CFG library. The CFG now includes additional nodes to more accurately represent certain constructs, including assignments, function parameters and results, range statements, and deferred calls. The CFG now only includes nodes that are reachable from the entry point. Basic blocks are also now constructed directly from the shared CFG. Existing code that relies on specific CFG nodes, edges, locations, textual representations, or basic block boundaries may need to be updated.  Additionally, the following API changes have been made:
+
+    *   :code:`BasicBlocks::Cfg` has been removed. :code:`BasicBlock` now directly uses the basic-block implementation provided by the shared CFG library.
+    *   :code:`ControlFlow::EntryNode` and :code:`ControlFlow::ExitNode` have been added, and
+        :code:`ControlFlow::entryNode` and :code:`ControlFlow::exitNode` now return these more specific types.
+    *   :code:`IfStmt.getCond` has been deprecated. Please use the new :code:`IfStmt.getCondition` instead.
+    *   The result types of :code:`IfStmt.getThen` and :code:`LoopStmt.getBody` have been widened from :code:`BlockStmt` to :code:`Stmt`.
+    *   :code:`SwitchStmt.getExpr` has been added, providing a common accessor for the expression examined by expression and type switches.
+    *   Several IR instruction classes have been removed or consolidated, including
+        :code:`ReadArgumentInstruction`, :code:`InitResultInstruction`, :code:`IncDecInstruction`,
+        :code:`EvalIncDecRhsInstruction`, :code:`EvalImplicitOneInstruction`,
+        :code:`SelectInstruction`, and :code:`SendInstruction`.
+    *   :code:`EvalCompoundAssignRhsInstruction` now also represents increment and decrement operations, and it and :code:`EvalImplicitInitInstruction` directly represent their associated writes.
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   Fixed a false positive in :code:`cs/web/xss` for ASP.NET Core Razor Pages/MVC views: :code:`WriteLiteral` calls generated for tag helper attribute values (for example, :code:`asp-for`) capture the value into an internal buffer instead of writing it directly to the response, so they are no longer treated as XSS sinks.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added SQL-injection sink models for the Comdb2 C API functions :code:`cdb2_run_statement` and :code:`cdb2_run_statement_typed`.
+*   Added flow summaries for the BDE codecs :code:`BloombergLP::balber::BerDecoder`\ /\ :code:`BerEncoder`, :code:`BloombergLP::baljsn::Decoder`\ /\ :code:`Encoder` and :code:`BloombergLP::balxml::Decoder`\ /\ :code:`Encoder`.
+*   Added taint flow summaries for the BDE :code:`bslx` byte-stream deserializers :code:`BloombergLP::bslx::ByteInStream`, :code:`BloombergLP::bslx::GenericInStream`, and :code:`BloombergLP::bslx::InStreamFunctions::bdexStreamIn`.
+
+Golang
+""""""
+
+*   Models for the :code:`nhooyr.io/websocket` package have been updated to also support its new import path :code:`github.com/coder/websocket`.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   The Workflow SDK directives :code:`"use workflow"` and :code:`"use step"` are now recognized as known directives, so the :code:`js/unknown-directive` query no longer flags them.
+
+GitHub Actions
+""""""""""""""
+
+*   The :code:`trustedActionsOwnerDataModel` extensible predicate, used by the :code:`actions/unpinned-tag` query, now supports removing an owner from the trusted set by adding an entry prefixed with :code:`!` (for example, :code:`!github`). This makes it possible to distrust first-party owners (:code:`actions`, :code:`github`, :code:`advanced-security`) so that unpinned tags for their Actions are reported.
+
+Rust
+""""
+
+*   The Rust extractor has been upgraded to use :code:`rust-analyzer` version 0.0.352. As a result, the AST exposed by the Rust libraries now includes the :code:`AnyAttr` and :code:`DocComment` classes.
+*   Improve data flow for async blocks when used with :code:`await`.
+*   Added new flow summary models for the :code:`native-tls`, :code:`async-native-tls`, and :code:`tokio-native-tls` crates.
+
+New Features
+~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added a C++ regular-expression parser for the ECMAScript grammar used by :code:`std::regex`.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.3.rst
new file mode 100644
index 000000000000..dcafe1af6975
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.3.rst
@@ -0,0 +1,128 @@
+.. _codeql-cli-2.27.3:
+
+==========================
+CodeQL 2.27.3 (2026-10-20)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.27.3 runs a total of 498 security queries when configured with the Default suite (covering 170 CWE). The Extended suite enables an additional 131 queries (covering 32 more CWE).
+
+CodeQL CLI
+----------
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+*   With the release of macOS 27 and Xcode 27, Apple stopped shipping multi-architecture x86-64/arm64 binaries. These binaries are required by CodeQL to perform traced analysis. For this reason, CodeQL's :code:`autobuild` and :code:`manual` build modes will not be supported for compiled languages on macOS 27 with any Xcode version, and on macOS 26 when Xcode 27 is selected.
+
+Bug Fixes
+~~~~~~~~~
+
+*   Fixed a bug that caused database downgrades to fail for GitHub Actions databases.
+
+Improvements
+~~~~~~~~~~~~
+
+*   Data extension files now support JSON syntax, with the same structure as existing YAML data extensions. Java-style comments (:code:`// ...` and :code:`/* ... */`)
+    are also supported. Files using the :code:`.json` extension will be parsed as JSON,
+    while all other files will continue to be parsed as YAML.
+*   The :code:`codeql test run` feature to load a data extension named :code:`<test>.ext.yml` when running :code:`<test>.ql` or :code:`<test>.qlref` has been updated to support JSON data extensions, and files named :code:`<test>.ext.json` will now also be loaded automatically.
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The :code:`cpp/resource-not-released-in-destructor` query now recognizes resources released through local aliases, reducing false-positive results.
+
+C#
+""
+
+*   The :code:`cs/simplifiable-boolean-expression` query now produces fewer false-positive results when type information is incomplete.
+
+Language Libraries
+------------------
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+GitHub Actions
+""""""""""""""
+
+*   The GitHub Actions control flow graph (CFG) now uses the shared CFG library. The CFG includes explicit before and after nodes and uses the shared entry and exit node representations. Existing code that relies on specific CFG nodes, edges, textual representations, or basic block boundaries may need to be updated. The legacy :code:`Completion`, :code:`NormalCompletion`, :code:`SimpleCompletion`, :code:`BooleanCompletion`, and :code:`ReturnCompletion` classes have been removed because completions are no longer part of the Actions CFG API. Code that inspected completions should inspect CFG edge labels such as :code:`DirectSuccessor`, :code:`BooleanSuccessor`, and :code:`ReturnSuccessor` instead.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added flow summaries for the BlazingMQ :code:`BloombergLP::bmqa::Message` and :code:`MessageProperties` classes and their iterators.
+
+C#
+""
+
+*   Avoid logging warnings when there are no explicit or inherited feeds to check for reachability.
+*   The subprocess for the NuGet CLI is now provided with the proxy and certificate environment variables needed to access private registries if any are configured.
+*   Added support for data flow through positional patterns in :code:`is` expressions and :code:`switch` cases.
+
+Java/Kotlin
+"""""""""""
+
+*   The queries :code:`java/ssrf` and :code:`java/unvalidated-url-redirection` recognize case-insensitive comparisons of :code:`URI.getHost()` with fixed string allowlist entries, as well as equality and case-insensitive comparisons when the host is stored in a local variable.
+
+Python
+""""""
+
+*   Updated the :code:`py/xxe`, :code:`py/xml-bomb`, and :code:`py/nosql-injection` queries to respect the configured threat model when selecting untrusted data sources. The default behavior remains unchanged and uses remote flow sources. As a side effect, these queries now correctly include sources modeled using data extensions.
+*   Added taint-flow modeling for :code:`unicodedata.iter_graphemes`, introduced in Python 3.15.
+*   Added data-flow modeling for :code:`threading.serialize_iterator` and :code:`threading.concurrent_tee`, introduced in Python 3.15.
+*   Added modeling for the Base32, Base85, and Ascii85 encoding and decoding functions introduced in Python 3.15's :code:`binascii` module, including taint flow through custom alphabets.
+*   Added support for the :code:`frozendict` and :code:`sentinel` builtins introduced in Python 3.15, and data-flow modeling for :code:`frozendict` construction.
+*   The Python extractor now supports unary plus in :code:`match` literal patterns, introduced in Python 3.15.
+*   The Python extractor now supports Unicode 17 identifiers, introduced in Python 3.15.
+*   Added modeling for the :code:`extra_response_headers` constructor argument and instance attribute of :code:`http.server.SimpleHTTPRequestHandler`, introduced in Python 3.15.
+*   Added modeling for Python 3.15's :code:`re.prefixmatch` and :code:`re.Pattern.prefixmatch`, matching the existing support for their :code:`match` counterparts.
+*   Added taint-flow modeling for :code:`bytearray` construction and Python 3.15's :code:`bytearray.take_bytes` method.
+
+Rust
+""""
+
+*   The Rust extractor has been upgraded to use :code:`rust-analyzer` version 0.0.357. As a result, the AST exposed by the Rust libraries now includes the :code:`CfgPredExpr` and :code:`CfgPredPat` classes.
+
+New Features
+~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added support for C23 bit-precise integers (:code:`_BitInt(N)`).
+
+Ruby
+""""
+
+*   Added modeling for :code:`Grape::API`\ 's :code:`request` sub-accessors (:code:`body.read`, :code:`body.string`, :code:`params`, :code:`GET`, :code:`POST`, :code:`cookies`, :code:`env`, :code:`query_string`, and :code:`path_info`) as remote flow sources.
+
+Shared Libraries
+----------------
+
+New Features
+~~~~~~~~~~~~
+
+Threat Models
+"""""""""""""
+
+*   Added the opt-in :code:`ai` threat model for LLM-generated data. No built-in source models are included.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.4.rst
new file mode 100644
index 000000000000..dfe6344a3698
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.27.4.rst
@@ -0,0 +1,153 @@
+.. _codeql-cli-2.27.4:
+
+==========================
+CodeQL 2.27.4 (2026-11-02)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.27.4 runs a total of 498 security queries when configured with the Default suite (covering 169 CWE). The Extended suite enables an additional 131 queries (covering 32 more CWE).
+
+CodeQL CLI
+----------
+
+Bug Fixes
+~~~~~~~~~
+
+*   The CodeQL CLI now writes messages from the Java virtual machine, such as warnings and initialization errors, to standard error instead of standard output. Previously, these messages could corrupt the output of commands that print JSON or other machine-readable output.
+
+Security Updates
+~~~~~~~~~~~~~~~~
+
+*   :code:`codeql pack bundle` and :code:`codeql pack publish` now check that each file added to the pack archive is still inside the pack root after symbolic links are resolved. Files that resolve to a location outside the pack root are omitted from the archive with a warning.
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The :code:`cpp/suspicious-pointer-scaling` query no longer reports false positives for intentional pointer arithmetic from :code:`std::byte*` buffers.
+*   The :code:`cpp/unused-local-variable` and :code:`cpp/unused-static-variable` queries no longer report variables marked with the C++17 :code:`[[maybe_unused]]` attribute.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   The :code:`js/invalid-prototype-value` query no longer reports computed :code:`__proto__` properties in object literals.
+
+Query Metadata Changes
+~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added a new :code:`cpp-code-quality` query suite containing queries that identify maintainability and reliability issues in C and C++ code.
+
+C#
+""
+
+*   The :code:`external/cwe/cwe-730` tag has been removed from :code:`cs/redos` and :code:`cs/regex-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
+
+Java/Kotlin
+"""""""""""
+
+*   The :code:`external/cwe/cwe-730` tag has been removed from :code:`java/redos`, :code:`java/polynomial-redos` and :code:`java/regex-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   The :code:`external/cwe/cwe-730` tag has been removed from :code:`js/redos`, :code:`js/polynomial-redos`, :code:`js/regex-injection`, :code:`js/regex-injection-more-sources`, :code:`js/server-crash` and :code:`js/loop-bound-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
+
+Python
+""""""
+
+*   The :code:`external/cwe/cwe-730` tag has been removed from :code:`py/redos`, :code:`py/polynomial-redos` and :code:`py/regex-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
+
+Ruby
+""""
+
+*   The :code:`external/cwe/cwe-730` tag has been removed from :code:`rb/redos`, :code:`rb/polynomial-redos` and :code:`rb/regexp-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
+
+Swift
+"""""
+
+*   The :code:`external/cwe/cwe-730` tag has been removed from :code:`swift/redos` and :code:`swift/regex-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
+
+Language Libraries
+------------------
+
+Bug Fixes
+~~~~~~~~~
+
+Golang
+""""""
+
+*   The Go extractor no longer modifies the global Git configuration when private :code:`git_source` registries are configured. The registry proxy certificate is now passed to Git through the :code:`GIT_SSL_CAINFO` environment variable instead, which only affects the Git processes spawned by :code:`go`.
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   The :code:`SEMMLE_TYPESCRIPT_HOME` environment variable is no longer supported. The JavaScript/TypeScript extractor now ignores the environment variable and always uses its bundled TypeScript compiler.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   Rolled back the change that set proxy and certificate environment variables for the subprocess that invokes the NuGet CLI because the environment variables were only partially respected by the target process in some cases.
+
+Java/Kotlin
+"""""""""""
+
+*   The :code:`java/log-injection` query now recognizes additional sanitizers and sanitizer guards from the JDK, Apache Commons Lang and Text, Guava, OWASP Java Encoder, and Spring Framework.
+*   Queries that use path-injection sanitizers now recognize additional substring guards and string replacement and removal operations from Apache Commons Lang and Guava.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Added taint steps for :code:`String.prototype.trimStart`, :code:`trimEnd`, and :code:`normalize`.
+*   Fixed the flow summary for :code:`Array.prototype.flatMap`. The :code:`thisArg` argument now flows to the callback's :code:`this` instead of its index parameter.
+
+Rust
+""""
+
+*   The early return taken by the :code:`?` operator no longer makes the unwrapped value of :code:`x?` flow out of the enclosing function. This fixes false positive results from queries such as :code:`rust/cleartext-logging`, where a sensitive value read with :code:`?` was reported as part of an unrelated return value.
+*   Added neutral models to inhibit spurious generated sink models for :code:`actix_web::HttpRequest::connection_info` and the methods built on it, such as :code:`full_url` and :code:`url_for`. This fixes some false positive results from queries such as :code:`rust/uncontrolled-allocation-size` and :code:`rust/log-injection`.
+*   Added neutral models to inhibit spurious generated sink models for :code:`Vec` and :code:`VecDeque` methods such as :code:`insert`, :code:`remove` and :code:`push_back`. This fixes some false positive results from queries such as :code:`rust/cleartext-logging`.
+
+Deprecated APIs
+~~~~~~~~~~~~~~~
+
+Golang
+""""""
+
+*   :code:`ControlFlow::ConditionGuardNode` is now deprecated. Use the API from :code:`semmle.go.controlflow.Guards` instead.
+
+New Features
+~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added support for the :code:`__builtin_lt_synthesizes_from_spaceship`, :code:`__builtin_gt_synthesizes_from_spaceship`, :code:`__builtin_le_synthesizes_from_spaceship`, :code:`__builtin_ge_synthesizes_from_spaceship`, :code:`__builtin_is_implicit_lifetime`, :code:`__builtin_is_structural`, and :code:`__builtin_is_virtual_base_of` builtin operations.
+*   Added a new predicate :code:`getBitWidth` to the :code:`Type` class, which yields the bit-width of the type.
+
+Golang
+""""""
+
+*   The Go language library now instantiates the shared library :code:`semmle.go.controlflow.Guards`, including the :code:`Guard` and :code:`GuardValue` classes and the :code:`guardEnsures`, :code:`guardEnsuresEq`, :code:`guardEnsuresNeq`, and :code:`guardEnsuresLeq` predicates.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/index.rst b/docs/codeql/codeql-overview/codeql-changelog/index.rst
index a0a2e1832d83..0233e7c81ad2 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/index.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/index.rst
@@ -11,6 +11,13 @@ A list of queries for each suite and language `is available here <https://docs.g
 .. toctree::
    :maxdepth: 1
 
+   codeql-cli-2.27.4
+   codeql-cli-2.27.3
+   codeql-cli-2.27.2
+   codeql-cli-2.27.1
+   codeql-cli-2.27.0
+   codeql-cli-2.26.4
+   codeql-cli-2.26.3
    codeql-cli-2.26.2
    codeql-cli-2.26.1
    codeql-cli-2.26.0
diff --git a/docs/codeql/index.html b/docs/codeql/index.html
index 981599627bd6..6570f1c21671 100644
--- a/docs/codeql/index.html
+++ b/docs/codeql/index.html
@@ -66,7 +66,7 @@
     </div>
     <article class="pb-6" style="min-height: calc(100vh - 68px);">
         <div class="blankslate">
-            <img src="https://ghicons.github.com/assets/images/blue/svg/Code%20QL.svg" class="mb-3" />
+            <img src="../assets/img/svgs/codeql.svg" alt="" class="mb-3" />
             <h1>CodeQL documentation</h1>
             <p class="f2">CodeQL enables you to query code as though it were data. Write a query to find all variants of a
                 vulnerability, eradicating it forever. Then share your query to help others do the same.</p>
@@ -250,7 +250,7 @@ <h3 class="mb-3 text-mono text-gray-light text-normal">Platform</h3>
                     <ul class="list-style-none f5">
                         <li class="lh-condensed mb-3"><a href="https://docs.github.com/get-started/exploring-integrations/about-building-integrations"
                                 data-ga-click="Footer, go to api, text:api" class="link-gray">Developer API</a></li>
-                        <li class="lh-condensed mb-3"><a href="http://partner.github.com/"
+                        <li class="lh-condensed mb-3"><a href="https://partner.github.com/"
                                 data-ga-click="Footer, go to partner, text:partner" class="link-gray">Partners</a></li>
                         <li class="lh-condensed mb-3"><a href="https://github.com/edu"
                                 data-ga-click="Footer, go to education, text:education" class="link-gray">Education</a></li>
diff --git a/docs/codeql/ql-language-reference/about-the-ql-language.rst b/docs/codeql/ql-language-reference/about-the-ql-language.rst
index c24a29aea96c..97f2272d1fbb 100644
--- a/docs/codeql/ql-language-reference/about-the-ql-language.rst
+++ b/docs/codeql/ql-language-reference/about-the-ql-language.rst
@@ -66,7 +66,7 @@ Further reading
 
 `Academic references <https://codeql.github.com/publications/>`__ also provide an overview of QL and its semantics. Other useful references on database query languages and Datalog:
 
--  `Database theory: Query languages <http://www.lsv.fr/~segoufin/Papers/Mypapers/DB-chapter.pdf>`__
+-  `Database theory: Query languages <https://www.di.ens.fr/~segoufin/Papers/Mypapers/DB-chapter.pdf>`__
 -  `Logic Programming and Databases book <https://doi.org/10.1007/978-3-642-83952-8>`__
 -  `Foundations of Databases <http://webdam.inria.fr/Alice/>`__
 -  `Datalog <https://en.wikipedia.org/wiki/Datalog>`__
diff --git a/docs/codeql/ql-training/java/apache-struts-java.rst b/docs/codeql/ql-training/java/apache-struts-java.rst
index 503dfad54501..8c520c7f788a 100644
--- a/docs/codeql/ql-training/java/apache-struts-java.rst
+++ b/docs/codeql/ql-training/java/apache-struts-java.rst
@@ -41,7 +41,7 @@ RCE in Apache Struts
 
 - Xstream allows deserialization of **dynamic proxies**, which permit remote code execution.
 
-- Disclosed as `CVE-2017-9805 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9805>`__
+- Disclosed as `CVE-2017-9805 <https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9805>`__
 
 - Blog post: https://securitylab.github.com/research/apache-struts-vulnerability-cve-2017-9805
 
diff --git a/docs/codeql/qllexer.py b/docs/codeql/qllexer.py
index 55a65e84152f..d8191ed10007 100644
--- a/docs/codeql/qllexer.py
+++ b/docs/codeql/qllexer.py
@@ -1,7 +1,7 @@
 """
     Custom Pygments lexer for highlighting QL code.
     
-    Based on instructions from http://pygments.org/docs/lexerdevelopment/.
+    Based on instructions from https://pygments.org/docs/lexerdevelopment/.
 """
 
 import re
diff --git a/docs/codeql/reusables/supported-frameworks.rst b/docs/codeql/reusables/supported-frameworks.rst
index 0552a3495175..6fa32547d05a 100644
--- a/docs/codeql/reusables/supported-frameworks.rst
+++ b/docs/codeql/reusables/supported-frameworks.rst
@@ -74,7 +74,7 @@ and the CodeQL library pack ``codeql/go-all`` (`changelog <https://github.com/gi
    `AWS Lambda <https://docs.aws.amazon.com/lambda/latest/dg/lambda-golang.html>`_, Serverless framework
    `beego <https://beego.me/>`_, Web/logging/database framework
    `Chi <https://github.com/go-chi/chi>`_, Web framework
-   Couchbase (`gocb <https://github.com/couchbase/gocb>`_ and `go-couchbase <http://www.github.com/couchbase/go-couchbase>`_), Database
+   Couchbase (`gocb <https://github.com/couchbase/gocb>`_ and `go-couchbase <https://www.github.com/couchbase/go-couchbase>`_), Database
    `Echo <https://echo.labstack.com/>`_, Web framework
    `Gin <https://github.com/gin-gonic/gin>`_, Web framework
    `glog <https://github.com/golang/glog>`_, Logging library
@@ -87,7 +87,7 @@ and the CodeQL library pack ``codeql/go-all`` (`changelog <https://github.com/gi
    `golang.org/x/crypto/ssh <https://pkg.go.dev/golang.org/x/crypto/ssh>`_, Network communicator
    `golang.org/x/net/websocket <https://pkg.go.dev/golang.org/x/net/websocket>`_, Network communicator
    `goproxy <https://github.com/elazarl/goproxy>`_, HTTP proxy library
-   `Gorilla mux <http://www.gorillatoolkit.org/pkg/mux>`_, HTTP request router and dispatcher
+   `Gorilla mux <https://github.com/gorilla/mux>`_, HTTP request router and dispatcher
    `Gorilla websocket <https://github.com/gorilla/websocket>`_, Network communicator
    `GORM <https://gorm.io/>`_, Database
    `GoWebsocket <https://github.com/sacOO7/gowebsocket>`_, Network communicator
@@ -100,11 +100,11 @@ and the CodeQL library pack ``codeql/go-all`` (`changelog <https://github.com/gi
    `Logrus <https://github.com/sirupsen/logrus>`_, Logging library
    `Macaron <https://gopkg.in/macaron.v1>`_, Web framework
    `mongo <https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo>`_, Database
-   `nhooyr.io/websocket <http://nhooyr.io/websocket>`_, Network communicator
+   `coder/websocket <https://github.com/coder/websocket>`_ (formerly nhooyr.io/websocket), Network communicator
    `protobuf <https://pkg.go.dev/google.golang.org/protobuf>`_, Serialization
-   `Revel <http://revel.github.io/>`_, Web framework
+   `Revel <https://revel.github.io/>`_, Web framework
    `SendGrid <https://github.com/sendgrid/sendgrid-go>`_, Email library
-   `sqlx <http://jmoiron.github.io/sqlx/>`_, Database
+   `sqlx <https://jmoiron.github.io/sqlx/>`_, Database
    `Squirrel <https://github.com/Masterminds/squirrel>`_, Database
    `ws <https://github.com/gobwas/ws>`_, Network communicator
    `xmlpath <https://gopkg.in/xmlpath.v2>`_, XPath library
@@ -263,6 +263,7 @@ and the CodeQL library pack ``codeql/python-all`` (`changelog <https://github.co
    mysqlclient, Database
    oracledb, Database
    phoenixdb, Database
+   psycopg, Database
    psycopg2, Database
    pymssql, Database
    PyMySQL, Database
@@ -326,8 +327,9 @@ and the CodeQL library pack ``codeql/rust-all`` (`changelog <https://github.com/
    `actix-web <https://crates.io/crates/actix-web>`__, Web framework
    alloc, Standard library
    `async-std <https://crates.io/crates/async-std>`__, Asynchronous programming library
+   `axum <https://crates.io/crates/axum>`__, Web framework
    `biscotti <https://crates.io/crates/biscotti>`__, Cookie management
-   `clap <http://crates.io/crates/clap>`__, Utility library
+   `clap <https://crates.io/crates/clap>`__, Utility library
    `cookie <https://crates.io/crates/cookie>`__, Cookie management
    core, Standard library
    `digest <https://crates.io/crates/digest>`__, Cryptography library
@@ -340,6 +342,8 @@ and the CodeQL library pack ``codeql/rust-all`` (`changelog <https://github.com/
    `memchr <https://crates.io/crates/memchr>`__, Utility library
    `mysql <https://crates.io/crates/mysql>`__, Database
    `mysql_async <https://crates.io/crates/mysql_async>`__, Database
+   `native-tls <https://crates.io/crates/native-tls>`__, Network communicator
+   `async-native-tls <https://crates.io/crates/async-native-tls>`__, Network communicator
    `once_cell <https://crates.io/crates/once_cell>`__, Utility library
    `poem <https://crates.io/crates/poem>`__, Web framework
    `postgres <https://crates.io/crates/postgres>`__, Database
diff --git a/docs/codeql/reusables/supported-platforms.rst b/docs/codeql/reusables/supported-platforms.rst
index 5e679da12fa2..4b424130d6ab 100644
--- a/docs/codeql/reusables/supported-platforms.rst
+++ b/docs/codeql/reusables/supported-platforms.rst
@@ -6,16 +6,19 @@
    Operating system,Supported versions,Supported CPU architectures
    Linux,"Ubuntu 22.04
 
-   Ubuntu 24.04","x86-64"
+   Ubuntu 24.04","x86-64, arm64 [1]_"
    Windows,"Windows 10 / Windows Server 2019
 
    Windows 11 / Windows Server 2022/2025","x86-64"
-   macOS,"macOS 14 Sonoma
+   macOS,"macOS 15 Sequoia
 
-   macOS 15 Sequoia
+   macOS 26 Tahoe [2]_
 
-   macOS 26 Tahoe","x86-64, arm64 (Apple Silicon) [1]_"
+   macOS 27 Golden Gate [3]_","x86-64, arm64 (Apple Silicon) [4]_"
 
 .. container:: footnote-group
 
-    .. [1] Support for Apple Silicon is currently in beta.
+    .. [1] Support for Linux on arm64 is currently in beta.
+    .. [2] Support for macOS 26 with Xcode 27 selected is limited to using build mode ``none``.
+    .. [3] Support for macOS 27 is limited to Apple Silicon and using build mode ``none``.
+    .. [4] Support for Apple Silicon is currently in beta. Building your code during analysis requires Rosetta 2; analyzing an interpreted language or using build mode ``none`` runs natively.
diff --git a/docs/codeql/reusables/supported-versions-compilers.rst b/docs/codeql/reusables/supported-versions-compilers.rst
index 69def9ffeb19..e08ae794d1f1 100644
--- a/docs/codeql/reusables/supported-versions-compilers.rst
+++ b/docs/codeql/reusables/supported-versions-compilers.rst
@@ -4,44 +4,42 @@
    :stub-columns: 1
 
    Language,Variants,Compilers,Extensions
-   C/C++,"C89, C99, C11, C17, C23, C++98, C++03, C++11, C++14, C++17, C++20, C++23 [1]_ [2]_ [3]_","Clang (including clang-cl [4]_ and armclang) extensions (up to Clang 21),
+   C/C++,"C89, C99, C11, C17, C23, C++98, C++03, C++11, C++14, C++17, C++20, C++23 [1]_ [2]_ [3]_","Clang (including clang-cl and armclang) extensions (up to Clang 23),
 
-   GNU extensions (up to GCC 15),
+   GNU extensions (up to GCC 16),
 
-   Microsoft extensions (up to VS 2022),
+   Microsoft extensions (up to VS 2026),
 
-   Arm Compiler 5 [5]_","``.cpp``, ``.c++``, ``.cxx``, ``.hpp``, ``.hh``, ``.h++``, ``.hxx``, ``.c``, ``.cc``, ``.h``"
+   Arm Compiler 5 [4]_","``.cpp``, ``.c++``, ``.cxx``, ``.hpp``, ``.hh``, ``.h++``, ``.hxx``, ``.c``, ``.cc``, ``.h``"
    C#,C# up to 14,"Microsoft Visual Studio up to 2019 with .NET up to 4.8,
 
    .NET Core up to 3.1
 
    .NET 5, .NET 6, .NET 7, .NET 8, .NET 9, .NET 10","``.sln``, ``.slnx``, ``.csproj``, ``.cs``, ``.cshtml``, ``.xaml``"
    GitHub Actions,"Not applicable",Not applicable,"``.github/workflows/*.yml``, ``.github/workflows/*.yaml``, ``**/action.yml``, ``**/action.yaml``"
-   Go (aka Golang), "Go up to 1.26", "Go 1.11 or more recent", ``.go``
-   Java,"Java 7 to 26 [6]_","javac (OpenJDK and Oracle JDK),
-
-   Eclipse compiler for Java (ECJ) [7]_",``.java``
-   Kotlin,"Kotlin 1.8.0 to 2.4.1\ *x*","kotlinc",``.kt``
-   JavaScript,ECMAScript 2022 or lower,Not applicable,"``.js``, ``.jsx``, ``.mjs``, ``.es``, ``.es6``, ``.htm``, ``.html``, ``.xhtm``, ``.xhtml``, ``.vue``, ``.hbs``, ``.ejs``, ``.njk``, ``.json``, ``.yaml``, ``.yml``, ``.raml``, ``.xml`` [8]_"
-   Python [9]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13",Not applicable,``.py``
-   Ruby [10]_,"up to 3.3",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
-   Rust [11]_,"Rust editions 2021 and 2024","Rust compiler","``.rs``, ``Cargo.toml``"
-   Swift [12]_ [13]_,"Swift 5.4-6.3","Swift compiler","``.swift``"
-   TypeScript [14]_,"2.6-5.9",Standard TypeScript compiler,"``.ts``, ``.tsx``, ``.mts``, ``.cts``"
+   Go (aka Golang), "Go up to 1.27", "Go 1.11 or more recent", ``.go``
+   Java,"Java 7 to 26 [5]_","javac (OpenJDK and Oracle JDK),
+
+   Eclipse compiler for Java (ECJ) [6]_",``.java``
+   Kotlin,"Kotlin 1.8.0 to 2.4.20","kotlinc",``.kt``
+   JavaScript,ECMAScript 2022 or lower,Not applicable,"``.js``, ``.jsx``, ``.mjs``, ``.es``, ``.es6``, ``.htm``, ``.html``, ``.xhtm``, ``.xhtml``, ``.vue``, ``.hbs``, ``.ejs``, ``.njk``, ``.json``, ``.yaml``, ``.yml``, ``.raml``, ``.xml`` [7]_"
+   Python [8]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, 3.14",Not applicable,``.py``
+   Ruby,"up to 3.3",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
+   Rust [9]_,"Rust editions 2021 and 2024","Rust compiler","``.rs``, ``Cargo.toml``"
+   Swift [10]_ [11]_,"Swift 5.4-6.3","Swift compiler","``.swift``"
+   TypeScript [12]_,"2.6-7.0",Standard TypeScript compiler,"``.ts``, ``.tsx``, ``.mts``, ``.cts``"
 
 .. container:: footnote-group
 
     .. [1] C++20 modules are *not* supported.
     .. [2] C23 and C++23 support is currently in beta.
     .. [3] Objective-C, Objective-C++, C++/CLI, and C++/CX are not supported.
-    .. [4] Support for the clang-cl compiler is preliminary.
-    .. [5] Support for the Arm Compiler (armcc) is preliminary.
-    .. [6] Builds that execute on Java 7 to 26 can be analyzed. The analysis understands standard language features in Java 8 to 26; "preview" and "incubator" features are not supported. Source code using Java language versions older than Java 8 are analyzed as Java 8 code.
-    .. [7] ECJ is supported when the build invokes it via the Maven Compiler plugin or the Takari Lifecycle plugin.
-    .. [8] JSX and Flow code, YAML, JSON, HTML, and XML files may also be analyzed with JavaScript files.
-    .. [9] The extractor requires Python 3 to run. To analyze Python 2.7 you should install both versions of Python.
-    .. [10] Requires glibc 2.17.
-    .. [11] Requires ``rustup`` and ``cargo`` to be installed. Features from nightly toolchains are not supported.
-    .. [12] Support for the analysis of Swift requires macOS.
-    .. [13] Embedded Swift is not supported.
-    .. [14] TypeScript analysis is performed by running the JavaScript extractor with TypeScript enabled. This is the default.
+    .. [4] Support for the Arm Compiler (armcc) is preliminary.
+    .. [5] Builds that execute on Java 7 to 26 can be analyzed. The analysis understands standard language features in Java 8 to 26; "preview" and "incubator" features are not supported. Source code using Java language versions older than Java 8 are analyzed as Java 8 code.
+    .. [6] ECJ is supported when the build invokes it via the Maven Compiler plugin or the Takari Lifecycle plugin.
+    .. [7] JSX and Flow code, YAML, JSON, HTML, and XML files may also be analyzed with JavaScript files.
+    .. [8] The extractor requires Python 3 to run. To analyze Python 2.7 you should install both versions of Python.
+    .. [9] Requires ``rustup`` and ``cargo`` to be installed. Features from nightly toolchains are not supported.
+    .. [10] Support for the analysis of Swift requires macOS.
+    .. [11] Embedded Swift is not supported.
+    .. [12] TypeScript analysis is performed by running the JavaScript extractor with TypeScript enabled. This is the default.
diff --git a/docs/codeql/reusables/threat-model-description.rst b/docs/codeql/reusables/threat-model-description.rst
index ff1718fcedcc..4f4966dc23f3 100644
--- a/docs/codeql/reusables/threat-model-description.rst
+++ b/docs/codeql/reusables/threat-model-description.rst
@@ -11,6 +11,7 @@ Note that subcategories can be turned included or excluded separately, so you ca
 
 The less commonly used categories are:
 
+- ``ai`` which represents output generated by large language models (LLMs). This threat model is opt-in.
 - ``android`` which represents reads from external files in Android (``android-external-storage-dir``) and parameter of an entry-point method declared in a ``ContentProvider`` class (``contentprovider``). Currently only used by Java/Kotlin.
 - ``database-access-result`` which represents a database access. Currently only used by JavaScript.
 - ``file-write`` which represents opening a file in write mode. Currently only used in C#.
diff --git a/docs/prepare-db-upgrade-downgrade.md b/docs/prepare-db-upgrade-downgrade.md
new file mode 100644
index 000000000000..113f49ce3083
--- /dev/null
+++ b/docs/prepare-db-upgrade-downgrade.md
@@ -0,0 +1,249 @@
+# Upgrading a language database schema
+
+When a `.dbscheme` file changes, you need to provide two things:
+
+1. An upgrade script that modifies old databases (built against an earlier schema), so they can use new query functionality (albeit with possibly degraded results).
+2. A downgrade script that reverses those changes, so that newer databases can be queried using older query and library packs.
+
+This document explains how to write or generate those scripts.
+
+## Process Overview
+
+ 1. Commit the change to your language's `.dbscheme` file, along with any library updates required to work with the change.
+ 2. Run `misc/scripts/prepare-db-upgrade.sh --lang <lang>`. This will generate skeleton upgrade/downgrade scripts in the appropriate directories.
+ 3. Fill in the details in the two `upgrade.properties` files that it generated, and add any required upgrade queries.
+
+The generated directory names are hashes of the old and new `.dbscheme` files. If the
+schema changes after generating the scripts, delete the generated directories and run the
+script again so that the directory names and schema snapshots use the correct hashes.
+
+It may be helpful to look at some of the existing upgrade/downgrade scripts, to see how they work.
+
+## Details
+
+An `upgrade.properties` file will look something like:
+
+```
+description: what it does
+compatibility: partial
+some_relation.rel: run some_relation.qlo
+```
+
+The `description` field is a textual description of the aim of the step. Describe the
+operation in its actual direction: for example, a downgrade that removes a newly added
+table should say that it removes the table.
+
+The `compatibility` field takes one of four values. In these definitions, the source schema is
+`old.dbscheme`, and the target schema is the other `.dbscheme` in the script directory. Thus,
+the source is the older schema for an upgrade and the newer schema for a downgrade.
+
+ * **full**: query results from the transformed database will be identical to results from a database built with the target version of the toolchain.
+
+ * **backwards**: the step is safe and preserves the meaning of the source database, but features provided by the target query and library packs may not work correctly on the transformed database.
+
+ * **partial**: the step is safe and preserves the meaning of the source database, but rebuilding the database with the target version of the toolchain would produce better results.
+
+ * **breaking**: the step is unsafe and will prevent certain target queries from working.
+
+Choose compatibility independently for the upgrade and downgrade, because the two directions
+may preserve different amounts of information.
+
+The `some_relation.rel` line(s) are the actions required to transform the database in the
+direction of the step. Upgrade and downgrade directories use the same file name and command
+syntax, even though a file in a downgrade directory describes a downgrade. Diff `old.dbscheme`
+against the target `.dbscheme` in the generated directory to determine which actions are
+needed.
+
+No action is needed for a relation added by the target schema if it should be empty in the
+transformed database. A missing relation is treated as empty, so do not add a `.rel` line just
+to create an empty file. If extraction would populate the new relation, however, the upgrade
+is not `full`: it will usually be `backwards`, because queries using the new relation may have
+degraded results on upgraded databases.
+
+A relation that exists in `old.dbscheme` but not in the target schema should normally be
+deleted explicitly with `relation.rel: delete` so that the transformation does not leave
+obsolete data behind.
+
+Sometimes no commands are needed because the schema changed only cosmetically, for example
+by adding or removing comments or changing union type relationships without changing the
+on-disk format. The script then documents that it is safe to replace the old schema with the
+new one.
+
+Ideally, your downgrade script will perfectly revert the changes applied by the upgrade script, such that applying the upgrade and then the downgrade will result in the same database you started with.
+
+Some typical upgrade or downgrade commands look like this:
+
+```
+// Delete a relation that does not exist in the target schema
+obsolete.rel: delete
+
+// Create a new version of a table by applying an expression (using a simple
+// synthetic language) to an existing table. The example duplicates the 'id'
+// column of input.rel as the last column of extended.rel, perhaps to record our
+// best guess at newly-populated "source declaration" information.
+extended.rel: reorder input.rel (int id, string name, int parent) id name parent id
+
+// Create relationname.rel by running relationname.qlo and writing the query
+// results as a .rel file. The query file should be named relationname.ql and
+// should be placed in the upgrade directory. It should avoid using the default
+// QLL library, and will run in the context of the *old* dbscheme.
+relationname.rel: run relationname.qlo
+
+// Create relation1.rel by running the query predicate 'predicate1' in upgrade.qlo
+// and writing the query results as a .rel file, and running 'predicate2' in
+// upgrade.qlo and writing the query results as a .rel file. This command
+// expects the upgrade relation to be a query predicate, which has the advantage
+// of allowing multiple upgrade relations to appear in the same .ql file as
+// multiple query predicates. The query file should be named upgrade.ql and
+// should be placed in the upgrade directory. It should avoid using the default
+// QLL library, and will run in the context of the *old* dbscheme.
+relation1.rel: run upgrade.qlo predicate1
+relation2.rel: run upgrade.qlo predicate2
+```
+
+### Creating new database entities
+
+An upgrade or downgrade query can create database entities that do not exist in
+the source database by using the compiler-provided `QlBuiltins::NewEntity`
+module. Define a `newtype` whose values uniquely identify the entities to
+create, and instantiate `NewEntity` with that type:
+
+```ql
+class Element extends @element {
+  string toString() { none() }
+}
+
+// Create one wrapper for each existing element.
+newtype TAddedElement = TWrapper(Element element)
+
+module Fresh = QlBuiltins::NewEntity<TAddedElement>;
+```
+
+`Fresh::map` maps each value of `TAddedElement` to a distinct new entity ID.
+Using an algebraic data type with multiple constructors allows several distinct
+entities to be created for the same source entity.
+
+The query is compiled against the source schema, so its static QL types cannot
+refer to an entity type that exists only in the target schema. An output column
+that contains only fresh IDs can use `Fresh::EntityId` directly:
+
+```ql
+query predicate new_wrappers(Fresh::EntityId wrapper, Element element) {
+  wrapper = Fresh::map(TWrapper(element))
+}
+```
+
+Run the predicate to populate a relation in the target schema:
+
+```properties
+wrappers.rel: run upgrade.qlo new_wrappers
+```
+
+If an output column can contain both existing source IDs and fresh IDs, define a
+union of the source-schema type and `Fresh::EntityId`, then use a class extending
+that union as the column's static QL type:
+
+```ql
+class TExistingOrFreshElement = @element or Fresh::EntityId;
+
+class ExistingOrFreshElement extends TExistingOrFreshElement {
+  string toString() { none() }
+}
+```
+
+These QL types only describe values while evaluating the transformation against
+the source schema. The corresponding column type in the target database schema
+determines the database type assigned to each fresh ID. Emit every target
+relation needed to describe the new entity, including relationships such as its
+parent, location, or type. When rewriting an existing relation, its output
+predicate will usually need to preserve all existing rows as well as add rows
+containing the fresh IDs. Reuse the same `Fresh::map(...)` expression in each
+predicate that refers to a particular new entity.
+
+### Testing your scripts
+
+Although we have some automated testing of the scripts (e.g. to test that you can upgrade databases all the way from an initial dbscheme to the newest, and back), it's essential that you apply some more rigorous testing for any non-trivial upgrade or downgrade. You might do so as follows:
+
+#### Running qltests
+
+To test the upgrade script, run:
+
+```
+codeql test run --search-path=<old-extractor-pack> --search-path=<codeql-root> <test-dir>
+```
+
+Where `<old-extractor-pack>` is an extractor pack containing the old extractor and dbscheme that pre-date your changes, `<test-dir>` is the directory containing the qltests for your language, and `<codeql-root>` is the root directory of the `github/codeql` clone that contains `<test-dir>`. This will run the tests using an old extractor, and the test databases will all be upgraded in place using your new upgrade script.
+
+To test the downgrade script, create an extractor pack that includes your new dbscheme and extractor changes. Then checkout the `main` branch of `codeql` (i.e. a branch that does not include your changes), and run:
+
+```
+codeql test run --search-path=<new-extractor-pack> <test-dir>
+```
+
+This will run the tests using your new extractor, and the databases will be downgraded using your new downgrade script so that they match the dbscheme of the `main` branch.
+
+#### Manual testing
+
+You might also choose to test with a real-world database.
+
+ 1. Create a snapshot of your favourite project using the old version of the code.
+
+ 2. Switch to the new version of the code.
+
+ 3. Try to run some queries that will depend on your upgrade script working correctly.
+
+ 4. Observe the upgrade being performed in the query server log.
+
+ 5. Verify that your queries produced sensible results.
+
+#### Creating the scripts manually
+
+To create both directions manually, without using `prepare-db-upgrade.sh`, run the following
+commands from the repository root. First set `lang` to the language directory and `schema_file`
+to the repository-relative path of its `.dbscheme` file. For example, for Go:
+
+	```sh
+	lang=go
+	schema_file=go/ql/lib/go.dbscheme
+	```
+
+1. Get the hashes of the old `.dbscheme` from `main` and the new `.dbscheme` from
+	your branch. For example:
+
+	```sh
+	old_hash=$(git show "main:$schema_file" | git hash-object --stdin)
+	new_hash=$(git hash-object "$schema_file")
+	```
+
+2. Create the upgrade directory using the old hash and the downgrade directory using the
+	new hash:
+
+	```sh
+	upgrade_dir="$lang/ql/lib/upgrades/$old_hash"
+	downgrade_dir="$lang/downgrades/$new_hash"
+	mkdir -p "$upgrade_dir" "$downgrade_dir"
+	```
+
+3. Populate the upgrade directory. Here, `old.dbscheme` is the schema from `main`, and
+	the other `.dbscheme` file is the new target schema:
+
+	```sh
+	git show "main:$schema_file" > "$upgrade_dir/old.dbscheme"
+	cp "$schema_file" "$upgrade_dir/$(basename "$schema_file")"
+	```
+
+4. Populate the downgrade directory in the opposite direction. For a downgrade, the new
+	schema is called `old.dbscheme`, because it is the schema before the downgrade step:
+
+	```sh
+	cp "$schema_file" "$downgrade_dir/old.dbscheme"
+	git show "main:$schema_file" > "$downgrade_dir/$(basename "$schema_file")"
+	```
+
+5. Create an `upgrade.properties` file in each directory. The file in the upgrade directory
+	describes the forward transformation, while the file in the downgrade directory describes
+	the reverse transformation.
+
+### Debugging your scripts
+
+Database upgrade/downgrade may fail for several reasons. To find out the exact issue it is recommended to rerun the `codeql test run` commands from above in a verbose mode, e.g. `codeql test run -vvvv ...`.
diff --git a/docs/prepare-db-upgrade.md b/docs/prepare-db-upgrade.md
deleted file mode 100644
index 58806ecebebf..000000000000
--- a/docs/prepare-db-upgrade.md
+++ /dev/null
@@ -1,150 +0,0 @@
-# Upgrading a language database schema
-
-When a `.dbscheme` file changes, you need to provide two things:
-
-1. An upgrade script that modifies old databases (built against an earlier schema), so they can use new query functionality (albeit with possibly degraded results).
-2. A downgrade script that reverses those changes, so that newer databases can be queried using older query and library packs.
-
-This document explains how to write or generate those scripts.
-
-## Process Overview
-
- 1. Commit the change to your language's `.dbscheme` file, along with any library updates required to work with the change.
- 2. Run `misc/scripts/prepare-db-upgrade.sh --lang <lang>`. This will generate skeleton upgrade/downgrade scripts in the appropriate directories.
- 3. Fill in the details in the two `upgrade.properties` files that it generated, and add any required upgrade queries.
-
-It may be helpful to look at some of the existing upgrade/downgrade scripts, to see how they work.
-
-## Details
-
-An `upgrade.properties` file will look something like:
-
-```
-description: what it does
-compatibility: partial
-some_relation.rel: run some_relation.qlo
-```
-
-The `description` field is a textual description of the aim of the upgrade.
-
-The `compatibility` field takes one of four values:
-
- * **full**: results from the upgraded snapshot will be identical to results from a snapshot built with the new version of the toolchain.
-
- * **backwards**: the step is safe and preserves the meaning of the old database, but new features may not work correctly on the upgraded snapshot.
-
- * **partial**: the step is safe and preserves the meaning of the old database, but you would get better results if you rebuilt the snapshot with the new version of the toolchain.
-
- * **breaking**: the step is unsafe and will prevent certain queries from working.
-
-The `some_relation.rel` line(s) are the actions required to perform the database upgrade. Do a diff on the new vs old `.dbscheme` file to get an idea of what they have to achieve. Sometimes you won't need any upgrade commands – this happens when the dbscheme has changed in "cosmetic" ways, for example by adding/removing comments or changing union type relationships, but still retains the same on-disk format for all tables; the purpose of the upgrade script is then to document the fact that it's safe to replace the old dbscheme with the new one.
-
-Ideally, your downgrade script will perfectly revert the changes applied by the upgrade script, such that applying the upgrade and then the downgrade will result in the same database you started with.
-
-Some typical upgrade commands look like this:
-
-```
-// Delete a relation that has been replaced in the new scheme
-obsolete.rel: delete
-
-// Create a new version of a table by applying an expression (using a simple
-// synthetic language) to an existing table. The example duplicates the 'id'
-// column of input.rel as the last column of extended.rel, perhaps to record our
-// best guess at newly-populated "source declaration" information.
-extended.rel: reorder input.rel (int id, string name, int parent) id name parent id
-
-// Create relationname.rel by running relationname.qlo and writing the query
-// results as a .rel file. The query file should be named relationname.ql and
-// should be placed in the upgrade directory. It should avoid using the default
-// QLL library, and will run in the context of the *old* dbscheme.
-relationname.rel: run relationname.qlo
-
-// Create relation1.rel by running the query predicate 'predicate1' in upgrade.qlo
-// and writing the query results as a .rel file, and running 'predicate2' in
-// upgrade.qlo and writing the query results as a .rel file. This command
-// expects the upgrade relation to be a query predicate, which has the advantage
-// of allowing multiple upgrade relations to appear in the same .ql file as
-// multiple query predicates. The query file should be named upgrade.ql and
-// should be placed in the upgrade directory. It should avoid using the default
-// QLL library, and will run in the context of the *old* dbscheme.
-relation1.rel: run upgrade.qlo predicate1
-relation2.rel: run upgrade.qlo predicate2
-```
-
-### Testing your scripts
-
-Although we have some automated testing of the scripts (e.g. to test that you can upgrade databases all the way from an initial dbscheme to the newest, and back), it's essential that you apply some more rigorous testing for any non-trivial upgrade or downgrade. You might do so as follows:
-
-#### Running qltests
-
-To test the upgrade script, run:
-
-```
-codeql test run --search-path=<old-extractor-pack> --search-path=<codeql-root> <test-dir>
-```
-
-Where `<old-extractor-pack>` is an extractor pack containing the old extractor and dbscheme that pre-date your changes, `<test-dir>` is the directory containing the qltests for your language, and `<codeql-root>` is the root directory directory of the `github/codeql` clone that contains `<test-dir>`. This will run the tests using an old extractor, and the test databases will all be upgraded in place using your new upgrade script.
-
-To test the downgrade script, create an extractor pack that includes your new dbscheme and extractor changes. Then checkout the `main` branch of `codeql` (i.e. a branch that does not include your changes), and run:
-
-```
-codeql test run --search-path=<new-extractor-pack> <test-dir>
-```
-
-This will run the tests using your new extractor, and the databases will be downgraded using your new downgrade script so that they match the dbscheme of the `main` branch.
-
-#### Manual testing
-
-You might also choose to test with a real-world database.
-
- 1. Create a snapshot of your favourite project using the old version of the code.
-
- 2. Switch to the new version of the code.
-
- 3. Try to run some queries that will depend on your upgrade script working correctly.
-
- 4. Observe the upgrade being performed in the query server log.
-
- 5. Verify that your queries produced sensible results.
-
-#### Doing the upgrade manually
-
-To create the upgrade directory manually, without using `prepare-db-upgrade.sh`:
-
-1. Get a hash of the old `.dbscheme` file from `main` (i.e. from just before your changes). You can do this by checking out the code prior to your changes and running `git hash-object ql/lib/<mylang>.dbscheme`
-
-2. Go back to your branch and create an upgrade directory with that hash as its name, for example:
-```
-mkdir ql/lib/upgrades/454f1e15151422355049dc4f1f0486a03baeffef
-```
-
-
-3. Copy the old `.dbscheme` file to that directory, using the name old.dbscheme.
-
-```
-cp ql/lib/<mylang>.dbscheme ql/lib/upgrades/454f1e15151422355049dc4f1f0486a03baeffef/old.dbscheme
-```
-
-4. Put a copy of your new `.dbscheme` file in that directory and create an `upgrade.properties` file (as described above).
-
-#### Doing the downgrade manually
-
-The process is similar for downgrade scripts, but there is a reversal in terminology: your **new** dbscheme will now be the one called `old.dbscheme`.
-
-1. Get a hash of your new `.dbscheme` file, with `git hash-object ql/lib/<mylang>.dbscheme`
-
-2. Create a downgrade directory with that hash as its name, for example:
-```
-mkdir downgrades/9fdd1d40fd3c3f8f9db8fabf5a353580d14c663a
-```
-
-3. Copy your new `.dbscheme` file to that directory, using the name `old.dbscheme`.
-```
-cp ql/lib/<mylang>.dbscheme ql/lib/upgrades/454f1e15151422355049dc4f1f0486a03baeffef/old.dbscheme
-```
-
-4. Put a copy of the `.dbscheme` from `main` in that directory and create an `upgrade.properties` file that performs the downgrade (as described above).
-
-### Debugging your scripts
-
-Database upgrade/downgrade may fail for several reasons. To find out the exact issue it is recommended to rerun the `codeql test run` commands from above in a verbose mode, e.g. `codeql test run -vvvv ...`.
diff --git a/go/Makefile b/go/Makefile
index 0b9dc9e4ea4c..86c690fcad9b 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -58,7 +58,6 @@ test: all build/testdb/check-upgrade-path
 #	use GOOS=linux because GOOS=darwin GOARCH=386 is no longer supported
 	env GOOS=linux GOARCH=386 codeql$(EXE) test run -j0 ql/test/query-tests/Security/CWE-681 --search-path .. --check-diff-informed --consistency-queries ql/consistency-queries --compilation-cache=$(cache) --dynamic-join-order-mode=$(rtjo)
 	cd extractor; $(BAZEL) test ...
-	bash extractor-smoke-test/test.sh || (echo "Extractor smoke test FAILED"; exit 1)
 
 .PHONY: build/testdb/check-upgrade-path
 build/testdb/check-upgrade-path : build/testdb/go.dbscheme ql/lib/go.dbscheme
diff --git a/go/actions/test/action.yml b/go/actions/test/action.yml
index d4c391cd0103..453cb6e85122 100644
--- a/go/actions/test/action.yml
+++ b/go/actions/test/action.yml
@@ -1,12 +1,12 @@
 name: Test Go extractor
-description: Run build, QL tests, and optionally basic code sanity checks (formatting and generated code) for the Go extractor
+description: Run build, QL tests, and optionally qhelp generation for the Go extractor
 inputs:
   go-test-version:
     description: Which Go version to use for running the tests
     required: false
-    default: "~1.26.5"
+    default: "~1.27.3"
   run-code-checks:
-    description: Whether to run formatting, code and qhelp generation checks
+    description: Whether to run qhelp generation checks
     required: false
     default: false
 runs:
@@ -26,28 +26,11 @@ runs:
       shell: bash
       run: 'find .github/problem-matchers -name \*.json -exec echo "::add-matcher::{}" \;'
 
-    - name: Check checked-in generated code
-      if: inputs.run-code-checks == 'true'
-      shell: bash
-      run: |
-        bazel run go:gen
-        git add .
-        git diff --exit-code HEAD || (
-          echo "please run bazel run //go:gen"
-          exit 1
-        )
-
     - name: Build
       shell: bash
       run: |
-        bazel run go:go-installer
-
-    - name: Check that all Go code is autoformatted
-      if: inputs.run-code-checks == 'true' && !cancelled()
-      shell: bash
-      run: |
-          cd go
-          make check-formatting
+        cd go/extractor
+        go build ./...
 
     - name: Compile qhelp files to markdown
       if: inputs.run-code-checks == 'true' && !cancelled()
diff --git a/go/codeql-tools/autobuild.sh b/go/codeql-tools/autobuild.sh
index 585152e676e2..85060a3d9bde 100755
--- a/go/codeql-tools/autobuild.sh
+++ b/go/codeql-tools/autobuild.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-if [ "$CODEQL_PLATFORM" != "linux64" ] && [ "$CODEQL_PLATFORM" != "osx64" ] ; then
+if [ "$CODEQL_PLATFORM" != "linux64" ] && [ "$CODEQL_PLATFORM" != "linux-arm64" ] && [ "$CODEQL_PLATFORM" != "osx64" ] ; then
     echo "Automatic build detection for $CODEQL_PLATFORM is not implemented."
     exit 1
 fi
diff --git a/go/codeql-tools/identify-environment.sh b/go/codeql-tools/identify-environment.sh
index 27d483290656..917a59225744 100755
--- a/go/codeql-tools/identify-environment.sh
+++ b/go/codeql-tools/identify-environment.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-if [ "$CODEQL_PLATFORM" != "linux64" ] && [ "$CODEQL_PLATFORM" != "osx64" ] ; then
+if [ "$CODEQL_PLATFORM" != "linux64" ] && [ "$CODEQL_PLATFORM" != "linux-arm64" ] && [ "$CODEQL_PLATFORM" != "osx64" ] ; then
     echo "Automatic build detection for $CODEQL_PLATFORM is not implemented."
     exit 1
 fi
diff --git a/go/codeql-tools/index.sh b/go/codeql-tools/index.sh
index 877400d37f2a..de2790ceca70 100755
--- a/go/codeql-tools/index.sh
+++ b/go/codeql-tools/index.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-if [ "$CODEQL_PLATFORM" != "linux64" ] && [ "$CODEQL_PLATFORM" != "osx64" ] ; then
+if [ "$CODEQL_PLATFORM" != "linux64" ] && [ "$CODEQL_PLATFORM" != "linux-arm64" ] && [ "$CODEQL_PLATFORM" != "osx64" ] ; then
     echo "Automatic build detection for $CODEQL_PLATFORM is not implemented."
     exit 1
 fi
diff --git a/go/docs/language/learn-ql/go/ast-class-reference.rst b/go/docs/language/learn-ql/go/ast-class-reference.rst
index d874652a8946..fc46df7c65d4 100644
--- a/go/docs/language/learn-ql/go/ast-class-reference.rst
+++ b/go/docs/language/learn-ql/go/ast-class-reference.rst
@@ -450,8 +450,6 @@ Miscellaneous
 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | ``...``                                                                                                                                                                                                                                                                                                                                                                    | `Ellipsis <https://help.semmle.com/qldoc/go/semmle/go/Expr.qll/type.Expr$Ellipsis.html>`__             |                                                                                                                    |                                                                                                                                                                                                                          |
 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| ``(``\ `Expr <https://help.semmle.com/qldoc/go/semmle/go/Expr.qll/type.Expr$Expr.html>`__\ ``)``                                                                                                                                                                                                                                                                           | `ParenExpr <https://help.semmle.com/qldoc/go/semmle/go/Expr.qll/type.Expr$ParenExpr.html>`__           |                                                                                                                    |                                                                                                                                                                                                                          |
-+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | `Ident <https://help.semmle.com/qldoc/go/semmle/go/Expr.qll/type.Expr$Ident.html>`__\ ``.``\ `Ident <https://help.semmle.com/qldoc/go/semmle/go/Expr.qll/type.Expr$Ident.html>`__                                                                                                                                                                                          | `SelectorExpr <https://help.semmle.com/qldoc/go/semmle/go/Expr.qll/type.Expr$SelectorExpr.html>`__     |                                                                                                                    |                                                                                                                                                                                                                          |
 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | `Expr <https://help.semmle.com/qldoc/go/semmle/go/Expr.qll/type.Expr$Expr.html>`__\ ``[``\ `Expr <https://help.semmle.com/qldoc/go/semmle/go/Expr.qll/type.Expr$Expr.html>`__\ ``]``                                                                                                                                                                                       | `IndexExpr <https://help.semmle.com/qldoc/go/semmle/go/Expr.qll/type.Expr$IndexExpr.html>`__           |                                                                                                                    |                                                                                                                                                                                                                          |
diff --git a/go/documentation/library-coverage/coverage.csv b/go/documentation/library-coverage/coverage.csv
index d4266a31dfb4..6260bcd1f3aa 100644
--- a/go/documentation/library-coverage/coverage.csv
+++ b/go/documentation/library-coverage/coverage.csv
@@ -3,7 +3,7 @@ package,sink,source,summary,sink:command-injection,sink:credentials-key,sink:jwt
 archive/tar,,,5,,,,,,,,,,,,,,,,,,,,,,,5,
 archive/zip,,,6,,,,,,,,,,,,,,,,,,,,,,,6,
 bufio,,,17,,,,,,,,,,,,,,,,,,,,,,,17,
-bytes,,,44,,,,,,,,,,,,,,,,,,,,,,,44,
+bytes,,,45,,,,,,,,,,,,,,,,,,,,,,,45,
 clevergo.tech/clevergo,1,,,,,,,,,,,,,,,,,1,,,,,,,,,
 cloud.google.com/go/bigquery,1,,,,,,,,,,,,,,1,,,,,,,,,,,,
 compress/bzip2,,,1,,,,,,,,,,,,,,,,,,,,,,,1,
@@ -16,8 +16,8 @@ container/list,,,20,,,,,,,,,,,,,,,,,,,,,,,20,
 container/ring,,,5,,,,,,,,,,,,,,,,,,,,,,,5,
 context,,,5,,,,,,,,,,,,,,,,,,,,,,,5,
 crypto,,,10,,,,,,,,,,,,,,,,,,,,,,,10,
-database/sql,30,18,12,,,,,,,,,,,,30,,,,,,18,,,,,12,
-encoding,,,81,,,,,,,,,,,,,,,,,,,,,,,81,
+database/sql,30,18,14,,,,,,,,,,,,30,,,,,,18,,,,,14,
+encoding,,,112,,,,,,,,,,,,,,,,,,,,,,,112,
 errors,,,4,,,,,,,,,,,,,,,,,,,,,,,4,
 expvar,,,6,,,,,,,,,,,,,,,,,,,,,,,6,
 fmt,3,,16,,,,3,,,,,,,,,,,,,,,,,,,16,
@@ -33,6 +33,7 @@ github.com/astaxie/beego,71,34,21,,,,34,,5,,,,,,30,2,,,,,13,,,21,,21,
 github.com/beego/beego,142,68,42,,,,68,,10,,,,,,60,4,,,,,26,,,42,,42,
 github.com/caarlos0/env,,5,2,,,,,,,,,,,,,,,,,,,5,,,,1,1
 github.com/clevergo/clevergo,1,,,,,,,,,,,,,,,,,1,,,,,,,,,
+github.com/coder/websocket,,2,,,,,,,,,,,,,,,,,,,,,,2,,,
 github.com/codeskyblue/go-sh,4,,,4,,,,,,,,,,,,,,,,,,,,,,,
 github.com/couchbase/gocb,8,22,48,,,,,8,,,,,,,,,,,,,22,,,,,48,
 github.com/couchbaselabs/gocb,8,22,48,,,,,8,,,,,,,,,,,,,22,,,,,48,
@@ -126,7 +127,7 @@ launchpad.net/xmlpath,2,,,,,,,,,,,,,,,,,,2,,,,,,,,
 log,43,,16,,,,43,,,,,,,,,,,,,,,,,,,16,
 math/big,,,1,,,,,,,,,,,,,,,,,,,,,,,1,
 mime,,,14,,,,,,,,,,,,,,,,,,,,,,,14,
-net,2,16,100,,,,,,1,,,,,,,,1,,,,,,,16,,100,
+net,2,16,102,,,,,,1,,,,,,,,1,,,,,,,16,,102,
 nhooyr.io/websocket,,2,,,,,,,,,,,,,,,,,,,,,,2,,,
 os,29,12,6,3,,,,,26,,,,,,,,,,,1,,7,3,,1,6,
 path,,,18,,,,,,,,,,,,,,,,,,,,,,,18,
@@ -135,7 +136,7 @@ regexp,10,,20,,,,,,,3,3,4,,,,,,,,,,,,,,20,
 slices,,,17,,,,,,,,,,,,,,,,,,,,,,,,17
 sort,,,1,,,,,,,,,,,,,,,,,,,,,,,1,
 strconv,,,9,,,,,,,,,,,,,,,,,,,,,,,9,
-strings,,,34,,,,,,,,,,,,,,,,,,,,,,,34,
+strings,,,47,,,,,,,,,,,,,,,,,,,,,,,46,1
 sync,,,34,,,,,,,,,,,,,,,,,,,,,,,34,
 syscall,5,2,8,5,,,,,,,,,,,,,,,,,,2,,,,8,
 text/scanner,,,3,,,,,,,,,,,,,,,,,,,,,,,3,
diff --git a/go/documentation/library-coverage/coverage.rst b/go/documentation/library-coverage/coverage.rst
index fc16fb8c2c57..849c1c937f01 100644
--- a/go/documentation/library-coverage/coverage.rst
+++ b/go/documentation/library-coverage/coverage.rst
@@ -32,7 +32,7 @@ Go framework & library support
    `Revel <http://revel.github.io/>`_,"``github.com/revel/revel*``, ``github.com/robfig/revel*``",46,20,4
    `SendGrid <https://github.com/sendgrid/sendgrid-go>`_,``github.com/sendgrid/sendgrid-go*``,,1,
    `Squirrel <https://github.com/Masterminds/squirrel>`_,"``github.com/Masterminds/squirrel*``, ``github.com/lann/squirrel*``, ``gopkg.in/Masterminds/squirrel``",81,,96
-   `Standard library <https://pkg.go.dev/std>`_,"````, ``archive/*``, ``bufio``, ``bytes``, ``cmp``, ``compress/*``, ``container/*``, ``context``, ``crypto``, ``crypto/*``, ``database/*``, ``debug/*``, ``embed``, ``encoding``, ``encoding/*``, ``errors``, ``expvar``, ``flag``, ``fmt``, ``go/*``, ``hash``, ``hash/*``, ``html``, ``html/*``, ``image``, ``image/*``, ``index/*``, ``io``, ``io/*``, ``log``, ``log/*``, ``maps``, ``math``, ``math/*``, ``mime``, ``mime/*``, ``net``, ``net/*``, ``os``, ``os/*``, ``path``, ``path/*``, ``plugin``, ``reflect``, ``reflect/*``, ``regexp``, ``regexp/*``, ``slices``, ``sort``, ``strconv``, ``strings``, ``sync``, ``sync/*``, ``syscall``, ``syscall/*``, ``testing``, ``testing/*``, ``text/*``, ``time``, ``time/*``, ``unicode``, ``unicode/*``, ``unsafe``, ``weak``",52,625,127
+   `Standard library <https://pkg.go.dev/std>`_,"````, ``archive/*``, ``bufio``, ``bytes``, ``cmp``, ``compress/*``, ``container/*``, ``context``, ``crypto``, ``crypto/*``, ``database/*``, ``debug/*``, ``embed``, ``encoding``, ``encoding/*``, ``errors``, ``expvar``, ``flag``, ``fmt``, ``go/*``, ``hash``, ``hash/*``, ``html``, ``html/*``, ``image``, ``image/*``, ``index/*``, ``io``, ``io/*``, ``log``, ``log/*``, ``maps``, ``math``, ``math/*``, ``mime``, ``mime/*``, ``net``, ``net/*``, ``os``, ``os/*``, ``path``, ``path/*``, ``plugin``, ``reflect``, ``reflect/*``, ``regexp``, ``regexp/*``, ``slices``, ``sort``, ``strconv``, ``strings``, ``sync``, ``sync/*``, ``syscall``, ``syscall/*``, ``testing``, ``testing/*``, ``text/*``, ``time``, ``time/*``, ``unicode``, ``unicode/*``, ``unsafe``, ``weak``",52,674,127
    `XORM <https://xorm.io>`_,"``github.com/go-xorm/xorm*``, ``xorm.io/xorm*``",,,68
    `XPath <https://github.com/antchfx/xpath>`_,``github.com/antchfx/xpath*``,,,4
    `appleboy/gin-jwt <https://github.com/appleboy/gin-jwt>`_,``github.com/appleboy/gin-jwt*``,,,1
@@ -74,5 +74,6 @@ Go framework & library support
    `xpathparser <https://github.com/santhosh-tekuri/xpathparser>`_,``github.com/santhosh-tekuri/xpathparser*``,,,2
    `yaml <https://gopkg.in/yaml.v3>`_,``gopkg.in/yaml*``,,9,
    `zap <https://go.uber.org/zap>`_,``go.uber.org/zap*``,,11,33
-   Totals,,688,1085,1580
+   Others,``github.com/coder/websocket``,2,,
+   Totals,,690,1134,1580
 
diff --git a/go/downgrades/b4012cfa6fa7de1878c247155b7dfcd76df2604d/go.dbscheme b/go/downgrades/b4012cfa6fa7de1878c247155b7dfcd76df2604d/go.dbscheme
new file mode 100644
index 000000000000..d0e7336b491e
--- /dev/null
+++ b/go/downgrades/b4012cfa6fa7de1878c247155b7dfcd76df2604d/go.dbscheme
@@ -0,0 +1,564 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+/** Overlay support **/
+
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @definedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx, is_from_recv]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref,
+          int bound: @compositetype ref, int parent: @typeparamparentobject ref, int idx: int ref, boolean is_from_recv: boolean ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr
+| 55 = @rangeelementexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @definedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @definedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/downgrades/b4012cfa6fa7de1878c247155b7dfcd76df2604d/old.dbscheme b/go/downgrades/b4012cfa6fa7de1878c247155b7dfcd76df2604d/old.dbscheme
new file mode 100644
index 000000000000..b4012cfa6fa7
--- /dev/null
+++ b/go/downgrades/b4012cfa6fa7de1878c247155b7dfcd76df2604d/old.dbscheme
@@ -0,0 +1,565 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+/** Overlay support **/
+
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+isParenthesized(unique int id: @expr ref, int parentheses: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @definedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx, is_from_recv]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref,
+          int bound: @compositetype ref, int parent: @typeparamparentobject ref, int idx: int ref, boolean is_from_recv: boolean ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr
+| 55 = @rangeelementexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @definedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @definedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
diff --git a/go/downgrades/b4012cfa6fa7de1878c247155b7dfcd76df2604d/upgrade.properties b/go/downgrades/b4012cfa6fa7de1878c247155b7dfcd76df2604d/upgrade.properties
new file mode 100644
index 000000000000..74cb08710c86
--- /dev/null
+++ b/go/downgrades/b4012cfa6fa7de1878c247155b7dfcd76df2604d/upgrade.properties
@@ -0,0 +1,3 @@
+description: Remove table recording the number of parentheses around expressions
+compatibility: full
+isParenthesized.rel: delete
diff --git a/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/exprs.ql b/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/exprs.ql
new file mode 100644
index 000000000000..80911bb7a6b8
--- /dev/null
+++ b/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/exprs.ql
@@ -0,0 +1,31 @@
+class Expr_ extends @expr {
+  string toString() { result = "Expr" }
+}
+
+class ExprParent_ extends @exprparent {
+  string toString() { result = "ExprParent" }
+}
+
+// The schema for exprs is:
+//
+// exprs(unique int id: @expr,
+//     int kind: int ref,
+//     int parent: @exprparent ref,
+//     int idx: int ref);
+//
+// `@rangeelementexpr` (kind 55) is a synthesized node that groups the loop
+// variables (the key and value) of a `range` statement. To downgrade we remove
+// those nodes and reparent their children (the key and value expressions)
+// directly onto the `range` statement, at the same indices.
+from Expr_ id, int kind, ExprParent_ newparent, int idx
+where
+  exists(ExprParent_ parent | exprs(id, kind, parent, idx) and kind != 55 |
+    // A key or value grouped by a range element node: reparent it onto the
+    // range statement (the range element node's own parent).
+    exists(Expr_ pe | pe = parent and exprs(pe, 55, newparent, _))
+    or
+    // Any other expression keeps its parent unchanged.
+    not exists(Expr_ pe | pe = parent and exprs(pe, 55, _, _)) and
+    newparent = parent
+  )
+select id, kind, newparent, idx
diff --git a/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/go.dbscheme b/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/go.dbscheme
new file mode 100644
index 000000000000..5ff5325d274a
--- /dev/null
+++ b/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/go.dbscheme
@@ -0,0 +1,563 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+/** Overlay support **/
+
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @definedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx, is_from_recv]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref,
+          int bound: @compositetype ref, int parent: @typeparamparentobject ref, int idx: int ref, boolean is_from_recv: boolean ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @definedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @definedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/has_location.ql b/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/has_location.ql
new file mode 100644
index 000000000000..34dda880ebd1
--- /dev/null
+++ b/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/has_location.ql
@@ -0,0 +1,23 @@
+class Locatable_ extends @locatable {
+  string toString() { result = "Locatable" }
+}
+
+class Location_ extends @location {
+  string toString() { result = "Location" }
+}
+
+class Expr_ extends @expr {
+  string toString() { result = "Expr" }
+}
+
+// The schema for has_location is:
+//
+// has_location(unique int locatable: @locatable ref, int location: @location ref);
+//
+// The synthesized `@rangeelementexpr` nodes (kind 55) are removed by the
+// accompanying `exprs` downgrade, so their locations must be removed too.
+from Locatable_ locatable, Location_ location
+where
+  has_location(locatable, location) and
+  not exists(Expr_ e | e = locatable and exprs(e, 55, _, _))
+select locatable, location
diff --git a/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/old.dbscheme b/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/old.dbscheme
new file mode 100644
index 000000000000..d0e7336b491e
--- /dev/null
+++ b/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/old.dbscheme
@@ -0,0 +1,564 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+/** Overlay support **/
+
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @definedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx, is_from_recv]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref,
+          int bound: @compositetype ref, int parent: @typeparamparentobject ref, int idx: int ref, boolean is_from_recv: boolean ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr
+| 55 = @rangeelementexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @definedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @definedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/upgrade.properties b/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/upgrade.properties
new file mode 100644
index 000000000000..abaabbd305de
--- /dev/null
+++ b/go/downgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/upgrade.properties
@@ -0,0 +1,4 @@
+description: Remove @rangeelementexpr, reparenting range loop variables onto the range statement
+compatibility: full
+exprs.rel: run exprs.qlo
+has_location.rel: run has_location.qlo
diff --git a/go/extractor-smoke-test/.gitignore b/go/extractor-smoke-test/.gitignore
deleted file mode 100644
index e32b11d7ee16..000000000000
--- a/go/extractor-smoke-test/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.bqrs
-tracing-out.csv
-notracing-out.csv
-testdb
diff --git a/go/extractor-smoke-test/expected.csv b/go/extractor-smoke-test/expected.csv
deleted file mode 100644
index cb0eb08f8f42..000000000000
--- a/go/extractor-smoke-test/expected.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-"1","assignment to i"
-"assignment to i","selection of Println"
-"call to Println","exit"
-"entry","skip"
-"entry","skip"
-"function declaration","exit"
-"i","call to Println"
-"nd","col1"
-"selection of Println","i"
-"skip","1"
-"skip","function declaration"
-"skip","skip"
diff --git a/go/extractor-smoke-test/go.mod b/go/extractor-smoke-test/go.mod
deleted file mode 100644
index 0659b4eaec81..000000000000
--- a/go/extractor-smoke-test/go.mod
+++ /dev/null
@@ -1,3 +0,0 @@
-module github.com/codeql-go-extractor-smoke-test
-
-go 1.14
diff --git a/go/extractor-smoke-test/main.go b/go/extractor-smoke-test/main.go
deleted file mode 100644
index 2f7b1325daa0..000000000000
--- a/go/extractor-smoke-test/main.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package main
-
-import "fmt"
-
-func main() {
-	var i int = 1
-	fmt.Println(i)
-}
diff --git a/go/extractor-smoke-test/test.sh b/go/extractor-smoke-test/test.sh
deleted file mode 100755
index bd22da4d906e..000000000000
--- a/go/extractor-smoke-test/test.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-set -e
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-cd $DIR
-
-rm -rf testdb
-
-codeql database create --language=go testdb --search-path ../..
-codeql dataset check testdb/db-go
-codeql query run ../ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/ControlFlowNode_getASuccessor.ql --database=testdb --output=notracing-out.bqrs --search-path ..
-codeql bqrs decode notracing-out.bqrs --format=csv --output=notracing-out.csv
-diff -w -u <(sort notracing-out.csv) expected.csv
-
-# Now do it again with tracing enabled
-
-export CODEQL_EXTRACTOR_GO_BUILD_TRACING=on
-
-rm -rf testdb
-
-codeql database create --language=go testdb --search-path ../..
-codeql dataset check testdb/db-go
-codeql query run ../ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/ControlFlowNode_getASuccessor.ql --database=testdb --output=tracing-out.bqrs --search-path ..
-codeql bqrs decode tracing-out.bqrs --format=csv --output=tracing-out.csv
-diff -w -u <(sort tracing-out.csv) expected.csv
diff --git a/go/extractor/autobuilder/build-environment.go b/go/extractor/autobuilder/build-environment.go
index c660373205b2..bd7fc0adabe1 100644
--- a/go/extractor/autobuilder/build-environment.go
+++ b/go/extractor/autobuilder/build-environment.go
@@ -12,7 +12,7 @@ import (
 )
 
 var minGoVersion = util.NewSemVer("1.11")
-var maxGoVersion = util.NewSemVer("1.26")
+var maxGoVersion = util.NewSemVer("1.27")
 
 type versionInfo struct {
 	goModVersion util.SemVer // The version of Go found in the go directive in the `go.mod` file.
diff --git a/go/extractor/dbscheme/dbscheme.go b/go/extractor/dbscheme/dbscheme.go
index 45aea39b4e54..66152eca49da 100644
--- a/go/extractor/dbscheme/dbscheme.go
+++ b/go/extractor/dbscheme/dbscheme.go
@@ -415,17 +415,19 @@ func AddDefaultSnippet(snippet string) bool {
 
 // PrintDbScheme prints the schema of this database to the writer `w`
 func PrintDbScheme(w io.Writer) {
-	fmt.Fprintf(w, "/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */\n\n")
+	var b strings.Builder
+	fmt.Fprintf(&b, "/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */\n\n")
 	for _, snippet := range defaultSnippets {
-		fmt.Fprintf(w, "%s\n", snippet)
+		fmt.Fprintf(&b, "%s\n", snippet)
 	}
 	for _, table := range tables {
-		fmt.Fprintf(w, "%s\n\n", table.String())
+		fmt.Fprintf(&b, "%s\n\n", table.String())
 	}
 	for _, tp := range types {
 		def := tp.def()
 		if def != "" {
-			fmt.Fprintf(w, "%s\n\n", def)
+			fmt.Fprintf(&b, "%s\n\n", def)
 		}
 	}
+	fmt.Fprintln(w, strings.TrimRight(b.String(), "\n"))
 }
diff --git a/go/extractor/dbscheme/tables.go b/go/extractor/dbscheme/tables.go
index b72c33795182..8335734963c5 100644
--- a/go/extractor/dbscheme/tables.go
+++ b/go/extractor/dbscheme/tables.go
@@ -532,6 +532,12 @@ var ChanTypeExprs = map[ast.ChanDir]*BranchType{
 	ast.SEND | ast.RECV: ExprKind.NewBranch("@sendrcvchantypeexpr", ChanTypeExpr),
 }
 
+// RangeElementExpr is the type of the synthesized node representing the loop
+// variables (key and value) bound by a `range` statement. It groups the key and
+// value expressions into a single "tuple pattern" target, mirroring how other
+// languages present a single variable node for a `foreach` loop.
+var RangeElementExpr = ExprKind.NewBranch("@rangeelementexpr")
+
 // StmtKind is a case type for distinguishing different kinds of statement AST nodes
 var StmtKind = NewCaseType(StmtType, "kind")
 
@@ -990,6 +996,12 @@ var ExprsTable = NewTable("exprs",
 	IntColumn("idx"),
 ).KeySet("parent", "idx")
 
+// IsParenthesizedTable is the table associating expressions with how many parentheses they originally had
+var IsParenthesizedTable = NewTable("isParenthesized",
+	EntityColumn(ExprType, "id").Unique(),
+	IntColumn("parentheses"),
+)
+
 // LiteralsTable is the table associating literal expression AST nodes with their values
 var LiteralsTable = NewTable("literals",
 	EntityColumn(ExprType, "expr").Unique(),
diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index 7f8ae557e3c4..cbe24088d7c0 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -38,8 +38,16 @@ type typeParamParentEntry struct {
 	isFromReceiver bool
 }
 
+// typeParamMutex protects typeParamParent.
+var typeParamParentMutex sync.RWMutex
+
 var typeParamParent map[*types.TypeParam]typeParamParentEntry = make(map[*types.TypeParam]typeParamParentEntry)
 
+// typeParamMutex protects typeParamOrigin.
+var typeParamOriginMutex sync.RWMutex
+
+var typeParamOrigin map[*types.TypeParam]*types.TypeParam = make(map[*types.TypeParam]*types.TypeParam)
+
 func init() {
 	// this sets the number of threads that the Go runtime will spawn; this is separate
 	// from the number of goroutines that the program spawns, which are scheduled into
@@ -1017,7 +1025,23 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int, ski
 		return
 	}
 
+	// Skip parenthesised expressions and extract their child directly in their place
+	nParens := 0
+	for {
+		paren, ok := expr.(*ast.ParenExpr)
+		if !ok {
+			break
+		}
+		nParens++
+		expr = paren.X
+	}
+
 	lbl := tw.Labeler.LocalID(expr)
+
+	if nParens > 0 {
+		dbscheme.IsParenthesizedTable.Emit(tw, lbl, nParens)
+	}
+
 	extractTypeOf(tw, expr, lbl)
 
 	var kind int
@@ -1091,9 +1115,6 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int, ski
 		kind = dbscheme.CompositeLitExpr.Index()
 		extractExpr(tw, expr.Type, lbl, 0, false)
 		extractExprs(tw, expr.Elts, lbl, 1, 1)
-	case *ast.ParenExpr:
-		kind = dbscheme.ParenExpr.Index()
-		extractExpr(tw, expr.X, lbl, 0, false)
 	case *ast.SelectorExpr:
 		kind = dbscheme.SelectorExpr.Index()
 		extractExpr(tw, expr.X, lbl, 0, false)
@@ -1420,8 +1441,18 @@ func extractStmt(tw *trap.Writer, stmt ast.Stmt, parent trap.Label, idx int) {
 		emitScopeNodeInfo(tw, stmt, lbl)
 	case *ast.RangeStmt:
 		kind = dbscheme.RangeStmtType.Index()
-		extractExpr(tw, stmt.Key, lbl, 0, false)
-		extractExpr(tw, stmt.Value, lbl, 1, false)
+		// Synthesize a "range element" node that groups the loop variables (the
+		// key and value) into a single target. This mirrors how other languages
+		// present a single loop-variable node for a `foreach` loop and lets the
+		// shared control-flow library drive the destructuring through this node.
+		patternLbl := tw.Labeler.FreshID()
+		dbscheme.ExprsTable.Emit(tw, patternLbl, dbscheme.RangeElementExpr.Index(), lbl, 0)
+		// The range element node uses the location of the whole range statement,
+		// so that the destructuring control-flow and data-flow nodes derived from
+		// it keep the same location they had before this node was introduced.
+		extractNodeLocation(tw, stmt, patternLbl)
+		extractExpr(tw, stmt.Key, patternLbl, 0, false)
+		extractExpr(tw, stmt.Value, patternLbl, 1, false)
 		extractExpr(tw, stmt.X, lbl, 2, false)
 		extractStmt(tw, stmt.Body, lbl, 3)
 		emitScopeNodeInfo(tw, stmt, lbl)
@@ -1657,8 +1688,8 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 			// parent scope, so they are not dealt with by `extractScopes`
 			for i := 0; i < origintp.NumMethods(); i++ {
 				meth := origintp.Method(i).Origin()
-
 				extractMethod(tw, meth)
+				populateTypeParamParentsAndOrigins(tp.Method(i), meth)
 			}
 
 			underlyingInterface, underlyingIsInterface := underlying.(*types.Interface)
@@ -1682,7 +1713,8 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 		case *types.TypeParam:
 			kind = dbscheme.TypeParamType.Index()
 			parentlbl, isReceiverChild := getTypeParamParentLabel(tw, tp)
-			constraintLabel := extractType(tw, tp.Constraint())
+			constraint := getTypeParamOrigin(tp).Constraint()
+			constraintLabel := extractType(tw, constraint)
 			dbscheme.TypeParamTable.Emit(tw, lbl, tp.Obj().Name(), constraintLabel, parentlbl, tp.Index(), isReceiverChild)
 		case *types.Union:
 			kind = dbscheme.TypeSetLiteral.Index()
@@ -2040,7 +2072,10 @@ func getObjectBeingUsed(tw *trap.Writer, ident *ast.Ident) types.Object {
 }
 
 func getTypeParamParentLabel(tw *trap.Writer, tp *types.TypeParam) (trap.Label, bool) {
+	typeParamParentMutex.RLock()
 	entry, exists := typeParamParent[tp]
+	typeParamParentMutex.RUnlock()
+
 	if !exists {
 		log.Fatalf("Parent of type parameter does not exist: %s %s", tp.String(), tp.Constraint().String())
 	}
@@ -2052,6 +2087,9 @@ func getTypeParamParentLabel(tw *trap.Writer, tp *types.TypeParam) (trap.Label,
 }
 
 func setTypeParamParent(tp *types.TypeParam, parent types.Object, isFromReceiver bool) {
+	typeParamParentMutex.Lock()
+	defer typeParamParentMutex.Unlock()
+
 	entry, exists := typeParamParent[tp]
 	newEntry := typeParamParentEntry{parent, isFromReceiver}
 	if !exists {
@@ -2099,3 +2137,76 @@ func checkObjectNotSpecialized(obj types.Object) {
 		}
 	}
 }
+
+// getTypeParamOrigin returns the origin type parameter for a type parameter
+// from an instantiated method.
+func getTypeParamOrigin(tp *types.TypeParam) *types.TypeParam {
+	typeParamOriginMutex.RLock()
+	origin, exists := typeParamOrigin[tp]
+	typeParamOriginMutex.RUnlock()
+
+	if exists {
+		return origin
+	} else {
+		return tp
+	}
+}
+
+// populateTypeParamParentsAndOrigins records for each type parameter of a method
+// the origin parent and type parameter.
+//
+// Consider a generic struct and a generic method:
+//
+//	type S[P any] struct{}
+//	func (*S[P]) m[Q ~P](x Q) {}
+//
+// If we have a variable 's' of type 'S[int]' and the expression 's.m[int](42)',
+// then the type of the selector expression 's.m' is 'func[Q ~int](Q)'. The
+// method 'm' here is an instantiation of the declaration, which has its own
+// type with type parameter 'Q' with constraint 'interface { ~int }'. As we
+// do not extract method instantiations, but only their origins, we want to
+// match this behavior for the constraints of instantiated type parameter, and
+// record their origin. Moreover, not extracting instantiations also means that
+// 'populateTypeParamParents' does not automatically get called on their type
+// parameters. To compensate, we add the type params here by calling
+// `setTypeParamParent`.
+//
+// As the parent of a type parameter use the origin method. This suffices, as
+// the name and index of the type parameter in the instantiation will be
+// identical to those of the uninstantiated method, and as only a constraint and
+// these two properties will be extracted for a type parameter.
+func populateTypeParamParentsAndOrigins(meth *types.Func, originmeth *types.Func) {
+	if meth == originmeth {
+		return
+	}
+
+	typeparams := meth.Type().(*types.Signature).TypeParams()
+	populateTypeParamParents(typeparams, originmeth, false)
+
+	origintypeparams := originmeth.Type().(*types.Signature).TypeParams()
+	populateTypeParamOrigins(meth, typeparams, origintypeparams)
+}
+
+func populateTypeParamOrigins(meth *types.Func, typeparams *types.TypeParamList, origintypeparams *types.TypeParamList) {
+	if typeparams.Len() != origintypeparams.Len() {
+		log.Fatalf("Method instantiation %s has %d type parameters, origin has %d",
+			meth, typeparams.Len(), origintypeparams.Len())
+	}
+
+	for j := 0; j < typeparams.Len(); j++ {
+		setTypeParamOrigin(typeparams.At(j), origintypeparams.At(j))
+	}
+}
+
+func setTypeParamOrigin(typeparam *types.TypeParam, origintypeparam *types.TypeParam) {
+	typeParamOriginMutex.Lock()
+	defer typeParamOriginMutex.Unlock()
+
+	entry, exists := typeParamOrigin[typeparam]
+	if !exists {
+		typeParamOrigin[typeparam] = origintypeparam
+	} else if entry != origintypeparam {
+		log.Fatalf("Origin of type parameter '%s %s' being set to a different value: '%s' vs '%s'",
+			typeparam.String(), typeparam.Constraint().String(), entry.String(), origintypeparam.String())
+	}
+}
diff --git a/go/extractor/go.mod b/go/extractor/go.mod
index c92b654c8c6c..502203152c18 100644
--- a/go/extractor/go.mod
+++ b/go/extractor/go.mod
@@ -1,26 +1,23 @@
 module github.com/github/codeql-go/extractor
 
-go 1.26
+go 1.27
 
-toolchain go1.26.5
+toolchain go1.27.3
 
 // when updating this, run
 //    bazel run @rules_go//go -- mod tidy
 // when adding or removing dependencies, run
 //    bazel mod tidy
-require (
-	golang.org/x/mod v0.38.0
-	golang.org/x/tools v0.48.0
-)
-
 require (
 	github.com/stretchr/testify v1.11.1
-	golang.org/x/sys v0.47.0
+	golang.org/x/mod v0.42.0
+	golang.org/x/sys v0.49.0
+	golang.org/x/tools v0.52.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/sync v0.22.0 // indirect
+	golang.org/x/sync v0.24.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go/extractor/go.sum b/go/extractor/go.sum
index b57649cbb351..25b1d0bc411b 100644
--- a/go/extractor/go.sum
+++ b/go/extractor/go.sum
@@ -6,14 +6,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-golang.org/x/mod v0.38.0 h1:MECBjubtXD7yj4HrhIUcywNaGeNVUdfVnxmPajOk4yk=
-golang.org/x/mod v0.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40=
-golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
-golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
-golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
-golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE=
-golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk=
+golang.org/x/mod v0.42.0 h1:ICeL3t2L30ljSPHHxDnR4fqVcBt/zR2zJAb9juavmQg=
+golang.org/x/mod v0.42.0/go.mod h1:u5fzIrRInkL8MaO1cbRkUHT64v303YIT5KEqpNr7jRs=
+golang.org/x/sync v0.24.0 h1:iqiDrGoDgyuvAKrhLQthUEzU/R378N78gXbBjxed7oA=
+golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0=
+golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA=
+golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
+golang.org/x/tools v0.52.0 h1:ryxg4U63oaUYk7uOLTF37n43f4qgtGvqV4Ioit1BaEs=
+golang.org/x/tools v0.52.0/go.mod h1:ItcP5UNaVGG+Yc4eIYmaFLNJ4soEopkx5Y2d4lcEurs=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/go/extractor/registries/registryproxy.go b/go/extractor/registries/registryproxy.go
index 39578af476be..270d47ed29b8 100644
--- a/go/extractor/registries/registryproxy.go
+++ b/go/extractor/registries/registryproxy.go
@@ -103,7 +103,13 @@ func getEnvVars() []string {
 			slog.Error("Failed to close the temporary certificate file", slog.String("error", err.Error()))
 		} else {
 			proxy_cert_file = f.Name()
-			result = append(result, fmt.Sprintf("SSL_CERT_FILE=%s", proxy_cert_file))
+			// `SSL_CERT_FILE` is used by Go itself; `GIT_SSL_CAINFO` is used by the `git`
+			// processes that `go` spawns to fetch `git_source` modules.
+			result = append(
+				result,
+				fmt.Sprintf("SSL_CERT_FILE=%s", proxy_cert_file),
+				fmt.Sprintf("GIT_SSL_CAINFO=%s", proxy_cert_file),
+			)
 		}
 	}
 
@@ -160,18 +166,6 @@ func getEnvVars() []string {
 
 			if len(git_sources) > 0 {
 				goprivate = append(goprivate, git_sources...)
-
-				if proxy_cert_file != "" {
-					slog.Info("Configuring `git` to use proxy certificate", slog.String("path", proxy_cert_file))
-					cmd := exec.Command("git", "config", "--global", "http.sslCAInfo", proxy_cert_file)
-
-					out, cmdErr := cmd.CombinedOutput()
-					slog.Info(string(out))
-
-					if cmdErr != nil {
-						slog.Error("Failed to configure `git` to accept the certificate file", slog.String("error", cmdErr.Error()))
-					}
-				}
 			}
 
 			result = append(result, fmt.Sprintf("GOPRIVATE=%s", strings.Join(goprivate, ",")))
diff --git a/go/extractor/registries/registryproxy_test.go b/go/extractor/registries/registryproxy_test.go
index 2f0b34bcb036..bd5d305747a4 100644
--- a/go/extractor/registries/registryproxy_test.go
+++ b/go/extractor/registries/registryproxy_test.go
@@ -1,6 +1,8 @@
 package registries
 
 import (
+	"os"
+	"slices"
 	"testing"
 )
 
@@ -131,3 +133,23 @@ func TestParseRegistryConfigsMultipleGoProxyServers(t *testing.T) {
 		t.Fatalf("Expected `URL` to be `https://goproxy.io`, but got `%s`", second.URL)
 	}
 }
+
+func TestGetEnvVarsScopesCertificateToSubprocesses(t *testing.T) {
+	t.Setenv(PROXY_HOST, "")
+	t.Setenv(PROXY_PORT, "")
+	t.Setenv(PROXY_URLS, "")
+	t.Setenv(PROXY_CA_CERTIFICATE, "dummy certificate")
+
+	vars := getEnvVars()
+	defer os.Remove(proxy_cert_file)
+
+	if proxy_cert_file == "" {
+		t.Fatal("Expected a temporary certificate file to be created.")
+	}
+
+	for _, expected := range []string{"SSL_CERT_FILE=" + proxy_cert_file, "GIT_SSL_CAINFO=" + proxy_cert_file} {
+		if !slices.Contains(vars, expected) {
+			t.Errorf("Expected `getEnvVars` to return %q, but got %v.", expected, vars)
+		}
+	}
+}
diff --git a/go/extractor/toolchain/toolchain_test.go b/go/extractor/toolchain/toolchain_test.go
index 8a6b38318cb9..a62c9016a700 100644
--- a/go/extractor/toolchain/toolchain_test.go
+++ b/go/extractor/toolchain/toolchain_test.go
@@ -8,9 +8,9 @@ import (
 
 func TestParseGoVersion(t *testing.T) {
 	tests := map[string]string{
-		"go version go1.18.9 linux/amd64":            "go1.18.9",
-		"go version go1.26.3-X:nodwarf5 linux/amd64": "go1.26.3",
-		"go version go1.26.3rc1 linux/amd64":         "go1.26.3rc1",
+		"go version go1.18.9 linux/amd64":                                                              "go1.18.9",
+		"go version go1.26.3-X:nodwarf5 linux/amd64":                                                   "go1.26.3",
+		"go version go1.26.3rc1 linux/amd64":                                                           "go1.26.3rc1",
 		"warning: GOPATH set to GOROOT (/usr/local/go) has no effect\ngo version go1.18.9 linux/amd64": "go1.18.9",
 	}
 	for input, expected := range tests {
diff --git a/go/extractor/trap/labels.go b/go/extractor/trap/labels.go
index 473e2e761f2e..ca43bc370252 100644
--- a/go/extractor/trap/labels.go
+++ b/go/extractor/trap/labels.go
@@ -187,7 +187,7 @@ func findMethodOnTypeWithGivenReceiver(tp types.Type, object types.Object) *type
 	if definedType, ok := tp.(*types.Named); ok {
 		for i := 0; i < definedType.NumMethods(); i++ {
 			meth := definedType.Method(i)
-			if object == meth.Type().(*types.Signature).Recv() {
+			if object == meth.Type().(*types.Signature).Recv().Origin() {
 				return meth
 			}
 		}
diff --git a/go/ql/consistency-queries/CHANGELOG.md b/go/ql/consistency-queries/CHANGELOG.md
index d75ab9a9e2d7..00beeb1106c7 100644
--- a/go/ql/consistency-queries/CHANGELOG.md
+++ b/go/ql/consistency-queries/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.0.61
+
+No user-facing changes.
+
+## 1.0.60
+
+No user-facing changes.
+
+## 1.0.59
+
+No user-facing changes.
+
+## 1.0.58
+
+No user-facing changes.
+
+## 1.0.57
+
+No user-facing changes.
+
+## 1.0.56
+
+No user-facing changes.
+
+## 1.0.55
+
+No user-facing changes.
+
 ## 1.0.54
 
 No user-facing changes.
diff --git a/go/ql/consistency-queries/CfgConsistency.ql b/go/ql/consistency-queries/CfgConsistency.ql
new file mode 100644
index 000000000000..86aa5260886c
--- /dev/null
+++ b/go/ql/consistency-queries/CfgConsistency.ql
@@ -0,0 +1,3 @@
+import go
+private import semmle.go.controlflow.ControlFlowGraphImpl
+import CfgImpl::ControlFlow::Consistency
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.55.md b/go/ql/consistency-queries/change-notes/released/1.0.55.md
new file mode 100644
index 000000000000..fd53dce64a9f
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.55.md
@@ -0,0 +1,3 @@
+## 1.0.55
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.56.md b/go/ql/consistency-queries/change-notes/released/1.0.56.md
new file mode 100644
index 000000000000..3b784cb7d975
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.56.md
@@ -0,0 +1,3 @@
+## 1.0.56
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.57.md b/go/ql/consistency-queries/change-notes/released/1.0.57.md
new file mode 100644
index 000000000000..18a94c4bca4a
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.57.md
@@ -0,0 +1,3 @@
+## 1.0.57
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.58.md b/go/ql/consistency-queries/change-notes/released/1.0.58.md
new file mode 100644
index 000000000000..f43459b898c0
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.58.md
@@ -0,0 +1,3 @@
+## 1.0.58
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.59.md b/go/ql/consistency-queries/change-notes/released/1.0.59.md
new file mode 100644
index 000000000000..071c0337a4d5
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.59.md
@@ -0,0 +1,3 @@
+## 1.0.59
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.60.md b/go/ql/consistency-queries/change-notes/released/1.0.60.md
new file mode 100644
index 000000000000..74ecf38fafa0
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.60.md
@@ -0,0 +1,3 @@
+## 1.0.60
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.61.md b/go/ql/consistency-queries/change-notes/released/1.0.61.md
new file mode 100644
index 000000000000..432f5481ee83
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.61.md
@@ -0,0 +1,3 @@
+## 1.0.61
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/codeql-pack.release.yml b/go/ql/consistency-queries/codeql-pack.release.yml
index c3c3b0f4418a..1319f4fe8fde 100644
--- a/go/ql/consistency-queries/codeql-pack.release.yml
+++ b/go/ql/consistency-queries/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.54
+lastReleaseVersion: 1.0.61
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index e21cc5f01830..0b47a03629bd 100644
--- a/go/ql/consistency-queries/qlpack.yml
+++ b/go/ql/consistency-queries/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql-go-consistency-queries
-version: 1.0.55-dev
+version: 1.0.62-dev
 groups:
   - go
   - queries
diff --git a/go/ql/examples/snippets/emptythen.ql b/go/ql/examples/snippets/emptythen.ql
index 97a810e388c1..0973a791dd7f 100644
--- a/go/ql/examples/snippets/emptythen.ql
+++ b/go/ql/examples/snippets/emptythen.ql
@@ -14,5 +14,5 @@
 import go
 
 from IfStmt i
-where i.getThen().getNumStmt() = 0
+where i.getThen().(BlockStmt).getNumStmt() = 0
 select i
diff --git a/go/ql/integration-tests/test-extraction/test.py b/go/ql/integration-tests/test-extraction/test.py
index e25b46801146..7b6caad350a1 100644
--- a/go/ql/integration-tests/test-extraction/test.py
+++ b/go/ql/integration-tests/test-extraction/test.py
@@ -5,3 +5,12 @@ def test_traced(codeql, go):
 
 def test_autobuild(codeql, go):
     codeql.database.create(source_root="src", extractor_option = ["extract_tests=true"])
+
+def test_autobuild_traced(codeql, go):
+    # Autobuild under build tracing must produce the same database as untraced
+    # autobuild and explicit traced builds, all checked against test.expected.
+    codeql.database.create(
+        source_root="src",
+        extractor_option = ["extract_tests=true"],
+        _env={"CODEQL_EXTRACTOR_GO_BUILD_TRACING": "on"},
+    )
diff --git a/go/ql/lib/CHANGELOG.md b/go/ql/lib/CHANGELOG.md
index 4b594f8f7405..55f840973eaf 100644
--- a/go/ql/lib/CHANGELOG.md
+++ b/go/ql/lib/CHANGELOG.md
@@ -1,3 +1,79 @@
+## 8.1.0
+
+### Deprecated APIs
+
+* `ControlFlow::ConditionGuardNode` is now deprecated. Use the API from `semmle.go.controlflow.Guards` instead.
+
+### New Features
+
+* The Go language library now instantiates the shared library `semmle.go.controlflow.Guards`, including the `Guard` and `GuardValue` classes and the `guardEnsures`, `guardEnsuresEq`, `guardEnsuresNeq`, and `guardEnsuresLeq` predicates.
+
+### Bug Fixes
+
+* The Go extractor no longer modifies the global Git configuration when private `git_source` registries are configured. The registry proxy certificate is now passed to Git through the `GIT_SSL_CAINFO` environment variable instead, which only affects the Git processes spawned by `go`.
+
+## 8.0.1
+
+No user-facing changes.
+
+## 8.0.0
+
+### Breaking Changes
+
+* The Go control flow graph (CFG) implementation has been completely rewritten
+  to use the shared CFG library. The CFG now includes additional nodes to more
+  accurately represent certain constructs, including assignments, function
+  parameters and results, range statements, and deferred calls. The CFG now
+  only includes nodes that are reachable from the entry point. Basic blocks are
+  also now constructed directly from the shared CFG. Existing code that relies
+  on specific CFG nodes, edges, locations, textual representations, or basic
+  block boundaries may need to be updated.  Additionally, the following API
+  changes have been made:
+  - `BasicBlocks::Cfg` has been removed. `BasicBlock` now directly uses the
+    basic-block implementation provided by the shared CFG library.
+  - `ControlFlow::EntryNode` and `ControlFlow::ExitNode` have been added, and
+    `ControlFlow::entryNode` and `ControlFlow::exitNode` now return these more
+    specific types.
+  - `IfStmt.getCond` has been deprecated. Please use the new `IfStmt.getCondition` instead.
+  - The result types of `IfStmt.getThen` and `LoopStmt.getBody` have been
+    widened from `BlockStmt` to `Stmt`.
+  - `SwitchStmt.getExpr` has been added, providing a common accessor for the
+    expression examined by expression and type switches.
+  - Several IR instruction classes have been removed or consolidated, including
+    `ReadArgumentInstruction`, `InitResultInstruction`, `IncDecInstruction`,
+    `EvalIncDecRhsInstruction`, `EvalImplicitOneInstruction`,
+    `SelectInstruction`, and `SendInstruction`.
+  - `EvalCompoundAssignRhsInstruction` now also represents increment and
+    decrement operations, and it and `EvalImplicitInitInstruction` directly
+    represent their associated writes.
+
+### Minor Analysis Improvements
+
+* Models for the `nhooyr.io/websocket` package have been updated to also support its new import path `github.com/coder/websocket`.
+
+## 7.3.2
+
+### Minor Analysis Improvements
+
+* Added or improved data flow models for the following Go standard-library APIs introduced or updated in Go 1.27:
+	* `bytes.CutLast`, `database/sql.ConvertAssign`, `database/sql/driver.RowsColumnScanner.ScanColumn`, `net/url.URL.Clone`, `net/url.Values.Clone` and `strings.CutLast`.
+	* The new `encoding/json/jsontext` package.
+* Added more data flow models for the `strings` package: `strings.Clone`, `Cut`, `CutPrefix`, `CutSuffix`, `Fields`, `FieldsFunc`, and `Join`; `strings.Builder.String`, `Builder.WriteByte`, and `Builder.WriteRune`; `strings.Reader.ReadByte` and `Reader.ReadRune`; and `strings.Replacer.Replace` and `Replacer.WriteString`.
+
+## 7.3.1
+
+No user-facing changes.
+
+## 7.3.0
+
+### Major Analysis Improvements
+
+* Go 1.27 is now supported.
+
+## 7.2.3
+
+No user-facing changes.
+
 ## 7.2.2
 
 ### Minor Analysis Improvements
diff --git a/go/ql/lib/change-notes/released/7.2.3.md b/go/ql/lib/change-notes/released/7.2.3.md
new file mode 100644
index 000000000000..ba04214fb88d
--- /dev/null
+++ b/go/ql/lib/change-notes/released/7.2.3.md
@@ -0,0 +1,3 @@
+## 7.2.3
+
+No user-facing changes.
diff --git a/go/ql/lib/change-notes/released/7.3.0.md b/go/ql/lib/change-notes/released/7.3.0.md
new file mode 100644
index 000000000000..0088cfeb9f50
--- /dev/null
+++ b/go/ql/lib/change-notes/released/7.3.0.md
@@ -0,0 +1,5 @@
+## 7.3.0
+
+### Major Analysis Improvements
+
+* Go 1.27 is now supported.
diff --git a/go/ql/lib/change-notes/released/7.3.1.md b/go/ql/lib/change-notes/released/7.3.1.md
new file mode 100644
index 000000000000..2f2fe5472266
--- /dev/null
+++ b/go/ql/lib/change-notes/released/7.3.1.md
@@ -0,0 +1,3 @@
+## 7.3.1
+
+No user-facing changes.
diff --git a/go/ql/lib/change-notes/released/7.3.2.md b/go/ql/lib/change-notes/released/7.3.2.md
new file mode 100644
index 000000000000..988651b7ec2c
--- /dev/null
+++ b/go/ql/lib/change-notes/released/7.3.2.md
@@ -0,0 +1,8 @@
+## 7.3.2
+
+### Minor Analysis Improvements
+
+* Added or improved data flow models for the following Go standard-library APIs introduced or updated in Go 1.27:
+	* `bytes.CutLast`, `database/sql.ConvertAssign`, `database/sql/driver.RowsColumnScanner.ScanColumn`, `net/url.URL.Clone`, `net/url.Values.Clone` and `strings.CutLast`.
+	* The new `encoding/json/jsontext` package.
+* Added more data flow models for the `strings` package: `strings.Clone`, `Cut`, `CutPrefix`, `CutSuffix`, `Fields`, `FieldsFunc`, and `Join`; `strings.Builder.String`, `Builder.WriteByte`, and `Builder.WriteRune`; `strings.Reader.ReadByte` and `Reader.ReadRune`; and `strings.Replacer.Replace` and `Replacer.WriteString`.
diff --git a/go/ql/lib/change-notes/released/8.0.0.md b/go/ql/lib/change-notes/released/8.0.0.md
new file mode 100644
index 000000000000..2f89b50122ee
--- /dev/null
+++ b/go/ql/lib/change-notes/released/8.0.0.md
@@ -0,0 +1,34 @@
+## 8.0.0
+
+### Breaking Changes
+
+* The Go control flow graph (CFG) implementation has been completely rewritten
+  to use the shared CFG library. The CFG now includes additional nodes to more
+  accurately represent certain constructs, including assignments, function
+  parameters and results, range statements, and deferred calls. The CFG now
+  only includes nodes that are reachable from the entry point. Basic blocks are
+  also now constructed directly from the shared CFG. Existing code that relies
+  on specific CFG nodes, edges, locations, textual representations, or basic
+  block boundaries may need to be updated.  Additionally, the following API
+  changes have been made:
+  - `BasicBlocks::Cfg` has been removed. `BasicBlock` now directly uses the
+    basic-block implementation provided by the shared CFG library.
+  - `ControlFlow::EntryNode` and `ControlFlow::ExitNode` have been added, and
+    `ControlFlow::entryNode` and `ControlFlow::exitNode` now return these more
+    specific types.
+  - `IfStmt.getCond` has been deprecated. Please use the new `IfStmt.getCondition` instead.
+  - The result types of `IfStmt.getThen` and `LoopStmt.getBody` have been
+    widened from `BlockStmt` to `Stmt`.
+  - `SwitchStmt.getExpr` has been added, providing a common accessor for the
+    expression examined by expression and type switches.
+  - Several IR instruction classes have been removed or consolidated, including
+    `ReadArgumentInstruction`, `InitResultInstruction`, `IncDecInstruction`,
+    `EvalIncDecRhsInstruction`, `EvalImplicitOneInstruction`,
+    `SelectInstruction`, and `SendInstruction`.
+  - `EvalCompoundAssignRhsInstruction` now also represents increment and
+    decrement operations, and it and `EvalImplicitInitInstruction` directly
+    represent their associated writes.
+
+### Minor Analysis Improvements
+
+* Models for the `nhooyr.io/websocket` package have been updated to also support its new import path `github.com/coder/websocket`.
diff --git a/go/ql/lib/change-notes/released/8.0.1.md b/go/ql/lib/change-notes/released/8.0.1.md
new file mode 100644
index 000000000000..72c82ffed0b6
--- /dev/null
+++ b/go/ql/lib/change-notes/released/8.0.1.md
@@ -0,0 +1,3 @@
+## 8.0.1
+
+No user-facing changes.
diff --git a/go/ql/lib/change-notes/released/8.1.0.md b/go/ql/lib/change-notes/released/8.1.0.md
new file mode 100644
index 000000000000..29a390f48645
--- /dev/null
+++ b/go/ql/lib/change-notes/released/8.1.0.md
@@ -0,0 +1,13 @@
+## 8.1.0
+
+### Deprecated APIs
+
+* `ControlFlow::ConditionGuardNode` is now deprecated. Use the API from `semmle.go.controlflow.Guards` instead.
+
+### New Features
+
+* The Go language library now instantiates the shared library `semmle.go.controlflow.Guards`, including the `Guard` and `GuardValue` classes and the `guardEnsures`, `guardEnsuresEq`, `guardEnsuresNeq`, and `guardEnsuresLeq` predicates.
+
+### Bug Fixes
+
+* The Go extractor no longer modifies the global Git configuration when private `git_source` registries are configured. The registry proxy certificate is now passed to Git through the `GIT_SSL_CAINFO` environment variable instead, which only affects the Git processes spawned by `go`.
diff --git a/go/ql/lib/codeql-pack.release.yml b/go/ql/lib/codeql-pack.release.yml
index fa4a7164fb7b..59984961848d 100644
--- a/go/ql/lib/codeql-pack.release.yml
+++ b/go/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 7.2.2
+lastReleaseVersion: 8.1.0
diff --git a/go/ql/lib/ext/bytes.model.yml b/go/ql/lib/ext/bytes.model.yml
index b55749f828bf..9f5ad37176a7 100644
--- a/go/ql/lib/ext/bytes.model.yml
+++ b/go/ql/lib/ext/bytes.model.yml
@@ -5,6 +5,7 @@ extensions:
     data:
       - ["bytes", "", False, "Clone", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["bytes", "", False, "Cut", "", "", "Argument[0]", "ReturnValue[0..1]", "taint", "manual"]
+      - ["bytes", "", False, "CutLast", "", "", "Argument[0]", "ReturnValue[0..1]", "taint", "manual"]
       - ["bytes", "", False, "CutPrefix", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
       - ["bytes", "", False, "CutSuffix", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
       - ["bytes", "", False, "Fields", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
diff --git a/go/ql/lib/ext/database.sql.driver.model.yml b/go/ql/lib/ext/database.sql.driver.model.yml
index 0f33a6e14b8c..2c5770e26194 100644
--- a/go/ql/lib/ext/database.sql.driver.model.yml
+++ b/go/ql/lib/ext/database.sql.driver.model.yml
@@ -24,5 +24,6 @@ extensions:
       - ["database/sql/driver", "Conn", True, "Prepare", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
       - ["database/sql/driver", "ConnPrepareContext", True, "PrepareContext", "", "", "Argument[1]", "ReturnValue[0]", "taint", "manual"]
       - ["database/sql/driver", "Rows", True, "Next", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["database/sql/driver", "RowsColumnScanner", True, "ScanColumn", "", "", "Argument[receiver]", "Argument[2]", "taint", "manual"]
       - ["database/sql/driver", "ValueConverter", True, "ConvertValue", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
       - ["database/sql/driver", "Valuer", True, "Value", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
diff --git a/go/ql/lib/ext/database.sql.model.yml b/go/ql/lib/ext/database.sql.model.yml
index 8d67dd921423..3f37c2a6eab4 100644
--- a/go/ql/lib/ext/database.sql.model.yml
+++ b/go/ql/lib/ext/database.sql.model.yml
@@ -49,6 +49,7 @@ extensions:
       pack: codeql/go-all
       extensible: summaryModel
     data:
+      - ["database/sql", "", False, "ConvertAssign", "", "", "Argument[2]", "Argument[1]", "taint", "manual"]
       - ["database/sql", "", False, "Named", "", "", "Argument[0..1]", "ReturnValue", "taint", "manual"]
       - ["database/sql", "Conn", True, "PrepareContext", "", "", "Argument[1]", "ReturnValue[0]", "taint", "manual"]
       - ["database/sql", "DB", True, "Prepare", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
diff --git a/go/ql/lib/ext/encoding.json.jsontext.model.yml b/go/ql/lib/ext/encoding.json.jsontext.model.yml
new file mode 100644
index 000000000000..d04afceaefe2
--- /dev/null
+++ b/go/ql/lib/ext/encoding.json.jsontext.model.yml
@@ -0,0 +1,36 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      - ["encoding/json/jsontext", "", False, "AppendFloat", "", "", "Argument[0..1]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "", False, "AppendFormat", "", "", "Argument[0..1]", "ReturnValue[0]", "taint", "manual"]
+      - ["encoding/json/jsontext", "", False, "AppendQuote", "", "", "Argument[0..1]", "ReturnValue[0]", "taint", "manual"]
+      - ["encoding/json/jsontext", "", False, "AppendUnquote", "", "", "Argument[0..1]", "ReturnValue[0]", "taint", "manual"]
+      - ["encoding/json/jsontext", "", False, "NewDecoder", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "", False, "Float", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "", False, "Float32", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "", False, "Int", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "", False, "String", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "", False, "Uint", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "Decoder", True, "ReadToken", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
+      - ["encoding/json/jsontext", "Decoder", True, "ReadValue", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
+      - ["encoding/json/jsontext", "Decoder", True, "Reset", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
+      - ["encoding/json/jsontext", "Decoder", True, "UnreadBuffer", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "Encoder", True, "Reset", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["encoding/json/jsontext", "Encoder", True, "WriteToken", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
+      - ["encoding/json/jsontext", "Encoder", True, "WriteValue", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
+      - ["encoding/json/jsontext", "Pointer", True, "AppendToken", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "Pointer", True, "AppendToken", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "Pointer", True, "LastToken", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "Pointer", True, "Parent", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "Token", True, "Clone", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "Token", True, "Float", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
+      - ["encoding/json/jsontext", "Token", True, "Float32", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
+      - ["encoding/json/jsontext", "Token", True, "Int", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
+      - ["encoding/json/jsontext", "Token", True, "String", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "Token", True, "Uint", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
+      - ["encoding/json/jsontext", "Value", True, "Clone", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "Value", True, "MarshalJSON", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
+      - ["encoding/json/jsontext", "Value", True, "String", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["encoding/json/jsontext", "Value", True, "UnmarshalJSON", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
diff --git a/go/ql/lib/ext/github.com.coder.websocket.model.yml b/go/ql/lib/ext/github.com.coder.websocket.model.yml
new file mode 100644
index 000000000000..cf94840ea910
--- /dev/null
+++ b/go/ql/lib/ext/github.com.coder.websocket.model.yml
@@ -0,0 +1,13 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: packageGrouping
+    data:
+      - ["coder/websocket", "github.com/coder/websocket"]
+      - ["coder/websocket", "nhooyr.io/websocket"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["group:coder/websocket", "Conn", True, "Read", "", "", "ReturnValue[1]", "remote", "manual"]
+      - ["group:coder/websocket", "Conn", True, "Reader", "", "", "ReturnValue[1]", "remote", "manual"]
diff --git a/go/ql/lib/ext/maps.model.yml b/go/ql/lib/ext/maps.model.yml
new file mode 100644
index 000000000000..ce772ae31a46
--- /dev/null
+++ b/go/ql/lib/ext/maps.model.yml
@@ -0,0 +1,14 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      # All should be modeled when we have a way to model iterators
+      - ["maps", "", False, "Clone", "", "", "Argument[0].MapKey", "ReturnValue.MapKey", "value", "manual"]
+      - ["maps", "", False, "Clone", "", "", "Argument[0].MapValue", "ReturnValue.MapValue", "value", "manual"]
+      # Collect should be modeled when we have a way to model iterators
+      - ["maps", "", False, "Copy", "", "", "Argument[1].MapKey", "Argument[0].MapKey", "value", "manual"]
+      - ["maps", "", False, "Copy", "", "", "Argument[1].MapValue", "Argument[0].MapValue", "value", "manual"]
+      # Insert should be modeled when we have a way to model iterators
+      # Keys should be modeled when we have a way to model iterators
+      # Values should be modeled when we have a way to model iterators
diff --git a/go/ql/lib/ext/net.url.model.yml b/go/ql/lib/ext/net.url.model.yml
index 0b48aa2352c2..ca4cf2c170f2 100644
--- a/go/ql/lib/ext/net.url.model.yml
+++ b/go/ql/lib/ext/net.url.model.yml
@@ -12,6 +12,7 @@ extensions:
       - ["net/url", "", False, "QueryUnescape", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
       - ["net/url", "", False, "User", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["net/url", "", False, "UserPassword", "", "", "Argument[0..1]", "ReturnValue", "taint", "manual"]
+      - ["net/url", "URL", True, "Clone", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
       - ["net/url", "URL", True, "EscapedPath", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
       - ["net/url", "URL", True, "Hostname", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
       - ["net/url", "URL", True, "MarshalBinary", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
@@ -24,5 +25,6 @@ extensions:
       - ["net/url", "URL", True, "ResolveReference", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["net/url", "Userinfo", True, "Password", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
       - ["net/url", "Userinfo", True, "Username", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["net/url", "Values", True, "Clone", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
       - ["net/url", "Values", True, "Encode", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
       - ["net/url", "Values", True, "Get", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
diff --git a/go/ql/lib/ext/nhooyr.io.websocket.model.yml b/go/ql/lib/ext/nhooyr.io.websocket.model.yml
deleted file mode 100644
index bb94c1ce2d4c..000000000000
--- a/go/ql/lib/ext/nhooyr.io.websocket.model.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-extensions:
-  - addsTo:
-      pack: codeql/go-all
-      extensible: sourceModel
-    data:
-      - ["nhooyr.io/websocket", "Conn", True, "Read", "", "", "ReturnValue[1]", "remote", "manual"]
-      - ["nhooyr.io/websocket", "Conn", True, "Reader", "", "", "ReturnValue[1]", "remote", "manual"]
diff --git a/go/ql/lib/ext/strings.model.yml b/go/ql/lib/ext/strings.model.yml
index 01015b31517e..4a6d852baab4 100644
--- a/go/ql/lib/ext/strings.model.yml
+++ b/go/ql/lib/ext/strings.model.yml
@@ -3,9 +3,15 @@ extensions:
       pack: codeql/go-all
       extensible: summaryModel
     data:
-      - ["strings", "", False, "Fields", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["strings", "", False, "FieldsFunc", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["strings", "", False, "Join", "", "", "Argument[0..1]", "ReturnValue", "taint", "manual"]
+      - ["strings", "", False, "Clone", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+      - ["strings", "", False, "Cut", "", "", "Argument[0]", "ReturnValue[0..1]", "taint", "manual"]
+      - ["strings", "", False, "CutLast", "", "", "Argument[0]", "ReturnValue[0..1]", "taint", "manual"]
+      - ["strings", "", False, "CutPrefix", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["strings", "", False, "CutSuffix", "", "", "Argument[0]", "ReturnValue[0]", "taint", "manual"]
+      - ["strings", "", False, "Fields", "", "", "Argument[0]", "ReturnValue.ArrayElement", "taint", "manual"]
+      - ["strings", "", False, "FieldsFunc", "", "", "Argument[0]", "ReturnValue.ArrayElement", "taint", "manual"]
+      - ["strings", "", False, "Join", "", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "manual"]
+      - ["strings", "", False, "Join", "", "", "Argument[1]", "ReturnValue", "taint", "manual"]
       - ["strings", "", False, "Map", "", "", "Argument[1]", "ReturnValue", "taint", "manual"]
       - ["strings", "", False, "NewReader", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["strings", "", False, "Repeat", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
@@ -34,6 +40,13 @@ extensions:
       - ["strings", "", False, "TrimRightFunc", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["strings", "", False, "TrimSpace", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["strings", "", False, "TrimSuffix", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["strings", "Builder", True, "String", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["strings", "Builder", True, "WriteByte", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
+      - ["strings", "Builder", True, "WriteRune", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
+      - ["strings", "Reader", True, "ReadByte", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
+      - ["strings", "Reader", True, "ReadRune", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
       - ["strings", "Reader", True, "Reset", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
+      - ["strings", "Replacer", True, "Replace", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
       - ["strings", "Replacer", True, "Replace", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["strings", "Replacer", True, "WriteString", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
       - ["strings", "Replacer", True, "WriteString", "", "", "Argument[1]", "Argument[0]", "taint", "manual"]
diff --git a/go/ql/lib/go.dbscheme b/go/ql/lib/go.dbscheme
index 5ff5325d274a..b4012cfa6fa7 100644
--- a/go/ql/lib/go.dbscheme
+++ b/go/ql/lib/go.dbscheme
@@ -162,6 +162,8 @@ doc_comments(unique int node: @documentable ref, int comment: @comment_group ref
 #keyset[parent, idx]
 exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
 
+isParenthesized(unique int id: @expr ref, int parentheses: int ref);
+
 literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
 
 constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
@@ -336,7 +338,8 @@ case @expr.kind of
 | 51 = @andnotexpr
 | 52 = @sendchantypeexpr
 | 53 = @recvchantypeexpr
-| 54 = @sendrcvchantypeexpr;
+| 54 = @sendrcvchantypeexpr
+| 55 = @rangeelementexpr;
 
 @basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
 
@@ -560,4 +563,3 @@ case @error.kind of
 | 1 = @listerror
 | 2 = @parseerror
 | 3 = @typeerror;
-
diff --git a/go/ql/lib/printCfg.ql b/go/ql/lib/printCfg.ql
new file mode 100644
index 000000000000..2b018caf5acc
--- /dev/null
+++ b/go/ql/lib/printCfg.ql
@@ -0,0 +1,53 @@
+/**
+ * @name Print CFG
+ * @description Produces a representation of a file's Control Flow Graph.
+ *              This query is used by the VS Code extension.
+ * @id go/print-cfg
+ * @kind graph
+ * @tags ide-contextual-queries/print-cfg
+ */
+
+import go
+import semmle.go.controlflow.ControlFlowGraph
+private import semmle.go.controlflow.ControlFlowGraphImpl
+
+external string selectedSourceFile();
+
+private predicate selectedSourceFileAlias = selectedSourceFile/0;
+
+external int selectedSourceLine();
+
+private predicate selectedSourceLineAlias = selectedSourceLine/0;
+
+external int selectedSourceColumn();
+
+private predicate selectedSourceColumnAlias = selectedSourceColumn/0;
+
+module ViewCfgQueryInput implements CfgImpl::ControlFlow::ViewCfgQueryInputSig<File> {
+  predicate selectedSourceFile = selectedSourceFileAlias/0;
+
+  predicate selectedSourceLine = selectedSourceLineAlias/0;
+
+  predicate selectedSourceColumn = selectedSourceColumnAlias/0;
+
+  predicate cfgScopeSpan(
+    CfgScope scope, File file, int startLine, int startColumn, int endLine, int endColumn
+  ) {
+    file = scope.getFile() and
+    scope.getLocation().getStartLine() = startLine and
+    scope.getLocation().getStartColumn() = startColumn and
+    exists(Location loc |
+      loc.getEndLine() = endLine and
+      loc.getEndColumn() = endColumn and
+      loc = scope.(FuncDef).getBody().getLocation()
+    )
+    or
+    file = scope.(File) and
+    startLine = 1 and
+    startColumn = 1 and
+    endLine = file.getNumberOfLines() and
+    endColumn = 999999
+  }
+}
+
+import CfgImpl::ControlFlow::ViewCfgQuery<File, ViewCfgQueryInput>
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index 47c1077e0992..728d6fbe2263 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 7.2.3-dev
+version: 8.1.1-dev
 groups: go
 dbscheme: go.dbscheme
 extractor: go
diff --git a/go/ql/lib/semmle/go/Comments.qll b/go/ql/lib/semmle/go/Comments.qll
index 08a0fabc1cab..b5cd9a48e173 100644
--- a/go/ql/lib/semmle/go/Comments.qll
+++ b/go/ql/lib/semmle/go/Comments.qll
@@ -190,6 +190,18 @@ private Comment getInitialComment(File f, int i) {
     )
 }
 
+bindingset[comment]
+pragma[inline_late]
+private predicate hasBuildConstraintText(Comment comment) {
+  comment.getText().regexpMatch("\\s*(\\+|go:)build.*")
+}
+
+pragma[noinline]
+private predicate isInitialBuildConstraintComment(Comment comment) {
+  isInitialComment(comment, _, _, _) and
+  hasBuildConstraintText(comment)
+}
+
 /**
  * A build constraint comment of the form `// +build ...` or `//go:build ...`.
  *
@@ -211,7 +223,7 @@ class BuildConstraintComment extends LineComment {
       not getInitialComment(f, [0 .. i - 1]) instanceof BlockComment
     ) and
     // comment text starts with `+build` or `go:build`
-    this.getText().regexpMatch("\\s*(\\+|go:)build.*")
+    isInitialBuildConstraintComment(this)
   }
 
   override string getAPrimaryQlClass() { result = "BuildConstraintComment" }
diff --git a/go/ql/lib/semmle/go/Concepts.qll b/go/ql/lib/semmle/go/Concepts.qll
index 302149149520..1194b2051f5a 100644
--- a/go/ql/lib/semmle/go/Concepts.qll
+++ b/go/ql/lib/semmle/go/Concepts.qll
@@ -431,7 +431,7 @@ private class HeuristicLoggerFunction extends Method {
     )
   }
 
-  override predicate mayReturnNormally() { logFunctionPrefix != "Fatal" }
+  override predicate mustNotReturnNormally() { logFunctionPrefix = "Fatal" }
 
   override predicate mustPanic() { logFunctionPrefix = "Panic" }
 }
diff --git a/go/ql/lib/semmle/go/Expr.qll b/go/ql/lib/semmle/go/Expr.qll
index 9a8481a2dcc8..e3db6bd12650 100644
--- a/go/ql/lib/semmle/go/Expr.qll
+++ b/go/ql/lib/semmle/go/Expr.qll
@@ -5,6 +5,7 @@ overlay[local]
 module;
 
 import go
+private import semmle.go.controlflow.ControlFlowGraphImpl
 
 /**
  * An expression.
@@ -17,6 +18,12 @@ import go
  * ```
  */
 class Expr extends @expr, ExprParent {
+  /** Gets the control-flow node associated with this expression. */
+  CfgImpl::Cfg::ControlFlowNode getControlFlowNode() { result.injects(this) }
+
+  /** Gets the basic block containing this expression. */
+  CfgImpl::Cfg::BasicBlock getBasicBlock() { result = this.getControlFlowNode().getBasicBlock() }
+
   /**
    * Gets the kind of this expression, which is an integer value representing the expression's
    * node type.
@@ -551,6 +558,11 @@ class SliceLit extends ArrayOrSliceLit {
  * ```go
  * (x + y)
  * ```
+ *
+ * Note that `ParenExpr` is no longer extracted - the child expression takes
+ * the place of the parenthesized expression directly. This class only exists
+ * for compatibility with old databases, and will be deprecated and removed in
+ * the future.
  */
 class ParenExpr extends @parenexpr, Expr {
   /** Gets the expression between parentheses. */
@@ -971,6 +983,18 @@ class KeyValueExpr extends @keyvalueexpr, Expr {
   /** Gets the composite literal to which this key-value pair belongs. */
   CompositeLit getLiteral() { this = result.getElement(_) }
 
+  /**
+   * Gets the type of this key-value pair.
+   *
+   * The Go type checker does not assign a type to key-value pairs, so we use the
+   * type of the value, which is the value that flows through this node.
+   */
+  override Type getType() {
+    type_of(this, result)
+    or
+    not type_of(this, _) and result = this.getValue().getType()
+  }
+
   override string toString() { result = "key-value pair" }
 
   override string getAPrimaryQlClass() { result = "KeyValueExpr" }
@@ -2137,8 +2161,6 @@ private predicate isTypeExprBottomUp(Expr e) {
   or
   e instanceof @indexexpr and isTypeExprBottomUp(e.getChildExpr(0))
   or
-  isTypeExprBottomUp(e.(ParenExpr).getExpr())
-  or
   isTypeExprBottomUp(e.(StarExpr).getBase())
   or
   isTypeExprBottomUp(e.(Ellipsis).getOperand())
@@ -2189,8 +2211,6 @@ private predicate isTypeExprTopDown(Expr e) {
   or
   e = any(SelectorExpr sel | isTypeExprTopDown(sel)).getBase()
   or
-  e = any(ParenExpr pe | isTypeExprTopDown(pe)).getExpr()
-  or
   e = any(StarExpr se | isTypeExprTopDown(se)).getBase()
   or
   e = any(Ellipsis ell | isTypeExprTopDown(ell)).getOperand()
@@ -2239,8 +2259,6 @@ class ReferenceExpr extends Expr {
     not this = any(MethodSpec md).getNameExpr() and
     not this = any(StructLit sl).getKey(_)
     or
-    this.(ParenExpr).getExpr() instanceof ReferenceExpr
-    or
     this.(StarExpr).getBase() instanceof ReferenceExpr
     or
     this instanceof DerefExpr
@@ -2290,7 +2308,6 @@ class ValueExpr extends Expr {
     this instanceof BasicLit or
     this instanceof FuncLit or
     this instanceof CompositeLit or
-    this.(ParenExpr).getExpr() instanceof ValueExpr or
     this instanceof SliceExpr or
     this instanceof TypeAssertExpr or
     this instanceof CallOrConversionExpr or
diff --git a/go/ql/lib/semmle/go/Files.qll b/go/ql/lib/semmle/go/Files.qll
index ab4e2e084ed0..68bb00073e05 100644
--- a/go/ql/lib/semmle/go/Files.qll
+++ b/go/ql/lib/semmle/go/Files.qll
@@ -68,7 +68,7 @@ class ExtractedOrExternalFile extends Container, Impl::File, Documentable, ExprP
   string getPackageName() { result = this.getPackageNameExpr().getName() }
 
   /** Holds if this file contains at least one build constraint. */
-  pragma[noinline]
+  pragma[nomagic]
   predicate hasBuildConstraints() { exists(BuildConstraintComment bc | this = bc.getFile()) }
 
   /**
diff --git a/go/ql/lib/semmle/go/PrintAst.qll b/go/ql/lib/semmle/go/PrintAst.qll
index 6ea5fcc39719..c7c9bb5b4b7e 100644
--- a/go/ql/lib/semmle/go/PrintAst.qll
+++ b/go/ql/lib/semmle/go/PrintAst.qll
@@ -1,7 +1,7 @@
 /**
  * Provides queries to pretty-print a Go AST as a graph.
  */
-overlay[local]
+overlay[local?]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/Scopes.qll b/go/ql/lib/semmle/go/Scopes.qll
index 9f18290fb011..735dbe80d590 100644
--- a/go/ql/lib/semmle/go/Scopes.qll
+++ b/go/ql/lib/semmle/go/Scopes.qll
@@ -437,11 +437,12 @@ class Function extends ValueEntity, @functionobject {
    * This predicate is an over-approximation: it may hold for functions that can never
    * return normally, but it never fails to hold for functions that can.
    *
-   * Note this is declared here and not in `DeclaredFunction` so that library models can override this
-   * by extending `Function` rather than having to remember to extend `DeclaredFunction`.
+   * Library models should not override this predicate; override `mustNotReturnNormally`
+   * instead, so that the control-flow graph construction can take the model into account.
    */
   predicate mayReturnNormally() {
     not this.mustPanic() and
+    not this.mustNotReturnNormally() and
     (ControlFlow::mayReturnNormally(this.getFuncDecl()) or not exists(this.getBody()))
   }
 
@@ -461,6 +462,16 @@ class Function extends ValueEntity, @functionobject {
    */
   predicate mustPanic() { none() }
 
+  /**
+   * Holds if calling this function never returns normally (for example because it
+   * always panics, exits the process, or loops forever).
+   *
+   * Unlike `mayReturnNormally`, this predicate must be defined without reference to
+   * the control-flow graph, so that it can be used during CFG construction to
+   * suppress normal-flow successors of calls to this function.
+   */
+  predicate mustNotReturnNormally() { none() }
+
   /** Gets the number of parameters of this function. */
   int getNumParameter() { result = this.getType().(SignatureType).getNumParameter() }
 
diff --git a/go/ql/lib/semmle/go/Stmt.qll b/go/ql/lib/semmle/go/Stmt.qll
index aa6fe7c24de9..04d9b24e9f70 100644
--- a/go/ql/lib/semmle/go/Stmt.qll
+++ b/go/ql/lib/semmle/go/Stmt.qll
@@ -571,7 +571,7 @@ class ReturnStmt extends @returnstmt, Stmt {
   int getNumExpr() { result = count(this.getAnExpr()) }
 
   /** Gets the unique returned expression, if there is only one. */
-  Expr getExpr() { this.getNumChild() = 1 and result = this.getExpr(0) }
+  Expr getExpr() { this.getNumExpr() = 1 and result = this.getExpr(0) }
 
   override predicate mayHaveSideEffects() { this.getAnExpr().mayHaveSideEffects() }
 
@@ -710,18 +710,21 @@ class IfStmt extends @ifstmt, Stmt, ScopeNode {
   /** Gets the init statement of this `if` statement, if any. */
   Stmt getInit() { result = this.getChildStmt(0) }
 
+  /** DEPRECATED: Use `getCondition` instead. */
+  deprecated Expr getCond() { result = this.getCondition() }
+
   /** Gets the condition of this `if` statement. */
-  Expr getCond() { result = this.getChildExpr(1) }
+  Expr getCondition() { result = this.getChildExpr(1) }
 
   /** Gets the "then" branch of this `if` statement. */
-  BlockStmt getThen() { result = this.getChildStmt(2) }
+  Stmt getThen() { result = this.getChildStmt(2) }
 
   /** Gets the "else" branch of this `if` statement, if any. */
   Stmt getElse() { result = this.getChildStmt(3) }
 
   override predicate mayHaveSideEffects() {
     this.getInit().mayHaveSideEffects() or
-    this.getCond().mayHaveSideEffects() or
+    this.getCondition().mayHaveSideEffects() or
     this.getThen().mayHaveSideEffects() or
     this.getElse().mayHaveSideEffects()
   }
@@ -829,6 +832,12 @@ class SwitchStmt extends @switchstmt, Stmt, ScopeNode {
   /** Gets the init statement of this `switch` statement, if any. */
   Stmt getInit() { result = this.getChildStmt(0) }
 
+  /**
+   * Gets the expression whose value or type is examined by this `switch`
+   * statement, if any.
+   */
+  Expr getExpr() { none() }
+
   /** Gets the body of this `switch` statement. */
   BlockStmt getBody() { result = this.getChildStmt(2) }
 
@@ -877,8 +886,7 @@ class SwitchStmt extends @switchstmt, Stmt, ScopeNode {
  * ```
  */
 class ExpressionSwitchStmt extends @exprswitchstmt, SwitchStmt {
-  /** Gets the switch expression of this `switch` statement. */
-  Expr getExpr() { result = this.getChildExpr(1) }
+  override Expr getExpr() { result = this.getChildExpr(1) }
 
   override predicate mayHaveSideEffects() {
     this.getInit().mayHaveSideEffects() or
@@ -909,14 +917,14 @@ class ExpressionSwitchStmt extends @exprswitchstmt, SwitchStmt {
  * ```
  */
 class TypeSwitchStmt extends @typeswitchstmt, SwitchStmt {
-  /** Gets the assign statement of this type-switch statement. */
+  /** Gets the assignment statement of this type-switch statement, if any. */
   SimpleAssignStmt getAssign() { result = this.getChildStmt(1) }
 
   /** Gets the test statement of this type-switch statement. This is a `SimpleAssignStmt` or `ExprStmt`. */
   Stmt getTest() { result = this.getChildStmt(1) }
 
   /** Gets the expression whose type is examined by this `switch` statement. */
-  Expr getExpr() {
+  override Expr getExpr() {
     result = this.getAssign().getRhs() or result = this.getChildStmt(1).(ExprStmt).getExpr()
   }
 
@@ -1082,7 +1090,7 @@ class SelectStmt extends @selectstmt, Stmt {
  */
 class LoopStmt extends @loopstmt, Stmt, ScopeNode {
   /** Gets the body of this loop. */
-  BlockStmt getBody() { none() }
+  Stmt getBody() { none() }
 }
 
 /**
@@ -1148,11 +1156,14 @@ class ForStmt extends @forstmt, LoopStmt {
  * ```
  */
 class RangeStmt extends @rangestmt, LoopStmt {
+  /** Gets the synthesized node grouping the loop variables of this `range` statement. */
+  RangeElementExpr getPattern() { result = this.getChildExpr(0) }
+
   /** Gets the expression denoting the key of this `range` statement. */
-  Expr getKey() { result = this.getChildExpr(0) }
+  Expr getKey() { result = this.getPattern().getKey() }
 
   /** Get the expression denoting the value of this `range` statement. */
-  Expr getValue() { result = this.getChildExpr(1) }
+  Expr getValue() { result = this.getPattern().getValue() }
 
   /** Gets the domain of this `range` statement. */
   Expr getDomain() { result = this.getChildExpr(2) }
@@ -1165,3 +1176,31 @@ class RangeStmt extends @rangestmt, LoopStmt {
 
   override string getAPrimaryQlClass() { result = "RangeStmt" }
 }
+
+/**
+ * A synthesized node grouping the loop variables (key and value) bound by a
+ * `range` statement.
+ *
+ * This node acts as the single target of the destructuring performed on each
+ * iteration of the loop, so that a `range` statement can be modeled with a
+ * single loop-variable node in the same way as a `foreach` loop in other
+ * languages. It is present for every `range` statement, even when no loop
+ * variables are bound (as in `for range x`).
+ */
+class RangeElementExpr extends @rangeelementexpr, Expr {
+  /** Gets the `range` statement that this node belongs to. */
+  RangeStmt getRangeStmt() { result = this.getParent() }
+
+  /** Gets the expression denoting the key of the `range` statement. */
+  Expr getKey() { result = this.getChildExpr(0) }
+
+  /** Gets the expression denoting the value of the `range` statement. */
+  Expr getValue() { result = this.getChildExpr(1) }
+
+  /** Gets the domain of the `range` statement. */
+  Expr getDomain() { result = this.getRangeStmt().getDomain() }
+
+  override string toString() { result = "range element" }
+
+  override string getAPrimaryQlClass() { result = "RangeElementExpr" }
+}
diff --git a/go/ql/lib/semmle/go/StringOps.qll b/go/ql/lib/semmle/go/StringOps.qll
index 6af2946f95c5..a00f8d90b48e 100644
--- a/go/ql/lib/semmle/go/StringOps.qll
+++ b/go/ql/lib/semmle/go/StringOps.qll
@@ -138,6 +138,18 @@ module StringOps {
       override boolean getPolarity() { result = expr.getPolarity() }
     }
 
+    bindingset[slice, substring]
+    pragma[inline_late]
+    private predicate hasPrefixSliceUpperBound(DataFlow::SliceNode slice, DataFlow::Node substring) {
+      exists(DataFlow::CallNode len |
+        len = Builtin::len().getACall() and
+        len.getArgument(0) = globalValueNumber(substring).getANode() and
+        slice.getHigh() = globalValueNumber(len).getANode()
+      )
+      or
+      substring.getStringValue().length() = slice.getHigh().getIntValue()
+    }
+
     /**
      * A comparison of the form `x[:len(y)] == y`.
      */
@@ -147,16 +159,9 @@ module StringOps {
 
       HasPrefix_Substring() {
         this.eq(_, slice, substring) and
-        slice.getLow().getIntValue() = 0 and
-        (
-          exists(DataFlow::CallNode len |
-            len = Builtin::len().getACall() and
-            len.getArgument(0) = globalValueNumber(substring).getANode() and
-            slice.getHigh() = globalValueNumber(len).getANode()
-          )
-          or
-          substring.getStringValue().length() = slice.getHigh().getIntValue()
-        )
+        // An omitted lower bound (`x[:len(y)]`) is implicitly `0`.
+        (not exists(slice.getLow()) or slice.getLow().getIntValue() = 0) and
+        hasPrefixSliceUpperBound(slice, substring)
       }
 
       override DataFlow::Node getBaseString() { result = slice.getBase() }
diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index 1ea5b5c65c1d..04e0f456276c 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -517,17 +517,23 @@ class StructType extends @structtype, CompositeType {
           .getOwnField(name, isEmbedded)
   }
 
+  // Materialize the embedded fields and their types before joining them with methods.
+  pragma[nomagic]
+  private Type getEmbeddedFieldType(Field embeddedParent, int depth) {
+    this.hasFieldCand(_, embeddedParent, depth, true) and
+    result = embeddedParent.getType()
+  }
+
   /**
    * Gets a method of `embeddedParent`, which is then embedded into this struct type.
    */
   Method getMethodOfEmbedded(Field embeddedParent, string name, int depth) {
-    // embeddedParent is a field of 'this' at depth 'depth - 1'
-    this.hasFieldCand(_, embeddedParent, depth - 1, true) and
     result.getName() = name and
-    (
-      result.getReceiverBaseType() = lookThroughPointerType(embeddedParent.getType())
+    // embeddedParent is a field of 'this' at depth 'depth - 1'
+    exists(Type embeddedType | embeddedType = this.getEmbeddedFieldType(embeddedParent, depth - 1) |
+      result.getReceiverBaseType() = lookThroughPointerType(embeddedType)
       or
-      methodhosts(result, embeddedParent.getType())
+      methodhosts(result, embeddedType)
     )
   }
 
diff --git a/go/ql/lib/semmle/go/controlflow/BasicBlocks.qll b/go/ql/lib/semmle/go/controlflow/BasicBlocks.qll
index 9bb92bb7d460..3ae911e931d0 100644
--- a/go/ql/lib/semmle/go/controlflow/BasicBlocks.qll
+++ b/go/ql/lib/semmle/go/controlflow/BasicBlocks.qll
@@ -6,65 +6,26 @@ module;
 
 import go
 private import ControlFlowGraphImpl
-private import codeql.controlflow.BasicBlock as BB
-private import codeql.controlflow.SuccessorType
 
-private module Input implements BB::InputSig<Location> {
-  /** A delineated part of the AST with its own CFG. */
-  class CfgScope = ControlFlow::Root;
+/** A basic block in the control-flow graph. */
+class BasicBlock = CfgImpl::Cfg::BasicBlock;
 
-  /** The class of control flow nodes. */
-  class Node = ControlFlowNode;
-
-  /** Gets the CFG scope in which this node occurs. */
-  CfgScope nodeGetCfgScope(Node node) { node.getRoot() = result }
-
-  /** Gets an immediate successor of this node. */
-  Node nodeGetASuccessor(Node node, SuccessorType t) {
-    result = node.getASuccessor() and
-    (
-      not result instanceof ControlFlow::ConditionGuardNode and t instanceof DirectSuccessor
-      or
-      t.(BooleanSuccessor).getValue() = result.(ControlFlow::ConditionGuardNode).getOutcome()
-    )
-  }
-
-  /**
-   * Holds if `node` represents an entry node to be used when calculating
-   * dominance.
-   */
-  predicate nodeIsDominanceEntry(Node node) { node instanceof EntryNode }
-
-  /**
-   * Holds if `node` represents an exit node to be used when calculating
-   * post dominance.
-   */
-  predicate nodeIsPostDominanceExit(Node node) { node instanceof ExitNode }
-}
-
-module Cfg = BB::Make<Location, Input>;
-
-class BasicBlock = Cfg::BasicBlock;
-
-class EntryBasicBlock = Cfg::EntryBasicBlock;
-
-cached
-private predicate reachableBB(BasicBlock bb) {
-  bb instanceof EntryBasicBlock
-  or
-  exists(BasicBlock predBB | predBB.getASuccessor(_) = bb | reachableBB(predBB))
-}
+/** An entry basic block. */
+class EntryBasicBlock = CfgImpl::Cfg::EntryBasicBlock;
 
 /**
  * A basic block that is reachable from an entry basic block.
+ *
+ * Since the shared CFG library only creates nodes for reachable code,
+ * all basic blocks are reachable by construction.
  */
 class ReachableBasicBlock extends BasicBlock {
-  ReachableBasicBlock() { reachableBB(this) }
+  ReachableBasicBlock() { any() }
 }
 
 /**
  * A reachable basic block with more than one predecessor.
  */
 class ReachableJoinBlock extends ReachableBasicBlock {
-  ReachableJoinBlock() { this.getFirstNode().isJoin() }
+  ReachableJoinBlock() { this.getFirstNode().(ControlFlow::Node).isJoin() }
 }
diff --git a/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll b/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll
index 77bb94d89f8c..80287d7c02b9 100644
--- a/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll
+++ b/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll
@@ -1,17 +1,22 @@
 /**
- * Provides classes for working with a CFG-based program representation.
+ * Provides the public API for working with Go's control-flow graph.
  */
 overlay[local]
 module;
 
 import go
 private import ControlFlowGraphImpl
+private import codeql.controlflow.SuccessorType
 
-/** Provides helper predicates for mapping btween CFG nodes and the AST. */
+/** Provides helper predicates for mapping between CFG nodes and the AST. */
 module ControlFlow {
   /** A file or function with which a CFG is associated. */
   class Root extends AstNode {
-    Root() { exists(this.(File).getADecl()) or exists(this.(FuncDef).getBody()) }
+    Root() {
+      exists(this.(FuncDef).getBody())
+      or
+      exists(this.(File).getADecl())
+    }
 
     /** Holds if `nd` belongs to this file or function. */
     predicate isRootOf(AstNode nd) {
@@ -29,22 +34,15 @@ module ControlFlow {
   }
 
   /**
-   * A node in the intra-procedural control-flow graph of a Go function or file.
+   * A node in the control-flow graph of a Go file or function.
    *
    * Nodes correspond to expressions and statements that compute a value or perform
    * an operation (as opposed to providing syntactic structure or type information).
    *
-   * There are also synthetic entry and exit nodes for each Go function and file
-   * that mark the beginning and the end, respectively, of the execution of the
-   * function and the loading of the file.
+   * There are also synthetic entry and exit nodes for each Go file or function
+   * that mark the beginning and the end, respectively, of its execution.
    */
-  class Node extends TControlFlowNode {
-    /** Gets a node that directly follows this one in the control-flow graph. */
-    Node getASuccessor() { result = CFG::succ(this) }
-
-    /** Gets a node that directly precedes this one in the control-flow graph. */
-    Node getAPredecessor() { this = result.getASuccessor() }
-
+  class Node extends CfgImpl::ControlFlowNode {
     /** Holds if this is a node with more than one successor. */
     predicate isBranch() { strictcount(this.getASuccessor()) > 1 }
 
@@ -52,22 +50,19 @@ module ControlFlow {
     predicate isJoin() { strictcount(this.getAPredecessor()) > 1 }
 
     /** Holds if this is the first control-flow node in `subtree`. */
-    predicate isFirstNodeOf(AstNode subtree) { CFG::firstNode(subtree, this) }
-
-    /** Holds if this node is the (unique) entry node of a function or file. */
-    predicate isEntryNode() { this instanceof MkEntryNode }
+    predicate isFirstNodeOf(AstNode subtree) { this.isBefore(subtree) }
 
-    /** Holds if this node is the (unique) exit node of a function or file. */
-    predicate isExitNode() { this instanceof MkExitNode }
+    /** Holds if this node is the unique entry node of a file or function. */
+    predicate isEntryNode() { this instanceof CfgImpl::ControlFlow::EntryNode }
 
-    /** Gets the basic block to which this node belongs. */
-    BasicBlock getBasicBlock() { result.getANode() = this }
+    /** Holds if this node is the unique exit node of a file or function. */
+    predicate isExitNode() { this instanceof CfgImpl::ControlFlow::ExitNode }
 
     /** Holds if this node dominates `dominee` in the control-flow graph. */
     overlay[caller?]
     pragma[inline]
     predicate dominatesNode(ControlFlow::Node dominee) {
-      exists(ReachableBasicBlock thisbb, ReachableBasicBlock dbb, int i, int j |
+      exists(CfgImpl::Cfg::BasicBlock thisbb, CfgImpl::Cfg::BasicBlock dbb, int i, int j |
         this = thisbb.getNode(i) and dominee = dbb.getNode(j)
       |
         thisbb.strictlyDominates(dbb)
@@ -76,19 +71,15 @@ module ControlFlow {
       )
     }
 
-    /** Gets the innermost function or file to which this node belongs. */
-    Root getRoot() { none() }
-
-    /** Gets the file to which this node belongs. */
-    File getFile() { result = this.getLocation().getFile() }
-
     /**
-     * Gets a textual representation of this control flow node.
+     * Gets the innermost function to which this node belongs, or the file if
+     * it is not inside a function.
      */
-    string toString() { result = "control-flow node" }
+    cached
+    Root getRoot() { result = this.getEnclosingCallable() }
 
-    /** Gets the source location for this element. */
-    Location getLocation() { none() }
+    /** Gets the file to which this node belongs. */
+    File getFile() { result = this.getLocation().getFile() }
 
     /**
      * DEPRECATED: Use `getLocation()` instead.
@@ -113,6 +104,26 @@ module ControlFlow {
     }
   }
 
+  /** A synthetic entry node for a function or a file. */
+  class EntryNode extends Node instanceof CfgImpl::ControlFlow::EntryNode { }
+
+  /** A synthetic exit node for a function or a file. */
+  class ExitNode extends Node instanceof CfgImpl::ControlFlow::ExitNode { }
+
+  private predicate isConditionGuardRoot(Expr expr) {
+    expr = any(LogicalBinaryExpr lbe).getLeftOperand()
+    or
+    expr = any(ForStmt fs).getCond()
+    or
+    expr = any(IfStmt is).getCondition()
+    or
+    isExpressionlessSwitchCaseCondition(expr)
+  }
+
+  private predicate isExpressionlessSwitchCaseCondition(Expr expr) {
+    expr = any(ExpressionSwitchStmt ess | not exists(ess.getExpr())).getACase().getAnExpr()
+  }
+
   /**
    * A control-flow node that initializes or updates the value of a constant, a variable,
    * a field, or an (array, slice, or map) element.
@@ -172,7 +183,7 @@ module ControlFlow {
       exists(IR::FieldTarget trg | trg = super.getLhs() |
         (
           trg.getBase() = base or
-          trg.getBase() = MkImplicitDeref(base.(IR::EvalInstruction).getExpr())
+          trg.getBase() = IR::implicitDerefInstruction(base.(IR::EvalInstruction).getExpr())
         ) and
         trg.getField() = f and
         super.getRhs() = rhs
@@ -220,7 +231,7 @@ module ControlFlow {
       exists(IR::ElementTarget trg | trg = super.getLhs() |
         (
           trg.getBase() = base or
-          trg.getBase() = MkImplicitDeref(base.(IR::EvalInstruction).getExpr())
+          trg.getBase() = IR::implicitDerefInstruction(base.(IR::EvalInstruction).getExpr())
         ) and
         trg.getIndex() = index and
         super.getRhs() = rhs
@@ -247,20 +258,33 @@ module ControlFlow {
   }
 
   /**
+   * DEPRECATED: Use `Guard` from `semmle.go.controlflow.Guards` instead.
+   *
    * A control-flow node recording the fact that a certain expression has a known
    * Boolean value at this point in the program.
    */
-  class ConditionGuardNode extends IR::Instruction, MkConditionGuardNode {
+  deprecated class ConditionGuardNode extends IR::Instruction {
     Expr cond;
     boolean outcome;
 
-    ConditionGuardNode() { this = MkConditionGuardNode(cond, outcome) }
+    ConditionGuardNode() {
+      isConditionGuardRoot(cond) and
+      this.isAfterTrue(cond) and
+      outcome = true
+      or
+      isConditionGuardRoot(cond) and
+      this.isAfterFalse(cond) and
+      outcome = false
+      or
+      isExpressionlessSwitchCaseCondition(cond) and
+      exists(MatchingSuccessor successor |
+        this.isAfterValue(cond, successor) and outcome = successor.getValue()
+      )
+    }
 
     private predicate ensuresAux(Expr expr, boolean b) {
       expr = cond and b = outcome
       or
-      expr = any(ParenExpr par | this.ensuresAux(par, b)).getExpr()
-      or
       expr = any(NotExpr ne | this.ensuresAux(ne, b.booleanNot())).getOperand()
       or
       expr = any(LandExpr land | this.ensuresAux(land, true)).getAnOperand() and
@@ -270,43 +294,69 @@ module ControlFlow {
       b = false
     }
 
-    /** Holds if this guard ensures that the result of `nd` is `b`. */
-    predicate ensures(DataFlow::Node nd, boolean b) {
+    /**
+     * DEPRECATED: Use `Guard.controls` from `semmle.go.controlflow.Guards`
+     * instead.
+     *
+     * Holds if this guard ensures that the result of `nd` is `b`.
+     */
+    deprecated predicate ensures(DataFlow::Node nd, boolean b) {
       this.ensuresAux(any(Expr e | nd = DataFlow::exprNode(e)), b)
     }
 
-    /** Holds if this guard ensures that `lesser <= greater + bias` holds. */
-    predicate ensuresLeq(DataFlow::Node lesser, DataFlow::Node greater, int bias) {
+    /**
+     * DEPRECATED: Use `guardEnsuresLeq` from `semmle.go.controlflow.Guards`
+     * instead.
+     *
+     * Holds if this guard ensures that `lesser <= greater + bias` holds.
+     */
+    deprecated predicate ensuresLeq(DataFlow::Node lesser, DataFlow::Node greater, int bias) {
       exists(DataFlow::RelationalComparisonNode rel, boolean b |
-        this.ensures(rel, b) and
+        this.ensuresAux(rel.asExpr(), b) and
         rel.leq(b, lesser, greater, bias)
       )
       or
-      this.ensuresEq(lesser, greater) and
+      exists(DataFlow::EqualityTestNode eq, boolean b |
+        this.ensuresAux(eq.asExpr(), b) and
+        eq.eq(b, lesser, greater)
+      ) and
       bias = 0
     }
 
-    /** Holds if this guard ensures that `i = j` holds. */
-    predicate ensuresEq(DataFlow::Node i, DataFlow::Node j) {
+    /**
+     * DEPRECATED: Use `guardEnsuresEq` from `semmle.go.controlflow.Guards`
+     * instead.
+     *
+     * Holds if this guard ensures that `i = j` holds.
+     */
+    deprecated predicate ensuresEq(DataFlow::Node i, DataFlow::Node j) {
       exists(DataFlow::EqualityTestNode eq, boolean b |
-        this.ensures(eq, b) and
+        this.ensuresAux(eq.asExpr(), b) and
         eq.eq(b, i, j)
       )
     }
 
-    /** Holds if this guard ensures that `i != j` holds. */
-    predicate ensuresNeq(DataFlow::Node i, DataFlow::Node j) {
+    /**
+     * DEPRECATED: Use `guardEnsuresNeq` from `semmle.go.controlflow.Guards`
+     * instead.
+     *
+     * Holds if this guard ensures that `i != j` holds.
+     */
+    deprecated predicate ensuresNeq(DataFlow::Node i, DataFlow::Node j) {
       exists(DataFlow::EqualityTestNode eq, boolean b |
-        this.ensures(eq, b.booleanNot()) and
+        this.ensuresAux(eq.asExpr(), b.booleanNot()) and
         eq.eq(b, i, j)
       )
     }
 
     /**
+     * DEPRECATED: Use `Guard.controls` from `semmle.go.controlflow.Guards`
+     * instead.
+     *
      * Holds if this guard dominates basic block `bb`, that is, the guard
      * is known to hold at `bb`.
      */
-    predicate dominates(ReachableBasicBlock bb) {
+    deprecated predicate dominates(ReachableBasicBlock bb) {
       this = bb.getANode() or
       this.dominates(bb.getImmediateDominator())
     }
@@ -318,23 +368,17 @@ module ControlFlow {
 
     /** Gets the value of the condition that this node corresponds to. */
     boolean getOutcome() { result = outcome }
-
-    override Root getRoot() { result.isRootOf(cond) }
-
-    override string toString() { result = cond + " is " + outcome }
-
-    override Location getLocation() { result = cond.getLocation() }
   }
 
   /**
-   * Gets the entry node of function or file `root`.
+   * Gets the entry node of file or function `root`.
    */
-  Node entryNode(Root root) { result = MkEntryNode(root) }
+  EntryNode entryNode(Root root) { result.getEnclosingCallable() = root }
 
   /**
-   * Gets the exit node of function or file `root`.
+   * Gets the exit node of file or function `root`.
    */
-  Node exitNode(Root root) { result = MkExitNode(root) }
+  ExitNode exitNode(Root root) { result.getEnclosingCallable() = root }
 
   /**
    * Holds if the function `f` may return without panicking, exiting the process, or looping forever.
@@ -342,20 +386,40 @@ module ControlFlow {
    * This is defined conservatively, and so may also hold of a function that in fact
    * cannot return normally, but never fails to hold of a function that can return normally.
    */
-  predicate mayReturnNormally(FuncDecl f) { CFG::mayReturnNormally(f.getBody()) }
+  predicate mayReturnNormally(FuncDecl f) {
+    exists(CfgImpl::ControlFlow::NormalExitNode exit |
+      exit.getEnclosingCallable() = f and
+      exists(exit.getAPredecessor())
+    )
+  }
 
   /**
-   * Holds if `pred` is the node for the case `testExpr` in an expression
-   * switch statement which is switching on `switchExpr`, and `succ` is the
-   * node to be executed next if the case test succeeds.
+   * Holds if `pred` is the node reached when a case of the expression switch
+   * statement switching on `switchExpr` matches, `testExpr` is one of that
+   * case's test expressions, and `succ` is the node to be executed next when
+   * the case matches.
+   *
+   * In the control-flow graph the individual case test expressions of a case
+   * clause all funnel into a single "matched" node for the clause, from which
+   * control transfers to the case body. Hence `pred` is that shared matched
+   * node, and the same `(pred, succ)` pair is reported once per test
+   * expression `testExpr` of the clause.
    */
   predicate isSwitchCaseTestPassingEdge(
     ControlFlow::Node pred, ControlFlow::Node succ, Expr switchExpr, Expr testExpr
   ) {
-    CFG::isSwitchCaseTestPassingEdge(pred, succ, switchExpr, testExpr)
+    exists(ExpressionSwitchStmt ess, CaseClause cc, int i |
+      ess.getExpr() = switchExpr and
+      cc = ess.getACase() and
+      testExpr = cc.getExpr(i) and
+      pred.isAfter(cc) and
+      succ.isFirstNodeOf(cc.getStmt(0))
+    )
   }
 }
 
 class ControlFlowNode = ControlFlow::Node;
 
+class CfgScope = CfgImpl::CfgScope;
+
 class Write = ControlFlow::WriteNode;
diff --git a/go/ql/lib/semmle/go/controlflow/ControlFlowGraphImpl.qll b/go/ql/lib/semmle/go/controlflow/ControlFlowGraphImpl.qll
index a26ab3adaf5f..9d73c09a2a75 100644
--- a/go/ql/lib/semmle/go/controlflow/ControlFlowGraphImpl.qll
+++ b/go/ql/lib/semmle/go/controlflow/ControlFlowGraphImpl.qll
@@ -1,2133 +1,1731 @@
 /**
- * INTERNAL: Analyses should use module `ControlFlowGraph` instead.
- *
- * Provides predicates for building intra-procedural CFGs.
+ * Provides the shared CFG library instantiation for Go.
  */
 overlay[local]
 module;
 
-import go
+private import codeql.controlflow.ControlFlowGraph as CfgLib
+private import codeql.controlflow.SuccessorType
+private import codeql.util.Void
 
-/** A block statement that is not the body of a `switch` or `select` statement. */
-class PlainBlock extends BlockStmt {
-  PlainBlock() {
-    not this = any(SwitchStmt sw).getBody() and not this = any(SelectStmt sel).getBody()
-  }
-}
-
-private predicate notBlankIdent(Expr e) { not e instanceof BlankIdent }
-
-private predicate pureLvalue(ReferenceExpr e) { not e.isRvalue() }
-
-/**
- * Holds if `e` is a branch condition, including the LHS of a short-circuiting binary operator.
- */
-private predicate isCondRoot(Expr e) {
-  e = any(LogicalBinaryExpr lbe).getLeftOperand()
-  or
-  e = any(ForStmt fs).getCond()
-  or
-  e = any(IfStmt is).getCond()
-  or
-  e = any(ExpressionSwitchStmt ess | not exists(ess.getExpr())).getACase().getAnExpr()
-}
-
-/**
- * Holds if `e` is a branch condition or part of a logical binary expression contributing to a
- * branch condition.
- *
- * For example, in `v := (x && y) || (z && w)`, `x` and `(x && y)` and `z` are branch conditions
- * (`isCondRoot` holds of them), whereas this predicate also holds of `y` (contributes to condition
- * `x && y`) but not of `w` (contributes to the value `v`, but not to any branch condition).
- *
- * In the context `if (x && y) || (z && w)` then the whole `(x && y) || (z && w)` is a branch condition
- * as well as `x` and `(x && y)` and `z` as previously, and this predicate holds of all their
- * subexpressions.
- */
-private predicate isCond(Expr e) {
-  isCondRoot(e) or
-  e = any(LogicalBinaryExpr lbe | isCond(lbe)).getRightOperand() or
-  e = any(ParenExpr par | isCond(par)).getExpr()
-}
-
-/**
- * Holds if `e` implicitly reads the embedded field `implicitField`.
- *
- * The `index` is the distance from the promoted field. For example, if `A` contains an embedded
- * field `B`, `B` contains an embedded field `C` and `C` contains the non-embedded field `x`.
- * Then `a.x` implicitly reads `C` with index 1 and `B` with index 2.
- */
-private predicate implicitFieldSelectionForField(PromotedSelector e, int index, Field implicitField) {
-  exists(StructType baseType, PromotedField child, int implicitFieldDepth |
-    baseType = e.getSelectedStructType() and
-    (
-      e.refersTo(child)
-      or
-      implicitFieldSelectionForField(e, implicitFieldDepth + 1, child)
-    )
-  |
-    child = baseType.getFieldOfEmbedded(implicitField, _, implicitFieldDepth + 1, _) and
-    exists(PromotedField explicitField, int explicitFieldDepth |
-      e.refersTo(explicitField) and baseType.getFieldAtDepth(_, explicitFieldDepth) = explicitField
-    |
-      index = explicitFieldDepth - implicitFieldDepth
-    )
-  )
-}
-
-private predicate implicitFieldSelectionForMethod(PromotedSelector e, int index, Field implicitField) {
-  exists(StructType baseType, PromotedMethod method, int mDepth, int implicitFieldDepth |
-    baseType = e.getSelectedStructType() and
-    e.refersTo(method) and
-    baseType.getMethodAtDepth(_, mDepth) = method and
-    index = mDepth - implicitFieldDepth
-  |
-    method = baseType.getMethodOfEmbedded(implicitField, _, implicitFieldDepth + 1)
-    or
-    exists(PromotedField child |
-      child = baseType.getFieldOfEmbedded(implicitField, _, implicitFieldDepth + 1, _) and
-      implicitFieldSelectionForMethod(e, implicitFieldDepth + 1, child)
-    )
-  )
-}
-
-/**
- * A node in the intra-procedural control-flow graph of a Go function or file.
- *
- * There are two kinds of control-flow nodes:
- *
- *   1. Instructions: these are nodes that correspond to expressions and statements
- *      that compute a value or perform an operation (as opposed to providing syntactic
- *      structure or type information).
- *   2. Synthetic nodes:
- *      - Entry and exit nodes for each Go function and file that mark the beginning and the end,
- *        respectively, of the execution of the function and the loading of the file;
- *      - Skip nodes that are semantic no-ops, but make CFG construction easier.
- */
-cached
-newtype TControlFlowNode =
-  /**
-   * A control-flow node that represents the evaluation of an expression.
-   */
-  MkExprNode(Expr e) { CFG::hasEvaluationNode(e) } or
-  /**
-   * A control-flow node that represents the initialization of an element of a composite literal.
-   */
-  MkLiteralElementInitNode(Expr e) { e = any(CompositeLit lit).getAnElement() } or
-  /**
-   * A control-flow node that represents the implicit index of an element in a slice or array literal.
-   */
-  MkImplicitLiteralElementIndex(Expr e) {
-    exists(CompositeLit lit | not lit instanceof StructLit |
-      e = lit.getAnElement() and
-      not e instanceof KeyValueExpr
-    )
-  } or
-  /**
-   * A control-flow node that represents a (single) assignment.
-   *
-   * Assignments with multiple left-hand sides are split up into multiple assignment nodes,
-   * one for each left-hand side. Assignments to `_` are not represented in the control-flow graph.
-   */
-  MkAssignNode(AstNode assgn, int i) {
-    // the `i`th assignment in a (possibly multi-)assignment
-    notBlankIdent(assgn.(Assignment).getLhs(i))
-    or
-    // the `i`th name declared in a (possibly multi-)declaration specifier
-    notBlankIdent(assgn.(ValueSpec).getNameExpr(i))
-    or
-    // the assignment to the "key" variable in a `range` statement
-    notBlankIdent(assgn.(RangeStmt).getKey()) and i = 0
-    or
-    // the assignment to the "value" variable in a `range` statement
-    notBlankIdent(assgn.(RangeStmt).getValue()) and i = 1
-  } or
-  /**
-   * A control-flow node that represents the implicit right-hand side of a compound assignment.
-   *
-   * For example, the compound assignment `x += 1` has an implicit right-hand side `x + 1`.
-   */
-  MkCompoundAssignRhsNode(CompoundAssignStmt assgn) or
-  /**
-   * A control-flow node that represents the `i`th component of a tuple expression `s`.
-   */
-  MkExtractNode(AstNode s, int i) {
-    // in an assignment `x, y, z = tuple`
-    exists(Assignment assgn |
-      s = assgn and
-      exists(assgn.getRhs()) and
-      assgn.getNumLhs() > 1 and
-      exists(assgn.getLhs(i))
-    )
-    or
-    // in a declaration `var x, y, z = tuple`
-    exists(ValueSpec spec |
-      s = spec and
-      exists(spec.getInit()) and
-      spec.getNumName() > 1 and
-      exists(spec.getNameExpr(i))
-    )
-    or
-    // in a `range` statement
-    exists(RangeStmt rs | s = rs |
-      exists(rs.getKey()) and i = 0
-      or
-      exists(rs.getValue()) and i = 1
-    )
-    or
-    // in a return statement `return f()` where `f` has multiple return values
-    exists(ReturnStmt ret, SignatureType rettp |
-      s = ret and
-      // the return statement has a single expression
-      exists(ret.getExpr()) and
-      // but the enclosing function has multiple results
-      rettp = ret.getEnclosingFunction().getType() and
-      rettp.getNumResult() > 1 and
-      exists(rettp.getResultType(i))
-    )
-    or
-    // in a call `f(g())` where `g` has multiple return values
-    exists(CallExpr outer, CallExpr inner | s = outer |
-      inner = outer.getArgument(0).stripParens() and
-      outer.getNumArgument() = 1 and
-      exists(inner.getType().(TupleType).getComponentType(i))
-    )
-  } or
-  /**
-   * A control-flow node that represents the zero value to which a variable without an initializer
-   * expression is initialized.
-   */
-  MkZeroInitNode(ValueEntity v) {
-    exists(ValueSpec spec |
-      not exists(spec.getAnInit()) and
-      spec.getNameExpr(_) = v.getDeclaration()
-    )
-    or
-    exists(v.(ResultVariable).getFunction().getBody())
-  } or
-  /**
-   * A control-flow node that represents a function declaration.
-   */
-  MkFuncDeclNode(FuncDecl fd) or
-  /**
-   * A control-flow node that represents a `defer` statement.
-   */
-  MkDeferNode(DeferStmt def) or
-  /**
-   * A control-flow node that represents a `go` statement.
-   */
-  MkGoNode(GoStmt go) or
-  /**
-   * A control-flow node that represents the fact that `e` is known to evaluate to
-   * `outcome`.
-   */
-  MkConditionGuardNode(Expr e, Boolean outcome) { isCondRoot(e) } or
-  /**
-   * A control-flow node that represents an increment or decrement statement.
-   */
-  MkIncDecNode(IncDecStmt ids) or
-  /**
-   * A control-flow node that represents the implicit right-hand side of an increment or decrement statement.
-   */
-  MkIncDecRhs(IncDecStmt ids) or
-  /**
-   * A control-flow node that represents the implicit operand 1 of an increment or decrement statement.
-   */
-  MkImplicitOne(IncDecStmt ids) or
-  /**
-   * A control-flow node that represents a return from a function.
-   */
-  MkReturnNode(ReturnStmt ret) or
-  /**
-   * A control-flow node that represents the implicit write to a named result variable in a return statement.
-   */
-  MkResultWriteNode(ResultVariable var, int i, ReturnStmt ret) {
-    ret.getEnclosingFunction().getResultVar(i) = var and
-    exists(ret.getAnExpr())
-  } or
-  /**
-   * A control-flow node that represents the implicit read of a named result variable upon returning from
-   * a function (after any deferred calls have been executed).
-   */
-  MkResultReadNode(ResultVariable var) or
-  /**
-   * A control-flow node that represents a no-op.
-   *
-   * These control-flow nodes correspond to Go statements that have no runtime semantics other than potentially
-   * influencing control flow: the branching statements `continue`, `break`, `fallthrough` and `goto`; empty
-   * blocks; empty statements; and import and type declarations.
-   */
-  MkSkipNode(AstNode skip) {
-    skip instanceof BranchStmt
-    or
-    skip instanceof EmptyStmt
-    or
-    skip.(PlainBlock).getNumStmt() = 0
-    or
-    skip instanceof ImportDecl
-    or
-    skip instanceof TypeDecl
-    or
-    pureLvalue(skip)
-    or
-    skip.(CaseClause).getNumStmt() = 0
-    or
-    skip.(CommClause).getNumStmt() = 0
-  } or
-  /**
-   * A control-flow node that represents a `select` operation.
-   */
-  MkSelectNode(SelectStmt sel) or
-  /**
-   * A control-flow node that represents a `send` operation.
-   */
-  MkSendNode(SendStmt send) or
-  /**
-   * A control-flow node that represents the initialization of a parameter to its corresponding argument.
-   */
-  MkParameterInit(Parameter parm) { exists(parm.getFunction().getBody()) } or
-  /**
-   * A control-flow node that represents the argument corresponding to a parameter.
-   */
-  MkArgumentNode(Parameter parm) { exists(parm.getFunction().getBody()) } or
-  /**
-   * A control-flow node that represents the initialization of a result variable to its zero value.
-   */
-  MkResultInit(ResultVariable rv) { exists(rv.getFunction().getBody()) } or
-  /**
-   * A control-flow node that represents the operation of retrieving the next (key, value) pair in a
-   * `range` statement, if any.
-   */
-  MkNextNode(RangeStmt rs) or
-  /**
-   * A control-flow node that represents the implicit `true` expression in `switch { ... }`.
-   */
-  MkImplicitTrue(ExpressionSwitchStmt stmt) { not exists(stmt.getExpr()) } or
-  /**
-   * A control-flow node that represents the implicit comparison or type check performed by
-   * the `i`th expression of a case clause `cc`.
-   */
-  MkCaseCheckNode(CaseClause cc, int i) { exists(cc.getExpr(i)) } or
-  /**
-   * A control-flow node that represents the implicit declaration of the
-   * variable `lv` in case clause `cc` and its assignment of the value
-   * `switchExpr` from the guard. This only occurs in case clauses in a type
-   * switch statement which declares a variable in its guard.
-   */
-  MkTypeSwitchImplicitVariable(CaseClause cc, LocalVariable lv, Expr switchExpr) {
-    exists(TypeSwitchStmt ts, DefineStmt ds | ds = ts.getAssign() |
-      cc = ts.getACase() and
-      lv = cc.getImplicitlyDeclaredVariable() and
-      switchExpr = ds.getRhs().(TypeAssertExpr).getExpr()
-    )
-  } or
-  /**
-   * A control-flow node that represents the implicit lower bound of a slice expression.
-   */
-  MkImplicitLowerSliceBound(SliceExpr sl) { not exists(sl.getLow()) } or
-  /**
-   * A control-flow node that represents the implicit upper bound of a simple slice expression.
-   */
-  MkImplicitUpperSliceBound(SliceExpr sl) { not exists(sl.getHigh()) } or
-  /**
-   * A control-flow node that represents the implicit max bound of a simple slice expression.
-   */
-  MkImplicitMaxSliceBound(SliceExpr sl) { not exists(sl.getMax()) } or
-  /**
-   * A control-flow node that represents the implicit dereference of the base in a field/method
-   * access, element access, or slice expression.
-   */
-  MkImplicitDeref(Expr e) {
-    e.getType().getUnderlyingType() instanceof PointerType and
-    (
-      exists(SelectorExpr sel | e = sel.getBase() |
-        // field accesses through a pointer always implicitly dereference
-        sel = any(Field f).getAReference()
-        or
-        // method accesses only dereference if the receiver is _not_ a pointer
-        exists(Method m, Type tp |
-          sel = m.getAReference() and
-          tp = m.getReceiver().getType().getUnderlyingType() and
-          not tp instanceof PointerType
-        )
-      )
-      or
-      e = any(IndexExpr ie).getBase()
-      or
-      e = any(SliceExpr se).getBase()
-    )
-  } or
-  /**
-   * A control-flow node that represents the implicit selection of a field when
-   * accessing a promoted field.
-   *
-   * If that field has a pointer type then this control-flow node also
-   * represents an implicit dereference of it.
-   */
-  MkImplicitFieldSelection(PromotedSelector e, int i, Field implicitField) {
-    implicitFieldSelectionForField(e, i, implicitField) or
-    implicitFieldSelectionForMethod(e, i, implicitField)
-  } or
-  /**
-   * A control-flow node that represents the start of the execution of a function or file.
-   */
-  MkEntryNode(ControlFlow::Root root) or
-  /**
-   * A control-flow node that represents the end of the execution of a function or file.
-   */
-  MkExitNode(ControlFlow::Root root)
+/** Contains the shared CFG library instantiation for Go. */
+module CfgImpl {
+  private import go as Go
 
-/** A representation of the target of a write. */
-newtype TWriteTarget =
-  /** A write target that is represented explicitly in the AST. */
-  MkLhs(TControlFlowNode write, Expr lhs) {
-    exists(AstNode assgn, int i | write = MkAssignNode(assgn, i) |
-      lhs = assgn.(Assignment).getLhs(i).stripParens()
-      or
-      lhs = assgn.(ValueSpec).getNameExpr(i)
-      or
-      exists(RangeStmt rs | rs = assgn |
-        i = 0 and lhs = rs.getKey().stripParens()
-        or
-        i = 1 and lhs = rs.getValue().stripParens()
-      )
-    )
-    or
-    exists(IncDecStmt ids | write = MkIncDecNode(ids) | lhs = ids.getOperand().stripParens())
-    or
-    exists(Parameter parm | write = MkParameterInit(parm) | lhs = parm.getDeclaration())
-    or
-    exists(ResultVariable res | write = MkResultInit(res) | lhs = res.getDeclaration())
-  } or
-  /** A write target for an element in a compound literal, viewed as a field write. */
-  MkLiteralElementTarget(MkLiteralElementInitNode elt) or
-  /** A write target for a returned expression, viewed as a write to the corresponding result variable. */
-  MkResultWriteTarget(MkResultWriteNode w)
-
-/**
- * A control-flow node that represents a no-op.
- *
- * These control-flow nodes correspond to Go statements that have no runtime semantics other than
- * potentially influencing control flow: the branching statements `continue`, `break`,
- * `fallthrough` and `goto`; empty blocks; empty statements; and import and type declarations.
- */
-class SkipNode extends ControlFlow::Node, MkSkipNode {
-  AstNode skip;
-
-  SkipNode() { this = MkSkipNode(skip) }
-
-  override ControlFlow::Root getRoot() { result.isRootOf(skip) }
-
-  override string toString() { result = "skip" }
-
-  override Location getLocation() { result = skip.getLocation() }
-}
+  private module Cfg0 = CfgLib::Make0<Go::Location, Ast>;
 
-/**
- * A control-flow node that represents the start of the execution of a function or file.
- */
-class EntryNode extends ControlFlow::Node, MkEntryNode {
-  ControlFlow::Root root;
-
-  EntryNode() { this = MkEntryNode(root) }
-
-  override ControlFlow::Root getRoot() { result = root }
-
-  override string toString() { result = "entry" }
+  private module Cfg1 = Cfg0::Make1<Input1>;
 
-  override Location getLocation() { result = root.getLocation() }
-}
-
-/**
- * A control-flow node that represents the end of the execution of a function or file.
- */
-class ExitNode extends ControlFlow::Node, MkExitNode {
-  ControlFlow::Root root;
+  private module EarlyCfg2 = Cfg1::Make2<EarlyInput2>;
 
-  ExitNode() { this = MkExitNode(root) }
+  private module Cfg2 = Cfg1::Make2<FinalInput2>;
 
-  override ControlFlow::Root getRoot() { result = root }
+  private import Cfg0
+  private import Cfg1
+  private import Cfg2
+  import Public
 
-  override string toString() { result = "exit" }
+  class CfgScope = Ast::Callable;
 
-  override Location getLocation() { result = root.getLocation() }
-}
-
-/**
- * Provides classes and predicates for computing the control-flow graph.
- */
-cached
-module CFG {
-  /**
-   * The target of a branch statement, which is either the label of a labeled statement or
-   * the special target `""` referring to the innermost enclosing loop or `switch`.
-   */
-  private class BranchTarget extends string {
-    BranchTarget() { this = any(LabeledStmt ls).getLabel() or this = "" }
-  }
-
-  private module BranchTarget {
-    /** Holds if this is the target of branch statement `stmt` or the label of compound statement `stmt`. */
-    BranchTarget of(Stmt stmt) {
-      exists(BranchStmt bs | bs = stmt |
-        result = bs.getLabel()
-        or
-        not exists(bs.getLabel()) and result = ""
-      )
-      or
-      exists(LabeledStmt ls | stmt = ls.getStmt() | result = ls.getLabel())
-      or
-      (stmt instanceof LoopStmt or stmt instanceof SwitchStmt or stmt instanceof SelectStmt) and
-      result = ""
-    }
-  }
-
-  private newtype TCompletion =
-    /** A completion indicating that an expression or statement was evaluated successfully. */
-    Done() or
-    /**
-     * A completion indicating that an expression was successfully evaluated to Boolean value `b`.
-     *
-     * Note that many Boolean expressions are modeled as having completion `Done()` instead.
-     * Completion `Bool` is only used in contexts where the Boolean value can be determined.
-     */
-    Bool(boolean b) { b = true or b = false } or
-    /**
-     * A completion indicating that execution of a (compound) statement ended with a `break`
-     * statement targeting the given label.
-     */
-    Break(BranchTarget lbl) or
-    /**
-     * A completion indicating that execution of a (compound) statement ended with a `continue`
-     * statement targeting the given label.
-     */
-    Continue(BranchTarget lbl) or
-    /**
-     * A completion indicating that execution of a (compound) statement ended with a `fallthrough`
-     * statement.
-     */
-    Fallthrough() or
-    /**
-     * A completion indicating that execution of a (compound) statement ended with a `return`
-     * statement.
-     */
-    Return() or
-    /**
-     * A completion indicating that execution of a statement or expression may have ended with
-     * a panic being raised.
-     */
-    Panic()
-
-  private Completion normalCompletion() { result.isNormal() }
-
-  private class Completion extends TCompletion {
-    predicate isNormal() { this = Done() or this = Bool(_) }
-
-    Boolean getOutcome() { this = Done() or this = Bool(result) }
-
-    string toString() {
-      this = Done() and result = "normal"
-      or
-      exists(boolean b | this = Bool(b) | result = b.toString())
-      or
-      exists(BranchTarget lbl |
-        this = Break(lbl) and result = "break " + lbl
-        or
-        this = Continue(lbl) and result = "continue " + lbl
-      )
-      or
-      this = Fallthrough() and result = "fallthrough"
-      or
-      this = Return() and result = "return"
-      or
-      this = Panic() and result = "panic"
-    }
-  }
-
-  /**
-   * Holds if `e` should have an evaluation node in the control-flow graph.
-   *
-   * Excluded expressions include those not evaluated at runtime (e.g. identifiers, type expressions)
-   * and some logical expressions that are expressed as control-flow edges rather than having a specific
-   * evaluation node.
-   */
-  cached
-  predicate hasEvaluationNode(Expr e) {
-    // exclude expressions that do not denote a value
-    not e instanceof TypeExpr and
-    not e = any(FieldDecl f).getTag() and
-    not e instanceof KeyValueExpr and
-    not e = any(SelectorExpr sel).getSelector() and
-    not e = any(StructLit sl).getKey(_) and
-    not (e instanceof Ident and not e instanceof ReferenceExpr) and
-    not (e instanceof SelectorExpr and not e instanceof ReferenceExpr) and
-    not pureLvalue(e) and
-    // exclude parentheses, which are purely concrete syntax, and some logical binary expressions
-    // whose evaluation is implied by control-flow edges without requiring an evaluation node.
-    not isControlFlowStructural(e) and
-    // exclude expressions that are not evaluated at runtime
-    not e = any(ImportSpec is).getPathExpr() and
-    not e.getParent*() = any(ArrayTypeExpr ate).getLength() and
-    // sub-expressions of constant expressions are not evaluated (even if they don't look constant
-    // themselves)
-    not constRoot(e.getParent+())
+  /** Holds if `e` has an implicit field selection at `index` for `implicitField`. */
+  predicate implicitFieldSelection(Go::AstNode e, int index, Go::Field implicitField) {
+    Input1::implicitFieldSelection(e, index, implicitField)
   }
 
   /**
-   * Holds if `e` is an expression that purely serves grouping or control-flow purposes.
-   *
-   * Examples include parenthesized expressions and short-circuiting Boolean expressions used within
-   * a branch condition (`if` or `for` condition, or as part of a larger boolean expression, e.g.
-   * in `(x && y) || z`, the `&&` subexpression matches this predicate).
+   * Holds if `root` is a constant root: a constant expression (with any
+   * enclosing parentheses stripped) whose parent expression is not itself
+   * constant. The strict sub-expressions of a constant root are folded at
+   * compile time and are not evaluated at run time, so they get no evaluation
+   * node; the constant root itself is evaluated as a single leaf value.
    */
-  private predicate isControlFlowStructural(Expr e) {
-    // Some logical binary operators do not need an evaluation node
-    // (for example, in `if x && y`, we evaluate `x` and then branch straight to either `y` or the
-    //  `else` block, so there is no control-flow step where `x && y` is specifically calculated)
-    e instanceof LogicalBinaryExpr and
-    isCond(e)
-    or
-    // Purely concrete-syntactic structural expression:
-    e instanceof ParenExpr
-  }
-
-  /**
-   * Gets a constant root, that is, an expression that is constant but whose parent expression is not.
-   *
-   * As an exception to the latter, for a control-flow structural expression such as `(c1)` or `c1 && c2`
-   * where `cn` are constants we still consider the `cn`s to be a constant roots, even though their parent
-   * expression is also constant.
-   */
-  private predicate constRoot(Expr root) {
-    exists(Expr c |
+  private predicate constantRoot(Go::Expr root) {
+    exists(Go::Expr c |
       c.isConst() and
-      not c.getParent().(Expr).isConst() and
-      root = stripStructural(c)
+      not c.getParent().(Go::Expr).isConst() and
+      root = c.stripParens()
     )
   }
 
-  /**
-   * Strips off any control-flow structural components from `e`.
-   */
-  private Expr stripStructural(Expr e) {
-    if isControlFlowStructural(e) then result = stripStructural(e.getAChildExpr()) else result = e
+  private predicate insideConstantRoot(Go::AstNode node) {
+    constantRoot(node.getParent())
+    or
+    insideConstantRoot(node.getParent())
   }
 
-  private class ControlFlowTree extends AstNode {
-    predicate firstNode(ControlFlow::Node first) { none() }
+  private predicate inArrayLength(Go::AstNode node) {
+    node = any(Go::ArrayTypeExpr array).getLength()
+    or
+    inArrayLength(node.getParent())
+  }
 
-    predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      // propagate abnormal completion from children
-      lastNode(this.getAChild(), last, cmpl) and
-      not cmpl.isNormal()
-    }
+  /** Provides an implementation of the AST signature for Go. */
+  private module Ast implements CfgLib::AstSig<Go::Location> {
+    class AstNode = Go::AstNode;
 
     /**
-     * Holds if `succ` is a successor of `pred`, ignoring the execution of any
-     * deferred functions when a function ends.
+     * Holds if `e` is excluded from ordinary AST child traversal by `getChild`.
+     * This does not exclude `e` from the CFG entirely: specialized accessors and
+     * explicit control-flow steps can still use it, for example as a type-switch
+     * pattern or a select-receive assignment target.
      */
-    pragma[nomagic]
-    predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      exists(int i |
-        lastNode(this.getChildTreeRanked(i), pred, normalCompletion()) and
-        firstNode(this.getChildTreeRanked(i + 1), succ)
-      )
-    }
-
-    /** Holds if `succ` is a successor of `pred`. */
-    predicate succ(ControlFlow::Node pred, ControlFlow::Node succ) { this.succ0(pred, succ) }
-
-    final ControlFlowTree getChildTreeRanked(int i) {
-      exists(int j |
-        result = this.getChildTree(j) and
-        j = rank[i + 1](int k | exists(this.getChildTree(k)))
-      )
-    }
-
-    ControlFlowTree getFirstChildTree() { result = this.getChildTreeRanked(0) }
-
-    ControlFlowTree getLastChildTree() {
-      result = max(ControlFlowTree ch, int j | ch = this.getChildTree(j) | ch order by j)
-    }
-
-    ControlFlowTree getChildTree(int i) { none() }
-  }
-
-  private class AtomicTree extends ControlFlowTree {
-    ControlFlow::Node nd;
-    Completion cmpl;
-
-    AtomicTree() {
-      exists(Expr e |
-        e = this and
-        e.isConst() and
-        nd = mkExprOrSkipNode(this)
-      |
-        if e.isPlatformIndependentConstant() and exists(e.getBoolValue())
-        then cmpl = Bool(e.getBoolValue())
-        else cmpl = Done()
-      )
+    private predicate skipCfg(AstNode e) {
+      e instanceof Go::TypeExpr and not e instanceof Go::FuncTypeExpr
       or
-      this instanceof Ident and
-      not this.(Expr).isConst() and
-      nd = mkExprOrSkipNode(this) and
-      cmpl = Done()
+      e = any(Go::FieldDecl f).getTag()
       or
-      this instanceof BreakStmt and
-      nd = MkSkipNode(this) and
-      cmpl = Break(BranchTarget::of(this))
+      e instanceof Go::KeyValueExpr and not e = any(Go::CompositeLit lit).getAnElement()
       or
-      this instanceof ContinueStmt and
-      nd = MkSkipNode(this) and
-      cmpl = Continue(BranchTarget::of(this))
+      e = any(Go::SelectorExpr sel).getSelector()
       or
-      this instanceof Decl and
-      nd = MkSkipNode(this) and
-      cmpl = Done()
+      e = any(Go::StructLit sl).getKey(_)
       or
-      this instanceof EmptyStmt and
-      nd = MkSkipNode(this) and
-      cmpl = Done()
+      e instanceof Go::Ident and not e instanceof Go::ReferenceExpr
       or
-      this instanceof FallthroughStmt and
-      nd = MkSkipNode(this) and
-      cmpl = Fallthrough()
+      e instanceof Go::SelectorExpr and not e instanceof Go::ReferenceExpr
       or
-      this instanceof FuncLit and
-      nd = MkExprNode(this) and
-      cmpl = Done()
+      e instanceof Go::ReferenceExpr and
+      not e.(Go::ReferenceExpr).isRvalue() and
+      not e instanceof Go::SelectorExpr and
+      not e = any(Go::SelectorExpr sel).getBase() and
+      not e instanceof Go::IndexExpr and
+      not e = any(Go::IndexExpr idx).getBase() and
+      not e = any(Go::IndexExpr idx).getIndex()
       or
-      this instanceof PlainBlock and
-      nd = MkSkipNode(this) and
-      cmpl = Done()
+      e instanceof Go::CommentGroup
       or
-      this instanceof SelectorExpr and
-      not this.(SelectorExpr).getBase() instanceof ValueExpr and
-      nd = mkExprOrSkipNode(this) and
-      cmpl = Done()
+      e instanceof Go::Comment
       or
-      this instanceof GenericFunctionInstantiationExpr and
-      nd = MkExprNode(this) and
-      cmpl = Done()
-    }
-
-    override predicate firstNode(ControlFlow::Node first) { first = nd }
-
-    override predicate lastNode(ControlFlow::Node last, Completion c) { last = nd and c = cmpl }
-  }
-
-  abstract private class PostOrderTree extends ControlFlowTree {
-    abstract ControlFlow::Node getNode();
-
-    Completion getCompletion() { result = Done() }
-
-    override predicate firstNode(ControlFlow::Node first) {
-      firstNode(this.getFirstChildTree(), first)
+      e = any(Go::ImportSpec is).getPathExpr()
       or
-      not exists(this.getChildTree(_)) and
-      first = this.getNode()
-    }
-
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      super.lastNode(last, cmpl)
+      inArrayLength(e)
       or
-      last = this.getNode() and cmpl = this.getCompletion()
-    }
-
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      super.succ0(pred, succ)
+      // The shared switch model wires control flow directly from the switch to
+      // its case clauses (in control-flow order) and between cases, so the
+      // enclosing block must not introduce its own nodes or default
+      // left-to-right sequencing of the case clauses.
+      e = any(Go::SwitchStmt sw).getBody()
       or
-      lastNode(this.getLastChildTree(), pred, normalCompletion()) and
-      succ = this.getNode()
-    }
-  }
-
-  abstract private class PreOrderTree extends ControlFlowTree {
-    abstract ControlFlow::Node getNode();
-
-    override predicate firstNode(ControlFlow::Node first) { first = this.getNode() }
-
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      super.lastNode(last, cmpl)
-      or
-      lastNode(this.getLastChildTree(), last, cmpl)
+      // The test statement of a type switch (`y := x.(type)` or the bare
+      // `x.(type)` expression statement) is transparent: the shared switch
+      // model evaluates the underlying type-assertion expression directly as
+      // the switch expression (see `Switch.getExpr`), so the wrapping
+      // statement must not introduce its own assignment or expression nodes.
+      e = any(Go::TypeSwitchStmt ts).getTest()
       or
-      not exists(this.getChildTree(_)) and
-      last = this.getNode() and
-      cmpl = Done()
+      // The strict sub-expressions of a constant expression are not evaluated
+      // at run time, so they must not get their own evaluation nodes.
+      insideConstantRoot(e.(Go::Expr))
     }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      super.succ0(pred, succ)
-      or
-      pred = this.getNode() and
-      firstNode(this.getFirstChildTree(), succ)
-    }
-  }
-
-  private class WrapperTree extends ControlFlowTree {
-    WrapperTree() {
-      this instanceof ConstDecl or
-      this instanceof DeclStmt or
-      this instanceof ExprStmt or
-      this instanceof KeyValueExpr or
-      this instanceof LabeledStmt or
-      this instanceof ParenExpr or
-      this instanceof PlainBlock or
-      this instanceof VarDecl
+    AstNode getChild(AstNode n, int index) {
+      (
+        not n instanceof Go::FuncDef and
+        not n instanceof Go::ImportDecl and
+        not n instanceof Go::TypeDecl and
+        not skipCfg(n) and
+        result = n.getChild(index)
+        or
+        exists(Go::Assignment assgn, Go::Expr lhs |
+          n = assgn and lhs = assgn.getLhs(_) and lhs = n.getChild(index) and skipCfg(lhs)
+        |
+          result = lhs.(Go::StarExpr).getBase()
+          or
+          result = lhs.(Go::DerefExpr).getOperand()
+        )
+        or
+        // The body block of a switch (expression or type) is transparent (see
+        // `skipCfg`), so it is not itself a child and contributes no children.
+        // Expose the case clauses directly as children of the switch instead,
+        // so that the AST child chain stays connected for abrupt-completion
+        // propagation (e.g. a panicking call in a case body reaching the
+        // enclosing function's exceptional exit).
+        result = n.(Go::SwitchStmt).getBody().getChild(index)
+        or
+        // The type-switch test statement is transparent (see `skipCfg`), so
+        // expose the underlying type-assertion expression directly as a child
+        // of the type switch, keeping the AST child chain connected.
+        result = n.(Go::TypeSwitchStmt).getExpr() and index = 1
+      ) and
+      not skipCfg(result)
     }
 
-    override predicate firstNode(ControlFlow::Node first) {
-      firstNode(this.getFirstChildTree(), first)
+    class Callable extends AstNode {
+      Callable() {
+        exists(this.(Go::FuncDef).getBody())
+        or
+        exists(this.(Go::File).getADecl())
+      }
     }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      super.lastNode(last, cmpl)
-      or
-      lastNode(this.getLastChildTree(), last, cmpl)
+    AstNode callableGetBody(Callable c) {
+      result = c.(Go::FuncDef).getBody()
       or
-      exists(LoopStmt ls | this = ls.getBody() |
-        lastNode(this, last, Continue(BranchTarget::of(ls))) and
-        cmpl = Done()
-      )
+      result = c.(Go::File)
     }
 
-    override ControlFlowTree getChildTree(int i) {
-      i = 0 and result = this.(DeclStmt).getDecl()
-      or
-      i = 0 and result = this.(ExprStmt).getExpr()
-      or
-      result = this.(GenDecl).getSpec(i)
-      or
-      exists(KeyValueExpr kv | kv = this |
-        not kv.getLiteral() instanceof StructLit and
-        i = 0 and
-        result = kv.getKey()
-        or
-        i = 1 and result = kv.getValue()
-      )
-      or
-      i = 0 and result = this.(LabeledStmt).getStmt()
-      or
-      i = 0 and result = this.(ParenExpr).getExpr()
-      or
-      result = this.(PlainBlock).getStmt(i)
-    }
-  }
+    class Parameter extends AstNode {
+      Parameter() { this = any(Go::Parameter p).getDeclaration() }
 
-  private class AssignmentTree extends ControlFlowTree {
-    AssignmentTree() {
-      this instanceof Assignment or
-      this instanceof ValueSpec
-    }
+      AstNode getPattern() { result = this }
 
-    Expr getLhs(int i) {
-      result = this.(Assignment).getLhs(i) or
-      result = this.(ValueSpec).getNameExpr(i)
+      Expr getDefaultValue() { none() }
     }
 
-    int getNumLhs() {
-      result = this.(Assignment).getNumLhs() or
-      result = this.(ValueSpec).getNumName()
+    Parameter callableGetParameter(Callable c, int index) {
+      result = c.(Go::FuncDef).getParameter(index).getDeclaration()
     }
 
-    Expr getRhs(int i) {
-      result = this.(Assignment).getRhs(i) or
-      result = this.(ValueSpec).getInit(i)
+    cached
+    Callable getEnclosingCallable(AstNode node) {
+      result = node.getEnclosingFunction()
+      or
+      not exists(node.getEnclosingFunction()) and
+      result = node.getFile()
     }
 
-    int getNumRhs() {
-      result = this.(Assignment).getNumRhs() or
-      result = this.(ValueSpec).getNumInit()
-    }
+    class Stmt = Go::Stmt;
 
-    predicate isExtractingAssign() { this.getNumRhs() = 1 and this.getNumLhs() > 1 }
+    class LabeledStmt = Go::LabeledStmt;
 
-    override predicate firstNode(ControlFlow::Node first) {
-      not this instanceof RecvStmt and
-      firstNode(this.getLhs(0), first)
-    }
+    class Expr = Go::Expr;
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      ControlFlowTree.super.lastNode(last, cmpl)
-      or
-      (
-        last = max(int i | | this.epilogueNode(i) order by i)
-        or
-        not exists(this.epilogueNode(_)) and
-        lastNode(this.getLastSubExprInEvalOrder(), last, normalCompletion())
-      ) and
-      cmpl = Done()
-    }
+    class BlockStmt extends Go::BlockStmt {
+      BlockStmt() {
+        not this = any(Go::FuncDef fd).getBody() and
+        not this = any(Go::SwitchStmt sw).getBody() and
+        not this = any(Go::SelectStmt sel).getBody()
+      }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      ControlFlowTree.super.succ0(pred, succ)
-      or
-      exists(int i | lastNode(this.getLhs(i), pred, normalCompletion()) |
-        firstNode(this.getLhs(i + 1), succ)
-        or
-        not this instanceof RecvStmt and
-        i = this.getNumLhs() - 1 and
-        (
-          firstNode(this.getRhs(0), succ)
-          or
-          not exists(this.getRhs(_)) and
-          succ = this.epilogueNodeRanked(0)
-        )
-      )
-      or
-      exists(int i |
-        lastNode(this.getRhs(i), pred, normalCompletion()) and
-        firstNode(this.getRhs(i + 1), succ)
-      )
-      or
-      not this instanceof RecvStmt and
-      lastNode(this.getRhs(this.getNumRhs() - 1), pred, normalCompletion()) and
-      succ = this.epilogueNodeRanked(0)
-      or
-      exists(int i |
-        pred = this.epilogueNodeRanked(i) and
-        succ = this.epilogueNodeRanked(i + 1)
-      )
+      Stmt getLastStmt() {
+        exists(int last | result = this.getStmt(last) and not exists(this.getStmt(last + 1)))
+      }
     }
 
-    ControlFlow::Node epilogueNodeRanked(int i) {
-      exists(int j |
-        result = this.epilogueNode(j) and
-        j = rank[i + 1](int k | exists(this.epilogueNode(k)))
-      )
-    }
+    class ExprStmt extends Stmt instanceof Go::ExprStmt {
+      // The `x.(type)` test statement of a type switch is transparent (see
+      // `skipCfg`): the shared switch model evaluates the underlying
+      // type-assertion expression directly as the switch expression. It must
+      // therefore not be treated as an ordinary expression statement, whose
+      // value would otherwise be propagated from the expression to the
+      // statement (creating a spurious flow into the transparent wrapper).
+      ExprStmt() { not this = any(Go::TypeSwitchStmt ts).getTest() }
 
-    private Expr getSubExprInEvalOrder(int evalOrder) {
-      if evalOrder < this.getNumLhs()
-      then result = this.getLhs(evalOrder)
-      else result = this.getRhs(evalOrder - this.getNumLhs())
+      Expr getExpr() { result = Go::ExprStmt.super.getExpr() }
     }
 
-    private Expr getLastSubExprInEvalOrder() {
-      result = max(int i | | this.getSubExprInEvalOrder(i) order by i)
-    }
+    class IfStmt = Go::IfStmt;
 
-    private ControlFlow::Node epilogueNode(int i) {
-      i = -1 and
-      result = MkCompoundAssignRhsNode(this)
-      or
-      exists(int j |
-        result = MkExtractNode(this, j) and
-        i = 2 * j
-        or
-        result = MkZeroInitNode(any(ValueEntity v | this.getLhs(j) = v.getDeclaration())) and
-        i = 2 * j
-        or
-        result = MkAssignNode(this, j) and
-        i = 2 * j + 1
-      )
-    }
-  }
+    AstNode getIfInit(IfStmt ifstmt) { result = ifstmt.(Go::IfStmt).getInit() }
+
+    class LoopStmt = Go::LoopStmt;
 
-  private class BinaryExprTree extends PostOrderTree, BinaryExpr {
-    override ControlFlow::Node getNode() { result = MkExprNode(this) }
+    class WhileStmt extends LoopStmt {
+      WhileStmt() { none() }
 
-    private predicate equalityTestMayPanic() {
-      this instanceof EqualityTestExpr and
-      exists(Type t |
-        t = this.getAnOperand().getType().getUnderlyingType() and
-        (
-          t instanceof InterfaceType or // panic due to comparison of incomparable interface values
-          t instanceof StructType or // may contain an interface-typed field
-          t instanceof ArrayType // may be an array of interface values
-        )
-      )
+      Expr getCondition() { none() }
     }
 
-    override Completion getCompletion() {
-      result = PostOrderTree.super.getCompletion()
-      or
-      // runtime panic due to division by zero or comparison of incomparable interface values
-      (this instanceof DivExpr or this.equalityTestMayPanic()) and
-      not this.(Expr).isConst() and
-      result = Panic()
-    }
+    class DoStmt extends LoopStmt {
+      DoStmt() { none() }
 
-    override ControlFlowTree getChildTree(int i) {
-      i = 0 and result = this.getLeftOperand()
-      or
-      i = 1 and result = this.getRightOperand()
+      Expr getCondition() { none() }
     }
-  }
 
-  private class LogicalBinaryExprTree extends BinaryExprTree, LogicalBinaryExpr {
-    boolean shortCircuit;
+    class UntilStmt extends LoopStmt {
+      UntilStmt() { none() }
 
-    LogicalBinaryExprTree() {
-      this instanceof LandExpr and shortCircuit = false
-      or
-      this instanceof LorExpr and shortCircuit = true
+      Expr getCondition() { none() }
     }
 
-    private ControlFlow::Node getGuard(boolean outcome) {
-      result = MkConditionGuardNode(this.getLeftOperand(), outcome)
-    }
+    class ForStmt extends LoopStmt instanceof Go::ForStmt {
+      AstNode getInit(int index) { index = 0 and result = this.(Go::ForStmt).getInit() }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      lastNode(this.getAnOperand(), last, cmpl) and
-      not cmpl.isNormal()
-      or
-      if isCond(this)
-      then (
-        last = this.getGuard(shortCircuit) and
-        cmpl = Bool(shortCircuit)
-        or
-        lastNode(this.getRightOperand(), last, cmpl)
-      ) else (
-        last = MkExprNode(this) and
-        cmpl = Done()
-      )
-    }
+      Expr getCondition() { result = this.(Go::ForStmt).getCond() }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      exists(Completion lcmpl |
-        lastNode(this.getLeftOperand(), pred, lcmpl) and
-        succ = this.getGuard(lcmpl.getOutcome())
-      )
-      or
-      pred = this.getGuard(shortCircuit.booleanNot()) and
-      firstNode(this.getRightOperand(), succ)
-      or
-      not isCond(this) and
-      (
-        pred = this.getGuard(shortCircuit) and
-        succ = MkExprNode(this)
-        or
-        exists(Completion rcmpl |
-          lastNode(this.getRightOperand(), pred, rcmpl) and
-          rcmpl.isNormal() and
-          succ = MkExprNode(this)
-        )
-      )
+      AstNode getUpdate(int index) { index = 0 and result = this.(Go::ForStmt).getPost() }
     }
-  }
 
-  private class CallExprTree extends PostOrderTree, CallExpr {
-    private predicate isSpecial() {
-      this = any(DeferStmt defer).getCall() or
-      this = any(GoStmt go).getCall()
-    }
+    class ForEachStmt extends LoopStmt instanceof Go::RangeStmt {
+      Expr getVariable() { result = this.(Go::RangeStmt).getPattern() }
 
-    override ControlFlow::Node getNode() {
-      not this.isSpecial() and
-      result = MkExprNode(this)
+      Expr getCollection() { result = this.(Go::RangeStmt).getDomain() }
     }
 
-    override Completion getCompletion() {
-      (not exists(this.getTarget()) or this.getTarget().mayReturnNormally()) and
-      result = Done()
-      or
-      (not exists(this.getTarget()) or this.getTarget().mayPanic()) and
-      result = Panic()
-    }
+    class BreakStmt = Go::BreakStmt;
 
-    override ControlFlowTree getChildTree(int i) {
-      i = 0 and result = this.getCalleeExpr()
-      or
-      result = this.getArgument(i - 1) and
-      // calls to `make` and `new` can have type expressions as arguments
-      not result instanceof TypeExpr
-    }
+    class ContinueStmt = Go::ContinueStmt;
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      // interpose implicit argument destructuring nodes between last argument
-      // and call itself; this is for cases like `f(g())` where `g` has multiple
-      // results
-      exists(ControlFlow::Node mid | PostOrderTree.super.succ0(pred, mid) |
-        if mid = this.getNode() then succ = this.getEpilogueNode(0) else succ = mid
-      )
-      or
-      exists(int i |
-        pred = this.getEpilogueNode(i) and
-        succ = this.getEpilogueNode(i + 1)
-      )
-    }
+    class GotoStmt = Go::GotoStmt;
 
-    private ControlFlow::Node getEpilogueNode(int i) {
-      result = MkExtractNode(this, i)
-      or
-      i = max(int j | exists(MkExtractNode(this, j))) + 1 and
-      result = this.getNode()
-      or
-      not exists(MkExtractNode(this, _)) and
-      i = 0 and
-      result = this.getNode()
+    class ReturnStmt = Go::ReturnStmt;
+
+    class Throw extends AstNode {
+      Throw() { none() }
+
+      Expr getExpr() { none() }
     }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      PostOrderTree.super.lastNode(last, cmpl)
-      or
-      this.isSpecial() and
-      lastNode(this.getLastChildTree(), last, cmpl)
+    class TryStmt extends Stmt {
+      TryStmt() { none() }
+
+      AstNode getBody(int index) { none() }
+
+      CatchClause getCatch(int index) { none() }
+
+      Stmt getFinally() { none() }
     }
-  }
 
-  private class CaseClauseTree extends ControlFlowTree, CaseClause {
-    private ControlFlow::Node getExprStart(int i) {
-      firstNode(this.getExpr(i), result)
-      or
-      this.getExpr(i) instanceof TypeExpr and
-      result = MkCaseCheckNode(this, i)
+    class CatchClause extends AstNode {
+      CatchClause() { none() }
+
+      AstNode getPattern() { none() }
+
+      AstNode getVariable() { none() }
+
+      Expr getCondition() { none() }
+
+      Stmt getBody() { none() }
     }
 
-    ControlFlow::Node getExprEnd(int i, Boolean outcome) {
-      exists(Expr e | e = this.getExpr(i) |
-        result = MkConditionGuardNode(e, outcome)
-        or
-        not exists(MkConditionGuardNode(e, _)) and
-        result = MkCaseCheckNode(this, i)
-      )
+    class Switch extends AstNode instanceof Go::SwitchStmt {
+      Expr getExpr() { result = this.(Go::SwitchStmt).getExpr() }
+
+      Case getCase(int index) { result = this.(Go::SwitchStmt).getCase(index) }
+
+      Stmt getStmt(int index) {
+        // Go nests each case clause's body statements under the clause rather
+        // than in a flat list, so we expose a flattened view in which every
+        // case clause is immediately followed by its own body statements. This
+        // lets the shared library compute the body of a case as the statements
+        // between it and the next clause.
+        result =
+          rank[index + 1](Go::Stmt s, int caseIdx, int inner |
+            switchFlatItem(this, s, caseIdx, inner)
+          |
+            s order by caseIdx, inner
+          )
+      }
     }
 
-    private ControlFlow::Node getBodyStart() {
-      firstNode(this.getStmt(0), result) or result = MkSkipNode(this)
+    class Case extends AstNode {
+      Case() { this = any(Go::SwitchStmt sw).getACase() }
+
+      AstNode getPattern(int index) { result = this.(Go::CaseClause).getExpr(index) }
+
+      Expr getGuard() { none() }
+
+      AstNode getBody() { none() }
     }
 
-    override predicate firstNode(ControlFlow::Node first) {
-      first = this.getExprStart(0)
-      or
-      not exists(this.getAnExpr()) and
-      first = MkTypeSwitchImplicitVariable(this, _, _)
-      or
-      not exists(this.getAnExpr()) and
-      not exists(MkTypeSwitchImplicitVariable(this, _, _)) and
-      first = this.getBodyStart()
+    class DefaultCase extends Case {
+      DefaultCase() { not exists(this.(Go::CaseClause).getAnExpr()) }
     }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      ControlFlowTree.super.lastNode(last, cmpl)
-      or
-      // TODO: shouldn't be here
-      last = this.getExprEnd(this.getNumExpr() - 1, false) and
-      cmpl = Bool(false)
-      or
-      last = MkSkipNode(this) and
-      cmpl = Done()
-      or
-      lastNode(this.getStmt(this.getNumStmt() - 1), last, cmpl)
+    AstNode getSwitchInit(Switch switch) { result = switch.(Go::SwitchStmt).getInit() }
+
+    predicate fallsThrough(Case c) {
+      // Go has no implicit fall-through between case clauses; an explicit
+      // `fallthrough` statement is required.
+      c.(Go::CaseClause).getStmt(max(int i | exists(c.(Go::CaseClause).getStmt(i)))) instanceof
+        Go::FallthroughStmt
     }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      ControlFlowTree.super.succ0(pred, succ)
-      or
-      pred = MkTypeSwitchImplicitVariable(this, _, _) and
-      succ = this.getBodyStart()
+    /**
+     * Holds if `s` is the flattened body element at position (`caseIdx`,
+     * `inner`) of switch `sw`: either the `caseIdx`-th case clause itself (with
+     * `inner` = -1) or its `inner`-th body statement.
+     */
+    private predicate switchFlatItem(Go::SwitchStmt sw, Go::Stmt s, int caseIdx, int inner) {
+      s = sw.getCase(caseIdx) and inner = -1
       or
-      exists(int i |
-        lastNode(this.getExpr(i), pred, normalCompletion()) and
-        succ = MkCaseCheckNode(this, i)
-        or
-        // visit guard node if there is one
-        pred = MkCaseCheckNode(this, i) and
-        succ = this.getExprEnd(i, _) and
-        succ != pred // this avoids self-loops if there isn't a guard node
-        or
-        pred = this.getExprEnd(i, false) and
-        succ = this.getExprStart(i + 1)
-        or
-        this.isPassingEdge(i, pred, succ, _)
-      )
+      s = sw.getCase(caseIdx).getStmt(inner)
     }
 
-    predicate isPassingEdge(int i, ControlFlow::Node pred, ControlFlow::Node succ, Expr testExpr) {
-      pred = this.getExprEnd(i, true) and
-      testExpr = this.getExpr(i) and
-      (
-        succ = MkTypeSwitchImplicitVariable(this, _, _)
-        or
-        not exists(MkTypeSwitchImplicitVariable(this, _, _)) and
-        succ = this.getBodyStart()
-      )
-    }
+    class ConditionalExpr extends Expr {
+      ConditionalExpr() { none() }
 
-    override ControlFlowTree getChildTree(int i) { result = this.getStmt(i) }
-  }
+      Expr getCondition() { none() }
 
-  private class CommClauseTree extends ControlFlowTree, CommClause {
-    override predicate firstNode(ControlFlow::Node first) { firstNode(this.getComm(), first) }
+      Expr getThen() { none() }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      ControlFlowTree.super.lastNode(last, cmpl)
-      or
-      last = MkSkipNode(this) and
-      cmpl = Done()
-      or
-      lastNode(this.getStmt(this.getNumStmt() - 1), last, cmpl)
+      Expr getElse() { none() }
     }
 
-    override ControlFlowTree getChildTree(int i) { result = this.getStmt(i) }
-  }
+    class BinaryExpr = Go::BinaryExpr;
 
-  private class CompositeLiteralTree extends ControlFlowTree, CompositeLit {
-    private ControlFlow::Node getElementInit(int i) {
-      result = MkLiteralElementInitNode(this.getElement(i))
+    // Constant short-circuiting operators are folded at compile time and their
+    // operands are not evaluated at run time, so they are not treated as
+    // logical operators here (which would give their operands their own
+    // evaluation nodes via `getLeftOperand`/`getRightOperand`/`getOperand`,
+    // bypassing `skipCfg`). Instead they are handled as constant-root leaf
+    // value nodes (see `postOrInOrder`).
+    class LogicalAndExpr extends Go::LandExpr {
+      LogicalAndExpr() { not this.isConst() }
     }
 
-    private ControlFlow::Node getElementStart(int i) {
-      exists(Expr elt | elt = this.getElement(i) |
-        result = MkImplicitLiteralElementIndex(elt)
-        or
-        (elt instanceof KeyValueExpr or this instanceof StructLit) and
-        firstNode(this.getElement(i), result)
-      )
+    class LogicalOrExpr extends Go::LorExpr {
+      LogicalOrExpr() { not this.isConst() }
     }
 
-    override predicate firstNode(ControlFlow::Node first) { first = MkExprNode(this) }
+    class NullCoalescingExpr extends BinaryExpr {
+      NullCoalescingExpr() { none() }
+    }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      ControlFlowTree.super.lastNode(last, cmpl)
-      or
-      last = this.getElementInit(this.getNumElement() - 1) and
-      cmpl = Done()
-      or
-      not exists(this.getElement(_)) and
-      last = MkExprNode(this) and
-      cmpl = Done()
+    class UnaryExpr = Go::UnaryExpr;
+
+    class LogicalNotExpr extends Go::NotExpr {
+      LogicalNotExpr() { not this.isConst() }
     }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      this.firstNode(pred) and
-      succ = this.getElementStart(0)
-      or
-      exists(int i |
-        pred = MkImplicitLiteralElementIndex(this.getElement(i)) and
-        firstNode(this.getElement(i), succ)
-        or
-        lastNode(this.getElement(i), pred, normalCompletion()) and
-        succ = this.getElementInit(i)
+    class BooleanLiteral extends Expr {
+      boolean val;
+
+      BooleanLiteral() {
+        this.(Go::Ident).getName() = "true" and val = true
         or
-        pred = this.getElementInit(i) and
-        succ = this.getElementStart(i + 1)
-      )
+        this.(Go::Ident).getName() = "false" and val = false
+      }
+
+      boolean getValue() { result = val }
     }
-  }
 
-  private class ConversionExprTree extends PostOrderTree, ConversionExpr {
-    override Completion getCompletion() {
-      // conversions of a slice to an array pointer are the only kind that may panic
-      this.getType().(PointerType).getBaseType() instanceof ArrayType and
-      result = Panic()
-      or
-      result = Done()
+    class Assignment extends BinaryExpr {
+      Assignment() { none() }
     }
 
-    override ControlFlow::Node getNode() { result = MkExprNode(this) }
+    class AssignExpr extends Assignment {
+      AssignExpr() { none() }
+    }
 
-    override ControlFlowTree getChildTree(int i) { i = 0 and result = this.getOperand() }
-  }
+    class CompoundAssignment extends Assignment {
+      CompoundAssignment() { none() }
+    }
+
+    class AssignLogicalAndExpr extends CompoundAssignment {
+      AssignLogicalAndExpr() { none() }
+    }
 
-  private class DeferStmtTree extends PostOrderTree, DeferStmt {
-    override ControlFlow::Node getNode() { result = MkDeferNode(this) }
+    class AssignLogicalOrExpr extends CompoundAssignment {
+      AssignLogicalOrExpr() { none() }
+    }
 
-    override ControlFlowTree getChildTree(int i) { i = 0 and result = this.getCall() }
-  }
+    class AssignNullCoalescingExpr extends CompoundAssignment {
+      AssignNullCoalescingExpr() { none() }
+    }
 
-  private class FuncDeclTree extends PostOrderTree, FuncDecl {
-    override ControlFlow::Node getNode() { result = MkFuncDeclNode(this) }
+    class PatternMatchExpr extends Expr {
+      PatternMatchExpr() { none() }
 
-    override ControlFlowTree getChildTree(int i) { i = 0 and result = this.getNameExpr() }
+      Expr getExpr() { none() }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      // override to prevent panic propagation out of function declarations
-      last = this.getNode() and cmpl = Done()
+      AstNode getPattern() { none() }
     }
   }
 
-  private class GoStmtTree extends PostOrderTree, GoStmt {
-    override ControlFlow::Node getNode() { result = MkGoNode(this) }
+  /** Predicates shared by the two stages of Go CFG construction. */
+  private module Input1 implements Cfg0::InputSig1 {
+    predicate cfgCachedStageRef() { CfgCachedStage::ref() }
 
-    override ControlFlowTree getChildTree(int i) { i = 0 and result = this.getCall() }
-  }
+    class CallableContext = Void;
 
-  private class IfStmtTree extends ControlFlowTree, IfStmt {
-    private ControlFlow::Node getGuard(boolean outcome) {
-      result = MkConditionGuardNode(this.getCond(), outcome)
-    }
+    class Label extends string {
+      Label() { this = any(Go::LabeledStmt ls).getLabel() }
 
-    override predicate firstNode(ControlFlow::Node first) {
-      firstNode(this.getInit(), first)
-      or
-      not exists(this.getInit()) and
-      firstNode(this.getCond(), first)
+      string toString() { result = this }
     }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      ControlFlowTree.super.lastNode(last, cmpl)
+    predicate hasLabel(Ast::AstNode n, Label l) {
+      l = n.(Go::LabeledStmt).getLabel()
       or
-      lastNode(this.getThen(), last, cmpl)
+      l = n.(Go::BreakStmt).getLabel()
       or
-      lastNode(this.getElse(), last, cmpl)
+      l = n.(Go::ContinueStmt).getLabel()
       or
-      not exists(this.getElse()) and
-      last = this.getGuard(false) and
-      cmpl = Done()
+      l = n.(Go::GotoStmt).getLabel()
+    }
+
+    predicate preOrderExpr(Ast::Expr e) {
+      // The call of a `defer` statement is not invoked at the statement
+      // itself; its callee expression and arguments are evaluated in place,
+      // but the call is only invoked later, at function exit (modeled by the
+      // `defer-invoke` node and the final-stage defer steps). Marking it as
+      // pre-order means no in-order "invocation" node (and hence no inline
+      // exceptional-exit edge) is created at the `defer` statement.
+      e = any(Go::DeferStmt s).getCall()
     }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      lastNode(this.getInit(), pred, normalCompletion()) and
-      firstNode(this.getCond(), succ)
+    predicate postOrInOrder(Ast::AstNode n) {
+      // References other than plain identifiers need an in-order value node
+      // even when they have no CFG children. Basic literals, function literals,
+      // and plain identifiers instead evaluate at their before node.
+      n instanceof Go::ReferenceExpr and not n instanceof Go::Ident
       or
-      exists(Completion condCmpl |
-        lastNode(this.getCond(), pred, condCmpl) and
-        succ = MkConditionGuardNode(this.getCond(), condCmpl.getOutcome())
-      )
+      // An empty composite literal (e.g. `T{}`) has no CFG children, so it too
+      // needs an explicit in-order (allocation) node.
+      n instanceof Go::CompositeLit
       or
-      pred = this.getGuard(true) and
-      firstNode(this.getThen(), succ)
+      // A constant expression is folded at compile time and its sub-expressions
+      // are not evaluated (they are pruned by `skipCfg`), so the constant root
+      // has no CFG children. Except for basic literals and identifiers, it
+      // needs an explicit in-order node to remain a single value-producing
+      // leaf (e.g. `unsafe.Sizeof(test())`, `1 << 10`, or `!d` for constant `d`).
+      constantRoot(n) and not n instanceof Go::BasicLit and not n instanceof Go::Ident
       or
-      pred = this.getGuard(false) and
-      firstNode(this.getElse(), succ)
-    }
-  }
-
-  private class IndexExprTree extends ControlFlowTree, IndexExpr {
-    override predicate firstNode(ControlFlow::Node first) { firstNode(this.getBase(), first) }
-
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      ControlFlowTree.super.lastNode(last, cmpl)
+      // Statements/declarations that compute a value or perform an operation and
+      // are not among the statements the shared library makes post-order by
+      // default.
+      n instanceof Go::DeferStmt
+      or
+      n instanceof Go::GoStmt
+      or
+      n instanceof Go::CompoundAssignStmt
       or
-      // panic due to `nil` dereference
-      last = MkImplicitDeref(this.getBase()) and
-      cmpl = Panic()
+      n instanceof Go::IncDecStmt
       or
-      last = mkExprOrSkipNode(this) and
-      (cmpl = Done() or cmpl = Panic())
+      n instanceof Go::SelectStmt
+      or
+      n instanceof Go::SendStmt
     }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      lastNode(this.getBase(), pred, normalCompletion()) and
+    predicate additionalNode(Ast::AstNode n, string tag, NormalSuccessor t) {
+      t instanceof DirectSuccessor and
       (
-        succ = MkImplicitDeref(this.getBase())
+        // Assignment write nodes: one per LHS
+        exists(int i |
+          (
+            notBlankIdent(n.(Go::Assignment).getLhs(i)) and
+            // A compound assignment (`x += y`) performs its write at its
+            // post-order operation node rather than emitting a separate
+            // `assign:i` write node (see
+            // `IR::EvalCompoundAssignRhsInstruction`).
+            not n instanceof Go::CompoundAssignStmt and
+            // The `y := x.(type)` test statement of a type switch is transparent
+            // (see `skipCfg`): the per-case implicit variables are written at the
+            // case match nodes (see `IR::TypeSwitchImplicitVariableInstruction`),
+            // so the guard itself emits no assignment write node.
+            not n = any(Go::TypeSwitchStmt ts).getAssign() and
+            // A tuple-destructuring assignment (`x, y = f()`) folds its per-target
+            // write into the `extract` node (see `IR::ExtractWriteInstruction`).
+            not extractNodeCondition(n, i)
+            or
+            // A `ValueSpec` without an initializer is written by its `zero-init`
+            // node directly (see `IR::EvalImplicitInitInstruction`), and a
+            // tuple-destructuring declaration (`var x, y = f()`) is written by its
+            // `extract` node; only specs with a per-name initializer emit
+            // `assign:i`.
+            notBlankIdent(n.(Go::ValueSpec).getNameExpr(i)) and
+            exists(n.(Go::ValueSpec).getAnInit()) and
+            not extractNodeCondition(n, i)
+          ) and
+          tag = "assign:" + i.toString()
+        )
+        or
+        // Get the next key-value pair produced by a `range` statement.
+        n instanceof Go::RangeElementExpr and tag = "next"
+        or
+        // Tuple extraction nodes
+        exists(int i |
+          extractNodeCondition(n, i) and
+          tag = "extract:" + i.toString()
+        )
+        or
+        // Zero initialization (on the ValueSpec)
+        exists(int i, Go::ValueSpec spec |
+          n = spec and
+          not exists(spec.getAnInit()) and
+          exists(spec.getNameExpr(i)) and
+          tag = "zero-init:" + i.toString()
+        )
+        or
+        // Result write nodes in return statements
+        exists(int i, Go::ReturnStmt ret |
+          n = ret and
+          exists(ret.getEnclosingFunction().getResultVar(i)) and
+          exists(ret.getAnExpr()) and
+          tag = "result-write:" + i.toString()
+        )
+        or
+        // Result read nodes (on the function body)
+        exists(int i, Go::FuncDef fd |
+          n = fd.getBody() and
+          exists(fd.getBody()) and
+          exists(fd.getResultVar(i)) and
+          tag = "result-read:" + i.toString()
+        )
+        or
+        // Result-variable zero-initialization (on the function body). This single
+        // node computes the zero value and writes it to the result variable (see
+        // `IR::EvalImplicitInitInstruction`); it is the same kind of node as the
+        // `zero-init` of an uninitialised local variable.
+        exists(int i, Go::FuncDef fd |
+          n = fd.getBody() and
+          exists(fd.getBody()) and
+          exists(fd.getResultVar(i)) and
+          tag = "zero-init:" + i.toString()
+        )
+        or
+        // Implicit deref
+        implicitDerefCondition(n) and tag = "implicit-deref"
+        or
+        // Literal element initialization
+        n = any(Go::CompositeLit lit).getAnElement() and
+        tag = "lit-init"
+        or
+        // Implicit field selection for promoted fields
+        exists(int i, Go::Field implicitField |
+          implicitFieldSelection(n, i, implicitField) and
+          tag = "implicit-field:" + i.toString()
+        )
+        or
+        // Deferred-call invocation node, placed at function exit by the final-stage defer steps
+        n = any(Go::DeferStmt s).getCall() and tag = "defer-invoke"
+        or
+        n instanceof Go::DeferStmt and tag = "catch-defer-panic"
+        or
+        not n instanceof Go::DeferStmt and
+        mayPanic(n) and
+        mayDeferParent(n) and
+        tag = "catch-panic"
         or
-        not exists(MkImplicitDeref(this.getBase())) and
-        firstNode(this.getIndex(), succ)
+        mayReturn(n) and mayDeferParent(n) and tag = "catch-return"
+      )
+    }
+
+    /** Helper: condition for MkExtractNode */
+    private predicate extractNodeCondition(Ast::AstNode s, int i) {
+      exists(Go::Assignment assgn |
+        s = assgn and
+        exists(assgn.getRhs()) and
+        assgn.getNumLhs() > 1 and
+        exists(assgn.getLhs(i))
+      )
+      or
+      exists(Go::ValueSpec spec |
+        s = spec and
+        exists(spec.getInit()) and
+        spec.getNumName() > 1 and
+        exists(spec.getNameExpr(i))
+      )
+      or
+      exists(Go::RangeElementExpr p | s = p |
+        exists(p.getKey()) and i = 0
+        or
+        exists(p.getValue()) and i = 1
       )
       or
-      pred = MkImplicitDeref(this.getBase()) and
-      firstNode(this.getIndex(), succ)
+      exists(Go::ReturnStmt ret, Go::SignatureType rettp |
+        s = ret and
+        exists(ret.getExpr()) and
+        rettp = ret.getEnclosingFunction().getType() and
+        rettp.getNumResult() > 1 and
+        exists(rettp.getResultType(i))
+      )
       or
-      lastNode(this.getIndex(), pred, normalCompletion()) and
-      succ = mkExprOrSkipNode(this)
+      exists(Go::CallExpr outer, Go::CallExpr inner | s = outer |
+        inner = outer.getArgument(0).stripParens() and
+        outer.getNumArgument() = 1 and
+        exists(inner.getType().(Go::TupleType).getComponentType(i))
+      )
     }
-  }
-
-  private class LoopTree extends ControlFlowTree, LoopStmt {
-    BranchTarget getLabel() { result = BranchTarget::of(this) }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      exists(Completion inner | lastNode(this.getBody(), last, inner) and not inner.isNormal() |
-        if inner = Break(this.getLabel())
-        then cmpl = Done()
-        else (
-          not inner = Continue(this.getLabel()) and
-          cmpl = inner
+    /** Helper: condition for implicit dereference */
+    private predicate implicitDerefCondition(Ast::AstNode e) {
+      e.(Go::Expr).getType().getUnderlyingType() instanceof Go::PointerType and
+      (
+        exists(Go::SelectorExpr sel | e = sel.getBase() |
+          sel = any(Go::Field f).getAReference()
+          or
+          exists(Go::Method m, Go::Type tp |
+            sel = m.getAReference() and
+            tp = m.getReceiver().getType().getUnderlyingType() and
+            not tp instanceof Go::PointerType
+          )
         )
+        or
+        e = any(Go::IndexExpr ie).getBase()
+        or
+        e = any(Go::SliceExpr se).getBase()
       )
     }
-  }
 
-  private class FileTree extends ControlFlowTree, File {
-    FileTree() { exists(this.getADecl()) }
+    /** Helper: blank identifier check */
+    private predicate notBlankIdent(Go::Expr e) { not e instanceof Go::BlankIdent }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) { none() }
+    /** Holds if `e` is invoked in a newly started goroutine. */
+    private predicate isGoStmtCall(Ast::AstNode e) { e = any(Go::GoStmt s).getCall() }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      ControlFlowTree.super.succ0(pred, succ)
-      or
-      pred = MkEntryNode(this) and
-      firstNode(this.getDecl(0), succ)
+    /** Helper: implicit field selection for promoted selectors */
+    additional predicate implicitFieldSelection(Ast::AstNode e, int index, Go::Field implicitField) {
+      exists(Go::StructType baseType, Go::PromotedField child, int implicitFieldDepth |
+        baseType = e.(Go::PromotedSelector).getSelectedStructType() and
+        (
+          e.(Go::PromotedSelector).refersTo(child)
+          or
+          implicitFieldSelection(e, implicitFieldDepth + 1, child)
+        )
+      |
+        child = baseType.getFieldOfEmbedded(implicitField, _, implicitFieldDepth + 1, _) and
+        exists(Go::PromotedField explicitField, int explicitFieldDepth |
+          e.(Go::PromotedSelector).refersTo(explicitField) and
+          baseType.getFieldAtDepth(_, explicitFieldDepth) = explicitField
+        |
+          index = explicitFieldDepth - implicitFieldDepth and index > 0
+        )
+      )
       or
-      exists(int i, Completion inner | lastNode(this.getDecl(i), pred, inner) |
-        not inner.isNormal()
+      exists(
+        Go::StructType baseType, Go::PromotedMethod method, int mDepth, int implicitFieldDepth
+      |
+        baseType = e.(Go::PromotedSelector).getSelectedStructType() and
+        e.(Go::PromotedSelector).refersTo(method) and
+        baseType.getMethodAtDepth(_, mDepth) = method and
+        index = mDepth - implicitFieldDepth and
+        index > 0
+      |
+        method = baseType.getMethodOfEmbedded(implicitField, _, implicitFieldDepth + 1)
         or
-        i = this.getNumDecl() - 1
-      ) and
-      succ = MkExitNode(this)
-    }
-
-    override ControlFlowTree getChildTree(int i) { result = this.getDecl(i) }
-  }
-
-  private class ForTree extends LoopTree, ForStmt {
-    private ControlFlow::Node getGuard(boolean outcome) {
-      result = MkConditionGuardNode(this.getCond(), outcome)
-    }
-
-    override predicate firstNode(ControlFlow::Node first) {
-      firstNode(this.getFirstChildTree(), first)
+        exists(Go::PromotedField child |
+          child = baseType.getFieldOfEmbedded(implicitField, _, implicitFieldDepth + 1, _) and
+          implicitFieldSelection(e, implicitFieldDepth + 1, child)
+        )
+      )
     }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      LoopTree.super.lastNode(last, cmpl)
-      or
-      lastNode(this.getInit(), last, cmpl) and
-      not cmpl.isNormal()
-      or
-      lastNode(this.getCond(), last, cmpl) and
-      not cmpl.isNormal()
+    additional predicate beginAbruptCompletion(
+      Ast::AstNode ast, PreControlFlowNode n, AbruptCompletion c, boolean always
+    ) {
+      ast instanceof Go::CallExpr and
+      not isGoStmtCall(ast) and
+      (
+        not exists(ast.(Go::CallExpr).getTarget()) or
+        ast.(Go::CallExpr).getTarget().mayPanic()
+      ) and
+      n.isIn(ast) and
+      c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+      always = false
       or
-      lastNode(this.getPost(), last, cmpl) and
-      not cmpl.isNormal()
+      ast instanceof Go::CallExpr and
+      ast = any(Go::DeferStmt defer).getCall() and
+      (
+        not exists(ast.(Go::CallExpr).getTarget()) or
+        ast.(Go::CallExpr).getTarget().mayPanic()
+      ) and
+      n.isAdditional(ast, "defer-invoke") and
+      c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+      always = false
+      or
+      // Calls to functions that never return normally (e.g. `os.Exit`, `log.Fatal`,
+      // `panic`) must suppress normal flow past the call site. We emit an `always`
+      // exception completion so that the shared library's default In->After step
+      // is suppressed.
+      ast instanceof Go::CallExpr and
+      not isGoStmtCall(ast) and
+      exists(Go::Function target | target = ast.(Go::CallExpr).getTarget() |
+        target.mustPanic() or target.mustNotReturnNormally()
+      ) and
+      n.isIn(ast) and
+      c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+      always = true
+      or
+      ast instanceof Go::CallExpr and
+      ast = any(Go::DeferStmt defer).getCall() and
+      exists(Go::Function target | target = ast.(Go::CallExpr).getTarget() |
+        target.mustPanic() or target.mustNotReturnNormally()
+      ) and
+      n.isAdditional(ast, "defer-invoke") and
+      c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+      always = true
+      or
+      ast instanceof Go::DivExpr and
+      not ast.(Go::Expr).isConst() and
+      n.isIn(ast) and
+      c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+      always = false
+      or
+      ast instanceof Go::DerefExpr and
+      n.isIn(ast) and
+      c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+      always = false
+      or
+      ast instanceof Go::TypeAssertExpr and
+      not exists(Go::Assignment assgn |
+        assgn.getNumLhs() = 2 and ast = assgn.getRhs().stripParens()
+      ) and
+      not exists(Go::ValueSpec vs | vs.getNumName() = 2 and ast = vs.getInit().stripParens()) and
+      not exists(Go::TypeSwitchStmt ts | ast = ts.getExpr()) and
+      n.isIn(ast) and
+      c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+      always = false
+      or
+      ast instanceof Go::IndexExpr and
+      n.isIn(ast) and
+      c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+      always = false
+      or
+      ast instanceof Go::ConversionExpr and
+      ast.(Go::ConversionExpr).getType().(Go::PointerType).getBaseType() instanceof Go::ArrayType and
+      n.isIn(ast) and
+      c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+      always = false
+    }
+
+    additional predicate endAbruptCompletion(
+      Ast::AstNode ast, PreControlFlowNode n, AbruptCompletion c
+    ) {
+      ast instanceof Go::DeferStmt and
+      n.isAdditional(ast, "catch-defer-panic") and
+      c.getSuccessorType() instanceof ExceptionSuccessor
+      or
+      not ast instanceof Go::DeferStmt and
+      mayPanic(ast) and
+      mayDeferParent(ast) and
+      n.isAdditional(ast, "catch-panic") and
+      c.getSuccessorType() instanceof ExceptionSuccessor
+      or
+      mayReturn(ast) and
+      mayDeferParent(ast) and
+      n.isAdditional(ast, "catch-return") and
+      c.getSuccessorType() instanceof ReturnSuccessor
+      or
+      // An unlabeled `break` in a communication clause body terminates the
+      // enclosing `select`. Labeled breaks are handled by the shared
+      // `LabeledStmt` logic.
+      exists(Go::SelectStmt sel, Go::CommClause cc |
+        cc = sel.getACommClause() and
+        ast = cc.getStmt(_) and
+        n.isAfter(sel) and
+        c.getSuccessorType() instanceof BreakSuccessor
+      |
+        not c.hasLabel(_)
+      )
       or
-      last = this.getGuard(false) and
-      cmpl = Done()
+      exists(Go::FuncDef fd |
+        ast = fd.getBody() and
+        not funcHasDefer(fd) and
+        c.getSuccessorType() instanceof ReturnSuccessor and
+        // If the function has result variables, route the return completion
+        // through the result-read epilogue before reaching the function exit.
+        exists(fd.getResultVar(0)) and
+        n.isAdditional(fd.getBody(), "result-read:0")
+      )
     }
 
-    override ControlFlowTree getChildTree(int i) {
-      i = 0 and result = this.getInit()
+    /** Holds if `ast` or one of its CFG children may panic. */
+    private predicate mayPanic(Ast::AstNode ast) {
+      ast instanceof Go::CallExpr and
+      not ast = any(Go::DeferStmt s).getCall() and
+      not isGoStmtCall(ast) and
+      (not exists(ast.(Go::CallExpr).getTarget()) or ast.(Go::CallExpr).getTarget().mayPanic()) and
+      not exists(Go::Function target | target = ast.(Go::CallExpr).getTarget() |
+        target.mustNotReturnNormally() and not target.mustPanic()
+      )
       or
-      i = 1 and result = this.getCond()
+      ast instanceof Go::DivExpr and not ast.(Go::Expr).isConst()
       or
-      i = 2 and result = this.getBody()
+      ast instanceof Go::DerefExpr
       or
-      i = 3 and result = this.getPost()
+      ast instanceof Go::TypeAssertExpr and
+      not exists(Go::Assignment assgn |
+        assgn.getNumLhs() = 2 and ast = assgn.getRhs().stripParens()
+      ) and
+      not exists(Go::ValueSpec vs | vs.getNumName() = 2 and ast = vs.getInit().stripParens()) and
+      not exists(Go::TypeSwitchStmt ts | ast = ts.getExpr())
+      or
+      ast instanceof Go::IndexExpr
       or
-      i = 4 and result = this.getCond()
+      ast instanceof Go::ConversionExpr and
+      ast.(Go::ConversionExpr).getType().(Go::PointerType).getBaseType() instanceof Go::ArrayType
       or
-      i = 5 and result = this.getBody()
+      mayPanic(Ast::getChild(ast, _))
     }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      exists(int i, ControlFlowTree predTree, Completion cmpl |
-        predTree = this.getChildTreeRanked(i) and
-        lastNode(predTree, pred, cmpl) and
-        cmpl.isNormal()
-      |
-        if predTree = this.getCond()
-        then succ = this.getGuard(cmpl.getOutcome())
-        else firstNode(this.getChildTreeRanked(i + 1), succ)
-      )
+    /** Holds if `ast` or one of its CFG children may return abruptly. */
+    private predicate mayReturn(Ast::AstNode ast) {
+      ast instanceof Go::ReturnStmt
       or
-      pred = this.getGuard(true) and
-      firstNode(this.getBody(), succ)
+      mayReturn(Ast::getChild(ast, _))
     }
-  }
 
-  private class FuncDefTree extends ControlFlowTree, FuncDef {
-    FuncDefTree() { exists(this.getBody()) }
+    /** Holds if `ast` or one of its CFG children registers a deferred call. */
+    private predicate mayDefer(Ast::AstNode ast) {
+      ast instanceof Go::DeferStmt
+      or
+      mayDefer(Ast::getChild(ast, _))
+    }
 
-    pragma[noinline]
-    private MkEntryNode getEntry() { result = MkEntryNode(this) }
+    /** Holds if the CFG parent of `ast` may register a deferred call. */
+    private predicate mayDeferParent(Ast::AstNode ast) {
+      exists(Ast::AstNode parent | ast = Ast::getChild(parent, _) and mayDefer(parent))
+    }
 
-    private Parameter getParameterRanked(int i) {
-      result = rank[i + 1](Parameter p, int j | p = this.getParameter(j) | p order by j)
+    /** Holds if `fd` contains at least one `defer` statement. */
+    private predicate funcHasDefer(Go::FuncDef fd) {
+      exists(Go::DeferStmt s | s.getEnclosingFunction() = fd)
     }
 
-    private ControlFlow::Node getPrologueNode(int i) {
-      i = -1 and result = this.getEntry()
-      or
-      exists(int numParm, int numRes |
-        numParm = count(this.getParameter(_)) and
-        numRes = count(this.getResultVar(_))
-      |
-        exists(int j, Parameter p | p = this.getParameterRanked(j) |
-          i = 2 * j and result = MkArgumentNode(p)
-          or
-          i = 2 * j + 1 and result = MkParameterInit(p)
-        )
-        or
-        exists(int j, ResultVariable v | v = this.getResultVar(j) |
-          i = 2 * numParm + 2 * j and
-          result = MkZeroInitNode(v)
-          or
-          i = 2 * numParm + 2 * j + 1 and
-          result = MkResultInit(v)
-        )
-        or
-        i = 2 * numParm + 2 * numRes and
-        firstNode(this.getBody(), result)
-      )
+    /**
+     * Holds if `n` is the registration node of `defer` statement `s` (the
+     * post-order node of the statement, reached once its call's arguments have
+     * been evaluated).
+     */
+    private predicate deferRegistration(PreControlFlowNode n, Go::DeferStmt s) { n.isIn(s) }
+
+    /**
+     * Holds if `n` is the deferred-invocation node for `defer` statement `s`,
+     * which models the deferred call running at function exit.
+     */
+    private predicate deferInvoke(PreControlFlowNode n, Go::DeferStmt s) {
+      n.isAdditional(s.getCall(), "defer-invoke")
     }
 
-    private ControlFlow::Node getEpilogueNode(int i) {
-      result = MkResultReadNode(this.getResultVar(i))
-      or
-      i = count(this.getAResultVar()) and
-      result = MkExitNode(this)
+    /** Holds if invoking deferred call `s` may return normally. */
+    private predicate deferInvocationMayReturnNormally(Go::DeferStmt s) {
+      not exists(Go::Function target | target = s.getCall().getTarget() |
+        target.mustPanic() or target.mustNotReturnNormally()
+      )
     }
 
-    pragma[noinline]
-    private predicate firstDefer(ControlFlow::Node nd) {
-      exists(DeferStmt defer |
-        nd = MkExprNode(defer.getCall()) and
-        // `defer` can be the first `defer` statement executed
-        // there is always a predecessor node because the `defer`'s call is always
-        // evaluated before the defer statement itself
-        MkDeferNode(defer) = succ0(notDeferSucc0*(this.getEntry()))
+    /** Holds if invoking deferred call `s` terminates without panic unwinding. */
+    private predicate deferInvocationStopsUnwinding(Go::DeferStmt s) {
+      exists(Go::Function target | target = s.getCall().getTarget() |
+        target.mustNotReturnNormally() and not target.mustPanic()
       )
     }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) { none() }
+    /**
+     * Gets a defer-free successor of `n` that is not a `defer` registration
+     * node. Walking this relation from a node stops at the next registration
+     * node, which is how the reachability gate for deferred calls is computed.
+     *
+     * This is computed over the early CFG, before deferred-invocation edges are
+     * added to the final CFG.
+     */
+    private PreControlFlowNode succBeforeNextDeferRegistration(PreControlFlowNode n) {
+      earlySuccessor(n) = result and
+      not deferRegistration(result, _)
+    }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      exists(int i |
-        pred = this.getPrologueNode(i) and
-        succ = this.getPrologueNode(i + 1)
-      )
-      or
-      exists(GotoStmt goto, LabeledStmt ls |
-        pred = MkSkipNode(goto) and
-        this = goto.getEnclosingFunction() and
-        this = ls.getEnclosingFunction() and
-        goto.getLabel() = ls.getLabel() and
-        firstNode(ls, succ)
-      )
+    /** Gets a successor of `n` in the early CFG, before deferred invocations are added. */
+    private PreControlFlowNode earlySuccessor(PreControlFlowNode n) {
+      exists(EarlyCfg2::ControlFlowNode early | early = n and result = early.getASuccessor())
+    }
+
+    /** Gets a node reachable from `start` over `succBeforeNextDeferRegistration`, reflexively. */
+    private PreControlFlowNode reachableBeforeNextDeferRegistration(PreControlFlowNode start) {
+      result = start
       or
-      exists(int i |
-        pred = this.getEpilogueNode(i) and
-        succ = this.getEpilogueNode(i + 1)
+      result = succBeforeNextDeferRegistration(reachableBeforeNextDeferRegistration(start))
+    }
+
+    /** Gets the entry node of `fd`. */
+    private PreControlFlowNode funcEntry(Go::FuncDef fd) {
+      result.(EntryNodeImpl).getEnclosingCallable() = fd
+    }
+
+    /**
+     * Holds if `s` can be the first `defer` statement registered in `fd`, and
+     * hence the last to run: its registration node is reachable from the entry
+     * node without passing through another registration node.
+     */
+    private predicate firstRegisteredDefer(Go::DeferStmt s, Go::FuncDef fd) {
+      s.getEnclosingFunction() = fd and
+      exists(PreControlFlowNode reg, PreControlFlowNode m |
+        deferRegistration(reg, s) and
+        m = reachableBeforeNextDeferRegistration(funcEntry(fd)) and
+        earlySuccessor(m) = reg
       )
     }
 
-    override predicate succ(ControlFlow::Node pred, ControlFlow::Node succ) {
-      this.succ0(pred, succ)
-      or
-      exists(Completion cmpl |
-        lastNode(this.getBody(), pred, cmpl) and
-        // last node of function body can be reached without going through a `defer` statement
-        pred = notDeferSucc0*(this.getEntry())
+    /**
+     * Holds if the registration node of `laterRegistered` is the next registration
+     * node reachable from the registration node of `earlierRegistered`. The later
+     * registration therefore runs immediately before the earlier one (deferred calls
+     * run in last-in-first-out order).
+     */
+    private predicate nextRegisteredDefer(
+      Go::DeferStmt laterRegistered, Go::DeferStmt earlierRegistered
+    ) {
+      exists(
+        PreControlFlowNode laterRegistration, PreControlFlowNode earlierRegistration,
+        PreControlFlowNode m
       |
-        // panic goes directly to exit, non-panic reads result variables first
-        if cmpl = Panic() then succ = MkExitNode(this) else succ = this.getEpilogueNode(0)
+        deferRegistration(laterRegistration, laterRegistered) and
+        deferRegistration(earlierRegistration, earlierRegistered) and
+        m = reachableBeforeNextDeferRegistration(earlierRegistration) and
+        earlySuccessor(m) = laterRegistration
       )
-      or
-      lastNode(this.getBody(), pred, _) and
-      exists(DeferStmt defer | defer = this.getADeferStmt() |
-        succ = MkExprNode(defer.getCall()) and
-        // the last `DeferStmt` executed before pred is this `defer`
-        pred = notDeferSucc0*(MkDeferNode(defer))
+    }
+
+    /**
+     * Holds if `n` is a normal-exit predecessor of `fd`: a `return` statement
+     * node, or the normal fall-through from the body's last statement.
+     */
+    private predicate normalExitPred(PreControlFlowNode n, Go::FuncDef fd) {
+      exists(Ast::AstNode ast |
+        ast.getEnclosingFunction() = fd and n.isAdditional(ast, "catch-return")
       )
       or
-      exists(DeferStmt predDefer, DeferStmt succDefer |
-        predDefer = this.getADeferStmt() and
-        succDefer = this.getADeferStmt()
-      |
-        // reversed because `defer`s are executed in LIFO order
-        MkDeferNode(predDefer) = nextDefer(MkDeferNode(succDefer)) and
-        pred = MkExprNode(predDefer.getCall()) and
-        succ = MkExprNode(succDefer.getCall())
+      n.isAfter(getLastRankedChild(fd.getBody()))
+    }
+
+    /**
+     * Holds if `n` is an exceptional-exit predecessor of `fd`: the in-order
+     * node of an operation that may panic. In Go, deferred functions run on
+     * panic, so these nodes must also enter the deferred-call chain. Other
+     * nonreturning calls, such as `os.Exit`, do not run deferred functions.
+     */
+    private predicate exceptionalExitPred(PreControlFlowNode n, Go::FuncDef fd) {
+      exists(Ast::AstNode ast |
+        ast.getEnclosingFunction() = fd and n.isAdditional(ast, "catch-panic")
       )
+    }
+
+    /**
+     * Holds if, after running its deferred calls, `fd` should continue at
+     * `target` on a normal exit. For functions with result variables this is
+     * the start of the result-read epilogue; otherwise it is the function
+     * body's `After` node.
+     */
+    private predicate deferChainExitTarget(Go::FuncDef fd, PreControlFlowNode target) {
+      exists(fd.getResultVar(0)) and target.isAdditional(fd.getBody(), "result-read:0")
       or
-      this.firstDefer(pred) and
+      not exists(fd.getResultVar(_)) and target.isAfter(fd.getBody())
+    }
+
+    additional predicate finalDeferStep(PreControlFlowNode n1, PreControlFlowNode n2) {
+      exists(Go::FuncDef fd | funcHasDefer(fd) |
+        // an exit predecessor with no active defer flows straight to the exit target
+        normalExitPred(n1, fd) and
+        n1 = reachableBeforeNextDeferRegistration(funcEntry(fd)) and
+        deferChainExitTarget(fd, n2)
+        or
+        // an exit predecessor flows to the invocation of the last-registered active defer
+        exists(Go::DeferStmt d, PreControlFlowNode reg |
+          deferRegistration(reg, d) and
+          d.getEnclosingFunction() = fd and
+          normalExitPred(n1, fd) and
+          n1 = reachableBeforeNextDeferRegistration(reg) and
+          deferInvoke(n2, d)
+        )
+        or
+        // deferred invocations chain in last-in-first-out order
+        exists(Go::DeferStmt laterRegistered, Go::DeferStmt earlierRegistered |
+          laterRegistered.getEnclosingFunction() = fd and
+          nextRegisteredDefer(laterRegistered, earlierRegistered) and
+          not deferInvocationStopsUnwinding(laterRegistered) and
+          deferInvoke(n1, laterRegistered) and
+          deferInvoke(n2, earlierRegistered)
+        )
+        or
+        // a panic in a deferred invocation continues unwinding through earlier defers
+        exists(Go::DeferStmt laterRegistered, Go::DeferStmt earlierRegistered |
+          laterRegistered.getEnclosingFunction() = fd and
+          nextRegisteredDefer(laterRegistered, earlierRegistered) and
+          not deferInvocationStopsUnwinding(laterRegistered) and
+          n1.isAdditional(laterRegistered, "catch-defer-panic") and
+          deferInvoke(n2, earlierRegistered)
+        )
+        or
+        // the invocation of the first-registered (last to run) defer flows to the exit target
+        exists(Go::DeferStmt firstD |
+          firstRegisteredDefer(firstD, fd) and
+          deferInvocationMayReturnNormally(firstD) and
+          deferInvoke(n1, firstD) and
+          deferChainExitTarget(fd, n2)
+        )
+        or
+        // a panic in the first-registered defer finishes at the exceptional exit
+        exists(Go::DeferStmt firstD |
+          firstRegisteredDefer(firstD, fd) and
+          n1.isAdditional(firstD, "catch-defer-panic") and
+          n2.(ExceptionalExitNodeImpl).getEnclosingCallable() = fd
+        )
+        or
+        // a non-panicking, non-returning deferred call stops unwinding immediately
+        exists(Go::DeferStmt d |
+          d.getEnclosingFunction() = fd and
+          deferInvocationStopsUnwinding(d) and
+          n1.isAdditional(d, "catch-defer-panic") and
+          n2.(ExceptionalExitNodeImpl).getEnclosingCallable() = fd
+        )
+        or
+        // a possible panic with active defers flows to the last-registered active defer
+        exists(Go::DeferStmt d, PreControlFlowNode reg |
+          deferRegistration(reg, d) and
+          d.getEnclosingFunction() = fd and
+          exceptionalExitPred(n1, fd) and
+          n1 = reachableBeforeNextDeferRegistration(reg) and
+          deferInvoke(n2, d)
+        )
+        or
+        // a possible panic with no active defer flows to the exceptional exit
+        exceptionalExitPred(n1, fd) and
+        n1 = reachableBeforeNextDeferRegistration(funcEntry(fd)) and
+        n2.(ExceptionalExitNodeImpl).getEnclosingCallable() = fd
+      )
+    }
+
+    additional predicate step(PreControlFlowNode n1, PreControlFlowNode n2) {
+      rangeStmtStep(n1, n2) or
+      selectStmtStep(n1, n2) or
+      assignmentStep(n1, n2) or
+      returnStep(n1, n2) or
+      callExprStep(n1, n2) or
+      indexExprStep(n1, n2) or
+      sliceExprStep(n1, n2) or
+      selectorExprStep(n1, n2) or
+      compositeLitStep(n1, n2) or
+      funcDefStep(n1, n2)
+    }
+
+    /**
+     * Gets the non-skipped child of `parent` at rank `rnk` (1-based).
+     * This mimics the shared library's getRankedChild for explicit sequencing of
+     * function bodies and nodes with epilogues.
+     */
+    private Ast::AstNode getRankedChild(Ast::AstNode parent, int rnk) {
       (
-        // conservatively assume that we might either panic (and hence skip the result reads)
-        // or not
-        succ = MkExitNode(this)
+        parent = any(Go::FuncDef fd).getBody()
         or
-        succ = this.getEpilogueNode(0)
-      )
+        exists(getEpilogueTag(parent, _))
+      ) and
+      result = rank[rnk](Ast::AstNode c, int ix | c = Ast::getChild(parent, ix) | c order by ix)
     }
-  }
-
-  private class GotoTree extends ControlFlowTree, GotoStmt {
-    override predicate firstNode(ControlFlow::Node first) { first = MkSkipNode(this) }
-  }
-
-  private class IncDecTree extends ControlFlowTree, IncDecStmt {
-    override predicate firstNode(ControlFlow::Node first) { firstNode(this.getOperand(), first) }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      ControlFlowTree.super.lastNode(last, cmpl)
-      or
-      last = MkIncDecNode(this) and
-      cmpl = Done()
+    /** Gets the last non-skipped child of `parent`, or fails if none. */
+    private Ast::AstNode getLastRankedChild(Ast::AstNode parent) {
+      exists(int i |
+        result = getRankedChild(parent, i) and
+        not exists(getRankedChild(parent, i + 1))
+      )
     }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      lastNode(this.getOperand(), pred, normalCompletion()) and
-      succ = MkImplicitOne(this)
-      or
-      pred = MkImplicitOne(this) and
-      succ = MkIncDecRhs(this)
+    /** Routes into and between the children of `parent` in evaluation order. */
+    private predicate childSequenceStep(
+      Ast::AstNode parent, PreControlFlowNode n1, PreControlFlowNode n2
+    ) {
+      n1.isBefore(parent) and n2.isBefore(getRankedChild(parent, 1))
       or
-      pred = MkIncDecRhs(this) and
-      succ = MkIncDecNode(this)
+      exists(int i |
+        n1.isAfter(getRankedChild(parent, i)) and n2.isBefore(getRankedChild(parent, i + 1))
+      )
     }
-  }
 
-  private class RangeTree extends LoopTree, RangeStmt {
-    override predicate firstNode(ControlFlow::Node first) { firstNode(this.getDomain(), first) }
+    /** Routes between consecutive epilogue nodes of `parent`. */
+    private predicate epilogueSequenceStep(
+      Ast::AstNode parent, PreControlFlowNode n1, PreControlFlowNode n2
+    ) {
+      exists(string tag1, string tag2 |
+        epilogueTagSucc(parent, tag1, tag2) and
+        n1.isAdditional(parent, tag1) and
+        n2.isAdditional(parent, tag2)
+      )
+    }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      LoopTree.super.lastNode(last, cmpl)
-      or
-      last = MkNextNode(this) and
-      cmpl = Done()
+    /** Routes into and between the epilogue nodes of `parent`. */
+    private predicate epilogueStep(Ast::AstNode parent, PreControlFlowNode n1, PreControlFlowNode n2) {
+      exists(getFirstEpilogueTag(parent)) and childSequenceStep(parent, n1, n2)
       or
-      lastNode(this.getKey(), last, cmpl) and
-      not cmpl.isNormal()
+      n1.isAfter(getLastRankedChild(parent)) and
+      n2.isAdditional(parent, getFirstEpilogueTag(parent))
       or
-      lastNode(this.getValue(), last, cmpl) and
-      not cmpl.isNormal()
+      not exists(getRankedChild(parent, _)) and
+      n1.isBefore(parent) and
+      n2.isAdditional(parent, getFirstEpilogueTag(parent))
       or
-      lastNode(this.getDomain(), last, cmpl) and
-      not cmpl.isNormal()
+      epilogueSequenceStep(parent, n1, n2)
     }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      lastNode(this.getDomain(), pred, normalCompletion()) and
-      succ = MkNextNode(this)
-      or
-      pred = MkNextNode(this) and
-      (
-        firstNode(this.getKey(), succ)
+    /**
+     * Assignment flow: routes through LHS/RHS children, then through
+     * additional nodes for extract, zero-init, and assign operations.
+     */
+    private predicate assignmentStep(PreControlFlowNode n1, PreControlFlowNode n2) {
+      exists(Ast::AstNode assgn |
+        assgn instanceof Go::Assignment and
+        not assgn instanceof Go::RecvStmt and
+        // The `y := x.(type)` test statement of a type switch is transparent
+        // (see `skipCfg`); the shared switch model evaluates the underlying
+        // type-assertion expression directly, so this statement has no
+        // assignment flow of its own.
+        not assgn = any(Go::TypeSwitchStmt ts).getAssign()
         or
-        not exists(this.getKey()) and
-        firstNode(this.getBody(), succ)
-      )
-      or
-      lastNode(this.getKey(), pred, normalCompletion()) and
-      (
-        firstNode(this.getValue(), succ)
+        assgn instanceof Go::ValueSpec
+      |
+        epilogueStep(assgn, n1, n2)
         or
-        not exists(this.getValue()) and
-        succ = MkExtractNode(this, 0)
-      )
-      or
-      lastNode(this.getValue(), pred, normalCompletion()) and
-      succ = MkExtractNode(this, 0)
-      or
-      pred = MkExtractNode(this, 0) and
-      (
-        if exists(this.getValue())
-        then succ = MkExtractNode(this, 1)
-        else
-          if exists(MkAssignNode(this, 0))
-          then succ = MkAssignNode(this, 0)
-          else
-            if exists(MkAssignNode(this, 1))
-            then succ = MkAssignNode(this, 1)
-            else firstNode(this.getBody(), succ)
-      )
-      or
-      pred = MkExtractNode(this, 1) and
-      (
-        if exists(MkAssignNode(this, 0))
-        then succ = MkAssignNode(this, 0)
-        else
-          if exists(MkAssignNode(this, 1))
-          then succ = MkAssignNode(this, 1)
-          else firstNode(this.getBody(), succ)
-      )
-      or
-      pred = MkAssignNode(this, 0) and
-      (
-        if exists(MkAssignNode(this, 1))
-        then succ = MkAssignNode(this, 1)
-        else firstNode(this.getBody(), succ)
+        n1.isAdditional(assgn, getLastEpilogueTag(assgn)) and
+        n2.isAfter(assgn)
       )
-      or
-      pred = MkAssignNode(this, 1) and
-      firstNode(this.getBody(), succ)
-      or
-      exists(Completion inner |
-        lastNode(this.getBody(), pred, inner) and
-        (inner.isNormal() or inner = Continue(BranchTarget::of(this))) and
-        succ = MkNextNode(this)
-      )
-    }
-  }
-
-  private class RecvStmtTree extends ControlFlowTree, RecvStmt {
-    override predicate firstNode(ControlFlow::Node first) {
-      firstNode(this.getExpr().getOperand(), first)
     }
-  }
-
-  private class ReturnStmtTree extends PostOrderTree, ReturnStmt {
-    override ControlFlow::Node getNode() { result = MkReturnNode(this) }
 
-    override Completion getCompletion() { result = Return() }
-
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
+    /** Gets a tuple-extraction epilogue tag and its order. */
+    private string getExtractionEpilogueTag(Ast::AstNode node, int ord) {
       exists(int i |
-        lastNode(this.getExpr(i), pred, normalCompletion()) and
-        succ = this.complete(i)
-        or
-        pred = MkExtractNode(this, i) and
-        succ = this.after(i)
-        or
-        pred = MkResultWriteNode(_, i, this) and
-        succ = this.next(i)
+        extractNodeCondition(node, i) and
+        result = "extract:" + i.toString() and
+        ord = 2 * i
       )
     }
 
-    private ControlFlow::Node complete(int i) {
-      result = MkExtractNode(this, i)
-      or
-      not exists(MkExtractNode(this, _)) and
-      result = this.after(i)
+    /** Gets an assignment epilogue tag and its order. */
+    private string getAssignmentEpilogueTag(Ast::AstNode assgn, int ord) {
+      exists(int j |
+        (
+          exists(Go::ValueSpec spec |
+            assgn = spec and
+            not exists(spec.getAnInit()) and
+            exists(spec.getNameExpr(j)) and
+            result = "zero-init:" + j.toString() and
+            ord = 2 * j
+          )
+          or
+          (
+            notBlankIdent(assgn.(Go::Assignment).getLhs(j)) and
+            // Compound assignments perform their write at their post-order
+            // operation node, so they emit no separate `assign:j` node.
+            not assgn instanceof Go::CompoundAssignStmt and
+            // Tuple-destructuring targets are written by their `extract` node.
+            not extractNodeCondition(assgn, j)
+            or
+            // A `ValueSpec` without an initializer is written by its `zero-init`
+            // node directly, and a tuple-destructuring declaration by its
+            // `extract` node, so only specs with a per-name initializer emit
+            // `assign:j`.
+            notBlankIdent(assgn.(Go::ValueSpec).getNameExpr(j)) and
+            exists(assgn.(Go::ValueSpec).getAnInit()) and
+            not extractNodeCondition(assgn, j)
+          ) and
+          result = "assign:" + j.toString() and
+          ord = 2 * j + 1
+        )
+      )
     }
 
-    private ControlFlow::Node after(int i) {
-      result = MkResultWriteNode(_, i, this)
-      or
-      not exists(MkResultWriteNode(_, i, this)) and
-      result = this.next(i)
+    /** Gets a result-write epilogue tag and its order. */
+    private string getResultWriteEpilogueTag(Ast::AstNode node, int ord) {
+      exists(int i, Go::ReturnStmt ret, Go::ResultVariable rv |
+        node = ret and
+        ret.getEnclosingFunction().getResultVar(i) = rv and
+        exists(ret.getAnExpr()) and
+        result = "result-write:" + i.toString() and
+        ord = 2 * i + 1
+      )
     }
 
-    private ControlFlow::Node next(int i) {
-      firstNode(this.getExpr(i + 1), result)
+    /** Gets an epilogue tag and its order. */
+    private string getEpilogueTag(Ast::AstNode node, int ord) {
+      result = getExtractionEpilogueTag(node, ord)
       or
-      exists(MkExtractNode(this, _)) and
-      result = this.complete(i + 1)
+      result = getAssignmentEpilogueTag(node, ord)
       or
-      i + 1 = this.getEnclosingFunction().getType().getNumResult() and
-      result = this.getNode()
+      result = getResultWriteEpilogueTag(node, ord)
     }
 
-    override ControlFlowTree getChildTree(int i) { result = this.getExpr(i) }
-  }
+    private string getRankedEpilogueTag(Ast::AstNode node, int rnk) {
+      result = rank[rnk](string tag, int ord | tag = getEpilogueTag(node, ord) | tag order by ord)
+    }
 
-  private class SelectStmtTree extends ControlFlowTree, SelectStmt {
-    private BranchTarget getLabel() { result = BranchTarget::of(this) }
+    private string getFirstEpilogueTag(Ast::AstNode node) { result = getRankedEpilogueTag(node, 1) }
 
-    override predicate firstNode(ControlFlow::Node first) {
-      firstNode(this.getNonDefaultCommClause(0), first)
-      or
-      this.getNumNonDefaultCommClause() = 0 and
-      first = MkSelectNode(this)
+    private string getLastEpilogueTag(Ast::AstNode node) {
+      exists(int i |
+        result = getRankedEpilogueTag(node, i) and
+        not exists(getRankedEpilogueTag(node, i + 1))
+      )
     }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      exists(Completion inner | lastNode(this.getACommClause(), last, inner) |
-        if inner = Break(this.getLabel()) then cmpl = Done() else cmpl = inner
+    private predicate epilogueTagSucc(Ast::AstNode node, string tag1, string tag2) {
+      exists(int i |
+        tag1 = getRankedEpilogueTag(node, i) and
+        tag2 = getRankedEpilogueTag(node, i + 1)
       )
     }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      ControlFlowTree.super.succ0(pred, succ)
-      or
-      exists(CommClause cc, int i, Stmt comm |
-        cc = this.getNonDefaultCommClause(i) and
-        comm = cc.getComm() and
-        (
-          comm instanceof RecvStmt and
-          lastNode(comm.(RecvStmt).getExpr().getOperand(), pred, normalCompletion())
-          or
-          comm instanceof SendStmt and
-          lastNode(comm.(SendStmt).getValue(), pred, normalCompletion())
-        )
-      |
-        firstNode(this.getNonDefaultCommClause(i + 1), succ)
+    /**
+     * Return statement: evaluate expressions, extract tuples, write results,
+     * then the return node.
+     */
+    private predicate returnStep(PreControlFlowNode n1, PreControlFlowNode n2) {
+      exists(Go::ReturnStmt ret |
+        epilogueStep(ret, n1, n2)
         or
-        i = this.getNumNonDefaultCommClause() - 1 and
-        succ = MkSelectNode(this)
+        n1.isAdditional(ret, getLastEpilogueTag(ret)) and
+        n2.isIn(ret)
       )
-      or
-      pred = MkSelectNode(this) and
-      exists(CommClause cc, Stmt comm |
-        cc = this.getNonDefaultCommClause(_) and comm = cc.getComm()
+    }
+
+    /**
+     * Call with spread arguments, e.g. `f(g())` where the inner call `g`
+     * returns multiple results that are passed as the arguments of the outer
+     * call `f`: evaluate the function expression and argument call, extract
+     * each tuple element of the argument's result, then invoke the outer call.
+     *
+     * The tuple-extraction nodes are additional nodes (see
+     * `extractNodeCondition`); without wiring them into the control flow they
+     * would be unreachable and pruned, breaking data flow through `f(g())`.
+     */
+    private predicate callExprStep(PreControlFlowNode n1, PreControlFlowNode n2) {
+      exists(Go::CallExpr call |
+        // Restrict to ordinary invoked calls; the calls of `defer`/`go`
+        // statements do not use this tuple-extraction override.
+        not call = any(Go::DeferStmt s).getCall() and
+        not call = any(Go::GoStmt s).getCall() and
+        extractNodeCondition(call, _)
       |
-        comm instanceof RecvStmt and
-        succ = MkExprNode(comm.(RecvStmt).getExpr())
+        epilogueStep(call, n1, n2)
         or
-        comm instanceof SendStmt and
-        succ = MkSendNode(comm)
-      )
-      or
-      pred = MkSelectNode(this) and
-      exists(CommClause cc | cc = this.getDefaultCommClause() |
-        firstNode(cc.getStmt(0), succ)
+        n1.isAdditional(call, getLastEpilogueTag(call)) and n2.isIn(call)
         or
-        succ = MkSkipNode(cc)
+        n1.isIn(call) and
+        n2.isAfter(call) and
+        not beginAbruptCompletion(call, n1, _, true)
       )
-      or
-      exists(CommClause cc, RecvStmt recv | cc = this.getCommClause(_) and recv = cc.getComm() |
-        pred = MkExprNode(recv.getExpr()) and
+    }
+
+    /**
+     * Index expression: base -> implicit-deref? -> index -> In(indexExpr)
+     */
+    private predicate indexExprStep(PreControlFlowNode n1, PreControlFlowNode n2) {
+      exists(Go::IndexExpr ie |
+        implicitDerefCondition(ie.getBase()) and
         (
-          firstNode(recv.getLhs(0), succ)
+          n1.isBefore(ie) and n2.isBefore(ie.getBase())
           or
-          not exists(recv.getLhs(0)) and
-          (firstNode(cc.getStmt(0), succ) or succ = MkSkipNode(cc))
-        )
-        or
-        lastNode(recv.getLhs(0), pred, normalCompletion()) and
-        not exists(recv.getLhs(1)) and
-        (
-          succ = MkAssignNode(recv, 0)
+          n1.isAfter(ie.getBase()) and n2.isAdditional(ie.getBase(), "implicit-deref")
           or
-          not exists(MkAssignNode(recv, 0)) and
-          (firstNode(cc.getStmt(0), succ) or succ = MkSkipNode(cc))
-        )
-        or
-        lastNode(recv.getLhs(1), pred, normalCompletion()) and
-        succ = MkExtractNode(recv, 0)
-        or
-        (
-          pred = MkAssignNode(recv, 0) and
-          not exists(MkExtractNode(recv, 1))
+          n1.isAdditional(ie.getBase(), "implicit-deref") and n2.isBefore(ie.getIndex())
           or
-          pred = MkExtractNode(recv, 1) and
-          not exists(MkAssignNode(recv, 1))
+          n1.isAfter(ie.getIndex()) and n2.isIn(ie)
           or
-          pred = MkAssignNode(recv, 1)
-        ) and
-        (firstNode(cc.getStmt(0), succ) or succ = MkSkipNode(cc))
-      )
-      or
-      exists(CommClause cc, SendStmt ss |
-        cc = this.getCommClause(_) and
-        ss = cc.getComm() and
-        pred = MkSendNode(ss)
-      |
-        firstNode(cc.getStmt(0), succ)
-        or
-        succ = MkSkipNode(cc)
+          n1.isIn(ie) and n2.isAfter(ie)
+        )
       )
     }
-  }
-
-  private class SelectorExprTree extends ControlFlowTree, SelectorExpr {
-    SelectorExprTree() { this.getBase() instanceof ValueExpr }
 
-    override predicate firstNode(ControlFlow::Node first) { firstNode(this.getBase(), first) }
-
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      ControlFlowTree.super.lastNode(last, cmpl)
+    /**
+     * Gets the bound expression of slice `se` at position `r` (`0` = low,
+     * `1` = high, `2` = max), if it is present.
+     */
+    private Go::Expr sliceBoundExpr(Go::SliceExpr se, int r) {
+      r = 0 and result = se.getLow()
       or
-      // panic due to `nil` dereference
-      last = MkImplicitDeref(this.getBase()) and
-      cmpl = Panic()
+      r = 1 and result = se.getHigh()
       or
-      last = mkExprOrSkipNode(this) and
-      cmpl = Done()
+      r = 2 and result = se.getMax()
     }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      exists(int i | pred = this.getStepWithRank(i) and succ = this.getStepWithRank(i + 1))
+    /**
+     * Holds if, having finished evaluating the slice component at position `p`
+     * (`-1` = base, `0` = low, `1` = high, `2` = max), `n2` is the control-flow
+     * node to execute next: the next present bound in `low, high, max` order, or
+     * the slice evaluation node `In(se)` if no further bound is present.
+     *
+     * Implicit (omitted) bounds have no control-flow node of their own, so
+     * control simply skips over them.
+     */
+    bindingset[p]
+    private predicate sliceNext(Go::SliceExpr se, int p, PreControlFlowNode n2) {
+      exists(int q | q = min(int r | r > p and exists(sliceBoundExpr(se, r)) | r) |
+        n2.isBefore(sliceBoundExpr(se, q))
+      )
+      or
+      not exists(int r | r > p and exists(sliceBoundExpr(se, r))) and
+      n2.isIn(se)
     }
 
-    private ControlFlow::Node getStepOrdered(int i) {
-      i = -2 and lastNode(this.getBase(), result, normalCompletion())
-      or
-      i = -1 and result = MkImplicitDeref(this.getBase())
-      or
-      exists(int maxIndex |
-        maxIndex = max(int k | k = 0 or exists(MkImplicitFieldSelection(this, k, _)))
-      |
-        result = MkImplicitFieldSelection(this, maxIndex - i, _)
+    /**
+     * Slice expression with implicit dereference: base -> implicit-deref ->
+     * low? -> high? -> max? -> In(sliceExpr).
+     *
+     * Missing (implicit) bounds have no control-flow node of their own; the
+     * implicit lower bound of `0` is modeled as a constant on the
+     * `SliceInstruction` rather than as a separate node.
+     */
+    private predicate sliceExprStep(PreControlFlowNode n1, PreControlFlowNode n2) {
+      exists(Go::SliceExpr se | implicitDerefCondition(se.getBase()) |
+        n1.isBefore(se) and n2.isBefore(se.getBase())
+        or
+        n1.isAfter(se.getBase()) and
+        n2.isAdditional(se.getBase(), "implicit-deref")
+        or
+        n1.isAdditional(se.getBase(), "implicit-deref") and sliceNext(se, -1, n2)
         or
-        i = maxIndex and
-        result = mkExprOrSkipNode(this)
+        n1.isAfter(se.getLow()) and sliceNext(se, 0, n2)
+        or
+        n1.isAfter(se.getHigh()) and sliceNext(se, 1, n2)
+        or
+        n1.isAfter(se.getMax()) and sliceNext(se, 2, n2)
+        or
+        n1.isIn(se) and n2.isAfter(se)
       )
     }
 
-    private ControlFlow::Node getStepWithRank(int i) {
-      exists(int j |
-        result = this.getStepOrdered(j) and
-        j = rank[i + 1](int k | exists(this.getStepOrdered(k)))
+    /**
+     * Selector expression with value base: base -> implicit-deref? ->
+     * implicit-field-selections -> In(selector)
+     */
+    private predicate selectorExprStep(PreControlFlowNode n1, PreControlFlowNode n2) {
+      exists(Go::SelectorExpr sel |
+        sel.getBase() instanceof Go::ValueExpr and
+        (
+          implicitDerefCondition(sel.getBase()) or
+          implicitFieldSelection(sel, _, _)
+        ) and
+        (
+          n1.isBefore(sel) and n2.isBefore(sel.getBase())
+          or
+          n1.isAfter(sel.getBase()) and
+          not implicitDerefCondition(sel.getBase()) and
+          (
+            // Has implicit field reads: go to outermost (highest index)
+            exists(int maxIdx |
+              maxIdx = max(int i | implicitFieldSelection(sel, i, _)) and
+              n2.isAdditional(sel, "implicit-field:" + maxIdx.toString())
+            )
+            or
+            // No implicit field reads: go directly to In(sel)
+            not implicitFieldSelection(sel, _, _) and n2.isIn(sel)
+          )
+          or
+          n1.isAfter(sel.getBase()) and
+          implicitDerefCondition(sel.getBase()) and
+          n2.isAdditional(sel.getBase(), "implicit-deref")
+          or
+          n1.isAdditional(sel.getBase(), "implicit-deref") and
+          (
+            // Has implicit field reads: go to outermost (highest index)
+            exists(int maxIdx |
+              maxIdx = max(int i | implicitFieldSelection(sel, i, _)) and
+              n2.isAdditional(sel, "implicit-field:" + maxIdx.toString())
+            )
+            or
+            // No implicit field reads: go directly to In(sel)
+            not implicitFieldSelection(sel, _, _) and n2.isIn(sel)
+          )
+          or
+          exists(int i |
+            i > 1 and
+            implicitFieldSelection(sel, i, _) and
+            implicitFieldSelection(sel, i - 1, _) and
+            n1.isAdditional(sel, "implicit-field:" + i.toString()) and
+            n2.isAdditional(sel, "implicit-field:" + (i - 1).toString())
+          )
+          or
+          implicitFieldSelection(sel, 1, _) and
+          n1.isAdditional(sel, "implicit-field:1") and
+          n2.isIn(sel)
+          or
+          n1.isIn(sel) and n2.isAfter(sel)
+        )
       )
     }
-  }
 
-  private class SendStmtTree extends ControlFlowTree, SendStmt {
-    override predicate firstNode(ControlFlow::Node first) { firstNode(this.getChannel(), first) }
+    /**
+     * Composite literal: In(lit) -> element-init chain -> After(lit)
+     * CompositeLit evaluates the literal (allocation) first (pre-order),
+     * then initializes elements.
+     */
+    private predicate compositeLitStep(PreControlFlowNode n1, PreControlFlowNode n2) {
+      exists(Go::CompositeLit lit |
+        n1.isBefore(lit) and n2.isIn(lit)
+        or
+        n1.isIn(lit) and
+        (
+          n2.isBefore(lit.getElement(0))
+          or
+          not exists(lit.getElement(_)) and n2.isAfter(lit)
+        )
+        or
+        // Positional array/slice elements have an implicit index that is
+        // modeled on the `lit-init` instruction itself (see
+        // `IR::InitLiteralElementInstruction`) rather than as a separate node.
+        exists(int i |
+          n1.isAfter(lit.getElement(i)) and
+          n2.isAdditional(lit.getElement(i), "lit-init")
+          or
+          n1.isAdditional(lit.getElement(i), "lit-init") and
+          (
+            n2.isBefore(lit.getElement(i + 1))
+            or
+            not exists(lit.getElement(i + 1)) and n2.isAfter(lit)
+          )
+        )
+      )
+    }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      ControlFlowTree.super.lastNode(last, cmpl)
-      or
-      last = MkSendNode(this) and
-      (cmpl = Done() or cmpl = Panic())
+    private predicate rangeStmtStep(PreControlFlowNode n1, PreControlFlowNode n2) {
+      exists(Go::RangeElementExpr p |
+        // The shared `ForEachStmt` model owns the loop skeleton (testing the
+        // domain for emptiness, the `[LoopHeader]` join/branch point, and the
+        // loop exit) and routes control flow into `Before(p)` and out of
+        // `After(p)`, where `p` is the synthesized "range element" loop
+        // variable. Here we get the next key-value pair and destructure it into
+        // the key/value variables using the shared extract/assign epilogue
+        // machinery.
+        n1.isBefore(p) and n2.isAdditional(p, "next")
+        or
+        n1.isAdditional(p, "next") and
+        (
+          exists(getFirstEpilogueTag(p)) and
+          n2.isAdditional(p, getFirstEpilogueTag(p))
+          or
+          not exists(getFirstEpilogueTag(p)) and n2.isAfter(p)
+        )
+        or
+        epilogueSequenceStep(p, n1, n2)
+        or
+        n1.isAdditional(p, getLastEpilogueTag(p)) and n2.isAfter(p)
+      )
     }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      ControlFlowTree.super.succ0(pred, succ)
+    private predicate commClauseBodyStart(
+      Go::SelectStmt sel, Go::CommClause cc, PreControlFlowNode n
+    ) {
+      n.isBefore(cc.getStmt(0))
       or
-      not this = any(CommClause cc).getComm() and
-      lastNode(this.getValue(), pred, normalCompletion()) and
-      succ = MkSendNode(this)
+      not exists(cc.getStmt(0)) and n.isAfter(sel)
     }
 
-    override ControlFlowTree getChildTree(int i) {
-      i = 0 and result = this.getChannel()
+    private predicate selectCommPrepStart(Go::CommClause cc, PreControlFlowNode n) {
+      exists(Go::RecvStmt recv | recv = cc.getComm() | n.isBefore(recv.getExpr().getOperand()))
       or
-      i = 1 and result = this.getValue()
+      exists(Go::SendStmt send | send = cc.getComm() | n.isBefore(send.getChannel()))
     }
-  }
-
-  private class SliceExprTree extends ControlFlowTree, SliceExpr {
-    override predicate firstNode(ControlFlow::Node first) { firstNode(this.getBase(), first) }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      ControlFlowTree.super.lastNode(last, cmpl)
+    private predicate selectCommPrepEnd(Go::CommClause cc, PreControlFlowNode n) {
+      exists(Go::RecvStmt recv | recv = cc.getComm() | n.isAfter(recv.getExpr().getOperand()))
       or
-      // panic due to `nil` dereference
-      last = MkImplicitDeref(this.getBase()) and
-      cmpl = Panic()
-      or
-      last = MkExprNode(this) and
-      (cmpl = Done() or cmpl = Panic())
+      exists(Go::SendStmt send | send = cc.getComm() | n.isAfter(send.getValue()))
     }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      ControlFlowTree.super.succ0(pred, succ)
-      or
-      lastNode(this.getBase(), pred, normalCompletion()) and
-      (
-        succ = MkImplicitDeref(this.getBase())
-        or
-        not exists(MkImplicitDeref(this.getBase())) and
-        (firstNode(this.getLow(), succ) or succ = MkImplicitLowerSliceBound(this))
+    private predicate selectCommPrepStep(
+      Go::CommClause cc, PreControlFlowNode n1, PreControlFlowNode n2
+    ) {
+      exists(Go::SendStmt send | send = cc.getComm() |
+        n1.isAfter(send.getChannel()) and n2.isBefore(send.getValue())
       )
-      or
-      pred = MkImplicitDeref(this.getBase()) and
-      (firstNode(this.getLow(), succ) or succ = MkImplicitLowerSliceBound(this))
-      or
-      (lastNode(this.getLow(), pred, normalCompletion()) or pred = MkImplicitLowerSliceBound(this)) and
-      (firstNode(this.getHigh(), succ) or succ = MkImplicitUpperSliceBound(this))
-      or
-      (lastNode(this.getHigh(), pred, normalCompletion()) or pred = MkImplicitUpperSliceBound(this)) and
-      (firstNode(this.getMax(), succ) or succ = MkImplicitMaxSliceBound(this))
-      or
-      (lastNode(this.getMax(), pred, normalCompletion()) or pred = MkImplicitMaxSliceBound(this)) and
-      succ = MkExprNode(this)
     }
-  }
-
-  private class StarExprTree extends PostOrderTree, StarExpr {
-    override ControlFlow::Node getNode() { result = mkExprOrSkipNode(this) }
 
-    override Completion getCompletion() { result = Done() or result = Panic() }
-
-    override ControlFlowTree getChildTree(int i) { i = 0 and result = this.getBase() }
-  }
-
-  private class SwitchTree extends ControlFlowTree, SwitchStmt {
-    override predicate firstNode(ControlFlow::Node first) {
-      firstNode(this.getInit(), first)
-      or
-      not exists(this.getInit()) and
-      (
-        firstNode(this.(ExpressionSwitchStmt).getExpr(), first)
-        or
-        first = MkImplicitTrue(this)
+    /**
+     * Holds if there is a control-flow step from `n1` to `n2` for the
+     * communication operation of a comm clause of `sel` that has been selected.
+     *
+     * The channel operands (and, for a send, the value) of every clause are
+     * evaluated up front in the prep phase (see `selectCommPrepStart` and
+     * friends), and the `select` then non-deterministically dispatches to one
+     * clause via `In(sel) -> Before(cc) -> Before(comm)`. Explicit steps from
+     * the communication statement's `Before` node then skip the operands that
+     * were already evaluated during preparation and perform the selected
+     * communication.
+     */
+    private predicate selectedCommStep(
+      Go::SelectStmt sel, PreControlFlowNode n1, PreControlFlowNode n2
+    ) {
+      exists(Go::SendStmt send | send = sel.getACommClause().getComm() |
+        n1.isBefore(send) and n2.isIn(send)
         or
-        firstNode(this.(TypeSwitchStmt).getTest(), first)
+        // The send communication happens at `In(send)`; flow then continues to
+        // the clause body via `selectStmtStep`.
+        n1.isIn(send) and n2.isAfter(send)
       )
     }
 
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      lastNode(this.getInit(), last, cmpl) and
-      not cmpl.isNormal()
-      or
+    private predicate selectRecvStmtStep(
+      Go::SelectStmt sel, Go::CommClause cc, Go::RecvStmt recv, PreControlFlowNode n1,
+      PreControlFlowNode n2
+    ) {
+      cc = sel.getACommClause() and
+      recv = cc.getComm() and
       (
-        lastNode(this.(ExpressionSwitchStmt).getExpr(), last, cmpl)
+        n1.isBefore(recv) and n2.isBefore(recv.getExpr())
         or
-        lastNode(this.(TypeSwitchStmt).getTest(), last, cmpl)
-      ) and
-      (
-        not cmpl.isNormal()
+        n1.isBefore(recv.getExpr()) and n2.isIn(recv.getExpr())
         or
-        not exists(this.getDefault())
-      )
-      or
-      last = MkImplicitTrue(this) and
-      cmpl = Bool(true) and
-      this.getNumCase() = 0
-      or
-      exists(CaseClause cc, int i, Completion inner |
-        cc = this.getCase(i) and lastNode(cc, last, inner)
-      |
-        not exists(this.getDefault()) and
-        i = this.getNumCase() - 1 and
-        last = cc.(CaseClauseTree).getExprEnd(cc.getNumExpr() - 1, false) and
-        inner.isNormal() and
-        cmpl = inner
-        or
-        not last = cc.(CaseClauseTree).getExprEnd(_, _) and
-        inner.isNormal() and
-        cmpl = inner
-        or
-        if inner = Break(BranchTarget::of(this))
-        then cmpl = Done()
-        else (
-          not inner.isNormal() and inner != Fallthrough() and cmpl = inner
+        n1.isIn(recv.getExpr()) and
+        (
+          n2.isBefore(recv.getLhs(0))
+          or
+          not exists(recv.getLhs(0)) and commClauseBodyStart(sel, cc, n2)
+        )
+        or
+        exists(int j | n1.isAfter(recv.getLhs(j)) and n2.isBefore(recv.getLhs(j + 1)))
+        or
+        exists(int last | exists(recv.getLhs(last)) and not exists(recv.getLhs(last + 1)) |
+          n1.isAfter(recv.getLhs(last)) and
+          n2.isAdditional(recv, getFirstEpilogueTag(recv))
+        )
+        or
+        exists(int last | exists(recv.getLhs(last)) and not exists(recv.getLhs(last + 1)) |
+          not exists(getFirstEpilogueTag(recv)) and
+          n1.isAfter(recv.getLhs(last)) and
+          commClauseBodyStart(sel, cc, n2)
         )
+        or
+        epilogueSequenceStep(recv, n1, n2)
+        or
+        n1.isAdditional(recv, getLastEpilogueTag(recv)) and
+        commClauseBodyStart(sel, cc, n2)
       )
     }
 
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      ControlFlowTree.super.succ0(pred, succ)
-      or
-      lastNode(this.getInit(), pred, normalCompletion()) and
-      (
-        firstNode(this.(ExpressionSwitchStmt).getExpr(), succ) or
-        succ = MkImplicitTrue(this) or
-        firstNode(this.(TypeSwitchStmt).getTest(), succ)
-      )
-      or
-      (
-        lastNode(this.(ExpressionSwitchStmt).getExpr(), pred, normalCompletion()) or
-        pred = MkImplicitTrue(this) or
-        lastNode(this.(TypeSwitchStmt).getTest(), pred, normalCompletion())
-      ) and
-      (
-        firstNode(this.getNonDefaultCase(0), succ)
+    private predicate selectStmtStep(PreControlFlowNode n1, PreControlFlowNode n2) {
+      exists(Go::SelectStmt sel |
+        selectedCommStep(sel, n1, n2)
         or
-        not exists(this.getANonDefaultCase()) and
-        firstNode(this.getDefault(), succ)
-      )
-      or
-      exists(CaseClause cc, int i |
-        cc = this.getNonDefaultCase(i) and
-        lastNode(cc, pred, normalCompletion()) and
-        pred = cc.(CaseClauseTree).getExprEnd(_, false)
-      |
-        firstNode(this.getNonDefaultCase(i + 1), succ)
+        n1.isBefore(sel) and
+        (
+          selectCommPrepStart(sel.getNonDefaultCommClause(0), n2)
+          or
+          not exists(sel.getNonDefaultCommClause(0)) and n2.isIn(sel)
+        )
         or
-        i = this.getNumNonDefaultCase() - 1 and
-        firstNode(this.getDefault(), succ)
-      )
-      or
-      exists(CaseClause cc, int i, CaseClause next |
-        cc = this.getCase(i) and
-        lastNode(cc, pred, Fallthrough()) and
-        next = this.getCase(i + 1)
-      |
-        firstNode(next.getStmt(0), succ)
+        exists(Go::CommClause cc, int i | cc = sel.getNonDefaultCommClause(i) |
+          selectCommPrepStep(cc, n1, n2)
+          or
+          selectCommPrepEnd(cc, n1) and
+          (
+            selectCommPrepStart(sel.getNonDefaultCommClause(i + 1), n2)
+            or
+            not exists(sel.getNonDefaultCommClause(i + 1)) and n2.isIn(sel)
+          )
+        )
+        or
+        n1.isIn(sel) and
+        exists(Go::CommClause cc | sel.getACommClause() = cc | n2.isBefore(cc))
         or
-        succ = MkSkipNode(next)
+        exists(Go::CommClause cc | sel.getACommClause() = cc |
+          n1.isBefore(cc) and
+          (
+            n2.isBefore(cc.getComm())
+            or
+            not exists(cc.getComm()) and commClauseBodyStart(sel, cc, n2)
+          )
+          or
+          exists(Go::RecvStmt recv | selectRecvStmtStep(sel, cc, recv, n1, n2))
+          or
+          n1.isAfter(cc.getComm().(Go::SendStmt)) and commClauseBodyStart(sel, cc, n2)
+          or
+          exists(int j | n1.isAfter(cc.getStmt(j)) and n2.isBefore(cc.getStmt(j + 1)))
+          or
+          exists(int last |
+            last = max(int j | exists(cc.getStmt(j))) and
+            n1.isAfter(cc.getStmt(last)) and
+            n2.isAfter(sel)
+          )
+        )
       )
     }
-  }
 
-  private class TypeAssertTree extends PostOrderTree, TypeAssertExpr {
-    override ControlFlow::Node getNode() { result = MkExprNode(this) }
+    private predicate hasFuncDefPrologue(Go::FuncDef fd) { exists(fd.getResultVar(_)) }
 
-    override Completion getCompletion() {
-      result = Done()
+    private predicate funcDefBodyStart(Go::FuncDef fd, PreControlFlowNode n) {
+      n.isBefore(getRankedChild(fd.getBody(), 1))
       or
-      // panic due to type mismatch, but not if the assertion appears in an assignment or
-      // initialization with two variables or a type-switch
-      not exists(Assignment assgn | assgn.getNumLhs() = 2 and this = assgn.getRhs().stripParens()) and
-      not exists(ValueSpec vs | vs.getNumName() = 2 and this = vs.getInit().stripParens()) and
-      not exists(TypeSwitchStmt ts | this = ts.getExpr()) and
-      result = Panic()
+      not exists(getRankedChild(fd.getBody(), _)) and
+      n.isAdditional(fd.getBody(), "result-read:0")
     }
 
-    override ControlFlowTree getChildTree(int i) { i = 0 and result = this.getExpr() }
-  }
-
-  private class UnaryExprTree extends ControlFlowTree, UnaryExpr {
-    override predicate firstNode(ControlFlow::Node first) { firstNode(this.getOperand(), first) }
-
-    override predicate lastNode(ControlFlow::Node last, Completion cmpl) {
-      last = MkExprNode(this) and
-      (
-        cmpl = Done()
+    /**
+     * Function body flow for named result variables: `Before(body)` ->
+     * `zero-init:0` -> ... -> first statement -> ... -> `result-read:0` -> ...
+     * -> `After(body)`. Parameters precede `Before(body)` through the shared
+     * callable flow. Return and defer handling route into the result-read
+     * sequence separately; this predicate sequences its nodes and routes
+     * defer-free fall-through into it.
+     */
+    private predicate funcDefStep(PreControlFlowNode n1, PreControlFlowNode n2) {
+      exists(Go::FuncDef fd | exists(fd.getBody()) |
+        funcHasDefer(fd) and
+        not hasFuncDefPrologue(fd) and
+        n1.isBefore(fd.getBody()) and
+        n2.isBefore(getRankedChild(fd.getBody(), 1))
+        or
+        (hasFuncDefPrologue(fd) or funcHasDefer(fd)) and
+        exists(int i |
+          n1.isAfter(getRankedChild(fd.getBody(), i)) and
+          n2.isBefore(getRankedChild(fd.getBody(), i + 1))
+        )
+        or
+        n1.isBefore(fd.getBody()) and
+        exists(fd.getResultVar(0)) and
+        n2.isAdditional(fd.getBody(), "zero-init:0")
+        or
+        exists(int j | exists(fd.getResultVar(j)) |
+          n1.isAdditional(fd.getBody(), "zero-init:" + j.toString()) and
+          (
+            exists(fd.getResultVar(j + 1)) and
+            n2.isAdditional(fd.getBody(), "zero-init:" + (j + 1).toString())
+            or
+            not exists(fd.getResultVar(j + 1)) and
+            funcDefBodyStart(fd, n2)
+          )
+        )
+        or
+        exists(int j | exists(fd.getResultVar(j + 1)) |
+          n1.isAdditional(fd.getBody(), "result-read:" + j.toString()) and
+          n2.isAdditional(fd.getBody(), "result-read:" + (j + 1).toString())
+        )
+        or
+        not funcHasDefer(fd) and
+        exists(fd.getResultVar(0)) and
+        n1.isAfter(getLastRankedChild(fd.getBody())) and
+        n2.isAdditional(fd.getBody(), "result-read:0")
         or
-        this instanceof DerefExpr and cmpl = Panic()
+        exists(int j |
+          exists(fd.getResultVar(j)) and
+          not exists(fd.getResultVar(j + 1)) and
+          n1.isAdditional(fd.getBody(), "result-read:" + j.toString()) and
+          n2.isAfter(fd.getBody())
+        )
       )
     }
-
-    pragma[nomagic]
-    override predicate succ0(ControlFlow::Node pred, ControlFlow::Node succ) {
-      ControlFlowTree.super.succ0(pred, succ)
-      or
-      not this = any(RecvStmt recv).getExpr() and
-      lastNode(this.getOperand(), pred, normalCompletion()) and
-      succ = MkExprNode(this)
-    }
-  }
-
-  private ControlFlow::Node mkExprOrSkipNode(Expr e) {
-    result = MkExprNode(e) or
-    result = MkSkipNode(e)
-  }
-
-  /** Holds if evaluation of `root` may start at `first`. */
-  cached
-  predicate firstNode(ControlFlowTree root, ControlFlow::Node first) { root.firstNode(first) }
-
-  /** Holds if evaluation of `root` may complete normally after `last`. */
-  cached
-  predicate lastNode(ControlFlowTree root, ControlFlow::Node last) {
-    lastNode(root, last, normalCompletion())
   }
 
-  private predicate lastNode(ControlFlowTree root, ControlFlow::Node last, Completion cmpl) {
-    root.lastNode(last, cmpl)
-  }
+  /**
+   * Builds the CFG used to determine which `defer` statements have been registered.
+   * Only functions containing `defer` statements need this auxiliary stage.
+   */
+  private module EarlyInput2 implements Cfg1::InputSig2 {
+    predicate includeCallableEntry(Ast::Callable callable) {
+      callable = any(Go::DeferStmt stmt).getEnclosingFunction()
+    }
 
-  /** Gets a successor of `nd` that is not a `defer` node */
-  private ControlFlow::Node notDeferSucc0(ControlFlow::Node nd) {
-    not result = MkDeferNode(_) and
-    result = succ0(nd)
-  }
+    predicate beginAbruptCompletion(
+      Ast::AstNode ast, PreControlFlowNode n, AbruptCompletion c, boolean always
+    ) {
+      Input1::beginAbruptCompletion(ast, n, c, always)
+    }
 
-  /** Gets `defer` statements that can be the first defer statement after `nd` in the CFG */
-  private ControlFlow::Node nextDefer(ControlFlow::Node nd) {
-    nd = MkDeferNode(_) and
-    result = MkDeferNode(_) and
-    (
-      result = succ0(nd)
+    predicate endAbruptCompletion(Ast::AstNode ast, PreControlFlowNode n, AbruptCompletion c) {
+      Input1::endAbruptCompletion(ast, n, c)
       or
-      result = succ0(notDeferSucc0+(nd))
-    )
-  }
+      exists(Go::FuncDef fd |
+        ast = fd.getBody() and
+        c.getSuccessorType() instanceof ReturnSuccessor and
+        exists(fd.getResultVar(0)) and
+        n.isAdditional(fd.getBody(), "result-read:0")
+      )
+    }
 
-  /**
-   * Holds if the function `f` may return without panicking, exiting the process, or looping forever.
-   *
-   * This is defined conservatively, and so may also hold of a function that in fact
-   * cannot return normally, but never fails to hold of a function that can return normally.
-   */
-  cached
-  predicate mayReturnNormally(ControlFlowTree root) {
-    exists(Completion cmpl | lastNode(root, _, cmpl) and cmpl != Panic())
+    predicate step(PreControlFlowNode n1, PreControlFlowNode n2) { Input1::step(n1, n2) }
   }
 
-  /**
-   * Holds if `pred` is the node for the case `testExpr` in an expression
-   * switch statement which is switching on `switchExpr`, and `succ` is the
-   * node to be executed next if the case test succeeds.
-   */
-  cached
-  predicate isSwitchCaseTestPassingEdge(
-    ControlFlow::Node pred, ControlFlow::Node succ, Expr switchExpr, Expr testExpr
-  ) {
-    exists(ExpressionSwitchStmt ess | ess.getExpr() = switchExpr |
-      ess.getACase().(CaseClauseTree).isPassingEdge(_, pred, succ, testExpr)
-    )
-  }
+  /** Builds the final Go CFG, including deferred invocations. */
+  private module FinalInput2 implements Cfg1::InputSig2 {
+    predicate beginAbruptCompletion(
+      Ast::AstNode ast, PreControlFlowNode n, AbruptCompletion c, boolean always
+    ) {
+      Input1::beginAbruptCompletion(ast, n, c, always)
+    }
 
-  /**
-   * Gets a successor of `nd`, that is, a node that is executed after `nd`,
-   * ignoring the execution of any deferred functions when a function ends.
-   */
-  pragma[nomagic]
-  private ControlFlow::Node succ0(ControlFlow::Node nd) {
-    any(ControlFlowTree tree).succ0(nd, result)
-  }
+    predicate endAbruptCompletion(Ast::AstNode ast, PreControlFlowNode n, AbruptCompletion c) {
+      Input1::endAbruptCompletion(ast, n, c)
+    }
 
-  /** Gets a successor of `nd`, that is, a node that is executed after `nd`. */
-  cached
-  ControlFlow::Node succ(ControlFlow::Node nd) { any(ControlFlowTree tree).succ(nd, result) }
+    predicate step(PreControlFlowNode n1, PreControlFlowNode n2) {
+      Input1::step(n1, n2) or Input1::finalDeferStep(n1, n2)
+    }
+  }
 }
diff --git a/go/ql/lib/semmle/go/controlflow/Guards.qll b/go/ql/lib/semmle/go/controlflow/Guards.qll
new file mode 100644
index 000000000000..5f22dd22a9e3
--- /dev/null
+++ b/go/ql/lib/semmle/go/controlflow/Guards.qll
@@ -0,0 +1,598 @@
+/**
+ * Provides classes and predicates for reasoning about guards and the control
+ * flow elements controlled by those guards.
+ *
+ * This is an instantiation of the shared guards library for Go.
+ */
+overlay[local?]
+module;
+
+private import go
+private import semmle.go.controlflow.ControlFlowGraphImpl
+private import semmle.go.dataflow.SSA as GoSsa
+private import semmle.go.dataflow.SsaImpl as SsaImpl
+private import semmle.go.dataflow.internal.DataFlowUtil as DataFlowUtil
+private import codeql.controlflow.Guards as SharedGuards
+private import codeql.controlflow.SuccessorType
+
+private module GuardsInput implements
+  SharedGuards::InputSig<Location, CfgImpl::Cfg::ControlFlowNode, CfgImpl::Cfg::BasicBlock>
+{
+  private import go as G
+
+  class NormalExitNode = CfgImpl::ControlFlow::NormalExitNode;
+
+  class AstNode = G::AstNode;
+
+  class Expr = G::Expr;
+
+  private newtype TConstantValue = TStringValue(string s) { s = any(G::Expr e).getStringValue() }
+
+  class ConstantValue extends TConstantValue {
+    /** Gets a textual representation of this constant value. */
+    string toString() { this = TStringValue(result) }
+  }
+
+  abstract class ConstantExpr extends Expr {
+    predicate isNull() { none() }
+
+    boolean asBooleanValue() { none() }
+
+    int asIntegerValue() { none() }
+
+    ConstantValue asConstantValue() { none() }
+  }
+
+  private class NilConstant extends ConstantExpr {
+    NilConstant() {
+      exprRefersToNil(this)
+      or
+      exprRefersToNil(this.(G::ConversionExpr).getOperand().stripParens())
+    }
+
+    override predicate isNull() { any() }
+  }
+
+  private class BooleanConstant extends ConstantExpr {
+    BooleanConstant() { exists(this.getBoolValue()) }
+
+    override boolean asBooleanValue() { result = this.getBoolValue() }
+  }
+
+  private class IntegerConstant extends ConstantExpr {
+    IntegerConstant() { exists(this.getIntValue()) }
+
+    override int asIntegerValue() { result = this.getIntValue() }
+  }
+
+  private class StringConstant extends ConstantExpr {
+    StringConstant() { exists(this.getStringValue()) }
+
+    override ConstantValue asConstantValue() { result = TStringValue(this.getStringValue()) }
+  }
+
+  /**
+   * An expression that is known not to be `nil`.
+   */
+  class NonNullExpr extends Expr {
+    NonNullExpr() {
+      this instanceof G::CompositeLit
+      or
+      this instanceof G::FuncLit
+      or
+      this instanceof G::AddressExpr
+      or
+      DataFlowUtil::isCertainlyNotNil(DataFlow::exprNode(this))
+    }
+  }
+
+  /**
+   * A case clause in a tagged expression `switch` statement, or a case expression in an
+   * expressionless `switch` statement.
+   */
+  class Case extends AstNode {
+    G::ExpressionSwitchStmt switch;
+
+    Case() {
+      exists(switch.getExpr()) and
+      this = switch.getACase()
+      or
+      not exists(switch.getExpr()) and
+      (
+        this = switch.getANonDefaultCase().getAnExpr()
+        or
+        this = switch.getDefault()
+      )
+    }
+
+    Expr getSwitchExpr() {
+      result = switch.getExpr()
+      or
+      not exists(switch.getExpr()) and result = this
+    }
+
+    predicate isDefaultCase() { this = switch.getDefault() }
+
+    ConstantExpr asConstantCase() {
+      exists(G::CaseClause cc |
+        this = cc and
+        cc.getNumExpr() = 1 and
+        result = cc.getExpr(0)
+      )
+    }
+
+    predicate matchEdge(CfgImpl::Cfg::BasicBlock bb1, CfgImpl::Cfg::BasicBlock bb2) {
+      exists(Expr caseExpr |
+        caseExpr = this.(G::CaseClause).getAnExpr()
+        or
+        caseExpr = this
+      |
+        caseExpressionBranch(caseExpr, bb1,
+          any(MatchingSuccessor successor |
+            bb1.getASuccessor(successor) = bb2 and successor.getValue() = true
+          ))
+      )
+    }
+
+    predicate nonMatchEdge(CfgImpl::Cfg::BasicBlock bb1, CfgImpl::Cfg::BasicBlock bb2) {
+      exists(G::CaseClause cc, int last, Expr caseExpr |
+        cc = this and
+        last = max(int i | exists(cc.getExpr(i))) and
+        caseExpr = cc.getExpr(last)
+      |
+        caseExpressionBranch(caseExpr, bb1,
+          any(MatchingSuccessor successor |
+            bb1.getASuccessor(successor) = bb2 and successor.getValue() = false
+          ))
+      )
+      or
+      caseExpressionBranch(this, bb1,
+        any(MatchingSuccessor successor |
+          bb1.getASuccessor(successor) = bb2 and successor.getValue() = false
+        ))
+    }
+  }
+
+  additional predicate caseExpressionBranch(
+    Expr caseExpr, CfgImpl::Cfg::BasicBlock bb, MatchingSuccessor successor
+  ) {
+    exists(G::CaseClause cc, G::ExpressionSwitchStmt switch |
+      cc = switch.getACase() and
+      caseExpr = cc.getAnExpr() and
+      bb.getLastNode() = caseExpr.getControlFlowNode() and
+      exists(bb.getASuccessor(successor))
+    )
+  }
+
+  predicate equalityBranchEdge(
+    Expr left, Expr right, CfgImpl::Cfg::BasicBlock bb1, CfgImpl::Cfg::BasicBlock bb2, boolean equal
+  ) {
+    exists(G::CaseClause cc, G::ExpressionSwitchStmt switch |
+      cc = switch.getACase() and
+      left = switch.getExpr() and
+      right = cc.getAnExpr() and
+      caseExpressionBranch(right, bb1,
+        any(MatchingSuccessor successor |
+          bb1.getASuccessor(successor) = bb2 and successor.getValue() = equal
+        ))
+    )
+  }
+
+  class AndExpr = G::LandExpr;
+
+  class OrExpr = G::LorExpr;
+
+  class NotExpr = G::NotExpr;
+
+  private predicate sameNumericTypeFamily(G::NumericType source, G::NumericType target) {
+    source instanceof G::SignedIntegerType and target instanceof G::SignedIntegerType
+    or
+    source instanceof G::UnsignedIntegerType and target instanceof G::UnsignedIntegerType
+    or
+    source instanceof G::FloatType and target instanceof G::FloatType
+    or
+    source instanceof G::ComplexType and target instanceof G::ComplexType
+  }
+
+  private predicate isUpcast(G::ConversionExpr conversion) {
+    conversion.getOperand().getType().getUnderlyingType() = conversion.getType().getUnderlyingType()
+    or
+    exists(G::NumericType source, G::NumericType target |
+      source = conversion.getOperand().getType().getUnderlyingType() and
+      target = conversion.getType().getUnderlyingType() and
+      sameNumericTypeFamily(source, target) and
+      source.getSize() <= target.getSize()
+    )
+  }
+
+  /**
+   * An expression that has the same value as a specific sub-expression, that
+   * is, a parenthesized expression or an upcast.
+   */
+  class IdExpr extends Expr {
+    IdExpr() { this instanceof G::ParenExpr or isUpcast(this) }
+
+    Expr getEqualChildExpr() {
+      result = this.(G::ParenExpr).getExpr()
+      or
+      result = this.(G::ConversionExpr).getOperand()
+    }
+  }
+
+  /**
+   * Holds if `eqtest` is an equality or inequality test between `left` and
+   * `right`. The `polarity` indicates whether this is an equality test (true)
+   * or inequality test (false).
+   */
+  pragma[nomagic]
+  predicate equalityTest(Expr eqtest, Expr left, Expr right, boolean polarity) {
+    exists(G::EqualityTestExpr eq | eq = eqtest |
+      left = eq.getLeftOperand() and
+      right = eq.getRightOperand() and
+      polarity = eq.getPolarity()
+    )
+  }
+
+  /**
+   * A conditional expression. Go has no such expression, so this class is
+   * empty.
+   */
+  class ConditionalExpr extends Expr {
+    ConditionalExpr() { none() }
+
+    /** Gets the condition of this expression. */
+    Expr getCondition() { none() }
+
+    /** Gets the true branch of this expression. */
+    Expr getThen() { none() }
+
+    /** Gets the false branch of this expression. */
+    Expr getElse() { none() }
+  }
+
+  class Parameter = G::Parameter;
+
+  private int parameterPosition() { result = any(Parameter p).getIndex() }
+
+  /** A parameter position represented by an integer. */
+  class ParameterPosition extends int {
+    ParameterPosition() { this = parameterPosition() }
+  }
+
+  /** An argument position represented by an integer. */
+  class ArgumentPosition extends int {
+    ArgumentPosition() { this = parameterPosition() }
+  }
+
+  /** Holds if arguments at position `apos` match parameters at position `ppos`. */
+  overlay[caller?]
+  pragma[inline]
+  predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { ppos = apos }
+
+  private newtype TNonOverridableMethod =
+    TMethod(G::Function function, int resultIndex) {
+      exists(function.getFuncDecl()) and
+      resultIndex in [-1 .. function.getNumResult() - 1]
+    }
+
+  /**
+   * A result of a declared function or concrete method, or its normal completion.
+   *
+   * Calls are restricted separately to calls whose syntactic target is this
+   * function or method, excluding interface dispatch.
+   */
+  class NonOverridableMethod extends TNonOverridableMethod {
+    G::Function getFunction() { this = TMethod(result, _) }
+
+    int getResultIndex() { this = TMethod(_, result) }
+
+    string toString() {
+      result = this.getFunction().toString() + " result " + this.getResultIndex().toString()
+    }
+
+    int getNumParameter() { result = this.getFunction().getNumParameter() }
+
+    Parameter getParameter(ParameterPosition ppos) {
+      result = this.getFunction().getParameter(ppos)
+    }
+
+    /**
+     * Holds if every return maps one expression to each result position.
+     *
+     * Otherwise, the shared wrapper analysis would treat a partial set of
+     * return expressions as exhaustive.
+     */
+    private predicate hasOnlyPositionMappedReturns() {
+      forall(G::ReturnStmt ret | ret.getEnclosingFunction() = this.getFunction().getFuncDecl() |
+        ret.getNumExpr() = this.getFunction().getNumResult()
+      )
+    }
+
+    /** Gets an expression being returned by this function. */
+    Expr getAReturnExpr() {
+      exists(G::ReturnStmt ret |
+        this.getResultIndex() >= 0 and
+        this.hasOnlyPositionMappedReturns() and
+        ret.getEnclosingFunction() = this.getFunction().getFuncDecl() and
+        result = ret.getExpr(this.getResultIndex())
+      )
+    }
+  }
+
+  private predicate extractedCallResult(Expr use, G::CallExpr call, int resultIndex) {
+    exists(GoSsa::SsaDefinition def, IR::ExtractTupleElementInstruction extract |
+      use = def.getVariable().getAUse().(IR::EvalInstruction).getExpr() and
+      def.(GoSsa::SsaExplicitDefinition).getInstruction() = extract and
+      extract.extractsElement(IR::evalExprInstruction(call), resultIndex)
+    )
+  }
+
+  private predicate nonOverridableCall(
+    Expr resultExpr, G::CallExpr call, NonOverridableMethod method
+  ) {
+    call.getTarget() = method.getFunction() and
+    (
+      method.getResultIndex() = -1 and
+      resultExpr = call
+      or
+      method.getResultIndex() = 0 and
+      method.getFunction().getNumResult() = 1 and
+      resultExpr = call
+      or
+      method.getResultIndex() >= 0 and
+      method.getFunction().getNumResult() > 1 and
+      extractedCallResult(resultExpr, call, method.getResultIndex())
+    )
+  }
+
+  private predicate hasExplicitReceiverArgument(G::CallExpr call) {
+    call.getTarget() instanceof G::Method and
+    call.getCalleeExpr().(G::SelectorExpr).getBase() instanceof G::TypeExpr
+  }
+
+  /**
+   * Gets the receiver argument when the selector base is passed directly,
+   * without promotion or an implicit address/dereference conversion.
+   */
+  private Expr getDirectReceiverArgument(G::CallExpr call) {
+    exists(G::SelectorExpr sel, IR::MethodReadInstruction read |
+      sel = call.getCalleeExpr() and
+      read.getExpr() = sel and
+      read.getReceiver() = IR::evalExprInstruction(result) and
+      result = sel.getBase() and
+      result.getType() = call.getTarget().getParameter(-1).getType()
+    )
+  }
+
+  class NonOverridableMethodCall extends Expr {
+    NonOverridableMethodCall() { nonOverridableCall(this, _, _) }
+
+    private G::CallExpr getCall() { nonOverridableCall(this, result, _) }
+
+    NonOverridableMethod getMethod() { nonOverridableCall(this, _, result) }
+
+    Expr getArgument(ArgumentPosition apos) {
+      exists(G::CallExpr call | call = this.getCall() |
+        (
+          not hasExplicitReceiverArgument(call) and
+          (
+            apos = -1 and
+            result = getDirectReceiverArgument(call)
+            or
+            apos != -1 and
+            result = call.getArgument(apos)
+          )
+          or
+          hasExplicitReceiverArgument(call) and
+          result = call.getArgument(apos + 1)
+        ) and
+        not (
+          call.hasImplicitVarargs() and
+          apos = call.getTarget().getNumParameter() - 1
+        )
+      )
+    }
+  }
+}
+
+private module GuardsImpl = SharedGuards::Make<Location, CfgImpl::Cfg, GuardsInput>;
+
+private module LogicInput implements GuardsImpl::LogicInputSig {
+  final private class FinalSsaDefinition = GoSsa::SsaDefinition;
+
+  class SsaDefinition extends FinalSsaDefinition {
+    GuardsInput::Expr getARead() {
+      result = super.getVariable().getAUse().(IR::EvalInstruction).getExpr()
+    }
+  }
+
+  class SsaExplicitWrite extends SsaDefinition instanceof GoSsa::SsaExplicitDefinition {
+    GuardsInput::Expr getValue() { result = super.getRhs().(IR::EvalInstruction).getExpr() }
+  }
+
+  class SsaPhiDefinition extends SsaDefinition instanceof GoSsa::SsaPhiNode {
+    /** Holds if `inp` is an input to the phi node along the edge originating in `bb`. */
+    predicate hasInputFromBlock(SsaDefinition inp, BasicBlock bb) {
+      SsaImpl::phiHasInputFromBlock(this, inp, bb)
+    }
+  }
+
+  class SsaParameterInit extends SsaDefinition {
+    SsaParameterInit() {
+      this.(GoSsa::SsaExplicitDefinition).getInstruction() instanceof IR::InitParameterInstruction
+    }
+
+    GuardsInput::Parameter getParameter() {
+      this.(GoSsa::SsaExplicitDefinition).getInstruction() = IR::initParamInstruction(result)
+    }
+  }
+
+  predicate implicitReturnDefinition(GuardsInput::NonOverridableMethod method, SsaDefinition def) {
+    exists(IR::ReadResultInstruction read |
+      method.getResultIndex() >= 0 and
+      read.reads(method.getFunction().getResult(method.getResultIndex())) and
+      def.getVariable().getAUse() = read
+    )
+  }
+
+  predicate additionalSsaDefinitionValue(SsaDefinition def, GuardValue value) {
+    exists(IR::EvalImplicitInitInstruction init |
+      def.(GoSsa::SsaExplicitDefinition).getInstruction() = init and
+      value.asBooleanValue() = init.getBoolValue()
+    )
+  }
+
+  predicate relevantImplicitReturnSsaDefinition(
+    GuardsInput::NonOverridableMethod method, SsaDefinition def
+  ) {
+    method.getResultIndex() >= 0 and
+    def.getSourceVariable() = method.getFunction().getResult(method.getResultIndex())
+  }
+
+  /**
+   * Holds if `rel` evaluating to `branch` ensures that `lesser` is less than
+   * `greater`, strictly if `strict` is true.
+   */
+  private predicate comparison(
+    RelationalComparisonExpr rel, boolean branch, GuardsInput::Expr lesser,
+    GuardsInput::Expr greater, boolean strict
+  ) {
+    branch = true and
+    lesser = rel.getLesserOperand() and
+    greater = rel.getGreaterOperand() and
+    (if rel.isStrict() then strict = true else strict = false)
+    or
+    branch = false and
+    lesser = rel.getGreaterOperand() and
+    greater = rel.getLesserOperand() and
+    (if rel.isStrict() then strict = false else strict = true)
+  }
+
+  /**
+   * Holds if `guard` evaluating to `val` ensures that:
+   * `e <= k` when `upper = true`
+   * `e >= k` when `upper = false`
+   */
+  predicate rangeGuard(
+    GuardsImpl::PreGuard guard, GuardValue val, GuardsInput::Expr e, int k, boolean upper
+  ) {
+    exists(
+      RelationalComparisonExpr rel, boolean branch, GuardsInput::Expr lesser,
+      GuardsInput::Expr greater, boolean strict, int strictnessAdjustment
+    |
+      guard = rel and
+      val.asBooleanValue() = branch and
+      comparison(rel, branch, lesser, greater, strict) and
+      (if strict = true then strictnessAdjustment = 1 else strictnessAdjustment = 0)
+    |
+      // `e < k` or `e <= k`
+      e = lesser and
+      upper = true and
+      k = greater.getIntValue() - strictnessAdjustment
+      or
+      // `k < e` or `k <= e`
+      e = greater and
+      upper = false and
+      k = lesser.getIntValue() + strictnessAdjustment
+    )
+  }
+}
+
+/** An abstract value that a `Guard` may evaluate to. */
+class GuardValue = GuardsImpl::GuardValue;
+
+private module GuardsLogic = GuardsImpl::Logic<LogicInput>;
+
+/**
+ * A guard. This is an expression whose value, or a switch case whose match outcome, determines
+ * subsequent control flow.
+ */
+final class Guard extends GuardsLogic::Guard {
+  /** Gets the innermost function or file to which this guard belongs. */
+  ControlFlow::Root getRoot() { result.isRootOf(this) }
+}
+
+/**
+ * Holds if `caseExpr` is a case expression in a tagged switch and its matching edge controls
+ * `block`.
+ */
+predicate caseExpressionMatchControls(Expr caseExpr, BasicBlock block) {
+  exists(BasicBlock guard, MatchingSuccessor successor |
+    GuardsInput::caseExpressionBranch(caseExpr, guard, successor) and
+    successor.getValue() = true and
+    guard.edgeDominates(block, successor)
+  )
+}
+
+/**
+ * Provides a set of barrier nodes for a guard that validates an expression.
+ */
+module ValidationWrapper<GuardsLogic::guardChecksSig/3 guardChecks> {
+  import GuardsLogic::ValidationWrapper<guardChecks/3>
+}
+
+bindingset[this]
+private signature class ValidationParamSig;
+
+private module WithValidationParam<ValidationParamSig P> {
+  signature predicate guardChecksSig(Guard g, Expr e, GuardValue value, P param);
+}
+
+/**
+ * Provides a parameterized set of guard checks extended with wrapped invocations.
+ */
+module ParameterizedValidationWrapper<
+  ValidationParamSig P, WithValidationParam<P>::guardChecksSig/4 guardChecks0>
+{
+  private predicate guardChecksAdjusted(
+    GuardsLogic::Guard g, GuardsInput::Expr e, GuardValue value, P param
+  ) {
+    guardChecks0(g, e, value, param)
+  }
+
+  private module Wrapper = GuardsLogic::ParameterizedValidationWrapper<P, guardChecksAdjusted/4>;
+
+  /** Holds if `guard` validates `e` upon evaluating to `value`. */
+  predicate guardChecks(Guard guard, Expr e, GuardValue value, P param) {
+    Wrapper::guardChecks(guard, e, value, param)
+  }
+}
+
+/**
+ * Holds if `bb` can only be reached when the expression `e` evaluates to `b`.
+ *
+ * This is the replacement for the old
+ * `ConditionGuardNode.ensures(e, b) and ConditionGuardNode.dominates(bb)`
+ * idiom.
+ */
+overlay[caller?]
+pragma[inline]
+predicate guardEnsures(Expr e, boolean b, BasicBlock bb) { e.(Guard).controls(bb, b) }
+
+/** Holds if `guard` evaluating to `branch` ensures that `i = j` holds. */
+predicate guardEnsuresEq(Guard guard, boolean branch, DataFlow::Node i, DataFlow::Node j) {
+  guard.isEquality(i.asExpr(), j.asExpr(), branch)
+}
+
+/** Holds if `guard` evaluating to `branch` ensures that `i != j` holds. */
+predicate guardEnsuresNeq(Guard guard, boolean branch, DataFlow::Node i, DataFlow::Node j) {
+  exists(boolean eqval |
+    guard.isEquality(i.asExpr(), j.asExpr(), eqval) and
+    branch = eqval.booleanNot()
+  )
+}
+
+/**
+ * Holds if `guard` evaluating to `branch` ensures that `lesser <= greater + bias`
+ * holds.
+ */
+predicate guardEnsuresLeq(
+  Guard guard, boolean branch, DataFlow::Node lesser, DataFlow::Node greater, int bias
+) {
+  exists(DataFlow::RelationalComparisonNode rel |
+    guard = rel.asExpr() and
+    rel.leq(branch, lesser, greater, bias)
+  )
+  or
+  guardEnsuresEq(guard, branch, lesser, greater) and bias = 0
+}
diff --git a/go/ql/lib/semmle/go/controlflow/IR.qll b/go/ql/lib/semmle/go/controlflow/IR.qll
index a4c730041082..aded50ecc80c 100644
--- a/go/ql/lib/semmle/go/controlflow/IR.qll
+++ b/go/ql/lib/semmle/go/controlflow/IR.qll
@@ -7,52 +7,97 @@
  * structure or type information).
  *
  * Each instruction is also a control-flow node, but there are control-flow nodes that are not
- * instructions (synthetic entry and exit nodes, as well as no-op skip nodes).
+ * instructions (synthetic entry and exit nodes, as well as before/after nodes).
  */
 overlay[local]
 module;
 
 import go
-private import semmle.go.controlflow.ControlFlowGraphImpl
+private import ControlFlowGraphImpl
+private import codeql.controlflow.SuccessorType
 
 /** Provides predicates and classes for working with IR constructs. */
 module IR {
+  /**
+   * Holds if `n` is the control-flow node representing a successful match of
+   * the type-switch case clause `cc` that implicitly declares a variable.
+   *
+   * This node dominates the case body and is where the implicit per-case
+   * variable declaration/assignment is materialised (see
+   * `TypeSwitchImplicitVariableInstruction`).
+   */
+  private predicate typeSwitchCaseMatch(ControlFlow::Node n, CaseClause cc) {
+    cc = any(TypeSwitchStmt ts).getACase() and
+    exists(cc.getImplicitlyDeclaredVariable()) and
+    n.isAfterValue(cc, any(MatchingSuccessor t | t.isMatch()))
+  }
+
+  /**
+   * Holds if `n` records a boolean outcome, or the matching outcome of an
+   * expressionless switch case condition.
+   */
+  private predicate isConditionGuardNode(ControlFlow::Node n) {
+    n.isAfterTrue(_)
+    or
+    n.isAfterFalse(_)
+    or
+    exists(Expr condition, MatchingSuccessor successor |
+      condition =
+        any(ExpressionSwitchStmt switch | not exists(switch.getExpr())).getACase().getAnExpr() and
+      n.isAfterValue(condition, successor)
+    )
+  }
+
+  /** Gets the CFG node representing a basic literal, function literal, or plain identifier reference. */
+  cached
+  private ControlFlow::Node leafEvaluation(Expr leaf) {
+    (
+      leaf instanceof BasicLit
+      or
+      leaf instanceof FuncLit
+      or
+      leaf instanceof Ident and leaf instanceof ReferenceExpr
+    ) and
+    result.injects(leaf)
+  }
+
   /**
    * An IR instruction.
    */
   class Instruction extends ControlFlow::Node {
     Instruction() {
-      this instanceof MkExprNode or
-      this instanceof MkLiteralElementInitNode or
-      this instanceof MkImplicitLiteralElementIndex or
-      this instanceof MkAssignNode or
-      this instanceof MkCompoundAssignRhsNode or
-      this instanceof MkExtractNode or
-      this instanceof MkZeroInitNode or
-      this instanceof MkFuncDeclNode or
-      this instanceof MkDeferNode or
-      this instanceof MkGoNode or
-      this instanceof MkConditionGuardNode or
-      this instanceof MkIncDecNode or
-      this instanceof MkIncDecRhs or
-      this instanceof MkImplicitOne or
-      this instanceof MkReturnNode or
-      this instanceof MkResultWriteNode or
-      this instanceof MkResultReadNode or
-      this instanceof MkSelectNode or
-      this instanceof MkSendNode or
-      this instanceof MkParameterInit or
-      this instanceof MkArgumentNode or
-      this instanceof MkResultInit or
-      this instanceof MkNextNode or
-      this instanceof MkImplicitTrue or
-      this instanceof MkCaseCheckNode or
-      this instanceof MkTypeSwitchImplicitVariable or
-      this instanceof MkImplicitLowerSliceBound or
-      this instanceof MkImplicitUpperSliceBound or
-      this instanceof MkImplicitMaxSliceBound or
-      this instanceof MkImplicitDeref or
-      this instanceof MkImplicitFieldSelection
+      this.isIn(_)
+      or
+      this = leafEvaluation(_)
+      or
+      this.isAdditional(_, _)
+      or
+      isConditionGuardNode(this)
+      or
+      // The successful-match node of a type-switch case that binds an implicit
+      // variable hosts that variable's declaration/assignment (see
+      // `TypeSwitchImplicitVariableInstruction`).
+      typeSwitchCaseMatch(this, _)
+      or
+      // `NotExpr` and `LogicalBinaryExpr` are not in `postOrInOrder`, so they
+      // have no `isIn` node. When such an expression is not in a conditional
+      // context (so it has a single combined after-node rather than per-branch
+      // value-after-nodes), use that after-node as the value-producing
+      // instruction. In conditional contexts the value is already split
+      // across branches, so no separate value instruction is needed.
+      exists(Expr e |
+        (e instanceof NotExpr or e instanceof LogicalBinaryExpr) and
+        this.isAfter(e) and
+        not this.isAfterValue(e, _)
+      )
+      or
+      // A named parameter is represented by a single CFG node (the merged
+      // "before"/"after" leaf node for its declaration), which hosts the
+      // initialization write (see `InitParameterInstruction`).
+      this.isBefore(any(FuncDef fd).getParameter(_).getDeclaration())
+      or
+      // Function declarations are represented by their merged leaf node.
+      this.isBefore(any(FuncDecl fd))
     }
 
     /** Holds if this instruction reads the value of variable or constant `v`. */
@@ -120,78 +165,82 @@ module IR {
 
     /** Gets a textual representation of the kind of this instruction. */
     string getInsnKind() {
-      this instanceof MkExprNode and result = "expression"
-      or
-      this instanceof MkLiteralElementInitNode and result = "element init"
-      or
-      this instanceof MkImplicitLiteralElementIndex and result = "element index"
-      or
-      this instanceof MkAssignNode and result = "assignment"
-      or
-      this instanceof MkCompoundAssignRhsNode and result = "right-hand side of compound assignment"
-      or
-      this instanceof MkExtractNode and result = "tuple element extraction"
+      this instanceof EvalInstruction and result = "expression"
       or
-      this instanceof MkZeroInitNode and result = "zero value"
+      this instanceof InitLiteralComponentInstruction and result = "element init"
       or
-      this instanceof MkFuncDeclNode and result = "function declaration"
+      this instanceof AssignInstruction and result = "assignment"
       or
-      this instanceof MkDeferNode and result = "defer"
+      this instanceof EvalCompoundAssignRhsInstruction and
+      result = "right-hand side of compound assignment"
       or
-      this instanceof MkGoNode and result = "go"
+      this instanceof ExtractTupleElementInstruction and result = "tuple element extraction"
       or
-      this instanceof MkConditionGuardNode and result = "condition guard"
+      this instanceof EvalImplicitInitInstruction and result = "zero value"
       or
-      this instanceof MkIncDecNode and result = "increment/decrement"
+      this instanceof DeclareFunctionInstruction and result = "function declaration"
       or
-      this instanceof MkIncDecRhs and result = "right-hand side of increment/decrement"
+      this instanceof DeferInstruction and result = "defer"
       or
-      this instanceof MkImplicitOne and result = "implicit 1"
+      this instanceof GoInstruction and result = "go"
       or
-      this instanceof MkReturnNode and result = "return"
+      this instanceof ConditionGuardInstruction and result = "condition guard"
       or
-      this instanceof MkResultWriteNode and result = "result write"
+      this instanceof ReturnInstruction and result = "return"
       or
-      this instanceof MkResultReadNode and result = "result read"
+      this instanceof WriteResultInstruction and result = "result write"
       or
-      this instanceof MkSelectNode and result = "select"
+      this instanceof ReadResultInstruction and result = "result read"
       or
-      this instanceof MkSendNode and result = "send"
+      this instanceof InitParameterInstruction and result = "parameter initialization"
       or
-      this instanceof MkParameterInit and result = "parameter initialization"
+      this instanceof GetNextEntryInstruction and result = "next key-value pair"
       or
-      this instanceof MkArgumentNode and result = "argument"
+      this instanceof EvalImplicitTrueInstruction and result = "implicit true"
       or
-      this instanceof MkResultInit and result = "result initialization"
+      this instanceof CaseInstruction and result = "case"
       or
-      this instanceof MkNextNode and result = "next key-value pair"
-      or
-      this instanceof MkImplicitTrue and result = "implicit true"
-      or
-      this instanceof MkCaseCheckNode and result = "case"
-      or
-      this instanceof MkTypeSwitchImplicitVariable and
+      this instanceof TypeSwitchImplicitVariableInstruction and
       result = "type switch implicit variable declaration"
       or
-      this instanceof MkImplicitLowerSliceBound and result = "implicit lower bound"
-      or
-      this instanceof MkImplicitUpperSliceBound and result = "implicit upper bound"
-      or
-      this instanceof MkImplicitMaxSliceBound and result = "implicit maximum"
-      or
-      this instanceof MkImplicitDeref and result = "implicit dereference"
+      this instanceof EvalImplicitDerefInstruction and result = "implicit dereference"
       or
-      this instanceof MkImplicitFieldSelection and result = "implicit field selection"
+      this instanceof ImplicitFieldReadInstruction and result = "implicit field selection"
     }
   }
 
+  /** A condition guard instruction, representing a known boolean outcome for a condition. */
+  private class ConditionGuardInstruction extends Instruction {
+    ConditionGuardInstruction() { isConditionGuardNode(this) }
+  }
+
   /**
    * An IR instruction representing the evaluation of an expression.
    */
-  class EvalInstruction extends Instruction, MkExprNode {
+  class EvalInstruction extends Instruction {
     Expr e;
 
-    EvalInstruction() { this = MkExprNode(e) }
+    EvalInstruction() {
+      this.isIn(e)
+      or
+      this = leafEvaluation(e)
+      or
+      // The call of a `defer` statement is pre-order (it has no in-order
+      // "invocation" node at the statement), so its value is produced by the
+      // `defer-invoke` node that models the call at function exit.
+      this.isAdditional(e, "defer-invoke")
+      or
+      // Non-constant `NotExpr` and `LogicalBinaryExpr` are not in
+      // `postOrInOrder`, so they don't have an `isIn` node; their value is
+      // produced by the after-node. (Constant ones are folded and get a leaf
+      // `isIn` node via `constRoot`, handled by the first disjunct above, so
+      // they are excluded here to avoid a duplicate value node.) Value-specific
+      // after-nodes are condition guards rather than expression evaluations.
+      (e instanceof NotExpr or e instanceof LogicalBinaryExpr) and
+      not e.isConst() and
+      this.isAfter(e) and
+      not this.isAfterValue(_, _)
+    }
 
     /** Gets the expression underlying this instruction. */
     Expr getExpr() { result = e }
@@ -200,8 +249,6 @@ module IR {
 
     override Type getResultType() { result = e.getType() }
 
-    override ControlFlow::Root getRoot() { result.isRootOf(e) }
-
     override float getFloatValue() { result = e.getFloatValue() }
 
     override int getIntValue() { result = e.getIntValue() }
@@ -217,10 +264,6 @@ module IR {
     override predicate isConst() { e.isConst() }
 
     override predicate isPlatformIndependentConstant() { e.isPlatformIndependentConstant() }
-
-    override string toString() { result = e.toString() }
-
-    override Location getLocation() { result = e.getLocation() }
   }
 
   /**
@@ -236,17 +279,13 @@ module IR {
       or
       this instanceof ReadResultInstruction
       or
-      this instanceof MkImplicitFieldSelection
+      this instanceof ImplicitFieldReadInstruction
     }
   }
 
   /**
    * Gets the effective base of a selector, index or slice expression, taking implicit dereferences
    * and implicit field reads into account.
-   *
-   * For a selector expression `b.f`, this could be the implicit dereference `*b`, or the implicit
-   * field access `b.Embedded` if the field `f` is promoted from an embedded type `Embedded`, or a
-   * combination of both `*(b.Embedded)`, or simply `b` if neither case applies.
    */
   private Instruction selectorBase(Expr e) {
     exists(ImplicitFieldReadInstruction fri | fri.getSelectorExpr() = e and fri.getIndex() = 1 |
@@ -261,17 +300,15 @@ module IR {
       or
       base = e.(SliceExpr).getBase()
     |
-      result = MkImplicitDeref(base)
+      result = implicitDerefInstruction(base)
       or
-      not exists(MkImplicitDeref(base)) and
+      not exists(implicitDerefInstruction(base)) and
       result = evalExprInstruction(base)
     )
   }
 
   /**
    * An IR instruction that reads a component from a composite object.
-   *
-   * This is either a field of a struct, or an element of an array, map, slice or string.
    */
   class ComponentReadInstruction extends ReadInstruction {
     ComponentReadInstruction() {
@@ -282,7 +319,7 @@ module IR {
         not e.(SelectorExpr).getSelector() = any(Method method).getAReference()
       )
       or
-      this instanceof MkImplicitFieldSelection
+      this instanceof ImplicitFieldReadInstruction
     }
 
     /** Gets the instruction computing the base value on which the field or element is read. */
@@ -295,9 +332,6 @@ module IR {
 
   /**
    * An IR instruction that reads the value of a field.
-   *
-   * On databases with incomplete type information, method expressions may sometimes be
-   * misclassified as field reads.
    */
   class FieldReadInstruction extends ComponentReadInstruction {
     SelectorExpr e;
@@ -309,7 +343,9 @@ module IR {
       index = 0 and
       field.getAReference() = e.getSelector()
       or
-      this = MkImplicitFieldSelection(e, index, field)
+      this.(ImplicitFieldReadInstruction).getSelectorExpr() = e and
+      this.(ImplicitFieldReadInstruction).getIndex() = index and
+      this.(ImplicitFieldReadInstruction).getField() = field
     }
 
     /** Gets the `SelectorExpr` of this field read. */
@@ -332,9 +368,9 @@ module IR {
         fri.getSelectorExpr() = e and fri.getIndex() = pragma[only_bind_into](index + 1)
       ) and
       (
-        result = MkImplicitDeref(e.getBase())
+        result = implicitDerefInstruction(e.getBase())
         or
-        not exists(MkImplicitDeref(e.getBase())) and
+        not exists(implicitDerefInstruction(e.getBase())) and
         result = evalExprInstruction(e.getBase())
       )
     }
@@ -345,24 +381,49 @@ module IR {
   }
 
   /**
-   * An IR instruction for an implicit field read as part of reading a
-   * promoted field.
-   *
-   * If the field that is being implicitly read has a pointer type then this
-   * instruction represents an implicit dereference of it.
+   * An IR instruction for an implicit field read as part of reading a promoted field.
    */
-  class ImplicitFieldReadInstruction extends FieldReadInstruction, MkImplicitFieldSelection {
-    ImplicitFieldReadInstruction() { this = MkImplicitFieldSelection(e, index, field) }
+  class ImplicitFieldReadInstruction extends Instruction {
+    SelectorExpr sel;
+    int idx;
+    Field fld;
+
+    ImplicitFieldReadInstruction() {
+      this.isAdditional(sel, "implicit-field:" + idx.toString()) and
+      CfgImpl::implicitFieldSelection(sel, idx, fld)
+    }
 
-    override predicate reads(ValueEntity v) { v = field }
+    /** Gets the `SelectorExpr` for which this is an implicit field read. */
+    SelectorExpr getSelectorExpr() { result = sel }
 
-    override Type getResultType() { result = lookThroughPointerType(field.getType()) }
+    /** Gets the index of this implicit field read. */
+    int getIndex() { result = idx }
 
-    override ControlFlow::Root getRoot() { result.isRootOf(e) }
+    /** Gets the field being read. */
+    Field getField() { result = fld }
 
-    override string toString() { result = "implicit read of field " + field.toString() }
+    /** Gets the instruction computing the base value on which the field is read. */
+    Instruction getBaseInstruction() {
+      exists(ImplicitFieldReadInstruction fri |
+        fri.getSelectorExpr() = sel and fri.getIndex() = pragma[only_bind_into](idx + 1)
+      |
+        result = fri
+      )
+      or
+      not exists(ImplicitFieldReadInstruction fri |
+        fri.getSelectorExpr() = sel and fri.getIndex() = pragma[only_bind_into](idx + 1)
+      ) and
+      (
+        result = implicitDerefInstruction(sel.getBase())
+        or
+        not exists(implicitDerefInstruction(sel.getBase())) and
+        result = evalExprInstruction(sel.getBase())
+      )
+    }
 
-    override Location getLocation() { result = e.getBase().getLocation() }
+    override predicate reads(ValueEntity v) { v = fld }
+
+    override Type getResultType() { result = lookThroughPointerType(fld.getType()) }
   }
 
   /**
@@ -408,23 +469,14 @@ module IR {
     /** Gets the instruction computing the base value from which the slice is constructed. */
     Instruction getBase() { result = selectorBase(e) }
 
-    /** Gets the instruction computing the lower bound of the slice. */
-    Instruction getLow() {
-      result = evalExprInstruction(e.getLow()) or
-      result = implicitLowerSliceBoundInstruction(e)
-    }
+    /** Gets the instruction computing the lower bound of the slice, if it is explicit. */
+    Instruction getLow() { result = evalExprInstruction(e.getLow()) }
 
-    /** Gets the instruction computing the upper bound of the slice. */
-    Instruction getHigh() {
-      result = evalExprInstruction(e.getHigh()) or
-      result = implicitUpperSliceBoundInstruction(e)
-    }
+    /** Gets the instruction computing the upper bound of the slice, if it is explicit. */
+    Instruction getHigh() { result = evalExprInstruction(e.getHigh()) }
 
-    /** Gets the instruction computing the capacity of the slice. */
-    Instruction getMax() {
-      result = evalExprInstruction(e.getMax()) or
-      result = implicitMaxSliceBoundInstruction(e)
-    }
+    /** Gets the instruction computing the capacity of the slice, if it is explicit. */
+    Instruction getMax() { result = evalExprInstruction(e.getMax()) }
   }
 
   /**
@@ -463,28 +515,24 @@ module IR {
   /**
    * An IR instruction that initializes a component of a composite literal.
    */
-  class InitLiteralComponentInstruction extends WriteInstruction, MkLiteralElementInitNode {
+  class InitLiteralComponentInstruction extends WriteInstruction {
     CompositeLit lit;
-    int i;
+    int litIdx;
     Expr elt;
 
     InitLiteralComponentInstruction() {
-      this = MkLiteralElementInitNode(elt) and elt = lit.getElement(i)
+      this.isAdditional(elt, "lit-init") and
+      elt = lit.getElement(litIdx)
     }
 
     /** Gets the instruction allocating the composite literal. */
     Instruction getBase() { result = evalExprInstruction(lit) }
 
     override Instruction getRhs() {
-      result = evalExprInstruction(elt) or
+      not elt instanceof KeyValueExpr and result = evalExprInstruction(elt)
+      or
       result = evalExprInstruction(elt.(KeyValueExpr).getValue())
     }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(elt) }
-
-    override string toString() { result = "init of " + elt }
-
-    override Location getLocation() { result = elt.getLocation() }
   }
 
   /**
@@ -498,7 +546,7 @@ module IR {
     string getFieldName() {
       if elt instanceof KeyValueExpr
       then result = elt.(KeyValueExpr).getKey().(Ident).getName()
-      else pragma[only_bind_out](lit.getStructType()).hasOwnField(i, result, _, _)
+      else pragma[only_bind_out](lit.getStructType()).hasOwnField(litIdx, result, _, _)
     }
 
     /** Gets the initialized field. */
@@ -527,34 +575,30 @@ module IR {
     Instruction getIndex() {
       result = evalExprInstruction(elt.(KeyValueExpr).getKey())
       or
-      result = MkImplicitLiteralElementIndex(elt)
+      // A positional array/slice element has an implicit index. Array/slice
+      // content flow is index-insensitive, so rather than materialise a
+      // separate index node the element-init instruction acts as its own
+      // (opaque) index.
+      not elt instanceof KeyValueExpr and result = this
     }
   }
 
-  /**
-   * An IR instruction that initializes an element of an array literal.
-   */
+  /** An IR instruction that initializes an element of an array literal. */
   class InitLiteralArrayElementInstruction extends InitLiteralElementInstruction {
     override ArrayType literalType;
   }
 
-  /**
-   * An IR instruction that initializes an element of a slice literal.
-   */
+  /** An IR instruction that initializes an element of a slice literal. */
   class InitLiteralSliceElementInstruction extends InitLiteralElementInstruction {
     override SliceType literalType;
   }
 
-  /**
-   * An IR instruction that initializes an element of a map literal.
-   */
+  /** An IR instruction that initializes an element of a map literal. */
   class InitLiteralMapElementInstruction extends InitLiteralElementInstruction {
     override MapType literalType;
   }
 
-  /**
-   * An IR instruction that writes to a field.
-   */
+  /** An IR instruction that writes to a field. */
   class FieldWriteInstruction extends WriteInstruction {
     override FieldTarget lhs;
 
@@ -565,93 +609,44 @@ module IR {
     Field getField() { result = lhs.getField() }
 
     override predicate writesField(Instruction base, Field f, Instruction rhs) {
-      this.getBase() = base and
-      this.getField() = f and
-      this.getRhs() = rhs
+      this.getBase() = base and this.getField() = f and this.getRhs() = rhs
     }
   }
 
-  /**
-   * An IR instruction that writes to an element of an array, slice, or map.
-   */
+  /** An IR instruction that writes to an element of an array, slice, or map. */
   class ElementWriteInstruction extends WriteInstruction {
     override ElementTarget lhs;
 
-    /** Gets the instruction computing the base value on which the field is written. */
+    /** Gets the instruction computing the base value on which the element is written. */
     Instruction getBase() { result = lhs.getBase() }
 
     /** Gets the instruction computing the element index being written. */
     Instruction getIndex() { result = lhs.getIndex() }
 
     override predicate writesElement(Instruction base, Instruction index) {
-      this.getBase() = base and
-      this.getIndex() = index
+      this.getBase() = base and this.getIndex() = index
     }
   }
 
-  /** Holds if `lit` does not specify any explicit keys. */
-  private predicate noExplicitKeys(CompositeLit lit) {
-    not lit.getAnElement() instanceof KeyValueExpr
-  }
-
-  /** Gets the index of the `i`th element in (array or slice) literal `lit`. */
-  private int getElementIndex(CompositeLit lit, int i) {
-    (
-      lit.getType().getUnderlyingType() instanceof ArrayType or
-      lit.getType().getUnderlyingType() instanceof SliceType
-    ) and
-    exists(Expr elt | elt = lit.getElement(i) |
-      // short-circuit computation for literals without any explicit keys
-      noExplicitKeys(lit) and result = i
-      or
-      result = elt.(KeyValueExpr).getKey().getIntValue()
-      or
-      not elt instanceof KeyValueExpr and
-      (
-        i = 0 and result = 0
-        or
-        result = getElementIndex(lit, i - 1) + 1
-      )
-    )
-  }
-
-  /**
-   * An IR instruction computing the implicit index of an element in an array or slice literal.
-   */
-  class ImplicitLiteralElementIndexInstruction extends Instruction, MkImplicitLiteralElementIndex {
-    Expr elt;
-
-    ImplicitLiteralElementIndexInstruction() { this = MkImplicitLiteralElementIndex(elt) }
-
-    override Type getResultType() { result instanceof IntType }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(elt) }
-
-    override int getIntValue() {
-      exists(CompositeLit lit, int i | elt = lit.getElement(i) | result = getElementIndex(lit, i))
-    }
-
-    override string getStringValue() { none() }
-
-    override string getExactValue() { result = this.getIntValue().toString() }
-
-    override predicate isPlatformIndependentConstant() { any() }
-
-    override predicate isConst() { any() }
-
-    override string toString() { result = "element index" }
-
-    override Location getLocation() { result = elt.getLocation() }
-  }
-
   /**
    * An instruction assigning to a variable or field.
    */
-  class AssignInstruction extends WriteInstruction, MkAssignNode {
+  class AssignInstruction extends WriteInstruction {
     AstNode assgn;
     int i;
 
-    AssignInstruction() { this = MkAssignNode(assgn, i) }
+    AssignInstruction() {
+      this.isAdditional(assgn, "assign:" + i.toString()) and
+      (
+        exists(assgn.(Assignment).getLhs(i))
+        or
+        // A `ValueSpec` without an initializer (`var x int`) is written by its
+        // `zero-init` node directly (see `EvalImplicitInitInstruction`), so only
+        // specs *with* an initializer produce an `assign` node.
+        exists(assgn.(ValueSpec).getNameExpr(i)) and
+        exists(assgn.(ValueSpec).getAnInit())
+      )
+    }
 
     override Instruction getRhs() {
       exists(SimpleAssignStmt a | a = assgn |
@@ -662,52 +657,70 @@ module IR {
       exists(ValueSpec spec | spec = assgn |
         spec.getNumName() = spec.getNumInit() and
         result = evalExprInstruction(spec.getInit(i))
-        or
-        result = MkZeroInitNode(any(ValueEntity v | spec.getNameExpr(i) = v.getDeclaration()))
       )
-      or
-      result = MkCompoundAssignRhsNode(assgn)
-      or
-      result = MkExtractNode(assgn, i)
     }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(assgn) }
-
-    override string toString() { result = "assignment to " + this.getLhs() }
-
-    override Location getLocation() { result = this.getLhs().getLocation() }
   }
 
-  /** An instruction computing the value of the right-hand side of a compound assignment. */
-  class EvalCompoundAssignRhsInstruction extends Instruction, MkCompoundAssignRhsNode {
-    CompoundAssignStmt assgn;
-
-    EvalCompoundAssignRhsInstruction() { this = MkCompoundAssignRhsNode(assgn) }
+  /**
+   * An instruction that computes the (implicit) right-hand side of a compound
+   * assignment (the `x + y` in `x += y`) or an increment/decrement (the
+   * `x + 1` in `x++`), and writes the resulting value to the left-hand side.
+   */
+  class EvalCompoundAssignRhsInstruction extends WriteInstruction {
+    AstNode s;
 
-    /** Gets the underlying assignment of this instruction. */
-    CompoundAssignStmt getAssignment() { result = assgn }
+    EvalCompoundAssignRhsInstruction() {
+      this.isIn(s) and
+      (s instanceof CompoundAssignStmt or s instanceof IncDecStmt)
+    }
 
-    override Type getResultType() { result = assgn.getRhs().getType() }
+    /** Gets the corresponding compound assignment statement, if it is one. */
+    CompoundAssignStmt getAssignment() { result = s }
 
-    override ControlFlow::Root getRoot() { result.isRootOf(assgn) }
+    /**
+     * Gets the corresponding compound assignment (`x += y`) or increment/decrement
+     * (`x++`, `x--`) statement.
+     */
+    AstNode getStmt() { result = s }
 
-    override string toString() { result = assgn.toString() }
+    override Instruction getRhs() { result = this }
 
-    override Location getLocation() { result = assgn.getLocation() }
+    override Type getResultType() {
+      result = s.(CompoundAssignStmt).getRhs().getType()
+      or
+      result = s.(IncDecStmt).getOperand().getType()
+    }
   }
 
-  /**
-   * An instruction selecting one of multiple values returned by a function, or either the key
-   * or the value of the iterator in a range loop, or the result or success value from a type
-   * assertion.
-   */
-  class ExtractTupleElementInstruction extends Instruction, MkExtractNode {
+  /** An instruction extracting a component of a tuple value. */
+  class ExtractTupleElementInstruction extends Instruction {
     AstNode s;
     int i;
 
-    ExtractTupleElementInstruction() { this = MkExtractNode(s, i) }
+    ExtractTupleElementInstruction() {
+      this.isAdditional(s, "extract:" + i.toString()) and
+      (
+        exists(s.(Assignment).getLhs(i))
+        or
+        exists(s.(ValueSpec).getNameExpr(i))
+        or
+        s instanceof RangeElementExpr and i in [0, 1]
+        or
+        exists(s.(ReturnStmt).getEnclosingFunction().getType().(SignatureType).getResultType(i))
+        or
+        exists(
+          s.(CallExpr)
+              .getArgument(0)
+              .stripParens()
+              .(CallExpr)
+              .getType()
+              .(TupleType)
+              .getComponentType(i)
+        )
+      )
+    }
 
-    /** Gets the instruction computing the tuple value from which one value is extracted. */
+    /** Gets the instruction computing the tuple value from which the element is extracted. */
     Instruction getBase() {
       exists(Expr baseExpr |
         baseExpr = s.(Assignment).getRhs() or
@@ -716,14 +729,14 @@ module IR {
         result = evalExprInstruction(baseExpr)
       )
       or
-      result = MkNextNode(s)
+      result.(GetNextEntryInstruction).isAdditional(s, "next")
       or
       result = evalExprInstruction(s.(ReturnStmt).getExpr())
       or
       result = evalExprInstruction(s.(CallExpr).getArgument(0).stripParens())
     }
 
-    /** Holds if this extracts the `idx`th value of the result of `base`. */
+    /** Holds if this instruction extracts element `idx` from the tuple `base`. */
     predicate extractsElement(Instruction base, int idx) { base = this.getBase() and idx = i }
 
     override Type getResultType() {
@@ -731,62 +744,81 @@ module IR {
         result = e.getType().(TupleType).getComponentType(pragma[only_bind_into](i))
       )
       or
-      exists(Type rangeType | rangeType = s.(RangeStmt).getDomain().getType().getUnderlyingType() |
+      exists(Type rangeType |
+        rangeType = s.(RangeElementExpr).getDomain().getType().getUnderlyingType()
+      |
         exists(Type baseType |
           baseType = rangeType.(ArrayType).getElementType() or
           baseType =
             rangeType.(PointerType).getBaseType().getUnderlyingType().(ArrayType).getElementType() or
           baseType = rangeType.(SliceType).getElementType()
         |
-          i = 0 and
-          result instanceof IntType
+          i = 0 and result instanceof IntType
           or
-          i = 1 and
-          result = baseType
+          i = 1 and result = baseType
         )
         or
         rangeType instanceof StringType and
         (
-          i = 0 and
-          result instanceof IntType
+          i = 0 and result instanceof IntType
           or
           result = Builtin::rune().getType()
         )
         or
         exists(MapType map | map = rangeType |
-          i = 0 and
-          result = map.getKeyType()
+          i = 0 and result = map.getKeyType()
           or
-          i = 1 and
-          result = map.getValueType()
+          i = 1 and result = map.getValueType()
         )
         or
-        i = 0 and
-        result = rangeType.(RecvChanType).getElementType()
+        i = 0 and result = rangeType.(RecvChanType).getElementType()
         or
-        i = 0 and
-        result = rangeType.(SendRecvChanType).getElementType()
+        i = 0 and result = rangeType.(SendRecvChanType).getElementType()
       )
     }
+  }
 
-    override ControlFlow::Root getRoot() { result.isRootOf(s) }
-
-    override string toString() { result = s + "[" + i + "]" }
-
-    override Location getLocation() { result = s.getLocation() }
+  /**
+   * An `ExtractTupleElementInstruction` that also writes the extracted component
+   * to a left-hand side, as in a tuple-destructuring assignment (`x, y = f()`),
+   * a multi-variable declaration (`var x, y = f()`), or a `range` statement
+   * (`k, v := range m`).
+   *
+   * The extraction node performs the write directly, rather than feeding a
+   * separate `assign` node.
+   */
+  class ExtractWriteInstruction extends WriteInstruction, ExtractTupleElementInstruction {
+    override Instruction getRhs() { result = this }
   }
 
   /**
-   * An instruction that computes the zero value for a variable or constant.
+   * An instruction initializing a variable declared without an initializer
+   * (a local `var x int`, or a named function result) to its zero value.
+   *
+   * The zero-value instruction performs the write of the variable directly,
+   * rather than feeding a separate write node.
    */
-  class EvalImplicitInitInstruction extends Instruction, MkZeroInitNode {
+  class EvalImplicitInitInstruction extends WriteInstruction {
     ValueEntity v;
 
-    EvalImplicitInitInstruction() { this = MkZeroInitNode(v) }
+    EvalImplicitInitInstruction() {
+      exists(ValueSpec spec, int idx |
+        this.isAdditional(spec, "zero-init:" + idx.toString()) and
+        spec.getNameExpr(idx) = v.getDeclaration()
+      )
+      or
+      exists(FuncDef fd, int idx |
+        this.isAdditional(fd.getBody(), "zero-init:" + idx.toString()) and
+        v = fd.getResultVar(idx)
+      )
+    }
+
+    override Instruction getRhs() { result = this }
 
-    override Type getResultType() { result = v.getType() }
+    /** Gets the variable (a local or a named result) being zero-initialized. */
+    ValueEntity getVariable() { result = v }
 
-    override ControlFlow::Root getRoot() { result.isRootOf(v.getDeclaration()) }
+    override Type getResultType() { result = v.getType() }
 
     override int getIntValue() {
       v.getType().getUnderlyingType() instanceof IntegerType and result = 0
@@ -814,136 +846,46 @@ module IR {
     override predicate isConst() { any() }
 
     override predicate isPlatformIndependentConstant() { any() }
-
-    override string toString() { result = "zero value for " + v }
-
-    override Location getLocation() { result = v.getDeclaration().getLocation() }
   }
 
-  /**
-   * An instruction that corresponds to the declaration of a function.
-   */
-  class DeclareFunctionInstruction extends Instruction, MkFuncDeclNode {
+  /** An instruction that declares a function. */
+  class DeclareFunctionInstruction extends Instruction {
     FuncDecl fd;
 
-    DeclareFunctionInstruction() { this = MkFuncDeclNode(fd) }
+    DeclareFunctionInstruction() { this.isBefore(fd) }
 
     override Type getResultType() { result = fd.getType() }
-
-    override string toString() { result = fd.toString() }
-
-    override Location getLocation() { result = fd.getLocation() }
   }
 
-  /**
-   * An instruction that corresponds to a `defer` statement.
-   */
-  class DeferInstruction extends Instruction, MkDeferNode {
+  /** An instruction that corresponds to a `defer` statement. */
+  class DeferInstruction extends Instruction {
     DeferStmt defer;
 
-    DeferInstruction() { this = MkDeferNode(defer) }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(defer) }
-
-    override string toString() { result = defer.toString() }
-
-    override Location getLocation() { result = defer.getLocation() }
+    DeferInstruction() { this.isIn(defer) }
   }
 
-  /**
-   * An instruction that corresponds to a `go` statement.
-   */
-  class GoInstruction extends Instruction, MkGoNode {
+  /** An instruction that corresponds to a `go` statement. */
+  class GoInstruction extends Instruction {
     GoStmt go;
 
-    GoInstruction() { this = MkGoNode(go) }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(go) }
-
-    override string toString() { result = go.toString() }
-
-    override Location getLocation() { result = go.getLocation() }
-  }
-
-  /**
-   * An instruction that corresponds to an increment or decrement statement.
-   */
-  class IncDecInstruction extends WriteInstruction, MkIncDecNode {
-    IncDecStmt ids;
-
-    IncDecInstruction() { this = MkIncDecNode(ids) }
-
-    override Instruction getRhs() { result = MkIncDecRhs(ids) }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(ids) }
-
-    override string toString() { result = ids.toString() }
-
-    override Location getLocation() { result = ids.getLocation() }
-  }
-
-  /**
-   * An instruction that computes the (implicit) right-hand side of an increment or
-   * decrement statement.
-   */
-  class EvalIncDecRhsInstruction extends Instruction, MkIncDecRhs {
-    IncDecStmt ids;
-
-    EvalIncDecRhsInstruction() { this = MkIncDecRhs(ids) }
-
-    /** Gets the corresponding increment or decrement statement. */
-    IncDecStmt getStmt() { result = ids }
-
-    override Type getResultType() { result = ids.getOperand().getType() }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(ids) }
-
-    override string toString() { result = "rhs of " + ids }
-
-    override Location getLocation() { result = ids.getLocation() }
-  }
-
-  /**
-   * An instruction computing the implicit operand `1` in an increment or decrement statement.
-   */
-  class EvalImplicitOneInstruction extends Instruction, MkImplicitOne {
-    IncDecStmt ids;
-
-    EvalImplicitOneInstruction() { this = MkImplicitOne(ids) }
-
-    /** Gets the corresponding increment or decrement statement. */
-    IncDecStmt getStmt() { result = ids }
-
-    override Type getResultType() { result = ids.getOperand().getType() }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(ids) }
-
-    override int getIntValue() { result = 1 }
-
-    override string getExactValue() { result = "1" }
-
-    override predicate isConst() { any() }
-
-    override predicate isPlatformIndependentConstant() { any() }
-
-    override string toString() { result = "1" }
-
-    override Location getLocation() { result = ids.getLocation() }
+    GoInstruction() { this.isIn(go) }
   }
 
-  /**
-   * An instruction corresponding to a return from a function.
-   */
-  class ReturnInstruction extends Instruction, MkReturnNode {
+  /** An instruction corresponding to a return from a function. */
+  class ReturnInstruction extends Instruction {
     ReturnStmt ret;
 
-    ReturnInstruction() { this = MkReturnNode(ret) }
+    ReturnInstruction() { this.isIn(ret) }
 
     /** Gets the corresponding `ReturnStmt`. */
     ReturnStmt getReturnStmt() { result = ret }
 
     /** Holds if this statement returns multiple results. */
-    predicate returnsMultipleResults() { exists(MkExtractNode(ret, _)) or ret.getNumExpr() > 1 }
+    predicate returnsMultipleResults() {
+      exists(ExtractTupleElementInstruction ext | ext.isAdditional(ret, _))
+      or
+      ret.getNumExpr() > 1
+    }
 
     /** Gets the instruction whose result is the (unique) result returned by this statement. */
     Instruction getResult() {
@@ -953,182 +895,96 @@ module IR {
 
     /** Gets the instruction whose result is the `i`th result returned by this statement. */
     Instruction getResult(int i) {
-      result = MkExtractNode(ret, i)
+      result.isAdditional(ret, _) and
+      result.(ExtractTupleElementInstruction).extractsElement(_, i)
       or
-      not exists(MkExtractNode(ret, _)) and
+      not exists(ExtractTupleElementInstruction ext | ext.isAdditional(ret, _)) and
       result = evalExprInstruction(ret.getExpr(i))
     }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(ret) }
-
-    override string toString() { result = ret.toString() }
-
-    override Location getLocation() { result = ret.getLocation() }
   }
 
   /**
    * An instruction that represents the implicit assignment to a result variable
    * performed by a return statement.
    */
-  class WriteResultInstruction extends WriteInstruction, MkResultWriteNode {
+  class WriteResultInstruction extends WriteInstruction {
     ResultVariable var;
-    int i;
-    ReturnInstruction ret;
+    int idx;
+    ReturnStmt retStmt;
 
     WriteResultInstruction() {
-      exists(ReturnStmt retstmt |
-        this = MkResultWriteNode(var, i, retstmt) and
-        ret = MkReturnNode(retstmt)
-      )
+      this.isAdditional(retStmt, "result-write:" + idx.toString()) and
+      var = retStmt.getEnclosingFunction().getResultVar(idx) and
+      exists(retStmt.getAnExpr())
     }
 
-    override Instruction getRhs() { result = ret.getResult(i) }
+    private ReturnInstruction getReturnInstruction() { result.getReturnStmt() = retStmt }
+
+    override Instruction getRhs() { result = this.getReturnInstruction().getResult(idx) }
 
     /** Gets the result variable being assigned. */
     ResultVariable getResultVariable() { result = var }
 
     override Type getResultType() { result = var.getType() }
-
-    override ControlFlow::Root getRoot() { var = result.(FuncDef).getAResultVar() }
-
-    override string toString() { result = "implicit write of " + var }
-
-    override Location getLocation() { result = ret.getResult(i).getLocation() }
   }
 
   /**
    * An instruction that reads the final value of a result variable upon returning
    * from a function.
    */
-  class ReadResultInstruction extends Instruction, MkResultReadNode {
+  class ReadResultInstruction extends Instruction {
     ResultVariable var;
+    int idx;
+    FuncDef fd;
 
-    ReadResultInstruction() { this = MkResultReadNode(var) }
+    ReadResultInstruction() {
+      this.isAdditional(fd.getBody(), "result-read:" + idx.toString()) and
+      var = fd.getResultVar(idx)
+    }
 
     override predicate reads(ValueEntity v) { v = var }
 
     override Type getResultType() { result = var.getType() }
-
-    override ControlFlow::Root getRoot() { var = result.(FuncDef).getAResultVar() }
-
-    override string toString() { result = "implicit read of " + var }
-
-    override Location getLocation() { result = var.getDeclaration().getLocation() }
-  }
-
-  /**
-   * An instruction corresponding to a `select` statement.
-   */
-  class SelectInstruction extends Instruction, MkSelectNode {
-    SelectStmt sel;
-
-    SelectInstruction() { this = MkSelectNode(sel) }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(sel) }
-
-    override string toString() { result = sel.toString() }
-
-    override Location getLocation() { result = sel.getLocation() }
-  }
-
-  /**
-   * An instruction corresponding to a send statement.
-   */
-  class SendInstruction extends Instruction, MkSendNode {
-    SendStmt send;
-
-    SendInstruction() { this = MkSendNode(send) }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(send) }
-
-    override string toString() { result = send.toString() }
-
-    override Location getLocation() { result = send.getLocation() }
   }
 
-  /**
-   * An instruction initializing a parameter to the corresponding argument.
-   */
-  class InitParameterInstruction extends WriteInstruction, MkParameterInit {
+  /** An instruction initializing a parameter to the corresponding argument. */
+  class InitParameterInstruction extends WriteInstruction {
     Parameter parm;
+    int idx;
+    FuncDef fd;
 
-    InitParameterInstruction() { this = MkParameterInit(parm) }
-
-    override Instruction getRhs() { result = MkArgumentNode(parm) }
-
-    override ControlFlow::Root getRoot() { result = parm.getFunction() }
-
-    override string toString() { result = "initialization of " + parm }
-
-    override Location getLocation() { result = parm.getDeclaration().getLocation() }
-  }
-
-  /**
-   * An instruction reading the value of a function argument.
-   */
-  class ReadArgumentInstruction extends Instruction, MkArgumentNode {
-    Parameter parm;
+    InitParameterInstruction() {
+      this.isBefore(parm.getDeclaration()) and
+      parm = fd.getParameter(idx)
+    }
 
-    ReadArgumentInstruction() { this = MkArgumentNode(parm) }
+    override Instruction getRhs() { result = this }
 
     override Type getResultType() { result = parm.getType() }
-
-    override ControlFlow::Root getRoot() { result = parm.getFunction() }
-
-    override string toString() { result = "argument corresponding to " + parm }
-
-    override Location getLocation() { result = parm.getDeclaration().getLocation() }
-  }
-
-  /**
-   * An instruction initializing a result variable to its zero value.
-   */
-  class InitResultInstruction extends WriteInstruction, MkResultInit {
-    ResultVariable res;
-
-    InitResultInstruction() { this = MkResultInit(res) }
-
-    override Instruction getRhs() { result = MkZeroInitNode(res) }
-
-    override ControlFlow::Root getRoot() { result = res.getFunction() }
-
-    override string toString() { result = "initialization of " + res }
-
-    override Location getLocation() { result = res.getDeclaration().getLocation() }
   }
 
-  /**
-   * An instruction that gets the next key-value pair in a range loop.
-   */
-  class GetNextEntryInstruction extends Instruction, MkNextNode {
-    RangeStmt rs;
+  /** An instruction that gets the next key-value pair in a range loop. */
+  class GetNextEntryInstruction extends Instruction {
+    RangeElementExpr p;
 
-    GetNextEntryInstruction() { this = MkNextNode(rs) }
+    GetNextEntryInstruction() { this.isAdditional(p, "next") }
 
     /**
      * Gets the instruction computing the value whose key-value pairs this instruction reads.
      */
-    Instruction getDomain() { result = evalExprInstruction(rs.getDomain()) }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(rs) }
-
-    override string toString() { result = "next key-value pair in range" }
-
-    override Location getLocation() { result = rs.getDomain().getLocation() }
+    Instruction getDomain() { result = evalExprInstruction(p.getDomain()) }
   }
 
   /**
    * An instruction computing the implicit `true` value in an expression-less `switch` statement.
    */
-  class EvalImplicitTrueInstruction extends Instruction, MkImplicitTrue {
-    Stmt stmt;
+  class EvalImplicitTrueInstruction extends Instruction {
+    ExpressionSwitchStmt stmt;
 
-    EvalImplicitTrueInstruction() { this = MkImplicitTrue(stmt) }
+    EvalImplicitTrueInstruction() { this.isAdditional(stmt, "implicit-true") }
 
     override Type getResultType() { result instanceof BoolType }
 
-    override ControlFlow::Root getRoot() { result.isRootOf(stmt) }
-
     override boolean getBoolValue() { result = true }
 
     override string getExactValue() { result = "true" }
@@ -1136,153 +992,45 @@ module IR {
     override predicate isConst() { any() }
 
     override predicate isPlatformIndependentConstant() { any() }
-
-    override string toString() { result = "true" }
-
-    override Location getLocation() { result = stmt.getLocation() }
   }
 
   /**
    * An instruction corresponding to the implicit comparison or type check performed by an
    * expression in a `case` clause.
-   *
-   * For example, consider this `switch` statement:
-   *
-   * ```go
-   * switch x {
-   * case 2, y+1:
-   *   ...
-   * }
-   * ```
-   *
-   * The expressions `2` and `y+1` are implicitly compared to `x`. These comparisons are
-   * represented by case instructions.
    */
-  class CaseInstruction extends Instruction, MkCaseCheckNode {
+  class CaseInstruction extends Instruction {
     CaseClause cc;
     int i;
 
-    CaseInstruction() { this = MkCaseCheckNode(cc, i) }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(cc) }
-
-    override string toString() { result = "case " + cc.getExpr(i) }
-
-    override Location getLocation() { result = cc.getExpr(i).getLocation() }
+    CaseInstruction() {
+      this.isAdditional(cc, "case-check:" + i.toString()) and
+      exists(cc.getExpr(i))
+    }
   }
 
   /**
-   * An instruction corresponding to the implicit declaration of the variable
-   * `lv` in case clause `cc` and its assignment of the value `switchExpr` from
-   * the guard. This only occurs in case clauses in a type switch statement
-   * which declares a variable in its guard.
-   *
-   * For example, consider this type switch statement:
-   *
-   * ```go
-   * switch y := x.(type) {
-   * case Type1:
-   *   f(y)
-   *   ...
-   * }
-   * ```
-   *
-   * The `y` inside the case clause is actually a local variable with type
-   * `Type1` that is implicitly declared at the top of the case clause. In
-   * default clauses and case clauses which list more than one type, the type
-   * of the implicitly declared variable is the type of `switchExpr`.
+   * An instruction corresponding to the implicit declaration and assignment of a variable
+   * in a type switch case clause.
    */
-  class TypeSwitchImplicitVariableInstruction extends Instruction, MkTypeSwitchImplicitVariable {
+  class TypeSwitchImplicitVariableInstruction extends Instruction {
     CaseClause cc;
-    LocalVariable lv;
-    Expr switchExpr;
 
-    TypeSwitchImplicitVariableInstruction() {
-      this = MkTypeSwitchImplicitVariable(cc, lv, switchExpr)
-    }
+    TypeSwitchImplicitVariableInstruction() { typeSwitchCaseMatch(this, cc) }
 
     override predicate writes(ValueEntity v, Instruction rhs) {
-      v = lv and
-      rhs = evalExprInstruction(switchExpr)
+      v = cc.getImplicitlyDeclaredVariable() and
+      exists(TypeSwitchStmt ts | cc = ts.getACase() | rhs = evalExprInstruction(ts.getExpr()))
     }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(cc) }
-
-    override string toString() { result = "implicit type switch variable declaration" }
-
-    override Location getLocation() { result = cc.getLocation() }
   }
 
   /**
-   * An instruction computing the implicit lower slice bound of zero in a slice expression without
-   * an explicit lower bound.
+   * An instruction computing the implicit dereference of a pointer used as the base of a field
+   * or method access, element access, or slice expression.
    */
-  class EvalImplicitLowerSliceBoundInstruction extends Instruction, MkImplicitLowerSliceBound {
-    SliceExpr slice;
-
-    EvalImplicitLowerSliceBoundInstruction() { this = MkImplicitLowerSliceBound(slice) }
-
-    override Type getResultType() { result instanceof IntType }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(slice) }
-
-    override int getIntValue() { result = 0 }
-
-    override string getExactValue() { result = "0" }
-
-    override predicate isConst() { any() }
-
-    override predicate isPlatformIndependentConstant() { any() }
-
-    override string toString() { result = "0" }
-
-    override Location getLocation() { result = slice.getLocation() }
-  }
-
-  /**
-   * An instruction computing the implicit upper slice bound in a slice expression without an
-   * explicit upper bound.
-   */
-  class EvalImplicitUpperSliceBoundInstruction extends Instruction, MkImplicitUpperSliceBound {
-    SliceExpr slice;
-
-    EvalImplicitUpperSliceBoundInstruction() { this = MkImplicitUpperSliceBound(slice) }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(slice) }
-
-    override Type getResultType() { result instanceof IntType }
-
-    override string toString() { result = "len" }
-
-    override Location getLocation() { result = slice.getLocation() }
-  }
-
-  /**
-   * An instruction computing the implicit maximum slice bound in a slice expression without an
-   * explicit maximum bound.
-   */
-  class EvalImplicitMaxSliceBoundInstruction extends Instruction, MkImplicitMaxSliceBound {
-    SliceExpr slice;
-
-    EvalImplicitMaxSliceBoundInstruction() { this = MkImplicitMaxSliceBound(slice) }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(slice) }
-
-    override Type getResultType() { result instanceof IntType }
-
-    override string toString() { result = "cap" }
-
-    override Location getLocation() { result = slice.getLocation() }
-  }
-
-  /**
-   * An instruction implicitly dereferencing the base in a field or method reference through a
-   * pointer, or the base in an element or slice reference through a pointer.
-   */
-  class EvalImplicitDerefInstruction extends Instruction, MkImplicitDeref {
+  class EvalImplicitDerefInstruction extends Instruction {
     Expr e;
 
-    EvalImplicitDerefInstruction() { this = MkImplicitDeref(e) }
+    EvalImplicitDerefInstruction() { this.isAdditional(e, "implicit-deref") }
 
     /** Gets the operand that is being dereferenced. */
     Expr getOperand() { result = e }
@@ -1290,14 +1038,78 @@ module IR {
     override Type getResultType() {
       result = e.getType().getUnderlyingType().(PointerType).getBaseType()
     }
-
-    override ControlFlow::Root getRoot() { result.isRootOf(e) }
-
-    override string toString() { result = "implicit dereference" }
-
-    override Location getLocation() { result = e.getLocation() }
   }
 
+  /** A representation of the target of a write instruction. */
+  cached
+  newtype TWriteTarget =
+    /** A left-hand side of an assignment. */
+    MkLhs(ControlFlow::Node write, Expr lhs) {
+      exists(AstNode assgn, int i | write.isAdditional(assgn, "assign:" + i.toString()) |
+        lhs = assgn.(Assignment).getLhs(i).stripParens()
+        or
+        lhs = assgn.(ValueSpec).getNameExpr(i)
+        or
+        exists(RangeElementExpr p | p = assgn |
+          i = 0 and lhs = p.getKey().stripParens()
+          or
+          i = 1 and lhs = p.getValue().stripParens()
+        )
+      )
+      or
+      exists(CompoundAssignStmt ca | write.isIn(ca) | lhs = ca.getLhs().stripParens())
+      or
+      exists(IncDecStmt ids | write.isIn(ids) | lhs = ids.getOperand().stripParens())
+      or
+      exists(FuncDef fd, int idx |
+        write.isBefore(fd.getParameter(idx).getDeclaration()) and
+        lhs = fd.getParameter(idx).getDeclaration()
+      )
+      or
+      // The `zero-init` node writes the variable it initializes: a named
+      // function result or a local declared without an initializer.
+      exists(int idx, AstNode an | write.isAdditional(an, "zero-init:" + idx.toString()) |
+        an = any(FuncDef fd | lhs = fd.getResultVar(idx).getDeclaration()).getBody()
+        or
+        an = any(ValueSpec spec | lhs = spec.getNameExpr(idx))
+      )
+      or
+      // A tuple-destructuring `extract` node writes its component directly (see
+      // `ExtractWriteInstruction`); blank-identifier targets are not written.
+      exists(AstNode assgn, int i | write.isAdditional(assgn, "extract:" + i.toString()) |
+        (
+          lhs = assgn.(Assignment).getLhs(i).stripParens()
+          or
+          lhs = assgn.(ValueSpec).getNameExpr(i)
+          or
+          exists(RangeElementExpr p | p = assgn |
+            i = 0 and lhs = p.getKey().stripParens()
+            or
+            i = 1 and lhs = p.getValue().stripParens()
+          )
+        ) and
+        not lhs instanceof BlankIdent
+      )
+    } or
+    /** A composite literal element target. */
+    MkLiteralElementTarget(ControlFlow::Node write) {
+      write.isAdditional(any(CompositeLit lit).getAnElement(), "lit-init")
+    } or
+    /**
+     * A result variable write target. Parameterized by `ControlFlow::Node`
+     * rather than `WriteResultInstruction` to avoid a circular dependency:
+     * `WriteResultInstruction extends WriteInstruction` needs
+     * `MkResultWriteTarget(this)` to hold, which would in turn require
+     * `this` to already be a `WriteResultInstruction`.
+     */
+    MkResultWriteTarget(ControlFlow::Node w) {
+      exists(ReturnStmt ret, int idx |
+        w.isAdditional(ret, "result-write:" + idx.toString()) and
+        exists(ret.getEnclosingFunction().getResultVar(idx)) and
+        exists(ret.getAnExpr())
+      )
+    }
+
   /** A representation of the target of a write instruction. */
   class WriteTarget extends TWriteTarget {
     ControlFlow::Node w;
@@ -1309,6 +1121,9 @@ module IR {
     /** Gets the write instruction of which this is the target. */
     WriteInstruction getWrite() { result = w }
 
+    /** Gets the left-hand side expression being written to, if any. */
+    Expr getExpr() { this = MkLhs(_, result) }
+
     /** Gets the name of the variable or field being written to, if any. */
     string getName() { none() }
 
@@ -1330,10 +1145,6 @@ module IR {
      * DEPRECATED: Use `getLocation()` instead.
      *
      * Holds if this element is at the specified location.
-     * The location spans column `startcolumn` of line `startline` to
-     * column `endcolumn` of line `endline` in file `filepath`.
-     * For more information, see
-     * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
      */
     deprecated predicate hasLocationInfo(
       string filepath, int startline, int startcolumn, int endline, int endcolumn
@@ -1395,10 +1206,6 @@ module IR {
 
     /** Gets the constant this refers to, if any. */
     Constant getConstant() { this.refersTo(result) }
-
-    override string toString() { result = this.getName() }
-
-    override Location getLocation() { result = loc.getLocation() }
   }
 
   /** A reference to a field, used as the target of a write. */
@@ -1416,7 +1223,7 @@ module IR {
       result = w.(InitLiteralStructFieldInstruction).getBase()
     }
 
-    /** Get the type of the base of this field access, that is, the type that contains the field. */
+    /** Gets the type of the base of this field access, that is, the type that contains the field. */
     Type getBaseType() { result = this.getBase().getResultType() }
 
     override predicate refersTo(ValueEntity e) {
@@ -1429,24 +1236,10 @@ module IR {
 
     /** Gets the field this refers to, if it can be determined. */
     Field getField() { this.refersTo(result) }
-
-    override string toString() {
-      exists(SelectorExpr sel | this = MkLhs(_, sel) |
-        result = "field " + sel.getSelector().getName()
-      )
-      or
-      result = "field " + w.(InitLiteralStructFieldInstruction).getFieldName()
-    }
-
-    override Location getLocation() {
-      exists(SelectorExpr sel | this = MkLhs(_, sel) | result = sel.getLocation())
-      or
-      result = w.(InitLiteralStructFieldInstruction).getLocation()
-    }
   }
 
   /**
-   * A reference to an element of an array, slice or map, used as the target of a write.
+   * A reference to an element of an array, slice, or map, used as the target of a write.
    */
   class ElementTarget extends WriteTarget {
     ElementTarget() {
@@ -1468,14 +1261,6 @@ module IR {
       or
       result = w.(InitLiteralElementInstruction).getIndex()
     }
-
-    override string toString() { result = "element" }
-
-    override Location getLocation() {
-      exists(IndexExpr idx | this = MkLhs(_, idx) | result = idx.getLocation())
-      or
-      result = w.(InitLiteralElementInstruction).getLocation()
-    }
   }
 
   /**
@@ -1495,66 +1280,70 @@ module IR {
         result = evalExprInstruction(base)
       )
     }
-
-    override string toString() { result = lhs.toString() }
-
-    override Location getLocation() { result = lhs.getLocation() }
   }
 
   /**
    * Gets the (final) instruction computing the value of `e`.
-   *
-   * Note that some expressions (such as type expressions or labels) have no corresponding
-   * instruction, so this predicate is undefined for them.
-   *
-   * Short-circuiting expressions that are purely used for control flow (meaning that their
-   * value is not stored in a variable or used to compute the value of a non-shortcircuiting
-   * expression) do not have a final instruction either.
    */
-  Instruction evalExprInstruction(Expr e) {
-    result = MkExprNode(e) or
-    result = evalExprInstruction(e.(ParenExpr).getExpr())
-  }
+  Instruction evalExprInstruction(Expr e) { result.(EvalInstruction).getExpr() = e }
 
   /**
    * Gets the instruction corresponding to the initialization of `r`.
    */
-  InitParameterInstruction initRecvInstruction(ReceiverVariable r) { result = MkParameterInit(r) }
+  InitParameterInstruction initRecvInstruction(ReceiverVariable r) {
+    exists(FuncDef fd, int i |
+      fd.getParameter(i) = r and result.isBefore(fd.getParameter(i).getDeclaration())
+    )
+  }
 
   /**
    * Gets the instruction corresponding to the initialization of `p`.
    */
-  InitParameterInstruction initParamInstruction(Parameter p) { result = MkParameterInit(p) }
+  InitParameterInstruction initParamInstruction(Parameter p) {
+    exists(FuncDef fd, int i |
+      fd.getParameter(i) = p and result.isBefore(fd.getParameter(i).getDeclaration())
+    )
+  }
 
   /**
    * Gets the instruction corresponding to the `i`th assignment happening at
    * `assgn` (0-based).
    */
-  AssignInstruction assignInstruction(Assignment assgn, int i) { result = MkAssignNode(assgn, i) }
+  AssignInstruction assignInstruction(Assignment assgn, int i) {
+    result.isAdditional(assgn, "assign:" + i.toString()) and
+    exists(assgn.getLhs(i))
+  }
 
   /**
    * Gets the instruction corresponding to the `i`th initialization happening
    * at `spec` (0-based).
    */
-  AssignInstruction initInstruction(ValueSpec spec, int i) { result = MkAssignNode(spec, i) }
+  AssignInstruction initInstruction(ValueSpec spec, int i) {
+    result.isAdditional(spec, "assign:" + i.toString()) and
+    exists(spec.getNameExpr(i))
+  }
 
   /**
    * Gets the instruction corresponding to the assignment of the key variable
    * of range statement `rs`.
    */
-  AssignInstruction assignKeyInstruction(RangeStmt rs) { result = MkAssignNode(rs, 0) }
+  ExtractWriteInstruction assignKeyInstruction(RangeStmt rs) {
+    result.isAdditional(rs.getPattern(), "extract:0")
+  }
 
   /**
    * Gets the instruction corresponding to the assignment of the value variable
    * of range statement `rs`.
    */
-  AssignInstruction assignValueInstruction(RangeStmt rs) { result = MkAssignNode(rs, 1) }
+  ExtractWriteInstruction assignValueInstruction(RangeStmt rs) {
+    result.isAdditional(rs.getPattern(), "extract:1")
+  }
 
   /**
    * Gets the instruction corresponding to the implicit initialization of `v`
    * to its zero value.
    */
-  EvalImplicitInitInstruction implicitInitInstruction(ValueEntity v) { result = MkZeroInitNode(v) }
+  EvalImplicitInitInstruction implicitInitInstruction(ValueEntity v) { result.getVariable() = v }
 
   /**
    * Gets the instruction corresponding to the extraction of the `idx`th element
@@ -1564,32 +1353,13 @@ module IR {
     result.extractsElement(base, idx)
   }
 
-  /**
-   * Gets the instruction corresponding to the implicit lower bound of slice `e`, if any.
-   */
-  EvalImplicitLowerSliceBoundInstruction implicitLowerSliceBoundInstruction(SliceExpr e) {
-    result = MkImplicitLowerSliceBound(e)
-  }
-
-  /**
-   * Gets the instruction corresponding to the implicit upper bound of slice `e`, if any.
-   */
-  EvalImplicitUpperSliceBoundInstruction implicitUpperSliceBoundInstruction(SliceExpr e) {
-    result = MkImplicitUpperSliceBound(e)
-  }
-
-  /**
-   * Gets the instruction corresponding to the implicit maximum bound of slice `e`, if any.
-   */
-  EvalImplicitMaxSliceBoundInstruction implicitMaxSliceBoundInstruction(SliceExpr e) {
-    result = MkImplicitMaxSliceBound(e)
-  }
-
   /**
    * Gets the implicit dereference instruction for `e`, where `e` is a pointer used as the base
    * in a field/method access, element access, or slice expression.
    */
-  EvalImplicitDerefInstruction implicitDerefInstruction(Expr e) { result = MkImplicitDeref(e) }
+  EvalImplicitDerefInstruction implicitDerefInstruction(Expr e) {
+    result.isAdditional(e, "implicit-deref")
+  }
 
   /** Gets the base of `insn`, if `insn` is an implicit field read. */
   Instruction lookThroughImplicitFieldRead(Instruction insn) {
diff --git a/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll b/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
index f0dc0cf0ca2b..40e82507d70d 100644
--- a/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
+++ b/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
@@ -104,6 +104,7 @@ overlay[local?]
 module;
 
 private import go
+private import semmle.go.controlflow.Guards
 private import internal.ExternalFlowExtensions::Extensions as Extensions
 private import FlowSummary as FlowSummary
 private import internal.DataFlowPrivate
@@ -459,24 +460,23 @@ private module Cached {
   private newtype TKindModelPair =
     TMkPair(string kind, string model) { isBarrierGuardNode(_, _, kind, model) }
 
-  private boolean convertAcceptingValue(Public::AcceptingValue av) {
-    av.isTrue() and result = true
+  private GuardValue convertAcceptingValue(Public::AcceptingValue av) {
+    av.isTrue() and result.asBooleanValue() = true
     or
-    av.isFalse() and result = false
-    // Remaining cases are not supported yet, they depend on the shared Guards library.
-    // or
-    // av.isNoException() and result.getDualValue().isThrowsException()
-    // or
-    // av.isZero() and result.asIntValue() = 0
-    // or
-    // av.isNotZero() and result.getDualValue().asIntValue() = 0
-    // or
-    // av.isNull() and result.isNullValue()
-    // or
-    // av.isNotNull() and result.isNonNullValue()
+    av.isFalse() and result.asBooleanValue() = false
+    or
+    av.isNoException() and result.getDualValue().isThrowsException()
+    or
+    av.isZero() and result.asIntValue() = 0
+    or
+    av.isNotZero() and result.getDualValue().asIntValue() = 0
+    or
+    av.isNull() and result.isNullValue()
+    or
+    av.isNotNull() and result.isNonNullValue()
   }
 
-  private predicate barrierGuardChecks(DataFlow::Node g, Expr e, boolean gv, TKindModelPair kmp) {
+  private predicate barrierGuardChecks(Guard g, Expr e, GuardValue gv, TKindModelPair kmp) {
     exists(
       SourceSinkInterpretationInput::InterpretNode n, Public::AcceptingValue acceptingValue,
       string kind, string model
@@ -486,7 +486,7 @@ private module Cached {
       kmp = TMkPair(kind, model) and
       gv = convertAcceptingValue(acceptingValue)
     |
-      g.asExpr().(CallExpr).getAnArgument() = e // TODO: qualifier?
+      g.(CallExpr).getAnArgument() = e // TODO: qualifier?
     )
   }
 
@@ -500,7 +500,7 @@ private module Cached {
       isBarrierNode(n, kind, model) and n.asNode() = node
     )
     or
-    DataFlow::ParameterizedBarrierGuard<TKindModelPair, barrierGuardChecks/4>::getABarrierNode(TMkPair(kind,
+    DataFlow::ParameterizedBarrierGuardValue<TKindModelPair, barrierGuardChecks/4>::getABarrierNode(TMkPair(kind,
         model)) = node
   }
 }
diff --git a/go/ql/lib/semmle/go/dataflow/GlobalValueNumbering.qll b/go/ql/lib/semmle/go/dataflow/GlobalValueNumbering.qll
index 3547e70b858a..38c5ff4de219 100644
--- a/go/ql/lib/semmle/go/dataflow/GlobalValueNumbering.qll
+++ b/go/ql/lib/semmle/go/dataflow/GlobalValueNumbering.qll
@@ -109,15 +109,41 @@ private ControlFlow::Node getControlFlowEntry(ControlFlow::Node node) {
 
 private predicate entryNode(ControlFlow::Node node) { node.isEntryNode() }
 
+/** Retains queried instructions, effects, and junctions while allowing linear CFG nodes to be bypassed. */
+private predicate retainedSideEffectNode(ControlFlow::Node node) {
+  node instanceof IR::Instruction
+  or
+  node = nodeWithPossibleSideEffect()
+  or
+  node.isEntryNode()
+  or
+  node.isBranch()
+  or
+  node.isJoin()
+  or
+  not exists(node.getAPredecessor())
+  or
+  not exists(node.getASuccessor())
+}
+
+/** Gets the first retained node at or after `node` along a linear CFG path. */
+private ControlFlow::Node nextSideEffectNode(ControlFlow::Node node) {
+  retainedSideEffectNode(node) and result = node
+  or
+  not retainedSideEffectNode(node) and
+  result = nextSideEffectNode(node.getASuccessor())
+}
+
 /**
- * Holds if there is a control flow edge from `src` to `dst` or
+ * Holds if there is a contracted control flow edge from `src` to `dst` or
  * if `dst` is an expression with a possible side-effect. The idea
  * is to treat side effects as entry points in the control flow
  * graph so that we can use the dominator tree to find the most recent
  * side-effect.
  */
 private predicate sideEffectCfg(ControlFlow::Node src, ControlFlow::Node dst) {
-  src.getASuccessor() = dst
+  retainedSideEffectNode(src) and
+  dst = nextSideEffectNode(src.getASuccessor())
   or
   // Add an edge from the entry point to any node that might have a side
   // effect.
diff --git a/go/ql/lib/semmle/go/dataflow/Properties.qll b/go/ql/lib/semmle/go/dataflow/Properties.qll
index 573b001a3c36..0ec2654f8610 100644
--- a/go/ql/lib/semmle/go/dataflow/Properties.qll
+++ b/go/ql/lib/semmle/go/dataflow/Properties.qll
@@ -32,10 +32,6 @@ class Property extends TProperty {
     // then !test = !outcome ==> nd matches this
     this.checkOnExpr(test.(NotExpr).getOperand(), outcome.booleanNot(), nd)
     or
-    // if test = outcome ==> nd matches this
-    // then (test) = outcome ==> nd matches this
-    this.checkOnExpr(test.(ParenExpr).getExpr(), outcome, nd)
-    or
     // if test = true ==> nd matches this
     // then (test && e) = true ==> nd matches this
     outcome = true and
diff --git a/go/ql/lib/semmle/go/dataflow/SsaImpl.qll b/go/ql/lib/semmle/go/dataflow/SsaImpl.qll
index f4f62ab9f1d9..c206dccbba38 100644
--- a/go/ql/lib/semmle/go/dataflow/SsaImpl.qll
+++ b/go/ql/lib/semmle/go/dataflow/SsaImpl.qll
@@ -9,6 +9,7 @@ module;
 import go
 private import codeql.ssa.Ssa as SsaImplCommon
 private import semmle.go.controlflow.BasicBlocks as BasicBlocks
+private import semmle.go.controlflow.ControlFlowGraphImpl
 
 private class BasicBlock = BasicBlocks::BasicBlock;
 
@@ -38,7 +39,7 @@ private module Internal {
   /** Holds if the `i`th node of `bb` in function `f` is an entry node. */
   private predicate entryNode(FuncDef f, BasicBlock bb, int i) {
     f = bb.getScope() and
-    bb.getNode(i).isEntryNode()
+    bb.getNode(i).(ControlFlow::Node).isEntryNode()
   }
 
   /**
@@ -110,7 +111,7 @@ private module Internal {
       v.isCaptured() and
       exists(FuncDef f |
         f = bb.getScope() and
-        bb.getLastNode().isExitNode() and
+        bb.getLastNode().(ControlFlow::Node).isExitNode() and
         i = bb.length() - 1 and
         certain = false
       |
@@ -126,7 +127,7 @@ private module Internal {
 }
 
 import Internal
-import SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput> as Impl
+import SsaImplCommon::Make<Location, CfgImpl::Cfg, SsaInput> as Impl
 
 final class Definition = Impl::Definition;
 
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
index 7069cf36bd01..1aa60c0eca46 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
@@ -13,7 +13,10 @@ private newtype TNode =
   MkInstructionNode(IR::Instruction insn) or
   MkSsaNode(SsaDefinition ssa) or
   MkGlobalFunctionNode(Function f) or
-  MkImplicitVarargsSlice(CallExpr c) { c.hasImplicitVarargs() } or
+  MkImplicitVarargsSlice(IR::EvalInstruction ins) {
+    // We only use CallExprs with an EvalInstruction to guarantee reachability.
+    ins.getExpr().(CallExpr).hasImplicitVarargs()
+  } or
   MkSliceElementNode(SliceExpr se) or
   MkFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn) or
   MkDefaultPostUpdateNode(IR::Instruction insn) { insnHasPostUpdateNode(insn) }
@@ -82,7 +85,7 @@ module Private {
       result = this.getSummaryNode().getSummarizedCallable()
     }
 
-    override Location getLocation() { result = this.getSummarizedCallable().getLocation() }
+    override Location getLocation() { result = this.getSummaryNode().getLocation() }
 
     override string toString() { result = this.getSummaryNode().toString() }
 
@@ -430,7 +433,7 @@ module Public {
   class ImplicitVarargsSlice extends Node, MkImplicitVarargsSlice {
     CallNode call;
 
-    ImplicitVarargsSlice() { this = MkImplicitVarargsSlice(call.getCall()) }
+    ImplicitVarargsSlice() { this = MkImplicitVarargsSlice(call.asInstruction()) }
 
     override ControlFlow::Root getRoot() { result = call.getRoot() }
 
@@ -769,6 +772,8 @@ module Public {
   private IR::Instruction getADirectlyWrittenInsn() {
     exists(Write w | w.writesComponentInstruction(result, _))
     or
+    result = any(Write w).getLhs().(IR::PointerTarget).getBase()
+    or
     result = IR::evalExprInstruction(any(SendStmt s).getChannel())
   }
 
@@ -785,7 +790,23 @@ module Public {
   }
 
   private IR::Instruction getAWrittenInsn() {
-    result = getAccessPathPredecessorInsn*(getADirectlyWrittenInsn())
+    result = getADirectlyWrittenInsn()
+    or
+    result = getAccessPathPredecessorInsn(getAWrittenInsn())
+  }
+
+  private IR::Instruction getAMethodReceiverInsn() {
+    exists(CallExpr call, IR::MethodReadInstruction methodRead |
+      call.getTarget() instanceof Method and
+      methodRead = IR::evalExprInstruction(call.getCalleeExpr()) and
+      result = methodRead.getReceiver()
+    )
+    or
+    // If a.x is reading a promoted field, and it's equivalent to a.b.c.x,
+    // then methodRead.getReceiver() will give us the implicit field read a.b.c
+    // and we want to have post-update nodes for a, the implicit field
+    // read a.b and the implicit field read a.b.c.
+    result = IR::lookThroughImplicitFieldRead(getAMethodReceiverInsn())
   }
 
   /**
@@ -832,23 +853,17 @@ module Public {
       e = any(IR::EvalImplicitDerefInstruction eidi).getOperand()
     )
     or
-    exists(CallExpr ce |
-      ce.getArgument(0).getType() instanceof TupleType and
-      insn = IR::extractTupleElement(IR::evalExprInstruction(ce.getArgument(0)), _)
-      or
-      not ce.getArgument(0).getType() instanceof TupleType and
-      insn = IR::evalExprInstruction(ce.getAnArgument())
+    (
+      exists(CallExpr ce |
+        ce.getArgument(0).getType() instanceof TupleType and
+        insn = IR::extractTupleElement(IR::evalExprInstruction(ce.getArgument(0)), _)
+        or
+        not ce.getArgument(0).getType() instanceof TupleType and
+        insn = IR::evalExprInstruction(ce.getAnArgument())
+      )
       or
       // Receiver of a method call
-      exists(IR::MethodReadInstruction mri |
-        ce.getTarget() instanceof Method and
-        mri = IR::evalExprInstruction(ce.getCalleeExpr()) and
-        // If a.x is reading a promoted field, and it's equivalent to a.b.c.x,
-        // then mri.getReceiver() will give us the implicit field read a.b.c
-        // and we want to have post-update nodes for a, the implicit field
-        // read a.b and the implicit field read a.b.c.
-        insn = IR::lookThroughImplicitFieldRead*(mri.getReceiver())
-      )
+      insn = getAMethodReceiverInsn()
     ) and
     mutableType(insn.getResultType())
     or
@@ -1124,15 +1139,6 @@ module Public {
         right = DataFlow::exprNode(assgn.getRhs()) and
         op = o.substring(0, o.length() - 1)
       )
-      or
-      exists(IR::EvalIncDecRhsInstruction rhs, IncDecStmt ids |
-        rhs = this.asInstruction() and ids = rhs.getStmt()
-      |
-        left = DataFlow::exprNode(ids.getOperand()) and
-        right =
-          DataFlow::instructionNode(any(IR::EvalImplicitOneInstruction one | one.getStmt() = ids)) and
-        op = ids.getOperator().charAt(0)
-      )
     }
 
     /** Holds if this operation may have observable side effects. */
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll
index 2c5c64ace7d5..056d8edd5d9f 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll
@@ -2,6 +2,7 @@ overlay[local?]
 module;
 
 private import go
+private import semmle.go.controlflow.Guards
 private import DataFlowUtil
 private import DataFlowImplCommon
 private import ContainerFlow
@@ -153,8 +154,7 @@ predicate jumpStep(Node n1, Node n2) {
     n2 = recvRead
   )
   or
-  FlowSummaryImpl::Private::Steps::summaryJumpStep(n1.(FlowSummaryNode).getSummaryNode(),
-    n2.(FlowSummaryNode).getSummaryNode())
+  FlowSummaryImpl::Private::Steps::summaryJumpStep(n1, n2)
 }
 
 /**
@@ -391,19 +391,21 @@ private class ConstantBooleanArgumentNode extends ArgumentNode, ExprNode {
 }
 
 /**
- * Returns a guard that will certainly not hold in calling context `call`.
+ * Holds if `guard` evaluating to `branch` will certainly not happen in calling
+ * context `call`.
  *
  * In particular it does not hold because it checks that `param` has value `b`, but
  * in context `call` it is known to have value `!b`. Note this is `noinline`d in order
  * to avoid a bad join order in `isUnreachableInCall`.
  */
 pragma[noinline]
-private ControlFlow::ConditionGuardNode getAFalsifiedGuard(DataFlowCall call) {
+private predicate falsifiedGuard(DataFlowCall call, Guard guard, boolean branch) {
   exists(SsaParameterNode param, ConstantBooleanArgumentNode arg |
     // get constant bool argument and parameter for this call
     viableParamArg(call, pragma[only_bind_into](param), pragma[only_bind_into](arg)) and
     // which is used in a guard controlling `n` with the opposite value of `arg`
-    result.ensures(param.getAUse(), arg.getBooleanValue().booleanNot())
+    guard = param.getAUse().asExpr() and
+    branch = arg.getBooleanValue().booleanNot()
   )
 }
 
@@ -417,7 +419,10 @@ class NodeRegion instanceof BasicBlock {
  * Holds if the nodes in `nr` are unreachable when the call context is `call`.
  */
 predicate isUnreachableInCall(NodeRegion nr, DataFlowCall call) {
-  getAFalsifiedGuard(call).dominates(nr)
+  exists(Guard guard, boolean branch |
+    falsifiedGuard(call, guard, branch) and
+    guard.controls(nr, branch)
+  )
 }
 
 /**
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
index e207a72727f9..62da08733110 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
@@ -5,6 +5,7 @@ overlay[local?]
 module;
 
 private import go
+private import semmle.go.controlflow.Guards
 private import semmle.go.dataflow.FunctionInputsAndOutputs
 private import semmle.go.dataflow.ExternalFlow
 private import DataFlowPrivate
@@ -141,8 +142,7 @@ predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo, string model) {
   any(FunctionModel m).flowStep(nodeFrom, nodeTo) and
   model = "FunctionModel"
   or
-  FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-    nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)
+  FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, true, model)
 }
 
 /**
@@ -356,6 +356,39 @@ private module WithParam<ParamSig P> {
   signature predicate guardChecksSig(Node g, Expr e, boolean branch, P param);
 }
 
+/**
+ * Holds if the guard `g` validates the expression `e` upon evaluating to `value`.
+ *
+ * The expression `e` is expected to be a syntactic part of the guard `g`.
+ */
+signature predicate valueGuardChecksSig(Guard g, Expr e, GuardValue value);
+
+bindingset[this]
+private signature class ValueParamSig;
+
+private module WithValueParam<ValueParamSig P> {
+  /**
+   * Holds if the guard `g` validates the expression `e` upon evaluating to `value`.
+   *
+   * The expression `e` is expected to be a syntactic part of the guard `g`.
+   */
+  signature predicate guardChecksSig(Guard g, Expr e, GuardValue value, P param);
+}
+
+/**
+ * Provides a set of barrier nodes for a guard that validates an expression.
+ */
+module BarrierGuardValue<valueGuardChecksSig/3 guardChecks> {
+  private predicate guardChecksWithParam(Guard g, Expr e, GuardValue value, Unit param) {
+    guardChecks(g, e, value) and exists(param)
+  }
+
+  private module B = ParameterizedBarrierGuardValue<Unit, guardChecksWithParam/4>;
+
+  /** Gets a node that is safely guarded by the given guard check. */
+  Node getABarrierNode() { result = B::getABarrierNode(_) }
+}
+
 /**
  * Provides a set of barrier nodes for a guard that validates an expression.
  *
@@ -363,20 +396,25 @@ private module WithParam<ParamSig P> {
  * in data flow and taint tracking.
  */
 module BarrierGuard<guardChecksSig/3 guardChecks> {
-  private predicate guardChecks(Node g, Expr e, boolean branch, Unit param) {
-    guardChecks(g, e, branch) and exists(param)
+  private predicate guardChecksValue(Guard g, Expr e, GuardValue value) {
+    guardChecks(DataFlow::exprNode(g), e, value.asBooleanValue())
   }
 
-  private module B = ParameterizedBarrierGuard<Unit, guardChecks/4>;
+  private module B = BarrierGuardValue<guardChecksValue/3>;
 
   /** Gets a node that is safely guarded by the given guard check. */
-  Node getABarrierNode() { result = B::getABarrierNode(_) }
+  Node getABarrierNode() { result = B::getABarrierNode() }
 
   /**
    * Gets a node that is safely guarded by the given guard check.
    */
   Node getABarrierNodeForGuard(Node guardCheck) {
-    result = B::getABarrierNodeForGuard(guardCheck, _)
+    result =
+      ParameterizedBarrierGuard<Unit, guardChecksWithParam/4>::getABarrierNodeForGuard(guardCheck, _)
+  }
+
+  private predicate guardChecksWithParam(Node g, Expr e, boolean branch, Unit param) {
+    guardChecks(g, e, branch) and exists(param)
   }
 }
 
@@ -386,14 +424,18 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
  * This is expected to be used in `isBarrier`/`isSanitizer` definitions
  * in data flow and taint tracking.
  */
-module ParameterizedBarrierGuard<ParamSig P, WithParam<P>::guardChecksSig/4 guardChecks> {
+module ParameterizedBarrierGuardValue<
+  ValueParamSig P, WithValueParam<P>::guardChecksSig/4 guardChecks>
+{
+  private module WrappedGuardChecks = ParameterizedValidationWrapper<P, guardChecks/4>;
+
   /** Gets a node that is safely guarded by the given guard check. */
   Node getABarrierNode(P param) {
-    exists(ControlFlow::ConditionGuardNode guard, SsaWithFields var |
+    exists(Guard guard, GuardValue value, SsaWithFields var |
       result = pragma[only_bind_out](var).getAUse()
     |
-      guards(_, guard, _, var, param) and
-      pragma[only_bind_out](guard).dominates(result.getBasicBlock())
+      guards(_, guard, value, _, var, param) and
+      pragma[only_bind_out](guard).valueControls(result.getBasicBlock(), value)
     )
   }
 
@@ -401,133 +443,51 @@ module ParameterizedBarrierGuard<ParamSig P, WithParam<P>::guardChecksSig/4 guar
    * Gets a node that is safely guarded by the given guard check.
    */
   Node getABarrierNodeForGuard(Node guardCheck, P param) {
-    exists(ControlFlow::ConditionGuardNode guard, SsaWithFields var | result = var.getAUse() |
-      guards(guardCheck, guard, _, var, param) and
-      guard.dominates(result.getBasicBlock())
+    exists(Guard guard, GuardValue value, SsaWithFields var | result = var.getAUse() |
+      guards(guardCheck, guard, value, _, var, param) and
+      guard.valueControls(result.getBasicBlock(), value)
     )
   }
 
   /**
-   * Holds if `guard` marks a point in the control-flow graph where `g`
-   * is known to validate `nd`, which is represented by `ap`.
+   * Holds if `guard` evaluating to `value` marks a point in the control-flow
+   * graph where `g` is known to validate `nd`, which is represented by `ap`.
+   * `param` is the caller-supplied parameter associated with that validation.
    *
    * This predicate exists to enforce a good join order in `getAGuardedNode`.
    */
   pragma[noinline]
-  private predicate guards(
-    Node g, ControlFlow::ConditionGuardNode guard, Node nd, SsaWithFields ap, P param
-  ) {
-    guards(g, guard, nd, param) and nd = ap.getAUse()
+  private predicate guards(Node g, Guard guard, GuardValue value, Node nd, SsaWithFields ap, P param) {
+    guards(g, guard, value, nd, param) and nd = ap.getAUse()
   }
 
   /**
-   * Holds if `guard` marks a point in the control-flow graph where `g`
-   * is known to validate `nd`.
+   * Holds if `guard` evaluating to `value` marks a point in the control-flow
+   * graph where `g` is known to validate `nd`. `param` is the caller-supplied
+   * parameter associated with that validation.
    */
-  private predicate guards(Node g, ControlFlow::ConditionGuardNode guard, Node nd, P param) {
-    exists(boolean branch |
-      guardChecks(g, nd.asExpr(), branch, param) and
-      guard.ensures(g, branch)
-    )
-    or
-    exists(DataFlow::Property p, Node resNode, Node check, boolean outcome |
-      guardingCall(g, _, _, _, p, _, nd, resNode, param) and
-      p.checkOn(check, outcome, resNode) and
-      guard.ensures(pragma[only_bind_into](check), outcome)
-    )
+  private predicate guards(Node g, Guard guard, GuardValue value, Node nd, P param) {
+    WrappedGuardChecks::guardChecks(guard, nd.asExpr(), value, param) and
+    g = DataFlow::exprNode(guard)
   }
+}
 
-  bindingset[inp, c]
-  pragma[inline_late]
-  private Node getInputNode(FunctionInput inp, CallNode c) { result = inp.getNode(c) }
-
-  bindingset[outp, c]
-  pragma[inline_late]
-  private Node getOutputNode(FunctionOutput outp, CallNode c) { result = outp.getNode(c) }
-
-  pragma[noinline]
-  private predicate guardingCall(
-    Node g, Function f, FunctionInput inp, FunctionOutput outp, DataFlow::Property p, CallNode c,
-    Node nd, Node resNode, P param
-  ) {
-    guardingFunction(g, f, inp, outp, p, param) and
-    c = f.getACall() and
-    nd = getInputNode(inp, c) and
-    localFlow(getOutputNode(outp, c), resNode)
+/**
+ * Provides a set of barrier nodes for a Boolean guard that validates an expression.
+ */
+module ParameterizedBarrierGuard<ParamSig P, WithParam<P>::guardChecksSig/4 guardChecks> {
+  private predicate guardChecksValue(Guard g, Expr e, GuardValue value, P param) {
+    guardChecks(DataFlow::exprNode(g), e, value.asBooleanValue(), param)
   }
 
-  private predicate onlyPossibleReturnSatisfyingProperty(
-    FuncDecl fd, FunctionOutput outp, Node ret, DataFlow::Property p
-  ) {
-    exists(boolean b |
-      onlyPossibleReturnOfBool(fd, outp, ret, b) and
-      p.isBoolean(b)
-    )
-    or
-    onlyPossibleReturnOfNonNil(fd, outp, ret) and
-    p.isNonNil()
-    or
-    onlyPossibleReturnOfNil(fd, outp, ret) and
-    p.isNil()
-  }
+  private module B = ParameterizedBarrierGuardValue<P, guardChecksValue/4>;
 
-  /**
-   * Holds if whenever `p` holds of output `outp` of function `f`, this node
-   * is known to validate the input `inp` of `f`.
-   *
-   * We check this by looking for guards on `inp` that dominate a `return` statement that
-   * is the only `return` in `f` that can return `true`. This means that if `f` returns `true`,
-   * the guard must have been satisfied. (Similar reasoning is applied for statements returning
-   * `false`, `nil` or a non-`nil` value.)
-   */
-  private predicate guardingFunction(
-    Node g, Function f, FunctionInput inp, FunctionOutput outp, DataFlow::Property p, P param
-  ) {
-    exists(FuncDecl fd, Node arg, Node ret |
-      fd.getFunction() = f and
-      localFlow(inp.getExitNode(fd), pragma[only_bind_out](arg)) and
-      (
-        // Case: a function like "if someBarrierGuard(arg) { return true } else { return false }"
-        exists(ControlFlow::ConditionGuardNode guard |
-          guards(g, pragma[only_bind_out](guard), arg, param) and
-          guard.dominates(pragma[only_bind_out](ret).getBasicBlock())
-        |
-          onlyPossibleReturnSatisfyingProperty(fd, outp, ret, p)
-        )
-        or
-        // Case: a function like "return someBarrierGuard(arg)"
-        // or "return !someBarrierGuard(arg) && otherCond(...)"
-        exists(boolean outcome |
-          ret = getUniqueOutputNode(fd, outp) and
-          guardChecks(g, arg.asExpr(), outcome, param) and
-          // This predicate's contract is (p holds of ret ==> arg is checked),
-          // (and we have (this has outcome ==> arg is checked))
-          // but p.checkOn(ret, outcome, this) gives us (ret has outcome ==> p holds of this),
-          // so we need to swap outcome and (specifically boolean) p:
-          DataFlow::booleanProperty(outcome).checkOn(ret, p.asBoolean(), g)
-        )
-        or
-        // Case: a function like "return guardProxy(arg)"
-        // or "return !guardProxy(arg) || otherCond(...)"
-        exists(
-          Function f2, FunctionInput inp2, FunctionOutput outp2, CallNode c,
-          DataFlow::Property outpProp
-        |
-          ret = getUniqueOutputNode(fd, outp) and
-          guardingFunction(g, f2, inp2, outp2, outpProp, param) and
-          c = f2.getACall() and
-          arg = inp2.getNode(c) and
-          (
-            // See comment above ("This method's contract...") for rationale re: the inversion of
-            // `p` and `outpProp` here:
-            outpProp.checkOn(ret, p.asBoolean(), outp2.getNode(c))
-            or
-            // The particular case where p is non-boolean (i.e., nil or non-nil), and we directly return `c`:
-            outpProp = p and ret = outp2.getNode(c)
-          )
-        )
-      )
-    )
+  /** Gets a node that is safely guarded by the given guard check. */
+  Node getABarrierNode(P param) { result = B::getABarrierNode(param) }
+
+  /** Gets a node that is safely guarded by the given guard check. */
+  Node getABarrierNodeForGuard(Node guardCheck, P param) {
+    result = B::getABarrierNodeForGuard(guardCheck, param)
   }
 }
 
@@ -545,18 +505,6 @@ predicate possiblyReturnsBool(FuncDecl fd, FunctionOutput res, Node ret, Boolean
   not ret.getBoolValue() != b
 }
 
-/**
- * Holds if `ret` is the only data-flow node whose value contributes to the output `res` of `fd`
- * that may have Boolean value `b`, since all the other output nodes have a Boolean value
- * other than `b`.
- */
-private predicate onlyPossibleReturnOfBool(FuncDecl fd, FunctionOutput res, Node ret, boolean b) {
-  possiblyReturnsBool(fd, res, ret, b) and
-  forall(Node otherRet | otherRet = res.getEntryNode(fd) and otherRet != ret |
-    otherRet.getBoolValue() != b
-  )
-}
-
 /**
  * Holds if `ret` is a data-flow node whose value contributes to the output `res` of `fd`,
  * and that node may evaluate to a value other than `nil`.
@@ -566,21 +514,10 @@ predicate possiblyReturnsNonNil(FuncDecl fd, FunctionOutput res, Node ret) {
   not exprRefersToNil(ret.asExpr())
 }
 
-/**
- * Holds if `ret` is the only data-flow node whose value contributes to the output `res` of `fd`
- * that may have a value other than `nil`, since all the other output nodes evaluate to `nil`.
- */
-private predicate onlyPossibleReturnOfNonNil(FuncDecl fd, FunctionOutput res, Node ret) {
-  possiblyReturnsNonNil(fd, res, ret) and
-  forall(Node otherRet | otherRet = res.getEntryNode(fd) and otherRet != ret |
-    exprRefersToNil(otherRet.asExpr())
-  )
-}
-
 /**
  * Holds if function `f`'s result `output`, which must be a return value, cannot be nil.
  */
-private predicate certainlyReturnsNonNil(Function f, FunctionOutput output) {
+predicate certainlyReturnsNonNil(Function f, FunctionOutput output) {
   output.isResult(_) and
   (
     f.hasQualifiedName("errors", "New")
@@ -598,22 +535,10 @@ private predicate certainlyReturnsNonNil(Function f, FunctionOutput output) {
 /**
  * Holds if `node` cannot be `nil`.
  */
-private predicate isCertainlyNotNil(DataFlow::Node node) {
+predicate isCertainlyNotNil(DataFlow::Node node) {
   node instanceof DataFlow::AddressOperationNode
   or
   exists(DataFlow::CallNode c, FunctionOutput output | output.getExitNode(c) = node |
     certainlyReturnsNonNil(c.getTarget(), output)
   )
 }
-
-/**
- * Holds if `ret` is the only data-flow node whose value contributes to the output `res` of `fd`
- * that returns `nil`, since all the other output nodes are known to be non-nil.
- */
-private predicate onlyPossibleReturnOfNil(FuncDecl fd, FunctionOutput res, DataFlow::Node ret) {
-  ret = res.getEntryNode(fd) and
-  exprRefersToNil(ret.asExpr()) and
-  forall(DataFlow::Node otherRet | otherRet = res.getEntryNode(fd) and otherRet != ret |
-    isCertainlyNotNil(otherRet)
-  )
-}
diff --git a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
index 868066af1e45..4dc80eed652f 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
@@ -27,14 +27,16 @@ module Input implements InputSig<Location, DataFlowImplSpecific::GoDataFlow> {
 
   class SummarizedCallableBase = Callable;
 
-  class SourceBase = Void;
-
-  class SinkBase = Void;
-
-  class FlowSummaryCallBase = Void;
+  class FlowSummaryCallBase extends Void {
+    Location getLocation() { none() }
+  }
 
   predicate callableFromSource(SummarizedCallableBase c) { exists(c.getFuncDef()) }
 
+  DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
+    result.asSummarizedCallable() = c
+  }
+
   predicate neutralElement(
     Input::SummarizedCallableBase c, string kind, string provenance, boolean isExact
   ) {
@@ -114,10 +116,22 @@ module Input implements InputSig<Location, DataFlowImplSpecific::GoDataFlow> {
 
 private import Make<Location, DataFlowImplSpecific::GoDataFlow, Input> as Impl
 
-private module StepsInput implements Impl::Private::StepsInputSig {
-  Impl::Private::SummaryNode getSummaryNode(Node n) {
-    result = n.(FlowSummaryNode).getSummaryNode()
+private module Input2 implements Impl::Private::InputSig2 {
+  private import codeql.util.Void
+
+  class SourceSinkReportingElement extends Void {
+    Location getLocation() { none() }
+
+    DataFlowCallable getEnclosingCallable() { none() }
+
+    SourceSinkReportingElement getASuccessor(Impl::Private::SummaryComponent sc) { none() }
   }
+}
+
+private import Impl::Private::Make2<Input2> as Impl2
+
+private module StepsInput implements Impl2::StepsInputSig {
+  Impl2::SummaryNode getSummaryNode(Node n) { result = n.(FlowSummaryNode).getSummaryNode() }
 
   DataFlowCall getACall(Public::SummarizedCallable sc) {
     exists(DataFlow::CallNode call |
@@ -125,12 +139,6 @@ private module StepsInput implements Impl::Private::StepsInputSig {
       call.getACalleeIncludingExternals() = sc
     )
   }
-
-  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
-
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
-
-  Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
 
 module SourceSinkInterpretationInput implements
@@ -500,8 +508,9 @@ private predicate parseReturn(AccessPath::AccessPathTokenBase c, int n) {
 
 module Private {
   import Impl::Private
+  import Impl2
 
-  module Steps = Impl::Private::Steps<StepsInput>;
+  module Steps = Impl2::Steps<StepsInput>;
 
   module External {
     import Impl::Private::External
diff --git a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
index de7a1f743c53..e985383c8cf4 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
@@ -109,8 +109,7 @@ private predicate localAdditionalForwardTaintStep(
   or
   any(AdditionalTaintStep a).step(pred, succ) and model = "AdditionalTaintStep"
   or
-  FlowSummaryImpl::Private::Steps::summaryLocalStep(pred,
-    succ.(DataFlowPrivate::FlowSummaryNode).getSummaryNode(), false, model)
+  FlowSummaryImpl::Private::Steps::summaryLocalStep(pred, succ, false, model)
 }
 
 /**
@@ -337,25 +336,40 @@ private predicate isPossibleInputNode(DataFlow::Node inputNode, FuncDef fd) {
  * an expression which data flows to from `inputNode`.
  */
 private ControlFlow::Node getANonTestPassingPredecessor(
-  ControlFlow::Node succ, DataFlow::Node inputNode
+  ControlFlow::Node succ, DataFlow::Node inputNode, FuncDef fd
 ) {
-  isPossibleInputNode(inputNode, succ.getRoot()) and
+  succ.getRoot() = fd and
+  isPossibleInputNode(inputNode, fd) and
   result = succ.getAPredecessor() and
-  not exists(Expr testExpr, DataFlow::Node switchExprNode |
+  not exists(DataFlow::Node switchExprNode |
     flowsToSwitchExpression(inputNode, switchExprNode) and
-    ControlFlow::isSwitchCaseTestPassingEdge(result, succ, switchExprNode.asExpr(), testExpr) and
-    testExpr.isConst()
+    // The case body is reachable only by matching a constant: at least one of
+    // the case's test expressions is constant, and none of them is
+    // non-constant. (All test expressions of a case share the same matched
+    // edge `result -> succ`, so a case mixing constant and non-constant tests
+    // must not be treated as a constant-only match.)
+    exists(Expr testExpr |
+      ControlFlow::isSwitchCaseTestPassingEdge(result, succ, switchExprNode.asExpr(), testExpr) and
+      testExpr.isConst()
+    ) and
+    not exists(Expr nonConstTestExpr |
+      ControlFlow::isSwitchCaseTestPassingEdge(result, succ, switchExprNode.asExpr(),
+        nonConstTestExpr) and
+      not nonConstTestExpr.isConst()
+    )
   )
 }
 
 private ControlFlow::Node getANonTestPassingReachingNodeRecursive(
-  ControlFlow::Node n, DataFlow::Node inputNode
+  ControlFlow::Node n, DataFlow::Node inputNode, FuncDef fd
 ) {
-  isPossibleInputNode(inputNode, n.getRoot()) and
+  n.getRoot() = fd and
+  isPossibleInputNode(inputNode, fd) and
   (
     result = n or
     result =
-      getANonTestPassingReachingNodeRecursive(getANonTestPassingPredecessor(n, inputNode), inputNode)
+      getANonTestPassingReachingNodeRecursive(getANonTestPassingPredecessor(n, inputNode, fd),
+        inputNode, fd)
   )
 }
 
@@ -367,7 +381,7 @@ private ControlFlow::Node getANonTestPassingReachingNodeRecursive(
 private ControlFlow::Node getANonTestPassingReachingNodeBase(
   IR::ReturnInstruction ret, DataFlow::Node inputNode
 ) {
-  result = getANonTestPassingReachingNodeRecursive(ret, inputNode)
+  result = getANonTestPassingReachingNodeRecursive(ret, inputNode, ret.getRoot())
 }
 
 /**
diff --git a/go/ql/lib/semmle/go/dependencies/SemVer.qll b/go/ql/lib/semmle/go/dependencies/SemVer.qll
index 290617781ec0..a55d4e127990 100644
--- a/go/ql/lib/semmle/go/dependencies/SemVer.qll
+++ b/go/ql/lib/semmle/go/dependencies/SemVer.qll
@@ -5,6 +5,7 @@ overlay[local?]
 module;
 
 import semmle.go.dependencies.Dependencies
+private import codeql.util.SemVer
 
 /**
  * A SemVer-formatted version string in a dependency.
@@ -17,35 +18,35 @@ class DependencySemVer extends string {
 
   DependencySemVer() {
     this = dep.getDepVersion() and
-    normalized = normalizeSemver(this)
+    normalized = padSemVer(this)
   }
 
   /**
    * Holds if this version may be before `last`.
    */
   bindingset[last]
-  predicate maybeBefore(string last) { normalized < normalizeSemver(last) }
+  predicate maybeBefore(string last) { normalized < padSemVer(last) }
 
   /**
    * Holds if this version may be after `first`.
    */
   bindingset[first]
-  predicate maybeAfter(string first) { normalizeSemver(first) < normalized }
+  predicate maybeAfter(string first) { padSemVer(first) < normalized }
 
   /**
    * Holds if this version may be between `first` (inclusive) and `last` (exclusive).
    */
   bindingset[first, last]
   predicate maybeBetween(string first, string last) {
-    normalizeSemver(first) <= normalized and
-    normalized < normalizeSemver(last)
+    padSemVer(first) <= normalized and
+    normalized < padSemVer(last)
   }
 
   /**
    * Holds if this version is equivalent to `other`.
    */
   bindingset[other]
-  predicate is(string other) { normalized = normalizeSemver(other) }
+  predicate is(string other) { normalized = padSemVer(other) }
 
   /**
    * Gets the dependency that uses this string.
@@ -53,27 +54,6 @@ class DependencySemVer extends string {
   Dependency getDependency() { result = dep }
 }
 
-bindingset[str]
-private string leftPad(string str) { result = ("000" + str).suffix(str.length()) }
-
-/**
- * Normalizes a SemVer string such that the lexicographical ordering
- * of two normalized strings is consistent with the SemVer ordering.
- *
- * Pre-release information and build metadata is not yet supported.
- */
-bindingset[orig]
-private string normalizeSemver(string orig) {
-  exists(string pattern, string major, string minor, string patch |
-    pattern = "v?(\\d+)\\.(\\d+)\\.(\\d+)(\\D.*)?" and
-    major = orig.regexpCapture(pattern, 1) and
-    minor = orig.regexpCapture(pattern, 2) and
-    patch = orig.regexpCapture(pattern, 3)
-  |
-    result = leftPad(major) + "." + leftPad(minor) + "." + leftPad(patch)
-  )
-}
-
 /**
  * A version string in a dependency that has a SemVer, but also contains a git commit SHA.
  *
diff --git a/go/ql/lib/semmle/go/frameworks/Glog.qll b/go/ql/lib/semmle/go/frameworks/Glog.qll
index 9715cc910733..eb7210fd36d8 100644
--- a/go/ql/lib/semmle/go/frameworks/Glog.qll
+++ b/go/ql/lib/semmle/go/frameworks/Glog.qll
@@ -59,7 +59,7 @@ module Glog {
     /** Holds if this function takes a format string. */
     predicate formatter() { format = "f" }
 
-    override predicate mayReturnNormally() { level != "Fatal" and level != "Exit" }
+    override predicate mustNotReturnNormally() { level = "Fatal" or level = "Exit" }
   }
 
   private class StringFormatter extends StringOps::Formatting::Range instanceof GlogFunction {
diff --git a/go/ql/lib/semmle/go/frameworks/Logrus.qll b/go/ql/lib/semmle/go/frameworks/Logrus.qll
index 069764318d57..c3e3a1051acf 100644
--- a/go/ql/lib/semmle/go/frameworks/Logrus.qll
+++ b/go/ql/lib/semmle/go/frameworks/Logrus.qll
@@ -29,11 +29,9 @@ module Logrus {
       )
     }
 
-    override predicate mayReturnNormally() {
-      not exists(string level, string suffix | level = ["Fatal", "Panic"] |
-        this.getName() = level + suffix
-      )
-    }
+    override predicate mustNotReturnNormally() { this.getName() = "Fatal" + any(string suffix) }
+
+    override predicate mustPanic() { this.getName() = "Panic" + any(string suffix) }
   }
 
   private class StringFormatters extends StringOps::Formatting::Range instanceof LogFunction {
@@ -46,4 +44,11 @@ module Logrus {
 
     override int getFormatStringIndex() { result = argOffset }
   }
+
+  /** The `Exit` function, which ends the process. */
+  private class Exit extends Function {
+    Exit() { this.hasQualifiedName(packagePath(), "Exit") }
+
+    override predicate mustNotReturnNormally() { any() }
+  }
 }
diff --git a/go/ql/lib/semmle/go/frameworks/Revel.qll b/go/ql/lib/semmle/go/frameworks/Revel.qll
index c6250c2f8a51..085db1d2b0a8 100644
--- a/go/ql/lib/semmle/go/frameworks/Revel.qll
+++ b/go/ql/lib/semmle/go/frameworks/Revel.qll
@@ -154,7 +154,7 @@ module Revel {
 
   private IR::EvalInstruction skipImplicitFieldReads(IR::Instruction insn) {
     result = insn or
-    result = skipImplicitFieldReads(insn.(IR::ImplicitFieldReadInstruction).getBase())
+    result = skipImplicitFieldReads(insn.(IR::ImplicitFieldReadInstruction).getBaseInstruction())
   }
 
   /** A call to `Controller.Render`. */
diff --git a/go/ql/lib/semmle/go/frameworks/WebSocket.qll b/go/ql/lib/semmle/go/frameworks/WebSocket.qll
index 36c6db5c4536..e8657d296b3f 100644
--- a/go/ql/lib/semmle/go/frameworks/WebSocket.qll
+++ b/go/ql/lib/semmle/go/frameworks/WebSocket.qll
@@ -102,10 +102,10 @@ module WebSocketRequestCall {
   /**
    * A call to the `Dial` function of the `nhooyr.io/websocket` package.
    */
-  private class NhooyrWebSocketDialFunc extends Range {
-    NhooyrWebSocketDialFunc() {
+  private class CoderWebSocketDialFunc extends Range {
+    CoderWebSocketDialFunc() {
       // func Dial(ctx context.Context, u string, opts *DialOptions) (*Conn, *http.Response, error)
-      this.getTarget().hasQualifiedName(NhooyrWebSocket::packagePath(), "Dial")
+      this.getTarget().hasQualifiedName(CoderWebSocket::packagePath(), "Dial")
     }
 
     override DataFlow::Node getRequestUrl() { result = this.getArgument(1) }
@@ -188,10 +188,10 @@ module WebSocketReader {
   /**
    * The `Conn.Read` method of the `nhooyr.io/websocket` package.
    */
-  private class NhooyrWebSocketRead extends Range, Method {
-    NhooyrWebSocketRead() {
+  private class CoderWebSocketRead extends Range, Method {
+    CoderWebSocketRead() {
       // func (c *Conn) Read(ctx context.Context) (MessageType, []byte, error)
-      this.hasQualifiedName(NhooyrWebSocket::packagePath(), "Conn", "Read")
+      this.hasQualifiedName(CoderWebSocket::packagePath(), "Conn", "Read")
     }
 
     override FunctionOutput getAnOutput() { result.isResult(1) }
@@ -200,10 +200,10 @@ module WebSocketReader {
   /**
    * The `Conn.Reader` method of the `nhooyr.io/websocket` package.
    */
-  private class NhooyrWebSocketReader extends Range, Method {
-    NhooyrWebSocketReader() {
+  private class CoderWebSocketReader extends Range, Method {
+    CoderWebSocketReader() {
       // func (c *Conn) Reader(ctx context.Context) (MessageType, io.Reader, error)
-      this.hasQualifiedName(NhooyrWebSocket::packagePath(), "Conn", "Reader")
+      this.hasQualifiedName(CoderWebSocket::packagePath(), "Conn", "Reader")
     }
 
     override FunctionOutput getAnOutput() { result.isResult(1) }
@@ -313,12 +313,14 @@ module GolangOrgXNetWebsocket {
 }
 
 /**
- * Provides classes for working with the [nhooyr.io/websocket](http://nhooyr.io/websocket)
+ * Provides classes for working with the [coder/websocket](http://github.com/coder/websocket)
  * package.
  */
-module NhooyrWebSocket {
-  /** Gets the package name `nhooyr.io/websocket/`. */
-  string packagePath() { result = package("nhooyr.io/websocket", "") }
+module CoderWebSocket {
+  /** Gets the package name `github.com/coder/websocket` or `nhooyr.io/websocket`. */
+  string packagePath() {
+    result = package(["github.com/coder/websocket", "nhooyr.io/websocket"], "")
+  }
 }
 
 /**
diff --git a/go/ql/lib/semmle/go/frameworks/Zap.qll b/go/ql/lib/semmle/go/frameworks/Zap.qll
index cf0abcd9336e..95947d22116e 100644
--- a/go/ql/lib/semmle/go/frameworks/Zap.qll
+++ b/go/ql/lib/semmle/go/frameworks/Zap.qll
@@ -54,7 +54,7 @@ module Zap {
       this.hasQualifiedName(packagePath(), "SugaredLogger", "Fatal" + getSuffix())
     }
 
-    override predicate mayReturnNormally() { none() }
+    override predicate mustNotReturnNormally() { any() }
   }
 
   /** A Zap logging function which always panics. */
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingJson.qll b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingJson.qll
index bf6e25ff9f12..e04f9392def7 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingJson.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingJson.qll
@@ -41,9 +41,15 @@ module EncodingJson {
     FunctionOutput outp;
 
     FunctionModels() {
-      // signature: func NewEncoder(w io.Writer) *Encoder
-      this.hasQualifiedName("encoding/json", "NewEncoder") and
-      (inp.isResult() and outp.isParameter(0))
+      (
+        // signature: func NewEncoder(w io.Writer) *Encoder
+        this.hasQualifiedName("encoding/json", "NewEncoder")
+        or
+        // signature: func NewEncoder(w io.Writer, opts ...Options) *Encoder
+        this.hasQualifiedName("encoding/json/jsontext", "NewEncoder")
+      ) and
+      inp.isResult() and
+      outp.isParameter(0)
     }
 
     override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll
index 1ff1a4b320fa..fece3cbab9ae 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll
@@ -44,7 +44,7 @@ module Log {
       )
     }
 
-    override predicate mayReturnNormally() { none() }
+    override predicate mustNotReturnNormally() { any() }
   }
 
   /** A log function which must panic. */
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
index 0a633de08c82..6a3550e1cbd4 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
@@ -12,7 +12,7 @@ module Os {
   private class Exit extends Function {
     Exit() { this.hasQualifiedName("os", "Exit") }
 
-    override predicate mayReturnNormally() { none() }
+    override predicate mustNotReturnNormally() { any() }
   }
 
   // These models are not implemented using Models-as-Data because they represent reverse flow.
diff --git a/go/ql/lib/semmle/go/security/AllocationSizeOverflowCustomizations.qll b/go/ql/lib/semmle/go/security/AllocationSizeOverflowCustomizations.qll
index 3eced801f209..789aaec04a16 100644
--- a/go/ql/lib/semmle/go/security/AllocationSizeOverflowCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/AllocationSizeOverflowCustomizations.qll
@@ -73,7 +73,9 @@ module AllocationSizeOverflow {
 
   private predicate allocationSizeCheck(DataFlow::Node g, Expr e, boolean branch) {
     exists(DataFlow::Node lesser |
-      g.(DataFlow::RelationalComparisonNode).leq(branch, lesser, _, _) and
+      pragma[only_bind_into](g)
+          .(DataFlow::RelationalComparisonNode)
+          .leq(pragma[only_bind_into](branch), pragma[only_bind_into](lesser), _, _) and
       not lesser.isConst() and
       globalValueNumber(DataFlow::exprNode(e)) = globalValueNumber(lesser)
     )
diff --git a/go/ql/lib/semmle/go/security/InsecureFeatureFlag.qll b/go/ql/lib/semmle/go/security/InsecureFeatureFlag.qll
index 293f78507cc3..506d44077a04 100644
--- a/go/ql/lib/semmle/go/security/InsecureFeatureFlag.qll
+++ b/go/ql/lib/semmle/go/security/InsecureFeatureFlag.qll
@@ -3,6 +3,7 @@
  */
 
 import go
+private import semmle.go.controlflow.Guards
 
 /**
  * Provides classes and predicates relating to flags that may indicate security expectations.
@@ -114,9 +115,30 @@ module InsecureFeatureFlag {
   }
 
   /**
-   * Gets a control-flow node that represents a (likely) security feature-flag check
+   * Holds if `block` is controlled by a flag of kind `flagKind`.
+   *
+   * For a switch case expression, only the matching branch is controlled by that flag. Other
+   * branches, including the default case, are reached when the flag does not match.
    */
-  ControlFlow::ConditionGuardNode getASecurityFeatureFlagCheck() {
-    result.ensures(any(SecurityFeatureFlag f).getAFlag().getANode(), _)
+  predicate flagControls(FlagKind flagKind, BasicBlock block) {
+    exists(GVN flag, Guard guard |
+      flag = flagKind.getAFlag() and
+      guard = flag.getANode().asExpr() and
+      (
+        exists(CaseClause cc, ExpressionSwitchStmt switch |
+          guard.getParent() = cc and
+          cc = switch.getACase() and
+          exists(switch.getExpr()) and
+          caseExpressionMatchControls(guard, block)
+        )
+        or
+        not exists(CaseClause cc, ExpressionSwitchStmt switch |
+          guard.getParent() = cc and
+          cc = switch.getACase() and
+          exists(switch.getExpr())
+        ) and
+        guard.controls(block, _)
+      )
+    )
   }
 }
diff --git a/go/ql/lib/upgrades/5ff5325d274ae4f86defa195577bc7c1370b72fa/go.dbscheme b/go/ql/lib/upgrades/5ff5325d274ae4f86defa195577bc7c1370b72fa/go.dbscheme
new file mode 100644
index 000000000000..d0e7336b491e
--- /dev/null
+++ b/go/ql/lib/upgrades/5ff5325d274ae4f86defa195577bc7c1370b72fa/go.dbscheme
@@ -0,0 +1,564 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+/** Overlay support **/
+
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @definedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx, is_from_recv]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref,
+          int bound: @compositetype ref, int parent: @typeparamparentobject ref, int idx: int ref, boolean is_from_recv: boolean ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr
+| 55 = @rangeelementexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @definedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @definedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/ql/lib/upgrades/5ff5325d274ae4f86defa195577bc7c1370b72fa/old.dbscheme b/go/ql/lib/upgrades/5ff5325d274ae4f86defa195577bc7c1370b72fa/old.dbscheme
new file mode 100644
index 000000000000..5ff5325d274a
--- /dev/null
+++ b/go/ql/lib/upgrades/5ff5325d274ae4f86defa195577bc7c1370b72fa/old.dbscheme
@@ -0,0 +1,563 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+/** Overlay support **/
+
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @definedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx, is_from_recv]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref,
+          int bound: @compositetype ref, int parent: @typeparamparentobject ref, int idx: int ref, boolean is_from_recv: boolean ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @definedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @definedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/ql/lib/upgrades/5ff5325d274ae4f86defa195577bc7c1370b72fa/upgrade.properties b/go/ql/lib/upgrades/5ff5325d274ae4f86defa195577bc7c1370b72fa/upgrade.properties
new file mode 100644
index 000000000000..1a8bbabd727f
--- /dev/null
+++ b/go/ql/lib/upgrades/5ff5325d274ae4f86defa195577bc7c1370b72fa/upgrade.properties
@@ -0,0 +1,5 @@
+description: Add @rangeelementexpr, grouping the loop variables of a range statement
+compatibility: full
+
+exprs.rel: run upgrade.qlo new_exprs
+has_location.rel: run upgrade.qlo new_has_location
diff --git a/go/ql/lib/upgrades/5ff5325d274ae4f86defa195577bc7c1370b72fa/upgrade.ql b/go/ql/lib/upgrades/5ff5325d274ae4f86defa195577bc7c1370b72fa/upgrade.ql
new file mode 100644
index 000000000000..cbf128324d8a
--- /dev/null
+++ b/go/ql/lib/upgrades/5ff5325d274ae4f86defa195577bc7c1370b72fa/upgrade.ql
@@ -0,0 +1,69 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class ExprParent extends @exprparent {
+  string toString() { none() }
+}
+
+class RangeStmt extends @rangestmt {
+  string toString() { none() }
+}
+
+class Location extends @location {
+  string toString() { none() }
+}
+
+newtype TAddedExpr = TRangeElement(RangeStmt stmt)
+
+module Fresh = QlBuiltins::NewEntity<TAddedExpr>;
+
+class TNewExpr = @expr or Fresh::EntityId;
+
+class NewExpr extends TNewExpr {
+  string toString() { none() }
+}
+
+class TNewExprParent = @exprparent or Fresh::EntityId;
+
+class NewExprParent extends TNewExprParent {
+  string toString() { none() }
+}
+
+class TNewLocatable = @locatable or Fresh::EntityId;
+
+class NewLocatable extends TNewLocatable {
+  string toString() { none() }
+}
+
+predicate isRangeElementChild(ExprParent parent, int idx, RangeStmt range) {
+  parent = range and
+  idx in [0 .. 1]
+}
+
+query predicate new_exprs(NewExpr id, int kind, NewExprParent parent, int idx) {
+  exists(RangeStmt range |
+    id = Fresh::map(TRangeElement(range)) and
+    kind = 55 and
+    parent = range and
+    idx = 0
+  )
+  or
+  exists(ExprParent oldParent | exprs(id, kind, oldParent, idx) |
+    exists(RangeStmt range | isRangeElementChild(oldParent, idx, range) |
+      parent = Fresh::map(TRangeElement(range))
+    )
+    or
+    not isRangeElementChild(oldParent, idx, _) and
+    parent = oldParent
+  )
+}
+
+query predicate new_has_location(NewLocatable locatable, Location location) {
+  has_location(locatable, location)
+  or
+  exists(RangeStmt range |
+    locatable = Fresh::map(TRangeElement(range)) and
+    has_location(range, location)
+  )
+}
diff --git a/go/ql/lib/upgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/go.dbscheme b/go/ql/lib/upgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/go.dbscheme
new file mode 100644
index 000000000000..b4012cfa6fa7
--- /dev/null
+++ b/go/ql/lib/upgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/go.dbscheme
@@ -0,0 +1,565 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+/** Overlay support **/
+
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+isParenthesized(unique int id: @expr ref, int parentheses: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @definedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx, is_from_recv]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref,
+          int bound: @compositetype ref, int parent: @typeparamparentobject ref, int idx: int ref, boolean is_from_recv: boolean ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr
+| 55 = @rangeelementexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @definedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @definedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
diff --git a/go/ql/lib/upgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/old.dbscheme b/go/ql/lib/upgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/old.dbscheme
new file mode 100644
index 000000000000..d0e7336b491e
--- /dev/null
+++ b/go/ql/lib/upgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/old.dbscheme
@@ -0,0 +1,564 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+/** Overlay support **/
+
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @definedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx, is_from_recv]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref,
+          int bound: @compositetype ref, int parent: @typeparamparentobject ref, int idx: int ref, boolean is_from_recv: boolean ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr
+| 55 = @rangeelementexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @definedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @definedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/ql/lib/upgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/upgrade.properties b/go/ql/lib/upgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/upgrade.properties
new file mode 100644
index 000000000000..3874b6cb69b2
--- /dev/null
+++ b/go/ql/lib/upgrades/d0e7336b491e35a4c890e0b9755a4030d32ee444/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add table recording the number of parentheses around expressions
+compatibility: backwards
diff --git a/go/ql/lib/utils/test/InlineExpectationsTestQuery.ql b/go/ql/lib/utils/test/InlineExpectationsTestQuery.ql
index 1cf2f5ea1d9b..0d7462c57056 100644
--- a/go/ql/lib/utils/test/InlineExpectationsTestQuery.ql
+++ b/go/ql/lib/utils/test/InlineExpectationsTestQuery.ql
@@ -6,16 +6,4 @@ private import go
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>
diff --git a/go/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll b/go/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
index 3bdc948842c7..3084c4846795 100644
--- a/go/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/go/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
@@ -20,4 +20,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = G::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(G::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }
diff --git a/go/ql/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index 6d012f9d2a4d..ea8e2bb9b2c6 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.6.14
+
+No user-facing changes.
+
+## 1.6.13
+
+No user-facing changes.
+
+## 1.6.12
+
+No user-facing changes.
+
+## 1.6.11
+
+No user-facing changes.
+
+## 1.6.10
+
+No user-facing changes.
+
+## 1.6.9
+
+No user-facing changes.
+
+## 1.6.8
+
+No user-facing changes.
+
 ## 1.6.7
 
 No user-facing changes.
diff --git a/go/ql/src/InconsistentCode/ConstantLengthComparison.ql b/go/ql/src/InconsistentCode/ConstantLengthComparison.ql
index d0bcec7a89cb..6b722d887ae6 100644
--- a/go/ql/src/InconsistentCode/ConstantLengthComparison.ql
+++ b/go/ql/src/InconsistentCode/ConstantLengthComparison.ql
@@ -13,10 +13,11 @@
  */
 
 import go
+private import semmle.go.controlflow.Guards
 
 from
-  ForStmt fs, Variable i, DataFlow::ElementReadNode idx, GVN a,
-  ControlFlow::ConditionGuardNode cond, DataFlow::CallNode lenA
+  ForStmt fs, Variable i, DataFlow::ElementReadNode idx, GVN a, Guard cond, boolean branch,
+  DataFlow::CallNode lenA
 where
   // `i` is incremented in `fs`
   fs.getPost().(IncStmt).getOperand() = i.getAReference() and
@@ -27,11 +28,11 @@ where
   lenA.getArgument(0) = a.getANode() and
   // and is checked against a constant
   exists(DataFlow::Node const | exists(const.getIntValue()) |
-    cond.ensuresNeq(lenA, const) or
-    cond.ensuresLeq(const, lenA, _)
+    guardEnsuresNeq(cond, branch, lenA, const) or
+    guardEnsuresLeq(cond, branch, const, lenA, _)
   ) and
-  cond.dominates(idx.getBasicBlock()) and
+  cond.controls(idx.getBasicBlock(), branch) and
   // and that check happens inside the loop body
-  cond.getCondition().getParent+() = fs
-select cond.getCondition(), "This checks the length against a constant, but it $@.", idx,
+  cond.(Expr).getParent+() = fs
+select cond, "This checks the length against a constant, but it $@.", idx,
   "is indexed using a variable"
diff --git a/go/ql/src/InconsistentCode/LengthComparisonOffByOne.ql b/go/ql/src/InconsistentCode/LengthComparisonOffByOne.ql
index 176e34bc9bbb..632c1afe143b 100644
--- a/go/ql/src/InconsistentCode/LengthComparisonOffByOne.ql
+++ b/go/ql/src/InconsistentCode/LengthComparisonOffByOne.ql
@@ -13,6 +13,7 @@
  */
 
 import go
+private import semmle.go.controlflow.Guards
 
 newtype TIndex =
   VariableIndex(DataFlow::SsaNode v) { v.getAUse() = any(DataFlow::ElementReadNode e).getIndex() } or
@@ -41,21 +42,29 @@ DataFlow::CallNode arrayLen(DataFlow::SsaNode array) {
 }
 
 /**
- * Gets a condition that checks that `index` is less than or equal to `array.length`.
+ * Holds if `guard` evaluating to `branch` checks that `index` is less than or equal to
+ * `array.length`.
  */
-ControlFlow::ConditionGuardNode getLengthLEGuard(Index index, DataFlow::SsaNode array) {
-  result.ensuresLeq(getAUse(index), arrayLen(array), 0)
+predicate lengthLeGuard(Guard guard, boolean branch, Index index, DataFlow::SsaNode array) {
+  guardEnsuresLeq(guard, branch, getAUse(index), arrayLen(array), 0)
   or
   exists(int i, int bias | index = ConstantIndex(i) |
-    result.ensuresLeq(getAUse(ConstantIndex(i + bias)), arrayLen(array), bias)
+    guardEnsuresLeq(guard, branch, getAUse(ConstantIndex(i + bias)), arrayLen(array), bias)
   )
 }
 
+predicate isControllingLengthLeGuard(
+  Guard guard, boolean branch, Index index, DataFlow::SsaNode array, BasicBlock bb
+) {
+  lengthLeGuard(guard, branch, index, array) and
+  guard.controls(bb, branch)
+}
+
 /**
- * Gets a condition that checks that `index` is not equal to `array.length`.
+ * Holds if `guard` evaluating to `branch` checks that `index` is not equal to `array.length`.
  */
-ControlFlow::ConditionGuardNode getLengthNEGuard(Index index, DataFlow::SsaNode array) {
-  result.ensuresNeq(getAUse(index), arrayLen(array))
+predicate lengthNeGuard(Guard guard, boolean branch, Index index, DataFlow::SsaNode array) {
+  guardEnsuresNeq(guard, branch, getAUse(index), arrayLen(array))
 }
 
 /**
@@ -78,23 +87,27 @@ predicate isRegexpMethodCall(DataFlow::MethodCallNode c) {
 }
 
 from
-  ControlFlow::ConditionGuardNode cond, DataFlow::SsaNode array, Index index,
-  DataFlow::ElementReadNode ea, BasicBlock bb
+  Guard cond, boolean branch, DataFlow::SsaNode array, Index index, DataFlow::ElementReadNode ea,
+  BasicBlock bb
 where
-  // there is a comparison `index <= len(array)`
-  cond = getLengthLEGuard(index, array) and
   // there is a read from `array[index]`
   elementRead(ea, array, index, bb) and
-  // and the read is guarded by the comparison
-  cond.dominates(bb) and
+  // and it is guarded by a comparison `index <= len(array)`
+  isControllingLengthLeGuard(cond, branch, index, array, bb) and
+  // and report the innermost guard that establishes the comparison
+  not exists(Guard innerCond |
+    isControllingLengthLeGuard(innerCond, _, index, array, bb) and
+    innerCond.(Expr).getParent+() = cond.(Expr)
+  ) and
   // but the read is not guarded by another check that `index != len(array)`
-  not getLengthNEGuard(index, array).dominates(bb) and
+  not exists(Guard ne, boolean neBranch |
+    lengthNeGuard(ne, neBranch, index, array) and ne.controls(bb, neBranch)
+  ) and
   // and it is not additionally guarded by a stronger index check
   not exists(Index index2, int i, int i2 |
     index = ConstantIndex(i) and index2 = ConstantIndex(i2) and i < i2
   |
-    getLengthLEGuard(index2, array).dominates(bb)
+    isControllingLengthLeGuard(_, _, index2, array, bb)
   ) and
   not isRegexpMethodCall(array.getInit())
-select cond.getCondition(),
-  "Off-by-one index comparison against length may lead to out-of-bounds $@.", ea, "read"
+select cond, "Off-by-one index comparison against length may lead to out-of-bounds $@.", ea, "read"
diff --git a/go/ql/src/InconsistentCode/WhitespaceContradictsPrecedence.ql b/go/ql/src/InconsistentCode/WhitespaceContradictsPrecedence.ql
index 7e2846cf6b2f..77706822f1fb 100644
--- a/go/ql/src/InconsistentCode/WhitespaceContradictsPrecedence.ql
+++ b/go/ql/src/InconsistentCode/WhitespaceContradictsPrecedence.ql
@@ -67,20 +67,31 @@ class HarmlessNestedExpr extends BinaryExpr {
  */
 predicate interestingNesting(BinaryExpr inner, BinaryExpr outer) {
   inner = outer.getAChildExpr() and
+  not isParenthesized(inner, _) and
   not inner instanceof AssocNestedExpr and
   not inner instanceof HarmlessNestedExpr
 }
 
+private int getNumberOfParentheses(Expr expr) {
+  isParenthesized(expr, result)
+  or
+  not isParenthesized(expr, _) and result = 0
+}
+
 /** Gets the number of whitespace characters around the operator `op` of `be`. */
 int getWhitespaceAroundOperator(BinaryExpr be, string op) {
-  exists(Location left, Location right |
+  exists(Location left, Location right, int leftParens, int rightParens |
     be.getLeftOperand().getLocation() = left and
     be.getRightOperand().getLocation() = right and
     left.getFile() = right.getFile() and
-    left.getStartLine() = right.getStartLine()
+    left.getStartLine() = right.getStartLine() and
+    leftParens = getNumberOfParentheses(be.getLeftOperand()) and
+    rightParens = getNumberOfParentheses(be.getRightOperand())
   |
     op = be.getOperator() and
-    result = (right.getStartColumn() - left.getEndColumn() - op.length() - 1) / 2
+    result =
+      (right.getStartColumn() - left.getEndColumn() - op.length() - leftParens - rightParens - 1) /
+        2
   )
 }
 
diff --git a/go/ql/src/RedundantCode/DeadStoreOfField.ql b/go/ql/src/RedundantCode/DeadStoreOfField.ql
index 4a971343823b..fbe0fcf04c2e 100644
--- a/go/ql/src/RedundantCode/DeadStoreOfField.ql
+++ b/go/ql/src/RedundantCode/DeadStoreOfField.ql
@@ -86,7 +86,7 @@ Type getTypeEmbeddedViaPointer(Type t) {
   result = getEmbeddedType*(getEmbeddedType(getEmbeddedType*(t), true))
 }
 
-from Write w, LocalVariable v, Field f
+from Write w, LocalVariable v, Field f, Expr lhs
 where
   // `w` writes `f` on `v`
   w.writesFieldPreUpdate(v.getARead(), f, _) and
@@ -97,5 +97,9 @@ where
   // exclude escaping `v`; there may be reads in other functions
   not exists(Read r | r.reads(v) | escapes(r)) and
   // exclude fields promoted through an embedded pointer type
-  not f = getTypeEmbeddedViaPointer(v.getType()).getField(_)
-select w, "This assignment to " + f + " is useless since its value is never read."
+  not f = getTypeEmbeddedViaPointer(v.getType()).getField(_) and
+  // Report the assigned field expression rather than the whole write instruction. A field write
+  // `v.f = ...` always has an explicit left-hand side expression (the `v.f` selector), so this
+  // does not drop any results.
+  lhs = w.getLhs().getExpr()
+select lhs, "This assignment to " + f + " is useless since its value is never read."
diff --git a/go/ql/src/RedundantCode/DeadStoreOfLocal.qhelp b/go/ql/src/RedundantCode/DeadStoreOfLocal.qhelp
index fd8d49d6bcd2..9e9aa12da8a1 100644
--- a/go/ql/src/RedundantCode/DeadStoreOfLocal.qhelp
+++ b/go/ql/src/RedundantCode/DeadStoreOfLocal.qhelp
@@ -39,7 +39,7 @@ use <code>_</code>.
 </example>
 
 <references>
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Dead_store">Dead store</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Dead_store">Dead store</a>.</li>
 <li>The Go Programming Language Specification: <a href="https://golang.org/ref/spec#Blank_identifier">Blank identifier</a>.</li>
 </references>
 </qhelp>
diff --git a/go/ql/src/RedundantCode/DeadStoreOfLocal.ql b/go/ql/src/RedundantCode/DeadStoreOfLocal.ql
index 3e3642f92db1..2b6886222aa4 100644
--- a/go/ql/src/RedundantCode/DeadStoreOfLocal.ql
+++ b/go/ql/src/RedundantCode/DeadStoreOfLocal.ql
@@ -26,10 +26,10 @@ predicate isSimple(IR::Instruction nd) {
   nd = IR::implicitInitInstruction(_)
   or
   // don't flag parameters
-  nd instanceof IR::ReadArgumentInstruction
+  nd instanceof IR::InitParameterInstruction
 }
 
-from IR::Instruction def, SsaSourceVariable target, IR::Instruction rhs
+from IR::WriteInstruction def, SsaSourceVariable target, IR::Instruction rhs, Expr lhs
 where
   def.writes(target, rhs) and
   not exists(SsaExplicitDefinition ssa | ssa.getInstruction() = def) and
@@ -37,8 +37,17 @@ where
   def.getBasicBlock() instanceof ReachableBasicBlock and
   // exclude assignments with default values or simple expressions
   not isSimple(rhs) and
-  // exclude variables that are not used at all
-  exists(target.getAReference()) and
+  // exclude variables that are not used in reachable code
+  exists(IR::Instruction ref |
+    ref != def and
+    (ref.reads(target) or ref.writes(target, _))
+  ) and
   // exclude variables with indirect references
-  not target.mayHaveIndirectReferences()
-select def, "This definition of " + target + " is never used."
+  not target.mayHaveIndirectReferences() and
+  // Report the assigned variable rather than the whole write instruction. A write to an
+  // `SsaSourceVariable` that survives the `SsaExplicitDefinition` exclusion above always has an
+  // explicit left-hand side expression (writes without one, such as result-variable writes at a
+  // `return`, are `SsaExplicitDefinition`s and so are already excluded), so this does not drop
+  // any results.
+  lhs = def.getLhs().getExpr()
+select lhs, "This definition of " + target + " is never used."
diff --git a/go/ql/src/RedundantCode/DuplicateBranches.ql b/go/ql/src/RedundantCode/DuplicateBranches.ql
index 589aa55246cd..0640fc8fcbbc 100644
--- a/go/ql/src/RedundantCode/DuplicateBranches.ql
+++ b/go/ql/src/RedundantCode/DuplicateBranches.ql
@@ -23,4 +23,4 @@ where
   thenBranch = is.getThen() and
   elseBranch = is.getElse() and
   thenBranch.hash() = elseBranch.hash()
-select is.getCond(), "The 'then' and 'else' branches of this if statement are identical."
+select is.getCondition(), "The 'then' and 'else' branches of this if statement are identical."
diff --git a/go/ql/src/RedundantCode/DuplicateCondition.ql b/go/ql/src/RedundantCode/DuplicateCondition.ql
index e0ea97980438..9a256d0519f7 100644
--- a/go/ql/src/RedundantCode/DuplicateCondition.ql
+++ b/go/ql/src/RedundantCode/DuplicateCondition.ql
@@ -16,7 +16,7 @@ import go
 
 /** Gets the `i`th condition in the `if`-`else if` chain starting at `stmt`. */
 Expr getCondition(IfStmt stmt, int i) {
-  i = 0 and result = stmt.getCond()
+  i = 0 and result = stmt.getCondition()
   or
   exists(IfStmt elsif | elsif = stmt.getElse() |
     not exists(elsif.getInit()) and
diff --git a/go/ql/src/RedundantCode/UnreachableStatement.qhelp b/go/ql/src/RedundantCode/UnreachableStatement.qhelp
index ae3feadf2402..153bb7f20be1 100644
--- a/go/ql/src/RedundantCode/UnreachableStatement.qhelp
+++ b/go/ql/src/RedundantCode/UnreachableStatement.qhelp
@@ -31,6 +31,6 @@ statement:
 </example>
 
 <references>
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Unreachable_code">Unreachable code</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Unreachable_code">Unreachable code</a>.</li>
 </references>
 </qhelp>
diff --git a/go/ql/src/RedundantCode/UnreachableStatement.ql b/go/ql/src/RedundantCode/UnreachableStatement.ql
index 12b035049e9e..edd2b17ab674 100644
--- a/go/ql/src/RedundantCode/UnreachableStatement.ql
+++ b/go/ql/src/RedundantCode/UnreachableStatement.ql
@@ -14,11 +14,45 @@
 
 import go
 
-ControlFlow::Node nonGuardPredecessor(ControlFlow::Node nd) {
-  exists(ControlFlow::Node pred | pred = nd.getAPredecessor() |
-    if pred instanceof ControlFlow::ConditionGuardNode
-    then result = nonGuardPredecessor(pred)
-    else result = pred
+/**
+ * Holds if `s` is reachable, that is, the control-flow graph contains a node for it.
+ *
+ * The shared control-flow library does not create control-flow nodes for dead code, so an
+ * unreachable statement has no first control-flow node.
+ */
+predicate isReachable(Stmt s) { exists(s.getFirstControlFlowNode()) }
+
+/** Gets the statement immediately preceding `s` in a statement list, if any. */
+Stmt getPreviousStmt(Stmt s) {
+  exists(BlockStmt b, int i | s = b.getStmt(i) and result = b.getStmt(i - 1))
+  or
+  exists(CaseClause c, int i | s = c.getStmt(i) and result = c.getStmt(i - 1))
+  or
+  exists(CommClause c, int i | s = c.getStmt(i) and result = c.getStmt(i - 1))
+}
+
+/**
+ * Holds if `s` is unreachable but the code that would precede it in the control-flow graph is
+ * reachable, so that `s` is the first unreachable statement in a run of dead code.
+ */
+predicate firstUnreachableStmt(Stmt s) {
+  not isReachable(s) and
+  (
+    // a statement whose preceding statement in the same list is reachable
+    isReachable(getPreviousStmt(s))
+    or
+    // the post statement of a `for` loop whose body is entered
+    exists(ForStmt f | s = f.getPost() and isReachable(f.getBody().getAStmt()))
+  )
+}
+
+/** Holds if `s` is in a run of unreachable statements following a constant condition. */
+predicate isInUnreachableRunAfterConstantCondition(Stmt s) {
+  not isReachable(s) and
+  (
+    exists(getPreviousStmt(s).(IfStmt).getCondition().getBoolValue())
+    or
+    isInUnreachableRunAfterConstantCondition(getPreviousStmt(s))
   )
 }
 
@@ -53,6 +87,8 @@ predicate isAllowedReturnValue(Expr retval) {
  * Matches if `s` is an allowed unreachable statement.
  */
 predicate allowlist(Stmt s) {
+  s instanceof EmptyStmt
+  or
   // `panic("unreachable")` and similar
   exists(CallExpr ce | ce = s.(ExprStmt).getExpr() or ce = s.(ReturnStmt).getExpr() |
     ce.getTarget().mustPanic() or ce.getCalleeName().toLowerCase() = "error"
@@ -62,19 +98,28 @@ predicate allowlist(Stmt s) {
   exists(ReturnStmt ret | ret = s |
     forall(Expr retval | retval = ret.getAnExpr() | isAllowedReturnValue(retval))
   )
-  or
-  // statements in an `if false { ... }` and similar
-  exists(IfStmt is, ControlFlow::ConditionGuardNode iffalse, Expr cond, boolean b |
-    iffalse.getCondition() = is.getCond() and
-    iffalse = s.getFirstControlFlowNode().getAPredecessor() and
-    cond.getBoolValue() = b and
-    iffalse.ensures(DataFlow::exprNode(cond), b.booleanNot())
+}
+
+Stmt firstNonAllowlisted(Stmt s) {
+  not isReachable(s) and
+  (
+    not allowlist(s) and result = s
+    or
+    allowlist(s) and
+    exists(Stmt next | getPreviousStmt(next) = s | result = firstNonAllowlisted(next))
+  )
+}
+
+/** Holds if `s` is the first non-allowlisted statement in a run of unreachable statements. */
+predicate firstNonAllowlistedUnreachableStmt(Stmt s) {
+  exists(Stmt unreachable |
+    firstUnreachableStmt(unreachable) and
+    s = firstNonAllowlisted(unreachable)
   )
 }
 
-from Stmt s, ControlFlow::Node fst
+from Stmt s
 where
-  fst = s.getFirstControlFlowNode() and
-  not exists(nonGuardPredecessor(fst)) and
-  not allowlist(s)
+  firstNonAllowlistedUnreachableStmt(s) and
+  not isInUnreachableRunAfterConstantCondition(s)
 select s, "This statement is unreachable."
diff --git a/go/ql/src/Security/CWE-020/IncompleteHostnameRegexp.ql b/go/ql/src/Security/CWE-020/IncompleteHostnameRegexp.ql
index a6321b7d7cb3..76b694e3bfe9 100644
--- a/go/ql/src/Security/CWE-020/IncompleteHostnameRegexp.ql
+++ b/go/ql/src/Security/CWE-020/IncompleteHostnameRegexp.ql
@@ -13,6 +13,7 @@
  */
 
 import go
+private import semmle.go.controlflow.Guards
 
 /**
  * Holds if `pattern` is a regular expression pattern for URLs with a host matched by `hostPart`,
@@ -70,12 +71,12 @@ predicate regexpGuardsHandler(RegexpPattern regexp, Http::RequestHandler handler
 
 /** Holds if `regexp` guards an HTTP error write. */
 predicate regexpGuardsError(RegexpPattern regexp) {
-  exists(ControlFlow::ConditionGuardNode cond, RegexpMatchFunction match, DataFlow::CallNode call |
+  exists(Guard cond, RegexpMatchFunction match, DataFlow::CallNode call |
     call.getTarget() = match and
     match.getRegexp(call) = regexp
   |
-    cond.ensures(match.getResult().getNode(call).getASuccessor*(), true) and
-    cond.dominates(any(ReachableBasicBlock b | writesHttpError(b)))
+    cond = match.getResult().getNode(call).getASuccessor*().asExpr() and
+    cond.controls(any(ReachableBasicBlock b | writesHttpError(b)), true)
   )
 }
 
diff --git a/go/ql/src/Security/CWE-078/CommandInjection.qhelp b/go/ql/src/Security/CWE-078/CommandInjection.qhelp
index 1623268c5675..b59730db0cf1 100644
--- a/go/ql/src/Security/CWE-078/CommandInjection.qhelp
+++ b/go/ql/src/Security/CWE-078/CommandInjection.qhelp
@@ -58,7 +58,7 @@ not interpreted as flags, or verify that the argument does not start with <code>
 </example>
 <references>
 <li>
-OWASP: <a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+OWASP: <a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 </references>
 </qhelp>
diff --git a/go/ql/src/Security/CWE-078/StoredCommand.qhelp b/go/ql/src/Security/CWE-078/StoredCommand.qhelp
index 48800c753ce5..43317ab77b3b 100644
--- a/go/ql/src/Security/CWE-078/StoredCommand.qhelp
+++ b/go/ql/src/Security/CWE-078/StoredCommand.qhelp
@@ -39,7 +39,7 @@ ensure that commands are checked against a whitelist:
 
 <references>
 <li>
-OWASP: <a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+OWASP: <a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 </references>
 </qhelp>
diff --git a/go/ql/src/Security/CWE-079/ReflectedXss.qhelp b/go/ql/src/Security/CWE-079/ReflectedXss.qhelp
index 038c7646d0fa..6dded43ac116 100644
--- a/go/ql/src/Security/CWE-079/ReflectedXss.qhelp
+++ b/go/ql/src/Security/CWE-079/ReflectedXss.qhelp
@@ -46,7 +46,7 @@ OWASP
 Scripting</a>.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 </li>
 </references>
 </qhelp>
diff --git a/go/ql/src/Security/CWE-079/StoredXss.qhelp b/go/ql/src/Security/CWE-079/StoredXss.qhelp
index 3cb059cc6f02..a5aab38c92f5 100644
--- a/go/ql/src/Security/CWE-079/StoredXss.qhelp
+++ b/go/ql/src/Security/CWE-079/StoredXss.qhelp
@@ -57,7 +57,7 @@
 		Scripting</a>.
 	</li>
 	<li>
-		Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+		Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 	</li>
 </references>
 </qhelp>
diff --git a/go/ql/src/Security/CWE-089/StringBreak.qhelp b/go/ql/src/Security/CWE-089/StringBreak.qhelp
index 399eb8170e41..46ef8a6c0941 100644
--- a/go/ql/src/Security/CWE-089/StringBreak.qhelp
+++ b/go/ql/src/Security/CWE-089/StringBreak.qhelp
@@ -67,6 +67,6 @@ that it has two limitations:
 
 <references>
 <li>Wikipedia: <a href="https://en.wikipedia.org/wiki/SQL_injection">SQL injection</a>.</li>
-<li>OWASP: <a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.</li>
+<li>OWASP: <a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.</li>
 </references>
 </qhelp>
diff --git a/go/ql/src/Security/CWE-209/StackTraceExposure.ql b/go/ql/src/Security/CWE-209/StackTraceExposure.ql
index 45d58f442c32..4be0867b33f5 100644
--- a/go/ql/src/Security/CWE-209/StackTraceExposure.ql
+++ b/go/ql/src/Security/CWE-209/StackTraceExposure.ql
@@ -15,6 +15,7 @@
 
 import go
 import semmle.go.security.InsecureFeatureFlag::InsecureFeatureFlag
+private import semmle.go.controlflow.Guards
 
 /**
  * A flag indicating the program is in debug or development mode, or that stack
@@ -56,11 +57,7 @@ module StackTraceExposureConfig implements DataFlow::ConfigSig {
     // Sanitize everything controlled by an is-debug-mode check.
     // Imprecision: I don't try to guess which arm of a branch is intended
     // to mean debug mode, and which is production mode.
-    exists(ControlFlow::ConditionGuardNode cgn |
-      cgn.ensures(any(DebugModeFlag f).getAFlag().getANode(), _)
-    |
-      cgn.dominates(node.getBasicBlock())
-    )
+    flagControls(any(DebugModeFlag f), node.getBasicBlock())
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
diff --git a/go/ql/src/Security/CWE-295/DisabledCertificateCheck.ql b/go/ql/src/Security/CWE-295/DisabledCertificateCheck.ql
index bc05c8cf4aa8..80b19196cc1b 100644
--- a/go/ql/src/Security/CWE-295/DisabledCertificateCheck.ql
+++ b/go/ql/src/Security/CWE-295/DisabledCertificateCheck.ql
@@ -24,6 +24,7 @@
 
 import go
 import semmle.go.security.InsecureFeatureFlag::InsecureFeatureFlag
+private import semmle.go.controlflow.Guards
 
 /**
  * Holds if `part` becomes a part of `whole`, either by (local) data flow or by being incorporated
@@ -49,13 +50,6 @@ class InsecureCertificateFlag extends FlagKind {
   }
 }
 
-/**
- * Gets a control-flow node that represents a (likely) flag controlling an insecure certificate setup.
- */
-ControlFlow::ConditionGuardNode getAnInsecureCertificateCheck() {
-  result.ensures(any(InsecureCertificateFlag f).getAFlag().getANode(), _)
-}
-
 /**
  * Returns flag kinds relevant to this query: a generic security feature flag, or one
  * specifically controlling insecure certificate configuration.
@@ -80,7 +74,7 @@ where
   f.hasQualifiedName("crypto/tls", "Config", "InsecureSkipVerify") and
   rhs.getBoolValue() = true and
   // exclude writes guarded by a feature flag
-  not [getASecurityFeatureFlagCheck(), getAnInsecureCertificateCheck()].dominatesNode(w) and
+  not flagControls(securityOrTlsVersionFlag(), w.getBasicBlock()) and
   // exclude results in functions whose name documents the insecurity
   not exists(FuncDef fn | fn = w.getRoot() |
     isSecurityOrCertificateConfigFlag(fn.getEnclosingFunction*().getName())
diff --git a/go/ql/src/Security/CWE-312/CleartextLogging.qhelp b/go/ql/src/Security/CWE-312/CleartextLogging.qhelp
index e8326e59999b..9e35d1713678 100644
--- a/go/ql/src/Security/CWE-312/CleartextLogging.qhelp
+++ b/go/ql/src/Security/CWE-312/CleartextLogging.qhelp
@@ -44,7 +44,7 @@ Instead, the credentials should be encrypted, obfuscated, or omitted entirely:
 
 <li>M. Dowd, J. McDonald and J. Schuhm, <i>The Art of Software Security Assessment</i>, 1st Edition, Chapter 2 - 'Common Vulnerabilities of Encryption', p. 43. Addison Wesley, 2006.</li>
 <li>M. Howard and D. LeBlanc, <i>Writing Secure Code</i>, 2nd Edition, Chapter 9 - 'Protecting Secret Data', p. 299. Microsoft, 2002.</li>
-<li>OWASP: <a href="https://www.owasp.org/index.php/Password_Plaintext_Storage">Password Plaintext Storage</a>.</li>
+<li>OWASP: <a href="https://cheatsheetseries.owasp.org/cheatsheets/Logging_Cheat_Sheet.html">Logging Cheat Sheet</a>.</li>
 
 </references>
 </qhelp>
diff --git a/go/ql/src/Security/CWE-327/InsecureTLS.ql b/go/ql/src/Security/CWE-327/InsecureTLS.ql
index b5d8a81f3d82..559af3060c1d 100644
--- a/go/ql/src/Security/CWE-327/InsecureTLS.ql
+++ b/go/ql/src/Security/CWE-327/InsecureTLS.ql
@@ -13,6 +13,7 @@
 
 import go
 import semmle.go.security.InsecureFeatureFlag::InsecureFeatureFlag
+private import semmle.go.controlflow.Guards
 
 /**
  * Holds if it is insecure to assign TLS version `val` named `name` to `tls.Config` field `fieldName`.
@@ -246,13 +247,6 @@ class LegacyTlsVersionFlag extends FlagKind {
   override string getAFlagName() { result.regexpMatch("(?i).*(old|intermediate|legacy).*") }
 }
 
-/**
- * Gets a control-flow node that represents a (likely) flag controlling TLS version selection.
- */
-ControlFlow::ConditionGuardNode getALegacyTlsVersionCheck() {
-  result.ensures(any(LegacyTlsVersionFlag f).getAFlag().getANode(), _)
-}
-
 /**
  * Returns flag kinds relevant to this query: a generic security feature flag, or one
  * specifically controlling TLS version selection.
@@ -275,8 +269,7 @@ where
     isInsecureTlsCipherFlow(source.asPathNode2(), sink.asPathNode2(), message)
   ) and
   // Exclude sources or sinks guarded by a feature or legacy flag
-  not [getASecurityFeatureFlagCheck(), getALegacyTlsVersionCheck()]
-      .dominatesNode([source, sink].getNode().asInstruction()) and
+  not flagControls(securityOrTlsVersionFlag(), [source, sink].getNode().getBasicBlock()) and
   // Exclude sources or sinks that occur lexically within a block related to a feature or legacy flag
   not astNodeIsFlag([source, sink].getNode().asExpr().getParent*(), securityOrTlsVersionFlag()) and
   // Exclude results in functions whose name documents insecurity
diff --git a/go/ql/src/Security/CWE-338/InsecureRandomness.qhelp b/go/ql/src/Security/CWE-338/InsecureRandomness.qhelp
index fb61773a6dfc..0b9899657c36 100644
--- a/go/ql/src/Security/CWE-338/InsecureRandomness.qhelp
+++ b/go/ql/src/Security/CWE-338/InsecureRandomness.qhelp
@@ -42,7 +42,7 @@ Instead, use <code>crypto/rand</code>:
 </example>
 
 <references>
-  <li>Wikipedia. <a href="http://en.wikipedia.org/wiki/Pseudorandom_number_generator">Pseudo-random number generator</a>.</li>
+  <li>Wikipedia. <a href="https://en.wikipedia.org/wiki/Pseudorandom_number_generator">Pseudo-random number generator</a>.</li>
   <li>OWASP: <a href="https://owasp.org/www-community/vulnerabilities/Insecure_Randomness">Insecure Randomness</a>.</li>
   <li>OWASP: <a href="https://cheatsheetseries.owasp.org/cheatsheets/Cryptographic_Storage_Cheat_Sheet.html#secure-random-number-generation">Secure Random Number Generation</a>.</li>
 </references>
diff --git a/go/ql/src/change-notes/2026-09-30-model-maps-package.md b/go/ql/src/change-notes/2026-09-30-model-maps-package.md
new file mode 100644
index 000000000000..a99a8c1c40ae
--- /dev/null
+++ b/go/ql/src/change-notes/2026-09-30-model-maps-package.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added value flow models for functions in the `maps` package which do not involve the `iter` package.
diff --git a/go/ql/src/change-notes/released/1.6.10.md b/go/ql/src/change-notes/released/1.6.10.md
new file mode 100644
index 000000000000..0c6a14492ed0
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.6.10.md
@@ -0,0 +1,3 @@
+## 1.6.10
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.6.11.md b/go/ql/src/change-notes/released/1.6.11.md
new file mode 100644
index 000000000000..cd335cb7d261
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.6.11.md
@@ -0,0 +1,3 @@
+## 1.6.11
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.6.12.md b/go/ql/src/change-notes/released/1.6.12.md
new file mode 100644
index 000000000000..1e23a10579f9
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.6.12.md
@@ -0,0 +1,3 @@
+## 1.6.12
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.6.13.md b/go/ql/src/change-notes/released/1.6.13.md
new file mode 100644
index 000000000000..f15eb488f526
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.6.13.md
@@ -0,0 +1,3 @@
+## 1.6.13
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.6.14.md b/go/ql/src/change-notes/released/1.6.14.md
new file mode 100644
index 000000000000..161031a3d6e4
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.6.14.md
@@ -0,0 +1,3 @@
+## 1.6.14
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.6.8.md b/go/ql/src/change-notes/released/1.6.8.md
new file mode 100644
index 000000000000..0a5d9b06c55e
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.6.8.md
@@ -0,0 +1,3 @@
+## 1.6.8
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.6.9.md b/go/ql/src/change-notes/released/1.6.9.md
new file mode 100644
index 000000000000..65abde2f749b
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.6.9.md
@@ -0,0 +1,3 @@
+## 1.6.9
+
+No user-facing changes.
diff --git a/go/ql/src/codeql-pack.release.yml b/go/ql/src/codeql-pack.release.yml
index 0b49adeac7da..4e7f93f87f23 100644
--- a/go/ql/src/codeql-pack.release.yml
+++ b/go/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.6.7
+lastReleaseVersion: 1.6.14
diff --git a/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.ql b/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.ql
index 554e271492e4..7770b05f1e22 100644
--- a/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.ql
+++ b/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.ql
@@ -14,20 +14,18 @@
 
 import go
 import SensitiveConditionBypass
+private import semmle.go.controlflow.Guards
 
 from
-  ControlFlow::ConditionGuardNode guard, DataFlow::Node sensitiveSink,
-  SensitiveExpr::Classification classification, DataFlow::Node source, DataFlow::Node operand,
-  ComparisonExpr comp
+  DataFlow::Node sensitiveSink, SensitiveExpr::Classification classification, DataFlow::Node source,
+  DataFlow::Node operand, ComparisonExpr comp
 where
   // there should be a flow between source and the operand sink
   Flow::flow(source, operand) and
   // both the operand should belong to the same comparison expression
   operand.asExpr() = comp.getAnOperand() and
-  // get the ConditionGuardNode corresponding to the comparison expr.
-  guard.getCondition() = comp and
   // the sink `sensitiveSink` should be sensitive,
   isSensitive(sensitiveSink, classification) and
-  // the guard should control the sink
-  guard.dominates(sensitiveSink.getBasicBlock())
+  // the comparison should control the sink
+  comp.(Guard).controls(sensitiveSink.getBasicBlock(), _)
 select comp, "This sensitive comparision check can potentially be bypassed."
diff --git a/go/ql/src/experimental/CWE-942/CorsMisconfiguration.ql b/go/ql/src/experimental/CWE-942/CorsMisconfiguration.ql
index 342f1addfe06..2fada12af834 100644
--- a/go/ql/src/experimental/CWE-942/CorsMisconfiguration.ql
+++ b/go/ql/src/experimental/CWE-942/CorsMisconfiguration.ql
@@ -14,6 +14,7 @@
 
 import go
 import semmle.go.security.InsecureFeatureFlag::InsecureFeatureFlag
+private import semmle.go.controlflow.Guards
 
 /**
  * A flag indicating a check for satisfied permissions or test configuration.
@@ -59,11 +60,7 @@ module UntrustedToAllowOriginHeaderConfig implements DataFlow::ConfigSig {
   }
 
   predicate isBarrier(DataFlow::Node node) {
-    exists(ControlFlow::ConditionGuardNode cgn |
-      cgn.ensures(any(AllowedFlag f).getAFlag().getANode(), _)
-    |
-      cgn.dominates(node.getBasicBlock())
-    )
+    flagControls(any(AllowedFlag f), node.getBasicBlock())
   }
 
   predicate isSink(DataFlow::Node sink) { isSinkHW(sink, _) }
@@ -171,12 +168,12 @@ class MapRead extends DataFlow::ElementReadNode {
 module FromUntrustedConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
-  predicate isSink(DataFlow::Node sink) { isSinkCgn(sink, _) }
+  predicate isSink(DataFlow::Node sink) { isSinkGuard(sink, _) }
 
-  additional predicate isSinkCgn(DataFlow::Node sink, ControlFlow::ConditionGuardNode cgn) {
+  additional predicate isSinkGuard(DataFlow::Node sink, Guard guard) {
     exists(IfStmt ifs |
       exists(Expr operand |
-        operand = ifs.getCond().getAChildExpr*() and
+        operand = ifs.getCondition().getAChildExpr*() and
         (
           exists(DataFlow::CallExpr call | call = operand |
             call.getTarget().hasQualifiedName("strings", "HasSuffix") and
@@ -202,7 +199,7 @@ module FromUntrustedConfig implements DataFlow::ConfigSig {
         )
       )
     |
-      cgn.getCondition() = ifs.getCond()
+      guard = ifs.getCondition()
     )
   }
 }
@@ -217,10 +214,10 @@ module FromUntrustedFlow = TaintTracking::Global<FromUntrustedConfig>;
  * Holds if the provided `allowOriginHW` is also destination of a `ActiveThreatModelSource`.
  */
 predicate flowsToGuardedByCheckOnUntrusted(DataFlow::ExprNode allowOriginHW) {
-  exists(DataFlow::Node sink, ControlFlow::ConditionGuardNode cgn |
-    FromUntrustedFlow::flowTo(sink) and FromUntrustedConfig::isSinkCgn(sink, cgn)
+  exists(DataFlow::Node sink, Guard guard |
+    FromUntrustedFlow::flowTo(sink) and FromUntrustedConfig::isSinkGuard(sink, guard)
   |
-    cgn.dominates(allowOriginHW.getBasicBlock())
+    guard.controls(allowOriginHW.getBasicBlock(), _)
   )
 }
 
@@ -233,9 +230,5 @@ where
     allowOriginIsNull(allowOriginHW, message)
   ) and
   not flowsToGuardedByCheckOnUntrusted(allowOriginHW) and
-  not exists(ControlFlow::ConditionGuardNode cgn |
-    cgn.ensures(any(AllowedFlag f).getAFlag().getANode(), _)
-  |
-    cgn.dominates(allowOriginHW.getBasicBlock())
-  )
+  not flagControls(any(AllowedFlag f), allowOriginHW.getBasicBlock())
 select allowOriginHW, message
diff --git a/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll b/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll
index f3f4c15f0085..615ea485ac42 100644
--- a/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll
+++ b/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll
@@ -1,4 +1,5 @@
 import go
+private import semmle.go.controlflow.Guards
 
 Expr getAUse(SsaDefinition def) {
   result = def.getVariable().getAUse().(IR::EvalInstruction).getExpr()
@@ -31,12 +32,6 @@ float getAnUpperBound(Expr expr) {
   if expr.isConst()
   then result = expr.getNumericValue()
   else (
-    //if an expression with parenthesis, strip the parenthesis first
-    exists(ParenExpr paren |
-      paren = expr and
-      result = getAnUpperBound(paren.stripParens())
-    )
-    or
     //if this expression is an identifier
     exists(SsaVariable v, Ident identifier |
       identifier = expr and
@@ -46,12 +41,12 @@ float getAnUpperBound(Expr expr) {
         if
           //if a condition expression exists before and one of the operand happens to be the identifier, we use this condition expression to narrow down the range.
           exists(
-            ControlFlow::ConditionGuardNode n, DataFlow::Node lesser, DataFlow::Node greater,
+            Guard n, boolean branch, DataFlow::Node lesser, DataFlow::Node greater,
             ReachableBasicBlock bb
           |
-            n.ensuresLeq(lesser, greater, _) and
+            guardEnsuresLeq(n, branch, lesser, greater, _) and
             IR::evalExprInstruction(lesser.asExpr()) = v.getAUse() and
-            n.dominates(bb) and
+            n.controls(bb, branch) and
             bb.getANode() = IR::evalExprInstruction(identifier) and
             not exists(Expr e |
               e = v.getAUse().(IR::EvalInstruction).getExpr() and
@@ -60,12 +55,12 @@ float getAnUpperBound(Expr expr) {
           )
         then
           exists(
-            ControlFlow::ConditionGuardNode n, ReachableBasicBlock bb, DataFlow::Node lesser,
+            Guard n, boolean branch, ReachableBasicBlock bb, DataFlow::Node lesser,
             DataFlow::Node greater, int bias
           |
-            n.dominates(bb) and
+            n.controls(bb, branch) and
             bb.getANode() = IR::evalExprInstruction(identifier) and
-            n.ensuresLeq(lesser, greater, bias) and
+            guardEnsuresLeq(n, branch, lesser, greater, bias) and
             v.getAUse() = IR::evalExprInstruction(lesser.asExpr()) and
             not exists(Expr e |
               e = v.getAUse().(IR::EvalInstruction).getExpr() and
@@ -188,11 +183,6 @@ float getALowerBound(Expr expr) {
     result = expr.getIntValue() or
     result = expr.getExactValue().toFloat()
   else (
-    exists(ParenExpr paren |
-      paren = expr and
-      result = getALowerBound(paren.stripParens())
-    )
-    or
     //if this expression is an identifer
     exists(SsaVariable v, Ident identifier |
       identifier = expr and
@@ -202,12 +192,12 @@ float getALowerBound(Expr expr) {
         //if exists a condition expression before this identifier
         if
           exists(
-            ControlFlow::ConditionGuardNode n, DataFlow::Node greater, DataFlow::Node lesser,
+            Guard n, boolean branch, DataFlow::Node greater, DataFlow::Node lesser,
             ReachableBasicBlock bb
           |
-            n.ensuresLeq(lesser, greater, _) and
+            guardEnsuresLeq(n, branch, lesser, greater, _) and
             IR::evalExprInstruction(greater.asExpr()) = v.getAUse() and
-            n.dominates(bb) and
+            n.controls(bb, branch) and
             bb.getANode() = IR::evalExprInstruction(identifier) and
             not exists(Expr e |
               e = v.getAUse().(IR::EvalInstruction).getExpr() and
@@ -216,12 +206,12 @@ float getALowerBound(Expr expr) {
           )
         then
           exists(
-            ControlFlow::ConditionGuardNode n, ReachableBasicBlock bb, DataFlow::Node lesser,
+            Guard n, boolean branch, ReachableBasicBlock bb, DataFlow::Node lesser,
             DataFlow::Node greater, int bias, float lbs
           |
-            n.dominates(bb) and
+            n.controls(bb, branch) and
             bb.getANode() = IR::evalExprInstruction(identifier) and
-            n.ensuresLeq(lesser, greater, bias) and
+            guardEnsuresLeq(n, branch, lesser, greater, bias) and
             v.getAUse() = IR::evalExprInstruction(greater.asExpr()) and
             not exists(Expr e |
               e = v.getAUse().(IR::EvalInstruction).getExpr() and
@@ -389,12 +379,13 @@ float getAnSsaUpperBound(SsaDefinition def) {
         )
       else
         //SSA definition corresponding to an `IncDecStmt`
-        if explicitDef.getInstruction() instanceof IR::IncDecInstruction
+        if
+          explicitDef.getInstruction().(IR::EvalCompoundAssignRhsInstruction).getStmt() instanceof
+            IncDecStmt
         then
-          exists(IncDecStmt incOrDec, IR::IncDecInstruction instr, float exprLB |
-            instr = explicitDef.getInstruction() and
+          exists(IncDecStmt incOrDec, float exprLB |
+            explicitDef.getInstruction().(IR::EvalCompoundAssignRhsInstruction).getStmt() = incOrDec and
             exprLB = getAnUpperBound(incOrDec.getOperand()) and
-            instr.getRhs().(IR::EvalIncDecRhsInstruction).getStmt() = incOrDec and
             (
               //IncStmt(x++)
               exists(IncStmt inc |
@@ -475,12 +466,13 @@ float getAnSsaLowerBound(SsaDefinition def) {
         )
       else
         //IncDecStmt
-        if explicitDef.getInstruction() instanceof IR::IncDecInstruction
+        if
+          explicitDef.getInstruction().(IR::EvalCompoundAssignRhsInstruction).getStmt() instanceof
+            IncDecStmt
         then
-          exists(IncDecStmt incOrDec, IR::IncDecInstruction instr, float exprLB |
-            instr = explicitDef.getInstruction() and
+          exists(IncDecStmt incOrDec, float exprLB |
+            explicitDef.getInstruction().(IR::EvalCompoundAssignRhsInstruction).getStmt() = incOrDec and
             exprLB = getALowerBound(incOrDec.getOperand()) and
-            instr.getRhs().(IR::EvalIncDecRhsInstruction).getStmt() = incOrDec and
             (
               //IncStmt(x++)
               exists(IncStmt inc |
@@ -550,9 +542,7 @@ predicate ssaDependsOnSsa(SsaDefinition nextDef, SsaDefinition prevDef) {
     nextDef
         .(SsaExplicitDefinition)
         .getInstruction()
-        .(IR::IncDecInstruction)
-        .getRhs()
-        .(IR::EvalIncDecRhsInstruction)
+        .(IR::EvalCompoundAssignRhsInstruction)
         .getStmt() = incDec and
     ssaDependsOnExpr(prevDef, incDec.getOperand())
   )
@@ -571,12 +561,6 @@ predicate ssaDependsOnExpr(SsaDefinition def, Expr expr) {
   if expr.isConst()
   then none()
   else (
-    //if an expression with parenthesis, strip the parenthesis
-    exists(ParenExpr paren |
-      paren = expr and
-      ssaDependsOnExpr(def, paren.stripParens())
-    )
-    or
     exists(Ident ident |
       ident = expr and
       getAUse(def) = ident
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index 25a573adf8a0..95b820e2caa4 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.6.8-dev
+version: 1.6.15-dev
 groups:
   - go
   - queries
diff --git a/go/ql/test/example-tests/snippets/fieldwrite.expected b/go/ql/test/example-tests/snippets/fieldwrite.expected
index 26c7f7b90f81..2819dac1c658 100644
--- a/go/ql/test/example-tests/snippets/fieldwrite.expected
+++ b/go/ql/test/example-tests/snippets/fieldwrite.expected
@@ -1 +1 @@
-| main.go:23:3:23:13 | assignment to field Status | main.go:23:17:23:21 | "200" |
+| main.go:23:3:23:21 | assign:0 ... = ... | main.go:23:17:23:21 | "200" |
diff --git a/go/ql/test/example-tests/snippets/typeinfo.expected b/go/ql/test/example-tests/snippets/typeinfo.expected
index c3a0ff5dacb2..692838d50e98 100644
--- a/go/ql/test/example-tests/snippets/typeinfo.expected
+++ b/go/ql/test/example-tests/snippets/typeinfo.expected
@@ -3,6 +3,6 @@
 | file://:0:0:0:0 | [summary param] -1 in Write |
 | file://:0:0:0:0 | [summary param] -1 in WriteProxy |
 | main.go:18:12:18:14 | SSA def(req) |
-| main.go:18:12:18:14 | argument corresponding to req |
+| main.go:18:12:18:14 | req |
 | main.go:20:5:20:7 | req |
 | main.go:20:5:20:7 | req [postupdate] |
diff --git a/go/ql/test/example-tests/snippets/varwrite.expected b/go/ql/test/example-tests/snippets/varwrite.expected
index b2c06e76a27b..8b35595f4a82 100644
--- a/go/ql/test/example-tests/snippets/varwrite.expected
+++ b/go/ql/test/example-tests/snippets/varwrite.expected
@@ -1 +1 @@
-| main.go:29:2:29:4 | assignment to err | main.go:29:9:29:31 | call to test1 |
+| main.go:29:2:29:31 | assign:0 ... := ... | main.go:29:9:29:31 | call to test1 |
diff --git a/go/ql/test/experimental/CWE-203/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/experimental/CWE-203/CONSISTENCY/DataFlowConsistency.expected
index 0bd77bfcaa2d..cabe6568e9c0 100644
--- a/go/ql/test/experimental/CWE-203/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/experimental/CWE-203/CONSISTENCY/DataFlowConsistency.expected
@@ -1,5 +1,5 @@
 reverseRead
-| timing.go:15:18:15:20 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| timing.go:28:18:28:20 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| timing.go:41:18:41:20 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| timing.go:53:18:53:20 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| timing.go:15:18:15:20 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| timing.go:28:18:28:20 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| timing.go:41:18:41:20 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| timing.go:53:18:53:20 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/experimental/CWE-285/PamAuthBypass.expected b/go/ql/test/experimental/CWE-285/PamAuthBypass.expected
index 23441b3361e5..f7bc883d2d5b 100644
--- a/go/ql/test/experimental/CWE-285/PamAuthBypass.expected
+++ b/go/ql/test/experimental/CWE-285/PamAuthBypass.expected
@@ -1 +1 @@
-| main.go:10:2:12:3 | ... := ...[0] | This Pam transaction may not be secure. |
\ No newline at end of file
+| main.go:10:2:12:3 | extract:0 ... := ... | This Pam transaction may not be secure. |
diff --git a/go/ql/test/experimental/CWE-287/CONSISTENCY/CfgConsistency.expected b/go/ql/test/experimental/CWE-287/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/experimental/CWE-287/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/experimental/CWE-287/CONSISTENCY/DataFlowConsistency.expected
index c77e608378d5..a45a61725b92 100644
--- a/go/ql/test/experimental/CWE-287/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/experimental/CWE-287/CONSISTENCY/DataFlowConsistency.expected
@@ -1,4 +1,4 @@
 reverseRead
-| ImproperLdapAuth.go:18:18:18:20 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| ImproperLdapAuth.go:39:18:39:20 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| ImproperLdapAuth.go:64:18:64:20 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| ImproperLdapAuth.go:18:18:18:20 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| ImproperLdapAuth.go:39:18:39:20 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| ImproperLdapAuth.go:64:18:64:20 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/experimental/CWE-321-V2/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/experimental/CWE-321-V2/CONSISTENCY/DataFlowConsistency.expected
index 3a9dc0286509..00934dd30c49 100644
--- a/go/ql/test/experimental/CWE-321-V2/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/experimental/CWE-321-V2/CONSISTENCY/DataFlowConsistency.expected
@@ -1,3 +1,3 @@
 reverseRead
-| go-jose.v3.go:16:17:16:17 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| golang-jwt-v5.go:22:17:22:17 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| go-jose.v3.go:16:17:16:17 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| golang-jwt-v5.go:22:17:22:17 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/experimental/CWE-369/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/experimental/CWE-369/CONSISTENCY/DataFlowConsistency.expected
index d2ae8651ea5e..2c48b7b383c9 100644
--- a/go/ql/test/experimental/CWE-369/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/experimental/CWE-369/CONSISTENCY/DataFlowConsistency.expected
@@ -1,10 +1,10 @@
 reverseRead
-| DivideByZero.go:10:12:10:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| DivideByZero.go:17:12:17:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| DivideByZero.go:24:12:24:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| DivideByZero.go:31:12:31:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| DivideByZero.go:38:12:38:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| DivideByZero.go:45:12:45:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| DivideByZero.go:54:12:54:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| DivideByZero.go:63:12:63:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| DivideByZero.go:72:12:72:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| DivideByZero.go:10:12:10:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| DivideByZero.go:17:12:17:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| DivideByZero.go:24:12:24:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| DivideByZero.go:31:12:31:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| DivideByZero.go:38:12:38:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| DivideByZero.go:45:12:45:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| DivideByZero.go:54:12:54:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| DivideByZero.go:63:12:63:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| DivideByZero.go:72:12:72:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/experimental/CWE-369/DivideByZero.expected b/go/ql/test/experimental/CWE-369/DivideByZero.expected
index 01211d9d107a..7f206a30c8a4 100644
--- a/go/ql/test/experimental/CWE-369/DivideByZero.expected
+++ b/go/ql/test/experimental/CWE-369/DivideByZero.expected
@@ -8,23 +8,23 @@
 edges
 | DivideByZero.go:10:12:10:16 | selection of URL | DivideByZero.go:10:12:10:24 | call to Query | provenance | Src:MaD:1 MaD:2 |
 | DivideByZero.go:10:12:10:24 | call to Query | DivideByZero.go:11:27:11:32 | param1 | provenance |  |
-| DivideByZero.go:11:2:11:33 | ... := ...[0] | DivideByZero.go:12:16:12:20 | value | provenance |  |
-| DivideByZero.go:11:27:11:32 | param1 | DivideByZero.go:11:2:11:33 | ... := ...[0] | provenance | Config |
+| DivideByZero.go:11:2:11:33 | extract:0 ... := ... | DivideByZero.go:12:16:12:20 | value | provenance |  |
+| DivideByZero.go:11:27:11:32 | param1 | DivideByZero.go:11:2:11:33 | extract:0 ... := ... | provenance | Config |
 | DivideByZero.go:17:12:17:16 | selection of URL | DivideByZero.go:17:12:17:24 | call to Query | provenance | Src:MaD:1 MaD:2 |
 | DivideByZero.go:17:12:17:24 | call to Query | DivideByZero.go:18:11:18:24 | type conversion | provenance |  |
 | DivideByZero.go:18:11:18:24 | type conversion | DivideByZero.go:19:16:19:20 | value | provenance |  |
 | DivideByZero.go:24:12:24:16 | selection of URL | DivideByZero.go:24:12:24:24 | call to Query | provenance | Src:MaD:1 MaD:2 |
 | DivideByZero.go:24:12:24:24 | call to Query | DivideByZero.go:25:31:25:36 | param1 | provenance |  |
-| DivideByZero.go:25:2:25:45 | ... := ...[0] | DivideByZero.go:26:16:26:20 | value | provenance |  |
-| DivideByZero.go:25:31:25:36 | param1 | DivideByZero.go:25:2:25:45 | ... := ...[0] | provenance | Config |
+| DivideByZero.go:25:2:25:45 | extract:0 ... := ... | DivideByZero.go:26:16:26:20 | value | provenance |  |
+| DivideByZero.go:25:31:25:36 | param1 | DivideByZero.go:25:2:25:45 | extract:0 ... := ... | provenance | Config |
 | DivideByZero.go:31:12:31:16 | selection of URL | DivideByZero.go:31:12:31:24 | call to Query | provenance | Src:MaD:1 MaD:2 |
 | DivideByZero.go:31:12:31:24 | call to Query | DivideByZero.go:32:33:32:38 | param1 | provenance |  |
-| DivideByZero.go:32:2:32:43 | ... := ...[0] | DivideByZero.go:33:16:33:20 | value | provenance |  |
-| DivideByZero.go:32:33:32:38 | param1 | DivideByZero.go:32:2:32:43 | ... := ...[0] | provenance | Config |
+| DivideByZero.go:32:2:32:43 | extract:0 ... := ... | DivideByZero.go:33:16:33:20 | value | provenance |  |
+| DivideByZero.go:32:33:32:38 | param1 | DivideByZero.go:32:2:32:43 | extract:0 ... := ... | provenance | Config |
 | DivideByZero.go:38:12:38:16 | selection of URL | DivideByZero.go:38:12:38:24 | call to Query | provenance | Src:MaD:1 MaD:2 |
 | DivideByZero.go:38:12:38:24 | call to Query | DivideByZero.go:39:32:39:37 | param1 | provenance |  |
-| DivideByZero.go:39:2:39:46 | ... := ...[0] | DivideByZero.go:40:16:40:20 | value | provenance |  |
-| DivideByZero.go:39:32:39:37 | param1 | DivideByZero.go:39:2:39:46 | ... := ...[0] | provenance | Config |
+| DivideByZero.go:39:2:39:46 | extract:0 ... := ... | DivideByZero.go:40:16:40:20 | value | provenance |  |
+| DivideByZero.go:39:32:39:37 | param1 | DivideByZero.go:39:2:39:46 | extract:0 ... := ... | provenance | Config |
 | DivideByZero.go:54:12:54:16 | selection of URL | DivideByZero.go:54:12:54:24 | call to Query | provenance | Src:MaD:1 MaD:2 |
 | DivideByZero.go:54:12:54:24 | call to Query | DivideByZero.go:55:11:55:24 | type conversion | provenance |  |
 | DivideByZero.go:55:11:55:24 | type conversion | DivideByZero.go:57:17:57:21 | value | provenance |  |
@@ -34,7 +34,7 @@ models
 nodes
 | DivideByZero.go:10:12:10:16 | selection of URL | semmle.label | selection of URL |
 | DivideByZero.go:10:12:10:24 | call to Query | semmle.label | call to Query |
-| DivideByZero.go:11:2:11:33 | ... := ...[0] | semmle.label | ... := ...[0] |
+| DivideByZero.go:11:2:11:33 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | DivideByZero.go:11:27:11:32 | param1 | semmle.label | param1 |
 | DivideByZero.go:12:16:12:20 | value | semmle.label | value |
 | DivideByZero.go:17:12:17:16 | selection of URL | semmle.label | selection of URL |
@@ -43,17 +43,17 @@ nodes
 | DivideByZero.go:19:16:19:20 | value | semmle.label | value |
 | DivideByZero.go:24:12:24:16 | selection of URL | semmle.label | selection of URL |
 | DivideByZero.go:24:12:24:24 | call to Query | semmle.label | call to Query |
-| DivideByZero.go:25:2:25:45 | ... := ...[0] | semmle.label | ... := ...[0] |
+| DivideByZero.go:25:2:25:45 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | DivideByZero.go:25:31:25:36 | param1 | semmle.label | param1 |
 | DivideByZero.go:26:16:26:20 | value | semmle.label | value |
 | DivideByZero.go:31:12:31:16 | selection of URL | semmle.label | selection of URL |
 | DivideByZero.go:31:12:31:24 | call to Query | semmle.label | call to Query |
-| DivideByZero.go:32:2:32:43 | ... := ...[0] | semmle.label | ... := ...[0] |
+| DivideByZero.go:32:2:32:43 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | DivideByZero.go:32:33:32:38 | param1 | semmle.label | param1 |
 | DivideByZero.go:33:16:33:20 | value | semmle.label | value |
 | DivideByZero.go:38:12:38:16 | selection of URL | semmle.label | selection of URL |
 | DivideByZero.go:38:12:38:24 | call to Query | semmle.label | call to Query |
-| DivideByZero.go:39:2:39:46 | ... := ...[0] | semmle.label | ... := ...[0] |
+| DivideByZero.go:39:2:39:46 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | DivideByZero.go:39:32:39:37 | param1 | semmle.label | param1 |
 | DivideByZero.go:40:16:40:20 | value | semmle.label | value |
 | DivideByZero.go:54:12:54:16 | selection of URL | semmle.label | selection of URL |
diff --git a/go/ql/test/experimental/CWE-522-DecompressionBombs/CONSISTENCY/CfgConsistency.expected b/go/ql/test/experimental/CWE-522-DecompressionBombs/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/experimental/CWE-522-DecompressionBombs/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/experimental/CWE-522-DecompressionBombs/CONSISTENCY/DataFlowConsistency.expected
index 455781c6b15b..3cb5d9567bf5 100644
--- a/go/ql/test/experimental/CWE-522-DecompressionBombs/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/experimental/CWE-522-DecompressionBombs/CONSISTENCY/DataFlowConsistency.expected
@@ -1,36 +1,36 @@
 reverseRead
-| test.go:60:15:60:21 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:61:24:61:30 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:62:13:62:19 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:63:17:63:23 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:64:8:64:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:65:12:65:18 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:66:8:66:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:67:12:67:18 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:68:17:68:23 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:69:21:69:27 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:70:13:70:19 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:71:17:71:23 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:72:16:72:22 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:73:20:73:26 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:74:7:74:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:75:11:75:17 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:76:9:76:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:77:13:77:19 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:78:18:78:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:79:22:79:28 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:80:5:80:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:81:9:81:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:82:7:82:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:83:11:83:17 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:84:15:84:21 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:85:16:85:22 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:86:20:86:26 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:87:16:87:22 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:88:20:88:26 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:89:17:89:23 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:90:21:90:27 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:91:15:91:21 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:92:19:92:25 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:93:5:93:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:94:9:94:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| test.go:60:15:60:21 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:61:24:61:30 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:62:13:62:19 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:63:17:63:23 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:64:8:64:14 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:65:12:65:18 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:66:8:66:14 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:67:12:67:18 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:68:17:68:23 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:69:21:69:27 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:70:13:70:19 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:71:17:71:23 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:72:16:72:22 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:73:20:73:26 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:74:7:74:13 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:75:11:75:17 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:76:9:76:15 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:77:13:77:19 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:78:18:78:24 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:79:22:79:28 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:80:5:80:11 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:81:9:81:15 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:82:7:82:13 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:83:11:83:17 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:84:15:84:21 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:85:16:85:22 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:86:20:86:26 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:87:16:87:22 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:88:20:88:26 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:89:17:89:23 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:90:21:90:27 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:91:15:91:21 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:92:19:92:25 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:93:5:93:11 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:94:9:94:15 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.expected b/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.expected
index c770dc825d71..2fea1cfd6d75 100644
--- a/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.expected
+++ b/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.expected
@@ -68,35 +68,35 @@ edges
 | test.go:91:15:91:26 | selection of Body | test.go:555:19:555:22 | SSA def(file) | provenance | Src:MaD:1  |
 | test.go:93:5:93:16 | selection of Body | test.go:580:9:580:12 | SSA def(file) | provenance | Src:MaD:1  |
 | test.go:128:20:128:27 | SSA def(filename) | test.go:130:33:130:40 | filename | provenance |  |
-| test.go:130:2:130:41 | ... := ...[0] | test.go:132:12:132:12 | f | provenance |  |
-| test.go:130:33:130:40 | filename | test.go:130:2:130:41 | ... := ...[0] | provenance | Config |
+| test.go:130:2:130:41 | extract:0 ... := ... | test.go:132:12:132:12 | f | provenance |  |
+| test.go:130:33:130:40 | filename | test.go:130:2:130:41 | extract:0 ... := ... | provenance | Config |
 | test.go:130:33:130:40 | filename | test.go:143:51:143:58 | filename | provenance |  |
-| test.go:132:3:132:19 | ... := ...[0] | test.go:134:37:134:38 | rc | provenance |  |
-| test.go:132:12:132:12 | f | test.go:132:3:132:19 | ... := ...[0] | provenance | MaD:4 |
-| test.go:143:2:143:59 | ... := ...[0] | test.go:145:12:145:12 | f | provenance |  |
-| test.go:143:51:143:58 | filename | test.go:143:2:143:59 | ... := ...[0] | provenance | Config |
+| test.go:132:3:132:19 | extract:0 ... := ... | test.go:134:37:134:38 | rc | provenance |  |
+| test.go:132:12:132:12 | f | test.go:132:3:132:19 | extract:0 ... := ... | provenance | MaD:4 |
+| test.go:143:2:143:59 | extract:0 ... := ... | test.go:145:12:145:12 | f | provenance |  |
+| test.go:143:51:143:58 | filename | test.go:143:2:143:59 | extract:0 ... := ... | provenance | Config |
 | test.go:145:12:145:12 | f | test.go:145:12:145:19 | call to Open | provenance | Config |
 | test.go:145:12:145:19 | call to Open | test.go:147:37:147:38 | rc | provenance |  |
 | test.go:158:19:158:22 | SSA def(file) | test.go:159:25:159:28 | file | provenance |  |
-| test.go:159:2:159:29 | ... := ...[0] | test.go:160:48:160:52 | file1 | provenance |  |
-| test.go:159:25:159:28 | file | test.go:159:2:159:29 | ... := ...[0] | provenance | MaD:6 |
-| test.go:160:2:160:69 | ... := ...[0] | test.go:163:26:163:29 | file | provenance |  |
-| test.go:160:32:160:53 | call to NewReader | test.go:160:2:160:69 | ... := ...[0] | provenance | Config |
+| test.go:159:2:159:29 | extract:0 ... := ... | test.go:160:48:160:52 | file1 | provenance |  |
+| test.go:159:25:159:28 | file | test.go:159:2:159:29 | extract:0 ... := ... | provenance | MaD:6 |
+| test.go:160:2:160:69 | extract:0 ... := ... | test.go:163:26:163:29 | file | provenance |  |
+| test.go:160:32:160:53 | call to NewReader | test.go:160:2:160:69 | extract:0 ... := ... | provenance | Config |
 | test.go:160:48:160:52 | file1 | test.go:160:32:160:53 | call to NewReader | provenance | MaD:5 |
-| test.go:163:3:163:36 | ... := ...[0] | test.go:164:36:164:51 | fileReaderCloser | provenance |  |
-| test.go:163:26:163:29 | file | test.go:163:3:163:36 | ... := ...[0] | provenance | MaD:4 |
+| test.go:163:3:163:36 | extract:0 ... := ... | test.go:164:36:164:51 | fileReaderCloser | provenance |  |
+| test.go:163:26:163:29 | file | test.go:163:3:163:36 | extract:0 ... := ... | provenance | MaD:4 |
 | test.go:169:28:169:31 | SSA def(file) | test.go:170:25:170:28 | file | provenance |  |
-| test.go:170:2:170:29 | ... := ...[0] | test.go:171:57:171:61 | file2 | provenance |  |
-| test.go:170:25:170:28 | file | test.go:170:2:170:29 | ... := ...[0] | provenance | MaD:6 |
-| test.go:171:2:171:78 | ... := ...[0] | test.go:175:26:175:29 | file | provenance |  |
-| test.go:171:41:171:62 | call to NewReader | test.go:171:2:171:78 | ... := ...[0] | provenance | Config |
+| test.go:170:2:170:29 | extract:0 ... := ... | test.go:171:57:171:61 | file2 | provenance |  |
+| test.go:170:25:170:28 | file | test.go:170:2:170:29 | extract:0 ... := ... | provenance | MaD:6 |
+| test.go:171:2:171:78 | extract:0 ... := ... | test.go:175:26:175:29 | file | provenance |  |
+| test.go:171:41:171:62 | call to NewReader | test.go:171:2:171:78 | extract:0 ... := ... | provenance | Config |
 | test.go:171:57:171:61 | file2 | test.go:171:41:171:62 | call to NewReader | provenance | MaD:5 |
 | test.go:175:26:175:29 | file | test.go:175:26:175:36 | call to Open | provenance | Config |
 | test.go:175:26:175:36 | call to Open | test.go:176:36:176:51 | fileReaderCloser | provenance |  |
 | test.go:181:17:181:20 | SSA def(file) | test.go:184:41:184:44 | file | provenance |  |
-| test.go:184:2:184:73 | ... := ...[0] | test.go:186:2:186:12 | bzip2Reader | provenance |  |
-| test.go:184:2:184:73 | ... := ...[0] | test.go:187:26:187:36 | bzip2Reader | provenance |  |
-| test.go:184:41:184:44 | file | test.go:184:2:184:73 | ... := ...[0] | provenance | Config |
+| test.go:184:2:184:73 | extract:0 ... := ... | test.go:186:2:186:12 | bzip2Reader | provenance |  |
+| test.go:184:2:184:73 | extract:0 ... := ... | test.go:187:26:187:36 | bzip2Reader | provenance |  |
+| test.go:184:41:184:44 | file | test.go:184:2:184:73 | extract:0 ... := ... | provenance | Config |
 | test.go:187:12:187:37 | call to NewReader | test.go:189:18:189:24 | tarRead | provenance |  |
 | test.go:187:26:187:36 | bzip2Reader | test.go:187:12:187:37 | call to NewReader | provenance | MaD:3 |
 | test.go:189:18:189:24 | tarRead | test.go:611:22:611:28 | SSA def(tarRead) | provenance |  |
@@ -122,23 +122,23 @@ edges
 | test.go:264:26:264:36 | flateReader | test.go:264:12:264:37 | call to NewReader | provenance | MaD:3 |
 | test.go:266:18:266:24 | tarRead | test.go:611:22:611:28 | SSA def(tarRead) | provenance |  |
 | test.go:283:17:283:20 | SSA def(file) | test.go:286:41:286:44 | file | provenance |  |
-| test.go:286:2:286:73 | ... := ...[0] | test.go:288:2:288:12 | flateReader | provenance |  |
-| test.go:286:2:286:73 | ... := ...[0] | test.go:289:26:289:36 | flateReader | provenance |  |
-| test.go:286:41:286:44 | file | test.go:286:2:286:73 | ... := ...[0] | provenance | Config |
+| test.go:286:2:286:73 | extract:0 ... := ... | test.go:288:2:288:12 | flateReader | provenance |  |
+| test.go:286:2:286:73 | extract:0 ... := ... | test.go:289:26:289:36 | flateReader | provenance |  |
+| test.go:286:41:286:44 | file | test.go:286:2:286:73 | extract:0 ... := ... | provenance | Config |
 | test.go:289:12:289:37 | call to NewReader | test.go:291:18:291:24 | tarRead | provenance |  |
 | test.go:289:26:289:36 | flateReader | test.go:289:12:289:37 | call to NewReader | provenance | MaD:3 |
 | test.go:291:18:291:24 | tarRead | test.go:611:22:611:28 | SSA def(tarRead) | provenance |  |
 | test.go:308:20:308:23 | SSA def(file) | test.go:311:43:311:46 | file | provenance |  |
-| test.go:311:2:311:47 | ... := ...[0] | test.go:313:2:313:11 | zlibReader | provenance |  |
-| test.go:311:2:311:47 | ... := ...[0] | test.go:314:26:314:35 | zlibReader | provenance |  |
-| test.go:311:43:311:46 | file | test.go:311:2:311:47 | ... := ...[0] | provenance | Config |
+| test.go:311:2:311:47 | extract:0 ... := ... | test.go:313:2:313:11 | zlibReader | provenance |  |
+| test.go:311:2:311:47 | extract:0 ... := ... | test.go:314:26:314:35 | zlibReader | provenance |  |
+| test.go:311:43:311:46 | file | test.go:311:2:311:47 | extract:0 ... := ... | provenance | Config |
 | test.go:314:12:314:36 | call to NewReader | test.go:316:18:316:24 | tarRead | provenance |  |
 | test.go:314:26:314:35 | zlibReader | test.go:314:12:314:36 | call to NewReader | provenance | MaD:3 |
 | test.go:316:18:316:24 | tarRead | test.go:611:22:611:28 | SSA def(tarRead) | provenance |  |
 | test.go:333:11:333:14 | SSA def(file) | test.go:336:34:336:37 | file | provenance |  |
-| test.go:336:2:336:38 | ... := ...[0] | test.go:338:2:338:11 | zlibReader | provenance |  |
-| test.go:336:2:336:38 | ... := ...[0] | test.go:339:26:339:35 | zlibReader | provenance |  |
-| test.go:336:34:336:37 | file | test.go:336:2:336:38 | ... := ...[0] | provenance | Config |
+| test.go:336:2:336:38 | extract:0 ... := ... | test.go:338:2:338:11 | zlibReader | provenance |  |
+| test.go:336:2:336:38 | extract:0 ... := ... | test.go:339:26:339:35 | zlibReader | provenance |  |
+| test.go:336:34:336:37 | file | test.go:336:2:336:38 | extract:0 ... := ... | provenance | Config |
 | test.go:339:12:339:36 | call to NewReader | test.go:341:18:341:24 | tarRead | provenance |  |
 | test.go:339:26:339:35 | zlibReader | test.go:339:12:339:36 | call to NewReader | provenance | MaD:3 |
 | test.go:341:18:341:24 | tarRead | test.go:611:22:611:28 | SSA def(tarRead) | provenance |  |
@@ -169,38 +169,38 @@ edges
 | test.go:421:26:421:33 | s2Reader | test.go:421:12:421:34 | call to NewReader | provenance | MaD:3 |
 | test.go:423:18:423:24 | tarRead | test.go:611:22:611:28 | SSA def(tarRead) | provenance |  |
 | test.go:440:19:440:21 | SSA def(src) | test.go:441:34:441:36 | src | provenance |  |
-| test.go:441:2:441:37 | ... := ...[0] | test.go:444:12:444:32 | type conversion | provenance |  |
-| test.go:441:34:441:36 | src | test.go:441:2:441:37 | ... := ...[0] | provenance | Config |
+| test.go:441:2:441:37 | extract:0 ... := ... | test.go:444:12:444:32 | type conversion | provenance |  |
+| test.go:441:34:441:36 | src | test.go:441:2:441:37 | extract:0 ... := ... | provenance | Config |
 | test.go:444:12:444:32 | type conversion | test.go:445:23:445:28 | newSrc | provenance |  |
 | test.go:447:11:447:14 | SSA def(file) | test.go:450:34:450:37 | file | provenance |  |
-| test.go:450:2:450:38 | ... := ...[0] | test.go:452:2:452:11 | gzipReader | provenance |  |
-| test.go:450:2:450:38 | ... := ...[0] | test.go:453:26:453:35 | gzipReader | provenance |  |
-| test.go:450:34:450:37 | file | test.go:450:2:450:38 | ... := ...[0] | provenance | Config |
+| test.go:450:2:450:38 | extract:0 ... := ... | test.go:452:2:452:11 | gzipReader | provenance |  |
+| test.go:450:2:450:38 | extract:0 ... := ... | test.go:453:26:453:35 | gzipReader | provenance |  |
+| test.go:450:34:450:37 | file | test.go:450:2:450:38 | extract:0 ... := ... | provenance | Config |
 | test.go:453:12:453:36 | call to NewReader | test.go:455:18:455:24 | tarRead | provenance |  |
 | test.go:453:26:453:35 | gzipReader | test.go:453:12:453:36 | call to NewReader | provenance | MaD:3 |
 | test.go:455:18:455:24 | tarRead | test.go:611:22:611:28 | SSA def(tarRead) | provenance |  |
 | test.go:472:20:472:23 | SSA def(file) | test.go:475:43:475:46 | file | provenance |  |
-| test.go:475:2:475:47 | ... := ...[0] | test.go:477:2:477:11 | gzipReader | provenance |  |
-| test.go:475:2:475:47 | ... := ...[0] | test.go:479:2:479:11 | gzipReader | provenance |  |
-| test.go:475:2:475:47 | ... := ...[0] | test.go:480:26:480:35 | gzipReader | provenance |  |
-| test.go:475:43:475:46 | file | test.go:475:2:475:47 | ... := ...[0] | provenance | Config |
+| test.go:475:2:475:47 | extract:0 ... := ... | test.go:477:2:477:11 | gzipReader | provenance |  |
+| test.go:475:2:475:47 | extract:0 ... := ... | test.go:479:2:479:11 | gzipReader | provenance |  |
+| test.go:475:2:475:47 | extract:0 ... := ... | test.go:480:26:480:35 | gzipReader | provenance |  |
+| test.go:475:43:475:46 | file | test.go:475:2:475:47 | extract:0 ... := ... | provenance | Config |
 | test.go:480:12:480:36 | call to NewReader | test.go:482:18:482:24 | tarRead | provenance |  |
 | test.go:480:26:480:35 | gzipReader | test.go:480:12:480:36 | call to NewReader | provenance | MaD:3 |
 | test.go:482:18:482:24 | tarRead | test.go:611:22:611:28 | SSA def(tarRead) | provenance |  |
 | test.go:499:20:499:23 | SSA def(file) | test.go:502:45:502:48 | file | provenance |  |
-| test.go:502:2:502:49 | ... := ...[0] | test.go:504:2:504:12 | pgzipReader | provenance |  |
-| test.go:502:2:502:49 | ... := ...[0] | test.go:506:2:506:12 | pgzipReader | provenance |  |
-| test.go:502:2:502:49 | ... := ...[0] | test.go:507:26:507:36 | pgzipReader | provenance |  |
-| test.go:502:45:502:48 | file | test.go:502:2:502:49 | ... := ...[0] | provenance | Config |
+| test.go:502:2:502:49 | extract:0 ... := ... | test.go:504:2:504:12 | pgzipReader | provenance |  |
+| test.go:502:2:502:49 | extract:0 ... := ... | test.go:506:2:506:12 | pgzipReader | provenance |  |
+| test.go:502:2:502:49 | extract:0 ... := ... | test.go:507:26:507:36 | pgzipReader | provenance |  |
+| test.go:502:45:502:48 | file | test.go:502:2:502:49 | extract:0 ... := ... | provenance | Config |
 | test.go:507:12:507:37 | call to NewReader | test.go:509:18:509:24 | tarRead | provenance |  |
 | test.go:507:26:507:36 | pgzipReader | test.go:507:12:507:37 | call to NewReader | provenance | MaD:3 |
 | test.go:509:18:509:24 | tarRead | test.go:611:22:611:28 | SSA def(tarRead) | provenance |  |
 | test.go:526:21:526:24 | SSA def(file) | test.go:529:43:529:46 | file | provenance |  |
-| test.go:529:2:529:47 | ... := ...[0] | test.go:531:2:531:11 | zstdReader | provenance |  |
-| test.go:529:2:529:47 | ... := ...[0] | test.go:533:2:533:11 | zstdReader | provenance |  |
-| test.go:529:2:529:47 | ... := ...[0] | test.go:535:2:535:11 | zstdReader | provenance |  |
-| test.go:529:2:529:47 | ... := ...[0] | test.go:536:26:536:35 | zstdReader | provenance |  |
-| test.go:529:43:529:46 | file | test.go:529:2:529:47 | ... := ...[0] | provenance | Config |
+| test.go:529:2:529:47 | extract:0 ... := ... | test.go:531:2:531:11 | zstdReader | provenance |  |
+| test.go:529:2:529:47 | extract:0 ... := ... | test.go:533:2:533:11 | zstdReader | provenance |  |
+| test.go:529:2:529:47 | extract:0 ... := ... | test.go:535:2:535:11 | zstdReader | provenance |  |
+| test.go:529:2:529:47 | extract:0 ... := ... | test.go:536:26:536:35 | zstdReader | provenance |  |
+| test.go:529:43:529:46 | file | test.go:529:2:529:47 | extract:0 ... := ... | provenance | Config |
 | test.go:536:12:536:36 | call to NewReader | test.go:538:18:538:24 | tarRead | provenance |  |
 | test.go:536:26:536:35 | zstdReader | test.go:536:12:536:36 | call to NewReader | provenance | MaD:3 |
 | test.go:538:18:538:24 | tarRead | test.go:611:22:611:28 | SSA def(tarRead) | provenance |  |
@@ -212,9 +212,9 @@ edges
 | test.go:561:26:561:35 | zstdReader | test.go:561:12:561:36 | call to NewReader | provenance | MaD:3 |
 | test.go:563:18:563:24 | tarRead | test.go:611:22:611:28 | SSA def(tarRead) | provenance |  |
 | test.go:580:9:580:12 | SSA def(file) | test.go:583:30:583:33 | file | provenance |  |
-| test.go:583:2:583:34 | ... := ...[0] | test.go:585:2:585:9 | xzReader | provenance |  |
-| test.go:583:2:583:34 | ... := ...[0] | test.go:586:26:586:33 | xzReader | provenance |  |
-| test.go:583:30:583:33 | file | test.go:583:2:583:34 | ... := ...[0] | provenance | Config |
+| test.go:583:2:583:34 | extract:0 ... := ... | test.go:585:2:585:9 | xzReader | provenance |  |
+| test.go:583:2:583:34 | extract:0 ... := ... | test.go:586:26:586:33 | xzReader | provenance |  |
+| test.go:583:30:583:33 | file | test.go:583:2:583:34 | extract:0 ... := ... | provenance | Config |
 | test.go:586:12:586:34 | call to NewReader | test.go:589:18:589:24 | tarRead | provenance |  |
 | test.go:586:12:586:34 | call to NewReader | test.go:590:19:590:25 | tarRead | provenance |  |
 | test.go:586:26:586:33 | xzReader | test.go:586:12:586:34 | call to NewReader | provenance | MaD:3 |
@@ -259,36 +259,36 @@ nodes
 | test.go:91:15:91:26 | selection of Body | semmle.label | selection of Body |
 | test.go:93:5:93:16 | selection of Body | semmle.label | selection of Body |
 | test.go:128:20:128:27 | SSA def(filename) | semmle.label | SSA def(filename) |
-| test.go:130:2:130:41 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:130:2:130:41 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:130:33:130:40 | filename | semmle.label | filename |
-| test.go:132:3:132:19 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:132:3:132:19 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:132:12:132:12 | f | semmle.label | f |
 | test.go:134:37:134:38 | rc | semmle.label | rc |
-| test.go:143:2:143:59 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:143:2:143:59 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:143:51:143:58 | filename | semmle.label | filename |
 | test.go:145:12:145:12 | f | semmle.label | f |
 | test.go:145:12:145:19 | call to Open | semmle.label | call to Open |
 | test.go:147:37:147:38 | rc | semmle.label | rc |
 | test.go:158:19:158:22 | SSA def(file) | semmle.label | SSA def(file) |
-| test.go:159:2:159:29 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:159:2:159:29 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:159:25:159:28 | file | semmle.label | file |
-| test.go:160:2:160:69 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:160:2:160:69 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:160:32:160:53 | call to NewReader | semmle.label | call to NewReader |
 | test.go:160:48:160:52 | file1 | semmle.label | file1 |
-| test.go:163:3:163:36 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:163:3:163:36 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:163:26:163:29 | file | semmle.label | file |
 | test.go:164:36:164:51 | fileReaderCloser | semmle.label | fileReaderCloser |
 | test.go:169:28:169:31 | SSA def(file) | semmle.label | SSA def(file) |
-| test.go:170:2:170:29 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:170:2:170:29 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:170:25:170:28 | file | semmle.label | file |
-| test.go:171:2:171:78 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:171:2:171:78 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:171:41:171:62 | call to NewReader | semmle.label | call to NewReader |
 | test.go:171:57:171:61 | file2 | semmle.label | file2 |
 | test.go:175:26:175:29 | file | semmle.label | file |
 | test.go:175:26:175:36 | call to Open | semmle.label | call to Open |
 | test.go:176:36:176:51 | fileReaderCloser | semmle.label | fileReaderCloser |
 | test.go:181:17:181:20 | SSA def(file) | semmle.label | SSA def(file) |
-| test.go:184:2:184:73 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:184:2:184:73 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:184:41:184:44 | file | semmle.label | file |
 | test.go:186:2:186:12 | bzip2Reader | semmle.label | bzip2Reader |
 | test.go:187:12:187:37 | call to NewReader | semmle.label | call to NewReader |
@@ -316,21 +316,21 @@ nodes
 | test.go:264:26:264:36 | flateReader | semmle.label | flateReader |
 | test.go:266:18:266:24 | tarRead | semmle.label | tarRead |
 | test.go:283:17:283:20 | SSA def(file) | semmle.label | SSA def(file) |
-| test.go:286:2:286:73 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:286:2:286:73 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:286:41:286:44 | file | semmle.label | file |
 | test.go:288:2:288:12 | flateReader | semmle.label | flateReader |
 | test.go:289:12:289:37 | call to NewReader | semmle.label | call to NewReader |
 | test.go:289:26:289:36 | flateReader | semmle.label | flateReader |
 | test.go:291:18:291:24 | tarRead | semmle.label | tarRead |
 | test.go:308:20:308:23 | SSA def(file) | semmle.label | SSA def(file) |
-| test.go:311:2:311:47 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:311:2:311:47 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:311:43:311:46 | file | semmle.label | file |
 | test.go:313:2:313:11 | zlibReader | semmle.label | zlibReader |
 | test.go:314:12:314:36 | call to NewReader | semmle.label | call to NewReader |
 | test.go:314:26:314:35 | zlibReader | semmle.label | zlibReader |
 | test.go:316:18:316:24 | tarRead | semmle.label | tarRead |
 | test.go:333:11:333:14 | SSA def(file) | semmle.label | SSA def(file) |
-| test.go:336:2:336:38 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:336:2:336:38 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:336:34:336:37 | file | semmle.label | file |
 | test.go:338:2:338:11 | zlibReader | semmle.label | zlibReader |
 | test.go:339:12:339:36 | call to NewReader | semmle.label | call to NewReader |
@@ -363,19 +363,19 @@ nodes
 | test.go:421:26:421:33 | s2Reader | semmle.label | s2Reader |
 | test.go:423:18:423:24 | tarRead | semmle.label | tarRead |
 | test.go:440:19:440:21 | SSA def(src) | semmle.label | SSA def(src) |
-| test.go:441:2:441:37 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:441:2:441:37 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:441:34:441:36 | src | semmle.label | src |
 | test.go:444:12:444:32 | type conversion | semmle.label | type conversion |
 | test.go:445:23:445:28 | newSrc | semmle.label | newSrc |
 | test.go:447:11:447:14 | SSA def(file) | semmle.label | SSA def(file) |
-| test.go:450:2:450:38 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:450:2:450:38 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:450:34:450:37 | file | semmle.label | file |
 | test.go:452:2:452:11 | gzipReader | semmle.label | gzipReader |
 | test.go:453:12:453:36 | call to NewReader | semmle.label | call to NewReader |
 | test.go:453:26:453:35 | gzipReader | semmle.label | gzipReader |
 | test.go:455:18:455:24 | tarRead | semmle.label | tarRead |
 | test.go:472:20:472:23 | SSA def(file) | semmle.label | SSA def(file) |
-| test.go:475:2:475:47 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:475:2:475:47 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:475:43:475:46 | file | semmle.label | file |
 | test.go:477:2:477:11 | gzipReader | semmle.label | gzipReader |
 | test.go:479:2:479:11 | gzipReader | semmle.label | gzipReader |
@@ -383,7 +383,7 @@ nodes
 | test.go:480:26:480:35 | gzipReader | semmle.label | gzipReader |
 | test.go:482:18:482:24 | tarRead | semmle.label | tarRead |
 | test.go:499:20:499:23 | SSA def(file) | semmle.label | SSA def(file) |
-| test.go:502:2:502:49 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:502:2:502:49 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:502:45:502:48 | file | semmle.label | file |
 | test.go:504:2:504:12 | pgzipReader | semmle.label | pgzipReader |
 | test.go:506:2:506:12 | pgzipReader | semmle.label | pgzipReader |
@@ -391,7 +391,7 @@ nodes
 | test.go:507:26:507:36 | pgzipReader | semmle.label | pgzipReader |
 | test.go:509:18:509:24 | tarRead | semmle.label | tarRead |
 | test.go:526:21:526:24 | SSA def(file) | semmle.label | SSA def(file) |
-| test.go:529:2:529:47 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:529:2:529:47 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:529:43:529:46 | file | semmle.label | file |
 | test.go:531:2:531:11 | zstdReader | semmle.label | zstdReader |
 | test.go:533:2:533:11 | zstdReader | semmle.label | zstdReader |
@@ -407,7 +407,7 @@ nodes
 | test.go:561:26:561:35 | zstdReader | semmle.label | zstdReader |
 | test.go:563:18:563:24 | tarRead | semmle.label | tarRead |
 | test.go:580:9:580:12 | SSA def(file) | semmle.label | SSA def(file) |
-| test.go:583:2:583:34 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:583:2:583:34 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:583:30:583:33 | file | semmle.label | file |
 | test.go:585:2:585:9 | xzReader | semmle.label | xzReader |
 | test.go:586:12:586:34 | call to NewReader | semmle.label | call to NewReader |
diff --git a/go/ql/test/experimental/CWE-525/CONSISTENCY/CfgConsistency.expected b/go/ql/test/experimental/CWE-525/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/experimental/CWE-74/DsnInjectionLocal.expected b/go/ql/test/experimental/CWE-74/DsnInjectionLocal.expected
index 4b26395c8e7c..1a938af237c2 100644
--- a/go/ql/test/experimental/CWE-74/DsnInjectionLocal.expected
+++ b/go/ql/test/experimental/CWE-74/DsnInjectionLocal.expected
@@ -8,14 +8,14 @@ edges
 | Dsn.go:28:102:28:109 | index expression | Dsn.go:28:11:28:110 | []type{args} [array] | provenance |  |
 | Dsn.go:28:102:28:109 | index expression | Dsn.go:28:11:28:110 | call to Sprintf | provenance | FunctionModel |
 | Dsn.go:63:9:63:11 | cfg [postupdate] [pointer] | Dsn.go:67:102:67:104 | cfg [pointer] | provenance |  |
-| Dsn.go:63:9:63:11 | implicit dereference [postupdate] | Dsn.go:63:9:63:11 | cfg [postupdate] [pointer] | provenance |  |
-| Dsn.go:63:9:63:11 | implicit dereference [postupdate] | Dsn.go:67:102:67:108 | selection of dsn | provenance |  |
+| Dsn.go:63:9:63:11 | implicit-deref cfg [postupdate] | Dsn.go:63:9:63:11 | cfg [postupdate] [pointer] | provenance |  |
+| Dsn.go:63:9:63:11 | implicit-deref cfg [postupdate] | Dsn.go:67:102:67:108 | selection of dsn | provenance |  |
 | Dsn.go:63:19:63:25 | selection of Args | Dsn.go:63:19:63:29 | slice expression | provenance | Src:MaD:1  |
-| Dsn.go:63:19:63:29 | slice expression | Dsn.go:63:9:63:11 | implicit dereference [postupdate] | provenance | FunctionModel |
+| Dsn.go:63:19:63:29 | slice expression | Dsn.go:63:9:63:11 | implicit-deref cfg [postupdate] | provenance | FunctionModel |
 | Dsn.go:67:11:67:109 | []type{args} [array] | Dsn.go:67:11:67:109 | call to Sprintf | provenance | MaD:2 |
 | Dsn.go:67:11:67:109 | call to Sprintf | Dsn.go:68:29:68:33 | dbDSN | provenance |  |
-| Dsn.go:67:102:67:104 | cfg [pointer] | Dsn.go:67:102:67:104 | implicit dereference | provenance |  |
-| Dsn.go:67:102:67:104 | implicit dereference | Dsn.go:67:102:67:108 | selection of dsn | provenance |  |
+| Dsn.go:67:102:67:104 | cfg [pointer] | Dsn.go:67:102:67:104 | implicit-deref cfg | provenance |  |
+| Dsn.go:67:102:67:104 | implicit-deref cfg | Dsn.go:67:102:67:108 | selection of dsn | provenance |  |
 | Dsn.go:67:102:67:108 | selection of dsn | Dsn.go:67:11:67:109 | []type{args} [array] | provenance |  |
 | Dsn.go:67:102:67:108 | selection of dsn | Dsn.go:67:11:67:109 | call to Sprintf | provenance | FunctionModel |
 models
@@ -28,13 +28,13 @@ nodes
 | Dsn.go:28:102:28:109 | index expression | semmle.label | index expression |
 | Dsn.go:29:29:29:33 | dbDSN | semmle.label | dbDSN |
 | Dsn.go:63:9:63:11 | cfg [postupdate] [pointer] | semmle.label | cfg [postupdate] [pointer] |
-| Dsn.go:63:9:63:11 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| Dsn.go:63:9:63:11 | implicit-deref cfg [postupdate] | semmle.label | implicit-deref cfg [postupdate] |
 | Dsn.go:63:19:63:25 | selection of Args | semmle.label | selection of Args |
 | Dsn.go:63:19:63:29 | slice expression | semmle.label | slice expression |
 | Dsn.go:67:11:67:109 | []type{args} [array] | semmle.label | []type{args} [array] |
 | Dsn.go:67:11:67:109 | call to Sprintf | semmle.label | call to Sprintf |
 | Dsn.go:67:102:67:104 | cfg [pointer] | semmle.label | cfg [pointer] |
-| Dsn.go:67:102:67:104 | implicit dereference | semmle.label | implicit dereference |
+| Dsn.go:67:102:67:104 | implicit-deref cfg | semmle.label | implicit-deref cfg |
 | Dsn.go:67:102:67:108 | selection of dsn | semmle.label | selection of dsn |
 | Dsn.go:68:29:68:33 | dbDSN | semmle.label | dbDSN |
 subpaths
diff --git a/go/ql/test/experimental/CWE-807/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/experimental/CWE-807/CONSISTENCY/DataFlowConsistency.expected
index 0b244f8f0333..f230dfa91685 100644
--- a/go/ql/test/experimental/CWE-807/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/experimental/CWE-807/CONSISTENCY/DataFlowConsistency.expected
@@ -1,13 +1,13 @@
 reverseRead
-| SensitiveConditionBypassBad.go:7:5:7:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:16:5:16:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:25:5:25:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:34:5:34:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:41:5:41:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:41:35:41:35 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:49:5:49:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:56:5:56:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:63:5:63:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:70:5:70:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:77:5:77:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:84:5:84:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| SensitiveConditionBypassBad.go:7:5:7:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:16:5:16:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:25:5:25:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:34:5:34:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:41:5:41:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:41:35:41:35 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:49:5:49:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:56:5:56:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:63:5:63:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:70:5:70:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:77:5:77:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:84:5:84:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/experimental/CWE-840/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/experimental/CWE-840/CONSISTENCY/DataFlowConsistency.expected
index b2cb9694e61c..fedb34fec073 100644
--- a/go/ql/test/experimental/CWE-840/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/experimental/CWE-840/CONSISTENCY/DataFlowConsistency.expected
@@ -1,7 +1,7 @@
 reverseRead
-| ConditionalBypassBad.go:9:5:9:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| ConditionalBypassGood.go:9:5:9:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:9:5:9:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:16:5:16:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:16:41:16:41 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| condition.go:23:5:23:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| ConditionalBypassBad.go:9:5:9:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| ConditionalBypassGood.go:9:5:9:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:9:5:9:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:16:5:16:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:16:41:16:41 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| condition.go:23:5:23:5 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/experimental/CWE-918/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/experimental/CWE-918/CONSISTENCY/DataFlowConsistency.expected
index 082a5e7bd31c..8b2cc46f5851 100644
--- a/go/ql/test/experimental/CWE-918/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/experimental/CWE-918/CONSISTENCY/DataFlowConsistency.expected
@@ -1,8 +1,8 @@
 reverseRead
-| builtin.go:115:31:115:31 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| builtin.go:124:32:124:32 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| builtin.go:133:54:133:54 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| builtin.go:142:55:142:55 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| new-tests.go:62:31:62:33 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| new-tests.go:78:18:78:20 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| new-tests.go:81:37:81:39 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| builtin.go:115:31:115:31 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| builtin.go:124:32:124:32 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| builtin.go:133:54:133:54 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| builtin.go:142:55:142:55 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| new-tests.go:62:31:62:33 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| new-tests.go:78:18:78:20 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| new-tests.go:81:37:81:39 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/experimental/CWE-918/SSRF.expected b/go/ql/test/experimental/CWE-918/SSRF.expected
index 5c8d1832ac19..28f5e2ca18bf 100644
--- a/go/ql/test/experimental/CWE-918/SSRF.expected
+++ b/go/ql/test/experimental/CWE-918/SSRF.expected
@@ -24,9 +24,9 @@ edges
 | builtin.go:112:21:112:31 | call to Referer | builtin.go:115:15:115:28 | untrustedInput | provenance | Src:MaD:8  |
 | builtin.go:130:21:130:31 | call to Referer | builtin.go:133:38:133:51 | untrustedInput | provenance | Src:MaD:8  |
 | builtin.go:151:16:151:36 | call to FormValue | builtin.go:154:13:154:22 | unsafehost | provenance | Src:MaD:7  |
-| builtin.go:154:2:154:4 | implicit dereference [postupdate] | builtin.go:154:2:154:4 | url [postupdate] | provenance |  |
+| builtin.go:154:2:154:4 | implicit-deref url [postupdate] | builtin.go:154:2:154:4 | url [postupdate] | provenance |  |
 | builtin.go:154:2:154:4 | url [postupdate] | builtin.go:156:21:156:23 | url | provenance |  |
-| builtin.go:154:13:154:22 | unsafehost | builtin.go:154:2:154:4 | implicit dereference [postupdate] | provenance | Config |
+| builtin.go:154:13:154:22 | unsafehost | builtin.go:154:2:154:4 | implicit-deref url [postupdate] | provenance | Config |
 | builtin.go:154:13:154:22 | unsafehost | builtin.go:154:2:154:4 | url [postupdate] | provenance | Config |
 | builtin.go:156:21:156:23 | url | builtin.go:156:21:156:32 | call to String | provenance | MaD:12 |
 | new-tests.go:26:26:26:30 | &... [postupdate] | new-tests.go:31:48:31:56 | selection of word | provenance | Src:MaD:3  |
@@ -43,8 +43,8 @@ edges
 | new-tests.go:35:49:35:57 | selection of word | new-tests.go:35:12:35:58 | call to Sprintf | provenance | FunctionModel |
 | new-tests.go:39:18:39:30 | call to Param | new-tests.go:47:11:47:46 | ...+... | provenance | Src:MaD:1  |
 | new-tests.go:49:18:49:30 | call to Query | new-tests.go:50:11:50:46 | ...+... | provenance | Src:MaD:2  |
-| new-tests.go:62:2:62:39 | ... := ...[0] | new-tests.go:63:17:63:23 | reqBody | provenance |  |
-| new-tests.go:62:31:62:38 | selection of Body | new-tests.go:62:2:62:39 | ... := ...[0] | provenance | Src:MaD:6 MaD:13 |
+| new-tests.go:62:2:62:39 | extract:0 ... := ... | new-tests.go:63:17:63:23 | reqBody | provenance |  |
+| new-tests.go:62:31:62:38 | selection of Body | new-tests.go:62:2:62:39 | extract:0 ... := ... | provenance | Src:MaD:6 MaD:13 |
 | new-tests.go:63:17:63:23 | reqBody | new-tests.go:63:26:63:30 | &... [postupdate] | provenance | MaD:10 |
 | new-tests.go:63:26:63:30 | &... [postupdate] | new-tests.go:68:48:68:56 | selection of word | provenance |  |
 | new-tests.go:63:26:63:30 | &... [postupdate] | new-tests.go:69:48:69:56 | selection of safe | provenance |  |
@@ -95,7 +95,7 @@ nodes
 | builtin.go:130:21:130:31 | call to Referer | semmle.label | call to Referer |
 | builtin.go:133:38:133:51 | untrustedInput | semmle.label | untrustedInput |
 | builtin.go:151:16:151:36 | call to FormValue | semmle.label | call to FormValue |
-| builtin.go:154:2:154:4 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| builtin.go:154:2:154:4 | implicit-deref url [postupdate] | semmle.label | implicit-deref url [postupdate] |
 | builtin.go:154:2:154:4 | url [postupdate] | semmle.label | url [postupdate] |
 | builtin.go:154:13:154:22 | unsafehost | semmle.label | unsafehost |
 | builtin.go:156:21:156:23 | url | semmle.label | url |
@@ -114,7 +114,7 @@ nodes
 | new-tests.go:47:11:47:46 | ...+... | semmle.label | ...+... |
 | new-tests.go:49:18:49:30 | call to Query | semmle.label | call to Query |
 | new-tests.go:50:11:50:46 | ...+... | semmle.label | ...+... |
-| new-tests.go:62:2:62:39 | ... := ...[0] | semmle.label | ... := ...[0] |
+| new-tests.go:62:2:62:39 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | new-tests.go:62:31:62:38 | selection of Body | semmle.label | selection of Body |
 | new-tests.go:63:17:63:23 | reqBody | semmle.label | reqBody |
 | new-tests.go:63:26:63:30 | &... [postupdate] | semmle.label | &... [postupdate] |
diff --git a/go/ql/test/experimental/CWE-942/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/experimental/CWE-942/CONSISTENCY/DataFlowConsistency.expected
index 736ff52258ff..20e32467bcbb 100644
--- a/go/ql/test/experimental/CWE-942/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/experimental/CWE-942/CONSISTENCY/DataFlowConsistency.expected
@@ -1,15 +1,16 @@
 reverseRead
-| CorsMisconfiguration.go:52:14:52:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CorsMisconfiguration.go:59:14:59:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CorsMisconfiguration.go:66:17:66:19 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CorsMisconfiguration.go:74:14:74:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CorsMisconfiguration.go:81:14:81:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CorsMisconfiguration.go:88:14:88:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CorsMisconfiguration.go:101:14:101:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CorsMisconfiguration.go:112:14:112:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CorsMisconfiguration.go:126:15:126:17 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CorsMisconfiguration.go:141:14:141:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CorsMisconfiguration.go:156:14:156:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CorsMisconfiguration.go:170:14:170:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CorsMisconfiguration.go:194:17:194:19 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CorsMisconfiguration.go:206:14:206:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:52:14:52:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:59:14:59:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:66:17:66:19 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:74:14:74:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:81:14:81:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:88:14:88:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:101:14:101:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:112:14:112:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:126:15:126:17 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:141:14:141:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:156:14:156:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:170:14:170:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:194:17:194:19 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:206:14:206:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CorsMisconfiguration.go:219:14:219:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/experimental/CWE-942/CorsMisconfiguration.expected b/go/ql/test/experimental/CWE-942/CorsMisconfiguration.expected
index 442324639216..6c3cfb735227 100644
--- a/go/ql/test/experimental/CWE-942/CorsMisconfiguration.expected
+++ b/go/ql/test/experimental/CWE-942/CorsMisconfiguration.expected
@@ -7,6 +7,11 @@
 | CorsMisconfiguration.go:53:4:53:44 | call to Set | access-control-allow-origin header is set to a user-defined value, and access-control-allow-credentials is set to `true` |
 | CorsMisconfiguration.go:60:4:60:56 | call to Set | access-control-allow-origin header is set to a user-defined value, and access-control-allow-credentials is set to `true` |
 | CorsMisconfiguration.go:67:5:67:57 | call to Set | access-control-allow-origin header is set to a user-defined value, and access-control-allow-credentials is set to `true` |
+| CorsMisconfiguration.go:130:7:130:63 | call to Set | access-control-allow-origin header is set to a user-defined value, and access-control-allow-credentials is set to `true` |
+| CorsMisconfiguration.go:143:5:143:57 | call to Set | access-control-allow-origin header is set to a user-defined value, and access-control-allow-credentials is set to `true` |
+| CorsMisconfiguration.go:158:5:158:57 | call to Set | access-control-allow-origin header is set to a user-defined value, and access-control-allow-credentials is set to `true` |
+| CorsMisconfiguration.go:173:6:173:58 | call to Set | access-control-allow-origin header is set to a user-defined value, and access-control-allow-credentials is set to `true` |
+| CorsMisconfiguration.go:224:5:224:57 | call to Set | access-control-allow-origin header is set to a user-defined value, and access-control-allow-credentials is set to `true` |
 | RsCors.go:11:21:11:59 | slice literal | access-control-allow-origin header is set to `null`, and access-control-allow-credentials is set to `true` |
 | RsCors.go:31:23:31:61 | slice literal | access-control-allow-origin header is set to `null`, and access-control-allow-credentials is set to `true` |
 | RsCors.go:59:20:59:58 | slice literal | access-control-allow-origin header is set to `null`, and access-control-allow-credentials is set to `true` |
diff --git a/go/ql/test/experimental/CWE-942/CorsMisconfiguration.go b/go/ql/test/experimental/CWE-942/CorsMisconfiguration.go
index 506db53a2621..7e36752cd4b0 100644
--- a/go/ql/test/experimental/CWE-942/CorsMisconfiguration.go
+++ b/go/ql/test/experimental/CWE-942/CorsMisconfiguration.go
@@ -127,7 +127,7 @@ func main() {
 				if origin != "" && origin != "null" {
 					if len(AccessControlAllowOrigins) == 0 ||
 						AccessControlAllowOrigins[origin] {
-						responseHeader.Set("Access-Control-Allow-Origin", origin)
+						responseHeader.Set("Access-Control-Allow-Origin", origin) // $ SPURIOUS: Alert
 						responseHeader.Set("Access-Control-Allow-Credentials", "true")
 					}
 				} else {
@@ -140,7 +140,7 @@ func main() {
 			// OK-ish: the input origin header is validated against a suffix.
 			origin := req.Header.Get("Origin")
 			if origin != "" && (originSuffix == "" || strings.HasSuffix(origin, originSuffix)) {
-				w.Header().Set("Access-Control-Allow-Origin", origin)
+				w.Header().Set("Access-Control-Allow-Origin", origin) // $ SPURIOUS: Alert
 				w.Header().Set("Access-Control-Allow-Credentials", "true")
 				w.Header().Set("Access-Control-Allow-Headers", "Content-Type, x-requested-by, *")
 				w.Header().Set("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE, OPTIONS")
@@ -155,7 +155,7 @@ func main() {
 			// OK-ish: the input origin header is validated against a whitelist.
 			origin := req.Header.Get("Origin")
 			if origin != "" && (originSuffix == "" || AccessControlAllowOrigins[origin]) {
-				w.Header().Set("Access-Control-Allow-Origin", origin)
+				w.Header().Set("Access-Control-Allow-Origin", origin) // $ SPURIOUS: Alert
 				w.Header().Set("Access-Control-Allow-Credentials", "true")
 				w.Header().Set("Access-Control-Allow-Headers", "Content-Type, x-requested-by, *")
 				w.Header().Set("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE, OPTIONS")
@@ -170,7 +170,7 @@ func main() {
 			origin := req.Header.Get("origin")
 			if origin != "" && origin != "null" {
 				if len(AccessControlAllowOrigins) == 0 || AccessControlAllowOrigins[origin] {
-					w.Header().Set("Access-Control-Allow-Origin", origin)
+					w.Header().Set("Access-Control-Allow-Origin", origin) // $ SPURIOUS: Alert
 					w.Header().Set("Access-Control-Allow-Credentials", "true")
 				}
 			} else {
@@ -215,6 +215,16 @@ func main() {
 			w.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-Token, X-Client")
 			w.Header().Set("Access-Control-Allow-Credentials", "true")
 		})
+		http.HandleFunc("/", func(w http.ResponseWriter, req *http.Request) {
+			origin := req.Header.Get("origin")
+			switch req.Method {
+			case "allowed":
+				w.Header().Set("Access-Control-Allow-Origin", origin)
+			default:
+				w.Header().Set("Access-Control-Allow-Origin", origin) // $ Alert
+			}
+			w.Header().Set("Access-Control-Allow-Credentials", "true")
+		})
 	}
 }
 
diff --git a/go/ql/test/experimental/InconsistentCode/CONSISTENCY/CfgConsistency.expected b/go/ql/test/experimental/InconsistentCode/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..3c00017bbfca
--- /dev/null
+++ b/go/ql/test/experimental/InconsistentCode/CONSISTENCY/CfgConsistency.expected
@@ -0,0 +1,14 @@
+consistencyOverview
+| multipleSuccessors | 8 |
+| selfLoop | 1 |
+multipleSuccessors
+| DeferInLoop.go:6:2:13:2 | After range statement | successor | DeferInLoop.go:5:36:14:1 | After block statement |
+| DeferInLoop.go:6:2:13:2 | After range statement | successor | DeferInLoop.go:8:9:8:20 | defer-invoke call to Close |
+| DeferInLoop.go:7:3:7:32 | catch-panic ... := ... | successor | DeferInLoop.go:5:1:14:1 | Exceptional Exit |
+| DeferInLoop.go:7:3:7:32 | catch-panic ... := ... | successor | DeferInLoop.go:8:9:8:20 | defer-invoke call to Close |
+| DeferInLoop.go:8:3:8:20 | catch-defer-panic defer statement | successor | DeferInLoop.go:5:1:14:1 | Exceptional Exit |
+| DeferInLoop.go:8:3:8:20 | catch-defer-panic defer statement | successor | DeferInLoop.go:8:9:8:20 | defer-invoke call to Close |
+| DeferInLoop.go:8:9:8:20 | defer-invoke call to Close | successor | DeferInLoop.go:5:36:14:1 | After block statement |
+| DeferInLoop.go:8:9:8:20 | defer-invoke call to Close | successor | DeferInLoop.go:8:9:8:20 | defer-invoke call to Close |
+selfLoop
+| DeferInLoop.go:8:9:8:20 | defer-invoke call to Close | successor |
diff --git a/go/ql/test/experimental/Unsafe/CONSISTENCY/CfgConsistency.expected b/go/ql/test/experimental/Unsafe/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/experimental/frameworks/CleverGo/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/experimental/frameworks/CleverGo/CONSISTENCY/DataFlowConsistency.expected
index f2a42c6dbedd..d3f4571abef8 100644
--- a/go/ql/test/experimental/frameworks/CleverGo/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/experimental/frameworks/CleverGo/CONSISTENCY/DataFlowConsistency.expected
@@ -1,2 +1,2 @@
 reverseRead
-| RemoteSources.go:98:9:98:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| RemoteSources.go:98:9:98:24 | implicit-deref structContext409 | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/extractor-tests/go1.17/CFG.expected b/go/ql/test/extractor-tests/go1.17/CFG.expected
index 55c46adec789..d6f4ea0f06fc 100644
--- a/go/ql/test/extractor-tests/go1.17/CFG.expected
+++ b/go/ql/test/extractor-tests/go1.17/CFG.expected
@@ -1,64 +1,114 @@
 nodes
 edges
-| conversions.go:0:0:0:0 | entry | conversions.go:3:1:3:15 | skip |
-| conversions.go:3:1:3:15 | skip | conversions.go:5:6:5:8 | skip |
-| conversions.go:5:1:5:29 | entry | conversions.go:5:10:5:10 | argument corresponding to _ |
-| conversions.go:5:1:5:29 | function declaration | conversions.go:7:6:7:9 | skip |
-| conversions.go:5:6:5:8 | skip | conversions.go:5:1:5:29 | function declaration |
-| conversions.go:5:10:5:10 | argument corresponding to _ | conversions.go:5:10:5:10 | initialization of _ |
-| conversions.go:5:10:5:10 | initialization of _ | conversions.go:5:28:5:29 | skip |
-| conversions.go:5:28:5:29 | skip | conversions.go:5:1:5:29 | exit |
-| conversions.go:7:1:26:1 | entry | conversions.go:8:6:8:6 | skip |
-| conversions.go:7:1:26:1 | function declaration | conversions.go:0:0:0:0 | exit |
-| conversions.go:7:6:7:9 | skip | conversions.go:7:1:26:1 | function declaration |
-| conversions.go:8:6:8:6 | assignment to a | conversions.go:10:2:10:2 | skip |
-| conversions.go:8:6:8:6 | skip | conversions.go:8:6:8:6 | zero value for a |
-| conversions.go:8:6:8:6 | zero value for a | conversions.go:8:6:8:6 | assignment to a |
-| conversions.go:10:2:10:2 | assignment to b | conversions.go:11:2:11:4 | use |
-| conversions.go:10:2:10:2 | skip | conversions.go:10:7:10:16 | selection of Add |
-| conversions.go:10:7:10:16 | selection of Add | conversions.go:10:18:10:18 | a |
-| conversions.go:10:7:10:23 | call to Add | conversions.go:10:2:10:2 | assignment to b |
+| conversions.go:0:0:0:0 | After conversions.go | conversions.go:0:0:0:0 | Normal Exit |
+| conversions.go:0:0:0:0 | Entry | conversions.go:0:0:0:0 | conversions.go |
+| conversions.go:0:0:0:0 | Normal Exit | conversions.go:0:0:0:0 | Exit |
+| conversions.go:0:0:0:0 | conversions.go | conversions.go:3:1:3:15 | import declaration |
+| conversions.go:3:1:3:15 | import declaration | conversions.go:5:1:5:29 | function declaration |
+| conversions.go:5:1:5:29 | Entry | conversions.go:5:10:5:10 | _ |
+| conversions.go:5:1:5:29 | Normal Exit | conversions.go:5:1:5:29 | Exit |
+| conversions.go:5:1:5:29 | function declaration | conversions.go:7:1:26:1 | function declaration |
+| conversions.go:5:10:5:10 | _ | conversions.go:5:28:5:29 | block statement |
+| conversions.go:5:28:5:29 | block statement | conversions.go:5:1:5:29 | Normal Exit |
+| conversions.go:7:1:26:1 | Entry | conversions.go:7:13:26:1 | block statement |
+| conversions.go:7:1:26:1 | Exceptional Exit | conversions.go:7:1:26:1 | Exit |
+| conversions.go:7:1:26:1 | Normal Exit | conversions.go:7:1:26:1 | Exit |
+| conversions.go:7:1:26:1 | function declaration | conversions.go:0:0:0:0 | After conversions.go |
+| conversions.go:7:13:26:1 | After block statement | conversions.go:7:1:26:1 | Normal Exit |
+| conversions.go:7:13:26:1 | block statement | conversions.go:8:2:8:21 | declaration statement |
+| conversions.go:8:2:8:21 | After declaration statement | conversions.go:10:2:10:23 | ... := ... |
+| conversions.go:8:2:8:21 | After variable declaration | conversions.go:8:2:8:21 | After declaration statement |
+| conversions.go:8:2:8:21 | declaration statement | conversions.go:8:2:8:21 | variable declaration |
+| conversions.go:8:2:8:21 | variable declaration | conversions.go:8:6:8:21 | value declaration specifier |
+| conversions.go:8:6:8:21 | After value declaration specifier | conversions.go:8:2:8:21 | After variable declaration |
+| conversions.go:8:6:8:21 | value declaration specifier | conversions.go:8:6:8:21 | zero-init:0 value declaration specifier |
+| conversions.go:8:6:8:21 | zero-init:0 value declaration specifier | conversions.go:8:6:8:21 | After value declaration specifier |
+| conversions.go:10:2:10:23 | ... := ... | conversions.go:10:7:10:23 | Before call to Add |
+| conversions.go:10:2:10:23 | After ... := ... | conversions.go:11:2:11:7 | expression statement |
+| conversions.go:10:2:10:23 | assign:0 ... := ... | conversions.go:10:2:10:23 | After ... := ... |
+| conversions.go:10:7:10:16 | After selection of Add | conversions.go:10:18:10:18 | a |
+| conversions.go:10:7:10:16 | Before selection of Add | conversions.go:10:7:10:16 | selection of Add |
+| conversions.go:10:7:10:16 | selection of Add | conversions.go:10:7:10:16 | After selection of Add |
+| conversions.go:10:7:10:23 | After call to Add | conversions.go:10:2:10:23 | assign:0 ... := ... |
+| conversions.go:10:7:10:23 | Before call to Add | conversions.go:10:7:10:16 | Before selection of Add |
+| conversions.go:10:7:10:23 | call to Add | conversions.go:10:7:10:23 | After call to Add |
 | conversions.go:10:18:10:18 | a | conversions.go:10:21:10:22 | 10 |
 | conversions.go:10:21:10:22 | 10 | conversions.go:10:7:10:23 | call to Add |
 | conversions.go:11:2:11:4 | use | conversions.go:11:6:11:6 | b |
-| conversions.go:11:2:11:7 | call to use | conversions.go:7:1:26:1 | exit |
-| conversions.go:11:2:11:7 | call to use | conversions.go:13:6:13:8 | skip |
+| conversions.go:11:2:11:7 | After call to use | conversions.go:11:2:11:7 | After expression statement |
+| conversions.go:11:2:11:7 | After expression statement | conversions.go:13:2:13:13 | declaration statement |
+| conversions.go:11:2:11:7 | Before call to use | conversions.go:11:2:11:4 | use |
+| conversions.go:11:2:11:7 | call to use | conversions.go:7:1:26:1 | Exceptional Exit |
+| conversions.go:11:2:11:7 | call to use | conversions.go:11:2:11:7 | After call to use |
+| conversions.go:11:2:11:7 | expression statement | conversions.go:11:2:11:7 | Before call to use |
 | conversions.go:11:6:11:6 | b | conversions.go:11:2:11:7 | call to use |
-| conversions.go:13:6:13:8 | assignment to arr | conversions.go:14:2:14:6 | skip |
-| conversions.go:13:6:13:8 | skip | conversions.go:13:6:13:8 | zero value for arr |
-| conversions.go:13:6:13:8 | zero value for arr | conversions.go:13:6:13:8 | assignment to arr |
-| conversions.go:14:2:14:6 | assignment to slice | conversions.go:17:2:17:4 | skip |
-| conversions.go:14:2:14:6 | skip | conversions.go:14:11:14:22 | selection of Slice |
-| conversions.go:14:11:14:22 | selection of Slice | conversions.go:14:24:14:26 | arr |
-| conversions.go:14:11:14:31 | call to Slice | conversions.go:14:2:14:6 | assignment to slice |
+| conversions.go:13:2:13:13 | After declaration statement | conversions.go:14:2:14:31 | ... := ... |
+| conversions.go:13:2:13:13 | After variable declaration | conversions.go:13:2:13:13 | After declaration statement |
+| conversions.go:13:2:13:13 | declaration statement | conversions.go:13:2:13:13 | variable declaration |
+| conversions.go:13:2:13:13 | variable declaration | conversions.go:13:6:13:13 | value declaration specifier |
+| conversions.go:13:6:13:13 | After value declaration specifier | conversions.go:13:2:13:13 | After variable declaration |
+| conversions.go:13:6:13:13 | value declaration specifier | conversions.go:13:6:13:13 | zero-init:0 value declaration specifier |
+| conversions.go:13:6:13:13 | zero-init:0 value declaration specifier | conversions.go:13:6:13:13 | After value declaration specifier |
+| conversions.go:14:2:14:31 | ... := ... | conversions.go:14:11:14:31 | Before call to Slice |
+| conversions.go:14:2:14:31 | After ... := ... | conversions.go:17:2:17:25 | ... := ... |
+| conversions.go:14:2:14:31 | assign:0 ... := ... | conversions.go:14:2:14:31 | After ... := ... |
+| conversions.go:14:11:14:22 | After selection of Slice | conversions.go:14:24:14:26 | arr |
+| conversions.go:14:11:14:22 | Before selection of Slice | conversions.go:14:11:14:22 | selection of Slice |
+| conversions.go:14:11:14:22 | selection of Slice | conversions.go:14:11:14:22 | After selection of Slice |
+| conversions.go:14:11:14:31 | After call to Slice | conversions.go:14:2:14:31 | assign:0 ... := ... |
+| conversions.go:14:11:14:31 | Before call to Slice | conversions.go:14:11:14:22 | Before selection of Slice |
+| conversions.go:14:11:14:31 | call to Slice | conversions.go:14:11:14:31 | After call to Slice |
 | conversions.go:14:24:14:26 | arr | conversions.go:14:29:14:30 | 20 |
 | conversions.go:14:29:14:30 | 20 | conversions.go:14:11:14:31 | call to Slice |
-| conversions.go:17:2:17:4 | assignment to ptr | conversions.go:18:2:18:4 | use |
-| conversions.go:17:2:17:4 | skip | conversions.go:17:20:17:24 | slice |
-| conversions.go:17:9:17:25 | type conversion | conversions.go:7:1:26:1 | exit |
-| conversions.go:17:9:17:25 | type conversion | conversions.go:17:2:17:4 | assignment to ptr |
+| conversions.go:17:2:17:25 | ... := ... | conversions.go:17:9:17:25 | Before type conversion |
+| conversions.go:17:2:17:25 | After ... := ... | conversions.go:18:2:18:9 | expression statement |
+| conversions.go:17:2:17:25 | assign:0 ... := ... | conversions.go:17:2:17:25 | After ... := ... |
+| conversions.go:17:9:17:25 | After type conversion | conversions.go:17:2:17:25 | assign:0 ... := ... |
+| conversions.go:17:9:17:25 | Before type conversion | conversions.go:17:20:17:24 | slice |
+| conversions.go:17:9:17:25 | type conversion | conversions.go:7:1:26:1 | Exceptional Exit |
+| conversions.go:17:9:17:25 | type conversion | conversions.go:17:9:17:25 | After type conversion |
 | conversions.go:17:20:17:24 | slice | conversions.go:17:9:17:25 | type conversion |
 | conversions.go:18:2:18:4 | use | conversions.go:18:6:18:8 | ptr |
-| conversions.go:18:2:18:9 | call to use | conversions.go:7:1:26:1 | exit |
-| conversions.go:18:2:18:9 | call to use | conversions.go:21:2:21:4 | skip |
+| conversions.go:18:2:18:9 | After call to use | conversions.go:18:2:18:9 | After expression statement |
+| conversions.go:18:2:18:9 | After expression statement | conversions.go:21:2:21:18 | ... := ... |
+| conversions.go:18:2:18:9 | Before call to use | conversions.go:18:2:18:4 | use |
+| conversions.go:18:2:18:9 | call to use | conversions.go:7:1:26:1 | Exceptional Exit |
+| conversions.go:18:2:18:9 | call to use | conversions.go:18:2:18:9 | After call to use |
+| conversions.go:18:2:18:9 | expression statement | conversions.go:18:2:18:9 | Before call to use |
 | conversions.go:18:6:18:8 | ptr | conversions.go:18:2:18:9 | call to use |
-| conversions.go:21:2:21:4 | assignment to str | conversions.go:22:2:22:6 | skip |
-| conversions.go:21:2:21:4 | skip | conversions.go:21:9:21:18 | "a string" |
-| conversions.go:21:9:21:18 | "a string" | conversions.go:21:2:21:4 | assignment to str |
-| conversions.go:22:2:22:6 | assignment to bytes | conversions.go:23:2:23:4 | use |
-| conversions.go:22:2:22:6 | skip | conversions.go:22:18:22:20 | str |
-| conversions.go:22:11:22:21 | type conversion | conversions.go:22:2:22:6 | assignment to bytes |
+| conversions.go:21:2:21:18 | ... := ... | conversions.go:21:9:21:18 | "a string" |
+| conversions.go:21:2:21:18 | After ... := ... | conversions.go:22:2:22:21 | ... := ... |
+| conversions.go:21:2:21:18 | assign:0 ... := ... | conversions.go:21:2:21:18 | After ... := ... |
+| conversions.go:21:9:21:18 | "a string" | conversions.go:21:2:21:18 | assign:0 ... := ... |
+| conversions.go:22:2:22:21 | ... := ... | conversions.go:22:11:22:21 | Before type conversion |
+| conversions.go:22:2:22:21 | After ... := ... | conversions.go:23:2:23:11 | expression statement |
+| conversions.go:22:2:22:21 | assign:0 ... := ... | conversions.go:22:2:22:21 | After ... := ... |
+| conversions.go:22:11:22:21 | After type conversion | conversions.go:22:2:22:21 | assign:0 ... := ... |
+| conversions.go:22:11:22:21 | Before type conversion | conversions.go:22:18:22:20 | str |
+| conversions.go:22:11:22:21 | type conversion | conversions.go:22:11:22:21 | After type conversion |
 | conversions.go:22:18:22:20 | str | conversions.go:22:11:22:21 | type conversion |
 | conversions.go:23:2:23:4 | use | conversions.go:23:6:23:10 | bytes |
-| conversions.go:23:2:23:11 | call to use | conversions.go:7:1:26:1 | exit |
-| conversions.go:23:2:23:11 | call to use | conversions.go:24:2:24:6 | skip |
+| conversions.go:23:2:23:11 | After call to use | conversions.go:23:2:23:11 | After expression statement |
+| conversions.go:23:2:23:11 | After expression statement | conversions.go:24:2:24:21 | ... := ... |
+| conversions.go:23:2:23:11 | Before call to use | conversions.go:23:2:23:4 | use |
+| conversions.go:23:2:23:11 | call to use | conversions.go:7:1:26:1 | Exceptional Exit |
+| conversions.go:23:2:23:11 | call to use | conversions.go:23:2:23:11 | After call to use |
+| conversions.go:23:2:23:11 | expression statement | conversions.go:23:2:23:11 | Before call to use |
 | conversions.go:23:6:23:10 | bytes | conversions.go:23:2:23:11 | call to use |
-| conversions.go:24:2:24:6 | assignment to runes | conversions.go:25:2:25:4 | use |
-| conversions.go:24:2:24:6 | skip | conversions.go:24:18:24:20 | str |
-| conversions.go:24:11:24:21 | type conversion | conversions.go:24:2:24:6 | assignment to runes |
+| conversions.go:24:2:24:21 | ... := ... | conversions.go:24:11:24:21 | Before type conversion |
+| conversions.go:24:2:24:21 | After ... := ... | conversions.go:25:2:25:11 | expression statement |
+| conversions.go:24:2:24:21 | assign:0 ... := ... | conversions.go:24:2:24:21 | After ... := ... |
+| conversions.go:24:11:24:21 | After type conversion | conversions.go:24:2:24:21 | assign:0 ... := ... |
+| conversions.go:24:11:24:21 | Before type conversion | conversions.go:24:18:24:20 | str |
+| conversions.go:24:11:24:21 | type conversion | conversions.go:24:11:24:21 | After type conversion |
 | conversions.go:24:18:24:20 | str | conversions.go:24:11:24:21 | type conversion |
 | conversions.go:25:2:25:4 | use | conversions.go:25:6:25:10 | runes |
-| conversions.go:25:2:25:11 | call to use | conversions.go:7:1:26:1 | exit |
+| conversions.go:25:2:25:11 | After call to use | conversions.go:25:2:25:11 | After expression statement |
+| conversions.go:25:2:25:11 | After expression statement | conversions.go:7:13:26:1 | After block statement |
+| conversions.go:25:2:25:11 | Before call to use | conversions.go:25:2:25:4 | use |
+| conversions.go:25:2:25:11 | call to use | conversions.go:7:1:26:1 | Exceptional Exit |
+| conversions.go:25:2:25:11 | call to use | conversions.go:25:2:25:11 | After call to use |
+| conversions.go:25:2:25:11 | expression statement | conversions.go:25:2:25:11 | Before call to use |
 | conversions.go:25:6:25:10 | runes | conversions.go:25:2:25:11 | call to use |
 #select
 |  |
diff --git a/go/ql/test/library-tests/semmle/go/Function/GenericFunctionInstantiationExpr.expected b/go/ql/test/library-tests/semmle/go/Function/GenericFunctionInstantiationExpr.expected
index 6528a0ae7f3d..5c01d626b28a 100644
--- a/go/ql/test/library-tests/semmle/go/Function/GenericFunctionInstantiationExpr.expected
+++ b/go/ql/test/library-tests/semmle/go/Function/GenericFunctionInstantiationExpr.expected
@@ -6,3 +6,5 @@
 | genericFunctions.go:45:6:45:50 | generic function instantiation expression | genericFunctions.go:45:6:45:33 | GenericFunctionTwoTypeParams | 1 | genericFunctions.go:45:43:45:49 | float64 |
 | genericFunctions.go:141:6:141:41 | generic function instantiation expression | genericFunctions.go:141:6:141:33 | GenericFunctionInAnotherFile | 0 | genericFunctions.go:141:35:141:40 | string |
 | genericFunctions.go:146:6:146:55 | generic function instantiation expression | genericFunctions.go:146:6:146:47 | selection of GenericFunctionInAnotherPackage | 0 | genericFunctions.go:146:49:146:54 | string |
+| genericMethods.go:13:2:13:23 | generic function instantiation expression | genericMethods.go:13:2:13:18 | selection of GenericMethod1 | 0 | genericMethods.go:13:20:13:22 | int |
+| genericMethods.go:14:2:14:26 | generic function instantiation expression | genericMethods.go:14:2:14:18 | selection of GenericMethod2 | 0 | genericMethods.go:14:20:14:25 | string |
diff --git a/go/ql/test/library-tests/semmle/go/Function/TypeParamType.expected b/go/ql/test/library-tests/semmle/go/Function/TypeParamType.expected
index 4addfa50f349..6a3d9e0091db 100644
--- a/go/ql/test/library-tests/semmle/go/Function/TypeParamType.expected
+++ b/go/ql/test/library-tests/semmle/go/Function/TypeParamType.expected
@@ -19,6 +19,11 @@ numberOfTypeParameters
 | genericFunctions.go:150:6:150:36 | multipleAnonymousTypeParamsFunc | 3 |
 | genericFunctions.go:152:6:152:36 | multipleAnonymousTypeParamsType | 3 |
 | genericFunctions.go:154:51:154:51 | f | 3 |
+| genericMethods.go:5:33:5:46 | GenericMethod1 | 1 |
+| genericMethods.go:7:6:7:28 | StructForGenericMethod2 | 1 |
+| genericMethods.go:9:37:9:50 | GenericMethod2 | 2 |
+| genericMethods.go:21:6:21:29 | StructWithDependentBound | 1 |
+| genericMethods.go:23:38:23:68 | GenericMethodWithDependentBound | 2 |
 #select
 | codeql-go-tests/function.EdgeConstraint | 0 |  | Node | interface { } |
 | codeql-go-tests/function.Element | 0 |  | S | interface { } |
@@ -44,6 +49,13 @@ numberOfTypeParameters
 | codeql-go-tests/function.New | 0 |  | Node | NodeConstraint |
 | codeql-go-tests/function.New | 1 |  | Edge | EdgeConstraint |
 | codeql-go-tests/function.NodeConstraint | 0 |  | Edge | interface { } |
+| codeql-go-tests/function.StructForGenericMethod1.GenericMethod1 | 0 |  | P1 | interface { } |
+| codeql-go-tests/function.StructForGenericMethod2 | 0 |  | P2 | interface { } |
+| codeql-go-tests/function.StructForGenericMethod2.GenericMethod2 | 0 |  | P4 | interface { } |
+| codeql-go-tests/function.StructForGenericMethod2.GenericMethod2 | 0 | from receiver | P3 | interface { } |
+| codeql-go-tests/function.StructWithDependentBound | 0 |  | P5 | interface { } |
+| codeql-go-tests/function.StructWithDependentBound.GenericMethodWithDependentBound | 0 |  | P7 | interface { ~[]P6 } |
+| codeql-go-tests/function.StructWithDependentBound.GenericMethodWithDependentBound | 0 | from receiver | P6 | interface { } |
 | codeql-go-tests/function.multipleAnonymousTypeParamsFunc | 0 |  | _ | interface { } |
 | codeql-go-tests/function.multipleAnonymousTypeParamsFunc | 1 |  | _ | interface { string } |
 | codeql-go-tests/function.multipleAnonymousTypeParamsFunc | 2 |  | _ | interface { } |
diff --git a/go/ql/test/library-tests/semmle/go/Function/genericMethods.go b/go/ql/test/library-tests/semmle/go/Function/genericMethods.go
new file mode 100644
index 000000000000..3d9c414fbe6b
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/Function/genericMethods.go
@@ -0,0 +1,28 @@
+package main
+
+type StructForGenericMethod1 struct{}
+
+func (*StructForGenericMethod1) GenericMethod1[P1 any](x P1) {}
+
+type StructForGenericMethod2[P2 any] struct{}
+
+func (*StructForGenericMethod2[P3]) GenericMethod2[P4 any](x P4) {}
+
+func generic_methods(s1 StructForGenericMethod1, s2 StructForGenericMethod2[int]) {
+	// Call the generic method specifying the type
+	s1.GenericMethod1[int](1)
+	s2.GenericMethod2[string]("hello")
+
+	// Call the generic method without specifying the type
+	s1.GenericMethod1("hello")
+	s2.GenericMethod2(42)
+}
+
+type StructWithDependentBound[P5 any] struct{}
+
+func (*StructWithDependentBound[P6]) GenericMethodWithDependentBound[P7 ~[]P6](x P7) {}
+
+func genericMethodDependentBounds(t1 StructWithDependentBound[int], t2 StructWithDependentBound[string]) {
+	t1.GenericMethodWithDependentBound([]int{})
+	t2.GenericMethodWithDependentBound([]string{})
+}
diff --git a/go/ql/test/library-tests/semmle/go/Function/getParameter.expected b/go/ql/test/library-tests/semmle/go/Function/getParameter.expected
index 80171d5e79a6..39961b50a07b 100644
--- a/go/ql/test/library-tests/semmle/go/Function/getParameter.expected
+++ b/go/ql/test/library-tests/semmle/go/Function/getParameter.expected
@@ -11,6 +11,13 @@
 | genericFunctions.go:138:29:138:40 | ShortestPath | 1 | genericFunctions.go:138:48:138:49 | to |
 | genericFunctions.go:138:29:138:40 | ShortestPath | -1 | genericFunctions.go:138:7:138:7 | g |
 | genericFunctions.go:154:51:154:51 | f | -1 | genericFunctions.go:154:7:154:7 | x |
+| genericMethods.go:5:33:5:46 | GenericMethod1 | 0 | genericMethods.go:5:56:5:56 | x |
+| genericMethods.go:9:37:9:50 | GenericMethod2 | 0 | genericMethods.go:9:60:9:60 | x |
+| genericMethods.go:11:6:11:20 | generic_methods | 0 | genericMethods.go:11:22:11:23 | s1 |
+| genericMethods.go:11:6:11:20 | generic_methods | 1 | genericMethods.go:11:50:11:51 | s2 |
+| genericMethods.go:23:38:23:68 | GenericMethodWithDependentBound | 0 | genericMethods.go:23:80:23:80 | x |
+| genericMethods.go:25:6:25:33 | genericMethodDependentBounds | 0 | genericMethods.go:25:35:25:36 | t1 |
+| genericMethods.go:25:6:25:33 | genericMethodDependentBounds | 1 | genericMethods.go:25:69:25:70 | t2 |
 | main.go:7:6:7:7 | f1 | 0 | main.go:7:9:7:9 | x |
 | main.go:9:12:9:13 | f2 | 0 | main.go:9:15:9:15 | x |
 | main.go:9:12:9:13 | f2 | 1 | main.go:9:18:9:18 | y |
diff --git a/go/ql/test/library-tests/semmle/go/Function/getTypeParameter.expected b/go/ql/test/library-tests/semmle/go/Function/getTypeParameter.expected
index 27a89adf95e2..2519efae0ed2 100644
--- a/go/ql/test/library-tests/semmle/go/Function/getTypeParameter.expected
+++ b/go/ql/test/library-tests/semmle/go/Function/getTypeParameter.expected
@@ -19,3 +19,8 @@
 | genericFunctions.go:152:6:152:69 | type declaration specifier | TypeSpec | 0 | genericFunctions.go:152:38:152:42 | type parameter declaration | 0 | genericFunctions.go:152:38:152:38 | _ | genericFunctions.go:152:40:152:42 | any | interface { } |
 | genericFunctions.go:152:6:152:69 | type declaration specifier | TypeSpec | 1 | genericFunctions.go:152:45:152:52 | type parameter declaration | 0 | genericFunctions.go:152:45:152:45 | _ | genericFunctions.go:152:47:152:52 | string | interface { string } |
 | genericFunctions.go:152:6:152:69 | type declaration specifier | TypeSpec | 2 | genericFunctions.go:152:55:152:59 | type parameter declaration | 0 | genericFunctions.go:152:55:152:55 | _ | genericFunctions.go:152:57:152:59 | any | interface { } |
+| genericMethods.go:5:1:5:63 | function declaration | MethodDecl | 0 | genericMethods.go:5:48:5:53 | type parameter declaration | 0 | genericMethods.go:5:48:5:49 | P1 | genericMethods.go:5:51:5:53 | any | interface { } |
+| genericMethods.go:7:6:7:45 | type declaration specifier | TypeSpec | 0 | genericMethods.go:7:30:7:35 | type parameter declaration | 0 | genericMethods.go:7:30:7:31 | P2 | genericMethods.go:7:33:7:35 | any | interface { } |
+| genericMethods.go:9:1:9:67 | function declaration | MethodDecl | 0 | genericMethods.go:9:52:9:57 | type parameter declaration | 0 | genericMethods.go:9:52:9:53 | P4 | genericMethods.go:9:55:9:57 | any | interface { } |
+| genericMethods.go:21:6:21:46 | type declaration specifier | TypeSpec | 0 | genericMethods.go:21:31:21:36 | type parameter declaration | 0 | genericMethods.go:21:31:21:32 | P5 | genericMethods.go:21:34:21:36 | any | interface { } |
+| genericMethods.go:23:1:23:87 | function declaration | MethodDecl | 0 | genericMethods.go:23:70:23:77 | type parameter declaration | 0 | genericMethods.go:23:70:23:71 | P7 | genericMethods.go:23:73:23:77 | type set literal | interface { ~[]P6 } |
diff --git a/go/ql/test/library-tests/semmle/go/Function/go.mod b/go/ql/test/library-tests/semmle/go/Function/go.mod
index 85d3db5c5a37..6be32d80e106 100644
--- a/go/ql/test/library-tests/semmle/go/Function/go.mod
+++ b/go/ql/test/library-tests/semmle/go/Function/go.mod
@@ -1,6 +1,6 @@
 module codeql-go-tests/function
 
-go 1.18
+go 1.27
 
 require github.com/anotherpkg v0.0.0-20200203000000-0000000000000
 
diff --git a/go/ql/test/library-tests/semmle/go/IR/test.expected b/go/ql/test/library-tests/semmle/go/IR/test.expected
index c42cdaa9932f..1895e51b6fa4 100644
--- a/go/ql/test/library-tests/semmle/go/IR/test.expected
+++ b/go/ql/test/library-tests/semmle/go/IR/test.expected
@@ -1,10 +1,10 @@
-| test.go:9:2:9:16 | ... := ...[0] | test.go:9:13:9:16 | <-... | 0 | file://:0:0:0:0 | bool |
-| test.go:9:2:9:16 | ... := ...[1] | test.go:9:13:9:16 | <-... | 1 | file://:0:0:0:0 | bool |
-| test.go:15:2:15:20 | ... := ...[0] | test.go:15:13:15:20 | index expression | 0 | file://:0:0:0:0 | string |
-| test.go:15:2:15:20 | ... := ...[1] | test.go:15:13:15:20 | index expression | 1 | file://:0:0:0:0 | bool |
-| test.go:21:2:21:22 | ... := ...[0] | test.go:21:13:21:22 | type assertion | 0 | file://:0:0:0:0 | string |
-| test.go:21:2:21:22 | ... := ...[1] | test.go:21:13:21:22 | type assertion | 1 | file://:0:0:0:0 | bool |
-| test.go:29:2:29:7 | call to f[0] | test.go:29:4:29:6 | call to g | 0 | file://:0:0:0:0 | int |
-| test.go:29:2:29:7 | call to f[1] | test.go:29:4:29:6 | call to g | 1 | file://:0:0:0:0 | int |
-| test.go:33:2:33:7 | call to f[0] | test.go:33:4:33:6 | call to v | 0 | file://:0:0:0:0 | int |
-| test.go:33:2:33:7 | call to f[1] | test.go:33:4:33:6 | call to v | 1 | file://:0:0:0:0 | int |
+| test.go:9:2:9:16 | extract:0 ... := ... | test.go:9:13:9:16 | <-... | 0 | file://:0:0:0:0 | bool |
+| test.go:9:2:9:16 | extract:1 ... := ... | test.go:9:13:9:16 | <-... | 1 | file://:0:0:0:0 | bool |
+| test.go:15:2:15:20 | extract:0 ... := ... | test.go:15:13:15:20 | index expression | 0 | file://:0:0:0:0 | string |
+| test.go:15:2:15:20 | extract:1 ... := ... | test.go:15:13:15:20 | index expression | 1 | file://:0:0:0:0 | bool |
+| test.go:21:2:21:22 | extract:0 ... := ... | test.go:21:13:21:22 | type assertion | 0 | file://:0:0:0:0 | string |
+| test.go:21:2:21:22 | extract:1 ... := ... | test.go:21:13:21:22 | type assertion | 1 | file://:0:0:0:0 | bool |
+| test.go:29:2:29:7 | extract:0 call to f | test.go:29:4:29:6 | call to g | 0 | file://:0:0:0:0 | int |
+| test.go:29:2:29:7 | extract:1 call to f | test.go:29:4:29:6 | call to g | 1 | file://:0:0:0:0 | int |
+| test.go:33:2:33:7 | extract:0 call to f | test.go:33:4:33:6 | call to v | 0 | file://:0:0:0:0 | int |
+| test.go:33:2:33:7 | extract:1 call to f | test.go:33:4:33:6 | call to v | 1 | file://:0:0:0:0 | int |
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/CONSISTENCY/CfgConsistency.expected b/go/ql/test/library-tests/semmle/go/PrintAst/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..bedab226be6e
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/CONSISTENCY/CfgConsistency.expected
@@ -0,0 +1,12 @@
+consistencyOverview
+| deadEnd | 1 |
+| multipleSuccessors | 6 |
+deadEnd
+| input.go:61:2:61:10 | select statement |
+multipleSuccessors
+| input.go:50:2:59:2 | select statement | successor | input.go:51:2:52:31 | comm clause |
+| input.go:50:2:59:2 | select statement | successor | input.go:53:2:55:16 | comm clause |
+| input.go:50:2:59:2 | select statement | successor | input.go:56:2:57:15 | comm clause |
+| input.go:50:2:59:2 | select statement | successor | input.go:58:2:58:16 | comm clause |
+| input.go:71:2:71:10 | catch-return return statement | successor | input.go:67:9:67:35 | defer-invoke function call |
+| input.go:71:2:71:10 | catch-return return statement | successor | input.go:69:9:69:36 | defer-invoke function call |
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
index 66aa26430633..ddd012611356 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
@@ -547,8 +547,9 @@ input.go:
 #  133|             Type = []int
 #  133|     2: [BlockStmt] block statement
 #  134|       0: [RangeStmt] range statement
-#  134|         0: [Ident, VariableName] x
-#  134|             Type = int
+#  134|         0: [RangeElementExpr] range element
+#  134|           0: [Ident, VariableName] x
+#  134|               Type = int
 #  134|         1: [Ident, VariableName] xs
 #  134|             Type = []int
 #  134|         2: [BlockStmt] block statement
@@ -573,13 +574,14 @@ input.go:
 #  138|               1: [Ident, VariableName] x
 #  138|                   Type = int
 #  141|       1: [RangeStmt] range statement
-#  141|         0: [Ident, VariableName] i
-#  141|             Type = int
-#  141|         1: [Ident, VariableName] v
-#  141|             Type = int
-#  141|         2: [Ident, VariableName] xs
+#  141|         0: [RangeElementExpr] range element
+#  141|           0: [Ident, VariableName] i
+#  141|               Type = int
+#  141|           1: [Ident, VariableName] v
+#  141|               Type = int
+#  141|         1: [Ident, VariableName] xs
 #  141|             Type = []int
-#  141|         3: [BlockStmt] block statement
+#  141|         2: [BlockStmt] block statement
 #  142|           0: [ExprStmt] expression statement
 #  142|             0: [CallExpr] call to Print
 #  142|                 Type = (int, error)
@@ -593,9 +595,10 @@ input.go:
 #  142|               2: [Ident, VariableName] v
 #  142|                   Type = int
 #  145|       2: [RangeStmt] range statement
-#  145|         0: [Ident, VariableName] xs
+#  145|         0: [RangeElementExpr] range element
+#  145|         1: [Ident, VariableName] xs
 #  145|             Type = []int
-#  145|         1: [BlockStmt] block statement
+#  145|         2: [BlockStmt] block statement
 other.go:
 #    0| [GoFile] other.go
 #    1|   package: [Ident] main
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected
index 099aa4e6144f..c25ff250f785 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.expected
@@ -527,8 +527,9 @@ input.go:
 #  133|             Type = []int
 #  133|     2: [BlockStmt] block statement
 #  134|       0: [RangeStmt] range statement
-#  134|         0: [Ident, VariableName] x
-#  134|             Type = int
+#  134|         0: [RangeElementExpr] range element
+#  134|           0: [Ident, VariableName] x
+#  134|               Type = int
 #  134|         1: [Ident, VariableName] xs
 #  134|             Type = []int
 #  134|         2: [BlockStmt] block statement
@@ -553,13 +554,14 @@ input.go:
 #  138|               1: [Ident, VariableName] x
 #  138|                   Type = int
 #  141|       1: [RangeStmt] range statement
-#  141|         0: [Ident, VariableName] i
-#  141|             Type = int
-#  141|         1: [Ident, VariableName] v
-#  141|             Type = int
-#  141|         2: [Ident, VariableName] xs
+#  141|         0: [RangeElementExpr] range element
+#  141|           0: [Ident, VariableName] i
+#  141|               Type = int
+#  141|           1: [Ident, VariableName] v
+#  141|               Type = int
+#  141|         1: [Ident, VariableName] xs
 #  141|             Type = []int
-#  141|         3: [BlockStmt] block statement
+#  141|         2: [BlockStmt] block statement
 #  142|           0: [ExprStmt] expression statement
 #  142|             0: [CallExpr] call to Print
 #  142|                 Type = (int, error)
@@ -573,9 +575,10 @@ input.go:
 #  142|               2: [Ident, VariableName] v
 #  142|                   Type = int
 #  145|       2: [RangeStmt] range statement
-#  145|         0: [Ident, VariableName] xs
+#  145|         0: [RangeElementExpr] range element
+#  145|         1: [Ident, VariableName] xs
 #  145|             Type = []int
-#  145|         1: [BlockStmt] block statement
+#  145|         2: [BlockStmt] block statement
 other.go:
 #    0| [GoFile] other.go
 #    1|   package: [Ident] main
diff --git a/go/ql/test/library-tests/semmle/go/Scopes/EntityWrite.expected b/go/ql/test/library-tests/semmle/go/Scopes/EntityWrite.expected
index 843922048a07..ed3af2c6ddff 100644
--- a/go/ql/test/library-tests/semmle/go/Scopes/EntityWrite.expected
+++ b/go/ql/test/library-tests/semmle/go/Scopes/EntityWrite.expected
@@ -1,6 +1,6 @@
 | main.go:6:2:6:2 | x | main.go:24:2:24:9 | increment statement |
-| main.go:13:7:13:10 | recv | main.go:13:7:13:10 | initialization of recv |
-| main.go:17:10:17:10 | x | main.go:17:10:17:10 | initialization of x |
-| main.go:17:26:17:26 | y | main.go:17:26:17:26 | initialization of y |
-| main.go:23:7:23:10 | recv | main.go:23:7:23:10 | initialization of recv |
-| types.go:33:22:33:22 | a | types.go:33:22:33:22 | initialization of a |
+| main.go:13:7:13:10 | recv | main.go:13:7:13:10 | recv |
+| main.go:17:10:17:10 | x | main.go:17:10:17:10 | x |
+| main.go:17:26:17:26 | y | main.go:17:26:17:26 | y |
+| main.go:23:7:23:10 | recv | main.go:23:7:23:10 | recv |
+| types.go:33:22:33:22 | a | types.go:33:22:33:22 | a |
diff --git a/go/ql/test/library-tests/semmle/go/Types/notype.ql b/go/ql/test/library-tests/semmle/go/Types/notype.ql
index 9c781d2bff23..9845f6129303 100644
--- a/go/ql/test/library-tests/semmle/go/Types/notype.ql
+++ b/go/ql/test/library-tests/semmle/go/Types/notype.ql
@@ -4,5 +4,7 @@ from Expr e
 where
   // filter out expressions that don't have any semantics
   exists(DataFlow::exprNode(e)) and
-  not type_of(e, _)
+  // no type was extracted for the expression, and it has no synthesized type either
+  not type_of(e, _) and
+  e.getType() instanceof InvalidType
 select e, e.getType()
diff --git a/go/ql/test/library-tests/semmle/go/concepts/HTTP/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/concepts/HTTP/CONSISTENCY/DataFlowConsistency.expected
index ded5f21e3e6a..56f4c17d2240 100644
--- a/go/ql/test/library-tests/semmle/go/concepts/HTTP/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/concepts/HTTP/CONSISTENCY/DataFlowConsistency.expected
@@ -1,9 +1,9 @@
 reverseRead
-| main.go:49:2:49:4 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| main.go:50:2:50:4 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| main.go:58:2:58:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| main.go:63:49:63:49 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| server.go:8:6:8:6 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| server.go:9:6:9:6 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| server.go:10:6:10:6 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| server.go:13:6:13:6 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| main.go:49:2:49:4 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| main.go:50:2:50:4 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| main.go:58:2:58:5 | implicit-deref resp | Origin of readStep is missing a PostUpdateNode. |
+| main.go:63:49:63:49 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| server.go:8:6:8:6 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| server.go:9:6:9:6 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| server.go:10:6:10:6 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| server.go:13:6:13:6 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/concepts/Regexp/RegexpPattern.expected b/go/ql/test/library-tests/semmle/go/concepts/Regexp/RegexpPattern.expected
index 63adab35d7b6..7019de4934ed 100644
--- a/go/ql/test/library-tests/semmle/go/concepts/Regexp/RegexpPattern.expected
+++ b/go/ql/test/library-tests/semmle/go/concepts/Regexp/RegexpPattern.expected
@@ -1,10 +1,10 @@
 | stdlib.go:10:15:10:17 | "a" | a | stdlib.go:10:15:10:17 | "a" |
 | stdlib.go:12:21:12:39 | `(^\|\\n)repository=` | (^\|\\n)repository= | stdlib.go:12:21:12:39 | `(^\|\\n)repository=` |
 | stdlib.go:13:21:13:24 | "ab" | ab | stdlib.go:13:21:13:24 | "ab" |
-| stdlib.go:15:26:15:39 | "[so]me\|regex" | [so]me\|regex | stdlib.go:15:2:15:40 | ... := ...[0] |
+| stdlib.go:15:26:15:39 | "[so]me\|regex" | [so]me\|regex | stdlib.go:15:2:15:40 | extract:0 ... := ... |
 | stdlib.go:15:26:15:39 | "[so]me\|regex" | [so]me\|regex | stdlib.go:15:26:15:39 | "[so]me\|regex" |
-| stdlib.go:16:30:16:37 | "posix?" | posix? | stdlib.go:16:2:16:3 | SSA def(re) |
-| stdlib.go:16:30:16:37 | "posix?" | posix? | stdlib.go:16:2:16:38 | ... = ...[0] |
+| stdlib.go:16:30:16:37 | "posix?" | posix? | stdlib.go:16:2:16:38 | SSA def(re) |
+| stdlib.go:16:30:16:37 | "posix?" | posix? | stdlib.go:16:2:16:38 | extract:0 ... = ... |
 | stdlib.go:16:30:16:37 | "posix?" | posix? | stdlib.go:16:30:16:37 | "posix?" |
 | stdlib.go:16:30:16:37 | "posix?" | posix? | stdlib.go:17:2:17:3 | re |
 | stdlib.go:16:30:16:37 | "posix?" | posix? | stdlib.go:21:2:21:3 | re |
diff --git a/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/CONSISTENCY/CfgConsistency.expected b/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..d856f64ab253
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/CONSISTENCY/CfgConsistency.expected
@@ -0,0 +1,33 @@
+consistencyOverview
+| deadEnd | 1 |
+| multipleSuccessors | 24 |
+| selfLoop | 1 |
+deadEnd
+| stmts.go:61:2:61:10 | select statement |
+multipleSuccessors
+| stmts2.go:16:2:26:2 | select statement | successor | stmts2.go:17:2:17:15 | comm clause |
+| stmts2.go:16:2:26:2 | select statement | successor | stmts2.go:18:2:19:10 | comm clause |
+| stmts2.go:16:2:26:2 | select statement | successor | stmts2.go:20:2:24:10 | comm clause |
+| stmts2.go:16:2:26:2 | select statement | successor | stmts2.go:25:2:25:18 | comm clause |
+| stmts7.go:61:2:61:20 | After expression statement | successor | stmts7.go:57:38:62:1 | After block statement |
+| stmts7.go:61:2:61:20 | After expression statement | successor | stmts7.go:59:9:59:22 | defer-invoke call to recoverPanic |
+| stmts7.go:61:2:61:20 | catch-panic expression statement | successor | stmts7.go:57:1:62:1 | Exceptional Exit |
+| stmts7.go:61:2:61:20 | catch-panic expression statement | successor | stmts7.go:59:9:59:22 | defer-invoke call to recoverPanic |
+| stmts7.go:65:2:67:2 | After for statement | successor | stmts7.go:64:31:68:1 | After block statement |
+| stmts7.go:65:2:67:2 | After for statement | successor | stmts7.go:66:9:66:22 | defer-invoke call to recoverPanic |
+| stmts7.go:66:3:66:22 | catch-defer-panic defer statement | successor | stmts7.go:64:1:68:1 | Exceptional Exit |
+| stmts7.go:66:3:66:22 | catch-defer-panic defer statement | successor | stmts7.go:66:9:66:22 | defer-invoke call to recoverPanic |
+| stmts7.go:66:9:66:22 | defer-invoke call to recoverPanic | successor | stmts7.go:64:31:68:1 | After block statement |
+| stmts7.go:66:9:66:22 | defer-invoke call to recoverPanic | successor | stmts7.go:66:9:66:22 | defer-invoke call to recoverPanic |
+| stmts7.go:75:1:76:20 | After labeled statement | successor | stmts7.go:70:31:77:1 | After block statement |
+| stmts7.go:75:1:76:20 | After labeled statement | successor | stmts7.go:74:8:74:21 | defer-invoke call to recoverPanic |
+| stmts7.go:75:1:76:20 | catch-panic labeled statement | successor | stmts7.go:70:1:77:1 | Exceptional Exit |
+| stmts7.go:75:1:76:20 | catch-panic labeled statement | successor | stmts7.go:74:8:74:21 | defer-invoke call to recoverPanic |
+| stmts.go:50:2:59:2 | select statement | successor | stmts.go:51:2:52:31 | comm clause |
+| stmts.go:50:2:59:2 | select statement | successor | stmts.go:53:2:55:16 | comm clause |
+| stmts.go:50:2:59:2 | select statement | successor | stmts.go:56:2:57:15 | comm clause |
+| stmts.go:50:2:59:2 | select statement | successor | stmts.go:58:2:58:16 | comm clause |
+| stmts.go:71:2:71:10 | catch-return return statement | successor | stmts.go:67:9:67:35 | defer-invoke function call |
+| stmts.go:71:2:71:10 | catch-return return statement | successor | stmts.go:69:9:69:36 | defer-invoke function call |
+selfLoop
+| stmts7.go:66:9:66:22 | defer-invoke call to recoverPanic | successor |
diff --git a/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/ControlFlowNode_getASuccessor.expected b/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/ControlFlowNode_getASuccessor.expected
index 3768d015167e..ae8d5d7e77c4 100644
--- a/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/ControlFlowNode_getASuccessor.expected
+++ b/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/ControlFlowNode_getASuccessor.expected
@@ -1,1821 +1,3311 @@
-| DuplicateSwitchCase.go:0:0:0:0 | entry | DuplicateSwitchCase.go:3:6:3:15 | skip |
-| DuplicateSwitchCase.go:3:1:12:1 | entry | DuplicateSwitchCase.go:3:17:3:19 | argument corresponding to msg |
-| DuplicateSwitchCase.go:3:1:12:1 | function declaration | DuplicateSwitchCase.go:14:6:14:10 | skip |
-| DuplicateSwitchCase.go:3:6:3:15 | skip | DuplicateSwitchCase.go:3:1:12:1 | function declaration |
-| DuplicateSwitchCase.go:3:17:3:19 | argument corresponding to msg | DuplicateSwitchCase.go:3:17:3:19 | initialization of msg |
-| DuplicateSwitchCase.go:3:17:3:19 | initialization of msg | DuplicateSwitchCase.go:4:2:11:2 | true |
-| DuplicateSwitchCase.go:4:2:11:2 | true | DuplicateSwitchCase.go:5:7:5:9 | msg |
+| DuplicateSwitchCase.go:0:0:0:0 | After DuplicateSwitchCase.go | DuplicateSwitchCase.go:0:0:0:0 | Normal Exit |
+| DuplicateSwitchCase.go:0:0:0:0 | DuplicateSwitchCase.go | DuplicateSwitchCase.go:3:1:12:1 | function declaration |
+| DuplicateSwitchCase.go:0:0:0:0 | Entry | DuplicateSwitchCase.go:0:0:0:0 | DuplicateSwitchCase.go |
+| DuplicateSwitchCase.go:0:0:0:0 | Normal Exit | DuplicateSwitchCase.go:0:0:0:0 | Exit |
+| DuplicateSwitchCase.go:3:1:12:1 | Entry | DuplicateSwitchCase.go:3:17:3:19 | msg |
+| DuplicateSwitchCase.go:3:1:12:1 | Exceptional Exit | DuplicateSwitchCase.go:3:1:12:1 | Exit |
+| DuplicateSwitchCase.go:3:1:12:1 | Normal Exit | DuplicateSwitchCase.go:3:1:12:1 | Exit |
+| DuplicateSwitchCase.go:3:1:12:1 | function declaration | DuplicateSwitchCase.go:14:1:14:15 | function declaration |
+| DuplicateSwitchCase.go:3:17:3:19 | msg | DuplicateSwitchCase.go:3:29:12:1 | block statement |
+| DuplicateSwitchCase.go:3:29:12:1 | After block statement | DuplicateSwitchCase.go:3:1:12:1 | Normal Exit |
+| DuplicateSwitchCase.go:3:29:12:1 | block statement | DuplicateSwitchCase.go:4:2:11:2 | expression-switch statement |
+| DuplicateSwitchCase.go:4:2:11:2 | After expression-switch statement | DuplicateSwitchCase.go:3:29:12:1 | After block statement |
+| DuplicateSwitchCase.go:4:2:11:2 | expression-switch statement | DuplicateSwitchCase.go:5:2:6:9 | case clause |
+| DuplicateSwitchCase.go:5:2:6:9 | After case clause [match] | DuplicateSwitchCase.go:6:3:6:9 | expression statement |
+| DuplicateSwitchCase.go:5:2:6:9 | After case clause [no-match] | DuplicateSwitchCase.go:7:2:8:8 | case clause |
+| DuplicateSwitchCase.go:5:2:6:9 | case clause | DuplicateSwitchCase.go:5:7:5:20 | Before ...==... |
 | DuplicateSwitchCase.go:5:7:5:9 | msg | DuplicateSwitchCase.go:5:14:5:20 | "start" |
-| DuplicateSwitchCase.go:5:7:5:20 | ...==... | DuplicateSwitchCase.go:5:7:5:20 | case ...==... |
-| DuplicateSwitchCase.go:5:7:5:20 | ...==... is false | DuplicateSwitchCase.go:7:7:7:9 | msg |
-| DuplicateSwitchCase.go:5:7:5:20 | ...==... is true | DuplicateSwitchCase.go:6:3:6:7 | start |
-| DuplicateSwitchCase.go:5:7:5:20 | case ...==... | DuplicateSwitchCase.go:5:7:5:20 | ...==... is false |
-| DuplicateSwitchCase.go:5:7:5:20 | case ...==... | DuplicateSwitchCase.go:5:7:5:20 | ...==... is true |
+| DuplicateSwitchCase.go:5:7:5:20 | ...==... | DuplicateSwitchCase.go:5:7:5:20 | After ...==... [match] |
+| DuplicateSwitchCase.go:5:7:5:20 | ...==... | DuplicateSwitchCase.go:5:7:5:20 | After ...==... [no-match] |
+| DuplicateSwitchCase.go:5:7:5:20 | After ...==... [match] | DuplicateSwitchCase.go:5:2:6:9 | After case clause [match] |
+| DuplicateSwitchCase.go:5:7:5:20 | After ...==... [no-match] | DuplicateSwitchCase.go:5:2:6:9 | After case clause [no-match] |
+| DuplicateSwitchCase.go:5:7:5:20 | Before ...==... | DuplicateSwitchCase.go:5:7:5:9 | msg |
 | DuplicateSwitchCase.go:5:14:5:20 | "start" | DuplicateSwitchCase.go:5:7:5:20 | ...==... |
 | DuplicateSwitchCase.go:6:3:6:7 | start | DuplicateSwitchCase.go:6:3:6:9 | call to start |
-| DuplicateSwitchCase.go:6:3:6:9 | call to start | DuplicateSwitchCase.go:3:1:12:1 | exit |
+| DuplicateSwitchCase.go:6:3:6:9 | After call to start | DuplicateSwitchCase.go:6:3:6:9 | After expression statement |
+| DuplicateSwitchCase.go:6:3:6:9 | After expression statement | DuplicateSwitchCase.go:4:2:11:2 | After expression-switch statement |
+| DuplicateSwitchCase.go:6:3:6:9 | Before call to start | DuplicateSwitchCase.go:6:3:6:7 | start |
+| DuplicateSwitchCase.go:6:3:6:9 | call to start | DuplicateSwitchCase.go:3:1:12:1 | Exceptional Exit |
+| DuplicateSwitchCase.go:6:3:6:9 | call to start | DuplicateSwitchCase.go:6:3:6:9 | After call to start |
+| DuplicateSwitchCase.go:6:3:6:9 | expression statement | DuplicateSwitchCase.go:6:3:6:9 | Before call to start |
+| DuplicateSwitchCase.go:7:2:8:8 | After case clause [match] | DuplicateSwitchCase.go:8:3:8:8 | expression statement |
+| DuplicateSwitchCase.go:7:2:8:8 | After case clause [no-match] | DuplicateSwitchCase.go:9:2:10:34 | case clause |
+| DuplicateSwitchCase.go:7:2:8:8 | case clause | DuplicateSwitchCase.go:7:7:7:20 | Before ...==... |
 | DuplicateSwitchCase.go:7:7:7:9 | msg | DuplicateSwitchCase.go:7:14:7:20 | "start" |
-| DuplicateSwitchCase.go:7:7:7:20 | ...==... | DuplicateSwitchCase.go:7:7:7:20 | case ...==... |
-| DuplicateSwitchCase.go:7:7:7:20 | ...==... is false | DuplicateSwitchCase.go:10:3:10:7 | panic |
-| DuplicateSwitchCase.go:7:7:7:20 | ...==... is true | DuplicateSwitchCase.go:8:3:8:6 | stop |
-| DuplicateSwitchCase.go:7:7:7:20 | case ...==... | DuplicateSwitchCase.go:7:7:7:20 | ...==... is false |
-| DuplicateSwitchCase.go:7:7:7:20 | case ...==... | DuplicateSwitchCase.go:7:7:7:20 | ...==... is true |
+| DuplicateSwitchCase.go:7:7:7:20 | ...==... | DuplicateSwitchCase.go:7:7:7:20 | After ...==... [match] |
+| DuplicateSwitchCase.go:7:7:7:20 | ...==... | DuplicateSwitchCase.go:7:7:7:20 | After ...==... [no-match] |
+| DuplicateSwitchCase.go:7:7:7:20 | After ...==... [match] | DuplicateSwitchCase.go:7:2:8:8 | After case clause [match] |
+| DuplicateSwitchCase.go:7:7:7:20 | After ...==... [no-match] | DuplicateSwitchCase.go:7:2:8:8 | After case clause [no-match] |
+| DuplicateSwitchCase.go:7:7:7:20 | Before ...==... | DuplicateSwitchCase.go:7:7:7:9 | msg |
 | DuplicateSwitchCase.go:7:14:7:20 | "start" | DuplicateSwitchCase.go:7:7:7:20 | ...==... |
 | DuplicateSwitchCase.go:8:3:8:6 | stop | DuplicateSwitchCase.go:8:3:8:8 | call to stop |
-| DuplicateSwitchCase.go:8:3:8:8 | call to stop | DuplicateSwitchCase.go:3:1:12:1 | exit |
+| DuplicateSwitchCase.go:8:3:8:8 | After call to stop | DuplicateSwitchCase.go:8:3:8:8 | After expression statement |
+| DuplicateSwitchCase.go:8:3:8:8 | After expression statement | DuplicateSwitchCase.go:4:2:11:2 | After expression-switch statement |
+| DuplicateSwitchCase.go:8:3:8:8 | Before call to stop | DuplicateSwitchCase.go:8:3:8:6 | stop |
+| DuplicateSwitchCase.go:8:3:8:8 | call to stop | DuplicateSwitchCase.go:3:1:12:1 | Exceptional Exit |
+| DuplicateSwitchCase.go:8:3:8:8 | call to stop | DuplicateSwitchCase.go:8:3:8:8 | After call to stop |
+| DuplicateSwitchCase.go:8:3:8:8 | expression statement | DuplicateSwitchCase.go:8:3:8:8 | Before call to stop |
+| DuplicateSwitchCase.go:9:2:10:34 | After case clause [match] | DuplicateSwitchCase.go:10:3:10:34 | expression statement |
+| DuplicateSwitchCase.go:9:2:10:34 | case clause | DuplicateSwitchCase.go:9:2:10:34 | After case clause [match] |
 | DuplicateSwitchCase.go:10:3:10:7 | panic | DuplicateSwitchCase.go:10:9:10:33 | "Message not understood." |
-| DuplicateSwitchCase.go:10:3:10:34 | call to panic | DuplicateSwitchCase.go:3:1:12:1 | exit |
+| DuplicateSwitchCase.go:10:3:10:34 | Before call to panic | DuplicateSwitchCase.go:10:3:10:7 | panic |
+| DuplicateSwitchCase.go:10:3:10:34 | call to panic | DuplicateSwitchCase.go:3:1:12:1 | Exceptional Exit |
+| DuplicateSwitchCase.go:10:3:10:34 | expression statement | DuplicateSwitchCase.go:10:3:10:34 | Before call to panic |
 | DuplicateSwitchCase.go:10:9:10:33 | "Message not understood." | DuplicateSwitchCase.go:10:3:10:34 | call to panic |
-| DuplicateSwitchCase.go:14:1:14:15 | entry | DuplicateSwitchCase.go:14:14:14:15 | skip |
-| DuplicateSwitchCase.go:14:1:14:15 | function declaration | DuplicateSwitchCase.go:16:6:16:9 | skip |
-| DuplicateSwitchCase.go:14:6:14:10 | skip | DuplicateSwitchCase.go:14:1:14:15 | function declaration |
-| DuplicateSwitchCase.go:14:14:14:15 | skip | DuplicateSwitchCase.go:14:1:14:15 | exit |
-| DuplicateSwitchCase.go:16:1:16:14 | entry | DuplicateSwitchCase.go:16:13:16:14 | skip |
-| DuplicateSwitchCase.go:16:1:16:14 | function declaration | DuplicateSwitchCase.go:0:0:0:0 | exit |
-| DuplicateSwitchCase.go:16:6:16:9 | skip | DuplicateSwitchCase.go:16:1:16:14 | function declaration |
-| DuplicateSwitchCase.go:16:13:16:14 | skip | DuplicateSwitchCase.go:16:1:16:14 | exit |
-| epilogues.go:0:0:0:0 | entry | epilogues.go:3:1:3:12 | skip |
-| epilogues.go:3:1:3:12 | skip | epilogues.go:8:1:10:1 | skip |
-| epilogues.go:8:1:10:1 | skip | epilogues.go:12:21:12:23 | skip |
-| epilogues.go:12:1:14:1 | entry | epilogues.go:12:7:12:7 | argument corresponding to l |
-| epilogues.go:12:1:14:1 | function declaration | epilogues.go:16:20:16:27 | skip |
-| epilogues.go:12:7:12:7 | argument corresponding to l | epilogues.go:12:7:12:7 | initialization of l |
-| epilogues.go:12:7:12:7 | initialization of l | epilogues.go:12:25:12:27 | argument corresponding to msg |
-| epilogues.go:12:21:12:23 | skip | epilogues.go:12:1:14:1 | function declaration |
-| epilogues.go:12:25:12:27 | argument corresponding to msg | epilogues.go:12:25:12:27 | initialization of msg |
-| epilogues.go:12:25:12:27 | initialization of msg | epilogues.go:12:37:12:40 | argument corresponding to code |
-| epilogues.go:12:37:12:40 | argument corresponding to code | epilogues.go:12:37:12:40 | initialization of code |
-| epilogues.go:12:37:12:40 | initialization of code | epilogues.go:13:2:13:12 | selection of Println |
-| epilogues.go:13:2:13:12 | selection of Println | epilogues.go:13:14:13:14 | l |
-| epilogues.go:13:2:13:33 | call to Println | epilogues.go:12:1:14:1 | exit |
-| epilogues.go:13:14:13:14 | implicit dereference | epilogues.go:12:1:14:1 | exit |
-| epilogues.go:13:14:13:14 | implicit dereference | epilogues.go:13:14:13:21 | selection of prefix |
-| epilogues.go:13:14:13:14 | l | epilogues.go:13:14:13:14 | implicit dereference |
-| epilogues.go:13:14:13:21 | selection of prefix | epilogues.go:13:24:13:26 | msg |
+| DuplicateSwitchCase.go:14:1:14:15 | Entry | DuplicateSwitchCase.go:14:14:14:15 | block statement |
+| DuplicateSwitchCase.go:14:1:14:15 | Normal Exit | DuplicateSwitchCase.go:14:1:14:15 | Exit |
+| DuplicateSwitchCase.go:14:1:14:15 | function declaration | DuplicateSwitchCase.go:16:1:16:14 | function declaration |
+| DuplicateSwitchCase.go:14:14:14:15 | block statement | DuplicateSwitchCase.go:14:1:14:15 | Normal Exit |
+| DuplicateSwitchCase.go:16:1:16:14 | Entry | DuplicateSwitchCase.go:16:13:16:14 | block statement |
+| DuplicateSwitchCase.go:16:1:16:14 | Normal Exit | DuplicateSwitchCase.go:16:1:16:14 | Exit |
+| DuplicateSwitchCase.go:16:1:16:14 | function declaration | DuplicateSwitchCase.go:0:0:0:0 | After DuplicateSwitchCase.go |
+| DuplicateSwitchCase.go:16:13:16:14 | block statement | DuplicateSwitchCase.go:16:1:16:14 | Normal Exit |
+| epilogues.go:0:0:0:0 | After epilogues.go | epilogues.go:0:0:0:0 | Normal Exit |
+| epilogues.go:0:0:0:0 | Entry | epilogues.go:0:0:0:0 | epilogues.go |
+| epilogues.go:0:0:0:0 | Normal Exit | epilogues.go:0:0:0:0 | Exit |
+| epilogues.go:0:0:0:0 | epilogues.go | epilogues.go:3:1:3:12 | import declaration |
+| epilogues.go:3:1:3:12 | import declaration | epilogues.go:8:1:10:1 | type declaration |
+| epilogues.go:8:1:10:1 | type declaration | epilogues.go:12:1:14:1 | function declaration |
+| epilogues.go:12:1:14:1 | Entry | epilogues.go:12:7:12:7 | l |
+| epilogues.go:12:1:14:1 | Exceptional Exit | epilogues.go:12:1:14:1 | Exit |
+| epilogues.go:12:1:14:1 | Normal Exit | epilogues.go:12:1:14:1 | Exit |
+| epilogues.go:12:1:14:1 | function declaration | epilogues.go:16:1:18:1 | function declaration |
+| epilogues.go:12:7:12:7 | l | epilogues.go:12:25:12:27 | msg |
+| epilogues.go:12:25:12:27 | msg | epilogues.go:12:37:12:40 | code |
+| epilogues.go:12:37:12:40 | code | epilogues.go:12:47:14:1 | block statement |
+| epilogues.go:12:47:14:1 | After block statement | epilogues.go:12:1:14:1 | Normal Exit |
+| epilogues.go:12:47:14:1 | block statement | epilogues.go:13:2:13:33 | expression statement |
+| epilogues.go:13:2:13:12 | After selection of Println | epilogues.go:13:14:13:21 | Before selection of prefix |
+| epilogues.go:13:2:13:12 | Before selection of Println | epilogues.go:13:2:13:12 | selection of Println |
+| epilogues.go:13:2:13:12 | selection of Println | epilogues.go:13:2:13:12 | After selection of Println |
+| epilogues.go:13:2:13:33 | After call to Println | epilogues.go:13:2:13:33 | After expression statement |
+| epilogues.go:13:2:13:33 | After expression statement | epilogues.go:12:47:14:1 | After block statement |
+| epilogues.go:13:2:13:33 | Before call to Println | epilogues.go:13:2:13:12 | Before selection of Println |
+| epilogues.go:13:2:13:33 | call to Println | epilogues.go:12:1:14:1 | Exceptional Exit |
+| epilogues.go:13:2:13:33 | call to Println | epilogues.go:13:2:13:33 | After call to Println |
+| epilogues.go:13:2:13:33 | expression statement | epilogues.go:13:2:13:33 | Before call to Println |
+| epilogues.go:13:14:13:14 | After l | epilogues.go:13:14:13:14 | implicit-deref l |
+| epilogues.go:13:14:13:14 | implicit-deref l | epilogues.go:13:14:13:21 | selection of prefix |
+| epilogues.go:13:14:13:14 | l | epilogues.go:13:14:13:14 | After l |
+| epilogues.go:13:14:13:21 | After selection of prefix | epilogues.go:13:24:13:26 | msg |
+| epilogues.go:13:14:13:21 | Before selection of prefix | epilogues.go:13:14:13:14 | l |
+| epilogues.go:13:14:13:21 | selection of prefix | epilogues.go:13:14:13:21 | After selection of prefix |
 | epilogues.go:13:24:13:26 | msg | epilogues.go:13:29:13:32 | code |
 | epilogues.go:13:29:13:32 | code | epilogues.go:13:2:13:33 | call to Println |
-| epilogues.go:16:1:18:1 | entry | epilogues.go:16:7:16:7 | argument corresponding to l |
-| epilogues.go:16:1:18:1 | function declaration | epilogues.go:23:6:23:15 | skip |
-| epilogues.go:16:7:16:7 | argument corresponding to l | epilogues.go:16:7:16:7 | initialization of l |
-| epilogues.go:16:7:16:7 | initialization of l | epilogues.go:16:29:16:31 | argument corresponding to msg |
-| epilogues.go:16:20:16:27 | skip | epilogues.go:16:1:18:1 | function declaration |
-| epilogues.go:16:29:16:31 | argument corresponding to msg | epilogues.go:16:29:16:31 | initialization of msg |
-| epilogues.go:16:29:16:31 | initialization of msg | epilogues.go:17:2:17:12 | selection of Println |
-| epilogues.go:17:2:17:12 | selection of Println | epilogues.go:17:14:17:14 | l |
-| epilogues.go:17:2:17:27 | call to Println | epilogues.go:16:1:18:1 | exit |
+| epilogues.go:16:1:18:1 | Entry | epilogues.go:16:7:16:7 | l |
+| epilogues.go:16:1:18:1 | Exceptional Exit | epilogues.go:16:1:18:1 | Exit |
+| epilogues.go:16:1:18:1 | Normal Exit | epilogues.go:16:1:18:1 | Exit |
+| epilogues.go:16:1:18:1 | function declaration | epilogues.go:23:1:27:1 | function declaration |
+| epilogues.go:16:7:16:7 | l | epilogues.go:16:29:16:31 | msg |
+| epilogues.go:16:29:16:31 | msg | epilogues.go:16:41:18:1 | block statement |
+| epilogues.go:16:41:18:1 | After block statement | epilogues.go:16:1:18:1 | Normal Exit |
+| epilogues.go:16:41:18:1 | block statement | epilogues.go:17:2:17:27 | expression statement |
+| epilogues.go:17:2:17:12 | After selection of Println | epilogues.go:17:14:17:21 | Before selection of prefix |
+| epilogues.go:17:2:17:12 | Before selection of Println | epilogues.go:17:2:17:12 | selection of Println |
+| epilogues.go:17:2:17:12 | selection of Println | epilogues.go:17:2:17:12 | After selection of Println |
+| epilogues.go:17:2:17:27 | After call to Println | epilogues.go:17:2:17:27 | After expression statement |
+| epilogues.go:17:2:17:27 | After expression statement | epilogues.go:16:41:18:1 | After block statement |
+| epilogues.go:17:2:17:27 | Before call to Println | epilogues.go:17:2:17:12 | Before selection of Println |
+| epilogues.go:17:2:17:27 | call to Println | epilogues.go:16:1:18:1 | Exceptional Exit |
+| epilogues.go:17:2:17:27 | call to Println | epilogues.go:17:2:17:27 | After call to Println |
+| epilogues.go:17:2:17:27 | expression statement | epilogues.go:17:2:17:27 | Before call to Println |
 | epilogues.go:17:14:17:14 | l | epilogues.go:17:14:17:21 | selection of prefix |
-| epilogues.go:17:14:17:21 | selection of prefix | epilogues.go:17:24:17:26 | msg |
+| epilogues.go:17:14:17:21 | After selection of prefix | epilogues.go:17:24:17:26 | msg |
+| epilogues.go:17:14:17:21 | Before selection of prefix | epilogues.go:17:14:17:14 | l |
+| epilogues.go:17:14:17:21 | selection of prefix | epilogues.go:17:14:17:21 | After selection of prefix |
 | epilogues.go:17:24:17:26 | msg | epilogues.go:17:2:17:27 | call to Println |
-| epilogues.go:23:1:27:1 | entry | epilogues.go:24:5:24:5 | skip |
-| epilogues.go:23:1:27:1 | function declaration | epilogues.go:31:6:31:13 | skip |
-| epilogues.go:23:6:23:15 | skip | epilogues.go:23:1:27:1 | function declaration |
-| epilogues.go:24:5:24:5 | assignment to r | epilogues.go:24:21:24:21 | r |
-| epilogues.go:24:5:24:5 | skip | epilogues.go:24:10:24:16 | recover |
+| epilogues.go:23:1:27:1 | Entry | epilogues.go:23:19:27:1 | block statement |
+| epilogues.go:23:1:27:1 | Exceptional Exit | epilogues.go:23:1:27:1 | Exit |
+| epilogues.go:23:1:27:1 | Normal Exit | epilogues.go:23:1:27:1 | Exit |
+| epilogues.go:23:1:27:1 | function declaration | epilogues.go:31:1:33:1 | function declaration |
+| epilogues.go:23:19:27:1 | After block statement | epilogues.go:23:1:27:1 | Normal Exit |
+| epilogues.go:23:19:27:1 | block statement | epilogues.go:24:2:26:2 | if statement |
+| epilogues.go:24:2:26:2 | After if statement | epilogues.go:23:19:27:1 | After block statement |
+| epilogues.go:24:2:26:2 | if statement | epilogues.go:24:5:24:18 | ... := ... |
+| epilogues.go:24:5:24:18 | ... := ... | epilogues.go:24:10:24:18 | Before call to recover |
+| epilogues.go:24:5:24:18 | After ... := ... | epilogues.go:24:21:24:28 | Before ...!=... |
+| epilogues.go:24:5:24:18 | assign:0 ... := ... | epilogues.go:24:5:24:18 | After ... := ... |
 | epilogues.go:24:10:24:16 | recover | epilogues.go:24:10:24:18 | call to recover |
-| epilogues.go:24:10:24:18 | call to recover | epilogues.go:24:5:24:5 | assignment to r |
+| epilogues.go:24:10:24:18 | After call to recover | epilogues.go:24:5:24:18 | assign:0 ... := ... |
+| epilogues.go:24:10:24:18 | Before call to recover | epilogues.go:24:10:24:16 | recover |
+| epilogues.go:24:10:24:18 | call to recover | epilogues.go:24:10:24:18 | After call to recover |
 | epilogues.go:24:21:24:21 | r | epilogues.go:24:26:24:28 | nil |
-| epilogues.go:24:21:24:28 | ...!=... | epilogues.go:23:1:27:1 | exit |
-| epilogues.go:24:21:24:28 | ...!=... | epilogues.go:24:21:24:28 | ...!=... is false |
-| epilogues.go:24:21:24:28 | ...!=... | epilogues.go:24:21:24:28 | ...!=... is true |
-| epilogues.go:24:21:24:28 | ...!=... is false | epilogues.go:23:1:27:1 | exit |
-| epilogues.go:24:21:24:28 | ...!=... is true | epilogues.go:25:3:25:13 | selection of Println |
+| epilogues.go:24:21:24:28 | ...!=... | epilogues.go:24:21:24:28 | After ...!=... [false] |
+| epilogues.go:24:21:24:28 | ...!=... | epilogues.go:24:21:24:28 | After ...!=... [true] |
+| epilogues.go:24:21:24:28 | After ...!=... [false] | epilogues.go:24:2:26:2 | After if statement |
+| epilogues.go:24:21:24:28 | After ...!=... [true] | epilogues.go:24:30:26:2 | block statement |
+| epilogues.go:24:21:24:28 | Before ...!=... | epilogues.go:24:21:24:21 | r |
 | epilogues.go:24:26:24:28 | nil | epilogues.go:24:21:24:28 | ...!=... |
-| epilogues.go:25:3:25:13 | selection of Println | epilogues.go:25:15:25:26 | "recovered:" |
-| epilogues.go:25:3:25:30 | call to Println | epilogues.go:23:1:27:1 | exit |
+| epilogues.go:24:30:26:2 | After block statement | epilogues.go:24:2:26:2 | After if statement |
+| epilogues.go:24:30:26:2 | block statement | epilogues.go:25:3:25:30 | expression statement |
+| epilogues.go:25:3:25:13 | After selection of Println | epilogues.go:25:15:25:26 | "recovered:" |
+| epilogues.go:25:3:25:13 | Before selection of Println | epilogues.go:25:3:25:13 | selection of Println |
+| epilogues.go:25:3:25:13 | selection of Println | epilogues.go:25:3:25:13 | After selection of Println |
+| epilogues.go:25:3:25:30 | After call to Println | epilogues.go:25:3:25:30 | After expression statement |
+| epilogues.go:25:3:25:30 | After expression statement | epilogues.go:24:30:26:2 | After block statement |
+| epilogues.go:25:3:25:30 | Before call to Println | epilogues.go:25:3:25:13 | Before selection of Println |
+| epilogues.go:25:3:25:30 | call to Println | epilogues.go:23:1:27:1 | Exceptional Exit |
+| epilogues.go:25:3:25:30 | call to Println | epilogues.go:25:3:25:30 | After call to Println |
+| epilogues.go:25:3:25:30 | expression statement | epilogues.go:25:3:25:30 | Before call to Println |
 | epilogues.go:25:15:25:26 | "recovered:" | epilogues.go:25:29:25:29 | r |
 | epilogues.go:25:29:25:29 | r | epilogues.go:25:3:25:30 | call to Println |
-| epilogues.go:31:1:33:1 | entry | epilogues.go:31:15:31:15 | argument corresponding to x |
-| epilogues.go:31:1:33:1 | function declaration | epilogues.go:36:6:36:12 | skip |
-| epilogues.go:31:6:31:13 | skip | epilogues.go:31:1:33:1 | function declaration |
-| epilogues.go:31:15:31:15 | argument corresponding to x | epilogues.go:31:15:31:15 | initialization of x |
-| epilogues.go:31:15:31:15 | initialization of x | epilogues.go:32:9:32:9 | x |
-| epilogues.go:32:2:32:13 | return statement | epilogues.go:31:1:33:1 | exit |
+| epilogues.go:31:1:33:1 | Entry | epilogues.go:31:15:31:15 | x |
+| epilogues.go:31:1:33:1 | Normal Exit | epilogues.go:31:1:33:1 | Exit |
+| epilogues.go:31:1:33:1 | function declaration | epilogues.go:36:1:38:1 | function declaration |
+| epilogues.go:31:15:31:15 | x | epilogues.go:31:26:33:1 | block statement |
+| epilogues.go:31:26:33:1 | block statement | epilogues.go:32:2:32:13 | Before return statement |
+| epilogues.go:32:2:32:13 | Before return statement | epilogues.go:32:9:32:13 | Before ...*... |
+| epilogues.go:32:2:32:13 | return statement | epilogues.go:31:1:33:1 | Normal Exit |
 | epilogues.go:32:9:32:9 | x | epilogues.go:32:13:32:13 | 2 |
-| epilogues.go:32:9:32:13 | ...*... | epilogues.go:32:2:32:13 | return statement |
+| epilogues.go:32:9:32:13 | ...*... | epilogues.go:32:9:32:13 | After ...*... |
+| epilogues.go:32:9:32:13 | After ...*... | epilogues.go:32:2:32:13 | return statement |
+| epilogues.go:32:9:32:13 | Before ...*... | epilogues.go:32:9:32:9 | x |
 | epilogues.go:32:13:32:13 | 2 | epilogues.go:32:9:32:13 | ...*... |
-| epilogues.go:36:1:38:1 | entry | epilogues.go:37:2:37:12 | selection of Println |
-| epilogues.go:36:1:38:1 | function declaration | epilogues.go:42:6:42:18 | skip |
-| epilogues.go:36:6:36:12 | skip | epilogues.go:36:1:38:1 | function declaration |
-| epilogues.go:37:2:37:12 | selection of Println | epilogues.go:37:14:37:19 | "void" |
-| epilogues.go:37:2:37:20 | call to Println | epilogues.go:36:1:38:1 | exit |
+| epilogues.go:36:1:38:1 | Entry | epilogues.go:36:16:38:1 | block statement |
+| epilogues.go:36:1:38:1 | Exceptional Exit | epilogues.go:36:1:38:1 | Exit |
+| epilogues.go:36:1:38:1 | Normal Exit | epilogues.go:36:1:38:1 | Exit |
+| epilogues.go:36:1:38:1 | function declaration | epilogues.go:42:1:48:1 | function declaration |
+| epilogues.go:36:16:38:1 | After block statement | epilogues.go:36:1:38:1 | Normal Exit |
+| epilogues.go:36:16:38:1 | block statement | epilogues.go:37:2:37:20 | expression statement |
+| epilogues.go:37:2:37:12 | After selection of Println | epilogues.go:37:14:37:19 | "void" |
+| epilogues.go:37:2:37:12 | Before selection of Println | epilogues.go:37:2:37:12 | selection of Println |
+| epilogues.go:37:2:37:12 | selection of Println | epilogues.go:37:2:37:12 | After selection of Println |
+| epilogues.go:37:2:37:20 | After call to Println | epilogues.go:37:2:37:20 | After expression statement |
+| epilogues.go:37:2:37:20 | After expression statement | epilogues.go:36:16:38:1 | After block statement |
+| epilogues.go:37:2:37:20 | Before call to Println | epilogues.go:37:2:37:12 | Before selection of Println |
+| epilogues.go:37:2:37:20 | call to Println | epilogues.go:36:1:38:1 | Exceptional Exit |
+| epilogues.go:37:2:37:20 | call to Println | epilogues.go:37:2:37:20 | After call to Println |
+| epilogues.go:37:2:37:20 | expression statement | epilogues.go:37:2:37:20 | Before call to Println |
 | epilogues.go:37:14:37:19 | "void" | epilogues.go:37:2:37:20 | call to Println |
-| epilogues.go:42:1:48:1 | entry | epilogues.go:42:20:42:20 | argument corresponding to x |
-| epilogues.go:42:1:48:1 | function declaration | epilogues.go:51:6:51:21 | skip |
-| epilogues.go:42:6:42:18 | skip | epilogues.go:42:1:48:1 | function declaration |
-| epilogues.go:42:20:42:20 | argument corresponding to x | epilogues.go:42:20:42:20 | initialization of x |
-| epilogues.go:42:20:42:20 | initialization of x | epilogues.go:42:28:42:33 | zero value for result |
-| epilogues.go:42:28:42:33 | implicit read of result | epilogues.go:42:40:42:42 | implicit read of err |
-| epilogues.go:42:28:42:33 | initialization of result | epilogues.go:42:40:42:42 | zero value for err |
-| epilogues.go:42:28:42:33 | zero value for result | epilogues.go:42:28:42:33 | initialization of result |
-| epilogues.go:42:40:42:42 | implicit read of err | epilogues.go:42:1:48:1 | exit |
-| epilogues.go:42:40:42:42 | initialization of err | epilogues.go:43:5:43:5 | x |
-| epilogues.go:42:40:42:42 | zero value for err | epilogues.go:42:40:42:42 | initialization of err |
+| epilogues.go:42:1:48:1 | Entry | epilogues.go:42:20:42:20 | x |
+| epilogues.go:42:1:48:1 | Normal Exit | epilogues.go:42:1:48:1 | Exit |
+| epilogues.go:42:1:48:1 | function declaration | epilogues.go:51:1:54:1 | function declaration |
+| epilogues.go:42:20:42:20 | x | epilogues.go:42:51:48:1 | block statement |
+| epilogues.go:42:51:48:1 | After block statement | epilogues.go:42:1:48:1 | Normal Exit |
+| epilogues.go:42:51:48:1 | block statement | epilogues.go:42:51:48:1 | zero-init:0 block statement |
+| epilogues.go:42:51:48:1 | result-read:0 block statement | epilogues.go:42:51:48:1 | result-read:1 block statement |
+| epilogues.go:42:51:48:1 | result-read:1 block statement | epilogues.go:42:51:48:1 | After block statement |
+| epilogues.go:42:51:48:1 | zero-init:0 block statement | epilogues.go:42:51:48:1 | zero-init:1 block statement |
+| epilogues.go:42:51:48:1 | zero-init:1 block statement | epilogues.go:43:2:46:2 | if statement |
+| epilogues.go:43:2:46:2 | After if statement | epilogues.go:47:2:47:14 | Before return statement |
+| epilogues.go:43:2:46:2 | if statement | epilogues.go:43:5:43:9 | Before ...<... |
 | epilogues.go:43:5:43:5 | x | epilogues.go:43:9:43:9 | 0 |
-| epilogues.go:43:5:43:9 | ...<... | epilogues.go:43:5:43:9 | ...<... is false |
-| epilogues.go:43:5:43:9 | ...<... | epilogues.go:43:5:43:9 | ...<... is true |
-| epilogues.go:43:5:43:9 | ...<... is false | epilogues.go:47:9:47:9 | x |
-| epilogues.go:43:5:43:9 | ...<... is true | epilogues.go:44:3:44:8 | skip |
+| epilogues.go:43:5:43:9 | ...<... | epilogues.go:43:5:43:9 | After ...<... [false] |
+| epilogues.go:43:5:43:9 | ...<... | epilogues.go:43:5:43:9 | After ...<... [true] |
+| epilogues.go:43:5:43:9 | After ...<... [false] | epilogues.go:43:2:46:2 | After if statement |
+| epilogues.go:43:5:43:9 | After ...<... [true] | epilogues.go:43:11:46:2 | block statement |
+| epilogues.go:43:5:43:9 | Before ...<... | epilogues.go:43:5:43:5 | x |
 | epilogues.go:43:9:43:9 | 0 | epilogues.go:43:5:43:9 | ...<... |
-| epilogues.go:44:3:44:8 | assignment to result | epilogues.go:45:3:45:8 | return statement |
-| epilogues.go:44:3:44:8 | skip | epilogues.go:44:13:44:13 | x |
-| epilogues.go:44:12:44:13 | -... | epilogues.go:44:3:44:8 | assignment to result |
+| epilogues.go:43:11:46:2 | block statement | epilogues.go:44:3:44:13 | ... = ... |
+| epilogues.go:44:3:44:13 | ... = ... | epilogues.go:44:12:44:13 | Before -... |
+| epilogues.go:44:3:44:13 | After ... = ... | epilogues.go:45:3:45:8 | Before return statement |
+| epilogues.go:44:3:44:13 | assign:0 ... = ... | epilogues.go:44:3:44:13 | After ... = ... |
+| epilogues.go:44:12:44:13 | -... | epilogues.go:44:12:44:13 | After -... |
+| epilogues.go:44:12:44:13 | After -... | epilogues.go:44:3:44:13 | assign:0 ... = ... |
+| epilogues.go:44:12:44:13 | Before -... | epilogues.go:44:13:44:13 | x |
 | epilogues.go:44:13:44:13 | x | epilogues.go:44:12:44:13 | -... |
-| epilogues.go:45:3:45:8 | return statement | epilogues.go:42:28:42:33 | implicit read of result |
-| epilogues.go:47:2:47:14 | return statement | epilogues.go:42:28:42:33 | implicit read of result |
-| epilogues.go:47:9:47:9 | implicit write of result | epilogues.go:47:12:47:14 | nil |
-| epilogues.go:47:9:47:9 | x | epilogues.go:47:9:47:9 | implicit write of result |
-| epilogues.go:47:12:47:14 | implicit write of err | epilogues.go:47:2:47:14 | return statement |
-| epilogues.go:47:12:47:14 | nil | epilogues.go:47:12:47:14 | implicit write of err |
-| epilogues.go:51:1:54:1 | entry | epilogues.go:51:23:51:23 | argument corresponding to x |
-| epilogues.go:51:1:54:1 | function declaration | epilogues.go:59:6:59:25 | skip |
-| epilogues.go:51:6:51:21 | skip | epilogues.go:51:1:54:1 | function declaration |
-| epilogues.go:51:23:51:23 | argument corresponding to x | epilogues.go:51:23:51:23 | initialization of x |
-| epilogues.go:51:23:51:23 | initialization of x | epilogues.go:51:31:51:31 | zero value for n |
-| epilogues.go:51:31:51:31 | implicit read of n | epilogues.go:51:1:54:1 | exit |
-| epilogues.go:51:31:51:31 | initialization of n | epilogues.go:52:2:52:2 | skip |
-| epilogues.go:51:31:51:31 | zero value for n | epilogues.go:51:31:51:31 | initialization of n |
-| epilogues.go:52:2:52:2 | assignment to n | epilogues.go:53:2:53:7 | return statement |
-| epilogues.go:52:2:52:2 | skip | epilogues.go:52:6:52:6 | x |
+| epilogues.go:45:3:45:8 | Before return statement | epilogues.go:45:3:45:8 | return statement |
+| epilogues.go:45:3:45:8 | return statement | epilogues.go:42:51:48:1 | result-read:0 block statement |
+| epilogues.go:47:2:47:14 | Before return statement | epilogues.go:47:9:47:9 | x |
+| epilogues.go:47:2:47:14 | result-write:0 return statement | epilogues.go:47:2:47:14 | result-write:1 return statement |
+| epilogues.go:47:2:47:14 | result-write:1 return statement | epilogues.go:47:2:47:14 | return statement |
+| epilogues.go:47:2:47:14 | return statement | epilogues.go:42:51:48:1 | result-read:0 block statement |
+| epilogues.go:47:9:47:9 | x | epilogues.go:47:12:47:14 | nil |
+| epilogues.go:47:12:47:14 | nil | epilogues.go:47:2:47:14 | result-write:0 return statement |
+| epilogues.go:51:1:54:1 | Entry | epilogues.go:51:23:51:23 | x |
+| epilogues.go:51:1:54:1 | Normal Exit | epilogues.go:51:1:54:1 | Exit |
+| epilogues.go:51:1:54:1 | function declaration | epilogues.go:59:1:62:1 | function declaration |
+| epilogues.go:51:23:51:23 | x | epilogues.go:51:38:54:1 | block statement |
+| epilogues.go:51:38:54:1 | After block statement | epilogues.go:51:1:54:1 | Normal Exit |
+| epilogues.go:51:38:54:1 | block statement | epilogues.go:51:38:54:1 | zero-init:0 block statement |
+| epilogues.go:51:38:54:1 | result-read:0 block statement | epilogues.go:51:38:54:1 | After block statement |
+| epilogues.go:51:38:54:1 | zero-init:0 block statement | epilogues.go:52:2:52:10 | ... = ... |
+| epilogues.go:52:2:52:10 | ... = ... | epilogues.go:52:6:52:10 | Before ...+... |
+| epilogues.go:52:2:52:10 | After ... = ... | epilogues.go:53:2:53:7 | Before return statement |
+| epilogues.go:52:2:52:10 | assign:0 ... = ... | epilogues.go:52:2:52:10 | After ... = ... |
 | epilogues.go:52:6:52:6 | x | epilogues.go:52:10:52:10 | 1 |
-| epilogues.go:52:6:52:10 | ...+... | epilogues.go:52:2:52:2 | assignment to n |
+| epilogues.go:52:6:52:10 | ...+... | epilogues.go:52:6:52:10 | After ...+... |
+| epilogues.go:52:6:52:10 | After ...+... | epilogues.go:52:2:52:10 | assign:0 ... = ... |
+| epilogues.go:52:6:52:10 | Before ...+... | epilogues.go:52:6:52:6 | x |
 | epilogues.go:52:10:52:10 | 1 | epilogues.go:52:6:52:10 | ...+... |
-| epilogues.go:53:2:53:7 | return statement | epilogues.go:51:31:51:31 | implicit read of n |
-| epilogues.go:59:1:62:1 | entry | epilogues.go:59:27:59:27 | argument corresponding to l |
-| epilogues.go:59:1:62:1 | function declaration | epilogues.go:66:6:66:26 | skip |
-| epilogues.go:59:6:59:25 | skip | epilogues.go:59:1:62:1 | function declaration |
-| epilogues.go:59:27:59:27 | argument corresponding to l | epilogues.go:59:27:59:27 | initialization of l |
-| epilogues.go:59:27:59:27 | initialization of l | epilogues.go:59:41:59:45 | argument corresponding to items |
-| epilogues.go:59:41:59:45 | argument corresponding to items | epilogues.go:59:41:59:45 | initialization of items |
-| epilogues.go:59:41:59:45 | initialization of items | epilogues.go:60:8:60:8 | l |
-| epilogues.go:60:2:60:33 | defer statement | epilogues.go:61:2:61:12 | selection of Println |
+| epilogues.go:53:2:53:7 | Before return statement | epilogues.go:53:2:53:7 | return statement |
+| epilogues.go:53:2:53:7 | return statement | epilogues.go:51:38:54:1 | result-read:0 block statement |
+| epilogues.go:59:1:62:1 | Entry | epilogues.go:59:27:59:27 | l |
+| epilogues.go:59:1:62:1 | Exceptional Exit | epilogues.go:59:1:62:1 | Exit |
+| epilogues.go:59:1:62:1 | Normal Exit | epilogues.go:59:1:62:1 | Exit |
+| epilogues.go:59:1:62:1 | function declaration | epilogues.go:66:1:71:1 | function declaration |
+| epilogues.go:59:27:59:27 | l | epilogues.go:59:41:59:45 | items |
+| epilogues.go:59:41:59:45 | items | epilogues.go:59:54:62:1 | block statement |
+| epilogues.go:59:54:62:1 | After block statement | epilogues.go:59:1:62:1 | Normal Exit |
+| epilogues.go:59:54:62:1 | block statement | epilogues.go:60:2:60:33 | Before defer statement |
+| epilogues.go:60:2:60:33 | After defer statement | epilogues.go:61:2:61:38 | expression statement |
+| epilogues.go:60:2:60:33 | Before defer statement | epilogues.go:60:8:60:33 | call to log |
+| epilogues.go:60:2:60:33 | catch-defer-panic defer statement | epilogues.go:59:1:62:1 | Exceptional Exit |
+| epilogues.go:60:2:60:33 | defer statement | epilogues.go:60:2:60:33 | After defer statement |
 | epilogues.go:60:8:60:8 | l | epilogues.go:60:8:60:12 | selection of log |
-| epilogues.go:60:8:60:12 | selection of log | epilogues.go:60:14:60:20 | "count" |
-| epilogues.go:60:8:60:33 | call to log | epilogues.go:59:1:62:1 | exit |
-| epilogues.go:60:14:60:20 | "count" | epilogues.go:60:23:60:25 | len |
+| epilogues.go:60:8:60:12 | After selection of log | epilogues.go:60:14:60:20 | "count" |
+| epilogues.go:60:8:60:12 | Before selection of log | epilogues.go:60:8:60:8 | l |
+| epilogues.go:60:8:60:12 | selection of log | epilogues.go:60:8:60:12 | After selection of log |
+| epilogues.go:60:8:60:33 | After call to log | epilogues.go:60:2:60:33 | defer statement |
+| epilogues.go:60:8:60:33 | call to log | epilogues.go:60:8:60:12 | Before selection of log |
+| epilogues.go:60:8:60:33 | defer-invoke call to log | epilogues.go:59:54:62:1 | After block statement |
+| epilogues.go:60:8:60:33 | defer-invoke call to log | epilogues.go:60:2:60:33 | catch-defer-panic defer statement |
+| epilogues.go:60:14:60:20 | "count" | epilogues.go:60:23:60:32 | Before call to len |
 | epilogues.go:60:23:60:25 | len | epilogues.go:60:27:60:31 | items |
-| epilogues.go:60:23:60:32 | call to len | epilogues.go:60:2:60:33 | defer statement |
+| epilogues.go:60:23:60:32 | After call to len | epilogues.go:60:8:60:33 | After call to log |
+| epilogues.go:60:23:60:32 | Before call to len | epilogues.go:60:23:60:25 | len |
+| epilogues.go:60:23:60:32 | call to len | epilogues.go:60:23:60:32 | After call to len |
 | epilogues.go:60:27:60:31 | items | epilogues.go:60:23:60:32 | call to len |
-| epilogues.go:61:2:61:12 | selection of Println | epilogues.go:61:14:61:25 | "processing" |
-| epilogues.go:61:2:61:38 | call to Println | epilogues.go:60:8:60:33 | call to log |
-| epilogues.go:61:14:61:25 | "processing" | epilogues.go:61:28:61:30 | len |
+| epilogues.go:61:2:61:12 | After selection of Println | epilogues.go:61:14:61:25 | "processing" |
+| epilogues.go:61:2:61:12 | Before selection of Println | epilogues.go:61:2:61:12 | selection of Println |
+| epilogues.go:61:2:61:12 | selection of Println | epilogues.go:61:2:61:12 | After selection of Println |
+| epilogues.go:61:2:61:38 | After call to Println | epilogues.go:61:2:61:38 | After expression statement |
+| epilogues.go:61:2:61:38 | After expression statement | epilogues.go:60:8:60:33 | defer-invoke call to log |
+| epilogues.go:61:2:61:38 | Before call to Println | epilogues.go:61:2:61:12 | Before selection of Println |
+| epilogues.go:61:2:61:38 | call to Println | epilogues.go:61:2:61:38 | After call to Println |
+| epilogues.go:61:2:61:38 | call to Println | epilogues.go:61:2:61:38 | catch-panic expression statement |
+| epilogues.go:61:2:61:38 | catch-panic expression statement | epilogues.go:60:8:60:33 | defer-invoke call to log |
+| epilogues.go:61:2:61:38 | expression statement | epilogues.go:61:2:61:38 | Before call to Println |
+| epilogues.go:61:14:61:25 | "processing" | epilogues.go:61:28:61:37 | Before call to len |
 | epilogues.go:61:28:61:30 | len | epilogues.go:61:32:61:36 | items |
-| epilogues.go:61:28:61:37 | call to len | epilogues.go:61:2:61:38 | call to Println |
+| epilogues.go:61:28:61:37 | After call to len | epilogues.go:61:2:61:38 | call to Println |
+| epilogues.go:61:28:61:37 | Before call to len | epilogues.go:61:28:61:30 | len |
+| epilogues.go:61:28:61:37 | call to len | epilogues.go:61:28:61:37 | After call to len |
 | epilogues.go:61:32:61:36 | items | epilogues.go:61:28:61:37 | call to len |
-| epilogues.go:66:1:71:1 | entry | epilogues.go:66:28:66:33 | argument corresponding to prefix |
-| epilogues.go:66:1:71:1 | function declaration | epilogues.go:77:6:77:20 | skip |
-| epilogues.go:66:6:66:26 | skip | epilogues.go:66:1:71:1 | function declaration |
-| epilogues.go:66:28:66:33 | argument corresponding to prefix | epilogues.go:66:28:66:33 | initialization of prefix |
-| epilogues.go:66:28:66:33 | initialization of prefix | epilogues.go:67:2:67:2 | skip |
-| epilogues.go:67:2:67:2 | assignment to l | epilogues.go:68:8:68:8 | l |
-| epilogues.go:67:2:67:2 | skip | epilogues.go:67:7:67:31 | struct literal |
-| epilogues.go:67:7:67:31 | struct literal | epilogues.go:67:25:67:30 | prefix |
-| epilogues.go:67:17:67:30 | init of key-value pair | epilogues.go:67:2:67:2 | assignment to l |
-| epilogues.go:67:25:67:30 | prefix | epilogues.go:67:17:67:30 | init of key-value pair |
-| epilogues.go:68:2:68:24 | defer statement | epilogues.go:69:10:69:10 | l |
+| epilogues.go:66:1:71:1 | Entry | epilogues.go:66:28:66:33 | prefix |
+| epilogues.go:66:1:71:1 | Exceptional Exit | epilogues.go:66:1:71:1 | Exit |
+| epilogues.go:66:1:71:1 | Normal Exit | epilogues.go:66:1:71:1 | Exit |
+| epilogues.go:66:1:71:1 | function declaration | epilogues.go:77:1:82:1 | function declaration |
+| epilogues.go:66:28:66:33 | prefix | epilogues.go:66:43:71:1 | block statement |
+| epilogues.go:66:43:71:1 | After block statement | epilogues.go:66:1:71:1 | Normal Exit |
+| epilogues.go:66:43:71:1 | block statement | epilogues.go:67:2:67:31 | ... := ... |
+| epilogues.go:67:2:67:31 | ... := ... | epilogues.go:67:7:67:31 | Before struct literal |
+| epilogues.go:67:2:67:31 | After ... := ... | epilogues.go:68:2:68:24 | Before defer statement |
+| epilogues.go:67:2:67:31 | assign:0 ... := ... | epilogues.go:67:2:67:31 | After ... := ... |
+| epilogues.go:67:7:67:31 | After struct literal | epilogues.go:67:2:67:31 | assign:0 ... := ... |
+| epilogues.go:67:7:67:31 | Before struct literal | epilogues.go:67:7:67:31 | struct literal |
+| epilogues.go:67:7:67:31 | struct literal | epilogues.go:67:17:67:30 | Before key-value pair |
+| epilogues.go:67:17:67:30 | After key-value pair | epilogues.go:67:17:67:30 | lit-init key-value pair |
+| epilogues.go:67:17:67:30 | Before key-value pair | epilogues.go:67:25:67:30 | prefix |
+| epilogues.go:67:17:67:30 | key-value pair | epilogues.go:67:17:67:30 | After key-value pair |
+| epilogues.go:67:17:67:30 | lit-init key-value pair | epilogues.go:67:7:67:31 | After struct literal |
+| epilogues.go:67:25:67:30 | prefix | epilogues.go:67:17:67:30 | key-value pair |
+| epilogues.go:68:2:68:24 | After defer statement | epilogues.go:69:2:69:25 | Before defer statement |
+| epilogues.go:68:2:68:24 | Before defer statement | epilogues.go:68:8:68:24 | call to logValue |
+| epilogues.go:68:2:68:24 | catch-defer-panic defer statement | epilogues.go:66:1:71:1 | Exceptional Exit |
+| epilogues.go:68:2:68:24 | defer statement | epilogues.go:68:2:68:24 | After defer statement |
 | epilogues.go:68:8:68:8 | l | epilogues.go:68:8:68:17 | selection of logValue |
-| epilogues.go:68:8:68:17 | selection of logValue | epilogues.go:68:19:68:23 | "bye" |
-| epilogues.go:68:8:68:24 | call to logValue | epilogues.go:66:1:71:1 | exit |
-| epilogues.go:68:19:68:23 | "bye" | epilogues.go:68:2:68:24 | defer statement |
-| epilogues.go:69:2:69:25 | defer statement | epilogues.go:70:2:70:12 | selection of Println |
-| epilogues.go:69:8:69:15 | selection of log | epilogues.go:69:17:69:21 | "ptr" |
-| epilogues.go:69:8:69:25 | call to log | epilogues.go:68:8:68:24 | call to logValue |
-| epilogues.go:69:9:69:10 | &... | epilogues.go:69:8:69:15 | selection of log |
+| epilogues.go:68:8:68:17 | After selection of logValue | epilogues.go:68:19:68:23 | "bye" |
+| epilogues.go:68:8:68:17 | Before selection of logValue | epilogues.go:68:8:68:8 | l |
+| epilogues.go:68:8:68:17 | selection of logValue | epilogues.go:68:8:68:17 | After selection of logValue |
+| epilogues.go:68:8:68:24 | After call to logValue | epilogues.go:68:2:68:24 | defer statement |
+| epilogues.go:68:8:68:24 | call to logValue | epilogues.go:68:8:68:17 | Before selection of logValue |
+| epilogues.go:68:8:68:24 | defer-invoke call to logValue | epilogues.go:66:43:71:1 | After block statement |
+| epilogues.go:68:8:68:24 | defer-invoke call to logValue | epilogues.go:68:2:68:24 | catch-defer-panic defer statement |
+| epilogues.go:68:19:68:23 | "bye" | epilogues.go:68:8:68:24 | After call to logValue |
+| epilogues.go:69:2:69:25 | After defer statement | epilogues.go:70:2:70:20 | expression statement |
+| epilogues.go:69:2:69:25 | Before defer statement | epilogues.go:69:8:69:25 | call to log |
+| epilogues.go:69:2:69:25 | catch-defer-panic defer statement | epilogues.go:68:8:68:24 | defer-invoke call to logValue |
+| epilogues.go:69:2:69:25 | defer statement | epilogues.go:69:2:69:25 | After defer statement |
+| epilogues.go:69:8:69:15 | After selection of log | epilogues.go:69:17:69:21 | "ptr" |
+| epilogues.go:69:8:69:15 | Before selection of log | epilogues.go:69:9:69:10 | Before &... |
+| epilogues.go:69:8:69:15 | selection of log | epilogues.go:69:8:69:15 | After selection of log |
+| epilogues.go:69:8:69:25 | After call to log | epilogues.go:69:2:69:25 | defer statement |
+| epilogues.go:69:8:69:25 | call to log | epilogues.go:69:8:69:15 | Before selection of log |
+| epilogues.go:69:8:69:25 | defer-invoke call to log | epilogues.go:68:8:68:24 | defer-invoke call to logValue |
+| epilogues.go:69:8:69:25 | defer-invoke call to log | epilogues.go:69:2:69:25 | catch-defer-panic defer statement |
+| epilogues.go:69:9:69:10 | &... | epilogues.go:69:9:69:10 | After &... |
+| epilogues.go:69:9:69:10 | After &... | epilogues.go:69:8:69:15 | selection of log |
+| epilogues.go:69:9:69:10 | Before &... | epilogues.go:69:10:69:10 | l |
 | epilogues.go:69:10:69:10 | l | epilogues.go:69:9:69:10 | &... |
 | epilogues.go:69:17:69:21 | "ptr" | epilogues.go:69:24:69:24 | 7 |
-| epilogues.go:69:24:69:24 | 7 | epilogues.go:69:2:69:25 | defer statement |
-| epilogues.go:70:2:70:12 | selection of Println | epilogues.go:70:14:70:19 | "body" |
-| epilogues.go:70:2:70:20 | call to Println | epilogues.go:69:8:69:25 | call to log |
+| epilogues.go:69:24:69:24 | 7 | epilogues.go:69:8:69:25 | After call to log |
+| epilogues.go:70:2:70:12 | After selection of Println | epilogues.go:70:14:70:19 | "body" |
+| epilogues.go:70:2:70:12 | Before selection of Println | epilogues.go:70:2:70:12 | selection of Println |
+| epilogues.go:70:2:70:12 | selection of Println | epilogues.go:70:2:70:12 | After selection of Println |
+| epilogues.go:70:2:70:20 | After call to Println | epilogues.go:70:2:70:20 | After expression statement |
+| epilogues.go:70:2:70:20 | After expression statement | epilogues.go:69:8:69:25 | defer-invoke call to log |
+| epilogues.go:70:2:70:20 | Before call to Println | epilogues.go:70:2:70:12 | Before selection of Println |
+| epilogues.go:70:2:70:20 | call to Println | epilogues.go:70:2:70:20 | After call to Println |
+| epilogues.go:70:2:70:20 | call to Println | epilogues.go:70:2:70:20 | catch-panic expression statement |
+| epilogues.go:70:2:70:20 | catch-panic expression statement | epilogues.go:69:8:69:25 | defer-invoke call to log |
+| epilogues.go:70:2:70:20 | expression statement | epilogues.go:70:2:70:20 | Before call to Println |
 | epilogues.go:70:14:70:19 | "body" | epilogues.go:70:2:70:20 | call to Println |
-| epilogues.go:77:1:82:1 | entry | epilogues.go:77:22:77:22 | argument corresponding to x |
-| epilogues.go:77:1:82:1 | function declaration | epilogues.go:87:6:87:20 | skip |
-| epilogues.go:77:6:77:20 | skip | epilogues.go:77:1:82:1 | function declaration |
-| epilogues.go:77:22:77:22 | argument corresponding to x | epilogues.go:77:22:77:22 | initialization of x |
-| epilogues.go:77:22:77:22 | initialization of x | epilogues.go:78:8:80:2 | function literal |
-| epilogues.go:78:2:80:15 | defer statement | epilogues.go:81:2:81:12 | selection of Println |
-| epilogues.go:78:8:80:2 | entry | epilogues.go:78:13:78:17 | argument corresponding to label |
+| epilogues.go:77:1:82:1 | Entry | epilogues.go:77:22:77:22 | x |
+| epilogues.go:77:1:82:1 | Exceptional Exit | epilogues.go:77:1:82:1 | Exit |
+| epilogues.go:77:1:82:1 | Normal Exit | epilogues.go:77:1:82:1 | Exit |
+| epilogues.go:77:1:82:1 | function declaration | epilogues.go:87:1:98:1 | function declaration |
+| epilogues.go:77:22:77:22 | x | epilogues.go:77:29:82:1 | block statement |
+| epilogues.go:77:29:82:1 | After block statement | epilogues.go:77:1:82:1 | Normal Exit |
+| epilogues.go:77:29:82:1 | block statement | epilogues.go:78:2:80:15 | Before defer statement |
+| epilogues.go:78:2:80:15 | After defer statement | epilogues.go:81:2:81:23 | expression statement |
+| epilogues.go:78:2:80:15 | Before defer statement | epilogues.go:78:8:80:15 | function call |
+| epilogues.go:78:2:80:15 | catch-defer-panic defer statement | epilogues.go:77:1:82:1 | Exceptional Exit |
+| epilogues.go:78:2:80:15 | defer statement | epilogues.go:78:2:80:15 | After defer statement |
+| epilogues.go:78:8:80:2 | Entry | epilogues.go:78:13:78:17 | label |
+| epilogues.go:78:8:80:2 | Exceptional Exit | epilogues.go:78:8:80:2 | Exit |
+| epilogues.go:78:8:80:2 | Normal Exit | epilogues.go:78:8:80:2 | Exit |
 | epilogues.go:78:8:80:2 | function literal | epilogues.go:80:4:80:9 | "done" |
-| epilogues.go:78:8:80:15 | function call | epilogues.go:77:1:82:1 | exit |
-| epilogues.go:78:13:78:17 | argument corresponding to label | epilogues.go:78:13:78:17 | initialization of label |
-| epilogues.go:78:13:78:17 | initialization of label | epilogues.go:78:27:78:27 | argument corresponding to n |
-| epilogues.go:78:27:78:27 | argument corresponding to n | epilogues.go:78:27:78:27 | initialization of n |
-| epilogues.go:78:27:78:27 | initialization of n | epilogues.go:79:3:79:13 | selection of Println |
-| epilogues.go:79:3:79:13 | selection of Println | epilogues.go:79:15:79:19 | label |
-| epilogues.go:79:3:79:23 | call to Println | epilogues.go:78:8:80:2 | exit |
+| epilogues.go:78:8:80:15 | After function call | epilogues.go:78:2:80:15 | defer statement |
+| epilogues.go:78:8:80:15 | defer-invoke function call | epilogues.go:77:29:82:1 | After block statement |
+| epilogues.go:78:8:80:15 | defer-invoke function call | epilogues.go:78:2:80:15 | catch-defer-panic defer statement |
+| epilogues.go:78:8:80:15 | function call | epilogues.go:78:8:80:2 | function literal |
+| epilogues.go:78:13:78:17 | label | epilogues.go:78:27:78:27 | n |
+| epilogues.go:78:27:78:27 | n | epilogues.go:78:34:80:2 | block statement |
+| epilogues.go:78:34:80:2 | After block statement | epilogues.go:78:8:80:2 | Normal Exit |
+| epilogues.go:78:34:80:2 | block statement | epilogues.go:79:3:79:23 | expression statement |
+| epilogues.go:79:3:79:13 | After selection of Println | epilogues.go:79:15:79:19 | label |
+| epilogues.go:79:3:79:13 | Before selection of Println | epilogues.go:79:3:79:13 | selection of Println |
+| epilogues.go:79:3:79:13 | selection of Println | epilogues.go:79:3:79:13 | After selection of Println |
+| epilogues.go:79:3:79:23 | After call to Println | epilogues.go:79:3:79:23 | After expression statement |
+| epilogues.go:79:3:79:23 | After expression statement | epilogues.go:78:34:80:2 | After block statement |
+| epilogues.go:79:3:79:23 | Before call to Println | epilogues.go:79:3:79:13 | Before selection of Println |
+| epilogues.go:79:3:79:23 | call to Println | epilogues.go:78:8:80:2 | Exceptional Exit |
+| epilogues.go:79:3:79:23 | call to Println | epilogues.go:79:3:79:23 | After call to Println |
+| epilogues.go:79:3:79:23 | expression statement | epilogues.go:79:3:79:23 | Before call to Println |
 | epilogues.go:79:15:79:19 | label | epilogues.go:79:22:79:22 | n |
 | epilogues.go:79:22:79:22 | n | epilogues.go:79:3:79:23 | call to Println |
-| epilogues.go:80:4:80:9 | "done" | epilogues.go:80:12:80:12 | x |
+| epilogues.go:80:4:80:9 | "done" | epilogues.go:80:12:80:14 | Before ...+... |
 | epilogues.go:80:12:80:12 | x | epilogues.go:80:14:80:14 | 1 |
-| epilogues.go:80:12:80:14 | ...+... | epilogues.go:78:2:80:15 | defer statement |
+| epilogues.go:80:12:80:14 | ...+... | epilogues.go:80:12:80:14 | After ...+... |
+| epilogues.go:80:12:80:14 | After ...+... | epilogues.go:78:8:80:15 | After function call |
+| epilogues.go:80:12:80:14 | Before ...+... | epilogues.go:80:12:80:12 | x |
 | epilogues.go:80:14:80:14 | 1 | epilogues.go:80:12:80:14 | ...+... |
-| epilogues.go:81:2:81:12 | selection of Println | epilogues.go:81:14:81:19 | "body" |
-| epilogues.go:81:2:81:23 | call to Println | epilogues.go:78:8:80:15 | function call |
+| epilogues.go:81:2:81:12 | After selection of Println | epilogues.go:81:14:81:19 | "body" |
+| epilogues.go:81:2:81:12 | Before selection of Println | epilogues.go:81:2:81:12 | selection of Println |
+| epilogues.go:81:2:81:12 | selection of Println | epilogues.go:81:2:81:12 | After selection of Println |
+| epilogues.go:81:2:81:23 | After call to Println | epilogues.go:81:2:81:23 | After expression statement |
+| epilogues.go:81:2:81:23 | After expression statement | epilogues.go:78:8:80:15 | defer-invoke function call |
+| epilogues.go:81:2:81:23 | Before call to Println | epilogues.go:81:2:81:12 | Before selection of Println |
+| epilogues.go:81:2:81:23 | call to Println | epilogues.go:81:2:81:23 | After call to Println |
+| epilogues.go:81:2:81:23 | call to Println | epilogues.go:81:2:81:23 | catch-panic expression statement |
+| epilogues.go:81:2:81:23 | catch-panic expression statement | epilogues.go:78:8:80:15 | defer-invoke function call |
+| epilogues.go:81:2:81:23 | expression statement | epilogues.go:81:2:81:23 | Before call to Println |
 | epilogues.go:81:14:81:19 | "body" | epilogues.go:81:22:81:22 | x |
 | epilogues.go:81:22:81:22 | x | epilogues.go:81:2:81:23 | call to Println |
-| epilogues.go:87:1:98:1 | entry | epilogues.go:87:22:87:22 | argument corresponding to x |
-| epilogues.go:87:1:98:1 | function declaration | epilogues.go:102:6:102:24 | skip |
-| epilogues.go:87:6:87:20 | skip | epilogues.go:87:1:98:1 | function declaration |
-| epilogues.go:87:22:87:22 | argument corresponding to x | epilogues.go:87:22:87:22 | initialization of x |
-| epilogues.go:87:22:87:22 | initialization of x | epilogues.go:87:30:87:35 | zero value for result |
-| epilogues.go:87:30:87:35 | implicit read of result | epilogues.go:87:1:98:1 | exit |
-| epilogues.go:87:30:87:35 | initialization of result | epilogues.go:88:8:92:2 | function literal |
-| epilogues.go:87:30:87:35 | zero value for result | epilogues.go:87:30:87:35 | initialization of result |
-| epilogues.go:88:2:92:4 | defer statement | epilogues.go:93:5:93:5 | x |
-| epilogues.go:88:8:92:2 | entry | epilogues.go:89:6:89:6 | skip |
-| epilogues.go:88:8:92:2 | function literal | epilogues.go:88:2:92:4 | defer statement |
-| epilogues.go:88:8:92:4 | function call | epilogues.go:87:1:98:1 | exit |
-| epilogues.go:88:8:92:4 | function call | epilogues.go:87:30:87:35 | implicit read of result |
-| epilogues.go:89:6:89:6 | assignment to r | epilogues.go:89:22:89:22 | r |
-| epilogues.go:89:6:89:6 | skip | epilogues.go:89:11:89:17 | recover |
+| epilogues.go:87:1:98:1 | Entry | epilogues.go:87:22:87:22 | x |
+| epilogues.go:87:1:98:1 | Exceptional Exit | epilogues.go:87:1:98:1 | Exit |
+| epilogues.go:87:1:98:1 | Normal Exit | epilogues.go:87:1:98:1 | Exit |
+| epilogues.go:87:1:98:1 | function declaration | epilogues.go:102:1:110:1 | function declaration |
+| epilogues.go:87:22:87:22 | x | epilogues.go:87:42:98:1 | block statement |
+| epilogues.go:87:42:98:1 | After block statement | epilogues.go:87:1:98:1 | Normal Exit |
+| epilogues.go:87:42:98:1 | block statement | epilogues.go:87:42:98:1 | zero-init:0 block statement |
+| epilogues.go:87:42:98:1 | result-read:0 block statement | epilogues.go:87:42:98:1 | After block statement |
+| epilogues.go:87:42:98:1 | zero-init:0 block statement | epilogues.go:88:2:92:4 | Before defer statement |
+| epilogues.go:88:2:92:4 | After defer statement | epilogues.go:93:2:95:2 | if statement |
+| epilogues.go:88:2:92:4 | Before defer statement | epilogues.go:88:8:92:4 | function call |
+| epilogues.go:88:2:92:4 | catch-defer-panic defer statement | epilogues.go:87:1:98:1 | Exceptional Exit |
+| epilogues.go:88:2:92:4 | defer statement | epilogues.go:88:2:92:4 | After defer statement |
+| epilogues.go:88:8:92:2 | Entry | epilogues.go:88:15:92:2 | block statement |
+| epilogues.go:88:8:92:2 | Normal Exit | epilogues.go:88:8:92:2 | Exit |
+| epilogues.go:88:8:92:2 | function literal | epilogues.go:88:8:92:4 | After function call |
+| epilogues.go:88:8:92:4 | After function call | epilogues.go:88:2:92:4 | defer statement |
+| epilogues.go:88:8:92:4 | defer-invoke function call | epilogues.go:87:42:98:1 | result-read:0 block statement |
+| epilogues.go:88:8:92:4 | defer-invoke function call | epilogues.go:88:2:92:4 | catch-defer-panic defer statement |
+| epilogues.go:88:8:92:4 | function call | epilogues.go:88:8:92:2 | function literal |
+| epilogues.go:88:15:92:2 | After block statement | epilogues.go:88:8:92:2 | Normal Exit |
+| epilogues.go:88:15:92:2 | block statement | epilogues.go:89:3:91:3 | if statement |
+| epilogues.go:89:3:91:3 | After if statement | epilogues.go:88:15:92:2 | After block statement |
+| epilogues.go:89:3:91:3 | if statement | epilogues.go:89:6:89:19 | ... := ... |
+| epilogues.go:89:6:89:19 | ... := ... | epilogues.go:89:11:89:19 | Before call to recover |
+| epilogues.go:89:6:89:19 | After ... := ... | epilogues.go:89:22:89:29 | Before ...!=... |
+| epilogues.go:89:6:89:19 | assign:0 ... := ... | epilogues.go:89:6:89:19 | After ... := ... |
 | epilogues.go:89:11:89:17 | recover | epilogues.go:89:11:89:19 | call to recover |
-| epilogues.go:89:11:89:19 | call to recover | epilogues.go:89:6:89:6 | assignment to r |
+| epilogues.go:89:11:89:19 | After call to recover | epilogues.go:89:6:89:19 | assign:0 ... := ... |
+| epilogues.go:89:11:89:19 | Before call to recover | epilogues.go:89:11:89:17 | recover |
+| epilogues.go:89:11:89:19 | call to recover | epilogues.go:89:11:89:19 | After call to recover |
 | epilogues.go:89:22:89:22 | r | epilogues.go:89:27:89:29 | nil |
-| epilogues.go:89:22:89:29 | ...!=... | epilogues.go:88:8:92:2 | exit |
-| epilogues.go:89:22:89:29 | ...!=... | epilogues.go:89:22:89:29 | ...!=... is false |
-| epilogues.go:89:22:89:29 | ...!=... | epilogues.go:89:22:89:29 | ...!=... is true |
-| epilogues.go:89:22:89:29 | ...!=... is false | epilogues.go:88:8:92:2 | exit |
-| epilogues.go:89:22:89:29 | ...!=... is true | epilogues.go:90:4:90:9 | skip |
+| epilogues.go:89:22:89:29 | ...!=... | epilogues.go:89:22:89:29 | After ...!=... [false] |
+| epilogues.go:89:22:89:29 | ...!=... | epilogues.go:89:22:89:29 | After ...!=... [true] |
+| epilogues.go:89:22:89:29 | After ...!=... [false] | epilogues.go:89:3:91:3 | After if statement |
+| epilogues.go:89:22:89:29 | After ...!=... [true] | epilogues.go:89:31:91:3 | block statement |
+| epilogues.go:89:22:89:29 | Before ...!=... | epilogues.go:89:22:89:22 | r |
 | epilogues.go:89:27:89:29 | nil | epilogues.go:89:22:89:29 | ...!=... |
-| epilogues.go:90:4:90:9 | assignment to result | epilogues.go:88:8:92:2 | exit |
-| epilogues.go:90:4:90:9 | skip | epilogues.go:90:13:90:14 | -... |
-| epilogues.go:90:13:90:14 | -... | epilogues.go:90:4:90:9 | assignment to result |
+| epilogues.go:89:31:91:3 | After block statement | epilogues.go:89:3:91:3 | After if statement |
+| epilogues.go:89:31:91:3 | block statement | epilogues.go:90:4:90:14 | ... = ... |
+| epilogues.go:90:4:90:14 | ... = ... | epilogues.go:90:13:90:14 | Before -... |
+| epilogues.go:90:4:90:14 | After ... = ... | epilogues.go:89:31:91:3 | After block statement |
+| epilogues.go:90:4:90:14 | assign:0 ... = ... | epilogues.go:90:4:90:14 | After ... = ... |
+| epilogues.go:90:13:90:14 | -... | epilogues.go:90:13:90:14 | After -... |
+| epilogues.go:90:13:90:14 | After -... | epilogues.go:90:4:90:14 | assign:0 ... = ... |
+| epilogues.go:90:13:90:14 | Before -... | epilogues.go:90:13:90:14 | -... |
+| epilogues.go:93:2:95:2 | After if statement | epilogues.go:96:2:96:15 | ... = ... |
+| epilogues.go:93:2:95:2 | catch-panic if statement | epilogues.go:88:8:92:4 | defer-invoke function call |
+| epilogues.go:93:2:95:2 | if statement | epilogues.go:93:5:93:9 | Before ...<... |
 | epilogues.go:93:5:93:5 | x | epilogues.go:93:9:93:9 | 0 |
-| epilogues.go:93:5:93:9 | ...<... | epilogues.go:93:5:93:9 | ...<... is false |
-| epilogues.go:93:5:93:9 | ...<... | epilogues.go:93:5:93:9 | ...<... is true |
-| epilogues.go:93:5:93:9 | ...<... is false | epilogues.go:96:2:96:7 | skip |
-| epilogues.go:93:5:93:9 | ...<... is true | epilogues.go:94:3:94:7 | panic |
+| epilogues.go:93:5:93:9 | ...<... | epilogues.go:93:5:93:9 | After ...<... [false] |
+| epilogues.go:93:5:93:9 | ...<... | epilogues.go:93:5:93:9 | After ...<... [true] |
+| epilogues.go:93:5:93:9 | After ...<... [false] | epilogues.go:93:2:95:2 | After if statement |
+| epilogues.go:93:5:93:9 | After ...<... [true] | epilogues.go:93:11:95:2 | block statement |
+| epilogues.go:93:5:93:9 | Before ...<... | epilogues.go:93:5:93:5 | x |
 | epilogues.go:93:9:93:9 | 0 | epilogues.go:93:5:93:9 | ...<... |
+| epilogues.go:93:11:95:2 | block statement | epilogues.go:94:3:94:14 | expression statement |
 | epilogues.go:94:3:94:7 | panic | epilogues.go:94:9:94:13 | "neg" |
-| epilogues.go:94:3:94:14 | call to panic | epilogues.go:88:8:92:4 | function call |
+| epilogues.go:94:3:94:14 | Before call to panic | epilogues.go:94:3:94:7 | panic |
+| epilogues.go:94:3:94:14 | call to panic | epilogues.go:93:2:95:2 | catch-panic if statement |
+| epilogues.go:94:3:94:14 | expression statement | epilogues.go:94:3:94:14 | Before call to panic |
 | epilogues.go:94:9:94:13 | "neg" | epilogues.go:94:3:94:14 | call to panic |
-| epilogues.go:96:2:96:7 | assignment to result | epilogues.go:97:9:97:14 | result |
-| epilogues.go:96:2:96:7 | skip | epilogues.go:96:11:96:11 | x |
+| epilogues.go:96:2:96:15 | ... = ... | epilogues.go:96:11:96:15 | Before ...*... |
+| epilogues.go:96:2:96:15 | After ... = ... | epilogues.go:97:2:97:14 | Before return statement |
+| epilogues.go:96:2:96:15 | assign:0 ... = ... | epilogues.go:96:2:96:15 | After ... = ... |
 | epilogues.go:96:11:96:11 | x | epilogues.go:96:15:96:15 | x |
-| epilogues.go:96:11:96:15 | ...*... | epilogues.go:96:2:96:7 | assignment to result |
+| epilogues.go:96:11:96:15 | ...*... | epilogues.go:96:11:96:15 | After ...*... |
+| epilogues.go:96:11:96:15 | After ...*... | epilogues.go:96:2:96:15 | assign:0 ... = ... |
+| epilogues.go:96:11:96:15 | Before ...*... | epilogues.go:96:11:96:11 | x |
 | epilogues.go:96:15:96:15 | x | epilogues.go:96:11:96:15 | ...*... |
-| epilogues.go:97:2:97:14 | return statement | epilogues.go:88:8:92:4 | function call |
-| epilogues.go:97:9:97:14 | implicit write of result | epilogues.go:97:2:97:14 | return statement |
-| epilogues.go:97:9:97:14 | result | epilogues.go:97:9:97:14 | implicit write of result |
-| epilogues.go:102:1:110:1 | entry | epilogues.go:102:26:102:26 | argument corresponding to x |
-| epilogues.go:102:1:110:1 | function declaration | epilogues.go:115:6:115:22 | skip |
-| epilogues.go:102:6:102:24 | skip | epilogues.go:102:1:110:1 | function declaration |
-| epilogues.go:102:26:102:26 | argument corresponding to x | epilogues.go:102:26:102:26 | initialization of x |
-| epilogues.go:102:26:102:26 | initialization of x | epilogues.go:102:34:102:35 | zero value for ok |
-| epilogues.go:102:34:102:35 | implicit read of ok | epilogues.go:102:43:102:43 | implicit read of n |
-| epilogues.go:102:34:102:35 | initialization of ok | epilogues.go:102:43:102:43 | zero value for n |
-| epilogues.go:102:34:102:35 | zero value for ok | epilogues.go:102:34:102:35 | initialization of ok |
-| epilogues.go:102:43:102:43 | implicit read of n | epilogues.go:102:1:110:1 | exit |
-| epilogues.go:102:43:102:43 | initialization of n | epilogues.go:103:8:103:17 | epiRecover |
-| epilogues.go:102:43:102:43 | zero value for n | epilogues.go:102:43:102:43 | initialization of n |
-| epilogues.go:103:2:103:19 | defer statement | epilogues.go:104:5:104:5 | x |
-| epilogues.go:103:8:103:17 | epiRecover | epilogues.go:103:2:103:19 | defer statement |
-| epilogues.go:103:8:103:19 | call to epiRecover | epilogues.go:102:1:110:1 | exit |
-| epilogues.go:103:8:103:19 | call to epiRecover | epilogues.go:102:34:102:35 | implicit read of ok |
+| epilogues.go:97:2:97:14 | Before return statement | epilogues.go:97:9:97:14 | result |
+| epilogues.go:97:2:97:14 | catch-return return statement | epilogues.go:88:8:92:4 | defer-invoke function call |
+| epilogues.go:97:2:97:14 | result-write:0 return statement | epilogues.go:97:2:97:14 | return statement |
+| epilogues.go:97:2:97:14 | return statement | epilogues.go:97:2:97:14 | catch-return return statement |
+| epilogues.go:97:9:97:14 | result | epilogues.go:97:2:97:14 | result-write:0 return statement |
+| epilogues.go:102:1:110:1 | Entry | epilogues.go:102:26:102:26 | x |
+| epilogues.go:102:1:110:1 | Exceptional Exit | epilogues.go:102:1:110:1 | Exit |
+| epilogues.go:102:1:110:1 | Normal Exit | epilogues.go:102:1:110:1 | Exit |
+| epilogues.go:102:1:110:1 | function declaration | epilogues.go:115:1:118:1 | function declaration |
+| epilogues.go:102:26:102:26 | x | epilogues.go:102:50:110:1 | block statement |
+| epilogues.go:102:50:110:1 | After block statement | epilogues.go:102:1:110:1 | Normal Exit |
+| epilogues.go:102:50:110:1 | block statement | epilogues.go:102:50:110:1 | zero-init:0 block statement |
+| epilogues.go:102:50:110:1 | result-read:0 block statement | epilogues.go:102:50:110:1 | result-read:1 block statement |
+| epilogues.go:102:50:110:1 | result-read:1 block statement | epilogues.go:102:50:110:1 | After block statement |
+| epilogues.go:102:50:110:1 | zero-init:0 block statement | epilogues.go:102:50:110:1 | zero-init:1 block statement |
+| epilogues.go:102:50:110:1 | zero-init:1 block statement | epilogues.go:103:2:103:19 | Before defer statement |
+| epilogues.go:103:2:103:19 | After defer statement | epilogues.go:104:2:106:2 | if statement |
+| epilogues.go:103:2:103:19 | Before defer statement | epilogues.go:103:8:103:19 | call to epiRecover |
+| epilogues.go:103:2:103:19 | catch-defer-panic defer statement | epilogues.go:102:1:110:1 | Exceptional Exit |
+| epilogues.go:103:2:103:19 | defer statement | epilogues.go:103:2:103:19 | After defer statement |
+| epilogues.go:103:8:103:17 | epiRecover | epilogues.go:103:8:103:19 | After call to epiRecover |
+| epilogues.go:103:8:103:19 | After call to epiRecover | epilogues.go:103:2:103:19 | defer statement |
+| epilogues.go:103:8:103:19 | call to epiRecover | epilogues.go:103:8:103:17 | epiRecover |
+| epilogues.go:103:8:103:19 | defer-invoke call to epiRecover | epilogues.go:102:50:110:1 | result-read:0 block statement |
+| epilogues.go:103:8:103:19 | defer-invoke call to epiRecover | epilogues.go:103:2:103:19 | catch-defer-panic defer statement |
+| epilogues.go:104:2:106:2 | After if statement | epilogues.go:107:2:107:6 | ... = ... |
+| epilogues.go:104:2:106:2 | catch-return if statement | epilogues.go:103:8:103:19 | defer-invoke call to epiRecover |
+| epilogues.go:104:2:106:2 | if statement | epilogues.go:104:5:104:10 | Before ...==... |
 | epilogues.go:104:5:104:5 | x | epilogues.go:104:10:104:10 | 0 |
-| epilogues.go:104:5:104:10 | ...==... | epilogues.go:104:5:104:10 | ...==... is false |
-| epilogues.go:104:5:104:10 | ...==... | epilogues.go:104:5:104:10 | ...==... is true |
-| epilogues.go:104:5:104:10 | ...==... is false | epilogues.go:107:2:107:2 | skip |
-| epilogues.go:104:5:104:10 | ...==... is true | epilogues.go:105:3:105:8 | return statement |
+| epilogues.go:104:5:104:10 | ...==... | epilogues.go:104:5:104:10 | After ...==... [false] |
+| epilogues.go:104:5:104:10 | ...==... | epilogues.go:104:5:104:10 | After ...==... [true] |
+| epilogues.go:104:5:104:10 | After ...==... [false] | epilogues.go:104:2:106:2 | After if statement |
+| epilogues.go:104:5:104:10 | After ...==... [true] | epilogues.go:104:12:106:2 | block statement |
+| epilogues.go:104:5:104:10 | Before ...==... | epilogues.go:104:5:104:5 | x |
 | epilogues.go:104:10:104:10 | 0 | epilogues.go:104:5:104:10 | ...==... |
-| epilogues.go:105:3:105:8 | return statement | epilogues.go:103:8:103:19 | call to epiRecover |
-| epilogues.go:107:2:107:2 | assignment to n | epilogues.go:108:2:108:3 | skip |
-| epilogues.go:107:2:107:2 | skip | epilogues.go:107:6:107:6 | x |
-| epilogues.go:107:6:107:6 | x | epilogues.go:107:2:107:2 | assignment to n |
-| epilogues.go:108:2:108:3 | assignment to ok | epilogues.go:109:2:109:7 | return statement |
-| epilogues.go:108:2:108:3 | skip | epilogues.go:108:7:108:10 | true |
-| epilogues.go:108:7:108:10 | true | epilogues.go:108:2:108:3 | assignment to ok |
-| epilogues.go:109:2:109:7 | return statement | epilogues.go:103:8:103:19 | call to epiRecover |
-| epilogues.go:115:1:118:1 | entry | epilogues.go:116:8:116:17 | epiRecover |
-| epilogues.go:115:1:118:1 | function declaration | epilogues.go:0:0:0:0 | exit |
-| epilogues.go:115:6:115:22 | skip | epilogues.go:115:1:118:1 | function declaration |
-| epilogues.go:116:2:116:19 | defer statement | epilogues.go:117:2:117:6 | panic |
-| epilogues.go:116:8:116:17 | epiRecover | epilogues.go:116:2:116:19 | defer statement |
-| epilogues.go:116:8:116:19 | call to epiRecover | epilogues.go:115:1:118:1 | exit |
+| epilogues.go:104:12:106:2 | block statement | epilogues.go:105:3:105:8 | Before return statement |
+| epilogues.go:105:3:105:8 | Before return statement | epilogues.go:105:3:105:8 | return statement |
+| epilogues.go:105:3:105:8 | return statement | epilogues.go:104:2:106:2 | catch-return if statement |
+| epilogues.go:107:2:107:6 | ... = ... | epilogues.go:107:6:107:6 | x |
+| epilogues.go:107:2:107:6 | After ... = ... | epilogues.go:108:2:108:10 | ... = ... |
+| epilogues.go:107:2:107:6 | assign:0 ... = ... | epilogues.go:107:2:107:6 | After ... = ... |
+| epilogues.go:107:6:107:6 | x | epilogues.go:107:2:107:6 | assign:0 ... = ... |
+| epilogues.go:108:2:108:10 | ... = ... | epilogues.go:108:7:108:10 | true |
+| epilogues.go:108:2:108:10 | After ... = ... | epilogues.go:109:2:109:7 | Before return statement |
+| epilogues.go:108:2:108:10 | assign:0 ... = ... | epilogues.go:108:2:108:10 | After ... = ... |
+| epilogues.go:108:7:108:10 | true | epilogues.go:108:2:108:10 | assign:0 ... = ... |
+| epilogues.go:109:2:109:7 | Before return statement | epilogues.go:109:2:109:7 | return statement |
+| epilogues.go:109:2:109:7 | catch-return return statement | epilogues.go:103:8:103:19 | defer-invoke call to epiRecover |
+| epilogues.go:109:2:109:7 | return statement | epilogues.go:109:2:109:7 | catch-return return statement |
+| epilogues.go:115:1:118:1 | Entry | epilogues.go:115:26:118:1 | block statement |
+| epilogues.go:115:1:118:1 | Exceptional Exit | epilogues.go:115:1:118:1 | Exit |
+| epilogues.go:115:1:118:1 | Normal Exit | epilogues.go:115:1:118:1 | Exit |
+| epilogues.go:115:1:118:1 | function declaration | epilogues.go:0:0:0:0 | After epilogues.go |
+| epilogues.go:115:26:118:1 | After block statement | epilogues.go:115:1:118:1 | Normal Exit |
+| epilogues.go:115:26:118:1 | block statement | epilogues.go:116:2:116:19 | Before defer statement |
+| epilogues.go:116:2:116:19 | After defer statement | epilogues.go:117:2:117:14 | expression statement |
+| epilogues.go:116:2:116:19 | Before defer statement | epilogues.go:116:8:116:19 | call to epiRecover |
+| epilogues.go:116:2:116:19 | catch-defer-panic defer statement | epilogues.go:115:1:118:1 | Exceptional Exit |
+| epilogues.go:116:2:116:19 | defer statement | epilogues.go:116:2:116:19 | After defer statement |
+| epilogues.go:116:8:116:17 | epiRecover | epilogues.go:116:8:116:19 | After call to epiRecover |
+| epilogues.go:116:8:116:19 | After call to epiRecover | epilogues.go:116:2:116:19 | defer statement |
+| epilogues.go:116:8:116:19 | call to epiRecover | epilogues.go:116:8:116:17 | epiRecover |
+| epilogues.go:116:8:116:19 | defer-invoke call to epiRecover | epilogues.go:115:26:118:1 | After block statement |
+| epilogues.go:116:8:116:19 | defer-invoke call to epiRecover | epilogues.go:116:2:116:19 | catch-defer-panic defer statement |
 | epilogues.go:117:2:117:6 | panic | epilogues.go:117:8:117:13 | "boom" |
-| epilogues.go:117:2:117:14 | call to panic | epilogues.go:116:8:116:19 | call to epiRecover |
+| epilogues.go:117:2:117:14 | Before call to panic | epilogues.go:117:2:117:6 | panic |
+| epilogues.go:117:2:117:14 | call to panic | epilogues.go:117:2:117:14 | catch-panic expression statement |
+| epilogues.go:117:2:117:14 | catch-panic expression statement | epilogues.go:116:8:116:19 | defer-invoke call to epiRecover |
+| epilogues.go:117:2:117:14 | expression statement | epilogues.go:117:2:117:14 | Before call to panic |
 | epilogues.go:117:8:117:13 | "boom" | epilogues.go:117:2:117:14 | call to panic |
-| equalitytests.go:0:0:0:0 | entry | equalitytests.go:3:1:5:1 | skip |
-| equalitytests.go:3:1:5:1 | skip | equalitytests.go:7:1:9:1 | skip |
-| equalitytests.go:7:1:9:1 | skip | equalitytests.go:11:6:11:18 | skip |
-| equalitytests.go:11:1:13:1 | entry | equalitytests.go:11:20:11:21 | argument corresponding to i1 |
-| equalitytests.go:11:1:13:1 | function declaration | equalitytests.go:0:0:0:0 | exit |
-| equalitytests.go:11:6:11:18 | skip | equalitytests.go:11:1:13:1 | function declaration |
-| equalitytests.go:11:20:11:21 | argument corresponding to i1 | equalitytests.go:11:20:11:21 | initialization of i1 |
-| equalitytests.go:11:20:11:21 | initialization of i1 | equalitytests.go:11:28:11:29 | argument corresponding to i2 |
-| equalitytests.go:11:28:11:29 | argument corresponding to i2 | equalitytests.go:11:28:11:29 | initialization of i2 |
-| equalitytests.go:11:28:11:29 | initialization of i2 | equalitytests.go:11:36:11:37 | argument corresponding to e1 |
-| equalitytests.go:11:36:11:37 | argument corresponding to e1 | equalitytests.go:11:36:11:37 | initialization of e1 |
-| equalitytests.go:11:36:11:37 | initialization of e1 | equalitytests.go:11:46:11:47 | argument corresponding to e2 |
-| equalitytests.go:11:46:11:47 | argument corresponding to e2 | equalitytests.go:11:46:11:47 | initialization of e2 |
-| equalitytests.go:11:46:11:47 | initialization of e2 | equalitytests.go:11:56:11:57 | argument corresponding to s1 |
-| equalitytests.go:11:56:11:57 | argument corresponding to s1 | equalitytests.go:11:56:11:57 | initialization of s1 |
-| equalitytests.go:11:56:11:57 | initialization of s1 | equalitytests.go:11:83:11:84 | argument corresponding to s2 |
-| equalitytests.go:11:83:11:84 | argument corresponding to s2 | equalitytests.go:11:83:11:84 | initialization of s2 |
-| equalitytests.go:11:83:11:84 | initialization of s2 | equalitytests.go:11:110:11:111 | argument corresponding to s3 |
-| equalitytests.go:11:110:11:111 | argument corresponding to s3 | equalitytests.go:11:110:11:111 | initialization of s3 |
-| equalitytests.go:11:110:11:111 | initialization of s3 | equalitytests.go:11:134:11:135 | argument corresponding to s4 |
-| equalitytests.go:11:134:11:135 | argument corresponding to s4 | equalitytests.go:11:134:11:135 | initialization of s4 |
-| equalitytests.go:11:134:11:135 | initialization of s4 | equalitytests.go:11:158:11:159 | argument corresponding to a1 |
-| equalitytests.go:11:158:11:159 | argument corresponding to a1 | equalitytests.go:11:158:11:159 | initialization of a1 |
-| equalitytests.go:11:158:11:159 | initialization of a1 | equalitytests.go:11:171:11:172 | argument corresponding to a2 |
-| equalitytests.go:11:171:11:172 | argument corresponding to a2 | equalitytests.go:11:171:11:172 | initialization of a2 |
-| equalitytests.go:11:171:11:172 | initialization of a2 | equalitytests.go:11:184:11:185 | argument corresponding to a3 |
-| equalitytests.go:11:184:11:185 | argument corresponding to a3 | equalitytests.go:11:184:11:185 | initialization of a3 |
-| equalitytests.go:11:184:11:185 | initialization of a3 | equalitytests.go:11:195:11:196 | argument corresponding to a4 |
-| equalitytests.go:11:195:11:196 | argument corresponding to a4 | equalitytests.go:11:195:11:196 | initialization of a4 |
-| equalitytests.go:11:195:11:196 | initialization of a4 | equalitytests.go:12:9:12:10 | i1 |
-| equalitytests.go:12:2:12:76 | return statement | equalitytests.go:11:1:13:1 | exit |
+| equalitytests.go:0:0:0:0 | After equalitytests.go | equalitytests.go:0:0:0:0 | Normal Exit |
+| equalitytests.go:0:0:0:0 | Entry | equalitytests.go:0:0:0:0 | equalitytests.go |
+| equalitytests.go:0:0:0:0 | Normal Exit | equalitytests.go:0:0:0:0 | Exit |
+| equalitytests.go:0:0:0:0 | equalitytests.go | equalitytests.go:3:1:5:1 | type declaration |
+| equalitytests.go:3:1:5:1 | type declaration | equalitytests.go:7:1:9:1 | type declaration |
+| equalitytests.go:7:1:9:1 | type declaration | equalitytests.go:11:1:13:1 | function declaration |
+| equalitytests.go:11:1:13:1 | Entry | equalitytests.go:11:20:11:21 | i1 |
+| equalitytests.go:11:1:13:1 | Normal Exit | equalitytests.go:11:1:13:1 | Exit |
+| equalitytests.go:11:1:13:1 | function declaration | equalitytests.go:0:0:0:0 | After equalitytests.go |
+| equalitytests.go:11:20:11:21 | i1 | equalitytests.go:11:28:11:29 | i2 |
+| equalitytests.go:11:28:11:29 | i2 | equalitytests.go:11:36:11:37 | e1 |
+| equalitytests.go:11:36:11:37 | e1 | equalitytests.go:11:46:11:47 | e2 |
+| equalitytests.go:11:46:11:47 | e2 | equalitytests.go:11:56:11:57 | s1 |
+| equalitytests.go:11:56:11:57 | s1 | equalitytests.go:11:83:11:84 | s2 |
+| equalitytests.go:11:83:11:84 | s2 | equalitytests.go:11:110:11:111 | s3 |
+| equalitytests.go:11:110:11:111 | s3 | equalitytests.go:11:134:11:135 | s4 |
+| equalitytests.go:11:134:11:135 | s4 | equalitytests.go:11:158:11:159 | a1 |
+| equalitytests.go:11:158:11:159 | a1 | equalitytests.go:11:171:11:172 | a2 |
+| equalitytests.go:11:171:11:172 | a2 | equalitytests.go:11:184:11:185 | a3 |
+| equalitytests.go:11:184:11:185 | a3 | equalitytests.go:11:195:11:196 | a4 |
+| equalitytests.go:11:195:11:196 | a4 | equalitytests.go:11:211:13:1 | block statement |
+| equalitytests.go:11:211:13:1 | block statement | equalitytests.go:12:2:12:76 | Before return statement |
+| equalitytests.go:12:2:12:76 | Before return statement | equalitytests.go:12:9:12:76 | ...&&... |
+| equalitytests.go:12:2:12:76 | return statement | equalitytests.go:11:1:13:1 | Normal Exit |
 | equalitytests.go:12:9:12:10 | i1 | equalitytests.go:12:15:12:16 | i2 |
-| equalitytests.go:12:9:12:16 | ...==... | equalitytests.go:12:9:12:16 | ...==... is false |
-| equalitytests.go:12:9:12:16 | ...==... | equalitytests.go:12:9:12:16 | ...==... is true |
-| equalitytests.go:12:9:12:16 | ...==... is false | equalitytests.go:12:9:12:28 | ...&&... is false |
-| equalitytests.go:12:9:12:16 | ...==... is true | equalitytests.go:12:21:12:22 | e1 |
-| equalitytests.go:12:9:12:28 | ...&&... is false | equalitytests.go:12:9:12:40 | ...&&... is false |
-| equalitytests.go:12:9:12:28 | ...&&... is true | equalitytests.go:12:33:12:34 | s1 |
-| equalitytests.go:12:9:12:40 | ...&&... is false | equalitytests.go:12:9:12:52 | ...&&... is false |
-| equalitytests.go:12:9:12:40 | ...&&... is true | equalitytests.go:12:45:12:46 | s3 |
-| equalitytests.go:12:9:12:52 | ...&&... is false | equalitytests.go:12:9:12:64 | ...&&... is false |
-| equalitytests.go:12:9:12:52 | ...&&... is true | equalitytests.go:12:57:12:58 | a1 |
-| equalitytests.go:12:9:12:64 | ...&&... is false | equalitytests.go:12:9:12:76 | ...&&... |
-| equalitytests.go:12:9:12:64 | ...&&... is true | equalitytests.go:12:69:12:70 | a3 |
-| equalitytests.go:12:9:12:76 | ...&&... | equalitytests.go:12:2:12:76 | return statement |
+| equalitytests.go:12:9:12:16 | ...==... | equalitytests.go:12:9:12:16 | After ...==... [false] |
+| equalitytests.go:12:9:12:16 | ...==... | equalitytests.go:12:9:12:16 | After ...==... [true] |
+| equalitytests.go:12:9:12:16 | After ...==... [false] | equalitytests.go:12:9:12:28 | After ...&&... [false] |
+| equalitytests.go:12:9:12:16 | After ...==... [true] | equalitytests.go:12:21:12:28 | Before ...==... |
+| equalitytests.go:12:9:12:16 | Before ...==... | equalitytests.go:12:9:12:10 | i1 |
+| equalitytests.go:12:9:12:28 | ...&&... | equalitytests.go:12:9:12:16 | Before ...==... |
+| equalitytests.go:12:9:12:28 | After ...&&... [false] | equalitytests.go:12:9:12:40 | After ...&&... [false] |
+| equalitytests.go:12:9:12:28 | After ...&&... [true] | equalitytests.go:12:33:12:40 | Before ...==... |
+| equalitytests.go:12:9:12:40 | ...&&... | equalitytests.go:12:9:12:28 | ...&&... |
+| equalitytests.go:12:9:12:40 | After ...&&... [false] | equalitytests.go:12:9:12:52 | After ...&&... [false] |
+| equalitytests.go:12:9:12:40 | After ...&&... [true] | equalitytests.go:12:45:12:52 | Before ...==... |
+| equalitytests.go:12:9:12:52 | ...&&... | equalitytests.go:12:9:12:40 | ...&&... |
+| equalitytests.go:12:9:12:52 | After ...&&... [false] | equalitytests.go:12:9:12:64 | After ...&&... [false] |
+| equalitytests.go:12:9:12:52 | After ...&&... [true] | equalitytests.go:12:57:12:64 | Before ...==... |
+| equalitytests.go:12:9:12:64 | ...&&... | equalitytests.go:12:9:12:52 | ...&&... |
+| equalitytests.go:12:9:12:64 | After ...&&... [false] | equalitytests.go:12:9:12:76 | After ...&&... |
+| equalitytests.go:12:9:12:64 | After ...&&... [true] | equalitytests.go:12:69:12:76 | Before ...==... |
+| equalitytests.go:12:9:12:76 | ...&&... | equalitytests.go:12:9:12:64 | ...&&... |
+| equalitytests.go:12:9:12:76 | After ...&&... | equalitytests.go:12:2:12:76 | return statement |
 | equalitytests.go:12:15:12:16 | i2 | equalitytests.go:12:9:12:16 | ...==... |
 | equalitytests.go:12:21:12:22 | e1 | equalitytests.go:12:27:12:28 | e2 |
-| equalitytests.go:12:21:12:28 | ...==... | equalitytests.go:11:1:13:1 | exit |
-| equalitytests.go:12:21:12:28 | ...==... | equalitytests.go:12:9:12:28 | ...&&... is false |
-| equalitytests.go:12:21:12:28 | ...==... | equalitytests.go:12:9:12:28 | ...&&... is true |
+| equalitytests.go:12:21:12:28 | ...==... | equalitytests.go:12:21:12:28 | After ...==... [false] |
+| equalitytests.go:12:21:12:28 | ...==... | equalitytests.go:12:21:12:28 | After ...==... [true] |
+| equalitytests.go:12:21:12:28 | After ...==... [false] | equalitytests.go:12:9:12:28 | After ...&&... [false] |
+| equalitytests.go:12:21:12:28 | After ...==... [true] | equalitytests.go:12:9:12:28 | After ...&&... [true] |
+| equalitytests.go:12:21:12:28 | Before ...==... | equalitytests.go:12:21:12:22 | e1 |
 | equalitytests.go:12:27:12:28 | e2 | equalitytests.go:12:21:12:28 | ...==... |
 | equalitytests.go:12:33:12:34 | s1 | equalitytests.go:12:39:12:40 | s2 |
-| equalitytests.go:12:33:12:40 | ...==... | equalitytests.go:11:1:13:1 | exit |
-| equalitytests.go:12:33:12:40 | ...==... | equalitytests.go:12:9:12:40 | ...&&... is false |
-| equalitytests.go:12:33:12:40 | ...==... | equalitytests.go:12:9:12:40 | ...&&... is true |
+| equalitytests.go:12:33:12:40 | ...==... | equalitytests.go:12:33:12:40 | After ...==... [false] |
+| equalitytests.go:12:33:12:40 | ...==... | equalitytests.go:12:33:12:40 | After ...==... [true] |
+| equalitytests.go:12:33:12:40 | After ...==... [false] | equalitytests.go:12:9:12:40 | After ...&&... [false] |
+| equalitytests.go:12:33:12:40 | After ...==... [true] | equalitytests.go:12:9:12:40 | After ...&&... [true] |
+| equalitytests.go:12:33:12:40 | Before ...==... | equalitytests.go:12:33:12:34 | s1 |
 | equalitytests.go:12:39:12:40 | s2 | equalitytests.go:12:33:12:40 | ...==... |
 | equalitytests.go:12:45:12:46 | s3 | equalitytests.go:12:51:12:52 | s4 |
-| equalitytests.go:12:45:12:52 | ...==... | equalitytests.go:11:1:13:1 | exit |
-| equalitytests.go:12:45:12:52 | ...==... | equalitytests.go:12:9:12:52 | ...&&... is false |
-| equalitytests.go:12:45:12:52 | ...==... | equalitytests.go:12:9:12:52 | ...&&... is true |
+| equalitytests.go:12:45:12:52 | ...==... | equalitytests.go:12:45:12:52 | After ...==... [false] |
+| equalitytests.go:12:45:12:52 | ...==... | equalitytests.go:12:45:12:52 | After ...==... [true] |
+| equalitytests.go:12:45:12:52 | After ...==... [false] | equalitytests.go:12:9:12:52 | After ...&&... [false] |
+| equalitytests.go:12:45:12:52 | After ...==... [true] | equalitytests.go:12:9:12:52 | After ...&&... [true] |
+| equalitytests.go:12:45:12:52 | Before ...==... | equalitytests.go:12:45:12:46 | s3 |
 | equalitytests.go:12:51:12:52 | s4 | equalitytests.go:12:45:12:52 | ...==... |
 | equalitytests.go:12:57:12:58 | a1 | equalitytests.go:12:63:12:64 | a2 |
-| equalitytests.go:12:57:12:64 | ...==... | equalitytests.go:11:1:13:1 | exit |
-| equalitytests.go:12:57:12:64 | ...==... | equalitytests.go:12:9:12:64 | ...&&... is false |
-| equalitytests.go:12:57:12:64 | ...==... | equalitytests.go:12:9:12:64 | ...&&... is true |
+| equalitytests.go:12:57:12:64 | ...==... | equalitytests.go:12:57:12:64 | After ...==... [false] |
+| equalitytests.go:12:57:12:64 | ...==... | equalitytests.go:12:57:12:64 | After ...==... [true] |
+| equalitytests.go:12:57:12:64 | After ...==... [false] | equalitytests.go:12:9:12:64 | After ...&&... [false] |
+| equalitytests.go:12:57:12:64 | After ...==... [true] | equalitytests.go:12:9:12:64 | After ...&&... [true] |
+| equalitytests.go:12:57:12:64 | Before ...==... | equalitytests.go:12:57:12:58 | a1 |
 | equalitytests.go:12:63:12:64 | a2 | equalitytests.go:12:57:12:64 | ...==... |
 | equalitytests.go:12:69:12:70 | a3 | equalitytests.go:12:75:12:76 | a4 |
-| equalitytests.go:12:69:12:76 | ...==... | equalitytests.go:11:1:13:1 | exit |
-| equalitytests.go:12:69:12:76 | ...==... | equalitytests.go:12:9:12:76 | ...&&... |
+| equalitytests.go:12:69:12:76 | ...==... | equalitytests.go:12:69:12:76 | After ...==... |
+| equalitytests.go:12:69:12:76 | After ...==... | equalitytests.go:12:9:12:76 | After ...&&... |
+| equalitytests.go:12:69:12:76 | Before ...==... | equalitytests.go:12:69:12:70 | a3 |
 | equalitytests.go:12:75:12:76 | a4 | equalitytests.go:12:69:12:76 | ...==... |
-| exprs.go:0:0:0:0 | entry | exprs.go:3:1:3:29 | skip |
-| exprs.go:3:1:3:29 | skip | exprs.go:5:6:5:9 | skip |
-| exprs.go:5:1:26:1 | entry | exprs.go:6:6:6:6 | skip |
-| exprs.go:5:1:26:1 | function declaration | exprs.go:28:6:28:10 | skip |
-| exprs.go:5:6:5:9 | skip | exprs.go:5:1:26:1 | function declaration |
-| exprs.go:6:6:6:6 | assignment to i | exprs.go:6:9:6:9 | assignment to j |
-| exprs.go:6:6:6:6 | skip | exprs.go:6:9:6:9 | skip |
-| exprs.go:6:9:6:9 | assignment to j | exprs.go:7:6:7:6 | skip |
-| exprs.go:6:9:6:9 | skip | exprs.go:6:13:6:13 | 0 |
-| exprs.go:6:13:6:13 | 0 | exprs.go:6:16:6:26 | ...+... |
-| exprs.go:6:16:6:26 | ...+... | exprs.go:6:6:6:6 | assignment to i |
-| exprs.go:7:6:7:6 | assignment to k | exprs.go:8:2:8:2 | skip |
-| exprs.go:7:6:7:6 | skip | exprs.go:7:10:7:10 | i |
-| exprs.go:7:10:7:10 | i | exprs.go:7:14:7:14 | 2 |
-| exprs.go:7:10:7:16 | ...+... | exprs.go:7:6:7:6 | assignment to k |
+| exprs.go:0:0:0:0 | After exprs.go | exprs.go:0:0:0:0 | Normal Exit |
+| exprs.go:0:0:0:0 | Entry | exprs.go:0:0:0:0 | exprs.go |
+| exprs.go:0:0:0:0 | Exceptional Exit | exprs.go:0:0:0:0 | Exit |
+| exprs.go:0:0:0:0 | Normal Exit | exprs.go:0:0:0:0 | Exit |
+| exprs.go:0:0:0:0 | exprs.go | exprs.go:3:1:3:29 | type declaration |
+| exprs.go:3:1:3:29 | type declaration | exprs.go:5:1:26:1 | function declaration |
+| exprs.go:5:1:26:1 | Entry | exprs.go:5:19:26:1 | block statement |
+| exprs.go:5:1:26:1 | Exceptional Exit | exprs.go:5:1:26:1 | Exit |
+| exprs.go:5:1:26:1 | Normal Exit | exprs.go:5:1:26:1 | Exit |
+| exprs.go:5:1:26:1 | function declaration | exprs.go:28:1:30:1 | function declaration |
+| exprs.go:5:19:26:1 | block statement | exprs.go:6:2:6:26 | declaration statement |
+| exprs.go:6:2:6:26 | After declaration statement | exprs.go:7:2:7:16 | declaration statement |
+| exprs.go:6:2:6:26 | After variable declaration | exprs.go:6:2:6:26 | After declaration statement |
+| exprs.go:6:2:6:26 | declaration statement | exprs.go:6:2:6:26 | variable declaration |
+| exprs.go:6:2:6:26 | variable declaration | exprs.go:6:6:6:26 | value declaration specifier |
+| exprs.go:6:6:6:26 | After value declaration specifier | exprs.go:6:2:6:26 | After variable declaration |
+| exprs.go:6:6:6:26 | assign:0 value declaration specifier | exprs.go:6:6:6:26 | assign:1 value declaration specifier |
+| exprs.go:6:6:6:26 | assign:1 value declaration specifier | exprs.go:6:6:6:26 | After value declaration specifier |
+| exprs.go:6:6:6:26 | value declaration specifier | exprs.go:6:13:6:13 | 0 |
+| exprs.go:6:13:6:13 | 0 | exprs.go:6:16:6:26 | Before ...+... |
+| exprs.go:6:16:6:26 | ...+... | exprs.go:6:16:6:26 | After ...+... |
+| exprs.go:6:16:6:26 | After ...+... | exprs.go:6:6:6:26 | assign:0 value declaration specifier |
+| exprs.go:6:16:6:26 | Before ...+... | exprs.go:6:16:6:26 | ...+... |
+| exprs.go:7:2:7:16 | After declaration statement | exprs.go:8:2:8:24 | ... := ... |
+| exprs.go:7:2:7:16 | After variable declaration | exprs.go:7:2:7:16 | After declaration statement |
+| exprs.go:7:2:7:16 | declaration statement | exprs.go:7:2:7:16 | variable declaration |
+| exprs.go:7:2:7:16 | variable declaration | exprs.go:7:6:7:16 | value declaration specifier |
+| exprs.go:7:6:7:16 | After value declaration specifier | exprs.go:7:2:7:16 | After variable declaration |
+| exprs.go:7:6:7:16 | assign:0 value declaration specifier | exprs.go:7:6:7:16 | After value declaration specifier |
+| exprs.go:7:6:7:16 | value declaration specifier | exprs.go:7:10:7:16 | Before ...+... |
+| exprs.go:7:10:7:10 | i | exprs.go:7:14:7:16 | Before ...*... |
+| exprs.go:7:10:7:16 | ...+... | exprs.go:7:10:7:16 | After ...+... |
+| exprs.go:7:10:7:16 | After ...+... | exprs.go:7:6:7:16 | assign:0 value declaration specifier |
+| exprs.go:7:10:7:16 | Before ...+... | exprs.go:7:10:7:10 | i |
 | exprs.go:7:14:7:14 | 2 | exprs.go:7:16:7:16 | j |
-| exprs.go:7:14:7:16 | ...*... | exprs.go:7:10:7:16 | ...+... |
+| exprs.go:7:14:7:16 | ...*... | exprs.go:7:14:7:16 | After ...*... |
+| exprs.go:7:14:7:16 | After ...*... | exprs.go:7:10:7:16 | ...+... |
+| exprs.go:7:14:7:16 | Before ...*... | exprs.go:7:14:7:14 | 2 |
 | exprs.go:7:16:7:16 | j | exprs.go:7:14:7:16 | ...*... |
-| exprs.go:8:2:8:2 | assignment to s | exprs.go:9:2:9:3 | skip |
-| exprs.go:8:2:8:2 | skip | exprs.go:8:7:8:12 | "k = " |
-| exprs.go:8:7:8:12 | "k = " | exprs.go:8:23:8:23 | k |
-| exprs.go:8:7:8:24 | ...+... | exprs.go:8:2:8:2 | assignment to s |
-| exprs.go:8:16:8:24 | type conversion | exprs.go:8:7:8:24 | ...+... |
+| exprs.go:8:2:8:24 | ... := ... | exprs.go:8:7:8:24 | Before ...+... |
+| exprs.go:8:2:8:24 | After ... := ... | exprs.go:9:2:9:61 | ... := ... |
+| exprs.go:8:2:8:24 | assign:0 ... := ... | exprs.go:8:2:8:24 | After ... := ... |
+| exprs.go:8:7:8:12 | "k = " | exprs.go:8:16:8:24 | Before type conversion |
+| exprs.go:8:7:8:24 | ...+... | exprs.go:8:7:8:24 | After ...+... |
+| exprs.go:8:7:8:24 | After ...+... | exprs.go:8:2:8:24 | assign:0 ... := ... |
+| exprs.go:8:7:8:24 | Before ...+... | exprs.go:8:7:8:12 | "k = " |
+| exprs.go:8:16:8:24 | After type conversion | exprs.go:8:7:8:24 | ...+... |
+| exprs.go:8:16:8:24 | Before type conversion | exprs.go:8:23:8:23 | k |
+| exprs.go:8:16:8:24 | type conversion | exprs.go:8:16:8:24 | After type conversion |
 | exprs.go:8:23:8:23 | k | exprs.go:8:16:8:24 | type conversion |
-| exprs.go:9:2:9:3 | assignment to fn | exprs.go:10:2:10:8 | skip |
-| exprs.go:9:2:9:3 | skip | exprs.go:9:8:9:61 | function literal |
-| exprs.go:9:8:9:61 | entry | exprs.go:9:13:9:13 | argument corresponding to a |
-| exprs.go:9:8:9:61 | function literal | exprs.go:9:2:9:3 | assignment to fn |
-| exprs.go:9:13:9:13 | argument corresponding to a | exprs.go:9:13:9:13 | initialization of a |
-| exprs.go:9:13:9:13 | initialization of a | exprs.go:9:16:9:16 | argument corresponding to b |
-| exprs.go:9:16:9:16 | argument corresponding to b | exprs.go:9:16:9:16 | initialization of b |
-| exprs.go:9:16:9:16 | initialization of b | exprs.go:9:23:9:23 | argument corresponding to z |
-| exprs.go:9:23:9:23 | argument corresponding to z | exprs.go:9:23:9:23 | initialization of z |
-| exprs.go:9:23:9:23 | initialization of z | exprs.go:9:48:9:48 | a |
-| exprs.go:9:41:9:59 | return statement | exprs.go:9:8:9:61 | exit |
+| exprs.go:9:2:9:61 | ... := ... | exprs.go:9:8:9:61 | function literal |
+| exprs.go:9:2:9:61 | After ... := ... | exprs.go:10:2:10:32 | ... := ... |
+| exprs.go:9:2:9:61 | assign:0 ... := ... | exprs.go:9:2:9:61 | After ... := ... |
+| exprs.go:9:8:9:61 | Entry | exprs.go:9:13:9:13 | a |
+| exprs.go:9:8:9:61 | Normal Exit | exprs.go:9:8:9:61 | Exit |
+| exprs.go:9:8:9:61 | function literal | exprs.go:9:2:9:61 | assign:0 ... := ... |
+| exprs.go:9:13:9:13 | a | exprs.go:9:16:9:16 | b |
+| exprs.go:9:16:9:16 | b | exprs.go:9:23:9:23 | z |
+| exprs.go:9:23:9:23 | z | exprs.go:9:39:9:61 | block statement |
+| exprs.go:9:39:9:61 | block statement | exprs.go:9:41:9:59 | Before return statement |
+| exprs.go:9:41:9:59 | Before return statement | exprs.go:9:48:9:59 | Before ...<... |
+| exprs.go:9:41:9:59 | return statement | exprs.go:9:8:9:61 | Normal Exit |
 | exprs.go:9:48:9:48 | a | exprs.go:9:50:9:50 | b |
-| exprs.go:9:48:9:50 | ...*... | exprs.go:9:58:9:58 | z |
-| exprs.go:9:48:9:59 | ...<... | exprs.go:9:41:9:59 | return statement |
+| exprs.go:9:48:9:50 | ...*... | exprs.go:9:48:9:50 | After ...*... |
+| exprs.go:9:48:9:50 | After ...*... | exprs.go:9:54:9:59 | Before type conversion |
+| exprs.go:9:48:9:50 | Before ...*... | exprs.go:9:48:9:48 | a |
+| exprs.go:9:48:9:59 | ...<... | exprs.go:9:48:9:59 | After ...<... |
+| exprs.go:9:48:9:59 | After ...<... | exprs.go:9:41:9:59 | return statement |
+| exprs.go:9:48:9:59 | Before ...<... | exprs.go:9:48:9:50 | Before ...*... |
 | exprs.go:9:50:9:50 | b | exprs.go:9:48:9:50 | ...*... |
-| exprs.go:9:54:9:59 | type conversion | exprs.go:9:48:9:59 | ...<... |
+| exprs.go:9:54:9:59 | After type conversion | exprs.go:9:48:9:59 | ...<... |
+| exprs.go:9:54:9:59 | Before type conversion | exprs.go:9:58:9:58 | z |
+| exprs.go:9:54:9:59 | type conversion | exprs.go:9:54:9:59 | After type conversion |
 | exprs.go:9:58:9:58 | z | exprs.go:9:54:9:59 | type conversion |
-| exprs.go:10:2:10:8 | assignment to struct1 | exprs.go:11:2:11:8 | skip |
-| exprs.go:10:2:10:8 | skip | exprs.go:10:13:10:32 | struct literal |
-| exprs.go:10:13:10:32 | struct literal | exprs.go:10:2:10:8 | assignment to struct1 |
-| exprs.go:11:2:11:8 | assignment to struct2 | exprs.go:15:2:15:8 | skip |
-| exprs.go:11:2:11:8 | skip | exprs.go:11:13:14:21 | struct literal |
+| exprs.go:10:2:10:32 | ... := ... | exprs.go:10:13:10:32 | Before struct literal |
+| exprs.go:10:2:10:32 | After ... := ... | exprs.go:11:2:14:21 | ... := ... |
+| exprs.go:10:2:10:32 | assign:0 ... := ... | exprs.go:10:2:10:32 | After ... := ... |
+| exprs.go:10:13:10:32 | After struct literal | exprs.go:10:2:10:32 | assign:0 ... := ... |
+| exprs.go:10:13:10:32 | Before struct literal | exprs.go:10:13:10:32 | struct literal |
+| exprs.go:10:13:10:32 | struct literal | exprs.go:10:13:10:32 | After struct literal |
+| exprs.go:11:2:14:21 | ... := ... | exprs.go:11:13:14:21 | Before struct literal |
+| exprs.go:11:2:14:21 | After ... := ... | exprs.go:15:2:15:58 | ... := ... |
+| exprs.go:11:2:14:21 | assign:0 ... := ... | exprs.go:11:2:14:21 | After ... := ... |
+| exprs.go:11:13:14:21 | After struct literal | exprs.go:11:2:14:21 | assign:0 ... := ... |
+| exprs.go:11:13:14:21 | Before struct literal | exprs.go:11:13:14:21 | struct literal |
 | exprs.go:11:13:14:21 | struct literal | exprs.go:14:4:14:4 | k |
-| exprs.go:14:4:14:4 | init of k | exprs.go:14:7:14:8 | fn |
-| exprs.go:14:4:14:4 | k | exprs.go:14:4:14:4 | init of k |
+| exprs.go:14:4:14:4 | After k | exprs.go:14:4:14:4 | lit-init k |
+| exprs.go:14:4:14:4 | k | exprs.go:14:4:14:4 | After k |
+| exprs.go:14:4:14:4 | lit-init k | exprs.go:14:7:14:20 | Before call to fn |
 | exprs.go:14:7:14:8 | fn | exprs.go:14:10:14:10 | i |
-| exprs.go:14:7:14:20 | call to fn | exprs.go:5:1:26:1 | exit |
-| exprs.go:14:7:14:20 | call to fn | exprs.go:14:7:14:20 | init of call to fn |
-| exprs.go:14:7:14:20 | init of call to fn | exprs.go:11:2:11:8 | assignment to struct2 |
+| exprs.go:14:7:14:20 | After call to fn | exprs.go:14:7:14:20 | lit-init call to fn |
+| exprs.go:14:7:14:20 | Before call to fn | exprs.go:14:7:14:8 | fn |
+| exprs.go:14:7:14:20 | call to fn | exprs.go:5:1:26:1 | Exceptional Exit |
+| exprs.go:14:7:14:20 | call to fn | exprs.go:14:7:14:20 | After call to fn |
+| exprs.go:14:7:14:20 | lit-init call to fn | exprs.go:11:13:14:21 | After struct literal |
 | exprs.go:14:10:14:10 | i | exprs.go:14:13:14:13 | j |
-| exprs.go:14:13:14:13 | j | exprs.go:14:16:14:19 | .../... |
-| exprs.go:14:16:14:19 | .../... | exprs.go:14:7:14:20 | call to fn |
-| exprs.go:15:2:15:8 | assignment to struct3 | exprs.go:16:2:16:5 | skip |
-| exprs.go:15:2:15:8 | skip | exprs.go:15:13:15:58 | struct literal |
-| exprs.go:15:13:15:58 | struct literal | exprs.go:15:35:15:41 | struct1 |
-| exprs.go:15:32:15:43 | init of key-value pair | exprs.go:15:49:15:55 | struct2 |
+| exprs.go:14:13:14:13 | j | exprs.go:14:16:14:19 | Before .../... |
+| exprs.go:14:16:14:19 | .../... | exprs.go:14:16:14:19 | After .../... |
+| exprs.go:14:16:14:19 | After .../... | exprs.go:14:7:14:20 | call to fn |
+| exprs.go:14:16:14:19 | Before .../... | exprs.go:14:16:14:19 | .../... |
+| exprs.go:15:2:15:58 | ... := ... | exprs.go:15:13:15:58 | Before struct literal |
+| exprs.go:15:2:15:58 | After ... := ... | exprs.go:16:2:16:26 | ... := ... |
+| exprs.go:15:2:15:58 | assign:0 ... := ... | exprs.go:15:2:15:58 | After ... := ... |
+| exprs.go:15:13:15:58 | After struct literal | exprs.go:15:2:15:58 | assign:0 ... := ... |
+| exprs.go:15:13:15:58 | Before struct literal | exprs.go:15:13:15:58 | struct literal |
+| exprs.go:15:13:15:58 | struct literal | exprs.go:15:32:15:43 | Before key-value pair |
+| exprs.go:15:32:15:43 | After key-value pair | exprs.go:15:32:15:43 | lit-init key-value pair |
+| exprs.go:15:32:15:43 | Before key-value pair | exprs.go:15:35:15:43 | Before selection of x |
+| exprs.go:15:32:15:43 | key-value pair | exprs.go:15:32:15:43 | After key-value pair |
+| exprs.go:15:32:15:43 | lit-init key-value pair | exprs.go:15:46:15:57 | Before key-value pair |
 | exprs.go:15:35:15:41 | struct1 | exprs.go:15:35:15:43 | selection of x |
-| exprs.go:15:35:15:43 | selection of x | exprs.go:15:32:15:43 | init of key-value pair |
-| exprs.go:15:46:15:57 | init of key-value pair | exprs.go:15:2:15:8 | assignment to struct3 |
+| exprs.go:15:35:15:43 | After selection of x | exprs.go:15:32:15:43 | key-value pair |
+| exprs.go:15:35:15:43 | Before selection of x | exprs.go:15:35:15:41 | struct1 |
+| exprs.go:15:35:15:43 | selection of x | exprs.go:15:35:15:43 | After selection of x |
+| exprs.go:15:46:15:57 | After key-value pair | exprs.go:15:46:15:57 | lit-init key-value pair |
+| exprs.go:15:46:15:57 | Before key-value pair | exprs.go:15:49:15:57 | Before selection of x |
+| exprs.go:15:46:15:57 | key-value pair | exprs.go:15:46:15:57 | After key-value pair |
+| exprs.go:15:46:15:57 | lit-init key-value pair | exprs.go:15:13:15:58 | After struct literal |
 | exprs.go:15:49:15:55 | struct2 | exprs.go:15:49:15:57 | selection of x |
-| exprs.go:15:49:15:57 | selection of x | exprs.go:15:46:15:57 | init of key-value pair |
-| exprs.go:16:2:16:5 | assignment to arr1 | exprs.go:17:2:17:5 | skip |
-| exprs.go:16:2:16:5 | skip | exprs.go:16:10:16:26 | array literal |
-| exprs.go:16:10:16:26 | array literal | exprs.go:16:17:16:25 | element index |
+| exprs.go:15:49:15:57 | After selection of x | exprs.go:15:46:15:57 | key-value pair |
+| exprs.go:15:49:15:57 | Before selection of x | exprs.go:15:49:15:55 | struct2 |
+| exprs.go:15:49:15:57 | selection of x | exprs.go:15:49:15:57 | After selection of x |
+| exprs.go:16:2:16:26 | ... := ... | exprs.go:16:10:16:26 | Before array literal |
+| exprs.go:16:2:16:26 | After ... := ... | exprs.go:17:2:17:40 | ... := ... |
+| exprs.go:16:2:16:26 | assign:0 ... := ... | exprs.go:16:2:16:26 | After ... := ... |
+| exprs.go:16:10:16:26 | After array literal | exprs.go:16:2:16:26 | assign:0 ... := ... |
+| exprs.go:16:10:16:26 | Before array literal | exprs.go:16:10:16:26 | array literal |
+| exprs.go:16:10:16:26 | array literal | exprs.go:16:17:16:25 | Before selection of x |
 | exprs.go:16:17:16:23 | struct3 | exprs.go:16:17:16:25 | selection of x |
-| exprs.go:16:17:16:25 | element index | exprs.go:16:17:16:23 | struct3 |
-| exprs.go:16:17:16:25 | init of selection of x | exprs.go:16:2:16:5 | assignment to arr1 |
-| exprs.go:16:17:16:25 | selection of x | exprs.go:16:17:16:25 | init of selection of x |
-| exprs.go:17:2:17:5 | assignment to arr2 | exprs.go:18:2:18:4 | skip |
-| exprs.go:17:2:17:5 | skip | exprs.go:17:10:17:40 | array literal |
-| exprs.go:17:10:17:40 | array literal | exprs.go:17:19:17:27 | element index |
+| exprs.go:16:17:16:25 | After selection of x | exprs.go:16:17:16:25 | lit-init selection of x |
+| exprs.go:16:17:16:25 | Before selection of x | exprs.go:16:17:16:23 | struct3 |
+| exprs.go:16:17:16:25 | lit-init selection of x | exprs.go:16:10:16:26 | After array literal |
+| exprs.go:16:17:16:25 | selection of x | exprs.go:16:17:16:25 | After selection of x |
+| exprs.go:17:2:17:40 | ... := ... | exprs.go:17:10:17:40 | Before array literal |
+| exprs.go:17:2:17:40 | After ... := ... | exprs.go:18:2:18:22 | ... := ... |
+| exprs.go:17:2:17:40 | assign:0 ... := ... | exprs.go:17:2:17:40 | After ... := ... |
+| exprs.go:17:10:17:40 | After array literal | exprs.go:17:2:17:40 | assign:0 ... := ... |
+| exprs.go:17:10:17:40 | Before array literal | exprs.go:17:10:17:40 | array literal |
+| exprs.go:17:10:17:40 | array literal | exprs.go:17:19:17:27 | Before selection of x |
 | exprs.go:17:19:17:25 | struct3 | exprs.go:17:19:17:27 | selection of x |
-| exprs.go:17:19:17:27 | element index | exprs.go:17:19:17:25 | struct3 |
-| exprs.go:17:19:17:27 | init of selection of x | exprs.go:17:30:17:30 | 2 |
-| exprs.go:17:19:17:27 | selection of x | exprs.go:17:19:17:27 | init of selection of x |
-| exprs.go:17:30:17:30 | 2 | exprs.go:17:33:17:36 | arr1 |
-| exprs.go:17:30:17:39 | init of key-value pair | exprs.go:17:2:17:5 | assignment to arr2 |
+| exprs.go:17:19:17:27 | After selection of x | exprs.go:17:19:17:27 | lit-init selection of x |
+| exprs.go:17:19:17:27 | Before selection of x | exprs.go:17:19:17:25 | struct3 |
+| exprs.go:17:19:17:27 | lit-init selection of x | exprs.go:17:30:17:39 | Before key-value pair |
+| exprs.go:17:19:17:27 | selection of x | exprs.go:17:19:17:27 | After selection of x |
+| exprs.go:17:30:17:30 | 2 | exprs.go:17:33:17:39 | Before index expression |
+| exprs.go:17:30:17:39 | After key-value pair | exprs.go:17:30:17:39 | lit-init key-value pair |
+| exprs.go:17:30:17:39 | Before key-value pair | exprs.go:17:30:17:30 | 2 |
+| exprs.go:17:30:17:39 | key-value pair | exprs.go:17:30:17:39 | After key-value pair |
+| exprs.go:17:30:17:39 | lit-init key-value pair | exprs.go:17:10:17:40 | After array literal |
 | exprs.go:17:33:17:36 | arr1 | exprs.go:17:38:17:38 | 0 |
-| exprs.go:17:33:17:39 | index expression | exprs.go:5:1:26:1 | exit |
-| exprs.go:17:33:17:39 | index expression | exprs.go:17:30:17:39 | init of key-value pair |
+| exprs.go:17:33:17:39 | After index expression | exprs.go:17:30:17:39 | key-value pair |
+| exprs.go:17:33:17:39 | Before index expression | exprs.go:17:33:17:36 | arr1 |
+| exprs.go:17:33:17:39 | index expression | exprs.go:5:1:26:1 | Exceptional Exit |
+| exprs.go:17:33:17:39 | index expression | exprs.go:17:33:17:39 | After index expression |
 | exprs.go:17:38:17:38 | 0 | exprs.go:17:33:17:39 | index expression |
-| exprs.go:18:2:18:4 | assignment to slc | exprs.go:19:2:19:3 | skip |
-| exprs.go:18:2:18:4 | skip | exprs.go:18:9:18:22 | slice literal |
-| exprs.go:18:9:18:22 | slice literal | exprs.go:18:18:18:18 | element index |
-| exprs.go:18:18:18:18 | element index | exprs.go:18:18:18:18 | s |
-| exprs.go:18:18:18:18 | init of s | exprs.go:18:21:18:21 | element index |
-| exprs.go:18:18:18:18 | s | exprs.go:18:18:18:18 | init of s |
-| exprs.go:18:21:18:21 | element index | exprs.go:18:21:18:21 | s |
-| exprs.go:18:21:18:21 | init of s | exprs.go:18:2:18:4 | assignment to slc |
-| exprs.go:18:21:18:21 | s | exprs.go:18:21:18:21 | init of s |
-| exprs.go:19:2:19:3 | assignment to mp | exprs.go:20:2:20:5 | skip |
-| exprs.go:19:2:19:3 | skip | exprs.go:19:8:19:38 | map literal |
-| exprs.go:19:8:19:38 | map literal | exprs.go:19:23:19:25 | slc |
+| exprs.go:18:2:18:22 | ... := ... | exprs.go:18:9:18:22 | Before slice literal |
+| exprs.go:18:2:18:22 | After ... := ... | exprs.go:19:2:19:38 | ... := ... |
+| exprs.go:18:2:18:22 | assign:0 ... := ... | exprs.go:18:2:18:22 | After ... := ... |
+| exprs.go:18:9:18:22 | After slice literal | exprs.go:18:2:18:22 | assign:0 ... := ... |
+| exprs.go:18:9:18:22 | Before slice literal | exprs.go:18:9:18:22 | slice literal |
+| exprs.go:18:9:18:22 | slice literal | exprs.go:18:18:18:18 | s |
+| exprs.go:18:18:18:18 | After s | exprs.go:18:18:18:18 | lit-init s |
+| exprs.go:18:18:18:18 | lit-init s | exprs.go:18:21:18:21 | s |
+| exprs.go:18:18:18:18 | s | exprs.go:18:18:18:18 | After s |
+| exprs.go:18:21:18:21 | After s | exprs.go:18:21:18:21 | lit-init s |
+| exprs.go:18:21:18:21 | lit-init s | exprs.go:18:9:18:22 | After slice literal |
+| exprs.go:18:21:18:21 | s | exprs.go:18:21:18:21 | After s |
+| exprs.go:19:2:19:38 | ... := ... | exprs.go:19:8:19:38 | Before map literal |
+| exprs.go:19:2:19:38 | After ... := ... | exprs.go:20:2:20:19 | ... := ... |
+| exprs.go:19:2:19:38 | assign:0 ... := ... | exprs.go:19:2:19:38 | After ... := ... |
+| exprs.go:19:8:19:38 | After map literal | exprs.go:19:2:19:38 | assign:0 ... := ... |
+| exprs.go:19:8:19:38 | Before map literal | exprs.go:19:8:19:38 | map literal |
+| exprs.go:19:8:19:38 | map literal | exprs.go:19:23:19:37 | Before key-value pair |
 | exprs.go:19:23:19:25 | slc | exprs.go:19:27:19:27 | 0 |
-| exprs.go:19:23:19:28 | index expression | exprs.go:5:1:26:1 | exit |
-| exprs.go:19:23:19:28 | index expression | exprs.go:19:31:19:34 | arr2 |
-| exprs.go:19:23:19:37 | init of key-value pair | exprs.go:19:2:19:3 | assignment to mp |
+| exprs.go:19:23:19:28 | After index expression | exprs.go:19:31:19:37 | Before index expression |
+| exprs.go:19:23:19:28 | Before index expression | exprs.go:19:23:19:25 | slc |
+| exprs.go:19:23:19:28 | index expression | exprs.go:5:1:26:1 | Exceptional Exit |
+| exprs.go:19:23:19:28 | index expression | exprs.go:19:23:19:28 | After index expression |
+| exprs.go:19:23:19:37 | After key-value pair | exprs.go:19:23:19:37 | lit-init key-value pair |
+| exprs.go:19:23:19:37 | Before key-value pair | exprs.go:19:23:19:28 | Before index expression |
+| exprs.go:19:23:19:37 | key-value pair | exprs.go:19:23:19:37 | After key-value pair |
+| exprs.go:19:23:19:37 | lit-init key-value pair | exprs.go:19:8:19:38 | After map literal |
 | exprs.go:19:27:19:27 | 0 | exprs.go:19:23:19:28 | index expression |
 | exprs.go:19:31:19:34 | arr2 | exprs.go:19:36:19:36 | 1 |
-| exprs.go:19:31:19:37 | index expression | exprs.go:5:1:26:1 | exit |
-| exprs.go:19:31:19:37 | index expression | exprs.go:19:23:19:37 | init of key-value pair |
+| exprs.go:19:31:19:37 | After index expression | exprs.go:19:23:19:37 | key-value pair |
+| exprs.go:19:31:19:37 | Before index expression | exprs.go:19:31:19:34 | arr2 |
+| exprs.go:19:31:19:37 | index expression | exprs.go:5:1:26:1 | Exceptional Exit |
+| exprs.go:19:31:19:37 | index expression | exprs.go:19:31:19:37 | After index expression |
 | exprs.go:19:36:19:36 | 1 | exprs.go:19:31:19:37 | index expression |
-| exprs.go:20:2:20:5 | assignment to slc2 | exprs.go:21:2:21:5 | skip |
-| exprs.go:20:2:20:5 | skip | exprs.go:20:10:20:12 | slc |
+| exprs.go:20:2:20:19 | ... := ... | exprs.go:20:10:20:19 | Before slice expression |
+| exprs.go:20:2:20:19 | After ... := ... | exprs.go:21:2:21:19 | ... := ... |
+| exprs.go:20:2:20:19 | assign:0 ... := ... | exprs.go:20:2:20:19 | After ... := ... |
 | exprs.go:20:10:20:12 | slc | exprs.go:20:14:20:14 | 1 |
-| exprs.go:20:10:20:19 | slice expression | exprs.go:5:1:26:1 | exit |
-| exprs.go:20:10:20:19 | slice expression | exprs.go:20:2:20:5 | assignment to slc2 |
+| exprs.go:20:10:20:19 | After slice expression | exprs.go:20:2:20:19 | assign:0 ... := ... |
+| exprs.go:20:10:20:19 | Before slice expression | exprs.go:20:10:20:12 | slc |
+| exprs.go:20:10:20:19 | slice expression | exprs.go:20:10:20:19 | After slice expression |
 | exprs.go:20:14:20:14 | 1 | exprs.go:20:16:20:16 | 2 |
 | exprs.go:20:16:20:16 | 2 | exprs.go:20:18:20:18 | 3 |
 | exprs.go:20:18:20:18 | 3 | exprs.go:20:10:20:19 | slice expression |
-| exprs.go:21:2:21:5 | assignment to slc3 | exprs.go:22:2:22:5 | skip |
-| exprs.go:21:2:21:5 | skip | exprs.go:21:10:21:13 | slc2 |
-| exprs.go:21:10:21:13 | slc2 | exprs.go:21:10:21:19 | 0 |
-| exprs.go:21:10:21:19 | 0 | exprs.go:21:16:21:16 | 2 |
-| exprs.go:21:10:21:19 | slice expression | exprs.go:5:1:26:1 | exit |
-| exprs.go:21:10:21:19 | slice expression | exprs.go:21:2:21:5 | assignment to slc3 |
+| exprs.go:21:2:21:19 | ... := ... | exprs.go:21:10:21:19 | Before slice expression |
+| exprs.go:21:2:21:19 | After ... := ... | exprs.go:22:2:22:18 | ... := ... |
+| exprs.go:21:2:21:19 | assign:0 ... := ... | exprs.go:21:2:21:19 | After ... := ... |
+| exprs.go:21:10:21:13 | slc2 | exprs.go:21:16:21:16 | 2 |
+| exprs.go:21:10:21:19 | After slice expression | exprs.go:21:2:21:19 | assign:0 ... := ... |
+| exprs.go:21:10:21:19 | Before slice expression | exprs.go:21:10:21:13 | slc2 |
+| exprs.go:21:10:21:19 | slice expression | exprs.go:21:10:21:19 | After slice expression |
 | exprs.go:21:16:21:16 | 2 | exprs.go:21:18:21:18 | 3 |
 | exprs.go:21:18:21:18 | 3 | exprs.go:21:10:21:19 | slice expression |
-| exprs.go:22:2:22:5 | assignment to slc4 | exprs.go:23:2:23:5 | skip |
-| exprs.go:22:2:22:5 | skip | exprs.go:22:10:22:13 | slc3 |
+| exprs.go:22:2:22:18 | ... := ... | exprs.go:22:10:22:18 | Before slice expression |
+| exprs.go:22:2:22:18 | After ... := ... | exprs.go:23:2:23:17 | ... := ... |
+| exprs.go:22:2:22:18 | assign:0 ... := ... | exprs.go:22:2:22:18 | After ... := ... |
 | exprs.go:22:10:22:13 | slc3 | exprs.go:22:15:22:15 | 0 |
-| exprs.go:22:10:22:18 | cap | exprs.go:22:10:22:18 | slice expression |
-| exprs.go:22:10:22:18 | slice expression | exprs.go:5:1:26:1 | exit |
-| exprs.go:22:10:22:18 | slice expression | exprs.go:22:2:22:5 | assignment to slc4 |
+| exprs.go:22:10:22:18 | After slice expression | exprs.go:22:2:22:18 | assign:0 ... := ... |
+| exprs.go:22:10:22:18 | Before slice expression | exprs.go:22:10:22:13 | slc3 |
+| exprs.go:22:10:22:18 | slice expression | exprs.go:22:10:22:18 | After slice expression |
 | exprs.go:22:15:22:15 | 0 | exprs.go:22:17:22:17 | 2 |
-| exprs.go:22:17:22:17 | 2 | exprs.go:22:10:22:18 | cap |
-| exprs.go:23:2:23:5 | assignment to slc5 | exprs.go:24:2:24:5 | skip |
-| exprs.go:23:2:23:5 | skip | exprs.go:23:10:23:13 | slc4 |
+| exprs.go:22:17:22:17 | 2 | exprs.go:22:10:22:18 | slice expression |
+| exprs.go:23:2:23:17 | ... := ... | exprs.go:23:10:23:17 | Before slice expression |
+| exprs.go:23:2:23:17 | After ... := ... | exprs.go:24:2:24:17 | ... := ... |
+| exprs.go:23:2:23:17 | assign:0 ... := ... | exprs.go:23:2:23:17 | After ... := ... |
 | exprs.go:23:10:23:13 | slc4 | exprs.go:23:15:23:15 | 0 |
-| exprs.go:23:10:23:17 | cap | exprs.go:23:10:23:17 | slice expression |
-| exprs.go:23:10:23:17 | len | exprs.go:23:10:23:17 | cap |
-| exprs.go:23:10:23:17 | slice expression | exprs.go:5:1:26:1 | exit |
-| exprs.go:23:10:23:17 | slice expression | exprs.go:23:2:23:5 | assignment to slc5 |
-| exprs.go:23:15:23:15 | 0 | exprs.go:23:10:23:17 | len |
-| exprs.go:24:2:24:5 | assignment to slc6 | exprs.go:25:9:25:34 | struct literal |
-| exprs.go:24:2:24:5 | skip | exprs.go:24:10:24:13 | slc5 |
-| exprs.go:24:10:24:13 | slc5 | exprs.go:24:10:24:17 | 0 |
-| exprs.go:24:10:24:17 | 0 | exprs.go:24:16:24:16 | 2 |
-| exprs.go:24:10:24:17 | cap | exprs.go:24:10:24:17 | slice expression |
-| exprs.go:24:10:24:17 | slice expression | exprs.go:5:1:26:1 | exit |
-| exprs.go:24:10:24:17 | slice expression | exprs.go:24:2:24:5 | assignment to slc6 |
-| exprs.go:24:16:24:16 | 2 | exprs.go:24:10:24:17 | cap |
-| exprs.go:25:2:25:34 | return statement | exprs.go:5:1:26:1 | exit |
-| exprs.go:25:9:25:34 | struct literal | exprs.go:25:15:25:16 | mp |
+| exprs.go:23:10:23:17 | After slice expression | exprs.go:23:2:23:17 | assign:0 ... := ... |
+| exprs.go:23:10:23:17 | Before slice expression | exprs.go:23:10:23:13 | slc4 |
+| exprs.go:23:10:23:17 | slice expression | exprs.go:23:10:23:17 | After slice expression |
+| exprs.go:23:15:23:15 | 0 | exprs.go:23:10:23:17 | slice expression |
+| exprs.go:24:2:24:17 | ... := ... | exprs.go:24:10:24:17 | Before slice expression |
+| exprs.go:24:2:24:17 | After ... := ... | exprs.go:25:2:25:34 | Before return statement |
+| exprs.go:24:2:24:17 | assign:0 ... := ... | exprs.go:24:2:24:17 | After ... := ... |
+| exprs.go:24:10:24:13 | slc5 | exprs.go:24:16:24:16 | 2 |
+| exprs.go:24:10:24:17 | After slice expression | exprs.go:24:2:24:17 | assign:0 ... := ... |
+| exprs.go:24:10:24:17 | Before slice expression | exprs.go:24:10:24:13 | slc5 |
+| exprs.go:24:10:24:17 | slice expression | exprs.go:24:10:24:17 | After slice expression |
+| exprs.go:24:16:24:16 | 2 | exprs.go:24:10:24:17 | slice expression |
+| exprs.go:25:2:25:34 | Before return statement | exprs.go:25:9:25:34 | Before struct literal |
+| exprs.go:25:2:25:34 | return statement | exprs.go:5:1:26:1 | Normal Exit |
+| exprs.go:25:9:25:34 | After struct literal | exprs.go:25:2:25:34 | return statement |
+| exprs.go:25:9:25:34 | Before struct literal | exprs.go:25:9:25:34 | struct literal |
+| exprs.go:25:9:25:34 | struct literal | exprs.go:25:15:25:19 | Before index expression |
 | exprs.go:25:15:25:16 | mp | exprs.go:25:18:25:18 | s |
-| exprs.go:25:15:25:19 | index expression | exprs.go:5:1:26:1 | exit |
-| exprs.go:25:15:25:19 | index expression | exprs.go:25:15:25:19 | init of index expression |
-| exprs.go:25:15:25:19 | init of index expression | exprs.go:25:22:25:24 | len |
+| exprs.go:25:15:25:19 | After index expression | exprs.go:25:15:25:19 | lit-init index expression |
+| exprs.go:25:15:25:19 | Before index expression | exprs.go:25:15:25:16 | mp |
+| exprs.go:25:15:25:19 | index expression | exprs.go:5:1:26:1 | Exceptional Exit |
+| exprs.go:25:15:25:19 | index expression | exprs.go:25:15:25:19 | After index expression |
+| exprs.go:25:15:25:19 | lit-init index expression | exprs.go:25:22:25:33 | Before call to len |
 | exprs.go:25:18:25:18 | s | exprs.go:25:15:25:19 | index expression |
-| exprs.go:25:22:25:24 | len | exprs.go:25:26:25:29 | slc6 |
-| exprs.go:25:22:25:33 | call to len | exprs.go:25:22:25:33 | init of call to len |
-| exprs.go:25:22:25:33 | init of call to len | exprs.go:25:2:25:34 | return statement |
+| exprs.go:25:22:25:24 | len | exprs.go:25:26:25:32 | Before index expression |
+| exprs.go:25:22:25:33 | After call to len | exprs.go:25:22:25:33 | lit-init call to len |
+| exprs.go:25:22:25:33 | Before call to len | exprs.go:25:22:25:24 | len |
+| exprs.go:25:22:25:33 | call to len | exprs.go:25:22:25:33 | After call to len |
+| exprs.go:25:22:25:33 | lit-init call to len | exprs.go:25:9:25:34 | After struct literal |
 | exprs.go:25:26:25:29 | slc6 | exprs.go:25:31:25:31 | 0 |
-| exprs.go:25:26:25:32 | index expression | exprs.go:5:1:26:1 | exit |
-| exprs.go:25:26:25:32 | index expression | exprs.go:25:22:25:33 | call to len |
+| exprs.go:25:26:25:32 | After index expression | exprs.go:25:22:25:33 | call to len |
+| exprs.go:25:26:25:32 | Before index expression | exprs.go:25:26:25:29 | slc6 |
+| exprs.go:25:26:25:32 | index expression | exprs.go:5:1:26:1 | Exceptional Exit |
+| exprs.go:25:26:25:32 | index expression | exprs.go:25:26:25:32 | After index expression |
 | exprs.go:25:31:25:31 | 0 | exprs.go:25:26:25:32 | index expression |
-| exprs.go:28:1:30:1 | entry | exprs.go:28:12:28:14 | argument corresponding to arg |
-| exprs.go:28:1:30:1 | function declaration | exprs.go:32:6:32:10 | skip |
-| exprs.go:28:6:28:10 | skip | exprs.go:28:1:30:1 | function declaration |
-| exprs.go:28:12:28:14 | argument corresponding to arg | exprs.go:28:12:28:14 | initialization of arg |
-| exprs.go:28:12:28:14 | initialization of arg | exprs.go:29:9:29:11 | arg |
-| exprs.go:29:2:29:21 | return statement | exprs.go:28:1:30:1 | exit |
+| exprs.go:28:1:30:1 | Entry | exprs.go:28:12:28:14 | arg |
+| exprs.go:28:1:30:1 | Exceptional Exit | exprs.go:28:1:30:1 | Exit |
+| exprs.go:28:1:30:1 | Normal Exit | exprs.go:28:1:30:1 | Exit |
+| exprs.go:28:1:30:1 | function declaration | exprs.go:32:1:37:1 | function declaration |
+| exprs.go:28:12:28:14 | arg | exprs.go:28:33:30:1 | block statement |
+| exprs.go:28:33:30:1 | block statement | exprs.go:29:2:29:21 | Before return statement |
+| exprs.go:29:2:29:21 | Before return statement | exprs.go:29:9:29:21 | Before selection of x |
+| exprs.go:29:2:29:21 | return statement | exprs.go:28:1:30:1 | Normal Exit |
 | exprs.go:29:9:29:11 | arg | exprs.go:29:9:29:19 | type assertion |
-| exprs.go:29:9:29:19 | type assertion | exprs.go:28:1:30:1 | exit |
-| exprs.go:29:9:29:19 | type assertion | exprs.go:29:9:29:21 | selection of x |
-| exprs.go:29:9:29:21 | selection of x | exprs.go:29:2:29:21 | return statement |
-| exprs.go:32:1:37:1 | entry | exprs.go:32:12:32:14 | argument corresponding to arg |
-| exprs.go:32:1:37:1 | function declaration | exprs.go:39:6:39:10 | skip |
-| exprs.go:32:6:32:10 | skip | exprs.go:32:1:37:1 | function declaration |
-| exprs.go:32:12:32:14 | argument corresponding to arg | exprs.go:32:12:32:14 | initialization of arg |
-| exprs.go:32:12:32:14 | initialization of arg | exprs.go:33:5:33:5 | skip |
-| exprs.go:33:5:33:5 | assignment to p | exprs.go:33:5:33:24 | ... := ...[1] |
-| exprs.go:33:5:33:5 | skip | exprs.go:33:8:33:9 | skip |
-| exprs.go:33:5:33:24 | ... := ...[0] | exprs.go:33:5:33:5 | assignment to p |
-| exprs.go:33:5:33:24 | ... := ...[1] | exprs.go:33:8:33:9 | assignment to ok |
-| exprs.go:33:8:33:9 | assignment to ok | exprs.go:33:27:33:28 | ok |
-| exprs.go:33:8:33:9 | skip | exprs.go:33:14:33:16 | arg |
+| exprs.go:29:9:29:19 | After type assertion | exprs.go:29:9:29:21 | selection of x |
+| exprs.go:29:9:29:19 | Before type assertion | exprs.go:29:9:29:11 | arg |
+| exprs.go:29:9:29:19 | type assertion | exprs.go:28:1:30:1 | Exceptional Exit |
+| exprs.go:29:9:29:19 | type assertion | exprs.go:29:9:29:19 | After type assertion |
+| exprs.go:29:9:29:21 | After selection of x | exprs.go:29:2:29:21 | return statement |
+| exprs.go:29:9:29:21 | Before selection of x | exprs.go:29:9:29:19 | Before type assertion |
+| exprs.go:29:9:29:21 | selection of x | exprs.go:29:9:29:21 | After selection of x |
+| exprs.go:32:1:37:1 | Entry | exprs.go:32:12:32:14 | arg |
+| exprs.go:32:1:37:1 | Normal Exit | exprs.go:32:1:37:1 | Exit |
+| exprs.go:32:1:37:1 | function declaration | exprs.go:39:1:47:1 | function declaration |
+| exprs.go:32:12:32:14 | arg | exprs.go:32:33:37:1 | block statement |
+| exprs.go:32:33:37:1 | block statement | exprs.go:33:2:35:2 | if statement |
+| exprs.go:33:2:35:2 | After if statement | exprs.go:36:2:36:10 | Before return statement |
+| exprs.go:33:2:35:2 | if statement | exprs.go:33:5:33:24 | ... := ... |
+| exprs.go:33:5:33:24 | ... := ... | exprs.go:33:14:33:24 | Before type assertion |
+| exprs.go:33:5:33:24 | After ... := ... | exprs.go:33:27:33:28 | ok |
+| exprs.go:33:5:33:24 | extract:0 ... := ... | exprs.go:33:5:33:24 | extract:1 ... := ... |
+| exprs.go:33:5:33:24 | extract:1 ... := ... | exprs.go:33:5:33:24 | After ... := ... |
 | exprs.go:33:14:33:16 | arg | exprs.go:33:14:33:24 | type assertion |
-| exprs.go:33:14:33:24 | type assertion | exprs.go:33:5:33:24 | ... := ...[0] |
-| exprs.go:33:27:33:28 | ok | exprs.go:33:27:33:28 | ok is false |
-| exprs.go:33:27:33:28 | ok | exprs.go:33:27:33:28 | ok is true |
-| exprs.go:33:27:33:28 | ok is false | exprs.go:36:9:36:10 | -... |
-| exprs.go:33:27:33:28 | ok is true | exprs.go:34:10:34:10 | p |
-| exprs.go:34:3:34:12 | return statement | exprs.go:32:1:37:1 | exit |
+| exprs.go:33:14:33:24 | After type assertion | exprs.go:33:5:33:24 | extract:0 ... := ... |
+| exprs.go:33:14:33:24 | Before type assertion | exprs.go:33:14:33:16 | arg |
+| exprs.go:33:14:33:24 | type assertion | exprs.go:33:14:33:24 | After type assertion |
+| exprs.go:33:27:33:28 | After ok [false] | exprs.go:33:2:35:2 | After if statement |
+| exprs.go:33:27:33:28 | After ok [true] | exprs.go:33:30:35:2 | block statement |
+| exprs.go:33:27:33:28 | ok | exprs.go:33:27:33:28 | After ok [false] |
+| exprs.go:33:27:33:28 | ok | exprs.go:33:27:33:28 | After ok [true] |
+| exprs.go:33:30:35:2 | block statement | exprs.go:34:3:34:12 | Before return statement |
+| exprs.go:34:3:34:12 | Before return statement | exprs.go:34:10:34:12 | Before selection of x |
+| exprs.go:34:3:34:12 | return statement | exprs.go:32:1:37:1 | Normal Exit |
 | exprs.go:34:10:34:10 | p | exprs.go:34:10:34:12 | selection of x |
-| exprs.go:34:10:34:12 | selection of x | exprs.go:34:3:34:12 | return statement |
-| exprs.go:36:2:36:10 | return statement | exprs.go:32:1:37:1 | exit |
-| exprs.go:36:9:36:10 | -... | exprs.go:36:2:36:10 | return statement |
-| exprs.go:39:1:47:1 | entry | exprs.go:39:12:39:14 | argument corresponding to arg |
-| exprs.go:39:1:47:1 | function declaration | exprs.go:49:6:49:8 | skip |
-| exprs.go:39:6:39:10 | skip | exprs.go:39:1:47:1 | function declaration |
-| exprs.go:39:12:39:14 | argument corresponding to arg | exprs.go:39:12:39:14 | initialization of arg |
-| exprs.go:39:12:39:14 | initialization of arg | exprs.go:40:6:40:6 | skip |
-| exprs.go:40:6:40:6 | assignment to p | exprs.go:41:6:41:7 | skip |
-| exprs.go:40:6:40:6 | skip | exprs.go:40:6:40:6 | zero value for p |
-| exprs.go:40:6:40:6 | zero value for p | exprs.go:40:6:40:6 | assignment to p |
-| exprs.go:41:6:41:7 | assignment to ok | exprs.go:42:2:42:2 | skip |
-| exprs.go:41:6:41:7 | skip | exprs.go:41:6:41:7 | zero value for ok |
-| exprs.go:41:6:41:7 | zero value for ok | exprs.go:41:6:41:7 | assignment to ok |
-| exprs.go:42:2:42:2 | assignment to p | exprs.go:42:2:42:20 | ... = ...[1] |
-| exprs.go:42:2:42:2 | skip | exprs.go:42:5:42:6 | skip |
-| exprs.go:42:2:42:20 | ... = ...[0] | exprs.go:42:2:42:2 | assignment to p |
-| exprs.go:42:2:42:20 | ... = ...[1] | exprs.go:42:5:42:6 | assignment to ok |
-| exprs.go:42:5:42:6 | assignment to ok | exprs.go:43:5:43:6 | ok |
-| exprs.go:42:5:42:6 | skip | exprs.go:42:10:42:12 | arg |
+| exprs.go:34:10:34:12 | After selection of x | exprs.go:34:3:34:12 | return statement |
+| exprs.go:34:10:34:12 | Before selection of x | exprs.go:34:10:34:10 | p |
+| exprs.go:34:10:34:12 | selection of x | exprs.go:34:10:34:12 | After selection of x |
+| exprs.go:36:2:36:10 | Before return statement | exprs.go:36:9:36:10 | Before -... |
+| exprs.go:36:2:36:10 | return statement | exprs.go:32:1:37:1 | Normal Exit |
+| exprs.go:36:9:36:10 | -... | exprs.go:36:9:36:10 | After -... |
+| exprs.go:36:9:36:10 | After -... | exprs.go:36:2:36:10 | return statement |
+| exprs.go:36:9:36:10 | Before -... | exprs.go:36:9:36:10 | -... |
+| exprs.go:39:1:47:1 | Entry | exprs.go:39:12:39:14 | arg |
+| exprs.go:39:1:47:1 | Normal Exit | exprs.go:39:1:47:1 | Exit |
+| exprs.go:39:1:47:1 | function declaration | exprs.go:49:1:54:1 | function declaration |
+| exprs.go:39:12:39:14 | arg | exprs.go:39:33:47:1 | block statement |
+| exprs.go:39:33:47:1 | block statement | exprs.go:40:2:40:12 | declaration statement |
+| exprs.go:40:2:40:12 | After declaration statement | exprs.go:41:2:41:12 | declaration statement |
+| exprs.go:40:2:40:12 | After variable declaration | exprs.go:40:2:40:12 | After declaration statement |
+| exprs.go:40:2:40:12 | declaration statement | exprs.go:40:2:40:12 | variable declaration |
+| exprs.go:40:2:40:12 | variable declaration | exprs.go:40:6:40:12 | value declaration specifier |
+| exprs.go:40:6:40:12 | After value declaration specifier | exprs.go:40:2:40:12 | After variable declaration |
+| exprs.go:40:6:40:12 | value declaration specifier | exprs.go:40:6:40:12 | zero-init:0 value declaration specifier |
+| exprs.go:40:6:40:12 | zero-init:0 value declaration specifier | exprs.go:40:6:40:12 | After value declaration specifier |
+| exprs.go:41:2:41:12 | After declaration statement | exprs.go:42:2:42:20 | ... = ... |
+| exprs.go:41:2:41:12 | After variable declaration | exprs.go:41:2:41:12 | After declaration statement |
+| exprs.go:41:2:41:12 | declaration statement | exprs.go:41:2:41:12 | variable declaration |
+| exprs.go:41:2:41:12 | variable declaration | exprs.go:41:6:41:12 | value declaration specifier |
+| exprs.go:41:6:41:12 | After value declaration specifier | exprs.go:41:2:41:12 | After variable declaration |
+| exprs.go:41:6:41:12 | value declaration specifier | exprs.go:41:6:41:12 | zero-init:0 value declaration specifier |
+| exprs.go:41:6:41:12 | zero-init:0 value declaration specifier | exprs.go:41:6:41:12 | After value declaration specifier |
+| exprs.go:42:2:42:20 | ... = ... | exprs.go:42:10:42:20 | Before type assertion |
+| exprs.go:42:2:42:20 | After ... = ... | exprs.go:43:2:45:2 | if statement |
+| exprs.go:42:2:42:20 | extract:0 ... = ... | exprs.go:42:2:42:20 | extract:1 ... = ... |
+| exprs.go:42:2:42:20 | extract:1 ... = ... | exprs.go:42:2:42:20 | After ... = ... |
 | exprs.go:42:10:42:12 | arg | exprs.go:42:10:42:20 | type assertion |
-| exprs.go:42:10:42:20 | type assertion | exprs.go:42:2:42:20 | ... = ...[0] |
-| exprs.go:43:5:43:6 | ok | exprs.go:43:5:43:6 | ok is false |
-| exprs.go:43:5:43:6 | ok | exprs.go:43:5:43:6 | ok is true |
-| exprs.go:43:5:43:6 | ok is false | exprs.go:46:9:46:10 | -... |
-| exprs.go:43:5:43:6 | ok is true | exprs.go:44:10:44:10 | p |
-| exprs.go:44:3:44:12 | return statement | exprs.go:39:1:47:1 | exit |
+| exprs.go:42:10:42:20 | After type assertion | exprs.go:42:2:42:20 | extract:0 ... = ... |
+| exprs.go:42:10:42:20 | Before type assertion | exprs.go:42:10:42:12 | arg |
+| exprs.go:42:10:42:20 | type assertion | exprs.go:42:10:42:20 | After type assertion |
+| exprs.go:43:2:45:2 | After if statement | exprs.go:46:2:46:10 | Before return statement |
+| exprs.go:43:2:45:2 | if statement | exprs.go:43:5:43:6 | ok |
+| exprs.go:43:5:43:6 | After ok [false] | exprs.go:43:2:45:2 | After if statement |
+| exprs.go:43:5:43:6 | After ok [true] | exprs.go:43:8:45:2 | block statement |
+| exprs.go:43:5:43:6 | ok | exprs.go:43:5:43:6 | After ok [false] |
+| exprs.go:43:5:43:6 | ok | exprs.go:43:5:43:6 | After ok [true] |
+| exprs.go:43:8:45:2 | block statement | exprs.go:44:3:44:12 | Before return statement |
+| exprs.go:44:3:44:12 | Before return statement | exprs.go:44:10:44:12 | Before selection of x |
+| exprs.go:44:3:44:12 | return statement | exprs.go:39:1:47:1 | Normal Exit |
 | exprs.go:44:10:44:10 | p | exprs.go:44:10:44:12 | selection of x |
-| exprs.go:44:10:44:12 | selection of x | exprs.go:44:3:44:12 | return statement |
-| exprs.go:46:2:46:10 | return statement | exprs.go:39:1:47:1 | exit |
-| exprs.go:46:9:46:10 | -... | exprs.go:46:2:46:10 | return statement |
-| exprs.go:49:1:54:1 | entry | exprs.go:49:10:49:11 | argument corresponding to xs |
-| exprs.go:49:1:54:1 | function declaration | exprs.go:56:6:56:9 | skip |
-| exprs.go:49:6:49:8 | skip | exprs.go:49:1:54:1 | function declaration |
-| exprs.go:49:10:49:11 | argument corresponding to xs | exprs.go:49:10:49:11 | initialization of xs |
-| exprs.go:49:10:49:11 | initialization of xs | exprs.go:49:21:49:23 | zero value for res |
-| exprs.go:49:21:49:23 | implicit read of res | exprs.go:49:1:54:1 | exit |
-| exprs.go:49:21:49:23 | initialization of res | exprs.go:50:6:50:6 | skip |
-| exprs.go:49:21:49:23 | zero value for res | exprs.go:49:21:49:23 | initialization of res |
-| exprs.go:50:6:50:6 | assignment to i | exprs.go:50:14:50:14 | i |
-| exprs.go:50:6:50:6 | skip | exprs.go:50:11:50:11 | 0 |
-| exprs.go:50:11:50:11 | 0 | exprs.go:50:6:50:6 | assignment to i |
-| exprs.go:50:14:50:14 | i | exprs.go:50:18:50:20 | len |
-| exprs.go:50:14:50:24 | ...<... | exprs.go:50:14:50:24 | ...<... is false |
-| exprs.go:50:14:50:24 | ...<... | exprs.go:50:14:50:24 | ...<... is true |
-| exprs.go:50:14:50:24 | ...<... is false | exprs.go:53:2:53:7 | return statement |
-| exprs.go:50:14:50:24 | ...<... is true | exprs.go:51:3:51:5 | res |
+| exprs.go:44:10:44:12 | After selection of x | exprs.go:44:3:44:12 | return statement |
+| exprs.go:44:10:44:12 | Before selection of x | exprs.go:44:10:44:10 | p |
+| exprs.go:44:10:44:12 | selection of x | exprs.go:44:10:44:12 | After selection of x |
+| exprs.go:46:2:46:10 | Before return statement | exprs.go:46:9:46:10 | Before -... |
+| exprs.go:46:2:46:10 | return statement | exprs.go:39:1:47:1 | Normal Exit |
+| exprs.go:46:9:46:10 | -... | exprs.go:46:9:46:10 | After -... |
+| exprs.go:46:9:46:10 | After -... | exprs.go:46:2:46:10 | return statement |
+| exprs.go:46:9:46:10 | Before -... | exprs.go:46:9:46:10 | -... |
+| exprs.go:49:1:54:1 | Entry | exprs.go:49:10:49:11 | xs |
+| exprs.go:49:1:54:1 | Exceptional Exit | exprs.go:49:1:54:1 | Exit |
+| exprs.go:49:1:54:1 | Normal Exit | exprs.go:49:1:54:1 | Exit |
+| exprs.go:49:1:54:1 | function declaration | exprs.go:56:1:58:1 | function declaration |
+| exprs.go:49:10:49:11 | xs | exprs.go:49:30:54:1 | block statement |
+| exprs.go:49:30:54:1 | After block statement | exprs.go:49:1:54:1 | Normal Exit |
+| exprs.go:49:30:54:1 | block statement | exprs.go:49:30:54:1 | zero-init:0 block statement |
+| exprs.go:49:30:54:1 | result-read:0 block statement | exprs.go:49:30:54:1 | After block statement |
+| exprs.go:49:30:54:1 | zero-init:0 block statement | exprs.go:50:2:52:2 | for statement |
+| exprs.go:50:2:52:2 | After for statement | exprs.go:53:2:53:7 | Before return statement |
+| exprs.go:50:2:52:2 | [LoopHeader] for statement | exprs.go:50:27:50:29 | Before increment statement |
+| exprs.go:50:2:52:2 | for statement | exprs.go:50:6:50:11 | ... := ... |
+| exprs.go:50:6:50:11 | ... := ... | exprs.go:50:11:50:11 | 0 |
+| exprs.go:50:6:50:11 | After ... := ... | exprs.go:50:14:50:24 | Before ...<... |
+| exprs.go:50:6:50:11 | assign:0 ... := ... | exprs.go:50:6:50:11 | After ... := ... |
+| exprs.go:50:11:50:11 | 0 | exprs.go:50:6:50:11 | assign:0 ... := ... |
+| exprs.go:50:14:50:14 | i | exprs.go:50:18:50:24 | Before call to len |
+| exprs.go:50:14:50:24 | ...<... | exprs.go:50:14:50:24 | After ...<... [false] |
+| exprs.go:50:14:50:24 | ...<... | exprs.go:50:14:50:24 | After ...<... [true] |
+| exprs.go:50:14:50:24 | After ...<... [false] | exprs.go:50:2:52:2 | After for statement |
+| exprs.go:50:14:50:24 | After ...<... [true] | exprs.go:50:31:52:2 | block statement |
+| exprs.go:50:14:50:24 | Before ...<... | exprs.go:50:14:50:14 | i |
 | exprs.go:50:18:50:20 | len | exprs.go:50:22:50:23 | xs |
-| exprs.go:50:18:50:24 | call to len | exprs.go:50:14:50:24 | ...<... |
+| exprs.go:50:18:50:24 | After call to len | exprs.go:50:14:50:24 | ...<... |
+| exprs.go:50:18:50:24 | Before call to len | exprs.go:50:18:50:20 | len |
+| exprs.go:50:18:50:24 | call to len | exprs.go:50:18:50:24 | After call to len |
 | exprs.go:50:22:50:23 | xs | exprs.go:50:18:50:24 | call to len |
-| exprs.go:50:27:50:27 | i | exprs.go:50:27:50:29 | 1 |
-| exprs.go:50:27:50:29 | 1 | exprs.go:50:27:50:29 | rhs of increment statement |
-| exprs.go:50:27:50:29 | increment statement | exprs.go:50:14:50:14 | i |
-| exprs.go:50:27:50:29 | rhs of increment statement | exprs.go:50:27:50:29 | increment statement |
-| exprs.go:51:3:51:5 | assignment to res | exprs.go:50:27:50:27 | i |
-| exprs.go:51:3:51:5 | res | exprs.go:51:10:51:11 | xs |
-| exprs.go:51:3:51:14 | ... += ... | exprs.go:51:3:51:5 | assignment to res |
+| exprs.go:50:27:50:27 | i | exprs.go:50:27:50:29 | increment statement |
+| exprs.go:50:27:50:29 | After increment statement | exprs.go:50:14:50:24 | Before ...<... |
+| exprs.go:50:27:50:29 | Before increment statement | exprs.go:50:27:50:27 | i |
+| exprs.go:50:27:50:29 | increment statement | exprs.go:50:27:50:29 | After increment statement |
+| exprs.go:50:31:52:2 | After block statement | exprs.go:50:2:52:2 | [LoopHeader] for statement |
+| exprs.go:50:31:52:2 | block statement | exprs.go:51:3:51:14 | Before ... += ... |
+| exprs.go:51:3:51:5 | res | exprs.go:51:10:51:14 | Before index expression |
+| exprs.go:51:3:51:14 | ... += ... | exprs.go:51:3:51:14 | After ... += ... |
+| exprs.go:51:3:51:14 | After ... += ... | exprs.go:50:31:52:2 | After block statement |
+| exprs.go:51:3:51:14 | Before ... += ... | exprs.go:51:3:51:5 | res |
 | exprs.go:51:10:51:11 | xs | exprs.go:51:13:51:13 | i |
-| exprs.go:51:10:51:14 | index expression | exprs.go:49:1:54:1 | exit |
-| exprs.go:51:10:51:14 | index expression | exprs.go:51:3:51:14 | ... += ... |
+| exprs.go:51:10:51:14 | After index expression | exprs.go:51:3:51:14 | ... += ... |
+| exprs.go:51:10:51:14 | Before index expression | exprs.go:51:10:51:11 | xs |
+| exprs.go:51:10:51:14 | index expression | exprs.go:49:1:54:1 | Exceptional Exit |
+| exprs.go:51:10:51:14 | index expression | exprs.go:51:10:51:14 | After index expression |
 | exprs.go:51:13:51:13 | i | exprs.go:51:10:51:14 | index expression |
-| exprs.go:53:2:53:7 | return statement | exprs.go:49:21:49:23 | implicit read of res |
-| exprs.go:56:1:58:1 | entry | exprs.go:56:11:56:12 | argument corresponding to xs |
-| exprs.go:56:1:58:1 | function declaration | exprs.go:60:6:60:9 | skip |
-| exprs.go:56:6:56:9 | skip | exprs.go:56:1:58:1 | function declaration |
-| exprs.go:56:11:56:12 | argument corresponding to xs | exprs.go:56:11:56:12 | initialization of xs |
-| exprs.go:56:11:56:12 | initialization of xs | exprs.go:57:9:57:11 | sum |
-| exprs.go:57:2:57:15 | return statement | exprs.go:56:1:58:1 | exit |
+| exprs.go:53:2:53:7 | Before return statement | exprs.go:53:2:53:7 | return statement |
+| exprs.go:53:2:53:7 | return statement | exprs.go:49:30:54:1 | result-read:0 block statement |
+| exprs.go:56:1:58:1 | Entry | exprs.go:56:11:56:12 | xs |
+| exprs.go:56:1:58:1 | Exceptional Exit | exprs.go:56:1:58:1 | Exit |
+| exprs.go:56:1:58:1 | Normal Exit | exprs.go:56:1:58:1 | Exit |
+| exprs.go:56:1:58:1 | function declaration | exprs.go:60:1:62:1 | function declaration |
+| exprs.go:56:11:56:12 | xs | exprs.go:56:26:58:1 | block statement |
+| exprs.go:56:26:58:1 | block statement | exprs.go:57:2:57:15 | Before return statement |
+| exprs.go:57:2:57:15 | Before return statement | exprs.go:57:9:57:15 | Before call to sum |
+| exprs.go:57:2:57:15 | return statement | exprs.go:56:1:58:1 | Normal Exit |
 | exprs.go:57:9:57:11 | sum | exprs.go:57:13:57:14 | xs |
-| exprs.go:57:9:57:15 | call to sum | exprs.go:56:1:58:1 | exit |
-| exprs.go:57:9:57:15 | call to sum | exprs.go:57:2:57:15 | return statement |
+| exprs.go:57:9:57:15 | After call to sum | exprs.go:57:2:57:15 | return statement |
+| exprs.go:57:9:57:15 | Before call to sum | exprs.go:57:9:57:11 | sum |
+| exprs.go:57:9:57:15 | call to sum | exprs.go:56:1:58:1 | Exceptional Exit |
+| exprs.go:57:9:57:15 | call to sum | exprs.go:57:9:57:15 | After call to sum |
 | exprs.go:57:13:57:14 | xs | exprs.go:57:9:57:15 | call to sum |
-| exprs.go:60:1:62:1 | entry | exprs.go:61:9:61:22 | slice literal |
-| exprs.go:60:1:62:1 | function declaration | exprs.go:64:5:64:5 | skip |
-| exprs.go:60:6:60:9 | skip | exprs.go:60:1:62:1 | function declaration |
-| exprs.go:61:2:61:22 | return statement | exprs.go:60:1:62:1 | exit |
-| exprs.go:61:9:61:22 | slice literal | exprs.go:61:15:61:15 | element index |
-| exprs.go:61:15:61:15 | 1 | exprs.go:61:15:61:15 | init of 1 |
-| exprs.go:61:15:61:15 | element index | exprs.go:61:15:61:15 | 1 |
-| exprs.go:61:15:61:15 | init of 1 | exprs.go:61:18:61:18 | element index |
-| exprs.go:61:18:61:18 | 2 | exprs.go:61:18:61:18 | init of 2 |
-| exprs.go:61:18:61:18 | element index | exprs.go:61:18:61:18 | 2 |
-| exprs.go:61:18:61:18 | init of 2 | exprs.go:61:21:61:21 | element index |
-| exprs.go:61:21:61:21 | 3 | exprs.go:61:21:61:21 | init of 3 |
-| exprs.go:61:21:61:21 | element index | exprs.go:61:21:61:21 | 3 |
-| exprs.go:61:21:61:21 | init of 3 | exprs.go:61:2:61:22 | return statement |
-| exprs.go:64:5:64:5 | assignment to s | exprs.go:65:5:65:6 | skip |
-| exprs.go:64:5:64:5 | skip | exprs.go:64:9:64:11 | sum |
-| exprs.go:64:9:64:11 | sum | exprs.go:64:13:64:16 | ints |
-| exprs.go:64:9:64:19 | call to sum | exprs.go:0:0:0:0 | exit |
-| exprs.go:64:9:64:19 | call to sum | exprs.go:64:5:64:5 | assignment to s |
+| exprs.go:60:1:62:1 | Entry | exprs.go:60:19:62:1 | block statement |
+| exprs.go:60:1:62:1 | Normal Exit | exprs.go:60:1:62:1 | Exit |
+| exprs.go:60:1:62:1 | function declaration | exprs.go:64:1:64:19 | variable declaration |
+| exprs.go:60:19:62:1 | block statement | exprs.go:61:2:61:22 | Before return statement |
+| exprs.go:61:2:61:22 | Before return statement | exprs.go:61:9:61:22 | Before slice literal |
+| exprs.go:61:2:61:22 | return statement | exprs.go:60:1:62:1 | Normal Exit |
+| exprs.go:61:9:61:22 | After slice literal | exprs.go:61:2:61:22 | return statement |
+| exprs.go:61:9:61:22 | Before slice literal | exprs.go:61:9:61:22 | slice literal |
+| exprs.go:61:9:61:22 | slice literal | exprs.go:61:15:61:15 | 1 |
+| exprs.go:61:15:61:15 | 1 | exprs.go:61:15:61:15 | After 1 |
+| exprs.go:61:15:61:15 | After 1 | exprs.go:61:15:61:15 | lit-init 1 |
+| exprs.go:61:15:61:15 | lit-init 1 | exprs.go:61:18:61:18 | 2 |
+| exprs.go:61:18:61:18 | 2 | exprs.go:61:18:61:18 | After 2 |
+| exprs.go:61:18:61:18 | After 2 | exprs.go:61:18:61:18 | lit-init 2 |
+| exprs.go:61:18:61:18 | lit-init 2 | exprs.go:61:21:61:21 | 3 |
+| exprs.go:61:21:61:21 | 3 | exprs.go:61:21:61:21 | After 3 |
+| exprs.go:61:21:61:21 | After 3 | exprs.go:61:21:61:21 | lit-init 3 |
+| exprs.go:61:21:61:21 | lit-init 3 | exprs.go:61:9:61:22 | After slice literal |
+| exprs.go:64:1:64:19 | After variable declaration | exprs.go:65:1:65:24 | variable declaration |
+| exprs.go:64:1:64:19 | variable declaration | exprs.go:64:5:64:19 | value declaration specifier |
+| exprs.go:64:5:64:19 | After value declaration specifier | exprs.go:64:1:64:19 | After variable declaration |
+| exprs.go:64:5:64:19 | assign:0 value declaration specifier | exprs.go:64:5:64:19 | After value declaration specifier |
+| exprs.go:64:5:64:19 | value declaration specifier | exprs.go:64:9:64:19 | Before call to sum |
+| exprs.go:64:9:64:11 | sum | exprs.go:64:13:64:18 | Before call to ints |
+| exprs.go:64:9:64:19 | After call to sum | exprs.go:64:5:64:19 | assign:0 value declaration specifier |
+| exprs.go:64:9:64:19 | Before call to sum | exprs.go:64:9:64:11 | sum |
+| exprs.go:64:9:64:19 | call to sum | exprs.go:0:0:0:0 | Exceptional Exit |
+| exprs.go:64:9:64:19 | call to sum | exprs.go:64:9:64:19 | After call to sum |
 | exprs.go:64:13:64:16 | ints | exprs.go:64:13:64:18 | call to ints |
-| exprs.go:64:13:64:18 | call to ints | exprs.go:0:0:0:0 | exit |
-| exprs.go:64:13:64:18 | call to ints | exprs.go:64:9:64:19 | call to sum |
-| exprs.go:65:5:65:6 | assignment to s2 | exprs.go:67:6:67:8 | skip |
-| exprs.go:65:5:65:6 | skip | exprs.go:65:10:65:13 | sum2 |
-| exprs.go:65:10:65:13 | sum2 | exprs.go:65:15:65:18 | ints |
-| exprs.go:65:10:65:24 | call to sum2 | exprs.go:0:0:0:0 | exit |
-| exprs.go:65:10:65:24 | call to sum2 | exprs.go:65:5:65:6 | assignment to s2 |
+| exprs.go:64:13:64:18 | After call to ints | exprs.go:64:9:64:19 | call to sum |
+| exprs.go:64:13:64:18 | Before call to ints | exprs.go:64:13:64:16 | ints |
+| exprs.go:64:13:64:18 | call to ints | exprs.go:0:0:0:0 | Exceptional Exit |
+| exprs.go:64:13:64:18 | call to ints | exprs.go:64:13:64:18 | After call to ints |
+| exprs.go:65:1:65:24 | After variable declaration | exprs.go:67:1:69:1 | function declaration |
+| exprs.go:65:1:65:24 | variable declaration | exprs.go:65:5:65:24 | value declaration specifier |
+| exprs.go:65:5:65:24 | After value declaration specifier | exprs.go:65:1:65:24 | After variable declaration |
+| exprs.go:65:5:65:24 | assign:0 value declaration specifier | exprs.go:65:5:65:24 | After value declaration specifier |
+| exprs.go:65:5:65:24 | value declaration specifier | exprs.go:65:10:65:24 | Before call to sum2 |
+| exprs.go:65:10:65:13 | sum2 | exprs.go:65:15:65:20 | Before call to ints |
+| exprs.go:65:10:65:24 | After call to sum2 | exprs.go:65:5:65:24 | assign:0 value declaration specifier |
+| exprs.go:65:10:65:24 | Before call to sum2 | exprs.go:65:10:65:13 | sum2 |
+| exprs.go:65:10:65:24 | call to sum2 | exprs.go:0:0:0:0 | Exceptional Exit |
+| exprs.go:65:10:65:24 | call to sum2 | exprs.go:65:10:65:24 | After call to sum2 |
 | exprs.go:65:15:65:18 | ints | exprs.go:65:15:65:20 | call to ints |
-| exprs.go:65:15:65:20 | call to ints | exprs.go:0:0:0:0 | exit |
-| exprs.go:65:15:65:20 | call to ints | exprs.go:65:10:65:24 | call to sum2 |
-| exprs.go:67:1:69:1 | entry | exprs.go:67:10:67:10 | argument corresponding to x |
-| exprs.go:67:1:69:1 | function declaration | exprs.go:71:6:71:8 | skip |
-| exprs.go:67:6:67:8 | skip | exprs.go:67:1:69:1 | function declaration |
-| exprs.go:67:10:67:10 | argument corresponding to x | exprs.go:67:10:67:10 | initialization of x |
-| exprs.go:67:10:67:10 | initialization of x | exprs.go:67:13:67:13 | argument corresponding to y |
-| exprs.go:67:13:67:13 | argument corresponding to y | exprs.go:67:13:67:13 | initialization of y |
-| exprs.go:67:13:67:13 | initialization of y | exprs.go:68:9:68:9 | x |
-| exprs.go:68:2:68:13 | return statement | exprs.go:67:1:69:1 | exit |
+| exprs.go:65:15:65:20 | After call to ints | exprs.go:65:10:65:24 | call to sum2 |
+| exprs.go:65:15:65:20 | Before call to ints | exprs.go:65:15:65:18 | ints |
+| exprs.go:65:15:65:20 | call to ints | exprs.go:0:0:0:0 | Exceptional Exit |
+| exprs.go:65:15:65:20 | call to ints | exprs.go:65:15:65:20 | After call to ints |
+| exprs.go:67:1:69:1 | Entry | exprs.go:67:10:67:10 | x |
+| exprs.go:67:1:69:1 | Normal Exit | exprs.go:67:1:69:1 | Exit |
+| exprs.go:67:1:69:1 | function declaration | exprs.go:71:1:73:1 | function declaration |
+| exprs.go:67:10:67:10 | x | exprs.go:67:13:67:13 | y |
+| exprs.go:67:13:67:13 | y | exprs.go:67:24:69:1 | block statement |
+| exprs.go:67:24:69:1 | block statement | exprs.go:68:2:68:13 | Before return statement |
+| exprs.go:68:2:68:13 | Before return statement | exprs.go:68:9:68:13 | Before ...+... |
+| exprs.go:68:2:68:13 | return statement | exprs.go:67:1:69:1 | Normal Exit |
 | exprs.go:68:9:68:9 | x | exprs.go:68:13:68:13 | y |
-| exprs.go:68:9:68:13 | ...+... | exprs.go:68:2:68:13 | return statement |
+| exprs.go:68:9:68:13 | ...+... | exprs.go:68:9:68:13 | After ...+... |
+| exprs.go:68:9:68:13 | After ...+... | exprs.go:68:2:68:13 | return statement |
+| exprs.go:68:9:68:13 | Before ...+... | exprs.go:68:9:68:9 | x |
 | exprs.go:68:13:68:13 | y | exprs.go:68:9:68:13 | ...+... |
-| exprs.go:71:1:73:1 | entry | exprs.go:72:9:72:9 | 1 |
-| exprs.go:71:1:73:1 | function declaration | exprs.go:75:5:75:6 | skip |
-| exprs.go:71:6:71:8 | skip | exprs.go:71:1:73:1 | function declaration |
-| exprs.go:72:2:72:12 | return statement | exprs.go:71:1:73:1 | exit |
+| exprs.go:71:1:73:1 | Entry | exprs.go:71:23:73:1 | block statement |
+| exprs.go:71:1:73:1 | Normal Exit | exprs.go:71:1:73:1 | Exit |
+| exprs.go:71:1:73:1 | function declaration | exprs.go:75:1:75:19 | variable declaration |
+| exprs.go:71:23:73:1 | block statement | exprs.go:72:2:72:12 | Before return statement |
+| exprs.go:72:2:72:12 | Before return statement | exprs.go:72:9:72:9 | 1 |
+| exprs.go:72:2:72:12 | return statement | exprs.go:71:1:73:1 | Normal Exit |
 | exprs.go:72:9:72:9 | 1 | exprs.go:72:12:72:12 | 2 |
 | exprs.go:72:12:72:12 | 2 | exprs.go:72:2:72:12 | return statement |
-| exprs.go:75:5:75:6 | assignment to s3 | exprs.go:77:6:77:10 | skip |
-| exprs.go:75:5:75:6 | skip | exprs.go:75:10:75:12 | add |
-| exprs.go:75:10:75:12 | add | exprs.go:75:14:75:16 | gen |
-| exprs.go:75:10:75:19 | call to add | exprs.go:0:0:0:0 | exit |
-| exprs.go:75:10:75:19 | call to add | exprs.go:75:5:75:6 | assignment to s3 |
-| exprs.go:75:10:75:19 | call to add[0] | exprs.go:75:10:75:19 | call to add[1] |
-| exprs.go:75:10:75:19 | call to add[1] | exprs.go:75:10:75:19 | call to add |
+| exprs.go:75:1:75:19 | After variable declaration | exprs.go:77:1:79:1 | function declaration |
+| exprs.go:75:1:75:19 | variable declaration | exprs.go:75:5:75:19 | value declaration specifier |
+| exprs.go:75:5:75:19 | After value declaration specifier | exprs.go:75:1:75:19 | After variable declaration |
+| exprs.go:75:5:75:19 | assign:0 value declaration specifier | exprs.go:75:5:75:19 | After value declaration specifier |
+| exprs.go:75:5:75:19 | value declaration specifier | exprs.go:75:10:75:19 | Before call to add |
+| exprs.go:75:10:75:12 | add | exprs.go:75:14:75:18 | Before call to gen |
+| exprs.go:75:10:75:19 | After call to add | exprs.go:75:5:75:19 | assign:0 value declaration specifier |
+| exprs.go:75:10:75:19 | Before call to add | exprs.go:75:10:75:12 | add |
+| exprs.go:75:10:75:19 | call to add | exprs.go:0:0:0:0 | Exceptional Exit |
+| exprs.go:75:10:75:19 | call to add | exprs.go:75:10:75:19 | After call to add |
+| exprs.go:75:10:75:19 | extract:0 call to add | exprs.go:75:10:75:19 | extract:1 call to add |
+| exprs.go:75:10:75:19 | extract:1 call to add | exprs.go:75:10:75:19 | call to add |
 | exprs.go:75:14:75:16 | gen | exprs.go:75:14:75:18 | call to gen |
-| exprs.go:75:14:75:18 | call to gen | exprs.go:0:0:0:0 | exit |
-| exprs.go:75:14:75:18 | call to gen | exprs.go:75:10:75:19 | call to add[0] |
-| exprs.go:77:1:79:1 | entry | exprs.go:77:12:77:12 | argument corresponding to x |
-| exprs.go:77:1:79:1 | function declaration | exprs.go:81:6:81:16 | skip |
-| exprs.go:77:6:77:10 | skip | exprs.go:77:1:79:1 | function declaration |
-| exprs.go:77:12:77:12 | argument corresponding to x | exprs.go:77:12:77:12 | initialization of x |
-| exprs.go:77:12:77:12 | initialization of x | exprs.go:77:15:77:15 | argument corresponding to y |
-| exprs.go:77:15:77:15 | argument corresponding to y | exprs.go:77:15:77:15 | initialization of y |
-| exprs.go:77:15:77:15 | initialization of y | exprs.go:77:18:77:18 | argument corresponding to z |
-| exprs.go:77:18:77:18 | argument corresponding to z | exprs.go:77:18:77:18 | initialization of z |
-| exprs.go:77:18:77:18 | initialization of z | exprs.go:78:11:78:11 | x |
-| exprs.go:78:2:78:22 | return statement | exprs.go:77:1:79:1 | exit |
-| exprs.go:78:9:78:17 | !... | exprs.go:78:9:78:17 | !... is false |
-| exprs.go:78:9:78:17 | !... | exprs.go:78:9:78:17 | !... is true |
-| exprs.go:78:9:78:17 | !... is false | exprs.go:78:22:78:22 | z |
-| exprs.go:78:9:78:17 | !... is true | exprs.go:78:9:78:22 | ...\|\|... |
-| exprs.go:78:9:78:22 | ...\|\|... | exprs.go:78:2:78:22 | return statement |
-| exprs.go:78:11:78:11 | x | exprs.go:78:11:78:11 | x is false |
-| exprs.go:78:11:78:11 | x | exprs.go:78:11:78:11 | x is true |
-| exprs.go:78:11:78:11 | x is false | exprs.go:78:11:78:16 | ...&&... |
-| exprs.go:78:11:78:11 | x is true | exprs.go:78:16:78:16 | y |
-| exprs.go:78:11:78:16 | ...&&... | exprs.go:78:9:78:17 | !... |
-| exprs.go:78:16:78:16 | y | exprs.go:78:11:78:16 | ...&&... |
-| exprs.go:78:22:78:22 | z | exprs.go:78:9:78:22 | ...\|\|... |
-| exprs.go:81:1:87:1 | entry | exprs.go:81:18:81:19 | argument corresponding to ch |
-| exprs.go:81:1:87:1 | function declaration | exprs.go:89:7:89:9 | skip |
-| exprs.go:81:6:81:16 | skip | exprs.go:81:1:87:1 | function declaration |
-| exprs.go:81:18:81:19 | argument corresponding to ch | exprs.go:81:18:81:19 | initialization of ch |
-| exprs.go:81:18:81:19 | initialization of ch | exprs.go:82:2:82:4 | skip |
-| exprs.go:82:2:82:4 | assignment to val | exprs.go:82:2:82:16 | ... := ...[1] |
-| exprs.go:82:2:82:4 | skip | exprs.go:82:7:82:8 | skip |
-| exprs.go:82:2:82:16 | ... := ...[0] | exprs.go:82:2:82:4 | assignment to val |
-| exprs.go:82:2:82:16 | ... := ...[1] | exprs.go:82:7:82:8 | assignment to ok |
-| exprs.go:82:7:82:8 | assignment to ok | exprs.go:83:5:83:6 | ok |
-| exprs.go:82:7:82:8 | skip | exprs.go:82:15:82:16 | ch |
-| exprs.go:82:13:82:16 | <-... | exprs.go:82:2:82:16 | ... := ...[0] |
+| exprs.go:75:14:75:18 | After call to gen | exprs.go:75:10:75:19 | extract:0 call to add |
+| exprs.go:75:14:75:18 | Before call to gen | exprs.go:75:14:75:16 | gen |
+| exprs.go:75:14:75:18 | call to gen | exprs.go:0:0:0:0 | Exceptional Exit |
+| exprs.go:75:14:75:18 | call to gen | exprs.go:75:14:75:18 | After call to gen |
+| exprs.go:77:1:79:1 | Entry | exprs.go:77:12:77:12 | x |
+| exprs.go:77:1:79:1 | Normal Exit | exprs.go:77:1:79:1 | Exit |
+| exprs.go:77:1:79:1 | function declaration | exprs.go:81:1:87:1 | function declaration |
+| exprs.go:77:12:77:12 | x | exprs.go:77:15:77:15 | y |
+| exprs.go:77:15:77:15 | y | exprs.go:77:18:77:18 | z |
+| exprs.go:77:18:77:18 | z | exprs.go:77:31:79:1 | block statement |
+| exprs.go:77:31:79:1 | block statement | exprs.go:78:2:78:22 | Before return statement |
+| exprs.go:78:2:78:22 | Before return statement | exprs.go:78:9:78:22 | ...\|\|... |
+| exprs.go:78:2:78:22 | return statement | exprs.go:77:1:79:1 | Normal Exit |
+| exprs.go:78:9:78:17 | !... | exprs.go:78:11:78:16 | ...&&... |
+| exprs.go:78:9:78:17 | After !... [false] | exprs.go:78:22:78:22 | z |
+| exprs.go:78:9:78:17 | After !... [true] | exprs.go:78:9:78:22 | After ...\|\|... |
+| exprs.go:78:9:78:22 | ...\|\|... | exprs.go:78:9:78:17 | !... |
+| exprs.go:78:9:78:22 | After ...\|\|... | exprs.go:78:2:78:22 | return statement |
+| exprs.go:78:11:78:11 | After x [false] | exprs.go:78:11:78:16 | After ...&&... [false] |
+| exprs.go:78:11:78:11 | After x [true] | exprs.go:78:16:78:16 | y |
+| exprs.go:78:11:78:11 | x | exprs.go:78:11:78:11 | After x [false] |
+| exprs.go:78:11:78:11 | x | exprs.go:78:11:78:11 | After x [true] |
+| exprs.go:78:11:78:16 | ...&&... | exprs.go:78:11:78:11 | x |
+| exprs.go:78:11:78:16 | After ...&&... [false] | exprs.go:78:9:78:17 | After !... [true] |
+| exprs.go:78:11:78:16 | After ...&&... [true] | exprs.go:78:9:78:17 | After !... [false] |
+| exprs.go:78:16:78:16 | After y [false] | exprs.go:78:11:78:16 | After ...&&... [false] |
+| exprs.go:78:16:78:16 | After y [true] | exprs.go:78:11:78:16 | After ...&&... [true] |
+| exprs.go:78:16:78:16 | y | exprs.go:78:16:78:16 | After y [false] |
+| exprs.go:78:16:78:16 | y | exprs.go:78:16:78:16 | After y [true] |
+| exprs.go:78:22:78:22 | z | exprs.go:78:9:78:22 | After ...\|\|... |
+| exprs.go:81:1:87:1 | Entry | exprs.go:81:18:81:19 | ch |
+| exprs.go:81:1:87:1 | Exceptional Exit | exprs.go:81:1:87:1 | Exit |
+| exprs.go:81:1:87:1 | Normal Exit | exprs.go:81:1:87:1 | Exit |
+| exprs.go:81:1:87:1 | function declaration | exprs.go:89:1:89:13 | constant declaration |
+| exprs.go:81:18:81:19 | ch | exprs.go:81:35:87:1 | block statement |
+| exprs.go:81:35:87:1 | block statement | exprs.go:82:2:82:16 | ... := ... |
+| exprs.go:82:2:82:16 | ... := ... | exprs.go:82:13:82:16 | Before <-... |
+| exprs.go:82:2:82:16 | After ... := ... | exprs.go:83:2:85:2 | if statement |
+| exprs.go:82:2:82:16 | extract:0 ... := ... | exprs.go:82:2:82:16 | extract:1 ... := ... |
+| exprs.go:82:2:82:16 | extract:1 ... := ... | exprs.go:82:2:82:16 | After ... := ... |
+| exprs.go:82:13:82:16 | <-... | exprs.go:82:13:82:16 | After <-... |
+| exprs.go:82:13:82:16 | After <-... | exprs.go:82:2:82:16 | extract:0 ... := ... |
+| exprs.go:82:13:82:16 | Before <-... | exprs.go:82:15:82:16 | ch |
 | exprs.go:82:15:82:16 | ch | exprs.go:82:13:82:16 | <-... |
-| exprs.go:83:5:83:6 | ok | exprs.go:83:5:83:6 | ok is false |
-| exprs.go:83:5:83:6 | ok | exprs.go:83:5:83:6 | ok is true |
-| exprs.go:83:5:83:6 | ok is false | exprs.go:86:2:86:6 | panic |
-| exprs.go:83:5:83:6 | ok is true | exprs.go:84:10:84:12 | val |
-| exprs.go:84:3:84:12 | return statement | exprs.go:81:1:87:1 | exit |
+| exprs.go:83:2:85:2 | After if statement | exprs.go:86:2:86:18 | expression statement |
+| exprs.go:83:2:85:2 | if statement | exprs.go:83:5:83:6 | ok |
+| exprs.go:83:5:83:6 | After ok [false] | exprs.go:83:2:85:2 | After if statement |
+| exprs.go:83:5:83:6 | After ok [true] | exprs.go:83:8:85:2 | block statement |
+| exprs.go:83:5:83:6 | ok | exprs.go:83:5:83:6 | After ok [false] |
+| exprs.go:83:5:83:6 | ok | exprs.go:83:5:83:6 | After ok [true] |
+| exprs.go:83:8:85:2 | block statement | exprs.go:84:3:84:12 | Before return statement |
+| exprs.go:84:3:84:12 | Before return statement | exprs.go:84:10:84:12 | val |
+| exprs.go:84:3:84:12 | return statement | exprs.go:81:1:87:1 | Normal Exit |
 | exprs.go:84:10:84:12 | val | exprs.go:84:3:84:12 | return statement |
 | exprs.go:86:2:86:6 | panic | exprs.go:86:8:86:17 | "No value" |
-| exprs.go:86:2:86:18 | call to panic | exprs.go:81:1:87:1 | exit |
+| exprs.go:86:2:86:18 | Before call to panic | exprs.go:86:2:86:6 | panic |
+| exprs.go:86:2:86:18 | call to panic | exprs.go:81:1:87:1 | Exceptional Exit |
+| exprs.go:86:2:86:18 | expression statement | exprs.go:86:2:86:18 | Before call to panic |
 | exprs.go:86:8:86:17 | "No value" | exprs.go:86:2:86:18 | call to panic |
-| exprs.go:89:7:89:9 | assignment to one | exprs.go:91:5:91:5 | skip |
-| exprs.go:89:7:89:9 | skip | exprs.go:89:13:89:13 | 1 |
-| exprs.go:89:13:89:13 | 1 | exprs.go:89:7:89:9 | assignment to one |
-| exprs.go:91:5:91:5 | assignment to a | exprs.go:93:6:93:11 | skip |
-| exprs.go:91:5:91:5 | skip | exprs.go:91:9:91:25 | slice literal |
-| exprs.go:91:9:91:25 | slice literal | exprs.go:91:15:91:21 | ...+... |
-| exprs.go:91:15:91:21 | ...+... | exprs.go:91:24:91:24 | 2 |
-| exprs.go:91:15:91:24 | init of key-value pair | exprs.go:91:5:91:5 | assignment to a |
-| exprs.go:91:24:91:24 | 2 | exprs.go:91:15:91:24 | init of key-value pair |
-| exprs.go:93:1:95:1 | entry | exprs.go:93:13:93:13 | argument corresponding to x |
-| exprs.go:93:1:95:1 | function declaration | exprs.go:0:0:0:0 | exit |
-| exprs.go:93:6:93:11 | skip | exprs.go:93:1:95:1 | function declaration |
-| exprs.go:93:13:93:13 | argument corresponding to x | exprs.go:93:13:93:13 | initialization of x |
-| exprs.go:93:13:93:13 | initialization of x | exprs.go:93:16:93:16 | argument corresponding to y |
-| exprs.go:93:16:93:16 | argument corresponding to y | exprs.go:93:16:93:16 | initialization of y |
-| exprs.go:93:16:93:16 | initialization of y | exprs.go:93:19:93:19 | argument corresponding to z |
-| exprs.go:93:19:93:19 | argument corresponding to z | exprs.go:93:19:93:19 | initialization of z |
-| exprs.go:93:19:93:19 | initialization of z | exprs.go:94:10:94:10 | x |
-| exprs.go:94:2:94:21 | return statement | exprs.go:93:1:95:1 | exit |
-| exprs.go:94:9:94:16 | (...) is false | exprs.go:94:21:94:21 | z |
-| exprs.go:94:9:94:16 | (...) is true | exprs.go:94:9:94:21 | ...\|\|... |
-| exprs.go:94:9:94:21 | ...\|\|... | exprs.go:94:2:94:21 | return statement |
-| exprs.go:94:10:94:10 | x | exprs.go:94:10:94:10 | x is false |
-| exprs.go:94:10:94:10 | x | exprs.go:94:10:94:10 | x is true |
-| exprs.go:94:10:94:10 | x is false | exprs.go:94:9:94:16 | (...) is false |
-| exprs.go:94:10:94:10 | x is true | exprs.go:94:15:94:15 | y |
-| exprs.go:94:15:94:15 | y | exprs.go:94:9:94:16 | (...) is false |
-| exprs.go:94:15:94:15 | y | exprs.go:94:9:94:16 | (...) is true |
-| exprs.go:94:21:94:21 | z | exprs.go:94:9:94:21 | ...\|\|... |
-| generic.go:0:0:0:0 | entry | generic.go:3:1:5:1 | skip |
-| generic.go:3:1:5:1 | skip | generic.go:7:28:7:35 | skip |
-| generic.go:7:1:7:55 | entry | generic.go:7:7:7:7 | argument corresponding to g |
-| generic.go:7:1:7:55 | function declaration | generic.go:9:1:12:1 | skip |
-| generic.go:7:7:7:7 | argument corresponding to g | generic.go:7:7:7:7 | initialization of g |
-| generic.go:7:7:7:7 | initialization of g | generic.go:7:37:7:37 | argument corresponding to u |
-| generic.go:7:28:7:35 | skip | generic.go:7:1:7:55 | function declaration |
-| generic.go:7:37:7:37 | argument corresponding to u | generic.go:7:37:7:37 | initialization of u |
-| generic.go:7:37:7:37 | initialization of u | generic.go:7:53:7:53 | u |
-| generic.go:7:46:7:53 | return statement | generic.go:7:1:7:55 | exit |
+| exprs.go:89:1:89:13 | After constant declaration | exprs.go:91:1:91:25 | variable declaration |
+| exprs.go:89:1:89:13 | constant declaration | exprs.go:89:7:89:13 | value declaration specifier |
+| exprs.go:89:7:89:13 | After value declaration specifier | exprs.go:89:1:89:13 | After constant declaration |
+| exprs.go:89:7:89:13 | assign:0 value declaration specifier | exprs.go:89:7:89:13 | After value declaration specifier |
+| exprs.go:89:7:89:13 | value declaration specifier | exprs.go:89:13:89:13 | 1 |
+| exprs.go:89:13:89:13 | 1 | exprs.go:89:7:89:13 | assign:0 value declaration specifier |
+| exprs.go:91:1:91:25 | After variable declaration | exprs.go:93:1:95:1 | function declaration |
+| exprs.go:91:1:91:25 | variable declaration | exprs.go:91:5:91:25 | value declaration specifier |
+| exprs.go:91:5:91:25 | After value declaration specifier | exprs.go:91:1:91:25 | After variable declaration |
+| exprs.go:91:5:91:25 | assign:0 value declaration specifier | exprs.go:91:5:91:25 | After value declaration specifier |
+| exprs.go:91:5:91:25 | value declaration specifier | exprs.go:91:9:91:25 | Before slice literal |
+| exprs.go:91:9:91:25 | After slice literal | exprs.go:91:5:91:25 | assign:0 value declaration specifier |
+| exprs.go:91:9:91:25 | Before slice literal | exprs.go:91:9:91:25 | slice literal |
+| exprs.go:91:9:91:25 | slice literal | exprs.go:91:15:91:24 | Before key-value pair |
+| exprs.go:91:15:91:21 | ...+... | exprs.go:91:15:91:21 | After ...+... |
+| exprs.go:91:15:91:21 | After ...+... | exprs.go:91:24:91:24 | 2 |
+| exprs.go:91:15:91:21 | Before ...+... | exprs.go:91:15:91:21 | ...+... |
+| exprs.go:91:15:91:24 | After key-value pair | exprs.go:91:15:91:24 | lit-init key-value pair |
+| exprs.go:91:15:91:24 | Before key-value pair | exprs.go:91:15:91:21 | Before ...+... |
+| exprs.go:91:15:91:24 | key-value pair | exprs.go:91:15:91:24 | After key-value pair |
+| exprs.go:91:15:91:24 | lit-init key-value pair | exprs.go:91:9:91:25 | After slice literal |
+| exprs.go:91:24:91:24 | 2 | exprs.go:91:15:91:24 | key-value pair |
+| exprs.go:93:1:95:1 | Entry | exprs.go:93:13:93:13 | x |
+| exprs.go:93:1:95:1 | Normal Exit | exprs.go:93:1:95:1 | Exit |
+| exprs.go:93:1:95:1 | function declaration | exprs.go:0:0:0:0 | After exprs.go |
+| exprs.go:93:13:93:13 | x | exprs.go:93:16:93:16 | y |
+| exprs.go:93:16:93:16 | y | exprs.go:93:19:93:19 | z |
+| exprs.go:93:19:93:19 | z | exprs.go:93:32:95:1 | block statement |
+| exprs.go:93:32:95:1 | block statement | exprs.go:94:2:94:21 | Before return statement |
+| exprs.go:94:2:94:21 | Before return statement | exprs.go:94:9:94:21 | ...\|\|... |
+| exprs.go:94:2:94:21 | return statement | exprs.go:93:1:95:1 | Normal Exit |
+| exprs.go:94:9:94:21 | ...\|\|... | exprs.go:94:10:94:15 | ...&&... |
+| exprs.go:94:9:94:21 | After ...\|\|... | exprs.go:94:2:94:21 | return statement |
+| exprs.go:94:10:94:10 | After x [false] | exprs.go:94:10:94:15 | After ...&&... [false] |
+| exprs.go:94:10:94:10 | After x [true] | exprs.go:94:15:94:15 | y |
+| exprs.go:94:10:94:10 | x | exprs.go:94:10:94:10 | After x [false] |
+| exprs.go:94:10:94:10 | x | exprs.go:94:10:94:10 | After x [true] |
+| exprs.go:94:10:94:15 | ...&&... | exprs.go:94:10:94:10 | x |
+| exprs.go:94:10:94:15 | After ...&&... [false] | exprs.go:94:21:94:21 | z |
+| exprs.go:94:10:94:15 | After ...&&... [true] | exprs.go:94:9:94:21 | After ...\|\|... |
+| exprs.go:94:15:94:15 | After y [false] | exprs.go:94:10:94:15 | After ...&&... [false] |
+| exprs.go:94:15:94:15 | After y [true] | exprs.go:94:10:94:15 | After ...&&... [true] |
+| exprs.go:94:15:94:15 | y | exprs.go:94:15:94:15 | After y [false] |
+| exprs.go:94:15:94:15 | y | exprs.go:94:15:94:15 | After y [true] |
+| exprs.go:94:21:94:21 | z | exprs.go:94:9:94:21 | After ...\|\|... |
+| generic.go:0:0:0:0 | After generic.go | generic.go:0:0:0:0 | Normal Exit |
+| generic.go:0:0:0:0 | Entry | generic.go:0:0:0:0 | generic.go |
+| generic.go:0:0:0:0 | Normal Exit | generic.go:0:0:0:0 | Exit |
+| generic.go:0:0:0:0 | generic.go | generic.go:3:1:5:1 | type declaration |
+| generic.go:3:1:5:1 | type declaration | generic.go:7:1:7:55 | function declaration |
+| generic.go:7:1:7:55 | Entry | generic.go:7:7:7:7 | g |
+| generic.go:7:1:7:55 | Normal Exit | generic.go:7:1:7:55 | Exit |
+| generic.go:7:1:7:55 | function declaration | generic.go:9:1:12:1 | type declaration |
+| generic.go:7:7:7:7 | g | generic.go:7:37:7:37 | u |
+| generic.go:7:37:7:37 | u | generic.go:7:44:7:55 | block statement |
+| generic.go:7:44:7:55 | block statement | generic.go:7:46:7:53 | Before return statement |
+| generic.go:7:46:7:53 | Before return statement | generic.go:7:53:7:53 | u |
+| generic.go:7:46:7:53 | return statement | generic.go:7:1:7:55 | Normal Exit |
 | generic.go:7:53:7:53 | u | generic.go:7:46:7:53 | return statement |
-| generic.go:9:1:12:1 | skip | generic.go:14:31:14:39 | skip |
-| generic.go:14:1:14:59 | entry | generic.go:14:7:14:7 | argument corresponding to g |
-| generic.go:14:1:14:59 | function declaration | generic.go:16:6:16:21 | skip |
-| generic.go:14:7:14:7 | argument corresponding to g | generic.go:14:7:14:7 | initialization of g |
-| generic.go:14:7:14:7 | initialization of g | generic.go:14:41:14:41 | argument corresponding to u |
-| generic.go:14:31:14:39 | skip | generic.go:14:1:14:59 | function declaration |
-| generic.go:14:41:14:41 | argument corresponding to u | generic.go:14:41:14:41 | initialization of u |
-| generic.go:14:41:14:41 | initialization of u | generic.go:14:57:14:57 | u |
-| generic.go:14:50:14:57 | return statement | generic.go:14:1:14:59 | exit |
+| generic.go:9:1:12:1 | type declaration | generic.go:14:1:14:59 | function declaration |
+| generic.go:14:1:14:59 | Entry | generic.go:14:7:14:7 | g |
+| generic.go:14:1:14:59 | Normal Exit | generic.go:14:1:14:59 | Exit |
+| generic.go:14:1:14:59 | function declaration | generic.go:16:1:18:1 | function declaration |
+| generic.go:14:7:14:7 | g | generic.go:14:41:14:41 | u |
+| generic.go:14:41:14:41 | u | generic.go:14:48:14:59 | block statement |
+| generic.go:14:48:14:59 | block statement | generic.go:14:50:14:57 | Before return statement |
+| generic.go:14:50:14:57 | Before return statement | generic.go:14:57:14:57 | u |
+| generic.go:14:50:14:57 | return statement | generic.go:14:1:14:59 | Normal Exit |
 | generic.go:14:57:14:57 | u | generic.go:14:50:14:57 | return statement |
-| generic.go:16:1:18:1 | entry | generic.go:16:30:16:30 | argument corresponding to t |
-| generic.go:16:1:18:1 | function declaration | generic.go:20:6:20:21 | skip |
-| generic.go:16:6:16:21 | skip | generic.go:16:1:18:1 | function declaration |
-| generic.go:16:30:16:30 | argument corresponding to t | generic.go:16:30:16:30 | initialization of t |
-| generic.go:16:30:16:30 | initialization of t | generic.go:17:9:17:9 | t |
-| generic.go:17:2:17:9 | return statement | generic.go:16:1:18:1 | exit |
+| generic.go:16:1:18:1 | Entry | generic.go:16:30:16:30 | t |
+| generic.go:16:1:18:1 | Normal Exit | generic.go:16:1:18:1 | Exit |
+| generic.go:16:1:18:1 | function declaration | generic.go:20:1:22:1 | function declaration |
+| generic.go:16:30:16:30 | t | generic.go:16:37:18:1 | block statement |
+| generic.go:16:37:18:1 | block statement | generic.go:17:2:17:9 | Before return statement |
+| generic.go:17:2:17:9 | Before return statement | generic.go:17:9:17:9 | t |
+| generic.go:17:2:17:9 | return statement | generic.go:16:1:18:1 | Normal Exit |
 | generic.go:17:9:17:9 | t | generic.go:17:2:17:9 | return statement |
-| generic.go:20:1:22:1 | entry | generic.go:20:33:20:33 | argument corresponding to s |
-| generic.go:20:1:22:1 | function declaration | generic.go:24:6:24:12 | skip |
-| generic.go:20:6:20:21 | skip | generic.go:20:1:22:1 | function declaration |
-| generic.go:20:33:20:33 | argument corresponding to s | generic.go:20:33:20:33 | initialization of s |
-| generic.go:20:33:20:33 | initialization of s | generic.go:20:38:20:38 | argument corresponding to t |
-| generic.go:20:38:20:38 | argument corresponding to t | generic.go:20:38:20:38 | initialization of t |
-| generic.go:20:38:20:38 | initialization of t | generic.go:21:9:21:9 | s |
-| generic.go:21:2:21:12 | return statement | generic.go:20:1:22:1 | exit |
+| generic.go:20:1:22:1 | Entry | generic.go:20:33:20:33 | s |
+| generic.go:20:1:22:1 | Normal Exit | generic.go:20:1:22:1 | Exit |
+| generic.go:20:1:22:1 | function declaration | generic.go:24:1:35:1 | function declaration |
+| generic.go:20:33:20:33 | s | generic.go:20:38:20:38 | t |
+| generic.go:20:38:20:38 | t | generic.go:20:50:22:1 | block statement |
+| generic.go:20:50:22:1 | block statement | generic.go:21:2:21:12 | Before return statement |
+| generic.go:21:2:21:12 | Before return statement | generic.go:21:9:21:9 | s |
+| generic.go:21:2:21:12 | return statement | generic.go:20:1:22:1 | Normal Exit |
 | generic.go:21:9:21:9 | s | generic.go:21:12:21:12 | t |
 | generic.go:21:12:21:12 | t | generic.go:21:2:21:12 | return statement |
-| generic.go:24:1:35:1 | entry | generic.go:25:2:25:4 | skip |
-| generic.go:24:1:35:1 | function declaration | generic.go:0:0:0:0 | exit |
-| generic.go:24:6:24:12 | skip | generic.go:24:1:35:1 | function declaration |
-| generic.go:25:2:25:4 | assignment to gs1 | generic.go:26:2:26:2 | skip |
-| generic.go:25:2:25:4 | skip | generic.go:25:9:25:35 | struct literal |
+| generic.go:24:1:35:1 | Entry | generic.go:24:16:35:1 | block statement |
+| generic.go:24:1:35:1 | Exceptional Exit | generic.go:24:1:35:1 | Exit |
+| generic.go:24:1:35:1 | Normal Exit | generic.go:24:1:35:1 | Exit |
+| generic.go:24:1:35:1 | function declaration | generic.go:0:0:0:0 | After generic.go |
+| generic.go:24:16:35:1 | After block statement | generic.go:24:1:35:1 | Normal Exit |
+| generic.go:24:16:35:1 | block statement | generic.go:25:2:25:35 | ... := ... |
+| generic.go:25:2:25:35 | ... := ... | generic.go:25:9:25:35 | Before struct literal |
+| generic.go:25:2:25:35 | After ... := ... | generic.go:26:2:26:27 | ... := ... |
+| generic.go:25:2:25:35 | assign:0 ... := ... | generic.go:25:2:25:35 | After ... := ... |
+| generic.go:25:9:25:35 | After struct literal | generic.go:25:2:25:35 | assign:0 ... := ... |
+| generic.go:25:9:25:35 | Before struct literal | generic.go:25:9:25:35 | struct literal |
 | generic.go:25:9:25:35 | struct literal | generic.go:25:32:25:34 | "x" |
-| generic.go:25:32:25:34 | "x" | generic.go:25:32:25:34 | init of "x" |
-| generic.go:25:32:25:34 | init of "x" | generic.go:25:2:25:4 | assignment to gs1 |
-| generic.go:26:2:26:2 | assignment to a | generic.go:27:2:27:4 | skip |
-| generic.go:26:2:26:2 | skip | generic.go:26:7:26:9 | gs1 |
+| generic.go:25:32:25:34 | "x" | generic.go:25:32:25:34 | After "x" |
+| generic.go:25:32:25:34 | After "x" | generic.go:25:32:25:34 | lit-init "x" |
+| generic.go:25:32:25:34 | lit-init "x" | generic.go:25:9:25:35 | After struct literal |
+| generic.go:26:2:26:27 | ... := ... | generic.go:26:7:26:27 | Before call to Identity |
+| generic.go:26:2:26:27 | After ... := ... | generic.go:27:2:27:48 | ... := ... |
+| generic.go:26:2:26:27 | assign:0 ... := ... | generic.go:26:2:26:27 | After ... := ... |
 | generic.go:26:7:26:9 | gs1 | generic.go:26:7:26:18 | selection of Identity |
-| generic.go:26:7:26:18 | selection of Identity | generic.go:26:20:26:26 | "hello" |
-| generic.go:26:7:26:27 | call to Identity | generic.go:24:1:35:1 | exit |
-| generic.go:26:7:26:27 | call to Identity | generic.go:26:2:26:2 | assignment to a |
+| generic.go:26:7:26:18 | After selection of Identity | generic.go:26:20:26:26 | "hello" |
+| generic.go:26:7:26:18 | Before selection of Identity | generic.go:26:7:26:9 | gs1 |
+| generic.go:26:7:26:18 | selection of Identity | generic.go:26:7:26:18 | After selection of Identity |
+| generic.go:26:7:26:27 | After call to Identity | generic.go:26:2:26:27 | assign:0 ... := ... |
+| generic.go:26:7:26:27 | Before call to Identity | generic.go:26:7:26:18 | Before selection of Identity |
+| generic.go:26:7:26:27 | call to Identity | generic.go:24:1:35:1 | Exceptional Exit |
+| generic.go:26:7:26:27 | call to Identity | generic.go:26:7:26:27 | After call to Identity |
 | generic.go:26:20:26:26 | "hello" | generic.go:26:7:26:27 | call to Identity |
-| generic.go:27:2:27:4 | assignment to gs2 | generic.go:28:2:28:2 | skip |
-| generic.go:27:2:27:4 | skip | generic.go:27:9:27:48 | struct literal |
+| generic.go:27:2:27:48 | ... := ... | generic.go:27:9:27:48 | Before struct literal |
+| generic.go:27:2:27:48 | After ... := ... | generic.go:28:2:28:22 | ... := ... |
+| generic.go:27:2:27:48 | assign:0 ... := ... | generic.go:27:2:27:48 | After ... := ... |
+| generic.go:27:9:27:48 | After struct literal | generic.go:27:2:27:48 | assign:0 ... := ... |
+| generic.go:27:9:27:48 | Before struct literal | generic.go:27:9:27:48 | struct literal |
 | generic.go:27:9:27:48 | struct literal | generic.go:27:40:27:42 | "y" |
-| generic.go:27:40:27:42 | "y" | generic.go:27:40:27:42 | init of "y" |
-| generic.go:27:40:27:42 | init of "y" | generic.go:27:45:27:47 | "z" |
-| generic.go:27:45:27:47 | "z" | generic.go:27:45:27:47 | init of "z" |
-| generic.go:27:45:27:47 | init of "z" | generic.go:27:2:27:4 | assignment to gs2 |
-| generic.go:28:2:28:2 | assignment to b | generic.go:29:2:29:2 | skip |
-| generic.go:28:2:28:2 | skip | generic.go:28:7:28:9 | gs2 |
+| generic.go:27:40:27:42 | "y" | generic.go:27:40:27:42 | After "y" |
+| generic.go:27:40:27:42 | After "y" | generic.go:27:40:27:42 | lit-init "y" |
+| generic.go:27:40:27:42 | lit-init "y" | generic.go:27:45:27:47 | "z" |
+| generic.go:27:45:27:47 | "z" | generic.go:27:45:27:47 | After "z" |
+| generic.go:27:45:27:47 | After "z" | generic.go:27:45:27:47 | lit-init "z" |
+| generic.go:27:45:27:47 | lit-init "z" | generic.go:27:9:27:48 | After struct literal |
+| generic.go:28:2:28:22 | ... := ... | generic.go:28:7:28:22 | Before call to Identity1 |
+| generic.go:28:2:28:22 | After ... := ... | generic.go:29:2:29:33 | ... := ... |
+| generic.go:28:2:28:22 | assign:0 ... := ... | generic.go:28:2:28:22 | After ... := ... |
 | generic.go:28:7:28:9 | gs2 | generic.go:28:7:28:19 | selection of Identity1 |
-| generic.go:28:7:28:19 | selection of Identity1 | generic.go:28:21:28:21 | a |
-| generic.go:28:7:28:22 | call to Identity1 | generic.go:24:1:35:1 | exit |
-| generic.go:28:7:28:22 | call to Identity1 | generic.go:28:2:28:2 | assignment to b |
+| generic.go:28:7:28:19 | After selection of Identity1 | generic.go:28:21:28:21 | a |
+| generic.go:28:7:28:19 | Before selection of Identity1 | generic.go:28:7:28:9 | gs2 |
+| generic.go:28:7:28:19 | selection of Identity1 | generic.go:28:7:28:19 | After selection of Identity1 |
+| generic.go:28:7:28:22 | After call to Identity1 | generic.go:28:2:28:22 | assign:0 ... := ... |
+| generic.go:28:7:28:22 | Before call to Identity1 | generic.go:28:7:28:19 | Before selection of Identity1 |
+| generic.go:28:7:28:22 | call to Identity1 | generic.go:24:1:35:1 | Exceptional Exit |
+| generic.go:28:7:28:22 | call to Identity1 | generic.go:28:7:28:22 | After call to Identity1 |
 | generic.go:28:21:28:21 | a | generic.go:28:7:28:22 | call to Identity1 |
-| generic.go:29:2:29:2 | assignment to c | generic.go:30:2:30:2 | skip |
-| generic.go:29:2:29:2 | skip | generic.go:29:7:29:22 | genericIdentity1 |
-| generic.go:29:7:29:22 | genericIdentity1 | generic.go:29:32:29:32 | b |
-| generic.go:29:7:29:33 | call to genericIdentity1 | generic.go:24:1:35:1 | exit |
-| generic.go:29:7:29:33 | call to genericIdentity1 | generic.go:29:2:29:2 | assignment to c |
+| generic.go:29:2:29:33 | ... := ... | generic.go:29:7:29:33 | Before call to genericIdentity1 |
+| generic.go:29:2:29:33 | After ... := ... | generic.go:30:2:30:25 | ... := ... |
+| generic.go:29:2:29:33 | assign:0 ... := ... | generic.go:29:2:29:33 | After ... := ... |
+| generic.go:29:7:29:22 | genericIdentity1 | generic.go:29:7:29:30 | generic function instantiation expression |
+| generic.go:29:7:29:30 | After generic function instantiation expression | generic.go:29:32:29:32 | b |
+| generic.go:29:7:29:30 | Before generic function instantiation expression | generic.go:29:7:29:22 | genericIdentity1 |
+| generic.go:29:7:29:30 | generic function instantiation expression | generic.go:29:7:29:30 | After generic function instantiation expression |
+| generic.go:29:7:29:33 | After call to genericIdentity1 | generic.go:29:2:29:33 | assign:0 ... := ... |
+| generic.go:29:7:29:33 | Before call to genericIdentity1 | generic.go:29:7:29:30 | Before generic function instantiation expression |
+| generic.go:29:7:29:33 | call to genericIdentity1 | generic.go:24:1:35:1 | Exceptional Exit |
+| generic.go:29:7:29:33 | call to genericIdentity1 | generic.go:29:7:29:33 | After call to genericIdentity1 |
 | generic.go:29:32:29:32 | b | generic.go:29:7:29:33 | call to genericIdentity1 |
-| generic.go:30:2:30:2 | assignment to d | generic.go:31:2:31:2 | skip |
-| generic.go:30:2:30:2 | skip | generic.go:30:7:30:22 | genericIdentity1 |
+| generic.go:30:2:30:25 | ... := ... | generic.go:30:7:30:25 | Before call to genericIdentity1 |
+| generic.go:30:2:30:25 | After ... := ... | generic.go:31:2:31:53 | ... := ... |
+| generic.go:30:2:30:25 | assign:0 ... := ... | generic.go:30:2:30:25 | After ... := ... |
 | generic.go:30:7:30:22 | genericIdentity1 | generic.go:30:24:30:24 | c |
-| generic.go:30:7:30:25 | call to genericIdentity1 | generic.go:24:1:35:1 | exit |
-| generic.go:30:7:30:25 | call to genericIdentity1 | generic.go:30:2:30:2 | assignment to d |
+| generic.go:30:7:30:25 | After call to genericIdentity1 | generic.go:30:2:30:25 | assign:0 ... := ... |
+| generic.go:30:7:30:25 | Before call to genericIdentity1 | generic.go:30:7:30:22 | genericIdentity1 |
+| generic.go:30:7:30:25 | call to genericIdentity1 | generic.go:24:1:35:1 | Exceptional Exit |
+| generic.go:30:7:30:25 | call to genericIdentity1 | generic.go:30:7:30:25 | After call to genericIdentity1 |
 | generic.go:30:24:30:24 | c | generic.go:30:7:30:25 | call to genericIdentity1 |
-| generic.go:31:2:31:2 | assignment to e | generic.go:31:2:31:53 | ... := ...[1] |
-| generic.go:31:2:31:2 | skip | generic.go:31:5:31:5 | skip |
-| generic.go:31:2:31:53 | ... := ...[0] | generic.go:31:2:31:2 | assignment to e |
-| generic.go:31:2:31:53 | ... := ...[1] | generic.go:31:5:31:5 | assignment to f |
-| generic.go:31:5:31:5 | assignment to f | generic.go:32:2:32:2 | skip |
-| generic.go:31:5:31:5 | skip | generic.go:31:10:31:25 | genericIdentity2 |
-| generic.go:31:10:31:25 | genericIdentity2 | generic.go:31:43:31:43 | d |
-| generic.go:31:10:31:53 | call to genericIdentity2 | generic.go:24:1:35:1 | exit |
-| generic.go:31:10:31:53 | call to genericIdentity2 | generic.go:31:2:31:53 | ... := ...[0] |
+| generic.go:31:2:31:53 | ... := ... | generic.go:31:10:31:53 | Before call to genericIdentity2 |
+| generic.go:31:2:31:53 | After ... := ... | generic.go:32:2:32:31 | ... := ... |
+| generic.go:31:2:31:53 | extract:0 ... := ... | generic.go:31:2:31:53 | extract:1 ... := ... |
+| generic.go:31:2:31:53 | extract:1 ... := ... | generic.go:31:2:31:53 | After ... := ... |
+| generic.go:31:10:31:25 | genericIdentity2 | generic.go:31:10:31:41 | generic function instantiation expression |
+| generic.go:31:10:31:41 | After generic function instantiation expression | generic.go:31:43:31:43 | d |
+| generic.go:31:10:31:41 | Before generic function instantiation expression | generic.go:31:10:31:25 | genericIdentity2 |
+| generic.go:31:10:31:41 | generic function instantiation expression | generic.go:31:10:31:41 | After generic function instantiation expression |
+| generic.go:31:10:31:53 | After call to genericIdentity2 | generic.go:31:2:31:53 | extract:0 ... := ... |
+| generic.go:31:10:31:53 | Before call to genericIdentity2 | generic.go:31:10:31:41 | Before generic function instantiation expression |
+| generic.go:31:10:31:53 | call to genericIdentity2 | generic.go:24:1:35:1 | Exceptional Exit |
+| generic.go:31:10:31:53 | call to genericIdentity2 | generic.go:31:10:31:53 | After call to genericIdentity2 |
 | generic.go:31:43:31:43 | d | generic.go:31:46:31:52 | "hello" |
 | generic.go:31:46:31:52 | "hello" | generic.go:31:10:31:53 | call to genericIdentity2 |
-| generic.go:32:2:32:2 | assignment to g | generic.go:32:2:32:31 | ... := ...[1] |
-| generic.go:32:2:32:2 | skip | generic.go:32:5:32:5 | skip |
-| generic.go:32:2:32:31 | ... := ...[0] | generic.go:32:2:32:2 | assignment to g |
-| generic.go:32:2:32:31 | ... := ...[1] | generic.go:32:5:32:5 | assignment to h |
-| generic.go:32:5:32:5 | assignment to h | generic.go:33:2:33:2 | skip |
-| generic.go:32:5:32:5 | skip | generic.go:32:10:32:25 | genericIdentity2 |
+| generic.go:32:2:32:31 | ... := ... | generic.go:32:10:32:31 | Before call to genericIdentity2 |
+| generic.go:32:2:32:31 | After ... := ... | generic.go:33:2:33:6 | ... = ... |
+| generic.go:32:2:32:31 | extract:0 ... := ... | generic.go:32:2:32:31 | extract:1 ... := ... |
+| generic.go:32:2:32:31 | extract:1 ... := ... | generic.go:32:2:32:31 | After ... := ... |
 | generic.go:32:10:32:25 | genericIdentity2 | generic.go:32:27:32:27 | e |
-| generic.go:32:10:32:31 | call to genericIdentity2 | generic.go:24:1:35:1 | exit |
-| generic.go:32:10:32:31 | call to genericIdentity2 | generic.go:32:2:32:31 | ... := ...[0] |
+| generic.go:32:10:32:31 | After call to genericIdentity2 | generic.go:32:2:32:31 | extract:0 ... := ... |
+| generic.go:32:10:32:31 | Before call to genericIdentity2 | generic.go:32:10:32:25 | genericIdentity2 |
+| generic.go:32:10:32:31 | call to genericIdentity2 | generic.go:24:1:35:1 | Exceptional Exit |
+| generic.go:32:10:32:31 | call to genericIdentity2 | generic.go:32:10:32:31 | After call to genericIdentity2 |
 | generic.go:32:27:32:27 | e | generic.go:32:30:32:30 | f |
 | generic.go:32:30:32:30 | f | generic.go:32:10:32:31 | call to genericIdentity2 |
-| generic.go:33:2:33:2 | skip | generic.go:33:6:33:6 | g |
-| generic.go:33:6:33:6 | g | generic.go:34:2:34:2 | skip |
-| generic.go:34:2:34:2 | skip | generic.go:34:6:34:6 | h |
-| generic.go:34:6:34:6 | h | generic.go:24:1:35:1 | exit |
-| hello.go:0:0:0:0 | entry | hello.go:3:1:3:12 | skip |
-| hello.go:3:1:3:12 | skip | hello.go:5:7:5:13 | skip |
-| hello.go:5:7:5:13 | assignment to message | hello.go:7:6:7:13 | skip |
-| hello.go:5:7:5:13 | skip | hello.go:5:17:5:31 | "Hello, world!" |
-| hello.go:5:17:5:31 | "Hello, world!" | hello.go:5:7:5:13 | assignment to message |
-| hello.go:7:1:9:1 | entry | hello.go:8:2:8:12 | selection of Println |
-| hello.go:7:1:9:1 | function declaration | hello.go:0:0:0:0 | exit |
-| hello.go:7:6:7:13 | skip | hello.go:7:1:9:1 | function declaration |
-| hello.go:8:2:8:12 | selection of Println | hello.go:8:14:8:20 | message |
-| hello.go:8:2:8:21 | call to Println | hello.go:7:1:9:1 | exit |
+| generic.go:33:2:33:6 | ... = ... | generic.go:33:6:33:6 | g |
+| generic.go:33:2:33:6 | After ... = ... | generic.go:34:2:34:6 | ... = ... |
+| generic.go:33:6:33:6 | g | generic.go:33:2:33:6 | After ... = ... |
+| generic.go:34:2:34:6 | ... = ... | generic.go:34:6:34:6 | h |
+| generic.go:34:2:34:6 | After ... = ... | generic.go:24:16:35:1 | After block statement |
+| generic.go:34:6:34:6 | h | generic.go:34:2:34:6 | After ... = ... |
+| hello.go:0:0:0:0 | After hello.go | hello.go:0:0:0:0 | Normal Exit |
+| hello.go:0:0:0:0 | Entry | hello.go:0:0:0:0 | hello.go |
+| hello.go:0:0:0:0 | Normal Exit | hello.go:0:0:0:0 | Exit |
+| hello.go:0:0:0:0 | hello.go | hello.go:3:1:3:12 | import declaration |
+| hello.go:3:1:3:12 | import declaration | hello.go:5:1:5:31 | constant declaration |
+| hello.go:5:1:5:31 | After constant declaration | hello.go:7:1:9:1 | function declaration |
+| hello.go:5:1:5:31 | constant declaration | hello.go:5:7:5:31 | value declaration specifier |
+| hello.go:5:7:5:31 | After value declaration specifier | hello.go:5:1:5:31 | After constant declaration |
+| hello.go:5:7:5:31 | assign:0 value declaration specifier | hello.go:5:7:5:31 | After value declaration specifier |
+| hello.go:5:7:5:31 | value declaration specifier | hello.go:5:17:5:31 | "Hello, world!" |
+| hello.go:5:17:5:31 | "Hello, world!" | hello.go:5:7:5:31 | assign:0 value declaration specifier |
+| hello.go:7:1:9:1 | Entry | hello.go:7:17:9:1 | block statement |
+| hello.go:7:1:9:1 | Exceptional Exit | hello.go:7:1:9:1 | Exit |
+| hello.go:7:1:9:1 | Normal Exit | hello.go:7:1:9:1 | Exit |
+| hello.go:7:1:9:1 | function declaration | hello.go:0:0:0:0 | After hello.go |
+| hello.go:7:17:9:1 | After block statement | hello.go:7:1:9:1 | Normal Exit |
+| hello.go:7:17:9:1 | block statement | hello.go:8:2:8:21 | expression statement |
+| hello.go:8:2:8:12 | After selection of Println | hello.go:8:14:8:20 | message |
+| hello.go:8:2:8:12 | Before selection of Println | hello.go:8:2:8:12 | selection of Println |
+| hello.go:8:2:8:12 | selection of Println | hello.go:8:2:8:12 | After selection of Println |
+| hello.go:8:2:8:21 | After call to Println | hello.go:8:2:8:21 | After expression statement |
+| hello.go:8:2:8:21 | After expression statement | hello.go:7:17:9:1 | After block statement |
+| hello.go:8:2:8:21 | Before call to Println | hello.go:8:2:8:12 | Before selection of Println |
+| hello.go:8:2:8:21 | call to Println | hello.go:7:1:9:1 | Exceptional Exit |
+| hello.go:8:2:8:21 | call to Println | hello.go:8:2:8:21 | After call to Println |
+| hello.go:8:2:8:21 | expression statement | hello.go:8:2:8:21 | Before call to Println |
 | hello.go:8:14:8:20 | message | hello.go:8:2:8:21 | call to Println |
-| main.go:0:0:0:0 | entry | main.go:3:1:6:1 | skip |
-| main.go:3:1:6:1 | skip | main.go:8:6:8:9 | skip |
-| main.go:8:1:10:1 | entry | main.go:9:9:9:20 | selection of Float64 |
-| main.go:8:1:10:1 | function declaration | main.go:12:6:12:9 | skip |
-| main.go:8:6:8:9 | skip | main.go:8:1:10:1 | function declaration |
-| main.go:9:2:9:29 | return statement | main.go:8:1:10:1 | exit |
-| main.go:9:9:9:20 | selection of Float64 | main.go:9:9:9:22 | call to Float64 |
-| main.go:9:9:9:22 | call to Float64 | main.go:8:1:10:1 | exit |
-| main.go:9:9:9:22 | call to Float64 | main.go:9:27:9:29 | 0.5 |
-| main.go:9:9:9:29 | ...>=... | main.go:9:2:9:29 | return statement |
+| main.go:0:0:0:0 | After main.go | main.go:0:0:0:0 | Normal Exit |
+| main.go:0:0:0:0 | Entry | main.go:0:0:0:0 | main.go |
+| main.go:0:0:0:0 | Normal Exit | main.go:0:0:0:0 | Exit |
+| main.go:0:0:0:0 | main.go | main.go:3:1:6:1 | import declaration |
+| main.go:3:1:6:1 | import declaration | main.go:8:1:10:1 | function declaration |
+| main.go:8:1:10:1 | Entry | main.go:8:18:10:1 | block statement |
+| main.go:8:1:10:1 | Exceptional Exit | main.go:8:1:10:1 | Exit |
+| main.go:8:1:10:1 | Normal Exit | main.go:8:1:10:1 | Exit |
+| main.go:8:1:10:1 | function declaration | main.go:12:1:24:1 | function declaration |
+| main.go:8:18:10:1 | block statement | main.go:9:2:9:29 | Before return statement |
+| main.go:9:2:9:29 | Before return statement | main.go:9:9:9:29 | Before ...>=... |
+| main.go:9:2:9:29 | return statement | main.go:8:1:10:1 | Normal Exit |
+| main.go:9:9:9:20 | After selection of Float64 | main.go:9:9:9:22 | call to Float64 |
+| main.go:9:9:9:20 | Before selection of Float64 | main.go:9:9:9:20 | selection of Float64 |
+| main.go:9:9:9:20 | selection of Float64 | main.go:9:9:9:20 | After selection of Float64 |
+| main.go:9:9:9:22 | After call to Float64 | main.go:9:27:9:29 | 0.5 |
+| main.go:9:9:9:22 | Before call to Float64 | main.go:9:9:9:20 | Before selection of Float64 |
+| main.go:9:9:9:22 | call to Float64 | main.go:8:1:10:1 | Exceptional Exit |
+| main.go:9:9:9:22 | call to Float64 | main.go:9:9:9:22 | After call to Float64 |
+| main.go:9:9:9:29 | ...>=... | main.go:9:9:9:29 | After ...>=... |
+| main.go:9:9:9:29 | After ...>=... | main.go:9:2:9:29 | return statement |
+| main.go:9:9:9:29 | Before ...>=... | main.go:9:9:9:22 | Before call to Float64 |
 | main.go:9:27:9:29 | 0.5 | main.go:9:9:9:29 | ...>=... |
-| main.go:12:1:24:1 | entry | main.go:13:6:13:6 | skip |
-| main.go:12:1:24:1 | function declaration | main.go:26:6:26:8 | skip |
-| main.go:12:6:12:9 | skip | main.go:12:1:24:1 | function declaration |
-| main.go:13:6:13:6 | assignment to x | main.go:14:2:14:2 | skip |
-| main.go:13:6:13:6 | skip | main.go:13:6:13:6 | zero value for x |
-| main.go:13:6:13:6 | zero value for x | main.go:13:6:13:6 | assignment to x |
-| main.go:14:2:14:2 | assignment to y | main.go:15:2:15:10 | selection of Print |
-| main.go:14:2:14:2 | skip | main.go:14:7:14:8 | 23 |
-| main.go:14:7:14:8 | 23 | main.go:14:2:14:2 | assignment to y |
-| main.go:15:2:15:10 | selection of Print | main.go:15:12:15:12 | x |
-| main.go:15:2:15:16 | call to Print | main.go:12:1:24:1 | exit |
-| main.go:15:2:15:16 | call to Print | main.go:16:5:16:8 | cond |
+| main.go:12:1:24:1 | Entry | main.go:12:13:24:1 | block statement |
+| main.go:12:1:24:1 | Exceptional Exit | main.go:12:1:24:1 | Exit |
+| main.go:12:1:24:1 | Normal Exit | main.go:12:1:24:1 | Exit |
+| main.go:12:1:24:1 | function declaration | main.go:26:1:32:1 | function declaration |
+| main.go:12:13:24:1 | After block statement | main.go:12:1:24:1 | Normal Exit |
+| main.go:12:13:24:1 | block statement | main.go:13:2:13:10 | declaration statement |
+| main.go:13:2:13:10 | After declaration statement | main.go:14:2:14:8 | ... := ... |
+| main.go:13:2:13:10 | After variable declaration | main.go:13:2:13:10 | After declaration statement |
+| main.go:13:2:13:10 | declaration statement | main.go:13:2:13:10 | variable declaration |
+| main.go:13:2:13:10 | variable declaration | main.go:13:6:13:10 | value declaration specifier |
+| main.go:13:6:13:10 | After value declaration specifier | main.go:13:2:13:10 | After variable declaration |
+| main.go:13:6:13:10 | value declaration specifier | main.go:13:6:13:10 | zero-init:0 value declaration specifier |
+| main.go:13:6:13:10 | zero-init:0 value declaration specifier | main.go:13:6:13:10 | After value declaration specifier |
+| main.go:14:2:14:8 | ... := ... | main.go:14:7:14:8 | 23 |
+| main.go:14:2:14:8 | After ... := ... | main.go:15:2:15:16 | expression statement |
+| main.go:14:2:14:8 | assign:0 ... := ... | main.go:14:2:14:8 | After ... := ... |
+| main.go:14:7:14:8 | 23 | main.go:14:2:14:8 | assign:0 ... := ... |
+| main.go:15:2:15:10 | After selection of Print | main.go:15:12:15:12 | x |
+| main.go:15:2:15:10 | Before selection of Print | main.go:15:2:15:10 | selection of Print |
+| main.go:15:2:15:10 | selection of Print | main.go:15:2:15:10 | After selection of Print |
+| main.go:15:2:15:16 | After call to Print | main.go:15:2:15:16 | After expression statement |
+| main.go:15:2:15:16 | After expression statement | main.go:16:2:18:2 | if statement |
+| main.go:15:2:15:16 | Before call to Print | main.go:15:2:15:10 | Before selection of Print |
+| main.go:15:2:15:16 | call to Print | main.go:12:1:24:1 | Exceptional Exit |
+| main.go:15:2:15:16 | call to Print | main.go:15:2:15:16 | After call to Print |
+| main.go:15:2:15:16 | expression statement | main.go:15:2:15:16 | Before call to Print |
 | main.go:15:12:15:12 | x | main.go:15:15:15:15 | y |
 | main.go:15:15:15:15 | y | main.go:15:2:15:16 | call to Print |
+| main.go:16:2:18:2 | After if statement | main.go:19:2:19:16 | expression statement |
+| main.go:16:2:18:2 | if statement | main.go:16:5:16:10 | Before call to cond |
 | main.go:16:5:16:8 | cond | main.go:16:5:16:10 | call to cond |
-| main.go:16:5:16:10 | call to cond | main.go:12:1:24:1 | exit |
-| main.go:16:5:16:10 | call to cond | main.go:16:5:16:10 | call to cond is false |
-| main.go:16:5:16:10 | call to cond | main.go:16:5:16:10 | call to cond is true |
-| main.go:16:5:16:10 | call to cond is false | main.go:19:2:19:10 | selection of Print |
-| main.go:16:5:16:10 | call to cond is true | main.go:17:3:17:3 | y |
-| main.go:17:3:17:3 | assignment to y | main.go:19:2:19:10 | selection of Print |
+| main.go:16:5:16:10 | After call to cond [false] | main.go:16:2:18:2 | After if statement |
+| main.go:16:5:16:10 | After call to cond [true] | main.go:16:12:18:2 | block statement |
+| main.go:16:5:16:10 | Before call to cond | main.go:16:5:16:8 | cond |
+| main.go:16:5:16:10 | call to cond | main.go:12:1:24:1 | Exceptional Exit |
+| main.go:16:5:16:10 | call to cond | main.go:16:5:16:10 | After call to cond [false] |
+| main.go:16:5:16:10 | call to cond | main.go:16:5:16:10 | After call to cond [true] |
+| main.go:16:12:18:2 | After block statement | main.go:16:2:18:2 | After if statement |
+| main.go:16:12:18:2 | block statement | main.go:17:3:17:9 | Before ... += ... |
 | main.go:17:3:17:3 | y | main.go:17:8:17:9 | 19 |
-| main.go:17:3:17:9 | ... += ... | main.go:17:3:17:3 | assignment to y |
+| main.go:17:3:17:9 | ... += ... | main.go:17:3:17:9 | After ... += ... |
+| main.go:17:3:17:9 | After ... += ... | main.go:16:12:18:2 | After block statement |
+| main.go:17:3:17:9 | Before ... += ... | main.go:17:3:17:3 | y |
 | main.go:17:8:17:9 | 19 | main.go:17:3:17:9 | ... += ... |
-| main.go:19:2:19:10 | selection of Print | main.go:19:12:19:12 | x |
-| main.go:19:2:19:16 | call to Print | main.go:12:1:24:1 | exit |
-| main.go:19:2:19:16 | call to Print | main.go:20:5:20:8 | cond |
+| main.go:19:2:19:10 | After selection of Print | main.go:19:12:19:12 | x |
+| main.go:19:2:19:10 | Before selection of Print | main.go:19:2:19:10 | selection of Print |
+| main.go:19:2:19:10 | selection of Print | main.go:19:2:19:10 | After selection of Print |
+| main.go:19:2:19:16 | After call to Print | main.go:19:2:19:16 | After expression statement |
+| main.go:19:2:19:16 | After expression statement | main.go:20:2:22:2 | if statement |
+| main.go:19:2:19:16 | Before call to Print | main.go:19:2:19:10 | Before selection of Print |
+| main.go:19:2:19:16 | call to Print | main.go:12:1:24:1 | Exceptional Exit |
+| main.go:19:2:19:16 | call to Print | main.go:19:2:19:16 | After call to Print |
+| main.go:19:2:19:16 | expression statement | main.go:19:2:19:16 | Before call to Print |
 | main.go:19:12:19:12 | x | main.go:19:15:19:15 | y |
 | main.go:19:15:19:15 | y | main.go:19:2:19:16 | call to Print |
+| main.go:20:2:22:2 | After if statement | main.go:23:2:23:16 | expression statement |
+| main.go:20:2:22:2 | if statement | main.go:20:5:20:10 | Before call to cond |
 | main.go:20:5:20:8 | cond | main.go:20:5:20:10 | call to cond |
-| main.go:20:5:20:10 | call to cond | main.go:12:1:24:1 | exit |
-| main.go:20:5:20:10 | call to cond | main.go:20:5:20:10 | call to cond is false |
-| main.go:20:5:20:10 | call to cond | main.go:20:5:20:10 | call to cond is true |
-| main.go:20:5:20:10 | call to cond is false | main.go:23:2:23:10 | selection of Print |
-| main.go:20:5:20:10 | call to cond is true | main.go:21:3:21:3 | skip |
-| main.go:21:3:21:3 | assignment to x | main.go:23:2:23:10 | selection of Print |
-| main.go:21:3:21:3 | skip | main.go:21:7:21:7 | y |
-| main.go:21:7:21:7 | y | main.go:21:3:21:3 | assignment to x |
-| main.go:23:2:23:10 | selection of Print | main.go:23:12:23:12 | x |
-| main.go:23:2:23:16 | call to Print | main.go:12:1:24:1 | exit |
+| main.go:20:5:20:10 | After call to cond [false] | main.go:20:2:22:2 | After if statement |
+| main.go:20:5:20:10 | After call to cond [true] | main.go:20:12:22:2 | block statement |
+| main.go:20:5:20:10 | Before call to cond | main.go:20:5:20:8 | cond |
+| main.go:20:5:20:10 | call to cond | main.go:12:1:24:1 | Exceptional Exit |
+| main.go:20:5:20:10 | call to cond | main.go:20:5:20:10 | After call to cond [false] |
+| main.go:20:5:20:10 | call to cond | main.go:20:5:20:10 | After call to cond [true] |
+| main.go:20:12:22:2 | After block statement | main.go:20:2:22:2 | After if statement |
+| main.go:20:12:22:2 | block statement | main.go:21:3:21:7 | ... = ... |
+| main.go:21:3:21:7 | ... = ... | main.go:21:7:21:7 | y |
+| main.go:21:3:21:7 | After ... = ... | main.go:20:12:22:2 | After block statement |
+| main.go:21:3:21:7 | assign:0 ... = ... | main.go:21:3:21:7 | After ... = ... |
+| main.go:21:7:21:7 | y | main.go:21:3:21:7 | assign:0 ... = ... |
+| main.go:23:2:23:10 | After selection of Print | main.go:23:12:23:12 | x |
+| main.go:23:2:23:10 | Before selection of Print | main.go:23:2:23:10 | selection of Print |
+| main.go:23:2:23:10 | selection of Print | main.go:23:2:23:10 | After selection of Print |
+| main.go:23:2:23:16 | After call to Print | main.go:23:2:23:16 | After expression statement |
+| main.go:23:2:23:16 | After expression statement | main.go:12:13:24:1 | After block statement |
+| main.go:23:2:23:16 | Before call to Print | main.go:23:2:23:10 | Before selection of Print |
+| main.go:23:2:23:16 | call to Print | main.go:12:1:24:1 | Exceptional Exit |
+| main.go:23:2:23:16 | call to Print | main.go:23:2:23:16 | After call to Print |
+| main.go:23:2:23:16 | expression statement | main.go:23:2:23:16 | Before call to Print |
 | main.go:23:12:23:12 | x | main.go:23:15:23:15 | y |
 | main.go:23:15:23:15 | y | main.go:23:2:23:16 | call to Print |
-| main.go:26:1:32:1 | entry | main.go:26:10:26:10 | argument corresponding to x |
-| main.go:26:1:32:1 | function declaration | main.go:34:6:34:9 | skip |
-| main.go:26:6:26:8 | skip | main.go:26:1:32:1 | function declaration |
-| main.go:26:10:26:10 | argument corresponding to x | main.go:26:10:26:10 | initialization of x |
-| main.go:26:10:26:10 | initialization of x | main.go:27:2:27:2 | skip |
-| main.go:27:2:27:2 | assignment to a | main.go:27:5:27:5 | assignment to b |
-| main.go:27:2:27:2 | skip | main.go:27:5:27:5 | skip |
-| main.go:27:5:27:5 | assignment to b | main.go:28:5:28:8 | cond |
-| main.go:27:5:27:5 | skip | main.go:27:10:27:10 | x |
+| main.go:26:1:32:1 | Entry | main.go:26:10:26:10 | x |
+| main.go:26:1:32:1 | Exceptional Exit | main.go:26:1:32:1 | Exit |
+| main.go:26:1:32:1 | Normal Exit | main.go:26:1:32:1 | Exit |
+| main.go:26:1:32:1 | function declaration | main.go:34:1:36:1 | function declaration |
+| main.go:26:10:26:10 | x | main.go:26:28:32:1 | block statement |
+| main.go:26:28:32:1 | block statement | main.go:27:2:27:13 | ... := ... |
+| main.go:27:2:27:13 | ... := ... | main.go:27:10:27:10 | x |
+| main.go:27:2:27:13 | After ... := ... | main.go:28:2:30:2 | if statement |
+| main.go:27:2:27:13 | assign:0 ... := ... | main.go:27:2:27:13 | assign:1 ... := ... |
+| main.go:27:2:27:13 | assign:1 ... := ... | main.go:27:2:27:13 | After ... := ... |
 | main.go:27:10:27:10 | x | main.go:27:13:27:13 | 0 |
-| main.go:27:13:27:13 | 0 | main.go:27:2:27:2 | assignment to a |
+| main.go:27:13:27:13 | 0 | main.go:27:2:27:13 | assign:0 ... := ... |
+| main.go:28:2:30:2 | After if statement | main.go:31:2:31:12 | Before return statement |
+| main.go:28:2:30:2 | if statement | main.go:28:5:28:10 | Before call to cond |
 | main.go:28:5:28:8 | cond | main.go:28:5:28:10 | call to cond |
-| main.go:28:5:28:10 | call to cond | main.go:26:1:32:1 | exit |
-| main.go:28:5:28:10 | call to cond | main.go:28:5:28:10 | call to cond is false |
-| main.go:28:5:28:10 | call to cond | main.go:28:5:28:10 | call to cond is true |
-| main.go:28:5:28:10 | call to cond is false | main.go:31:9:31:9 | a |
-| main.go:28:5:28:10 | call to cond is true | main.go:29:3:29:3 | skip |
-| main.go:29:3:29:3 | assignment to a | main.go:29:6:29:6 | assignment to b |
-| main.go:29:3:29:3 | skip | main.go:29:6:29:6 | skip |
-| main.go:29:6:29:6 | assignment to b | main.go:31:9:31:9 | a |
-| main.go:29:6:29:6 | skip | main.go:29:10:29:10 | b |
+| main.go:28:5:28:10 | After call to cond [false] | main.go:28:2:30:2 | After if statement |
+| main.go:28:5:28:10 | After call to cond [true] | main.go:28:12:30:2 | block statement |
+| main.go:28:5:28:10 | Before call to cond | main.go:28:5:28:8 | cond |
+| main.go:28:5:28:10 | call to cond | main.go:26:1:32:1 | Exceptional Exit |
+| main.go:28:5:28:10 | call to cond | main.go:28:5:28:10 | After call to cond [false] |
+| main.go:28:5:28:10 | call to cond | main.go:28:5:28:10 | After call to cond [true] |
+| main.go:28:12:30:2 | After block statement | main.go:28:2:30:2 | After if statement |
+| main.go:28:12:30:2 | block statement | main.go:29:3:29:13 | ... = ... |
+| main.go:29:3:29:13 | ... = ... | main.go:29:10:29:10 | b |
+| main.go:29:3:29:13 | After ... = ... | main.go:28:12:30:2 | After block statement |
+| main.go:29:3:29:13 | assign:0 ... = ... | main.go:29:3:29:13 | assign:1 ... = ... |
+| main.go:29:3:29:13 | assign:1 ... = ... | main.go:29:3:29:13 | After ... = ... |
 | main.go:29:10:29:10 | b | main.go:29:13:29:13 | a |
-| main.go:29:13:29:13 | a | main.go:29:3:29:3 | assignment to a |
-| main.go:31:2:31:12 | return statement | main.go:26:1:32:1 | exit |
+| main.go:29:13:29:13 | a | main.go:29:3:29:13 | assign:0 ... = ... |
+| main.go:31:2:31:12 | Before return statement | main.go:31:9:31:9 | a |
+| main.go:31:2:31:12 | return statement | main.go:26:1:32:1 | Normal Exit |
 | main.go:31:9:31:9 | a | main.go:31:12:31:12 | b |
 | main.go:31:12:31:12 | b | main.go:31:2:31:12 | return statement |
-| main.go:34:1:36:1 | entry | main.go:34:11:34:11 | argument corresponding to x |
-| main.go:34:1:36:1 | function declaration | main.go:38:6:38:8 | skip |
-| main.go:34:6:34:9 | skip | main.go:34:1:36:1 | function declaration |
-| main.go:34:11:34:11 | argument corresponding to x | main.go:34:11:34:11 | initialization of x |
-| main.go:34:11:34:11 | initialization of x | main.go:35:3:35:3 | x |
-| main.go:35:2:35:3 | assignment to star expression | main.go:34:1:36:1 | exit |
-| main.go:35:2:35:3 | star expression | main.go:34:1:36:1 | exit |
-| main.go:35:2:35:3 | star expression | main.go:35:8:35:9 | 19 |
-| main.go:35:2:35:9 | ... += ... | main.go:35:2:35:3 | assignment to star expression |
+| main.go:34:1:36:1 | Entry | main.go:34:11:34:11 | x |
+| main.go:34:1:36:1 | Normal Exit | main.go:34:1:36:1 | Exit |
+| main.go:34:1:36:1 | function declaration | main.go:38:1:45:1 | function declaration |
+| main.go:34:11:34:11 | x | main.go:34:19:36:1 | block statement |
+| main.go:34:19:36:1 | After block statement | main.go:34:1:36:1 | Normal Exit |
+| main.go:34:19:36:1 | block statement | main.go:35:2:35:9 | Before ... += ... |
+| main.go:35:2:35:3 | After star expression | main.go:35:8:35:9 | 19 |
+| main.go:35:2:35:3 | Before star expression | main.go:35:3:35:3 | x |
+| main.go:35:2:35:3 | star expression | main.go:35:2:35:3 | After star expression |
+| main.go:35:2:35:9 | ... += ... | main.go:35:2:35:9 | After ... += ... |
+| main.go:35:2:35:9 | After ... += ... | main.go:34:19:36:1 | After block statement |
+| main.go:35:2:35:9 | Before ... += ... | main.go:35:2:35:3 | Before star expression |
 | main.go:35:3:35:3 | x | main.go:35:2:35:3 | star expression |
 | main.go:35:8:35:9 | 19 | main.go:35:2:35:9 | ... += ... |
-| main.go:38:1:45:1 | entry | main.go:39:2:39:2 | skip |
-| main.go:38:1:45:1 | function declaration | main.go:47:6:47:8 | skip |
-| main.go:38:6:38:8 | skip | main.go:38:1:45:1 | function declaration |
-| main.go:39:2:39:2 | assignment to x | main.go:40:2:40:4 | skip |
-| main.go:39:2:39:2 | skip | main.go:39:7:39:8 | 23 |
-| main.go:39:7:39:8 | 23 | main.go:39:2:39:2 | assignment to x |
-| main.go:40:2:40:4 | assignment to ptr | main.go:41:5:41:8 | cond |
-| main.go:40:2:40:4 | skip | main.go:40:10:40:10 | x |
-| main.go:40:9:40:10 | &... | main.go:40:2:40:4 | assignment to ptr |
+| main.go:38:1:45:1 | Entry | main.go:38:12:45:1 | block statement |
+| main.go:38:1:45:1 | Exceptional Exit | main.go:38:1:45:1 | Exit |
+| main.go:38:1:45:1 | Normal Exit | main.go:38:1:45:1 | Exit |
+| main.go:38:1:45:1 | function declaration | main.go:47:1:50:1 | function declaration |
+| main.go:38:12:45:1 | After block statement | main.go:38:1:45:1 | Normal Exit |
+| main.go:38:12:45:1 | block statement | main.go:39:2:39:8 | ... := ... |
+| main.go:39:2:39:8 | ... := ... | main.go:39:7:39:8 | 23 |
+| main.go:39:2:39:8 | After ... := ... | main.go:40:2:40:10 | ... := ... |
+| main.go:39:2:39:8 | assign:0 ... := ... | main.go:39:2:39:8 | After ... := ... |
+| main.go:39:7:39:8 | 23 | main.go:39:2:39:8 | assign:0 ... := ... |
+| main.go:40:2:40:10 | ... := ... | main.go:40:9:40:10 | Before &... |
+| main.go:40:2:40:10 | After ... := ... | main.go:41:2:43:2 | if statement |
+| main.go:40:2:40:10 | assign:0 ... := ... | main.go:40:2:40:10 | After ... := ... |
+| main.go:40:9:40:10 | &... | main.go:40:9:40:10 | After &... |
+| main.go:40:9:40:10 | After &... | main.go:40:2:40:10 | assign:0 ... := ... |
+| main.go:40:9:40:10 | Before &... | main.go:40:10:40:10 | x |
 | main.go:40:10:40:10 | x | main.go:40:9:40:10 | &... |
+| main.go:41:2:43:2 | After if statement | main.go:44:2:44:13 | expression statement |
+| main.go:41:2:43:2 | if statement | main.go:41:5:41:10 | Before call to cond |
 | main.go:41:5:41:8 | cond | main.go:41:5:41:10 | call to cond |
-| main.go:41:5:41:10 | call to cond | main.go:38:1:45:1 | exit |
-| main.go:41:5:41:10 | call to cond | main.go:41:5:41:10 | call to cond is false |
-| main.go:41:5:41:10 | call to cond | main.go:41:5:41:10 | call to cond is true |
-| main.go:41:5:41:10 | call to cond is false | main.go:44:2:44:10 | selection of Print |
-| main.go:41:5:41:10 | call to cond is true | main.go:42:3:42:6 | bump |
+| main.go:41:5:41:10 | After call to cond [false] | main.go:41:2:43:2 | After if statement |
+| main.go:41:5:41:10 | After call to cond [true] | main.go:41:12:43:2 | block statement |
+| main.go:41:5:41:10 | Before call to cond | main.go:41:5:41:8 | cond |
+| main.go:41:5:41:10 | call to cond | main.go:38:1:45:1 | Exceptional Exit |
+| main.go:41:5:41:10 | call to cond | main.go:41:5:41:10 | After call to cond [false] |
+| main.go:41:5:41:10 | call to cond | main.go:41:5:41:10 | After call to cond [true] |
+| main.go:41:12:43:2 | After block statement | main.go:41:2:43:2 | After if statement |
+| main.go:41:12:43:2 | block statement | main.go:42:3:42:11 | expression statement |
 | main.go:42:3:42:6 | bump | main.go:42:8:42:10 | ptr |
-| main.go:42:3:42:11 | call to bump | main.go:38:1:45:1 | exit |
-| main.go:42:3:42:11 | call to bump | main.go:44:2:44:10 | selection of Print |
+| main.go:42:3:42:11 | After call to bump | main.go:42:3:42:11 | After expression statement |
+| main.go:42:3:42:11 | After expression statement | main.go:41:12:43:2 | After block statement |
+| main.go:42:3:42:11 | Before call to bump | main.go:42:3:42:6 | bump |
+| main.go:42:3:42:11 | call to bump | main.go:38:1:45:1 | Exceptional Exit |
+| main.go:42:3:42:11 | call to bump | main.go:42:3:42:11 | After call to bump |
+| main.go:42:3:42:11 | expression statement | main.go:42:3:42:11 | Before call to bump |
 | main.go:42:8:42:10 | ptr | main.go:42:3:42:11 | call to bump |
-| main.go:44:2:44:10 | selection of Print | main.go:44:12:44:12 | x |
-| main.go:44:2:44:13 | call to Print | main.go:38:1:45:1 | exit |
+| main.go:44:2:44:10 | After selection of Print | main.go:44:12:44:12 | x |
+| main.go:44:2:44:10 | Before selection of Print | main.go:44:2:44:10 | selection of Print |
+| main.go:44:2:44:10 | selection of Print | main.go:44:2:44:10 | After selection of Print |
+| main.go:44:2:44:13 | After call to Print | main.go:44:2:44:13 | After expression statement |
+| main.go:44:2:44:13 | After expression statement | main.go:38:12:45:1 | After block statement |
+| main.go:44:2:44:13 | Before call to Print | main.go:44:2:44:10 | Before selection of Print |
+| main.go:44:2:44:13 | call to Print | main.go:38:1:45:1 | Exceptional Exit |
+| main.go:44:2:44:13 | call to Print | main.go:44:2:44:13 | After call to Print |
+| main.go:44:2:44:13 | expression statement | main.go:44:2:44:13 | Before call to Print |
 | main.go:44:12:44:12 | x | main.go:44:2:44:13 | call to Print |
-| main.go:47:1:50:1 | entry | main.go:47:13:47:18 | zero value for result |
-| main.go:47:1:50:1 | function declaration | main.go:52:6:52:9 | skip |
-| main.go:47:6:47:8 | skip | main.go:47:1:50:1 | function declaration |
-| main.go:47:13:47:18 | implicit read of result | main.go:47:1:50:1 | exit |
-| main.go:47:13:47:18 | initialization of result | main.go:48:2:48:7 | skip |
-| main.go:47:13:47:18 | zero value for result | main.go:47:13:47:18 | initialization of result |
-| main.go:48:2:48:7 | assignment to result | main.go:49:2:49:7 | return statement |
-| main.go:48:2:48:7 | skip | main.go:48:11:48:12 | 42 |
-| main.go:48:11:48:12 | 42 | main.go:48:2:48:7 | assignment to result |
-| main.go:49:2:49:7 | return statement | main.go:47:13:47:18 | implicit read of result |
-| main.go:52:1:54:1 | entry | main.go:52:14:52:19 | zero value for result |
-| main.go:52:1:54:1 | function declaration | main.go:56:6:56:9 | skip |
-| main.go:52:6:52:9 | skip | main.go:52:1:54:1 | function declaration |
-| main.go:52:14:52:19 | implicit read of result | main.go:52:1:54:1 | exit |
-| main.go:52:14:52:19 | initialization of result | main.go:53:2:53:7 | return statement |
-| main.go:52:14:52:19 | zero value for result | main.go:52:14:52:19 | initialization of result |
-| main.go:53:2:53:7 | return statement | main.go:52:14:52:19 | implicit read of result |
-| main.go:56:1:64:1 | entry | main.go:56:11:56:18 | argument corresponding to selector |
-| main.go:56:1:64:1 | function declaration | main.go:66:6:66:10 | skip |
-| main.go:56:6:56:9 | skip | main.go:56:1:64:1 | function declaration |
-| main.go:56:11:56:18 | argument corresponding to selector | main.go:56:11:56:18 | initialization of selector |
-| main.go:56:11:56:18 | initialization of selector | main.go:56:26:56:31 | zero value for result |
-| main.go:56:26:56:31 | implicit read of result | main.go:56:1:64:1 | exit |
-| main.go:56:26:56:31 | initialization of result | main.go:57:2:57:7 | skip |
-| main.go:56:26:56:31 | zero value for result | main.go:56:26:56:31 | initialization of result |
-| main.go:57:2:57:7 | assignment to result | main.go:58:5:58:12 | selector |
-| main.go:57:2:57:7 | skip | main.go:57:11:57:11 | 0 |
-| main.go:57:11:57:11 | 0 | main.go:57:2:57:7 | assignment to result |
+| main.go:47:1:50:1 | Entry | main.go:47:25:50:1 | block statement |
+| main.go:47:1:50:1 | Normal Exit | main.go:47:1:50:1 | Exit |
+| main.go:47:1:50:1 | function declaration | main.go:52:1:54:1 | function declaration |
+| main.go:47:25:50:1 | After block statement | main.go:47:1:50:1 | Normal Exit |
+| main.go:47:25:50:1 | block statement | main.go:47:25:50:1 | zero-init:0 block statement |
+| main.go:47:25:50:1 | result-read:0 block statement | main.go:47:25:50:1 | After block statement |
+| main.go:47:25:50:1 | zero-init:0 block statement | main.go:48:2:48:12 | ... = ... |
+| main.go:48:2:48:12 | ... = ... | main.go:48:11:48:12 | 42 |
+| main.go:48:2:48:12 | After ... = ... | main.go:49:2:49:7 | Before return statement |
+| main.go:48:2:48:12 | assign:0 ... = ... | main.go:48:2:48:12 | After ... = ... |
+| main.go:48:11:48:12 | 42 | main.go:48:2:48:12 | assign:0 ... = ... |
+| main.go:49:2:49:7 | Before return statement | main.go:49:2:49:7 | return statement |
+| main.go:49:2:49:7 | return statement | main.go:47:25:50:1 | result-read:0 block statement |
+| main.go:52:1:54:1 | Entry | main.go:52:26:54:1 | block statement |
+| main.go:52:1:54:1 | Normal Exit | main.go:52:1:54:1 | Exit |
+| main.go:52:1:54:1 | function declaration | main.go:56:1:64:1 | function declaration |
+| main.go:52:26:54:1 | After block statement | main.go:52:1:54:1 | Normal Exit |
+| main.go:52:26:54:1 | block statement | main.go:52:26:54:1 | zero-init:0 block statement |
+| main.go:52:26:54:1 | result-read:0 block statement | main.go:52:26:54:1 | After block statement |
+| main.go:52:26:54:1 | zero-init:0 block statement | main.go:53:2:53:7 | Before return statement |
+| main.go:53:2:53:7 | Before return statement | main.go:53:2:53:7 | return statement |
+| main.go:53:2:53:7 | return statement | main.go:52:26:54:1 | result-read:0 block statement |
+| main.go:56:1:64:1 | Entry | main.go:56:11:56:18 | selector |
+| main.go:56:1:64:1 | Normal Exit | main.go:56:1:64:1 | Exit |
+| main.go:56:1:64:1 | function declaration | main.go:66:1:90:1 | function declaration |
+| main.go:56:11:56:18 | selector | main.go:56:38:64:1 | block statement |
+| main.go:56:38:64:1 | After block statement | main.go:56:1:64:1 | Normal Exit |
+| main.go:56:38:64:1 | block statement | main.go:56:38:64:1 | zero-init:0 block statement |
+| main.go:56:38:64:1 | result-read:0 block statement | main.go:56:38:64:1 | After block statement |
+| main.go:56:38:64:1 | zero-init:0 block statement | main.go:57:2:57:11 | ... = ... |
+| main.go:57:2:57:11 | ... = ... | main.go:57:11:57:11 | 0 |
+| main.go:57:2:57:11 | After ... = ... | main.go:58:2:62:2 | if statement |
+| main.go:57:2:57:11 | assign:0 ... = ... | main.go:57:2:57:11 | After ... = ... |
+| main.go:57:11:57:11 | 0 | main.go:57:2:57:11 | assign:0 ... = ... |
+| main.go:58:2:62:2 | After if statement | main.go:63:2:63:7 | Before return statement |
+| main.go:58:2:62:2 | if statement | main.go:58:5:58:17 | Before ...==... |
 | main.go:58:5:58:12 | selector | main.go:58:17:58:17 | 1 |
-| main.go:58:5:58:17 | ...==... | main.go:58:5:58:17 | ...==... is false |
-| main.go:58:5:58:17 | ...==... | main.go:58:5:58:17 | ...==... is true |
-| main.go:58:5:58:17 | ...==... is false | main.go:61:3:61:8 | skip |
-| main.go:58:5:58:17 | ...==... is true | main.go:59:10:59:10 | 1 |
+| main.go:58:5:58:17 | ...==... | main.go:58:5:58:17 | After ...==... [false] |
+| main.go:58:5:58:17 | ...==... | main.go:58:5:58:17 | After ...==... [true] |
+| main.go:58:5:58:17 | After ...==... [false] | main.go:60:9:62:2 | block statement |
+| main.go:58:5:58:17 | After ...==... [true] | main.go:58:19:60:2 | block statement |
+| main.go:58:5:58:17 | Before ...==... | main.go:58:5:58:12 | selector |
 | main.go:58:17:58:17 | 1 | main.go:58:5:58:17 | ...==... |
-| main.go:59:3:59:10 | return statement | main.go:56:26:56:31 | implicit read of result |
-| main.go:59:10:59:10 | 1 | main.go:59:10:59:10 | implicit write of result |
-| main.go:59:10:59:10 | implicit write of result | main.go:59:3:59:10 | return statement |
-| main.go:61:3:61:8 | assignment to result | main.go:63:2:63:7 | return statement |
-| main.go:61:3:61:8 | skip | main.go:61:12:61:12 | 2 |
-| main.go:61:12:61:12 | 2 | main.go:61:3:61:8 | assignment to result |
-| main.go:63:2:63:7 | return statement | main.go:56:26:56:31 | implicit read of result |
-| main.go:66:1:90:1 | entry | main.go:67:6:67:6 | skip |
-| main.go:66:1:90:1 | function declaration | main.go:92:6:92:13 | skip |
-| main.go:66:6:66:10 | skip | main.go:66:1:90:1 | function declaration |
-| main.go:67:6:67:6 | assignment to x | main.go:68:6:68:9 | cond |
-| main.go:67:6:67:6 | skip | main.go:67:6:67:6 | zero value for x |
-| main.go:67:6:67:6 | zero value for x | main.go:67:6:67:6 | assignment to x |
+| main.go:58:19:60:2 | block statement | main.go:59:3:59:10 | Before return statement |
+| main.go:59:3:59:10 | Before return statement | main.go:59:10:59:10 | 1 |
+| main.go:59:3:59:10 | result-write:0 return statement | main.go:59:3:59:10 | return statement |
+| main.go:59:3:59:10 | return statement | main.go:56:38:64:1 | result-read:0 block statement |
+| main.go:59:10:59:10 | 1 | main.go:59:3:59:10 | result-write:0 return statement |
+| main.go:60:9:62:2 | After block statement | main.go:58:2:62:2 | After if statement |
+| main.go:60:9:62:2 | block statement | main.go:61:3:61:12 | ... = ... |
+| main.go:61:3:61:12 | ... = ... | main.go:61:12:61:12 | 2 |
+| main.go:61:3:61:12 | After ... = ... | main.go:60:9:62:2 | After block statement |
+| main.go:61:3:61:12 | assign:0 ... = ... | main.go:61:3:61:12 | After ... = ... |
+| main.go:61:12:61:12 | 2 | main.go:61:3:61:12 | assign:0 ... = ... |
+| main.go:63:2:63:7 | Before return statement | main.go:63:2:63:7 | return statement |
+| main.go:63:2:63:7 | return statement | main.go:56:38:64:1 | result-read:0 block statement |
+| main.go:66:1:90:1 | Entry | main.go:66:14:90:1 | block statement |
+| main.go:66:1:90:1 | Exceptional Exit | main.go:66:1:90:1 | Exit |
+| main.go:66:1:90:1 | Normal Exit | main.go:66:1:90:1 | Exit |
+| main.go:66:1:90:1 | function declaration | main.go:92:1:96:1 | function declaration |
+| main.go:66:14:90:1 | After block statement | main.go:66:1:90:1 | Normal Exit |
+| main.go:66:14:90:1 | block statement | main.go:67:2:67:10 | declaration statement |
+| main.go:67:2:67:10 | After declaration statement | main.go:68:2:70:2 | for statement |
+| main.go:67:2:67:10 | After variable declaration | main.go:67:2:67:10 | After declaration statement |
+| main.go:67:2:67:10 | declaration statement | main.go:67:2:67:10 | variable declaration |
+| main.go:67:2:67:10 | variable declaration | main.go:67:6:67:10 | value declaration specifier |
+| main.go:67:6:67:10 | After value declaration specifier | main.go:67:2:67:10 | After variable declaration |
+| main.go:67:6:67:10 | value declaration specifier | main.go:67:6:67:10 | zero-init:0 value declaration specifier |
+| main.go:67:6:67:10 | zero-init:0 value declaration specifier | main.go:67:6:67:10 | After value declaration specifier |
+| main.go:68:2:70:2 | After for statement | main.go:71:2:71:13 | expression statement |
+| main.go:68:2:70:2 | [LoopHeader] for statement | main.go:68:6:68:11 | Before call to cond |
+| main.go:68:2:70:2 | for statement | main.go:68:6:68:11 | Before call to cond |
 | main.go:68:6:68:9 | cond | main.go:68:6:68:11 | call to cond |
-| main.go:68:6:68:11 | call to cond | main.go:66:1:90:1 | exit |
-| main.go:68:6:68:11 | call to cond | main.go:68:6:68:11 | call to cond is false |
-| main.go:68:6:68:11 | call to cond | main.go:68:6:68:11 | call to cond is true |
-| main.go:68:6:68:11 | call to cond is false | main.go:71:2:71:10 | selection of Print |
-| main.go:68:6:68:11 | call to cond is true | main.go:69:3:69:3 | skip |
-| main.go:69:3:69:3 | assignment to x | main.go:68:6:68:9 | cond |
-| main.go:69:3:69:3 | skip | main.go:69:7:69:7 | 2 |
-| main.go:69:7:69:7 | 2 | main.go:69:3:69:3 | assignment to x |
-| main.go:71:2:71:10 | selection of Print | main.go:71:12:71:12 | x |
-| main.go:71:2:71:13 | call to Print | main.go:66:1:90:1 | exit |
-| main.go:71:2:71:13 | call to Print | main.go:73:2:73:2 | skip |
+| main.go:68:6:68:11 | After call to cond [false] | main.go:68:2:70:2 | After for statement |
+| main.go:68:6:68:11 | After call to cond [true] | main.go:68:13:70:2 | block statement |
+| main.go:68:6:68:11 | Before call to cond | main.go:68:6:68:9 | cond |
+| main.go:68:6:68:11 | call to cond | main.go:66:1:90:1 | Exceptional Exit |
+| main.go:68:6:68:11 | call to cond | main.go:68:6:68:11 | After call to cond [false] |
+| main.go:68:6:68:11 | call to cond | main.go:68:6:68:11 | After call to cond [true] |
+| main.go:68:13:70:2 | After block statement | main.go:68:2:70:2 | [LoopHeader] for statement |
+| main.go:68:13:70:2 | block statement | main.go:69:3:69:7 | ... = ... |
+| main.go:69:3:69:7 | ... = ... | main.go:69:7:69:7 | 2 |
+| main.go:69:3:69:7 | After ... = ... | main.go:68:13:70:2 | After block statement |
+| main.go:69:3:69:7 | assign:0 ... = ... | main.go:69:3:69:7 | After ... = ... |
+| main.go:69:7:69:7 | 2 | main.go:69:3:69:7 | assign:0 ... = ... |
+| main.go:71:2:71:10 | After selection of Print | main.go:71:12:71:12 | x |
+| main.go:71:2:71:10 | Before selection of Print | main.go:71:2:71:10 | selection of Print |
+| main.go:71:2:71:10 | selection of Print | main.go:71:2:71:10 | After selection of Print |
+| main.go:71:2:71:13 | After call to Print | main.go:71:2:71:13 | After expression statement |
+| main.go:71:2:71:13 | After expression statement | main.go:73:2:73:7 | ... := ... |
+| main.go:71:2:71:13 | Before call to Print | main.go:71:2:71:10 | Before selection of Print |
+| main.go:71:2:71:13 | call to Print | main.go:66:1:90:1 | Exceptional Exit |
+| main.go:71:2:71:13 | call to Print | main.go:71:2:71:13 | After call to Print |
+| main.go:71:2:71:13 | expression statement | main.go:71:2:71:13 | Before call to Print |
 | main.go:71:12:71:12 | x | main.go:71:2:71:13 | call to Print |
-| main.go:73:2:73:2 | assignment to y | main.go:74:6:74:6 | skip |
-| main.go:73:2:73:2 | skip | main.go:73:7:73:7 | 1 |
-| main.go:73:7:73:7 | 1 | main.go:73:2:73:2 | assignment to y |
-| main.go:74:6:74:6 | assignment to i | main.go:75:6:75:9 | cond |
-| main.go:74:6:74:6 | skip | main.go:74:11:74:11 | 0 |
-| main.go:74:11:74:11 | 0 | main.go:74:6:74:6 | assignment to i |
-| main.go:74:16:74:16 | i | main.go:74:16:74:18 | 1 |
-| main.go:74:16:74:18 | 1 | main.go:74:16:74:18 | rhs of increment statement |
-| main.go:74:16:74:18 | increment statement | main.go:75:6:75:9 | cond |
-| main.go:74:16:74:18 | rhs of increment statement | main.go:74:16:74:18 | increment statement |
+| main.go:73:2:73:7 | ... := ... | main.go:73:7:73:7 | 1 |
+| main.go:73:2:73:7 | After ... := ... | main.go:74:2:79:2 | for statement |
+| main.go:73:2:73:7 | assign:0 ... := ... | main.go:73:2:73:7 | After ... := ... |
+| main.go:73:7:73:7 | 1 | main.go:73:2:73:7 | assign:0 ... := ... |
+| main.go:74:2:79:2 | After for statement | main.go:80:2:80:13 | expression statement |
+| main.go:74:2:79:2 | [LoopHeader] for statement | main.go:74:16:74:18 | Before increment statement |
+| main.go:74:2:79:2 | for statement | main.go:74:6:74:11 | ... := ... |
+| main.go:74:6:74:11 | ... := ... | main.go:74:11:74:11 | 0 |
+| main.go:74:6:74:11 | After ... := ... | main.go:74:20:79:2 | block statement |
+| main.go:74:6:74:11 | assign:0 ... := ... | main.go:74:6:74:11 | After ... := ... |
+| main.go:74:11:74:11 | 0 | main.go:74:6:74:11 | assign:0 ... := ... |
+| main.go:74:16:74:16 | i | main.go:74:16:74:18 | increment statement |
+| main.go:74:16:74:18 | After increment statement | main.go:74:20:79:2 | block statement |
+| main.go:74:16:74:18 | Before increment statement | main.go:74:16:74:16 | i |
+| main.go:74:16:74:18 | increment statement | main.go:74:16:74:18 | After increment statement |
+| main.go:74:20:79:2 | After block statement | main.go:74:2:79:2 | [LoopHeader] for statement |
+| main.go:74:20:79:2 | block statement | main.go:75:3:77:3 | if statement |
+| main.go:75:3:77:3 | After if statement | main.go:78:3:78:7 | ... = ... |
+| main.go:75:3:77:3 | if statement | main.go:75:6:75:11 | Before call to cond |
 | main.go:75:6:75:9 | cond | main.go:75:6:75:11 | call to cond |
-| main.go:75:6:75:11 | call to cond | main.go:66:1:90:1 | exit |
-| main.go:75:6:75:11 | call to cond | main.go:75:6:75:11 | call to cond is false |
-| main.go:75:6:75:11 | call to cond | main.go:75:6:75:11 | call to cond is true |
-| main.go:75:6:75:11 | call to cond is false | main.go:78:3:78:3 | skip |
-| main.go:75:6:75:11 | call to cond is true | main.go:76:4:76:8 | skip |
-| main.go:76:4:76:8 | skip | main.go:80:2:80:10 | selection of Print |
-| main.go:78:3:78:3 | assignment to y | main.go:74:16:74:16 | i |
-| main.go:78:3:78:3 | skip | main.go:78:7:78:7 | 2 |
-| main.go:78:7:78:7 | 2 | main.go:78:3:78:3 | assignment to y |
-| main.go:80:2:80:10 | selection of Print | main.go:80:12:80:12 | y |
-| main.go:80:2:80:13 | call to Print | main.go:66:1:90:1 | exit |
-| main.go:80:2:80:13 | call to Print | main.go:82:2:82:2 | skip |
+| main.go:75:6:75:11 | After call to cond [false] | main.go:75:3:77:3 | After if statement |
+| main.go:75:6:75:11 | After call to cond [true] | main.go:75:13:77:3 | block statement |
+| main.go:75:6:75:11 | Before call to cond | main.go:75:6:75:9 | cond |
+| main.go:75:6:75:11 | call to cond | main.go:66:1:90:1 | Exceptional Exit |
+| main.go:75:6:75:11 | call to cond | main.go:75:6:75:11 | After call to cond [false] |
+| main.go:75:6:75:11 | call to cond | main.go:75:6:75:11 | After call to cond [true] |
+| main.go:75:13:77:3 | block statement | main.go:76:4:76:8 | Before break statement |
+| main.go:76:4:76:8 | Before break statement | main.go:76:4:76:8 | break statement |
+| main.go:76:4:76:8 | break statement | main.go:74:2:79:2 | After for statement |
+| main.go:78:3:78:7 | ... = ... | main.go:78:7:78:7 | 2 |
+| main.go:78:3:78:7 | After ... = ... | main.go:74:20:79:2 | After block statement |
+| main.go:78:3:78:7 | assign:0 ... = ... | main.go:78:3:78:7 | After ... = ... |
+| main.go:78:7:78:7 | 2 | main.go:78:3:78:7 | assign:0 ... = ... |
+| main.go:80:2:80:10 | After selection of Print | main.go:80:12:80:12 | y |
+| main.go:80:2:80:10 | Before selection of Print | main.go:80:2:80:10 | selection of Print |
+| main.go:80:2:80:10 | selection of Print | main.go:80:2:80:10 | After selection of Print |
+| main.go:80:2:80:13 | After call to Print | main.go:80:2:80:13 | After expression statement |
+| main.go:80:2:80:13 | After expression statement | main.go:82:2:82:7 | ... := ... |
+| main.go:80:2:80:13 | Before call to Print | main.go:80:2:80:10 | Before selection of Print |
+| main.go:80:2:80:13 | call to Print | main.go:66:1:90:1 | Exceptional Exit |
+| main.go:80:2:80:13 | call to Print | main.go:80:2:80:13 | After call to Print |
+| main.go:80:2:80:13 | expression statement | main.go:80:2:80:13 | Before call to Print |
 | main.go:80:12:80:12 | y | main.go:80:2:80:13 | call to Print |
-| main.go:82:2:82:2 | assignment to z | main.go:83:6:83:6 | skip |
-| main.go:82:2:82:2 | skip | main.go:82:7:82:7 | 1 |
-| main.go:82:7:82:7 | 1 | main.go:82:2:82:2 | assignment to z |
-| main.go:83:6:83:6 | assignment to i | main.go:84:3:84:3 | skip |
-| main.go:83:6:83:6 | skip | main.go:83:11:83:11 | 0 |
-| main.go:83:11:83:11 | 0 | main.go:83:6:83:6 | assignment to i |
-| main.go:83:16:83:16 | i | main.go:83:16:83:18 | 1 |
-| main.go:83:16:83:18 | 1 | main.go:83:16:83:18 | rhs of increment statement |
-| main.go:83:16:83:18 | increment statement | main.go:84:3:84:3 | skip |
-| main.go:83:16:83:18 | rhs of increment statement | main.go:83:16:83:18 | increment statement |
-| main.go:84:3:84:3 | assignment to z | main.go:85:6:85:9 | cond |
-| main.go:84:3:84:3 | skip | main.go:84:7:84:7 | 2 |
-| main.go:84:7:84:7 | 2 | main.go:84:3:84:3 | assignment to z |
+| main.go:82:2:82:7 | ... := ... | main.go:82:7:82:7 | 1 |
+| main.go:82:2:82:7 | After ... := ... | main.go:83:2:88:2 | for statement |
+| main.go:82:2:82:7 | assign:0 ... := ... | main.go:82:2:82:7 | After ... := ... |
+| main.go:82:7:82:7 | 1 | main.go:82:2:82:7 | assign:0 ... := ... |
+| main.go:83:2:88:2 | After for statement | main.go:89:2:89:13 | expression statement |
+| main.go:83:2:88:2 | [LoopHeader] for statement | main.go:83:16:83:18 | Before increment statement |
+| main.go:83:2:88:2 | for statement | main.go:83:6:83:11 | ... := ... |
+| main.go:83:6:83:11 | ... := ... | main.go:83:11:83:11 | 0 |
+| main.go:83:6:83:11 | After ... := ... | main.go:83:20:88:2 | block statement |
+| main.go:83:6:83:11 | assign:0 ... := ... | main.go:83:6:83:11 | After ... := ... |
+| main.go:83:11:83:11 | 0 | main.go:83:6:83:11 | assign:0 ... := ... |
+| main.go:83:16:83:16 | i | main.go:83:16:83:18 | increment statement |
+| main.go:83:16:83:18 | After increment statement | main.go:83:20:88:2 | block statement |
+| main.go:83:16:83:18 | Before increment statement | main.go:83:16:83:16 | i |
+| main.go:83:16:83:18 | increment statement | main.go:83:16:83:18 | After increment statement |
+| main.go:83:20:88:2 | After block statement | main.go:83:2:88:2 | [LoopHeader] for statement |
+| main.go:83:20:88:2 | block statement | main.go:84:3:84:7 | ... = ... |
+| main.go:84:3:84:7 | ... = ... | main.go:84:7:84:7 | 2 |
+| main.go:84:3:84:7 | After ... = ... | main.go:85:3:87:3 | if statement |
+| main.go:84:3:84:7 | assign:0 ... = ... | main.go:84:3:84:7 | After ... = ... |
+| main.go:84:7:84:7 | 2 | main.go:84:3:84:7 | assign:0 ... = ... |
+| main.go:85:3:87:3 | After if statement | main.go:83:20:88:2 | After block statement |
+| main.go:85:3:87:3 | if statement | main.go:85:6:85:11 | Before call to cond |
 | main.go:85:6:85:9 | cond | main.go:85:6:85:11 | call to cond |
-| main.go:85:6:85:11 | call to cond | main.go:66:1:90:1 | exit |
-| main.go:85:6:85:11 | call to cond | main.go:85:6:85:11 | call to cond is false |
-| main.go:85:6:85:11 | call to cond | main.go:85:6:85:11 | call to cond is true |
-| main.go:85:6:85:11 | call to cond is false | main.go:83:16:83:16 | i |
-| main.go:85:6:85:11 | call to cond is true | main.go:86:4:86:8 | skip |
-| main.go:86:4:86:8 | skip | main.go:89:2:89:10 | selection of Print |
-| main.go:89:2:89:10 | selection of Print | main.go:89:12:89:12 | z |
-| main.go:89:2:89:13 | call to Print | main.go:66:1:90:1 | exit |
+| main.go:85:6:85:11 | After call to cond [false] | main.go:85:3:87:3 | After if statement |
+| main.go:85:6:85:11 | After call to cond [true] | main.go:85:13:87:3 | block statement |
+| main.go:85:6:85:11 | Before call to cond | main.go:85:6:85:9 | cond |
+| main.go:85:6:85:11 | call to cond | main.go:66:1:90:1 | Exceptional Exit |
+| main.go:85:6:85:11 | call to cond | main.go:85:6:85:11 | After call to cond [false] |
+| main.go:85:6:85:11 | call to cond | main.go:85:6:85:11 | After call to cond [true] |
+| main.go:85:13:87:3 | block statement | main.go:86:4:86:8 | Before break statement |
+| main.go:86:4:86:8 | Before break statement | main.go:86:4:86:8 | break statement |
+| main.go:86:4:86:8 | break statement | main.go:83:2:88:2 | After for statement |
+| main.go:89:2:89:10 | After selection of Print | main.go:89:12:89:12 | z |
+| main.go:89:2:89:10 | Before selection of Print | main.go:89:2:89:10 | selection of Print |
+| main.go:89:2:89:10 | selection of Print | main.go:89:2:89:10 | After selection of Print |
+| main.go:89:2:89:13 | After call to Print | main.go:89:2:89:13 | After expression statement |
+| main.go:89:2:89:13 | After expression statement | main.go:66:14:90:1 | After block statement |
+| main.go:89:2:89:13 | Before call to Print | main.go:89:2:89:10 | Before selection of Print |
+| main.go:89:2:89:13 | call to Print | main.go:66:1:90:1 | Exceptional Exit |
+| main.go:89:2:89:13 | call to Print | main.go:89:2:89:13 | After call to Print |
+| main.go:89:2:89:13 | expression statement | main.go:89:2:89:13 | Before call to Print |
 | main.go:89:12:89:12 | z | main.go:89:2:89:13 | call to Print |
-| main.go:92:1:96:1 | entry | main.go:92:18:92:18 | zero value for a |
-| main.go:92:1:96:1 | function declaration | main.go:98:6:98:23 | skip |
-| main.go:92:6:92:13 | skip | main.go:92:1:96:1 | function declaration |
-| main.go:92:18:92:18 | implicit read of a | main.go:92:25:92:25 | implicit read of b |
-| main.go:92:18:92:18 | initialization of a | main.go:92:25:92:25 | zero value for b |
-| main.go:92:18:92:18 | zero value for a | main.go:92:18:92:18 | initialization of a |
-| main.go:92:25:92:25 | implicit read of b | main.go:92:1:96:1 | exit |
-| main.go:92:25:92:25 | initialization of b | main.go:93:2:93:2 | skip |
-| main.go:92:25:92:25 | zero value for b | main.go:92:25:92:25 | initialization of b |
-| main.go:93:2:93:2 | assignment to x | main.go:94:2:94:2 | skip |
-| main.go:93:2:93:2 | skip | main.go:93:7:93:8 | 23 |
-| main.go:93:7:93:8 | 23 | main.go:93:2:93:2 | assignment to x |
-| main.go:94:2:94:2 | assignment to x | main.go:94:5:94:5 | assignment to a |
-| main.go:94:2:94:2 | skip | main.go:94:5:94:5 | skip |
-| main.go:94:5:94:5 | assignment to a | main.go:95:2:95:7 | return statement |
-| main.go:94:5:94:5 | skip | main.go:94:9:94:9 | x |
+| main.go:92:1:96:1 | Entry | main.go:92:36:96:1 | block statement |
+| main.go:92:1:96:1 | Normal Exit | main.go:92:1:96:1 | Exit |
+| main.go:92:1:96:1 | function declaration | main.go:98:1:106:1 | function declaration |
+| main.go:92:36:96:1 | After block statement | main.go:92:1:96:1 | Normal Exit |
+| main.go:92:36:96:1 | block statement | main.go:92:36:96:1 | zero-init:0 block statement |
+| main.go:92:36:96:1 | result-read:0 block statement | main.go:92:36:96:1 | result-read:1 block statement |
+| main.go:92:36:96:1 | result-read:1 block statement | main.go:92:36:96:1 | After block statement |
+| main.go:92:36:96:1 | zero-init:0 block statement | main.go:92:36:96:1 | zero-init:1 block statement |
+| main.go:92:36:96:1 | zero-init:1 block statement | main.go:93:2:93:8 | ... := ... |
+| main.go:93:2:93:8 | ... := ... | main.go:93:7:93:8 | 23 |
+| main.go:93:2:93:8 | After ... := ... | main.go:94:2:94:15 | ... = ... |
+| main.go:93:2:93:8 | assign:0 ... := ... | main.go:93:2:93:8 | After ... := ... |
+| main.go:93:7:93:8 | 23 | main.go:93:2:93:8 | assign:0 ... := ... |
+| main.go:94:2:94:15 | ... = ... | main.go:94:9:94:12 | Before ...+... |
+| main.go:94:2:94:15 | After ... = ... | main.go:95:2:95:7 | Before return statement |
+| main.go:94:2:94:15 | assign:0 ... = ... | main.go:94:2:94:15 | assign:1 ... = ... |
+| main.go:94:2:94:15 | assign:1 ... = ... | main.go:94:2:94:15 | After ... = ... |
 | main.go:94:9:94:9 | x | main.go:94:11:94:12 | 19 |
-| main.go:94:9:94:12 | ...+... | main.go:94:15:94:15 | x |
+| main.go:94:9:94:12 | ...+... | main.go:94:9:94:12 | After ...+... |
+| main.go:94:9:94:12 | After ...+... | main.go:94:15:94:15 | x |
+| main.go:94:9:94:12 | Before ...+... | main.go:94:9:94:9 | x |
 | main.go:94:11:94:12 | 19 | main.go:94:9:94:12 | ...+... |
-| main.go:94:15:94:15 | x | main.go:94:2:94:2 | assignment to x |
-| main.go:95:2:95:7 | return statement | main.go:92:18:92:18 | implicit read of a |
-| main.go:98:1:106:1 | entry | main.go:98:25:98:25 | argument corresponding to x |
-| main.go:98:1:106:1 | function declaration | main.go:0:0:0:0 | exit |
-| main.go:98:6:98:23 | skip | main.go:98:1:106:1 | function declaration |
-| main.go:98:25:98:25 | argument corresponding to x | main.go:98:25:98:25 | initialization of x |
-| main.go:98:25:98:25 | initialization of x | main.go:99:2:99:2 | skip |
-| main.go:99:2:99:2 | assignment to a | main.go:99:5:99:5 | assignment to b |
-| main.go:99:2:99:2 | skip | main.go:99:5:99:5 | skip |
-| main.go:99:5:99:5 | assignment to b | main.go:100:5:100:8 | cond |
-| main.go:99:5:99:5 | skip | main.go:99:10:99:10 | x |
+| main.go:94:15:94:15 | x | main.go:94:2:94:15 | assign:0 ... = ... |
+| main.go:95:2:95:7 | Before return statement | main.go:95:2:95:7 | return statement |
+| main.go:95:2:95:7 | return statement | main.go:92:36:96:1 | result-read:0 block statement |
+| main.go:98:1:106:1 | Entry | main.go:98:25:98:25 | x |
+| main.go:98:1:106:1 | Exceptional Exit | main.go:98:1:106:1 | Exit |
+| main.go:98:1:106:1 | Normal Exit | main.go:98:1:106:1 | Exit |
+| main.go:98:1:106:1 | function declaration | main.go:0:0:0:0 | After main.go |
+| main.go:98:25:98:25 | x | main.go:98:43:106:1 | block statement |
+| main.go:98:43:106:1 | block statement | main.go:99:2:99:13 | ... := ... |
+| main.go:99:2:99:13 | ... := ... | main.go:99:10:99:10 | x |
+| main.go:99:2:99:13 | After ... := ... | main.go:100:2:104:2 | if statement |
+| main.go:99:2:99:13 | assign:0 ... := ... | main.go:99:2:99:13 | assign:1 ... := ... |
+| main.go:99:2:99:13 | assign:1 ... := ... | main.go:99:2:99:13 | After ... := ... |
 | main.go:99:10:99:10 | x | main.go:99:13:99:13 | 0 |
-| main.go:99:13:99:13 | 0 | main.go:99:2:99:2 | assignment to a |
+| main.go:99:13:99:13 | 0 | main.go:99:2:99:13 | assign:0 ... := ... |
+| main.go:100:2:104:2 | After if statement | main.go:105:2:105:12 | Before return statement |
+| main.go:100:2:104:2 | if statement | main.go:100:5:100:10 | Before call to cond |
 | main.go:100:5:100:8 | cond | main.go:100:5:100:10 | call to cond |
-| main.go:100:5:100:10 | call to cond | main.go:98:1:106:1 | exit |
-| main.go:100:5:100:10 | call to cond | main.go:100:5:100:10 | call to cond is false |
-| main.go:100:5:100:10 | call to cond | main.go:100:5:100:10 | call to cond is true |
-| main.go:100:5:100:10 | call to cond is false | main.go:103:3:103:3 | skip |
-| main.go:100:5:100:10 | call to cond is true | main.go:101:3:101:3 | skip |
-| main.go:101:3:101:3 | assignment to a | main.go:105:9:105:9 | a |
-| main.go:101:3:101:3 | skip | main.go:101:6:101:6 | skip |
-| main.go:101:6:101:6 | skip | main.go:101:10:101:10 | b |
+| main.go:100:5:100:10 | After call to cond [false] | main.go:102:9:104:2 | block statement |
+| main.go:100:5:100:10 | After call to cond [true] | main.go:100:12:102:2 | block statement |
+| main.go:100:5:100:10 | Before call to cond | main.go:100:5:100:8 | cond |
+| main.go:100:5:100:10 | call to cond | main.go:98:1:106:1 | Exceptional Exit |
+| main.go:100:5:100:10 | call to cond | main.go:100:5:100:10 | After call to cond [false] |
+| main.go:100:5:100:10 | call to cond | main.go:100:5:100:10 | After call to cond [true] |
+| main.go:100:12:102:2 | After block statement | main.go:100:2:104:2 | After if statement |
+| main.go:100:12:102:2 | block statement | main.go:101:3:101:13 | ... = ... |
+| main.go:101:3:101:13 | ... = ... | main.go:101:10:101:10 | b |
+| main.go:101:3:101:13 | After ... = ... | main.go:100:12:102:2 | After block statement |
+| main.go:101:3:101:13 | assign:0 ... = ... | main.go:101:3:101:13 | After ... = ... |
 | main.go:101:10:101:10 | b | main.go:101:13:101:13 | a |
-| main.go:101:13:101:13 | a | main.go:101:3:101:3 | assignment to a |
-| main.go:103:3:103:3 | skip | main.go:103:6:103:6 | skip |
-| main.go:103:6:103:6 | assignment to b | main.go:105:9:105:9 | a |
-| main.go:103:6:103:6 | skip | main.go:103:10:103:10 | b |
+| main.go:101:13:101:13 | a | main.go:101:3:101:13 | assign:0 ... = ... |
+| main.go:102:9:104:2 | After block statement | main.go:100:2:104:2 | After if statement |
+| main.go:102:9:104:2 | block statement | main.go:103:3:103:13 | ... = ... |
+| main.go:103:3:103:13 | ... = ... | main.go:103:10:103:10 | b |
+| main.go:103:3:103:13 | After ... = ... | main.go:102:9:104:2 | After block statement |
+| main.go:103:3:103:13 | assign:1 ... = ... | main.go:103:3:103:13 | After ... = ... |
 | main.go:103:10:103:10 | b | main.go:103:13:103:13 | a |
-| main.go:103:13:103:13 | a | main.go:103:6:103:6 | assignment to b |
-| main.go:105:2:105:12 | return statement | main.go:98:1:106:1 | exit |
+| main.go:103:13:103:13 | a | main.go:103:3:103:13 | assign:1 ... = ... |
+| main.go:105:2:105:12 | Before return statement | main.go:105:9:105:9 | a |
+| main.go:105:2:105:12 | return statement | main.go:98:1:106:1 | Normal Exit |
 | main.go:105:9:105:9 | a | main.go:105:12:105:12 | b |
 | main.go:105:12:105:12 | b | main.go:105:2:105:12 | return statement |
-| noretfunctions.go:0:0:0:0 | entry | noretfunctions.go:3:1:6:1 | skip |
-| noretfunctions.go:3:1:6:1 | skip | noretfunctions.go:8:6:8:12 | skip |
-| noretfunctions.go:8:1:10:1 | entry | noretfunctions.go:9:2:9:8 | selection of Exit |
-| noretfunctions.go:8:1:10:1 | function declaration | noretfunctions.go:12:6:12:11 | skip |
-| noretfunctions.go:8:6:8:12 | skip | noretfunctions.go:8:1:10:1 | function declaration |
-| noretfunctions.go:9:2:9:8 | selection of Exit | noretfunctions.go:9:10:9:10 | 1 |
-| noretfunctions.go:9:2:9:11 | call to Exit | noretfunctions.go:8:1:10:1 | exit |
+| noretfunctions.go:0:0:0:0 | After noretfunctions.go | noretfunctions.go:0:0:0:0 | Normal Exit |
+| noretfunctions.go:0:0:0:0 | Entry | noretfunctions.go:0:0:0:0 | noretfunctions.go |
+| noretfunctions.go:0:0:0:0 | Normal Exit | noretfunctions.go:0:0:0:0 | Exit |
+| noretfunctions.go:0:0:0:0 | noretfunctions.go | noretfunctions.go:3:1:6:1 | import declaration |
+| noretfunctions.go:3:1:6:1 | import declaration | noretfunctions.go:8:1:10:1 | function declaration |
+| noretfunctions.go:8:1:10:1 | Entry | noretfunctions.go:8:16:10:1 | block statement |
+| noretfunctions.go:8:1:10:1 | Exceptional Exit | noretfunctions.go:8:1:10:1 | Exit |
+| noretfunctions.go:8:1:10:1 | function declaration | noretfunctions.go:12:1:16:1 | function declaration |
+| noretfunctions.go:8:16:10:1 | block statement | noretfunctions.go:9:2:9:11 | expression statement |
+| noretfunctions.go:9:2:9:8 | After selection of Exit | noretfunctions.go:9:10:9:10 | 1 |
+| noretfunctions.go:9:2:9:8 | Before selection of Exit | noretfunctions.go:9:2:9:8 | selection of Exit |
+| noretfunctions.go:9:2:9:8 | selection of Exit | noretfunctions.go:9:2:9:8 | After selection of Exit |
+| noretfunctions.go:9:2:9:11 | Before call to Exit | noretfunctions.go:9:2:9:8 | Before selection of Exit |
+| noretfunctions.go:9:2:9:11 | call to Exit | noretfunctions.go:8:1:10:1 | Exceptional Exit |
+| noretfunctions.go:9:2:9:11 | expression statement | noretfunctions.go:9:2:9:11 | Before call to Exit |
 | noretfunctions.go:9:10:9:10 | 1 | noretfunctions.go:9:2:9:11 | call to Exit |
-| noretfunctions.go:12:1:16:1 | entry | noretfunctions.go:12:13:12:13 | argument corresponding to x |
-| noretfunctions.go:12:1:16:1 | function declaration | noretfunctions.go:18:6:18:12 | skip |
-| noretfunctions.go:12:6:12:11 | skip | noretfunctions.go:12:1:16:1 | function declaration |
-| noretfunctions.go:12:13:12:13 | argument corresponding to x | noretfunctions.go:12:13:12:13 | initialization of x |
-| noretfunctions.go:12:13:12:13 | initialization of x | noretfunctions.go:13:5:13:5 | x |
+| noretfunctions.go:12:1:16:1 | Entry | noretfunctions.go:12:13:12:13 | x |
+| noretfunctions.go:12:1:16:1 | Exceptional Exit | noretfunctions.go:12:1:16:1 | Exit |
+| noretfunctions.go:12:1:16:1 | Normal Exit | noretfunctions.go:12:1:16:1 | Exit |
+| noretfunctions.go:12:1:16:1 | function declaration | noretfunctions.go:18:1:18:17 | function declaration |
+| noretfunctions.go:12:13:12:13 | x | noretfunctions.go:12:20:16:1 | block statement |
+| noretfunctions.go:12:20:16:1 | After block statement | noretfunctions.go:12:1:16:1 | Normal Exit |
+| noretfunctions.go:12:20:16:1 | block statement | noretfunctions.go:13:2:15:2 | if statement |
+| noretfunctions.go:13:2:15:2 | After if statement | noretfunctions.go:12:20:16:1 | After block statement |
+| noretfunctions.go:13:2:15:2 | if statement | noretfunctions.go:13:5:13:10 | Before ...!=... |
 | noretfunctions.go:13:5:13:5 | x | noretfunctions.go:13:10:13:10 | 0 |
-| noretfunctions.go:13:5:13:10 | ...!=... | noretfunctions.go:13:5:13:10 | ...!=... is false |
-| noretfunctions.go:13:5:13:10 | ...!=... | noretfunctions.go:13:5:13:10 | ...!=... is true |
-| noretfunctions.go:13:5:13:10 | ...!=... is false | noretfunctions.go:12:1:16:1 | exit |
-| noretfunctions.go:13:5:13:10 | ...!=... is true | noretfunctions.go:14:3:14:9 | selection of Exit |
+| noretfunctions.go:13:5:13:10 | ...!=... | noretfunctions.go:13:5:13:10 | After ...!=... [false] |
+| noretfunctions.go:13:5:13:10 | ...!=... | noretfunctions.go:13:5:13:10 | After ...!=... [true] |
+| noretfunctions.go:13:5:13:10 | After ...!=... [false] | noretfunctions.go:13:2:15:2 | After if statement |
+| noretfunctions.go:13:5:13:10 | After ...!=... [true] | noretfunctions.go:13:12:15:2 | block statement |
+| noretfunctions.go:13:5:13:10 | Before ...!=... | noretfunctions.go:13:5:13:5 | x |
 | noretfunctions.go:13:10:13:10 | 0 | noretfunctions.go:13:5:13:10 | ...!=... |
-| noretfunctions.go:14:3:14:9 | selection of Exit | noretfunctions.go:14:11:14:11 | x |
-| noretfunctions.go:14:3:14:12 | call to Exit | noretfunctions.go:12:1:16:1 | exit |
+| noretfunctions.go:13:12:15:2 | block statement | noretfunctions.go:14:3:14:12 | expression statement |
+| noretfunctions.go:14:3:14:9 | After selection of Exit | noretfunctions.go:14:11:14:11 | x |
+| noretfunctions.go:14:3:14:9 | Before selection of Exit | noretfunctions.go:14:3:14:9 | selection of Exit |
+| noretfunctions.go:14:3:14:9 | selection of Exit | noretfunctions.go:14:3:14:9 | After selection of Exit |
+| noretfunctions.go:14:3:14:12 | Before call to Exit | noretfunctions.go:14:3:14:9 | Before selection of Exit |
+| noretfunctions.go:14:3:14:12 | call to Exit | noretfunctions.go:12:1:16:1 | Exceptional Exit |
+| noretfunctions.go:14:3:14:12 | expression statement | noretfunctions.go:14:3:14:12 | Before call to Exit |
 | noretfunctions.go:14:11:14:11 | x | noretfunctions.go:14:3:14:12 | call to Exit |
-| noretfunctions.go:18:1:18:17 | entry | noretfunctions.go:18:16:18:17 | skip |
-| noretfunctions.go:18:1:18:17 | function declaration | noretfunctions.go:20:6:20:22 | skip |
-| noretfunctions.go:18:6:18:12 | skip | noretfunctions.go:18:1:18:17 | function declaration |
-| noretfunctions.go:18:16:18:17 | skip | noretfunctions.go:18:1:18:17 | exit |
-| noretfunctions.go:20:1:22:1 | entry | noretfunctions.go:21:2:21:10 | selection of Fatal |
-| noretfunctions.go:20:1:22:1 | function declaration | noretfunctions.go:24:6:24:23 | skip |
-| noretfunctions.go:20:6:20:22 | skip | noretfunctions.go:20:1:22:1 | function declaration |
-| noretfunctions.go:21:2:21:10 | selection of Fatal | noretfunctions.go:21:12:21:18 | "Oh no" |
-| noretfunctions.go:21:2:21:19 | call to Fatal | noretfunctions.go:20:1:22:1 | exit |
+| noretfunctions.go:18:1:18:17 | Entry | noretfunctions.go:18:16:18:17 | block statement |
+| noretfunctions.go:18:1:18:17 | Normal Exit | noretfunctions.go:18:1:18:17 | Exit |
+| noretfunctions.go:18:1:18:17 | function declaration | noretfunctions.go:20:1:22:1 | function declaration |
+| noretfunctions.go:18:16:18:17 | block statement | noretfunctions.go:18:1:18:17 | Normal Exit |
+| noretfunctions.go:20:1:22:1 | Entry | noretfunctions.go:20:26:22:1 | block statement |
+| noretfunctions.go:20:1:22:1 | Exceptional Exit | noretfunctions.go:20:1:22:1 | Exit |
+| noretfunctions.go:20:1:22:1 | function declaration | noretfunctions.go:24:1:26:1 | function declaration |
+| noretfunctions.go:20:26:22:1 | block statement | noretfunctions.go:21:2:21:19 | expression statement |
+| noretfunctions.go:21:2:21:10 | After selection of Fatal | noretfunctions.go:21:12:21:18 | "Oh no" |
+| noretfunctions.go:21:2:21:10 | Before selection of Fatal | noretfunctions.go:21:2:21:10 | selection of Fatal |
+| noretfunctions.go:21:2:21:10 | selection of Fatal | noretfunctions.go:21:2:21:10 | After selection of Fatal |
+| noretfunctions.go:21:2:21:19 | Before call to Fatal | noretfunctions.go:21:2:21:10 | Before selection of Fatal |
+| noretfunctions.go:21:2:21:19 | call to Fatal | noretfunctions.go:20:1:22:1 | Exceptional Exit |
+| noretfunctions.go:21:2:21:19 | expression statement | noretfunctions.go:21:2:21:19 | Before call to Fatal |
 | noretfunctions.go:21:12:21:18 | "Oh no" | noretfunctions.go:21:2:21:19 | call to Fatal |
-| noretfunctions.go:24:1:26:1 | entry | noretfunctions.go:25:2:25:11 | selection of Fatalf |
-| noretfunctions.go:24:1:26:1 | function declaration | noretfunctions.go:0:0:0:0 | exit |
-| noretfunctions.go:24:6:24:23 | skip | noretfunctions.go:24:1:26:1 | function declaration |
-| noretfunctions.go:25:2:25:11 | selection of Fatalf | noretfunctions.go:25:13:25:30 | "It's as I feared" |
-| noretfunctions.go:25:2:25:31 | call to Fatalf | noretfunctions.go:24:1:26:1 | exit |
+| noretfunctions.go:24:1:26:1 | Entry | noretfunctions.go:24:27:26:1 | block statement |
+| noretfunctions.go:24:1:26:1 | Exceptional Exit | noretfunctions.go:24:1:26:1 | Exit |
+| noretfunctions.go:24:1:26:1 | function declaration | noretfunctions.go:0:0:0:0 | After noretfunctions.go |
+| noretfunctions.go:24:27:26:1 | block statement | noretfunctions.go:25:2:25:31 | expression statement |
+| noretfunctions.go:25:2:25:11 | After selection of Fatalf | noretfunctions.go:25:13:25:30 | "It's as I feared" |
+| noretfunctions.go:25:2:25:11 | Before selection of Fatalf | noretfunctions.go:25:2:25:11 | selection of Fatalf |
+| noretfunctions.go:25:2:25:11 | selection of Fatalf | noretfunctions.go:25:2:25:11 | After selection of Fatalf |
+| noretfunctions.go:25:2:25:31 | Before call to Fatalf | noretfunctions.go:25:2:25:11 | Before selection of Fatalf |
+| noretfunctions.go:25:2:25:31 | call to Fatalf | noretfunctions.go:24:1:26:1 | Exceptional Exit |
+| noretfunctions.go:25:2:25:31 | expression statement | noretfunctions.go:25:2:25:31 | Before call to Fatalf |
 | noretfunctions.go:25:13:25:30 | "It's as I feared" | noretfunctions.go:25:2:25:31 | call to Fatalf |
-| stmts2.go:0:0:0:0 | entry | stmts2.go:3:6:3:11 | skip |
-| stmts2.go:3:1:7:1 | entry | stmts2.go:4:2:4:2 | skip |
-| stmts2.go:3:1:7:1 | function declaration | stmts2.go:9:6:9:11 | skip |
-| stmts2.go:3:6:3:11 | skip | stmts2.go:3:1:7:1 | function declaration |
-| stmts2.go:4:2:4:2 | skip | stmts2.go:4:6:4:10 | test7 |
+| stmts2.go:0:0:0:0 | After stmts2.go | stmts2.go:0:0:0:0 | Normal Exit |
+| stmts2.go:0:0:0:0 | Entry | stmts2.go:0:0:0:0 | stmts2.go |
+| stmts2.go:0:0:0:0 | Normal Exit | stmts2.go:0:0:0:0 | Exit |
+| stmts2.go:0:0:0:0 | stmts2.go | stmts2.go:3:1:7:1 | function declaration |
+| stmts2.go:3:1:7:1 | Entry | stmts2.go:3:19:7:1 | block statement |
+| stmts2.go:3:1:7:1 | Exceptional Exit | stmts2.go:3:1:7:1 | Exit |
+| stmts2.go:3:1:7:1 | Normal Exit | stmts2.go:3:1:7:1 | Exit |
+| stmts2.go:3:1:7:1 | function declaration | stmts2.go:9:1:13:1 | function declaration |
+| stmts2.go:3:19:7:1 | block statement | stmts2.go:4:2:4:13 | ... = ... |
+| stmts2.go:4:2:4:13 | ... = ... | stmts2.go:4:6:4:13 | Before call to test7 |
+| stmts2.go:4:2:4:13 | After ... = ... | stmts2.go:5:2:5:17 | declaration statement |
 | stmts2.go:4:6:4:10 | test7 | stmts2.go:4:12:4:12 | 0 |
-| stmts2.go:4:6:4:13 | call to test7 | stmts2.go:3:1:7:1 | exit |
-| stmts2.go:4:6:4:13 | call to test7 | stmts2.go:5:6:5:6 | skip |
+| stmts2.go:4:6:4:13 | After call to test7 | stmts2.go:4:2:4:13 | After ... = ... |
+| stmts2.go:4:6:4:13 | Before call to test7 | stmts2.go:4:6:4:10 | test7 |
+| stmts2.go:4:6:4:13 | call to test7 | stmts2.go:3:1:7:1 | Exceptional Exit |
+| stmts2.go:4:6:4:13 | call to test7 | stmts2.go:4:6:4:13 | After call to test7 |
 | stmts2.go:4:12:4:12 | 0 | stmts2.go:4:6:4:13 | call to test7 |
-| stmts2.go:5:6:5:6 | skip | stmts2.go:5:10:5:14 | test7 |
+| stmts2.go:5:2:5:17 | After declaration statement | stmts2.go:6:2:6:9 | Before return statement |
+| stmts2.go:5:2:5:17 | After variable declaration | stmts2.go:5:2:5:17 | After declaration statement |
+| stmts2.go:5:2:5:17 | declaration statement | stmts2.go:5:2:5:17 | variable declaration |
+| stmts2.go:5:2:5:17 | variable declaration | stmts2.go:5:6:5:17 | value declaration specifier |
+| stmts2.go:5:6:5:17 | After value declaration specifier | stmts2.go:5:2:5:17 | After variable declaration |
+| stmts2.go:5:6:5:17 | value declaration specifier | stmts2.go:5:10:5:17 | Before call to test7 |
 | stmts2.go:5:10:5:14 | test7 | stmts2.go:5:16:5:16 | 1 |
-| stmts2.go:5:10:5:17 | call to test7 | stmts2.go:3:1:7:1 | exit |
-| stmts2.go:5:10:5:17 | call to test7 | stmts2.go:6:9:6:9 | 2 |
+| stmts2.go:5:10:5:17 | After call to test7 | stmts2.go:5:6:5:17 | After value declaration specifier |
+| stmts2.go:5:10:5:17 | Before call to test7 | stmts2.go:5:10:5:14 | test7 |
+| stmts2.go:5:10:5:17 | call to test7 | stmts2.go:3:1:7:1 | Exceptional Exit |
+| stmts2.go:5:10:5:17 | call to test7 | stmts2.go:5:10:5:17 | After call to test7 |
 | stmts2.go:5:16:5:16 | 1 | stmts2.go:5:10:5:17 | call to test7 |
-| stmts2.go:6:2:6:9 | return statement | stmts2.go:3:1:7:1 | exit |
+| stmts2.go:6:2:6:9 | Before return statement | stmts2.go:6:9:6:9 | 2 |
+| stmts2.go:6:2:6:9 | return statement | stmts2.go:3:1:7:1 | Normal Exit |
 | stmts2.go:6:9:6:9 | 2 | stmts2.go:6:2:6:9 | return statement |
-| stmts2.go:9:1:13:1 | entry | stmts2.go:10:2:10:2 | skip |
-| stmts2.go:9:1:13:1 | function declaration | stmts2.go:15:6:15:11 | skip |
-| stmts2.go:9:6:9:11 | skip | stmts2.go:9:1:13:1 | function declaration |
-| stmts2.go:10:2:10:2 | skip | stmts2.go:10:5:10:5 | skip |
-| stmts2.go:10:2:10:14 | ... := ...[0] | stmts2.go:10:2:10:14 | ... := ...[1] |
-| stmts2.go:10:2:10:14 | ... := ...[1] | stmts2.go:10:5:10:5 | assignment to x |
-| stmts2.go:10:5:10:5 | assignment to x | stmts2.go:11:6:11:6 | skip |
-| stmts2.go:10:5:10:5 | skip | stmts2.go:10:10:10:12 | gen |
+| stmts2.go:9:1:13:1 | Entry | stmts2.go:9:19:13:1 | block statement |
+| stmts2.go:9:1:13:1 | Exceptional Exit | stmts2.go:9:1:13:1 | Exit |
+| stmts2.go:9:1:13:1 | Normal Exit | stmts2.go:9:1:13:1 | Exit |
+| stmts2.go:9:1:13:1 | function declaration | stmts2.go:15:1:28:1 | function declaration |
+| stmts2.go:9:19:13:1 | block statement | stmts2.go:10:2:10:14 | ... := ... |
+| stmts2.go:10:2:10:14 | ... := ... | stmts2.go:10:10:10:14 | Before call to gen |
+| stmts2.go:10:2:10:14 | After ... := ... | stmts2.go:11:2:11:17 | declaration statement |
+| stmts2.go:10:2:10:14 | extract:0 ... := ... | stmts2.go:10:2:10:14 | extract:1 ... := ... |
+| stmts2.go:10:2:10:14 | extract:1 ... := ... | stmts2.go:10:2:10:14 | After ... := ... |
 | stmts2.go:10:10:10:12 | gen | stmts2.go:10:10:10:14 | call to gen |
-| stmts2.go:10:10:10:14 | call to gen | stmts2.go:9:1:13:1 | exit |
-| stmts2.go:10:10:10:14 | call to gen | stmts2.go:10:2:10:14 | ... := ...[0] |
-| stmts2.go:11:6:11:6 | skip | stmts2.go:11:9:11:9 | skip |
-| stmts2.go:11:6:11:17 | value declaration specifier[0] | stmts2.go:11:6:11:17 | value declaration specifier[1] |
-| stmts2.go:11:6:11:17 | value declaration specifier[1] | stmts2.go:11:9:11:9 | assignment to y |
-| stmts2.go:11:9:11:9 | assignment to y | stmts2.go:12:9:12:9 | x |
-| stmts2.go:11:9:11:9 | skip | stmts2.go:11:13:11:15 | gen |
+| stmts2.go:10:10:10:14 | After call to gen | stmts2.go:10:2:10:14 | extract:0 ... := ... |
+| stmts2.go:10:10:10:14 | Before call to gen | stmts2.go:10:10:10:12 | gen |
+| stmts2.go:10:10:10:14 | call to gen | stmts2.go:9:1:13:1 | Exceptional Exit |
+| stmts2.go:10:10:10:14 | call to gen | stmts2.go:10:10:10:14 | After call to gen |
+| stmts2.go:11:2:11:17 | After declaration statement | stmts2.go:12:2:12:13 | Before return statement |
+| stmts2.go:11:2:11:17 | After variable declaration | stmts2.go:11:2:11:17 | After declaration statement |
+| stmts2.go:11:2:11:17 | declaration statement | stmts2.go:11:2:11:17 | variable declaration |
+| stmts2.go:11:2:11:17 | variable declaration | stmts2.go:11:6:11:17 | value declaration specifier |
+| stmts2.go:11:6:11:17 | After value declaration specifier | stmts2.go:11:2:11:17 | After variable declaration |
+| stmts2.go:11:6:11:17 | extract:0 value declaration specifier | stmts2.go:11:6:11:17 | extract:1 value declaration specifier |
+| stmts2.go:11:6:11:17 | extract:1 value declaration specifier | stmts2.go:11:6:11:17 | After value declaration specifier |
+| stmts2.go:11:6:11:17 | value declaration specifier | stmts2.go:11:13:11:17 | Before call to gen |
 | stmts2.go:11:13:11:15 | gen | stmts2.go:11:13:11:17 | call to gen |
-| stmts2.go:11:13:11:17 | call to gen | stmts2.go:9:1:13:1 | exit |
-| stmts2.go:11:13:11:17 | call to gen | stmts2.go:11:6:11:17 | value declaration specifier[0] |
-| stmts2.go:12:2:12:13 | return statement | stmts2.go:9:1:13:1 | exit |
+| stmts2.go:11:13:11:17 | After call to gen | stmts2.go:11:6:11:17 | extract:0 value declaration specifier |
+| stmts2.go:11:13:11:17 | Before call to gen | stmts2.go:11:13:11:15 | gen |
+| stmts2.go:11:13:11:17 | call to gen | stmts2.go:9:1:13:1 | Exceptional Exit |
+| stmts2.go:11:13:11:17 | call to gen | stmts2.go:11:13:11:17 | After call to gen |
+| stmts2.go:12:2:12:13 | Before return statement | stmts2.go:12:9:12:13 | Before ...+... |
+| stmts2.go:12:2:12:13 | return statement | stmts2.go:9:1:13:1 | Normal Exit |
 | stmts2.go:12:9:12:9 | x | stmts2.go:12:13:12:13 | y |
-| stmts2.go:12:9:12:13 | ...+... | stmts2.go:12:2:12:13 | return statement |
+| stmts2.go:12:9:12:13 | ...+... | stmts2.go:12:9:12:13 | After ...+... |
+| stmts2.go:12:9:12:13 | After ...+... | stmts2.go:12:2:12:13 | return statement |
+| stmts2.go:12:9:12:13 | Before ...+... | stmts2.go:12:9:12:9 | x |
 | stmts2.go:12:13:12:13 | y | stmts2.go:12:9:12:13 | ...+... |
-| stmts2.go:15:1:28:1 | entry | stmts2.go:15:13:15:14 | argument corresponding to ch |
-| stmts2.go:15:1:28:1 | function declaration | stmts2.go:30:6:30:12 | skip |
-| stmts2.go:15:6:15:11 | skip | stmts2.go:15:1:28:1 | function declaration |
-| stmts2.go:15:13:15:14 | argument corresponding to ch | stmts2.go:15:13:15:14 | initialization of ch |
-| stmts2.go:15:13:15:14 | initialization of ch | stmts2.go:17:13:17:14 | ch |
-| stmts2.go:16:2:26:2 | select statement | stmts2.go:17:11:17:14 | <-... |
-| stmts2.go:16:2:26:2 | select statement | stmts2.go:18:15:18:18 | <-... |
-| stmts2.go:16:2:26:2 | select statement | stmts2.go:20:15:20:18 | <-... |
-| stmts2.go:16:2:26:2 | select statement | stmts2.go:25:14:25:17 | <-... |
-| stmts2.go:17:2:17:15 | skip | stmts2.go:27:9:27:9 | 1 |
-| stmts2.go:17:7:17:7 | skip | stmts2.go:17:2:17:15 | skip |
-| stmts2.go:17:11:17:14 | <-... | stmts2.go:17:7:17:7 | skip |
+| stmts2.go:15:1:28:1 | Entry | stmts2.go:15:13:15:14 | ch |
+| stmts2.go:15:1:28:1 | Normal Exit | stmts2.go:15:1:28:1 | Exit |
+| stmts2.go:15:1:28:1 | function declaration | stmts2.go:30:1:34:1 | function declaration |
+| stmts2.go:15:13:15:14 | ch | stmts2.go:15:30:28:1 | block statement |
+| stmts2.go:15:30:28:1 | block statement | stmts2.go:16:2:26:2 | Before select statement |
+| stmts2.go:16:2:26:2 | After select statement | stmts2.go:27:2:27:9 | Before return statement |
+| stmts2.go:16:2:26:2 | Before select statement | stmts2.go:17:13:17:14 | ch |
+| stmts2.go:16:2:26:2 | select statement | stmts2.go:17:2:17:15 | comm clause |
+| stmts2.go:16:2:26:2 | select statement | stmts2.go:18:2:19:10 | comm clause |
+| stmts2.go:16:2:26:2 | select statement | stmts2.go:20:2:24:10 | comm clause |
+| stmts2.go:16:2:26:2 | select statement | stmts2.go:25:2:25:18 | comm clause |
+| stmts2.go:17:2:17:15 | comm clause | stmts2.go:17:7:17:14 | ... = ... |
+| stmts2.go:17:7:17:7 | _ | stmts2.go:16:2:26:2 | After select statement |
+| stmts2.go:17:7:17:14 | ... = ... | stmts2.go:17:11:17:14 | Before <-... |
+| stmts2.go:17:11:17:14 | <-... | stmts2.go:17:7:17:7 | _ |
+| stmts2.go:17:11:17:14 | Before <-... | stmts2.go:17:11:17:14 | <-... |
 | stmts2.go:17:13:17:14 | ch | stmts2.go:18:17:18:18 | ch |
-| stmts2.go:18:7:18:7 | assignment to x | stmts2.go:18:7:18:18 | ... := ...[1] |
-| stmts2.go:18:7:18:7 | skip | stmts2.go:18:10:18:10 | skip |
-| stmts2.go:18:7:18:18 | ... := ...[0] | stmts2.go:18:7:18:7 | assignment to x |
-| stmts2.go:18:7:18:18 | ... := ...[1] | stmts2.go:19:10:19:10 | x |
-| stmts2.go:18:10:18:10 | skip | stmts2.go:18:7:18:18 | ... := ...[0] |
-| stmts2.go:18:15:18:18 | <-... | stmts2.go:18:7:18:7 | skip |
+| stmts2.go:18:2:19:10 | comm clause | stmts2.go:18:7:18:18 | ... := ... |
+| stmts2.go:18:7:18:7 | x | stmts2.go:18:10:18:10 | _ |
+| stmts2.go:18:7:18:18 | ... := ... | stmts2.go:18:15:18:18 | Before <-... |
+| stmts2.go:18:7:18:18 | extract:0 ... := ... | stmts2.go:18:7:18:18 | extract:1 ... := ... |
+| stmts2.go:18:7:18:18 | extract:1 ... := ... | stmts2.go:19:3:19:10 | Before return statement |
+| stmts2.go:18:10:18:10 | _ | stmts2.go:18:7:18:18 | extract:0 ... := ... |
+| stmts2.go:18:15:18:18 | <-... | stmts2.go:18:7:18:7 | x |
+| stmts2.go:18:15:18:18 | Before <-... | stmts2.go:18:15:18:18 | <-... |
 | stmts2.go:18:17:18:18 | ch | stmts2.go:20:17:20:18 | ch |
-| stmts2.go:19:3:19:10 | return statement | stmts2.go:15:1:28:1 | exit |
+| stmts2.go:19:3:19:10 | Before return statement | stmts2.go:19:10:19:10 | x |
+| stmts2.go:19:3:19:10 | return statement | stmts2.go:15:1:28:1 | Normal Exit |
 | stmts2.go:19:10:19:10 | x | stmts2.go:19:3:19:10 | return statement |
-| stmts2.go:20:7:20:7 | skip | stmts2.go:20:10:20:10 | skip |
-| stmts2.go:20:7:20:18 | ... := ...[0] | stmts2.go:20:7:20:18 | ... := ...[1] |
-| stmts2.go:20:7:20:18 | ... := ...[1] | stmts2.go:20:10:20:10 | assignment to y |
-| stmts2.go:20:10:20:10 | assignment to y | stmts2.go:21:6:21:6 | y |
-| stmts2.go:20:10:20:10 | skip | stmts2.go:20:7:20:18 | ... := ...[0] |
-| stmts2.go:20:15:20:18 | <-... | stmts2.go:20:7:20:7 | skip |
+| stmts2.go:20:2:24:10 | comm clause | stmts2.go:20:7:20:18 | ... := ... |
+| stmts2.go:20:7:20:7 | _ | stmts2.go:20:10:20:10 | y |
+| stmts2.go:20:7:20:18 | ... := ... | stmts2.go:20:15:20:18 | Before <-... |
+| stmts2.go:20:7:20:18 | extract:0 ... := ... | stmts2.go:20:7:20:18 | extract:1 ... := ... |
+| stmts2.go:20:7:20:18 | extract:1 ... := ... | stmts2.go:21:3:23:3 | if statement |
+| stmts2.go:20:10:20:10 | y | stmts2.go:20:7:20:18 | extract:0 ... := ... |
+| stmts2.go:20:15:20:18 | <-... | stmts2.go:20:7:20:7 | _ |
+| stmts2.go:20:15:20:18 | Before <-... | stmts2.go:20:15:20:18 | <-... |
 | stmts2.go:20:17:20:18 | ch | stmts2.go:25:16:25:17 | ch |
-| stmts2.go:21:6:21:6 | y | stmts2.go:21:6:21:6 | y is false |
-| stmts2.go:21:6:21:6 | y | stmts2.go:21:6:21:6 | y is true |
-| stmts2.go:21:6:21:6 | y is false | stmts2.go:24:10:24:10 | 0 |
-| stmts2.go:21:6:21:6 | y is true | stmts2.go:22:4:22:8 | skip |
-| stmts2.go:22:4:22:8 | skip | stmts2.go:27:9:27:9 | 1 |
-| stmts2.go:24:3:24:10 | return statement | stmts2.go:15:1:28:1 | exit |
+| stmts2.go:21:3:23:3 | After if statement | stmts2.go:24:3:24:10 | Before return statement |
+| stmts2.go:21:3:23:3 | if statement | stmts2.go:21:6:21:6 | y |
+| stmts2.go:21:6:21:6 | After y [false] | stmts2.go:21:3:23:3 | After if statement |
+| stmts2.go:21:6:21:6 | After y [true] | stmts2.go:21:8:23:3 | block statement |
+| stmts2.go:21:6:21:6 | y | stmts2.go:21:6:21:6 | After y [false] |
+| stmts2.go:21:6:21:6 | y | stmts2.go:21:6:21:6 | After y [true] |
+| stmts2.go:21:8:23:3 | block statement | stmts2.go:22:4:22:8 | Before break statement |
+| stmts2.go:22:4:22:8 | Before break statement | stmts2.go:22:4:22:8 | break statement |
+| stmts2.go:22:4:22:8 | break statement | stmts2.go:16:2:26:2 | After select statement |
+| stmts2.go:24:3:24:10 | Before return statement | stmts2.go:24:10:24:10 | 0 |
+| stmts2.go:24:3:24:10 | return statement | stmts2.go:15:1:28:1 | Normal Exit |
 | stmts2.go:24:10:24:10 | 0 | stmts2.go:24:3:24:10 | return statement |
-| stmts2.go:25:2:25:18 | skip | stmts2.go:27:9:27:9 | 1 |
-| stmts2.go:25:7:25:7 | skip | stmts2.go:25:10:25:10 | skip |
-| stmts2.go:25:7:25:17 | ... = ...[0] | stmts2.go:25:7:25:17 | ... = ...[1] |
-| stmts2.go:25:7:25:17 | ... = ...[1] | stmts2.go:25:2:25:18 | skip |
-| stmts2.go:25:10:25:10 | skip | stmts2.go:25:7:25:17 | ... = ...[0] |
-| stmts2.go:25:14:25:17 | <-... | stmts2.go:25:7:25:7 | skip |
+| stmts2.go:25:2:25:18 | comm clause | stmts2.go:25:7:25:17 | ... = ... |
+| stmts2.go:25:7:25:7 | _ | stmts2.go:25:10:25:10 | _ |
+| stmts2.go:25:7:25:17 | ... = ... | stmts2.go:25:14:25:17 | Before <-... |
+| stmts2.go:25:7:25:17 | extract:0 ... = ... | stmts2.go:25:7:25:17 | extract:1 ... = ... |
+| stmts2.go:25:7:25:17 | extract:1 ... = ... | stmts2.go:16:2:26:2 | After select statement |
+| stmts2.go:25:10:25:10 | _ | stmts2.go:25:7:25:17 | extract:0 ... = ... |
+| stmts2.go:25:14:25:17 | <-... | stmts2.go:25:7:25:7 | _ |
+| stmts2.go:25:14:25:17 | Before <-... | stmts2.go:25:14:25:17 | <-... |
 | stmts2.go:25:16:25:17 | ch | stmts2.go:16:2:26:2 | select statement |
-| stmts2.go:27:2:27:9 | return statement | stmts2.go:15:1:28:1 | exit |
+| stmts2.go:27:2:27:9 | Before return statement | stmts2.go:27:9:27:9 | 1 |
+| stmts2.go:27:2:27:9 | return statement | stmts2.go:15:1:28:1 | Normal Exit |
 | stmts2.go:27:9:27:9 | 1 | stmts2.go:27:2:27:9 | return statement |
-| stmts2.go:30:1:34:1 | entry | stmts2.go:31:2:31:2 | skip |
-| stmts2.go:30:1:34:1 | function declaration | stmts2.go:0:0:0:0 | exit |
-| stmts2.go:30:6:30:12 | skip | stmts2.go:30:1:34:1 | function declaration |
-| stmts2.go:31:2:31:2 | assignment to x | stmts2.go:31:2:31:14 | ... := ...[1] |
-| stmts2.go:31:2:31:2 | skip | stmts2.go:31:5:31:5 | skip |
-| stmts2.go:31:2:31:14 | ... := ...[0] | stmts2.go:31:2:31:2 | assignment to x |
-| stmts2.go:31:2:31:14 | ... := ...[1] | stmts2.go:32:6:32:6 | skip |
-| stmts2.go:31:5:31:5 | skip | stmts2.go:31:10:31:12 | gen |
+| stmts2.go:30:1:34:1 | Entry | stmts2.go:30:20:34:1 | block statement |
+| stmts2.go:30:1:34:1 | Exceptional Exit | stmts2.go:30:1:34:1 | Exit |
+| stmts2.go:30:1:34:1 | Normal Exit | stmts2.go:30:1:34:1 | Exit |
+| stmts2.go:30:1:34:1 | function declaration | stmts2.go:0:0:0:0 | After stmts2.go |
+| stmts2.go:30:20:34:1 | block statement | stmts2.go:31:2:31:14 | ... := ... |
+| stmts2.go:31:2:31:14 | ... := ... | stmts2.go:31:10:31:14 | Before call to gen |
+| stmts2.go:31:2:31:14 | After ... := ... | stmts2.go:32:2:32:17 | declaration statement |
+| stmts2.go:31:2:31:14 | extract:0 ... := ... | stmts2.go:31:2:31:14 | extract:1 ... := ... |
+| stmts2.go:31:2:31:14 | extract:1 ... := ... | stmts2.go:31:2:31:14 | After ... := ... |
 | stmts2.go:31:10:31:12 | gen | stmts2.go:31:10:31:14 | call to gen |
-| stmts2.go:31:10:31:14 | call to gen | stmts2.go:30:1:34:1 | exit |
-| stmts2.go:31:10:31:14 | call to gen | stmts2.go:31:2:31:14 | ... := ...[0] |
-| stmts2.go:32:6:32:6 | assignment to y | stmts2.go:32:6:32:17 | value declaration specifier[1] |
-| stmts2.go:32:6:32:6 | skip | stmts2.go:32:9:32:9 | skip |
-| stmts2.go:32:6:32:17 | value declaration specifier[0] | stmts2.go:32:6:32:6 | assignment to y |
-| stmts2.go:32:6:32:17 | value declaration specifier[1] | stmts2.go:33:9:33:9 | x |
-| stmts2.go:32:9:32:9 | skip | stmts2.go:32:13:32:15 | gen |
+| stmts2.go:31:10:31:14 | After call to gen | stmts2.go:31:2:31:14 | extract:0 ... := ... |
+| stmts2.go:31:10:31:14 | Before call to gen | stmts2.go:31:10:31:12 | gen |
+| stmts2.go:31:10:31:14 | call to gen | stmts2.go:30:1:34:1 | Exceptional Exit |
+| stmts2.go:31:10:31:14 | call to gen | stmts2.go:31:10:31:14 | After call to gen |
+| stmts2.go:32:2:32:17 | After declaration statement | stmts2.go:33:2:33:13 | Before return statement |
+| stmts2.go:32:2:32:17 | After variable declaration | stmts2.go:32:2:32:17 | After declaration statement |
+| stmts2.go:32:2:32:17 | declaration statement | stmts2.go:32:2:32:17 | variable declaration |
+| stmts2.go:32:2:32:17 | variable declaration | stmts2.go:32:6:32:17 | value declaration specifier |
+| stmts2.go:32:6:32:17 | After value declaration specifier | stmts2.go:32:2:32:17 | After variable declaration |
+| stmts2.go:32:6:32:17 | extract:0 value declaration specifier | stmts2.go:32:6:32:17 | extract:1 value declaration specifier |
+| stmts2.go:32:6:32:17 | extract:1 value declaration specifier | stmts2.go:32:6:32:17 | After value declaration specifier |
+| stmts2.go:32:6:32:17 | value declaration specifier | stmts2.go:32:13:32:17 | Before call to gen |
 | stmts2.go:32:13:32:15 | gen | stmts2.go:32:13:32:17 | call to gen |
-| stmts2.go:32:13:32:17 | call to gen | stmts2.go:30:1:34:1 | exit |
-| stmts2.go:32:13:32:17 | call to gen | stmts2.go:32:6:32:17 | value declaration specifier[0] |
-| stmts2.go:33:2:33:13 | return statement | stmts2.go:30:1:34:1 | exit |
+| stmts2.go:32:13:32:17 | After call to gen | stmts2.go:32:6:32:17 | extract:0 value declaration specifier |
+| stmts2.go:32:13:32:17 | Before call to gen | stmts2.go:32:13:32:15 | gen |
+| stmts2.go:32:13:32:17 | call to gen | stmts2.go:30:1:34:1 | Exceptional Exit |
+| stmts2.go:32:13:32:17 | call to gen | stmts2.go:32:13:32:17 | After call to gen |
+| stmts2.go:33:2:33:13 | Before return statement | stmts2.go:33:9:33:13 | Before ...+... |
+| stmts2.go:33:2:33:13 | return statement | stmts2.go:30:1:34:1 | Normal Exit |
 | stmts2.go:33:9:33:9 | x | stmts2.go:33:13:33:13 | y |
-| stmts2.go:33:9:33:13 | ...+... | stmts2.go:33:2:33:13 | return statement |
+| stmts2.go:33:9:33:13 | ...+... | stmts2.go:33:9:33:13 | After ...+... |
+| stmts2.go:33:9:33:13 | After ...+... | stmts2.go:33:2:33:13 | return statement |
+| stmts2.go:33:9:33:13 | Before ...+... | stmts2.go:33:9:33:9 | x |
 | stmts2.go:33:13:33:13 | y | stmts2.go:33:9:33:13 | ...+... |
-| stmts3.go:0:0:0:0 | entry | stmts3.go:3:1:3:13 | skip |
-| stmts3.go:3:1:3:13 | skip | stmts3.go:5:6:5:11 | skip |
-| stmts3.go:5:1:12:1 | entry | stmts3.go:7:3:7:5 | skip |
-| stmts3.go:5:1:12:1 | function declaration | stmts3.go:14:6:14:11 | skip |
-| stmts3.go:5:6:5:11 | skip | stmts3.go:5:1:12:1 | function declaration |
-| stmts3.go:7:3:7:5 | assignment to red | stmts3.go:8:3:8:7 | skip |
-| stmts3.go:7:3:7:5 | skip | stmts3.go:7:9:7:12 | iota |
-| stmts3.go:7:9:7:12 | iota | stmts3.go:7:3:7:5 | assignment to red |
-| stmts3.go:8:3:8:7 | assignment to green | stmts3.go:9:3:9:6 | skip |
-| stmts3.go:8:3:8:7 | skip | stmts3.go:8:3:8:7 | zero value for green |
-| stmts3.go:8:3:8:7 | zero value for green | stmts3.go:8:3:8:7 | assignment to green |
-| stmts3.go:9:3:9:6 | assignment to blue | stmts3.go:11:9:11:26 | ...-... |
-| stmts3.go:9:3:9:6 | skip | stmts3.go:9:3:9:6 | zero value for blue |
-| stmts3.go:9:3:9:6 | zero value for blue | stmts3.go:9:3:9:6 | assignment to blue |
-| stmts3.go:11:2:11:26 | return statement | stmts3.go:5:1:12:1 | exit |
-| stmts3.go:11:9:11:26 | ...-... | stmts3.go:11:2:11:26 | return statement |
-| stmts3.go:14:1:16:1 | entry | stmts3.go:14:13:14:13 | argument corresponding to x |
-| stmts3.go:14:1:16:1 | function declaration | stmts3.go:18:6:18:11 | skip |
-| stmts3.go:14:6:14:11 | skip | stmts3.go:14:1:16:1 | function declaration |
-| stmts3.go:14:13:14:13 | argument corresponding to x | stmts3.go:14:13:14:13 | initialization of x |
-| stmts3.go:14:13:14:13 | initialization of x | stmts3.go:15:3:15:3 | x |
-| stmts3.go:15:2:15:3 | assignment to star expression | stmts3.go:14:1:16:1 | exit |
-| stmts3.go:15:2:15:3 | skip | stmts3.go:14:1:16:1 | exit |
-| stmts3.go:15:2:15:3 | skip | stmts3.go:15:7:15:8 | 42 |
-| stmts3.go:15:3:15:3 | x | stmts3.go:15:2:15:3 | skip |
-| stmts3.go:15:7:15:8 | 42 | stmts3.go:15:2:15:3 | assignment to star expression |
-| stmts3.go:18:1:20:1 | entry | stmts3.go:19:2:19:11 | skip |
-| stmts3.go:18:1:20:1 | function declaration | stmts3.go:0:0:0:0 | exit |
-| stmts3.go:18:6:18:11 | skip | stmts3.go:18:1:20:1 | function declaration |
-| stmts3.go:19:2:19:11 | assignment to Usage | stmts3.go:18:1:20:1 | exit |
-| stmts3.go:19:2:19:11 | skip | stmts3.go:19:15:19:23 | function literal |
-| stmts3.go:19:15:19:23 | entry | stmts3.go:19:22:19:23 | skip |
-| stmts3.go:19:15:19:23 | function literal | stmts3.go:19:2:19:11 | assignment to Usage |
-| stmts3.go:19:22:19:23 | skip | stmts3.go:19:15:19:23 | exit |
-| stmts4.go:0:0:0:0 | entry | stmts4.go:3:5:3:5 | skip |
-| stmts4.go:3:5:3:5 | skip | stmts4.go:3:5:3:5 | zero value for _ |
-| stmts4.go:3:5:3:5 | zero value for _ | stmts4.go:5:6:5:11 | skip |
-| stmts4.go:5:1:5:26 | function declaration | stmts4.go:0:0:0:0 | exit |
-| stmts4.go:5:6:5:11 | skip | stmts4.go:5:1:5:26 | function declaration |
-| stmts5.go:0:0:0:0 | entry | stmts5.go:3:1:5:1 | skip |
-| stmts5.go:3:1:5:1 | skip | stmts5.go:7:17:7:20 | skip |
-| stmts5.go:7:1:9:1 | entry | stmts5.go:7:7:7:8 | argument corresponding to me |
-| stmts5.go:7:1:9:1 | function declaration | stmts5.go:11:14:11:16 | skip |
-| stmts5.go:7:7:7:8 | argument corresponding to me | stmts5.go:7:7:7:8 | initialization of me |
-| stmts5.go:7:7:7:8 | initialization of me | stmts5.go:7:22:7:26 | argument corresponding to other |
-| stmts5.go:7:17:7:20 | skip | stmts5.go:7:1:9:1 | function declaration |
-| stmts5.go:7:22:7:26 | argument corresponding to other | stmts5.go:7:22:7:26 | initialization of other |
-| stmts5.go:7:22:7:26 | initialization of other | stmts5.go:8:2:8:3 | me |
+| stmts3.go:0:0:0:0 | After stmts3.go | stmts3.go:0:0:0:0 | Normal Exit |
+| stmts3.go:0:0:0:0 | Entry | stmts3.go:0:0:0:0 | stmts3.go |
+| stmts3.go:0:0:0:0 | Normal Exit | stmts3.go:0:0:0:0 | Exit |
+| stmts3.go:0:0:0:0 | stmts3.go | stmts3.go:3:1:3:13 | import declaration |
+| stmts3.go:3:1:3:13 | import declaration | stmts3.go:5:1:12:1 | function declaration |
+| stmts3.go:5:1:12:1 | Entry | stmts3.go:5:19:12:1 | block statement |
+| stmts3.go:5:1:12:1 | Normal Exit | stmts3.go:5:1:12:1 | Exit |
+| stmts3.go:5:1:12:1 | function declaration | stmts3.go:14:1:16:1 | function declaration |
+| stmts3.go:5:19:12:1 | block statement | stmts3.go:6:2:10:2 | declaration statement |
+| stmts3.go:6:2:10:2 | After constant declaration | stmts3.go:6:2:10:2 | After declaration statement |
+| stmts3.go:6:2:10:2 | After declaration statement | stmts3.go:11:2:11:26 | Before return statement |
+| stmts3.go:6:2:10:2 | constant declaration | stmts3.go:7:3:7:12 | value declaration specifier |
+| stmts3.go:6:2:10:2 | declaration statement | stmts3.go:6:2:10:2 | constant declaration |
+| stmts3.go:7:3:7:12 | After value declaration specifier | stmts3.go:8:3:8:7 | value declaration specifier |
+| stmts3.go:7:3:7:12 | assign:0 value declaration specifier | stmts3.go:7:3:7:12 | After value declaration specifier |
+| stmts3.go:7:3:7:12 | value declaration specifier | stmts3.go:7:9:7:12 | iota |
+| stmts3.go:7:9:7:12 | iota | stmts3.go:7:3:7:12 | assign:0 value declaration specifier |
+| stmts3.go:8:3:8:7 | After value declaration specifier | stmts3.go:9:3:9:6 | value declaration specifier |
+| stmts3.go:8:3:8:7 | value declaration specifier | stmts3.go:8:3:8:7 | zero-init:0 value declaration specifier |
+| stmts3.go:8:3:8:7 | zero-init:0 value declaration specifier | stmts3.go:8:3:8:7 | After value declaration specifier |
+| stmts3.go:9:3:9:6 | After value declaration specifier | stmts3.go:6:2:10:2 | After constant declaration |
+| stmts3.go:9:3:9:6 | value declaration specifier | stmts3.go:9:3:9:6 | zero-init:0 value declaration specifier |
+| stmts3.go:9:3:9:6 | zero-init:0 value declaration specifier | stmts3.go:9:3:9:6 | After value declaration specifier |
+| stmts3.go:11:2:11:26 | Before return statement | stmts3.go:11:9:11:26 | Before ...-... |
+| stmts3.go:11:2:11:26 | return statement | stmts3.go:5:1:12:1 | Normal Exit |
+| stmts3.go:11:9:11:26 | ...-... | stmts3.go:11:9:11:26 | After ...-... |
+| stmts3.go:11:9:11:26 | After ...-... | stmts3.go:11:2:11:26 | return statement |
+| stmts3.go:11:9:11:26 | Before ...-... | stmts3.go:11:9:11:26 | ...-... |
+| stmts3.go:14:1:16:1 | Entry | stmts3.go:14:13:14:13 | x |
+| stmts3.go:14:1:16:1 | Normal Exit | stmts3.go:14:1:16:1 | Exit |
+| stmts3.go:14:1:16:1 | function declaration | stmts3.go:18:1:20:1 | function declaration |
+| stmts3.go:14:13:14:13 | x | stmts3.go:14:21:16:1 | block statement |
+| stmts3.go:14:21:16:1 | After block statement | stmts3.go:14:1:16:1 | Normal Exit |
+| stmts3.go:14:21:16:1 | block statement | stmts3.go:15:2:15:8 | ... = ... |
+| stmts3.go:15:2:15:8 | ... = ... | stmts3.go:15:3:15:3 | x |
+| stmts3.go:15:2:15:8 | After ... = ... | stmts3.go:14:21:16:1 | After block statement |
+| stmts3.go:15:2:15:8 | assign:0 ... = ... | stmts3.go:15:2:15:8 | After ... = ... |
+| stmts3.go:15:3:15:3 | x | stmts3.go:15:7:15:8 | 42 |
+| stmts3.go:15:7:15:8 | 42 | stmts3.go:15:2:15:8 | assign:0 ... = ... |
+| stmts3.go:18:1:20:1 | Entry | stmts3.go:18:15:20:1 | block statement |
+| stmts3.go:18:1:20:1 | Normal Exit | stmts3.go:18:1:20:1 | Exit |
+| stmts3.go:18:1:20:1 | function declaration | stmts3.go:0:0:0:0 | After stmts3.go |
+| stmts3.go:18:15:20:1 | After block statement | stmts3.go:18:1:20:1 | Normal Exit |
+| stmts3.go:18:15:20:1 | block statement | stmts3.go:19:2:19:23 | ... = ... |
+| stmts3.go:19:2:19:11 | After selection of Usage | stmts3.go:19:15:19:23 | function literal |
+| stmts3.go:19:2:19:11 | Before selection of Usage | stmts3.go:19:2:19:11 | selection of Usage |
+| stmts3.go:19:2:19:11 | selection of Usage | stmts3.go:19:2:19:11 | After selection of Usage |
+| stmts3.go:19:2:19:23 | ... = ... | stmts3.go:19:2:19:11 | Before selection of Usage |
+| stmts3.go:19:2:19:23 | After ... = ... | stmts3.go:18:15:20:1 | After block statement |
+| stmts3.go:19:2:19:23 | assign:0 ... = ... | stmts3.go:19:2:19:23 | After ... = ... |
+| stmts3.go:19:15:19:23 | Entry | stmts3.go:19:22:19:23 | block statement |
+| stmts3.go:19:15:19:23 | Normal Exit | stmts3.go:19:15:19:23 | Exit |
+| stmts3.go:19:15:19:23 | function literal | stmts3.go:19:2:19:23 | assign:0 ... = ... |
+| stmts3.go:19:22:19:23 | block statement | stmts3.go:19:15:19:23 | Normal Exit |
+| stmts4.go:0:0:0:0 | After stmts4.go | stmts4.go:0:0:0:0 | Normal Exit |
+| stmts4.go:0:0:0:0 | Entry | stmts4.go:0:0:0:0 | stmts4.go |
+| stmts4.go:0:0:0:0 | Normal Exit | stmts4.go:0:0:0:0 | Exit |
+| stmts4.go:0:0:0:0 | stmts4.go | stmts4.go:3:1:3:9 | variable declaration |
+| stmts4.go:3:1:3:9 | After variable declaration | stmts4.go:5:1:5:26 | function declaration |
+| stmts4.go:3:1:3:9 | variable declaration | stmts4.go:3:5:3:9 | value declaration specifier |
+| stmts4.go:3:5:3:9 | After value declaration specifier | stmts4.go:3:1:3:9 | After variable declaration |
+| stmts4.go:3:5:3:9 | value declaration specifier | stmts4.go:3:5:3:9 | zero-init:0 value declaration specifier |
+| stmts4.go:3:5:3:9 | zero-init:0 value declaration specifier | stmts4.go:3:5:3:9 | After value declaration specifier |
+| stmts4.go:5:1:5:26 | function declaration | stmts4.go:0:0:0:0 | After stmts4.go |
+| stmts5.go:0:0:0:0 | After stmts5.go | stmts5.go:0:0:0:0 | Normal Exit |
+| stmts5.go:0:0:0:0 | Entry | stmts5.go:0:0:0:0 | stmts5.go |
+| stmts5.go:0:0:0:0 | Normal Exit | stmts5.go:0:0:0:0 | Exit |
+| stmts5.go:0:0:0:0 | stmts5.go | stmts5.go:3:1:5:1 | type declaration |
+| stmts5.go:3:1:5:1 | type declaration | stmts5.go:7:1:9:1 | function declaration |
+| stmts5.go:7:1:9:1 | Entry | stmts5.go:7:7:7:8 | me |
+| stmts5.go:7:1:9:1 | Normal Exit | stmts5.go:7:1:9:1 | Exit |
+| stmts5.go:7:1:9:1 | function declaration | stmts5.go:11:1:12:1 | function declaration |
+| stmts5.go:7:7:7:8 | me | stmts5.go:7:22:7:26 | other |
+| stmts5.go:7:22:7:26 | other | stmts5.go:7:33:9:1 | block statement |
+| stmts5.go:7:33:9:1 | After block statement | stmts5.go:7:1:9:1 | Normal Exit |
+| stmts5.go:7:33:9:1 | block statement | stmts5.go:8:2:8:16 | Before ... += ... |
 | stmts5.go:8:2:8:3 | me | stmts5.go:8:2:8:7 | selection of val |
-| stmts5.go:8:2:8:7 | assignment to field val | stmts5.go:7:1:9:1 | exit |
-| stmts5.go:8:2:8:7 | selection of val | stmts5.go:8:12:8:16 | other |
-| stmts5.go:8:2:8:16 | ... += ... | stmts5.go:8:2:8:7 | assignment to field val |
+| stmts5.go:8:2:8:7 | After selection of val | stmts5.go:8:12:8:16 | other |
+| stmts5.go:8:2:8:7 | Before selection of val | stmts5.go:8:2:8:3 | me |
+| stmts5.go:8:2:8:7 | selection of val | stmts5.go:8:2:8:7 | After selection of val |
+| stmts5.go:8:2:8:16 | ... += ... | stmts5.go:8:2:8:16 | After ... += ... |
+| stmts5.go:8:2:8:16 | After ... += ... | stmts5.go:7:33:9:1 | After block statement |
+| stmts5.go:8:2:8:16 | Before ... += ... | stmts5.go:8:2:8:7 | Before selection of val |
 | stmts5.go:8:12:8:16 | other | stmts5.go:8:2:8:16 | ... += ... |
-| stmts5.go:11:1:12:1 | entry | stmts5.go:11:20:12:1 | skip |
-| stmts5.go:11:1:12:1 | function declaration | stmts5.go:0:0:0:0 | exit |
-| stmts5.go:11:14:11:16 | skip | stmts5.go:11:1:12:1 | function declaration |
-| stmts5.go:11:20:12:1 | skip | stmts5.go:11:1:12:1 | exit |
-| stmts6.go:0:0:0:0 | entry | stmts6.go:3:6:3:11 | skip |
-| stmts6.go:3:1:8:1 | entry | stmts6.go:4:5:4:8 | true |
-| stmts6.go:3:1:8:1 | function declaration | stmts6.go:0:0:0:0 | exit |
-| stmts6.go:3:6:3:11 | skip | stmts6.go:3:1:8:1 | function declaration |
-| stmts6.go:4:5:4:8 | true | stmts6.go:4:5:4:8 | true is true |
-| stmts6.go:4:5:4:8 | true is false | stmts6.go:7:9:7:10 | 23 |
-| stmts6.go:4:5:4:8 | true is true | stmts6.go:5:10:5:11 | 42 |
-| stmts6.go:5:3:5:11 | return statement | stmts6.go:3:1:8:1 | exit |
+| stmts5.go:11:1:12:1 | Entry | stmts5.go:11:20:12:1 | block statement |
+| stmts5.go:11:1:12:1 | Normal Exit | stmts5.go:11:1:12:1 | Exit |
+| stmts5.go:11:1:12:1 | function declaration | stmts5.go:0:0:0:0 | After stmts5.go |
+| stmts5.go:11:20:12:1 | block statement | stmts5.go:11:1:12:1 | Normal Exit |
+| stmts6.go:0:0:0:0 | After stmts6.go | stmts6.go:0:0:0:0 | Normal Exit |
+| stmts6.go:0:0:0:0 | Entry | stmts6.go:0:0:0:0 | stmts6.go |
+| stmts6.go:0:0:0:0 | Normal Exit | stmts6.go:0:0:0:0 | Exit |
+| stmts6.go:0:0:0:0 | stmts6.go | stmts6.go:3:1:8:1 | function declaration |
+| stmts6.go:3:1:8:1 | Entry | stmts6.go:3:19:8:1 | block statement |
+| stmts6.go:3:1:8:1 | Normal Exit | stmts6.go:3:1:8:1 | Exit |
+| stmts6.go:3:1:8:1 | function declaration | stmts6.go:0:0:0:0 | After stmts6.go |
+| stmts6.go:3:19:8:1 | block statement | stmts6.go:4:2:6:2 | if statement |
+| stmts6.go:4:2:6:2 | if statement | stmts6.go:4:5:4:8 | true |
+| stmts6.go:4:5:4:8 | After true [true] | stmts6.go:4:10:6:2 | block statement |
+| stmts6.go:4:5:4:8 | true | stmts6.go:4:5:4:8 | After true [true] |
+| stmts6.go:4:10:6:2 | block statement | stmts6.go:5:3:5:11 | Before return statement |
+| stmts6.go:5:3:5:11 | Before return statement | stmts6.go:5:10:5:11 | 42 |
+| stmts6.go:5:3:5:11 | return statement | stmts6.go:3:1:8:1 | Normal Exit |
 | stmts6.go:5:10:5:11 | 42 | stmts6.go:5:3:5:11 | return statement |
-| stmts6.go:7:9:7:10 | 23 | stmts6.go:7:2:7:10 | return statement |
-| stmts7.go:0:0:0:0 | entry | stmts7.go:3:1:3:12 | skip |
-| stmts7.go:3:1:3:12 | skip | stmts7.go:5:6:5:17 | skip |
-| stmts7.go:5:1:8:1 | entry | stmts7.go:6:2:6:5 | skip |
-| stmts7.go:5:1:8:1 | function declaration | stmts7.go:10:6:10:15 | skip |
-| stmts7.go:5:6:5:17 | skip | stmts7.go:5:1:8:1 | function declaration |
-| stmts7.go:6:2:6:5 | assignment to blah | stmts7.go:7:2:7:12 | selection of Println |
-| stmts7.go:6:2:6:5 | skip | stmts7.go:6:10:6:16 | recover |
-| stmts7.go:6:10:6:16 | recover | stmts7.go:6:10:6:18 | call to recover |
-| stmts7.go:6:10:6:18 | call to recover | stmts7.go:6:2:6:5 | assignment to blah |
-| stmts7.go:7:2:7:12 | selection of Println | stmts7.go:7:14:7:26 | "recovered: " |
-| stmts7.go:7:2:7:33 | call to Println | stmts7.go:5:1:8:1 | exit |
-| stmts7.go:7:14:7:26 | "recovered: " | stmts7.go:7:29:7:32 | blah |
-| stmts7.go:7:29:7:32 | blah | stmts7.go:7:2:7:33 | call to Println |
-| stmts7.go:10:1:13:1 | entry | stmts7.go:11:8:11:19 | recoverPanic |
-| stmts7.go:10:1:13:1 | function declaration | stmts7.go:15:1:17:1 | skip |
-| stmts7.go:10:6:10:15 | skip | stmts7.go:10:1:13:1 | function declaration |
-| stmts7.go:11:2:11:21 | defer statement | stmts7.go:12:2:12:6 | panic |
-| stmts7.go:11:8:11:19 | recoverPanic | stmts7.go:11:2:11:21 | defer statement |
-| stmts7.go:11:8:11:21 | call to recoverPanic | stmts7.go:10:1:13:1 | exit |
-| stmts7.go:12:2:12:6 | panic | stmts7.go:12:8:12:9 | "" |
-| stmts7.go:12:2:12:10 | call to panic | stmts7.go:11:8:11:21 | call to recoverPanic |
-| stmts7.go:12:8:12:9 | "" | stmts7.go:12:2:12:10 | call to panic |
-| stmts7.go:15:1:17:1 | skip | stmts7.go:19:26:19:28 | skip |
-| stmts7.go:19:1:21:1 | entry | stmts7.go:19:7:19:13 | argument corresponding to methods |
-| stmts7.go:19:1:21:1 | function declaration | stmts7.go:23:6:23:14 | skip |
-| stmts7.go:19:7:19:13 | argument corresponding to methods | stmts7.go:19:7:19:13 | initialization of methods |
-| stmts7.go:19:7:19:13 | initialization of methods | stmts7.go:20:2:20:8 | methods |
-| stmts7.go:19:26:19:28 | skip | stmts7.go:19:1:21:1 | function declaration |
-| stmts7.go:20:2:20:8 | implicit dereference | stmts7.go:19:1:21:1 | exit |
-| stmts7.go:20:2:20:8 | implicit dereference | stmts7.go:20:2:20:11 | selection of fn |
-| stmts7.go:20:2:20:8 | methods | stmts7.go:20:2:20:8 | implicit dereference |
-| stmts7.go:20:2:20:11 | selection of fn | stmts7.go:20:2:20:13 | call to fn |
-| stmts7.go:20:2:20:13 | call to fn | stmts7.go:19:1:21:1 | exit |
-| stmts7.go:23:1:28:1 | entry | stmts7.go:23:16:23:23 | argument corresponding to callback |
-| stmts7.go:23:1:28:1 | function declaration | stmts7.go:0:0:0:0 | exit |
-| stmts7.go:23:6:23:14 | skip | stmts7.go:23:1:28:1 | function declaration |
-| stmts7.go:23:16:23:23 | argument corresponding to callback | stmts7.go:23:16:23:23 | initialization of callback |
-| stmts7.go:23:16:23:23 | initialization of callback | stmts7.go:24:8:24:15 | callback |
-| stmts7.go:24:2:24:20 | defer statement | stmts7.go:25:10:25:17 | callback |
-| stmts7.go:24:8:24:15 | callback | stmts7.go:24:8:24:18 | selection of fn |
-| stmts7.go:24:8:24:18 | selection of fn | stmts7.go:24:2:24:20 | defer statement |
-| stmts7.go:24:8:24:20 | call to fn | stmts7.go:23:1:28:1 | exit |
-| stmts7.go:25:2:25:23 | defer statement | stmts7.go:26:2:26:12 | selection of Println |
-| stmts7.go:25:8:25:18 | implicit dereference | stmts7.go:24:8:24:20 | call to fn |
-| stmts7.go:25:8:25:18 | implicit dereference | stmts7.go:25:8:25:21 | selection of fn |
-| stmts7.go:25:8:25:21 | selection of fn | stmts7.go:25:2:25:23 | defer statement |
-| stmts7.go:25:8:25:23 | call to fn | stmts7.go:24:8:24:20 | call to fn |
-| stmts7.go:25:9:25:17 | &... | stmts7.go:25:8:25:18 | implicit dereference |
-| stmts7.go:25:10:25:17 | callback | stmts7.go:25:9:25:17 | &... |
-| stmts7.go:26:2:26:12 | selection of Println | stmts7.go:26:14:26:30 | "print something" |
-| stmts7.go:26:2:26:31 | call to Println | stmts7.go:25:8:25:23 | call to fn |
-| stmts7.go:26:2:26:31 | call to Println | stmts7.go:27:9:27:13 | false |
-| stmts7.go:26:14:26:30 | "print something" | stmts7.go:26:2:26:31 | call to Println |
-| stmts7.go:27:2:27:13 | return statement | stmts7.go:25:8:25:23 | call to fn |
-| stmts7.go:27:9:27:13 | false | stmts7.go:27:2:27:13 | return statement |
-| stmts8.go:0:0:0:0 | entry | stmts8.go:3:6:3:11 | skip |
-| stmts8.go:3:1:7:1 | entry | stmts8.go:3:13:3:13 | argument corresponding to x |
-| stmts8.go:3:1:7:1 | function declaration | stmts8.go:9:6:9:12 | skip |
-| stmts8.go:3:6:3:11 | skip | stmts8.go:3:1:7:1 | function declaration |
-| stmts8.go:3:13:3:13 | argument corresponding to x | stmts8.go:3:13:3:13 | initialization of x |
-| stmts8.go:3:13:3:13 | initialization of x | stmts8.go:4:2:4:2 | skip |
-| stmts8.go:4:2:4:2 | assignment to y | stmts8.go:5:2:5:2 | skip |
-| stmts8.go:4:2:4:2 | skip | stmts8.go:4:7:4:7 | x |
+| stmts7.go:0:0:0:0 | After stmts7.go | stmts7.go:0:0:0:0 | Normal Exit |
+| stmts7.go:0:0:0:0 | Entry | stmts7.go:0:0:0:0 | stmts7.go |
+| stmts7.go:0:0:0:0 | Normal Exit | stmts7.go:0:0:0:0 | Exit |
+| stmts7.go:0:0:0:0 | stmts7.go | stmts7.go:3:1:6:1 | import declaration |
+| stmts7.go:3:1:6:1 | import declaration | stmts7.go:8:1:11:1 | function declaration |
+| stmts7.go:8:1:11:1 | Entry | stmts7.go:8:21:11:1 | block statement |
+| stmts7.go:8:1:11:1 | Exceptional Exit | stmts7.go:8:1:11:1 | Exit |
+| stmts7.go:8:1:11:1 | Normal Exit | stmts7.go:8:1:11:1 | Exit |
+| stmts7.go:8:1:11:1 | function declaration | stmts7.go:13:1:16:1 | function declaration |
+| stmts7.go:8:21:11:1 | After block statement | stmts7.go:8:1:11:1 | Normal Exit |
+| stmts7.go:8:21:11:1 | block statement | stmts7.go:9:2:9:18 | ... := ... |
+| stmts7.go:9:2:9:18 | ... := ... | stmts7.go:9:10:9:18 | Before call to recover |
+| stmts7.go:9:2:9:18 | After ... := ... | stmts7.go:10:2:10:33 | expression statement |
+| stmts7.go:9:2:9:18 | assign:0 ... := ... | stmts7.go:9:2:9:18 | After ... := ... |
+| stmts7.go:9:10:9:16 | recover | stmts7.go:9:10:9:18 | call to recover |
+| stmts7.go:9:10:9:18 | After call to recover | stmts7.go:9:2:9:18 | assign:0 ... := ... |
+| stmts7.go:9:10:9:18 | Before call to recover | stmts7.go:9:10:9:16 | recover |
+| stmts7.go:9:10:9:18 | call to recover | stmts7.go:9:10:9:18 | After call to recover |
+| stmts7.go:10:2:10:12 | After selection of Println | stmts7.go:10:14:10:26 | "recovered: " |
+| stmts7.go:10:2:10:12 | Before selection of Println | stmts7.go:10:2:10:12 | selection of Println |
+| stmts7.go:10:2:10:12 | selection of Println | stmts7.go:10:2:10:12 | After selection of Println |
+| stmts7.go:10:2:10:33 | After call to Println | stmts7.go:10:2:10:33 | After expression statement |
+| stmts7.go:10:2:10:33 | After expression statement | stmts7.go:8:21:11:1 | After block statement |
+| stmts7.go:10:2:10:33 | Before call to Println | stmts7.go:10:2:10:12 | Before selection of Println |
+| stmts7.go:10:2:10:33 | call to Println | stmts7.go:8:1:11:1 | Exceptional Exit |
+| stmts7.go:10:2:10:33 | call to Println | stmts7.go:10:2:10:33 | After call to Println |
+| stmts7.go:10:2:10:33 | expression statement | stmts7.go:10:2:10:33 | Before call to Println |
+| stmts7.go:10:14:10:26 | "recovered: " | stmts7.go:10:29:10:32 | blah |
+| stmts7.go:10:29:10:32 | blah | stmts7.go:10:2:10:33 | call to Println |
+| stmts7.go:13:1:16:1 | Entry | stmts7.go:13:19:16:1 | block statement |
+| stmts7.go:13:1:16:1 | Exceptional Exit | stmts7.go:13:1:16:1 | Exit |
+| stmts7.go:13:1:16:1 | Normal Exit | stmts7.go:13:1:16:1 | Exit |
+| stmts7.go:13:1:16:1 | function declaration | stmts7.go:18:1:20:1 | type declaration |
+| stmts7.go:13:19:16:1 | After block statement | stmts7.go:13:1:16:1 | Normal Exit |
+| stmts7.go:13:19:16:1 | block statement | stmts7.go:14:2:14:21 | Before defer statement |
+| stmts7.go:14:2:14:21 | After defer statement | stmts7.go:15:2:15:10 | expression statement |
+| stmts7.go:14:2:14:21 | Before defer statement | stmts7.go:14:8:14:21 | call to recoverPanic |
+| stmts7.go:14:2:14:21 | catch-defer-panic defer statement | stmts7.go:13:1:16:1 | Exceptional Exit |
+| stmts7.go:14:2:14:21 | defer statement | stmts7.go:14:2:14:21 | After defer statement |
+| stmts7.go:14:8:14:19 | recoverPanic | stmts7.go:14:8:14:21 | After call to recoverPanic |
+| stmts7.go:14:8:14:21 | After call to recoverPanic | stmts7.go:14:2:14:21 | defer statement |
+| stmts7.go:14:8:14:21 | call to recoverPanic | stmts7.go:14:8:14:19 | recoverPanic |
+| stmts7.go:14:8:14:21 | defer-invoke call to recoverPanic | stmts7.go:13:19:16:1 | After block statement |
+| stmts7.go:14:8:14:21 | defer-invoke call to recoverPanic | stmts7.go:14:2:14:21 | catch-defer-panic defer statement |
+| stmts7.go:15:2:15:6 | panic | stmts7.go:15:8:15:9 | "" |
+| stmts7.go:15:2:15:10 | Before call to panic | stmts7.go:15:2:15:6 | panic |
+| stmts7.go:15:2:15:10 | call to panic | stmts7.go:15:2:15:10 | catch-panic expression statement |
+| stmts7.go:15:2:15:10 | catch-panic expression statement | stmts7.go:14:8:14:21 | defer-invoke call to recoverPanic |
+| stmts7.go:15:2:15:10 | expression statement | stmts7.go:15:2:15:10 | Before call to panic |
+| stmts7.go:15:8:15:9 | "" | stmts7.go:15:2:15:10 | call to panic |
+| stmts7.go:18:1:20:1 | type declaration | stmts7.go:22:1:24:1 | function declaration |
+| stmts7.go:22:1:24:1 | Entry | stmts7.go:22:7:22:13 | methods |
+| stmts7.go:22:1:24:1 | Exceptional Exit | stmts7.go:22:1:24:1 | Exit |
+| stmts7.go:22:1:24:1 | Normal Exit | stmts7.go:22:1:24:1 | Exit |
+| stmts7.go:22:1:24:1 | function declaration | stmts7.go:26:1:31:1 | function declaration |
+| stmts7.go:22:7:22:13 | methods | stmts7.go:22:32:24:1 | block statement |
+| stmts7.go:22:32:24:1 | After block statement | stmts7.go:22:1:24:1 | Normal Exit |
+| stmts7.go:22:32:24:1 | block statement | stmts7.go:23:2:23:13 | expression statement |
+| stmts7.go:23:2:23:8 | After methods | stmts7.go:23:2:23:8 | implicit-deref methods |
+| stmts7.go:23:2:23:8 | implicit-deref methods | stmts7.go:23:2:23:11 | selection of fn |
+| stmts7.go:23:2:23:8 | methods | stmts7.go:23:2:23:8 | After methods |
+| stmts7.go:23:2:23:11 | After selection of fn | stmts7.go:23:2:23:13 | call to fn |
+| stmts7.go:23:2:23:11 | Before selection of fn | stmts7.go:23:2:23:8 | methods |
+| stmts7.go:23:2:23:11 | selection of fn | stmts7.go:23:2:23:11 | After selection of fn |
+| stmts7.go:23:2:23:13 | After call to fn | stmts7.go:23:2:23:13 | After expression statement |
+| stmts7.go:23:2:23:13 | After expression statement | stmts7.go:22:32:24:1 | After block statement |
+| stmts7.go:23:2:23:13 | Before call to fn | stmts7.go:23:2:23:11 | Before selection of fn |
+| stmts7.go:23:2:23:13 | call to fn | stmts7.go:22:1:24:1 | Exceptional Exit |
+| stmts7.go:23:2:23:13 | call to fn | stmts7.go:23:2:23:13 | After call to fn |
+| stmts7.go:23:2:23:13 | expression statement | stmts7.go:23:2:23:13 | Before call to fn |
+| stmts7.go:26:1:31:1 | Entry | stmts7.go:26:16:26:23 | callback |
+| stmts7.go:26:1:31:1 | Exceptional Exit | stmts7.go:26:1:31:1 | Exit |
+| stmts7.go:26:1:31:1 | Normal Exit | stmts7.go:26:1:31:1 | Exit |
+| stmts7.go:26:1:31:1 | function declaration | stmts7.go:33:1:36:1 | function declaration |
+| stmts7.go:26:16:26:23 | callback | stmts7.go:26:40:31:1 | block statement |
+| stmts7.go:26:40:31:1 | After block statement | stmts7.go:26:1:31:1 | Normal Exit |
+| stmts7.go:26:40:31:1 | block statement | stmts7.go:27:2:27:20 | Before defer statement |
+| stmts7.go:27:2:27:20 | After defer statement | stmts7.go:28:2:28:23 | Before defer statement |
+| stmts7.go:27:2:27:20 | Before defer statement | stmts7.go:27:8:27:20 | call to fn |
+| stmts7.go:27:2:27:20 | catch-defer-panic defer statement | stmts7.go:26:1:31:1 | Exceptional Exit |
+| stmts7.go:27:2:27:20 | defer statement | stmts7.go:27:2:27:20 | After defer statement |
+| stmts7.go:27:8:27:15 | callback | stmts7.go:27:8:27:18 | selection of fn |
+| stmts7.go:27:8:27:18 | After selection of fn | stmts7.go:27:8:27:20 | After call to fn |
+| stmts7.go:27:8:27:18 | Before selection of fn | stmts7.go:27:8:27:15 | callback |
+| stmts7.go:27:8:27:18 | selection of fn | stmts7.go:27:8:27:18 | After selection of fn |
+| stmts7.go:27:8:27:20 | After call to fn | stmts7.go:27:2:27:20 | defer statement |
+| stmts7.go:27:8:27:20 | call to fn | stmts7.go:27:8:27:18 | Before selection of fn |
+| stmts7.go:27:8:27:20 | defer-invoke call to fn | stmts7.go:26:40:31:1 | After block statement |
+| stmts7.go:27:8:27:20 | defer-invoke call to fn | stmts7.go:27:2:27:20 | catch-defer-panic defer statement |
+| stmts7.go:28:2:28:23 | After defer statement | stmts7.go:29:2:29:31 | expression statement |
+| stmts7.go:28:2:28:23 | Before defer statement | stmts7.go:28:8:28:23 | call to fn |
+| stmts7.go:28:2:28:23 | catch-defer-panic defer statement | stmts7.go:27:8:27:20 | defer-invoke call to fn |
+| stmts7.go:28:2:28:23 | defer statement | stmts7.go:28:2:28:23 | After defer statement |
+| stmts7.go:28:8:28:21 | After selection of fn | stmts7.go:28:8:28:23 | After call to fn |
+| stmts7.go:28:8:28:21 | Before selection of fn | stmts7.go:28:9:28:17 | Before &... |
+| stmts7.go:28:8:28:21 | selection of fn | stmts7.go:28:8:28:21 | After selection of fn |
+| stmts7.go:28:8:28:23 | After call to fn | stmts7.go:28:2:28:23 | defer statement |
+| stmts7.go:28:8:28:23 | call to fn | stmts7.go:28:8:28:21 | Before selection of fn |
+| stmts7.go:28:8:28:23 | defer-invoke call to fn | stmts7.go:27:8:27:20 | defer-invoke call to fn |
+| stmts7.go:28:8:28:23 | defer-invoke call to fn | stmts7.go:28:2:28:23 | catch-defer-panic defer statement |
+| stmts7.go:28:9:28:17 | &... | stmts7.go:28:9:28:17 | After &... |
+| stmts7.go:28:9:28:17 | After &... | stmts7.go:28:9:28:17 | implicit-deref &... |
+| stmts7.go:28:9:28:17 | Before &... | stmts7.go:28:10:28:17 | callback |
+| stmts7.go:28:9:28:17 | implicit-deref &... | stmts7.go:28:8:28:21 | selection of fn |
+| stmts7.go:28:10:28:17 | callback | stmts7.go:28:9:28:17 | &... |
+| stmts7.go:29:2:29:12 | After selection of Println | stmts7.go:29:14:29:30 | "print something" |
+| stmts7.go:29:2:29:12 | Before selection of Println | stmts7.go:29:2:29:12 | selection of Println |
+| stmts7.go:29:2:29:12 | selection of Println | stmts7.go:29:2:29:12 | After selection of Println |
+| stmts7.go:29:2:29:31 | After call to Println | stmts7.go:29:2:29:31 | After expression statement |
+| stmts7.go:29:2:29:31 | After expression statement | stmts7.go:30:2:30:13 | Before return statement |
+| stmts7.go:29:2:29:31 | Before call to Println | stmts7.go:29:2:29:12 | Before selection of Println |
+| stmts7.go:29:2:29:31 | call to Println | stmts7.go:29:2:29:31 | After call to Println |
+| stmts7.go:29:2:29:31 | call to Println | stmts7.go:29:2:29:31 | catch-panic expression statement |
+| stmts7.go:29:2:29:31 | catch-panic expression statement | stmts7.go:28:8:28:23 | defer-invoke call to fn |
+| stmts7.go:29:2:29:31 | expression statement | stmts7.go:29:2:29:31 | Before call to Println |
+| stmts7.go:29:14:29:30 | "print something" | stmts7.go:29:2:29:31 | call to Println |
+| stmts7.go:30:2:30:13 | Before return statement | stmts7.go:30:9:30:13 | false |
+| stmts7.go:30:2:30:13 | catch-return return statement | stmts7.go:28:8:28:23 | defer-invoke call to fn |
+| stmts7.go:30:2:30:13 | return statement | stmts7.go:30:2:30:13 | catch-return return statement |
+| stmts7.go:30:9:30:13 | false | stmts7.go:30:2:30:13 | return statement |
+| stmts7.go:33:1:36:1 | Entry | stmts7.go:33:24:36:1 | block statement |
+| stmts7.go:33:1:36:1 | Exceptional Exit | stmts7.go:33:1:36:1 | Exit |
+| stmts7.go:33:1:36:1 | function declaration | stmts7.go:38:1:41:1 | function declaration |
+| stmts7.go:33:24:36:1 | block statement | stmts7.go:34:2:34:21 | Before defer statement |
+| stmts7.go:34:2:34:21 | After defer statement | stmts7.go:35:2:35:11 | expression statement |
+| stmts7.go:34:2:34:21 | Before defer statement | stmts7.go:34:8:34:21 | call to recoverPanic |
+| stmts7.go:34:2:34:21 | defer statement | stmts7.go:34:2:34:21 | After defer statement |
+| stmts7.go:34:8:34:19 | recoverPanic | stmts7.go:34:8:34:21 | After call to recoverPanic |
+| stmts7.go:34:8:34:21 | After call to recoverPanic | stmts7.go:34:2:34:21 | defer statement |
+| stmts7.go:34:8:34:21 | call to recoverPanic | stmts7.go:34:8:34:19 | recoverPanic |
+| stmts7.go:35:2:35:8 | After selection of Exit | stmts7.go:35:10:35:10 | 1 |
+| stmts7.go:35:2:35:8 | Before selection of Exit | stmts7.go:35:2:35:8 | selection of Exit |
+| stmts7.go:35:2:35:8 | selection of Exit | stmts7.go:35:2:35:8 | After selection of Exit |
+| stmts7.go:35:2:35:11 | Before call to Exit | stmts7.go:35:2:35:8 | Before selection of Exit |
+| stmts7.go:35:2:35:11 | call to Exit | stmts7.go:33:1:36:1 | Exceptional Exit |
+| stmts7.go:35:2:35:11 | expression statement | stmts7.go:35:2:35:11 | Before call to Exit |
+| stmts7.go:35:10:35:10 | 1 | stmts7.go:35:2:35:11 | call to Exit |
+| stmts7.go:38:1:41:1 | Entry | stmts7.go:38:22:41:1 | block statement |
+| stmts7.go:38:1:41:1 | Exceptional Exit | stmts7.go:38:1:41:1 | Exit |
+| stmts7.go:38:1:41:1 | Normal Exit | stmts7.go:38:1:41:1 | Exit |
+| stmts7.go:38:1:41:1 | function declaration | stmts7.go:43:1:45:1 | function declaration |
+| stmts7.go:38:22:41:1 | After block statement | stmts7.go:38:1:41:1 | Normal Exit |
+| stmts7.go:38:22:41:1 | block statement | stmts7.go:39:2:39:21 | Before defer statement |
+| stmts7.go:39:2:39:21 | After defer statement | stmts7.go:40:2:40:30 | Before defer statement |
+| stmts7.go:39:2:39:21 | Before defer statement | stmts7.go:39:8:39:21 | call to recoverPanic |
+| stmts7.go:39:2:39:21 | catch-defer-panic defer statement | stmts7.go:38:1:41:1 | Exceptional Exit |
+| stmts7.go:39:2:39:21 | defer statement | stmts7.go:39:2:39:21 | After defer statement |
+| stmts7.go:39:8:39:19 | recoverPanic | stmts7.go:39:8:39:21 | After call to recoverPanic |
+| stmts7.go:39:8:39:21 | After call to recoverPanic | stmts7.go:39:2:39:21 | defer statement |
+| stmts7.go:39:8:39:21 | call to recoverPanic | stmts7.go:39:8:39:19 | recoverPanic |
+| stmts7.go:39:8:39:21 | defer-invoke call to recoverPanic | stmts7.go:38:22:41:1 | After block statement |
+| stmts7.go:39:8:39:21 | defer-invoke call to recoverPanic | stmts7.go:39:2:39:21 | catch-defer-panic defer statement |
+| stmts7.go:40:2:40:30 | After defer statement | stmts7.go:40:8:40:30 | defer-invoke call to panic |
+| stmts7.go:40:2:40:30 | Before defer statement | stmts7.go:40:8:40:30 | call to panic |
+| stmts7.go:40:2:40:30 | catch-defer-panic defer statement | stmts7.go:39:8:39:21 | defer-invoke call to recoverPanic |
+| stmts7.go:40:2:40:30 | defer statement | stmts7.go:40:2:40:30 | After defer statement |
+| stmts7.go:40:8:40:12 | panic | stmts7.go:40:14:40:29 | "deferred panic" |
+| stmts7.go:40:8:40:30 | After call to panic | stmts7.go:40:2:40:30 | defer statement |
+| stmts7.go:40:8:40:30 | call to panic | stmts7.go:40:8:40:12 | panic |
+| stmts7.go:40:8:40:30 | defer-invoke call to panic | stmts7.go:39:8:39:21 | defer-invoke call to recoverPanic |
+| stmts7.go:40:8:40:30 | defer-invoke call to panic | stmts7.go:40:2:40:30 | catch-defer-panic defer statement |
+| stmts7.go:40:14:40:29 | "deferred panic" | stmts7.go:40:8:40:30 | After call to panic |
+| stmts7.go:43:1:45:1 | Entry | stmts7.go:43:27:45:1 | block statement |
+| stmts7.go:43:1:45:1 | Exceptional Exit | stmts7.go:43:1:45:1 | Exit |
+| stmts7.go:43:1:45:1 | function declaration | stmts7.go:47:1:50:1 | function declaration |
+| stmts7.go:43:27:45:1 | block statement | stmts7.go:44:2:44:36 | Before defer statement |
+| stmts7.go:44:2:44:36 | After defer statement | stmts7.go:44:8:44:36 | defer-invoke call to panic |
+| stmts7.go:44:2:44:36 | Before defer statement | stmts7.go:44:8:44:36 | call to panic |
+| stmts7.go:44:2:44:36 | catch-defer-panic defer statement | stmts7.go:43:1:45:1 | Exceptional Exit |
+| stmts7.go:44:2:44:36 | defer statement | stmts7.go:44:2:44:36 | After defer statement |
+| stmts7.go:44:8:44:12 | panic | stmts7.go:44:14:44:35 | "final deferred panic" |
+| stmts7.go:44:8:44:36 | After call to panic | stmts7.go:44:2:44:36 | defer statement |
+| stmts7.go:44:8:44:36 | call to panic | stmts7.go:44:8:44:12 | panic |
+| stmts7.go:44:8:44:36 | defer-invoke call to panic | stmts7.go:44:2:44:36 | catch-defer-panic defer statement |
+| stmts7.go:44:14:44:35 | "final deferred panic" | stmts7.go:44:8:44:36 | After call to panic |
+| stmts7.go:47:1:50:1 | Entry | stmts7.go:47:35:50:1 | block statement |
+| stmts7.go:47:1:50:1 | Exceptional Exit | stmts7.go:47:1:50:1 | Exit |
+| stmts7.go:47:1:50:1 | function declaration | stmts7.go:52:1:55:1 | function declaration |
+| stmts7.go:47:35:50:1 | block statement | stmts7.go:48:2:48:21 | Before defer statement |
+| stmts7.go:48:2:48:21 | After defer statement | stmts7.go:49:2:49:17 | Before defer statement |
+| stmts7.go:48:2:48:21 | Before defer statement | stmts7.go:48:8:48:21 | call to recoverPanic |
+| stmts7.go:48:2:48:21 | defer statement | stmts7.go:48:2:48:21 | After defer statement |
+| stmts7.go:48:8:48:19 | recoverPanic | stmts7.go:48:8:48:21 | After call to recoverPanic |
+| stmts7.go:48:8:48:21 | After call to recoverPanic | stmts7.go:48:2:48:21 | defer statement |
+| stmts7.go:48:8:48:21 | call to recoverPanic | stmts7.go:48:8:48:19 | recoverPanic |
+| stmts7.go:49:2:49:17 | After defer statement | stmts7.go:49:8:49:17 | defer-invoke call to Exit |
+| stmts7.go:49:2:49:17 | Before defer statement | stmts7.go:49:8:49:17 | call to Exit |
+| stmts7.go:49:2:49:17 | catch-defer-panic defer statement | stmts7.go:47:1:50:1 | Exceptional Exit |
+| stmts7.go:49:2:49:17 | defer statement | stmts7.go:49:2:49:17 | After defer statement |
+| stmts7.go:49:8:49:14 | After selection of Exit | stmts7.go:49:16:49:16 | 1 |
+| stmts7.go:49:8:49:14 | Before selection of Exit | stmts7.go:49:8:49:14 | selection of Exit |
+| stmts7.go:49:8:49:14 | selection of Exit | stmts7.go:49:8:49:14 | After selection of Exit |
+| stmts7.go:49:8:49:17 | After call to Exit | stmts7.go:49:2:49:17 | defer statement |
+| stmts7.go:49:8:49:17 | call to Exit | stmts7.go:49:8:49:14 | Before selection of Exit |
+| stmts7.go:49:8:49:17 | defer-invoke call to Exit | stmts7.go:49:2:49:17 | catch-defer-panic defer statement |
+| stmts7.go:49:16:49:16 | 1 | stmts7.go:49:8:49:17 | After call to Exit |
+| stmts7.go:52:1:55:1 | Entry | stmts7.go:52:31:52:36 | values |
+| stmts7.go:52:1:55:1 | Exceptional Exit | stmts7.go:52:1:55:1 | Exit |
+| stmts7.go:52:1:55:1 | Normal Exit | stmts7.go:52:1:55:1 | Exit |
+| stmts7.go:52:1:55:1 | function declaration | stmts7.go:57:1:62:1 | function declaration |
+| stmts7.go:52:31:52:36 | values | stmts7.go:52:45:52:49 | index |
+| stmts7.go:52:45:52:49 | index | stmts7.go:52:56:55:1 | block statement |
+| stmts7.go:52:56:55:1 | After block statement | stmts7.go:52:1:55:1 | Normal Exit |
+| stmts7.go:52:56:55:1 | block statement | stmts7.go:53:2:53:21 | Before defer statement |
+| stmts7.go:53:2:53:21 | After defer statement | stmts7.go:54:2:54:18 | ... = ... |
+| stmts7.go:53:2:53:21 | Before defer statement | stmts7.go:53:8:53:21 | call to recoverPanic |
+| stmts7.go:53:2:53:21 | catch-defer-panic defer statement | stmts7.go:52:1:55:1 | Exceptional Exit |
+| stmts7.go:53:2:53:21 | defer statement | stmts7.go:53:2:53:21 | After defer statement |
+| stmts7.go:53:8:53:19 | recoverPanic | stmts7.go:53:8:53:21 | After call to recoverPanic |
+| stmts7.go:53:8:53:21 | After call to recoverPanic | stmts7.go:53:2:53:21 | defer statement |
+| stmts7.go:53:8:53:21 | call to recoverPanic | stmts7.go:53:8:53:19 | recoverPanic |
+| stmts7.go:53:8:53:21 | defer-invoke call to recoverPanic | stmts7.go:52:56:55:1 | After block statement |
+| stmts7.go:53:8:53:21 | defer-invoke call to recoverPanic | stmts7.go:53:2:53:21 | catch-defer-panic defer statement |
+| stmts7.go:54:2:54:18 | ... = ... | stmts7.go:54:6:54:18 | Before index expression |
+| stmts7.go:54:2:54:18 | After ... = ... | stmts7.go:53:8:53:21 | defer-invoke call to recoverPanic |
+| stmts7.go:54:2:54:18 | catch-panic ... = ... | stmts7.go:53:8:53:21 | defer-invoke call to recoverPanic |
+| stmts7.go:54:6:54:11 | values | stmts7.go:54:13:54:17 | index |
+| stmts7.go:54:6:54:18 | After index expression | stmts7.go:54:2:54:18 | After ... = ... |
+| stmts7.go:54:6:54:18 | Before index expression | stmts7.go:54:6:54:11 | values |
+| stmts7.go:54:6:54:18 | index expression | stmts7.go:54:2:54:18 | catch-panic ... = ... |
+| stmts7.go:54:6:54:18 | index expression | stmts7.go:54:6:54:18 | After index expression |
+| stmts7.go:54:13:54:17 | index | stmts7.go:54:6:54:18 | index expression |
+| stmts7.go:57:1:62:1 | Entry | stmts7.go:57:23:57:30 | register |
+| stmts7.go:57:1:62:1 | Exceptional Exit | stmts7.go:57:1:62:1 | Exit |
+| stmts7.go:57:1:62:1 | Normal Exit | stmts7.go:57:1:62:1 | Exit |
+| stmts7.go:57:1:62:1 | function declaration | stmts7.go:64:1:68:1 | function declaration |
+| stmts7.go:57:23:57:30 | register | stmts7.go:57:38:62:1 | block statement |
+| stmts7.go:57:38:62:1 | After block statement | stmts7.go:57:1:62:1 | Normal Exit |
+| stmts7.go:57:38:62:1 | block statement | stmts7.go:58:2:60:2 | if statement |
+| stmts7.go:58:2:60:2 | After if statement | stmts7.go:61:2:61:20 | expression statement |
+| stmts7.go:58:2:60:2 | if statement | stmts7.go:58:5:58:12 | register |
+| stmts7.go:58:5:58:12 | After register [false] | stmts7.go:58:2:60:2 | After if statement |
+| stmts7.go:58:5:58:12 | After register [true] | stmts7.go:58:14:60:2 | block statement |
+| stmts7.go:58:5:58:12 | register | stmts7.go:58:5:58:12 | After register [false] |
+| stmts7.go:58:5:58:12 | register | stmts7.go:58:5:58:12 | After register [true] |
+| stmts7.go:58:14:60:2 | After block statement | stmts7.go:58:2:60:2 | After if statement |
+| stmts7.go:58:14:60:2 | block statement | stmts7.go:59:3:59:22 | Before defer statement |
+| stmts7.go:59:3:59:22 | After defer statement | stmts7.go:58:14:60:2 | After block statement |
+| stmts7.go:59:3:59:22 | Before defer statement | stmts7.go:59:9:59:22 | call to recoverPanic |
+| stmts7.go:59:3:59:22 | catch-defer-panic defer statement | stmts7.go:57:1:62:1 | Exceptional Exit |
+| stmts7.go:59:3:59:22 | defer statement | stmts7.go:59:3:59:22 | After defer statement |
+| stmts7.go:59:9:59:20 | recoverPanic | stmts7.go:59:9:59:22 | After call to recoverPanic |
+| stmts7.go:59:9:59:22 | After call to recoverPanic | stmts7.go:59:3:59:22 | defer statement |
+| stmts7.go:59:9:59:22 | call to recoverPanic | stmts7.go:59:9:59:20 | recoverPanic |
+| stmts7.go:59:9:59:22 | defer-invoke call to recoverPanic | stmts7.go:57:38:62:1 | After block statement |
+| stmts7.go:59:9:59:22 | defer-invoke call to recoverPanic | stmts7.go:59:3:59:22 | catch-defer-panic defer statement |
+| stmts7.go:61:2:61:12 | After selection of Println | stmts7.go:61:14:61:19 | "done" |
+| stmts7.go:61:2:61:12 | Before selection of Println | stmts7.go:61:2:61:12 | selection of Println |
+| stmts7.go:61:2:61:12 | selection of Println | stmts7.go:61:2:61:12 | After selection of Println |
+| stmts7.go:61:2:61:20 | After call to Println | stmts7.go:61:2:61:20 | After expression statement |
+| stmts7.go:61:2:61:20 | After expression statement | stmts7.go:57:38:62:1 | After block statement |
+| stmts7.go:61:2:61:20 | After expression statement | stmts7.go:59:9:59:22 | defer-invoke call to recoverPanic |
+| stmts7.go:61:2:61:20 | Before call to Println | stmts7.go:61:2:61:12 | Before selection of Println |
+| stmts7.go:61:2:61:20 | call to Println | stmts7.go:61:2:61:20 | After call to Println |
+| stmts7.go:61:2:61:20 | call to Println | stmts7.go:61:2:61:20 | catch-panic expression statement |
+| stmts7.go:61:2:61:20 | catch-panic expression statement | stmts7.go:57:1:62:1 | Exceptional Exit |
+| stmts7.go:61:2:61:20 | catch-panic expression statement | stmts7.go:59:9:59:22 | defer-invoke call to recoverPanic |
+| stmts7.go:61:2:61:20 | expression statement | stmts7.go:61:2:61:20 | Before call to Println |
+| stmts7.go:61:14:61:19 | "done" | stmts7.go:61:2:61:20 | call to Println |
+| stmts7.go:64:1:68:1 | Entry | stmts7.go:64:20:64:24 | count |
+| stmts7.go:64:1:68:1 | Exceptional Exit | stmts7.go:64:1:68:1 | Exit |
+| stmts7.go:64:1:68:1 | Normal Exit | stmts7.go:64:1:68:1 | Exit |
+| stmts7.go:64:1:68:1 | function declaration | stmts7.go:70:1:77:1 | function declaration |
+| stmts7.go:64:20:64:24 | count | stmts7.go:64:31:68:1 | block statement |
+| stmts7.go:64:31:68:1 | After block statement | stmts7.go:64:1:68:1 | Normal Exit |
+| stmts7.go:64:31:68:1 | block statement | stmts7.go:65:2:67:2 | for statement |
+| stmts7.go:65:2:67:2 | After for statement | stmts7.go:64:31:68:1 | After block statement |
+| stmts7.go:65:2:67:2 | After for statement | stmts7.go:66:9:66:22 | defer-invoke call to recoverPanic |
+| stmts7.go:65:2:67:2 | [LoopHeader] for statement | stmts7.go:65:25:65:27 | Before increment statement |
+| stmts7.go:65:2:67:2 | for statement | stmts7.go:65:6:65:11 | ... := ... |
+| stmts7.go:65:6:65:11 | ... := ... | stmts7.go:65:11:65:11 | 0 |
+| stmts7.go:65:6:65:11 | After ... := ... | stmts7.go:65:14:65:22 | Before ...<... |
+| stmts7.go:65:6:65:11 | assign:0 ... := ... | stmts7.go:65:6:65:11 | After ... := ... |
+| stmts7.go:65:11:65:11 | 0 | stmts7.go:65:6:65:11 | assign:0 ... := ... |
+| stmts7.go:65:14:65:14 | i | stmts7.go:65:18:65:22 | count |
+| stmts7.go:65:14:65:22 | ...<... | stmts7.go:65:14:65:22 | After ...<... [false] |
+| stmts7.go:65:14:65:22 | ...<... | stmts7.go:65:14:65:22 | After ...<... [true] |
+| stmts7.go:65:14:65:22 | After ...<... [false] | stmts7.go:65:2:67:2 | After for statement |
+| stmts7.go:65:14:65:22 | After ...<... [true] | stmts7.go:65:29:67:2 | block statement |
+| stmts7.go:65:14:65:22 | Before ...<... | stmts7.go:65:14:65:14 | i |
+| stmts7.go:65:18:65:22 | count | stmts7.go:65:14:65:22 | ...<... |
+| stmts7.go:65:25:65:25 | i | stmts7.go:65:25:65:27 | increment statement |
+| stmts7.go:65:25:65:27 | After increment statement | stmts7.go:65:14:65:22 | Before ...<... |
+| stmts7.go:65:25:65:27 | Before increment statement | stmts7.go:65:25:65:25 | i |
+| stmts7.go:65:25:65:27 | increment statement | stmts7.go:65:25:65:27 | After increment statement |
+| stmts7.go:65:29:67:2 | After block statement | stmts7.go:65:2:67:2 | [LoopHeader] for statement |
+| stmts7.go:65:29:67:2 | block statement | stmts7.go:66:3:66:22 | Before defer statement |
+| stmts7.go:66:3:66:22 | After defer statement | stmts7.go:65:29:67:2 | After block statement |
+| stmts7.go:66:3:66:22 | Before defer statement | stmts7.go:66:9:66:22 | call to recoverPanic |
+| stmts7.go:66:3:66:22 | catch-defer-panic defer statement | stmts7.go:64:1:68:1 | Exceptional Exit |
+| stmts7.go:66:3:66:22 | catch-defer-panic defer statement | stmts7.go:66:9:66:22 | defer-invoke call to recoverPanic |
+| stmts7.go:66:3:66:22 | defer statement | stmts7.go:66:3:66:22 | After defer statement |
+| stmts7.go:66:9:66:20 | recoverPanic | stmts7.go:66:9:66:22 | After call to recoverPanic |
+| stmts7.go:66:9:66:22 | After call to recoverPanic | stmts7.go:66:3:66:22 | defer statement |
+| stmts7.go:66:9:66:22 | call to recoverPanic | stmts7.go:66:9:66:20 | recoverPanic |
+| stmts7.go:66:9:66:22 | defer-invoke call to recoverPanic | stmts7.go:64:31:68:1 | After block statement |
+| stmts7.go:66:9:66:22 | defer-invoke call to recoverPanic | stmts7.go:66:3:66:22 | catch-defer-panic defer statement |
+| stmts7.go:66:9:66:22 | defer-invoke call to recoverPanic | stmts7.go:66:9:66:22 | defer-invoke call to recoverPanic |
+| stmts7.go:70:1:77:1 | Entry | stmts7.go:70:20:70:23 | skip |
+| stmts7.go:70:1:77:1 | Exceptional Exit | stmts7.go:70:1:77:1 | Exit |
+| stmts7.go:70:1:77:1 | Normal Exit | stmts7.go:70:1:77:1 | Exit |
+| stmts7.go:70:1:77:1 | function declaration | stmts7.go:79:1:85:1 | function declaration |
+| stmts7.go:70:20:70:23 | skip | stmts7.go:70:31:77:1 | block statement |
+| stmts7.go:70:31:77:1 | After block statement | stmts7.go:70:1:77:1 | Normal Exit |
+| stmts7.go:70:31:77:1 | block statement | stmts7.go:71:2:73:2 | if statement |
+| stmts7.go:71:2:73:2 | After if statement | stmts7.go:74:2:74:21 | Before defer statement |
+| stmts7.go:71:2:73:2 | if statement | stmts7.go:71:5:71:8 | skip |
+| stmts7.go:71:5:71:8 | After skip [false] | stmts7.go:71:2:73:2 | After if statement |
+| stmts7.go:71:5:71:8 | After skip [true] | stmts7.go:71:10:73:2 | block statement |
+| stmts7.go:71:5:71:8 | skip | stmts7.go:71:5:71:8 | After skip [false] |
+| stmts7.go:71:5:71:8 | skip | stmts7.go:71:5:71:8 | After skip [true] |
+| stmts7.go:71:10:73:2 | block statement | stmts7.go:72:3:72:11 | Before goto statement |
+| stmts7.go:72:3:72:11 | Before goto statement | stmts7.go:72:3:72:11 | goto statement |
+| stmts7.go:72:3:72:11 | goto statement | stmts7.go:75:1:76:20 | labeled statement |
+| stmts7.go:74:2:74:21 | After defer statement | stmts7.go:75:1:76:20 | labeled statement |
+| stmts7.go:74:2:74:21 | Before defer statement | stmts7.go:74:8:74:21 | call to recoverPanic |
+| stmts7.go:74:2:74:21 | catch-defer-panic defer statement | stmts7.go:70:1:77:1 | Exceptional Exit |
+| stmts7.go:74:2:74:21 | defer statement | stmts7.go:74:2:74:21 | After defer statement |
+| stmts7.go:74:8:74:19 | recoverPanic | stmts7.go:74:8:74:21 | After call to recoverPanic |
+| stmts7.go:74:8:74:21 | After call to recoverPanic | stmts7.go:74:2:74:21 | defer statement |
+| stmts7.go:74:8:74:21 | call to recoverPanic | stmts7.go:74:8:74:19 | recoverPanic |
+| stmts7.go:74:8:74:21 | defer-invoke call to recoverPanic | stmts7.go:70:31:77:1 | After block statement |
+| stmts7.go:74:8:74:21 | defer-invoke call to recoverPanic | stmts7.go:74:2:74:21 | catch-defer-panic defer statement |
+| stmts7.go:75:1:76:20 | After labeled statement | stmts7.go:70:31:77:1 | After block statement |
+| stmts7.go:75:1:76:20 | After labeled statement | stmts7.go:74:8:74:21 | defer-invoke call to recoverPanic |
+| stmts7.go:75:1:76:20 | catch-panic labeled statement | stmts7.go:70:1:77:1 | Exceptional Exit |
+| stmts7.go:75:1:76:20 | catch-panic labeled statement | stmts7.go:74:8:74:21 | defer-invoke call to recoverPanic |
+| stmts7.go:75:1:76:20 | labeled statement | stmts7.go:76:2:76:20 | expression statement |
+| stmts7.go:76:2:76:12 | After selection of Println | stmts7.go:76:14:76:19 | "done" |
+| stmts7.go:76:2:76:12 | Before selection of Println | stmts7.go:76:2:76:12 | selection of Println |
+| stmts7.go:76:2:76:12 | selection of Println | stmts7.go:76:2:76:12 | After selection of Println |
+| stmts7.go:76:2:76:20 | After call to Println | stmts7.go:76:2:76:20 | After expression statement |
+| stmts7.go:76:2:76:20 | After expression statement | stmts7.go:75:1:76:20 | After labeled statement |
+| stmts7.go:76:2:76:20 | Before call to Println | stmts7.go:76:2:76:12 | Before selection of Println |
+| stmts7.go:76:2:76:20 | call to Println | stmts7.go:75:1:76:20 | catch-panic labeled statement |
+| stmts7.go:76:2:76:20 | call to Println | stmts7.go:76:2:76:20 | After call to Println |
+| stmts7.go:76:2:76:20 | expression statement | stmts7.go:76:2:76:20 | Before call to Println |
+| stmts7.go:76:14:76:19 | "done" | stmts7.go:76:2:76:20 | call to Println |
+| stmts7.go:79:1:85:1 | Entry | stmts7.go:79:23:79:32 | panicEarly |
+| stmts7.go:79:1:85:1 | Exceptional Exit | stmts7.go:79:1:85:1 | Exit |
+| stmts7.go:79:1:85:1 | Normal Exit | stmts7.go:79:1:85:1 | Exit |
+| stmts7.go:79:1:85:1 | function declaration | stmts7.go:0:0:0:0 | After stmts7.go |
+| stmts7.go:79:23:79:32 | panicEarly | stmts7.go:79:40:85:1 | block statement |
+| stmts7.go:79:40:85:1 | After block statement | stmts7.go:79:1:85:1 | Normal Exit |
+| stmts7.go:79:40:85:1 | block statement | stmts7.go:80:2:82:2 | if statement |
+| stmts7.go:80:2:82:2 | After if statement | stmts7.go:83:2:83:21 | Before defer statement |
+| stmts7.go:80:2:82:2 | catch-panic if statement | stmts7.go:79:1:85:1 | Exceptional Exit |
+| stmts7.go:80:2:82:2 | if statement | stmts7.go:80:5:80:14 | panicEarly |
+| stmts7.go:80:5:80:14 | After panicEarly [false] | stmts7.go:80:2:82:2 | After if statement |
+| stmts7.go:80:5:80:14 | After panicEarly [true] | stmts7.go:80:16:82:2 | block statement |
+| stmts7.go:80:5:80:14 | panicEarly | stmts7.go:80:5:80:14 | After panicEarly [false] |
+| stmts7.go:80:5:80:14 | panicEarly | stmts7.go:80:5:80:14 | After panicEarly [true] |
+| stmts7.go:80:16:82:2 | block statement | stmts7.go:81:3:81:16 | expression statement |
+| stmts7.go:81:3:81:7 | panic | stmts7.go:81:9:81:15 | "early" |
+| stmts7.go:81:3:81:16 | Before call to panic | stmts7.go:81:3:81:7 | panic |
+| stmts7.go:81:3:81:16 | call to panic | stmts7.go:80:2:82:2 | catch-panic if statement |
+| stmts7.go:81:3:81:16 | expression statement | stmts7.go:81:3:81:16 | Before call to panic |
+| stmts7.go:81:9:81:15 | "early" | stmts7.go:81:3:81:16 | call to panic |
+| stmts7.go:83:2:83:21 | After defer statement | stmts7.go:84:2:84:14 | expression statement |
+| stmts7.go:83:2:83:21 | Before defer statement | stmts7.go:83:8:83:21 | call to recoverPanic |
+| stmts7.go:83:2:83:21 | catch-defer-panic defer statement | stmts7.go:79:1:85:1 | Exceptional Exit |
+| stmts7.go:83:2:83:21 | defer statement | stmts7.go:83:2:83:21 | After defer statement |
+| stmts7.go:83:8:83:19 | recoverPanic | stmts7.go:83:8:83:21 | After call to recoverPanic |
+| stmts7.go:83:8:83:21 | After call to recoverPanic | stmts7.go:83:2:83:21 | defer statement |
+| stmts7.go:83:8:83:21 | call to recoverPanic | stmts7.go:83:8:83:19 | recoverPanic |
+| stmts7.go:83:8:83:21 | defer-invoke call to recoverPanic | stmts7.go:79:40:85:1 | After block statement |
+| stmts7.go:83:8:83:21 | defer-invoke call to recoverPanic | stmts7.go:83:2:83:21 | catch-defer-panic defer statement |
+| stmts7.go:84:2:84:6 | panic | stmts7.go:84:8:84:13 | "late" |
+| stmts7.go:84:2:84:14 | Before call to panic | stmts7.go:84:2:84:6 | panic |
+| stmts7.go:84:2:84:14 | call to panic | stmts7.go:84:2:84:14 | catch-panic expression statement |
+| stmts7.go:84:2:84:14 | catch-panic expression statement | stmts7.go:83:8:83:21 | defer-invoke call to recoverPanic |
+| stmts7.go:84:2:84:14 | expression statement | stmts7.go:84:2:84:14 | Before call to panic |
+| stmts7.go:84:8:84:13 | "late" | stmts7.go:84:2:84:14 | call to panic |
+| stmts8.go:0:0:0:0 | After stmts8.go | stmts8.go:0:0:0:0 | Normal Exit |
+| stmts8.go:0:0:0:0 | Entry | stmts8.go:0:0:0:0 | stmts8.go |
+| stmts8.go:0:0:0:0 | Normal Exit | stmts8.go:0:0:0:0 | Exit |
+| stmts8.go:0:0:0:0 | stmts8.go | stmts8.go:3:1:7:1 | function declaration |
+| stmts8.go:3:1:7:1 | Entry | stmts8.go:3:13:3:13 | x |
+| stmts8.go:3:1:7:1 | Normal Exit | stmts8.go:3:1:7:1 | Exit |
+| stmts8.go:3:1:7:1 | function declaration | stmts8.go:9:1:14:1 | function declaration |
+| stmts8.go:3:13:3:13 | x | stmts8.go:3:31:7:1 | block statement |
+| stmts8.go:3:31:7:1 | block statement | stmts8.go:4:2:4:12 | ... := ... |
+| stmts8.go:4:2:4:12 | ... := ... | stmts8.go:4:7:4:12 | Before ...>>... |
+| stmts8.go:4:2:4:12 | After ... := ... | stmts8.go:5:2:5:13 | ... := ... |
+| stmts8.go:4:2:4:12 | assign:0 ... := ... | stmts8.go:4:2:4:12 | After ... := ... |
 | stmts8.go:4:7:4:7 | x | stmts8.go:4:12:4:12 | 5 |
-| stmts8.go:4:7:4:12 | ...>>... | stmts8.go:4:2:4:2 | assignment to y |
+| stmts8.go:4:7:4:12 | ...>>... | stmts8.go:4:7:4:12 | After ...>>... |
+| stmts8.go:4:7:4:12 | After ...>>... | stmts8.go:4:2:4:12 | assign:0 ... := ... |
+| stmts8.go:4:7:4:12 | Before ...>>... | stmts8.go:4:7:4:7 | x |
 | stmts8.go:4:12:4:12 | 5 | stmts8.go:4:7:4:12 | ...>>... |
-| stmts8.go:5:2:5:2 | assignment to z | stmts8.go:6:9:6:9 | z |
-| stmts8.go:5:2:5:2 | skip | stmts8.go:5:7:5:7 | x |
+| stmts8.go:5:2:5:13 | ... := ... | stmts8.go:5:7:5:13 | Before ...%... |
+| stmts8.go:5:2:5:13 | After ... := ... | stmts8.go:6:2:6:17 | Before return statement |
+| stmts8.go:5:2:5:13 | assign:0 ... := ... | stmts8.go:5:2:5:13 | After ... := ... |
 | stmts8.go:5:7:5:7 | x | stmts8.go:5:12:5:12 | 1 |
-| stmts8.go:5:7:5:13 | ...%... | stmts8.go:5:2:5:2 | assignment to z |
+| stmts8.go:5:7:5:13 | ...%... | stmts8.go:5:7:5:13 | After ...%... |
+| stmts8.go:5:7:5:13 | After ...%... | stmts8.go:5:2:5:13 | assign:0 ... := ... |
+| stmts8.go:5:7:5:13 | Before ...%... | stmts8.go:5:7:5:7 | x |
 | stmts8.go:5:12:5:12 | 1 | stmts8.go:5:7:5:13 | ...%... |
-| stmts8.go:6:2:6:17 | return statement | stmts8.go:3:1:7:1 | exit |
-| stmts8.go:6:9:6:9 | z | stmts8.go:6:12:6:12 | y |
+| stmts8.go:6:2:6:17 | Before return statement | stmts8.go:6:9:6:9 | z |
+| stmts8.go:6:2:6:17 | return statement | stmts8.go:3:1:7:1 | Normal Exit |
+| stmts8.go:6:9:6:9 | z | stmts8.go:6:12:6:17 | Before ...%... |
 | stmts8.go:6:12:6:12 | y | stmts8.go:6:16:6:17 | 13 |
-| stmts8.go:6:12:6:17 | ...%... | stmts8.go:6:2:6:17 | return statement |
+| stmts8.go:6:12:6:17 | ...%... | stmts8.go:6:12:6:17 | After ...%... |
+| stmts8.go:6:12:6:17 | After ...%... | stmts8.go:6:2:6:17 | return statement |
+| stmts8.go:6:12:6:17 | Before ...%... | stmts8.go:6:12:6:12 | y |
 | stmts8.go:6:16:6:17 | 13 | stmts8.go:6:12:6:17 | ...%... |
-| stmts8.go:9:1:14:1 | entry | stmts8.go:10:5:10:9 | linux |
-| stmts8.go:9:1:14:1 | function declaration | stmts8.go:0:0:0:0 | exit |
-| stmts8.go:9:6:9:12 | skip | stmts8.go:9:1:14:1 | function declaration |
-| stmts8.go:10:5:10:9 | linux | stmts8.go:10:5:10:9 | linux is false |
-| stmts8.go:10:5:10:9 | linux | stmts8.go:10:5:10:9 | linux is true |
-| stmts8.go:10:5:10:9 | linux is false | stmts8.go:13:9:13:13 | false |
-| stmts8.go:10:5:10:9 | linux is true | stmts8.go:11:10:11:13 | true |
-| stmts8.go:11:3:11:13 | return statement | stmts8.go:9:1:14:1 | exit |
+| stmts8.go:9:1:14:1 | Entry | stmts8.go:9:21:14:1 | block statement |
+| stmts8.go:9:1:14:1 | Normal Exit | stmts8.go:9:1:14:1 | Exit |
+| stmts8.go:9:1:14:1 | function declaration | stmts8.go:0:0:0:0 | After stmts8.go |
+| stmts8.go:9:21:14:1 | block statement | stmts8.go:10:2:12:2 | if statement |
+| stmts8.go:10:2:12:2 | After if statement | stmts8.go:13:2:13:13 | Before return statement |
+| stmts8.go:10:2:12:2 | if statement | stmts8.go:10:5:10:9 | linux |
+| stmts8.go:10:5:10:9 | After linux [false] | stmts8.go:10:2:12:2 | After if statement |
+| stmts8.go:10:5:10:9 | After linux [true] | stmts8.go:10:11:12:2 | block statement |
+| stmts8.go:10:5:10:9 | linux | stmts8.go:10:5:10:9 | After linux [false] |
+| stmts8.go:10:5:10:9 | linux | stmts8.go:10:5:10:9 | After linux [true] |
+| stmts8.go:10:11:12:2 | block statement | stmts8.go:11:3:11:13 | Before return statement |
+| stmts8.go:11:3:11:13 | Before return statement | stmts8.go:11:10:11:13 | true |
+| stmts8.go:11:3:11:13 | return statement | stmts8.go:9:1:14:1 | Normal Exit |
 | stmts8.go:11:10:11:13 | true | stmts8.go:11:3:11:13 | return statement |
-| stmts8.go:13:2:13:13 | return statement | stmts8.go:9:1:14:1 | exit |
+| stmts8.go:13:2:13:13 | Before return statement | stmts8.go:13:9:13:13 | false |
+| stmts8.go:13:2:13:13 | return statement | stmts8.go:9:1:14:1 | Normal Exit |
 | stmts8.go:13:9:13:13 | false | stmts8.go:13:2:13:13 | return statement |
-| stmts.go:0:0:0:0 | entry | stmts.go:3:1:3:12 | skip |
-| stmts.go:3:1:3:12 | skip | stmts.go:10:6:10:10 | skip |
-| stmts.go:10:1:43:1 | entry | stmts.go:10:12:10:12 | argument corresponding to b |
-| stmts.go:10:1:43:1 | function declaration | stmts.go:46:6:46:10 | skip |
-| stmts.go:10:6:10:10 | skip | stmts.go:10:1:43:1 | function declaration |
-| stmts.go:10:12:10:12 | argument corresponding to b | stmts.go:10:12:10:12 | initialization of b |
-| stmts.go:10:12:10:12 | initialization of b | stmts.go:12:7:12:7 | b |
-| stmts.go:12:6:12:7 | !... | stmts.go:12:6:12:7 | !... is false |
-| stmts.go:12:6:12:7 | !... | stmts.go:12:6:12:7 | !... is true |
-| stmts.go:12:6:12:7 | !... is false | stmts.go:15:3:16:3 | skip |
-| stmts.go:12:6:12:7 | !... is true | stmts.go:13:4:13:13 | skip |
-| stmts.go:12:7:12:7 | b | stmts.go:12:6:12:7 | !... |
-| stmts.go:13:4:13:13 | skip | stmts.go:23:6:23:9 | true |
-| stmts.go:15:3:16:3 | skip | stmts.go:17:3:17:3 | skip |
-| stmts.go:17:3:17:3 | skip | stmts.go:20:2:20:12 | selection of Println |
-| stmts.go:20:2:20:12 | selection of Println | stmts.go:20:14:20:17 | "Hi" |
-| stmts.go:20:2:20:18 | call to Println | stmts.go:10:1:43:1 | exit |
-| stmts.go:20:2:20:18 | call to Println | stmts.go:23:6:23:9 | true |
+| stmts.go:0:0:0:0 | After stmts.go | stmts.go:0:0:0:0 | Normal Exit |
+| stmts.go:0:0:0:0 | Entry | stmts.go:0:0:0:0 | stmts.go |
+| stmts.go:0:0:0:0 | Normal Exit | stmts.go:0:0:0:0 | Exit |
+| stmts.go:0:0:0:0 | stmts.go | stmts.go:3:1:3:12 | import declaration |
+| stmts.go:3:1:3:12 | import declaration | stmts.go:10:1:43:1 | function declaration |
+| stmts.go:10:1:43:1 | Entry | stmts.go:10:12:10:12 | b |
+| stmts.go:10:1:43:1 | Exceptional Exit | stmts.go:10:1:43:1 | Exit |
+| stmts.go:10:1:43:1 | function declaration | stmts.go:46:1:62:1 | function declaration |
+| stmts.go:10:12:10:12 | b | stmts.go:10:20:43:1 | block statement |
+| stmts.go:10:20:43:1 | block statement | stmts.go:11:2:18:2 | block statement |
+| stmts.go:11:2:18:2 | After block statement | stmts.go:20:2:20:18 | expression statement |
+| stmts.go:11:2:18:2 | block statement | stmts.go:12:3:14:3 | if statement |
+| stmts.go:12:3:14:3 | After if statement | stmts.go:15:3:16:3 | block statement |
+| stmts.go:12:3:14:3 | if statement | stmts.go:12:6:12:7 | !... |
+| stmts.go:12:6:12:7 | !... | stmts.go:12:7:12:7 | b |
+| stmts.go:12:6:12:7 | After !... [false] | stmts.go:12:3:14:3 | After if statement |
+| stmts.go:12:6:12:7 | After !... [true] | stmts.go:12:9:14:3 | block statement |
+| stmts.go:12:7:12:7 | After b [false] | stmts.go:12:6:12:7 | After !... [true] |
+| stmts.go:12:7:12:7 | After b [true] | stmts.go:12:6:12:7 | After !... [false] |
+| stmts.go:12:7:12:7 | b | stmts.go:12:7:12:7 | After b [false] |
+| stmts.go:12:7:12:7 | b | stmts.go:12:7:12:7 | After b [true] |
+| stmts.go:12:9:14:3 | block statement | stmts.go:13:4:13:13 | Before goto statement |
+| stmts.go:13:4:13:13 | Before goto statement | stmts.go:13:4:13:13 | goto statement |
+| stmts.go:13:4:13:13 | goto statement | stmts.go:22:1:37:2 | labeled statement |
+| stmts.go:15:3:16:3 | block statement | stmts.go:17:3:17:3 | empty statement |
+| stmts.go:17:3:17:3 | empty statement | stmts.go:11:2:18:2 | After block statement |
+| stmts.go:20:2:20:12 | After selection of Println | stmts.go:20:14:20:17 | "Hi" |
+| stmts.go:20:2:20:12 | Before selection of Println | stmts.go:20:2:20:12 | selection of Println |
+| stmts.go:20:2:20:12 | selection of Println | stmts.go:20:2:20:12 | After selection of Println |
+| stmts.go:20:2:20:18 | After call to Println | stmts.go:20:2:20:18 | After expression statement |
+| stmts.go:20:2:20:18 | After expression statement | stmts.go:22:1:37:2 | labeled statement |
+| stmts.go:20:2:20:18 | Before call to Println | stmts.go:20:2:20:12 | Before selection of Println |
+| stmts.go:20:2:20:18 | call to Println | stmts.go:10:1:43:1 | Exceptional Exit |
+| stmts.go:20:2:20:18 | call to Println | stmts.go:20:2:20:18 | After call to Println |
+| stmts.go:20:2:20:18 | expression statement | stmts.go:20:2:20:18 | Before call to Println |
 | stmts.go:20:14:20:17 | "Hi" | stmts.go:20:2:20:18 | call to Println |
-| stmts.go:23:6:23:9 | true | stmts.go:23:6:23:9 | true is true |
-| stmts.go:23:6:23:9 | true is false | stmts.go:39:2:39:2 | skip |
-| stmts.go:23:6:23:9 | true is true | stmts.go:24:7:24:7 | skip |
-| stmts.go:24:7:24:7 | assignment to i | stmts.go:24:15:24:15 | i |
-| stmts.go:24:7:24:7 | skip | stmts.go:24:12:24:12 | 0 |
-| stmts.go:24:12:24:12 | 0 | stmts.go:24:7:24:7 | assignment to i |
+| stmts.go:22:1:37:2 | After labeled statement | stmts.go:39:2:39:7 | ... := ... |
+| stmts.go:22:1:37:2 | labeled statement | stmts.go:23:2:37:2 | for statement |
+| stmts.go:23:2:37:2 | After for statement | stmts.go:22:1:37:2 | After labeled statement |
+| stmts.go:23:2:37:2 | [LoopHeader] for statement | stmts.go:23:6:23:9 | true |
+| stmts.go:23:2:37:2 | for statement | stmts.go:23:6:23:9 | true |
+| stmts.go:23:6:23:9 | After true [true] | stmts.go:23:11:37:2 | block statement |
+| stmts.go:23:6:23:9 | true | stmts.go:23:6:23:9 | After true [true] |
+| stmts.go:23:11:37:2 | After block statement | stmts.go:23:2:37:2 | [LoopHeader] for statement |
+| stmts.go:23:11:37:2 | block statement | stmts.go:24:3:36:3 | for statement |
+| stmts.go:24:3:36:3 | After for statement | stmts.go:23:11:37:2 | After block statement |
+| stmts.go:24:3:36:3 | [LoopHeader] for statement | stmts.go:24:23:24:25 | Before increment statement |
+| stmts.go:24:3:36:3 | for statement | stmts.go:24:7:24:12 | ... := ... |
+| stmts.go:24:7:24:12 | ... := ... | stmts.go:24:12:24:12 | 0 |
+| stmts.go:24:7:24:12 | After ... := ... | stmts.go:24:15:24:20 | Before ...<... |
+| stmts.go:24:7:24:12 | assign:0 ... := ... | stmts.go:24:7:24:12 | After ... := ... |
+| stmts.go:24:12:24:12 | 0 | stmts.go:24:7:24:12 | assign:0 ... := ... |
 | stmts.go:24:15:24:15 | i | stmts.go:24:19:24:20 | 10 |
-| stmts.go:24:15:24:20 | ...<... | stmts.go:24:15:24:20 | ...<... is false |
-| stmts.go:24:15:24:20 | ...<... | stmts.go:24:15:24:20 | ...<... is true |
-| stmts.go:24:15:24:20 | ...<... is false | stmts.go:23:6:23:9 | true |
-| stmts.go:24:15:24:20 | ...<... is true | stmts.go:25:7:25:7 | skip |
+| stmts.go:24:15:24:20 | ...<... | stmts.go:24:15:24:20 | After ...<... [false] |
+| stmts.go:24:15:24:20 | ...<... | stmts.go:24:15:24:20 | After ...<... [true] |
+| stmts.go:24:15:24:20 | After ...<... [false] | stmts.go:24:3:36:3 | After for statement |
+| stmts.go:24:15:24:20 | After ...<... [true] | stmts.go:24:27:36:3 | block statement |
+| stmts.go:24:15:24:20 | Before ...<... | stmts.go:24:15:24:15 | i |
 | stmts.go:24:19:24:20 | 10 | stmts.go:24:15:24:20 | ...<... |
-| stmts.go:24:23:24:23 | i | stmts.go:24:23:24:25 | 1 |
-| stmts.go:24:23:24:25 | 1 | stmts.go:24:23:24:25 | rhs of increment statement |
-| stmts.go:24:23:24:25 | increment statement | stmts.go:24:15:24:15 | i |
-| stmts.go:24:23:24:25 | rhs of increment statement | stmts.go:24:23:24:25 | increment statement |
-| stmts.go:25:7:25:7 | assignment to j | stmts.go:25:19:25:19 | j |
-| stmts.go:25:7:25:7 | skip | stmts.go:25:12:25:12 | i |
+| stmts.go:24:23:24:23 | i | stmts.go:24:23:24:25 | increment statement |
+| stmts.go:24:23:24:25 | After increment statement | stmts.go:24:15:24:20 | Before ...<... |
+| stmts.go:24:23:24:25 | Before increment statement | stmts.go:24:23:24:23 | i |
+| stmts.go:24:23:24:25 | increment statement | stmts.go:24:23:24:25 | After increment statement |
+| stmts.go:24:27:36:3 | block statement | stmts.go:25:4:35:4 | if statement |
+| stmts.go:25:4:35:4 | if statement | stmts.go:25:7:25:16 | ... := ... |
+| stmts.go:25:7:25:16 | ... := ... | stmts.go:25:12:25:16 | Before ...-... |
+| stmts.go:25:7:25:16 | After ... := ... | stmts.go:25:19:25:23 | Before ...>... |
+| stmts.go:25:7:25:16 | assign:0 ... := ... | stmts.go:25:7:25:16 | After ... := ... |
 | stmts.go:25:12:25:12 | i | stmts.go:25:16:25:16 | 1 |
-| stmts.go:25:12:25:16 | ...-... | stmts.go:25:7:25:7 | assignment to j |
+| stmts.go:25:12:25:16 | ...-... | stmts.go:25:12:25:16 | After ...-... |
+| stmts.go:25:12:25:16 | After ...-... | stmts.go:25:7:25:16 | assign:0 ... := ... |
+| stmts.go:25:12:25:16 | Before ...-... | stmts.go:25:12:25:12 | i |
 | stmts.go:25:16:25:16 | 1 | stmts.go:25:12:25:16 | ...-... |
 | stmts.go:25:19:25:19 | j | stmts.go:25:23:25:23 | 5 |
-| stmts.go:25:19:25:23 | ...>... | stmts.go:25:19:25:23 | ...>... is false |
-| stmts.go:25:19:25:23 | ...>... | stmts.go:25:19:25:23 | ...>... is true |
-| stmts.go:25:19:25:23 | ...>... is false | stmts.go:27:14:27:14 | i |
-| stmts.go:25:19:25:23 | ...>... is true | stmts.go:26:5:26:15 | skip |
+| stmts.go:25:19:25:23 | ...>... | stmts.go:25:19:25:23 | After ...>... [false] |
+| stmts.go:25:19:25:23 | ...>... | stmts.go:25:19:25:23 | After ...>... [true] |
+| stmts.go:25:19:25:23 | After ...>... [false] | stmts.go:27:11:35:4 | if statement |
+| stmts.go:25:19:25:23 | After ...>... [true] | stmts.go:25:25:27:4 | block statement |
+| stmts.go:25:19:25:23 | Before ...>... | stmts.go:25:19:25:19 | j |
 | stmts.go:25:23:25:23 | 5 | stmts.go:25:19:25:23 | ...>... |
-| stmts.go:26:5:26:15 | skip | stmts.go:39:2:39:2 | skip |
+| stmts.go:25:25:27:4 | block statement | stmts.go:26:5:26:15 | Before break statement |
+| stmts.go:26:5:26:15 | Before break statement | stmts.go:26:5:26:15 | break statement |
+| stmts.go:26:5:26:15 | break statement | stmts.go:23:2:37:2 | After for statement |
+| stmts.go:27:11:35:4 | if statement | stmts.go:27:14:27:18 | Before ...<... |
 | stmts.go:27:14:27:14 | i | stmts.go:27:18:27:18 | 3 |
-| stmts.go:27:14:27:18 | ...<... | stmts.go:27:14:27:18 | ...<... is false |
-| stmts.go:27:14:27:18 | ...<... | stmts.go:27:14:27:18 | ...<... is true |
-| stmts.go:27:14:27:18 | ...<... is false | stmts.go:29:14:29:14 | i |
-| stmts.go:27:14:27:18 | ...<... is true | stmts.go:28:5:28:9 | skip |
+| stmts.go:27:14:27:18 | ...<... | stmts.go:27:14:27:18 | After ...<... [false] |
+| stmts.go:27:14:27:18 | ...<... | stmts.go:27:14:27:18 | After ...<... [true] |
+| stmts.go:27:14:27:18 | After ...<... [false] | stmts.go:29:11:35:4 | if statement |
+| stmts.go:27:14:27:18 | After ...<... [true] | stmts.go:27:20:29:4 | block statement |
+| stmts.go:27:14:27:18 | Before ...<... | stmts.go:27:14:27:14 | i |
 | stmts.go:27:18:27:18 | 3 | stmts.go:27:14:27:18 | ...<... |
-| stmts.go:28:5:28:9 | skip | stmts.go:23:6:23:9 | true |
+| stmts.go:27:20:29:4 | block statement | stmts.go:28:5:28:9 | Before break statement |
+| stmts.go:28:5:28:9 | Before break statement | stmts.go:28:5:28:9 | break statement |
+| stmts.go:28:5:28:9 | break statement | stmts.go:24:3:36:3 | After for statement |
+| stmts.go:29:11:35:4 | if statement | stmts.go:29:14:29:19 | Before ...!=... |
 | stmts.go:29:14:29:14 | i | stmts.go:29:19:29:19 | 9 |
-| stmts.go:29:14:29:19 | ...!=... | stmts.go:29:14:29:19 | ...!=... is false |
-| stmts.go:29:14:29:19 | ...!=... | stmts.go:29:14:29:19 | ...!=... is true |
-| stmts.go:29:14:29:19 | ...!=... is false | stmts.go:31:14:31:14 | i |
-| stmts.go:29:14:29:19 | ...!=... is true | stmts.go:30:5:30:18 | skip |
+| stmts.go:29:14:29:19 | ...!=... | stmts.go:29:14:29:19 | After ...!=... [false] |
+| stmts.go:29:14:29:19 | ...!=... | stmts.go:29:14:29:19 | After ...!=... [true] |
+| stmts.go:29:14:29:19 | After ...!=... [false] | stmts.go:31:11:35:4 | if statement |
+| stmts.go:29:14:29:19 | After ...!=... [true] | stmts.go:29:21:31:4 | block statement |
+| stmts.go:29:14:29:19 | Before ...!=... | stmts.go:29:14:29:14 | i |
 | stmts.go:29:19:29:19 | 9 | stmts.go:29:14:29:19 | ...!=... |
-| stmts.go:30:5:30:18 | skip | stmts.go:23:6:23:9 | true |
+| stmts.go:29:21:31:4 | block statement | stmts.go:30:5:30:18 | Before continue statement |
+| stmts.go:30:5:30:18 | Before continue statement | stmts.go:30:5:30:18 | continue statement |
+| stmts.go:30:5:30:18 | continue statement | stmts.go:23:2:37:2 | [LoopHeader] for statement |
+| stmts.go:31:11:35:4 | if statement | stmts.go:31:14:31:19 | Before ...>=... |
 | stmts.go:31:14:31:14 | i | stmts.go:31:19:31:19 | 4 |
-| stmts.go:31:14:31:19 | ...>=... | stmts.go:31:14:31:19 | ...>=... is false |
-| stmts.go:31:14:31:19 | ...>=... | stmts.go:31:14:31:19 | ...>=... is true |
-| stmts.go:31:14:31:19 | ...>=... is false | stmts.go:34:5:34:12 | skip |
-| stmts.go:31:14:31:19 | ...>=... is true | stmts.go:32:5:32:14 | skip |
+| stmts.go:31:14:31:19 | ...>=... | stmts.go:31:14:31:19 | After ...>=... [false] |
+| stmts.go:31:14:31:19 | ...>=... | stmts.go:31:14:31:19 | After ...>=... [true] |
+| stmts.go:31:14:31:19 | After ...>=... [false] | stmts.go:33:11:35:4 | block statement |
+| stmts.go:31:14:31:19 | After ...>=... [true] | stmts.go:31:21:33:4 | block statement |
+| stmts.go:31:14:31:19 | Before ...>=... | stmts.go:31:14:31:14 | i |
 | stmts.go:31:19:31:19 | 4 | stmts.go:31:14:31:19 | ...>=... |
-| stmts.go:32:5:32:14 | skip | stmts.go:23:6:23:9 | true |
-| stmts.go:34:5:34:12 | skip | stmts.go:24:23:24:23 | i |
-| stmts.go:39:2:39:2 | assignment to k | stmts.go:41:3:41:12 | skip |
-| stmts.go:39:2:39:2 | skip | stmts.go:39:7:39:7 | 9 |
-| stmts.go:39:7:39:7 | 9 | stmts.go:39:2:39:2 | assignment to k |
-| stmts.go:40:10:40:10 | k | stmts.go:40:10:40:12 | 1 |
-| stmts.go:40:10:40:12 | 1 | stmts.go:40:10:40:12 | rhs of increment statement |
-| stmts.go:40:10:40:12 | increment statement | stmts.go:41:3:41:12 | skip |
-| stmts.go:40:10:40:12 | rhs of increment statement | stmts.go:40:10:40:12 | increment statement |
-| stmts.go:41:3:41:12 | skip | stmts.go:23:6:23:9 | true |
-| stmts.go:46:1:62:1 | entry | stmts.go:46:12:46:14 | argument corresponding to ch1 |
-| stmts.go:46:1:62:1 | function declaration | stmts.go:65:6:65:10 | skip |
-| stmts.go:46:6:46:10 | skip | stmts.go:46:1:62:1 | function declaration |
-| stmts.go:46:12:46:14 | argument corresponding to ch1 | stmts.go:46:12:46:14 | initialization of ch1 |
-| stmts.go:46:12:46:14 | initialization of ch1 | stmts.go:46:26:46:28 | argument corresponding to ch2 |
-| stmts.go:46:26:46:28 | argument corresponding to ch2 | stmts.go:46:26:46:28 | initialization of ch2 |
-| stmts.go:46:26:46:28 | initialization of ch2 | stmts.go:47:6:47:6 | skip |
-| stmts.go:47:6:47:6 | assignment to a | stmts.go:48:6:48:6 | skip |
-| stmts.go:47:6:47:6 | skip | stmts.go:47:6:47:6 | zero value for a |
-| stmts.go:47:6:47:6 | zero value for a | stmts.go:47:6:47:6 | assignment to a |
-| stmts.go:48:6:48:6 | assignment to w | stmts.go:51:9:51:11 | ch1 |
-| stmts.go:48:6:48:6 | skip | stmts.go:48:6:48:6 | zero value for w |
-| stmts.go:48:6:48:6 | zero value for w | stmts.go:48:6:48:6 | assignment to w |
-| stmts.go:50:2:59:2 | select statement | stmts.go:51:7:51:11 | <-... |
-| stmts.go:50:2:59:2 | select statement | stmts.go:53:17:53:21 | <-... |
-| stmts.go:50:2:59:2 | select statement | stmts.go:57:3:57:13 | selection of Println |
-| stmts.go:50:2:59:2 | select statement | stmts.go:58:7:58:15 | send statement |
-| stmts.go:51:7:51:11 | <-... | stmts.go:52:3:52:13 | selection of Println |
+| stmts.go:31:21:33:4 | block statement | stmts.go:32:5:32:14 | Before goto statement |
+| stmts.go:32:5:32:14 | Before goto statement | stmts.go:32:5:32:14 | goto statement |
+| stmts.go:32:5:32:14 | goto statement | stmts.go:22:1:37:2 | labeled statement |
+| stmts.go:33:11:35:4 | block statement | stmts.go:34:5:34:12 | Before continue statement |
+| stmts.go:34:5:34:12 | Before continue statement | stmts.go:34:5:34:12 | continue statement |
+| stmts.go:34:5:34:12 | continue statement | stmts.go:24:3:36:3 | [LoopHeader] for statement |
+| stmts.go:39:2:39:7 | ... := ... | stmts.go:39:7:39:7 | 9 |
+| stmts.go:39:2:39:7 | After ... := ... | stmts.go:40:2:42:2 | for statement |
+| stmts.go:39:2:39:7 | assign:0 ... := ... | stmts.go:39:2:39:7 | After ... := ... |
+| stmts.go:39:7:39:7 | 9 | stmts.go:39:2:39:7 | assign:0 ... := ... |
+| stmts.go:40:2:42:2 | for statement | stmts.go:40:14:42:2 | block statement |
+| stmts.go:40:14:42:2 | block statement | stmts.go:41:3:41:12 | Before goto statement |
+| stmts.go:41:3:41:12 | Before goto statement | stmts.go:41:3:41:12 | goto statement |
+| stmts.go:41:3:41:12 | goto statement | stmts.go:22:1:37:2 | labeled statement |
+| stmts.go:46:1:62:1 | Entry | stmts.go:46:12:46:14 | ch1 |
+| stmts.go:46:1:62:1 | Exceptional Exit | stmts.go:46:1:62:1 | Exit |
+| stmts.go:46:1:62:1 | function declaration | stmts.go:65:1:72:1 | function declaration |
+| stmts.go:46:12:46:14 | ch1 | stmts.go:46:26:46:28 | ch2 |
+| stmts.go:46:26:46:28 | ch2 | stmts.go:46:44:62:1 | block statement |
+| stmts.go:46:44:62:1 | block statement | stmts.go:47:2:47:17 | declaration statement |
+| stmts.go:47:2:47:17 | After declaration statement | stmts.go:48:2:48:11 | declaration statement |
+| stmts.go:47:2:47:17 | After variable declaration | stmts.go:47:2:47:17 | After declaration statement |
+| stmts.go:47:2:47:17 | declaration statement | stmts.go:47:2:47:17 | variable declaration |
+| stmts.go:47:2:47:17 | variable declaration | stmts.go:47:6:47:17 | value declaration specifier |
+| stmts.go:47:6:47:17 | After value declaration specifier | stmts.go:47:2:47:17 | After variable declaration |
+| stmts.go:47:6:47:17 | value declaration specifier | stmts.go:47:6:47:17 | zero-init:0 value declaration specifier |
+| stmts.go:47:6:47:17 | zero-init:0 value declaration specifier | stmts.go:47:6:47:17 | After value declaration specifier |
+| stmts.go:48:2:48:11 | After declaration statement | stmts.go:50:2:59:2 | Before select statement |
+| stmts.go:48:2:48:11 | After variable declaration | stmts.go:48:2:48:11 | After declaration statement |
+| stmts.go:48:2:48:11 | declaration statement | stmts.go:48:2:48:11 | variable declaration |
+| stmts.go:48:2:48:11 | variable declaration | stmts.go:48:6:48:11 | value declaration specifier |
+| stmts.go:48:6:48:11 | After value declaration specifier | stmts.go:48:2:48:11 | After variable declaration |
+| stmts.go:48:6:48:11 | value declaration specifier | stmts.go:48:6:48:11 | zero-init:0 value declaration specifier |
+| stmts.go:48:6:48:11 | zero-init:0 value declaration specifier | stmts.go:48:6:48:11 | After value declaration specifier |
+| stmts.go:50:2:59:2 | After select statement | stmts.go:61:2:61:10 | Before select statement |
+| stmts.go:50:2:59:2 | Before select statement | stmts.go:51:9:51:11 | ch1 |
+| stmts.go:50:2:59:2 | select statement | stmts.go:51:2:52:31 | comm clause |
+| stmts.go:50:2:59:2 | select statement | stmts.go:53:2:55:16 | comm clause |
+| stmts.go:50:2:59:2 | select statement | stmts.go:56:2:57:15 | comm clause |
+| stmts.go:50:2:59:2 | select statement | stmts.go:58:2:58:16 | comm clause |
+| stmts.go:51:2:52:31 | comm clause | stmts.go:51:7:51:11 | expression statement |
+| stmts.go:51:7:51:11 | <-... | stmts.go:52:3:52:31 | expression statement |
+| stmts.go:51:7:51:11 | Before <-... | stmts.go:51:7:51:11 | <-... |
+| stmts.go:51:7:51:11 | expression statement | stmts.go:51:7:51:11 | Before <-... |
 | stmts.go:51:9:51:11 | ch1 | stmts.go:53:19:53:21 | ch2 |
-| stmts.go:52:3:52:13 | selection of Println | stmts.go:52:15:52:30 | "Heard from ch1" |
-| stmts.go:52:3:52:31 | call to Println | stmts.go:46:1:62:1 | exit |
-| stmts.go:52:3:52:31 | call to Println | stmts.go:61:2:61:10 | select statement |
+| stmts.go:52:3:52:13 | After selection of Println | stmts.go:52:15:52:30 | "Heard from ch1" |
+| stmts.go:52:3:52:13 | Before selection of Println | stmts.go:52:3:52:13 | selection of Println |
+| stmts.go:52:3:52:13 | selection of Println | stmts.go:52:3:52:13 | After selection of Println |
+| stmts.go:52:3:52:31 | After call to Println | stmts.go:52:3:52:31 | After expression statement |
+| stmts.go:52:3:52:31 | After expression statement | stmts.go:50:2:59:2 | After select statement |
+| stmts.go:52:3:52:31 | Before call to Println | stmts.go:52:3:52:13 | Before selection of Println |
+| stmts.go:52:3:52:31 | call to Println | stmts.go:46:1:62:1 | Exceptional Exit |
+| stmts.go:52:3:52:31 | call to Println | stmts.go:52:3:52:31 | After call to Println |
+| stmts.go:52:3:52:31 | expression statement | stmts.go:52:3:52:31 | Before call to Println |
 | stmts.go:52:15:52:30 | "Heard from ch1" | stmts.go:52:3:52:31 | call to Println |
+| stmts.go:53:2:55:16 | comm clause | stmts.go:53:7:53:21 | ... = ... |
 | stmts.go:53:7:53:7 | a | stmts.go:53:9:53:9 | 0 |
-| stmts.go:53:7:53:10 | assignment to element | stmts.go:53:7:53:21 | ... = ...[1] |
-| stmts.go:53:7:53:10 | skip | stmts.go:46:1:62:1 | exit |
-| stmts.go:53:7:53:10 | skip | stmts.go:53:13:53:13 | skip |
-| stmts.go:53:7:53:21 | ... = ...[0] | stmts.go:53:7:53:10 | assignment to element |
-| stmts.go:53:7:53:21 | ... = ...[1] | stmts.go:53:13:53:13 | assignment to w |
-| stmts.go:53:9:53:9 | 0 | stmts.go:53:7:53:10 | skip |
-| stmts.go:53:13:53:13 | assignment to w | stmts.go:54:3:54:13 | selection of Println |
-| stmts.go:53:13:53:13 | skip | stmts.go:53:7:53:21 | ... = ...[0] |
-| stmts.go:53:17:53:21 | <-... | stmts.go:53:7:53:7 | a |
+| stmts.go:53:7:53:10 | After index expression | stmts.go:53:13:53:13 | w |
+| stmts.go:53:7:53:10 | Before index expression | stmts.go:53:7:53:7 | a |
+| stmts.go:53:7:53:10 | index expression | stmts.go:46:1:62:1 | Exceptional Exit |
+| stmts.go:53:7:53:10 | index expression | stmts.go:53:7:53:10 | After index expression |
+| stmts.go:53:7:53:21 | ... = ... | stmts.go:53:17:53:21 | Before <-... |
+| stmts.go:53:7:53:21 | extract:0 ... = ... | stmts.go:53:7:53:21 | extract:1 ... = ... |
+| stmts.go:53:7:53:21 | extract:1 ... = ... | stmts.go:54:3:54:16 | expression statement |
+| stmts.go:53:9:53:9 | 0 | stmts.go:53:7:53:10 | index expression |
+| stmts.go:53:13:53:13 | w | stmts.go:53:7:53:21 | extract:0 ... = ... |
+| stmts.go:53:17:53:21 | <-... | stmts.go:53:7:53:10 | Before index expression |
+| stmts.go:53:17:53:21 | Before <-... | stmts.go:53:17:53:21 | <-... |
 | stmts.go:53:19:53:21 | ch2 | stmts.go:58:7:58:9 | ch1 |
-| stmts.go:54:3:54:13 | selection of Println | stmts.go:54:15:54:15 | a |
-| stmts.go:54:3:54:16 | call to Println | stmts.go:46:1:62:1 | exit |
-| stmts.go:54:3:54:16 | call to Println | stmts.go:55:3:55:13 | selection of Println |
+| stmts.go:54:3:54:13 | After selection of Println | stmts.go:54:15:54:15 | a |
+| stmts.go:54:3:54:13 | Before selection of Println | stmts.go:54:3:54:13 | selection of Println |
+| stmts.go:54:3:54:13 | selection of Println | stmts.go:54:3:54:13 | After selection of Println |
+| stmts.go:54:3:54:16 | After call to Println | stmts.go:54:3:54:16 | After expression statement |
+| stmts.go:54:3:54:16 | After expression statement | stmts.go:55:3:55:16 | expression statement |
+| stmts.go:54:3:54:16 | Before call to Println | stmts.go:54:3:54:13 | Before selection of Println |
+| stmts.go:54:3:54:16 | call to Println | stmts.go:46:1:62:1 | Exceptional Exit |
+| stmts.go:54:3:54:16 | call to Println | stmts.go:54:3:54:16 | After call to Println |
+| stmts.go:54:3:54:16 | expression statement | stmts.go:54:3:54:16 | Before call to Println |
 | stmts.go:54:15:54:15 | a | stmts.go:54:3:54:16 | call to Println |
-| stmts.go:55:3:55:13 | selection of Println | stmts.go:55:15:55:15 | w |
-| stmts.go:55:3:55:16 | call to Println | stmts.go:46:1:62:1 | exit |
-| stmts.go:55:3:55:16 | call to Println | stmts.go:61:2:61:10 | select statement |
+| stmts.go:55:3:55:13 | After selection of Println | stmts.go:55:15:55:15 | w |
+| stmts.go:55:3:55:13 | Before selection of Println | stmts.go:55:3:55:13 | selection of Println |
+| stmts.go:55:3:55:13 | selection of Println | stmts.go:55:3:55:13 | After selection of Println |
+| stmts.go:55:3:55:16 | After call to Println | stmts.go:55:3:55:16 | After expression statement |
+| stmts.go:55:3:55:16 | After expression statement | stmts.go:50:2:59:2 | After select statement |
+| stmts.go:55:3:55:16 | Before call to Println | stmts.go:55:3:55:13 | Before selection of Println |
+| stmts.go:55:3:55:16 | call to Println | stmts.go:46:1:62:1 | Exceptional Exit |
+| stmts.go:55:3:55:16 | call to Println | stmts.go:55:3:55:16 | After call to Println |
+| stmts.go:55:3:55:16 | expression statement | stmts.go:55:3:55:16 | Before call to Println |
 | stmts.go:55:15:55:15 | w | stmts.go:55:3:55:16 | call to Println |
-| stmts.go:57:3:57:13 | selection of Println | stmts.go:57:3:57:15 | call to Println |
-| stmts.go:57:3:57:15 | call to Println | stmts.go:46:1:62:1 | exit |
-| stmts.go:57:3:57:15 | call to Println | stmts.go:61:2:61:10 | select statement |
-| stmts.go:58:2:58:16 | skip | stmts.go:61:2:61:10 | select statement |
+| stmts.go:56:2:57:15 | comm clause | stmts.go:57:3:57:15 | expression statement |
+| stmts.go:57:3:57:13 | After selection of Println | stmts.go:57:3:57:15 | call to Println |
+| stmts.go:57:3:57:13 | Before selection of Println | stmts.go:57:3:57:13 | selection of Println |
+| stmts.go:57:3:57:13 | selection of Println | stmts.go:57:3:57:13 | After selection of Println |
+| stmts.go:57:3:57:15 | After call to Println | stmts.go:57:3:57:15 | After expression statement |
+| stmts.go:57:3:57:15 | After expression statement | stmts.go:50:2:59:2 | After select statement |
+| stmts.go:57:3:57:15 | Before call to Println | stmts.go:57:3:57:13 | Before selection of Println |
+| stmts.go:57:3:57:15 | call to Println | stmts.go:46:1:62:1 | Exceptional Exit |
+| stmts.go:57:3:57:15 | call to Println | stmts.go:57:3:57:15 | After call to Println |
+| stmts.go:57:3:57:15 | expression statement | stmts.go:57:3:57:15 | Before call to Println |
+| stmts.go:58:2:58:16 | comm clause | stmts.go:58:7:58:15 | Before send statement |
 | stmts.go:58:7:58:9 | ch1 | stmts.go:58:14:58:15 | 42 |
-| stmts.go:58:7:58:15 | send statement | stmts.go:46:1:62:1 | exit |
-| stmts.go:58:7:58:15 | send statement | stmts.go:58:2:58:16 | skip |
+| stmts.go:58:7:58:15 | After send statement | stmts.go:50:2:59:2 | After select statement |
+| stmts.go:58:7:58:15 | Before send statement | stmts.go:58:7:58:15 | send statement |
+| stmts.go:58:7:58:15 | send statement | stmts.go:58:7:58:15 | After send statement |
 | stmts.go:58:14:58:15 | 42 | stmts.go:50:2:59:2 | select statement |
-| stmts.go:65:1:72:1 | entry | stmts.go:65:12:65:12 | argument corresponding to x |
-| stmts.go:65:1:72:1 | function declaration | stmts.go:75:6:75:10 | skip |
-| stmts.go:65:6:65:10 | skip | stmts.go:65:1:72:1 | function declaration |
-| stmts.go:65:12:65:12 | argument corresponding to x | stmts.go:65:12:65:12 | initialization of x |
-| stmts.go:65:12:65:12 | initialization of x | stmts.go:66:5:66:5 | x |
+| stmts.go:61:2:61:10 | Before select statement | stmts.go:61:2:61:10 | select statement |
+| stmts.go:65:1:72:1 | Entry | stmts.go:65:12:65:12 | x |
+| stmts.go:65:1:72:1 | Exceptional Exit | stmts.go:65:1:72:1 | Exit |
+| stmts.go:65:1:72:1 | Normal Exit | stmts.go:65:1:72:1 | Exit |
+| stmts.go:65:1:72:1 | function declaration | stmts.go:75:1:109:1 | function declaration |
+| stmts.go:65:12:65:12 | x | stmts.go:65:23:72:1 | block statement |
+| stmts.go:65:23:72:1 | After block statement | stmts.go:65:1:72:1 | Normal Exit |
+| stmts.go:65:23:72:1 | block statement | stmts.go:66:2:70:2 | if statement |
+| stmts.go:66:2:70:2 | After if statement | stmts.go:71:2:71:10 | Before return statement |
+| stmts.go:66:2:70:2 | if statement | stmts.go:66:5:66:9 | Before ...>... |
 | stmts.go:66:5:66:5 | x | stmts.go:66:9:66:9 | 0 |
-| stmts.go:66:5:66:9 | ...>... | stmts.go:66:5:66:9 | ...>... is false |
-| stmts.go:66:5:66:9 | ...>... | stmts.go:66:5:66:9 | ...>... is true |
-| stmts.go:66:5:66:9 | ...>... is false | stmts.go:69:9:69:34 | function literal |
-| stmts.go:66:5:66:9 | ...>... is true | stmts.go:67:9:67:33 | function literal |
+| stmts.go:66:5:66:9 | ...>... | stmts.go:66:5:66:9 | After ...>... [false] |
+| stmts.go:66:5:66:9 | ...>... | stmts.go:66:5:66:9 | After ...>... [true] |
+| stmts.go:66:5:66:9 | After ...>... [false] | stmts.go:68:9:70:2 | block statement |
+| stmts.go:66:5:66:9 | After ...>... [true] | stmts.go:66:11:68:2 | block statement |
+| stmts.go:66:5:66:9 | Before ...>... | stmts.go:66:5:66:5 | x |
 | stmts.go:66:9:66:9 | 0 | stmts.go:66:5:66:9 | ...>... |
-| stmts.go:67:3:67:35 | defer statement | stmts.go:71:9:71:10 | 42 |
-| stmts.go:67:9:67:33 | entry | stmts.go:67:18:67:28 | selection of Println |
-| stmts.go:67:9:67:33 | function literal | stmts.go:67:3:67:35 | defer statement |
-| stmts.go:67:9:67:35 | function call | stmts.go:65:1:72:1 | exit |
-| stmts.go:67:18:67:28 | selection of Println | stmts.go:67:30:67:30 | x |
-| stmts.go:67:18:67:31 | call to Println | stmts.go:67:9:67:33 | exit |
+| stmts.go:66:11:68:2 | After block statement | stmts.go:66:2:70:2 | After if statement |
+| stmts.go:66:11:68:2 | block statement | stmts.go:67:3:67:35 | Before defer statement |
+| stmts.go:67:3:67:35 | After defer statement | stmts.go:66:11:68:2 | After block statement |
+| stmts.go:67:3:67:35 | Before defer statement | stmts.go:67:9:67:35 | function call |
+| stmts.go:67:3:67:35 | catch-defer-panic defer statement | stmts.go:65:1:72:1 | Exceptional Exit |
+| stmts.go:67:3:67:35 | defer statement | stmts.go:67:3:67:35 | After defer statement |
+| stmts.go:67:9:67:33 | Entry | stmts.go:67:16:67:33 | block statement |
+| stmts.go:67:9:67:33 | Exceptional Exit | stmts.go:67:9:67:33 | Exit |
+| stmts.go:67:9:67:33 | Normal Exit | stmts.go:67:9:67:33 | Exit |
+| stmts.go:67:9:67:33 | function literal | stmts.go:67:9:67:35 | After function call |
+| stmts.go:67:9:67:35 | After function call | stmts.go:67:3:67:35 | defer statement |
+| stmts.go:67:9:67:35 | defer-invoke function call | stmts.go:65:23:72:1 | After block statement |
+| stmts.go:67:9:67:35 | defer-invoke function call | stmts.go:67:3:67:35 | catch-defer-panic defer statement |
+| stmts.go:67:9:67:35 | function call | stmts.go:67:9:67:33 | function literal |
+| stmts.go:67:16:67:33 | After block statement | stmts.go:67:9:67:33 | Normal Exit |
+| stmts.go:67:16:67:33 | block statement | stmts.go:67:18:67:31 | expression statement |
+| stmts.go:67:18:67:28 | After selection of Println | stmts.go:67:30:67:30 | x |
+| stmts.go:67:18:67:28 | Before selection of Println | stmts.go:67:18:67:28 | selection of Println |
+| stmts.go:67:18:67:28 | selection of Println | stmts.go:67:18:67:28 | After selection of Println |
+| stmts.go:67:18:67:31 | After call to Println | stmts.go:67:18:67:31 | After expression statement |
+| stmts.go:67:18:67:31 | After expression statement | stmts.go:67:16:67:33 | After block statement |
+| stmts.go:67:18:67:31 | Before call to Println | stmts.go:67:18:67:28 | Before selection of Println |
+| stmts.go:67:18:67:31 | call to Println | stmts.go:67:9:67:33 | Exceptional Exit |
+| stmts.go:67:18:67:31 | call to Println | stmts.go:67:18:67:31 | After call to Println |
+| stmts.go:67:18:67:31 | expression statement | stmts.go:67:18:67:31 | Before call to Println |
 | stmts.go:67:30:67:30 | x | stmts.go:67:18:67:31 | call to Println |
-| stmts.go:69:3:69:36 | defer statement | stmts.go:71:9:71:10 | 42 |
-| stmts.go:69:9:69:34 | entry | stmts.go:69:18:69:28 | selection of Println |
-| stmts.go:69:9:69:34 | function literal | stmts.go:69:3:69:36 | defer statement |
-| stmts.go:69:9:69:36 | function call | stmts.go:65:1:72:1 | exit |
-| stmts.go:69:18:69:28 | selection of Println | stmts.go:69:31:69:31 | x |
-| stmts.go:69:18:69:32 | call to Println | stmts.go:69:9:69:34 | exit |
-| stmts.go:69:30:69:31 | -... | stmts.go:69:18:69:32 | call to Println |
+| stmts.go:68:9:70:2 | After block statement | stmts.go:66:2:70:2 | After if statement |
+| stmts.go:68:9:70:2 | block statement | stmts.go:69:3:69:36 | Before defer statement |
+| stmts.go:69:3:69:36 | After defer statement | stmts.go:68:9:70:2 | After block statement |
+| stmts.go:69:3:69:36 | Before defer statement | stmts.go:69:9:69:36 | function call |
+| stmts.go:69:3:69:36 | catch-defer-panic defer statement | stmts.go:65:1:72:1 | Exceptional Exit |
+| stmts.go:69:3:69:36 | defer statement | stmts.go:69:3:69:36 | After defer statement |
+| stmts.go:69:9:69:34 | Entry | stmts.go:69:16:69:34 | block statement |
+| stmts.go:69:9:69:34 | Exceptional Exit | stmts.go:69:9:69:34 | Exit |
+| stmts.go:69:9:69:34 | Normal Exit | stmts.go:69:9:69:34 | Exit |
+| stmts.go:69:9:69:34 | function literal | stmts.go:69:9:69:36 | After function call |
+| stmts.go:69:9:69:36 | After function call | stmts.go:69:3:69:36 | defer statement |
+| stmts.go:69:9:69:36 | defer-invoke function call | stmts.go:65:23:72:1 | After block statement |
+| stmts.go:69:9:69:36 | defer-invoke function call | stmts.go:69:3:69:36 | catch-defer-panic defer statement |
+| stmts.go:69:9:69:36 | function call | stmts.go:69:9:69:34 | function literal |
+| stmts.go:69:16:69:34 | After block statement | stmts.go:69:9:69:34 | Normal Exit |
+| stmts.go:69:16:69:34 | block statement | stmts.go:69:18:69:32 | expression statement |
+| stmts.go:69:18:69:28 | After selection of Println | stmts.go:69:30:69:31 | Before -... |
+| stmts.go:69:18:69:28 | Before selection of Println | stmts.go:69:18:69:28 | selection of Println |
+| stmts.go:69:18:69:28 | selection of Println | stmts.go:69:18:69:28 | After selection of Println |
+| stmts.go:69:18:69:32 | After call to Println | stmts.go:69:18:69:32 | After expression statement |
+| stmts.go:69:18:69:32 | After expression statement | stmts.go:69:16:69:34 | After block statement |
+| stmts.go:69:18:69:32 | Before call to Println | stmts.go:69:18:69:28 | Before selection of Println |
+| stmts.go:69:18:69:32 | call to Println | stmts.go:69:9:69:34 | Exceptional Exit |
+| stmts.go:69:18:69:32 | call to Println | stmts.go:69:18:69:32 | After call to Println |
+| stmts.go:69:18:69:32 | expression statement | stmts.go:69:18:69:32 | Before call to Println |
+| stmts.go:69:30:69:31 | -... | stmts.go:69:30:69:31 | After -... |
+| stmts.go:69:30:69:31 | After -... | stmts.go:69:18:69:32 | call to Println |
+| stmts.go:69:30:69:31 | Before -... | stmts.go:69:31:69:31 | x |
 | stmts.go:69:31:69:31 | x | stmts.go:69:30:69:31 | -... |
-| stmts.go:71:2:71:10 | return statement | stmts.go:67:9:67:35 | function call |
-| stmts.go:71:2:71:10 | return statement | stmts.go:69:9:69:36 | function call |
+| stmts.go:71:2:71:10 | Before return statement | stmts.go:71:9:71:10 | 42 |
+| stmts.go:71:2:71:10 | catch-return return statement | stmts.go:67:9:67:35 | defer-invoke function call |
+| stmts.go:71:2:71:10 | catch-return return statement | stmts.go:69:9:69:36 | defer-invoke function call |
+| stmts.go:71:2:71:10 | return statement | stmts.go:71:2:71:10 | catch-return return statement |
 | stmts.go:71:9:71:10 | 42 | stmts.go:71:2:71:10 | return statement |
-| stmts.go:75:1:109:1 | entry | stmts.go:75:12:75:12 | argument corresponding to x |
-| stmts.go:75:1:109:1 | function declaration | stmts.go:112:6:112:10 | skip |
-| stmts.go:75:6:75:10 | skip | stmts.go:75:1:109:1 | function declaration |
-| stmts.go:75:12:75:12 | argument corresponding to x | stmts.go:75:12:75:12 | initialization of x |
-| stmts.go:75:12:75:12 | initialization of x | stmts.go:76:9:76:9 | x |
-| stmts.go:76:9:76:9 | x | stmts.go:79:9:79:9 | skip |
-| stmts.go:79:9:79:9 | assignment to y | stmts.go:79:17:79:17 | y |
-| stmts.go:79:9:79:9 | skip | stmts.go:79:14:79:14 | x |
-| stmts.go:79:14:79:14 | x | stmts.go:79:9:79:9 | assignment to y |
+| stmts.go:75:1:109:1 | Entry | stmts.go:75:12:75:12 | x |
+| stmts.go:75:1:109:1 | Exceptional Exit | stmts.go:75:1:109:1 | Exit |
+| stmts.go:75:1:109:1 | Normal Exit | stmts.go:75:1:109:1 | Exit |
+| stmts.go:75:1:109:1 | function declaration | stmts.go:112:1:137:1 | function declaration |
+| stmts.go:75:12:75:12 | x | stmts.go:75:19:109:1 | block statement |
+| stmts.go:75:19:109:1 | After block statement | stmts.go:75:1:109:1 | Normal Exit |
+| stmts.go:75:19:109:1 | block statement | stmts.go:76:2:77:2 | expression-switch statement |
+| stmts.go:76:2:77:2 | After expression-switch statement | stmts.go:79:2:82:2 | expression-switch statement |
+| stmts.go:76:2:77:2 | expression-switch statement | stmts.go:76:9:76:9 | x |
+| stmts.go:76:9:76:9 | x | stmts.go:76:2:77:2 | After expression-switch statement |
+| stmts.go:79:2:82:2 | After expression-switch statement | stmts.go:84:2:88:2 | expression-switch statement |
+| stmts.go:79:2:82:2 | expression-switch statement | stmts.go:79:9:79:14 | ... := ... |
+| stmts.go:79:9:79:14 | ... := ... | stmts.go:79:14:79:14 | x |
+| stmts.go:79:9:79:14 | After ... := ... | stmts.go:79:17:79:22 | Before ...-... |
+| stmts.go:79:9:79:14 | assign:0 ... := ... | stmts.go:79:9:79:14 | After ... := ... |
+| stmts.go:79:14:79:14 | x | stmts.go:79:9:79:14 | assign:0 ... := ... |
 | stmts.go:79:17:79:17 | y | stmts.go:79:21:79:22 | 19 |
-| stmts.go:79:17:79:22 | ...-... | stmts.go:81:3:81:7 | test5 |
+| stmts.go:79:17:79:22 | ...-... | stmts.go:79:17:79:22 | After ...-... |
+| stmts.go:79:17:79:22 | After ...-... | stmts.go:80:2:81:14 | case clause |
+| stmts.go:79:17:79:22 | Before ...-... | stmts.go:79:17:79:17 | y |
 | stmts.go:79:21:79:22 | 19 | stmts.go:79:17:79:22 | ...-... |
+| stmts.go:80:2:81:14 | After case clause [match] | stmts.go:81:3:81:14 | expression statement |
+| stmts.go:80:2:81:14 | case clause | stmts.go:80:2:81:14 | After case clause [match] |
 | stmts.go:81:3:81:7 | test5 | stmts.go:81:9:81:13 | false |
-| stmts.go:81:3:81:14 | call to test5 | stmts.go:75:1:109:1 | exit |
+| stmts.go:81:3:81:14 | After call to test5 | stmts.go:81:3:81:14 | After expression statement |
+| stmts.go:81:3:81:14 | After expression statement | stmts.go:79:2:82:2 | After expression-switch statement |
+| stmts.go:81:3:81:14 | Before call to test5 | stmts.go:81:3:81:7 | test5 |
+| stmts.go:81:3:81:14 | call to test5 | stmts.go:75:1:109:1 | Exceptional Exit |
+| stmts.go:81:3:81:14 | call to test5 | stmts.go:81:3:81:14 | After call to test5 |
+| stmts.go:81:3:81:14 | expression statement | stmts.go:81:3:81:14 | Before call to test5 |
 | stmts.go:81:9:81:13 | false | stmts.go:81:3:81:14 | call to test5 |
-| stmts.go:84:9:84:9 | x | stmts.go:85:7:85:7 | 1 |
-| stmts.go:84:9:84:9 | x | stmts.go:90:9:90:9 | x |
-| stmts.go:85:2:85:8 | skip | stmts.go:90:9:90:9 | x |
-| stmts.go:85:7:85:7 | 1 | stmts.go:85:7:85:7 | case 1 |
-| stmts.go:85:7:85:7 | case 1 | stmts.go:85:2:85:8 | skip |
-| stmts.go:85:7:85:7 | case 1 | stmts.go:86:7:86:7 | 2 |
-| stmts.go:86:7:86:7 | 2 | stmts.go:86:7:86:7 | case 2 |
-| stmts.go:86:7:86:7 | case 2 | stmts.go:86:10:86:10 | 3 |
-| stmts.go:86:7:86:7 | case 2 | stmts.go:87:3:87:7 | test5 |
-| stmts.go:86:10:86:10 | 3 | stmts.go:86:10:86:10 | case 3 |
-| stmts.go:86:10:86:10 | case 3 | stmts.go:87:3:87:7 | test5 |
-| stmts.go:86:10:86:10 | case 3 | stmts.go:90:9:90:9 | x |
+| stmts.go:84:2:88:2 | After expression-switch statement | stmts.go:90:2:96:2 | expression-switch statement |
+| stmts.go:84:2:88:2 | expression-switch statement | stmts.go:84:9:84:9 | x |
+| stmts.go:84:9:84:9 | x | stmts.go:85:2:85:8 | case clause |
+| stmts.go:85:2:85:8 | After case clause [match] | stmts.go:84:2:88:2 | After expression-switch statement |
+| stmts.go:85:2:85:8 | After case clause [no-match] | stmts.go:86:2:87:13 | case clause |
+| stmts.go:85:2:85:8 | case clause | stmts.go:85:7:85:7 | 1 |
+| stmts.go:85:7:85:7 | 1 | stmts.go:85:7:85:7 | After 1 [match] |
+| stmts.go:85:7:85:7 | 1 | stmts.go:85:7:85:7 | After 1 [no-match] |
+| stmts.go:85:7:85:7 | After 1 [match] | stmts.go:85:2:85:8 | After case clause [match] |
+| stmts.go:85:7:85:7 | After 1 [no-match] | stmts.go:85:2:85:8 | After case clause [no-match] |
+| stmts.go:86:2:87:13 | After case clause [match] | stmts.go:87:3:87:13 | expression statement |
+| stmts.go:86:2:87:13 | After case clause [no-match] | stmts.go:84:2:88:2 | After expression-switch statement |
+| stmts.go:86:2:87:13 | case clause | stmts.go:86:7:86:7 | 2 |
+| stmts.go:86:7:86:7 | 2 | stmts.go:86:7:86:7 | After 2 [match] |
+| stmts.go:86:7:86:7 | 2 | stmts.go:86:7:86:7 | After 2 [no-match] |
+| stmts.go:86:7:86:7 | After 2 [match] | stmts.go:86:2:87:13 | After case clause [match] |
+| stmts.go:86:7:86:7 | After 2 [no-match] | stmts.go:86:10:86:10 | 3 |
+| stmts.go:86:10:86:10 | 3 | stmts.go:86:10:86:10 | After 3 [match] |
+| stmts.go:86:10:86:10 | 3 | stmts.go:86:10:86:10 | After 3 [no-match] |
+| stmts.go:86:10:86:10 | After 3 [match] | stmts.go:86:2:87:13 | After case clause [match] |
+| stmts.go:86:10:86:10 | After 3 [no-match] | stmts.go:86:2:87:13 | After case clause [no-match] |
 | stmts.go:87:3:87:7 | test5 | stmts.go:87:9:87:12 | true |
+| stmts.go:87:3:87:13 | After call to test5 | stmts.go:87:3:87:13 | After expression statement |
+| stmts.go:87:3:87:13 | After expression statement | stmts.go:84:2:88:2 | After expression-switch statement |
+| stmts.go:87:3:87:13 | Before call to test5 | stmts.go:87:3:87:7 | test5 |
+| stmts.go:87:3:87:13 | call to test5 | stmts.go:75:1:109:1 | Exceptional Exit |
+| stmts.go:87:3:87:13 | call to test5 | stmts.go:87:3:87:13 | After call to test5 |
+| stmts.go:87:3:87:13 | expression statement | stmts.go:87:3:87:13 | Before call to test5 |
 | stmts.go:87:9:87:12 | true | stmts.go:87:3:87:13 | call to test5 |
-| stmts.go:90:9:90:9 | x | stmts.go:91:7:91:7 | 1 |
-| stmts.go:90:9:90:9 | x | stmts.go:98:9:98:9 | x |
-| stmts.go:91:7:91:7 | 1 | stmts.go:91:7:91:7 | case 1 |
-| stmts.go:91:7:91:7 | case 1 | stmts.go:92:3:92:7 | test5 |
-| stmts.go:91:7:91:7 | case 1 | stmts.go:94:7:94:11 | ...-... |
+| stmts.go:90:2:96:2 | After expression-switch statement | stmts.go:98:2:102:2 | expression-switch statement |
+| stmts.go:90:2:96:2 | expression-switch statement | stmts.go:90:9:90:9 | x |
+| stmts.go:90:9:90:9 | x | stmts.go:91:2:93:13 | case clause |
+| stmts.go:91:2:93:13 | After case clause [match] | stmts.go:92:3:92:14 | expression statement |
+| stmts.go:91:2:93:13 | After case clause [no-match] | stmts.go:94:2:95:13 | case clause |
+| stmts.go:91:2:93:13 | case clause | stmts.go:91:7:91:7 | 1 |
+| stmts.go:91:7:91:7 | 1 | stmts.go:91:7:91:7 | After 1 [match] |
+| stmts.go:91:7:91:7 | 1 | stmts.go:91:7:91:7 | After 1 [no-match] |
+| stmts.go:91:7:91:7 | After 1 [match] | stmts.go:91:2:93:13 | After case clause [match] |
+| stmts.go:91:7:91:7 | After 1 [no-match] | stmts.go:91:2:93:13 | After case clause [no-match] |
 | stmts.go:92:3:92:7 | test5 | stmts.go:92:9:92:13 | false |
+| stmts.go:92:3:92:14 | After call to test5 | stmts.go:92:3:92:14 | After expression statement |
+| stmts.go:92:3:92:14 | After expression statement | stmts.go:93:3:93:13 | fallthrough statement |
+| stmts.go:92:3:92:14 | Before call to test5 | stmts.go:92:3:92:7 | test5 |
+| stmts.go:92:3:92:14 | call to test5 | stmts.go:75:1:109:1 | Exceptional Exit |
+| stmts.go:92:3:92:14 | call to test5 | stmts.go:92:3:92:14 | After call to test5 |
+| stmts.go:92:3:92:14 | expression statement | stmts.go:92:3:92:14 | Before call to test5 |
 | stmts.go:92:9:92:13 | false | stmts.go:92:3:92:14 | call to test5 |
-| stmts.go:93:3:93:13 | skip | stmts.go:95:3:95:7 | test5 |
-| stmts.go:94:7:94:11 | ...-... | stmts.go:94:7:94:11 | case ...-... |
-| stmts.go:94:7:94:11 | case ...-... | stmts.go:95:3:95:7 | test5 |
-| stmts.go:94:7:94:11 | case ...-... | stmts.go:98:9:98:9 | x |
+| stmts.go:93:3:93:13 | fallthrough statement | stmts.go:95:3:95:13 | expression statement |
+| stmts.go:94:2:95:13 | After case clause [match] | stmts.go:95:3:95:13 | expression statement |
+| stmts.go:94:2:95:13 | After case clause [no-match] | stmts.go:90:2:96:2 | After expression-switch statement |
+| stmts.go:94:2:95:13 | case clause | stmts.go:94:7:94:11 | Before ...-... |
+| stmts.go:94:7:94:11 | ...-... | stmts.go:94:7:94:11 | After ...-... [match] |
+| stmts.go:94:7:94:11 | ...-... | stmts.go:94:7:94:11 | After ...-... [no-match] |
+| stmts.go:94:7:94:11 | After ...-... [match] | stmts.go:94:2:95:13 | After case clause [match] |
+| stmts.go:94:7:94:11 | After ...-... [no-match] | stmts.go:94:2:95:13 | After case clause [no-match] |
+| stmts.go:94:7:94:11 | Before ...-... | stmts.go:94:7:94:11 | ...-... |
 | stmts.go:95:3:95:7 | test5 | stmts.go:95:9:95:12 | true |
+| stmts.go:95:3:95:13 | After call to test5 | stmts.go:95:3:95:13 | After expression statement |
+| stmts.go:95:3:95:13 | After expression statement | stmts.go:90:2:96:2 | After expression-switch statement |
+| stmts.go:95:3:95:13 | Before call to test5 | stmts.go:95:3:95:7 | test5 |
+| stmts.go:95:3:95:13 | call to test5 | stmts.go:75:1:109:1 | Exceptional Exit |
+| stmts.go:95:3:95:13 | call to test5 | stmts.go:95:3:95:13 | After call to test5 |
+| stmts.go:95:3:95:13 | expression statement | stmts.go:95:3:95:13 | Before call to test5 |
 | stmts.go:95:9:95:12 | true | stmts.go:95:3:95:13 | call to test5 |
-| stmts.go:98:9:98:9 | x | stmts.go:100:7:100:7 | 2 |
-| stmts.go:99:2:99:9 | skip | stmts.go:104:2:108:2 | true |
-| stmts.go:100:7:100:7 | 2 | stmts.go:100:7:100:7 | case 2 |
-| stmts.go:100:7:100:7 | case 2 | stmts.go:99:2:99:9 | skip |
-| stmts.go:100:7:100:7 | case 2 | stmts.go:101:3:101:7 | test5 |
+| stmts.go:98:2:102:2 | After expression-switch statement | stmts.go:104:2:108:2 | expression-switch statement |
+| stmts.go:98:2:102:2 | expression-switch statement | stmts.go:98:9:98:9 | x |
+| stmts.go:98:9:98:9 | x | stmts.go:100:2:101:13 | case clause |
+| stmts.go:99:2:99:9 | After case clause [match] | stmts.go:98:2:102:2 | After expression-switch statement |
+| stmts.go:99:2:99:9 | case clause | stmts.go:99:2:99:9 | After case clause [match] |
+| stmts.go:100:2:101:13 | After case clause [match] | stmts.go:101:3:101:13 | expression statement |
+| stmts.go:100:2:101:13 | After case clause [no-match] | stmts.go:99:2:99:9 | case clause |
+| stmts.go:100:2:101:13 | case clause | stmts.go:100:7:100:7 | 2 |
+| stmts.go:100:7:100:7 | 2 | stmts.go:100:7:100:7 | After 2 [match] |
+| stmts.go:100:7:100:7 | 2 | stmts.go:100:7:100:7 | After 2 [no-match] |
+| stmts.go:100:7:100:7 | After 2 [match] | stmts.go:100:2:101:13 | After case clause [match] |
+| stmts.go:100:7:100:7 | After 2 [no-match] | stmts.go:100:2:101:13 | After case clause [no-match] |
 | stmts.go:101:3:101:7 | test5 | stmts.go:101:9:101:12 | true |
+| stmts.go:101:3:101:13 | After call to test5 | stmts.go:101:3:101:13 | After expression statement |
+| stmts.go:101:3:101:13 | After expression statement | stmts.go:98:2:102:2 | After expression-switch statement |
+| stmts.go:101:3:101:13 | Before call to test5 | stmts.go:101:3:101:7 | test5 |
+| stmts.go:101:3:101:13 | call to test5 | stmts.go:75:1:109:1 | Exceptional Exit |
+| stmts.go:101:3:101:13 | call to test5 | stmts.go:101:3:101:13 | After call to test5 |
+| stmts.go:101:3:101:13 | expression statement | stmts.go:101:3:101:13 | Before call to test5 |
 | stmts.go:101:9:101:12 | true | stmts.go:101:3:101:13 | call to test5 |
-| stmts.go:104:2:108:2 | true | stmts.go:107:7:107:10 | true |
-| stmts.go:107:7:107:10 | case true | stmts.go:107:7:107:10 | true is false |
-| stmts.go:107:7:107:10 | case true | stmts.go:107:7:107:10 | true is true |
-| stmts.go:107:7:107:10 | true | stmts.go:107:7:107:10 | case true |
-| stmts.go:107:7:107:10 | true is false | stmts.go:106:3:106:7 | skip |
-| stmts.go:107:7:107:10 | true is true | stmts.go:107:2:107:11 | skip |
-| stmts.go:112:1:137:1 | entry | stmts.go:112:12:112:12 | argument corresponding to x |
-| stmts.go:112:1:137:1 | function declaration | stmts.go:140:6:140:11 | skip |
-| stmts.go:112:6:112:10 | skip | stmts.go:112:1:137:1 | function declaration |
-| stmts.go:112:12:112:12 | argument corresponding to x | stmts.go:112:12:112:12 | initialization of x |
-| stmts.go:112:12:112:12 | initialization of x | stmts.go:113:9:113:9 | skip |
-| stmts.go:113:9:113:9 | assignment to y | stmts.go:114:7:114:11 | case error |
-| stmts.go:113:9:113:9 | skip | stmts.go:113:14:113:14 | x |
+| stmts.go:104:2:108:2 | After expression-switch statement | stmts.go:75:19:109:1 | After block statement |
+| stmts.go:104:2:108:2 | expression-switch statement | stmts.go:107:2:107:11 | case clause |
+| stmts.go:105:2:106:7 | After case clause [match] | stmts.go:106:3:106:7 | Before break statement |
+| stmts.go:105:2:106:7 | case clause | stmts.go:105:2:106:7 | After case clause [match] |
+| stmts.go:106:3:106:7 | Before break statement | stmts.go:106:3:106:7 | break statement |
+| stmts.go:106:3:106:7 | break statement | stmts.go:104:2:108:2 | After expression-switch statement |
+| stmts.go:107:2:107:11 | After case clause [match] | stmts.go:104:2:108:2 | After expression-switch statement |
+| stmts.go:107:2:107:11 | After case clause [no-match] | stmts.go:105:2:106:7 | case clause |
+| stmts.go:107:2:107:11 | case clause | stmts.go:107:7:107:10 | true |
+| stmts.go:107:7:107:10 | After true [match] | stmts.go:107:2:107:11 | After case clause [match] |
+| stmts.go:107:7:107:10 | After true [no-match] | stmts.go:107:2:107:11 | After case clause [no-match] |
+| stmts.go:107:7:107:10 | true | stmts.go:107:7:107:10 | After true [match] |
+| stmts.go:107:7:107:10 | true | stmts.go:107:7:107:10 | After true [no-match] |
+| stmts.go:112:1:137:1 | Entry | stmts.go:112:12:112:12 | x |
+| stmts.go:112:1:137:1 | Exceptional Exit | stmts.go:112:1:137:1 | Exit |
+| stmts.go:112:1:137:1 | Normal Exit | stmts.go:112:1:137:1 | Exit |
+| stmts.go:112:1:137:1 | function declaration | stmts.go:140:1:142:1 | function declaration |
+| stmts.go:112:12:112:12 | x | stmts.go:112:27:137:1 | block statement |
+| stmts.go:112:27:137:1 | After block statement | stmts.go:112:1:137:1 | Normal Exit |
+| stmts.go:112:27:137:1 | block statement | stmts.go:113:2:121:2 | type-switch statement |
+| stmts.go:113:2:121:2 | After type-switch statement | stmts.go:123:2:131:2 | type-switch statement |
+| stmts.go:113:2:121:2 | type-switch statement | stmts.go:113:14:113:21 | Before type assertion |
 | stmts.go:113:14:113:14 | x | stmts.go:113:14:113:21 | type assertion |
-| stmts.go:113:14:113:21 | type assertion | stmts.go:113:9:113:9 | assignment to y |
-| stmts.go:114:2:115:16 | implicit type switch variable declaration | stmts.go:115:3:115:13 | selection of Println |
-| stmts.go:114:7:114:11 | case error | stmts.go:114:2:115:16 | implicit type switch variable declaration |
-| stmts.go:114:7:114:11 | case error | stmts.go:114:14:114:19 | case string |
-| stmts.go:114:14:114:19 | case string | stmts.go:114:2:115:16 | implicit type switch variable declaration |
-| stmts.go:114:14:114:19 | case string | stmts.go:116:7:116:13 | case float32 |
-| stmts.go:115:3:115:13 | selection of Println | stmts.go:115:15:115:15 | y |
-| stmts.go:115:3:115:16 | call to Println | stmts.go:112:1:137:1 | exit |
-| stmts.go:115:3:115:16 | call to Println | stmts.go:123:9:123:9 | skip |
+| stmts.go:113:14:113:21 | After type assertion | stmts.go:114:2:115:16 | case clause |
+| stmts.go:113:14:113:21 | Before type assertion | stmts.go:113:14:113:14 | x |
+| stmts.go:113:14:113:21 | type assertion | stmts.go:113:14:113:21 | After type assertion |
+| stmts.go:114:2:115:16 | After case clause [match] | stmts.go:115:3:115:16 | expression statement |
+| stmts.go:114:2:115:16 | After case clause [no-match] | stmts.go:116:2:118:14 | case clause |
+| stmts.go:114:2:115:16 | case clause | stmts.go:114:7:114:11 | error |
+| stmts.go:114:7:114:11 | After error [match] | stmts.go:114:2:115:16 | After case clause [match] |
+| stmts.go:114:7:114:11 | After error [no-match] | stmts.go:114:14:114:19 | string |
+| stmts.go:114:7:114:11 | error | stmts.go:114:7:114:11 | After error [match] |
+| stmts.go:114:7:114:11 | error | stmts.go:114:7:114:11 | After error [no-match] |
+| stmts.go:114:14:114:19 | After string [match] | stmts.go:114:2:115:16 | After case clause [match] |
+| stmts.go:114:14:114:19 | After string [no-match] | stmts.go:114:2:115:16 | After case clause [no-match] |
+| stmts.go:114:14:114:19 | string | stmts.go:114:14:114:19 | After string [match] |
+| stmts.go:114:14:114:19 | string | stmts.go:114:14:114:19 | After string [no-match] |
+| stmts.go:115:3:115:13 | After selection of Println | stmts.go:115:15:115:15 | y |
+| stmts.go:115:3:115:13 | Before selection of Println | stmts.go:115:3:115:13 | selection of Println |
+| stmts.go:115:3:115:13 | selection of Println | stmts.go:115:3:115:13 | After selection of Println |
+| stmts.go:115:3:115:16 | After call to Println | stmts.go:115:3:115:16 | After expression statement |
+| stmts.go:115:3:115:16 | After expression statement | stmts.go:113:2:121:2 | After type-switch statement |
+| stmts.go:115:3:115:16 | Before call to Println | stmts.go:115:3:115:13 | Before selection of Println |
+| stmts.go:115:3:115:16 | call to Println | stmts.go:112:1:137:1 | Exceptional Exit |
+| stmts.go:115:3:115:16 | call to Println | stmts.go:115:3:115:16 | After call to Println |
+| stmts.go:115:3:115:16 | expression statement | stmts.go:115:3:115:16 | Before call to Println |
 | stmts.go:115:15:115:15 | y | stmts.go:115:3:115:16 | call to Println |
-| stmts.go:116:2:118:14 | implicit type switch variable declaration | stmts.go:117:3:117:7 | test5 |
-| stmts.go:116:7:116:13 | case float32 | stmts.go:116:2:118:14 | implicit type switch variable declaration |
-| stmts.go:116:7:116:13 | case float32 | stmts.go:119:2:120:7 | implicit type switch variable declaration |
+| stmts.go:116:2:118:14 | After case clause [match] | stmts.go:117:3:117:13 | expression statement |
+| stmts.go:116:2:118:14 | After case clause [no-match] | stmts.go:119:2:120:7 | case clause |
+| stmts.go:116:2:118:14 | case clause | stmts.go:116:7:116:13 | float32 |
+| stmts.go:116:7:116:13 | After float32 [match] | stmts.go:116:2:118:14 | After case clause [match] |
+| stmts.go:116:7:116:13 | After float32 [no-match] | stmts.go:116:2:118:14 | After case clause [no-match] |
+| stmts.go:116:7:116:13 | float32 | stmts.go:116:7:116:13 | After float32 [match] |
+| stmts.go:116:7:116:13 | float32 | stmts.go:116:7:116:13 | After float32 [no-match] |
 | stmts.go:117:3:117:7 | test5 | stmts.go:117:9:117:12 | true |
-| stmts.go:117:3:117:13 | call to test5 | stmts.go:112:1:137:1 | exit |
+| stmts.go:117:3:117:13 | After call to test5 | stmts.go:117:3:117:13 | After expression statement |
+| stmts.go:117:3:117:13 | After expression statement | stmts.go:118:3:118:14 | expression statement |
+| stmts.go:117:3:117:13 | Before call to test5 | stmts.go:117:3:117:7 | test5 |
+| stmts.go:117:3:117:13 | call to test5 | stmts.go:112:1:137:1 | Exceptional Exit |
+| stmts.go:117:3:117:13 | call to test5 | stmts.go:117:3:117:13 | After call to test5 |
+| stmts.go:117:3:117:13 | expression statement | stmts.go:117:3:117:13 | Before call to test5 |
 | stmts.go:117:9:117:12 | true | stmts.go:117:3:117:13 | call to test5 |
 | stmts.go:118:3:118:7 | test5 | stmts.go:118:9:118:13 | false |
+| stmts.go:118:3:118:14 | After call to test5 | stmts.go:118:3:118:14 | After expression statement |
+| stmts.go:118:3:118:14 | After expression statement | stmts.go:113:2:121:2 | After type-switch statement |
+| stmts.go:118:3:118:14 | Before call to test5 | stmts.go:118:3:118:7 | test5 |
+| stmts.go:118:3:118:14 | call to test5 | stmts.go:112:1:137:1 | Exceptional Exit |
+| stmts.go:118:3:118:14 | call to test5 | stmts.go:118:3:118:14 | After call to test5 |
+| stmts.go:118:3:118:14 | expression statement | stmts.go:118:3:118:14 | Before call to test5 |
 | stmts.go:118:9:118:13 | false | stmts.go:118:3:118:14 | call to test5 |
-| stmts.go:119:2:120:7 | implicit type switch variable declaration | stmts.go:120:3:120:3 | skip |
-| stmts.go:120:3:120:3 | skip | stmts.go:120:7:120:7 | y |
-| stmts.go:120:7:120:7 | y | stmts.go:123:9:123:9 | skip |
-| stmts.go:123:9:123:9 | assignment to y | stmts.go:123:17:123:17 | y |
-| stmts.go:123:9:123:9 | skip | stmts.go:123:14:123:14 | x |
-| stmts.go:123:14:123:14 | x | stmts.go:123:9:123:9 | assignment to y |
+| stmts.go:119:2:120:7 | After case clause [match] | stmts.go:120:3:120:7 | ... = ... |
+| stmts.go:119:2:120:7 | case clause | stmts.go:119:2:120:7 | After case clause [match] |
+| stmts.go:120:3:120:7 | ... = ... | stmts.go:120:7:120:7 | y |
+| stmts.go:120:3:120:7 | After ... = ... | stmts.go:113:2:121:2 | After type-switch statement |
+| stmts.go:120:7:120:7 | y | stmts.go:120:3:120:7 | After ... = ... |
+| stmts.go:123:2:131:2 | After type-switch statement | stmts.go:133:2:136:2 | type-switch statement |
+| stmts.go:123:2:131:2 | type-switch statement | stmts.go:123:9:123:14 | ... := ... |
+| stmts.go:123:9:123:14 | ... := ... | stmts.go:123:14:123:14 | x |
+| stmts.go:123:9:123:14 | After ... := ... | stmts.go:123:17:123:24 | Before type assertion |
+| stmts.go:123:9:123:14 | assign:0 ... := ... | stmts.go:123:9:123:14 | After ... := ... |
+| stmts.go:123:14:123:14 | x | stmts.go:123:9:123:14 | assign:0 ... := ... |
 | stmts.go:123:17:123:17 | y | stmts.go:123:17:123:24 | type assertion |
-| stmts.go:123:17:123:24 | type assertion | stmts.go:124:7:124:11 | case error |
-| stmts.go:124:7:124:11 | case error | stmts.go:124:14:124:19 | case string |
-| stmts.go:124:7:124:11 | case error | stmts.go:125:3:125:13 | selection of Println |
-| stmts.go:124:14:124:19 | case string | stmts.go:125:3:125:13 | selection of Println |
-| stmts.go:124:14:124:19 | case string | stmts.go:126:7:126:13 | case float32 |
-| stmts.go:125:3:125:13 | selection of Println | stmts.go:125:15:125:15 | y |
-| stmts.go:125:3:125:16 | call to Println | stmts.go:112:1:137:1 | exit |
-| stmts.go:125:3:125:16 | call to Println | stmts.go:133:9:133:9 | skip |
+| stmts.go:123:17:123:24 | After type assertion | stmts.go:124:2:125:16 | case clause |
+| stmts.go:123:17:123:24 | Before type assertion | stmts.go:123:17:123:17 | y |
+| stmts.go:123:17:123:24 | type assertion | stmts.go:123:17:123:24 | After type assertion |
+| stmts.go:124:2:125:16 | After case clause [match] | stmts.go:125:3:125:16 | expression statement |
+| stmts.go:124:2:125:16 | After case clause [no-match] | stmts.go:126:2:128:14 | case clause |
+| stmts.go:124:2:125:16 | case clause | stmts.go:124:7:124:11 | error |
+| stmts.go:124:7:124:11 | After error [match] | stmts.go:124:2:125:16 | After case clause [match] |
+| stmts.go:124:7:124:11 | After error [no-match] | stmts.go:124:14:124:19 | string |
+| stmts.go:124:7:124:11 | error | stmts.go:124:7:124:11 | After error [match] |
+| stmts.go:124:7:124:11 | error | stmts.go:124:7:124:11 | After error [no-match] |
+| stmts.go:124:14:124:19 | After string [match] | stmts.go:124:2:125:16 | After case clause [match] |
+| stmts.go:124:14:124:19 | After string [no-match] | stmts.go:124:2:125:16 | After case clause [no-match] |
+| stmts.go:124:14:124:19 | string | stmts.go:124:14:124:19 | After string [match] |
+| stmts.go:124:14:124:19 | string | stmts.go:124:14:124:19 | After string [no-match] |
+| stmts.go:125:3:125:13 | After selection of Println | stmts.go:125:15:125:15 | y |
+| stmts.go:125:3:125:13 | Before selection of Println | stmts.go:125:3:125:13 | selection of Println |
+| stmts.go:125:3:125:13 | selection of Println | stmts.go:125:3:125:13 | After selection of Println |
+| stmts.go:125:3:125:16 | After call to Println | stmts.go:125:3:125:16 | After expression statement |
+| stmts.go:125:3:125:16 | After expression statement | stmts.go:123:2:131:2 | After type-switch statement |
+| stmts.go:125:3:125:16 | Before call to Println | stmts.go:125:3:125:13 | Before selection of Println |
+| stmts.go:125:3:125:16 | call to Println | stmts.go:112:1:137:1 | Exceptional Exit |
+| stmts.go:125:3:125:16 | call to Println | stmts.go:125:3:125:16 | After call to Println |
+| stmts.go:125:3:125:16 | expression statement | stmts.go:125:3:125:16 | Before call to Println |
 | stmts.go:125:15:125:15 | y | stmts.go:125:3:125:16 | call to Println |
-| stmts.go:126:7:126:13 | case float32 | stmts.go:127:3:127:7 | test5 |
-| stmts.go:126:7:126:13 | case float32 | stmts.go:130:3:130:3 | skip |
+| stmts.go:126:2:128:14 | After case clause [match] | stmts.go:127:3:127:13 | expression statement |
+| stmts.go:126:2:128:14 | After case clause [no-match] | stmts.go:129:2:130:7 | case clause |
+| stmts.go:126:2:128:14 | case clause | stmts.go:126:7:126:13 | float32 |
+| stmts.go:126:7:126:13 | After float32 [match] | stmts.go:126:2:128:14 | After case clause [match] |
+| stmts.go:126:7:126:13 | After float32 [no-match] | stmts.go:126:2:128:14 | After case clause [no-match] |
+| stmts.go:126:7:126:13 | float32 | stmts.go:126:7:126:13 | After float32 [match] |
+| stmts.go:126:7:126:13 | float32 | stmts.go:126:7:126:13 | After float32 [no-match] |
 | stmts.go:127:3:127:7 | test5 | stmts.go:127:9:127:12 | true |
-| stmts.go:127:3:127:13 | call to test5 | stmts.go:112:1:137:1 | exit |
+| stmts.go:127:3:127:13 | After call to test5 | stmts.go:127:3:127:13 | After expression statement |
+| stmts.go:127:3:127:13 | After expression statement | stmts.go:128:3:128:14 | expression statement |
+| stmts.go:127:3:127:13 | Before call to test5 | stmts.go:127:3:127:7 | test5 |
+| stmts.go:127:3:127:13 | call to test5 | stmts.go:112:1:137:1 | Exceptional Exit |
+| stmts.go:127:3:127:13 | call to test5 | stmts.go:127:3:127:13 | After call to test5 |
+| stmts.go:127:3:127:13 | expression statement | stmts.go:127:3:127:13 | Before call to test5 |
 | stmts.go:127:9:127:12 | true | stmts.go:127:3:127:13 | call to test5 |
 | stmts.go:128:3:128:7 | test5 | stmts.go:128:9:128:13 | false |
+| stmts.go:128:3:128:14 | After call to test5 | stmts.go:128:3:128:14 | After expression statement |
+| stmts.go:128:3:128:14 | After expression statement | stmts.go:123:2:131:2 | After type-switch statement |
+| stmts.go:128:3:128:14 | Before call to test5 | stmts.go:128:3:128:7 | test5 |
+| stmts.go:128:3:128:14 | call to test5 | stmts.go:112:1:137:1 | Exceptional Exit |
+| stmts.go:128:3:128:14 | call to test5 | stmts.go:128:3:128:14 | After call to test5 |
+| stmts.go:128:3:128:14 | expression statement | stmts.go:128:3:128:14 | Before call to test5 |
 | stmts.go:128:9:128:13 | false | stmts.go:128:3:128:14 | call to test5 |
-| stmts.go:130:3:130:3 | skip | stmts.go:130:7:130:7 | y |
-| stmts.go:130:7:130:7 | y | stmts.go:133:9:133:9 | skip |
-| stmts.go:133:9:133:9 | assignment to y | stmts.go:133:17:133:17 | y |
-| stmts.go:133:9:133:9 | skip | stmts.go:133:14:133:14 | x |
-| stmts.go:133:14:133:14 | x | stmts.go:133:9:133:9 | assignment to y |
+| stmts.go:129:2:130:7 | After case clause [match] | stmts.go:130:3:130:7 | ... = ... |
+| stmts.go:129:2:130:7 | case clause | stmts.go:129:2:130:7 | After case clause [match] |
+| stmts.go:130:3:130:7 | ... = ... | stmts.go:130:7:130:7 | y |
+| stmts.go:130:3:130:7 | After ... = ... | stmts.go:123:2:131:2 | After type-switch statement |
+| stmts.go:130:7:130:7 | y | stmts.go:130:3:130:7 | After ... = ... |
+| stmts.go:133:2:136:2 | After type-switch statement | stmts.go:112:27:137:1 | After block statement |
+| stmts.go:133:2:136:2 | type-switch statement | stmts.go:133:9:133:14 | ... := ... |
+| stmts.go:133:9:133:14 | ... := ... | stmts.go:133:14:133:14 | x |
+| stmts.go:133:9:133:14 | After ... := ... | stmts.go:133:17:133:24 | Before type assertion |
+| stmts.go:133:9:133:14 | assign:0 ... := ... | stmts.go:133:9:133:14 | After ... := ... |
+| stmts.go:133:14:133:14 | x | stmts.go:133:9:133:14 | assign:0 ... := ... |
 | stmts.go:133:17:133:17 | y | stmts.go:133:17:133:24 | type assertion |
-| stmts.go:133:17:133:24 | type assertion | stmts.go:135:3:135:7 | test5 |
+| stmts.go:133:17:133:24 | After type assertion | stmts.go:134:2:135:14 | case clause |
+| stmts.go:133:17:133:24 | Before type assertion | stmts.go:133:17:133:17 | y |
+| stmts.go:133:17:133:24 | type assertion | stmts.go:133:17:133:24 | After type assertion |
+| stmts.go:134:2:135:14 | After case clause [match] | stmts.go:135:3:135:14 | expression statement |
+| stmts.go:134:2:135:14 | case clause | stmts.go:134:2:135:14 | After case clause [match] |
 | stmts.go:135:3:135:7 | test5 | stmts.go:135:9:135:13 | false |
-| stmts.go:135:3:135:14 | call to test5 | stmts.go:112:1:137:1 | exit |
+| stmts.go:135:3:135:14 | After call to test5 | stmts.go:135:3:135:14 | After expression statement |
+| stmts.go:135:3:135:14 | After expression statement | stmts.go:133:2:136:2 | After type-switch statement |
+| stmts.go:135:3:135:14 | Before call to test5 | stmts.go:135:3:135:7 | test5 |
+| stmts.go:135:3:135:14 | call to test5 | stmts.go:112:1:137:1 | Exceptional Exit |
+| stmts.go:135:3:135:14 | call to test5 | stmts.go:135:3:135:14 | After call to test5 |
+| stmts.go:135:3:135:14 | expression statement | stmts.go:135:3:135:14 | Before call to test5 |
 | stmts.go:135:9:135:13 | false | stmts.go:135:3:135:14 | call to test5 |
-| stmts.go:140:1:142:1 | entry | stmts.go:140:13:140:13 | argument corresponding to f |
-| stmts.go:140:1:142:1 | function declaration | stmts.go:145:6:145:11 | skip |
-| stmts.go:140:6:140:11 | skip | stmts.go:140:1:142:1 | function declaration |
-| stmts.go:140:13:140:13 | argument corresponding to f | stmts.go:140:13:140:13 | initialization of f |
-| stmts.go:140:13:140:13 | initialization of f | stmts.go:141:5:141:5 | f |
-| stmts.go:141:2:141:7 | go statement | stmts.go:140:1:142:1 | exit |
-| stmts.go:141:5:141:5 | f | stmts.go:141:2:141:7 | go statement |
-| stmts.go:145:1:159:1 | entry | stmts.go:145:13:145:14 | argument corresponding to xs |
-| stmts.go:145:1:159:1 | function declaration | stmts.go:0:0:0:0 | exit |
-| stmts.go:145:6:145:11 | skip | stmts.go:145:1:159:1 | function declaration |
-| stmts.go:145:13:145:14 | argument corresponding to xs | stmts.go:145:13:145:14 | initialization of xs |
-| stmts.go:145:13:145:14 | initialization of xs | stmts.go:146:17:146:18 | xs |
-| stmts.go:146:2:151:2 | range statement[0] | stmts.go:146:6:146:6 | assignment to x |
-| stmts.go:146:6:146:6 | assignment to x | stmts.go:147:6:147:6 | x |
-| stmts.go:146:6:146:6 | skip | stmts.go:146:2:151:2 | range statement[0] |
-| stmts.go:146:17:146:18 | next key-value pair in range | stmts.go:146:6:146:6 | skip |
-| stmts.go:146:17:146:18 | next key-value pair in range | stmts.go:153:20:153:21 | xs |
-| stmts.go:146:17:146:18 | xs | stmts.go:146:17:146:18 | next key-value pair in range |
+| stmts.go:140:1:142:1 | Entry | stmts.go:140:13:140:13 | f |
+| stmts.go:140:1:142:1 | Normal Exit | stmts.go:140:1:142:1 | Exit |
+| stmts.go:140:1:142:1 | function declaration | stmts.go:145:1:159:1 | function declaration |
+| stmts.go:140:13:140:13 | f | stmts.go:140:23:142:1 | block statement |
+| stmts.go:140:23:142:1 | After block statement | stmts.go:140:1:142:1 | Normal Exit |
+| stmts.go:140:23:142:1 | block statement | stmts.go:141:2:141:7 | Before go statement |
+| stmts.go:141:2:141:7 | After go statement | stmts.go:140:23:142:1 | After block statement |
+| stmts.go:141:2:141:7 | Before go statement | stmts.go:141:5:141:7 | Before call to f |
+| stmts.go:141:2:141:7 | go statement | stmts.go:141:2:141:7 | After go statement |
+| stmts.go:141:5:141:5 | f | stmts.go:141:5:141:7 | call to f |
+| stmts.go:141:5:141:7 | After call to f | stmts.go:141:2:141:7 | go statement |
+| stmts.go:141:5:141:7 | Before call to f | stmts.go:141:5:141:5 | f |
+| stmts.go:141:5:141:7 | call to f | stmts.go:141:5:141:7 | After call to f |
+| stmts.go:145:1:159:1 | Entry | stmts.go:145:13:145:14 | xs |
+| stmts.go:145:1:159:1 | Exceptional Exit | stmts.go:145:1:159:1 | Exit |
+| stmts.go:145:1:159:1 | Normal Exit | stmts.go:145:1:159:1 | Exit |
+| stmts.go:145:1:159:1 | function declaration | stmts.go:0:0:0:0 | After stmts.go |
+| stmts.go:145:13:145:14 | xs | stmts.go:145:23:159:1 | block statement |
+| stmts.go:145:23:159:1 | After block statement | stmts.go:145:1:159:1 | Normal Exit |
+| stmts.go:145:23:159:1 | block statement | stmts.go:146:2:151:2 | range statement |
+| stmts.go:146:2:151:2 | After range element | stmts.go:146:20:151:2 | block statement |
+| stmts.go:146:2:151:2 | After range statement | stmts.go:153:2:155:2 | range statement |
+| stmts.go:146:2:151:2 | [LoopHeader] range statement | stmts.go:146:2:151:2 | After range statement |
+| stmts.go:146:2:151:2 | [LoopHeader] range statement | stmts.go:146:2:151:2 | range element |
+| stmts.go:146:2:151:2 | extract:0 range element | stmts.go:146:2:151:2 | After range element |
+| stmts.go:146:2:151:2 | next range element | stmts.go:146:2:151:2 | extract:0 range element |
+| stmts.go:146:2:151:2 | range element | stmts.go:146:2:151:2 | next range element |
+| stmts.go:146:2:151:2 | range statement | stmts.go:146:17:146:18 | xs |
+| stmts.go:146:17:146:18 | After xs [empty] | stmts.go:146:2:151:2 | After range statement |
+| stmts.go:146:17:146:18 | After xs [non-empty] | stmts.go:146:2:151:2 | range element |
+| stmts.go:146:17:146:18 | xs | stmts.go:146:17:146:18 | After xs [empty] |
+| stmts.go:146:17:146:18 | xs | stmts.go:146:17:146:18 | After xs [non-empty] |
+| stmts.go:146:20:151:2 | After block statement | stmts.go:146:2:151:2 | [LoopHeader] range statement |
+| stmts.go:146:20:151:2 | block statement | stmts.go:147:3:149:3 | if statement |
+| stmts.go:147:3:149:3 | After if statement | stmts.go:150:3:150:14 | expression statement |
+| stmts.go:147:3:149:3 | if statement | stmts.go:147:6:147:10 | Before ...>... |
 | stmts.go:147:6:147:6 | x | stmts.go:147:10:147:10 | 5 |
-| stmts.go:147:6:147:10 | ...>... | stmts.go:147:6:147:10 | ...>... is false |
-| stmts.go:147:6:147:10 | ...>... | stmts.go:147:6:147:10 | ...>... is true |
-| stmts.go:147:6:147:10 | ...>... is false | stmts.go:150:3:150:11 | selection of Print |
-| stmts.go:147:6:147:10 | ...>... is true | stmts.go:148:4:148:11 | skip |
+| stmts.go:147:6:147:10 | ...>... | stmts.go:147:6:147:10 | After ...>... [false] |
+| stmts.go:147:6:147:10 | ...>... | stmts.go:147:6:147:10 | After ...>... [true] |
+| stmts.go:147:6:147:10 | After ...>... [false] | stmts.go:147:3:149:3 | After if statement |
+| stmts.go:147:6:147:10 | After ...>... [true] | stmts.go:147:12:149:3 | block statement |
+| stmts.go:147:6:147:10 | Before ...>... | stmts.go:147:6:147:6 | x |
 | stmts.go:147:10:147:10 | 5 | stmts.go:147:6:147:10 | ...>... |
-| stmts.go:148:4:148:11 | skip | stmts.go:146:17:146:18 | next key-value pair in range |
-| stmts.go:150:3:150:11 | selection of Print | stmts.go:150:13:150:13 | x |
-| stmts.go:150:3:150:14 | call to Print | stmts.go:145:1:159:1 | exit |
-| stmts.go:150:3:150:14 | call to Print | stmts.go:146:17:146:18 | next key-value pair in range |
+| stmts.go:147:12:149:3 | block statement | stmts.go:148:4:148:11 | Before continue statement |
+| stmts.go:148:4:148:11 | Before continue statement | stmts.go:148:4:148:11 | continue statement |
+| stmts.go:148:4:148:11 | continue statement | stmts.go:146:2:151:2 | [LoopHeader] range statement |
+| stmts.go:150:3:150:11 | After selection of Print | stmts.go:150:13:150:13 | x |
+| stmts.go:150:3:150:11 | Before selection of Print | stmts.go:150:3:150:11 | selection of Print |
+| stmts.go:150:3:150:11 | selection of Print | stmts.go:150:3:150:11 | After selection of Print |
+| stmts.go:150:3:150:14 | After call to Print | stmts.go:150:3:150:14 | After expression statement |
+| stmts.go:150:3:150:14 | After expression statement | stmts.go:146:20:151:2 | After block statement |
+| stmts.go:150:3:150:14 | Before call to Print | stmts.go:150:3:150:11 | Before selection of Print |
+| stmts.go:150:3:150:14 | call to Print | stmts.go:145:1:159:1 | Exceptional Exit |
+| stmts.go:150:3:150:14 | call to Print | stmts.go:150:3:150:14 | After call to Print |
+| stmts.go:150:3:150:14 | expression statement | stmts.go:150:3:150:14 | Before call to Print |
 | stmts.go:150:13:150:13 | x | stmts.go:150:3:150:14 | call to Print |
-| stmts.go:153:2:155:2 | range statement[0] | stmts.go:153:2:155:2 | range statement[1] |
-| stmts.go:153:2:155:2 | range statement[1] | stmts.go:153:6:153:6 | assignment to i |
-| stmts.go:153:6:153:6 | assignment to i | stmts.go:153:9:153:9 | assignment to v |
-| stmts.go:153:6:153:6 | skip | stmts.go:153:9:153:9 | skip |
-| stmts.go:153:9:153:9 | assignment to v | stmts.go:154:3:154:11 | selection of Print |
-| stmts.go:153:9:153:9 | skip | stmts.go:153:2:155:2 | range statement[0] |
-| stmts.go:153:20:153:21 | next key-value pair in range | stmts.go:153:6:153:6 | skip |
-| stmts.go:153:20:153:21 | next key-value pair in range | stmts.go:157:12:157:13 | xs |
-| stmts.go:153:20:153:21 | xs | stmts.go:153:20:153:21 | next key-value pair in range |
-| stmts.go:154:3:154:11 | selection of Print | stmts.go:154:13:154:13 | i |
-| stmts.go:154:3:154:17 | call to Print | stmts.go:145:1:159:1 | exit |
-| stmts.go:154:3:154:17 | call to Print | stmts.go:153:20:153:21 | next key-value pair in range |
+| stmts.go:153:2:155:2 | After range element | stmts.go:153:23:155:2 | block statement |
+| stmts.go:153:2:155:2 | After range statement | stmts.go:157:2:158:2 | range statement |
+| stmts.go:153:2:155:2 | [LoopHeader] range statement | stmts.go:153:2:155:2 | After range statement |
+| stmts.go:153:2:155:2 | [LoopHeader] range statement | stmts.go:153:2:155:2 | range element |
+| stmts.go:153:2:155:2 | extract:0 range element | stmts.go:153:2:155:2 | extract:1 range element |
+| stmts.go:153:2:155:2 | extract:1 range element | stmts.go:153:2:155:2 | After range element |
+| stmts.go:153:2:155:2 | next range element | stmts.go:153:2:155:2 | extract:0 range element |
+| stmts.go:153:2:155:2 | range element | stmts.go:153:2:155:2 | next range element |
+| stmts.go:153:2:155:2 | range statement | stmts.go:153:20:153:21 | xs |
+| stmts.go:153:20:153:21 | After xs [empty] | stmts.go:153:2:155:2 | After range statement |
+| stmts.go:153:20:153:21 | After xs [non-empty] | stmts.go:153:2:155:2 | range element |
+| stmts.go:153:20:153:21 | xs | stmts.go:153:20:153:21 | After xs [empty] |
+| stmts.go:153:20:153:21 | xs | stmts.go:153:20:153:21 | After xs [non-empty] |
+| stmts.go:153:23:155:2 | After block statement | stmts.go:153:2:155:2 | [LoopHeader] range statement |
+| stmts.go:153:23:155:2 | block statement | stmts.go:154:3:154:17 | expression statement |
+| stmts.go:154:3:154:11 | After selection of Print | stmts.go:154:13:154:13 | i |
+| stmts.go:154:3:154:11 | Before selection of Print | stmts.go:154:3:154:11 | selection of Print |
+| stmts.go:154:3:154:11 | selection of Print | stmts.go:154:3:154:11 | After selection of Print |
+| stmts.go:154:3:154:17 | After call to Print | stmts.go:154:3:154:17 | After expression statement |
+| stmts.go:154:3:154:17 | After expression statement | stmts.go:153:23:155:2 | After block statement |
+| stmts.go:154:3:154:17 | Before call to Print | stmts.go:154:3:154:11 | Before selection of Print |
+| stmts.go:154:3:154:17 | call to Print | stmts.go:145:1:159:1 | Exceptional Exit |
+| stmts.go:154:3:154:17 | call to Print | stmts.go:154:3:154:17 | After call to Print |
+| stmts.go:154:3:154:17 | expression statement | stmts.go:154:3:154:17 | Before call to Print |
 | stmts.go:154:13:154:13 | i | stmts.go:154:16:154:16 | v |
 | stmts.go:154:16:154:16 | v | stmts.go:154:3:154:17 | call to Print |
-| stmts.go:157:12:157:13 | next key-value pair in range | stmts.go:145:1:159:1 | exit |
-| stmts.go:157:12:157:13 | next key-value pair in range | stmts.go:157:15:158:2 | skip |
-| stmts.go:157:12:157:13 | xs | stmts.go:157:12:157:13 | next key-value pair in range |
-| stmts.go:157:15:158:2 | skip | stmts.go:157:12:157:13 | next key-value pair in range |
-| tst.go:0:0:0:0 | entry | tst.go:3:6:3:10 | skip |
-| tst.go:3:1:12:1 | entry | tst.go:3:12:3:12 | argument corresponding to x |
-| tst.go:3:1:12:1 | function declaration | tst.go:14:6:14:11 | skip |
-| tst.go:3:6:3:10 | skip | tst.go:3:1:12:1 | function declaration |
-| tst.go:3:12:3:12 | argument corresponding to x | tst.go:3:12:3:12 | initialization of x |
-| tst.go:3:12:3:12 | initialization of x | tst.go:4:2:11:2 | true |
-| tst.go:4:2:11:2 | true | tst.go:5:7:5:7 | x |
-| tst.go:5:2:5:13 | skip | tst.go:3:1:12:1 | exit |
+| stmts.go:157:2:158:2 | After range element | stmts.go:157:15:158:2 | block statement |
+| stmts.go:157:2:158:2 | After range statement | stmts.go:145:23:159:1 | After block statement |
+| stmts.go:157:2:158:2 | [LoopHeader] range statement | stmts.go:157:2:158:2 | After range statement |
+| stmts.go:157:2:158:2 | [LoopHeader] range statement | stmts.go:157:2:158:2 | range element |
+| stmts.go:157:2:158:2 | next range element | stmts.go:157:2:158:2 | After range element |
+| stmts.go:157:2:158:2 | range element | stmts.go:157:2:158:2 | next range element |
+| stmts.go:157:2:158:2 | range statement | stmts.go:157:12:157:13 | xs |
+| stmts.go:157:12:157:13 | After xs [empty] | stmts.go:157:2:158:2 | After range statement |
+| stmts.go:157:12:157:13 | After xs [non-empty] | stmts.go:157:2:158:2 | range element |
+| stmts.go:157:12:157:13 | xs | stmts.go:157:12:157:13 | After xs [empty] |
+| stmts.go:157:12:157:13 | xs | stmts.go:157:12:157:13 | After xs [non-empty] |
+| stmts.go:157:15:158:2 | block statement | stmts.go:157:2:158:2 | [LoopHeader] range statement |
+| tst.go:0:0:0:0 | After tst.go | tst.go:0:0:0:0 | Normal Exit |
+| tst.go:0:0:0:0 | Entry | tst.go:0:0:0:0 | tst.go |
+| tst.go:0:0:0:0 | Normal Exit | tst.go:0:0:0:0 | Exit |
+| tst.go:0:0:0:0 | tst.go | tst.go:3:1:12:1 | function declaration |
+| tst.go:3:1:12:1 | Entry | tst.go:3:12:3:12 | x |
+| tst.go:3:1:12:1 | Normal Exit | tst.go:3:1:12:1 | Exit |
+| tst.go:3:1:12:1 | function declaration | tst.go:14:1:21:1 | function declaration |
+| tst.go:3:12:3:12 | x | tst.go:3:19:12:1 | block statement |
+| tst.go:3:19:12:1 | After block statement | tst.go:3:1:12:1 | Normal Exit |
+| tst.go:3:19:12:1 | block statement | tst.go:4:2:11:2 | expression-switch statement |
+| tst.go:4:2:11:2 | After expression-switch statement | tst.go:3:19:12:1 | After block statement |
+| tst.go:4:2:11:2 | expression-switch statement | tst.go:5:2:5:13 | case clause |
+| tst.go:5:2:5:13 | After case clause [match] | tst.go:4:2:11:2 | After expression-switch statement |
+| tst.go:5:2:5:13 | After case clause [no-match] | tst.go:7:2:7:13 | case clause |
+| tst.go:5:2:5:13 | case clause | tst.go:5:7:5:12 | Before ...<... |
 | tst.go:5:7:5:7 | x | tst.go:5:11:5:12 | 23 |
-| tst.go:5:7:5:12 | ...<... | tst.go:5:7:5:12 | case ...<... |
-| tst.go:5:7:5:12 | ...<... is false | tst.go:7:7:7:7 | x |
-| tst.go:5:7:5:12 | ...<... is true | tst.go:5:2:5:13 | skip |
-| tst.go:5:7:5:12 | case ...<... | tst.go:5:7:5:12 | ...<... is false |
-| tst.go:5:7:5:12 | case ...<... | tst.go:5:7:5:12 | ...<... is true |
+| tst.go:5:7:5:12 | ...<... | tst.go:5:7:5:12 | After ...<... [match] |
+| tst.go:5:7:5:12 | ...<... | tst.go:5:7:5:12 | After ...<... [no-match] |
+| tst.go:5:7:5:12 | After ...<... [match] | tst.go:5:2:5:13 | After case clause [match] |
+| tst.go:5:7:5:12 | After ...<... [no-match] | tst.go:5:2:5:13 | After case clause [no-match] |
+| tst.go:5:7:5:12 | Before ...<... | tst.go:5:7:5:7 | x |
 | tst.go:5:11:5:12 | 23 | tst.go:5:7:5:12 | ...<... |
-| tst.go:7:2:7:13 | skip | tst.go:3:1:12:1 | exit |
+| tst.go:7:2:7:13 | After case clause [match] | tst.go:4:2:11:2 | After expression-switch statement |
+| tst.go:7:2:7:13 | After case clause [no-match] | tst.go:9:2:9:13 | case clause |
+| tst.go:7:2:7:13 | case clause | tst.go:7:7:7:12 | Before ...<... |
 | tst.go:7:7:7:7 | x | tst.go:7:11:7:12 | 42 |
-| tst.go:7:7:7:12 | ...<... | tst.go:7:7:7:12 | case ...<... |
-| tst.go:7:7:7:12 | ...<... is false | tst.go:9:7:9:7 | x |
-| tst.go:7:7:7:12 | ...<... is true | tst.go:7:2:7:13 | skip |
-| tst.go:7:7:7:12 | case ...<... | tst.go:7:7:7:12 | ...<... is false |
-| tst.go:7:7:7:12 | case ...<... | tst.go:7:7:7:12 | ...<... is true |
+| tst.go:7:7:7:12 | ...<... | tst.go:7:7:7:12 | After ...<... [match] |
+| tst.go:7:7:7:12 | ...<... | tst.go:7:7:7:12 | After ...<... [no-match] |
+| tst.go:7:7:7:12 | After ...<... [match] | tst.go:7:2:7:13 | After case clause [match] |
+| tst.go:7:7:7:12 | After ...<... [no-match] | tst.go:7:2:7:13 | After case clause [no-match] |
+| tst.go:7:7:7:12 | Before ...<... | tst.go:7:7:7:7 | x |
 | tst.go:7:11:7:12 | 42 | tst.go:7:7:7:12 | ...<... |
-| tst.go:9:2:9:13 | skip | tst.go:3:1:12:1 | exit |
+| tst.go:9:2:9:13 | After case clause [match] | tst.go:4:2:11:2 | After expression-switch statement |
+| tst.go:9:2:9:13 | After case clause [no-match] | tst.go:4:2:11:2 | After expression-switch statement |
+| tst.go:9:2:9:13 | case clause | tst.go:9:7:9:12 | Before ...<... |
 | tst.go:9:7:9:7 | x | tst.go:9:11:9:12 | 23 |
-| tst.go:9:7:9:12 | ...<... | tst.go:9:7:9:12 | case ...<... |
-| tst.go:9:7:9:12 | ...<... is false | tst.go:3:1:12:1 | exit |
-| tst.go:9:7:9:12 | ...<... is true | tst.go:9:2:9:13 | skip |
-| tst.go:9:7:9:12 | case ...<... | tst.go:9:7:9:12 | ...<... is false |
-| tst.go:9:7:9:12 | case ...<... | tst.go:9:7:9:12 | ...<... is true |
+| tst.go:9:7:9:12 | ...<... | tst.go:9:7:9:12 | After ...<... [match] |
+| tst.go:9:7:9:12 | ...<... | tst.go:9:7:9:12 | After ...<... [no-match] |
+| tst.go:9:7:9:12 | After ...<... [match] | tst.go:9:2:9:13 | After case clause [match] |
+| tst.go:9:7:9:12 | After ...<... [no-match] | tst.go:9:2:9:13 | After case clause [no-match] |
+| tst.go:9:7:9:12 | Before ...<... | tst.go:9:7:9:7 | x |
 | tst.go:9:11:9:12 | 23 | tst.go:9:7:9:12 | ...<... |
-| tst.go:14:1:21:1 | entry | tst.go:14:13:14:17 | argument corresponding to value |
-| tst.go:14:1:21:1 | function declaration | tst.go:23:6:23:11 | skip |
-| tst.go:14:6:14:11 | skip | tst.go:14:1:21:1 | function declaration |
-| tst.go:14:13:14:17 | argument corresponding to value | tst.go:14:13:14:17 | initialization of value |
-| tst.go:14:13:14:17 | initialization of value | tst.go:15:2:20:2 | true |
-| tst.go:15:2:20:2 | true | tst.go:16:7:16:11 | value |
-| tst.go:16:2:16:34 | skip | tst.go:14:1:21:1 | exit |
-| tst.go:16:7:16:11 | value | tst.go:16:15:16:33 | ...*... |
-| tst.go:16:7:16:33 | ...<... | tst.go:16:7:16:33 | case ...<... |
-| tst.go:16:7:16:33 | ...<... is false | tst.go:18:7:18:11 | value |
-| tst.go:16:7:16:33 | ...<... is true | tst.go:16:2:16:34 | skip |
-| tst.go:16:7:16:33 | case ...<... | tst.go:16:7:16:33 | ...<... is false |
-| tst.go:16:7:16:33 | case ...<... | tst.go:16:7:16:33 | ...<... is true |
-| tst.go:16:15:16:33 | ...*... | tst.go:16:7:16:33 | ...<... |
-| tst.go:18:2:18:39 | skip | tst.go:14:1:21:1 | exit |
-| tst.go:18:7:18:11 | value | tst.go:18:15:18:38 | ...*... |
-| tst.go:18:7:18:38 | ...<... | tst.go:18:7:18:38 | case ...<... |
-| tst.go:18:7:18:38 | ...<... is false | tst.go:14:1:21:1 | exit |
-| tst.go:18:7:18:38 | ...<... is true | tst.go:18:2:18:39 | skip |
-| tst.go:18:7:18:38 | case ...<... | tst.go:18:7:18:38 | ...<... is false |
-| tst.go:18:7:18:38 | case ...<... | tst.go:18:7:18:38 | ...<... is true |
-| tst.go:18:15:18:38 | ...*... | tst.go:18:7:18:38 | ...<... |
-| tst.go:23:1:26:1 | entry | tst.go:24:2:25:2 | true |
-| tst.go:23:1:26:1 | function declaration | tst.go:28:6:28:11 | skip |
-| tst.go:23:6:23:11 | skip | tst.go:23:1:26:1 | function declaration |
-| tst.go:24:2:25:2 | true | tst.go:23:1:26:1 | exit |
-| tst.go:28:1:32:1 | entry | tst.go:29:2:31:2 | true |
-| tst.go:28:1:32:1 | function declaration | tst.go:0:0:0:0 | exit |
-| tst.go:28:6:28:11 | skip | tst.go:28:1:32:1 | function declaration |
-| tst.go:29:2:31:2 | true | tst.go:30:2:30:9 | skip |
-| tst.go:30:2:30:9 | skip | tst.go:28:1:32:1 | exit |
+| tst.go:14:1:21:1 | Entry | tst.go:14:13:14:17 | value |
+| tst.go:14:1:21:1 | Normal Exit | tst.go:14:1:21:1 | Exit |
+| tst.go:14:1:21:1 | function declaration | tst.go:23:1:26:1 | function declaration |
+| tst.go:14:13:14:17 | value | tst.go:14:26:21:1 | block statement |
+| tst.go:14:26:21:1 | After block statement | tst.go:14:1:21:1 | Normal Exit |
+| tst.go:14:26:21:1 | block statement | tst.go:15:2:20:2 | expression-switch statement |
+| tst.go:15:2:20:2 | After expression-switch statement | tst.go:14:26:21:1 | After block statement |
+| tst.go:15:2:20:2 | expression-switch statement | tst.go:16:2:16:34 | case clause |
+| tst.go:16:2:16:34 | After case clause [match] | tst.go:15:2:20:2 | After expression-switch statement |
+| tst.go:16:2:16:34 | After case clause [no-match] | tst.go:18:2:18:39 | case clause |
+| tst.go:16:2:16:34 | case clause | tst.go:16:7:16:33 | Before ...<... |
+| tst.go:16:7:16:11 | value | tst.go:16:15:16:33 | Before ...*... |
+| tst.go:16:7:16:33 | ...<... | tst.go:16:7:16:33 | After ...<... [match] |
+| tst.go:16:7:16:33 | ...<... | tst.go:16:7:16:33 | After ...<... [no-match] |
+| tst.go:16:7:16:33 | After ...<... [match] | tst.go:16:2:16:34 | After case clause [match] |
+| tst.go:16:7:16:33 | After ...<... [no-match] | tst.go:16:2:16:34 | After case clause [no-match] |
+| tst.go:16:7:16:33 | Before ...<... | tst.go:16:7:16:11 | value |
+| tst.go:16:15:16:33 | ...*... | tst.go:16:15:16:33 | After ...*... |
+| tst.go:16:15:16:33 | After ...*... | tst.go:16:7:16:33 | ...<... |
+| tst.go:16:15:16:33 | Before ...*... | tst.go:16:15:16:33 | ...*... |
+| tst.go:18:2:18:39 | After case clause [match] | tst.go:15:2:20:2 | After expression-switch statement |
+| tst.go:18:2:18:39 | After case clause [no-match] | tst.go:15:2:20:2 | After expression-switch statement |
+| tst.go:18:2:18:39 | case clause | tst.go:18:7:18:38 | Before ...<... |
+| tst.go:18:7:18:11 | value | tst.go:18:15:18:38 | Before ...*... |
+| tst.go:18:7:18:38 | ...<... | tst.go:18:7:18:38 | After ...<... [match] |
+| tst.go:18:7:18:38 | ...<... | tst.go:18:7:18:38 | After ...<... [no-match] |
+| tst.go:18:7:18:38 | After ...<... [match] | tst.go:18:2:18:39 | After case clause [match] |
+| tst.go:18:7:18:38 | After ...<... [no-match] | tst.go:18:2:18:39 | After case clause [no-match] |
+| tst.go:18:7:18:38 | Before ...<... | tst.go:18:7:18:11 | value |
+| tst.go:18:15:18:38 | ...*... | tst.go:18:15:18:38 | After ...*... |
+| tst.go:18:15:18:38 | After ...*... | tst.go:18:7:18:38 | ...<... |
+| tst.go:18:15:18:38 | Before ...*... | tst.go:18:15:18:38 | ...*... |
+| tst.go:23:1:26:1 | Entry | tst.go:23:15:26:1 | block statement |
+| tst.go:23:1:26:1 | Normal Exit | tst.go:23:1:26:1 | Exit |
+| tst.go:23:1:26:1 | function declaration | tst.go:28:1:32:1 | function declaration |
+| tst.go:23:15:26:1 | After block statement | tst.go:23:1:26:1 | Normal Exit |
+| tst.go:23:15:26:1 | block statement | tst.go:24:2:25:2 | expression-switch statement |
+| tst.go:24:2:25:2 | expression-switch statement | tst.go:23:15:26:1 | After block statement |
+| tst.go:28:1:32:1 | Entry | tst.go:28:15:32:1 | block statement |
+| tst.go:28:1:32:1 | Normal Exit | tst.go:28:1:32:1 | Exit |
+| tst.go:28:1:32:1 | function declaration | tst.go:0:0:0:0 | After tst.go |
+| tst.go:28:15:32:1 | After block statement | tst.go:28:1:32:1 | Normal Exit |
+| tst.go:28:15:32:1 | block statement | tst.go:29:2:31:2 | expression-switch statement |
+| tst.go:29:2:31:2 | After expression-switch statement | tst.go:28:15:32:1 | After block statement |
+| tst.go:29:2:31:2 | expression-switch statement | tst.go:30:2:30:9 | case clause |
+| tst.go:30:2:30:9 | After case clause [match] | tst.go:29:2:31:2 | After expression-switch statement |
+| tst.go:30:2:30:9 | case clause | tst.go:30:2:30:9 | After case clause [match] |
diff --git a/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/NoretFunctions.expected b/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/NoretFunctions.expected
index 2715352ef253..52306e9a9878 100644
--- a/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/NoretFunctions.expected
+++ b/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/NoretFunctions.expected
@@ -1,4 +1,3 @@
-| epilogues.go:115:6:115:22 | epiRecoverUnnamed | github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph.epiRecoverUnnamed |
 | file://:0:0:0:0 | Exit | os.Exit |
 | file://:0:0:0:0 | Fatal | log.Fatal |
 | file://:0:0:0:0 | Fatal | log.Logger.Fatal |
@@ -16,7 +15,8 @@
 | noretfunctions.go:8:6:8:12 | isNoRet | github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph.isNoRet |
 | noretfunctions.go:20:6:20:22 | noRetUsesLogFatal | github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph.noRetUsesLogFatal |
 | noretfunctions.go:24:6:24:23 | noRetUsesLogFatalf | github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph.noRetUsesLogFatalf |
-| stmts7.go:10:6:10:15 | canRecover | github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph.canRecover |
+| stmts7.go:33:6:33:20 | deferBeforeExit | github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph.deferBeforeExit |
+| stmts7.go:43:6:43:23 | finalDeferredPanic | github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph.finalDeferredPanic |
+| stmts7.go:47:6:47:31 | deferredExitStopsRemaining | github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph.deferredExitStopsRemaining |
 | stmts.go:10:6:10:10 | test5 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph.test5 |
 | stmts.go:46:6:46:10 | test6 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph.test6 |
-| stmts.go:112:6:112:10 | test9 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph.test9 |
diff --git a/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/stmts7.go b/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/stmts7.go
index f44b8d53a0d5..64d5db51563d 100644
--- a/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/stmts7.go
+++ b/go/ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/stmts7.go
@@ -1,6 +1,9 @@
 package main
 
-import "fmt"
+import (
+	"fmt"
+	"os"
+)
 
 func recoverPanic() {
 	blah := recover()
@@ -26,3 +29,57 @@ func defertest(callback Callback) bool {
 	fmt.Println("print something")
 	return false
 }
+
+func deferBeforeExit() {
+	defer recoverPanic()
+	os.Exit(1)
+}
+
+func deferredPanic() {
+	defer recoverPanic()
+	defer panic("deferred panic")
+}
+
+func finalDeferredPanic() {
+	defer panic("final deferred panic")
+}
+
+func deferredExitStopsRemaining() {
+	defer recoverPanic()
+	defer os.Exit(1)
+}
+
+func deferBeforePossiblePanic(values []int, index int) {
+	defer recoverPanic()
+	_ = values[index]
+}
+
+func conditionalDefer(register bool) {
+	if register {
+		defer recoverPanic()
+	}
+	fmt.Println("done")
+}
+
+func repeatedDefer(count int) {
+	for i := 0; i < count; i++ {
+		defer recoverPanic()
+	}
+}
+
+func bypassedDefer(skip bool) {
+	if skip {
+		goto done
+	}
+	defer recoverPanic()
+done:
+	fmt.Println("done")
+}
+
+func panicAroundDefer(panicEarly bool) {
+	if panicEarly {
+		panic("early")
+	}
+	defer recoverPanic()
+	panic("late")
+}
diff --git a/go/ql/test/library-tests/semmle/go/controlflow/GotoTarget/GotoTarget.expected b/go/ql/test/library-tests/semmle/go/controlflow/GotoTarget/GotoTarget.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/library-tests/semmle/go/controlflow/GotoTarget/GotoTarget.ql b/go/ql/test/library-tests/semmle/go/controlflow/GotoTarget/GotoTarget.ql
new file mode 100644
index 000000000000..4b0a288bcf98
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/controlflow/GotoTarget/GotoTarget.ql
@@ -0,0 +1,19 @@
+import go
+import utils.test.InlineExpectationsTest
+
+module GotoTargetTest implements TestSig {
+  string getARelevantTag() { result = "gotoTarget" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(GotoStmt jump, LabeledStmt target, ControlFlow::Node source |
+      jump.getLocation() = location and
+      source.getAstNode() = jump and
+      source.getASuccessor().getAstNode() = target and
+      element = jump.toString() and
+      tag = "gotoTarget" and
+      value = target.getLabel()
+    )
+  }
+}
+
+import MakeTest<GotoTargetTest>
diff --git a/go/ql/test/library-tests/semmle/go/controlflow/GotoTarget/gotos.go b/go/ql/test/library-tests/semmle/go/controlflow/GotoTarget/gotos.go
new file mode 100644
index 000000000000..48f2b170e58c
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/controlflow/GotoTarget/gotos.go
@@ -0,0 +1,53 @@
+package main
+
+func gotoStackedSiblingTarget(flag bool) {
+	if flag {
+		goto inner // $ gotoTarget=inner
+	}
+outer:
+inner:
+	flag = false
+	goto outer // $ gotoTarget=outer
+}
+
+func gotoNestedSiblingTarget(flag bool) {
+	if flag {
+		goto inner // $ gotoTarget=inner
+	} else {
+		goto outer // $ gotoTarget=outer
+	}
+outer:
+inner:
+	{
+		flag = false
+	}
+}
+
+func gotoSelfLoop(flag bool) {
+self:
+	if flag {
+		goto self // $ gotoTarget=self
+	}
+}
+
+func gotoDirectSelfLoop() {
+self:
+	goto self // $ gotoTarget=self
+}
+
+func gotoDirectTarget() {
+step1:
+	goto step2 // $ gotoTarget=step2
+step2:
+	goto step1 // $ gotoTarget=step1
+}
+
+func gotoEnclosingStackedLabel(flag bool) {
+outer:
+inner:
+	if flag {
+		goto inner // $ gotoTarget=inner
+	} else {
+		goto outer // $ gotoTarget=outer
+	}
+}
diff --git a/go/ql/test/library-tests/semmle/go/controlflow/Guards/Guards.expected b/go/ql/test/library-tests/semmle/go/controlflow/Guards/Guards.expected
new file mode 100644
index 000000000000..044d84d8dab3
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/controlflow/Guards/Guards.expected
@@ -0,0 +1,258 @@
+controlsResult
+| guards.go:12:7:12:15 | ...<... | negative | true |
+| guards.go:12:7:12:15 | ...<... | positive | false |
+| guards.go:12:7:12:15 | ...<... | zero | false |
+| guards.go:14:7:14:16 | ...==... | positive | false |
+| guards.go:14:7:14:16 | ...==... | zero | true |
+| guards.go:23:2:24:21 | case clause | tagged one or two | false |
+| guards.go:23:2:24:21 | case clause | tagged other | false |
+| guards.go:23:2:24:21 | case clause | tagged zero | true |
+| guards.go:25:2:26:27 | case clause | tagged other | false |
+| guards.go:34:2:35:30 | case clause | tagged false boolean | true |
+| guards.go:34:7:34:11 | value | tagged false boolean | false |
+| guards.go:38:2:39:29 | case clause | tagged true boolean | true |
+| guards.go:38:7:38:11 | value | tagged true boolean | true |
+| guards.go:42:2:43:33 | case clause | tagged false comparison | true |
+| guards.go:42:7:42:17 | ...<... | tagged false comparison | false |
+| guards.go:48:5:48:5 | a | compound true | true |
+| guards.go:56:5:56:20 | ...==... | upcast | true |
+| guards.go:59:5:59:19 | ...==... | downcast | true |
+| guards.go:62:5:62:22 | ...==... | upcast narrow | true |
+| guards.go:68:5:68:15 | ...<=... | above ten | false |
+| guards.go:68:5:68:15 | ...<=... | at most ten | true |
+| guards.go:73:5:73:15 | ...<=... | at least ten | true |
+| guards.go:73:5:73:15 | ...<=... | below ten | false |
+| guards.go:81:10:81:14 | value | ssa copy | true |
+| guards.go:82:5:82:8 | copy | ssa copy | true |
+| guards.go:87:5:87:9 | value | ssa phi | true |
+| guards.go:90:5:90:7 | phi | ssa phi | true |
+| guards.go:96:5:96:18 | ...==... | nil pointer | true |
+| guards.go:96:5:96:18 | ...==... | non-nil pointer | false |
+| guards.go:102:5:102:26 | ...==... | typed nil pointer | true |
+| guards.go:106:5:106:21 | ...==... | new result | true |
+| guards.go:110:5:110:27 | ...==... | make result | true |
+| guards.go:114:5:114:24 | ...==... | composite literal | true |
+| guards.go:118:5:118:32 | ...==... | errors new | true |
+| guards.go:122:5:122:32 | ...==... | fmt errorf | true |
+| guards.go:126:5:126:28 | ...==... | source non-nil return | true |
+| guards.go:137:2:138:26 | case clause | default case | false |
+| guards.go:137:2:138:26 | case clause | non-default case | true |
+| guards.go:148:2:149:28 | case clause | case after default | true |
+| guards.go:148:2:149:28 | case clause | default before case | false |
+| guards.go:162:7:162:11 | value | expressionless case | true |
+| guards.go:162:7:162:11 | value | expressionless default | false |
+| guards.go:183:5:183:21 | call to isNotNil | non-variadic wrapper | true |
+| guards.go:194:5:194:32 | call to namedResultIsNotNil | named result wrapper | true |
+| guards.go:208:5:208:43 | call to conditionalNamedResultIsNotNil | conditional named result wrapper | true |
+| guards.go:224:5:224:31 | call to isNotNil | method wrapper | true |
+| guards.go:230:5:230:50 | call to isNotNil | method expression wrapper | true |
+| guards.go:236:5:236:31 | call to isNotNil | interface method wrapper | true |
+| guards.go:248:5:248:24 | call to isNotNil | receiver method wrapper | true |
+| guards.go:254:5:254:44 | call to isNotNil | receiver method expression wrapper | true |
+| guards.go:264:5:264:24 | call to isNotNil | promoted receiver method wrapper | true |
+| guards.go:270:5:270:24 | call to isNotNil | implicit address receiver method wrapper | true |
+| guards.go:282:5:282:22 | call to isTrue | implicit dereference receiver method wrapper | true |
+| guards.go:296:5:296:18 | call to check | indirect wrapper | true |
+| guards.go:306:5:306:20 | call to hasArgs | implicit variadic wrapper | true |
+| guards.go:309:5:309:24 | call to hasArgs | explicit variadic wrapper | true |
+valueControlsResult
+| guards.go:12:7:12:11 | value | negative | Upper bound -1 |
+| guards.go:12:7:12:11 | value | positive | Lower bound 0 |
+| guards.go:12:7:12:11 | value | zero | Lower bound 0 |
+| guards.go:12:7:12:15 | ...<... | negative | true |
+| guards.go:12:7:12:15 | ...<... | positive | false |
+| guards.go:12:7:12:15 | ...<... | zero | false |
+| guards.go:14:7:14:11 | value | positive | not 0 |
+| guards.go:14:7:14:11 | value | zero | 0 |
+| guards.go:14:7:14:16 | ...==... | positive | false |
+| guards.go:14:7:14:16 | ...==... | zero | true |
+| guards.go:22:9:22:13 | value | tagged one or two | not 0 |
+| guards.go:22:9:22:13 | value | tagged other | not 0 |
+| guards.go:22:9:22:13 | value | tagged other | not 1 |
+| guards.go:22:9:22:13 | value | tagged other | not 2 |
+| guards.go:22:9:22:13 | value | tagged zero | 0 |
+| guards.go:23:2:24:21 | case clause | tagged one or two | false |
+| guards.go:23:2:24:21 | case clause | tagged other | false |
+| guards.go:23:2:24:21 | case clause | tagged zero | true |
+| guards.go:25:2:26:27 | case clause | tagged other | false |
+| guards.go:34:2:35:30 | case clause | tagged false boolean | true |
+| guards.go:34:7:34:11 | value | tagged false boolean | false |
+| guards.go:38:2:39:29 | case clause | tagged true boolean | true |
+| guards.go:38:7:38:11 | value | tagged true boolean | true |
+| guards.go:42:2:43:33 | case clause | tagged false comparison | true |
+| guards.go:42:7:42:12 | number | tagged false comparison | Lower bound 10 |
+| guards.go:42:7:42:17 | ...<... | tagged false comparison | false |
+| guards.go:48:5:48:5 | a | compound true | true |
+| guards.go:56:5:56:15 | type conversion | upcast | 0 |
+| guards.go:56:5:56:20 | ...==... | upcast | true |
+| guards.go:56:11:56:14 | wide | upcast | 0 |
+| guards.go:59:5:59:14 | type conversion | downcast | 0 |
+| guards.go:59:5:59:19 | ...==... | downcast | true |
+| guards.go:62:5:62:17 | type conversion | upcast narrow | 0 |
+| guards.go:62:5:62:22 | ...==... | upcast narrow | true |
+| guards.go:62:11:62:16 | narrow | upcast narrow | 0 |
+| guards.go:68:5:68:9 | value | above ten | Lower bound 11 |
+| guards.go:68:5:68:9 | value | at most ten | Upper bound 10 |
+| guards.go:68:5:68:15 | ...<=... | above ten | false |
+| guards.go:68:5:68:15 | ...<=... | at most ten | true |
+| guards.go:73:5:73:15 | ...<=... | at least ten | true |
+| guards.go:73:5:73:15 | ...<=... | below ten | false |
+| guards.go:73:11:73:15 | value | at least ten | Lower bound 10 |
+| guards.go:73:11:73:15 | value | below ten | Upper bound 9 |
+| guards.go:81:10:81:14 | value | ssa copy | true |
+| guards.go:82:5:82:8 | copy | ssa copy | true |
+| guards.go:87:5:87:9 | value | ssa phi | true |
+| guards.go:90:5:90:7 | phi | ssa phi | true |
+| guards.go:96:5:96:11 | pointer | nil pointer | null |
+| guards.go:96:5:96:11 | pointer | non-nil pointer | not null |
+| guards.go:96:5:96:18 | ...==... | nil pointer | true |
+| guards.go:96:5:96:18 | ...==... | non-nil pointer | false |
+| guards.go:102:5:102:11 | pointer | typed nil pointer | null |
+| guards.go:102:5:102:26 | ...==... | typed nil pointer | true |
+| guards.go:106:5:106:9 | value | new result | not null |
+| guards.go:106:5:106:21 | ...==... | new result | true |
+| guards.go:110:5:110:9 | value | make result | not null |
+| guards.go:110:5:110:27 | ...==... | make result | true |
+| guards.go:110:14:110:27 | call to make | composite literal | no exception |
+| guards.go:110:14:110:27 | call to make | errors new | no exception |
+| guards.go:110:14:110:27 | call to make | fmt errorf | no exception |
+| guards.go:110:14:110:27 | call to make | make result | no exception |
+| guards.go:110:14:110:27 | call to make | source non-nil return | no exception |
+| guards.go:114:5:114:9 | value | composite literal | not null |
+| guards.go:114:5:114:24 | ...==... | composite literal | true |
+| guards.go:118:5:118:9 | value | errors new | not null |
+| guards.go:118:5:118:32 | ...==... | errors new | true |
+| guards.go:118:14:118:32 | call to New | errors new | no exception |
+| guards.go:118:14:118:32 | call to New | fmt errorf | no exception |
+| guards.go:118:14:118:32 | call to New | source non-nil return | no exception |
+| guards.go:122:5:122:9 | value | fmt errorf | not null |
+| guards.go:122:5:122:32 | ...==... | fmt errorf | true |
+| guards.go:122:14:122:32 | call to Errorf | fmt errorf | no exception |
+| guards.go:122:14:122:32 | call to Errorf | source non-nil return | no exception |
+| guards.go:126:5:126:9 | value | source non-nil return | not null |
+| guards.go:126:5:126:28 | ...==... | source non-nil return | true |
+| guards.go:126:14:126:28 | call to returnsNonNil | source non-nil return | no exception |
+| guards.go:136:9:136:13 | value | default case | not 0 |
+| guards.go:136:9:136:13 | value | non-default case | 0 |
+| guards.go:137:2:138:26 | case clause | default case | false |
+| guards.go:137:2:138:26 | case clause | non-default case | true |
+| guards.go:145:9:145:13 | value | case after default | 0 |
+| guards.go:145:9:145:13 | value | default before case | not 0 |
+| guards.go:148:2:149:28 | case clause | case after default | true |
+| guards.go:148:2:149:28 | case clause | default before case | false |
+| guards.go:162:7:162:11 | value | expressionless case | true |
+| guards.go:162:7:162:11 | value | expressionless default | false |
+| guards.go:183:5:183:21 | call to isNotNil | non-variadic wrapper | no exception |
+| guards.go:183:5:183:21 | call to isNotNil | non-variadic wrapper | true |
+| guards.go:183:14:183:20 | pointer | non-variadic wrapper | not null |
+| guards.go:194:5:194:32 | call to namedResultIsNotNil | named result wrapper | no exception |
+| guards.go:194:5:194:32 | call to namedResultIsNotNil | named result wrapper | true |
+| guards.go:194:25:194:31 | pointer | named result wrapper | not null |
+| guards.go:208:5:208:43 | call to conditionalNamedResultIsNotNil | conditional named result wrapper | no exception |
+| guards.go:208:5:208:43 | call to conditionalNamedResultIsNotNil | conditional named result wrapper | true |
+| guards.go:208:36:208:42 | pointer | conditional named result wrapper | not null |
+| guards.go:224:5:224:31 | call to isNotNil | method wrapper | no exception |
+| guards.go:224:5:224:31 | call to isNotNil | method wrapper | true |
+| guards.go:224:24:224:30 | pointer | method wrapper | not null |
+| guards.go:230:5:230:50 | call to isNotNil | method expression wrapper | no exception |
+| guards.go:230:5:230:50 | call to isNotNil | method expression wrapper | true |
+| guards.go:230:43:230:49 | pointer | method expression wrapper | not null |
+| guards.go:236:5:236:31 | call to isNotNil | interface method wrapper | no exception |
+| guards.go:236:5:236:31 | call to isNotNil | interface method wrapper | true |
+| guards.go:248:5:248:13 | validator | receiver method wrapper | not null |
+| guards.go:248:5:248:24 | call to isNotNil | receiver method wrapper | no exception |
+| guards.go:248:5:248:24 | call to isNotNil | receiver method wrapper | true |
+| guards.go:254:5:254:44 | call to isNotNil | receiver method expression wrapper | no exception |
+| guards.go:254:5:254:44 | call to isNotNil | receiver method expression wrapper | true |
+| guards.go:254:35:254:43 | validator | receiver method expression wrapper | not null |
+| guards.go:264:5:264:24 | call to isNotNil | promoted receiver method wrapper | no exception |
+| guards.go:264:5:264:24 | call to isNotNil | promoted receiver method wrapper | true |
+| guards.go:270:5:270:24 | call to isNotNil | implicit address receiver method wrapper | no exception |
+| guards.go:270:5:270:24 | call to isNotNil | implicit address receiver method wrapper | true |
+| guards.go:282:5:282:22 | call to isTrue | implicit dereference receiver method wrapper | no exception |
+| guards.go:282:5:282:22 | call to isTrue | implicit dereference receiver method wrapper | true |
+| guards.go:296:5:296:18 | call to check | indirect wrapper | no exception |
+| guards.go:296:5:296:18 | call to check | indirect wrapper | true |
+| guards.go:306:5:306:20 | call to hasArgs | implicit variadic wrapper | no exception |
+| guards.go:306:5:306:20 | call to hasArgs | implicit variadic wrapper | true |
+| guards.go:309:5:309:24 | call to hasArgs | explicit variadic wrapper | no exception |
+| guards.go:309:5:309:24 | call to hasArgs | explicit variadic wrapper | true |
+| guards.go:309:13:309:20 | pointers | explicit variadic wrapper | not null |
+| guards.go:321:2:321:22 | call to ensureNotNil | after assertion | no exception |
+| guards.go:321:15:321:21 | pointer | after assertion | not null |
+| guards.go:333:2:333:32 | call to ensureNotNilWithResult | after single-result assertion | no exception |
+| guards.go:333:25:333:31 | pointer | after single-result assertion | not null |
+| guards.go:345:2:345:33 | call to ensureNotNilWithResults | after multi-result assertion | no exception |
+| guards.go:345:26:345:32 | pointer | after multi-result assertion | not null |
+ensuresEqResult
+| guards.go:14:7:14:16 | ...==... | 0 = value | true |
+| guards.go:14:7:14:16 | ...==... | value = 0 | true |
+| guards.go:23:2:24:21 | case clause | 0 = value | true |
+| guards.go:23:2:24:21 | case clause | value = 0 | true |
+| guards.go:56:5:56:20 | ...==... | 0 = type conversion | true |
+| guards.go:56:5:56:20 | ...==... | type conversion = 0 | true |
+| guards.go:59:5:59:19 | ...==... | 0 = type conversion | true |
+| guards.go:59:5:59:19 | ...==... | type conversion = 0 | true |
+| guards.go:62:5:62:22 | ...==... | 0 = type conversion | true |
+| guards.go:62:5:62:22 | ...==... | type conversion = 0 | true |
+| guards.go:96:5:96:18 | ...==... | nil = pointer | true |
+| guards.go:96:5:96:18 | ...==... | pointer = nil | true |
+| guards.go:102:5:102:26 | ...==... | pointer = type conversion | true |
+| guards.go:102:5:102:26 | ...==... | type conversion = pointer | true |
+| guards.go:106:5:106:21 | ...==... | call to new = value | true |
+| guards.go:106:5:106:21 | ...==... | value = call to new | true |
+| guards.go:110:5:110:27 | ...==... | call to make = value | true |
+| guards.go:110:5:110:27 | ...==... | value = call to make | true |
+| guards.go:114:5:114:24 | ...==... | &... = value | true |
+| guards.go:114:5:114:24 | ...==... | value = &... | true |
+| guards.go:118:5:118:32 | ...==... | call to New = value | true |
+| guards.go:118:5:118:32 | ...==... | value = call to New | true |
+| guards.go:122:5:122:32 | ...==... | call to Errorf = value | true |
+| guards.go:122:5:122:32 | ...==... | value = call to Errorf | true |
+| guards.go:126:5:126:28 | ...==... | call to returnsNonNil = value | true |
+| guards.go:126:5:126:28 | ...==... | value = call to returnsNonNil | true |
+| guards.go:137:2:138:26 | case clause | 0 = value | true |
+| guards.go:137:2:138:26 | case clause | value = 0 | true |
+| guards.go:148:2:149:28 | case clause | 0 = value | true |
+| guards.go:148:2:149:28 | case clause | value = 0 | true |
+| guards.go:171:2:172:13 | case clause | 0 = value | true |
+| guards.go:171:2:172:13 | case clause | value = 0 | true |
+| guards.go:179:9:179:22 | ...!=... | nil = pointer | false |
+| guards.go:179:9:179:22 | ...!=... | pointer = nil | false |
+| guards.go:189:10:189:23 | ...!=... | nil = pointer | false |
+| guards.go:189:10:189:23 | ...!=... | pointer = nil | false |
+| guards.go:200:5:200:18 | ...==... | nil = pointer | true |
+| guards.go:200:5:200:18 | ...==... | pointer = nil | true |
+| guards.go:220:9:220:22 | ...!=... | nil = pointer | false |
+| guards.go:220:9:220:22 | ...!=... | pointer = nil | false |
+| guards.go:244:9:244:24 | ...!=... | nil = validator | false |
+| guards.go:244:9:244:24 | ...!=... | validator = nil | false |
+| guards.go:278:9:278:25 | ...==... | true = validator | true |
+| guards.go:278:9:278:25 | ...==... | validator = true | true |
+| guards.go:302:9:302:21 | ...!=... | nil = values | false |
+| guards.go:302:9:302:21 | ...!=... | values = nil | false |
+| guards.go:315:5:315:18 | ...==... | nil = pointer | true |
+| guards.go:315:5:315:18 | ...==... | pointer = nil | true |
+| guards.go:326:5:326:18 | ...==... | nil = pointer | true |
+| guards.go:326:5:326:18 | ...==... | pointer = nil | true |
+| guards.go:338:5:338:18 | ...==... | nil = pointer | true |
+| guards.go:338:5:338:18 | ...==... | pointer = nil | true |
+| guards.go:352:9:352:22 | ...!=... | nil = pointer | false |
+| guards.go:352:9:352:22 | ...!=... | pointer = nil | false |
+| guards.go:377:5:377:32 | ...==... | 0 = call to modelZeroGuard | true |
+| guards.go:377:5:377:32 | ...==... | call to modelZeroGuard = 0 | true |
+| guards.go:380:5:380:35 | ...!=... | 0 = call to modelNotZeroGuard | false |
+| guards.go:380:5:380:35 | ...!=... | call to modelNotZeroGuard = 0 | false |
+| guards.go:383:5:383:34 | ...==... | call to modelNullGuard = nil | true |
+| guards.go:383:5:383:34 | ...==... | nil = call to modelNullGuard | true |
+| guards.go:386:5:386:37 | ...!=... | call to modelNotNullGuard = nil | false |
+| guards.go:386:5:386:37 | ...!=... | nil = call to modelNotNullGuard | false |
+modelBarrierResult
+| guards.go:375:27:375:33 | pointer | model bool | model-bool |
+| guards.go:378:27:378:33 | pointer | model zero | model-zero |
+| guards.go:381:31:381:37 | pointer | model not zero | model-not-zero |
+| guards.go:384:27:384:33 | pointer | model null | model-null |
+| guards.go:387:31:387:37 | pointer | model not null | model-not-null |
+| guards.go:390:34:390:40 | pointer | model no exception | model-no-exception |
+legacyConditionGuardCount
+| 92 |
diff --git a/go/ql/test/library-tests/semmle/go/controlflow/Guards/Guards.ext.yml b/go/ql/test/library-tests/semmle/go/controlflow/Guards/Guards.ext.yml
new file mode 100644
index 000000000000..4635146b411c
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/controlflow/Guards/Guards.ext.yml
@@ -0,0 +1,11 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: barrierGuardModel
+    data:
+      - ["github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/Guards", "", False, "modelBoolGuard", "", "", "Argument[0]", "true", "model-bool", "manual"]
+      - ["github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/Guards", "", False, "modelZeroGuard", "", "", "Argument[0]", "zero", "model-zero", "manual"]
+      - ["github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/Guards", "", False, "modelNotZeroGuard", "", "", "Argument[0]", "not-zero", "model-not-zero", "manual"]
+      - ["github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/Guards", "", False, "modelNullGuard", "", "", "Argument[0]", "null", "model-null", "manual"]
+      - ["github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/Guards", "", False, "modelNotNullGuard", "", "", "Argument[0]", "not-null", "model-not-null", "manual"]
+      - ["github.com/github/codeql-go/ql/test/library-tests/semmle/go/controlflow/Guards", "", False, "modelExceptionGuard", "", "", "Argument[0]", "no-exception", "model-no-exception", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/controlflow/Guards/Guards.ql b/go/ql/test/library-tests/semmle/go/controlflow/Guards/Guards.ql
new file mode 100644
index 000000000000..38a8b5c6f9ca
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/controlflow/Guards/Guards.ql
@@ -0,0 +1,45 @@
+import go
+import semmle.go.controlflow.Guards
+private import semmle.go.dataflow.ExternalFlow
+
+predicate sinkCall(DataFlow::CallNode call, string label) {
+  call.getTarget().getName() = "sink" and
+  label = call.getArgument(0).getExactValue()
+}
+
+query predicate controlsResult(Guard guard, string label, string outcome) {
+  exists(DataFlow::CallNode call, boolean branch |
+    sinkCall(call, label) and
+    guard.controls(call.getBasicBlock(), branch) and
+    outcome = branch.toString()
+  )
+}
+
+query predicate valueControlsResult(Guard guard, string label, string outcome) {
+  exists(DataFlow::CallNode call, GuardValue value |
+    sinkCall(call, label) and
+    guard.valueControls(call.getBasicBlock(), value) and
+    outcome = value.toString()
+  )
+}
+
+query predicate ensuresEqResult(Guard guard, string label, string outcome) {
+  exists(boolean branch, DataFlow::Node left, DataFlow::Node right |
+    guardEnsuresEq(guard, branch, left, right) and
+    label = left.toString() + " = " + right.toString() and
+    outcome = branch.toString()
+  )
+}
+
+query predicate modelBarrierResult(DataFlow::Node node, string label, string kind) {
+  exists(DataFlow::CallNode call |
+    call.getTarget().getName() = "valueSink" and
+    label = call.getArgument(0).getExactValue() and
+    node = call.getArgument(1) and
+    barrierNode(node, kind, _)
+  )
+}
+
+deprecated query predicate legacyConditionGuardCount(int guardCount) {
+  guardCount = count(ControlFlow::ConditionGuardNode guard)
+}
diff --git a/go/ql/test/library-tests/semmle/go/controlflow/Guards/guards.go b/go/ql/test/library-tests/semmle/go/controlflow/Guards/guards.go
new file mode 100644
index 000000000000..147afd8dbe23
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/controlflow/Guards/guards.go
@@ -0,0 +1,391 @@
+package guards
+
+import (
+	"errors"
+	"fmt"
+)
+
+func sink(string) {}
+
+func taglessSwitch(value int) {
+	switch {
+	case value < 0:
+		sink("negative")
+	case value == 0:
+		sink("zero")
+	default:
+		sink("positive")
+	}
+}
+
+func taggedSwitch(value int) {
+	switch value {
+	case 0:
+		sink("tagged zero")
+	case 1, 2:
+		sink("tagged one or two")
+	default:
+		sink("tagged other")
+	}
+}
+
+func taggedBooleanSwitch(value bool, number int) {
+	switch false {
+	case value:
+		sink("tagged false boolean")
+	}
+	switch true {
+	case value:
+		sink("tagged true boolean")
+	}
+	switch false {
+	case number < 10:
+		sink("tagged false comparison")
+	}
+}
+
+func compoundCondition(a, b, c bool) {
+	if a && (b || c) {
+		sink("compound true")
+	} else {
+		sink("compound false")
+	}
+}
+
+func conversions(wide int16, narrow int8) {
+	if int32(wide) == 0 {
+		sink("upcast")
+	}
+	if int8(wide) == 0 {
+		sink("downcast")
+	}
+	if int16(narrow) == 0 {
+		sink("upcast narrow")
+	}
+}
+
+func nonStrictComparisons(value int) {
+	if value <= 10 {
+		sink("at most ten")
+	} else {
+		sink("above ten")
+	}
+	if 10 <= value {
+		sink("at least ten")
+	} else {
+		sink("below ten")
+	}
+}
+
+func ssaGuards(value bool) {
+	copy := value
+	if copy {
+		sink("ssa copy")
+	}
+
+	phi := false
+	if value {
+		phi = true
+	}
+	if phi {
+		sink("ssa phi")
+	}
+}
+
+func nilGuards(pointer *int, value any) {
+	if pointer == nil {
+		sink("nil pointer")
+	} else {
+		sink("non-nil pointer")
+	}
+
+	if pointer == (*int)(nil) {
+		sink("typed nil pointer") // pointer is null
+	}
+
+	if value == new(int) {
+		sink("new result") // value is not null
+	}
+
+	if value == make(chan int) {
+		sink("make result") // value is not null
+	}
+
+	if value == &struct{}{} {
+		sink("composite literal")
+	}
+
+	if value == errors.New("error") {
+		sink("errors new") // value is not null
+	}
+
+	if value == fmt.Errorf("error") {
+		sink("fmt errorf") // value is not null
+	}
+
+	if value == returnsNonNil() {
+		sink("source non-nil return") // value is not null
+	}
+}
+
+func returnsNonNil() *int {
+	return new(int)
+}
+
+func defaultCase(value int) {
+	switch value {
+	case 0:
+		sink("non-default case")
+	default:
+		sink("default case")
+	}
+}
+
+func defaultBeforeCase(value int) {
+	switch value {
+	default:
+		sink("default before case")
+	case 0:
+		sink("case after default")
+	}
+}
+
+func defaultOnly(value int) {
+	switch value {
+	default:
+		sink("default only") // No guard fact: matching the only case is tautological.
+	}
+}
+
+func expressionlessDefault(value bool) {
+	switch {
+	case value:
+		sink("expressionless case")
+	default:
+		sink("expressionless default")
+	}
+}
+
+func fallthroughToDefault(value int) {
+	switch value {
+	case 0:
+		fallthrough
+	default:
+		sink("fallthrough default") // No default-match fact: this is also reached by fallthrough.
+	}
+}
+
+func isNotNil(pointer *int) bool {
+	return pointer != nil
+}
+
+func wrapperGuard(pointer *int) {
+	if isNotNil(pointer) {
+		sink("non-variadic wrapper")
+	}
+}
+
+func namedResultIsNotNil(pointer *int) (valid bool) {
+	valid = pointer != nil
+	return
+}
+
+func namedResultWrapper(pointer *int) {
+	if namedResultIsNotNil(pointer) {
+		sink("named result wrapper") // pointer is not null
+	}
+}
+
+func conditionalNamedResultIsNotNil(pointer *int) (valid bool) {
+	if pointer == nil {
+		return
+	}
+	valid = true
+	return
+}
+
+func conditionalNamedResultWrapper(pointer *int) {
+	if conditionalNamedResultIsNotNil(pointer) {
+		sink("conditional named result wrapper") // pointer is not null
+	}
+}
+
+type pointerValidator interface {
+	isNotNil(*int) bool
+}
+
+type concreteValidator struct{}
+
+func (concreteValidator) isNotNil(pointer *int) bool {
+	return pointer != nil
+}
+
+func methodWrapper(validator concreteValidator, pointer *int) {
+	if validator.isNotNil(pointer) {
+		sink("method wrapper") // pointer is not null
+	}
+}
+
+func methodExpressionWrapper(validator concreteValidator, pointer *int) {
+	if concreteValidator.isNotNil(validator, pointer) {
+		sink("method expression wrapper") // pointer is not null
+	}
+}
+
+func interfaceMethodWrapper(validator pointerValidator, pointer *int) {
+	if validator.isNotNil(pointer) {
+		sink("interface method wrapper") // No pointer fact: the concrete target is unknown.
+	}
+}
+
+type receiverValidator struct{}
+
+func (validator *receiverValidator) isNotNil() bool {
+	return validator != nil
+}
+
+func receiverMethodWrapper(validator *receiverValidator) {
+	if validator.isNotNil() {
+		sink("receiver method wrapper") // validator is not null
+	}
+}
+
+func receiverMethodExpressionWrapper(validator *receiverValidator) {
+	if (*receiverValidator).isNotNil(validator) {
+		sink("receiver method expression wrapper") // validator is not null
+	}
+}
+
+type promotedReceiverValidator struct {
+	*receiverValidator
+}
+
+func promotedReceiverMethodWrapper(validator promotedReceiverValidator) {
+	if validator.isNotNil() {
+		sink("promoted receiver method wrapper") // No fact for the outer validator.
+	}
+}
+
+func implicitAddressReceiverMethodWrapper(validator receiverValidator) {
+	if validator.isNotNil() {
+		sink("implicit address receiver method wrapper") // No fact for the addressed value.
+	}
+}
+
+type booleanReceiverValidator bool
+
+func (validator booleanReceiverValidator) isTrue() bool {
+	return validator == true
+}
+
+func implicitDereferenceReceiverMethodWrapper(validator *booleanReceiverValidator) {
+	if validator.isTrue() {
+		sink("implicit dereference receiver method wrapper") // No Boolean fact for the pointer.
+	}
+}
+
+func alwaysTrue(*int) bool {
+	return true
+}
+
+func indirectWrapper(pointer *int, useValidation bool) {
+	check := alwaysTrue
+	if useValidation {
+		check = isNotNil
+	}
+	if check(pointer) {
+		sink("indirect wrapper") // No pointer fact: the possible target may not validate it.
+	}
+}
+
+func hasArgs(values ...*int) bool {
+	return values != nil
+}
+
+func variadicWrapper(pointer *int, pointers []*int) {
+	if hasArgs(pointer) {
+		sink("implicit variadic wrapper") // No pointer fact: only the synthetic slice is non-null.
+	}
+	if hasArgs(pointers...) {
+		sink("explicit variadic wrapper")
+	}
+}
+
+func ensureNotNil(pointer *int) {
+	if pointer == nil {
+		panic("nil pointer")
+	}
+}
+
+func exceptionGuard(pointer *int) {
+	ensureNotNil(pointer)
+	sink("after assertion") // pointer is not null
+}
+
+func ensureNotNilWithResult(pointer *int) *int {
+	if pointer == nil {
+		panic("nil pointer")
+	}
+	return pointer
+}
+
+func exceptionGuardWithResult(pointer *int) {
+	ensureNotNilWithResult(pointer)
+	sink("after single-result assertion") // pointer is not null
+}
+
+func ensureNotNilWithResults(pointer *int) (*int, bool) {
+	if pointer == nil {
+		panic("nil pointer")
+	}
+	return pointer, true
+}
+
+func exceptionGuardWithResults(pointer *int) {
+	ensureNotNilWithResults(pointer)
+	sink("after multi-result assertion") // pointer is not null
+}
+
+func valueSink(string, any) {}
+
+func modelBoolGuard(pointer *int) bool {
+	return pointer != nil
+}
+
+func modelZeroGuard(pointer *int) int {
+	return 0
+}
+
+func modelNotZeroGuard(pointer *int) int {
+	return 1
+}
+
+func modelNullGuard(pointer *int) *int {
+	return nil
+}
+
+func modelNotNullGuard(pointer *int) *int {
+	return pointer
+}
+
+func modelExceptionGuard(pointer *int) {}
+
+func modelGuards(pointer *int) {
+	if modelBoolGuard(pointer) {
+		valueSink("model bool", pointer)
+	}
+	if modelZeroGuard(pointer) == 0 {
+		valueSink("model zero", pointer) // model-zero barrier
+	}
+	if modelNotZeroGuard(pointer) != 0 {
+		valueSink("model not zero", pointer) // model-not-zero barrier
+	}
+	if modelNullGuard(pointer) == nil {
+		valueSink("model null", pointer) // model-null barrier
+	}
+	if modelNotNullGuard(pointer) != nil {
+		valueSink("model not null", pointer) // model-not-null barrier
+	}
+	modelExceptionGuard(pointer)
+	valueSink("model no exception", pointer) // model-no-exception barrier
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/DefaultTaintSanitizer/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/dataflow/DefaultTaintSanitizer/CONSISTENCY/DataFlowConsistency.expected
index cf59277a48b3..c1715caa6ec3 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/DefaultTaintSanitizer/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/DefaultTaintSanitizer/CONSISTENCY/DataFlowConsistency.expected
@@ -1,6 +1,6 @@
 reverseRead
-| Builtin.go:7:2:7:10 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Builtin.go:13:2:13:10 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Builtin.go:22:2:22:10 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Builtin.go:32:2:32:10 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Builtin.go:39:2:39:10 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| Builtin.go:7:2:7:10 | implicit-deref sourceReq | Origin of readStep is missing a PostUpdateNode. |
+| Builtin.go:13:2:13:10 | implicit-deref sourceReq | Origin of readStep is missing a PostUpdateNode. |
+| Builtin.go:22:2:22:10 | implicit-deref sourceReq | Origin of readStep is missing a PostUpdateNode. |
+| Builtin.go:32:2:32:10 | implicit-deref sourceReq | Origin of readStep is missing a PostUpdateNode. |
+| Builtin.go:39:2:39:10 | implicit-deref sourceReq | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected
index dac989575507..f446be1e266b 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected
@@ -4,9 +4,9 @@ invalidModelRow
 | test.go:40:8:40:15 | call to Src2 | qltest |
 | test.go:40:8:40:15 | call to Src2 | qltest-w-subtypes |
 | test.go:41:8:41:16 | call to Src2 | qltest-w-subtypes |
-| test.go:42:2:42:21 | ... = ...[0] | qltest |
-| test.go:42:2:42:21 | ... = ...[1] | qltest-w-subtypes |
-| test.go:43:2:43:22 | ... = ...[1] | qltest-w-subtypes |
+| test.go:42:2:42:21 | extract:0 ... = ... | qltest |
+| test.go:42:2:42:21 | extract:1 ... = ... | qltest-w-subtypes |
+| test.go:43:2:43:22 | extract:1 ... = ... | qltest-w-subtypes |
 | test.go:44:11:44:13 | arg [postupdate] | qltest-arg |
 | test.go:59:9:59:16 | call to Src1 | qltest |
 | test.go:102:46:102:53 | call to Src1 | qltest |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/steps.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/steps.expected
index 97a1cc49261a..b27341d3b8fb 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/steps.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/steps.expected
@@ -1,14 +1,14 @@
 invalidModelRow
 #select
 | test.go:17:23:17:25 | arg | test.go:17:10:17:26 | call to StepArgRes |
-| test.go:18:27:18:29 | arg | test.go:18:2:18:30 | ... = ...[1] |
+| test.go:18:27:18:29 | arg | test.go:18:2:18:30 | extract:1 ... = ... |
 | test.go:19:15:19:17 | arg | test.go:19:20:19:23 | arg1 [postupdate] |
 | test.go:21:16:21:18 | arg | test.go:21:2:21:2 | t [postupdate] |
 | test.go:22:10:22:10 | t | test.go:22:10:22:24 | call to StepQualRes |
 | test.go:23:2:23:2 | t | test.go:23:16:23:18 | arg [postupdate] |
 | test.go:24:32:24:34 | arg | test.go:24:10:24:35 | call to StepArgResNoQual |
 | test.go:61:25:61:27 | src | test.go:61:12:61:28 | call to StepArgRes |
-| test.go:64:29:64:31 | src | test.go:64:2:64:32 | ... := ...[1] |
+| test.go:64:29:64:31 | src | test.go:64:2:64:32 | extract:1 ... := ... |
 | test.go:68:15:68:17 | src | test.go:68:20:68:25 | taint3 [postupdate] |
 | test.go:76:21:76:23 | src | test.go:76:2:76:7 | taint4 [postupdate] |
 | test.go:79:13:79:25 | type assertion | test.go:79:12:79:40 | call to StepQualRes |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected
index 87ca46d4c131..6e8870b33803 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected
@@ -4,9 +4,9 @@ invalidModelRow
 | test.go:40:8:40:15 | call to Src2 | qltest |
 | test.go:40:8:40:15 | call to Src2 | qltest-w-subtypes |
 | test.go:41:8:41:16 | call to Src2 | qltest-w-subtypes |
-| test.go:42:2:42:21 | ... = ...[0] | qltest |
-| test.go:42:2:42:21 | ... = ...[1] | qltest-w-subtypes |
-| test.go:43:2:43:22 | ... = ...[1] | qltest-w-subtypes |
+| test.go:42:2:42:21 | extract:0 ... = ... | qltest |
+| test.go:42:2:42:21 | extract:1 ... = ... | qltest-w-subtypes |
+| test.go:43:2:43:22 | extract:1 ... = ... | qltest-w-subtypes |
 | test.go:44:11:44:13 | arg [postupdate] | qltest-arg |
 | test.go:59:9:59:16 | call to Src1 | qltest |
 | test.go:102:46:102:53 | call to Src1 | qltest |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/steps.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/steps.expected
index eb52daa42537..83861e4d9f8d 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/steps.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/steps.expected
@@ -1,14 +1,14 @@
 invalidModelRow
 #select
 | test.go:17:23:17:25 | arg | test.go:17:10:17:26 | call to StepArgRes |
-| test.go:18:27:18:29 | arg | test.go:18:2:18:30 | ... = ...[1] |
+| test.go:18:27:18:29 | arg | test.go:18:2:18:30 | extract:1 ... = ... |
 | test.go:19:15:19:17 | arg | test.go:19:20:19:23 | arg1 [postupdate] |
 | test.go:21:16:21:18 | arg | test.go:21:2:21:2 | t [postupdate] |
 | test.go:22:10:22:10 | t | test.go:22:10:22:24 | call to StepQualRes |
 | test.go:23:2:23:2 | t | test.go:23:16:23:18 | arg [postupdate] |
 | test.go:24:32:24:34 | arg | test.go:24:10:24:35 | call to StepArgResNoQual |
 | test.go:61:25:61:27 | src | test.go:61:12:61:28 | call to StepArgRes |
-| test.go:64:29:64:31 | src | test.go:64:2:64:32 | ... := ...[1] |
+| test.go:64:29:64:31 | src | test.go:64:2:64:32 | extract:1 ... := ... |
 | test.go:68:15:68:17 | src | test.go:68:20:68:25 | taint3 [postupdate] |
 | test.go:76:21:76:23 | src | test.go:76:2:76:7 | taint4 [postupdate] |
 | test.go:79:13:79:25 | type assertion | test.go:79:12:79:40 | call to StepQualRes |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalFlowStep.expected b/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalFlowStep.expected
index 0f34d6589170..5c4bd6cfcb2f 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalFlowStep.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalFlowStep.expected
@@ -1,169 +1,169 @@
 | main.go:3:12:3:12 | SSA def(x) | main.go:5:5:5:5 | x |
-| main.go:3:12:3:12 | argument corresponding to x | main.go:3:12:3:12 | SSA def(x) |
+| main.go:3:12:3:12 | x | main.go:3:12:3:12 | SSA def(x) |
 | main.go:3:19:3:20 | SSA def(fn) | main.go:10:24:10:25 | fn |
-| main.go:3:19:3:20 | argument corresponding to fn | main.go:3:19:3:20 | SSA def(fn) |
+| main.go:3:19:3:20 | fn | main.go:3:19:3:20 | SSA def(fn) |
 | main.go:5:5:5:5 | x | main.go:6:7:6:7 | x |
 | main.go:5:5:5:5 | x | main.go:8:8:8:8 | x |
-| main.go:6:3:6:3 | SSA def(y) | main.go:10:12:10:12 | y |
-| main.go:6:7:6:7 | x | main.go:6:3:6:3 | SSA def(y) |
+| main.go:6:3:6:7 | SSA def(y) | main.go:10:12:10:12 | y |
+| main.go:6:7:6:7 | x | main.go:6:3:6:7 | SSA def(y) |
 | main.go:6:7:6:7 | x | main.go:10:7:10:7 | x |
-| main.go:8:3:8:3 | SSA def(y) | main.go:10:12:10:12 | y |
-| main.go:8:7:8:8 | -... | main.go:8:3:8:3 | SSA def(y) |
+| main.go:8:3:8:8 | SSA def(y) | main.go:10:12:10:12 | y |
+| main.go:8:7:8:8 | -... | main.go:8:3:8:8 | SSA def(y) |
 | main.go:8:8:8:8 | x | main.go:10:7:10:7 | x |
-| main.go:10:2:10:2 | SSA def(z) | main.go:11:14:11:14 | z |
+| main.go:10:2:10:27 | SSA def(z) | main.go:11:14:11:14 | z |
 | main.go:10:7:10:7 | x | main.go:10:22:10:22 | x |
-| main.go:10:7:10:12 | ...<=... | main.go:10:7:10:27 | ...&&... |
-| main.go:10:7:10:27 | ...&&... | main.go:10:2:10:2 | SSA def(z) |
+| main.go:10:7:10:12 | ...<=... | main.go:10:7:10:27 | After ...&&... |
+| main.go:10:7:10:27 | After ...&&... | main.go:10:2:10:27 | SSA def(z) |
 | main.go:10:12:10:12 | y | main.go:10:17:10:17 | y |
-| main.go:10:17:10:27 | ...>=... | main.go:10:7:10:27 | ...&&... |
+| main.go:10:17:10:27 | ...>=... | main.go:10:7:10:27 | After ...&&... |
 | main.go:11:14:11:14 | z | main.go:11:9:11:15 | type conversion |
-| main.go:15:9:15:9 | 0 | main.go:15:2:15:4 | SSA def(acc) |
+| main.go:15:9:15:9 | 0 | main.go:15:2:15:9 | SSA def(acc) |
 | main.go:16:9:19:2 | SSA def(acc) | main.go:17:3:17:5 | acc |
 | main.go:17:3:17:7 | SSA def(acc) | main.go:18:10:18:12 | acc |
-| main.go:17:3:17:7 | rhs of increment statement | main.go:17:3:17:7 | SSA def(acc) |
+| main.go:17:3:17:7 | increment statement | main.go:17:3:17:7 | SSA def(acc) |
 | main.go:22:12:22:12 | SSA def(b) | main.go:23:5:23:5 | b |
-| main.go:22:12:22:12 | argument corresponding to b | main.go:22:12:22:12 | SSA def(b) |
+| main.go:22:12:22:12 | b | main.go:22:12:22:12 | SSA def(b) |
 | main.go:22:20:22:20 | SSA def(x) | main.go:24:10:24:10 | x |
 | main.go:22:20:22:20 | SSA def(x) | main.go:26:11:26:11 | x |
-| main.go:22:20:22:20 | argument corresponding to x | main.go:22:20:22:20 | SSA def(x) |
+| main.go:22:20:22:20 | x | main.go:22:20:22:20 | SSA def(x) |
 | main.go:24:10:24:10 | x | main.go:24:10:24:19 | type assertion |
-| main.go:26:2:26:2 | SSA def(n) | main.go:27:11:27:11 | n |
-| main.go:26:2:26:17 | ... := ...[0] | main.go:26:2:26:2 | SSA def(n) |
-| main.go:26:2:26:17 | ... := ...[1] | main.go:26:5:26:6 | SSA def(ok) |
-| main.go:26:5:26:6 | SSA def(ok) | main.go:27:5:27:6 | ok |
-| main.go:26:11:26:11 | x | main.go:26:2:26:17 | ... := ...[0] |
-| main.go:38:2:38:2 | SSA def(s) | main.go:39:15:39:15 | s |
-| main.go:38:7:38:20 | slice literal | main.go:38:2:38:2 | SSA def(s) |
-| main.go:38:7:38:20 | slice literal [postupdate] | main.go:38:2:38:2 | SSA def(s) |
-| main.go:39:2:39:3 | SSA def(s1) | main.go:40:18:40:19 | s1 |
-| main.go:39:8:39:25 | call to append | main.go:39:2:39:3 | SSA def(s1) |
+| main.go:26:2:26:17 | SSA def(n) | main.go:27:11:27:11 | n |
+| main.go:26:2:26:17 | SSA def(ok) | main.go:27:5:27:6 | ok |
+| main.go:26:2:26:17 | extract:0 ... := ... | main.go:26:2:26:17 | SSA def(n) |
+| main.go:26:2:26:17 | extract:1 ... := ... | main.go:26:2:26:17 | SSA def(ok) |
+| main.go:26:11:26:11 | x | main.go:26:2:26:17 | extract:0 ... := ... |
+| main.go:38:2:38:20 | SSA def(s) | main.go:39:15:39:15 | s |
+| main.go:38:7:38:20 | slice literal | main.go:38:2:38:20 | SSA def(s) |
+| main.go:38:7:38:20 | slice literal [postupdate] | main.go:38:2:38:20 | SSA def(s) |
+| main.go:39:2:39:25 | SSA def(s1) | main.go:40:18:40:19 | s1 |
+| main.go:39:8:39:25 | call to append | main.go:39:2:39:25 | SSA def(s1) |
 | main.go:39:15:39:15 | s | main.go:40:15:40:15 | s |
 | main.go:39:15:39:15 | s [postupdate] | main.go:40:15:40:15 | s |
-| main.go:40:2:40:3 | SSA def(s2) | main.go:43:9:43:10 | s2 |
-| main.go:40:8:40:23 | call to append | main.go:40:2:40:3 | SSA def(s2) |
+| main.go:40:2:40:23 | SSA def(s2) | main.go:43:9:43:10 | s2 |
+| main.go:40:8:40:23 | call to append | main.go:40:2:40:23 | SSA def(s2) |
 | main.go:40:15:40:15 | s | main.go:42:7:42:7 | s |
 | main.go:40:15:40:15 | s [postupdate] | main.go:42:7:42:7 | s |
-| main.go:41:2:41:3 | SSA def(s4) | main.go:42:10:42:11 | s4 |
-| main.go:41:8:41:21 | call to make | main.go:41:2:41:3 | SSA def(s4) |
+| main.go:41:2:41:21 | SSA def(s4) | main.go:42:10:42:11 | s4 |
+| main.go:41:8:41:21 | call to make | main.go:41:2:41:21 | SSA def(s4) |
 | main.go:46:13:46:14 | SSA def(xs) | main.go:47:20:47:21 | xs |
-| main.go:46:13:46:14 | argument corresponding to xs | main.go:46:13:46:14 | SSA def(xs) |
-| main.go:46:24:46:27 | SSA def(keys) | main.go:46:24:46:27 | implicit read of keys |
-| main.go:46:24:46:27 | SSA def(keys) | main.go:49:3:49:6 | keys |
-| main.go:46:24:46:27 | zero value for keys | main.go:46:24:46:27 | SSA def(keys) |
-| main.go:46:34:46:37 | SSA def(vals) | main.go:46:34:46:37 | implicit read of vals |
-| main.go:46:34:46:37 | SSA def(vals) | main.go:48:3:48:6 | vals |
-| main.go:46:34:46:37 | zero value for vals | main.go:46:34:46:37 | SSA def(vals) |
-| main.go:47:2:50:2 | range statement[0] | main.go:47:6:47:6 | SSA def(k) |
-| main.go:47:2:50:2 | range statement[1] | main.go:47:9:47:9 | SSA def(v) |
-| main.go:47:6:47:6 | SSA def(k) | main.go:49:11:49:11 | k |
-| main.go:47:9:47:9 | SSA def(v) | main.go:48:11:48:11 | v |
-| main.go:48:3:48:6 | SSA def(vals) | main.go:46:34:46:37 | implicit read of vals |
-| main.go:48:3:48:6 | SSA def(vals) | main.go:48:3:48:6 | vals |
-| main.go:48:3:48:11 | ... += ... | main.go:48:3:48:6 | SSA def(vals) |
-| main.go:49:3:49:6 | SSA def(keys) | main.go:46:24:46:27 | implicit read of keys |
-| main.go:49:3:49:6 | SSA def(keys) | main.go:49:3:49:6 | keys |
-| main.go:49:3:49:11 | ... += ... | main.go:49:3:49:6 | SSA def(keys) |
-| main.go:55:6:55:7 | SSA def(ch) | main.go:56:2:56:3 | ch |
-| main.go:55:6:55:7 | zero value for ch | main.go:55:6:55:7 | SSA def(ch) |
+| main.go:46:13:46:14 | xs | main.go:46:13:46:14 | SSA def(xs) |
+| main.go:46:44:52:1 | SSA def(keys) | main.go:46:44:52:1 | result-read:0 block statement |
+| main.go:46:44:52:1 | SSA def(keys) | main.go:49:3:49:6 | keys |
+| main.go:46:44:52:1 | SSA def(vals) | main.go:46:44:52:1 | result-read:1 block statement |
+| main.go:46:44:52:1 | SSA def(vals) | main.go:48:3:48:6 | vals |
+| main.go:46:44:52:1 | zero-init:0 block statement | main.go:46:44:52:1 | SSA def(keys) |
+| main.go:46:44:52:1 | zero-init:1 block statement | main.go:46:44:52:1 | SSA def(vals) |
+| main.go:47:2:50:2 | SSA def(k) | main.go:49:11:49:11 | k |
+| main.go:47:2:50:2 | SSA def(v) | main.go:48:11:48:11 | v |
+| main.go:47:2:50:2 | extract:0 range element | main.go:47:2:50:2 | SSA def(k) |
+| main.go:47:2:50:2 | extract:1 range element | main.go:47:2:50:2 | SSA def(v) |
+| main.go:48:3:48:11 | ... += ... | main.go:48:3:48:11 | SSA def(vals) |
+| main.go:48:3:48:11 | SSA def(vals) | main.go:46:44:52:1 | result-read:1 block statement |
+| main.go:48:3:48:11 | SSA def(vals) | main.go:48:3:48:6 | vals |
+| main.go:49:3:49:11 | ... += ... | main.go:49:3:49:11 | SSA def(keys) |
+| main.go:49:3:49:11 | SSA def(keys) | main.go:46:44:52:1 | result-read:0 block statement |
+| main.go:49:3:49:11 | SSA def(keys) | main.go:49:3:49:6 | keys |
+| main.go:55:6:55:17 | SSA def(ch) | main.go:56:2:56:3 | ch |
+| main.go:55:6:55:17 | zero-init:0 value declaration specifier | main.go:55:6:55:17 | SSA def(ch) |
 | main.go:56:2:56:3 | ch | main.go:57:4:57:5 | ch |
 | main.go:56:2:56:3 | ch [postupdate] | main.go:57:4:57:5 | ch |
-| main.go:61:2:61:2 | SSA def(x) | main.go:64:11:64:11 | x |
-| main.go:61:7:61:7 | 1 | main.go:61:2:61:2 | SSA def(x) |
-| main.go:62:2:62:2 | SSA def(y) | main.go:64:14:64:14 | y |
-| main.go:62:7:62:7 | 2 | main.go:62:2:62:2 | SSA def(y) |
-| main.go:63:2:63:2 | SSA def(z) | main.go:64:17:64:17 | z |
-| main.go:63:7:63:7 | 3 | main.go:63:2:63:2 | SSA def(z) |
-| main.go:64:2:64:2 | SSA def(a) | main.go:66:9:66:9 | a |
-| main.go:64:7:64:18 | call to min | main.go:64:2:64:2 | SSA def(a) |
+| main.go:61:2:61:7 | SSA def(x) | main.go:64:11:64:11 | x |
+| main.go:61:7:61:7 | 1 | main.go:61:2:61:7 | SSA def(x) |
+| main.go:62:2:62:7 | SSA def(y) | main.go:64:14:64:14 | y |
+| main.go:62:7:62:7 | 2 | main.go:62:2:62:7 | SSA def(y) |
+| main.go:63:2:63:7 | SSA def(z) | main.go:64:17:64:17 | z |
+| main.go:63:7:63:7 | 3 | main.go:63:2:63:7 | SSA def(z) |
+| main.go:64:2:64:18 | SSA def(a) | main.go:66:9:66:9 | a |
+| main.go:64:7:64:18 | call to min | main.go:64:2:64:18 | SSA def(a) |
 | main.go:64:11:64:11 | x | main.go:64:7:64:18 | call to min |
 | main.go:64:11:64:11 | x | main.go:65:11:65:11 | x |
 | main.go:64:14:64:14 | y | main.go:64:7:64:18 | call to min |
 | main.go:64:14:64:14 | y | main.go:65:14:65:14 | y |
 | main.go:64:17:64:17 | z | main.go:64:7:64:18 | call to min |
 | main.go:64:17:64:17 | z | main.go:65:17:65:17 | z |
-| main.go:65:2:65:2 | SSA def(b) | main.go:66:12:66:12 | b |
-| main.go:65:7:65:18 | call to max | main.go:65:2:65:2 | SSA def(b) |
+| main.go:65:2:65:18 | SSA def(b) | main.go:66:12:66:12 | b |
+| main.go:65:7:65:18 | call to max | main.go:65:2:65:18 | SSA def(b) |
 | main.go:65:11:65:11 | x | main.go:65:7:65:18 | call to max |
 | main.go:65:14:65:14 | y | main.go:65:7:65:18 | call to max |
 | main.go:65:17:65:17 | z | main.go:65:7:65:18 | call to max |
 | strings.go:8:12:8:12 | SSA def(s) | strings.go:9:24:9:24 | s |
-| strings.go:8:12:8:12 | argument corresponding to s | strings.go:8:12:8:12 | SSA def(s) |
-| strings.go:9:2:9:3 | SSA def(s2) | strings.go:11:20:11:21 | s2 |
-| strings.go:9:8:9:38 | call to Replace | strings.go:9:2:9:3 | SSA def(s2) |
+| strings.go:8:12:8:12 | s | strings.go:8:12:8:12 | SSA def(s) |
+| strings.go:9:2:9:38 | SSA def(s2) | strings.go:11:20:11:21 | s2 |
+| strings.go:9:8:9:38 | call to Replace | strings.go:9:2:9:38 | SSA def(s2) |
 | strings.go:9:24:9:24 | s | strings.go:10:27:10:27 | s |
-| strings.go:10:2:10:3 | SSA def(s3) | strings.go:11:24:11:25 | s3 |
-| strings.go:10:8:10:42 | call to ReplaceAll | strings.go:10:2:10:3 | SSA def(s3) |
+| strings.go:10:2:10:42 | SSA def(s3) | strings.go:11:24:11:25 | s3 |
+| strings.go:10:8:10:42 | call to ReplaceAll | strings.go:10:2:10:42 | SSA def(s3) |
 | strings.go:11:20:11:21 | s2 | strings.go:11:48:11:49 | s2 |
 | strings.go:11:24:11:25 | s3 | strings.go:11:67:11:68 | s3 |
 | url.go:8:12:8:12 | SSA def(b) | url.go:11:5:11:5 | b |
-| url.go:8:12:8:12 | argument corresponding to b | url.go:8:12:8:12 | SSA def(b) |
+| url.go:8:12:8:12 | b | url.go:8:12:8:12 | SSA def(b) |
 | url.go:8:20:8:20 | SSA def(s) | url.go:12:46:12:46 | s |
 | url.go:8:20:8:20 | SSA def(s) | url.go:14:48:14:48 | s |
-| url.go:8:20:8:20 | argument corresponding to s | url.go:8:20:8:20 | SSA def(s) |
-| url.go:12:3:12:5 | SSA def(res) | url.go:19:9:19:11 | res |
-| url.go:12:3:12:48 | ... = ...[0] | url.go:12:3:12:5 | SSA def(res) |
-| url.go:12:3:12:48 | ... = ...[1] | url.go:12:8:12:10 | SSA def(err) |
-| url.go:12:8:12:10 | SSA def(err) | url.go:16:5:16:7 | err |
-| url.go:14:3:14:5 | SSA def(res) | url.go:19:9:19:11 | res |
-| url.go:14:3:14:50 | ... = ...[0] | url.go:14:3:14:5 | SSA def(res) |
-| url.go:14:3:14:50 | ... = ...[1] | url.go:14:8:14:10 | SSA def(err) |
-| url.go:14:8:14:10 | SSA def(err) | url.go:16:5:16:7 | err |
+| url.go:8:20:8:20 | s | url.go:8:20:8:20 | SSA def(s) |
+| url.go:12:3:12:48 | SSA def(err) | url.go:16:5:16:7 | err |
+| url.go:12:3:12:48 | SSA def(res) | url.go:19:9:19:11 | res |
+| url.go:12:3:12:48 | extract:0 ... = ... | url.go:12:3:12:48 | SSA def(res) |
+| url.go:12:3:12:48 | extract:1 ... = ... | url.go:12:3:12:48 | SSA def(err) |
+| url.go:14:3:14:50 | SSA def(err) | url.go:16:5:16:7 | err |
+| url.go:14:3:14:50 | SSA def(res) | url.go:19:9:19:11 | res |
+| url.go:14:3:14:50 | extract:0 ... = ... | url.go:14:3:14:50 | SSA def(res) |
+| url.go:14:3:14:50 | extract:1 ... = ... | url.go:14:3:14:50 | SSA def(err) |
 | url.go:22:12:22:12 | SSA def(i) | url.go:24:5:24:5 | i |
-| url.go:22:12:22:12 | argument corresponding to i | url.go:22:12:22:12 | SSA def(i) |
+| url.go:22:12:22:12 | i | url.go:22:12:22:12 | SSA def(i) |
 | url.go:22:19:22:19 | SSA def(s) | url.go:23:20:23:20 | s |
-| url.go:22:19:22:19 | argument corresponding to s | url.go:22:19:22:19 | SSA def(s) |
-| url.go:23:2:23:2 | SSA def(u) | url.go:25:10:25:10 | u |
-| url.go:23:2:23:21 | ... := ...[0] | url.go:23:2:23:2 | SSA def(u) |
+| url.go:22:19:22:19 | s | url.go:22:19:22:19 | SSA def(s) |
+| url.go:23:2:23:21 | SSA def(u) | url.go:25:10:25:10 | u |
+| url.go:23:2:23:21 | extract:0 ... := ... | url.go:23:2:23:21 | SSA def(u) |
 | url.go:23:20:23:20 | s | url.go:27:29:27:29 | s |
-| url.go:27:2:27:2 | SSA def(u) | url.go:28:14:28:14 | u |
-| url.go:27:2:27:30 | ... = ...[0] | url.go:27:2:27:2 | SSA def(u) |
+| url.go:27:2:27:30 | SSA def(u) | url.go:28:14:28:14 | u |
+| url.go:27:2:27:30 | extract:0 ... = ... | url.go:27:2:27:30 | SSA def(u) |
 | url.go:28:14:28:14 | u | url.go:29:14:29:14 | u |
 | url.go:28:14:28:14 | u [postupdate] | url.go:29:14:29:14 | u |
 | url.go:29:14:29:14 | u | url.go:30:11:30:11 | u |
 | url.go:29:14:29:14 | u [postupdate] | url.go:30:11:30:11 | u |
-| url.go:30:2:30:3 | SSA def(bs) | url.go:31:14:31:15 | bs |
-| url.go:30:2:30:27 | ... := ...[0] | url.go:30:2:30:3 | SSA def(bs) |
+| url.go:30:2:30:27 | SSA def(bs) | url.go:31:14:31:15 | bs |
+| url.go:30:2:30:27 | extract:0 ... := ... | url.go:30:2:30:27 | SSA def(bs) |
 | url.go:30:11:30:11 | u | url.go:32:9:32:9 | u |
 | url.go:30:11:30:11 | u [postupdate] | url.go:32:9:32:9 | u |
-| url.go:32:2:32:2 | SSA def(u) | url.go:33:14:33:14 | u |
-| url.go:32:2:32:23 | ... = ...[0] | url.go:32:2:32:2 | SSA def(u) |
+| url.go:32:2:32:23 | SSA def(u) | url.go:33:14:33:14 | u |
+| url.go:32:2:32:23 | extract:0 ... = ... | url.go:32:2:32:23 | SSA def(u) |
 | url.go:33:14:33:14 | u | url.go:34:14:34:14 | u |
 | url.go:33:14:33:14 | u [postupdate] | url.go:34:14:34:14 | u |
 | url.go:34:14:34:14 | u | url.go:35:14:35:14 | u |
 | url.go:34:14:34:14 | u [postupdate] | url.go:35:14:35:14 | u |
 | url.go:35:14:35:14 | u | url.go:36:6:36:6 | u |
 | url.go:35:14:35:14 | u [postupdate] | url.go:36:6:36:6 | u |
-| url.go:36:2:36:2 | SSA def(u) | url.go:37:9:37:9 | u |
+| url.go:36:2:36:26 | SSA def(u) | url.go:37:9:37:9 | u |
 | url.go:36:6:36:6 | u | url.go:36:25:36:25 | u |
 | url.go:36:6:36:6 | u [postupdate] | url.go:36:25:36:25 | u |
-| url.go:36:6:36:26 | call to ResolveReference | url.go:36:2:36:2 | SSA def(u) |
-| url.go:42:2:42:3 | SSA def(ui) | url.go:43:11:43:12 | ui |
-| url.go:42:7:42:38 | call to UserPassword | url.go:42:2:42:3 | SSA def(ui) |
-| url.go:43:2:43:3 | SSA def(pw) | url.go:44:14:44:15 | pw |
-| url.go:43:2:43:23 | ... := ...[0] | url.go:43:2:43:3 | SSA def(pw) |
+| url.go:36:6:36:26 | call to ResolveReference | url.go:36:2:36:26 | SSA def(u) |
+| url.go:42:2:42:38 | SSA def(ui) | url.go:43:11:43:12 | ui |
+| url.go:42:7:42:38 | call to UserPassword | url.go:42:2:42:38 | SSA def(ui) |
+| url.go:43:2:43:23 | SSA def(pw) | url.go:44:14:44:15 | pw |
+| url.go:43:2:43:23 | extract:0 ... := ... | url.go:43:2:43:23 | SSA def(pw) |
 | url.go:43:11:43:12 | ui | url.go:45:14:45:15 | ui |
 | url.go:43:11:43:12 | ui [postupdate] | url.go:45:14:45:15 | ui |
 | url.go:45:14:45:15 | ui | url.go:46:9:46:10 | ui |
 | url.go:45:14:45:15 | ui [postupdate] | url.go:46:9:46:10 | ui |
 | url.go:49:12:49:12 | SSA def(q) | url.go:50:25:50:25 | q |
-| url.go:49:12:49:12 | argument corresponding to q | url.go:49:12:49:12 | SSA def(q) |
-| url.go:50:2:50:2 | SSA def(v) | url.go:51:14:51:14 | v |
-| url.go:50:2:50:26 | ... := ...[0] | url.go:50:2:50:2 | SSA def(v) |
+| url.go:49:12:49:12 | q | url.go:49:12:49:12 | SSA def(q) |
+| url.go:50:2:50:26 | SSA def(v) | url.go:51:14:51:14 | v |
+| url.go:50:2:50:26 | extract:0 ... := ... | url.go:50:2:50:26 | SSA def(v) |
 | url.go:51:14:51:14 | v | url.go:52:14:52:14 | v |
 | url.go:51:14:51:14 | v [postupdate] | url.go:52:14:52:14 | v |
 | url.go:52:14:52:14 | v | url.go:53:9:53:9 | v |
 | url.go:52:14:52:14 | v [postupdate] | url.go:53:9:53:9 | v |
 | url.go:56:12:56:12 | SSA def(q) | url.go:57:29:57:29 | q |
-| url.go:56:12:56:12 | argument corresponding to q | url.go:56:12:56:12 | SSA def(q) |
-| url.go:57:2:57:8 | SSA def(joined1) | url.go:58:38:58:44 | joined1 |
-| url.go:57:2:57:39 | ... := ...[0] | url.go:57:2:57:8 | SSA def(joined1) |
-| url.go:58:2:58:8 | SSA def(joined2) | url.go:59:24:59:30 | joined2 |
-| url.go:58:2:58:45 | ... := ...[0] | url.go:58:2:58:8 | SSA def(joined2) |
-| url.go:59:2:59:6 | SSA def(asUrl) | url.go:60:15:60:19 | asUrl |
-| url.go:59:2:59:31 | ... := ...[0] | url.go:59:2:59:6 | SSA def(asUrl) |
-| url.go:60:2:60:10 | SSA def(joinedUrl) | url.go:61:9:61:17 | joinedUrl |
-| url.go:60:15:60:37 | call to JoinPath | url.go:60:2:60:10 | SSA def(joinedUrl) |
+| url.go:56:12:56:12 | q | url.go:56:12:56:12 | SSA def(q) |
+| url.go:57:2:57:39 | SSA def(joined1) | url.go:58:38:58:44 | joined1 |
+| url.go:57:2:57:39 | extract:0 ... := ... | url.go:57:2:57:39 | SSA def(joined1) |
+| url.go:58:2:58:45 | SSA def(joined2) | url.go:59:24:59:30 | joined2 |
+| url.go:58:2:58:45 | extract:0 ... := ... | url.go:58:2:58:45 | SSA def(joined2) |
+| url.go:59:2:59:31 | SSA def(asUrl) | url.go:60:15:60:19 | asUrl |
+| url.go:59:2:59:31 | extract:0 ... := ... | url.go:59:2:59:31 | SSA def(asUrl) |
+| url.go:60:2:60:37 | SSA def(joinedUrl) | url.go:61:9:61:17 | joinedUrl |
+| url.go:60:15:60:37 | call to JoinPath | url.go:60:2:60:37 | SSA def(joinedUrl) |
 | url.go:64:13:64:13 | SSA def(q) | url.go:66:27:66:27 | q |
-| url.go:64:13:64:13 | argument corresponding to q | url.go:64:13:64:13 | SSA def(q) |
-| url.go:65:2:65:9 | SSA def(cleanUrl) | url.go:66:9:66:16 | cleanUrl |
-| url.go:65:2:65:48 | ... := ...[0] | url.go:65:2:65:9 | SSA def(cleanUrl) |
+| url.go:64:13:64:13 | q | url.go:64:13:64:13 | SSA def(q) |
+| url.go:65:2:65:48 | SSA def(cleanUrl) | url.go:66:9:66:16 | cleanUrl |
+| url.go:65:2:65:48 | extract:0 ... := ... | url.go:65:2:65:48 | SSA def(cleanUrl) |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalTaintStep.expected b/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalTaintStep.expected
index 667845624969..4ace99a0ab2c 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalTaintStep.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalTaintStep.expected
@@ -1,5 +1,5 @@
-| main.go:26:11:26:17 | type assertion | main.go:26:2:26:17 | ... := ...[0] |
-| main.go:26:11:26:17 | type assertion | main.go:26:2:26:17 | ... := ...[1] |
+| main.go:26:11:26:17 | type assertion | main.go:26:2:26:17 | extract:0 ... := ... |
+| main.go:26:11:26:17 | type assertion | main.go:26:2:26:17 | extract:1 ... := ... |
 | main.go:38:13:38:13 | 1 | main.go:38:7:38:20 | slice literal |
 | main.go:38:16:38:16 | 2 | main.go:38:7:38:20 | slice literal |
 | main.go:38:19:38:19 | 3 | main.go:38:7:38:20 | slice literal |
@@ -8,9 +8,9 @@
 | main.go:40:15:40:15 | s | main.go:40:8:40:23 | call to append |
 | main.go:40:18:40:19 | s1 | main.go:40:8:40:23 | call to append |
 | main.go:42:10:42:11 | s4 | main.go:42:7:42:7 | s [postupdate] |
-| main.go:47:20:47:21 | next key-value pair in range | main.go:47:2:50:2 | range statement[0] |
-| main.go:47:20:47:21 | next key-value pair in range | main.go:47:2:50:2 | range statement[1] |
-| main.go:47:20:47:21 | xs | main.go:47:2:50:2 | range statement[1] |
+| main.go:47:2:50:2 | next range element | main.go:47:2:50:2 | extract:0 range element |
+| main.go:47:2:50:2 | next range element | main.go:47:2:50:2 | extract:1 range element |
+| main.go:47:20:47:21 | xs | main.go:47:2:50:2 | extract:1 range element |
 | strings.go:9:24:9:24 | s | strings.go:9:8:9:38 | call to Replace |
 | strings.go:9:32:9:34 | "_" | strings.go:9:8:9:38 | call to Replace |
 | strings.go:10:27:10:27 | s | strings.go:10:8:10:42 | call to ReplaceAll |
@@ -24,29 +24,29 @@
 | strings.go:11:48:11:49 | s2 | strings.go:11:30:11:50 | call to Sprintf |
 | strings.go:11:54:11:69 | call to Sprintln | strings.go:11:9:11:69 | ...+... |
 | strings.go:11:67:11:68 | s3 | strings.go:11:54:11:69 | call to Sprintln |
-| url.go:12:14:12:48 | call to PathUnescape | url.go:12:3:12:48 | ... = ...[0] |
-| url.go:12:14:12:48 | call to PathUnescape | url.go:12:3:12:48 | ... = ...[1] |
-| url.go:12:31:12:47 | call to PathEscape | url.go:12:3:12:48 | ... = ...[0] |
+| url.go:12:14:12:48 | call to PathUnescape | url.go:12:3:12:48 | extract:0 ... = ... |
+| url.go:12:14:12:48 | call to PathUnescape | url.go:12:3:12:48 | extract:1 ... = ... |
+| url.go:12:31:12:47 | call to PathEscape | url.go:12:3:12:48 | extract:0 ... = ... |
 | url.go:12:46:12:46 | s | url.go:12:31:12:47 | call to PathEscape |
-| url.go:14:14:14:50 | call to QueryUnescape | url.go:14:3:14:50 | ... = ...[0] |
-| url.go:14:14:14:50 | call to QueryUnescape | url.go:14:3:14:50 | ... = ...[1] |
-| url.go:14:32:14:49 | call to QueryEscape | url.go:14:3:14:50 | ... = ...[0] |
+| url.go:14:14:14:50 | call to QueryUnescape | url.go:14:3:14:50 | extract:0 ... = ... |
+| url.go:14:14:14:50 | call to QueryUnescape | url.go:14:3:14:50 | extract:1 ... = ... |
+| url.go:14:32:14:49 | call to QueryEscape | url.go:14:3:14:50 | extract:0 ... = ... |
 | url.go:14:48:14:48 | s | url.go:14:32:14:49 | call to QueryEscape |
-| url.go:23:10:23:21 | call to Parse | url.go:23:2:23:21 | ... := ...[0] |
-| url.go:23:10:23:21 | call to Parse | url.go:23:2:23:21 | ... := ...[1] |
-| url.go:23:20:23:20 | s | url.go:23:2:23:21 | ... := ...[0] |
-| url.go:27:9:27:30 | call to ParseRequestURI | url.go:27:2:27:30 | ... = ...[0] |
-| url.go:27:9:27:30 | call to ParseRequestURI | url.go:27:2:27:30 | ... = ...[1] |
-| url.go:27:29:27:29 | s | url.go:27:2:27:30 | ... = ...[0] |
+| url.go:23:10:23:21 | call to Parse | url.go:23:2:23:21 | extract:0 ... := ... |
+| url.go:23:10:23:21 | call to Parse | url.go:23:2:23:21 | extract:1 ... := ... |
+| url.go:23:20:23:20 | s | url.go:23:2:23:21 | extract:0 ... := ... |
+| url.go:27:9:27:30 | call to ParseRequestURI | url.go:27:2:27:30 | extract:0 ... = ... |
+| url.go:27:9:27:30 | call to ParseRequestURI | url.go:27:2:27:30 | extract:1 ... = ... |
+| url.go:27:29:27:29 | s | url.go:27:2:27:30 | extract:0 ... = ... |
 | url.go:28:14:28:14 | u | url.go:28:14:28:28 | call to EscapedPath |
 | url.go:29:14:29:14 | u | url.go:29:14:29:25 | call to Hostname |
-| url.go:30:11:30:11 | u | url.go:30:2:30:27 | ... := ...[0] |
-| url.go:30:11:30:27 | call to MarshalBinary | url.go:30:2:30:27 | ... := ...[0] |
-| url.go:30:11:30:27 | call to MarshalBinary | url.go:30:2:30:27 | ... := ...[1] |
-| url.go:32:9:32:9 | u | url.go:32:2:32:23 | ... = ...[0] |
-| url.go:32:9:32:23 | call to Parse | url.go:32:2:32:23 | ... = ...[0] |
-| url.go:32:9:32:23 | call to Parse | url.go:32:2:32:23 | ... = ...[1] |
-| url.go:32:17:32:22 | "/foo" | url.go:32:2:32:23 | ... = ...[0] |
+| url.go:30:11:30:11 | u | url.go:30:2:30:27 | extract:0 ... := ... |
+| url.go:30:11:30:27 | call to MarshalBinary | url.go:30:2:30:27 | extract:0 ... := ... |
+| url.go:30:11:30:27 | call to MarshalBinary | url.go:30:2:30:27 | extract:1 ... := ... |
+| url.go:32:9:32:9 | u | url.go:32:2:32:23 | extract:0 ... = ... |
+| url.go:32:9:32:23 | call to Parse | url.go:32:2:32:23 | extract:0 ... = ... |
+| url.go:32:9:32:23 | call to Parse | url.go:32:2:32:23 | extract:1 ... = ... |
+| url.go:32:17:32:22 | "/foo" | url.go:32:2:32:23 | extract:0 ... = ... |
 | url.go:33:14:33:14 | u | url.go:33:14:33:21 | call to Port |
 | url.go:34:14:34:14 | u | url.go:34:14:34:22 | call to Query |
 | url.go:35:14:35:14 | u | url.go:35:14:35:27 | call to RequestURI |
@@ -55,30 +55,30 @@
 | url.go:41:17:41:20 | "me" | url.go:41:8:41:21 | call to User |
 | url.go:42:24:42:27 | "me" | url.go:42:7:42:38 | call to UserPassword |
 | url.go:42:30:42:37 | "secret" | url.go:42:7:42:38 | call to UserPassword |
-| url.go:43:11:43:12 | ui | url.go:43:2:43:23 | ... := ...[0] |
-| url.go:43:11:43:23 | call to Password | url.go:43:2:43:23 | ... := ...[0] |
-| url.go:43:11:43:23 | call to Password | url.go:43:2:43:23 | ... := ...[1] |
+| url.go:43:11:43:12 | ui | url.go:43:2:43:23 | extract:0 ... := ... |
+| url.go:43:11:43:23 | call to Password | url.go:43:2:43:23 | extract:0 ... := ... |
+| url.go:43:11:43:23 | call to Password | url.go:43:2:43:23 | extract:1 ... := ... |
 | url.go:45:14:45:15 | ui | url.go:45:14:45:26 | call to Username |
-| url.go:50:10:50:26 | call to ParseQuery | url.go:50:2:50:26 | ... := ...[0] |
-| url.go:50:10:50:26 | call to ParseQuery | url.go:50:2:50:26 | ... := ...[1] |
-| url.go:50:25:50:25 | q | url.go:50:2:50:26 | ... := ...[0] |
+| url.go:50:10:50:26 | call to ParseQuery | url.go:50:2:50:26 | extract:0 ... := ... |
+| url.go:50:10:50:26 | call to ParseQuery | url.go:50:2:50:26 | extract:1 ... := ... |
+| url.go:50:25:50:25 | q | url.go:50:2:50:26 | extract:0 ... := ... |
 | url.go:51:14:51:14 | v | url.go:51:14:51:23 | call to Encode |
 | url.go:52:14:52:14 | v | url.go:52:14:52:26 | call to Get |
-| url.go:57:16:57:39 | call to JoinPath | url.go:57:2:57:39 | ... := ...[0] |
-| url.go:57:16:57:39 | call to JoinPath | url.go:57:2:57:39 | ... := ...[1] |
-| url.go:57:29:57:29 | q | url.go:57:2:57:39 | ... := ...[0] |
-| url.go:57:32:57:38 | "clean" | url.go:57:2:57:39 | ... := ...[0] |
-| url.go:58:16:58:45 | call to JoinPath | url.go:58:2:58:45 | ... := ...[0] |
-| url.go:58:16:58:45 | call to JoinPath | url.go:58:2:58:45 | ... := ...[1] |
-| url.go:58:29:58:35 | "clean" | url.go:58:2:58:45 | ... := ...[0] |
-| url.go:58:38:58:44 | joined1 | url.go:58:2:58:45 | ... := ...[0] |
-| url.go:59:14:59:31 | call to Parse | url.go:59:2:59:31 | ... := ...[0] |
-| url.go:59:14:59:31 | call to Parse | url.go:59:2:59:31 | ... := ...[1] |
-| url.go:59:24:59:30 | joined2 | url.go:59:2:59:31 | ... := ...[0] |
+| url.go:57:16:57:39 | call to JoinPath | url.go:57:2:57:39 | extract:0 ... := ... |
+| url.go:57:16:57:39 | call to JoinPath | url.go:57:2:57:39 | extract:1 ... := ... |
+| url.go:57:29:57:29 | q | url.go:57:2:57:39 | extract:0 ... := ... |
+| url.go:57:32:57:38 | "clean" | url.go:57:2:57:39 | extract:0 ... := ... |
+| url.go:58:16:58:45 | call to JoinPath | url.go:58:2:58:45 | extract:0 ... := ... |
+| url.go:58:16:58:45 | call to JoinPath | url.go:58:2:58:45 | extract:1 ... := ... |
+| url.go:58:29:58:35 | "clean" | url.go:58:2:58:45 | extract:0 ... := ... |
+| url.go:58:38:58:44 | joined1 | url.go:58:2:58:45 | extract:0 ... := ... |
+| url.go:59:14:59:31 | call to Parse | url.go:59:2:59:31 | extract:0 ... := ... |
+| url.go:59:14:59:31 | call to Parse | url.go:59:2:59:31 | extract:1 ... := ... |
+| url.go:59:24:59:30 | joined2 | url.go:59:2:59:31 | extract:0 ... := ... |
 | url.go:60:15:60:19 | asUrl | url.go:60:15:60:37 | call to JoinPath |
 | url.go:60:30:60:36 | "clean" | url.go:60:15:60:37 | call to JoinPath |
-| url.go:65:17:65:48 | call to Parse | url.go:65:2:65:48 | ... := ...[0] |
-| url.go:65:17:65:48 | call to Parse | url.go:65:2:65:48 | ... := ...[1] |
-| url.go:65:27:65:47 | "http://harmless.org" | url.go:65:2:65:48 | ... := ...[0] |
+| url.go:65:17:65:48 | call to Parse | url.go:65:2:65:48 | extract:0 ... := ... |
+| url.go:65:17:65:48 | call to Parse | url.go:65:2:65:48 | extract:1 ... := ... |
+| url.go:65:27:65:47 | "http://harmless.org" | url.go:65:2:65:48 | extract:0 ... := ... |
 | url.go:66:9:66:16 | cleanUrl | url.go:66:9:66:28 | call to JoinPath |
 | url.go:66:27:66:27 | q | url.go:66:9:66:28 | call to JoinPath |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/CONSISTENCY/CfgConsistency.expected b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionInput_getEntryNode.expected b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionInput_getEntryNode.expected
index a64298b64442..c66a1334a178 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionInput_getEntryNode.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionInput_getEntryNode.expected
@@ -25,15 +25,15 @@
 | result | main.go:53:2:53:22 | call to op2 | main.go:53:2:53:22 | call to op2 |
 | result | main.go:53:14:53:21 | call to bump | main.go:53:14:53:21 | call to bump |
 | result | tst2.go:10:9:10:26 | call to NewEncoder | tst2.go:10:9:10:26 | call to NewEncoder |
-| result | tst2.go:10:9:10:39 | call to Encode | tst2.go:10:2:10:4 | SSA def(err) |
-| result | tst.go:9:17:9:33 | call to new | tst.go:9:2:9:12 | SSA def(bytesBuffer) |
+| result | tst2.go:10:9:10:39 | call to Encode | tst2.go:10:2:10:39 | SSA def(err) |
+| result | tst.go:9:17:9:33 | call to new | tst.go:9:2:9:33 | SSA def(bytesBuffer) |
 | result 0 | main.go:51:2:51:14 | call to op | main.go:51:2:51:14 | call to op |
 | result 0 | main.go:53:2:53:22 | call to op2 | main.go:53:2:53:22 | call to op2 |
 | result 0 | main.go:53:14:53:21 | call to bump | main.go:53:14:53:21 | call to bump |
-| result 0 | main.go:54:10:54:15 | call to test | main.go:54:2:54:2 | SSA def(x) |
-| result 0 | main.go:56:9:56:15 | call to test2 | main.go:56:2:56:2 | SSA def(x) |
+| result 0 | main.go:54:10:54:15 | call to test | main.go:54:2:54:15 | SSA def(x) |
+| result 0 | main.go:56:9:56:15 | call to test2 | main.go:56:2:56:15 | SSA def(x) |
 | result 0 | tst2.go:10:9:10:26 | call to NewEncoder | tst2.go:10:9:10:26 | call to NewEncoder |
-| result 0 | tst2.go:10:9:10:39 | call to Encode | tst2.go:10:2:10:4 | SSA def(err) |
-| result 0 | tst.go:9:17:9:33 | call to new | tst.go:9:2:9:12 | SSA def(bytesBuffer) |
-| result 1 | main.go:54:10:54:15 | call to test | main.go:54:5:54:5 | SSA def(y) |
-| result 1 | main.go:56:9:56:15 | call to test2 | main.go:56:5:56:5 | SSA def(y) |
+| result 0 | tst2.go:10:9:10:39 | call to Encode | tst2.go:10:2:10:39 | SSA def(err) |
+| result 0 | tst.go:9:17:9:33 | call to new | tst.go:9:2:9:33 | SSA def(bytesBuffer) |
+| result 1 | main.go:54:10:54:15 | call to test | main.go:54:2:54:15 | SSA def(y) |
+| result 1 | main.go:56:9:56:15 | call to test2 | main.go:56:2:56:15 | SSA def(y) |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionInput_getExitNode.expected b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionInput_getExitNode.expected
index b101ce537fca..c62d1a1fc231 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionInput_getExitNode.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionInput_getExitNode.expected
@@ -4,7 +4,7 @@
 | parameter 0 | reset.go:8:1:16:1 | function declaration | reset.go:8:27:8:27 | SSA def(r) |
 | parameter 0 | tst2.go:8:1:12:1 | function declaration | tst2.go:8:12:8:15 | SSA def(data) |
 | parameter 0 | tst.go:8:1:11:1 | function declaration | tst.go:8:12:8:17 | SSA def(reader) |
-| parameter 0 | tst.go:13:1:13:25 | function declaration | tst.go:13:12:13:13 | initialization of xs |
+| parameter 0 | tst.go:13:1:13:25 | function declaration | tst.go:13:12:13:13 | xs |
 | parameter 0 | tst.go:15:1:19:1 | function declaration | tst.go:15:12:15:12 | SSA def(x) |
 | parameter 1 | main.go:5:1:11:1 | function declaration | main.go:5:20:5:20 | SSA def(x) |
 | parameter 1 | main.go:13:1:20:1 | function declaration | main.go:13:21:13:21 | SSA def(x) |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_getEntryNode.expected b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_getEntryNode.expected
index 263a9298413a..ebe01f709c94 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_getEntryNode.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_getEntryNode.expected
@@ -1,22 +1,22 @@
 | result | main.go:5:1:11:1 | function declaration | main.go:7:10:7:14 | ...+... |
 | result | main.go:5:1:11:1 | function declaration | main.go:9:10:9:14 | ...-... |
-| result | main.go:13:1:20:1 | function declaration | main.go:13:36:13:38 | zero value for res |
+| result | main.go:13:1:20:1 | function declaration | main.go:13:45:20:1 | zero-init:0 block statement |
 | result | main.go:13:1:20:1 | function declaration | main.go:15:9:15:13 | ...+... |
 | result | main.go:13:1:20:1 | function declaration | main.go:17:10:17:14 | ...-... |
 | result | main.go:26:1:29:1 | function declaration | main.go:28:9:28:15 | selection of count |
 | result | reset.go:8:1:16:1 | function declaration | reset.go:15:9:15:12 | sink |
 | result 0 | main.go:31:1:33:1 | function declaration | main.go:32:9:32:10 | 23 |
-| result 0 | main.go:35:1:38:1 | function declaration | main.go:35:15:35:15 | zero value for x |
+| result 0 | main.go:35:1:38:1 | function declaration | main.go:35:29:38:1 | zero-init:0 block statement |
 | result 0 | main.go:35:1:38:1 | function declaration | main.go:36:13:36:14 | 23 |
-| result 0 | main.go:40:1:48:1 | function declaration | main.go:40:21:40:23 | zero value for int |
+| result 0 | main.go:40:1:48:1 | function declaration | main.go:40:33:48:1 | zero-init:0 block statement |
 | result 0 | main.go:40:1:48:1 | function declaration | main.go:45:10:45:10 | 0 |
 | result 0 | main.go:40:1:48:1 | function declaration | main.go:47:9:47:9 | 0 |
 | result 0 | tst2.go:8:1:12:1 | function declaration | tst2.go:11:9:11:9 | w |
 | result 1 | main.go:31:1:33:1 | function declaration | main.go:32:13:32:14 | 42 |
-| result 1 | main.go:35:1:38:1 | function declaration | main.go:35:22:35:22 | zero value for y |
+| result 1 | main.go:35:1:38:1 | function declaration | main.go:35:29:38:1 | zero-init:1 block statement |
 | result 1 | main.go:35:1:38:1 | function declaration | main.go:36:9:36:10 | 42 |
-| result 1 | main.go:40:1:48:1 | function declaration | main.go:40:26:40:26 | zero value for y |
-| result 1 | main.go:40:1:48:1 | function declaration | main.go:42:3:42:5 | rhs of increment statement |
+| result 1 | main.go:40:1:48:1 | function declaration | main.go:40:33:48:1 | zero-init:1 block statement |
+| result 1 | main.go:40:1:48:1 | function declaration | main.go:42:3:42:5 | increment statement |
 | result 1 | main.go:40:1:48:1 | function declaration | main.go:45:13:45:13 | 1 |
 | result 1 | main.go:40:1:48:1 | function declaration | main.go:47:12:47:12 | 4 |
 | result 1 | tst2.go:8:1:12:1 | function declaration | tst2.go:11:12:11:14 | err |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_getExitNode.expected b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_getExitNode.expected
index eebf68d92d4a..9d2fdaf117e0 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_getExitNode.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_getExitNode.expected
@@ -17,10 +17,10 @@
 | result 0 | main.go:51:2:51:14 | call to op | main.go:51:2:51:14 | call to op |
 | result 0 | main.go:53:2:53:22 | call to op2 | main.go:53:2:53:22 | call to op2 |
 | result 0 | main.go:53:14:53:21 | call to bump | main.go:53:14:53:21 | call to bump |
-| result 0 | main.go:54:10:54:15 | call to test | main.go:54:2:54:15 | ... := ...[0] |
-| result 0 | main.go:56:9:56:15 | call to test2 | main.go:56:2:56:15 | ... = ...[0] |
+| result 0 | main.go:54:10:54:15 | call to test | main.go:54:2:54:15 | extract:0 ... := ... |
+| result 0 | main.go:56:9:56:15 | call to test2 | main.go:56:2:56:15 | extract:0 ... = ... |
 | result 0 | tst2.go:10:9:10:26 | call to NewEncoder | tst2.go:10:9:10:26 | call to NewEncoder |
 | result 0 | tst2.go:10:9:10:39 | call to Encode | tst2.go:10:9:10:39 | call to Encode |
 | result 0 | tst.go:9:17:9:33 | call to new | tst.go:9:17:9:33 | call to new |
-| result 1 | main.go:54:10:54:15 | call to test | main.go:54:2:54:15 | ... := ...[1] |
-| result 1 | main.go:56:9:56:15 | call to test2 | main.go:56:2:56:15 | ... = ...[1] |
+| result 1 | main.go:54:10:54:15 | call to test | main.go:54:2:54:15 | extract:1 ... := ... |
+| result 1 | main.go:56:9:56:15 | call to test2 | main.go:56:2:56:15 | extract:1 ... = ... |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_isResult_int.expected b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_isResult_int.expected
index 61f029031c67..071afdc13858 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_isResult_int.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_isResult_int.expected
@@ -4,10 +4,10 @@
 | main.go:53:2:53:22 | call to op2 | main.go:53:2:53:22 | call to op2 | 0 | result 0 |
 | main.go:53:14:53:21 | call to bump | main.go:53:14:53:21 | call to bump | 0 | result |
 | main.go:53:14:53:21 | call to bump | main.go:53:14:53:21 | call to bump | 0 | result 0 |
-| main.go:54:10:54:15 | call to test | main.go:54:2:54:15 | ... := ...[0] | 0 | result 0 |
-| main.go:54:10:54:15 | call to test | main.go:54:2:54:15 | ... := ...[1] | 1 | result 1 |
-| main.go:56:9:56:15 | call to test2 | main.go:56:2:56:15 | ... = ...[0] | 0 | result 0 |
-| main.go:56:9:56:15 | call to test2 | main.go:56:2:56:15 | ... = ...[1] | 1 | result 1 |
+| main.go:54:10:54:15 | call to test | main.go:54:2:54:15 | extract:0 ... := ... | 0 | result 0 |
+| main.go:54:10:54:15 | call to test | main.go:54:2:54:15 | extract:1 ... := ... | 1 | result 1 |
+| main.go:56:9:56:15 | call to test2 | main.go:56:2:56:15 | extract:0 ... = ... | 0 | result 0 |
+| main.go:56:9:56:15 | call to test2 | main.go:56:2:56:15 | extract:1 ... = ... | 1 | result 1 |
 | tst2.go:10:9:10:26 | call to NewEncoder | tst2.go:10:9:10:26 | call to NewEncoder | 0 | result |
 | tst2.go:10:9:10:26 | call to NewEncoder | tst2.go:10:9:10:26 | call to NewEncoder | 0 | result 0 |
 | tst2.go:10:9:10:39 | call to Encode | tst2.go:10:9:10:39 | call to Encode | 0 | result |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/GlobalValueNumbering/CONSISTENCY/CfgConsistency.expected b/go/ql/test/library-tests/semmle/go/dataflow/GlobalValueNumbering/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/GlobalValueNumbering/GlobalValueNumber.expected b/go/ql/test/library-tests/semmle/go/dataflow/GlobalValueNumbering/GlobalValueNumber.expected
index 287a7f735f24..b8d5333c8411 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/GlobalValueNumbering/GlobalValueNumber.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/GlobalValueNumbering/GlobalValueNumber.expected
@@ -1,39 +1,38 @@
-| main.go:6:2:6:5 | 1 | main.go:14:7:14:7 | 1 |
-| main.go:10:2:10:2 | SSA def(x) | main.go:10:7:10:7 | 0 |
+| main.go:10:2:10:7 | SSA def(x) | main.go:10:7:10:7 | 0 |
 | main.go:10:7:10:7 | 0 | main.go:10:7:10:7 | 0 |
-| main.go:11:6:11:6 | SSA def(y) | main.go:10:7:10:7 | 0 |
-| main.go:11:6:11:6 | zero value for y | main.go:10:7:10:7 | 0 |
+| main.go:11:6:11:10 | SSA def(y) | main.go:10:7:10:7 | 0 |
+| main.go:11:6:11:10 | zero-init:0 value declaration specifier | main.go:10:7:10:7 | 0 |
 | main.go:12:2:12:18 | call to Println | main.go:12:2:12:18 | call to Println |
 | main.go:12:14:12:14 | x | main.go:10:7:10:7 | 0 |
 | main.go:12:17:12:17 | y | main.go:10:7:10:7 | 0 |
-| main.go:14:2:14:2 | SSA def(z) | main.go:14:7:14:7 | 1 |
+| main.go:14:2:14:7 | SSA def(z) | main.go:14:7:14:7 | 1 |
 | main.go:14:7:14:7 | 1 | main.go:14:7:14:7 | 1 |
 | main.go:15:2:15:9 | call to bump | main.go:15:2:15:9 | call to bump |
 | main.go:16:2:16:21 | call to Println | main.go:16:2:16:21 | call to Println |
 | main.go:16:14:16:14 | x | main.go:10:7:10:7 | 0 |
 | main.go:16:17:16:17 | y | main.go:10:7:10:7 | 0 |
-| main.go:18:2:18:3 | SSA def(ss) | main.go:18:8:18:24 | call to make |
+| main.go:18:2:18:24 | SSA def(ss) | main.go:18:8:18:24 | call to make |
 | main.go:18:8:18:24 | call to make | main.go:18:8:18:24 | call to make |
 | main.go:18:23:18:23 | 3 | main.go:18:23:18:23 | 3 |
 | main.go:19:5:19:5 | 2 | main.go:19:5:19:5 | 2 |
 | main.go:19:10:19:24 | "Hello, world!" | main.go:19:10:19:24 | "Hello, world!" |
 | main.go:20:2:20:16 | call to Println | main.go:20:2:20:16 | call to Println |
-| main.go:23:14:23:16 | implicit read of res | main.go:24:8:24:8 | 4 |
-| main.go:23:14:23:16 | zero value for res | main.go:10:7:10:7 | 0 |
-| main.go:24:2:24:4 | SSA def(res) | main.go:24:8:24:8 | 4 |
+| main.go:23:23:26:1 | result-read:0 block statement | main.go:24:8:24:8 | 4 |
+| main.go:23:23:26:1 | zero-init:0 block statement | main.go:10:7:10:7 | 0 |
+| main.go:24:2:24:8 | SSA def(res) | main.go:24:8:24:8 | 4 |
 | main.go:24:8:24:8 | 4 | main.go:24:8:24:8 | 4 |
-| main.go:28:15:28:17 | implicit read of res | main.go:30:9:30:9 | 6 |
-| main.go:28:15:28:17 | zero value for res | main.go:10:7:10:7 | 0 |
+| main.go:28:24:31:1 | result-read:0 block statement | main.go:30:9:30:9 | 6 |
+| main.go:28:24:31:1 | zero-init:0 block statement | main.go:10:7:10:7 | 0 |
 | main.go:29:8:29:8 | 5 | main.go:29:8:29:8 | 5 |
+| main.go:30:2:30:9 | SSA def(res) | main.go:30:9:30:9 | 6 |
 | main.go:30:9:30:9 | 6 | main.go:30:9:30:9 | 6 |
-| main.go:30:9:30:9 | SSA def(res) | main.go:30:9:30:9 | 6 |
-| main.go:33:15:33:17 | zero value for res | main.go:10:7:10:7 | 0 |
+| main.go:33:24:39:1 | zero-init:0 block statement | main.go:10:7:10:7 | 0 |
 | main.go:34:8:34:8 | 7 | main.go:34:8:34:8 | 7 |
-| main.go:35:8:37:4 | function call | main.go:35:8:37:4 | function call |
-| main.go:36:3:36:5 | SSA def(res) | main.go:36:9:36:9 | 8 |
+| main.go:35:8:37:4 | defer-invoke function call | main.go:35:8:37:4 | function call |
+| main.go:36:3:36:9 | SSA def(res) | main.go:36:9:36:9 | 8 |
 | main.go:36:9:36:9 | 8 | main.go:36:9:36:9 | 8 |
+| main.go:38:2:38:9 | SSA def(res) | main.go:38:9:38:9 | 9 |
 | main.go:38:9:38:9 | 9 | main.go:38:9:38:9 | 9 |
-| main.go:38:9:38:9 | SSA def(res) | main.go:38:9:38:9 | 9 |
 | regressions.go:5:11:5:31 | call to Sizeof | regressions.go:5:11:5:31 | call to Sizeof |
 | regressions.go:7:11:7:15 | false | regressions.go:7:11:7:15 | false |
 | regressions.go:9:11:9:12 | !... | regressions.go:11:11:11:14 | true |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/GuardingFunctions/test.go b/go/ql/test/library-tests/semmle/go/dataflow/GuardingFunctions/test.go
index a7a595509f9c..55115d4ba737 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/GuardingFunctions/test.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/GuardingFunctions/test.go
@@ -334,6 +334,62 @@ func deeplyNestedConditionalRight(p string) bool {
 	return p[1] == 'b' && len(p)%2 == 1 && p[0] == 'a' && !isBad(p)
 }
 
+// Valid when the second result is nil
+func guardMultiError(p string) (string, error) {
+	if isBad(p) {
+		return "", errors.New("invalid")
+	}
+	return p, nil
+}
+
+// Valid when the first result is true; the second result is unrelated
+func guardMultiResultIsolation(p string) (bool, bool) {
+	return !isBad(p), true
+}
+
+// Valid when the named error result is nil
+func guardMultiNamed(p string) (value string, err error) {
+	if isBad(p) {
+		err = errors.New("invalid")
+		return
+	}
+	value = p
+	return
+}
+
+// Not a guard: the naked return can return false without validating p
+func mixedNamedResultGuard(p string, bypass bool) (invalid bool) {
+	if bypass {
+		return
+	}
+	return isBad(p)
+}
+
+func uncheckedMultiResult(p string) (string, error) {
+	return p, nil
+}
+
+// Not a guard: the tuple-forwarding return can return nil without validating p
+func mixedTupleReturnGuard(p string, bypass bool) (string, error) {
+	if bypass {
+		return uncheckedMultiResult(p)
+	}
+	if isBad(p) {
+		return "", errors.New("invalid")
+	}
+	return p, nil
+}
+
+type multiGuard struct{}
+
+// Validates p when the second result is nil
+func (multiGuard) validate(p string) (string, error) {
+	if isBad(p) {
+		return "", errors.New("invalid")
+	}
+	return p, nil
+}
+
 // Finally, actually test the functions -- try sinking a tainted value in the is-true/false
 // or is-nil/non-nil case for each candidate:
 
@@ -842,7 +898,84 @@ func test() {
 		s := source()
 		isValid := !guardBool(s)
 		if isValid {
-			sink(s) // $ SPURIOUS: hasValueFlow="s"
+			sink(s)
+		} else {
+			sink(s) // $ hasValueFlow="s"
+		}
+	}
+
+	{
+		s := source()
+		_, err := guardMultiError(s)
+		if err == nil {
+			sink(s)
+		} else {
+			sink(s) // $ hasValueFlow="s"
+		}
+	}
+
+	{
+		s := source()
+		valid, _ := guardMultiResultIsolation(s)
+		if valid {
+			sink(s)
+		} else {
+			sink(s) // $ hasValueFlow="s"
+		}
+	}
+
+	{
+		s := source()
+		_, unrelated := guardMultiResultIsolation(s)
+		if unrelated {
+			sink(s) // $ hasValueFlow="s"
+		} else {
+			sink(s) // $ hasValueFlow="s"
+		}
+	}
+
+	{
+		s := source()
+		_, err := guardMultiNamed(s)
+		if err == nil {
+			sink(s)
+		} else {
+			sink(s) // $ hasValueFlow="s"
+		}
+	}
+
+	{
+		s := source()
+		invalid := mixedNamedResultGuard(s, true)
+		if !invalid {
+			sink(s) // $ hasValueFlow="s"
+		}
+	}
+
+	{
+		s := source()
+		_, err := mixedTupleReturnGuard(s, true)
+		if err == nil {
+			sink(s) // $ hasValueFlow="s"
+		}
+	}
+
+	{
+		s := source()
+		_, err := guardMultiError(s)
+		copiedErr := err
+		if copiedErr == nil {
+			sink(s)
+		} else {
+			sink(s) // $ hasValueFlow="s"
+		}
+	}
+
+	{
+		s := source()
+		_, err := (multiGuard{}).validate(s)
+		if err == nil {
+			sink(s)
 		} else {
 			sink(s) // $ hasValueFlow="s"
 		}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/HiddenNodes/test.expected b/go/ql/test/library-tests/semmle/go/dataflow/HiddenNodes/test.expected
index 13aa3515962b..3b1674900dd0 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/HiddenNodes/test.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/HiddenNodes/test.expected
@@ -2,11 +2,11 @@ models
 | 1 | Summary: archive/tar; ; false; FileInfoHeader; ; ; Argument[0]; ReturnValue[0]; taint; manual |
 edges
 | test.go:14:8:14:15 | call to source | test.go:15:34:15:35 | fi | provenance |  |
-| test.go:15:2:15:44 | ... := ...[0] | test.go:16:7:16:12 | header | provenance |  |
-| test.go:15:34:15:35 | fi | test.go:15:2:15:44 | ... := ...[0] | provenance | MaD:1 |
+| test.go:15:2:15:44 | extract:0 ... := ... | test.go:16:7:16:12 | header | provenance |  |
+| test.go:15:34:15:35 | fi | test.go:15:2:15:44 | extract:0 ... := ... | provenance | MaD:1 |
 nodes
 | test.go:14:8:14:15 | call to source | semmle.label | call to source |
-| test.go:15:2:15:44 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:15:2:15:44 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:15:34:15:35 | fi | semmle.label | fi |
 | test.go:16:7:16:12 | header | semmle.label | header |
 subpaths
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/Nodes/CallNode_getResult_int.expected b/go/ql/test/library-tests/semmle/go/dataflow/Nodes/CallNode_getResult_int.expected
index 6c9465eeaf47..9e8955199329 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/Nodes/CallNode_getResult_int.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/Nodes/CallNode_getResult_int.expected
@@ -1,3 +1,3 @@
-| main.go:9:9:9:14 | call to test | 0 | main.go:9:2:9:14 | ... = ...[0] |
-| main.go:9:9:9:14 | call to test | 1 | main.go:9:2:9:14 | ... = ...[1] |
+| main.go:9:9:9:14 | call to test | 0 | main.go:9:2:9:14 | extract:0 ... = ... |
+| main.go:9:9:9:14 | call to test | 1 | main.go:9:2:9:14 | extract:1 ... = ... |
 | main.go:14:8:14:24 | call to make | 0 | main.go:14:8:14:24 | call to make |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/Nodes/ResultNode.expected b/go/ql/test/library-tests/semmle/go/dataflow/Nodes/ResultNode.expected
index 093fcdbdae13..ca4d2fc9dd8d 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/Nodes/ResultNode.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/Nodes/ResultNode.expected
@@ -4,5 +4,5 @@
 | resultParameters.go:9:10:9:10 | 1 | Result node with index 0 |
 | resultParameters.go:11:10:11:10 | 2 | Result node with index 0 |
 | resultParameters.go:13:9:13:9 | 3 | Result node with index 0 |
-| resultParameters.go:16:26:16:26 | implicit read of r | Result node with index 0 |
-| resultParameters.go:21:38:21:38 | implicit read of r | Result node with index 0 |
+| resultParameters.go:16:33:19:1 | result-read:0 block statement | Result node with index 0 |
+| resultParameters.go:21:45:27:1 | result-read:0 block statement | Result node with index 0 |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/Nodes/resultParameters.go b/go/ql/test/library-tests/semmle/go/dataflow/Nodes/resultParameters.go
index c404b8199142..60ae1462687e 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/Nodes/resultParameters.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/Nodes/resultParameters.go
@@ -13,15 +13,15 @@ func multipleReturns(selector int) int {
 	return 3 // $ Alert[result-node]
 }
 
-func resultParameter1() (r int) { // $ Alert[result-node] // implicit reads of result parameters are located at the result parameter declaration
+func resultParameter1() (r int) {
 	r = 0
 	return
-}
+} // $ Alert[result-node] // implicit reads of result parameters use the function body's location
 
-func resultParameter2(selector int) (r int) { // $ Alert[result-node] // implicit reads of result parameters are located at the result parameter declaration
+func resultParameter2(selector int) (r int) {
 	r = 0
 	if selector == 1 {
 		return 1
 	}
 	return
-}
+} // $ Alert[result-node] // implicit reads of result parameters use the function body's location
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.expected b/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.expected
index d29d11627b0f..f0d15090e67f 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.expected
@@ -10,12 +10,12 @@
 | test.go:25:2:25:2 | a | test.go:25:2:25:2 | a [postupdate] |
 | test.go:25:2:25:5 | selection of bs | test.go:25:2:25:5 | selection of bs [postupdate] |
 | test.go:25:2:25:8 | index expression | test.go:25:2:25:8 | index expression [postupdate] |
-| test.go:25:2:25:13 | implicit dereference | test.go:25:2:25:13 | implicit dereference [postupdate] |
+| test.go:25:2:25:13 | implicit-deref selection of cptr | test.go:25:2:25:13 | implicit-deref selection of cptr [postupdate] |
 | test.go:25:2:25:13 | selection of cptr | test.go:25:2:25:13 | selection of cptr [postupdate] |
 | test.go:26:2:26:2 | a | test.go:26:2:26:2 | a [postupdate] |
-| test.go:26:2:26:7 | implicit dereference | test.go:26:2:26:7 | implicit dereference [postupdate] |
+| test.go:26:2:26:7 | implicit-deref selection of bptr | test.go:26:2:26:7 | implicit-deref selection of bptr [postupdate] |
 | test.go:26:2:26:7 | selection of bptr | test.go:26:2:26:7 | selection of bptr [postupdate] |
-| test.go:26:2:26:12 | implicit dereference | test.go:26:2:26:12 | implicit dereference [postupdate] |
+| test.go:26:2:26:12 | implicit-deref selection of cptr | test.go:26:2:26:12 | implicit-deref selection of cptr [postupdate] |
 | test.go:26:2:26:12 | selection of cptr | test.go:26:2:26:12 | selection of cptr [postupdate] |
 | test.go:28:7:28:10 | struct literal | test.go:28:7:28:10 | struct literal [postupdate] |
 | test.go:29:2:29:2 | c | test.go:29:2:29:2 | c [postupdate] |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/LocalFlowStep.expected b/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/LocalFlowStep.expected
index 950a3a5ae987..c08f17177ac2 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/LocalFlowStep.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/LocalFlowStep.expected
@@ -1,132 +1,132 @@
-| main.go:22:2:22:6 | SSA def(outer) | main.go:25:7:25:11 | outer |
-| main.go:22:11:24:2 | struct literal | main.go:22:2:22:6 | SSA def(outer) |
-| main.go:22:11:24:2 | struct literal [postupdate] | main.go:22:2:22:6 | SSA def(outer) |
+| main.go:22:2:24:2 | SSA def(outer) | main.go:25:7:25:11 | outer |
+| main.go:22:11:24:2 | struct literal | main.go:22:2:24:2 | SSA def(outer) |
+| main.go:22:11:24:2 | struct literal [postupdate] | main.go:22:2:24:2 | SSA def(outer) |
 | main.go:25:7:25:11 | outer | main.go:26:7:26:11 | outer |
 | main.go:26:7:26:11 | outer | main.go:27:7:27:11 | outer |
 | main.go:27:7:27:11 | outer | main.go:28:7:28:11 | outer |
-| main.go:30:2:30:7 | SSA def(outerp) | main.go:33:7:33:12 | outerp |
-| main.go:30:12:32:2 | &... | main.go:30:2:30:7 | SSA def(outerp) |
-| main.go:30:12:32:2 | &... [postupdate] | main.go:30:2:30:7 | SSA def(outerp) |
+| main.go:30:2:32:2 | SSA def(outerp) | main.go:33:7:33:12 | outerp |
+| main.go:30:12:32:2 | &... | main.go:30:2:32:2 | SSA def(outerp) |
+| main.go:30:12:32:2 | &... [postupdate] | main.go:30:2:32:2 | SSA def(outerp) |
 | main.go:33:7:33:12 | outerp | main.go:34:7:34:12 | outerp |
 | main.go:33:7:33:12 | outerp [postupdate] | main.go:34:7:34:12 | outerp |
 | main.go:34:7:34:12 | outerp | main.go:35:7:35:12 | outerp |
 | main.go:34:7:34:12 | outerp [postupdate] | main.go:35:7:35:12 | outerp |
 | main.go:35:7:35:12 | outerp | main.go:36:7:36:12 | outerp |
 | main.go:35:7:35:12 | outerp [postupdate] | main.go:36:7:36:12 | outerp |
-| main.go:40:2:40:6 | SSA def(outer) | main.go:41:7:41:11 | outer |
-| main.go:40:11:40:40 | struct literal | main.go:40:2:40:6 | SSA def(outer) |
-| main.go:40:11:40:40 | struct literal [postupdate] | main.go:40:2:40:6 | SSA def(outer) |
+| main.go:40:2:40:40 | SSA def(outer) | main.go:41:7:41:11 | outer |
+| main.go:40:11:40:40 | struct literal | main.go:40:2:40:40 | SSA def(outer) |
+| main.go:40:11:40:40 | struct literal [postupdate] | main.go:40:2:40:40 | SSA def(outer) |
 | main.go:41:7:41:11 | outer | main.go:42:7:42:11 | outer |
 | main.go:42:7:42:11 | outer | main.go:43:7:43:11 | outer |
 | main.go:43:7:43:11 | outer | main.go:44:7:44:11 | outer |
-| main.go:46:2:46:7 | SSA def(outerp) | main.go:47:7:47:12 | outerp |
-| main.go:46:12:46:42 | &... | main.go:46:2:46:7 | SSA def(outerp) |
-| main.go:46:12:46:42 | &... [postupdate] | main.go:46:2:46:7 | SSA def(outerp) |
+| main.go:46:2:46:42 | SSA def(outerp) | main.go:47:7:47:12 | outerp |
+| main.go:46:12:46:42 | &... | main.go:46:2:46:42 | SSA def(outerp) |
+| main.go:46:12:46:42 | &... [postupdate] | main.go:46:2:46:42 | SSA def(outerp) |
 | main.go:47:7:47:12 | outerp | main.go:48:7:48:12 | outerp |
 | main.go:47:7:47:12 | outerp [postupdate] | main.go:48:7:48:12 | outerp |
 | main.go:48:7:48:12 | outerp | main.go:49:7:49:12 | outerp |
 | main.go:48:7:48:12 | outerp [postupdate] | main.go:49:7:49:12 | outerp |
 | main.go:49:7:49:12 | outerp | main.go:50:7:50:12 | outerp |
 | main.go:49:7:49:12 | outerp [postupdate] | main.go:50:7:50:12 | outerp |
-| main.go:54:2:54:6 | SSA def(inner) | main.go:55:19:55:23 | inner |
-| main.go:54:11:54:25 | struct literal | main.go:54:2:54:6 | SSA def(inner) |
-| main.go:54:11:54:25 | struct literal [postupdate] | main.go:54:2:54:6 | SSA def(inner) |
-| main.go:55:2:55:7 | SSA def(middle) | main.go:56:17:56:22 | middle |
-| main.go:55:12:55:24 | struct literal | main.go:55:2:55:7 | SSA def(middle) |
-| main.go:55:12:55:24 | struct literal [postupdate] | main.go:55:2:55:7 | SSA def(middle) |
-| main.go:56:2:56:6 | SSA def(outer) | main.go:57:7:57:11 | outer |
-| main.go:56:11:56:23 | struct literal | main.go:56:2:56:6 | SSA def(outer) |
-| main.go:56:11:56:23 | struct literal [postupdate] | main.go:56:2:56:6 | SSA def(outer) |
+| main.go:54:2:54:25 | SSA def(inner) | main.go:55:19:55:23 | inner |
+| main.go:54:11:54:25 | struct literal | main.go:54:2:54:25 | SSA def(inner) |
+| main.go:54:11:54:25 | struct literal [postupdate] | main.go:54:2:54:25 | SSA def(inner) |
+| main.go:55:2:55:24 | SSA def(middle) | main.go:56:17:56:22 | middle |
+| main.go:55:12:55:24 | struct literal | main.go:55:2:55:24 | SSA def(middle) |
+| main.go:55:12:55:24 | struct literal [postupdate] | main.go:55:2:55:24 | SSA def(middle) |
+| main.go:56:2:56:23 | SSA def(outer) | main.go:57:7:57:11 | outer |
+| main.go:56:11:56:23 | struct literal | main.go:56:2:56:23 | SSA def(outer) |
+| main.go:56:11:56:23 | struct literal [postupdate] | main.go:56:2:56:23 | SSA def(outer) |
 | main.go:57:7:57:11 | outer | main.go:58:7:58:11 | outer |
 | main.go:58:7:58:11 | outer | main.go:59:7:59:11 | outer |
 | main.go:59:7:59:11 | outer | main.go:60:7:60:11 | outer |
-| main.go:62:2:62:7 | SSA def(innerp) | main.go:63:20:63:25 | innerp |
-| main.go:62:12:62:26 | struct literal | main.go:62:2:62:7 | SSA def(innerp) |
-| main.go:62:12:62:26 | struct literal [postupdate] | main.go:62:2:62:7 | SSA def(innerp) |
-| main.go:63:2:63:8 | SSA def(middlep) | main.go:64:18:64:24 | middlep |
-| main.go:63:13:63:26 | struct literal | main.go:63:2:63:8 | SSA def(middlep) |
-| main.go:63:13:63:26 | struct literal [postupdate] | main.go:63:2:63:8 | SSA def(middlep) |
-| main.go:64:2:64:7 | SSA def(outerp) | main.go:65:7:65:12 | outerp |
-| main.go:64:12:64:25 | struct literal | main.go:64:2:64:7 | SSA def(outerp) |
-| main.go:64:12:64:25 | struct literal [postupdate] | main.go:64:2:64:7 | SSA def(outerp) |
+| main.go:62:2:62:26 | SSA def(innerp) | main.go:63:20:63:25 | innerp |
+| main.go:62:12:62:26 | struct literal | main.go:62:2:62:26 | SSA def(innerp) |
+| main.go:62:12:62:26 | struct literal [postupdate] | main.go:62:2:62:26 | SSA def(innerp) |
+| main.go:63:2:63:26 | SSA def(middlep) | main.go:64:18:64:24 | middlep |
+| main.go:63:13:63:26 | struct literal | main.go:63:2:63:26 | SSA def(middlep) |
+| main.go:63:13:63:26 | struct literal [postupdate] | main.go:63:2:63:26 | SSA def(middlep) |
+| main.go:64:2:64:25 | SSA def(outerp) | main.go:65:7:65:12 | outerp |
+| main.go:64:12:64:25 | struct literal | main.go:64:2:64:25 | SSA def(outerp) |
+| main.go:64:12:64:25 | struct literal [postupdate] | main.go:64:2:64:25 | SSA def(outerp) |
 | main.go:65:7:65:12 | outerp | main.go:66:7:66:12 | outerp |
 | main.go:66:7:66:12 | outerp | main.go:67:7:67:12 | outerp |
 | main.go:67:7:67:12 | outerp | main.go:68:7:68:12 | outerp |
-| main.go:72:2:72:6 | SSA def(inner) | main.go:73:26:73:30 | inner |
-| main.go:72:11:72:25 | struct literal | main.go:72:2:72:6 | SSA def(inner) |
-| main.go:72:11:72:25 | struct literal [postupdate] | main.go:72:2:72:6 | SSA def(inner) |
-| main.go:73:2:73:7 | SSA def(middle) | main.go:74:25:74:30 | middle |
-| main.go:73:12:73:31 | struct literal | main.go:73:2:73:7 | SSA def(middle) |
-| main.go:73:12:73:31 | struct literal [postupdate] | main.go:73:2:73:7 | SSA def(middle) |
-| main.go:74:2:74:6 | SSA def(outer) | main.go:75:7:75:11 | outer |
-| main.go:74:11:74:31 | struct literal | main.go:74:2:74:6 | SSA def(outer) |
-| main.go:74:11:74:31 | struct literal [postupdate] | main.go:74:2:74:6 | SSA def(outer) |
+| main.go:72:2:72:25 | SSA def(inner) | main.go:73:26:73:30 | inner |
+| main.go:72:11:72:25 | struct literal | main.go:72:2:72:25 | SSA def(inner) |
+| main.go:72:11:72:25 | struct literal [postupdate] | main.go:72:2:72:25 | SSA def(inner) |
+| main.go:73:2:73:31 | SSA def(middle) | main.go:74:25:74:30 | middle |
+| main.go:73:12:73:31 | struct literal | main.go:73:2:73:31 | SSA def(middle) |
+| main.go:73:12:73:31 | struct literal [postupdate] | main.go:73:2:73:31 | SSA def(middle) |
+| main.go:74:2:74:31 | SSA def(outer) | main.go:75:7:75:11 | outer |
+| main.go:74:11:74:31 | struct literal | main.go:74:2:74:31 | SSA def(outer) |
+| main.go:74:11:74:31 | struct literal [postupdate] | main.go:74:2:74:31 | SSA def(outer) |
 | main.go:75:7:75:11 | outer | main.go:76:7:76:11 | outer |
 | main.go:76:7:76:11 | outer | main.go:77:7:77:11 | outer |
 | main.go:77:7:77:11 | outer | main.go:78:7:78:11 | outer |
-| main.go:80:2:80:7 | SSA def(innerp) | main.go:81:27:81:32 | innerp |
-| main.go:80:12:80:26 | struct literal | main.go:80:2:80:7 | SSA def(innerp) |
-| main.go:80:12:80:26 | struct literal [postupdate] | main.go:80:2:80:7 | SSA def(innerp) |
-| main.go:81:2:81:8 | SSA def(middlep) | main.go:82:26:82:32 | middlep |
-| main.go:81:13:81:33 | struct literal | main.go:81:2:81:8 | SSA def(middlep) |
-| main.go:81:13:81:33 | struct literal [postupdate] | main.go:81:2:81:8 | SSA def(middlep) |
-| main.go:82:2:82:7 | SSA def(outerp) | main.go:83:7:83:12 | outerp |
-| main.go:82:12:82:33 | struct literal | main.go:82:2:82:7 | SSA def(outerp) |
-| main.go:82:12:82:33 | struct literal [postupdate] | main.go:82:2:82:7 | SSA def(outerp) |
+| main.go:80:2:80:26 | SSA def(innerp) | main.go:81:27:81:32 | innerp |
+| main.go:80:12:80:26 | struct literal | main.go:80:2:80:26 | SSA def(innerp) |
+| main.go:80:12:80:26 | struct literal [postupdate] | main.go:80:2:80:26 | SSA def(innerp) |
+| main.go:81:2:81:33 | SSA def(middlep) | main.go:82:26:82:32 | middlep |
+| main.go:81:13:81:33 | struct literal | main.go:81:2:81:33 | SSA def(middlep) |
+| main.go:81:13:81:33 | struct literal [postupdate] | main.go:81:2:81:33 | SSA def(middlep) |
+| main.go:82:2:82:33 | SSA def(outerp) | main.go:83:7:83:12 | outerp |
+| main.go:82:12:82:33 | struct literal | main.go:82:2:82:33 | SSA def(outerp) |
+| main.go:82:12:82:33 | struct literal [postupdate] | main.go:82:2:82:33 | SSA def(outerp) |
 | main.go:83:7:83:12 | outerp | main.go:84:7:84:12 | outerp |
 | main.go:84:7:84:12 | outerp | main.go:85:7:85:12 | outerp |
 | main.go:85:7:85:12 | outerp | main.go:86:7:86:12 | outerp |
-| main.go:90:6:90:10 | SSA def(outer) | main.go:91:2:91:6 | outer |
-| main.go:90:6:90:10 | zero value for outer | main.go:90:6:90:10 | SSA def(outer) |
+| main.go:90:6:90:16 | SSA def(outer) | main.go:91:2:91:6 | outer |
+| main.go:90:6:90:16 | zero-init:0 value declaration specifier | main.go:90:6:90:16 | SSA def(outer) |
 | main.go:91:2:91:6 | outer | main.go:92:7:92:11 | outer |
 | main.go:91:2:91:6 | outer [postupdate] | main.go:92:7:92:11 | outer |
 | main.go:92:7:92:11 | outer | main.go:93:7:93:11 | outer |
 | main.go:93:7:93:11 | outer | main.go:94:7:94:11 | outer |
 | main.go:94:7:94:11 | outer | main.go:95:7:95:11 | outer |
-| main.go:97:6:97:11 | SSA def(outerp) | main.go:98:2:98:7 | outerp |
-| main.go:97:6:97:11 | zero value for outerp | main.go:97:6:97:11 | SSA def(outerp) |
+| main.go:97:6:97:17 | SSA def(outerp) | main.go:98:2:98:7 | outerp |
+| main.go:97:6:97:17 | zero-init:0 value declaration specifier | main.go:97:6:97:17 | SSA def(outerp) |
 | main.go:98:2:98:7 | outerp | main.go:99:7:99:12 | outerp |
 | main.go:98:2:98:7 | outerp [postupdate] | main.go:99:7:99:12 | outerp |
 | main.go:99:7:99:12 | outerp | main.go:100:7:100:12 | outerp |
 | main.go:100:7:100:12 | outerp | main.go:101:7:101:12 | outerp |
 | main.go:101:7:101:12 | outerp | main.go:102:7:102:12 | outerp |
-| main.go:106:6:106:10 | SSA def(outer) | main.go:107:2:107:6 | outer |
-| main.go:106:6:106:10 | zero value for outer | main.go:106:6:106:10 | SSA def(outer) |
+| main.go:106:6:106:16 | SSA def(outer) | main.go:107:2:107:6 | outer |
+| main.go:106:6:106:16 | zero-init:0 value declaration specifier | main.go:106:6:106:16 | SSA def(outer) |
 | main.go:107:2:107:6 | outer | main.go:108:7:108:11 | outer |
 | main.go:107:2:107:6 | outer [postupdate] | main.go:108:7:108:11 | outer |
 | main.go:108:7:108:11 | outer | main.go:109:7:109:11 | outer |
 | main.go:109:7:109:11 | outer | main.go:110:7:110:11 | outer |
 | main.go:110:7:110:11 | outer | main.go:111:7:111:11 | outer |
-| main.go:113:6:113:11 | SSA def(outerp) | main.go:114:2:114:7 | outerp |
-| main.go:113:6:113:11 | zero value for outerp | main.go:113:6:113:11 | SSA def(outerp) |
+| main.go:113:6:113:17 | SSA def(outerp) | main.go:114:2:114:7 | outerp |
+| main.go:113:6:113:17 | zero-init:0 value declaration specifier | main.go:113:6:113:17 | SSA def(outerp) |
 | main.go:114:2:114:7 | outerp | main.go:115:7:115:12 | outerp |
 | main.go:114:2:114:7 | outerp [postupdate] | main.go:115:7:115:12 | outerp |
 | main.go:115:7:115:12 | outerp | main.go:116:7:116:12 | outerp |
 | main.go:116:7:116:12 | outerp | main.go:117:7:117:12 | outerp |
 | main.go:117:7:117:12 | outerp | main.go:118:7:118:12 | outerp |
-| main.go:122:6:122:10 | SSA def(outer) | main.go:123:2:123:6 | outer |
-| main.go:122:6:122:10 | zero value for outer | main.go:122:6:122:10 | SSA def(outer) |
+| main.go:122:6:122:16 | SSA def(outer) | main.go:123:2:123:6 | outer |
+| main.go:122:6:122:16 | zero-init:0 value declaration specifier | main.go:122:6:122:16 | SSA def(outer) |
 | main.go:123:2:123:6 | outer | main.go:124:7:124:11 | outer |
 | main.go:123:2:123:6 | outer [postupdate] | main.go:124:7:124:11 | outer |
 | main.go:124:7:124:11 | outer | main.go:125:7:125:11 | outer |
 | main.go:125:7:125:11 | outer | main.go:126:7:126:11 | outer |
 | main.go:126:7:126:11 | outer | main.go:127:7:127:11 | outer |
-| main.go:129:6:129:11 | SSA def(outerp) | main.go:130:2:130:7 | outerp |
-| main.go:129:6:129:11 | zero value for outerp | main.go:129:6:129:11 | SSA def(outerp) |
+| main.go:129:6:129:17 | SSA def(outerp) | main.go:130:2:130:7 | outerp |
+| main.go:129:6:129:17 | zero-init:0 value declaration specifier | main.go:129:6:129:17 | SSA def(outerp) |
 | main.go:130:2:130:7 | outerp | main.go:131:7:131:12 | outerp |
 | main.go:130:2:130:7 | outerp [postupdate] | main.go:131:7:131:12 | outerp |
 | main.go:131:7:131:12 | outerp | main.go:132:7:132:12 | outerp |
 | main.go:132:7:132:12 | outerp | main.go:133:7:133:12 | outerp |
 | main.go:133:7:133:12 | outerp | main.go:134:7:134:12 | outerp |
-| main.go:138:6:138:10 | SSA def(outer) | main.go:139:2:139:6 | outer |
-| main.go:138:6:138:10 | zero value for outer | main.go:138:6:138:10 | SSA def(outer) |
+| main.go:138:6:138:16 | SSA def(outer) | main.go:139:2:139:6 | outer |
+| main.go:138:6:138:16 | zero-init:0 value declaration specifier | main.go:138:6:138:16 | SSA def(outer) |
 | main.go:139:2:139:6 | outer | main.go:140:7:140:11 | outer |
 | main.go:139:2:139:6 | outer [postupdate] | main.go:140:7:140:11 | outer |
 | main.go:140:7:140:11 | outer | main.go:141:7:141:11 | outer |
 | main.go:141:7:141:11 | outer | main.go:142:7:142:11 | outer |
 | main.go:142:7:142:11 | outer | main.go:143:7:143:11 | outer |
-| main.go:145:6:145:11 | SSA def(outerp) | main.go:146:2:146:7 | outerp |
-| main.go:145:6:145:11 | zero value for outerp | main.go:145:6:145:11 | SSA def(outerp) |
+| main.go:145:6:145:17 | SSA def(outerp) | main.go:146:2:146:7 | outerp |
+| main.go:145:6:145:17 | zero-init:0 value declaration specifier | main.go:145:6:145:17 | SSA def(outerp) |
 | main.go:146:2:146:7 | outerp | main.go:147:7:147:12 | outerp |
 | main.go:146:2:146:7 | outerp [postupdate] | main.go:147:7:147:12 | outerp |
 | main.go:147:7:147:12 | outerp | main.go:148:7:148:12 | outerp |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/readsElement.expected b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/readsElement.expected
index 640c0dec2676..df6a0b049b60 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/readsElement.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/readsElement.expected
@@ -1,3 +1,3 @@
 | tst.go:19:10:19:14 | index expression | tst.go:19:10:19:11 | xs | tst.go:19:13:19:13 | 1 |
-| tst.go:20:10:20:14 | index expression | tst.go:20:10:20:11 | implicit dereference | tst.go:20:13:20:13 | 1 |
+| tst.go:20:10:20:14 | index expression | tst.go:20:10:20:11 | implicit-deref ps | tst.go:20:13:20:13 | 1 |
 | tst.go:20:10:20:14 | index expression | tst.go:20:10:20:11 | ps | tst.go:20:13:20:13 | 1 |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/readsField.expected b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/readsField.expected
index 683117030c76..3dbbdc221e8d 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/readsField.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/readsField.expected
@@ -1,4 +1,4 @@
-| tst.go:8:8:8:10 | selection of f | tst.go:8:8:8:8 | implicit dereference | tst.go:4:2:4:2 | f |
+| tst.go:8:8:8:10 | selection of f | tst.go:8:8:8:8 | implicit-deref t | tst.go:4:2:4:2 | f |
 | tst.go:8:8:8:10 | selection of f | tst.go:8:8:8:8 | t | tst.go:4:2:4:2 | f |
 | tst.go:13:9:13:11 | selection of f | tst.go:13:9:13:9 | t | tst.go:4:2:4:2 | f |
 | tst.go:17:8:17:10 | selection of f | tst.go:17:8:17:8 | x | tst.go:4:2:4:2 | f |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/readsMethod.expected b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/readsMethod.expected
index 1909e3257452..0a948af2cd23 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/readsMethod.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/readsMethod.expected
@@ -1,3 +1,3 @@
-| tst.go:9:9:9:13 | selection of get | tst.go:9:9:9:9 | implicit dereference | tst.go:12:12:12:14 | get |
+| tst.go:9:9:9:13 | selection of get | tst.go:9:9:9:9 | implicit-deref t | tst.go:12:12:12:14 | get |
 | tst.go:9:9:9:13 | selection of get | tst.go:9:9:9:9 | t | tst.go:12:12:12:14 | get |
 | tst.go:18:2:18:7 | selection of bump | tst.go:18:2:18:2 | x | tst.go:7:13:7:16 | bump |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesElement.expected b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesElement.expected
index 44792aa3d299..23cfd9b6acab 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesElement.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesElement.expected
@@ -1,3 +1,3 @@
-| tst.go:19:2:19:6 | assignment to element | tst.go:19:2:19:3 | xs [postupdate] | tst.go:19:5:19:5 | 0 | tst.go:19:10:19:14 | index expression |
-| tst.go:20:2:20:6 | assignment to element | tst.go:20:2:20:3 | implicit dereference [postupdate] | tst.go:20:5:20:5 | 0 | tst.go:20:10:20:14 | index expression |
-| tst.go:20:2:20:6 | assignment to element | tst.go:20:2:20:3 | ps [postupdate] | tst.go:20:5:20:5 | 0 | tst.go:20:10:20:14 | index expression |
+| tst.go:19:2:19:14 | assign:0 ... = ... | tst.go:19:2:19:3 | xs [postupdate] | tst.go:19:5:19:5 | 0 | tst.go:19:10:19:14 | index expression |
+| tst.go:20:2:20:14 | assign:0 ... = ... | tst.go:20:2:20:3 | implicit-deref ps [postupdate] | tst.go:20:5:20:5 | 0 | tst.go:20:10:20:14 | index expression |
+| tst.go:20:2:20:14 | assign:0 ... = ... | tst.go:20:2:20:3 | ps [postupdate] | tst.go:20:5:20:5 | 0 | tst.go:20:10:20:14 | index expression |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesField.expected b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesField.expected
index 7862b2d61b3d..414a82acfc95 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesField.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesField.expected
@@ -1,3 +1,3 @@
-| tst.go:8:2:8:4 | assignment to field f | tst.go:8:2:8:2 | implicit dereference [postupdate] | tst.go:4:2:4:2 | f | tst.go:8:8:8:14 | ...+... |
-| tst.go:8:2:8:4 | assignment to field f | tst.go:8:2:8:2 | t [postupdate] | tst.go:4:2:4:2 | f | tst.go:8:8:8:14 | ...+... |
-| tst.go:17:2:17:4 | assignment to field f | tst.go:17:2:17:2 | x [postupdate] | tst.go:4:2:4:2 | f | tst.go:17:8:17:14 | ...+... |
+| tst.go:8:2:8:14 | assign:0 ... = ... | tst.go:8:2:8:2 | implicit-deref t [postupdate] | tst.go:4:2:4:2 | f | tst.go:8:8:8:14 | ...+... |
+| tst.go:8:2:8:14 | assign:0 ... = ... | tst.go:8:2:8:2 | t [postupdate] | tst.go:4:2:4:2 | f | tst.go:8:8:8:14 | ...+... |
+| tst.go:17:2:17:14 | assign:0 ... = ... | tst.go:17:2:17:2 | x [postupdate] | tst.go:4:2:4:2 | f | tst.go:17:8:17:14 | ...+... |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/SSA/DefUse.expected b/go/ql/test/library-tests/semmle/go/dataflow/SSA/DefUse.expected
index 775eff4a49e5..17be1f70f90c 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/SSA/DefUse.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/SSA/DefUse.expected
@@ -1,42 +1,42 @@
-| main.go:15:12:15:12 | x | main.go:13:6:13:6 | SSA def(x) | main.go:13:6:13:6 | x |
-| main.go:15:15:15:15 | y | main.go:14:2:14:2 | SSA def(y) | main.go:14:2:14:2 | y |
-| main.go:17:3:17:3 | y | main.go:14:2:14:2 | SSA def(y) | main.go:14:2:14:2 | y |
-| main.go:19:12:19:12 | x | main.go:13:6:13:6 | SSA def(x) | main.go:13:6:13:6 | x |
-| main.go:19:15:19:15 | y | main.go:19:2:19:10 | SSA phi(y) | main.go:14:2:14:2 | y |
-| main.go:21:7:21:7 | y | main.go:19:2:19:10 | SSA phi(y) | main.go:14:2:14:2 | y |
-| main.go:23:12:23:12 | x | main.go:23:2:23:10 | SSA phi(x) | main.go:13:6:13:6 | x |
-| main.go:23:15:23:15 | y | main.go:19:2:19:10 | SSA phi(y) | main.go:14:2:14:2 | y |
+| main.go:15:12:15:12 | x | main.go:13:6:13:10 | SSA def(x) | main.go:13:6:13:6 | x |
+| main.go:15:15:15:15 | y | main.go:14:2:14:8 | SSA def(y) | main.go:14:2:14:2 | y |
+| main.go:17:3:17:3 | y | main.go:14:2:14:8 | SSA def(y) | main.go:14:2:14:2 | y |
+| main.go:19:12:19:12 | x | main.go:13:6:13:10 | SSA def(x) | main.go:13:6:13:6 | x |
+| main.go:19:15:19:15 | y | main.go:16:2:18:2 | SSA phi(y) | main.go:14:2:14:2 | y |
+| main.go:21:7:21:7 | y | main.go:16:2:18:2 | SSA phi(y) | main.go:14:2:14:2 | y |
+| main.go:23:12:23:12 | x | main.go:20:2:22:2 | SSA phi(x) | main.go:13:6:13:6 | x |
+| main.go:23:15:23:15 | y | main.go:16:2:18:2 | SSA phi(y) | main.go:14:2:14:2 | y |
 | main.go:27:10:27:10 | x | main.go:26:10:26:10 | SSA def(x) | main.go:26:10:26:10 | x |
-| main.go:29:10:29:10 | b | main.go:27:5:27:5 | SSA def(b) | main.go:27:5:27:5 | b |
-| main.go:29:13:29:13 | a | main.go:27:2:27:2 | SSA def(a) | main.go:27:2:27:2 | a |
-| main.go:31:9:31:9 | a | main.go:31:9:31:9 | SSA phi(a) | main.go:27:2:27:2 | a |
-| main.go:31:12:31:12 | b | main.go:31:9:31:9 | SSA phi(b) | main.go:27:5:27:5 | b |
+| main.go:29:10:29:10 | b | main.go:27:2:27:13 | SSA def(b) | main.go:27:5:27:5 | b |
+| main.go:29:13:29:13 | a | main.go:27:2:27:13 | SSA def(a) | main.go:27:2:27:2 | a |
+| main.go:31:9:31:9 | a | main.go:28:2:30:2 | SSA phi(a) | main.go:27:2:27:2 | a |
+| main.go:31:12:31:12 | b | main.go:28:2:30:2 | SSA phi(b) | main.go:27:5:27:5 | b |
 | main.go:35:3:35:3 | x | main.go:34:11:34:11 | SSA def(x) | main.go:34:11:34:11 | x |
-| main.go:40:10:40:10 | x | main.go:39:2:39:2 | SSA def(x) | main.go:39:2:39:2 | x |
-| main.go:42:8:42:10 | ptr | main.go:40:2:40:4 | SSA def(ptr) | main.go:40:2:40:4 | ptr |
-| main.go:44:12:44:12 | x | main.go:39:2:39:2 | SSA def(x) | main.go:39:2:39:2 | x |
-| main.go:47:13:47:18 | implicit read of result | main.go:48:2:48:7 | SSA def(result) | main.go:47:13:47:18 | result |
-| main.go:52:14:52:19 | implicit read of result | main.go:52:14:52:19 | SSA def(result) | main.go:52:14:52:19 | result |
-| main.go:61:12:61:12 | x | main.go:58:6:58:9 | SSA phi(x) | main.go:57:6:57:6 | x |
-| main.go:64:16:64:16 | i | main.go:65:6:65:9 | SSA phi(i) | main.go:64:6:64:6 | i |
-| main.go:70:12:70:12 | y | main.go:65:6:65:9 | SSA phi(y) | main.go:63:2:63:2 | y |
-| main.go:73:16:73:16 | i | main.go:74:3:74:3 | SSA phi(i) | main.go:73:6:73:6 | i |
-| main.go:79:12:79:12 | z | main.go:74:3:74:3 | SSA def(z) | main.go:72:2:72:2 | z |
-| main.go:82:18:82:18 | implicit read of a | main.go:84:5:84:5 | SSA def(a) | main.go:82:18:82:18 | a |
-| main.go:82:25:82:25 | implicit read of b | main.go:82:25:82:25 | SSA def(b) | main.go:82:25:82:25 | b |
-| main.go:84:9:84:9 | x | main.go:83:2:83:2 | SSA def(x) | main.go:83:2:83:2 | x |
-| main.go:84:15:84:15 | x | main.go:83:2:83:2 | SSA def(x) | main.go:83:2:83:2 | x |
+| main.go:40:10:40:10 | x | main.go:39:2:39:8 | SSA def(x) | main.go:39:2:39:2 | x |
+| main.go:42:8:42:10 | ptr | main.go:40:2:40:10 | SSA def(ptr) | main.go:40:2:40:4 | ptr |
+| main.go:44:12:44:12 | x | main.go:39:2:39:8 | SSA def(x) | main.go:39:2:39:2 | x |
+| main.go:47:25:50:1 | result-read:0 block statement | main.go:48:2:48:12 | SSA def(result) | main.go:47:13:47:18 | result |
+| main.go:52:26:54:1 | result-read:0 block statement | main.go:52:26:54:1 | SSA def(result) | main.go:52:14:52:19 | result |
+| main.go:61:12:61:12 | x | main.go:58:6:58:11 | SSA phi(x) | main.go:57:6:57:6 | x |
+| main.go:64:16:64:16 | i | main.go:64:20:69:2 | SSA phi(i) | main.go:64:6:64:6 | i |
+| main.go:70:12:70:12 | y | main.go:64:20:69:2 | SSA phi(y) | main.go:63:2:63:2 | y |
+| main.go:73:16:73:16 | i | main.go:73:20:78:2 | SSA phi(i) | main.go:73:6:73:6 | i |
+| main.go:79:12:79:12 | z | main.go:74:3:74:7 | SSA def(z) | main.go:72:2:72:2 | z |
+| main.go:82:36:86:1 | result-read:0 block statement | main.go:84:2:84:15 | SSA def(a) | main.go:82:18:82:18 | a |
+| main.go:82:36:86:1 | result-read:1 block statement | main.go:82:36:86:1 | SSA def(b) | main.go:82:25:82:25 | b |
+| main.go:84:9:84:9 | x | main.go:83:2:83:8 | SSA def(x) | main.go:83:2:83:2 | x |
+| main.go:84:15:84:15 | x | main.go:83:2:83:8 | SSA def(x) | main.go:83:2:83:2 | x |
 | main.go:97:2:97:8 | wrapper | main.go:95:22:95:28 | SSA def(wrapper) | main.go:95:22:95:28 | wrapper |
 | main.go:100:9:100:9 | x | main.go:97:2:99:3 | SSA def(x) | main.go:96:2:96:2 | x |
 | main.go:105:2:105:8 | wrapper | main.go:103:20:103:26 | SSA def(wrapper) | main.go:103:20:103:26 | wrapper |
 | main.go:106:8:106:8 | x | main.go:105:16:108:2 | SSA def(x) | main.go:104:2:104:2 | x |
-| main.go:107:7:107:7 | y | main.go:106:3:106:3 | SSA def(y) | main.go:106:3:106:3 | y |
-| main.go:109:9:109:9 | x | main.go:104:2:104:2 | SSA def(x) | main.go:104:2:104:2 | x |
+| main.go:107:7:107:7 | y | main.go:106:3:106:8 | SSA def(y) | main.go:106:3:106:3 | y |
+| main.go:109:9:109:9 | x | main.go:104:2:104:7 | SSA def(x) | main.go:104:2:104:2 | x |
 | main.go:114:2:114:8 | wrapper | main.go:112:29:112:35 | SSA def(wrapper) | main.go:112:29:112:35 | wrapper |
 | main.go:115:8:115:8 | x | main.go:114:16:117:2 | SSA def(x) | main.go:113:2:113:2 | x |
-| main.go:116:7:116:7 | y | main.go:115:3:115:3 | SSA def(y) | main.go:115:3:115:3 | y |
+| main.go:116:7:116:7 | y | main.go:115:3:115:12 | SSA def(y) | main.go:115:3:115:3 | y |
 | main.go:118:9:118:9 | x | main.go:114:2:117:3 | SSA def(x) | main.go:113:2:113:2 | x |
-| main.go:135:2:135:2 | p | main.go:135:2:135:2 | SSA phi(p) | main.go:128:6:128:6 | p |
-| main.go:137:12:137:12 | p | main.go:135:2:135:2 | SSA phi(p) | main.go:128:6:128:6 | p |
-| main.go:137:17:137:17 | p | main.go:135:2:135:2 | SSA phi(p) | main.go:128:6:128:6 | p |
-| main.go:137:24:137:24 | p | main.go:135:2:135:2 | SSA phi(p) | main.go:128:6:128:6 | p |
+| main.go:135:2:135:2 | p | main.go:129:2:133:2 | SSA phi(p) | main.go:128:6:128:6 | p |
+| main.go:137:12:137:12 | p | main.go:129:2:133:2 | SSA phi(p) | main.go:128:6:128:6 | p |
+| main.go:137:17:137:17 | p | main.go:129:2:133:2 | SSA phi(p) | main.go:128:6:128:6 | p |
+| main.go:137:24:137:24 | p | main.go:129:2:133:2 | SSA phi(p) | main.go:128:6:128:6 | p |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/SSA/SsaDefinition.expected b/go/ql/test/library-tests/semmle/go/dataflow/SSA/SsaDefinition.expected
index 3ff2faf872c4..0345f6c5b70a 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/SSA/SsaDefinition.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/SSA/SsaDefinition.expected
@@ -1,51 +1,51 @@
-| main.go:13:6:13:6 | SSA def(x) |
-| main.go:14:2:14:2 | SSA def(y) |
-| main.go:17:3:17:3 | SSA def(y) |
-| main.go:19:2:19:10 | SSA phi(y) |
-| main.go:21:3:21:3 | SSA def(x) |
-| main.go:23:2:23:10 | SSA phi(x) |
+| main.go:13:6:13:10 | SSA def(x) |
+| main.go:14:2:14:8 | SSA def(y) |
+| main.go:16:2:18:2 | SSA phi(y) |
+| main.go:17:3:17:9 | SSA def(y) |
+| main.go:20:2:22:2 | SSA phi(x) |
+| main.go:21:3:21:7 | SSA def(x) |
 | main.go:26:10:26:10 | SSA def(x) |
-| main.go:27:2:27:2 | SSA def(a) |
-| main.go:27:5:27:5 | SSA def(b) |
-| main.go:29:3:29:3 | SSA def(a) |
-| main.go:29:6:29:6 | SSA def(b) |
-| main.go:31:9:31:9 | SSA phi(a) |
-| main.go:31:9:31:9 | SSA phi(b) |
+| main.go:27:2:27:13 | SSA def(a) |
+| main.go:27:2:27:13 | SSA def(b) |
+| main.go:28:2:30:2 | SSA phi(a) |
+| main.go:28:2:30:2 | SSA phi(b) |
+| main.go:29:3:29:13 | SSA def(a) |
+| main.go:29:3:29:13 | SSA def(b) |
 | main.go:34:11:34:11 | SSA def(x) |
-| main.go:39:2:39:2 | SSA def(x) |
-| main.go:40:2:40:4 | SSA def(ptr) |
-| main.go:48:2:48:7 | SSA def(result) |
-| main.go:52:14:52:19 | SSA def(result) |
-| main.go:57:6:57:6 | SSA def(x) |
-| main.go:58:6:58:9 | SSA phi(x) |
-| main.go:59:3:59:3 | SSA def(x) |
-| main.go:63:2:63:2 | SSA def(y) |
-| main.go:64:6:64:6 | SSA def(i) |
+| main.go:39:2:39:8 | SSA def(x) |
+| main.go:40:2:40:10 | SSA def(ptr) |
+| main.go:48:2:48:12 | SSA def(result) |
+| main.go:52:26:54:1 | SSA def(result) |
+| main.go:57:6:57:10 | SSA def(x) |
+| main.go:58:6:58:11 | SSA phi(x) |
+| main.go:59:3:59:7 | SSA def(x) |
+| main.go:63:2:63:7 | SSA def(y) |
+| main.go:64:6:64:11 | SSA def(i) |
 | main.go:64:16:64:18 | SSA def(i) |
-| main.go:65:6:65:9 | SSA phi(i) |
-| main.go:65:6:65:9 | SSA phi(y) |
-| main.go:68:3:68:3 | SSA def(y) |
-| main.go:73:6:73:6 | SSA def(i) |
+| main.go:64:20:69:2 | SSA phi(i) |
+| main.go:64:20:69:2 | SSA phi(y) |
+| main.go:68:3:68:7 | SSA def(y) |
+| main.go:73:6:73:11 | SSA def(i) |
 | main.go:73:16:73:18 | SSA def(i) |
-| main.go:74:3:74:3 | SSA def(z) |
-| main.go:74:3:74:3 | SSA phi(i) |
-| main.go:82:25:82:25 | SSA def(b) |
-| main.go:83:2:83:2 | SSA def(x) |
-| main.go:84:5:84:5 | SSA def(a) |
+| main.go:73:20:78:2 | SSA phi(i) |
+| main.go:74:3:74:7 | SSA def(z) |
+| main.go:82:36:86:1 | SSA def(b) |
+| main.go:83:2:83:8 | SSA def(x) |
+| main.go:84:2:84:15 | SSA def(a) |
 | main.go:95:22:95:28 | SSA def(wrapper) |
-| main.go:96:2:96:2 | SSA def(x) |
+| main.go:96:2:96:7 | SSA def(x) |
 | main.go:97:2:99:3 | SSA def(x) |
-| main.go:98:3:98:3 | SSA def(x) |
+| main.go:98:3:98:7 | SSA def(x) |
 | main.go:103:20:103:26 | SSA def(wrapper) |
-| main.go:104:2:104:2 | SSA def(x) |
+| main.go:104:2:104:7 | SSA def(x) |
 | main.go:105:16:108:2 | SSA def(x) |
-| main.go:106:3:106:3 | SSA def(y) |
+| main.go:106:3:106:8 | SSA def(y) |
 | main.go:112:29:112:35 | SSA def(wrapper) |
-| main.go:113:2:113:2 | SSA def(x) |
+| main.go:113:2:113:7 | SSA def(x) |
 | main.go:114:2:117:3 | SSA def(x) |
 | main.go:114:16:117:2 | SSA def(x) |
-| main.go:115:3:115:3 | SSA def(y) |
-| main.go:116:3:116:3 | SSA def(x) |
-| main.go:130:3:130:3 | SSA def(p) |
-| main.go:132:3:132:3 | SSA def(p) |
-| main.go:135:2:135:2 | SSA phi(p) |
+| main.go:115:3:115:12 | SSA def(y) |
+| main.go:116:3:116:7 | SSA def(x) |
+| main.go:129:2:133:2 | SSA phi(p) |
+| main.go:130:3:130:24 | SSA def(p) |
+| main.go:132:3:132:24 | SSA def(p) |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/SSA/SsaWithFields.expected b/go/ql/test/library-tests/semmle/go/dataflow/SSA/SsaWithFields.expected
index 2c43f05257aa..f00640593538 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/SSA/SsaWithFields.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/SSA/SsaWithFields.expected
@@ -1,58 +1,58 @@
-| main.go:13:6:13:6 | (SSA def(x)) | x |
-| main.go:14:2:14:2 | (SSA def(y)) | y |
-| main.go:17:3:17:3 | (SSA def(y)) | y |
-| main.go:19:2:19:10 | (SSA phi(y)) | y |
-| main.go:21:3:21:3 | (SSA def(x)) | x |
-| main.go:23:2:23:10 | (SSA phi(x)) | x |
+| main.go:13:6:13:10 | (SSA def(x)) | x |
+| main.go:14:2:14:8 | (SSA def(y)) | y |
+| main.go:16:2:18:2 | (SSA phi(y)) | y |
+| main.go:17:3:17:9 | (SSA def(y)) | y |
+| main.go:20:2:22:2 | (SSA phi(x)) | x |
+| main.go:21:3:21:7 | (SSA def(x)) | x |
 | main.go:26:10:26:10 | (SSA def(x)) | x |
-| main.go:27:2:27:2 | (SSA def(a)) | a |
-| main.go:27:5:27:5 | (SSA def(b)) | b |
-| main.go:29:3:29:3 | (SSA def(a)) | a |
-| main.go:29:6:29:6 | (SSA def(b)) | b |
-| main.go:31:9:31:9 | (SSA phi(a)) | a |
-| main.go:31:9:31:9 | (SSA phi(b)) | b |
+| main.go:27:2:27:13 | (SSA def(a)) | a |
+| main.go:27:2:27:13 | (SSA def(b)) | b |
+| main.go:28:2:30:2 | (SSA phi(a)) | a |
+| main.go:28:2:30:2 | (SSA phi(b)) | b |
+| main.go:29:3:29:13 | (SSA def(a)) | a |
+| main.go:29:3:29:13 | (SSA def(b)) | b |
 | main.go:34:11:34:11 | (SSA def(x)) | x |
-| main.go:39:2:39:2 | (SSA def(x)) | x |
-| main.go:40:2:40:4 | (SSA def(ptr)) | ptr |
-| main.go:48:2:48:7 | (SSA def(result)) | result |
-| main.go:52:14:52:19 | (SSA def(result)) | result |
-| main.go:57:6:57:6 | (SSA def(x)) | x |
-| main.go:58:6:58:9 | (SSA phi(x)) | x |
-| main.go:59:3:59:3 | (SSA def(x)) | x |
-| main.go:63:2:63:2 | (SSA def(y)) | y |
-| main.go:64:6:64:6 | (SSA def(i)) | i |
+| main.go:39:2:39:8 | (SSA def(x)) | x |
+| main.go:40:2:40:10 | (SSA def(ptr)) | ptr |
+| main.go:48:2:48:12 | (SSA def(result)) | result |
+| main.go:52:26:54:1 | (SSA def(result)) | result |
+| main.go:57:6:57:10 | (SSA def(x)) | x |
+| main.go:58:6:58:11 | (SSA phi(x)) | x |
+| main.go:59:3:59:7 | (SSA def(x)) | x |
+| main.go:63:2:63:7 | (SSA def(y)) | y |
+| main.go:64:6:64:11 | (SSA def(i)) | i |
 | main.go:64:16:64:18 | (SSA def(i)) | i |
-| main.go:65:6:65:9 | (SSA phi(i)) | i |
-| main.go:65:6:65:9 | (SSA phi(y)) | y |
-| main.go:68:3:68:3 | (SSA def(y)) | y |
-| main.go:73:6:73:6 | (SSA def(i)) | i |
+| main.go:64:20:69:2 | (SSA phi(i)) | i |
+| main.go:64:20:69:2 | (SSA phi(y)) | y |
+| main.go:68:3:68:7 | (SSA def(y)) | y |
+| main.go:73:6:73:11 | (SSA def(i)) | i |
 | main.go:73:16:73:18 | (SSA def(i)) | i |
-| main.go:74:3:74:3 | (SSA def(z)) | z |
-| main.go:74:3:74:3 | (SSA phi(i)) | i |
-| main.go:82:25:82:25 | (SSA def(b)) | b |
-| main.go:83:2:83:2 | (SSA def(x)) | x |
-| main.go:84:5:84:5 | (SSA def(a)) | a |
+| main.go:73:20:78:2 | (SSA phi(i)) | i |
+| main.go:74:3:74:7 | (SSA def(z)) | z |
+| main.go:82:36:86:1 | (SSA def(b)) | b |
+| main.go:83:2:83:8 | (SSA def(x)) | x |
+| main.go:84:2:84:15 | (SSA def(a)) | a |
 | main.go:95:22:95:28 | (SSA def(wrapper)) | wrapper |
 | main.go:95:22:95:28 | (SSA def(wrapper)).s | wrapper.s |
-| main.go:96:2:96:2 | (SSA def(x)) | x |
+| main.go:96:2:96:7 | (SSA def(x)) | x |
 | main.go:97:2:99:3 | (SSA def(x)) | x |
-| main.go:98:3:98:3 | (SSA def(x)) | x |
+| main.go:98:3:98:7 | (SSA def(x)) | x |
 | main.go:103:20:103:26 | (SSA def(wrapper)) | wrapper |
 | main.go:103:20:103:26 | (SSA def(wrapper)).s | wrapper.s |
-| main.go:104:2:104:2 | (SSA def(x)) | x |
+| main.go:104:2:104:7 | (SSA def(x)) | x |
 | main.go:105:16:108:2 | (SSA def(x)) | x |
-| main.go:106:3:106:3 | (SSA def(y)) | y |
+| main.go:106:3:106:8 | (SSA def(y)) | y |
 | main.go:112:29:112:35 | (SSA def(wrapper)) | wrapper |
 | main.go:112:29:112:35 | (SSA def(wrapper)).s | wrapper.s |
-| main.go:113:2:113:2 | (SSA def(x)) | x |
+| main.go:113:2:113:7 | (SSA def(x)) | x |
 | main.go:114:2:117:3 | (SSA def(x)) | x |
 | main.go:114:16:117:2 | (SSA def(x)) | x |
-| main.go:115:3:115:3 | (SSA def(y)) | y |
-| main.go:116:3:116:3 | (SSA def(x)) | x |
-| main.go:130:3:130:3 | (SSA def(p)) | p |
-| main.go:132:3:132:3 | (SSA def(p)) | p |
-| main.go:135:2:135:2 | (SSA phi(p)) | p |
-| main.go:135:2:135:2 | (SSA phi(p)).a | p.a |
-| main.go:135:2:135:2 | (SSA phi(p)).b | p.b |
-| main.go:135:2:135:2 | (SSA phi(p)).b.a | p.b.a |
-| main.go:135:2:135:2 | (SSA phi(p)).c | p.c |
+| main.go:115:3:115:12 | (SSA def(y)) | y |
+| main.go:116:3:116:7 | (SSA def(x)) | x |
+| main.go:129:2:133:2 | (SSA phi(p)) | p |
+| main.go:129:2:133:2 | (SSA phi(p)).a | p.a |
+| main.go:129:2:133:2 | (SSA phi(p)).b | p.b |
+| main.go:129:2:133:2 | (SSA phi(p)).b.a | p.b.a |
+| main.go:129:2:133:2 | (SSA phi(p)).c | p.c |
+| main.go:130:3:130:24 | (SSA def(p)) | p |
+| main.go:132:3:132:24 | (SSA def(p)) | p |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/SSA/VarDefs.expected b/go/ql/test/library-tests/semmle/go/dataflow/SSA/VarDefs.expected
index 6149ddfbb54a..01085718157d 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/SSA/VarDefs.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/SSA/VarDefs.expected
@@ -1,54 +1,54 @@
-| main.go:13:6:13:6 | assignment to x | main.go:13:6:13:6 | x | main.go:13:6:13:6 | zero value for x |
-| main.go:14:2:14:2 | assignment to y | main.go:14:2:14:2 | y | main.go:14:7:14:8 | 23 |
-| main.go:17:3:17:3 | assignment to y | main.go:14:2:14:2 | y | main.go:17:3:17:9 | ... += ... |
-| main.go:21:3:21:3 | assignment to x | main.go:13:6:13:6 | x | main.go:21:7:21:7 | y |
-| main.go:26:10:26:10 | initialization of x | main.go:26:10:26:10 | x | main.go:26:10:26:10 | argument corresponding to x |
-| main.go:27:2:27:2 | assignment to a | main.go:27:2:27:2 | a | main.go:27:10:27:10 | x |
-| main.go:27:5:27:5 | assignment to b | main.go:27:5:27:5 | b | main.go:27:13:27:13 | 0 |
-| main.go:29:3:29:3 | assignment to a | main.go:27:2:27:2 | a | main.go:29:10:29:10 | b |
-| main.go:29:6:29:6 | assignment to b | main.go:27:5:27:5 | b | main.go:29:13:29:13 | a |
-| main.go:34:11:34:11 | initialization of x | main.go:34:11:34:11 | x | main.go:34:11:34:11 | argument corresponding to x |
-| main.go:39:2:39:2 | assignment to x | main.go:39:2:39:2 | x | main.go:39:7:39:8 | 23 |
-| main.go:40:2:40:4 | assignment to ptr | main.go:40:2:40:4 | ptr | main.go:40:9:40:10 | &... |
-| main.go:47:13:47:18 | initialization of result | main.go:47:13:47:18 | result | main.go:47:13:47:18 | zero value for result |
-| main.go:48:2:48:7 | assignment to result | main.go:47:13:47:18 | result | main.go:48:11:48:12 | 42 |
-| main.go:52:14:52:19 | initialization of result | main.go:52:14:52:19 | result | main.go:52:14:52:19 | zero value for result |
-| main.go:57:6:57:6 | assignment to x | main.go:57:6:57:6 | x | main.go:57:6:57:6 | zero value for x |
-| main.go:59:3:59:3 | assignment to x | main.go:57:6:57:6 | x | main.go:59:7:59:7 | 2 |
-| main.go:63:2:63:2 | assignment to y | main.go:63:2:63:2 | y | main.go:63:7:63:7 | 1 |
-| main.go:64:6:64:6 | assignment to i | main.go:64:6:64:6 | i | main.go:64:11:64:11 | 0 |
-| main.go:64:16:64:18 | increment statement | main.go:64:6:64:6 | i | main.go:64:16:64:18 | rhs of increment statement |
-| main.go:68:3:68:3 | assignment to y | main.go:63:2:63:2 | y | main.go:68:7:68:7 | 2 |
-| main.go:72:2:72:2 | assignment to z | main.go:72:2:72:2 | z | main.go:72:7:72:7 | 1 |
-| main.go:73:6:73:6 | assignment to i | main.go:73:6:73:6 | i | main.go:73:11:73:11 | 0 |
-| main.go:73:16:73:18 | increment statement | main.go:73:6:73:6 | i | main.go:73:16:73:18 | rhs of increment statement |
-| main.go:74:3:74:3 | assignment to z | main.go:72:2:72:2 | z | main.go:74:7:74:7 | 2 |
-| main.go:82:18:82:18 | initialization of a | main.go:82:18:82:18 | a | main.go:82:18:82:18 | zero value for a |
-| main.go:82:25:82:25 | initialization of b | main.go:82:25:82:25 | b | main.go:82:25:82:25 | zero value for b |
-| main.go:83:2:83:2 | assignment to x | main.go:83:2:83:2 | x | main.go:83:7:83:8 | 23 |
-| main.go:84:2:84:2 | assignment to x | main.go:83:2:83:2 | x | main.go:84:9:84:12 | ...+... |
-| main.go:84:5:84:5 | assignment to a | main.go:82:18:82:18 | a | main.go:84:15:84:15 | x |
-| main.go:93:15:93:16 | initialization of cb | main.go:93:15:93:16 | cb | main.go:93:15:93:16 | argument corresponding to cb |
-| main.go:95:22:95:28 | initialization of wrapper | main.go:95:22:95:28 | wrapper | main.go:95:22:95:28 | argument corresponding to wrapper |
-| main.go:96:2:96:2 | assignment to x | main.go:96:2:96:2 | x | main.go:96:7:96:7 | 0 |
-| main.go:98:3:98:3 | assignment to x | main.go:96:2:96:2 | x | main.go:98:7:98:7 | 1 |
-| main.go:103:20:103:26 | initialization of wrapper | main.go:103:20:103:26 | wrapper | main.go:103:20:103:26 | argument corresponding to wrapper |
-| main.go:104:2:104:2 | assignment to x | main.go:104:2:104:2 | x | main.go:104:7:104:7 | 0 |
-| main.go:106:3:106:3 | assignment to y | main.go:106:3:106:3 | y | main.go:106:8:106:8 | x |
-| main.go:112:29:112:35 | initialization of wrapper | main.go:112:29:112:35 | wrapper | main.go:112:29:112:35 | argument corresponding to wrapper |
-| main.go:113:2:113:2 | assignment to x | main.go:113:2:113:2 | x | main.go:113:7:113:7 | 0 |
-| main.go:115:3:115:3 | assignment to y | main.go:115:3:115:3 | y | main.go:115:8:115:12 | ...+... |
-| main.go:116:3:116:3 | assignment to x | main.go:113:2:113:2 | x | main.go:116:7:116:7 | y |
-| main.go:128:6:128:6 | assignment to p | main.go:128:6:128:6 | p | main.go:128:6:128:6 | zero value for p |
-| main.go:130:3:130:3 | assignment to p | main.go:128:6:128:6 | p | main.go:130:7:130:24 | struct literal |
-| main.go:130:9:130:9 | init of 2 | main.go:122:2:122:2 | a | main.go:130:9:130:9 | 2 |
-| main.go:130:12:130:18 | init of struct literal | main.go:123:2:123:2 | b | main.go:130:12:130:18 | struct literal |
-| main.go:130:14:130:14 | init of 1 | main.go:89:2:89:2 | a | main.go:130:14:130:14 | 1 |
-| main.go:130:17:130:17 | init of 5 | main.go:90:2:90:2 | b | main.go:130:17:130:17 | 5 |
-| main.go:130:21:130:23 | init of 'n' | main.go:124:2:124:2 | c | main.go:130:21:130:23 | 'n' |
-| main.go:132:3:132:3 | assignment to p | main.go:128:6:128:6 | p | main.go:132:7:132:24 | struct literal |
-| main.go:132:9:132:9 | init of 3 | main.go:122:2:122:2 | a | main.go:132:9:132:9 | 3 |
-| main.go:132:12:132:18 | init of struct literal | main.go:123:2:123:2 | b | main.go:132:12:132:18 | struct literal |
-| main.go:132:14:132:14 | init of 4 | main.go:89:2:89:2 | a | main.go:132:14:132:14 | 4 |
-| main.go:132:17:132:17 | init of 5 | main.go:90:2:90:2 | b | main.go:132:17:132:17 | 5 |
-| main.go:132:21:132:23 | init of '2' | main.go:124:2:124:2 | c | main.go:132:21:132:23 | '2' |
+| main.go:13:6:13:10 | zero-init:0 value declaration specifier | main.go:13:6:13:6 | x | main.go:13:6:13:10 | zero-init:0 value declaration specifier |
+| main.go:14:2:14:8 | assign:0 ... := ... | main.go:14:2:14:2 | y | main.go:14:7:14:8 | 23 |
+| main.go:17:3:17:9 | ... += ... | main.go:14:2:14:2 | y | main.go:17:3:17:9 | ... += ... |
+| main.go:21:3:21:7 | assign:0 ... = ... | main.go:13:6:13:6 | x | main.go:21:7:21:7 | y |
+| main.go:26:10:26:10 | x | main.go:26:10:26:10 | x | main.go:26:10:26:10 | x |
+| main.go:27:2:27:13 | assign:0 ... := ... | main.go:27:2:27:2 | a | main.go:27:10:27:10 | x |
+| main.go:27:2:27:13 | assign:1 ... := ... | main.go:27:5:27:5 | b | main.go:27:13:27:13 | 0 |
+| main.go:29:3:29:13 | assign:0 ... = ... | main.go:27:2:27:2 | a | main.go:29:10:29:10 | b |
+| main.go:29:3:29:13 | assign:1 ... = ... | main.go:27:5:27:5 | b | main.go:29:13:29:13 | a |
+| main.go:34:11:34:11 | x | main.go:34:11:34:11 | x | main.go:34:11:34:11 | x |
+| main.go:39:2:39:8 | assign:0 ... := ... | main.go:39:2:39:2 | x | main.go:39:7:39:8 | 23 |
+| main.go:40:2:40:10 | assign:0 ... := ... | main.go:40:2:40:4 | ptr | main.go:40:9:40:10 | &... |
+| main.go:47:25:50:1 | zero-init:0 block statement | main.go:47:13:47:18 | result | main.go:47:25:50:1 | zero-init:0 block statement |
+| main.go:48:2:48:12 | assign:0 ... = ... | main.go:47:13:47:18 | result | main.go:48:11:48:12 | 42 |
+| main.go:52:26:54:1 | zero-init:0 block statement | main.go:52:14:52:19 | result | main.go:52:26:54:1 | zero-init:0 block statement |
+| main.go:57:6:57:10 | zero-init:0 value declaration specifier | main.go:57:6:57:6 | x | main.go:57:6:57:10 | zero-init:0 value declaration specifier |
+| main.go:59:3:59:7 | assign:0 ... = ... | main.go:57:6:57:6 | x | main.go:59:7:59:7 | 2 |
+| main.go:63:2:63:7 | assign:0 ... := ... | main.go:63:2:63:2 | y | main.go:63:7:63:7 | 1 |
+| main.go:64:6:64:11 | assign:0 ... := ... | main.go:64:6:64:6 | i | main.go:64:11:64:11 | 0 |
+| main.go:64:16:64:18 | increment statement | main.go:64:6:64:6 | i | main.go:64:16:64:18 | increment statement |
+| main.go:68:3:68:7 | assign:0 ... = ... | main.go:63:2:63:2 | y | main.go:68:7:68:7 | 2 |
+| main.go:72:2:72:7 | assign:0 ... := ... | main.go:72:2:72:2 | z | main.go:72:7:72:7 | 1 |
+| main.go:73:6:73:11 | assign:0 ... := ... | main.go:73:6:73:6 | i | main.go:73:11:73:11 | 0 |
+| main.go:73:16:73:18 | increment statement | main.go:73:6:73:6 | i | main.go:73:16:73:18 | increment statement |
+| main.go:74:3:74:7 | assign:0 ... = ... | main.go:72:2:72:2 | z | main.go:74:7:74:7 | 2 |
+| main.go:82:36:86:1 | zero-init:0 block statement | main.go:82:18:82:18 | a | main.go:82:36:86:1 | zero-init:0 block statement |
+| main.go:82:36:86:1 | zero-init:1 block statement | main.go:82:25:82:25 | b | main.go:82:36:86:1 | zero-init:1 block statement |
+| main.go:83:2:83:8 | assign:0 ... := ... | main.go:83:2:83:2 | x | main.go:83:7:83:8 | 23 |
+| main.go:84:2:84:15 | assign:0 ... = ... | main.go:83:2:83:2 | x | main.go:84:9:84:12 | ...+... |
+| main.go:84:2:84:15 | assign:1 ... = ... | main.go:82:18:82:18 | a | main.go:84:15:84:15 | x |
+| main.go:93:15:93:16 | cb | main.go:93:15:93:16 | cb | main.go:93:15:93:16 | cb |
+| main.go:95:22:95:28 | wrapper | main.go:95:22:95:28 | wrapper | main.go:95:22:95:28 | wrapper |
+| main.go:96:2:96:7 | assign:0 ... := ... | main.go:96:2:96:2 | x | main.go:96:7:96:7 | 0 |
+| main.go:98:3:98:7 | assign:0 ... = ... | main.go:96:2:96:2 | x | main.go:98:7:98:7 | 1 |
+| main.go:103:20:103:26 | wrapper | main.go:103:20:103:26 | wrapper | main.go:103:20:103:26 | wrapper |
+| main.go:104:2:104:7 | assign:0 ... := ... | main.go:104:2:104:2 | x | main.go:104:7:104:7 | 0 |
+| main.go:106:3:106:8 | assign:0 ... := ... | main.go:106:3:106:3 | y | main.go:106:8:106:8 | x |
+| main.go:112:29:112:35 | wrapper | main.go:112:29:112:35 | wrapper | main.go:112:29:112:35 | wrapper |
+| main.go:113:2:113:7 | assign:0 ... := ... | main.go:113:2:113:2 | x | main.go:113:7:113:7 | 0 |
+| main.go:115:3:115:12 | assign:0 ... := ... | main.go:115:3:115:3 | y | main.go:115:8:115:12 | ...+... |
+| main.go:116:3:116:7 | assign:0 ... = ... | main.go:113:2:113:2 | x | main.go:116:7:116:7 | y |
+| main.go:128:6:128:8 | zero-init:0 value declaration specifier | main.go:128:6:128:6 | p | main.go:128:6:128:8 | zero-init:0 value declaration specifier |
+| main.go:130:3:130:24 | assign:0 ... = ... | main.go:128:6:128:6 | p | main.go:130:7:130:24 | struct literal |
+| main.go:130:9:130:9 | lit-init 2 | main.go:122:2:122:2 | a | main.go:130:9:130:9 | 2 |
+| main.go:130:12:130:18 | lit-init struct literal | main.go:123:2:123:2 | b | main.go:130:12:130:18 | struct literal |
+| main.go:130:14:130:14 | lit-init 1 | main.go:89:2:89:2 | a | main.go:130:14:130:14 | 1 |
+| main.go:130:17:130:17 | lit-init 5 | main.go:90:2:90:2 | b | main.go:130:17:130:17 | 5 |
+| main.go:130:21:130:23 | lit-init 'n' | main.go:124:2:124:2 | c | main.go:130:21:130:23 | 'n' |
+| main.go:132:3:132:24 | assign:0 ... = ... | main.go:128:6:128:6 | p | main.go:132:7:132:24 | struct literal |
+| main.go:132:9:132:9 | lit-init 3 | main.go:122:2:122:2 | a | main.go:132:9:132:9 | 3 |
+| main.go:132:12:132:18 | lit-init struct literal | main.go:123:2:123:2 | b | main.go:132:12:132:18 | struct literal |
+| main.go:132:14:132:14 | lit-init 4 | main.go:89:2:89:2 | a | main.go:132:14:132:14 | 4 |
+| main.go:132:17:132:17 | lit-init 5 | main.go:90:2:90:2 | b | main.go:132:17:132:17 | 5 |
+| main.go:132:21:132:23 | lit-init '2' | main.go:124:2:124:2 | c | main.go:132:21:132:23 | '2' |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/SSA/VarUses.expected b/go/ql/test/library-tests/semmle/go/dataflow/SSA/VarUses.expected
index 2e6b3c855c36..5a37307af191 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/SSA/VarUses.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/SSA/VarUses.expected
@@ -15,15 +15,15 @@
 | main.go:40:10:40:10 | x | main.go:39:2:39:2 | x |
 | main.go:42:8:42:10 | ptr | main.go:40:2:40:4 | ptr |
 | main.go:44:12:44:12 | x | main.go:39:2:39:2 | x |
-| main.go:47:13:47:18 | implicit read of result | main.go:47:13:47:18 | result |
-| main.go:52:14:52:19 | implicit read of result | main.go:52:14:52:19 | result |
+| main.go:47:25:50:1 | result-read:0 block statement | main.go:47:13:47:18 | result |
+| main.go:52:26:54:1 | result-read:0 block statement | main.go:52:14:52:19 | result |
 | main.go:61:12:61:12 | x | main.go:57:6:57:6 | x |
 | main.go:64:16:64:16 | i | main.go:64:6:64:6 | i |
 | main.go:70:12:70:12 | y | main.go:63:2:63:2 | y |
 | main.go:73:16:73:16 | i | main.go:73:6:73:6 | i |
 | main.go:79:12:79:12 | z | main.go:72:2:72:2 | z |
-| main.go:82:18:82:18 | implicit read of a | main.go:82:18:82:18 | a |
-| main.go:82:25:82:25 | implicit read of b | main.go:82:25:82:25 | b |
+| main.go:82:36:86:1 | result-read:0 block statement | main.go:82:18:82:18 | a |
+| main.go:82:36:86:1 | result-read:1 block statement | main.go:82:25:82:25 | b |
 | main.go:84:9:84:9 | x | main.go:83:2:83:2 | x |
 | main.go:84:15:84:15 | x | main.go:83:2:83:2 | x |
 | main.go:97:2:97:8 | wrapper | main.go:95:22:95:28 | wrapper |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/SliceExpressions/CONSISTENCY/CfgConsistency.expected b/go/ql/test/library-tests/semmle/go/dataflow/SliceExpressions/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/CONSISTENCY/DataFlowConsistency.expected
index b1b3608ee058..0a79232575c2 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ThreatModels/CONSISTENCY/DataFlowConsistency.expected
@@ -1,2 +1,2 @@
 reverseRead
-| test.go:32:11:32:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| test.go:32:11:32:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/VarArgs/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/dataflow/VarArgs/CONSISTENCY/DataFlowConsistency.expected
deleted file mode 100644
index 95848ba942a8..000000000000
--- a/go/ql/test/library-tests/semmle/go/dataflow/VarArgs/CONSISTENCY/DataFlowConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-reverseRead
-| main.go:23:3:23:5 | out | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/CONSISTENCY/CfgConsistency.expected b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/CONSISTENCY/CfgConsistency.expected b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/CONSISTENCY/CfgConsistency.expected b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Afero/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/Afero/CONSISTENCY/DataFlowConsistency.expected
index daba79d62f03..40a0dda55e33 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Afero/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Afero/CONSISTENCY/DataFlowConsistency.expected
@@ -1,2 +1,2 @@
 reverseRead
-| test.go:19:14:19:20 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| test.go:19:14:19:20 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/Beego/CONSISTENCY/DataFlowConsistency.expected
index 42b10a988b50..fe63cabf552a 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/CONSISTENCY/DataFlowConsistency.expected
@@ -1,16 +1,16 @@
 reverseRead
-| test.go:142:3:142:9 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:143:3:143:9 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:143:23:143:29 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:208:18:208:20 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:208:18:208:28 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| test.go:142:3:142:9 | implicit-deref context | Origin of readStep is missing a PostUpdateNode. |
+| test.go:143:3:143:9 | implicit-deref context | Origin of readStep is missing a PostUpdateNode. |
+| test.go:143:23:143:29 | implicit-deref context | Origin of readStep is missing a PostUpdateNode. |
+| test.go:208:18:208:20 | implicit-deref ctx | Origin of readStep is missing a PostUpdateNode. |
+| test.go:208:18:208:28 | implicit-deref selection of Request | Origin of readStep is missing a PostUpdateNode. |
 | test.go:229:21:229:25 | files | Origin of readStep is missing a PostUpdateNode. |
-| test.go:259:2:259:2 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:270:37:270:37 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| test.go:259:2:259:2 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| test.go:270:37:270:37 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
 | test.go:283:44:283:48 | files | Origin of readStep is missing a PostUpdateNode. |
 | test.go:297:51:297:62 | genericFiles | Origin of readStep is missing a PostUpdateNode. |
 | test.go:298:54:298:62 | untainted | Origin of readStep is missing a PostUpdateNode. |
-| test.go:317:13:317:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:318:20:318:22 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:324:17:324:19 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:324:17:324:25 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| test.go:317:13:317:15 | implicit-deref ctx | Origin of readStep is missing a PostUpdateNode. |
+| test.go:318:20:318:22 | implicit-deref ctx | Origin of readStep is missing a PostUpdateNode. |
+| test.go:324:17:324:19 | implicit-deref ctx | Origin of readStep is missing a PostUpdateNode. |
+| test.go:324:17:324:25 | implicit-deref selection of Input | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected
index be8ae2ec2fa4..f88de8721b0b 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected
@@ -24,9 +24,9 @@
 | test.go:204:14:204:55 | type conversion | test.go:199:15:199:26 | call to Data | test.go:204:14:204:55 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:199:15:199:26 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:205:14:205:59 | type conversion | test.go:199:15:199:26 | call to Data | test.go:205:14:205:59 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:199:15:199:26 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:209:14:209:28 | type conversion | test.go:208:18:208:33 | selection of Form | test.go:209:14:209:28 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:208:18:208:33 | selection of Form | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:224:14:224:32 | type conversion | test.go:223:2:223:34 | ... := ...[1] | test.go:224:14:224:32 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:223:2:223:34 | ... := ...[1] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:226:14:226:20 | content | test.go:223:2:223:34 | ... := ...[0] | test.go:226:14:226:20 | content | Cross-site scripting vulnerability due to $@. | test.go:223:2:223:34 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:229:14:229:38 | type conversion | test.go:228:2:228:40 | ... := ...[0] | test.go:229:14:229:38 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:228:2:228:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:224:14:224:32 | type conversion | test.go:223:2:223:34 | extract:1 ... := ... | test.go:224:14:224:32 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:223:2:223:34 | extract:1 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:226:14:226:20 | content | test.go:223:2:223:34 | extract:0 ... := ... | test.go:226:14:226:20 | content | Cross-site scripting vulnerability due to $@. | test.go:223:2:223:34 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:229:14:229:38 | type conversion | test.go:228:2:228:40 | extract:0 ... := ... | test.go:229:14:229:38 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:228:2:228:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:232:14:232:22 | type conversion | test.go:231:7:231:28 | call to GetString | test.go:232:14:232:22 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:231:7:231:28 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:235:14:235:26 | type conversion | test.go:234:8:234:35 | call to GetStrings | test.go:235:14:235:26 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:234:8:234:35 | call to GetStrings | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:238:14:238:27 | type conversion | test.go:237:9:237:17 | call to Input | test.go:238:14:238:27 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:237:9:237:17 | call to Input | user-provided value | test.go:0:0:0:0 | test.go |  |
@@ -36,20 +36,20 @@
 | test.go:264:16:264:37 | call to GetCookie | test.go:264:16:264:37 | call to GetCookie | test.go:264:16:264:37 | call to GetCookie | Cross-site scripting vulnerability due to $@. | test.go:264:16:264:37 | call to GetCookie | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:265:15:265:41 | call to GetCookie | test.go:265:15:265:41 | call to GetCookie | test.go:265:15:265:41 | call to GetCookie | Cross-site scripting vulnerability due to $@. | test.go:265:15:265:41 | call to GetCookie | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:270:55:270:84 | type conversion | test.go:270:62:270:83 | call to GetCookie | test.go:270:55:270:84 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:270:62:270:83 | call to GetCookie | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:283:21:283:61 | call to GetDisplayString | test.go:275:2:275:40 | ... := ...[0] | test.go:283:21:283:61 | call to GetDisplayString | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:284:21:284:92 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:284:21:284:92 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:285:21:285:96 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:285:21:285:96 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:290:3:292:80 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:290:3:292:80 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:293:21:293:101 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:293:21:293:101 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:294:21:294:101 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:294:21:294:101 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:295:21:295:97 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:295:21:295:97 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:296:21:296:97 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:296:21:296:97 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:297:21:297:102 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:297:21:297:102 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:298:21:298:102 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:298:21:298:102 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:299:21:299:82 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:299:21:299:82 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:301:21:301:133 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:301:21:301:133 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:302:21:302:88 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:302:21:302:88 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:303:21:303:87 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:303:21:303:87 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:283:21:283:61 | call to GetDisplayString | test.go:275:2:275:40 | extract:0 ... := ... | test.go:283:21:283:61 | call to GetDisplayString | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:284:21:284:92 | selection of Filename | test.go:275:2:275:40 | extract:0 ... := ... | test.go:284:21:284:92 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:285:21:285:96 | selection of Filename | test.go:275:2:275:40 | extract:0 ... := ... | test.go:285:21:285:96 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:290:3:292:80 | selection of Filename | test.go:275:2:275:40 | extract:0 ... := ... | test.go:290:3:292:80 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:293:21:293:101 | selection of Filename | test.go:275:2:275:40 | extract:0 ... := ... | test.go:293:21:293:101 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:294:21:294:101 | selection of Filename | test.go:275:2:275:40 | extract:0 ... := ... | test.go:294:21:294:101 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:295:21:295:97 | selection of Filename | test.go:275:2:275:40 | extract:0 ... := ... | test.go:295:21:295:97 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:296:21:296:97 | selection of Filename | test.go:275:2:275:40 | extract:0 ... := ... | test.go:296:21:296:97 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:297:21:297:102 | selection of Filename | test.go:275:2:275:40 | extract:0 ... := ... | test.go:297:21:297:102 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:298:21:298:102 | selection of Filename | test.go:275:2:275:40 | extract:0 ... := ... | test.go:298:21:298:102 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:299:21:299:82 | selection of Filename | test.go:275:2:275:40 | extract:0 ... := ... | test.go:299:21:299:82 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:301:21:301:133 | selection of Filename | test.go:275:2:275:40 | extract:0 ... := ... | test.go:301:21:301:133 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:302:21:302:88 | selection of Filename | test.go:275:2:275:40 | extract:0 ... := ... | test.go:302:21:302:88 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:303:21:303:87 | selection of Filename | test.go:275:2:275:40 | extract:0 ... := ... | test.go:303:21:303:87 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:311:21:311:48 | type assertion | test.go:309:15:309:36 | call to GetString | test.go:311:21:311:48 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:309:15:309:36 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:312:21:312:52 | type assertion | test.go:309:15:309:36 | call to GetString | test.go:312:21:312:52 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:309:15:309:36 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
 edges
@@ -81,19 +81,19 @@ edges
 | test.go:200:36:200:53 | type assertion | test.go:200:21:200:54 | call to HTML2str | provenance | MaD:35 |
 | test.go:201:21:201:57 | call to Htmlunquote | test.go:201:14:201:58 | type conversion | provenance |  |
 | test.go:201:39:201:56 | type assertion | test.go:201:21:201:57 | call to Htmlunquote | provenance | MaD:36 |
-| test.go:202:2:202:68 | ... := ...[0] | test.go:203:14:203:28 | type assertion | provenance |  |
-| test.go:202:28:202:56 | type assertion | test.go:202:2:202:68 | ... := ...[0] | provenance | MaD:37 |
+| test.go:202:2:202:68 | extract:0 ... := ... | test.go:203:14:203:28 | type assertion | provenance |  |
+| test.go:202:28:202:56 | type assertion | test.go:202:2:202:68 | extract:0 ... := ... | provenance | MaD:37 |
 | test.go:204:21:204:54 | call to Str2html | test.go:204:14:204:55 | type conversion | provenance |  |
 | test.go:204:36:204:53 | type assertion | test.go:204:21:204:54 | call to Str2html | provenance | MaD:39 |
 | test.go:205:21:205:58 | call to Substr | test.go:205:14:205:59 | type conversion | provenance |  |
 | test.go:205:34:205:51 | type assertion | test.go:205:21:205:58 | call to Substr | provenance | MaD:40 |
 | test.go:208:18:208:33 | selection of Form | test.go:208:36:208:36 | s [postupdate] | provenance | Src:MaD:21 MaD:38 |
 | test.go:208:36:208:36 | s [postupdate] | test.go:209:14:209:28 | type conversion | provenance |  |
-| test.go:223:2:223:34 | ... := ...[0] | test.go:225:31:225:31 | f | provenance | Src:MaD:15  |
-| test.go:223:2:223:34 | ... := ...[1] | test.go:224:14:224:32 | type conversion | provenance | Src:MaD:15  |
-| test.go:225:2:225:32 | ... := ...[0] | test.go:226:14:226:20 | content | provenance |  |
-| test.go:225:31:225:31 | f | test.go:225:2:225:32 | ... := ...[0] | provenance | MaD:41 |
-| test.go:228:2:228:40 | ... := ...[0] | test.go:229:14:229:38 | type conversion | provenance | Src:MaD:16  |
+| test.go:223:2:223:34 | extract:0 ... := ... | test.go:225:31:225:31 | f | provenance | Src:MaD:15  |
+| test.go:223:2:223:34 | extract:1 ... := ... | test.go:224:14:224:32 | type conversion | provenance | Src:MaD:15  |
+| test.go:225:2:225:32 | extract:0 ... := ... | test.go:226:14:226:20 | content | provenance |  |
+| test.go:225:31:225:31 | f | test.go:225:2:225:32 | extract:0 ... := ... | provenance | MaD:41 |
+| test.go:228:2:228:40 | extract:0 ... := ... | test.go:229:14:229:38 | type conversion | provenance | Src:MaD:16  |
 | test.go:231:7:231:28 | call to GetString | test.go:232:14:232:22 | type conversion | provenance | Src:MaD:17  |
 | test.go:234:8:234:35 | call to GetStrings | test.go:235:14:235:26 | type conversion | provenance | Src:MaD:18  |
 | test.go:237:9:237:17 | call to Input | test.go:238:14:238:27 | type conversion | provenance | Src:MaD:19  |
@@ -101,21 +101,21 @@ edges
 | test.go:246:15:246:36 | call to GetString | test.go:249:21:249:29 | untrusted | provenance | Src:MaD:17  |
 | test.go:259:23:259:44 | call to GetCookie | test.go:259:16:259:45 | type conversion | provenance | Src:MaD:14  |
 | test.go:270:62:270:83 | call to GetCookie | test.go:270:55:270:84 | type conversion | provenance | Src:MaD:14  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:278:21:278:28 | index expression | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:283:44:283:60 | selection of Filename | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:284:38:284:49 | genericFiles | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:285:37:285:48 | genericFiles | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:291:4:291:15 | genericFiles | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:293:42:293:53 | genericFiles | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:294:53:294:64 | genericFiles | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:295:38:295:49 | genericFiles | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:296:49:296:60 | genericFiles | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:297:51:297:65 | index expression | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:298:36:298:47 | genericFiles | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:299:37:299:48 | genericFiles | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:301:39:301:50 | genericFiles | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:302:40:302:51 | genericFiles | provenance | Src:MaD:16  |
-| test.go:275:2:275:40 | ... := ...[0] | test.go:303:39:303:50 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:278:21:278:28 | index expression | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:283:44:283:60 | selection of Filename | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:284:38:284:49 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:285:37:285:48 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:291:4:291:15 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:293:42:293:53 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:294:53:294:64 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:295:38:295:49 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:296:49:296:60 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:297:51:297:65 | index expression | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:298:36:298:47 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:299:37:299:48 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:301:39:301:50 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:302:40:302:51 | genericFiles | provenance | Src:MaD:16  |
+| test.go:275:2:275:40 | extract:0 ... := ... | test.go:303:39:303:50 | genericFiles | provenance | Src:MaD:16  |
 | test.go:278:3:278:14 | genericFiles [postupdate] [array] | test.go:297:51:297:62 | genericFiles [array] | provenance |  |
 | test.go:278:21:278:28 | index expression | test.go:278:3:278:14 | genericFiles [postupdate] [array] | provenance |  |
 | test.go:283:44:283:60 | selection of Filename | test.go:283:21:283:61 | call to GetDisplayString | provenance | FunctionModel |
@@ -240,7 +240,7 @@ nodes
 | test.go:201:14:201:58 | type conversion | semmle.label | type conversion |
 | test.go:201:21:201:57 | call to Htmlunquote | semmle.label | call to Htmlunquote |
 | test.go:201:39:201:56 | type assertion | semmle.label | type assertion |
-| test.go:202:2:202:68 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:202:2:202:68 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:202:28:202:56 | type assertion | semmle.label | type assertion |
 | test.go:203:14:203:28 | type assertion | semmle.label | type assertion |
 | test.go:204:14:204:55 | type conversion | semmle.label | type conversion |
@@ -252,13 +252,13 @@ nodes
 | test.go:208:18:208:33 | selection of Form | semmle.label | selection of Form |
 | test.go:208:36:208:36 | s [postupdate] | semmle.label | s [postupdate] |
 | test.go:209:14:209:28 | type conversion | semmle.label | type conversion |
-| test.go:223:2:223:34 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:223:2:223:34 | ... := ...[1] | semmle.label | ... := ...[1] |
+| test.go:223:2:223:34 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
+| test.go:223:2:223:34 | extract:1 ... := ... | semmle.label | extract:1 ... := ... |
 | test.go:224:14:224:32 | type conversion | semmle.label | type conversion |
-| test.go:225:2:225:32 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:225:2:225:32 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:225:31:225:31 | f | semmle.label | f |
 | test.go:226:14:226:20 | content | semmle.label | content |
-| test.go:228:2:228:40 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:228:2:228:40 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:229:14:229:38 | type conversion | semmle.label | type conversion |
 | test.go:231:7:231:28 | call to GetString | semmle.label | call to GetString |
 | test.go:232:14:232:22 | type conversion | semmle.label | type conversion |
@@ -276,7 +276,7 @@ nodes
 | test.go:265:15:265:41 | call to GetCookie | semmle.label | call to GetCookie |
 | test.go:270:55:270:84 | type conversion | semmle.label | type conversion |
 | test.go:270:62:270:83 | call to GetCookie | semmle.label | call to GetCookie |
-| test.go:275:2:275:40 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:275:2:275:40 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:278:3:278:14 | genericFiles [postupdate] [array] | semmle.label | genericFiles [postupdate] [array] |
 | test.go:278:21:278:28 | index expression | semmle.label | index expression |
 | test.go:283:21:283:61 | call to GetDisplayString | semmle.label | call to GetDisplayString |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Chi/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/Chi/CONSISTENCY/DataFlowConsistency.expected
index e87bbb9cdee9..4bd409e41d29 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Chi/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Chi/CONSISTENCY/DataFlowConsistency.expected
@@ -1,2 +1,2 @@
 reverseRead
-| test.go:13:12:13:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| test.go:13:12:13:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/Echo/CONSISTENCY/DataFlowConsistency.expected
index 1765ea137674..01ec84e742c6 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/CONSISTENCY/DataFlowConsistency.expected
@@ -1,4 +1,4 @@
 reverseRead
 | test.go:89:16:89:22 | cookies | Origin of readStep is missing a PostUpdateNode. |
-| test.go:193:10:193:22 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| test.go:193:10:193:22 | implicit-deref call to Request | Origin of readStep is missing a PostUpdateNode. |
 | test.go:216:20:216:26 | cookies | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected
index 4e885d284d48..c13bbc39ec8a 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected
@@ -5,11 +5,11 @@
 | test.go:34:16:34:20 | param | test.go:33:11:33:27 | call to QueryParams | test.go:34:16:34:20 | param | Cross-site scripting vulnerability due to $@. | test.go:33:11:33:27 | call to QueryParams | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:40:16:40:19 | qstr | test.go:39:10:39:26 | call to QueryString | test.go:40:16:40:19 | qstr | Cross-site scripting vulnerability due to $@. | test.go:39:10:39:26 | call to QueryString | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:46:16:46:18 | val | test.go:45:9:45:34 | call to FormValue | test.go:46:16:46:18 | val | Cross-site scripting vulnerability due to $@. | test.go:45:9:45:34 | call to FormValue | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:52:16:52:37 | index expression | test.go:51:2:51:30 | ... := ...[0] | test.go:52:16:52:37 | index expression | Cross-site scripting vulnerability due to $@. | test.go:51:2:51:30 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:61:20:61:25 | buffer | test.go:57:2:57:46 | ... := ...[0] | test.go:61:20:61:25 | buffer | Cross-site scripting vulnerability due to $@. | test.go:57:2:57:46 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:67:16:67:41 | index expression | test.go:66:2:66:31 | ... := ...[0] | test.go:67:16:67:41 | index expression | Cross-site scripting vulnerability due to $@. | test.go:66:2:66:31 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:77:20:77:25 | buffer | test.go:72:2:72:31 | ... := ...[0] | test.go:77:20:77:25 | buffer | Cross-site scripting vulnerability due to $@. | test.go:72:2:72:31 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:83:16:83:24 | selection of Value | test.go:82:2:82:32 | ... := ...[0] | test.go:83:16:83:24 | selection of Value | Cross-site scripting vulnerability due to $@. | test.go:82:2:82:32 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:52:16:52:37 | index expression | test.go:51:2:51:30 | extract:0 ... := ... | test.go:52:16:52:37 | index expression | Cross-site scripting vulnerability due to $@. | test.go:51:2:51:30 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:61:20:61:25 | buffer | test.go:57:2:57:46 | extract:0 ... := ... | test.go:61:20:61:25 | buffer | Cross-site scripting vulnerability due to $@. | test.go:57:2:57:46 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:67:16:67:41 | index expression | test.go:66:2:66:31 | extract:0 ... := ... | test.go:67:16:67:41 | index expression | Cross-site scripting vulnerability due to $@. | test.go:66:2:66:31 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:77:20:77:25 | buffer | test.go:72:2:72:31 | extract:0 ... := ... | test.go:77:20:77:25 | buffer | Cross-site scripting vulnerability due to $@. | test.go:72:2:72:31 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:83:16:83:24 | selection of Value | test.go:82:2:82:32 | extract:0 ... := ... | test.go:83:16:83:24 | selection of Value | Cross-site scripting vulnerability due to $@. | test.go:82:2:82:32 | extract:0 ... := ... | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:89:16:89:31 | selection of Value | test.go:88:13:88:25 | call to Cookies | test.go:89:16:89:31 | selection of Value | Cross-site scripting vulnerability due to $@. | test.go:88:13:88:25 | call to Cookies | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:100:16:100:21 | selection of s | test.go:99:11:99:15 | &... [postupdate] | test.go:100:16:100:21 | selection of s | Cross-site scripting vulnerability due to $@. | test.go:99:11:99:15 | &... [postupdate] | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:114:16:114:42 | type assertion | test.go:113:21:113:42 | call to Param | test.go:114:16:114:42 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:113:21:113:42 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
@@ -25,23 +25,23 @@ edges
 | test.go:33:11:33:27 | call to QueryParams | test.go:34:16:34:20 | param | provenance | Src:MaD:11  |
 | test.go:39:10:39:26 | call to QueryString | test.go:40:16:40:19 | qstr | provenance | Src:MaD:12  |
 | test.go:45:9:45:34 | call to FormValue | test.go:46:16:46:18 | val | provenance | Src:MaD:6  |
-| test.go:51:2:51:30 | ... := ...[0] | test.go:52:16:52:37 | index expression | provenance | Src:MaD:5  |
-| test.go:57:2:57:46 | ... := ...[0] | test.go:58:13:58:22 | fileHeader | provenance | Src:MaD:4  |
-| test.go:58:2:58:29 | ... := ...[0] | test.go:60:2:60:5 | file | provenance |  |
-| test.go:58:13:58:22 | fileHeader | test.go:58:2:58:29 | ... := ...[0] | provenance | MaD:17 |
+| test.go:51:2:51:30 | extract:0 ... := ... | test.go:52:16:52:37 | index expression | provenance | Src:MaD:5  |
+| test.go:57:2:57:46 | extract:0 ... := ... | test.go:58:13:58:22 | fileHeader | provenance | Src:MaD:4  |
+| test.go:58:2:58:29 | extract:0 ... := ... | test.go:60:2:60:5 | file | provenance |  |
+| test.go:58:13:58:22 | fileHeader | test.go:58:2:58:29 | extract:0 ... := ... | provenance | MaD:17 |
 | test.go:60:2:60:5 | file | test.go:60:12:60:17 | buffer [postupdate] | provenance | MaD:15 |
 | test.go:60:2:60:5 | file | test.go:60:12:60:17 | buffer [postupdate] | provenance | MaD:16 |
 | test.go:60:2:60:5 | file | test.go:60:12:60:17 | buffer [postupdate] | provenance | MaD:18 |
 | test.go:60:12:60:17 | buffer [postupdate] | test.go:61:20:61:25 | buffer | provenance |  |
-| test.go:66:2:66:31 | ... := ...[0] | test.go:67:16:67:41 | index expression | provenance | Src:MaD:7  |
-| test.go:72:2:72:31 | ... := ...[0] | test.go:74:13:74:22 | fileHeader | provenance | Src:MaD:7  |
-| test.go:74:2:74:29 | ... := ...[0] | test.go:76:2:76:5 | file | provenance |  |
-| test.go:74:13:74:22 | fileHeader | test.go:74:2:74:29 | ... := ...[0] | provenance | MaD:17 |
+| test.go:66:2:66:31 | extract:0 ... := ... | test.go:67:16:67:41 | index expression | provenance | Src:MaD:7  |
+| test.go:72:2:72:31 | extract:0 ... := ... | test.go:74:13:74:22 | fileHeader | provenance | Src:MaD:7  |
+| test.go:74:2:74:29 | extract:0 ... := ... | test.go:76:2:76:5 | file | provenance |  |
+| test.go:74:13:74:22 | fileHeader | test.go:74:2:74:29 | extract:0 ... := ... | provenance | MaD:17 |
 | test.go:76:2:76:5 | file | test.go:76:12:76:17 | buffer [postupdate] | provenance | MaD:15 |
 | test.go:76:2:76:5 | file | test.go:76:12:76:17 | buffer [postupdate] | provenance | MaD:16 |
 | test.go:76:2:76:5 | file | test.go:76:12:76:17 | buffer [postupdate] | provenance | MaD:18 |
 | test.go:76:12:76:17 | buffer [postupdate] | test.go:77:20:77:25 | buffer | provenance |  |
-| test.go:82:2:82:32 | ... := ...[0] | test.go:83:16:83:24 | selection of Value | provenance | Src:MaD:2  |
+| test.go:82:2:82:32 | extract:0 ... := ... | test.go:83:16:83:24 | selection of Value | provenance | Src:MaD:2  |
 | test.go:88:13:88:25 | call to Cookies | test.go:89:16:89:31 | selection of Value | provenance | Src:MaD:3  |
 | test.go:99:11:99:15 | &... [postupdate] | test.go:100:16:100:21 | selection of s | provenance | Src:MaD:1  |
 | test.go:113:2:113:4 | ctx [postupdate] | test.go:114:16:114:18 | ctx | provenance |  |
@@ -88,23 +88,23 @@ nodes
 | test.go:40:16:40:19 | qstr | semmle.label | qstr |
 | test.go:45:9:45:34 | call to FormValue | semmle.label | call to FormValue |
 | test.go:46:16:46:18 | val | semmle.label | val |
-| test.go:51:2:51:30 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:51:2:51:30 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:52:16:52:37 | index expression | semmle.label | index expression |
-| test.go:57:2:57:46 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:58:2:58:29 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:57:2:57:46 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
+| test.go:58:2:58:29 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:58:13:58:22 | fileHeader | semmle.label | fileHeader |
 | test.go:60:2:60:5 | file | semmle.label | file |
 | test.go:60:12:60:17 | buffer [postupdate] | semmle.label | buffer [postupdate] |
 | test.go:61:20:61:25 | buffer | semmle.label | buffer |
-| test.go:66:2:66:31 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:66:2:66:31 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:67:16:67:41 | index expression | semmle.label | index expression |
-| test.go:72:2:72:31 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:74:2:74:29 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:72:2:72:31 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
+| test.go:74:2:74:29 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:74:13:74:22 | fileHeader | semmle.label | fileHeader |
 | test.go:76:2:76:5 | file | semmle.label | file |
 | test.go:76:12:76:17 | buffer [postupdate] | semmle.label | buffer [postupdate] |
 | test.go:77:20:77:25 | buffer | semmle.label | buffer |
-| test.go:82:2:82:32 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:82:2:82:32 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:83:16:83:24 | selection of Value | semmle.label | selection of Value |
 | test.go:88:13:88:25 | call to Cookies | semmle.label | call to Cookies |
 | test.go:89:16:89:31 | selection of Value | semmle.label | selection of Value |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/CONSISTENCY/DataFlowConsistency.expected
index b57f285e1425..ce16ef565303 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/CONSISTENCY/DataFlowConsistency.expected
@@ -1,22 +1,22 @@
 reverseRead
 | fasthttp.go:75:28:75:35 | lbclient | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:102:7:102:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:162:3:162:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:163:3:163:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:164:3:164:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:165:15:165:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:166:15:166:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:167:15:167:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:168:15:168:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:170:3:170:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:172:3:172:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:173:3:173:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:174:3:174:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:175:3:175:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:183:3:183:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:184:3:184:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:185:16:185:25 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:194:3:194:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:195:3:195:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:196:3:196:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| fasthttp.go:197:3:197:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:102:7:102:16 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:162:3:162:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:163:3:163:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:164:3:164:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:165:15:165:24 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:166:15:166:24 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:167:15:167:24 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:168:15:168:24 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:170:3:170:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:172:3:172:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:173:3:173:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:174:3:174:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:175:3:175:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:183:3:183:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:184:3:184:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:185:16:185:25 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:194:3:194:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:195:3:195:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:196:3:196:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
+| fasthttp.go:197:3:197:12 | implicit-deref requestCtx | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/RemoteFlowSources.expected b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/RemoteFlowSources.expected
index e69de29bb2d1..3ff8fb45938f 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/RemoteFlowSources.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/RemoteFlowSources.expected
@@ -0,0 +1,8 @@
+| fasthttp.go:165:3:165:45 | extract:0 ... := ... | Unexpected result: RemoteFlowSource="extract:0 ... := ..." |
+| fasthttp.go:165:53:165:89 | comment | Missing result: RemoteFlowSource="... := ...[0]" |
+| fasthttp.go:166:3:166:46 | extract:0 ... := ... | Unexpected result: RemoteFlowSource="extract:0 ... := ..." |
+| fasthttp.go:166:53:166:89 | comment | Missing result: RemoteFlowSource="... := ...[0]" |
+| fasthttp.go:167:3:167:47 | extract:0 ... := ... | Unexpected result: RemoteFlowSource="extract:0 ... := ..." |
+| fasthttp.go:167:53:167:89 | comment | Missing result: RemoteFlowSource="... := ...[0]" |
+| fasthttp.go:168:3:168:51 | extract:0 ... := ... | Unexpected result: RemoteFlowSource="extract:0 ... := ..." |
+| fasthttp.go:168:53:168:89 | comment | Missing result: RemoteFlowSource="... := ...[0]" |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gin/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/Gin/CONSISTENCY/DataFlowConsistency.expected
index d430ebd33f51..a3358c49ec11 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Gin/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gin/CONSISTENCY/DataFlowConsistency.expected
@@ -1,5 +1,5 @@
 reverseRead
-| Gin.go:26:18:26:18 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Gin.go:26:28:26:28 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Gin.go:158:10:158:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Gin.go:162:13:162:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| Gin.go:26:18:26:18 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Gin.go:26:28:26:28 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Gin.go:158:10:158:12 | implicit-deref ctx | Origin of readStep is missing a PostUpdateNode. |
+| Gin.go:162:13:162:15 | implicit-deref ctx | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected b/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected
index 071bf34cd7e0..46239a3c3394 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected
@@ -7,18 +7,18 @@
 | Gin.go:58:10:58:25 | call to Param |
 | Gin.go:62:10:62:34 | call to GetStringSlice |
 | Gin.go:66:10:66:29 | call to GetString |
-| Gin.go:70:3:70:28 | ... := ...[0] |
+| Gin.go:70:3:70:28 | extract:0 ... := ... |
 | Gin.go:74:10:74:23 | call to ClientIP |
 | Gin.go:78:10:78:26 | call to ContentType |
-| Gin.go:82:3:82:29 | ... := ...[0] |
-| Gin.go:86:3:86:36 | ... := ...[0] |
-| Gin.go:90:3:90:31 | ... := ...[0] |
-| Gin.go:94:3:94:39 | ... := ...[0] |
-| Gin.go:98:3:98:34 | ... := ...[0] |
+| Gin.go:82:3:82:29 | extract:0 ... := ... |
+| Gin.go:86:3:86:36 | extract:0 ... := ... |
+| Gin.go:90:3:90:31 | extract:0 ... := ... |
+| Gin.go:94:3:94:39 | extract:0 ... := ... |
+| Gin.go:98:3:98:34 | extract:0 ... := ... |
 | Gin.go:102:10:102:52 | call to DefaultPostForm |
 | Gin.go:106:10:106:49 | call to DefaultQuery |
-| Gin.go:110:3:110:37 | ... := ...[0] |
-| Gin.go:114:3:114:34 | ... := ...[0] |
+| Gin.go:110:3:110:37 | extract:0 ... := ... |
+| Gin.go:114:3:114:34 | extract:0 ... := ... |
 | Gin.go:118:10:118:32 | call to GetStringMap |
 | Gin.go:122:10:122:38 | call to GetStringMapString |
 | Gin.go:126:10:126:43 | call to GetStringMapStringSlice |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/CONSISTENCY/DataFlowConsistency.expected
index 0bbe91ae77ed..d3172f5635cb 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/CONSISTENCY/DataFlowConsistency.expected
@@ -3,12 +3,12 @@ reverseRead
 | proto/Hello.pb.go:47:9:47:39 | file_proto_Hello_proto_msgTypes | Origin of readStep is missing a PostUpdateNode. |
 | proto/Hello.pb.go:81:10:81:40 | file_proto_Hello_proto_msgTypes | Origin of readStep is missing a PostUpdateNode. |
 | proto/Hello.pb.go:94:9:94:39 | file_proto_Hello_proto_msgTypes | Origin of readStep is missing a PostUpdateNode. |
-| proto/Hello.pb.go:169:13:169:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| proto/Hello.pb.go:171:13:171:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| proto/Hello.pb.go:173:13:173:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| proto/Hello.pb.go:181:13:181:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| proto/Hello.pb.go:183:13:183:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| proto/Hello.pb.go:185:13:185:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| proto/Hello.pb.micro.go:55:9:55:9 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| proto/Hello.pb.micro.go:57:9:57:9 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| proto/Hello.pb.micro.go:86:9:86:9 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| proto/Hello.pb.go:169:13:169:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| proto/Hello.pb.go:171:13:171:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| proto/Hello.pb.go:173:13:173:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| proto/Hello.pb.go:181:13:181:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| proto/Hello.pb.go:183:13:183:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| proto/Hello.pb.go:185:13:185:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| proto/Hello.pb.micro.go:55:9:55:9 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| proto/Hello.pb.micro.go:57:9:57:9 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| proto/Hello.pb.micro.go:86:9:86:9 | implicit-deref h | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected b/go/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected
index 0af67462f7c2..b17e65d31ec7 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected
@@ -6,18 +6,18 @@ models
 | 5 | Source: github.com/emicklei/go-restful; Request; true; ReadEntity; ; ; Argument[0]; remote; manual |
 edges
 | gorestful.go:15:15:15:44 | call to QueryParameters | gorestful.go:15:15:15:47 | index expression | provenance | Src:MaD:4 Sink:MaD:1 |
-| gorestful.go:17:2:17:39 | ... := ...[0] | gorestful.go:18:15:18:17 | val | provenance | Src:MaD:2 Sink:MaD:1 |
+| gorestful.go:17:2:17:39 | extract:0 ... := ... | gorestful.go:18:15:18:17 | val | provenance | Src:MaD:2 Sink:MaD:1 |
 | gorestful.go:21:15:21:38 | call to PathParameters | gorestful.go:21:15:21:45 | index expression | provenance | Src:MaD:3 Sink:MaD:1 |
 | gorestful.go:23:21:23:24 | &... [postupdate] | gorestful.go:24:15:24:21 | selection of cmd | provenance | Src:MaD:5 Sink:MaD:1 |
 | gorestful_v2.go:15:15:15:44 | call to QueryParameters | gorestful_v2.go:15:15:15:47 | index expression | provenance | Src:MaD:4 Sink:MaD:1 |
-| gorestful_v2.go:17:2:17:39 | ... := ...[0] | gorestful_v2.go:18:15:18:17 | val | provenance | Src:MaD:2 Sink:MaD:1 |
+| gorestful_v2.go:17:2:17:39 | extract:0 ... := ... | gorestful_v2.go:18:15:18:17 | val | provenance | Src:MaD:2 Sink:MaD:1 |
 | gorestful_v2.go:21:15:21:38 | call to PathParameters | gorestful_v2.go:21:15:21:45 | index expression | provenance | Src:MaD:3 Sink:MaD:1 |
 | gorestful_v2.go:23:21:23:24 | &... [postupdate] | gorestful_v2.go:24:15:24:21 | selection of cmd | provenance | Src:MaD:5 Sink:MaD:1 |
 nodes
 | gorestful.go:15:15:15:44 | call to QueryParameters | semmle.label | call to QueryParameters |
 | gorestful.go:15:15:15:47 | index expression | semmle.label | index expression |
 | gorestful.go:16:15:16:43 | call to QueryParameter | semmle.label | call to QueryParameter |
-| gorestful.go:17:2:17:39 | ... := ...[0] | semmle.label | ... := ...[0] |
+| gorestful.go:17:2:17:39 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | gorestful.go:18:15:18:17 | val | semmle.label | val |
 | gorestful.go:19:15:19:44 | call to HeaderParameter | semmle.label | call to HeaderParameter |
 | gorestful.go:20:15:20:42 | call to PathParameter | semmle.label | call to PathParameter |
@@ -28,7 +28,7 @@ nodes
 | gorestful_v2.go:15:15:15:44 | call to QueryParameters | semmle.label | call to QueryParameters |
 | gorestful_v2.go:15:15:15:47 | index expression | semmle.label | index expression |
 | gorestful_v2.go:16:15:16:43 | call to QueryParameter | semmle.label | call to QueryParameter |
-| gorestful_v2.go:17:2:17:39 | ... := ...[0] | semmle.label | ... := ...[0] |
+| gorestful_v2.go:17:2:17:39 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | gorestful_v2.go:18:15:18:17 | val | semmle.label | val |
 | gorestful_v2.go:19:15:19:44 | call to HeaderParameter | semmle.label | call to HeaderParameter |
 | gorestful_v2.go:20:15:20:42 | call to PathParameter | semmle.label | call to PathParameter |
@@ -41,14 +41,14 @@ invalidModelRow
 #select
 | gorestful.go:15:15:15:47 | index expression | gorestful.go:15:15:15:44 | call to QueryParameters | gorestful.go:15:15:15:47 | index expression | This command depends on $@. | gorestful.go:15:15:15:44 | call to QueryParameters | a user-provided value |
 | gorestful.go:16:15:16:43 | call to QueryParameter | gorestful.go:16:15:16:43 | call to QueryParameter | gorestful.go:16:15:16:43 | call to QueryParameter | This command depends on $@. | gorestful.go:16:15:16:43 | call to QueryParameter | a user-provided value |
-| gorestful.go:18:15:18:17 | val | gorestful.go:17:2:17:39 | ... := ...[0] | gorestful.go:18:15:18:17 | val | This command depends on $@. | gorestful.go:17:2:17:39 | ... := ...[0] | a user-provided value |
+| gorestful.go:18:15:18:17 | val | gorestful.go:17:2:17:39 | extract:0 ... := ... | gorestful.go:18:15:18:17 | val | This command depends on $@. | gorestful.go:17:2:17:39 | extract:0 ... := ... | a user-provided value |
 | gorestful.go:19:15:19:44 | call to HeaderParameter | gorestful.go:19:15:19:44 | call to HeaderParameter | gorestful.go:19:15:19:44 | call to HeaderParameter | This command depends on $@. | gorestful.go:19:15:19:44 | call to HeaderParameter | a user-provided value |
 | gorestful.go:20:15:20:42 | call to PathParameter | gorestful.go:20:15:20:42 | call to PathParameter | gorestful.go:20:15:20:42 | call to PathParameter | This command depends on $@. | gorestful.go:20:15:20:42 | call to PathParameter | a user-provided value |
 | gorestful.go:21:15:21:45 | index expression | gorestful.go:21:15:21:38 | call to PathParameters | gorestful.go:21:15:21:45 | index expression | This command depends on $@. | gorestful.go:21:15:21:38 | call to PathParameters | a user-provided value |
 | gorestful.go:24:15:24:21 | selection of cmd | gorestful.go:23:21:23:24 | &... [postupdate] | gorestful.go:24:15:24:21 | selection of cmd | This command depends on $@. | gorestful.go:23:21:23:24 | &... [postupdate] | a user-provided value |
 | gorestful_v2.go:15:15:15:47 | index expression | gorestful_v2.go:15:15:15:44 | call to QueryParameters | gorestful_v2.go:15:15:15:47 | index expression | This command depends on $@. | gorestful_v2.go:15:15:15:44 | call to QueryParameters | a user-provided value |
 | gorestful_v2.go:16:15:16:43 | call to QueryParameter | gorestful_v2.go:16:15:16:43 | call to QueryParameter | gorestful_v2.go:16:15:16:43 | call to QueryParameter | This command depends on $@. | gorestful_v2.go:16:15:16:43 | call to QueryParameter | a user-provided value |
-| gorestful_v2.go:18:15:18:17 | val | gorestful_v2.go:17:2:17:39 | ... := ...[0] | gorestful_v2.go:18:15:18:17 | val | This command depends on $@. | gorestful_v2.go:17:2:17:39 | ... := ...[0] | a user-provided value |
+| gorestful_v2.go:18:15:18:17 | val | gorestful_v2.go:17:2:17:39 | extract:0 ... := ... | gorestful_v2.go:18:15:18:17 | val | This command depends on $@. | gorestful_v2.go:17:2:17:39 | extract:0 ... := ... | a user-provided value |
 | gorestful_v2.go:19:15:19:44 | call to HeaderParameter | gorestful_v2.go:19:15:19:44 | call to HeaderParameter | gorestful_v2.go:19:15:19:44 | call to HeaderParameter | This command depends on $@. | gorestful_v2.go:19:15:19:44 | call to HeaderParameter | a user-provided value |
 | gorestful_v2.go:20:15:20:42 | call to PathParameter | gorestful_v2.go:20:15:20:42 | call to PathParameter | gorestful_v2.go:20:15:20:42 | call to PathParameter | This command depends on $@. | gorestful_v2.go:20:15:20:42 | call to PathParameter | a user-provided value |
 | gorestful_v2.go:21:15:21:45 | index expression | gorestful_v2.go:21:15:21:38 | call to PathParameters | gorestful_v2.go:21:15:21:45 | index expression | This command depends on $@. | gorestful_v2.go:21:15:21:38 | call to PathParameters | a user-provided value |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Protobuf/CONSISTENCY/CfgConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/Protobuf/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Protobuf/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/Protobuf/CONSISTENCY/DataFlowConsistency.expected
index b69ab06bee15..91e28a8114e8 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Protobuf/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Protobuf/CONSISTENCY/DataFlowConsistency.expected
@@ -7,26 +7,26 @@ reverseRead
 | protos/query/query.pb.go:169:9:169:33 | file_query_proto_msgTypes | Origin of readStep is missing a PostUpdateNode. |
 | protos/query/query.pb.go:204:10:204:34 | file_query_proto_msgTypes | Origin of readStep is missing a PostUpdateNode. |
 | protos/query/query.pb.go:217:9:217:33 | file_query_proto_msgTypes | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:318:13:318:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:320:13:320:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:322:13:322:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:330:13:330:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:332:13:332:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:334:13:334:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:342:13:342:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:344:13:344:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:346:13:346:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| testDeprecatedApi.go:74:24:74:28 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| testDeprecatedApi.go:85:24:85:28 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:318:13:318:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:320:13:320:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:322:13:322:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:330:13:330:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:332:13:332:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:334:13:334:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:342:13:342:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:344:13:344:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:346:13:346:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| testDeprecatedApi.go:74:24:74:28 | implicit-deref query | Origin of readStep is missing a PostUpdateNode. |
+| testDeprecatedApi.go:85:24:85:28 | implicit-deref query | Origin of readStep is missing a PostUpdateNode. |
 | testDeprecatedApi.go:98:13:98:24 | selection of Alerts | Origin of readStep is missing a PostUpdateNode. |
-| testDeprecatedApi.go:124:12:124:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| testDeprecatedApi.go:167:12:167:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| testDeprecatedApi.go:124:12:124:16 | implicit-deref query | Origin of readStep is missing a PostUpdateNode. |
+| testDeprecatedApi.go:167:12:167:16 | implicit-deref query | Origin of readStep is missing a PostUpdateNode. |
 | testDeprecatedApi.go:176:24:176:28 | query | Origin of readStep is missing a PostUpdateNode. |
 | testModernApi.go:94:12:94:21 | serialized | Origin of readStep is missing a PostUpdateNode. |
-| testModernApi.go:102:24:102:28 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| testModernApi.go:113:24:113:28 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| testModernApi.go:102:24:102:28 | implicit-deref query | Origin of readStep is missing a PostUpdateNode. |
+| testModernApi.go:113:24:113:28 | implicit-deref query | Origin of readStep is missing a PostUpdateNode. |
 | testModernApi.go:126:13:126:24 | selection of Alerts | Origin of readStep is missing a PostUpdateNode. |
-| testModernApi.go:162:12:162:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| testModernApi.go:162:12:162:16 | implicit-deref query | Origin of readStep is missing a PostUpdateNode. |
 | testModernApi.go:186:12:186:21 | serialized | Origin of readStep is missing a PostUpdateNode. |
-| testModernApi.go:224:12:224:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| testModernApi.go:224:12:224:16 | implicit-deref query | Origin of readStep is missing a PostUpdateNode. |
 | testModernApi.go:233:24:233:28 | query | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Revel/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/Revel/CONSISTENCY/DataFlowConsistency.expected
index 999379f92981..c6c4611752d8 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/CONSISTENCY/DataFlowConsistency.expected
@@ -1,114 +1,114 @@
 reverseRead
-| EndToEnd.go:31:35:31:35 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:31:35:31:42 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:37:18:37:18 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:37:18:37:25 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:45:18:45:18 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:45:18:45:25 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:52:20:52:20 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:52:20:52:27 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:59:18:59:18 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:59:18:59:25 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:65:26:65:26 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:65:26:65:33 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:70:22:70:22 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:70:22:70:29 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:75:22:75:22 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:75:22:75:29 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:80:35:80:35 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:80:35:80:42 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:85:22:85:22 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:85:22:85:29 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:90:21:90:21 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:90:21:90:28 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:95:20:95:20 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| EndToEnd.go:95:20:95:27 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:26:7:26:7 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:27:7:27:7 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:27:7:27:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:30:2:30:2 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:33:7:33:7 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:37:7:37:7 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:37:7:37:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:38:24:38:24 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:42:7:42:7 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:43:24:43:24 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:47:7:47:7 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:51:7:51:7 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:52:7:52:7 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:56:7:56:7 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:31:35:31:42 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:31:35:31:42 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:37:18:37:25 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:37:18:37:25 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:45:18:45:25 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:45:18:45:25 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:52:20:52:27 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:52:20:52:27 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:59:18:59:25 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:59:18:59:25 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:65:26:65:33 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:65:26:65:33 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:70:22:70:29 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:70:22:70:29 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:75:22:75:29 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:75:22:75:29 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:80:35:80:42 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:80:35:80:42 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:85:22:85:29 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:85:22:85:29 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:90:21:90:28 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:90:21:90:28 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:95:20:95:27 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| EndToEnd.go:95:20:95:27 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:26:7:26:14 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:27:7:27:14 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:27:7:27:14 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:30:2:30:9 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:33:7:33:15 | implicit-field:1 selection of Request | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:37:7:37:14 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:37:7:37:14 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:38:24:38:32 | implicit-field:1 selection of Request | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:42:7:42:14 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:43:24:43:32 | implicit-field:1 selection of Request | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:47:7:47:14 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:51:7:51:14 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:52:7:52:15 | implicit-field:1 selection of Request | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:56:7:56:14 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
 | Revel.go:56:7:56:27 | index expression | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:60:7:60:7 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:60:7:60:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:63:2:63:2 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:70:22:70:22 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:75:7:75:7 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:76:7:76:7 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:77:7:77:7 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:77:7:77:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:78:7:78:7 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:79:7:79:7 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:80:7:80:7 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:82:13:82:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:85:13:85:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:88:13:88:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:60:7:60:14 | implicit-deref selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:60:7:60:14 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:63:2:63:9 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:70:22:70:29 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:75:7:75:7 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:76:7:76:7 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:77:7:77:7 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:77:7:77:15 | implicit-deref selection of Request | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:78:7:78:7 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:79:7:79:7 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:80:7:80:7 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:82:13:82:13 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:85:13:85:13 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:88:13:88:13 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
 | Revel.go:89:7:89:28 | index expression | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:91:7:91:7 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:91:7:91:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:91:7:91:7 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:91:7:91:15 | implicit-deref selection of Request | Origin of readStep is missing a PostUpdateNode. |
 | Revel.go:91:7:91:41 | index expression | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:93:28:93:28 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:96:15:96:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:99:7:99:7 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:101:7:101:7 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:103:15:103:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:109:7:109:7 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:111:7:111:7 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:116:2:116:2 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:116:2:116:10 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:120:2:120:2 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:120:2:120:10 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:125:13:125:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:125:13:125:21 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:128:14:128:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:128:14:128:22 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| Revel.go:133:13:133:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/app.go:34:2:34:2 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/app.go:47:2:47:2 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/app.go:56:2:56:2 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/app.go:57:2:57:2 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/app.go:59:16:59:16 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/app.go:61:5:61:5 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/app.go:62:3:62:3 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/app.go:68:2:68:2 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/app.go:79:5:79:5 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/app.go:81:5:81:5 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/app.go:83:4:83:4 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/app.go:89:2:89:2 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/app.go:95:10:95:10 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:44:3:44:3 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:51:2:51:2 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:143:26:143:26 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:144:2:144:2 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:146:2:146:2 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:148:5:148:5 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:149:3:149:3 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:153:2:153:2 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:166:19:166:19 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:168:5:168:5 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:168:33:168:33 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:169:3:169:3 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:174:5:174:5 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:175:3:175:3 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:93:28:93:28 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:96:15:96:15 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:99:7:99:7 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:101:7:101:7 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:103:15:103:15 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:109:7:109:7 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:111:7:111:7 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:116:2:116:2 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:116:2:116:10 | implicit-deref selection of Request | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:120:2:120:2 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:120:2:120:10 | implicit-deref selection of Request | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:125:13:125:13 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:125:13:125:21 | implicit-deref selection of Request | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:128:14:128:14 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:128:14:128:22 | implicit-deref selection of Request | Origin of readStep is missing a PostUpdateNode. |
+| Revel.go:133:13:133:13 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/app.go:34:2:34:10 | implicit-field:1 selection of Session | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/app.go:47:2:47:8 | implicit-field:1 selection of Flash | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/app.go:56:2:56:13 | implicit-field:1 selection of Validation | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/app.go:57:2:57:13 | implicit-field:1 selection of Validation | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/app.go:59:16:59:27 | implicit-field:1 selection of Validation | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/app.go:61:5:61:16 | implicit-field:1 selection of Validation | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/app.go:62:3:62:14 | implicit-field:1 selection of Validation | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/app.go:68:2:68:8 | implicit-field:1 selection of Flash | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/app.go:79:5:79:13 | implicit-field:1 selection of Session | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/app.go:81:5:81:13 | implicit-field:1 selection of Session | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/app.go:83:4:83:10 | implicit-field:1 selection of Flash | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/app.go:89:2:89:8 | implicit-field:1 selection of Flash | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/app.go:95:10:95:18 | implicit-field:1 selection of Session | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:44:3:44:9 | implicit-field:1 selection of Flash | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:51:2:51:6 | implicit-field:1 selection of Log | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:143:26:143:37 | implicit-field:1 selection of Validation | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:144:2:144:13 | implicit-field:1 selection of Validation | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:146:2:146:13 | implicit-field:1 selection of Validation | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:148:5:148:16 | implicit-field:1 selection of Validation | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:149:3:149:14 | implicit-field:1 selection of Validation | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:153:2:153:8 | implicit-field:1 selection of Flash | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:166:19:166:30 | implicit-field:1 selection of Validation | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:168:5:168:16 | implicit-field:1 selection of Validation | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:168:33:168:40 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:169:3:169:14 | implicit-field:1 selection of Validation | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:174:5:174:12 | implicit-field:1 selection of Params | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:175:3:175:9 | implicit-field:1 selection of Flash | Origin of readStep is missing a PostUpdateNode. |
 | examples/booking/app/controllers/hotels.go:176:4:176:10 | booking | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/controllers/hotels.go:184:2:184:2 | implicit read of field Controller | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/init.go:36:44:36:44 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/init.go:40:49:40:49 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/init.go:52:2:52:2 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/init.go:52:2:52:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/init.go:53:2:53:2 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/init.go:53:2:53:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/init.go:54:2:54:2 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/init.go:54:2:54:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/controllers/hotels.go:184:2:184:8 | implicit-field:1 selection of Flash | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/init.go:36:44:36:44 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/init.go:40:49:40:49 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/init.go:52:2:52:2 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/init.go:52:2:52:11 | implicit-deref selection of Response | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/init.go:53:2:53:2 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/init.go:53:2:53:11 | implicit-deref selection of Response | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/init.go:54:2:54:2 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/init.go:54:2:54:11 | implicit-deref selection of Response | Origin of readStep is missing a PostUpdateNode. |
 | examples/booking/app/models/booking.go:33:13:33:19 | booking | Origin of readStep is missing a PostUpdateNode. |
 | examples/booking/app/models/booking.go:34:13:34:19 | booking | Origin of readStep is missing a PostUpdateNode. |
 | examples/booking/app/models/booking.go:35:13:35:19 | booking | Origin of readStep is missing a PostUpdateNode. |
@@ -121,7 +121,7 @@ reverseRead
 | examples/booking/app/models/booking.go:69:3:69:3 | b | Origin of readStep is missing a PostUpdateNode. |
 | examples/booking/app/models/booking.go:73:39:73:39 | b | Origin of readStep is missing a PostUpdateNode. |
 | examples/booking/app/models/booking.go:73:47:73:47 | b | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/models/booking.go:81:13:81:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/models/booking.go:82:14:82:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/models/booking.go:83:17:83:17 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| examples/booking/app/models/booking.go:84:18:84:18 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/models/booking.go:81:13:81:13 | implicit-deref b | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/models/booking.go:82:14:82:14 | implicit-deref b | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/models/booking.go:83:17:83:17 | implicit-deref b | Origin of readStep is missing a PostUpdateNode. |
+| examples/booking/app/models/booking.go:84:18:84:18 | implicit-deref b | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Revel/OpenRedirect.expected b/go/ql/test/library-tests/semmle/go/frameworks/Revel/OpenRedirect.expected
index 3c889cd177cb..5868cd8c3e7b 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/OpenRedirect.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/OpenRedirect.expected
@@ -1,17 +1,17 @@
 #select
 | EndToEnd.go:95:20:95:49 | call to Get | EndToEnd.go:95:20:95:27 | selection of Params | EndToEnd.go:95:20:95:49 | call to Get | This path to an untrusted URL redirection depends on a $@. | EndToEnd.go:95:20:95:27 | selection of Params | user-provided value |
 edges
-| EndToEnd.go:95:20:95:27 | implicit dereference | EndToEnd.go:95:20:95:27 | selection of Params [postupdate] | provenance | Config |
-| EndToEnd.go:95:20:95:27 | implicit dereference | EndToEnd.go:95:20:95:32 | selection of Form | provenance | Config |
-| EndToEnd.go:95:20:95:27 | selection of Params | EndToEnd.go:95:20:95:27 | implicit dereference | provenance | Src:MaD:2 Config |
+| EndToEnd.go:95:20:95:27 | implicit-deref selection of Params | EndToEnd.go:95:20:95:27 | selection of Params [postupdate] | provenance | Config |
+| EndToEnd.go:95:20:95:27 | implicit-deref selection of Params | EndToEnd.go:95:20:95:32 | selection of Form | provenance | Config |
+| EndToEnd.go:95:20:95:27 | selection of Params | EndToEnd.go:95:20:95:27 | implicit-deref selection of Params | provenance | Src:MaD:2 Config |
 | EndToEnd.go:95:20:95:27 | selection of Params | EndToEnd.go:95:20:95:32 | selection of Form | provenance | Src:MaD:2 Config |
-| EndToEnd.go:95:20:95:27 | selection of Params [postupdate] | EndToEnd.go:95:20:95:27 | implicit dereference | provenance | Config |
+| EndToEnd.go:95:20:95:27 | selection of Params [postupdate] | EndToEnd.go:95:20:95:27 | implicit-deref selection of Params | provenance | Config |
 | EndToEnd.go:95:20:95:32 | selection of Form | EndToEnd.go:95:20:95:49 | call to Get | provenance | Config Sink:MaD:1 |
 models
 | 1 | Sink: group:revel; Controller; true; Redirect; ; ; Argument[0]; url-redirection; manual |
 | 2 | Source: group:revel; Controller; true; Params; ; ; ; remote; manual |
 nodes
-| EndToEnd.go:95:20:95:27 | implicit dereference | semmle.label | implicit dereference |
+| EndToEnd.go:95:20:95:27 | implicit-deref selection of Params | semmle.label | implicit-deref selection of Params |
 | EndToEnd.go:95:20:95:27 | selection of Params | semmle.label | selection of Params |
 | EndToEnd.go:95:20:95:27 | selection of Params [postupdate] | semmle.label | selection of Params [postupdate] |
 | EndToEnd.go:95:20:95:32 | selection of Form | semmle.label | selection of Form |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Revel/Revel.go b/go/ql/test/library-tests/semmle/go/frameworks/Revel/Revel.go
index 219e1dddb4c9..c1a2cc72d9e2 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/Revel.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/Revel.go
@@ -64,7 +64,7 @@ func (c myAppController) accessingParamsJSONIsUnsafe() {
 	sink(val2["name"].(string))
 }
 
-func (c myAppController) rawRead() { // $ responsebody='argument corresponding to c'
+func (c myAppController) rawRead() { // $ responsebody='c'
 	c.ViewArgs["Foo"] = "<p>raw HTML</p>" // $ responsebody='"<p>raw HTML</p>"'
 	c.ViewArgs["Bar"] = "<p>not raw HTML</p>"
 	c.ViewArgs["Foo"] = c.Params.Query // $ responsebody='selection of Query' Alert[go/reflected-xss]
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Bytes.go b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Bytes.go
index ac528c46267d..d744819e2807 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Bytes.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Bytes.go
@@ -335,6 +335,20 @@ func TaintStepTest_Cutright(sourceCQL interface{}) interface{} {
 	return right
 }
 
+func TaintStepTest_CutLastleft(sourceCQL interface{}) interface{} {
+	fromReader628 := sourceCQL.([]byte)
+	sep := []byte{}
+	left, _, _ := bytes.CutLast(fromReader628, sep)
+	return left
+}
+
+func TaintStepTest_CutLastright(sourceCQL interface{}) interface{} {
+	fromReader628 := sourceCQL.([]byte)
+	sep := []byte{}
+	_, right, _ := bytes.CutLast(fromReader628, sep)
+	return right
+}
+
 func TaintStepTest_CutPrefix(sourceCQL interface{}) interface{} {
 	fromReader628 := sourceCQL.([]byte)
 	sep := []byte{}
@@ -636,4 +650,14 @@ func RunAllTaints_Bytes() {
 		out := TaintStepTest_BytesBufferPeek(source)
 		sink(55, out)
 	}
+	{
+		source := newSource(56)
+		out := TaintStepTest_CutLastleft(source)
+		sink(56, out)
+	}
+	{
+		source := newSource(57)
+		out := TaintStepTest_CutLastright(source)
+		sink(57, out)
+	}
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/DatabaseSql.go b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/DatabaseSql.go
index 59a61cff31a9..3e2f5af18bba 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/DatabaseSql.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/DatabaseSql.go
@@ -2,7 +2,10 @@
 
 package main
 
-import "database/sql"
+import (
+	"database/sql"
+	"database/sql/driver"
+)
 
 func TaintStepTest_DatabaseSqlNamed_B0I0O0(sourceCQL interface{}) interface{} {
 	fromString656 := sourceCQL.(string)
@@ -79,6 +82,12 @@ func TaintStepTest_DatabaseSqlConnPrepareContext(sourceCQL interface{}) interfac
 	return intoPrepareResult0
 }
 
+func TaintStepTest_DatabaseSqlConvertAssign(sourceCQL interface{}) interface{} {
+	var destination interface{}
+	sql.ConvertAssign(driver.ScanContext{}, &destination, sourceCQL)
+	return destination
+}
+
 func RunAllTaints_DatabaseSql() {
 	{
 		source := newSource(0)
@@ -135,4 +144,9 @@ func RunAllTaints_DatabaseSql() {
 		out := TaintStepTest_DatabaseSqlConnPrepareContext(source)
 		sink(10, out)
 	}
+	{
+		source := newSource(11)
+		out := TaintStepTest_DatabaseSqlConvertAssign(source)
+		sink(11, out)
+	}
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/DatabaseSqlDriver.go b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/DatabaseSqlDriver.go
index fe44132e0fb4..ff572e9d889d 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/DatabaseSqlDriver.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/DatabaseSqlDriver.go
@@ -45,6 +45,13 @@ func TaintStepTest_DatabaseSqlDriverValuerValue_B0I0O0(sourceCQL interface{}) in
 	return intoValue982
 }
 
+func TaintStepTest_DatabaseSqlDriverRowsColumnScannerScanColumn(sourceCQL interface{}) interface{} {
+	fromRows := sourceCQL.(driver.RowsColumnScanner)
+	var destination interface{}
+	fromRows.ScanColumn(driver.ScanContext{}, 0, &destination)
+	return destination
+}
+
 func RunAllTaints_DatabaseSqlDriver() {
 	{
 		source := newSource(0)
@@ -76,4 +83,9 @@ func RunAllTaints_DatabaseSqlDriver() {
 		out := TaintStepTest_DatabaseSqlDriverValuerValue_B0I0O0(source)
 		sink(5, out)
 	}
+	{
+		source := newSource(6)
+		out := TaintStepTest_DatabaseSqlDriverRowsColumnScannerScanColumn(source)
+		sink(6, out)
+	}
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/EncodingJsonJsontext.go b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/EncodingJsonJsontext.go
new file mode 100644
index 000000000000..771de17ded3f
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/EncodingJsonJsontext.go
@@ -0,0 +1,413 @@
+package main
+
+import (
+	"encoding/json/jsontext"
+	"io"
+)
+
+func TaintStepTest_JsontextAppendFloat_I0(sourceCQL interface{}) interface{} {
+	fromByte := sourceCQL.([]byte)
+	intoByte := jsontext.AppendFloat(fromByte, 0, 64)
+	return intoByte
+}
+
+func TaintStepTest_JsontextAppendFloat_I1(sourceCQL interface{}) interface{} {
+	fromFloat := sourceCQL.(float64)
+	intoByte := jsontext.AppendFloat(nil, fromFloat, 64)
+	return intoByte
+}
+
+func TaintStepTest_JsontextAppendFormat_I0(sourceCQL interface{}) interface{} {
+	fromByte := sourceCQL.([]byte)
+	intoByte, _ := jsontext.AppendFormat(fromByte, []byte{})
+	return intoByte
+}
+
+func TaintStepTest_JsontextAppendFormat_I1(sourceCQL interface{}) interface{} {
+	fromByte := sourceCQL.([]byte)
+	intoByte, _ := jsontext.AppendFormat(nil, fromByte)
+	return intoByte
+}
+
+func TaintStepTest_JsontextAppendQuote_I0(sourceCQL interface{}) interface{} {
+	fromByte := sourceCQL.([]byte)
+	intoByte, _ := jsontext.AppendQuote(fromByte, []byte{})
+	return intoByte
+}
+
+func TaintStepTest_JsontextAppendQuote_I1(sourceCQL interface{}) interface{} {
+	fromString := sourceCQL.(string)
+	intoByte, _ := jsontext.AppendQuote(nil, fromString)
+	return intoByte
+}
+
+func TaintStepTest_JsontextAppendUnquote_I0(sourceCQL interface{}) interface{} {
+	fromByte := sourceCQL.([]byte)
+	intoByte, _ := jsontext.AppendUnquote(fromByte, []byte{})
+	return intoByte
+}
+
+func TaintStepTest_JsontextAppendUnquote_I1(sourceCQL interface{}) interface{} {
+	fromString := sourceCQL.(string)
+	intoByte, _ := jsontext.AppendUnquote(nil, fromString)
+	return intoByte
+}
+
+func TaintStepTest_JsontextNewDecoder(sourceCQL interface{}) interface{} {
+	fromReader := sourceCQL.(io.Reader)
+	intoDecoder := jsontext.NewDecoder(fromReader)
+	return intoDecoder
+}
+
+func TaintStepTest_JsontextNewEncoder(sourceCQL interface{}) interface{} {
+	fromEncoder := sourceCQL.(*jsontext.Encoder)
+	var intoWriter io.Writer
+	intermediateCQL := jsontext.NewEncoder(intoWriter)
+	link(fromEncoder, intermediateCQL)
+	return intoWriter
+}
+
+func TaintStepTest_JsontextFloat(sourceCQL interface{}) interface{} {
+	fromFloat := sourceCQL.(float64)
+	intoToken := jsontext.Float(fromFloat)
+	return intoToken
+}
+
+func TaintStepTest_JsontextFloat32(sourceCQL interface{}) interface{} {
+	fromFloat := sourceCQL.(float32)
+	intoToken := jsontext.Float32(fromFloat)
+	return intoToken
+}
+
+func TaintStepTest_JsontextInt(sourceCQL interface{}) interface{} {
+	fromInt := sourceCQL.(int64)
+	intoToken := jsontext.Int(fromInt)
+	return intoToken
+}
+
+func TaintStepTest_JsontextString(sourceCQL interface{}) interface{} {
+	fromString := sourceCQL.(string)
+	intoToken := jsontext.String(fromString)
+	return intoToken
+}
+
+func TaintStepTest_JsontextUint(sourceCQL interface{}) interface{} {
+	fromUint := sourceCQL.(uint64)
+	intoToken := jsontext.Uint(fromUint)
+	return intoToken
+}
+
+func TaintStepTest_JsontextDecoderReadToken(sourceCQL interface{}) interface{} {
+	fromDecoder := sourceCQL.(jsontext.Decoder)
+	intoToken, _ := fromDecoder.ReadToken()
+	return intoToken
+}
+
+func TaintStepTest_JsontextDecoderReadValue(sourceCQL interface{}) interface{} {
+	fromDecoder := sourceCQL.(jsontext.Decoder)
+	intoValue, _ := fromDecoder.ReadValue()
+	return intoValue
+}
+
+func TaintStepTest_JsontextDecoderReset(sourceCQL interface{}) interface{} {
+	fromReader := sourceCQL.(io.Reader)
+	var intoDecoder jsontext.Decoder
+	intoDecoder.Reset(fromReader)
+	return intoDecoder
+}
+
+func TaintStepTest_JsontextDecoderUnreadBuffer(sourceCQL interface{}) interface{} {
+	fromDecoder := sourceCQL.(jsontext.Decoder)
+	intoByte := fromDecoder.UnreadBuffer()
+	return intoByte
+}
+
+func TaintStepTest_JsontextEncoderReset(sourceCQL interface{}) interface{} {
+	fromEncoder := sourceCQL.(jsontext.Encoder)
+	var intoWriter io.Writer
+	fromEncoder.Reset(intoWriter)
+	return intoWriter
+}
+
+func TaintStepTest_JsontextEncoderWriteToken(sourceCQL interface{}) interface{} {
+	fromToken := sourceCQL.(jsontext.Token)
+	var intoEncoder jsontext.Encoder
+	intoEncoder.WriteToken(fromToken)
+	return intoEncoder
+}
+
+func TaintStepTest_JsontextEncoderWriteValue(sourceCQL interface{}) interface{} {
+	fromValue := sourceCQL.(jsontext.Value)
+	var intoEncoder jsontext.Encoder
+	intoEncoder.WriteValue(fromValue)
+	return intoEncoder
+}
+
+func TaintStepTest_JsontextPointerAppendToken_Receiver(sourceCQL interface{}) interface{} {
+	fromPointer := sourceCQL.(jsontext.Pointer)
+	intoPointer := fromPointer.AppendToken("")
+	return intoPointer
+}
+
+func TaintStepTest_JsontextPointerAppendToken_I0(sourceCQL interface{}) interface{} {
+	fromString := sourceCQL.(string)
+	var pointer jsontext.Pointer
+	intoPointer := pointer.AppendToken(fromString)
+	return intoPointer
+}
+
+func TaintStepTest_JsontextPointerLastToken(sourceCQL interface{}) interface{} {
+	fromPointer := sourceCQL.(jsontext.Pointer)
+	intoString := fromPointer.LastToken()
+	return intoString
+}
+
+func TaintStepTest_JsontextPointerParent(sourceCQL interface{}) interface{} {
+	fromPointer := sourceCQL.(jsontext.Pointer)
+	intoPointer := fromPointer.Parent()
+	return intoPointer
+}
+
+func TaintStepTest_JsontextTokenClone(sourceCQL interface{}) interface{} {
+	fromToken := sourceCQL.(jsontext.Token)
+	intoToken := fromToken.Clone()
+	return intoToken
+}
+
+func TaintStepTest_JsontextTokenFloat(sourceCQL interface{}) interface{} {
+	fromToken := sourceCQL.(jsontext.Token)
+	intoFloat, _ := fromToken.Float()
+	return intoFloat
+}
+
+func TaintStepTest_JsontextTokenFloat32(sourceCQL interface{}) interface{} {
+	fromToken := sourceCQL.(jsontext.Token)
+	intoFloat, _ := fromToken.Float32()
+	return intoFloat
+}
+
+func TaintStepTest_JsontextTokenInt(sourceCQL interface{}) interface{} {
+	fromToken := sourceCQL.(jsontext.Token)
+	intoInt, _ := fromToken.Int()
+	return intoInt
+}
+
+func TaintStepTest_JsontextTokenString(sourceCQL interface{}) interface{} {
+	fromToken := sourceCQL.(jsontext.Token)
+	intoString := fromToken.String()
+	return intoString
+}
+
+func TaintStepTest_JsontextTokenUint(sourceCQL interface{}) interface{} {
+	fromToken := sourceCQL.(jsontext.Token)
+	intoUint, _ := fromToken.Uint()
+	return intoUint
+}
+
+func TaintStepTest_JsontextValueClone(sourceCQL interface{}) interface{} {
+	fromValue := sourceCQL.(jsontext.Value)
+	intoValue := fromValue.Clone()
+	return intoValue
+}
+
+func TaintStepTest_JsontextValueMarshalJSON(sourceCQL interface{}) interface{} {
+	fromValue := sourceCQL.(jsontext.Value)
+	intoByte, _ := fromValue.MarshalJSON()
+	return intoByte
+}
+
+func TaintStepTest_JsontextValueString(sourceCQL interface{}) interface{} {
+	fromValue := sourceCQL.(jsontext.Value)
+	intoString := fromValue.String()
+	return intoString
+}
+
+func TaintStepTest_JsontextValueUnmarshalJSON(sourceCQL interface{}) interface{} {
+	fromByte := sourceCQL.([]byte)
+	var intoValue jsontext.Value
+	intoValue.UnmarshalJSON(fromByte)
+	return intoValue
+}
+
+func RunAllTaints_EncodingJsonJsontext() {
+	{
+		source := newSource(0)
+		out := TaintStepTest_JsontextAppendFloat_I0(source)
+		sink(0, out)
+	}
+	{
+		source := newSource(1)
+		out := TaintStepTest_JsontextAppendFloat_I1(source)
+		sink(1, out)
+	}
+	{
+		source := newSource(2)
+		out := TaintStepTest_JsontextAppendFormat_I0(source)
+		sink(2, out)
+	}
+	{
+		source := newSource(3)
+		out := TaintStepTest_JsontextAppendFormat_I1(source)
+		sink(3, out)
+	}
+	{
+		source := newSource(4)
+		out := TaintStepTest_JsontextAppendQuote_I0(source)
+		sink(4, out)
+	}
+	{
+		source := newSource(5)
+		out := TaintStepTest_JsontextAppendQuote_I1(source)
+		sink(5, out)
+	}
+	{
+		source := newSource(6)
+		out := TaintStepTest_JsontextAppendUnquote_I0(source)
+		sink(6, out)
+	}
+	{
+		source := newSource(7)
+		out := TaintStepTest_JsontextAppendUnquote_I1(source)
+		sink(7, out)
+	}
+	{
+		source := newSource(8)
+		out := TaintStepTest_JsontextNewDecoder(source)
+		sink(8, out)
+	}
+	{
+		source := newSource(9)
+		out := TaintStepTest_JsontextNewEncoder(source)
+		sink(9, out)
+	}
+	{
+		source := newSource(10)
+		out := TaintStepTest_JsontextFloat(source)
+		sink(10, out)
+	}
+	{
+		source := newSource(11)
+		out := TaintStepTest_JsontextFloat32(source)
+		sink(11, out)
+	}
+	{
+		source := newSource(12)
+		out := TaintStepTest_JsontextInt(source)
+		sink(12, out)
+	}
+	{
+		source := newSource(13)
+		out := TaintStepTest_JsontextString(source)
+		sink(13, out)
+	}
+	{
+		source := newSource(14)
+		out := TaintStepTest_JsontextUint(source)
+		sink(14, out)
+	}
+	{
+		source := newSource(15)
+		out := TaintStepTest_JsontextDecoderReadToken(source)
+		sink(15, out)
+	}
+	{
+		source := newSource(16)
+		out := TaintStepTest_JsontextDecoderReadValue(source)
+		sink(16, out)
+	}
+	{
+		source := newSource(17)
+		out := TaintStepTest_JsontextDecoderReset(source)
+		sink(17, out)
+	}
+	{
+		source := newSource(18)
+		out := TaintStepTest_JsontextDecoderUnreadBuffer(source)
+		sink(18, out)
+	}
+	{
+		source := newSource(19)
+		out := TaintStepTest_JsontextEncoderReset(source)
+		sink(19, out)
+	}
+	{
+		source := newSource(20)
+		out := TaintStepTest_JsontextEncoderWriteToken(source)
+		sink(20, out)
+	}
+	{
+		source := newSource(21)
+		out := TaintStepTest_JsontextEncoderWriteValue(source)
+		sink(21, out)
+	}
+	{
+		source := newSource(22)
+		out := TaintStepTest_JsontextPointerAppendToken_Receiver(source)
+		sink(22, out)
+	}
+	{
+		source := newSource(23)
+		out := TaintStepTest_JsontextPointerAppendToken_I0(source)
+		sink(23, out)
+	}
+	{
+		source := newSource(24)
+		out := TaintStepTest_JsontextPointerLastToken(source)
+		sink(24, out)
+	}
+	{
+		source := newSource(25)
+		out := TaintStepTest_JsontextPointerParent(source)
+		sink(25, out)
+	}
+	{
+		source := newSource(26)
+		out := TaintStepTest_JsontextTokenClone(source)
+		sink(26, out)
+	}
+	{
+		source := newSource(27)
+		out := TaintStepTest_JsontextTokenFloat(source)
+		sink(27, out)
+	}
+	{
+		source := newSource(28)
+		out := TaintStepTest_JsontextTokenFloat32(source)
+		sink(28, out)
+	}
+	{
+		source := newSource(29)
+		out := TaintStepTest_JsontextTokenInt(source)
+		sink(29, out)
+	}
+	{
+		source := newSource(30)
+		out := TaintStepTest_JsontextTokenString(source)
+		sink(30, out)
+	}
+	{
+		source := newSource(31)
+		out := TaintStepTest_JsontextTokenUint(source)
+		sink(31, out)
+	}
+	{
+		source := newSource(32)
+		out := TaintStepTest_JsontextValueClone(source)
+		sink(32, out)
+	}
+	{
+		source := newSource(33)
+		out := TaintStepTest_JsontextValueMarshalJSON(source)
+		sink(33, out)
+	}
+	{
+		source := newSource(34)
+		out := TaintStepTest_JsontextValueString(source)
+		sink(34, out)
+	}
+	{
+		source := newSource(35)
+		out := TaintStepTest_JsontextValueUnmarshalJSON(source)
+		sink(35, out)
+	}
+}
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Maps.go b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Maps.go
new file mode 100644
index 000000000000..45d62fac36db
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Maps.go
@@ -0,0 +1,54 @@
+package main
+
+import "maps"
+
+func TaintStepTest_MapsCloneKey(fromString string) string {
+	toMap := maps.Clone(map[string]int{fromString: 0})
+	for key := range toMap {
+		return key
+	}
+	return ""
+}
+
+func TaintStepTest_MapsCloneValue(fromString string) string {
+	toMap := maps.Clone(map[string]string{"key": fromString})
+	return toMap["key"]
+}
+
+func TaintStepTest_MapsCopyKey(fromString string) string {
+	toMap := map[string]int{}
+	maps.Copy(toMap, map[string]int{fromString: 0})
+	for key := range toMap {
+		return key
+	}
+	return ""
+}
+
+func TaintStepTest_MapsCopyValue(fromString string) string {
+	toMap := map[string]string{}
+	maps.Copy(toMap, map[string]string{"key": fromString})
+	return toMap["key"]
+}
+
+func RunAllTaints_Maps() {
+	{
+		source := newSource(0).(string)
+		out := TaintStepTest_MapsCloneKey(source)
+		sink(0, out)
+	}
+	{
+		source := newSource(1).(string)
+		out := TaintStepTest_MapsCloneValue(source)
+		sink(1, out)
+	}
+	{
+		source := newSource(2).(string)
+		out := TaintStepTest_MapsCopyKey(source)
+		sink(2, out)
+	}
+	{
+		source := newSource(3).(string)
+		out := TaintStepTest_MapsCopyValue(source)
+		sink(3, out)
+	}
+}
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/NetHttp.go b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/NetHttp.go
index ebf7fce029d0..86129bedbff2 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/NetHttp.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/NetHttp.go
@@ -6,6 +6,7 @@ import (
 	"bufio"
 	"io"
 	"net/http"
+	"net/url"
 )
 
 func TaintStepTest_NetHttpCanonicalHeaderKey_B0I0O0(sourceCQL interface{}) interface{} {
@@ -175,6 +176,16 @@ func TaintStepTest_NetHttpResponseWriterWrite_B0I0O0(sourceCQL interface{}) inte
 	return intoResponseWriter139
 }
 
+func TaintStepTest_NetUrlURLClone(sourceCQL interface{}) interface{} {
+	fromURL := sourceCQL.(*url.URL)
+	return fromURL.Clone()
+}
+
+func TaintStepTest_NetUrlValuesClone(sourceCQL interface{}) interface{} {
+	fromValues := sourceCQL.(url.Values)
+	return fromValues.Clone()
+}
+
 func RunAllTaints_NetHttp() {
 	{
 		source := newSource(0)
@@ -306,4 +317,14 @@ func RunAllTaints_NetHttp() {
 		out := TaintStepTest_NetHttpResponseWriterWrite_B0I0O0(source)
 		sink(23, out)
 	}
+	{
+		source := newSource(26)
+		out := TaintStepTest_NetUrlURLClone(source)
+		sink(26, out)
+	}
+	{
+		source := newSource(27)
+		out := TaintStepTest_NetUrlValuesClone(source)
+		sink(27, out)
+	}
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Strings.go b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Strings.go
index 878f4809130b..ac152a84c3b5 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Strings.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Strings.go
@@ -7,21 +7,80 @@ import (
 	"strings"
 )
 
+func TaintStepTest_StringsClone(sourceCQL interface{}) interface{} {
+	return strings.Clone(sourceCQL.(string))
+}
+
+func TaintStepTest_StringsCutleft(sourceCQL interface{}) interface{} {
+	left, _, _ := strings.Cut(sourceCQL.(string), "")
+	return left
+}
+
+func TaintStepTest_StringsCutright(sourceCQL interface{}) interface{} {
+	_, right, _ := strings.Cut(sourceCQL.(string), "")
+	return right
+}
+
+func TaintStepTest_StringsCutPrefix(sourceCQL interface{}) interface{} {
+	result, _ := strings.CutPrefix(sourceCQL.(string), "")
+	return result
+}
+
+func TaintStepTest_StringsCutSuffix(sourceCQL interface{}) interface{} {
+	result, _ := strings.CutSuffix(sourceCQL.(string), "")
+	return result
+}
+
+func TaintStepTest_StringsFieldsFuncSeq(sourceCQL interface{}) interface{} {
+	for result := range strings.FieldsFuncSeq(sourceCQL.(string), nil) {
+		return result
+	}
+	return ""
+}
+
+func TaintStepTest_StringsFieldsSeq(sourceCQL interface{}) interface{} {
+	for result := range strings.FieldsSeq(sourceCQL.(string)) {
+		return result
+	}
+	return ""
+}
+
+func TaintStepTest_StringsLines(sourceCQL interface{}) interface{} {
+	for result := range strings.Lines(sourceCQL.(string)) {
+		return result
+	}
+	return ""
+}
+
+func TaintStepTest_StringsSplitAfterSeq(sourceCQL interface{}) interface{} {
+	for result := range strings.SplitAfterSeq(sourceCQL.(string), "") {
+		return result
+	}
+	return ""
+}
+
+func TaintStepTest_StringsSplitSeq(sourceCQL interface{}) interface{} {
+	for result := range strings.SplitSeq(sourceCQL.(string), "") {
+		return result
+	}
+	return ""
+}
+
 func TaintStepTest_StringsFields_B0I0O0(sourceCQL interface{}) interface{} {
 	fromString656 := sourceCQL.(string)
 	intoString414 := strings.Fields(fromString656)
-	return intoString414
+	return intoString414[0]
 }
 
 func TaintStepTest_StringsFieldsFunc_B0I0O0(sourceCQL interface{}) interface{} {
 	fromString518 := sourceCQL.(string)
 	intoString650 := strings.FieldsFunc(fromString518, nil)
-	return intoString650
+	return intoString650[0]
 }
 
 func TaintStepTest_StringsJoin_B0I0O0(sourceCQL interface{}) interface{} {
-	fromString784 := sourceCQL.([]string)
-	intoString957 := strings.Join(fromString784, "")
+	fromString784 := sourceCQL.(string)
+	intoString957 := strings.Join([]string{fromString784}, "")
 	return intoString957
 }
 
@@ -231,6 +290,18 @@ func TaintStepTest_StringsBuilderWriteString_B0I0O0(sourceCQL interface{}) inter
 	return intoBuilder389
 }
 
+func TaintStepTest_StringsBuilderWriteByte(sourceCQL interface{}) interface{} {
+	var builder strings.Builder
+	builder.WriteByte(sourceCQL.(byte))
+	return builder
+}
+
+func TaintStepTest_StringsBuilderWriteRune(sourceCQL interface{}) interface{} {
+	var builder strings.Builder
+	builder.WriteRune(sourceCQL.(rune))
+	return builder
+}
+
 func TaintStepTest_StringsReaderRead_B0I0O0(sourceCQL interface{}) interface{} {
 	fromReader198 := sourceCQL.(strings.Reader)
 	var intoByte477 []byte
@@ -245,6 +316,18 @@ func TaintStepTest_StringsReaderReadAt_B0I0O0(sourceCQL interface{}) interface{}
 	return intoByte382
 }
 
+func TaintStepTest_StringsReaderReadByte(sourceCQL interface{}) interface{} {
+	reader := sourceCQL.(strings.Reader)
+	result, _ := reader.ReadByte()
+	return result
+}
+
+func TaintStepTest_StringsReaderReadRune(sourceCQL interface{}) interface{} {
+	reader := sourceCQL.(strings.Reader)
+	result, _, _ := reader.ReadRune()
+	return result
+}
+
 func TaintStepTest_StringsReaderReset_B0I0O0(sourceCQL interface{}) interface{} {
 	fromString715 := sourceCQL.(string)
 	var intoReader179 strings.Reader
@@ -274,6 +357,28 @@ func TaintStepTest_StringsReplacerWriteString_B0I0O0(sourceCQL interface{}) inte
 	return intoWriter754
 }
 
+func TaintStepTest_StringsReplacerReplaceReceiver(sourceCQL interface{}) interface{} {
+	return sourceCQL.(*strings.Replacer).Replace("")
+}
+
+func TaintStepTest_StringsReplacerWriteStringReceiver(sourceCQL interface{}) interface{} {
+	var writer io.Writer
+	sourceCQL.(*strings.Replacer).WriteString(writer, "")
+	return writer
+}
+
+func TaintStepTest_StringsCutLastleft(sourceCQL interface{}) interface{} {
+	fromString := sourceCQL.(string)
+	left, _, _ := strings.CutLast(fromString, "")
+	return left
+}
+
+func TaintStepTest_StringsCutLastright(sourceCQL interface{}) interface{} {
+	fromString := sourceCQL.(string)
+	_, right, _ := strings.CutLast(fromString, "")
+	return right
+}
+
 func RunAllTaints_Strings() {
 	{
 		source := newSource(0)
@@ -490,4 +595,94 @@ func RunAllTaints_Strings() {
 		out := TaintStepTest_StringsReplacerWriteString_B0I0O0(source)
 		sink(42, out)
 	}
+	{
+		source := newSource(43)
+		out := TaintStepTest_StringsCutLastleft(source)
+		sink(43, out)
+	}
+	{
+		source := newSource(44)
+		out := TaintStepTest_StringsCutLastright(source)
+		sink(44, out)
+	}
+	{
+		source := newSource(45)
+		out := TaintStepTest_StringsClone(source)
+		sink(45, out)
+	}
+	{
+		source := newSource(46)
+		out := TaintStepTest_StringsCutleft(source)
+		sink(46, out)
+	}
+	{
+		source := newSource(47)
+		out := TaintStepTest_StringsCutright(source)
+		sink(47, out)
+	}
+	{
+		source := newSource(48)
+		out := TaintStepTest_StringsCutPrefix(source)
+		sink(48, out)
+	}
+	{
+		source := newSource(49)
+		out := TaintStepTest_StringsCutSuffix(source)
+		sink(49, out)
+	}
+	// {
+	// 	source := newSource(50)
+	// 	out := TaintStepTest_StringsFieldsFuncSeq(source)
+	// 	sink(50, out)
+	// }
+	// {
+	// 	source := newSource(51)
+	// 	out := TaintStepTest_StringsFieldsSeq(source)
+	// 	sink(51, out)
+	// }
+	// {
+	// 	source := newSource(52)
+	// 	out := TaintStepTest_StringsLines(source)
+	// 	sink(52, out)
+	// }
+	// {
+	// 	source := newSource(53)
+	// 	out := TaintStepTest_StringsSplitAfterSeq(source)
+	// 	sink(53, out)
+	// }
+	// {
+	// 	source := newSource(54)
+	// 	out := TaintStepTest_StringsSplitSeq(source)
+	// 	sink(54, out)
+	// }
+	{
+		source := newSource(55)
+		out := TaintStepTest_StringsBuilderWriteByte(source)
+		sink(55, out)
+	}
+	{
+		source := newSource(56)
+		out := TaintStepTest_StringsBuilderWriteRune(source)
+		sink(56, out)
+	}
+	{
+		source := newSource(57)
+		out := TaintStepTest_StringsReaderReadByte(source)
+		sink(57, out)
+	}
+	{
+		source := newSource(58)
+		out := TaintStepTest_StringsReaderReadRune(source)
+		sink(58, out)
+	}
+	{
+		source := newSource(59)
+		out := TaintStepTest_StringsReplacerReplaceReceiver(source)
+		sink(59, out)
+	}
+	{
+		source := newSource(60)
+		out := TaintStepTest_StringsReplacerWriteStringReceiver(source)
+		sink(60, out)
+	}
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/go.mod b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/go.mod
index 1a8220297f27..50e9957cce14 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/go.mod
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/go.mod
@@ -1,6 +1,6 @@
 module example.com/m
 
-go 1.26
+go 1.27
 
 require (
 	golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SystemCommandExecutors/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/SystemCommandExecutors/CONSISTENCY/DataFlowConsistency.expected
index c7680b2b6ca1..22b7e84f85e2 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/SystemCommandExecutors/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SystemCommandExecutors/CONSISTENCY/DataFlowConsistency.expected
@@ -1,2 +1,2 @@
 reverseRead
-| SystemCommandExecutors.go:25:12:25:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| SystemCommandExecutors.go:25:12:25:14 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/TaintSteps/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/TaintSteps/CONSISTENCY/DataFlowConsistency.expected
index f07ffbe60cfe..716050b1f160 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/TaintSteps/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/TaintSteps/CONSISTENCY/DataFlowConsistency.expected
@@ -1,3 +1,3 @@
 reverseRead
-| main.go:28:2:28:4 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| main.go:34:2:34:4 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| main.go:28:2:28:4 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| main.go:34:2:34:4 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/TaintSteps/TaintStep.expected b/go/ql/test/library-tests/semmle/go/frameworks/TaintSteps/TaintStep.expected
index cfbbc771f777..98381fa1ed1c 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/TaintSteps/TaintStep.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/TaintSteps/TaintStep.expected
@@ -1,12 +1,12 @@
 invalidModelRow
 #select
-| crypto.go:9:14:9:31 | call to NewCipher | crypto.go:9:2:9:31 | ... := ...[0] |
-| crypto.go:9:14:9:31 | call to NewCipher | crypto.go:9:2:9:31 | ... := ...[1] |
-| crypto.go:10:15:10:34 | call to NewGCM | crypto.go:10:2:10:34 | ... := ...[0] |
-| crypto.go:10:15:10:34 | call to NewGCM | crypto.go:10:2:10:34 | ... := ...[1] |
-| crypto.go:11:18:11:57 | call to Open | crypto.go:11:2:11:57 | ... := ...[0] |
-| crypto.go:11:18:11:57 | call to Open | crypto.go:11:2:11:57 | ... := ...[1] |
-| crypto.go:11:42:11:51 | ciphertext | crypto.go:11:2:11:57 | ... := ...[0] |
+| crypto.go:9:14:9:31 | call to NewCipher | crypto.go:9:2:9:31 | extract:0 ... := ... |
+| crypto.go:9:14:9:31 | call to NewCipher | crypto.go:9:2:9:31 | extract:1 ... := ... |
+| crypto.go:10:15:10:34 | call to NewGCM | crypto.go:10:2:10:34 | extract:0 ... := ... |
+| crypto.go:10:15:10:34 | call to NewGCM | crypto.go:10:2:10:34 | extract:1 ... := ... |
+| crypto.go:11:18:11:57 | call to Open | crypto.go:11:2:11:57 | extract:0 ... := ... |
+| crypto.go:11:18:11:57 | call to Open | crypto.go:11:2:11:57 | extract:1 ... := ... |
+| crypto.go:11:42:11:51 | ciphertext | crypto.go:11:2:11:57 | extract:0 ... := ... |
 | io.go:14:31:14:43 | "some string" | io.go:14:13:14:44 | call to NewReader |
 | io.go:16:23:16:27 | &... | io.go:16:24:16:27 | buf1 [postupdate] |
 | io.go:16:23:16:27 | &... [postupdate] | io.go:16:24:16:27 | buf1 [postupdate] |
@@ -31,9 +31,9 @@ invalidModelRow
 | io.go:33:20:33:23 | buf1 | io.go:33:19:33:23 | &... |
 | io.go:33:20:33:23 | buf1 [postupdate] | io.go:33:19:33:23 | &... |
 | io.go:35:16:35:21 | reader | io.go:35:12:35:13 | w2 [postupdate] |
-| io.go:39:11:39:19 | call to Pipe | io.go:39:3:39:19 | ... := ...[0] |
-| io.go:39:11:39:19 | call to Pipe | io.go:39:3:39:19 | ... := ...[1] |
-| io.go:40:14:40:14 | w [postupdate] | io.go:39:3:39:19 | ... := ...[0] |
+| io.go:39:11:39:19 | call to Pipe | io.go:39:3:39:19 | extract:0 ... := ... |
+| io.go:39:11:39:19 | call to Pipe | io.go:39:3:39:19 | extract:1 ... := ... |
+| io.go:40:14:40:14 | w [postupdate] | io.go:39:3:39:19 | extract:0 ... := ... |
 | io.go:40:17:40:31 | "some string\\n" | io.go:40:14:40:14 | w [postupdate] |
 | io.go:43:16:43:16 | r | io.go:43:3:43:5 | buf [postupdate] |
 | io.go:44:13:44:15 | buf | io.go:44:13:44:24 | call to String |
@@ -74,35 +74,35 @@ invalidModelRow
 | io.go:101:26:101:38 | "some string" | io.go:101:8:101:39 | call to NewReader |
 | io.go:102:3:102:3 | r | io.go:102:13:102:21 | selection of Stdout [postupdate] |
 | io.go:108:30:108:42 | "some string" | io.go:108:12:108:43 | call to NewReader |
-| io.go:109:12:109:33 | call to ReadAll | io.go:109:2:109:33 | ... := ...[0] |
-| io.go:109:12:109:33 | call to ReadAll | io.go:109:2:109:33 | ... := ...[1] |
-| io.go:109:27:109:32 | reader | io.go:109:2:109:33 | ... := ...[0] |
+| io.go:109:12:109:33 | call to ReadAll | io.go:109:2:109:33 | extract:0 ... := ... |
+| io.go:109:12:109:33 | call to ReadAll | io.go:109:2:109:33 | extract:1 ... := ... |
+| io.go:109:27:109:32 | reader | io.go:109:2:109:33 | extract:0 ... := ... |
 | io.go:110:18:110:20 | buf | io.go:110:2:110:10 | selection of Stdout [postupdate] |
-| main.go:11:12:11:26 | call to Marshal | main.go:11:2:11:26 | ... := ...[0] |
-| main.go:11:12:11:26 | call to Marshal | main.go:11:2:11:26 | ... := ...[1] |
-| main.go:11:25:11:25 | v | main.go:11:2:11:26 | ... := ...[0] |
-| main.go:13:14:13:52 | call to MarshalIndent | main.go:13:2:13:52 | ... := ...[0] |
-| main.go:13:14:13:52 | call to MarshalIndent | main.go:13:2:13:52 | ... := ...[1] |
-| main.go:13:33:13:33 | v | main.go:13:2:13:52 | ... := ...[0] |
-| main.go:13:36:13:45 | "/*JSON*/" | main.go:13:2:13:52 | ... := ...[0] |
-| main.go:13:48:13:51 | "  " | main.go:13:2:13:52 | ... := ...[0] |
+| main.go:11:12:11:26 | call to Marshal | main.go:11:2:11:26 | extract:0 ... := ... |
+| main.go:11:12:11:26 | call to Marshal | main.go:11:2:11:26 | extract:1 ... := ... |
+| main.go:11:25:11:25 | v | main.go:11:2:11:26 | extract:0 ... := ... |
+| main.go:13:14:13:52 | call to MarshalIndent | main.go:13:2:13:52 | extract:0 ... := ... |
+| main.go:13:14:13:52 | call to MarshalIndent | main.go:13:2:13:52 | extract:1 ... := ... |
+| main.go:13:33:13:33 | v | main.go:13:2:13:52 | extract:0 ... := ... |
+| main.go:13:36:13:45 | "/*JSON*/" | main.go:13:2:13:52 | extract:0 ... := ... |
+| main.go:13:48:13:51 | "  " | main.go:13:2:13:52 | extract:0 ... := ... |
 | main.go:14:25:14:25 | b | main.go:14:9:14:41 | slice literal |
 | main.go:14:28:14:30 | err | main.go:14:9:14:41 | slice literal |
 | main.go:14:33:14:34 | b2 | main.go:14:9:14:41 | slice literal |
 | main.go:14:37:14:40 | err2 | main.go:14:9:14:41 | slice literal |
-| main.go:19:18:19:42 | call to DecodeString | main.go:19:2:19:42 | ... := ...[0] |
-| main.go:19:18:19:42 | call to DecodeString | main.go:19:2:19:42 | ... := ...[1] |
-| main.go:19:35:19:41 | encoded | main.go:19:2:19:42 | ... := ...[0] |
+| main.go:19:18:19:42 | call to DecodeString | main.go:19:2:19:42 | extract:0 ... := ... |
+| main.go:19:18:19:42 | call to DecodeString | main.go:19:2:19:42 | extract:1 ... := ... |
+| main.go:19:35:19:41 | encoded | main.go:19:2:19:42 | extract:0 ... := ... |
 | main.go:23:25:23:31 | decoded | main.go:23:9:23:48 | slice literal |
 | main.go:23:34:23:36 | err | main.go:23:9:23:48 | slice literal |
 | main.go:23:39:23:47 | reEncoded | main.go:23:9:23:48 | slice literal |
-| main.go:28:2:28:4 | implicit dereference | main.go:28:2:28:4 | req [postupdate] |
-| main.go:28:2:28:4 | implicit dereference | main.go:28:2:28:9 | selection of Body |
-| main.go:28:2:28:4 | req | main.go:28:2:28:4 | implicit dereference |
-| main.go:28:2:28:4 | req [postupdate] | main.go:28:2:28:4 | implicit dereference |
+| main.go:28:2:28:4 | implicit-deref req | main.go:28:2:28:4 | req [postupdate] |
+| main.go:28:2:28:4 | implicit-deref req | main.go:28:2:28:9 | selection of Body |
+| main.go:28:2:28:4 | req | main.go:28:2:28:4 | implicit-deref req |
+| main.go:28:2:28:4 | req [postupdate] | main.go:28:2:28:4 | implicit-deref req |
 | main.go:28:2:28:9 | selection of Body | main.go:28:16:28:16 | b [postupdate] |
-| main.go:34:2:34:4 | implicit dereference | main.go:34:2:34:4 | req [postupdate] |
-| main.go:34:2:34:4 | implicit dereference | main.go:34:2:34:9 | selection of Body |
-| main.go:34:2:34:4 | req | main.go:34:2:34:4 | implicit dereference |
-| main.go:34:2:34:4 | req [postupdate] | main.go:34:2:34:4 | implicit dereference |
+| main.go:34:2:34:4 | implicit-deref req | main.go:34:2:34:4 | req [postupdate] |
+| main.go:34:2:34:4 | implicit-deref req | main.go:34:2:34:9 | selection of Body |
+| main.go:34:2:34:4 | req | main.go:34:2:34:4 | implicit-deref req |
+| main.go:34:2:34:4 | req [postupdate] | main.go:34:2:34:4 | implicit-deref req |
 | main.go:34:2:34:9 | selection of Body | main.go:34:16:34:16 | b [postupdate] |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Twirp/CONSISTENCY/CfgConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/Twirp/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Twirp/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/Twirp/CONSISTENCY/DataFlowConsistency.expected
index d4e53cf33a9a..71165fc94b07 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Twirp/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Twirp/CONSISTENCY/DataFlowConsistency.expected
@@ -7,91 +7,91 @@ reverseRead
 | rpc/notes/service.pb.go:155:9:155:45 | file_rpc_notes_service_proto_msgTypes | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.pb.go:182:10:182:46 | file_rpc_notes_service_proto_msgTypes | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.pb.go:195:9:195:45 | file_rpc_notes_service_proto_msgTypes | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.pb.go:297:13:297:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.pb.go:299:13:299:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.pb.go:301:13:301:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.pb.go:309:13:309:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.pb.go:311:13:311:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.pb.go:313:13:313:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.pb.go:321:13:321:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.pb.go:323:13:323:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.pb.go:325:13:325:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.pb.go:333:13:333:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.pb.go:335:13:335:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.pb.go:337:13:337:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.pb.go:297:13:297:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.pb.go:299:13:299:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.pb.go:301:13:301:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.pb.go:309:13:309:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.pb.go:311:13:311:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.pb.go:313:13:313:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.pb.go:321:13:321:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.pb.go:323:13:323:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.pb.go:325:13:325:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.pb.go:333:13:333:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.pb.go:335:13:335:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.pb.go:337:13:337:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:82:40:82:49 | clientOpts | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:118:37:118:37 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:118:37:118:37 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:118:47:118:52 | selection of opts | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:124:24:124:29 | selection of opts | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:128:34:128:39 | selection of opts | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:164:37:164:37 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:164:37:164:37 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:164:47:164:52 | selection of opts | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:170:24:170:29 | selection of opts | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:174:34:174:39 | selection of opts | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:221:40:221:49 | clientOpts | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:257:33:257:33 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:257:33:257:33 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:257:43:257:48 | selection of opts | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:263:24:263:29 | selection of opts | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:267:34:267:39 | selection of opts | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:303:33:303:33 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:303:33:303:33 | implicit-deref c | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:303:43:303:48 | selection of opts | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:309:24:309:29 | selection of opts | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:313:34:313:39 | selection of opts | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:350:45:350:54 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:360:29:360:29 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:389:38:389:38 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:397:58:397:60 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:402:47:402:49 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:404:48:404:50 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:405:58:405:60 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:409:95:409:97 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:410:58:410:60 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:422:48:422:50 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:423:58:423:60 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:429:12:429:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:440:53:440:55 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:441:43:441:45 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:449:36:449:36 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:455:23:455:25 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:477:13:477:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:494:41:494:41 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:507:34:507:34 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:524:24:524:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:526:24:526:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:532:36:532:36 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:538:25:538:27 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:558:13:558:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:575:41:575:41 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:588:34:588:34 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:603:24:603:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:605:24:605:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:609:12:609:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:620:53:620:55 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:621:43:621:45 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:629:36:629:36 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:635:23:635:25 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:657:13:657:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:674:41:674:41 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:687:34:687:34 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:704:24:704:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:706:24:706:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:712:36:712:36 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:718:25:718:27 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:738:13:738:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:755:41:755:41 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:768:34:768:34 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:783:24:783:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:785:24:785:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:350:45:350:54 | implicit-deref serverOpts | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:360:29:360:29 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:389:38:389:38 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:397:58:397:60 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:402:47:402:49 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:404:48:404:50 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:405:58:405:60 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:409:95:409:97 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:410:58:410:60 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:422:48:422:50 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:423:58:423:60 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:429:12:429:14 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:440:53:440:55 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:441:43:441:45 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:449:36:449:36 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:455:23:455:25 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:477:13:477:13 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:494:41:494:41 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:507:34:507:34 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:524:24:524:24 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:526:24:526:24 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:532:36:532:36 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:538:25:538:27 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:558:13:558:13 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:575:41:575:41 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:588:34:588:34 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:603:24:603:24 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:605:24:605:24 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:609:12:609:14 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:620:53:620:55 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:621:43:621:45 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:629:36:629:36 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:635:23:635:25 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:657:13:657:13 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:674:41:674:41 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:687:34:687:34 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:704:24:704:24 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:706:24:706:24 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:712:36:712:36 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:718:25:718:27 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:738:13:738:13 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:755:41:755:41 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:768:34:768:34 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:783:24:783:24 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:785:24:785:24 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
 | rpc/notes/service.twirp.go:969:8:969:13 | copied | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:984:2:984:4 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:985:2:985:4 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:986:2:986:4 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:1032:15:1032:18 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:1037:35:1037:38 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:1116:66:1116:66 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:1159:98:1159:98 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:1227:21:1227:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:1237:35:1237:38 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:1278:11:1278:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| rpc/notes/service.twirp.go:1292:23:1292:26 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| server/main.go:33:19:33:19 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:984:2:984:4 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:985:2:985:4 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:986:2:986:4 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:1032:15:1032:18 | implicit-deref resp | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:1037:35:1037:38 | implicit-deref resp | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:1116:66:1116:66 | implicit-deref e | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:1159:98:1159:98 | implicit-deref e | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:1227:21:1227:24 | implicit-deref resp | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:1237:35:1237:38 | implicit-deref resp | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:1278:11:1278:14 | implicit-deref resp | Origin of readStep is missing a PostUpdateNode. |
+| rpc/notes/service.twirp.go:1292:23:1292:26 | implicit-deref resp | Origin of readStep is missing a PostUpdateNode. |
+| server/main.go:33:19:33:19 | implicit-deref s | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.expected b/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.expected
index a50f131a747c..483cd2702ca6 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.expected
@@ -4,8 +4,8 @@
 edges
 | client/main.go:16:35:16:78 | &... | server/main.go:19:56:19:61 | SSA def(params) | provenance |  |
 | client/main.go:16:35:16:78 | &... [postupdate] | client/main.go:16:35:16:78 | &... | provenance |  |
-| rpc/notes/service.twirp.go:538:2:538:33 | ... := ...[0] | rpc/notes/service.twirp.go:544:27:544:29 | buf | provenance |  |
-| rpc/notes/service.twirp.go:538:25:538:32 | selection of Body | rpc/notes/service.twirp.go:538:2:538:33 | ... := ...[0] | provenance | Src:MaD:1 MaD:3 |
+| rpc/notes/service.twirp.go:538:2:538:33 | extract:0 ... := ... | rpc/notes/service.twirp.go:544:27:544:29 | buf | provenance |  |
+| rpc/notes/service.twirp.go:538:25:538:32 | selection of Body | rpc/notes/service.twirp.go:538:2:538:33 | extract:0 ... := ... | provenance | Src:MaD:1 MaD:3 |
 | rpc/notes/service.twirp.go:544:27:544:29 | buf | rpc/notes/service.twirp.go:544:32:544:41 | reqContent [postupdate] | provenance | MaD:2 |
 | rpc/notes/service.twirp.go:544:32:544:41 | reqContent [postupdate] | rpc/notes/service.twirp.go:574:2:577:2 | SSA def(reqContent) | provenance |  |
 | rpc/notes/service.twirp.go:574:2:577:2 | SSA def(reqContent) | rpc/notes/service.twirp.go:576:35:576:44 | reqContent | provenance |  |
@@ -21,7 +21,7 @@ models
 nodes
 | client/main.go:16:35:16:78 | &... | semmle.label | &... |
 | client/main.go:16:35:16:78 | &... [postupdate] | semmle.label | &... [postupdate] |
-| rpc/notes/service.twirp.go:538:2:538:33 | ... := ...[0] | semmle.label | ... := ...[0] |
+| rpc/notes/service.twirp.go:538:2:538:33 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | rpc/notes/service.twirp.go:538:25:538:32 | selection of Body | semmle.label | selection of Body |
 | rpc/notes/service.twirp.go:544:27:544:29 | buf | semmle.label | buf |
 | rpc/notes/service.twirp.go:544:32:544:41 | reqContent [postupdate] | semmle.label | reqContent [postupdate] |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/CONSISTENCY/DataFlowConsistency.expected
index ace7b23eded1..980efad53219 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/CONSISTENCY/DataFlowConsistency.expected
@@ -1,2 +1,2 @@
 reverseRead
-| WebSocketReadWrite.go:27:9:27:9 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| WebSocketReadWrite.go:27:9:27:9 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/Read.expected b/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/Read.expected
index 4c4bd0743d24..0eea39ca3ae4 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/Read.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/Read.expected
@@ -1,8 +1,8 @@
 | WebSocketReadWrite.go:32:11:32:14 | xnet [postupdate] |
 | WebSocketReadWrite.go:36:21:36:25 | xnet2 [postupdate] |
-| WebSocketReadWrite.go:41:3:41:40 | ... := ...[1] |
-| WebSocketReadWrite.go:44:3:44:48 | ... := ...[1] |
+| WebSocketReadWrite.go:41:3:41:40 | extract:1 ... := ... |
+| WebSocketReadWrite.go:44:3:44:48 | extract:1 ... := ... |
 | WebSocketReadWrite.go:52:26:52:35 | gorillaMsg [postupdate] |
 | WebSocketReadWrite.go:56:17:56:24 | gorilla2 [postupdate] |
-| WebSocketReadWrite.go:61:3:61:38 | ... := ...[1] |
-| WebSocketReadWrite.go:67:3:67:36 | ... := ...[0] |
+| WebSocketReadWrite.go:61:3:61:38 | extract:1 ... := ... |
+| WebSocketReadWrite.go:67:3:67:36 | extract:0 ... := ... |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/RemoteFlowSources.expected b/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/RemoteFlowSources.expected
index e0c1603ff2e9..17d1e7adaf4b 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/RemoteFlowSources.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/RemoteFlowSources.expected
@@ -1,9 +1,9 @@
 | WebSocketReadWrite.go:27:9:27:16 | selection of Header |
 | WebSocketReadWrite.go:32:11:32:14 | xnet [postupdate] |
 | WebSocketReadWrite.go:36:21:36:25 | xnet2 [postupdate] |
-| WebSocketReadWrite.go:41:3:41:40 | ... := ...[1] |
-| WebSocketReadWrite.go:44:3:44:48 | ... := ...[1] |
+| WebSocketReadWrite.go:41:3:41:40 | extract:1 ... := ... |
+| WebSocketReadWrite.go:44:3:44:48 | extract:1 ... := ... |
 | WebSocketReadWrite.go:52:26:52:35 | gorillaMsg [postupdate] |
 | WebSocketReadWrite.go:56:17:56:24 | gorilla2 [postupdate] |
-| WebSocketReadWrite.go:61:3:61:38 | ... := ...[1] |
-| WebSocketReadWrite.go:67:3:67:36 | ... := ...[0] |
+| WebSocketReadWrite.go:61:3:61:38 | extract:1 ... := ... |
+| WebSocketReadWrite.go:67:3:67:36 | extract:0 ... := ... |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/CONSISTENCY/DataFlowConsistency.expected
index e938aa2ca923..5cdc979ed6b1 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/CONSISTENCY/DataFlowConsistency.expected
@@ -1,12 +1,12 @@
 reverseRead
-| test.go:12:12:12:18 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:17:24:17:30 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:20:36:20:42 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:23:33:23:39 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| test.go:12:12:12:18 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:17:24:17:30 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:20:36:20:42 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:23:33:23:39 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
 | test.go:24:22:24:26 | nodes | Origin of readStep is missing a PostUpdateNode. |
-| test.go:26:45:26:51 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| test.go:26:45:26:51 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
 | test.go:27:22:27:27 | nodes2 | Origin of readStep is missing a PostUpdateNode. |
-| test.go:31:33:31:39 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:39:49:39:55 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:43:31:43:37 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| test.go:48:32:48:38 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| test.go:31:33:31:39 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:39:49:39:55 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:43:31:43:37 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| test.go:48:32:48:38 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.expected
index 17c74de55552..8cd9603077e7 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.expected
@@ -19,15 +19,15 @@ edges
 | test.go:12:12:12:44 | call to Get | test.go:15:42:15:47 | param1 | provenance |  |
 | test.go:15:22:15:48 | call to UnescapeString | test.go:15:15:15:49 | type conversion | provenance |  |
 | test.go:15:42:15:47 | param1 | test.go:15:22:15:48 | call to UnescapeString | provenance | MaD:9 |
-| test.go:17:2:17:36 | ... := ...[0] | test.go:18:15:18:31 | type conversion | provenance |  |
-| test.go:17:2:17:36 | ... := ...[0] | test.go:29:22:29:25 | node | provenance |  |
-| test.go:17:24:17:35 | selection of Body | test.go:17:2:17:36 | ... := ...[0] | provenance | Src:MaD:1 MaD:5 |
-| test.go:20:2:20:48 | ... := ...[0] | test.go:21:15:21:32 | type conversion | provenance |  |
-| test.go:20:36:20:47 | selection of Body | test.go:20:2:20:48 | ... := ...[0] | provenance | Src:MaD:1 MaD:8 |
-| test.go:23:2:23:50 | ... := ...[0] | test.go:24:15:24:35 | type conversion | provenance |  |
-| test.go:23:33:23:44 | selection of Body | test.go:23:2:23:50 | ... := ...[0] | provenance | Src:MaD:1 MaD:6 |
-| test.go:26:2:26:62 | ... := ...[0] | test.go:27:15:27:36 | type conversion | provenance |  |
-| test.go:26:45:26:56 | selection of Body | test.go:26:2:26:62 | ... := ...[0] | provenance | Src:MaD:1 MaD:7 |
+| test.go:17:2:17:36 | extract:0 ... := ... | test.go:18:15:18:31 | type conversion | provenance |  |
+| test.go:17:2:17:36 | extract:0 ... := ... | test.go:29:22:29:25 | node | provenance |  |
+| test.go:17:24:17:35 | selection of Body | test.go:17:2:17:36 | extract:0 ... := ... | provenance | Src:MaD:1 MaD:5 |
+| test.go:20:2:20:48 | extract:0 ... := ... | test.go:21:15:21:32 | type conversion | provenance |  |
+| test.go:20:36:20:47 | selection of Body | test.go:20:2:20:48 | extract:0 ... := ... | provenance | Src:MaD:1 MaD:8 |
+| test.go:23:2:23:50 | extract:0 ... := ... | test.go:24:15:24:35 | type conversion | provenance |  |
+| test.go:23:33:23:44 | selection of Body | test.go:23:2:23:50 | extract:0 ... := ... | provenance | Src:MaD:1 MaD:6 |
+| test.go:26:2:26:62 | extract:0 ... := ... | test.go:27:15:27:36 | type conversion | provenance |  |
+| test.go:26:45:26:56 | selection of Body | test.go:26:2:26:62 | extract:0 ... := ... | provenance | Src:MaD:1 MaD:7 |
 | test.go:31:15:31:45 | call to NewTokenizer | test.go:32:15:32:23 | tokenizer | provenance |  |
 | test.go:31:15:31:45 | call to NewTokenizer | test.go:33:15:33:23 | tokenizer | provenance |  |
 | test.go:31:15:31:45 | call to NewTokenizer | test.go:34:17:34:25 | tokenizer | provenance |  |
@@ -36,24 +36,24 @@ edges
 | test.go:31:33:31:44 | selection of Body | test.go:31:15:31:45 | call to NewTokenizer | provenance | Src:MaD:1 MaD:3 |
 | test.go:32:15:32:23 | tokenizer | test.go:32:15:32:34 | call to Buffered | provenance | MaD:12 |
 | test.go:33:15:33:23 | tokenizer | test.go:33:15:33:29 | call to Raw | provenance | MaD:13 |
-| test.go:34:2:34:35 | ... := ...[1] | test.go:35:15:35:19 | value | provenance |  |
-| test.go:34:17:34:25 | tokenizer | test.go:34:2:34:35 | ... := ...[1] | provenance | MaD:14 |
+| test.go:34:2:34:35 | extract:1 ... := ... | test.go:35:15:35:19 | value | provenance |  |
+| test.go:34:17:34:25 | tokenizer | test.go:34:2:34:35 | extract:1 ... := ... | provenance | MaD:14 |
 | test.go:36:15:36:23 | tokenizer | test.go:36:15:36:30 | call to Text | provenance | MaD:15 |
 | test.go:37:22:37:30 | tokenizer | test.go:37:22:37:38 | call to Token | provenance | MaD:16 |
 | test.go:37:22:37:38 | call to Token | test.go:37:15:37:44 | type conversion | provenance |  |
 | test.go:39:23:39:77 | call to NewTokenizerFragment | test.go:40:15:40:31 | tokenizerFragment | provenance |  |
 | test.go:39:49:39:60 | selection of Body | test.go:39:23:39:77 | call to NewTokenizerFragment | provenance | Src:MaD:1 MaD:4 |
 | test.go:40:15:40:31 | tokenizerFragment | test.go:40:15:40:42 | call to Buffered | provenance | MaD:12 |
-| test.go:43:2:43:43 | ... := ...[0] | test.go:44:24:44:34 | taintedNode | provenance |  |
-| test.go:43:31:43:42 | selection of Body | test.go:43:2:43:43 | ... := ...[0] | provenance | Src:MaD:1 MaD:5 |
+| test.go:43:2:43:43 | extract:0 ... := ... | test.go:44:24:44:34 | taintedNode | provenance |  |
+| test.go:43:31:43:42 | selection of Body | test.go:43:2:43:43 | extract:0 ... := ... | provenance | Src:MaD:1 MaD:5 |
 | test.go:44:2:44:10 | cleanNode [postupdate] | test.go:45:22:45:31 | &... | provenance |  |
 | test.go:44:2:44:10 | cleanNode [postupdate] | test.go:45:23:45:31 | cleanNode | provenance |  |
 | test.go:44:24:44:34 | taintedNode | test.go:44:2:44:10 | cleanNode [postupdate] | provenance | MaD:10 |
 | test.go:45:22:45:31 | &... [pointer] | test.go:45:22:45:31 | &... | provenance |  |
 | test.go:45:23:45:31 | cleanNode | test.go:45:22:45:31 | &... | provenance |  |
 | test.go:45:23:45:31 | cleanNode | test.go:45:22:45:31 | &... [pointer] | provenance |  |
-| test.go:48:2:48:44 | ... := ...[0] | test.go:49:26:49:37 | taintedNode2 | provenance |  |
-| test.go:48:32:48:43 | selection of Body | test.go:48:2:48:44 | ... := ...[0] | provenance | Src:MaD:1 MaD:5 |
+| test.go:48:2:48:44 | extract:0 ... := ... | test.go:49:26:49:37 | taintedNode2 | provenance |  |
+| test.go:48:32:48:43 | selection of Body | test.go:48:2:48:44 | extract:0 ... := ... | provenance | Src:MaD:1 MaD:5 |
 | test.go:49:2:49:11 | cleanNode2 [postupdate] | test.go:50:22:50:32 | &... | provenance |  |
 | test.go:49:2:49:11 | cleanNode2 [postupdate] | test.go:50:23:50:32 | cleanNode2 | provenance |  |
 | test.go:49:26:49:37 | taintedNode2 | test.go:49:2:49:11 | cleanNode2 [postupdate] | provenance | MaD:11 |
@@ -86,16 +86,16 @@ nodes
 | test.go:15:15:15:49 | type conversion | semmle.label | type conversion |
 | test.go:15:22:15:48 | call to UnescapeString | semmle.label | call to UnescapeString |
 | test.go:15:42:15:47 | param1 | semmle.label | param1 |
-| test.go:17:2:17:36 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:17:2:17:36 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:17:24:17:35 | selection of Body | semmle.label | selection of Body |
 | test.go:18:15:18:31 | type conversion | semmle.label | type conversion |
-| test.go:20:2:20:48 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:20:2:20:48 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:20:36:20:47 | selection of Body | semmle.label | selection of Body |
 | test.go:21:15:21:32 | type conversion | semmle.label | type conversion |
-| test.go:23:2:23:50 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:23:2:23:50 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:23:33:23:44 | selection of Body | semmle.label | selection of Body |
 | test.go:24:15:24:35 | type conversion | semmle.label | type conversion |
-| test.go:26:2:26:62 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:26:2:26:62 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:26:45:26:56 | selection of Body | semmle.label | selection of Body |
 | test.go:27:15:27:36 | type conversion | semmle.label | type conversion |
 | test.go:29:22:29:25 | node | semmle.label | node |
@@ -105,7 +105,7 @@ nodes
 | test.go:32:15:32:34 | call to Buffered | semmle.label | call to Buffered |
 | test.go:33:15:33:23 | tokenizer | semmle.label | tokenizer |
 | test.go:33:15:33:29 | call to Raw | semmle.label | call to Raw |
-| test.go:34:2:34:35 | ... := ...[1] | semmle.label | ... := ...[1] |
+| test.go:34:2:34:35 | extract:1 ... := ... | semmle.label | extract:1 ... := ... |
 | test.go:34:17:34:25 | tokenizer | semmle.label | tokenizer |
 | test.go:35:15:35:19 | value | semmle.label | value |
 | test.go:36:15:36:23 | tokenizer | semmle.label | tokenizer |
@@ -117,14 +117,14 @@ nodes
 | test.go:39:49:39:60 | selection of Body | semmle.label | selection of Body |
 | test.go:40:15:40:31 | tokenizerFragment | semmle.label | tokenizerFragment |
 | test.go:40:15:40:42 | call to Buffered | semmle.label | call to Buffered |
-| test.go:43:2:43:43 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:43:2:43:43 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:43:31:43:42 | selection of Body | semmle.label | selection of Body |
 | test.go:44:2:44:10 | cleanNode [postupdate] | semmle.label | cleanNode [postupdate] |
 | test.go:44:24:44:34 | taintedNode | semmle.label | taintedNode |
 | test.go:45:22:45:31 | &... | semmle.label | &... |
 | test.go:45:22:45:31 | &... [pointer] | semmle.label | &... [pointer] |
 | test.go:45:23:45:31 | cleanNode | semmle.label | cleanNode |
-| test.go:48:2:48:44 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:48:2:48:44 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:48:32:48:43 | selection of Body | semmle.label | selection of Body |
 | test.go:49:2:49:11 | cleanNode2 [postupdate] | semmle.label | cleanNode2 [postupdate] |
 | test.go:49:26:49:37 | taintedNode2 | semmle.label | taintedNode2 |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.expected b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.expected
index 8b2f05c297f8..6a229e1f37df 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.expected
@@ -1,14 +1,14 @@
 #select
-| test.go:57:11:57:41 | call to EscapeString | test.go:56:2:56:42 | ... := ...[0] | test.go:57:11:57:41 | call to EscapeString | This query depends on a $@. | test.go:56:2:56:42 | ... := ...[0] | user-provided value |
+| test.go:57:11:57:41 | call to EscapeString | test.go:56:2:56:42 | extract:0 ... := ... | test.go:57:11:57:41 | call to EscapeString | This query depends on a $@. | test.go:56:2:56:42 | extract:0 ... := ... | user-provided value |
 edges
-| test.go:56:2:56:42 | ... := ...[0] | test.go:57:29:57:40 | selection of Value | provenance | Src:MaD:2  |
+| test.go:56:2:56:42 | extract:0 ... := ... | test.go:57:29:57:40 | selection of Value | provenance | Src:MaD:2  |
 | test.go:57:29:57:40 | selection of Value | test.go:57:11:57:41 | call to EscapeString | provenance | MaD:3 Sink:MaD:1 |
 models
 | 1 | Sink: database/sql; DB; true; Query; ; ; Argument[0]; sql-injection; manual |
 | 2 | Source: net/http; Request; true; Cookie; ; ; ReturnValue[0]; remote; manual |
 | 3 | Summary: golang.org/x/net/html; ; false; EscapeString; ; ; Argument[0]; ReturnValue; taint; manual |
 nodes
-| test.go:56:2:56:42 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:56:2:56:42 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | test.go:57:11:57:41 | call to EscapeString | semmle.label | call to EscapeString |
 | test.go:57:29:57:40 | selection of Value | semmle.label | selection of Value |
 subpaths
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Yaml/yaml.go b/go/ql/test/library-tests/semmle/go/frameworks/Yaml/yaml.go
index 388d884f38b7..68b2c657d748 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Yaml/yaml.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Yaml/yaml.go
@@ -12,10 +12,10 @@ func main() {
 	var in, out interface{}
 	var inb []byte
 
-	out, _ = yaml1.Marshal(in) // $ marshaler="yaml: in -> ... = ...[0]" ttfnmodelstep="in -> ... = ...[0]"
+	out, _ = yaml1.Marshal(in) // $ marshaler="yaml: in -> extract:0 ... = ..." ttfnmodelstep="in -> extract:0 ... = ..."
 	yaml1.Unmarshal(inb, out)  // $ unmarshaler="yaml: inb -> out [postupdate]" ttfnmodelstep="inb -> out [postupdate]"
 
-	out, _ = yaml2.Marshal(in)      // $ marshaler="yaml: in -> ... = ...[0]" ttfnmodelstep="in -> ... = ...[0]"
+	out, _ = yaml2.Marshal(in)      // $ marshaler="yaml: in -> extract:0 ... = ..." ttfnmodelstep="in -> extract:0 ... = ..."
 	yaml2.Unmarshal(inb, out)       // $ unmarshaler="yaml: inb -> out [postupdate]" ttfnmodelstep="inb -> out [postupdate]"
 	yaml2.UnmarshalStrict(inb, out) // $ unmarshaler="yaml: inb -> out [postupdate]" ttfnmodelstep="inb -> out [postupdate]"
 
@@ -27,7 +27,7 @@ func main() {
 	e := yaml2.NewEncoder(w) // $ ttfnmodelstep="SSA def(e) -> w [postupdate]"
 	e.Encode(in)             // $ ttfnmodelstep="in -> e [postupdate]"
 
-	out, _ = yaml3.Marshal(in) // $ marshaler="yaml: in -> ... = ...[0]" ttfnmodelstep="in -> ... = ...[0]"
+	out, _ = yaml3.Marshal(in) // $ marshaler="yaml: in -> extract:0 ... = ..." ttfnmodelstep="in -> extract:0 ... = ..."
 	yaml3.Unmarshal(inb, out)  // $ unmarshaler="yaml: inb -> out [postupdate]" ttfnmodelstep="inb -> out [postupdate]"
 
 	d1 := yaml3.NewDecoder(r) // $ ttfnmodelstep="r -> call to NewDecoder"
diff --git a/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.expected b/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.expected
index c2f82841d83c..e15f4207b6c1 100644
--- a/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.expected
+++ b/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.expected
@@ -56,9 +56,9 @@ edges
 | SafeUrlFlow.go:74:70:74:76 | safeURL | SafeUrlFlow.go:74:70:74:85 | call to String | provenance | MaD:3 |
 | SafeUrlFlow.go:78:40:78:46 | safeURL | SafeUrlFlow.go:78:40:78:55 | call to String | provenance | MaD:3 |
 | SafeUrlFlow.go:84:14:84:21 | selection of Host | SafeUrlFlow.go:87:19:87:26 | safeHost | provenance |  |
-| SafeUrlFlow.go:87:2:87:10 | implicit dereference [postupdate] | SafeUrlFlow.go:87:2:87:10 | targetURL [postupdate] | provenance |  |
+| SafeUrlFlow.go:87:2:87:10 | implicit-deref targetURL [postupdate] | SafeUrlFlow.go:87:2:87:10 | targetURL [postupdate] | provenance |  |
 | SafeUrlFlow.go:87:2:87:10 | targetURL [postupdate] | SafeUrlFlow.go:89:24:89:32 | targetURL | provenance |  |
-| SafeUrlFlow.go:87:19:87:26 | safeHost | SafeUrlFlow.go:87:2:87:10 | implicit dereference [postupdate] | provenance | Config |
+| SafeUrlFlow.go:87:19:87:26 | safeHost | SafeUrlFlow.go:87:2:87:10 | implicit-deref targetURL [postupdate] | provenance | Config |
 | SafeUrlFlow.go:87:19:87:26 | safeHost | SafeUrlFlow.go:87:2:87:10 | targetURL [postupdate] | provenance | Config |
 | SafeUrlFlow.go:89:24:89:32 | targetURL | SafeUrlFlow.go:89:24:89:41 | call to String | provenance | MaD:3 Sink:MaD:1 |
 | SafeUrlFlow.go:96:13:96:19 | selection of URL | SafeUrlFlow.go:105:11:105:23 | reconstructed | provenance | Src:MaD:2  |
@@ -108,7 +108,7 @@ nodes
 | SafeUrlFlow.go:78:40:78:46 | safeURL | semmle.label | safeURL |
 | SafeUrlFlow.go:78:40:78:55 | call to String | semmle.label | call to String |
 | SafeUrlFlow.go:84:14:84:21 | selection of Host | semmle.label | selection of Host |
-| SafeUrlFlow.go:87:2:87:10 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| SafeUrlFlow.go:87:2:87:10 | implicit-deref targetURL [postupdate] | semmle.label | implicit-deref targetURL [postupdate] |
 | SafeUrlFlow.go:87:2:87:10 | targetURL [postupdate] | semmle.label | targetURL [postupdate] |
 | SafeUrlFlow.go:87:19:87:26 | safeHost | semmle.label | safeHost |
 | SafeUrlFlow.go:89:24:89:32 | targetURL | semmle.label | targetURL |
diff --git a/go/ql/test/query-tests/InconsistentCode/LengthComparisonOffByOne/LengthComparisonOffByOne.expected b/go/ql/test/query-tests/InconsistentCode/LengthComparisonOffByOne/LengthComparisonOffByOne.expected
index 156b5860bd68..497e6fbf8e0e 100644
--- a/go/ql/test/query-tests/InconsistentCode/LengthComparisonOffByOne/LengthComparisonOffByOne.expected
+++ b/go/ql/test/query-tests/InconsistentCode/LengthComparisonOffByOne/LengthComparisonOffByOne.expected
@@ -1,3 +1,4 @@
 | LengthComparisonOffByOne.go:8:14:8:29 | ...<=... | Off-by-one index comparison against length may lead to out-of-bounds $@. | LengthComparisonOffByOne.go:10:6:10:14 | index expression | read |
 | main.go:6:5:6:15 | ...<=... | Off-by-one index comparison against length may lead to out-of-bounds $@. | main.go:7:10:7:13 | index expression | read |
 | main.go:29:5:29:14 | ...>... | Off-by-one index comparison against length may lead to out-of-bounds $@. | main.go:30:10:30:13 | index expression | read |
+| main.go:87:7:87:17 | ...>=... | Off-by-one index comparison against length may lead to out-of-bounds $@. | main.go:93:9:93:12 | index expression | read |
diff --git a/go/ql/test/query-tests/InconsistentCode/LengthComparisonOffByOne/main.go b/go/ql/test/query-tests/InconsistentCode/LengthComparisonOffByOne/main.go
index 01e849c0f2fc..f0f1d6168638 100644
--- a/go/ql/test/query-tests/InconsistentCode/LengthComparisonOffByOne/main.go
+++ b/go/ql/test/query-tests/InconsistentCode/LengthComparisonOffByOne/main.go
@@ -83,4 +83,14 @@ func f10(i int, a intintmap) int {
 	return -1
 }
 
+func f11(a []int) int {
+	if !(len(a) >= 3 && // $ Alert
+		a[0] == 0 &&
+		a[1] == 0 &&
+		a[2] == 0) {
+		return -1
+	}
+	return a[3] // $ Source
+}
+
 func main() {}
diff --git a/go/ql/test/query-tests/InconsistentCode/MissingErrorCheck/MissingErrorCheck.expected b/go/ql/test/query-tests/InconsistentCode/MissingErrorCheck/MissingErrorCheck.expected
index 9db748ebabd0..acd73e5a79ef 100644
--- a/go/ql/test/query-tests/InconsistentCode/MissingErrorCheck/MissingErrorCheck.expected
+++ b/go/ql/test/query-tests/InconsistentCode/MissingErrorCheck/MissingErrorCheck.expected
@@ -1,2 +1,2 @@
-| tests.go:61:30:61:35 | result | $@ may be nil at this dereference because $@ may not have been checked. | tests.go:59:2:59:7 | SSA def(result) | result | tests.go:59:10:59:12 | SSA def(err) | err |
-| tests.go:243:27:243:32 | result | $@ may be nil at this dereference because $@ may not have been checked. | tests.go:241:2:241:7 | SSA def(result) | result | tests.go:241:10:241:12 | SSA def(err) | err |
+| tests.go:61:30:61:35 | result | $@ may be nil at this dereference because $@ may not have been checked. | tests.go:59:2:59:30 | SSA def(result) | result | tests.go:59:2:59:30 | SSA def(err) | err |
+| tests.go:243:27:243:32 | result | $@ may be nil at this dereference because $@ may not have been checked. | tests.go:241:2:241:37 | SSA def(result) | result | tests.go:241:2:241:37 | SSA def(err) | err |
diff --git a/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/CONSISTENCY/CfgConsistency.expected b/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..2ce97565d12d
--- /dev/null
+++ b/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/CONSISTENCY/CfgConsistency.expected
@@ -0,0 +1,9 @@
+consistencyOverview
+| multipleSuccessors | 6 |
+multipleSuccessors
+| tests.go:96:2:104:2 | After if statement | successor | tests.go:94:30:105:1 | After block statement |
+| tests.go:96:2:104:2 | After if statement | successor | tests.go:99:9:99:17 | defer-invoke call to Close |
+| tests.go:119:2:119:6 | After ... = ... | successor | tests.go:107:31:120:1 | After block statement |
+| tests.go:119:2:119:6 | After ... = ... | successor | tests.go:112:9:112:17 | defer-invoke call to Close |
+| tests.go:124:2:136:2 | After if statement | successor | tests.go:122:46:137:1 | After block statement |
+| tests.go:124:2:136:2 | After if statement | successor | tests.go:126:9:126:17 | defer-invoke call to Close |
diff --git a/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.expected b/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.expected
index 5ded10ee1bde..4fe3c754a5a5 100644
--- a/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.expected
+++ b/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.expected
@@ -1,30 +1,30 @@
 #select
-| tests.go:10:8:10:8 | f | tests.go:32:5:32:78 | ... := ...[0] | tests.go:10:8:10:8 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:32:15:32:78 | call to OpenFile | call to OpenFile |
-| tests.go:10:8:10:8 | f | tests.go:46:5:46:76 | ... := ...[0] | tests.go:10:8:10:8 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:46:15:46:76 | call to OpenFile | call to OpenFile |
-| tests.go:15:3:15:3 | f | tests.go:32:5:32:78 | ... := ...[0] | tests.go:15:3:15:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:32:15:32:78 | call to OpenFile | call to OpenFile |
-| tests.go:15:3:15:3 | f | tests.go:46:5:46:76 | ... := ...[0] | tests.go:15:3:15:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:46:15:46:76 | call to OpenFile | call to OpenFile |
-| tests.go:57:3:57:3 | f | tests.go:55:5:55:78 | ... := ...[0] | tests.go:57:3:57:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:55:15:55:78 | call to OpenFile | call to OpenFile |
-| tests.go:69:3:69:3 | f | tests.go:67:5:67:76 | ... := ...[0] | tests.go:69:3:69:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:67:15:67:76 | call to OpenFile | call to OpenFile |
-| tests.go:126:9:126:9 | f | tests.go:124:5:124:78 | ... := ...[0] | tests.go:126:9:126:9 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:124:15:124:78 | call to OpenFile | call to OpenFile |
-| tests.go:145:3:145:3 | f | tests.go:141:5:141:78 | ... := ...[0] | tests.go:145:3:145:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:141:15:141:78 | call to OpenFile | call to OpenFile |
-| tests.go:166:8:166:8 | f | tests.go:162:2:162:74 | ... := ...[0] | tests.go:166:8:166:8 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:162:12:162:74 | call to OpenFile | call to OpenFile |
+| tests.go:10:8:10:8 | f | tests.go:32:5:32:78 | extract:0 ... := ... | tests.go:10:8:10:8 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:32:15:32:78 | call to OpenFile | call to OpenFile |
+| tests.go:10:8:10:8 | f | tests.go:46:5:46:76 | extract:0 ... := ... | tests.go:10:8:10:8 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:46:15:46:76 | call to OpenFile | call to OpenFile |
+| tests.go:15:3:15:3 | f | tests.go:32:5:32:78 | extract:0 ... := ... | tests.go:15:3:15:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:32:15:32:78 | call to OpenFile | call to OpenFile |
+| tests.go:15:3:15:3 | f | tests.go:46:5:46:76 | extract:0 ... := ... | tests.go:15:3:15:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:46:15:46:76 | call to OpenFile | call to OpenFile |
+| tests.go:57:3:57:3 | f | tests.go:55:5:55:78 | extract:0 ... := ... | tests.go:57:3:57:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:55:15:55:78 | call to OpenFile | call to OpenFile |
+| tests.go:69:3:69:3 | f | tests.go:67:5:67:76 | extract:0 ... := ... | tests.go:69:3:69:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:67:15:67:76 | call to OpenFile | call to OpenFile |
+| tests.go:126:9:126:9 | f | tests.go:124:5:124:78 | extract:0 ... := ... | tests.go:126:9:126:9 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:124:15:124:78 | call to OpenFile | call to OpenFile |
+| tests.go:145:3:145:3 | f | tests.go:141:5:141:78 | extract:0 ... := ... | tests.go:145:3:145:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:141:15:141:78 | call to OpenFile | call to OpenFile |
+| tests.go:166:8:166:8 | f | tests.go:162:2:162:74 | extract:0 ... := ... | tests.go:166:8:166:8 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:162:12:162:74 | call to OpenFile | call to OpenFile |
 edges
 | tests.go:9:24:9:24 | SSA def(f) | tests.go:10:8:10:8 | f | provenance |  |
 | tests.go:13:32:13:32 | SSA def(f) | tests.go:14:13:16:2 | SSA def(f) | provenance |  |
 | tests.go:14:13:16:2 | SSA def(f) | tests.go:15:3:15:3 | f | provenance |  |
-| tests.go:32:5:32:78 | ... := ...[0] | tests.go:33:21:33:21 | f | provenance | Src:MaD:1  |
-| tests.go:32:5:32:78 | ... := ...[0] | tests.go:34:29:34:29 | f | provenance | Src:MaD:1  |
+| tests.go:32:5:32:78 | extract:0 ... := ... | tests.go:33:21:33:21 | f | provenance | Src:MaD:1  |
+| tests.go:32:5:32:78 | extract:0 ... := ... | tests.go:34:29:34:29 | f | provenance | Src:MaD:1  |
 | tests.go:33:21:33:21 | f | tests.go:9:24:9:24 | SSA def(f) | provenance |  |
 | tests.go:34:29:34:29 | f | tests.go:13:32:13:32 | SSA def(f) | provenance |  |
-| tests.go:46:5:46:76 | ... := ...[0] | tests.go:47:21:47:21 | f | provenance | Src:MaD:1  |
-| tests.go:46:5:46:76 | ... := ...[0] | tests.go:48:29:48:29 | f | provenance | Src:MaD:1  |
+| tests.go:46:5:46:76 | extract:0 ... := ... | tests.go:47:21:47:21 | f | provenance | Src:MaD:1  |
+| tests.go:46:5:46:76 | extract:0 ... := ... | tests.go:48:29:48:29 | f | provenance | Src:MaD:1  |
 | tests.go:47:21:47:21 | f | tests.go:9:24:9:24 | SSA def(f) | provenance |  |
 | tests.go:48:29:48:29 | f | tests.go:13:32:13:32 | SSA def(f) | provenance |  |
-| tests.go:55:5:55:78 | ... := ...[0] | tests.go:57:3:57:3 | f | provenance | Src:MaD:1  |
-| tests.go:67:5:67:76 | ... := ...[0] | tests.go:69:3:69:3 | f | provenance | Src:MaD:1  |
-| tests.go:124:5:124:78 | ... := ...[0] | tests.go:126:9:126:9 | f | provenance | Src:MaD:1  |
-| tests.go:141:5:141:78 | ... := ...[0] | tests.go:145:3:145:3 | f | provenance | Src:MaD:1  |
-| tests.go:162:2:162:74 | ... := ...[0] | tests.go:166:8:166:8 | f | provenance | Src:MaD:1  |
+| tests.go:55:5:55:78 | extract:0 ... := ... | tests.go:57:3:57:3 | f | provenance | Src:MaD:1  |
+| tests.go:67:5:67:76 | extract:0 ... := ... | tests.go:69:3:69:3 | f | provenance | Src:MaD:1  |
+| tests.go:124:5:124:78 | extract:0 ... := ... | tests.go:126:9:126:9 | f | provenance | Src:MaD:1  |
+| tests.go:141:5:141:78 | extract:0 ... := ... | tests.go:145:3:145:3 | f | provenance | Src:MaD:1  |
+| tests.go:162:2:162:74 | extract:0 ... := ... | tests.go:166:8:166:8 | f | provenance | Src:MaD:1  |
 models
 | 1 | Source: os; ; false; OpenFile; ; ; ReturnValue[0]; file; manual |
 nodes
@@ -33,20 +33,20 @@ nodes
 | tests.go:13:32:13:32 | SSA def(f) | semmle.label | SSA def(f) |
 | tests.go:14:13:16:2 | SSA def(f) | semmle.label | SSA def(f) |
 | tests.go:15:3:15:3 | f | semmle.label | f |
-| tests.go:32:5:32:78 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:32:5:32:78 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | tests.go:33:21:33:21 | f | semmle.label | f |
 | tests.go:34:29:34:29 | f | semmle.label | f |
-| tests.go:46:5:46:76 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:46:5:46:76 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | tests.go:47:21:47:21 | f | semmle.label | f |
 | tests.go:48:29:48:29 | f | semmle.label | f |
-| tests.go:55:5:55:78 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:55:5:55:78 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | tests.go:57:3:57:3 | f | semmle.label | f |
-| tests.go:67:5:67:76 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:67:5:67:76 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | tests.go:69:3:69:3 | f | semmle.label | f |
-| tests.go:124:5:124:78 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:124:5:124:78 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | tests.go:126:9:126:9 | f | semmle.label | f |
-| tests.go:141:5:141:78 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:141:5:141:78 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | tests.go:145:3:145:3 | f | semmle.label | f |
-| tests.go:162:2:162:74 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:162:2:162:74 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | tests.go:166:8:166:8 | f | semmle.label | f |
 subpaths
diff --git a/go/ql/test/query-tests/InconsistentCode/WhitespaceContradictsPrecedence/ParenthesizedOperands.go b/go/ql/test/query-tests/InconsistentCode/WhitespaceContradictsPrecedence/ParenthesizedOperands.go
new file mode 100644
index 000000000000..07882d38b0a4
--- /dev/null
+++ b/go/ql/test/query-tests/InconsistentCode/WhitespaceContradictsPrecedence/ParenthesizedOperands.go
@@ -0,0 +1,11 @@
+package main
+
+// autoformat-ignore (otherwise gofmt will insist on its particular spacing)
+
+func weightedMeanGood(a, b float64, countA, countB, total int) float64 {
+	return ((a * float64(countA)) + (b * float64(countB))) / float64(total)
+}
+
+func parenthesizedGood(a, b, c int) int {
+	return (a ^ b)&c
+}
diff --git a/go/ql/test/query-tests/RedundantCode/DeadStoreOfField/CONSISTENCY/CfgConsistency.expected b/go/ql/test/query-tests/RedundantCode/DeadStoreOfField/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/query-tests/RedundantCode/DeadStoreOfField/DeadStoreOfField.expected b/go/ql/test/query-tests/RedundantCode/DeadStoreOfField/DeadStoreOfField.expected
index 68935b96eca4..476154a69fa5 100644
--- a/go/ql/test/query-tests/RedundantCode/DeadStoreOfField/DeadStoreOfField.expected
+++ b/go/ql/test/query-tests/RedundantCode/DeadStoreOfField/DeadStoreOfField.expected
@@ -1 +1,3 @@
-| DeadStoreOfField.go:8:2:8:6 | assignment to field val | This assignment to val is useless since its value is never read. |
+| DeadStoreOfField.go:8:2:8:6 | selection of val | This assignment to val is useless since its value is never read. |
+| writetargets.go:18:2:18:4 | selection of a | This assignment to a is useless since its value is never read. |
+| writetargets.go:23:2:23:4 | selection of c | This assignment to c is useless since its value is never read. |
diff --git a/go/ql/test/query-tests/RedundantCode/DeadStoreOfField/writetargets.go b/go/ql/test/query-tests/RedundantCode/DeadStoreOfField/writetargets.go
new file mode 100644
index 000000000000..25d4630bfb47
--- /dev/null
+++ b/go/ql/test/query-tests/RedundantCode/DeadStoreOfField/writetargets.go
@@ -0,0 +1,37 @@
+package main
+
+// Field-write target variations for go/useless-assignment-to-field, exercising
+// the FieldTarget write target with different selector-expression shapes.
+
+type wtInner struct {
+	a int
+	b int
+}
+
+type wtEmbed struct {
+	wtInner
+	c int
+}
+
+// direct field write on a value copy (dead)
+func wtDirect(v wtInner) {
+	v.a = 0 // $ Alert
+}
+
+// non-embedded field write on a value copy (dead)
+func wtOwnField(v wtEmbed) {
+	v.c = 0 // $ Alert
+}
+
+// The query only reports direct `v.f` writes, so writes whose base is itself a
+// field access are not flagged, even though they are also dead.
+
+// explicitly-qualified embedded field write on a value copy (not flagged)
+func wtNested(v wtEmbed) {
+	v.wtInner.b = 0 // OK
+}
+
+// promoted (value-embedded) field write on a value copy (not flagged)
+func wtPromoted(v wtEmbed) {
+	v.a = 0 // OK
+}
diff --git a/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/CONSISTENCY/CfgConsistency.expected b/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..b77a8bf15ea0
--- /dev/null
+++ b/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/CONSISTENCY/CfgConsistency.expected
@@ -0,0 +1,13 @@
+consistencyOverview
+| multipleSuccessors | 10 |
+multipleSuccessors
+| testdata.go:418:2:423:2 | select statement | successor | testdata.go:419:2:420:7 | comm clause |
+| testdata.go:418:2:423:2 | select statement | successor | testdata.go:421:2:422:7 | comm clause |
+| testdata.go:430:2:437:2 | select statement | successor | testdata.go:431:2:432:17 | comm clause |
+| testdata.go:430:2:437:2 | select statement | successor | testdata.go:433:2:434:17 | comm clause |
+| testdata.go:430:2:437:2 | select statement | successor | testdata.go:435:2:436:7 | comm clause |
+| testdata.go:443:2:450:2 | select statement | successor | testdata.go:444:2:445:7 | comm clause |
+| testdata.go:443:2:450:2 | select statement | successor | testdata.go:446:2:447:7 | comm clause |
+| testdata.go:443:2:450:2 | select statement | successor | testdata.go:448:2:449:7 | comm clause |
+| testdata.go:457:2:462:2 | select statement | successor | testdata.go:458:2:459:7 | comm clause |
+| testdata.go:457:2:462:2 | select statement | successor | testdata.go:460:2:461:7 | comm clause |
diff --git a/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/CONSISTENCY/UnexpectedFrontendErrors.expected b/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/CONSISTENCY/UnexpectedFrontendErrors.expected
index a7a03f17abcf..dbdac1b9d081 100644
--- a/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/CONSISTENCY/UnexpectedFrontendErrors.expected
+++ b/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/CONSISTENCY/UnexpectedFrontendErrors.expected
@@ -1 +1 @@
-| main.go:36:9:36:9 | undefined: unknownFunction |
+| main.go:41:9:41:9 | undefined: unknownFunction |
diff --git a/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/DeadStoreOfLocal.expected b/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/DeadStoreOfLocal.expected
index 5b2010251ef7..a2cba0d5dc92 100644
--- a/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/DeadStoreOfLocal.expected
+++ b/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/DeadStoreOfLocal.expected
@@ -1,30 +1,42 @@
-| main.go:25:2:25:2 | assignment to x | This definition of x is never used. |
-| testdata.go:32:2:32:2 | assignment to x | This definition of x is never used. |
-| testdata.go:37:2:37:2 | assignment to x | This definition of x is never used. |
-| testdata.go:61:2:61:2 | assignment to x | This definition of x is never used. |
-| testdata.go:67:2:67:2 | assignment to x | This definition of x is never used. |
-| testdata.go:99:2:99:2 | assignment to x | This definition of x is never used. |
-| testdata.go:101:3:101:3 | assignment to x | This definition of x is never used. |
-| testdata.go:108:2:108:2 | assignment to x | This definition of x is never used. |
-| testdata.go:110:3:110:3 | assignment to x | This definition of x is never used. |
-| testdata.go:128:2:128:2 | assignment to x | This definition of x is never used. |
-| testdata.go:130:3:130:3 | assignment to x | This definition of x is never used. |
-| testdata.go:131:3:131:3 | assignment to x | This definition of x is never used. |
-| testdata.go:134:3:134:3 | assignment to x | This definition of x is never used. |
-| testdata.go:143:3:143:3 | assignment to x | This definition of x is never used. |
-| testdata.go:164:3:164:3 | assignment to x | This definition of x is never used. |
-| testdata.go:172:3:172:3 | assignment to x | This definition of x is never used. |
-| testdata.go:180:3:180:5 | increment statement | This definition of x is never used. |
-| testdata.go:201:2:201:2 | assignment to x | This definition of x is never used. |
-| testdata.go:262:2:262:2 | assignment to x | This definition of x is never used. |
-| testdata.go:268:2:268:2 | assignment to x | This definition of x is never used. |
-| testdata.go:309:2:309:2 | assignment to a | This definition of a is never used. |
-| testdata.go:321:2:321:2 | assignment to a | This definition of a is never used. |
-| testdata.go:387:3:387:3 | assignment to x | This definition of x is never used. |
-| testdata.go:432:3:432:3 | assignment to x | This definition of x is never used. |
-| testdata.go:434:3:434:3 | assignment to x | This definition of x is never used. |
-| testdata.go:441:2:441:2 | assignment to x | This definition of x is never used. |
-| testdata.go:488:3:488:3 | assignment to x | This definition of x is never used. |
-| testdata.go:542:3:542:3 | assignment to x | This definition of x is never used. |
-| testdata.go:580:4:580:4 | assignment to x | This definition of x is never used. |
-| testdata.go:629:3:629:4 | assignment to v1 | This definition of v1 is never used. |
+| main.go:25:2:25:2 | x | This definition of x is never used. |
+| testdata.go:32:2:32:2 | x | This definition of x is never used. |
+| testdata.go:37:2:37:2 | x | This definition of x is never used. |
+| testdata.go:61:2:61:2 | x | This definition of x is never used. |
+| testdata.go:67:2:67:2 | x | This definition of x is never used. |
+| testdata.go:99:2:99:2 | x | This definition of x is never used. |
+| testdata.go:101:3:101:3 | x | This definition of x is never used. |
+| testdata.go:108:2:108:2 | x | This definition of x is never used. |
+| testdata.go:110:3:110:3 | x | This definition of x is never used. |
+| testdata.go:128:2:128:2 | x | This definition of x is never used. |
+| testdata.go:130:3:130:3 | x | This definition of x is never used. |
+| testdata.go:131:3:131:3 | x | This definition of x is never used. |
+| testdata.go:134:3:134:3 | x | This definition of x is never used. |
+| testdata.go:143:3:143:3 | x | This definition of x is never used. |
+| testdata.go:164:3:164:3 | x | This definition of x is never used. |
+| testdata.go:172:3:172:3 | x | This definition of x is never used. |
+| testdata.go:180:3:180:3 | x | This definition of x is never used. |
+| testdata.go:201:2:201:2 | x | This definition of x is never used. |
+| testdata.go:262:2:262:2 | x | This definition of x is never used. |
+| testdata.go:268:2:268:2 | x | This definition of x is never used. |
+| testdata.go:309:2:309:2 | a | This definition of a is never used. |
+| testdata.go:321:2:321:2 | a | This definition of a is never used. |
+| testdata.go:387:3:387:3 | x | This definition of x is never used. |
+| testdata.go:432:3:432:3 | x | This definition of x is never used. |
+| testdata.go:434:3:434:3 | x | This definition of x is never used. |
+| testdata.go:441:2:441:2 | x | This definition of x is never used. |
+| testdata.go:488:3:488:3 | x | This definition of x is never used. |
+| testdata.go:542:3:542:3 | x | This definition of x is never used. |
+| testdata.go:580:4:580:4 | x | This definition of x is never used. |
+| testdata.go:629:3:629:4 | v1 | This definition of v1 is never used. |
+| writetargets.go:20:2:20:2 | x | This definition of x is never used. |
+| writetargets.go:27:2:27:2 | x | This definition of x is never used. |
+| writetargets.go:34:6:34:6 | x | This definition of x is never used. |
+| writetargets.go:41:2:41:2 | x | This definition of x is never used. |
+| writetargets.go:48:2:48:2 | x | This definition of x is never used. |
+| writetargets.go:55:2:55:2 | x | This definition of x is never used. |
+| writetargets.go:62:2:62:2 | x | This definition of x is never used. |
+| writetargets.go:71:2:71:2 | x | This definition of x is never used. |
+| writetargets.go:79:2:79:2 | v | This definition of v is never used. |
+| writetargets.go:87:2:87:2 | v | This definition of v is never used. |
+| writetargets.go:95:9:95:9 | v | This definition of v is never used. |
+| writetargets.go:105:2:105:2 | r | This definition of r is never used. |
diff --git a/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/main.go b/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/main.go
index ee7b9214a66b..6574f5377bb2 100644
--- a/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/main.go
+++ b/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/main.go
@@ -26,6 +26,11 @@ func deadParameter(x int) bool { // we don't want to flag x here
 	return true
 }
 
+func usedOnlyAfterFalse() bool {
+	s := deadStore()
+	return false && s == 0
+}
+
 func test2(x int) (int, int) {
 	y := x >> 5
 	z := x % (1)
diff --git a/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/writetargets.go b/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/writetargets.go
new file mode 100644
index 000000000000..a7d707cfc8ea
--- /dev/null
+++ b/go/ql/test/query-tests/RedundantCode/DeadStoreOfLocal/writetargets.go
@@ -0,0 +1,135 @@
+package p
+
+// Examples exercising each kind of IR write target, to check that
+// `go/useless-assignment-to-local` reports the assigned variable for every kind
+// and correctly ignores writes that do not define a local variable.
+
+func wtTwoInts() (int, int) { return deadStore(), deadStore() }
+
+func wtMap() map[string]int { return nil }
+
+func wtIface() interface{} { return nil }
+
+type wtStruct struct{ f int }
+
+// --- Write targets that define a local variable (can be flagged) ---
+
+// simple assignment (assign / VarOrConstTarget)
+func wtAssign() {
+	var x int
+	x = deadStore() // $ Alert
+	x = deadStore()
+	_ = x
+}
+
+// short variable declaration (assign)
+func wtShortDecl() {
+	x := deadStore() // $ Alert
+	x = deadStore()
+	_ = x
+}
+
+// var declaration with initializer (assign via ValueSpec)
+func wtVarDecl() {
+	var x = deadStore() // $ Alert
+	x = deadStore()
+	_ = x
+}
+
+// compound assignment (compound-rhs)
+func wtCompound(x int) int {
+	x += deadStore() // $ Alert
+	x = deadStore()
+	return x
+}
+
+// increment (compound-rhs on an IncDecStmt)
+func wtIncrement(x int) int {
+	x++ // $ Alert
+	x = deadStore()
+	return x
+}
+
+// decrement (compound-rhs on an IncDecStmt)
+func wtDecrement(x int) int {
+	x-- // $ Alert
+	x = deadStore()
+	return x
+}
+
+// tuple destructuring in a short declaration (extract)
+func wtExtractShortDecl() {
+	x, y := wtTwoInts() // $ Alert
+	x = deadStore()
+	_ = x
+	_ = y
+}
+
+// tuple destructuring in an assignment (extract)
+func wtExtractAssign() {
+	var x, y int
+	x, y = wtTwoInts() // $ Alert
+	x = deadStore()
+	_ = x
+	_ = y
+}
+
+// map access with comma-ok (extract)
+func wtExtractMapCommaOk() {
+	v, ok := wtMap()["k"] // $ Alert
+	v = deadStore()
+	_ = v
+	_ = ok
+}
+
+// type assertion with comma-ok (extract)
+func wtExtractTypeAssert() {
+	v, ok := wtIface().(int) // $ Alert
+	v = deadStore()
+	_ = v
+	_ = ok
+}
+
+// range key/value (extract on a RangeElementExpr)
+func wtExtractRange(xs []int) {
+	for i, v := range xs { // $ Alert
+		v = deadStore()
+		_ = i
+		_ = v
+	}
+}
+
+// assignment to a named result (VarOrConstTarget), dead because it is
+// overwritten by the value in the `return` statement
+func wtNamedResult() (r int) {
+	r = deadStore() // $ Alert
+	return deadStore()
+}
+
+// --- Write targets that do not define a local variable (never flagged here) ---
+
+// field write (FieldTarget) - covered by go/useless-assignment-to-field
+func wtField(s *wtStruct) {
+	s.f = deadStore()
+	s.f = deadStore()
+	_ = s.f
+}
+
+// element write (ElementTarget)
+func wtElement(xs []int) {
+	xs[0] = deadStore()
+	xs[0] = deadStore()
+	_ = xs[0]
+}
+
+// pointer dereference write (PointerTarget)
+func wtPointer(p *int) {
+	*p = deadStore()
+	*p = deadStore()
+	_ = *p
+}
+
+// composite literal element (MkLiteralElementTarget)
+func wtLiteralElement() {
+	_ = []int{deadStore(), deadStore()}
+}
diff --git a/go/ql/test/query-tests/RedundantCode/RedundantRecover/CONSISTENCY/CfgConsistency.expected b/go/ql/test/query-tests/RedundantCode/RedundantRecover/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/query-tests/RedundantCode/RedundantRecover/RedundantRecover.expected b/go/ql/test/query-tests/RedundantCode/RedundantRecover/RedundantRecover.expected
index fdc175c8cf0f..07295232067a 100644
--- a/go/ql/test/query-tests/RedundantCode/RedundantRecover/RedundantRecover.expected
+++ b/go/ql/test/query-tests/RedundantCode/RedundantRecover/RedundantRecover.expected
@@ -1,3 +1,3 @@
 | RedundantRecover1.go:6:5:6:13 | call to recover | This call to 'recover' has no effect because $@ is never called using a defer statement. | RedundantRecover1.go:5:1:9:1 | function declaration | the enclosing function |
-| RedundantRecover2.go:4:8:4:16 | call to recover | Deferred calls to 'recover' have no effect. | RedundantRecover2.go:3:1:6:1 | function declaration | the enclosing function |
+| RedundantRecover2.go:4:8:4:16 | defer-invoke call to recover | Deferred calls to 'recover' have no effect. | RedundantRecover2.go:3:1:6:1 | function declaration | the enclosing function |
 | tst.go:8:5:8:13 | call to recover | This call to 'recover' has no effect because $@ is never called using a defer statement. | tst.go:5:1:11:1 | function declaration | the enclosing function |
diff --git a/go/ql/test/query-tests/RedundantCode/RedundantRecover/tst.go b/go/ql/test/query-tests/RedundantCode/RedundantRecover/tst.go
index c9bebbd4bfe4..e136cd9dff50 100644
--- a/go/ql/test/query-tests/RedundantCode/RedundantRecover/tst.go
+++ b/go/ql/test/query-tests/RedundantCode/RedundantRecover/tst.go
@@ -3,16 +3,16 @@ package main
 import "fmt"
 
 func callRecover3() {
-	// This will have no effect because panics do not propagate down the stack,
-	// only back up the stack
+	// This has no effect because recover is only effective when called directly
+	// by a deferred function while its caller is panicking.
 	if recover() != nil { // $ Alert
 		fmt.Printf("recovered")
 	}
 }
 
 func fun3() {
-	panic("3")
 	callRecover3()
+	panic("3")
 }
 
 func callRecover4() {
diff --git a/go/ql/test/query-tests/RedundantCode/UnreachableStatement/CONSISTENCY/CfgConsistency.expected b/go/ql/test/query-tests/RedundantCode/UnreachableStatement/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..887fef4a49c7
--- /dev/null
+++ b/go/ql/test/query-tests/RedundantCode/UnreachableStatement/CONSISTENCY/CfgConsistency.expected
@@ -0,0 +1,14 @@
+consistencyOverview
+| deadEnd | 11 |
+deadEnd
+| main.go:17:2:17:10 | select statement |
+| main.go:109:2:109:10 | select statement |
+| main.go:115:2:115:10 | select statement |
+| main.go:126:2:126:10 | select statement |
+| main.go:132:2:132:10 | select statement |
+| main.go:138:2:138:10 | select statement |
+| main.go:145:2:145:10 | select statement |
+| main.go:151:2:151:10 | select statement |
+| main.go:157:2:157:10 | select statement |
+| main.go:164:2:164:10 | select statement |
+| main.go:168:2:168:10 | select statement |
diff --git a/go/ql/test/query-tests/RedundantCode/UnreachableStatement/UnreachableStatement.expected b/go/ql/test/query-tests/RedundantCode/UnreachableStatement/UnreachableStatement.expected
index 9c70b439d5b3..240cfcaf1e5e 100644
--- a/go/ql/test/query-tests/RedundantCode/UnreachableStatement/UnreachableStatement.expected
+++ b/go/ql/test/query-tests/RedundantCode/UnreachableStatement/UnreachableStatement.expected
@@ -10,3 +10,4 @@
 | main.go:147:2:147:17 | return statement | This statement is unreachable. |
 | main.go:153:2:153:22 | return statement | This statement is unreachable. |
 | main.go:159:2:159:43 | return statement | This statement is unreachable. |
+| main.go:171:2:171:14 | expression statement | This statement is unreachable. |
diff --git a/go/ql/test/query-tests/RedundantCode/UnreachableStatement/main.go b/go/ql/test/query-tests/RedundantCode/UnreachableStatement/main.go
index cc26b717f605..016920175bb7 100644
--- a/go/ql/test/query-tests/RedundantCode/UnreachableStatement/main.go
+++ b/go/ql/test/query-tests/RedundantCode/UnreachableStatement/main.go
@@ -159,4 +159,48 @@ func test19() mystruct {
 	return mystruct{test10(1), test10(2) == 2} // $ Alert
 }
 
+func test20() {
+	go panic("panic in another goroutine")
+	select {} // OK: reachable after starting the goroutine
+}
+
+func test21() {
+	select {}
+	panic("unreachable") // OK: allowlisted statement
+	// OK: empty statement
+	unreachable() // $ Alert
+}
+
+func test22() {
+	goto reachableLabel
+	panic("unreachable") // OK: allowlisted statement
+reachableLabel:
+	reachable() // OK: reachable through the goto
+}
+
+func test23() {
+	if true {
+		return
+	}
+	unreachable() // OK: deliberately unreachable
+	unreachable() // OK: deliberately unreachable
+}
+
+type (
+	embedded  struct{}
+	recursive struct {
+		*embedded
+		value int
+		*recursive
+	}
+)
+
+func test24(x *recursive) []int {
+	values := []int{0}
+	if x.value != 0 {
+		values = append(values, x.value)
+	}
+	return values // OK: reachable because value is a direct field of recursive
+}
+
 func main() {}
diff --git a/go/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegexp/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegexp/CONSISTENCY/DataFlowConsistency.expected
index 1861fe5d2b9d..5290b84ea889 100644
--- a/go/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegexp/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegexp/CONSISTENCY/DataFlowConsistency.expected
@@ -1,5 +1,5 @@
 reverseRead
-| IncompleteHostnameRegexp.go:12:42:12:44 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| IncompleteHostnameRegexpGood2.go:12:42:12:44 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| IncompleteHostnameRegexpGood.go:12:42:12:44 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| main.go:18:57:18:57 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| IncompleteHostnameRegexp.go:12:42:12:44 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| IncompleteHostnameRegexpGood2.go:12:42:12:44 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| IncompleteHostnameRegexpGood.go:12:42:12:44 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| main.go:18:57:18:57 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-020/MissingRegexpAnchor/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-020/MissingRegexpAnchor/CONSISTENCY/DataFlowConsistency.expected
index a9e0caae7699..16052a78564a 100644
--- a/go/ql/test/query-tests/Security/CWE-020/MissingRegexpAnchor/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-020/MissingRegexpAnchor/CONSISTENCY/DataFlowConsistency.expected
@@ -1,3 +1,3 @@
 reverseRead
-| MissingRegexpAnchor.go:12:42:12:44 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| MissingRegexpAnchorGood.go:12:42:12:44 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| MissingRegexpAnchor.go:12:42:12:44 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| MissingRegexpAnchorGood.go:12:42:12:44 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-022/CONSISTENCY/CfgConsistency.expected b/go/ql/test/query-tests/Security/CWE-022/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/query-tests/Security/CWE-022/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-022/CONSISTENCY/DataFlowConsistency.expected
index 69de1fc20fd4..9f47590b9448 100644
--- a/go/ql/test/query-tests/Security/CWE-022/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-022/CONSISTENCY/DataFlowConsistency.expected
@@ -1,3 +1,3 @@
 reverseRead
-| TaintedPath.go:15:18:15:18 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| TaintedPath.go:15:18:15:18 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
 | TaintedPath.go:84:28:84:32 | files | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
index 851ed3533ae9..ecb64813d4c4 100644
--- a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
+++ b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
@@ -12,8 +12,8 @@ edges
 | TaintedPath.go:22:57:22:68 | tainted_path | TaintedPath.go:26:63:26:74 | tainted_path | provenance |  |
 | TaintedPath.go:22:57:22:68 | tainted_path | TaintedPath.go:43:29:43:40 | tainted_path | provenance | Sink:MaD:1 |
 | TaintedPath.go:22:57:22:68 | tainted_path | TaintedPath.go:74:39:74:56 | ...+... | provenance |  |
-| TaintedPath.go:26:2:26:75 | ... := ...[0] | TaintedPath.go:27:28:27:45 | sanitized_filepath | provenance | Sink:MaD:1 |
-| TaintedPath.go:26:63:26:74 | tainted_path | TaintedPath.go:26:2:26:75 | ... := ...[0] | provenance | MaD:4 |
+| TaintedPath.go:26:2:26:75 | extract:0 ... := ... | TaintedPath.go:27:28:27:45 | sanitized_filepath | provenance | Sink:MaD:1 |
+| TaintedPath.go:26:63:26:74 | tainted_path | TaintedPath.go:26:2:26:75 | extract:0 ... := ... | provenance | MaD:4 |
 | TaintedPath.go:74:39:74:56 | ...+... | TaintedPath.go:74:28:74:57 | call to Clean | provenance | MaD:5 Sink:MaD:1 |
 models
 | 1 | Sink: io/ioutil; ; false; ReadFile; ; ; Argument[0]; path-injection; manual |
@@ -27,7 +27,7 @@ nodes
 | TaintedPath.go:18:29:18:40 | tainted_path | semmle.label | tainted_path |
 | TaintedPath.go:22:28:22:69 | call to Join | semmle.label | call to Join |
 | TaintedPath.go:22:57:22:68 | tainted_path | semmle.label | tainted_path |
-| TaintedPath.go:26:2:26:75 | ... := ...[0] | semmle.label | ... := ...[0] |
+| TaintedPath.go:26:2:26:75 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | TaintedPath.go:26:63:26:74 | tainted_path | semmle.label | tainted_path |
 | TaintedPath.go:27:28:27:45 | sanitized_filepath | semmle.label | sanitized_filepath |
 | TaintedPath.go:43:29:43:40 | tainted_path | semmle.label | tainted_path |
diff --git a/go/ql/test/query-tests/Security/CWE-022/ZipSlip.expected b/go/ql/test/query-tests/Security/CWE-022/ZipSlip.expected
index 88f1666af3b9..6ed511869f75 100644
--- a/go/ql/test/query-tests/Security/CWE-022/ZipSlip.expected
+++ b/go/ql/test/query-tests/Security/CWE-022/ZipSlip.expected
@@ -1,27 +1,27 @@
 #select
-| UnsafeUnzipSymlinkGood.go:72:3:72:25 | ... := ...[0] | UnsafeUnzipSymlinkGood.go:72:3:72:25 | ... := ...[0] | UnsafeUnzipSymlinkGood.go:61:31:61:62 | call to Join | Unsanitized archive entry, which may contain '..', is used in a $@. | UnsafeUnzipSymlinkGood.go:61:31:61:62 | call to Join | file system operation |
-| ZipSlip.go:11:2:15:2 | range statement[1] | ZipSlip.go:11:2:15:2 | range statement[1] | ZipSlip.go:14:20:14:20 | p | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlip.go:14:20:14:20 | p | file system operation |
-| tarslip.go:15:2:15:30 | ... := ...[0] | tarslip.go:15:2:15:30 | ... := ...[0] | tarslip.go:16:14:16:34 | call to Dir | Unsanitized archive entry, which may contain '..', is used in a $@. | tarslip.go:16:14:16:34 | call to Dir | file system operation |
-| tst.go:23:2:43:2 | range statement[1] | tst.go:23:2:43:2 | range statement[1] | tst.go:27:21:27:48 | call to Join | Unsanitized archive entry, which may contain '..', is used in a $@. | tst.go:27:21:27:48 | call to Join | file system operation |
-| tst.go:23:2:43:2 | range statement[1] | tst.go:23:2:43:2 | range statement[1] | tst.go:29:20:29:23 | path | Unsanitized archive entry, which may contain '..', is used in a $@. | tst.go:29:20:29:23 | path | file system operation |
-| tst.go:23:2:43:2 | range statement[1] | tst.go:23:2:43:2 | range statement[1] | tst.go:31:21:31:24 | path | Unsanitized archive entry, which may contain '..', is used in a $@. | tst.go:31:21:31:24 | path | file system operation |
+| UnsafeUnzipSymlinkGood.go:72:3:72:25 | extract:0 ... := ... | UnsafeUnzipSymlinkGood.go:72:3:72:25 | extract:0 ... := ... | UnsafeUnzipSymlinkGood.go:61:31:61:62 | call to Join | Unsanitized archive entry, which may contain '..', is used in a $@. | UnsafeUnzipSymlinkGood.go:61:31:61:62 | call to Join | file system operation |
+| ZipSlip.go:11:2:15:2 | extract:1 range element | ZipSlip.go:11:2:15:2 | extract:1 range element | ZipSlip.go:14:20:14:20 | p | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlip.go:14:20:14:20 | p | file system operation |
+| tarslip.go:15:2:15:30 | extract:0 ... := ... | tarslip.go:15:2:15:30 | extract:0 ... := ... | tarslip.go:16:14:16:34 | call to Dir | Unsanitized archive entry, which may contain '..', is used in a $@. | tarslip.go:16:14:16:34 | call to Dir | file system operation |
+| tst.go:23:2:43:2 | extract:1 range element | tst.go:23:2:43:2 | extract:1 range element | tst.go:27:21:27:48 | call to Join | Unsanitized archive entry, which may contain '..', is used in a $@. | tst.go:27:21:27:48 | call to Join | file system operation |
+| tst.go:23:2:43:2 | extract:1 range element | tst.go:23:2:43:2 | extract:1 range element | tst.go:29:20:29:23 | path | Unsanitized archive entry, which may contain '..', is used in a $@. | tst.go:29:20:29:23 | path | file system operation |
+| tst.go:23:2:43:2 | extract:1 range element | tst.go:23:2:43:2 | extract:1 range element | tst.go:31:21:31:24 | path | Unsanitized archive entry, which may contain '..', is used in a $@. | tst.go:31:21:31:24 | path | file system operation |
 edges
 | UnsafeUnzipSymlinkGood.go:52:24:52:32 | SSA def(candidate) | UnsafeUnzipSymlinkGood.go:61:53:61:61 | candidate | provenance |  |
 | UnsafeUnzipSymlinkGood.go:61:53:61:61 | candidate | UnsafeUnzipSymlinkGood.go:61:31:61:62 | call to Join | provenance | FunctionModel Sink:MaD:3 |
-| UnsafeUnzipSymlinkGood.go:72:3:72:25 | ... := ...[0] | UnsafeUnzipSymlinkGood.go:76:24:76:38 | selection of Linkname | provenance |  |
-| UnsafeUnzipSymlinkGood.go:72:3:72:25 | ... := ...[0] | UnsafeUnzipSymlinkGood.go:76:70:76:80 | selection of Name | provenance |  |
+| UnsafeUnzipSymlinkGood.go:72:3:72:25 | extract:0 ... := ... | UnsafeUnzipSymlinkGood.go:76:24:76:38 | selection of Linkname | provenance |  |
+| UnsafeUnzipSymlinkGood.go:72:3:72:25 | extract:0 ... := ... | UnsafeUnzipSymlinkGood.go:76:70:76:80 | selection of Name | provenance |  |
 | UnsafeUnzipSymlinkGood.go:76:24:76:38 | selection of Linkname | UnsafeUnzipSymlinkGood.go:52:24:52:32 | SSA def(candidate) | provenance |  |
 | UnsafeUnzipSymlinkGood.go:76:70:76:80 | selection of Name | UnsafeUnzipSymlinkGood.go:52:24:52:32 | SSA def(candidate) | provenance |  |
-| ZipSlip.go:11:2:15:2 | range statement[1] | ZipSlip.go:12:24:12:29 | selection of Name | provenance |  |
-| ZipSlip.go:12:3:12:30 | ... := ...[0] | ZipSlip.go:14:20:14:20 | p | provenance | Sink:MaD:1 |
-| ZipSlip.go:12:24:12:29 | selection of Name | ZipSlip.go:12:3:12:30 | ... := ...[0] | provenance | MaD:4 |
-| tarslip.go:15:2:15:30 | ... := ...[0] | tarslip.go:16:23:16:33 | selection of Name | provenance |  |
+| ZipSlip.go:11:2:15:2 | extract:1 range element | ZipSlip.go:12:24:12:29 | selection of Name | provenance |  |
+| ZipSlip.go:12:3:12:30 | extract:0 ... := ... | ZipSlip.go:14:20:14:20 | p | provenance | Sink:MaD:1 |
+| ZipSlip.go:12:24:12:29 | selection of Name | ZipSlip.go:12:3:12:30 | extract:0 ... := ... | provenance | MaD:4 |
+| tarslip.go:15:2:15:30 | extract:0 ... := ... | tarslip.go:16:23:16:33 | selection of Name | provenance |  |
 | tarslip.go:16:23:16:33 | selection of Name | tarslip.go:16:14:16:34 | call to Dir | provenance | MaD:6 Sink:MaD:2 |
-| tst.go:23:2:43:2 | range statement[1] | tst.go:25:38:25:41 | path | provenance |  |
-| tst.go:23:2:43:2 | range statement[1] | tst.go:29:20:29:23 | path | provenance | Sink:MaD:1 |
-| tst.go:23:2:43:2 | range statement[1] | tst.go:31:21:31:24 | path | provenance | Sink:MaD:1 |
-| tst.go:25:3:25:42 | ... := ...[0] | tst.go:27:41:27:47 | relpath | provenance |  |
-| tst.go:25:38:25:41 | path | tst.go:25:3:25:42 | ... := ...[0] | provenance | MaD:5 |
+| tst.go:23:2:43:2 | extract:1 range element | tst.go:25:38:25:41 | path | provenance |  |
+| tst.go:23:2:43:2 | extract:1 range element | tst.go:29:20:29:23 | path | provenance | Sink:MaD:1 |
+| tst.go:23:2:43:2 | extract:1 range element | tst.go:31:21:31:24 | path | provenance | Sink:MaD:1 |
+| tst.go:25:3:25:42 | extract:0 ... := ... | tst.go:27:41:27:47 | relpath | provenance |  |
+| tst.go:25:38:25:41 | path | tst.go:25:3:25:42 | extract:0 ... := ... | provenance | MaD:5 |
 | tst.go:27:41:27:47 | relpath | tst.go:27:21:27:48 | call to Join | provenance | FunctionModel Sink:MaD:1 |
 models
 | 1 | Sink: io/ioutil; ; false; WriteFile; ; ; Argument[0]; path-injection; manual |
@@ -34,18 +34,18 @@ nodes
 | UnsafeUnzipSymlinkGood.go:52:24:52:32 | SSA def(candidate) | semmle.label | SSA def(candidate) |
 | UnsafeUnzipSymlinkGood.go:61:31:61:62 | call to Join | semmle.label | call to Join |
 | UnsafeUnzipSymlinkGood.go:61:53:61:61 | candidate | semmle.label | candidate |
-| UnsafeUnzipSymlinkGood.go:72:3:72:25 | ... := ...[0] | semmle.label | ... := ...[0] |
+| UnsafeUnzipSymlinkGood.go:72:3:72:25 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | UnsafeUnzipSymlinkGood.go:76:24:76:38 | selection of Linkname | semmle.label | selection of Linkname |
 | UnsafeUnzipSymlinkGood.go:76:70:76:80 | selection of Name | semmle.label | selection of Name |
-| ZipSlip.go:11:2:15:2 | range statement[1] | semmle.label | range statement[1] |
-| ZipSlip.go:12:3:12:30 | ... := ...[0] | semmle.label | ... := ...[0] |
+| ZipSlip.go:11:2:15:2 | extract:1 range element | semmle.label | extract:1 range element |
+| ZipSlip.go:12:3:12:30 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | ZipSlip.go:12:24:12:29 | selection of Name | semmle.label | selection of Name |
 | ZipSlip.go:14:20:14:20 | p | semmle.label | p |
-| tarslip.go:15:2:15:30 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tarslip.go:15:2:15:30 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | tarslip.go:16:14:16:34 | call to Dir | semmle.label | call to Dir |
 | tarslip.go:16:23:16:33 | selection of Name | semmle.label | selection of Name |
-| tst.go:23:2:43:2 | range statement[1] | semmle.label | range statement[1] |
-| tst.go:25:3:25:42 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tst.go:23:2:43:2 | extract:1 range element | semmle.label | extract:1 range element |
+| tst.go:25:3:25:42 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | tst.go:25:38:25:41 | path | semmle.label | path |
 | tst.go:27:21:27:48 | call to Join | semmle.label | call to Join |
 | tst.go:27:41:27:47 | relpath | semmle.label | relpath |
diff --git a/go/ql/test/query-tests/Security/CWE-078/CONSISTENCY/CfgConsistency.expected b/go/ql/test/query-tests/Security/CWE-078/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/query-tests/Security/CWE-078/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-078/CONSISTENCY/DataFlowConsistency.expected
index 51645e40047a..4a35d9f88b96 100644
--- a/go/ql/test/query-tests/Security/CWE-078/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-078/CONSISTENCY/DataFlowConsistency.expected
@@ -1,11 +1,11 @@
 reverseRead
-| ArgumentInjection.go:9:10:9:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CommandInjection2.go:13:15:13:17 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CommandInjection2.go:21:15:21:17 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CommandInjection2.go:41:15:41:17 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CommandInjection.go:9:13:9:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| GitSubcommands.go:11:13:11:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| GitSubcommands.go:22:13:22:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| GitSubcommands.go:33:13:33:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| SanitizingDoubleDash.go:9:13:9:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| SanitizingDoubleDash.go:92:13:92:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| ArgumentInjection.go:9:10:9:12 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CommandInjection2.go:13:15:13:17 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CommandInjection2.go:21:15:21:17 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CommandInjection2.go:41:15:41:17 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| CommandInjection.go:9:13:9:15 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| GitSubcommands.go:11:13:11:15 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| GitSubcommands.go:22:13:22:15 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| GitSubcommands.go:33:13:33:15 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| SanitizingDoubleDash.go:9:13:9:15 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| SanitizingDoubleDash.go:92:13:92:15 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-078/CommandInjection.expected b/go/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
index b029c6d2b849..2c0e30f02e47 100644
--- a/go/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
+++ b/go/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
@@ -48,14 +48,14 @@ edges
 | GitSubcommands.go:11:13:11:27 | call to Query | GitSubcommands.go:17:36:17:42 | tainted | provenance |  |
 | GitSubcommands.go:33:13:33:19 | selection of URL | GitSubcommands.go:33:13:33:27 | call to Query | provenance | Src:MaD:2 MaD:7 |
 | GitSubcommands.go:33:13:33:27 | call to Query | GitSubcommands.go:38:32:38:38 | tainted | provenance |  |
-| SanitizingDoubleDash.go:9:2:9:8 | SSA def(tainted) | SanitizingDoubleDash.go:13:25:13:31 | tainted | provenance |  |
-| SanitizingDoubleDash.go:9:2:9:8 | SSA def(tainted) | SanitizingDoubleDash.go:14:23:14:33 | slice expression | provenance |  |
-| SanitizingDoubleDash.go:9:2:9:8 | SSA def(tainted) | SanitizingDoubleDash.go:39:31:39:37 | tainted | provenance | Config |
-| SanitizingDoubleDash.go:9:2:9:8 | SSA def(tainted) | SanitizingDoubleDash.go:52:24:52:30 | tainted | provenance | Config |
-| SanitizingDoubleDash.go:9:2:9:8 | SSA def(tainted) | SanitizingDoubleDash.go:68:31:68:37 | tainted | provenance | Config |
-| SanitizingDoubleDash.go:9:2:9:8 | SSA def(tainted) | SanitizingDoubleDash.go:80:23:80:29 | tainted | provenance | Config |
+| SanitizingDoubleDash.go:9:2:9:37 | SSA def(tainted) | SanitizingDoubleDash.go:13:25:13:31 | tainted | provenance |  |
+| SanitizingDoubleDash.go:9:2:9:37 | SSA def(tainted) | SanitizingDoubleDash.go:14:23:14:33 | slice expression | provenance |  |
+| SanitizingDoubleDash.go:9:2:9:37 | SSA def(tainted) | SanitizingDoubleDash.go:39:31:39:37 | tainted | provenance | Config |
+| SanitizingDoubleDash.go:9:2:9:37 | SSA def(tainted) | SanitizingDoubleDash.go:52:24:52:30 | tainted | provenance | Config |
+| SanitizingDoubleDash.go:9:2:9:37 | SSA def(tainted) | SanitizingDoubleDash.go:68:31:68:37 | tainted | provenance | Config |
+| SanitizingDoubleDash.go:9:2:9:37 | SSA def(tainted) | SanitizingDoubleDash.go:80:23:80:29 | tainted | provenance | Config |
 | SanitizingDoubleDash.go:9:13:9:19 | selection of URL | SanitizingDoubleDash.go:9:13:9:27 | call to Query | provenance | Src:MaD:2 MaD:7 |
-| SanitizingDoubleDash.go:9:13:9:27 | call to Query | SanitizingDoubleDash.go:9:2:9:8 | SSA def(tainted) | provenance |  |
+| SanitizingDoubleDash.go:9:13:9:27 | call to Query | SanitizingDoubleDash.go:9:2:9:37 | SSA def(tainted) | provenance |  |
 | SanitizingDoubleDash.go:13:15:13:32 | array literal [array] | SanitizingDoubleDash.go:14:23:14:30 | arrayLit [array] | provenance |  |
 | SanitizingDoubleDash.go:13:25:13:31 | tainted | SanitizingDoubleDash.go:13:15:13:32 | array literal [array] | provenance |  |
 | SanitizingDoubleDash.go:14:23:14:30 | arrayLit [array] | SanitizingDoubleDash.go:14:23:14:33 | slice element node | provenance |  |
@@ -181,7 +181,7 @@ nodes
 | GitSubcommands.go:33:13:33:19 | selection of URL | semmle.label | selection of URL |
 | GitSubcommands.go:33:13:33:27 | call to Query | semmle.label | call to Query |
 | GitSubcommands.go:38:32:38:38 | tainted | semmle.label | tainted |
-| SanitizingDoubleDash.go:9:2:9:8 | SSA def(tainted) | semmle.label | SSA def(tainted) |
+| SanitizingDoubleDash.go:9:2:9:37 | SSA def(tainted) | semmle.label | SSA def(tainted) |
 | SanitizingDoubleDash.go:9:13:9:19 | selection of URL | semmle.label | selection of URL |
 | SanitizingDoubleDash.go:9:13:9:27 | call to Query | semmle.label | call to Query |
 | SanitizingDoubleDash.go:13:15:13:32 | array literal [array] | semmle.label | array literal [array] |
diff --git a/go/ql/test/query-tests/Security/CWE-078/StoredCommand.expected b/go/ql/test/query-tests/Security/CWE-078/StoredCommand.expected
index 809f5c20976b..d7f1ecd08652 100644
--- a/go/ql/test/query-tests/Security/CWE-078/StoredCommand.expected
+++ b/go/ql/test/query-tests/Security/CWE-078/StoredCommand.expected
@@ -1,14 +1,14 @@
 #select
-| StoredCommand.go:14:22:14:28 | cmdName | StoredCommand.go:11:2:11:27 | ... := ...[0] | StoredCommand.go:14:22:14:28 | cmdName | This command depends on a $@. | StoredCommand.go:11:2:11:27 | ... := ...[0] | stored value |
+| StoredCommand.go:14:22:14:28 | cmdName | StoredCommand.go:11:2:11:27 | extract:0 ... := ... | StoredCommand.go:14:22:14:28 | cmdName | This command depends on a $@. | StoredCommand.go:11:2:11:27 | extract:0 ... := ... | stored value |
 edges
-| StoredCommand.go:11:2:11:27 | ... := ...[0] | StoredCommand.go:13:2:13:5 | rows | provenance | Src:MaD:2  |
+| StoredCommand.go:11:2:11:27 | extract:0 ... := ... | StoredCommand.go:13:2:13:5 | rows | provenance | Src:MaD:2  |
 | StoredCommand.go:13:2:13:5 | rows | StoredCommand.go:13:12:13:19 | &... [postupdate] | provenance | FunctionModel |
 | StoredCommand.go:13:12:13:19 | &... [postupdate] | StoredCommand.go:14:22:14:28 | cmdName | provenance | Sink:MaD:1 |
 models
 | 1 | Sink: os/exec; ; false; Command; ; ; Argument[0]; command-injection; manual |
 | 2 | Source: database/sql; DB; true; Query; ; ; ReturnValue[0]; database; manual |
 nodes
-| StoredCommand.go:11:2:11:27 | ... := ...[0] | semmle.label | ... := ...[0] |
+| StoredCommand.go:11:2:11:27 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | StoredCommand.go:13:2:13:5 | rows | semmle.label | rows |
 | StoredCommand.go:13:12:13:19 | &... [postupdate] | semmle.label | &... [postupdate] |
 | StoredCommand.go:14:22:14:28 | cmdName | semmle.label | cmdName |
diff --git a/go/ql/test/query-tests/Security/CWE-079/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-079/CONSISTENCY/DataFlowConsistency.expected
index 0b22e7c6251b..ac74617174f9 100644
--- a/go/ql/test/query-tests/Security/CWE-079/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-079/CONSISTENCY/DataFlowConsistency.expected
@@ -1,21 +1,21 @@
 reverseRead
-| HtmlTemplateEscapingBypassXss.go:99:9:99:9 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| ReflectedXss.go:11:15:11:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| ReflectedXssGood.go:15:15:15:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| contenttype.go:11:11:11:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| contenttype.go:25:11:25:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| contenttype.go:39:11:39:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| contenttype.go:49:11:49:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| contenttype.go:61:11:61:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| contenttype.go:71:11:71:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| contenttype.go:86:11:86:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| contenttype.go:98:11:98:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| contenttype.go:111:11:111:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| HtmlTemplateEscapingBypassXss.go:99:9:99:9 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| ReflectedXss.go:11:15:11:15 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| ReflectedXssGood.go:15:15:15:15 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| contenttype.go:11:11:11:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| contenttype.go:25:11:25:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| contenttype.go:39:11:39:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| contenttype.go:49:11:49:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| contenttype.go:61:11:61:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| contenttype.go:71:11:71:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| contenttype.go:86:11:86:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| contenttype.go:98:11:98:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| contenttype.go:111:11:111:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
 | reflectedxsstest.go:15:13:15:13 | r | Origin of readStep is missing a PostUpdateNode. |
 | reflectedxsstest.go:21:13:21:13 | r | Origin of readStep is missing a PostUpdateNode. |
 | reflectedxsstest.go:51:14:51:14 | r | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:14:15:14:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:33:15:33:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:48:14:48:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:66:15:66:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| websocketXss.go:26:9:26:9 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:14:15:14:15 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:33:15:33:15 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:48:14:48:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:66:15:66:15 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| websocketXss.go:27:9:27:9 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected b/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected
index 3e593f0c2029..48b7d7728df6 100644
--- a/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected
+++ b/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected
@@ -6,34 +6,35 @@
 | contenttype.go:79:11:79:14 | data | contenttype.go:73:10:73:28 | call to FormValue | contenttype.go:79:11:79:14 | data | Cross-site scripting vulnerability due to $@. | contenttype.go:73:10:73:28 | call to FormValue | user-provided value | contenttype.go:0:0:0:0 | contenttype.go |  |
 | contenttype.go:91:4:91:7 | data | contenttype.go:88:10:88:28 | call to FormValue | contenttype.go:91:4:91:7 | data | Cross-site scripting vulnerability due to $@. | contenttype.go:88:10:88:28 | call to FormValue | user-provided value | contenttype.go:0:0:0:0 | contenttype.go |  |
 | contenttype.go:114:50:114:53 | data | contenttype.go:113:10:113:28 | call to FormValue | contenttype.go:114:50:114:53 | data | Cross-site scripting vulnerability due to $@. | contenttype.go:113:10:113:28 | call to FormValue | user-provided value | contenttype.go:0:0:0:0 | contenttype.go |  |
-| reflectedxsstest.go:33:10:33:57 | type conversion | reflectedxsstest.go:30:2:30:44 | ... := ...[0] | reflectedxsstest.go:33:10:33:57 | type conversion | Cross-site scripting vulnerability due to $@. | reflectedxsstest.go:30:2:30:44 | ... := ...[0] | user-provided value | reflectedxsstest.go:0:0:0:0 | reflectedxsstest.go |  |
-| reflectedxsstest.go:34:10:34:62 | type conversion | reflectedxsstest.go:30:2:30:44 | ... := ...[1] | reflectedxsstest.go:34:10:34:62 | type conversion | Cross-site scripting vulnerability due to $@. | reflectedxsstest.go:30:2:30:44 | ... := ...[1] | user-provided value | reflectedxsstest.go:0:0:0:0 | reflectedxsstest.go |  |
-| reflectedxsstest.go:44:10:44:55 | type conversion | reflectedxsstest.go:38:2:38:35 | ... := ...[0] | reflectedxsstest.go:44:10:44:55 | type conversion | Cross-site scripting vulnerability due to $@. | reflectedxsstest.go:38:2:38:35 | ... := ...[0] | user-provided value | reflectedxsstest.go:0:0:0:0 | reflectedxsstest.go |  |
-| reflectedxsstest.go:45:10:45:18 | byteSlice | reflectedxsstest.go:38:2:38:35 | ... := ...[0] | reflectedxsstest.go:45:10:45:18 | byteSlice | Cross-site scripting vulnerability due to $@. | reflectedxsstest.go:38:2:38:35 | ... := ...[0] | user-provided value | reflectedxsstest.go:0:0:0:0 | reflectedxsstest.go |  |
+| reflectedxsstest.go:33:10:33:57 | type conversion | reflectedxsstest.go:30:2:30:44 | extract:0 ... := ... | reflectedxsstest.go:33:10:33:57 | type conversion | Cross-site scripting vulnerability due to $@. | reflectedxsstest.go:30:2:30:44 | extract:0 ... := ... | user-provided value | reflectedxsstest.go:0:0:0:0 | reflectedxsstest.go |  |
+| reflectedxsstest.go:34:10:34:62 | type conversion | reflectedxsstest.go:30:2:30:44 | extract:1 ... := ... | reflectedxsstest.go:34:10:34:62 | type conversion | Cross-site scripting vulnerability due to $@. | reflectedxsstest.go:30:2:30:44 | extract:1 ... := ... | user-provided value | reflectedxsstest.go:0:0:0:0 | reflectedxsstest.go |  |
+| reflectedxsstest.go:44:10:44:55 | type conversion | reflectedxsstest.go:38:2:38:35 | extract:0 ... := ... | reflectedxsstest.go:44:10:44:55 | type conversion | Cross-site scripting vulnerability due to $@. | reflectedxsstest.go:38:2:38:35 | extract:0 ... := ... | user-provided value | reflectedxsstest.go:0:0:0:0 | reflectedxsstest.go |  |
+| reflectedxsstest.go:45:10:45:18 | byteSlice | reflectedxsstest.go:38:2:38:35 | extract:0 ... := ... | reflectedxsstest.go:45:10:45:18 | byteSlice | Cross-site scripting vulnerability due to $@. | reflectedxsstest.go:38:2:38:35 | extract:0 ... := ... | user-provided value | reflectedxsstest.go:0:0:0:0 | reflectedxsstest.go |  |
 | reflectedxsstest.go:54:11:54:21 | type conversion | reflectedxsstest.go:51:14:51:18 | selection of URL | reflectedxsstest.go:54:11:54:21 | type conversion | Cross-site scripting vulnerability due to $@. | reflectedxsstest.go:51:14:51:18 | selection of URL | user-provided value | reflectedxsstest.go:0:0:0:0 | reflectedxsstest.go |  |
 | tst.go:18:12:18:39 | type conversion | tst.go:14:15:14:20 | selection of Form | tst.go:18:12:18:39 | type conversion | Cross-site scripting vulnerability due to $@. | tst.go:14:15:14:20 | selection of Form | user-provided value | tst.go:0:0:0:0 | tst.go |  |
 | tst.go:53:12:53:26 | type conversion | tst.go:48:14:48:19 | selection of Form | tst.go:53:12:53:26 | type conversion | Cross-site scripting vulnerability due to $@. | tst.go:48:14:48:19 | selection of Form | user-provided value | tst.go:0:0:0:0 | tst.go |  |
-| websocketXss.go:32:24:32:27 | xnet | websocketXss.go:31:11:31:14 | xnet [postupdate] | websocketXss.go:32:24:32:27 | xnet | Cross-site scripting vulnerability due to $@. | websocketXss.go:31:11:31:14 | xnet [postupdate] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
-| websocketXss.go:36:24:36:28 | xnet2 | websocketXss.go:35:21:35:25 | xnet2 [postupdate] | websocketXss.go:36:24:36:28 | xnet2 | Cross-site scripting vulnerability due to $@. | websocketXss.go:35:21:35:25 | xnet2 [postupdate] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
-| websocketXss.go:41:24:41:29 | nhooyr | websocketXss.go:40:3:40:40 | ... := ...[1] | websocketXss.go:41:24:41:29 | nhooyr | Cross-site scripting vulnerability due to $@. | websocketXss.go:40:3:40:40 | ... := ...[1] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
-| websocketXss.go:48:24:48:33 | gorillaMsg | websocketXss.go:47:26:47:35 | gorillaMsg [postupdate] | websocketXss.go:48:24:48:33 | gorillaMsg | Cross-site scripting vulnerability due to $@. | websocketXss.go:47:26:47:35 | gorillaMsg [postupdate] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
-| websocketXss.go:52:24:52:31 | gorilla2 | websocketXss.go:51:17:51:24 | gorilla2 [postupdate] | websocketXss.go:52:24:52:31 | gorilla2 | Cross-site scripting vulnerability due to $@. | websocketXss.go:51:17:51:24 | gorilla2 [postupdate] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
-| websocketXss.go:55:24:55:31 | gorilla3 | websocketXss.go:54:3:54:38 | ... := ...[1] | websocketXss.go:55:24:55:31 | gorilla3 | Cross-site scripting vulnerability due to $@. | websocketXss.go:54:3:54:38 | ... := ...[1] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
+| websocketXss.go:33:24:33:27 | xnet | websocketXss.go:32:11:32:14 | xnet [postupdate] | websocketXss.go:33:24:33:27 | xnet | Cross-site scripting vulnerability due to $@. | websocketXss.go:32:11:32:14 | xnet [postupdate] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
+| websocketXss.go:37:24:37:28 | xnet2 | websocketXss.go:36:21:36:25 | xnet2 [postupdate] | websocketXss.go:37:24:37:28 | xnet2 | Cross-site scripting vulnerability due to $@. | websocketXss.go:36:21:36:25 | xnet2 [postupdate] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
+| websocketXss.go:42:24:42:29 | nhooyr | websocketXss.go:41:3:41:40 | extract:1 ... := ... | websocketXss.go:42:24:42:29 | nhooyr | Cross-site scripting vulnerability due to $@. | websocketXss.go:41:3:41:40 | extract:1 ... := ... | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
+| websocketXss.go:47:24:47:31 | coderMsg | websocketXss.go:46:3:46:42 | extract:1 ... := ... | websocketXss.go:47:24:47:31 | coderMsg | Cross-site scripting vulnerability due to $@. | websocketXss.go:46:3:46:42 | extract:1 ... := ... | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
+| websocketXss.go:54:24:54:33 | gorillaMsg | websocketXss.go:53:26:53:35 | gorillaMsg [postupdate] | websocketXss.go:54:24:54:33 | gorillaMsg | Cross-site scripting vulnerability due to $@. | websocketXss.go:53:26:53:35 | gorillaMsg [postupdate] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
+| websocketXss.go:58:24:58:31 | gorilla2 | websocketXss.go:57:17:57:24 | gorilla2 [postupdate] | websocketXss.go:58:24:58:31 | gorilla2 | Cross-site scripting vulnerability due to $@. | websocketXss.go:57:17:57:24 | gorilla2 [postupdate] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
+| websocketXss.go:61:24:61:31 | gorilla3 | websocketXss.go:60:3:60:38 | extract:1 ... := ... | websocketXss.go:61:24:61:31 | gorilla3 | Cross-site scripting vulnerability due to $@. | websocketXss.go:60:3:60:38 | extract:1 ... := ... | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
 edges
-| ReflectedXss.go:11:15:11:20 | selection of Form | ReflectedXss.go:11:15:11:36 | call to Get | provenance | Src:MaD:6 MaD:18 |
+| ReflectedXss.go:11:15:11:20 | selection of Form | ReflectedXss.go:11:15:11:36 | call to Get | provenance | Src:MaD:7 MaD:18 |
 | ReflectedXss.go:11:15:11:36 | call to Get | ReflectedXss.go:14:44:14:51 | username | provenance |  |
-| contenttype.go:11:11:11:16 | selection of Form | contenttype.go:11:11:11:28 | call to Get | provenance | Src:MaD:6 MaD:18 |
+| contenttype.go:11:11:11:16 | selection of Form | contenttype.go:11:11:11:28 | call to Get | provenance | Src:MaD:7 MaD:18 |
 | contenttype.go:11:11:11:28 | call to Get | contenttype.go:17:11:17:22 | type conversion | provenance |  |
-| contenttype.go:49:11:49:16 | selection of Form | contenttype.go:49:11:49:28 | call to Get | provenance | Src:MaD:6 MaD:18 |
+| contenttype.go:49:11:49:16 | selection of Form | contenttype.go:49:11:49:28 | call to Get | provenance | Src:MaD:7 MaD:18 |
 | contenttype.go:49:11:49:28 | call to Get | contenttype.go:53:34:53:37 | data | provenance |  |
-| contenttype.go:63:10:63:28 | call to FormValue | contenttype.go:64:52:64:55 | data | provenance | Src:MaD:8  |
-| contenttype.go:73:10:73:28 | call to FormValue | contenttype.go:79:11:79:14 | data | provenance | Src:MaD:8  |
-| contenttype.go:88:10:88:28 | call to FormValue | contenttype.go:91:4:91:7 | data | provenance | Src:MaD:8  |
-| contenttype.go:113:10:113:28 | call to FormValue | contenttype.go:114:50:114:53 | data | provenance | Src:MaD:8  |
-| reflectedxsstest.go:30:2:30:44 | ... := ...[0] | reflectedxsstest.go:31:30:31:33 | file | provenance | Src:MaD:7  |
-| reflectedxsstest.go:30:2:30:44 | ... := ...[1] | reflectedxsstest.go:34:46:34:60 | selection of Filename | provenance | Src:MaD:7  |
-| reflectedxsstest.go:31:2:31:34 | ... := ...[0] | reflectedxsstest.go:32:48:32:54 | content | provenance |  |
-| reflectedxsstest.go:31:30:31:33 | file | reflectedxsstest.go:31:2:31:34 | ... := ...[0] | provenance | MaD:13 |
+| contenttype.go:63:10:63:28 | call to FormValue | contenttype.go:64:52:64:55 | data | provenance | Src:MaD:9  |
+| contenttype.go:73:10:73:28 | call to FormValue | contenttype.go:79:11:79:14 | data | provenance | Src:MaD:9  |
+| contenttype.go:88:10:88:28 | call to FormValue | contenttype.go:91:4:91:7 | data | provenance | Src:MaD:9  |
+| contenttype.go:113:10:113:28 | call to FormValue | contenttype.go:114:50:114:53 | data | provenance | Src:MaD:9  |
+| reflectedxsstest.go:30:2:30:44 | extract:0 ... := ... | reflectedxsstest.go:31:30:31:33 | file | provenance | Src:MaD:8  |
+| reflectedxsstest.go:30:2:30:44 | extract:1 ... := ... | reflectedxsstest.go:34:46:34:60 | selection of Filename | provenance | Src:MaD:8  |
+| reflectedxsstest.go:31:2:31:34 | extract:0 ... := ... | reflectedxsstest.go:32:48:32:54 | content | provenance |  |
+| reflectedxsstest.go:31:30:31:33 | file | reflectedxsstest.go:31:2:31:34 | extract:0 ... := ... | provenance | MaD:13 |
 | reflectedxsstest.go:32:48:32:54 | content | reflectedxsstest.go:33:49:33:55 | content | provenance |  |
 | reflectedxsstest.go:33:17:33:56 | []type{args} [array] | reflectedxsstest.go:33:17:33:56 | call to Sprintf | provenance | MaD:12 |
 | reflectedxsstest.go:33:17:33:56 | call to Sprintf | reflectedxsstest.go:33:10:33:57 | type conversion | provenance |  |
@@ -43,10 +44,10 @@ edges
 | reflectedxsstest.go:34:17:34:61 | call to Sprintf | reflectedxsstest.go:34:10:34:62 | type conversion | provenance |  |
 | reflectedxsstest.go:34:46:34:60 | selection of Filename | reflectedxsstest.go:34:17:34:61 | []type{args} [array] | provenance |  |
 | reflectedxsstest.go:34:46:34:60 | selection of Filename | reflectedxsstest.go:34:17:34:61 | call to Sprintf | provenance | FunctionModel |
-| reflectedxsstest.go:38:2:38:35 | ... := ...[0] | reflectedxsstest.go:39:16:39:21 | reader | provenance | Src:MaD:9  |
-| reflectedxsstest.go:39:2:39:32 | ... := ...[0] | reflectedxsstest.go:40:14:40:17 | part | provenance |  |
-| reflectedxsstest.go:39:2:39:32 | ... := ...[0] | reflectedxsstest.go:42:2:42:5 | part | provenance |  |
-| reflectedxsstest.go:39:16:39:21 | reader | reflectedxsstest.go:39:2:39:32 | ... := ...[0] | provenance | MaD:16 |
+| reflectedxsstest.go:38:2:38:35 | extract:0 ... := ... | reflectedxsstest.go:39:16:39:21 | reader | provenance | Src:MaD:10  |
+| reflectedxsstest.go:39:2:39:32 | extract:0 ... := ... | reflectedxsstest.go:40:14:40:17 | part | provenance |  |
+| reflectedxsstest.go:39:2:39:32 | extract:0 ... := ... | reflectedxsstest.go:42:2:42:5 | part | provenance |  |
+| reflectedxsstest.go:39:16:39:21 | reader | reflectedxsstest.go:39:2:39:32 | extract:0 ... := ... | provenance | MaD:16 |
 | reflectedxsstest.go:40:14:40:17 | part | reflectedxsstest.go:40:14:40:28 | call to FileName | provenance | MaD:15 |
 | reflectedxsstest.go:40:14:40:28 | call to FileName | reflectedxsstest.go:44:46:44:53 | partName | provenance |  |
 | reflectedxsstest.go:42:2:42:5 | part | reflectedxsstest.go:42:12:42:20 | byteSlice [postupdate] | provenance | MaD:14 |
@@ -55,32 +56,35 @@ edges
 | reflectedxsstest.go:44:17:44:54 | call to Sprintf | reflectedxsstest.go:44:10:44:55 | type conversion | provenance |  |
 | reflectedxsstest.go:44:46:44:53 | partName | reflectedxsstest.go:44:17:44:54 | []type{args} [array] | provenance |  |
 | reflectedxsstest.go:44:46:44:53 | partName | reflectedxsstest.go:44:17:44:54 | call to Sprintf | provenance | FunctionModel |
-| reflectedxsstest.go:51:14:51:18 | selection of URL | reflectedxsstest.go:51:14:51:26 | call to Query | provenance | Src:MaD:10 MaD:17 |
+| reflectedxsstest.go:51:14:51:18 | selection of URL | reflectedxsstest.go:51:14:51:26 | call to Query | provenance | Src:MaD:11 MaD:17 |
 | reflectedxsstest.go:51:14:51:26 | call to Query | reflectedxsstest.go:54:11:54:21 | type conversion | provenance |  |
-| tst.go:14:15:14:20 | selection of Form | tst.go:14:15:14:36 | call to Get | provenance | Src:MaD:6 MaD:18 |
-| tst.go:14:15:14:36 | call to Get | tst.go:18:32:18:32 | a | provenance |  |
+| tst.go:14:15:14:20 | selection of Form | tst.go:14:15:14:36 | call to Get | provenance | Src:MaD:7 MaD:18 |
+| tst.go:14:15:14:36 | call to Get | tst.go:17:18:17:25 | username | provenance |  |
+| tst.go:17:9:17:57 | slice literal [array] | tst.go:18:32:18:32 | a [array] | provenance |  |
+| tst.go:17:18:17:25 | username | tst.go:17:9:17:57 | slice literal [array] | provenance |  |
 | tst.go:18:19:18:38 | call to Join | tst.go:18:12:18:39 | type conversion | provenance |  |
-| tst.go:18:32:18:32 | a | tst.go:18:19:18:38 | call to Join | provenance | MaD:19 |
-| tst.go:48:14:48:19 | selection of Form | tst.go:48:14:48:34 | call to Get | provenance | Src:MaD:6 MaD:18 |
+| tst.go:18:32:18:32 | a [array] | tst.go:18:19:18:38 | call to Join | provenance | MaD:19 |
+| tst.go:48:14:48:19 | selection of Form | tst.go:48:14:48:34 | call to Get | provenance | Src:MaD:7 MaD:18 |
 | tst.go:48:14:48:34 | call to Get | tst.go:53:12:53:26 | type conversion | provenance |  |
-| websocketXss.go:31:11:31:14 | xnet [postupdate] | websocketXss.go:32:24:32:27 | xnet | provenance | Src:MaD:5  |
-| websocketXss.go:35:21:35:25 | xnet2 [postupdate] | websocketXss.go:36:24:36:28 | xnet2 | provenance | Src:MaD:4  |
-| websocketXss.go:40:3:40:40 | ... := ...[1] | websocketXss.go:41:24:41:29 | nhooyr | provenance | Src:MaD:11  |
-| websocketXss.go:47:26:47:35 | gorillaMsg [postupdate] | websocketXss.go:48:24:48:33 | gorillaMsg | provenance | Src:MaD:1  |
-| websocketXss.go:51:17:51:24 | gorilla2 [postupdate] | websocketXss.go:52:24:52:31 | gorilla2 | provenance | Src:MaD:2  |
-| websocketXss.go:54:3:54:38 | ... := ...[1] | websocketXss.go:55:24:55:31 | gorilla3 | provenance | Src:MaD:3  |
+| websocketXss.go:32:11:32:14 | xnet [postupdate] | websocketXss.go:33:24:33:27 | xnet | provenance | Src:MaD:5  |
+| websocketXss.go:36:21:36:25 | xnet2 [postupdate] | websocketXss.go:37:24:37:28 | xnet2 | provenance | Src:MaD:4  |
+| websocketXss.go:41:3:41:40 | extract:1 ... := ... | websocketXss.go:42:24:42:29 | nhooyr | provenance | Src:MaD:6  |
+| websocketXss.go:46:3:46:42 | extract:1 ... := ... | websocketXss.go:47:24:47:31 | coderMsg | provenance | Src:MaD:6  |
+| websocketXss.go:53:26:53:35 | gorillaMsg [postupdate] | websocketXss.go:54:24:54:33 | gorillaMsg | provenance | Src:MaD:1  |
+| websocketXss.go:57:17:57:24 | gorilla2 [postupdate] | websocketXss.go:58:24:58:31 | gorilla2 | provenance | Src:MaD:2  |
+| websocketXss.go:60:3:60:38 | extract:1 ... := ... | websocketXss.go:61:24:61:31 | gorilla3 | provenance | Src:MaD:3  |
 models
 | 1 | Source: github.com/gorilla/websocket; ; false; ReadJSON; ; ; Argument[1]; remote; manual |
 | 2 | Source: github.com/gorilla/websocket; Conn; true; ReadJSON; ; ; Argument[0]; remote; manual |
 | 3 | Source: github.com/gorilla/websocket; Conn; true; ReadMessage; ; ; ReturnValue[1]; remote; manual |
 | 4 | Source: golang.org/x/net/websocket; Codec; true; Receive; ; ; Argument[1]; remote; manual |
 | 5 | Source: golang.org/x/net/websocket; Conn; true; Read; ; ; Argument[0]; remote; manual |
-| 6 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
-| 7 | Source: net/http; Request; true; FormFile; ; ; ReturnValue[0..1]; remote; manual |
-| 8 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
-| 9 | Source: net/http; Request; true; MultipartReader; ; ; ReturnValue[0]; remote; manual |
-| 10 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
-| 11 | Source: nhooyr.io/websocket; Conn; true; Read; ; ; ReturnValue[1]; remote; manual |
+| 6 | Source: group:coder/websocket; Conn; true; Read; ; ; ReturnValue[1]; remote; manual |
+| 7 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
+| 8 | Source: net/http; Request; true; FormFile; ; ; ReturnValue[0..1]; remote; manual |
+| 9 | Source: net/http; Request; true; FormValue; ; ; ReturnValue; remote; manual |
+| 10 | Source: net/http; Request; true; MultipartReader; ; ; ReturnValue[0]; remote; manual |
+| 11 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
 | 12 | Summary: fmt; ; false; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
 | 13 | Summary: io; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
 | 14 | Summary: io; Reader; true; Read; ; ; Argument[receiver]; Argument[0]; taint; manual |
@@ -88,7 +92,7 @@ models
 | 16 | Summary: mime/multipart; Reader; true; NextPart; ; ; Argument[receiver]; ReturnValue[0]; taint; manual |
 | 17 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
 | 18 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 19 | Summary: strings; ; false; Join; ; ; Argument[0..1]; ReturnValue; taint; manual |
+| 19 | Summary: strings; ; false; Join; ; ; Argument[0].ArrayElement; ReturnValue; taint; manual |
 nodes
 | ReflectedXss.go:11:15:11:20 | selection of Form | semmle.label | selection of Form |
 | ReflectedXss.go:11:15:11:36 | call to Get | semmle.label | call to Get |
@@ -107,9 +111,9 @@ nodes
 | contenttype.go:91:4:91:7 | data | semmle.label | data |
 | contenttype.go:113:10:113:28 | call to FormValue | semmle.label | call to FormValue |
 | contenttype.go:114:50:114:53 | data | semmle.label | data |
-| reflectedxsstest.go:30:2:30:44 | ... := ...[0] | semmle.label | ... := ...[0] |
-| reflectedxsstest.go:30:2:30:44 | ... := ...[1] | semmle.label | ... := ...[1] |
-| reflectedxsstest.go:31:2:31:34 | ... := ...[0] | semmle.label | ... := ...[0] |
+| reflectedxsstest.go:30:2:30:44 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
+| reflectedxsstest.go:30:2:30:44 | extract:1 ... := ... | semmle.label | extract:1 ... := ... |
+| reflectedxsstest.go:31:2:31:34 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | reflectedxsstest.go:31:30:31:33 | file | semmle.label | file |
 | reflectedxsstest.go:32:48:32:54 | content | semmle.label | content |
 | reflectedxsstest.go:33:10:33:57 | type conversion | semmle.label | type conversion |
@@ -120,8 +124,8 @@ nodes
 | reflectedxsstest.go:34:17:34:61 | []type{args} [array] | semmle.label | []type{args} [array] |
 | reflectedxsstest.go:34:17:34:61 | call to Sprintf | semmle.label | call to Sprintf |
 | reflectedxsstest.go:34:46:34:60 | selection of Filename | semmle.label | selection of Filename |
-| reflectedxsstest.go:38:2:38:35 | ... := ...[0] | semmle.label | ... := ...[0] |
-| reflectedxsstest.go:39:2:39:32 | ... := ...[0] | semmle.label | ... := ...[0] |
+| reflectedxsstest.go:38:2:38:35 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
+| reflectedxsstest.go:39:2:39:32 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | reflectedxsstest.go:39:16:39:21 | reader | semmle.label | reader |
 | reflectedxsstest.go:40:14:40:17 | part | semmle.label | part |
 | reflectedxsstest.go:40:14:40:28 | call to FileName | semmle.label | call to FileName |
@@ -137,22 +141,26 @@ nodes
 | reflectedxsstest.go:54:11:54:21 | type conversion | semmle.label | type conversion |
 | tst.go:14:15:14:20 | selection of Form | semmle.label | selection of Form |
 | tst.go:14:15:14:36 | call to Get | semmle.label | call to Get |
+| tst.go:17:9:17:57 | slice literal [array] | semmle.label | slice literal [array] |
+| tst.go:17:18:17:25 | username | semmle.label | username |
 | tst.go:18:12:18:39 | type conversion | semmle.label | type conversion |
 | tst.go:18:19:18:38 | call to Join | semmle.label | call to Join |
-| tst.go:18:32:18:32 | a | semmle.label | a |
+| tst.go:18:32:18:32 | a [array] | semmle.label | a [array] |
 | tst.go:48:14:48:19 | selection of Form | semmle.label | selection of Form |
 | tst.go:48:14:48:34 | call to Get | semmle.label | call to Get |
 | tst.go:53:12:53:26 | type conversion | semmle.label | type conversion |
-| websocketXss.go:31:11:31:14 | xnet [postupdate] | semmle.label | xnet [postupdate] |
-| websocketXss.go:32:24:32:27 | xnet | semmle.label | xnet |
-| websocketXss.go:35:21:35:25 | xnet2 [postupdate] | semmle.label | xnet2 [postupdate] |
-| websocketXss.go:36:24:36:28 | xnet2 | semmle.label | xnet2 |
-| websocketXss.go:40:3:40:40 | ... := ...[1] | semmle.label | ... := ...[1] |
-| websocketXss.go:41:24:41:29 | nhooyr | semmle.label | nhooyr |
-| websocketXss.go:47:26:47:35 | gorillaMsg [postupdate] | semmle.label | gorillaMsg [postupdate] |
-| websocketXss.go:48:24:48:33 | gorillaMsg | semmle.label | gorillaMsg |
-| websocketXss.go:51:17:51:24 | gorilla2 [postupdate] | semmle.label | gorilla2 [postupdate] |
-| websocketXss.go:52:24:52:31 | gorilla2 | semmle.label | gorilla2 |
-| websocketXss.go:54:3:54:38 | ... := ...[1] | semmle.label | ... := ...[1] |
-| websocketXss.go:55:24:55:31 | gorilla3 | semmle.label | gorilla3 |
+| websocketXss.go:32:11:32:14 | xnet [postupdate] | semmle.label | xnet [postupdate] |
+| websocketXss.go:33:24:33:27 | xnet | semmle.label | xnet |
+| websocketXss.go:36:21:36:25 | xnet2 [postupdate] | semmle.label | xnet2 [postupdate] |
+| websocketXss.go:37:24:37:28 | xnet2 | semmle.label | xnet2 |
+| websocketXss.go:41:3:41:40 | extract:1 ... := ... | semmle.label | extract:1 ... := ... |
+| websocketXss.go:42:24:42:29 | nhooyr | semmle.label | nhooyr |
+| websocketXss.go:46:3:46:42 | extract:1 ... := ... | semmle.label | extract:1 ... := ... |
+| websocketXss.go:47:24:47:31 | coderMsg | semmle.label | coderMsg |
+| websocketXss.go:53:26:53:35 | gorillaMsg [postupdate] | semmle.label | gorillaMsg [postupdate] |
+| websocketXss.go:54:24:54:33 | gorillaMsg | semmle.label | gorillaMsg |
+| websocketXss.go:57:17:57:24 | gorilla2 [postupdate] | semmle.label | gorilla2 [postupdate] |
+| websocketXss.go:58:24:58:31 | gorilla2 | semmle.label | gorilla2 |
+| websocketXss.go:60:3:60:38 | extract:1 ... := ... | semmle.label | extract:1 ... := ... |
+| websocketXss.go:61:24:61:31 | gorilla3 | semmle.label | gorilla3 |
 subpaths
diff --git a/go/ql/test/query-tests/Security/CWE-079/StoredXss.expected b/go/ql/test/query-tests/Security/CWE-079/StoredXss.expected
index cde1a866c755..50284f8e6d4d 100644
--- a/go/ql/test/query-tests/Security/CWE-079/StoredXss.expected
+++ b/go/ql/test/query-tests/Security/CWE-079/StoredXss.expected
@@ -1,10 +1,10 @@
 #select
 | StoredXss.go:13:21:13:36 | ...+... | StoredXss.go:13:21:13:31 | call to Name | StoredXss.go:13:21:13:36 | ...+... | Stored cross-site scripting vulnerability due to $@. | StoredXss.go:13:21:13:31 | call to Name | stored value |
-| stored.go:30:22:30:25 | name | stored.go:18:3:18:28 | ... := ...[0] | stored.go:30:22:30:25 | name | Stored cross-site scripting vulnerability due to $@. | stored.go:18:3:18:28 | ... := ...[0] | stored value |
+| stored.go:30:22:30:25 | name | stored.go:18:3:18:28 | extract:0 ... := ... | stored.go:30:22:30:25 | name | Stored cross-site scripting vulnerability due to $@. | stored.go:18:3:18:28 | extract:0 ... := ... | stored value |
 | stored.go:61:22:61:25 | path | stored.go:59:30:59:33 | SSA def(path) | stored.go:61:22:61:25 | path | Stored cross-site scripting vulnerability due to $@. | stored.go:59:30:59:33 | SSA def(path) | stored value |
 edges
 | StoredXss.go:13:21:13:31 | call to Name | StoredXss.go:13:21:13:36 | ...+... | provenance |  |
-| stored.go:18:3:18:28 | ... := ...[0] | stored.go:25:14:25:17 | rows | provenance | Src:MaD:1  |
+| stored.go:18:3:18:28 | extract:0 ... := ... | stored.go:25:14:25:17 | rows | provenance | Src:MaD:1  |
 | stored.go:25:14:25:17 | rows | stored.go:25:29:25:33 | &... [postupdate] | provenance | FunctionModel |
 | stored.go:25:29:25:33 | &... [postupdate] | stored.go:30:22:30:25 | name | provenance |  |
 | stored.go:59:30:59:33 | SSA def(path) | stored.go:61:22:61:25 | path | provenance |  |
@@ -13,7 +13,7 @@ models
 nodes
 | StoredXss.go:13:21:13:31 | call to Name | semmle.label | call to Name |
 | StoredXss.go:13:21:13:36 | ...+... | semmle.label | ...+... |
-| stored.go:18:3:18:28 | ... := ...[0] | semmle.label | ... := ...[0] |
+| stored.go:18:3:18:28 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | stored.go:25:14:25:17 | rows | semmle.label | rows |
 | stored.go:25:29:25:33 | &... [postupdate] | semmle.label | &... [postupdate] |
 | stored.go:30:22:30:25 | name | semmle.label | name |
diff --git a/go/ql/test/query-tests/Security/CWE-079/go.mod b/go/ql/test/query-tests/Security/CWE-079/go.mod
index aaab77bf0398..fa397e413d7e 100644
--- a/go/ql/test/query-tests/Security/CWE-079/go.mod
+++ b/go/ql/test/query-tests/Security/CWE-079/go.mod
@@ -3,6 +3,7 @@ module codeql-go-tests/CWE-079
 go 1.24
 
 require (
+	github.com/coder/websocket v1.8.5
 	github.com/gobwas/ws v1.0.3
 	github.com/gorilla/websocket v1.4.2
 	golang.org/x/net v0.0.0-20200505041828-1ed23360d12c
diff --git a/go/ql/test/query-tests/Security/CWE-079/vendor/github.com/coder/websocket/LICENSE b/go/ql/test/query-tests/Security/CWE-079/vendor/github.com/coder/websocket/LICENSE
new file mode 100644
index 000000000000..b5b5fef31f0f
--- /dev/null
+++ b/go/ql/test/query-tests/Security/CWE-079/vendor/github.com/coder/websocket/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Anmol Sethi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/go/ql/test/query-tests/Security/CWE-079/vendor/github.com/coder/websocket/stub.go b/go/ql/test/query-tests/Security/CWE-079/vendor/github.com/coder/websocket/stub.go
new file mode 100644
index 000000000000..7bf2a208daca
--- /dev/null
+++ b/go/ql/test/query-tests/Security/CWE-079/vendor/github.com/coder/websocket/stub.go
@@ -0,0 +1,76 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for nhooyr.io/websocket, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: nhooyr.io/websocket (exports: ; functions: Dial)
+
+// Package websocket is a stub of nhooyr.io/websocket, generated by depstubber.
+package websocket
+
+import (
+	context "context"
+	io "io"
+	http "net/http"
+)
+
+type CompressionMode int
+
+type Conn struct{}
+
+func (_ *Conn) Close(_ StatusCode, _ string) error {
+	return nil
+}
+
+func (_ *Conn) CloseRead(_ context.Context) context.Context {
+	return nil
+}
+
+func (_ *Conn) Ping(_ context.Context) error {
+	return nil
+}
+
+func (_ *Conn) Read(_ context.Context) (MessageType, []byte, error) {
+	return 0, nil, nil
+}
+
+func (_ *Conn) Reader(_ context.Context) (MessageType, io.Reader, error) {
+	return 0, nil, nil
+}
+
+func (_ *Conn) SetReadLimit(_ int64) {}
+
+func (_ *Conn) Subprotocol() string {
+	return ""
+}
+
+func (_ *Conn) Write(_ context.Context, _ MessageType, _ []byte) error {
+	return nil
+}
+
+func (_ *Conn) Writer(_ context.Context, _ MessageType) (io.WriteCloser, error) {
+	return nil, nil
+}
+
+func Dial(_ context.Context, _ string, _ *DialOptions) (*Conn, *http.Response, error) {
+	return nil, nil, nil
+}
+
+type DialOptions struct {
+	HTTPClient           *http.Client
+	HTTPHeader           http.Header
+	Subprotocols         []string
+	CompressionMode      CompressionMode
+	CompressionThreshold int
+}
+
+type MessageType int
+
+func (_ MessageType) String() string {
+	return ""
+}
+
+type StatusCode int
+
+func (_ StatusCode) String() string {
+	return ""
+}
diff --git a/go/ql/test/query-tests/Security/CWE-079/vendor/modules.txt b/go/ql/test/query-tests/Security/CWE-079/vendor/modules.txt
index f61f191db597..829fd45b3539 100644
--- a/go/ql/test/query-tests/Security/CWE-079/vendor/modules.txt
+++ b/go/ql/test/query-tests/Security/CWE-079/vendor/modules.txt
@@ -1,3 +1,6 @@
+# github.com/coder/websocket v1.8.5
+## explicit
+github.com/coder/websocket
 # github.com/gobwas/ws v1.0.3
 ## explicit
 github.com/gobwas/ws
diff --git a/go/ql/test/query-tests/Security/CWE-079/websocketXss.go b/go/ql/test/query-tests/Security/CWE-079/websocketXss.go
index eadc87b2c9f9..1bf77e72d8f6 100644
--- a/go/ql/test/query-tests/Security/CWE-079/websocketXss.go
+++ b/go/ql/test/query-tests/Security/CWE-079/websocketXss.go
@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"net/http"
 
+	coder "github.com/coder/websocket"
 	gorilla "github.com/gorilla/websocket"
 	websocket "golang.org/x/net/websocket"
 	nhooyr "nhooyr.io/websocket"
@@ -40,6 +41,11 @@ func xss(w http.ResponseWriter, r *http.Request) {
 		_, nhooyr, _ := n.Read(context.TODO()) // $ Source[go/reflected-xss]
 		fmt.Fprintf(w, "%v", nhooyr)           // $ Alert[go/reflected-xss]
 	}
+	{
+		n, _, _ := coder.Dial(context.TODO(), uri, nil)
+		_, coderMsg, _ := n.Read(context.TODO()) // $ Source[go/reflected-xss]
+		fmt.Fprintf(w, "%v", coderMsg)           // $ Alert[go/reflected-xss]
+	}
 	{
 		dialer := gorilla.Dialer{}
 		conn, _, _ := dialer.Dial(uri, nil)
diff --git a/go/ql/test/query-tests/Security/CWE-089/CONSISTENCY/CfgConsistency.expected b/go/ql/test/query-tests/Security/CWE-089/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/go/ql/test/query-tests/Security/CWE-089/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-089/CONSISTENCY/DataFlowConsistency.expected
index bb9cf32663a7..3ec923eb2391 100644
--- a/go/ql/test/query-tests/Security/CWE-089/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-089/CONSISTENCY/DataFlowConsistency.expected
@@ -1,23 +1,23 @@
 reverseRead
-| SqlInjection.go:11:3:11:5 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| SqlInjection.go:11:3:11:5 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
 | SqlInjection.go:11:3:11:17 | call to Query | Origin of readStep is missing a PostUpdateNode. |
-| SqlInjectionGood.go:10:14:10:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| SqlInjectionGood.go:10:14:10:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
 | SqlInjectionGood.go:10:14:10:28 | call to Query | Origin of readStep is missing a PostUpdateNode. |
-| issue48.go:17:25:17:27 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| issue48.go:17:25:17:27 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
 | issue48.go:21:3:21:21 | RequestDataFromJson | Origin of readStep is missing a PostUpdateNode. |
-| issue48.go:27:26:27:28 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| issue48.go:27:26:27:28 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
 | issue48.go:31:3:31:22 | RequestDataFromJson2 | Origin of readStep is missing a PostUpdateNode. |
-| issue48.go:37:24:37:26 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| issue48.go:37:24:37:26 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
 | issue48.go:40:3:40:22 | RequestDataFromJson3 | Origin of readStep is missing a PostUpdateNode. |
-| main.go:15:63:15:63 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| main.go:15:63:15:63 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
 | main.go:15:63:15:75 | call to Query | Origin of readStep is missing a PostUpdateNode. |
-| main.go:16:63:16:63 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| main.go:30:13:30:15 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| main.go:34:3:34:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| main.go:40:25:40:27 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| main.go:43:3:43:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| main.go:49:28:49:30 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| main.go:52:3:52:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| main.go:58:28:58:30 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| main.go:16:63:16:63 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| main.go:30:13:30:15 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| main.go:34:3:34:13 | implicit-deref RequestData | Origin of readStep is missing a PostUpdateNode. |
+| main.go:40:25:40:27 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| main.go:43:3:43:13 | implicit-deref RequestData | Origin of readStep is missing a PostUpdateNode. |
+| main.go:49:28:49:30 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| main.go:52:3:52:13 | implicit-deref RequestData | Origin of readStep is missing a PostUpdateNode. |
+| main.go:58:28:58:30 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
 | main.go:61:4:61:15 | star expression | Origin of readStep is missing a PostUpdateNode. |
-| main.go:68:18:68:20 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| main.go:68:18:68:20 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected b/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected
index e8c6848b5695..70037706cfd8 100644
--- a/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected
+++ b/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected
@@ -31,16 +31,16 @@ edges
 | SqlInjection.go:11:3:11:17 | call to Query | SqlInjection.go:11:3:11:29 | index expression | provenance |  |
 | SqlInjection.go:11:3:11:29 | index expression | SqlInjection.go:10:7:11:30 | []type{args} [array] | provenance |  |
 | SqlInjection.go:11:3:11:29 | index expression | SqlInjection.go:10:7:11:30 | call to Sprintf | provenance | FunctionModel |
-| issue48.go:17:2:17:33 | ... := ...[0] | issue48.go:18:17:18:17 | b | provenance |  |
-| issue48.go:17:25:17:32 | selection of Body | issue48.go:17:2:17:33 | ... := ...[0] | provenance | Src:MaD:17 MaD:24 |
+| issue48.go:17:2:17:33 | extract:0 ... := ... | issue48.go:18:17:18:17 | b | provenance |  |
+| issue48.go:17:25:17:32 | selection of Body | issue48.go:17:2:17:33 | extract:0 ... := ... | provenance | Src:MaD:17 MaD:24 |
 | issue48.go:18:17:18:17 | b | issue48.go:18:20:18:39 | &... [postupdate] | provenance | MaD:22 |
 | issue48.go:18:20:18:39 | &... [postupdate] | issue48.go:21:3:21:33 | index expression | provenance |  |
 | issue48.go:20:8:21:34 | []type{args} [array] | issue48.go:20:8:21:34 | call to Sprintf | provenance | MaD:23 |
 | issue48.go:20:8:21:34 | call to Sprintf | issue48.go:22:11:22:12 | q3 | provenance | Sink:MaD:1 |
 | issue48.go:21:3:21:33 | index expression | issue48.go:20:8:21:34 | []type{args} [array] | provenance |  |
 | issue48.go:21:3:21:33 | index expression | issue48.go:20:8:21:34 | call to Sprintf | provenance | FunctionModel |
-| issue48.go:27:2:27:34 | ... := ...[0] | issue48.go:28:17:28:18 | b2 | provenance |  |
-| issue48.go:27:26:27:33 | selection of Body | issue48.go:27:2:27:34 | ... := ...[0] | provenance | Src:MaD:17 MaD:24 |
+| issue48.go:27:2:27:34 | extract:0 ... := ... | issue48.go:28:17:28:18 | b2 | provenance |  |
+| issue48.go:27:26:27:33 | selection of Body | issue48.go:27:2:27:34 | extract:0 ... := ... | provenance | Src:MaD:17 MaD:24 |
 | issue48.go:28:17:28:18 | b2 | issue48.go:28:21:28:41 | &... [postupdate] | provenance | MaD:22 |
 | issue48.go:28:21:28:41 | &... [postupdate] | issue48.go:31:3:31:31 | selection of Category | provenance |  |
 | issue48.go:30:8:31:32 | []type{args} [array] | issue48.go:30:8:31:32 | call to Sprintf | provenance | MaD:23 |
@@ -72,19 +72,19 @@ edges
 | main.go:30:13:30:39 | index expression | main.go:28:18:31:2 | struct literal [Category] | provenance |  |
 | main.go:33:7:34:23 | []type{args} [array] | main.go:33:7:34:23 | call to Sprintf | provenance | MaD:23 |
 | main.go:33:7:34:23 | call to Sprintf | main.go:35:11:35:11 | q | provenance | Sink:MaD:1 |
-| main.go:34:3:34:13 | RequestData [pointer, Category] | main.go:34:3:34:13 | implicit dereference [Category] | provenance |  |
-| main.go:34:3:34:13 | implicit dereference [Category] | main.go:34:3:34:22 | selection of Category | provenance |  |
+| main.go:34:3:34:13 | RequestData [pointer, Category] | main.go:34:3:34:13 | implicit-deref RequestData [Category] | provenance |  |
+| main.go:34:3:34:13 | implicit-deref RequestData [Category] | main.go:34:3:34:22 | selection of Category | provenance |  |
 | main.go:34:3:34:22 | selection of Category | main.go:33:7:34:23 | []type{args} [array] | provenance |  |
 | main.go:34:3:34:22 | selection of Category | main.go:33:7:34:23 | call to Sprintf | provenance | FunctionModel |
 | main.go:40:2:40:12 | RequestData [postupdate] [pointer, Category] | main.go:43:3:43:13 | RequestData [pointer, Category] | provenance |  |
-| main.go:40:2:40:12 | implicit dereference [postupdate] [Category] | main.go:40:2:40:12 | RequestData [postupdate] [pointer, Category] | provenance |  |
+| main.go:40:2:40:12 | implicit-deref RequestData [postupdate] [Category] | main.go:40:2:40:12 | RequestData [postupdate] [pointer, Category] | provenance |  |
 | main.go:40:25:40:31 | selection of URL | main.go:40:25:40:39 | call to Query | provenance | Src:MaD:21 MaD:26 |
 | main.go:40:25:40:39 | call to Query | main.go:40:25:40:51 | index expression | provenance |  |
-| main.go:40:25:40:51 | index expression | main.go:40:2:40:12 | implicit dereference [postupdate] [Category] | provenance |  |
+| main.go:40:25:40:51 | index expression | main.go:40:2:40:12 | implicit-deref RequestData [postupdate] [Category] | provenance |  |
 | main.go:42:7:43:23 | []type{args} [array] | main.go:42:7:43:23 | call to Sprintf | provenance | MaD:23 |
 | main.go:42:7:43:23 | call to Sprintf | main.go:44:11:44:11 | q | provenance | Sink:MaD:1 |
-| main.go:43:3:43:13 | RequestData [pointer, Category] | main.go:43:3:43:13 | implicit dereference [Category] | provenance |  |
-| main.go:43:3:43:13 | implicit dereference [Category] | main.go:43:3:43:22 | selection of Category | provenance |  |
+| main.go:43:3:43:13 | RequestData [pointer, Category] | main.go:43:3:43:13 | implicit-deref RequestData [Category] | provenance |  |
+| main.go:43:3:43:13 | implicit-deref RequestData [Category] | main.go:43:3:43:22 | selection of Category | provenance |  |
 | main.go:43:3:43:22 | selection of Category | main.go:42:7:43:23 | []type{args} [array] | provenance |  |
 | main.go:43:3:43:22 | selection of Category | main.go:42:7:43:23 | call to Sprintf | provenance | FunctionModel |
 | main.go:49:3:49:14 | star expression [postupdate] [Category] | main.go:49:4:49:14 | RequestData [postupdate] [pointer, Category] | provenance |  |
@@ -94,8 +94,8 @@ edges
 | main.go:49:28:49:54 | index expression | main.go:49:3:49:14 | star expression [postupdate] [Category] | provenance |  |
 | main.go:51:7:52:23 | []type{args} [array] | main.go:51:7:52:23 | call to Sprintf | provenance | MaD:23 |
 | main.go:51:7:52:23 | call to Sprintf | main.go:53:11:53:11 | q | provenance | Sink:MaD:1 |
-| main.go:52:3:52:13 | RequestData [pointer, Category] | main.go:52:3:52:13 | implicit dereference [Category] | provenance |  |
-| main.go:52:3:52:13 | implicit dereference [Category] | main.go:52:3:52:22 | selection of Category | provenance |  |
+| main.go:52:3:52:13 | RequestData [pointer, Category] | main.go:52:3:52:13 | implicit-deref RequestData [Category] | provenance |  |
+| main.go:52:3:52:13 | implicit-deref RequestData [Category] | main.go:52:3:52:22 | selection of Category | provenance |  |
 | main.go:52:3:52:22 | selection of Category | main.go:51:7:52:23 | []type{args} [array] | provenance |  |
 | main.go:52:3:52:22 | selection of Category | main.go:51:7:52:23 | call to Sprintf | provenance | FunctionModel |
 | main.go:58:3:58:14 | star expression [postupdate] [Category] | main.go:58:4:58:14 | RequestData [postupdate] [pointer, Category] | provenance |  |
@@ -161,7 +161,7 @@ nodes
 | SqlInjection.go:11:3:11:17 | call to Query | semmle.label | call to Query |
 | SqlInjection.go:11:3:11:29 | index expression | semmle.label | index expression |
 | SqlInjection.go:12:11:12:11 | q | semmle.label | q |
-| issue48.go:17:2:17:33 | ... := ...[0] | semmle.label | ... := ...[0] |
+| issue48.go:17:2:17:33 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | issue48.go:17:25:17:32 | selection of Body | semmle.label | selection of Body |
 | issue48.go:18:17:18:17 | b | semmle.label | b |
 | issue48.go:18:20:18:39 | &... [postupdate] | semmle.label | &... [postupdate] |
@@ -169,7 +169,7 @@ nodes
 | issue48.go:20:8:21:34 | call to Sprintf | semmle.label | call to Sprintf |
 | issue48.go:21:3:21:33 | index expression | semmle.label | index expression |
 | issue48.go:22:11:22:12 | q3 | semmle.label | q3 |
-| issue48.go:27:2:27:34 | ... := ...[0] | semmle.label | ... := ...[0] |
+| issue48.go:27:2:27:34 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | issue48.go:27:26:27:33 | selection of Body | semmle.label | selection of Body |
 | issue48.go:28:17:28:18 | b2 | semmle.label | b2 |
 | issue48.go:28:21:28:41 | &... [postupdate] | semmle.label | &... [postupdate] |
@@ -204,18 +204,18 @@ nodes
 | main.go:33:7:34:23 | []type{args} [array] | semmle.label | []type{args} [array] |
 | main.go:33:7:34:23 | call to Sprintf | semmle.label | call to Sprintf |
 | main.go:34:3:34:13 | RequestData [pointer, Category] | semmle.label | RequestData [pointer, Category] |
-| main.go:34:3:34:13 | implicit dereference [Category] | semmle.label | implicit dereference [Category] |
+| main.go:34:3:34:13 | implicit-deref RequestData [Category] | semmle.label | implicit-deref RequestData [Category] |
 | main.go:34:3:34:22 | selection of Category | semmle.label | selection of Category |
 | main.go:35:11:35:11 | q | semmle.label | q |
 | main.go:40:2:40:12 | RequestData [postupdate] [pointer, Category] | semmle.label | RequestData [postupdate] [pointer, Category] |
-| main.go:40:2:40:12 | implicit dereference [postupdate] [Category] | semmle.label | implicit dereference [postupdate] [Category] |
+| main.go:40:2:40:12 | implicit-deref RequestData [postupdate] [Category] | semmle.label | implicit-deref RequestData [postupdate] [Category] |
 | main.go:40:25:40:31 | selection of URL | semmle.label | selection of URL |
 | main.go:40:25:40:39 | call to Query | semmle.label | call to Query |
 | main.go:40:25:40:51 | index expression | semmle.label | index expression |
 | main.go:42:7:43:23 | []type{args} [array] | semmle.label | []type{args} [array] |
 | main.go:42:7:43:23 | call to Sprintf | semmle.label | call to Sprintf |
 | main.go:43:3:43:13 | RequestData [pointer, Category] | semmle.label | RequestData [pointer, Category] |
-| main.go:43:3:43:13 | implicit dereference [Category] | semmle.label | implicit dereference [Category] |
+| main.go:43:3:43:13 | implicit-deref RequestData [Category] | semmle.label | implicit-deref RequestData [Category] |
 | main.go:43:3:43:22 | selection of Category | semmle.label | selection of Category |
 | main.go:44:11:44:11 | q | semmle.label | q |
 | main.go:49:3:49:14 | star expression [postupdate] [Category] | semmle.label | star expression [postupdate] [Category] |
@@ -226,7 +226,7 @@ nodes
 | main.go:51:7:52:23 | []type{args} [array] | semmle.label | []type{args} [array] |
 | main.go:51:7:52:23 | call to Sprintf | semmle.label | call to Sprintf |
 | main.go:52:3:52:13 | RequestData [pointer, Category] | semmle.label | RequestData [pointer, Category] |
-| main.go:52:3:52:13 | implicit dereference [Category] | semmle.label | implicit dereference [Category] |
+| main.go:52:3:52:13 | implicit-deref RequestData [Category] | semmle.label | implicit-deref RequestData [Category] |
 | main.go:52:3:52:22 | selection of Category | semmle.label | selection of Category |
 | main.go:53:11:53:11 | q | semmle.label | q |
 | main.go:58:3:58:14 | star expression [postupdate] [Category] | semmle.label | star expression [postupdate] [Category] |
diff --git a/go/ql/test/query-tests/Security/CWE-089/StringBreak.expected b/go/ql/test/query-tests/Security/CWE-089/StringBreak.expected
index 63caa73d596d..31d7ff8622c8 100644
--- a/go/ql/test/query-tests/Security/CWE-089/StringBreak.expected
+++ b/go/ql/test/query-tests/Security/CWE-089/StringBreak.expected
@@ -1,25 +1,25 @@
 #select
-| StringBreak.go:15:47:15:57 | versionJSON | StringBreak.go:11:2:11:40 | ... := ...[0] | StringBreak.go:15:47:15:57 | versionJSON | If this $@ contains a single quote, it could break out of the enclosing quotes. | StringBreak.go:11:2:11:40 | ... := ...[0] | JSON value |
-| StringBreakMismatched.go:18:26:18:32 | escaped | StringBreakMismatched.go:13:2:13:40 | ... := ...[0] | StringBreakMismatched.go:18:26:18:32 | escaped | If this $@ contains a single quote, it could break out of the enclosing quotes. | StringBreakMismatched.go:13:2:13:40 | ... := ...[0] | JSON value |
-| StringBreakMismatched.go:30:27:30:33 | escaped | StringBreakMismatched.go:25:2:25:40 | ... := ...[0] | StringBreakMismatched.go:30:27:30:33 | escaped | If this $@ contains a double quote, it could break out of the enclosing quotes. | StringBreakMismatched.go:25:2:25:40 | ... := ...[0] | JSON value |
+| StringBreak.go:15:47:15:57 | versionJSON | StringBreak.go:11:2:11:40 | extract:0 ... := ... | StringBreak.go:15:47:15:57 | versionJSON | If this $@ contains a single quote, it could break out of the enclosing quotes. | StringBreak.go:11:2:11:40 | extract:0 ... := ... | JSON value |
+| StringBreakMismatched.go:18:26:18:32 | escaped | StringBreakMismatched.go:13:2:13:40 | extract:0 ... := ... | StringBreakMismatched.go:18:26:18:32 | escaped | If this $@ contains a single quote, it could break out of the enclosing quotes. | StringBreakMismatched.go:13:2:13:40 | extract:0 ... := ... | JSON value |
+| StringBreakMismatched.go:30:27:30:33 | escaped | StringBreakMismatched.go:25:2:25:40 | extract:0 ... := ... | StringBreakMismatched.go:30:27:30:33 | escaped | If this $@ contains a double quote, it could break out of the enclosing quotes. | StringBreakMismatched.go:25:2:25:40 | extract:0 ... := ... | JSON value |
 edges
-| StringBreak.go:11:2:11:40 | ... := ...[0] | StringBreak.go:15:47:15:57 | versionJSON | provenance |  |
-| StringBreakMismatched.go:13:2:13:40 | ... := ...[0] | StringBreakMismatched.go:14:29:14:47 | type conversion | provenance |  |
+| StringBreak.go:11:2:11:40 | extract:0 ... := ... | StringBreak.go:15:47:15:57 | versionJSON | provenance |  |
+| StringBreakMismatched.go:13:2:13:40 | extract:0 ... := ... | StringBreakMismatched.go:14:29:14:47 | type conversion | provenance |  |
 | StringBreakMismatched.go:14:13:14:62 | call to Replace | StringBreakMismatched.go:18:26:18:32 | escaped | provenance |  |
 | StringBreakMismatched.go:14:29:14:47 | type conversion | StringBreakMismatched.go:14:13:14:62 | call to Replace | provenance | MaD:1 |
-| StringBreakMismatched.go:25:2:25:40 | ... := ...[0] | StringBreakMismatched.go:26:29:26:47 | type conversion | provenance |  |
+| StringBreakMismatched.go:25:2:25:40 | extract:0 ... := ... | StringBreakMismatched.go:26:29:26:47 | type conversion | provenance |  |
 | StringBreakMismatched.go:26:13:26:61 | call to Replace | StringBreakMismatched.go:30:27:30:33 | escaped | provenance |  |
 | StringBreakMismatched.go:26:29:26:47 | type conversion | StringBreakMismatched.go:26:13:26:61 | call to Replace | provenance | MaD:1 |
 models
 | 1 | Summary: strings; ; false; Replace; ; ; Argument[0]; ReturnValue; taint; manual |
 nodes
-| StringBreak.go:11:2:11:40 | ... := ...[0] | semmle.label | ... := ...[0] |
+| StringBreak.go:11:2:11:40 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | StringBreak.go:15:47:15:57 | versionJSON | semmle.label | versionJSON |
-| StringBreakMismatched.go:13:2:13:40 | ... := ...[0] | semmle.label | ... := ...[0] |
+| StringBreakMismatched.go:13:2:13:40 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | StringBreakMismatched.go:14:13:14:62 | call to Replace | semmle.label | call to Replace |
 | StringBreakMismatched.go:14:29:14:47 | type conversion | semmle.label | type conversion |
 | StringBreakMismatched.go:18:26:18:32 | escaped | semmle.label | escaped |
-| StringBreakMismatched.go:25:2:25:40 | ... := ...[0] | semmle.label | ... := ...[0] |
+| StringBreakMismatched.go:25:2:25:40 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | StringBreakMismatched.go:26:13:26:61 | call to Replace | semmle.label | call to Replace |
 | StringBreakMismatched.go:26:29:26:47 | type conversion | semmle.label | type conversion |
 | StringBreakMismatched.go:30:27:30:33 | escaped | semmle.label | escaped |
diff --git a/go/ql/test/query-tests/Security/CWE-117/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-117/CONSISTENCY/DataFlowConsistency.expected
index a683e9691675..f519d603e82e 100644
--- a/go/ql/test/query-tests/Security/CWE-117/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-117/CONSISTENCY/DataFlowConsistency.expected
@@ -1,11 +1,11 @@
 reverseRead
-| LogInjection.go:32:14:32:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| LogInjection.go:33:14:33:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| LogInjection.go:34:18:34:20 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| LogInjection.go:35:14:35:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| LogInjection.go:551:14:551:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| LogInjection.go:559:14:559:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| LogInjection.go:567:14:567:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| LogInjection.go:602:14:602:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| LogInjection.go:603:14:603:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| LogInjection.go:828:12:828:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| LogInjection.go:32:14:32:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| LogInjection.go:33:14:33:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| LogInjection.go:34:18:34:20 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| LogInjection.go:35:14:35:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| LogInjection.go:551:14:551:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| LogInjection.go:559:14:559:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| LogInjection.go:567:14:567:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| LogInjection.go:602:14:602:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| LogInjection.go:603:14:603:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| LogInjection.go:828:12:828:14 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-190/AllocationSizeOverflow.expected b/go/ql/test/query-tests/Security/CWE-190/AllocationSizeOverflow.expected
index ec1835a6f8ac..f21d5dd184b8 100644
--- a/go/ql/test/query-tests/Security/CWE-190/AllocationSizeOverflow.expected
+++ b/go/ql/test/query-tests/Security/CWE-190/AllocationSizeOverflow.expected
@@ -1,22 +1,22 @@
 #select
-| AllocationSizeOverflow.go:10:10:10:22 | call to len | AllocationSizeOverflow.go:6:2:6:33 | ... := ...[0] | AllocationSizeOverflow.go:10:10:10:22 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | AllocationSizeOverflow.go:11:25:11:28 | size | allocation | AllocationSizeOverflow.go:6:2:6:33 | ... := ...[0] | potentially large value |
-| tst2.go:10:22:10:30 | call to len | tst2.go:9:2:9:37 | ... := ...[0] | tst2.go:10:22:10:30 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst2.go:10:22:10:32 | ...+... | allocation | tst2.go:9:2:9:37 | ... := ...[0] | potentially large value |
-| tst2.go:15:22:15:30 | call to len | tst2.go:14:2:14:29 | ... := ...[0] | tst2.go:15:22:15:30 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst2.go:15:22:15:32 | ...+... | allocation | tst2.go:14:2:14:29 | ... := ...[0] | potentially large value |
-| tst3.go:7:22:7:34 | call to len | tst3.go:6:2:6:31 | ... := ...[0] | tst3.go:7:22:7:34 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst3.go:7:22:7:36 | ...+... | allocation | tst3.go:6:2:6:31 | ... := ...[0] | potentially large value |
-| tst3.go:24:16:24:28 | call to len | tst3.go:6:2:6:31 | ... := ...[0] | tst3.go:24:16:24:28 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst3.go:27:24:27:32 | newlength | allocation | tst3.go:6:2:6:31 | ... := ...[0] | potentially large value |
-| tst3.go:32:16:32:28 | call to len | tst3.go:6:2:6:31 | ... := ...[0] | tst3.go:32:16:32:28 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst3.go:36:23:36:31 | newlength | allocation | tst3.go:6:2:6:31 | ... := ...[0] | potentially large value |
-| tst.go:15:22:15:34 | call to len | tst.go:14:2:14:30 | ... = ...[0] | tst.go:15:22:15:34 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst.go:15:22:15:36 | ...+... | allocation | tst.go:14:2:14:30 | ... = ...[0] | potentially large value |
-| tst.go:21:22:21:34 | call to len | tst.go:20:2:20:31 | ... = ...[0] | tst.go:21:22:21:34 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst.go:21:22:21:36 | ...+... | allocation | tst.go:20:2:20:31 | ... = ...[0] | potentially large value |
-| tst.go:27:26:27:38 | call to len | tst.go:26:2:26:31 | ... = ...[0] | tst.go:27:26:27:38 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst.go:27:26:27:40 | ...+... | allocation | tst.go:26:2:26:31 | ... = ...[0] | potentially large value |
-| tst.go:35:22:35:34 | call to len | tst.go:34:2:34:30 | ... = ...[0] | tst.go:35:22:35:34 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst.go:35:22:35:36 | ...+... | allocation | tst.go:34:2:34:30 | ... = ...[0] | potentially large value |
+| AllocationSizeOverflow.go:10:10:10:22 | call to len | AllocationSizeOverflow.go:6:2:6:33 | extract:0 ... := ... | AllocationSizeOverflow.go:10:10:10:22 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | AllocationSizeOverflow.go:11:25:11:28 | size | allocation | AllocationSizeOverflow.go:6:2:6:33 | extract:0 ... := ... | potentially large value |
+| tst2.go:10:22:10:30 | call to len | tst2.go:9:2:9:37 | extract:0 ... := ... | tst2.go:10:22:10:30 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst2.go:10:22:10:32 | ...+... | allocation | tst2.go:9:2:9:37 | extract:0 ... := ... | potentially large value |
+| tst2.go:15:22:15:30 | call to len | tst2.go:14:2:14:29 | extract:0 ... := ... | tst2.go:15:22:15:30 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst2.go:15:22:15:32 | ...+... | allocation | tst2.go:14:2:14:29 | extract:0 ... := ... | potentially large value |
+| tst3.go:7:22:7:34 | call to len | tst3.go:6:2:6:31 | extract:0 ... := ... | tst3.go:7:22:7:34 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst3.go:7:22:7:36 | ...+... | allocation | tst3.go:6:2:6:31 | extract:0 ... := ... | potentially large value |
+| tst3.go:24:16:24:28 | call to len | tst3.go:6:2:6:31 | extract:0 ... := ... | tst3.go:24:16:24:28 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst3.go:27:24:27:32 | newlength | allocation | tst3.go:6:2:6:31 | extract:0 ... := ... | potentially large value |
+| tst3.go:32:16:32:28 | call to len | tst3.go:6:2:6:31 | extract:0 ... := ... | tst3.go:32:16:32:28 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst3.go:36:23:36:31 | newlength | allocation | tst3.go:6:2:6:31 | extract:0 ... := ... | potentially large value |
+| tst.go:15:22:15:34 | call to len | tst.go:14:2:14:30 | extract:0 ... = ... | tst.go:15:22:15:34 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst.go:15:22:15:36 | ...+... | allocation | tst.go:14:2:14:30 | extract:0 ... = ... | potentially large value |
+| tst.go:21:22:21:34 | call to len | tst.go:20:2:20:31 | extract:0 ... = ... | tst.go:21:22:21:34 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst.go:21:22:21:36 | ...+... | allocation | tst.go:20:2:20:31 | extract:0 ... = ... | potentially large value |
+| tst.go:27:26:27:38 | call to len | tst.go:26:2:26:31 | extract:0 ... = ... | tst.go:27:26:27:38 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst.go:27:26:27:40 | ...+... | allocation | tst.go:26:2:26:31 | extract:0 ... = ... | potentially large value |
+| tst.go:35:22:35:34 | call to len | tst.go:34:2:34:30 | extract:0 ... = ... | tst.go:35:22:35:34 | call to len | This operation, which is used in an $@, involves a $@ and might overflow. | tst.go:35:22:35:36 | ...+... | allocation | tst.go:34:2:34:30 | extract:0 ... = ... | potentially large value |
 edges
-| AllocationSizeOverflow.go:6:2:6:33 | ... := ...[0] | AllocationSizeOverflow.go:10:14:10:21 | jsonData | provenance |  |
+| AllocationSizeOverflow.go:6:2:6:33 | extract:0 ... := ... | AllocationSizeOverflow.go:10:14:10:21 | jsonData | provenance |  |
 | AllocationSizeOverflow.go:10:14:10:21 | jsonData | AllocationSizeOverflow.go:10:10:10:22 | call to len | provenance | Config |
-| tst2.go:9:2:9:37 | ... := ...[0] | tst2.go:10:26:10:29 | data | provenance | Src:MaD:1  |
+| tst2.go:9:2:9:37 | extract:0 ... := ... | tst2.go:10:26:10:29 | data | provenance | Src:MaD:1  |
 | tst2.go:10:26:10:29 | data | tst2.go:10:22:10:30 | call to len | provenance | Config |
-| tst2.go:14:2:14:29 | ... := ...[0] | tst2.go:15:26:15:29 | data | provenance |  |
+| tst2.go:14:2:14:29 | extract:0 ... := ... | tst2.go:15:26:15:29 | data | provenance |  |
 | tst2.go:15:26:15:29 | data | tst2.go:15:22:15:30 | call to len | provenance | Config |
-| tst3.go:6:2:6:31 | ... := ...[0] | tst3.go:7:26:7:33 | jsonData | provenance |  |
+| tst3.go:6:2:6:31 | extract:0 ... := ... | tst3.go:7:26:7:33 | jsonData | provenance |  |
 | tst3.go:7:26:7:33 | jsonData | tst3.go:7:22:7:34 | call to len | provenance | Config |
 | tst3.go:7:26:7:33 | jsonData | tst3.go:9:32:9:39 | jsonData | provenance |  |
 | tst3.go:9:32:9:39 | jsonData | tst3.go:11:9:11:16 | jsonData | provenance |  |
@@ -25,27 +25,27 @@ edges
 | tst3.go:24:20:24:27 | jsonData | tst3.go:24:16:24:28 | call to len | provenance | Config |
 | tst3.go:24:20:24:27 | jsonData | tst3.go:32:20:32:27 | jsonData | provenance |  |
 | tst3.go:32:20:32:27 | jsonData | tst3.go:32:16:32:28 | call to len | provenance | Config |
-| tst.go:14:2:14:30 | ... = ...[0] | tst.go:15:26:15:33 | jsonData | provenance |  |
+| tst.go:14:2:14:30 | extract:0 ... = ... | tst.go:15:26:15:33 | jsonData | provenance |  |
 | tst.go:15:26:15:33 | jsonData | tst.go:15:22:15:34 | call to len | provenance | Config |
-| tst.go:20:2:20:31 | ... = ...[0] | tst.go:21:26:21:33 | jsonData | provenance |  |
+| tst.go:20:2:20:31 | extract:0 ... = ... | tst.go:21:26:21:33 | jsonData | provenance |  |
 | tst.go:21:26:21:33 | jsonData | tst.go:21:22:21:34 | call to len | provenance | Config |
-| tst.go:26:2:26:31 | ... = ...[0] | tst.go:27:30:27:37 | jsonData | provenance |  |
+| tst.go:26:2:26:31 | extract:0 ... = ... | tst.go:27:30:27:37 | jsonData | provenance |  |
 | tst.go:27:30:27:37 | jsonData | tst.go:27:26:27:38 | call to len | provenance | Config |
-| tst.go:34:2:34:30 | ... = ...[0] | tst.go:35:26:35:33 | jsonData | provenance |  |
+| tst.go:34:2:34:30 | extract:0 ... = ... | tst.go:35:26:35:33 | jsonData | provenance |  |
 | tst.go:35:26:35:33 | jsonData | tst.go:35:22:35:34 | call to len | provenance | Config |
 models
 | 1 | Source: io/ioutil; ; false; ReadFile; ; ; ReturnValue[0]; file; manual |
 nodes
-| AllocationSizeOverflow.go:6:2:6:33 | ... := ...[0] | semmle.label | ... := ...[0] |
+| AllocationSizeOverflow.go:6:2:6:33 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | AllocationSizeOverflow.go:10:10:10:22 | call to len | semmle.label | call to len |
 | AllocationSizeOverflow.go:10:14:10:21 | jsonData | semmle.label | jsonData |
-| tst2.go:9:2:9:37 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tst2.go:9:2:9:37 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | tst2.go:10:22:10:30 | call to len | semmle.label | call to len |
 | tst2.go:10:26:10:29 | data | semmle.label | data |
-| tst2.go:14:2:14:29 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tst2.go:14:2:14:29 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | tst2.go:15:22:15:30 | call to len | semmle.label | call to len |
 | tst2.go:15:26:15:29 | data | semmle.label | data |
-| tst3.go:6:2:6:31 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tst3.go:6:2:6:31 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | tst3.go:7:22:7:34 | call to len | semmle.label | call to len |
 | tst3.go:7:26:7:33 | jsonData | semmle.label | jsonData |
 | tst3.go:9:32:9:39 | jsonData | semmle.label | jsonData |
@@ -55,16 +55,16 @@ nodes
 | tst3.go:24:20:24:27 | jsonData | semmle.label | jsonData |
 | tst3.go:32:16:32:28 | call to len | semmle.label | call to len |
 | tst3.go:32:20:32:27 | jsonData | semmle.label | jsonData |
-| tst.go:14:2:14:30 | ... = ...[0] | semmle.label | ... = ...[0] |
+| tst.go:14:2:14:30 | extract:0 ... = ... | semmle.label | extract:0 ... = ... |
 | tst.go:15:22:15:34 | call to len | semmle.label | call to len |
 | tst.go:15:26:15:33 | jsonData | semmle.label | jsonData |
-| tst.go:20:2:20:31 | ... = ...[0] | semmle.label | ... = ...[0] |
+| tst.go:20:2:20:31 | extract:0 ... = ... | semmle.label | extract:0 ... = ... |
 | tst.go:21:22:21:34 | call to len | semmle.label | call to len |
 | tst.go:21:26:21:33 | jsonData | semmle.label | jsonData |
-| tst.go:26:2:26:31 | ... = ...[0] | semmle.label | ... = ...[0] |
+| tst.go:26:2:26:31 | extract:0 ... = ... | semmle.label | extract:0 ... = ... |
 | tst.go:27:26:27:38 | call to len | semmle.label | call to len |
 | tst.go:27:30:27:37 | jsonData | semmle.label | jsonData |
-| tst.go:34:2:34:30 | ... = ...[0] | semmle.label | ... = ...[0] |
+| tst.go:34:2:34:30 | extract:0 ... = ... | semmle.label | extract:0 ... = ... |
 | tst.go:35:22:35:34 | call to len | semmle.label | call to len |
 | tst.go:35:26:35:33 | jsonData | semmle.label | jsonData |
 subpaths
diff --git a/go/ql/test/query-tests/Security/CWE-190/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-190/CONSISTENCY/DataFlowConsistency.expected
index 26d6a7eec8e5..5d9da2284549 100644
--- a/go/ql/test/query-tests/Security/CWE-190/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-190/CONSISTENCY/DataFlowConsistency.expected
@@ -1,3 +1,3 @@
 reverseRead
-| array_vs_contents.go:16:25:16:31 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| array_vs_contents.go:33:25:33:31 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| array_vs_contents.go:16:25:16:31 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
+| array_vs_contents.go:33:25:33:31 | implicit-deref request | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected b/go/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected
index 732b9cd5caed..a16e9e115283 100644
--- a/go/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected
+++ b/go/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected
@@ -1,8 +1,13 @@
+#select
+| test.go:18:10:18:12 | buf | test.go:15:28:15:30 | buf [postupdate] | test.go:18:10:18:12 | buf | HTTP response depends on $@ and may be exposed to an external user. | test.go:15:28:15:30 | buf [postupdate] | stack trace information |
+| test.go:46:11:46:13 | buf | test.go:15:28:15:30 | buf [postupdate] | test.go:46:11:46:13 | buf | HTTP response depends on $@ and may be exposed to an external user. | test.go:15:28:15:30 | buf [postupdate] | stack trace information |
 edges
 | test.go:15:28:15:30 | buf [postupdate] | test.go:18:10:18:12 | buf | provenance |  |
+| test.go:15:28:15:30 | buf [postupdate] | test.go:21:29:21:31 | buf | provenance |  |
+| test.go:21:29:21:31 | buf | test.go:46:11:46:13 | buf | provenance |  |
 nodes
 | test.go:15:28:15:30 | buf [postupdate] | semmle.label | buf [postupdate] |
 | test.go:18:10:18:12 | buf | semmle.label | buf |
+| test.go:21:29:21:31 | buf | semmle.label | buf |
+| test.go:46:11:46:13 | buf | semmle.label | buf |
 subpaths
-#select
-| test.go:18:10:18:12 | buf | test.go:15:28:15:30 | buf [postupdate] | test.go:18:10:18:12 | buf | HTTP response depends on $@ and may be exposed to an external user. | test.go:15:28:15:30 | buf [postupdate] | stack trace information |
diff --git a/go/ql/test/query-tests/Security/CWE-209/test.go b/go/ql/test/query-tests/Security/CWE-209/test.go
index 6a1b6c298ba2..94231dd62b22 100644
--- a/go/ql/test/query-tests/Security/CWE-209/test.go
+++ b/go/ql/test/query-tests/Security/CWE-209/test.go
@@ -39,4 +39,10 @@ func handlePanic(w http.ResponseWriter, r *http.Request) {
 	if printStackTrace {
 		w.Write(buf)
 	}
+	switch "production" {
+	case "debug":
+		w.Write(buf)
+	default:
+		w.Write(buf) // $ Alert
+	}
 }
diff --git a/go/ql/test/query-tests/Security/CWE-295/DisabledCertificateCheck/DisabledCertificateCheck.expected b/go/ql/test/query-tests/Security/CWE-295/DisabledCertificateCheck/DisabledCertificateCheck.expected
index 6e7de24be8e5..fc99e821181f 100644
--- a/go/ql/test/query-tests/Security/CWE-295/DisabledCertificateCheck/DisabledCertificateCheck.expected
+++ b/go/ql/test/query-tests/Security/CWE-295/DisabledCertificateCheck/DisabledCertificateCheck.expected
@@ -1,4 +1,4 @@
-| DisabledCertificateCheck.go:10:32:10:55 | init of key-value pair | InsecureSkipVerify should not be used in production code. |
-| main.go:9:2:9:23 | assignment to field InsecureSkipVerify | InsecureSkipVerify should not be used in production code. |
-| main.go:57:21:57:44 | init of key-value pair | InsecureSkipVerify should not be used in production code. |
-| main.go:62:32:62:55 | init of key-value pair | InsecureSkipVerify should not be used in production code. |
+| DisabledCertificateCheck.go:10:32:10:55 | lit-init key-value pair | InsecureSkipVerify should not be used in production code. |
+| main.go:9:2:9:30 | assign:0 ... = ... | InsecureSkipVerify should not be used in production code. |
+| main.go:57:21:57:44 | lit-init key-value pair | InsecureSkipVerify should not be used in production code. |
+| main.go:62:32:62:55 | lit-init key-value pair | InsecureSkipVerify should not be used in production code. |
diff --git a/go/ql/test/query-tests/Security/CWE-295/DisabledCertificateCheck/main.go b/go/ql/test/query-tests/Security/CWE-295/DisabledCertificateCheck/main.go
index 152ece5ba466..ece238eb8933 100644
--- a/go/ql/test/query-tests/Security/CWE-295/DisabledCertificateCheck/main.go
+++ b/go/ql/test/query-tests/Security/CWE-295/DisabledCertificateCheck/main.go
@@ -83,3 +83,16 @@ func good3(i int) *http.Transport {
 	}
 	return nil
 }
+
+func reusedFeatureFlag(cfg *tls.Config, enableSecurity bool) {
+	switch true {
+	case enableSecurity:
+		_ = enableSecurity
+	}
+
+	if enableSecurity {
+		_ = cfg
+	} else {
+		cfg.InsecureSkipVerify = true // OK
+	}
+}
diff --git a/go/ql/test/query-tests/Security/CWE-312/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-312/CONSISTENCY/DataFlowConsistency.expected
index 9161b6f3eb9c..12cd207a4e09 100644
--- a/go/ql/test/query-tests/Security/CWE-312/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-312/CONSISTENCY/DataFlowConsistency.expected
@@ -1,12 +1,12 @@
 reverseRead
-| CleartextLogging.go:11:11:11:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CleartextLogging.go:12:9:12:9 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CleartextLoggingGood.go:12:11:12:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CleartextLoggingGood.go:13:9:13:9 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| CleartextLoggingGood.go:25:14:25:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| klog.go:27:13:27:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| CleartextLogging.go:11:11:11:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| CleartextLogging.go:12:9:12:9 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| CleartextLoggingGood.go:12:11:12:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| CleartextLoggingGood.go:13:9:13:9 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| CleartextLoggingGood.go:25:14:25:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| klog.go:27:13:27:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
 | klog.go:28:13:28:20 | selection of Header | Origin of readStep is missing a PostUpdateNode. |
-| klog.go:29:13:29:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| klog.go:29:13:29:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
 | protos/query/query.pb.go:58:9:58:34 | file_query_proto_enumTypes | Origin of readStep is missing a PostUpdateNode. |
 | protos/query/query.pb.go:62:10:62:35 | file_query_proto_enumTypes | Origin of readStep is missing a PostUpdateNode. |
 | protos/query/query.pb.go:88:10:88:34 | file_query_proto_msgTypes | Origin of readStep is missing a PostUpdateNode. |
@@ -15,17 +15,17 @@ reverseRead
 | protos/query/query.pb.go:169:9:169:33 | file_query_proto_msgTypes | Origin of readStep is missing a PostUpdateNode. |
 | protos/query/query.pb.go:204:10:204:34 | file_query_proto_msgTypes | Origin of readStep is missing a PostUpdateNode. |
 | protos/query/query.pb.go:217:9:217:33 | file_query_proto_msgTypes | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:318:13:318:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:320:13:320:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:322:13:322:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:330:13:330:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:332:13:332:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:334:13:334:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:342:13:342:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:344:13:344:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| protos/query/query.pb.go:346:13:346:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| server1.go:11:11:11:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| server1.go:13:11:13:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:318:13:318:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:320:13:320:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:322:13:322:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:330:13:330:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:332:13:332:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:334:13:334:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:342:13:342:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:344:13:344:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| protos/query/query.pb.go:346:13:346:13 | implicit-deref v | Origin of readStep is missing a PostUpdateNode. |
+| server1.go:11:11:11:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| server1.go:13:11:13:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
 | server1.go:14:11:14:14 | vals | Origin of readStep is missing a PostUpdateNode. |
-| server1.go:17:41:17:41 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| server1.go:21:46:21:46 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| server1.go:17:41:17:41 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| server1.go:21:46:21:46 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected b/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
index 7a195352f395..c81e0ed61412 100644
--- a/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
+++ b/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
@@ -1,80 +1,80 @@
 #select
 | klog.go:23:15:23:20 | header | klog.go:21:30:21:37 | selection of Header | klog.go:23:15:23:20 | header | $@ flows to a logging call. | klog.go:21:30:21:37 | selection of Header | Sensitive data returned by HTTP request headers |
 | klog.go:29:13:29:41 | call to Get | klog.go:29:13:29:20 | selection of Header | klog.go:29:13:29:41 | call to Get | $@ flows to a logging call. | klog.go:29:13:29:20 | selection of Header | Sensitive data returned by HTTP request headers |
-| main.go:19:12:19:19 | password | main.go:17:2:17:9 | SSA def(password) | main.go:19:12:19:19 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:20:19:20:26 | password | main.go:17:2:17:9 | SSA def(password) | main.go:20:19:20:26 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:21:13:21:20 | password | main.go:17:2:17:9 | SSA def(password) | main.go:21:13:21:20 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:22:14:22:21 | password | main.go:17:2:17:9 | SSA def(password) | main.go:22:14:22:21 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:24:13:24:20 | password | main.go:17:2:17:9 | SSA def(password) | main.go:24:13:24:20 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:27:20:27:27 | password | main.go:17:2:17:9 | SSA def(password) | main.go:27:20:27:27 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:30:14:30:21 | password | main.go:17:2:17:9 | SSA def(password) | main.go:30:14:30:21 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:33:15:33:22 | password | main.go:17:2:17:9 | SSA def(password) | main.go:33:15:33:22 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:36:13:36:20 | password | main.go:17:2:17:9 | SSA def(password) | main.go:36:13:36:20 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:39:20:39:27 | password | main.go:17:2:17:9 | SSA def(password) | main.go:39:20:39:27 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:42:14:42:21 | password | main.go:17:2:17:9 | SSA def(password) | main.go:42:14:42:21 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:45:15:45:22 | password | main.go:17:2:17:9 | SSA def(password) | main.go:45:15:45:22 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:47:16:47:23 | password | main.go:17:2:17:9 | SSA def(password) | main.go:47:16:47:23 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:51:10:51:17 | password | main.go:17:2:17:9 | SSA def(password) | main.go:51:10:51:17 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:52:17:52:24 | password | main.go:17:2:17:9 | SSA def(password) | main.go:52:17:52:24 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:53:11:53:18 | password | main.go:17:2:17:9 | SSA def(password) | main.go:53:11:53:18 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:54:12:54:19 | password | main.go:17:2:17:9 | SSA def(password) | main.go:54:12:54:19 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:56:11:56:18 | password | main.go:17:2:17:9 | SSA def(password) | main.go:56:11:56:18 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:59:18:59:25 | password | main.go:17:2:17:9 | SSA def(password) | main.go:59:18:59:25 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:62:12:62:19 | password | main.go:17:2:17:9 | SSA def(password) | main.go:62:12:62:19 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:65:13:65:20 | password | main.go:17:2:17:9 | SSA def(password) | main.go:65:13:65:20 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:68:11:68:18 | password | main.go:17:2:17:9 | SSA def(password) | main.go:68:11:68:18 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:71:18:71:25 | password | main.go:17:2:17:9 | SSA def(password) | main.go:71:18:71:25 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:74:12:74:19 | password | main.go:17:2:17:9 | SSA def(password) | main.go:74:12:74:19 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:77:13:77:20 | password | main.go:17:2:17:9 | SSA def(password) | main.go:77:13:77:20 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:79:14:79:21 | password | main.go:17:2:17:9 | SSA def(password) | main.go:79:14:79:21 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:82:12:82:19 | password | main.go:17:2:17:9 | SSA def(password) | main.go:82:12:82:19 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:83:17:83:24 | password | main.go:17:2:17:9 | SSA def(password) | main.go:83:17:83:24 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:87:29:87:34 | fields | main.go:17:2:17:9 | SSA def(password) | main.go:87:29:87:34 | fields | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| main.go:90:35:90:42 | password | main.go:17:2:17:9 | SSA def(password) | main.go:90:35:90:42 | password | $@ flows to a logging call. | main.go:17:2:17:9 | SSA def(password) | Sensitive data returned by an access to password |
-| overrides.go:13:14:13:23 | call to String | overrides.go:8:2:8:9 | SSA def(password) | overrides.go:13:14:13:23 | call to String | $@ flows to a logging call. | overrides.go:8:2:8:9 | SSA def(password) | Sensitive data returned by an access to password |
-| passwords.go:9:14:9:14 | x | passwords.go:21:2:21:9 | SSA def(password) | passwords.go:9:14:9:14 | x | $@ flows to a logging call. | passwords.go:21:2:21:9 | SSA def(password) | Sensitive data returned by an access to password |
-| passwords.go:25:14:25:21 | password | passwords.go:21:2:21:9 | SSA def(password) | passwords.go:25:14:25:21 | password | $@ flows to a logging call. | passwords.go:21:2:21:9 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:19:12:19:19 | password | main.go:17:2:17:23 | SSA def(password) | main.go:19:12:19:19 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:20:19:20:26 | password | main.go:17:2:17:23 | SSA def(password) | main.go:20:19:20:26 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:21:13:21:20 | password | main.go:17:2:17:23 | SSA def(password) | main.go:21:13:21:20 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:22:14:22:21 | password | main.go:17:2:17:23 | SSA def(password) | main.go:22:14:22:21 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:24:13:24:20 | password | main.go:17:2:17:23 | SSA def(password) | main.go:24:13:24:20 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:27:20:27:27 | password | main.go:17:2:17:23 | SSA def(password) | main.go:27:20:27:27 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:30:14:30:21 | password | main.go:17:2:17:23 | SSA def(password) | main.go:30:14:30:21 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:33:15:33:22 | password | main.go:17:2:17:23 | SSA def(password) | main.go:33:15:33:22 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:36:13:36:20 | password | main.go:17:2:17:23 | SSA def(password) | main.go:36:13:36:20 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:39:20:39:27 | password | main.go:17:2:17:23 | SSA def(password) | main.go:39:20:39:27 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:42:14:42:21 | password | main.go:17:2:17:23 | SSA def(password) | main.go:42:14:42:21 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:45:15:45:22 | password | main.go:17:2:17:23 | SSA def(password) | main.go:45:15:45:22 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:47:16:47:23 | password | main.go:17:2:17:23 | SSA def(password) | main.go:47:16:47:23 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:51:10:51:17 | password | main.go:17:2:17:23 | SSA def(password) | main.go:51:10:51:17 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:52:17:52:24 | password | main.go:17:2:17:23 | SSA def(password) | main.go:52:17:52:24 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:53:11:53:18 | password | main.go:17:2:17:23 | SSA def(password) | main.go:53:11:53:18 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:54:12:54:19 | password | main.go:17:2:17:23 | SSA def(password) | main.go:54:12:54:19 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:56:11:56:18 | password | main.go:17:2:17:23 | SSA def(password) | main.go:56:11:56:18 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:59:18:59:25 | password | main.go:17:2:17:23 | SSA def(password) | main.go:59:18:59:25 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:62:12:62:19 | password | main.go:17:2:17:23 | SSA def(password) | main.go:62:12:62:19 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:65:13:65:20 | password | main.go:17:2:17:23 | SSA def(password) | main.go:65:13:65:20 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:68:11:68:18 | password | main.go:17:2:17:23 | SSA def(password) | main.go:68:11:68:18 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:71:18:71:25 | password | main.go:17:2:17:23 | SSA def(password) | main.go:71:18:71:25 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:74:12:74:19 | password | main.go:17:2:17:23 | SSA def(password) | main.go:74:12:74:19 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:77:13:77:20 | password | main.go:17:2:17:23 | SSA def(password) | main.go:77:13:77:20 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:79:14:79:21 | password | main.go:17:2:17:23 | SSA def(password) | main.go:79:14:79:21 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:82:12:82:19 | password | main.go:17:2:17:23 | SSA def(password) | main.go:82:12:82:19 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:83:17:83:24 | password | main.go:17:2:17:23 | SSA def(password) | main.go:83:17:83:24 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:87:29:87:34 | fields | main.go:17:2:17:23 | SSA def(password) | main.go:87:29:87:34 | fields | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| main.go:90:35:90:42 | password | main.go:17:2:17:23 | SSA def(password) | main.go:90:35:90:42 | password | $@ flows to a logging call. | main.go:17:2:17:23 | SSA def(password) | Sensitive data returned by an access to password |
+| overrides.go:13:14:13:23 | call to String | overrides.go:8:2:8:40 | SSA def(password) | overrides.go:13:14:13:23 | call to String | $@ flows to a logging call. | overrides.go:8:2:8:40 | SSA def(password) | Sensitive data returned by an access to password |
+| passwords.go:9:14:9:14 | x | passwords.go:21:2:21:23 | SSA def(password) | passwords.go:9:14:9:14 | x | $@ flows to a logging call. | passwords.go:21:2:21:23 | SSA def(password) | Sensitive data returned by an access to password |
+| passwords.go:25:14:25:21 | password | passwords.go:21:2:21:23 | SSA def(password) | passwords.go:25:14:25:21 | password | $@ flows to a logging call. | passwords.go:21:2:21:23 | SSA def(password) | Sensitive data returned by an access to password |
 | passwords.go:26:14:26:23 | selection of password | passwords.go:26:14:26:23 | selection of password | passwords.go:26:14:26:23 | selection of password | $@ flows to a logging call. | passwords.go:26:14:26:23 | selection of password | Sensitive data returned by an access to password |
 | passwords.go:27:14:27:26 | call to getPassword | passwords.go:27:14:27:26 | call to getPassword | passwords.go:27:14:27:26 | call to getPassword | $@ flows to a logging call. | passwords.go:27:14:27:26 | call to getPassword | Sensitive data returned by a call to getPassword |
 | passwords.go:28:14:28:28 | call to getPassword | passwords.go:28:14:28:28 | call to getPassword | passwords.go:28:14:28:28 | call to getPassword | $@ flows to a logging call. | passwords.go:28:14:28:28 | call to getPassword | Sensitive data returned by a call to getPassword |
-| passwords.go:33:13:33:20 | password | passwords.go:21:2:21:9 | SSA def(password) | passwords.go:33:13:33:20 | password | $@ flows to a logging call. | passwords.go:21:2:21:9 | SSA def(password) | Sensitive data returned by an access to password |
-| passwords.go:36:14:36:35 | ...+... | passwords.go:21:2:21:9 | SSA def(password) | passwords.go:36:14:36:35 | ...+... | $@ flows to a logging call. | passwords.go:21:2:21:9 | SSA def(password) | Sensitive data returned by an access to password |
+| passwords.go:33:13:33:20 | password | passwords.go:21:2:21:23 | SSA def(password) | passwords.go:33:13:33:20 | password | $@ flows to a logging call. | passwords.go:21:2:21:23 | SSA def(password) | Sensitive data returned by an access to password |
+| passwords.go:36:14:36:35 | ...+... | passwords.go:21:2:21:23 | SSA def(password) | passwords.go:36:14:36:35 | ...+... | $@ flows to a logging call. | passwords.go:21:2:21:23 | SSA def(password) | Sensitive data returned by an access to password |
 | passwords.go:41:14:41:17 | obj1 | passwords.go:39:13:39:13 | x | passwords.go:41:14:41:17 | obj1 | $@ flows to a logging call. | passwords.go:39:13:39:13 | x | Sensitive data returned by an access to password |
-| passwords.go:46:14:46:17 | obj2 | passwords.go:21:2:21:9 | SSA def(password) | passwords.go:46:14:46:17 | obj2 | $@ flows to a logging call. | passwords.go:21:2:21:9 | SSA def(password) | Sensitive data returned by an access to password |
-| passwords.go:53:14:53:27 | fixed_password | passwords.go:52:2:52:15 | SSA def(fixed_password) | passwords.go:53:14:53:27 | fixed_password | $@ flows to a logging call. | passwords.go:52:2:52:15 | SSA def(fixed_password) | Sensitive data returned by an access to fixed_password |
+| passwords.go:46:14:46:17 | obj2 | passwords.go:21:2:21:23 | SSA def(password) | passwords.go:46:14:46:17 | obj2 | $@ flows to a logging call. | passwords.go:21:2:21:23 | SSA def(password) | Sensitive data returned by an access to password |
+| passwords.go:53:14:53:27 | fixed_password | passwords.go:52:2:52:44 | SSA def(fixed_password) | passwords.go:53:14:53:27 | fixed_password | $@ flows to a logging call. | passwords.go:52:2:52:44 | SSA def(fixed_password) | Sensitive data returned by an access to fixed_password |
 | passwords.go:91:14:91:26 | utilityObject | passwords.go:89:16:89:36 | call to make | passwords.go:91:14:91:26 | utilityObject | $@ flows to a logging call. | passwords.go:89:16:89:36 | call to make | Sensitive data returned by an access to passwordSet |
-| passwords.go:94:23:94:28 | secret | passwords.go:21:2:21:9 | SSA def(password) | passwords.go:94:23:94:28 | secret | $@ flows to a logging call. | passwords.go:21:2:21:9 | SSA def(password) | Sensitive data returned by an access to password |
-| passwords.go:104:15:104:40 | ...+... | passwords.go:21:2:21:9 | SSA def(password) | passwords.go:104:15:104:40 | ...+... | $@ flows to a logging call. | passwords.go:21:2:21:9 | SSA def(password) | Sensitive data returned by an access to password |
-| passwords.go:110:16:110:41 | ...+... | passwords.go:21:2:21:9 | SSA def(password) | passwords.go:110:16:110:41 | ...+... | $@ flows to a logging call. | passwords.go:21:2:21:9 | SSA def(password) | Sensitive data returned by an access to password |
-| passwords.go:115:15:115:40 | ...+... | passwords.go:21:2:21:9 | SSA def(password) | passwords.go:115:15:115:40 | ...+... | $@ flows to a logging call. | passwords.go:21:2:21:9 | SSA def(password) | Sensitive data returned by an access to password |
-| passwords.go:119:14:119:45 | ...+... | passwords.go:118:6:118:14 | SSA def(password1) | passwords.go:119:14:119:45 | ...+... | $@ flows to a logging call. | passwords.go:118:6:118:14 | SSA def(password1) | Sensitive data returned by an access to password1 |
-| passwords.go:129:14:129:19 | config | passwords.go:21:2:21:9 | SSA def(password) | passwords.go:129:14:129:19 | config | $@ flows to a logging call. | passwords.go:21:2:21:9 | SSA def(password) | Sensitive data returned by an access to password |
+| passwords.go:94:23:94:28 | secret | passwords.go:21:2:21:23 | SSA def(password) | passwords.go:94:23:94:28 | secret | $@ flows to a logging call. | passwords.go:21:2:21:23 | SSA def(password) | Sensitive data returned by an access to password |
+| passwords.go:104:15:104:40 | ...+... | passwords.go:21:2:21:23 | SSA def(password) | passwords.go:104:15:104:40 | ...+... | $@ flows to a logging call. | passwords.go:21:2:21:23 | SSA def(password) | Sensitive data returned by an access to password |
+| passwords.go:110:16:110:41 | ...+... | passwords.go:21:2:21:23 | SSA def(password) | passwords.go:110:16:110:41 | ...+... | $@ flows to a logging call. | passwords.go:21:2:21:23 | SSA def(password) | Sensitive data returned by an access to password |
+| passwords.go:115:15:115:40 | ...+... | passwords.go:21:2:21:23 | SSA def(password) | passwords.go:115:15:115:40 | ...+... | $@ flows to a logging call. | passwords.go:21:2:21:23 | SSA def(password) | Sensitive data returned by an access to password |
+| passwords.go:119:14:119:45 | ...+... | passwords.go:118:6:118:50 | SSA def(password1) | passwords.go:119:14:119:45 | ...+... | $@ flows to a logging call. | passwords.go:118:6:118:50 | SSA def(password1) | Sensitive data returned by an access to password1 |
+| passwords.go:129:14:129:19 | config | passwords.go:21:2:21:23 | SSA def(password) | passwords.go:129:14:129:19 | config | $@ flows to a logging call. | passwords.go:21:2:21:23 | SSA def(password) | Sensitive data returned by an access to password |
 | passwords.go:129:14:129:19 | config | passwords.go:123:13:123:14 | x3 | passwords.go:129:14:129:19 | config | $@ flows to a logging call. | passwords.go:123:13:123:14 | x3 | Sensitive data returned by an access to password |
 | passwords.go:129:14:129:19 | config | passwords.go:126:13:126:25 | call to getPassword | passwords.go:129:14:129:19 | config | $@ flows to a logging call. | passwords.go:126:13:126:25 | call to getPassword | Sensitive data returned by a call to getPassword |
-| passwords.go:130:14:130:21 | selection of x | passwords.go:21:2:21:9 | SSA def(password) | passwords.go:130:14:130:21 | selection of x | $@ flows to a logging call. | passwords.go:21:2:21:9 | SSA def(password) | Sensitive data returned by an access to password |
+| passwords.go:130:14:130:21 | selection of x | passwords.go:21:2:21:23 | SSA def(password) | passwords.go:130:14:130:21 | selection of x | $@ flows to a logging call. | passwords.go:21:2:21:23 | SSA def(password) | Sensitive data returned by an access to password |
 | passwords.go:131:14:131:21 | selection of y | passwords.go:126:13:126:25 | call to getPassword | passwords.go:131:14:131:21 | selection of y | $@ flows to a logging call. | passwords.go:126:13:126:25 | call to getPassword | Sensitive data returned by a call to getPassword |
-| protobuf.go:14:14:14:35 | call to GetDescription | protobuf.go:9:2:9:9 | SSA def(password) | protobuf.go:14:14:14:35 | call to GetDescription | $@ flows to a logging call. | protobuf.go:9:2:9:9 | SSA def(password) | Sensitive data returned by an access to password |
+| protobuf.go:14:14:14:35 | call to GetDescription | protobuf.go:9:2:9:23 | SSA def(password) | protobuf.go:14:14:14:35 | call to GetDescription | $@ flows to a logging call. | protobuf.go:9:2:9:23 | SSA def(password) | Sensitive data returned by an access to password |
 edges
-| klog.go:21:3:26:3 | range statement[1] | klog.go:22:27:22:33 | headers | provenance |  |
-| klog.go:21:30:21:37 | selection of Header | klog.go:21:3:26:3 | range statement[1] | provenance | Src:MaD:11 Config |
-| klog.go:22:4:25:4 | range statement[1] | klog.go:23:15:23:20 | header | provenance |  |
-| klog.go:22:27:22:33 | headers | klog.go:22:4:25:4 | range statement[1] | provenance | Config |
+| klog.go:21:3:26:3 | extract:1 range element | klog.go:22:27:22:33 | headers | provenance |  |
+| klog.go:21:30:21:37 | selection of Header | klog.go:21:3:26:3 | extract:1 range element | provenance | Src:MaD:11 Config |
+| klog.go:22:4:25:4 | extract:1 range element | klog.go:23:15:23:20 | header | provenance |  |
+| klog.go:22:27:22:33 | headers | klog.go:22:4:25:4 | extract:1 range element | provenance | Config |
 | klog.go:29:13:29:20 | selection of Header | klog.go:29:13:29:41 | call to Get | provenance | Src:MaD:11 Config |
-| main.go:17:2:17:9 | SSA def(password) | main.go:19:12:19:19 | password | provenance |  |
-| main.go:17:2:17:9 | SSA def(password) | main.go:20:19:20:26 | password | provenance |  |
-| main.go:17:2:17:9 | SSA def(password) | main.go:21:13:21:20 | password | provenance | Sink:MaD:6 |
-| main.go:17:2:17:9 | SSA def(password) | main.go:22:14:22:21 | password | provenance |  |
-| main.go:17:2:17:9 | SSA def(password) | main.go:24:13:24:20 | password | provenance |  |
-| main.go:17:2:17:9 | SSA def(password) | main.go:27:20:27:27 | password | provenance |  |
-| main.go:17:2:17:9 | SSA def(password) | main.go:30:14:30:21 | password | provenance | Sink:MaD:3 |
-| main.go:17:2:17:9 | SSA def(password) | main.go:33:15:33:22 | password | provenance |  |
-| main.go:17:2:17:9 | SSA def(password) | main.go:36:13:36:20 | password | provenance |  |
-| main.go:17:2:17:9 | SSA def(password) | main.go:39:20:39:27 | password | provenance |  |
-| main.go:17:2:17:9 | SSA def(password) | main.go:42:14:42:21 | password | provenance | Sink:MaD:5 |
-| main.go:17:2:17:9 | SSA def(password) | main.go:45:15:45:22 | password | provenance |  |
-| main.go:17:2:17:9 | SSA def(password) | main.go:47:16:47:23 | password | provenance | Sink:MaD:4 |
-| main.go:17:2:17:9 | SSA def(password) | main.go:51:10:51:17 | password | provenance |  |
-| main.go:17:2:17:9 | SSA def(password) | main.go:51:10:51:17 | password | provenance |  |
+| main.go:17:2:17:23 | SSA def(password) | main.go:19:12:19:19 | password | provenance |  |
+| main.go:17:2:17:23 | SSA def(password) | main.go:20:19:20:26 | password | provenance |  |
+| main.go:17:2:17:23 | SSA def(password) | main.go:21:13:21:20 | password | provenance | Sink:MaD:6 |
+| main.go:17:2:17:23 | SSA def(password) | main.go:22:14:22:21 | password | provenance |  |
+| main.go:17:2:17:23 | SSA def(password) | main.go:24:13:24:20 | password | provenance |  |
+| main.go:17:2:17:23 | SSA def(password) | main.go:27:20:27:27 | password | provenance |  |
+| main.go:17:2:17:23 | SSA def(password) | main.go:30:14:30:21 | password | provenance | Sink:MaD:3 |
+| main.go:17:2:17:23 | SSA def(password) | main.go:33:15:33:22 | password | provenance |  |
+| main.go:17:2:17:23 | SSA def(password) | main.go:36:13:36:20 | password | provenance |  |
+| main.go:17:2:17:23 | SSA def(password) | main.go:39:20:39:27 | password | provenance |  |
+| main.go:17:2:17:23 | SSA def(password) | main.go:42:14:42:21 | password | provenance | Sink:MaD:5 |
+| main.go:17:2:17:23 | SSA def(password) | main.go:45:15:45:22 | password | provenance |  |
+| main.go:17:2:17:23 | SSA def(password) | main.go:47:16:47:23 | password | provenance | Sink:MaD:4 |
+| main.go:17:2:17:23 | SSA def(password) | main.go:51:10:51:17 | password | provenance |  |
+| main.go:17:2:17:23 | SSA def(password) | main.go:51:10:51:17 | password | provenance |  |
 | main.go:51:10:51:17 | password | main.go:52:17:52:24 | password | provenance |  |
 | main.go:51:10:51:17 | password | main.go:52:17:52:24 | password | provenance |  |
 | main.go:52:17:52:24 | password | main.go:53:11:53:18 | password | provenance |  |
@@ -97,13 +97,13 @@ edges
 | main.go:86:2:86:7 | fields [postupdate] | main.go:87:29:87:34 | fields | provenance | Sink:MaD:2 |
 | main.go:86:19:86:26 | password | main.go:86:2:86:7 | fields [postupdate] | provenance | Config |
 | main.go:86:19:86:26 | password | main.go:90:35:90:42 | password | provenance | Sink:MaD:1 |
-| overrides.go:8:2:8:9 | SSA def(password) | overrides.go:9:9:9:16 | password | provenance |  |
+| overrides.go:8:2:8:40 | SSA def(password) | overrides.go:9:9:9:16 | password | provenance |  |
 | overrides.go:9:9:9:16 | password | overrides.go:13:14:13:23 | call to String | provenance |  |
 | passwords.go:8:12:8:12 | SSA def(x) | passwords.go:9:14:9:14 | x | provenance |  |
-| passwords.go:21:2:21:9 | SSA def(password) | passwords.go:25:14:25:21 | password | provenance |  |
-| passwords.go:21:2:21:9 | SSA def(password) | passwords.go:30:8:30:15 | password | provenance |  |
-| passwords.go:21:2:21:9 | SSA def(password) | passwords.go:33:13:33:20 | password | provenance |  |
-| passwords.go:21:2:21:9 | SSA def(password) | passwords.go:36:28:36:35 | password | provenance |  |
+| passwords.go:21:2:21:23 | SSA def(password) | passwords.go:25:14:25:21 | password | provenance |  |
+| passwords.go:21:2:21:23 | SSA def(password) | passwords.go:30:8:30:15 | password | provenance |  |
+| passwords.go:21:2:21:23 | SSA def(password) | passwords.go:33:13:33:20 | password | provenance |  |
+| passwords.go:21:2:21:23 | SSA def(password) | passwords.go:36:28:36:35 | password | provenance |  |
 | passwords.go:30:8:30:15 | password | passwords.go:8:12:8:12 | SSA def(x) | provenance |  |
 | passwords.go:36:28:36:35 | password | passwords.go:36:14:36:35 | ...+... | provenance | Config |
 | passwords.go:36:28:36:35 | password | passwords.go:44:6:44:13 | password | provenance |  |
@@ -117,7 +117,7 @@ edges
 | passwords.go:50:11:50:18 | password | passwords.go:110:34:110:41 | password | provenance |  |
 | passwords.go:50:11:50:18 | password | passwords.go:115:33:115:40 | password | provenance |  |
 | passwords.go:50:11:50:18 | password | passwords.go:125:13:125:20 | password | provenance |  |
-| passwords.go:52:2:52:15 | SSA def(fixed_password) | passwords.go:53:14:53:27 | fixed_password | provenance |  |
+| passwords.go:52:2:52:44 | SSA def(fixed_password) | passwords.go:53:14:53:27 | fixed_password | provenance |  |
 | passwords.go:88:19:90:2 | struct literal | passwords.go:91:14:91:26 | utilityObject | provenance |  |
 | passwords.go:89:16:89:36 | call to make | passwords.go:88:19:90:2 | struct literal | provenance | Config |
 | passwords.go:104:33:104:40 | password | passwords.go:104:15:104:40 | ...+... | provenance | Config |
@@ -129,7 +129,7 @@ edges
 | passwords.go:110:34:110:41 | password | passwords.go:125:13:125:20 | password | provenance |  |
 | passwords.go:115:33:115:40 | password | passwords.go:115:15:115:40 | ...+... | provenance | Config |
 | passwords.go:115:33:115:40 | password | passwords.go:125:13:125:20 | password | provenance |  |
-| passwords.go:118:6:118:14 | SSA def(password1) | passwords.go:119:28:119:36 | password1 | provenance |  |
+| passwords.go:118:6:118:50 | SSA def(password1) | passwords.go:119:28:119:36 | password1 | provenance |  |
 | passwords.go:119:28:119:36 | password1 | passwords.go:119:28:119:45 | call to String | provenance | Config |
 | passwords.go:119:28:119:45 | call to String | passwords.go:119:14:119:45 | ...+... | provenance | Config |
 | passwords.go:122:12:127:2 | struct literal | passwords.go:129:14:129:19 | config | provenance |  |
@@ -142,15 +142,15 @@ edges
 | passwords.go:126:13:126:25 | call to getPassword | passwords.go:122:12:127:2 | struct literal [y] | provenance |  |
 | passwords.go:130:14:130:19 | config [x] | passwords.go:130:14:130:21 | selection of x | provenance |  |
 | passwords.go:131:14:131:19 | config [y] | passwords.go:131:14:131:21 | selection of y | provenance |  |
-| protobuf.go:9:2:9:9 | SSA def(password) | protobuf.go:12:22:12:29 | password | provenance |  |
-| protobuf.go:12:2:12:6 | implicit dereference [postupdate] [Description] | protobuf.go:12:2:12:6 | query [postupdate] [pointer, Description] | provenance |  |
+| protobuf.go:9:2:9:23 | SSA def(password) | protobuf.go:12:22:12:29 | password | provenance |  |
+| protobuf.go:12:2:12:6 | implicit-deref query [postupdate] [Description] | protobuf.go:12:2:12:6 | query [postupdate] [pointer, Description] | provenance |  |
 | protobuf.go:12:2:12:6 | query [postupdate] [pointer, Description] | protobuf.go:14:14:14:18 | query [pointer, Description] | provenance |  |
-| protobuf.go:12:22:12:29 | password | protobuf.go:12:2:12:6 | implicit dereference [postupdate] [Description] | provenance |  |
+| protobuf.go:12:22:12:29 | password | protobuf.go:12:2:12:6 | implicit-deref query [postupdate] [Description] | provenance |  |
 | protobuf.go:14:14:14:18 | query [pointer, Description] | protobuf.go:14:14:14:35 | call to GetDescription | provenance |  |
 | protobuf.go:14:14:14:18 | query [pointer, Description] | protos/query/query.pb.go:117:7:117:7 | SSA def(x) [pointer, Description] | provenance |  |
 | protos/query/query.pb.go:117:7:117:7 | SSA def(x) [pointer, Description] | protos/query/query.pb.go:119:10:119:10 | x [pointer, Description] | provenance |  |
-| protos/query/query.pb.go:119:10:119:10 | implicit dereference [Description] | protos/query/query.pb.go:119:10:119:22 | selection of Description | provenance |  |
-| protos/query/query.pb.go:119:10:119:10 | x [pointer, Description] | protos/query/query.pb.go:119:10:119:10 | implicit dereference [Description] | provenance |  |
+| protos/query/query.pb.go:119:10:119:10 | implicit-deref x [Description] | protos/query/query.pb.go:119:10:119:22 | selection of Description | provenance |  |
+| protos/query/query.pb.go:119:10:119:10 | x [pointer, Description] | protos/query/query.pb.go:119:10:119:10 | implicit-deref x [Description] | provenance |  |
 models
 | 1 | Sink: group:logrus; ; false; WithField; ; ; Argument[0..1]; log-injection; manual |
 | 2 | Sink: group:logrus; ; false; WithFields; ; ; Argument[0]; log-injection; manual |
@@ -164,14 +164,14 @@ models
 | 10 | Sink: log; Logger; true; Printf; ; ; Argument[0..1]; log-injection; manual |
 | 11 | Source: net/http; Request; true; Header; ; ; ; remote; manual |
 nodes
-| klog.go:21:3:26:3 | range statement[1] | semmle.label | range statement[1] |
+| klog.go:21:3:26:3 | extract:1 range element | semmle.label | extract:1 range element |
 | klog.go:21:30:21:37 | selection of Header | semmle.label | selection of Header |
-| klog.go:22:4:25:4 | range statement[1] | semmle.label | range statement[1] |
+| klog.go:22:4:25:4 | extract:1 range element | semmle.label | extract:1 range element |
 | klog.go:22:27:22:33 | headers | semmle.label | headers |
 | klog.go:23:15:23:20 | header | semmle.label | header |
 | klog.go:29:13:29:20 | selection of Header | semmle.label | selection of Header |
 | klog.go:29:13:29:41 | call to Get | semmle.label | call to Get |
-| main.go:17:2:17:9 | SSA def(password) | semmle.label | SSA def(password) |
+| main.go:17:2:17:23 | SSA def(password) | semmle.label | SSA def(password) |
 | main.go:19:12:19:19 | password | semmle.label | password |
 | main.go:20:19:20:26 | password | semmle.label | password |
 | main.go:21:13:21:20 | password | semmle.label | password |
@@ -209,12 +209,12 @@ nodes
 | main.go:86:19:86:26 | password | semmle.label | password |
 | main.go:87:29:87:34 | fields | semmle.label | fields |
 | main.go:90:35:90:42 | password | semmle.label | password |
-| overrides.go:8:2:8:9 | SSA def(password) | semmle.label | SSA def(password) |
+| overrides.go:8:2:8:40 | SSA def(password) | semmle.label | SSA def(password) |
 | overrides.go:9:9:9:16 | password | semmle.label | password |
 | overrides.go:13:14:13:23 | call to String | semmle.label | call to String |
 | passwords.go:8:12:8:12 | SSA def(x) | semmle.label | SSA def(x) |
 | passwords.go:9:14:9:14 | x | semmle.label | x |
-| passwords.go:21:2:21:9 | SSA def(password) | semmle.label | SSA def(password) |
+| passwords.go:21:2:21:23 | SSA def(password) | semmle.label | SSA def(password) |
 | passwords.go:25:14:25:21 | password | semmle.label | password |
 | passwords.go:26:14:26:23 | selection of password | semmle.label | selection of password |
 | passwords.go:27:14:27:26 | call to getPassword | semmle.label | call to getPassword |
@@ -230,7 +230,7 @@ nodes
 | passwords.go:44:6:44:13 | password | semmle.label | password |
 | passwords.go:46:14:46:17 | obj2 | semmle.label | obj2 |
 | passwords.go:50:11:50:18 | password | semmle.label | password |
-| passwords.go:52:2:52:15 | SSA def(fixed_password) | semmle.label | SSA def(fixed_password) |
+| passwords.go:52:2:52:44 | SSA def(fixed_password) | semmle.label | SSA def(fixed_password) |
 | passwords.go:53:14:53:27 | fixed_password | semmle.label | fixed_password |
 | passwords.go:88:19:90:2 | struct literal | semmle.label | struct literal |
 | passwords.go:89:16:89:36 | call to make | semmle.label | call to make |
@@ -242,7 +242,7 @@ nodes
 | passwords.go:110:34:110:41 | password | semmle.label | password |
 | passwords.go:115:15:115:40 | ...+... | semmle.label | ...+... |
 | passwords.go:115:33:115:40 | password | semmle.label | password |
-| passwords.go:118:6:118:14 | SSA def(password1) | semmle.label | SSA def(password1) |
+| passwords.go:118:6:118:50 | SSA def(password1) | semmle.label | SSA def(password1) |
 | passwords.go:119:14:119:45 | ...+... | semmle.label | ...+... |
 | passwords.go:119:28:119:36 | password1 | semmle.label | password1 |
 | passwords.go:119:28:119:45 | call to String | semmle.label | call to String |
@@ -257,14 +257,14 @@ nodes
 | passwords.go:130:14:130:21 | selection of x | semmle.label | selection of x |
 | passwords.go:131:14:131:19 | config [y] | semmle.label | config [y] |
 | passwords.go:131:14:131:21 | selection of y | semmle.label | selection of y |
-| protobuf.go:9:2:9:9 | SSA def(password) | semmle.label | SSA def(password) |
-| protobuf.go:12:2:12:6 | implicit dereference [postupdate] [Description] | semmle.label | implicit dereference [postupdate] [Description] |
+| protobuf.go:9:2:9:23 | SSA def(password) | semmle.label | SSA def(password) |
+| protobuf.go:12:2:12:6 | implicit-deref query [postupdate] [Description] | semmle.label | implicit-deref query [postupdate] [Description] |
 | protobuf.go:12:2:12:6 | query [postupdate] [pointer, Description] | semmle.label | query [postupdate] [pointer, Description] |
 | protobuf.go:12:22:12:29 | password | semmle.label | password |
 | protobuf.go:14:14:14:18 | query [pointer, Description] | semmle.label | query [pointer, Description] |
 | protobuf.go:14:14:14:35 | call to GetDescription | semmle.label | call to GetDescription |
 | protos/query/query.pb.go:117:7:117:7 | SSA def(x) [pointer, Description] | semmle.label | SSA def(x) [pointer, Description] |
-| protos/query/query.pb.go:119:10:119:10 | implicit dereference [Description] | semmle.label | implicit dereference [Description] |
+| protos/query/query.pb.go:119:10:119:10 | implicit-deref x [Description] | semmle.label | implicit-deref x [Description] |
 | protos/query/query.pb.go:119:10:119:10 | x [pointer, Description] | semmle.label | x [pointer, Description] |
 | protos/query/query.pb.go:119:10:119:22 | selection of Description | semmle.label | selection of Description |
 subpaths
diff --git a/go/ql/test/query-tests/Security/CWE-322/InsecureHostKeyCallback.expected b/go/ql/test/query-tests/Security/CWE-322/InsecureHostKeyCallback.expected
index 0f0bc8bf2591..130e2a6781f3 100644
--- a/go/ql/test/query-tests/Security/CWE-322/InsecureHostKeyCallback.expected
+++ b/go/ql/test/query-tests/Security/CWE-322/InsecureHostKeyCallback.expected
@@ -10,7 +10,7 @@ edges
 | InsecureHostKeyCallbackExample.go:45:3:47:3 | function literal | InsecureHostKeyCallbackExample.go:52:20:52:48 | type conversion | provenance |  |
 | InsecureHostKeyCallbackExample.go:58:39:58:46 | SSA def(callback) | InsecureHostKeyCallbackExample.go:62:20:62:27 | callback | provenance |  |
 | InsecureHostKeyCallbackExample.go:68:48:68:55 | SSA def(callback) | InsecureHostKeyCallbackExample.go:78:28:78:35 | callback | provenance |  |
-| InsecureHostKeyCallbackExample.go:94:3:94:43 | ... := ...[0] | InsecureHostKeyCallbackExample.go:95:28:95:35 | callback | provenance |  |
+| InsecureHostKeyCallbackExample.go:94:3:94:43 | extract:0 ... := ... | InsecureHostKeyCallbackExample.go:95:28:95:35 | callback | provenance |  |
 | InsecureHostKeyCallbackExample.go:102:22:105:4 | type conversion | InsecureHostKeyCallbackExample.go:107:35:107:50 | insecureCallback | provenance |  |
 | InsecureHostKeyCallbackExample.go:103:3:105:3 | function literal | InsecureHostKeyCallbackExample.go:102:22:105:4 | type conversion | provenance |  |
 | InsecureHostKeyCallbackExample.go:107:35:107:50 | insecureCallback | InsecureHostKeyCallbackExample.go:58:39:58:46 | SSA def(callback) | provenance |  |
@@ -35,7 +35,7 @@ nodes
 | InsecureHostKeyCallbackExample.go:76:28:76:54 | call to InsecureIgnoreHostKey | semmle.label | call to InsecureIgnoreHostKey |
 | InsecureHostKeyCallbackExample.go:78:28:78:35 | callback | semmle.label | callback |
 | InsecureHostKeyCallbackExample.go:92:28:92:54 | call to InsecureIgnoreHostKey | semmle.label | call to InsecureIgnoreHostKey |
-| InsecureHostKeyCallbackExample.go:94:3:94:43 | ... := ...[0] | semmle.label | ... := ...[0] |
+| InsecureHostKeyCallbackExample.go:94:3:94:43 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | InsecureHostKeyCallbackExample.go:95:28:95:35 | callback | semmle.label | callback |
 | InsecureHostKeyCallbackExample.go:102:22:105:4 | type conversion | semmle.label | type conversion |
 | InsecureHostKeyCallbackExample.go:103:3:105:3 | function literal | semmle.label | function literal |
diff --git a/go/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected b/go/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected
index 00eb67fea0ba..17c258a601bd 100644
--- a/go/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected
+++ b/go/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected
@@ -1,29 +1,29 @@
-| encryption.go:30:2:30:36 | call to Encrypt | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:34:2:34:42 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:38:2:38:42 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:42:2:42:42 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:46:2:46:42 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:50:2:50:47 | call to CryptBlocks | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:54:2:54:45 | call to XORKeyStream | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:56:22:56:91 | struct literal | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:59:21:59:68 | &... [postupdate] | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:59:22:59:68 | struct literal | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:59:22:59:68 | struct literal [postupdate] | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:60:10:60:24 | ctrStreamWriter [postupdate] | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:65:2:65:45 | call to XORKeyStream | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:69:2:69:45 | call to XORKeyStream | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | ... := ...[0] | The cryptographic algorithm DES |
-| encryption.go:76:2:76:32 | call to Encrypt | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
-| encryption.go:80:2:80:38 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
-| encryption.go:84:2:84:38 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
-| encryption.go:88:2:88:42 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
-| encryption.go:92:2:92:42 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
-| encryption.go:96:2:96:43 | call to CryptBlocks | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
-| encryption.go:100:2:100:41 | call to XORKeyStream | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
-| encryption.go:102:22:102:87 | struct literal | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
-| encryption.go:105:21:105:68 | &... [postupdate] | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
-| encryption.go:105:22:105:68 | struct literal | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
-| encryption.go:105:22:105:68 | struct literal [postupdate] | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
-| encryption.go:106:10:106:24 | ctrStreamWriter [postupdate] | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
-| encryption.go:111:2:111:45 | call to XORKeyStream | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
-| encryption.go:115:2:115:45 | call to XORKeyStream | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | ... := ...[0] | The cryptographic algorithm TRIPLEDES |
+| encryption.go:30:2:30:36 | call to Encrypt | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:34:2:34:42 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:38:2:38:42 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:42:2:42:42 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:46:2:46:42 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:50:2:50:47 | call to CryptBlocks | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:54:2:54:45 | call to XORKeyStream | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:56:22:56:91 | struct literal | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:59:21:59:68 | &... [postupdate] | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:59:22:59:68 | struct literal | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:59:22:59:68 | struct literal [postupdate] | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:60:10:60:24 | ctrStreamWriter [postupdate] | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:65:2:65:45 | call to XORKeyStream | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:69:2:69:45 | call to XORKeyStream | $@ is broken or weak, and should not be used. | encryption.go:28:2:28:31 | extract:0 ... := ... | The cryptographic algorithm DES |
+| encryption.go:76:2:76:32 | call to Encrypt | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
+| encryption.go:80:2:80:38 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
+| encryption.go:84:2:84:38 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
+| encryption.go:88:2:88:42 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
+| encryption.go:92:2:92:42 | call to Seal | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
+| encryption.go:96:2:96:43 | call to CryptBlocks | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
+| encryption.go:100:2:100:41 | call to XORKeyStream | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
+| encryption.go:102:22:102:87 | struct literal | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
+| encryption.go:105:21:105:68 | &... [postupdate] | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
+| encryption.go:105:22:105:68 | struct literal | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
+| encryption.go:105:22:105:68 | struct literal [postupdate] | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
+| encryption.go:106:10:106:24 | ctrStreamWriter [postupdate] | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
+| encryption.go:111:2:111:45 | call to XORKeyStream | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
+| encryption.go:115:2:115:45 | call to XORKeyStream | $@ is broken or weak, and should not be used. | encryption.go:74:2:74:40 | extract:0 ... := ... | The cryptographic algorithm TRIPLEDES |
 | encryption.go:166:2:166:33 | call to XORKeyStream | $@ is broken or weak, and should not be used. | encryption.go:166:2:166:33 | call to XORKeyStream | The cryptographic algorithm RC4 |
diff --git a/go/ql/test/query-tests/Security/CWE-327/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-327/CONSISTENCY/DataFlowConsistency.expected
index 95bea8fef591..256f53d2e623 100644
--- a/go/ql/test/query-tests/Security/CWE-327/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-327/CONSISTENCY/DataFlowConsistency.expected
@@ -1,4 +1,4 @@
 reverseRead
-| UnsafeTLS.go:329:32:329:37 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| UnsafeTLS.go:336:33:336:38 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| UnsafeTLS.go:329:32:329:37 | implicit-deref config | Origin of readStep is missing a PostUpdateNode. |
+| UnsafeTLS.go:336:33:336:38 | implicit-deref config | Origin of readStep is missing a PostUpdateNode. |
 | UnsafeTLS.go:353:40:353:45 | suites | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-347/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-347/CONSISTENCY/DataFlowConsistency.expected
index 922af8fad2eb..d5809621a06e 100644
--- a/go/ql/test/query-tests/Security/CWE-347/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-347/CONSISTENCY/DataFlowConsistency.expected
@@ -1,5 +1,5 @@
 reverseRead
-| go-jose.v3.go:19:17:19:17 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| go-jose.v3.go:25:16:25:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| golang-jwt-v5.go:22:17:22:17 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| golang-jwt-v5.go:28:16:28:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| go-jose.v3.go:19:17:19:17 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| go-jose.v3.go:25:16:25:16 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| golang-jwt-v5.go:22:17:22:17 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| golang-jwt-v5.go:28:16:28:16 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-347/MissingJwtSignatureCheck.expected b/go/ql/test/query-tests/Security/CWE-347/MissingJwtSignatureCheck.expected
index c1f41d118e76..7eafa2b87aa2 100644
--- a/go/ql/test/query-tests/Security/CWE-347/MissingJwtSignatureCheck.expected
+++ b/go/ql/test/query-tests/Security/CWE-347/MissingJwtSignatureCheck.expected
@@ -7,8 +7,8 @@ edges
 | go-jose.v3.go:25:16:25:47 | call to Get | go-jose.v3.go:26:15:26:25 | signedToken | provenance |  |
 | go-jose.v3.go:26:15:26:25 | signedToken | go-jose.v3.go:29:19:29:29 | SSA def(signedToken) | provenance |  |
 | go-jose.v3.go:29:19:29:29 | SSA def(signedToken) | go-jose.v3.go:31:37:31:47 | signedToken | provenance |  |
-| go-jose.v3.go:31:2:31:48 | ... := ...[0] | go-jose.v3.go:33:12:33:23 | DecodedToken | provenance | Sink:MaD:2 |
-| go-jose.v3.go:31:37:31:47 | signedToken | go-jose.v3.go:31:2:31:48 | ... := ...[0] | provenance | MaD:4 |
+| go-jose.v3.go:31:2:31:48 | extract:0 ... := ... | go-jose.v3.go:33:12:33:23 | DecodedToken | provenance | Sink:MaD:2 |
+| go-jose.v3.go:31:37:31:47 | signedToken | go-jose.v3.go:31:2:31:48 | extract:0 ... := ... | provenance | MaD:4 |
 | golang-jwt-v5.go:28:16:28:20 | selection of URL | golang-jwt-v5.go:28:16:28:28 | call to Query | provenance | Src:MaD:3 MaD:5 |
 | golang-jwt-v5.go:28:16:28:28 | call to Query | golang-jwt-v5.go:28:16:28:47 | call to Get | provenance | MaD:6 |
 | golang-jwt-v5.go:28:16:28:47 | call to Get | golang-jwt-v5.go:29:25:29:35 | signedToken | provenance |  |
@@ -27,7 +27,7 @@ nodes
 | go-jose.v3.go:25:16:25:47 | call to Get | semmle.label | call to Get |
 | go-jose.v3.go:26:15:26:25 | signedToken | semmle.label | signedToken |
 | go-jose.v3.go:29:19:29:29 | SSA def(signedToken) | semmle.label | SSA def(signedToken) |
-| go-jose.v3.go:31:2:31:48 | ... := ...[0] | semmle.label | ... := ...[0] |
+| go-jose.v3.go:31:2:31:48 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | go-jose.v3.go:31:37:31:47 | signedToken | semmle.label | signedToken |
 | go-jose.v3.go:33:12:33:23 | DecodedToken | semmle.label | DecodedToken |
 | golang-jwt-v5.go:28:16:28:20 | selection of URL | semmle.label | selection of URL |
diff --git a/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/BadRedirectCheck.expected b/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/BadRedirectCheck.expected
index 9135bafbf54e..8fb1a305e550 100644
--- a/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/BadRedirectCheck.expected
+++ b/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/BadRedirectCheck.expected
@@ -1,30 +1,30 @@
 #select
-| BadRedirectCheck.go:4:23:4:37 | ...==... | BadRedirectCheck.go:3:18:3:22 | argument corresponding to redir | main.go:11:25:11:45 | call to sanitizeUrl | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | BadRedirectCheck.go:3:18:3:22 | argument corresponding to redir | this value | main.go:11:25:11:45 | call to sanitizeUrl | redirect |
-| BadRedirectCheck.go:4:23:4:37 | ...==... | main.go:10:18:10:25 | argument corresponding to redirect | main.go:11:25:11:45 | call to sanitizeUrl | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | main.go:10:18:10:25 | argument corresponding to redirect | this value | main.go:11:25:11:45 | call to sanitizeUrl | redirect |
-| cves.go:11:26:11:38 | ...==... | cves.go:14:23:14:25 | argument corresponding to url | cves.go:16:26:16:28 | url | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | cves.go:14:23:14:25 | argument corresponding to url | this value | cves.go:16:26:16:28 | url | redirect |
+| BadRedirectCheck.go:4:23:4:37 | ...==... | BadRedirectCheck.go:3:18:3:22 | redir | main.go:11:25:11:45 | call to sanitizeUrl | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | BadRedirectCheck.go:3:18:3:22 | redir | this value | main.go:11:25:11:45 | call to sanitizeUrl | redirect |
+| BadRedirectCheck.go:4:23:4:37 | ...==... | main.go:10:18:10:25 | redirect | main.go:11:25:11:45 | call to sanitizeUrl | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | main.go:10:18:10:25 | redirect | this value | main.go:11:25:11:45 | call to sanitizeUrl | redirect |
+| cves.go:11:26:11:38 | ...==... | cves.go:14:23:14:25 | url | cves.go:16:26:16:28 | url | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | cves.go:14:23:14:25 | url | this value | cves.go:16:26:16:28 | url | redirect |
 | cves.go:34:6:34:37 | call to HasPrefix | cves.go:33:14:33:34 | call to Get | cves.go:37:25:37:32 | redirect | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | cves.go:33:14:33:34 | call to Get | this value | cves.go:37:25:37:32 | redirect | redirect |
 | cves.go:42:6:42:37 | call to HasPrefix | cves.go:41:14:41:34 | call to Get | cves.go:45:25:45:32 | redirect | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | cves.go:41:14:41:34 | call to Get | this value | cves.go:45:25:45:32 | redirect | redirect |
-| main.go:25:7:25:38 | call to HasPrefix | main.go:32:24:32:26 | argument corresponding to url | main.go:34:26:34:28 | url | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | main.go:32:24:32:26 | argument corresponding to url | this value | main.go:34:26:34:28 | url | redirect |
-| main.go:69:5:69:22 | ...!=... | main.go:68:17:68:24 | argument corresponding to redirect | main.go:77:25:77:39 | call to getTarget1 | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | main.go:68:17:68:24 | argument corresponding to redirect | this value | main.go:77:25:77:39 | call to getTarget1 | redirect |
-| main.go:69:5:69:22 | ...!=... | main.go:76:19:76:21 | argument corresponding to url | main.go:77:25:77:39 | call to getTarget1 | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | main.go:76:19:76:21 | argument corresponding to url | this value | main.go:77:25:77:39 | call to getTarget1 | redirect |
+| main.go:25:7:25:38 | call to HasPrefix | main.go:32:24:32:26 | url | main.go:34:26:34:28 | url | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | main.go:32:24:32:26 | url | this value | main.go:34:26:34:28 | url | redirect |
+| main.go:69:5:69:22 | ...!=... | main.go:68:17:68:24 | redirect | main.go:77:25:77:39 | call to getTarget1 | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | main.go:68:17:68:24 | redirect | this value | main.go:77:25:77:39 | call to getTarget1 | redirect |
+| main.go:69:5:69:22 | ...!=... | main.go:76:19:76:21 | url | main.go:77:25:77:39 | call to getTarget1 | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | main.go:76:19:76:21 | url | this value | main.go:77:25:77:39 | call to getTarget1 | redirect |
 | main.go:83:5:83:20 | ...!=... | main.go:87:9:87:14 | selection of Path | main.go:91:25:91:39 | call to getTarget2 | This is a check that $@, which flows into a $@, has a leading slash, but not that it does not have '/' or '\\' in its second position. | main.go:87:9:87:14 | selection of Path | this value | main.go:91:25:91:39 | call to getTarget2 | redirect |
 edges
 | BadRedirectCheck.go:3:18:3:22 | SSA def(redir) | BadRedirectCheck.go:5:10:5:14 | redir | provenance |  |
-| BadRedirectCheck.go:3:18:3:22 | argument corresponding to redir | BadRedirectCheck.go:5:10:5:14 | redir | provenance |  |
+| BadRedirectCheck.go:3:18:3:22 | redir | BadRedirectCheck.go:5:10:5:14 | redir | provenance |  |
 | BadRedirectCheck.go:5:10:5:14 | redir | main.go:11:25:11:45 | call to sanitizeUrl | provenance | Sink:MaD:1 |
-| cves.go:14:23:14:25 | argument corresponding to url | cves.go:16:26:16:28 | url | provenance | Sink:MaD:1 |
+| cves.go:14:23:14:25 | url | cves.go:16:26:16:28 | url | provenance | Sink:MaD:1 |
 | cves.go:33:14:33:34 | call to Get | cves.go:37:25:37:32 | redirect | provenance | Sink:MaD:1 |
 | cves.go:41:14:41:34 | call to Get | cves.go:45:25:45:32 | redirect | provenance | Sink:MaD:1 |
-| main.go:10:18:10:25 | argument corresponding to redirect | main.go:11:37:11:44 | redirect | provenance |  |
+| main.go:10:18:10:25 | redirect | main.go:11:37:11:44 | redirect | provenance |  |
 | main.go:11:37:11:44 | redirect | BadRedirectCheck.go:3:18:3:22 | SSA def(redir) | provenance |  |
 | main.go:11:37:11:44 | redirect | main.go:11:25:11:45 | call to sanitizeUrl | provenance | Sink:MaD:1 |
-| main.go:32:24:32:26 | argument corresponding to url | main.go:34:26:34:28 | url | provenance | Sink:MaD:1 |
+| main.go:32:24:32:26 | url | main.go:34:26:34:28 | url | provenance | Sink:MaD:1 |
 | main.go:68:17:68:24 | SSA def(redirect) | main.go:73:20:73:27 | redirect | provenance |  |
-| main.go:68:17:68:24 | argument corresponding to redirect | main.go:73:20:73:27 | redirect | provenance |  |
+| main.go:68:17:68:24 | redirect | main.go:73:20:73:27 | redirect | provenance |  |
 | main.go:73:9:73:28 | call to Clean | main.go:77:25:77:39 | call to getTarget1 | provenance | Sink:MaD:1 |
 | main.go:73:20:73:27 | redirect | main.go:73:9:73:28 | call to Clean | provenance | MaD:2 |
 | main.go:73:20:73:27 | redirect | main.go:73:9:73:28 | call to Clean | provenance | MaD:2 |
-| main.go:76:19:76:21 | argument corresponding to url | main.go:77:36:77:38 | url | provenance |  |
+| main.go:76:19:76:21 | url | main.go:77:36:77:38 | url | provenance |  |
 | main.go:77:36:77:38 | url | main.go:68:17:68:24 | SSA def(redirect) | provenance |  |
 | main.go:77:36:77:38 | url | main.go:77:25:77:39 | call to getTarget1 | provenance | MaD:2 Sink:MaD:1 |
 | main.go:87:9:87:14 | selection of Path | main.go:91:25:91:39 | call to getTarget2 | provenance | Sink:MaD:1 |
@@ -33,27 +33,27 @@ models
 | 2 | Summary: path; ; false; Clean; ; ; Argument[0]; ReturnValue; taint; manual |
 nodes
 | BadRedirectCheck.go:3:18:3:22 | SSA def(redir) | semmle.label | SSA def(redir) |
-| BadRedirectCheck.go:3:18:3:22 | argument corresponding to redir | semmle.label | argument corresponding to redir |
+| BadRedirectCheck.go:3:18:3:22 | redir | semmle.label | redir |
 | BadRedirectCheck.go:5:10:5:14 | redir | semmle.label | redir |
 | BadRedirectCheck.go:5:10:5:14 | redir | semmle.label | redir |
-| cves.go:14:23:14:25 | argument corresponding to url | semmle.label | argument corresponding to url |
+| cves.go:14:23:14:25 | url | semmle.label | url |
 | cves.go:16:26:16:28 | url | semmle.label | url |
 | cves.go:33:14:33:34 | call to Get | semmle.label | call to Get |
 | cves.go:37:25:37:32 | redirect | semmle.label | redirect |
 | cves.go:41:14:41:34 | call to Get | semmle.label | call to Get |
 | cves.go:45:25:45:32 | redirect | semmle.label | redirect |
-| main.go:10:18:10:25 | argument corresponding to redirect | semmle.label | argument corresponding to redirect |
+| main.go:10:18:10:25 | redirect | semmle.label | redirect |
 | main.go:11:25:11:45 | call to sanitizeUrl | semmle.label | call to sanitizeUrl |
 | main.go:11:37:11:44 | redirect | semmle.label | redirect |
-| main.go:32:24:32:26 | argument corresponding to url | semmle.label | argument corresponding to url |
+| main.go:32:24:32:26 | url | semmle.label | url |
 | main.go:34:26:34:28 | url | semmle.label | url |
 | main.go:68:17:68:24 | SSA def(redirect) | semmle.label | SSA def(redirect) |
-| main.go:68:17:68:24 | argument corresponding to redirect | semmle.label | argument corresponding to redirect |
+| main.go:68:17:68:24 | redirect | semmle.label | redirect |
 | main.go:73:9:73:28 | call to Clean | semmle.label | call to Clean |
 | main.go:73:9:73:28 | call to Clean | semmle.label | call to Clean |
 | main.go:73:20:73:27 | redirect | semmle.label | redirect |
 | main.go:73:20:73:27 | redirect | semmle.label | redirect |
-| main.go:76:19:76:21 | argument corresponding to url | semmle.label | argument corresponding to url |
+| main.go:76:19:76:21 | url | semmle.label | url |
 | main.go:77:25:77:39 | call to getTarget1 | semmle.label | call to getTarget1 |
 | main.go:77:36:77:38 | url | semmle.label | url |
 | main.go:87:9:87:14 | selection of Path | semmle.label | selection of Path |
diff --git a/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/CONSISTENCY/DataFlowConsistency.expected
index d6381960485e..9068ee79a7d5 100644
--- a/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/CONSISTENCY/DataFlowConsistency.expected
@@ -1,3 +1,3 @@
 reverseRead
-| cves.go:33:14:33:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| cves.go:41:14:41:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| cves.go:33:14:33:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
+| cves.go:41:14:41:16 | implicit-deref req | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/CONSISTENCY/DataFlowConsistency.expected
index f05017daafda..fda76dcac5af 100644
--- a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/CONSISTENCY/DataFlowConsistency.expected
@@ -1,26 +1,26 @@
 reverseRead
-| OpenUrlRedirect.go:10:23:10:23 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| OpenUrlRedirectGood.go:12:16:12:16 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:13:13:13:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:22:13:22:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:33:13:33:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:48:13:48:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:56:13:56:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:68:13:68:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:77:13:77:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:85:13:85:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:93:13:93:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:102:13:102:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:115:6:115:6 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:117:24:117:24 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:126:13:126:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:138:13:138:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:150:13:150:13 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:163:11:163:11 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:176:6:176:6 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:177:35:177:35 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:220:3:220:3 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:226:23:226:23 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:227:23:227:23 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| stdlib.go:228:23:228:23 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| OpenUrlRedirect.go:10:23:10:23 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| OpenUrlRedirectGood.go:12:16:12:16 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:13:13:13:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:22:13:22:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:33:13:33:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:48:13:48:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:56:13:56:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:68:13:68:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:77:13:77:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:85:13:85:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:93:13:93:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:102:13:102:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:115:6:115:6 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:117:24:117:24 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:126:13:126:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:138:13:138:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:150:13:150:13 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:163:11:163:11 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:176:6:176:6 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:177:35:177:35 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:220:3:220:3 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:226:23:226:23 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:227:23:227:23 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| stdlib.go:228:23:228:23 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
 | stdlib.go:232:23:232:33 | call to Cookies | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.expected b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.expected
index d9f24369ca2a..09c6cb5157f1 100644
--- a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.expected
+++ b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.expected
@@ -32,14 +32,14 @@ edges
 | stdlib.go:93:13:93:32 | call to Get | stdlib.go:94:3:94:8 | target | provenance |  |
 | stdlib.go:94:3:94:8 | target | stdlib.go:94:3:94:25 | ... += ... | provenance | Config |
 | stdlib.go:94:3:94:25 | ... += ... | stdlib.go:96:23:96:28 | target | provenance | Sink:MaD:1 |
-| stdlib.go:116:4:116:4 | implicit dereference [postupdate] [URL] | stdlib.go:116:4:116:4 | r [postupdate] [pointer, URL] | provenance |  |
+| stdlib.go:116:4:116:4 | implicit-deref r [postupdate] [URL] | stdlib.go:116:4:116:4 | r [postupdate] [pointer, URL] | provenance |  |
 | stdlib.go:116:4:116:4 | r [postupdate] [pointer, URL] | stdlib.go:117:24:117:24 | r [pointer, URL] | provenance |  |
-| stdlib.go:116:4:116:8 | implicit dereference | stdlib.go:116:4:116:8 | selection of URL [postupdate] | provenance | Config |
-| stdlib.go:116:4:116:8 | selection of URL | stdlib.go:116:4:116:8 | implicit dereference | provenance | Src:MaD:4 Config |
-| stdlib.go:116:4:116:8 | selection of URL [postupdate] | stdlib.go:116:4:116:4 | implicit dereference [postupdate] [URL] | provenance |  |
-| stdlib.go:116:4:116:8 | selection of URL [postupdate] | stdlib.go:116:4:116:8 | implicit dereference | provenance | Config |
-| stdlib.go:117:24:117:24 | implicit dereference [URL] | stdlib.go:117:24:117:28 | selection of URL | provenance |  |
-| stdlib.go:117:24:117:24 | r [pointer, URL] | stdlib.go:117:24:117:24 | implicit dereference [URL] | provenance |  |
+| stdlib.go:116:4:116:8 | implicit-deref selection of URL | stdlib.go:116:4:116:8 | selection of URL [postupdate] | provenance | Config |
+| stdlib.go:116:4:116:8 | selection of URL | stdlib.go:116:4:116:8 | implicit-deref selection of URL | provenance | Src:MaD:4 Config |
+| stdlib.go:116:4:116:8 | selection of URL [postupdate] | stdlib.go:116:4:116:4 | implicit-deref r [postupdate] [URL] | provenance |  |
+| stdlib.go:116:4:116:8 | selection of URL [postupdate] | stdlib.go:116:4:116:8 | implicit-deref selection of URL | provenance | Config |
+| stdlib.go:117:24:117:24 | implicit-deref r [URL] | stdlib.go:117:24:117:28 | selection of URL | provenance |  |
+| stdlib.go:117:24:117:24 | r [pointer, URL] | stdlib.go:117:24:117:24 | implicit-deref r [URL] | provenance |  |
 | stdlib.go:117:24:117:28 | selection of URL | stdlib.go:117:24:117:37 | call to String | provenance | Src:MaD:4 Config Sink:MaD:1 |
 | stdlib.go:150:13:150:18 | selection of Form | stdlib.go:150:13:150:32 | call to Get | provenance | Src:MaD:2 Config |
 | stdlib.go:150:13:150:32 | call to Get | stdlib.go:156:23:156:28 | target | provenance | Sink:MaD:1 |
@@ -51,42 +51,42 @@ edges
 | stdlib.go:177:35:177:39 | selection of URL | stdlib.go:177:35:177:52 | call to RequestURI | provenance | Src:MaD:4 Config |
 | stdlib.go:177:35:177:52 | call to RequestURI | stdlib.go:177:24:177:52 | ...+... | provenance | Config Sink:MaD:1 |
 | stdlib.go:186:13:186:33 | call to FormValue | stdlib.go:188:23:188:28 | target | provenance | Src:MaD:3 Sink:MaD:1 |
-| stdlib.go:194:3:194:57 | ... := ...[0] | stdlib.go:196:23:196:28 | target | provenance |  |
-| stdlib.go:194:36:194:56 | call to FormValue | stdlib.go:194:3:194:57 | ... := ...[0] | provenance | Src:MaD:3 Config |
-| stdlib.go:196:23:196:28 | implicit dereference | stdlib.go:196:23:196:28 | target [postupdate] | provenance | Config |
-| stdlib.go:196:23:196:28 | implicit dereference | stdlib.go:196:23:196:33 | selection of Path | provenance | Config Sink:MaD:1 |
-| stdlib.go:196:23:196:28 | target | stdlib.go:196:23:196:28 | implicit dereference | provenance | Config |
+| stdlib.go:194:3:194:57 | extract:0 ... := ... | stdlib.go:196:23:196:28 | target | provenance |  |
+| stdlib.go:194:36:194:56 | call to FormValue | stdlib.go:194:3:194:57 | extract:0 ... := ... | provenance | Src:MaD:3 Config |
+| stdlib.go:196:23:196:28 | implicit-deref target | stdlib.go:196:23:196:28 | target [postupdate] | provenance | Config |
+| stdlib.go:196:23:196:28 | implicit-deref target | stdlib.go:196:23:196:33 | selection of Path | provenance | Config Sink:MaD:1 |
+| stdlib.go:196:23:196:28 | target | stdlib.go:196:23:196:28 | implicit-deref target | provenance | Config |
 | stdlib.go:196:23:196:28 | target | stdlib.go:196:23:196:33 | selection of Path | provenance | Config Sink:MaD:1 |
 | stdlib.go:196:23:196:28 | target | stdlib.go:198:23:198:28 | target | provenance |  |
-| stdlib.go:196:23:196:28 | target [postupdate] | stdlib.go:196:23:196:28 | implicit dereference | provenance | Config |
+| stdlib.go:196:23:196:28 | target [postupdate] | stdlib.go:196:23:196:28 | implicit-deref target | provenance | Config |
 | stdlib.go:196:23:196:28 | target [postupdate] | stdlib.go:198:23:198:28 | target | provenance |  |
 | stdlib.go:198:23:198:28 | target | stdlib.go:198:23:198:42 | call to EscapedPath | provenance | Config Sink:MaD:1 |
-| stdlib.go:210:3:210:3 | implicit dereference [postupdate] | stdlib.go:210:3:210:3 | u [postupdate] | provenance | Config |
-| stdlib.go:210:3:210:3 | implicit dereference [postupdate] | stdlib.go:210:3:210:3 | u [postupdate] [pointer] | provenance |  |
+| stdlib.go:210:3:210:3 | implicit-deref u [postupdate] | stdlib.go:210:3:210:3 | u [postupdate] | provenance | Config |
+| stdlib.go:210:3:210:3 | implicit-deref u [postupdate] | stdlib.go:210:3:210:3 | u [postupdate] [pointer] | provenance |  |
 | stdlib.go:210:3:210:3 | u [postupdate] | stdlib.go:212:23:212:23 | u | provenance |  |
 | stdlib.go:210:3:210:3 | u [postupdate] [pointer] | stdlib.go:212:23:212:23 | u [pointer] | provenance |  |
-| stdlib.go:210:12:210:30 | call to FormValue | stdlib.go:210:3:210:3 | implicit dereference [postupdate] | provenance | Src:MaD:3 Config |
+| stdlib.go:210:12:210:30 | call to FormValue | stdlib.go:210:3:210:3 | implicit-deref u [postupdate] | provenance | Src:MaD:3 Config |
 | stdlib.go:210:12:210:30 | call to FormValue | stdlib.go:210:3:210:3 | u [postupdate] | provenance | Src:MaD:3 Config |
-| stdlib.go:212:23:212:23 | implicit dereference | stdlib.go:212:23:212:23 | u [postupdate] | provenance | Config |
-| stdlib.go:212:23:212:23 | implicit dereference | stdlib.go:212:23:212:28 | selection of Path | provenance | Config Sink:MaD:1 |
-| stdlib.go:212:23:212:23 | u | stdlib.go:212:23:212:23 | implicit dereference | provenance | Config |
+| stdlib.go:212:23:212:23 | implicit-deref u | stdlib.go:212:23:212:23 | u [postupdate] | provenance | Config |
+| stdlib.go:212:23:212:23 | implicit-deref u | stdlib.go:212:23:212:28 | selection of Path | provenance | Config Sink:MaD:1 |
+| stdlib.go:212:23:212:23 | u | stdlib.go:212:23:212:23 | implicit-deref u | provenance | Config |
 | stdlib.go:212:23:212:23 | u | stdlib.go:212:23:212:28 | selection of Path | provenance | Config Sink:MaD:1 |
 | stdlib.go:212:23:212:23 | u | stdlib.go:214:23:214:23 | u | provenance |  |
-| stdlib.go:212:23:212:23 | u [pointer] | stdlib.go:212:23:212:23 | implicit dereference | provenance |  |
-| stdlib.go:212:23:212:23 | u [postupdate] | stdlib.go:212:23:212:23 | implicit dereference | provenance | Config |
+| stdlib.go:212:23:212:23 | u [pointer] | stdlib.go:212:23:212:23 | implicit-deref u | provenance |  |
+| stdlib.go:212:23:212:23 | u [postupdate] | stdlib.go:212:23:212:23 | implicit-deref u | provenance | Config |
 | stdlib.go:212:23:212:23 | u [postupdate] | stdlib.go:214:23:214:23 | u | provenance |  |
 | stdlib.go:214:23:214:23 | u | stdlib.go:214:23:214:32 | call to String | provenance | Config Sink:MaD:1 |
-| stdlib.go:257:3:257:3 | implicit dereference [postupdate] | stdlib.go:257:3:257:3 | u [postupdate] | provenance | Config |
-| stdlib.go:257:3:257:3 | implicit dereference [postupdate] | stdlib.go:257:3:257:3 | u [postupdate] [pointer] | provenance |  |
+| stdlib.go:257:3:257:3 | implicit-deref u [postupdate] | stdlib.go:257:3:257:3 | u [postupdate] | provenance | Config |
+| stdlib.go:257:3:257:3 | implicit-deref u [postupdate] | stdlib.go:257:3:257:3 | u [postupdate] [pointer] | provenance |  |
 | stdlib.go:257:3:257:3 | u [postupdate] | stdlib.go:260:3:260:3 | u | provenance |  |
 | stdlib.go:257:3:257:3 | u [postupdate] [pointer] | stdlib.go:260:3:260:3 | u [pointer] | provenance |  |
-| stdlib.go:257:12:257:30 | call to FormValue | stdlib.go:257:3:257:3 | implicit dereference [postupdate] | provenance | Src:MaD:3 Config |
+| stdlib.go:257:12:257:30 | call to FormValue | stdlib.go:257:3:257:3 | implicit-deref u [postupdate] | provenance | Src:MaD:3 Config |
 | stdlib.go:257:12:257:30 | call to FormValue | stdlib.go:257:3:257:3 | u [postupdate] | provenance | Src:MaD:3 Config |
-| stdlib.go:260:3:260:3 | implicit dereference | stdlib.go:260:3:260:3 | u [postupdate] | provenance | Config |
-| stdlib.go:260:3:260:3 | u | stdlib.go:260:3:260:3 | implicit dereference | provenance | Config |
+| stdlib.go:260:3:260:3 | implicit-deref u | stdlib.go:260:3:260:3 | u [postupdate] | provenance | Config |
+| stdlib.go:260:3:260:3 | u | stdlib.go:260:3:260:3 | implicit-deref u | provenance | Config |
 | stdlib.go:260:3:260:3 | u | stdlib.go:261:23:261:23 | u | provenance |  |
-| stdlib.go:260:3:260:3 | u [pointer] | stdlib.go:260:3:260:3 | implicit dereference | provenance |  |
-| stdlib.go:260:3:260:3 | u [postupdate] | stdlib.go:260:3:260:3 | implicit dereference | provenance | Config |
+| stdlib.go:260:3:260:3 | u [pointer] | stdlib.go:260:3:260:3 | implicit-deref u | provenance |  |
+| stdlib.go:260:3:260:3 | u [postupdate] | stdlib.go:260:3:260:3 | implicit-deref u | provenance | Config |
 | stdlib.go:260:3:260:3 | u [postupdate] | stdlib.go:261:23:261:23 | u | provenance |  |
 | stdlib.go:261:23:261:23 | u | stdlib.go:261:23:261:32 | call to String | provenance | Config Sink:MaD:1 |
 models
@@ -120,12 +120,12 @@ nodes
 | stdlib.go:94:3:94:8 | target | semmle.label | target |
 | stdlib.go:94:3:94:25 | ... += ... | semmle.label | ... += ... |
 | stdlib.go:96:23:96:28 | target | semmle.label | target |
-| stdlib.go:116:4:116:4 | implicit dereference [postupdate] [URL] | semmle.label | implicit dereference [postupdate] [URL] |
+| stdlib.go:116:4:116:4 | implicit-deref r [postupdate] [URL] | semmle.label | implicit-deref r [postupdate] [URL] |
 | stdlib.go:116:4:116:4 | r [postupdate] [pointer, URL] | semmle.label | r [postupdate] [pointer, URL] |
-| stdlib.go:116:4:116:8 | implicit dereference | semmle.label | implicit dereference |
+| stdlib.go:116:4:116:8 | implicit-deref selection of URL | semmle.label | implicit-deref selection of URL |
 | stdlib.go:116:4:116:8 | selection of URL | semmle.label | selection of URL |
 | stdlib.go:116:4:116:8 | selection of URL [postupdate] | semmle.label | selection of URL [postupdate] |
-| stdlib.go:117:24:117:24 | implicit dereference [URL] | semmle.label | implicit dereference [URL] |
+| stdlib.go:117:24:117:24 | implicit-deref r [URL] | semmle.label | implicit-deref r [URL] |
 | stdlib.go:117:24:117:24 | r [pointer, URL] | semmle.label | r [pointer, URL] |
 | stdlib.go:117:24:117:28 | selection of URL | semmle.label | selection of URL |
 | stdlib.go:117:24:117:37 | call to String | semmle.label | call to String |
@@ -142,30 +142,30 @@ nodes
 | stdlib.go:177:35:177:52 | call to RequestURI | semmle.label | call to RequestURI |
 | stdlib.go:186:13:186:33 | call to FormValue | semmle.label | call to FormValue |
 | stdlib.go:188:23:188:28 | target | semmle.label | target |
-| stdlib.go:194:3:194:57 | ... := ...[0] | semmle.label | ... := ...[0] |
+| stdlib.go:194:3:194:57 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | stdlib.go:194:36:194:56 | call to FormValue | semmle.label | call to FormValue |
-| stdlib.go:196:23:196:28 | implicit dereference | semmle.label | implicit dereference |
+| stdlib.go:196:23:196:28 | implicit-deref target | semmle.label | implicit-deref target |
 | stdlib.go:196:23:196:28 | target | semmle.label | target |
 | stdlib.go:196:23:196:28 | target [postupdate] | semmle.label | target [postupdate] |
 | stdlib.go:196:23:196:33 | selection of Path | semmle.label | selection of Path |
 | stdlib.go:198:23:198:28 | target | semmle.label | target |
 | stdlib.go:198:23:198:42 | call to EscapedPath | semmle.label | call to EscapedPath |
-| stdlib.go:210:3:210:3 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| stdlib.go:210:3:210:3 | implicit-deref u [postupdate] | semmle.label | implicit-deref u [postupdate] |
 | stdlib.go:210:3:210:3 | u [postupdate] | semmle.label | u [postupdate] |
 | stdlib.go:210:3:210:3 | u [postupdate] [pointer] | semmle.label | u [postupdate] [pointer] |
 | stdlib.go:210:12:210:30 | call to FormValue | semmle.label | call to FormValue |
-| stdlib.go:212:23:212:23 | implicit dereference | semmle.label | implicit dereference |
+| stdlib.go:212:23:212:23 | implicit-deref u | semmle.label | implicit-deref u |
 | stdlib.go:212:23:212:23 | u | semmle.label | u |
 | stdlib.go:212:23:212:23 | u [pointer] | semmle.label | u [pointer] |
 | stdlib.go:212:23:212:23 | u [postupdate] | semmle.label | u [postupdate] |
 | stdlib.go:212:23:212:28 | selection of Path | semmle.label | selection of Path |
 | stdlib.go:214:23:214:23 | u | semmle.label | u |
 | stdlib.go:214:23:214:32 | call to String | semmle.label | call to String |
-| stdlib.go:257:3:257:3 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| stdlib.go:257:3:257:3 | implicit-deref u [postupdate] | semmle.label | implicit-deref u [postupdate] |
 | stdlib.go:257:3:257:3 | u [postupdate] | semmle.label | u [postupdate] |
 | stdlib.go:257:3:257:3 | u [postupdate] [pointer] | semmle.label | u [postupdate] [pointer] |
 | stdlib.go:257:12:257:30 | call to FormValue | semmle.label | call to FormValue |
-| stdlib.go:260:3:260:3 | implicit dereference | semmle.label | implicit dereference |
+| stdlib.go:260:3:260:3 | implicit-deref u | semmle.label | implicit-deref u |
 | stdlib.go:260:3:260:3 | u | semmle.label | u |
 | stdlib.go:260:3:260:3 | u [pointer] | semmle.label | u [pointer] |
 | stdlib.go:260:3:260:3 | u [postupdate] | semmle.label | u [postupdate] |
diff --git a/go/ql/test/query-tests/Security/CWE-640/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-640/CONSISTENCY/DataFlowConsistency.expected
index f3510be5f6c8..e2b722b16382 100644
--- a/go/ql/test/query-tests/Security/CWE-640/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-640/CONSISTENCY/DataFlowConsistency.expected
@@ -1,2 +1,2 @@
 reverseRead
-| EmailBad.go:9:10:9:10 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| EmailBad.go:9:10:9:10 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-643/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-643/CONSISTENCY/DataFlowConsistency.expected
index 001bad6c8fc1..7df0be09a4b8 100644
--- a/go/ql/test/query-tests/Security/CWE-643/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-643/CONSISTENCY/DataFlowConsistency.expected
@@ -1,13 +1,13 @@
 reverseRead
-| XPathInjection.go:13:14:13:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:35:14:35:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:46:14:46:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:57:14:57:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:72:14:72:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:83:14:83:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:92:14:92:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:93:14:93:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:106:14:106:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:115:14:115:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:116:14:116:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| tst.go:139:14:139:14 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| XPathInjection.go:13:14:13:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:35:14:35:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:46:14:46:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:57:14:57:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:72:14:72:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:83:14:83:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:92:14:92:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:93:14:93:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:106:14:106:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:115:14:115:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:116:14:116:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| tst.go:139:14:139:14 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-770/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-770/CONSISTENCY/DataFlowConsistency.expected
index 215578883b20..bea886c155e3 100644
--- a/go/ql/test/query-tests/Security/CWE-770/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-770/CONSISTENCY/DataFlowConsistency.expected
@@ -1,6 +1,6 @@
 reverseRead
-| UncontrolledAllocationSizeBad.go:11:12:11:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| UncontrolledAllocationSizeGood.go:11:12:11:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| UncontrolledAllocationSizeGood.go:32:12:32:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| UncontrolledAllocationSizeGood.go:52:12:52:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| UncontrolledAllocationSizeGood.go:73:12:73:12 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| UncontrolledAllocationSizeBad.go:11:12:11:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| UncontrolledAllocationSizeGood.go:11:12:11:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| UncontrolledAllocationSizeGood.go:32:12:32:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| UncontrolledAllocationSizeGood.go:52:12:52:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| UncontrolledAllocationSizeGood.go:73:12:73:12 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-770/UncontrolledAllocationSize.expected b/go/ql/test/query-tests/Security/CWE-770/UncontrolledAllocationSize.expected
index bdcf83b8935f..22005b1ac6e9 100644
--- a/go/ql/test/query-tests/Security/CWE-770/UncontrolledAllocationSize.expected
+++ b/go/ql/test/query-tests/Security/CWE-770/UncontrolledAllocationSize.expected
@@ -5,8 +5,8 @@ edges
 | UncontrolledAllocationSizeBad.go:11:12:11:24 | call to Query | UncontrolledAllocationSizeBad.go:13:15:13:20 | source | provenance |  |
 | UncontrolledAllocationSizeBad.go:13:15:13:20 | source | UncontrolledAllocationSizeBad.go:13:15:13:29 | call to Get | provenance | MaD:3 |
 | UncontrolledAllocationSizeBad.go:13:15:13:29 | call to Get | UncontrolledAllocationSizeBad.go:14:28:14:36 | sourceStr | provenance |  |
-| UncontrolledAllocationSizeBad.go:14:2:14:37 | ... := ...[0] | UncontrolledAllocationSizeBad.go:20:27:20:30 | sink | provenance |  |
-| UncontrolledAllocationSizeBad.go:14:28:14:36 | sourceStr | UncontrolledAllocationSizeBad.go:14:2:14:37 | ... := ...[0] | provenance | Config |
+| UncontrolledAllocationSizeBad.go:14:2:14:37 | extract:0 ... := ... | UncontrolledAllocationSizeBad.go:20:27:20:30 | sink | provenance |  |
+| UncontrolledAllocationSizeBad.go:14:28:14:36 | sourceStr | UncontrolledAllocationSizeBad.go:14:2:14:37 | extract:0 ... := ... | provenance | Config |
 models
 | 1 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
 | 2 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
@@ -16,7 +16,7 @@ nodes
 | UncontrolledAllocationSizeBad.go:11:12:11:24 | call to Query | semmle.label | call to Query |
 | UncontrolledAllocationSizeBad.go:13:15:13:20 | source | semmle.label | source |
 | UncontrolledAllocationSizeBad.go:13:15:13:29 | call to Get | semmle.label | call to Get |
-| UncontrolledAllocationSizeBad.go:14:2:14:37 | ... := ...[0] | semmle.label | ... := ...[0] |
+| UncontrolledAllocationSizeBad.go:14:2:14:37 | extract:0 ... := ... | semmle.label | extract:0 ... := ... |
 | UncontrolledAllocationSizeBad.go:14:28:14:36 | sourceStr | semmle.label | sourceStr |
 | UncontrolledAllocationSizeBad.go:20:27:20:30 | sink | semmle.label | sink |
 subpaths
diff --git a/go/ql/test/query-tests/Security/CWE-918/CONSISTENCY/DataFlowConsistency.expected b/go/ql/test/query-tests/Security/CWE-918/CONSISTENCY/DataFlowConsistency.expected
index cb71c6569c58..53fc71eeb543 100644
--- a/go/ql/test/query-tests/Security/CWE-918/CONSISTENCY/DataFlowConsistency.expected
+++ b/go/ql/test/query-tests/Security/CWE-918/CONSISTENCY/DataFlowConsistency.expected
@@ -1,5 +1,5 @@
 reverseRead
-| websocket.go:110:31:110:31 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| websocket.go:120:32:120:32 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| websocket.go:129:54:129:54 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
-| websocket.go:139:55:139:55 | implicit dereference | Origin of readStep is missing a PostUpdateNode. |
+| websocket.go:110:31:110:31 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| websocket.go:120:32:120:32 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| websocket.go:129:54:129:54 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
+| websocket.go:139:55:139:55 | implicit-deref r | Origin of readStep is missing a PostUpdateNode. |
diff --git a/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected b/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
index 15b0e179e983..9dfdcd278a4e 100644
--- a/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
+++ b/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
@@ -37,9 +37,9 @@ edges
 | tst.go:11:13:11:35 | call to FormValue | tst.go:39:11:39:29 | ...+... | provenance | Src:MaD:1  |
 | tst.go:11:13:11:35 | call to FormValue | tst.go:41:11:41:40 | ...+... | provenance | Src:MaD:1  |
 | tst.go:11:13:11:35 | call to FormValue | tst.go:48:11:48:18 | tainted2 | provenance | Src:MaD:1  |
-| tst.go:48:2:48:2 | implicit dereference [postupdate] | tst.go:48:2:48:2 | u [postupdate] | provenance |  |
+| tst.go:48:2:48:2 | implicit-deref u [postupdate] | tst.go:48:2:48:2 | u [postupdate] | provenance |  |
 | tst.go:48:2:48:2 | u [postupdate] | tst.go:49:11:49:11 | u | provenance |  |
-| tst.go:48:11:48:18 | tainted2 | tst.go:48:2:48:2 | implicit dereference [postupdate] | provenance | Config |
+| tst.go:48:11:48:18 | tainted2 | tst.go:48:2:48:2 | implicit-deref u [postupdate] | provenance | Config |
 | tst.go:48:11:48:18 | tainted2 | tst.go:48:2:48:2 | u [postupdate] | provenance | Config |
 | tst.go:49:11:49:11 | u | tst.go:49:11:49:20 | call to String | provenance | MaD:3 |
 | websocket.go:60:21:60:31 | call to Referer | websocket.go:65:27:65:40 | untrustedInput | provenance | Src:MaD:2  |
@@ -71,7 +71,7 @@ nodes
 | tst.go:37:18:37:24 | tainted | semmle.label | tainted |
 | tst.go:39:11:39:29 | ...+... | semmle.label | ...+... |
 | tst.go:41:11:41:40 | ...+... | semmle.label | ...+... |
-| tst.go:48:2:48:2 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| tst.go:48:2:48:2 | implicit-deref u [postupdate] | semmle.label | implicit-deref u [postupdate] |
 | tst.go:48:2:48:2 | u [postupdate] | semmle.label | u [postupdate] |
 | tst.go:48:11:48:18 | tainted2 | semmle.label | tainted2 |
 | tst.go:49:11:49:11 | u | semmle.label | u |
diff --git a/java/documentation/library-coverage/coverage.csv b/java/documentation/library-coverage/coverage.csv
index 39bb4b37e593..8a75b44ea164 100644
--- a/java/documentation/library-coverage/coverage.csv
+++ b/java/documentation/library-coverage/coverage.csv
@@ -31,7 +31,7 @@ com.esotericsoftware.kryo5.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 com.esotericsoftware.yamlbeans,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,
 com.fasterxml.jackson.core,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
 com.fasterxml.jackson.databind,2,,8,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,
-com.google.common.base,4,,87,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,,,,,,63,24
+com.google.common.base,4,,92,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,,,,,,68,24
 com.google.common.cache,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17
 com.google.common.collect,,,553,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,551
 com.google.common.flogger,29,,,,,,,,,,,,,,,,,,,,,,29,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -65,6 +65,9 @@ groovy.text,1,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 groovy.util,5,,,,,,,,,,,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 hudson,75,9,2648,,4,,,,,,3,2,,,,4,,,,,,,,,,,39,17,,,,,,,,,6,,,,,,,,,,,,,,,,5,4,2572,76
 io.jsonwebtoken,,2,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,4,
+io.micronaut.context.annotation,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,
+io.micronaut.core.convert.value,,,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,1
+io.micronaut.http,31,14,47,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,25,2,,,,,,4,,,,,,,,,,14,39,8
 io.netty.bootstrap,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,
 io.netty.buffer,,,207,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,130,77
 io.netty.channel,9,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,,,,,,,2,,
@@ -73,6 +76,7 @@ io.netty.handler.ssl,4,,,,,,,,,,,,,,,,,,,,,,,,,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 io.netty.handler.stream,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 io.netty.resolver,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
 io.netty.util,2,,23,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,1,,,,,,,,,,,,,,,,,,21,2
+io.r2dbc.spi,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,
 io.undertow.server.handlers.resource,1,,3,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
 jakarta.activation,2,,2,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,1,,,,,,,,,,,,,,,,,,2,
 jakarta.faces.context,4,7,,,,,,,,,,,,,,2,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,
@@ -87,7 +91,7 @@ java.applet,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,
 java.awt,1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,3
 java.beans,1,,177,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,82,95
 java.io,66,1,225,,,,,,,,,22,,,,,,,,,,,,,,,29,15,,,,,,,,,,,,,,,,,,,,,,,,,1,,202,23
-java.lang,38,3,790,,13,,,,,,1,,,,,,,,,,,,8,,,,2,9,,,4,,,1,,,,,,,,,,,,,,,,,,3,,,510,280
+java.lang,38,3,789,,13,,,,,,1,,,,,,,,,,,,8,,,,2,9,,,4,,,1,,,,,,,,,,,,,,,,,,3,,,509,280
 java.math,,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9
 java.net,23,3,347,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,21,,,,,,,,,,,,,,,,,3,248,99
 java.nio,47,,499,,,,,,,,,5,,,,,,,,,,,,,,,25,16,,,,,,,,,1,,,,,,,,,,,,,,,,,,302,197
@@ -164,11 +168,11 @@ org.apache.commons.jelly,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,
 org.apache.commons.jexl2,15,,,,,,,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 org.apache.commons.jexl3,15,,,,,,,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 org.apache.commons.lang,1,,767,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,596,171
-org.apache.commons.lang3,7,,425,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,1,,,,,,,,,,,,,294,131
+org.apache.commons.lang3,7,,426,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,1,,,,,,,,,,,,,295,131
 org.apache.commons.logging,6,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 org.apache.commons.net,13,12,,,,,2,2,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,6,,,,,,,,,,,,,,,,,12,,
 org.apache.commons.ognl,6,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.text,,,272,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,220,52
+org.apache.commons.text,,,273,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,221,52
 org.apache.cxf.catalog,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
 org.apache.cxf.common.classloader,3,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,
 org.apache.cxf.common.jaxb,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -237,6 +241,7 @@ org.kohsuke.stapler,20,24,363,,,,,,,,,,,,,2,,,,,,,,,,,8,1,,,,,,,,,3,,,,,,1,5,,,,
 org.lastaflute.web,,1,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,4,
 org.mvel2,16,,,,,,,,,,,,,,,,,,,,,,,16,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 org.openjdk.jmh.runner.options,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.owasp.encoder,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
 org.owasp.esapi,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
 org.pac4j.jwt.config.encryption,4,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 org.pac4j.jwt.config.signature,4,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -254,6 +259,7 @@ org.springframework.jdbc.datasource,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,
 org.springframework.jdbc.object,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,,,,,,,
 org.springframework.jndi,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 org.springframework.ldap,47,,,,,,,,,,,,,,,,,,,33,,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.springframework.r2dbc.core,8,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,,,,,,,,,,,,,,,,10,
 org.springframework.security.core.userdetails,2,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 org.springframework.security.web.savedrequest,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,
 org.springframework.ui,,,32,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,32
diff --git a/java/documentation/library-coverage/coverage.rst b/java/documentation/library-coverage/coverage.rst
index cc3da4594a66..6c3f4e1108e9 100644
--- a/java/documentation/library-coverage/coverage.rst
+++ b/java/documentation/library-coverage/coverage.rst
@@ -11,8 +11,8 @@ Java framework & library support
    Android extensions,``androidx.*``,5,183,60,,,,,,
    `Apache Commons Collections <https://commons.apache.org/proper/commons-collections/>`_,"``org.apache.commons.collections``, ``org.apache.commons.collections4``",,1606,,,,,,,
    `Apache Commons IO <https://commons.apache.org/proper/commons-io/>`_,``org.apache.commons.io``,,570,124,105,,,,,15
-   `Apache Commons Lang <https://commons.apache.org/proper/commons-lang/>`_,``org.apache.commons.lang3``,,425,7,,,,,,
-   `Apache Commons Text <https://commons.apache.org/proper/commons-text/>`_,``org.apache.commons.text``,,272,,,,,,,
+   `Apache Commons Lang <https://commons.apache.org/proper/commons-lang/>`_,``org.apache.commons.lang3``,,426,7,,,,,,
+   `Apache Commons Text <https://commons.apache.org/proper/commons-text/>`_,``org.apache.commons.text``,,273,,,,,,,
    `Apache HttpComponents <https://hc.apache.org/>`_,"``org.apache.hc.core5.*``, ``org.apache.http``",5,205,127,,3,,,,124
    `Apache Log4j 2 <https://logging.apache.org/log4j/2.0/>`_,``org.apache.logging.log4j``,,8,359,,,,,,
    `Apache Struts <https://struts.apache.org/>`_,"``org.apache.struts2``, ``org.apache.struts.beanvalidation.validation.interceptor``",,3877,14,,,,,,
@@ -20,13 +20,13 @@ Java framework & library support
    `Couchbase <https://couchbase.com/>`_,``com.couchbase.client.*``,,1,25,,,6,,,
    `FreeMarker <https://freemarker.apache.org/>`_,"``freemarker.cache``, ``freemarker.template``",,,8,,,,,,
    `Google Gson <https://github.com/google/gson>`_,``com.google.gson``,,52,,,,,,,
-   `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,730,43,9,,,,,
+   `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,735,43,9,,,,,
    `Groovy <https://groovy-lang.org/>`_,"``groovy.lang``, ``groovy.text``, ``groovy.util``, ``org.codehaus.groovy.control``",,,33,,,,,,
    `Hibernate <https://hibernate.org/>`_,``org.hibernate``,,,10,,,10,,,
    `JBoss Logging <https://github.com/jboss-logging/jboss-logging>`_,``org.jboss.logging``,,,324,,,,,,
    `JSON-java <https://github.com/stleary/JSON-java>`_,``org.json``,,236,,,,,,,
    `Jackson <https://github.com/FasterXML/jackson>`_,``com.fasterxml.jackson.*``,,9,2,2,,,,,
-   Java Standard Library,``java.*``,10,4629,260,99,,9,,,26
+   Java Standard Library,``java.*``,10,4628,260,99,,9,,,26
    Java extensions,"``javax.*``, ``jakarta.*``",101,4185,90,10,4,2,1,1,4
    `Jetty <https://eclipse.dev/jetty/>`_,``org.eclipse.jetty.client``,,,2,,,,,,2
    Kotlin Standard Library,``kotlin*``,,1849,16,14,,,,,2
@@ -37,9 +37,9 @@ Java framework & library support
    `Retrofit <https://square.github.io/retrofit/>`_,``retrofit2``,,1,1,,,,,,1
    `SLF4J <https://www.slf4j.org/>`_,``org.slf4j``,,6,55,,,,,,
    `SnakeYAML <https://github.com/snakeyaml/snakeyaml>`_,``org.yaml.snakeyaml``,,1,,,,,,,
-   `Spring <https://spring.io/>`_,``org.springframework.*``,46,494,144,26,,28,14,,36
+   `Spring <https://spring.io/>`_,``org.springframework.*``,46,504,152,26,,36,14,,36
    `Thymeleaf <https://www.thymeleaf.org/>`_,``org.thymeleaf``,,2,2,,,,,,
    `jOOQ <https://www.jooq.org/>`_,``org.jooq``,,,1,,,1,,,
-   Others,"``actions.osgi``, ``antlr``, ``ch.ethz.ssh2``, ``cn.hutool.core.codec``, ``com.alibaba.com.caucho.hessian.io``, ``com.alibaba.druid.sql``, ``com.alibaba.fastjson2``, ``com.amazonaws.auth``, ``com.auth0.jwt.algorithms``, ``com.azure.identity``, ``com.caucho.burlap.io``, ``com.caucho.hessian.io``, ``com.cedarsoftware.util.io``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.esotericsoftware.yamlbeans``, ``com.hubspot.jinjava``, ``com.jcraft.jsch``, ``com.microsoft.sqlserver.jdbc``, ``com.mitchellbosecke.pebble``, ``com.opensymphony.xwork2``, ``com.sshtools.j2ssh.authentication``, ``com.sun.crypto.provider``, ``com.sun.jndi.ldap``, ``com.sun.net.httpserver``, ``com.sun.net.ssl``, ``com.sun.rowset``, ``com.sun.security.auth.module``, ``com.sun.security.ntlm``, ``com.sun.security.sasl.digest``, ``com.thoughtworks.xstream``, ``com.trilead.ssh2``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``hudson``, ``io.jsonwebtoken``, ``io.undertow.server.handlers.resource``, ``javafx.scene.web``, ``jenkins``, ``jodd.json``, ``liquibase.database.jvm``, ``liquibase.statement.core``, ``net.lingala.zip4j``, ``net.schmizz.sshj``, ``net.sf.json``, ``net.sf.saxon.s9api``, ``ognl``, ``org.acegisecurity``, ``org.antlr.runtime``, ``org.apache.avro``, ``org.apache.commons.codec``, ``org.apache.commons.compress.archivers.tar``, ``org.apache.commons.exec``, ``org.apache.commons.fileupload``, ``org.apache.commons.httpclient.util``, ``org.apache.commons.jelly``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.lang``, ``org.apache.commons.logging``, ``org.apache.commons.net``, ``org.apache.commons.ognl``, ``org.apache.cxf.catalog``, ``org.apache.cxf.common.classloader``, ``org.apache.cxf.common.jaxb``, ``org.apache.cxf.common.logging``, ``org.apache.cxf.configuration.jsse``, ``org.apache.cxf.helpers``, ``org.apache.cxf.resource``, ``org.apache.cxf.staxutils``, ``org.apache.cxf.tools.corba.utils``, ``org.apache.cxf.tools.util``, ``org.apache.cxf.transform``, ``org.apache.directory.ldap.client.api``, ``org.apache.hadoop.fs``, ``org.apache.hadoop.hive.metastore``, ``org.apache.hadoop.hive.ql.exec``, ``org.apache.hadoop.hive.ql.metadata``, ``org.apache.hc.client5.http.async.methods``, ``org.apache.hc.client5.http.classic.methods``, ``org.apache.hc.client5.http.fluent``, ``org.apache.hc.client5.http.protocol``, ``org.apache.hc.client5.http.utils``, ``org.apache.hive.hcatalog.templeton``, ``org.apache.ibatis.jdbc``, ``org.apache.ibatis.mapping``, ``org.apache.log4j``, ``org.apache.poi``, ``org.apache.shiro.authc``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.apache.shiro.mgt``, ``org.apache.sshd.client.session``, ``org.apache.tools.ant``, ``org.apache.tools.zip``, ``org.codehaus.cargo.container.installer``, ``org.dom4j``, ``org.exolab.castor.xml``, ``org.fusesource.leveldbjni``, ``org.geogebra.web.full.main``, ``org.gradle.api.file``, ``org.ho.yaml``, ``org.influxdb``, ``org.jabsorb``, ``org.jboss.vfs``, ``org.jdbi.v3.core``, ``org.jenkins.ui.icon``, ``org.jenkins.ui.symbol``, ``org.keycloak.models.map.storage``, ``org.kohsuke.stapler``, ``org.lastaflute.web``, ``org.mvel2``, ``org.openjdk.jmh.runner.options``, ``org.owasp.esapi``, ``org.pac4j.jwt.config.encryption``, ``org.pac4j.jwt.config.signature``, ``org.scijava.log``, ``org.xml.sax``, ``org.xmlpull.v1``, ``play.libs.ws``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``software.amazon.awssdk.transfer.s3.model``, ``sun.jvmstat.perfdata.monitor.protocol.local``, ``sun.jvmstat.perfdata.monitor.protocol.rmi``, ``sun.misc``, ``sun.net.ftp``, ``sun.net.www.protocol.http``, ``sun.security.acl``, ``sun.security.jgss.krb5``, ``sun.security.krb5``, ``sun.security.pkcs``, ``sun.security.pkcs11``, ``sun.security.provider``, ``sun.security.ssl``, ``sun.security.x509``, ``sun.tools.jconsole``",151,8258,818,188,6,14,18,,186
-   Totals,,406,28627,2751,461,16,137,33,1,416
+   Others,"``actions.osgi``, ``antlr``, ``ch.ethz.ssh2``, ``cn.hutool.core.codec``, ``com.alibaba.com.caucho.hessian.io``, ``com.alibaba.druid.sql``, ``com.alibaba.fastjson2``, ``com.amazonaws.auth``, ``com.auth0.jwt.algorithms``, ``com.azure.identity``, ``com.caucho.burlap.io``, ``com.caucho.hessian.io``, ``com.cedarsoftware.util.io``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.esotericsoftware.yamlbeans``, ``com.hubspot.jinjava``, ``com.jcraft.jsch``, ``com.microsoft.sqlserver.jdbc``, ``com.mitchellbosecke.pebble``, ``com.opensymphony.xwork2``, ``com.sshtools.j2ssh.authentication``, ``com.sun.crypto.provider``, ``com.sun.jndi.ldap``, ``com.sun.net.httpserver``, ``com.sun.net.ssl``, ``com.sun.rowset``, ``com.sun.security.auth.module``, ``com.sun.security.ntlm``, ``com.sun.security.sasl.digest``, ``com.thoughtworks.xstream``, ``com.trilead.ssh2``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``hudson``, ``io.jsonwebtoken``, ``io.micronaut.context.annotation``, ``io.micronaut.core.convert.value``, ``io.micronaut.http``, ``io.r2dbc.spi``, ``io.undertow.server.handlers.resource``, ``javafx.scene.web``, ``jenkins``, ``jodd.json``, ``liquibase.database.jvm``, ``liquibase.statement.core``, ``net.lingala.zip4j``, ``net.schmizz.sshj``, ``net.sf.json``, ``net.sf.saxon.s9api``, ``ognl``, ``org.acegisecurity``, ``org.antlr.runtime``, ``org.apache.avro``, ``org.apache.commons.codec``, ``org.apache.commons.compress.archivers.tar``, ``org.apache.commons.exec``, ``org.apache.commons.fileupload``, ``org.apache.commons.httpclient.util``, ``org.apache.commons.jelly``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.lang``, ``org.apache.commons.logging``, ``org.apache.commons.net``, ``org.apache.commons.ognl``, ``org.apache.cxf.catalog``, ``org.apache.cxf.common.classloader``, ``org.apache.cxf.common.jaxb``, ``org.apache.cxf.common.logging``, ``org.apache.cxf.configuration.jsse``, ``org.apache.cxf.helpers``, ``org.apache.cxf.resource``, ``org.apache.cxf.staxutils``, ``org.apache.cxf.tools.corba.utils``, ``org.apache.cxf.tools.util``, ``org.apache.cxf.transform``, ``org.apache.directory.ldap.client.api``, ``org.apache.hadoop.fs``, ``org.apache.hadoop.hive.metastore``, ``org.apache.hadoop.hive.ql.exec``, ``org.apache.hadoop.hive.ql.metadata``, ``org.apache.hc.client5.http.async.methods``, ``org.apache.hc.client5.http.classic.methods``, ``org.apache.hc.client5.http.fluent``, ``org.apache.hc.client5.http.protocol``, ``org.apache.hc.client5.http.utils``, ``org.apache.hive.hcatalog.templeton``, ``org.apache.ibatis.jdbc``, ``org.apache.ibatis.mapping``, ``org.apache.log4j``, ``org.apache.poi``, ``org.apache.shiro.authc``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.apache.shiro.mgt``, ``org.apache.sshd.client.session``, ``org.apache.tools.ant``, ``org.apache.tools.zip``, ``org.codehaus.cargo.container.installer``, ``org.dom4j``, ``org.exolab.castor.xml``, ``org.fusesource.leveldbjni``, ``org.geogebra.web.full.main``, ``org.gradle.api.file``, ``org.ho.yaml``, ``org.influxdb``, ``org.jabsorb``, ``org.jboss.vfs``, ``org.jdbi.v3.core``, ``org.jenkins.ui.icon``, ``org.jenkins.ui.symbol``, ``org.keycloak.models.map.storage``, ``org.kohsuke.stapler``, ``org.lastaflute.web``, ``org.mvel2``, ``org.openjdk.jmh.runner.options``, ``org.owasp.encoder``, ``org.owasp.esapi``, ``org.pac4j.jwt.config.encryption``, ``org.pac4j.jwt.config.signature``, ``org.scijava.log``, ``org.xml.sax``, ``org.xmlpull.v1``, ``play.libs.ws``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``software.amazon.awssdk.transfer.s3.model``, ``sun.jvmstat.perfdata.monitor.protocol.local``, ``sun.jvmstat.perfdata.monitor.protocol.rmi``, ``sun.misc``, ``sun.net.ftp``, ``sun.net.www.protocol.http``, ``sun.security.acl``, ``sun.security.jgss.krb5``, ``sun.security.krb5``, ``sun.security.pkcs``, ``sun.security.pkcs11``, ``sun.security.provider``, ``sun.security.ssl``, ``sun.security.x509``, ``sun.tools.jconsole``",167,8314,855,188,6,20,18,,211
+   Totals,,422,28699,2796,461,16,151,33,1,441
 
diff --git a/java/kotlin-extractor/AGENTS.md b/java/kotlin-extractor/AGENTS.md
new file mode 100644
index 000000000000..5cf35f53952f
--- /dev/null
+++ b/java/kotlin-extractor/AGENTS.md
@@ -0,0 +1,33 @@
+# Kotlin extractor development
+
+## Versioned extractor packaging
+
+Extractors ship as `codeql-extractor-kotlin-<variant>-<version>.jar`, with `standalone` and `embeddable` variants. `VERSIONS` in `versions.bzl` lists compiler baselines; the Bazel `many` target builds all variants and versions. The packaged test wrapper selects the newest baseline not newer than `kotlinc` using `pick-kotlin-version.py` and `kotlin-versions.list`, ignoring prerelease suffixes. Compiler and extractor versions need not match exactly; selection alone does not prove compatibility with a newer compiler.
+
+## Compiler compatibility patches
+
+- Patches live in `src/main/kotlin/utils/versions/v_<version>/`, replacing version dots with underscores.
+- `get_compatilibity_sources` in `versions.bzl` selects the newest applicable file per filename; earlier files remain active until replaced. Comparisons ignore prerelease suffixes.
+- Add same-filename replacements at the first compiler baseline needing them; preserve older implementations. Put shared code outside `utils/versions`.
+
+## Compiler and runtime selection
+
+From the repository root, replace `<version>` with a baseline from `VERSIONS`:
+
+```sh
+java/kotlin-extractor/dev/kotlinc --select <version>
+export PATH="$PWD/java/kotlin-extractor/dev:$PATH"
+CODEQL_KOTLIN_SINGLE_VERSION=<version> bazel build //java/kotlin-extractor
+```
+
+- Rebuild the Java extractor pack used by your test environment; building a JAR alone does not refresh it. Use that environment's packaging target, not a stale distribution.
+- List available packs with `codeql resolve languages --format=json`, then check which Java pack the test invocation actually uses, including overrides. With `JAVA_ROOT` set to that path, check `kotlinc -version`, run `python3 "$JAVA_ROOT/tools/pick-kotlin-version.py" "@$JAVA_ROOT/tools/kotlin-versions.list"`, and verify the matching JAR exists there. QL tests use the standalone variant.
+- Use a runtime JDK supported by the selected compiler; check it separately because the wrapper omits it from version output. Preserve Bazel's configured toolchain.
+
+## Testing
+
+- For extractor changes, cover applicable cases in both `java/ql/test-kotlin1` (K1) and `java/ql/test-kotlin2` (K2); neither substitutes for the other. These sibling suites are validation references, not directories governed by this file.
+- Run QL suites with `codeql test run -j<threads> <suite>`, optionally sharding with `--slice=N/M`. Allow modest parallelism, but limit concurrent tests, builds, and memory use to avoid exhausting local resources. Run every shard for full coverage and aggregate failures.
+- `java/ql/integration-tests/kotlin` uses the integration-test pytest harness, not `codeql test run`. Run relevant platform cases separately using the configured harness and fixtures.
+- All applicable tests must pass when testing is authorised. After runner changes, pass one representative test before a matrix. Respect explicit requests not to run tests and report coverage gaps rather than claiming completion.
+- Never disable or weaken tests without human approval. Before accepting expected-output changes, verify compiler/extractor/JDK selection, investigate the cause, and inspect the full diff. Do not use `--learn` for unexplained changes.
diff --git a/java/kotlin-extractor/BUILD.bazel b/java/kotlin-extractor/BUILD.bazel
index f33949f83914..fae93f6a2cc4 100644
--- a/java/kotlin-extractor/BUILD.bazel
+++ b/java/kotlin-extractor/BUILD.bazel
@@ -57,6 +57,10 @@ _compiler_plugin_registrar_service_source = "src/main/resources/META-INF/service
 
 _compiler_plugin_registrar_service_target = "META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar"
 
+_component_registrar_service_source = "src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar"
+
+_component_registrar_service_target = "META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar"
+
 py_binary(
     name = "generate_dbscheme",
     srcs = ["generate_dbscheme.py"],
@@ -68,7 +72,10 @@ _resources = [
         r[len("src/main/resources/"):],
     )
     for r in glob(["src/main/resources/**"])
-    if r != _compiler_plugin_registrar_service_source
+    if r not in (
+        _compiler_plugin_registrar_service_source,
+        _component_registrar_service_source,
+    )
 ]
 
 _compiler_plugin_registrar_service = (
@@ -76,6 +83,11 @@ _compiler_plugin_registrar_service = (
     _compiler_plugin_registrar_service_target,
 )
 
+_component_registrar_service = (
+    _component_registrar_service_source,
+    _component_registrar_service_target,
+)
+
 kt_javac_options(
     name = "javac-options",
     release = "8",
@@ -93,7 +105,11 @@ kt_javac_options(
                 "kotlin.RequiresOptIn",
                 "org.jetbrains.kotlin.ir.symbols.%s" %
                 ("IrSymbolInternals" if version_less(v, "2.0.0") else "UnsafeDuringIrConstructionAPI"),
-            ] + ([] if version_less(v, "2.2.20") else ["org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi"]),
+            ] + (
+                [] if version_less(v, "2.2.20") else ["org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi"]
+            ) + (
+                [] if version_less(v, "2.4.20") else ["org.jetbrains.kotlin.K1Deprecation"]
+            ),
             x_suppress_version_warnings = True,
         ),
         # * extractor.name is different for each version, so we need to put it in different output dirs
@@ -103,6 +119,8 @@ kt_javac_options(
             name = "resources-%s" % v,
             srcs = [src for src, _ in _resources] + (
                 [_compiler_plugin_registrar_service[0]] if not version_less(v, "2.4.0") else []
+            ) + (
+                [_component_registrar_service[0]] if version_less(v, "2.4.20") else []
             ),
             outs = [
                 "%s/com/github/codeql/extractor.name" % v,
@@ -114,6 +132,11 @@ kt_javac_options(
                     v,
                     _compiler_plugin_registrar_service[1],
                 )] if not version_less(v, "2.4.0") else []
+            ) + (
+                ["%s/%s" % (
+                    v,
+                    _component_registrar_service[1],
+                )] if version_less(v, "2.4.20") else []
             ),
             cmd = "\n".join([
                 "echo %s-%s > $(RULEDIR)/%s/com/github/codeql/extractor.name" % (_extractor_name_prefix, v, v),
@@ -126,6 +149,12 @@ kt_javac_options(
                     v,
                     _compiler_plugin_registrar_service[1],
                 )] if not version_less(v, "2.4.0") else []
+            ) + (
+                ["cp $(execpath %s) $(RULEDIR)/%s/%s" % (
+                    _component_registrar_service[0],
+                    v,
+                    _component_registrar_service[1],
+                )] if version_less(v, "2.4.20") else []
             )),
         ),
         kt_jvm_library(
diff --git a/java/kotlin-extractor/deps.bzl b/java/kotlin-extractor/deps.bzl
index bee713f8c466..24503f7baa67 100644
--- a/java/kotlin-extractor/deps.bzl
+++ b/java/kotlin-extractor/deps.bzl
@@ -27,6 +27,7 @@ def _kotlin_dep_impl(repository_ctx):
         "kotlin-stdlib.jar",
         "kotlin-reflect.jar",
         "kotlin-script-runtime.jar",
+        "kotlinx-coroutines-core-jvm.jar",
         "trove4j.jar",
     ):
         repository_ctx.symlink("empty.zip", jar)
diff --git a/java/kotlin-extractor/deps/kotlin-compiler-2.4.20.jar b/java/kotlin-extractor/deps/kotlin-compiler-2.4.20.jar
new file mode 100644
index 000000000000..6ffc5a160971
--- /dev/null
+++ b/java/kotlin-extractor/deps/kotlin-compiler-2.4.20.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:038d406cc51d5fe3f6b5a16366a3f083b783bceb9e576e3103e695c3ce04e0fa
+size 60184475
diff --git a/java/kotlin-extractor/deps/kotlin-compiler-embeddable-2.4.20.jar b/java/kotlin-extractor/deps/kotlin-compiler-embeddable-2.4.20.jar
new file mode 100644
index 000000000000..4084155d18e5
--- /dev/null
+++ b/java/kotlin-extractor/deps/kotlin-compiler-embeddable-2.4.20.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf97161430683fb9af96dc6a7017ffae1fe8737b80d12eee11f2fe3e76f8ded8
+size 58593245
diff --git a/java/kotlin-extractor/deps/kotlin-stdlib-2.4.20.jar b/java/kotlin-extractor/deps/kotlin-stdlib-2.4.20.jar
new file mode 100644
index 000000000000..bf737b49cf30
--- /dev/null
+++ b/java/kotlin-extractor/deps/kotlin-stdlib-2.4.20.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2226de463d309d4a5500a481320b3dea515a6981dcae1def531fbc158884e25f
+size 1853314
diff --git a/java/kotlin-extractor/dev/wrapper.py b/java/kotlin-extractor/dev/wrapper.py
index 1b29de23f766..6940765cbc33 100755
--- a/java/kotlin-extractor/dev/wrapper.py
+++ b/java/kotlin-extractor/dev/wrapper.py
@@ -27,7 +27,7 @@
 import io
 import os
 
-DEFAULT_VERSION = "2.4.10"
+DEFAULT_VERSION = "2.4.20"
 
 
 def options():
diff --git a/java/kotlin-extractor/src/main/java/com/semmle/util/files/FileUtil.java b/java/kotlin-extractor/src/main/java/com/semmle/util/files/FileUtil.java
index 19bdc786c5e2..16df41e5341e 100644
--- a/java/kotlin-extractor/src/main/java/com/semmle/util/files/FileUtil.java
+++ b/java/kotlin-extractor/src/main/java/com/semmle/util/files/FileUtil.java
@@ -1244,8 +1244,8 @@ public static File tryMakeCanonical (File f)
 		try {
 			// getCanonicalFile does not canonicalize subst drives on Windows, so do this separately. This
 			// is a no-op on non-Windows platforms.
-			return SubstResolver.resolve(f.getCanonicalFile());		}
-		catch (IOException ignored) {
+			return SubstResolver.resolve(f.getCanonicalFile());
+		} catch (IOException ignored) {
 			Exceptions.ignore(ignored, "Can't log error: Could be too verbose.");
 			return new File(simplifyPath(f));
 		}
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
index 0b975d9b829b..7a092faa9d56 100644
--- a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
+++ b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -1645,8 +1645,9 @@ open class KotlinFileExtractor(
         extractMethodAndParameterTypeAccesses: Boolean,
         typeSubstitution: TypeSubstitution?,
         classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?
-    ) : Label<out DbCallable> =
-        forceExtractFunction(
+    ) : Label<out DbCallable> {
+        val sourceLoc = tw.getLocation(f.parentClassOrNull ?: f)
+        return forceExtractFunction(
                 f,
                 parentId,
                 extractBody = false,
@@ -1656,6 +1657,7 @@ open class KotlinFileExtractor(
                 classTypeArgsIncludingOuterClasses,
                 overriddenAttributes =
                     OverriddenFunctionAttributes(
+                        sourceLoc = sourceLoc,
                         visibility = DescriptorVisibilities.PUBLIC,
                         modality = Modality.OPEN
                     )
@@ -1666,7 +1668,6 @@ open class KotlinFileExtractor(
                     CompilerGeneratedKinds.INTERFACE_FORWARDER.kind
                 )
                 if (extractBody) {
-                    val realFunctionLocId = tw.getLocation(f)
                     val inheritedDefaultFunction = f.realOverrideTarget
                     val directlyInheritedSymbol =
                         when (f) {
@@ -1686,10 +1687,10 @@ open class KotlinFileExtractor(
                         (directlyInheritedSymbol.owner.parentClassOrNull ?: return functionId)
                             .typeWith()
 
-                    extractExpressionBody(functionId, realFunctionLocId).also { returnId ->
+                    extractExpressionBody(functionId, sourceLoc).also { returnId ->
                         extractRawMethodAccess(
                             f,
-                            realFunctionLocId,
+                            sourceLoc,
                             f.returnType,
                             functionId,
                             returnId,
@@ -1702,7 +1703,7 @@ open class KotlinFileExtractor(
                                     extractVariableAccess(
                                         syntheticParamId,
                                         param.type,
-                                        realFunctionLocId,
+                                        sourceLoc,
                                         argParentId,
                                         idxOffset + idx,
                                         functionId,
@@ -1718,7 +1719,7 @@ open class KotlinFileExtractor(
                                     callId,
                                     -1,
                                     returnId,
-                                    realFunctionLocId
+                                    sourceLoc
                                 )
                             },
                             null
@@ -1726,6 +1727,7 @@ open class KotlinFileExtractor(
                     }
                 }
             }
+    }
 
     private fun extractFunction(
         f: IrFunction,
@@ -3903,7 +3905,14 @@ open class KotlinFileExtractor(
 
         val prop =
             getPropertiesByFqName(pluginContext, propertyPkg, propertyName)
-                .firstOrNull { it.owner.parentClassOrNull?.fqNameWhenAvailable?.asString() == type }
+                .firstOrNull {
+                    val owner = it.owner
+                    when (val parent = owner.parent) {
+                        is IrClass -> parent.fqNameWhenAvailable?.asString()
+                        is IrExternalPackageFragment -> getFileClassFqName(owner)?.asString()
+                        else -> null
+                    } == type
+                }
                 ?.owner
 
         if (prop != null) {
@@ -6957,7 +6966,7 @@ open class KotlinFileExtractor(
                     tw.writeExprs_stringliteral(id, type.javaResult.id, parent, idx)
                     tw.writeExprsKotlinType(id, type.kotlinResult.id)
                     extractExprContext(id, locId, enclosingCallable, enclosingStmt)
-                    tw.writeNamestrings(toQuotedLiteral(v.toString()), v.toString(), id)
+                    tw.writeNamestrings(toQuotedLiteral(v), v, id)
                 }
             }
             v == null -> {
diff --git a/java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt b/java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt
index e215b5ca31da..d5650389448d 100644
--- a/java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt
+++ b/java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt
@@ -96,8 +96,7 @@ class MetaAnnotationSupport(
         val metaAnnotations = annotationClass.annotations
         val jvmRepeatable =
             metaAnnotations.find {
-                it.symbol.owner.parentAsClass.fqNameWhenAvailable ==
-                    JvmAnnotationNames.REPEATABLE_ANNOTATION
+                it.annotationClass.fqNameWhenAvailable == JvmAnnotationNames.REPEATABLE_ANNOTATION
             }
         return if (jvmRepeatable != null) {
             ((jvmRepeatable.codeQlGetValueArgument(0) as? IrClassReference)?.symbol as? IrClassSymbol)
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_4_20/Kotlin2ComponentRegistrar.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_4_20/Kotlin2ComponentRegistrar.kt
new file mode 100644
index 000000000000..f5091752633c
--- /dev/null
+++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_4_20/Kotlin2ComponentRegistrar.kt
@@ -0,0 +1,32 @@
+package com.github.codeql
+
+import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
+import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
+import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
+import org.jetbrains.kotlin.config.CompilerConfiguration
+
+@OptIn(ExperimentalCompilerApi::class)
+abstract class Kotlin2ComponentRegistrar : CompilerPluginRegistrar() {
+    override val supportsK2: Boolean
+        get() = true
+
+    override val pluginId: String
+        get() = "kotlin-extractor"
+
+    private var extensionStorage: CompilerPluginRegistrar.ExtensionStorage? = null
+
+    override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
+        this@Kotlin2ComponentRegistrar.extensionStorage = this
+        doRegisterExtensions(configuration)
+    }
+
+    abstract fun doRegisterExtensions(configuration: CompilerConfiguration)
+
+    protected fun registerExtractorExtension(extension: IrGenerationExtension) {
+        val storage = extensionStorage
+            ?: throw IllegalStateException("registerExtractorExtension called before registerExtensions")
+        with(storage) {
+            IrGenerationExtension.registerExtension(extension)
+        }
+    }
+}
diff --git a/java/kotlin-extractor/versions.bzl b/java/kotlin-extractor/versions.bzl
index f9642c96b788..17c925493905 100644
--- a/java/kotlin-extractor/versions.bzl
+++ b/java/kotlin-extractor/versions.bzl
@@ -12,6 +12,7 @@ VERSIONS = [
     "2.3.0",
     "2.3.20",
     "2.4.0",
+    "2.4.20",
 ]
 
 def _version_to_tuple(v):
diff --git a/java/ql/consistency-queries/SsaConsistency.ql b/java/ql/consistency-queries/SsaConsistency.ql
index b62db63ac5ba..2ea5604d5b7e 100644
--- a/java/ql/consistency-queries/SsaConsistency.ql
+++ b/java/ql/consistency-queries/SsaConsistency.ql
@@ -1,3 +1,4 @@
 import java
 import semmle.code.java.dataflow.internal.SsaImpl
 import Impl::Consistency
+import DataFlowIntegration::DfConsistency
diff --git a/java/ql/integration-tests/java/android-8-sample/test.py b/java/ql/integration-tests/java/android-8-sample/test.py
index 72e3c5d3fc47..3b38eb208893 100644
--- a/java/ql/integration-tests/java/android-8-sample/test.py
+++ b/java/ql/integration-tests/java/android-8-sample/test.py
@@ -1,4 +1,9 @@
+import runs_on
+
+
 # Put Java 11 on the path so as to challenge our version selection logic: Java 11 is unsuitable for Android Gradle Plugin 8+,
 # so it will be necessary to notice Java 17 available in the environment and actively select it.
+# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
+@(runs_on.x86_64 or runs_on.macos)
 def test(codeql, use_java_11, java, gradle_8_0, android_sdk):
     codeql.database.create()
diff --git a/java/ql/integration-tests/java/android-sample-kotlin-build-script-no-wrapper/test.py b/java/ql/integration-tests/java/android-sample-kotlin-build-script-no-wrapper/test.py
index 67b5dde772eb..7eaea2c2d368 100644
--- a/java/ql/integration-tests/java/android-sample-kotlin-build-script-no-wrapper/test.py
+++ b/java/ql/integration-tests/java/android-sample-kotlin-build-script-no-wrapper/test.py
@@ -1,2 +1,7 @@
+import runs_on
+
+
+# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
+@(runs_on.x86_64 or runs_on.macos)
 def test(codeql, use_java_17, java, android_sdk):
     codeql.database.create()
diff --git a/java/ql/integration-tests/java/android-sample-kotlin-build-script/test.py b/java/ql/integration-tests/java/android-sample-kotlin-build-script/test.py
index d3399e414e61..cefeb2c86df4 100644
--- a/java/ql/integration-tests/java/android-sample-kotlin-build-script/test.py
+++ b/java/ql/integration-tests/java/android-sample-kotlin-build-script/test.py
@@ -1,2 +1,7 @@
+import runs_on
+
+
+# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
+@(runs_on.x86_64 or runs_on.macos)
 def test(codeql, use_java_11, java, gradle_7_4, android_sdk):
     codeql.database.create()
diff --git a/java/ql/integration-tests/java/android-sample-no-wrapper/test.py b/java/ql/integration-tests/java/android-sample-no-wrapper/test.py
index 67b5dde772eb..7eaea2c2d368 100644
--- a/java/ql/integration-tests/java/android-sample-no-wrapper/test.py
+++ b/java/ql/integration-tests/java/android-sample-no-wrapper/test.py
@@ -1,2 +1,7 @@
+import runs_on
+
+
+# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
+@(runs_on.x86_64 or runs_on.macos)
 def test(codeql, use_java_17, java, android_sdk):
     codeql.database.create()
diff --git a/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py b/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py
index 5730f55d9819..4544feb39fcb 100644
--- a/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py
+++ b/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py
@@ -1,2 +1,7 @@
+import runs_on
+
+
+# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
+@(runs_on.x86_64 or runs_on.macos)
 def test(codeql, use_java_17, java, android_sdk, actions_toolchains_file):
     codeql.database.create(_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": str(actions_toolchains_file)})
diff --git a/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script/test.py b/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script/test.py
index d3399e414e61..cefeb2c86df4 100644
--- a/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script/test.py
+++ b/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script/test.py
@@ -1,2 +1,7 @@
+import runs_on
+
+
+# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
+@(runs_on.x86_64 or runs_on.macos)
 def test(codeql, use_java_11, java, gradle_7_4, android_sdk):
     codeql.database.create()
diff --git a/java/ql/integration-tests/java/android-sample-old-style-no-wrapper/test.py b/java/ql/integration-tests/java/android-sample-old-style-no-wrapper/test.py
index 5730f55d9819..4544feb39fcb 100644
--- a/java/ql/integration-tests/java/android-sample-old-style-no-wrapper/test.py
+++ b/java/ql/integration-tests/java/android-sample-old-style-no-wrapper/test.py
@@ -1,2 +1,7 @@
+import runs_on
+
+
+# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
+@(runs_on.x86_64 or runs_on.macos)
 def test(codeql, use_java_17, java, android_sdk, actions_toolchains_file):
     codeql.database.create(_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": str(actions_toolchains_file)})
diff --git a/java/ql/integration-tests/java/android-sample-old-style/test.py b/java/ql/integration-tests/java/android-sample-old-style/test.py
index d3399e414e61..cefeb2c86df4 100644
--- a/java/ql/integration-tests/java/android-sample-old-style/test.py
+++ b/java/ql/integration-tests/java/android-sample-old-style/test.py
@@ -1,2 +1,7 @@
+import runs_on
+
+
+# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
+@(runs_on.x86_64 or runs_on.macos)
 def test(codeql, use_java_11, java, gradle_7_4, android_sdk):
     codeql.database.create()
diff --git a/java/ql/integration-tests/java/android-sample/test.py b/java/ql/integration-tests/java/android-sample/test.py
index d3399e414e61..cefeb2c86df4 100644
--- a/java/ql/integration-tests/java/android-sample/test.py
+++ b/java/ql/integration-tests/java/android-sample/test.py
@@ -1,2 +1,7 @@
+import runs_on
+
+
+# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
+@(runs_on.x86_64 or runs_on.macos)
 def test(codeql, use_java_11, java, gradle_7_4, android_sdk):
     codeql.database.create()
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/test.py b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/test.py
index 811ef3bb926b..d34586fc6955 100644
--- a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/test.py
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/test.py
@@ -1,9 +1,12 @@
 import os
 import os.path
 
-def test(codeql, java, check_diagnostics_java):
+def test(codeql, java, check_diagnostics_java, tmp_path):
     codeql.database.create(build_mode = "none",
         _env={
-            "_JAVA_OPTIONS": "-Duser.home=" + os.path.join(os.getcwd(), "home-dir-with-maven-settings")
+            "_JAVA_OPTIONS": " ".join([
+                "-Duser.home=" + os.path.join(os.getcwd(), "home-dir-with-maven-settings"),
+                "-Dmaven.repo.local=" + str(tmp_path / "maven-repository")
+            ])
         }
     )
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/test.py b/java/ql/integration-tests/java/buildless-maven-mirrorof/test.py
index c24417c14405..e9a14a563240 100644
--- a/java/ql/integration-tests/java/buildless-maven-mirrorof/test.py
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/test.py
@@ -1,10 +1,13 @@
 import os
 import os.path
 
-def test(codeql, java, check_diagnostics_java):
+def test(codeql, java, check_diagnostics_java, tmp_path):
     codeql.database.create(build_mode = "none",
         _env={
-            "_JAVA_OPTIONS": "-Duser.home=" + os.path.join(os.getcwd(), "empty-home"),
+            "_JAVA_OPTIONS": " ".join([
+                "-Duser.home=" + os.path.join(os.getcwd(), "empty-home"),
+                "-Dmaven.repo.local=" + str(tmp_path / "maven-repository")
+            ]),
             "LGTM_INDEX_MAVEN_SETTINGS_FILE": os.path.join(os.path.dirname(os.path.realpath(__file__)), "settings.xml")
         }
     )
diff --git a/java/ql/integration-tests/java/buildless-maven/test.py b/java/ql/integration-tests/java/buildless-maven/test.py
index 2e49378d9827..fdb6b208fc2a 100644
--- a/java/ql/integration-tests/java/buildless-maven/test.py
+++ b/java/ql/integration-tests/java/buildless-maven/test.py
@@ -1,9 +1,12 @@
 import os
 import os.path
 
-def test(codeql, java, check_diagnostics_java):
+def test(codeql, java, check_diagnostics_java, tmp_path):
     codeql.database.create(build_mode = "none",
         _env={
-            "_JAVA_OPTIONS": "-Duser.home=" + os.path.join(os.getcwd(), "empty-home")
+            "_JAVA_OPTIONS": " ".join([
+                "-Duser.home=" + os.path.join(os.getcwd(), "empty-home"),
+                "-Dmaven.repo.local=" + str(tmp_path / "maven-repository")
+            ])
         }
     )
diff --git a/java/ql/integration-tests/java/diagnostics/android-gradle-incompatibility/test.py b/java/ql/integration-tests/java/diagnostics/android-gradle-incompatibility/test.py
index f58e84e77a2f..5131ab601762 100644
--- a/java/ql/integration-tests/java/diagnostics/android-gradle-incompatibility/test.py
+++ b/java/ql/integration-tests/java/diagnostics/android-gradle-incompatibility/test.py
@@ -1,2 +1,7 @@
+import runs_on
+
+
+# Deselected on linux-arm64: there the AGP build fails because no linux-aarch64 aapt2 exists, which is unrelated to the AGP/Gradle version incompatibility this test asserts and would otherwise let it pass for the wrong reason.
+@(runs_on.x86_64 or runs_on.macos)
 def test(codeql, java, gradle_7_3, android_sdk):
     codeql.database.create(_assert_failure=True)
diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected
index b23aa85f2548..f479e56b2e68 100644
--- a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected
+++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected
@@ -1,7 +1,7 @@
 {
   "attributes": {
     "java_vendor": "__REDACTED__",
-    "java_version": "11.0.31"
+    "java_version": "11"
   },
   "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
   "severity": "note",
diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py
index 92aedd825efa..a312878e107f 100644
--- a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py
+++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py
@@ -6,6 +6,9 @@
 # The version of gradle used doesn't work on java 17
 def test(codeql, use_java_11, java, environment, check_diagnostics):
     check_diagnostics.redact += ["attributes.java_vendor"]
+    # the JDK build provided by the CI runner image may report any number of version components
+    # (e.g. `11.0.32` or `11.0.32.1`), so keep only the feature version
+    check_diagnostics.replacements = [(r'"11(\.[0-9]+)+"', '"11"')]
     gradle_override_dir = pathlib.Path(tempfile.mkdtemp())
     if runs_on.windows:
         (gradle_override_dir / "gradle.bat").write_text("@echo off\nexit /b 2\n")
diff --git a/java/ql/integration-tests/java/maven-enforcer-property-version/pom.xml b/java/ql/integration-tests/java/maven-enforcer-property-version/pom.xml
new file mode 100644
index 000000000000..1fde7386b72b
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-property-version/pom.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.example</groupId>
+  <artifactId>maven-sample</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>maven-sample</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.version>3.9.1</maven.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>exec-maven-plugin</artifactId>
+        <groupId>org.codehaus.mojo</groupId>
+        <version>1.1.1</version>
+        <executions>
+          <execution>
+            <id>check-maven-version</id>
+            <phase>package</phase>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>com.example.App</mainClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.19.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>compile</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <java>
+            <licenseHeader>
+              <content>/* FAIL ME */</content>
+            </licenseHeader>
+          </java>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>${maven.version}</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.7.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
diff --git a/java/ql/integration-tests/java/maven-enforcer-property-version/settings.xml b/java/ql/integration-tests/java/maven-enforcer-property-version/settings.xml
new file mode 100644
index 000000000000..a40670670a62
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-property-version/settings.xml
@@ -0,0 +1,10 @@
+<settings>
+  <mirrors>
+    <mirror>
+      <id>google-maven-central</id>
+      <name>GCS Maven Central mirror</name>
+      <url>https://maven-central.storage-download.googleapis.com/maven2/</url>
+      <mirrorOf>central</mirrorOf>
+    </mirror>
+  </mirrors>
+</settings>
diff --git a/java/ql/integration-tests/java/maven-enforcer-property-version/source_archive.expected b/java/ql/integration-tests/java/maven-enforcer-property-version/source_archive.expected
new file mode 100644
index 000000000000..d86dae4531fd
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-property-version/source_archive.expected
@@ -0,0 +1,11 @@
+pom.xml
+settings.xml
+src/main/java/com/example/App.java
+src/main/resources/my-app.properties
+src/main/resources/page.xml
+src/main/resources/struts.xml
+src/test/java/com/example/AppTest.java
+target/classes/my-app.properties
+target/classes/page.xml
+target/classes/struts.xml
+target/maven-archiver/pom.properties
diff --git a/java/ql/integration-tests/java/maven-enforcer-property-version/src/main/java/com/example/App.java b/java/ql/integration-tests/java/maven-enforcer-property-version/src/main/java/com/example/App.java
new file mode 100644
index 000000000000..3229e21835cd
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-property-version/src/main/java/com/example/App.java
@@ -0,0 +1,30 @@
+package com.example;
+
+import java.util.regex.Pattern;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+        String expectedVersion = System.getenv("EXPECT_MAVEN");
+        Path mavenHome = Paths.get(System.getProperty("maven.home")).normalize();
+        String observedVersion = mavenHome.getFileName().toString();
+        if (expectedVersion != null && !expectedVersion.equals(observedVersion)) {
+                System.err.println("Wrong maven version, expected '" + expectedVersion + "' but got '" + observedVersion + "'" + mavenHome);
+                System.exit(1);
+        }
+        String commandMatcher = System.getenv("EXPECT_COMMAND_REGEX");
+        String command = System.getProperty("sun.java.command");
+        if (commandMatcher != null && !Pattern.matches(commandMatcher, command)) {
+                System.err.println("Wrong command line, '" + command + "' does not match '" + commandMatcher + "'");
+                System.exit(1);
+        }
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-enforcer-property-version/src/main/resources/my-app.properties b/java/ql/integration-tests/java/maven-enforcer-property-version/src/main/resources/my-app.properties
new file mode 100644
index 000000000000..e566b49a29a8
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-property-version/src/main/resources/my-app.properties
@@ -0,0 +1 @@
+version=1.0
diff --git a/java/ql/integration-tests/java/maven-enforcer-property-version/src/main/resources/page.xml b/java/ql/integration-tests/java/maven-enforcer-property-version/src/main/resources/page.xml
new file mode 100644
index 000000000000..2bab459cb031
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-property-version/src/main/resources/page.xml
@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>A sample</title>
+</head>
+<body>
+<p>Hello world!</p>
+</body>
+</html>
diff --git a/java/ql/integration-tests/java/maven-enforcer-property-version/src/main/resources/struts.xml b/java/ql/integration-tests/java/maven-enforcer-property-version/src/main/resources/struts.xml
new file mode 100644
index 000000000000..73fc0c6b9cb6
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-property-version/src/main/resources/struts.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<struts>
+This is a sample file
+</struts>
diff --git a/java/ql/integration-tests/java/maven-enforcer-property-version/src/test/java/com/example/AppTest.java b/java/ql/integration-tests/java/maven-enforcer-property-version/src/test/java/com/example/AppTest.java
new file mode 100644
index 000000000000..328b4d97ce59
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-property-version/src/test/java/com/example/AppTest.java
@@ -0,0 +1,20 @@
+package com.example;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-enforcer-property-version/test.py b/java/ql/integration-tests/java/maven-enforcer-property-version/test.py
new file mode 100644
index 000000000000..295db6762b6f
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-property-version/test.py
@@ -0,0 +1,9 @@
+import os
+
+def test(codeql, java):
+    codeql.database.create(
+        _env={
+            "EXPECT_MAVEN": "apache-maven-3.9.16",
+            "LGTM_INDEX_MAVEN_SETTINGS_FILE": os.path.join(os.path.dirname(os.path.realpath(__file__)), "settings.xml"),
+        },
+    )
diff --git a/java/ql/integration-tests/java/maven-enforcer-single-version/test.py b/java/ql/integration-tests/java/maven-enforcer-single-version/test.py
index a71c8821d5e6..295db6762b6f 100644
--- a/java/ql/integration-tests/java/maven-enforcer-single-version/test.py
+++ b/java/ql/integration-tests/java/maven-enforcer-single-version/test.py
@@ -3,6 +3,7 @@
 def test(codeql, java):
     codeql.database.create(
         _env={
+            "EXPECT_MAVEN": "apache-maven-3.9.16",
             "LGTM_INDEX_MAVEN_SETTINGS_FILE": os.path.join(os.path.dirname(os.path.realpath(__file__)), "settings.xml"),
         },
     )
diff --git a/java/ql/integration-tests/kotlin/all-platforms/diagnostics/kotlin-version-too-new/diagnostics.expected b/java/ql/integration-tests/kotlin/all-platforms/diagnostics/kotlin-version-too-new/diagnostics.expected
index 09429027c5d6..ff2c056ff962 100644
--- a/java/ql/integration-tests/kotlin/all-platforms/diagnostics/kotlin-version-too-new/diagnostics.expected
+++ b/java/ql/integration-tests/kotlin/all-platforms/diagnostics/kotlin-version-too-new/diagnostics.expected
@@ -1,5 +1,5 @@
 {
-  "markdownMessage": "The Kotlin version installed (`999.999.999`) is too recent for this version of CodeQL. Install a version lower than 2.4.20.",
+  "markdownMessage": "The Kotlin version installed (`999.999.999`) is too recent for this version of CodeQL. Install a version lower than 2.4.30.",
   "severity": "error",
   "source": {
     "extractorName": "java",
diff --git a/java/ql/integration-tests/kotlin/all-platforms/logs/test.py b/java/ql/integration-tests/kotlin/all-platforms/logs/test.py
index 38a385f0e7d3..44965f0f2dcc 100644
--- a/java/ql/integration-tests/kotlin/all-platforms/logs/test.py
+++ b/java/ql/integration-tests/kotlin/all-platforms/logs/test.py
@@ -6,9 +6,8 @@
 
 def test(codeql, java_full, cwd: pathlib.Path, expected_files):
     codeql.database.create(command=["kotlinc test.kt"])
-    expected_files.add("logs.actual")
 
-    with open("logs.actual", "w") as f_out:
+    with expected_files.add("logs.actual") as f_out:
         log_dir = cwd / "test-db" / "log"
         for file_index, log_file in enumerate(log_dir.glob("kotlin-extractor*.log"), 1):
             f_out.write(f"Log file {file_index}\n")
diff --git a/java/ql/lib/CHANGELOG.md b/java/ql/lib/CHANGELOG.md
index 83910f155a3c..d98b8ad60b6d 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,3 +1,49 @@
+## 9.3.4
+
+### Minor Analysis Improvements
+
+* The `java/log-injection` query now recognizes additional sanitizers and sanitizer guards from the JDK, Apache Commons Lang and Text, Guava, OWASP Java Encoder, and Spring Framework.
+* Queries that use path-injection sanitizers now recognize additional substring guards and string replacement and removal operations from Apache Commons Lang and Guava.
+
+## 9.3.3
+
+### Minor Analysis Improvements
+
+* The queries `java/ssrf` and `java/unvalidated-url-redirection` recognize case-insensitive comparisons of `URI.getHost()` with fixed string allowlist entries, as well as equality and case-insensitive comparisons when the host is stored in a local variable.
+
+## 9.3.2
+
+No user-facing changes.
+
+## 9.3.1
+
+### Minor Analysis Improvements
+
+* Support for Kotlin 2.4.20 has been added.
+* Fixed an issue where `Foo::class.java` arguments were dropped during extraction under the Kotlin K2 compiler, which could cause false positives in queries such as `java/android/implicit-pendingintents`.
+
+## 9.3.0
+
+### New Features
+
+* Factories returned by the Apache Commons Secure XML (`org.apache.commons.xml.secure`) hardening library's `SecureDocumentBuilderFactory`, `SecureSAXParserFactory`, `SecureXMLInputFactory`, `SecureTransformerFactory` and `SecureSchemaFactory` classes are now recognized as safely configured by the XXE query.
+* A new extensible class `SafeXmlFactorySource` was added to `semmle.code.java.security.XmlParsers` for modeling sources of pre-hardened JAXP factories.
+
+### Minor Analysis Improvements
+
+* Added modeling for the Micronaut framework, including HTTP controllers, WebSocket endpoints, configuration injection, data access, security annotations, and HTTP client sinks.
+
+## 9.2.4
+
+### Minor Analysis Improvements
+
+* Removed the summary model for `String.valueOf(CharSequence)`, which does not exist. Instead, taint is now propagated through calls to `String.valueOf(Object)` when the argument is a `CharSequence`, for example a `String` or a `StringBuilder`.
+* Added SQL injection sink models for Spring R2DBC `DatabaseClient` and the R2DBC SPI.
+
+## 9.2.3
+
+No user-facing changes.
+
 ## 9.2.2
 
 ### Minor Analysis Improvements
diff --git a/java/ql/lib/change-notes/2026-10-14-constant-value-guards.md b/java/ql/lib/change-notes/2026-10-14-constant-value-guards.md
new file mode 100644
index 000000000000..ee8e09960064
--- /dev/null
+++ b/java/ql/lib/change-notes/2026-10-14-constant-value-guards.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Java taint-tracking queries now recognize equality and case-insensitive equality checks against fixed string constants as sanitizers. The queries `java/ssrf` and `java/unvalidated-url-redirection` also recognize checks of `URI.getHost()` against fixed collections of strings, including when the host is normalized to upper or lower case.
diff --git a/java/ql/lib/change-notes/released/9.2.3.md b/java/ql/lib/change-notes/released/9.2.3.md
new file mode 100644
index 000000000000..c0cdbd68de76
--- /dev/null
+++ b/java/ql/lib/change-notes/released/9.2.3.md
@@ -0,0 +1,3 @@
+## 9.2.3
+
+No user-facing changes.
diff --git a/java/ql/lib/change-notes/released/9.2.4.md b/java/ql/lib/change-notes/released/9.2.4.md
new file mode 100644
index 000000000000..8b1f87145a79
--- /dev/null
+++ b/java/ql/lib/change-notes/released/9.2.4.md
@@ -0,0 +1,6 @@
+## 9.2.4
+
+### Minor Analysis Improvements
+
+* Removed the summary model for `String.valueOf(CharSequence)`, which does not exist. Instead, taint is now propagated through calls to `String.valueOf(Object)` when the argument is a `CharSequence`, for example a `String` or a `StringBuilder`.
+* Added SQL injection sink models for Spring R2DBC `DatabaseClient` and the R2DBC SPI.
diff --git a/java/ql/lib/change-notes/released/9.3.0.md b/java/ql/lib/change-notes/released/9.3.0.md
new file mode 100644
index 000000000000..efabbd03ca3c
--- /dev/null
+++ b/java/ql/lib/change-notes/released/9.3.0.md
@@ -0,0 +1,10 @@
+## 9.3.0
+
+### New Features
+
+* Factories returned by the Apache Commons Secure XML (`org.apache.commons.xml.secure`) hardening library's `SecureDocumentBuilderFactory`, `SecureSAXParserFactory`, `SecureXMLInputFactory`, `SecureTransformerFactory` and `SecureSchemaFactory` classes are now recognized as safely configured by the XXE query.
+* A new extensible class `SafeXmlFactorySource` was added to `semmle.code.java.security.XmlParsers` for modeling sources of pre-hardened JAXP factories.
+
+### Minor Analysis Improvements
+
+* Added modeling for the Micronaut framework, including HTTP controllers, WebSocket endpoints, configuration injection, data access, security annotations, and HTTP client sinks.
diff --git a/java/ql/lib/change-notes/released/9.3.1.md b/java/ql/lib/change-notes/released/9.3.1.md
new file mode 100644
index 000000000000..322934436309
--- /dev/null
+++ b/java/ql/lib/change-notes/released/9.3.1.md
@@ -0,0 +1,6 @@
+## 9.3.1
+
+### Minor Analysis Improvements
+
+* Support for Kotlin 2.4.20 has been added.
+* Fixed an issue where `Foo::class.java` arguments were dropped during extraction under the Kotlin K2 compiler, which could cause false positives in queries such as `java/android/implicit-pendingintents`.
diff --git a/java/ql/lib/change-notes/released/9.3.2.md b/java/ql/lib/change-notes/released/9.3.2.md
new file mode 100644
index 000000000000..efa8cf58c1b5
--- /dev/null
+++ b/java/ql/lib/change-notes/released/9.3.2.md
@@ -0,0 +1,3 @@
+## 9.3.2
+
+No user-facing changes.
diff --git a/java/ql/lib/change-notes/released/9.3.3.md b/java/ql/lib/change-notes/released/9.3.3.md
new file mode 100644
index 000000000000..09dd4ef62936
--- /dev/null
+++ b/java/ql/lib/change-notes/released/9.3.3.md
@@ -0,0 +1,5 @@
+## 9.3.3
+
+### Minor Analysis Improvements
+
+* The queries `java/ssrf` and `java/unvalidated-url-redirection` recognize case-insensitive comparisons of `URI.getHost()` with fixed string allowlist entries, as well as equality and case-insensitive comparisons when the host is stored in a local variable.
diff --git a/java/ql/lib/change-notes/released/9.3.4.md b/java/ql/lib/change-notes/released/9.3.4.md
new file mode 100644
index 000000000000..53015bb0afe1
--- /dev/null
+++ b/java/ql/lib/change-notes/released/9.3.4.md
@@ -0,0 +1,6 @@
+## 9.3.4
+
+### Minor Analysis Improvements
+
+* The `java/log-injection` query now recognizes additional sanitizers and sanitizer guards from the JDK, Apache Commons Lang and Text, Guava, OWASP Java Encoder, and Spring Framework.
+* Queries that use path-injection sanitizers now recognize additional substring guards and string replacement and removal operations from Apache Commons Lang and Guava.
diff --git a/java/ql/lib/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
index 41cfa549b0a6..9b88f8a94867 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 9.2.2
+lastReleaseVersion: 9.3.4
diff --git a/java/ql/lib/ext/com.google.common.base.model.yml b/java/ql/lib/ext/com.google.common.base.model.yml
index 2de9d66b0af8..494e37abe036 100644
--- a/java/ql/lib/ext/com.google.common.base.model.yml
+++ b/java/ql/lib/ext/com.google.common.base.model.yml
@@ -18,6 +18,11 @@ extensions:
       - ["com.google.common.base", "Ascii", False, "truncate", "(CharSequence,int,String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["com.google.common.base", "Ascii", False, "truncate", "(CharSequence,int,String)", "", "Argument[2]", "ReturnValue", "taint", "manual"]
       - ["com.google.common.base", "CaseFormat", True, "to", "(CaseFormat,String)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
+      - ["com.google.common.base", "CharMatcher", True, "removeFrom", "(CharSequence)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["com.google.common.base", "CharMatcher", True, "replaceFrom", "(CharSequence,char)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["com.google.common.base", "CharMatcher", True, "replaceFrom", "(CharSequence,char)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
+      - ["com.google.common.base", "CharMatcher", True, "replaceFrom", "(CharSequence,CharSequence)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["com.google.common.base", "CharMatcher", True, "replaceFrom", "(CharSequence,CharSequence)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
       - ["com.google.common.base", "Converter", True, "apply", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["com.google.common.base", "Converter", True, "convert", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["com.google.common.base", "Converter", True, "convertAll", "(Iterable)", "", "Argument[0].Element", "ReturnValue.Element", "taint", "manual"]
diff --git a/java/ql/lib/ext/io.micronaut.context.annotation.model.yml b/java/ql/lib/ext/io.micronaut.context.annotation.model.yml
new file mode 100644
index 000000000000..816b47eaf5d3
--- /dev/null
+++ b/java/ql/lib/ext/io.micronaut.context.annotation.model.yml
@@ -0,0 +1,7 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["io.micronaut.context.annotation", "Property", True, "", "", "Annotated", "", "environment", "manual"]
+      - ["io.micronaut.context.annotation", "Value", True, "", "", "Annotated", "", "environment", "manual"]
diff --git a/java/ql/lib/ext/io.micronaut.core.convert.value.model.yml b/java/ql/lib/ext/io.micronaut.core.convert.value.model.yml
new file mode 100644
index 000000000000..f5400d2384d6
--- /dev/null
+++ b/java/ql/lib/ext/io.micronaut.core.convert.value.model.yml
@@ -0,0 +1,13 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["io.micronaut.core.convert.value", "ConvertibleMultiValues", True, "get", "", "", "Argument[this].MapValue", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.core.convert.value", "ConvertibleMultiValues", True, "getAll", "", "", "Argument[this].MapValue", "ReturnValue.Element", "value", "manual"]
+      - ["io.micronaut.core.convert.value", "ConvertibleMultiValues", True, "getFirst", "", "", "Argument[this].MapValue", "ReturnValue.Element", "taint", "manual"]
+      - ["io.micronaut.core.convert.value", "ConvertibleValues", True, "asMap", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.core.convert.value", "ConvertibleValues", True, "asProperties", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.core.convert.value", "ConvertibleValues", True, "getValue", "", "", "Argument[this].MapValue", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.core.convert.value", "ConvertibleValues", True, "subMap", "", "", "Argument[this].MapValue", "ReturnValue.MapValue", "taint", "manual"]
+      - ["io.micronaut.core.convert.value", "ConvertibleValues", True, "values", "", "", "Argument[this].MapValue", "ReturnValue.Element", "taint", "manual"]
diff --git a/java/ql/lib/ext/io.micronaut.http.client.model.yml b/java/ql/lib/ext/io.micronaut.http.client.model.yml
new file mode 100644
index 000000000000..1ecbe3c2b869
--- /dev/null
+++ b/java/ql/lib/ext/io.micronaut.http.client.model.yml
@@ -0,0 +1,35 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "exchange", "(HttpRequest)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "exchange", "(HttpRequest,Argument)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "exchange", "(HttpRequest,Argument,Argument)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "exchange", "(HttpRequest,Class)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "exchange", "(String)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "exchange", "(String,Class)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "exchange", "(String,Class,Class)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "retrieve", "(HttpRequest)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "retrieve", "(HttpRequest,Argument)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "retrieve", "(HttpRequest,Argument,Argument)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "retrieve", "(HttpRequest,Class)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "retrieve", "(String)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "retrieve", "(String,Class)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "BlockingHttpClient", True, "retrieve", "(String,Class,Class)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "HttpClient", True, "exchange", "(HttpRequest)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "HttpClient", True, "exchange", "(HttpRequest,Argument)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "HttpClient", True, "exchange", "(HttpRequest,Argument,Argument)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "HttpClient", True, "exchange", "(HttpRequest,Class)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "HttpClient", True, "exchange", "(String)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "HttpClient", True, "exchange", "(String,Class)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "HttpClient", True, "retrieve", "(HttpRequest)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "HttpClient", True, "retrieve", "(HttpRequest,Argument)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "HttpClient", True, "retrieve", "(HttpRequest,Argument,Argument)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "HttpClient", True, "retrieve", "(HttpRequest,Class)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["io.micronaut.http.client", "HttpClient", True, "retrieve", "(String)", "", "Argument[0]", "request-forgery", "manual"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["io.micronaut.http.client", "HttpClient", True, "toBlocking", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
diff --git a/java/ql/lib/ext/io.micronaut.http.cookie.model.yml b/java/ql/lib/ext/io.micronaut.http.cookie.model.yml
new file mode 100644
index 000000000000..4db713a8f90c
--- /dev/null
+++ b/java/ql/lib/ext/io.micronaut.http.cookie.model.yml
@@ -0,0 +1,12 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["io.micronaut.http.cookie", "Cookie", True, "getDomain", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http.cookie", "Cookie", True, "getName", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http.cookie", "Cookie", True, "getPath", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http.cookie", "Cookie", True, "getValue", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http.cookie", "Cookies", True, "findCookie", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http.cookie", "Cookies", True, "get", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http.cookie", "Cookies", True, "getAll", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
diff --git a/java/ql/lib/ext/io.micronaut.http.model.yml b/java/ql/lib/ext/io.micronaut.http.model.yml
new file mode 100644
index 000000000000..d4ad7697ec41
--- /dev/null
+++ b/java/ql/lib/ext/io.micronaut.http.model.yml
@@ -0,0 +1,44 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["io.micronaut.http", "HttpRequest", True, "getBody", "", "", "ReturnValue", "remote", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "getContentLength", "", "", "ReturnValue", "remote", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "getContentType", "", "", "ReturnValue", "remote", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "getCookies", "", "", "ReturnValue", "remote", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "getHeaders", "", "", "ReturnValue", "remote", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "getMethodName", "", "", "ReturnValue", "remote", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "getParameters", "", "", "ReturnValue", "remote", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "getPath", "", "", "ReturnValue", "remote", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "getUri", "", "", "ReturnValue", "remote", "manual"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["io.micronaut.http", "HttpRequest", True, "DELETE", "(String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "DELETE", "(String,Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "DELETE", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "DELETE", "(URI,Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "GET", "(String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "GET", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "HEAD", "(String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "HEAD", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "OPTIONS", "(String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "OPTIONS", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "PATCH", "(String,Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "PATCH", "(URI,Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "POST", "(String,Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "POST", "(URI,Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "PUT", "(String,Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http", "HttpRequest", True, "PUT", "(URI,Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["io.micronaut.http", "HttpResponse", True, "permanentRedirect", "(URI)", "", "Argument[0]", "url-redirection", "manual"]
+      - ["io.micronaut.http", "HttpResponse", True, "redirect", "(URI)", "", "Argument[0]", "url-redirection", "manual"]
+      - ["io.micronaut.http", "HttpResponse", True, "seeOther", "(URI)", "", "Argument[0]", "url-redirection", "manual"]
+      - ["io.micronaut.http", "HttpResponse", True, "temporaryRedirect", "(URI)", "", "Argument[0]", "url-redirection", "manual"]
+      - ["io.micronaut.http", "MutableHttpResponse", True, "header", "(CharSequence,CharSequence)", "", "Argument[1]", "response-splitting", "manual"]
+      - ["io.micronaut.http", "MutableHttpResponse", True, "headers", "(Map)", "", "Argument[0]", "response-splitting", "manual"]
diff --git a/java/ql/lib/ext/io.micronaut.http.multipart.model.yml b/java/ql/lib/ext/io.micronaut.http.multipart.model.yml
new file mode 100644
index 000000000000..36116e12f08f
--- /dev/null
+++ b/java/ql/lib/ext/io.micronaut.http.multipart.model.yml
@@ -0,0 +1,10 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["io.micronaut.http.multipart", "CompletedFileUpload", True, "getBytes", "", "", "ReturnValue", "remote", "manual"]
+      - ["io.micronaut.http.multipart", "CompletedFileUpload", True, "getInputStream", "", "", "ReturnValue", "remote", "manual"]
+      - ["io.micronaut.http.multipart", "CompletedFileUpload", True, "getFilename", "", "", "ReturnValue", "remote", "manual"]
+      - ["io.micronaut.http.multipart", "CompletedFileUpload", True, "getContentType", "", "", "ReturnValue", "remote", "manual"]
+      - ["io.micronaut.http.multipart", "CompletedFileUpload", True, "getSize", "", "", "ReturnValue", "remote", "manual"]
diff --git a/java/ql/lib/ext/io.micronaut.http.uri.model.yml b/java/ql/lib/ext/io.micronaut.http.uri.model.yml
new file mode 100644
index 000000000000..61ce1391b93a
--- /dev/null
+++ b/java/ql/lib/ext/io.micronaut.http.uri.model.yml
@@ -0,0 +1,28 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["io.micronaut.http.uri", "UriBuilder", True, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "expand", "(Map)", "", "Argument[0].MapValue", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "expand", "(Map)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "fragment", "(String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "fragment", "(String)", "", "Argument[this]", "ReturnValue", "value", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "host", "(String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "host", "(String)", "", "Argument[this]", "ReturnValue", "value", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "of", "(CharSequence)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "of", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "path", "(String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "path", "(String)", "", "Argument[this]", "ReturnValue", "value", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "queryParam", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "queryParam", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "queryParam", "(String,Object[])", "", "Argument[this]", "ReturnValue", "value", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "replacePath", "(String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "replacePath", "(String)", "", "Argument[this]", "ReturnValue", "value", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "replaceQueryParam", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "replaceQueryParam", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "replaceQueryParam", "(String,Object[])", "", "Argument[this]", "ReturnValue", "value", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "scheme", "(String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "scheme", "(String)", "", "Argument[this]", "ReturnValue", "value", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "userInfo", "(String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["io.micronaut.http.uri", "UriBuilder", True, "userInfo", "(String)", "", "Argument[this]", "ReturnValue", "value", "manual"]
diff --git a/java/ql/lib/ext/io.r2dbc.spi.model.yml b/java/ql/lib/ext/io.r2dbc.spi.model.yml
new file mode 100644
index 000000000000..4643a3e874fe
--- /dev/null
+++ b/java/ql/lib/ext/io.r2dbc.spi.model.yml
@@ -0,0 +1,11 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["io.r2dbc.spi", "Batch", True, "add", "(String)", "", "Argument[0]", "sql-injection", "manual"]
+      - ["io.r2dbc.spi", "Connection", True, "createSavepoint", "(String)", "", "Argument[0]", "sql-injection", "manual"]
+      - ["io.r2dbc.spi", "Connection", True, "createStatement", "(String)", "", "Argument[0]", "sql-injection", "manual"]
+      - ["io.r2dbc.spi", "Connection", True, "releaseSavepoint", "(String)", "", "Argument[0]", "sql-injection", "manual"]
+      - ["io.r2dbc.spi", "Statement", True, "returnGeneratedValues", "(String[])", "", "Argument[0]", "sql-injection", "manual"]
+      - ["io.r2dbc.spi", "Connection", True, "rollbackTransactionToSavepoint", "(String)", "", "Argument[0]", "sql-injection", "manual"]
diff --git a/java/ql/lib/ext/java.lang.model.yml b/java/ql/lib/ext/java.lang.model.yml
index 9e3d9e8cee54..d613c6fe8f5b 100644
--- a/java/ql/lib/ext/java.lang.model.yml
+++ b/java/ql/lib/ext/java.lang.model.yml
@@ -134,7 +134,6 @@ extensions:
       - ["java.lang", "String", False, "valueOf", "(char)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["java.lang", "String", False, "valueOf", "(char[])", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["java.lang", "String", False, "valueOf", "(char[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["java.lang", "String", False, "valueOf", "(CharSequence)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["java.lang", "StringBuffer", True, "StringBuffer", "(CharSequence)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["java.lang", "StringBuffer", True, "StringBuffer", "(String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["java.lang", "StringBuilder", True, "StringBuilder", "", "", "Argument[0]", "Argument[this]", "taint", "manual"]
diff --git a/java/ql/lib/ext/org.apache.commons.lang3.model.yml b/java/ql/lib/ext/org.apache.commons.lang3.model.yml
index 7c455d780b13..25557741aa9d 100644
--- a/java/ql/lib/ext/org.apache.commons.lang3.model.yml
+++ b/java/ql/lib/ext/org.apache.commons.lang3.model.yml
@@ -1,4 +1,11 @@
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: barrierModel
+    data:
+      - ["org.apache.commons.lang3", "StringEscapeUtils", False, "escapeJava", "(String)", "", "ReturnValue", "log-injection", "manual"]
+      - ["org.apache.commons.lang3", "StringUtils", False, "deleteWhitespace", "", "", "ReturnValue", "log-injection", "manual"]
+      - ["org.apache.commons.lang3", "StringUtils", False, "normalizeSpace", "", "", "ReturnValue", "log-injection", "manual"]
   - addsTo:
       pack: codeql/java-all
       extensible: sinkModel
@@ -75,6 +82,7 @@ extensions:
       - ["org.apache.commons.lang3", "RegExUtils", False, "replaceFirst", "", "", "Argument[2]", "ReturnValue", "taint", "manual"]
       - ["org.apache.commons.lang3", "RegExUtils", False, "replacePattern", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["org.apache.commons.lang3", "RegExUtils", False, "replacePattern", "", "", "Argument[2]", "ReturnValue", "taint", "manual"]
+      - ["org.apache.commons.lang3", "StringEscapeUtils", False, "escapeJava", "(String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["org.apache.commons.lang3", "StringEscapeUtils", False, "escapeJson", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["org.apache.commons.lang3", "StringUtils", False, "abbreviate", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["org.apache.commons.lang3", "StringUtils", False, "abbreviate", "(java.lang.String,java.lang.String,int)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
diff --git a/java/ql/lib/ext/org.apache.commons.text.model.yml b/java/ql/lib/ext/org.apache.commons.text.model.yml
index 2e36598bdbfd..ffde17b44a9b 100644
--- a/java/ql/lib/ext/org.apache.commons.text.model.yml
+++ b/java/ql/lib/ext/org.apache.commons.text.model.yml
@@ -1,8 +1,14 @@
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: barrierModel
+    data:
+      - ["org.apache.commons.text", "StringEscapeUtils", False, "escapeJava", "(String)", "", "ReturnValue", "log-injection", "manual"]
   - addsTo:
       pack: codeql/java-all
       extensible: summaryModel
     data:
+      - ["org.apache.commons.text", "StringEscapeUtils", False, "escapeJava", "(String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["org.apache.commons.text", "StrBuilder", False, "StrBuilder", "(java.lang.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["org.apache.commons.text", "StrBuilder", False, "append", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["org.apache.commons.text", "StrBuilder", False, "append", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
diff --git a/java/ql/lib/ext/org.owasp.encoder.model.yml b/java/ql/lib/ext/org.owasp.encoder.model.yml
new file mode 100644
index 000000000000..7f6b2627bbf5
--- /dev/null
+++ b/java/ql/lib/ext/org.owasp.encoder.model.yml
@@ -0,0 +1,11 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: barrierModel
+    data:
+      - ["org.owasp.encoder", "Encode", False, "forJava", "(String)", "", "ReturnValue", "log-injection", "manual"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["org.owasp.encoder", "Encode", False, "forJava", "(String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
diff --git a/java/ql/lib/ext/org.springframework.r2dbc.core.model.yml b/java/ql/lib/ext/org.springframework.r2dbc.core.model.yml
new file mode 100644
index 000000000000..7246dd68f8d4
--- /dev/null
+++ b/java/ql/lib/ext/org.springframework.r2dbc.core.model.yml
@@ -0,0 +1,27 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["org.springframework.r2dbc.core", "DatabaseClient", True, "sql", "(String)", "", "Argument[0]", "sql-injection", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "flatMap", "(java.util.function.Function)", "", "Argument[this]", "sql-injection", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "fetch", "", "", "Argument[this]", "sql-injection", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "map", "(java.util.function.BiFunction)", "", "Argument[this]", "sql-injection", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "map", "(java.util.function.Function)", "", "Argument[this]", "sql-injection", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "mapProperties", "(Class)", "", "Argument[this]", "sql-injection", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "mapValue", "(Class)", "", "Argument[this]", "sql-injection", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "then", "", "", "Argument[this]", "sql-injection", "manual"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["org.springframework.r2dbc.core", "DatabaseClient", True, "sql", "(java.util.function.Supplier)", "", "Argument[0].ReturnValue", "ReturnValue", "taint", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "bind", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "bind", "(int,Object)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "bindNull", "(String,Class)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "bindNull", "(int,Class)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "bindProperties", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "bindValues", "(List)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "bindValues", "(Map)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "filter", "(java.util.function.Function)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["org.springframework.r2dbc.core", "DatabaseClient$GenericExecuteSpec", True, "filter", "(org.springframework.r2dbc.core.StatementFilterFunction)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
diff --git a/java/ql/lib/ext/org.springframework.util.model.yml b/java/ql/lib/ext/org.springframework.util.model.yml
index a3c5e7448d8a..98ab8b7e1420 100644
--- a/java/ql/lib/ext/org.springframework.util.model.yml
+++ b/java/ql/lib/ext/org.springframework.util.model.yml
@@ -1,4 +1,9 @@
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: barrierModel
+    data:
+      - ["org.springframework.util", "StringUtils", False, "trimAllWhitespace", "", "", "ReturnValue", "log-injection", "manual"]
   - addsTo:
       pack: codeql/java-all
       extensible: sinkModel
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index 782d89ff8172..eff99bb22a6e 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 9.2.3-dev
+version: 9.3.5-dev
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/lib/semmle/code/java/Concepts.qll b/java/ql/lib/semmle/code/java/Concepts.qll
index 025ba89d3826..82c2bb1c9999 100644
--- a/java/ql/lib/semmle/code/java/Concepts.qll
+++ b/java/ql/lib/semmle/code/java/Concepts.qll
@@ -9,11 +9,13 @@ module;
 import java
 
 /**
- * A module importing the frameworks that implement `RegexMatch`es,
+ * A module importing the frameworks that implement string matches,
  * ensuring that they are visible to the concepts library.
  */
 private module Frameworks {
   private import semmle.code.java.JDK
+  private import semmle.code.java.frameworks.apache.Lang
+  private import semmle.code.java.frameworks.guava.Guava
   private import semmle.code.java.frameworks.JavaxAnnotations
 }
 
@@ -79,3 +81,207 @@ module RegexMatch {
     abstract string getName();
   }
 }
+
+/**
+ * An expression that tests whether an input string contains a substring.
+ *
+ * Extend this class to refine existing API models. If you want to model new APIs,
+ * extend `StringSubstringMatch::Range` instead.
+ */
+class StringSubstringMatch extends Expr instanceof StringSubstringMatch::Range {
+  /** Gets the input string being tested. */
+  Expr getInputString() { result = super.getInputString() }
+
+  /** Gets the expression that specifies the substring. */
+  Expr getMatchExpression() { result = super.getMatchExpression() }
+
+  /** Gets an expression to be sanitized. */
+  Expr getASanitizedExpr() { result = [this.getInputString(), super.getAdditionalSanitizedExpr()] }
+
+  /** Holds if taking `branch` means that the input contains the substring. */
+  predicate hasSubstringOnBranch(boolean branch) { super.hasSubstringOnBranch(branch) }
+
+  /** Gets a descriptive name for this substring match. */
+  string getName() { result = super.getName() }
+}
+
+/** Provides classes for modeling substring-matching APIs. */
+module StringSubstringMatch {
+  /** A range class for APIs that test whether an input contains a substring. */
+  abstract class Range extends Expr {
+    /** Gets the input string being tested. */
+    abstract Expr getInputString();
+
+    /** Gets the expression that specifies the substring. */
+    abstract Expr getMatchExpression();
+
+    /** Gets an additional expression to be sanitized, if any. */
+    Expr getAdditionalSanitizedExpr() { none() }
+
+    /** Holds if taking `branch` means that the input contains the substring. */
+    abstract predicate hasSubstringOnBranch(boolean branch);
+
+    /** Gets a descriptive name for this substring match. */
+    abstract string getName();
+  }
+}
+
+/**
+ * An expression that tests whether an input string contains characters from a
+ * character set.
+ *
+ * Extend this class to refine existing API models. If you want to model new APIs,
+ * extend `StringCharacterSetMatch::Range` instead.
+ */
+class StringCharacterSetMatch extends Expr instanceof StringCharacterSetMatch::Range {
+  /** Gets the input string being tested. */
+  Expr getInputString() { result = super.getInputString() }
+
+  /** Gets the expression that specifies the character set. */
+  Expr getMatchExpression() { result = super.getMatchExpression() }
+
+  /** Gets an expression to be sanitized. */
+  Expr getASanitizedExpr() { result = [this.getInputString(), super.getAdditionalSanitizedExpr()] }
+
+  /**
+   * Holds if taking `branch` means that the input contains at least one
+   * character from the match expression.
+   */
+  predicate hasMatchingCharacterOnBranch(boolean branch) {
+    super.hasMatchingCharacterOnBranch(branch)
+  }
+
+  /** Gets a descriptive name for this character-set match. */
+  string getName() { result = super.getName() }
+}
+
+/** Provides classes for modeling character-set matching APIs. */
+module StringCharacterSetMatch {
+  /**
+   * A range class for APIs that test whether an input contains characters from
+   * a character set.
+   */
+  abstract class Range extends Expr {
+    /** Gets the input string being tested. */
+    abstract Expr getInputString();
+
+    /** Gets the expression that specifies the character set. */
+    abstract Expr getMatchExpression();
+
+    /** Gets an additional expression to be sanitized, if any. */
+    Expr getAdditionalSanitizedExpr() { none() }
+
+    /**
+     * Holds if taking `branch` means that the input contains at least one
+     * character from the match expression.
+     */
+    abstract predicate hasMatchingCharacterOnBranch(boolean branch);
+
+    /** Gets a descriptive name for this character-set match. */
+    abstract string getName();
+  }
+}
+
+/**
+ * An expression that replaces every occurrence of a target in a string.
+ *
+ * Extend this class to refine existing API models. If you want to model new APIs,
+ * extend `StringReplacement::Range` instead.
+ */
+class StringReplacement extends Expr instanceof StringReplacement::Range {
+  /** Gets the input string whose contents are replaced. */
+  Expr getInputString() { result = super.getInputString() }
+
+  /** Gets the expression that identifies the content to replace. */
+  Expr getMatchExpression() { result = super.getMatchExpression() }
+
+  /** Gets the replacement expression. */
+  Expr getReplacement() { result = super.getReplacement() }
+
+  /** Holds if the match expression is interpreted as a regular expression. */
+  predicate matchExpressionIsRegex() { super.matchExpressionIsRegex() }
+
+  /** Holds if each character in the match expression is matched independently. */
+  predicate matchExpressionIsCharacterSet() { super.matchExpressionIsCharacterSet() }
+
+  /** Gets a descriptive name for this replacement operation. */
+  string getName() { result = super.getName() }
+}
+
+/** Provides classes for modeling string-replacement APIs. */
+module StringReplacement {
+  /**
+   * An expression that replaces every occurrence of a target in a string.
+   *
+   * Extend this class to model new APIs. If you want to refine existing API models,
+   * extend `StringReplacement` instead.
+   */
+  abstract class Range extends Expr {
+    /** Gets the input string whose contents are replaced. */
+    abstract Expr getInputString();
+
+    /** Gets the expression that identifies the content to replace. */
+    abstract Expr getMatchExpression();
+
+    /** Gets the replacement expression. */
+    abstract Expr getReplacement();
+
+    /** Holds if the match expression is interpreted as a regular expression. */
+    predicate matchExpressionIsRegex() { none() }
+
+    /** Holds if each character in the match expression is matched independently. */
+    predicate matchExpressionIsCharacterSet() { none() }
+
+    /** Gets a descriptive name for this replacement operation. */
+    abstract string getName();
+  }
+}
+
+/**
+ * An expression that removes every occurrence of a target from a string.
+ *
+ * Extend this class to refine existing API models. If you want to model new APIs,
+ * extend `StringRemoval::Range` instead.
+ */
+class StringRemoval extends Expr instanceof StringRemoval::Range {
+  /** Gets the input string whose contents are removed. */
+  Expr getInputString() { result = super.getInputString() }
+
+  /** Gets the expression that identifies the content to remove. */
+  Expr getMatchExpression() { result = super.getMatchExpression() }
+
+  /** Holds if the match expression is interpreted as a regular expression. */
+  predicate matchExpressionIsRegex() { super.matchExpressionIsRegex() }
+
+  /** Holds if each character in the match expression is matched independently. */
+  predicate matchExpressionIsCharacterSet() { super.matchExpressionIsCharacterSet() }
+
+  /** Gets a descriptive name for this removal operation. */
+  string getName() { result = super.getName() }
+}
+
+/** Provides classes for modeling string-removal APIs. */
+module StringRemoval {
+  /**
+   * An expression that removes every occurrence of a target from a string.
+   *
+   * Extend this class to model new APIs. If you want to refine existing API models,
+   * extend `StringRemoval` instead.
+   */
+  abstract class Range extends Expr {
+    /** Gets the input string whose contents are removed. */
+    abstract Expr getInputString();
+
+    /** Gets the expression that identifies the content to remove. */
+    abstract Expr getMatchExpression();
+
+    /** Holds if the match expression is interpreted as a regular expression. */
+    predicate matchExpressionIsRegex() { none() }
+
+    /** Holds if each character in the match expression is matched independently. */
+    predicate matchExpressionIsCharacterSet() { none() }
+
+    /** Gets a descriptive name for this removal operation. */
+    abstract string getName();
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
index c4f0c44b3813..dce6ba6afd03 100644
--- a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
+++ b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
@@ -70,6 +70,8 @@ private module Ast implements AstSig<Location> {
 
   class Stmt = J::Stmt;
 
+  class LabeledStmt = J::LabeledStmt;
+
   class Expr = J::Expr;
 
   class BlockStmt = J::BlockStmt;
@@ -100,7 +102,7 @@ private module Ast implements AstSig<Location> {
 
   final private class FinalEnhancedForStmt = J::EnhancedForStmt;
 
-  class ForeachStmt extends FinalEnhancedForStmt {
+  class ForEachStmt extends FinalEnhancedForStmt {
     Expr getVariable() { result = super.getVariable() }
 
     Expr getCollection() { result = super.getExpr() }
@@ -543,15 +545,8 @@ private module Input implements InputSig1, InputSig2 {
     }
   }
 
-  private Label getLabelOfLoop(Stmt s) {
-    exists(LabeledStmt l | s = l.getStmt() |
-      result = TJavaLabel(l.getLabel()) or
-      result = getLabelOfLoop(l)
-    )
-  }
-
   predicate hasLabel(Ast::AstNode n, Label l) {
-    l = getLabelOfLoop(n)
+    l = TJavaLabel(n.(LabeledStmt).getLabel())
     or
     l = TJavaLabel(n.(BreakStmt).getLabel())
     or
@@ -616,12 +611,7 @@ private module Input implements InputSig1, InputSig2 {
    * flow continuing at `n`.
    */
   predicate endAbruptCompletion(Ast::AstNode ast, PreControlFlowNode n, AbruptCompletion c) {
-    exists(LabeledStmt lbl |
-      ast = lbl.getStmt() and
-      n.isAfter(lbl) and
-      c.getSuccessorType() instanceof BreakSuccessor and
-      c.hasLabel(TJavaLabel(lbl.getLabel()))
-    )
+    none()
   }
 
   /** Holds if there is a local non-abrupt step from `n1` to `n2`. */
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
index c03be611067f..d691fbe2bc07 100644
--- a/java/ql/lib/semmle/code/java/Expr.qll
+++ b/java/ql/lib/semmle/code/java/Expr.qll
@@ -205,6 +205,17 @@ class CompileTimeConstantExpr extends Expr {
     result = this.(LiveLiteral).getValue().getStringValue()
   }
 
+  /**
+   * Gets the string value of this expression if it is a `String` constant, or
+   * the single-character string value if it is a `char` constant.
+   */
+  string getStringOrCharValue() {
+    result = this.getStringValue()
+    or
+    this.getType() instanceof CharacterType and
+    result = this.getIntValue().toUnicode()
+  }
+
   /**
    * Gets the boolean value of this expression, where possible.
    */
diff --git a/java/ql/lib/semmle/code/java/JDK.qll b/java/ql/lib/semmle/code/java/JDK.qll
index 93562c7c3d80..21230fd7a1b1 100644
--- a/java/ql/lib/semmle/code/java/JDK.qll
+++ b/java/ql/lib/semmle/code/java/JDK.qll
@@ -47,6 +47,19 @@ class StringContainsMethod extends Method {
   }
 }
 
+/** A call to the `java.lang.String.contains` method. */
+class StringContainsCall extends MethodCall, StringSubstringMatch::Range {
+  StringContainsCall() { this.getMethod() instanceof StringContainsMethod }
+
+  override Expr getInputString() { result = this.getQualifier() }
+
+  override Expr getMatchExpression() { result = this.getArgument(0) }
+
+  override predicate hasSubstringOnBranch(boolean branch) { branch = true }
+
+  override string getName() { result = "String.contains" }
+}
+
 /** A call to the `java.lang.String.matches` method. */
 class StringMatchesCall extends MethodCall, RegexMatch::Range {
   StringMatchesCall() {
@@ -64,23 +77,41 @@ class StringMatchesCall extends MethodCall, RegexMatch::Range {
 }
 
 /** A call to the `java.lang.String.replaceAll` method. */
-class StringReplaceAllCall extends MethodCall {
+class StringReplaceAllCall extends MethodCall, StringReplacement::Range {
   StringReplaceAllCall() {
     exists(Method m | m = this.getMethod() |
       m.getDeclaringType() instanceof TypeString and
       m.hasName("replaceAll")
     )
   }
+
+  override Expr getInputString() { result = this.getQualifier() }
+
+  override Expr getMatchExpression() { result = this.getArgument(0) }
+
+  override Expr getReplacement() { result = this.getArgument(1) }
+
+  override predicate matchExpressionIsRegex() { any() }
+
+  override string getName() { result = "String.replaceAll" }
 }
 
 /** A call to the `java.lang.String.replace` method. */
-class StringReplaceCall extends MethodCall {
+class StringReplaceCall extends MethodCall, StringReplacement::Range {
   StringReplaceCall() {
     exists(Method m | m = this.getMethod() |
       m.getDeclaringType() instanceof TypeString and
       m.hasName("replace")
     )
   }
+
+  override Expr getInputString() { result = this.getQualifier() }
+
+  override Expr getMatchExpression() { result = this.getArgument(0) }
+
+  override Expr getReplacement() { result = this.getArgument(1) }
+
+  override string getName() { result = "String.replace" }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/controlflow/Guards.qll b/java/ql/lib/semmle/code/java/controlflow/Guards.qll
index 56dc9aa55e50..4356dbd18948 100644
--- a/java/ql/lib/semmle/code/java/controlflow/Guards.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/Guards.qll
@@ -342,6 +342,18 @@ private module LogicInput_v3 implements GuardsImpl::LogicInputSig {
   private import semmle.code.java.dataflow.IntegerGuards as IntegerGuards
   import LogicInput_v2
 
+  predicate implicitReturnDefinition(GuardsInput::NonOverridableMethod method, SsaDefinition def) {
+    none()
+  }
+
+  predicate additionalSsaDefinitionValue(SsaDefinition def, GuardValue value) { none() }
+
+  predicate relevantImplicitReturnSsaDefinition(
+    GuardsInput::NonOverridableMethod method, SsaDefinition def
+  ) {
+    none()
+  }
+
   predicate rangeGuard(GuardsImpl::PreGuard guard, GuardValue val, Expr e, int k, boolean upper) {
     IntegerGuards::rangeGuard(guard, val.asBooleanValue(), e, k, upper)
   }
diff --git a/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll b/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll
index f8bd1e605976..e9ab94aa85df 100644
--- a/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll
@@ -30,6 +30,8 @@ import semmle.code.java.frameworks.Guice
 import semmle.code.java.frameworks.struts.StrutsActions
 import semmle.code.java.frameworks.Thrift
 import semmle.code.java.frameworks.javaee.jsf.JSFRenderer
+import semmle.code.java.frameworks.micronaut.MicronautController
+import semmle.code.java.frameworks.micronaut.MicronautWebSocket
 private import semmle.code.java.dataflow.ExternalFlow
 private import codeql.threatmodels.ThreatModels
 
@@ -179,6 +181,28 @@ private class AndroidExternalStorageSource extends RemoteFlowSource {
   override string getSourceType() { result = "Android external storage" }
 }
 
+private class MicronautHttpInputParameterSource extends RemoteFlowSource {
+  MicronautHttpInputParameterSource() {
+    this.asParameter() = any(MicronautRequestMappingParameter mrmp | mrmp.isTaintedInput())
+  }
+
+  override string getSourceType() { result = "Micronaut HTTP input parameter" }
+}
+
+private class MicronautWebSocketParameterSource extends RemoteFlowSource {
+  MicronautWebSocketParameterSource() { this.asParameter() instanceof MicronautWebSocketParameter }
+
+  override string getSourceType() { result = "Micronaut WebSocket parameter" }
+}
+
+private class MicronautErrorHandlerSource extends RemoteFlowSource {
+  MicronautErrorHandlerSource() {
+    this.asParameter() = any(MicronautErrorHandler h).getARemoteParameter()
+  }
+
+  override string getSourceType() { result = "Micronaut error handler parameter" }
+}
+
 /** Class for `tainted` user input. */
 abstract class UserInput extends SourceNode { }
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/FlowSteps.qll b/java/ql/lib/semmle/code/java/dataflow/FlowSteps.qll
index 6dd8de89e213..615a9640bf07 100644
--- a/java/ql/lib/semmle/code/java/dataflow/FlowSteps.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/FlowSteps.qll
@@ -30,7 +30,7 @@ private module Frameworks {
   private import semmle.code.java.frameworks.ThreadLocal
   private import semmle.code.java.frameworks.ratpack.RatpackExec
   private import semmle.code.java.frameworks.stapler.Stapler
-  private import semmle.code.java.security.ListOfConstantsSanitizer
+  private import semmle.code.java.security.ConstantValueSanitizer
   private import semmle.code.java.security.PathSanitizer
 }
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/FlowSummary.qll b/java/ql/lib/semmle/code/java/dataflow/FlowSummary.qll
index b88db0272cea..ff281b61511c 100644
--- a/java/ql/lib/semmle/code/java/dataflow/FlowSummary.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/FlowSummary.qll
@@ -44,6 +44,7 @@ private module SyntheticCallables {
   private import semmle.code.java.dispatch.WrappedInvocation
   private import semmle.code.java.frameworks.android.Intent
   private import semmle.code.java.frameworks.Stream
+  private import semmle.code.java.frameworks.Strings
 }
 
 private newtype TSummarizedCallableBase =
diff --git a/java/ql/lib/semmle/code/java/dataflow/IntegerGuards.qll b/java/ql/lib/semmle/code/java/dataflow/IntegerGuards.qll
index ea2bce01e151..d1498636c9a0 100644
--- a/java/ql/lib/semmle/code/java/dataflow/IntegerGuards.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/IntegerGuards.qll
@@ -9,31 +9,6 @@ private import SSA
 private import RangeUtils
 private import RangeAnalysis
 
-/** Gets an expression that might have the value `i`. */
-deprecated private Expr exprWithIntValue(int i) {
-  result.(ConstantIntegerExpr).getIntValue() = i or
-  result.(ChooseExpr).getAResultExpr() = exprWithIntValue(i)
-}
-
-/**
- * An expression for which the predicate `integerGuard` is relevant.
- * This includes `VarRead` and `MethodCall`.
- */
-deprecated class IntComparableExpr extends Expr {
-  IntComparableExpr() { this instanceof VarRead or this instanceof MethodCall }
-
-  /** Gets an integer that is directly assigned to the expression in case of a variable; or zero. */
-  deprecated int relevantInt() {
-    exists(SsaExplicitUpdate ssa, SsaSourceVariable v |
-      this = v.getAnAccess() and
-      ssa.getSourceVariable() = v and
-      ssa.getDefiningExpr().(VariableAssign).getSource() = exprWithIntValue(result)
-    )
-    or
-    result = 0
-  }
-}
-
 /**
  * Holds if `comp` evaluating to `branch` ensures that `e1` is less than `e2`.
  * When `strict` is true, `e1` is strictly less than `e2`, otherwise it is less
@@ -111,79 +86,3 @@ Expr nonZeroGuard(Expr e, boolean branch) {
     upper = false and val > 0 // e >= val > 0  ==>  e != 0
   )
 }
-
-/**
- * DEPRECATED.
- *
- * An expression that directly tests whether a given expression is equal to `k` or not.
- * The set of `k`s is restricted to those that are relevant for the expression or
- * have a direct comparison with the expression.
- *
- * If `result` evaluates to `branch`, then `e` is guaranteed to be equal to `k` if `is_k`
- * is true, and different from `k` if `is_k` is false.
- */
-pragma[nomagic]
-deprecated Expr integerGuard(IntComparableExpr e, boolean branch, int k, boolean is_k) {
-  exists(EqualityTest eqtest, boolean polarity |
-    eqtest = result and
-    eqtest.hasOperands(e, any(ConstantIntegerExpr c | c.getIntValue() = k)) and
-    polarity = eqtest.polarity() and
-    (
-      branch = true and is_k = polarity
-      or
-      branch = false and is_k = polarity.booleanNot()
-    )
-  )
-  or
-  exists(int val, boolean upper |
-    rangeGuard(result, branch, e, val, upper) and
-    k = e.relevantInt() and
-    is_k = false
-  |
-    upper = true and val < k // e <= val < k  ==>  e != k
-    or
-    upper = false and val > k // e >= val > k  ==>  e != k
-  )
-}
-
-/**
- * DEPRECATED: Use `rangeGuard` instead.
- *
- * A guard that splits the values of a variable into one range with an upper bound of `k-1`
- * and one with a lower bound of `k`.
- *
- * If `branch_with_lower_bound_k` is true then `result` is equivalent to `k <= x`
- * and if it is false then `result` is equivalent to `k > x`.
- */
-deprecated Expr intBoundGuard(VarRead x, boolean branch_with_lower_bound_k, int k) {
-  exists(ComparisonExpr comp, ConstantIntegerExpr c, int val |
-    comp = result and
-    comp.hasOperands(x, c) and
-    c.getIntValue() = val and
-    x.getVariable().getType() instanceof IntegralType
-  |
-    // c < x
-    comp.getLesserOperand() = c and
-    comp.isStrict() and
-    branch_with_lower_bound_k = true and
-    val + 1 = k
-    or
-    // c <= x
-    comp.getLesserOperand() = c and
-    not comp.isStrict() and
-    branch_with_lower_bound_k = true and
-    val = k
-    or
-    // x < c
-    comp.getGreaterOperand() = c and
-    comp.isStrict() and
-    branch_with_lower_bound_k = false and
-    val = k
-    or
-    // x <= c
-    comp.getGreaterOperand() = c and
-    not comp.isStrict() and
-    branch_with_lower_bound_k = false and
-    val + 1 = k
-  )
-}
diff --git a/java/ql/lib/semmle/code/java/dataflow/SSA.qll b/java/ql/lib/semmle/code/java/dataflow/SSA.qll
index a627904174b6..c3dca4cb36bb 100644
--- a/java/ql/lib/semmle/code/java/dataflow/SSA.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/SSA.qll
@@ -188,178 +188,6 @@ class SsaImplicitQualifierDefinition extends SsaImplicitWrite {
  */
 VarRead ssaGetAFirstUse(SsaDefinition def) { firstUse(def, result) }
 
-/**
- * DEPRECATED: use `SsaDefinition` instead.
- *
- * An SSA variable.
- */
-deprecated class SsaVariable extends Definition {
-  /** Gets the SSA source variable underlying this SSA variable. */
-  SsaSourceVariable getSourceVariable() { result = super.getSourceVariable() }
-
-  /**
-   * DEPRECATED: Use `getControlFlowNode()` instead.
-   *
-   * Gets the `ControlFlowNode` at which this SSA variable is defined.
-   */
-  pragma[nomagic]
-  deprecated ControlFlowNode getCfgNode() {
-    exists(BasicBlock bb, int i |
-      this.definesAt(_, bb, i) and
-      // phi nodes are inserted at position `-1`
-      result = bb.getNode(0.maximum(i))
-    )
-  }
-
-  /** Gets a textual representation of this SSA variable. */
-  string toString() { none() }
-
-  /** Gets the source location for this element. */
-  Location getLocation() { result = this.getCfgNode().getLocation() }
-
-  /** Gets the `BasicBlock` in which this SSA variable is defined. */
-  BasicBlock getBasicBlock() { result = super.getBasicBlock() }
-
-  /**
-   * DEPRECATED: Use `getARead()` instead.
-   *
-   * Gets an access of this SSA variable.
-   */
-  deprecated VarRead getAUse() { result = getAUse(this) }
-
-  /**
-   * DEPRECATED: Use `ssaGetAFirstUse(SsaDefinition)` instead.
-   *
-   * Gets an access of the SSA source variable underlying this SSA variable
-   * that can be reached from this SSA variable without passing through any
-   * other uses, but potentially through phi nodes and uncertain implicit
-   * updates.
-   *
-   * Subsequent uses can be found by following the steps defined by
-   * `adjacentUseUse`.
-   */
-  deprecated VarRead getAFirstUse() { firstUse(this, result) }
-
-  /** Holds if this SSA variable is live at the end of `b`. */
-  predicate isLiveAtEndOfBlock(BasicBlock b) { ssaDefReachesEndOfBlock(b, this) }
-
-  /**
-   * DEPRECATED.
-   *
-   * Gets an SSA variable whose value can flow to this one in one step. This
-   * includes inputs to phi nodes, the prior definition of uncertain updates,
-   * and the captured ssa variable for a closure variable.
-   */
-  deprecated SsaVariable getAPhiInputOrPriorDef() {
-    result = this.(SsaPhiNode).getAPhiInput() or
-    result = this.(SsaUncertainImplicitUpdate).getPriorDef() or
-    this.(SsaImplicitInit).captures(result)
-  }
-
-  /**
-   * DEPRECATED: Use `SsaCapturedDefinition::getAnUltimateCapturedDefinition()`
-   * and/or `SsaDefinition::getAnUltimateDefinition()` instead.
-   *
-   * Gets a definition that ultimately defines this variable and is not itself a phi node.
-   */
-  deprecated SsaVariable getAnUltimateDefinition() {
-    result = this.getAPhiInputOrPriorDef*() and not result instanceof SsaPhiNode
-  }
-}
-
-/**
- * DEPRECATED: use `SsaWriteDefinition` instead.
- *
- * An SSA variable that either explicitly or implicitly updates the variable.
- */
-deprecated class SsaUpdate extends SsaVariable instanceof WriteDefinition {
-  SsaUpdate() { not this instanceof SsaImplicitInit }
-}
-
-/**
- * DEPRECATED: Use `SsaExplicitWrite` instead.
- *
- * An SSA variable that is defined by a `VariableUpdate`.
- */
-deprecated class SsaExplicitUpdate extends SsaUpdate {
-  private VariableUpdate upd;
-
-  SsaExplicitUpdate() { ssaExplicitUpdate(this, upd) }
-
-  override string toString() { result = "SSA def(" + this.getSourceVariable() + ")" }
-
-  /** Gets the `VariableUpdate` defining the SSA variable. */
-  VariableUpdate getDefiningExpr() { result = upd }
-}
-
-/**
- * DEPRECATED: Use `SsaImplicitWrite` instead.
- *
- * An SSA variable that represents any sort of implicit update. This can be a
- * `Call` that might reach a non-local update of the field, an explicit or
- * implicit update of the qualifier of the field, or the implicit update that
- * occurs just prior to a `FieldRead` of an untracked field.
- */
-deprecated class SsaImplicitUpdate extends SsaUpdate {
-  SsaImplicitUpdate() { not this instanceof SsaExplicitUpdate }
-
-  override string toString() {
-    result = "SSA impl upd[" + this.getKind() + "](" + this.getSourceVariable() + ")"
-  }
-
-  private predicate hasExplicitQualifierUpdate() {
-    exists(SsaUpdate qdef, BasicBlock bb, int i |
-      qdef.definesAt(this.getSourceVariable().getQualifier(), bb, i) and
-      this.definesAt(_, bb, i) and
-      not qdef instanceof SsaUncertainImplicitUpdate
-    )
-  }
-
-  private predicate hasImplicitQualifierUpdate() {
-    exists(SsaUncertainImplicitUpdate qdef, BasicBlock bb, int i |
-      qdef.definesAt(this.getSourceVariable().getQualifier(), bb, i) and
-      this.definesAt(_, bb, i)
-    )
-  }
-
-  private string getKind() {
-    this.hasExplicitQualifierUpdate() and
-    result = "explicit qualifier" // -> SSA qualifier def
-    or
-    if this.hasImplicitQualifierUpdate()
-    then
-      if isNonLocal(this)
-      then result = "nonlocal + nonlocal qualifier" // -> SSA qualifier def
-      else result = "nonlocal qualifier" // -> SSA qualifier def
-    else (
-      isNonLocal(this) and result = "nonlocal" // -> SSA call def
-    )
-  }
-
-  /**
-   * DEPRECATED: Use `SsaImplicitCallDefinition.getANonLocalUpdate()` instead.
-   *
-   * Gets a reachable `FieldWrite` that might represent this ssa update, if any.
-   */
-  overlay[global]
-  deprecated FieldWrite getANonLocalUpdate() { result = getANonLocalUpdate(this) }
-
-  /**
-   * DEPRECATED: Use `SsaImplicitQualifierDefinition` instead.
-   *
-   * Holds if this ssa variable might change the value to something unknown.
-   *
-   * Examples include updates that might change the value of the qualifier, or
-   * reads from untracked variables, for example those where the field or one
-   * of its qualifiers is volatile.
-   */
-  deprecated predicate assignsUnknownValue() {
-    this.hasExplicitQualifierUpdate()
-    or
-    this.hasImplicitQualifierUpdate()
-  }
-}
-
 private predicate hasQualifierUpdate(SsaImplicitWrite def) {
   exists(SsaWriteDefinition qdef, BasicBlock bb, int i |
     qdef.definesAt(def.getSourceVariable().getQualifier(), bb, i) and
@@ -384,74 +212,6 @@ private predicate isNonLocalImpl(SsaImplicitWrite calldef) { exists(getANonLocal
 
 private predicate isNonLocal(SsaImplicitWrite calldef) = forceLocal(isNonLocalImpl/1)(calldef)
 
-/**
- * DEPRECATED: Use `SsaUncertainWrite` instead.
- *
- * An SSA variable that represents an uncertain implicit update of the value.
- * This is a `Call` that might reach a non-local update of the field or one of
- * its qualifiers.
- */
-deprecated class SsaUncertainImplicitUpdate extends SsaImplicitUpdate {
-  SsaUncertainImplicitUpdate() { ssaUncertainImplicitUpdate(this) }
-
-  /**
-   * DEPRECATED: Use `getPriorDefinition()` instead.
-   *
-   * Gets the immediately preceding definition. Since this update is uncertain
-   * the value from the preceding definition might still be valid.
-   */
-  deprecated SsaVariable getPriorDef() { ssaDefReachesUncertainDef(result, this) }
-}
-
-/**
- * DEPRECATED: Use `SsaParameterInit`, `SsaImplicitEntryDefinition`, or `SsaCapturedDefinition` instead.
- *
- * An SSA variable that is defined by its initial value in the callable. This
- * includes initial values of parameters, fields, and closure variables.
- */
-deprecated class SsaImplicitInit extends SsaVariable instanceof WriteDefinition {
-  SsaImplicitInit() { ssaImplicitInit(this) }
-
-  override string toString() { result = "SSA init(" + this.getSourceVariable() + ")" }
-
-  /** Holds if this is a closure variable that captures the value of `capturedvar`. */
-  predicate captures(SsaVariable capturedvar) { captures(this, capturedvar) }
-
-  /**
-   * DEPRECATED: Use `SsaParameterInit::getParameter()` instead.
-   *
-   * Holds if the SSA variable is a parameter defined by its initial value in the callable.
-   */
-  deprecated predicate isParameterDefinition(Parameter p) {
-    this.getSourceVariable() = TLocalVar(p.getCallable(), p) and
-    p.getCallable().getBody().getControlFlowNode() = this.getCfgNode()
-  }
-}
-
-/**
- * DEPRECATED: Use `SsaPhiDefinition` instead.
- *
- * An SSA phi node.
- */
-deprecated class SsaPhiNode extends SsaVariable instanceof PhiNode {
-  override string toString() { result = "SSA phi(" + this.getSourceVariable() + ")" }
-
-  /**
-   * DEPRECATED: Use `getAnInput()` instead.
-   *
-   * Gets an input to the phi node defining the SSA variable.
-   */
-  deprecated SsaVariable getAPhiInput() { this.hasInputFromBlock(result, _) }
-
-  /** Gets an input to the phi node defining the SSA variable. */
-  SsaVariable getAnInput() { this.hasInputFromBlock(result, _) }
-
-  /** Holds if `inp` is an input to the phi node along the edge originating in `bb`. */
-  predicate hasInputFromBlock(SsaVariable inp, BasicBlock bb) {
-    phiHasInputFromBlock(this, inp, bb)
-  }
-}
-
 private class RefTypeCastingExpr extends CastingExpr {
   RefTypeCastingExpr() {
     this.getType() instanceof RefType and
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowNodes.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowNodes.qll
index 8957442b39ac..5a0df6a222c6 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowNodes.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowNodes.qll
@@ -439,7 +439,7 @@ module Private {
     result.asCallable() = n.(ImplicitInstanceAccess).getInstanceAccess().getEnclosingCallable() or
     result.asCallable() = n.(MallocNode).getClassInstanceExpr().getEnclosingCallable() or
     result = nodeGetEnclosingCallable(n.(ImplicitPostUpdateNode).getPreUpdateNode()) or
-    result.asSummarizedCallable() = n.(FlowSummaryNode).getSummarizedCallable() or
+    result = n.(FlowSummaryNode).getSummaryNode().getEnclosingCallable() or
     result.asCallable() = n.(CaptureNode).getSynthesizedCaptureNode().getEnclosingCallable() or
     result.asFieldScope() = n.(FieldValueNode).getField() or
     result.asCallable() = any(Expr e | n.(AdditionalNode).nodeAt(e, _)).getEnclosingCallable() or
@@ -531,7 +531,7 @@ module Private {
       result = this.getSummaryNode().getSummarizedCallable()
     }
 
-    override Location getLocation() { result = this.getSummarizedCallable().getLocation() }
+    override Location getLocation() { result = this.getSummaryNode().getLocation() }
 
     override string toString() { result = this.getSummaryNode().toString() }
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
index 3dcdc1887614..e727e698e5fa 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
@@ -199,8 +199,7 @@ predicate jumpStep(Node node1, Node node2) {
   any(AdditionalValueStep a).step(node1, node2) and
   node1.getEnclosingCallable() != node2.getEnclosingCallable()
   or
-  FlowSummaryImpl::Private::Steps::summaryJumpStep(node1.(FlowSummaryNode).getSummaryNode(),
-    node2.(FlowSummaryNode).getSummaryNode())
+  FlowSummaryImpl::Private::Steps::summaryJumpStep(node1, node2)
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
index e1df870da7eb..4dea36c40b81 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
@@ -247,8 +247,7 @@ private predicate simpleLocalFlowStep0(Node node1, Node node2, string model) {
   or
   cloneStep(node1, node2) and model = "CloneStep"
   or
-  FlowSummaryImpl::Private::Steps::summaryLocalStep(node1, node2.(FlowSummaryNode).getSummaryNode(),
-    true, model)
+  FlowSummaryImpl::Private::Steps::summaryLocalStep(node1, node2, true, model)
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
index 5ff113db730e..0dc800ecaaa0 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
@@ -37,11 +37,13 @@ module Input implements InputSig<Location, DataFlowImplSpecific::JavaDataFlow> {
     sc.asCallable() = any(Callable c | c.fromSource() and not c.isStub())
   }
 
-  class SourceBase = Void;
-
-  class SinkBase = Void;
+  class FlowSummaryCallBase extends Void {
+    Location getLocation() { none() }
+  }
 
-  class FlowSummaryCallBase = Void;
+  DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
+    result.asSummarizedCallable() = c
+  }
 
   predicate neutralElement(
     Input::SummarizedCallableBase c, string kind, string provenance, boolean isExact
@@ -110,7 +112,21 @@ module Input implements InputSig<Location, DataFlowImplSpecific::JavaDataFlow> {
 
 private import Make<Location, DataFlowImplSpecific::JavaDataFlow, Input> as Impl
 
-private module TypesInput implements Impl::Private::TypesInputSig {
+private module Input2 implements Impl::Private::InputSig2 {
+  private import codeql.util.Void
+
+  class SourceSinkReportingElement extends Void {
+    Location getLocation() { none() }
+
+    DataFlowCallable getEnclosingCallable() { none() }
+
+    SourceSinkReportingElement getASuccessor(Impl::Private::SummaryComponent sc) { none() }
+  }
+}
+
+private import Impl::Private::Make2<Input2> as Impl2
+
+private module TypesInput implements Impl2::TypesInputSig {
   DataFlowType getSyntheticGlobalType(Impl::Private::SyntheticGlobal sg) {
     exists(sg) and
     result instanceof TypeObject
@@ -138,27 +154,15 @@ private module TypesInput implements Impl::Private::TypesInputSig {
     exists(rk)
   }
 
-  DataFlowType getSourceType(Input::SourceBase source, Impl::Private::SummaryComponentStack s) {
-    none()
-  }
-
-  DataFlowType getSinkType(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
+  DataFlowType getSourceSinkType(Input2::SourceSinkReportingElement e) { none() }
 }
 
-private module StepsInput implements Impl::Private::StepsInputSig {
-  Impl::Private::SummaryNode getSummaryNode(Node n) {
-    result = n.(FlowSummaryNode).getSummaryNode()
-  }
+private module StepsInput implements Impl2::StepsInputSig {
+  Impl2::SummaryNode getSummaryNode(Node n) { result = n.(FlowSummaryNode).getSummaryNode() }
 
   DataFlowCall getACall(Public::SummarizedCallable sc) {
     sc = viableCallable(result).asSummarizedCallable()
   }
-
-  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
-
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
-
-  Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
 
 private predicate relatedArgSpec(Callable c, string spec) {
@@ -372,9 +376,10 @@ module SourceSinkInterpretationInput implements
 
 module Private {
   import Impl::Private
-  import Impl::Private::Types<TypesInput>
+  import Impl2
+  import Types<TypesInput>
 
-  module Steps = Impl::Private::Steps<StepsInput>;
+  module Steps = Impl2::Steps<StepsInput>;
 
   module External {
     import Impl::Private::External
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
index 019b507586f5..94dda4b64e08 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
@@ -239,53 +239,6 @@ final class UncertainWriteDefinition = Impl::UncertainWriteDefinition;
 
 final class PhiNode = Impl::PhiNode;
 
-deprecated predicate ssaExplicitUpdate(SsaUpdate def, VariableUpdate upd) {
-  exists(SsaSourceVariable v, BasicBlock bb, int i |
-    def.definesAt(v, bb, i) and
-    certainVariableUpdate(v, upd.getControlFlowNode(), bb, i) and
-    getDestVar(upd) = def.getSourceVariable()
-  )
-}
-
-deprecated predicate ssaUncertainImplicitUpdate(SsaImplicitUpdate def) {
-  exists(SsaSourceVariable v, BasicBlock bb, int i |
-    def.definesAt(v, bb, i) and
-    uncertainVariableUpdate(v, _, bb, i)
-  )
-}
-
-deprecated predicate ssaImplicitInit(WriteDefinition def) {
-  exists(SsaSourceVariable v, BasicBlock bb, int i |
-    def.definesAt(v, bb, i) and
-    hasEntryDef(v, bb) and
-    i = -1
-  )
-}
-
-/**
- * Holds if the SSA definition of `v` at `def` reaches `redef` without crossing another
- * SSA definition of `v`.
- */
-deprecated predicate ssaDefReachesUncertainDef(TrackedSsaDef def, SsaUncertainImplicitUpdate redef) {
-  Impl::uncertainWriteDefinitionInput(redef, def)
-}
-
-deprecated VarRead getAUse(Definition def) {
-  exists(SsaSourceVariable v, BasicBlock bb, int i |
-    Impl::ssaDefReachesRead(v, def, bb, i) and
-    result.getControlFlowNode() = bb.getNode(i) and
-    result = v.getAnAccess()
-  )
-}
-
-deprecated predicate ssaDefReachesEndOfBlock(BasicBlock bb, Definition def) {
-  Impl::ssaDefReachesEndOfBlock(bb, def, _)
-}
-
-deprecated predicate phiHasInputFromBlock(PhiNode phi, Definition inp, BasicBlock bb) {
-  Impl::phiHasInputFromBlock(phi, inp, bb)
-}
-
 cached
 private module Cached {
   /** Gets the destination variable of an update of a tracked variable. */
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
index dc6b075aed31..7cf0c3d536b3 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
@@ -145,8 +145,7 @@ private module Cached {
       )
     )
     or
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(src,
-      sink.(DataFlowPrivate::FlowSummaryNode).getSummaryNode(), false, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(src, sink, false, model)
   }
 
   /**
diff --git a/java/ql/lib/semmle/code/java/frameworks/Strings.qll b/java/ql/lib/semmle/code/java/frameworks/Strings.qll
new file mode 100644
index 000000000000..4b8600ab3ac3
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/frameworks/Strings.qll
@@ -0,0 +1,40 @@
+/** Definitions related to `java.lang.String`. */
+overlay[local?]
+module;
+
+private import java
+private import semmle.code.java.dataflow.FlowSummary
+
+/**
+ * A call to `String.valueOf(Object)` where the argument is a `CharSequence`,
+ * for example a `String` or a `StringBuilder`.
+ *
+ * Such a call is equivalent to calling `toString()` on the argument, which for
+ * a `CharSequence` is guaranteed to yield a string containing the characters of
+ * the argument, so taint is propagated. This is in contrast to `valueOf(Object)`
+ * calls in general, where `toString()` may not expose the state of the argument.
+ */
+private class StringValueOfCharSequence extends SyntheticCallable {
+  StringValueOfCharSequence() { this = "java.lang.String.valueOf(Object)+CharSequence" }
+
+  override MethodCall getACall() {
+    exists(Method m | m = result.getMethod().getSourceDeclaration() |
+      m.hasQualifiedName("java.lang", "String", "valueOf") and
+      m.getParameterType(0) instanceof TypeObject
+    ) and
+    result
+        .getArgument(0)
+        .getType()
+        .(RefType)
+        .getAnAncestor()
+        .hasQualifiedName("java.lang", "CharSequence")
+  }
+
+  override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+    input = "Argument[0]" and
+    output = "ReturnValue" and
+    preservesValue = false
+  }
+
+  override Type getReturnType() { result instanceof TypeString }
+}
diff --git a/java/ql/lib/semmle/code/java/frameworks/apache/CommonsXml.qll b/java/ql/lib/semmle/code/java/frameworks/apache/CommonsXml.qll
index 163bd773dad0..fa570b0b61ae 100644
--- a/java/ql/lib/semmle/code/java/frameworks/apache/CommonsXml.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/apache/CommonsXml.qll
@@ -90,3 +90,33 @@ private module SafeDigesterFlowConfig implements DataFlow::ConfigSig {
 }
 
 private module SafeDigesterFlow = DataFlow::Global<SafeDigesterFlowConfig>;
+
+/**
+ * A call to one of the static factory methods of the `org.apache.commons.xml.secure`
+ * `SecureXxxFactory` classes of the Apache Commons Secure XML library.
+ *
+ * These methods mirror the JAXP factory entry points (`newInstance`, `newDefaultInstance`,
+ * `newNSInstance`, `newFactory`, ...) and every one of them returns a fresh JAXP factory
+ * that has already been hardened against XML external entity (XXE) attacks, so any parser
+ * created from it is treated as safe.
+ *
+ * `SecureXPathFactory` is matched for completeness, but the XXE model has no `XPathFactory`
+ * safety chain (the XXE sink for XPath is the document being evaluated, not the factory),
+ * so it currently has no effect on XXE results.
+ */
+private class CommonsSecureXmlFactory extends SafeXmlFactorySource, MethodCall {
+  CommonsSecureXmlFactory() {
+    this.getMethod()
+        .getDeclaringType()
+        .hasQualifiedName("org.apache.commons.xml.secure",
+          [
+            "SecureDocumentBuilderFactory", "SecureSAXParserFactory", "SecureXMLInputFactory",
+            "SecureTransformerFactory", "SecureSchemaFactory", "SecureXPathFactory"
+          ]) and
+    this.getMethod()
+        .hasName([
+            "newDefaultInstance", "newDefaultNSInstance", "newInstance", "newNSInstance",
+            "newDefaultFactory", "newFactory"
+          ])
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/frameworks/apache/Lang.qll b/java/ql/lib/semmle/code/java/frameworks/apache/Lang.qll
index a58500eb20df..195b905df059 100644
--- a/java/ql/lib/semmle/code/java/frameworks/apache/Lang.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/apache/Lang.qll
@@ -47,3 +47,76 @@ class TypeApacheSystemUtils extends Class {
     this.hasQualifiedName(["org.apache.commons.lang", "org.apache.commons.lang3"], "SystemUtils")
   }
 }
+
+private predicate isStringLike(Type type) {
+  type.(RefType).hasQualifiedName("java.lang", ["String", "CharSequence"])
+}
+
+private predicate isCharacterSetType(Type type) {
+  isStringLike(type)
+  or
+  type.(Array).getElementType().(PrimitiveType).hasName("char")
+}
+
+/** A call to `StringUtils.contains` or `StringUtils.containsIgnoreCase`. */
+private class ApacheStringUtilsSubstringMatch extends MethodCall, StringSubstringMatch::Range {
+  ApacheStringUtilsSubstringMatch() {
+    this.getMethod()
+        .getDeclaringType()
+        .hasQualifiedName(["org.apache.commons.lang", "org.apache.commons.lang3"], "StringUtils") and
+    this.getMethod().hasName(["contains", "containsIgnoreCase"]) and
+    isStringLike(this.getMethod().getParameterType(1))
+  }
+
+  override Expr getInputString() { result = this.getArgument(0) }
+
+  override Expr getMatchExpression() { result = this.getArgument(1) }
+
+  override predicate hasSubstringOnBranch(boolean branch) { branch = true }
+
+  override string getName() { result = "StringUtils." + this.getMethod().getName() }
+}
+
+/** A call to `StringUtils.containsAny` or `StringUtils.containsNone`. */
+private class ApacheStringUtilsCharacterSetMatch extends MethodCall, StringCharacterSetMatch::Range {
+  ApacheStringUtilsCharacterSetMatch() {
+    this.getMethod()
+        .getDeclaringType()
+        .hasQualifiedName(["org.apache.commons.lang", "org.apache.commons.lang3"], "StringUtils") and
+    this.getMethod().hasName(["containsAny", "containsNone"]) and
+    isCharacterSetType(this.getMethod().getParameterType(1))
+  }
+
+  override Expr getInputString() { result = this.getArgument(0) }
+
+  override Expr getMatchExpression() { result = this.getArgument(1) }
+
+  override predicate hasMatchingCharacterOnBranch(boolean branch) {
+    this.getMethod().hasName("containsAny") and branch = true
+    or
+    this.getMethod().hasName("containsNone") and branch = false
+  }
+
+  override string getName() { result = "StringUtils." + this.getMethod().getName() }
+}
+
+/** A call to `StringUtils.replaceChars`. */
+private class ApacheStringUtilsReplaceCharsCall extends MethodCall, StringReplacement::Range {
+  ApacheStringUtilsReplaceCharsCall() {
+    this.getMethod()
+        .hasQualifiedName(["org.apache.commons.lang", "org.apache.commons.lang3"], "StringUtils",
+          "replaceChars")
+  }
+
+  override Expr getInputString() { result = this.getArgument(0) }
+
+  override Expr getMatchExpression() { result = this.getArgument(1) }
+
+  override Expr getReplacement() { result = this.getArgument(2) }
+
+  override predicate matchExpressionIsCharacterSet() {
+    this.getMethod().getParameterType(1) instanceof TypeString
+  }
+
+  override string getName() { result = "StringUtils.replaceChars" }
+}
diff --git a/java/ql/lib/semmle/code/java/frameworks/guava/Guava.qll b/java/ql/lib/semmle/code/java/frameworks/guava/Guava.qll
index 545aae763d55..6d0ece826e77 100644
--- a/java/ql/lib/semmle/code/java/frameworks/guava/Guava.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/guava/Guava.qll
@@ -6,3 +6,96 @@ module;
 
 import java
 import Collections
+private import semmle.code.java.dataflow.DataFlow
+
+private DataFlow::Node getALocalOriginNode(Expr expr) {
+  DataFlow::localFlow(result, DataFlow::exprNode(expr)) and
+  not DataFlow::localFlowStep(_, result)
+}
+
+private Expr getUniqueLocalOrigin(Expr expr) {
+  result = unique(DataFlow::Node src | src = getALocalOriginNode(expr)).asExpr()
+}
+
+/** A call to `CharMatcher.anyOf`. */
+private class CharMatcherAnyOfCall extends MethodCall {
+  CharMatcherAnyOfCall() {
+    this.getMethod().hasQualifiedName("com.google.common.base", "CharMatcher", "anyOf")
+  }
+}
+
+/** A call to `CharMatcher.noneOf`. */
+private class CharMatcherNoneOfCall extends MethodCall {
+  CharMatcherNoneOfCall() {
+    this.getMethod().hasQualifiedName("com.google.common.base", "CharMatcher", "noneOf")
+  }
+}
+
+/** A call that tests a string using a character-set `CharMatcher`. */
+private class CharMatcherCharacterSetMatch extends MethodCall, StringCharacterSetMatch::Range {
+  CharMatcherCharacterSetMatch() {
+    this.getMethod()
+        .hasQualifiedName("com.google.common.base", "CharMatcher",
+          ["matchesAllOf", "matchesAnyOf", "matchesNoneOf"]) and
+    (
+      this.getMethod().hasName(["matchesAnyOf", "matchesNoneOf"]) and
+      getUniqueLocalOrigin(this.getQualifier()) instanceof CharMatcherAnyOfCall
+      or
+      this.getMethod().hasName("matchesAllOf") and
+      getUniqueLocalOrigin(this.getQualifier()) instanceof CharMatcherNoneOfCall
+    )
+  }
+
+  override Expr getInputString() { result = this.getArgument(0) }
+
+  override Expr getMatchExpression() {
+    result = getUniqueLocalOrigin(this.getQualifier()).(MethodCall).getArgument(0)
+  }
+
+  override predicate hasMatchingCharacterOnBranch(boolean branch) {
+    this.getMethod().hasName("matchesAnyOf") and branch = true
+    or
+    this.getMethod().hasName("matchesNoneOf") and branch = false
+    or
+    this.getMethod().hasName("matchesAllOf") and
+    branch = false
+  }
+
+  override string getName() { result = "CharMatcher." + this.getMethod().getName() }
+}
+
+/** A call to `CharMatcher.replaceFrom`. */
+private class CharMatcherReplaceFromCall extends MethodCall, StringReplacement::Range {
+  CharMatcherReplaceFromCall() {
+    this.getMethod().hasQualifiedName("com.google.common.base", "CharMatcher", "replaceFrom")
+  }
+
+  override Expr getInputString() { result = this.getArgument(0) }
+
+  override Expr getMatchExpression() {
+    result = getUniqueLocalOrigin(this.getQualifier()).(CharMatcherAnyOfCall).getArgument(0)
+  }
+
+  override Expr getReplacement() { result = this.getArgument(1) }
+
+  override predicate matchExpressionIsCharacterSet() { any() }
+
+  override string getName() { result = "CharMatcher.replaceFrom" }
+}
+
+/** A call to `CharMatcher.removeFrom`. */
+private class CharMatcherRemoveFromCall extends MethodCall, StringRemoval::Range {
+  CharMatcherRemoveFromCall() {
+    this.getMethod().hasQualifiedName("com.google.common.base", "CharMatcher", "removeFrom")
+  }
+
+  override Expr getInputString() { result = this.getArgument(0) }
+
+  override Expr getMatchExpression() {
+    result = getUniqueLocalOrigin(this.getQualifier()).(CharMatcherAnyOfCall).getArgument(0)
+  }
+
+  override predicate matchExpressionIsCharacterSet() { any() }
+
+  override string getName() { result = "CharMatcher.removeFrom" }
+}
diff --git a/java/ql/lib/semmle/code/java/frameworks/micronaut/MicronautController.qll b/java/ql/lib/semmle/code/java/frameworks/micronaut/MicronautController.qll
new file mode 100644
index 000000000000..c0ca30d97995
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/frameworks/micronaut/MicronautController.qll
@@ -0,0 +1,136 @@
+/**
+ * Provides classes for identifying Micronaut HTTP controllers and their request handling methods.
+ */
+overlay[local?]
+module;
+
+import java
+
+/** An annotation type that identifies Micronaut controllers. */
+class MicronautControllerAnnotation extends AnnotationType {
+  MicronautControllerAnnotation() {
+    this.hasQualifiedName("io.micronaut.http.annotation", "Controller")
+  }
+}
+
+/**
+ * A class annotated as a Micronaut `@Controller`.
+ */
+class MicronautController extends Class {
+  MicronautController() {
+    this.getAnAnnotation().getType() instanceof MicronautControllerAnnotation
+  }
+}
+
+/** An annotation type that identifies Micronaut HTTP method mappings. */
+class MicronautHttpMethodAnnotation extends AnnotationType {
+  MicronautHttpMethodAnnotation() {
+    this.getPackage().hasName("io.micronaut.http.annotation") and
+    this.hasName([
+        "Get", "Post", "Put", "Delete", "Patch", "Head", "Options", "Trace", "CustomHttpMethod"
+      ])
+  }
+}
+
+/**
+ * A method on a Micronaut controller that is executed in response to an HTTP request.
+ */
+class MicronautRequestMappingMethod extends Method {
+  MicronautRequestMappingMethod() {
+    this.getDeclaringType() instanceof MicronautController and
+    this.getAnAnnotation().getType() instanceof MicronautHttpMethodAnnotation
+  }
+
+  /** Gets a request mapping parameter. */
+  MicronautRequestMappingParameter getARequestParameter() { result = this.getAParameter() }
+}
+
+/** A Micronaut annotation indicating remote user input from HTTP requests. */
+class MicronautHttpInputAnnotation extends Annotation {
+  MicronautHttpInputAnnotation() {
+    exists(AnnotationType a |
+      a = this.getType() and
+      a.getPackage().hasName("io.micronaut.http.annotation")
+    |
+      a.hasName([
+          "PathVariable", "QueryValue", "Body", "Header", "CookieValue", "Part", "RequestAttribute"
+        ])
+    )
+  }
+}
+
+/** Holds if `parameter` is explicitly bound to remote HTTP request data. */
+private predicate isExplicitlyTaintedInput(Parameter parameter) {
+  parameter.getAnAnnotation() instanceof MicronautHttpInputAnnotation
+  or
+  parameter.getAnAnnotation().getType() instanceof MicronautRequestBeanAnnotation
+  or
+  parameter
+      .getType()
+      .(RefType)
+      .getASourceSupertype*()
+      .hasQualifiedName("io.micronaut.http", ["HttpRequest", "HttpHeaders", "HttpParameters"])
+  or
+  parameter
+      .getType()
+      .(RefType)
+      .getASourceSupertype*()
+      .hasQualifiedName("io.micronaut.http.cookie", "Cookies")
+}
+
+/** A parameter of a `MicronautRequestMappingMethod`. */
+class MicronautRequestMappingParameter extends Parameter {
+  MicronautRequestMappingParameter() { this.getCallable() instanceof MicronautRequestMappingMethod }
+
+  /** Holds if the parameter should not be considered a direct source of taint. */
+  predicate isNotDirectlyTaintedInput() {
+    this.getType().(RefType).getAnAncestor().hasQualifiedName("io.micronaut.http", "HttpResponse")
+    or
+    this.getType().(RefType).getAnAncestor().hasQualifiedName("java.security", "Principal")
+    or
+    this.getType().(RefType).getAnAncestor().hasQualifiedName("java.util", "Locale")
+    or
+    this.getType().(RefType).getAnAncestor().hasQualifiedName("java.util", "TimeZone")
+    or
+    this.getType().(RefType).getAnAncestor().hasQualifiedName("java.time", "ZoneId")
+    or
+    this.getType().(RefType).getAnAncestor() instanceof TypeInputStream
+    or
+    this.getType().(RefType).getAnAncestor().hasQualifiedName("java.io", "Reader")
+    or
+    // @Value/@Property parameters are configuration injection, not HTTP input
+    this.getAnAnnotation()
+        .getType()
+        .hasQualifiedName("io.micronaut.context.annotation", ["Value", "Property"])
+  }
+
+  /** Holds if the input is tainted (i.e. comes from user-controlled input). */
+  predicate isTaintedInput() {
+    isExplicitlyTaintedInput(this)
+    or
+    not this.isNotDirectlyTaintedInput()
+  }
+}
+
+/** An annotation type that identifies Micronaut error handler methods. */
+class MicronautErrorAnnotation extends AnnotationType {
+  MicronautErrorAnnotation() { this.hasQualifiedName("io.micronaut.http.annotation", "Error") }
+}
+
+/** A method annotated with Micronaut's `@Error` that handles exceptions. */
+class MicronautErrorHandler extends Method {
+  MicronautErrorHandler() { this.getAnAnnotation().getType() instanceof MicronautErrorAnnotation }
+
+  /** Gets a parameter that carries user-controlled request data. */
+  Parameter getARemoteParameter() {
+    result = this.getAParameter() and
+    isExplicitlyTaintedInput(result)
+  }
+}
+
+/** An annotation type that identifies Micronaut request bean parameters. */
+class MicronautRequestBeanAnnotation extends AnnotationType {
+  MicronautRequestBeanAnnotation() {
+    this.hasQualifiedName("io.micronaut.http.annotation", "RequestBean")
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/frameworks/micronaut/MicronautData.qll b/java/ql/lib/semmle/code/java/frameworks/micronaut/MicronautData.qll
new file mode 100644
index 000000000000..0ae6f1e516f9
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/frameworks/micronaut/MicronautData.qll
@@ -0,0 +1,32 @@
+/** Provides classes for identifying Micronaut Data repositories and query annotations. */
+overlay[local?]
+module;
+
+import java
+
+/**
+ * The annotation type `@Query` from `io.micronaut.data.annotation`.
+ */
+class MicronautQueryAnnotation extends AnnotationType {
+  MicronautQueryAnnotation() { this.hasQualifiedName("io.micronaut.data.annotation", "Query") }
+}
+
+/**
+ * The annotation type `@Repository` from `io.micronaut.data.annotation`.
+ */
+class MicronautRepositoryAnnotation extends AnnotationType {
+  MicronautRepositoryAnnotation() {
+    this.hasQualifiedName("io.micronaut.data.annotation", "Repository")
+  }
+}
+
+/**
+ * A class annotated with Micronaut's `@Repository` annotation.
+ */
+class MicronautRepositoryClass extends RefType {
+  MicronautRepositoryClass() {
+    this.getAnAnnotation().getType() instanceof MicronautRepositoryAnnotation
+    or
+    this.getAnAncestor().hasQualifiedName("io.micronaut.data.repository", "GenericRepository")
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/frameworks/micronaut/MicronautSecurity.qll b/java/ql/lib/semmle/code/java/frameworks/micronaut/MicronautSecurity.qll
new file mode 100644
index 000000000000..299d64a246e0
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/frameworks/micronaut/MicronautSecurity.qll
@@ -0,0 +1,38 @@
+/**
+ * Provides classes for identifying Micronaut Security annotations.
+ *
+ * Micronaut Security provides the `@Secured` annotation and integrates
+ * with standard `@RolesAllowed` for method-level access control.
+ */
+overlay[local?]
+module;
+
+import java
+
+/**
+ * The annotation type `@Secured` from `io.micronaut.security.annotation`.
+ */
+class MicronautSecuredAnnotation extends AnnotationType {
+  MicronautSecuredAnnotation() {
+    this.hasQualifiedName("io.micronaut.security.annotation", "Secured")
+  }
+}
+
+/**
+ * A callable (method or constructor) that is annotated with Micronaut's `@Secured`
+ * annotation, either directly or via its declaring type.
+ */
+class MicronautSecuredCallable extends Callable {
+  MicronautSecuredCallable() {
+    this.getAnAnnotation().getType() instanceof MicronautSecuredAnnotation
+    or
+    this.getDeclaringType().getAnAnnotation().getType() instanceof MicronautSecuredAnnotation
+  }
+}
+
+/**
+ * A class annotated with Micronaut's `@Secured` annotation.
+ */
+class MicronautSecuredClass extends Class {
+  MicronautSecuredClass() { this.getAnAnnotation().getType() instanceof MicronautSecuredAnnotation }
+}
diff --git a/java/ql/lib/semmle/code/java/frameworks/micronaut/MicronautWebSocket.qll b/java/ql/lib/semmle/code/java/frameworks/micronaut/MicronautWebSocket.qll
new file mode 100644
index 000000000000..8f4fdfb58f30
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/frameworks/micronaut/MicronautWebSocket.qll
@@ -0,0 +1,53 @@
+/** Provides classes for identifying Micronaut WebSocket endpoints. */
+overlay[local?]
+module;
+
+import java
+
+/**
+ * The annotation type `@ServerWebSocket` from `io.micronaut.websocket.annotation`.
+ */
+class MicronautServerWebSocketAnnotation extends AnnotationType {
+  MicronautServerWebSocketAnnotation() {
+    this.hasQualifiedName("io.micronaut.websocket.annotation", "ServerWebSocket")
+  }
+}
+
+/**
+ * A class annotated with `@ServerWebSocket`, representing a Micronaut WebSocket endpoint.
+ */
+class MicronautServerWebSocketClass extends Class {
+  MicronautServerWebSocketClass() {
+    this.getAnAnnotation().getType() instanceof MicronautServerWebSocketAnnotation
+  }
+}
+
+/** An annotation type for Micronaut WebSocket message handler methods. */
+class MicronautWebSocketHandlerAnnotation extends AnnotationType {
+  MicronautWebSocketHandlerAnnotation() {
+    this.getPackage().hasName("io.micronaut.websocket.annotation") and
+    this.hasName(["OnClose", "OnMessage", "OnOpen"])
+  }
+}
+
+/**
+ * A method on a Micronaut `@ServerWebSocket` class that handles WebSocket messages.
+ */
+class MicronautWebSocketMessageHandler extends Method {
+  MicronautWebSocketMessageHandler() {
+    this.getDeclaringType() instanceof MicronautServerWebSocketClass and
+    this.getAnAnnotation().getType() instanceof MicronautWebSocketHandlerAnnotation
+  }
+}
+
+/** A parameter of a Micronaut WebSocket message handler that receives user-controlled data. */
+class MicronautWebSocketParameter extends Parameter {
+  MicronautWebSocketParameter() {
+    this.getCallable() instanceof MicronautWebSocketMessageHandler and
+    // Exclude framework-provided WebSocket lifecycle parameters
+    not this.getType()
+        .(RefType)
+        .getAnAncestor()
+        .hasQualifiedName("io.micronaut.websocket", ["CloseReason", "WebSocketSession"])
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/security/ConstantValueSanitizer.qll b/java/ql/lib/semmle/code/java/security/ConstantValueSanitizer.qll
new file mode 100644
index 000000000000..46020585d0e1
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/security/ConstantValueSanitizer.qll
@@ -0,0 +1,350 @@
+/** Provides a default taint sanitizer identifying checks against compile-time constants. */
+overlay[local?]
+module;
+
+import java
+private import codeql.typeflow.UniversalFlow as UniversalFlow
+private import semmle.code.java.Collections
+private import semmle.code.java.controlflow.Guards
+private import semmle.code.java.dataflow.internal.BaseSSA as Base
+private import semmle.code.java.dataflow.NullGuards
+private import semmle.code.java.dataflow.TaintTracking
+private import semmle.code.java.dataflow.TypeFlow
+private import semmle.code.java.dispatch.VirtualDispatch
+
+private class FlowNode = FlowStepsInput::FlowNode;
+
+/**
+ * Holds if `n2` is an unmodifiable collection constructed from input `n1`,
+ * which is either another collection or a number of elements.
+ */
+private predicate unmodifiableCollectionStep(FlowNode n1, FlowNode n2) {
+  exists(Call c, Callable tgt |
+    n2.asExpr() = c and
+    n1.asExpr() = c.getAnArgument() and
+    c.getCallee().getSourceDeclaration() = tgt
+  |
+    tgt.hasQualifiedName("java.util", "Collections",
+      ["unmodifiableCollection", "unmodifiableList", "unmodifiableSet"])
+    or
+    tgt.hasQualifiedName("java.util", ["List", "Set"], ["copyOf", "of"])
+    or
+    tgt.hasQualifiedName("com.google.common.collect", ["ImmutableList", "ImmutableSet"],
+      ["copyOf", "of"])
+  )
+}
+
+/**
+ * Holds if `n2` is a collection or array constructed from input `n1`, which is
+ * either a collection, an array, or a number of elements.
+ */
+private predicate collectionStep(FlowNode n1, FlowNode n2) {
+  n2.asExpr().(ArrayInit).getAnInit() = n1.asExpr()
+  or
+  n2.asExpr().(ArrayCreationExpr).getInit() = n1.asExpr()
+  or
+  unmodifiableCollectionStep(n1, n2)
+  or
+  exists(Call c, Callable tgt |
+    n2.asExpr() = c and
+    n1.asExpr() = c.getAnArgument() and
+    c.getCallee().getSourceDeclaration() = tgt
+  |
+    tgt.hasQualifiedName("java.util", "Arrays", "asList")
+    or
+    tgt.isStatic() and
+    tgt.hasName(["copyOf", "of"]) and
+    tgt.getDeclaringType().getASourceSupertype+().hasQualifiedName("java.util", "Collection")
+    or
+    tgt instanceof Constructor and
+    tgt.getNumberOfParameters() = 1 and
+    tgt.getParameterType(0) instanceof CollectionType and
+    tgt.getDeclaringType() instanceof CollectionType
+  )
+}
+
+private module BaseUniversalFlow = UniversalFlow::Make<Location, FlowStepsInput>;
+
+private module UnmodifiableProp implements BaseUniversalFlow::NullaryPropertySig {
+  predicate hasPropertyBase(FlowNode n) { unmodifiableCollectionStep(_, n) }
+}
+
+/** Holds if the given node is an unmodifiable collection. */
+private predicate unmodifiableCollection =
+  BaseUniversalFlow::FlowNullary<UnmodifiableProp>::hasProperty/1;
+
+/**
+ * Holds if `v` is a collection or array with an access, `coll`, at which the
+ * element `e` gets added.
+ */
+private predicate collectionAddition(Variable v, VarAccess coll, Expr e) {
+  exists(MethodCall mc, Method m, int arg |
+    mc.getMethod().getSourceDeclaration().overridesOrInstantiates*(m) and
+    mc.getQualifier() = coll and
+    v.getAnAccess() = coll and
+    mc.getArgument(arg) = e
+  |
+    m.hasQualifiedName("java.util", "Collection", ["add", "addAll"]) and
+    m.getNumberOfParameters() = 1 and
+    arg = 0
+    or
+    m.hasQualifiedName("java.util", "List", ["add", "addAll"]) and
+    m.getNumberOfParameters() = 2 and
+    arg = 1
+    or
+    m.hasQualifiedName("java.util", "SequencedCollection", ["addFirst", "addLast"]) and
+    m.getNumberOfParameters() = 1 and
+    arg = 0
+  )
+  or
+  v.getAnAccess() = coll and
+  exists(Assignment assign | assign.getSource() = e |
+    coll = assign.getDest().(ArrayAccess).getArray()
+  )
+}
+
+/**
+ * Holds if `n` represents a definition of `v` and `v` is a collection or
+ * array that has additions occurring as side-effects after its definition.
+ */
+private predicate nodeWithAddition(FlowNode n, Variable v) {
+  collectionAddition(v, _, _) and
+  (
+    n.asField() = v
+    or
+    n.asSsa().getSourceVariable().getVariable() = v and
+    n.asSsa() instanceof Base::SsaExplicitWrite
+  )
+}
+
+/** Holds if `c` does not add elements to the given collection. */
+private predicate safeCallable(Callable c) {
+  c instanceof CollectionQueryMethod
+  or
+  c instanceof CollectionMethod and
+  c.hasName(["clear", "remove", "removeAll", "stream", "iterator", "toArray"])
+  or
+  c.hasQualifiedName("org.apache.commons.lang3", "StringUtils", "join")
+}
+
+/**
+ * Holds if `n` might be mutated in ways that adds elements that are not
+ * tracked by the `collectionAddition` predicate.
+ */
+private predicate collectionWithPossibleMutation(FlowNode n) {
+  not unmodifiableCollection(n) and
+  (
+    exists(Expr e |
+      n.asExpr() = e and
+      (e.getType() instanceof CollectionType or e.getType() instanceof Array) and
+      not collectionAddition(_, e, _) and
+      not collectionStep(n, _)
+    |
+      exists(ArrayAccess aa | e = aa.getArray())
+      or
+      exists(Call c, Callable tgt | c.getAnArgument() = e or c.getQualifier() = e |
+        tgt = c.getCallee().getSourceDeclaration() and
+        not safeCallable(tgt)
+      )
+    )
+    or
+    exists(FlowNode mid |
+      FlowStepsInput::step(n, mid) and
+      collectionWithPossibleMutation(mid)
+    )
+  )
+}
+
+/** Holds if `n` is a collection constructed by an API that rejects null elements. */
+private predicate nullRejectingCollectionCreation(FlowNode n) {
+  exists(Call c, Callable tgt |
+    n.asExpr() = c and
+    c.getCallee().getSourceDeclaration() = tgt
+  |
+    tgt.hasQualifiedName("java.util", ["List", "Set"], ["copyOf", "of"])
+    or
+    tgt.hasQualifiedName("com.google.common.collect", ["ImmutableList", "ImmutableSet"],
+      ["copyOf", "of"])
+  )
+}
+
+private module NullRejectingCollectionProp implements BaseUniversalFlow::NullaryPropertySig {
+  predicate hasPropertyBase(FlowNode n) { nullRejectingCollectionCreation(n) }
+
+  predicate barrier = collectionWithPossibleMutation/1;
+}
+
+/** Holds if the given collection cannot contain null. */
+private predicate nullRejectingCollection =
+  BaseUniversalFlow::FlowNullary<NullRejectingCollectionProp>::hasProperty/1;
+
+/**
+ * A collection constructor that constructs an empty mutable collection.
+ */
+private class EmptyCollectionConstructor extends Constructor {
+  EmptyCollectionConstructor() {
+    this.getDeclaringType() instanceof CollectionType and
+    forall(Type t | t = this.getAParamType() | t instanceof PrimitiveType)
+  }
+}
+
+private module CollectionFlowStepsInput implements UniversalFlow::UniversalFlowInput<Location> {
+  import FlowStepsInput
+
+  predicate getFlowNodeId = FlowStepsInput::getFlowNodeId/1;
+
+  /**
+   * Holds if `n2` is a collection/array/constant whose value(s) are
+   * determined completely from the range of `n1` nodes.
+   */
+  predicate step(FlowNode n1, FlowNode n2) {
+    // Exclude the regular input constraints for those nodes that are covered
+    // completely by `collectionStep`.
+    FlowStepsInput::step(n1, n2) and
+    not collectionStep(_, n2)
+    or
+    // For collections with side-effects in the form of additions, we add the
+    // sources of those additions as additional input that need to originate
+    // from constants.
+    exists(Variable v |
+      nodeWithAddition(n2, v) and
+      collectionAddition(v, _, n1.asExpr())
+    )
+    or
+    // Include various forms of collection transformation.
+    collectionStep(n1, n2)
+  }
+
+  predicate isExcludedFromNullAnalysis = FlowStepsInput::isExcludedFromNullAnalysis/1;
+}
+
+private module CollectionUniversalFlow = UniversalFlow::Make<Location, CollectionFlowStepsInput>;
+
+private module ConstantCollectionProp implements CollectionUniversalFlow::NullaryPropertySig {
+  /**
+   * Holds if `n` forms the base case for finding collections of constants.
+   * These are individual constants and empty collections.
+   */
+  predicate hasPropertyBase(FlowNode n) {
+    n.asExpr().isCompileTimeConstant() or
+    n.asExpr().(ConstructorCall).getConstructor() instanceof EmptyCollectionConstructor
+  }
+
+  predicate barrier = collectionWithPossibleMutation/1;
+}
+
+/**
+ * Holds if the given node is either a constant or a collection/array of
+ * constants.
+ */
+private predicate constantCollection =
+  CollectionUniversalFlow::FlowNullary<ConstantCollectionProp>::hasProperty/1;
+
+/** Gets the result of a case normalization call of `arg`. */
+private MethodCall normalizeCaseCall(Expr arg) {
+  exists(Method changecase | result.getMethod() = changecase |
+    changecase.hasName(["toUpperCase", "toLowerCase"]) and
+    changecase.getDeclaringType() instanceof TypeString and
+    arg = result.getQualifier()
+    or
+    changecase
+        .hasQualifiedName(["org.apache.commons.lang", "org.apache.commons.lang3"], "StringUtils",
+          ["lowerCase", "upperCase"]) and
+    arg = result.getArgument(0)
+    or
+    changecase
+        .hasQualifiedName("org.apache.hadoop.util", "StringUtils", ["toLowerCase", "toUpperCase"]) and
+    arg = result.getArgument(0)
+  )
+}
+
+/**
+ * Holds if the guard `g` ensures that the expression `e` is one of a set of
+ * known constants upon evaluating to `branch`.
+ */
+private predicate constantCollectionContainsCall(
+  MethodCall contains, FlowNode collection, Expr checked
+) {
+  exists(Method m, FlowNode n |
+    contains.getMethod().getSourceDeclaration().overridesOrInstantiates*(m) and
+    m.hasQualifiedName("java.util", "Collection", "contains") and
+    n.asExpr() = contains.getQualifier() and
+    constantCollection(n) and
+    checked = contains.getAnArgument() and
+    collection = n
+  )
+}
+
+private predicate constantCollectionContainsCheck(Guard g, Expr e, boolean branch) {
+  exists(Expr checked | checked = e or checked = normalizeCaseCall(e) |
+    constantCollectionContainsCall(g, _, checked) and
+    branch = true
+  )
+}
+
+/**
+ * Holds if the guard `g` ensures that the string expression `e` equals a compile-time constant
+ * upon evaluating to `branch`.
+ */
+private predicate constantStringEqualityCheck(Guard g, Expr e, boolean branch) {
+  exists(MethodCall comparison, Expr constant |
+    g = comparison and
+    comparison.getMethod().getDeclaringType() instanceof TypeString and
+    comparison.getMethod().hasName(["equals", "equalsIgnoreCase"]) and
+    branch = true and
+    (
+      e = comparison.getQualifier() and constant = comparison.getArgument(0)
+      or
+      e = comparison.getArgument(0) and constant = comparison.getQualifier()
+    ) and
+    exists(constant.(CompileTimeConstantExpr).getStringValue())
+  )
+}
+
+/**
+ * Holds if the guard `g` ensures that the expression `e` is one of a set of compile-time constants
+ * upon evaluating to `branch`.
+ */
+predicate constantValueGuardChecks(Guard g, Expr e, boolean branch) {
+  constantStringEqualityCheck(g, e, branch)
+  or
+  constantCollectionContainsCheck(g, e, branch)
+}
+
+/**
+ * Holds if `g` ensures that `e` is a non-null member of a set of compile-time constants upon
+ * evaluating to `branch`.
+ */
+predicate nonNullConstantValueGuardChecks(Guard g, Expr e, boolean branch) {
+  constantStringEqualityCheck(g, e, branch)
+  or
+  exists(FlowNode collection, Expr checked |
+    constantCollectionContainsCall(g, collection, checked) and
+    branch = true
+  |
+    checked = e and
+    (
+      nullRejectingCollection(collection)
+      or
+      e = clearlyNotNullExpr()
+    )
+    or
+    checked = normalizeCaseCall(e) and
+    (
+      nullRejectingCollection(collection)
+      or
+      checked.(MethodCall).getQualifier() = e
+      or
+      e = clearlyNotNullExpr()
+    )
+  )
+}
+
+/**
+ * A check against compile-time constants, sanitizing taint by restricting a value to a known set.
+ */
+private class ConstantValueSanitizerGuard extends TaintTracking::DefaultTaintSanitizer {
+  ConstantValueSanitizerGuard() {
+    this = DataFlow::BarrierGuard<constantValueGuardChecks/3>::getABarrierNode()
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/security/Encryption.qll b/java/ql/lib/semmle/code/java/security/Encryption.qll
index 6af8d29cc4a1..f4e218c981e6 100644
--- a/java/ql/lib/semmle/code/java/security/Encryption.qll
+++ b/java/ql/lib/semmle/code/java/security/Encryption.qll
@@ -271,19 +271,15 @@ string getASecureAlgorithmName() {
 
 private string rankedSecureAlgorithm(int i) { result = rank[i](getASecureAlgorithmName()) }
 
-private string secureAlgorithmString(int i) {
-  i = 1 and result = rankedSecureAlgorithm(i)
-  or
-  result = rankedSecureAlgorithm(i) + "|" + secureAlgorithmString(i - 1)
+private string secureAlgorithmString() {
+  result = concat(int i | | rankedSecureAlgorithm(i), "|" order by i desc)
 }
 
 /**
  * Gets a regular expression for matching strings that look like they
  * contain an algorithm that is known to be secure.
  */
-string getSecureAlgorithmRegex() {
-  result = algorithmRegex(secureAlgorithmString(max(int i | exists(rankedSecureAlgorithm(i)))))
-}
+string getSecureAlgorithmRegex() { result = algorithmRegex(secureAlgorithmString()) }
 
 /**
  * Any use of a cryptographic element that specifies an encryption
diff --git a/java/ql/lib/semmle/code/java/security/ListOfConstantsSanitizer.qll b/java/ql/lib/semmle/code/java/security/ListOfConstantsSanitizer.qll
deleted file mode 100644
index b00c5c99405a..000000000000
--- a/java/ql/lib/semmle/code/java/security/ListOfConstantsSanitizer.qll
+++ /dev/null
@@ -1,267 +0,0 @@
-/**
- * Provides a default taint sanitizer identifying comparisons against lists of
- * compile-time constants.
- */
-overlay[local?]
-module;
-
-import java
-private import codeql.typeflow.UniversalFlow as UniversalFlow
-private import semmle.code.java.Collections
-private import semmle.code.java.controlflow.Guards
-private import semmle.code.java.dataflow.internal.BaseSSA as Base
-private import semmle.code.java.dataflow.TaintTracking
-private import semmle.code.java.dataflow.TypeFlow
-private import semmle.code.java.dispatch.VirtualDispatch
-
-private class FlowNode = FlowStepsInput::FlowNode;
-
-/**
- * Holds if `n2` is an unmodifiable collection constructed from input `n1`,
- * which is either another collection or a number of elements.
- */
-private predicate unmodifiableCollectionStep(FlowNode n1, FlowNode n2) {
-  exists(Call c, Callable tgt |
-    n2.asExpr() = c and
-    n1.asExpr() = c.getAnArgument() and
-    c.getCallee().getSourceDeclaration() = tgt
-  |
-    tgt.hasQualifiedName("java.util", "Collections",
-      ["unmodifiableCollection", "unmodifiableList", "unmodifiableSet"])
-    or
-    tgt.hasQualifiedName("java.util", ["List", "Set"], ["copyOf", "of"])
-    or
-    tgt.hasQualifiedName("com.google.common.collect", ["ImmutableList", "ImmutableSet"],
-      ["copyOf", "of"])
-  )
-}
-
-/**
- * Holds if `n2` is a collection or array constructed from input `n1`, which is
- * either a collection, an array, or a number of elements.
- */
-private predicate collectionStep(FlowNode n1, FlowNode n2) {
-  n2.asExpr().(ArrayInit).getAnInit() = n1.asExpr()
-  or
-  n2.asExpr().(ArrayCreationExpr).getInit() = n1.asExpr()
-  or
-  unmodifiableCollectionStep(n1, n2)
-  or
-  exists(Call c, Callable tgt |
-    n2.asExpr() = c and
-    n1.asExpr() = c.getAnArgument() and
-    c.getCallee().getSourceDeclaration() = tgt
-  |
-    tgt.hasQualifiedName("java.util", "Arrays", "asList")
-    or
-    tgt.isStatic() and
-    tgt.hasName(["copyOf", "of"]) and
-    tgt.getDeclaringType().getASourceSupertype+().hasQualifiedName("java.util", "Collection")
-    or
-    tgt instanceof Constructor and
-    tgt.getNumberOfParameters() = 1 and
-    tgt.getParameterType(0) instanceof CollectionType and
-    tgt.getDeclaringType() instanceof CollectionType
-  )
-}
-
-private module BaseUniversalFlow = UniversalFlow::Make<Location, FlowStepsInput>;
-
-private module UnmodifiableProp implements BaseUniversalFlow::NullaryPropertySig {
-  predicate hasPropertyBase(FlowNode n) { unmodifiableCollectionStep(_, n) }
-}
-
-/** Holds if the given node is an unmodifiable collection. */
-private predicate unmodifiableCollection =
-  BaseUniversalFlow::FlowNullary<UnmodifiableProp>::hasProperty/1;
-
-/**
- * Holds if `v` is a collection or array with an access, `coll`, at which the
- * element `e` gets added.
- */
-private predicate collectionAddition(Variable v, VarAccess coll, Expr e) {
-  exists(MethodCall mc, Method m, int arg |
-    mc.getMethod().getSourceDeclaration().overridesOrInstantiates*(m) and
-    mc.getQualifier() = coll and
-    v.getAnAccess() = coll and
-    mc.getArgument(arg) = e
-  |
-    m.hasQualifiedName("java.util", "Collection", ["add", "addAll"]) and
-    m.getNumberOfParameters() = 1 and
-    arg = 0
-    or
-    m.hasQualifiedName("java.util", "List", ["add", "addAll"]) and
-    m.getNumberOfParameters() = 2 and
-    arg = 1
-    or
-    m.hasQualifiedName("java.util", "SequencedCollection", ["addFirst", "addLast"]) and
-    m.getNumberOfParameters() = 1 and
-    arg = 0
-  )
-  or
-  v.getAnAccess() = coll and
-  exists(Assignment assign | assign.getSource() = e |
-    coll = assign.getDest().(ArrayAccess).getArray()
-  )
-}
-
-/**
- * Holds if `n` represents a definition of `v` and `v` is a collection or
- * array that has additions occurring as side-effects after its definition.
- */
-private predicate nodeWithAddition(FlowNode n, Variable v) {
-  collectionAddition(v, _, _) and
-  (
-    n.asField() = v
-    or
-    n.asSsa().getSourceVariable().getVariable() = v and
-    n.asSsa() instanceof Base::SsaExplicitWrite
-  )
-}
-
-/** Holds if `c` does not add elements to the given collection. */
-private predicate safeCallable(Callable c) {
-  c instanceof CollectionQueryMethod
-  or
-  c instanceof CollectionMethod and
-  c.hasName(["clear", "remove", "removeAll", "stream", "iterator", "toArray"])
-  or
-  c.hasQualifiedName("org.apache.commons.lang3", "StringUtils", "join")
-}
-
-/**
- * Holds if `n` might be mutated in ways that adds elements that are not
- * tracked by the `collectionAddition` predicate.
- */
-private predicate collectionWithPossibleMutation(FlowNode n) {
-  not unmodifiableCollection(n) and
-  (
-    exists(Expr e |
-      n.asExpr() = e and
-      (e.getType() instanceof CollectionType or e.getType() instanceof Array) and
-      not collectionAddition(_, e, _) and
-      not collectionStep(n, _)
-    |
-      exists(ArrayAccess aa | e = aa.getArray())
-      or
-      exists(Call c, Callable tgt | c.getAnArgument() = e or c.getQualifier() = e |
-        tgt = c.getCallee().getSourceDeclaration() and
-        not safeCallable(tgt)
-      )
-    )
-    or
-    exists(FlowNode mid |
-      FlowStepsInput::step(n, mid) and
-      collectionWithPossibleMutation(mid)
-    )
-  )
-}
-
-/**
- * A collection constructor that constructs an empty mutable collection.
- */
-private class EmptyCollectionConstructor extends Constructor {
-  EmptyCollectionConstructor() {
-    this.getDeclaringType() instanceof CollectionType and
-    forall(Type t | t = this.getAParamType() | t instanceof PrimitiveType)
-  }
-}
-
-private module CollectionFlowStepsInput implements UniversalFlow::UniversalFlowInput<Location> {
-  import FlowStepsInput
-
-  predicate getFlowNodeId = FlowStepsInput::getFlowNodeId/1;
-
-  /**
-   * Holds if `n2` is a collection/array/constant whose value(s) are
-   * determined completely from the range of `n1` nodes.
-   */
-  predicate step(FlowNode n1, FlowNode n2) {
-    // Exclude the regular input constraints for those nodes that are covered
-    // completely by `collectionStep`.
-    FlowStepsInput::step(n1, n2) and
-    not collectionStep(_, n2)
-    or
-    // For collections with side-effects in the form of additions, we add the
-    // sources of those additions as additional input that need to originate
-    // from constants.
-    exists(Variable v |
-      nodeWithAddition(n2, v) and
-      collectionAddition(v, _, n1.asExpr())
-    )
-    or
-    // Include various forms of collection transformation.
-    collectionStep(n1, n2)
-  }
-
-  predicate isExcludedFromNullAnalysis = FlowStepsInput::isExcludedFromNullAnalysis/1;
-}
-
-private module CollectionUniversalFlow = UniversalFlow::Make<Location, CollectionFlowStepsInput>;
-
-private module ConstantCollectionProp implements CollectionUniversalFlow::NullaryPropertySig {
-  /**
-   * Holds if `n` forms the base case for finding collections of constants.
-   * These are individual constants and empty collections.
-   */
-  predicate hasPropertyBase(FlowNode n) {
-    n.asExpr().isCompileTimeConstant() or
-    n.asExpr().(ConstructorCall).getConstructor() instanceof EmptyCollectionConstructor
-  }
-
-  predicate barrier = collectionWithPossibleMutation/1;
-}
-
-/**
- * Holds if the given node is either a constant or a collection/array of
- * constants.
- */
-private predicate constantCollection =
-  CollectionUniversalFlow::FlowNullary<ConstantCollectionProp>::hasProperty/1;
-
-/** Gets the result of a case normalization call of `arg`. */
-private MethodCall normalizeCaseCall(Expr arg) {
-  exists(Method changecase | result.getMethod() = changecase |
-    changecase.hasName(["toUpperCase", "toLowerCase"]) and
-    changecase.getDeclaringType() instanceof TypeString and
-    arg = result.getQualifier()
-    or
-    changecase
-        .hasQualifiedName(["org.apache.commons.lang", "org.apache.commons.lang3"], "StringUtils",
-          ["lowerCase", "upperCase"]) and
-    arg = result.getArgument(0)
-    or
-    changecase
-        .hasQualifiedName("org.apache.hadoop.util", "StringUtils", ["toLowerCase", "toUpperCase"]) and
-    arg = result.getArgument(0)
-  )
-}
-
-/**
- * Holds if the guard `g` ensures that the expression `e` is one of a set of
- * known constants upon evaluating to `branch`.
- */
-private predicate constantCollectionContainsCheck(Guard g, Expr e, boolean branch) {
-  exists(MethodCall mc, Method m, FlowNode n, Expr checked |
-    g = mc and
-    mc.getMethod().getSourceDeclaration().overridesOrInstantiates*(m) and
-    m.hasQualifiedName("java.util", "Collection", "contains") and
-    n.asExpr() = mc.getQualifier() and
-    constantCollection(n) and
-    checked = mc.getAnArgument() and
-    branch = true
-  |
-    checked = e or
-    checked = normalizeCaseCall(e)
-  )
-}
-
-/**
- * A comparison against a list of compile-time constants, sanitizing taint by
- * restricting to a set of known values.
- */
-private class ListOfConstantsComparisonSanitizerGuard extends TaintTracking::DefaultTaintSanitizer {
-  ListOfConstantsComparisonSanitizerGuard() {
-    this = DataFlow::BarrierGuard<constantCollectionContainsCheck/3>::getABarrierNode()
-  }
-}
diff --git a/java/ql/lib/semmle/code/java/security/LogInjection.qll b/java/ql/lib/semmle/code/java/security/LogInjection.qll
index 0a670c41ae47..350f2123f8cd 100644
--- a/java/ql/lib/semmle/code/java/security/LogInjection.qll
+++ b/java/ql/lib/semmle/code/java/security/LogInjection.qll
@@ -36,6 +36,10 @@ private class DefaultLogInjectionSink extends LogInjectionSink {
 private class DefaultLogInjectionSanitizer extends LogInjectionSanitizer instanceof SimpleTypeSanitizer
 { }
 
+private class ExternalLogInjectionSanitizer extends LogInjectionSanitizer {
+  ExternalLogInjectionSanitizer() { barrierNode(this, "log-injection") }
+}
+
 private class LineBreaksLogInjectionSanitizer extends LogInjectionSanitizer {
   LineBreaksLogInjectionSanitizer() {
     logInjectionSanitizer(this.asExpr())
@@ -44,23 +48,55 @@ private class LineBreaksLogInjectionSanitizer extends LogInjectionSanitizer {
   }
 }
 
-private predicate stringMethodCall(
-  MethodCall mc, CompileTimeConstantExpr arg0, CompileTimeConstantExpr arg1
-) {
-  mc.getMethod().getDeclaringType() instanceof TypeString and
-  arg0 = mc.getArgument(0) and
-  arg1 = mc.getArgument(1)
+bindingset[match]
+pragma[inline_late]
+private predicate stringOrCharValueMatches(CompileTimeConstantExpr const, string match) {
+  const.getStringOrCharValue().matches(match)
 }
 
-private predicate stringMethodArgument(CompileTimeConstantExpr arg) {
-  stringMethodCall(_, arg, _) or stringMethodCall(_, _, arg)
+private predicate containsLineBreak(CompileTimeConstantExpr const) {
+  stringOrCharValueMatches(const, ["%\n%", "%\r%"])
 }
 
-bindingset[match]
-pragma[inline_late]
-private predicate stringMethodArgumentValueMatches(CompileTimeConstantExpr const, string match) {
-  stringMethodArgument(const) and
-  const.getStringValue().matches(match)
+private predicate containsBothLineBreaks(CompileTimeConstantExpr const) {
+  stringOrCharValueMatches(const, "%\n%") and stringOrCharValueMatches(const, "%\r%")
+}
+
+private predicate regexRemovesLineBreaks(CompileTimeConstantExpr target) {
+  // Replace anything not in an allow list
+  target.getStringValue().matches("[^%]") and
+  not stringOrCharValueMatches(target, "%" + ["\n", "\r", "\\n", "\\r", "\\R"] + "%")
+  or
+  // Replace line breaks
+  target.getStringValue() = ["\n", "\r", "\\n", "\\r", "\\R"]
+}
+
+private predicate replacementRemovesLineBreaks(
+  StringReplacement replacement, CompileTimeConstantExpr target
+) {
+  target = replacement.getMatchExpression() and
+  (
+    replacement.matchExpressionIsCharacterSet() and containsBothLineBreaks(target)
+    or
+    replacement.matchExpressionIsRegex() and regexRemovesLineBreaks(target)
+    or
+    not replacement.matchExpressionIsCharacterSet() and
+    not replacement.matchExpressionIsRegex() and
+    target.getStringOrCharValue() = ["\n", "\r"]
+  )
+}
+
+private predicate removalRemovesLineBreaks(StringRemoval removal, CompileTimeConstantExpr target) {
+  target = removal.getMatchExpression() and
+  (
+    removal.matchExpressionIsCharacterSet() and containsBothLineBreaks(target)
+    or
+    removal.matchExpressionIsRegex() and regexRemovesLineBreaks(target)
+    or
+    not removal.matchExpressionIsCharacterSet() and
+    not removal.matchExpressionIsRegex() and
+    target.getStringOrCharValue() = ["\n", "\r"]
+  )
 }
 
 /**
@@ -68,28 +104,14 @@ private predicate stringMethodArgumentValueMatches(CompileTimeConstantExpr const
  * breaks from it.
  */
 private predicate logInjectionSanitizer(Expr e) {
-  exists(MethodCall mc, CompileTimeConstantExpr target, CompileTimeConstantExpr replacement |
-    e = mc and
-    stringMethodCall(mc, target, replacement) and
-    not stringMethodArgumentValueMatches(replacement, ["%\n%", "%\r%"])
-  |
-    mc.getMethod().hasName("replace") and
-    not replacement.getIntValue() = [10, 13] and
-    (
-      target.getIntValue() = [10, 13] or // 10 == '\n', 13 == '\r'
-      target.getStringValue() = ["\n", "\r"]
-    )
-    or
-    mc.getMethod().hasName("replaceAll") and
-    (
-      // Replace anything not in an allow list
-      target.getStringValue().matches("[^%]") and
-      not stringMethodArgumentValueMatches(target, "%" + ["\n", "\r", "\\n", "\\r", "\\R"] + "%")
-      or
-      // Replace line breaks
-      target.getStringValue() = ["\n", "\r", "\\n", "\\r", "\\R"]
-    )
+  replacementRemovesLineBreaks(e, _) and
+  exists(CompileTimeConstantExpr replacement |
+    replacement = e.(StringReplacement).getReplacement() and
+    exists(replacement.getStringOrCharValue()) and
+    not containsLineBreak(replacement)
   )
+  or
+  removalRemovesLineBreaks(e, _)
 }
 
 /**
@@ -97,11 +119,20 @@ private predicate logInjectionSanitizer(Expr e) {
  * by checking if there are line breaks in `e`.
  */
 private predicate logInjectionGuard(Guard g, Expr e, boolean branch) {
-  exists(MethodCall mc | mc = g |
-    mc.getMethod() instanceof StringContainsMethod and
-    mc.getArgument(0).(CompileTimeConstantExpr).getStringValue() = ["\n", "\r"] and
-    e = mc.getQualifier() and
-    branch = false
+  exists(StringSubstringMatch match, boolean matchingBranch | match = g |
+    match.getMatchExpression().(CompileTimeConstantExpr).getStringValue() = ["\n", "\r"] and
+    e = match.getASanitizedExpr() and
+    match.hasSubstringOnBranch(matchingBranch) and
+    branch = matchingBranch.booleanNot()
+  )
+  or
+  exists(StringCharacterSetMatch match, CompileTimeConstantExpr characters, boolean matchingBranch |
+    match = g and
+    characters = match.getMatchExpression() and
+    containsBothLineBreaks(characters) and
+    e = match.getASanitizedExpr() and
+    match.hasMatchingCharacterOnBranch(matchingBranch) and
+    branch = matchingBranch.booleanNot()
   )
   or
   exists(RegexMatch rm, CompileTimeConstantExpr target |
diff --git a/java/ql/lib/semmle/code/java/security/PathSanitizer.qll b/java/ql/lib/semmle/code/java/security/PathSanitizer.qll
index b4344c50cea3..6648f1b948e8 100644
--- a/java/ql/lib/semmle/code/java/security/PathSanitizer.qll
+++ b/java/ql/lib/semmle/code/java/security/PathSanitizer.qll
@@ -111,7 +111,9 @@ private predicate dotDotCheckGuard(Guard g, Expr e, boolean branch) {
   exists(Guard previousGuard |
     previousGuard.(AllowedPrefixGuard).controls(g.getBasicBlock(), true)
     or
-    previousGuard.(BlockListGuard).controls(g.getBasicBlock(), false)
+    previousGuard
+        .(BlockListGuard)
+        .controls(g.getBasicBlock(), previousGuard.(BlockListGuard).getBranch())
   )
   or
   // `File.getName` strips any directory prefix, returning only the final path
@@ -128,13 +130,31 @@ private class DotDotCheckSanitizer extends PathInjectionSanitizer {
   DotDotCheckSanitizer() { this = DataFlow::BarrierGuard<dotDotCheckGuard/3>::getABarrierNode() }
 }
 
-private class BlockListGuard extends PathGuard instanceof MethodCall {
+private class BlockListGuard extends PathGuard {
+  Expr checkedExpr;
+  boolean branch;
+
   BlockListGuard() {
-    (isStringPartialMatch(this) or isPathPrefixMatch(this)) and
-    isDisallowedWord(super.getAnArgument())
+    exists(StringSubstringMatch match, boolean matchingBranch |
+      this = match and
+      checkedExpr = match.getInputString() and
+      isDisallowedWord(match.getMatchExpression()) and
+      match.hasSubstringOnBranch(matchingBranch) and
+      branch = matchingBranch.booleanNot()
+    )
+    or
+    exists(MethodCall ma |
+      this = ma and
+      (isStringPartialMatch(ma) or isPathPrefixMatch(ma)) and
+      isDisallowedWord(ma.getAnArgument()) and
+      checkedExpr = getVisualQualifier(ma).getUnderlyingExpr() and
+      branch = false
+    )
   }
 
-  override Expr getCheckedExpr() { result = getVisualQualifier(this).getUnderlyingExpr() }
+  override Expr getCheckedExpr() { result = checkedExpr }
+
+  boolean getBranch() { result = branch }
 }
 
 /**
@@ -143,7 +163,7 @@ private class BlockListGuard extends PathGuard instanceof MethodCall {
  * or a sanitizer (`PathNormalizeSanitizer`), to ensure any internal `..` components are removed from the path.
  */
 private predicate blockListGuard(Guard g, Expr e, boolean branch) {
-  branch = false and
+  branch = g.(BlockListGuard).getBranch() and
   // Local taint-flow is used here to handle cases where the validated expression comes from the
   // expression reaching the sink, but it's not the same one, e.g.:
   //  File file = source();
@@ -202,8 +222,10 @@ private predicate isStringPartialMatch(MethodCall ma) {
   exists(RefType t | t = ma.getMethod().getDeclaringType() |
     t instanceof TypeString or t instanceof StringsKt
   ) and
-  getSourceMethod(ma.getMethod())
-      .hasName(["contains", "matches", "regionMatches", "indexOf", "lastIndexOf"])
+  getSourceMethod(ma.getMethod()).hasName(["matches", "regionMatches", "indexOf", "lastIndexOf"])
+  or
+  ma.getMethod().getDeclaringType() instanceof StringsKt and
+  getSourceMethod(ma.getMethod()).hasName("contains")
 }
 
 /**
@@ -223,8 +245,17 @@ private predicate isDisallowedWord(ConstantOrRegex word) {
 /** A complementary guard that protects against path traversal, by looking for the literal `..`. */
 private class PathTraversalGuard extends PathGuard {
   Expr checkedExpr;
+  boolean branch;
 
   PathTraversalGuard() {
+    exists(StringSubstringMatch match, boolean matchingBranch |
+      this = match and
+      checkedExpr = match.getInputString() and
+      match.getMatchExpression().(CompileTimeConstantExpr).getStringValue() = ".." and
+      match.hasSubstringOnBranch(matchingBranch) and
+      branch = matchingBranch.booleanNot()
+    )
+    or
     exists(MethodCall ma, Method m, RefType t |
       m = ma.getMethod() and
       t = m.getDeclaringType() and
@@ -233,24 +264,23 @@ private class PathTraversalGuard extends PathGuard {
       ma.getAnArgument().(CompileTimeConstantExpr).getStringValue() = ".."
     |
       this = ma and
-      getSourceMethod(m).hasName("contains")
+      t instanceof StringsKt and
+      getSourceMethod(m).hasName("contains") and
+      branch = false
       or
       exists(EqualityTest eq |
         this = eq and
         getSourceMethod(m).hasName(["indexOf", "lastIndexOf"]) and
         eq.getAnOperand() = ma and
-        eq.getAnOperand().(CompileTimeConstantExpr).getIntValue() = -1
+        eq.getAnOperand().(CompileTimeConstantExpr).getIntValue() = -1 and
+        branch = eq.polarity()
       )
     )
   }
 
   override Expr getCheckedExpr() { result = checkedExpr }
 
-  boolean getBranch() {
-    this instanceof MethodCall and result = false
-    or
-    result = this.(EqualityTest).polarity()
-  }
+  boolean getBranch() { result = branch }
 }
 
 /** A complementary sanitizer that protects against path traversal using path normalization. */
@@ -344,43 +374,35 @@ private class FileConstructorChildArgumentStep extends AdditionalTaintStep {
   }
 }
 
-/** A call to `java.lang.String.replace` or `java.lang.String.replaceAll`. */
-private class StringReplaceOrReplaceAllCall extends MethodCall {
-  StringReplaceOrReplaceAllCall() {
-    this instanceof StringReplaceCall or
-    this instanceof StringReplaceAllCall
-  }
-}
-
 /** Gets a character used for replacement. */
 private string getAReplacementChar() { result = ["", "_", "-"] }
 
+/** Holds if `replacement` is a safe replacement value. */
+private predicate isSafeReplacement(Expr replacement) {
+  replacement.(CompileTimeConstantExpr).getStringOrCharValue() = getAReplacementChar()
+}
+
 /** Gets a directory character represented as regex. */
 private string getADirRegexChar() { result = ["\\.", "/", "\\\\"] }
 
 /** Gets a directory character represented as a char. */
 private string getADirChar() { result = [".", "/", "\\"] }
 
-/** Holds if `target` is the first argument of `replaceAllCall`. */
-private predicate isReplaceAllTarget(
-  StringReplaceAllCall replaceAllCall, CompileTimeConstantExpr target
-) {
-  target = replaceAllCall.getArgument(0)
-}
-
-/** Holds if `target` is the first argument of `replaceCall`. */
-private predicate isReplaceTarget(StringReplaceCall replaceCall, CompileTimeConstantExpr target) {
-  target = replaceCall.getArgument(0)
+/** Holds if `value` contains every directory character. */
+bindingset[value]
+private predicate containsAllDirectoryCharacters(string value) {
+  forall(string directoryCharacter | directoryCharacter = getADirChar() |
+    exists(value.indexOf(directoryCharacter))
+  )
 }
 
-/** Holds if a single `replaceAllCall` replaces all directory characters. */
-private predicate replacesDirectoryCharactersWithSingleReplaceAll(
-  StringReplaceAllCall replaceAllCall
-) {
+/** Holds if `replacement` replaces all directory characters. */
+private predicate replacesDirectoryCharactersWithSingleReplaceAll(StringReplacement replacement) {
   exists(CompileTimeConstantExpr target, string targetValue |
-    isReplaceAllTarget(replaceAllCall, target) and
+    replacement.matchExpressionIsRegex() and
+    target = replacement.getMatchExpression() and
     target.getStringValue() = targetValue and
-    replaceAllCall.getArgument(1).(CompileTimeConstantExpr).getStringValue() = getAReplacementChar()
+    isSafeReplacement(replacement.getReplacement())
   |
     not targetValue.matches("%[^%]%") and
     targetValue.matches("[%.%]") and
@@ -395,34 +417,49 @@ private predicate replacesDirectoryCharactersWithSingleReplaceAll(
   )
 }
 
+/**
+ * Holds if a character-set replacement replaces all directory characters.
+ */
+private predicate replacesDirectoryCharactersWithCharacterSet(StringReplacement replacement) {
+  exists(CompileTimeConstantExpr target, string targetValue |
+    replacement.matchExpressionIsCharacterSet() and
+    target = replacement.getMatchExpression() and
+    target.getStringValue() = targetValue and
+    containsAllDirectoryCharacters(targetValue) and
+    isSafeReplacement(replacement.getReplacement())
+  )
+}
+
 /**
  * Holds if there are two chained replacement calls, `rc1` and `rc2`, that replace
  * '.' and one of '/' or '\'.
  */
-private predicate replacesDirectoryCharactersWithDoubleReplaceOrReplaceAll(
-  StringReplaceOrReplaceAllCall rc1
-) {
+private predicate replacesDirectoryCharactersWithDoubleReplaceOrReplaceAll(StringReplacement rc1) {
   exists(
-    CompileTimeConstantExpr target1, string targetValue1, StringReplaceOrReplaceAllCall rc2,
+    CompileTimeConstantExpr target1, string targetValue1, StringReplacement rc2,
     CompileTimeConstantExpr target2, string targetValue2
   |
-    rc1 instanceof StringReplaceAllCall and
-    isReplaceAllTarget(rc1, target1) and
-    isReplaceAllTarget(rc2, target2) and
+    rc1.matchExpressionIsRegex() and
+    rc2.matchExpressionIsRegex() and
+    target1 = rc1.getMatchExpression() and
+    target2 = rc2.getMatchExpression() and
     targetValue1 = getADirRegexChar() and
     targetValue2 = getADirRegexChar()
     or
-    rc1 instanceof StringReplaceCall and
-    isReplaceTarget(rc1, target1) and
-    isReplaceTarget(rc2, target2) and
+    not rc1.matchExpressionIsRegex() and
+    not rc1.matchExpressionIsCharacterSet() and
+    not rc2.matchExpressionIsRegex() and
+    not rc2.matchExpressionIsCharacterSet() and
+    target1 = rc1.getMatchExpression() and
+    target2 = rc2.getMatchExpression() and
     targetValue1 = getADirChar() and
     targetValue2 = getADirChar()
   |
-    rc2.getQualifier() = rc1 and
-    target1.getStringValue() = targetValue1 and
-    target2.getStringValue() = targetValue2 and
-    rc1.getArgument(1).(CompileTimeConstantExpr).getStringValue() = getAReplacementChar() and
-    rc2.getArgument(1).(CompileTimeConstantExpr).getStringValue() = getAReplacementChar() and
+    rc2.getInputString() = rc1 and
+    target1.getStringOrCharValue() = targetValue1 and
+    target2.getStringOrCharValue() = targetValue2 and
+    isSafeReplacement(rc1.getReplacement()) and
+    isSafeReplacement(rc2.getReplacement()) and
     // make sure the calls replace different characters
     targetValue2 != targetValue1 and
     // make sure one of the calls replaces '.'
@@ -435,13 +472,29 @@ private predicate replacesDirectoryCharactersWithDoubleReplaceOrReplaceAll(
  * A sanitizer that protects against path injection vulnerabilities by replacing
  * directory characters ('..', '/', and '\') with safe characters.
  */
-private class ReplaceDirectoryCharactersSanitizer extends StringReplaceOrReplaceAllCall {
+private class ReplaceDirectoryCharactersSanitizer extends StringReplacement {
   ReplaceDirectoryCharactersSanitizer() {
     replacesDirectoryCharactersWithSingleReplaceAll(this) or
+    replacesDirectoryCharactersWithCharacterSet(this) or
     replacesDirectoryCharactersWithDoubleReplaceOrReplaceAll(this)
   }
 }
 
+/**
+ * A sanitizer that protects against path injection vulnerabilities by removing
+ * every directory character.
+ */
+private class RemoveDirectoryCharactersSanitizer extends StringRemoval {
+  RemoveDirectoryCharactersSanitizer() {
+    exists(CompileTimeConstantExpr target, string targetValue |
+      this.matchExpressionIsCharacterSet() and
+      target = this.getMatchExpression() and
+      target.getStringValue() = targetValue and
+      containsAllDirectoryCharacters(targetValue)
+    )
+  }
+}
+
 /**
  * Holds if `matchesCall` confirms that `checkedExpr` does not contain any directory characters
  * on the given `branch`.
@@ -477,6 +530,23 @@ private predicate isMatchesCall(RegexMatch regexMatch, Expr checkedExpr, boolean
   )
 }
 
+/**
+ * Holds if `match` confirms that `checkedExpr` does not contain any directory
+ * characters on `branch`.
+ */
+private predicate isCharacterSetMatch(
+  StringCharacterSetMatch match, Expr checkedExpr, boolean branch
+) {
+  exists(CompileTimeConstantExpr target, string targetValue, boolean matchingBranch |
+    target = match.getMatchExpression() and
+    target.getStringValue() = targetValue and
+    containsAllDirectoryCharacters(targetValue) and
+    checkedExpr = match.getInputString() and
+    match.hasMatchingCharacterOnBranch(matchingBranch) and
+    branch = matchingBranch.booleanNot()
+  )
+}
+
 /**
  * A guard that protects against path traversal by looking for patterns
  * that exclude directory characters: `..`, '/', and '\'.
@@ -485,7 +555,10 @@ private class DirectoryCharactersGuard extends PathGuard {
   Expr checkedExpr;
   boolean branch;
 
-  DirectoryCharactersGuard() { isMatchesCall(this, checkedExpr, branch) }
+  DirectoryCharactersGuard() {
+    isMatchesCall(this, checkedExpr, branch) or
+    isCharacterSetMatch(this, checkedExpr, branch)
+  }
 
   override Expr getCheckedExpr() { result = checkedExpr }
 
@@ -510,6 +583,8 @@ private class DirectoryCharactersSanitizer extends PathInjectionSanitizer {
   DirectoryCharactersSanitizer() {
     this.asExpr() instanceof ReplaceDirectoryCharactersSanitizer
     or
+    this.asExpr() instanceof RemoveDirectoryCharactersSanitizer
+    or
     this = DataFlow::BarrierGuard<directoryCharactersGuard/3>::getABarrierNode()
   }
 }
diff --git a/java/ql/lib/semmle/code/java/security/RequestForgery.qll b/java/ql/lib/semmle/code/java/security/RequestForgery.qll
index 489b45dffa2c..3711a93c0530 100644
--- a/java/ql/lib/semmle/code/java/security/RequestForgery.qll
+++ b/java/ql/lib/semmle/code/java/security/RequestForgery.qll
@@ -13,6 +13,8 @@ import semmle.code.java.frameworks.Properties
 private import semmle.code.java.controlflow.Guards
 private import semmle.code.java.dataflow.StringPrefixes
 private import semmle.code.java.dataflow.ExternalFlow
+private import semmle.code.java.dataflow.SSA
+private import semmle.code.java.security.ConstantValueSanitizer
 private import semmle.code.java.security.Sanitizers
 
 /**
@@ -122,11 +124,21 @@ private class ExternalRequestForgerySanitizer extends RequestForgerySanitizer {
   ExternalRequestForgerySanitizer() { barrierNode(this, "request-forgery") }
 }
 
-/**
- * A comparison on the host of a url, that is a sanitizer for URL redirects.
- * E.g. `"example.org".equals(url.getHost())"`
- */
+/** Gets a host read, following local assignments with a single explicit SSA definition. */
+private MethodCall getCheckedHost(Expr checked) {
+  result = checked.getUnderlyingExpr() and
+  result.getMethod().hasQualifiedName("java.net", "URI", "getHost")
+  or
+  exists(SsaExplicitWrite def |
+    checked.getUnderlyingExpr().(VarRead).getVariable() instanceof LocalScopeVariable and
+    def.getARead() = checked.getUnderlyingExpr() and
+    result = getCheckedHost(def.getValue())
+  )
+}
+
+/** Holds if a comparison validates the host of a URI. */
 private predicate isHostComparisonSanitizer(Guard guard, Expr e, boolean branch) {
+  // Direct equality checks also accept nonconstant comparison operands.
   guard =
     any(MethodCall equalsCall |
       equalsCall.getMethod().getName() = "equals" and
@@ -137,6 +149,11 @@ private predicate isHostComparisonSanitizer(Guard guard, Expr e, boolean branch)
         e = hostCall.getQualifier()
       )
     )
+  or
+  exists(Expr checked |
+    nonNullConstantValueGuardChecks(guard, checked, branch) and
+    e = getCheckedHost(checked).getQualifier()
+  )
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/XmlParsers.qll b/java/ql/lib/semmle/code/java/security/XmlParsers.qll
index 602076996a77..4a30ded19e3a 100644
--- a/java/ql/lib/semmle/code/java/security/XmlParsers.qll
+++ b/java/ql/lib/semmle/code/java/security/XmlParsers.qll
@@ -56,6 +56,15 @@ abstract class ParserConfig extends MethodCall {
   }
 }
 
+/**
+ * An expression that evaluates to a JAXP parser factory (such as a
+ * `DocumentBuilderFactory` or `SAXParserFactory`) that has already been hardened
+ * against XML external entity (XXE) attacks, for example by a helper library.
+ *
+ * Extend this class to model additional sources of pre-hardened JAXP factories.
+ */
+abstract class SafeXmlFactorySource extends Expr { }
+
 /*
  * https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#jaxp-documentbuilderfactory-saxparserfactory-and-dom4j
  */
@@ -156,6 +165,8 @@ private class DocumentBuilderConstruction extends MethodCall {
 
 private predicate safeDocumentBuilderFactoryNode(DataFlow::Node src) {
   src.asExpr() instanceof SafeDocumentBuilderFactory
+  or
+  src.asExpr().(SafeXmlFactorySource).getType() instanceof DocumentBuilderFactory
 }
 
 private module SafeDocumentBuilderFactoryToDocumentBuilderConstructionFlow =
@@ -219,6 +230,8 @@ class XmlInputFactoryStreamReader extends XmlParserCall {
 
 private predicate safeXmlInputFactoryNode(DataFlow::Node src) {
   src.asExpr() instanceof SafeXmlInputFactory
+  or
+  src.asExpr().(SafeXmlFactorySource).getType() instanceof XmlInputFactory
 }
 
 private module SafeXmlInputFactoryToXmlInputFactoryReaderFlow =
@@ -456,6 +469,8 @@ class SafeSaxParserFactory extends VarAccess {
 
 private predicate safeSaxParserFactoryNode(DataFlow::Node src) {
   src.asExpr() instanceof SafeSaxParserFactory
+  or
+  src.asExpr().(SafeXmlFactorySource).getType() instanceof SaxParserFactory
 }
 
 private module SafeSaxParserFactoryToNewSaxParserFlow =
@@ -831,6 +846,8 @@ class TransformerFactoryConfig extends TransformerConfig {
 
 private predicate safeTransformerFactoryNode(DataFlow::Node src) {
   src.asExpr() instanceof SafeTransformerFactory
+  or
+  src.asExpr().(SafeXmlFactorySource).getType() instanceof TransformerFactory
 }
 
 private module SafeTransformerFactoryFlow = DataFlow::SimpleGlobal<safeTransformerFactoryNode/1>;
@@ -920,6 +937,8 @@ class SchemaFactoryNewSchema extends XmlParserCall {
 
 private predicate safeSchemaFactoryNode(DataFlow::Node src) {
   src.asExpr() instanceof SafeSchemaFactory
+  or
+  src.asExpr().(SafeXmlFactorySource).getType() instanceof SchemaFactory
 }
 
 private module SafeSchemaFactoryToSchemaFactoryNewSchemaFlow =
diff --git a/java/ql/lib/utils/test/InlineExpectationsTestQuery.ql b/java/ql/lib/utils/test/InlineExpectationsTestQuery.ql
index b0360dfecd8d..72cbb9c4148a 100644
--- a/java/ql/lib/utils/test/InlineExpectationsTestQuery.ql
+++ b/java/ql/lib/utils/test/InlineExpectationsTestQuery.ql
@@ -6,16 +6,4 @@ private import java
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>
diff --git a/java/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll b/java/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
index 446b6a544c34..9a51a70eda60 100644
--- a/java/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/java/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
@@ -35,4 +35,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = J::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(J::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }
diff --git a/java/ql/src/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index 3fd98c386b69..b2ccac02ad00 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,3 +1,33 @@
+## 1.12.0
+
+### Query Metadata Changes
+
+* The `external/cwe/cwe-730` tag has been removed from `java/redos`, `java/polynomial-redos` and `java/regex-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
+
+## 1.11.13
+
+No user-facing changes.
+
+## 1.11.12
+
+No user-facing changes.
+
+## 1.11.11
+
+No user-facing changes.
+
+## 1.11.10
+
+No user-facing changes.
+
+## 1.11.9
+
+No user-facing changes.
+
+## 1.11.8
+
+No user-facing changes.
+
 ## 1.11.7
 
 No user-facing changes.
diff --git a/java/ql/src/Likely Bugs/Concurrency/LazyInitStaticField.qhelp b/java/ql/src/Likely Bugs/Concurrency/LazyInitStaticField.qhelp
index 8ea8b951924e..14d0c749fb2f 100644
--- a/java/ql/src/Likely Bugs/Concurrency/LazyInitStaticField.qhelp	
+++ b/java/ql/src/Likely Bugs/Concurrency/LazyInitStaticField.qhelp	
@@ -43,7 +43,7 @@ approach of using a static initializer to initialize <code>resource</code>.</p>
 
 
 <!--
-<p>Wikipedia article on the <a href="http://en.wikipedia.org/wiki/Double-checked_locking">Double-Checked Locking Pattern</a></p>
+<p>Wikipedia article on the <a href="https://en.wikipedia.org/wiki/Double-checked_locking">Double-Checked Locking Pattern</a></p>
 -->
 
 </references>
diff --git a/java/ql/src/Metrics/Callables/CCyclomaticComplexity.qhelp b/java/ql/src/Metrics/Callables/CCyclomaticComplexity.qhelp
index ea496155fbbf..80909522e4ba 100644
--- a/java/ql/src/Metrics/Callables/CCyclomaticComplexity.qhelp
+++ b/java/ql/src/Metrics/Callables/CCyclomaticComplexity.qhelp
@@ -51,7 +51,7 @@ M. Fowler, <em>Refactoring</em>. Addison-Wesley, 1999.
 T. J. McCabe, <em>A Complexity Measure</em>. IEEE Transactions on Software Engineering, SE-2(4), December 1976.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>.
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>.
 </li>
 
 
diff --git a/java/ql/src/Metrics/Files/FCyclomaticComplexity.qhelp b/java/ql/src/Metrics/Files/FCyclomaticComplexity.qhelp
index 2009e77d66fb..e9469d2df7ca 100644
--- a/java/ql/src/Metrics/Files/FCyclomaticComplexity.qhelp
+++ b/java/ql/src/Metrics/Files/FCyclomaticComplexity.qhelp
@@ -67,10 +67,10 @@ T. J. McCabe, <em>A Complexity Measure</em>. IEEE Transactions on Software Engin
 Dave Thomas, <a href="http://www.jot.fm/issues/issue_2005_01/column1/">Refactoring as Meta Programming?</a>, in Journal of Object Technology, vol. 4, no. 1, January-February 2005, pp. 7-11.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Code_refactoring">Code refactoring</a>
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Code_refactoring">Code refactoring</a>
 </li>
 
 </references>
diff --git a/java/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp b/java/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp
index 6fc36156c110..47e4c871dbe0 100644
--- a/java/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp
+++ b/java/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp
@@ -27,7 +27,7 @@ a shared library or module.
 <references> 
 
 
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Duplicate_code">Duplicate code</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Duplicate_code">Duplicate code</a>.</li>
 <li>M. Fowler, <em>Refactoring</em>. Addison-Wesley, 1999.</li>
 
 
diff --git a/java/ql/src/Metrics/Files/FLinesOfSimilarCode.qhelp b/java/ql/src/Metrics/Files/FLinesOfSimilarCode.qhelp
index bddda6b1b37d..319f801e3634 100644
--- a/java/ql/src/Metrics/Files/FLinesOfSimilarCode.qhelp
+++ b/java/ql/src/Metrics/Files/FLinesOfSimilarCode.qhelp
@@ -23,7 +23,7 @@ that can be reused across classes.
 <references> 
 
 
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Duplicate_code">Duplicate code</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Duplicate_code">Duplicate code</a>.</li>
 <li>M. Fowler, <em>Refactoring</em>. Addison-Wesley, 1999.</li>
 
 
diff --git a/java/ql/src/Metrics/Files/FSelfContainedness.qhelp b/java/ql/src/Metrics/Files/FSelfContainedness.qhelp
index 3a254ca64132..3da981e106f1 100644
--- a/java/ql/src/Metrics/Files/FSelfContainedness.qhelp
+++ b/java/ql/src/Metrics/Files/FSelfContainedness.qhelp
@@ -55,7 +55,7 @@ external libraries.
 
 
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Software_portability">Software portability</a>
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Software_portability">Software portability</a>
 </li>
 <li>
   Oracle Technology Network: <a href="https://www.oracle.com/java/technologies/javase/compatibility.html">Java SE 6 Compatibility</a>
diff --git a/java/ql/src/Metrics/RefTypes/TSelfContainedness.qhelp b/java/ql/src/Metrics/RefTypes/TSelfContainedness.qhelp
index cafeb813b27c..d0c6e41c05ec 100644
--- a/java/ql/src/Metrics/RefTypes/TSelfContainedness.qhelp
+++ b/java/ql/src/Metrics/RefTypes/TSelfContainedness.qhelp
@@ -55,7 +55,7 @@ external libraries.
 
 
 <li>
-Wikipedia. <a href="http://en.wikipedia.org/wiki/Software_portability">Software portability</a>. Published online.
+Wikipedia. <a href="https://en.wikipedia.org/wiki/Software_portability">Software portability</a>. Published online.
 </li>
 <li>
   Oracle Technology Network: <a href="http://www.oracle.com/technetwork/java/javase/compatibility-137541.html">Java SE 6 Compatibility</a>
diff --git a/java/ql/src/Security/CWE/CWE-078/ExecTainted.qhelp b/java/ql/src/Security/CWE/CWE-078/ExecTainted.qhelp
index a8b7508763cb..046b7790bb40 100644
--- a/java/ql/src/Security/CWE/CWE-078/ExecTainted.qhelp
+++ b/java/ql/src/Security/CWE/CWE-078/ExecTainted.qhelp
@@ -33,7 +33,7 @@ without examining it first.</p>
 
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 <li>SEI CERT Oracle Coding Standard for Java:
   <a href="https://wiki.sei.cmu.edu/confluence/display/java/IDS07-J.+Sanitize+untrusted+data+passed+to+the+Runtime.exec()+method">IDS07-J. Sanitize untrusted data passed to the Runtime.exec() method</a>.</li>
diff --git a/java/ql/src/Security/CWE/CWE-078/ExecUnescaped.qhelp b/java/ql/src/Security/CWE/CWE-078/ExecUnescaped.qhelp
index 4520828b1be2..d6f551a656e9 100644
--- a/java/ql/src/Security/CWE/CWE-078/ExecUnescaped.qhelp
+++ b/java/ql/src/Security/CWE/CWE-078/ExecUnescaped.qhelp
@@ -34,7 +34,7 @@ an argument.</p>
 
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 <li>SEI CERT Oracle Coding Standard for Java:
   <a href="https://wiki.sei.cmu.edu/confluence/display/java/IDS07-J.+Sanitize+untrusted+data+passed+to+the+Runtime.exec()+method">IDS07-J. Sanitize untrusted data passed to the Runtime.exec() method</a>.</li>
diff --git a/java/ql/src/Security/CWE/CWE-079/XSS.qhelp b/java/ql/src/Security/CWE/CWE-079/XSS.qhelp
index 05b0f2680022..8434212390be 100644
--- a/java/ql/src/Security/CWE/CWE-079/XSS.qhelp
+++ b/java/ql/src/Security/CWE/CWE-079/XSS.qhelp
@@ -33,7 +33,7 @@ OWASP:
 (Cross Site Scripting) Prevention Cheat Sheet</a>.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 </li>
 
 
diff --git a/java/ql/src/Security/CWE/CWE-113/ResponseSplitting.qhelp b/java/ql/src/Security/CWE/CWE-113/ResponseSplitting.qhelp
index c4c2032af7dc..d0b6faefdb86 100644
--- a/java/ql/src/Security/CWE/CWE-113/ResponseSplitting.qhelp
+++ b/java/ql/src/Security/CWE/CWE-113/ResponseSplitting.qhelp
@@ -57,7 +57,7 @@ OWASP:
 <a href="https://www.owasp.org/index.php/HTTP_Response_Splitting">HTTP Response Splitting</a>.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/HTTP_response_splitting">HTTP response splitting</a>.
+Wikipedia: <a href="https://en.wikipedia.org/wiki/HTTP_response_splitting">HTTP response splitting</a>.
 </li>
 <li>
 CAPEC: <a href="https://capec.mitre.org/data/definitions/105.html">CAPEC-105: HTTP Request Splitting</a>
diff --git a/java/ql/src/Security/CWE/CWE-326/InsufficientKeySize.qhelp b/java/ql/src/Security/CWE/CWE-326/InsufficientKeySize.qhelp
index 3a0b74bebd49..f786c865b8a2 100644
--- a/java/ql/src/Security/CWE/CWE-326/InsufficientKeySize.qhelp
+++ b/java/ql/src/Security/CWE/CWE-326/InsufficientKeySize.qhelp
@@ -33,7 +33,7 @@
     <references>
         <li>
             Wikipedia:
-            <a href="http://en.wikipedia.org/wiki/Key_size">Key size</a>.
+            <a href="https://en.wikipedia.org/wiki/Key_size">Key size</a>.
         </li>
         <li>
             Wikipedia: <a href="https://en.wikipedia.org/wiki/Strong_cryptography">Strong cryptography</a>.
diff --git a/java/ql/src/Security/CWE/CWE-330/InsecureRandomness.qhelp b/java/ql/src/Security/CWE/CWE-330/InsecureRandomness.qhelp
index 414e32520577..a0d056132b9e 100644
--- a/java/ql/src/Security/CWE/CWE-330/InsecureRandomness.qhelp
+++ b/java/ql/src/Security/CWE/CWE-330/InsecureRandomness.qhelp
@@ -53,7 +53,7 @@
 	</example>
 
 	<references>
-		<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Pseudorandom_number_generator">Pseudo-random number generator</a>.</li>
+		<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Pseudorandom_number_generator">Pseudo-random number generator</a>.</li>
         <li>
             Java Docs: <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Random.html">Random</a>.
         </li>
diff --git a/java/ql/src/Security/CWE/CWE-501/TrustBoundaryViolation.qhelp b/java/ql/src/Security/CWE/CWE-501/TrustBoundaryViolation.qhelp
index f0eb5de2f7fd..cd069a4c4f38 100644
--- a/java/ql/src/Security/CWE/CWE-501/TrustBoundaryViolation.qhelp
+++ b/java/ql/src/Security/CWE/CWE-501/TrustBoundaryViolation.qhelp
@@ -41,7 +41,7 @@
 
   <references>
     <li>
-      Wikipedia: <a href="http://en.wikipedia.org/wiki/Trust_boundary">Trust boundary</a>.
+      Wikipedia: <a href="https://en.wikipedia.org/wiki/Trust_boundary">Trust boundary</a>.
     </li>
   </references>
 
diff --git a/java/ql/src/Security/CWE/CWE-730/PolynomialReDoS.ql b/java/ql/src/Security/CWE/CWE-730/PolynomialReDoS.ql
index 2ba45ca083ca..f1498f1861b7 100644
--- a/java/ql/src/Security/CWE/CWE-730/PolynomialReDoS.ql
+++ b/java/ql/src/Security/CWE/CWE-730/PolynomialReDoS.ql
@@ -9,7 +9,6 @@
  * @id java/polynomial-redos
  * @tags security
  *       external/cwe/cwe-1333
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/java/ql/src/Security/CWE/CWE-730/ReDoS.ql b/java/ql/src/Security/CWE/CWE-730/ReDoS.ql
index ca4750fc8588..d8008202bbd0 100644
--- a/java/ql/src/Security/CWE/CWE-730/ReDoS.ql
+++ b/java/ql/src/Security/CWE/CWE-730/ReDoS.ql
@@ -10,7 +10,6 @@
  * @id java/redos
  * @tags security
  *       external/cwe/cwe-1333
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/java/ql/src/Security/CWE/CWE-730/RegexInjection.ql b/java/ql/src/Security/CWE/CWE-730/RegexInjection.ql
index 64fe906658ba..a379d39a0bb8 100644
--- a/java/ql/src/Security/CWE/CWE-730/RegexInjection.ql
+++ b/java/ql/src/Security/CWE/CWE-730/RegexInjection.ql
@@ -9,7 +9,6 @@
  * @precision high
  * @id java/regex-injection
  * @tags security
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/java/ql/src/Violations of Best Practice/Comments/TodoComments.qhelp b/java/ql/src/Violations of Best Practice/Comments/TodoComments.qhelp
index b1a01ba71631..c915fa833f93 100644
--- a/java/ql/src/Violations of Best Practice/Comments/TodoComments.qhelp	
+++ b/java/ql/src/Violations of Best Practice/Comments/TodoComments.qhelp	
@@ -44,8 +44,8 @@ Approxion:
 </li>
 <li>
 Wikipedia:
-<a href="http://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Tags">Comment tags</a>,
-<a href="http://en.wikipedia.org/wiki/Issue_tracking_system">Issue tracking system</a>.
+<a href="https://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Tags">Comment tags</a>,
+<a href="https://en.wikipedia.org/wiki/Issue_tracking_system">Issue tracking system</a>.
 </li>
 
 
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/DeadRefTypes.qhelp b/java/ql/src/Violations of Best Practice/Dead Code/DeadRefTypes.qhelp
index c367fcaead78..cf6b21896deb 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/DeadRefTypes.qhelp	
+++ b/java/ql/src/Violations of Best Practice/Dead Code/DeadRefTypes.qhelp	
@@ -19,7 +19,7 @@ in the program may cause a programmer to waste time and effort maintaining and d
 
 <li>
   Wikipedia:
-  <a href="http://en.wikipedia.org/wiki/Unreachable_code">Unreachable code</a>.
+  <a href="https://en.wikipedia.org/wiki/Unreachable_code">Unreachable code</a>.
 </li>
 
 
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/UnreadLocal.ql b/java/ql/src/Violations of Best Practice/Dead Code/UnreadLocal.ql
index ae85f5466132..e7a6f63c2858 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/UnreadLocal.ql	
+++ b/java/ql/src/Violations of Best Practice/Dead Code/UnreadLocal.ql	
@@ -32,5 +32,7 @@ where
     f.getVariable().getVariable() = v and
     f.getExpr().getType().(RefType).hasQualifiedName("kotlin.ranges", ["IntRange", "LongRange"])
   ) and
+  // Unnamed variables (`_`) cannot be read.
+  not v.getDeclExpr().isAnonymous() and
   not readImplicitly(v)
 select v, "Variable '" + v + "' is never read."
diff --git a/java/ql/src/change-notes/2026-11-03-unread-local-unnamed-variables.md b/java/ql/src/change-notes/2026-11-03-unread-local-unnamed-variables.md
new file mode 100644
index 000000000000..8cb1aececb4e
--- /dev/null
+++ b/java/ql/src/change-notes/2026-11-03-unread-local-unnamed-variables.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `java/local-variable-is-never-read` query no longer reports unnamed variables (`_`), for example in `case Foo _ ->` patterns, `for (var _ : items)` loops, and `var _ = ...;` declarations.
diff --git a/java/ql/src/change-notes/released/1.11.10.md b/java/ql/src/change-notes/released/1.11.10.md
new file mode 100644
index 000000000000..735d0b8ceb75
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.11.10.md
@@ -0,0 +1,3 @@
+## 1.11.10
+
+No user-facing changes.
diff --git a/java/ql/src/change-notes/released/1.11.11.md b/java/ql/src/change-notes/released/1.11.11.md
new file mode 100644
index 000000000000..e7597eb25e2c
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.11.11.md
@@ -0,0 +1,3 @@
+## 1.11.11
+
+No user-facing changes.
diff --git a/java/ql/src/change-notes/released/1.11.12.md b/java/ql/src/change-notes/released/1.11.12.md
new file mode 100644
index 000000000000..aaecc6fda7e7
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.11.12.md
@@ -0,0 +1,3 @@
+## 1.11.12
+
+No user-facing changes.
diff --git a/java/ql/src/change-notes/released/1.11.13.md b/java/ql/src/change-notes/released/1.11.13.md
new file mode 100644
index 000000000000..f2d174ab8dc8
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.11.13.md
@@ -0,0 +1,3 @@
+## 1.11.13
+
+No user-facing changes.
diff --git a/java/ql/src/change-notes/released/1.11.8.md b/java/ql/src/change-notes/released/1.11.8.md
new file mode 100644
index 000000000000..0783473b96d3
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.11.8.md
@@ -0,0 +1,3 @@
+## 1.11.8
+
+No user-facing changes.
diff --git a/java/ql/src/change-notes/released/1.11.9.md b/java/ql/src/change-notes/released/1.11.9.md
new file mode 100644
index 000000000000..d502923c39f5
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.11.9.md
@@ -0,0 +1,3 @@
+## 1.11.9
+
+No user-facing changes.
diff --git a/java/ql/src/change-notes/released/1.12.0.md b/java/ql/src/change-notes/released/1.12.0.md
new file mode 100644
index 000000000000..81458b24b958
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.12.0.md
@@ -0,0 +1,5 @@
+## 1.12.0
+
+### Query Metadata Changes
+
+* The `external/cwe/cwe-730` tag has been removed from `java/redos`, `java/polynomial-redos` and `java/regex-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
diff --git a/java/ql/src/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
index da245378bca5..59868ba778d8 100644
--- a/java/ql/src/codeql-pack.release.yml
+++ b/java/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.11.7
+lastReleaseVersion: 1.12.0
diff --git a/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExec.qhelp b/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExec.qhelp
index 820f5b71405f..d91db89704b3 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExec.qhelp
+++ b/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExec.qhelp
@@ -32,7 +32,7 @@ without examining it first.</p>
 
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 <li>SEI CERT Oracle Coding Standard for Java:
   <a href="https://wiki.sei.cmu.edu/confluence/display/java/IDS07-J.+Sanitize+untrusted+data+passed+to+the+Runtime.exec()+method">IDS07-J. Sanitize untrusted data passed to the Runtime.exec() method</a>.</li>
diff --git a/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExecLocal.qhelp b/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExecLocal.qhelp
index be2b7aac973b..b7867b9603bb 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExecLocal.qhelp
+++ b/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExecLocal.qhelp
@@ -32,7 +32,7 @@ without examining it first.</p>
 
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 <li>SEI CERT Oracle Coding Standard for Java:
   <a href="https://wiki.sei.cmu.edu/confluence/display/java/IDS07-J.+Sanitize+untrusted+data+passed+to+the+Runtime.exec()+method">IDS07-J. Sanitize untrusted data passed to the Runtime.exec() method</a>.</li>
diff --git a/java/ql/src/experimental/Security/CWE/CWE-078/ExecTainted.qhelp b/java/ql/src/experimental/Security/CWE/CWE-078/ExecTainted.qhelp
index a8b7508763cb..046b7790bb40 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-078/ExecTainted.qhelp
+++ b/java/ql/src/experimental/Security/CWE/CWE-078/ExecTainted.qhelp
@@ -33,7 +33,7 @@ without examining it first.</p>
 
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 <li>SEI CERT Oracle Coding Standard for Java:
   <a href="https://wiki.sei.cmu.edu/confluence/display/java/IDS07-J.+Sanitize+untrusted+data+passed+to+the+Runtime.exec()+method">IDS07-J. Sanitize untrusted data passed to the Runtime.exec() method</a>.</li>
diff --git a/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql b/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql
index b449f118bc34..a4215caac6a5 100644
--- a/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql
+++ b/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql
@@ -34,19 +34,15 @@ private string rankedInsecureAlgorithm(int i) {
   result = rank[i](string s | s = getAnInsecureAlgorithmName())
 }
 
-private string insecureAlgorithmString(int i) {
-  i = 1 and result = rankedInsecureAlgorithm(i)
-  or
-  result = rankedInsecureAlgorithm(i) + "|" + insecureAlgorithmString(i - 1)
+private string insecureAlgorithmString() {
+  result = concat(int i | | rankedInsecureAlgorithm(i), "|" order by i desc)
 }
 
 /**
  * Gets the regular expression used for matching strings that look like they
  * contain an algorithm that is known to be insecure.
  */
-string getInsecureAlgorithmRegex() {
-  result = algorithmRegex(insecureAlgorithmString(max(int i | exists(rankedInsecureAlgorithm(i)))))
-}
+string getInsecureAlgorithmRegex() { result = algorithmRegex(insecureAlgorithmString()) }
 
 bindingset[algorithmString]
 private string algorithmRegex(string algorithmString) {
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index f85ddd4d3f6a..e87965c929d8 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.11.8-dev
+version: 1.12.1-dev
 groups:
   - java
   - queries
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll
index f02f9a5b623d..2fe9079a9f7f 100644
--- a/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll
+++ b/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll
@@ -167,7 +167,7 @@ module SummaryModelGeneratorInput implements SummaryModelGeneratorInputSig {
   Parameter asParameter(NodeExtended node) { result = node.asParameter() }
 
   private J::Method getARelevantOverride(J::Method m) {
-    result = m.getAnOverride() and
+    result = m.getAnOverride().getSourceDeclaration() and
     relevant(result) and
     // Other exclusions for overrides.
     not m instanceof J::ToStringMethod
diff --git a/java/ql/test-kotlin1/TestUtilities/internal/InlineExpectationsTestImpl.qll b/java/ql/test-kotlin1/TestUtilities/internal/InlineExpectationsTestImpl.qll
index cd62fdb757e0..646501a84c91 100644
--- a/java/ql/test-kotlin1/TestUtilities/internal/InlineExpectationsTestImpl.qll
+++ b/java/ql/test-kotlin1/TestUtilities/internal/InlineExpectationsTestImpl.qll
@@ -32,4 +32,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = J::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(J::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }
diff --git a/java/ql/test-kotlin1/library-tests/kclass-java-arg/test.expected b/java/ql/test-kotlin1/library-tests/kclass-java-arg/test.expected
new file mode 100644
index 000000000000..7410c1676f77
--- /dev/null
+++ b/java/ql/test-kotlin1/library-tests/kclass-java-arg/test.expected
@@ -0,0 +1 @@
+| consume | Class<Target> |
diff --git a/java/ql/test-kotlin1/library-tests/kclass-java-arg/test.kt b/java/ql/test-kotlin1/library-tests/kclass-java-arg/test.kt
new file mode 100644
index 000000000000..c3bfc80fd03e
--- /dev/null
+++ b/java/ql/test-kotlin1/library-tests/kclass-java-arg/test.kt
@@ -0,0 +1,10 @@
+class Target
+
+class KClassJavaArg {
+    fun consume(c: Class<*>) {}
+
+    fun test() {
+        // `Target::class.java` must be extracted as the argument to `consume`.
+        consume(Target::class.java)
+    }
+}
diff --git a/java/ql/test-kotlin1/library-tests/kclass-java-arg/test.ql b/java/ql/test-kotlin1/library-tests/kclass-java-arg/test.ql
new file mode 100644
index 000000000000..e4b98d76d1cd
--- /dev/null
+++ b/java/ql/test-kotlin1/library-tests/kclass-java-arg/test.ql
@@ -0,0 +1,5 @@
+import java
+
+from MethodCall mc, Argument arg
+where mc.getMethod().hasName("consume") and arg = mc.getAnArgument()
+select mc.getMethod().getName(), arg.getType().getName()
diff --git a/java/ql/test-kotlin2/TestUtilities/internal/InlineExpectationsTestImpl.qll b/java/ql/test-kotlin2/TestUtilities/internal/InlineExpectationsTestImpl.qll
index cd62fdb757e0..646501a84c91 100644
--- a/java/ql/test-kotlin2/TestUtilities/internal/InlineExpectationsTestImpl.qll
+++ b/java/ql/test-kotlin2/TestUtilities/internal/InlineExpectationsTestImpl.qll
@@ -32,4 +32,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = J::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(J::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }
diff --git a/java/ql/test-kotlin2/library-tests/kclass-java-arg/test.expected b/java/ql/test-kotlin2/library-tests/kclass-java-arg/test.expected
new file mode 100644
index 000000000000..7410c1676f77
--- /dev/null
+++ b/java/ql/test-kotlin2/library-tests/kclass-java-arg/test.expected
@@ -0,0 +1 @@
+| consume | Class<Target> |
diff --git a/java/ql/test-kotlin2/library-tests/kclass-java-arg/test.kt b/java/ql/test-kotlin2/library-tests/kclass-java-arg/test.kt
new file mode 100644
index 000000000000..c3bfc80fd03e
--- /dev/null
+++ b/java/ql/test-kotlin2/library-tests/kclass-java-arg/test.kt
@@ -0,0 +1,10 @@
+class Target
+
+class KClassJavaArg {
+    fun consume(c: Class<*>) {}
+
+    fun test() {
+        // `Target::class.java` must be extracted as the argument to `consume`.
+        consume(Target::class.java)
+    }
+}
diff --git a/java/ql/test-kotlin2/library-tests/kclass-java-arg/test.ql b/java/ql/test-kotlin2/library-tests/kclass-java-arg/test.ql
new file mode 100644
index 000000000000..e4b98d76d1cd
--- /dev/null
+++ b/java/ql/test-kotlin2/library-tests/kclass-java-arg/test.ql
@@ -0,0 +1,5 @@
+import java
+
+from MethodCall mc, Argument arg
+where mc.getMethod().hasName("consume") and arg = mc.getAnArgument()
+select mc.getMethod().getName(), arg.getType().getName()
diff --git a/java/ql/test/library-tests/dataflow/local-additional-taint/localAdditionalTaintStep.ql b/java/ql/test/library-tests/dataflow/local-additional-taint/localAdditionalTaintStep.ql
index ce43c1a216aa..dc1aa584a890 100644
--- a/java/ql/test/library-tests/dataflow/local-additional-taint/localAdditionalTaintStep.ql
+++ b/java/ql/test/library-tests/dataflow/local-additional-taint/localAdditionalTaintStep.ql
@@ -13,7 +13,7 @@ predicate taintFlowUpdate(DataFlow::ParameterNode p1, DataFlow::ParameterNode p2
 }
 
 predicate summaryStep(FlowSummaryNode src, FlowSummaryNode sink) {
-  FlowSummaryImpl::Private::Steps::summaryLocalStep(src, sink.getSummaryNode(), false, _) or
+  FlowSummaryImpl::Private::Steps::summaryLocalStep(src, sink, false, _) or
   FlowSummaryImpl::Private::Steps::summaryReadStep(src.getSummaryNode(), _, sink.getSummaryNode()) or
   FlowSummaryImpl::Private::Steps::summaryStoreStep(src.getSummaryNode(), _, sink.getSummaryNode())
 }
diff --git a/java/ql/test/library-tests/dataflow/string-valueof/A.java b/java/ql/test/library-tests/dataflow/string-valueof/A.java
new file mode 100644
index 000000000000..cf9d6ea8c1d7
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/string-valueof/A.java
@@ -0,0 +1,26 @@
+public class A {
+  String source() { return "source"; }
+
+  void sink(Object o) {}
+
+  void m() {
+    String s = source();
+
+    sink(String.valueOf(s)); // $ hasTaintFlow
+
+    CharSequence seq = s;
+    sink(String.valueOf(seq)); // $ hasTaintFlow
+
+    StringBuilder sb = new StringBuilder(s);
+    sink(String.valueOf(sb)); // $ hasTaintFlow
+
+    sink(String.valueOf(s.toCharArray())); // $ hasTaintFlow
+
+    sink(String.valueOf(s.charAt(0))); // $ hasTaintFlow
+
+    // `toString` on an arbitrary object is not assumed to expose the state of
+    // the object, so no flow is expected here.
+    Object o = s;
+    sink(String.valueOf(o));
+  }
+}
diff --git a/java/ql/test/library-tests/dataflow/string-valueof/test.expected b/java/ql/test/library-tests/dataflow/string-valueof/test.expected
new file mode 100644
index 000000000000..851523f93087
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/string-valueof/test.expected
@@ -0,0 +1,39 @@
+models
+| 1 | Summary: java.lang; CharSequence; true; charAt; ; ; Argument[this]; ReturnValue; taint; manual |
+| 2 | Summary: java.lang; String; false; toCharArray; ; ; Argument[this]; ReturnValue; taint; manual |
+| 3 | Summary: java.lang; String; false; valueOf; (char); ; Argument[0]; ReturnValue; taint; manual |
+| 4 | Summary: java.lang; String; false; valueOf; (char[]); ; Argument[0]; ReturnValue; taint; manual |
+| 5 | Summary: java.lang; StringBuilder; true; StringBuilder; ; ; Argument[0]; Argument[this]; taint; manual |
+edges
+| A.java:7:16:7:23 | source(...) : String | A.java:9:25:9:25 | s : String | provenance |  |
+| A.java:7:16:7:23 | source(...) : String | A.java:12:25:12:27 | seq : String | provenance |  |
+| A.java:7:16:7:23 | source(...) : String | A.java:14:42:14:42 | s : String | provenance |  |
+| A.java:7:16:7:23 | source(...) : String | A.java:17:25:17:25 | s : String | provenance |  |
+| A.java:7:16:7:23 | source(...) : String | A.java:19:25:19:25 | s : String | provenance |  |
+| A.java:9:25:9:25 | s : String | A.java:9:10:9:26 | valueOf(...) | provenance | java.lang.String.valueOf(Object)+CharSequence |
+| A.java:12:25:12:27 | seq : String | A.java:12:10:12:28 | valueOf(...) | provenance | java.lang.String.valueOf(Object)+CharSequence |
+| A.java:14:24:14:43 | new StringBuilder(...) : StringBuilder | A.java:15:25:15:26 | sb : StringBuilder | provenance |  |
+| A.java:14:42:14:42 | s : String | A.java:14:24:14:43 | new StringBuilder(...) : StringBuilder | provenance | MaD:5 |
+| A.java:15:25:15:26 | sb : StringBuilder | A.java:15:10:15:27 | valueOf(...) | provenance | java.lang.String.valueOf(Object)+CharSequence |
+| A.java:17:25:17:25 | s : String | A.java:17:25:17:39 | toCharArray(...) : char[] | provenance | MaD:2 |
+| A.java:17:25:17:39 | toCharArray(...) : char[] | A.java:17:10:17:40 | valueOf(...) | provenance | MaD:4 |
+| A.java:19:25:19:25 | s : String | A.java:19:25:19:35 | charAt(...) : Number | provenance | MaD:1 |
+| A.java:19:25:19:35 | charAt(...) : Number | A.java:19:10:19:36 | valueOf(...) | provenance | MaD:3 |
+nodes
+| A.java:7:16:7:23 | source(...) : String | semmle.label | source(...) : String |
+| A.java:9:10:9:26 | valueOf(...) | semmle.label | valueOf(...) |
+| A.java:9:25:9:25 | s : String | semmle.label | s : String |
+| A.java:12:10:12:28 | valueOf(...) | semmle.label | valueOf(...) |
+| A.java:12:25:12:27 | seq : String | semmle.label | seq : String |
+| A.java:14:24:14:43 | new StringBuilder(...) : StringBuilder | semmle.label | new StringBuilder(...) : StringBuilder |
+| A.java:14:42:14:42 | s : String | semmle.label | s : String |
+| A.java:15:10:15:27 | valueOf(...) | semmle.label | valueOf(...) |
+| A.java:15:25:15:26 | sb : StringBuilder | semmle.label | sb : StringBuilder |
+| A.java:17:10:17:40 | valueOf(...) | semmle.label | valueOf(...) |
+| A.java:17:25:17:25 | s : String | semmle.label | s : String |
+| A.java:17:25:17:39 | toCharArray(...) : char[] | semmle.label | toCharArray(...) : char[] |
+| A.java:19:10:19:36 | valueOf(...) | semmle.label | valueOf(...) |
+| A.java:19:25:19:25 | s : String | semmle.label | s : String |
+| A.java:19:25:19:35 | charAt(...) : Number | semmle.label | charAt(...) : Number |
+subpaths
+testFailures
diff --git a/java/ql/test/library-tests/dataflow/string-valueof/test.ql b/java/ql/test/library-tests/dataflow/string-valueof/test.ql
new file mode 100644
index 000000000000..e64b8bfececb
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/string-valueof/test.ql
@@ -0,0 +1,3 @@
+import utils.test.InlineFlowTest
+import DefaultFlowTest
+import TaintFlow::PathGraph
diff --git a/java/ql/test/library-tests/dataflow/taintsources/MicronautConfig.java b/java/ql/test/library-tests/dataflow/taintsources/MicronautConfig.java
new file mode 100644
index 000000000000..a2dcca0b5cf1
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/taintsources/MicronautConfig.java
@@ -0,0 +1,35 @@
+import io.micronaut.context.annotation.Value;
+import io.micronaut.context.annotation.Property;
+import io.micronaut.http.annotation.*;
+
+@Controller("/config")
+class MicronautConfig {
+
+    private static void sink(Object o) {}
+
+    @Value("${app.secret}")
+    String secretValue;
+
+    @Property(name = "app.api-key")
+    String apiKey;
+
+    @Get("/secret")
+    void testValueField() {
+        sink(secretValue); // $ hasLocalValueFlow
+    }
+
+    @Get("/key")
+    void testPropertyField() {
+        sink(apiKey); // $ hasLocalValueFlow
+    }
+
+    @Get("/param")
+    void testPropertyParam(@Property(name = "app.api-key") String appName) {
+        sink(appName); // $ hasLocalValueFlow
+    }
+
+    @Get("/param")
+    void testValueParam(@Value("${app.name}") String appName) {
+        sink(appName); // $ hasLocalValueFlow
+    }
+}
diff --git a/java/ql/test/library-tests/dataflow/taintsources/options b/java/ql/test/library-tests/dataflow/taintsources/options
index 1ae3d158cec8..04284151d078 100644
--- a/java/ql/test/library-tests/dataflow/taintsources/options
+++ b/java/ql/test/library-tests/dataflow/taintsources/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/jakarta.servlet-api-6.0.0:${testdir}/../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../stubs/javax-servlet-2.5:${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/google-android-9.0.0:${testdir}/../../../stubs/playframework-2.6.x:${testdir}/../../../stubs/jackson-databind-2.12:${testdir}/../../../stubs/jackson-core-2.12:${testdir}/../../../stubs/akka-2.6.x:${testdir}/../../../stubs/jwtk-jjwt-0.11.2:${testdir}/../../../stubs/jenkins:${testdir}/../../../stubs/stapler-1.263
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/jakarta.servlet-api-6.0.0:${testdir}/../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../stubs/javax-servlet-2.5:${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/google-android-9.0.0:${testdir}/../../../stubs/playframework-2.6.x:${testdir}/../../../stubs/jackson-databind-2.12:${testdir}/../../../stubs/jackson-core-2.12:${testdir}/../../../stubs/akka-2.6.x:${testdir}/../../../stubs/jwtk-jjwt-0.11.2:${testdir}/../../../stubs/jenkins:${testdir}/../../../stubs/stapler-1.263:${testdir}/../../../stubs/micronaut-4.x
\ No newline at end of file
diff --git a/java/ql/test/library-tests/default-taint-sanitizer/CONSISTENCY/typeParametersInScope.expected b/java/ql/test/library-tests/default-taint-sanitizer/CONSISTENCY/typeParametersInScope.expected
new file mode 100644
index 000000000000..355fb350542e
--- /dev/null
+++ b/java/ql/test/library-tests/default-taint-sanitizer/CONSISTENCY/typeParametersInScope.expected
@@ -0,0 +1 @@
+| Type ConstantValue uses out-of-scope type variable E. Note the Java extractor is known to sometimes do this; the Kotlin extractor should not. |
diff --git a/java/ql/test/library-tests/default-taint-sanitizer/ConstantValue.java b/java/ql/test/library-tests/default-taint-sanitizer/ConstantValue.java
new file mode 100644
index 000000000000..a9c422e64c52
--- /dev/null
+++ b/java/ql/test/library-tests/default-taint-sanitizer/ConstantValue.java
@@ -0,0 +1,59 @@
+import java.util.*;
+
+public class ConstantValue {
+  private static final Set<String> SEPARATORS =
+      Collections.unmodifiableSet(
+          new HashSet<>(Arrays.asList("\t", "\n", ";")));
+
+  public static void sink(String s) { }
+
+  private void checkSeparator(String separator) {
+    if (SEPARATORS.contains(separator)) {
+      sink(separator);
+    }
+  }
+
+  public static final String URI1 = "yarn.io/gpu";
+  public static final String URI2 = "yarn.io/fpga";
+
+  public static final Set<String> SCHEMAS = Set.of(URI1, URI2, "s3a", "wasb");
+
+  private void checkSchema(String schema) {
+    if (SCHEMAS.contains(schema)) {
+      sink(schema);
+    }
+  }
+
+  private void testAdd(String inp) {
+    Set<String> s = new HashSet<>();
+    s.add("AA");
+    s.add("BB");
+    if (s.contains(inp.toUpperCase())) {
+      sink(inp);
+    }
+  }
+
+  private void checkEquals(String input) {
+    if ("AA".equals(input)) {
+      sink(input);
+    }
+  }
+
+  private void checkEqualsIgnoreCase(String input) {
+    if (input.equalsIgnoreCase("AA")) {
+      sink(input);
+    }
+  }
+
+  private void checkWrongBranch(String input) {
+    if (!"AA".equals(input)) {
+      sink(input);
+    }
+  }
+
+  private void checkUntrustedValue(String input, String allowed) {
+    if (allowed.equals(input)) {
+      sink(input);
+    }
+  }
+}
diff --git a/java/ql/test/library-tests/default-taint-sanitizer/test.expected b/java/ql/test/library-tests/default-taint-sanitizer/test.expected
new file mode 100644
index 000000000000..f275a0b13b27
--- /dev/null
+++ b/java/ql/test/library-tests/default-taint-sanitizer/test.expected
@@ -0,0 +1,5 @@
+| ConstantValue.java:12:12:12:20 | separator |
+| ConstantValue.java:23:12:23:17 | schema |
+| ConstantValue.java:32:12:32:14 | inp |
+| ConstantValue.java:38:12:38:16 | input |
+| ConstantValue.java:44:12:44:16 | input |
diff --git a/java/ql/test/library-tests/listofconstants/test.ql b/java/ql/test/library-tests/default-taint-sanitizer/test.ql
similarity index 100%
rename from java/ql/test/library-tests/listofconstants/test.ql
rename to java/ql/test/library-tests/default-taint-sanitizer/test.ql
diff --git a/java/ql/test/library-tests/frameworks/micronaut/MicronautControllerTest.java b/java/ql/test/library-tests/frameworks/micronaut/MicronautControllerTest.java
new file mode 100644
index 000000000000..582a10829ead
--- /dev/null
+++ b/java/ql/test/library-tests/frameworks/micronaut/MicronautControllerTest.java
@@ -0,0 +1,129 @@
+import io.micronaut.http.annotation.*;
+import io.micronaut.http.*;
+import io.micronaut.http.cookie.Cookies;
+import io.micronaut.http.cookie.Cookie;
+import java.io.InputStream;
+import java.io.Reader;
+
+@Controller("/test")
+class MicronautControllerTest {
+
+    void sink(Object o) {}
+
+    @Get("/path/{id}")
+    void testPathVariable(@PathVariable String id) {
+        sink(id); // $ hasTaintFlow
+    }
+
+    @Get("/query")
+    void testQueryValue(@QueryValue String name) {
+        sink(name); // $ hasTaintFlow
+    }
+
+    @Post("/body")
+    void testBody(@Body String body) {
+        sink(body); // $ hasTaintFlow
+    }
+
+    @Get("/header")
+    void testHeader(@Header String authorization) {
+        sink(authorization); // $ hasTaintFlow
+    }
+
+    @Get("/cookie")
+    void testCookieValue(@CookieValue String sessionId) {
+        sink(sessionId); // $ hasTaintFlow
+    }
+
+    @Post("/part")
+    void testPart(@Part String name) {
+        sink(name); // $ hasTaintFlow
+    }
+
+    @Get("/attr")
+    void testRequestAttribute(@RequestAttribute String attr) {
+        sink(attr); // $ hasTaintFlow
+    }
+
+    @Post("/bean")
+    void testRequestBean(@RequestBean Object bean) {
+        sink(bean); // $ hasTaintFlow
+    }
+
+    @Get("/implicit")
+    void testImplicitParam(String implicitParam) {
+        sink(implicitParam); // $ hasTaintFlow
+    }
+
+    @Get("/request")
+    void testHttpRequest(HttpRequest<String> request) {
+        sink(request); // $ hasTaintFlow
+    }
+
+    @Get("/headers")
+    void testHttpHeaders(HttpHeaders headers) {
+        sink(headers); // $ hasTaintFlow
+    }
+
+    @Get("/parameters")
+    void testHttpParameters(HttpParameters parameters) {
+        sink(parameters); // $ hasTaintFlow
+    }
+
+    @Get("/cookies")
+    void testCookies(Cookies cookies) {
+        sink(cookies); // $ hasTaintFlow
+        sink(cookies.getValue("session")); // $ hasTaintFlow
+        for (java.util.Map.Entry<String, Cookie> entry : cookies) {
+            sink(entry.getValue()); // $ hasTaintFlow
+        }
+    }
+
+    @Post("/stream")
+    void testInputStream(@Body InputStream stream) {
+        sink(stream); // $ hasTaintFlow
+    }
+
+    @Post("/reader")
+    void testReader(Reader reader) {
+        sink(reader);
+    }
+
+    @Post("/post")
+    void testPostMethod(@Body String data) {
+        sink(data); // $ hasTaintFlow
+    }
+
+    @Put("/put")
+    void testPutMethod(@Body String data) {
+        sink(data); // $ hasTaintFlow
+    }
+
+    @Delete("/delete/{id}")
+    void testDeleteMethod(@PathVariable String id) {
+        sink(id); // $ hasTaintFlow
+    }
+
+    @Patch("/patch")
+    void testPatchMethod(@Body String data) {
+        sink(data); // $ hasTaintFlow
+    }
+
+    @io.micronaut.http.annotation.Error
+    void testErrorHandler(HttpRequest<?> request) {
+        sink(request); // $ hasTaintFlow
+    }
+
+    @io.micronaut.http.annotation.Error
+    void testAnnotatedErrorHandler(@Header String header, @RequestBean Object bean) {
+        sink(header); // $ hasTaintFlow
+        sink(bean); // $ hasTaintFlow
+    }
+
+    @io.micronaut.http.annotation.Error
+    void testErrorHandlerCarriers(HttpHeaders headers, HttpParameters parameters, Cookies cookies) {
+        sink(headers); // $ hasTaintFlow
+        sink(parameters); // $ hasTaintFlow
+        sink(cookies); // $ hasTaintFlow
+    }
+}
diff --git a/java/ql/test/library-tests/frameworks/micronaut/MicronautFileUploadTest.java b/java/ql/test/library-tests/frameworks/micronaut/MicronautFileUploadTest.java
new file mode 100644
index 000000000000..7cff0859358c
--- /dev/null
+++ b/java/ql/test/library-tests/frameworks/micronaut/MicronautFileUploadTest.java
@@ -0,0 +1,18 @@
+import io.micronaut.http.annotation.*;
+import io.micronaut.http.multipart.CompletedFileUpload;
+import java.io.IOException;
+
+@Controller("/upload")
+class MicronautFileUploadTest {
+
+    void sink(Object o) {}
+
+    @Post("/file")
+    void testFileUpload(CompletedFileUpload file) throws IOException {
+        sink(file.getFilename()); // $ hasTaintFlow
+        sink(file.getBytes()); // $ hasTaintFlow
+        sink(file.getInputStream()); // $ hasTaintFlow
+        sink(file.getContentType()); // $ hasTaintFlow
+        sink(file.getSize()); // $ hasTaintFlow
+    }
+}
diff --git a/java/ql/test/library-tests/frameworks/micronaut/MicronautHttpClientTest.java b/java/ql/test/library-tests/frameworks/micronaut/MicronautHttpClientTest.java
new file mode 100644
index 000000000000..6bac6e838006
--- /dev/null
+++ b/java/ql/test/library-tests/frameworks/micronaut/MicronautHttpClientTest.java
@@ -0,0 +1,184 @@
+import io.micronaut.http.*;
+import io.micronaut.http.client.HttpClient;
+import io.micronaut.http.client.BlockingHttpClient;
+import io.micronaut.http.uri.UriBuilder;
+import io.micronaut.core.type.Argument;
+import java.net.URI;
+import java.util.Collections;
+
+class MicronautHttpClientTest {
+
+    void sink(Object o) {}
+
+    String taint() {
+        return null;
+    }
+
+    HttpClient client;
+
+    void testRetrieveString() {
+        String url = taint();
+        client.toBlocking().retrieve(url); // $ hasTaintFlow
+    }
+
+    void testRetrieveStringClass() {
+        String url = taint();
+        client.toBlocking().retrieve(url, String.class); // $ hasTaintFlow
+    }
+
+    void testExchangeString() {
+        String url = taint();
+        client.toBlocking().exchange(url); // $ hasTaintFlow
+    }
+
+    void testExchangeStringClass() {
+        String url = taint();
+        client.toBlocking().exchange(url, String.class); // $ hasTaintFlow
+    }
+
+    void testRetrieveStringClassClass() {
+        client.toBlocking().retrieve(taint(), String.class, Object.class); // $ hasTaintFlow
+    }
+
+    void testExchangeStringClassClass() {
+        client.toBlocking().exchange(taint(), String.class, Object.class); // $ hasTaintFlow
+    }
+
+    void testBlockingRequest() {
+        client.toBlocking().retrieve(HttpRequest.GET(taint())); // $ hasTaintFlow
+        client.toBlocking().retrieve(HttpRequest.GET(taint()), String.class); // $ hasTaintFlow
+        client.toBlocking().retrieve(HttpRequest.GET(taint()), new Argument<String>()); // $ hasTaintFlow
+        client.toBlocking().retrieve(HttpRequest.GET(taint()), new Argument<String>(), new Argument<Object>()); // $ hasTaintFlow
+        client.toBlocking().exchange(HttpRequest.GET(taint())); // $ hasTaintFlow
+        client.toBlocking().exchange(HttpRequest.GET(taint()), String.class); // $ hasTaintFlow
+        client.toBlocking().exchange(HttpRequest.GET(taint()), new Argument<String>()); // $ hasTaintFlow
+        client.toBlocking().exchange(HttpRequest.GET(taint()), new Argument<String>(), new Argument<Object>()); // $ hasTaintFlow
+    }
+
+    void testNonBlockingClient() {
+        client.retrieve(taint()); // $ hasTaintFlow
+        client.exchange(taint()); // $ hasTaintFlow
+        client.exchange(taint(), String.class); // $ hasTaintFlow
+        client.retrieve(HttpRequest.GET(taint())); // $ hasTaintFlow
+        client.retrieve(HttpRequest.GET(taint()), String.class); // $ hasTaintFlow
+        client.retrieve(HttpRequest.GET(taint()), new Argument<String>()); // $ hasTaintFlow
+        client.retrieve(HttpRequest.GET(taint()), new Argument<String>(), new Argument<Object>()); // $ hasTaintFlow
+        client.exchange(HttpRequest.GET(taint())); // $ hasTaintFlow
+        client.exchange(HttpRequest.GET(taint()), String.class); // $ hasTaintFlow
+        client.exchange(HttpRequest.GET(taint()), new Argument<String>()); // $ hasTaintFlow
+        client.exchange(HttpRequest.GET(taint()), new Argument<String>(), new Argument<Object>()); // $ hasTaintFlow
+    }
+
+    void testGetFactory() {
+        HttpRequest<?> req = HttpRequest.GET(taint());
+        sink(req); // $ hasTaintFlow
+    }
+
+    void testPostFactory() {
+        HttpRequest<?> req = HttpRequest.POST(taint(), "body");
+        sink(req); // $ hasTaintFlow
+    }
+
+    void testPutFactory() {
+        HttpRequest<?> req = HttpRequest.PUT(taint(), "body");
+        sink(req); // $ hasTaintFlow
+    }
+
+    void testDeleteFactory() {
+        HttpRequest<?> req = HttpRequest.DELETE(taint());
+        sink(req); // $ hasTaintFlow
+    }
+
+    void testPatchFactory() {
+        HttpRequest<?> req = HttpRequest.PATCH(taint(), "body");
+        sink(req); // $ hasTaintFlow
+    }
+
+    void testHeadFactory() {
+        HttpRequest<?> req = HttpRequest.HEAD(taint());
+        sink(req); // $ hasTaintFlow
+    }
+
+    void testOptionsFactory() {
+        HttpRequest<?> req = HttpRequest.OPTIONS(taint());
+        sink(req); // $ hasTaintFlow
+    }
+
+    void testUriFactories() {
+        sink(HttpRequest.GET(URI.create(taint()))); // $ hasTaintFlow
+        sink(HttpRequest.POST(URI.create(taint()), "body")); // $ hasTaintFlow
+        sink(HttpRequest.PUT(URI.create(taint()), "body")); // $ hasTaintFlow
+        sink(HttpRequest.DELETE(URI.create(taint()))); // $ hasTaintFlow
+        sink(HttpRequest.DELETE(URI.create(taint()), "body")); // $ hasTaintFlow
+        sink(HttpRequest.PATCH(URI.create(taint()), "body")); // $ hasTaintFlow
+        sink(HttpRequest.HEAD(URI.create(taint()))); // $ hasTaintFlow
+        sink(HttpRequest.OPTIONS(URI.create(taint()))); // $ hasTaintFlow
+    }
+
+    void testDeleteFactoryWithBody() {
+        sink(HttpRequest.DELETE(taint(), "body")); // $ hasTaintFlow
+    }
+
+    void testUriBuilderOfCharSequence() {
+        URI uri = UriBuilder.of(taint()).build();
+        sink(uri); // $ hasTaintFlow
+    }
+
+    void testUriBuilderOfUri() {
+        URI uri = UriBuilder.of(URI.create(taint())).build();
+        sink(uri); // $ hasTaintFlow
+    }
+
+    void testUriBuilderHost() {
+        URI uri = UriBuilder.of("http://example.com").host(taint()).build();
+        sink(uri); // $ hasTaintFlow
+    }
+
+    void testUriBuilderPath() {
+        URI uri = UriBuilder.of("http://example.com").path(taint()).build();
+        sink(uri); // $ hasTaintFlow
+    }
+
+    void testUriBuilderQueryParamName() {
+        URI uri = UriBuilder.of("http://example.com").queryParam(taint(), "value").build();
+        sink(uri); // $ hasTaintFlow
+    }
+
+    void testUriBuilderQueryParamValue() {
+        URI uri = UriBuilder.of("http://example.com").queryParam("key", taint()).build();
+        sink(uri); // $ hasTaintFlow
+    }
+
+    void testUriBuilderFragment() {
+        URI uri = UriBuilder.of("http://example.com").fragment(taint()).build();
+        sink(uri); // $ hasTaintFlow
+    }
+
+    void testUriBuilderMutation() {
+        UriBuilder builder = UriBuilder.of("http://example.com");
+        builder.host(taint());
+        sink(builder.build()); // $ hasTaintFlow
+    }
+
+    void testUriBuilderReplaceQueryParam() {
+        URI uri = UriBuilder.of("http://example.com").replaceQueryParam("key", taint()).build();
+        sink(uri); // $ hasTaintFlow
+    }
+
+    void testUriBuilderAdditionalFluentMethods() {
+        sink(UriBuilder.of("http://example.com").scheme(taint()).build()); // $ hasTaintFlow
+        sink(UriBuilder.of("http://example.com").userInfo(taint()).build()); // $ hasTaintFlow
+        sink(UriBuilder.of("http://example.com").replacePath(taint()).build()); // $ hasTaintFlow
+    }
+
+    void testUriBuilderExpandBuilder() {
+        URI uri = UriBuilder.of(taint()).expand(Collections.singletonMap("id", "value"));
+        sink(uri); // $ hasTaintFlow
+    }
+
+    void testUriBuilderExpandValue() {
+        URI uri = UriBuilder.of("http://example.com/{id}")
+            .expand(Collections.singletonMap("id", taint()));
+        sink(uri); // $ hasTaintFlow
+    }
+}
diff --git a/java/ql/test/library-tests/frameworks/micronaut/MicronautHttpRequestTest.java b/java/ql/test/library-tests/frameworks/micronaut/MicronautHttpRequestTest.java
new file mode 100644
index 000000000000..63f637a97990
--- /dev/null
+++ b/java/ql/test/library-tests/frameworks/micronaut/MicronautHttpRequestTest.java
@@ -0,0 +1,85 @@
+import io.micronaut.http.annotation.*;
+import io.micronaut.http.*;
+import io.micronaut.http.cookie.*;
+import java.util.List;
+import java.util.Map;
+
+@Controller("/http")
+class MicronautHttpRequestTest {
+
+    void sink(Object o) {}
+
+    @Get("/headers")
+    void testHeaders(HttpRequest<?> request) {
+        sink(request.getHeaders()); // $ hasTaintFlow
+        sink(request.getHeaders().get("X-Custom")); // $ hasTaintFlow
+        sink(request.getHeaders().getAll("X-Custom").get(0)); // $ hasTaintFlow
+        sink(request.getHeaders().getFirst("X-Custom").get()); // $ hasTaintFlow
+        sink(request.getHeaders().getValue("X-Custom").get(0)); // $ hasTaintFlow
+        sink(request.getHeaders().values().iterator().next().get(0)); // $ hasTaintFlow
+        sink(request.getHeaders().asMap().get("X-Custom").get(0)); // $ hasTaintFlow
+        sink(request.getHeaders().asProperties().get("X-Custom")); // $ hasTaintFlow
+        sink(request.getHeaders().subMap("X", List.class).get("Custom").get(0)); // $ hasTaintFlow
+        for (Map.Entry<String, List<String>> header : request.getHeaders()) {
+            sink(header.getValue().get(0)); // $ hasTaintFlow
+        }
+    }
+
+    @Get("/params")
+    void testParameters(HttpRequest<?> request) {
+        sink(request.getParameters()); // $ hasTaintFlow
+        sink(request.getParameters().get("q")); // $ hasTaintFlow
+        sink(request.getParameters().getAll("q").get(0)); // $ hasTaintFlow
+        sink(request.getParameters().getFirst("q").get()); // $ hasTaintFlow
+        sink(request.getParameters().getValue("q").get(0)); // $ hasTaintFlow
+        sink(request.getParameters().values().iterator().next().get(0)); // $ hasTaintFlow
+        sink(request.getParameters().asMap().get("q").get(0)); // $ hasTaintFlow
+    }
+
+    @Get("/cookies")
+    void testCookies(HttpRequest<?> request) {
+        sink(request.getCookies()); // $ hasTaintFlow
+        Cookie cookie = request.getCookies().get("session");
+        sink(cookie); // $ hasTaintFlow
+        sink(cookie.getValue()); // $ hasTaintFlow
+        sink(cookie.getName()); // $ hasTaintFlow
+        sink(cookie.getDomain()); // $ hasTaintFlow
+        sink(cookie.getPath()); // $ hasTaintFlow
+        sink(request.getCookies().getAll()); // $ hasTaintFlow
+        sink(request.getCookies().findCookie("session")); // $ hasTaintFlow
+        sink(request.getCookies().getValue("session")); // $ hasTaintFlow
+        sink(request.getCookies().values().iterator().next()); // $ hasTaintFlow
+        sink(request.getCookies().asMap().get("session")); // $ hasTaintFlow
+        for (Map.Entry<String, Cookie> entry : request.getCookies()) {
+            sink(entry.getValue()); // $ hasTaintFlow
+        }
+    }
+
+    @Get("/uri")
+    void testUri(HttpRequest<?> request) {
+        sink(request.getUri()); // $ hasTaintFlow
+        sink(request.getPath()); // $ hasTaintFlow
+        sink(request.getMethodName()); // $ hasTaintFlow
+    }
+
+    @Post("/body")
+    void testBody(HttpRequest<String> request) {
+        sink(request.getBody()); // $ hasTaintFlow
+    }
+
+    @Get("/content")
+    void testContent(HttpRequest<?> request) {
+        sink(request.getContentType()); // $ hasTaintFlow
+        sink(request.getContentLength()); // $ hasTaintFlow
+    }
+
+    @Get("/redirect")
+    HttpResponse<?> testRedirect(HttpRequest<?> request) {
+        return HttpResponse.redirect(request.getUri()); // $ hasTaintFlow
+    }
+
+    @Get("/header-set")
+    HttpResponse<?> testHeaderSplitting(HttpRequest<?> request) {
+        return HttpResponse.ok().header("X-Custom", request.getHeaders().get("User-Input")); // $ hasTaintFlow
+    }
+}
diff --git a/java/ql/test/library-tests/frameworks/micronaut/MicronautWebSocketTest.java b/java/ql/test/library-tests/frameworks/micronaut/MicronautWebSocketTest.java
new file mode 100644
index 000000000000..b019dca7af68
--- /dev/null
+++ b/java/ql/test/library-tests/frameworks/micronaut/MicronautWebSocketTest.java
@@ -0,0 +1,26 @@
+import io.micronaut.websocket.annotation.*;
+import io.micronaut.websocket.CloseReason;
+import io.micronaut.websocket.WebSocketSession;
+
+@ServerWebSocket("/chat/{room}")
+class MicronautWebSocketTest {
+
+    void sink(Object o) {}
+
+    @OnMessage
+    void onMessage(String message, WebSocketSession session) {
+        sink(message); // $ hasTaintFlow
+    }
+
+    @OnOpen
+    void onOpen(String room, WebSocketSession session) {
+        sink(room); // $ hasTaintFlow
+    }
+
+    @OnClose
+    void onClose(String room, CloseReason reason, WebSocketSession session) {
+        sink(room); // $ hasTaintFlow
+        sink(reason);
+        sink(session);
+    }
+}
diff --git a/java/ql/test/library-tests/frameworks/micronaut/flow.expected b/java/ql/test/library-tests/frameworks/micronaut/flow.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/java/ql/test/library-tests/frameworks/micronaut/flow.ql b/java/ql/test/library-tests/frameworks/micronaut/flow.ql
new file mode 100644
index 000000000000..587269f818c1
--- /dev/null
+++ b/java/ql/test/library-tests/frameworks/micronaut/flow.ql
@@ -0,0 +1,25 @@
+import java
+import semmle.code.java.security.RequestForgery
+import semmle.code.java.security.UrlRedirect
+import semmle.code.java.security.ResponseSplitting
+import utils.test.InlineFlowTest
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node n) {
+    n.asExpr().(MethodCall).getMethod().hasName("taint")
+    or
+    n instanceof ActiveThreatModelSource
+  }
+
+  predicate isSink(DataFlow::Node n) {
+    exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
+    or
+    n instanceof RequestForgerySink
+    or
+    n instanceof UrlRedirectSink
+    or
+    n instanceof HeaderSplittingSink
+  }
+}
+
+import TaintFlowTest<Config>
diff --git a/java/ql/test/library-tests/frameworks/micronaut/options b/java/ql/test/library-tests/frameworks/micronaut/options
new file mode 100644
index 000000000000..1dbd9fc24405
--- /dev/null
+++ b/java/ql/test/library-tests/frameworks/micronaut/options
@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/micronaut-4.x
diff --git a/java/ql/test/library-tests/listofconstants/A.java b/java/ql/test/library-tests/listofconstants/A.java
deleted file mode 100644
index 74129692d71d..000000000000
--- a/java/ql/test/library-tests/listofconstants/A.java
+++ /dev/null
@@ -1,35 +0,0 @@
-import java.util.*;
-
-public class A {
-  private static final Set<String> SEPARATORS =
-      Collections.unmodifiableSet(
-          new HashSet<>(Arrays.asList("\t", "\n", ";")));
-
-  public static void sink(String s) { }
-
-  private void checkSeparator(String separator) {
-    if (SEPARATORS.contains(separator)) {
-      sink(separator);
-    }
-  }
-
-  public static final String URI1 = "yarn.io/gpu";
-  public static final String URI2 = "yarn.io/fpga";
-
-  public static final Set<String> SCHEMAS = Set.of(URI1, URI2, "s3a", "wasb");
-
-  private void checkSchema(String schema) {
-    if (SCHEMAS.contains(schema)) {
-      sink(schema);
-    }
-  }
-
-  private void testAdd(String inp) {
-    Set<String> s = new HashSet<>();
-    s.add("AA");
-    s.add("BB");
-    if (s.contains(inp.toUpperCase())) {
-      sink(inp);
-    }
-  }
-}
diff --git a/java/ql/test/library-tests/listofconstants/CONSISTENCY/typeParametersInScope.expected b/java/ql/test/library-tests/listofconstants/CONSISTENCY/typeParametersInScope.expected
deleted file mode 100644
index 1ea902154a6e..000000000000
--- a/java/ql/test/library-tests/listofconstants/CONSISTENCY/typeParametersInScope.expected
+++ /dev/null
@@ -1 +0,0 @@
-| Type A uses out-of-scope type variable E. Note the Java extractor is known to sometimes do this; the Kotlin extractor should not. |
diff --git a/java/ql/test/library-tests/listofconstants/test.expected b/java/ql/test/library-tests/listofconstants/test.expected
deleted file mode 100644
index 203d64cd46dd..000000000000
--- a/java/ql/test/library-tests/listofconstants/test.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| A.java:12:12:12:20 | separator |
-| A.java:23:12:23:17 | schema |
-| A.java:32:12:32:14 | inp |
diff --git a/java/ql/test/library-tests/pathsanitizer/Test.java b/java/ql/test/library-tests/pathsanitizer/Test.java
index 5943d29c144b..44a1110d0a9a 100644
--- a/java/ql/test/library-tests/pathsanitizer/Test.java
+++ b/java/ql/test/library-tests/pathsanitizer/Test.java
@@ -3,6 +3,8 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import android.net.Uri;
+import com.google.common.base.CharMatcher;
+import org.apache.commons.lang3.StringUtils;
 
 public class Test {
 
@@ -227,6 +229,13 @@ public void dotDotCheckGuard() throws Exception {
             else
                 sink(source); // $ hasTaintFlow
         }
+        {
+            String source = (String) source();
+            if (source.startsWith("/safe") && !StringUtils.contains(source, ".."))
+                sink(source); // Safe
+            else
+                sink(source); // $ hasTaintFlow
+        }
         {
             String source = (String) source();
             if (source.startsWith("/safe") && source.indexOf("..") == -1)
@@ -440,6 +449,17 @@ public void blockListGuard() throws Exception {
                 sink(normalized); // $ hasTaintFlow
             }
         }
+        {
+            String source = (String) source();
+            String normalized = Paths.get(source).normalize().toString();
+            if (!StringUtils.contains(normalized, "/data")) {
+                sink(source); // Safe
+                sink(normalized); // Safe
+            } else {
+                sink(source); // $ hasTaintFlow
+                sink(normalized); // $ hasTaintFlow
+            }
+        }
         {
             String source = (String) source();
             String normalized = Paths.get(source).normalize().toString();
@@ -830,6 +850,11 @@ public void directoryCharsSanitizer() throws Exception {
             source = source.replace(".", "").replace("/", "");
             sink(source); // Safe
         }
+        {
+            String source = (String) source();
+            source = source.replace('.', '_').replace('/', '_');
+            sink(source); // Safe
+        }
         {
             String source = (String) source();
             source = source.replace(".", "").replace("/", "").replace("\\", "");
@@ -859,5 +884,46 @@ public void directoryCharsSanitizer() throws Exception {
             source = source.replace("../", "");
             sink(source); // $ hasTaintFlow
         }
+        {
+            String source = (String) source();
+            source = StringUtils.replaceChars(source, "./\\", "_");
+            sink(source); // Safe
+        }
+        {
+            String source = (String) source();
+            source = CharMatcher.anyOf("./\\").replaceFrom(source, '_');
+            sink(source); // Safe
+        }
+        {
+            String source = (String) source();
+            source = CharMatcher.anyOf("./\\").removeFrom(source);
+            sink(source); // Safe
+        }
+        {
+            String source = (String) source();
+            source = CharMatcher.anyOf("/\\").removeFrom(source);
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            if (StringUtils.containsNone(source, "./\\"))
+                sink(source); // Safe
+            else
+                sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            if (CharMatcher.anyOf("./\\").matchesNoneOf(source))
+                sink(source); // Safe
+            else
+                sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            if (CharMatcher.anyOf("/\\").matchesNoneOf(source))
+                sink(source); // $ hasTaintFlow
+            else
+                sink(source); // $ hasTaintFlow
+        }
     }
 }
diff --git a/java/ql/test/library-tests/pathsanitizer/options b/java/ql/test/library-tests/pathsanitizer/options
index 02ea18b0cac3..816c75501e1d 100644
--- a/java/ql/test/library-tests/pathsanitizer/options
+++ b/java/ql/test/library-tests/pathsanitizer/options
@@ -1,2 +1,2 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/google-android-9.0.0
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/google-android-9.0.0:${testdir}/../../stubs/apache-commons-lang3-3.7:${testdir}/../../stubs/guava-30.0
 //codeql-extractor-kotlin-options: ${testdir}/../../stubs/google-android-9.0.0
diff --git a/java/ql/test/query-tests/UnreadLocal/UnreadLocal/UnnamedVariables.java b/java/ql/test/query-tests/UnreadLocal/UnreadLocal/UnnamedVariables.java
new file mode 100644
index 000000000000..887e14a19168
--- /dev/null
+++ b/java/ql/test/query-tests/UnreadLocal/UnreadLocal/UnnamedVariables.java
@@ -0,0 +1,45 @@
+package test;
+
+import java.util.List;
+
+public class UnnamedVariables
+{
+  sealed interface Shape permits Circle, Square {}
+  record Circle(double radius) implements Shape {}
+  record Square(double side) implements Shape {}
+  record Pair(Object left, Object right) {}
+
+  // Not flagged: unnamed variables cannot be read
+  static int side(Shape shape)
+  {
+    return switch (shape) {
+      case Circle _ -> 0;
+      case Square s -> (int) s.side();
+    };
+  }
+
+  static Object left(Object o)
+  {
+    if (o instanceof Pair(var left, _)) {
+      return left;
+    }
+    return switch (o) {
+      case Pair(Object left, Object _) -> left;
+      default -> null;
+    };
+  }
+
+  static int count(List<String> items)
+  {
+    int n = 0;
+    for (String _ : items) {
+      n++;
+    }
+    return n;
+  }
+
+  static void removeFirst(List<String> items)
+  {
+    var _ = items.remove(0);
+  }
+}
diff --git a/java/ql/test/query-tests/UnreadLocal/options b/java/ql/test/query-tests/UnreadLocal/options
new file mode 100644
index 000000000000..5011824a5d7a
--- /dev/null
+++ b/java/ql/test/query-tests/UnreadLocal/options
@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args --release 22
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/SpringJdbc.java b/java/ql/test/query-tests/security/CWE-089/semmle/examples/SpringJdbc.java
index 2772ce95536a..398a7784ed03 100644
--- a/java/ql/test/query-tests/security/CWE-089/semmle/examples/SpringJdbc.java
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/SpringJdbc.java
@@ -1,5 +1,8 @@
 import java.sql.ResultSet;
 import java.util.Map;
+import java.util.function.Supplier;
+import io.r2dbc.spi.Batch;
+import io.r2dbc.spi.Connection;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
@@ -13,6 +16,7 @@
 import org.springframework.jdbc.object.SqlFunction;
 import org.springframework.jdbc.object.SqlUpdate;
 import org.springframework.jdbc.object.UpdatableSqlQuery;
+import org.springframework.r2dbc.core.DatabaseClient;
 
 public class SpringJdbc {
 
@@ -80,4 +84,43 @@ public static void test(JdbcTemplate template, NamedParameterJdbcOperations name
     namedParamTemplate.update(source(), null, null, null); // $ sqlInjection
   }
 
+  public static void testR2dbc(DatabaseClient client, Connection connection, Batch batch) {
+    client.sql(source()); // $ sqlInjection
+    client.sql((Supplier<String>) SpringJdbc::source).fetch(); // $ sqlInjection
+    client.sql((Supplier<String>) SpringJdbc::source).then(); // $ sqlInjection
+    client.sql((Supplier<String>) SpringJdbc::source).map(row -> row); // $ sqlInjection
+    client.sql((Supplier<String>) SpringJdbc::source).map((row, metadata) -> row); // $ sqlInjection
+    client.sql((Supplier<String>) SpringJdbc::source).flatMap(row -> row); // $ sqlInjection
+    client.sql((Supplier<String>) SpringJdbc::source).mapValue(String.class); // $ sqlInjection
+    client.sql((Supplier<String>) SpringJdbc::source).mapProperties(String.class); // $ sqlInjection
+    client.sql((Supplier<String>) SpringJdbc::source)
+        .bind(0, "value")
+        .bind("name", "value")
+        .bindNull(0, String.class)
+        .bindNull("name", String.class)
+        .bindValues(java.util.List.of("value"))
+        .bindValues(java.util.Map.of("name", "value"))
+        .bindProperties(new Object())
+        .filter(statement -> statement)
+        .filter((org.springframework.r2dbc.core.StatementFilterFunction) null) // $ sqlInjection
+        .fetch();
+    connection.createStatement(source()); // $ sqlInjection
+    batch.add(source()); // $ sqlInjection
+    connection.createSavepoint(source()); // $ sqlInjection
+    connection.releaseSavepoint(source()); // $ sqlInjection
+    connection.rollbackTransactionToSavepoint(source()); // $ sqlInjection
+    connection.createStatement("INSERT INTO test VALUES (1)")
+        .returnGeneratedValues(source()); // $ sqlInjection
+
+    client.sql(() -> "SELECT * FROM test WHERE value = :value").bind("value", source()).fetch();
+    client.sql(() -> "SELECT * FROM test").filter(statement -> source()).fetch();
+    client.sql(() -> "SELECT * FROM test").map(row -> source());
+    connection.createStatement("SELECT * FROM test");
+    batch.add("SELECT * FROM test");
+    connection.createSavepoint("savepoint");
+    connection.releaseSavepoint("savepoint");
+    connection.rollbackTransactionToSavepoint("savepoint");
+    connection.createStatement("INSERT INTO test VALUES (1)").returnGeneratedValues("id");
+  }
+
 }
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/io/r2dbc/spi/Batch.java b/java/ql/test/query-tests/security/CWE-089/semmle/examples/io/r2dbc/spi/Batch.java
new file mode 100644
index 000000000000..dda062e2362f
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/io/r2dbc/spi/Batch.java
@@ -0,0 +1,5 @@
+package io.r2dbc.spi;
+
+public interface Batch {
+  Batch add(String sql);
+}
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/io/r2dbc/spi/Connection.java b/java/ql/test/query-tests/security/CWE-089/semmle/examples/io/r2dbc/spi/Connection.java
new file mode 100644
index 000000000000..0269be9693c5
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/io/r2dbc/spi/Connection.java
@@ -0,0 +1,11 @@
+package io.r2dbc.spi;
+
+public interface Connection {
+  Statement createStatement(String sql);
+
+  void createSavepoint(String name);
+
+  void releaseSavepoint(String name);
+
+  void rollbackTransactionToSavepoint(String name);
+}
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/io/r2dbc/spi/Statement.java b/java/ql/test/query-tests/security/CWE-089/semmle/examples/io/r2dbc/spi/Statement.java
new file mode 100644
index 000000000000..216629d0dad3
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/io/r2dbc/spi/Statement.java
@@ -0,0 +1,5 @@
+package io.r2dbc.spi;
+
+public interface Statement {
+  Statement returnGeneratedValues(String... columns);
+}
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/org/springframework/r2dbc/core/DatabaseClient.java b/java/ql/test/query-tests/security/CWE-089/semmle/examples/org/springframework/r2dbc/core/DatabaseClient.java
new file mode 100644
index 000000000000..f36da8510dc5
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/org/springframework/r2dbc/core/DatabaseClient.java
@@ -0,0 +1,47 @@
+package org.springframework.r2dbc.core;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public interface DatabaseClient {
+  GenericExecuteSpec sql(String sql);
+
+  GenericExecuteSpec sql(Supplier<String> sqlSupplier);
+
+  interface GenericExecuteSpec {
+    GenericExecuteSpec bind(int index, Object value);
+
+    GenericExecuteSpec bind(String name, Object value);
+
+    GenericExecuteSpec bindNull(int index, Class<?> type);
+
+    GenericExecuteSpec bindNull(String name, Class<?> type);
+
+    GenericExecuteSpec bindValues(List<Object> values);
+
+    GenericExecuteSpec bindValues(Map<String, Object> values);
+
+    GenericExecuteSpec bindProperties(Object source);
+
+    GenericExecuteSpec filter(Function<Object, Object> filterFunction);
+
+    GenericExecuteSpec filter(StatementFilterFunction filterFunction);
+
+    Object fetch();
+
+    Object then();
+
+    Object map(Function<Object, Object> mappingFunction);
+
+    Object map(BiFunction<Object, Object, Object> mappingFunction);
+
+    Object mapValue(Class<?> mappedClass);
+
+    Object mapProperties(Class<?> mappedClass);
+
+    Object flatMap(Function<Object, Object> mappingFunction);
+  }
+}
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/org/springframework/r2dbc/core/StatementFilterFunction.java b/java/ql/test/query-tests/security/CWE-089/semmle/examples/org/springframework/r2dbc/core/StatementFilterFunction.java
new file mode 100644
index 000000000000..871c6dae9670
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/org/springframework/r2dbc/core/StatementFilterFunction.java
@@ -0,0 +1,4 @@
+package org.springframework.r2dbc.core;
+
+public interface StatementFilterFunction {
+}
diff --git a/java/ql/test/query-tests/security/CWE-113/semmle/tests/MicronautResponseSplitting.java b/java/ql/test/query-tests/security/CWE-113/semmle/tests/MicronautResponseSplitting.java
new file mode 100644
index 000000000000..52381734c75a
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-113/semmle/tests/MicronautResponseSplitting.java
@@ -0,0 +1,49 @@
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.QueryValue;
+import io.micronaut.http.HttpResponse;
+import io.micronaut.http.MutableHttpResponse;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+@Controller("/headers")
+public class MicronautResponseSplitting {
+
+    @Get("/bad")
+    public MutableHttpResponse<?> bad(@QueryValue String headerValue) { // $ Source
+        // BAD: user-controlled header value
+        return HttpResponse.ok().header("X-Custom", headerValue); // $ Alert
+    }
+
+    @Get("/good")
+    public MutableHttpResponse<?> good(@QueryValue String headerValue) {
+        // GOOD: sanitized header value by replacing line breaks
+        String sanitized = headerValue.replace('\n', ' ').replace('\r', ' ');
+        return HttpResponse.ok().header("X-Custom", sanitized);
+    }
+
+    @Get("/bad-map")
+    public MutableHttpResponse<?> badMap(@QueryValue String headerValue) { // $ Source
+        // BAD: user-controlled header value
+        return HttpResponse.ok().headers(Collections.singletonMap("X-Custom", headerValue)); // $ Alert
+    }
+
+    @Get("/bad-map-mutation")
+    public MutableHttpResponse<?> badMapMutation(@QueryValue String headerValue) { // $ Source
+        Map<CharSequence, CharSequence> headers = new HashMap<>();
+        headers.put("X-Custom", headerValue);
+        return HttpResponse.ok().headers(headers); // $ Alert
+    }
+
+    @Get("/good-map")
+    public MutableHttpResponse<?> goodMap() {
+        return HttpResponse.ok().headers(Collections.singletonMap("X-Custom", "safe"));
+    }
+
+    @Get("/good-map-sanitized")
+    public MutableHttpResponse<?> goodMapSanitized(@QueryValue String headerValue) {
+        String sanitized = headerValue.replace('\n', ' ').replace('\r', ' ');
+        return HttpResponse.ok().headers(Collections.singletonMap("X-Custom", sanitized));
+    }
+}
diff --git a/java/ql/test/query-tests/security/CWE-113/semmle/tests/ResponseSplitting.expected b/java/ql/test/query-tests/security/CWE-113/semmle/tests/ResponseSplitting.expected
index ed597e70eb55..3aaffd3ece3f 100644
--- a/java/ql/test/query-tests/security/CWE-113/semmle/tests/ResponseSplitting.expected
+++ b/java/ql/test/query-tests/security/CWE-113/semmle/tests/ResponseSplitting.expected
@@ -1,20 +1,42 @@
 #select
+| MicronautResponseSplitting.java:16:53:16:63 | headerValue | MicronautResponseSplitting.java:14:39:14:68 | headerValue : String | MicronautResponseSplitting.java:16:53:16:63 | headerValue | This header depends on a $@, which may cause a response-splitting vulnerability. | MicronautResponseSplitting.java:14:39:14:68 | headerValue | user-provided value |
+| MicronautResponseSplitting.java:29:42:29:90 | singletonMap(...) | MicronautResponseSplitting.java:27:42:27:71 | headerValue : String | MicronautResponseSplitting.java:29:42:29:90 | singletonMap(...) | This header depends on a $@, which may cause a response-splitting vulnerability. | MicronautResponseSplitting.java:27:42:27:71 | headerValue | user-provided value |
+| MicronautResponseSplitting.java:36:42:36:48 | headers | MicronautResponseSplitting.java:33:50:33:79 | headerValue : String | MicronautResponseSplitting.java:36:42:36:48 | headers | This header depends on a $@, which may cause a response-splitting vulnerability. | MicronautResponseSplitting.java:33:50:33:79 | headerValue | user-provided value |
 | ResponseSplitting.java:23:23:23:28 | cookie | ResponseSplitting.java:22:39:22:66 | getParameter(...) : String | ResponseSplitting.java:23:23:23:28 | cookie | This header depends on a $@, which may cause a response-splitting vulnerability. | ResponseSplitting.java:22:39:22:66 | getParameter(...) | user-provided value |
 | ResponseSplitting.java:28:38:28:72 | getParameter(...) | ResponseSplitting.java:28:38:28:72 | getParameter(...) | ResponseSplitting.java:28:38:28:72 | getParameter(...) | This header depends on a $@, which may cause a response-splitting vulnerability. | ResponseSplitting.java:28:38:28:72 | getParameter(...) | user-provided value |
 | ResponseSplitting.java:29:38:29:72 | getParameter(...) | ResponseSplitting.java:29:38:29:72 | getParameter(...) | ResponseSplitting.java:29:38:29:72 | getParameter(...) | This header depends on a $@, which may cause a response-splitting vulnerability. | ResponseSplitting.java:29:38:29:72 | getParameter(...) | user-provided value |
 | ResponseSplitting.java:59:27:59:57 | replaceFirst(...) | ResponseSplitting.java:53:14:53:48 | getParameter(...) : String | ResponseSplitting.java:59:27:59:57 | replaceFirst(...) | This header depends on a $@, which may cause a response-splitting vulnerability. | ResponseSplitting.java:53:14:53:48 | getParameter(...) | user-provided value |
 edges
-| ResponseSplitting.java:22:20:22:67 | new Cookie(...) : Cookie | ResponseSplitting.java:23:23:23:28 | cookie | provenance | Sink:MaD:1 |
-| ResponseSplitting.java:22:39:22:66 | getParameter(...) : String | ResponseSplitting.java:22:20:22:67 | new Cookie(...) : Cookie | provenance | Src:MaD:3 MaD:5 |
-| ResponseSplitting.java:53:14:53:48 | getParameter(...) : String | ResponseSplitting.java:59:27:59:27 | t : String | provenance | Src:MaD:3  |
-| ResponseSplitting.java:59:27:59:27 | t : String | ResponseSplitting.java:59:27:59:57 | replaceFirst(...) | provenance | MaD:4 Sink:MaD:2 |
+| MicronautResponseSplitting.java:14:39:14:68 | headerValue : String | MicronautResponseSplitting.java:16:53:16:63 | headerValue | provenance | Sink:MaD:1 |
+| MicronautResponseSplitting.java:27:42:27:71 | headerValue : String | MicronautResponseSplitting.java:29:79:29:89 | headerValue : String | provenance |  |
+| MicronautResponseSplitting.java:29:79:29:89 | headerValue : String | MicronautResponseSplitting.java:29:42:29:90 | singletonMap(...) | provenance | MaD:7 Sink:MaD:2 |
+| MicronautResponseSplitting.java:33:50:33:79 | headerValue : String | MicronautResponseSplitting.java:35:33:35:43 | headerValue : String | provenance |  |
+| MicronautResponseSplitting.java:35:9:35:15 | headers [post update] : HashMap [<map.value>] : String | MicronautResponseSplitting.java:36:42:36:48 | headers | provenance | Sink:MaD:2 |
+| MicronautResponseSplitting.java:35:33:35:43 | headerValue : String | MicronautResponseSplitting.java:35:9:35:15 | headers [post update] : HashMap [<map.value>] : String | provenance | MaD:8 |
+| ResponseSplitting.java:22:20:22:67 | new Cookie(...) : Cookie | ResponseSplitting.java:23:23:23:28 | cookie | provenance | Sink:MaD:3 |
+| ResponseSplitting.java:22:39:22:66 | getParameter(...) : String | ResponseSplitting.java:22:20:22:67 | new Cookie(...) : Cookie | provenance | Src:MaD:5 MaD:9 |
+| ResponseSplitting.java:53:14:53:48 | getParameter(...) : String | ResponseSplitting.java:59:27:59:27 | t : String | provenance | Src:MaD:5  |
+| ResponseSplitting.java:59:27:59:27 | t : String | ResponseSplitting.java:59:27:59:57 | replaceFirst(...) | provenance | MaD:6 Sink:MaD:4 |
 models
-| 1 | Sink: javax.servlet.http; HttpServletResponse; false; addCookie; ; ; Argument[0]; response-splitting; manual |
-| 2 | Sink: javax.servlet.http; HttpServletResponse; false; setHeader; ; ; Argument[0..1]; response-splitting; manual |
-| 3 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
-| 4 | Summary: java.lang; String; false; replaceFirst; ; ; Argument[this]; ReturnValue; taint; manual |
-| 5 | Summary: javax.servlet.http; Cookie; false; Cookie; ; ; Argument[1]; Argument[this]; taint; manual |
+| 1 | Sink: io.micronaut.http; MutableHttpResponse; true; header; (CharSequence,CharSequence); ; Argument[1]; response-splitting; manual |
+| 2 | Sink: io.micronaut.http; MutableHttpResponse; true; headers; (Map); ; Argument[0]; response-splitting; manual |
+| 3 | Sink: javax.servlet.http; HttpServletResponse; false; addCookie; ; ; Argument[0]; response-splitting; manual |
+| 4 | Sink: javax.servlet.http; HttpServletResponse; false; setHeader; ; ; Argument[0..1]; response-splitting; manual |
+| 5 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 6 | Summary: java.lang; String; false; replaceFirst; ; ; Argument[this]; ReturnValue; taint; manual |
+| 7 | Summary: java.util; Collections; false; singletonMap; (Object,Object); ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 8 | Summary: java.util; Map; true; put; (Object,Object); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 9 | Summary: javax.servlet.http; Cookie; false; Cookie; ; ; Argument[1]; Argument[this]; taint; manual |
 nodes
+| MicronautResponseSplitting.java:14:39:14:68 | headerValue : String | semmle.label | headerValue : String |
+| MicronautResponseSplitting.java:16:53:16:63 | headerValue | semmle.label | headerValue |
+| MicronautResponseSplitting.java:27:42:27:71 | headerValue : String | semmle.label | headerValue : String |
+| MicronautResponseSplitting.java:29:42:29:90 | singletonMap(...) | semmle.label | singletonMap(...) |
+| MicronautResponseSplitting.java:29:79:29:89 | headerValue : String | semmle.label | headerValue : String |
+| MicronautResponseSplitting.java:33:50:33:79 | headerValue : String | semmle.label | headerValue : String |
+| MicronautResponseSplitting.java:35:9:35:15 | headers [post update] : HashMap [<map.value>] : String | semmle.label | headers [post update] : HashMap [<map.value>] : String |
+| MicronautResponseSplitting.java:35:33:35:43 | headerValue : String | semmle.label | headerValue : String |
+| MicronautResponseSplitting.java:36:42:36:48 | headers | semmle.label | headers |
 | ResponseSplitting.java:22:20:22:67 | new Cookie(...) : Cookie | semmle.label | new Cookie(...) : Cookie |
 | ResponseSplitting.java:22:39:22:66 | getParameter(...) : String | semmle.label | getParameter(...) : String |
 | ResponseSplitting.java:23:23:23:28 | cookie | semmle.label | cookie |
diff --git a/java/ql/test/query-tests/security/CWE-113/semmle/tests/options b/java/ql/test/query-tests/security/CWE-113/semmle/tests/options
index 668a863ac607..2154955f23cb 100644
--- a/java/ql/test/query-tests/security/CWE-113/semmle/tests/options
+++ b/java/ql/test/query-tests/security/CWE-113/semmle/tests/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/servlet-api-2.4
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/micronaut-4.x:${testdir}/../../../../../stubs/servlet-api-2.4
diff --git a/java/ql/test/query-tests/security/CWE-117/LibrarySanitizers.java b/java/ql/test/query-tests/security/CWE-117/LibrarySanitizers.java
new file mode 100644
index 000000000000..d851334e9bb9
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-117/LibrarySanitizers.java
@@ -0,0 +1,121 @@
+package loginjection;
+
+import com.google.common.base.CharMatcher;
+import org.apache.logging.log4j.Logger;
+
+public class LibrarySanitizers {
+    public String source() {
+        return null;
+    }
+
+    public void testJdkSanitizers() {
+        String source = source(); // $ Source
+        Logger logger = null;
+
+        logger.debug(source.replace("\n", "")); // Safe
+        logger.debug(source.replace("\n", "\n")); // $ Alert
+        logger.debug(source.replace("\n", "\r")); // $ Alert
+        logger.debug(source.replace("\r", "")); // Safe
+        logger.debug(source.replace("\r", "\n")); // $ Alert
+        logger.debug(source.replace("\r", "\r")); // $ Alert
+        logger.debug(source.replace("something_else", "")); // $ Alert
+        logger.debug("\n".replace("\n", source)); // $ Alert
+        logger.debug(source.replace('\n', '_')); // Safe
+        logger.debug(source.replace('\n', '\n')); // $ Alert
+        logger.debug(source.replace('\n', '\r')); // $ Alert
+        logger.debug(source.replace('\r', '_')); // Safe
+        logger.debug(source.replace('\r', '\n')); // $ Alert
+        logger.debug(source.replace('\r', '\r')); // $ Alert
+        logger.debug(source.replace('-', '_')); // $ Alert
+        logger.debug(source.replaceAll("\n", "")); // Safe
+        logger.debug(source.replaceAll("\n", "\n")); // $ Alert
+        logger.debug(source.replaceAll("\n", "\r")); // $ Alert
+        logger.debug(source.replaceAll("\r", "")); // Safe
+        logger.debug(source.replaceAll("\r", "\n")); // $ Alert
+        logger.debug(source.replaceAll("\r", "\r")); // $ Alert
+        logger.debug(source.replaceAll("\\n", "")); // Safe
+        logger.debug(source.replaceAll("\\n", "\n")); // $ Alert
+        logger.debug(source.replaceAll("\\n", "\r")); // $ Alert
+        logger.debug(source.replaceAll("\\r", "")); // Safe
+        logger.debug(source.replaceAll("\\r", "\n")); // $ Alert
+        logger.debug(source.replaceAll("\\r", "\r")); // $ Alert
+        logger.debug(source.replaceAll("\\R", "")); // Safe
+        logger.debug(source.replaceAll("\\R", "\n")); // $ Alert
+        logger.debug(source.replaceAll("\\R", "\r")); // $ Alert
+        logger.debug(source.replaceAll("[^a-zA-Z]", "")); // Safe
+        logger.debug(source.replaceAll("[^a-zA-Z]", "\n")); // $ Alert
+        logger.debug(source.replaceAll("[^a-zA-Z]", "\r")); // $ Alert
+        logger.debug(source.replaceAll("[^a-zA-Z\n]", "")); // $ Alert
+        logger.debug(source.replaceAll("[^a-zA-Z\r]", "")); // $ Alert
+        logger.debug(source.replaceAll("[^a-zA-Z\\R]", "")); // $ Alert
+    }
+
+    public void testSanitizers() {
+        String source = source();
+        Logger logger = null;
+
+        logger.debug(org.apache.commons.text.StringEscapeUtils.escapeJava(source));
+        logger.debug(org.apache.commons.lang3.StringEscapeUtils.escapeJava(source));
+        logger.debug(org.owasp.encoder.Encode.forJava(source));
+
+        logger.debug(CharMatcher.anyOf("\r\n").removeFrom(source));
+        logger.debug(CharMatcher.anyOf("\r\n").replaceFrom(source, '_'));
+        logger.debug(CharMatcher.anyOf("\r\n").replaceFrom(source, "_"));
+
+        logger.debug(org.apache.commons.lang3.StringUtils.replaceChars(source, "\r\n", "__"));
+        logger.debug(org.apache.commons.lang3.StringUtils.deleteWhitespace(source));
+        logger.debug(org.apache.commons.lang3.StringUtils.normalizeSpace(source));
+        logger.debug(org.springframework.util.StringUtils.trimAllWhitespace(source));
+    }
+
+    public void testAmbiguousGuavaMatcher(boolean condition) {
+        String source = source(); // $ Source
+        Logger logger = null;
+        CharMatcher matcher;
+
+        if (condition) {
+            matcher = CharMatcher.anyOf("\r\n");
+        } else {
+            matcher = CharMatcher.anyOf("x");
+        }
+
+        logger.debug(matcher.removeFrom(source)); // $ Alert
+    }
+
+    public void testGuards() {
+        String source = source();
+        Logger logger = null;
+
+        if (!source.contains("\n")) {
+            logger.debug(source);
+        }
+
+        if (!org.apache.commons.lang3.StringUtils.contains(source, "\n")) {
+            logger.debug(source);
+        }
+
+        if (!org.apache.commons.lang3.StringUtils.containsIgnoreCase(source, "\n")) {
+            logger.debug(source);
+        }
+
+        if (!org.apache.commons.lang3.StringUtils.containsAny(source, "\r\n")) {
+            logger.debug(source);
+        }
+
+        if (org.apache.commons.lang3.StringUtils.containsNone(source, "\r\n")) {
+            logger.debug(source);
+        }
+
+        if (!CharMatcher.anyOf("\r\n").matchesAnyOf(source)) {
+            logger.debug(source);
+        }
+
+        if (CharMatcher.anyOf("\r\n").matchesNoneOf(source)) {
+            logger.debug(source);
+        }
+
+        if (CharMatcher.noneOf("\r\n").matchesAllOf(source)) {
+            logger.debug(source);
+        }
+    }
+}
diff --git a/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.expected b/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.expected
index 035658641ffc..343687b8a672 100644
--- a/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.expected
+++ b/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.expected
@@ -1,1172 +1,1214 @@
 #select
-| LogInjectionTest.java:38:22:38:47 | replace(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:38:22:38:47 | replace(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:39:22:39:47 | replace(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:39:22:39:47 | replace(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:41:22:41:47 | replace(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:41:22:41:47 | replace(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:42:22:42:47 | replace(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:42:22:42:47 | replace(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:43:22:43:57 | replace(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:43:22:43:57 | replace(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:45:22:45:47 | replace(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:45:22:45:47 | replace(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:46:22:46:47 | replace(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:46:22:46:47 | replace(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:48:22:48:47 | replace(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:48:22:48:47 | replace(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:49:22:49:47 | replace(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:49:22:49:47 | replace(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:50:22:50:45 | replace(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:50:22:50:45 | replace(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:52:22:52:50 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:52:22:52:50 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:53:22:53:50 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:53:22:53:50 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:55:22:55:50 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:55:22:55:50 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:56:22:56:50 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:56:22:56:50 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:58:22:58:51 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:58:22:58:51 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:59:22:59:51 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:59:22:59:51 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:61:22:61:51 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:61:22:61:51 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:62:22:62:51 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:62:22:62:51 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:64:22:64:51 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:64:22:64:51 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:65:22:65:51 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:65:22:65:51 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:67:22:67:57 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:67:22:67:57 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:68:22:68:57 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:68:22:68:57 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:69:22:69:57 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:69:22:69:57 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:70:22:70:57 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:70:22:70:57 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:71:22:71:58 | replaceAll(...) | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:71:22:71:58 | replaceAll(...) | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
-| LogInjectionTest.java:79:26:79:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:79:26:79:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:85:26:85:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:85:26:85:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:91:26:91:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:91:26:91:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:97:26:97:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:97:26:97:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:103:26:103:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:103:26:103:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:109:26:109:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:109:26:109:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:115:26:115:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:115:26:115:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:121:26:121:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:121:26:121:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:127:26:127:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:127:26:127:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:133:26:133:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:133:26:133:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:141:26:141:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:141:26:141:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:147:26:147:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:147:26:147:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:153:26:153:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:153:26:153:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:159:26:159:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:159:26:159:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:165:26:165:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:165:26:165:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:171:26:171:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:171:26:171:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:175:26:175:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:175:26:175:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:177:26:177:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:177:26:177:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:181:26:181:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:181:26:181:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:183:26:183:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:183:26:183:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:187:26:187:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:187:26:187:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:193:26:193:31 | source | LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:193:26:193:31 | source | This log entry depends on a $@. | LogInjectionTest.java:75:34:75:41 | source(...) | user-provided value |
-| LogInjectionTest.java:205:39:205:55 | (...)... | LogInjectionTest.java:205:48:205:55 | source(...) : Object | LogInjectionTest.java:205:39:205:55 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:205:48:205:55 | source(...) | user-provided value |
-| LogInjectionTest.java:206:28:206:35 | source(...) | LogInjectionTest.java:206:28:206:35 | source(...) | LogInjectionTest.java:206:28:206:35 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:206:28:206:35 | source(...) | user-provided value |
-| LogInjectionTest.java:207:28:207:35 | source(...) | LogInjectionTest.java:207:28:207:35 | source(...) | LogInjectionTest.java:207:28:207:35 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:207:28:207:35 | source(...) | user-provided value |
-| LogInjectionTest.java:208:28:208:35 | source(...) | LogInjectionTest.java:208:28:208:35 | source(...) | LogInjectionTest.java:208:28:208:35 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:208:28:208:35 | source(...) | user-provided value |
-| LogInjectionTest.java:209:28:209:35 | source(...) | LogInjectionTest.java:209:28:209:35 | source(...) | LogInjectionTest.java:209:28:209:35 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:209:28:209:35 | source(...) | user-provided value |
-| LogInjectionTest.java:210:28:210:35 | source(...) | LogInjectionTest.java:210:28:210:35 | source(...) | LogInjectionTest.java:210:28:210:35 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:210:28:210:35 | source(...) | user-provided value |
-| LogInjectionTest.java:211:28:211:35 | source(...) | LogInjectionTest.java:211:28:211:35 | source(...) | LogInjectionTest.java:211:28:211:35 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:211:28:211:35 | source(...) | user-provided value |
-| LogInjectionTest.java:212:44:212:51 | source(...) | LogInjectionTest.java:212:44:212:51 | source(...) | LogInjectionTest.java:212:44:212:51 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:212:44:212:51 | source(...) | user-provided value |
-| LogInjectionTest.java:213:27:213:34 | source(...) | LogInjectionTest.java:213:27:213:34 | source(...) | LogInjectionTest.java:213:27:213:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:213:27:213:34 | source(...) | user-provided value |
-| LogInjectionTest.java:214:27:214:34 | source(...) | LogInjectionTest.java:214:27:214:34 | source(...) | LogInjectionTest.java:214:27:214:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:214:27:214:34 | source(...) | user-provided value |
-| LogInjectionTest.java:215:41:215:63 | new Object[] | LogInjectionTest.java:215:55:215:62 | source(...) : Object | LogInjectionTest.java:215:41:215:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:215:55:215:62 | source(...) | user-provided value |
-| LogInjectionTest.java:216:32:216:39 | source(...) | LogInjectionTest.java:216:32:216:39 | source(...) | LogInjectionTest.java:216:32:216:39 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:216:32:216:39 | source(...) | user-provided value |
-| LogInjectionTest.java:217:32:217:39 | source(...) | LogInjectionTest.java:217:32:217:39 | source(...) | LogInjectionTest.java:217:32:217:39 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:217:32:217:39 | source(...) | user-provided value |
-| LogInjectionTest.java:218:38:218:45 | source(...) | LogInjectionTest.java:218:38:218:45 | source(...) | LogInjectionTest.java:218:38:218:45 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:218:38:218:45 | source(...) | user-provided value |
-| LogInjectionTest.java:219:27:219:34 | source(...) | LogInjectionTest.java:219:27:219:34 | source(...) | LogInjectionTest.java:219:27:219:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:219:27:219:34 | source(...) | user-provided value |
-| LogInjectionTest.java:220:27:220:34 | source(...) | LogInjectionTest.java:220:27:220:34 | source(...) | LogInjectionTest.java:220:27:220:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:220:27:220:34 | source(...) | user-provided value |
-| LogInjectionTest.java:225:26:225:48 | (...)... | LogInjectionTest.java:225:41:225:48 | source(...) : Object | LogInjectionTest.java:225:26:225:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:225:41:225:48 | source(...) | user-provided value |
-| LogInjectionTest.java:226:26:226:48 | (...)... | LogInjectionTest.java:226:41:226:48 | source(...) : Object | LogInjectionTest.java:226:26:226:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:226:41:226:48 | source(...) | user-provided value |
-| LogInjectionTest.java:227:41:227:63 | (...)... | LogInjectionTest.java:227:56:227:63 | source(...) : Object | LogInjectionTest.java:227:41:227:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:227:56:227:63 | source(...) | user-provided value |
-| LogInjectionTest.java:228:41:228:63 | (...)... | LogInjectionTest.java:228:56:228:63 | source(...) : Object | LogInjectionTest.java:228:41:228:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:228:56:228:63 | source(...) | user-provided value |
-| LogInjectionTest.java:229:41:229:58 | (...)... | LogInjectionTest.java:229:51:229:58 | source(...) : Object | LogInjectionTest.java:229:41:229:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:229:51:229:58 | source(...) | user-provided value |
-| LogInjectionTest.java:230:41:230:66 | (...)... | LogInjectionTest.java:230:59:230:66 | source(...) : Object | LogInjectionTest.java:230:41:230:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:230:59:230:66 | source(...) | user-provided value |
-| LogInjectionTest.java:231:41:231:66 | (...)... | LogInjectionTest.java:231:59:231:66 | source(...) : Object | LogInjectionTest.java:231:41:231:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:231:59:231:66 | source(...) | user-provided value |
-| LogInjectionTest.java:232:41:232:48 | source(...) | LogInjectionTest.java:232:41:232:48 | source(...) | LogInjectionTest.java:232:41:232:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:232:41:232:48 | source(...) | user-provided value |
-| LogInjectionTest.java:233:41:233:57 | (...)... | LogInjectionTest.java:233:50:233:57 | source(...) : Object | LogInjectionTest.java:233:41:233:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:233:50:233:57 | source(...) | user-provided value |
-| LogInjectionTest.java:234:41:234:57 | (...)... | LogInjectionTest.java:234:50:234:57 | source(...) : Object | LogInjectionTest.java:234:41:234:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:234:50:234:57 | source(...) | user-provided value |
-| LogInjectionTest.java:235:56:235:78 | new Object[] | LogInjectionTest.java:235:70:235:77 | source(...) : Object | LogInjectionTest.java:235:56:235:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:235:70:235:77 | source(...) | user-provided value |
-| LogInjectionTest.java:236:56:236:72 | (...)... | LogInjectionTest.java:236:65:236:72 | source(...) : Object | LogInjectionTest.java:236:56:236:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:236:65:236:72 | source(...) | user-provided value |
-| LogInjectionTest.java:237:41:237:57 | (...)... | LogInjectionTest.java:237:50:237:57 | source(...) : Object | LogInjectionTest.java:237:41:237:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:237:50:237:57 | source(...) | user-provided value |
-| LogInjectionTest.java:238:71:238:87 | (...)... | LogInjectionTest.java:238:80:238:87 | source(...) : Object | LogInjectionTest.java:238:71:238:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:238:80:238:87 | source(...) | user-provided value |
-| LogInjectionTest.java:239:56:239:72 | (...)... | LogInjectionTest.java:239:65:239:72 | source(...) : Object | LogInjectionTest.java:239:56:239:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:239:65:239:72 | source(...) | user-provided value |
-| LogInjectionTest.java:240:41:240:57 | (...)... | LogInjectionTest.java:240:50:240:57 | source(...) : Object | LogInjectionTest.java:240:41:240:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:240:50:240:57 | source(...) | user-provided value |
-| LogInjectionTest.java:241:86:241:102 | (...)... | LogInjectionTest.java:241:95:241:102 | source(...) : Object | LogInjectionTest.java:241:86:241:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:241:95:241:102 | source(...) | user-provided value |
-| LogInjectionTest.java:242:71:242:87 | (...)... | LogInjectionTest.java:242:80:242:87 | source(...) : Object | LogInjectionTest.java:242:71:242:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:242:80:242:87 | source(...) | user-provided value |
-| LogInjectionTest.java:243:56:243:72 | (...)... | LogInjectionTest.java:243:65:243:72 | source(...) : Object | LogInjectionTest.java:243:56:243:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:243:65:243:72 | source(...) | user-provided value |
-| LogInjectionTest.java:244:41:244:57 | (...)... | LogInjectionTest.java:244:50:244:57 | source(...) : Object | LogInjectionTest.java:244:41:244:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:244:50:244:57 | source(...) | user-provided value |
+| LibrarySanitizers.java:16:22:16:47 | replace(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:16:22:16:47 | replace(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:17:22:17:47 | replace(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:17:22:17:47 | replace(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:19:22:19:47 | replace(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:19:22:19:47 | replace(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:20:22:20:47 | replace(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:20:22:20:47 | replace(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:21:22:21:57 | replace(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:21:22:21:57 | replace(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:22:22:22:47 | replace(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:22:22:22:47 | replace(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:24:22:24:47 | replace(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:24:22:24:47 | replace(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:25:22:25:47 | replace(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:25:22:25:47 | replace(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:27:22:27:47 | replace(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:27:22:27:47 | replace(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:28:22:28:47 | replace(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:28:22:28:47 | replace(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:29:22:29:45 | replace(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:29:22:29:45 | replace(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:31:22:31:50 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:31:22:31:50 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:32:22:32:50 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:32:22:32:50 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:34:22:34:50 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:34:22:34:50 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:35:22:35:50 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:35:22:35:50 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:37:22:37:51 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:37:22:37:51 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:38:22:38:51 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:38:22:38:51 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:40:22:40:51 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:40:22:40:51 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:41:22:41:51 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:41:22:41:51 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:43:22:43:51 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:43:22:43:51 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:44:22:44:51 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:44:22:44:51 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:46:22:46:57 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:46:22:46:57 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:47:22:47:57 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:47:22:47:57 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:48:22:48:57 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:48:22:48:57 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:49:22:49:57 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:49:22:49:57 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:50:22:50:58 | replaceAll(...) | LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:50:22:50:58 | replaceAll(...) | This log entry depends on a $@. | LibrarySanitizers.java:12:25:12:32 | source(...) | user-provided value |
+| LibrarySanitizers.java:82:22:82:47 | removeFrom(...) | LibrarySanitizers.java:72:25:72:32 | source(...) : String | LibrarySanitizers.java:82:22:82:47 | removeFrom(...) | This log entry depends on a $@. | LibrarySanitizers.java:72:25:72:32 | source(...) | user-provided value |
+| LogInjectionTest.java:39:26:39:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:39:26:39:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:45:26:45:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:45:26:45:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:51:26:51:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:51:26:51:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:57:26:57:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:57:26:57:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:63:26:63:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:63:26:63:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:69:26:69:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:69:26:69:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:75:26:75:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:75:26:75:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:81:26:81:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:81:26:81:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:87:26:87:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:87:26:87:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:93:26:93:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:93:26:93:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:101:26:101:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:101:26:101:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:107:26:107:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:107:26:107:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:113:26:113:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:113:26:113:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:119:26:119:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:119:26:119:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:125:26:125:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:125:26:125:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:131:26:131:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:131:26:131:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:135:26:135:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:135:26:135:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:137:26:137:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:137:26:137:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:141:26:141:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:141:26:141:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:143:26:143:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:143:26:143:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:147:26:147:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:147:26:147:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:153:26:153:31 | source | LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:153:26:153:31 | source | This log entry depends on a $@. | LogInjectionTest.java:35:34:35:41 | source(...) | user-provided value |
+| LogInjectionTest.java:165:39:165:55 | (...)... | LogInjectionTest.java:165:48:165:55 | source(...) : Object | LogInjectionTest.java:165:39:165:55 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:165:48:165:55 | source(...) | user-provided value |
+| LogInjectionTest.java:166:28:166:35 | source(...) | LogInjectionTest.java:166:28:166:35 | source(...) | LogInjectionTest.java:166:28:166:35 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:166:28:166:35 | source(...) | user-provided value |
+| LogInjectionTest.java:167:28:167:35 | source(...) | LogInjectionTest.java:167:28:167:35 | source(...) | LogInjectionTest.java:167:28:167:35 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:167:28:167:35 | source(...) | user-provided value |
+| LogInjectionTest.java:168:28:168:35 | source(...) | LogInjectionTest.java:168:28:168:35 | source(...) | LogInjectionTest.java:168:28:168:35 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:168:28:168:35 | source(...) | user-provided value |
+| LogInjectionTest.java:169:28:169:35 | source(...) | LogInjectionTest.java:169:28:169:35 | source(...) | LogInjectionTest.java:169:28:169:35 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:169:28:169:35 | source(...) | user-provided value |
+| LogInjectionTest.java:170:28:170:35 | source(...) | LogInjectionTest.java:170:28:170:35 | source(...) | LogInjectionTest.java:170:28:170:35 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:170:28:170:35 | source(...) | user-provided value |
+| LogInjectionTest.java:171:28:171:35 | source(...) | LogInjectionTest.java:171:28:171:35 | source(...) | LogInjectionTest.java:171:28:171:35 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:171:28:171:35 | source(...) | user-provided value |
+| LogInjectionTest.java:172:44:172:51 | source(...) | LogInjectionTest.java:172:44:172:51 | source(...) | LogInjectionTest.java:172:44:172:51 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:172:44:172:51 | source(...) | user-provided value |
+| LogInjectionTest.java:173:27:173:34 | source(...) | LogInjectionTest.java:173:27:173:34 | source(...) | LogInjectionTest.java:173:27:173:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:173:27:173:34 | source(...) | user-provided value |
+| LogInjectionTest.java:174:27:174:34 | source(...) | LogInjectionTest.java:174:27:174:34 | source(...) | LogInjectionTest.java:174:27:174:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:174:27:174:34 | source(...) | user-provided value |
+| LogInjectionTest.java:175:41:175:63 | new Object[] | LogInjectionTest.java:175:55:175:62 | source(...) : Object | LogInjectionTest.java:175:41:175:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:175:55:175:62 | source(...) | user-provided value |
+| LogInjectionTest.java:176:32:176:39 | source(...) | LogInjectionTest.java:176:32:176:39 | source(...) | LogInjectionTest.java:176:32:176:39 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:176:32:176:39 | source(...) | user-provided value |
+| LogInjectionTest.java:177:32:177:39 | source(...) | LogInjectionTest.java:177:32:177:39 | source(...) | LogInjectionTest.java:177:32:177:39 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:177:32:177:39 | source(...) | user-provided value |
+| LogInjectionTest.java:178:38:178:45 | source(...) | LogInjectionTest.java:178:38:178:45 | source(...) | LogInjectionTest.java:178:38:178:45 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:178:38:178:45 | source(...) | user-provided value |
+| LogInjectionTest.java:179:27:179:34 | source(...) | LogInjectionTest.java:179:27:179:34 | source(...) | LogInjectionTest.java:179:27:179:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:179:27:179:34 | source(...) | user-provided value |
+| LogInjectionTest.java:180:27:180:34 | source(...) | LogInjectionTest.java:180:27:180:34 | source(...) | LogInjectionTest.java:180:27:180:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:180:27:180:34 | source(...) | user-provided value |
+| LogInjectionTest.java:185:26:185:48 | (...)... | LogInjectionTest.java:185:41:185:48 | source(...) : Object | LogInjectionTest.java:185:26:185:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:185:41:185:48 | source(...) | user-provided value |
+| LogInjectionTest.java:186:26:186:48 | (...)... | LogInjectionTest.java:186:41:186:48 | source(...) : Object | LogInjectionTest.java:186:26:186:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:186:41:186:48 | source(...) | user-provided value |
+| LogInjectionTest.java:187:41:187:63 | (...)... | LogInjectionTest.java:187:56:187:63 | source(...) : Object | LogInjectionTest.java:187:41:187:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:187:56:187:63 | source(...) | user-provided value |
+| LogInjectionTest.java:188:41:188:63 | (...)... | LogInjectionTest.java:188:56:188:63 | source(...) : Object | LogInjectionTest.java:188:41:188:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:188:56:188:63 | source(...) | user-provided value |
+| LogInjectionTest.java:189:41:189:58 | (...)... | LogInjectionTest.java:189:51:189:58 | source(...) : Object | LogInjectionTest.java:189:41:189:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:189:51:189:58 | source(...) | user-provided value |
+| LogInjectionTest.java:190:41:190:66 | (...)... | LogInjectionTest.java:190:59:190:66 | source(...) : Object | LogInjectionTest.java:190:41:190:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:190:59:190:66 | source(...) | user-provided value |
+| LogInjectionTest.java:191:41:191:66 | (...)... | LogInjectionTest.java:191:59:191:66 | source(...) : Object | LogInjectionTest.java:191:41:191:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:191:59:191:66 | source(...) | user-provided value |
+| LogInjectionTest.java:192:41:192:48 | source(...) | LogInjectionTest.java:192:41:192:48 | source(...) | LogInjectionTest.java:192:41:192:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:192:41:192:48 | source(...) | user-provided value |
+| LogInjectionTest.java:193:41:193:57 | (...)... | LogInjectionTest.java:193:50:193:57 | source(...) : Object | LogInjectionTest.java:193:41:193:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:193:50:193:57 | source(...) | user-provided value |
+| LogInjectionTest.java:194:41:194:57 | (...)... | LogInjectionTest.java:194:50:194:57 | source(...) : Object | LogInjectionTest.java:194:41:194:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:194:50:194:57 | source(...) | user-provided value |
+| LogInjectionTest.java:195:56:195:78 | new Object[] | LogInjectionTest.java:195:70:195:77 | source(...) : Object | LogInjectionTest.java:195:56:195:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:195:70:195:77 | source(...) | user-provided value |
+| LogInjectionTest.java:196:56:196:72 | (...)... | LogInjectionTest.java:196:65:196:72 | source(...) : Object | LogInjectionTest.java:196:56:196:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:196:65:196:72 | source(...) | user-provided value |
+| LogInjectionTest.java:197:41:197:57 | (...)... | LogInjectionTest.java:197:50:197:57 | source(...) : Object | LogInjectionTest.java:197:41:197:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:197:50:197:57 | source(...) | user-provided value |
+| LogInjectionTest.java:198:71:198:87 | (...)... | LogInjectionTest.java:198:80:198:87 | source(...) : Object | LogInjectionTest.java:198:71:198:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:198:80:198:87 | source(...) | user-provided value |
+| LogInjectionTest.java:199:56:199:72 | (...)... | LogInjectionTest.java:199:65:199:72 | source(...) : Object | LogInjectionTest.java:199:56:199:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:199:65:199:72 | source(...) | user-provided value |
+| LogInjectionTest.java:200:41:200:57 | (...)... | LogInjectionTest.java:200:50:200:57 | source(...) : Object | LogInjectionTest.java:200:41:200:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:200:50:200:57 | source(...) | user-provided value |
+| LogInjectionTest.java:201:86:201:102 | (...)... | LogInjectionTest.java:201:95:201:102 | source(...) : Object | LogInjectionTest.java:201:86:201:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:201:95:201:102 | source(...) | user-provided value |
+| LogInjectionTest.java:202:71:202:87 | (...)... | LogInjectionTest.java:202:80:202:87 | source(...) : Object | LogInjectionTest.java:202:71:202:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:202:80:202:87 | source(...) | user-provided value |
+| LogInjectionTest.java:203:56:203:72 | (...)... | LogInjectionTest.java:203:65:203:72 | source(...) : Object | LogInjectionTest.java:203:56:203:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:203:65:203:72 | source(...) | user-provided value |
+| LogInjectionTest.java:204:41:204:57 | (...)... | LogInjectionTest.java:204:50:204:57 | source(...) : Object | LogInjectionTest.java:204:41:204:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:204:50:204:57 | source(...) | user-provided value |
+| LogInjectionTest.java:205:101:205:117 | (...)... | LogInjectionTest.java:205:110:205:117 | source(...) : Object | LogInjectionTest.java:205:101:205:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:205:110:205:117 | source(...) | user-provided value |
+| LogInjectionTest.java:206:86:206:102 | (...)... | LogInjectionTest.java:206:95:206:102 | source(...) : Object | LogInjectionTest.java:206:86:206:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:206:95:206:102 | source(...) | user-provided value |
+| LogInjectionTest.java:207:71:207:87 | (...)... | LogInjectionTest.java:207:80:207:87 | source(...) : Object | LogInjectionTest.java:207:71:207:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:207:80:207:87 | source(...) | user-provided value |
+| LogInjectionTest.java:208:56:208:72 | (...)... | LogInjectionTest.java:208:65:208:72 | source(...) : Object | LogInjectionTest.java:208:56:208:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:208:65:208:72 | source(...) | user-provided value |
+| LogInjectionTest.java:209:41:209:57 | (...)... | LogInjectionTest.java:209:50:209:57 | source(...) : Object | LogInjectionTest.java:209:41:209:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:209:50:209:57 | source(...) | user-provided value |
+| LogInjectionTest.java:210:116:210:132 | (...)... | LogInjectionTest.java:210:125:210:132 | source(...) : Object | LogInjectionTest.java:210:116:210:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:210:125:210:132 | source(...) | user-provided value |
+| LogInjectionTest.java:211:101:211:117 | (...)... | LogInjectionTest.java:211:110:211:117 | source(...) : Object | LogInjectionTest.java:211:101:211:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:211:110:211:117 | source(...) | user-provided value |
+| LogInjectionTest.java:212:86:212:102 | (...)... | LogInjectionTest.java:212:95:212:102 | source(...) : Object | LogInjectionTest.java:212:86:212:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:212:95:212:102 | source(...) | user-provided value |
+| LogInjectionTest.java:213:71:213:87 | (...)... | LogInjectionTest.java:213:80:213:87 | source(...) : Object | LogInjectionTest.java:213:71:213:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:213:80:213:87 | source(...) | user-provided value |
+| LogInjectionTest.java:214:56:214:72 | (...)... | LogInjectionTest.java:214:65:214:72 | source(...) : Object | LogInjectionTest.java:214:56:214:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:214:65:214:72 | source(...) | user-provided value |
+| LogInjectionTest.java:215:41:215:57 | (...)... | LogInjectionTest.java:215:50:215:57 | source(...) : Object | LogInjectionTest.java:215:41:215:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:215:50:215:57 | source(...) | user-provided value |
+| LogInjectionTest.java:216:131:216:147 | (...)... | LogInjectionTest.java:216:140:216:147 | source(...) : Object | LogInjectionTest.java:216:131:216:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:216:140:216:147 | source(...) | user-provided value |
+| LogInjectionTest.java:217:116:217:132 | (...)... | LogInjectionTest.java:217:125:217:132 | source(...) : Object | LogInjectionTest.java:217:116:217:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:217:125:217:132 | source(...) | user-provided value |
+| LogInjectionTest.java:218:101:218:117 | (...)... | LogInjectionTest.java:218:110:218:117 | source(...) : Object | LogInjectionTest.java:218:101:218:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:218:110:218:117 | source(...) | user-provided value |
+| LogInjectionTest.java:219:86:219:102 | (...)... | LogInjectionTest.java:219:95:219:102 | source(...) : Object | LogInjectionTest.java:219:86:219:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:219:95:219:102 | source(...) | user-provided value |
+| LogInjectionTest.java:220:71:220:87 | (...)... | LogInjectionTest.java:220:80:220:87 | source(...) : Object | LogInjectionTest.java:220:71:220:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:220:80:220:87 | source(...) | user-provided value |
+| LogInjectionTest.java:221:56:221:72 | (...)... | LogInjectionTest.java:221:65:221:72 | source(...) : Object | LogInjectionTest.java:221:56:221:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:221:65:221:72 | source(...) | user-provided value |
+| LogInjectionTest.java:222:41:222:57 | (...)... | LogInjectionTest.java:222:50:222:57 | source(...) : Object | LogInjectionTest.java:222:41:222:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:222:50:222:57 | source(...) | user-provided value |
+| LogInjectionTest.java:223:146:223:162 | (...)... | LogInjectionTest.java:223:155:223:162 | source(...) : Object | LogInjectionTest.java:223:146:223:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:223:155:223:162 | source(...) | user-provided value |
+| LogInjectionTest.java:224:131:224:147 | (...)... | LogInjectionTest.java:224:140:224:147 | source(...) : Object | LogInjectionTest.java:224:131:224:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:224:140:224:147 | source(...) | user-provided value |
+| LogInjectionTest.java:225:116:225:132 | (...)... | LogInjectionTest.java:225:125:225:132 | source(...) : Object | LogInjectionTest.java:225:116:225:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:225:125:225:132 | source(...) | user-provided value |
+| LogInjectionTest.java:226:101:226:117 | (...)... | LogInjectionTest.java:226:110:226:117 | source(...) : Object | LogInjectionTest.java:226:101:226:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:226:110:226:117 | source(...) | user-provided value |
+| LogInjectionTest.java:227:86:227:102 | (...)... | LogInjectionTest.java:227:95:227:102 | source(...) : Object | LogInjectionTest.java:227:86:227:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:227:95:227:102 | source(...) | user-provided value |
+| LogInjectionTest.java:228:71:228:87 | (...)... | LogInjectionTest.java:228:80:228:87 | source(...) : Object | LogInjectionTest.java:228:71:228:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:228:80:228:87 | source(...) | user-provided value |
+| LogInjectionTest.java:229:56:229:72 | (...)... | LogInjectionTest.java:229:65:229:72 | source(...) : Object | LogInjectionTest.java:229:56:229:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:229:65:229:72 | source(...) | user-provided value |
+| LogInjectionTest.java:230:41:230:57 | (...)... | LogInjectionTest.java:230:50:230:57 | source(...) : Object | LogInjectionTest.java:230:41:230:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:230:50:230:57 | source(...) | user-provided value |
+| LogInjectionTest.java:231:161:231:177 | (...)... | LogInjectionTest.java:231:170:231:177 | source(...) : Object | LogInjectionTest.java:231:161:231:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:231:170:231:177 | source(...) | user-provided value |
+| LogInjectionTest.java:232:146:232:162 | (...)... | LogInjectionTest.java:232:155:232:162 | source(...) : Object | LogInjectionTest.java:232:146:232:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:232:155:232:162 | source(...) | user-provided value |
+| LogInjectionTest.java:233:131:233:147 | (...)... | LogInjectionTest.java:233:140:233:147 | source(...) : Object | LogInjectionTest.java:233:131:233:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:233:140:233:147 | source(...) | user-provided value |
+| LogInjectionTest.java:234:116:234:132 | (...)... | LogInjectionTest.java:234:125:234:132 | source(...) : Object | LogInjectionTest.java:234:116:234:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:234:125:234:132 | source(...) | user-provided value |
+| LogInjectionTest.java:235:101:235:117 | (...)... | LogInjectionTest.java:235:110:235:117 | source(...) : Object | LogInjectionTest.java:235:101:235:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:235:110:235:117 | source(...) | user-provided value |
+| LogInjectionTest.java:236:86:236:102 | (...)... | LogInjectionTest.java:236:95:236:102 | source(...) : Object | LogInjectionTest.java:236:86:236:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:236:95:236:102 | source(...) | user-provided value |
+| LogInjectionTest.java:237:71:237:87 | (...)... | LogInjectionTest.java:237:80:237:87 | source(...) : Object | LogInjectionTest.java:237:71:237:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:237:80:237:87 | source(...) | user-provided value |
+| LogInjectionTest.java:238:56:238:72 | (...)... | LogInjectionTest.java:238:65:238:72 | source(...) : Object | LogInjectionTest.java:238:56:238:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:238:65:238:72 | source(...) | user-provided value |
+| LogInjectionTest.java:239:41:239:57 | (...)... | LogInjectionTest.java:239:50:239:57 | source(...) : Object | LogInjectionTest.java:239:41:239:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:239:50:239:57 | source(...) | user-provided value |
+| LogInjectionTest.java:240:176:240:192 | (...)... | LogInjectionTest.java:240:185:240:192 | source(...) : Object | LogInjectionTest.java:240:176:240:192 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:240:185:240:192 | source(...) | user-provided value |
+| LogInjectionTest.java:241:161:241:177 | (...)... | LogInjectionTest.java:241:170:241:177 | source(...) : Object | LogInjectionTest.java:241:161:241:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:241:170:241:177 | source(...) | user-provided value |
+| LogInjectionTest.java:242:146:242:162 | (...)... | LogInjectionTest.java:242:155:242:162 | source(...) : Object | LogInjectionTest.java:242:146:242:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:242:155:242:162 | source(...) | user-provided value |
+| LogInjectionTest.java:243:131:243:147 | (...)... | LogInjectionTest.java:243:140:243:147 | source(...) : Object | LogInjectionTest.java:243:131:243:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:243:140:243:147 | source(...) | user-provided value |
+| LogInjectionTest.java:244:116:244:132 | (...)... | LogInjectionTest.java:244:125:244:132 | source(...) : Object | LogInjectionTest.java:244:116:244:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:244:125:244:132 | source(...) | user-provided value |
 | LogInjectionTest.java:245:101:245:117 | (...)... | LogInjectionTest.java:245:110:245:117 | source(...) : Object | LogInjectionTest.java:245:101:245:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:245:110:245:117 | source(...) | user-provided value |
 | LogInjectionTest.java:246:86:246:102 | (...)... | LogInjectionTest.java:246:95:246:102 | source(...) : Object | LogInjectionTest.java:246:86:246:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:246:95:246:102 | source(...) | user-provided value |
 | LogInjectionTest.java:247:71:247:87 | (...)... | LogInjectionTest.java:247:80:247:87 | source(...) : Object | LogInjectionTest.java:247:71:247:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:247:80:247:87 | source(...) | user-provided value |
 | LogInjectionTest.java:248:56:248:72 | (...)... | LogInjectionTest.java:248:65:248:72 | source(...) : Object | LogInjectionTest.java:248:56:248:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:248:65:248:72 | source(...) | user-provided value |
 | LogInjectionTest.java:249:41:249:57 | (...)... | LogInjectionTest.java:249:50:249:57 | source(...) : Object | LogInjectionTest.java:249:41:249:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:249:50:249:57 | source(...) | user-provided value |
-| LogInjectionTest.java:250:116:250:132 | (...)... | LogInjectionTest.java:250:125:250:132 | source(...) : Object | LogInjectionTest.java:250:116:250:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:250:125:250:132 | source(...) | user-provided value |
-| LogInjectionTest.java:251:101:251:117 | (...)... | LogInjectionTest.java:251:110:251:117 | source(...) : Object | LogInjectionTest.java:251:101:251:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:251:110:251:117 | source(...) | user-provided value |
-| LogInjectionTest.java:252:86:252:102 | (...)... | LogInjectionTest.java:252:95:252:102 | source(...) : Object | LogInjectionTest.java:252:86:252:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:252:95:252:102 | source(...) | user-provided value |
-| LogInjectionTest.java:253:71:253:87 | (...)... | LogInjectionTest.java:253:80:253:87 | source(...) : Object | LogInjectionTest.java:253:71:253:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:253:80:253:87 | source(...) | user-provided value |
-| LogInjectionTest.java:254:56:254:72 | (...)... | LogInjectionTest.java:254:65:254:72 | source(...) : Object | LogInjectionTest.java:254:56:254:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:254:65:254:72 | source(...) | user-provided value |
-| LogInjectionTest.java:255:41:255:57 | (...)... | LogInjectionTest.java:255:50:255:57 | source(...) : Object | LogInjectionTest.java:255:41:255:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:255:50:255:57 | source(...) | user-provided value |
-| LogInjectionTest.java:256:131:256:147 | (...)... | LogInjectionTest.java:256:140:256:147 | source(...) : Object | LogInjectionTest.java:256:131:256:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:256:140:256:147 | source(...) | user-provided value |
-| LogInjectionTest.java:257:116:257:132 | (...)... | LogInjectionTest.java:257:125:257:132 | source(...) : Object | LogInjectionTest.java:257:116:257:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:257:125:257:132 | source(...) | user-provided value |
-| LogInjectionTest.java:258:101:258:117 | (...)... | LogInjectionTest.java:258:110:258:117 | source(...) : Object | LogInjectionTest.java:258:101:258:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:258:110:258:117 | source(...) | user-provided value |
-| LogInjectionTest.java:259:86:259:102 | (...)... | LogInjectionTest.java:259:95:259:102 | source(...) : Object | LogInjectionTest.java:259:86:259:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:259:95:259:102 | source(...) | user-provided value |
-| LogInjectionTest.java:260:71:260:87 | (...)... | LogInjectionTest.java:260:80:260:87 | source(...) : Object | LogInjectionTest.java:260:71:260:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:260:80:260:87 | source(...) | user-provided value |
-| LogInjectionTest.java:261:56:261:72 | (...)... | LogInjectionTest.java:261:65:261:72 | source(...) : Object | LogInjectionTest.java:261:56:261:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:261:65:261:72 | source(...) | user-provided value |
-| LogInjectionTest.java:262:41:262:57 | (...)... | LogInjectionTest.java:262:50:262:57 | source(...) : Object | LogInjectionTest.java:262:41:262:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:262:50:262:57 | source(...) | user-provided value |
-| LogInjectionTest.java:263:146:263:162 | (...)... | LogInjectionTest.java:263:155:263:162 | source(...) : Object | LogInjectionTest.java:263:146:263:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:263:155:263:162 | source(...) | user-provided value |
-| LogInjectionTest.java:264:131:264:147 | (...)... | LogInjectionTest.java:264:140:264:147 | source(...) : Object | LogInjectionTest.java:264:131:264:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:264:140:264:147 | source(...) | user-provided value |
-| LogInjectionTest.java:265:116:265:132 | (...)... | LogInjectionTest.java:265:125:265:132 | source(...) : Object | LogInjectionTest.java:265:116:265:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:265:125:265:132 | source(...) | user-provided value |
-| LogInjectionTest.java:266:101:266:117 | (...)... | LogInjectionTest.java:266:110:266:117 | source(...) : Object | LogInjectionTest.java:266:101:266:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:266:110:266:117 | source(...) | user-provided value |
-| LogInjectionTest.java:267:86:267:102 | (...)... | LogInjectionTest.java:267:95:267:102 | source(...) : Object | LogInjectionTest.java:267:86:267:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:267:95:267:102 | source(...) | user-provided value |
-| LogInjectionTest.java:268:71:268:87 | (...)... | LogInjectionTest.java:268:80:268:87 | source(...) : Object | LogInjectionTest.java:268:71:268:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:268:80:268:87 | source(...) | user-provided value |
-| LogInjectionTest.java:269:56:269:72 | (...)... | LogInjectionTest.java:269:65:269:72 | source(...) : Object | LogInjectionTest.java:269:56:269:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:269:65:269:72 | source(...) | user-provided value |
-| LogInjectionTest.java:270:41:270:57 | (...)... | LogInjectionTest.java:270:50:270:57 | source(...) : Object | LogInjectionTest.java:270:41:270:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:270:50:270:57 | source(...) | user-provided value |
-| LogInjectionTest.java:271:161:271:177 | (...)... | LogInjectionTest.java:271:170:271:177 | source(...) : Object | LogInjectionTest.java:271:161:271:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:271:170:271:177 | source(...) | user-provided value |
-| LogInjectionTest.java:272:146:272:162 | (...)... | LogInjectionTest.java:272:155:272:162 | source(...) : Object | LogInjectionTest.java:272:146:272:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:272:155:272:162 | source(...) | user-provided value |
-| LogInjectionTest.java:273:131:273:147 | (...)... | LogInjectionTest.java:273:140:273:147 | source(...) : Object | LogInjectionTest.java:273:131:273:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:273:140:273:147 | source(...) | user-provided value |
-| LogInjectionTest.java:274:116:274:132 | (...)... | LogInjectionTest.java:274:125:274:132 | source(...) : Object | LogInjectionTest.java:274:116:274:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:274:125:274:132 | source(...) | user-provided value |
-| LogInjectionTest.java:275:101:275:117 | (...)... | LogInjectionTest.java:275:110:275:117 | source(...) : Object | LogInjectionTest.java:275:101:275:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:275:110:275:117 | source(...) | user-provided value |
-| LogInjectionTest.java:276:86:276:102 | (...)... | LogInjectionTest.java:276:95:276:102 | source(...) : Object | LogInjectionTest.java:276:86:276:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:276:95:276:102 | source(...) | user-provided value |
-| LogInjectionTest.java:277:71:277:87 | (...)... | LogInjectionTest.java:277:80:277:87 | source(...) : Object | LogInjectionTest.java:277:71:277:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:277:80:277:87 | source(...) | user-provided value |
-| LogInjectionTest.java:278:56:278:72 | (...)... | LogInjectionTest.java:278:65:278:72 | source(...) : Object | LogInjectionTest.java:278:56:278:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:278:65:278:72 | source(...) | user-provided value |
-| LogInjectionTest.java:279:41:279:57 | (...)... | LogInjectionTest.java:279:50:279:57 | source(...) : Object | LogInjectionTest.java:279:41:279:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:279:50:279:57 | source(...) | user-provided value |
-| LogInjectionTest.java:280:176:280:192 | (...)... | LogInjectionTest.java:280:185:280:192 | source(...) : Object | LogInjectionTest.java:280:176:280:192 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:280:185:280:192 | source(...) | user-provided value |
-| LogInjectionTest.java:281:161:281:177 | (...)... | LogInjectionTest.java:281:170:281:177 | source(...) : Object | LogInjectionTest.java:281:161:281:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:281:170:281:177 | source(...) | user-provided value |
-| LogInjectionTest.java:282:146:282:162 | (...)... | LogInjectionTest.java:282:155:282:162 | source(...) : Object | LogInjectionTest.java:282:146:282:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:282:155:282:162 | source(...) | user-provided value |
-| LogInjectionTest.java:283:131:283:147 | (...)... | LogInjectionTest.java:283:140:283:147 | source(...) : Object | LogInjectionTest.java:283:131:283:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:283:140:283:147 | source(...) | user-provided value |
+| LogInjectionTest.java:250:41:250:57 | (...)... | LogInjectionTest.java:250:50:250:57 | source(...) : Object | LogInjectionTest.java:250:41:250:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:250:50:250:57 | source(...) | user-provided value |
+| LogInjectionTest.java:251:56:251:77 | (...)... | LogInjectionTest.java:251:70:251:77 | source(...) : Object | LogInjectionTest.java:251:56:251:77 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:251:70:251:77 | source(...) | user-provided value |
+| LogInjectionTest.java:252:41:252:57 | (...)... | LogInjectionTest.java:252:50:252:57 | source(...) : Object | LogInjectionTest.java:252:41:252:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:252:50:252:57 | source(...) | user-provided value |
+| LogInjectionTest.java:253:41:253:62 | (...)... | LogInjectionTest.java:253:55:253:62 | source(...) : Object | LogInjectionTest.java:253:41:253:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:253:55:253:62 | source(...) | user-provided value |
+| LogInjectionTest.java:254:41:254:62 | (...)... | LogInjectionTest.java:254:55:254:62 | source(...) : Object | LogInjectionTest.java:254:41:254:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:254:55:254:62 | source(...) | user-provided value |
+| LogInjectionTest.java:255:26:255:51 | (...)... | LogInjectionTest.java:255:44:255:51 | source(...) : Object | LogInjectionTest.java:255:26:255:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:255:44:255:51 | source(...) | user-provided value |
+| LogInjectionTest.java:256:26:256:51 | (...)... | LogInjectionTest.java:256:44:256:51 | source(...) : Object | LogInjectionTest.java:256:26:256:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:256:44:256:51 | source(...) | user-provided value |
+| LogInjectionTest.java:257:26:257:43 | (...)... | LogInjectionTest.java:257:36:257:43 | source(...) : Object | LogInjectionTest.java:257:26:257:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:257:36:257:43 | source(...) | user-provided value |
+| LogInjectionTest.java:258:26:258:43 | (...)... | LogInjectionTest.java:258:36:258:43 | source(...) : Object | LogInjectionTest.java:258:26:258:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:258:36:258:43 | source(...) | user-provided value |
+| LogInjectionTest.java:259:26:259:33 | source(...) | LogInjectionTest.java:259:26:259:33 | source(...) | LogInjectionTest.java:259:26:259:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:259:26:259:33 | source(...) | user-provided value |
+| LogInjectionTest.java:260:26:260:33 | source(...) | LogInjectionTest.java:260:26:260:33 | source(...) | LogInjectionTest.java:260:26:260:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:260:26:260:33 | source(...) | user-provided value |
+| LogInjectionTest.java:261:26:261:42 | (...)... | LogInjectionTest.java:261:35:261:42 | source(...) : Object | LogInjectionTest.java:261:26:261:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:261:35:261:42 | source(...) | user-provided value |
+| LogInjectionTest.java:262:26:262:42 | (...)... | LogInjectionTest.java:262:35:262:42 | source(...) : Object | LogInjectionTest.java:262:26:262:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:262:35:262:42 | source(...) | user-provided value |
+| LogInjectionTest.java:263:41:263:63 | new Object[] | LogInjectionTest.java:263:55:263:62 | source(...) : Object | LogInjectionTest.java:263:41:263:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:263:55:263:62 | source(...) | user-provided value |
+| LogInjectionTest.java:264:41:264:57 | (...)... | LogInjectionTest.java:264:50:264:57 | source(...) : Object | LogInjectionTest.java:264:41:264:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:264:50:264:57 | source(...) | user-provided value |
+| LogInjectionTest.java:265:26:265:42 | (...)... | LogInjectionTest.java:265:35:265:42 | source(...) : Object | LogInjectionTest.java:265:26:265:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:265:35:265:42 | source(...) | user-provided value |
+| LogInjectionTest.java:266:56:266:72 | (...)... | LogInjectionTest.java:266:65:266:72 | source(...) : Object | LogInjectionTest.java:266:56:266:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:266:65:266:72 | source(...) | user-provided value |
+| LogInjectionTest.java:267:41:267:57 | (...)... | LogInjectionTest.java:267:50:267:57 | source(...) : Object | LogInjectionTest.java:267:41:267:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:267:50:267:57 | source(...) | user-provided value |
+| LogInjectionTest.java:268:26:268:42 | (...)... | LogInjectionTest.java:268:35:268:42 | source(...) : Object | LogInjectionTest.java:268:26:268:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:268:35:268:42 | source(...) | user-provided value |
+| LogInjectionTest.java:269:71:269:87 | (...)... | LogInjectionTest.java:269:80:269:87 | source(...) : Object | LogInjectionTest.java:269:71:269:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:269:80:269:87 | source(...) | user-provided value |
+| LogInjectionTest.java:270:56:270:72 | (...)... | LogInjectionTest.java:270:65:270:72 | source(...) : Object | LogInjectionTest.java:270:56:270:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:270:65:270:72 | source(...) | user-provided value |
+| LogInjectionTest.java:271:41:271:57 | (...)... | LogInjectionTest.java:271:50:271:57 | source(...) : Object | LogInjectionTest.java:271:41:271:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:271:50:271:57 | source(...) | user-provided value |
+| LogInjectionTest.java:272:26:272:42 | (...)... | LogInjectionTest.java:272:35:272:42 | source(...) : Object | LogInjectionTest.java:272:26:272:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:272:35:272:42 | source(...) | user-provided value |
+| LogInjectionTest.java:273:86:273:102 | (...)... | LogInjectionTest.java:273:95:273:102 | source(...) : Object | LogInjectionTest.java:273:86:273:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:273:95:273:102 | source(...) | user-provided value |
+| LogInjectionTest.java:274:71:274:87 | (...)... | LogInjectionTest.java:274:80:274:87 | source(...) : Object | LogInjectionTest.java:274:71:274:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:274:80:274:87 | source(...) | user-provided value |
+| LogInjectionTest.java:275:56:275:72 | (...)... | LogInjectionTest.java:275:65:275:72 | source(...) : Object | LogInjectionTest.java:275:56:275:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:275:65:275:72 | source(...) | user-provided value |
+| LogInjectionTest.java:276:41:276:57 | (...)... | LogInjectionTest.java:276:50:276:57 | source(...) : Object | LogInjectionTest.java:276:41:276:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:276:50:276:57 | source(...) | user-provided value |
+| LogInjectionTest.java:277:26:277:42 | (...)... | LogInjectionTest.java:277:35:277:42 | source(...) : Object | LogInjectionTest.java:277:26:277:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:277:35:277:42 | source(...) | user-provided value |
+| LogInjectionTest.java:278:101:278:117 | (...)... | LogInjectionTest.java:278:110:278:117 | source(...) : Object | LogInjectionTest.java:278:101:278:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:278:110:278:117 | source(...) | user-provided value |
+| LogInjectionTest.java:279:86:279:102 | (...)... | LogInjectionTest.java:279:95:279:102 | source(...) : Object | LogInjectionTest.java:279:86:279:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:279:95:279:102 | source(...) | user-provided value |
+| LogInjectionTest.java:280:71:280:87 | (...)... | LogInjectionTest.java:280:80:280:87 | source(...) : Object | LogInjectionTest.java:280:71:280:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:280:80:280:87 | source(...) | user-provided value |
+| LogInjectionTest.java:281:56:281:72 | (...)... | LogInjectionTest.java:281:65:281:72 | source(...) : Object | LogInjectionTest.java:281:56:281:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:281:65:281:72 | source(...) | user-provided value |
+| LogInjectionTest.java:282:41:282:57 | (...)... | LogInjectionTest.java:282:50:282:57 | source(...) : Object | LogInjectionTest.java:282:41:282:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:282:50:282:57 | source(...) | user-provided value |
+| LogInjectionTest.java:283:26:283:42 | (...)... | LogInjectionTest.java:283:35:283:42 | source(...) : Object | LogInjectionTest.java:283:26:283:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:283:35:283:42 | source(...) | user-provided value |
 | LogInjectionTest.java:284:116:284:132 | (...)... | LogInjectionTest.java:284:125:284:132 | source(...) : Object | LogInjectionTest.java:284:116:284:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:284:125:284:132 | source(...) | user-provided value |
 | LogInjectionTest.java:285:101:285:117 | (...)... | LogInjectionTest.java:285:110:285:117 | source(...) : Object | LogInjectionTest.java:285:101:285:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:285:110:285:117 | source(...) | user-provided value |
 | LogInjectionTest.java:286:86:286:102 | (...)... | LogInjectionTest.java:286:95:286:102 | source(...) : Object | LogInjectionTest.java:286:86:286:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:286:95:286:102 | source(...) | user-provided value |
 | LogInjectionTest.java:287:71:287:87 | (...)... | LogInjectionTest.java:287:80:287:87 | source(...) : Object | LogInjectionTest.java:287:71:287:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:287:80:287:87 | source(...) | user-provided value |
 | LogInjectionTest.java:288:56:288:72 | (...)... | LogInjectionTest.java:288:65:288:72 | source(...) : Object | LogInjectionTest.java:288:56:288:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:288:65:288:72 | source(...) | user-provided value |
 | LogInjectionTest.java:289:41:289:57 | (...)... | LogInjectionTest.java:289:50:289:57 | source(...) : Object | LogInjectionTest.java:289:41:289:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:289:50:289:57 | source(...) | user-provided value |
-| LogInjectionTest.java:290:41:290:57 | (...)... | LogInjectionTest.java:290:50:290:57 | source(...) : Object | LogInjectionTest.java:290:41:290:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:290:50:290:57 | source(...) | user-provided value |
-| LogInjectionTest.java:291:56:291:77 | (...)... | LogInjectionTest.java:291:70:291:77 | source(...) : Object | LogInjectionTest.java:291:56:291:77 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:291:70:291:77 | source(...) | user-provided value |
-| LogInjectionTest.java:292:41:292:57 | (...)... | LogInjectionTest.java:292:50:292:57 | source(...) : Object | LogInjectionTest.java:292:41:292:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:292:50:292:57 | source(...) | user-provided value |
-| LogInjectionTest.java:293:41:293:62 | (...)... | LogInjectionTest.java:293:55:293:62 | source(...) : Object | LogInjectionTest.java:293:41:293:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:293:55:293:62 | source(...) | user-provided value |
-| LogInjectionTest.java:294:41:294:62 | (...)... | LogInjectionTest.java:294:55:294:62 | source(...) : Object | LogInjectionTest.java:294:41:294:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:294:55:294:62 | source(...) | user-provided value |
-| LogInjectionTest.java:295:26:295:51 | (...)... | LogInjectionTest.java:295:44:295:51 | source(...) : Object | LogInjectionTest.java:295:26:295:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:295:44:295:51 | source(...) | user-provided value |
-| LogInjectionTest.java:296:26:296:51 | (...)... | LogInjectionTest.java:296:44:296:51 | source(...) : Object | LogInjectionTest.java:296:26:296:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:296:44:296:51 | source(...) | user-provided value |
-| LogInjectionTest.java:297:26:297:43 | (...)... | LogInjectionTest.java:297:36:297:43 | source(...) : Object | LogInjectionTest.java:297:26:297:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:297:36:297:43 | source(...) | user-provided value |
-| LogInjectionTest.java:298:26:298:43 | (...)... | LogInjectionTest.java:298:36:298:43 | source(...) : Object | LogInjectionTest.java:298:26:298:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:298:36:298:43 | source(...) | user-provided value |
-| LogInjectionTest.java:299:26:299:33 | source(...) | LogInjectionTest.java:299:26:299:33 | source(...) | LogInjectionTest.java:299:26:299:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:299:26:299:33 | source(...) | user-provided value |
-| LogInjectionTest.java:300:26:300:33 | source(...) | LogInjectionTest.java:300:26:300:33 | source(...) | LogInjectionTest.java:300:26:300:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:300:26:300:33 | source(...) | user-provided value |
-| LogInjectionTest.java:301:26:301:42 | (...)... | LogInjectionTest.java:301:35:301:42 | source(...) : Object | LogInjectionTest.java:301:26:301:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:301:35:301:42 | source(...) | user-provided value |
-| LogInjectionTest.java:302:26:302:42 | (...)... | LogInjectionTest.java:302:35:302:42 | source(...) : Object | LogInjectionTest.java:302:26:302:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:302:35:302:42 | source(...) | user-provided value |
-| LogInjectionTest.java:303:41:303:63 | new Object[] | LogInjectionTest.java:303:55:303:62 | source(...) : Object | LogInjectionTest.java:303:41:303:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:303:55:303:62 | source(...) | user-provided value |
-| LogInjectionTest.java:304:41:304:57 | (...)... | LogInjectionTest.java:304:50:304:57 | source(...) : Object | LogInjectionTest.java:304:41:304:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:304:50:304:57 | source(...) | user-provided value |
-| LogInjectionTest.java:305:26:305:42 | (...)... | LogInjectionTest.java:305:35:305:42 | source(...) : Object | LogInjectionTest.java:305:26:305:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:305:35:305:42 | source(...) | user-provided value |
-| LogInjectionTest.java:306:56:306:72 | (...)... | LogInjectionTest.java:306:65:306:72 | source(...) : Object | LogInjectionTest.java:306:56:306:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:306:65:306:72 | source(...) | user-provided value |
-| LogInjectionTest.java:307:41:307:57 | (...)... | LogInjectionTest.java:307:50:307:57 | source(...) : Object | LogInjectionTest.java:307:41:307:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:307:50:307:57 | source(...) | user-provided value |
-| LogInjectionTest.java:308:26:308:42 | (...)... | LogInjectionTest.java:308:35:308:42 | source(...) : Object | LogInjectionTest.java:308:26:308:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:308:35:308:42 | source(...) | user-provided value |
-| LogInjectionTest.java:309:71:309:87 | (...)... | LogInjectionTest.java:309:80:309:87 | source(...) : Object | LogInjectionTest.java:309:71:309:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:309:80:309:87 | source(...) | user-provided value |
-| LogInjectionTest.java:310:56:310:72 | (...)... | LogInjectionTest.java:310:65:310:72 | source(...) : Object | LogInjectionTest.java:310:56:310:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:310:65:310:72 | source(...) | user-provided value |
-| LogInjectionTest.java:311:41:311:57 | (...)... | LogInjectionTest.java:311:50:311:57 | source(...) : Object | LogInjectionTest.java:311:41:311:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:311:50:311:57 | source(...) | user-provided value |
-| LogInjectionTest.java:312:26:312:42 | (...)... | LogInjectionTest.java:312:35:312:42 | source(...) : Object | LogInjectionTest.java:312:26:312:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:312:35:312:42 | source(...) | user-provided value |
+| LogInjectionTest.java:290:26:290:42 | (...)... | LogInjectionTest.java:290:35:290:42 | source(...) : Object | LogInjectionTest.java:290:26:290:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:290:35:290:42 | source(...) | user-provided value |
+| LogInjectionTest.java:291:131:291:147 | (...)... | LogInjectionTest.java:291:140:291:147 | source(...) : Object | LogInjectionTest.java:291:131:291:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:291:140:291:147 | source(...) | user-provided value |
+| LogInjectionTest.java:292:116:292:132 | (...)... | LogInjectionTest.java:292:125:292:132 | source(...) : Object | LogInjectionTest.java:292:116:292:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:292:125:292:132 | source(...) | user-provided value |
+| LogInjectionTest.java:293:101:293:117 | (...)... | LogInjectionTest.java:293:110:293:117 | source(...) : Object | LogInjectionTest.java:293:101:293:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:293:110:293:117 | source(...) | user-provided value |
+| LogInjectionTest.java:294:86:294:102 | (...)... | LogInjectionTest.java:294:95:294:102 | source(...) : Object | LogInjectionTest.java:294:86:294:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:294:95:294:102 | source(...) | user-provided value |
+| LogInjectionTest.java:295:71:295:87 | (...)... | LogInjectionTest.java:295:80:295:87 | source(...) : Object | LogInjectionTest.java:295:71:295:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:295:80:295:87 | source(...) | user-provided value |
+| LogInjectionTest.java:296:56:296:72 | (...)... | LogInjectionTest.java:296:65:296:72 | source(...) : Object | LogInjectionTest.java:296:56:296:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:296:65:296:72 | source(...) | user-provided value |
+| LogInjectionTest.java:297:41:297:57 | (...)... | LogInjectionTest.java:297:50:297:57 | source(...) : Object | LogInjectionTest.java:297:41:297:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:297:50:297:57 | source(...) | user-provided value |
+| LogInjectionTest.java:298:26:298:42 | (...)... | LogInjectionTest.java:298:35:298:42 | source(...) : Object | LogInjectionTest.java:298:26:298:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:298:35:298:42 | source(...) | user-provided value |
+| LogInjectionTest.java:299:146:299:162 | (...)... | LogInjectionTest.java:299:155:299:162 | source(...) : Object | LogInjectionTest.java:299:146:299:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:299:155:299:162 | source(...) | user-provided value |
+| LogInjectionTest.java:300:131:300:147 | (...)... | LogInjectionTest.java:300:140:300:147 | source(...) : Object | LogInjectionTest.java:300:131:300:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:300:140:300:147 | source(...) | user-provided value |
+| LogInjectionTest.java:301:116:301:132 | (...)... | LogInjectionTest.java:301:125:301:132 | source(...) : Object | LogInjectionTest.java:301:116:301:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:301:125:301:132 | source(...) | user-provided value |
+| LogInjectionTest.java:302:101:302:117 | (...)... | LogInjectionTest.java:302:110:302:117 | source(...) : Object | LogInjectionTest.java:302:101:302:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:302:110:302:117 | source(...) | user-provided value |
+| LogInjectionTest.java:303:86:303:102 | (...)... | LogInjectionTest.java:303:95:303:102 | source(...) : Object | LogInjectionTest.java:303:86:303:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:303:95:303:102 | source(...) | user-provided value |
+| LogInjectionTest.java:304:71:304:87 | (...)... | LogInjectionTest.java:304:80:304:87 | source(...) : Object | LogInjectionTest.java:304:71:304:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:304:80:304:87 | source(...) | user-provided value |
+| LogInjectionTest.java:305:56:305:72 | (...)... | LogInjectionTest.java:305:65:305:72 | source(...) : Object | LogInjectionTest.java:305:56:305:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:305:65:305:72 | source(...) | user-provided value |
+| LogInjectionTest.java:306:41:306:57 | (...)... | LogInjectionTest.java:306:50:306:57 | source(...) : Object | LogInjectionTest.java:306:41:306:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:306:50:306:57 | source(...) | user-provided value |
+| LogInjectionTest.java:307:26:307:42 | (...)... | LogInjectionTest.java:307:35:307:42 | source(...) : Object | LogInjectionTest.java:307:26:307:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:307:35:307:42 | source(...) | user-provided value |
+| LogInjectionTest.java:308:161:308:177 | (...)... | LogInjectionTest.java:308:170:308:177 | source(...) : Object | LogInjectionTest.java:308:161:308:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:308:170:308:177 | source(...) | user-provided value |
+| LogInjectionTest.java:309:146:309:162 | (...)... | LogInjectionTest.java:309:155:309:162 | source(...) : Object | LogInjectionTest.java:309:146:309:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:309:155:309:162 | source(...) | user-provided value |
+| LogInjectionTest.java:310:131:310:147 | (...)... | LogInjectionTest.java:310:140:310:147 | source(...) : Object | LogInjectionTest.java:310:131:310:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:310:140:310:147 | source(...) | user-provided value |
+| LogInjectionTest.java:311:116:311:132 | (...)... | LogInjectionTest.java:311:125:311:132 | source(...) : Object | LogInjectionTest.java:311:116:311:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:311:125:311:132 | source(...) | user-provided value |
+| LogInjectionTest.java:312:101:312:117 | (...)... | LogInjectionTest.java:312:110:312:117 | source(...) : Object | LogInjectionTest.java:312:101:312:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:312:110:312:117 | source(...) | user-provided value |
 | LogInjectionTest.java:313:86:313:102 | (...)... | LogInjectionTest.java:313:95:313:102 | source(...) : Object | LogInjectionTest.java:313:86:313:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:313:95:313:102 | source(...) | user-provided value |
 | LogInjectionTest.java:314:71:314:87 | (...)... | LogInjectionTest.java:314:80:314:87 | source(...) : Object | LogInjectionTest.java:314:71:314:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:314:80:314:87 | source(...) | user-provided value |
 | LogInjectionTest.java:315:56:315:72 | (...)... | LogInjectionTest.java:315:65:315:72 | source(...) : Object | LogInjectionTest.java:315:56:315:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:315:65:315:72 | source(...) | user-provided value |
 | LogInjectionTest.java:316:41:316:57 | (...)... | LogInjectionTest.java:316:50:316:57 | source(...) : Object | LogInjectionTest.java:316:41:316:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:316:50:316:57 | source(...) | user-provided value |
 | LogInjectionTest.java:317:26:317:42 | (...)... | LogInjectionTest.java:317:35:317:42 | source(...) : Object | LogInjectionTest.java:317:26:317:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:317:35:317:42 | source(...) | user-provided value |
-| LogInjectionTest.java:318:101:318:117 | (...)... | LogInjectionTest.java:318:110:318:117 | source(...) : Object | LogInjectionTest.java:318:101:318:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:318:110:318:117 | source(...) | user-provided value |
-| LogInjectionTest.java:319:86:319:102 | (...)... | LogInjectionTest.java:319:95:319:102 | source(...) : Object | LogInjectionTest.java:319:86:319:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:319:95:319:102 | source(...) | user-provided value |
-| LogInjectionTest.java:320:71:320:87 | (...)... | LogInjectionTest.java:320:80:320:87 | source(...) : Object | LogInjectionTest.java:320:71:320:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:320:80:320:87 | source(...) | user-provided value |
-| LogInjectionTest.java:321:56:321:72 | (...)... | LogInjectionTest.java:321:65:321:72 | source(...) : Object | LogInjectionTest.java:321:56:321:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:321:65:321:72 | source(...) | user-provided value |
-| LogInjectionTest.java:322:41:322:57 | (...)... | LogInjectionTest.java:322:50:322:57 | source(...) : Object | LogInjectionTest.java:322:41:322:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:322:50:322:57 | source(...) | user-provided value |
-| LogInjectionTest.java:323:26:323:42 | (...)... | LogInjectionTest.java:323:35:323:42 | source(...) : Object | LogInjectionTest.java:323:26:323:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:323:35:323:42 | source(...) | user-provided value |
-| LogInjectionTest.java:324:116:324:132 | (...)... | LogInjectionTest.java:324:125:324:132 | source(...) : Object | LogInjectionTest.java:324:116:324:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:324:125:324:132 | source(...) | user-provided value |
-| LogInjectionTest.java:325:101:325:117 | (...)... | LogInjectionTest.java:325:110:325:117 | source(...) : Object | LogInjectionTest.java:325:101:325:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:325:110:325:117 | source(...) | user-provided value |
-| LogInjectionTest.java:326:86:326:102 | (...)... | LogInjectionTest.java:326:95:326:102 | source(...) : Object | LogInjectionTest.java:326:86:326:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:326:95:326:102 | source(...) | user-provided value |
-| LogInjectionTest.java:327:71:327:87 | (...)... | LogInjectionTest.java:327:80:327:87 | source(...) : Object | LogInjectionTest.java:327:71:327:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:327:80:327:87 | source(...) | user-provided value |
-| LogInjectionTest.java:328:56:328:72 | (...)... | LogInjectionTest.java:328:65:328:72 | source(...) : Object | LogInjectionTest.java:328:56:328:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:328:65:328:72 | source(...) | user-provided value |
-| LogInjectionTest.java:329:41:329:57 | (...)... | LogInjectionTest.java:329:50:329:57 | source(...) : Object | LogInjectionTest.java:329:41:329:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:329:50:329:57 | source(...) | user-provided value |
-| LogInjectionTest.java:330:26:330:42 | (...)... | LogInjectionTest.java:330:35:330:42 | source(...) : Object | LogInjectionTest.java:330:26:330:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:330:35:330:42 | source(...) | user-provided value |
-| LogInjectionTest.java:331:131:331:147 | (...)... | LogInjectionTest.java:331:140:331:147 | source(...) : Object | LogInjectionTest.java:331:131:331:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:331:140:331:147 | source(...) | user-provided value |
-| LogInjectionTest.java:332:116:332:132 | (...)... | LogInjectionTest.java:332:125:332:132 | source(...) : Object | LogInjectionTest.java:332:116:332:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:332:125:332:132 | source(...) | user-provided value |
-| LogInjectionTest.java:333:101:333:117 | (...)... | LogInjectionTest.java:333:110:333:117 | source(...) : Object | LogInjectionTest.java:333:101:333:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:333:110:333:117 | source(...) | user-provided value |
-| LogInjectionTest.java:334:86:334:102 | (...)... | LogInjectionTest.java:334:95:334:102 | source(...) : Object | LogInjectionTest.java:334:86:334:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:334:95:334:102 | source(...) | user-provided value |
-| LogInjectionTest.java:335:71:335:87 | (...)... | LogInjectionTest.java:335:80:335:87 | source(...) : Object | LogInjectionTest.java:335:71:335:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:335:80:335:87 | source(...) | user-provided value |
-| LogInjectionTest.java:336:56:336:72 | (...)... | LogInjectionTest.java:336:65:336:72 | source(...) : Object | LogInjectionTest.java:336:56:336:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:336:65:336:72 | source(...) | user-provided value |
-| LogInjectionTest.java:337:41:337:57 | (...)... | LogInjectionTest.java:337:50:337:57 | source(...) : Object | LogInjectionTest.java:337:41:337:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:337:50:337:57 | source(...) | user-provided value |
-| LogInjectionTest.java:338:26:338:42 | (...)... | LogInjectionTest.java:338:35:338:42 | source(...) : Object | LogInjectionTest.java:338:26:338:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:338:35:338:42 | source(...) | user-provided value |
-| LogInjectionTest.java:339:146:339:162 | (...)... | LogInjectionTest.java:339:155:339:162 | source(...) : Object | LogInjectionTest.java:339:146:339:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:339:155:339:162 | source(...) | user-provided value |
-| LogInjectionTest.java:340:131:340:147 | (...)... | LogInjectionTest.java:340:140:340:147 | source(...) : Object | LogInjectionTest.java:340:131:340:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:340:140:340:147 | source(...) | user-provided value |
-| LogInjectionTest.java:341:116:341:132 | (...)... | LogInjectionTest.java:341:125:341:132 | source(...) : Object | LogInjectionTest.java:341:116:341:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:341:125:341:132 | source(...) | user-provided value |
-| LogInjectionTest.java:342:101:342:117 | (...)... | LogInjectionTest.java:342:110:342:117 | source(...) : Object | LogInjectionTest.java:342:101:342:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:342:110:342:117 | source(...) | user-provided value |
-| LogInjectionTest.java:343:86:343:102 | (...)... | LogInjectionTest.java:343:95:343:102 | source(...) : Object | LogInjectionTest.java:343:86:343:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:343:95:343:102 | source(...) | user-provided value |
-| LogInjectionTest.java:344:71:344:87 | (...)... | LogInjectionTest.java:344:80:344:87 | source(...) : Object | LogInjectionTest.java:344:71:344:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:344:80:344:87 | source(...) | user-provided value |
-| LogInjectionTest.java:345:56:345:72 | (...)... | LogInjectionTest.java:345:65:345:72 | source(...) : Object | LogInjectionTest.java:345:56:345:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:345:65:345:72 | source(...) | user-provided value |
-| LogInjectionTest.java:346:41:346:57 | (...)... | LogInjectionTest.java:346:50:346:57 | source(...) : Object | LogInjectionTest.java:346:41:346:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:346:50:346:57 | source(...) | user-provided value |
-| LogInjectionTest.java:347:26:347:42 | (...)... | LogInjectionTest.java:347:35:347:42 | source(...) : Object | LogInjectionTest.java:347:26:347:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:347:35:347:42 | source(...) | user-provided value |
-| LogInjectionTest.java:348:161:348:177 | (...)... | LogInjectionTest.java:348:170:348:177 | source(...) : Object | LogInjectionTest.java:348:161:348:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:348:170:348:177 | source(...) | user-provided value |
-| LogInjectionTest.java:349:146:349:162 | (...)... | LogInjectionTest.java:349:155:349:162 | source(...) : Object | LogInjectionTest.java:349:146:349:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:349:155:349:162 | source(...) | user-provided value |
-| LogInjectionTest.java:350:131:350:147 | (...)... | LogInjectionTest.java:350:140:350:147 | source(...) : Object | LogInjectionTest.java:350:131:350:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:350:140:350:147 | source(...) | user-provided value |
-| LogInjectionTest.java:351:116:351:132 | (...)... | LogInjectionTest.java:351:125:351:132 | source(...) : Object | LogInjectionTest.java:351:116:351:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:351:125:351:132 | source(...) | user-provided value |
-| LogInjectionTest.java:352:101:352:117 | (...)... | LogInjectionTest.java:352:110:352:117 | source(...) : Object | LogInjectionTest.java:352:101:352:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:352:110:352:117 | source(...) | user-provided value |
-| LogInjectionTest.java:353:86:353:102 | (...)... | LogInjectionTest.java:353:95:353:102 | source(...) : Object | LogInjectionTest.java:353:86:353:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:353:95:353:102 | source(...) | user-provided value |
-| LogInjectionTest.java:354:71:354:87 | (...)... | LogInjectionTest.java:354:80:354:87 | source(...) : Object | LogInjectionTest.java:354:71:354:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:354:80:354:87 | source(...) | user-provided value |
-| LogInjectionTest.java:355:56:355:72 | (...)... | LogInjectionTest.java:355:65:355:72 | source(...) : Object | LogInjectionTest.java:355:56:355:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:355:65:355:72 | source(...) | user-provided value |
-| LogInjectionTest.java:356:41:356:57 | (...)... | LogInjectionTest.java:356:50:356:57 | source(...) : Object | LogInjectionTest.java:356:41:356:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:356:50:356:57 | source(...) | user-provided value |
-| LogInjectionTest.java:357:26:357:42 | (...)... | LogInjectionTest.java:357:35:357:42 | source(...) : Object | LogInjectionTest.java:357:26:357:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:357:35:357:42 | source(...) | user-provided value |
-| LogInjectionTest.java:358:26:358:42 | (...)... | LogInjectionTest.java:358:35:358:42 | source(...) : Object | LogInjectionTest.java:358:26:358:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:358:35:358:42 | source(...) | user-provided value |
-| LogInjectionTest.java:359:41:359:62 | (...)... | LogInjectionTest.java:359:55:359:62 | source(...) : Object | LogInjectionTest.java:359:41:359:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:359:55:359:62 | source(...) | user-provided value |
-| LogInjectionTest.java:360:26:360:42 | (...)... | LogInjectionTest.java:360:35:360:42 | source(...) : Object | LogInjectionTest.java:360:26:360:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:360:35:360:42 | source(...) | user-provided value |
-| LogInjectionTest.java:361:26:361:47 | (...)... | LogInjectionTest.java:361:40:361:47 | source(...) : Object | LogInjectionTest.java:361:26:361:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:361:40:361:47 | source(...) | user-provided value |
-| LogInjectionTest.java:362:26:362:47 | (...)... | LogInjectionTest.java:362:40:362:47 | source(...) : Object | LogInjectionTest.java:362:26:362:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:362:40:362:47 | source(...) | user-provided value |
-| LogInjectionTest.java:363:26:363:48 | (...)... | LogInjectionTest.java:363:41:363:48 | source(...) : Object | LogInjectionTest.java:363:26:363:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:363:41:363:48 | source(...) | user-provided value |
-| LogInjectionTest.java:364:26:364:48 | (...)... | LogInjectionTest.java:364:41:364:48 | source(...) : Object | LogInjectionTest.java:364:26:364:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:364:41:364:48 | source(...) | user-provided value |
-| LogInjectionTest.java:365:41:365:63 | (...)... | LogInjectionTest.java:365:56:365:63 | source(...) : Object | LogInjectionTest.java:365:41:365:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:365:56:365:63 | source(...) | user-provided value |
-| LogInjectionTest.java:366:41:366:63 | (...)... | LogInjectionTest.java:366:56:366:63 | source(...) : Object | LogInjectionTest.java:366:41:366:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:366:56:366:63 | source(...) | user-provided value |
-| LogInjectionTest.java:367:41:367:58 | (...)... | LogInjectionTest.java:367:51:367:58 | source(...) : Object | LogInjectionTest.java:367:41:367:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:367:51:367:58 | source(...) | user-provided value |
-| LogInjectionTest.java:368:41:368:66 | (...)... | LogInjectionTest.java:368:59:368:66 | source(...) : Object | LogInjectionTest.java:368:41:368:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:368:59:368:66 | source(...) | user-provided value |
-| LogInjectionTest.java:369:41:369:66 | (...)... | LogInjectionTest.java:369:59:369:66 | source(...) : Object | LogInjectionTest.java:369:41:369:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:369:59:369:66 | source(...) | user-provided value |
-| LogInjectionTest.java:370:41:370:48 | source(...) | LogInjectionTest.java:370:41:370:48 | source(...) | LogInjectionTest.java:370:41:370:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:370:41:370:48 | source(...) | user-provided value |
-| LogInjectionTest.java:371:41:371:57 | (...)... | LogInjectionTest.java:371:50:371:57 | source(...) : Object | LogInjectionTest.java:371:41:371:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:371:50:371:57 | source(...) | user-provided value |
-| LogInjectionTest.java:372:41:372:57 | (...)... | LogInjectionTest.java:372:50:372:57 | source(...) : Object | LogInjectionTest.java:372:41:372:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:372:50:372:57 | source(...) | user-provided value |
-| LogInjectionTest.java:373:56:373:78 | new Object[] | LogInjectionTest.java:373:70:373:77 | source(...) : Object | LogInjectionTest.java:373:56:373:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:373:70:373:77 | source(...) | user-provided value |
-| LogInjectionTest.java:374:56:374:72 | (...)... | LogInjectionTest.java:374:65:374:72 | source(...) : Object | LogInjectionTest.java:374:56:374:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:374:65:374:72 | source(...) | user-provided value |
-| LogInjectionTest.java:375:41:375:57 | (...)... | LogInjectionTest.java:375:50:375:57 | source(...) : Object | LogInjectionTest.java:375:41:375:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:375:50:375:57 | source(...) | user-provided value |
-| LogInjectionTest.java:376:71:376:87 | (...)... | LogInjectionTest.java:376:80:376:87 | source(...) : Object | LogInjectionTest.java:376:71:376:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:376:80:376:87 | source(...) | user-provided value |
-| LogInjectionTest.java:377:56:377:72 | (...)... | LogInjectionTest.java:377:65:377:72 | source(...) : Object | LogInjectionTest.java:377:56:377:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:377:65:377:72 | source(...) | user-provided value |
-| LogInjectionTest.java:378:41:378:57 | (...)... | LogInjectionTest.java:378:50:378:57 | source(...) : Object | LogInjectionTest.java:378:41:378:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:378:50:378:57 | source(...) | user-provided value |
-| LogInjectionTest.java:379:86:379:102 | (...)... | LogInjectionTest.java:379:95:379:102 | source(...) : Object | LogInjectionTest.java:379:86:379:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:379:95:379:102 | source(...) | user-provided value |
-| LogInjectionTest.java:380:71:380:87 | (...)... | LogInjectionTest.java:380:80:380:87 | source(...) : Object | LogInjectionTest.java:380:71:380:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:380:80:380:87 | source(...) | user-provided value |
-| LogInjectionTest.java:381:56:381:72 | (...)... | LogInjectionTest.java:381:65:381:72 | source(...) : Object | LogInjectionTest.java:381:56:381:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:381:65:381:72 | source(...) | user-provided value |
-| LogInjectionTest.java:382:41:382:57 | (...)... | LogInjectionTest.java:382:50:382:57 | source(...) : Object | LogInjectionTest.java:382:41:382:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:382:50:382:57 | source(...) | user-provided value |
+| LogInjectionTest.java:318:26:318:42 | (...)... | LogInjectionTest.java:318:35:318:42 | source(...) : Object | LogInjectionTest.java:318:26:318:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:318:35:318:42 | source(...) | user-provided value |
+| LogInjectionTest.java:319:41:319:62 | (...)... | LogInjectionTest.java:319:55:319:62 | source(...) : Object | LogInjectionTest.java:319:41:319:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:319:55:319:62 | source(...) | user-provided value |
+| LogInjectionTest.java:320:26:320:42 | (...)... | LogInjectionTest.java:320:35:320:42 | source(...) : Object | LogInjectionTest.java:320:26:320:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:320:35:320:42 | source(...) | user-provided value |
+| LogInjectionTest.java:321:26:321:47 | (...)... | LogInjectionTest.java:321:40:321:47 | source(...) : Object | LogInjectionTest.java:321:26:321:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:321:40:321:47 | source(...) | user-provided value |
+| LogInjectionTest.java:322:26:322:47 | (...)... | LogInjectionTest.java:322:40:322:47 | source(...) : Object | LogInjectionTest.java:322:26:322:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:322:40:322:47 | source(...) | user-provided value |
+| LogInjectionTest.java:323:26:323:48 | (...)... | LogInjectionTest.java:323:41:323:48 | source(...) : Object | LogInjectionTest.java:323:26:323:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:323:41:323:48 | source(...) | user-provided value |
+| LogInjectionTest.java:324:26:324:48 | (...)... | LogInjectionTest.java:324:41:324:48 | source(...) : Object | LogInjectionTest.java:324:26:324:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:324:41:324:48 | source(...) | user-provided value |
+| LogInjectionTest.java:325:41:325:63 | (...)... | LogInjectionTest.java:325:56:325:63 | source(...) : Object | LogInjectionTest.java:325:41:325:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:325:56:325:63 | source(...) | user-provided value |
+| LogInjectionTest.java:326:41:326:63 | (...)... | LogInjectionTest.java:326:56:326:63 | source(...) : Object | LogInjectionTest.java:326:41:326:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:326:56:326:63 | source(...) | user-provided value |
+| LogInjectionTest.java:327:41:327:58 | (...)... | LogInjectionTest.java:327:51:327:58 | source(...) : Object | LogInjectionTest.java:327:41:327:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:327:51:327:58 | source(...) | user-provided value |
+| LogInjectionTest.java:328:41:328:66 | (...)... | LogInjectionTest.java:328:59:328:66 | source(...) : Object | LogInjectionTest.java:328:41:328:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:328:59:328:66 | source(...) | user-provided value |
+| LogInjectionTest.java:329:41:329:66 | (...)... | LogInjectionTest.java:329:59:329:66 | source(...) : Object | LogInjectionTest.java:329:41:329:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:329:59:329:66 | source(...) | user-provided value |
+| LogInjectionTest.java:330:41:330:48 | source(...) | LogInjectionTest.java:330:41:330:48 | source(...) | LogInjectionTest.java:330:41:330:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:330:41:330:48 | source(...) | user-provided value |
+| LogInjectionTest.java:331:41:331:57 | (...)... | LogInjectionTest.java:331:50:331:57 | source(...) : Object | LogInjectionTest.java:331:41:331:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:331:50:331:57 | source(...) | user-provided value |
+| LogInjectionTest.java:332:41:332:57 | (...)... | LogInjectionTest.java:332:50:332:57 | source(...) : Object | LogInjectionTest.java:332:41:332:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:332:50:332:57 | source(...) | user-provided value |
+| LogInjectionTest.java:333:56:333:78 | new Object[] | LogInjectionTest.java:333:70:333:77 | source(...) : Object | LogInjectionTest.java:333:56:333:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:333:70:333:77 | source(...) | user-provided value |
+| LogInjectionTest.java:334:56:334:72 | (...)... | LogInjectionTest.java:334:65:334:72 | source(...) : Object | LogInjectionTest.java:334:56:334:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:334:65:334:72 | source(...) | user-provided value |
+| LogInjectionTest.java:335:41:335:57 | (...)... | LogInjectionTest.java:335:50:335:57 | source(...) : Object | LogInjectionTest.java:335:41:335:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:335:50:335:57 | source(...) | user-provided value |
+| LogInjectionTest.java:336:71:336:87 | (...)... | LogInjectionTest.java:336:80:336:87 | source(...) : Object | LogInjectionTest.java:336:71:336:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:336:80:336:87 | source(...) | user-provided value |
+| LogInjectionTest.java:337:56:337:72 | (...)... | LogInjectionTest.java:337:65:337:72 | source(...) : Object | LogInjectionTest.java:337:56:337:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:337:65:337:72 | source(...) | user-provided value |
+| LogInjectionTest.java:338:41:338:57 | (...)... | LogInjectionTest.java:338:50:338:57 | source(...) : Object | LogInjectionTest.java:338:41:338:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:338:50:338:57 | source(...) | user-provided value |
+| LogInjectionTest.java:339:86:339:102 | (...)... | LogInjectionTest.java:339:95:339:102 | source(...) : Object | LogInjectionTest.java:339:86:339:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:339:95:339:102 | source(...) | user-provided value |
+| LogInjectionTest.java:340:71:340:87 | (...)... | LogInjectionTest.java:340:80:340:87 | source(...) : Object | LogInjectionTest.java:340:71:340:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:340:80:340:87 | source(...) | user-provided value |
+| LogInjectionTest.java:341:56:341:72 | (...)... | LogInjectionTest.java:341:65:341:72 | source(...) : Object | LogInjectionTest.java:341:56:341:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:341:65:341:72 | source(...) | user-provided value |
+| LogInjectionTest.java:342:41:342:57 | (...)... | LogInjectionTest.java:342:50:342:57 | source(...) : Object | LogInjectionTest.java:342:41:342:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:342:50:342:57 | source(...) | user-provided value |
+| LogInjectionTest.java:343:101:343:117 | (...)... | LogInjectionTest.java:343:110:343:117 | source(...) : Object | LogInjectionTest.java:343:101:343:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:343:110:343:117 | source(...) | user-provided value |
+| LogInjectionTest.java:344:86:344:102 | (...)... | LogInjectionTest.java:344:95:344:102 | source(...) : Object | LogInjectionTest.java:344:86:344:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:344:95:344:102 | source(...) | user-provided value |
+| LogInjectionTest.java:345:71:345:87 | (...)... | LogInjectionTest.java:345:80:345:87 | source(...) : Object | LogInjectionTest.java:345:71:345:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:345:80:345:87 | source(...) | user-provided value |
+| LogInjectionTest.java:346:56:346:72 | (...)... | LogInjectionTest.java:346:65:346:72 | source(...) : Object | LogInjectionTest.java:346:56:346:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:346:65:346:72 | source(...) | user-provided value |
+| LogInjectionTest.java:347:41:347:57 | (...)... | LogInjectionTest.java:347:50:347:57 | source(...) : Object | LogInjectionTest.java:347:41:347:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:347:50:347:57 | source(...) | user-provided value |
+| LogInjectionTest.java:348:116:348:132 | (...)... | LogInjectionTest.java:348:125:348:132 | source(...) : Object | LogInjectionTest.java:348:116:348:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:348:125:348:132 | source(...) | user-provided value |
+| LogInjectionTest.java:349:101:349:117 | (...)... | LogInjectionTest.java:349:110:349:117 | source(...) : Object | LogInjectionTest.java:349:101:349:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:349:110:349:117 | source(...) | user-provided value |
+| LogInjectionTest.java:350:86:350:102 | (...)... | LogInjectionTest.java:350:95:350:102 | source(...) : Object | LogInjectionTest.java:350:86:350:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:350:95:350:102 | source(...) | user-provided value |
+| LogInjectionTest.java:351:71:351:87 | (...)... | LogInjectionTest.java:351:80:351:87 | source(...) : Object | LogInjectionTest.java:351:71:351:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:351:80:351:87 | source(...) | user-provided value |
+| LogInjectionTest.java:352:56:352:72 | (...)... | LogInjectionTest.java:352:65:352:72 | source(...) : Object | LogInjectionTest.java:352:56:352:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:352:65:352:72 | source(...) | user-provided value |
+| LogInjectionTest.java:353:41:353:57 | (...)... | LogInjectionTest.java:353:50:353:57 | source(...) : Object | LogInjectionTest.java:353:41:353:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:353:50:353:57 | source(...) | user-provided value |
+| LogInjectionTest.java:354:131:354:147 | (...)... | LogInjectionTest.java:354:140:354:147 | source(...) : Object | LogInjectionTest.java:354:131:354:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:354:140:354:147 | source(...) | user-provided value |
+| LogInjectionTest.java:355:116:355:132 | (...)... | LogInjectionTest.java:355:125:355:132 | source(...) : Object | LogInjectionTest.java:355:116:355:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:355:125:355:132 | source(...) | user-provided value |
+| LogInjectionTest.java:356:101:356:117 | (...)... | LogInjectionTest.java:356:110:356:117 | source(...) : Object | LogInjectionTest.java:356:101:356:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:356:110:356:117 | source(...) | user-provided value |
+| LogInjectionTest.java:357:86:357:102 | (...)... | LogInjectionTest.java:357:95:357:102 | source(...) : Object | LogInjectionTest.java:357:86:357:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:357:95:357:102 | source(...) | user-provided value |
+| LogInjectionTest.java:358:71:358:87 | (...)... | LogInjectionTest.java:358:80:358:87 | source(...) : Object | LogInjectionTest.java:358:71:358:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:358:80:358:87 | source(...) | user-provided value |
+| LogInjectionTest.java:359:56:359:72 | (...)... | LogInjectionTest.java:359:65:359:72 | source(...) : Object | LogInjectionTest.java:359:56:359:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:359:65:359:72 | source(...) | user-provided value |
+| LogInjectionTest.java:360:41:360:57 | (...)... | LogInjectionTest.java:360:50:360:57 | source(...) : Object | LogInjectionTest.java:360:41:360:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:360:50:360:57 | source(...) | user-provided value |
+| LogInjectionTest.java:361:146:361:162 | (...)... | LogInjectionTest.java:361:155:361:162 | source(...) : Object | LogInjectionTest.java:361:146:361:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:361:155:361:162 | source(...) | user-provided value |
+| LogInjectionTest.java:362:131:362:147 | (...)... | LogInjectionTest.java:362:140:362:147 | source(...) : Object | LogInjectionTest.java:362:131:362:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:362:140:362:147 | source(...) | user-provided value |
+| LogInjectionTest.java:363:116:363:132 | (...)... | LogInjectionTest.java:363:125:363:132 | source(...) : Object | LogInjectionTest.java:363:116:363:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:363:125:363:132 | source(...) | user-provided value |
+| LogInjectionTest.java:364:101:364:117 | (...)... | LogInjectionTest.java:364:110:364:117 | source(...) : Object | LogInjectionTest.java:364:101:364:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:364:110:364:117 | source(...) | user-provided value |
+| LogInjectionTest.java:365:86:365:102 | (...)... | LogInjectionTest.java:365:95:365:102 | source(...) : Object | LogInjectionTest.java:365:86:365:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:365:95:365:102 | source(...) | user-provided value |
+| LogInjectionTest.java:366:71:366:87 | (...)... | LogInjectionTest.java:366:80:366:87 | source(...) : Object | LogInjectionTest.java:366:71:366:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:366:80:366:87 | source(...) | user-provided value |
+| LogInjectionTest.java:367:56:367:72 | (...)... | LogInjectionTest.java:367:65:367:72 | source(...) : Object | LogInjectionTest.java:367:56:367:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:367:65:367:72 | source(...) | user-provided value |
+| LogInjectionTest.java:368:41:368:57 | (...)... | LogInjectionTest.java:368:50:368:57 | source(...) : Object | LogInjectionTest.java:368:41:368:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:368:50:368:57 | source(...) | user-provided value |
+| LogInjectionTest.java:369:161:369:177 | (...)... | LogInjectionTest.java:369:170:369:177 | source(...) : Object | LogInjectionTest.java:369:161:369:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:369:170:369:177 | source(...) | user-provided value |
+| LogInjectionTest.java:370:146:370:162 | (...)... | LogInjectionTest.java:370:155:370:162 | source(...) : Object | LogInjectionTest.java:370:146:370:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:370:155:370:162 | source(...) | user-provided value |
+| LogInjectionTest.java:371:131:371:147 | (...)... | LogInjectionTest.java:371:140:371:147 | source(...) : Object | LogInjectionTest.java:371:131:371:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:371:140:371:147 | source(...) | user-provided value |
+| LogInjectionTest.java:372:116:372:132 | (...)... | LogInjectionTest.java:372:125:372:132 | source(...) : Object | LogInjectionTest.java:372:116:372:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:372:125:372:132 | source(...) | user-provided value |
+| LogInjectionTest.java:373:101:373:117 | (...)... | LogInjectionTest.java:373:110:373:117 | source(...) : Object | LogInjectionTest.java:373:101:373:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:373:110:373:117 | source(...) | user-provided value |
+| LogInjectionTest.java:374:86:374:102 | (...)... | LogInjectionTest.java:374:95:374:102 | source(...) : Object | LogInjectionTest.java:374:86:374:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:374:95:374:102 | source(...) | user-provided value |
+| LogInjectionTest.java:375:71:375:87 | (...)... | LogInjectionTest.java:375:80:375:87 | source(...) : Object | LogInjectionTest.java:375:71:375:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:375:80:375:87 | source(...) | user-provided value |
+| LogInjectionTest.java:376:56:376:72 | (...)... | LogInjectionTest.java:376:65:376:72 | source(...) : Object | LogInjectionTest.java:376:56:376:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:376:65:376:72 | source(...) | user-provided value |
+| LogInjectionTest.java:377:41:377:57 | (...)... | LogInjectionTest.java:377:50:377:57 | source(...) : Object | LogInjectionTest.java:377:41:377:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:377:50:377:57 | source(...) | user-provided value |
+| LogInjectionTest.java:378:176:378:192 | (...)... | LogInjectionTest.java:378:185:378:192 | source(...) : Object | LogInjectionTest.java:378:176:378:192 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:378:185:378:192 | source(...) | user-provided value |
+| LogInjectionTest.java:379:161:379:177 | (...)... | LogInjectionTest.java:379:170:379:177 | source(...) : Object | LogInjectionTest.java:379:161:379:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:379:170:379:177 | source(...) | user-provided value |
+| LogInjectionTest.java:380:146:380:162 | (...)... | LogInjectionTest.java:380:155:380:162 | source(...) : Object | LogInjectionTest.java:380:146:380:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:380:155:380:162 | source(...) | user-provided value |
+| LogInjectionTest.java:381:131:381:147 | (...)... | LogInjectionTest.java:381:140:381:147 | source(...) : Object | LogInjectionTest.java:381:131:381:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:381:140:381:147 | source(...) | user-provided value |
+| LogInjectionTest.java:382:116:382:132 | (...)... | LogInjectionTest.java:382:125:382:132 | source(...) : Object | LogInjectionTest.java:382:116:382:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:382:125:382:132 | source(...) | user-provided value |
 | LogInjectionTest.java:383:101:383:117 | (...)... | LogInjectionTest.java:383:110:383:117 | source(...) : Object | LogInjectionTest.java:383:101:383:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:383:110:383:117 | source(...) | user-provided value |
 | LogInjectionTest.java:384:86:384:102 | (...)... | LogInjectionTest.java:384:95:384:102 | source(...) : Object | LogInjectionTest.java:384:86:384:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:384:95:384:102 | source(...) | user-provided value |
 | LogInjectionTest.java:385:71:385:87 | (...)... | LogInjectionTest.java:385:80:385:87 | source(...) : Object | LogInjectionTest.java:385:71:385:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:385:80:385:87 | source(...) | user-provided value |
 | LogInjectionTest.java:386:56:386:72 | (...)... | LogInjectionTest.java:386:65:386:72 | source(...) : Object | LogInjectionTest.java:386:56:386:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:386:65:386:72 | source(...) | user-provided value |
 | LogInjectionTest.java:387:41:387:57 | (...)... | LogInjectionTest.java:387:50:387:57 | source(...) : Object | LogInjectionTest.java:387:41:387:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:387:50:387:57 | source(...) | user-provided value |
-| LogInjectionTest.java:388:116:388:132 | (...)... | LogInjectionTest.java:388:125:388:132 | source(...) : Object | LogInjectionTest.java:388:116:388:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:388:125:388:132 | source(...) | user-provided value |
-| LogInjectionTest.java:389:101:389:117 | (...)... | LogInjectionTest.java:389:110:389:117 | source(...) : Object | LogInjectionTest.java:389:101:389:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:389:110:389:117 | source(...) | user-provided value |
-| LogInjectionTest.java:390:86:390:102 | (...)... | LogInjectionTest.java:390:95:390:102 | source(...) : Object | LogInjectionTest.java:390:86:390:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:390:95:390:102 | source(...) | user-provided value |
-| LogInjectionTest.java:391:71:391:87 | (...)... | LogInjectionTest.java:391:80:391:87 | source(...) : Object | LogInjectionTest.java:391:71:391:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:391:80:391:87 | source(...) | user-provided value |
-| LogInjectionTest.java:392:56:392:72 | (...)... | LogInjectionTest.java:392:65:392:72 | source(...) : Object | LogInjectionTest.java:392:56:392:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:392:65:392:72 | source(...) | user-provided value |
-| LogInjectionTest.java:393:41:393:57 | (...)... | LogInjectionTest.java:393:50:393:57 | source(...) : Object | LogInjectionTest.java:393:41:393:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:393:50:393:57 | source(...) | user-provided value |
-| LogInjectionTest.java:394:131:394:147 | (...)... | LogInjectionTest.java:394:140:394:147 | source(...) : Object | LogInjectionTest.java:394:131:394:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:394:140:394:147 | source(...) | user-provided value |
-| LogInjectionTest.java:395:116:395:132 | (...)... | LogInjectionTest.java:395:125:395:132 | source(...) : Object | LogInjectionTest.java:395:116:395:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:395:125:395:132 | source(...) | user-provided value |
-| LogInjectionTest.java:396:101:396:117 | (...)... | LogInjectionTest.java:396:110:396:117 | source(...) : Object | LogInjectionTest.java:396:101:396:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:396:110:396:117 | source(...) | user-provided value |
-| LogInjectionTest.java:397:86:397:102 | (...)... | LogInjectionTest.java:397:95:397:102 | source(...) : Object | LogInjectionTest.java:397:86:397:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:397:95:397:102 | source(...) | user-provided value |
-| LogInjectionTest.java:398:71:398:87 | (...)... | LogInjectionTest.java:398:80:398:87 | source(...) : Object | LogInjectionTest.java:398:71:398:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:398:80:398:87 | source(...) | user-provided value |
-| LogInjectionTest.java:399:56:399:72 | (...)... | LogInjectionTest.java:399:65:399:72 | source(...) : Object | LogInjectionTest.java:399:56:399:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:399:65:399:72 | source(...) | user-provided value |
-| LogInjectionTest.java:400:41:400:57 | (...)... | LogInjectionTest.java:400:50:400:57 | source(...) : Object | LogInjectionTest.java:400:41:400:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:400:50:400:57 | source(...) | user-provided value |
-| LogInjectionTest.java:401:146:401:162 | (...)... | LogInjectionTest.java:401:155:401:162 | source(...) : Object | LogInjectionTest.java:401:146:401:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:401:155:401:162 | source(...) | user-provided value |
-| LogInjectionTest.java:402:131:402:147 | (...)... | LogInjectionTest.java:402:140:402:147 | source(...) : Object | LogInjectionTest.java:402:131:402:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:402:140:402:147 | source(...) | user-provided value |
-| LogInjectionTest.java:403:116:403:132 | (...)... | LogInjectionTest.java:403:125:403:132 | source(...) : Object | LogInjectionTest.java:403:116:403:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:403:125:403:132 | source(...) | user-provided value |
-| LogInjectionTest.java:404:101:404:117 | (...)... | LogInjectionTest.java:404:110:404:117 | source(...) : Object | LogInjectionTest.java:404:101:404:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:404:110:404:117 | source(...) | user-provided value |
-| LogInjectionTest.java:405:86:405:102 | (...)... | LogInjectionTest.java:405:95:405:102 | source(...) : Object | LogInjectionTest.java:405:86:405:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:405:95:405:102 | source(...) | user-provided value |
-| LogInjectionTest.java:406:71:406:87 | (...)... | LogInjectionTest.java:406:80:406:87 | source(...) : Object | LogInjectionTest.java:406:71:406:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:406:80:406:87 | source(...) | user-provided value |
-| LogInjectionTest.java:407:56:407:72 | (...)... | LogInjectionTest.java:407:65:407:72 | source(...) : Object | LogInjectionTest.java:407:56:407:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:407:65:407:72 | source(...) | user-provided value |
-| LogInjectionTest.java:408:41:408:57 | (...)... | LogInjectionTest.java:408:50:408:57 | source(...) : Object | LogInjectionTest.java:408:41:408:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:408:50:408:57 | source(...) | user-provided value |
-| LogInjectionTest.java:409:161:409:177 | (...)... | LogInjectionTest.java:409:170:409:177 | source(...) : Object | LogInjectionTest.java:409:161:409:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:409:170:409:177 | source(...) | user-provided value |
-| LogInjectionTest.java:410:146:410:162 | (...)... | LogInjectionTest.java:410:155:410:162 | source(...) : Object | LogInjectionTest.java:410:146:410:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:410:155:410:162 | source(...) | user-provided value |
-| LogInjectionTest.java:411:131:411:147 | (...)... | LogInjectionTest.java:411:140:411:147 | source(...) : Object | LogInjectionTest.java:411:131:411:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:411:140:411:147 | source(...) | user-provided value |
-| LogInjectionTest.java:412:116:412:132 | (...)... | LogInjectionTest.java:412:125:412:132 | source(...) : Object | LogInjectionTest.java:412:116:412:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:412:125:412:132 | source(...) | user-provided value |
-| LogInjectionTest.java:413:101:413:117 | (...)... | LogInjectionTest.java:413:110:413:117 | source(...) : Object | LogInjectionTest.java:413:101:413:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:413:110:413:117 | source(...) | user-provided value |
-| LogInjectionTest.java:414:86:414:102 | (...)... | LogInjectionTest.java:414:95:414:102 | source(...) : Object | LogInjectionTest.java:414:86:414:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:414:95:414:102 | source(...) | user-provided value |
-| LogInjectionTest.java:415:71:415:87 | (...)... | LogInjectionTest.java:415:80:415:87 | source(...) : Object | LogInjectionTest.java:415:71:415:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:415:80:415:87 | source(...) | user-provided value |
-| LogInjectionTest.java:416:56:416:72 | (...)... | LogInjectionTest.java:416:65:416:72 | source(...) : Object | LogInjectionTest.java:416:56:416:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:416:65:416:72 | source(...) | user-provided value |
-| LogInjectionTest.java:417:41:417:57 | (...)... | LogInjectionTest.java:417:50:417:57 | source(...) : Object | LogInjectionTest.java:417:41:417:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:417:50:417:57 | source(...) | user-provided value |
-| LogInjectionTest.java:418:176:418:192 | (...)... | LogInjectionTest.java:418:185:418:192 | source(...) : Object | LogInjectionTest.java:418:176:418:192 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:418:185:418:192 | source(...) | user-provided value |
-| LogInjectionTest.java:419:161:419:177 | (...)... | LogInjectionTest.java:419:170:419:177 | source(...) : Object | LogInjectionTest.java:419:161:419:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:419:170:419:177 | source(...) | user-provided value |
-| LogInjectionTest.java:420:146:420:162 | (...)... | LogInjectionTest.java:420:155:420:162 | source(...) : Object | LogInjectionTest.java:420:146:420:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:420:155:420:162 | source(...) | user-provided value |
-| LogInjectionTest.java:421:131:421:147 | (...)... | LogInjectionTest.java:421:140:421:147 | source(...) : Object | LogInjectionTest.java:421:131:421:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:421:140:421:147 | source(...) | user-provided value |
+| LogInjectionTest.java:388:41:388:57 | (...)... | LogInjectionTest.java:388:50:388:57 | source(...) : Object | LogInjectionTest.java:388:41:388:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:388:50:388:57 | source(...) | user-provided value |
+| LogInjectionTest.java:389:56:389:77 | (...)... | LogInjectionTest.java:389:70:389:77 | source(...) : Object | LogInjectionTest.java:389:56:389:77 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:389:70:389:77 | source(...) | user-provided value |
+| LogInjectionTest.java:390:41:390:57 | (...)... | LogInjectionTest.java:390:50:390:57 | source(...) : Object | LogInjectionTest.java:390:41:390:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:390:50:390:57 | source(...) | user-provided value |
+| LogInjectionTest.java:391:41:391:62 | (...)... | LogInjectionTest.java:391:55:391:62 | source(...) : Object | LogInjectionTest.java:391:41:391:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:391:55:391:62 | source(...) | user-provided value |
+| LogInjectionTest.java:392:41:392:62 | (...)... | LogInjectionTest.java:392:55:392:62 | source(...) : Object | LogInjectionTest.java:392:41:392:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:392:55:392:62 | source(...) | user-provided value |
+| LogInjectionTest.java:393:26:393:51 | (...)... | LogInjectionTest.java:393:44:393:51 | source(...) : Object | LogInjectionTest.java:393:26:393:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:393:44:393:51 | source(...) | user-provided value |
+| LogInjectionTest.java:394:26:394:51 | (...)... | LogInjectionTest.java:394:44:394:51 | source(...) : Object | LogInjectionTest.java:394:26:394:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:394:44:394:51 | source(...) | user-provided value |
+| LogInjectionTest.java:395:26:395:43 | (...)... | LogInjectionTest.java:395:36:395:43 | source(...) : Object | LogInjectionTest.java:395:26:395:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:395:36:395:43 | source(...) | user-provided value |
+| LogInjectionTest.java:396:26:396:43 | (...)... | LogInjectionTest.java:396:36:396:43 | source(...) : Object | LogInjectionTest.java:396:26:396:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:396:36:396:43 | source(...) | user-provided value |
+| LogInjectionTest.java:397:26:397:33 | source(...) | LogInjectionTest.java:397:26:397:33 | source(...) | LogInjectionTest.java:397:26:397:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:397:26:397:33 | source(...) | user-provided value |
+| LogInjectionTest.java:398:26:398:33 | source(...) | LogInjectionTest.java:398:26:398:33 | source(...) | LogInjectionTest.java:398:26:398:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:398:26:398:33 | source(...) | user-provided value |
+| LogInjectionTest.java:399:26:399:42 | (...)... | LogInjectionTest.java:399:35:399:42 | source(...) : Object | LogInjectionTest.java:399:26:399:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:399:35:399:42 | source(...) | user-provided value |
+| LogInjectionTest.java:400:26:400:42 | (...)... | LogInjectionTest.java:400:35:400:42 | source(...) : Object | LogInjectionTest.java:400:26:400:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:400:35:400:42 | source(...) | user-provided value |
+| LogInjectionTest.java:401:41:401:63 | new Object[] | LogInjectionTest.java:401:55:401:62 | source(...) : Object | LogInjectionTest.java:401:41:401:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:401:55:401:62 | source(...) | user-provided value |
+| LogInjectionTest.java:402:41:402:57 | (...)... | LogInjectionTest.java:402:50:402:57 | source(...) : Object | LogInjectionTest.java:402:41:402:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:402:50:402:57 | source(...) | user-provided value |
+| LogInjectionTest.java:403:26:403:42 | (...)... | LogInjectionTest.java:403:35:403:42 | source(...) : Object | LogInjectionTest.java:403:26:403:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:403:35:403:42 | source(...) | user-provided value |
+| LogInjectionTest.java:404:56:404:72 | (...)... | LogInjectionTest.java:404:65:404:72 | source(...) : Object | LogInjectionTest.java:404:56:404:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:404:65:404:72 | source(...) | user-provided value |
+| LogInjectionTest.java:405:41:405:57 | (...)... | LogInjectionTest.java:405:50:405:57 | source(...) : Object | LogInjectionTest.java:405:41:405:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:405:50:405:57 | source(...) | user-provided value |
+| LogInjectionTest.java:406:26:406:42 | (...)... | LogInjectionTest.java:406:35:406:42 | source(...) : Object | LogInjectionTest.java:406:26:406:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:406:35:406:42 | source(...) | user-provided value |
+| LogInjectionTest.java:407:71:407:87 | (...)... | LogInjectionTest.java:407:80:407:87 | source(...) : Object | LogInjectionTest.java:407:71:407:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:407:80:407:87 | source(...) | user-provided value |
+| LogInjectionTest.java:408:56:408:72 | (...)... | LogInjectionTest.java:408:65:408:72 | source(...) : Object | LogInjectionTest.java:408:56:408:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:408:65:408:72 | source(...) | user-provided value |
+| LogInjectionTest.java:409:41:409:57 | (...)... | LogInjectionTest.java:409:50:409:57 | source(...) : Object | LogInjectionTest.java:409:41:409:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:409:50:409:57 | source(...) | user-provided value |
+| LogInjectionTest.java:410:26:410:42 | (...)... | LogInjectionTest.java:410:35:410:42 | source(...) : Object | LogInjectionTest.java:410:26:410:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:410:35:410:42 | source(...) | user-provided value |
+| LogInjectionTest.java:411:86:411:102 | (...)... | LogInjectionTest.java:411:95:411:102 | source(...) : Object | LogInjectionTest.java:411:86:411:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:411:95:411:102 | source(...) | user-provided value |
+| LogInjectionTest.java:412:71:412:87 | (...)... | LogInjectionTest.java:412:80:412:87 | source(...) : Object | LogInjectionTest.java:412:71:412:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:412:80:412:87 | source(...) | user-provided value |
+| LogInjectionTest.java:413:56:413:72 | (...)... | LogInjectionTest.java:413:65:413:72 | source(...) : Object | LogInjectionTest.java:413:56:413:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:413:65:413:72 | source(...) | user-provided value |
+| LogInjectionTest.java:414:41:414:57 | (...)... | LogInjectionTest.java:414:50:414:57 | source(...) : Object | LogInjectionTest.java:414:41:414:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:414:50:414:57 | source(...) | user-provided value |
+| LogInjectionTest.java:415:26:415:42 | (...)... | LogInjectionTest.java:415:35:415:42 | source(...) : Object | LogInjectionTest.java:415:26:415:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:415:35:415:42 | source(...) | user-provided value |
+| LogInjectionTest.java:416:101:416:117 | (...)... | LogInjectionTest.java:416:110:416:117 | source(...) : Object | LogInjectionTest.java:416:101:416:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:416:110:416:117 | source(...) | user-provided value |
+| LogInjectionTest.java:417:86:417:102 | (...)... | LogInjectionTest.java:417:95:417:102 | source(...) : Object | LogInjectionTest.java:417:86:417:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:417:95:417:102 | source(...) | user-provided value |
+| LogInjectionTest.java:418:71:418:87 | (...)... | LogInjectionTest.java:418:80:418:87 | source(...) : Object | LogInjectionTest.java:418:71:418:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:418:80:418:87 | source(...) | user-provided value |
+| LogInjectionTest.java:419:56:419:72 | (...)... | LogInjectionTest.java:419:65:419:72 | source(...) : Object | LogInjectionTest.java:419:56:419:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:419:65:419:72 | source(...) | user-provided value |
+| LogInjectionTest.java:420:41:420:57 | (...)... | LogInjectionTest.java:420:50:420:57 | source(...) : Object | LogInjectionTest.java:420:41:420:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:420:50:420:57 | source(...) | user-provided value |
+| LogInjectionTest.java:421:26:421:42 | (...)... | LogInjectionTest.java:421:35:421:42 | source(...) : Object | LogInjectionTest.java:421:26:421:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:421:35:421:42 | source(...) | user-provided value |
 | LogInjectionTest.java:422:116:422:132 | (...)... | LogInjectionTest.java:422:125:422:132 | source(...) : Object | LogInjectionTest.java:422:116:422:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:422:125:422:132 | source(...) | user-provided value |
 | LogInjectionTest.java:423:101:423:117 | (...)... | LogInjectionTest.java:423:110:423:117 | source(...) : Object | LogInjectionTest.java:423:101:423:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:423:110:423:117 | source(...) | user-provided value |
 | LogInjectionTest.java:424:86:424:102 | (...)... | LogInjectionTest.java:424:95:424:102 | source(...) : Object | LogInjectionTest.java:424:86:424:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:424:95:424:102 | source(...) | user-provided value |
 | LogInjectionTest.java:425:71:425:87 | (...)... | LogInjectionTest.java:425:80:425:87 | source(...) : Object | LogInjectionTest.java:425:71:425:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:425:80:425:87 | source(...) | user-provided value |
 | LogInjectionTest.java:426:56:426:72 | (...)... | LogInjectionTest.java:426:65:426:72 | source(...) : Object | LogInjectionTest.java:426:56:426:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:426:65:426:72 | source(...) | user-provided value |
 | LogInjectionTest.java:427:41:427:57 | (...)... | LogInjectionTest.java:427:50:427:57 | source(...) : Object | LogInjectionTest.java:427:41:427:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:427:50:427:57 | source(...) | user-provided value |
-| LogInjectionTest.java:428:41:428:57 | (...)... | LogInjectionTest.java:428:50:428:57 | source(...) : Object | LogInjectionTest.java:428:41:428:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:428:50:428:57 | source(...) | user-provided value |
-| LogInjectionTest.java:429:56:429:77 | (...)... | LogInjectionTest.java:429:70:429:77 | source(...) : Object | LogInjectionTest.java:429:56:429:77 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:429:70:429:77 | source(...) | user-provided value |
-| LogInjectionTest.java:430:41:430:57 | (...)... | LogInjectionTest.java:430:50:430:57 | source(...) : Object | LogInjectionTest.java:430:41:430:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:430:50:430:57 | source(...) | user-provided value |
-| LogInjectionTest.java:431:41:431:62 | (...)... | LogInjectionTest.java:431:55:431:62 | source(...) : Object | LogInjectionTest.java:431:41:431:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:431:55:431:62 | source(...) | user-provided value |
-| LogInjectionTest.java:432:41:432:62 | (...)... | LogInjectionTest.java:432:55:432:62 | source(...) : Object | LogInjectionTest.java:432:41:432:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:432:55:432:62 | source(...) | user-provided value |
-| LogInjectionTest.java:433:26:433:51 | (...)... | LogInjectionTest.java:433:44:433:51 | source(...) : Object | LogInjectionTest.java:433:26:433:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:433:44:433:51 | source(...) | user-provided value |
-| LogInjectionTest.java:434:26:434:51 | (...)... | LogInjectionTest.java:434:44:434:51 | source(...) : Object | LogInjectionTest.java:434:26:434:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:434:44:434:51 | source(...) | user-provided value |
-| LogInjectionTest.java:435:26:435:43 | (...)... | LogInjectionTest.java:435:36:435:43 | source(...) : Object | LogInjectionTest.java:435:26:435:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:435:36:435:43 | source(...) | user-provided value |
-| LogInjectionTest.java:436:26:436:43 | (...)... | LogInjectionTest.java:436:36:436:43 | source(...) : Object | LogInjectionTest.java:436:26:436:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:436:36:436:43 | source(...) | user-provided value |
-| LogInjectionTest.java:437:26:437:33 | source(...) | LogInjectionTest.java:437:26:437:33 | source(...) | LogInjectionTest.java:437:26:437:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:437:26:437:33 | source(...) | user-provided value |
-| LogInjectionTest.java:438:26:438:33 | source(...) | LogInjectionTest.java:438:26:438:33 | source(...) | LogInjectionTest.java:438:26:438:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:438:26:438:33 | source(...) | user-provided value |
-| LogInjectionTest.java:439:26:439:42 | (...)... | LogInjectionTest.java:439:35:439:42 | source(...) : Object | LogInjectionTest.java:439:26:439:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:439:35:439:42 | source(...) | user-provided value |
-| LogInjectionTest.java:440:26:440:42 | (...)... | LogInjectionTest.java:440:35:440:42 | source(...) : Object | LogInjectionTest.java:440:26:440:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:440:35:440:42 | source(...) | user-provided value |
-| LogInjectionTest.java:441:41:441:63 | new Object[] | LogInjectionTest.java:441:55:441:62 | source(...) : Object | LogInjectionTest.java:441:41:441:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:441:55:441:62 | source(...) | user-provided value |
-| LogInjectionTest.java:442:41:442:57 | (...)... | LogInjectionTest.java:442:50:442:57 | source(...) : Object | LogInjectionTest.java:442:41:442:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:442:50:442:57 | source(...) | user-provided value |
-| LogInjectionTest.java:443:26:443:42 | (...)... | LogInjectionTest.java:443:35:443:42 | source(...) : Object | LogInjectionTest.java:443:26:443:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:443:35:443:42 | source(...) | user-provided value |
-| LogInjectionTest.java:444:56:444:72 | (...)... | LogInjectionTest.java:444:65:444:72 | source(...) : Object | LogInjectionTest.java:444:56:444:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:444:65:444:72 | source(...) | user-provided value |
-| LogInjectionTest.java:445:41:445:57 | (...)... | LogInjectionTest.java:445:50:445:57 | source(...) : Object | LogInjectionTest.java:445:41:445:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:445:50:445:57 | source(...) | user-provided value |
-| LogInjectionTest.java:446:26:446:42 | (...)... | LogInjectionTest.java:446:35:446:42 | source(...) : Object | LogInjectionTest.java:446:26:446:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:446:35:446:42 | source(...) | user-provided value |
-| LogInjectionTest.java:447:71:447:87 | (...)... | LogInjectionTest.java:447:80:447:87 | source(...) : Object | LogInjectionTest.java:447:71:447:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:447:80:447:87 | source(...) | user-provided value |
-| LogInjectionTest.java:448:56:448:72 | (...)... | LogInjectionTest.java:448:65:448:72 | source(...) : Object | LogInjectionTest.java:448:56:448:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:448:65:448:72 | source(...) | user-provided value |
-| LogInjectionTest.java:449:41:449:57 | (...)... | LogInjectionTest.java:449:50:449:57 | source(...) : Object | LogInjectionTest.java:449:41:449:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:449:50:449:57 | source(...) | user-provided value |
-| LogInjectionTest.java:450:26:450:42 | (...)... | LogInjectionTest.java:450:35:450:42 | source(...) : Object | LogInjectionTest.java:450:26:450:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:450:35:450:42 | source(...) | user-provided value |
+| LogInjectionTest.java:428:26:428:42 | (...)... | LogInjectionTest.java:428:35:428:42 | source(...) : Object | LogInjectionTest.java:428:26:428:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:428:35:428:42 | source(...) | user-provided value |
+| LogInjectionTest.java:429:131:429:147 | (...)... | LogInjectionTest.java:429:140:429:147 | source(...) : Object | LogInjectionTest.java:429:131:429:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:429:140:429:147 | source(...) | user-provided value |
+| LogInjectionTest.java:430:116:430:132 | (...)... | LogInjectionTest.java:430:125:430:132 | source(...) : Object | LogInjectionTest.java:430:116:430:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:430:125:430:132 | source(...) | user-provided value |
+| LogInjectionTest.java:431:101:431:117 | (...)... | LogInjectionTest.java:431:110:431:117 | source(...) : Object | LogInjectionTest.java:431:101:431:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:431:110:431:117 | source(...) | user-provided value |
+| LogInjectionTest.java:432:86:432:102 | (...)... | LogInjectionTest.java:432:95:432:102 | source(...) : Object | LogInjectionTest.java:432:86:432:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:432:95:432:102 | source(...) | user-provided value |
+| LogInjectionTest.java:433:71:433:87 | (...)... | LogInjectionTest.java:433:80:433:87 | source(...) : Object | LogInjectionTest.java:433:71:433:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:433:80:433:87 | source(...) | user-provided value |
+| LogInjectionTest.java:434:56:434:72 | (...)... | LogInjectionTest.java:434:65:434:72 | source(...) : Object | LogInjectionTest.java:434:56:434:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:434:65:434:72 | source(...) | user-provided value |
+| LogInjectionTest.java:435:41:435:57 | (...)... | LogInjectionTest.java:435:50:435:57 | source(...) : Object | LogInjectionTest.java:435:41:435:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:435:50:435:57 | source(...) | user-provided value |
+| LogInjectionTest.java:436:26:436:42 | (...)... | LogInjectionTest.java:436:35:436:42 | source(...) : Object | LogInjectionTest.java:436:26:436:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:436:35:436:42 | source(...) | user-provided value |
+| LogInjectionTest.java:437:146:437:162 | (...)... | LogInjectionTest.java:437:155:437:162 | source(...) : Object | LogInjectionTest.java:437:146:437:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:437:155:437:162 | source(...) | user-provided value |
+| LogInjectionTest.java:438:131:438:147 | (...)... | LogInjectionTest.java:438:140:438:147 | source(...) : Object | LogInjectionTest.java:438:131:438:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:438:140:438:147 | source(...) | user-provided value |
+| LogInjectionTest.java:439:116:439:132 | (...)... | LogInjectionTest.java:439:125:439:132 | source(...) : Object | LogInjectionTest.java:439:116:439:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:439:125:439:132 | source(...) | user-provided value |
+| LogInjectionTest.java:440:101:440:117 | (...)... | LogInjectionTest.java:440:110:440:117 | source(...) : Object | LogInjectionTest.java:440:101:440:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:440:110:440:117 | source(...) | user-provided value |
+| LogInjectionTest.java:441:86:441:102 | (...)... | LogInjectionTest.java:441:95:441:102 | source(...) : Object | LogInjectionTest.java:441:86:441:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:441:95:441:102 | source(...) | user-provided value |
+| LogInjectionTest.java:442:71:442:87 | (...)... | LogInjectionTest.java:442:80:442:87 | source(...) : Object | LogInjectionTest.java:442:71:442:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:442:80:442:87 | source(...) | user-provided value |
+| LogInjectionTest.java:443:56:443:72 | (...)... | LogInjectionTest.java:443:65:443:72 | source(...) : Object | LogInjectionTest.java:443:56:443:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:443:65:443:72 | source(...) | user-provided value |
+| LogInjectionTest.java:444:41:444:57 | (...)... | LogInjectionTest.java:444:50:444:57 | source(...) : Object | LogInjectionTest.java:444:41:444:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:444:50:444:57 | source(...) | user-provided value |
+| LogInjectionTest.java:445:26:445:42 | (...)... | LogInjectionTest.java:445:35:445:42 | source(...) : Object | LogInjectionTest.java:445:26:445:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:445:35:445:42 | source(...) | user-provided value |
+| LogInjectionTest.java:446:161:446:177 | (...)... | LogInjectionTest.java:446:170:446:177 | source(...) : Object | LogInjectionTest.java:446:161:446:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:446:170:446:177 | source(...) | user-provided value |
+| LogInjectionTest.java:447:146:447:162 | (...)... | LogInjectionTest.java:447:155:447:162 | source(...) : Object | LogInjectionTest.java:447:146:447:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:447:155:447:162 | source(...) | user-provided value |
+| LogInjectionTest.java:448:131:448:147 | (...)... | LogInjectionTest.java:448:140:448:147 | source(...) : Object | LogInjectionTest.java:448:131:448:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:448:140:448:147 | source(...) | user-provided value |
+| LogInjectionTest.java:449:116:449:132 | (...)... | LogInjectionTest.java:449:125:449:132 | source(...) : Object | LogInjectionTest.java:449:116:449:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:449:125:449:132 | source(...) | user-provided value |
+| LogInjectionTest.java:450:101:450:117 | (...)... | LogInjectionTest.java:450:110:450:117 | source(...) : Object | LogInjectionTest.java:450:101:450:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:450:110:450:117 | source(...) | user-provided value |
 | LogInjectionTest.java:451:86:451:102 | (...)... | LogInjectionTest.java:451:95:451:102 | source(...) : Object | LogInjectionTest.java:451:86:451:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:451:95:451:102 | source(...) | user-provided value |
 | LogInjectionTest.java:452:71:452:87 | (...)... | LogInjectionTest.java:452:80:452:87 | source(...) : Object | LogInjectionTest.java:452:71:452:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:452:80:452:87 | source(...) | user-provided value |
 | LogInjectionTest.java:453:56:453:72 | (...)... | LogInjectionTest.java:453:65:453:72 | source(...) : Object | LogInjectionTest.java:453:56:453:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:453:65:453:72 | source(...) | user-provided value |
 | LogInjectionTest.java:454:41:454:57 | (...)... | LogInjectionTest.java:454:50:454:57 | source(...) : Object | LogInjectionTest.java:454:41:454:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:454:50:454:57 | source(...) | user-provided value |
 | LogInjectionTest.java:455:26:455:42 | (...)... | LogInjectionTest.java:455:35:455:42 | source(...) : Object | LogInjectionTest.java:455:26:455:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:455:35:455:42 | source(...) | user-provided value |
-| LogInjectionTest.java:456:101:456:117 | (...)... | LogInjectionTest.java:456:110:456:117 | source(...) : Object | LogInjectionTest.java:456:101:456:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:456:110:456:117 | source(...) | user-provided value |
-| LogInjectionTest.java:457:86:457:102 | (...)... | LogInjectionTest.java:457:95:457:102 | source(...) : Object | LogInjectionTest.java:457:86:457:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:457:95:457:102 | source(...) | user-provided value |
-| LogInjectionTest.java:458:71:458:87 | (...)... | LogInjectionTest.java:458:80:458:87 | source(...) : Object | LogInjectionTest.java:458:71:458:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:458:80:458:87 | source(...) | user-provided value |
-| LogInjectionTest.java:459:56:459:72 | (...)... | LogInjectionTest.java:459:65:459:72 | source(...) : Object | LogInjectionTest.java:459:56:459:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:459:65:459:72 | source(...) | user-provided value |
-| LogInjectionTest.java:460:41:460:57 | (...)... | LogInjectionTest.java:460:50:460:57 | source(...) : Object | LogInjectionTest.java:460:41:460:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:460:50:460:57 | source(...) | user-provided value |
-| LogInjectionTest.java:461:26:461:42 | (...)... | LogInjectionTest.java:461:35:461:42 | source(...) : Object | LogInjectionTest.java:461:26:461:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:461:35:461:42 | source(...) | user-provided value |
-| LogInjectionTest.java:462:116:462:132 | (...)... | LogInjectionTest.java:462:125:462:132 | source(...) : Object | LogInjectionTest.java:462:116:462:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:462:125:462:132 | source(...) | user-provided value |
-| LogInjectionTest.java:463:101:463:117 | (...)... | LogInjectionTest.java:463:110:463:117 | source(...) : Object | LogInjectionTest.java:463:101:463:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:463:110:463:117 | source(...) | user-provided value |
-| LogInjectionTest.java:464:86:464:102 | (...)... | LogInjectionTest.java:464:95:464:102 | source(...) : Object | LogInjectionTest.java:464:86:464:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:464:95:464:102 | source(...) | user-provided value |
-| LogInjectionTest.java:465:71:465:87 | (...)... | LogInjectionTest.java:465:80:465:87 | source(...) : Object | LogInjectionTest.java:465:71:465:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:465:80:465:87 | source(...) | user-provided value |
-| LogInjectionTest.java:466:56:466:72 | (...)... | LogInjectionTest.java:466:65:466:72 | source(...) : Object | LogInjectionTest.java:466:56:466:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:466:65:466:72 | source(...) | user-provided value |
-| LogInjectionTest.java:467:41:467:57 | (...)... | LogInjectionTest.java:467:50:467:57 | source(...) : Object | LogInjectionTest.java:467:41:467:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:467:50:467:57 | source(...) | user-provided value |
-| LogInjectionTest.java:468:26:468:42 | (...)... | LogInjectionTest.java:468:35:468:42 | source(...) : Object | LogInjectionTest.java:468:26:468:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:468:35:468:42 | source(...) | user-provided value |
-| LogInjectionTest.java:469:131:469:147 | (...)... | LogInjectionTest.java:469:140:469:147 | source(...) : Object | LogInjectionTest.java:469:131:469:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:469:140:469:147 | source(...) | user-provided value |
-| LogInjectionTest.java:470:116:470:132 | (...)... | LogInjectionTest.java:470:125:470:132 | source(...) : Object | LogInjectionTest.java:470:116:470:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:470:125:470:132 | source(...) | user-provided value |
-| LogInjectionTest.java:471:101:471:117 | (...)... | LogInjectionTest.java:471:110:471:117 | source(...) : Object | LogInjectionTest.java:471:101:471:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:471:110:471:117 | source(...) | user-provided value |
-| LogInjectionTest.java:472:86:472:102 | (...)... | LogInjectionTest.java:472:95:472:102 | source(...) : Object | LogInjectionTest.java:472:86:472:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:472:95:472:102 | source(...) | user-provided value |
-| LogInjectionTest.java:473:71:473:87 | (...)... | LogInjectionTest.java:473:80:473:87 | source(...) : Object | LogInjectionTest.java:473:71:473:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:473:80:473:87 | source(...) | user-provided value |
-| LogInjectionTest.java:474:56:474:72 | (...)... | LogInjectionTest.java:474:65:474:72 | source(...) : Object | LogInjectionTest.java:474:56:474:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:474:65:474:72 | source(...) | user-provided value |
-| LogInjectionTest.java:475:41:475:57 | (...)... | LogInjectionTest.java:475:50:475:57 | source(...) : Object | LogInjectionTest.java:475:41:475:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:475:50:475:57 | source(...) | user-provided value |
-| LogInjectionTest.java:476:26:476:42 | (...)... | LogInjectionTest.java:476:35:476:42 | source(...) : Object | LogInjectionTest.java:476:26:476:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:476:35:476:42 | source(...) | user-provided value |
-| LogInjectionTest.java:477:146:477:162 | (...)... | LogInjectionTest.java:477:155:477:162 | source(...) : Object | LogInjectionTest.java:477:146:477:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:477:155:477:162 | source(...) | user-provided value |
-| LogInjectionTest.java:478:131:478:147 | (...)... | LogInjectionTest.java:478:140:478:147 | source(...) : Object | LogInjectionTest.java:478:131:478:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:478:140:478:147 | source(...) | user-provided value |
-| LogInjectionTest.java:479:116:479:132 | (...)... | LogInjectionTest.java:479:125:479:132 | source(...) : Object | LogInjectionTest.java:479:116:479:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:479:125:479:132 | source(...) | user-provided value |
-| LogInjectionTest.java:480:101:480:117 | (...)... | LogInjectionTest.java:480:110:480:117 | source(...) : Object | LogInjectionTest.java:480:101:480:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:480:110:480:117 | source(...) | user-provided value |
-| LogInjectionTest.java:481:86:481:102 | (...)... | LogInjectionTest.java:481:95:481:102 | source(...) : Object | LogInjectionTest.java:481:86:481:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:481:95:481:102 | source(...) | user-provided value |
-| LogInjectionTest.java:482:71:482:87 | (...)... | LogInjectionTest.java:482:80:482:87 | source(...) : Object | LogInjectionTest.java:482:71:482:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:482:80:482:87 | source(...) | user-provided value |
-| LogInjectionTest.java:483:56:483:72 | (...)... | LogInjectionTest.java:483:65:483:72 | source(...) : Object | LogInjectionTest.java:483:56:483:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:483:65:483:72 | source(...) | user-provided value |
-| LogInjectionTest.java:484:41:484:57 | (...)... | LogInjectionTest.java:484:50:484:57 | source(...) : Object | LogInjectionTest.java:484:41:484:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:484:50:484:57 | source(...) | user-provided value |
-| LogInjectionTest.java:485:26:485:42 | (...)... | LogInjectionTest.java:485:35:485:42 | source(...) : Object | LogInjectionTest.java:485:26:485:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:485:35:485:42 | source(...) | user-provided value |
-| LogInjectionTest.java:486:161:486:177 | (...)... | LogInjectionTest.java:486:170:486:177 | source(...) : Object | LogInjectionTest.java:486:161:486:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:486:170:486:177 | source(...) | user-provided value |
-| LogInjectionTest.java:487:146:487:162 | (...)... | LogInjectionTest.java:487:155:487:162 | source(...) : Object | LogInjectionTest.java:487:146:487:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:487:155:487:162 | source(...) | user-provided value |
-| LogInjectionTest.java:488:131:488:147 | (...)... | LogInjectionTest.java:488:140:488:147 | source(...) : Object | LogInjectionTest.java:488:131:488:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:488:140:488:147 | source(...) | user-provided value |
-| LogInjectionTest.java:489:116:489:132 | (...)... | LogInjectionTest.java:489:125:489:132 | source(...) : Object | LogInjectionTest.java:489:116:489:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:489:125:489:132 | source(...) | user-provided value |
-| LogInjectionTest.java:490:101:490:117 | (...)... | LogInjectionTest.java:490:110:490:117 | source(...) : Object | LogInjectionTest.java:490:101:490:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:490:110:490:117 | source(...) | user-provided value |
-| LogInjectionTest.java:491:86:491:102 | (...)... | LogInjectionTest.java:491:95:491:102 | source(...) : Object | LogInjectionTest.java:491:86:491:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:491:95:491:102 | source(...) | user-provided value |
-| LogInjectionTest.java:492:71:492:87 | (...)... | LogInjectionTest.java:492:80:492:87 | source(...) : Object | LogInjectionTest.java:492:71:492:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:492:80:492:87 | source(...) | user-provided value |
-| LogInjectionTest.java:493:56:493:72 | (...)... | LogInjectionTest.java:493:65:493:72 | source(...) : Object | LogInjectionTest.java:493:56:493:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:493:65:493:72 | source(...) | user-provided value |
-| LogInjectionTest.java:494:41:494:57 | (...)... | LogInjectionTest.java:494:50:494:57 | source(...) : Object | LogInjectionTest.java:494:41:494:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:494:50:494:57 | source(...) | user-provided value |
-| LogInjectionTest.java:495:26:495:42 | (...)... | LogInjectionTest.java:495:35:495:42 | source(...) : Object | LogInjectionTest.java:495:26:495:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:495:35:495:42 | source(...) | user-provided value |
-| LogInjectionTest.java:496:26:496:42 | (...)... | LogInjectionTest.java:496:35:496:42 | source(...) : Object | LogInjectionTest.java:496:26:496:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:496:35:496:42 | source(...) | user-provided value |
-| LogInjectionTest.java:497:41:497:62 | (...)... | LogInjectionTest.java:497:55:497:62 | source(...) : Object | LogInjectionTest.java:497:41:497:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:497:55:497:62 | source(...) | user-provided value |
-| LogInjectionTest.java:498:26:498:42 | (...)... | LogInjectionTest.java:498:35:498:42 | source(...) : Object | LogInjectionTest.java:498:26:498:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:498:35:498:42 | source(...) | user-provided value |
-| LogInjectionTest.java:499:26:499:47 | (...)... | LogInjectionTest.java:499:40:499:47 | source(...) : Object | LogInjectionTest.java:499:26:499:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:499:40:499:47 | source(...) | user-provided value |
-| LogInjectionTest.java:500:26:500:47 | (...)... | LogInjectionTest.java:500:40:500:47 | source(...) : Object | LogInjectionTest.java:500:26:500:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:500:40:500:47 | source(...) | user-provided value |
-| LogInjectionTest.java:501:26:501:48 | (...)... | LogInjectionTest.java:501:41:501:48 | source(...) : Object | LogInjectionTest.java:501:26:501:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:501:41:501:48 | source(...) | user-provided value |
-| LogInjectionTest.java:502:26:502:48 | (...)... | LogInjectionTest.java:502:41:502:48 | source(...) : Object | LogInjectionTest.java:502:26:502:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:502:41:502:48 | source(...) | user-provided value |
-| LogInjectionTest.java:503:41:503:63 | (...)... | LogInjectionTest.java:503:56:503:63 | source(...) : Object | LogInjectionTest.java:503:41:503:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:503:56:503:63 | source(...) | user-provided value |
-| LogInjectionTest.java:504:41:504:63 | (...)... | LogInjectionTest.java:504:56:504:63 | source(...) : Object | LogInjectionTest.java:504:41:504:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:504:56:504:63 | source(...) | user-provided value |
-| LogInjectionTest.java:505:41:505:58 | (...)... | LogInjectionTest.java:505:51:505:58 | source(...) : Object | LogInjectionTest.java:505:41:505:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:505:51:505:58 | source(...) | user-provided value |
-| LogInjectionTest.java:506:41:506:66 | (...)... | LogInjectionTest.java:506:59:506:66 | source(...) : Object | LogInjectionTest.java:506:41:506:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:506:59:506:66 | source(...) | user-provided value |
-| LogInjectionTest.java:507:41:507:66 | (...)... | LogInjectionTest.java:507:59:507:66 | source(...) : Object | LogInjectionTest.java:507:41:507:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:507:59:507:66 | source(...) | user-provided value |
-| LogInjectionTest.java:508:41:508:48 | source(...) | LogInjectionTest.java:508:41:508:48 | source(...) | LogInjectionTest.java:508:41:508:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:508:41:508:48 | source(...) | user-provided value |
-| LogInjectionTest.java:509:41:509:57 | (...)... | LogInjectionTest.java:509:50:509:57 | source(...) : Object | LogInjectionTest.java:509:41:509:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:509:50:509:57 | source(...) | user-provided value |
-| LogInjectionTest.java:510:41:510:57 | (...)... | LogInjectionTest.java:510:50:510:57 | source(...) : Object | LogInjectionTest.java:510:41:510:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:510:50:510:57 | source(...) | user-provided value |
-| LogInjectionTest.java:511:56:511:78 | new Object[] | LogInjectionTest.java:511:70:511:77 | source(...) : Object | LogInjectionTest.java:511:56:511:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:511:70:511:77 | source(...) | user-provided value |
-| LogInjectionTest.java:512:56:512:72 | (...)... | LogInjectionTest.java:512:65:512:72 | source(...) : Object | LogInjectionTest.java:512:56:512:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:512:65:512:72 | source(...) | user-provided value |
-| LogInjectionTest.java:513:41:513:57 | (...)... | LogInjectionTest.java:513:50:513:57 | source(...) : Object | LogInjectionTest.java:513:41:513:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:513:50:513:57 | source(...) | user-provided value |
-| LogInjectionTest.java:514:71:514:87 | (...)... | LogInjectionTest.java:514:80:514:87 | source(...) : Object | LogInjectionTest.java:514:71:514:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:514:80:514:87 | source(...) | user-provided value |
-| LogInjectionTest.java:515:56:515:72 | (...)... | LogInjectionTest.java:515:65:515:72 | source(...) : Object | LogInjectionTest.java:515:56:515:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:515:65:515:72 | source(...) | user-provided value |
-| LogInjectionTest.java:516:41:516:57 | (...)... | LogInjectionTest.java:516:50:516:57 | source(...) : Object | LogInjectionTest.java:516:41:516:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:516:50:516:57 | source(...) | user-provided value |
-| LogInjectionTest.java:517:86:517:102 | (...)... | LogInjectionTest.java:517:95:517:102 | source(...) : Object | LogInjectionTest.java:517:86:517:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:517:95:517:102 | source(...) | user-provided value |
-| LogInjectionTest.java:518:71:518:87 | (...)... | LogInjectionTest.java:518:80:518:87 | source(...) : Object | LogInjectionTest.java:518:71:518:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:518:80:518:87 | source(...) | user-provided value |
-| LogInjectionTest.java:519:56:519:72 | (...)... | LogInjectionTest.java:519:65:519:72 | source(...) : Object | LogInjectionTest.java:519:56:519:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:519:65:519:72 | source(...) | user-provided value |
-| LogInjectionTest.java:520:41:520:57 | (...)... | LogInjectionTest.java:520:50:520:57 | source(...) : Object | LogInjectionTest.java:520:41:520:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:520:50:520:57 | source(...) | user-provided value |
+| LogInjectionTest.java:456:26:456:42 | (...)... | LogInjectionTest.java:456:35:456:42 | source(...) : Object | LogInjectionTest.java:456:26:456:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:456:35:456:42 | source(...) | user-provided value |
+| LogInjectionTest.java:457:41:457:62 | (...)... | LogInjectionTest.java:457:55:457:62 | source(...) : Object | LogInjectionTest.java:457:41:457:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:457:55:457:62 | source(...) | user-provided value |
+| LogInjectionTest.java:458:26:458:42 | (...)... | LogInjectionTest.java:458:35:458:42 | source(...) : Object | LogInjectionTest.java:458:26:458:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:458:35:458:42 | source(...) | user-provided value |
+| LogInjectionTest.java:459:26:459:47 | (...)... | LogInjectionTest.java:459:40:459:47 | source(...) : Object | LogInjectionTest.java:459:26:459:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:459:40:459:47 | source(...) | user-provided value |
+| LogInjectionTest.java:460:26:460:47 | (...)... | LogInjectionTest.java:460:40:460:47 | source(...) : Object | LogInjectionTest.java:460:26:460:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:460:40:460:47 | source(...) | user-provided value |
+| LogInjectionTest.java:461:26:461:48 | (...)... | LogInjectionTest.java:461:41:461:48 | source(...) : Object | LogInjectionTest.java:461:26:461:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:461:41:461:48 | source(...) | user-provided value |
+| LogInjectionTest.java:462:26:462:48 | (...)... | LogInjectionTest.java:462:41:462:48 | source(...) : Object | LogInjectionTest.java:462:26:462:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:462:41:462:48 | source(...) | user-provided value |
+| LogInjectionTest.java:463:41:463:63 | (...)... | LogInjectionTest.java:463:56:463:63 | source(...) : Object | LogInjectionTest.java:463:41:463:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:463:56:463:63 | source(...) | user-provided value |
+| LogInjectionTest.java:464:41:464:63 | (...)... | LogInjectionTest.java:464:56:464:63 | source(...) : Object | LogInjectionTest.java:464:41:464:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:464:56:464:63 | source(...) | user-provided value |
+| LogInjectionTest.java:465:41:465:58 | (...)... | LogInjectionTest.java:465:51:465:58 | source(...) : Object | LogInjectionTest.java:465:41:465:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:465:51:465:58 | source(...) | user-provided value |
+| LogInjectionTest.java:466:41:466:66 | (...)... | LogInjectionTest.java:466:59:466:66 | source(...) : Object | LogInjectionTest.java:466:41:466:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:466:59:466:66 | source(...) | user-provided value |
+| LogInjectionTest.java:467:41:467:66 | (...)... | LogInjectionTest.java:467:59:467:66 | source(...) : Object | LogInjectionTest.java:467:41:467:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:467:59:467:66 | source(...) | user-provided value |
+| LogInjectionTest.java:468:41:468:48 | source(...) | LogInjectionTest.java:468:41:468:48 | source(...) | LogInjectionTest.java:468:41:468:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:468:41:468:48 | source(...) | user-provided value |
+| LogInjectionTest.java:469:41:469:57 | (...)... | LogInjectionTest.java:469:50:469:57 | source(...) : Object | LogInjectionTest.java:469:41:469:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:469:50:469:57 | source(...) | user-provided value |
+| LogInjectionTest.java:470:41:470:57 | (...)... | LogInjectionTest.java:470:50:470:57 | source(...) : Object | LogInjectionTest.java:470:41:470:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:470:50:470:57 | source(...) | user-provided value |
+| LogInjectionTest.java:471:56:471:78 | new Object[] | LogInjectionTest.java:471:70:471:77 | source(...) : Object | LogInjectionTest.java:471:56:471:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:471:70:471:77 | source(...) | user-provided value |
+| LogInjectionTest.java:472:56:472:72 | (...)... | LogInjectionTest.java:472:65:472:72 | source(...) : Object | LogInjectionTest.java:472:56:472:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:472:65:472:72 | source(...) | user-provided value |
+| LogInjectionTest.java:473:41:473:57 | (...)... | LogInjectionTest.java:473:50:473:57 | source(...) : Object | LogInjectionTest.java:473:41:473:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:473:50:473:57 | source(...) | user-provided value |
+| LogInjectionTest.java:474:71:474:87 | (...)... | LogInjectionTest.java:474:80:474:87 | source(...) : Object | LogInjectionTest.java:474:71:474:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:474:80:474:87 | source(...) | user-provided value |
+| LogInjectionTest.java:475:56:475:72 | (...)... | LogInjectionTest.java:475:65:475:72 | source(...) : Object | LogInjectionTest.java:475:56:475:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:475:65:475:72 | source(...) | user-provided value |
+| LogInjectionTest.java:476:41:476:57 | (...)... | LogInjectionTest.java:476:50:476:57 | source(...) : Object | LogInjectionTest.java:476:41:476:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:476:50:476:57 | source(...) | user-provided value |
+| LogInjectionTest.java:477:86:477:102 | (...)... | LogInjectionTest.java:477:95:477:102 | source(...) : Object | LogInjectionTest.java:477:86:477:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:477:95:477:102 | source(...) | user-provided value |
+| LogInjectionTest.java:478:71:478:87 | (...)... | LogInjectionTest.java:478:80:478:87 | source(...) : Object | LogInjectionTest.java:478:71:478:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:478:80:478:87 | source(...) | user-provided value |
+| LogInjectionTest.java:479:56:479:72 | (...)... | LogInjectionTest.java:479:65:479:72 | source(...) : Object | LogInjectionTest.java:479:56:479:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:479:65:479:72 | source(...) | user-provided value |
+| LogInjectionTest.java:480:41:480:57 | (...)... | LogInjectionTest.java:480:50:480:57 | source(...) : Object | LogInjectionTest.java:480:41:480:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:480:50:480:57 | source(...) | user-provided value |
+| LogInjectionTest.java:481:101:481:117 | (...)... | LogInjectionTest.java:481:110:481:117 | source(...) : Object | LogInjectionTest.java:481:101:481:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:481:110:481:117 | source(...) | user-provided value |
+| LogInjectionTest.java:482:86:482:102 | (...)... | LogInjectionTest.java:482:95:482:102 | source(...) : Object | LogInjectionTest.java:482:86:482:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:482:95:482:102 | source(...) | user-provided value |
+| LogInjectionTest.java:483:71:483:87 | (...)... | LogInjectionTest.java:483:80:483:87 | source(...) : Object | LogInjectionTest.java:483:71:483:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:483:80:483:87 | source(...) | user-provided value |
+| LogInjectionTest.java:484:56:484:72 | (...)... | LogInjectionTest.java:484:65:484:72 | source(...) : Object | LogInjectionTest.java:484:56:484:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:484:65:484:72 | source(...) | user-provided value |
+| LogInjectionTest.java:485:41:485:57 | (...)... | LogInjectionTest.java:485:50:485:57 | source(...) : Object | LogInjectionTest.java:485:41:485:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:485:50:485:57 | source(...) | user-provided value |
+| LogInjectionTest.java:486:116:486:132 | (...)... | LogInjectionTest.java:486:125:486:132 | source(...) : Object | LogInjectionTest.java:486:116:486:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:486:125:486:132 | source(...) | user-provided value |
+| LogInjectionTest.java:487:101:487:117 | (...)... | LogInjectionTest.java:487:110:487:117 | source(...) : Object | LogInjectionTest.java:487:101:487:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:487:110:487:117 | source(...) | user-provided value |
+| LogInjectionTest.java:488:86:488:102 | (...)... | LogInjectionTest.java:488:95:488:102 | source(...) : Object | LogInjectionTest.java:488:86:488:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:488:95:488:102 | source(...) | user-provided value |
+| LogInjectionTest.java:489:71:489:87 | (...)... | LogInjectionTest.java:489:80:489:87 | source(...) : Object | LogInjectionTest.java:489:71:489:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:489:80:489:87 | source(...) | user-provided value |
+| LogInjectionTest.java:490:56:490:72 | (...)... | LogInjectionTest.java:490:65:490:72 | source(...) : Object | LogInjectionTest.java:490:56:490:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:490:65:490:72 | source(...) | user-provided value |
+| LogInjectionTest.java:491:41:491:57 | (...)... | LogInjectionTest.java:491:50:491:57 | source(...) : Object | LogInjectionTest.java:491:41:491:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:491:50:491:57 | source(...) | user-provided value |
+| LogInjectionTest.java:492:131:492:147 | (...)... | LogInjectionTest.java:492:140:492:147 | source(...) : Object | LogInjectionTest.java:492:131:492:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:492:140:492:147 | source(...) | user-provided value |
+| LogInjectionTest.java:493:116:493:132 | (...)... | LogInjectionTest.java:493:125:493:132 | source(...) : Object | LogInjectionTest.java:493:116:493:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:493:125:493:132 | source(...) | user-provided value |
+| LogInjectionTest.java:494:101:494:117 | (...)... | LogInjectionTest.java:494:110:494:117 | source(...) : Object | LogInjectionTest.java:494:101:494:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:494:110:494:117 | source(...) | user-provided value |
+| LogInjectionTest.java:495:86:495:102 | (...)... | LogInjectionTest.java:495:95:495:102 | source(...) : Object | LogInjectionTest.java:495:86:495:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:495:95:495:102 | source(...) | user-provided value |
+| LogInjectionTest.java:496:71:496:87 | (...)... | LogInjectionTest.java:496:80:496:87 | source(...) : Object | LogInjectionTest.java:496:71:496:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:496:80:496:87 | source(...) | user-provided value |
+| LogInjectionTest.java:497:56:497:72 | (...)... | LogInjectionTest.java:497:65:497:72 | source(...) : Object | LogInjectionTest.java:497:56:497:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:497:65:497:72 | source(...) | user-provided value |
+| LogInjectionTest.java:498:41:498:57 | (...)... | LogInjectionTest.java:498:50:498:57 | source(...) : Object | LogInjectionTest.java:498:41:498:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:498:50:498:57 | source(...) | user-provided value |
+| LogInjectionTest.java:499:146:499:162 | (...)... | LogInjectionTest.java:499:155:499:162 | source(...) : Object | LogInjectionTest.java:499:146:499:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:499:155:499:162 | source(...) | user-provided value |
+| LogInjectionTest.java:500:131:500:147 | (...)... | LogInjectionTest.java:500:140:500:147 | source(...) : Object | LogInjectionTest.java:500:131:500:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:500:140:500:147 | source(...) | user-provided value |
+| LogInjectionTest.java:501:116:501:132 | (...)... | LogInjectionTest.java:501:125:501:132 | source(...) : Object | LogInjectionTest.java:501:116:501:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:501:125:501:132 | source(...) | user-provided value |
+| LogInjectionTest.java:502:101:502:117 | (...)... | LogInjectionTest.java:502:110:502:117 | source(...) : Object | LogInjectionTest.java:502:101:502:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:502:110:502:117 | source(...) | user-provided value |
+| LogInjectionTest.java:503:86:503:102 | (...)... | LogInjectionTest.java:503:95:503:102 | source(...) : Object | LogInjectionTest.java:503:86:503:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:503:95:503:102 | source(...) | user-provided value |
+| LogInjectionTest.java:504:71:504:87 | (...)... | LogInjectionTest.java:504:80:504:87 | source(...) : Object | LogInjectionTest.java:504:71:504:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:504:80:504:87 | source(...) | user-provided value |
+| LogInjectionTest.java:505:56:505:72 | (...)... | LogInjectionTest.java:505:65:505:72 | source(...) : Object | LogInjectionTest.java:505:56:505:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:505:65:505:72 | source(...) | user-provided value |
+| LogInjectionTest.java:506:41:506:57 | (...)... | LogInjectionTest.java:506:50:506:57 | source(...) : Object | LogInjectionTest.java:506:41:506:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:506:50:506:57 | source(...) | user-provided value |
+| LogInjectionTest.java:507:161:507:177 | (...)... | LogInjectionTest.java:507:170:507:177 | source(...) : Object | LogInjectionTest.java:507:161:507:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:507:170:507:177 | source(...) | user-provided value |
+| LogInjectionTest.java:508:146:508:162 | (...)... | LogInjectionTest.java:508:155:508:162 | source(...) : Object | LogInjectionTest.java:508:146:508:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:508:155:508:162 | source(...) | user-provided value |
+| LogInjectionTest.java:509:131:509:147 | (...)... | LogInjectionTest.java:509:140:509:147 | source(...) : Object | LogInjectionTest.java:509:131:509:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:509:140:509:147 | source(...) | user-provided value |
+| LogInjectionTest.java:510:116:510:132 | (...)... | LogInjectionTest.java:510:125:510:132 | source(...) : Object | LogInjectionTest.java:510:116:510:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:510:125:510:132 | source(...) | user-provided value |
+| LogInjectionTest.java:511:101:511:117 | (...)... | LogInjectionTest.java:511:110:511:117 | source(...) : Object | LogInjectionTest.java:511:101:511:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:511:110:511:117 | source(...) | user-provided value |
+| LogInjectionTest.java:512:86:512:102 | (...)... | LogInjectionTest.java:512:95:512:102 | source(...) : Object | LogInjectionTest.java:512:86:512:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:512:95:512:102 | source(...) | user-provided value |
+| LogInjectionTest.java:513:71:513:87 | (...)... | LogInjectionTest.java:513:80:513:87 | source(...) : Object | LogInjectionTest.java:513:71:513:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:513:80:513:87 | source(...) | user-provided value |
+| LogInjectionTest.java:514:56:514:72 | (...)... | LogInjectionTest.java:514:65:514:72 | source(...) : Object | LogInjectionTest.java:514:56:514:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:514:65:514:72 | source(...) | user-provided value |
+| LogInjectionTest.java:515:41:515:57 | (...)... | LogInjectionTest.java:515:50:515:57 | source(...) : Object | LogInjectionTest.java:515:41:515:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:515:50:515:57 | source(...) | user-provided value |
+| LogInjectionTest.java:516:176:516:192 | (...)... | LogInjectionTest.java:516:185:516:192 | source(...) : Object | LogInjectionTest.java:516:176:516:192 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:516:185:516:192 | source(...) | user-provided value |
+| LogInjectionTest.java:517:161:517:177 | (...)... | LogInjectionTest.java:517:170:517:177 | source(...) : Object | LogInjectionTest.java:517:161:517:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:517:170:517:177 | source(...) | user-provided value |
+| LogInjectionTest.java:518:146:518:162 | (...)... | LogInjectionTest.java:518:155:518:162 | source(...) : Object | LogInjectionTest.java:518:146:518:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:518:155:518:162 | source(...) | user-provided value |
+| LogInjectionTest.java:519:131:519:147 | (...)... | LogInjectionTest.java:519:140:519:147 | source(...) : Object | LogInjectionTest.java:519:131:519:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:519:140:519:147 | source(...) | user-provided value |
+| LogInjectionTest.java:520:116:520:132 | (...)... | LogInjectionTest.java:520:125:520:132 | source(...) : Object | LogInjectionTest.java:520:116:520:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:520:125:520:132 | source(...) | user-provided value |
 | LogInjectionTest.java:521:101:521:117 | (...)... | LogInjectionTest.java:521:110:521:117 | source(...) : Object | LogInjectionTest.java:521:101:521:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:521:110:521:117 | source(...) | user-provided value |
 | LogInjectionTest.java:522:86:522:102 | (...)... | LogInjectionTest.java:522:95:522:102 | source(...) : Object | LogInjectionTest.java:522:86:522:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:522:95:522:102 | source(...) | user-provided value |
 | LogInjectionTest.java:523:71:523:87 | (...)... | LogInjectionTest.java:523:80:523:87 | source(...) : Object | LogInjectionTest.java:523:71:523:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:523:80:523:87 | source(...) | user-provided value |
 | LogInjectionTest.java:524:56:524:72 | (...)... | LogInjectionTest.java:524:65:524:72 | source(...) : Object | LogInjectionTest.java:524:56:524:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:524:65:524:72 | source(...) | user-provided value |
 | LogInjectionTest.java:525:41:525:57 | (...)... | LogInjectionTest.java:525:50:525:57 | source(...) : Object | LogInjectionTest.java:525:41:525:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:525:50:525:57 | source(...) | user-provided value |
-| LogInjectionTest.java:526:116:526:132 | (...)... | LogInjectionTest.java:526:125:526:132 | source(...) : Object | LogInjectionTest.java:526:116:526:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:526:125:526:132 | source(...) | user-provided value |
-| LogInjectionTest.java:527:101:527:117 | (...)... | LogInjectionTest.java:527:110:527:117 | source(...) : Object | LogInjectionTest.java:527:101:527:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:527:110:527:117 | source(...) | user-provided value |
-| LogInjectionTest.java:528:86:528:102 | (...)... | LogInjectionTest.java:528:95:528:102 | source(...) : Object | LogInjectionTest.java:528:86:528:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:528:95:528:102 | source(...) | user-provided value |
-| LogInjectionTest.java:529:71:529:87 | (...)... | LogInjectionTest.java:529:80:529:87 | source(...) : Object | LogInjectionTest.java:529:71:529:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:529:80:529:87 | source(...) | user-provided value |
-| LogInjectionTest.java:530:56:530:72 | (...)... | LogInjectionTest.java:530:65:530:72 | source(...) : Object | LogInjectionTest.java:530:56:530:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:530:65:530:72 | source(...) | user-provided value |
-| LogInjectionTest.java:531:41:531:57 | (...)... | LogInjectionTest.java:531:50:531:57 | source(...) : Object | LogInjectionTest.java:531:41:531:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:531:50:531:57 | source(...) | user-provided value |
-| LogInjectionTest.java:532:131:532:147 | (...)... | LogInjectionTest.java:532:140:532:147 | source(...) : Object | LogInjectionTest.java:532:131:532:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:532:140:532:147 | source(...) | user-provided value |
-| LogInjectionTest.java:533:116:533:132 | (...)... | LogInjectionTest.java:533:125:533:132 | source(...) : Object | LogInjectionTest.java:533:116:533:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:533:125:533:132 | source(...) | user-provided value |
-| LogInjectionTest.java:534:101:534:117 | (...)... | LogInjectionTest.java:534:110:534:117 | source(...) : Object | LogInjectionTest.java:534:101:534:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:534:110:534:117 | source(...) | user-provided value |
-| LogInjectionTest.java:535:86:535:102 | (...)... | LogInjectionTest.java:535:95:535:102 | source(...) : Object | LogInjectionTest.java:535:86:535:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:535:95:535:102 | source(...) | user-provided value |
-| LogInjectionTest.java:536:71:536:87 | (...)... | LogInjectionTest.java:536:80:536:87 | source(...) : Object | LogInjectionTest.java:536:71:536:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:536:80:536:87 | source(...) | user-provided value |
-| LogInjectionTest.java:537:56:537:72 | (...)... | LogInjectionTest.java:537:65:537:72 | source(...) : Object | LogInjectionTest.java:537:56:537:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:537:65:537:72 | source(...) | user-provided value |
-| LogInjectionTest.java:538:41:538:57 | (...)... | LogInjectionTest.java:538:50:538:57 | source(...) : Object | LogInjectionTest.java:538:41:538:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:538:50:538:57 | source(...) | user-provided value |
-| LogInjectionTest.java:539:146:539:162 | (...)... | LogInjectionTest.java:539:155:539:162 | source(...) : Object | LogInjectionTest.java:539:146:539:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:539:155:539:162 | source(...) | user-provided value |
-| LogInjectionTest.java:540:131:540:147 | (...)... | LogInjectionTest.java:540:140:540:147 | source(...) : Object | LogInjectionTest.java:540:131:540:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:540:140:540:147 | source(...) | user-provided value |
-| LogInjectionTest.java:541:116:541:132 | (...)... | LogInjectionTest.java:541:125:541:132 | source(...) : Object | LogInjectionTest.java:541:116:541:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:541:125:541:132 | source(...) | user-provided value |
-| LogInjectionTest.java:542:101:542:117 | (...)... | LogInjectionTest.java:542:110:542:117 | source(...) : Object | LogInjectionTest.java:542:101:542:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:542:110:542:117 | source(...) | user-provided value |
-| LogInjectionTest.java:543:86:543:102 | (...)... | LogInjectionTest.java:543:95:543:102 | source(...) : Object | LogInjectionTest.java:543:86:543:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:543:95:543:102 | source(...) | user-provided value |
-| LogInjectionTest.java:544:71:544:87 | (...)... | LogInjectionTest.java:544:80:544:87 | source(...) : Object | LogInjectionTest.java:544:71:544:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:544:80:544:87 | source(...) | user-provided value |
-| LogInjectionTest.java:545:56:545:72 | (...)... | LogInjectionTest.java:545:65:545:72 | source(...) : Object | LogInjectionTest.java:545:56:545:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:545:65:545:72 | source(...) | user-provided value |
-| LogInjectionTest.java:546:41:546:57 | (...)... | LogInjectionTest.java:546:50:546:57 | source(...) : Object | LogInjectionTest.java:546:41:546:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:546:50:546:57 | source(...) | user-provided value |
-| LogInjectionTest.java:547:161:547:177 | (...)... | LogInjectionTest.java:547:170:547:177 | source(...) : Object | LogInjectionTest.java:547:161:547:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:547:170:547:177 | source(...) | user-provided value |
-| LogInjectionTest.java:548:146:548:162 | (...)... | LogInjectionTest.java:548:155:548:162 | source(...) : Object | LogInjectionTest.java:548:146:548:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:548:155:548:162 | source(...) | user-provided value |
-| LogInjectionTest.java:549:131:549:147 | (...)... | LogInjectionTest.java:549:140:549:147 | source(...) : Object | LogInjectionTest.java:549:131:549:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:549:140:549:147 | source(...) | user-provided value |
-| LogInjectionTest.java:550:116:550:132 | (...)... | LogInjectionTest.java:550:125:550:132 | source(...) : Object | LogInjectionTest.java:550:116:550:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:550:125:550:132 | source(...) | user-provided value |
-| LogInjectionTest.java:551:101:551:117 | (...)... | LogInjectionTest.java:551:110:551:117 | source(...) : Object | LogInjectionTest.java:551:101:551:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:551:110:551:117 | source(...) | user-provided value |
-| LogInjectionTest.java:552:86:552:102 | (...)... | LogInjectionTest.java:552:95:552:102 | source(...) : Object | LogInjectionTest.java:552:86:552:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:552:95:552:102 | source(...) | user-provided value |
-| LogInjectionTest.java:553:71:553:87 | (...)... | LogInjectionTest.java:553:80:553:87 | source(...) : Object | LogInjectionTest.java:553:71:553:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:553:80:553:87 | source(...) | user-provided value |
-| LogInjectionTest.java:554:56:554:72 | (...)... | LogInjectionTest.java:554:65:554:72 | source(...) : Object | LogInjectionTest.java:554:56:554:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:554:65:554:72 | source(...) | user-provided value |
-| LogInjectionTest.java:555:41:555:57 | (...)... | LogInjectionTest.java:555:50:555:57 | source(...) : Object | LogInjectionTest.java:555:41:555:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:555:50:555:57 | source(...) | user-provided value |
-| LogInjectionTest.java:556:176:556:192 | (...)... | LogInjectionTest.java:556:185:556:192 | source(...) : Object | LogInjectionTest.java:556:176:556:192 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:556:185:556:192 | source(...) | user-provided value |
-| LogInjectionTest.java:557:161:557:177 | (...)... | LogInjectionTest.java:557:170:557:177 | source(...) : Object | LogInjectionTest.java:557:161:557:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:557:170:557:177 | source(...) | user-provided value |
-| LogInjectionTest.java:558:146:558:162 | (...)... | LogInjectionTest.java:558:155:558:162 | source(...) : Object | LogInjectionTest.java:558:146:558:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:558:155:558:162 | source(...) | user-provided value |
-| LogInjectionTest.java:559:131:559:147 | (...)... | LogInjectionTest.java:559:140:559:147 | source(...) : Object | LogInjectionTest.java:559:131:559:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:559:140:559:147 | source(...) | user-provided value |
+| LogInjectionTest.java:526:41:526:57 | (...)... | LogInjectionTest.java:526:50:526:57 | source(...) : Object | LogInjectionTest.java:526:41:526:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:526:50:526:57 | source(...) | user-provided value |
+| LogInjectionTest.java:527:56:527:77 | (...)... | LogInjectionTest.java:527:70:527:77 | source(...) : Object | LogInjectionTest.java:527:56:527:77 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:527:70:527:77 | source(...) | user-provided value |
+| LogInjectionTest.java:528:41:528:57 | (...)... | LogInjectionTest.java:528:50:528:57 | source(...) : Object | LogInjectionTest.java:528:41:528:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:528:50:528:57 | source(...) | user-provided value |
+| LogInjectionTest.java:529:41:529:62 | (...)... | LogInjectionTest.java:529:55:529:62 | source(...) : Object | LogInjectionTest.java:529:41:529:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:529:55:529:62 | source(...) | user-provided value |
+| LogInjectionTest.java:530:41:530:62 | (...)... | LogInjectionTest.java:530:55:530:62 | source(...) : Object | LogInjectionTest.java:530:41:530:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:530:55:530:62 | source(...) | user-provided value |
+| LogInjectionTest.java:531:26:531:51 | (...)... | LogInjectionTest.java:531:44:531:51 | source(...) : Object | LogInjectionTest.java:531:26:531:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:531:44:531:51 | source(...) | user-provided value |
+| LogInjectionTest.java:532:26:532:51 | (...)... | LogInjectionTest.java:532:44:532:51 | source(...) : Object | LogInjectionTest.java:532:26:532:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:532:44:532:51 | source(...) | user-provided value |
+| LogInjectionTest.java:533:26:533:43 | (...)... | LogInjectionTest.java:533:36:533:43 | source(...) : Object | LogInjectionTest.java:533:26:533:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:533:36:533:43 | source(...) | user-provided value |
+| LogInjectionTest.java:534:26:534:43 | (...)... | LogInjectionTest.java:534:36:534:43 | source(...) : Object | LogInjectionTest.java:534:26:534:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:534:36:534:43 | source(...) | user-provided value |
+| LogInjectionTest.java:535:26:535:33 | source(...) | LogInjectionTest.java:535:26:535:33 | source(...) | LogInjectionTest.java:535:26:535:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:535:26:535:33 | source(...) | user-provided value |
+| LogInjectionTest.java:536:26:536:33 | source(...) | LogInjectionTest.java:536:26:536:33 | source(...) | LogInjectionTest.java:536:26:536:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:536:26:536:33 | source(...) | user-provided value |
+| LogInjectionTest.java:537:26:537:42 | (...)... | LogInjectionTest.java:537:35:537:42 | source(...) : Object | LogInjectionTest.java:537:26:537:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:537:35:537:42 | source(...) | user-provided value |
+| LogInjectionTest.java:538:26:538:42 | (...)... | LogInjectionTest.java:538:35:538:42 | source(...) : Object | LogInjectionTest.java:538:26:538:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:538:35:538:42 | source(...) | user-provided value |
+| LogInjectionTest.java:539:41:539:63 | new Object[] | LogInjectionTest.java:539:55:539:62 | source(...) : Object | LogInjectionTest.java:539:41:539:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:539:55:539:62 | source(...) | user-provided value |
+| LogInjectionTest.java:540:41:540:57 | (...)... | LogInjectionTest.java:540:50:540:57 | source(...) : Object | LogInjectionTest.java:540:41:540:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:540:50:540:57 | source(...) | user-provided value |
+| LogInjectionTest.java:541:26:541:42 | (...)... | LogInjectionTest.java:541:35:541:42 | source(...) : Object | LogInjectionTest.java:541:26:541:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:541:35:541:42 | source(...) | user-provided value |
+| LogInjectionTest.java:542:56:542:72 | (...)... | LogInjectionTest.java:542:65:542:72 | source(...) : Object | LogInjectionTest.java:542:56:542:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:542:65:542:72 | source(...) | user-provided value |
+| LogInjectionTest.java:543:41:543:57 | (...)... | LogInjectionTest.java:543:50:543:57 | source(...) : Object | LogInjectionTest.java:543:41:543:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:543:50:543:57 | source(...) | user-provided value |
+| LogInjectionTest.java:544:26:544:42 | (...)... | LogInjectionTest.java:544:35:544:42 | source(...) : Object | LogInjectionTest.java:544:26:544:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:544:35:544:42 | source(...) | user-provided value |
+| LogInjectionTest.java:545:71:545:87 | (...)... | LogInjectionTest.java:545:80:545:87 | source(...) : Object | LogInjectionTest.java:545:71:545:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:545:80:545:87 | source(...) | user-provided value |
+| LogInjectionTest.java:546:56:546:72 | (...)... | LogInjectionTest.java:546:65:546:72 | source(...) : Object | LogInjectionTest.java:546:56:546:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:546:65:546:72 | source(...) | user-provided value |
+| LogInjectionTest.java:547:41:547:57 | (...)... | LogInjectionTest.java:547:50:547:57 | source(...) : Object | LogInjectionTest.java:547:41:547:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:547:50:547:57 | source(...) | user-provided value |
+| LogInjectionTest.java:548:26:548:42 | (...)... | LogInjectionTest.java:548:35:548:42 | source(...) : Object | LogInjectionTest.java:548:26:548:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:548:35:548:42 | source(...) | user-provided value |
+| LogInjectionTest.java:549:86:549:102 | (...)... | LogInjectionTest.java:549:95:549:102 | source(...) : Object | LogInjectionTest.java:549:86:549:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:549:95:549:102 | source(...) | user-provided value |
+| LogInjectionTest.java:550:71:550:87 | (...)... | LogInjectionTest.java:550:80:550:87 | source(...) : Object | LogInjectionTest.java:550:71:550:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:550:80:550:87 | source(...) | user-provided value |
+| LogInjectionTest.java:551:56:551:72 | (...)... | LogInjectionTest.java:551:65:551:72 | source(...) : Object | LogInjectionTest.java:551:56:551:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:551:65:551:72 | source(...) | user-provided value |
+| LogInjectionTest.java:552:41:552:57 | (...)... | LogInjectionTest.java:552:50:552:57 | source(...) : Object | LogInjectionTest.java:552:41:552:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:552:50:552:57 | source(...) | user-provided value |
+| LogInjectionTest.java:553:26:553:42 | (...)... | LogInjectionTest.java:553:35:553:42 | source(...) : Object | LogInjectionTest.java:553:26:553:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:553:35:553:42 | source(...) | user-provided value |
+| LogInjectionTest.java:554:101:554:117 | (...)... | LogInjectionTest.java:554:110:554:117 | source(...) : Object | LogInjectionTest.java:554:101:554:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:554:110:554:117 | source(...) | user-provided value |
+| LogInjectionTest.java:555:86:555:102 | (...)... | LogInjectionTest.java:555:95:555:102 | source(...) : Object | LogInjectionTest.java:555:86:555:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:555:95:555:102 | source(...) | user-provided value |
+| LogInjectionTest.java:556:71:556:87 | (...)... | LogInjectionTest.java:556:80:556:87 | source(...) : Object | LogInjectionTest.java:556:71:556:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:556:80:556:87 | source(...) | user-provided value |
+| LogInjectionTest.java:557:56:557:72 | (...)... | LogInjectionTest.java:557:65:557:72 | source(...) : Object | LogInjectionTest.java:557:56:557:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:557:65:557:72 | source(...) | user-provided value |
+| LogInjectionTest.java:558:41:558:57 | (...)... | LogInjectionTest.java:558:50:558:57 | source(...) : Object | LogInjectionTest.java:558:41:558:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:558:50:558:57 | source(...) | user-provided value |
+| LogInjectionTest.java:559:26:559:42 | (...)... | LogInjectionTest.java:559:35:559:42 | source(...) : Object | LogInjectionTest.java:559:26:559:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:559:35:559:42 | source(...) | user-provided value |
 | LogInjectionTest.java:560:116:560:132 | (...)... | LogInjectionTest.java:560:125:560:132 | source(...) : Object | LogInjectionTest.java:560:116:560:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:560:125:560:132 | source(...) | user-provided value |
 | LogInjectionTest.java:561:101:561:117 | (...)... | LogInjectionTest.java:561:110:561:117 | source(...) : Object | LogInjectionTest.java:561:101:561:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:561:110:561:117 | source(...) | user-provided value |
 | LogInjectionTest.java:562:86:562:102 | (...)... | LogInjectionTest.java:562:95:562:102 | source(...) : Object | LogInjectionTest.java:562:86:562:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:562:95:562:102 | source(...) | user-provided value |
 | LogInjectionTest.java:563:71:563:87 | (...)... | LogInjectionTest.java:563:80:563:87 | source(...) : Object | LogInjectionTest.java:563:71:563:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:563:80:563:87 | source(...) | user-provided value |
 | LogInjectionTest.java:564:56:564:72 | (...)... | LogInjectionTest.java:564:65:564:72 | source(...) : Object | LogInjectionTest.java:564:56:564:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:564:65:564:72 | source(...) | user-provided value |
 | LogInjectionTest.java:565:41:565:57 | (...)... | LogInjectionTest.java:565:50:565:57 | source(...) : Object | LogInjectionTest.java:565:41:565:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:565:50:565:57 | source(...) | user-provided value |
-| LogInjectionTest.java:566:41:566:57 | (...)... | LogInjectionTest.java:566:50:566:57 | source(...) : Object | LogInjectionTest.java:566:41:566:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:566:50:566:57 | source(...) | user-provided value |
-| LogInjectionTest.java:567:56:567:77 | (...)... | LogInjectionTest.java:567:70:567:77 | source(...) : Object | LogInjectionTest.java:567:56:567:77 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:567:70:567:77 | source(...) | user-provided value |
-| LogInjectionTest.java:568:41:568:57 | (...)... | LogInjectionTest.java:568:50:568:57 | source(...) : Object | LogInjectionTest.java:568:41:568:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:568:50:568:57 | source(...) | user-provided value |
-| LogInjectionTest.java:569:41:569:62 | (...)... | LogInjectionTest.java:569:55:569:62 | source(...) : Object | LogInjectionTest.java:569:41:569:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:569:55:569:62 | source(...) | user-provided value |
-| LogInjectionTest.java:570:41:570:62 | (...)... | LogInjectionTest.java:570:55:570:62 | source(...) : Object | LogInjectionTest.java:570:41:570:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:570:55:570:62 | source(...) | user-provided value |
-| LogInjectionTest.java:571:26:571:51 | (...)... | LogInjectionTest.java:571:44:571:51 | source(...) : Object | LogInjectionTest.java:571:26:571:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:571:44:571:51 | source(...) | user-provided value |
-| LogInjectionTest.java:572:26:572:51 | (...)... | LogInjectionTest.java:572:44:572:51 | source(...) : Object | LogInjectionTest.java:572:26:572:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:572:44:572:51 | source(...) | user-provided value |
-| LogInjectionTest.java:573:26:573:43 | (...)... | LogInjectionTest.java:573:36:573:43 | source(...) : Object | LogInjectionTest.java:573:26:573:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:573:36:573:43 | source(...) | user-provided value |
-| LogInjectionTest.java:574:26:574:43 | (...)... | LogInjectionTest.java:574:36:574:43 | source(...) : Object | LogInjectionTest.java:574:26:574:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:574:36:574:43 | source(...) | user-provided value |
-| LogInjectionTest.java:575:26:575:33 | source(...) | LogInjectionTest.java:575:26:575:33 | source(...) | LogInjectionTest.java:575:26:575:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:575:26:575:33 | source(...) | user-provided value |
-| LogInjectionTest.java:576:26:576:33 | source(...) | LogInjectionTest.java:576:26:576:33 | source(...) | LogInjectionTest.java:576:26:576:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:576:26:576:33 | source(...) | user-provided value |
-| LogInjectionTest.java:577:26:577:42 | (...)... | LogInjectionTest.java:577:35:577:42 | source(...) : Object | LogInjectionTest.java:577:26:577:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:577:35:577:42 | source(...) | user-provided value |
-| LogInjectionTest.java:578:26:578:42 | (...)... | LogInjectionTest.java:578:35:578:42 | source(...) : Object | LogInjectionTest.java:578:26:578:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:578:35:578:42 | source(...) | user-provided value |
-| LogInjectionTest.java:579:41:579:63 | new Object[] | LogInjectionTest.java:579:55:579:62 | source(...) : Object | LogInjectionTest.java:579:41:579:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:579:55:579:62 | source(...) | user-provided value |
-| LogInjectionTest.java:580:41:580:57 | (...)... | LogInjectionTest.java:580:50:580:57 | source(...) : Object | LogInjectionTest.java:580:41:580:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:580:50:580:57 | source(...) | user-provided value |
-| LogInjectionTest.java:581:26:581:42 | (...)... | LogInjectionTest.java:581:35:581:42 | source(...) : Object | LogInjectionTest.java:581:26:581:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:581:35:581:42 | source(...) | user-provided value |
-| LogInjectionTest.java:582:56:582:72 | (...)... | LogInjectionTest.java:582:65:582:72 | source(...) : Object | LogInjectionTest.java:582:56:582:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:582:65:582:72 | source(...) | user-provided value |
-| LogInjectionTest.java:583:41:583:57 | (...)... | LogInjectionTest.java:583:50:583:57 | source(...) : Object | LogInjectionTest.java:583:41:583:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:583:50:583:57 | source(...) | user-provided value |
-| LogInjectionTest.java:584:26:584:42 | (...)... | LogInjectionTest.java:584:35:584:42 | source(...) : Object | LogInjectionTest.java:584:26:584:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:584:35:584:42 | source(...) | user-provided value |
-| LogInjectionTest.java:585:71:585:87 | (...)... | LogInjectionTest.java:585:80:585:87 | source(...) : Object | LogInjectionTest.java:585:71:585:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:585:80:585:87 | source(...) | user-provided value |
-| LogInjectionTest.java:586:56:586:72 | (...)... | LogInjectionTest.java:586:65:586:72 | source(...) : Object | LogInjectionTest.java:586:56:586:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:586:65:586:72 | source(...) | user-provided value |
-| LogInjectionTest.java:587:41:587:57 | (...)... | LogInjectionTest.java:587:50:587:57 | source(...) : Object | LogInjectionTest.java:587:41:587:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:587:50:587:57 | source(...) | user-provided value |
-| LogInjectionTest.java:588:26:588:42 | (...)... | LogInjectionTest.java:588:35:588:42 | source(...) : Object | LogInjectionTest.java:588:26:588:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:588:35:588:42 | source(...) | user-provided value |
+| LogInjectionTest.java:566:26:566:42 | (...)... | LogInjectionTest.java:566:35:566:42 | source(...) : Object | LogInjectionTest.java:566:26:566:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:566:35:566:42 | source(...) | user-provided value |
+| LogInjectionTest.java:567:131:567:147 | (...)... | LogInjectionTest.java:567:140:567:147 | source(...) : Object | LogInjectionTest.java:567:131:567:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:567:140:567:147 | source(...) | user-provided value |
+| LogInjectionTest.java:568:116:568:132 | (...)... | LogInjectionTest.java:568:125:568:132 | source(...) : Object | LogInjectionTest.java:568:116:568:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:568:125:568:132 | source(...) | user-provided value |
+| LogInjectionTest.java:569:101:569:117 | (...)... | LogInjectionTest.java:569:110:569:117 | source(...) : Object | LogInjectionTest.java:569:101:569:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:569:110:569:117 | source(...) | user-provided value |
+| LogInjectionTest.java:570:86:570:102 | (...)... | LogInjectionTest.java:570:95:570:102 | source(...) : Object | LogInjectionTest.java:570:86:570:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:570:95:570:102 | source(...) | user-provided value |
+| LogInjectionTest.java:571:71:571:87 | (...)... | LogInjectionTest.java:571:80:571:87 | source(...) : Object | LogInjectionTest.java:571:71:571:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:571:80:571:87 | source(...) | user-provided value |
+| LogInjectionTest.java:572:56:572:72 | (...)... | LogInjectionTest.java:572:65:572:72 | source(...) : Object | LogInjectionTest.java:572:56:572:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:572:65:572:72 | source(...) | user-provided value |
+| LogInjectionTest.java:573:41:573:57 | (...)... | LogInjectionTest.java:573:50:573:57 | source(...) : Object | LogInjectionTest.java:573:41:573:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:573:50:573:57 | source(...) | user-provided value |
+| LogInjectionTest.java:574:26:574:42 | (...)... | LogInjectionTest.java:574:35:574:42 | source(...) : Object | LogInjectionTest.java:574:26:574:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:574:35:574:42 | source(...) | user-provided value |
+| LogInjectionTest.java:575:146:575:162 | (...)... | LogInjectionTest.java:575:155:575:162 | source(...) : Object | LogInjectionTest.java:575:146:575:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:575:155:575:162 | source(...) | user-provided value |
+| LogInjectionTest.java:576:131:576:147 | (...)... | LogInjectionTest.java:576:140:576:147 | source(...) : Object | LogInjectionTest.java:576:131:576:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:576:140:576:147 | source(...) | user-provided value |
+| LogInjectionTest.java:577:116:577:132 | (...)... | LogInjectionTest.java:577:125:577:132 | source(...) : Object | LogInjectionTest.java:577:116:577:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:577:125:577:132 | source(...) | user-provided value |
+| LogInjectionTest.java:578:101:578:117 | (...)... | LogInjectionTest.java:578:110:578:117 | source(...) : Object | LogInjectionTest.java:578:101:578:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:578:110:578:117 | source(...) | user-provided value |
+| LogInjectionTest.java:579:86:579:102 | (...)... | LogInjectionTest.java:579:95:579:102 | source(...) : Object | LogInjectionTest.java:579:86:579:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:579:95:579:102 | source(...) | user-provided value |
+| LogInjectionTest.java:580:71:580:87 | (...)... | LogInjectionTest.java:580:80:580:87 | source(...) : Object | LogInjectionTest.java:580:71:580:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:580:80:580:87 | source(...) | user-provided value |
+| LogInjectionTest.java:581:56:581:72 | (...)... | LogInjectionTest.java:581:65:581:72 | source(...) : Object | LogInjectionTest.java:581:56:581:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:581:65:581:72 | source(...) | user-provided value |
+| LogInjectionTest.java:582:41:582:57 | (...)... | LogInjectionTest.java:582:50:582:57 | source(...) : Object | LogInjectionTest.java:582:41:582:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:582:50:582:57 | source(...) | user-provided value |
+| LogInjectionTest.java:583:26:583:42 | (...)... | LogInjectionTest.java:583:35:583:42 | source(...) : Object | LogInjectionTest.java:583:26:583:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:583:35:583:42 | source(...) | user-provided value |
+| LogInjectionTest.java:584:161:584:177 | (...)... | LogInjectionTest.java:584:170:584:177 | source(...) : Object | LogInjectionTest.java:584:161:584:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:584:170:584:177 | source(...) | user-provided value |
+| LogInjectionTest.java:585:146:585:162 | (...)... | LogInjectionTest.java:585:155:585:162 | source(...) : Object | LogInjectionTest.java:585:146:585:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:585:155:585:162 | source(...) | user-provided value |
+| LogInjectionTest.java:586:131:586:147 | (...)... | LogInjectionTest.java:586:140:586:147 | source(...) : Object | LogInjectionTest.java:586:131:586:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:586:140:586:147 | source(...) | user-provided value |
+| LogInjectionTest.java:587:116:587:132 | (...)... | LogInjectionTest.java:587:125:587:132 | source(...) : Object | LogInjectionTest.java:587:116:587:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:587:125:587:132 | source(...) | user-provided value |
+| LogInjectionTest.java:588:101:588:117 | (...)... | LogInjectionTest.java:588:110:588:117 | source(...) : Object | LogInjectionTest.java:588:101:588:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:588:110:588:117 | source(...) | user-provided value |
 | LogInjectionTest.java:589:86:589:102 | (...)... | LogInjectionTest.java:589:95:589:102 | source(...) : Object | LogInjectionTest.java:589:86:589:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:589:95:589:102 | source(...) | user-provided value |
 | LogInjectionTest.java:590:71:590:87 | (...)... | LogInjectionTest.java:590:80:590:87 | source(...) : Object | LogInjectionTest.java:590:71:590:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:590:80:590:87 | source(...) | user-provided value |
 | LogInjectionTest.java:591:56:591:72 | (...)... | LogInjectionTest.java:591:65:591:72 | source(...) : Object | LogInjectionTest.java:591:56:591:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:591:65:591:72 | source(...) | user-provided value |
 | LogInjectionTest.java:592:41:592:57 | (...)... | LogInjectionTest.java:592:50:592:57 | source(...) : Object | LogInjectionTest.java:592:41:592:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:592:50:592:57 | source(...) | user-provided value |
 | LogInjectionTest.java:593:26:593:42 | (...)... | LogInjectionTest.java:593:35:593:42 | source(...) : Object | LogInjectionTest.java:593:26:593:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:593:35:593:42 | source(...) | user-provided value |
-| LogInjectionTest.java:594:101:594:117 | (...)... | LogInjectionTest.java:594:110:594:117 | source(...) : Object | LogInjectionTest.java:594:101:594:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:594:110:594:117 | source(...) | user-provided value |
-| LogInjectionTest.java:595:86:595:102 | (...)... | LogInjectionTest.java:595:95:595:102 | source(...) : Object | LogInjectionTest.java:595:86:595:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:595:95:595:102 | source(...) | user-provided value |
-| LogInjectionTest.java:596:71:596:87 | (...)... | LogInjectionTest.java:596:80:596:87 | source(...) : Object | LogInjectionTest.java:596:71:596:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:596:80:596:87 | source(...) | user-provided value |
-| LogInjectionTest.java:597:56:597:72 | (...)... | LogInjectionTest.java:597:65:597:72 | source(...) : Object | LogInjectionTest.java:597:56:597:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:597:65:597:72 | source(...) | user-provided value |
-| LogInjectionTest.java:598:41:598:57 | (...)... | LogInjectionTest.java:598:50:598:57 | source(...) : Object | LogInjectionTest.java:598:41:598:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:598:50:598:57 | source(...) | user-provided value |
-| LogInjectionTest.java:599:26:599:42 | (...)... | LogInjectionTest.java:599:35:599:42 | source(...) : Object | LogInjectionTest.java:599:26:599:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:599:35:599:42 | source(...) | user-provided value |
-| LogInjectionTest.java:600:116:600:132 | (...)... | LogInjectionTest.java:600:125:600:132 | source(...) : Object | LogInjectionTest.java:600:116:600:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:600:125:600:132 | source(...) | user-provided value |
-| LogInjectionTest.java:601:101:601:117 | (...)... | LogInjectionTest.java:601:110:601:117 | source(...) : Object | LogInjectionTest.java:601:101:601:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:601:110:601:117 | source(...) | user-provided value |
-| LogInjectionTest.java:602:86:602:102 | (...)... | LogInjectionTest.java:602:95:602:102 | source(...) : Object | LogInjectionTest.java:602:86:602:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:602:95:602:102 | source(...) | user-provided value |
-| LogInjectionTest.java:603:71:603:87 | (...)... | LogInjectionTest.java:603:80:603:87 | source(...) : Object | LogInjectionTest.java:603:71:603:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:603:80:603:87 | source(...) | user-provided value |
-| LogInjectionTest.java:604:56:604:72 | (...)... | LogInjectionTest.java:604:65:604:72 | source(...) : Object | LogInjectionTest.java:604:56:604:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:604:65:604:72 | source(...) | user-provided value |
-| LogInjectionTest.java:605:41:605:57 | (...)... | LogInjectionTest.java:605:50:605:57 | source(...) : Object | LogInjectionTest.java:605:41:605:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:605:50:605:57 | source(...) | user-provided value |
-| LogInjectionTest.java:606:26:606:42 | (...)... | LogInjectionTest.java:606:35:606:42 | source(...) : Object | LogInjectionTest.java:606:26:606:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:606:35:606:42 | source(...) | user-provided value |
-| LogInjectionTest.java:607:131:607:147 | (...)... | LogInjectionTest.java:607:140:607:147 | source(...) : Object | LogInjectionTest.java:607:131:607:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:607:140:607:147 | source(...) | user-provided value |
-| LogInjectionTest.java:608:116:608:132 | (...)... | LogInjectionTest.java:608:125:608:132 | source(...) : Object | LogInjectionTest.java:608:116:608:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:608:125:608:132 | source(...) | user-provided value |
-| LogInjectionTest.java:609:101:609:117 | (...)... | LogInjectionTest.java:609:110:609:117 | source(...) : Object | LogInjectionTest.java:609:101:609:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:609:110:609:117 | source(...) | user-provided value |
-| LogInjectionTest.java:610:86:610:102 | (...)... | LogInjectionTest.java:610:95:610:102 | source(...) : Object | LogInjectionTest.java:610:86:610:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:610:95:610:102 | source(...) | user-provided value |
-| LogInjectionTest.java:611:71:611:87 | (...)... | LogInjectionTest.java:611:80:611:87 | source(...) : Object | LogInjectionTest.java:611:71:611:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:611:80:611:87 | source(...) | user-provided value |
-| LogInjectionTest.java:612:56:612:72 | (...)... | LogInjectionTest.java:612:65:612:72 | source(...) : Object | LogInjectionTest.java:612:56:612:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:612:65:612:72 | source(...) | user-provided value |
-| LogInjectionTest.java:613:41:613:57 | (...)... | LogInjectionTest.java:613:50:613:57 | source(...) : Object | LogInjectionTest.java:613:41:613:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:613:50:613:57 | source(...) | user-provided value |
-| LogInjectionTest.java:614:26:614:42 | (...)... | LogInjectionTest.java:614:35:614:42 | source(...) : Object | LogInjectionTest.java:614:26:614:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:614:35:614:42 | source(...) | user-provided value |
-| LogInjectionTest.java:615:146:615:162 | (...)... | LogInjectionTest.java:615:155:615:162 | source(...) : Object | LogInjectionTest.java:615:146:615:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:615:155:615:162 | source(...) | user-provided value |
-| LogInjectionTest.java:616:131:616:147 | (...)... | LogInjectionTest.java:616:140:616:147 | source(...) : Object | LogInjectionTest.java:616:131:616:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:616:140:616:147 | source(...) | user-provided value |
-| LogInjectionTest.java:617:116:617:132 | (...)... | LogInjectionTest.java:617:125:617:132 | source(...) : Object | LogInjectionTest.java:617:116:617:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:617:125:617:132 | source(...) | user-provided value |
-| LogInjectionTest.java:618:101:618:117 | (...)... | LogInjectionTest.java:618:110:618:117 | source(...) : Object | LogInjectionTest.java:618:101:618:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:618:110:618:117 | source(...) | user-provided value |
-| LogInjectionTest.java:619:86:619:102 | (...)... | LogInjectionTest.java:619:95:619:102 | source(...) : Object | LogInjectionTest.java:619:86:619:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:619:95:619:102 | source(...) | user-provided value |
-| LogInjectionTest.java:620:71:620:87 | (...)... | LogInjectionTest.java:620:80:620:87 | source(...) : Object | LogInjectionTest.java:620:71:620:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:620:80:620:87 | source(...) | user-provided value |
-| LogInjectionTest.java:621:56:621:72 | (...)... | LogInjectionTest.java:621:65:621:72 | source(...) : Object | LogInjectionTest.java:621:56:621:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:621:65:621:72 | source(...) | user-provided value |
-| LogInjectionTest.java:622:41:622:57 | (...)... | LogInjectionTest.java:622:50:622:57 | source(...) : Object | LogInjectionTest.java:622:41:622:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:622:50:622:57 | source(...) | user-provided value |
-| LogInjectionTest.java:623:26:623:42 | (...)... | LogInjectionTest.java:623:35:623:42 | source(...) : Object | LogInjectionTest.java:623:26:623:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:623:35:623:42 | source(...) | user-provided value |
-| LogInjectionTest.java:624:161:624:177 | (...)... | LogInjectionTest.java:624:170:624:177 | source(...) : Object | LogInjectionTest.java:624:161:624:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:624:170:624:177 | source(...) | user-provided value |
-| LogInjectionTest.java:625:146:625:162 | (...)... | LogInjectionTest.java:625:155:625:162 | source(...) : Object | LogInjectionTest.java:625:146:625:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:625:155:625:162 | source(...) | user-provided value |
-| LogInjectionTest.java:626:131:626:147 | (...)... | LogInjectionTest.java:626:140:626:147 | source(...) : Object | LogInjectionTest.java:626:131:626:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:626:140:626:147 | source(...) | user-provided value |
-| LogInjectionTest.java:627:116:627:132 | (...)... | LogInjectionTest.java:627:125:627:132 | source(...) : Object | LogInjectionTest.java:627:116:627:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:627:125:627:132 | source(...) | user-provided value |
-| LogInjectionTest.java:628:101:628:117 | (...)... | LogInjectionTest.java:628:110:628:117 | source(...) : Object | LogInjectionTest.java:628:101:628:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:628:110:628:117 | source(...) | user-provided value |
-| LogInjectionTest.java:629:86:629:102 | (...)... | LogInjectionTest.java:629:95:629:102 | source(...) : Object | LogInjectionTest.java:629:86:629:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:629:95:629:102 | source(...) | user-provided value |
-| LogInjectionTest.java:630:71:630:87 | (...)... | LogInjectionTest.java:630:80:630:87 | source(...) : Object | LogInjectionTest.java:630:71:630:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:630:80:630:87 | source(...) | user-provided value |
-| LogInjectionTest.java:631:56:631:72 | (...)... | LogInjectionTest.java:631:65:631:72 | source(...) : Object | LogInjectionTest.java:631:56:631:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:631:65:631:72 | source(...) | user-provided value |
-| LogInjectionTest.java:632:41:632:57 | (...)... | LogInjectionTest.java:632:50:632:57 | source(...) : Object | LogInjectionTest.java:632:41:632:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:632:50:632:57 | source(...) | user-provided value |
-| LogInjectionTest.java:633:26:633:42 | (...)... | LogInjectionTest.java:633:35:633:42 | source(...) : Object | LogInjectionTest.java:633:26:633:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:633:35:633:42 | source(...) | user-provided value |
-| LogInjectionTest.java:634:26:634:42 | (...)... | LogInjectionTest.java:634:35:634:42 | source(...) : Object | LogInjectionTest.java:634:26:634:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:634:35:634:42 | source(...) | user-provided value |
-| LogInjectionTest.java:635:41:635:62 | (...)... | LogInjectionTest.java:635:55:635:62 | source(...) : Object | LogInjectionTest.java:635:41:635:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:635:55:635:62 | source(...) | user-provided value |
-| LogInjectionTest.java:636:26:636:42 | (...)... | LogInjectionTest.java:636:35:636:42 | source(...) : Object | LogInjectionTest.java:636:26:636:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:636:35:636:42 | source(...) | user-provided value |
-| LogInjectionTest.java:637:26:637:47 | (...)... | LogInjectionTest.java:637:40:637:47 | source(...) : Object | LogInjectionTest.java:637:26:637:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:637:40:637:47 | source(...) | user-provided value |
-| LogInjectionTest.java:638:26:638:47 | (...)... | LogInjectionTest.java:638:40:638:47 | source(...) : Object | LogInjectionTest.java:638:26:638:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:638:40:638:47 | source(...) | user-provided value |
-| LogInjectionTest.java:639:25:639:47 | (...)... | LogInjectionTest.java:639:40:639:47 | source(...) : Object | LogInjectionTest.java:639:25:639:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:639:40:639:47 | source(...) | user-provided value |
-| LogInjectionTest.java:640:25:640:47 | (...)... | LogInjectionTest.java:640:40:640:47 | source(...) : Object | LogInjectionTest.java:640:25:640:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:640:40:640:47 | source(...) | user-provided value |
-| LogInjectionTest.java:641:40:641:62 | (...)... | LogInjectionTest.java:641:55:641:62 | source(...) : Object | LogInjectionTest.java:641:40:641:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:641:55:641:62 | source(...) | user-provided value |
-| LogInjectionTest.java:642:40:642:62 | (...)... | LogInjectionTest.java:642:55:642:62 | source(...) : Object | LogInjectionTest.java:642:40:642:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:642:55:642:62 | source(...) | user-provided value |
-| LogInjectionTest.java:643:40:643:57 | (...)... | LogInjectionTest.java:643:50:643:57 | source(...) : Object | LogInjectionTest.java:643:40:643:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:643:50:643:57 | source(...) | user-provided value |
-| LogInjectionTest.java:644:40:644:65 | (...)... | LogInjectionTest.java:644:58:644:65 | source(...) : Object | LogInjectionTest.java:644:40:644:65 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:644:58:644:65 | source(...) | user-provided value |
-| LogInjectionTest.java:645:40:645:65 | (...)... | LogInjectionTest.java:645:58:645:65 | source(...) : Object | LogInjectionTest.java:645:40:645:65 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:645:58:645:65 | source(...) | user-provided value |
-| LogInjectionTest.java:646:40:646:47 | source(...) | LogInjectionTest.java:646:40:646:47 | source(...) | LogInjectionTest.java:646:40:646:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:646:40:646:47 | source(...) | user-provided value |
-| LogInjectionTest.java:647:40:647:56 | (...)... | LogInjectionTest.java:647:49:647:56 | source(...) : Object | LogInjectionTest.java:647:40:647:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:647:49:647:56 | source(...) | user-provided value |
-| LogInjectionTest.java:648:40:648:56 | (...)... | LogInjectionTest.java:648:49:648:56 | source(...) : Object | LogInjectionTest.java:648:40:648:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:648:49:648:56 | source(...) | user-provided value |
-| LogInjectionTest.java:649:55:649:77 | new Object[] | LogInjectionTest.java:649:69:649:76 | source(...) : Object | LogInjectionTest.java:649:55:649:77 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:649:69:649:76 | source(...) | user-provided value |
-| LogInjectionTest.java:650:55:650:71 | (...)... | LogInjectionTest.java:650:64:650:71 | source(...) : Object | LogInjectionTest.java:650:55:650:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:650:64:650:71 | source(...) | user-provided value |
-| LogInjectionTest.java:651:40:651:56 | (...)... | LogInjectionTest.java:651:49:651:56 | source(...) : Object | LogInjectionTest.java:651:40:651:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:651:49:651:56 | source(...) | user-provided value |
-| LogInjectionTest.java:652:70:652:86 | (...)... | LogInjectionTest.java:652:79:652:86 | source(...) : Object | LogInjectionTest.java:652:70:652:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:652:79:652:86 | source(...) | user-provided value |
-| LogInjectionTest.java:653:55:653:71 | (...)... | LogInjectionTest.java:653:64:653:71 | source(...) : Object | LogInjectionTest.java:653:55:653:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:653:64:653:71 | source(...) | user-provided value |
-| LogInjectionTest.java:654:40:654:56 | (...)... | LogInjectionTest.java:654:49:654:56 | source(...) : Object | LogInjectionTest.java:654:40:654:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:654:49:654:56 | source(...) | user-provided value |
-| LogInjectionTest.java:655:85:655:101 | (...)... | LogInjectionTest.java:655:94:655:101 | source(...) : Object | LogInjectionTest.java:655:85:655:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:655:94:655:101 | source(...) | user-provided value |
-| LogInjectionTest.java:656:70:656:86 | (...)... | LogInjectionTest.java:656:79:656:86 | source(...) : Object | LogInjectionTest.java:656:70:656:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:656:79:656:86 | source(...) | user-provided value |
-| LogInjectionTest.java:657:55:657:71 | (...)... | LogInjectionTest.java:657:64:657:71 | source(...) : Object | LogInjectionTest.java:657:55:657:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:657:64:657:71 | source(...) | user-provided value |
-| LogInjectionTest.java:658:40:658:56 | (...)... | LogInjectionTest.java:658:49:658:56 | source(...) : Object | LogInjectionTest.java:658:40:658:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:658:49:658:56 | source(...) | user-provided value |
+| LogInjectionTest.java:594:26:594:42 | (...)... | LogInjectionTest.java:594:35:594:42 | source(...) : Object | LogInjectionTest.java:594:26:594:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:594:35:594:42 | source(...) | user-provided value |
+| LogInjectionTest.java:595:41:595:62 | (...)... | LogInjectionTest.java:595:55:595:62 | source(...) : Object | LogInjectionTest.java:595:41:595:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:595:55:595:62 | source(...) | user-provided value |
+| LogInjectionTest.java:596:26:596:42 | (...)... | LogInjectionTest.java:596:35:596:42 | source(...) : Object | LogInjectionTest.java:596:26:596:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:596:35:596:42 | source(...) | user-provided value |
+| LogInjectionTest.java:597:26:597:47 | (...)... | LogInjectionTest.java:597:40:597:47 | source(...) : Object | LogInjectionTest.java:597:26:597:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:597:40:597:47 | source(...) | user-provided value |
+| LogInjectionTest.java:598:26:598:47 | (...)... | LogInjectionTest.java:598:40:598:47 | source(...) : Object | LogInjectionTest.java:598:26:598:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:598:40:598:47 | source(...) | user-provided value |
+| LogInjectionTest.java:599:25:599:47 | (...)... | LogInjectionTest.java:599:40:599:47 | source(...) : Object | LogInjectionTest.java:599:25:599:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:599:40:599:47 | source(...) | user-provided value |
+| LogInjectionTest.java:600:25:600:47 | (...)... | LogInjectionTest.java:600:40:600:47 | source(...) : Object | LogInjectionTest.java:600:25:600:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:600:40:600:47 | source(...) | user-provided value |
+| LogInjectionTest.java:601:40:601:62 | (...)... | LogInjectionTest.java:601:55:601:62 | source(...) : Object | LogInjectionTest.java:601:40:601:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:601:55:601:62 | source(...) | user-provided value |
+| LogInjectionTest.java:602:40:602:62 | (...)... | LogInjectionTest.java:602:55:602:62 | source(...) : Object | LogInjectionTest.java:602:40:602:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:602:55:602:62 | source(...) | user-provided value |
+| LogInjectionTest.java:603:40:603:57 | (...)... | LogInjectionTest.java:603:50:603:57 | source(...) : Object | LogInjectionTest.java:603:40:603:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:603:50:603:57 | source(...) | user-provided value |
+| LogInjectionTest.java:604:40:604:65 | (...)... | LogInjectionTest.java:604:58:604:65 | source(...) : Object | LogInjectionTest.java:604:40:604:65 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:604:58:604:65 | source(...) | user-provided value |
+| LogInjectionTest.java:605:40:605:65 | (...)... | LogInjectionTest.java:605:58:605:65 | source(...) : Object | LogInjectionTest.java:605:40:605:65 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:605:58:605:65 | source(...) | user-provided value |
+| LogInjectionTest.java:606:40:606:47 | source(...) | LogInjectionTest.java:606:40:606:47 | source(...) | LogInjectionTest.java:606:40:606:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:606:40:606:47 | source(...) | user-provided value |
+| LogInjectionTest.java:607:40:607:56 | (...)... | LogInjectionTest.java:607:49:607:56 | source(...) : Object | LogInjectionTest.java:607:40:607:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:607:49:607:56 | source(...) | user-provided value |
+| LogInjectionTest.java:608:40:608:56 | (...)... | LogInjectionTest.java:608:49:608:56 | source(...) : Object | LogInjectionTest.java:608:40:608:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:608:49:608:56 | source(...) | user-provided value |
+| LogInjectionTest.java:609:55:609:77 | new Object[] | LogInjectionTest.java:609:69:609:76 | source(...) : Object | LogInjectionTest.java:609:55:609:77 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:609:69:609:76 | source(...) | user-provided value |
+| LogInjectionTest.java:610:55:610:71 | (...)... | LogInjectionTest.java:610:64:610:71 | source(...) : Object | LogInjectionTest.java:610:55:610:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:610:64:610:71 | source(...) | user-provided value |
+| LogInjectionTest.java:611:40:611:56 | (...)... | LogInjectionTest.java:611:49:611:56 | source(...) : Object | LogInjectionTest.java:611:40:611:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:611:49:611:56 | source(...) | user-provided value |
+| LogInjectionTest.java:612:70:612:86 | (...)... | LogInjectionTest.java:612:79:612:86 | source(...) : Object | LogInjectionTest.java:612:70:612:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:612:79:612:86 | source(...) | user-provided value |
+| LogInjectionTest.java:613:55:613:71 | (...)... | LogInjectionTest.java:613:64:613:71 | source(...) : Object | LogInjectionTest.java:613:55:613:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:613:64:613:71 | source(...) | user-provided value |
+| LogInjectionTest.java:614:40:614:56 | (...)... | LogInjectionTest.java:614:49:614:56 | source(...) : Object | LogInjectionTest.java:614:40:614:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:614:49:614:56 | source(...) | user-provided value |
+| LogInjectionTest.java:615:85:615:101 | (...)... | LogInjectionTest.java:615:94:615:101 | source(...) : Object | LogInjectionTest.java:615:85:615:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:615:94:615:101 | source(...) | user-provided value |
+| LogInjectionTest.java:616:70:616:86 | (...)... | LogInjectionTest.java:616:79:616:86 | source(...) : Object | LogInjectionTest.java:616:70:616:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:616:79:616:86 | source(...) | user-provided value |
+| LogInjectionTest.java:617:55:617:71 | (...)... | LogInjectionTest.java:617:64:617:71 | source(...) : Object | LogInjectionTest.java:617:55:617:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:617:64:617:71 | source(...) | user-provided value |
+| LogInjectionTest.java:618:40:618:56 | (...)... | LogInjectionTest.java:618:49:618:56 | source(...) : Object | LogInjectionTest.java:618:40:618:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:618:49:618:56 | source(...) | user-provided value |
+| LogInjectionTest.java:619:100:619:116 | (...)... | LogInjectionTest.java:619:109:619:116 | source(...) : Object | LogInjectionTest.java:619:100:619:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:619:109:619:116 | source(...) | user-provided value |
+| LogInjectionTest.java:620:85:620:101 | (...)... | LogInjectionTest.java:620:94:620:101 | source(...) : Object | LogInjectionTest.java:620:85:620:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:620:94:620:101 | source(...) | user-provided value |
+| LogInjectionTest.java:621:70:621:86 | (...)... | LogInjectionTest.java:621:79:621:86 | source(...) : Object | LogInjectionTest.java:621:70:621:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:621:79:621:86 | source(...) | user-provided value |
+| LogInjectionTest.java:622:55:622:71 | (...)... | LogInjectionTest.java:622:64:622:71 | source(...) : Object | LogInjectionTest.java:622:55:622:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:622:64:622:71 | source(...) | user-provided value |
+| LogInjectionTest.java:623:40:623:56 | (...)... | LogInjectionTest.java:623:49:623:56 | source(...) : Object | LogInjectionTest.java:623:40:623:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:623:49:623:56 | source(...) | user-provided value |
+| LogInjectionTest.java:624:115:624:131 | (...)... | LogInjectionTest.java:624:124:624:131 | source(...) : Object | LogInjectionTest.java:624:115:624:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:624:124:624:131 | source(...) | user-provided value |
+| LogInjectionTest.java:625:100:625:116 | (...)... | LogInjectionTest.java:625:109:625:116 | source(...) : Object | LogInjectionTest.java:625:100:625:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:625:109:625:116 | source(...) | user-provided value |
+| LogInjectionTest.java:626:85:626:101 | (...)... | LogInjectionTest.java:626:94:626:101 | source(...) : Object | LogInjectionTest.java:626:85:626:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:626:94:626:101 | source(...) | user-provided value |
+| LogInjectionTest.java:627:70:627:86 | (...)... | LogInjectionTest.java:627:79:627:86 | source(...) : Object | LogInjectionTest.java:627:70:627:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:627:79:627:86 | source(...) | user-provided value |
+| LogInjectionTest.java:628:55:628:71 | (...)... | LogInjectionTest.java:628:64:628:71 | source(...) : Object | LogInjectionTest.java:628:55:628:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:628:64:628:71 | source(...) | user-provided value |
+| LogInjectionTest.java:629:40:629:56 | (...)... | LogInjectionTest.java:629:49:629:56 | source(...) : Object | LogInjectionTest.java:629:40:629:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:629:49:629:56 | source(...) | user-provided value |
+| LogInjectionTest.java:630:130:630:146 | (...)... | LogInjectionTest.java:630:139:630:146 | source(...) : Object | LogInjectionTest.java:630:130:630:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:630:139:630:146 | source(...) | user-provided value |
+| LogInjectionTest.java:631:115:631:131 | (...)... | LogInjectionTest.java:631:124:631:131 | source(...) : Object | LogInjectionTest.java:631:115:631:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:631:124:631:131 | source(...) | user-provided value |
+| LogInjectionTest.java:632:100:632:116 | (...)... | LogInjectionTest.java:632:109:632:116 | source(...) : Object | LogInjectionTest.java:632:100:632:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:632:109:632:116 | source(...) | user-provided value |
+| LogInjectionTest.java:633:85:633:101 | (...)... | LogInjectionTest.java:633:94:633:101 | source(...) : Object | LogInjectionTest.java:633:85:633:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:633:94:633:101 | source(...) | user-provided value |
+| LogInjectionTest.java:634:70:634:86 | (...)... | LogInjectionTest.java:634:79:634:86 | source(...) : Object | LogInjectionTest.java:634:70:634:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:634:79:634:86 | source(...) | user-provided value |
+| LogInjectionTest.java:635:55:635:71 | (...)... | LogInjectionTest.java:635:64:635:71 | source(...) : Object | LogInjectionTest.java:635:55:635:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:635:64:635:71 | source(...) | user-provided value |
+| LogInjectionTest.java:636:40:636:56 | (...)... | LogInjectionTest.java:636:49:636:56 | source(...) : Object | LogInjectionTest.java:636:40:636:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:636:49:636:56 | source(...) | user-provided value |
+| LogInjectionTest.java:637:145:637:161 | (...)... | LogInjectionTest.java:637:154:637:161 | source(...) : Object | LogInjectionTest.java:637:145:637:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:637:154:637:161 | source(...) | user-provided value |
+| LogInjectionTest.java:638:130:638:146 | (...)... | LogInjectionTest.java:638:139:638:146 | source(...) : Object | LogInjectionTest.java:638:130:638:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:638:139:638:146 | source(...) | user-provided value |
+| LogInjectionTest.java:639:115:639:131 | (...)... | LogInjectionTest.java:639:124:639:131 | source(...) : Object | LogInjectionTest.java:639:115:639:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:639:124:639:131 | source(...) | user-provided value |
+| LogInjectionTest.java:640:100:640:116 | (...)... | LogInjectionTest.java:640:109:640:116 | source(...) : Object | LogInjectionTest.java:640:100:640:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:640:109:640:116 | source(...) | user-provided value |
+| LogInjectionTest.java:641:85:641:101 | (...)... | LogInjectionTest.java:641:94:641:101 | source(...) : Object | LogInjectionTest.java:641:85:641:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:641:94:641:101 | source(...) | user-provided value |
+| LogInjectionTest.java:642:70:642:86 | (...)... | LogInjectionTest.java:642:79:642:86 | source(...) : Object | LogInjectionTest.java:642:70:642:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:642:79:642:86 | source(...) | user-provided value |
+| LogInjectionTest.java:643:55:643:71 | (...)... | LogInjectionTest.java:643:64:643:71 | source(...) : Object | LogInjectionTest.java:643:55:643:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:643:64:643:71 | source(...) | user-provided value |
+| LogInjectionTest.java:644:40:644:56 | (...)... | LogInjectionTest.java:644:49:644:56 | source(...) : Object | LogInjectionTest.java:644:40:644:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:644:49:644:56 | source(...) | user-provided value |
+| LogInjectionTest.java:645:160:645:176 | (...)... | LogInjectionTest.java:645:169:645:176 | source(...) : Object | LogInjectionTest.java:645:160:645:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:645:169:645:176 | source(...) | user-provided value |
+| LogInjectionTest.java:646:145:646:161 | (...)... | LogInjectionTest.java:646:154:646:161 | source(...) : Object | LogInjectionTest.java:646:145:646:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:646:154:646:161 | source(...) | user-provided value |
+| LogInjectionTest.java:647:130:647:146 | (...)... | LogInjectionTest.java:647:139:647:146 | source(...) : Object | LogInjectionTest.java:647:130:647:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:647:139:647:146 | source(...) | user-provided value |
+| LogInjectionTest.java:648:115:648:131 | (...)... | LogInjectionTest.java:648:124:648:131 | source(...) : Object | LogInjectionTest.java:648:115:648:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:648:124:648:131 | source(...) | user-provided value |
+| LogInjectionTest.java:649:100:649:116 | (...)... | LogInjectionTest.java:649:109:649:116 | source(...) : Object | LogInjectionTest.java:649:100:649:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:649:109:649:116 | source(...) | user-provided value |
+| LogInjectionTest.java:650:85:650:101 | (...)... | LogInjectionTest.java:650:94:650:101 | source(...) : Object | LogInjectionTest.java:650:85:650:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:650:94:650:101 | source(...) | user-provided value |
+| LogInjectionTest.java:651:70:651:86 | (...)... | LogInjectionTest.java:651:79:651:86 | source(...) : Object | LogInjectionTest.java:651:70:651:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:651:79:651:86 | source(...) | user-provided value |
+| LogInjectionTest.java:652:55:652:71 | (...)... | LogInjectionTest.java:652:64:652:71 | source(...) : Object | LogInjectionTest.java:652:55:652:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:652:64:652:71 | source(...) | user-provided value |
+| LogInjectionTest.java:653:40:653:56 | (...)... | LogInjectionTest.java:653:49:653:56 | source(...) : Object | LogInjectionTest.java:653:40:653:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:653:49:653:56 | source(...) | user-provided value |
+| LogInjectionTest.java:654:175:654:191 | (...)... | LogInjectionTest.java:654:184:654:191 | source(...) : Object | LogInjectionTest.java:654:175:654:191 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:654:184:654:191 | source(...) | user-provided value |
+| LogInjectionTest.java:655:160:655:176 | (...)... | LogInjectionTest.java:655:169:655:176 | source(...) : Object | LogInjectionTest.java:655:160:655:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:655:169:655:176 | source(...) | user-provided value |
+| LogInjectionTest.java:656:145:656:161 | (...)... | LogInjectionTest.java:656:154:656:161 | source(...) : Object | LogInjectionTest.java:656:145:656:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:656:154:656:161 | source(...) | user-provided value |
+| LogInjectionTest.java:657:130:657:146 | (...)... | LogInjectionTest.java:657:139:657:146 | source(...) : Object | LogInjectionTest.java:657:130:657:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:657:139:657:146 | source(...) | user-provided value |
+| LogInjectionTest.java:658:115:658:131 | (...)... | LogInjectionTest.java:658:124:658:131 | source(...) : Object | LogInjectionTest.java:658:115:658:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:658:124:658:131 | source(...) | user-provided value |
 | LogInjectionTest.java:659:100:659:116 | (...)... | LogInjectionTest.java:659:109:659:116 | source(...) : Object | LogInjectionTest.java:659:100:659:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:659:109:659:116 | source(...) | user-provided value |
 | LogInjectionTest.java:660:85:660:101 | (...)... | LogInjectionTest.java:660:94:660:101 | source(...) : Object | LogInjectionTest.java:660:85:660:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:660:94:660:101 | source(...) | user-provided value |
 | LogInjectionTest.java:661:70:661:86 | (...)... | LogInjectionTest.java:661:79:661:86 | source(...) : Object | LogInjectionTest.java:661:70:661:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:661:79:661:86 | source(...) | user-provided value |
 | LogInjectionTest.java:662:55:662:71 | (...)... | LogInjectionTest.java:662:64:662:71 | source(...) : Object | LogInjectionTest.java:662:55:662:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:662:64:662:71 | source(...) | user-provided value |
 | LogInjectionTest.java:663:40:663:56 | (...)... | LogInjectionTest.java:663:49:663:56 | source(...) : Object | LogInjectionTest.java:663:40:663:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:663:49:663:56 | source(...) | user-provided value |
-| LogInjectionTest.java:664:115:664:131 | (...)... | LogInjectionTest.java:664:124:664:131 | source(...) : Object | LogInjectionTest.java:664:115:664:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:664:124:664:131 | source(...) | user-provided value |
-| LogInjectionTest.java:665:100:665:116 | (...)... | LogInjectionTest.java:665:109:665:116 | source(...) : Object | LogInjectionTest.java:665:100:665:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:665:109:665:116 | source(...) | user-provided value |
-| LogInjectionTest.java:666:85:666:101 | (...)... | LogInjectionTest.java:666:94:666:101 | source(...) : Object | LogInjectionTest.java:666:85:666:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:666:94:666:101 | source(...) | user-provided value |
-| LogInjectionTest.java:667:70:667:86 | (...)... | LogInjectionTest.java:667:79:667:86 | source(...) : Object | LogInjectionTest.java:667:70:667:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:667:79:667:86 | source(...) | user-provided value |
-| LogInjectionTest.java:668:55:668:71 | (...)... | LogInjectionTest.java:668:64:668:71 | source(...) : Object | LogInjectionTest.java:668:55:668:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:668:64:668:71 | source(...) | user-provided value |
-| LogInjectionTest.java:669:40:669:56 | (...)... | LogInjectionTest.java:669:49:669:56 | source(...) : Object | LogInjectionTest.java:669:40:669:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:669:49:669:56 | source(...) | user-provided value |
-| LogInjectionTest.java:670:130:670:146 | (...)... | LogInjectionTest.java:670:139:670:146 | source(...) : Object | LogInjectionTest.java:670:130:670:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:670:139:670:146 | source(...) | user-provided value |
-| LogInjectionTest.java:671:115:671:131 | (...)... | LogInjectionTest.java:671:124:671:131 | source(...) : Object | LogInjectionTest.java:671:115:671:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:671:124:671:131 | source(...) | user-provided value |
-| LogInjectionTest.java:672:100:672:116 | (...)... | LogInjectionTest.java:672:109:672:116 | source(...) : Object | LogInjectionTest.java:672:100:672:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:672:109:672:116 | source(...) | user-provided value |
-| LogInjectionTest.java:673:85:673:101 | (...)... | LogInjectionTest.java:673:94:673:101 | source(...) : Object | LogInjectionTest.java:673:85:673:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:673:94:673:101 | source(...) | user-provided value |
-| LogInjectionTest.java:674:70:674:86 | (...)... | LogInjectionTest.java:674:79:674:86 | source(...) : Object | LogInjectionTest.java:674:70:674:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:674:79:674:86 | source(...) | user-provided value |
-| LogInjectionTest.java:675:55:675:71 | (...)... | LogInjectionTest.java:675:64:675:71 | source(...) : Object | LogInjectionTest.java:675:55:675:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:675:64:675:71 | source(...) | user-provided value |
-| LogInjectionTest.java:676:40:676:56 | (...)... | LogInjectionTest.java:676:49:676:56 | source(...) : Object | LogInjectionTest.java:676:40:676:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:676:49:676:56 | source(...) | user-provided value |
-| LogInjectionTest.java:677:145:677:161 | (...)... | LogInjectionTest.java:677:154:677:161 | source(...) : Object | LogInjectionTest.java:677:145:677:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:677:154:677:161 | source(...) | user-provided value |
-| LogInjectionTest.java:678:130:678:146 | (...)... | LogInjectionTest.java:678:139:678:146 | source(...) : Object | LogInjectionTest.java:678:130:678:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:678:139:678:146 | source(...) | user-provided value |
-| LogInjectionTest.java:679:115:679:131 | (...)... | LogInjectionTest.java:679:124:679:131 | source(...) : Object | LogInjectionTest.java:679:115:679:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:679:124:679:131 | source(...) | user-provided value |
-| LogInjectionTest.java:680:100:680:116 | (...)... | LogInjectionTest.java:680:109:680:116 | source(...) : Object | LogInjectionTest.java:680:100:680:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:680:109:680:116 | source(...) | user-provided value |
-| LogInjectionTest.java:681:85:681:101 | (...)... | LogInjectionTest.java:681:94:681:101 | source(...) : Object | LogInjectionTest.java:681:85:681:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:681:94:681:101 | source(...) | user-provided value |
-| LogInjectionTest.java:682:70:682:86 | (...)... | LogInjectionTest.java:682:79:682:86 | source(...) : Object | LogInjectionTest.java:682:70:682:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:682:79:682:86 | source(...) | user-provided value |
-| LogInjectionTest.java:683:55:683:71 | (...)... | LogInjectionTest.java:683:64:683:71 | source(...) : Object | LogInjectionTest.java:683:55:683:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:683:64:683:71 | source(...) | user-provided value |
-| LogInjectionTest.java:684:40:684:56 | (...)... | LogInjectionTest.java:684:49:684:56 | source(...) : Object | LogInjectionTest.java:684:40:684:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:684:49:684:56 | source(...) | user-provided value |
-| LogInjectionTest.java:685:160:685:176 | (...)... | LogInjectionTest.java:685:169:685:176 | source(...) : Object | LogInjectionTest.java:685:160:685:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:685:169:685:176 | source(...) | user-provided value |
-| LogInjectionTest.java:686:145:686:161 | (...)... | LogInjectionTest.java:686:154:686:161 | source(...) : Object | LogInjectionTest.java:686:145:686:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:686:154:686:161 | source(...) | user-provided value |
-| LogInjectionTest.java:687:130:687:146 | (...)... | LogInjectionTest.java:687:139:687:146 | source(...) : Object | LogInjectionTest.java:687:130:687:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:687:139:687:146 | source(...) | user-provided value |
-| LogInjectionTest.java:688:115:688:131 | (...)... | LogInjectionTest.java:688:124:688:131 | source(...) : Object | LogInjectionTest.java:688:115:688:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:688:124:688:131 | source(...) | user-provided value |
-| LogInjectionTest.java:689:100:689:116 | (...)... | LogInjectionTest.java:689:109:689:116 | source(...) : Object | LogInjectionTest.java:689:100:689:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:689:109:689:116 | source(...) | user-provided value |
-| LogInjectionTest.java:690:85:690:101 | (...)... | LogInjectionTest.java:690:94:690:101 | source(...) : Object | LogInjectionTest.java:690:85:690:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:690:94:690:101 | source(...) | user-provided value |
-| LogInjectionTest.java:691:70:691:86 | (...)... | LogInjectionTest.java:691:79:691:86 | source(...) : Object | LogInjectionTest.java:691:70:691:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:691:79:691:86 | source(...) | user-provided value |
-| LogInjectionTest.java:692:55:692:71 | (...)... | LogInjectionTest.java:692:64:692:71 | source(...) : Object | LogInjectionTest.java:692:55:692:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:692:64:692:71 | source(...) | user-provided value |
-| LogInjectionTest.java:693:40:693:56 | (...)... | LogInjectionTest.java:693:49:693:56 | source(...) : Object | LogInjectionTest.java:693:40:693:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:693:49:693:56 | source(...) | user-provided value |
-| LogInjectionTest.java:694:175:694:191 | (...)... | LogInjectionTest.java:694:184:694:191 | source(...) : Object | LogInjectionTest.java:694:175:694:191 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:694:184:694:191 | source(...) | user-provided value |
-| LogInjectionTest.java:695:160:695:176 | (...)... | LogInjectionTest.java:695:169:695:176 | source(...) : Object | LogInjectionTest.java:695:160:695:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:695:169:695:176 | source(...) | user-provided value |
-| LogInjectionTest.java:696:145:696:161 | (...)... | LogInjectionTest.java:696:154:696:161 | source(...) : Object | LogInjectionTest.java:696:145:696:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:696:154:696:161 | source(...) | user-provided value |
-| LogInjectionTest.java:697:130:697:146 | (...)... | LogInjectionTest.java:697:139:697:146 | source(...) : Object | LogInjectionTest.java:697:130:697:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:697:139:697:146 | source(...) | user-provided value |
+| LogInjectionTest.java:664:40:664:56 | (...)... | LogInjectionTest.java:664:49:664:56 | source(...) : Object | LogInjectionTest.java:664:40:664:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:664:49:664:56 | source(...) | user-provided value |
+| LogInjectionTest.java:665:55:665:76 | (...)... | LogInjectionTest.java:665:69:665:76 | source(...) : Object | LogInjectionTest.java:665:55:665:76 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:665:69:665:76 | source(...) | user-provided value |
+| LogInjectionTest.java:666:40:666:56 | (...)... | LogInjectionTest.java:666:49:666:56 | source(...) : Object | LogInjectionTest.java:666:40:666:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:666:49:666:56 | source(...) | user-provided value |
+| LogInjectionTest.java:667:40:667:61 | (...)... | LogInjectionTest.java:667:54:667:61 | source(...) : Object | LogInjectionTest.java:667:40:667:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:667:54:667:61 | source(...) | user-provided value |
+| LogInjectionTest.java:668:40:668:61 | (...)... | LogInjectionTest.java:668:54:668:61 | source(...) : Object | LogInjectionTest.java:668:40:668:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:668:54:668:61 | source(...) | user-provided value |
+| LogInjectionTest.java:669:25:669:50 | (...)... | LogInjectionTest.java:669:43:669:50 | source(...) : Object | LogInjectionTest.java:669:25:669:50 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:669:43:669:50 | source(...) | user-provided value |
+| LogInjectionTest.java:670:25:670:50 | (...)... | LogInjectionTest.java:670:43:670:50 | source(...) : Object | LogInjectionTest.java:670:25:670:50 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:670:43:670:50 | source(...) | user-provided value |
+| LogInjectionTest.java:671:25:671:42 | (...)... | LogInjectionTest.java:671:35:671:42 | source(...) : Object | LogInjectionTest.java:671:25:671:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:671:35:671:42 | source(...) | user-provided value |
+| LogInjectionTest.java:672:25:672:42 | (...)... | LogInjectionTest.java:672:35:672:42 | source(...) : Object | LogInjectionTest.java:672:25:672:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:672:35:672:42 | source(...) | user-provided value |
+| LogInjectionTest.java:673:25:673:32 | source(...) | LogInjectionTest.java:673:25:673:32 | source(...) | LogInjectionTest.java:673:25:673:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:673:25:673:32 | source(...) | user-provided value |
+| LogInjectionTest.java:674:25:674:32 | source(...) | LogInjectionTest.java:674:25:674:32 | source(...) | LogInjectionTest.java:674:25:674:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:674:25:674:32 | source(...) | user-provided value |
+| LogInjectionTest.java:675:25:675:41 | (...)... | LogInjectionTest.java:675:34:675:41 | source(...) : Object | LogInjectionTest.java:675:25:675:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:675:34:675:41 | source(...) | user-provided value |
+| LogInjectionTest.java:676:25:676:41 | (...)... | LogInjectionTest.java:676:34:676:41 | source(...) : Object | LogInjectionTest.java:676:25:676:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:676:34:676:41 | source(...) | user-provided value |
+| LogInjectionTest.java:677:40:677:62 | new Object[] | LogInjectionTest.java:677:54:677:61 | source(...) : Object | LogInjectionTest.java:677:40:677:62 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:677:54:677:61 | source(...) | user-provided value |
+| LogInjectionTest.java:678:40:678:56 | (...)... | LogInjectionTest.java:678:49:678:56 | source(...) : Object | LogInjectionTest.java:678:40:678:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:678:49:678:56 | source(...) | user-provided value |
+| LogInjectionTest.java:679:25:679:41 | (...)... | LogInjectionTest.java:679:34:679:41 | source(...) : Object | LogInjectionTest.java:679:25:679:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:679:34:679:41 | source(...) | user-provided value |
+| LogInjectionTest.java:680:55:680:71 | (...)... | LogInjectionTest.java:680:64:680:71 | source(...) : Object | LogInjectionTest.java:680:55:680:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:680:64:680:71 | source(...) | user-provided value |
+| LogInjectionTest.java:681:40:681:56 | (...)... | LogInjectionTest.java:681:49:681:56 | source(...) : Object | LogInjectionTest.java:681:40:681:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:681:49:681:56 | source(...) | user-provided value |
+| LogInjectionTest.java:682:25:682:41 | (...)... | LogInjectionTest.java:682:34:682:41 | source(...) : Object | LogInjectionTest.java:682:25:682:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:682:34:682:41 | source(...) | user-provided value |
+| LogInjectionTest.java:683:70:683:86 | (...)... | LogInjectionTest.java:683:79:683:86 | source(...) : Object | LogInjectionTest.java:683:70:683:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:683:79:683:86 | source(...) | user-provided value |
+| LogInjectionTest.java:684:55:684:71 | (...)... | LogInjectionTest.java:684:64:684:71 | source(...) : Object | LogInjectionTest.java:684:55:684:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:684:64:684:71 | source(...) | user-provided value |
+| LogInjectionTest.java:685:40:685:56 | (...)... | LogInjectionTest.java:685:49:685:56 | source(...) : Object | LogInjectionTest.java:685:40:685:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:685:49:685:56 | source(...) | user-provided value |
+| LogInjectionTest.java:686:25:686:41 | (...)... | LogInjectionTest.java:686:34:686:41 | source(...) : Object | LogInjectionTest.java:686:25:686:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:686:34:686:41 | source(...) | user-provided value |
+| LogInjectionTest.java:687:85:687:101 | (...)... | LogInjectionTest.java:687:94:687:101 | source(...) : Object | LogInjectionTest.java:687:85:687:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:687:94:687:101 | source(...) | user-provided value |
+| LogInjectionTest.java:688:70:688:86 | (...)... | LogInjectionTest.java:688:79:688:86 | source(...) : Object | LogInjectionTest.java:688:70:688:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:688:79:688:86 | source(...) | user-provided value |
+| LogInjectionTest.java:689:55:689:71 | (...)... | LogInjectionTest.java:689:64:689:71 | source(...) : Object | LogInjectionTest.java:689:55:689:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:689:64:689:71 | source(...) | user-provided value |
+| LogInjectionTest.java:690:40:690:56 | (...)... | LogInjectionTest.java:690:49:690:56 | source(...) : Object | LogInjectionTest.java:690:40:690:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:690:49:690:56 | source(...) | user-provided value |
+| LogInjectionTest.java:691:25:691:41 | (...)... | LogInjectionTest.java:691:34:691:41 | source(...) : Object | LogInjectionTest.java:691:25:691:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:691:34:691:41 | source(...) | user-provided value |
+| LogInjectionTest.java:692:100:692:116 | (...)... | LogInjectionTest.java:692:109:692:116 | source(...) : Object | LogInjectionTest.java:692:100:692:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:692:109:692:116 | source(...) | user-provided value |
+| LogInjectionTest.java:693:85:693:101 | (...)... | LogInjectionTest.java:693:94:693:101 | source(...) : Object | LogInjectionTest.java:693:85:693:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:693:94:693:101 | source(...) | user-provided value |
+| LogInjectionTest.java:694:70:694:86 | (...)... | LogInjectionTest.java:694:79:694:86 | source(...) : Object | LogInjectionTest.java:694:70:694:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:694:79:694:86 | source(...) | user-provided value |
+| LogInjectionTest.java:695:55:695:71 | (...)... | LogInjectionTest.java:695:64:695:71 | source(...) : Object | LogInjectionTest.java:695:55:695:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:695:64:695:71 | source(...) | user-provided value |
+| LogInjectionTest.java:696:40:696:56 | (...)... | LogInjectionTest.java:696:49:696:56 | source(...) : Object | LogInjectionTest.java:696:40:696:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:696:49:696:56 | source(...) | user-provided value |
+| LogInjectionTest.java:697:25:697:41 | (...)... | LogInjectionTest.java:697:34:697:41 | source(...) : Object | LogInjectionTest.java:697:25:697:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:697:34:697:41 | source(...) | user-provided value |
 | LogInjectionTest.java:698:115:698:131 | (...)... | LogInjectionTest.java:698:124:698:131 | source(...) : Object | LogInjectionTest.java:698:115:698:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:698:124:698:131 | source(...) | user-provided value |
 | LogInjectionTest.java:699:100:699:116 | (...)... | LogInjectionTest.java:699:109:699:116 | source(...) : Object | LogInjectionTest.java:699:100:699:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:699:109:699:116 | source(...) | user-provided value |
 | LogInjectionTest.java:700:85:700:101 | (...)... | LogInjectionTest.java:700:94:700:101 | source(...) : Object | LogInjectionTest.java:700:85:700:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:700:94:700:101 | source(...) | user-provided value |
 | LogInjectionTest.java:701:70:701:86 | (...)... | LogInjectionTest.java:701:79:701:86 | source(...) : Object | LogInjectionTest.java:701:70:701:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:701:79:701:86 | source(...) | user-provided value |
 | LogInjectionTest.java:702:55:702:71 | (...)... | LogInjectionTest.java:702:64:702:71 | source(...) : Object | LogInjectionTest.java:702:55:702:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:702:64:702:71 | source(...) | user-provided value |
 | LogInjectionTest.java:703:40:703:56 | (...)... | LogInjectionTest.java:703:49:703:56 | source(...) : Object | LogInjectionTest.java:703:40:703:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:703:49:703:56 | source(...) | user-provided value |
-| LogInjectionTest.java:704:40:704:56 | (...)... | LogInjectionTest.java:704:49:704:56 | source(...) : Object | LogInjectionTest.java:704:40:704:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:704:49:704:56 | source(...) | user-provided value |
-| LogInjectionTest.java:705:55:705:76 | (...)... | LogInjectionTest.java:705:69:705:76 | source(...) : Object | LogInjectionTest.java:705:55:705:76 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:705:69:705:76 | source(...) | user-provided value |
-| LogInjectionTest.java:706:40:706:56 | (...)... | LogInjectionTest.java:706:49:706:56 | source(...) : Object | LogInjectionTest.java:706:40:706:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:706:49:706:56 | source(...) | user-provided value |
-| LogInjectionTest.java:707:40:707:61 | (...)... | LogInjectionTest.java:707:54:707:61 | source(...) : Object | LogInjectionTest.java:707:40:707:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:707:54:707:61 | source(...) | user-provided value |
-| LogInjectionTest.java:708:40:708:61 | (...)... | LogInjectionTest.java:708:54:708:61 | source(...) : Object | LogInjectionTest.java:708:40:708:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:708:54:708:61 | source(...) | user-provided value |
-| LogInjectionTest.java:709:25:709:50 | (...)... | LogInjectionTest.java:709:43:709:50 | source(...) : Object | LogInjectionTest.java:709:25:709:50 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:709:43:709:50 | source(...) | user-provided value |
-| LogInjectionTest.java:710:25:710:50 | (...)... | LogInjectionTest.java:710:43:710:50 | source(...) : Object | LogInjectionTest.java:710:25:710:50 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:710:43:710:50 | source(...) | user-provided value |
-| LogInjectionTest.java:711:25:711:42 | (...)... | LogInjectionTest.java:711:35:711:42 | source(...) : Object | LogInjectionTest.java:711:25:711:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:711:35:711:42 | source(...) | user-provided value |
-| LogInjectionTest.java:712:25:712:42 | (...)... | LogInjectionTest.java:712:35:712:42 | source(...) : Object | LogInjectionTest.java:712:25:712:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:712:35:712:42 | source(...) | user-provided value |
-| LogInjectionTest.java:713:25:713:32 | source(...) | LogInjectionTest.java:713:25:713:32 | source(...) | LogInjectionTest.java:713:25:713:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:713:25:713:32 | source(...) | user-provided value |
-| LogInjectionTest.java:714:25:714:32 | source(...) | LogInjectionTest.java:714:25:714:32 | source(...) | LogInjectionTest.java:714:25:714:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:714:25:714:32 | source(...) | user-provided value |
-| LogInjectionTest.java:715:25:715:41 | (...)... | LogInjectionTest.java:715:34:715:41 | source(...) : Object | LogInjectionTest.java:715:25:715:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:715:34:715:41 | source(...) | user-provided value |
-| LogInjectionTest.java:716:25:716:41 | (...)... | LogInjectionTest.java:716:34:716:41 | source(...) : Object | LogInjectionTest.java:716:25:716:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:716:34:716:41 | source(...) | user-provided value |
-| LogInjectionTest.java:717:40:717:62 | new Object[] | LogInjectionTest.java:717:54:717:61 | source(...) : Object | LogInjectionTest.java:717:40:717:62 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:717:54:717:61 | source(...) | user-provided value |
-| LogInjectionTest.java:718:40:718:56 | (...)... | LogInjectionTest.java:718:49:718:56 | source(...) : Object | LogInjectionTest.java:718:40:718:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:718:49:718:56 | source(...) | user-provided value |
-| LogInjectionTest.java:719:25:719:41 | (...)... | LogInjectionTest.java:719:34:719:41 | source(...) : Object | LogInjectionTest.java:719:25:719:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:719:34:719:41 | source(...) | user-provided value |
-| LogInjectionTest.java:720:55:720:71 | (...)... | LogInjectionTest.java:720:64:720:71 | source(...) : Object | LogInjectionTest.java:720:55:720:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:720:64:720:71 | source(...) | user-provided value |
-| LogInjectionTest.java:721:40:721:56 | (...)... | LogInjectionTest.java:721:49:721:56 | source(...) : Object | LogInjectionTest.java:721:40:721:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:721:49:721:56 | source(...) | user-provided value |
-| LogInjectionTest.java:722:25:722:41 | (...)... | LogInjectionTest.java:722:34:722:41 | source(...) : Object | LogInjectionTest.java:722:25:722:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:722:34:722:41 | source(...) | user-provided value |
-| LogInjectionTest.java:723:70:723:86 | (...)... | LogInjectionTest.java:723:79:723:86 | source(...) : Object | LogInjectionTest.java:723:70:723:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:723:79:723:86 | source(...) | user-provided value |
-| LogInjectionTest.java:724:55:724:71 | (...)... | LogInjectionTest.java:724:64:724:71 | source(...) : Object | LogInjectionTest.java:724:55:724:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:724:64:724:71 | source(...) | user-provided value |
-| LogInjectionTest.java:725:40:725:56 | (...)... | LogInjectionTest.java:725:49:725:56 | source(...) : Object | LogInjectionTest.java:725:40:725:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:725:49:725:56 | source(...) | user-provided value |
-| LogInjectionTest.java:726:25:726:41 | (...)... | LogInjectionTest.java:726:34:726:41 | source(...) : Object | LogInjectionTest.java:726:25:726:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:726:34:726:41 | source(...) | user-provided value |
+| LogInjectionTest.java:704:25:704:41 | (...)... | LogInjectionTest.java:704:34:704:41 | source(...) : Object | LogInjectionTest.java:704:25:704:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:704:34:704:41 | source(...) | user-provided value |
+| LogInjectionTest.java:705:130:705:146 | (...)... | LogInjectionTest.java:705:139:705:146 | source(...) : Object | LogInjectionTest.java:705:130:705:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:705:139:705:146 | source(...) | user-provided value |
+| LogInjectionTest.java:706:115:706:131 | (...)... | LogInjectionTest.java:706:124:706:131 | source(...) : Object | LogInjectionTest.java:706:115:706:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:706:124:706:131 | source(...) | user-provided value |
+| LogInjectionTest.java:707:100:707:116 | (...)... | LogInjectionTest.java:707:109:707:116 | source(...) : Object | LogInjectionTest.java:707:100:707:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:707:109:707:116 | source(...) | user-provided value |
+| LogInjectionTest.java:708:85:708:101 | (...)... | LogInjectionTest.java:708:94:708:101 | source(...) : Object | LogInjectionTest.java:708:85:708:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:708:94:708:101 | source(...) | user-provided value |
+| LogInjectionTest.java:709:70:709:86 | (...)... | LogInjectionTest.java:709:79:709:86 | source(...) : Object | LogInjectionTest.java:709:70:709:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:709:79:709:86 | source(...) | user-provided value |
+| LogInjectionTest.java:710:55:710:71 | (...)... | LogInjectionTest.java:710:64:710:71 | source(...) : Object | LogInjectionTest.java:710:55:710:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:710:64:710:71 | source(...) | user-provided value |
+| LogInjectionTest.java:711:40:711:56 | (...)... | LogInjectionTest.java:711:49:711:56 | source(...) : Object | LogInjectionTest.java:711:40:711:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:711:49:711:56 | source(...) | user-provided value |
+| LogInjectionTest.java:712:25:712:41 | (...)... | LogInjectionTest.java:712:34:712:41 | source(...) : Object | LogInjectionTest.java:712:25:712:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:712:34:712:41 | source(...) | user-provided value |
+| LogInjectionTest.java:713:145:713:161 | (...)... | LogInjectionTest.java:713:154:713:161 | source(...) : Object | LogInjectionTest.java:713:145:713:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:713:154:713:161 | source(...) | user-provided value |
+| LogInjectionTest.java:714:130:714:146 | (...)... | LogInjectionTest.java:714:139:714:146 | source(...) : Object | LogInjectionTest.java:714:130:714:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:714:139:714:146 | source(...) | user-provided value |
+| LogInjectionTest.java:715:115:715:131 | (...)... | LogInjectionTest.java:715:124:715:131 | source(...) : Object | LogInjectionTest.java:715:115:715:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:715:124:715:131 | source(...) | user-provided value |
+| LogInjectionTest.java:716:100:716:116 | (...)... | LogInjectionTest.java:716:109:716:116 | source(...) : Object | LogInjectionTest.java:716:100:716:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:716:109:716:116 | source(...) | user-provided value |
+| LogInjectionTest.java:717:85:717:101 | (...)... | LogInjectionTest.java:717:94:717:101 | source(...) : Object | LogInjectionTest.java:717:85:717:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:717:94:717:101 | source(...) | user-provided value |
+| LogInjectionTest.java:718:70:718:86 | (...)... | LogInjectionTest.java:718:79:718:86 | source(...) : Object | LogInjectionTest.java:718:70:718:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:718:79:718:86 | source(...) | user-provided value |
+| LogInjectionTest.java:719:55:719:71 | (...)... | LogInjectionTest.java:719:64:719:71 | source(...) : Object | LogInjectionTest.java:719:55:719:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:719:64:719:71 | source(...) | user-provided value |
+| LogInjectionTest.java:720:40:720:56 | (...)... | LogInjectionTest.java:720:49:720:56 | source(...) : Object | LogInjectionTest.java:720:40:720:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:720:49:720:56 | source(...) | user-provided value |
+| LogInjectionTest.java:721:25:721:41 | (...)... | LogInjectionTest.java:721:34:721:41 | source(...) : Object | LogInjectionTest.java:721:25:721:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:721:34:721:41 | source(...) | user-provided value |
+| LogInjectionTest.java:722:160:722:176 | (...)... | LogInjectionTest.java:722:169:722:176 | source(...) : Object | LogInjectionTest.java:722:160:722:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:722:169:722:176 | source(...) | user-provided value |
+| LogInjectionTest.java:723:145:723:161 | (...)... | LogInjectionTest.java:723:154:723:161 | source(...) : Object | LogInjectionTest.java:723:145:723:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:723:154:723:161 | source(...) | user-provided value |
+| LogInjectionTest.java:724:130:724:146 | (...)... | LogInjectionTest.java:724:139:724:146 | source(...) : Object | LogInjectionTest.java:724:130:724:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:724:139:724:146 | source(...) | user-provided value |
+| LogInjectionTest.java:725:115:725:131 | (...)... | LogInjectionTest.java:725:124:725:131 | source(...) : Object | LogInjectionTest.java:725:115:725:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:725:124:725:131 | source(...) | user-provided value |
+| LogInjectionTest.java:726:100:726:116 | (...)... | LogInjectionTest.java:726:109:726:116 | source(...) : Object | LogInjectionTest.java:726:100:726:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:726:109:726:116 | source(...) | user-provided value |
 | LogInjectionTest.java:727:85:727:101 | (...)... | LogInjectionTest.java:727:94:727:101 | source(...) : Object | LogInjectionTest.java:727:85:727:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:727:94:727:101 | source(...) | user-provided value |
 | LogInjectionTest.java:728:70:728:86 | (...)... | LogInjectionTest.java:728:79:728:86 | source(...) : Object | LogInjectionTest.java:728:70:728:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:728:79:728:86 | source(...) | user-provided value |
 | LogInjectionTest.java:729:55:729:71 | (...)... | LogInjectionTest.java:729:64:729:71 | source(...) : Object | LogInjectionTest.java:729:55:729:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:729:64:729:71 | source(...) | user-provided value |
 | LogInjectionTest.java:730:40:730:56 | (...)... | LogInjectionTest.java:730:49:730:56 | source(...) : Object | LogInjectionTest.java:730:40:730:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:730:49:730:56 | source(...) | user-provided value |
 | LogInjectionTest.java:731:25:731:41 | (...)... | LogInjectionTest.java:731:34:731:41 | source(...) : Object | LogInjectionTest.java:731:25:731:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:731:34:731:41 | source(...) | user-provided value |
-| LogInjectionTest.java:732:100:732:116 | (...)... | LogInjectionTest.java:732:109:732:116 | source(...) : Object | LogInjectionTest.java:732:100:732:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:732:109:732:116 | source(...) | user-provided value |
-| LogInjectionTest.java:733:85:733:101 | (...)... | LogInjectionTest.java:733:94:733:101 | source(...) : Object | LogInjectionTest.java:733:85:733:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:733:94:733:101 | source(...) | user-provided value |
-| LogInjectionTest.java:734:70:734:86 | (...)... | LogInjectionTest.java:734:79:734:86 | source(...) : Object | LogInjectionTest.java:734:70:734:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:734:79:734:86 | source(...) | user-provided value |
-| LogInjectionTest.java:735:55:735:71 | (...)... | LogInjectionTest.java:735:64:735:71 | source(...) : Object | LogInjectionTest.java:735:55:735:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:735:64:735:71 | source(...) | user-provided value |
-| LogInjectionTest.java:736:40:736:56 | (...)... | LogInjectionTest.java:736:49:736:56 | source(...) : Object | LogInjectionTest.java:736:40:736:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:736:49:736:56 | source(...) | user-provided value |
-| LogInjectionTest.java:737:25:737:41 | (...)... | LogInjectionTest.java:737:34:737:41 | source(...) : Object | LogInjectionTest.java:737:25:737:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:737:34:737:41 | source(...) | user-provided value |
-| LogInjectionTest.java:738:115:738:131 | (...)... | LogInjectionTest.java:738:124:738:131 | source(...) : Object | LogInjectionTest.java:738:115:738:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:738:124:738:131 | source(...) | user-provided value |
-| LogInjectionTest.java:739:100:739:116 | (...)... | LogInjectionTest.java:739:109:739:116 | source(...) : Object | LogInjectionTest.java:739:100:739:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:739:109:739:116 | source(...) | user-provided value |
-| LogInjectionTest.java:740:85:740:101 | (...)... | LogInjectionTest.java:740:94:740:101 | source(...) : Object | LogInjectionTest.java:740:85:740:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:740:94:740:101 | source(...) | user-provided value |
-| LogInjectionTest.java:741:70:741:86 | (...)... | LogInjectionTest.java:741:79:741:86 | source(...) : Object | LogInjectionTest.java:741:70:741:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:741:79:741:86 | source(...) | user-provided value |
-| LogInjectionTest.java:742:55:742:71 | (...)... | LogInjectionTest.java:742:64:742:71 | source(...) : Object | LogInjectionTest.java:742:55:742:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:742:64:742:71 | source(...) | user-provided value |
-| LogInjectionTest.java:743:40:743:56 | (...)... | LogInjectionTest.java:743:49:743:56 | source(...) : Object | LogInjectionTest.java:743:40:743:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:743:49:743:56 | source(...) | user-provided value |
-| LogInjectionTest.java:744:25:744:41 | (...)... | LogInjectionTest.java:744:34:744:41 | source(...) : Object | LogInjectionTest.java:744:25:744:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:744:34:744:41 | source(...) | user-provided value |
-| LogInjectionTest.java:745:130:745:146 | (...)... | LogInjectionTest.java:745:139:745:146 | source(...) : Object | LogInjectionTest.java:745:130:745:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:745:139:745:146 | source(...) | user-provided value |
-| LogInjectionTest.java:746:115:746:131 | (...)... | LogInjectionTest.java:746:124:746:131 | source(...) : Object | LogInjectionTest.java:746:115:746:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:746:124:746:131 | source(...) | user-provided value |
-| LogInjectionTest.java:747:100:747:116 | (...)... | LogInjectionTest.java:747:109:747:116 | source(...) : Object | LogInjectionTest.java:747:100:747:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:747:109:747:116 | source(...) | user-provided value |
-| LogInjectionTest.java:748:85:748:101 | (...)... | LogInjectionTest.java:748:94:748:101 | source(...) : Object | LogInjectionTest.java:748:85:748:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:748:94:748:101 | source(...) | user-provided value |
-| LogInjectionTest.java:749:70:749:86 | (...)... | LogInjectionTest.java:749:79:749:86 | source(...) : Object | LogInjectionTest.java:749:70:749:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:749:79:749:86 | source(...) | user-provided value |
-| LogInjectionTest.java:750:55:750:71 | (...)... | LogInjectionTest.java:750:64:750:71 | source(...) : Object | LogInjectionTest.java:750:55:750:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:750:64:750:71 | source(...) | user-provided value |
-| LogInjectionTest.java:751:40:751:56 | (...)... | LogInjectionTest.java:751:49:751:56 | source(...) : Object | LogInjectionTest.java:751:40:751:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:751:49:751:56 | source(...) | user-provided value |
-| LogInjectionTest.java:752:25:752:41 | (...)... | LogInjectionTest.java:752:34:752:41 | source(...) : Object | LogInjectionTest.java:752:25:752:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:752:34:752:41 | source(...) | user-provided value |
-| LogInjectionTest.java:753:145:753:161 | (...)... | LogInjectionTest.java:753:154:753:161 | source(...) : Object | LogInjectionTest.java:753:145:753:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:753:154:753:161 | source(...) | user-provided value |
-| LogInjectionTest.java:754:130:754:146 | (...)... | LogInjectionTest.java:754:139:754:146 | source(...) : Object | LogInjectionTest.java:754:130:754:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:754:139:754:146 | source(...) | user-provided value |
-| LogInjectionTest.java:755:115:755:131 | (...)... | LogInjectionTest.java:755:124:755:131 | source(...) : Object | LogInjectionTest.java:755:115:755:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:755:124:755:131 | source(...) | user-provided value |
-| LogInjectionTest.java:756:100:756:116 | (...)... | LogInjectionTest.java:756:109:756:116 | source(...) : Object | LogInjectionTest.java:756:100:756:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:756:109:756:116 | source(...) | user-provided value |
-| LogInjectionTest.java:757:85:757:101 | (...)... | LogInjectionTest.java:757:94:757:101 | source(...) : Object | LogInjectionTest.java:757:85:757:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:757:94:757:101 | source(...) | user-provided value |
-| LogInjectionTest.java:758:70:758:86 | (...)... | LogInjectionTest.java:758:79:758:86 | source(...) : Object | LogInjectionTest.java:758:70:758:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:758:79:758:86 | source(...) | user-provided value |
-| LogInjectionTest.java:759:55:759:71 | (...)... | LogInjectionTest.java:759:64:759:71 | source(...) : Object | LogInjectionTest.java:759:55:759:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:759:64:759:71 | source(...) | user-provided value |
-| LogInjectionTest.java:760:40:760:56 | (...)... | LogInjectionTest.java:760:49:760:56 | source(...) : Object | LogInjectionTest.java:760:40:760:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:760:49:760:56 | source(...) | user-provided value |
-| LogInjectionTest.java:761:25:761:41 | (...)... | LogInjectionTest.java:761:34:761:41 | source(...) : Object | LogInjectionTest.java:761:25:761:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:761:34:761:41 | source(...) | user-provided value |
-| LogInjectionTest.java:762:160:762:176 | (...)... | LogInjectionTest.java:762:169:762:176 | source(...) : Object | LogInjectionTest.java:762:160:762:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:762:169:762:176 | source(...) | user-provided value |
-| LogInjectionTest.java:763:145:763:161 | (...)... | LogInjectionTest.java:763:154:763:161 | source(...) : Object | LogInjectionTest.java:763:145:763:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:763:154:763:161 | source(...) | user-provided value |
-| LogInjectionTest.java:764:130:764:146 | (...)... | LogInjectionTest.java:764:139:764:146 | source(...) : Object | LogInjectionTest.java:764:130:764:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:764:139:764:146 | source(...) | user-provided value |
-| LogInjectionTest.java:765:115:765:131 | (...)... | LogInjectionTest.java:765:124:765:131 | source(...) : Object | LogInjectionTest.java:765:115:765:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:765:124:765:131 | source(...) | user-provided value |
-| LogInjectionTest.java:766:100:766:116 | (...)... | LogInjectionTest.java:766:109:766:116 | source(...) : Object | LogInjectionTest.java:766:100:766:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:766:109:766:116 | source(...) | user-provided value |
-| LogInjectionTest.java:767:85:767:101 | (...)... | LogInjectionTest.java:767:94:767:101 | source(...) : Object | LogInjectionTest.java:767:85:767:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:767:94:767:101 | source(...) | user-provided value |
-| LogInjectionTest.java:768:70:768:86 | (...)... | LogInjectionTest.java:768:79:768:86 | source(...) : Object | LogInjectionTest.java:768:70:768:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:768:79:768:86 | source(...) | user-provided value |
-| LogInjectionTest.java:769:55:769:71 | (...)... | LogInjectionTest.java:769:64:769:71 | source(...) : Object | LogInjectionTest.java:769:55:769:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:769:64:769:71 | source(...) | user-provided value |
-| LogInjectionTest.java:770:40:770:56 | (...)... | LogInjectionTest.java:770:49:770:56 | source(...) : Object | LogInjectionTest.java:770:40:770:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:770:49:770:56 | source(...) | user-provided value |
-| LogInjectionTest.java:771:25:771:41 | (...)... | LogInjectionTest.java:771:34:771:41 | source(...) : Object | LogInjectionTest.java:771:25:771:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:771:34:771:41 | source(...) | user-provided value |
-| LogInjectionTest.java:772:25:772:41 | (...)... | LogInjectionTest.java:772:34:772:41 | source(...) : Object | LogInjectionTest.java:772:25:772:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:772:34:772:41 | source(...) | user-provided value |
-| LogInjectionTest.java:773:40:773:61 | (...)... | LogInjectionTest.java:773:54:773:61 | source(...) : Object | LogInjectionTest.java:773:40:773:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:773:54:773:61 | source(...) | user-provided value |
-| LogInjectionTest.java:774:25:774:41 | (...)... | LogInjectionTest.java:774:34:774:41 | source(...) : Object | LogInjectionTest.java:774:25:774:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:774:34:774:41 | source(...) | user-provided value |
-| LogInjectionTest.java:775:25:775:46 | (...)... | LogInjectionTest.java:775:39:775:46 | source(...) : Object | LogInjectionTest.java:775:25:775:46 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:775:39:775:46 | source(...) | user-provided value |
-| LogInjectionTest.java:776:25:776:46 | (...)... | LogInjectionTest.java:776:39:776:46 | source(...) : Object | LogInjectionTest.java:776:25:776:46 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:776:39:776:46 | source(...) | user-provided value |
-| LogInjectionTest.java:777:38:777:60 | (...)... | LogInjectionTest.java:777:53:777:60 | source(...) : Object | LogInjectionTest.java:777:38:777:60 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:777:53:777:60 | source(...) | user-provided value |
-| LogInjectionTest.java:778:38:778:60 | (...)... | LogInjectionTest.java:778:53:778:60 | source(...) : Object | LogInjectionTest.java:778:38:778:60 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:778:53:778:60 | source(...) | user-provided value |
-| LogInjectionTest.java:779:53:779:75 | (...)... | LogInjectionTest.java:779:68:779:75 | source(...) : Object | LogInjectionTest.java:779:53:779:75 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:779:68:779:75 | source(...) | user-provided value |
-| LogInjectionTest.java:780:53:780:75 | (...)... | LogInjectionTest.java:780:68:780:75 | source(...) : Object | LogInjectionTest.java:780:53:780:75 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:780:68:780:75 | source(...) | user-provided value |
-| LogInjectionTest.java:781:53:781:70 | (...)... | LogInjectionTest.java:781:63:781:70 | source(...) : Object | LogInjectionTest.java:781:53:781:70 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:781:63:781:70 | source(...) | user-provided value |
-| LogInjectionTest.java:782:53:782:78 | (...)... | LogInjectionTest.java:782:71:782:78 | source(...) : Object | LogInjectionTest.java:782:53:782:78 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:782:71:782:78 | source(...) | user-provided value |
-| LogInjectionTest.java:783:53:783:78 | (...)... | LogInjectionTest.java:783:71:783:78 | source(...) : Object | LogInjectionTest.java:783:53:783:78 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:783:71:783:78 | source(...) | user-provided value |
-| LogInjectionTest.java:784:53:784:60 | source(...) | LogInjectionTest.java:784:53:784:60 | source(...) | LogInjectionTest.java:784:53:784:60 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:784:53:784:60 | source(...) | user-provided value |
-| LogInjectionTest.java:785:53:785:69 | (...)... | LogInjectionTest.java:785:62:785:69 | source(...) : Object | LogInjectionTest.java:785:53:785:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:785:62:785:69 | source(...) | user-provided value |
-| LogInjectionTest.java:786:53:786:69 | (...)... | LogInjectionTest.java:786:62:786:69 | source(...) : Object | LogInjectionTest.java:786:53:786:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:786:62:786:69 | source(...) | user-provided value |
-| LogInjectionTest.java:787:68:787:90 | new Object[] | LogInjectionTest.java:787:82:787:89 | source(...) : Object | LogInjectionTest.java:787:68:787:90 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:787:82:787:89 | source(...) | user-provided value |
-| LogInjectionTest.java:788:68:788:84 | (...)... | LogInjectionTest.java:788:77:788:84 | source(...) : Object | LogInjectionTest.java:788:68:788:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:788:77:788:84 | source(...) | user-provided value |
-| LogInjectionTest.java:789:53:789:69 | (...)... | LogInjectionTest.java:789:62:789:69 | source(...) : Object | LogInjectionTest.java:789:53:789:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:789:62:789:69 | source(...) | user-provided value |
-| LogInjectionTest.java:790:83:790:99 | (...)... | LogInjectionTest.java:790:92:790:99 | source(...) : Object | LogInjectionTest.java:790:83:790:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:790:92:790:99 | source(...) | user-provided value |
-| LogInjectionTest.java:791:68:791:84 | (...)... | LogInjectionTest.java:791:77:791:84 | source(...) : Object | LogInjectionTest.java:791:68:791:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:791:77:791:84 | source(...) | user-provided value |
-| LogInjectionTest.java:792:53:792:69 | (...)... | LogInjectionTest.java:792:62:792:69 | source(...) : Object | LogInjectionTest.java:792:53:792:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:792:62:792:69 | source(...) | user-provided value |
-| LogInjectionTest.java:793:98:793:114 | (...)... | LogInjectionTest.java:793:107:793:114 | source(...) : Object | LogInjectionTest.java:793:98:793:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:793:107:793:114 | source(...) | user-provided value |
-| LogInjectionTest.java:794:83:794:99 | (...)... | LogInjectionTest.java:794:92:794:99 | source(...) : Object | LogInjectionTest.java:794:83:794:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:794:92:794:99 | source(...) | user-provided value |
-| LogInjectionTest.java:795:68:795:84 | (...)... | LogInjectionTest.java:795:77:795:84 | source(...) : Object | LogInjectionTest.java:795:68:795:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:795:77:795:84 | source(...) | user-provided value |
-| LogInjectionTest.java:796:53:796:69 | (...)... | LogInjectionTest.java:796:62:796:69 | source(...) : Object | LogInjectionTest.java:796:53:796:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:796:62:796:69 | source(...) | user-provided value |
+| LogInjectionTest.java:732:25:732:41 | (...)... | LogInjectionTest.java:732:34:732:41 | source(...) : Object | LogInjectionTest.java:732:25:732:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:732:34:732:41 | source(...) | user-provided value |
+| LogInjectionTest.java:733:40:733:61 | (...)... | LogInjectionTest.java:733:54:733:61 | source(...) : Object | LogInjectionTest.java:733:40:733:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:733:54:733:61 | source(...) | user-provided value |
+| LogInjectionTest.java:734:25:734:41 | (...)... | LogInjectionTest.java:734:34:734:41 | source(...) : Object | LogInjectionTest.java:734:25:734:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:734:34:734:41 | source(...) | user-provided value |
+| LogInjectionTest.java:735:25:735:46 | (...)... | LogInjectionTest.java:735:39:735:46 | source(...) : Object | LogInjectionTest.java:735:25:735:46 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:735:39:735:46 | source(...) | user-provided value |
+| LogInjectionTest.java:736:25:736:46 | (...)... | LogInjectionTest.java:736:39:736:46 | source(...) : Object | LogInjectionTest.java:736:25:736:46 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:736:39:736:46 | source(...) | user-provided value |
+| LogInjectionTest.java:737:38:737:60 | (...)... | LogInjectionTest.java:737:53:737:60 | source(...) : Object | LogInjectionTest.java:737:38:737:60 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:737:53:737:60 | source(...) | user-provided value |
+| LogInjectionTest.java:738:38:738:60 | (...)... | LogInjectionTest.java:738:53:738:60 | source(...) : Object | LogInjectionTest.java:738:38:738:60 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:738:53:738:60 | source(...) | user-provided value |
+| LogInjectionTest.java:739:53:739:75 | (...)... | LogInjectionTest.java:739:68:739:75 | source(...) : Object | LogInjectionTest.java:739:53:739:75 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:739:68:739:75 | source(...) | user-provided value |
+| LogInjectionTest.java:740:53:740:75 | (...)... | LogInjectionTest.java:740:68:740:75 | source(...) : Object | LogInjectionTest.java:740:53:740:75 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:740:68:740:75 | source(...) | user-provided value |
+| LogInjectionTest.java:741:53:741:70 | (...)... | LogInjectionTest.java:741:63:741:70 | source(...) : Object | LogInjectionTest.java:741:53:741:70 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:741:63:741:70 | source(...) | user-provided value |
+| LogInjectionTest.java:742:53:742:78 | (...)... | LogInjectionTest.java:742:71:742:78 | source(...) : Object | LogInjectionTest.java:742:53:742:78 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:742:71:742:78 | source(...) | user-provided value |
+| LogInjectionTest.java:743:53:743:78 | (...)... | LogInjectionTest.java:743:71:743:78 | source(...) : Object | LogInjectionTest.java:743:53:743:78 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:743:71:743:78 | source(...) | user-provided value |
+| LogInjectionTest.java:744:53:744:60 | source(...) | LogInjectionTest.java:744:53:744:60 | source(...) | LogInjectionTest.java:744:53:744:60 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:744:53:744:60 | source(...) | user-provided value |
+| LogInjectionTest.java:745:53:745:69 | (...)... | LogInjectionTest.java:745:62:745:69 | source(...) : Object | LogInjectionTest.java:745:53:745:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:745:62:745:69 | source(...) | user-provided value |
+| LogInjectionTest.java:746:53:746:69 | (...)... | LogInjectionTest.java:746:62:746:69 | source(...) : Object | LogInjectionTest.java:746:53:746:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:746:62:746:69 | source(...) | user-provided value |
+| LogInjectionTest.java:747:68:747:90 | new Object[] | LogInjectionTest.java:747:82:747:89 | source(...) : Object | LogInjectionTest.java:747:68:747:90 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:747:82:747:89 | source(...) | user-provided value |
+| LogInjectionTest.java:748:68:748:84 | (...)... | LogInjectionTest.java:748:77:748:84 | source(...) : Object | LogInjectionTest.java:748:68:748:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:748:77:748:84 | source(...) | user-provided value |
+| LogInjectionTest.java:749:53:749:69 | (...)... | LogInjectionTest.java:749:62:749:69 | source(...) : Object | LogInjectionTest.java:749:53:749:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:749:62:749:69 | source(...) | user-provided value |
+| LogInjectionTest.java:750:83:750:99 | (...)... | LogInjectionTest.java:750:92:750:99 | source(...) : Object | LogInjectionTest.java:750:83:750:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:750:92:750:99 | source(...) | user-provided value |
+| LogInjectionTest.java:751:68:751:84 | (...)... | LogInjectionTest.java:751:77:751:84 | source(...) : Object | LogInjectionTest.java:751:68:751:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:751:77:751:84 | source(...) | user-provided value |
+| LogInjectionTest.java:752:53:752:69 | (...)... | LogInjectionTest.java:752:62:752:69 | source(...) : Object | LogInjectionTest.java:752:53:752:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:752:62:752:69 | source(...) | user-provided value |
+| LogInjectionTest.java:753:98:753:114 | (...)... | LogInjectionTest.java:753:107:753:114 | source(...) : Object | LogInjectionTest.java:753:98:753:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:753:107:753:114 | source(...) | user-provided value |
+| LogInjectionTest.java:754:83:754:99 | (...)... | LogInjectionTest.java:754:92:754:99 | source(...) : Object | LogInjectionTest.java:754:83:754:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:754:92:754:99 | source(...) | user-provided value |
+| LogInjectionTest.java:755:68:755:84 | (...)... | LogInjectionTest.java:755:77:755:84 | source(...) : Object | LogInjectionTest.java:755:68:755:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:755:77:755:84 | source(...) | user-provided value |
+| LogInjectionTest.java:756:53:756:69 | (...)... | LogInjectionTest.java:756:62:756:69 | source(...) : Object | LogInjectionTest.java:756:53:756:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:756:62:756:69 | source(...) | user-provided value |
+| LogInjectionTest.java:757:113:757:129 | (...)... | LogInjectionTest.java:757:122:757:129 | source(...) : Object | LogInjectionTest.java:757:113:757:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:757:122:757:129 | source(...) | user-provided value |
+| LogInjectionTest.java:758:98:758:114 | (...)... | LogInjectionTest.java:758:107:758:114 | source(...) : Object | LogInjectionTest.java:758:98:758:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:758:107:758:114 | source(...) | user-provided value |
+| LogInjectionTest.java:759:83:759:99 | (...)... | LogInjectionTest.java:759:92:759:99 | source(...) : Object | LogInjectionTest.java:759:83:759:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:759:92:759:99 | source(...) | user-provided value |
+| LogInjectionTest.java:760:68:760:84 | (...)... | LogInjectionTest.java:760:77:760:84 | source(...) : Object | LogInjectionTest.java:760:68:760:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:760:77:760:84 | source(...) | user-provided value |
+| LogInjectionTest.java:761:53:761:69 | (...)... | LogInjectionTest.java:761:62:761:69 | source(...) : Object | LogInjectionTest.java:761:53:761:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:761:62:761:69 | source(...) | user-provided value |
+| LogInjectionTest.java:762:128:762:144 | (...)... | LogInjectionTest.java:762:137:762:144 | source(...) : Object | LogInjectionTest.java:762:128:762:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:762:137:762:144 | source(...) | user-provided value |
+| LogInjectionTest.java:763:113:763:129 | (...)... | LogInjectionTest.java:763:122:763:129 | source(...) : Object | LogInjectionTest.java:763:113:763:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:763:122:763:129 | source(...) | user-provided value |
+| LogInjectionTest.java:764:98:764:114 | (...)... | LogInjectionTest.java:764:107:764:114 | source(...) : Object | LogInjectionTest.java:764:98:764:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:764:107:764:114 | source(...) | user-provided value |
+| LogInjectionTest.java:765:83:765:99 | (...)... | LogInjectionTest.java:765:92:765:99 | source(...) : Object | LogInjectionTest.java:765:83:765:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:765:92:765:99 | source(...) | user-provided value |
+| LogInjectionTest.java:766:68:766:84 | (...)... | LogInjectionTest.java:766:77:766:84 | source(...) : Object | LogInjectionTest.java:766:68:766:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:766:77:766:84 | source(...) | user-provided value |
+| LogInjectionTest.java:767:53:767:69 | (...)... | LogInjectionTest.java:767:62:767:69 | source(...) : Object | LogInjectionTest.java:767:53:767:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:767:62:767:69 | source(...) | user-provided value |
+| LogInjectionTest.java:768:143:768:159 | (...)... | LogInjectionTest.java:768:152:768:159 | source(...) : Object | LogInjectionTest.java:768:143:768:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:768:152:768:159 | source(...) | user-provided value |
+| LogInjectionTest.java:769:128:769:144 | (...)... | LogInjectionTest.java:769:137:769:144 | source(...) : Object | LogInjectionTest.java:769:128:769:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:769:137:769:144 | source(...) | user-provided value |
+| LogInjectionTest.java:770:113:770:129 | (...)... | LogInjectionTest.java:770:122:770:129 | source(...) : Object | LogInjectionTest.java:770:113:770:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:770:122:770:129 | source(...) | user-provided value |
+| LogInjectionTest.java:771:98:771:114 | (...)... | LogInjectionTest.java:771:107:771:114 | source(...) : Object | LogInjectionTest.java:771:98:771:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:771:107:771:114 | source(...) | user-provided value |
+| LogInjectionTest.java:772:83:772:99 | (...)... | LogInjectionTest.java:772:92:772:99 | source(...) : Object | LogInjectionTest.java:772:83:772:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:772:92:772:99 | source(...) | user-provided value |
+| LogInjectionTest.java:773:68:773:84 | (...)... | LogInjectionTest.java:773:77:773:84 | source(...) : Object | LogInjectionTest.java:773:68:773:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:773:77:773:84 | source(...) | user-provided value |
+| LogInjectionTest.java:774:53:774:69 | (...)... | LogInjectionTest.java:774:62:774:69 | source(...) : Object | LogInjectionTest.java:774:53:774:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:774:62:774:69 | source(...) | user-provided value |
+| LogInjectionTest.java:775:158:775:174 | (...)... | LogInjectionTest.java:775:167:775:174 | source(...) : Object | LogInjectionTest.java:775:158:775:174 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:775:167:775:174 | source(...) | user-provided value |
+| LogInjectionTest.java:776:143:776:159 | (...)... | LogInjectionTest.java:776:152:776:159 | source(...) : Object | LogInjectionTest.java:776:143:776:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:776:152:776:159 | source(...) | user-provided value |
+| LogInjectionTest.java:777:128:777:144 | (...)... | LogInjectionTest.java:777:137:777:144 | source(...) : Object | LogInjectionTest.java:777:128:777:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:777:137:777:144 | source(...) | user-provided value |
+| LogInjectionTest.java:778:113:778:129 | (...)... | LogInjectionTest.java:778:122:778:129 | source(...) : Object | LogInjectionTest.java:778:113:778:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:778:122:778:129 | source(...) | user-provided value |
+| LogInjectionTest.java:779:98:779:114 | (...)... | LogInjectionTest.java:779:107:779:114 | source(...) : Object | LogInjectionTest.java:779:98:779:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:779:107:779:114 | source(...) | user-provided value |
+| LogInjectionTest.java:780:83:780:99 | (...)... | LogInjectionTest.java:780:92:780:99 | source(...) : Object | LogInjectionTest.java:780:83:780:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:780:92:780:99 | source(...) | user-provided value |
+| LogInjectionTest.java:781:68:781:84 | (...)... | LogInjectionTest.java:781:77:781:84 | source(...) : Object | LogInjectionTest.java:781:68:781:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:781:77:781:84 | source(...) | user-provided value |
+| LogInjectionTest.java:782:53:782:69 | (...)... | LogInjectionTest.java:782:62:782:69 | source(...) : Object | LogInjectionTest.java:782:53:782:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:782:62:782:69 | source(...) | user-provided value |
+| LogInjectionTest.java:783:173:783:189 | (...)... | LogInjectionTest.java:783:182:783:189 | source(...) : Object | LogInjectionTest.java:783:173:783:189 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:783:182:783:189 | source(...) | user-provided value |
+| LogInjectionTest.java:784:158:784:174 | (...)... | LogInjectionTest.java:784:167:784:174 | source(...) : Object | LogInjectionTest.java:784:158:784:174 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:784:167:784:174 | source(...) | user-provided value |
+| LogInjectionTest.java:785:143:785:159 | (...)... | LogInjectionTest.java:785:152:785:159 | source(...) : Object | LogInjectionTest.java:785:143:785:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:785:152:785:159 | source(...) | user-provided value |
+| LogInjectionTest.java:786:128:786:144 | (...)... | LogInjectionTest.java:786:137:786:144 | source(...) : Object | LogInjectionTest.java:786:128:786:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:786:137:786:144 | source(...) | user-provided value |
+| LogInjectionTest.java:787:113:787:129 | (...)... | LogInjectionTest.java:787:122:787:129 | source(...) : Object | LogInjectionTest.java:787:113:787:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:787:122:787:129 | source(...) | user-provided value |
+| LogInjectionTest.java:788:98:788:114 | (...)... | LogInjectionTest.java:788:107:788:114 | source(...) : Object | LogInjectionTest.java:788:98:788:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:788:107:788:114 | source(...) | user-provided value |
+| LogInjectionTest.java:789:83:789:99 | (...)... | LogInjectionTest.java:789:92:789:99 | source(...) : Object | LogInjectionTest.java:789:83:789:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:789:92:789:99 | source(...) | user-provided value |
+| LogInjectionTest.java:790:68:790:84 | (...)... | LogInjectionTest.java:790:77:790:84 | source(...) : Object | LogInjectionTest.java:790:68:790:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:790:77:790:84 | source(...) | user-provided value |
+| LogInjectionTest.java:791:53:791:69 | (...)... | LogInjectionTest.java:791:62:791:69 | source(...) : Object | LogInjectionTest.java:791:53:791:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:791:62:791:69 | source(...) | user-provided value |
+| LogInjectionTest.java:792:188:792:204 | (...)... | LogInjectionTest.java:792:197:792:204 | source(...) : Object | LogInjectionTest.java:792:188:792:204 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:792:197:792:204 | source(...) | user-provided value |
+| LogInjectionTest.java:793:173:793:189 | (...)... | LogInjectionTest.java:793:182:793:189 | source(...) : Object | LogInjectionTest.java:793:173:793:189 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:793:182:793:189 | source(...) | user-provided value |
+| LogInjectionTest.java:794:158:794:174 | (...)... | LogInjectionTest.java:794:167:794:174 | source(...) : Object | LogInjectionTest.java:794:158:794:174 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:794:167:794:174 | source(...) | user-provided value |
+| LogInjectionTest.java:795:143:795:159 | (...)... | LogInjectionTest.java:795:152:795:159 | source(...) : Object | LogInjectionTest.java:795:143:795:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:795:152:795:159 | source(...) | user-provided value |
+| LogInjectionTest.java:796:128:796:144 | (...)... | LogInjectionTest.java:796:137:796:144 | source(...) : Object | LogInjectionTest.java:796:128:796:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:796:137:796:144 | source(...) | user-provided value |
 | LogInjectionTest.java:797:113:797:129 | (...)... | LogInjectionTest.java:797:122:797:129 | source(...) : Object | LogInjectionTest.java:797:113:797:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:797:122:797:129 | source(...) | user-provided value |
 | LogInjectionTest.java:798:98:798:114 | (...)... | LogInjectionTest.java:798:107:798:114 | source(...) : Object | LogInjectionTest.java:798:98:798:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:798:107:798:114 | source(...) | user-provided value |
 | LogInjectionTest.java:799:83:799:99 | (...)... | LogInjectionTest.java:799:92:799:99 | source(...) : Object | LogInjectionTest.java:799:83:799:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:799:92:799:99 | source(...) | user-provided value |
 | LogInjectionTest.java:800:68:800:84 | (...)... | LogInjectionTest.java:800:77:800:84 | source(...) : Object | LogInjectionTest.java:800:68:800:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:800:77:800:84 | source(...) | user-provided value |
 | LogInjectionTest.java:801:53:801:69 | (...)... | LogInjectionTest.java:801:62:801:69 | source(...) : Object | LogInjectionTest.java:801:53:801:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:801:62:801:69 | source(...) | user-provided value |
-| LogInjectionTest.java:802:128:802:144 | (...)... | LogInjectionTest.java:802:137:802:144 | source(...) : Object | LogInjectionTest.java:802:128:802:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:802:137:802:144 | source(...) | user-provided value |
-| LogInjectionTest.java:803:113:803:129 | (...)... | LogInjectionTest.java:803:122:803:129 | source(...) : Object | LogInjectionTest.java:803:113:803:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:803:122:803:129 | source(...) | user-provided value |
-| LogInjectionTest.java:804:98:804:114 | (...)... | LogInjectionTest.java:804:107:804:114 | source(...) : Object | LogInjectionTest.java:804:98:804:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:804:107:804:114 | source(...) | user-provided value |
-| LogInjectionTest.java:805:83:805:99 | (...)... | LogInjectionTest.java:805:92:805:99 | source(...) : Object | LogInjectionTest.java:805:83:805:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:805:92:805:99 | source(...) | user-provided value |
-| LogInjectionTest.java:806:68:806:84 | (...)... | LogInjectionTest.java:806:77:806:84 | source(...) : Object | LogInjectionTest.java:806:68:806:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:806:77:806:84 | source(...) | user-provided value |
-| LogInjectionTest.java:807:53:807:69 | (...)... | LogInjectionTest.java:807:62:807:69 | source(...) : Object | LogInjectionTest.java:807:53:807:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:807:62:807:69 | source(...) | user-provided value |
-| LogInjectionTest.java:808:143:808:159 | (...)... | LogInjectionTest.java:808:152:808:159 | source(...) : Object | LogInjectionTest.java:808:143:808:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:808:152:808:159 | source(...) | user-provided value |
-| LogInjectionTest.java:809:128:809:144 | (...)... | LogInjectionTest.java:809:137:809:144 | source(...) : Object | LogInjectionTest.java:809:128:809:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:809:137:809:144 | source(...) | user-provided value |
-| LogInjectionTest.java:810:113:810:129 | (...)... | LogInjectionTest.java:810:122:810:129 | source(...) : Object | LogInjectionTest.java:810:113:810:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:810:122:810:129 | source(...) | user-provided value |
-| LogInjectionTest.java:811:98:811:114 | (...)... | LogInjectionTest.java:811:107:811:114 | source(...) : Object | LogInjectionTest.java:811:98:811:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:811:107:811:114 | source(...) | user-provided value |
-| LogInjectionTest.java:812:83:812:99 | (...)... | LogInjectionTest.java:812:92:812:99 | source(...) : Object | LogInjectionTest.java:812:83:812:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:812:92:812:99 | source(...) | user-provided value |
-| LogInjectionTest.java:813:68:813:84 | (...)... | LogInjectionTest.java:813:77:813:84 | source(...) : Object | LogInjectionTest.java:813:68:813:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:813:77:813:84 | source(...) | user-provided value |
-| LogInjectionTest.java:814:53:814:69 | (...)... | LogInjectionTest.java:814:62:814:69 | source(...) : Object | LogInjectionTest.java:814:53:814:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:814:62:814:69 | source(...) | user-provided value |
-| LogInjectionTest.java:815:158:815:174 | (...)... | LogInjectionTest.java:815:167:815:174 | source(...) : Object | LogInjectionTest.java:815:158:815:174 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:815:167:815:174 | source(...) | user-provided value |
-| LogInjectionTest.java:816:143:816:159 | (...)... | LogInjectionTest.java:816:152:816:159 | source(...) : Object | LogInjectionTest.java:816:143:816:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:816:152:816:159 | source(...) | user-provided value |
-| LogInjectionTest.java:817:128:817:144 | (...)... | LogInjectionTest.java:817:137:817:144 | source(...) : Object | LogInjectionTest.java:817:128:817:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:817:137:817:144 | source(...) | user-provided value |
-| LogInjectionTest.java:818:113:818:129 | (...)... | LogInjectionTest.java:818:122:818:129 | source(...) : Object | LogInjectionTest.java:818:113:818:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:818:122:818:129 | source(...) | user-provided value |
-| LogInjectionTest.java:819:98:819:114 | (...)... | LogInjectionTest.java:819:107:819:114 | source(...) : Object | LogInjectionTest.java:819:98:819:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:819:107:819:114 | source(...) | user-provided value |
-| LogInjectionTest.java:820:83:820:99 | (...)... | LogInjectionTest.java:820:92:820:99 | source(...) : Object | LogInjectionTest.java:820:83:820:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:820:92:820:99 | source(...) | user-provided value |
-| LogInjectionTest.java:821:68:821:84 | (...)... | LogInjectionTest.java:821:77:821:84 | source(...) : Object | LogInjectionTest.java:821:68:821:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:821:77:821:84 | source(...) | user-provided value |
-| LogInjectionTest.java:822:53:822:69 | (...)... | LogInjectionTest.java:822:62:822:69 | source(...) : Object | LogInjectionTest.java:822:53:822:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:822:62:822:69 | source(...) | user-provided value |
-| LogInjectionTest.java:823:173:823:189 | (...)... | LogInjectionTest.java:823:182:823:189 | source(...) : Object | LogInjectionTest.java:823:173:823:189 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:823:182:823:189 | source(...) | user-provided value |
-| LogInjectionTest.java:824:158:824:174 | (...)... | LogInjectionTest.java:824:167:824:174 | source(...) : Object | LogInjectionTest.java:824:158:824:174 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:824:167:824:174 | source(...) | user-provided value |
-| LogInjectionTest.java:825:143:825:159 | (...)... | LogInjectionTest.java:825:152:825:159 | source(...) : Object | LogInjectionTest.java:825:143:825:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:825:152:825:159 | source(...) | user-provided value |
-| LogInjectionTest.java:826:128:826:144 | (...)... | LogInjectionTest.java:826:137:826:144 | source(...) : Object | LogInjectionTest.java:826:128:826:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:826:137:826:144 | source(...) | user-provided value |
-| LogInjectionTest.java:827:113:827:129 | (...)... | LogInjectionTest.java:827:122:827:129 | source(...) : Object | LogInjectionTest.java:827:113:827:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:827:122:827:129 | source(...) | user-provided value |
-| LogInjectionTest.java:828:98:828:114 | (...)... | LogInjectionTest.java:828:107:828:114 | source(...) : Object | LogInjectionTest.java:828:98:828:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:828:107:828:114 | source(...) | user-provided value |
-| LogInjectionTest.java:829:83:829:99 | (...)... | LogInjectionTest.java:829:92:829:99 | source(...) : Object | LogInjectionTest.java:829:83:829:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:829:92:829:99 | source(...) | user-provided value |
-| LogInjectionTest.java:830:68:830:84 | (...)... | LogInjectionTest.java:830:77:830:84 | source(...) : Object | LogInjectionTest.java:830:68:830:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:830:77:830:84 | source(...) | user-provided value |
-| LogInjectionTest.java:831:53:831:69 | (...)... | LogInjectionTest.java:831:62:831:69 | source(...) : Object | LogInjectionTest.java:831:53:831:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:831:62:831:69 | source(...) | user-provided value |
-| LogInjectionTest.java:832:188:832:204 | (...)... | LogInjectionTest.java:832:197:832:204 | source(...) : Object | LogInjectionTest.java:832:188:832:204 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:832:197:832:204 | source(...) | user-provided value |
-| LogInjectionTest.java:833:173:833:189 | (...)... | LogInjectionTest.java:833:182:833:189 | source(...) : Object | LogInjectionTest.java:833:173:833:189 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:833:182:833:189 | source(...) | user-provided value |
-| LogInjectionTest.java:834:158:834:174 | (...)... | LogInjectionTest.java:834:167:834:174 | source(...) : Object | LogInjectionTest.java:834:158:834:174 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:834:167:834:174 | source(...) | user-provided value |
-| LogInjectionTest.java:835:143:835:159 | (...)... | LogInjectionTest.java:835:152:835:159 | source(...) : Object | LogInjectionTest.java:835:143:835:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:835:152:835:159 | source(...) | user-provided value |
+| LogInjectionTest.java:802:53:802:69 | (...)... | LogInjectionTest.java:802:62:802:69 | source(...) : Object | LogInjectionTest.java:802:53:802:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:802:62:802:69 | source(...) | user-provided value |
+| LogInjectionTest.java:803:68:803:89 | (...)... | LogInjectionTest.java:803:82:803:89 | source(...) : Object | LogInjectionTest.java:803:68:803:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:803:82:803:89 | source(...) | user-provided value |
+| LogInjectionTest.java:804:53:804:69 | (...)... | LogInjectionTest.java:804:62:804:69 | source(...) : Object | LogInjectionTest.java:804:53:804:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:804:62:804:69 | source(...) | user-provided value |
+| LogInjectionTest.java:805:53:805:74 | (...)... | LogInjectionTest.java:805:67:805:74 | source(...) : Object | LogInjectionTest.java:805:53:805:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:805:67:805:74 | source(...) | user-provided value |
+| LogInjectionTest.java:806:53:806:74 | (...)... | LogInjectionTest.java:806:67:806:74 | source(...) : Object | LogInjectionTest.java:806:53:806:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:806:67:806:74 | source(...) | user-provided value |
+| LogInjectionTest.java:807:38:807:63 | (...)... | LogInjectionTest.java:807:56:807:63 | source(...) : Object | LogInjectionTest.java:807:38:807:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:807:56:807:63 | source(...) | user-provided value |
+| LogInjectionTest.java:808:38:808:63 | (...)... | LogInjectionTest.java:808:56:808:63 | source(...) : Object | LogInjectionTest.java:808:38:808:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:808:56:808:63 | source(...) | user-provided value |
+| LogInjectionTest.java:809:38:809:55 | (...)... | LogInjectionTest.java:809:48:809:55 | source(...) : Object | LogInjectionTest.java:809:38:809:55 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:809:48:809:55 | source(...) | user-provided value |
+| LogInjectionTest.java:810:38:810:55 | (...)... | LogInjectionTest.java:810:48:810:55 | source(...) : Object | LogInjectionTest.java:810:38:810:55 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:810:48:810:55 | source(...) | user-provided value |
+| LogInjectionTest.java:811:38:811:45 | source(...) | LogInjectionTest.java:811:38:811:45 | source(...) | LogInjectionTest.java:811:38:811:45 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:811:38:811:45 | source(...) | user-provided value |
+| LogInjectionTest.java:812:38:812:45 | source(...) | LogInjectionTest.java:812:38:812:45 | source(...) | LogInjectionTest.java:812:38:812:45 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:812:38:812:45 | source(...) | user-provided value |
+| LogInjectionTest.java:813:38:813:54 | (...)... | LogInjectionTest.java:813:47:813:54 | source(...) : Object | LogInjectionTest.java:813:38:813:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:813:47:813:54 | source(...) | user-provided value |
+| LogInjectionTest.java:814:38:814:54 | (...)... | LogInjectionTest.java:814:47:814:54 | source(...) : Object | LogInjectionTest.java:814:38:814:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:814:47:814:54 | source(...) | user-provided value |
+| LogInjectionTest.java:815:53:815:75 | new Object[] | LogInjectionTest.java:815:67:815:74 | source(...) : Object | LogInjectionTest.java:815:53:815:75 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:815:67:815:74 | source(...) | user-provided value |
+| LogInjectionTest.java:816:53:816:69 | (...)... | LogInjectionTest.java:816:62:816:69 | source(...) : Object | LogInjectionTest.java:816:53:816:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:816:62:816:69 | source(...) | user-provided value |
+| LogInjectionTest.java:817:38:817:54 | (...)... | LogInjectionTest.java:817:47:817:54 | source(...) : Object | LogInjectionTest.java:817:38:817:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:817:47:817:54 | source(...) | user-provided value |
+| LogInjectionTest.java:818:68:818:84 | (...)... | LogInjectionTest.java:818:77:818:84 | source(...) : Object | LogInjectionTest.java:818:68:818:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:818:77:818:84 | source(...) | user-provided value |
+| LogInjectionTest.java:819:53:819:69 | (...)... | LogInjectionTest.java:819:62:819:69 | source(...) : Object | LogInjectionTest.java:819:53:819:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:819:62:819:69 | source(...) | user-provided value |
+| LogInjectionTest.java:820:38:820:54 | (...)... | LogInjectionTest.java:820:47:820:54 | source(...) : Object | LogInjectionTest.java:820:38:820:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:820:47:820:54 | source(...) | user-provided value |
+| LogInjectionTest.java:821:83:821:99 | (...)... | LogInjectionTest.java:821:92:821:99 | source(...) : Object | LogInjectionTest.java:821:83:821:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:821:92:821:99 | source(...) | user-provided value |
+| LogInjectionTest.java:822:68:822:84 | (...)... | LogInjectionTest.java:822:77:822:84 | source(...) : Object | LogInjectionTest.java:822:68:822:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:822:77:822:84 | source(...) | user-provided value |
+| LogInjectionTest.java:823:53:823:69 | (...)... | LogInjectionTest.java:823:62:823:69 | source(...) : Object | LogInjectionTest.java:823:53:823:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:823:62:823:69 | source(...) | user-provided value |
+| LogInjectionTest.java:824:38:824:54 | (...)... | LogInjectionTest.java:824:47:824:54 | source(...) : Object | LogInjectionTest.java:824:38:824:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:824:47:824:54 | source(...) | user-provided value |
+| LogInjectionTest.java:825:98:825:114 | (...)... | LogInjectionTest.java:825:107:825:114 | source(...) : Object | LogInjectionTest.java:825:98:825:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:825:107:825:114 | source(...) | user-provided value |
+| LogInjectionTest.java:826:83:826:99 | (...)... | LogInjectionTest.java:826:92:826:99 | source(...) : Object | LogInjectionTest.java:826:83:826:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:826:92:826:99 | source(...) | user-provided value |
+| LogInjectionTest.java:827:68:827:84 | (...)... | LogInjectionTest.java:827:77:827:84 | source(...) : Object | LogInjectionTest.java:827:68:827:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:827:77:827:84 | source(...) | user-provided value |
+| LogInjectionTest.java:828:53:828:69 | (...)... | LogInjectionTest.java:828:62:828:69 | source(...) : Object | LogInjectionTest.java:828:53:828:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:828:62:828:69 | source(...) | user-provided value |
+| LogInjectionTest.java:829:38:829:54 | (...)... | LogInjectionTest.java:829:47:829:54 | source(...) : Object | LogInjectionTest.java:829:38:829:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:829:47:829:54 | source(...) | user-provided value |
+| LogInjectionTest.java:830:113:830:129 | (...)... | LogInjectionTest.java:830:122:830:129 | source(...) : Object | LogInjectionTest.java:830:113:830:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:830:122:830:129 | source(...) | user-provided value |
+| LogInjectionTest.java:831:98:831:114 | (...)... | LogInjectionTest.java:831:107:831:114 | source(...) : Object | LogInjectionTest.java:831:98:831:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:831:107:831:114 | source(...) | user-provided value |
+| LogInjectionTest.java:832:83:832:99 | (...)... | LogInjectionTest.java:832:92:832:99 | source(...) : Object | LogInjectionTest.java:832:83:832:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:832:92:832:99 | source(...) | user-provided value |
+| LogInjectionTest.java:833:68:833:84 | (...)... | LogInjectionTest.java:833:77:833:84 | source(...) : Object | LogInjectionTest.java:833:68:833:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:833:77:833:84 | source(...) | user-provided value |
+| LogInjectionTest.java:834:53:834:69 | (...)... | LogInjectionTest.java:834:62:834:69 | source(...) : Object | LogInjectionTest.java:834:53:834:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:834:62:834:69 | source(...) | user-provided value |
+| LogInjectionTest.java:835:38:835:54 | (...)... | LogInjectionTest.java:835:47:835:54 | source(...) : Object | LogInjectionTest.java:835:38:835:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:835:47:835:54 | source(...) | user-provided value |
 | LogInjectionTest.java:836:128:836:144 | (...)... | LogInjectionTest.java:836:137:836:144 | source(...) : Object | LogInjectionTest.java:836:128:836:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:836:137:836:144 | source(...) | user-provided value |
 | LogInjectionTest.java:837:113:837:129 | (...)... | LogInjectionTest.java:837:122:837:129 | source(...) : Object | LogInjectionTest.java:837:113:837:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:837:122:837:129 | source(...) | user-provided value |
 | LogInjectionTest.java:838:98:838:114 | (...)... | LogInjectionTest.java:838:107:838:114 | source(...) : Object | LogInjectionTest.java:838:98:838:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:838:107:838:114 | source(...) | user-provided value |
 | LogInjectionTest.java:839:83:839:99 | (...)... | LogInjectionTest.java:839:92:839:99 | source(...) : Object | LogInjectionTest.java:839:83:839:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:839:92:839:99 | source(...) | user-provided value |
 | LogInjectionTest.java:840:68:840:84 | (...)... | LogInjectionTest.java:840:77:840:84 | source(...) : Object | LogInjectionTest.java:840:68:840:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:840:77:840:84 | source(...) | user-provided value |
 | LogInjectionTest.java:841:53:841:69 | (...)... | LogInjectionTest.java:841:62:841:69 | source(...) : Object | LogInjectionTest.java:841:53:841:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:841:62:841:69 | source(...) | user-provided value |
-| LogInjectionTest.java:842:53:842:69 | (...)... | LogInjectionTest.java:842:62:842:69 | source(...) : Object | LogInjectionTest.java:842:53:842:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:842:62:842:69 | source(...) | user-provided value |
-| LogInjectionTest.java:843:68:843:89 | (...)... | LogInjectionTest.java:843:82:843:89 | source(...) : Object | LogInjectionTest.java:843:68:843:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:843:82:843:89 | source(...) | user-provided value |
-| LogInjectionTest.java:844:53:844:69 | (...)... | LogInjectionTest.java:844:62:844:69 | source(...) : Object | LogInjectionTest.java:844:53:844:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:844:62:844:69 | source(...) | user-provided value |
-| LogInjectionTest.java:845:53:845:74 | (...)... | LogInjectionTest.java:845:67:845:74 | source(...) : Object | LogInjectionTest.java:845:53:845:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:845:67:845:74 | source(...) | user-provided value |
-| LogInjectionTest.java:846:53:846:74 | (...)... | LogInjectionTest.java:846:67:846:74 | source(...) : Object | LogInjectionTest.java:846:53:846:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:846:67:846:74 | source(...) | user-provided value |
-| LogInjectionTest.java:847:38:847:63 | (...)... | LogInjectionTest.java:847:56:847:63 | source(...) : Object | LogInjectionTest.java:847:38:847:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:847:56:847:63 | source(...) | user-provided value |
-| LogInjectionTest.java:848:38:848:63 | (...)... | LogInjectionTest.java:848:56:848:63 | source(...) : Object | LogInjectionTest.java:848:38:848:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:848:56:848:63 | source(...) | user-provided value |
-| LogInjectionTest.java:849:38:849:55 | (...)... | LogInjectionTest.java:849:48:849:55 | source(...) : Object | LogInjectionTest.java:849:38:849:55 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:849:48:849:55 | source(...) | user-provided value |
-| LogInjectionTest.java:850:38:850:55 | (...)... | LogInjectionTest.java:850:48:850:55 | source(...) : Object | LogInjectionTest.java:850:38:850:55 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:850:48:850:55 | source(...) | user-provided value |
-| LogInjectionTest.java:851:38:851:45 | source(...) | LogInjectionTest.java:851:38:851:45 | source(...) | LogInjectionTest.java:851:38:851:45 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:851:38:851:45 | source(...) | user-provided value |
-| LogInjectionTest.java:852:38:852:45 | source(...) | LogInjectionTest.java:852:38:852:45 | source(...) | LogInjectionTest.java:852:38:852:45 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:852:38:852:45 | source(...) | user-provided value |
-| LogInjectionTest.java:853:38:853:54 | (...)... | LogInjectionTest.java:853:47:853:54 | source(...) : Object | LogInjectionTest.java:853:38:853:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:853:47:853:54 | source(...) | user-provided value |
-| LogInjectionTest.java:854:38:854:54 | (...)... | LogInjectionTest.java:854:47:854:54 | source(...) : Object | LogInjectionTest.java:854:38:854:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:854:47:854:54 | source(...) | user-provided value |
-| LogInjectionTest.java:855:53:855:75 | new Object[] | LogInjectionTest.java:855:67:855:74 | source(...) : Object | LogInjectionTest.java:855:53:855:75 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:855:67:855:74 | source(...) | user-provided value |
-| LogInjectionTest.java:856:53:856:69 | (...)... | LogInjectionTest.java:856:62:856:69 | source(...) : Object | LogInjectionTest.java:856:53:856:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:856:62:856:69 | source(...) | user-provided value |
-| LogInjectionTest.java:857:38:857:54 | (...)... | LogInjectionTest.java:857:47:857:54 | source(...) : Object | LogInjectionTest.java:857:38:857:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:857:47:857:54 | source(...) | user-provided value |
-| LogInjectionTest.java:858:68:858:84 | (...)... | LogInjectionTest.java:858:77:858:84 | source(...) : Object | LogInjectionTest.java:858:68:858:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:858:77:858:84 | source(...) | user-provided value |
-| LogInjectionTest.java:859:53:859:69 | (...)... | LogInjectionTest.java:859:62:859:69 | source(...) : Object | LogInjectionTest.java:859:53:859:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:859:62:859:69 | source(...) | user-provided value |
-| LogInjectionTest.java:860:38:860:54 | (...)... | LogInjectionTest.java:860:47:860:54 | source(...) : Object | LogInjectionTest.java:860:38:860:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:860:47:860:54 | source(...) | user-provided value |
-| LogInjectionTest.java:861:83:861:99 | (...)... | LogInjectionTest.java:861:92:861:99 | source(...) : Object | LogInjectionTest.java:861:83:861:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:861:92:861:99 | source(...) | user-provided value |
-| LogInjectionTest.java:862:68:862:84 | (...)... | LogInjectionTest.java:862:77:862:84 | source(...) : Object | LogInjectionTest.java:862:68:862:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:862:77:862:84 | source(...) | user-provided value |
-| LogInjectionTest.java:863:53:863:69 | (...)... | LogInjectionTest.java:863:62:863:69 | source(...) : Object | LogInjectionTest.java:863:53:863:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:863:62:863:69 | source(...) | user-provided value |
-| LogInjectionTest.java:864:38:864:54 | (...)... | LogInjectionTest.java:864:47:864:54 | source(...) : Object | LogInjectionTest.java:864:38:864:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:864:47:864:54 | source(...) | user-provided value |
+| LogInjectionTest.java:842:38:842:54 | (...)... | LogInjectionTest.java:842:47:842:54 | source(...) : Object | LogInjectionTest.java:842:38:842:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:842:47:842:54 | source(...) | user-provided value |
+| LogInjectionTest.java:843:143:843:159 | (...)... | LogInjectionTest.java:843:152:843:159 | source(...) : Object | LogInjectionTest.java:843:143:843:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:843:152:843:159 | source(...) | user-provided value |
+| LogInjectionTest.java:844:128:844:144 | (...)... | LogInjectionTest.java:844:137:844:144 | source(...) : Object | LogInjectionTest.java:844:128:844:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:844:137:844:144 | source(...) | user-provided value |
+| LogInjectionTest.java:845:113:845:129 | (...)... | LogInjectionTest.java:845:122:845:129 | source(...) : Object | LogInjectionTest.java:845:113:845:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:845:122:845:129 | source(...) | user-provided value |
+| LogInjectionTest.java:846:98:846:114 | (...)... | LogInjectionTest.java:846:107:846:114 | source(...) : Object | LogInjectionTest.java:846:98:846:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:846:107:846:114 | source(...) | user-provided value |
+| LogInjectionTest.java:847:83:847:99 | (...)... | LogInjectionTest.java:847:92:847:99 | source(...) : Object | LogInjectionTest.java:847:83:847:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:847:92:847:99 | source(...) | user-provided value |
+| LogInjectionTest.java:848:68:848:84 | (...)... | LogInjectionTest.java:848:77:848:84 | source(...) : Object | LogInjectionTest.java:848:68:848:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:848:77:848:84 | source(...) | user-provided value |
+| LogInjectionTest.java:849:53:849:69 | (...)... | LogInjectionTest.java:849:62:849:69 | source(...) : Object | LogInjectionTest.java:849:53:849:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:849:62:849:69 | source(...) | user-provided value |
+| LogInjectionTest.java:850:38:850:54 | (...)... | LogInjectionTest.java:850:47:850:54 | source(...) : Object | LogInjectionTest.java:850:38:850:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:850:47:850:54 | source(...) | user-provided value |
+| LogInjectionTest.java:851:158:851:174 | (...)... | LogInjectionTest.java:851:167:851:174 | source(...) : Object | LogInjectionTest.java:851:158:851:174 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:851:167:851:174 | source(...) | user-provided value |
+| LogInjectionTest.java:852:143:852:159 | (...)... | LogInjectionTest.java:852:152:852:159 | source(...) : Object | LogInjectionTest.java:852:143:852:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:852:152:852:159 | source(...) | user-provided value |
+| LogInjectionTest.java:853:128:853:144 | (...)... | LogInjectionTest.java:853:137:853:144 | source(...) : Object | LogInjectionTest.java:853:128:853:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:853:137:853:144 | source(...) | user-provided value |
+| LogInjectionTest.java:854:113:854:129 | (...)... | LogInjectionTest.java:854:122:854:129 | source(...) : Object | LogInjectionTest.java:854:113:854:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:854:122:854:129 | source(...) | user-provided value |
+| LogInjectionTest.java:855:98:855:114 | (...)... | LogInjectionTest.java:855:107:855:114 | source(...) : Object | LogInjectionTest.java:855:98:855:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:855:107:855:114 | source(...) | user-provided value |
+| LogInjectionTest.java:856:83:856:99 | (...)... | LogInjectionTest.java:856:92:856:99 | source(...) : Object | LogInjectionTest.java:856:83:856:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:856:92:856:99 | source(...) | user-provided value |
+| LogInjectionTest.java:857:68:857:84 | (...)... | LogInjectionTest.java:857:77:857:84 | source(...) : Object | LogInjectionTest.java:857:68:857:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:857:77:857:84 | source(...) | user-provided value |
+| LogInjectionTest.java:858:53:858:69 | (...)... | LogInjectionTest.java:858:62:858:69 | source(...) : Object | LogInjectionTest.java:858:53:858:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:858:62:858:69 | source(...) | user-provided value |
+| LogInjectionTest.java:859:38:859:54 | (...)... | LogInjectionTest.java:859:47:859:54 | source(...) : Object | LogInjectionTest.java:859:38:859:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:859:47:859:54 | source(...) | user-provided value |
+| LogInjectionTest.java:860:173:860:189 | (...)... | LogInjectionTest.java:860:182:860:189 | source(...) : Object | LogInjectionTest.java:860:173:860:189 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:860:182:860:189 | source(...) | user-provided value |
+| LogInjectionTest.java:861:158:861:174 | (...)... | LogInjectionTest.java:861:167:861:174 | source(...) : Object | LogInjectionTest.java:861:158:861:174 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:861:167:861:174 | source(...) | user-provided value |
+| LogInjectionTest.java:862:143:862:159 | (...)... | LogInjectionTest.java:862:152:862:159 | source(...) : Object | LogInjectionTest.java:862:143:862:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:862:152:862:159 | source(...) | user-provided value |
+| LogInjectionTest.java:863:128:863:144 | (...)... | LogInjectionTest.java:863:137:863:144 | source(...) : Object | LogInjectionTest.java:863:128:863:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:863:137:863:144 | source(...) | user-provided value |
+| LogInjectionTest.java:864:113:864:129 | (...)... | LogInjectionTest.java:864:122:864:129 | source(...) : Object | LogInjectionTest.java:864:113:864:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:864:122:864:129 | source(...) | user-provided value |
 | LogInjectionTest.java:865:98:865:114 | (...)... | LogInjectionTest.java:865:107:865:114 | source(...) : Object | LogInjectionTest.java:865:98:865:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:865:107:865:114 | source(...) | user-provided value |
 | LogInjectionTest.java:866:83:866:99 | (...)... | LogInjectionTest.java:866:92:866:99 | source(...) : Object | LogInjectionTest.java:866:83:866:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:866:92:866:99 | source(...) | user-provided value |
 | LogInjectionTest.java:867:68:867:84 | (...)... | LogInjectionTest.java:867:77:867:84 | source(...) : Object | LogInjectionTest.java:867:68:867:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:867:77:867:84 | source(...) | user-provided value |
 | LogInjectionTest.java:868:53:868:69 | (...)... | LogInjectionTest.java:868:62:868:69 | source(...) : Object | LogInjectionTest.java:868:53:868:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:868:62:868:69 | source(...) | user-provided value |
 | LogInjectionTest.java:869:38:869:54 | (...)... | LogInjectionTest.java:869:47:869:54 | source(...) : Object | LogInjectionTest.java:869:38:869:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:869:47:869:54 | source(...) | user-provided value |
-| LogInjectionTest.java:870:113:870:129 | (...)... | LogInjectionTest.java:870:122:870:129 | source(...) : Object | LogInjectionTest.java:870:113:870:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:870:122:870:129 | source(...) | user-provided value |
-| LogInjectionTest.java:871:98:871:114 | (...)... | LogInjectionTest.java:871:107:871:114 | source(...) : Object | LogInjectionTest.java:871:98:871:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:871:107:871:114 | source(...) | user-provided value |
-| LogInjectionTest.java:872:83:872:99 | (...)... | LogInjectionTest.java:872:92:872:99 | source(...) : Object | LogInjectionTest.java:872:83:872:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:872:92:872:99 | source(...) | user-provided value |
-| LogInjectionTest.java:873:68:873:84 | (...)... | LogInjectionTest.java:873:77:873:84 | source(...) : Object | LogInjectionTest.java:873:68:873:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:873:77:873:84 | source(...) | user-provided value |
-| LogInjectionTest.java:874:53:874:69 | (...)... | LogInjectionTest.java:874:62:874:69 | source(...) : Object | LogInjectionTest.java:874:53:874:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:874:62:874:69 | source(...) | user-provided value |
-| LogInjectionTest.java:875:38:875:54 | (...)... | LogInjectionTest.java:875:47:875:54 | source(...) : Object | LogInjectionTest.java:875:38:875:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:875:47:875:54 | source(...) | user-provided value |
-| LogInjectionTest.java:876:128:876:144 | (...)... | LogInjectionTest.java:876:137:876:144 | source(...) : Object | LogInjectionTest.java:876:128:876:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:876:137:876:144 | source(...) | user-provided value |
-| LogInjectionTest.java:877:113:877:129 | (...)... | LogInjectionTest.java:877:122:877:129 | source(...) : Object | LogInjectionTest.java:877:113:877:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:877:122:877:129 | source(...) | user-provided value |
-| LogInjectionTest.java:878:98:878:114 | (...)... | LogInjectionTest.java:878:107:878:114 | source(...) : Object | LogInjectionTest.java:878:98:878:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:878:107:878:114 | source(...) | user-provided value |
-| LogInjectionTest.java:879:83:879:99 | (...)... | LogInjectionTest.java:879:92:879:99 | source(...) : Object | LogInjectionTest.java:879:83:879:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:879:92:879:99 | source(...) | user-provided value |
-| LogInjectionTest.java:880:68:880:84 | (...)... | LogInjectionTest.java:880:77:880:84 | source(...) : Object | LogInjectionTest.java:880:68:880:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:880:77:880:84 | source(...) | user-provided value |
-| LogInjectionTest.java:881:53:881:69 | (...)... | LogInjectionTest.java:881:62:881:69 | source(...) : Object | LogInjectionTest.java:881:53:881:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:881:62:881:69 | source(...) | user-provided value |
-| LogInjectionTest.java:882:38:882:54 | (...)... | LogInjectionTest.java:882:47:882:54 | source(...) : Object | LogInjectionTest.java:882:38:882:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:882:47:882:54 | source(...) | user-provided value |
-| LogInjectionTest.java:883:143:883:159 | (...)... | LogInjectionTest.java:883:152:883:159 | source(...) : Object | LogInjectionTest.java:883:143:883:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:883:152:883:159 | source(...) | user-provided value |
-| LogInjectionTest.java:884:128:884:144 | (...)... | LogInjectionTest.java:884:137:884:144 | source(...) : Object | LogInjectionTest.java:884:128:884:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:884:137:884:144 | source(...) | user-provided value |
-| LogInjectionTest.java:885:113:885:129 | (...)... | LogInjectionTest.java:885:122:885:129 | source(...) : Object | LogInjectionTest.java:885:113:885:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:885:122:885:129 | source(...) | user-provided value |
-| LogInjectionTest.java:886:98:886:114 | (...)... | LogInjectionTest.java:886:107:886:114 | source(...) : Object | LogInjectionTest.java:886:98:886:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:886:107:886:114 | source(...) | user-provided value |
-| LogInjectionTest.java:887:83:887:99 | (...)... | LogInjectionTest.java:887:92:887:99 | source(...) : Object | LogInjectionTest.java:887:83:887:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:887:92:887:99 | source(...) | user-provided value |
-| LogInjectionTest.java:888:68:888:84 | (...)... | LogInjectionTest.java:888:77:888:84 | source(...) : Object | LogInjectionTest.java:888:68:888:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:888:77:888:84 | source(...) | user-provided value |
-| LogInjectionTest.java:889:53:889:69 | (...)... | LogInjectionTest.java:889:62:889:69 | source(...) : Object | LogInjectionTest.java:889:53:889:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:889:62:889:69 | source(...) | user-provided value |
-| LogInjectionTest.java:890:38:890:54 | (...)... | LogInjectionTest.java:890:47:890:54 | source(...) : Object | LogInjectionTest.java:890:38:890:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:890:47:890:54 | source(...) | user-provided value |
-| LogInjectionTest.java:891:158:891:174 | (...)... | LogInjectionTest.java:891:167:891:174 | source(...) : Object | LogInjectionTest.java:891:158:891:174 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:891:167:891:174 | source(...) | user-provided value |
-| LogInjectionTest.java:892:143:892:159 | (...)... | LogInjectionTest.java:892:152:892:159 | source(...) : Object | LogInjectionTest.java:892:143:892:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:892:152:892:159 | source(...) | user-provided value |
-| LogInjectionTest.java:893:128:893:144 | (...)... | LogInjectionTest.java:893:137:893:144 | source(...) : Object | LogInjectionTest.java:893:128:893:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:893:137:893:144 | source(...) | user-provided value |
-| LogInjectionTest.java:894:113:894:129 | (...)... | LogInjectionTest.java:894:122:894:129 | source(...) : Object | LogInjectionTest.java:894:113:894:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:894:122:894:129 | source(...) | user-provided value |
-| LogInjectionTest.java:895:98:895:114 | (...)... | LogInjectionTest.java:895:107:895:114 | source(...) : Object | LogInjectionTest.java:895:98:895:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:895:107:895:114 | source(...) | user-provided value |
-| LogInjectionTest.java:896:83:896:99 | (...)... | LogInjectionTest.java:896:92:896:99 | source(...) : Object | LogInjectionTest.java:896:83:896:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:896:92:896:99 | source(...) | user-provided value |
-| LogInjectionTest.java:897:68:897:84 | (...)... | LogInjectionTest.java:897:77:897:84 | source(...) : Object | LogInjectionTest.java:897:68:897:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:897:77:897:84 | source(...) | user-provided value |
-| LogInjectionTest.java:898:53:898:69 | (...)... | LogInjectionTest.java:898:62:898:69 | source(...) : Object | LogInjectionTest.java:898:53:898:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:898:62:898:69 | source(...) | user-provided value |
-| LogInjectionTest.java:899:38:899:54 | (...)... | LogInjectionTest.java:899:47:899:54 | source(...) : Object | LogInjectionTest.java:899:38:899:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:899:47:899:54 | source(...) | user-provided value |
-| LogInjectionTest.java:900:173:900:189 | (...)... | LogInjectionTest.java:900:182:900:189 | source(...) : Object | LogInjectionTest.java:900:173:900:189 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:900:182:900:189 | source(...) | user-provided value |
-| LogInjectionTest.java:901:158:901:174 | (...)... | LogInjectionTest.java:901:167:901:174 | source(...) : Object | LogInjectionTest.java:901:158:901:174 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:901:167:901:174 | source(...) | user-provided value |
-| LogInjectionTest.java:902:143:902:159 | (...)... | LogInjectionTest.java:902:152:902:159 | source(...) : Object | LogInjectionTest.java:902:143:902:159 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:902:152:902:159 | source(...) | user-provided value |
-| LogInjectionTest.java:903:128:903:144 | (...)... | LogInjectionTest.java:903:137:903:144 | source(...) : Object | LogInjectionTest.java:903:128:903:144 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:903:137:903:144 | source(...) | user-provided value |
-| LogInjectionTest.java:904:113:904:129 | (...)... | LogInjectionTest.java:904:122:904:129 | source(...) : Object | LogInjectionTest.java:904:113:904:129 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:904:122:904:129 | source(...) | user-provided value |
-| LogInjectionTest.java:905:98:905:114 | (...)... | LogInjectionTest.java:905:107:905:114 | source(...) : Object | LogInjectionTest.java:905:98:905:114 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:905:107:905:114 | source(...) | user-provided value |
-| LogInjectionTest.java:906:83:906:99 | (...)... | LogInjectionTest.java:906:92:906:99 | source(...) : Object | LogInjectionTest.java:906:83:906:99 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:906:92:906:99 | source(...) | user-provided value |
-| LogInjectionTest.java:907:68:907:84 | (...)... | LogInjectionTest.java:907:77:907:84 | source(...) : Object | LogInjectionTest.java:907:68:907:84 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:907:77:907:84 | source(...) | user-provided value |
-| LogInjectionTest.java:908:53:908:69 | (...)... | LogInjectionTest.java:908:62:908:69 | source(...) : Object | LogInjectionTest.java:908:53:908:69 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:908:62:908:69 | source(...) | user-provided value |
-| LogInjectionTest.java:909:38:909:54 | (...)... | LogInjectionTest.java:909:47:909:54 | source(...) : Object | LogInjectionTest.java:909:38:909:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:909:47:909:54 | source(...) | user-provided value |
-| LogInjectionTest.java:910:38:910:54 | (...)... | LogInjectionTest.java:910:47:910:54 | source(...) : Object | LogInjectionTest.java:910:38:910:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:910:47:910:54 | source(...) | user-provided value |
-| LogInjectionTest.java:911:53:911:74 | (...)... | LogInjectionTest.java:911:67:911:74 | source(...) : Object | LogInjectionTest.java:911:53:911:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:911:67:911:74 | source(...) | user-provided value |
-| LogInjectionTest.java:912:38:912:54 | (...)... | LogInjectionTest.java:912:47:912:54 | source(...) : Object | LogInjectionTest.java:912:38:912:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:912:47:912:54 | source(...) | user-provided value |
-| LogInjectionTest.java:913:38:913:59 | (...)... | LogInjectionTest.java:913:52:913:59 | source(...) : Object | LogInjectionTest.java:913:38:913:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:913:52:913:59 | source(...) | user-provided value |
-| LogInjectionTest.java:914:38:914:59 | (...)... | LogInjectionTest.java:914:52:914:59 | source(...) : Object | LogInjectionTest.java:914:38:914:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:914:52:914:59 | source(...) | user-provided value |
-| LogInjectionTest.java:915:26:915:48 | (...)... | LogInjectionTest.java:915:41:915:48 | source(...) : Object | LogInjectionTest.java:915:26:915:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:915:41:915:48 | source(...) | user-provided value |
-| LogInjectionTest.java:916:26:916:48 | (...)... | LogInjectionTest.java:916:41:916:48 | source(...) : Object | LogInjectionTest.java:916:26:916:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:916:41:916:48 | source(...) | user-provided value |
-| LogInjectionTest.java:917:41:917:63 | (...)... | LogInjectionTest.java:917:56:917:63 | source(...) : Object | LogInjectionTest.java:917:41:917:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:917:56:917:63 | source(...) | user-provided value |
-| LogInjectionTest.java:918:41:918:63 | (...)... | LogInjectionTest.java:918:56:918:63 | source(...) : Object | LogInjectionTest.java:918:41:918:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:918:56:918:63 | source(...) | user-provided value |
-| LogInjectionTest.java:919:41:919:58 | (...)... | LogInjectionTest.java:919:51:919:58 | source(...) : Object | LogInjectionTest.java:919:41:919:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:919:51:919:58 | source(...) | user-provided value |
-| LogInjectionTest.java:920:41:920:66 | (...)... | LogInjectionTest.java:920:59:920:66 | source(...) : Object | LogInjectionTest.java:920:41:920:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:920:59:920:66 | source(...) | user-provided value |
-| LogInjectionTest.java:921:41:921:66 | (...)... | LogInjectionTest.java:921:59:921:66 | source(...) : Object | LogInjectionTest.java:921:41:921:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:921:59:921:66 | source(...) | user-provided value |
-| LogInjectionTest.java:922:41:922:48 | source(...) | LogInjectionTest.java:922:41:922:48 | source(...) | LogInjectionTest.java:922:41:922:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:922:41:922:48 | source(...) | user-provided value |
-| LogInjectionTest.java:923:41:923:57 | (...)... | LogInjectionTest.java:923:50:923:57 | source(...) : Object | LogInjectionTest.java:923:41:923:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:923:50:923:57 | source(...) | user-provided value |
-| LogInjectionTest.java:924:41:924:57 | (...)... | LogInjectionTest.java:924:50:924:57 | source(...) : Object | LogInjectionTest.java:924:41:924:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:924:50:924:57 | source(...) | user-provided value |
-| LogInjectionTest.java:925:56:925:78 | new Object[] | LogInjectionTest.java:925:70:925:77 | source(...) : Object | LogInjectionTest.java:925:56:925:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:925:70:925:77 | source(...) | user-provided value |
-| LogInjectionTest.java:926:56:926:72 | (...)... | LogInjectionTest.java:926:65:926:72 | source(...) : Object | LogInjectionTest.java:926:56:926:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:926:65:926:72 | source(...) | user-provided value |
-| LogInjectionTest.java:927:41:927:57 | (...)... | LogInjectionTest.java:927:50:927:57 | source(...) : Object | LogInjectionTest.java:927:41:927:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:927:50:927:57 | source(...) | user-provided value |
-| LogInjectionTest.java:928:71:928:87 | (...)... | LogInjectionTest.java:928:80:928:87 | source(...) : Object | LogInjectionTest.java:928:71:928:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:928:80:928:87 | source(...) | user-provided value |
-| LogInjectionTest.java:929:56:929:72 | (...)... | LogInjectionTest.java:929:65:929:72 | source(...) : Object | LogInjectionTest.java:929:56:929:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:929:65:929:72 | source(...) | user-provided value |
-| LogInjectionTest.java:930:41:930:57 | (...)... | LogInjectionTest.java:930:50:930:57 | source(...) : Object | LogInjectionTest.java:930:41:930:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:930:50:930:57 | source(...) | user-provided value |
-| LogInjectionTest.java:931:86:931:102 | (...)... | LogInjectionTest.java:931:95:931:102 | source(...) : Object | LogInjectionTest.java:931:86:931:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:931:95:931:102 | source(...) | user-provided value |
-| LogInjectionTest.java:932:71:932:87 | (...)... | LogInjectionTest.java:932:80:932:87 | source(...) : Object | LogInjectionTest.java:932:71:932:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:932:80:932:87 | source(...) | user-provided value |
-| LogInjectionTest.java:933:56:933:72 | (...)... | LogInjectionTest.java:933:65:933:72 | source(...) : Object | LogInjectionTest.java:933:56:933:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:933:65:933:72 | source(...) | user-provided value |
-| LogInjectionTest.java:934:41:934:57 | (...)... | LogInjectionTest.java:934:50:934:57 | source(...) : Object | LogInjectionTest.java:934:41:934:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:934:50:934:57 | source(...) | user-provided value |
+| LogInjectionTest.java:870:38:870:54 | (...)... | LogInjectionTest.java:870:47:870:54 | source(...) : Object | LogInjectionTest.java:870:38:870:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:870:47:870:54 | source(...) | user-provided value |
+| LogInjectionTest.java:871:53:871:74 | (...)... | LogInjectionTest.java:871:67:871:74 | source(...) : Object | LogInjectionTest.java:871:53:871:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:871:67:871:74 | source(...) | user-provided value |
+| LogInjectionTest.java:872:38:872:54 | (...)... | LogInjectionTest.java:872:47:872:54 | source(...) : Object | LogInjectionTest.java:872:38:872:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:872:47:872:54 | source(...) | user-provided value |
+| LogInjectionTest.java:873:38:873:59 | (...)... | LogInjectionTest.java:873:52:873:59 | source(...) : Object | LogInjectionTest.java:873:38:873:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:873:52:873:59 | source(...) | user-provided value |
+| LogInjectionTest.java:874:38:874:59 | (...)... | LogInjectionTest.java:874:52:874:59 | source(...) : Object | LogInjectionTest.java:874:38:874:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:874:52:874:59 | source(...) | user-provided value |
+| LogInjectionTest.java:875:26:875:48 | (...)... | LogInjectionTest.java:875:41:875:48 | source(...) : Object | LogInjectionTest.java:875:26:875:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:875:41:875:48 | source(...) | user-provided value |
+| LogInjectionTest.java:876:26:876:48 | (...)... | LogInjectionTest.java:876:41:876:48 | source(...) : Object | LogInjectionTest.java:876:26:876:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:876:41:876:48 | source(...) | user-provided value |
+| LogInjectionTest.java:877:41:877:63 | (...)... | LogInjectionTest.java:877:56:877:63 | source(...) : Object | LogInjectionTest.java:877:41:877:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:877:56:877:63 | source(...) | user-provided value |
+| LogInjectionTest.java:878:41:878:63 | (...)... | LogInjectionTest.java:878:56:878:63 | source(...) : Object | LogInjectionTest.java:878:41:878:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:878:56:878:63 | source(...) | user-provided value |
+| LogInjectionTest.java:879:41:879:58 | (...)... | LogInjectionTest.java:879:51:879:58 | source(...) : Object | LogInjectionTest.java:879:41:879:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:879:51:879:58 | source(...) | user-provided value |
+| LogInjectionTest.java:880:41:880:66 | (...)... | LogInjectionTest.java:880:59:880:66 | source(...) : Object | LogInjectionTest.java:880:41:880:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:880:59:880:66 | source(...) | user-provided value |
+| LogInjectionTest.java:881:41:881:66 | (...)... | LogInjectionTest.java:881:59:881:66 | source(...) : Object | LogInjectionTest.java:881:41:881:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:881:59:881:66 | source(...) | user-provided value |
+| LogInjectionTest.java:882:41:882:48 | source(...) | LogInjectionTest.java:882:41:882:48 | source(...) | LogInjectionTest.java:882:41:882:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:882:41:882:48 | source(...) | user-provided value |
+| LogInjectionTest.java:883:41:883:57 | (...)... | LogInjectionTest.java:883:50:883:57 | source(...) : Object | LogInjectionTest.java:883:41:883:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:883:50:883:57 | source(...) | user-provided value |
+| LogInjectionTest.java:884:41:884:57 | (...)... | LogInjectionTest.java:884:50:884:57 | source(...) : Object | LogInjectionTest.java:884:41:884:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:884:50:884:57 | source(...) | user-provided value |
+| LogInjectionTest.java:885:56:885:78 | new Object[] | LogInjectionTest.java:885:70:885:77 | source(...) : Object | LogInjectionTest.java:885:56:885:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:885:70:885:77 | source(...) | user-provided value |
+| LogInjectionTest.java:886:56:886:72 | (...)... | LogInjectionTest.java:886:65:886:72 | source(...) : Object | LogInjectionTest.java:886:56:886:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:886:65:886:72 | source(...) | user-provided value |
+| LogInjectionTest.java:887:41:887:57 | (...)... | LogInjectionTest.java:887:50:887:57 | source(...) : Object | LogInjectionTest.java:887:41:887:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:887:50:887:57 | source(...) | user-provided value |
+| LogInjectionTest.java:888:71:888:87 | (...)... | LogInjectionTest.java:888:80:888:87 | source(...) : Object | LogInjectionTest.java:888:71:888:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:888:80:888:87 | source(...) | user-provided value |
+| LogInjectionTest.java:889:56:889:72 | (...)... | LogInjectionTest.java:889:65:889:72 | source(...) : Object | LogInjectionTest.java:889:56:889:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:889:65:889:72 | source(...) | user-provided value |
+| LogInjectionTest.java:890:41:890:57 | (...)... | LogInjectionTest.java:890:50:890:57 | source(...) : Object | LogInjectionTest.java:890:41:890:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:890:50:890:57 | source(...) | user-provided value |
+| LogInjectionTest.java:891:86:891:102 | (...)... | LogInjectionTest.java:891:95:891:102 | source(...) : Object | LogInjectionTest.java:891:86:891:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:891:95:891:102 | source(...) | user-provided value |
+| LogInjectionTest.java:892:71:892:87 | (...)... | LogInjectionTest.java:892:80:892:87 | source(...) : Object | LogInjectionTest.java:892:71:892:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:892:80:892:87 | source(...) | user-provided value |
+| LogInjectionTest.java:893:56:893:72 | (...)... | LogInjectionTest.java:893:65:893:72 | source(...) : Object | LogInjectionTest.java:893:56:893:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:893:65:893:72 | source(...) | user-provided value |
+| LogInjectionTest.java:894:41:894:57 | (...)... | LogInjectionTest.java:894:50:894:57 | source(...) : Object | LogInjectionTest.java:894:41:894:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:894:50:894:57 | source(...) | user-provided value |
+| LogInjectionTest.java:895:101:895:117 | (...)... | LogInjectionTest.java:895:110:895:117 | source(...) : Object | LogInjectionTest.java:895:101:895:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:895:110:895:117 | source(...) | user-provided value |
+| LogInjectionTest.java:896:86:896:102 | (...)... | LogInjectionTest.java:896:95:896:102 | source(...) : Object | LogInjectionTest.java:896:86:896:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:896:95:896:102 | source(...) | user-provided value |
+| LogInjectionTest.java:897:71:897:87 | (...)... | LogInjectionTest.java:897:80:897:87 | source(...) : Object | LogInjectionTest.java:897:71:897:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:897:80:897:87 | source(...) | user-provided value |
+| LogInjectionTest.java:898:56:898:72 | (...)... | LogInjectionTest.java:898:65:898:72 | source(...) : Object | LogInjectionTest.java:898:56:898:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:898:65:898:72 | source(...) | user-provided value |
+| LogInjectionTest.java:899:41:899:57 | (...)... | LogInjectionTest.java:899:50:899:57 | source(...) : Object | LogInjectionTest.java:899:41:899:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:899:50:899:57 | source(...) | user-provided value |
+| LogInjectionTest.java:900:116:900:132 | (...)... | LogInjectionTest.java:900:125:900:132 | source(...) : Object | LogInjectionTest.java:900:116:900:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:900:125:900:132 | source(...) | user-provided value |
+| LogInjectionTest.java:901:101:901:117 | (...)... | LogInjectionTest.java:901:110:901:117 | source(...) : Object | LogInjectionTest.java:901:101:901:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:901:110:901:117 | source(...) | user-provided value |
+| LogInjectionTest.java:902:86:902:102 | (...)... | LogInjectionTest.java:902:95:902:102 | source(...) : Object | LogInjectionTest.java:902:86:902:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:902:95:902:102 | source(...) | user-provided value |
+| LogInjectionTest.java:903:71:903:87 | (...)... | LogInjectionTest.java:903:80:903:87 | source(...) : Object | LogInjectionTest.java:903:71:903:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:903:80:903:87 | source(...) | user-provided value |
+| LogInjectionTest.java:904:56:904:72 | (...)... | LogInjectionTest.java:904:65:904:72 | source(...) : Object | LogInjectionTest.java:904:56:904:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:904:65:904:72 | source(...) | user-provided value |
+| LogInjectionTest.java:905:41:905:57 | (...)... | LogInjectionTest.java:905:50:905:57 | source(...) : Object | LogInjectionTest.java:905:41:905:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:905:50:905:57 | source(...) | user-provided value |
+| LogInjectionTest.java:906:131:906:147 | (...)... | LogInjectionTest.java:906:140:906:147 | source(...) : Object | LogInjectionTest.java:906:131:906:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:906:140:906:147 | source(...) | user-provided value |
+| LogInjectionTest.java:907:116:907:132 | (...)... | LogInjectionTest.java:907:125:907:132 | source(...) : Object | LogInjectionTest.java:907:116:907:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:907:125:907:132 | source(...) | user-provided value |
+| LogInjectionTest.java:908:101:908:117 | (...)... | LogInjectionTest.java:908:110:908:117 | source(...) : Object | LogInjectionTest.java:908:101:908:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:908:110:908:117 | source(...) | user-provided value |
+| LogInjectionTest.java:909:86:909:102 | (...)... | LogInjectionTest.java:909:95:909:102 | source(...) : Object | LogInjectionTest.java:909:86:909:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:909:95:909:102 | source(...) | user-provided value |
+| LogInjectionTest.java:910:71:910:87 | (...)... | LogInjectionTest.java:910:80:910:87 | source(...) : Object | LogInjectionTest.java:910:71:910:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:910:80:910:87 | source(...) | user-provided value |
+| LogInjectionTest.java:911:56:911:72 | (...)... | LogInjectionTest.java:911:65:911:72 | source(...) : Object | LogInjectionTest.java:911:56:911:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:911:65:911:72 | source(...) | user-provided value |
+| LogInjectionTest.java:912:41:912:57 | (...)... | LogInjectionTest.java:912:50:912:57 | source(...) : Object | LogInjectionTest.java:912:41:912:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:912:50:912:57 | source(...) | user-provided value |
+| LogInjectionTest.java:913:146:913:162 | (...)... | LogInjectionTest.java:913:155:913:162 | source(...) : Object | LogInjectionTest.java:913:146:913:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:913:155:913:162 | source(...) | user-provided value |
+| LogInjectionTest.java:914:131:914:147 | (...)... | LogInjectionTest.java:914:140:914:147 | source(...) : Object | LogInjectionTest.java:914:131:914:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:914:140:914:147 | source(...) | user-provided value |
+| LogInjectionTest.java:915:116:915:132 | (...)... | LogInjectionTest.java:915:125:915:132 | source(...) : Object | LogInjectionTest.java:915:116:915:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:915:125:915:132 | source(...) | user-provided value |
+| LogInjectionTest.java:916:101:916:117 | (...)... | LogInjectionTest.java:916:110:916:117 | source(...) : Object | LogInjectionTest.java:916:101:916:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:916:110:916:117 | source(...) | user-provided value |
+| LogInjectionTest.java:917:86:917:102 | (...)... | LogInjectionTest.java:917:95:917:102 | source(...) : Object | LogInjectionTest.java:917:86:917:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:917:95:917:102 | source(...) | user-provided value |
+| LogInjectionTest.java:918:71:918:87 | (...)... | LogInjectionTest.java:918:80:918:87 | source(...) : Object | LogInjectionTest.java:918:71:918:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:918:80:918:87 | source(...) | user-provided value |
+| LogInjectionTest.java:919:56:919:72 | (...)... | LogInjectionTest.java:919:65:919:72 | source(...) : Object | LogInjectionTest.java:919:56:919:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:919:65:919:72 | source(...) | user-provided value |
+| LogInjectionTest.java:920:41:920:57 | (...)... | LogInjectionTest.java:920:50:920:57 | source(...) : Object | LogInjectionTest.java:920:41:920:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:920:50:920:57 | source(...) | user-provided value |
+| LogInjectionTest.java:921:161:921:177 | (...)... | LogInjectionTest.java:921:170:921:177 | source(...) : Object | LogInjectionTest.java:921:161:921:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:921:170:921:177 | source(...) | user-provided value |
+| LogInjectionTest.java:922:146:922:162 | (...)... | LogInjectionTest.java:922:155:922:162 | source(...) : Object | LogInjectionTest.java:922:146:922:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:922:155:922:162 | source(...) | user-provided value |
+| LogInjectionTest.java:923:131:923:147 | (...)... | LogInjectionTest.java:923:140:923:147 | source(...) : Object | LogInjectionTest.java:923:131:923:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:923:140:923:147 | source(...) | user-provided value |
+| LogInjectionTest.java:924:116:924:132 | (...)... | LogInjectionTest.java:924:125:924:132 | source(...) : Object | LogInjectionTest.java:924:116:924:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:924:125:924:132 | source(...) | user-provided value |
+| LogInjectionTest.java:925:101:925:117 | (...)... | LogInjectionTest.java:925:110:925:117 | source(...) : Object | LogInjectionTest.java:925:101:925:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:925:110:925:117 | source(...) | user-provided value |
+| LogInjectionTest.java:926:86:926:102 | (...)... | LogInjectionTest.java:926:95:926:102 | source(...) : Object | LogInjectionTest.java:926:86:926:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:926:95:926:102 | source(...) | user-provided value |
+| LogInjectionTest.java:927:71:927:87 | (...)... | LogInjectionTest.java:927:80:927:87 | source(...) : Object | LogInjectionTest.java:927:71:927:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:927:80:927:87 | source(...) | user-provided value |
+| LogInjectionTest.java:928:56:928:72 | (...)... | LogInjectionTest.java:928:65:928:72 | source(...) : Object | LogInjectionTest.java:928:56:928:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:928:65:928:72 | source(...) | user-provided value |
+| LogInjectionTest.java:929:41:929:57 | (...)... | LogInjectionTest.java:929:50:929:57 | source(...) : Object | LogInjectionTest.java:929:41:929:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:929:50:929:57 | source(...) | user-provided value |
+| LogInjectionTest.java:930:176:930:192 | (...)... | LogInjectionTest.java:930:185:930:192 | source(...) : Object | LogInjectionTest.java:930:176:930:192 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:930:185:930:192 | source(...) | user-provided value |
+| LogInjectionTest.java:931:161:931:177 | (...)... | LogInjectionTest.java:931:170:931:177 | source(...) : Object | LogInjectionTest.java:931:161:931:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:931:170:931:177 | source(...) | user-provided value |
+| LogInjectionTest.java:932:146:932:162 | (...)... | LogInjectionTest.java:932:155:932:162 | source(...) : Object | LogInjectionTest.java:932:146:932:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:932:155:932:162 | source(...) | user-provided value |
+| LogInjectionTest.java:933:131:933:147 | (...)... | LogInjectionTest.java:933:140:933:147 | source(...) : Object | LogInjectionTest.java:933:131:933:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:933:140:933:147 | source(...) | user-provided value |
+| LogInjectionTest.java:934:116:934:132 | (...)... | LogInjectionTest.java:934:125:934:132 | source(...) : Object | LogInjectionTest.java:934:116:934:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:934:125:934:132 | source(...) | user-provided value |
 | LogInjectionTest.java:935:101:935:117 | (...)... | LogInjectionTest.java:935:110:935:117 | source(...) : Object | LogInjectionTest.java:935:101:935:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:935:110:935:117 | source(...) | user-provided value |
 | LogInjectionTest.java:936:86:936:102 | (...)... | LogInjectionTest.java:936:95:936:102 | source(...) : Object | LogInjectionTest.java:936:86:936:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:936:95:936:102 | source(...) | user-provided value |
 | LogInjectionTest.java:937:71:937:87 | (...)... | LogInjectionTest.java:937:80:937:87 | source(...) : Object | LogInjectionTest.java:937:71:937:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:937:80:937:87 | source(...) | user-provided value |
 | LogInjectionTest.java:938:56:938:72 | (...)... | LogInjectionTest.java:938:65:938:72 | source(...) : Object | LogInjectionTest.java:938:56:938:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:938:65:938:72 | source(...) | user-provided value |
 | LogInjectionTest.java:939:41:939:57 | (...)... | LogInjectionTest.java:939:50:939:57 | source(...) : Object | LogInjectionTest.java:939:41:939:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:939:50:939:57 | source(...) | user-provided value |
-| LogInjectionTest.java:940:116:940:132 | (...)... | LogInjectionTest.java:940:125:940:132 | source(...) : Object | LogInjectionTest.java:940:116:940:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:940:125:940:132 | source(...) | user-provided value |
-| LogInjectionTest.java:941:101:941:117 | (...)... | LogInjectionTest.java:941:110:941:117 | source(...) : Object | LogInjectionTest.java:941:101:941:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:941:110:941:117 | source(...) | user-provided value |
-| LogInjectionTest.java:942:86:942:102 | (...)... | LogInjectionTest.java:942:95:942:102 | source(...) : Object | LogInjectionTest.java:942:86:942:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:942:95:942:102 | source(...) | user-provided value |
-| LogInjectionTest.java:943:71:943:87 | (...)... | LogInjectionTest.java:943:80:943:87 | source(...) : Object | LogInjectionTest.java:943:71:943:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:943:80:943:87 | source(...) | user-provided value |
-| LogInjectionTest.java:944:56:944:72 | (...)... | LogInjectionTest.java:944:65:944:72 | source(...) : Object | LogInjectionTest.java:944:56:944:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:944:65:944:72 | source(...) | user-provided value |
-| LogInjectionTest.java:945:41:945:57 | (...)... | LogInjectionTest.java:945:50:945:57 | source(...) : Object | LogInjectionTest.java:945:41:945:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:945:50:945:57 | source(...) | user-provided value |
-| LogInjectionTest.java:946:131:946:147 | (...)... | LogInjectionTest.java:946:140:946:147 | source(...) : Object | LogInjectionTest.java:946:131:946:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:946:140:946:147 | source(...) | user-provided value |
-| LogInjectionTest.java:947:116:947:132 | (...)... | LogInjectionTest.java:947:125:947:132 | source(...) : Object | LogInjectionTest.java:947:116:947:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:947:125:947:132 | source(...) | user-provided value |
-| LogInjectionTest.java:948:101:948:117 | (...)... | LogInjectionTest.java:948:110:948:117 | source(...) : Object | LogInjectionTest.java:948:101:948:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:948:110:948:117 | source(...) | user-provided value |
-| LogInjectionTest.java:949:86:949:102 | (...)... | LogInjectionTest.java:949:95:949:102 | source(...) : Object | LogInjectionTest.java:949:86:949:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:949:95:949:102 | source(...) | user-provided value |
-| LogInjectionTest.java:950:71:950:87 | (...)... | LogInjectionTest.java:950:80:950:87 | source(...) : Object | LogInjectionTest.java:950:71:950:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:950:80:950:87 | source(...) | user-provided value |
-| LogInjectionTest.java:951:56:951:72 | (...)... | LogInjectionTest.java:951:65:951:72 | source(...) : Object | LogInjectionTest.java:951:56:951:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:951:65:951:72 | source(...) | user-provided value |
-| LogInjectionTest.java:952:41:952:57 | (...)... | LogInjectionTest.java:952:50:952:57 | source(...) : Object | LogInjectionTest.java:952:41:952:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:952:50:952:57 | source(...) | user-provided value |
-| LogInjectionTest.java:953:146:953:162 | (...)... | LogInjectionTest.java:953:155:953:162 | source(...) : Object | LogInjectionTest.java:953:146:953:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:953:155:953:162 | source(...) | user-provided value |
-| LogInjectionTest.java:954:131:954:147 | (...)... | LogInjectionTest.java:954:140:954:147 | source(...) : Object | LogInjectionTest.java:954:131:954:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:954:140:954:147 | source(...) | user-provided value |
-| LogInjectionTest.java:955:116:955:132 | (...)... | LogInjectionTest.java:955:125:955:132 | source(...) : Object | LogInjectionTest.java:955:116:955:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:955:125:955:132 | source(...) | user-provided value |
-| LogInjectionTest.java:956:101:956:117 | (...)... | LogInjectionTest.java:956:110:956:117 | source(...) : Object | LogInjectionTest.java:956:101:956:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:956:110:956:117 | source(...) | user-provided value |
-| LogInjectionTest.java:957:86:957:102 | (...)... | LogInjectionTest.java:957:95:957:102 | source(...) : Object | LogInjectionTest.java:957:86:957:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:957:95:957:102 | source(...) | user-provided value |
-| LogInjectionTest.java:958:71:958:87 | (...)... | LogInjectionTest.java:958:80:958:87 | source(...) : Object | LogInjectionTest.java:958:71:958:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:958:80:958:87 | source(...) | user-provided value |
-| LogInjectionTest.java:959:56:959:72 | (...)... | LogInjectionTest.java:959:65:959:72 | source(...) : Object | LogInjectionTest.java:959:56:959:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:959:65:959:72 | source(...) | user-provided value |
-| LogInjectionTest.java:960:41:960:57 | (...)... | LogInjectionTest.java:960:50:960:57 | source(...) : Object | LogInjectionTest.java:960:41:960:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:960:50:960:57 | source(...) | user-provided value |
-| LogInjectionTest.java:961:161:961:177 | (...)... | LogInjectionTest.java:961:170:961:177 | source(...) : Object | LogInjectionTest.java:961:161:961:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:961:170:961:177 | source(...) | user-provided value |
-| LogInjectionTest.java:962:146:962:162 | (...)... | LogInjectionTest.java:962:155:962:162 | source(...) : Object | LogInjectionTest.java:962:146:962:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:962:155:962:162 | source(...) | user-provided value |
-| LogInjectionTest.java:963:131:963:147 | (...)... | LogInjectionTest.java:963:140:963:147 | source(...) : Object | LogInjectionTest.java:963:131:963:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:963:140:963:147 | source(...) | user-provided value |
-| LogInjectionTest.java:964:116:964:132 | (...)... | LogInjectionTest.java:964:125:964:132 | source(...) : Object | LogInjectionTest.java:964:116:964:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:964:125:964:132 | source(...) | user-provided value |
-| LogInjectionTest.java:965:101:965:117 | (...)... | LogInjectionTest.java:965:110:965:117 | source(...) : Object | LogInjectionTest.java:965:101:965:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:965:110:965:117 | source(...) | user-provided value |
-| LogInjectionTest.java:966:86:966:102 | (...)... | LogInjectionTest.java:966:95:966:102 | source(...) : Object | LogInjectionTest.java:966:86:966:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:966:95:966:102 | source(...) | user-provided value |
-| LogInjectionTest.java:967:71:967:87 | (...)... | LogInjectionTest.java:967:80:967:87 | source(...) : Object | LogInjectionTest.java:967:71:967:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:967:80:967:87 | source(...) | user-provided value |
-| LogInjectionTest.java:968:56:968:72 | (...)... | LogInjectionTest.java:968:65:968:72 | source(...) : Object | LogInjectionTest.java:968:56:968:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:968:65:968:72 | source(...) | user-provided value |
-| LogInjectionTest.java:969:41:969:57 | (...)... | LogInjectionTest.java:969:50:969:57 | source(...) : Object | LogInjectionTest.java:969:41:969:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:969:50:969:57 | source(...) | user-provided value |
-| LogInjectionTest.java:970:176:970:192 | (...)... | LogInjectionTest.java:970:185:970:192 | source(...) : Object | LogInjectionTest.java:970:176:970:192 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:970:185:970:192 | source(...) | user-provided value |
-| LogInjectionTest.java:971:161:971:177 | (...)... | LogInjectionTest.java:971:170:971:177 | source(...) : Object | LogInjectionTest.java:971:161:971:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:971:170:971:177 | source(...) | user-provided value |
-| LogInjectionTest.java:972:146:972:162 | (...)... | LogInjectionTest.java:972:155:972:162 | source(...) : Object | LogInjectionTest.java:972:146:972:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:972:155:972:162 | source(...) | user-provided value |
-| LogInjectionTest.java:973:131:973:147 | (...)... | LogInjectionTest.java:973:140:973:147 | source(...) : Object | LogInjectionTest.java:973:131:973:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:973:140:973:147 | source(...) | user-provided value |
+| LogInjectionTest.java:940:41:940:57 | (...)... | LogInjectionTest.java:940:50:940:57 | source(...) : Object | LogInjectionTest.java:940:41:940:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:940:50:940:57 | source(...) | user-provided value |
+| LogInjectionTest.java:941:56:941:77 | (...)... | LogInjectionTest.java:941:70:941:77 | source(...) : Object | LogInjectionTest.java:941:56:941:77 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:941:70:941:77 | source(...) | user-provided value |
+| LogInjectionTest.java:942:41:942:57 | (...)... | LogInjectionTest.java:942:50:942:57 | source(...) : Object | LogInjectionTest.java:942:41:942:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:942:50:942:57 | source(...) | user-provided value |
+| LogInjectionTest.java:943:41:943:62 | (...)... | LogInjectionTest.java:943:55:943:62 | source(...) : Object | LogInjectionTest.java:943:41:943:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:943:55:943:62 | source(...) | user-provided value |
+| LogInjectionTest.java:944:41:944:62 | (...)... | LogInjectionTest.java:944:55:944:62 | source(...) : Object | LogInjectionTest.java:944:41:944:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:944:55:944:62 | source(...) | user-provided value |
+| LogInjectionTest.java:945:26:945:51 | (...)... | LogInjectionTest.java:945:44:945:51 | source(...) : Object | LogInjectionTest.java:945:26:945:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:945:44:945:51 | source(...) | user-provided value |
+| LogInjectionTest.java:946:26:946:51 | (...)... | LogInjectionTest.java:946:44:946:51 | source(...) : Object | LogInjectionTest.java:946:26:946:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:946:44:946:51 | source(...) | user-provided value |
+| LogInjectionTest.java:947:26:947:43 | (...)... | LogInjectionTest.java:947:36:947:43 | source(...) : Object | LogInjectionTest.java:947:26:947:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:947:36:947:43 | source(...) | user-provided value |
+| LogInjectionTest.java:948:26:948:43 | (...)... | LogInjectionTest.java:948:36:948:43 | source(...) : Object | LogInjectionTest.java:948:26:948:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:948:36:948:43 | source(...) | user-provided value |
+| LogInjectionTest.java:949:26:949:33 | source(...) | LogInjectionTest.java:949:26:949:33 | source(...) | LogInjectionTest.java:949:26:949:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:949:26:949:33 | source(...) | user-provided value |
+| LogInjectionTest.java:950:26:950:33 | source(...) | LogInjectionTest.java:950:26:950:33 | source(...) | LogInjectionTest.java:950:26:950:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:950:26:950:33 | source(...) | user-provided value |
+| LogInjectionTest.java:951:26:951:42 | (...)... | LogInjectionTest.java:951:35:951:42 | source(...) : Object | LogInjectionTest.java:951:26:951:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:951:35:951:42 | source(...) | user-provided value |
+| LogInjectionTest.java:952:26:952:42 | (...)... | LogInjectionTest.java:952:35:952:42 | source(...) : Object | LogInjectionTest.java:952:26:952:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:952:35:952:42 | source(...) | user-provided value |
+| LogInjectionTest.java:953:41:953:63 | new Object[] | LogInjectionTest.java:953:55:953:62 | source(...) : Object | LogInjectionTest.java:953:41:953:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:953:55:953:62 | source(...) | user-provided value |
+| LogInjectionTest.java:954:41:954:57 | (...)... | LogInjectionTest.java:954:50:954:57 | source(...) : Object | LogInjectionTest.java:954:41:954:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:954:50:954:57 | source(...) | user-provided value |
+| LogInjectionTest.java:955:26:955:42 | (...)... | LogInjectionTest.java:955:35:955:42 | source(...) : Object | LogInjectionTest.java:955:26:955:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:955:35:955:42 | source(...) | user-provided value |
+| LogInjectionTest.java:956:56:956:72 | (...)... | LogInjectionTest.java:956:65:956:72 | source(...) : Object | LogInjectionTest.java:956:56:956:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:956:65:956:72 | source(...) | user-provided value |
+| LogInjectionTest.java:957:41:957:57 | (...)... | LogInjectionTest.java:957:50:957:57 | source(...) : Object | LogInjectionTest.java:957:41:957:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:957:50:957:57 | source(...) | user-provided value |
+| LogInjectionTest.java:958:26:958:42 | (...)... | LogInjectionTest.java:958:35:958:42 | source(...) : Object | LogInjectionTest.java:958:26:958:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:958:35:958:42 | source(...) | user-provided value |
+| LogInjectionTest.java:959:71:959:87 | (...)... | LogInjectionTest.java:959:80:959:87 | source(...) : Object | LogInjectionTest.java:959:71:959:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:959:80:959:87 | source(...) | user-provided value |
+| LogInjectionTest.java:960:56:960:72 | (...)... | LogInjectionTest.java:960:65:960:72 | source(...) : Object | LogInjectionTest.java:960:56:960:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:960:65:960:72 | source(...) | user-provided value |
+| LogInjectionTest.java:961:41:961:57 | (...)... | LogInjectionTest.java:961:50:961:57 | source(...) : Object | LogInjectionTest.java:961:41:961:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:961:50:961:57 | source(...) | user-provided value |
+| LogInjectionTest.java:962:26:962:42 | (...)... | LogInjectionTest.java:962:35:962:42 | source(...) : Object | LogInjectionTest.java:962:26:962:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:962:35:962:42 | source(...) | user-provided value |
+| LogInjectionTest.java:963:86:963:102 | (...)... | LogInjectionTest.java:963:95:963:102 | source(...) : Object | LogInjectionTest.java:963:86:963:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:963:95:963:102 | source(...) | user-provided value |
+| LogInjectionTest.java:964:71:964:87 | (...)... | LogInjectionTest.java:964:80:964:87 | source(...) : Object | LogInjectionTest.java:964:71:964:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:964:80:964:87 | source(...) | user-provided value |
+| LogInjectionTest.java:965:56:965:72 | (...)... | LogInjectionTest.java:965:65:965:72 | source(...) : Object | LogInjectionTest.java:965:56:965:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:965:65:965:72 | source(...) | user-provided value |
+| LogInjectionTest.java:966:41:966:57 | (...)... | LogInjectionTest.java:966:50:966:57 | source(...) : Object | LogInjectionTest.java:966:41:966:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:966:50:966:57 | source(...) | user-provided value |
+| LogInjectionTest.java:967:26:967:42 | (...)... | LogInjectionTest.java:967:35:967:42 | source(...) : Object | LogInjectionTest.java:967:26:967:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:967:35:967:42 | source(...) | user-provided value |
+| LogInjectionTest.java:968:101:968:117 | (...)... | LogInjectionTest.java:968:110:968:117 | source(...) : Object | LogInjectionTest.java:968:101:968:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:968:110:968:117 | source(...) | user-provided value |
+| LogInjectionTest.java:969:86:969:102 | (...)... | LogInjectionTest.java:969:95:969:102 | source(...) : Object | LogInjectionTest.java:969:86:969:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:969:95:969:102 | source(...) | user-provided value |
+| LogInjectionTest.java:970:71:970:87 | (...)... | LogInjectionTest.java:970:80:970:87 | source(...) : Object | LogInjectionTest.java:970:71:970:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:970:80:970:87 | source(...) | user-provided value |
+| LogInjectionTest.java:971:56:971:72 | (...)... | LogInjectionTest.java:971:65:971:72 | source(...) : Object | LogInjectionTest.java:971:56:971:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:971:65:971:72 | source(...) | user-provided value |
+| LogInjectionTest.java:972:41:972:57 | (...)... | LogInjectionTest.java:972:50:972:57 | source(...) : Object | LogInjectionTest.java:972:41:972:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:972:50:972:57 | source(...) | user-provided value |
+| LogInjectionTest.java:973:26:973:42 | (...)... | LogInjectionTest.java:973:35:973:42 | source(...) : Object | LogInjectionTest.java:973:26:973:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:973:35:973:42 | source(...) | user-provided value |
 | LogInjectionTest.java:974:116:974:132 | (...)... | LogInjectionTest.java:974:125:974:132 | source(...) : Object | LogInjectionTest.java:974:116:974:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:974:125:974:132 | source(...) | user-provided value |
 | LogInjectionTest.java:975:101:975:117 | (...)... | LogInjectionTest.java:975:110:975:117 | source(...) : Object | LogInjectionTest.java:975:101:975:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:975:110:975:117 | source(...) | user-provided value |
 | LogInjectionTest.java:976:86:976:102 | (...)... | LogInjectionTest.java:976:95:976:102 | source(...) : Object | LogInjectionTest.java:976:86:976:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:976:95:976:102 | source(...) | user-provided value |
 | LogInjectionTest.java:977:71:977:87 | (...)... | LogInjectionTest.java:977:80:977:87 | source(...) : Object | LogInjectionTest.java:977:71:977:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:977:80:977:87 | source(...) | user-provided value |
 | LogInjectionTest.java:978:56:978:72 | (...)... | LogInjectionTest.java:978:65:978:72 | source(...) : Object | LogInjectionTest.java:978:56:978:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:978:65:978:72 | source(...) | user-provided value |
 | LogInjectionTest.java:979:41:979:57 | (...)... | LogInjectionTest.java:979:50:979:57 | source(...) : Object | LogInjectionTest.java:979:41:979:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:979:50:979:57 | source(...) | user-provided value |
-| LogInjectionTest.java:980:41:980:57 | (...)... | LogInjectionTest.java:980:50:980:57 | source(...) : Object | LogInjectionTest.java:980:41:980:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:980:50:980:57 | source(...) | user-provided value |
-| LogInjectionTest.java:981:56:981:77 | (...)... | LogInjectionTest.java:981:70:981:77 | source(...) : Object | LogInjectionTest.java:981:56:981:77 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:981:70:981:77 | source(...) | user-provided value |
-| LogInjectionTest.java:982:41:982:57 | (...)... | LogInjectionTest.java:982:50:982:57 | source(...) : Object | LogInjectionTest.java:982:41:982:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:982:50:982:57 | source(...) | user-provided value |
-| LogInjectionTest.java:983:41:983:62 | (...)... | LogInjectionTest.java:983:55:983:62 | source(...) : Object | LogInjectionTest.java:983:41:983:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:983:55:983:62 | source(...) | user-provided value |
-| LogInjectionTest.java:984:41:984:62 | (...)... | LogInjectionTest.java:984:55:984:62 | source(...) : Object | LogInjectionTest.java:984:41:984:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:984:55:984:62 | source(...) | user-provided value |
-| LogInjectionTest.java:985:26:985:51 | (...)... | LogInjectionTest.java:985:44:985:51 | source(...) : Object | LogInjectionTest.java:985:26:985:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:985:44:985:51 | source(...) | user-provided value |
-| LogInjectionTest.java:986:26:986:51 | (...)... | LogInjectionTest.java:986:44:986:51 | source(...) : Object | LogInjectionTest.java:986:26:986:51 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:986:44:986:51 | source(...) | user-provided value |
-| LogInjectionTest.java:987:26:987:43 | (...)... | LogInjectionTest.java:987:36:987:43 | source(...) : Object | LogInjectionTest.java:987:26:987:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:987:36:987:43 | source(...) | user-provided value |
-| LogInjectionTest.java:988:26:988:43 | (...)... | LogInjectionTest.java:988:36:988:43 | source(...) : Object | LogInjectionTest.java:988:26:988:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:988:36:988:43 | source(...) | user-provided value |
-| LogInjectionTest.java:989:26:989:33 | source(...) | LogInjectionTest.java:989:26:989:33 | source(...) | LogInjectionTest.java:989:26:989:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:989:26:989:33 | source(...) | user-provided value |
-| LogInjectionTest.java:990:26:990:33 | source(...) | LogInjectionTest.java:990:26:990:33 | source(...) | LogInjectionTest.java:990:26:990:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:990:26:990:33 | source(...) | user-provided value |
-| LogInjectionTest.java:991:26:991:42 | (...)... | LogInjectionTest.java:991:35:991:42 | source(...) : Object | LogInjectionTest.java:991:26:991:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:991:35:991:42 | source(...) | user-provided value |
-| LogInjectionTest.java:992:26:992:42 | (...)... | LogInjectionTest.java:992:35:992:42 | source(...) : Object | LogInjectionTest.java:992:26:992:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:992:35:992:42 | source(...) | user-provided value |
-| LogInjectionTest.java:993:41:993:63 | new Object[] | LogInjectionTest.java:993:55:993:62 | source(...) : Object | LogInjectionTest.java:993:41:993:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:993:55:993:62 | source(...) | user-provided value |
-| LogInjectionTest.java:994:41:994:57 | (...)... | LogInjectionTest.java:994:50:994:57 | source(...) : Object | LogInjectionTest.java:994:41:994:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:994:50:994:57 | source(...) | user-provided value |
-| LogInjectionTest.java:995:26:995:42 | (...)... | LogInjectionTest.java:995:35:995:42 | source(...) : Object | LogInjectionTest.java:995:26:995:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:995:35:995:42 | source(...) | user-provided value |
-| LogInjectionTest.java:996:56:996:72 | (...)... | LogInjectionTest.java:996:65:996:72 | source(...) : Object | LogInjectionTest.java:996:56:996:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:996:65:996:72 | source(...) | user-provided value |
-| LogInjectionTest.java:997:41:997:57 | (...)... | LogInjectionTest.java:997:50:997:57 | source(...) : Object | LogInjectionTest.java:997:41:997:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:997:50:997:57 | source(...) | user-provided value |
-| LogInjectionTest.java:998:26:998:42 | (...)... | LogInjectionTest.java:998:35:998:42 | source(...) : Object | LogInjectionTest.java:998:26:998:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:998:35:998:42 | source(...) | user-provided value |
-| LogInjectionTest.java:999:71:999:87 | (...)... | LogInjectionTest.java:999:80:999:87 | source(...) : Object | LogInjectionTest.java:999:71:999:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:999:80:999:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1000:56:1000:72 | (...)... | LogInjectionTest.java:1000:65:1000:72 | source(...) : Object | LogInjectionTest.java:1000:56:1000:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1000:65:1000:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1001:41:1001:57 | (...)... | LogInjectionTest.java:1001:50:1001:57 | source(...) : Object | LogInjectionTest.java:1001:41:1001:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1001:50:1001:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1002:26:1002:42 | (...)... | LogInjectionTest.java:1002:35:1002:42 | source(...) : Object | LogInjectionTest.java:1002:26:1002:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1002:35:1002:42 | source(...) | user-provided value |
+| LogInjectionTest.java:980:26:980:42 | (...)... | LogInjectionTest.java:980:35:980:42 | source(...) : Object | LogInjectionTest.java:980:26:980:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:980:35:980:42 | source(...) | user-provided value |
+| LogInjectionTest.java:981:131:981:147 | (...)... | LogInjectionTest.java:981:140:981:147 | source(...) : Object | LogInjectionTest.java:981:131:981:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:981:140:981:147 | source(...) | user-provided value |
+| LogInjectionTest.java:982:116:982:132 | (...)... | LogInjectionTest.java:982:125:982:132 | source(...) : Object | LogInjectionTest.java:982:116:982:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:982:125:982:132 | source(...) | user-provided value |
+| LogInjectionTest.java:983:101:983:117 | (...)... | LogInjectionTest.java:983:110:983:117 | source(...) : Object | LogInjectionTest.java:983:101:983:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:983:110:983:117 | source(...) | user-provided value |
+| LogInjectionTest.java:984:86:984:102 | (...)... | LogInjectionTest.java:984:95:984:102 | source(...) : Object | LogInjectionTest.java:984:86:984:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:984:95:984:102 | source(...) | user-provided value |
+| LogInjectionTest.java:985:71:985:87 | (...)... | LogInjectionTest.java:985:80:985:87 | source(...) : Object | LogInjectionTest.java:985:71:985:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:985:80:985:87 | source(...) | user-provided value |
+| LogInjectionTest.java:986:56:986:72 | (...)... | LogInjectionTest.java:986:65:986:72 | source(...) : Object | LogInjectionTest.java:986:56:986:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:986:65:986:72 | source(...) | user-provided value |
+| LogInjectionTest.java:987:41:987:57 | (...)... | LogInjectionTest.java:987:50:987:57 | source(...) : Object | LogInjectionTest.java:987:41:987:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:987:50:987:57 | source(...) | user-provided value |
+| LogInjectionTest.java:988:26:988:42 | (...)... | LogInjectionTest.java:988:35:988:42 | source(...) : Object | LogInjectionTest.java:988:26:988:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:988:35:988:42 | source(...) | user-provided value |
+| LogInjectionTest.java:989:146:989:162 | (...)... | LogInjectionTest.java:989:155:989:162 | source(...) : Object | LogInjectionTest.java:989:146:989:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:989:155:989:162 | source(...) | user-provided value |
+| LogInjectionTest.java:990:131:990:147 | (...)... | LogInjectionTest.java:990:140:990:147 | source(...) : Object | LogInjectionTest.java:990:131:990:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:990:140:990:147 | source(...) | user-provided value |
+| LogInjectionTest.java:991:116:991:132 | (...)... | LogInjectionTest.java:991:125:991:132 | source(...) : Object | LogInjectionTest.java:991:116:991:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:991:125:991:132 | source(...) | user-provided value |
+| LogInjectionTest.java:992:101:992:117 | (...)... | LogInjectionTest.java:992:110:992:117 | source(...) : Object | LogInjectionTest.java:992:101:992:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:992:110:992:117 | source(...) | user-provided value |
+| LogInjectionTest.java:993:86:993:102 | (...)... | LogInjectionTest.java:993:95:993:102 | source(...) : Object | LogInjectionTest.java:993:86:993:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:993:95:993:102 | source(...) | user-provided value |
+| LogInjectionTest.java:994:71:994:87 | (...)... | LogInjectionTest.java:994:80:994:87 | source(...) : Object | LogInjectionTest.java:994:71:994:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:994:80:994:87 | source(...) | user-provided value |
+| LogInjectionTest.java:995:56:995:72 | (...)... | LogInjectionTest.java:995:65:995:72 | source(...) : Object | LogInjectionTest.java:995:56:995:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:995:65:995:72 | source(...) | user-provided value |
+| LogInjectionTest.java:996:41:996:57 | (...)... | LogInjectionTest.java:996:50:996:57 | source(...) : Object | LogInjectionTest.java:996:41:996:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:996:50:996:57 | source(...) | user-provided value |
+| LogInjectionTest.java:997:26:997:42 | (...)... | LogInjectionTest.java:997:35:997:42 | source(...) : Object | LogInjectionTest.java:997:26:997:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:997:35:997:42 | source(...) | user-provided value |
+| LogInjectionTest.java:998:161:998:177 | (...)... | LogInjectionTest.java:998:170:998:177 | source(...) : Object | LogInjectionTest.java:998:161:998:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:998:170:998:177 | source(...) | user-provided value |
+| LogInjectionTest.java:999:146:999:162 | (...)... | LogInjectionTest.java:999:155:999:162 | source(...) : Object | LogInjectionTest.java:999:146:999:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:999:155:999:162 | source(...) | user-provided value |
+| LogInjectionTest.java:1000:131:1000:147 | (...)... | LogInjectionTest.java:1000:140:1000:147 | source(...) : Object | LogInjectionTest.java:1000:131:1000:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1000:140:1000:147 | source(...) | user-provided value |
+| LogInjectionTest.java:1001:116:1001:132 | (...)... | LogInjectionTest.java:1001:125:1001:132 | source(...) : Object | LogInjectionTest.java:1001:116:1001:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1001:125:1001:132 | source(...) | user-provided value |
+| LogInjectionTest.java:1002:101:1002:117 | (...)... | LogInjectionTest.java:1002:110:1002:117 | source(...) : Object | LogInjectionTest.java:1002:101:1002:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1002:110:1002:117 | source(...) | user-provided value |
 | LogInjectionTest.java:1003:86:1003:102 | (...)... | LogInjectionTest.java:1003:95:1003:102 | source(...) : Object | LogInjectionTest.java:1003:86:1003:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1003:95:1003:102 | source(...) | user-provided value |
 | LogInjectionTest.java:1004:71:1004:87 | (...)... | LogInjectionTest.java:1004:80:1004:87 | source(...) : Object | LogInjectionTest.java:1004:71:1004:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1004:80:1004:87 | source(...) | user-provided value |
 | LogInjectionTest.java:1005:56:1005:72 | (...)... | LogInjectionTest.java:1005:65:1005:72 | source(...) : Object | LogInjectionTest.java:1005:56:1005:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1005:65:1005:72 | source(...) | user-provided value |
 | LogInjectionTest.java:1006:41:1006:57 | (...)... | LogInjectionTest.java:1006:50:1006:57 | source(...) : Object | LogInjectionTest.java:1006:41:1006:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1006:50:1006:57 | source(...) | user-provided value |
 | LogInjectionTest.java:1007:26:1007:42 | (...)... | LogInjectionTest.java:1007:35:1007:42 | source(...) : Object | LogInjectionTest.java:1007:26:1007:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1007:35:1007:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1008:101:1008:117 | (...)... | LogInjectionTest.java:1008:110:1008:117 | source(...) : Object | LogInjectionTest.java:1008:101:1008:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1008:110:1008:117 | source(...) | user-provided value |
-| LogInjectionTest.java:1009:86:1009:102 | (...)... | LogInjectionTest.java:1009:95:1009:102 | source(...) : Object | LogInjectionTest.java:1009:86:1009:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1009:95:1009:102 | source(...) | user-provided value |
-| LogInjectionTest.java:1010:71:1010:87 | (...)... | LogInjectionTest.java:1010:80:1010:87 | source(...) : Object | LogInjectionTest.java:1010:71:1010:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1010:80:1010:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1011:56:1011:72 | (...)... | LogInjectionTest.java:1011:65:1011:72 | source(...) : Object | LogInjectionTest.java:1011:56:1011:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1011:65:1011:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1012:41:1012:57 | (...)... | LogInjectionTest.java:1012:50:1012:57 | source(...) : Object | LogInjectionTest.java:1012:41:1012:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1012:50:1012:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1013:26:1013:42 | (...)... | LogInjectionTest.java:1013:35:1013:42 | source(...) : Object | LogInjectionTest.java:1013:26:1013:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1013:35:1013:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1014:116:1014:132 | (...)... | LogInjectionTest.java:1014:125:1014:132 | source(...) : Object | LogInjectionTest.java:1014:116:1014:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1014:125:1014:132 | source(...) | user-provided value |
-| LogInjectionTest.java:1015:101:1015:117 | (...)... | LogInjectionTest.java:1015:110:1015:117 | source(...) : Object | LogInjectionTest.java:1015:101:1015:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1015:110:1015:117 | source(...) | user-provided value |
-| LogInjectionTest.java:1016:86:1016:102 | (...)... | LogInjectionTest.java:1016:95:1016:102 | source(...) : Object | LogInjectionTest.java:1016:86:1016:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1016:95:1016:102 | source(...) | user-provided value |
-| LogInjectionTest.java:1017:71:1017:87 | (...)... | LogInjectionTest.java:1017:80:1017:87 | source(...) : Object | LogInjectionTest.java:1017:71:1017:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1017:80:1017:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1018:56:1018:72 | (...)... | LogInjectionTest.java:1018:65:1018:72 | source(...) : Object | LogInjectionTest.java:1018:56:1018:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1018:65:1018:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1019:41:1019:57 | (...)... | LogInjectionTest.java:1019:50:1019:57 | source(...) : Object | LogInjectionTest.java:1019:41:1019:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1019:50:1019:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1020:26:1020:42 | (...)... | LogInjectionTest.java:1020:35:1020:42 | source(...) : Object | LogInjectionTest.java:1020:26:1020:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1020:35:1020:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1021:131:1021:147 | (...)... | LogInjectionTest.java:1021:140:1021:147 | source(...) : Object | LogInjectionTest.java:1021:131:1021:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1021:140:1021:147 | source(...) | user-provided value |
-| LogInjectionTest.java:1022:116:1022:132 | (...)... | LogInjectionTest.java:1022:125:1022:132 | source(...) : Object | LogInjectionTest.java:1022:116:1022:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1022:125:1022:132 | source(...) | user-provided value |
-| LogInjectionTest.java:1023:101:1023:117 | (...)... | LogInjectionTest.java:1023:110:1023:117 | source(...) : Object | LogInjectionTest.java:1023:101:1023:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1023:110:1023:117 | source(...) | user-provided value |
-| LogInjectionTest.java:1024:86:1024:102 | (...)... | LogInjectionTest.java:1024:95:1024:102 | source(...) : Object | LogInjectionTest.java:1024:86:1024:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1024:95:1024:102 | source(...) | user-provided value |
-| LogInjectionTest.java:1025:71:1025:87 | (...)... | LogInjectionTest.java:1025:80:1025:87 | source(...) : Object | LogInjectionTest.java:1025:71:1025:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1025:80:1025:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1026:56:1026:72 | (...)... | LogInjectionTest.java:1026:65:1026:72 | source(...) : Object | LogInjectionTest.java:1026:56:1026:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1026:65:1026:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1027:41:1027:57 | (...)... | LogInjectionTest.java:1027:50:1027:57 | source(...) : Object | LogInjectionTest.java:1027:41:1027:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1027:50:1027:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1028:26:1028:42 | (...)... | LogInjectionTest.java:1028:35:1028:42 | source(...) : Object | LogInjectionTest.java:1028:26:1028:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1028:35:1028:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1029:146:1029:162 | (...)... | LogInjectionTest.java:1029:155:1029:162 | source(...) : Object | LogInjectionTest.java:1029:146:1029:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1029:155:1029:162 | source(...) | user-provided value |
-| LogInjectionTest.java:1030:131:1030:147 | (...)... | LogInjectionTest.java:1030:140:1030:147 | source(...) : Object | LogInjectionTest.java:1030:131:1030:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1030:140:1030:147 | source(...) | user-provided value |
-| LogInjectionTest.java:1031:116:1031:132 | (...)... | LogInjectionTest.java:1031:125:1031:132 | source(...) : Object | LogInjectionTest.java:1031:116:1031:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1031:125:1031:132 | source(...) | user-provided value |
-| LogInjectionTest.java:1032:101:1032:117 | (...)... | LogInjectionTest.java:1032:110:1032:117 | source(...) : Object | LogInjectionTest.java:1032:101:1032:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1032:110:1032:117 | source(...) | user-provided value |
-| LogInjectionTest.java:1033:86:1033:102 | (...)... | LogInjectionTest.java:1033:95:1033:102 | source(...) : Object | LogInjectionTest.java:1033:86:1033:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1033:95:1033:102 | source(...) | user-provided value |
-| LogInjectionTest.java:1034:71:1034:87 | (...)... | LogInjectionTest.java:1034:80:1034:87 | source(...) : Object | LogInjectionTest.java:1034:71:1034:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1034:80:1034:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1035:56:1035:72 | (...)... | LogInjectionTest.java:1035:65:1035:72 | source(...) : Object | LogInjectionTest.java:1035:56:1035:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1035:65:1035:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1036:41:1036:57 | (...)... | LogInjectionTest.java:1036:50:1036:57 | source(...) : Object | LogInjectionTest.java:1036:41:1036:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1036:50:1036:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1037:26:1037:42 | (...)... | LogInjectionTest.java:1037:35:1037:42 | source(...) : Object | LogInjectionTest.java:1037:26:1037:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1037:35:1037:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1038:161:1038:177 | (...)... | LogInjectionTest.java:1038:170:1038:177 | source(...) : Object | LogInjectionTest.java:1038:161:1038:177 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1038:170:1038:177 | source(...) | user-provided value |
-| LogInjectionTest.java:1039:146:1039:162 | (...)... | LogInjectionTest.java:1039:155:1039:162 | source(...) : Object | LogInjectionTest.java:1039:146:1039:162 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1039:155:1039:162 | source(...) | user-provided value |
-| LogInjectionTest.java:1040:131:1040:147 | (...)... | LogInjectionTest.java:1040:140:1040:147 | source(...) : Object | LogInjectionTest.java:1040:131:1040:147 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1040:140:1040:147 | source(...) | user-provided value |
-| LogInjectionTest.java:1041:116:1041:132 | (...)... | LogInjectionTest.java:1041:125:1041:132 | source(...) : Object | LogInjectionTest.java:1041:116:1041:132 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1041:125:1041:132 | source(...) | user-provided value |
-| LogInjectionTest.java:1042:101:1042:117 | (...)... | LogInjectionTest.java:1042:110:1042:117 | source(...) : Object | LogInjectionTest.java:1042:101:1042:117 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1042:110:1042:117 | source(...) | user-provided value |
-| LogInjectionTest.java:1043:86:1043:102 | (...)... | LogInjectionTest.java:1043:95:1043:102 | source(...) : Object | LogInjectionTest.java:1043:86:1043:102 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1043:95:1043:102 | source(...) | user-provided value |
-| LogInjectionTest.java:1044:71:1044:87 | (...)... | LogInjectionTest.java:1044:80:1044:87 | source(...) : Object | LogInjectionTest.java:1044:71:1044:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1044:80:1044:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1045:56:1045:72 | (...)... | LogInjectionTest.java:1045:65:1045:72 | source(...) : Object | LogInjectionTest.java:1045:56:1045:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1045:65:1045:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1046:41:1046:57 | (...)... | LogInjectionTest.java:1046:50:1046:57 | source(...) : Object | LogInjectionTest.java:1046:41:1046:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1046:50:1046:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1047:26:1047:42 | (...)... | LogInjectionTest.java:1047:35:1047:42 | source(...) : Object | LogInjectionTest.java:1047:26:1047:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1047:35:1047:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1048:26:1048:42 | (...)... | LogInjectionTest.java:1048:35:1048:42 | source(...) : Object | LogInjectionTest.java:1048:26:1048:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1048:35:1048:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1049:41:1049:62 | (...)... | LogInjectionTest.java:1049:55:1049:62 | source(...) : Object | LogInjectionTest.java:1049:41:1049:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1049:55:1049:62 | source(...) | user-provided value |
-| LogInjectionTest.java:1050:26:1050:42 | (...)... | LogInjectionTest.java:1050:35:1050:42 | source(...) : Object | LogInjectionTest.java:1050:26:1050:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1050:35:1050:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1051:26:1051:47 | (...)... | LogInjectionTest.java:1051:40:1051:47 | source(...) : Object | LogInjectionTest.java:1051:26:1051:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1051:40:1051:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1052:26:1052:47 | (...)... | LogInjectionTest.java:1052:40:1052:47 | source(...) : Object | LogInjectionTest.java:1052:26:1052:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1052:40:1052:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1053:25:1053:47 | (...)... | LogInjectionTest.java:1053:40:1053:47 | source(...) : Object | LogInjectionTest.java:1053:25:1053:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1053:40:1053:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1054:25:1054:47 | (...)... | LogInjectionTest.java:1054:40:1054:47 | source(...) : Object | LogInjectionTest.java:1054:25:1054:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1054:40:1054:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1055:40:1055:62 | (...)... | LogInjectionTest.java:1055:55:1055:62 | source(...) : Object | LogInjectionTest.java:1055:40:1055:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1055:55:1055:62 | source(...) | user-provided value |
-| LogInjectionTest.java:1056:40:1056:62 | (...)... | LogInjectionTest.java:1056:55:1056:62 | source(...) : Object | LogInjectionTest.java:1056:40:1056:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1056:55:1056:62 | source(...) | user-provided value |
-| LogInjectionTest.java:1057:40:1057:57 | (...)... | LogInjectionTest.java:1057:50:1057:57 | source(...) : Object | LogInjectionTest.java:1057:40:1057:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1057:50:1057:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1058:40:1058:65 | (...)... | LogInjectionTest.java:1058:58:1058:65 | source(...) : Object | LogInjectionTest.java:1058:40:1058:65 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1058:58:1058:65 | source(...) | user-provided value |
-| LogInjectionTest.java:1059:40:1059:65 | (...)... | LogInjectionTest.java:1059:58:1059:65 | source(...) : Object | LogInjectionTest.java:1059:40:1059:65 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1059:58:1059:65 | source(...) | user-provided value |
-| LogInjectionTest.java:1060:40:1060:47 | source(...) | LogInjectionTest.java:1060:40:1060:47 | source(...) | LogInjectionTest.java:1060:40:1060:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1060:40:1060:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1061:40:1061:56 | (...)... | LogInjectionTest.java:1061:49:1061:56 | source(...) : Object | LogInjectionTest.java:1061:40:1061:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1061:49:1061:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1062:40:1062:56 | (...)... | LogInjectionTest.java:1062:49:1062:56 | source(...) : Object | LogInjectionTest.java:1062:40:1062:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1062:49:1062:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1063:55:1063:77 | new Object[] | LogInjectionTest.java:1063:69:1063:76 | source(...) : Object | LogInjectionTest.java:1063:55:1063:77 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1063:69:1063:76 | source(...) | user-provided value |
-| LogInjectionTest.java:1064:55:1064:71 | (...)... | LogInjectionTest.java:1064:64:1064:71 | source(...) : Object | LogInjectionTest.java:1064:55:1064:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1064:64:1064:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1065:40:1065:56 | (...)... | LogInjectionTest.java:1065:49:1065:56 | source(...) : Object | LogInjectionTest.java:1065:40:1065:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1065:49:1065:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1066:70:1066:86 | (...)... | LogInjectionTest.java:1066:79:1066:86 | source(...) : Object | LogInjectionTest.java:1066:70:1066:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1066:79:1066:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1067:55:1067:71 | (...)... | LogInjectionTest.java:1067:64:1067:71 | source(...) : Object | LogInjectionTest.java:1067:55:1067:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1067:64:1067:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1068:40:1068:56 | (...)... | LogInjectionTest.java:1068:49:1068:56 | source(...) : Object | LogInjectionTest.java:1068:40:1068:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1068:49:1068:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1069:85:1069:101 | (...)... | LogInjectionTest.java:1069:94:1069:101 | source(...) : Object | LogInjectionTest.java:1069:85:1069:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1069:94:1069:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1070:70:1070:86 | (...)... | LogInjectionTest.java:1070:79:1070:86 | source(...) : Object | LogInjectionTest.java:1070:70:1070:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1070:79:1070:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1071:55:1071:71 | (...)... | LogInjectionTest.java:1071:64:1071:71 | source(...) : Object | LogInjectionTest.java:1071:55:1071:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1071:64:1071:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1072:40:1072:56 | (...)... | LogInjectionTest.java:1072:49:1072:56 | source(...) : Object | LogInjectionTest.java:1072:40:1072:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1072:49:1072:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1008:26:1008:42 | (...)... | LogInjectionTest.java:1008:35:1008:42 | source(...) : Object | LogInjectionTest.java:1008:26:1008:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1008:35:1008:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1009:41:1009:62 | (...)... | LogInjectionTest.java:1009:55:1009:62 | source(...) : Object | LogInjectionTest.java:1009:41:1009:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1009:55:1009:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1010:26:1010:42 | (...)... | LogInjectionTest.java:1010:35:1010:42 | source(...) : Object | LogInjectionTest.java:1010:26:1010:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1010:35:1010:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1011:26:1011:47 | (...)... | LogInjectionTest.java:1011:40:1011:47 | source(...) : Object | LogInjectionTest.java:1011:26:1011:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1011:40:1011:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1012:26:1012:47 | (...)... | LogInjectionTest.java:1012:40:1012:47 | source(...) : Object | LogInjectionTest.java:1012:26:1012:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1012:40:1012:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1013:25:1013:47 | (...)... | LogInjectionTest.java:1013:40:1013:47 | source(...) : Object | LogInjectionTest.java:1013:25:1013:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1013:40:1013:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1014:25:1014:47 | (...)... | LogInjectionTest.java:1014:40:1014:47 | source(...) : Object | LogInjectionTest.java:1014:25:1014:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1014:40:1014:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1015:40:1015:62 | (...)... | LogInjectionTest.java:1015:55:1015:62 | source(...) : Object | LogInjectionTest.java:1015:40:1015:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1015:55:1015:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1016:40:1016:62 | (...)... | LogInjectionTest.java:1016:55:1016:62 | source(...) : Object | LogInjectionTest.java:1016:40:1016:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1016:55:1016:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1017:40:1017:57 | (...)... | LogInjectionTest.java:1017:50:1017:57 | source(...) : Object | LogInjectionTest.java:1017:40:1017:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1017:50:1017:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1018:40:1018:65 | (...)... | LogInjectionTest.java:1018:58:1018:65 | source(...) : Object | LogInjectionTest.java:1018:40:1018:65 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1018:58:1018:65 | source(...) | user-provided value |
+| LogInjectionTest.java:1019:40:1019:65 | (...)... | LogInjectionTest.java:1019:58:1019:65 | source(...) : Object | LogInjectionTest.java:1019:40:1019:65 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1019:58:1019:65 | source(...) | user-provided value |
+| LogInjectionTest.java:1020:40:1020:47 | source(...) | LogInjectionTest.java:1020:40:1020:47 | source(...) | LogInjectionTest.java:1020:40:1020:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1020:40:1020:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1021:40:1021:56 | (...)... | LogInjectionTest.java:1021:49:1021:56 | source(...) : Object | LogInjectionTest.java:1021:40:1021:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1021:49:1021:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1022:40:1022:56 | (...)... | LogInjectionTest.java:1022:49:1022:56 | source(...) : Object | LogInjectionTest.java:1022:40:1022:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1022:49:1022:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1023:55:1023:77 | new Object[] | LogInjectionTest.java:1023:69:1023:76 | source(...) : Object | LogInjectionTest.java:1023:55:1023:77 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1023:69:1023:76 | source(...) | user-provided value |
+| LogInjectionTest.java:1024:55:1024:71 | (...)... | LogInjectionTest.java:1024:64:1024:71 | source(...) : Object | LogInjectionTest.java:1024:55:1024:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1024:64:1024:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1025:40:1025:56 | (...)... | LogInjectionTest.java:1025:49:1025:56 | source(...) : Object | LogInjectionTest.java:1025:40:1025:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1025:49:1025:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1026:70:1026:86 | (...)... | LogInjectionTest.java:1026:79:1026:86 | source(...) : Object | LogInjectionTest.java:1026:70:1026:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1026:79:1026:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1027:55:1027:71 | (...)... | LogInjectionTest.java:1027:64:1027:71 | source(...) : Object | LogInjectionTest.java:1027:55:1027:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1027:64:1027:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1028:40:1028:56 | (...)... | LogInjectionTest.java:1028:49:1028:56 | source(...) : Object | LogInjectionTest.java:1028:40:1028:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1028:49:1028:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1029:85:1029:101 | (...)... | LogInjectionTest.java:1029:94:1029:101 | source(...) : Object | LogInjectionTest.java:1029:85:1029:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1029:94:1029:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1030:70:1030:86 | (...)... | LogInjectionTest.java:1030:79:1030:86 | source(...) : Object | LogInjectionTest.java:1030:70:1030:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1030:79:1030:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1031:55:1031:71 | (...)... | LogInjectionTest.java:1031:64:1031:71 | source(...) : Object | LogInjectionTest.java:1031:55:1031:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1031:64:1031:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1032:40:1032:56 | (...)... | LogInjectionTest.java:1032:49:1032:56 | source(...) : Object | LogInjectionTest.java:1032:40:1032:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1032:49:1032:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1033:100:1033:116 | (...)... | LogInjectionTest.java:1033:109:1033:116 | source(...) : Object | LogInjectionTest.java:1033:100:1033:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1033:109:1033:116 | source(...) | user-provided value |
+| LogInjectionTest.java:1034:85:1034:101 | (...)... | LogInjectionTest.java:1034:94:1034:101 | source(...) : Object | LogInjectionTest.java:1034:85:1034:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1034:94:1034:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1035:70:1035:86 | (...)... | LogInjectionTest.java:1035:79:1035:86 | source(...) : Object | LogInjectionTest.java:1035:70:1035:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1035:79:1035:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1036:55:1036:71 | (...)... | LogInjectionTest.java:1036:64:1036:71 | source(...) : Object | LogInjectionTest.java:1036:55:1036:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1036:64:1036:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1037:40:1037:56 | (...)... | LogInjectionTest.java:1037:49:1037:56 | source(...) : Object | LogInjectionTest.java:1037:40:1037:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1037:49:1037:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1038:115:1038:131 | (...)... | LogInjectionTest.java:1038:124:1038:131 | source(...) : Object | LogInjectionTest.java:1038:115:1038:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1038:124:1038:131 | source(...) | user-provided value |
+| LogInjectionTest.java:1039:100:1039:116 | (...)... | LogInjectionTest.java:1039:109:1039:116 | source(...) : Object | LogInjectionTest.java:1039:100:1039:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1039:109:1039:116 | source(...) | user-provided value |
+| LogInjectionTest.java:1040:85:1040:101 | (...)... | LogInjectionTest.java:1040:94:1040:101 | source(...) : Object | LogInjectionTest.java:1040:85:1040:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1040:94:1040:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1041:70:1041:86 | (...)... | LogInjectionTest.java:1041:79:1041:86 | source(...) : Object | LogInjectionTest.java:1041:70:1041:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1041:79:1041:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1042:55:1042:71 | (...)... | LogInjectionTest.java:1042:64:1042:71 | source(...) : Object | LogInjectionTest.java:1042:55:1042:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1042:64:1042:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1043:40:1043:56 | (...)... | LogInjectionTest.java:1043:49:1043:56 | source(...) : Object | LogInjectionTest.java:1043:40:1043:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1043:49:1043:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1044:130:1044:146 | (...)... | LogInjectionTest.java:1044:139:1044:146 | source(...) : Object | LogInjectionTest.java:1044:130:1044:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1044:139:1044:146 | source(...) | user-provided value |
+| LogInjectionTest.java:1045:115:1045:131 | (...)... | LogInjectionTest.java:1045:124:1045:131 | source(...) : Object | LogInjectionTest.java:1045:115:1045:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1045:124:1045:131 | source(...) | user-provided value |
+| LogInjectionTest.java:1046:100:1046:116 | (...)... | LogInjectionTest.java:1046:109:1046:116 | source(...) : Object | LogInjectionTest.java:1046:100:1046:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1046:109:1046:116 | source(...) | user-provided value |
+| LogInjectionTest.java:1047:85:1047:101 | (...)... | LogInjectionTest.java:1047:94:1047:101 | source(...) : Object | LogInjectionTest.java:1047:85:1047:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1047:94:1047:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1048:70:1048:86 | (...)... | LogInjectionTest.java:1048:79:1048:86 | source(...) : Object | LogInjectionTest.java:1048:70:1048:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1048:79:1048:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1049:55:1049:71 | (...)... | LogInjectionTest.java:1049:64:1049:71 | source(...) : Object | LogInjectionTest.java:1049:55:1049:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1049:64:1049:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1050:40:1050:56 | (...)... | LogInjectionTest.java:1050:49:1050:56 | source(...) : Object | LogInjectionTest.java:1050:40:1050:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1050:49:1050:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1051:145:1051:161 | (...)... | LogInjectionTest.java:1051:154:1051:161 | source(...) : Object | LogInjectionTest.java:1051:145:1051:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1051:154:1051:161 | source(...) | user-provided value |
+| LogInjectionTest.java:1052:130:1052:146 | (...)... | LogInjectionTest.java:1052:139:1052:146 | source(...) : Object | LogInjectionTest.java:1052:130:1052:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1052:139:1052:146 | source(...) | user-provided value |
+| LogInjectionTest.java:1053:115:1053:131 | (...)... | LogInjectionTest.java:1053:124:1053:131 | source(...) : Object | LogInjectionTest.java:1053:115:1053:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1053:124:1053:131 | source(...) | user-provided value |
+| LogInjectionTest.java:1054:100:1054:116 | (...)... | LogInjectionTest.java:1054:109:1054:116 | source(...) : Object | LogInjectionTest.java:1054:100:1054:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1054:109:1054:116 | source(...) | user-provided value |
+| LogInjectionTest.java:1055:85:1055:101 | (...)... | LogInjectionTest.java:1055:94:1055:101 | source(...) : Object | LogInjectionTest.java:1055:85:1055:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1055:94:1055:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1056:70:1056:86 | (...)... | LogInjectionTest.java:1056:79:1056:86 | source(...) : Object | LogInjectionTest.java:1056:70:1056:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1056:79:1056:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1057:55:1057:71 | (...)... | LogInjectionTest.java:1057:64:1057:71 | source(...) : Object | LogInjectionTest.java:1057:55:1057:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1057:64:1057:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1058:40:1058:56 | (...)... | LogInjectionTest.java:1058:49:1058:56 | source(...) : Object | LogInjectionTest.java:1058:40:1058:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1058:49:1058:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1059:160:1059:176 | (...)... | LogInjectionTest.java:1059:169:1059:176 | source(...) : Object | LogInjectionTest.java:1059:160:1059:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1059:169:1059:176 | source(...) | user-provided value |
+| LogInjectionTest.java:1060:145:1060:161 | (...)... | LogInjectionTest.java:1060:154:1060:161 | source(...) : Object | LogInjectionTest.java:1060:145:1060:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1060:154:1060:161 | source(...) | user-provided value |
+| LogInjectionTest.java:1061:130:1061:146 | (...)... | LogInjectionTest.java:1061:139:1061:146 | source(...) : Object | LogInjectionTest.java:1061:130:1061:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1061:139:1061:146 | source(...) | user-provided value |
+| LogInjectionTest.java:1062:115:1062:131 | (...)... | LogInjectionTest.java:1062:124:1062:131 | source(...) : Object | LogInjectionTest.java:1062:115:1062:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1062:124:1062:131 | source(...) | user-provided value |
+| LogInjectionTest.java:1063:100:1063:116 | (...)... | LogInjectionTest.java:1063:109:1063:116 | source(...) : Object | LogInjectionTest.java:1063:100:1063:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1063:109:1063:116 | source(...) | user-provided value |
+| LogInjectionTest.java:1064:85:1064:101 | (...)... | LogInjectionTest.java:1064:94:1064:101 | source(...) : Object | LogInjectionTest.java:1064:85:1064:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1064:94:1064:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1065:70:1065:86 | (...)... | LogInjectionTest.java:1065:79:1065:86 | source(...) : Object | LogInjectionTest.java:1065:70:1065:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1065:79:1065:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1066:55:1066:71 | (...)... | LogInjectionTest.java:1066:64:1066:71 | source(...) : Object | LogInjectionTest.java:1066:55:1066:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1066:64:1066:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1067:40:1067:56 | (...)... | LogInjectionTest.java:1067:49:1067:56 | source(...) : Object | LogInjectionTest.java:1067:40:1067:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1067:49:1067:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1068:175:1068:191 | (...)... | LogInjectionTest.java:1068:184:1068:191 | source(...) : Object | LogInjectionTest.java:1068:175:1068:191 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1068:184:1068:191 | source(...) | user-provided value |
+| LogInjectionTest.java:1069:160:1069:176 | (...)... | LogInjectionTest.java:1069:169:1069:176 | source(...) : Object | LogInjectionTest.java:1069:160:1069:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1069:169:1069:176 | source(...) | user-provided value |
+| LogInjectionTest.java:1070:145:1070:161 | (...)... | LogInjectionTest.java:1070:154:1070:161 | source(...) : Object | LogInjectionTest.java:1070:145:1070:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1070:154:1070:161 | source(...) | user-provided value |
+| LogInjectionTest.java:1071:130:1071:146 | (...)... | LogInjectionTest.java:1071:139:1071:146 | source(...) : Object | LogInjectionTest.java:1071:130:1071:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1071:139:1071:146 | source(...) | user-provided value |
+| LogInjectionTest.java:1072:115:1072:131 | (...)... | LogInjectionTest.java:1072:124:1072:131 | source(...) : Object | LogInjectionTest.java:1072:115:1072:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1072:124:1072:131 | source(...) | user-provided value |
 | LogInjectionTest.java:1073:100:1073:116 | (...)... | LogInjectionTest.java:1073:109:1073:116 | source(...) : Object | LogInjectionTest.java:1073:100:1073:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1073:109:1073:116 | source(...) | user-provided value |
 | LogInjectionTest.java:1074:85:1074:101 | (...)... | LogInjectionTest.java:1074:94:1074:101 | source(...) : Object | LogInjectionTest.java:1074:85:1074:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1074:94:1074:101 | source(...) | user-provided value |
 | LogInjectionTest.java:1075:70:1075:86 | (...)... | LogInjectionTest.java:1075:79:1075:86 | source(...) : Object | LogInjectionTest.java:1075:70:1075:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1075:79:1075:86 | source(...) | user-provided value |
 | LogInjectionTest.java:1076:55:1076:71 | (...)... | LogInjectionTest.java:1076:64:1076:71 | source(...) : Object | LogInjectionTest.java:1076:55:1076:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1076:64:1076:71 | source(...) | user-provided value |
 | LogInjectionTest.java:1077:40:1077:56 | (...)... | LogInjectionTest.java:1077:49:1077:56 | source(...) : Object | LogInjectionTest.java:1077:40:1077:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1077:49:1077:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1078:115:1078:131 | (...)... | LogInjectionTest.java:1078:124:1078:131 | source(...) : Object | LogInjectionTest.java:1078:115:1078:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1078:124:1078:131 | source(...) | user-provided value |
-| LogInjectionTest.java:1079:100:1079:116 | (...)... | LogInjectionTest.java:1079:109:1079:116 | source(...) : Object | LogInjectionTest.java:1079:100:1079:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1079:109:1079:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1080:85:1080:101 | (...)... | LogInjectionTest.java:1080:94:1080:101 | source(...) : Object | LogInjectionTest.java:1080:85:1080:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1080:94:1080:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1081:70:1081:86 | (...)... | LogInjectionTest.java:1081:79:1081:86 | source(...) : Object | LogInjectionTest.java:1081:70:1081:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1081:79:1081:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1082:55:1082:71 | (...)... | LogInjectionTest.java:1082:64:1082:71 | source(...) : Object | LogInjectionTest.java:1082:55:1082:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1082:64:1082:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1083:40:1083:56 | (...)... | LogInjectionTest.java:1083:49:1083:56 | source(...) : Object | LogInjectionTest.java:1083:40:1083:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1083:49:1083:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1084:130:1084:146 | (...)... | LogInjectionTest.java:1084:139:1084:146 | source(...) : Object | LogInjectionTest.java:1084:130:1084:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1084:139:1084:146 | source(...) | user-provided value |
-| LogInjectionTest.java:1085:115:1085:131 | (...)... | LogInjectionTest.java:1085:124:1085:131 | source(...) : Object | LogInjectionTest.java:1085:115:1085:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1085:124:1085:131 | source(...) | user-provided value |
-| LogInjectionTest.java:1086:100:1086:116 | (...)... | LogInjectionTest.java:1086:109:1086:116 | source(...) : Object | LogInjectionTest.java:1086:100:1086:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1086:109:1086:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1087:85:1087:101 | (...)... | LogInjectionTest.java:1087:94:1087:101 | source(...) : Object | LogInjectionTest.java:1087:85:1087:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1087:94:1087:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1088:70:1088:86 | (...)... | LogInjectionTest.java:1088:79:1088:86 | source(...) : Object | LogInjectionTest.java:1088:70:1088:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1088:79:1088:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1089:55:1089:71 | (...)... | LogInjectionTest.java:1089:64:1089:71 | source(...) : Object | LogInjectionTest.java:1089:55:1089:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1089:64:1089:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1090:40:1090:56 | (...)... | LogInjectionTest.java:1090:49:1090:56 | source(...) : Object | LogInjectionTest.java:1090:40:1090:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1090:49:1090:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1091:145:1091:161 | (...)... | LogInjectionTest.java:1091:154:1091:161 | source(...) : Object | LogInjectionTest.java:1091:145:1091:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1091:154:1091:161 | source(...) | user-provided value |
-| LogInjectionTest.java:1092:130:1092:146 | (...)... | LogInjectionTest.java:1092:139:1092:146 | source(...) : Object | LogInjectionTest.java:1092:130:1092:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1092:139:1092:146 | source(...) | user-provided value |
-| LogInjectionTest.java:1093:115:1093:131 | (...)... | LogInjectionTest.java:1093:124:1093:131 | source(...) : Object | LogInjectionTest.java:1093:115:1093:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1093:124:1093:131 | source(...) | user-provided value |
-| LogInjectionTest.java:1094:100:1094:116 | (...)... | LogInjectionTest.java:1094:109:1094:116 | source(...) : Object | LogInjectionTest.java:1094:100:1094:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1094:109:1094:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1095:85:1095:101 | (...)... | LogInjectionTest.java:1095:94:1095:101 | source(...) : Object | LogInjectionTest.java:1095:85:1095:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1095:94:1095:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1096:70:1096:86 | (...)... | LogInjectionTest.java:1096:79:1096:86 | source(...) : Object | LogInjectionTest.java:1096:70:1096:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1096:79:1096:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1097:55:1097:71 | (...)... | LogInjectionTest.java:1097:64:1097:71 | source(...) : Object | LogInjectionTest.java:1097:55:1097:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1097:64:1097:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1098:40:1098:56 | (...)... | LogInjectionTest.java:1098:49:1098:56 | source(...) : Object | LogInjectionTest.java:1098:40:1098:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1098:49:1098:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1099:160:1099:176 | (...)... | LogInjectionTest.java:1099:169:1099:176 | source(...) : Object | LogInjectionTest.java:1099:160:1099:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1099:169:1099:176 | source(...) | user-provided value |
-| LogInjectionTest.java:1100:145:1100:161 | (...)... | LogInjectionTest.java:1100:154:1100:161 | source(...) : Object | LogInjectionTest.java:1100:145:1100:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1100:154:1100:161 | source(...) | user-provided value |
-| LogInjectionTest.java:1101:130:1101:146 | (...)... | LogInjectionTest.java:1101:139:1101:146 | source(...) : Object | LogInjectionTest.java:1101:130:1101:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1101:139:1101:146 | source(...) | user-provided value |
-| LogInjectionTest.java:1102:115:1102:131 | (...)... | LogInjectionTest.java:1102:124:1102:131 | source(...) : Object | LogInjectionTest.java:1102:115:1102:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1102:124:1102:131 | source(...) | user-provided value |
-| LogInjectionTest.java:1103:100:1103:116 | (...)... | LogInjectionTest.java:1103:109:1103:116 | source(...) : Object | LogInjectionTest.java:1103:100:1103:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1103:109:1103:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1104:85:1104:101 | (...)... | LogInjectionTest.java:1104:94:1104:101 | source(...) : Object | LogInjectionTest.java:1104:85:1104:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1104:94:1104:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1105:70:1105:86 | (...)... | LogInjectionTest.java:1105:79:1105:86 | source(...) : Object | LogInjectionTest.java:1105:70:1105:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1105:79:1105:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1106:55:1106:71 | (...)... | LogInjectionTest.java:1106:64:1106:71 | source(...) : Object | LogInjectionTest.java:1106:55:1106:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1106:64:1106:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1107:40:1107:56 | (...)... | LogInjectionTest.java:1107:49:1107:56 | source(...) : Object | LogInjectionTest.java:1107:40:1107:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1107:49:1107:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1108:175:1108:191 | (...)... | LogInjectionTest.java:1108:184:1108:191 | source(...) : Object | LogInjectionTest.java:1108:175:1108:191 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1108:184:1108:191 | source(...) | user-provided value |
-| LogInjectionTest.java:1109:160:1109:176 | (...)... | LogInjectionTest.java:1109:169:1109:176 | source(...) : Object | LogInjectionTest.java:1109:160:1109:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1109:169:1109:176 | source(...) | user-provided value |
-| LogInjectionTest.java:1110:145:1110:161 | (...)... | LogInjectionTest.java:1110:154:1110:161 | source(...) : Object | LogInjectionTest.java:1110:145:1110:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1110:154:1110:161 | source(...) | user-provided value |
-| LogInjectionTest.java:1111:130:1111:146 | (...)... | LogInjectionTest.java:1111:139:1111:146 | source(...) : Object | LogInjectionTest.java:1111:130:1111:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1111:139:1111:146 | source(...) | user-provided value |
+| LogInjectionTest.java:1078:40:1078:56 | (...)... | LogInjectionTest.java:1078:49:1078:56 | source(...) : Object | LogInjectionTest.java:1078:40:1078:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1078:49:1078:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1079:55:1079:76 | (...)... | LogInjectionTest.java:1079:69:1079:76 | source(...) : Object | LogInjectionTest.java:1079:55:1079:76 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1079:69:1079:76 | source(...) | user-provided value |
+| LogInjectionTest.java:1080:40:1080:56 | (...)... | LogInjectionTest.java:1080:49:1080:56 | source(...) : Object | LogInjectionTest.java:1080:40:1080:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1080:49:1080:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1081:40:1081:61 | (...)... | LogInjectionTest.java:1081:54:1081:61 | source(...) : Object | LogInjectionTest.java:1081:40:1081:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1081:54:1081:61 | source(...) | user-provided value |
+| LogInjectionTest.java:1082:40:1082:61 | (...)... | LogInjectionTest.java:1082:54:1082:61 | source(...) : Object | LogInjectionTest.java:1082:40:1082:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1082:54:1082:61 | source(...) | user-provided value |
+| LogInjectionTest.java:1083:25:1083:50 | (...)... | LogInjectionTest.java:1083:43:1083:50 | source(...) : Object | LogInjectionTest.java:1083:25:1083:50 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1083:43:1083:50 | source(...) | user-provided value |
+| LogInjectionTest.java:1084:25:1084:50 | (...)... | LogInjectionTest.java:1084:43:1084:50 | source(...) : Object | LogInjectionTest.java:1084:25:1084:50 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1084:43:1084:50 | source(...) | user-provided value |
+| LogInjectionTest.java:1085:25:1085:42 | (...)... | LogInjectionTest.java:1085:35:1085:42 | source(...) : Object | LogInjectionTest.java:1085:25:1085:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1085:35:1085:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1086:25:1086:42 | (...)... | LogInjectionTest.java:1086:35:1086:42 | source(...) : Object | LogInjectionTest.java:1086:25:1086:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1086:35:1086:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1087:25:1087:32 | source(...) | LogInjectionTest.java:1087:25:1087:32 | source(...) | LogInjectionTest.java:1087:25:1087:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1087:25:1087:32 | source(...) | user-provided value |
+| LogInjectionTest.java:1088:25:1088:32 | source(...) | LogInjectionTest.java:1088:25:1088:32 | source(...) | LogInjectionTest.java:1088:25:1088:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1088:25:1088:32 | source(...) | user-provided value |
+| LogInjectionTest.java:1089:25:1089:41 | (...)... | LogInjectionTest.java:1089:34:1089:41 | source(...) : Object | LogInjectionTest.java:1089:25:1089:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1089:34:1089:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1090:25:1090:41 | (...)... | LogInjectionTest.java:1090:34:1090:41 | source(...) : Object | LogInjectionTest.java:1090:25:1090:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1090:34:1090:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1091:40:1091:62 | new Object[] | LogInjectionTest.java:1091:54:1091:61 | source(...) : Object | LogInjectionTest.java:1091:40:1091:62 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1091:54:1091:61 | source(...) | user-provided value |
+| LogInjectionTest.java:1092:40:1092:56 | (...)... | LogInjectionTest.java:1092:49:1092:56 | source(...) : Object | LogInjectionTest.java:1092:40:1092:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1092:49:1092:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1093:25:1093:41 | (...)... | LogInjectionTest.java:1093:34:1093:41 | source(...) : Object | LogInjectionTest.java:1093:25:1093:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1093:34:1093:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1094:55:1094:71 | (...)... | LogInjectionTest.java:1094:64:1094:71 | source(...) : Object | LogInjectionTest.java:1094:55:1094:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1094:64:1094:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1095:40:1095:56 | (...)... | LogInjectionTest.java:1095:49:1095:56 | source(...) : Object | LogInjectionTest.java:1095:40:1095:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1095:49:1095:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1096:25:1096:41 | (...)... | LogInjectionTest.java:1096:34:1096:41 | source(...) : Object | LogInjectionTest.java:1096:25:1096:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1096:34:1096:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1097:70:1097:86 | (...)... | LogInjectionTest.java:1097:79:1097:86 | source(...) : Object | LogInjectionTest.java:1097:70:1097:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1097:79:1097:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1098:55:1098:71 | (...)... | LogInjectionTest.java:1098:64:1098:71 | source(...) : Object | LogInjectionTest.java:1098:55:1098:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1098:64:1098:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1099:40:1099:56 | (...)... | LogInjectionTest.java:1099:49:1099:56 | source(...) : Object | LogInjectionTest.java:1099:40:1099:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1099:49:1099:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1100:25:1100:41 | (...)... | LogInjectionTest.java:1100:34:1100:41 | source(...) : Object | LogInjectionTest.java:1100:25:1100:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1100:34:1100:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1101:85:1101:101 | (...)... | LogInjectionTest.java:1101:94:1101:101 | source(...) : Object | LogInjectionTest.java:1101:85:1101:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1101:94:1101:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1102:70:1102:86 | (...)... | LogInjectionTest.java:1102:79:1102:86 | source(...) : Object | LogInjectionTest.java:1102:70:1102:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1102:79:1102:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1103:55:1103:71 | (...)... | LogInjectionTest.java:1103:64:1103:71 | source(...) : Object | LogInjectionTest.java:1103:55:1103:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1103:64:1103:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1104:40:1104:56 | (...)... | LogInjectionTest.java:1104:49:1104:56 | source(...) : Object | LogInjectionTest.java:1104:40:1104:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1104:49:1104:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1105:25:1105:41 | (...)... | LogInjectionTest.java:1105:34:1105:41 | source(...) : Object | LogInjectionTest.java:1105:25:1105:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1105:34:1105:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1106:100:1106:116 | (...)... | LogInjectionTest.java:1106:109:1106:116 | source(...) : Object | LogInjectionTest.java:1106:100:1106:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1106:109:1106:116 | source(...) | user-provided value |
+| LogInjectionTest.java:1107:85:1107:101 | (...)... | LogInjectionTest.java:1107:94:1107:101 | source(...) : Object | LogInjectionTest.java:1107:85:1107:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1107:94:1107:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1108:70:1108:86 | (...)... | LogInjectionTest.java:1108:79:1108:86 | source(...) : Object | LogInjectionTest.java:1108:70:1108:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1108:79:1108:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1109:55:1109:71 | (...)... | LogInjectionTest.java:1109:64:1109:71 | source(...) : Object | LogInjectionTest.java:1109:55:1109:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1109:64:1109:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1110:40:1110:56 | (...)... | LogInjectionTest.java:1110:49:1110:56 | source(...) : Object | LogInjectionTest.java:1110:40:1110:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1110:49:1110:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1111:25:1111:41 | (...)... | LogInjectionTest.java:1111:34:1111:41 | source(...) : Object | LogInjectionTest.java:1111:25:1111:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1111:34:1111:41 | source(...) | user-provided value |
 | LogInjectionTest.java:1112:115:1112:131 | (...)... | LogInjectionTest.java:1112:124:1112:131 | source(...) : Object | LogInjectionTest.java:1112:115:1112:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1112:124:1112:131 | source(...) | user-provided value |
 | LogInjectionTest.java:1113:100:1113:116 | (...)... | LogInjectionTest.java:1113:109:1113:116 | source(...) : Object | LogInjectionTest.java:1113:100:1113:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1113:109:1113:116 | source(...) | user-provided value |
 | LogInjectionTest.java:1114:85:1114:101 | (...)... | LogInjectionTest.java:1114:94:1114:101 | source(...) : Object | LogInjectionTest.java:1114:85:1114:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1114:94:1114:101 | source(...) | user-provided value |
 | LogInjectionTest.java:1115:70:1115:86 | (...)... | LogInjectionTest.java:1115:79:1115:86 | source(...) : Object | LogInjectionTest.java:1115:70:1115:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1115:79:1115:86 | source(...) | user-provided value |
 | LogInjectionTest.java:1116:55:1116:71 | (...)... | LogInjectionTest.java:1116:64:1116:71 | source(...) : Object | LogInjectionTest.java:1116:55:1116:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1116:64:1116:71 | source(...) | user-provided value |
 | LogInjectionTest.java:1117:40:1117:56 | (...)... | LogInjectionTest.java:1117:49:1117:56 | source(...) : Object | LogInjectionTest.java:1117:40:1117:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1117:49:1117:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1118:40:1118:56 | (...)... | LogInjectionTest.java:1118:49:1118:56 | source(...) : Object | LogInjectionTest.java:1118:40:1118:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1118:49:1118:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1119:55:1119:76 | (...)... | LogInjectionTest.java:1119:69:1119:76 | source(...) : Object | LogInjectionTest.java:1119:55:1119:76 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1119:69:1119:76 | source(...) | user-provided value |
-| LogInjectionTest.java:1120:40:1120:56 | (...)... | LogInjectionTest.java:1120:49:1120:56 | source(...) : Object | LogInjectionTest.java:1120:40:1120:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1120:49:1120:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1121:40:1121:61 | (...)... | LogInjectionTest.java:1121:54:1121:61 | source(...) : Object | LogInjectionTest.java:1121:40:1121:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1121:54:1121:61 | source(...) | user-provided value |
-| LogInjectionTest.java:1122:40:1122:61 | (...)... | LogInjectionTest.java:1122:54:1122:61 | source(...) : Object | LogInjectionTest.java:1122:40:1122:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1122:54:1122:61 | source(...) | user-provided value |
-| LogInjectionTest.java:1123:25:1123:50 | (...)... | LogInjectionTest.java:1123:43:1123:50 | source(...) : Object | LogInjectionTest.java:1123:25:1123:50 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1123:43:1123:50 | source(...) | user-provided value |
-| LogInjectionTest.java:1124:25:1124:50 | (...)... | LogInjectionTest.java:1124:43:1124:50 | source(...) : Object | LogInjectionTest.java:1124:25:1124:50 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1124:43:1124:50 | source(...) | user-provided value |
-| LogInjectionTest.java:1125:25:1125:42 | (...)... | LogInjectionTest.java:1125:35:1125:42 | source(...) : Object | LogInjectionTest.java:1125:25:1125:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1125:35:1125:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1126:25:1126:42 | (...)... | LogInjectionTest.java:1126:35:1126:42 | source(...) : Object | LogInjectionTest.java:1126:25:1126:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1126:35:1126:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1127:25:1127:32 | source(...) | LogInjectionTest.java:1127:25:1127:32 | source(...) | LogInjectionTest.java:1127:25:1127:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1127:25:1127:32 | source(...) | user-provided value |
-| LogInjectionTest.java:1128:25:1128:32 | source(...) | LogInjectionTest.java:1128:25:1128:32 | source(...) | LogInjectionTest.java:1128:25:1128:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1128:25:1128:32 | source(...) | user-provided value |
-| LogInjectionTest.java:1129:25:1129:41 | (...)... | LogInjectionTest.java:1129:34:1129:41 | source(...) : Object | LogInjectionTest.java:1129:25:1129:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1129:34:1129:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1130:25:1130:41 | (...)... | LogInjectionTest.java:1130:34:1130:41 | source(...) : Object | LogInjectionTest.java:1130:25:1130:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1130:34:1130:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1131:40:1131:62 | new Object[] | LogInjectionTest.java:1131:54:1131:61 | source(...) : Object | LogInjectionTest.java:1131:40:1131:62 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1131:54:1131:61 | source(...) | user-provided value |
-| LogInjectionTest.java:1132:40:1132:56 | (...)... | LogInjectionTest.java:1132:49:1132:56 | source(...) : Object | LogInjectionTest.java:1132:40:1132:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1132:49:1132:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1133:25:1133:41 | (...)... | LogInjectionTest.java:1133:34:1133:41 | source(...) : Object | LogInjectionTest.java:1133:25:1133:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1133:34:1133:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1134:55:1134:71 | (...)... | LogInjectionTest.java:1134:64:1134:71 | source(...) : Object | LogInjectionTest.java:1134:55:1134:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1134:64:1134:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1135:40:1135:56 | (...)... | LogInjectionTest.java:1135:49:1135:56 | source(...) : Object | LogInjectionTest.java:1135:40:1135:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1135:49:1135:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1136:25:1136:41 | (...)... | LogInjectionTest.java:1136:34:1136:41 | source(...) : Object | LogInjectionTest.java:1136:25:1136:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1136:34:1136:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1137:70:1137:86 | (...)... | LogInjectionTest.java:1137:79:1137:86 | source(...) : Object | LogInjectionTest.java:1137:70:1137:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1137:79:1137:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1138:55:1138:71 | (...)... | LogInjectionTest.java:1138:64:1138:71 | source(...) : Object | LogInjectionTest.java:1138:55:1138:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1138:64:1138:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1139:40:1139:56 | (...)... | LogInjectionTest.java:1139:49:1139:56 | source(...) : Object | LogInjectionTest.java:1139:40:1139:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1139:49:1139:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1140:25:1140:41 | (...)... | LogInjectionTest.java:1140:34:1140:41 | source(...) : Object | LogInjectionTest.java:1140:25:1140:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1140:34:1140:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1118:25:1118:41 | (...)... | LogInjectionTest.java:1118:34:1118:41 | source(...) : Object | LogInjectionTest.java:1118:25:1118:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1118:34:1118:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1119:130:1119:146 | (...)... | LogInjectionTest.java:1119:139:1119:146 | source(...) : Object | LogInjectionTest.java:1119:130:1119:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1119:139:1119:146 | source(...) | user-provided value |
+| LogInjectionTest.java:1120:115:1120:131 | (...)... | LogInjectionTest.java:1120:124:1120:131 | source(...) : Object | LogInjectionTest.java:1120:115:1120:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1120:124:1120:131 | source(...) | user-provided value |
+| LogInjectionTest.java:1121:100:1121:116 | (...)... | LogInjectionTest.java:1121:109:1121:116 | source(...) : Object | LogInjectionTest.java:1121:100:1121:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1121:109:1121:116 | source(...) | user-provided value |
+| LogInjectionTest.java:1122:85:1122:101 | (...)... | LogInjectionTest.java:1122:94:1122:101 | source(...) : Object | LogInjectionTest.java:1122:85:1122:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1122:94:1122:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1123:70:1123:86 | (...)... | LogInjectionTest.java:1123:79:1123:86 | source(...) : Object | LogInjectionTest.java:1123:70:1123:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1123:79:1123:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1124:55:1124:71 | (...)... | LogInjectionTest.java:1124:64:1124:71 | source(...) : Object | LogInjectionTest.java:1124:55:1124:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1124:64:1124:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1125:40:1125:56 | (...)... | LogInjectionTest.java:1125:49:1125:56 | source(...) : Object | LogInjectionTest.java:1125:40:1125:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1125:49:1125:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1126:25:1126:41 | (...)... | LogInjectionTest.java:1126:34:1126:41 | source(...) : Object | LogInjectionTest.java:1126:25:1126:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1126:34:1126:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1127:145:1127:161 | (...)... | LogInjectionTest.java:1127:154:1127:161 | source(...) : Object | LogInjectionTest.java:1127:145:1127:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1127:154:1127:161 | source(...) | user-provided value |
+| LogInjectionTest.java:1128:130:1128:146 | (...)... | LogInjectionTest.java:1128:139:1128:146 | source(...) : Object | LogInjectionTest.java:1128:130:1128:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1128:139:1128:146 | source(...) | user-provided value |
+| LogInjectionTest.java:1129:115:1129:131 | (...)... | LogInjectionTest.java:1129:124:1129:131 | source(...) : Object | LogInjectionTest.java:1129:115:1129:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1129:124:1129:131 | source(...) | user-provided value |
+| LogInjectionTest.java:1130:100:1130:116 | (...)... | LogInjectionTest.java:1130:109:1130:116 | source(...) : Object | LogInjectionTest.java:1130:100:1130:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1130:109:1130:116 | source(...) | user-provided value |
+| LogInjectionTest.java:1131:85:1131:101 | (...)... | LogInjectionTest.java:1131:94:1131:101 | source(...) : Object | LogInjectionTest.java:1131:85:1131:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1131:94:1131:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1132:70:1132:86 | (...)... | LogInjectionTest.java:1132:79:1132:86 | source(...) : Object | LogInjectionTest.java:1132:70:1132:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1132:79:1132:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1133:55:1133:71 | (...)... | LogInjectionTest.java:1133:64:1133:71 | source(...) : Object | LogInjectionTest.java:1133:55:1133:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1133:64:1133:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1134:40:1134:56 | (...)... | LogInjectionTest.java:1134:49:1134:56 | source(...) : Object | LogInjectionTest.java:1134:40:1134:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1134:49:1134:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1135:25:1135:41 | (...)... | LogInjectionTest.java:1135:34:1135:41 | source(...) : Object | LogInjectionTest.java:1135:25:1135:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1135:34:1135:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1136:160:1136:176 | (...)... | LogInjectionTest.java:1136:169:1136:176 | source(...) : Object | LogInjectionTest.java:1136:160:1136:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1136:169:1136:176 | source(...) | user-provided value |
+| LogInjectionTest.java:1137:145:1137:161 | (...)... | LogInjectionTest.java:1137:154:1137:161 | source(...) : Object | LogInjectionTest.java:1137:145:1137:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1137:154:1137:161 | source(...) | user-provided value |
+| LogInjectionTest.java:1138:130:1138:146 | (...)... | LogInjectionTest.java:1138:139:1138:146 | source(...) : Object | LogInjectionTest.java:1138:130:1138:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1138:139:1138:146 | source(...) | user-provided value |
+| LogInjectionTest.java:1139:115:1139:131 | (...)... | LogInjectionTest.java:1139:124:1139:131 | source(...) : Object | LogInjectionTest.java:1139:115:1139:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1139:124:1139:131 | source(...) | user-provided value |
+| LogInjectionTest.java:1140:100:1140:116 | (...)... | LogInjectionTest.java:1140:109:1140:116 | source(...) : Object | LogInjectionTest.java:1140:100:1140:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1140:109:1140:116 | source(...) | user-provided value |
 | LogInjectionTest.java:1141:85:1141:101 | (...)... | LogInjectionTest.java:1141:94:1141:101 | source(...) : Object | LogInjectionTest.java:1141:85:1141:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1141:94:1141:101 | source(...) | user-provided value |
 | LogInjectionTest.java:1142:70:1142:86 | (...)... | LogInjectionTest.java:1142:79:1142:86 | source(...) : Object | LogInjectionTest.java:1142:70:1142:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1142:79:1142:86 | source(...) | user-provided value |
 | LogInjectionTest.java:1143:55:1143:71 | (...)... | LogInjectionTest.java:1143:64:1143:71 | source(...) : Object | LogInjectionTest.java:1143:55:1143:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1143:64:1143:71 | source(...) | user-provided value |
 | LogInjectionTest.java:1144:40:1144:56 | (...)... | LogInjectionTest.java:1144:49:1144:56 | source(...) : Object | LogInjectionTest.java:1144:40:1144:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1144:49:1144:56 | source(...) | user-provided value |
 | LogInjectionTest.java:1145:25:1145:41 | (...)... | LogInjectionTest.java:1145:34:1145:41 | source(...) : Object | LogInjectionTest.java:1145:25:1145:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1145:34:1145:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1146:100:1146:116 | (...)... | LogInjectionTest.java:1146:109:1146:116 | source(...) : Object | LogInjectionTest.java:1146:100:1146:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1146:109:1146:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1147:85:1147:101 | (...)... | LogInjectionTest.java:1147:94:1147:101 | source(...) : Object | LogInjectionTest.java:1147:85:1147:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1147:94:1147:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1148:70:1148:86 | (...)... | LogInjectionTest.java:1148:79:1148:86 | source(...) : Object | LogInjectionTest.java:1148:70:1148:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1148:79:1148:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1149:55:1149:71 | (...)... | LogInjectionTest.java:1149:64:1149:71 | source(...) : Object | LogInjectionTest.java:1149:55:1149:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1149:64:1149:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1150:40:1150:56 | (...)... | LogInjectionTest.java:1150:49:1150:56 | source(...) : Object | LogInjectionTest.java:1150:40:1150:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1150:49:1150:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1151:25:1151:41 | (...)... | LogInjectionTest.java:1151:34:1151:41 | source(...) : Object | LogInjectionTest.java:1151:25:1151:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1151:34:1151:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1152:115:1152:131 | (...)... | LogInjectionTest.java:1152:124:1152:131 | source(...) : Object | LogInjectionTest.java:1152:115:1152:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1152:124:1152:131 | source(...) | user-provided value |
-| LogInjectionTest.java:1153:100:1153:116 | (...)... | LogInjectionTest.java:1153:109:1153:116 | source(...) : Object | LogInjectionTest.java:1153:100:1153:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1153:109:1153:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1154:85:1154:101 | (...)... | LogInjectionTest.java:1154:94:1154:101 | source(...) : Object | LogInjectionTest.java:1154:85:1154:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1154:94:1154:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1155:70:1155:86 | (...)... | LogInjectionTest.java:1155:79:1155:86 | source(...) : Object | LogInjectionTest.java:1155:70:1155:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1155:79:1155:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1156:55:1156:71 | (...)... | LogInjectionTest.java:1156:64:1156:71 | source(...) : Object | LogInjectionTest.java:1156:55:1156:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1156:64:1156:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1157:40:1157:56 | (...)... | LogInjectionTest.java:1157:49:1157:56 | source(...) : Object | LogInjectionTest.java:1157:40:1157:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1157:49:1157:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1158:25:1158:41 | (...)... | LogInjectionTest.java:1158:34:1158:41 | source(...) : Object | LogInjectionTest.java:1158:25:1158:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1158:34:1158:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1159:130:1159:146 | (...)... | LogInjectionTest.java:1159:139:1159:146 | source(...) : Object | LogInjectionTest.java:1159:130:1159:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1159:139:1159:146 | source(...) | user-provided value |
-| LogInjectionTest.java:1160:115:1160:131 | (...)... | LogInjectionTest.java:1160:124:1160:131 | source(...) : Object | LogInjectionTest.java:1160:115:1160:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1160:124:1160:131 | source(...) | user-provided value |
-| LogInjectionTest.java:1161:100:1161:116 | (...)... | LogInjectionTest.java:1161:109:1161:116 | source(...) : Object | LogInjectionTest.java:1161:100:1161:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1161:109:1161:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1162:85:1162:101 | (...)... | LogInjectionTest.java:1162:94:1162:101 | source(...) : Object | LogInjectionTest.java:1162:85:1162:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1162:94:1162:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1163:70:1163:86 | (...)... | LogInjectionTest.java:1163:79:1163:86 | source(...) : Object | LogInjectionTest.java:1163:70:1163:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1163:79:1163:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1164:55:1164:71 | (...)... | LogInjectionTest.java:1164:64:1164:71 | source(...) : Object | LogInjectionTest.java:1164:55:1164:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1164:64:1164:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1165:40:1165:56 | (...)... | LogInjectionTest.java:1165:49:1165:56 | source(...) : Object | LogInjectionTest.java:1165:40:1165:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1165:49:1165:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1166:25:1166:41 | (...)... | LogInjectionTest.java:1166:34:1166:41 | source(...) : Object | LogInjectionTest.java:1166:25:1166:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1166:34:1166:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1167:145:1167:161 | (...)... | LogInjectionTest.java:1167:154:1167:161 | source(...) : Object | LogInjectionTest.java:1167:145:1167:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1167:154:1167:161 | source(...) | user-provided value |
-| LogInjectionTest.java:1168:130:1168:146 | (...)... | LogInjectionTest.java:1168:139:1168:146 | source(...) : Object | LogInjectionTest.java:1168:130:1168:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1168:139:1168:146 | source(...) | user-provided value |
-| LogInjectionTest.java:1169:115:1169:131 | (...)... | LogInjectionTest.java:1169:124:1169:131 | source(...) : Object | LogInjectionTest.java:1169:115:1169:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1169:124:1169:131 | source(...) | user-provided value |
-| LogInjectionTest.java:1170:100:1170:116 | (...)... | LogInjectionTest.java:1170:109:1170:116 | source(...) : Object | LogInjectionTest.java:1170:100:1170:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1170:109:1170:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1171:85:1171:101 | (...)... | LogInjectionTest.java:1171:94:1171:101 | source(...) : Object | LogInjectionTest.java:1171:85:1171:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1171:94:1171:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1172:70:1172:86 | (...)... | LogInjectionTest.java:1172:79:1172:86 | source(...) : Object | LogInjectionTest.java:1172:70:1172:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1172:79:1172:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1173:55:1173:71 | (...)... | LogInjectionTest.java:1173:64:1173:71 | source(...) : Object | LogInjectionTest.java:1173:55:1173:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1173:64:1173:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1174:40:1174:56 | (...)... | LogInjectionTest.java:1174:49:1174:56 | source(...) : Object | LogInjectionTest.java:1174:40:1174:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1174:49:1174:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1175:25:1175:41 | (...)... | LogInjectionTest.java:1175:34:1175:41 | source(...) : Object | LogInjectionTest.java:1175:25:1175:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1175:34:1175:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1176:160:1176:176 | (...)... | LogInjectionTest.java:1176:169:1176:176 | source(...) : Object | LogInjectionTest.java:1176:160:1176:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1176:169:1176:176 | source(...) | user-provided value |
-| LogInjectionTest.java:1177:145:1177:161 | (...)... | LogInjectionTest.java:1177:154:1177:161 | source(...) : Object | LogInjectionTest.java:1177:145:1177:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1177:154:1177:161 | source(...) | user-provided value |
-| LogInjectionTest.java:1178:130:1178:146 | (...)... | LogInjectionTest.java:1178:139:1178:146 | source(...) : Object | LogInjectionTest.java:1178:130:1178:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1178:139:1178:146 | source(...) | user-provided value |
-| LogInjectionTest.java:1179:115:1179:131 | (...)... | LogInjectionTest.java:1179:124:1179:131 | source(...) : Object | LogInjectionTest.java:1179:115:1179:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1179:124:1179:131 | source(...) | user-provided value |
-| LogInjectionTest.java:1180:100:1180:116 | (...)... | LogInjectionTest.java:1180:109:1180:116 | source(...) : Object | LogInjectionTest.java:1180:100:1180:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1180:109:1180:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1181:85:1181:101 | (...)... | LogInjectionTest.java:1181:94:1181:101 | source(...) : Object | LogInjectionTest.java:1181:85:1181:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1181:94:1181:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1182:70:1182:86 | (...)... | LogInjectionTest.java:1182:79:1182:86 | source(...) : Object | LogInjectionTest.java:1182:70:1182:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1182:79:1182:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1183:55:1183:71 | (...)... | LogInjectionTest.java:1183:64:1183:71 | source(...) : Object | LogInjectionTest.java:1183:55:1183:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1183:64:1183:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1184:40:1184:56 | (...)... | LogInjectionTest.java:1184:49:1184:56 | source(...) : Object | LogInjectionTest.java:1184:40:1184:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1184:49:1184:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1185:25:1185:41 | (...)... | LogInjectionTest.java:1185:34:1185:41 | source(...) : Object | LogInjectionTest.java:1185:25:1185:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1185:34:1185:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1146:25:1146:41 | (...)... | LogInjectionTest.java:1146:34:1146:41 | source(...) : Object | LogInjectionTest.java:1146:25:1146:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1146:34:1146:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1147:40:1147:61 | (...)... | LogInjectionTest.java:1147:54:1147:61 | source(...) : Object | LogInjectionTest.java:1147:40:1147:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1147:54:1147:61 | source(...) | user-provided value |
+| LogInjectionTest.java:1148:25:1148:41 | (...)... | LogInjectionTest.java:1148:34:1148:41 | source(...) : Object | LogInjectionTest.java:1148:25:1148:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1148:34:1148:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1149:25:1149:46 | (...)... | LogInjectionTest.java:1149:39:1149:46 | source(...) : Object | LogInjectionTest.java:1149:25:1149:46 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1149:39:1149:46 | source(...) | user-provided value |
+| LogInjectionTest.java:1150:25:1150:46 | (...)... | LogInjectionTest.java:1150:39:1150:46 | source(...) : Object | LogInjectionTest.java:1150:25:1150:46 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1150:39:1150:46 | source(...) | user-provided value |
+| LogInjectionTest.java:1152:55:1152:72 | (...)... | LogInjectionTest.java:1152:65:1152:72 | source(...) : Object | LogInjectionTest.java:1152:55:1152:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1152:65:1152:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1153:39:1153:55 | (...)... | LogInjectionTest.java:1153:48:1153:55 | source(...) : Object | LogInjectionTest.java:1153:39:1153:55 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1153:48:1153:55 | source(...) | user-provided value |
+| LogInjectionTest.java:1154:45:1154:67 | new Object[] | LogInjectionTest.java:1154:59:1154:66 | source(...) : Object | LogInjectionTest.java:1154:45:1154:67 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1154:59:1154:66 | source(...) | user-provided value |
+| LogInjectionTest.java:1155:33:1155:49 | (...)... | LogInjectionTest.java:1155:42:1155:49 | source(...) : Object | LogInjectionTest.java:1155:33:1155:49 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1155:42:1155:49 | source(...) | user-provided value |
+| LogInjectionTest.java:1156:39:1156:61 | new Object[] | LogInjectionTest.java:1156:53:1156:60 | source(...) : Object | LogInjectionTest.java:1156:39:1156:61 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1156:53:1156:60 | source(...) | user-provided value |
+| LogInjectionTest.java:1157:31:1157:48 | (...)... | LogInjectionTest.java:1157:41:1157:48 | source(...) : Object | LogInjectionTest.java:1157:31:1157:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1157:41:1157:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1158:31:1158:47 | (...)... | LogInjectionTest.java:1158:40:1158:47 | source(...) : Object | LogInjectionTest.java:1158:31:1158:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1158:40:1158:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1159:46:1159:68 | new Object[] | LogInjectionTest.java:1159:60:1159:67 | source(...) : Object | LogInjectionTest.java:1159:46:1159:68 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1159:60:1159:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1160:31:1160:47 | (...)... | LogInjectionTest.java:1160:40:1160:47 | source(...) : Object | LogInjectionTest.java:1160:31:1160:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1160:40:1160:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1161:13:1161:68 | new ..[] { .. } | LogInjectionTest.java:1161:60:1161:67 | source(...) : Object | LogInjectionTest.java:1161:13:1161:68 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1161:60:1161:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1162:13:1162:53 | new ..[] { .. } | LogInjectionTest.java:1162:45:1162:52 | source(...) : Object | LogInjectionTest.java:1162:13:1162:53 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1162:45:1162:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1163:30:1163:52 | (...)... | LogInjectionTest.java:1163:45:1163:52 | source(...) : Object | LogInjectionTest.java:1163:30:1163:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1163:45:1163:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1164:30:1164:52 | (...)... | LogInjectionTest.java:1164:45:1164:52 | source(...) : Object | LogInjectionTest.java:1164:30:1164:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1164:45:1164:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1165:51:1165:58 | source(...) | LogInjectionTest.java:1165:51:1165:58 | source(...) | LogInjectionTest.java:1165:51:1165:58 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1165:51:1165:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1166:30:1166:47 | (...)... | LogInjectionTest.java:1166:40:1166:47 | source(...) : Object | LogInjectionTest.java:1166:30:1166:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1166:40:1166:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1167:46:1167:53 | source(...) | LogInjectionTest.java:1167:46:1167:53 | source(...) | LogInjectionTest.java:1167:46:1167:53 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1167:46:1167:53 | source(...) | user-provided value |
+| LogInjectionTest.java:1168:30:1168:37 | source(...) | LogInjectionTest.java:1168:30:1168:37 | source(...) | LogInjectionTest.java:1168:30:1168:37 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1168:30:1168:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1169:30:1169:46 | (...)... | LogInjectionTest.java:1169:39:1169:46 | source(...) : Object | LogInjectionTest.java:1169:30:1169:46 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1169:39:1169:46 | source(...) | user-provided value |
+| LogInjectionTest.java:1170:45:1170:52 | source(...) | LogInjectionTest.java:1170:45:1170:52 | source(...) | LogInjectionTest.java:1170:45:1170:52 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1170:45:1170:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1174:25:1174:47 | (...)... | LogInjectionTest.java:1174:40:1174:47 | source(...) : Object | LogInjectionTest.java:1174:25:1174:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1174:40:1174:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1175:25:1175:42 | (...)... | LogInjectionTest.java:1175:35:1175:42 | source(...) : Object | LogInjectionTest.java:1175:25:1175:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1175:35:1175:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1176:25:1176:32 | source(...) | LogInjectionTest.java:1176:25:1176:32 | source(...) | LogInjectionTest.java:1176:25:1176:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1176:25:1176:32 | source(...) | user-provided value |
+| LogInjectionTest.java:1177:25:1177:41 | (...)... | LogInjectionTest.java:1177:34:1177:41 | source(...) : Object | LogInjectionTest.java:1177:25:1177:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1177:34:1177:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1178:25:1178:41 | (...)... | LogInjectionTest.java:1178:34:1178:41 | source(...) : Object | LogInjectionTest.java:1178:25:1178:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1178:34:1178:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1179:40:1179:62 | new Object[] | LogInjectionTest.java:1179:54:1179:61 | source(...) : Object | LogInjectionTest.java:1179:40:1179:62 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1179:54:1179:61 | source(...) | user-provided value |
+| LogInjectionTest.java:1180:40:1180:47 | source(...) | LogInjectionTest.java:1180:40:1180:47 | source(...) | LogInjectionTest.java:1180:40:1180:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1180:40:1180:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1182:40:1182:56 | (...)... | LogInjectionTest.java:1182:49:1182:56 | source(...) : Object | LogInjectionTest.java:1182:40:1182:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1182:49:1182:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1183:25:1183:41 | (...)... | LogInjectionTest.java:1183:34:1183:41 | source(...) : Object | LogInjectionTest.java:1183:25:1183:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1183:34:1183:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1184:55:1184:71 | (...)... | LogInjectionTest.java:1184:64:1184:71 | source(...) : Object | LogInjectionTest.java:1184:55:1184:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1184:64:1184:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1185:40:1185:56 | (...)... | LogInjectionTest.java:1185:49:1185:56 | source(...) : Object | LogInjectionTest.java:1185:40:1185:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1185:49:1185:56 | source(...) | user-provided value |
 | LogInjectionTest.java:1186:25:1186:41 | (...)... | LogInjectionTest.java:1186:34:1186:41 | source(...) : Object | LogInjectionTest.java:1186:25:1186:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1186:34:1186:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1187:40:1187:61 | (...)... | LogInjectionTest.java:1187:54:1187:61 | source(...) : Object | LogInjectionTest.java:1187:40:1187:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1187:54:1187:61 | source(...) | user-provided value |
-| LogInjectionTest.java:1188:25:1188:41 | (...)... | LogInjectionTest.java:1188:34:1188:41 | source(...) : Object | LogInjectionTest.java:1188:25:1188:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1188:34:1188:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1189:25:1189:46 | (...)... | LogInjectionTest.java:1189:39:1189:46 | source(...) : Object | LogInjectionTest.java:1189:25:1189:46 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1189:39:1189:46 | source(...) | user-provided value |
-| LogInjectionTest.java:1190:25:1190:46 | (...)... | LogInjectionTest.java:1190:39:1190:46 | source(...) : Object | LogInjectionTest.java:1190:25:1190:46 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1190:39:1190:46 | source(...) | user-provided value |
-| LogInjectionTest.java:1192:55:1192:72 | (...)... | LogInjectionTest.java:1192:65:1192:72 | source(...) : Object | LogInjectionTest.java:1192:55:1192:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1192:65:1192:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1193:39:1193:55 | (...)... | LogInjectionTest.java:1193:48:1193:55 | source(...) : Object | LogInjectionTest.java:1193:39:1193:55 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1193:48:1193:55 | source(...) | user-provided value |
-| LogInjectionTest.java:1194:45:1194:67 | new Object[] | LogInjectionTest.java:1194:59:1194:66 | source(...) : Object | LogInjectionTest.java:1194:45:1194:67 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1194:59:1194:66 | source(...) | user-provided value |
-| LogInjectionTest.java:1195:33:1195:49 | (...)... | LogInjectionTest.java:1195:42:1195:49 | source(...) : Object | LogInjectionTest.java:1195:33:1195:49 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1195:42:1195:49 | source(...) | user-provided value |
-| LogInjectionTest.java:1196:39:1196:61 | new Object[] | LogInjectionTest.java:1196:53:1196:60 | source(...) : Object | LogInjectionTest.java:1196:39:1196:61 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1196:53:1196:60 | source(...) | user-provided value |
-| LogInjectionTest.java:1197:31:1197:48 | (...)... | LogInjectionTest.java:1197:41:1197:48 | source(...) : Object | LogInjectionTest.java:1197:31:1197:48 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1197:41:1197:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1198:31:1198:47 | (...)... | LogInjectionTest.java:1198:40:1198:47 | source(...) : Object | LogInjectionTest.java:1198:31:1198:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1198:40:1198:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1199:46:1199:68 | new Object[] | LogInjectionTest.java:1199:60:1199:67 | source(...) : Object | LogInjectionTest.java:1199:46:1199:68 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1199:60:1199:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1200:31:1200:47 | (...)... | LogInjectionTest.java:1200:40:1200:47 | source(...) : Object | LogInjectionTest.java:1200:31:1200:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1200:40:1200:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1201:13:1201:68 | new ..[] { .. } | LogInjectionTest.java:1201:60:1201:67 | source(...) : Object | LogInjectionTest.java:1201:13:1201:68 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1201:60:1201:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1202:13:1202:53 | new ..[] { .. } | LogInjectionTest.java:1202:45:1202:52 | source(...) : Object | LogInjectionTest.java:1202:13:1202:53 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1202:45:1202:52 | source(...) | user-provided value |
-| LogInjectionTest.java:1203:30:1203:52 | (...)... | LogInjectionTest.java:1203:45:1203:52 | source(...) : Object | LogInjectionTest.java:1203:30:1203:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1203:45:1203:52 | source(...) | user-provided value |
-| LogInjectionTest.java:1204:30:1204:52 | (...)... | LogInjectionTest.java:1204:45:1204:52 | source(...) : Object | LogInjectionTest.java:1204:30:1204:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1204:45:1204:52 | source(...) | user-provided value |
-| LogInjectionTest.java:1205:51:1205:58 | source(...) | LogInjectionTest.java:1205:51:1205:58 | source(...) | LogInjectionTest.java:1205:51:1205:58 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1205:51:1205:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1206:30:1206:47 | (...)... | LogInjectionTest.java:1206:40:1206:47 | source(...) : Object | LogInjectionTest.java:1206:30:1206:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1206:40:1206:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1207:46:1207:53 | source(...) | LogInjectionTest.java:1207:46:1207:53 | source(...) | LogInjectionTest.java:1207:46:1207:53 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1207:46:1207:53 | source(...) | user-provided value |
-| LogInjectionTest.java:1208:30:1208:37 | source(...) | LogInjectionTest.java:1208:30:1208:37 | source(...) | LogInjectionTest.java:1208:30:1208:37 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1208:30:1208:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1209:30:1209:46 | (...)... | LogInjectionTest.java:1209:39:1209:46 | source(...) : Object | LogInjectionTest.java:1209:30:1209:46 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1209:39:1209:46 | source(...) | user-provided value |
-| LogInjectionTest.java:1210:45:1210:52 | source(...) | LogInjectionTest.java:1210:45:1210:52 | source(...) | LogInjectionTest.java:1210:45:1210:52 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1210:45:1210:52 | source(...) | user-provided value |
-| LogInjectionTest.java:1214:25:1214:47 | (...)... | LogInjectionTest.java:1214:40:1214:47 | source(...) : Object | LogInjectionTest.java:1214:25:1214:47 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1214:40:1214:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1215:25:1215:42 | (...)... | LogInjectionTest.java:1215:35:1215:42 | source(...) : Object | LogInjectionTest.java:1215:25:1215:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1215:35:1215:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1216:25:1216:32 | source(...) | LogInjectionTest.java:1216:25:1216:32 | source(...) | LogInjectionTest.java:1216:25:1216:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1216:25:1216:32 | source(...) | user-provided value |
-| LogInjectionTest.java:1217:25:1217:41 | (...)... | LogInjectionTest.java:1217:34:1217:41 | source(...) : Object | LogInjectionTest.java:1217:25:1217:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1217:34:1217:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1218:25:1218:41 | (...)... | LogInjectionTest.java:1218:34:1218:41 | source(...) : Object | LogInjectionTest.java:1218:25:1218:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1218:34:1218:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1219:40:1219:62 | new Object[] | LogInjectionTest.java:1219:54:1219:61 | source(...) : Object | LogInjectionTest.java:1219:40:1219:62 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1219:54:1219:61 | source(...) | user-provided value |
-| LogInjectionTest.java:1220:40:1220:47 | source(...) | LogInjectionTest.java:1220:40:1220:47 | source(...) | LogInjectionTest.java:1220:40:1220:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1220:40:1220:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1222:40:1222:56 | (...)... | LogInjectionTest.java:1222:49:1222:56 | source(...) : Object | LogInjectionTest.java:1222:40:1222:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1222:49:1222:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1223:25:1223:41 | (...)... | LogInjectionTest.java:1223:34:1223:41 | source(...) : Object | LogInjectionTest.java:1223:25:1223:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1223:34:1223:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1224:55:1224:71 | (...)... | LogInjectionTest.java:1224:64:1224:71 | source(...) : Object | LogInjectionTest.java:1224:55:1224:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1224:64:1224:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1225:40:1225:56 | (...)... | LogInjectionTest.java:1225:49:1225:56 | source(...) : Object | LogInjectionTest.java:1225:40:1225:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1225:49:1225:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1226:25:1226:41 | (...)... | LogInjectionTest.java:1226:34:1226:41 | source(...) : Object | LogInjectionTest.java:1226:25:1226:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1226:34:1226:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1227:70:1227:86 | (...)... | LogInjectionTest.java:1227:79:1227:86 | source(...) : Object | LogInjectionTest.java:1227:70:1227:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1227:79:1227:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1228:55:1228:71 | (...)... | LogInjectionTest.java:1228:64:1228:71 | source(...) : Object | LogInjectionTest.java:1228:55:1228:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1228:64:1228:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1229:40:1229:56 | (...)... | LogInjectionTest.java:1229:49:1229:56 | source(...) : Object | LogInjectionTest.java:1229:40:1229:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1229:49:1229:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1230:25:1230:41 | (...)... | LogInjectionTest.java:1230:34:1230:41 | source(...) : Object | LogInjectionTest.java:1230:25:1230:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1230:34:1230:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1187:70:1187:86 | (...)... | LogInjectionTest.java:1187:79:1187:86 | source(...) : Object | LogInjectionTest.java:1187:70:1187:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1187:79:1187:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1188:55:1188:71 | (...)... | LogInjectionTest.java:1188:64:1188:71 | source(...) : Object | LogInjectionTest.java:1188:55:1188:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1188:64:1188:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1189:40:1189:56 | (...)... | LogInjectionTest.java:1189:49:1189:56 | source(...) : Object | LogInjectionTest.java:1189:40:1189:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1189:49:1189:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1190:25:1190:41 | (...)... | LogInjectionTest.java:1190:34:1190:41 | source(...) : Object | LogInjectionTest.java:1190:25:1190:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1190:34:1190:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1191:85:1191:101 | (...)... | LogInjectionTest.java:1191:94:1191:101 | source(...) : Object | LogInjectionTest.java:1191:85:1191:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1191:94:1191:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1192:70:1192:86 | (...)... | LogInjectionTest.java:1192:79:1192:86 | source(...) : Object | LogInjectionTest.java:1192:70:1192:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1192:79:1192:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1193:55:1193:71 | (...)... | LogInjectionTest.java:1193:64:1193:71 | source(...) : Object | LogInjectionTest.java:1193:55:1193:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1193:64:1193:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1194:40:1194:56 | (...)... | LogInjectionTest.java:1194:49:1194:56 | source(...) : Object | LogInjectionTest.java:1194:40:1194:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1194:49:1194:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1195:25:1195:41 | (...)... | LogInjectionTest.java:1195:34:1195:41 | source(...) : Object | LogInjectionTest.java:1195:25:1195:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1195:34:1195:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1196:100:1196:116 | (...)... | LogInjectionTest.java:1196:109:1196:116 | source(...) : Object | LogInjectionTest.java:1196:100:1196:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1196:109:1196:116 | source(...) | user-provided value |
+| LogInjectionTest.java:1197:85:1197:101 | (...)... | LogInjectionTest.java:1197:94:1197:101 | source(...) : Object | LogInjectionTest.java:1197:85:1197:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1197:94:1197:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1198:70:1198:86 | (...)... | LogInjectionTest.java:1198:79:1198:86 | source(...) : Object | LogInjectionTest.java:1198:70:1198:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1198:79:1198:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1199:55:1199:71 | (...)... | LogInjectionTest.java:1199:64:1199:71 | source(...) : Object | LogInjectionTest.java:1199:55:1199:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1199:64:1199:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1200:40:1200:56 | (...)... | LogInjectionTest.java:1200:49:1200:56 | source(...) : Object | LogInjectionTest.java:1200:40:1200:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1200:49:1200:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1201:25:1201:41 | (...)... | LogInjectionTest.java:1201:34:1201:41 | source(...) : Object | LogInjectionTest.java:1201:25:1201:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1201:34:1201:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1202:115:1202:131 | (...)... | LogInjectionTest.java:1202:124:1202:131 | source(...) : Object | LogInjectionTest.java:1202:115:1202:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1202:124:1202:131 | source(...) | user-provided value |
+| LogInjectionTest.java:1203:100:1203:116 | (...)... | LogInjectionTest.java:1203:109:1203:116 | source(...) : Object | LogInjectionTest.java:1203:100:1203:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1203:109:1203:116 | source(...) | user-provided value |
+| LogInjectionTest.java:1204:85:1204:101 | (...)... | LogInjectionTest.java:1204:94:1204:101 | source(...) : Object | LogInjectionTest.java:1204:85:1204:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1204:94:1204:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1205:70:1205:86 | (...)... | LogInjectionTest.java:1205:79:1205:86 | source(...) : Object | LogInjectionTest.java:1205:70:1205:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1205:79:1205:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1206:55:1206:71 | (...)... | LogInjectionTest.java:1206:64:1206:71 | source(...) : Object | LogInjectionTest.java:1206:55:1206:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1206:64:1206:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1207:40:1207:56 | (...)... | LogInjectionTest.java:1207:49:1207:56 | source(...) : Object | LogInjectionTest.java:1207:40:1207:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1207:49:1207:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1208:25:1208:41 | (...)... | LogInjectionTest.java:1208:34:1208:41 | source(...) : Object | LogInjectionTest.java:1208:25:1208:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1208:34:1208:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1209:130:1209:146 | (...)... | LogInjectionTest.java:1209:139:1209:146 | source(...) : Object | LogInjectionTest.java:1209:130:1209:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1209:139:1209:146 | source(...) | user-provided value |
+| LogInjectionTest.java:1210:115:1210:131 | (...)... | LogInjectionTest.java:1210:124:1210:131 | source(...) : Object | LogInjectionTest.java:1210:115:1210:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1210:124:1210:131 | source(...) | user-provided value |
+| LogInjectionTest.java:1211:100:1211:116 | (...)... | LogInjectionTest.java:1211:109:1211:116 | source(...) : Object | LogInjectionTest.java:1211:100:1211:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1211:109:1211:116 | source(...) | user-provided value |
+| LogInjectionTest.java:1212:85:1212:101 | (...)... | LogInjectionTest.java:1212:94:1212:101 | source(...) : Object | LogInjectionTest.java:1212:85:1212:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1212:94:1212:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1213:70:1213:86 | (...)... | LogInjectionTest.java:1213:79:1213:86 | source(...) : Object | LogInjectionTest.java:1213:70:1213:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1213:79:1213:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1214:55:1214:71 | (...)... | LogInjectionTest.java:1214:64:1214:71 | source(...) : Object | LogInjectionTest.java:1214:55:1214:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1214:64:1214:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1215:40:1215:56 | (...)... | LogInjectionTest.java:1215:49:1215:56 | source(...) : Object | LogInjectionTest.java:1215:40:1215:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1215:49:1215:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1216:25:1216:41 | (...)... | LogInjectionTest.java:1216:34:1216:41 | source(...) : Object | LogInjectionTest.java:1216:25:1216:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1216:34:1216:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1217:145:1217:161 | (...)... | LogInjectionTest.java:1217:154:1217:161 | source(...) : Object | LogInjectionTest.java:1217:145:1217:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1217:154:1217:161 | source(...) | user-provided value |
+| LogInjectionTest.java:1218:130:1218:146 | (...)... | LogInjectionTest.java:1218:139:1218:146 | source(...) : Object | LogInjectionTest.java:1218:130:1218:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1218:139:1218:146 | source(...) | user-provided value |
+| LogInjectionTest.java:1219:115:1219:131 | (...)... | LogInjectionTest.java:1219:124:1219:131 | source(...) : Object | LogInjectionTest.java:1219:115:1219:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1219:124:1219:131 | source(...) | user-provided value |
+| LogInjectionTest.java:1220:100:1220:116 | (...)... | LogInjectionTest.java:1220:109:1220:116 | source(...) : Object | LogInjectionTest.java:1220:100:1220:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1220:109:1220:116 | source(...) | user-provided value |
+| LogInjectionTest.java:1221:85:1221:101 | (...)... | LogInjectionTest.java:1221:94:1221:101 | source(...) : Object | LogInjectionTest.java:1221:85:1221:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1221:94:1221:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1222:70:1222:86 | (...)... | LogInjectionTest.java:1222:79:1222:86 | source(...) : Object | LogInjectionTest.java:1222:70:1222:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1222:79:1222:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1223:55:1223:71 | (...)... | LogInjectionTest.java:1223:64:1223:71 | source(...) : Object | LogInjectionTest.java:1223:55:1223:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1223:64:1223:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1224:40:1224:56 | (...)... | LogInjectionTest.java:1224:49:1224:56 | source(...) : Object | LogInjectionTest.java:1224:40:1224:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1224:49:1224:56 | source(...) | user-provided value |
+| LogInjectionTest.java:1225:25:1225:41 | (...)... | LogInjectionTest.java:1225:34:1225:41 | source(...) : Object | LogInjectionTest.java:1225:25:1225:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1225:34:1225:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1226:160:1226:176 | (...)... | LogInjectionTest.java:1226:169:1226:176 | source(...) : Object | LogInjectionTest.java:1226:160:1226:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1226:169:1226:176 | source(...) | user-provided value |
+| LogInjectionTest.java:1227:145:1227:161 | (...)... | LogInjectionTest.java:1227:154:1227:161 | source(...) : Object | LogInjectionTest.java:1227:145:1227:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1227:154:1227:161 | source(...) | user-provided value |
+| LogInjectionTest.java:1228:130:1228:146 | (...)... | LogInjectionTest.java:1228:139:1228:146 | source(...) : Object | LogInjectionTest.java:1228:130:1228:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1228:139:1228:146 | source(...) | user-provided value |
+| LogInjectionTest.java:1229:115:1229:131 | (...)... | LogInjectionTest.java:1229:124:1229:131 | source(...) : Object | LogInjectionTest.java:1229:115:1229:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1229:124:1229:131 | source(...) | user-provided value |
+| LogInjectionTest.java:1230:100:1230:116 | (...)... | LogInjectionTest.java:1230:109:1230:116 | source(...) : Object | LogInjectionTest.java:1230:100:1230:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1230:109:1230:116 | source(...) | user-provided value |
 | LogInjectionTest.java:1231:85:1231:101 | (...)... | LogInjectionTest.java:1231:94:1231:101 | source(...) : Object | LogInjectionTest.java:1231:85:1231:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1231:94:1231:101 | source(...) | user-provided value |
 | LogInjectionTest.java:1232:70:1232:86 | (...)... | LogInjectionTest.java:1232:79:1232:86 | source(...) : Object | LogInjectionTest.java:1232:70:1232:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1232:79:1232:86 | source(...) | user-provided value |
 | LogInjectionTest.java:1233:55:1233:71 | (...)... | LogInjectionTest.java:1233:64:1233:71 | source(...) : Object | LogInjectionTest.java:1233:55:1233:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1233:64:1233:71 | source(...) | user-provided value |
 | LogInjectionTest.java:1234:40:1234:56 | (...)... | LogInjectionTest.java:1234:49:1234:56 | source(...) : Object | LogInjectionTest.java:1234:40:1234:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1234:49:1234:56 | source(...) | user-provided value |
 | LogInjectionTest.java:1235:25:1235:41 | (...)... | LogInjectionTest.java:1235:34:1235:41 | source(...) : Object | LogInjectionTest.java:1235:25:1235:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1235:34:1235:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1236:100:1236:116 | (...)... | LogInjectionTest.java:1236:109:1236:116 | source(...) : Object | LogInjectionTest.java:1236:100:1236:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1236:109:1236:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1237:85:1237:101 | (...)... | LogInjectionTest.java:1237:94:1237:101 | source(...) : Object | LogInjectionTest.java:1237:85:1237:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1237:94:1237:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1238:70:1238:86 | (...)... | LogInjectionTest.java:1238:79:1238:86 | source(...) : Object | LogInjectionTest.java:1238:70:1238:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1238:79:1238:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1239:55:1239:71 | (...)... | LogInjectionTest.java:1239:64:1239:71 | source(...) : Object | LogInjectionTest.java:1239:55:1239:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1239:64:1239:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1240:40:1240:56 | (...)... | LogInjectionTest.java:1240:49:1240:56 | source(...) : Object | LogInjectionTest.java:1240:40:1240:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1240:49:1240:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1241:25:1241:41 | (...)... | LogInjectionTest.java:1241:34:1241:41 | source(...) : Object | LogInjectionTest.java:1241:25:1241:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1241:34:1241:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1242:115:1242:131 | (...)... | LogInjectionTest.java:1242:124:1242:131 | source(...) : Object | LogInjectionTest.java:1242:115:1242:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1242:124:1242:131 | source(...) | user-provided value |
-| LogInjectionTest.java:1243:100:1243:116 | (...)... | LogInjectionTest.java:1243:109:1243:116 | source(...) : Object | LogInjectionTest.java:1243:100:1243:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1243:109:1243:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1244:85:1244:101 | (...)... | LogInjectionTest.java:1244:94:1244:101 | source(...) : Object | LogInjectionTest.java:1244:85:1244:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1244:94:1244:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1245:70:1245:86 | (...)... | LogInjectionTest.java:1245:79:1245:86 | source(...) : Object | LogInjectionTest.java:1245:70:1245:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1245:79:1245:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1246:55:1246:71 | (...)... | LogInjectionTest.java:1246:64:1246:71 | source(...) : Object | LogInjectionTest.java:1246:55:1246:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1246:64:1246:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1247:40:1247:56 | (...)... | LogInjectionTest.java:1247:49:1247:56 | source(...) : Object | LogInjectionTest.java:1247:40:1247:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1247:49:1247:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1248:25:1248:41 | (...)... | LogInjectionTest.java:1248:34:1248:41 | source(...) : Object | LogInjectionTest.java:1248:25:1248:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1248:34:1248:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1249:130:1249:146 | (...)... | LogInjectionTest.java:1249:139:1249:146 | source(...) : Object | LogInjectionTest.java:1249:130:1249:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1249:139:1249:146 | source(...) | user-provided value |
-| LogInjectionTest.java:1250:115:1250:131 | (...)... | LogInjectionTest.java:1250:124:1250:131 | source(...) : Object | LogInjectionTest.java:1250:115:1250:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1250:124:1250:131 | source(...) | user-provided value |
-| LogInjectionTest.java:1251:100:1251:116 | (...)... | LogInjectionTest.java:1251:109:1251:116 | source(...) : Object | LogInjectionTest.java:1251:100:1251:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1251:109:1251:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1252:85:1252:101 | (...)... | LogInjectionTest.java:1252:94:1252:101 | source(...) : Object | LogInjectionTest.java:1252:85:1252:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1252:94:1252:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1253:70:1253:86 | (...)... | LogInjectionTest.java:1253:79:1253:86 | source(...) : Object | LogInjectionTest.java:1253:70:1253:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1253:79:1253:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1254:55:1254:71 | (...)... | LogInjectionTest.java:1254:64:1254:71 | source(...) : Object | LogInjectionTest.java:1254:55:1254:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1254:64:1254:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1255:40:1255:56 | (...)... | LogInjectionTest.java:1255:49:1255:56 | source(...) : Object | LogInjectionTest.java:1255:40:1255:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1255:49:1255:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1256:25:1256:41 | (...)... | LogInjectionTest.java:1256:34:1256:41 | source(...) : Object | LogInjectionTest.java:1256:25:1256:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1256:34:1256:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1257:145:1257:161 | (...)... | LogInjectionTest.java:1257:154:1257:161 | source(...) : Object | LogInjectionTest.java:1257:145:1257:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1257:154:1257:161 | source(...) | user-provided value |
-| LogInjectionTest.java:1258:130:1258:146 | (...)... | LogInjectionTest.java:1258:139:1258:146 | source(...) : Object | LogInjectionTest.java:1258:130:1258:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1258:139:1258:146 | source(...) | user-provided value |
-| LogInjectionTest.java:1259:115:1259:131 | (...)... | LogInjectionTest.java:1259:124:1259:131 | source(...) : Object | LogInjectionTest.java:1259:115:1259:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1259:124:1259:131 | source(...) | user-provided value |
-| LogInjectionTest.java:1260:100:1260:116 | (...)... | LogInjectionTest.java:1260:109:1260:116 | source(...) : Object | LogInjectionTest.java:1260:100:1260:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1260:109:1260:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1261:85:1261:101 | (...)... | LogInjectionTest.java:1261:94:1261:101 | source(...) : Object | LogInjectionTest.java:1261:85:1261:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1261:94:1261:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1262:70:1262:86 | (...)... | LogInjectionTest.java:1262:79:1262:86 | source(...) : Object | LogInjectionTest.java:1262:70:1262:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1262:79:1262:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1263:55:1263:71 | (...)... | LogInjectionTest.java:1263:64:1263:71 | source(...) : Object | LogInjectionTest.java:1263:55:1263:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1263:64:1263:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1264:40:1264:56 | (...)... | LogInjectionTest.java:1264:49:1264:56 | source(...) : Object | LogInjectionTest.java:1264:40:1264:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1264:49:1264:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1265:25:1265:41 | (...)... | LogInjectionTest.java:1265:34:1265:41 | source(...) : Object | LogInjectionTest.java:1265:25:1265:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1265:34:1265:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1266:160:1266:176 | (...)... | LogInjectionTest.java:1266:169:1266:176 | source(...) : Object | LogInjectionTest.java:1266:160:1266:176 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1266:169:1266:176 | source(...) | user-provided value |
-| LogInjectionTest.java:1267:145:1267:161 | (...)... | LogInjectionTest.java:1267:154:1267:161 | source(...) : Object | LogInjectionTest.java:1267:145:1267:161 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1267:154:1267:161 | source(...) | user-provided value |
-| LogInjectionTest.java:1268:130:1268:146 | (...)... | LogInjectionTest.java:1268:139:1268:146 | source(...) : Object | LogInjectionTest.java:1268:130:1268:146 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1268:139:1268:146 | source(...) | user-provided value |
-| LogInjectionTest.java:1269:115:1269:131 | (...)... | LogInjectionTest.java:1269:124:1269:131 | source(...) : Object | LogInjectionTest.java:1269:115:1269:131 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1269:124:1269:131 | source(...) | user-provided value |
-| LogInjectionTest.java:1270:100:1270:116 | (...)... | LogInjectionTest.java:1270:109:1270:116 | source(...) : Object | LogInjectionTest.java:1270:100:1270:116 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1270:109:1270:116 | source(...) | user-provided value |
-| LogInjectionTest.java:1271:85:1271:101 | (...)... | LogInjectionTest.java:1271:94:1271:101 | source(...) : Object | LogInjectionTest.java:1271:85:1271:101 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1271:94:1271:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1272:70:1272:86 | (...)... | LogInjectionTest.java:1272:79:1272:86 | source(...) : Object | LogInjectionTest.java:1272:70:1272:86 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1272:79:1272:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1273:55:1273:71 | (...)... | LogInjectionTest.java:1273:64:1273:71 | source(...) : Object | LogInjectionTest.java:1273:55:1273:71 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1273:64:1273:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1274:40:1274:56 | (...)... | LogInjectionTest.java:1274:49:1274:56 | source(...) : Object | LogInjectionTest.java:1274:40:1274:56 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1274:49:1274:56 | source(...) | user-provided value |
-| LogInjectionTest.java:1275:25:1275:41 | (...)... | LogInjectionTest.java:1275:34:1275:41 | source(...) : Object | LogInjectionTest.java:1275:25:1275:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1275:34:1275:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1277:25:1277:41 | (...)... | LogInjectionTest.java:1277:34:1277:41 | source(...) : Object | LogInjectionTest.java:1277:25:1277:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1277:34:1277:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1278:40:1278:61 | (...)... | LogInjectionTest.java:1278:54:1278:61 | source(...) : Object | LogInjectionTest.java:1278:40:1278:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1278:54:1278:61 | source(...) | user-provided value |
-| LogInjectionTest.java:1279:25:1279:46 | (...)... | LogInjectionTest.java:1279:39:1279:46 | source(...) : Object | LogInjectionTest.java:1279:25:1279:46 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1279:39:1279:46 | source(...) | user-provided value |
-| LogInjectionTest.java:1283:23:1283:30 | source(...) | LogInjectionTest.java:1283:23:1283:30 | source(...) | LogInjectionTest.java:1283:23:1283:30 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1283:23:1283:30 | source(...) | user-provided value |
-| LogInjectionTest.java:1284:23:1284:30 | source(...) | LogInjectionTest.java:1284:23:1284:30 | source(...) | LogInjectionTest.java:1284:23:1284:30 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1284:23:1284:30 | source(...) | user-provided value |
-| LogInjectionTest.java:1285:23:1285:30 | source(...) | LogInjectionTest.java:1285:23:1285:30 | source(...) | LogInjectionTest.java:1285:23:1285:30 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1285:23:1285:30 | source(...) | user-provided value |
-| LogInjectionTest.java:1286:22:1286:29 | source(...) | LogInjectionTest.java:1286:22:1286:29 | source(...) | LogInjectionTest.java:1286:22:1286:29 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1286:22:1286:29 | source(...) | user-provided value |
-| LogInjectionTest.java:1287:23:1287:30 | source(...) | LogInjectionTest.java:1287:23:1287:30 | source(...) | LogInjectionTest.java:1287:23:1287:30 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1287:23:1287:30 | source(...) | user-provided value |
-| LogInjectionTest.java:1288:22:1288:29 | source(...) | LogInjectionTest.java:1288:22:1288:29 | source(...) | LogInjectionTest.java:1288:22:1288:29 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1288:22:1288:29 | source(...) | user-provided value |
-| LogInjectionTest.java:1293:27:1293:34 | source(...) | LogInjectionTest.java:1293:27:1293:34 | source(...) | LogInjectionTest.java:1293:27:1293:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1293:27:1293:34 | source(...) | user-provided value |
-| LogInjectionTest.java:1294:27:1294:34 | source(...) | LogInjectionTest.java:1294:27:1294:34 | source(...) | LogInjectionTest.java:1294:27:1294:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1294:27:1294:34 | source(...) | user-provided value |
-| LogInjectionTest.java:1298:42:1298:49 | source(...) | LogInjectionTest.java:1298:42:1298:49 | source(...) | LogInjectionTest.java:1298:42:1298:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1298:42:1298:49 | source(...) | user-provided value |
-| LogInjectionTest.java:1299:57:1299:79 | new Object[] | LogInjectionTest.java:1299:71:1299:78 | source(...) : Object | LogInjectionTest.java:1299:57:1299:79 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1299:71:1299:78 | source(...) | user-provided value |
-| LogInjectionTest.java:1300:42:1300:49 | source(...) | LogInjectionTest.java:1300:42:1300:49 | source(...) | LogInjectionTest.java:1300:42:1300:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1300:42:1300:49 | source(...) | user-provided value |
-| LogInjectionTest.java:1301:27:1301:34 | source(...) | LogInjectionTest.java:1301:27:1301:34 | source(...) | LogInjectionTest.java:1301:27:1301:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1301:27:1301:34 | source(...) | user-provided value |
-| LogInjectionTest.java:1302:27:1302:34 | source(...) | LogInjectionTest.java:1302:27:1302:34 | source(...) | LogInjectionTest.java:1302:27:1302:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1302:27:1302:34 | source(...) | user-provided value |
-| LogInjectionTest.java:1306:42:1306:49 | source(...) | LogInjectionTest.java:1306:42:1306:49 | source(...) | LogInjectionTest.java:1306:42:1306:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1306:42:1306:49 | source(...) | user-provided value |
-| LogInjectionTest.java:1307:57:1307:79 | new Object[] | LogInjectionTest.java:1307:71:1307:78 | source(...) : Object | LogInjectionTest.java:1307:57:1307:79 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1307:71:1307:78 | source(...) | user-provided value |
-| LogInjectionTest.java:1308:42:1308:49 | source(...) | LogInjectionTest.java:1308:42:1308:49 | source(...) | LogInjectionTest.java:1308:42:1308:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1308:42:1308:49 | source(...) | user-provided value |
-| LogInjectionTest.java:1309:27:1309:34 | source(...) | LogInjectionTest.java:1309:27:1309:34 | source(...) | LogInjectionTest.java:1309:27:1309:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1309:27:1309:34 | source(...) | user-provided value |
-| LogInjectionTest.java:1310:27:1310:34 | source(...) | LogInjectionTest.java:1310:27:1310:34 | source(...) | LogInjectionTest.java:1310:27:1310:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1310:27:1310:34 | source(...) | user-provided value |
-| LogInjectionTest.java:1314:42:1314:49 | source(...) | LogInjectionTest.java:1314:42:1314:49 | source(...) | LogInjectionTest.java:1314:42:1314:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1314:42:1314:49 | source(...) | user-provided value |
-| LogInjectionTest.java:1315:57:1315:79 | new Object[] | LogInjectionTest.java:1315:71:1315:78 | source(...) : Object | LogInjectionTest.java:1315:57:1315:79 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1315:71:1315:78 | source(...) | user-provided value |
-| LogInjectionTest.java:1316:42:1316:49 | source(...) | LogInjectionTest.java:1316:42:1316:49 | source(...) | LogInjectionTest.java:1316:42:1316:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1316:42:1316:49 | source(...) | user-provided value |
-| LogInjectionTest.java:1317:26:1317:33 | source(...) | LogInjectionTest.java:1317:26:1317:33 | source(...) | LogInjectionTest.java:1317:26:1317:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1317:26:1317:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1318:26:1318:33 | source(...) | LogInjectionTest.java:1318:26:1318:33 | source(...) | LogInjectionTest.java:1318:26:1318:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1318:26:1318:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1322:41:1322:48 | source(...) | LogInjectionTest.java:1322:41:1322:48 | source(...) | LogInjectionTest.java:1322:41:1322:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1322:41:1322:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1323:56:1323:78 | new Object[] | LogInjectionTest.java:1323:70:1323:77 | source(...) : Object | LogInjectionTest.java:1323:56:1323:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1323:70:1323:77 | source(...) | user-provided value |
-| LogInjectionTest.java:1324:41:1324:48 | source(...) | LogInjectionTest.java:1324:41:1324:48 | source(...) | LogInjectionTest.java:1324:41:1324:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1324:41:1324:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1325:27:1325:34 | source(...) | LogInjectionTest.java:1325:27:1325:34 | source(...) | LogInjectionTest.java:1325:27:1325:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1325:27:1325:34 | source(...) | user-provided value |
-| LogInjectionTest.java:1326:27:1326:34 | source(...) | LogInjectionTest.java:1326:27:1326:34 | source(...) | LogInjectionTest.java:1326:27:1326:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1326:27:1326:34 | source(...) | user-provided value |
-| LogInjectionTest.java:1330:42:1330:49 | source(...) | LogInjectionTest.java:1330:42:1330:49 | source(...) | LogInjectionTest.java:1330:42:1330:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1330:42:1330:49 | source(...) | user-provided value |
-| LogInjectionTest.java:1331:57:1331:79 | new Object[] | LogInjectionTest.java:1331:71:1331:78 | source(...) : Object | LogInjectionTest.java:1331:57:1331:79 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1331:71:1331:78 | source(...) | user-provided value |
-| LogInjectionTest.java:1332:42:1332:49 | source(...) | LogInjectionTest.java:1332:42:1332:49 | source(...) | LogInjectionTest.java:1332:42:1332:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1332:42:1332:49 | source(...) | user-provided value |
-| LogInjectionTest.java:1333:26:1333:33 | source(...) | LogInjectionTest.java:1333:26:1333:33 | source(...) | LogInjectionTest.java:1333:26:1333:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1333:26:1333:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1334:26:1334:33 | source(...) | LogInjectionTest.java:1334:26:1334:33 | source(...) | LogInjectionTest.java:1334:26:1334:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1334:26:1334:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1338:41:1338:48 | source(...) | LogInjectionTest.java:1338:41:1338:48 | source(...) | LogInjectionTest.java:1338:41:1338:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1338:41:1338:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1339:56:1339:78 | new Object[] | LogInjectionTest.java:1339:70:1339:77 | source(...) : Object | LogInjectionTest.java:1339:56:1339:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1339:70:1339:77 | source(...) | user-provided value |
-| LogInjectionTest.java:1340:41:1340:48 | source(...) | LogInjectionTest.java:1340:41:1340:48 | source(...) | LogInjectionTest.java:1340:41:1340:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1340:41:1340:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1341:64:1341:71 | source(...) | LogInjectionTest.java:1341:64:1341:71 | source(...) | LogInjectionTest.java:1341:64:1341:71 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1341:64:1341:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1342:64:1342:71 | source(...) | LogInjectionTest.java:1342:64:1342:71 | source(...) | LogInjectionTest.java:1342:64:1342:71 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1342:64:1342:71 | source(...) | user-provided value |
-| LogInjectionTest.java:1346:79:1346:86 | source(...) | LogInjectionTest.java:1346:79:1346:86 | source(...) | LogInjectionTest.java:1346:79:1346:86 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1346:79:1346:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1347:79:1347:86 | source(...) | LogInjectionTest.java:1347:79:1347:86 | source(...) | LogInjectionTest.java:1347:79:1347:86 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1347:79:1347:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1348:94:1348:116 | new Object[] | LogInjectionTest.java:1348:108:1348:115 | source(...) : Object | LogInjectionTest.java:1348:94:1348:116 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1348:108:1348:115 | source(...) | user-provided value |
-| LogInjectionTest.java:1349:43:1349:59 | (...)... | LogInjectionTest.java:1349:52:1349:59 | source(...) : Object | LogInjectionTest.java:1349:43:1349:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1349:52:1349:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1350:28:1350:44 | (...)... | LogInjectionTest.java:1350:37:1350:44 | source(...) : Object | LogInjectionTest.java:1350:28:1350:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1350:37:1350:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1237:25:1237:41 | (...)... | LogInjectionTest.java:1237:34:1237:41 | source(...) : Object | LogInjectionTest.java:1237:25:1237:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1237:34:1237:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1238:40:1238:61 | (...)... | LogInjectionTest.java:1238:54:1238:61 | source(...) : Object | LogInjectionTest.java:1238:40:1238:61 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1238:54:1238:61 | source(...) | user-provided value |
+| LogInjectionTest.java:1239:25:1239:46 | (...)... | LogInjectionTest.java:1239:39:1239:46 | source(...) : Object | LogInjectionTest.java:1239:25:1239:46 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1239:39:1239:46 | source(...) | user-provided value |
+| LogInjectionTest.java:1243:23:1243:30 | source(...) | LogInjectionTest.java:1243:23:1243:30 | source(...) | LogInjectionTest.java:1243:23:1243:30 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1243:23:1243:30 | source(...) | user-provided value |
+| LogInjectionTest.java:1244:23:1244:30 | source(...) | LogInjectionTest.java:1244:23:1244:30 | source(...) | LogInjectionTest.java:1244:23:1244:30 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1244:23:1244:30 | source(...) | user-provided value |
+| LogInjectionTest.java:1245:23:1245:30 | source(...) | LogInjectionTest.java:1245:23:1245:30 | source(...) | LogInjectionTest.java:1245:23:1245:30 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1245:23:1245:30 | source(...) | user-provided value |
+| LogInjectionTest.java:1246:22:1246:29 | source(...) | LogInjectionTest.java:1246:22:1246:29 | source(...) | LogInjectionTest.java:1246:22:1246:29 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1246:22:1246:29 | source(...) | user-provided value |
+| LogInjectionTest.java:1247:23:1247:30 | source(...) | LogInjectionTest.java:1247:23:1247:30 | source(...) | LogInjectionTest.java:1247:23:1247:30 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1247:23:1247:30 | source(...) | user-provided value |
+| LogInjectionTest.java:1248:22:1248:29 | source(...) | LogInjectionTest.java:1248:22:1248:29 | source(...) | LogInjectionTest.java:1248:22:1248:29 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1248:22:1248:29 | source(...) | user-provided value |
+| LogInjectionTest.java:1253:27:1253:34 | source(...) | LogInjectionTest.java:1253:27:1253:34 | source(...) | LogInjectionTest.java:1253:27:1253:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1253:27:1253:34 | source(...) | user-provided value |
+| LogInjectionTest.java:1254:27:1254:34 | source(...) | LogInjectionTest.java:1254:27:1254:34 | source(...) | LogInjectionTest.java:1254:27:1254:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1254:27:1254:34 | source(...) | user-provided value |
+| LogInjectionTest.java:1258:42:1258:49 | source(...) | LogInjectionTest.java:1258:42:1258:49 | source(...) | LogInjectionTest.java:1258:42:1258:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1258:42:1258:49 | source(...) | user-provided value |
+| LogInjectionTest.java:1259:57:1259:79 | new Object[] | LogInjectionTest.java:1259:71:1259:78 | source(...) : Object | LogInjectionTest.java:1259:57:1259:79 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1259:71:1259:78 | source(...) | user-provided value |
+| LogInjectionTest.java:1260:42:1260:49 | source(...) | LogInjectionTest.java:1260:42:1260:49 | source(...) | LogInjectionTest.java:1260:42:1260:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1260:42:1260:49 | source(...) | user-provided value |
+| LogInjectionTest.java:1261:27:1261:34 | source(...) | LogInjectionTest.java:1261:27:1261:34 | source(...) | LogInjectionTest.java:1261:27:1261:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1261:27:1261:34 | source(...) | user-provided value |
+| LogInjectionTest.java:1262:27:1262:34 | source(...) | LogInjectionTest.java:1262:27:1262:34 | source(...) | LogInjectionTest.java:1262:27:1262:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1262:27:1262:34 | source(...) | user-provided value |
+| LogInjectionTest.java:1266:42:1266:49 | source(...) | LogInjectionTest.java:1266:42:1266:49 | source(...) | LogInjectionTest.java:1266:42:1266:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1266:42:1266:49 | source(...) | user-provided value |
+| LogInjectionTest.java:1267:57:1267:79 | new Object[] | LogInjectionTest.java:1267:71:1267:78 | source(...) : Object | LogInjectionTest.java:1267:57:1267:79 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1267:71:1267:78 | source(...) | user-provided value |
+| LogInjectionTest.java:1268:42:1268:49 | source(...) | LogInjectionTest.java:1268:42:1268:49 | source(...) | LogInjectionTest.java:1268:42:1268:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1268:42:1268:49 | source(...) | user-provided value |
+| LogInjectionTest.java:1269:27:1269:34 | source(...) | LogInjectionTest.java:1269:27:1269:34 | source(...) | LogInjectionTest.java:1269:27:1269:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1269:27:1269:34 | source(...) | user-provided value |
+| LogInjectionTest.java:1270:27:1270:34 | source(...) | LogInjectionTest.java:1270:27:1270:34 | source(...) | LogInjectionTest.java:1270:27:1270:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1270:27:1270:34 | source(...) | user-provided value |
+| LogInjectionTest.java:1274:42:1274:49 | source(...) | LogInjectionTest.java:1274:42:1274:49 | source(...) | LogInjectionTest.java:1274:42:1274:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1274:42:1274:49 | source(...) | user-provided value |
+| LogInjectionTest.java:1275:57:1275:79 | new Object[] | LogInjectionTest.java:1275:71:1275:78 | source(...) : Object | LogInjectionTest.java:1275:57:1275:79 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1275:71:1275:78 | source(...) | user-provided value |
+| LogInjectionTest.java:1276:42:1276:49 | source(...) | LogInjectionTest.java:1276:42:1276:49 | source(...) | LogInjectionTest.java:1276:42:1276:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1276:42:1276:49 | source(...) | user-provided value |
+| LogInjectionTest.java:1277:26:1277:33 | source(...) | LogInjectionTest.java:1277:26:1277:33 | source(...) | LogInjectionTest.java:1277:26:1277:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1277:26:1277:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1278:26:1278:33 | source(...) | LogInjectionTest.java:1278:26:1278:33 | source(...) | LogInjectionTest.java:1278:26:1278:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1278:26:1278:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1282:41:1282:48 | source(...) | LogInjectionTest.java:1282:41:1282:48 | source(...) | LogInjectionTest.java:1282:41:1282:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1282:41:1282:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1283:56:1283:78 | new Object[] | LogInjectionTest.java:1283:70:1283:77 | source(...) : Object | LogInjectionTest.java:1283:56:1283:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1283:70:1283:77 | source(...) | user-provided value |
+| LogInjectionTest.java:1284:41:1284:48 | source(...) | LogInjectionTest.java:1284:41:1284:48 | source(...) | LogInjectionTest.java:1284:41:1284:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1284:41:1284:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1285:27:1285:34 | source(...) | LogInjectionTest.java:1285:27:1285:34 | source(...) | LogInjectionTest.java:1285:27:1285:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1285:27:1285:34 | source(...) | user-provided value |
+| LogInjectionTest.java:1286:27:1286:34 | source(...) | LogInjectionTest.java:1286:27:1286:34 | source(...) | LogInjectionTest.java:1286:27:1286:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1286:27:1286:34 | source(...) | user-provided value |
+| LogInjectionTest.java:1290:42:1290:49 | source(...) | LogInjectionTest.java:1290:42:1290:49 | source(...) | LogInjectionTest.java:1290:42:1290:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1290:42:1290:49 | source(...) | user-provided value |
+| LogInjectionTest.java:1291:57:1291:79 | new Object[] | LogInjectionTest.java:1291:71:1291:78 | source(...) : Object | LogInjectionTest.java:1291:57:1291:79 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1291:71:1291:78 | source(...) | user-provided value |
+| LogInjectionTest.java:1292:42:1292:49 | source(...) | LogInjectionTest.java:1292:42:1292:49 | source(...) | LogInjectionTest.java:1292:42:1292:49 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1292:42:1292:49 | source(...) | user-provided value |
+| LogInjectionTest.java:1293:26:1293:33 | source(...) | LogInjectionTest.java:1293:26:1293:33 | source(...) | LogInjectionTest.java:1293:26:1293:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1293:26:1293:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1294:26:1294:33 | source(...) | LogInjectionTest.java:1294:26:1294:33 | source(...) | LogInjectionTest.java:1294:26:1294:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1294:26:1294:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1298:41:1298:48 | source(...) | LogInjectionTest.java:1298:41:1298:48 | source(...) | LogInjectionTest.java:1298:41:1298:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1298:41:1298:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1299:56:1299:78 | new Object[] | LogInjectionTest.java:1299:70:1299:77 | source(...) : Object | LogInjectionTest.java:1299:56:1299:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1299:70:1299:77 | source(...) | user-provided value |
+| LogInjectionTest.java:1300:41:1300:48 | source(...) | LogInjectionTest.java:1300:41:1300:48 | source(...) | LogInjectionTest.java:1300:41:1300:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1300:41:1300:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1301:64:1301:71 | source(...) | LogInjectionTest.java:1301:64:1301:71 | source(...) | LogInjectionTest.java:1301:64:1301:71 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1301:64:1301:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1302:64:1302:71 | source(...) | LogInjectionTest.java:1302:64:1302:71 | source(...) | LogInjectionTest.java:1302:64:1302:71 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1302:64:1302:71 | source(...) | user-provided value |
+| LogInjectionTest.java:1306:79:1306:86 | source(...) | LogInjectionTest.java:1306:79:1306:86 | source(...) | LogInjectionTest.java:1306:79:1306:86 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1306:79:1306:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1307:79:1307:86 | source(...) | LogInjectionTest.java:1307:79:1307:86 | source(...) | LogInjectionTest.java:1307:79:1307:86 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1307:79:1307:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1308:94:1308:116 | new Object[] | LogInjectionTest.java:1308:108:1308:115 | source(...) : Object | LogInjectionTest.java:1308:94:1308:116 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1308:108:1308:115 | source(...) | user-provided value |
+| LogInjectionTest.java:1309:43:1309:59 | (...)... | LogInjectionTest.java:1309:52:1309:59 | source(...) : Object | LogInjectionTest.java:1309:43:1309:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1309:52:1309:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1310:28:1310:44 | (...)... | LogInjectionTest.java:1310:37:1310:44 | source(...) : Object | LogInjectionTest.java:1310:28:1310:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1310:37:1310:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1311:43:1311:59 | (...)... | LogInjectionTest.java:1311:52:1311:59 | source(...) : Object | LogInjectionTest.java:1311:43:1311:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1311:52:1311:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1312:28:1312:44 | (...)... | LogInjectionTest.java:1312:37:1312:44 | source(...) : Object | LogInjectionTest.java:1312:28:1312:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1312:37:1312:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1313:28:1313:44 | (...)... | LogInjectionTest.java:1313:37:1313:44 | source(...) : Object | LogInjectionTest.java:1313:28:1313:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1313:37:1313:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1314:28:1314:44 | (...)... | LogInjectionTest.java:1314:37:1314:44 | source(...) : Object | LogInjectionTest.java:1314:28:1314:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1314:37:1314:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1315:43:1315:65 | new Object[] | LogInjectionTest.java:1315:57:1315:64 | source(...) : Object | LogInjectionTest.java:1315:43:1315:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1315:57:1315:64 | source(...) | user-provided value |
+| LogInjectionTest.java:1316:43:1316:65 | new Object[] | LogInjectionTest.java:1316:57:1316:64 | source(...) : Object | LogInjectionTest.java:1316:43:1316:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1316:57:1316:64 | source(...) | user-provided value |
+| LogInjectionTest.java:1317:58:1317:74 | (...)... | LogInjectionTest.java:1317:67:1317:74 | source(...) : Object | LogInjectionTest.java:1317:58:1317:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1317:67:1317:74 | source(...) | user-provided value |
+| LogInjectionTest.java:1318:43:1318:59 | (...)... | LogInjectionTest.java:1318:52:1318:59 | source(...) : Object | LogInjectionTest.java:1318:43:1318:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1318:52:1318:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1319:28:1319:44 | (...)... | LogInjectionTest.java:1319:37:1319:44 | source(...) : Object | LogInjectionTest.java:1319:28:1319:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1319:37:1319:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1320:58:1320:74 | (...)... | LogInjectionTest.java:1320:67:1320:74 | source(...) : Object | LogInjectionTest.java:1320:58:1320:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1320:67:1320:74 | source(...) | user-provided value |
+| LogInjectionTest.java:1321:43:1321:59 | (...)... | LogInjectionTest.java:1321:52:1321:59 | source(...) : Object | LogInjectionTest.java:1321:43:1321:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1321:52:1321:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1322:28:1322:44 | (...)... | LogInjectionTest.java:1322:37:1322:44 | source(...) : Object | LogInjectionTest.java:1322:28:1322:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1322:37:1322:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1323:73:1323:89 | (...)... | LogInjectionTest.java:1323:82:1323:89 | source(...) : Object | LogInjectionTest.java:1323:73:1323:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1323:82:1323:89 | source(...) | user-provided value |
+| LogInjectionTest.java:1324:58:1324:74 | (...)... | LogInjectionTest.java:1324:67:1324:74 | source(...) : Object | LogInjectionTest.java:1324:58:1324:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1324:67:1324:74 | source(...) | user-provided value |
+| LogInjectionTest.java:1325:43:1325:59 | (...)... | LogInjectionTest.java:1325:52:1325:59 | source(...) : Object | LogInjectionTest.java:1325:43:1325:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1325:52:1325:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1326:28:1326:44 | (...)... | LogInjectionTest.java:1326:37:1326:44 | source(...) : Object | LogInjectionTest.java:1326:28:1326:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1326:37:1326:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1327:73:1327:89 | (...)... | LogInjectionTest.java:1327:82:1327:89 | source(...) : Object | LogInjectionTest.java:1327:73:1327:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1327:82:1327:89 | source(...) | user-provided value |
+| LogInjectionTest.java:1328:58:1328:74 | (...)... | LogInjectionTest.java:1328:67:1328:74 | source(...) : Object | LogInjectionTest.java:1328:58:1328:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1328:67:1328:74 | source(...) | user-provided value |
+| LogInjectionTest.java:1329:43:1329:59 | (...)... | LogInjectionTest.java:1329:52:1329:59 | source(...) : Object | LogInjectionTest.java:1329:43:1329:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1329:52:1329:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1330:28:1330:44 | (...)... | LogInjectionTest.java:1330:37:1330:44 | source(...) : Object | LogInjectionTest.java:1330:28:1330:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1330:37:1330:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1331:43:1331:59 | (...)... | LogInjectionTest.java:1331:52:1331:59 | source(...) : Object | LogInjectionTest.java:1331:43:1331:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1331:52:1331:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1332:28:1332:44 | (...)... | LogInjectionTest.java:1332:37:1332:44 | source(...) : Object | LogInjectionTest.java:1332:28:1332:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1332:37:1332:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1333:43:1333:59 | (...)... | LogInjectionTest.java:1333:52:1333:59 | source(...) : Object | LogInjectionTest.java:1333:43:1333:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1333:52:1333:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1334:28:1334:44 | (...)... | LogInjectionTest.java:1334:37:1334:44 | source(...) : Object | LogInjectionTest.java:1334:28:1334:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1334:37:1334:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1335:28:1335:44 | (...)... | LogInjectionTest.java:1335:37:1335:44 | source(...) : Object | LogInjectionTest.java:1335:28:1335:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1335:37:1335:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1336:28:1336:44 | (...)... | LogInjectionTest.java:1336:37:1336:44 | source(...) : Object | LogInjectionTest.java:1336:28:1336:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1336:37:1336:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1337:43:1337:65 | new Object[] | LogInjectionTest.java:1337:57:1337:64 | source(...) : Object | LogInjectionTest.java:1337:43:1337:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1337:57:1337:64 | source(...) | user-provided value |
+| LogInjectionTest.java:1338:43:1338:65 | new Object[] | LogInjectionTest.java:1338:57:1338:64 | source(...) : Object | LogInjectionTest.java:1338:43:1338:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1338:57:1338:64 | source(...) | user-provided value |
+| LogInjectionTest.java:1339:58:1339:74 | (...)... | LogInjectionTest.java:1339:67:1339:74 | source(...) : Object | LogInjectionTest.java:1339:58:1339:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1339:67:1339:74 | source(...) | user-provided value |
+| LogInjectionTest.java:1340:43:1340:59 | (...)... | LogInjectionTest.java:1340:52:1340:59 | source(...) : Object | LogInjectionTest.java:1340:43:1340:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1340:52:1340:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1341:28:1341:44 | (...)... | LogInjectionTest.java:1341:37:1341:44 | source(...) : Object | LogInjectionTest.java:1341:28:1341:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1341:37:1341:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1342:58:1342:74 | (...)... | LogInjectionTest.java:1342:67:1342:74 | source(...) : Object | LogInjectionTest.java:1342:58:1342:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1342:67:1342:74 | source(...) | user-provided value |
+| LogInjectionTest.java:1343:43:1343:59 | (...)... | LogInjectionTest.java:1343:52:1343:59 | source(...) : Object | LogInjectionTest.java:1343:43:1343:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1343:52:1343:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1344:28:1344:44 | (...)... | LogInjectionTest.java:1344:37:1344:44 | source(...) : Object | LogInjectionTest.java:1344:28:1344:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1344:37:1344:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1345:73:1345:89 | (...)... | LogInjectionTest.java:1345:82:1345:89 | source(...) : Object | LogInjectionTest.java:1345:73:1345:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1345:82:1345:89 | source(...) | user-provided value |
+| LogInjectionTest.java:1346:58:1346:74 | (...)... | LogInjectionTest.java:1346:67:1346:74 | source(...) : Object | LogInjectionTest.java:1346:58:1346:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1346:67:1346:74 | source(...) | user-provided value |
+| LogInjectionTest.java:1347:43:1347:59 | (...)... | LogInjectionTest.java:1347:52:1347:59 | source(...) : Object | LogInjectionTest.java:1347:43:1347:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1347:52:1347:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1348:28:1348:44 | (...)... | LogInjectionTest.java:1348:37:1348:44 | source(...) : Object | LogInjectionTest.java:1348:28:1348:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1348:37:1348:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1349:73:1349:89 | (...)... | LogInjectionTest.java:1349:82:1349:89 | source(...) : Object | LogInjectionTest.java:1349:73:1349:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1349:82:1349:89 | source(...) | user-provided value |
+| LogInjectionTest.java:1350:58:1350:74 | (...)... | LogInjectionTest.java:1350:67:1350:74 | source(...) : Object | LogInjectionTest.java:1350:58:1350:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1350:67:1350:74 | source(...) | user-provided value |
 | LogInjectionTest.java:1351:43:1351:59 | (...)... | LogInjectionTest.java:1351:52:1351:59 | source(...) : Object | LogInjectionTest.java:1351:43:1351:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1351:52:1351:59 | source(...) | user-provided value |
 | LogInjectionTest.java:1352:28:1352:44 | (...)... | LogInjectionTest.java:1352:37:1352:44 | source(...) : Object | LogInjectionTest.java:1352:28:1352:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1352:37:1352:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1353:28:1353:44 | (...)... | LogInjectionTest.java:1353:37:1353:44 | source(...) : Object | LogInjectionTest.java:1353:28:1353:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1353:37:1353:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1353:43:1353:59 | (...)... | LogInjectionTest.java:1353:52:1353:59 | source(...) : Object | LogInjectionTest.java:1353:43:1353:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1353:52:1353:59 | source(...) | user-provided value |
 | LogInjectionTest.java:1354:28:1354:44 | (...)... | LogInjectionTest.java:1354:37:1354:44 | source(...) : Object | LogInjectionTest.java:1354:28:1354:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1354:37:1354:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1355:43:1355:65 | new Object[] | LogInjectionTest.java:1355:57:1355:64 | source(...) : Object | LogInjectionTest.java:1355:43:1355:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1355:57:1355:64 | source(...) | user-provided value |
-| LogInjectionTest.java:1356:43:1356:65 | new Object[] | LogInjectionTest.java:1356:57:1356:64 | source(...) : Object | LogInjectionTest.java:1356:43:1356:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1356:57:1356:64 | source(...) | user-provided value |
-| LogInjectionTest.java:1357:58:1357:74 | (...)... | LogInjectionTest.java:1357:67:1357:74 | source(...) : Object | LogInjectionTest.java:1357:58:1357:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1357:67:1357:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1358:43:1358:59 | (...)... | LogInjectionTest.java:1358:52:1358:59 | source(...) : Object | LogInjectionTest.java:1358:43:1358:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1358:52:1358:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1359:28:1359:44 | (...)... | LogInjectionTest.java:1359:37:1359:44 | source(...) : Object | LogInjectionTest.java:1359:28:1359:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1359:37:1359:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1360:58:1360:74 | (...)... | LogInjectionTest.java:1360:67:1360:74 | source(...) : Object | LogInjectionTest.java:1360:58:1360:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1360:67:1360:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1361:43:1361:59 | (...)... | LogInjectionTest.java:1361:52:1361:59 | source(...) : Object | LogInjectionTest.java:1361:43:1361:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1361:52:1361:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1362:28:1362:44 | (...)... | LogInjectionTest.java:1362:37:1362:44 | source(...) : Object | LogInjectionTest.java:1362:28:1362:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1362:37:1362:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1363:73:1363:89 | (...)... | LogInjectionTest.java:1363:82:1363:89 | source(...) : Object | LogInjectionTest.java:1363:73:1363:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1363:82:1363:89 | source(...) | user-provided value |
+| LogInjectionTest.java:1355:43:1355:59 | (...)... | LogInjectionTest.java:1355:52:1355:59 | source(...) : Object | LogInjectionTest.java:1355:43:1355:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1355:52:1355:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1356:28:1356:44 | (...)... | LogInjectionTest.java:1356:37:1356:44 | source(...) : Object | LogInjectionTest.java:1356:28:1356:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1356:37:1356:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1357:28:1357:44 | (...)... | LogInjectionTest.java:1357:37:1357:44 | source(...) : Object | LogInjectionTest.java:1357:28:1357:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1357:37:1357:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1358:28:1358:44 | (...)... | LogInjectionTest.java:1358:37:1358:44 | source(...) : Object | LogInjectionTest.java:1358:28:1358:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1358:37:1358:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1359:43:1359:65 | new Object[] | LogInjectionTest.java:1359:57:1359:64 | source(...) : Object | LogInjectionTest.java:1359:43:1359:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1359:57:1359:64 | source(...) | user-provided value |
+| LogInjectionTest.java:1360:43:1360:65 | new Object[] | LogInjectionTest.java:1360:57:1360:64 | source(...) : Object | LogInjectionTest.java:1360:43:1360:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1360:57:1360:64 | source(...) | user-provided value |
+| LogInjectionTest.java:1361:58:1361:74 | (...)... | LogInjectionTest.java:1361:67:1361:74 | source(...) : Object | LogInjectionTest.java:1361:58:1361:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1361:67:1361:74 | source(...) | user-provided value |
+| LogInjectionTest.java:1362:43:1362:59 | (...)... | LogInjectionTest.java:1362:52:1362:59 | source(...) : Object | LogInjectionTest.java:1362:43:1362:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1362:52:1362:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1363:28:1363:44 | (...)... | LogInjectionTest.java:1363:37:1363:44 | source(...) : Object | LogInjectionTest.java:1363:28:1363:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1363:37:1363:44 | source(...) | user-provided value |
 | LogInjectionTest.java:1364:58:1364:74 | (...)... | LogInjectionTest.java:1364:67:1364:74 | source(...) : Object | LogInjectionTest.java:1364:58:1364:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1364:67:1364:74 | source(...) | user-provided value |
 | LogInjectionTest.java:1365:43:1365:59 | (...)... | LogInjectionTest.java:1365:52:1365:59 | source(...) : Object | LogInjectionTest.java:1365:43:1365:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1365:52:1365:59 | source(...) | user-provided value |
 | LogInjectionTest.java:1366:28:1366:44 | (...)... | LogInjectionTest.java:1366:37:1366:44 | source(...) : Object | LogInjectionTest.java:1366:28:1366:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1366:37:1366:44 | source(...) | user-provided value |
@@ -1174,188 +1216,188 @@
 | LogInjectionTest.java:1368:58:1368:74 | (...)... | LogInjectionTest.java:1368:67:1368:74 | source(...) : Object | LogInjectionTest.java:1368:58:1368:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1368:67:1368:74 | source(...) | user-provided value |
 | LogInjectionTest.java:1369:43:1369:59 | (...)... | LogInjectionTest.java:1369:52:1369:59 | source(...) : Object | LogInjectionTest.java:1369:43:1369:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1369:52:1369:59 | source(...) | user-provided value |
 | LogInjectionTest.java:1370:28:1370:44 | (...)... | LogInjectionTest.java:1370:37:1370:44 | source(...) : Object | LogInjectionTest.java:1370:28:1370:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1370:37:1370:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1371:43:1371:59 | (...)... | LogInjectionTest.java:1371:52:1371:59 | source(...) : Object | LogInjectionTest.java:1371:43:1371:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1371:52:1371:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1372:28:1372:44 | (...)... | LogInjectionTest.java:1372:37:1372:44 | source(...) : Object | LogInjectionTest.java:1372:28:1372:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1372:37:1372:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1371:73:1371:89 | (...)... | LogInjectionTest.java:1371:82:1371:89 | source(...) : Object | LogInjectionTest.java:1371:73:1371:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1371:82:1371:89 | source(...) | user-provided value |
+| LogInjectionTest.java:1372:58:1372:74 | (...)... | LogInjectionTest.java:1372:67:1372:74 | source(...) : Object | LogInjectionTest.java:1372:58:1372:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1372:67:1372:74 | source(...) | user-provided value |
 | LogInjectionTest.java:1373:43:1373:59 | (...)... | LogInjectionTest.java:1373:52:1373:59 | source(...) : Object | LogInjectionTest.java:1373:43:1373:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1373:52:1373:59 | source(...) | user-provided value |
 | LogInjectionTest.java:1374:28:1374:44 | (...)... | LogInjectionTest.java:1374:37:1374:44 | source(...) : Object | LogInjectionTest.java:1374:28:1374:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1374:37:1374:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1375:28:1375:44 | (...)... | LogInjectionTest.java:1375:37:1375:44 | source(...) : Object | LogInjectionTest.java:1375:28:1375:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1375:37:1375:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1376:28:1376:44 | (...)... | LogInjectionTest.java:1376:37:1376:44 | source(...) : Object | LogInjectionTest.java:1376:28:1376:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1376:37:1376:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1377:43:1377:65 | new Object[] | LogInjectionTest.java:1377:57:1377:64 | source(...) : Object | LogInjectionTest.java:1377:43:1377:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1377:57:1377:64 | source(...) | user-provided value |
-| LogInjectionTest.java:1378:43:1378:65 | new Object[] | LogInjectionTest.java:1378:57:1378:64 | source(...) : Object | LogInjectionTest.java:1378:43:1378:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1378:57:1378:64 | source(...) | user-provided value |
-| LogInjectionTest.java:1379:58:1379:74 | (...)... | LogInjectionTest.java:1379:67:1379:74 | source(...) : Object | LogInjectionTest.java:1379:58:1379:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1379:67:1379:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1380:43:1380:59 | (...)... | LogInjectionTest.java:1380:52:1380:59 | source(...) : Object | LogInjectionTest.java:1380:43:1380:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1380:52:1380:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1381:28:1381:44 | (...)... | LogInjectionTest.java:1381:37:1381:44 | source(...) : Object | LogInjectionTest.java:1381:28:1381:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1381:37:1381:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1382:58:1382:74 | (...)... | LogInjectionTest.java:1382:67:1382:74 | source(...) : Object | LogInjectionTest.java:1382:58:1382:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1382:67:1382:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1383:43:1383:59 | (...)... | LogInjectionTest.java:1383:52:1383:59 | source(...) : Object | LogInjectionTest.java:1383:43:1383:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1383:52:1383:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1384:28:1384:44 | (...)... | LogInjectionTest.java:1384:37:1384:44 | source(...) : Object | LogInjectionTest.java:1384:28:1384:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1384:37:1384:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1385:73:1385:89 | (...)... | LogInjectionTest.java:1385:82:1385:89 | source(...) : Object | LogInjectionTest.java:1385:73:1385:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1385:82:1385:89 | source(...) | user-provided value |
-| LogInjectionTest.java:1386:58:1386:74 | (...)... | LogInjectionTest.java:1386:67:1386:74 | source(...) : Object | LogInjectionTest.java:1386:58:1386:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1386:67:1386:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1387:43:1387:59 | (...)... | LogInjectionTest.java:1387:52:1387:59 | source(...) : Object | LogInjectionTest.java:1387:43:1387:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1387:52:1387:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1388:28:1388:44 | (...)... | LogInjectionTest.java:1388:37:1388:44 | source(...) : Object | LogInjectionTest.java:1388:28:1388:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1388:37:1388:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1389:73:1389:89 | (...)... | LogInjectionTest.java:1389:82:1389:89 | source(...) : Object | LogInjectionTest.java:1389:73:1389:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1389:82:1389:89 | source(...) | user-provided value |
-| LogInjectionTest.java:1390:58:1390:74 | (...)... | LogInjectionTest.java:1390:67:1390:74 | source(...) : Object | LogInjectionTest.java:1390:58:1390:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1390:67:1390:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1391:43:1391:59 | (...)... | LogInjectionTest.java:1391:52:1391:59 | source(...) : Object | LogInjectionTest.java:1391:43:1391:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1391:52:1391:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1392:28:1392:44 | (...)... | LogInjectionTest.java:1392:37:1392:44 | source(...) : Object | LogInjectionTest.java:1392:28:1392:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1392:37:1392:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1393:43:1393:59 | (...)... | LogInjectionTest.java:1393:52:1393:59 | source(...) : Object | LogInjectionTest.java:1393:43:1393:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1393:52:1393:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1394:28:1394:44 | (...)... | LogInjectionTest.java:1394:37:1394:44 | source(...) : Object | LogInjectionTest.java:1394:28:1394:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1394:37:1394:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1395:43:1395:59 | (...)... | LogInjectionTest.java:1395:52:1395:59 | source(...) : Object | LogInjectionTest.java:1395:43:1395:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1395:52:1395:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1396:28:1396:44 | (...)... | LogInjectionTest.java:1396:37:1396:44 | source(...) : Object | LogInjectionTest.java:1396:28:1396:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1396:37:1396:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1397:28:1397:44 | (...)... | LogInjectionTest.java:1397:37:1397:44 | source(...) : Object | LogInjectionTest.java:1397:28:1397:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1397:37:1397:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1398:28:1398:44 | (...)... | LogInjectionTest.java:1398:37:1398:44 | source(...) : Object | LogInjectionTest.java:1398:28:1398:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1398:37:1398:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1399:43:1399:65 | new Object[] | LogInjectionTest.java:1399:57:1399:64 | source(...) : Object | LogInjectionTest.java:1399:43:1399:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1399:57:1399:64 | source(...) | user-provided value |
-| LogInjectionTest.java:1400:43:1400:65 | new Object[] | LogInjectionTest.java:1400:57:1400:64 | source(...) : Object | LogInjectionTest.java:1400:43:1400:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1400:57:1400:64 | source(...) | user-provided value |
-| LogInjectionTest.java:1401:58:1401:74 | (...)... | LogInjectionTest.java:1401:67:1401:74 | source(...) : Object | LogInjectionTest.java:1401:58:1401:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1401:67:1401:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1402:43:1402:59 | (...)... | LogInjectionTest.java:1402:52:1402:59 | source(...) : Object | LogInjectionTest.java:1402:43:1402:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1402:52:1402:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1403:28:1403:44 | (...)... | LogInjectionTest.java:1403:37:1403:44 | source(...) : Object | LogInjectionTest.java:1403:28:1403:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1403:37:1403:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1404:58:1404:74 | (...)... | LogInjectionTest.java:1404:67:1404:74 | source(...) : Object | LogInjectionTest.java:1404:58:1404:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1404:67:1404:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1405:43:1405:59 | (...)... | LogInjectionTest.java:1405:52:1405:59 | source(...) : Object | LogInjectionTest.java:1405:43:1405:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1405:52:1405:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1406:28:1406:44 | (...)... | LogInjectionTest.java:1406:37:1406:44 | source(...) : Object | LogInjectionTest.java:1406:28:1406:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1406:37:1406:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1407:73:1407:89 | (...)... | LogInjectionTest.java:1407:82:1407:89 | source(...) : Object | LogInjectionTest.java:1407:73:1407:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1407:82:1407:89 | source(...) | user-provided value |
-| LogInjectionTest.java:1408:58:1408:74 | (...)... | LogInjectionTest.java:1408:67:1408:74 | source(...) : Object | LogInjectionTest.java:1408:58:1408:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1408:67:1408:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1409:43:1409:59 | (...)... | LogInjectionTest.java:1409:52:1409:59 | source(...) : Object | LogInjectionTest.java:1409:43:1409:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1409:52:1409:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1410:28:1410:44 | (...)... | LogInjectionTest.java:1410:37:1410:44 | source(...) : Object | LogInjectionTest.java:1410:28:1410:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1410:37:1410:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1411:73:1411:89 | (...)... | LogInjectionTest.java:1411:82:1411:89 | source(...) : Object | LogInjectionTest.java:1411:73:1411:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1411:82:1411:89 | source(...) | user-provided value |
-| LogInjectionTest.java:1412:58:1412:74 | (...)... | LogInjectionTest.java:1412:67:1412:74 | source(...) : Object | LogInjectionTest.java:1412:58:1412:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1412:67:1412:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1413:43:1413:59 | (...)... | LogInjectionTest.java:1413:52:1413:59 | source(...) : Object | LogInjectionTest.java:1413:43:1413:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1413:52:1413:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1414:28:1414:44 | (...)... | LogInjectionTest.java:1414:37:1414:44 | source(...) : Object | LogInjectionTest.java:1414:28:1414:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1414:37:1414:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1415:42:1415:58 | (...)... | LogInjectionTest.java:1415:51:1415:58 | source(...) : Object | LogInjectionTest.java:1415:42:1415:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1415:51:1415:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1416:27:1416:43 | (...)... | LogInjectionTest.java:1416:36:1416:43 | source(...) : Object | LogInjectionTest.java:1416:27:1416:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1416:36:1416:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1417:42:1417:58 | (...)... | LogInjectionTest.java:1417:51:1417:58 | source(...) : Object | LogInjectionTest.java:1417:42:1417:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1417:51:1417:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1418:27:1418:43 | (...)... | LogInjectionTest.java:1418:36:1418:43 | source(...) : Object | LogInjectionTest.java:1418:27:1418:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1418:36:1418:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1419:27:1419:43 | (...)... | LogInjectionTest.java:1419:36:1419:43 | source(...) : Object | LogInjectionTest.java:1419:27:1419:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1419:36:1419:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1420:27:1420:43 | (...)... | LogInjectionTest.java:1420:36:1420:43 | source(...) : Object | LogInjectionTest.java:1420:27:1420:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1420:36:1420:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1421:42:1421:64 | new Object[] | LogInjectionTest.java:1421:56:1421:63 | source(...) : Object | LogInjectionTest.java:1421:42:1421:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1421:56:1421:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1422:42:1422:64 | new Object[] | LogInjectionTest.java:1422:56:1422:63 | source(...) : Object | LogInjectionTest.java:1422:42:1422:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1422:56:1422:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1423:57:1423:73 | (...)... | LogInjectionTest.java:1423:66:1423:73 | source(...) : Object | LogInjectionTest.java:1423:57:1423:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1423:66:1423:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1424:42:1424:58 | (...)... | LogInjectionTest.java:1424:51:1424:58 | source(...) : Object | LogInjectionTest.java:1424:42:1424:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1424:51:1424:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1425:27:1425:43 | (...)... | LogInjectionTest.java:1425:36:1425:43 | source(...) : Object | LogInjectionTest.java:1425:27:1425:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1425:36:1425:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1426:57:1426:73 | (...)... | LogInjectionTest.java:1426:66:1426:73 | source(...) : Object | LogInjectionTest.java:1426:57:1426:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1426:66:1426:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1427:42:1427:58 | (...)... | LogInjectionTest.java:1427:51:1427:58 | source(...) : Object | LogInjectionTest.java:1427:42:1427:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1427:51:1427:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1428:27:1428:43 | (...)... | LogInjectionTest.java:1428:36:1428:43 | source(...) : Object | LogInjectionTest.java:1428:27:1428:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1428:36:1428:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1429:72:1429:88 | (...)... | LogInjectionTest.java:1429:81:1429:88 | source(...) : Object | LogInjectionTest.java:1429:72:1429:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1429:81:1429:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1430:57:1430:73 | (...)... | LogInjectionTest.java:1430:66:1430:73 | source(...) : Object | LogInjectionTest.java:1430:57:1430:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1430:66:1430:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1431:42:1431:58 | (...)... | LogInjectionTest.java:1431:51:1431:58 | source(...) : Object | LogInjectionTest.java:1431:42:1431:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1431:51:1431:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1432:27:1432:43 | (...)... | LogInjectionTest.java:1432:36:1432:43 | source(...) : Object | LogInjectionTest.java:1432:27:1432:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1432:36:1432:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1433:72:1433:88 | (...)... | LogInjectionTest.java:1433:81:1433:88 | source(...) : Object | LogInjectionTest.java:1433:72:1433:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1433:81:1433:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1434:57:1434:73 | (...)... | LogInjectionTest.java:1434:66:1434:73 | source(...) : Object | LogInjectionTest.java:1434:57:1434:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1434:66:1434:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1435:42:1435:58 | (...)... | LogInjectionTest.java:1435:51:1435:58 | source(...) : Object | LogInjectionTest.java:1435:42:1435:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1435:51:1435:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1436:27:1436:43 | (...)... | LogInjectionTest.java:1436:36:1436:43 | source(...) : Object | LogInjectionTest.java:1436:27:1436:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1436:36:1436:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1437:80:1437:96 | (...)... | LogInjectionTest.java:1437:89:1437:96 | source(...) : Object | LogInjectionTest.java:1437:80:1437:96 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1437:89:1437:96 | source(...) | user-provided value |
-| LogInjectionTest.java:1438:65:1438:81 | (...)... | LogInjectionTest.java:1438:74:1438:81 | source(...) : Object | LogInjectionTest.java:1438:65:1438:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1438:74:1438:81 | source(...) | user-provided value |
-| LogInjectionTest.java:1439:80:1439:96 | (...)... | LogInjectionTest.java:1439:89:1439:96 | source(...) : Object | LogInjectionTest.java:1439:80:1439:96 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1439:89:1439:96 | source(...) | user-provided value |
-| LogInjectionTest.java:1440:65:1440:81 | (...)... | LogInjectionTest.java:1440:74:1440:81 | source(...) : Object | LogInjectionTest.java:1440:65:1440:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1440:74:1440:81 | source(...) | user-provided value |
-| LogInjectionTest.java:1441:65:1441:81 | (...)... | LogInjectionTest.java:1441:74:1441:81 | source(...) : Object | LogInjectionTest.java:1441:65:1441:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1441:74:1441:81 | source(...) | user-provided value |
-| LogInjectionTest.java:1442:65:1442:81 | (...)... | LogInjectionTest.java:1442:74:1442:81 | source(...) : Object | LogInjectionTest.java:1442:65:1442:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1442:74:1442:81 | source(...) | user-provided value |
-| LogInjectionTest.java:1443:80:1443:102 | new Object[] | LogInjectionTest.java:1443:94:1443:101 | source(...) : Object | LogInjectionTest.java:1443:80:1443:102 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1443:94:1443:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1444:80:1444:102 | new Object[] | LogInjectionTest.java:1444:94:1444:101 | source(...) : Object | LogInjectionTest.java:1444:80:1444:102 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1444:94:1444:101 | source(...) | user-provided value |
-| LogInjectionTest.java:1445:95:1445:111 | (...)... | LogInjectionTest.java:1445:104:1445:111 | source(...) : Object | LogInjectionTest.java:1445:95:1445:111 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1445:104:1445:111 | source(...) | user-provided value |
-| LogInjectionTest.java:1446:80:1446:96 | (...)... | LogInjectionTest.java:1446:89:1446:96 | source(...) : Object | LogInjectionTest.java:1446:80:1446:96 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1446:89:1446:96 | source(...) | user-provided value |
-| LogInjectionTest.java:1447:65:1447:81 | (...)... | LogInjectionTest.java:1447:74:1447:81 | source(...) : Object | LogInjectionTest.java:1447:65:1447:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1447:74:1447:81 | source(...) | user-provided value |
-| LogInjectionTest.java:1448:95:1448:111 | (...)... | LogInjectionTest.java:1448:104:1448:111 | source(...) : Object | LogInjectionTest.java:1448:95:1448:111 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1448:104:1448:111 | source(...) | user-provided value |
-| LogInjectionTest.java:1449:80:1449:96 | (...)... | LogInjectionTest.java:1449:89:1449:96 | source(...) : Object | LogInjectionTest.java:1449:80:1449:96 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1449:89:1449:96 | source(...) | user-provided value |
-| LogInjectionTest.java:1450:65:1450:81 | (...)... | LogInjectionTest.java:1450:74:1450:81 | source(...) : Object | LogInjectionTest.java:1450:65:1450:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1450:74:1450:81 | source(...) | user-provided value |
-| LogInjectionTest.java:1451:110:1451:126 | (...)... | LogInjectionTest.java:1451:119:1451:126 | source(...) : Object | LogInjectionTest.java:1451:110:1451:126 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1451:119:1451:126 | source(...) | user-provided value |
-| LogInjectionTest.java:1452:95:1452:111 | (...)... | LogInjectionTest.java:1452:104:1452:111 | source(...) : Object | LogInjectionTest.java:1452:95:1452:111 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1452:104:1452:111 | source(...) | user-provided value |
-| LogInjectionTest.java:1453:80:1453:96 | (...)... | LogInjectionTest.java:1453:89:1453:96 | source(...) : Object | LogInjectionTest.java:1453:80:1453:96 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1453:89:1453:96 | source(...) | user-provided value |
-| LogInjectionTest.java:1454:65:1454:81 | (...)... | LogInjectionTest.java:1454:74:1454:81 | source(...) : Object | LogInjectionTest.java:1454:65:1454:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1454:74:1454:81 | source(...) | user-provided value |
-| LogInjectionTest.java:1455:110:1455:126 | (...)... | LogInjectionTest.java:1455:119:1455:126 | source(...) : Object | LogInjectionTest.java:1455:110:1455:126 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1455:119:1455:126 | source(...) | user-provided value |
-| LogInjectionTest.java:1456:95:1456:111 | (...)... | LogInjectionTest.java:1456:104:1456:111 | source(...) : Object | LogInjectionTest.java:1456:95:1456:111 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1456:104:1456:111 | source(...) | user-provided value |
-| LogInjectionTest.java:1457:80:1457:96 | (...)... | LogInjectionTest.java:1457:89:1457:96 | source(...) : Object | LogInjectionTest.java:1457:80:1457:96 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1457:89:1457:96 | source(...) | user-provided value |
-| LogInjectionTest.java:1458:65:1458:81 | (...)... | LogInjectionTest.java:1458:74:1458:81 | source(...) : Object | LogInjectionTest.java:1458:65:1458:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1458:74:1458:81 | source(...) | user-provided value |
-| LogInjectionTest.java:1459:43:1459:59 | (...)... | LogInjectionTest.java:1459:52:1459:59 | source(...) : Object | LogInjectionTest.java:1459:43:1459:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1459:52:1459:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1460:28:1460:44 | (...)... | LogInjectionTest.java:1460:37:1460:44 | source(...) : Object | LogInjectionTest.java:1460:28:1460:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1460:37:1460:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1461:43:1461:59 | (...)... | LogInjectionTest.java:1461:52:1461:59 | source(...) : Object | LogInjectionTest.java:1461:43:1461:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1461:52:1461:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1462:28:1462:44 | (...)... | LogInjectionTest.java:1462:37:1462:44 | source(...) : Object | LogInjectionTest.java:1462:28:1462:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1462:37:1462:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1463:28:1463:44 | (...)... | LogInjectionTest.java:1463:37:1463:44 | source(...) : Object | LogInjectionTest.java:1463:28:1463:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1463:37:1463:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1464:28:1464:44 | (...)... | LogInjectionTest.java:1464:37:1464:44 | source(...) : Object | LogInjectionTest.java:1464:28:1464:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1464:37:1464:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1465:43:1465:65 | new Object[] | LogInjectionTest.java:1465:57:1465:64 | source(...) : Object | LogInjectionTest.java:1465:43:1465:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1465:57:1465:64 | source(...) | user-provided value |
-| LogInjectionTest.java:1466:43:1466:65 | new Object[] | LogInjectionTest.java:1466:57:1466:64 | source(...) : Object | LogInjectionTest.java:1466:43:1466:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1466:57:1466:64 | source(...) | user-provided value |
-| LogInjectionTest.java:1467:58:1467:74 | (...)... | LogInjectionTest.java:1467:67:1467:74 | source(...) : Object | LogInjectionTest.java:1467:58:1467:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1467:67:1467:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1468:43:1468:59 | (...)... | LogInjectionTest.java:1468:52:1468:59 | source(...) : Object | LogInjectionTest.java:1468:43:1468:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1468:52:1468:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1469:28:1469:44 | (...)... | LogInjectionTest.java:1469:37:1469:44 | source(...) : Object | LogInjectionTest.java:1469:28:1469:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1469:37:1469:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1470:58:1470:74 | (...)... | LogInjectionTest.java:1470:67:1470:74 | source(...) : Object | LogInjectionTest.java:1470:58:1470:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1470:67:1470:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1471:43:1471:59 | (...)... | LogInjectionTest.java:1471:52:1471:59 | source(...) : Object | LogInjectionTest.java:1471:43:1471:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1471:52:1471:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1472:28:1472:44 | (...)... | LogInjectionTest.java:1472:37:1472:44 | source(...) : Object | LogInjectionTest.java:1472:28:1472:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1472:37:1472:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1473:73:1473:89 | (...)... | LogInjectionTest.java:1473:82:1473:89 | source(...) : Object | LogInjectionTest.java:1473:73:1473:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1473:82:1473:89 | source(...) | user-provided value |
-| LogInjectionTest.java:1474:58:1474:74 | (...)... | LogInjectionTest.java:1474:67:1474:74 | source(...) : Object | LogInjectionTest.java:1474:58:1474:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1474:67:1474:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1475:43:1475:59 | (...)... | LogInjectionTest.java:1475:52:1475:59 | source(...) : Object | LogInjectionTest.java:1475:43:1475:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1475:52:1475:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1476:28:1476:44 | (...)... | LogInjectionTest.java:1476:37:1476:44 | source(...) : Object | LogInjectionTest.java:1476:28:1476:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1476:37:1476:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1477:73:1477:89 | (...)... | LogInjectionTest.java:1477:82:1477:89 | source(...) : Object | LogInjectionTest.java:1477:73:1477:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1477:82:1477:89 | source(...) | user-provided value |
-| LogInjectionTest.java:1478:58:1478:74 | (...)... | LogInjectionTest.java:1478:67:1478:74 | source(...) : Object | LogInjectionTest.java:1478:58:1478:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1478:67:1478:74 | source(...) | user-provided value |
-| LogInjectionTest.java:1479:43:1479:59 | (...)... | LogInjectionTest.java:1479:52:1479:59 | source(...) : Object | LogInjectionTest.java:1479:43:1479:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1479:52:1479:59 | source(...) | user-provided value |
-| LogInjectionTest.java:1480:28:1480:44 | (...)... | LogInjectionTest.java:1480:37:1480:44 | source(...) : Object | LogInjectionTest.java:1480:28:1480:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1480:37:1480:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1481:42:1481:58 | (...)... | LogInjectionTest.java:1481:51:1481:58 | source(...) : Object | LogInjectionTest.java:1481:42:1481:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1481:51:1481:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1482:27:1482:43 | (...)... | LogInjectionTest.java:1482:36:1482:43 | source(...) : Object | LogInjectionTest.java:1482:27:1482:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1482:36:1482:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1483:42:1483:58 | (...)... | LogInjectionTest.java:1483:51:1483:58 | source(...) : Object | LogInjectionTest.java:1483:42:1483:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1483:51:1483:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1484:27:1484:43 | (...)... | LogInjectionTest.java:1484:36:1484:43 | source(...) : Object | LogInjectionTest.java:1484:27:1484:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1484:36:1484:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1485:27:1485:43 | (...)... | LogInjectionTest.java:1485:36:1485:43 | source(...) : Object | LogInjectionTest.java:1485:27:1485:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1485:36:1485:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1486:27:1486:43 | (...)... | LogInjectionTest.java:1486:36:1486:43 | source(...) : Object | LogInjectionTest.java:1486:27:1486:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1486:36:1486:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1487:42:1487:64 | new Object[] | LogInjectionTest.java:1487:56:1487:63 | source(...) : Object | LogInjectionTest.java:1487:42:1487:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1487:56:1487:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1488:42:1488:64 | new Object[] | LogInjectionTest.java:1488:56:1488:63 | source(...) : Object | LogInjectionTest.java:1488:42:1488:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1488:56:1488:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1489:57:1489:73 | (...)... | LogInjectionTest.java:1489:66:1489:73 | source(...) : Object | LogInjectionTest.java:1489:57:1489:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1489:66:1489:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1490:42:1490:58 | (...)... | LogInjectionTest.java:1490:51:1490:58 | source(...) : Object | LogInjectionTest.java:1490:42:1490:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1490:51:1490:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1491:27:1491:43 | (...)... | LogInjectionTest.java:1491:36:1491:43 | source(...) : Object | LogInjectionTest.java:1491:27:1491:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1491:36:1491:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1492:57:1492:73 | (...)... | LogInjectionTest.java:1492:66:1492:73 | source(...) : Object | LogInjectionTest.java:1492:57:1492:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1492:66:1492:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1493:42:1493:58 | (...)... | LogInjectionTest.java:1493:51:1493:58 | source(...) : Object | LogInjectionTest.java:1493:42:1493:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1493:51:1493:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1494:27:1494:43 | (...)... | LogInjectionTest.java:1494:36:1494:43 | source(...) : Object | LogInjectionTest.java:1494:27:1494:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1494:36:1494:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1495:72:1495:88 | (...)... | LogInjectionTest.java:1495:81:1495:88 | source(...) : Object | LogInjectionTest.java:1495:72:1495:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1495:81:1495:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1496:57:1496:73 | (...)... | LogInjectionTest.java:1496:66:1496:73 | source(...) : Object | LogInjectionTest.java:1496:57:1496:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1496:66:1496:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1497:42:1497:58 | (...)... | LogInjectionTest.java:1497:51:1497:58 | source(...) : Object | LogInjectionTest.java:1497:42:1497:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1497:51:1497:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1498:27:1498:43 | (...)... | LogInjectionTest.java:1498:36:1498:43 | source(...) : Object | LogInjectionTest.java:1498:27:1498:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1498:36:1498:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1499:72:1499:88 | (...)... | LogInjectionTest.java:1499:81:1499:88 | source(...) : Object | LogInjectionTest.java:1499:72:1499:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1499:81:1499:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1500:57:1500:73 | (...)... | LogInjectionTest.java:1500:66:1500:73 | source(...) : Object | LogInjectionTest.java:1500:57:1500:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1500:66:1500:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1501:42:1501:58 | (...)... | LogInjectionTest.java:1501:51:1501:58 | source(...) : Object | LogInjectionTest.java:1501:42:1501:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1501:51:1501:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1502:27:1502:43 | (...)... | LogInjectionTest.java:1502:36:1502:43 | source(...) : Object | LogInjectionTest.java:1502:27:1502:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1502:36:1502:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1508:26:1508:33 | source(...) | LogInjectionTest.java:1508:26:1508:33 | source(...) | LogInjectionTest.java:1508:26:1508:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1508:26:1508:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1509:26:1509:33 | source(...) | LogInjectionTest.java:1509:26:1509:33 | source(...) | LogInjectionTest.java:1509:26:1509:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1509:26:1509:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1513:41:1513:48 | source(...) | LogInjectionTest.java:1513:41:1513:48 | source(...) | LogInjectionTest.java:1513:41:1513:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1513:41:1513:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1514:56:1514:78 | new Object[] | LogInjectionTest.java:1514:70:1514:77 | source(...) : Object | LogInjectionTest.java:1514:56:1514:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1514:70:1514:77 | source(...) | user-provided value |
-| LogInjectionTest.java:1515:41:1515:48 | source(...) | LogInjectionTest.java:1515:41:1515:48 | source(...) | LogInjectionTest.java:1515:41:1515:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1515:41:1515:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1516:26:1516:33 | source(...) | LogInjectionTest.java:1516:26:1516:33 | source(...) | LogInjectionTest.java:1516:26:1516:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1516:26:1516:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1517:26:1517:33 | source(...) | LogInjectionTest.java:1517:26:1517:33 | source(...) | LogInjectionTest.java:1517:26:1517:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1517:26:1517:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1521:41:1521:48 | source(...) | LogInjectionTest.java:1521:41:1521:48 | source(...) | LogInjectionTest.java:1521:41:1521:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1521:41:1521:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1522:56:1522:78 | new Object[] | LogInjectionTest.java:1522:70:1522:77 | source(...) : Object | LogInjectionTest.java:1522:56:1522:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1522:70:1522:77 | source(...) | user-provided value |
-| LogInjectionTest.java:1523:41:1523:48 | source(...) | LogInjectionTest.java:1523:41:1523:48 | source(...) | LogInjectionTest.java:1523:41:1523:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1523:41:1523:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1524:26:1524:33 | source(...) | LogInjectionTest.java:1524:26:1524:33 | source(...) | LogInjectionTest.java:1524:26:1524:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1524:26:1524:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1525:26:1525:33 | source(...) | LogInjectionTest.java:1525:26:1525:33 | source(...) | LogInjectionTest.java:1525:26:1525:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1525:26:1525:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1529:41:1529:48 | source(...) | LogInjectionTest.java:1529:41:1529:48 | source(...) | LogInjectionTest.java:1529:41:1529:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1529:41:1529:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1530:56:1530:78 | new Object[] | LogInjectionTest.java:1530:70:1530:77 | source(...) : Object | LogInjectionTest.java:1530:56:1530:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1530:70:1530:77 | source(...) | user-provided value |
-| LogInjectionTest.java:1531:41:1531:48 | source(...) | LogInjectionTest.java:1531:41:1531:48 | source(...) | LogInjectionTest.java:1531:41:1531:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1531:41:1531:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1532:25:1532:32 | source(...) | LogInjectionTest.java:1532:25:1532:32 | source(...) | LogInjectionTest.java:1532:25:1532:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1532:25:1532:32 | source(...) | user-provided value |
-| LogInjectionTest.java:1533:25:1533:32 | source(...) | LogInjectionTest.java:1533:25:1533:32 | source(...) | LogInjectionTest.java:1533:25:1533:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1533:25:1533:32 | source(...) | user-provided value |
-| LogInjectionTest.java:1537:40:1537:47 | source(...) | LogInjectionTest.java:1537:40:1537:47 | source(...) | LogInjectionTest.java:1537:40:1537:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1537:40:1537:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1538:55:1538:77 | new Object[] | LogInjectionTest.java:1538:69:1538:76 | source(...) : Object | LogInjectionTest.java:1538:55:1538:77 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1538:69:1538:76 | source(...) | user-provided value |
-| LogInjectionTest.java:1539:40:1539:47 | source(...) | LogInjectionTest.java:1539:40:1539:47 | source(...) | LogInjectionTest.java:1539:40:1539:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1539:40:1539:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1540:26:1540:33 | source(...) | LogInjectionTest.java:1540:26:1540:33 | source(...) | LogInjectionTest.java:1540:26:1540:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1540:26:1540:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1541:26:1541:33 | source(...) | LogInjectionTest.java:1541:26:1541:33 | source(...) | LogInjectionTest.java:1541:26:1541:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1541:26:1541:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1545:41:1545:48 | source(...) | LogInjectionTest.java:1545:41:1545:48 | source(...) | LogInjectionTest.java:1545:41:1545:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1545:41:1545:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1546:56:1546:78 | new Object[] | LogInjectionTest.java:1546:70:1546:77 | source(...) : Object | LogInjectionTest.java:1546:56:1546:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1546:70:1546:77 | source(...) | user-provided value |
-| LogInjectionTest.java:1547:41:1547:48 | source(...) | LogInjectionTest.java:1547:41:1547:48 | source(...) | LogInjectionTest.java:1547:41:1547:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1547:41:1547:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1548:25:1548:32 | source(...) | LogInjectionTest.java:1548:25:1548:32 | source(...) | LogInjectionTest.java:1548:25:1548:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1548:25:1548:32 | source(...) | user-provided value |
-| LogInjectionTest.java:1549:25:1549:32 | source(...) | LogInjectionTest.java:1549:25:1549:32 | source(...) | LogInjectionTest.java:1549:25:1549:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1549:25:1549:32 | source(...) | user-provided value |
-| LogInjectionTest.java:1553:40:1553:47 | source(...) | LogInjectionTest.java:1553:40:1553:47 | source(...) | LogInjectionTest.java:1553:40:1553:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1553:40:1553:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1554:55:1554:77 | new Object[] | LogInjectionTest.java:1554:69:1554:76 | source(...) : Object | LogInjectionTest.java:1554:55:1554:77 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1554:69:1554:76 | source(...) | user-provided value |
-| LogInjectionTest.java:1555:40:1555:47 | source(...) | LogInjectionTest.java:1555:40:1555:47 | source(...) | LogInjectionTest.java:1555:40:1555:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1555:40:1555:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1556:63:1556:70 | source(...) | LogInjectionTest.java:1556:63:1556:70 | source(...) | LogInjectionTest.java:1556:63:1556:70 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1556:63:1556:70 | source(...) | user-provided value |
-| LogInjectionTest.java:1557:63:1557:70 | source(...) | LogInjectionTest.java:1557:63:1557:70 | source(...) | LogInjectionTest.java:1557:63:1557:70 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1557:63:1557:70 | source(...) | user-provided value |
-| LogInjectionTest.java:1561:78:1561:85 | source(...) | LogInjectionTest.java:1561:78:1561:85 | source(...) | LogInjectionTest.java:1561:78:1561:85 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1561:78:1561:85 | source(...) | user-provided value |
-| LogInjectionTest.java:1562:78:1562:85 | source(...) | LogInjectionTest.java:1562:78:1562:85 | source(...) | LogInjectionTest.java:1562:78:1562:85 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1562:78:1562:85 | source(...) | user-provided value |
-| LogInjectionTest.java:1563:93:1563:115 | new Object[] | LogInjectionTest.java:1563:107:1563:114 | source(...) : Object | LogInjectionTest.java:1563:93:1563:115 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1563:107:1563:114 | source(...) | user-provided value |
-| LogInjectionTest.java:1564:42:1564:58 | (...)... | LogInjectionTest.java:1564:51:1564:58 | source(...) : Object | LogInjectionTest.java:1564:42:1564:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1564:51:1564:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1565:27:1565:43 | (...)... | LogInjectionTest.java:1565:36:1565:43 | source(...) : Object | LogInjectionTest.java:1565:27:1565:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1565:36:1565:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1375:42:1375:58 | (...)... | LogInjectionTest.java:1375:51:1375:58 | source(...) : Object | LogInjectionTest.java:1375:42:1375:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1375:51:1375:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1376:27:1376:43 | (...)... | LogInjectionTest.java:1376:36:1376:43 | source(...) : Object | LogInjectionTest.java:1376:27:1376:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1376:36:1376:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1377:42:1377:58 | (...)... | LogInjectionTest.java:1377:51:1377:58 | source(...) : Object | LogInjectionTest.java:1377:42:1377:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1377:51:1377:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1378:27:1378:43 | (...)... | LogInjectionTest.java:1378:36:1378:43 | source(...) : Object | LogInjectionTest.java:1378:27:1378:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1378:36:1378:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1379:27:1379:43 | (...)... | LogInjectionTest.java:1379:36:1379:43 | source(...) : Object | LogInjectionTest.java:1379:27:1379:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1379:36:1379:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1380:27:1380:43 | (...)... | LogInjectionTest.java:1380:36:1380:43 | source(...) : Object | LogInjectionTest.java:1380:27:1380:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1380:36:1380:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1381:42:1381:64 | new Object[] | LogInjectionTest.java:1381:56:1381:63 | source(...) : Object | LogInjectionTest.java:1381:42:1381:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1381:56:1381:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1382:42:1382:64 | new Object[] | LogInjectionTest.java:1382:56:1382:63 | source(...) : Object | LogInjectionTest.java:1382:42:1382:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1382:56:1382:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1383:57:1383:73 | (...)... | LogInjectionTest.java:1383:66:1383:73 | source(...) : Object | LogInjectionTest.java:1383:57:1383:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1383:66:1383:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1384:42:1384:58 | (...)... | LogInjectionTest.java:1384:51:1384:58 | source(...) : Object | LogInjectionTest.java:1384:42:1384:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1384:51:1384:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1385:27:1385:43 | (...)... | LogInjectionTest.java:1385:36:1385:43 | source(...) : Object | LogInjectionTest.java:1385:27:1385:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1385:36:1385:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1386:57:1386:73 | (...)... | LogInjectionTest.java:1386:66:1386:73 | source(...) : Object | LogInjectionTest.java:1386:57:1386:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1386:66:1386:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1387:42:1387:58 | (...)... | LogInjectionTest.java:1387:51:1387:58 | source(...) : Object | LogInjectionTest.java:1387:42:1387:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1387:51:1387:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1388:27:1388:43 | (...)... | LogInjectionTest.java:1388:36:1388:43 | source(...) : Object | LogInjectionTest.java:1388:27:1388:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1388:36:1388:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1389:72:1389:88 | (...)... | LogInjectionTest.java:1389:81:1389:88 | source(...) : Object | LogInjectionTest.java:1389:72:1389:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1389:81:1389:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1390:57:1390:73 | (...)... | LogInjectionTest.java:1390:66:1390:73 | source(...) : Object | LogInjectionTest.java:1390:57:1390:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1390:66:1390:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1391:42:1391:58 | (...)... | LogInjectionTest.java:1391:51:1391:58 | source(...) : Object | LogInjectionTest.java:1391:42:1391:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1391:51:1391:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1392:27:1392:43 | (...)... | LogInjectionTest.java:1392:36:1392:43 | source(...) : Object | LogInjectionTest.java:1392:27:1392:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1392:36:1392:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1393:72:1393:88 | (...)... | LogInjectionTest.java:1393:81:1393:88 | source(...) : Object | LogInjectionTest.java:1393:72:1393:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1393:81:1393:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1394:57:1394:73 | (...)... | LogInjectionTest.java:1394:66:1394:73 | source(...) : Object | LogInjectionTest.java:1394:57:1394:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1394:66:1394:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1395:42:1395:58 | (...)... | LogInjectionTest.java:1395:51:1395:58 | source(...) : Object | LogInjectionTest.java:1395:42:1395:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1395:51:1395:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1396:27:1396:43 | (...)... | LogInjectionTest.java:1396:36:1396:43 | source(...) : Object | LogInjectionTest.java:1396:27:1396:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1396:36:1396:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1397:80:1397:96 | (...)... | LogInjectionTest.java:1397:89:1397:96 | source(...) : Object | LogInjectionTest.java:1397:80:1397:96 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1397:89:1397:96 | source(...) | user-provided value |
+| LogInjectionTest.java:1398:65:1398:81 | (...)... | LogInjectionTest.java:1398:74:1398:81 | source(...) : Object | LogInjectionTest.java:1398:65:1398:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1398:74:1398:81 | source(...) | user-provided value |
+| LogInjectionTest.java:1399:80:1399:96 | (...)... | LogInjectionTest.java:1399:89:1399:96 | source(...) : Object | LogInjectionTest.java:1399:80:1399:96 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1399:89:1399:96 | source(...) | user-provided value |
+| LogInjectionTest.java:1400:65:1400:81 | (...)... | LogInjectionTest.java:1400:74:1400:81 | source(...) : Object | LogInjectionTest.java:1400:65:1400:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1400:74:1400:81 | source(...) | user-provided value |
+| LogInjectionTest.java:1401:65:1401:81 | (...)... | LogInjectionTest.java:1401:74:1401:81 | source(...) : Object | LogInjectionTest.java:1401:65:1401:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1401:74:1401:81 | source(...) | user-provided value |
+| LogInjectionTest.java:1402:65:1402:81 | (...)... | LogInjectionTest.java:1402:74:1402:81 | source(...) : Object | LogInjectionTest.java:1402:65:1402:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1402:74:1402:81 | source(...) | user-provided value |
+| LogInjectionTest.java:1403:80:1403:102 | new Object[] | LogInjectionTest.java:1403:94:1403:101 | source(...) : Object | LogInjectionTest.java:1403:80:1403:102 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1403:94:1403:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1404:80:1404:102 | new Object[] | LogInjectionTest.java:1404:94:1404:101 | source(...) : Object | LogInjectionTest.java:1404:80:1404:102 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1404:94:1404:101 | source(...) | user-provided value |
+| LogInjectionTest.java:1405:95:1405:111 | (...)... | LogInjectionTest.java:1405:104:1405:111 | source(...) : Object | LogInjectionTest.java:1405:95:1405:111 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1405:104:1405:111 | source(...) | user-provided value |
+| LogInjectionTest.java:1406:80:1406:96 | (...)... | LogInjectionTest.java:1406:89:1406:96 | source(...) : Object | LogInjectionTest.java:1406:80:1406:96 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1406:89:1406:96 | source(...) | user-provided value |
+| LogInjectionTest.java:1407:65:1407:81 | (...)... | LogInjectionTest.java:1407:74:1407:81 | source(...) : Object | LogInjectionTest.java:1407:65:1407:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1407:74:1407:81 | source(...) | user-provided value |
+| LogInjectionTest.java:1408:95:1408:111 | (...)... | LogInjectionTest.java:1408:104:1408:111 | source(...) : Object | LogInjectionTest.java:1408:95:1408:111 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1408:104:1408:111 | source(...) | user-provided value |
+| LogInjectionTest.java:1409:80:1409:96 | (...)... | LogInjectionTest.java:1409:89:1409:96 | source(...) : Object | LogInjectionTest.java:1409:80:1409:96 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1409:89:1409:96 | source(...) | user-provided value |
+| LogInjectionTest.java:1410:65:1410:81 | (...)... | LogInjectionTest.java:1410:74:1410:81 | source(...) : Object | LogInjectionTest.java:1410:65:1410:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1410:74:1410:81 | source(...) | user-provided value |
+| LogInjectionTest.java:1411:110:1411:126 | (...)... | LogInjectionTest.java:1411:119:1411:126 | source(...) : Object | LogInjectionTest.java:1411:110:1411:126 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1411:119:1411:126 | source(...) | user-provided value |
+| LogInjectionTest.java:1412:95:1412:111 | (...)... | LogInjectionTest.java:1412:104:1412:111 | source(...) : Object | LogInjectionTest.java:1412:95:1412:111 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1412:104:1412:111 | source(...) | user-provided value |
+| LogInjectionTest.java:1413:80:1413:96 | (...)... | LogInjectionTest.java:1413:89:1413:96 | source(...) : Object | LogInjectionTest.java:1413:80:1413:96 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1413:89:1413:96 | source(...) | user-provided value |
+| LogInjectionTest.java:1414:65:1414:81 | (...)... | LogInjectionTest.java:1414:74:1414:81 | source(...) : Object | LogInjectionTest.java:1414:65:1414:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1414:74:1414:81 | source(...) | user-provided value |
+| LogInjectionTest.java:1415:110:1415:126 | (...)... | LogInjectionTest.java:1415:119:1415:126 | source(...) : Object | LogInjectionTest.java:1415:110:1415:126 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1415:119:1415:126 | source(...) | user-provided value |
+| LogInjectionTest.java:1416:95:1416:111 | (...)... | LogInjectionTest.java:1416:104:1416:111 | source(...) : Object | LogInjectionTest.java:1416:95:1416:111 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1416:104:1416:111 | source(...) | user-provided value |
+| LogInjectionTest.java:1417:80:1417:96 | (...)... | LogInjectionTest.java:1417:89:1417:96 | source(...) : Object | LogInjectionTest.java:1417:80:1417:96 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1417:89:1417:96 | source(...) | user-provided value |
+| LogInjectionTest.java:1418:65:1418:81 | (...)... | LogInjectionTest.java:1418:74:1418:81 | source(...) : Object | LogInjectionTest.java:1418:65:1418:81 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1418:74:1418:81 | source(...) | user-provided value |
+| LogInjectionTest.java:1419:43:1419:59 | (...)... | LogInjectionTest.java:1419:52:1419:59 | source(...) : Object | LogInjectionTest.java:1419:43:1419:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1419:52:1419:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1420:28:1420:44 | (...)... | LogInjectionTest.java:1420:37:1420:44 | source(...) : Object | LogInjectionTest.java:1420:28:1420:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1420:37:1420:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1421:43:1421:59 | (...)... | LogInjectionTest.java:1421:52:1421:59 | source(...) : Object | LogInjectionTest.java:1421:43:1421:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1421:52:1421:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1422:28:1422:44 | (...)... | LogInjectionTest.java:1422:37:1422:44 | source(...) : Object | LogInjectionTest.java:1422:28:1422:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1422:37:1422:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1423:28:1423:44 | (...)... | LogInjectionTest.java:1423:37:1423:44 | source(...) : Object | LogInjectionTest.java:1423:28:1423:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1423:37:1423:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1424:28:1424:44 | (...)... | LogInjectionTest.java:1424:37:1424:44 | source(...) : Object | LogInjectionTest.java:1424:28:1424:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1424:37:1424:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1425:43:1425:65 | new Object[] | LogInjectionTest.java:1425:57:1425:64 | source(...) : Object | LogInjectionTest.java:1425:43:1425:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1425:57:1425:64 | source(...) | user-provided value |
+| LogInjectionTest.java:1426:43:1426:65 | new Object[] | LogInjectionTest.java:1426:57:1426:64 | source(...) : Object | LogInjectionTest.java:1426:43:1426:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1426:57:1426:64 | source(...) | user-provided value |
+| LogInjectionTest.java:1427:58:1427:74 | (...)... | LogInjectionTest.java:1427:67:1427:74 | source(...) : Object | LogInjectionTest.java:1427:58:1427:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1427:67:1427:74 | source(...) | user-provided value |
+| LogInjectionTest.java:1428:43:1428:59 | (...)... | LogInjectionTest.java:1428:52:1428:59 | source(...) : Object | LogInjectionTest.java:1428:43:1428:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1428:52:1428:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1429:28:1429:44 | (...)... | LogInjectionTest.java:1429:37:1429:44 | source(...) : Object | LogInjectionTest.java:1429:28:1429:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1429:37:1429:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1430:58:1430:74 | (...)... | LogInjectionTest.java:1430:67:1430:74 | source(...) : Object | LogInjectionTest.java:1430:58:1430:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1430:67:1430:74 | source(...) | user-provided value |
+| LogInjectionTest.java:1431:43:1431:59 | (...)... | LogInjectionTest.java:1431:52:1431:59 | source(...) : Object | LogInjectionTest.java:1431:43:1431:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1431:52:1431:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1432:28:1432:44 | (...)... | LogInjectionTest.java:1432:37:1432:44 | source(...) : Object | LogInjectionTest.java:1432:28:1432:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1432:37:1432:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1433:73:1433:89 | (...)... | LogInjectionTest.java:1433:82:1433:89 | source(...) : Object | LogInjectionTest.java:1433:73:1433:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1433:82:1433:89 | source(...) | user-provided value |
+| LogInjectionTest.java:1434:58:1434:74 | (...)... | LogInjectionTest.java:1434:67:1434:74 | source(...) : Object | LogInjectionTest.java:1434:58:1434:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1434:67:1434:74 | source(...) | user-provided value |
+| LogInjectionTest.java:1435:43:1435:59 | (...)... | LogInjectionTest.java:1435:52:1435:59 | source(...) : Object | LogInjectionTest.java:1435:43:1435:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1435:52:1435:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1436:28:1436:44 | (...)... | LogInjectionTest.java:1436:37:1436:44 | source(...) : Object | LogInjectionTest.java:1436:28:1436:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1436:37:1436:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1437:73:1437:89 | (...)... | LogInjectionTest.java:1437:82:1437:89 | source(...) : Object | LogInjectionTest.java:1437:73:1437:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1437:82:1437:89 | source(...) | user-provided value |
+| LogInjectionTest.java:1438:58:1438:74 | (...)... | LogInjectionTest.java:1438:67:1438:74 | source(...) : Object | LogInjectionTest.java:1438:58:1438:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1438:67:1438:74 | source(...) | user-provided value |
+| LogInjectionTest.java:1439:43:1439:59 | (...)... | LogInjectionTest.java:1439:52:1439:59 | source(...) : Object | LogInjectionTest.java:1439:43:1439:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1439:52:1439:59 | source(...) | user-provided value |
+| LogInjectionTest.java:1440:28:1440:44 | (...)... | LogInjectionTest.java:1440:37:1440:44 | source(...) : Object | LogInjectionTest.java:1440:28:1440:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1440:37:1440:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1441:42:1441:58 | (...)... | LogInjectionTest.java:1441:51:1441:58 | source(...) : Object | LogInjectionTest.java:1441:42:1441:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1441:51:1441:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1442:27:1442:43 | (...)... | LogInjectionTest.java:1442:36:1442:43 | source(...) : Object | LogInjectionTest.java:1442:27:1442:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1442:36:1442:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1443:42:1443:58 | (...)... | LogInjectionTest.java:1443:51:1443:58 | source(...) : Object | LogInjectionTest.java:1443:42:1443:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1443:51:1443:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1444:27:1444:43 | (...)... | LogInjectionTest.java:1444:36:1444:43 | source(...) : Object | LogInjectionTest.java:1444:27:1444:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1444:36:1444:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1445:27:1445:43 | (...)... | LogInjectionTest.java:1445:36:1445:43 | source(...) : Object | LogInjectionTest.java:1445:27:1445:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1445:36:1445:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1446:27:1446:43 | (...)... | LogInjectionTest.java:1446:36:1446:43 | source(...) : Object | LogInjectionTest.java:1446:27:1446:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1446:36:1446:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1447:42:1447:64 | new Object[] | LogInjectionTest.java:1447:56:1447:63 | source(...) : Object | LogInjectionTest.java:1447:42:1447:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1447:56:1447:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1448:42:1448:64 | new Object[] | LogInjectionTest.java:1448:56:1448:63 | source(...) : Object | LogInjectionTest.java:1448:42:1448:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1448:56:1448:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1449:57:1449:73 | (...)... | LogInjectionTest.java:1449:66:1449:73 | source(...) : Object | LogInjectionTest.java:1449:57:1449:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1449:66:1449:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1450:42:1450:58 | (...)... | LogInjectionTest.java:1450:51:1450:58 | source(...) : Object | LogInjectionTest.java:1450:42:1450:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1450:51:1450:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1451:27:1451:43 | (...)... | LogInjectionTest.java:1451:36:1451:43 | source(...) : Object | LogInjectionTest.java:1451:27:1451:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1451:36:1451:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1452:57:1452:73 | (...)... | LogInjectionTest.java:1452:66:1452:73 | source(...) : Object | LogInjectionTest.java:1452:57:1452:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1452:66:1452:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1453:42:1453:58 | (...)... | LogInjectionTest.java:1453:51:1453:58 | source(...) : Object | LogInjectionTest.java:1453:42:1453:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1453:51:1453:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1454:27:1454:43 | (...)... | LogInjectionTest.java:1454:36:1454:43 | source(...) : Object | LogInjectionTest.java:1454:27:1454:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1454:36:1454:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1455:72:1455:88 | (...)... | LogInjectionTest.java:1455:81:1455:88 | source(...) : Object | LogInjectionTest.java:1455:72:1455:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1455:81:1455:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1456:57:1456:73 | (...)... | LogInjectionTest.java:1456:66:1456:73 | source(...) : Object | LogInjectionTest.java:1456:57:1456:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1456:66:1456:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1457:42:1457:58 | (...)... | LogInjectionTest.java:1457:51:1457:58 | source(...) : Object | LogInjectionTest.java:1457:42:1457:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1457:51:1457:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1458:27:1458:43 | (...)... | LogInjectionTest.java:1458:36:1458:43 | source(...) : Object | LogInjectionTest.java:1458:27:1458:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1458:36:1458:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1459:72:1459:88 | (...)... | LogInjectionTest.java:1459:81:1459:88 | source(...) : Object | LogInjectionTest.java:1459:72:1459:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1459:81:1459:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1460:57:1460:73 | (...)... | LogInjectionTest.java:1460:66:1460:73 | source(...) : Object | LogInjectionTest.java:1460:57:1460:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1460:66:1460:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1461:42:1461:58 | (...)... | LogInjectionTest.java:1461:51:1461:58 | source(...) : Object | LogInjectionTest.java:1461:42:1461:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1461:51:1461:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1462:27:1462:43 | (...)... | LogInjectionTest.java:1462:36:1462:43 | source(...) : Object | LogInjectionTest.java:1462:27:1462:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1462:36:1462:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1468:26:1468:33 | source(...) | LogInjectionTest.java:1468:26:1468:33 | source(...) | LogInjectionTest.java:1468:26:1468:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1468:26:1468:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1469:26:1469:33 | source(...) | LogInjectionTest.java:1469:26:1469:33 | source(...) | LogInjectionTest.java:1469:26:1469:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1469:26:1469:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1473:41:1473:48 | source(...) | LogInjectionTest.java:1473:41:1473:48 | source(...) | LogInjectionTest.java:1473:41:1473:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1473:41:1473:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1474:56:1474:78 | new Object[] | LogInjectionTest.java:1474:70:1474:77 | source(...) : Object | LogInjectionTest.java:1474:56:1474:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1474:70:1474:77 | source(...) | user-provided value |
+| LogInjectionTest.java:1475:41:1475:48 | source(...) | LogInjectionTest.java:1475:41:1475:48 | source(...) | LogInjectionTest.java:1475:41:1475:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1475:41:1475:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1476:26:1476:33 | source(...) | LogInjectionTest.java:1476:26:1476:33 | source(...) | LogInjectionTest.java:1476:26:1476:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1476:26:1476:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1477:26:1477:33 | source(...) | LogInjectionTest.java:1477:26:1477:33 | source(...) | LogInjectionTest.java:1477:26:1477:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1477:26:1477:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1481:41:1481:48 | source(...) | LogInjectionTest.java:1481:41:1481:48 | source(...) | LogInjectionTest.java:1481:41:1481:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1481:41:1481:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1482:56:1482:78 | new Object[] | LogInjectionTest.java:1482:70:1482:77 | source(...) : Object | LogInjectionTest.java:1482:56:1482:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1482:70:1482:77 | source(...) | user-provided value |
+| LogInjectionTest.java:1483:41:1483:48 | source(...) | LogInjectionTest.java:1483:41:1483:48 | source(...) | LogInjectionTest.java:1483:41:1483:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1483:41:1483:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1484:26:1484:33 | source(...) | LogInjectionTest.java:1484:26:1484:33 | source(...) | LogInjectionTest.java:1484:26:1484:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1484:26:1484:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1485:26:1485:33 | source(...) | LogInjectionTest.java:1485:26:1485:33 | source(...) | LogInjectionTest.java:1485:26:1485:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1485:26:1485:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1489:41:1489:48 | source(...) | LogInjectionTest.java:1489:41:1489:48 | source(...) | LogInjectionTest.java:1489:41:1489:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1489:41:1489:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1490:56:1490:78 | new Object[] | LogInjectionTest.java:1490:70:1490:77 | source(...) : Object | LogInjectionTest.java:1490:56:1490:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1490:70:1490:77 | source(...) | user-provided value |
+| LogInjectionTest.java:1491:41:1491:48 | source(...) | LogInjectionTest.java:1491:41:1491:48 | source(...) | LogInjectionTest.java:1491:41:1491:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1491:41:1491:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1492:25:1492:32 | source(...) | LogInjectionTest.java:1492:25:1492:32 | source(...) | LogInjectionTest.java:1492:25:1492:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1492:25:1492:32 | source(...) | user-provided value |
+| LogInjectionTest.java:1493:25:1493:32 | source(...) | LogInjectionTest.java:1493:25:1493:32 | source(...) | LogInjectionTest.java:1493:25:1493:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1493:25:1493:32 | source(...) | user-provided value |
+| LogInjectionTest.java:1497:40:1497:47 | source(...) | LogInjectionTest.java:1497:40:1497:47 | source(...) | LogInjectionTest.java:1497:40:1497:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1497:40:1497:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1498:55:1498:77 | new Object[] | LogInjectionTest.java:1498:69:1498:76 | source(...) : Object | LogInjectionTest.java:1498:55:1498:77 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1498:69:1498:76 | source(...) | user-provided value |
+| LogInjectionTest.java:1499:40:1499:47 | source(...) | LogInjectionTest.java:1499:40:1499:47 | source(...) | LogInjectionTest.java:1499:40:1499:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1499:40:1499:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1500:26:1500:33 | source(...) | LogInjectionTest.java:1500:26:1500:33 | source(...) | LogInjectionTest.java:1500:26:1500:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1500:26:1500:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1501:26:1501:33 | source(...) | LogInjectionTest.java:1501:26:1501:33 | source(...) | LogInjectionTest.java:1501:26:1501:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1501:26:1501:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1505:41:1505:48 | source(...) | LogInjectionTest.java:1505:41:1505:48 | source(...) | LogInjectionTest.java:1505:41:1505:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1505:41:1505:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1506:56:1506:78 | new Object[] | LogInjectionTest.java:1506:70:1506:77 | source(...) : Object | LogInjectionTest.java:1506:56:1506:78 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1506:70:1506:77 | source(...) | user-provided value |
+| LogInjectionTest.java:1507:41:1507:48 | source(...) | LogInjectionTest.java:1507:41:1507:48 | source(...) | LogInjectionTest.java:1507:41:1507:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1507:41:1507:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1508:25:1508:32 | source(...) | LogInjectionTest.java:1508:25:1508:32 | source(...) | LogInjectionTest.java:1508:25:1508:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1508:25:1508:32 | source(...) | user-provided value |
+| LogInjectionTest.java:1509:25:1509:32 | source(...) | LogInjectionTest.java:1509:25:1509:32 | source(...) | LogInjectionTest.java:1509:25:1509:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1509:25:1509:32 | source(...) | user-provided value |
+| LogInjectionTest.java:1513:40:1513:47 | source(...) | LogInjectionTest.java:1513:40:1513:47 | source(...) | LogInjectionTest.java:1513:40:1513:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1513:40:1513:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1514:55:1514:77 | new Object[] | LogInjectionTest.java:1514:69:1514:76 | source(...) : Object | LogInjectionTest.java:1514:55:1514:77 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1514:69:1514:76 | source(...) | user-provided value |
+| LogInjectionTest.java:1515:40:1515:47 | source(...) | LogInjectionTest.java:1515:40:1515:47 | source(...) | LogInjectionTest.java:1515:40:1515:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1515:40:1515:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1516:63:1516:70 | source(...) | LogInjectionTest.java:1516:63:1516:70 | source(...) | LogInjectionTest.java:1516:63:1516:70 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1516:63:1516:70 | source(...) | user-provided value |
+| LogInjectionTest.java:1517:63:1517:70 | source(...) | LogInjectionTest.java:1517:63:1517:70 | source(...) | LogInjectionTest.java:1517:63:1517:70 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1517:63:1517:70 | source(...) | user-provided value |
+| LogInjectionTest.java:1521:78:1521:85 | source(...) | LogInjectionTest.java:1521:78:1521:85 | source(...) | LogInjectionTest.java:1521:78:1521:85 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1521:78:1521:85 | source(...) | user-provided value |
+| LogInjectionTest.java:1522:78:1522:85 | source(...) | LogInjectionTest.java:1522:78:1522:85 | source(...) | LogInjectionTest.java:1522:78:1522:85 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1522:78:1522:85 | source(...) | user-provided value |
+| LogInjectionTest.java:1523:93:1523:115 | new Object[] | LogInjectionTest.java:1523:107:1523:114 | source(...) : Object | LogInjectionTest.java:1523:93:1523:115 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1523:107:1523:114 | source(...) | user-provided value |
+| LogInjectionTest.java:1524:42:1524:58 | (...)... | LogInjectionTest.java:1524:51:1524:58 | source(...) : Object | LogInjectionTest.java:1524:42:1524:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1524:51:1524:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1525:27:1525:43 | (...)... | LogInjectionTest.java:1525:36:1525:43 | source(...) : Object | LogInjectionTest.java:1525:27:1525:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1525:36:1525:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1526:42:1526:58 | (...)... | LogInjectionTest.java:1526:51:1526:58 | source(...) : Object | LogInjectionTest.java:1526:42:1526:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1526:51:1526:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1527:27:1527:43 | (...)... | LogInjectionTest.java:1527:36:1527:43 | source(...) : Object | LogInjectionTest.java:1527:27:1527:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1527:36:1527:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1528:27:1528:43 | (...)... | LogInjectionTest.java:1528:36:1528:43 | source(...) : Object | LogInjectionTest.java:1528:27:1528:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1528:36:1528:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1529:27:1529:43 | (...)... | LogInjectionTest.java:1529:36:1529:43 | source(...) : Object | LogInjectionTest.java:1529:27:1529:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1529:36:1529:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1530:42:1530:64 | new Object[] | LogInjectionTest.java:1530:56:1530:63 | source(...) : Object | LogInjectionTest.java:1530:42:1530:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1530:56:1530:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1531:42:1531:64 | new Object[] | LogInjectionTest.java:1531:56:1531:63 | source(...) : Object | LogInjectionTest.java:1531:42:1531:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1531:56:1531:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1532:57:1532:73 | (...)... | LogInjectionTest.java:1532:66:1532:73 | source(...) : Object | LogInjectionTest.java:1532:57:1532:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1532:66:1532:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1533:42:1533:58 | (...)... | LogInjectionTest.java:1533:51:1533:58 | source(...) : Object | LogInjectionTest.java:1533:42:1533:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1533:51:1533:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1534:27:1534:43 | (...)... | LogInjectionTest.java:1534:36:1534:43 | source(...) : Object | LogInjectionTest.java:1534:27:1534:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1534:36:1534:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1535:57:1535:73 | (...)... | LogInjectionTest.java:1535:66:1535:73 | source(...) : Object | LogInjectionTest.java:1535:57:1535:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1535:66:1535:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1536:42:1536:58 | (...)... | LogInjectionTest.java:1536:51:1536:58 | source(...) : Object | LogInjectionTest.java:1536:42:1536:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1536:51:1536:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1537:27:1537:43 | (...)... | LogInjectionTest.java:1537:36:1537:43 | source(...) : Object | LogInjectionTest.java:1537:27:1537:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1537:36:1537:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1538:72:1538:88 | (...)... | LogInjectionTest.java:1538:81:1538:88 | source(...) : Object | LogInjectionTest.java:1538:72:1538:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1538:81:1538:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1539:57:1539:73 | (...)... | LogInjectionTest.java:1539:66:1539:73 | source(...) : Object | LogInjectionTest.java:1539:57:1539:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1539:66:1539:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1540:42:1540:58 | (...)... | LogInjectionTest.java:1540:51:1540:58 | source(...) : Object | LogInjectionTest.java:1540:42:1540:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1540:51:1540:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1541:27:1541:43 | (...)... | LogInjectionTest.java:1541:36:1541:43 | source(...) : Object | LogInjectionTest.java:1541:27:1541:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1541:36:1541:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1542:72:1542:88 | (...)... | LogInjectionTest.java:1542:81:1542:88 | source(...) : Object | LogInjectionTest.java:1542:72:1542:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1542:81:1542:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1543:57:1543:73 | (...)... | LogInjectionTest.java:1543:66:1543:73 | source(...) : Object | LogInjectionTest.java:1543:57:1543:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1543:66:1543:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1544:42:1544:58 | (...)... | LogInjectionTest.java:1544:51:1544:58 | source(...) : Object | LogInjectionTest.java:1544:42:1544:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1544:51:1544:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1545:27:1545:43 | (...)... | LogInjectionTest.java:1545:36:1545:43 | source(...) : Object | LogInjectionTest.java:1545:27:1545:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1545:36:1545:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1546:42:1546:58 | (...)... | LogInjectionTest.java:1546:51:1546:58 | source(...) : Object | LogInjectionTest.java:1546:42:1546:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1546:51:1546:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1547:27:1547:43 | (...)... | LogInjectionTest.java:1547:36:1547:43 | source(...) : Object | LogInjectionTest.java:1547:27:1547:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1547:36:1547:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1548:42:1548:58 | (...)... | LogInjectionTest.java:1548:51:1548:58 | source(...) : Object | LogInjectionTest.java:1548:42:1548:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1548:51:1548:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1549:27:1549:43 | (...)... | LogInjectionTest.java:1549:36:1549:43 | source(...) : Object | LogInjectionTest.java:1549:27:1549:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1549:36:1549:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1550:27:1550:43 | (...)... | LogInjectionTest.java:1550:36:1550:43 | source(...) : Object | LogInjectionTest.java:1550:27:1550:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1550:36:1550:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1551:27:1551:43 | (...)... | LogInjectionTest.java:1551:36:1551:43 | source(...) : Object | LogInjectionTest.java:1551:27:1551:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1551:36:1551:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1552:42:1552:64 | new Object[] | LogInjectionTest.java:1552:56:1552:63 | source(...) : Object | LogInjectionTest.java:1552:42:1552:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1552:56:1552:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1553:42:1553:64 | new Object[] | LogInjectionTest.java:1553:56:1553:63 | source(...) : Object | LogInjectionTest.java:1553:42:1553:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1553:56:1553:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1554:57:1554:73 | (...)... | LogInjectionTest.java:1554:66:1554:73 | source(...) : Object | LogInjectionTest.java:1554:57:1554:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1554:66:1554:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1555:42:1555:58 | (...)... | LogInjectionTest.java:1555:51:1555:58 | source(...) : Object | LogInjectionTest.java:1555:42:1555:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1555:51:1555:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1556:27:1556:43 | (...)... | LogInjectionTest.java:1556:36:1556:43 | source(...) : Object | LogInjectionTest.java:1556:27:1556:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1556:36:1556:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1557:57:1557:73 | (...)... | LogInjectionTest.java:1557:66:1557:73 | source(...) : Object | LogInjectionTest.java:1557:57:1557:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1557:66:1557:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1558:42:1558:58 | (...)... | LogInjectionTest.java:1558:51:1558:58 | source(...) : Object | LogInjectionTest.java:1558:42:1558:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1558:51:1558:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1559:27:1559:43 | (...)... | LogInjectionTest.java:1559:36:1559:43 | source(...) : Object | LogInjectionTest.java:1559:27:1559:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1559:36:1559:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1560:72:1560:88 | (...)... | LogInjectionTest.java:1560:81:1560:88 | source(...) : Object | LogInjectionTest.java:1560:72:1560:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1560:81:1560:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1561:57:1561:73 | (...)... | LogInjectionTest.java:1561:66:1561:73 | source(...) : Object | LogInjectionTest.java:1561:57:1561:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1561:66:1561:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1562:42:1562:58 | (...)... | LogInjectionTest.java:1562:51:1562:58 | source(...) : Object | LogInjectionTest.java:1562:42:1562:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1562:51:1562:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1563:27:1563:43 | (...)... | LogInjectionTest.java:1563:36:1563:43 | source(...) : Object | LogInjectionTest.java:1563:27:1563:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1563:36:1563:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1564:72:1564:88 | (...)... | LogInjectionTest.java:1564:81:1564:88 | source(...) : Object | LogInjectionTest.java:1564:72:1564:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1564:81:1564:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1565:57:1565:73 | (...)... | LogInjectionTest.java:1565:66:1565:73 | source(...) : Object | LogInjectionTest.java:1565:57:1565:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1565:66:1565:73 | source(...) | user-provided value |
 | LogInjectionTest.java:1566:42:1566:58 | (...)... | LogInjectionTest.java:1566:51:1566:58 | source(...) : Object | LogInjectionTest.java:1566:42:1566:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1566:51:1566:58 | source(...) | user-provided value |
 | LogInjectionTest.java:1567:27:1567:43 | (...)... | LogInjectionTest.java:1567:36:1567:43 | source(...) : Object | LogInjectionTest.java:1567:27:1567:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1567:36:1567:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1568:27:1568:43 | (...)... | LogInjectionTest.java:1568:36:1568:43 | source(...) : Object | LogInjectionTest.java:1568:27:1568:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1568:36:1568:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1568:42:1568:58 | (...)... | LogInjectionTest.java:1568:51:1568:58 | source(...) : Object | LogInjectionTest.java:1568:42:1568:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1568:51:1568:58 | source(...) | user-provided value |
 | LogInjectionTest.java:1569:27:1569:43 | (...)... | LogInjectionTest.java:1569:36:1569:43 | source(...) : Object | LogInjectionTest.java:1569:27:1569:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1569:36:1569:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1570:42:1570:64 | new Object[] | LogInjectionTest.java:1570:56:1570:63 | source(...) : Object | LogInjectionTest.java:1570:42:1570:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1570:56:1570:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1571:42:1571:64 | new Object[] | LogInjectionTest.java:1571:56:1571:63 | source(...) : Object | LogInjectionTest.java:1571:42:1571:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1571:56:1571:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1572:57:1572:73 | (...)... | LogInjectionTest.java:1572:66:1572:73 | source(...) : Object | LogInjectionTest.java:1572:57:1572:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1572:66:1572:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1573:42:1573:58 | (...)... | LogInjectionTest.java:1573:51:1573:58 | source(...) : Object | LogInjectionTest.java:1573:42:1573:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1573:51:1573:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1574:27:1574:43 | (...)... | LogInjectionTest.java:1574:36:1574:43 | source(...) : Object | LogInjectionTest.java:1574:27:1574:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1574:36:1574:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1575:57:1575:73 | (...)... | LogInjectionTest.java:1575:66:1575:73 | source(...) : Object | LogInjectionTest.java:1575:57:1575:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1575:66:1575:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1576:42:1576:58 | (...)... | LogInjectionTest.java:1576:51:1576:58 | source(...) : Object | LogInjectionTest.java:1576:42:1576:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1576:51:1576:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1577:27:1577:43 | (...)... | LogInjectionTest.java:1577:36:1577:43 | source(...) : Object | LogInjectionTest.java:1577:27:1577:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1577:36:1577:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1578:72:1578:88 | (...)... | LogInjectionTest.java:1578:81:1578:88 | source(...) : Object | LogInjectionTest.java:1578:72:1578:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1578:81:1578:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1570:42:1570:58 | (...)... | LogInjectionTest.java:1570:51:1570:58 | source(...) : Object | LogInjectionTest.java:1570:42:1570:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1570:51:1570:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1571:27:1571:43 | (...)... | LogInjectionTest.java:1571:36:1571:43 | source(...) : Object | LogInjectionTest.java:1571:27:1571:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1571:36:1571:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1572:27:1572:43 | (...)... | LogInjectionTest.java:1572:36:1572:43 | source(...) : Object | LogInjectionTest.java:1572:27:1572:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1572:36:1572:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1573:27:1573:43 | (...)... | LogInjectionTest.java:1573:36:1573:43 | source(...) : Object | LogInjectionTest.java:1573:27:1573:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1573:36:1573:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1574:42:1574:64 | new Object[] | LogInjectionTest.java:1574:56:1574:63 | source(...) : Object | LogInjectionTest.java:1574:42:1574:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1574:56:1574:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1575:42:1575:64 | new Object[] | LogInjectionTest.java:1575:56:1575:63 | source(...) : Object | LogInjectionTest.java:1575:42:1575:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1575:56:1575:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1576:57:1576:73 | (...)... | LogInjectionTest.java:1576:66:1576:73 | source(...) : Object | LogInjectionTest.java:1576:57:1576:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1576:66:1576:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1577:42:1577:58 | (...)... | LogInjectionTest.java:1577:51:1577:58 | source(...) : Object | LogInjectionTest.java:1577:42:1577:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1577:51:1577:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1578:27:1578:43 | (...)... | LogInjectionTest.java:1578:36:1578:43 | source(...) : Object | LogInjectionTest.java:1578:27:1578:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1578:36:1578:43 | source(...) | user-provided value |
 | LogInjectionTest.java:1579:57:1579:73 | (...)... | LogInjectionTest.java:1579:66:1579:73 | source(...) : Object | LogInjectionTest.java:1579:57:1579:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1579:66:1579:73 | source(...) | user-provided value |
 | LogInjectionTest.java:1580:42:1580:58 | (...)... | LogInjectionTest.java:1580:51:1580:58 | source(...) : Object | LogInjectionTest.java:1580:42:1580:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1580:51:1580:58 | source(...) | user-provided value |
 | LogInjectionTest.java:1581:27:1581:43 | (...)... | LogInjectionTest.java:1581:36:1581:43 | source(...) : Object | LogInjectionTest.java:1581:27:1581:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1581:36:1581:43 | source(...) | user-provided value |
@@ -1363,382 +1405,382 @@
 | LogInjectionTest.java:1583:57:1583:73 | (...)... | LogInjectionTest.java:1583:66:1583:73 | source(...) : Object | LogInjectionTest.java:1583:57:1583:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1583:66:1583:73 | source(...) | user-provided value |
 | LogInjectionTest.java:1584:42:1584:58 | (...)... | LogInjectionTest.java:1584:51:1584:58 | source(...) : Object | LogInjectionTest.java:1584:42:1584:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1584:51:1584:58 | source(...) | user-provided value |
 | LogInjectionTest.java:1585:27:1585:43 | (...)... | LogInjectionTest.java:1585:36:1585:43 | source(...) : Object | LogInjectionTest.java:1585:27:1585:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1585:36:1585:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1586:42:1586:58 | (...)... | LogInjectionTest.java:1586:51:1586:58 | source(...) : Object | LogInjectionTest.java:1586:42:1586:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1586:51:1586:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1587:27:1587:43 | (...)... | LogInjectionTest.java:1587:36:1587:43 | source(...) : Object | LogInjectionTest.java:1587:27:1587:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1587:36:1587:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1586:72:1586:88 | (...)... | LogInjectionTest.java:1586:81:1586:88 | source(...) : Object | LogInjectionTest.java:1586:72:1586:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1586:81:1586:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1587:57:1587:73 | (...)... | LogInjectionTest.java:1587:66:1587:73 | source(...) : Object | LogInjectionTest.java:1587:57:1587:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1587:66:1587:73 | source(...) | user-provided value |
 | LogInjectionTest.java:1588:42:1588:58 | (...)... | LogInjectionTest.java:1588:51:1588:58 | source(...) : Object | LogInjectionTest.java:1588:42:1588:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1588:51:1588:58 | source(...) | user-provided value |
 | LogInjectionTest.java:1589:27:1589:43 | (...)... | LogInjectionTest.java:1589:36:1589:43 | source(...) : Object | LogInjectionTest.java:1589:27:1589:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1589:36:1589:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1590:27:1590:43 | (...)... | LogInjectionTest.java:1590:36:1590:43 | source(...) : Object | LogInjectionTest.java:1590:27:1590:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1590:36:1590:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1591:27:1591:43 | (...)... | LogInjectionTest.java:1591:36:1591:43 | source(...) : Object | LogInjectionTest.java:1591:27:1591:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1591:36:1591:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1592:42:1592:64 | new Object[] | LogInjectionTest.java:1592:56:1592:63 | source(...) : Object | LogInjectionTest.java:1592:42:1592:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1592:56:1592:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1593:42:1593:64 | new Object[] | LogInjectionTest.java:1593:56:1593:63 | source(...) : Object | LogInjectionTest.java:1593:42:1593:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1593:56:1593:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1594:57:1594:73 | (...)... | LogInjectionTest.java:1594:66:1594:73 | source(...) : Object | LogInjectionTest.java:1594:57:1594:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1594:66:1594:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1595:42:1595:58 | (...)... | LogInjectionTest.java:1595:51:1595:58 | source(...) : Object | LogInjectionTest.java:1595:42:1595:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1595:51:1595:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1596:27:1596:43 | (...)... | LogInjectionTest.java:1596:36:1596:43 | source(...) : Object | LogInjectionTest.java:1596:27:1596:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1596:36:1596:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1597:57:1597:73 | (...)... | LogInjectionTest.java:1597:66:1597:73 | source(...) : Object | LogInjectionTest.java:1597:57:1597:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1597:66:1597:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1598:42:1598:58 | (...)... | LogInjectionTest.java:1598:51:1598:58 | source(...) : Object | LogInjectionTest.java:1598:42:1598:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1598:51:1598:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1599:27:1599:43 | (...)... | LogInjectionTest.java:1599:36:1599:43 | source(...) : Object | LogInjectionTest.java:1599:27:1599:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1599:36:1599:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1600:72:1600:88 | (...)... | LogInjectionTest.java:1600:81:1600:88 | source(...) : Object | LogInjectionTest.java:1600:72:1600:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1600:81:1600:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1601:57:1601:73 | (...)... | LogInjectionTest.java:1601:66:1601:73 | source(...) : Object | LogInjectionTest.java:1601:57:1601:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1601:66:1601:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1602:42:1602:58 | (...)... | LogInjectionTest.java:1602:51:1602:58 | source(...) : Object | LogInjectionTest.java:1602:42:1602:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1602:51:1602:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1603:27:1603:43 | (...)... | LogInjectionTest.java:1603:36:1603:43 | source(...) : Object | LogInjectionTest.java:1603:27:1603:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1603:36:1603:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1604:72:1604:88 | (...)... | LogInjectionTest.java:1604:81:1604:88 | source(...) : Object | LogInjectionTest.java:1604:72:1604:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1604:81:1604:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1605:57:1605:73 | (...)... | LogInjectionTest.java:1605:66:1605:73 | source(...) : Object | LogInjectionTest.java:1605:57:1605:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1605:66:1605:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1606:42:1606:58 | (...)... | LogInjectionTest.java:1606:51:1606:58 | source(...) : Object | LogInjectionTest.java:1606:42:1606:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1606:51:1606:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1607:27:1607:43 | (...)... | LogInjectionTest.java:1607:36:1607:43 | source(...) : Object | LogInjectionTest.java:1607:27:1607:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1607:36:1607:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1608:42:1608:58 | (...)... | LogInjectionTest.java:1608:51:1608:58 | source(...) : Object | LogInjectionTest.java:1608:42:1608:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1608:51:1608:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1609:27:1609:43 | (...)... | LogInjectionTest.java:1609:36:1609:43 | source(...) : Object | LogInjectionTest.java:1609:27:1609:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1609:36:1609:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1610:42:1610:58 | (...)... | LogInjectionTest.java:1610:51:1610:58 | source(...) : Object | LogInjectionTest.java:1610:42:1610:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1610:51:1610:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1611:27:1611:43 | (...)... | LogInjectionTest.java:1611:36:1611:43 | source(...) : Object | LogInjectionTest.java:1611:27:1611:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1611:36:1611:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1612:27:1612:43 | (...)... | LogInjectionTest.java:1612:36:1612:43 | source(...) : Object | LogInjectionTest.java:1612:27:1612:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1612:36:1612:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1613:27:1613:43 | (...)... | LogInjectionTest.java:1613:36:1613:43 | source(...) : Object | LogInjectionTest.java:1613:27:1613:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1613:36:1613:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1614:42:1614:64 | new Object[] | LogInjectionTest.java:1614:56:1614:63 | source(...) : Object | LogInjectionTest.java:1614:42:1614:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1614:56:1614:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1615:42:1615:64 | new Object[] | LogInjectionTest.java:1615:56:1615:63 | source(...) : Object | LogInjectionTest.java:1615:42:1615:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1615:56:1615:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1616:57:1616:73 | (...)... | LogInjectionTest.java:1616:66:1616:73 | source(...) : Object | LogInjectionTest.java:1616:57:1616:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1616:66:1616:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1617:42:1617:58 | (...)... | LogInjectionTest.java:1617:51:1617:58 | source(...) : Object | LogInjectionTest.java:1617:42:1617:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1617:51:1617:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1618:27:1618:43 | (...)... | LogInjectionTest.java:1618:36:1618:43 | source(...) : Object | LogInjectionTest.java:1618:27:1618:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1618:36:1618:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1619:57:1619:73 | (...)... | LogInjectionTest.java:1619:66:1619:73 | source(...) : Object | LogInjectionTest.java:1619:57:1619:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1619:66:1619:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1620:42:1620:58 | (...)... | LogInjectionTest.java:1620:51:1620:58 | source(...) : Object | LogInjectionTest.java:1620:42:1620:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1620:51:1620:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1621:27:1621:43 | (...)... | LogInjectionTest.java:1621:36:1621:43 | source(...) : Object | LogInjectionTest.java:1621:27:1621:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1621:36:1621:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1622:72:1622:88 | (...)... | LogInjectionTest.java:1622:81:1622:88 | source(...) : Object | LogInjectionTest.java:1622:72:1622:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1622:81:1622:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1623:57:1623:73 | (...)... | LogInjectionTest.java:1623:66:1623:73 | source(...) : Object | LogInjectionTest.java:1623:57:1623:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1623:66:1623:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1624:42:1624:58 | (...)... | LogInjectionTest.java:1624:51:1624:58 | source(...) : Object | LogInjectionTest.java:1624:42:1624:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1624:51:1624:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1625:27:1625:43 | (...)... | LogInjectionTest.java:1625:36:1625:43 | source(...) : Object | LogInjectionTest.java:1625:27:1625:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1625:36:1625:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1626:72:1626:88 | (...)... | LogInjectionTest.java:1626:81:1626:88 | source(...) : Object | LogInjectionTest.java:1626:72:1626:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1626:81:1626:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1627:57:1627:73 | (...)... | LogInjectionTest.java:1627:66:1627:73 | source(...) : Object | LogInjectionTest.java:1627:57:1627:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1627:66:1627:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1628:42:1628:58 | (...)... | LogInjectionTest.java:1628:51:1628:58 | source(...) : Object | LogInjectionTest.java:1628:42:1628:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1628:51:1628:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1629:27:1629:43 | (...)... | LogInjectionTest.java:1629:36:1629:43 | source(...) : Object | LogInjectionTest.java:1629:27:1629:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1629:36:1629:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1630:41:1630:57 | (...)... | LogInjectionTest.java:1630:50:1630:57 | source(...) : Object | LogInjectionTest.java:1630:41:1630:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1630:50:1630:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1631:26:1631:42 | (...)... | LogInjectionTest.java:1631:35:1631:42 | source(...) : Object | LogInjectionTest.java:1631:26:1631:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1631:35:1631:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1632:41:1632:57 | (...)... | LogInjectionTest.java:1632:50:1632:57 | source(...) : Object | LogInjectionTest.java:1632:41:1632:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1632:50:1632:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1633:26:1633:42 | (...)... | LogInjectionTest.java:1633:35:1633:42 | source(...) : Object | LogInjectionTest.java:1633:26:1633:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1633:35:1633:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1634:26:1634:42 | (...)... | LogInjectionTest.java:1634:35:1634:42 | source(...) : Object | LogInjectionTest.java:1634:26:1634:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1634:35:1634:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1635:26:1635:42 | (...)... | LogInjectionTest.java:1635:35:1635:42 | source(...) : Object | LogInjectionTest.java:1635:26:1635:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1635:35:1635:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1636:41:1636:63 | new Object[] | LogInjectionTest.java:1636:55:1636:62 | source(...) : Object | LogInjectionTest.java:1636:41:1636:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1636:55:1636:62 | source(...) | user-provided value |
-| LogInjectionTest.java:1637:41:1637:63 | new Object[] | LogInjectionTest.java:1637:55:1637:62 | source(...) : Object | LogInjectionTest.java:1637:41:1637:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1637:55:1637:62 | source(...) | user-provided value |
-| LogInjectionTest.java:1638:56:1638:72 | (...)... | LogInjectionTest.java:1638:65:1638:72 | source(...) : Object | LogInjectionTest.java:1638:56:1638:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1638:65:1638:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1639:41:1639:57 | (...)... | LogInjectionTest.java:1639:50:1639:57 | source(...) : Object | LogInjectionTest.java:1639:41:1639:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1639:50:1639:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1640:26:1640:42 | (...)... | LogInjectionTest.java:1640:35:1640:42 | source(...) : Object | LogInjectionTest.java:1640:26:1640:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1640:35:1640:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1641:56:1641:72 | (...)... | LogInjectionTest.java:1641:65:1641:72 | source(...) : Object | LogInjectionTest.java:1641:56:1641:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1641:65:1641:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1642:41:1642:57 | (...)... | LogInjectionTest.java:1642:50:1642:57 | source(...) : Object | LogInjectionTest.java:1642:41:1642:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1642:50:1642:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1643:26:1643:42 | (...)... | LogInjectionTest.java:1643:35:1643:42 | source(...) : Object | LogInjectionTest.java:1643:26:1643:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1643:35:1643:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1644:71:1644:87 | (...)... | LogInjectionTest.java:1644:80:1644:87 | source(...) : Object | LogInjectionTest.java:1644:71:1644:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1644:80:1644:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1645:56:1645:72 | (...)... | LogInjectionTest.java:1645:65:1645:72 | source(...) : Object | LogInjectionTest.java:1645:56:1645:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1645:65:1645:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1646:41:1646:57 | (...)... | LogInjectionTest.java:1646:50:1646:57 | source(...) : Object | LogInjectionTest.java:1646:41:1646:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1646:50:1646:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1647:26:1647:42 | (...)... | LogInjectionTest.java:1647:35:1647:42 | source(...) : Object | LogInjectionTest.java:1647:26:1647:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1647:35:1647:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1648:71:1648:87 | (...)... | LogInjectionTest.java:1648:80:1648:87 | source(...) : Object | LogInjectionTest.java:1648:71:1648:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1648:80:1648:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1649:56:1649:72 | (...)... | LogInjectionTest.java:1649:65:1649:72 | source(...) : Object | LogInjectionTest.java:1649:56:1649:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1649:65:1649:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1650:41:1650:57 | (...)... | LogInjectionTest.java:1650:50:1650:57 | source(...) : Object | LogInjectionTest.java:1650:41:1650:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1650:50:1650:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1651:26:1651:42 | (...)... | LogInjectionTest.java:1651:35:1651:42 | source(...) : Object | LogInjectionTest.java:1651:26:1651:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1651:35:1651:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1652:79:1652:95 | (...)... | LogInjectionTest.java:1652:88:1652:95 | source(...) : Object | LogInjectionTest.java:1652:79:1652:95 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1652:88:1652:95 | source(...) | user-provided value |
-| LogInjectionTest.java:1653:64:1653:80 | (...)... | LogInjectionTest.java:1653:73:1653:80 | source(...) : Object | LogInjectionTest.java:1653:64:1653:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1653:73:1653:80 | source(...) | user-provided value |
-| LogInjectionTest.java:1654:79:1654:95 | (...)... | LogInjectionTest.java:1654:88:1654:95 | source(...) : Object | LogInjectionTest.java:1654:79:1654:95 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1654:88:1654:95 | source(...) | user-provided value |
-| LogInjectionTest.java:1655:64:1655:80 | (...)... | LogInjectionTest.java:1655:73:1655:80 | source(...) : Object | LogInjectionTest.java:1655:64:1655:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1655:73:1655:80 | source(...) | user-provided value |
-| LogInjectionTest.java:1656:64:1656:80 | (...)... | LogInjectionTest.java:1656:73:1656:80 | source(...) : Object | LogInjectionTest.java:1656:64:1656:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1656:73:1656:80 | source(...) | user-provided value |
-| LogInjectionTest.java:1657:64:1657:80 | (...)... | LogInjectionTest.java:1657:73:1657:80 | source(...) : Object | LogInjectionTest.java:1657:64:1657:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1657:73:1657:80 | source(...) | user-provided value |
-| LogInjectionTest.java:1658:79:1658:101 | new Object[] | LogInjectionTest.java:1658:93:1658:100 | source(...) : Object | LogInjectionTest.java:1658:79:1658:101 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1658:93:1658:100 | source(...) | user-provided value |
-| LogInjectionTest.java:1659:79:1659:101 | new Object[] | LogInjectionTest.java:1659:93:1659:100 | source(...) : Object | LogInjectionTest.java:1659:79:1659:101 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1659:93:1659:100 | source(...) | user-provided value |
-| LogInjectionTest.java:1660:94:1660:110 | (...)... | LogInjectionTest.java:1660:103:1660:110 | source(...) : Object | LogInjectionTest.java:1660:94:1660:110 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1660:103:1660:110 | source(...) | user-provided value |
-| LogInjectionTest.java:1661:79:1661:95 | (...)... | LogInjectionTest.java:1661:88:1661:95 | source(...) : Object | LogInjectionTest.java:1661:79:1661:95 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1661:88:1661:95 | source(...) | user-provided value |
-| LogInjectionTest.java:1662:64:1662:80 | (...)... | LogInjectionTest.java:1662:73:1662:80 | source(...) : Object | LogInjectionTest.java:1662:64:1662:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1662:73:1662:80 | source(...) | user-provided value |
-| LogInjectionTest.java:1663:94:1663:110 | (...)... | LogInjectionTest.java:1663:103:1663:110 | source(...) : Object | LogInjectionTest.java:1663:94:1663:110 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1663:103:1663:110 | source(...) | user-provided value |
-| LogInjectionTest.java:1664:79:1664:95 | (...)... | LogInjectionTest.java:1664:88:1664:95 | source(...) : Object | LogInjectionTest.java:1664:79:1664:95 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1664:88:1664:95 | source(...) | user-provided value |
-| LogInjectionTest.java:1665:64:1665:80 | (...)... | LogInjectionTest.java:1665:73:1665:80 | source(...) : Object | LogInjectionTest.java:1665:64:1665:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1665:73:1665:80 | source(...) | user-provided value |
-| LogInjectionTest.java:1666:109:1666:125 | (...)... | LogInjectionTest.java:1666:118:1666:125 | source(...) : Object | LogInjectionTest.java:1666:109:1666:125 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1666:118:1666:125 | source(...) | user-provided value |
-| LogInjectionTest.java:1667:94:1667:110 | (...)... | LogInjectionTest.java:1667:103:1667:110 | source(...) : Object | LogInjectionTest.java:1667:94:1667:110 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1667:103:1667:110 | source(...) | user-provided value |
-| LogInjectionTest.java:1668:79:1668:95 | (...)... | LogInjectionTest.java:1668:88:1668:95 | source(...) : Object | LogInjectionTest.java:1668:79:1668:95 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1668:88:1668:95 | source(...) | user-provided value |
-| LogInjectionTest.java:1669:64:1669:80 | (...)... | LogInjectionTest.java:1669:73:1669:80 | source(...) : Object | LogInjectionTest.java:1669:64:1669:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1669:73:1669:80 | source(...) | user-provided value |
-| LogInjectionTest.java:1670:109:1670:125 | (...)... | LogInjectionTest.java:1670:118:1670:125 | source(...) : Object | LogInjectionTest.java:1670:109:1670:125 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1670:118:1670:125 | source(...) | user-provided value |
-| LogInjectionTest.java:1671:94:1671:110 | (...)... | LogInjectionTest.java:1671:103:1671:110 | source(...) : Object | LogInjectionTest.java:1671:94:1671:110 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1671:103:1671:110 | source(...) | user-provided value |
-| LogInjectionTest.java:1672:79:1672:95 | (...)... | LogInjectionTest.java:1672:88:1672:95 | source(...) : Object | LogInjectionTest.java:1672:79:1672:95 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1672:88:1672:95 | source(...) | user-provided value |
-| LogInjectionTest.java:1673:64:1673:80 | (...)... | LogInjectionTest.java:1673:73:1673:80 | source(...) : Object | LogInjectionTest.java:1673:64:1673:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1673:73:1673:80 | source(...) | user-provided value |
-| LogInjectionTest.java:1674:42:1674:58 | (...)... | LogInjectionTest.java:1674:51:1674:58 | source(...) : Object | LogInjectionTest.java:1674:42:1674:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1674:51:1674:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1675:27:1675:43 | (...)... | LogInjectionTest.java:1675:36:1675:43 | source(...) : Object | LogInjectionTest.java:1675:27:1675:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1675:36:1675:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1676:42:1676:58 | (...)... | LogInjectionTest.java:1676:51:1676:58 | source(...) : Object | LogInjectionTest.java:1676:42:1676:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1676:51:1676:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1677:27:1677:43 | (...)... | LogInjectionTest.java:1677:36:1677:43 | source(...) : Object | LogInjectionTest.java:1677:27:1677:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1677:36:1677:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1678:27:1678:43 | (...)... | LogInjectionTest.java:1678:36:1678:43 | source(...) : Object | LogInjectionTest.java:1678:27:1678:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1678:36:1678:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1679:27:1679:43 | (...)... | LogInjectionTest.java:1679:36:1679:43 | source(...) : Object | LogInjectionTest.java:1679:27:1679:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1679:36:1679:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1680:42:1680:64 | new Object[] | LogInjectionTest.java:1680:56:1680:63 | source(...) : Object | LogInjectionTest.java:1680:42:1680:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1680:56:1680:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1681:42:1681:64 | new Object[] | LogInjectionTest.java:1681:56:1681:63 | source(...) : Object | LogInjectionTest.java:1681:42:1681:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1681:56:1681:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1682:57:1682:73 | (...)... | LogInjectionTest.java:1682:66:1682:73 | source(...) : Object | LogInjectionTest.java:1682:57:1682:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1682:66:1682:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1683:42:1683:58 | (...)... | LogInjectionTest.java:1683:51:1683:58 | source(...) : Object | LogInjectionTest.java:1683:42:1683:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1683:51:1683:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1684:27:1684:43 | (...)... | LogInjectionTest.java:1684:36:1684:43 | source(...) : Object | LogInjectionTest.java:1684:27:1684:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1684:36:1684:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1685:57:1685:73 | (...)... | LogInjectionTest.java:1685:66:1685:73 | source(...) : Object | LogInjectionTest.java:1685:57:1685:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1685:66:1685:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1686:42:1686:58 | (...)... | LogInjectionTest.java:1686:51:1686:58 | source(...) : Object | LogInjectionTest.java:1686:42:1686:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1686:51:1686:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1687:27:1687:43 | (...)... | LogInjectionTest.java:1687:36:1687:43 | source(...) : Object | LogInjectionTest.java:1687:27:1687:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1687:36:1687:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1688:72:1688:88 | (...)... | LogInjectionTest.java:1688:81:1688:88 | source(...) : Object | LogInjectionTest.java:1688:72:1688:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1688:81:1688:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1689:57:1689:73 | (...)... | LogInjectionTest.java:1689:66:1689:73 | source(...) : Object | LogInjectionTest.java:1689:57:1689:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1689:66:1689:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1690:42:1690:58 | (...)... | LogInjectionTest.java:1690:51:1690:58 | source(...) : Object | LogInjectionTest.java:1690:42:1690:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1690:51:1690:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1691:27:1691:43 | (...)... | LogInjectionTest.java:1691:36:1691:43 | source(...) : Object | LogInjectionTest.java:1691:27:1691:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1691:36:1691:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1692:72:1692:88 | (...)... | LogInjectionTest.java:1692:81:1692:88 | source(...) : Object | LogInjectionTest.java:1692:72:1692:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1692:81:1692:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1693:57:1693:73 | (...)... | LogInjectionTest.java:1693:66:1693:73 | source(...) : Object | LogInjectionTest.java:1693:57:1693:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1693:66:1693:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1694:42:1694:58 | (...)... | LogInjectionTest.java:1694:51:1694:58 | source(...) : Object | LogInjectionTest.java:1694:42:1694:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1694:51:1694:58 | source(...) | user-provided value |
-| LogInjectionTest.java:1695:27:1695:43 | (...)... | LogInjectionTest.java:1695:36:1695:43 | source(...) : Object | LogInjectionTest.java:1695:27:1695:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1695:36:1695:43 | source(...) | user-provided value |
-| LogInjectionTest.java:1696:41:1696:57 | (...)... | LogInjectionTest.java:1696:50:1696:57 | source(...) : Object | LogInjectionTest.java:1696:41:1696:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1696:50:1696:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1697:26:1697:42 | (...)... | LogInjectionTest.java:1697:35:1697:42 | source(...) : Object | LogInjectionTest.java:1697:26:1697:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1697:35:1697:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1698:41:1698:57 | (...)... | LogInjectionTest.java:1698:50:1698:57 | source(...) : Object | LogInjectionTest.java:1698:41:1698:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1698:50:1698:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1699:26:1699:42 | (...)... | LogInjectionTest.java:1699:35:1699:42 | source(...) : Object | LogInjectionTest.java:1699:26:1699:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1699:35:1699:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1590:41:1590:57 | (...)... | LogInjectionTest.java:1590:50:1590:57 | source(...) : Object | LogInjectionTest.java:1590:41:1590:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1590:50:1590:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1591:26:1591:42 | (...)... | LogInjectionTest.java:1591:35:1591:42 | source(...) : Object | LogInjectionTest.java:1591:26:1591:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1591:35:1591:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1592:41:1592:57 | (...)... | LogInjectionTest.java:1592:50:1592:57 | source(...) : Object | LogInjectionTest.java:1592:41:1592:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1592:50:1592:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1593:26:1593:42 | (...)... | LogInjectionTest.java:1593:35:1593:42 | source(...) : Object | LogInjectionTest.java:1593:26:1593:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1593:35:1593:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1594:26:1594:42 | (...)... | LogInjectionTest.java:1594:35:1594:42 | source(...) : Object | LogInjectionTest.java:1594:26:1594:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1594:35:1594:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1595:26:1595:42 | (...)... | LogInjectionTest.java:1595:35:1595:42 | source(...) : Object | LogInjectionTest.java:1595:26:1595:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1595:35:1595:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1596:41:1596:63 | new Object[] | LogInjectionTest.java:1596:55:1596:62 | source(...) : Object | LogInjectionTest.java:1596:41:1596:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1596:55:1596:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1597:41:1597:63 | new Object[] | LogInjectionTest.java:1597:55:1597:62 | source(...) : Object | LogInjectionTest.java:1597:41:1597:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1597:55:1597:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1598:56:1598:72 | (...)... | LogInjectionTest.java:1598:65:1598:72 | source(...) : Object | LogInjectionTest.java:1598:56:1598:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1598:65:1598:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1599:41:1599:57 | (...)... | LogInjectionTest.java:1599:50:1599:57 | source(...) : Object | LogInjectionTest.java:1599:41:1599:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1599:50:1599:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1600:26:1600:42 | (...)... | LogInjectionTest.java:1600:35:1600:42 | source(...) : Object | LogInjectionTest.java:1600:26:1600:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1600:35:1600:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1601:56:1601:72 | (...)... | LogInjectionTest.java:1601:65:1601:72 | source(...) : Object | LogInjectionTest.java:1601:56:1601:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1601:65:1601:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1602:41:1602:57 | (...)... | LogInjectionTest.java:1602:50:1602:57 | source(...) : Object | LogInjectionTest.java:1602:41:1602:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1602:50:1602:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1603:26:1603:42 | (...)... | LogInjectionTest.java:1603:35:1603:42 | source(...) : Object | LogInjectionTest.java:1603:26:1603:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1603:35:1603:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1604:71:1604:87 | (...)... | LogInjectionTest.java:1604:80:1604:87 | source(...) : Object | LogInjectionTest.java:1604:71:1604:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1604:80:1604:87 | source(...) | user-provided value |
+| LogInjectionTest.java:1605:56:1605:72 | (...)... | LogInjectionTest.java:1605:65:1605:72 | source(...) : Object | LogInjectionTest.java:1605:56:1605:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1605:65:1605:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1606:41:1606:57 | (...)... | LogInjectionTest.java:1606:50:1606:57 | source(...) : Object | LogInjectionTest.java:1606:41:1606:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1606:50:1606:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1607:26:1607:42 | (...)... | LogInjectionTest.java:1607:35:1607:42 | source(...) : Object | LogInjectionTest.java:1607:26:1607:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1607:35:1607:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1608:71:1608:87 | (...)... | LogInjectionTest.java:1608:80:1608:87 | source(...) : Object | LogInjectionTest.java:1608:71:1608:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1608:80:1608:87 | source(...) | user-provided value |
+| LogInjectionTest.java:1609:56:1609:72 | (...)... | LogInjectionTest.java:1609:65:1609:72 | source(...) : Object | LogInjectionTest.java:1609:56:1609:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1609:65:1609:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1610:41:1610:57 | (...)... | LogInjectionTest.java:1610:50:1610:57 | source(...) : Object | LogInjectionTest.java:1610:41:1610:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1610:50:1610:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1611:26:1611:42 | (...)... | LogInjectionTest.java:1611:35:1611:42 | source(...) : Object | LogInjectionTest.java:1611:26:1611:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1611:35:1611:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1612:79:1612:95 | (...)... | LogInjectionTest.java:1612:88:1612:95 | source(...) : Object | LogInjectionTest.java:1612:79:1612:95 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1612:88:1612:95 | source(...) | user-provided value |
+| LogInjectionTest.java:1613:64:1613:80 | (...)... | LogInjectionTest.java:1613:73:1613:80 | source(...) : Object | LogInjectionTest.java:1613:64:1613:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1613:73:1613:80 | source(...) | user-provided value |
+| LogInjectionTest.java:1614:79:1614:95 | (...)... | LogInjectionTest.java:1614:88:1614:95 | source(...) : Object | LogInjectionTest.java:1614:79:1614:95 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1614:88:1614:95 | source(...) | user-provided value |
+| LogInjectionTest.java:1615:64:1615:80 | (...)... | LogInjectionTest.java:1615:73:1615:80 | source(...) : Object | LogInjectionTest.java:1615:64:1615:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1615:73:1615:80 | source(...) | user-provided value |
+| LogInjectionTest.java:1616:64:1616:80 | (...)... | LogInjectionTest.java:1616:73:1616:80 | source(...) : Object | LogInjectionTest.java:1616:64:1616:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1616:73:1616:80 | source(...) | user-provided value |
+| LogInjectionTest.java:1617:64:1617:80 | (...)... | LogInjectionTest.java:1617:73:1617:80 | source(...) : Object | LogInjectionTest.java:1617:64:1617:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1617:73:1617:80 | source(...) | user-provided value |
+| LogInjectionTest.java:1618:79:1618:101 | new Object[] | LogInjectionTest.java:1618:93:1618:100 | source(...) : Object | LogInjectionTest.java:1618:79:1618:101 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1618:93:1618:100 | source(...) | user-provided value |
+| LogInjectionTest.java:1619:79:1619:101 | new Object[] | LogInjectionTest.java:1619:93:1619:100 | source(...) : Object | LogInjectionTest.java:1619:79:1619:101 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1619:93:1619:100 | source(...) | user-provided value |
+| LogInjectionTest.java:1620:94:1620:110 | (...)... | LogInjectionTest.java:1620:103:1620:110 | source(...) : Object | LogInjectionTest.java:1620:94:1620:110 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1620:103:1620:110 | source(...) | user-provided value |
+| LogInjectionTest.java:1621:79:1621:95 | (...)... | LogInjectionTest.java:1621:88:1621:95 | source(...) : Object | LogInjectionTest.java:1621:79:1621:95 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1621:88:1621:95 | source(...) | user-provided value |
+| LogInjectionTest.java:1622:64:1622:80 | (...)... | LogInjectionTest.java:1622:73:1622:80 | source(...) : Object | LogInjectionTest.java:1622:64:1622:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1622:73:1622:80 | source(...) | user-provided value |
+| LogInjectionTest.java:1623:94:1623:110 | (...)... | LogInjectionTest.java:1623:103:1623:110 | source(...) : Object | LogInjectionTest.java:1623:94:1623:110 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1623:103:1623:110 | source(...) | user-provided value |
+| LogInjectionTest.java:1624:79:1624:95 | (...)... | LogInjectionTest.java:1624:88:1624:95 | source(...) : Object | LogInjectionTest.java:1624:79:1624:95 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1624:88:1624:95 | source(...) | user-provided value |
+| LogInjectionTest.java:1625:64:1625:80 | (...)... | LogInjectionTest.java:1625:73:1625:80 | source(...) : Object | LogInjectionTest.java:1625:64:1625:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1625:73:1625:80 | source(...) | user-provided value |
+| LogInjectionTest.java:1626:109:1626:125 | (...)... | LogInjectionTest.java:1626:118:1626:125 | source(...) : Object | LogInjectionTest.java:1626:109:1626:125 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1626:118:1626:125 | source(...) | user-provided value |
+| LogInjectionTest.java:1627:94:1627:110 | (...)... | LogInjectionTest.java:1627:103:1627:110 | source(...) : Object | LogInjectionTest.java:1627:94:1627:110 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1627:103:1627:110 | source(...) | user-provided value |
+| LogInjectionTest.java:1628:79:1628:95 | (...)... | LogInjectionTest.java:1628:88:1628:95 | source(...) : Object | LogInjectionTest.java:1628:79:1628:95 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1628:88:1628:95 | source(...) | user-provided value |
+| LogInjectionTest.java:1629:64:1629:80 | (...)... | LogInjectionTest.java:1629:73:1629:80 | source(...) : Object | LogInjectionTest.java:1629:64:1629:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1629:73:1629:80 | source(...) | user-provided value |
+| LogInjectionTest.java:1630:109:1630:125 | (...)... | LogInjectionTest.java:1630:118:1630:125 | source(...) : Object | LogInjectionTest.java:1630:109:1630:125 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1630:118:1630:125 | source(...) | user-provided value |
+| LogInjectionTest.java:1631:94:1631:110 | (...)... | LogInjectionTest.java:1631:103:1631:110 | source(...) : Object | LogInjectionTest.java:1631:94:1631:110 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1631:103:1631:110 | source(...) | user-provided value |
+| LogInjectionTest.java:1632:79:1632:95 | (...)... | LogInjectionTest.java:1632:88:1632:95 | source(...) : Object | LogInjectionTest.java:1632:79:1632:95 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1632:88:1632:95 | source(...) | user-provided value |
+| LogInjectionTest.java:1633:64:1633:80 | (...)... | LogInjectionTest.java:1633:73:1633:80 | source(...) : Object | LogInjectionTest.java:1633:64:1633:80 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1633:73:1633:80 | source(...) | user-provided value |
+| LogInjectionTest.java:1634:42:1634:58 | (...)... | LogInjectionTest.java:1634:51:1634:58 | source(...) : Object | LogInjectionTest.java:1634:42:1634:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1634:51:1634:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1635:27:1635:43 | (...)... | LogInjectionTest.java:1635:36:1635:43 | source(...) : Object | LogInjectionTest.java:1635:27:1635:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1635:36:1635:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1636:42:1636:58 | (...)... | LogInjectionTest.java:1636:51:1636:58 | source(...) : Object | LogInjectionTest.java:1636:42:1636:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1636:51:1636:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1637:27:1637:43 | (...)... | LogInjectionTest.java:1637:36:1637:43 | source(...) : Object | LogInjectionTest.java:1637:27:1637:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1637:36:1637:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1638:27:1638:43 | (...)... | LogInjectionTest.java:1638:36:1638:43 | source(...) : Object | LogInjectionTest.java:1638:27:1638:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1638:36:1638:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1639:27:1639:43 | (...)... | LogInjectionTest.java:1639:36:1639:43 | source(...) : Object | LogInjectionTest.java:1639:27:1639:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1639:36:1639:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1640:42:1640:64 | new Object[] | LogInjectionTest.java:1640:56:1640:63 | source(...) : Object | LogInjectionTest.java:1640:42:1640:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1640:56:1640:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1641:42:1641:64 | new Object[] | LogInjectionTest.java:1641:56:1641:63 | source(...) : Object | LogInjectionTest.java:1641:42:1641:64 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1641:56:1641:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1642:57:1642:73 | (...)... | LogInjectionTest.java:1642:66:1642:73 | source(...) : Object | LogInjectionTest.java:1642:57:1642:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1642:66:1642:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1643:42:1643:58 | (...)... | LogInjectionTest.java:1643:51:1643:58 | source(...) : Object | LogInjectionTest.java:1643:42:1643:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1643:51:1643:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1644:27:1644:43 | (...)... | LogInjectionTest.java:1644:36:1644:43 | source(...) : Object | LogInjectionTest.java:1644:27:1644:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1644:36:1644:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1645:57:1645:73 | (...)... | LogInjectionTest.java:1645:66:1645:73 | source(...) : Object | LogInjectionTest.java:1645:57:1645:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1645:66:1645:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1646:42:1646:58 | (...)... | LogInjectionTest.java:1646:51:1646:58 | source(...) : Object | LogInjectionTest.java:1646:42:1646:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1646:51:1646:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1647:27:1647:43 | (...)... | LogInjectionTest.java:1647:36:1647:43 | source(...) : Object | LogInjectionTest.java:1647:27:1647:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1647:36:1647:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1648:72:1648:88 | (...)... | LogInjectionTest.java:1648:81:1648:88 | source(...) : Object | LogInjectionTest.java:1648:72:1648:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1648:81:1648:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1649:57:1649:73 | (...)... | LogInjectionTest.java:1649:66:1649:73 | source(...) : Object | LogInjectionTest.java:1649:57:1649:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1649:66:1649:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1650:42:1650:58 | (...)... | LogInjectionTest.java:1650:51:1650:58 | source(...) : Object | LogInjectionTest.java:1650:42:1650:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1650:51:1650:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1651:27:1651:43 | (...)... | LogInjectionTest.java:1651:36:1651:43 | source(...) : Object | LogInjectionTest.java:1651:27:1651:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1651:36:1651:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1652:72:1652:88 | (...)... | LogInjectionTest.java:1652:81:1652:88 | source(...) : Object | LogInjectionTest.java:1652:72:1652:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1652:81:1652:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1653:57:1653:73 | (...)... | LogInjectionTest.java:1653:66:1653:73 | source(...) : Object | LogInjectionTest.java:1653:57:1653:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1653:66:1653:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1654:42:1654:58 | (...)... | LogInjectionTest.java:1654:51:1654:58 | source(...) : Object | LogInjectionTest.java:1654:42:1654:58 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1654:51:1654:58 | source(...) | user-provided value |
+| LogInjectionTest.java:1655:27:1655:43 | (...)... | LogInjectionTest.java:1655:36:1655:43 | source(...) : Object | LogInjectionTest.java:1655:27:1655:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1655:36:1655:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1656:41:1656:57 | (...)... | LogInjectionTest.java:1656:50:1656:57 | source(...) : Object | LogInjectionTest.java:1656:41:1656:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1656:50:1656:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1657:26:1657:42 | (...)... | LogInjectionTest.java:1657:35:1657:42 | source(...) : Object | LogInjectionTest.java:1657:26:1657:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1657:35:1657:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1658:41:1658:57 | (...)... | LogInjectionTest.java:1658:50:1658:57 | source(...) : Object | LogInjectionTest.java:1658:41:1658:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1658:50:1658:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1659:26:1659:42 | (...)... | LogInjectionTest.java:1659:35:1659:42 | source(...) : Object | LogInjectionTest.java:1659:26:1659:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1659:35:1659:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1660:26:1660:42 | (...)... | LogInjectionTest.java:1660:35:1660:42 | source(...) : Object | LogInjectionTest.java:1660:26:1660:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1660:35:1660:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1661:26:1661:42 | (...)... | LogInjectionTest.java:1661:35:1661:42 | source(...) : Object | LogInjectionTest.java:1661:26:1661:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1661:35:1661:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1662:41:1662:63 | new Object[] | LogInjectionTest.java:1662:55:1662:62 | source(...) : Object | LogInjectionTest.java:1662:41:1662:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1662:55:1662:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1663:41:1663:63 | new Object[] | LogInjectionTest.java:1663:55:1663:62 | source(...) : Object | LogInjectionTest.java:1663:41:1663:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1663:55:1663:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1664:56:1664:72 | (...)... | LogInjectionTest.java:1664:65:1664:72 | source(...) : Object | LogInjectionTest.java:1664:56:1664:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1664:65:1664:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1665:41:1665:57 | (...)... | LogInjectionTest.java:1665:50:1665:57 | source(...) : Object | LogInjectionTest.java:1665:41:1665:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1665:50:1665:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1666:26:1666:42 | (...)... | LogInjectionTest.java:1666:35:1666:42 | source(...) : Object | LogInjectionTest.java:1666:26:1666:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1666:35:1666:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1667:56:1667:72 | (...)... | LogInjectionTest.java:1667:65:1667:72 | source(...) : Object | LogInjectionTest.java:1667:56:1667:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1667:65:1667:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1668:41:1668:57 | (...)... | LogInjectionTest.java:1668:50:1668:57 | source(...) : Object | LogInjectionTest.java:1668:41:1668:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1668:50:1668:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1669:26:1669:42 | (...)... | LogInjectionTest.java:1669:35:1669:42 | source(...) : Object | LogInjectionTest.java:1669:26:1669:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1669:35:1669:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1670:71:1670:87 | (...)... | LogInjectionTest.java:1670:80:1670:87 | source(...) : Object | LogInjectionTest.java:1670:71:1670:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1670:80:1670:87 | source(...) | user-provided value |
+| LogInjectionTest.java:1671:56:1671:72 | (...)... | LogInjectionTest.java:1671:65:1671:72 | source(...) : Object | LogInjectionTest.java:1671:56:1671:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1671:65:1671:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1672:41:1672:57 | (...)... | LogInjectionTest.java:1672:50:1672:57 | source(...) : Object | LogInjectionTest.java:1672:41:1672:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1672:50:1672:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1673:26:1673:42 | (...)... | LogInjectionTest.java:1673:35:1673:42 | source(...) : Object | LogInjectionTest.java:1673:26:1673:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1673:35:1673:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1674:71:1674:87 | (...)... | LogInjectionTest.java:1674:80:1674:87 | source(...) : Object | LogInjectionTest.java:1674:71:1674:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1674:80:1674:87 | source(...) | user-provided value |
+| LogInjectionTest.java:1675:56:1675:72 | (...)... | LogInjectionTest.java:1675:65:1675:72 | source(...) : Object | LogInjectionTest.java:1675:56:1675:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1675:65:1675:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1676:41:1676:57 | (...)... | LogInjectionTest.java:1676:50:1676:57 | source(...) : Object | LogInjectionTest.java:1676:41:1676:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1676:50:1676:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1677:26:1677:42 | (...)... | LogInjectionTest.java:1677:35:1677:42 | source(...) : Object | LogInjectionTest.java:1677:26:1677:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1677:35:1677:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1682:25:1682:41 | (...)... | LogInjectionTest.java:1682:34:1682:41 | source(...) : Object | LogInjectionTest.java:1682:25:1682:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1682:34:1682:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1683:25:1683:41 | (...)... | LogInjectionTest.java:1683:34:1683:41 | source(...) : Object | LogInjectionTest.java:1683:25:1683:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1683:34:1683:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1684:40:1684:47 | source(...) | LogInjectionTest.java:1684:40:1684:47 | source(...) | LogInjectionTest.java:1684:40:1684:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1684:40:1684:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1685:25:1685:41 | (...)... | LogInjectionTest.java:1685:34:1685:41 | source(...) : Object | LogInjectionTest.java:1685:25:1685:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1685:34:1685:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1686:40:1686:62 | new Object[] | LogInjectionTest.java:1686:54:1686:61 | source(...) : Object | LogInjectionTest.java:1686:40:1686:62 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1686:54:1686:61 | source(...) | user-provided value |
+| LogInjectionTest.java:1687:25:1687:41 | (...)... | LogInjectionTest.java:1687:34:1687:41 | source(...) : Object | LogInjectionTest.java:1687:25:1687:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1687:34:1687:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1688:40:1688:47 | source(...) | LogInjectionTest.java:1688:40:1688:47 | source(...) | LogInjectionTest.java:1688:40:1688:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1688:40:1688:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1689:55:1689:62 | source(...) | LogInjectionTest.java:1689:55:1689:62 | source(...) | LogInjectionTest.java:1689:55:1689:62 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1689:55:1689:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1690:25:1690:62 | (...)... | LogInjectionTest.java:1690:55:1690:62 | source(...) : Object | LogInjectionTest.java:1690:25:1690:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1690:55:1690:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1695:26:1695:42 | (...)... | LogInjectionTest.java:1695:35:1695:42 | source(...) : Object | LogInjectionTest.java:1695:26:1695:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1695:35:1695:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1696:26:1696:42 | (...)... | LogInjectionTest.java:1696:35:1696:42 | source(...) : Object | LogInjectionTest.java:1696:26:1696:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1696:35:1696:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1697:41:1697:48 | source(...) | LogInjectionTest.java:1697:41:1697:48 | source(...) | LogInjectionTest.java:1697:41:1697:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1697:41:1697:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1698:26:1698:42 | (...)... | LogInjectionTest.java:1698:35:1698:42 | source(...) : Object | LogInjectionTest.java:1698:26:1698:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1698:35:1698:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1699:41:1699:63 | new Object[] | LogInjectionTest.java:1699:55:1699:62 | source(...) : Object | LogInjectionTest.java:1699:41:1699:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1699:55:1699:62 | source(...) | user-provided value |
 | LogInjectionTest.java:1700:26:1700:42 | (...)... | LogInjectionTest.java:1700:35:1700:42 | source(...) : Object | LogInjectionTest.java:1700:26:1700:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1700:35:1700:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1701:26:1701:42 | (...)... | LogInjectionTest.java:1701:35:1701:42 | source(...) : Object | LogInjectionTest.java:1701:26:1701:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1701:35:1701:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1702:41:1702:63 | new Object[] | LogInjectionTest.java:1702:55:1702:62 | source(...) : Object | LogInjectionTest.java:1702:41:1702:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1702:55:1702:62 | source(...) | user-provided value |
-| LogInjectionTest.java:1703:41:1703:63 | new Object[] | LogInjectionTest.java:1703:55:1703:62 | source(...) : Object | LogInjectionTest.java:1703:41:1703:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1703:55:1703:62 | source(...) | user-provided value |
-| LogInjectionTest.java:1704:56:1704:72 | (...)... | LogInjectionTest.java:1704:65:1704:72 | source(...) : Object | LogInjectionTest.java:1704:56:1704:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1704:65:1704:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1705:41:1705:57 | (...)... | LogInjectionTest.java:1705:50:1705:57 | source(...) : Object | LogInjectionTest.java:1705:41:1705:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1705:50:1705:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1706:26:1706:42 | (...)... | LogInjectionTest.java:1706:35:1706:42 | source(...) : Object | LogInjectionTest.java:1706:26:1706:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1706:35:1706:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1707:56:1707:72 | (...)... | LogInjectionTest.java:1707:65:1707:72 | source(...) : Object | LogInjectionTest.java:1707:56:1707:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1707:65:1707:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1708:41:1708:57 | (...)... | LogInjectionTest.java:1708:50:1708:57 | source(...) : Object | LogInjectionTest.java:1708:41:1708:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1708:50:1708:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1709:26:1709:42 | (...)... | LogInjectionTest.java:1709:35:1709:42 | source(...) : Object | LogInjectionTest.java:1709:26:1709:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1709:35:1709:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1710:71:1710:87 | (...)... | LogInjectionTest.java:1710:80:1710:87 | source(...) : Object | LogInjectionTest.java:1710:71:1710:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1710:80:1710:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1711:56:1711:72 | (...)... | LogInjectionTest.java:1711:65:1711:72 | source(...) : Object | LogInjectionTest.java:1711:56:1711:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1711:65:1711:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1712:41:1712:57 | (...)... | LogInjectionTest.java:1712:50:1712:57 | source(...) : Object | LogInjectionTest.java:1712:41:1712:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1712:50:1712:57 | source(...) | user-provided value |
-| LogInjectionTest.java:1713:26:1713:42 | (...)... | LogInjectionTest.java:1713:35:1713:42 | source(...) : Object | LogInjectionTest.java:1713:26:1713:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1713:35:1713:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1714:71:1714:87 | (...)... | LogInjectionTest.java:1714:80:1714:87 | source(...) : Object | LogInjectionTest.java:1714:71:1714:87 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1714:80:1714:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1715:56:1715:72 | (...)... | LogInjectionTest.java:1715:65:1715:72 | source(...) : Object | LogInjectionTest.java:1715:56:1715:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1715:65:1715:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1716:41:1716:57 | (...)... | LogInjectionTest.java:1716:50:1716:57 | source(...) : Object | LogInjectionTest.java:1716:41:1716:57 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1716:50:1716:57 | source(...) | user-provided value |
+| LogInjectionTest.java:1701:41:1701:48 | source(...) | LogInjectionTest.java:1701:41:1701:48 | source(...) | LogInjectionTest.java:1701:41:1701:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1701:41:1701:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1702:56:1702:63 | source(...) | LogInjectionTest.java:1702:56:1702:63 | source(...) | LogInjectionTest.java:1702:56:1702:63 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1702:56:1702:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1703:26:1703:42 | (...)... | LogInjectionTest.java:1703:35:1703:42 | source(...) : Object | LogInjectionTest.java:1703:26:1703:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1703:35:1703:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1704:51:1704:67 | (...)... | LogInjectionTest.java:1704:60:1704:67 | source(...) : Object | LogInjectionTest.java:1704:51:1704:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1704:60:1704:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1705:51:1705:67 | (...)... | LogInjectionTest.java:1705:60:1705:67 | source(...) : Object | LogInjectionTest.java:1705:51:1705:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1705:60:1705:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1706:66:1706:73 | source(...) | LogInjectionTest.java:1706:66:1706:73 | source(...) | LogInjectionTest.java:1706:66:1706:73 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1706:66:1706:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1707:51:1707:67 | (...)... | LogInjectionTest.java:1707:60:1707:67 | source(...) : Object | LogInjectionTest.java:1707:51:1707:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1707:60:1707:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1708:66:1708:88 | new Object[] | LogInjectionTest.java:1708:80:1708:87 | source(...) : Object | LogInjectionTest.java:1708:66:1708:88 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1708:80:1708:87 | source(...) | user-provided value |
+| LogInjectionTest.java:1709:51:1709:67 | (...)... | LogInjectionTest.java:1709:60:1709:67 | source(...) : Object | LogInjectionTest.java:1709:51:1709:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1709:60:1709:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1710:66:1710:73 | source(...) | LogInjectionTest.java:1710:66:1710:73 | source(...) | LogInjectionTest.java:1710:66:1710:73 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1710:66:1710:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1711:81:1711:88 | source(...) | LogInjectionTest.java:1711:81:1711:88 | source(...) | LogInjectionTest.java:1711:81:1711:88 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1711:81:1711:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1712:51:1712:67 | (...)... | LogInjectionTest.java:1712:60:1712:67 | source(...) : Object | LogInjectionTest.java:1712:51:1712:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1712:60:1712:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1713:13:1713:104 | new ..[] { .. } | LogInjectionTest.java:1713:66:1713:73 | source(...) : Object | LogInjectionTest.java:1713:13:1713:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1713:66:1713:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1714:13:1714:104 | new ..[] { .. } | LogInjectionTest.java:1714:81:1714:88 | source(...) : Object | LogInjectionTest.java:1714:13:1714:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1714:81:1714:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1715:13:1715:104 | new ..[] { .. } | LogInjectionTest.java:1715:96:1715:103 | source(...) : Object | LogInjectionTest.java:1715:13:1715:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1715:96:1715:103 | source(...) | user-provided value |
+| LogInjectionTest.java:1716:26:1716:42 | (...)... | LogInjectionTest.java:1716:35:1716:42 | source(...) : Object | LogInjectionTest.java:1716:26:1716:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1716:35:1716:42 | source(...) | user-provided value |
 | LogInjectionTest.java:1717:26:1717:42 | (...)... | LogInjectionTest.java:1717:35:1717:42 | source(...) : Object | LogInjectionTest.java:1717:26:1717:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1717:35:1717:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1722:25:1722:41 | (...)... | LogInjectionTest.java:1722:34:1722:41 | source(...) : Object | LogInjectionTest.java:1722:25:1722:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1722:34:1722:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1723:25:1723:41 | (...)... | LogInjectionTest.java:1723:34:1723:41 | source(...) : Object | LogInjectionTest.java:1723:25:1723:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1723:34:1723:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1724:40:1724:47 | source(...) | LogInjectionTest.java:1724:40:1724:47 | source(...) | LogInjectionTest.java:1724:40:1724:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1724:40:1724:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1725:25:1725:41 | (...)... | LogInjectionTest.java:1725:34:1725:41 | source(...) : Object | LogInjectionTest.java:1725:25:1725:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1725:34:1725:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1726:40:1726:62 | new Object[] | LogInjectionTest.java:1726:54:1726:61 | source(...) : Object | LogInjectionTest.java:1726:40:1726:62 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1726:54:1726:61 | source(...) | user-provided value |
-| LogInjectionTest.java:1727:25:1727:41 | (...)... | LogInjectionTest.java:1727:34:1727:41 | source(...) : Object | LogInjectionTest.java:1727:25:1727:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1727:34:1727:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1728:40:1728:47 | source(...) | LogInjectionTest.java:1728:40:1728:47 | source(...) | LogInjectionTest.java:1728:40:1728:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1728:40:1728:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1729:55:1729:62 | source(...) | LogInjectionTest.java:1729:55:1729:62 | source(...) | LogInjectionTest.java:1729:55:1729:62 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1729:55:1729:62 | source(...) | user-provided value |
-| LogInjectionTest.java:1730:25:1730:62 | (...)... | LogInjectionTest.java:1730:55:1730:62 | source(...) : Object | LogInjectionTest.java:1730:25:1730:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1730:55:1730:62 | source(...) | user-provided value |
-| LogInjectionTest.java:1735:26:1735:42 | (...)... | LogInjectionTest.java:1735:35:1735:42 | source(...) : Object | LogInjectionTest.java:1735:26:1735:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1735:35:1735:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1736:26:1736:42 | (...)... | LogInjectionTest.java:1736:35:1736:42 | source(...) : Object | LogInjectionTest.java:1736:26:1736:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1736:35:1736:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1737:41:1737:48 | source(...) | LogInjectionTest.java:1737:41:1737:48 | source(...) | LogInjectionTest.java:1737:41:1737:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1737:41:1737:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1738:26:1738:42 | (...)... | LogInjectionTest.java:1738:35:1738:42 | source(...) : Object | LogInjectionTest.java:1738:26:1738:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1738:35:1738:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1739:41:1739:63 | new Object[] | LogInjectionTest.java:1739:55:1739:62 | source(...) : Object | LogInjectionTest.java:1739:41:1739:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1739:55:1739:62 | source(...) | user-provided value |
-| LogInjectionTest.java:1740:26:1740:42 | (...)... | LogInjectionTest.java:1740:35:1740:42 | source(...) : Object | LogInjectionTest.java:1740:26:1740:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1740:35:1740:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1741:41:1741:48 | source(...) | LogInjectionTest.java:1741:41:1741:48 | source(...) | LogInjectionTest.java:1741:41:1741:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1741:41:1741:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1742:56:1742:63 | source(...) | LogInjectionTest.java:1742:56:1742:63 | source(...) | LogInjectionTest.java:1742:56:1742:63 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1742:56:1742:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1743:26:1743:42 | (...)... | LogInjectionTest.java:1743:35:1743:42 | source(...) : Object | LogInjectionTest.java:1743:26:1743:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1743:35:1743:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1744:51:1744:67 | (...)... | LogInjectionTest.java:1744:60:1744:67 | source(...) : Object | LogInjectionTest.java:1744:51:1744:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1744:60:1744:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1745:51:1745:67 | (...)... | LogInjectionTest.java:1745:60:1745:67 | source(...) : Object | LogInjectionTest.java:1745:51:1745:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1745:60:1745:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1746:66:1746:73 | source(...) | LogInjectionTest.java:1746:66:1746:73 | source(...) | LogInjectionTest.java:1746:66:1746:73 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1746:66:1746:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1747:51:1747:67 | (...)... | LogInjectionTest.java:1747:60:1747:67 | source(...) : Object | LogInjectionTest.java:1747:51:1747:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1747:60:1747:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1748:66:1748:88 | new Object[] | LogInjectionTest.java:1748:80:1748:87 | source(...) : Object | LogInjectionTest.java:1748:66:1748:88 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1748:80:1748:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1749:51:1749:67 | (...)... | LogInjectionTest.java:1749:60:1749:67 | source(...) : Object | LogInjectionTest.java:1749:51:1749:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1749:60:1749:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1750:66:1750:73 | source(...) | LogInjectionTest.java:1750:66:1750:73 | source(...) | LogInjectionTest.java:1750:66:1750:73 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1750:66:1750:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1751:81:1751:88 | source(...) | LogInjectionTest.java:1751:81:1751:88 | source(...) | LogInjectionTest.java:1751:81:1751:88 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1751:81:1751:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1752:51:1752:67 | (...)... | LogInjectionTest.java:1752:60:1752:67 | source(...) : Object | LogInjectionTest.java:1752:51:1752:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1752:60:1752:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1753:13:1753:104 | new ..[] { .. } | LogInjectionTest.java:1753:66:1753:73 | source(...) : Object | LogInjectionTest.java:1753:13:1753:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1753:66:1753:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1754:13:1754:104 | new ..[] { .. } | LogInjectionTest.java:1754:81:1754:88 | source(...) : Object | LogInjectionTest.java:1754:13:1754:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1754:81:1754:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1755:13:1755:104 | new ..[] { .. } | LogInjectionTest.java:1755:96:1755:103 | source(...) : Object | LogInjectionTest.java:1755:13:1755:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1755:96:1755:103 | source(...) | user-provided value |
-| LogInjectionTest.java:1756:26:1756:42 | (...)... | LogInjectionTest.java:1756:35:1756:42 | source(...) : Object | LogInjectionTest.java:1756:26:1756:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1756:35:1756:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1757:26:1757:42 | (...)... | LogInjectionTest.java:1757:35:1757:42 | source(...) : Object | LogInjectionTest.java:1757:26:1757:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1757:35:1757:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1758:41:1758:48 | source(...) | LogInjectionTest.java:1758:41:1758:48 | source(...) | LogInjectionTest.java:1758:41:1758:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1758:41:1758:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1718:41:1718:48 | source(...) | LogInjectionTest.java:1718:41:1718:48 | source(...) | LogInjectionTest.java:1718:41:1718:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1718:41:1718:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1719:26:1719:42 | (...)... | LogInjectionTest.java:1719:35:1719:42 | source(...) : Object | LogInjectionTest.java:1719:26:1719:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1719:35:1719:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1720:41:1720:63 | new Object[] | LogInjectionTest.java:1720:55:1720:62 | source(...) : Object | LogInjectionTest.java:1720:41:1720:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1720:55:1720:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1721:26:1721:42 | (...)... | LogInjectionTest.java:1721:35:1721:42 | source(...) : Object | LogInjectionTest.java:1721:26:1721:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1721:35:1721:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1722:41:1722:48 | source(...) | LogInjectionTest.java:1722:41:1722:48 | source(...) | LogInjectionTest.java:1722:41:1722:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1722:41:1722:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1723:56:1723:63 | source(...) | LogInjectionTest.java:1723:56:1723:63 | source(...) | LogInjectionTest.java:1723:56:1723:63 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1723:56:1723:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1724:26:1724:42 | (...)... | LogInjectionTest.java:1724:35:1724:42 | source(...) : Object | LogInjectionTest.java:1724:26:1724:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1724:35:1724:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1725:51:1725:67 | (...)... | LogInjectionTest.java:1725:60:1725:67 | source(...) : Object | LogInjectionTest.java:1725:51:1725:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1725:60:1725:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1726:51:1726:67 | (...)... | LogInjectionTest.java:1726:60:1726:67 | source(...) : Object | LogInjectionTest.java:1726:51:1726:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1726:60:1726:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1727:66:1727:73 | source(...) | LogInjectionTest.java:1727:66:1727:73 | source(...) | LogInjectionTest.java:1727:66:1727:73 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1727:66:1727:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1728:51:1728:67 | (...)... | LogInjectionTest.java:1728:60:1728:67 | source(...) : Object | LogInjectionTest.java:1728:51:1728:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1728:60:1728:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1729:66:1729:88 | new Object[] | LogInjectionTest.java:1729:80:1729:87 | source(...) : Object | LogInjectionTest.java:1729:66:1729:88 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1729:80:1729:87 | source(...) | user-provided value |
+| LogInjectionTest.java:1730:51:1730:67 | (...)... | LogInjectionTest.java:1730:60:1730:67 | source(...) : Object | LogInjectionTest.java:1730:51:1730:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1730:60:1730:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1731:66:1731:73 | source(...) | LogInjectionTest.java:1731:66:1731:73 | source(...) | LogInjectionTest.java:1731:66:1731:73 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1731:66:1731:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1732:81:1732:88 | source(...) | LogInjectionTest.java:1732:81:1732:88 | source(...) | LogInjectionTest.java:1732:81:1732:88 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1732:81:1732:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1733:51:1733:67 | (...)... | LogInjectionTest.java:1733:60:1733:67 | source(...) : Object | LogInjectionTest.java:1733:51:1733:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1733:60:1733:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1734:13:1734:104 | new ..[] { .. } | LogInjectionTest.java:1734:66:1734:73 | source(...) : Object | LogInjectionTest.java:1734:13:1734:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1734:66:1734:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1735:13:1735:104 | new ..[] { .. } | LogInjectionTest.java:1735:81:1735:88 | source(...) : Object | LogInjectionTest.java:1735:13:1735:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1735:81:1735:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1736:13:1736:104 | new ..[] { .. } | LogInjectionTest.java:1736:96:1736:103 | source(...) : Object | LogInjectionTest.java:1736:13:1736:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1736:96:1736:103 | source(...) | user-provided value |
+| LogInjectionTest.java:1737:25:1737:41 | (...)... | LogInjectionTest.java:1737:34:1737:41 | source(...) : Object | LogInjectionTest.java:1737:25:1737:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1737:34:1737:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1738:25:1738:41 | (...)... | LogInjectionTest.java:1738:34:1738:41 | source(...) : Object | LogInjectionTest.java:1738:25:1738:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1738:34:1738:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1739:40:1739:47 | source(...) | LogInjectionTest.java:1739:40:1739:47 | source(...) | LogInjectionTest.java:1739:40:1739:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1739:40:1739:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1740:25:1740:41 | (...)... | LogInjectionTest.java:1740:34:1740:41 | source(...) : Object | LogInjectionTest.java:1740:25:1740:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1740:34:1740:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1741:40:1741:62 | new Object[] | LogInjectionTest.java:1741:54:1741:61 | source(...) : Object | LogInjectionTest.java:1741:40:1741:62 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1741:54:1741:61 | source(...) | user-provided value |
+| LogInjectionTest.java:1742:25:1742:41 | (...)... | LogInjectionTest.java:1742:34:1742:41 | source(...) : Object | LogInjectionTest.java:1742:25:1742:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1742:34:1742:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1743:40:1743:47 | source(...) | LogInjectionTest.java:1743:40:1743:47 | source(...) | LogInjectionTest.java:1743:40:1743:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1743:40:1743:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1744:55:1744:62 | source(...) | LogInjectionTest.java:1744:55:1744:62 | source(...) | LogInjectionTest.java:1744:55:1744:62 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1744:55:1744:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1745:25:1745:41 | (...)... | LogInjectionTest.java:1745:34:1745:41 | source(...) : Object | LogInjectionTest.java:1745:25:1745:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1745:34:1745:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1746:50:1746:66 | (...)... | LogInjectionTest.java:1746:59:1746:66 | source(...) : Object | LogInjectionTest.java:1746:50:1746:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1746:59:1746:66 | source(...) | user-provided value |
+| LogInjectionTest.java:1747:50:1747:66 | (...)... | LogInjectionTest.java:1747:59:1747:66 | source(...) : Object | LogInjectionTest.java:1747:50:1747:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1747:59:1747:66 | source(...) | user-provided value |
+| LogInjectionTest.java:1748:65:1748:72 | source(...) | LogInjectionTest.java:1748:65:1748:72 | source(...) | LogInjectionTest.java:1748:65:1748:72 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1748:65:1748:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1749:50:1749:66 | (...)... | LogInjectionTest.java:1749:59:1749:66 | source(...) : Object | LogInjectionTest.java:1749:50:1749:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1749:59:1749:66 | source(...) | user-provided value |
+| LogInjectionTest.java:1750:65:1750:87 | new Object[] | LogInjectionTest.java:1750:79:1750:86 | source(...) : Object | LogInjectionTest.java:1750:65:1750:87 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1750:79:1750:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1751:50:1751:66 | (...)... | LogInjectionTest.java:1751:59:1751:66 | source(...) : Object | LogInjectionTest.java:1751:50:1751:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1751:59:1751:66 | source(...) | user-provided value |
+| LogInjectionTest.java:1752:65:1752:72 | source(...) | LogInjectionTest.java:1752:65:1752:72 | source(...) | LogInjectionTest.java:1752:65:1752:72 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1752:65:1752:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1753:80:1753:87 | source(...) | LogInjectionTest.java:1753:80:1753:87 | source(...) | LogInjectionTest.java:1753:80:1753:87 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1753:80:1753:87 | source(...) | user-provided value |
+| LogInjectionTest.java:1754:50:1754:66 | (...)... | LogInjectionTest.java:1754:59:1754:66 | source(...) : Object | LogInjectionTest.java:1754:50:1754:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1754:59:1754:66 | source(...) | user-provided value |
+| LogInjectionTest.java:1755:13:1755:103 | new ..[] { .. } | LogInjectionTest.java:1755:65:1755:72 | source(...) : Object | LogInjectionTest.java:1755:13:1755:103 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1755:65:1755:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1756:13:1756:103 | new ..[] { .. } | LogInjectionTest.java:1756:80:1756:87 | source(...) : Object | LogInjectionTest.java:1756:13:1756:103 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1756:80:1756:87 | source(...) | user-provided value |
+| LogInjectionTest.java:1757:13:1757:103 | new ..[] { .. } | LogInjectionTest.java:1757:95:1757:102 | source(...) : Object | LogInjectionTest.java:1757:13:1757:103 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1757:95:1757:102 | source(...) | user-provided value |
+| LogInjectionTest.java:1758:26:1758:42 | (...)... | LogInjectionTest.java:1758:35:1758:42 | source(...) : Object | LogInjectionTest.java:1758:26:1758:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1758:35:1758:42 | source(...) | user-provided value |
 | LogInjectionTest.java:1759:26:1759:42 | (...)... | LogInjectionTest.java:1759:35:1759:42 | source(...) : Object | LogInjectionTest.java:1759:26:1759:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1759:35:1759:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1760:41:1760:63 | new Object[] | LogInjectionTest.java:1760:55:1760:62 | source(...) : Object | LogInjectionTest.java:1760:41:1760:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1760:55:1760:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1760:41:1760:48 | source(...) | LogInjectionTest.java:1760:41:1760:48 | source(...) | LogInjectionTest.java:1760:41:1760:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1760:41:1760:48 | source(...) | user-provided value |
 | LogInjectionTest.java:1761:26:1761:42 | (...)... | LogInjectionTest.java:1761:35:1761:42 | source(...) : Object | LogInjectionTest.java:1761:26:1761:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1761:35:1761:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1762:41:1762:48 | source(...) | LogInjectionTest.java:1762:41:1762:48 | source(...) | LogInjectionTest.java:1762:41:1762:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1762:41:1762:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1763:56:1763:63 | source(...) | LogInjectionTest.java:1763:56:1763:63 | source(...) | LogInjectionTest.java:1763:56:1763:63 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1763:56:1763:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1764:26:1764:42 | (...)... | LogInjectionTest.java:1764:35:1764:42 | source(...) : Object | LogInjectionTest.java:1764:26:1764:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1764:35:1764:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1765:51:1765:67 | (...)... | LogInjectionTest.java:1765:60:1765:67 | source(...) : Object | LogInjectionTest.java:1765:51:1765:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1765:60:1765:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1766:51:1766:67 | (...)... | LogInjectionTest.java:1766:60:1766:67 | source(...) : Object | LogInjectionTest.java:1766:51:1766:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1766:60:1766:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1767:66:1767:73 | source(...) | LogInjectionTest.java:1767:66:1767:73 | source(...) | LogInjectionTest.java:1767:66:1767:73 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1767:66:1767:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1762:41:1762:63 | new Object[] | LogInjectionTest.java:1762:55:1762:62 | source(...) : Object | LogInjectionTest.java:1762:41:1762:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1762:55:1762:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1763:26:1763:42 | (...)... | LogInjectionTest.java:1763:35:1763:42 | source(...) : Object | LogInjectionTest.java:1763:26:1763:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1763:35:1763:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1764:41:1764:48 | source(...) | LogInjectionTest.java:1764:41:1764:48 | source(...) | LogInjectionTest.java:1764:41:1764:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1764:41:1764:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1765:56:1765:63 | source(...) | LogInjectionTest.java:1765:56:1765:63 | source(...) | LogInjectionTest.java:1765:56:1765:63 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1765:56:1765:63 | source(...) | user-provided value |
+| LogInjectionTest.java:1766:26:1766:42 | (...)... | LogInjectionTest.java:1766:35:1766:42 | source(...) : Object | LogInjectionTest.java:1766:26:1766:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1766:35:1766:42 | source(...) | user-provided value |
+| LogInjectionTest.java:1767:51:1767:67 | (...)... | LogInjectionTest.java:1767:60:1767:67 | source(...) : Object | LogInjectionTest.java:1767:51:1767:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1767:60:1767:67 | source(...) | user-provided value |
 | LogInjectionTest.java:1768:51:1768:67 | (...)... | LogInjectionTest.java:1768:60:1768:67 | source(...) : Object | LogInjectionTest.java:1768:51:1768:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1768:60:1768:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1769:66:1769:88 | new Object[] | LogInjectionTest.java:1769:80:1769:87 | source(...) : Object | LogInjectionTest.java:1769:66:1769:88 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1769:80:1769:87 | source(...) | user-provided value |
+| LogInjectionTest.java:1769:66:1769:73 | source(...) | LogInjectionTest.java:1769:66:1769:73 | source(...) | LogInjectionTest.java:1769:66:1769:73 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1769:66:1769:73 | source(...) | user-provided value |
 | LogInjectionTest.java:1770:51:1770:67 | (...)... | LogInjectionTest.java:1770:60:1770:67 | source(...) : Object | LogInjectionTest.java:1770:51:1770:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1770:60:1770:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1771:66:1771:73 | source(...) | LogInjectionTest.java:1771:66:1771:73 | source(...) | LogInjectionTest.java:1771:66:1771:73 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1771:66:1771:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1772:81:1772:88 | source(...) | LogInjectionTest.java:1772:81:1772:88 | source(...) | LogInjectionTest.java:1772:81:1772:88 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1772:81:1772:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1773:51:1773:67 | (...)... | LogInjectionTest.java:1773:60:1773:67 | source(...) : Object | LogInjectionTest.java:1773:51:1773:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1773:60:1773:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1774:13:1774:104 | new ..[] { .. } | LogInjectionTest.java:1774:66:1774:73 | source(...) : Object | LogInjectionTest.java:1774:13:1774:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1774:66:1774:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1775:13:1775:104 | new ..[] { .. } | LogInjectionTest.java:1775:81:1775:88 | source(...) : Object | LogInjectionTest.java:1775:13:1775:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1775:81:1775:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1776:13:1776:104 | new ..[] { .. } | LogInjectionTest.java:1776:96:1776:103 | source(...) : Object | LogInjectionTest.java:1776:13:1776:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1776:96:1776:103 | source(...) | user-provided value |
-| LogInjectionTest.java:1777:25:1777:41 | (...)... | LogInjectionTest.java:1777:34:1777:41 | source(...) : Object | LogInjectionTest.java:1777:25:1777:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1777:34:1777:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1778:25:1778:41 | (...)... | LogInjectionTest.java:1778:34:1778:41 | source(...) : Object | LogInjectionTest.java:1778:25:1778:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1778:34:1778:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1779:40:1779:47 | source(...) | LogInjectionTest.java:1779:40:1779:47 | source(...) | LogInjectionTest.java:1779:40:1779:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1779:40:1779:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1771:66:1771:88 | new Object[] | LogInjectionTest.java:1771:80:1771:87 | source(...) : Object | LogInjectionTest.java:1771:66:1771:88 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1771:80:1771:87 | source(...) | user-provided value |
+| LogInjectionTest.java:1772:51:1772:67 | (...)... | LogInjectionTest.java:1772:60:1772:67 | source(...) : Object | LogInjectionTest.java:1772:51:1772:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1772:60:1772:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1773:66:1773:73 | source(...) | LogInjectionTest.java:1773:66:1773:73 | source(...) | LogInjectionTest.java:1773:66:1773:73 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1773:66:1773:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1774:81:1774:88 | source(...) | LogInjectionTest.java:1774:81:1774:88 | source(...) | LogInjectionTest.java:1774:81:1774:88 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1774:81:1774:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1775:51:1775:67 | (...)... | LogInjectionTest.java:1775:60:1775:67 | source(...) : Object | LogInjectionTest.java:1775:51:1775:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1775:60:1775:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1776:13:1776:104 | new ..[] { .. } | LogInjectionTest.java:1776:66:1776:73 | source(...) : Object | LogInjectionTest.java:1776:13:1776:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1776:66:1776:73 | source(...) | user-provided value |
+| LogInjectionTest.java:1777:13:1777:104 | new ..[] { .. } | LogInjectionTest.java:1777:81:1777:88 | source(...) : Object | LogInjectionTest.java:1777:13:1777:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1777:81:1777:88 | source(...) | user-provided value |
+| LogInjectionTest.java:1778:13:1778:104 | new ..[] { .. } | LogInjectionTest.java:1778:96:1778:103 | source(...) : Object | LogInjectionTest.java:1778:13:1778:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1778:96:1778:103 | source(...) | user-provided value |
+| LogInjectionTest.java:1779:25:1779:41 | (...)... | LogInjectionTest.java:1779:34:1779:41 | source(...) : Object | LogInjectionTest.java:1779:25:1779:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1779:34:1779:41 | source(...) | user-provided value |
 | LogInjectionTest.java:1780:25:1780:41 | (...)... | LogInjectionTest.java:1780:34:1780:41 | source(...) : Object | LogInjectionTest.java:1780:25:1780:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1780:34:1780:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1781:40:1781:62 | new Object[] | LogInjectionTest.java:1781:54:1781:61 | source(...) : Object | LogInjectionTest.java:1781:40:1781:62 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1781:54:1781:61 | source(...) | user-provided value |
+| LogInjectionTest.java:1781:40:1781:47 | source(...) | LogInjectionTest.java:1781:40:1781:47 | source(...) | LogInjectionTest.java:1781:40:1781:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1781:40:1781:47 | source(...) | user-provided value |
 | LogInjectionTest.java:1782:25:1782:41 | (...)... | LogInjectionTest.java:1782:34:1782:41 | source(...) : Object | LogInjectionTest.java:1782:25:1782:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1782:34:1782:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1783:40:1783:47 | source(...) | LogInjectionTest.java:1783:40:1783:47 | source(...) | LogInjectionTest.java:1783:40:1783:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1783:40:1783:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1784:55:1784:62 | source(...) | LogInjectionTest.java:1784:55:1784:62 | source(...) | LogInjectionTest.java:1784:55:1784:62 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1784:55:1784:62 | source(...) | user-provided value |
-| LogInjectionTest.java:1785:25:1785:41 | (...)... | LogInjectionTest.java:1785:34:1785:41 | source(...) : Object | LogInjectionTest.java:1785:25:1785:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1785:34:1785:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1786:50:1786:66 | (...)... | LogInjectionTest.java:1786:59:1786:66 | source(...) : Object | LogInjectionTest.java:1786:50:1786:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1786:59:1786:66 | source(...) | user-provided value |
-| LogInjectionTest.java:1787:50:1787:66 | (...)... | LogInjectionTest.java:1787:59:1787:66 | source(...) : Object | LogInjectionTest.java:1787:50:1787:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1787:59:1787:66 | source(...) | user-provided value |
-| LogInjectionTest.java:1788:65:1788:72 | source(...) | LogInjectionTest.java:1788:65:1788:72 | source(...) | LogInjectionTest.java:1788:65:1788:72 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1788:65:1788:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1783:40:1783:62 | new Object[] | LogInjectionTest.java:1783:54:1783:61 | source(...) : Object | LogInjectionTest.java:1783:40:1783:62 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1783:54:1783:61 | source(...) | user-provided value |
+| LogInjectionTest.java:1784:25:1784:41 | (...)... | LogInjectionTest.java:1784:34:1784:41 | source(...) : Object | LogInjectionTest.java:1784:25:1784:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1784:34:1784:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1785:40:1785:47 | source(...) | LogInjectionTest.java:1785:40:1785:47 | source(...) | LogInjectionTest.java:1785:40:1785:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1785:40:1785:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1786:55:1786:62 | source(...) | LogInjectionTest.java:1786:55:1786:62 | source(...) | LogInjectionTest.java:1786:55:1786:62 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1786:55:1786:62 | source(...) | user-provided value |
+| LogInjectionTest.java:1787:25:1787:41 | (...)... | LogInjectionTest.java:1787:34:1787:41 | source(...) : Object | LogInjectionTest.java:1787:25:1787:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1787:34:1787:41 | source(...) | user-provided value |
+| LogInjectionTest.java:1788:50:1788:66 | (...)... | LogInjectionTest.java:1788:59:1788:66 | source(...) : Object | LogInjectionTest.java:1788:50:1788:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1788:59:1788:66 | source(...) | user-provided value |
 | LogInjectionTest.java:1789:50:1789:66 | (...)... | LogInjectionTest.java:1789:59:1789:66 | source(...) : Object | LogInjectionTest.java:1789:50:1789:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1789:59:1789:66 | source(...) | user-provided value |
-| LogInjectionTest.java:1790:65:1790:87 | new Object[] | LogInjectionTest.java:1790:79:1790:86 | source(...) : Object | LogInjectionTest.java:1790:65:1790:87 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1790:79:1790:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1790:65:1790:72 | source(...) | LogInjectionTest.java:1790:65:1790:72 | source(...) | LogInjectionTest.java:1790:65:1790:72 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1790:65:1790:72 | source(...) | user-provided value |
 | LogInjectionTest.java:1791:50:1791:66 | (...)... | LogInjectionTest.java:1791:59:1791:66 | source(...) : Object | LogInjectionTest.java:1791:50:1791:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1791:59:1791:66 | source(...) | user-provided value |
-| LogInjectionTest.java:1792:65:1792:72 | source(...) | LogInjectionTest.java:1792:65:1792:72 | source(...) | LogInjectionTest.java:1792:65:1792:72 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1792:65:1792:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1793:80:1793:87 | source(...) | LogInjectionTest.java:1793:80:1793:87 | source(...) | LogInjectionTest.java:1793:80:1793:87 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1793:80:1793:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1794:50:1794:66 | (...)... | LogInjectionTest.java:1794:59:1794:66 | source(...) : Object | LogInjectionTest.java:1794:50:1794:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1794:59:1794:66 | source(...) | user-provided value |
-| LogInjectionTest.java:1795:13:1795:103 | new ..[] { .. } | LogInjectionTest.java:1795:65:1795:72 | source(...) : Object | LogInjectionTest.java:1795:13:1795:103 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1795:65:1795:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1796:13:1796:103 | new ..[] { .. } | LogInjectionTest.java:1796:80:1796:87 | source(...) : Object | LogInjectionTest.java:1796:13:1796:103 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1796:80:1796:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1797:13:1797:103 | new ..[] { .. } | LogInjectionTest.java:1797:95:1797:102 | source(...) : Object | LogInjectionTest.java:1797:13:1797:103 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1797:95:1797:102 | source(...) | user-provided value |
-| LogInjectionTest.java:1798:26:1798:42 | (...)... | LogInjectionTest.java:1798:35:1798:42 | source(...) : Object | LogInjectionTest.java:1798:26:1798:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1798:35:1798:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1799:26:1799:42 | (...)... | LogInjectionTest.java:1799:35:1799:42 | source(...) : Object | LogInjectionTest.java:1799:26:1799:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1799:35:1799:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1800:41:1800:48 | source(...) | LogInjectionTest.java:1800:41:1800:48 | source(...) | LogInjectionTest.java:1800:41:1800:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1800:41:1800:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1801:26:1801:42 | (...)... | LogInjectionTest.java:1801:35:1801:42 | source(...) : Object | LogInjectionTest.java:1801:26:1801:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1801:35:1801:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1802:41:1802:63 | new Object[] | LogInjectionTest.java:1802:55:1802:62 | source(...) : Object | LogInjectionTest.java:1802:41:1802:63 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1802:55:1802:62 | source(...) | user-provided value |
-| LogInjectionTest.java:1803:26:1803:42 | (...)... | LogInjectionTest.java:1803:35:1803:42 | source(...) : Object | LogInjectionTest.java:1803:26:1803:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1803:35:1803:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1804:41:1804:48 | source(...) | LogInjectionTest.java:1804:41:1804:48 | source(...) | LogInjectionTest.java:1804:41:1804:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1804:41:1804:48 | source(...) | user-provided value |
-| LogInjectionTest.java:1805:56:1805:63 | source(...) | LogInjectionTest.java:1805:56:1805:63 | source(...) | LogInjectionTest.java:1805:56:1805:63 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1805:56:1805:63 | source(...) | user-provided value |
-| LogInjectionTest.java:1806:26:1806:42 | (...)... | LogInjectionTest.java:1806:35:1806:42 | source(...) : Object | LogInjectionTest.java:1806:26:1806:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1806:35:1806:42 | source(...) | user-provided value |
-| LogInjectionTest.java:1807:51:1807:67 | (...)... | LogInjectionTest.java:1807:60:1807:67 | source(...) : Object | LogInjectionTest.java:1807:51:1807:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1807:60:1807:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1808:51:1808:67 | (...)... | LogInjectionTest.java:1808:60:1808:67 | source(...) : Object | LogInjectionTest.java:1808:51:1808:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1808:60:1808:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1809:66:1809:73 | source(...) | LogInjectionTest.java:1809:66:1809:73 | source(...) | LogInjectionTest.java:1809:66:1809:73 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1809:66:1809:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1810:51:1810:67 | (...)... | LogInjectionTest.java:1810:60:1810:67 | source(...) : Object | LogInjectionTest.java:1810:51:1810:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1810:60:1810:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1811:66:1811:88 | new Object[] | LogInjectionTest.java:1811:80:1811:87 | source(...) : Object | LogInjectionTest.java:1811:66:1811:88 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1811:80:1811:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1812:51:1812:67 | (...)... | LogInjectionTest.java:1812:60:1812:67 | source(...) : Object | LogInjectionTest.java:1812:51:1812:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1812:60:1812:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1813:66:1813:73 | source(...) | LogInjectionTest.java:1813:66:1813:73 | source(...) | LogInjectionTest.java:1813:66:1813:73 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1813:66:1813:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1814:81:1814:88 | source(...) | LogInjectionTest.java:1814:81:1814:88 | source(...) | LogInjectionTest.java:1814:81:1814:88 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1814:81:1814:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1815:51:1815:67 | (...)... | LogInjectionTest.java:1815:60:1815:67 | source(...) : Object | LogInjectionTest.java:1815:51:1815:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1815:60:1815:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1816:13:1816:104 | new ..[] { .. } | LogInjectionTest.java:1816:66:1816:73 | source(...) : Object | LogInjectionTest.java:1816:13:1816:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1816:66:1816:73 | source(...) | user-provided value |
-| LogInjectionTest.java:1817:13:1817:104 | new ..[] { .. } | LogInjectionTest.java:1817:81:1817:88 | source(...) : Object | LogInjectionTest.java:1817:13:1817:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1817:81:1817:88 | source(...) | user-provided value |
-| LogInjectionTest.java:1818:13:1818:104 | new ..[] { .. } | LogInjectionTest.java:1818:96:1818:103 | source(...) : Object | LogInjectionTest.java:1818:13:1818:104 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1818:96:1818:103 | source(...) | user-provided value |
-| LogInjectionTest.java:1819:25:1819:41 | (...)... | LogInjectionTest.java:1819:34:1819:41 | source(...) : Object | LogInjectionTest.java:1819:25:1819:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1819:34:1819:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1820:25:1820:41 | (...)... | LogInjectionTest.java:1820:34:1820:41 | source(...) : Object | LogInjectionTest.java:1820:25:1820:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1820:34:1820:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1821:40:1821:47 | source(...) | LogInjectionTest.java:1821:40:1821:47 | source(...) | LogInjectionTest.java:1821:40:1821:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1821:40:1821:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1822:25:1822:41 | (...)... | LogInjectionTest.java:1822:34:1822:41 | source(...) : Object | LogInjectionTest.java:1822:25:1822:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1822:34:1822:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1823:40:1823:62 | new Object[] | LogInjectionTest.java:1823:54:1823:61 | source(...) : Object | LogInjectionTest.java:1823:40:1823:62 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1823:54:1823:61 | source(...) | user-provided value |
-| LogInjectionTest.java:1824:25:1824:41 | (...)... | LogInjectionTest.java:1824:34:1824:41 | source(...) : Object | LogInjectionTest.java:1824:25:1824:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1824:34:1824:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1825:40:1825:47 | source(...) | LogInjectionTest.java:1825:40:1825:47 | source(...) | LogInjectionTest.java:1825:40:1825:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1825:40:1825:47 | source(...) | user-provided value |
-| LogInjectionTest.java:1826:55:1826:62 | source(...) | LogInjectionTest.java:1826:55:1826:62 | source(...) | LogInjectionTest.java:1826:55:1826:62 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1826:55:1826:62 | source(...) | user-provided value |
-| LogInjectionTest.java:1827:25:1827:41 | (...)... | LogInjectionTest.java:1827:34:1827:41 | source(...) : Object | LogInjectionTest.java:1827:25:1827:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1827:34:1827:41 | source(...) | user-provided value |
-| LogInjectionTest.java:1828:50:1828:66 | (...)... | LogInjectionTest.java:1828:59:1828:66 | source(...) : Object | LogInjectionTest.java:1828:50:1828:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1828:59:1828:66 | source(...) | user-provided value |
-| LogInjectionTest.java:1829:50:1829:66 | (...)... | LogInjectionTest.java:1829:59:1829:66 | source(...) : Object | LogInjectionTest.java:1829:50:1829:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1829:59:1829:66 | source(...) | user-provided value |
-| LogInjectionTest.java:1830:65:1830:72 | source(...) | LogInjectionTest.java:1830:65:1830:72 | source(...) | LogInjectionTest.java:1830:65:1830:72 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1830:65:1830:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1831:50:1831:66 | (...)... | LogInjectionTest.java:1831:59:1831:66 | source(...) : Object | LogInjectionTest.java:1831:50:1831:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1831:59:1831:66 | source(...) | user-provided value |
-| LogInjectionTest.java:1832:65:1832:87 | new Object[] | LogInjectionTest.java:1832:79:1832:86 | source(...) : Object | LogInjectionTest.java:1832:65:1832:87 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1832:79:1832:86 | source(...) | user-provided value |
-| LogInjectionTest.java:1833:50:1833:66 | (...)... | LogInjectionTest.java:1833:59:1833:66 | source(...) : Object | LogInjectionTest.java:1833:50:1833:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1833:59:1833:66 | source(...) | user-provided value |
-| LogInjectionTest.java:1834:65:1834:72 | source(...) | LogInjectionTest.java:1834:65:1834:72 | source(...) | LogInjectionTest.java:1834:65:1834:72 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1834:65:1834:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1835:80:1835:87 | source(...) | LogInjectionTest.java:1835:80:1835:87 | source(...) | LogInjectionTest.java:1835:80:1835:87 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1835:80:1835:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1836:50:1836:66 | (...)... | LogInjectionTest.java:1836:59:1836:66 | source(...) : Object | LogInjectionTest.java:1836:50:1836:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1836:59:1836:66 | source(...) | user-provided value |
-| LogInjectionTest.java:1837:13:1837:103 | new ..[] { .. } | LogInjectionTest.java:1837:65:1837:72 | source(...) : Object | LogInjectionTest.java:1837:13:1837:103 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1837:65:1837:72 | source(...) | user-provided value |
-| LogInjectionTest.java:1838:13:1838:103 | new ..[] { .. } | LogInjectionTest.java:1838:80:1838:87 | source(...) : Object | LogInjectionTest.java:1838:13:1838:103 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1838:80:1838:87 | source(...) | user-provided value |
-| LogInjectionTest.java:1839:13:1839:103 | new ..[] { .. } | LogInjectionTest.java:1839:95:1839:102 | source(...) : Object | LogInjectionTest.java:1839:13:1839:103 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1839:95:1839:102 | source(...) | user-provided value |
-| LogInjectionTest.java:1844:33:1844:40 | source(...) | LogInjectionTest.java:1844:33:1844:40 | source(...) | LogInjectionTest.java:1844:33:1844:40 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1844:33:1844:40 | source(...) | user-provided value |
-| LogInjectionTest.java:1845:26:1845:33 | source(...) | LogInjectionTest.java:1845:26:1845:33 | source(...) | LogInjectionTest.java:1845:26:1845:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1845:26:1845:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1846:26:1846:33 | source(...) | LogInjectionTest.java:1846:26:1846:33 | source(...) | LogInjectionTest.java:1846:26:1846:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1846:26:1846:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1847:26:1847:33 | source(...) | LogInjectionTest.java:1847:26:1847:33 | source(...) | LogInjectionTest.java:1847:26:1847:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1847:26:1847:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1848:26:1848:33 | source(...) | LogInjectionTest.java:1848:26:1848:33 | source(...) | LogInjectionTest.java:1848:26:1848:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1848:26:1848:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1849:25:1849:32 | source(...) | LogInjectionTest.java:1849:25:1849:32 | source(...) | LogInjectionTest.java:1849:25:1849:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1849:25:1849:32 | source(...) | user-provided value |
-| LogInjectionTest.java:1850:25:1850:32 | source(...) | LogInjectionTest.java:1850:25:1850:32 | source(...) | LogInjectionTest.java:1850:25:1850:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1850:25:1850:32 | source(...) | user-provided value |
-| LogInjectionTest.java:1851:26:1851:33 | source(...) | LogInjectionTest.java:1851:26:1851:33 | source(...) | LogInjectionTest.java:1851:26:1851:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1851:26:1851:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1852:26:1852:33 | source(...) | LogInjectionTest.java:1852:26:1852:33 | source(...) | LogInjectionTest.java:1852:26:1852:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1852:26:1852:33 | source(...) | user-provided value |
-| LogInjectionTest.java:1853:25:1853:32 | source(...) | LogInjectionTest.java:1853:25:1853:32 | source(...) | LogInjectionTest.java:1853:25:1853:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1853:25:1853:32 | source(...) | user-provided value |
-| LogInjectionTest.java:1854:25:1854:32 | source(...) | LogInjectionTest.java:1854:25:1854:32 | source(...) | LogInjectionTest.java:1854:25:1854:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1854:25:1854:32 | source(...) | user-provided value |
-| LogInjectionTest.java:1855:27:1855:34 | source(...) | LogInjectionTest.java:1855:27:1855:34 | source(...) | LogInjectionTest.java:1855:27:1855:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1855:27:1855:34 | source(...) | user-provided value |
-| LogInjectionTest.java:1856:27:1856:34 | source(...) | LogInjectionTest.java:1856:27:1856:34 | source(...) | LogInjectionTest.java:1856:27:1856:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1856:27:1856:34 | source(...) | user-provided value |
-| LogInjectionTest.java:1860:28:1860:44 | (...)... | LogInjectionTest.java:1860:37:1860:44 | source(...) : Object | LogInjectionTest.java:1860:28:1860:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1860:37:1860:44 | source(...) | user-provided value |
-| LogInjectionTest.java:1861:43:1861:65 | new Object[] | LogInjectionTest.java:1861:57:1861:64 | source(...) : Object | LogInjectionTest.java:1861:43:1861:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1861:57:1861:64 | source(...) | user-provided value |
-| LogInjectionTest.java:1863:21:1863:37 | (...)... | LogInjectionTest.java:1863:30:1863:37 | source(...) : Object | LogInjectionTest.java:1863:21:1863:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1863:30:1863:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1864:36:1864:52 | (...)... | LogInjectionTest.java:1864:45:1864:52 | source(...) : Object | LogInjectionTest.java:1864:36:1864:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1864:45:1864:52 | source(...) | user-provided value |
-| LogInjectionTest.java:1865:21:1865:37 | (...)... | LogInjectionTest.java:1865:30:1865:37 | source(...) : Object | LogInjectionTest.java:1865:21:1865:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1865:30:1865:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1866:51:1866:67 | (...)... | LogInjectionTest.java:1866:60:1866:67 | source(...) : Object | LogInjectionTest.java:1866:51:1866:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1866:60:1866:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1867:36:1867:52 | (...)... | LogInjectionTest.java:1867:45:1867:52 | source(...) : Object | LogInjectionTest.java:1867:36:1867:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1867:45:1867:52 | source(...) | user-provided value |
-| LogInjectionTest.java:1868:21:1868:37 | (...)... | LogInjectionTest.java:1868:30:1868:37 | source(...) : Object | LogInjectionTest.java:1868:21:1868:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1868:30:1868:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1869:66:1869:82 | (...)... | LogInjectionTest.java:1869:75:1869:82 | source(...) : Object | LogInjectionTest.java:1869:66:1869:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1869:75:1869:82 | source(...) | user-provided value |
-| LogInjectionTest.java:1870:51:1870:67 | (...)... | LogInjectionTest.java:1870:60:1870:67 | source(...) : Object | LogInjectionTest.java:1870:51:1870:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1870:60:1870:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1871:36:1871:52 | (...)... | LogInjectionTest.java:1871:45:1871:52 | source(...) : Object | LogInjectionTest.java:1871:36:1871:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1871:45:1871:52 | source(...) | user-provided value |
-| LogInjectionTest.java:1872:21:1872:37 | (...)... | LogInjectionTest.java:1872:30:1872:37 | source(...) : Object | LogInjectionTest.java:1872:21:1872:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1872:30:1872:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1792:65:1792:87 | new Object[] | LogInjectionTest.java:1792:79:1792:86 | source(...) : Object | LogInjectionTest.java:1792:65:1792:87 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1792:79:1792:86 | source(...) | user-provided value |
+| LogInjectionTest.java:1793:50:1793:66 | (...)... | LogInjectionTest.java:1793:59:1793:66 | source(...) : Object | LogInjectionTest.java:1793:50:1793:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1793:59:1793:66 | source(...) | user-provided value |
+| LogInjectionTest.java:1794:65:1794:72 | source(...) | LogInjectionTest.java:1794:65:1794:72 | source(...) | LogInjectionTest.java:1794:65:1794:72 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1794:65:1794:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1795:80:1795:87 | source(...) | LogInjectionTest.java:1795:80:1795:87 | source(...) | LogInjectionTest.java:1795:80:1795:87 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1795:80:1795:87 | source(...) | user-provided value |
+| LogInjectionTest.java:1796:50:1796:66 | (...)... | LogInjectionTest.java:1796:59:1796:66 | source(...) : Object | LogInjectionTest.java:1796:50:1796:66 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1796:59:1796:66 | source(...) | user-provided value |
+| LogInjectionTest.java:1797:13:1797:103 | new ..[] { .. } | LogInjectionTest.java:1797:65:1797:72 | source(...) : Object | LogInjectionTest.java:1797:13:1797:103 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1797:65:1797:72 | source(...) | user-provided value |
+| LogInjectionTest.java:1798:13:1798:103 | new ..[] { .. } | LogInjectionTest.java:1798:80:1798:87 | source(...) : Object | LogInjectionTest.java:1798:13:1798:103 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1798:80:1798:87 | source(...) | user-provided value |
+| LogInjectionTest.java:1799:13:1799:103 | new ..[] { .. } | LogInjectionTest.java:1799:95:1799:102 | source(...) : Object | LogInjectionTest.java:1799:13:1799:103 | new ..[] { .. } | This log entry depends on a $@. | LogInjectionTest.java:1799:95:1799:102 | source(...) | user-provided value |
+| LogInjectionTest.java:1804:33:1804:40 | source(...) | LogInjectionTest.java:1804:33:1804:40 | source(...) | LogInjectionTest.java:1804:33:1804:40 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1804:33:1804:40 | source(...) | user-provided value |
+| LogInjectionTest.java:1805:26:1805:33 | source(...) | LogInjectionTest.java:1805:26:1805:33 | source(...) | LogInjectionTest.java:1805:26:1805:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1805:26:1805:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1806:26:1806:33 | source(...) | LogInjectionTest.java:1806:26:1806:33 | source(...) | LogInjectionTest.java:1806:26:1806:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1806:26:1806:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1807:26:1807:33 | source(...) | LogInjectionTest.java:1807:26:1807:33 | source(...) | LogInjectionTest.java:1807:26:1807:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1807:26:1807:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1808:26:1808:33 | source(...) | LogInjectionTest.java:1808:26:1808:33 | source(...) | LogInjectionTest.java:1808:26:1808:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1808:26:1808:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1809:25:1809:32 | source(...) | LogInjectionTest.java:1809:25:1809:32 | source(...) | LogInjectionTest.java:1809:25:1809:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1809:25:1809:32 | source(...) | user-provided value |
+| LogInjectionTest.java:1810:25:1810:32 | source(...) | LogInjectionTest.java:1810:25:1810:32 | source(...) | LogInjectionTest.java:1810:25:1810:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1810:25:1810:32 | source(...) | user-provided value |
+| LogInjectionTest.java:1811:26:1811:33 | source(...) | LogInjectionTest.java:1811:26:1811:33 | source(...) | LogInjectionTest.java:1811:26:1811:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1811:26:1811:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1812:26:1812:33 | source(...) | LogInjectionTest.java:1812:26:1812:33 | source(...) | LogInjectionTest.java:1812:26:1812:33 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1812:26:1812:33 | source(...) | user-provided value |
+| LogInjectionTest.java:1813:25:1813:32 | source(...) | LogInjectionTest.java:1813:25:1813:32 | source(...) | LogInjectionTest.java:1813:25:1813:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1813:25:1813:32 | source(...) | user-provided value |
+| LogInjectionTest.java:1814:25:1814:32 | source(...) | LogInjectionTest.java:1814:25:1814:32 | source(...) | LogInjectionTest.java:1814:25:1814:32 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1814:25:1814:32 | source(...) | user-provided value |
+| LogInjectionTest.java:1815:27:1815:34 | source(...) | LogInjectionTest.java:1815:27:1815:34 | source(...) | LogInjectionTest.java:1815:27:1815:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1815:27:1815:34 | source(...) | user-provided value |
+| LogInjectionTest.java:1816:27:1816:34 | source(...) | LogInjectionTest.java:1816:27:1816:34 | source(...) | LogInjectionTest.java:1816:27:1816:34 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1816:27:1816:34 | source(...) | user-provided value |
+| LogInjectionTest.java:1820:28:1820:44 | (...)... | LogInjectionTest.java:1820:37:1820:44 | source(...) : Object | LogInjectionTest.java:1820:28:1820:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1820:37:1820:44 | source(...) | user-provided value |
+| LogInjectionTest.java:1821:43:1821:65 | new Object[] | LogInjectionTest.java:1821:57:1821:64 | source(...) : Object | LogInjectionTest.java:1821:43:1821:65 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1821:57:1821:64 | source(...) | user-provided value |
+| LogInjectionTest.java:1823:21:1823:37 | (...)... | LogInjectionTest.java:1823:30:1823:37 | source(...) : Object | LogInjectionTest.java:1823:21:1823:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1823:30:1823:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1824:36:1824:52 | (...)... | LogInjectionTest.java:1824:45:1824:52 | source(...) : Object | LogInjectionTest.java:1824:36:1824:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1824:45:1824:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1825:21:1825:37 | (...)... | LogInjectionTest.java:1825:30:1825:37 | source(...) : Object | LogInjectionTest.java:1825:21:1825:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1825:30:1825:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1826:51:1826:67 | (...)... | LogInjectionTest.java:1826:60:1826:67 | source(...) : Object | LogInjectionTest.java:1826:51:1826:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1826:60:1826:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1827:36:1827:52 | (...)... | LogInjectionTest.java:1827:45:1827:52 | source(...) : Object | LogInjectionTest.java:1827:36:1827:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1827:45:1827:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1828:21:1828:37 | (...)... | LogInjectionTest.java:1828:30:1828:37 | source(...) : Object | LogInjectionTest.java:1828:21:1828:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1828:30:1828:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1829:66:1829:82 | (...)... | LogInjectionTest.java:1829:75:1829:82 | source(...) : Object | LogInjectionTest.java:1829:66:1829:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1829:75:1829:82 | source(...) | user-provided value |
+| LogInjectionTest.java:1830:51:1830:67 | (...)... | LogInjectionTest.java:1830:60:1830:67 | source(...) : Object | LogInjectionTest.java:1830:51:1830:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1830:60:1830:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1831:36:1831:52 | (...)... | LogInjectionTest.java:1831:45:1831:52 | source(...) : Object | LogInjectionTest.java:1831:36:1831:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1831:45:1831:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1832:21:1832:37 | (...)... | LogInjectionTest.java:1832:30:1832:37 | source(...) : Object | LogInjectionTest.java:1832:21:1832:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1832:30:1832:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1833:81:1833:97 | (...)... | LogInjectionTest.java:1833:90:1833:97 | source(...) : Object | LogInjectionTest.java:1833:81:1833:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1833:90:1833:97 | source(...) | user-provided value |
+| LogInjectionTest.java:1834:66:1834:82 | (...)... | LogInjectionTest.java:1834:75:1834:82 | source(...) : Object | LogInjectionTest.java:1834:66:1834:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1834:75:1834:82 | source(...) | user-provided value |
+| LogInjectionTest.java:1835:51:1835:67 | (...)... | LogInjectionTest.java:1835:60:1835:67 | source(...) : Object | LogInjectionTest.java:1835:51:1835:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1835:60:1835:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1836:36:1836:52 | (...)... | LogInjectionTest.java:1836:45:1836:52 | source(...) : Object | LogInjectionTest.java:1836:36:1836:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1836:45:1836:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1837:21:1837:37 | (...)... | LogInjectionTest.java:1837:30:1837:37 | source(...) : Object | LogInjectionTest.java:1837:21:1837:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1837:30:1837:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1838:96:1838:112 | (...)... | LogInjectionTest.java:1838:105:1838:112 | source(...) : Object | LogInjectionTest.java:1838:96:1838:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1838:105:1838:112 | source(...) | user-provided value |
+| LogInjectionTest.java:1839:81:1839:97 | (...)... | LogInjectionTest.java:1839:90:1839:97 | source(...) : Object | LogInjectionTest.java:1839:81:1839:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1839:90:1839:97 | source(...) | user-provided value |
+| LogInjectionTest.java:1840:66:1840:82 | (...)... | LogInjectionTest.java:1840:75:1840:82 | source(...) : Object | LogInjectionTest.java:1840:66:1840:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1840:75:1840:82 | source(...) | user-provided value |
+| LogInjectionTest.java:1841:51:1841:67 | (...)... | LogInjectionTest.java:1841:60:1841:67 | source(...) : Object | LogInjectionTest.java:1841:51:1841:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1841:60:1841:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1842:36:1842:52 | (...)... | LogInjectionTest.java:1842:45:1842:52 | source(...) : Object | LogInjectionTest.java:1842:36:1842:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1842:45:1842:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1843:21:1843:37 | (...)... | LogInjectionTest.java:1843:30:1843:37 | source(...) : Object | LogInjectionTest.java:1843:21:1843:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1843:30:1843:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1844:111:1844:127 | (...)... | LogInjectionTest.java:1844:120:1844:127 | source(...) : Object | LogInjectionTest.java:1844:111:1844:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1844:120:1844:127 | source(...) | user-provided value |
+| LogInjectionTest.java:1845:96:1845:112 | (...)... | LogInjectionTest.java:1845:105:1845:112 | source(...) : Object | LogInjectionTest.java:1845:96:1845:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1845:105:1845:112 | source(...) | user-provided value |
+| LogInjectionTest.java:1846:81:1846:97 | (...)... | LogInjectionTest.java:1846:90:1846:97 | source(...) : Object | LogInjectionTest.java:1846:81:1846:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1846:90:1846:97 | source(...) | user-provided value |
+| LogInjectionTest.java:1847:66:1847:82 | (...)... | LogInjectionTest.java:1847:75:1847:82 | source(...) : Object | LogInjectionTest.java:1847:66:1847:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1847:75:1847:82 | source(...) | user-provided value |
+| LogInjectionTest.java:1848:51:1848:67 | (...)... | LogInjectionTest.java:1848:60:1848:67 | source(...) : Object | LogInjectionTest.java:1848:51:1848:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1848:60:1848:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1849:36:1849:52 | (...)... | LogInjectionTest.java:1849:45:1849:52 | source(...) : Object | LogInjectionTest.java:1849:36:1849:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1849:45:1849:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1850:21:1850:37 | (...)... | LogInjectionTest.java:1850:30:1850:37 | source(...) : Object | LogInjectionTest.java:1850:21:1850:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1850:30:1850:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1851:126:1851:142 | (...)... | LogInjectionTest.java:1851:135:1851:142 | source(...) : Object | LogInjectionTest.java:1851:126:1851:142 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1851:135:1851:142 | source(...) | user-provided value |
+| LogInjectionTest.java:1852:111:1852:127 | (...)... | LogInjectionTest.java:1852:120:1852:127 | source(...) : Object | LogInjectionTest.java:1852:111:1852:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1852:120:1852:127 | source(...) | user-provided value |
+| LogInjectionTest.java:1853:96:1853:112 | (...)... | LogInjectionTest.java:1853:105:1853:112 | source(...) : Object | LogInjectionTest.java:1853:96:1853:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1853:105:1853:112 | source(...) | user-provided value |
+| LogInjectionTest.java:1854:81:1854:97 | (...)... | LogInjectionTest.java:1854:90:1854:97 | source(...) : Object | LogInjectionTest.java:1854:81:1854:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1854:90:1854:97 | source(...) | user-provided value |
+| LogInjectionTest.java:1855:66:1855:82 | (...)... | LogInjectionTest.java:1855:75:1855:82 | source(...) : Object | LogInjectionTest.java:1855:66:1855:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1855:75:1855:82 | source(...) | user-provided value |
+| LogInjectionTest.java:1856:51:1856:67 | (...)... | LogInjectionTest.java:1856:60:1856:67 | source(...) : Object | LogInjectionTest.java:1856:51:1856:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1856:60:1856:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1857:36:1857:52 | (...)... | LogInjectionTest.java:1857:45:1857:52 | source(...) : Object | LogInjectionTest.java:1857:36:1857:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1857:45:1857:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1858:21:1858:37 | (...)... | LogInjectionTest.java:1858:30:1858:37 | source(...) : Object | LogInjectionTest.java:1858:21:1858:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1858:30:1858:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1859:141:1859:157 | (...)... | LogInjectionTest.java:1859:150:1859:157 | source(...) : Object | LogInjectionTest.java:1859:141:1859:157 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1859:150:1859:157 | source(...) | user-provided value |
+| LogInjectionTest.java:1860:126:1860:142 | (...)... | LogInjectionTest.java:1860:135:1860:142 | source(...) : Object | LogInjectionTest.java:1860:126:1860:142 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1860:135:1860:142 | source(...) | user-provided value |
+| LogInjectionTest.java:1861:111:1861:127 | (...)... | LogInjectionTest.java:1861:120:1861:127 | source(...) : Object | LogInjectionTest.java:1861:111:1861:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1861:120:1861:127 | source(...) | user-provided value |
+| LogInjectionTest.java:1862:96:1862:112 | (...)... | LogInjectionTest.java:1862:105:1862:112 | source(...) : Object | LogInjectionTest.java:1862:96:1862:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1862:105:1862:112 | source(...) | user-provided value |
+| LogInjectionTest.java:1863:81:1863:97 | (...)... | LogInjectionTest.java:1863:90:1863:97 | source(...) : Object | LogInjectionTest.java:1863:81:1863:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1863:90:1863:97 | source(...) | user-provided value |
+| LogInjectionTest.java:1864:66:1864:82 | (...)... | LogInjectionTest.java:1864:75:1864:82 | source(...) : Object | LogInjectionTest.java:1864:66:1864:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1864:75:1864:82 | source(...) | user-provided value |
+| LogInjectionTest.java:1865:51:1865:67 | (...)... | LogInjectionTest.java:1865:60:1865:67 | source(...) : Object | LogInjectionTest.java:1865:51:1865:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1865:60:1865:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1866:36:1866:52 | (...)... | LogInjectionTest.java:1866:45:1866:52 | source(...) : Object | LogInjectionTest.java:1866:36:1866:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1866:45:1866:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1867:21:1867:37 | (...)... | LogInjectionTest.java:1867:30:1867:37 | source(...) : Object | LogInjectionTest.java:1867:21:1867:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1867:30:1867:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1868:156:1868:172 | (...)... | LogInjectionTest.java:1868:165:1868:172 | source(...) : Object | LogInjectionTest.java:1868:156:1868:172 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1868:165:1868:172 | source(...) | user-provided value |
+| LogInjectionTest.java:1869:141:1869:157 | (...)... | LogInjectionTest.java:1869:150:1869:157 | source(...) : Object | LogInjectionTest.java:1869:141:1869:157 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1869:150:1869:157 | source(...) | user-provided value |
+| LogInjectionTest.java:1870:126:1870:142 | (...)... | LogInjectionTest.java:1870:135:1870:142 | source(...) : Object | LogInjectionTest.java:1870:126:1870:142 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1870:135:1870:142 | source(...) | user-provided value |
+| LogInjectionTest.java:1871:111:1871:127 | (...)... | LogInjectionTest.java:1871:120:1871:127 | source(...) : Object | LogInjectionTest.java:1871:111:1871:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1871:120:1871:127 | source(...) | user-provided value |
+| LogInjectionTest.java:1872:96:1872:112 | (...)... | LogInjectionTest.java:1872:105:1872:112 | source(...) : Object | LogInjectionTest.java:1872:96:1872:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1872:105:1872:112 | source(...) | user-provided value |
 | LogInjectionTest.java:1873:81:1873:97 | (...)... | LogInjectionTest.java:1873:90:1873:97 | source(...) : Object | LogInjectionTest.java:1873:81:1873:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1873:90:1873:97 | source(...) | user-provided value |
 | LogInjectionTest.java:1874:66:1874:82 | (...)... | LogInjectionTest.java:1874:75:1874:82 | source(...) : Object | LogInjectionTest.java:1874:66:1874:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1874:75:1874:82 | source(...) | user-provided value |
 | LogInjectionTest.java:1875:51:1875:67 | (...)... | LogInjectionTest.java:1875:60:1875:67 | source(...) : Object | LogInjectionTest.java:1875:51:1875:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1875:60:1875:67 | source(...) | user-provided value |
 | LogInjectionTest.java:1876:36:1876:52 | (...)... | LogInjectionTest.java:1876:45:1876:52 | source(...) : Object | LogInjectionTest.java:1876:36:1876:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1876:45:1876:52 | source(...) | user-provided value |
 | LogInjectionTest.java:1877:21:1877:37 | (...)... | LogInjectionTest.java:1877:30:1877:37 | source(...) : Object | LogInjectionTest.java:1877:21:1877:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1877:30:1877:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1878:96:1878:112 | (...)... | LogInjectionTest.java:1878:105:1878:112 | source(...) : Object | LogInjectionTest.java:1878:96:1878:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1878:105:1878:112 | source(...) | user-provided value |
-| LogInjectionTest.java:1879:81:1879:97 | (...)... | LogInjectionTest.java:1879:90:1879:97 | source(...) : Object | LogInjectionTest.java:1879:81:1879:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1879:90:1879:97 | source(...) | user-provided value |
-| LogInjectionTest.java:1880:66:1880:82 | (...)... | LogInjectionTest.java:1880:75:1880:82 | source(...) : Object | LogInjectionTest.java:1880:66:1880:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1880:75:1880:82 | source(...) | user-provided value |
-| LogInjectionTest.java:1881:51:1881:67 | (...)... | LogInjectionTest.java:1881:60:1881:67 | source(...) : Object | LogInjectionTest.java:1881:51:1881:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1881:60:1881:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1882:36:1882:52 | (...)... | LogInjectionTest.java:1882:45:1882:52 | source(...) : Object | LogInjectionTest.java:1882:36:1882:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1882:45:1882:52 | source(...) | user-provided value |
-| LogInjectionTest.java:1883:21:1883:37 | (...)... | LogInjectionTest.java:1883:30:1883:37 | source(...) : Object | LogInjectionTest.java:1883:21:1883:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1883:30:1883:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1884:111:1884:127 | (...)... | LogInjectionTest.java:1884:120:1884:127 | source(...) : Object | LogInjectionTest.java:1884:111:1884:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1884:120:1884:127 | source(...) | user-provided value |
-| LogInjectionTest.java:1885:96:1885:112 | (...)... | LogInjectionTest.java:1885:105:1885:112 | source(...) : Object | LogInjectionTest.java:1885:96:1885:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1885:105:1885:112 | source(...) | user-provided value |
-| LogInjectionTest.java:1886:81:1886:97 | (...)... | LogInjectionTest.java:1886:90:1886:97 | source(...) : Object | LogInjectionTest.java:1886:81:1886:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1886:90:1886:97 | source(...) | user-provided value |
-| LogInjectionTest.java:1887:66:1887:82 | (...)... | LogInjectionTest.java:1887:75:1887:82 | source(...) : Object | LogInjectionTest.java:1887:66:1887:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1887:75:1887:82 | source(...) | user-provided value |
-| LogInjectionTest.java:1888:51:1888:67 | (...)... | LogInjectionTest.java:1888:60:1888:67 | source(...) : Object | LogInjectionTest.java:1888:51:1888:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1888:60:1888:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1889:36:1889:52 | (...)... | LogInjectionTest.java:1889:45:1889:52 | source(...) : Object | LogInjectionTest.java:1889:36:1889:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1889:45:1889:52 | source(...) | user-provided value |
-| LogInjectionTest.java:1890:21:1890:37 | (...)... | LogInjectionTest.java:1890:30:1890:37 | source(...) : Object | LogInjectionTest.java:1890:21:1890:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1890:30:1890:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1891:126:1891:142 | (...)... | LogInjectionTest.java:1891:135:1891:142 | source(...) : Object | LogInjectionTest.java:1891:126:1891:142 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1891:135:1891:142 | source(...) | user-provided value |
-| LogInjectionTest.java:1892:111:1892:127 | (...)... | LogInjectionTest.java:1892:120:1892:127 | source(...) : Object | LogInjectionTest.java:1892:111:1892:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1892:120:1892:127 | source(...) | user-provided value |
-| LogInjectionTest.java:1893:96:1893:112 | (...)... | LogInjectionTest.java:1893:105:1893:112 | source(...) : Object | LogInjectionTest.java:1893:96:1893:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1893:105:1893:112 | source(...) | user-provided value |
-| LogInjectionTest.java:1894:81:1894:97 | (...)... | LogInjectionTest.java:1894:90:1894:97 | source(...) : Object | LogInjectionTest.java:1894:81:1894:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1894:90:1894:97 | source(...) | user-provided value |
-| LogInjectionTest.java:1895:66:1895:82 | (...)... | LogInjectionTest.java:1895:75:1895:82 | source(...) : Object | LogInjectionTest.java:1895:66:1895:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1895:75:1895:82 | source(...) | user-provided value |
-| LogInjectionTest.java:1896:51:1896:67 | (...)... | LogInjectionTest.java:1896:60:1896:67 | source(...) : Object | LogInjectionTest.java:1896:51:1896:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1896:60:1896:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1897:36:1897:52 | (...)... | LogInjectionTest.java:1897:45:1897:52 | source(...) : Object | LogInjectionTest.java:1897:36:1897:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1897:45:1897:52 | source(...) | user-provided value |
-| LogInjectionTest.java:1898:21:1898:37 | (...)... | LogInjectionTest.java:1898:30:1898:37 | source(...) : Object | LogInjectionTest.java:1898:21:1898:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1898:30:1898:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1899:141:1899:157 | (...)... | LogInjectionTest.java:1899:150:1899:157 | source(...) : Object | LogInjectionTest.java:1899:141:1899:157 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1899:150:1899:157 | source(...) | user-provided value |
-| LogInjectionTest.java:1900:126:1900:142 | (...)... | LogInjectionTest.java:1900:135:1900:142 | source(...) : Object | LogInjectionTest.java:1900:126:1900:142 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1900:135:1900:142 | source(...) | user-provided value |
-| LogInjectionTest.java:1901:111:1901:127 | (...)... | LogInjectionTest.java:1901:120:1901:127 | source(...) : Object | LogInjectionTest.java:1901:111:1901:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1901:120:1901:127 | source(...) | user-provided value |
-| LogInjectionTest.java:1902:96:1902:112 | (...)... | LogInjectionTest.java:1902:105:1902:112 | source(...) : Object | LogInjectionTest.java:1902:96:1902:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1902:105:1902:112 | source(...) | user-provided value |
-| LogInjectionTest.java:1903:81:1903:97 | (...)... | LogInjectionTest.java:1903:90:1903:97 | source(...) : Object | LogInjectionTest.java:1903:81:1903:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1903:90:1903:97 | source(...) | user-provided value |
-| LogInjectionTest.java:1904:66:1904:82 | (...)... | LogInjectionTest.java:1904:75:1904:82 | source(...) : Object | LogInjectionTest.java:1904:66:1904:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1904:75:1904:82 | source(...) | user-provided value |
-| LogInjectionTest.java:1905:51:1905:67 | (...)... | LogInjectionTest.java:1905:60:1905:67 | source(...) : Object | LogInjectionTest.java:1905:51:1905:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1905:60:1905:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1906:36:1906:52 | (...)... | LogInjectionTest.java:1906:45:1906:52 | source(...) : Object | LogInjectionTest.java:1906:36:1906:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1906:45:1906:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1878:171:1878:187 | (...)... | LogInjectionTest.java:1878:180:1878:187 | source(...) : Object | LogInjectionTest.java:1878:171:1878:187 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1878:180:1878:187 | source(...) | user-provided value |
+| LogInjectionTest.java:1879:156:1879:172 | (...)... | LogInjectionTest.java:1879:165:1879:172 | source(...) : Object | LogInjectionTest.java:1879:156:1879:172 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1879:165:1879:172 | source(...) | user-provided value |
+| LogInjectionTest.java:1880:141:1880:157 | (...)... | LogInjectionTest.java:1880:150:1880:157 | source(...) : Object | LogInjectionTest.java:1880:141:1880:157 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1880:150:1880:157 | source(...) | user-provided value |
+| LogInjectionTest.java:1881:126:1881:142 | (...)... | LogInjectionTest.java:1881:135:1881:142 | source(...) : Object | LogInjectionTest.java:1881:126:1881:142 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1881:135:1881:142 | source(...) | user-provided value |
+| LogInjectionTest.java:1882:111:1882:127 | (...)... | LogInjectionTest.java:1882:120:1882:127 | source(...) : Object | LogInjectionTest.java:1882:111:1882:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1882:120:1882:127 | source(...) | user-provided value |
+| LogInjectionTest.java:1883:96:1883:112 | (...)... | LogInjectionTest.java:1883:105:1883:112 | source(...) : Object | LogInjectionTest.java:1883:96:1883:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1883:105:1883:112 | source(...) | user-provided value |
+| LogInjectionTest.java:1884:81:1884:97 | (...)... | LogInjectionTest.java:1884:90:1884:97 | source(...) : Object | LogInjectionTest.java:1884:81:1884:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1884:90:1884:97 | source(...) | user-provided value |
+| LogInjectionTest.java:1885:66:1885:82 | (...)... | LogInjectionTest.java:1885:75:1885:82 | source(...) : Object | LogInjectionTest.java:1885:66:1885:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1885:75:1885:82 | source(...) | user-provided value |
+| LogInjectionTest.java:1886:51:1886:67 | (...)... | LogInjectionTest.java:1886:60:1886:67 | source(...) : Object | LogInjectionTest.java:1886:51:1886:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1886:60:1886:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1887:36:1887:52 | (...)... | LogInjectionTest.java:1887:45:1887:52 | source(...) : Object | LogInjectionTest.java:1887:36:1887:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1887:45:1887:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1888:21:1888:37 | (...)... | LogInjectionTest.java:1888:30:1888:37 | source(...) : Object | LogInjectionTest.java:1888:21:1888:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1888:30:1888:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1889:186:1889:207 | new Object[] | LogInjectionTest.java:1889:199:1889:206 | source(...) : Object | LogInjectionTest.java:1889:186:1889:207 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1889:199:1889:206 | source(...) | user-provided value |
+| LogInjectionTest.java:1890:171:1890:187 | (...)... | LogInjectionTest.java:1890:180:1890:187 | source(...) : Object | LogInjectionTest.java:1890:171:1890:187 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1890:180:1890:187 | source(...) | user-provided value |
+| LogInjectionTest.java:1891:156:1891:172 | (...)... | LogInjectionTest.java:1891:165:1891:172 | source(...) : Object | LogInjectionTest.java:1891:156:1891:172 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1891:165:1891:172 | source(...) | user-provided value |
+| LogInjectionTest.java:1892:141:1892:157 | (...)... | LogInjectionTest.java:1892:150:1892:157 | source(...) : Object | LogInjectionTest.java:1892:141:1892:157 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1892:150:1892:157 | source(...) | user-provided value |
+| LogInjectionTest.java:1893:126:1893:142 | (...)... | LogInjectionTest.java:1893:135:1893:142 | source(...) : Object | LogInjectionTest.java:1893:126:1893:142 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1893:135:1893:142 | source(...) | user-provided value |
+| LogInjectionTest.java:1894:111:1894:127 | (...)... | LogInjectionTest.java:1894:120:1894:127 | source(...) : Object | LogInjectionTest.java:1894:111:1894:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1894:120:1894:127 | source(...) | user-provided value |
+| LogInjectionTest.java:1895:96:1895:112 | (...)... | LogInjectionTest.java:1895:105:1895:112 | source(...) : Object | LogInjectionTest.java:1895:96:1895:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1895:105:1895:112 | source(...) | user-provided value |
+| LogInjectionTest.java:1896:81:1896:97 | (...)... | LogInjectionTest.java:1896:90:1896:97 | source(...) : Object | LogInjectionTest.java:1896:81:1896:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1896:90:1896:97 | source(...) | user-provided value |
+| LogInjectionTest.java:1897:66:1897:82 | (...)... | LogInjectionTest.java:1897:75:1897:82 | source(...) : Object | LogInjectionTest.java:1897:66:1897:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1897:75:1897:82 | source(...) | user-provided value |
+| LogInjectionTest.java:1898:51:1898:67 | (...)... | LogInjectionTest.java:1898:60:1898:67 | source(...) : Object | LogInjectionTest.java:1898:51:1898:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1898:60:1898:67 | source(...) | user-provided value |
+| LogInjectionTest.java:1899:36:1899:52 | (...)... | LogInjectionTest.java:1899:45:1899:52 | source(...) : Object | LogInjectionTest.java:1899:36:1899:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1899:45:1899:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1900:21:1900:37 | (...)... | LogInjectionTest.java:1900:30:1900:37 | source(...) : Object | LogInjectionTest.java:1900:21:1900:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1900:30:1900:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1902:21:1902:37 | (...)... | LogInjectionTest.java:1902:30:1902:37 | source(...) : Object | LogInjectionTest.java:1902:21:1902:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1902:30:1902:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1903:21:1903:37 | (...)... | LogInjectionTest.java:1903:30:1903:37 | source(...) : Object | LogInjectionTest.java:1903:21:1903:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1903:30:1903:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1904:21:1904:37 | (...)... | LogInjectionTest.java:1904:30:1904:37 | source(...) : Object | LogInjectionTest.java:1904:21:1904:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1904:30:1904:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1905:21:1905:37 | (...)... | LogInjectionTest.java:1905:30:1905:37 | source(...) : Object | LogInjectionTest.java:1905:21:1905:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1905:30:1905:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1906:21:1906:37 | (...)... | LogInjectionTest.java:1906:30:1906:37 | source(...) : Object | LogInjectionTest.java:1906:21:1906:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1906:30:1906:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1907:21:1907:37 | (...)... | LogInjectionTest.java:1907:30:1907:37 | source(...) : Object | LogInjectionTest.java:1907:21:1907:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1907:30:1907:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1908:156:1908:172 | (...)... | LogInjectionTest.java:1908:165:1908:172 | source(...) : Object | LogInjectionTest.java:1908:156:1908:172 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1908:165:1908:172 | source(...) | user-provided value |
-| LogInjectionTest.java:1909:141:1909:157 | (...)... | LogInjectionTest.java:1909:150:1909:157 | source(...) : Object | LogInjectionTest.java:1909:141:1909:157 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1909:150:1909:157 | source(...) | user-provided value |
-| LogInjectionTest.java:1910:126:1910:142 | (...)... | LogInjectionTest.java:1910:135:1910:142 | source(...) : Object | LogInjectionTest.java:1910:126:1910:142 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1910:135:1910:142 | source(...) | user-provided value |
-| LogInjectionTest.java:1911:111:1911:127 | (...)... | LogInjectionTest.java:1911:120:1911:127 | source(...) : Object | LogInjectionTest.java:1911:111:1911:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1911:120:1911:127 | source(...) | user-provided value |
-| LogInjectionTest.java:1912:96:1912:112 | (...)... | LogInjectionTest.java:1912:105:1912:112 | source(...) : Object | LogInjectionTest.java:1912:96:1912:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1912:105:1912:112 | source(...) | user-provided value |
-| LogInjectionTest.java:1913:81:1913:97 | (...)... | LogInjectionTest.java:1913:90:1913:97 | source(...) : Object | LogInjectionTest.java:1913:81:1913:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1913:90:1913:97 | source(...) | user-provided value |
-| LogInjectionTest.java:1914:66:1914:82 | (...)... | LogInjectionTest.java:1914:75:1914:82 | source(...) : Object | LogInjectionTest.java:1914:66:1914:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1914:75:1914:82 | source(...) | user-provided value |
-| LogInjectionTest.java:1915:51:1915:67 | (...)... | LogInjectionTest.java:1915:60:1915:67 | source(...) : Object | LogInjectionTest.java:1915:51:1915:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1915:60:1915:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1916:36:1916:52 | (...)... | LogInjectionTest.java:1916:45:1916:52 | source(...) : Object | LogInjectionTest.java:1916:36:1916:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1916:45:1916:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1908:36:1908:43 | source(...) | LogInjectionTest.java:1908:36:1908:43 | source(...) | LogInjectionTest.java:1908:36:1908:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1908:36:1908:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1909:21:1909:37 | (...)... | LogInjectionTest.java:1909:30:1909:37 | source(...) : Object | LogInjectionTest.java:1909:21:1909:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1909:30:1909:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1910:36:1910:43 | source(...) | LogInjectionTest.java:1910:36:1910:43 | source(...) | LogInjectionTest.java:1910:36:1910:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1910:36:1910:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1911:21:1911:37 | (...)... | LogInjectionTest.java:1911:30:1911:37 | source(...) : Object | LogInjectionTest.java:1911:21:1911:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1911:30:1911:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1912:36:1912:43 | source(...) | LogInjectionTest.java:1912:36:1912:43 | source(...) | LogInjectionTest.java:1912:36:1912:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1912:36:1912:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1913:21:1913:37 | (...)... | LogInjectionTest.java:1913:30:1913:37 | source(...) : Object | LogInjectionTest.java:1913:21:1913:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1913:30:1913:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1914:36:1914:43 | source(...) | LogInjectionTest.java:1914:36:1914:43 | source(...) | LogInjectionTest.java:1914:36:1914:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1914:36:1914:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1915:21:1915:37 | (...)... | LogInjectionTest.java:1915:30:1915:37 | source(...) : Object | LogInjectionTest.java:1915:21:1915:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1915:30:1915:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1916:36:1916:43 | source(...) | LogInjectionTest.java:1916:36:1916:43 | source(...) | LogInjectionTest.java:1916:36:1916:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1916:36:1916:43 | source(...) | user-provided value |
 | LogInjectionTest.java:1917:21:1917:37 | (...)... | LogInjectionTest.java:1917:30:1917:37 | source(...) : Object | LogInjectionTest.java:1917:21:1917:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1917:30:1917:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1918:171:1918:187 | (...)... | LogInjectionTest.java:1918:180:1918:187 | source(...) : Object | LogInjectionTest.java:1918:171:1918:187 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1918:180:1918:187 | source(...) | user-provided value |
-| LogInjectionTest.java:1919:156:1919:172 | (...)... | LogInjectionTest.java:1919:165:1919:172 | source(...) : Object | LogInjectionTest.java:1919:156:1919:172 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1919:165:1919:172 | source(...) | user-provided value |
-| LogInjectionTest.java:1920:141:1920:157 | (...)... | LogInjectionTest.java:1920:150:1920:157 | source(...) : Object | LogInjectionTest.java:1920:141:1920:157 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1920:150:1920:157 | source(...) | user-provided value |
-| LogInjectionTest.java:1921:126:1921:142 | (...)... | LogInjectionTest.java:1921:135:1921:142 | source(...) : Object | LogInjectionTest.java:1921:126:1921:142 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1921:135:1921:142 | source(...) | user-provided value |
-| LogInjectionTest.java:1922:111:1922:127 | (...)... | LogInjectionTest.java:1922:120:1922:127 | source(...) : Object | LogInjectionTest.java:1922:111:1922:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1922:120:1922:127 | source(...) | user-provided value |
-| LogInjectionTest.java:1923:96:1923:112 | (...)... | LogInjectionTest.java:1923:105:1923:112 | source(...) : Object | LogInjectionTest.java:1923:96:1923:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1923:105:1923:112 | source(...) | user-provided value |
-| LogInjectionTest.java:1924:81:1924:97 | (...)... | LogInjectionTest.java:1924:90:1924:97 | source(...) : Object | LogInjectionTest.java:1924:81:1924:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1924:90:1924:97 | source(...) | user-provided value |
-| LogInjectionTest.java:1925:66:1925:82 | (...)... | LogInjectionTest.java:1925:75:1925:82 | source(...) : Object | LogInjectionTest.java:1925:66:1925:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1925:75:1925:82 | source(...) | user-provided value |
-| LogInjectionTest.java:1926:51:1926:67 | (...)... | LogInjectionTest.java:1926:60:1926:67 | source(...) : Object | LogInjectionTest.java:1926:51:1926:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1926:60:1926:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1927:36:1927:52 | (...)... | LogInjectionTest.java:1927:45:1927:52 | source(...) : Object | LogInjectionTest.java:1927:36:1927:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1927:45:1927:52 | source(...) | user-provided value |
-| LogInjectionTest.java:1928:21:1928:37 | (...)... | LogInjectionTest.java:1928:30:1928:37 | source(...) : Object | LogInjectionTest.java:1928:21:1928:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1928:30:1928:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1929:186:1929:207 | new Object[] | LogInjectionTest.java:1929:199:1929:206 | source(...) : Object | LogInjectionTest.java:1929:186:1929:207 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:1929:199:1929:206 | source(...) | user-provided value |
-| LogInjectionTest.java:1930:171:1930:187 | (...)... | LogInjectionTest.java:1930:180:1930:187 | source(...) : Object | LogInjectionTest.java:1930:171:1930:187 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1930:180:1930:187 | source(...) | user-provided value |
-| LogInjectionTest.java:1931:156:1931:172 | (...)... | LogInjectionTest.java:1931:165:1931:172 | source(...) : Object | LogInjectionTest.java:1931:156:1931:172 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1931:165:1931:172 | source(...) | user-provided value |
-| LogInjectionTest.java:1932:141:1932:157 | (...)... | LogInjectionTest.java:1932:150:1932:157 | source(...) : Object | LogInjectionTest.java:1932:141:1932:157 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1932:150:1932:157 | source(...) | user-provided value |
-| LogInjectionTest.java:1933:126:1933:142 | (...)... | LogInjectionTest.java:1933:135:1933:142 | source(...) : Object | LogInjectionTest.java:1933:126:1933:142 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1933:135:1933:142 | source(...) | user-provided value |
-| LogInjectionTest.java:1934:111:1934:127 | (...)... | LogInjectionTest.java:1934:120:1934:127 | source(...) : Object | LogInjectionTest.java:1934:111:1934:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1934:120:1934:127 | source(...) | user-provided value |
-| LogInjectionTest.java:1935:96:1935:112 | (...)... | LogInjectionTest.java:1935:105:1935:112 | source(...) : Object | LogInjectionTest.java:1935:96:1935:112 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1935:105:1935:112 | source(...) | user-provided value |
-| LogInjectionTest.java:1936:81:1936:97 | (...)... | LogInjectionTest.java:1936:90:1936:97 | source(...) : Object | LogInjectionTest.java:1936:81:1936:97 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1936:90:1936:97 | source(...) | user-provided value |
-| LogInjectionTest.java:1937:66:1937:82 | (...)... | LogInjectionTest.java:1937:75:1937:82 | source(...) : Object | LogInjectionTest.java:1937:66:1937:82 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1937:75:1937:82 | source(...) | user-provided value |
-| LogInjectionTest.java:1938:51:1938:67 | (...)... | LogInjectionTest.java:1938:60:1938:67 | source(...) : Object | LogInjectionTest.java:1938:51:1938:67 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1938:60:1938:67 | source(...) | user-provided value |
-| LogInjectionTest.java:1939:36:1939:52 | (...)... | LogInjectionTest.java:1939:45:1939:52 | source(...) : Object | LogInjectionTest.java:1939:36:1939:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1939:45:1939:52 | source(...) | user-provided value |
+| LogInjectionTest.java:1918:36:1918:43 | source(...) | LogInjectionTest.java:1918:36:1918:43 | source(...) | LogInjectionTest.java:1918:36:1918:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1918:36:1918:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1919:21:1919:37 | (...)... | LogInjectionTest.java:1919:30:1919:37 | source(...) : Object | LogInjectionTest.java:1919:21:1919:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1919:30:1919:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1920:36:1920:43 | source(...) | LogInjectionTest.java:1920:36:1920:43 | source(...) | LogInjectionTest.java:1920:36:1920:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1920:36:1920:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1921:21:1921:37 | (...)... | LogInjectionTest.java:1921:30:1921:37 | source(...) : Object | LogInjectionTest.java:1921:21:1921:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1921:30:1921:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1922:36:1922:43 | source(...) | LogInjectionTest.java:1922:36:1922:43 | source(...) | LogInjectionTest.java:1922:36:1922:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1922:36:1922:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1923:21:1923:37 | (...)... | LogInjectionTest.java:1923:30:1923:37 | source(...) : Object | LogInjectionTest.java:1923:21:1923:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1923:30:1923:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1924:43:1924:50 | source(...) | LogInjectionTest.java:1924:43:1924:50 | source(...) | LogInjectionTest.java:1924:43:1924:50 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1924:43:1924:50 | source(...) | user-provided value |
+| LogInjectionTest.java:1925:21:1925:37 | (...)... | LogInjectionTest.java:1925:30:1925:37 | source(...) : Object | LogInjectionTest.java:1925:21:1925:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1925:30:1925:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1926:41:1926:48 | source(...) | LogInjectionTest.java:1926:41:1926:48 | source(...) | LogInjectionTest.java:1926:41:1926:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1926:41:1926:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1927:21:1927:37 | (...)... | LogInjectionTest.java:1927:30:1927:37 | source(...) : Object | LogInjectionTest.java:1927:21:1927:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1927:30:1927:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1928:46:1928:53 | source(...) | LogInjectionTest.java:1928:46:1928:53 | source(...) | LogInjectionTest.java:1928:46:1928:53 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1928:46:1928:53 | source(...) | user-provided value |
+| LogInjectionTest.java:1929:21:1929:37 | (...)... | LogInjectionTest.java:1929:30:1929:37 | source(...) : Object | LogInjectionTest.java:1929:21:1929:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1929:30:1929:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1930:47:1930:54 | source(...) | LogInjectionTest.java:1930:47:1930:54 | source(...) | LogInjectionTest.java:1930:47:1930:54 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1930:47:1930:54 | source(...) | user-provided value |
+| LogInjectionTest.java:1931:21:1931:37 | (...)... | LogInjectionTest.java:1931:30:1931:37 | source(...) : Object | LogInjectionTest.java:1931:21:1931:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1931:30:1931:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1932:39:1932:46 | source(...) | LogInjectionTest.java:1932:39:1932:46 | source(...) | LogInjectionTest.java:1932:39:1932:46 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1932:39:1932:46 | source(...) | user-provided value |
+| LogInjectionTest.java:1933:21:1933:37 | (...)... | LogInjectionTest.java:1933:30:1933:37 | source(...) : Object | LogInjectionTest.java:1933:21:1933:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1933:30:1933:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1934:40:1934:47 | source(...) | LogInjectionTest.java:1934:40:1934:47 | source(...) | LogInjectionTest.java:1934:40:1934:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1934:40:1934:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1935:21:1935:37 | (...)... | LogInjectionTest.java:1935:30:1935:37 | source(...) : Object | LogInjectionTest.java:1935:21:1935:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1935:30:1935:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1936:47:1936:54 | source(...) | LogInjectionTest.java:1936:47:1936:54 | source(...) | LogInjectionTest.java:1936:47:1936:54 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1936:47:1936:54 | source(...) | user-provided value |
+| LogInjectionTest.java:1937:21:1937:37 | (...)... | LogInjectionTest.java:1937:30:1937:37 | source(...) : Object | LogInjectionTest.java:1937:21:1937:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1937:30:1937:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1938:48:1938:55 | source(...) | LogInjectionTest.java:1938:48:1938:55 | source(...) | LogInjectionTest.java:1938:48:1938:55 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1938:48:1938:55 | source(...) | user-provided value |
+| LogInjectionTest.java:1939:21:1939:37 | (...)... | LogInjectionTest.java:1939:30:1939:37 | source(...) : Object | LogInjectionTest.java:1939:21:1939:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1939:30:1939:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1940:21:1940:37 | (...)... | LogInjectionTest.java:1940:30:1940:37 | source(...) : Object | LogInjectionTest.java:1940:21:1940:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1940:30:1940:37 | source(...) | user-provided value |
+| LogInjectionTest.java:1941:21:1941:37 | (...)... | LogInjectionTest.java:1941:30:1941:37 | source(...) : Object | LogInjectionTest.java:1941:21:1941:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1941:30:1941:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1942:21:1942:37 | (...)... | LogInjectionTest.java:1942:30:1942:37 | source(...) : Object | LogInjectionTest.java:1942:21:1942:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1942:30:1942:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1943:21:1943:37 | (...)... | LogInjectionTest.java:1943:30:1943:37 | source(...) : Object | LogInjectionTest.java:1943:21:1943:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1943:30:1943:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1944:21:1944:37 | (...)... | LogInjectionTest.java:1944:30:1944:37 | source(...) : Object | LogInjectionTest.java:1944:21:1944:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1944:30:1944:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1945:21:1945:37 | (...)... | LogInjectionTest.java:1945:30:1945:37 | source(...) : Object | LogInjectionTest.java:1945:21:1945:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1945:30:1945:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1946:21:1946:37 | (...)... | LogInjectionTest.java:1946:30:1946:37 | source(...) : Object | LogInjectionTest.java:1946:21:1946:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1946:30:1946:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1947:21:1947:37 | (...)... | LogInjectionTest.java:1947:30:1947:37 | source(...) : Object | LogInjectionTest.java:1947:21:1947:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1947:30:1947:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1948:36:1948:43 | source(...) | LogInjectionTest.java:1948:36:1948:43 | source(...) | LogInjectionTest.java:1948:36:1948:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1948:36:1948:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1948:21:1948:37 | (...)... | LogInjectionTest.java:1948:30:1948:37 | source(...) : Object | LogInjectionTest.java:1948:21:1948:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1948:30:1948:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1949:21:1949:37 | (...)... | LogInjectionTest.java:1949:30:1949:37 | source(...) : Object | LogInjectionTest.java:1949:21:1949:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1949:30:1949:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1950:36:1950:43 | source(...) | LogInjectionTest.java:1950:36:1950:43 | source(...) | LogInjectionTest.java:1950:36:1950:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1950:36:1950:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1950:21:1950:37 | (...)... | LogInjectionTest.java:1950:30:1950:37 | source(...) : Object | LogInjectionTest.java:1950:21:1950:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1950:30:1950:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1951:21:1951:37 | (...)... | LogInjectionTest.java:1951:30:1951:37 | source(...) : Object | LogInjectionTest.java:1951:21:1951:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1951:30:1951:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1952:36:1952:43 | source(...) | LogInjectionTest.java:1952:36:1952:43 | source(...) | LogInjectionTest.java:1952:36:1952:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1952:36:1952:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1952:21:1952:37 | (...)... | LogInjectionTest.java:1952:30:1952:37 | source(...) : Object | LogInjectionTest.java:1952:21:1952:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1952:30:1952:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1953:21:1953:37 | (...)... | LogInjectionTest.java:1953:30:1953:37 | source(...) : Object | LogInjectionTest.java:1953:21:1953:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1953:30:1953:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1954:36:1954:43 | source(...) | LogInjectionTest.java:1954:36:1954:43 | source(...) | LogInjectionTest.java:1954:36:1954:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1954:36:1954:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1954:21:1954:37 | (...)... | LogInjectionTest.java:1954:30:1954:37 | source(...) : Object | LogInjectionTest.java:1954:21:1954:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1954:30:1954:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1955:21:1955:37 | (...)... | LogInjectionTest.java:1955:30:1955:37 | source(...) : Object | LogInjectionTest.java:1955:21:1955:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1955:30:1955:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1956:36:1956:43 | source(...) | LogInjectionTest.java:1956:36:1956:43 | source(...) | LogInjectionTest.java:1956:36:1956:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1956:36:1956:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1956:21:1956:37 | (...)... | LogInjectionTest.java:1956:30:1956:37 | source(...) : Object | LogInjectionTest.java:1956:21:1956:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1956:30:1956:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1957:21:1957:37 | (...)... | LogInjectionTest.java:1957:30:1957:37 | source(...) : Object | LogInjectionTest.java:1957:21:1957:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1957:30:1957:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1958:36:1958:43 | source(...) | LogInjectionTest.java:1958:36:1958:43 | source(...) | LogInjectionTest.java:1958:36:1958:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1958:36:1958:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1958:21:1958:37 | (...)... | LogInjectionTest.java:1958:30:1958:37 | source(...) : Object | LogInjectionTest.java:1958:21:1958:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1958:30:1958:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1959:21:1959:37 | (...)... | LogInjectionTest.java:1959:30:1959:37 | source(...) : Object | LogInjectionTest.java:1959:21:1959:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1959:30:1959:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1960:36:1960:43 | source(...) | LogInjectionTest.java:1960:36:1960:43 | source(...) | LogInjectionTest.java:1960:36:1960:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1960:36:1960:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1960:21:1960:37 | (...)... | LogInjectionTest.java:1960:30:1960:37 | source(...) : Object | LogInjectionTest.java:1960:21:1960:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1960:30:1960:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1961:21:1961:37 | (...)... | LogInjectionTest.java:1961:30:1961:37 | source(...) : Object | LogInjectionTest.java:1961:21:1961:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1961:30:1961:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1962:36:1962:43 | source(...) | LogInjectionTest.java:1962:36:1962:43 | source(...) | LogInjectionTest.java:1962:36:1962:43 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1962:36:1962:43 | source(...) | user-provided value |
+| LogInjectionTest.java:1962:21:1962:37 | (...)... | LogInjectionTest.java:1962:30:1962:37 | source(...) : Object | LogInjectionTest.java:1962:21:1962:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1962:30:1962:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1963:21:1963:37 | (...)... | LogInjectionTest.java:1963:30:1963:37 | source(...) : Object | LogInjectionTest.java:1963:21:1963:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1963:30:1963:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1964:43:1964:50 | source(...) | LogInjectionTest.java:1964:43:1964:50 | source(...) | LogInjectionTest.java:1964:43:1964:50 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1964:43:1964:50 | source(...) | user-provided value |
+| LogInjectionTest.java:1964:21:1964:37 | (...)... | LogInjectionTest.java:1964:30:1964:37 | source(...) : Object | LogInjectionTest.java:1964:21:1964:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1964:30:1964:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1965:21:1965:37 | (...)... | LogInjectionTest.java:1965:30:1965:37 | source(...) : Object | LogInjectionTest.java:1965:21:1965:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1965:30:1965:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1966:41:1966:48 | source(...) | LogInjectionTest.java:1966:41:1966:48 | source(...) | LogInjectionTest.java:1966:41:1966:48 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1966:41:1966:48 | source(...) | user-provided value |
+| LogInjectionTest.java:1966:21:1966:37 | (...)... | LogInjectionTest.java:1966:30:1966:37 | source(...) : Object | LogInjectionTest.java:1966:21:1966:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1966:30:1966:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1967:21:1967:37 | (...)... | LogInjectionTest.java:1967:30:1967:37 | source(...) : Object | LogInjectionTest.java:1967:21:1967:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1967:30:1967:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1968:46:1968:53 | source(...) | LogInjectionTest.java:1968:46:1968:53 | source(...) | LogInjectionTest.java:1968:46:1968:53 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1968:46:1968:53 | source(...) | user-provided value |
+| LogInjectionTest.java:1968:21:1968:37 | (...)... | LogInjectionTest.java:1968:30:1968:37 | source(...) : Object | LogInjectionTest.java:1968:21:1968:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1968:30:1968:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1969:21:1969:37 | (...)... | LogInjectionTest.java:1969:30:1969:37 | source(...) : Object | LogInjectionTest.java:1969:21:1969:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1969:30:1969:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1970:47:1970:54 | source(...) | LogInjectionTest.java:1970:47:1970:54 | source(...) | LogInjectionTest.java:1970:47:1970:54 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1970:47:1970:54 | source(...) | user-provided value |
+| LogInjectionTest.java:1970:21:1970:37 | (...)... | LogInjectionTest.java:1970:30:1970:37 | source(...) : Object | LogInjectionTest.java:1970:21:1970:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1970:30:1970:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1971:21:1971:37 | (...)... | LogInjectionTest.java:1971:30:1971:37 | source(...) : Object | LogInjectionTest.java:1971:21:1971:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1971:30:1971:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1972:39:1972:46 | source(...) | LogInjectionTest.java:1972:39:1972:46 | source(...) | LogInjectionTest.java:1972:39:1972:46 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1972:39:1972:46 | source(...) | user-provided value |
+| LogInjectionTest.java:1972:21:1972:37 | (...)... | LogInjectionTest.java:1972:30:1972:37 | source(...) : Object | LogInjectionTest.java:1972:21:1972:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1972:30:1972:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1973:21:1973:37 | (...)... | LogInjectionTest.java:1973:30:1973:37 | source(...) : Object | LogInjectionTest.java:1973:21:1973:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1973:30:1973:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1974:40:1974:47 | source(...) | LogInjectionTest.java:1974:40:1974:47 | source(...) | LogInjectionTest.java:1974:40:1974:47 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1974:40:1974:47 | source(...) | user-provided value |
+| LogInjectionTest.java:1974:21:1974:37 | (...)... | LogInjectionTest.java:1974:30:1974:37 | source(...) : Object | LogInjectionTest.java:1974:21:1974:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1974:30:1974:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1975:21:1975:37 | (...)... | LogInjectionTest.java:1975:30:1975:37 | source(...) : Object | LogInjectionTest.java:1975:21:1975:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1975:30:1975:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1976:47:1976:54 | source(...) | LogInjectionTest.java:1976:47:1976:54 | source(...) | LogInjectionTest.java:1976:47:1976:54 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1976:47:1976:54 | source(...) | user-provided value |
+| LogInjectionTest.java:1976:21:1976:37 | (...)... | LogInjectionTest.java:1976:30:1976:37 | source(...) : Object | LogInjectionTest.java:1976:21:1976:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1976:30:1976:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1977:21:1977:37 | (...)... | LogInjectionTest.java:1977:30:1977:37 | source(...) : Object | LogInjectionTest.java:1977:21:1977:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1977:30:1977:37 | source(...) | user-provided value |
-| LogInjectionTest.java:1978:48:1978:55 | source(...) | LogInjectionTest.java:1978:48:1978:55 | source(...) | LogInjectionTest.java:1978:48:1978:55 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:1978:48:1978:55 | source(...) | user-provided value |
+| LogInjectionTest.java:1978:21:1978:37 | (...)... | LogInjectionTest.java:1978:30:1978:37 | source(...) : Object | LogInjectionTest.java:1978:21:1978:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1978:30:1978:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1979:21:1979:37 | (...)... | LogInjectionTest.java:1979:30:1979:37 | source(...) : Object | LogInjectionTest.java:1979:21:1979:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1979:30:1979:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1980:21:1980:37 | (...)... | LogInjectionTest.java:1980:30:1980:37 | source(...) : Object | LogInjectionTest.java:1980:21:1980:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1980:30:1980:37 | source(...) | user-provided value |
 | LogInjectionTest.java:1981:21:1981:37 | (...)... | LogInjectionTest.java:1981:30:1981:37 | source(...) : Object | LogInjectionTest.java:1981:21:1981:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:1981:30:1981:37 | source(...) | user-provided value |
@@ -1763,2142 +1805,2105 @@
 | LogInjectionTest.java:2000:21:2000:37 | (...)... | LogInjectionTest.java:2000:30:2000:37 | source(...) : Object | LogInjectionTest.java:2000:21:2000:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2000:30:2000:37 | source(...) | user-provided value |
 | LogInjectionTest.java:2001:21:2001:37 | (...)... | LogInjectionTest.java:2001:30:2001:37 | source(...) : Object | LogInjectionTest.java:2001:21:2001:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2001:30:2001:37 | source(...) | user-provided value |
 | LogInjectionTest.java:2002:21:2002:37 | (...)... | LogInjectionTest.java:2002:30:2002:37 | source(...) : Object | LogInjectionTest.java:2002:21:2002:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2002:30:2002:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2003:21:2003:37 | (...)... | LogInjectionTest.java:2003:30:2003:37 | source(...) : Object | LogInjectionTest.java:2003:21:2003:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2003:30:2003:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2004:21:2004:37 | (...)... | LogInjectionTest.java:2004:30:2004:37 | source(...) : Object | LogInjectionTest.java:2004:21:2004:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2004:30:2004:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2005:21:2005:37 | (...)... | LogInjectionTest.java:2005:30:2005:37 | source(...) : Object | LogInjectionTest.java:2005:21:2005:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2005:30:2005:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2006:21:2006:37 | (...)... | LogInjectionTest.java:2006:30:2006:37 | source(...) : Object | LogInjectionTest.java:2006:21:2006:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2006:30:2006:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2007:21:2007:37 | (...)... | LogInjectionTest.java:2007:30:2007:37 | source(...) : Object | LogInjectionTest.java:2007:21:2007:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2007:30:2007:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2008:21:2008:37 | (...)... | LogInjectionTest.java:2008:30:2008:37 | source(...) : Object | LogInjectionTest.java:2008:21:2008:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2008:30:2008:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2009:21:2009:37 | (...)... | LogInjectionTest.java:2009:30:2009:37 | source(...) : Object | LogInjectionTest.java:2009:21:2009:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2009:30:2009:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2010:21:2010:37 | (...)... | LogInjectionTest.java:2010:30:2010:37 | source(...) : Object | LogInjectionTest.java:2010:21:2010:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2010:30:2010:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2011:21:2011:37 | (...)... | LogInjectionTest.java:2011:30:2011:37 | source(...) : Object | LogInjectionTest.java:2011:21:2011:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2011:30:2011:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2012:21:2012:37 | (...)... | LogInjectionTest.java:2012:30:2012:37 | source(...) : Object | LogInjectionTest.java:2012:21:2012:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2012:30:2012:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2013:21:2013:37 | (...)... | LogInjectionTest.java:2013:30:2013:37 | source(...) : Object | LogInjectionTest.java:2013:21:2013:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2013:30:2013:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2014:21:2014:37 | (...)... | LogInjectionTest.java:2014:30:2014:37 | source(...) : Object | LogInjectionTest.java:2014:21:2014:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2014:30:2014:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2015:21:2015:37 | (...)... | LogInjectionTest.java:2015:30:2015:37 | source(...) : Object | LogInjectionTest.java:2015:21:2015:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2015:30:2015:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2016:21:2016:37 | (...)... | LogInjectionTest.java:2016:30:2016:37 | source(...) : Object | LogInjectionTest.java:2016:21:2016:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2016:30:2016:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2017:21:2017:37 | (...)... | LogInjectionTest.java:2017:30:2017:37 | source(...) : Object | LogInjectionTest.java:2017:21:2017:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2017:30:2017:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2018:21:2018:37 | (...)... | LogInjectionTest.java:2018:30:2018:37 | source(...) : Object | LogInjectionTest.java:2018:21:2018:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2018:30:2018:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2019:21:2019:37 | (...)... | LogInjectionTest.java:2019:30:2019:37 | source(...) : Object | LogInjectionTest.java:2019:21:2019:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2019:30:2019:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2020:21:2020:37 | (...)... | LogInjectionTest.java:2020:30:2020:37 | source(...) : Object | LogInjectionTest.java:2020:21:2020:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2020:30:2020:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2021:21:2021:37 | (...)... | LogInjectionTest.java:2021:30:2021:37 | source(...) : Object | LogInjectionTest.java:2021:21:2021:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2021:30:2021:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2022:21:2022:37 | (...)... | LogInjectionTest.java:2022:30:2022:37 | source(...) : Object | LogInjectionTest.java:2022:21:2022:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2022:30:2022:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2023:21:2023:37 | (...)... | LogInjectionTest.java:2023:30:2023:37 | source(...) : Object | LogInjectionTest.java:2023:21:2023:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2023:30:2023:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2024:21:2024:37 | (...)... | LogInjectionTest.java:2024:30:2024:37 | source(...) : Object | LogInjectionTest.java:2024:21:2024:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2024:30:2024:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2025:21:2025:37 | (...)... | LogInjectionTest.java:2025:30:2025:37 | source(...) : Object | LogInjectionTest.java:2025:21:2025:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2025:30:2025:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2026:21:2026:37 | (...)... | LogInjectionTest.java:2026:30:2026:37 | source(...) : Object | LogInjectionTest.java:2026:21:2026:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2026:30:2026:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2027:21:2027:37 | (...)... | LogInjectionTest.java:2027:30:2027:37 | source(...) : Object | LogInjectionTest.java:2027:21:2027:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2027:30:2027:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2028:21:2028:37 | (...)... | LogInjectionTest.java:2028:30:2028:37 | source(...) : Object | LogInjectionTest.java:2028:21:2028:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2028:30:2028:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2029:21:2029:37 | (...)... | LogInjectionTest.java:2029:30:2029:37 | source(...) : Object | LogInjectionTest.java:2029:21:2029:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2029:30:2029:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2030:21:2030:37 | (...)... | LogInjectionTest.java:2030:30:2030:37 | source(...) : Object | LogInjectionTest.java:2030:21:2030:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2030:30:2030:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2031:21:2031:37 | (...)... | LogInjectionTest.java:2031:30:2031:37 | source(...) : Object | LogInjectionTest.java:2031:21:2031:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2031:30:2031:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2032:21:2032:37 | (...)... | LogInjectionTest.java:2032:30:2032:37 | source(...) : Object | LogInjectionTest.java:2032:21:2032:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2032:30:2032:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2033:21:2033:37 | (...)... | LogInjectionTest.java:2033:30:2033:37 | source(...) : Object | LogInjectionTest.java:2033:21:2033:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2033:30:2033:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2034:21:2034:37 | (...)... | LogInjectionTest.java:2034:30:2034:37 | source(...) : Object | LogInjectionTest.java:2034:21:2034:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2034:30:2034:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2035:21:2035:37 | (...)... | LogInjectionTest.java:2035:30:2035:37 | source(...) : Object | LogInjectionTest.java:2035:21:2035:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2035:30:2035:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2036:21:2036:37 | (...)... | LogInjectionTest.java:2036:30:2036:37 | source(...) : Object | LogInjectionTest.java:2036:21:2036:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2036:30:2036:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2037:21:2037:37 | (...)... | LogInjectionTest.java:2037:30:2037:37 | source(...) : Object | LogInjectionTest.java:2037:21:2037:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2037:30:2037:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2038:21:2038:37 | (...)... | LogInjectionTest.java:2038:30:2038:37 | source(...) : Object | LogInjectionTest.java:2038:21:2038:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2038:30:2038:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2039:21:2039:37 | (...)... | LogInjectionTest.java:2039:30:2039:37 | source(...) : Object | LogInjectionTest.java:2039:21:2039:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2039:30:2039:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2040:21:2040:37 | (...)... | LogInjectionTest.java:2040:30:2040:37 | source(...) : Object | LogInjectionTest.java:2040:21:2040:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2040:30:2040:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2041:21:2041:37 | (...)... | LogInjectionTest.java:2041:30:2041:37 | source(...) : Object | LogInjectionTest.java:2041:21:2041:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2041:30:2041:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2042:21:2042:37 | (...)... | LogInjectionTest.java:2042:30:2042:37 | source(...) : Object | LogInjectionTest.java:2042:21:2042:37 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2042:30:2042:37 | source(...) | user-provided value |
-| LogInjectionTest.java:2047:27:2047:43 | (...)... | LogInjectionTest.java:2047:36:2047:43 | source(...) : Object | LogInjectionTest.java:2047:27:2047:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2047:36:2047:43 | source(...) | user-provided value |
-| LogInjectionTest.java:2048:27:2048:64 | (...)... | LogInjectionTest.java:2048:57:2048:64 | source(...) : Object | LogInjectionTest.java:2048:27:2048:64 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2048:57:2048:64 | source(...) | user-provided value |
-| LogInjectionTest.java:2049:25:2049:41 | (...)... | LogInjectionTest.java:2049:34:2049:41 | source(...) : Object | LogInjectionTest.java:2049:25:2049:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2049:34:2049:41 | source(...) | user-provided value |
-| LogInjectionTest.java:2050:25:2050:62 | (...)... | LogInjectionTest.java:2050:55:2050:62 | source(...) : Object | LogInjectionTest.java:2050:25:2050:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2050:55:2050:62 | source(...) | user-provided value |
-| LogInjectionTest.java:2051:26:2051:42 | (...)... | LogInjectionTest.java:2051:35:2051:42 | source(...) : Object | LogInjectionTest.java:2051:26:2051:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2051:35:2051:42 | source(...) | user-provided value |
-| LogInjectionTest.java:2052:26:2052:63 | (...)... | LogInjectionTest.java:2052:56:2052:63 | source(...) : Object | LogInjectionTest.java:2052:26:2052:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2052:56:2052:63 | source(...) | user-provided value |
-| LogInjectionTest.java:2053:27:2053:43 | (...)... | LogInjectionTest.java:2053:36:2053:43 | source(...) : Object | LogInjectionTest.java:2053:27:2053:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2053:36:2053:43 | source(...) | user-provided value |
-| LogInjectionTest.java:2054:27:2054:64 | (...)... | LogInjectionTest.java:2054:57:2054:64 | source(...) : Object | LogInjectionTest.java:2054:27:2054:64 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2054:57:2054:64 | source(...) | user-provided value |
-| LogInjectionTest.java:2055:25:2055:41 | (...)... | LogInjectionTest.java:2055:34:2055:41 | source(...) : Object | LogInjectionTest.java:2055:25:2055:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2055:34:2055:41 | source(...) | user-provided value |
-| LogInjectionTest.java:2056:25:2056:62 | (...)... | LogInjectionTest.java:2056:55:2056:62 | source(...) : Object | LogInjectionTest.java:2056:25:2056:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2056:55:2056:62 | source(...) | user-provided value |
-| LogInjectionTest.java:2057:27:2057:43 | (...)... | LogInjectionTest.java:2057:36:2057:43 | source(...) : Object | LogInjectionTest.java:2057:27:2057:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2057:36:2057:43 | source(...) | user-provided value |
-| LogInjectionTest.java:2058:27:2058:64 | (...)... | LogInjectionTest.java:2058:57:2058:64 | source(...) : Object | LogInjectionTest.java:2058:27:2058:64 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2058:57:2058:64 | source(...) | user-provided value |
-| LogInjectionTest.java:2059:28:2059:44 | (...)... | LogInjectionTest.java:2059:37:2059:44 | source(...) : Object | LogInjectionTest.java:2059:28:2059:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2059:37:2059:44 | source(...) | user-provided value |
-| LogInjectionTest.java:2060:28:2060:65 | (...)... | LogInjectionTest.java:2060:58:2060:65 | source(...) : Object | LogInjectionTest.java:2060:28:2060:65 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2060:58:2060:65 | source(...) | user-provided value |
-| LogInjectionTest.java:2061:29:2061:45 | (...)... | LogInjectionTest.java:2061:38:2061:45 | source(...) : Object | LogInjectionTest.java:2061:29:2061:45 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2061:38:2061:45 | source(...) | user-provided value |
-| LogInjectionTest.java:2062:44:2062:60 | (...)... | LogInjectionTest.java:2062:53:2062:60 | source(...) : Object | LogInjectionTest.java:2062:44:2062:60 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2062:53:2062:60 | source(...) | user-provided value |
-| LogInjectionTest.java:2063:29:2063:45 | (...)... | LogInjectionTest.java:2063:38:2063:45 | source(...) : Object | LogInjectionTest.java:2063:29:2063:45 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2063:38:2063:45 | source(...) | user-provided value |
-| LogInjectionTest.java:2064:44:2064:60 | (...)... | LogInjectionTest.java:2064:53:2064:60 | source(...) : Object | LogInjectionTest.java:2064:44:2064:60 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2064:53:2064:60 | source(...) | user-provided value |
-| LogInjectionTest.java:2065:59:2065:75 | (...)... | LogInjectionTest.java:2065:68:2065:75 | source(...) : Object | LogInjectionTest.java:2065:59:2065:75 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2065:68:2065:75 | source(...) | user-provided value |
-| LogInjectionTest.java:2066:29:2066:45 | (...)... | LogInjectionTest.java:2066:38:2066:45 | source(...) : Object | LogInjectionTest.java:2066:29:2066:45 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2066:38:2066:45 | source(...) | user-provided value |
-| LogInjectionTest.java:2067:44:2067:60 | (...)... | LogInjectionTest.java:2067:53:2067:60 | source(...) : Object | LogInjectionTest.java:2067:44:2067:60 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2067:53:2067:60 | source(...) | user-provided value |
-| LogInjectionTest.java:2068:59:2068:81 | new Object[] | LogInjectionTest.java:2068:73:2068:80 | source(...) : Object | LogInjectionTest.java:2068:59:2068:81 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:2068:73:2068:80 | source(...) | user-provided value |
-| LogInjectionTest.java:2069:28:2069:44 | (...)... | LogInjectionTest.java:2069:37:2069:44 | source(...) : Object | LogInjectionTest.java:2069:28:2069:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2069:37:2069:44 | source(...) | user-provided value |
-| LogInjectionTest.java:2070:43:2070:59 | (...)... | LogInjectionTest.java:2070:52:2070:59 | source(...) : Object | LogInjectionTest.java:2070:43:2070:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2070:52:2070:59 | source(...) | user-provided value |
-| LogInjectionTest.java:2071:28:2071:44 | (...)... | LogInjectionTest.java:2071:37:2071:44 | source(...) : Object | LogInjectionTest.java:2071:28:2071:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2071:37:2071:44 | source(...) | user-provided value |
-| LogInjectionTest.java:2072:43:2072:59 | (...)... | LogInjectionTest.java:2072:52:2072:59 | source(...) : Object | LogInjectionTest.java:2072:43:2072:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2072:52:2072:59 | source(...) | user-provided value |
-| LogInjectionTest.java:2073:58:2073:74 | (...)... | LogInjectionTest.java:2073:67:2073:74 | source(...) : Object | LogInjectionTest.java:2073:58:2073:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2073:67:2073:74 | source(...) | user-provided value |
-| LogInjectionTest.java:2074:56:2074:72 | (...)... | LogInjectionTest.java:2074:65:2074:72 | source(...) : Object | LogInjectionTest.java:2074:56:2074:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2074:65:2074:72 | source(...) | user-provided value |
-| LogInjectionTest.java:2075:56:2075:72 | (...)... | LogInjectionTest.java:2075:65:2075:72 | source(...) : Object | LogInjectionTest.java:2075:56:2075:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2075:65:2075:72 | source(...) | user-provided value |
-| LogInjectionTest.java:2076:71:2076:78 | source(...) | LogInjectionTest.java:2076:71:2076:78 | source(...) | LogInjectionTest.java:2076:71:2076:78 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:2076:71:2076:78 | source(...) | user-provided value |
-| LogInjectionTest.java:2077:56:2077:72 | (...)... | LogInjectionTest.java:2077:65:2077:72 | source(...) : Object | LogInjectionTest.java:2077:56:2077:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2077:65:2077:72 | source(...) | user-provided value |
-| LogInjectionTest.java:2078:71:2078:92 | new Object[] | LogInjectionTest.java:2078:84:2078:91 | source(...) : Object | LogInjectionTest.java:2078:71:2078:92 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:2078:84:2078:91 | source(...) | user-provided value |
-| LogInjectionTest.java:2079:56:2079:72 | (...)... | LogInjectionTest.java:2079:65:2079:72 | source(...) : Object | LogInjectionTest.java:2079:56:2079:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2079:65:2079:72 | source(...) | user-provided value |
-| LogInjectionTest.java:2080:56:2080:93 | (...)... | LogInjectionTest.java:2080:86:2080:93 | source(...) : Object | LogInjectionTest.java:2080:56:2080:93 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2080:86:2080:93 | source(...) | user-provided value |
-| LogInjectionTest.java:2081:74:2081:111 | (...)... | LogInjectionTest.java:2081:104:2081:111 | source(...) : Object | LogInjectionTest.java:2081:74:2081:111 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2081:104:2081:111 | source(...) | user-provided value |
-| LogInjectionTest.java:2082:24:2082:43 | (...)... | LogInjectionTest.java:2082:36:2082:43 | source(...) : Object | LogInjectionTest.java:2082:24:2082:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2082:36:2082:43 | source(...) | user-provided value |
-| LogInjectionTest.java:2083:57:2083:73 | (...)... | LogInjectionTest.java:2083:66:2083:73 | source(...) : Object | LogInjectionTest.java:2083:57:2083:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2083:66:2083:73 | source(...) | user-provided value |
-| LogInjectionTest.java:2084:72:2084:88 | (...)... | LogInjectionTest.java:2084:81:2084:88 | source(...) : Object | LogInjectionTest.java:2084:72:2084:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2084:81:2084:88 | source(...) | user-provided value |
-| LogInjectionTest.java:2085:87:2085:103 | (...)... | LogInjectionTest.java:2085:96:2085:103 | source(...) : Object | LogInjectionTest.java:2085:87:2085:103 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2085:96:2085:103 | source(...) | user-provided value |
-| LogInjectionTest.java:2086:57:2086:73 | (...)... | LogInjectionTest.java:2086:66:2086:73 | source(...) : Object | LogInjectionTest.java:2086:57:2086:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2086:66:2086:73 | source(...) | user-provided value |
-| LogInjectionTest.java:2087:72:2087:88 | (...)... | LogInjectionTest.java:2087:81:2087:88 | source(...) : Object | LogInjectionTest.java:2087:72:2087:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2087:81:2087:88 | source(...) | user-provided value |
-| LogInjectionTest.java:2088:87:2088:103 | (...)... | LogInjectionTest.java:2088:96:2088:103 | source(...) : Object | LogInjectionTest.java:2088:87:2088:103 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2088:96:2088:103 | source(...) | user-provided value |
-| LogInjectionTest.java:2089:102:2089:109 | source(...) | LogInjectionTest.java:2089:102:2089:109 | source(...) | LogInjectionTest.java:2089:102:2089:109 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:2089:102:2089:109 | source(...) | user-provided value |
-| LogInjectionTest.java:2090:57:2090:73 | (...)... | LogInjectionTest.java:2090:66:2090:73 | source(...) : Object | LogInjectionTest.java:2090:57:2090:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2090:66:2090:73 | source(...) | user-provided value |
-| LogInjectionTest.java:2091:72:2091:88 | (...)... | LogInjectionTest.java:2091:81:2091:88 | source(...) : Object | LogInjectionTest.java:2091:72:2091:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2091:81:2091:88 | source(...) | user-provided value |
-| LogInjectionTest.java:2092:87:2092:103 | (...)... | LogInjectionTest.java:2092:96:2092:103 | source(...) : Object | LogInjectionTest.java:2092:87:2092:103 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2092:96:2092:103 | source(...) | user-provided value |
-| LogInjectionTest.java:2093:102:2093:124 | new Object[] | LogInjectionTest.java:2093:116:2093:123 | source(...) : Object | LogInjectionTest.java:2093:102:2093:124 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:2093:116:2093:123 | source(...) | user-provided value |
-| LogInjectionTest.java:2094:57:2094:73 | (...)... | LogInjectionTest.java:2094:66:2094:73 | source(...) : Object | LogInjectionTest.java:2094:57:2094:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2094:66:2094:73 | source(...) | user-provided value |
-| LogInjectionTest.java:2095:72:2095:88 | (...)... | LogInjectionTest.java:2095:81:2095:88 | source(...) : Object | LogInjectionTest.java:2095:72:2095:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2095:81:2095:88 | source(...) | user-provided value |
-| LogInjectionTest.java:2096:87:2096:103 | (...)... | LogInjectionTest.java:2096:96:2096:103 | source(...) : Object | LogInjectionTest.java:2096:87:2096:103 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2096:96:2096:103 | source(...) | user-provided value |
-| LogInjectionTest.java:2097:57:2097:73 | (...)... | LogInjectionTest.java:2097:66:2097:73 | source(...) : Object | LogInjectionTest.java:2097:57:2097:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2097:66:2097:73 | source(...) | user-provided value |
-| LogInjectionTest.java:2098:72:2098:88 | (...)... | LogInjectionTest.java:2098:81:2098:88 | source(...) : Object | LogInjectionTest.java:2098:72:2098:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2098:81:2098:88 | source(...) | user-provided value |
-| LogInjectionTest.java:2099:87:2099:124 | (...)... | LogInjectionTest.java:2099:117:2099:124 | source(...) : Object | LogInjectionTest.java:2099:87:2099:124 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2099:117:2099:124 | source(...) | user-provided value |
-| LogInjectionTest.java:2100:57:2100:73 | (...)... | LogInjectionTest.java:2100:66:2100:73 | source(...) : Object | LogInjectionTest.java:2100:57:2100:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2100:66:2100:73 | source(...) | user-provided value |
-| LogInjectionTest.java:2101:72:2101:88 | (...)... | LogInjectionTest.java:2101:81:2101:88 | source(...) : Object | LogInjectionTest.java:2101:72:2101:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2101:81:2101:88 | source(...) | user-provided value |
-| LogInjectionTest.java:2102:105:2102:142 | (...)... | LogInjectionTest.java:2102:135:2102:142 | source(...) : Object | LogInjectionTest.java:2102:105:2102:142 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2102:135:2102:142 | source(...) | user-provided value |
-| LogInjectionTest.java:2103:58:2103:74 | (...)... | LogInjectionTest.java:2103:67:2103:74 | source(...) : Object | LogInjectionTest.java:2103:58:2103:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2103:67:2103:74 | source(...) | user-provided value |
-| LogInjectionTest.java:2104:73:2104:89 | (...)... | LogInjectionTest.java:2104:82:2104:89 | source(...) : Object | LogInjectionTest.java:2104:73:2104:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2104:82:2104:89 | source(...) | user-provided value |
-| LogInjectionTest.java:2105:111:2105:127 | (...)... | LogInjectionTest.java:2105:120:2105:127 | source(...) : Object | LogInjectionTest.java:2105:111:2105:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2105:120:2105:127 | source(...) | user-provided value |
-| LogInjectionTest.java:2106:126:2106:148 | new Object[] | LogInjectionTest.java:2106:140:2106:147 | source(...) : Object | LogInjectionTest.java:2106:126:2106:148 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:2106:140:2106:147 | source(...) | user-provided value |
-| LogInjectionTest.java:2107:58:2107:74 | (...)... | LogInjectionTest.java:2107:67:2107:74 | source(...) : Object | LogInjectionTest.java:2107:58:2107:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2107:67:2107:74 | source(...) | user-provided value |
-| LogInjectionTest.java:2108:73:2108:89 | (...)... | LogInjectionTest.java:2108:82:2108:89 | source(...) : Object | LogInjectionTest.java:2108:73:2108:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2108:82:2108:89 | source(...) | user-provided value |
-| LogInjectionTest.java:2109:111:2109:127 | (...)... | LogInjectionTest.java:2109:120:2109:127 | source(...) : Object | LogInjectionTest.java:2109:111:2109:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2109:120:2109:127 | source(...) | user-provided value |
-| LogInjectionTest.java:2110:58:2110:74 | (...)... | LogInjectionTest.java:2110:67:2110:74 | source(...) : Object | LogInjectionTest.java:2110:58:2110:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2110:67:2110:74 | source(...) | user-provided value |
-| LogInjectionTest.java:2111:73:2111:89 | (...)... | LogInjectionTest.java:2111:82:2111:89 | source(...) : Object | LogInjectionTest.java:2111:73:2111:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2111:82:2111:89 | source(...) | user-provided value |
-| LogInjectionTest.java:2112:88:2112:104 | (...)... | LogInjectionTest.java:2112:97:2112:104 | source(...) : Object | LogInjectionTest.java:2112:88:2112:104 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2112:97:2112:104 | source(...) | user-provided value |
-| LogInjectionTest.java:2113:103:2113:119 | (...)... | LogInjectionTest.java:2113:112:2113:119 | source(...) : Object | LogInjectionTest.java:2113:103:2113:119 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2113:112:2113:119 | source(...) | user-provided value |
-| LogInjectionTest.java:2114:58:2114:74 | (...)... | LogInjectionTest.java:2114:67:2114:74 | source(...) : Object | LogInjectionTest.java:2114:58:2114:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2114:67:2114:74 | source(...) | user-provided value |
-| LogInjectionTest.java:2115:73:2115:89 | (...)... | LogInjectionTest.java:2115:82:2115:89 | source(...) : Object | LogInjectionTest.java:2115:73:2115:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2115:82:2115:89 | source(...) | user-provided value |
-| LogInjectionTest.java:2116:88:2116:104 | (...)... | LogInjectionTest.java:2116:97:2116:104 | source(...) : Object | LogInjectionTest.java:2116:88:2116:104 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2116:97:2116:104 | source(...) | user-provided value |
-| LogInjectionTest.java:2117:103:2117:119 | (...)... | LogInjectionTest.java:2117:112:2117:119 | source(...) : Object | LogInjectionTest.java:2117:103:2117:119 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2117:112:2117:119 | source(...) | user-provided value |
-| LogInjectionTest.java:2118:118:2118:125 | source(...) | LogInjectionTest.java:2118:118:2118:125 | source(...) | LogInjectionTest.java:2118:118:2118:125 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:2118:118:2118:125 | source(...) | user-provided value |
-| LogInjectionTest.java:2119:58:2119:74 | (...)... | LogInjectionTest.java:2119:67:2119:74 | source(...) : Object | LogInjectionTest.java:2119:58:2119:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2119:67:2119:74 | source(...) | user-provided value |
-| LogInjectionTest.java:2120:73:2120:89 | (...)... | LogInjectionTest.java:2120:82:2120:89 | source(...) : Object | LogInjectionTest.java:2120:73:2120:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2120:82:2120:89 | source(...) | user-provided value |
-| LogInjectionTest.java:2121:88:2121:104 | (...)... | LogInjectionTest.java:2121:97:2121:104 | source(...) : Object | LogInjectionTest.java:2121:88:2121:104 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2121:97:2121:104 | source(...) | user-provided value |
-| LogInjectionTest.java:2122:103:2122:119 | (...)... | LogInjectionTest.java:2122:112:2122:119 | source(...) : Object | LogInjectionTest.java:2122:103:2122:119 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2122:112:2122:119 | source(...) | user-provided value |
-| LogInjectionTest.java:2123:118:2123:140 | new Object[] | LogInjectionTest.java:2123:132:2123:139 | source(...) : Object | LogInjectionTest.java:2123:118:2123:140 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:2123:132:2123:139 | source(...) | user-provided value |
-| LogInjectionTest.java:2124:58:2124:74 | (...)... | LogInjectionTest.java:2124:67:2124:74 | source(...) : Object | LogInjectionTest.java:2124:58:2124:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2124:67:2124:74 | source(...) | user-provided value |
-| LogInjectionTest.java:2125:73:2125:89 | (...)... | LogInjectionTest.java:2125:82:2125:89 | source(...) : Object | LogInjectionTest.java:2125:73:2125:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2125:82:2125:89 | source(...) | user-provided value |
-| LogInjectionTest.java:2126:88:2126:104 | (...)... | LogInjectionTest.java:2126:97:2126:104 | source(...) : Object | LogInjectionTest.java:2126:88:2126:104 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2126:97:2126:104 | source(...) | user-provided value |
-| LogInjectionTest.java:2127:103:2127:119 | (...)... | LogInjectionTest.java:2127:112:2127:119 | source(...) : Object | LogInjectionTest.java:2127:103:2127:119 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2127:112:2127:119 | source(...) | user-provided value |
-| LogInjectionTest.java:2131:36:2131:52 | (...)... | LogInjectionTest.java:2131:45:2131:52 | source(...) : Object | LogInjectionTest.java:2131:36:2131:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2131:45:2131:52 | source(...) | user-provided value |
-| LogInjectionTest.java:2132:36:2132:52 | (...)... | LogInjectionTest.java:2132:45:2132:52 | source(...) : Object | LogInjectionTest.java:2132:36:2132:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2132:45:2132:52 | source(...) | user-provided value |
-| LogInjectionTest.java:2133:36:2133:52 | (...)... | LogInjectionTest.java:2133:45:2133:52 | source(...) : Object | LogInjectionTest.java:2133:36:2133:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2133:45:2133:52 | source(...) | user-provided value |
-| LogInjectionTest.java:2134:36:2134:52 | (...)... | LogInjectionTest.java:2134:45:2134:52 | source(...) : Object | LogInjectionTest.java:2134:36:2134:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2134:45:2134:52 | source(...) | user-provided value |
-| LogInjectionTest.java:2135:36:2135:52 | (...)... | LogInjectionTest.java:2135:45:2135:52 | source(...) : Object | LogInjectionTest.java:2135:36:2135:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2135:45:2135:52 | source(...) | user-provided value |
-| LogInjectionTest.java:2136:38:2136:54 | (...)... | LogInjectionTest.java:2136:47:2136:54 | source(...) : Object | LogInjectionTest.java:2136:38:2136:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2136:47:2136:54 | source(...) | user-provided value |
-| LogInjectionTest.java:2141:38:2141:54 | (...)... | LogInjectionTest.java:2141:47:2141:54 | source(...) : Object | LogInjectionTest.java:2141:38:2141:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2141:47:2141:54 | source(...) | user-provided value |
-| LogInjectionTest.java:2143:38:2143:54 | (...)... | LogInjectionTest.java:2143:47:2143:54 | source(...) : Object | LogInjectionTest.java:2143:38:2143:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2143:47:2143:54 | source(...) | user-provided value |
-| LogInjectionTest.java:2145:38:2145:54 | (...)... | LogInjectionTest.java:2145:47:2145:54 | source(...) : Object | LogInjectionTest.java:2145:38:2145:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2145:47:2145:54 | source(...) | user-provided value |
-| LogInjectionTest.java:2147:38:2147:54 | (...)... | LogInjectionTest.java:2147:47:2147:54 | source(...) : Object | LogInjectionTest.java:2147:38:2147:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2147:47:2147:54 | source(...) | user-provided value |
-| LogInjectionTest.java:2149:38:2149:54 | (...)... | LogInjectionTest.java:2149:47:2149:54 | source(...) : Object | LogInjectionTest.java:2149:38:2149:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2149:47:2149:54 | source(...) | user-provided value |
-| LogInjectionTest.java:2151:38:2151:54 | (...)... | LogInjectionTest.java:2151:47:2151:54 | source(...) : Object | LogInjectionTest.java:2151:38:2151:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2151:47:2151:54 | source(...) | user-provided value |
+| LogInjectionTest.java:2007:27:2007:43 | (...)... | LogInjectionTest.java:2007:36:2007:43 | source(...) : Object | LogInjectionTest.java:2007:27:2007:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2007:36:2007:43 | source(...) | user-provided value |
+| LogInjectionTest.java:2008:27:2008:64 | (...)... | LogInjectionTest.java:2008:57:2008:64 | source(...) : Object | LogInjectionTest.java:2008:27:2008:64 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2008:57:2008:64 | source(...) | user-provided value |
+| LogInjectionTest.java:2009:25:2009:41 | (...)... | LogInjectionTest.java:2009:34:2009:41 | source(...) : Object | LogInjectionTest.java:2009:25:2009:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2009:34:2009:41 | source(...) | user-provided value |
+| LogInjectionTest.java:2010:25:2010:62 | (...)... | LogInjectionTest.java:2010:55:2010:62 | source(...) : Object | LogInjectionTest.java:2010:25:2010:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2010:55:2010:62 | source(...) | user-provided value |
+| LogInjectionTest.java:2011:26:2011:42 | (...)... | LogInjectionTest.java:2011:35:2011:42 | source(...) : Object | LogInjectionTest.java:2011:26:2011:42 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2011:35:2011:42 | source(...) | user-provided value |
+| LogInjectionTest.java:2012:26:2012:63 | (...)... | LogInjectionTest.java:2012:56:2012:63 | source(...) : Object | LogInjectionTest.java:2012:26:2012:63 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2012:56:2012:63 | source(...) | user-provided value |
+| LogInjectionTest.java:2013:27:2013:43 | (...)... | LogInjectionTest.java:2013:36:2013:43 | source(...) : Object | LogInjectionTest.java:2013:27:2013:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2013:36:2013:43 | source(...) | user-provided value |
+| LogInjectionTest.java:2014:27:2014:64 | (...)... | LogInjectionTest.java:2014:57:2014:64 | source(...) : Object | LogInjectionTest.java:2014:27:2014:64 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2014:57:2014:64 | source(...) | user-provided value |
+| LogInjectionTest.java:2015:25:2015:41 | (...)... | LogInjectionTest.java:2015:34:2015:41 | source(...) : Object | LogInjectionTest.java:2015:25:2015:41 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2015:34:2015:41 | source(...) | user-provided value |
+| LogInjectionTest.java:2016:25:2016:62 | (...)... | LogInjectionTest.java:2016:55:2016:62 | source(...) : Object | LogInjectionTest.java:2016:25:2016:62 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2016:55:2016:62 | source(...) | user-provided value |
+| LogInjectionTest.java:2017:27:2017:43 | (...)... | LogInjectionTest.java:2017:36:2017:43 | source(...) : Object | LogInjectionTest.java:2017:27:2017:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2017:36:2017:43 | source(...) | user-provided value |
+| LogInjectionTest.java:2018:27:2018:64 | (...)... | LogInjectionTest.java:2018:57:2018:64 | source(...) : Object | LogInjectionTest.java:2018:27:2018:64 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2018:57:2018:64 | source(...) | user-provided value |
+| LogInjectionTest.java:2019:28:2019:44 | (...)... | LogInjectionTest.java:2019:37:2019:44 | source(...) : Object | LogInjectionTest.java:2019:28:2019:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2019:37:2019:44 | source(...) | user-provided value |
+| LogInjectionTest.java:2020:28:2020:65 | (...)... | LogInjectionTest.java:2020:58:2020:65 | source(...) : Object | LogInjectionTest.java:2020:28:2020:65 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2020:58:2020:65 | source(...) | user-provided value |
+| LogInjectionTest.java:2021:29:2021:45 | (...)... | LogInjectionTest.java:2021:38:2021:45 | source(...) : Object | LogInjectionTest.java:2021:29:2021:45 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2021:38:2021:45 | source(...) | user-provided value |
+| LogInjectionTest.java:2022:44:2022:60 | (...)... | LogInjectionTest.java:2022:53:2022:60 | source(...) : Object | LogInjectionTest.java:2022:44:2022:60 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2022:53:2022:60 | source(...) | user-provided value |
+| LogInjectionTest.java:2023:29:2023:45 | (...)... | LogInjectionTest.java:2023:38:2023:45 | source(...) : Object | LogInjectionTest.java:2023:29:2023:45 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2023:38:2023:45 | source(...) | user-provided value |
+| LogInjectionTest.java:2024:44:2024:60 | (...)... | LogInjectionTest.java:2024:53:2024:60 | source(...) : Object | LogInjectionTest.java:2024:44:2024:60 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2024:53:2024:60 | source(...) | user-provided value |
+| LogInjectionTest.java:2025:59:2025:75 | (...)... | LogInjectionTest.java:2025:68:2025:75 | source(...) : Object | LogInjectionTest.java:2025:59:2025:75 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2025:68:2025:75 | source(...) | user-provided value |
+| LogInjectionTest.java:2026:29:2026:45 | (...)... | LogInjectionTest.java:2026:38:2026:45 | source(...) : Object | LogInjectionTest.java:2026:29:2026:45 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2026:38:2026:45 | source(...) | user-provided value |
+| LogInjectionTest.java:2027:44:2027:60 | (...)... | LogInjectionTest.java:2027:53:2027:60 | source(...) : Object | LogInjectionTest.java:2027:44:2027:60 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2027:53:2027:60 | source(...) | user-provided value |
+| LogInjectionTest.java:2028:59:2028:81 | new Object[] | LogInjectionTest.java:2028:73:2028:80 | source(...) : Object | LogInjectionTest.java:2028:59:2028:81 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:2028:73:2028:80 | source(...) | user-provided value |
+| LogInjectionTest.java:2029:28:2029:44 | (...)... | LogInjectionTest.java:2029:37:2029:44 | source(...) : Object | LogInjectionTest.java:2029:28:2029:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2029:37:2029:44 | source(...) | user-provided value |
+| LogInjectionTest.java:2030:43:2030:59 | (...)... | LogInjectionTest.java:2030:52:2030:59 | source(...) : Object | LogInjectionTest.java:2030:43:2030:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2030:52:2030:59 | source(...) | user-provided value |
+| LogInjectionTest.java:2031:28:2031:44 | (...)... | LogInjectionTest.java:2031:37:2031:44 | source(...) : Object | LogInjectionTest.java:2031:28:2031:44 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2031:37:2031:44 | source(...) | user-provided value |
+| LogInjectionTest.java:2032:43:2032:59 | (...)... | LogInjectionTest.java:2032:52:2032:59 | source(...) : Object | LogInjectionTest.java:2032:43:2032:59 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2032:52:2032:59 | source(...) | user-provided value |
+| LogInjectionTest.java:2033:58:2033:74 | (...)... | LogInjectionTest.java:2033:67:2033:74 | source(...) : Object | LogInjectionTest.java:2033:58:2033:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2033:67:2033:74 | source(...) | user-provided value |
+| LogInjectionTest.java:2034:56:2034:72 | (...)... | LogInjectionTest.java:2034:65:2034:72 | source(...) : Object | LogInjectionTest.java:2034:56:2034:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2034:65:2034:72 | source(...) | user-provided value |
+| LogInjectionTest.java:2035:56:2035:72 | (...)... | LogInjectionTest.java:2035:65:2035:72 | source(...) : Object | LogInjectionTest.java:2035:56:2035:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2035:65:2035:72 | source(...) | user-provided value |
+| LogInjectionTest.java:2036:71:2036:78 | source(...) | LogInjectionTest.java:2036:71:2036:78 | source(...) | LogInjectionTest.java:2036:71:2036:78 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:2036:71:2036:78 | source(...) | user-provided value |
+| LogInjectionTest.java:2037:56:2037:72 | (...)... | LogInjectionTest.java:2037:65:2037:72 | source(...) : Object | LogInjectionTest.java:2037:56:2037:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2037:65:2037:72 | source(...) | user-provided value |
+| LogInjectionTest.java:2038:71:2038:92 | new Object[] | LogInjectionTest.java:2038:84:2038:91 | source(...) : Object | LogInjectionTest.java:2038:71:2038:92 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:2038:84:2038:91 | source(...) | user-provided value |
+| LogInjectionTest.java:2039:56:2039:72 | (...)... | LogInjectionTest.java:2039:65:2039:72 | source(...) : Object | LogInjectionTest.java:2039:56:2039:72 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2039:65:2039:72 | source(...) | user-provided value |
+| LogInjectionTest.java:2040:56:2040:93 | (...)... | LogInjectionTest.java:2040:86:2040:93 | source(...) : Object | LogInjectionTest.java:2040:56:2040:93 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2040:86:2040:93 | source(...) | user-provided value |
+| LogInjectionTest.java:2041:74:2041:111 | (...)... | LogInjectionTest.java:2041:104:2041:111 | source(...) : Object | LogInjectionTest.java:2041:74:2041:111 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2041:104:2041:111 | source(...) | user-provided value |
+| LogInjectionTest.java:2042:24:2042:43 | (...)... | LogInjectionTest.java:2042:36:2042:43 | source(...) : Object | LogInjectionTest.java:2042:24:2042:43 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2042:36:2042:43 | source(...) | user-provided value |
+| LogInjectionTest.java:2043:57:2043:73 | (...)... | LogInjectionTest.java:2043:66:2043:73 | source(...) : Object | LogInjectionTest.java:2043:57:2043:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2043:66:2043:73 | source(...) | user-provided value |
+| LogInjectionTest.java:2044:72:2044:88 | (...)... | LogInjectionTest.java:2044:81:2044:88 | source(...) : Object | LogInjectionTest.java:2044:72:2044:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2044:81:2044:88 | source(...) | user-provided value |
+| LogInjectionTest.java:2045:87:2045:103 | (...)... | LogInjectionTest.java:2045:96:2045:103 | source(...) : Object | LogInjectionTest.java:2045:87:2045:103 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2045:96:2045:103 | source(...) | user-provided value |
+| LogInjectionTest.java:2046:57:2046:73 | (...)... | LogInjectionTest.java:2046:66:2046:73 | source(...) : Object | LogInjectionTest.java:2046:57:2046:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2046:66:2046:73 | source(...) | user-provided value |
+| LogInjectionTest.java:2047:72:2047:88 | (...)... | LogInjectionTest.java:2047:81:2047:88 | source(...) : Object | LogInjectionTest.java:2047:72:2047:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2047:81:2047:88 | source(...) | user-provided value |
+| LogInjectionTest.java:2048:87:2048:103 | (...)... | LogInjectionTest.java:2048:96:2048:103 | source(...) : Object | LogInjectionTest.java:2048:87:2048:103 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2048:96:2048:103 | source(...) | user-provided value |
+| LogInjectionTest.java:2049:102:2049:109 | source(...) | LogInjectionTest.java:2049:102:2049:109 | source(...) | LogInjectionTest.java:2049:102:2049:109 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:2049:102:2049:109 | source(...) | user-provided value |
+| LogInjectionTest.java:2050:57:2050:73 | (...)... | LogInjectionTest.java:2050:66:2050:73 | source(...) : Object | LogInjectionTest.java:2050:57:2050:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2050:66:2050:73 | source(...) | user-provided value |
+| LogInjectionTest.java:2051:72:2051:88 | (...)... | LogInjectionTest.java:2051:81:2051:88 | source(...) : Object | LogInjectionTest.java:2051:72:2051:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2051:81:2051:88 | source(...) | user-provided value |
+| LogInjectionTest.java:2052:87:2052:103 | (...)... | LogInjectionTest.java:2052:96:2052:103 | source(...) : Object | LogInjectionTest.java:2052:87:2052:103 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2052:96:2052:103 | source(...) | user-provided value |
+| LogInjectionTest.java:2053:102:2053:124 | new Object[] | LogInjectionTest.java:2053:116:2053:123 | source(...) : Object | LogInjectionTest.java:2053:102:2053:124 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:2053:116:2053:123 | source(...) | user-provided value |
+| LogInjectionTest.java:2054:57:2054:73 | (...)... | LogInjectionTest.java:2054:66:2054:73 | source(...) : Object | LogInjectionTest.java:2054:57:2054:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2054:66:2054:73 | source(...) | user-provided value |
+| LogInjectionTest.java:2055:72:2055:88 | (...)... | LogInjectionTest.java:2055:81:2055:88 | source(...) : Object | LogInjectionTest.java:2055:72:2055:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2055:81:2055:88 | source(...) | user-provided value |
+| LogInjectionTest.java:2056:87:2056:103 | (...)... | LogInjectionTest.java:2056:96:2056:103 | source(...) : Object | LogInjectionTest.java:2056:87:2056:103 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2056:96:2056:103 | source(...) | user-provided value |
+| LogInjectionTest.java:2057:57:2057:73 | (...)... | LogInjectionTest.java:2057:66:2057:73 | source(...) : Object | LogInjectionTest.java:2057:57:2057:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2057:66:2057:73 | source(...) | user-provided value |
+| LogInjectionTest.java:2058:72:2058:88 | (...)... | LogInjectionTest.java:2058:81:2058:88 | source(...) : Object | LogInjectionTest.java:2058:72:2058:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2058:81:2058:88 | source(...) | user-provided value |
+| LogInjectionTest.java:2059:87:2059:124 | (...)... | LogInjectionTest.java:2059:117:2059:124 | source(...) : Object | LogInjectionTest.java:2059:87:2059:124 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2059:117:2059:124 | source(...) | user-provided value |
+| LogInjectionTest.java:2060:57:2060:73 | (...)... | LogInjectionTest.java:2060:66:2060:73 | source(...) : Object | LogInjectionTest.java:2060:57:2060:73 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2060:66:2060:73 | source(...) | user-provided value |
+| LogInjectionTest.java:2061:72:2061:88 | (...)... | LogInjectionTest.java:2061:81:2061:88 | source(...) : Object | LogInjectionTest.java:2061:72:2061:88 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2061:81:2061:88 | source(...) | user-provided value |
+| LogInjectionTest.java:2062:105:2062:142 | (...)... | LogInjectionTest.java:2062:135:2062:142 | source(...) : Object | LogInjectionTest.java:2062:105:2062:142 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2062:135:2062:142 | source(...) | user-provided value |
+| LogInjectionTest.java:2063:58:2063:74 | (...)... | LogInjectionTest.java:2063:67:2063:74 | source(...) : Object | LogInjectionTest.java:2063:58:2063:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2063:67:2063:74 | source(...) | user-provided value |
+| LogInjectionTest.java:2064:73:2064:89 | (...)... | LogInjectionTest.java:2064:82:2064:89 | source(...) : Object | LogInjectionTest.java:2064:73:2064:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2064:82:2064:89 | source(...) | user-provided value |
+| LogInjectionTest.java:2065:111:2065:127 | (...)... | LogInjectionTest.java:2065:120:2065:127 | source(...) : Object | LogInjectionTest.java:2065:111:2065:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2065:120:2065:127 | source(...) | user-provided value |
+| LogInjectionTest.java:2066:126:2066:148 | new Object[] | LogInjectionTest.java:2066:140:2066:147 | source(...) : Object | LogInjectionTest.java:2066:126:2066:148 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:2066:140:2066:147 | source(...) | user-provided value |
+| LogInjectionTest.java:2067:58:2067:74 | (...)... | LogInjectionTest.java:2067:67:2067:74 | source(...) : Object | LogInjectionTest.java:2067:58:2067:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2067:67:2067:74 | source(...) | user-provided value |
+| LogInjectionTest.java:2068:73:2068:89 | (...)... | LogInjectionTest.java:2068:82:2068:89 | source(...) : Object | LogInjectionTest.java:2068:73:2068:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2068:82:2068:89 | source(...) | user-provided value |
+| LogInjectionTest.java:2069:111:2069:127 | (...)... | LogInjectionTest.java:2069:120:2069:127 | source(...) : Object | LogInjectionTest.java:2069:111:2069:127 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2069:120:2069:127 | source(...) | user-provided value |
+| LogInjectionTest.java:2070:58:2070:74 | (...)... | LogInjectionTest.java:2070:67:2070:74 | source(...) : Object | LogInjectionTest.java:2070:58:2070:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2070:67:2070:74 | source(...) | user-provided value |
+| LogInjectionTest.java:2071:73:2071:89 | (...)... | LogInjectionTest.java:2071:82:2071:89 | source(...) : Object | LogInjectionTest.java:2071:73:2071:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2071:82:2071:89 | source(...) | user-provided value |
+| LogInjectionTest.java:2072:88:2072:104 | (...)... | LogInjectionTest.java:2072:97:2072:104 | source(...) : Object | LogInjectionTest.java:2072:88:2072:104 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2072:97:2072:104 | source(...) | user-provided value |
+| LogInjectionTest.java:2073:103:2073:119 | (...)... | LogInjectionTest.java:2073:112:2073:119 | source(...) : Object | LogInjectionTest.java:2073:103:2073:119 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2073:112:2073:119 | source(...) | user-provided value |
+| LogInjectionTest.java:2074:58:2074:74 | (...)... | LogInjectionTest.java:2074:67:2074:74 | source(...) : Object | LogInjectionTest.java:2074:58:2074:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2074:67:2074:74 | source(...) | user-provided value |
+| LogInjectionTest.java:2075:73:2075:89 | (...)... | LogInjectionTest.java:2075:82:2075:89 | source(...) : Object | LogInjectionTest.java:2075:73:2075:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2075:82:2075:89 | source(...) | user-provided value |
+| LogInjectionTest.java:2076:88:2076:104 | (...)... | LogInjectionTest.java:2076:97:2076:104 | source(...) : Object | LogInjectionTest.java:2076:88:2076:104 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2076:97:2076:104 | source(...) | user-provided value |
+| LogInjectionTest.java:2077:103:2077:119 | (...)... | LogInjectionTest.java:2077:112:2077:119 | source(...) : Object | LogInjectionTest.java:2077:103:2077:119 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2077:112:2077:119 | source(...) | user-provided value |
+| LogInjectionTest.java:2078:118:2078:125 | source(...) | LogInjectionTest.java:2078:118:2078:125 | source(...) | LogInjectionTest.java:2078:118:2078:125 | source(...) | This log entry depends on a $@. | LogInjectionTest.java:2078:118:2078:125 | source(...) | user-provided value |
+| LogInjectionTest.java:2079:58:2079:74 | (...)... | LogInjectionTest.java:2079:67:2079:74 | source(...) : Object | LogInjectionTest.java:2079:58:2079:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2079:67:2079:74 | source(...) | user-provided value |
+| LogInjectionTest.java:2080:73:2080:89 | (...)... | LogInjectionTest.java:2080:82:2080:89 | source(...) : Object | LogInjectionTest.java:2080:73:2080:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2080:82:2080:89 | source(...) | user-provided value |
+| LogInjectionTest.java:2081:88:2081:104 | (...)... | LogInjectionTest.java:2081:97:2081:104 | source(...) : Object | LogInjectionTest.java:2081:88:2081:104 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2081:97:2081:104 | source(...) | user-provided value |
+| LogInjectionTest.java:2082:103:2082:119 | (...)... | LogInjectionTest.java:2082:112:2082:119 | source(...) : Object | LogInjectionTest.java:2082:103:2082:119 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2082:112:2082:119 | source(...) | user-provided value |
+| LogInjectionTest.java:2083:118:2083:140 | new Object[] | LogInjectionTest.java:2083:132:2083:139 | source(...) : Object | LogInjectionTest.java:2083:118:2083:140 | new Object[] | This log entry depends on a $@. | LogInjectionTest.java:2083:132:2083:139 | source(...) | user-provided value |
+| LogInjectionTest.java:2084:58:2084:74 | (...)... | LogInjectionTest.java:2084:67:2084:74 | source(...) : Object | LogInjectionTest.java:2084:58:2084:74 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2084:67:2084:74 | source(...) | user-provided value |
+| LogInjectionTest.java:2085:73:2085:89 | (...)... | LogInjectionTest.java:2085:82:2085:89 | source(...) : Object | LogInjectionTest.java:2085:73:2085:89 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2085:82:2085:89 | source(...) | user-provided value |
+| LogInjectionTest.java:2086:88:2086:104 | (...)... | LogInjectionTest.java:2086:97:2086:104 | source(...) : Object | LogInjectionTest.java:2086:88:2086:104 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2086:97:2086:104 | source(...) | user-provided value |
+| LogInjectionTest.java:2087:103:2087:119 | (...)... | LogInjectionTest.java:2087:112:2087:119 | source(...) : Object | LogInjectionTest.java:2087:103:2087:119 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2087:112:2087:119 | source(...) | user-provided value |
+| LogInjectionTest.java:2091:36:2091:52 | (...)... | LogInjectionTest.java:2091:45:2091:52 | source(...) : Object | LogInjectionTest.java:2091:36:2091:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2091:45:2091:52 | source(...) | user-provided value |
+| LogInjectionTest.java:2092:36:2092:52 | (...)... | LogInjectionTest.java:2092:45:2092:52 | source(...) : Object | LogInjectionTest.java:2092:36:2092:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2092:45:2092:52 | source(...) | user-provided value |
+| LogInjectionTest.java:2093:36:2093:52 | (...)... | LogInjectionTest.java:2093:45:2093:52 | source(...) : Object | LogInjectionTest.java:2093:36:2093:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2093:45:2093:52 | source(...) | user-provided value |
+| LogInjectionTest.java:2094:36:2094:52 | (...)... | LogInjectionTest.java:2094:45:2094:52 | source(...) : Object | LogInjectionTest.java:2094:36:2094:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2094:45:2094:52 | source(...) | user-provided value |
+| LogInjectionTest.java:2095:36:2095:52 | (...)... | LogInjectionTest.java:2095:45:2095:52 | source(...) : Object | LogInjectionTest.java:2095:36:2095:52 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2095:45:2095:52 | source(...) | user-provided value |
+| LogInjectionTest.java:2096:38:2096:54 | (...)... | LogInjectionTest.java:2096:47:2096:54 | source(...) : Object | LogInjectionTest.java:2096:38:2096:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2096:47:2096:54 | source(...) | user-provided value |
+| LogInjectionTest.java:2101:38:2101:54 | (...)... | LogInjectionTest.java:2101:47:2101:54 | source(...) : Object | LogInjectionTest.java:2101:38:2101:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2101:47:2101:54 | source(...) | user-provided value |
+| LogInjectionTest.java:2103:38:2103:54 | (...)... | LogInjectionTest.java:2103:47:2103:54 | source(...) : Object | LogInjectionTest.java:2103:38:2103:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2103:47:2103:54 | source(...) | user-provided value |
+| LogInjectionTest.java:2105:38:2105:54 | (...)... | LogInjectionTest.java:2105:47:2105:54 | source(...) : Object | LogInjectionTest.java:2105:38:2105:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2105:47:2105:54 | source(...) | user-provided value |
+| LogInjectionTest.java:2107:38:2107:54 | (...)... | LogInjectionTest.java:2107:47:2107:54 | source(...) : Object | LogInjectionTest.java:2107:38:2107:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2107:47:2107:54 | source(...) | user-provided value |
+| LogInjectionTest.java:2109:38:2109:54 | (...)... | LogInjectionTest.java:2109:47:2109:54 | source(...) : Object | LogInjectionTest.java:2109:38:2109:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2109:47:2109:54 | source(...) | user-provided value |
+| LogInjectionTest.java:2111:38:2111:54 | (...)... | LogInjectionTest.java:2111:47:2111:54 | source(...) : Object | LogInjectionTest.java:2111:38:2111:54 | (...)... | This log entry depends on a $@. | LogInjectionTest.java:2111:47:2111:54 | source(...) | user-provided value |
 edges
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:38:22:38:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:39:22:39:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:41:22:41:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:42:22:42:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:43:22:43:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:45:22:45:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:46:22:46:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:48:22:48:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:49:22:49:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:50:22:50:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:52:22:52:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:53:22:53:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:55:22:55:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:56:22:56:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:58:22:58:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:59:22:59:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:61:22:61:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:62:22:62:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:64:22:64:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:65:22:65:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:67:22:67:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:68:22:68:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:69:22:69:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:70:22:70:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:71:22:71:27 | source : String | provenance |  |
-| LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:35:25:35:41 | (...)... : String | provenance | Src:MaD:536  |
-| LogInjectionTest.java:38:22:38:27 | source : String | LogInjectionTest.java:38:22:38:47 | replace(...) | provenance | MaD:537 Sink:MaD:101 |
-| LogInjectionTest.java:39:22:39:27 | source : String | LogInjectionTest.java:39:22:39:47 | replace(...) | provenance | MaD:537 Sink:MaD:101 |
-| LogInjectionTest.java:41:22:41:27 | source : String | LogInjectionTest.java:41:22:41:47 | replace(...) | provenance | MaD:537 Sink:MaD:101 |
-| LogInjectionTest.java:42:22:42:27 | source : String | LogInjectionTest.java:42:22:42:47 | replace(...) | provenance | MaD:537 Sink:MaD:101 |
-| LogInjectionTest.java:43:22:43:27 | source : String | LogInjectionTest.java:43:22:43:57 | replace(...) | provenance | MaD:537 Sink:MaD:101 |
-| LogInjectionTest.java:45:22:45:27 | source : String | LogInjectionTest.java:45:22:45:47 | replace(...) | provenance | MaD:537 Sink:MaD:101 |
-| LogInjectionTest.java:46:22:46:27 | source : String | LogInjectionTest.java:46:22:46:47 | replace(...) | provenance | MaD:537 Sink:MaD:101 |
-| LogInjectionTest.java:48:22:48:27 | source : String | LogInjectionTest.java:48:22:48:47 | replace(...) | provenance | MaD:537 Sink:MaD:101 |
-| LogInjectionTest.java:49:22:49:27 | source : String | LogInjectionTest.java:49:22:49:47 | replace(...) | provenance | MaD:537 Sink:MaD:101 |
-| LogInjectionTest.java:50:22:50:27 | source : String | LogInjectionTest.java:50:22:50:45 | replace(...) | provenance | MaD:537 Sink:MaD:101 |
-| LogInjectionTest.java:52:22:52:27 | source : String | LogInjectionTest.java:52:22:52:50 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:53:22:53:27 | source : String | LogInjectionTest.java:53:22:53:50 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:55:22:55:27 | source : String | LogInjectionTest.java:55:22:55:50 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:56:22:56:27 | source : String | LogInjectionTest.java:56:22:56:50 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:58:22:58:27 | source : String | LogInjectionTest.java:58:22:58:51 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:59:22:59:27 | source : String | LogInjectionTest.java:59:22:59:51 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:61:22:61:27 | source : String | LogInjectionTest.java:61:22:61:51 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:62:22:62:27 | source : String | LogInjectionTest.java:62:22:62:51 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:64:22:64:27 | source : String | LogInjectionTest.java:64:22:64:51 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:65:22:65:27 | source : String | LogInjectionTest.java:65:22:65:51 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:67:22:67:27 | source : String | LogInjectionTest.java:67:22:67:57 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:68:22:68:27 | source : String | LogInjectionTest.java:68:22:68:57 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:69:22:69:27 | source : String | LogInjectionTest.java:69:22:69:57 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:70:22:70:27 | source : String | LogInjectionTest.java:70:22:70:57 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:71:22:71:27 | source : String | LogInjectionTest.java:71:22:71:58 | replaceAll(...) | provenance | MaD:538 Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:79:26:79:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:85:26:85:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:91:26:91:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:97:26:97:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:103:26:103:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:109:26:109:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:115:26:115:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:121:26:121:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:127:26:127:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:133:26:133:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:141:26:141:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:147:26:147:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:153:26:153:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:159:26:159:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:165:26:165:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:171:26:171:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:175:26:175:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:177:26:177:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:181:26:181:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:183:26:183:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:187:26:187:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | LogInjectionTest.java:193:26:193:31 | source | provenance | Sink:MaD:101 |
-| LogInjectionTest.java:75:34:75:41 | source(...) : Object | LogInjectionTest.java:75:25:75:41 | (...)... : String | provenance | Src:MaD:536  |
-| LogInjectionTest.java:205:48:205:55 | source(...) : Object | LogInjectionTest.java:205:39:205:55 | (...)... | provenance | Src:MaD:536 Sink:MaD:60 |
-| LogInjectionTest.java:215:41:215:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:215:41:215:63 | new Object[] | provenance | Sink:MaD:61 |
-| LogInjectionTest.java:215:55:215:62 | source(...) : Object | LogInjectionTest.java:215:41:215:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:225:41:225:48 | source(...) : Object | LogInjectionTest.java:225:26:225:48 | (...)... | provenance | Src:MaD:536 Sink:MaD:76 |
-| LogInjectionTest.java:226:41:226:48 | source(...) : Object | LogInjectionTest.java:226:26:226:48 | (...)... | provenance | Src:MaD:536 Sink:MaD:77 |
-| LogInjectionTest.java:227:56:227:63 | source(...) : Object | LogInjectionTest.java:227:41:227:63 | (...)... | provenance | Src:MaD:536 Sink:MaD:78 |
-| LogInjectionTest.java:228:56:228:63 | source(...) : Object | LogInjectionTest.java:228:41:228:63 | (...)... | provenance | Src:MaD:536 Sink:MaD:79 |
-| LogInjectionTest.java:229:51:229:58 | source(...) : Object | LogInjectionTest.java:229:41:229:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:80 |
-| LogInjectionTest.java:230:59:230:66 | source(...) : Object | LogInjectionTest.java:230:41:230:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:81 |
-| LogInjectionTest.java:231:59:231:66 | source(...) : Object | LogInjectionTest.java:231:41:231:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:82 |
-| LogInjectionTest.java:233:50:233:57 | source(...) : Object | LogInjectionTest.java:233:41:233:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:83 |
-| LogInjectionTest.java:234:50:234:57 | source(...) : Object | LogInjectionTest.java:234:41:234:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:93 |
-| LogInjectionTest.java:235:56:235:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:235:56:235:78 | new Object[] | provenance | Sink:MaD:93 |
-| LogInjectionTest.java:235:70:235:77 | source(...) : Object | LogInjectionTest.java:235:56:235:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:236:65:236:72 | source(...) : Object | LogInjectionTest.java:236:56:236:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:84 |
-| LogInjectionTest.java:237:50:237:57 | source(...) : Object | LogInjectionTest.java:237:41:237:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:84 |
-| LogInjectionTest.java:238:80:238:87 | source(...) : Object | LogInjectionTest.java:238:71:238:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:85 |
-| LogInjectionTest.java:239:65:239:72 | source(...) : Object | LogInjectionTest.java:239:56:239:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:85 |
-| LogInjectionTest.java:240:50:240:57 | source(...) : Object | LogInjectionTest.java:240:41:240:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:85 |
-| LogInjectionTest.java:241:95:241:102 | source(...) : Object | LogInjectionTest.java:241:86:241:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:86 |
-| LogInjectionTest.java:242:80:242:87 | source(...) : Object | LogInjectionTest.java:242:71:242:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:86 |
-| LogInjectionTest.java:243:65:243:72 | source(...) : Object | LogInjectionTest.java:243:56:243:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:86 |
-| LogInjectionTest.java:244:50:244:57 | source(...) : Object | LogInjectionTest.java:244:41:244:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:86 |
-| LogInjectionTest.java:245:110:245:117 | source(...) : Object | LogInjectionTest.java:245:101:245:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:87 |
-| LogInjectionTest.java:246:95:246:102 | source(...) : Object | LogInjectionTest.java:246:86:246:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:87 |
-| LogInjectionTest.java:247:80:247:87 | source(...) : Object | LogInjectionTest.java:247:71:247:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:87 |
-| LogInjectionTest.java:248:65:248:72 | source(...) : Object | LogInjectionTest.java:248:56:248:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:87 |
-| LogInjectionTest.java:249:50:249:57 | source(...) : Object | LogInjectionTest.java:249:41:249:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:87 |
-| LogInjectionTest.java:250:125:250:132 | source(...) : Object | LogInjectionTest.java:250:116:250:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:88 |
-| LogInjectionTest.java:251:110:251:117 | source(...) : Object | LogInjectionTest.java:251:101:251:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:88 |
-| LogInjectionTest.java:252:95:252:102 | source(...) : Object | LogInjectionTest.java:252:86:252:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:88 |
-| LogInjectionTest.java:253:80:253:87 | source(...) : Object | LogInjectionTest.java:253:71:253:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:88 |
-| LogInjectionTest.java:254:65:254:72 | source(...) : Object | LogInjectionTest.java:254:56:254:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:88 |
-| LogInjectionTest.java:255:50:255:57 | source(...) : Object | LogInjectionTest.java:255:41:255:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:88 |
-| LogInjectionTest.java:256:140:256:147 | source(...) : Object | LogInjectionTest.java:256:131:256:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:89 |
-| LogInjectionTest.java:257:125:257:132 | source(...) : Object | LogInjectionTest.java:257:116:257:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:89 |
-| LogInjectionTest.java:258:110:258:117 | source(...) : Object | LogInjectionTest.java:258:101:258:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:89 |
-| LogInjectionTest.java:259:95:259:102 | source(...) : Object | LogInjectionTest.java:259:86:259:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:89 |
-| LogInjectionTest.java:260:80:260:87 | source(...) : Object | LogInjectionTest.java:260:71:260:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:89 |
-| LogInjectionTest.java:261:65:261:72 | source(...) : Object | LogInjectionTest.java:261:56:261:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:89 |
-| LogInjectionTest.java:262:50:262:57 | source(...) : Object | LogInjectionTest.java:262:41:262:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:89 |
-| LogInjectionTest.java:263:155:263:162 | source(...) : Object | LogInjectionTest.java:263:146:263:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:90 |
-| LogInjectionTest.java:264:140:264:147 | source(...) : Object | LogInjectionTest.java:264:131:264:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:90 |
-| LogInjectionTest.java:265:125:265:132 | source(...) : Object | LogInjectionTest.java:265:116:265:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:90 |
-| LogInjectionTest.java:266:110:266:117 | source(...) : Object | LogInjectionTest.java:266:101:266:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:90 |
-| LogInjectionTest.java:267:95:267:102 | source(...) : Object | LogInjectionTest.java:267:86:267:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:90 |
-| LogInjectionTest.java:268:80:268:87 | source(...) : Object | LogInjectionTest.java:268:71:268:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:90 |
-| LogInjectionTest.java:269:65:269:72 | source(...) : Object | LogInjectionTest.java:269:56:269:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:90 |
-| LogInjectionTest.java:270:50:270:57 | source(...) : Object | LogInjectionTest.java:270:41:270:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:90 |
-| LogInjectionTest.java:271:170:271:177 | source(...) : Object | LogInjectionTest.java:271:161:271:177 | (...)... | provenance | Src:MaD:536 Sink:MaD:91 |
-| LogInjectionTest.java:272:155:272:162 | source(...) : Object | LogInjectionTest.java:272:146:272:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:91 |
-| LogInjectionTest.java:273:140:273:147 | source(...) : Object | LogInjectionTest.java:273:131:273:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:91 |
-| LogInjectionTest.java:274:125:274:132 | source(...) : Object | LogInjectionTest.java:274:116:274:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:91 |
-| LogInjectionTest.java:275:110:275:117 | source(...) : Object | LogInjectionTest.java:275:101:275:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:91 |
-| LogInjectionTest.java:276:95:276:102 | source(...) : Object | LogInjectionTest.java:276:86:276:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:91 |
-| LogInjectionTest.java:277:80:277:87 | source(...) : Object | LogInjectionTest.java:277:71:277:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:91 |
-| LogInjectionTest.java:278:65:278:72 | source(...) : Object | LogInjectionTest.java:278:56:278:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:91 |
-| LogInjectionTest.java:279:50:279:57 | source(...) : Object | LogInjectionTest.java:279:41:279:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:91 |
-| LogInjectionTest.java:280:185:280:192 | source(...) : Object | LogInjectionTest.java:280:176:280:192 | (...)... | provenance | Src:MaD:536 Sink:MaD:92 |
-| LogInjectionTest.java:281:170:281:177 | source(...) : Object | LogInjectionTest.java:281:161:281:177 | (...)... | provenance | Src:MaD:536 Sink:MaD:92 |
-| LogInjectionTest.java:282:155:282:162 | source(...) : Object | LogInjectionTest.java:282:146:282:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:92 |
-| LogInjectionTest.java:283:140:283:147 | source(...) : Object | LogInjectionTest.java:283:131:283:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:92 |
-| LogInjectionTest.java:284:125:284:132 | source(...) : Object | LogInjectionTest.java:284:116:284:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:92 |
-| LogInjectionTest.java:285:110:285:117 | source(...) : Object | LogInjectionTest.java:285:101:285:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:92 |
-| LogInjectionTest.java:286:95:286:102 | source(...) : Object | LogInjectionTest.java:286:86:286:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:92 |
-| LogInjectionTest.java:287:80:287:87 | source(...) : Object | LogInjectionTest.java:287:71:287:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:92 |
-| LogInjectionTest.java:288:65:288:72 | source(...) : Object | LogInjectionTest.java:288:56:288:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:92 |
-| LogInjectionTest.java:289:50:289:57 | source(...) : Object | LogInjectionTest.java:289:41:289:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:92 |
-| LogInjectionTest.java:290:50:290:57 | source(...) : Object | LogInjectionTest.java:290:41:290:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:84 |
-| LogInjectionTest.java:291:70:291:77 | source(...) : Object | LogInjectionTest.java:291:56:291:77 | (...)... | provenance | Src:MaD:536 Sink:MaD:84 |
-| LogInjectionTest.java:292:50:292:57 | source(...) : Object | LogInjectionTest.java:292:41:292:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:94 |
-| LogInjectionTest.java:293:55:293:62 | source(...) : Object | LogInjectionTest.java:293:41:293:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:95 |
-| LogInjectionTest.java:294:55:294:62 | source(...) : Object | LogInjectionTest.java:294:41:294:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:96 |
-| LogInjectionTest.java:295:44:295:51 | source(...) : Object | LogInjectionTest.java:295:26:295:51 | (...)... | provenance | Src:MaD:536 Sink:MaD:99 |
-| LogInjectionTest.java:296:44:296:51 | source(...) : Object | LogInjectionTest.java:296:26:296:51 | (...)... | provenance | Src:MaD:536 Sink:MaD:100 |
-| LogInjectionTest.java:297:36:297:43 | source(...) : Object | LogInjectionTest.java:297:26:297:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:97 |
-| LogInjectionTest.java:298:36:298:43 | source(...) : Object | LogInjectionTest.java:298:26:298:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:98 |
-| LogInjectionTest.java:301:35:301:42 | source(...) : Object | LogInjectionTest.java:301:26:301:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:101 |
-| LogInjectionTest.java:302:35:302:42 | source(...) : Object | LogInjectionTest.java:302:26:302:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:111 |
-| LogInjectionTest.java:303:41:303:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:303:41:303:63 | new Object[] | provenance | Sink:MaD:111 |
-| LogInjectionTest.java:303:55:303:62 | source(...) : Object | LogInjectionTest.java:303:41:303:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:304:50:304:57 | source(...) : Object | LogInjectionTest.java:304:41:304:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:102 |
-| LogInjectionTest.java:305:35:305:42 | source(...) : Object | LogInjectionTest.java:305:26:305:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:102 |
-| LogInjectionTest.java:306:65:306:72 | source(...) : Object | LogInjectionTest.java:306:56:306:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:103 |
-| LogInjectionTest.java:307:50:307:57 | source(...) : Object | LogInjectionTest.java:307:41:307:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:103 |
-| LogInjectionTest.java:308:35:308:42 | source(...) : Object | LogInjectionTest.java:308:26:308:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:103 |
-| LogInjectionTest.java:309:80:309:87 | source(...) : Object | LogInjectionTest.java:309:71:309:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:104 |
-| LogInjectionTest.java:310:65:310:72 | source(...) : Object | LogInjectionTest.java:310:56:310:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:104 |
-| LogInjectionTest.java:311:50:311:57 | source(...) : Object | LogInjectionTest.java:311:41:311:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:104 |
-| LogInjectionTest.java:312:35:312:42 | source(...) : Object | LogInjectionTest.java:312:26:312:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:104 |
-| LogInjectionTest.java:313:95:313:102 | source(...) : Object | LogInjectionTest.java:313:86:313:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:105 |
-| LogInjectionTest.java:314:80:314:87 | source(...) : Object | LogInjectionTest.java:314:71:314:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:105 |
-| LogInjectionTest.java:315:65:315:72 | source(...) : Object | LogInjectionTest.java:315:56:315:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:105 |
-| LogInjectionTest.java:316:50:316:57 | source(...) : Object | LogInjectionTest.java:316:41:316:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:105 |
-| LogInjectionTest.java:317:35:317:42 | source(...) : Object | LogInjectionTest.java:317:26:317:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:105 |
-| LogInjectionTest.java:318:110:318:117 | source(...) : Object | LogInjectionTest.java:318:101:318:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:106 |
-| LogInjectionTest.java:319:95:319:102 | source(...) : Object | LogInjectionTest.java:319:86:319:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:106 |
-| LogInjectionTest.java:320:80:320:87 | source(...) : Object | LogInjectionTest.java:320:71:320:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:106 |
-| LogInjectionTest.java:321:65:321:72 | source(...) : Object | LogInjectionTest.java:321:56:321:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:106 |
-| LogInjectionTest.java:322:50:322:57 | source(...) : Object | LogInjectionTest.java:322:41:322:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:106 |
-| LogInjectionTest.java:323:35:323:42 | source(...) : Object | LogInjectionTest.java:323:26:323:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:106 |
-| LogInjectionTest.java:324:125:324:132 | source(...) : Object | LogInjectionTest.java:324:116:324:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:107 |
-| LogInjectionTest.java:325:110:325:117 | source(...) : Object | LogInjectionTest.java:325:101:325:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:107 |
-| LogInjectionTest.java:326:95:326:102 | source(...) : Object | LogInjectionTest.java:326:86:326:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:107 |
-| LogInjectionTest.java:327:80:327:87 | source(...) : Object | LogInjectionTest.java:327:71:327:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:107 |
-| LogInjectionTest.java:328:65:328:72 | source(...) : Object | LogInjectionTest.java:328:56:328:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:107 |
-| LogInjectionTest.java:329:50:329:57 | source(...) : Object | LogInjectionTest.java:329:41:329:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:107 |
-| LogInjectionTest.java:330:35:330:42 | source(...) : Object | LogInjectionTest.java:330:26:330:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:107 |
-| LogInjectionTest.java:331:140:331:147 | source(...) : Object | LogInjectionTest.java:331:131:331:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:108 |
-| LogInjectionTest.java:332:125:332:132 | source(...) : Object | LogInjectionTest.java:332:116:332:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:108 |
-| LogInjectionTest.java:333:110:333:117 | source(...) : Object | LogInjectionTest.java:333:101:333:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:108 |
-| LogInjectionTest.java:334:95:334:102 | source(...) : Object | LogInjectionTest.java:334:86:334:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:108 |
-| LogInjectionTest.java:335:80:335:87 | source(...) : Object | LogInjectionTest.java:335:71:335:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:108 |
-| LogInjectionTest.java:336:65:336:72 | source(...) : Object | LogInjectionTest.java:336:56:336:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:108 |
-| LogInjectionTest.java:337:50:337:57 | source(...) : Object | LogInjectionTest.java:337:41:337:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:108 |
-| LogInjectionTest.java:338:35:338:42 | source(...) : Object | LogInjectionTest.java:338:26:338:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:108 |
-| LogInjectionTest.java:339:155:339:162 | source(...) : Object | LogInjectionTest.java:339:146:339:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:109 |
-| LogInjectionTest.java:340:140:340:147 | source(...) : Object | LogInjectionTest.java:340:131:340:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:109 |
-| LogInjectionTest.java:341:125:341:132 | source(...) : Object | LogInjectionTest.java:341:116:341:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:109 |
-| LogInjectionTest.java:342:110:342:117 | source(...) : Object | LogInjectionTest.java:342:101:342:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:109 |
-| LogInjectionTest.java:343:95:343:102 | source(...) : Object | LogInjectionTest.java:343:86:343:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:109 |
-| LogInjectionTest.java:344:80:344:87 | source(...) : Object | LogInjectionTest.java:344:71:344:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:109 |
-| LogInjectionTest.java:345:65:345:72 | source(...) : Object | LogInjectionTest.java:345:56:345:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:109 |
-| LogInjectionTest.java:346:50:346:57 | source(...) : Object | LogInjectionTest.java:346:41:346:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:109 |
-| LogInjectionTest.java:347:35:347:42 | source(...) : Object | LogInjectionTest.java:347:26:347:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:109 |
-| LogInjectionTest.java:348:170:348:177 | source(...) : Object | LogInjectionTest.java:348:161:348:177 | (...)... | provenance | Src:MaD:536 Sink:MaD:110 |
-| LogInjectionTest.java:349:155:349:162 | source(...) : Object | LogInjectionTest.java:349:146:349:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:110 |
-| LogInjectionTest.java:350:140:350:147 | source(...) : Object | LogInjectionTest.java:350:131:350:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:110 |
-| LogInjectionTest.java:351:125:351:132 | source(...) : Object | LogInjectionTest.java:351:116:351:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:110 |
-| LogInjectionTest.java:352:110:352:117 | source(...) : Object | LogInjectionTest.java:352:101:352:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:110 |
-| LogInjectionTest.java:353:95:353:102 | source(...) : Object | LogInjectionTest.java:353:86:353:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:110 |
-| LogInjectionTest.java:354:80:354:87 | source(...) : Object | LogInjectionTest.java:354:71:354:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:110 |
-| LogInjectionTest.java:355:65:355:72 | source(...) : Object | LogInjectionTest.java:355:56:355:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:110 |
-| LogInjectionTest.java:356:50:356:57 | source(...) : Object | LogInjectionTest.java:356:41:356:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:110 |
-| LogInjectionTest.java:357:35:357:42 | source(...) : Object | LogInjectionTest.java:357:26:357:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:110 |
-| LogInjectionTest.java:358:35:358:42 | source(...) : Object | LogInjectionTest.java:358:26:358:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:102 |
-| LogInjectionTest.java:359:55:359:62 | source(...) : Object | LogInjectionTest.java:359:41:359:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:102 |
-| LogInjectionTest.java:360:35:360:42 | source(...) : Object | LogInjectionTest.java:360:26:360:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:112 |
-| LogInjectionTest.java:361:40:361:47 | source(...) : Object | LogInjectionTest.java:361:26:361:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:113 |
-| LogInjectionTest.java:362:40:362:47 | source(...) : Object | LogInjectionTest.java:362:26:362:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:114 |
-| LogInjectionTest.java:363:41:363:48 | source(...) : Object | LogInjectionTest.java:363:26:363:48 | (...)... | provenance | Src:MaD:536 Sink:MaD:115 |
-| LogInjectionTest.java:364:41:364:48 | source(...) : Object | LogInjectionTest.java:364:26:364:48 | (...)... | provenance | Src:MaD:536 Sink:MaD:116 |
-| LogInjectionTest.java:365:56:365:63 | source(...) : Object | LogInjectionTest.java:365:41:365:63 | (...)... | provenance | Src:MaD:536 Sink:MaD:117 |
-| LogInjectionTest.java:366:56:366:63 | source(...) : Object | LogInjectionTest.java:366:41:366:63 | (...)... | provenance | Src:MaD:536 Sink:MaD:118 |
-| LogInjectionTest.java:367:51:367:58 | source(...) : Object | LogInjectionTest.java:367:41:367:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:119 |
-| LogInjectionTest.java:368:59:368:66 | source(...) : Object | LogInjectionTest.java:368:41:368:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:120 |
-| LogInjectionTest.java:369:59:369:66 | source(...) : Object | LogInjectionTest.java:369:41:369:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:121 |
-| LogInjectionTest.java:371:50:371:57 | source(...) : Object | LogInjectionTest.java:371:41:371:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:122 |
-| LogInjectionTest.java:372:50:372:57 | source(...) : Object | LogInjectionTest.java:372:41:372:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:132 |
-| LogInjectionTest.java:373:56:373:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:373:56:373:78 | new Object[] | provenance | Sink:MaD:132 |
-| LogInjectionTest.java:373:70:373:77 | source(...) : Object | LogInjectionTest.java:373:56:373:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:374:65:374:72 | source(...) : Object | LogInjectionTest.java:374:56:374:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:123 |
-| LogInjectionTest.java:375:50:375:57 | source(...) : Object | LogInjectionTest.java:375:41:375:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:123 |
-| LogInjectionTest.java:376:80:376:87 | source(...) : Object | LogInjectionTest.java:376:71:376:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:124 |
-| LogInjectionTest.java:377:65:377:72 | source(...) : Object | LogInjectionTest.java:377:56:377:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:124 |
-| LogInjectionTest.java:378:50:378:57 | source(...) : Object | LogInjectionTest.java:378:41:378:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:124 |
-| LogInjectionTest.java:379:95:379:102 | source(...) : Object | LogInjectionTest.java:379:86:379:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:125 |
-| LogInjectionTest.java:380:80:380:87 | source(...) : Object | LogInjectionTest.java:380:71:380:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:125 |
-| LogInjectionTest.java:381:65:381:72 | source(...) : Object | LogInjectionTest.java:381:56:381:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:125 |
-| LogInjectionTest.java:382:50:382:57 | source(...) : Object | LogInjectionTest.java:382:41:382:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:125 |
-| LogInjectionTest.java:383:110:383:117 | source(...) : Object | LogInjectionTest.java:383:101:383:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:126 |
-| LogInjectionTest.java:384:95:384:102 | source(...) : Object | LogInjectionTest.java:384:86:384:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:126 |
-| LogInjectionTest.java:385:80:385:87 | source(...) : Object | LogInjectionTest.java:385:71:385:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:126 |
-| LogInjectionTest.java:386:65:386:72 | source(...) : Object | LogInjectionTest.java:386:56:386:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:126 |
-| LogInjectionTest.java:387:50:387:57 | source(...) : Object | LogInjectionTest.java:387:41:387:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:126 |
-| LogInjectionTest.java:388:125:388:132 | source(...) : Object | LogInjectionTest.java:388:116:388:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:127 |
-| LogInjectionTest.java:389:110:389:117 | source(...) : Object | LogInjectionTest.java:389:101:389:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:127 |
-| LogInjectionTest.java:390:95:390:102 | source(...) : Object | LogInjectionTest.java:390:86:390:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:127 |
-| LogInjectionTest.java:391:80:391:87 | source(...) : Object | LogInjectionTest.java:391:71:391:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:127 |
-| LogInjectionTest.java:392:65:392:72 | source(...) : Object | LogInjectionTest.java:392:56:392:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:127 |
-| LogInjectionTest.java:393:50:393:57 | source(...) : Object | LogInjectionTest.java:393:41:393:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:127 |
-| LogInjectionTest.java:394:140:394:147 | source(...) : Object | LogInjectionTest.java:394:131:394:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:128 |
-| LogInjectionTest.java:395:125:395:132 | source(...) : Object | LogInjectionTest.java:395:116:395:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:128 |
-| LogInjectionTest.java:396:110:396:117 | source(...) : Object | LogInjectionTest.java:396:101:396:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:128 |
-| LogInjectionTest.java:397:95:397:102 | source(...) : Object | LogInjectionTest.java:397:86:397:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:128 |
-| LogInjectionTest.java:398:80:398:87 | source(...) : Object | LogInjectionTest.java:398:71:398:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:128 |
-| LogInjectionTest.java:399:65:399:72 | source(...) : Object | LogInjectionTest.java:399:56:399:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:128 |
-| LogInjectionTest.java:400:50:400:57 | source(...) : Object | LogInjectionTest.java:400:41:400:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:128 |
-| LogInjectionTest.java:401:155:401:162 | source(...) : Object | LogInjectionTest.java:401:146:401:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:129 |
-| LogInjectionTest.java:402:140:402:147 | source(...) : Object | LogInjectionTest.java:402:131:402:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:129 |
-| LogInjectionTest.java:403:125:403:132 | source(...) : Object | LogInjectionTest.java:403:116:403:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:129 |
-| LogInjectionTest.java:404:110:404:117 | source(...) : Object | LogInjectionTest.java:404:101:404:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:129 |
-| LogInjectionTest.java:405:95:405:102 | source(...) : Object | LogInjectionTest.java:405:86:405:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:129 |
-| LogInjectionTest.java:406:80:406:87 | source(...) : Object | LogInjectionTest.java:406:71:406:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:129 |
-| LogInjectionTest.java:407:65:407:72 | source(...) : Object | LogInjectionTest.java:407:56:407:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:129 |
-| LogInjectionTest.java:408:50:408:57 | source(...) : Object | LogInjectionTest.java:408:41:408:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:129 |
-| LogInjectionTest.java:409:170:409:177 | source(...) : Object | LogInjectionTest.java:409:161:409:177 | (...)... | provenance | Src:MaD:536 Sink:MaD:130 |
-| LogInjectionTest.java:410:155:410:162 | source(...) : Object | LogInjectionTest.java:410:146:410:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:130 |
-| LogInjectionTest.java:411:140:411:147 | source(...) : Object | LogInjectionTest.java:411:131:411:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:130 |
-| LogInjectionTest.java:412:125:412:132 | source(...) : Object | LogInjectionTest.java:412:116:412:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:130 |
-| LogInjectionTest.java:413:110:413:117 | source(...) : Object | LogInjectionTest.java:413:101:413:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:130 |
-| LogInjectionTest.java:414:95:414:102 | source(...) : Object | LogInjectionTest.java:414:86:414:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:130 |
-| LogInjectionTest.java:415:80:415:87 | source(...) : Object | LogInjectionTest.java:415:71:415:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:130 |
-| LogInjectionTest.java:416:65:416:72 | source(...) : Object | LogInjectionTest.java:416:56:416:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:130 |
-| LogInjectionTest.java:417:50:417:57 | source(...) : Object | LogInjectionTest.java:417:41:417:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:130 |
-| LogInjectionTest.java:418:185:418:192 | source(...) : Object | LogInjectionTest.java:418:176:418:192 | (...)... | provenance | Src:MaD:536 Sink:MaD:131 |
-| LogInjectionTest.java:419:170:419:177 | source(...) : Object | LogInjectionTest.java:419:161:419:177 | (...)... | provenance | Src:MaD:536 Sink:MaD:131 |
-| LogInjectionTest.java:420:155:420:162 | source(...) : Object | LogInjectionTest.java:420:146:420:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:131 |
-| LogInjectionTest.java:421:140:421:147 | source(...) : Object | LogInjectionTest.java:421:131:421:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:131 |
-| LogInjectionTest.java:422:125:422:132 | source(...) : Object | LogInjectionTest.java:422:116:422:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:131 |
-| LogInjectionTest.java:423:110:423:117 | source(...) : Object | LogInjectionTest.java:423:101:423:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:131 |
-| LogInjectionTest.java:424:95:424:102 | source(...) : Object | LogInjectionTest.java:424:86:424:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:131 |
-| LogInjectionTest.java:425:80:425:87 | source(...) : Object | LogInjectionTest.java:425:71:425:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:131 |
-| LogInjectionTest.java:426:65:426:72 | source(...) : Object | LogInjectionTest.java:426:56:426:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:131 |
-| LogInjectionTest.java:427:50:427:57 | source(...) : Object | LogInjectionTest.java:427:41:427:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:131 |
-| LogInjectionTest.java:428:50:428:57 | source(...) : Object | LogInjectionTest.java:428:41:428:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:123 |
-| LogInjectionTest.java:429:70:429:77 | source(...) : Object | LogInjectionTest.java:429:56:429:77 | (...)... | provenance | Src:MaD:536 Sink:MaD:123 |
-| LogInjectionTest.java:430:50:430:57 | source(...) : Object | LogInjectionTest.java:430:41:430:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:133 |
-| LogInjectionTest.java:431:55:431:62 | source(...) : Object | LogInjectionTest.java:431:41:431:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:134 |
-| LogInjectionTest.java:432:55:432:62 | source(...) : Object | LogInjectionTest.java:432:41:432:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:135 |
-| LogInjectionTest.java:433:44:433:51 | source(...) : Object | LogInjectionTest.java:433:26:433:51 | (...)... | provenance | Src:MaD:536 Sink:MaD:138 |
-| LogInjectionTest.java:434:44:434:51 | source(...) : Object | LogInjectionTest.java:434:26:434:51 | (...)... | provenance | Src:MaD:536 Sink:MaD:139 |
-| LogInjectionTest.java:435:36:435:43 | source(...) : Object | LogInjectionTest.java:435:26:435:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:136 |
-| LogInjectionTest.java:436:36:436:43 | source(...) : Object | LogInjectionTest.java:436:26:436:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:137 |
-| LogInjectionTest.java:439:35:439:42 | source(...) : Object | LogInjectionTest.java:439:26:439:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:140 |
-| LogInjectionTest.java:440:35:440:42 | source(...) : Object | LogInjectionTest.java:440:26:440:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:150 |
-| LogInjectionTest.java:441:41:441:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:441:41:441:63 | new Object[] | provenance | Sink:MaD:150 |
-| LogInjectionTest.java:441:55:441:62 | source(...) : Object | LogInjectionTest.java:441:41:441:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:442:50:442:57 | source(...) : Object | LogInjectionTest.java:442:41:442:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:141 |
-| LogInjectionTest.java:443:35:443:42 | source(...) : Object | LogInjectionTest.java:443:26:443:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:141 |
-| LogInjectionTest.java:444:65:444:72 | source(...) : Object | LogInjectionTest.java:444:56:444:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:142 |
-| LogInjectionTest.java:445:50:445:57 | source(...) : Object | LogInjectionTest.java:445:41:445:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:142 |
-| LogInjectionTest.java:446:35:446:42 | source(...) : Object | LogInjectionTest.java:446:26:446:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:142 |
-| LogInjectionTest.java:447:80:447:87 | source(...) : Object | LogInjectionTest.java:447:71:447:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:143 |
-| LogInjectionTest.java:448:65:448:72 | source(...) : Object | LogInjectionTest.java:448:56:448:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:143 |
-| LogInjectionTest.java:449:50:449:57 | source(...) : Object | LogInjectionTest.java:449:41:449:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:143 |
-| LogInjectionTest.java:450:35:450:42 | source(...) : Object | LogInjectionTest.java:450:26:450:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:143 |
-| LogInjectionTest.java:451:95:451:102 | source(...) : Object | LogInjectionTest.java:451:86:451:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:144 |
-| LogInjectionTest.java:452:80:452:87 | source(...) : Object | LogInjectionTest.java:452:71:452:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:144 |
-| LogInjectionTest.java:453:65:453:72 | source(...) : Object | LogInjectionTest.java:453:56:453:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:144 |
-| LogInjectionTest.java:454:50:454:57 | source(...) : Object | LogInjectionTest.java:454:41:454:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:144 |
-| LogInjectionTest.java:455:35:455:42 | source(...) : Object | LogInjectionTest.java:455:26:455:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:144 |
-| LogInjectionTest.java:456:110:456:117 | source(...) : Object | LogInjectionTest.java:456:101:456:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:145 |
-| LogInjectionTest.java:457:95:457:102 | source(...) : Object | LogInjectionTest.java:457:86:457:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:145 |
-| LogInjectionTest.java:458:80:458:87 | source(...) : Object | LogInjectionTest.java:458:71:458:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:145 |
-| LogInjectionTest.java:459:65:459:72 | source(...) : Object | LogInjectionTest.java:459:56:459:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:145 |
-| LogInjectionTest.java:460:50:460:57 | source(...) : Object | LogInjectionTest.java:460:41:460:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:145 |
-| LogInjectionTest.java:461:35:461:42 | source(...) : Object | LogInjectionTest.java:461:26:461:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:145 |
-| LogInjectionTest.java:462:125:462:132 | source(...) : Object | LogInjectionTest.java:462:116:462:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:146 |
-| LogInjectionTest.java:463:110:463:117 | source(...) : Object | LogInjectionTest.java:463:101:463:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:146 |
-| LogInjectionTest.java:464:95:464:102 | source(...) : Object | LogInjectionTest.java:464:86:464:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:146 |
-| LogInjectionTest.java:465:80:465:87 | source(...) : Object | LogInjectionTest.java:465:71:465:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:146 |
-| LogInjectionTest.java:466:65:466:72 | source(...) : Object | LogInjectionTest.java:466:56:466:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:146 |
-| LogInjectionTest.java:467:50:467:57 | source(...) : Object | LogInjectionTest.java:467:41:467:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:146 |
-| LogInjectionTest.java:468:35:468:42 | source(...) : Object | LogInjectionTest.java:468:26:468:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:146 |
-| LogInjectionTest.java:469:140:469:147 | source(...) : Object | LogInjectionTest.java:469:131:469:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:147 |
-| LogInjectionTest.java:470:125:470:132 | source(...) : Object | LogInjectionTest.java:470:116:470:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:147 |
-| LogInjectionTest.java:471:110:471:117 | source(...) : Object | LogInjectionTest.java:471:101:471:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:147 |
-| LogInjectionTest.java:472:95:472:102 | source(...) : Object | LogInjectionTest.java:472:86:472:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:147 |
-| LogInjectionTest.java:473:80:473:87 | source(...) : Object | LogInjectionTest.java:473:71:473:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:147 |
-| LogInjectionTest.java:474:65:474:72 | source(...) : Object | LogInjectionTest.java:474:56:474:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:147 |
-| LogInjectionTest.java:475:50:475:57 | source(...) : Object | LogInjectionTest.java:475:41:475:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:147 |
-| LogInjectionTest.java:476:35:476:42 | source(...) : Object | LogInjectionTest.java:476:26:476:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:147 |
-| LogInjectionTest.java:477:155:477:162 | source(...) : Object | LogInjectionTest.java:477:146:477:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:148 |
-| LogInjectionTest.java:478:140:478:147 | source(...) : Object | LogInjectionTest.java:478:131:478:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:148 |
-| LogInjectionTest.java:479:125:479:132 | source(...) : Object | LogInjectionTest.java:479:116:479:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:148 |
-| LogInjectionTest.java:480:110:480:117 | source(...) : Object | LogInjectionTest.java:480:101:480:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:148 |
-| LogInjectionTest.java:481:95:481:102 | source(...) : Object | LogInjectionTest.java:481:86:481:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:148 |
-| LogInjectionTest.java:482:80:482:87 | source(...) : Object | LogInjectionTest.java:482:71:482:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:148 |
-| LogInjectionTest.java:483:65:483:72 | source(...) : Object | LogInjectionTest.java:483:56:483:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:148 |
-| LogInjectionTest.java:484:50:484:57 | source(...) : Object | LogInjectionTest.java:484:41:484:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:148 |
-| LogInjectionTest.java:485:35:485:42 | source(...) : Object | LogInjectionTest.java:485:26:485:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:148 |
-| LogInjectionTest.java:486:170:486:177 | source(...) : Object | LogInjectionTest.java:486:161:486:177 | (...)... | provenance | Src:MaD:536 Sink:MaD:149 |
-| LogInjectionTest.java:487:155:487:162 | source(...) : Object | LogInjectionTest.java:487:146:487:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:149 |
-| LogInjectionTest.java:488:140:488:147 | source(...) : Object | LogInjectionTest.java:488:131:488:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:149 |
-| LogInjectionTest.java:489:125:489:132 | source(...) : Object | LogInjectionTest.java:489:116:489:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:149 |
-| LogInjectionTest.java:490:110:490:117 | source(...) : Object | LogInjectionTest.java:490:101:490:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:149 |
-| LogInjectionTest.java:491:95:491:102 | source(...) : Object | LogInjectionTest.java:491:86:491:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:149 |
-| LogInjectionTest.java:492:80:492:87 | source(...) : Object | LogInjectionTest.java:492:71:492:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:149 |
-| LogInjectionTest.java:493:65:493:72 | source(...) : Object | LogInjectionTest.java:493:56:493:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:149 |
-| LogInjectionTest.java:494:50:494:57 | source(...) : Object | LogInjectionTest.java:494:41:494:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:149 |
-| LogInjectionTest.java:495:35:495:42 | source(...) : Object | LogInjectionTest.java:495:26:495:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:149 |
-| LogInjectionTest.java:496:35:496:42 | source(...) : Object | LogInjectionTest.java:496:26:496:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:141 |
-| LogInjectionTest.java:497:55:497:62 | source(...) : Object | LogInjectionTest.java:497:41:497:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:141 |
-| LogInjectionTest.java:498:35:498:42 | source(...) : Object | LogInjectionTest.java:498:26:498:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:151 |
-| LogInjectionTest.java:499:40:499:47 | source(...) : Object | LogInjectionTest.java:499:26:499:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:152 |
-| LogInjectionTest.java:500:40:500:47 | source(...) : Object | LogInjectionTest.java:500:26:500:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:153 |
-| LogInjectionTest.java:501:41:501:48 | source(...) : Object | LogInjectionTest.java:501:26:501:48 | (...)... | provenance | Src:MaD:536 Sink:MaD:154 |
-| LogInjectionTest.java:502:41:502:48 | source(...) : Object | LogInjectionTest.java:502:26:502:48 | (...)... | provenance | Src:MaD:536 Sink:MaD:155 |
-| LogInjectionTest.java:503:56:503:63 | source(...) : Object | LogInjectionTest.java:503:41:503:63 | (...)... | provenance | Src:MaD:536 Sink:MaD:156 |
-| LogInjectionTest.java:504:56:504:63 | source(...) : Object | LogInjectionTest.java:504:41:504:63 | (...)... | provenance | Src:MaD:536 Sink:MaD:157 |
-| LogInjectionTest.java:505:51:505:58 | source(...) : Object | LogInjectionTest.java:505:41:505:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:158 |
-| LogInjectionTest.java:506:59:506:66 | source(...) : Object | LogInjectionTest.java:506:41:506:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:159 |
-| LogInjectionTest.java:507:59:507:66 | source(...) : Object | LogInjectionTest.java:507:41:507:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:160 |
-| LogInjectionTest.java:509:50:509:57 | source(...) : Object | LogInjectionTest.java:509:41:509:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:161 |
-| LogInjectionTest.java:510:50:510:57 | source(...) : Object | LogInjectionTest.java:510:41:510:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:171 |
-| LogInjectionTest.java:511:56:511:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:511:56:511:78 | new Object[] | provenance | Sink:MaD:171 |
-| LogInjectionTest.java:511:70:511:77 | source(...) : Object | LogInjectionTest.java:511:56:511:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:512:65:512:72 | source(...) : Object | LogInjectionTest.java:512:56:512:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:162 |
-| LogInjectionTest.java:513:50:513:57 | source(...) : Object | LogInjectionTest.java:513:41:513:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:162 |
-| LogInjectionTest.java:514:80:514:87 | source(...) : Object | LogInjectionTest.java:514:71:514:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:163 |
-| LogInjectionTest.java:515:65:515:72 | source(...) : Object | LogInjectionTest.java:515:56:515:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:163 |
-| LogInjectionTest.java:516:50:516:57 | source(...) : Object | LogInjectionTest.java:516:41:516:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:163 |
-| LogInjectionTest.java:517:95:517:102 | source(...) : Object | LogInjectionTest.java:517:86:517:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:164 |
-| LogInjectionTest.java:518:80:518:87 | source(...) : Object | LogInjectionTest.java:518:71:518:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:164 |
-| LogInjectionTest.java:519:65:519:72 | source(...) : Object | LogInjectionTest.java:519:56:519:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:164 |
-| LogInjectionTest.java:520:50:520:57 | source(...) : Object | LogInjectionTest.java:520:41:520:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:164 |
-| LogInjectionTest.java:521:110:521:117 | source(...) : Object | LogInjectionTest.java:521:101:521:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:165 |
-| LogInjectionTest.java:522:95:522:102 | source(...) : Object | LogInjectionTest.java:522:86:522:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:165 |
-| LogInjectionTest.java:523:80:523:87 | source(...) : Object | LogInjectionTest.java:523:71:523:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:165 |
-| LogInjectionTest.java:524:65:524:72 | source(...) : Object | LogInjectionTest.java:524:56:524:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:165 |
-| LogInjectionTest.java:525:50:525:57 | source(...) : Object | LogInjectionTest.java:525:41:525:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:165 |
-| LogInjectionTest.java:526:125:526:132 | source(...) : Object | LogInjectionTest.java:526:116:526:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:166 |
-| LogInjectionTest.java:527:110:527:117 | source(...) : Object | LogInjectionTest.java:527:101:527:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:166 |
-| LogInjectionTest.java:528:95:528:102 | source(...) : Object | LogInjectionTest.java:528:86:528:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:166 |
-| LogInjectionTest.java:529:80:529:87 | source(...) : Object | LogInjectionTest.java:529:71:529:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:166 |
-| LogInjectionTest.java:530:65:530:72 | source(...) : Object | LogInjectionTest.java:530:56:530:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:166 |
-| LogInjectionTest.java:531:50:531:57 | source(...) : Object | LogInjectionTest.java:531:41:531:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:166 |
-| LogInjectionTest.java:532:140:532:147 | source(...) : Object | LogInjectionTest.java:532:131:532:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:167 |
-| LogInjectionTest.java:533:125:533:132 | source(...) : Object | LogInjectionTest.java:533:116:533:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:167 |
-| LogInjectionTest.java:534:110:534:117 | source(...) : Object | LogInjectionTest.java:534:101:534:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:167 |
-| LogInjectionTest.java:535:95:535:102 | source(...) : Object | LogInjectionTest.java:535:86:535:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:167 |
-| LogInjectionTest.java:536:80:536:87 | source(...) : Object | LogInjectionTest.java:536:71:536:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:167 |
-| LogInjectionTest.java:537:65:537:72 | source(...) : Object | LogInjectionTest.java:537:56:537:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:167 |
-| LogInjectionTest.java:538:50:538:57 | source(...) : Object | LogInjectionTest.java:538:41:538:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:167 |
-| LogInjectionTest.java:539:155:539:162 | source(...) : Object | LogInjectionTest.java:539:146:539:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:168 |
-| LogInjectionTest.java:540:140:540:147 | source(...) : Object | LogInjectionTest.java:540:131:540:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:168 |
-| LogInjectionTest.java:541:125:541:132 | source(...) : Object | LogInjectionTest.java:541:116:541:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:168 |
-| LogInjectionTest.java:542:110:542:117 | source(...) : Object | LogInjectionTest.java:542:101:542:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:168 |
-| LogInjectionTest.java:543:95:543:102 | source(...) : Object | LogInjectionTest.java:543:86:543:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:168 |
-| LogInjectionTest.java:544:80:544:87 | source(...) : Object | LogInjectionTest.java:544:71:544:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:168 |
-| LogInjectionTest.java:545:65:545:72 | source(...) : Object | LogInjectionTest.java:545:56:545:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:168 |
-| LogInjectionTest.java:546:50:546:57 | source(...) : Object | LogInjectionTest.java:546:41:546:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:168 |
-| LogInjectionTest.java:547:170:547:177 | source(...) : Object | LogInjectionTest.java:547:161:547:177 | (...)... | provenance | Src:MaD:536 Sink:MaD:169 |
-| LogInjectionTest.java:548:155:548:162 | source(...) : Object | LogInjectionTest.java:548:146:548:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:169 |
-| LogInjectionTest.java:549:140:549:147 | source(...) : Object | LogInjectionTest.java:549:131:549:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:169 |
-| LogInjectionTest.java:550:125:550:132 | source(...) : Object | LogInjectionTest.java:550:116:550:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:169 |
-| LogInjectionTest.java:551:110:551:117 | source(...) : Object | LogInjectionTest.java:551:101:551:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:169 |
-| LogInjectionTest.java:552:95:552:102 | source(...) : Object | LogInjectionTest.java:552:86:552:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:169 |
-| LogInjectionTest.java:553:80:553:87 | source(...) : Object | LogInjectionTest.java:553:71:553:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:169 |
-| LogInjectionTest.java:554:65:554:72 | source(...) : Object | LogInjectionTest.java:554:56:554:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:169 |
-| LogInjectionTest.java:555:50:555:57 | source(...) : Object | LogInjectionTest.java:555:41:555:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:169 |
-| LogInjectionTest.java:556:185:556:192 | source(...) : Object | LogInjectionTest.java:556:176:556:192 | (...)... | provenance | Src:MaD:536 Sink:MaD:170 |
-| LogInjectionTest.java:557:170:557:177 | source(...) : Object | LogInjectionTest.java:557:161:557:177 | (...)... | provenance | Src:MaD:536 Sink:MaD:170 |
-| LogInjectionTest.java:558:155:558:162 | source(...) : Object | LogInjectionTest.java:558:146:558:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:170 |
-| LogInjectionTest.java:559:140:559:147 | source(...) : Object | LogInjectionTest.java:559:131:559:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:170 |
-| LogInjectionTest.java:560:125:560:132 | source(...) : Object | LogInjectionTest.java:560:116:560:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:170 |
-| LogInjectionTest.java:561:110:561:117 | source(...) : Object | LogInjectionTest.java:561:101:561:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:170 |
-| LogInjectionTest.java:562:95:562:102 | source(...) : Object | LogInjectionTest.java:562:86:562:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:170 |
-| LogInjectionTest.java:563:80:563:87 | source(...) : Object | LogInjectionTest.java:563:71:563:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:170 |
-| LogInjectionTest.java:564:65:564:72 | source(...) : Object | LogInjectionTest.java:564:56:564:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:170 |
-| LogInjectionTest.java:565:50:565:57 | source(...) : Object | LogInjectionTest.java:565:41:565:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:170 |
-| LogInjectionTest.java:566:50:566:57 | source(...) : Object | LogInjectionTest.java:566:41:566:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:162 |
-| LogInjectionTest.java:567:70:567:77 | source(...) : Object | LogInjectionTest.java:567:56:567:77 | (...)... | provenance | Src:MaD:536 Sink:MaD:162 |
-| LogInjectionTest.java:568:50:568:57 | source(...) : Object | LogInjectionTest.java:568:41:568:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:172 |
-| LogInjectionTest.java:569:55:569:62 | source(...) : Object | LogInjectionTest.java:569:41:569:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:173 |
-| LogInjectionTest.java:570:55:570:62 | source(...) : Object | LogInjectionTest.java:570:41:570:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:174 |
-| LogInjectionTest.java:571:44:571:51 | source(...) : Object | LogInjectionTest.java:571:26:571:51 | (...)... | provenance | Src:MaD:536 Sink:MaD:177 |
-| LogInjectionTest.java:572:44:572:51 | source(...) : Object | LogInjectionTest.java:572:26:572:51 | (...)... | provenance | Src:MaD:536 Sink:MaD:178 |
-| LogInjectionTest.java:573:36:573:43 | source(...) : Object | LogInjectionTest.java:573:26:573:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:175 |
-| LogInjectionTest.java:574:36:574:43 | source(...) : Object | LogInjectionTest.java:574:26:574:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:176 |
-| LogInjectionTest.java:577:35:577:42 | source(...) : Object | LogInjectionTest.java:577:26:577:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:179 |
-| LogInjectionTest.java:578:35:578:42 | source(...) : Object | LogInjectionTest.java:578:26:578:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:189 |
-| LogInjectionTest.java:579:41:579:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:579:41:579:63 | new Object[] | provenance | Sink:MaD:189 |
-| LogInjectionTest.java:579:55:579:62 | source(...) : Object | LogInjectionTest.java:579:41:579:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:580:50:580:57 | source(...) : Object | LogInjectionTest.java:580:41:580:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:180 |
-| LogInjectionTest.java:581:35:581:42 | source(...) : Object | LogInjectionTest.java:581:26:581:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:180 |
-| LogInjectionTest.java:582:65:582:72 | source(...) : Object | LogInjectionTest.java:582:56:582:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:181 |
-| LogInjectionTest.java:583:50:583:57 | source(...) : Object | LogInjectionTest.java:583:41:583:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:181 |
-| LogInjectionTest.java:584:35:584:42 | source(...) : Object | LogInjectionTest.java:584:26:584:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:181 |
-| LogInjectionTest.java:585:80:585:87 | source(...) : Object | LogInjectionTest.java:585:71:585:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:182 |
-| LogInjectionTest.java:586:65:586:72 | source(...) : Object | LogInjectionTest.java:586:56:586:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:182 |
-| LogInjectionTest.java:587:50:587:57 | source(...) : Object | LogInjectionTest.java:587:41:587:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:182 |
-| LogInjectionTest.java:588:35:588:42 | source(...) : Object | LogInjectionTest.java:588:26:588:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:182 |
-| LogInjectionTest.java:589:95:589:102 | source(...) : Object | LogInjectionTest.java:589:86:589:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:183 |
-| LogInjectionTest.java:590:80:590:87 | source(...) : Object | LogInjectionTest.java:590:71:590:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:183 |
-| LogInjectionTest.java:591:65:591:72 | source(...) : Object | LogInjectionTest.java:591:56:591:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:183 |
-| LogInjectionTest.java:592:50:592:57 | source(...) : Object | LogInjectionTest.java:592:41:592:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:183 |
-| LogInjectionTest.java:593:35:593:42 | source(...) : Object | LogInjectionTest.java:593:26:593:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:183 |
-| LogInjectionTest.java:594:110:594:117 | source(...) : Object | LogInjectionTest.java:594:101:594:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:184 |
-| LogInjectionTest.java:595:95:595:102 | source(...) : Object | LogInjectionTest.java:595:86:595:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:184 |
-| LogInjectionTest.java:596:80:596:87 | source(...) : Object | LogInjectionTest.java:596:71:596:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:184 |
-| LogInjectionTest.java:597:65:597:72 | source(...) : Object | LogInjectionTest.java:597:56:597:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:184 |
-| LogInjectionTest.java:598:50:598:57 | source(...) : Object | LogInjectionTest.java:598:41:598:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:184 |
-| LogInjectionTest.java:599:35:599:42 | source(...) : Object | LogInjectionTest.java:599:26:599:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:184 |
-| LogInjectionTest.java:600:125:600:132 | source(...) : Object | LogInjectionTest.java:600:116:600:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:185 |
-| LogInjectionTest.java:601:110:601:117 | source(...) : Object | LogInjectionTest.java:601:101:601:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:185 |
-| LogInjectionTest.java:602:95:602:102 | source(...) : Object | LogInjectionTest.java:602:86:602:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:185 |
-| LogInjectionTest.java:603:80:603:87 | source(...) : Object | LogInjectionTest.java:603:71:603:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:185 |
-| LogInjectionTest.java:604:65:604:72 | source(...) : Object | LogInjectionTest.java:604:56:604:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:185 |
-| LogInjectionTest.java:605:50:605:57 | source(...) : Object | LogInjectionTest.java:605:41:605:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:185 |
-| LogInjectionTest.java:606:35:606:42 | source(...) : Object | LogInjectionTest.java:606:26:606:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:185 |
-| LogInjectionTest.java:607:140:607:147 | source(...) : Object | LogInjectionTest.java:607:131:607:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:186 |
-| LogInjectionTest.java:608:125:608:132 | source(...) : Object | LogInjectionTest.java:608:116:608:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:186 |
-| LogInjectionTest.java:609:110:609:117 | source(...) : Object | LogInjectionTest.java:609:101:609:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:186 |
-| LogInjectionTest.java:610:95:610:102 | source(...) : Object | LogInjectionTest.java:610:86:610:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:186 |
-| LogInjectionTest.java:611:80:611:87 | source(...) : Object | LogInjectionTest.java:611:71:611:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:186 |
-| LogInjectionTest.java:612:65:612:72 | source(...) : Object | LogInjectionTest.java:612:56:612:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:186 |
-| LogInjectionTest.java:613:50:613:57 | source(...) : Object | LogInjectionTest.java:613:41:613:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:186 |
-| LogInjectionTest.java:614:35:614:42 | source(...) : Object | LogInjectionTest.java:614:26:614:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:186 |
-| LogInjectionTest.java:615:155:615:162 | source(...) : Object | LogInjectionTest.java:615:146:615:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:187 |
-| LogInjectionTest.java:616:140:616:147 | source(...) : Object | LogInjectionTest.java:616:131:616:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:187 |
-| LogInjectionTest.java:617:125:617:132 | source(...) : Object | LogInjectionTest.java:617:116:617:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:187 |
-| LogInjectionTest.java:618:110:618:117 | source(...) : Object | LogInjectionTest.java:618:101:618:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:187 |
-| LogInjectionTest.java:619:95:619:102 | source(...) : Object | LogInjectionTest.java:619:86:619:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:187 |
-| LogInjectionTest.java:620:80:620:87 | source(...) : Object | LogInjectionTest.java:620:71:620:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:187 |
-| LogInjectionTest.java:621:65:621:72 | source(...) : Object | LogInjectionTest.java:621:56:621:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:187 |
-| LogInjectionTest.java:622:50:622:57 | source(...) : Object | LogInjectionTest.java:622:41:622:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:187 |
-| LogInjectionTest.java:623:35:623:42 | source(...) : Object | LogInjectionTest.java:623:26:623:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:187 |
-| LogInjectionTest.java:624:170:624:177 | source(...) : Object | LogInjectionTest.java:624:161:624:177 | (...)... | provenance | Src:MaD:536 Sink:MaD:188 |
-| LogInjectionTest.java:625:155:625:162 | source(...) : Object | LogInjectionTest.java:625:146:625:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:188 |
-| LogInjectionTest.java:626:140:626:147 | source(...) : Object | LogInjectionTest.java:626:131:626:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:188 |
-| LogInjectionTest.java:627:125:627:132 | source(...) : Object | LogInjectionTest.java:627:116:627:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:188 |
-| LogInjectionTest.java:628:110:628:117 | source(...) : Object | LogInjectionTest.java:628:101:628:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:188 |
-| LogInjectionTest.java:629:95:629:102 | source(...) : Object | LogInjectionTest.java:629:86:629:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:188 |
-| LogInjectionTest.java:630:80:630:87 | source(...) : Object | LogInjectionTest.java:630:71:630:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:188 |
-| LogInjectionTest.java:631:65:631:72 | source(...) : Object | LogInjectionTest.java:631:56:631:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:188 |
-| LogInjectionTest.java:632:50:632:57 | source(...) : Object | LogInjectionTest.java:632:41:632:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:188 |
-| LogInjectionTest.java:633:35:633:42 | source(...) : Object | LogInjectionTest.java:633:26:633:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:188 |
-| LogInjectionTest.java:634:35:634:42 | source(...) : Object | LogInjectionTest.java:634:26:634:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:180 |
-| LogInjectionTest.java:635:55:635:62 | source(...) : Object | LogInjectionTest.java:635:41:635:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:180 |
-| LogInjectionTest.java:636:35:636:42 | source(...) : Object | LogInjectionTest.java:636:26:636:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:190 |
-| LogInjectionTest.java:637:40:637:47 | source(...) : Object | LogInjectionTest.java:637:26:637:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:191 |
-| LogInjectionTest.java:638:40:638:47 | source(...) : Object | LogInjectionTest.java:638:26:638:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:192 |
-| LogInjectionTest.java:639:40:639:47 | source(...) : Object | LogInjectionTest.java:639:25:639:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:193 |
-| LogInjectionTest.java:640:40:640:47 | source(...) : Object | LogInjectionTest.java:640:25:640:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:194 |
-| LogInjectionTest.java:641:55:641:62 | source(...) : Object | LogInjectionTest.java:641:40:641:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:195 |
-| LogInjectionTest.java:642:55:642:62 | source(...) : Object | LogInjectionTest.java:642:40:642:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:196 |
-| LogInjectionTest.java:643:50:643:57 | source(...) : Object | LogInjectionTest.java:643:40:643:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:197 |
-| LogInjectionTest.java:644:58:644:65 | source(...) : Object | LogInjectionTest.java:644:40:644:65 | (...)... | provenance | Src:MaD:536 Sink:MaD:198 |
-| LogInjectionTest.java:645:58:645:65 | source(...) : Object | LogInjectionTest.java:645:40:645:65 | (...)... | provenance | Src:MaD:536 Sink:MaD:199 |
-| LogInjectionTest.java:647:49:647:56 | source(...) : Object | LogInjectionTest.java:647:40:647:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:200 |
-| LogInjectionTest.java:648:49:648:56 | source(...) : Object | LogInjectionTest.java:648:40:648:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:210 |
-| LogInjectionTest.java:649:55:649:77 | {...} : Object[] [[]] : Object | LogInjectionTest.java:649:55:649:77 | new Object[] | provenance | Sink:MaD:210 |
-| LogInjectionTest.java:649:69:649:76 | source(...) : Object | LogInjectionTest.java:649:55:649:77 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:650:64:650:71 | source(...) : Object | LogInjectionTest.java:650:55:650:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:201 |
-| LogInjectionTest.java:651:49:651:56 | source(...) : Object | LogInjectionTest.java:651:40:651:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:201 |
-| LogInjectionTest.java:652:79:652:86 | source(...) : Object | LogInjectionTest.java:652:70:652:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:202 |
-| LogInjectionTest.java:653:64:653:71 | source(...) : Object | LogInjectionTest.java:653:55:653:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:202 |
-| LogInjectionTest.java:654:49:654:56 | source(...) : Object | LogInjectionTest.java:654:40:654:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:202 |
-| LogInjectionTest.java:655:94:655:101 | source(...) : Object | LogInjectionTest.java:655:85:655:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:203 |
-| LogInjectionTest.java:656:79:656:86 | source(...) : Object | LogInjectionTest.java:656:70:656:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:203 |
-| LogInjectionTest.java:657:64:657:71 | source(...) : Object | LogInjectionTest.java:657:55:657:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:203 |
-| LogInjectionTest.java:658:49:658:56 | source(...) : Object | LogInjectionTest.java:658:40:658:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:203 |
-| LogInjectionTest.java:659:109:659:116 | source(...) : Object | LogInjectionTest.java:659:100:659:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:204 |
-| LogInjectionTest.java:660:94:660:101 | source(...) : Object | LogInjectionTest.java:660:85:660:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:204 |
-| LogInjectionTest.java:661:79:661:86 | source(...) : Object | LogInjectionTest.java:661:70:661:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:204 |
-| LogInjectionTest.java:662:64:662:71 | source(...) : Object | LogInjectionTest.java:662:55:662:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:204 |
-| LogInjectionTest.java:663:49:663:56 | source(...) : Object | LogInjectionTest.java:663:40:663:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:204 |
-| LogInjectionTest.java:664:124:664:131 | source(...) : Object | LogInjectionTest.java:664:115:664:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:205 |
-| LogInjectionTest.java:665:109:665:116 | source(...) : Object | LogInjectionTest.java:665:100:665:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:205 |
-| LogInjectionTest.java:666:94:666:101 | source(...) : Object | LogInjectionTest.java:666:85:666:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:205 |
-| LogInjectionTest.java:667:79:667:86 | source(...) : Object | LogInjectionTest.java:667:70:667:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:205 |
-| LogInjectionTest.java:668:64:668:71 | source(...) : Object | LogInjectionTest.java:668:55:668:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:205 |
-| LogInjectionTest.java:669:49:669:56 | source(...) : Object | LogInjectionTest.java:669:40:669:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:205 |
-| LogInjectionTest.java:670:139:670:146 | source(...) : Object | LogInjectionTest.java:670:130:670:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:206 |
-| LogInjectionTest.java:671:124:671:131 | source(...) : Object | LogInjectionTest.java:671:115:671:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:206 |
-| LogInjectionTest.java:672:109:672:116 | source(...) : Object | LogInjectionTest.java:672:100:672:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:206 |
-| LogInjectionTest.java:673:94:673:101 | source(...) : Object | LogInjectionTest.java:673:85:673:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:206 |
-| LogInjectionTest.java:674:79:674:86 | source(...) : Object | LogInjectionTest.java:674:70:674:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:206 |
-| LogInjectionTest.java:675:64:675:71 | source(...) : Object | LogInjectionTest.java:675:55:675:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:206 |
-| LogInjectionTest.java:676:49:676:56 | source(...) : Object | LogInjectionTest.java:676:40:676:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:206 |
-| LogInjectionTest.java:677:154:677:161 | source(...) : Object | LogInjectionTest.java:677:145:677:161 | (...)... | provenance | Src:MaD:536 Sink:MaD:207 |
-| LogInjectionTest.java:678:139:678:146 | source(...) : Object | LogInjectionTest.java:678:130:678:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:207 |
-| LogInjectionTest.java:679:124:679:131 | source(...) : Object | LogInjectionTest.java:679:115:679:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:207 |
-| LogInjectionTest.java:680:109:680:116 | source(...) : Object | LogInjectionTest.java:680:100:680:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:207 |
-| LogInjectionTest.java:681:94:681:101 | source(...) : Object | LogInjectionTest.java:681:85:681:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:207 |
-| LogInjectionTest.java:682:79:682:86 | source(...) : Object | LogInjectionTest.java:682:70:682:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:207 |
-| LogInjectionTest.java:683:64:683:71 | source(...) : Object | LogInjectionTest.java:683:55:683:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:207 |
-| LogInjectionTest.java:684:49:684:56 | source(...) : Object | LogInjectionTest.java:684:40:684:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:207 |
-| LogInjectionTest.java:685:169:685:176 | source(...) : Object | LogInjectionTest.java:685:160:685:176 | (...)... | provenance | Src:MaD:536 Sink:MaD:208 |
-| LogInjectionTest.java:686:154:686:161 | source(...) : Object | LogInjectionTest.java:686:145:686:161 | (...)... | provenance | Src:MaD:536 Sink:MaD:208 |
-| LogInjectionTest.java:687:139:687:146 | source(...) : Object | LogInjectionTest.java:687:130:687:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:208 |
-| LogInjectionTest.java:688:124:688:131 | source(...) : Object | LogInjectionTest.java:688:115:688:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:208 |
-| LogInjectionTest.java:689:109:689:116 | source(...) : Object | LogInjectionTest.java:689:100:689:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:208 |
-| LogInjectionTest.java:690:94:690:101 | source(...) : Object | LogInjectionTest.java:690:85:690:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:208 |
-| LogInjectionTest.java:691:79:691:86 | source(...) : Object | LogInjectionTest.java:691:70:691:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:208 |
-| LogInjectionTest.java:692:64:692:71 | source(...) : Object | LogInjectionTest.java:692:55:692:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:208 |
-| LogInjectionTest.java:693:49:693:56 | source(...) : Object | LogInjectionTest.java:693:40:693:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:208 |
-| LogInjectionTest.java:694:184:694:191 | source(...) : Object | LogInjectionTest.java:694:175:694:191 | (...)... | provenance | Src:MaD:536 Sink:MaD:209 |
-| LogInjectionTest.java:695:169:695:176 | source(...) : Object | LogInjectionTest.java:695:160:695:176 | (...)... | provenance | Src:MaD:536 Sink:MaD:209 |
-| LogInjectionTest.java:696:154:696:161 | source(...) : Object | LogInjectionTest.java:696:145:696:161 | (...)... | provenance | Src:MaD:536 Sink:MaD:209 |
-| LogInjectionTest.java:697:139:697:146 | source(...) : Object | LogInjectionTest.java:697:130:697:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:209 |
-| LogInjectionTest.java:698:124:698:131 | source(...) : Object | LogInjectionTest.java:698:115:698:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:209 |
-| LogInjectionTest.java:699:109:699:116 | source(...) : Object | LogInjectionTest.java:699:100:699:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:209 |
-| LogInjectionTest.java:700:94:700:101 | source(...) : Object | LogInjectionTest.java:700:85:700:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:209 |
-| LogInjectionTest.java:701:79:701:86 | source(...) : Object | LogInjectionTest.java:701:70:701:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:209 |
-| LogInjectionTest.java:702:64:702:71 | source(...) : Object | LogInjectionTest.java:702:55:702:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:209 |
-| LogInjectionTest.java:703:49:703:56 | source(...) : Object | LogInjectionTest.java:703:40:703:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:209 |
-| LogInjectionTest.java:704:49:704:56 | source(...) : Object | LogInjectionTest.java:704:40:704:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:201 |
-| LogInjectionTest.java:705:69:705:76 | source(...) : Object | LogInjectionTest.java:705:55:705:76 | (...)... | provenance | Src:MaD:536 Sink:MaD:201 |
-| LogInjectionTest.java:706:49:706:56 | source(...) : Object | LogInjectionTest.java:706:40:706:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:211 |
-| LogInjectionTest.java:707:54:707:61 | source(...) : Object | LogInjectionTest.java:707:40:707:61 | (...)... | provenance | Src:MaD:536 Sink:MaD:212 |
-| LogInjectionTest.java:708:54:708:61 | source(...) : Object | LogInjectionTest.java:708:40:708:61 | (...)... | provenance | Src:MaD:536 Sink:MaD:213 |
-| LogInjectionTest.java:709:43:709:50 | source(...) : Object | LogInjectionTest.java:709:25:709:50 | (...)... | provenance | Src:MaD:536 Sink:MaD:216 |
-| LogInjectionTest.java:710:43:710:50 | source(...) : Object | LogInjectionTest.java:710:25:710:50 | (...)... | provenance | Src:MaD:536 Sink:MaD:217 |
-| LogInjectionTest.java:711:35:711:42 | source(...) : Object | LogInjectionTest.java:711:25:711:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:214 |
-| LogInjectionTest.java:712:35:712:42 | source(...) : Object | LogInjectionTest.java:712:25:712:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:215 |
-| LogInjectionTest.java:715:34:715:41 | source(...) : Object | LogInjectionTest.java:715:25:715:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:218 |
-| LogInjectionTest.java:716:34:716:41 | source(...) : Object | LogInjectionTest.java:716:25:716:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:228 |
-| LogInjectionTest.java:717:40:717:62 | {...} : Object[] [[]] : Object | LogInjectionTest.java:717:40:717:62 | new Object[] | provenance | Sink:MaD:228 |
-| LogInjectionTest.java:717:54:717:61 | source(...) : Object | LogInjectionTest.java:717:40:717:62 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:718:49:718:56 | source(...) : Object | LogInjectionTest.java:718:40:718:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:219 |
-| LogInjectionTest.java:719:34:719:41 | source(...) : Object | LogInjectionTest.java:719:25:719:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:219 |
-| LogInjectionTest.java:720:64:720:71 | source(...) : Object | LogInjectionTest.java:720:55:720:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:220 |
-| LogInjectionTest.java:721:49:721:56 | source(...) : Object | LogInjectionTest.java:721:40:721:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:220 |
-| LogInjectionTest.java:722:34:722:41 | source(...) : Object | LogInjectionTest.java:722:25:722:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:220 |
-| LogInjectionTest.java:723:79:723:86 | source(...) : Object | LogInjectionTest.java:723:70:723:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:221 |
-| LogInjectionTest.java:724:64:724:71 | source(...) : Object | LogInjectionTest.java:724:55:724:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:221 |
-| LogInjectionTest.java:725:49:725:56 | source(...) : Object | LogInjectionTest.java:725:40:725:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:221 |
-| LogInjectionTest.java:726:34:726:41 | source(...) : Object | LogInjectionTest.java:726:25:726:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:221 |
-| LogInjectionTest.java:727:94:727:101 | source(...) : Object | LogInjectionTest.java:727:85:727:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:222 |
-| LogInjectionTest.java:728:79:728:86 | source(...) : Object | LogInjectionTest.java:728:70:728:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:222 |
-| LogInjectionTest.java:729:64:729:71 | source(...) : Object | LogInjectionTest.java:729:55:729:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:222 |
-| LogInjectionTest.java:730:49:730:56 | source(...) : Object | LogInjectionTest.java:730:40:730:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:222 |
-| LogInjectionTest.java:731:34:731:41 | source(...) : Object | LogInjectionTest.java:731:25:731:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:222 |
-| LogInjectionTest.java:732:109:732:116 | source(...) : Object | LogInjectionTest.java:732:100:732:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:223 |
-| LogInjectionTest.java:733:94:733:101 | source(...) : Object | LogInjectionTest.java:733:85:733:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:223 |
-| LogInjectionTest.java:734:79:734:86 | source(...) : Object | LogInjectionTest.java:734:70:734:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:223 |
-| LogInjectionTest.java:735:64:735:71 | source(...) : Object | LogInjectionTest.java:735:55:735:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:223 |
-| LogInjectionTest.java:736:49:736:56 | source(...) : Object | LogInjectionTest.java:736:40:736:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:223 |
-| LogInjectionTest.java:737:34:737:41 | source(...) : Object | LogInjectionTest.java:737:25:737:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:223 |
-| LogInjectionTest.java:738:124:738:131 | source(...) : Object | LogInjectionTest.java:738:115:738:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:224 |
-| LogInjectionTest.java:739:109:739:116 | source(...) : Object | LogInjectionTest.java:739:100:739:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:224 |
-| LogInjectionTest.java:740:94:740:101 | source(...) : Object | LogInjectionTest.java:740:85:740:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:224 |
-| LogInjectionTest.java:741:79:741:86 | source(...) : Object | LogInjectionTest.java:741:70:741:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:224 |
-| LogInjectionTest.java:742:64:742:71 | source(...) : Object | LogInjectionTest.java:742:55:742:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:224 |
-| LogInjectionTest.java:743:49:743:56 | source(...) : Object | LogInjectionTest.java:743:40:743:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:224 |
-| LogInjectionTest.java:744:34:744:41 | source(...) : Object | LogInjectionTest.java:744:25:744:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:224 |
-| LogInjectionTest.java:745:139:745:146 | source(...) : Object | LogInjectionTest.java:745:130:745:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:225 |
-| LogInjectionTest.java:746:124:746:131 | source(...) : Object | LogInjectionTest.java:746:115:746:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:225 |
-| LogInjectionTest.java:747:109:747:116 | source(...) : Object | LogInjectionTest.java:747:100:747:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:225 |
-| LogInjectionTest.java:748:94:748:101 | source(...) : Object | LogInjectionTest.java:748:85:748:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:225 |
-| LogInjectionTest.java:749:79:749:86 | source(...) : Object | LogInjectionTest.java:749:70:749:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:225 |
-| LogInjectionTest.java:750:64:750:71 | source(...) : Object | LogInjectionTest.java:750:55:750:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:225 |
-| LogInjectionTest.java:751:49:751:56 | source(...) : Object | LogInjectionTest.java:751:40:751:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:225 |
-| LogInjectionTest.java:752:34:752:41 | source(...) : Object | LogInjectionTest.java:752:25:752:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:225 |
-| LogInjectionTest.java:753:154:753:161 | source(...) : Object | LogInjectionTest.java:753:145:753:161 | (...)... | provenance | Src:MaD:536 Sink:MaD:226 |
-| LogInjectionTest.java:754:139:754:146 | source(...) : Object | LogInjectionTest.java:754:130:754:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:226 |
-| LogInjectionTest.java:755:124:755:131 | source(...) : Object | LogInjectionTest.java:755:115:755:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:226 |
-| LogInjectionTest.java:756:109:756:116 | source(...) : Object | LogInjectionTest.java:756:100:756:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:226 |
-| LogInjectionTest.java:757:94:757:101 | source(...) : Object | LogInjectionTest.java:757:85:757:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:226 |
-| LogInjectionTest.java:758:79:758:86 | source(...) : Object | LogInjectionTest.java:758:70:758:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:226 |
-| LogInjectionTest.java:759:64:759:71 | source(...) : Object | LogInjectionTest.java:759:55:759:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:226 |
-| LogInjectionTest.java:760:49:760:56 | source(...) : Object | LogInjectionTest.java:760:40:760:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:226 |
-| LogInjectionTest.java:761:34:761:41 | source(...) : Object | LogInjectionTest.java:761:25:761:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:226 |
-| LogInjectionTest.java:762:169:762:176 | source(...) : Object | LogInjectionTest.java:762:160:762:176 | (...)... | provenance | Src:MaD:536 Sink:MaD:227 |
-| LogInjectionTest.java:763:154:763:161 | source(...) : Object | LogInjectionTest.java:763:145:763:161 | (...)... | provenance | Src:MaD:536 Sink:MaD:227 |
-| LogInjectionTest.java:764:139:764:146 | source(...) : Object | LogInjectionTest.java:764:130:764:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:227 |
-| LogInjectionTest.java:765:124:765:131 | source(...) : Object | LogInjectionTest.java:765:115:765:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:227 |
-| LogInjectionTest.java:766:109:766:116 | source(...) : Object | LogInjectionTest.java:766:100:766:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:227 |
-| LogInjectionTest.java:767:94:767:101 | source(...) : Object | LogInjectionTest.java:767:85:767:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:227 |
-| LogInjectionTest.java:768:79:768:86 | source(...) : Object | LogInjectionTest.java:768:70:768:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:227 |
-| LogInjectionTest.java:769:64:769:71 | source(...) : Object | LogInjectionTest.java:769:55:769:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:227 |
-| LogInjectionTest.java:770:49:770:56 | source(...) : Object | LogInjectionTest.java:770:40:770:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:227 |
-| LogInjectionTest.java:771:34:771:41 | source(...) : Object | LogInjectionTest.java:771:25:771:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:227 |
-| LogInjectionTest.java:772:34:772:41 | source(...) : Object | LogInjectionTest.java:772:25:772:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:219 |
-| LogInjectionTest.java:773:54:773:61 | source(...) : Object | LogInjectionTest.java:773:40:773:61 | (...)... | provenance | Src:MaD:536 Sink:MaD:219 |
-| LogInjectionTest.java:774:34:774:41 | source(...) : Object | LogInjectionTest.java:774:25:774:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:229 |
-| LogInjectionTest.java:775:39:775:46 | source(...) : Object | LogInjectionTest.java:775:25:775:46 | (...)... | provenance | Src:MaD:536 Sink:MaD:230 |
-| LogInjectionTest.java:776:39:776:46 | source(...) : Object | LogInjectionTest.java:776:25:776:46 | (...)... | provenance | Src:MaD:536 Sink:MaD:231 |
-| LogInjectionTest.java:777:53:777:60 | source(...) : Object | LogInjectionTest.java:777:38:777:60 | (...)... | provenance | Src:MaD:536 Sink:MaD:232 |
-| LogInjectionTest.java:778:53:778:60 | source(...) : Object | LogInjectionTest.java:778:38:778:60 | (...)... | provenance | Src:MaD:536 Sink:MaD:233 |
-| LogInjectionTest.java:779:68:779:75 | source(...) : Object | LogInjectionTest.java:779:53:779:75 | (...)... | provenance | Src:MaD:536 Sink:MaD:234 |
-| LogInjectionTest.java:780:68:780:75 | source(...) : Object | LogInjectionTest.java:780:53:780:75 | (...)... | provenance | Src:MaD:536 Sink:MaD:235 |
-| LogInjectionTest.java:781:63:781:70 | source(...) : Object | LogInjectionTest.java:781:53:781:70 | (...)... | provenance | Src:MaD:536 Sink:MaD:236 |
-| LogInjectionTest.java:782:71:782:78 | source(...) : Object | LogInjectionTest.java:782:53:782:78 | (...)... | provenance | Src:MaD:536 Sink:MaD:237 |
-| LogInjectionTest.java:783:71:783:78 | source(...) : Object | LogInjectionTest.java:783:53:783:78 | (...)... | provenance | Src:MaD:536 Sink:MaD:238 |
-| LogInjectionTest.java:785:62:785:69 | source(...) : Object | LogInjectionTest.java:785:53:785:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:239 |
-| LogInjectionTest.java:786:62:786:69 | source(...) : Object | LogInjectionTest.java:786:53:786:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:249 |
-| LogInjectionTest.java:787:68:787:90 | {...} : Object[] [[]] : Object | LogInjectionTest.java:787:68:787:90 | new Object[] | provenance | Sink:MaD:249 |
-| LogInjectionTest.java:787:82:787:89 | source(...) : Object | LogInjectionTest.java:787:68:787:90 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:788:77:788:84 | source(...) : Object | LogInjectionTest.java:788:68:788:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:240 |
-| LogInjectionTest.java:789:62:789:69 | source(...) : Object | LogInjectionTest.java:789:53:789:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:240 |
-| LogInjectionTest.java:790:92:790:99 | source(...) : Object | LogInjectionTest.java:790:83:790:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:241 |
-| LogInjectionTest.java:791:77:791:84 | source(...) : Object | LogInjectionTest.java:791:68:791:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:241 |
-| LogInjectionTest.java:792:62:792:69 | source(...) : Object | LogInjectionTest.java:792:53:792:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:241 |
-| LogInjectionTest.java:793:107:793:114 | source(...) : Object | LogInjectionTest.java:793:98:793:114 | (...)... | provenance | Src:MaD:536 Sink:MaD:242 |
-| LogInjectionTest.java:794:92:794:99 | source(...) : Object | LogInjectionTest.java:794:83:794:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:242 |
-| LogInjectionTest.java:795:77:795:84 | source(...) : Object | LogInjectionTest.java:795:68:795:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:242 |
-| LogInjectionTest.java:796:62:796:69 | source(...) : Object | LogInjectionTest.java:796:53:796:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:242 |
-| LogInjectionTest.java:797:122:797:129 | source(...) : Object | LogInjectionTest.java:797:113:797:129 | (...)... | provenance | Src:MaD:536 Sink:MaD:243 |
-| LogInjectionTest.java:798:107:798:114 | source(...) : Object | LogInjectionTest.java:798:98:798:114 | (...)... | provenance | Src:MaD:536 Sink:MaD:243 |
-| LogInjectionTest.java:799:92:799:99 | source(...) : Object | LogInjectionTest.java:799:83:799:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:243 |
-| LogInjectionTest.java:800:77:800:84 | source(...) : Object | LogInjectionTest.java:800:68:800:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:243 |
-| LogInjectionTest.java:801:62:801:69 | source(...) : Object | LogInjectionTest.java:801:53:801:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:243 |
-| LogInjectionTest.java:802:137:802:144 | source(...) : Object | LogInjectionTest.java:802:128:802:144 | (...)... | provenance | Src:MaD:536 Sink:MaD:244 |
-| LogInjectionTest.java:803:122:803:129 | source(...) : Object | LogInjectionTest.java:803:113:803:129 | (...)... | provenance | Src:MaD:536 Sink:MaD:244 |
-| LogInjectionTest.java:804:107:804:114 | source(...) : Object | LogInjectionTest.java:804:98:804:114 | (...)... | provenance | Src:MaD:536 Sink:MaD:244 |
-| LogInjectionTest.java:805:92:805:99 | source(...) : Object | LogInjectionTest.java:805:83:805:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:244 |
-| LogInjectionTest.java:806:77:806:84 | source(...) : Object | LogInjectionTest.java:806:68:806:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:244 |
-| LogInjectionTest.java:807:62:807:69 | source(...) : Object | LogInjectionTest.java:807:53:807:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:244 |
-| LogInjectionTest.java:808:152:808:159 | source(...) : Object | LogInjectionTest.java:808:143:808:159 | (...)... | provenance | Src:MaD:536 Sink:MaD:245 |
-| LogInjectionTest.java:809:137:809:144 | source(...) : Object | LogInjectionTest.java:809:128:809:144 | (...)... | provenance | Src:MaD:536 Sink:MaD:245 |
-| LogInjectionTest.java:810:122:810:129 | source(...) : Object | LogInjectionTest.java:810:113:810:129 | (...)... | provenance | Src:MaD:536 Sink:MaD:245 |
-| LogInjectionTest.java:811:107:811:114 | source(...) : Object | LogInjectionTest.java:811:98:811:114 | (...)... | provenance | Src:MaD:536 Sink:MaD:245 |
-| LogInjectionTest.java:812:92:812:99 | source(...) : Object | LogInjectionTest.java:812:83:812:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:245 |
-| LogInjectionTest.java:813:77:813:84 | source(...) : Object | LogInjectionTest.java:813:68:813:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:245 |
-| LogInjectionTest.java:814:62:814:69 | source(...) : Object | LogInjectionTest.java:814:53:814:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:245 |
-| LogInjectionTest.java:815:167:815:174 | source(...) : Object | LogInjectionTest.java:815:158:815:174 | (...)... | provenance | Src:MaD:536 Sink:MaD:246 |
-| LogInjectionTest.java:816:152:816:159 | source(...) : Object | LogInjectionTest.java:816:143:816:159 | (...)... | provenance | Src:MaD:536 Sink:MaD:246 |
-| LogInjectionTest.java:817:137:817:144 | source(...) : Object | LogInjectionTest.java:817:128:817:144 | (...)... | provenance | Src:MaD:536 Sink:MaD:246 |
-| LogInjectionTest.java:818:122:818:129 | source(...) : Object | LogInjectionTest.java:818:113:818:129 | (...)... | provenance | Src:MaD:536 Sink:MaD:246 |
-| LogInjectionTest.java:819:107:819:114 | source(...) : Object | LogInjectionTest.java:819:98:819:114 | (...)... | provenance | Src:MaD:536 Sink:MaD:246 |
-| LogInjectionTest.java:820:92:820:99 | source(...) : Object | LogInjectionTest.java:820:83:820:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:246 |
-| LogInjectionTest.java:821:77:821:84 | source(...) : Object | LogInjectionTest.java:821:68:821:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:246 |
-| LogInjectionTest.java:822:62:822:69 | source(...) : Object | LogInjectionTest.java:822:53:822:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:246 |
-| LogInjectionTest.java:823:182:823:189 | source(...) : Object | LogInjectionTest.java:823:173:823:189 | (...)... | provenance | Src:MaD:536 Sink:MaD:247 |
-| LogInjectionTest.java:824:167:824:174 | source(...) : Object | LogInjectionTest.java:824:158:824:174 | (...)... | provenance | Src:MaD:536 Sink:MaD:247 |
-| LogInjectionTest.java:825:152:825:159 | source(...) : Object | LogInjectionTest.java:825:143:825:159 | (...)... | provenance | Src:MaD:536 Sink:MaD:247 |
-| LogInjectionTest.java:826:137:826:144 | source(...) : Object | LogInjectionTest.java:826:128:826:144 | (...)... | provenance | Src:MaD:536 Sink:MaD:247 |
-| LogInjectionTest.java:827:122:827:129 | source(...) : Object | LogInjectionTest.java:827:113:827:129 | (...)... | provenance | Src:MaD:536 Sink:MaD:247 |
-| LogInjectionTest.java:828:107:828:114 | source(...) : Object | LogInjectionTest.java:828:98:828:114 | (...)... | provenance | Src:MaD:536 Sink:MaD:247 |
-| LogInjectionTest.java:829:92:829:99 | source(...) : Object | LogInjectionTest.java:829:83:829:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:247 |
-| LogInjectionTest.java:830:77:830:84 | source(...) : Object | LogInjectionTest.java:830:68:830:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:247 |
-| LogInjectionTest.java:831:62:831:69 | source(...) : Object | LogInjectionTest.java:831:53:831:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:247 |
-| LogInjectionTest.java:832:197:832:204 | source(...) : Object | LogInjectionTest.java:832:188:832:204 | (...)... | provenance | Src:MaD:536 Sink:MaD:248 |
-| LogInjectionTest.java:833:182:833:189 | source(...) : Object | LogInjectionTest.java:833:173:833:189 | (...)... | provenance | Src:MaD:536 Sink:MaD:248 |
-| LogInjectionTest.java:834:167:834:174 | source(...) : Object | LogInjectionTest.java:834:158:834:174 | (...)... | provenance | Src:MaD:536 Sink:MaD:248 |
-| LogInjectionTest.java:835:152:835:159 | source(...) : Object | LogInjectionTest.java:835:143:835:159 | (...)... | provenance | Src:MaD:536 Sink:MaD:248 |
-| LogInjectionTest.java:836:137:836:144 | source(...) : Object | LogInjectionTest.java:836:128:836:144 | (...)... | provenance | Src:MaD:536 Sink:MaD:248 |
-| LogInjectionTest.java:837:122:837:129 | source(...) : Object | LogInjectionTest.java:837:113:837:129 | (...)... | provenance | Src:MaD:536 Sink:MaD:248 |
-| LogInjectionTest.java:838:107:838:114 | source(...) : Object | LogInjectionTest.java:838:98:838:114 | (...)... | provenance | Src:MaD:536 Sink:MaD:248 |
-| LogInjectionTest.java:839:92:839:99 | source(...) : Object | LogInjectionTest.java:839:83:839:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:248 |
-| LogInjectionTest.java:840:77:840:84 | source(...) : Object | LogInjectionTest.java:840:68:840:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:248 |
-| LogInjectionTest.java:841:62:841:69 | source(...) : Object | LogInjectionTest.java:841:53:841:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:248 |
-| LogInjectionTest.java:842:62:842:69 | source(...) : Object | LogInjectionTest.java:842:53:842:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:240 |
-| LogInjectionTest.java:843:82:843:89 | source(...) : Object | LogInjectionTest.java:843:68:843:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:240 |
-| LogInjectionTest.java:844:62:844:69 | source(...) : Object | LogInjectionTest.java:844:53:844:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:250 |
-| LogInjectionTest.java:845:67:845:74 | source(...) : Object | LogInjectionTest.java:845:53:845:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:251 |
-| LogInjectionTest.java:846:67:846:74 | source(...) : Object | LogInjectionTest.java:846:53:846:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:252 |
-| LogInjectionTest.java:847:56:847:63 | source(...) : Object | LogInjectionTest.java:847:38:847:63 | (...)... | provenance | Src:MaD:536 Sink:MaD:255 |
-| LogInjectionTest.java:848:56:848:63 | source(...) : Object | LogInjectionTest.java:848:38:848:63 | (...)... | provenance | Src:MaD:536 Sink:MaD:256 |
-| LogInjectionTest.java:849:48:849:55 | source(...) : Object | LogInjectionTest.java:849:38:849:55 | (...)... | provenance | Src:MaD:536 Sink:MaD:253 |
-| LogInjectionTest.java:850:48:850:55 | source(...) : Object | LogInjectionTest.java:850:38:850:55 | (...)... | provenance | Src:MaD:536 Sink:MaD:254 |
-| LogInjectionTest.java:853:47:853:54 | source(...) : Object | LogInjectionTest.java:853:38:853:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:257 |
-| LogInjectionTest.java:854:47:854:54 | source(...) : Object | LogInjectionTest.java:854:38:854:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:267 |
-| LogInjectionTest.java:855:53:855:75 | {...} : Object[] [[]] : Object | LogInjectionTest.java:855:53:855:75 | new Object[] | provenance | Sink:MaD:267 |
-| LogInjectionTest.java:855:67:855:74 | source(...) : Object | LogInjectionTest.java:855:53:855:75 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:856:62:856:69 | source(...) : Object | LogInjectionTest.java:856:53:856:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:258 |
-| LogInjectionTest.java:857:47:857:54 | source(...) : Object | LogInjectionTest.java:857:38:857:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:258 |
-| LogInjectionTest.java:858:77:858:84 | source(...) : Object | LogInjectionTest.java:858:68:858:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:259 |
-| LogInjectionTest.java:859:62:859:69 | source(...) : Object | LogInjectionTest.java:859:53:859:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:259 |
-| LogInjectionTest.java:860:47:860:54 | source(...) : Object | LogInjectionTest.java:860:38:860:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:259 |
-| LogInjectionTest.java:861:92:861:99 | source(...) : Object | LogInjectionTest.java:861:83:861:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:260 |
-| LogInjectionTest.java:862:77:862:84 | source(...) : Object | LogInjectionTest.java:862:68:862:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:260 |
-| LogInjectionTest.java:863:62:863:69 | source(...) : Object | LogInjectionTest.java:863:53:863:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:260 |
-| LogInjectionTest.java:864:47:864:54 | source(...) : Object | LogInjectionTest.java:864:38:864:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:260 |
-| LogInjectionTest.java:865:107:865:114 | source(...) : Object | LogInjectionTest.java:865:98:865:114 | (...)... | provenance | Src:MaD:536 Sink:MaD:261 |
-| LogInjectionTest.java:866:92:866:99 | source(...) : Object | LogInjectionTest.java:866:83:866:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:261 |
-| LogInjectionTest.java:867:77:867:84 | source(...) : Object | LogInjectionTest.java:867:68:867:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:261 |
-| LogInjectionTest.java:868:62:868:69 | source(...) : Object | LogInjectionTest.java:868:53:868:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:261 |
-| LogInjectionTest.java:869:47:869:54 | source(...) : Object | LogInjectionTest.java:869:38:869:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:261 |
-| LogInjectionTest.java:870:122:870:129 | source(...) : Object | LogInjectionTest.java:870:113:870:129 | (...)... | provenance | Src:MaD:536 Sink:MaD:262 |
-| LogInjectionTest.java:871:107:871:114 | source(...) : Object | LogInjectionTest.java:871:98:871:114 | (...)... | provenance | Src:MaD:536 Sink:MaD:262 |
-| LogInjectionTest.java:872:92:872:99 | source(...) : Object | LogInjectionTest.java:872:83:872:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:262 |
-| LogInjectionTest.java:873:77:873:84 | source(...) : Object | LogInjectionTest.java:873:68:873:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:262 |
-| LogInjectionTest.java:874:62:874:69 | source(...) : Object | LogInjectionTest.java:874:53:874:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:262 |
-| LogInjectionTest.java:875:47:875:54 | source(...) : Object | LogInjectionTest.java:875:38:875:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:262 |
-| LogInjectionTest.java:876:137:876:144 | source(...) : Object | LogInjectionTest.java:876:128:876:144 | (...)... | provenance | Src:MaD:536 Sink:MaD:263 |
-| LogInjectionTest.java:877:122:877:129 | source(...) : Object | LogInjectionTest.java:877:113:877:129 | (...)... | provenance | Src:MaD:536 Sink:MaD:263 |
-| LogInjectionTest.java:878:107:878:114 | source(...) : Object | LogInjectionTest.java:878:98:878:114 | (...)... | provenance | Src:MaD:536 Sink:MaD:263 |
-| LogInjectionTest.java:879:92:879:99 | source(...) : Object | LogInjectionTest.java:879:83:879:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:263 |
-| LogInjectionTest.java:880:77:880:84 | source(...) : Object | LogInjectionTest.java:880:68:880:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:263 |
-| LogInjectionTest.java:881:62:881:69 | source(...) : Object | LogInjectionTest.java:881:53:881:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:263 |
-| LogInjectionTest.java:882:47:882:54 | source(...) : Object | LogInjectionTest.java:882:38:882:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:263 |
-| LogInjectionTest.java:883:152:883:159 | source(...) : Object | LogInjectionTest.java:883:143:883:159 | (...)... | provenance | Src:MaD:536 Sink:MaD:264 |
-| LogInjectionTest.java:884:137:884:144 | source(...) : Object | LogInjectionTest.java:884:128:884:144 | (...)... | provenance | Src:MaD:536 Sink:MaD:264 |
-| LogInjectionTest.java:885:122:885:129 | source(...) : Object | LogInjectionTest.java:885:113:885:129 | (...)... | provenance | Src:MaD:536 Sink:MaD:264 |
-| LogInjectionTest.java:886:107:886:114 | source(...) : Object | LogInjectionTest.java:886:98:886:114 | (...)... | provenance | Src:MaD:536 Sink:MaD:264 |
-| LogInjectionTest.java:887:92:887:99 | source(...) : Object | LogInjectionTest.java:887:83:887:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:264 |
-| LogInjectionTest.java:888:77:888:84 | source(...) : Object | LogInjectionTest.java:888:68:888:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:264 |
-| LogInjectionTest.java:889:62:889:69 | source(...) : Object | LogInjectionTest.java:889:53:889:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:264 |
-| LogInjectionTest.java:890:47:890:54 | source(...) : Object | LogInjectionTest.java:890:38:890:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:264 |
-| LogInjectionTest.java:891:167:891:174 | source(...) : Object | LogInjectionTest.java:891:158:891:174 | (...)... | provenance | Src:MaD:536 Sink:MaD:265 |
-| LogInjectionTest.java:892:152:892:159 | source(...) : Object | LogInjectionTest.java:892:143:892:159 | (...)... | provenance | Src:MaD:536 Sink:MaD:265 |
-| LogInjectionTest.java:893:137:893:144 | source(...) : Object | LogInjectionTest.java:893:128:893:144 | (...)... | provenance | Src:MaD:536 Sink:MaD:265 |
-| LogInjectionTest.java:894:122:894:129 | source(...) : Object | LogInjectionTest.java:894:113:894:129 | (...)... | provenance | Src:MaD:536 Sink:MaD:265 |
-| LogInjectionTest.java:895:107:895:114 | source(...) : Object | LogInjectionTest.java:895:98:895:114 | (...)... | provenance | Src:MaD:536 Sink:MaD:265 |
-| LogInjectionTest.java:896:92:896:99 | source(...) : Object | LogInjectionTest.java:896:83:896:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:265 |
-| LogInjectionTest.java:897:77:897:84 | source(...) : Object | LogInjectionTest.java:897:68:897:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:265 |
-| LogInjectionTest.java:898:62:898:69 | source(...) : Object | LogInjectionTest.java:898:53:898:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:265 |
-| LogInjectionTest.java:899:47:899:54 | source(...) : Object | LogInjectionTest.java:899:38:899:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:265 |
-| LogInjectionTest.java:900:182:900:189 | source(...) : Object | LogInjectionTest.java:900:173:900:189 | (...)... | provenance | Src:MaD:536 Sink:MaD:266 |
-| LogInjectionTest.java:901:167:901:174 | source(...) : Object | LogInjectionTest.java:901:158:901:174 | (...)... | provenance | Src:MaD:536 Sink:MaD:266 |
-| LogInjectionTest.java:902:152:902:159 | source(...) : Object | LogInjectionTest.java:902:143:902:159 | (...)... | provenance | Src:MaD:536 Sink:MaD:266 |
-| LogInjectionTest.java:903:137:903:144 | source(...) : Object | LogInjectionTest.java:903:128:903:144 | (...)... | provenance | Src:MaD:536 Sink:MaD:266 |
-| LogInjectionTest.java:904:122:904:129 | source(...) : Object | LogInjectionTest.java:904:113:904:129 | (...)... | provenance | Src:MaD:536 Sink:MaD:266 |
-| LogInjectionTest.java:905:107:905:114 | source(...) : Object | LogInjectionTest.java:905:98:905:114 | (...)... | provenance | Src:MaD:536 Sink:MaD:266 |
-| LogInjectionTest.java:906:92:906:99 | source(...) : Object | LogInjectionTest.java:906:83:906:99 | (...)... | provenance | Src:MaD:536 Sink:MaD:266 |
-| LogInjectionTest.java:907:77:907:84 | source(...) : Object | LogInjectionTest.java:907:68:907:84 | (...)... | provenance | Src:MaD:536 Sink:MaD:266 |
-| LogInjectionTest.java:908:62:908:69 | source(...) : Object | LogInjectionTest.java:908:53:908:69 | (...)... | provenance | Src:MaD:536 Sink:MaD:266 |
-| LogInjectionTest.java:909:47:909:54 | source(...) : Object | LogInjectionTest.java:909:38:909:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:266 |
-| LogInjectionTest.java:910:47:910:54 | source(...) : Object | LogInjectionTest.java:910:38:910:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:258 |
-| LogInjectionTest.java:911:67:911:74 | source(...) : Object | LogInjectionTest.java:911:53:911:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:258 |
-| LogInjectionTest.java:912:47:912:54 | source(...) : Object | LogInjectionTest.java:912:38:912:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:268 |
-| LogInjectionTest.java:913:52:913:59 | source(...) : Object | LogInjectionTest.java:913:38:913:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:269 |
-| LogInjectionTest.java:914:52:914:59 | source(...) : Object | LogInjectionTest.java:914:38:914:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:270 |
-| LogInjectionTest.java:915:41:915:48 | source(...) : Object | LogInjectionTest.java:915:26:915:48 | (...)... | provenance | Src:MaD:536 Sink:MaD:274 |
-| LogInjectionTest.java:916:41:916:48 | source(...) : Object | LogInjectionTest.java:916:26:916:48 | (...)... | provenance | Src:MaD:536 Sink:MaD:275 |
-| LogInjectionTest.java:917:56:917:63 | source(...) : Object | LogInjectionTest.java:917:41:917:63 | (...)... | provenance | Src:MaD:536 Sink:MaD:276 |
-| LogInjectionTest.java:918:56:918:63 | source(...) : Object | LogInjectionTest.java:918:41:918:63 | (...)... | provenance | Src:MaD:536 Sink:MaD:277 |
-| LogInjectionTest.java:919:51:919:58 | source(...) : Object | LogInjectionTest.java:919:41:919:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:278 |
-| LogInjectionTest.java:920:59:920:66 | source(...) : Object | LogInjectionTest.java:920:41:920:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:279 |
-| LogInjectionTest.java:921:59:921:66 | source(...) : Object | LogInjectionTest.java:921:41:921:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:280 |
-| LogInjectionTest.java:923:50:923:57 | source(...) : Object | LogInjectionTest.java:923:41:923:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:281 |
-| LogInjectionTest.java:924:50:924:57 | source(...) : Object | LogInjectionTest.java:924:41:924:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:291 |
-| LogInjectionTest.java:925:56:925:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:925:56:925:78 | new Object[] | provenance | Sink:MaD:291 |
-| LogInjectionTest.java:925:70:925:77 | source(...) : Object | LogInjectionTest.java:925:56:925:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:926:65:926:72 | source(...) : Object | LogInjectionTest.java:926:56:926:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:282 |
-| LogInjectionTest.java:927:50:927:57 | source(...) : Object | LogInjectionTest.java:927:41:927:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:282 |
-| LogInjectionTest.java:928:80:928:87 | source(...) : Object | LogInjectionTest.java:928:71:928:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:283 |
-| LogInjectionTest.java:929:65:929:72 | source(...) : Object | LogInjectionTest.java:929:56:929:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:283 |
-| LogInjectionTest.java:930:50:930:57 | source(...) : Object | LogInjectionTest.java:930:41:930:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:283 |
-| LogInjectionTest.java:931:95:931:102 | source(...) : Object | LogInjectionTest.java:931:86:931:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:284 |
-| LogInjectionTest.java:932:80:932:87 | source(...) : Object | LogInjectionTest.java:932:71:932:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:284 |
-| LogInjectionTest.java:933:65:933:72 | source(...) : Object | LogInjectionTest.java:933:56:933:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:284 |
-| LogInjectionTest.java:934:50:934:57 | source(...) : Object | LogInjectionTest.java:934:41:934:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:284 |
-| LogInjectionTest.java:935:110:935:117 | source(...) : Object | LogInjectionTest.java:935:101:935:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:285 |
-| LogInjectionTest.java:936:95:936:102 | source(...) : Object | LogInjectionTest.java:936:86:936:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:285 |
-| LogInjectionTest.java:937:80:937:87 | source(...) : Object | LogInjectionTest.java:937:71:937:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:285 |
-| LogInjectionTest.java:938:65:938:72 | source(...) : Object | LogInjectionTest.java:938:56:938:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:285 |
-| LogInjectionTest.java:939:50:939:57 | source(...) : Object | LogInjectionTest.java:939:41:939:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:285 |
-| LogInjectionTest.java:940:125:940:132 | source(...) : Object | LogInjectionTest.java:940:116:940:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:286 |
-| LogInjectionTest.java:941:110:941:117 | source(...) : Object | LogInjectionTest.java:941:101:941:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:286 |
-| LogInjectionTest.java:942:95:942:102 | source(...) : Object | LogInjectionTest.java:942:86:942:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:286 |
-| LogInjectionTest.java:943:80:943:87 | source(...) : Object | LogInjectionTest.java:943:71:943:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:286 |
-| LogInjectionTest.java:944:65:944:72 | source(...) : Object | LogInjectionTest.java:944:56:944:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:286 |
-| LogInjectionTest.java:945:50:945:57 | source(...) : Object | LogInjectionTest.java:945:41:945:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:286 |
-| LogInjectionTest.java:946:140:946:147 | source(...) : Object | LogInjectionTest.java:946:131:946:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:287 |
-| LogInjectionTest.java:947:125:947:132 | source(...) : Object | LogInjectionTest.java:947:116:947:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:287 |
-| LogInjectionTest.java:948:110:948:117 | source(...) : Object | LogInjectionTest.java:948:101:948:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:287 |
-| LogInjectionTest.java:949:95:949:102 | source(...) : Object | LogInjectionTest.java:949:86:949:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:287 |
-| LogInjectionTest.java:950:80:950:87 | source(...) : Object | LogInjectionTest.java:950:71:950:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:287 |
-| LogInjectionTest.java:951:65:951:72 | source(...) : Object | LogInjectionTest.java:951:56:951:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:287 |
-| LogInjectionTest.java:952:50:952:57 | source(...) : Object | LogInjectionTest.java:952:41:952:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:287 |
-| LogInjectionTest.java:953:155:953:162 | source(...) : Object | LogInjectionTest.java:953:146:953:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:288 |
-| LogInjectionTest.java:954:140:954:147 | source(...) : Object | LogInjectionTest.java:954:131:954:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:288 |
-| LogInjectionTest.java:955:125:955:132 | source(...) : Object | LogInjectionTest.java:955:116:955:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:288 |
-| LogInjectionTest.java:956:110:956:117 | source(...) : Object | LogInjectionTest.java:956:101:956:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:288 |
-| LogInjectionTest.java:957:95:957:102 | source(...) : Object | LogInjectionTest.java:957:86:957:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:288 |
-| LogInjectionTest.java:958:80:958:87 | source(...) : Object | LogInjectionTest.java:958:71:958:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:288 |
-| LogInjectionTest.java:959:65:959:72 | source(...) : Object | LogInjectionTest.java:959:56:959:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:288 |
-| LogInjectionTest.java:960:50:960:57 | source(...) : Object | LogInjectionTest.java:960:41:960:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:288 |
-| LogInjectionTest.java:961:170:961:177 | source(...) : Object | LogInjectionTest.java:961:161:961:177 | (...)... | provenance | Src:MaD:536 Sink:MaD:289 |
-| LogInjectionTest.java:962:155:962:162 | source(...) : Object | LogInjectionTest.java:962:146:962:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:289 |
-| LogInjectionTest.java:963:140:963:147 | source(...) : Object | LogInjectionTest.java:963:131:963:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:289 |
-| LogInjectionTest.java:964:125:964:132 | source(...) : Object | LogInjectionTest.java:964:116:964:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:289 |
-| LogInjectionTest.java:965:110:965:117 | source(...) : Object | LogInjectionTest.java:965:101:965:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:289 |
-| LogInjectionTest.java:966:95:966:102 | source(...) : Object | LogInjectionTest.java:966:86:966:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:289 |
-| LogInjectionTest.java:967:80:967:87 | source(...) : Object | LogInjectionTest.java:967:71:967:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:289 |
-| LogInjectionTest.java:968:65:968:72 | source(...) : Object | LogInjectionTest.java:968:56:968:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:289 |
-| LogInjectionTest.java:969:50:969:57 | source(...) : Object | LogInjectionTest.java:969:41:969:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:289 |
-| LogInjectionTest.java:970:185:970:192 | source(...) : Object | LogInjectionTest.java:970:176:970:192 | (...)... | provenance | Src:MaD:536 Sink:MaD:290 |
-| LogInjectionTest.java:971:170:971:177 | source(...) : Object | LogInjectionTest.java:971:161:971:177 | (...)... | provenance | Src:MaD:536 Sink:MaD:290 |
-| LogInjectionTest.java:972:155:972:162 | source(...) : Object | LogInjectionTest.java:972:146:972:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:290 |
-| LogInjectionTest.java:973:140:973:147 | source(...) : Object | LogInjectionTest.java:973:131:973:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:290 |
-| LogInjectionTest.java:974:125:974:132 | source(...) : Object | LogInjectionTest.java:974:116:974:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:290 |
-| LogInjectionTest.java:975:110:975:117 | source(...) : Object | LogInjectionTest.java:975:101:975:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:290 |
-| LogInjectionTest.java:976:95:976:102 | source(...) : Object | LogInjectionTest.java:976:86:976:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:290 |
-| LogInjectionTest.java:977:80:977:87 | source(...) : Object | LogInjectionTest.java:977:71:977:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:290 |
-| LogInjectionTest.java:978:65:978:72 | source(...) : Object | LogInjectionTest.java:978:56:978:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:290 |
-| LogInjectionTest.java:979:50:979:57 | source(...) : Object | LogInjectionTest.java:979:41:979:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:290 |
-| LogInjectionTest.java:980:50:980:57 | source(...) : Object | LogInjectionTest.java:980:41:980:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:282 |
-| LogInjectionTest.java:981:70:981:77 | source(...) : Object | LogInjectionTest.java:981:56:981:77 | (...)... | provenance | Src:MaD:536 Sink:MaD:282 |
-| LogInjectionTest.java:982:50:982:57 | source(...) : Object | LogInjectionTest.java:982:41:982:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:292 |
-| LogInjectionTest.java:983:55:983:62 | source(...) : Object | LogInjectionTest.java:983:41:983:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:293 |
-| LogInjectionTest.java:984:55:984:62 | source(...) : Object | LogInjectionTest.java:984:41:984:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:294 |
-| LogInjectionTest.java:985:44:985:51 | source(...) : Object | LogInjectionTest.java:985:26:985:51 | (...)... | provenance | Src:MaD:536 Sink:MaD:297 |
-| LogInjectionTest.java:986:44:986:51 | source(...) : Object | LogInjectionTest.java:986:26:986:51 | (...)... | provenance | Src:MaD:536 Sink:MaD:298 |
-| LogInjectionTest.java:987:36:987:43 | source(...) : Object | LogInjectionTest.java:987:26:987:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:295 |
-| LogInjectionTest.java:988:36:988:43 | source(...) : Object | LogInjectionTest.java:988:26:988:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:296 |
-| LogInjectionTest.java:991:35:991:42 | source(...) : Object | LogInjectionTest.java:991:26:991:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:299 |
-| LogInjectionTest.java:992:35:992:42 | source(...) : Object | LogInjectionTest.java:992:26:992:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:309 |
-| LogInjectionTest.java:993:41:993:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:993:41:993:63 | new Object[] | provenance | Sink:MaD:309 |
-| LogInjectionTest.java:993:55:993:62 | source(...) : Object | LogInjectionTest.java:993:41:993:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:994:50:994:57 | source(...) : Object | LogInjectionTest.java:994:41:994:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:300 |
-| LogInjectionTest.java:995:35:995:42 | source(...) : Object | LogInjectionTest.java:995:26:995:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:300 |
-| LogInjectionTest.java:996:65:996:72 | source(...) : Object | LogInjectionTest.java:996:56:996:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:301 |
-| LogInjectionTest.java:997:50:997:57 | source(...) : Object | LogInjectionTest.java:997:41:997:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:301 |
-| LogInjectionTest.java:998:35:998:42 | source(...) : Object | LogInjectionTest.java:998:26:998:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:301 |
-| LogInjectionTest.java:999:80:999:87 | source(...) : Object | LogInjectionTest.java:999:71:999:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:302 |
-| LogInjectionTest.java:1000:65:1000:72 | source(...) : Object | LogInjectionTest.java:1000:56:1000:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:302 |
-| LogInjectionTest.java:1001:50:1001:57 | source(...) : Object | LogInjectionTest.java:1001:41:1001:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:302 |
-| LogInjectionTest.java:1002:35:1002:42 | source(...) : Object | LogInjectionTest.java:1002:26:1002:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:302 |
-| LogInjectionTest.java:1003:95:1003:102 | source(...) : Object | LogInjectionTest.java:1003:86:1003:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:303 |
-| LogInjectionTest.java:1004:80:1004:87 | source(...) : Object | LogInjectionTest.java:1004:71:1004:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:303 |
-| LogInjectionTest.java:1005:65:1005:72 | source(...) : Object | LogInjectionTest.java:1005:56:1005:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:303 |
-| LogInjectionTest.java:1006:50:1006:57 | source(...) : Object | LogInjectionTest.java:1006:41:1006:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:303 |
-| LogInjectionTest.java:1007:35:1007:42 | source(...) : Object | LogInjectionTest.java:1007:26:1007:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:303 |
-| LogInjectionTest.java:1008:110:1008:117 | source(...) : Object | LogInjectionTest.java:1008:101:1008:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:304 |
-| LogInjectionTest.java:1009:95:1009:102 | source(...) : Object | LogInjectionTest.java:1009:86:1009:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:304 |
-| LogInjectionTest.java:1010:80:1010:87 | source(...) : Object | LogInjectionTest.java:1010:71:1010:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:304 |
-| LogInjectionTest.java:1011:65:1011:72 | source(...) : Object | LogInjectionTest.java:1011:56:1011:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:304 |
-| LogInjectionTest.java:1012:50:1012:57 | source(...) : Object | LogInjectionTest.java:1012:41:1012:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:304 |
-| LogInjectionTest.java:1013:35:1013:42 | source(...) : Object | LogInjectionTest.java:1013:26:1013:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:304 |
-| LogInjectionTest.java:1014:125:1014:132 | source(...) : Object | LogInjectionTest.java:1014:116:1014:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:305 |
-| LogInjectionTest.java:1015:110:1015:117 | source(...) : Object | LogInjectionTest.java:1015:101:1015:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:305 |
-| LogInjectionTest.java:1016:95:1016:102 | source(...) : Object | LogInjectionTest.java:1016:86:1016:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:305 |
-| LogInjectionTest.java:1017:80:1017:87 | source(...) : Object | LogInjectionTest.java:1017:71:1017:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:305 |
-| LogInjectionTest.java:1018:65:1018:72 | source(...) : Object | LogInjectionTest.java:1018:56:1018:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:305 |
-| LogInjectionTest.java:1019:50:1019:57 | source(...) : Object | LogInjectionTest.java:1019:41:1019:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:305 |
-| LogInjectionTest.java:1020:35:1020:42 | source(...) : Object | LogInjectionTest.java:1020:26:1020:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:305 |
-| LogInjectionTest.java:1021:140:1021:147 | source(...) : Object | LogInjectionTest.java:1021:131:1021:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:306 |
-| LogInjectionTest.java:1022:125:1022:132 | source(...) : Object | LogInjectionTest.java:1022:116:1022:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:306 |
-| LogInjectionTest.java:1023:110:1023:117 | source(...) : Object | LogInjectionTest.java:1023:101:1023:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:306 |
-| LogInjectionTest.java:1024:95:1024:102 | source(...) : Object | LogInjectionTest.java:1024:86:1024:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:306 |
-| LogInjectionTest.java:1025:80:1025:87 | source(...) : Object | LogInjectionTest.java:1025:71:1025:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:306 |
-| LogInjectionTest.java:1026:65:1026:72 | source(...) : Object | LogInjectionTest.java:1026:56:1026:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:306 |
-| LogInjectionTest.java:1027:50:1027:57 | source(...) : Object | LogInjectionTest.java:1027:41:1027:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:306 |
-| LogInjectionTest.java:1028:35:1028:42 | source(...) : Object | LogInjectionTest.java:1028:26:1028:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:306 |
-| LogInjectionTest.java:1029:155:1029:162 | source(...) : Object | LogInjectionTest.java:1029:146:1029:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:307 |
-| LogInjectionTest.java:1030:140:1030:147 | source(...) : Object | LogInjectionTest.java:1030:131:1030:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:307 |
-| LogInjectionTest.java:1031:125:1031:132 | source(...) : Object | LogInjectionTest.java:1031:116:1031:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:307 |
-| LogInjectionTest.java:1032:110:1032:117 | source(...) : Object | LogInjectionTest.java:1032:101:1032:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:307 |
-| LogInjectionTest.java:1033:95:1033:102 | source(...) : Object | LogInjectionTest.java:1033:86:1033:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:307 |
-| LogInjectionTest.java:1034:80:1034:87 | source(...) : Object | LogInjectionTest.java:1034:71:1034:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:307 |
-| LogInjectionTest.java:1035:65:1035:72 | source(...) : Object | LogInjectionTest.java:1035:56:1035:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:307 |
-| LogInjectionTest.java:1036:50:1036:57 | source(...) : Object | LogInjectionTest.java:1036:41:1036:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:307 |
-| LogInjectionTest.java:1037:35:1037:42 | source(...) : Object | LogInjectionTest.java:1037:26:1037:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:307 |
-| LogInjectionTest.java:1038:170:1038:177 | source(...) : Object | LogInjectionTest.java:1038:161:1038:177 | (...)... | provenance | Src:MaD:536 Sink:MaD:308 |
-| LogInjectionTest.java:1039:155:1039:162 | source(...) : Object | LogInjectionTest.java:1039:146:1039:162 | (...)... | provenance | Src:MaD:536 Sink:MaD:308 |
-| LogInjectionTest.java:1040:140:1040:147 | source(...) : Object | LogInjectionTest.java:1040:131:1040:147 | (...)... | provenance | Src:MaD:536 Sink:MaD:308 |
-| LogInjectionTest.java:1041:125:1041:132 | source(...) : Object | LogInjectionTest.java:1041:116:1041:132 | (...)... | provenance | Src:MaD:536 Sink:MaD:308 |
-| LogInjectionTest.java:1042:110:1042:117 | source(...) : Object | LogInjectionTest.java:1042:101:1042:117 | (...)... | provenance | Src:MaD:536 Sink:MaD:308 |
-| LogInjectionTest.java:1043:95:1043:102 | source(...) : Object | LogInjectionTest.java:1043:86:1043:102 | (...)... | provenance | Src:MaD:536 Sink:MaD:308 |
-| LogInjectionTest.java:1044:80:1044:87 | source(...) : Object | LogInjectionTest.java:1044:71:1044:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:308 |
-| LogInjectionTest.java:1045:65:1045:72 | source(...) : Object | LogInjectionTest.java:1045:56:1045:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:308 |
-| LogInjectionTest.java:1046:50:1046:57 | source(...) : Object | LogInjectionTest.java:1046:41:1046:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:308 |
-| LogInjectionTest.java:1047:35:1047:42 | source(...) : Object | LogInjectionTest.java:1047:26:1047:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:308 |
-| LogInjectionTest.java:1048:35:1048:42 | source(...) : Object | LogInjectionTest.java:1048:26:1048:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:300 |
-| LogInjectionTest.java:1049:55:1049:62 | source(...) : Object | LogInjectionTest.java:1049:41:1049:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:300 |
-| LogInjectionTest.java:1050:35:1050:42 | source(...) : Object | LogInjectionTest.java:1050:26:1050:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:310 |
-| LogInjectionTest.java:1051:40:1051:47 | source(...) : Object | LogInjectionTest.java:1051:26:1051:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:311 |
-| LogInjectionTest.java:1052:40:1052:47 | source(...) : Object | LogInjectionTest.java:1052:26:1052:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:312 |
-| LogInjectionTest.java:1053:40:1053:47 | source(...) : Object | LogInjectionTest.java:1053:25:1053:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:321 |
-| LogInjectionTest.java:1054:40:1054:47 | source(...) : Object | LogInjectionTest.java:1054:25:1054:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:322 |
-| LogInjectionTest.java:1055:55:1055:62 | source(...) : Object | LogInjectionTest.java:1055:40:1055:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:323 |
-| LogInjectionTest.java:1056:55:1056:62 | source(...) : Object | LogInjectionTest.java:1056:40:1056:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:324 |
-| LogInjectionTest.java:1057:50:1057:57 | source(...) : Object | LogInjectionTest.java:1057:40:1057:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:325 |
-| LogInjectionTest.java:1058:58:1058:65 | source(...) : Object | LogInjectionTest.java:1058:40:1058:65 | (...)... | provenance | Src:MaD:536 Sink:MaD:326 |
-| LogInjectionTest.java:1059:58:1059:65 | source(...) : Object | LogInjectionTest.java:1059:40:1059:65 | (...)... | provenance | Src:MaD:536 Sink:MaD:327 |
-| LogInjectionTest.java:1061:49:1061:56 | source(...) : Object | LogInjectionTest.java:1061:40:1061:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:328 |
-| LogInjectionTest.java:1062:49:1062:56 | source(...) : Object | LogInjectionTest.java:1062:40:1062:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:338 |
-| LogInjectionTest.java:1063:55:1063:77 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1063:55:1063:77 | new Object[] | provenance | Sink:MaD:338 |
-| LogInjectionTest.java:1063:69:1063:76 | source(...) : Object | LogInjectionTest.java:1063:55:1063:77 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1064:64:1064:71 | source(...) : Object | LogInjectionTest.java:1064:55:1064:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:329 |
-| LogInjectionTest.java:1065:49:1065:56 | source(...) : Object | LogInjectionTest.java:1065:40:1065:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:329 |
-| LogInjectionTest.java:1066:79:1066:86 | source(...) : Object | LogInjectionTest.java:1066:70:1066:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:330 |
-| LogInjectionTest.java:1067:64:1067:71 | source(...) : Object | LogInjectionTest.java:1067:55:1067:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:330 |
-| LogInjectionTest.java:1068:49:1068:56 | source(...) : Object | LogInjectionTest.java:1068:40:1068:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:330 |
-| LogInjectionTest.java:1069:94:1069:101 | source(...) : Object | LogInjectionTest.java:1069:85:1069:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:331 |
-| LogInjectionTest.java:1070:79:1070:86 | source(...) : Object | LogInjectionTest.java:1070:70:1070:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:331 |
-| LogInjectionTest.java:1071:64:1071:71 | source(...) : Object | LogInjectionTest.java:1071:55:1071:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:331 |
-| LogInjectionTest.java:1072:49:1072:56 | source(...) : Object | LogInjectionTest.java:1072:40:1072:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:331 |
-| LogInjectionTest.java:1073:109:1073:116 | source(...) : Object | LogInjectionTest.java:1073:100:1073:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:332 |
-| LogInjectionTest.java:1074:94:1074:101 | source(...) : Object | LogInjectionTest.java:1074:85:1074:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:332 |
-| LogInjectionTest.java:1075:79:1075:86 | source(...) : Object | LogInjectionTest.java:1075:70:1075:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:332 |
-| LogInjectionTest.java:1076:64:1076:71 | source(...) : Object | LogInjectionTest.java:1076:55:1076:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:332 |
-| LogInjectionTest.java:1077:49:1077:56 | source(...) : Object | LogInjectionTest.java:1077:40:1077:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:332 |
-| LogInjectionTest.java:1078:124:1078:131 | source(...) : Object | LogInjectionTest.java:1078:115:1078:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:333 |
-| LogInjectionTest.java:1079:109:1079:116 | source(...) : Object | LogInjectionTest.java:1079:100:1079:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:333 |
-| LogInjectionTest.java:1080:94:1080:101 | source(...) : Object | LogInjectionTest.java:1080:85:1080:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:333 |
-| LogInjectionTest.java:1081:79:1081:86 | source(...) : Object | LogInjectionTest.java:1081:70:1081:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:333 |
-| LogInjectionTest.java:1082:64:1082:71 | source(...) : Object | LogInjectionTest.java:1082:55:1082:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:333 |
-| LogInjectionTest.java:1083:49:1083:56 | source(...) : Object | LogInjectionTest.java:1083:40:1083:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:333 |
-| LogInjectionTest.java:1084:139:1084:146 | source(...) : Object | LogInjectionTest.java:1084:130:1084:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:334 |
-| LogInjectionTest.java:1085:124:1085:131 | source(...) : Object | LogInjectionTest.java:1085:115:1085:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:334 |
-| LogInjectionTest.java:1086:109:1086:116 | source(...) : Object | LogInjectionTest.java:1086:100:1086:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:334 |
-| LogInjectionTest.java:1087:94:1087:101 | source(...) : Object | LogInjectionTest.java:1087:85:1087:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:334 |
-| LogInjectionTest.java:1088:79:1088:86 | source(...) : Object | LogInjectionTest.java:1088:70:1088:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:334 |
-| LogInjectionTest.java:1089:64:1089:71 | source(...) : Object | LogInjectionTest.java:1089:55:1089:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:334 |
-| LogInjectionTest.java:1090:49:1090:56 | source(...) : Object | LogInjectionTest.java:1090:40:1090:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:334 |
-| LogInjectionTest.java:1091:154:1091:161 | source(...) : Object | LogInjectionTest.java:1091:145:1091:161 | (...)... | provenance | Src:MaD:536 Sink:MaD:335 |
-| LogInjectionTest.java:1092:139:1092:146 | source(...) : Object | LogInjectionTest.java:1092:130:1092:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:335 |
-| LogInjectionTest.java:1093:124:1093:131 | source(...) : Object | LogInjectionTest.java:1093:115:1093:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:335 |
-| LogInjectionTest.java:1094:109:1094:116 | source(...) : Object | LogInjectionTest.java:1094:100:1094:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:335 |
-| LogInjectionTest.java:1095:94:1095:101 | source(...) : Object | LogInjectionTest.java:1095:85:1095:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:335 |
-| LogInjectionTest.java:1096:79:1096:86 | source(...) : Object | LogInjectionTest.java:1096:70:1096:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:335 |
-| LogInjectionTest.java:1097:64:1097:71 | source(...) : Object | LogInjectionTest.java:1097:55:1097:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:335 |
-| LogInjectionTest.java:1098:49:1098:56 | source(...) : Object | LogInjectionTest.java:1098:40:1098:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:335 |
-| LogInjectionTest.java:1099:169:1099:176 | source(...) : Object | LogInjectionTest.java:1099:160:1099:176 | (...)... | provenance | Src:MaD:536 Sink:MaD:336 |
-| LogInjectionTest.java:1100:154:1100:161 | source(...) : Object | LogInjectionTest.java:1100:145:1100:161 | (...)... | provenance | Src:MaD:536 Sink:MaD:336 |
-| LogInjectionTest.java:1101:139:1101:146 | source(...) : Object | LogInjectionTest.java:1101:130:1101:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:336 |
-| LogInjectionTest.java:1102:124:1102:131 | source(...) : Object | LogInjectionTest.java:1102:115:1102:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:336 |
-| LogInjectionTest.java:1103:109:1103:116 | source(...) : Object | LogInjectionTest.java:1103:100:1103:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:336 |
-| LogInjectionTest.java:1104:94:1104:101 | source(...) : Object | LogInjectionTest.java:1104:85:1104:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:336 |
-| LogInjectionTest.java:1105:79:1105:86 | source(...) : Object | LogInjectionTest.java:1105:70:1105:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:336 |
-| LogInjectionTest.java:1106:64:1106:71 | source(...) : Object | LogInjectionTest.java:1106:55:1106:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:336 |
-| LogInjectionTest.java:1107:49:1107:56 | source(...) : Object | LogInjectionTest.java:1107:40:1107:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:336 |
-| LogInjectionTest.java:1108:184:1108:191 | source(...) : Object | LogInjectionTest.java:1108:175:1108:191 | (...)... | provenance | Src:MaD:536 Sink:MaD:337 |
-| LogInjectionTest.java:1109:169:1109:176 | source(...) : Object | LogInjectionTest.java:1109:160:1109:176 | (...)... | provenance | Src:MaD:536 Sink:MaD:337 |
-| LogInjectionTest.java:1110:154:1110:161 | source(...) : Object | LogInjectionTest.java:1110:145:1110:161 | (...)... | provenance | Src:MaD:536 Sink:MaD:337 |
-| LogInjectionTest.java:1111:139:1111:146 | source(...) : Object | LogInjectionTest.java:1111:130:1111:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:337 |
-| LogInjectionTest.java:1112:124:1112:131 | source(...) : Object | LogInjectionTest.java:1112:115:1112:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:337 |
-| LogInjectionTest.java:1113:109:1113:116 | source(...) : Object | LogInjectionTest.java:1113:100:1113:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:337 |
-| LogInjectionTest.java:1114:94:1114:101 | source(...) : Object | LogInjectionTest.java:1114:85:1114:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:337 |
-| LogInjectionTest.java:1115:79:1115:86 | source(...) : Object | LogInjectionTest.java:1115:70:1115:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:337 |
-| LogInjectionTest.java:1116:64:1116:71 | source(...) : Object | LogInjectionTest.java:1116:55:1116:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:337 |
-| LogInjectionTest.java:1117:49:1117:56 | source(...) : Object | LogInjectionTest.java:1117:40:1117:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:337 |
-| LogInjectionTest.java:1118:49:1118:56 | source(...) : Object | LogInjectionTest.java:1118:40:1118:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:329 |
-| LogInjectionTest.java:1119:69:1119:76 | source(...) : Object | LogInjectionTest.java:1119:55:1119:76 | (...)... | provenance | Src:MaD:536 Sink:MaD:329 |
-| LogInjectionTest.java:1120:49:1120:56 | source(...) : Object | LogInjectionTest.java:1120:40:1120:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:339 |
-| LogInjectionTest.java:1121:54:1121:61 | source(...) : Object | LogInjectionTest.java:1121:40:1121:61 | (...)... | provenance | Src:MaD:536 Sink:MaD:340 |
-| LogInjectionTest.java:1122:54:1122:61 | source(...) : Object | LogInjectionTest.java:1122:40:1122:61 | (...)... | provenance | Src:MaD:536 Sink:MaD:341 |
-| LogInjectionTest.java:1123:43:1123:50 | source(...) : Object | LogInjectionTest.java:1123:25:1123:50 | (...)... | provenance | Src:MaD:536 Sink:MaD:344 |
-| LogInjectionTest.java:1124:43:1124:50 | source(...) : Object | LogInjectionTest.java:1124:25:1124:50 | (...)... | provenance | Src:MaD:536 Sink:MaD:345 |
-| LogInjectionTest.java:1125:35:1125:42 | source(...) : Object | LogInjectionTest.java:1125:25:1125:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:342 |
-| LogInjectionTest.java:1126:35:1126:42 | source(...) : Object | LogInjectionTest.java:1126:25:1126:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:343 |
-| LogInjectionTest.java:1129:34:1129:41 | source(...) : Object | LogInjectionTest.java:1129:25:1129:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:346 |
-| LogInjectionTest.java:1130:34:1130:41 | source(...) : Object | LogInjectionTest.java:1130:25:1130:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:356 |
-| LogInjectionTest.java:1131:40:1131:62 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1131:40:1131:62 | new Object[] | provenance | Sink:MaD:356 |
-| LogInjectionTest.java:1131:54:1131:61 | source(...) : Object | LogInjectionTest.java:1131:40:1131:62 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1132:49:1132:56 | source(...) : Object | LogInjectionTest.java:1132:40:1132:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:347 |
-| LogInjectionTest.java:1133:34:1133:41 | source(...) : Object | LogInjectionTest.java:1133:25:1133:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:347 |
-| LogInjectionTest.java:1134:64:1134:71 | source(...) : Object | LogInjectionTest.java:1134:55:1134:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:348 |
-| LogInjectionTest.java:1135:49:1135:56 | source(...) : Object | LogInjectionTest.java:1135:40:1135:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:348 |
-| LogInjectionTest.java:1136:34:1136:41 | source(...) : Object | LogInjectionTest.java:1136:25:1136:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:348 |
-| LogInjectionTest.java:1137:79:1137:86 | source(...) : Object | LogInjectionTest.java:1137:70:1137:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:349 |
-| LogInjectionTest.java:1138:64:1138:71 | source(...) : Object | LogInjectionTest.java:1138:55:1138:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:349 |
-| LogInjectionTest.java:1139:49:1139:56 | source(...) : Object | LogInjectionTest.java:1139:40:1139:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:349 |
-| LogInjectionTest.java:1140:34:1140:41 | source(...) : Object | LogInjectionTest.java:1140:25:1140:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:349 |
-| LogInjectionTest.java:1141:94:1141:101 | source(...) : Object | LogInjectionTest.java:1141:85:1141:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:350 |
-| LogInjectionTest.java:1142:79:1142:86 | source(...) : Object | LogInjectionTest.java:1142:70:1142:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:350 |
-| LogInjectionTest.java:1143:64:1143:71 | source(...) : Object | LogInjectionTest.java:1143:55:1143:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:350 |
-| LogInjectionTest.java:1144:49:1144:56 | source(...) : Object | LogInjectionTest.java:1144:40:1144:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:350 |
-| LogInjectionTest.java:1145:34:1145:41 | source(...) : Object | LogInjectionTest.java:1145:25:1145:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:350 |
-| LogInjectionTest.java:1146:109:1146:116 | source(...) : Object | LogInjectionTest.java:1146:100:1146:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:351 |
-| LogInjectionTest.java:1147:94:1147:101 | source(...) : Object | LogInjectionTest.java:1147:85:1147:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:351 |
-| LogInjectionTest.java:1148:79:1148:86 | source(...) : Object | LogInjectionTest.java:1148:70:1148:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:351 |
-| LogInjectionTest.java:1149:64:1149:71 | source(...) : Object | LogInjectionTest.java:1149:55:1149:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:351 |
-| LogInjectionTest.java:1150:49:1150:56 | source(...) : Object | LogInjectionTest.java:1150:40:1150:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:351 |
-| LogInjectionTest.java:1151:34:1151:41 | source(...) : Object | LogInjectionTest.java:1151:25:1151:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:351 |
-| LogInjectionTest.java:1152:124:1152:131 | source(...) : Object | LogInjectionTest.java:1152:115:1152:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:352 |
-| LogInjectionTest.java:1153:109:1153:116 | source(...) : Object | LogInjectionTest.java:1153:100:1153:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:352 |
-| LogInjectionTest.java:1154:94:1154:101 | source(...) : Object | LogInjectionTest.java:1154:85:1154:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:352 |
-| LogInjectionTest.java:1155:79:1155:86 | source(...) : Object | LogInjectionTest.java:1155:70:1155:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:352 |
-| LogInjectionTest.java:1156:64:1156:71 | source(...) : Object | LogInjectionTest.java:1156:55:1156:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:352 |
-| LogInjectionTest.java:1157:49:1157:56 | source(...) : Object | LogInjectionTest.java:1157:40:1157:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:352 |
-| LogInjectionTest.java:1158:34:1158:41 | source(...) : Object | LogInjectionTest.java:1158:25:1158:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:352 |
-| LogInjectionTest.java:1159:139:1159:146 | source(...) : Object | LogInjectionTest.java:1159:130:1159:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:353 |
-| LogInjectionTest.java:1160:124:1160:131 | source(...) : Object | LogInjectionTest.java:1160:115:1160:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:353 |
-| LogInjectionTest.java:1161:109:1161:116 | source(...) : Object | LogInjectionTest.java:1161:100:1161:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:353 |
-| LogInjectionTest.java:1162:94:1162:101 | source(...) : Object | LogInjectionTest.java:1162:85:1162:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:353 |
-| LogInjectionTest.java:1163:79:1163:86 | source(...) : Object | LogInjectionTest.java:1163:70:1163:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:353 |
-| LogInjectionTest.java:1164:64:1164:71 | source(...) : Object | LogInjectionTest.java:1164:55:1164:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:353 |
-| LogInjectionTest.java:1165:49:1165:56 | source(...) : Object | LogInjectionTest.java:1165:40:1165:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:353 |
-| LogInjectionTest.java:1166:34:1166:41 | source(...) : Object | LogInjectionTest.java:1166:25:1166:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:353 |
-| LogInjectionTest.java:1167:154:1167:161 | source(...) : Object | LogInjectionTest.java:1167:145:1167:161 | (...)... | provenance | Src:MaD:536 Sink:MaD:354 |
-| LogInjectionTest.java:1168:139:1168:146 | source(...) : Object | LogInjectionTest.java:1168:130:1168:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:354 |
-| LogInjectionTest.java:1169:124:1169:131 | source(...) : Object | LogInjectionTest.java:1169:115:1169:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:354 |
-| LogInjectionTest.java:1170:109:1170:116 | source(...) : Object | LogInjectionTest.java:1170:100:1170:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:354 |
-| LogInjectionTest.java:1171:94:1171:101 | source(...) : Object | LogInjectionTest.java:1171:85:1171:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:354 |
-| LogInjectionTest.java:1172:79:1172:86 | source(...) : Object | LogInjectionTest.java:1172:70:1172:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:354 |
-| LogInjectionTest.java:1173:64:1173:71 | source(...) : Object | LogInjectionTest.java:1173:55:1173:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:354 |
-| LogInjectionTest.java:1174:49:1174:56 | source(...) : Object | LogInjectionTest.java:1174:40:1174:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:354 |
-| LogInjectionTest.java:1175:34:1175:41 | source(...) : Object | LogInjectionTest.java:1175:25:1175:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:354 |
-| LogInjectionTest.java:1176:169:1176:176 | source(...) : Object | LogInjectionTest.java:1176:160:1176:176 | (...)... | provenance | Src:MaD:536 Sink:MaD:355 |
-| LogInjectionTest.java:1177:154:1177:161 | source(...) : Object | LogInjectionTest.java:1177:145:1177:161 | (...)... | provenance | Src:MaD:536 Sink:MaD:355 |
-| LogInjectionTest.java:1178:139:1178:146 | source(...) : Object | LogInjectionTest.java:1178:130:1178:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:355 |
-| LogInjectionTest.java:1179:124:1179:131 | source(...) : Object | LogInjectionTest.java:1179:115:1179:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:355 |
-| LogInjectionTest.java:1180:109:1180:116 | source(...) : Object | LogInjectionTest.java:1180:100:1180:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:355 |
-| LogInjectionTest.java:1181:94:1181:101 | source(...) : Object | LogInjectionTest.java:1181:85:1181:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:355 |
-| LogInjectionTest.java:1182:79:1182:86 | source(...) : Object | LogInjectionTest.java:1182:70:1182:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:355 |
-| LogInjectionTest.java:1183:64:1183:71 | source(...) : Object | LogInjectionTest.java:1183:55:1183:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:355 |
-| LogInjectionTest.java:1184:49:1184:56 | source(...) : Object | LogInjectionTest.java:1184:40:1184:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:355 |
-| LogInjectionTest.java:1185:34:1185:41 | source(...) : Object | LogInjectionTest.java:1185:25:1185:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:355 |
-| LogInjectionTest.java:1186:34:1186:41 | source(...) : Object | LogInjectionTest.java:1186:25:1186:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:347 |
-| LogInjectionTest.java:1187:54:1187:61 | source(...) : Object | LogInjectionTest.java:1187:40:1187:61 | (...)... | provenance | Src:MaD:536 Sink:MaD:347 |
-| LogInjectionTest.java:1188:34:1188:41 | source(...) : Object | LogInjectionTest.java:1188:25:1188:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:357 |
-| LogInjectionTest.java:1189:39:1189:46 | source(...) : Object | LogInjectionTest.java:1189:25:1189:46 | (...)... | provenance | Src:MaD:536 Sink:MaD:358 |
-| LogInjectionTest.java:1190:39:1190:46 | source(...) : Object | LogInjectionTest.java:1190:25:1190:46 | (...)... | provenance | Src:MaD:536 Sink:MaD:359 |
-| LogInjectionTest.java:1192:65:1192:72 | source(...) : Object | LogInjectionTest.java:1192:55:1192:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:271 |
-| LogInjectionTest.java:1193:48:1193:55 | source(...) : Object | LogInjectionTest.java:1193:39:1193:55 | (...)... | provenance | Src:MaD:536 Sink:MaD:272 |
-| LogInjectionTest.java:1194:45:1194:67 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1194:45:1194:67 | new Object[] | provenance | Sink:MaD:272 |
-| LogInjectionTest.java:1194:59:1194:66 | source(...) : Object | LogInjectionTest.java:1194:45:1194:67 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1195:42:1195:49 | source(...) : Object | LogInjectionTest.java:1195:33:1195:49 | (...)... | provenance | Src:MaD:536 Sink:MaD:273 |
-| LogInjectionTest.java:1196:39:1196:61 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1196:39:1196:61 | new Object[] | provenance | Sink:MaD:273 |
-| LogInjectionTest.java:1196:53:1196:60 | source(...) : Object | LogInjectionTest.java:1196:39:1196:61 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1197:41:1197:48 | source(...) : Object | LogInjectionTest.java:1197:31:1197:48 | (...)... | provenance | Src:MaD:536 Sink:MaD:313 |
-| LogInjectionTest.java:1198:40:1198:47 | source(...) : Object | LogInjectionTest.java:1198:31:1198:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:314 |
-| LogInjectionTest.java:1199:46:1199:68 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1199:46:1199:68 | new Object[] | provenance | Sink:MaD:314 |
-| LogInjectionTest.java:1199:60:1199:67 | source(...) : Object | LogInjectionTest.java:1199:46:1199:68 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1200:40:1200:47 | source(...) : Object | LogInjectionTest.java:1200:31:1200:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:315 |
-| LogInjectionTest.java:1201:46:1201:67 | (...)... : Supplier | LogInjectionTest.java:1201:13:1201:68 | new ..[] { .. } | provenance | Sink:MaD:315 |
-| LogInjectionTest.java:1201:60:1201:67 | source(...) : Object | LogInjectionTest.java:1201:46:1201:67 | (...)... : Supplier | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1202:31:1202:52 | (...)... : Supplier | LogInjectionTest.java:1202:13:1202:53 | new ..[] { .. } | provenance | Sink:MaD:316 |
-| LogInjectionTest.java:1202:45:1202:52 | source(...) : Object | LogInjectionTest.java:1202:31:1202:52 | (...)... : Supplier | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1203:45:1203:52 | source(...) : Object | LogInjectionTest.java:1203:30:1203:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:317 |
-| LogInjectionTest.java:1204:45:1204:52 | source(...) : Object | LogInjectionTest.java:1204:30:1204:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:318 |
-| LogInjectionTest.java:1206:40:1206:47 | source(...) : Object | LogInjectionTest.java:1206:30:1206:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:319 |
-| LogInjectionTest.java:1209:39:1209:46 | source(...) : Object | LogInjectionTest.java:1209:30:1209:46 | (...)... | provenance | Src:MaD:536 Sink:MaD:320 |
-| LogInjectionTest.java:1214:40:1214:47 | source(...) : Object | LogInjectionTest.java:1214:25:1214:47 | (...)... | provenance | Src:MaD:536 Sink:MaD:62 |
-| LogInjectionTest.java:1215:35:1215:42 | source(...) : Object | LogInjectionTest.java:1215:25:1215:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:63 |
-| LogInjectionTest.java:1217:34:1217:41 | source(...) : Object | LogInjectionTest.java:1217:25:1217:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:65 |
-| LogInjectionTest.java:1218:34:1218:41 | source(...) : Object | LogInjectionTest.java:1218:25:1218:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:75 |
-| LogInjectionTest.java:1219:40:1219:62 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1219:40:1219:62 | new Object[] | provenance | Sink:MaD:75 |
-| LogInjectionTest.java:1219:54:1219:61 | source(...) : Object | LogInjectionTest.java:1219:40:1219:62 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1222:49:1222:56 | source(...) : Object | LogInjectionTest.java:1222:40:1222:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:66 |
-| LogInjectionTest.java:1223:34:1223:41 | source(...) : Object | LogInjectionTest.java:1223:25:1223:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:66 |
-| LogInjectionTest.java:1224:64:1224:71 | source(...) : Object | LogInjectionTest.java:1224:55:1224:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:67 |
-| LogInjectionTest.java:1225:49:1225:56 | source(...) : Object | LogInjectionTest.java:1225:40:1225:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:67 |
-| LogInjectionTest.java:1226:34:1226:41 | source(...) : Object | LogInjectionTest.java:1226:25:1226:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:67 |
-| LogInjectionTest.java:1227:79:1227:86 | source(...) : Object | LogInjectionTest.java:1227:70:1227:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:68 |
-| LogInjectionTest.java:1228:64:1228:71 | source(...) : Object | LogInjectionTest.java:1228:55:1228:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:68 |
-| LogInjectionTest.java:1229:49:1229:56 | source(...) : Object | LogInjectionTest.java:1229:40:1229:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:68 |
-| LogInjectionTest.java:1230:34:1230:41 | source(...) : Object | LogInjectionTest.java:1230:25:1230:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:68 |
-| LogInjectionTest.java:1231:94:1231:101 | source(...) : Object | LogInjectionTest.java:1231:85:1231:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:69 |
-| LogInjectionTest.java:1232:79:1232:86 | source(...) : Object | LogInjectionTest.java:1232:70:1232:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:69 |
-| LogInjectionTest.java:1233:64:1233:71 | source(...) : Object | LogInjectionTest.java:1233:55:1233:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:69 |
-| LogInjectionTest.java:1234:49:1234:56 | source(...) : Object | LogInjectionTest.java:1234:40:1234:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:69 |
-| LogInjectionTest.java:1235:34:1235:41 | source(...) : Object | LogInjectionTest.java:1235:25:1235:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:69 |
-| LogInjectionTest.java:1236:109:1236:116 | source(...) : Object | LogInjectionTest.java:1236:100:1236:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:70 |
-| LogInjectionTest.java:1237:94:1237:101 | source(...) : Object | LogInjectionTest.java:1237:85:1237:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:70 |
-| LogInjectionTest.java:1238:79:1238:86 | source(...) : Object | LogInjectionTest.java:1238:70:1238:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:70 |
-| LogInjectionTest.java:1239:64:1239:71 | source(...) : Object | LogInjectionTest.java:1239:55:1239:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:70 |
-| LogInjectionTest.java:1240:49:1240:56 | source(...) : Object | LogInjectionTest.java:1240:40:1240:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:70 |
-| LogInjectionTest.java:1241:34:1241:41 | source(...) : Object | LogInjectionTest.java:1241:25:1241:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:70 |
-| LogInjectionTest.java:1242:124:1242:131 | source(...) : Object | LogInjectionTest.java:1242:115:1242:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:71 |
-| LogInjectionTest.java:1243:109:1243:116 | source(...) : Object | LogInjectionTest.java:1243:100:1243:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:71 |
-| LogInjectionTest.java:1244:94:1244:101 | source(...) : Object | LogInjectionTest.java:1244:85:1244:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:71 |
-| LogInjectionTest.java:1245:79:1245:86 | source(...) : Object | LogInjectionTest.java:1245:70:1245:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:71 |
-| LogInjectionTest.java:1246:64:1246:71 | source(...) : Object | LogInjectionTest.java:1246:55:1246:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:71 |
-| LogInjectionTest.java:1247:49:1247:56 | source(...) : Object | LogInjectionTest.java:1247:40:1247:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:71 |
-| LogInjectionTest.java:1248:34:1248:41 | source(...) : Object | LogInjectionTest.java:1248:25:1248:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:71 |
-| LogInjectionTest.java:1249:139:1249:146 | source(...) : Object | LogInjectionTest.java:1249:130:1249:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:72 |
-| LogInjectionTest.java:1250:124:1250:131 | source(...) : Object | LogInjectionTest.java:1250:115:1250:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:72 |
-| LogInjectionTest.java:1251:109:1251:116 | source(...) : Object | LogInjectionTest.java:1251:100:1251:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:72 |
-| LogInjectionTest.java:1252:94:1252:101 | source(...) : Object | LogInjectionTest.java:1252:85:1252:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:72 |
-| LogInjectionTest.java:1253:79:1253:86 | source(...) : Object | LogInjectionTest.java:1253:70:1253:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:72 |
-| LogInjectionTest.java:1254:64:1254:71 | source(...) : Object | LogInjectionTest.java:1254:55:1254:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:72 |
-| LogInjectionTest.java:1255:49:1255:56 | source(...) : Object | LogInjectionTest.java:1255:40:1255:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:72 |
-| LogInjectionTest.java:1256:34:1256:41 | source(...) : Object | LogInjectionTest.java:1256:25:1256:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:72 |
-| LogInjectionTest.java:1257:154:1257:161 | source(...) : Object | LogInjectionTest.java:1257:145:1257:161 | (...)... | provenance | Src:MaD:536 Sink:MaD:73 |
-| LogInjectionTest.java:1258:139:1258:146 | source(...) : Object | LogInjectionTest.java:1258:130:1258:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:73 |
-| LogInjectionTest.java:1259:124:1259:131 | source(...) : Object | LogInjectionTest.java:1259:115:1259:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:73 |
-| LogInjectionTest.java:1260:109:1260:116 | source(...) : Object | LogInjectionTest.java:1260:100:1260:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:73 |
-| LogInjectionTest.java:1261:94:1261:101 | source(...) : Object | LogInjectionTest.java:1261:85:1261:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:73 |
-| LogInjectionTest.java:1262:79:1262:86 | source(...) : Object | LogInjectionTest.java:1262:70:1262:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:73 |
-| LogInjectionTest.java:1263:64:1263:71 | source(...) : Object | LogInjectionTest.java:1263:55:1263:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:73 |
-| LogInjectionTest.java:1264:49:1264:56 | source(...) : Object | LogInjectionTest.java:1264:40:1264:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:73 |
-| LogInjectionTest.java:1265:34:1265:41 | source(...) : Object | LogInjectionTest.java:1265:25:1265:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:73 |
-| LogInjectionTest.java:1266:169:1266:176 | source(...) : Object | LogInjectionTest.java:1266:160:1266:176 | (...)... | provenance | Src:MaD:536 Sink:MaD:74 |
-| LogInjectionTest.java:1267:154:1267:161 | source(...) : Object | LogInjectionTest.java:1267:145:1267:161 | (...)... | provenance | Src:MaD:536 Sink:MaD:74 |
-| LogInjectionTest.java:1268:139:1268:146 | source(...) : Object | LogInjectionTest.java:1268:130:1268:146 | (...)... | provenance | Src:MaD:536 Sink:MaD:74 |
-| LogInjectionTest.java:1269:124:1269:131 | source(...) : Object | LogInjectionTest.java:1269:115:1269:131 | (...)... | provenance | Src:MaD:536 Sink:MaD:74 |
-| LogInjectionTest.java:1270:109:1270:116 | source(...) : Object | LogInjectionTest.java:1270:100:1270:116 | (...)... | provenance | Src:MaD:536 Sink:MaD:74 |
-| LogInjectionTest.java:1271:94:1271:101 | source(...) : Object | LogInjectionTest.java:1271:85:1271:101 | (...)... | provenance | Src:MaD:536 Sink:MaD:74 |
-| LogInjectionTest.java:1272:79:1272:86 | source(...) : Object | LogInjectionTest.java:1272:70:1272:86 | (...)... | provenance | Src:MaD:536 Sink:MaD:74 |
-| LogInjectionTest.java:1273:64:1273:71 | source(...) : Object | LogInjectionTest.java:1273:55:1273:71 | (...)... | provenance | Src:MaD:536 Sink:MaD:74 |
-| LogInjectionTest.java:1274:49:1274:56 | source(...) : Object | LogInjectionTest.java:1274:40:1274:56 | (...)... | provenance | Src:MaD:536 Sink:MaD:74 |
-| LogInjectionTest.java:1275:34:1275:41 | source(...) : Object | LogInjectionTest.java:1275:25:1275:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:74 |
-| LogInjectionTest.java:1277:34:1277:41 | source(...) : Object | LogInjectionTest.java:1277:25:1277:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:66 |
-| LogInjectionTest.java:1278:54:1278:61 | source(...) : Object | LogInjectionTest.java:1278:40:1278:61 | (...)... | provenance | Src:MaD:536 Sink:MaD:66 |
-| LogInjectionTest.java:1279:39:1279:46 | source(...) : Object | LogInjectionTest.java:1279:25:1279:46 | (...)... | provenance | Src:MaD:536 Sink:MaD:64 |
-| LogInjectionTest.java:1299:57:1299:79 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1299:57:1299:79 | new Object[] | provenance | Sink:MaD:360 |
-| LogInjectionTest.java:1299:71:1299:78 | source(...) : Object | LogInjectionTest.java:1299:57:1299:79 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1307:57:1307:79 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1307:57:1307:79 | new Object[] | provenance | Sink:MaD:369 |
-| LogInjectionTest.java:1307:71:1307:78 | source(...) : Object | LogInjectionTest.java:1307:57:1307:79 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1315:57:1315:79 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1315:57:1315:79 | new Object[] | provenance | Sink:MaD:378 |
-| LogInjectionTest.java:1315:71:1315:78 | source(...) : Object | LogInjectionTest.java:1315:57:1315:79 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1323:56:1323:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1323:56:1323:78 | new Object[] | provenance | Sink:MaD:387 |
-| LogInjectionTest.java:1323:70:1323:77 | source(...) : Object | LogInjectionTest.java:1323:56:1323:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1331:57:1331:79 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1331:57:1331:79 | new Object[] | provenance | Sink:MaD:405 |
-| LogInjectionTest.java:1331:71:1331:78 | source(...) : Object | LogInjectionTest.java:1331:57:1331:79 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1339:56:1339:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1339:56:1339:78 | new Object[] | provenance | Sink:MaD:414 |
-| LogInjectionTest.java:1339:70:1339:77 | source(...) : Object | LogInjectionTest.java:1339:56:1339:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1348:94:1348:116 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1348:94:1348:116 | new Object[] | provenance | Sink:MaD:396 |
-| LogInjectionTest.java:1348:108:1348:115 | source(...) : Object | LogInjectionTest.java:1348:94:1348:116 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1349:52:1349:59 | source(...) : Object | LogInjectionTest.java:1349:43:1349:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:361 |
-| LogInjectionTest.java:1350:37:1350:44 | source(...) : Object | LogInjectionTest.java:1350:28:1350:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:361 |
-| LogInjectionTest.java:1351:52:1351:59 | source(...) : Object | LogInjectionTest.java:1351:43:1351:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:365 |
-| LogInjectionTest.java:1352:37:1352:44 | source(...) : Object | LogInjectionTest.java:1352:28:1352:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:365 |
-| LogInjectionTest.java:1353:37:1353:44 | source(...) : Object | LogInjectionTest.java:1353:28:1353:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:364 |
-| LogInjectionTest.java:1354:37:1354:44 | source(...) : Object | LogInjectionTest.java:1354:28:1354:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:368 |
-| LogInjectionTest.java:1355:43:1355:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1355:43:1355:65 | new Object[] | provenance | Sink:MaD:364 |
-| LogInjectionTest.java:1355:57:1355:64 | source(...) : Object | LogInjectionTest.java:1355:43:1355:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1356:43:1356:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1356:43:1356:65 | new Object[] | provenance | Sink:MaD:368 |
-| LogInjectionTest.java:1356:57:1356:64 | source(...) : Object | LogInjectionTest.java:1356:43:1356:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1357:67:1357:74 | source(...) : Object | LogInjectionTest.java:1357:58:1357:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:362 |
-| LogInjectionTest.java:1358:52:1358:59 | source(...) : Object | LogInjectionTest.java:1358:43:1358:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:362 |
-| LogInjectionTest.java:1359:37:1359:44 | source(...) : Object | LogInjectionTest.java:1359:28:1359:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:362 |
-| LogInjectionTest.java:1360:67:1360:74 | source(...) : Object | LogInjectionTest.java:1360:58:1360:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:366 |
-| LogInjectionTest.java:1361:52:1361:59 | source(...) : Object | LogInjectionTest.java:1361:43:1361:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:366 |
-| LogInjectionTest.java:1362:37:1362:44 | source(...) : Object | LogInjectionTest.java:1362:28:1362:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:366 |
-| LogInjectionTest.java:1363:82:1363:89 | source(...) : Object | LogInjectionTest.java:1363:73:1363:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:363 |
-| LogInjectionTest.java:1364:67:1364:74 | source(...) : Object | LogInjectionTest.java:1364:58:1364:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:363 |
-| LogInjectionTest.java:1365:52:1365:59 | source(...) : Object | LogInjectionTest.java:1365:43:1365:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:363 |
-| LogInjectionTest.java:1366:37:1366:44 | source(...) : Object | LogInjectionTest.java:1366:28:1366:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:363 |
-| LogInjectionTest.java:1367:82:1367:89 | source(...) : Object | LogInjectionTest.java:1367:73:1367:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:367 |
-| LogInjectionTest.java:1368:67:1368:74 | source(...) : Object | LogInjectionTest.java:1368:58:1368:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:367 |
-| LogInjectionTest.java:1369:52:1369:59 | source(...) : Object | LogInjectionTest.java:1369:43:1369:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:367 |
-| LogInjectionTest.java:1370:37:1370:44 | source(...) : Object | LogInjectionTest.java:1370:28:1370:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:367 |
-| LogInjectionTest.java:1371:52:1371:59 | source(...) : Object | LogInjectionTest.java:1371:43:1371:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:370 |
-| LogInjectionTest.java:1372:37:1372:44 | source(...) : Object | LogInjectionTest.java:1372:28:1372:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:370 |
-| LogInjectionTest.java:1373:52:1373:59 | source(...) : Object | LogInjectionTest.java:1373:43:1373:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:374 |
-| LogInjectionTest.java:1374:37:1374:44 | source(...) : Object | LogInjectionTest.java:1374:28:1374:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:374 |
-| LogInjectionTest.java:1375:37:1375:44 | source(...) : Object | LogInjectionTest.java:1375:28:1375:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:373 |
-| LogInjectionTest.java:1376:37:1376:44 | source(...) : Object | LogInjectionTest.java:1376:28:1376:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:377 |
-| LogInjectionTest.java:1377:43:1377:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1377:43:1377:65 | new Object[] | provenance | Sink:MaD:373 |
-| LogInjectionTest.java:1377:57:1377:64 | source(...) : Object | LogInjectionTest.java:1377:43:1377:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1378:43:1378:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1378:43:1378:65 | new Object[] | provenance | Sink:MaD:377 |
-| LogInjectionTest.java:1378:57:1378:64 | source(...) : Object | LogInjectionTest.java:1378:43:1378:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1379:67:1379:74 | source(...) : Object | LogInjectionTest.java:1379:58:1379:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:371 |
-| LogInjectionTest.java:1380:52:1380:59 | source(...) : Object | LogInjectionTest.java:1380:43:1380:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:371 |
-| LogInjectionTest.java:1381:37:1381:44 | source(...) : Object | LogInjectionTest.java:1381:28:1381:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:371 |
-| LogInjectionTest.java:1382:67:1382:74 | source(...) : Object | LogInjectionTest.java:1382:58:1382:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:375 |
-| LogInjectionTest.java:1383:52:1383:59 | source(...) : Object | LogInjectionTest.java:1383:43:1383:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:375 |
-| LogInjectionTest.java:1384:37:1384:44 | source(...) : Object | LogInjectionTest.java:1384:28:1384:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:375 |
-| LogInjectionTest.java:1385:82:1385:89 | source(...) : Object | LogInjectionTest.java:1385:73:1385:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:372 |
-| LogInjectionTest.java:1386:67:1386:74 | source(...) : Object | LogInjectionTest.java:1386:58:1386:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:372 |
-| LogInjectionTest.java:1387:52:1387:59 | source(...) : Object | LogInjectionTest.java:1387:43:1387:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:372 |
-| LogInjectionTest.java:1388:37:1388:44 | source(...) : Object | LogInjectionTest.java:1388:28:1388:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:372 |
-| LogInjectionTest.java:1389:82:1389:89 | source(...) : Object | LogInjectionTest.java:1389:73:1389:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:376 |
-| LogInjectionTest.java:1390:67:1390:74 | source(...) : Object | LogInjectionTest.java:1390:58:1390:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:376 |
-| LogInjectionTest.java:1391:52:1391:59 | source(...) : Object | LogInjectionTest.java:1391:43:1391:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:376 |
-| LogInjectionTest.java:1392:37:1392:44 | source(...) : Object | LogInjectionTest.java:1392:28:1392:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:376 |
-| LogInjectionTest.java:1393:52:1393:59 | source(...) : Object | LogInjectionTest.java:1393:43:1393:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:379 |
-| LogInjectionTest.java:1394:37:1394:44 | source(...) : Object | LogInjectionTest.java:1394:28:1394:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:379 |
-| LogInjectionTest.java:1395:52:1395:59 | source(...) : Object | LogInjectionTest.java:1395:43:1395:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:383 |
-| LogInjectionTest.java:1396:37:1396:44 | source(...) : Object | LogInjectionTest.java:1396:28:1396:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:383 |
-| LogInjectionTest.java:1397:37:1397:44 | source(...) : Object | LogInjectionTest.java:1397:28:1397:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:382 |
-| LogInjectionTest.java:1398:37:1398:44 | source(...) : Object | LogInjectionTest.java:1398:28:1398:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:386 |
-| LogInjectionTest.java:1399:43:1399:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1399:43:1399:65 | new Object[] | provenance | Sink:MaD:382 |
-| LogInjectionTest.java:1399:57:1399:64 | source(...) : Object | LogInjectionTest.java:1399:43:1399:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1400:43:1400:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1400:43:1400:65 | new Object[] | provenance | Sink:MaD:386 |
-| LogInjectionTest.java:1400:57:1400:64 | source(...) : Object | LogInjectionTest.java:1400:43:1400:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1401:67:1401:74 | source(...) : Object | LogInjectionTest.java:1401:58:1401:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:380 |
-| LogInjectionTest.java:1402:52:1402:59 | source(...) : Object | LogInjectionTest.java:1402:43:1402:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:380 |
-| LogInjectionTest.java:1403:37:1403:44 | source(...) : Object | LogInjectionTest.java:1403:28:1403:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:380 |
-| LogInjectionTest.java:1404:67:1404:74 | source(...) : Object | LogInjectionTest.java:1404:58:1404:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:384 |
-| LogInjectionTest.java:1405:52:1405:59 | source(...) : Object | LogInjectionTest.java:1405:43:1405:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:384 |
-| LogInjectionTest.java:1406:37:1406:44 | source(...) : Object | LogInjectionTest.java:1406:28:1406:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:384 |
-| LogInjectionTest.java:1407:82:1407:89 | source(...) : Object | LogInjectionTest.java:1407:73:1407:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:381 |
-| LogInjectionTest.java:1408:67:1408:74 | source(...) : Object | LogInjectionTest.java:1408:58:1408:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:381 |
-| LogInjectionTest.java:1409:52:1409:59 | source(...) : Object | LogInjectionTest.java:1409:43:1409:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:381 |
-| LogInjectionTest.java:1410:37:1410:44 | source(...) : Object | LogInjectionTest.java:1410:28:1410:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:381 |
-| LogInjectionTest.java:1411:82:1411:89 | source(...) : Object | LogInjectionTest.java:1411:73:1411:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:385 |
-| LogInjectionTest.java:1412:67:1412:74 | source(...) : Object | LogInjectionTest.java:1412:58:1412:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:385 |
-| LogInjectionTest.java:1413:52:1413:59 | source(...) : Object | LogInjectionTest.java:1413:43:1413:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:385 |
-| LogInjectionTest.java:1414:37:1414:44 | source(...) : Object | LogInjectionTest.java:1414:28:1414:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:385 |
-| LogInjectionTest.java:1415:51:1415:58 | source(...) : Object | LogInjectionTest.java:1415:42:1415:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:388 |
-| LogInjectionTest.java:1416:36:1416:43 | source(...) : Object | LogInjectionTest.java:1416:27:1416:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:388 |
-| LogInjectionTest.java:1417:51:1417:58 | source(...) : Object | LogInjectionTest.java:1417:42:1417:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:392 |
-| LogInjectionTest.java:1418:36:1418:43 | source(...) : Object | LogInjectionTest.java:1418:27:1418:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:392 |
-| LogInjectionTest.java:1419:36:1419:43 | source(...) : Object | LogInjectionTest.java:1419:27:1419:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:391 |
-| LogInjectionTest.java:1420:36:1420:43 | source(...) : Object | LogInjectionTest.java:1420:27:1420:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:395 |
-| LogInjectionTest.java:1421:42:1421:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1421:42:1421:64 | new Object[] | provenance | Sink:MaD:391 |
-| LogInjectionTest.java:1421:56:1421:63 | source(...) : Object | LogInjectionTest.java:1421:42:1421:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1422:42:1422:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1422:42:1422:64 | new Object[] | provenance | Sink:MaD:395 |
-| LogInjectionTest.java:1422:56:1422:63 | source(...) : Object | LogInjectionTest.java:1422:42:1422:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1423:66:1423:73 | source(...) : Object | LogInjectionTest.java:1423:57:1423:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:389 |
-| LogInjectionTest.java:1424:51:1424:58 | source(...) : Object | LogInjectionTest.java:1424:42:1424:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:389 |
-| LogInjectionTest.java:1425:36:1425:43 | source(...) : Object | LogInjectionTest.java:1425:27:1425:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:389 |
-| LogInjectionTest.java:1426:66:1426:73 | source(...) : Object | LogInjectionTest.java:1426:57:1426:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:393 |
-| LogInjectionTest.java:1427:51:1427:58 | source(...) : Object | LogInjectionTest.java:1427:42:1427:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:393 |
-| LogInjectionTest.java:1428:36:1428:43 | source(...) : Object | LogInjectionTest.java:1428:27:1428:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:393 |
-| LogInjectionTest.java:1429:81:1429:88 | source(...) : Object | LogInjectionTest.java:1429:72:1429:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:390 |
-| LogInjectionTest.java:1430:66:1430:73 | source(...) : Object | LogInjectionTest.java:1430:57:1430:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:390 |
-| LogInjectionTest.java:1431:51:1431:58 | source(...) : Object | LogInjectionTest.java:1431:42:1431:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:390 |
-| LogInjectionTest.java:1432:36:1432:43 | source(...) : Object | LogInjectionTest.java:1432:27:1432:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:390 |
-| LogInjectionTest.java:1433:81:1433:88 | source(...) : Object | LogInjectionTest.java:1433:72:1433:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:394 |
-| LogInjectionTest.java:1434:66:1434:73 | source(...) : Object | LogInjectionTest.java:1434:57:1434:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:394 |
-| LogInjectionTest.java:1435:51:1435:58 | source(...) : Object | LogInjectionTest.java:1435:42:1435:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:394 |
-| LogInjectionTest.java:1436:36:1436:43 | source(...) : Object | LogInjectionTest.java:1436:27:1436:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:394 |
-| LogInjectionTest.java:1437:89:1437:96 | source(...) : Object | LogInjectionTest.java:1437:80:1437:96 | (...)... | provenance | Src:MaD:536 Sink:MaD:397 |
-| LogInjectionTest.java:1438:74:1438:81 | source(...) : Object | LogInjectionTest.java:1438:65:1438:81 | (...)... | provenance | Src:MaD:536 Sink:MaD:397 |
-| LogInjectionTest.java:1439:89:1439:96 | source(...) : Object | LogInjectionTest.java:1439:80:1439:96 | (...)... | provenance | Src:MaD:536 Sink:MaD:401 |
-| LogInjectionTest.java:1440:74:1440:81 | source(...) : Object | LogInjectionTest.java:1440:65:1440:81 | (...)... | provenance | Src:MaD:536 Sink:MaD:401 |
-| LogInjectionTest.java:1441:74:1441:81 | source(...) : Object | LogInjectionTest.java:1441:65:1441:81 | (...)... | provenance | Src:MaD:536 Sink:MaD:400 |
-| LogInjectionTest.java:1442:74:1442:81 | source(...) : Object | LogInjectionTest.java:1442:65:1442:81 | (...)... | provenance | Src:MaD:536 Sink:MaD:404 |
-| LogInjectionTest.java:1443:80:1443:102 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1443:80:1443:102 | new Object[] | provenance | Sink:MaD:400 |
-| LogInjectionTest.java:1443:94:1443:101 | source(...) : Object | LogInjectionTest.java:1443:80:1443:102 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1444:80:1444:102 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1444:80:1444:102 | new Object[] | provenance | Sink:MaD:404 |
-| LogInjectionTest.java:1444:94:1444:101 | source(...) : Object | LogInjectionTest.java:1444:80:1444:102 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1445:104:1445:111 | source(...) : Object | LogInjectionTest.java:1445:95:1445:111 | (...)... | provenance | Src:MaD:536 Sink:MaD:398 |
-| LogInjectionTest.java:1446:89:1446:96 | source(...) : Object | LogInjectionTest.java:1446:80:1446:96 | (...)... | provenance | Src:MaD:536 Sink:MaD:398 |
-| LogInjectionTest.java:1447:74:1447:81 | source(...) : Object | LogInjectionTest.java:1447:65:1447:81 | (...)... | provenance | Src:MaD:536 Sink:MaD:398 |
-| LogInjectionTest.java:1448:104:1448:111 | source(...) : Object | LogInjectionTest.java:1448:95:1448:111 | (...)... | provenance | Src:MaD:536 Sink:MaD:402 |
-| LogInjectionTest.java:1449:89:1449:96 | source(...) : Object | LogInjectionTest.java:1449:80:1449:96 | (...)... | provenance | Src:MaD:536 Sink:MaD:402 |
-| LogInjectionTest.java:1450:74:1450:81 | source(...) : Object | LogInjectionTest.java:1450:65:1450:81 | (...)... | provenance | Src:MaD:536 Sink:MaD:402 |
-| LogInjectionTest.java:1451:119:1451:126 | source(...) : Object | LogInjectionTest.java:1451:110:1451:126 | (...)... | provenance | Src:MaD:536 Sink:MaD:399 |
-| LogInjectionTest.java:1452:104:1452:111 | source(...) : Object | LogInjectionTest.java:1452:95:1452:111 | (...)... | provenance | Src:MaD:536 Sink:MaD:399 |
-| LogInjectionTest.java:1453:89:1453:96 | source(...) : Object | LogInjectionTest.java:1453:80:1453:96 | (...)... | provenance | Src:MaD:536 Sink:MaD:399 |
-| LogInjectionTest.java:1454:74:1454:81 | source(...) : Object | LogInjectionTest.java:1454:65:1454:81 | (...)... | provenance | Src:MaD:536 Sink:MaD:399 |
-| LogInjectionTest.java:1455:119:1455:126 | source(...) : Object | LogInjectionTest.java:1455:110:1455:126 | (...)... | provenance | Src:MaD:536 Sink:MaD:403 |
-| LogInjectionTest.java:1456:104:1456:111 | source(...) : Object | LogInjectionTest.java:1456:95:1456:111 | (...)... | provenance | Src:MaD:536 Sink:MaD:403 |
-| LogInjectionTest.java:1457:89:1457:96 | source(...) : Object | LogInjectionTest.java:1457:80:1457:96 | (...)... | provenance | Src:MaD:536 Sink:MaD:403 |
-| LogInjectionTest.java:1458:74:1458:81 | source(...) : Object | LogInjectionTest.java:1458:65:1458:81 | (...)... | provenance | Src:MaD:536 Sink:MaD:403 |
-| LogInjectionTest.java:1459:52:1459:59 | source(...) : Object | LogInjectionTest.java:1459:43:1459:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:406 |
-| LogInjectionTest.java:1460:37:1460:44 | source(...) : Object | LogInjectionTest.java:1460:28:1460:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:406 |
-| LogInjectionTest.java:1461:52:1461:59 | source(...) : Object | LogInjectionTest.java:1461:43:1461:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:410 |
-| LogInjectionTest.java:1462:37:1462:44 | source(...) : Object | LogInjectionTest.java:1462:28:1462:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:410 |
-| LogInjectionTest.java:1463:37:1463:44 | source(...) : Object | LogInjectionTest.java:1463:28:1463:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:409 |
-| LogInjectionTest.java:1464:37:1464:44 | source(...) : Object | LogInjectionTest.java:1464:28:1464:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:413 |
-| LogInjectionTest.java:1465:43:1465:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1465:43:1465:65 | new Object[] | provenance | Sink:MaD:409 |
-| LogInjectionTest.java:1465:57:1465:64 | source(...) : Object | LogInjectionTest.java:1465:43:1465:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1466:43:1466:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1466:43:1466:65 | new Object[] | provenance | Sink:MaD:413 |
-| LogInjectionTest.java:1466:57:1466:64 | source(...) : Object | LogInjectionTest.java:1466:43:1466:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1467:67:1467:74 | source(...) : Object | LogInjectionTest.java:1467:58:1467:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:407 |
-| LogInjectionTest.java:1468:52:1468:59 | source(...) : Object | LogInjectionTest.java:1468:43:1468:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:407 |
-| LogInjectionTest.java:1469:37:1469:44 | source(...) : Object | LogInjectionTest.java:1469:28:1469:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:407 |
-| LogInjectionTest.java:1470:67:1470:74 | source(...) : Object | LogInjectionTest.java:1470:58:1470:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:411 |
-| LogInjectionTest.java:1471:52:1471:59 | source(...) : Object | LogInjectionTest.java:1471:43:1471:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:411 |
-| LogInjectionTest.java:1472:37:1472:44 | source(...) : Object | LogInjectionTest.java:1472:28:1472:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:411 |
-| LogInjectionTest.java:1473:82:1473:89 | source(...) : Object | LogInjectionTest.java:1473:73:1473:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:408 |
-| LogInjectionTest.java:1474:67:1474:74 | source(...) : Object | LogInjectionTest.java:1474:58:1474:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:408 |
-| LogInjectionTest.java:1475:52:1475:59 | source(...) : Object | LogInjectionTest.java:1475:43:1475:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:408 |
-| LogInjectionTest.java:1476:37:1476:44 | source(...) : Object | LogInjectionTest.java:1476:28:1476:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:408 |
-| LogInjectionTest.java:1477:82:1477:89 | source(...) : Object | LogInjectionTest.java:1477:73:1477:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:412 |
-| LogInjectionTest.java:1478:67:1478:74 | source(...) : Object | LogInjectionTest.java:1478:58:1478:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:412 |
-| LogInjectionTest.java:1479:52:1479:59 | source(...) : Object | LogInjectionTest.java:1479:43:1479:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:412 |
-| LogInjectionTest.java:1480:37:1480:44 | source(...) : Object | LogInjectionTest.java:1480:28:1480:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:412 |
-| LogInjectionTest.java:1481:51:1481:58 | source(...) : Object | LogInjectionTest.java:1481:42:1481:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:415 |
-| LogInjectionTest.java:1482:36:1482:43 | source(...) : Object | LogInjectionTest.java:1482:27:1482:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:415 |
-| LogInjectionTest.java:1483:51:1483:58 | source(...) : Object | LogInjectionTest.java:1483:42:1483:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:419 |
-| LogInjectionTest.java:1484:36:1484:43 | source(...) : Object | LogInjectionTest.java:1484:27:1484:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:419 |
-| LogInjectionTest.java:1485:36:1485:43 | source(...) : Object | LogInjectionTest.java:1485:27:1485:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:418 |
-| LogInjectionTest.java:1486:36:1486:43 | source(...) : Object | LogInjectionTest.java:1486:27:1486:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:422 |
-| LogInjectionTest.java:1487:42:1487:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1487:42:1487:64 | new Object[] | provenance | Sink:MaD:418 |
-| LogInjectionTest.java:1487:56:1487:63 | source(...) : Object | LogInjectionTest.java:1487:42:1487:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1488:42:1488:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1488:42:1488:64 | new Object[] | provenance | Sink:MaD:422 |
-| LogInjectionTest.java:1488:56:1488:63 | source(...) : Object | LogInjectionTest.java:1488:42:1488:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1489:66:1489:73 | source(...) : Object | LogInjectionTest.java:1489:57:1489:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:416 |
-| LogInjectionTest.java:1490:51:1490:58 | source(...) : Object | LogInjectionTest.java:1490:42:1490:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:416 |
-| LogInjectionTest.java:1491:36:1491:43 | source(...) : Object | LogInjectionTest.java:1491:27:1491:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:416 |
-| LogInjectionTest.java:1492:66:1492:73 | source(...) : Object | LogInjectionTest.java:1492:57:1492:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:420 |
-| LogInjectionTest.java:1493:51:1493:58 | source(...) : Object | LogInjectionTest.java:1493:42:1493:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:420 |
-| LogInjectionTest.java:1494:36:1494:43 | source(...) : Object | LogInjectionTest.java:1494:27:1494:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:420 |
-| LogInjectionTest.java:1495:81:1495:88 | source(...) : Object | LogInjectionTest.java:1495:72:1495:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:417 |
-| LogInjectionTest.java:1496:66:1496:73 | source(...) : Object | LogInjectionTest.java:1496:57:1496:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:417 |
-| LogInjectionTest.java:1497:51:1497:58 | source(...) : Object | LogInjectionTest.java:1497:42:1497:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:417 |
-| LogInjectionTest.java:1498:36:1498:43 | source(...) : Object | LogInjectionTest.java:1498:27:1498:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:417 |
-| LogInjectionTest.java:1499:81:1499:88 | source(...) : Object | LogInjectionTest.java:1499:72:1499:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:421 |
-| LogInjectionTest.java:1500:66:1500:73 | source(...) : Object | LogInjectionTest.java:1500:57:1500:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:421 |
-| LogInjectionTest.java:1501:51:1501:58 | source(...) : Object | LogInjectionTest.java:1501:42:1501:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:421 |
-| LogInjectionTest.java:1502:36:1502:43 | source(...) : Object | LogInjectionTest.java:1502:27:1502:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:421 |
-| LogInjectionTest.java:1514:56:1514:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1514:56:1514:78 | new Object[] | provenance | Sink:MaD:360 |
-| LogInjectionTest.java:1514:56:1514:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1514:56:1514:78 | new Object[] | provenance | Sink:MaD:423 |
-| LogInjectionTest.java:1514:70:1514:77 | source(...) : Object | LogInjectionTest.java:1514:56:1514:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1522:56:1522:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1522:56:1522:78 | new Object[] | provenance | Sink:MaD:369 |
-| LogInjectionTest.java:1522:56:1522:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1522:56:1522:78 | new Object[] | provenance | Sink:MaD:432 |
-| LogInjectionTest.java:1522:70:1522:77 | source(...) : Object | LogInjectionTest.java:1522:56:1522:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1530:56:1530:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1530:56:1530:78 | new Object[] | provenance | Sink:MaD:378 |
-| LogInjectionTest.java:1530:56:1530:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1530:56:1530:78 | new Object[] | provenance | Sink:MaD:441 |
-| LogInjectionTest.java:1530:70:1530:77 | source(...) : Object | LogInjectionTest.java:1530:56:1530:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1538:55:1538:77 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1538:55:1538:77 | new Object[] | provenance | Sink:MaD:387 |
-| LogInjectionTest.java:1538:55:1538:77 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1538:55:1538:77 | new Object[] | provenance | Sink:MaD:450 |
-| LogInjectionTest.java:1538:69:1538:76 | source(...) : Object | LogInjectionTest.java:1538:55:1538:77 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1546:56:1546:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1546:56:1546:78 | new Object[] | provenance | Sink:MaD:405 |
-| LogInjectionTest.java:1546:56:1546:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1546:56:1546:78 | new Object[] | provenance | Sink:MaD:468 |
-| LogInjectionTest.java:1546:70:1546:77 | source(...) : Object | LogInjectionTest.java:1546:56:1546:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1554:55:1554:77 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1554:55:1554:77 | new Object[] | provenance | Sink:MaD:414 |
-| LogInjectionTest.java:1554:55:1554:77 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1554:55:1554:77 | new Object[] | provenance | Sink:MaD:477 |
-| LogInjectionTest.java:1554:69:1554:76 | source(...) : Object | LogInjectionTest.java:1554:55:1554:77 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1563:93:1563:115 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1563:93:1563:115 | new Object[] | provenance | Sink:MaD:396 |
-| LogInjectionTest.java:1563:93:1563:115 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1563:93:1563:115 | new Object[] | provenance | Sink:MaD:459 |
-| LogInjectionTest.java:1563:107:1563:114 | source(...) : Object | LogInjectionTest.java:1563:93:1563:115 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1564:51:1564:58 | source(...) : Object | LogInjectionTest.java:1564:42:1564:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:361 |
-| LogInjectionTest.java:1564:51:1564:58 | source(...) : Object | LogInjectionTest.java:1564:42:1564:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:424 |
-| LogInjectionTest.java:1565:36:1565:43 | source(...) : Object | LogInjectionTest.java:1565:27:1565:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:361 |
-| LogInjectionTest.java:1565:36:1565:43 | source(...) : Object | LogInjectionTest.java:1565:27:1565:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:424 |
-| LogInjectionTest.java:1566:51:1566:58 | source(...) : Object | LogInjectionTest.java:1566:42:1566:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:365 |
-| LogInjectionTest.java:1566:51:1566:58 | source(...) : Object | LogInjectionTest.java:1566:42:1566:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:428 |
-| LogInjectionTest.java:1567:36:1567:43 | source(...) : Object | LogInjectionTest.java:1567:27:1567:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:365 |
-| LogInjectionTest.java:1567:36:1567:43 | source(...) : Object | LogInjectionTest.java:1567:27:1567:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:428 |
-| LogInjectionTest.java:1568:36:1568:43 | source(...) : Object | LogInjectionTest.java:1568:27:1568:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:364 |
-| LogInjectionTest.java:1568:36:1568:43 | source(...) : Object | LogInjectionTest.java:1568:27:1568:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:427 |
-| LogInjectionTest.java:1569:36:1569:43 | source(...) : Object | LogInjectionTest.java:1569:27:1569:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:368 |
-| LogInjectionTest.java:1569:36:1569:43 | source(...) : Object | LogInjectionTest.java:1569:27:1569:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:431 |
-| LogInjectionTest.java:1570:42:1570:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1570:42:1570:64 | new Object[] | provenance | Sink:MaD:364 |
-| LogInjectionTest.java:1570:42:1570:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1570:42:1570:64 | new Object[] | provenance | Sink:MaD:427 |
-| LogInjectionTest.java:1570:56:1570:63 | source(...) : Object | LogInjectionTest.java:1570:42:1570:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1571:42:1571:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1571:42:1571:64 | new Object[] | provenance | Sink:MaD:368 |
-| LogInjectionTest.java:1571:42:1571:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1571:42:1571:64 | new Object[] | provenance | Sink:MaD:431 |
-| LogInjectionTest.java:1571:56:1571:63 | source(...) : Object | LogInjectionTest.java:1571:42:1571:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1572:66:1572:73 | source(...) : Object | LogInjectionTest.java:1572:57:1572:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:362 |
-| LogInjectionTest.java:1572:66:1572:73 | source(...) : Object | LogInjectionTest.java:1572:57:1572:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:425 |
-| LogInjectionTest.java:1573:51:1573:58 | source(...) : Object | LogInjectionTest.java:1573:42:1573:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:362 |
-| LogInjectionTest.java:1573:51:1573:58 | source(...) : Object | LogInjectionTest.java:1573:42:1573:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:425 |
-| LogInjectionTest.java:1574:36:1574:43 | source(...) : Object | LogInjectionTest.java:1574:27:1574:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:362 |
-| LogInjectionTest.java:1574:36:1574:43 | source(...) : Object | LogInjectionTest.java:1574:27:1574:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:425 |
-| LogInjectionTest.java:1575:66:1575:73 | source(...) : Object | LogInjectionTest.java:1575:57:1575:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:366 |
-| LogInjectionTest.java:1575:66:1575:73 | source(...) : Object | LogInjectionTest.java:1575:57:1575:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:429 |
-| LogInjectionTest.java:1576:51:1576:58 | source(...) : Object | LogInjectionTest.java:1576:42:1576:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:366 |
-| LogInjectionTest.java:1576:51:1576:58 | source(...) : Object | LogInjectionTest.java:1576:42:1576:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:429 |
-| LogInjectionTest.java:1577:36:1577:43 | source(...) : Object | LogInjectionTest.java:1577:27:1577:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:366 |
-| LogInjectionTest.java:1577:36:1577:43 | source(...) : Object | LogInjectionTest.java:1577:27:1577:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:429 |
-| LogInjectionTest.java:1578:81:1578:88 | source(...) : Object | LogInjectionTest.java:1578:72:1578:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:363 |
-| LogInjectionTest.java:1578:81:1578:88 | source(...) : Object | LogInjectionTest.java:1578:72:1578:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:426 |
-| LogInjectionTest.java:1579:66:1579:73 | source(...) : Object | LogInjectionTest.java:1579:57:1579:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:363 |
-| LogInjectionTest.java:1579:66:1579:73 | source(...) : Object | LogInjectionTest.java:1579:57:1579:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:426 |
-| LogInjectionTest.java:1580:51:1580:58 | source(...) : Object | LogInjectionTest.java:1580:42:1580:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:363 |
-| LogInjectionTest.java:1580:51:1580:58 | source(...) : Object | LogInjectionTest.java:1580:42:1580:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:426 |
-| LogInjectionTest.java:1581:36:1581:43 | source(...) : Object | LogInjectionTest.java:1581:27:1581:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:363 |
-| LogInjectionTest.java:1581:36:1581:43 | source(...) : Object | LogInjectionTest.java:1581:27:1581:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:426 |
-| LogInjectionTest.java:1582:81:1582:88 | source(...) : Object | LogInjectionTest.java:1582:72:1582:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:367 |
-| LogInjectionTest.java:1582:81:1582:88 | source(...) : Object | LogInjectionTest.java:1582:72:1582:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:430 |
-| LogInjectionTest.java:1583:66:1583:73 | source(...) : Object | LogInjectionTest.java:1583:57:1583:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:367 |
-| LogInjectionTest.java:1583:66:1583:73 | source(...) : Object | LogInjectionTest.java:1583:57:1583:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:430 |
-| LogInjectionTest.java:1584:51:1584:58 | source(...) : Object | LogInjectionTest.java:1584:42:1584:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:367 |
-| LogInjectionTest.java:1584:51:1584:58 | source(...) : Object | LogInjectionTest.java:1584:42:1584:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:430 |
-| LogInjectionTest.java:1585:36:1585:43 | source(...) : Object | LogInjectionTest.java:1585:27:1585:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:367 |
-| LogInjectionTest.java:1585:36:1585:43 | source(...) : Object | LogInjectionTest.java:1585:27:1585:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:430 |
-| LogInjectionTest.java:1586:51:1586:58 | source(...) : Object | LogInjectionTest.java:1586:42:1586:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:370 |
-| LogInjectionTest.java:1586:51:1586:58 | source(...) : Object | LogInjectionTest.java:1586:42:1586:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:433 |
-| LogInjectionTest.java:1587:36:1587:43 | source(...) : Object | LogInjectionTest.java:1587:27:1587:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:370 |
-| LogInjectionTest.java:1587:36:1587:43 | source(...) : Object | LogInjectionTest.java:1587:27:1587:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:433 |
-| LogInjectionTest.java:1588:51:1588:58 | source(...) : Object | LogInjectionTest.java:1588:42:1588:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:374 |
-| LogInjectionTest.java:1588:51:1588:58 | source(...) : Object | LogInjectionTest.java:1588:42:1588:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:437 |
-| LogInjectionTest.java:1589:36:1589:43 | source(...) : Object | LogInjectionTest.java:1589:27:1589:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:374 |
-| LogInjectionTest.java:1589:36:1589:43 | source(...) : Object | LogInjectionTest.java:1589:27:1589:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:437 |
-| LogInjectionTest.java:1590:36:1590:43 | source(...) : Object | LogInjectionTest.java:1590:27:1590:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:373 |
-| LogInjectionTest.java:1590:36:1590:43 | source(...) : Object | LogInjectionTest.java:1590:27:1590:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:436 |
-| LogInjectionTest.java:1591:36:1591:43 | source(...) : Object | LogInjectionTest.java:1591:27:1591:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:377 |
-| LogInjectionTest.java:1591:36:1591:43 | source(...) : Object | LogInjectionTest.java:1591:27:1591:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:440 |
-| LogInjectionTest.java:1592:42:1592:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1592:42:1592:64 | new Object[] | provenance | Sink:MaD:373 |
-| LogInjectionTest.java:1592:42:1592:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1592:42:1592:64 | new Object[] | provenance | Sink:MaD:436 |
-| LogInjectionTest.java:1592:56:1592:63 | source(...) : Object | LogInjectionTest.java:1592:42:1592:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1593:42:1593:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1593:42:1593:64 | new Object[] | provenance | Sink:MaD:377 |
-| LogInjectionTest.java:1593:42:1593:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1593:42:1593:64 | new Object[] | provenance | Sink:MaD:440 |
-| LogInjectionTest.java:1593:56:1593:63 | source(...) : Object | LogInjectionTest.java:1593:42:1593:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1594:66:1594:73 | source(...) : Object | LogInjectionTest.java:1594:57:1594:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:371 |
-| LogInjectionTest.java:1594:66:1594:73 | source(...) : Object | LogInjectionTest.java:1594:57:1594:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:434 |
-| LogInjectionTest.java:1595:51:1595:58 | source(...) : Object | LogInjectionTest.java:1595:42:1595:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:371 |
-| LogInjectionTest.java:1595:51:1595:58 | source(...) : Object | LogInjectionTest.java:1595:42:1595:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:434 |
-| LogInjectionTest.java:1596:36:1596:43 | source(...) : Object | LogInjectionTest.java:1596:27:1596:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:371 |
-| LogInjectionTest.java:1596:36:1596:43 | source(...) : Object | LogInjectionTest.java:1596:27:1596:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:434 |
-| LogInjectionTest.java:1597:66:1597:73 | source(...) : Object | LogInjectionTest.java:1597:57:1597:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:375 |
-| LogInjectionTest.java:1597:66:1597:73 | source(...) : Object | LogInjectionTest.java:1597:57:1597:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:438 |
-| LogInjectionTest.java:1598:51:1598:58 | source(...) : Object | LogInjectionTest.java:1598:42:1598:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:375 |
-| LogInjectionTest.java:1598:51:1598:58 | source(...) : Object | LogInjectionTest.java:1598:42:1598:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:438 |
-| LogInjectionTest.java:1599:36:1599:43 | source(...) : Object | LogInjectionTest.java:1599:27:1599:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:375 |
-| LogInjectionTest.java:1599:36:1599:43 | source(...) : Object | LogInjectionTest.java:1599:27:1599:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:438 |
-| LogInjectionTest.java:1600:81:1600:88 | source(...) : Object | LogInjectionTest.java:1600:72:1600:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:372 |
-| LogInjectionTest.java:1600:81:1600:88 | source(...) : Object | LogInjectionTest.java:1600:72:1600:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:435 |
-| LogInjectionTest.java:1601:66:1601:73 | source(...) : Object | LogInjectionTest.java:1601:57:1601:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:372 |
-| LogInjectionTest.java:1601:66:1601:73 | source(...) : Object | LogInjectionTest.java:1601:57:1601:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:435 |
-| LogInjectionTest.java:1602:51:1602:58 | source(...) : Object | LogInjectionTest.java:1602:42:1602:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:372 |
-| LogInjectionTest.java:1602:51:1602:58 | source(...) : Object | LogInjectionTest.java:1602:42:1602:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:435 |
-| LogInjectionTest.java:1603:36:1603:43 | source(...) : Object | LogInjectionTest.java:1603:27:1603:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:372 |
-| LogInjectionTest.java:1603:36:1603:43 | source(...) : Object | LogInjectionTest.java:1603:27:1603:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:435 |
-| LogInjectionTest.java:1604:81:1604:88 | source(...) : Object | LogInjectionTest.java:1604:72:1604:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:376 |
-| LogInjectionTest.java:1604:81:1604:88 | source(...) : Object | LogInjectionTest.java:1604:72:1604:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:439 |
-| LogInjectionTest.java:1605:66:1605:73 | source(...) : Object | LogInjectionTest.java:1605:57:1605:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:376 |
-| LogInjectionTest.java:1605:66:1605:73 | source(...) : Object | LogInjectionTest.java:1605:57:1605:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:439 |
-| LogInjectionTest.java:1606:51:1606:58 | source(...) : Object | LogInjectionTest.java:1606:42:1606:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:376 |
-| LogInjectionTest.java:1606:51:1606:58 | source(...) : Object | LogInjectionTest.java:1606:42:1606:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:439 |
-| LogInjectionTest.java:1607:36:1607:43 | source(...) : Object | LogInjectionTest.java:1607:27:1607:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:376 |
-| LogInjectionTest.java:1607:36:1607:43 | source(...) : Object | LogInjectionTest.java:1607:27:1607:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:439 |
-| LogInjectionTest.java:1608:51:1608:58 | source(...) : Object | LogInjectionTest.java:1608:42:1608:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:379 |
-| LogInjectionTest.java:1608:51:1608:58 | source(...) : Object | LogInjectionTest.java:1608:42:1608:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:442 |
-| LogInjectionTest.java:1609:36:1609:43 | source(...) : Object | LogInjectionTest.java:1609:27:1609:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:379 |
-| LogInjectionTest.java:1609:36:1609:43 | source(...) : Object | LogInjectionTest.java:1609:27:1609:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:442 |
-| LogInjectionTest.java:1610:51:1610:58 | source(...) : Object | LogInjectionTest.java:1610:42:1610:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:383 |
-| LogInjectionTest.java:1610:51:1610:58 | source(...) : Object | LogInjectionTest.java:1610:42:1610:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:446 |
-| LogInjectionTest.java:1611:36:1611:43 | source(...) : Object | LogInjectionTest.java:1611:27:1611:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:383 |
-| LogInjectionTest.java:1611:36:1611:43 | source(...) : Object | LogInjectionTest.java:1611:27:1611:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:446 |
-| LogInjectionTest.java:1612:36:1612:43 | source(...) : Object | LogInjectionTest.java:1612:27:1612:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:382 |
-| LogInjectionTest.java:1612:36:1612:43 | source(...) : Object | LogInjectionTest.java:1612:27:1612:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:445 |
-| LogInjectionTest.java:1613:36:1613:43 | source(...) : Object | LogInjectionTest.java:1613:27:1613:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:386 |
-| LogInjectionTest.java:1613:36:1613:43 | source(...) : Object | LogInjectionTest.java:1613:27:1613:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:449 |
-| LogInjectionTest.java:1614:42:1614:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1614:42:1614:64 | new Object[] | provenance | Sink:MaD:382 |
-| LogInjectionTest.java:1614:42:1614:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1614:42:1614:64 | new Object[] | provenance | Sink:MaD:445 |
-| LogInjectionTest.java:1614:56:1614:63 | source(...) : Object | LogInjectionTest.java:1614:42:1614:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1615:42:1615:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1615:42:1615:64 | new Object[] | provenance | Sink:MaD:386 |
-| LogInjectionTest.java:1615:42:1615:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1615:42:1615:64 | new Object[] | provenance | Sink:MaD:449 |
-| LogInjectionTest.java:1615:56:1615:63 | source(...) : Object | LogInjectionTest.java:1615:42:1615:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1616:66:1616:73 | source(...) : Object | LogInjectionTest.java:1616:57:1616:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:380 |
-| LogInjectionTest.java:1616:66:1616:73 | source(...) : Object | LogInjectionTest.java:1616:57:1616:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:443 |
-| LogInjectionTest.java:1617:51:1617:58 | source(...) : Object | LogInjectionTest.java:1617:42:1617:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:380 |
-| LogInjectionTest.java:1617:51:1617:58 | source(...) : Object | LogInjectionTest.java:1617:42:1617:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:443 |
-| LogInjectionTest.java:1618:36:1618:43 | source(...) : Object | LogInjectionTest.java:1618:27:1618:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:380 |
-| LogInjectionTest.java:1618:36:1618:43 | source(...) : Object | LogInjectionTest.java:1618:27:1618:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:443 |
-| LogInjectionTest.java:1619:66:1619:73 | source(...) : Object | LogInjectionTest.java:1619:57:1619:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:384 |
-| LogInjectionTest.java:1619:66:1619:73 | source(...) : Object | LogInjectionTest.java:1619:57:1619:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:447 |
-| LogInjectionTest.java:1620:51:1620:58 | source(...) : Object | LogInjectionTest.java:1620:42:1620:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:384 |
-| LogInjectionTest.java:1620:51:1620:58 | source(...) : Object | LogInjectionTest.java:1620:42:1620:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:447 |
-| LogInjectionTest.java:1621:36:1621:43 | source(...) : Object | LogInjectionTest.java:1621:27:1621:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:384 |
-| LogInjectionTest.java:1621:36:1621:43 | source(...) : Object | LogInjectionTest.java:1621:27:1621:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:447 |
-| LogInjectionTest.java:1622:81:1622:88 | source(...) : Object | LogInjectionTest.java:1622:72:1622:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:381 |
-| LogInjectionTest.java:1622:81:1622:88 | source(...) : Object | LogInjectionTest.java:1622:72:1622:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:444 |
-| LogInjectionTest.java:1623:66:1623:73 | source(...) : Object | LogInjectionTest.java:1623:57:1623:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:381 |
-| LogInjectionTest.java:1623:66:1623:73 | source(...) : Object | LogInjectionTest.java:1623:57:1623:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:444 |
-| LogInjectionTest.java:1624:51:1624:58 | source(...) : Object | LogInjectionTest.java:1624:42:1624:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:381 |
-| LogInjectionTest.java:1624:51:1624:58 | source(...) : Object | LogInjectionTest.java:1624:42:1624:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:444 |
-| LogInjectionTest.java:1625:36:1625:43 | source(...) : Object | LogInjectionTest.java:1625:27:1625:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:381 |
-| LogInjectionTest.java:1625:36:1625:43 | source(...) : Object | LogInjectionTest.java:1625:27:1625:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:444 |
-| LogInjectionTest.java:1626:81:1626:88 | source(...) : Object | LogInjectionTest.java:1626:72:1626:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:385 |
-| LogInjectionTest.java:1626:81:1626:88 | source(...) : Object | LogInjectionTest.java:1626:72:1626:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:448 |
-| LogInjectionTest.java:1627:66:1627:73 | source(...) : Object | LogInjectionTest.java:1627:57:1627:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:385 |
-| LogInjectionTest.java:1627:66:1627:73 | source(...) : Object | LogInjectionTest.java:1627:57:1627:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:448 |
-| LogInjectionTest.java:1628:51:1628:58 | source(...) : Object | LogInjectionTest.java:1628:42:1628:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:385 |
-| LogInjectionTest.java:1628:51:1628:58 | source(...) : Object | LogInjectionTest.java:1628:42:1628:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:448 |
-| LogInjectionTest.java:1629:36:1629:43 | source(...) : Object | LogInjectionTest.java:1629:27:1629:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:385 |
-| LogInjectionTest.java:1629:36:1629:43 | source(...) : Object | LogInjectionTest.java:1629:27:1629:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:448 |
-| LogInjectionTest.java:1630:50:1630:57 | source(...) : Object | LogInjectionTest.java:1630:41:1630:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:388 |
-| LogInjectionTest.java:1630:50:1630:57 | source(...) : Object | LogInjectionTest.java:1630:41:1630:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:451 |
-| LogInjectionTest.java:1631:35:1631:42 | source(...) : Object | LogInjectionTest.java:1631:26:1631:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:388 |
-| LogInjectionTest.java:1631:35:1631:42 | source(...) : Object | LogInjectionTest.java:1631:26:1631:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:451 |
-| LogInjectionTest.java:1632:50:1632:57 | source(...) : Object | LogInjectionTest.java:1632:41:1632:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:392 |
-| LogInjectionTest.java:1632:50:1632:57 | source(...) : Object | LogInjectionTest.java:1632:41:1632:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:455 |
-| LogInjectionTest.java:1633:35:1633:42 | source(...) : Object | LogInjectionTest.java:1633:26:1633:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:392 |
-| LogInjectionTest.java:1633:35:1633:42 | source(...) : Object | LogInjectionTest.java:1633:26:1633:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:455 |
-| LogInjectionTest.java:1634:35:1634:42 | source(...) : Object | LogInjectionTest.java:1634:26:1634:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:391 |
-| LogInjectionTest.java:1634:35:1634:42 | source(...) : Object | LogInjectionTest.java:1634:26:1634:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:454 |
-| LogInjectionTest.java:1635:35:1635:42 | source(...) : Object | LogInjectionTest.java:1635:26:1635:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:395 |
-| LogInjectionTest.java:1635:35:1635:42 | source(...) : Object | LogInjectionTest.java:1635:26:1635:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:458 |
-| LogInjectionTest.java:1636:41:1636:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1636:41:1636:63 | new Object[] | provenance | Sink:MaD:391 |
-| LogInjectionTest.java:1636:41:1636:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1636:41:1636:63 | new Object[] | provenance | Sink:MaD:454 |
-| LogInjectionTest.java:1636:55:1636:62 | source(...) : Object | LogInjectionTest.java:1636:41:1636:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1637:41:1637:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1637:41:1637:63 | new Object[] | provenance | Sink:MaD:395 |
-| LogInjectionTest.java:1637:41:1637:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1637:41:1637:63 | new Object[] | provenance | Sink:MaD:458 |
-| LogInjectionTest.java:1637:55:1637:62 | source(...) : Object | LogInjectionTest.java:1637:41:1637:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1638:65:1638:72 | source(...) : Object | LogInjectionTest.java:1638:56:1638:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:389 |
-| LogInjectionTest.java:1638:65:1638:72 | source(...) : Object | LogInjectionTest.java:1638:56:1638:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:452 |
-| LogInjectionTest.java:1639:50:1639:57 | source(...) : Object | LogInjectionTest.java:1639:41:1639:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:389 |
-| LogInjectionTest.java:1639:50:1639:57 | source(...) : Object | LogInjectionTest.java:1639:41:1639:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:452 |
-| LogInjectionTest.java:1640:35:1640:42 | source(...) : Object | LogInjectionTest.java:1640:26:1640:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:389 |
-| LogInjectionTest.java:1640:35:1640:42 | source(...) : Object | LogInjectionTest.java:1640:26:1640:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:452 |
-| LogInjectionTest.java:1641:65:1641:72 | source(...) : Object | LogInjectionTest.java:1641:56:1641:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:393 |
-| LogInjectionTest.java:1641:65:1641:72 | source(...) : Object | LogInjectionTest.java:1641:56:1641:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:456 |
-| LogInjectionTest.java:1642:50:1642:57 | source(...) : Object | LogInjectionTest.java:1642:41:1642:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:393 |
-| LogInjectionTest.java:1642:50:1642:57 | source(...) : Object | LogInjectionTest.java:1642:41:1642:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:456 |
-| LogInjectionTest.java:1643:35:1643:42 | source(...) : Object | LogInjectionTest.java:1643:26:1643:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:393 |
-| LogInjectionTest.java:1643:35:1643:42 | source(...) : Object | LogInjectionTest.java:1643:26:1643:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:456 |
-| LogInjectionTest.java:1644:80:1644:87 | source(...) : Object | LogInjectionTest.java:1644:71:1644:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:390 |
-| LogInjectionTest.java:1644:80:1644:87 | source(...) : Object | LogInjectionTest.java:1644:71:1644:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:453 |
-| LogInjectionTest.java:1645:65:1645:72 | source(...) : Object | LogInjectionTest.java:1645:56:1645:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:390 |
-| LogInjectionTest.java:1645:65:1645:72 | source(...) : Object | LogInjectionTest.java:1645:56:1645:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:453 |
-| LogInjectionTest.java:1646:50:1646:57 | source(...) : Object | LogInjectionTest.java:1646:41:1646:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:390 |
-| LogInjectionTest.java:1646:50:1646:57 | source(...) : Object | LogInjectionTest.java:1646:41:1646:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:453 |
-| LogInjectionTest.java:1647:35:1647:42 | source(...) : Object | LogInjectionTest.java:1647:26:1647:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:390 |
-| LogInjectionTest.java:1647:35:1647:42 | source(...) : Object | LogInjectionTest.java:1647:26:1647:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:453 |
-| LogInjectionTest.java:1648:80:1648:87 | source(...) : Object | LogInjectionTest.java:1648:71:1648:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:394 |
-| LogInjectionTest.java:1648:80:1648:87 | source(...) : Object | LogInjectionTest.java:1648:71:1648:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:457 |
-| LogInjectionTest.java:1649:65:1649:72 | source(...) : Object | LogInjectionTest.java:1649:56:1649:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:394 |
-| LogInjectionTest.java:1649:65:1649:72 | source(...) : Object | LogInjectionTest.java:1649:56:1649:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:457 |
-| LogInjectionTest.java:1650:50:1650:57 | source(...) : Object | LogInjectionTest.java:1650:41:1650:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:394 |
-| LogInjectionTest.java:1650:50:1650:57 | source(...) : Object | LogInjectionTest.java:1650:41:1650:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:457 |
-| LogInjectionTest.java:1651:35:1651:42 | source(...) : Object | LogInjectionTest.java:1651:26:1651:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:394 |
-| LogInjectionTest.java:1651:35:1651:42 | source(...) : Object | LogInjectionTest.java:1651:26:1651:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:457 |
-| LogInjectionTest.java:1652:88:1652:95 | source(...) : Object | LogInjectionTest.java:1652:79:1652:95 | (...)... | provenance | Src:MaD:536 Sink:MaD:397 |
-| LogInjectionTest.java:1652:88:1652:95 | source(...) : Object | LogInjectionTest.java:1652:79:1652:95 | (...)... | provenance | Src:MaD:536 Sink:MaD:460 |
-| LogInjectionTest.java:1653:73:1653:80 | source(...) : Object | LogInjectionTest.java:1653:64:1653:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:397 |
-| LogInjectionTest.java:1653:73:1653:80 | source(...) : Object | LogInjectionTest.java:1653:64:1653:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:460 |
-| LogInjectionTest.java:1654:88:1654:95 | source(...) : Object | LogInjectionTest.java:1654:79:1654:95 | (...)... | provenance | Src:MaD:536 Sink:MaD:401 |
-| LogInjectionTest.java:1654:88:1654:95 | source(...) : Object | LogInjectionTest.java:1654:79:1654:95 | (...)... | provenance | Src:MaD:536 Sink:MaD:464 |
-| LogInjectionTest.java:1655:73:1655:80 | source(...) : Object | LogInjectionTest.java:1655:64:1655:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:401 |
-| LogInjectionTest.java:1655:73:1655:80 | source(...) : Object | LogInjectionTest.java:1655:64:1655:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:464 |
-| LogInjectionTest.java:1656:73:1656:80 | source(...) : Object | LogInjectionTest.java:1656:64:1656:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:400 |
-| LogInjectionTest.java:1656:73:1656:80 | source(...) : Object | LogInjectionTest.java:1656:64:1656:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:463 |
-| LogInjectionTest.java:1657:73:1657:80 | source(...) : Object | LogInjectionTest.java:1657:64:1657:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:404 |
-| LogInjectionTest.java:1657:73:1657:80 | source(...) : Object | LogInjectionTest.java:1657:64:1657:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:467 |
-| LogInjectionTest.java:1658:79:1658:101 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1658:79:1658:101 | new Object[] | provenance | Sink:MaD:400 |
-| LogInjectionTest.java:1658:79:1658:101 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1658:79:1658:101 | new Object[] | provenance | Sink:MaD:463 |
-| LogInjectionTest.java:1658:93:1658:100 | source(...) : Object | LogInjectionTest.java:1658:79:1658:101 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1659:79:1659:101 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1659:79:1659:101 | new Object[] | provenance | Sink:MaD:404 |
-| LogInjectionTest.java:1659:79:1659:101 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1659:79:1659:101 | new Object[] | provenance | Sink:MaD:467 |
-| LogInjectionTest.java:1659:93:1659:100 | source(...) : Object | LogInjectionTest.java:1659:79:1659:101 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1660:103:1660:110 | source(...) : Object | LogInjectionTest.java:1660:94:1660:110 | (...)... | provenance | Src:MaD:536 Sink:MaD:398 |
-| LogInjectionTest.java:1660:103:1660:110 | source(...) : Object | LogInjectionTest.java:1660:94:1660:110 | (...)... | provenance | Src:MaD:536 Sink:MaD:461 |
-| LogInjectionTest.java:1661:88:1661:95 | source(...) : Object | LogInjectionTest.java:1661:79:1661:95 | (...)... | provenance | Src:MaD:536 Sink:MaD:398 |
-| LogInjectionTest.java:1661:88:1661:95 | source(...) : Object | LogInjectionTest.java:1661:79:1661:95 | (...)... | provenance | Src:MaD:536 Sink:MaD:461 |
-| LogInjectionTest.java:1662:73:1662:80 | source(...) : Object | LogInjectionTest.java:1662:64:1662:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:398 |
-| LogInjectionTest.java:1662:73:1662:80 | source(...) : Object | LogInjectionTest.java:1662:64:1662:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:461 |
-| LogInjectionTest.java:1663:103:1663:110 | source(...) : Object | LogInjectionTest.java:1663:94:1663:110 | (...)... | provenance | Src:MaD:536 Sink:MaD:402 |
-| LogInjectionTest.java:1663:103:1663:110 | source(...) : Object | LogInjectionTest.java:1663:94:1663:110 | (...)... | provenance | Src:MaD:536 Sink:MaD:465 |
-| LogInjectionTest.java:1664:88:1664:95 | source(...) : Object | LogInjectionTest.java:1664:79:1664:95 | (...)... | provenance | Src:MaD:536 Sink:MaD:402 |
-| LogInjectionTest.java:1664:88:1664:95 | source(...) : Object | LogInjectionTest.java:1664:79:1664:95 | (...)... | provenance | Src:MaD:536 Sink:MaD:465 |
-| LogInjectionTest.java:1665:73:1665:80 | source(...) : Object | LogInjectionTest.java:1665:64:1665:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:402 |
-| LogInjectionTest.java:1665:73:1665:80 | source(...) : Object | LogInjectionTest.java:1665:64:1665:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:465 |
-| LogInjectionTest.java:1666:118:1666:125 | source(...) : Object | LogInjectionTest.java:1666:109:1666:125 | (...)... | provenance | Src:MaD:536 Sink:MaD:399 |
-| LogInjectionTest.java:1666:118:1666:125 | source(...) : Object | LogInjectionTest.java:1666:109:1666:125 | (...)... | provenance | Src:MaD:536 Sink:MaD:462 |
-| LogInjectionTest.java:1667:103:1667:110 | source(...) : Object | LogInjectionTest.java:1667:94:1667:110 | (...)... | provenance | Src:MaD:536 Sink:MaD:399 |
-| LogInjectionTest.java:1667:103:1667:110 | source(...) : Object | LogInjectionTest.java:1667:94:1667:110 | (...)... | provenance | Src:MaD:536 Sink:MaD:462 |
-| LogInjectionTest.java:1668:88:1668:95 | source(...) : Object | LogInjectionTest.java:1668:79:1668:95 | (...)... | provenance | Src:MaD:536 Sink:MaD:399 |
-| LogInjectionTest.java:1668:88:1668:95 | source(...) : Object | LogInjectionTest.java:1668:79:1668:95 | (...)... | provenance | Src:MaD:536 Sink:MaD:462 |
-| LogInjectionTest.java:1669:73:1669:80 | source(...) : Object | LogInjectionTest.java:1669:64:1669:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:399 |
-| LogInjectionTest.java:1669:73:1669:80 | source(...) : Object | LogInjectionTest.java:1669:64:1669:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:462 |
-| LogInjectionTest.java:1670:118:1670:125 | source(...) : Object | LogInjectionTest.java:1670:109:1670:125 | (...)... | provenance | Src:MaD:536 Sink:MaD:403 |
-| LogInjectionTest.java:1670:118:1670:125 | source(...) : Object | LogInjectionTest.java:1670:109:1670:125 | (...)... | provenance | Src:MaD:536 Sink:MaD:466 |
-| LogInjectionTest.java:1671:103:1671:110 | source(...) : Object | LogInjectionTest.java:1671:94:1671:110 | (...)... | provenance | Src:MaD:536 Sink:MaD:403 |
-| LogInjectionTest.java:1671:103:1671:110 | source(...) : Object | LogInjectionTest.java:1671:94:1671:110 | (...)... | provenance | Src:MaD:536 Sink:MaD:466 |
-| LogInjectionTest.java:1672:88:1672:95 | source(...) : Object | LogInjectionTest.java:1672:79:1672:95 | (...)... | provenance | Src:MaD:536 Sink:MaD:403 |
-| LogInjectionTest.java:1672:88:1672:95 | source(...) : Object | LogInjectionTest.java:1672:79:1672:95 | (...)... | provenance | Src:MaD:536 Sink:MaD:466 |
-| LogInjectionTest.java:1673:73:1673:80 | source(...) : Object | LogInjectionTest.java:1673:64:1673:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:403 |
-| LogInjectionTest.java:1673:73:1673:80 | source(...) : Object | LogInjectionTest.java:1673:64:1673:80 | (...)... | provenance | Src:MaD:536 Sink:MaD:466 |
-| LogInjectionTest.java:1674:51:1674:58 | source(...) : Object | LogInjectionTest.java:1674:42:1674:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:406 |
-| LogInjectionTest.java:1674:51:1674:58 | source(...) : Object | LogInjectionTest.java:1674:42:1674:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:469 |
-| LogInjectionTest.java:1675:36:1675:43 | source(...) : Object | LogInjectionTest.java:1675:27:1675:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:406 |
-| LogInjectionTest.java:1675:36:1675:43 | source(...) : Object | LogInjectionTest.java:1675:27:1675:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:469 |
-| LogInjectionTest.java:1676:51:1676:58 | source(...) : Object | LogInjectionTest.java:1676:42:1676:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:410 |
-| LogInjectionTest.java:1676:51:1676:58 | source(...) : Object | LogInjectionTest.java:1676:42:1676:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:473 |
-| LogInjectionTest.java:1677:36:1677:43 | source(...) : Object | LogInjectionTest.java:1677:27:1677:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:410 |
-| LogInjectionTest.java:1677:36:1677:43 | source(...) : Object | LogInjectionTest.java:1677:27:1677:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:473 |
-| LogInjectionTest.java:1678:36:1678:43 | source(...) : Object | LogInjectionTest.java:1678:27:1678:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:409 |
-| LogInjectionTest.java:1678:36:1678:43 | source(...) : Object | LogInjectionTest.java:1678:27:1678:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:472 |
-| LogInjectionTest.java:1679:36:1679:43 | source(...) : Object | LogInjectionTest.java:1679:27:1679:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:413 |
-| LogInjectionTest.java:1679:36:1679:43 | source(...) : Object | LogInjectionTest.java:1679:27:1679:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:476 |
-| LogInjectionTest.java:1680:42:1680:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1680:42:1680:64 | new Object[] | provenance | Sink:MaD:409 |
-| LogInjectionTest.java:1680:42:1680:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1680:42:1680:64 | new Object[] | provenance | Sink:MaD:472 |
-| LogInjectionTest.java:1680:56:1680:63 | source(...) : Object | LogInjectionTest.java:1680:42:1680:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1681:42:1681:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1681:42:1681:64 | new Object[] | provenance | Sink:MaD:413 |
-| LogInjectionTest.java:1681:42:1681:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1681:42:1681:64 | new Object[] | provenance | Sink:MaD:476 |
-| LogInjectionTest.java:1681:56:1681:63 | source(...) : Object | LogInjectionTest.java:1681:42:1681:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1682:66:1682:73 | source(...) : Object | LogInjectionTest.java:1682:57:1682:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:407 |
-| LogInjectionTest.java:1682:66:1682:73 | source(...) : Object | LogInjectionTest.java:1682:57:1682:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:470 |
-| LogInjectionTest.java:1683:51:1683:58 | source(...) : Object | LogInjectionTest.java:1683:42:1683:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:407 |
-| LogInjectionTest.java:1683:51:1683:58 | source(...) : Object | LogInjectionTest.java:1683:42:1683:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:470 |
-| LogInjectionTest.java:1684:36:1684:43 | source(...) : Object | LogInjectionTest.java:1684:27:1684:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:407 |
-| LogInjectionTest.java:1684:36:1684:43 | source(...) : Object | LogInjectionTest.java:1684:27:1684:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:470 |
-| LogInjectionTest.java:1685:66:1685:73 | source(...) : Object | LogInjectionTest.java:1685:57:1685:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:411 |
-| LogInjectionTest.java:1685:66:1685:73 | source(...) : Object | LogInjectionTest.java:1685:57:1685:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:474 |
-| LogInjectionTest.java:1686:51:1686:58 | source(...) : Object | LogInjectionTest.java:1686:42:1686:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:411 |
-| LogInjectionTest.java:1686:51:1686:58 | source(...) : Object | LogInjectionTest.java:1686:42:1686:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:474 |
-| LogInjectionTest.java:1687:36:1687:43 | source(...) : Object | LogInjectionTest.java:1687:27:1687:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:411 |
-| LogInjectionTest.java:1687:36:1687:43 | source(...) : Object | LogInjectionTest.java:1687:27:1687:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:474 |
-| LogInjectionTest.java:1688:81:1688:88 | source(...) : Object | LogInjectionTest.java:1688:72:1688:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:408 |
-| LogInjectionTest.java:1688:81:1688:88 | source(...) : Object | LogInjectionTest.java:1688:72:1688:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:471 |
-| LogInjectionTest.java:1689:66:1689:73 | source(...) : Object | LogInjectionTest.java:1689:57:1689:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:408 |
-| LogInjectionTest.java:1689:66:1689:73 | source(...) : Object | LogInjectionTest.java:1689:57:1689:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:471 |
-| LogInjectionTest.java:1690:51:1690:58 | source(...) : Object | LogInjectionTest.java:1690:42:1690:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:408 |
-| LogInjectionTest.java:1690:51:1690:58 | source(...) : Object | LogInjectionTest.java:1690:42:1690:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:471 |
-| LogInjectionTest.java:1691:36:1691:43 | source(...) : Object | LogInjectionTest.java:1691:27:1691:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:408 |
-| LogInjectionTest.java:1691:36:1691:43 | source(...) : Object | LogInjectionTest.java:1691:27:1691:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:471 |
-| LogInjectionTest.java:1692:81:1692:88 | source(...) : Object | LogInjectionTest.java:1692:72:1692:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:412 |
-| LogInjectionTest.java:1692:81:1692:88 | source(...) : Object | LogInjectionTest.java:1692:72:1692:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:475 |
-| LogInjectionTest.java:1693:66:1693:73 | source(...) : Object | LogInjectionTest.java:1693:57:1693:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:412 |
-| LogInjectionTest.java:1693:66:1693:73 | source(...) : Object | LogInjectionTest.java:1693:57:1693:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:475 |
-| LogInjectionTest.java:1694:51:1694:58 | source(...) : Object | LogInjectionTest.java:1694:42:1694:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:412 |
-| LogInjectionTest.java:1694:51:1694:58 | source(...) : Object | LogInjectionTest.java:1694:42:1694:58 | (...)... | provenance | Src:MaD:536 Sink:MaD:475 |
-| LogInjectionTest.java:1695:36:1695:43 | source(...) : Object | LogInjectionTest.java:1695:27:1695:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:412 |
-| LogInjectionTest.java:1695:36:1695:43 | source(...) : Object | LogInjectionTest.java:1695:27:1695:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:475 |
-| LogInjectionTest.java:1696:50:1696:57 | source(...) : Object | LogInjectionTest.java:1696:41:1696:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:415 |
-| LogInjectionTest.java:1696:50:1696:57 | source(...) : Object | LogInjectionTest.java:1696:41:1696:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:478 |
-| LogInjectionTest.java:1697:35:1697:42 | source(...) : Object | LogInjectionTest.java:1697:26:1697:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:415 |
-| LogInjectionTest.java:1697:35:1697:42 | source(...) : Object | LogInjectionTest.java:1697:26:1697:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:478 |
-| LogInjectionTest.java:1698:50:1698:57 | source(...) : Object | LogInjectionTest.java:1698:41:1698:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:419 |
-| LogInjectionTest.java:1698:50:1698:57 | source(...) : Object | LogInjectionTest.java:1698:41:1698:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:482 |
-| LogInjectionTest.java:1699:35:1699:42 | source(...) : Object | LogInjectionTest.java:1699:26:1699:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:419 |
-| LogInjectionTest.java:1699:35:1699:42 | source(...) : Object | LogInjectionTest.java:1699:26:1699:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:482 |
-| LogInjectionTest.java:1700:35:1700:42 | source(...) : Object | LogInjectionTest.java:1700:26:1700:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:418 |
-| LogInjectionTest.java:1700:35:1700:42 | source(...) : Object | LogInjectionTest.java:1700:26:1700:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:481 |
-| LogInjectionTest.java:1701:35:1701:42 | source(...) : Object | LogInjectionTest.java:1701:26:1701:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:422 |
-| LogInjectionTest.java:1701:35:1701:42 | source(...) : Object | LogInjectionTest.java:1701:26:1701:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:485 |
-| LogInjectionTest.java:1702:41:1702:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1702:41:1702:63 | new Object[] | provenance | Sink:MaD:418 |
-| LogInjectionTest.java:1702:41:1702:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1702:41:1702:63 | new Object[] | provenance | Sink:MaD:481 |
-| LogInjectionTest.java:1702:55:1702:62 | source(...) : Object | LogInjectionTest.java:1702:41:1702:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1703:41:1703:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1703:41:1703:63 | new Object[] | provenance | Sink:MaD:422 |
-| LogInjectionTest.java:1703:41:1703:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1703:41:1703:63 | new Object[] | provenance | Sink:MaD:485 |
-| LogInjectionTest.java:1703:55:1703:62 | source(...) : Object | LogInjectionTest.java:1703:41:1703:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1704:65:1704:72 | source(...) : Object | LogInjectionTest.java:1704:56:1704:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:416 |
-| LogInjectionTest.java:1704:65:1704:72 | source(...) : Object | LogInjectionTest.java:1704:56:1704:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:479 |
-| LogInjectionTest.java:1705:50:1705:57 | source(...) : Object | LogInjectionTest.java:1705:41:1705:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:416 |
-| LogInjectionTest.java:1705:50:1705:57 | source(...) : Object | LogInjectionTest.java:1705:41:1705:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:479 |
-| LogInjectionTest.java:1706:35:1706:42 | source(...) : Object | LogInjectionTest.java:1706:26:1706:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:416 |
-| LogInjectionTest.java:1706:35:1706:42 | source(...) : Object | LogInjectionTest.java:1706:26:1706:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:479 |
-| LogInjectionTest.java:1707:65:1707:72 | source(...) : Object | LogInjectionTest.java:1707:56:1707:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:420 |
-| LogInjectionTest.java:1707:65:1707:72 | source(...) : Object | LogInjectionTest.java:1707:56:1707:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:483 |
-| LogInjectionTest.java:1708:50:1708:57 | source(...) : Object | LogInjectionTest.java:1708:41:1708:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:420 |
-| LogInjectionTest.java:1708:50:1708:57 | source(...) : Object | LogInjectionTest.java:1708:41:1708:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:483 |
-| LogInjectionTest.java:1709:35:1709:42 | source(...) : Object | LogInjectionTest.java:1709:26:1709:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:420 |
-| LogInjectionTest.java:1709:35:1709:42 | source(...) : Object | LogInjectionTest.java:1709:26:1709:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:483 |
-| LogInjectionTest.java:1710:80:1710:87 | source(...) : Object | LogInjectionTest.java:1710:71:1710:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:417 |
-| LogInjectionTest.java:1710:80:1710:87 | source(...) : Object | LogInjectionTest.java:1710:71:1710:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:480 |
-| LogInjectionTest.java:1711:65:1711:72 | source(...) : Object | LogInjectionTest.java:1711:56:1711:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:417 |
-| LogInjectionTest.java:1711:65:1711:72 | source(...) : Object | LogInjectionTest.java:1711:56:1711:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:480 |
-| LogInjectionTest.java:1712:50:1712:57 | source(...) : Object | LogInjectionTest.java:1712:41:1712:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:417 |
-| LogInjectionTest.java:1712:50:1712:57 | source(...) : Object | LogInjectionTest.java:1712:41:1712:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:480 |
-| LogInjectionTest.java:1713:35:1713:42 | source(...) : Object | LogInjectionTest.java:1713:26:1713:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:417 |
-| LogInjectionTest.java:1713:35:1713:42 | source(...) : Object | LogInjectionTest.java:1713:26:1713:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:480 |
-| LogInjectionTest.java:1714:80:1714:87 | source(...) : Object | LogInjectionTest.java:1714:71:1714:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:421 |
-| LogInjectionTest.java:1714:80:1714:87 | source(...) : Object | LogInjectionTest.java:1714:71:1714:87 | (...)... | provenance | Src:MaD:536 Sink:MaD:484 |
-| LogInjectionTest.java:1715:65:1715:72 | source(...) : Object | LogInjectionTest.java:1715:56:1715:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:421 |
-| LogInjectionTest.java:1715:65:1715:72 | source(...) : Object | LogInjectionTest.java:1715:56:1715:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:484 |
-| LogInjectionTest.java:1716:50:1716:57 | source(...) : Object | LogInjectionTest.java:1716:41:1716:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:421 |
-| LogInjectionTest.java:1716:50:1716:57 | source(...) : Object | LogInjectionTest.java:1716:41:1716:57 | (...)... | provenance | Src:MaD:536 Sink:MaD:484 |
-| LogInjectionTest.java:1717:35:1717:42 | source(...) : Object | LogInjectionTest.java:1717:26:1717:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:421 |
-| LogInjectionTest.java:1717:35:1717:42 | source(...) : Object | LogInjectionTest.java:1717:26:1717:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:484 |
-| LogInjectionTest.java:1722:34:1722:41 | source(...) : Object | LogInjectionTest.java:1722:25:1722:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:490 |
-| LogInjectionTest.java:1723:34:1723:41 | source(...) : Object | LogInjectionTest.java:1723:25:1723:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:490 |
-| LogInjectionTest.java:1723:34:1723:41 | source(...) : Object | LogInjectionTest.java:1723:25:1723:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:486 |
-| LogInjectionTest.java:1725:34:1725:41 | source(...) : Object | LogInjectionTest.java:1725:25:1725:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:490 |
-| LogInjectionTest.java:1725:34:1725:41 | source(...) : Object | LogInjectionTest.java:1725:25:1725:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:488 |
-| LogInjectionTest.java:1726:40:1726:62 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1726:40:1726:62 | new Object[] | provenance | Sink:MaD:488 |
-| LogInjectionTest.java:1726:54:1726:61 | source(...) : Object | LogInjectionTest.java:1726:40:1726:62 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1727:34:1727:41 | source(...) : Object | LogInjectionTest.java:1727:25:1727:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:490 |
-| LogInjectionTest.java:1727:34:1727:41 | source(...) : Object | LogInjectionTest.java:1727:25:1727:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:487 |
-| LogInjectionTest.java:1730:55:1730:62 | source(...) : Object | LogInjectionTest.java:1730:25:1730:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:490 |
-| LogInjectionTest.java:1730:55:1730:62 | source(...) : Object | LogInjectionTest.java:1730:25:1730:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:489 |
-| LogInjectionTest.java:1735:35:1735:42 | source(...) : Object | LogInjectionTest.java:1735:26:1735:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:495 |
-| LogInjectionTest.java:1736:35:1736:42 | source(...) : Object | LogInjectionTest.java:1736:26:1736:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:496 |
-| LogInjectionTest.java:1738:35:1738:42 | source(...) : Object | LogInjectionTest.java:1738:26:1738:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:498 |
-| LogInjectionTest.java:1739:41:1739:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1739:41:1739:63 | new Object[] | provenance | Sink:MaD:498 |
-| LogInjectionTest.java:1739:55:1739:62 | source(...) : Object | LogInjectionTest.java:1739:41:1739:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1740:35:1740:42 | source(...) : Object | LogInjectionTest.java:1740:26:1740:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:497 |
-| LogInjectionTest.java:1743:35:1743:42 | source(...) : Object | LogInjectionTest.java:1743:26:1743:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:499 |
-| LogInjectionTest.java:1744:60:1744:67 | source(...) : Object | LogInjectionTest.java:1744:51:1744:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:491 |
-| LogInjectionTest.java:1745:60:1745:67 | source(...) : Object | LogInjectionTest.java:1745:51:1745:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:492 |
-| LogInjectionTest.java:1747:60:1747:67 | source(...) : Object | LogInjectionTest.java:1747:51:1747:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:494 |
-| LogInjectionTest.java:1748:66:1748:88 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1748:66:1748:88 | new Object[] | provenance | Sink:MaD:494 |
-| LogInjectionTest.java:1748:80:1748:87 | source(...) : Object | LogInjectionTest.java:1748:66:1748:88 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1749:60:1749:67 | source(...) : Object | LogInjectionTest.java:1749:51:1749:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:493 |
-| LogInjectionTest.java:1752:60:1752:67 | source(...) : Object | LogInjectionTest.java:1752:51:1752:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:494 |
-| LogInjectionTest.java:1753:66:1753:73 | source(...) : Object | LogInjectionTest.java:1753:13:1753:104 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:494 |
-| LogInjectionTest.java:1754:81:1754:88 | source(...) : Object | LogInjectionTest.java:1754:13:1754:104 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:494 |
-| LogInjectionTest.java:1755:96:1755:103 | source(...) : Object | LogInjectionTest.java:1755:13:1755:104 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:494 |
-| LogInjectionTest.java:1756:35:1756:42 | source(...) : Object | LogInjectionTest.java:1756:26:1756:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:504 |
-| LogInjectionTest.java:1757:35:1757:42 | source(...) : Object | LogInjectionTest.java:1757:26:1757:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:505 |
-| LogInjectionTest.java:1759:35:1759:42 | source(...) : Object | LogInjectionTest.java:1759:26:1759:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:507 |
-| LogInjectionTest.java:1760:41:1760:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1760:41:1760:63 | new Object[] | provenance | Sink:MaD:507 |
-| LogInjectionTest.java:1760:55:1760:62 | source(...) : Object | LogInjectionTest.java:1760:41:1760:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1761:35:1761:42 | source(...) : Object | LogInjectionTest.java:1761:26:1761:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:506 |
-| LogInjectionTest.java:1764:35:1764:42 | source(...) : Object | LogInjectionTest.java:1764:26:1764:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:508 |
-| LogInjectionTest.java:1765:60:1765:67 | source(...) : Object | LogInjectionTest.java:1765:51:1765:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:500 |
-| LogInjectionTest.java:1766:60:1766:67 | source(...) : Object | LogInjectionTest.java:1766:51:1766:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:501 |
-| LogInjectionTest.java:1768:60:1768:67 | source(...) : Object | LogInjectionTest.java:1768:51:1768:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:503 |
-| LogInjectionTest.java:1769:66:1769:88 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1769:66:1769:88 | new Object[] | provenance | Sink:MaD:503 |
-| LogInjectionTest.java:1769:80:1769:87 | source(...) : Object | LogInjectionTest.java:1769:66:1769:88 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1770:60:1770:67 | source(...) : Object | LogInjectionTest.java:1770:51:1770:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:502 |
-| LogInjectionTest.java:1773:60:1773:67 | source(...) : Object | LogInjectionTest.java:1773:51:1773:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:503 |
-| LogInjectionTest.java:1774:66:1774:73 | source(...) : Object | LogInjectionTest.java:1774:13:1774:104 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:503 |
-| LogInjectionTest.java:1775:81:1775:88 | source(...) : Object | LogInjectionTest.java:1775:13:1775:104 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:503 |
-| LogInjectionTest.java:1776:96:1776:103 | source(...) : Object | LogInjectionTest.java:1776:13:1776:104 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:503 |
-| LogInjectionTest.java:1777:34:1777:41 | source(...) : Object | LogInjectionTest.java:1777:25:1777:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:513 |
-| LogInjectionTest.java:1778:34:1778:41 | source(...) : Object | LogInjectionTest.java:1778:25:1778:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:514 |
-| LogInjectionTest.java:1780:34:1780:41 | source(...) : Object | LogInjectionTest.java:1780:25:1780:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:516 |
-| LogInjectionTest.java:1781:40:1781:62 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1781:40:1781:62 | new Object[] | provenance | Sink:MaD:516 |
-| LogInjectionTest.java:1781:54:1781:61 | source(...) : Object | LogInjectionTest.java:1781:40:1781:62 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1782:34:1782:41 | source(...) : Object | LogInjectionTest.java:1782:25:1782:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:515 |
-| LogInjectionTest.java:1785:34:1785:41 | source(...) : Object | LogInjectionTest.java:1785:25:1785:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:517 |
-| LogInjectionTest.java:1786:59:1786:66 | source(...) : Object | LogInjectionTest.java:1786:50:1786:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:509 |
-| LogInjectionTest.java:1787:59:1787:66 | source(...) : Object | LogInjectionTest.java:1787:50:1787:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:510 |
-| LogInjectionTest.java:1789:59:1789:66 | source(...) : Object | LogInjectionTest.java:1789:50:1789:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:512 |
-| LogInjectionTest.java:1790:65:1790:87 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1790:65:1790:87 | new Object[] | provenance | Sink:MaD:512 |
-| LogInjectionTest.java:1790:79:1790:86 | source(...) : Object | LogInjectionTest.java:1790:65:1790:87 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1791:59:1791:66 | source(...) : Object | LogInjectionTest.java:1791:50:1791:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:511 |
-| LogInjectionTest.java:1794:59:1794:66 | source(...) : Object | LogInjectionTest.java:1794:50:1794:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:512 |
-| LogInjectionTest.java:1795:65:1795:72 | source(...) : Object | LogInjectionTest.java:1795:13:1795:103 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:512 |
-| LogInjectionTest.java:1796:80:1796:87 | source(...) : Object | LogInjectionTest.java:1796:13:1796:103 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:512 |
-| LogInjectionTest.java:1797:95:1797:102 | source(...) : Object | LogInjectionTest.java:1797:13:1797:103 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:512 |
-| LogInjectionTest.java:1798:35:1798:42 | source(...) : Object | LogInjectionTest.java:1798:26:1798:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:522 |
-| LogInjectionTest.java:1799:35:1799:42 | source(...) : Object | LogInjectionTest.java:1799:26:1799:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:523 |
-| LogInjectionTest.java:1801:35:1801:42 | source(...) : Object | LogInjectionTest.java:1801:26:1801:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:525 |
-| LogInjectionTest.java:1802:41:1802:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1802:41:1802:63 | new Object[] | provenance | Sink:MaD:525 |
-| LogInjectionTest.java:1802:55:1802:62 | source(...) : Object | LogInjectionTest.java:1802:41:1802:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1803:35:1803:42 | source(...) : Object | LogInjectionTest.java:1803:26:1803:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:524 |
-| LogInjectionTest.java:1806:35:1806:42 | source(...) : Object | LogInjectionTest.java:1806:26:1806:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:526 |
-| LogInjectionTest.java:1807:60:1807:67 | source(...) : Object | LogInjectionTest.java:1807:51:1807:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:518 |
-| LogInjectionTest.java:1808:60:1808:67 | source(...) : Object | LogInjectionTest.java:1808:51:1808:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:519 |
-| LogInjectionTest.java:1810:60:1810:67 | source(...) : Object | LogInjectionTest.java:1810:51:1810:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:521 |
-| LogInjectionTest.java:1811:66:1811:88 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1811:66:1811:88 | new Object[] | provenance | Sink:MaD:521 |
-| LogInjectionTest.java:1811:80:1811:87 | source(...) : Object | LogInjectionTest.java:1811:66:1811:88 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1812:60:1812:67 | source(...) : Object | LogInjectionTest.java:1812:51:1812:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:520 |
-| LogInjectionTest.java:1815:60:1815:67 | source(...) : Object | LogInjectionTest.java:1815:51:1815:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:521 |
-| LogInjectionTest.java:1816:66:1816:73 | source(...) : Object | LogInjectionTest.java:1816:13:1816:104 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:521 |
-| LogInjectionTest.java:1817:81:1817:88 | source(...) : Object | LogInjectionTest.java:1817:13:1817:104 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:521 |
-| LogInjectionTest.java:1818:96:1818:103 | source(...) : Object | LogInjectionTest.java:1818:13:1818:104 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:521 |
-| LogInjectionTest.java:1819:34:1819:41 | source(...) : Object | LogInjectionTest.java:1819:25:1819:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:531 |
-| LogInjectionTest.java:1820:34:1820:41 | source(...) : Object | LogInjectionTest.java:1820:25:1820:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:532 |
-| LogInjectionTest.java:1822:34:1822:41 | source(...) : Object | LogInjectionTest.java:1822:25:1822:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:534 |
-| LogInjectionTest.java:1823:40:1823:62 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1823:40:1823:62 | new Object[] | provenance | Sink:MaD:534 |
-| LogInjectionTest.java:1823:54:1823:61 | source(...) : Object | LogInjectionTest.java:1823:40:1823:62 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1824:34:1824:41 | source(...) : Object | LogInjectionTest.java:1824:25:1824:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:533 |
-| LogInjectionTest.java:1827:34:1827:41 | source(...) : Object | LogInjectionTest.java:1827:25:1827:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:535 |
-| LogInjectionTest.java:1828:59:1828:66 | source(...) : Object | LogInjectionTest.java:1828:50:1828:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:527 |
-| LogInjectionTest.java:1829:59:1829:66 | source(...) : Object | LogInjectionTest.java:1829:50:1829:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:528 |
-| LogInjectionTest.java:1831:59:1831:66 | source(...) : Object | LogInjectionTest.java:1831:50:1831:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:530 |
-| LogInjectionTest.java:1832:65:1832:87 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1832:65:1832:87 | new Object[] | provenance | Sink:MaD:530 |
-| LogInjectionTest.java:1832:79:1832:86 | source(...) : Object | LogInjectionTest.java:1832:65:1832:87 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1833:59:1833:66 | source(...) : Object | LogInjectionTest.java:1833:50:1833:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:529 |
-| LogInjectionTest.java:1836:59:1836:66 | source(...) : Object | LogInjectionTest.java:1836:50:1836:66 | (...)... | provenance | Src:MaD:536 Sink:MaD:530 |
-| LogInjectionTest.java:1837:65:1837:72 | source(...) : Object | LogInjectionTest.java:1837:13:1837:103 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:530 |
-| LogInjectionTest.java:1838:80:1838:87 | source(...) : Object | LogInjectionTest.java:1838:13:1838:103 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:530 |
-| LogInjectionTest.java:1839:95:1839:102 | source(...) : Object | LogInjectionTest.java:1839:13:1839:103 | new ..[] { .. } | provenance | Src:MaD:536  Sink:MaD:530 |
-| LogInjectionTest.java:1860:37:1860:44 | source(...) : Object | LogInjectionTest.java:1860:28:1860:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:19 |
-| LogInjectionTest.java:1861:43:1861:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1861:43:1861:65 | new Object[] | provenance | Sink:MaD:19 |
-| LogInjectionTest.java:1861:57:1861:64 | source(...) : Object | LogInjectionTest.java:1861:43:1861:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1863:30:1863:37 | source(...) : Object | LogInjectionTest.java:1863:21:1863:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1864:45:1864:52 | source(...) : Object | LogInjectionTest.java:1864:36:1864:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:7 |
-| LogInjectionTest.java:1865:30:1865:37 | source(...) : Object | LogInjectionTest.java:1865:21:1865:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1866:60:1866:67 | source(...) : Object | LogInjectionTest.java:1866:51:1866:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:8 |
-| LogInjectionTest.java:1867:45:1867:52 | source(...) : Object | LogInjectionTest.java:1867:36:1867:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:8 |
-| LogInjectionTest.java:1868:30:1868:37 | source(...) : Object | LogInjectionTest.java:1868:21:1868:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1869:75:1869:82 | source(...) : Object | LogInjectionTest.java:1869:66:1869:82 | (...)... | provenance | Src:MaD:536 Sink:MaD:9 |
-| LogInjectionTest.java:1870:60:1870:67 | source(...) : Object | LogInjectionTest.java:1870:51:1870:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:9 |
-| LogInjectionTest.java:1871:45:1871:52 | source(...) : Object | LogInjectionTest.java:1871:36:1871:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:9 |
-| LogInjectionTest.java:1872:30:1872:37 | source(...) : Object | LogInjectionTest.java:1872:21:1872:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1873:90:1873:97 | source(...) : Object | LogInjectionTest.java:1873:81:1873:97 | (...)... | provenance | Src:MaD:536 Sink:MaD:10 |
-| LogInjectionTest.java:1874:75:1874:82 | source(...) : Object | LogInjectionTest.java:1874:66:1874:82 | (...)... | provenance | Src:MaD:536 Sink:MaD:10 |
-| LogInjectionTest.java:1875:60:1875:67 | source(...) : Object | LogInjectionTest.java:1875:51:1875:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:10 |
-| LogInjectionTest.java:1876:45:1876:52 | source(...) : Object | LogInjectionTest.java:1876:36:1876:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:10 |
-| LogInjectionTest.java:1877:30:1877:37 | source(...) : Object | LogInjectionTest.java:1877:21:1877:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1878:105:1878:112 | source(...) : Object | LogInjectionTest.java:1878:96:1878:112 | (...)... | provenance | Src:MaD:536 Sink:MaD:11 |
-| LogInjectionTest.java:1879:90:1879:97 | source(...) : Object | LogInjectionTest.java:1879:81:1879:97 | (...)... | provenance | Src:MaD:536 Sink:MaD:11 |
-| LogInjectionTest.java:1880:75:1880:82 | source(...) : Object | LogInjectionTest.java:1880:66:1880:82 | (...)... | provenance | Src:MaD:536 Sink:MaD:11 |
-| LogInjectionTest.java:1881:60:1881:67 | source(...) : Object | LogInjectionTest.java:1881:51:1881:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:11 |
-| LogInjectionTest.java:1882:45:1882:52 | source(...) : Object | LogInjectionTest.java:1882:36:1882:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:11 |
-| LogInjectionTest.java:1883:30:1883:37 | source(...) : Object | LogInjectionTest.java:1883:21:1883:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1884:120:1884:127 | source(...) : Object | LogInjectionTest.java:1884:111:1884:127 | (...)... | provenance | Src:MaD:536 Sink:MaD:12 |
-| LogInjectionTest.java:1885:105:1885:112 | source(...) : Object | LogInjectionTest.java:1885:96:1885:112 | (...)... | provenance | Src:MaD:536 Sink:MaD:12 |
-| LogInjectionTest.java:1886:90:1886:97 | source(...) : Object | LogInjectionTest.java:1886:81:1886:97 | (...)... | provenance | Src:MaD:536 Sink:MaD:12 |
-| LogInjectionTest.java:1887:75:1887:82 | source(...) : Object | LogInjectionTest.java:1887:66:1887:82 | (...)... | provenance | Src:MaD:536 Sink:MaD:12 |
-| LogInjectionTest.java:1888:60:1888:67 | source(...) : Object | LogInjectionTest.java:1888:51:1888:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:12 |
-| LogInjectionTest.java:1889:45:1889:52 | source(...) : Object | LogInjectionTest.java:1889:36:1889:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:12 |
-| LogInjectionTest.java:1890:30:1890:37 | source(...) : Object | LogInjectionTest.java:1890:21:1890:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1891:135:1891:142 | source(...) : Object | LogInjectionTest.java:1891:126:1891:142 | (...)... | provenance | Src:MaD:536 Sink:MaD:13 |
-| LogInjectionTest.java:1892:120:1892:127 | source(...) : Object | LogInjectionTest.java:1892:111:1892:127 | (...)... | provenance | Src:MaD:536 Sink:MaD:13 |
-| LogInjectionTest.java:1893:105:1893:112 | source(...) : Object | LogInjectionTest.java:1893:96:1893:112 | (...)... | provenance | Src:MaD:536 Sink:MaD:13 |
-| LogInjectionTest.java:1894:90:1894:97 | source(...) : Object | LogInjectionTest.java:1894:81:1894:97 | (...)... | provenance | Src:MaD:536 Sink:MaD:13 |
-| LogInjectionTest.java:1895:75:1895:82 | source(...) : Object | LogInjectionTest.java:1895:66:1895:82 | (...)... | provenance | Src:MaD:536 Sink:MaD:13 |
-| LogInjectionTest.java:1896:60:1896:67 | source(...) : Object | LogInjectionTest.java:1896:51:1896:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:13 |
-| LogInjectionTest.java:1897:45:1897:52 | source(...) : Object | LogInjectionTest.java:1897:36:1897:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:13 |
-| LogInjectionTest.java:1898:30:1898:37 | source(...) : Object | LogInjectionTest.java:1898:21:1898:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1899:150:1899:157 | source(...) : Object | LogInjectionTest.java:1899:141:1899:157 | (...)... | provenance | Src:MaD:536 Sink:MaD:14 |
-| LogInjectionTest.java:1900:135:1900:142 | source(...) : Object | LogInjectionTest.java:1900:126:1900:142 | (...)... | provenance | Src:MaD:536 Sink:MaD:14 |
-| LogInjectionTest.java:1901:120:1901:127 | source(...) : Object | LogInjectionTest.java:1901:111:1901:127 | (...)... | provenance | Src:MaD:536 Sink:MaD:14 |
-| LogInjectionTest.java:1902:105:1902:112 | source(...) : Object | LogInjectionTest.java:1902:96:1902:112 | (...)... | provenance | Src:MaD:536 Sink:MaD:14 |
-| LogInjectionTest.java:1903:90:1903:97 | source(...) : Object | LogInjectionTest.java:1903:81:1903:97 | (...)... | provenance | Src:MaD:536 Sink:MaD:14 |
-| LogInjectionTest.java:1904:75:1904:82 | source(...) : Object | LogInjectionTest.java:1904:66:1904:82 | (...)... | provenance | Src:MaD:536 Sink:MaD:14 |
-| LogInjectionTest.java:1905:60:1905:67 | source(...) : Object | LogInjectionTest.java:1905:51:1905:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:14 |
-| LogInjectionTest.java:1906:45:1906:52 | source(...) : Object | LogInjectionTest.java:1906:36:1906:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:14 |
-| LogInjectionTest.java:1907:30:1907:37 | source(...) : Object | LogInjectionTest.java:1907:21:1907:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1908:165:1908:172 | source(...) : Object | LogInjectionTest.java:1908:156:1908:172 | (...)... | provenance | Src:MaD:536 Sink:MaD:15 |
-| LogInjectionTest.java:1909:150:1909:157 | source(...) : Object | LogInjectionTest.java:1909:141:1909:157 | (...)... | provenance | Src:MaD:536 Sink:MaD:15 |
-| LogInjectionTest.java:1910:135:1910:142 | source(...) : Object | LogInjectionTest.java:1910:126:1910:142 | (...)... | provenance | Src:MaD:536 Sink:MaD:15 |
-| LogInjectionTest.java:1911:120:1911:127 | source(...) : Object | LogInjectionTest.java:1911:111:1911:127 | (...)... | provenance | Src:MaD:536 Sink:MaD:15 |
-| LogInjectionTest.java:1912:105:1912:112 | source(...) : Object | LogInjectionTest.java:1912:96:1912:112 | (...)... | provenance | Src:MaD:536 Sink:MaD:15 |
-| LogInjectionTest.java:1913:90:1913:97 | source(...) : Object | LogInjectionTest.java:1913:81:1913:97 | (...)... | provenance | Src:MaD:536 Sink:MaD:15 |
-| LogInjectionTest.java:1914:75:1914:82 | source(...) : Object | LogInjectionTest.java:1914:66:1914:82 | (...)... | provenance | Src:MaD:536 Sink:MaD:15 |
-| LogInjectionTest.java:1915:60:1915:67 | source(...) : Object | LogInjectionTest.java:1915:51:1915:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:15 |
-| LogInjectionTest.java:1916:45:1916:52 | source(...) : Object | LogInjectionTest.java:1916:36:1916:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:15 |
-| LogInjectionTest.java:1917:30:1917:37 | source(...) : Object | LogInjectionTest.java:1917:21:1917:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1918:180:1918:187 | source(...) : Object | LogInjectionTest.java:1918:171:1918:187 | (...)... | provenance | Src:MaD:536 Sink:MaD:16 |
-| LogInjectionTest.java:1919:165:1919:172 | source(...) : Object | LogInjectionTest.java:1919:156:1919:172 | (...)... | provenance | Src:MaD:536 Sink:MaD:16 |
-| LogInjectionTest.java:1920:150:1920:157 | source(...) : Object | LogInjectionTest.java:1920:141:1920:157 | (...)... | provenance | Src:MaD:536 Sink:MaD:16 |
-| LogInjectionTest.java:1921:135:1921:142 | source(...) : Object | LogInjectionTest.java:1921:126:1921:142 | (...)... | provenance | Src:MaD:536 Sink:MaD:16 |
-| LogInjectionTest.java:1922:120:1922:127 | source(...) : Object | LogInjectionTest.java:1922:111:1922:127 | (...)... | provenance | Src:MaD:536 Sink:MaD:16 |
-| LogInjectionTest.java:1923:105:1923:112 | source(...) : Object | LogInjectionTest.java:1923:96:1923:112 | (...)... | provenance | Src:MaD:536 Sink:MaD:16 |
-| LogInjectionTest.java:1924:90:1924:97 | source(...) : Object | LogInjectionTest.java:1924:81:1924:97 | (...)... | provenance | Src:MaD:536 Sink:MaD:16 |
-| LogInjectionTest.java:1925:75:1925:82 | source(...) : Object | LogInjectionTest.java:1925:66:1925:82 | (...)... | provenance | Src:MaD:536 Sink:MaD:16 |
-| LogInjectionTest.java:1926:60:1926:67 | source(...) : Object | LogInjectionTest.java:1926:51:1926:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:16 |
-| LogInjectionTest.java:1927:45:1927:52 | source(...) : Object | LogInjectionTest.java:1927:36:1927:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:16 |
-| LogInjectionTest.java:1928:30:1928:37 | source(...) : Object | LogInjectionTest.java:1928:21:1928:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1929:186:1929:207 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1929:186:1929:207 | new Object[] | provenance | Sink:MaD:17 |
-| LogInjectionTest.java:1929:199:1929:206 | source(...) : Object | LogInjectionTest.java:1929:186:1929:207 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:1930:180:1930:187 | source(...) : Object | LogInjectionTest.java:1930:171:1930:187 | (...)... | provenance | Src:MaD:536 Sink:MaD:17 |
-| LogInjectionTest.java:1931:165:1931:172 | source(...) : Object | LogInjectionTest.java:1931:156:1931:172 | (...)... | provenance | Src:MaD:536 Sink:MaD:17 |
-| LogInjectionTest.java:1932:150:1932:157 | source(...) : Object | LogInjectionTest.java:1932:141:1932:157 | (...)... | provenance | Src:MaD:536 Sink:MaD:17 |
-| LogInjectionTest.java:1933:135:1933:142 | source(...) : Object | LogInjectionTest.java:1933:126:1933:142 | (...)... | provenance | Src:MaD:536 Sink:MaD:17 |
-| LogInjectionTest.java:1934:120:1934:127 | source(...) : Object | LogInjectionTest.java:1934:111:1934:127 | (...)... | provenance | Src:MaD:536 Sink:MaD:17 |
-| LogInjectionTest.java:1935:105:1935:112 | source(...) : Object | LogInjectionTest.java:1935:96:1935:112 | (...)... | provenance | Src:MaD:536 Sink:MaD:17 |
-| LogInjectionTest.java:1936:90:1936:97 | source(...) : Object | LogInjectionTest.java:1936:81:1936:97 | (...)... | provenance | Src:MaD:536 Sink:MaD:17 |
-| LogInjectionTest.java:1937:75:1937:82 | source(...) : Object | LogInjectionTest.java:1937:66:1937:82 | (...)... | provenance | Src:MaD:536 Sink:MaD:17 |
-| LogInjectionTest.java:1938:60:1938:67 | source(...) : Object | LogInjectionTest.java:1938:51:1938:67 | (...)... | provenance | Src:MaD:536 Sink:MaD:17 |
-| LogInjectionTest.java:1939:45:1939:52 | source(...) : Object | LogInjectionTest.java:1939:36:1939:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:17 |
-| LogInjectionTest.java:1940:30:1940:37 | source(...) : Object | LogInjectionTest.java:1940:21:1940:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1942:30:1942:37 | source(...) : Object | LogInjectionTest.java:1942:21:1942:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1943:30:1943:37 | source(...) : Object | LogInjectionTest.java:1943:21:1943:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1944:30:1944:37 | source(...) : Object | LogInjectionTest.java:1944:21:1944:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1945:30:1945:37 | source(...) : Object | LogInjectionTest.java:1945:21:1945:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1946:30:1946:37 | source(...) : Object | LogInjectionTest.java:1946:21:1946:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1947:30:1947:37 | source(...) : Object | LogInjectionTest.java:1947:21:1947:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1949:30:1949:37 | source(...) : Object | LogInjectionTest.java:1949:21:1949:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1951:30:1951:37 | source(...) : Object | LogInjectionTest.java:1951:21:1951:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1953:30:1953:37 | source(...) : Object | LogInjectionTest.java:1953:21:1953:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1955:30:1955:37 | source(...) : Object | LogInjectionTest.java:1955:21:1955:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1957:30:1957:37 | source(...) : Object | LogInjectionTest.java:1957:21:1957:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1959:30:1959:37 | source(...) : Object | LogInjectionTest.java:1959:21:1959:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1961:30:1961:37 | source(...) : Object | LogInjectionTest.java:1961:21:1961:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1963:30:1963:37 | source(...) : Object | LogInjectionTest.java:1963:21:1963:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1965:30:1965:37 | source(...) : Object | LogInjectionTest.java:1965:21:1965:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1967:30:1967:37 | source(...) : Object | LogInjectionTest.java:1967:21:1967:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1969:30:1969:37 | source(...) : Object | LogInjectionTest.java:1969:21:1969:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1971:30:1971:37 | source(...) : Object | LogInjectionTest.java:1971:21:1971:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1973:30:1973:37 | source(...) : Object | LogInjectionTest.java:1973:21:1973:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1975:30:1975:37 | source(...) : Object | LogInjectionTest.java:1975:21:1975:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1977:30:1977:37 | source(...) : Object | LogInjectionTest.java:1977:21:1977:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1979:30:1979:37 | source(...) : Object | LogInjectionTest.java:1979:21:1979:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1980:30:1980:37 | source(...) : Object | LogInjectionTest.java:1980:21:1980:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1981:30:1981:37 | source(...) : Object | LogInjectionTest.java:1981:21:1981:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1982:30:1982:37 | source(...) : Object | LogInjectionTest.java:1982:21:1982:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1983:30:1983:37 | source(...) : Object | LogInjectionTest.java:1983:21:1983:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1984:30:1984:37 | source(...) : Object | LogInjectionTest.java:1984:21:1984:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1985:30:1985:37 | source(...) : Object | LogInjectionTest.java:1985:21:1985:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1986:30:1986:37 | source(...) : Object | LogInjectionTest.java:1986:21:1986:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1987:30:1987:37 | source(...) : Object | LogInjectionTest.java:1987:21:1987:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1988:30:1988:37 | source(...) : Object | LogInjectionTest.java:1988:21:1988:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1989:30:1989:37 | source(...) : Object | LogInjectionTest.java:1989:21:1989:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1990:30:1990:37 | source(...) : Object | LogInjectionTest.java:1990:21:1990:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1991:30:1991:37 | source(...) : Object | LogInjectionTest.java:1991:21:1991:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1992:30:1992:37 | source(...) : Object | LogInjectionTest.java:1992:21:1992:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1993:30:1993:37 | source(...) : Object | LogInjectionTest.java:1993:21:1993:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1994:30:1994:37 | source(...) : Object | LogInjectionTest.java:1994:21:1994:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1995:30:1995:37 | source(...) : Object | LogInjectionTest.java:1995:21:1995:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1996:30:1996:37 | source(...) : Object | LogInjectionTest.java:1996:21:1996:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1997:30:1997:37 | source(...) : Object | LogInjectionTest.java:1997:21:1997:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1998:30:1998:37 | source(...) : Object | LogInjectionTest.java:1998:21:1998:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:1999:30:1999:37 | source(...) : Object | LogInjectionTest.java:1999:21:1999:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2000:30:2000:37 | source(...) : Object | LogInjectionTest.java:2000:21:2000:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2001:30:2001:37 | source(...) : Object | LogInjectionTest.java:2001:21:2001:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2002:30:2002:37 | source(...) : Object | LogInjectionTest.java:2002:21:2002:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2003:30:2003:37 | source(...) : Object | LogInjectionTest.java:2003:21:2003:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2004:30:2004:37 | source(...) : Object | LogInjectionTest.java:2004:21:2004:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2005:30:2005:37 | source(...) : Object | LogInjectionTest.java:2005:21:2005:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2006:30:2006:37 | source(...) : Object | LogInjectionTest.java:2006:21:2006:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2007:30:2007:37 | source(...) : Object | LogInjectionTest.java:2007:21:2007:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2008:30:2008:37 | source(...) : Object | LogInjectionTest.java:2008:21:2008:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2009:30:2009:37 | source(...) : Object | LogInjectionTest.java:2009:21:2009:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2010:30:2010:37 | source(...) : Object | LogInjectionTest.java:2010:21:2010:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2011:30:2011:37 | source(...) : Object | LogInjectionTest.java:2011:21:2011:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2012:30:2012:37 | source(...) : Object | LogInjectionTest.java:2012:21:2012:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2013:30:2013:37 | source(...) : Object | LogInjectionTest.java:2013:21:2013:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2014:30:2014:37 | source(...) : Object | LogInjectionTest.java:2014:21:2014:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2015:30:2015:37 | source(...) : Object | LogInjectionTest.java:2015:21:2015:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2016:30:2016:37 | source(...) : Object | LogInjectionTest.java:2016:21:2016:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2017:30:2017:37 | source(...) : Object | LogInjectionTest.java:2017:21:2017:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2018:30:2018:37 | source(...) : Object | LogInjectionTest.java:2018:21:2018:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2019:30:2019:37 | source(...) : Object | LogInjectionTest.java:2019:21:2019:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2020:30:2020:37 | source(...) : Object | LogInjectionTest.java:2020:21:2020:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2021:30:2021:37 | source(...) : Object | LogInjectionTest.java:2021:21:2021:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2022:30:2022:37 | source(...) : Object | LogInjectionTest.java:2022:21:2022:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2023:30:2023:37 | source(...) : Object | LogInjectionTest.java:2023:21:2023:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2024:30:2024:37 | source(...) : Object | LogInjectionTest.java:2024:21:2024:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2025:30:2025:37 | source(...) : Object | LogInjectionTest.java:2025:21:2025:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2026:30:2026:37 | source(...) : Object | LogInjectionTest.java:2026:21:2026:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2027:30:2027:37 | source(...) : Object | LogInjectionTest.java:2027:21:2027:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2028:30:2028:37 | source(...) : Object | LogInjectionTest.java:2028:21:2028:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2029:30:2029:37 | source(...) : Object | LogInjectionTest.java:2029:21:2029:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2030:30:2030:37 | source(...) : Object | LogInjectionTest.java:2030:21:2030:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2031:30:2031:37 | source(...) : Object | LogInjectionTest.java:2031:21:2031:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2032:30:2032:37 | source(...) : Object | LogInjectionTest.java:2032:21:2032:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2033:30:2033:37 | source(...) : Object | LogInjectionTest.java:2033:21:2033:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2034:30:2034:37 | source(...) : Object | LogInjectionTest.java:2034:21:2034:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2035:30:2035:37 | source(...) : Object | LogInjectionTest.java:2035:21:2035:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2036:30:2036:37 | source(...) : Object | LogInjectionTest.java:2036:21:2036:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2037:30:2037:37 | source(...) : Object | LogInjectionTest.java:2037:21:2037:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2038:30:2038:37 | source(...) : Object | LogInjectionTest.java:2038:21:2038:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2039:30:2039:37 | source(...) : Object | LogInjectionTest.java:2039:21:2039:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2040:30:2040:37 | source(...) : Object | LogInjectionTest.java:2040:21:2040:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2041:30:2041:37 | source(...) : Object | LogInjectionTest.java:2041:21:2041:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2042:30:2042:37 | source(...) : Object | LogInjectionTest.java:2042:21:2042:37 | (...)... | provenance | Src:MaD:536 Sink:MaD:18 |
-| LogInjectionTest.java:2047:36:2047:43 | source(...) : Object | LogInjectionTest.java:2047:27:2047:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:20 |
-| LogInjectionTest.java:2048:57:2048:64 | source(...) : Object | LogInjectionTest.java:2048:27:2048:64 | (...)... | provenance | Src:MaD:536 Sink:MaD:20 |
-| LogInjectionTest.java:2049:34:2049:41 | source(...) : Object | LogInjectionTest.java:2049:25:2049:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:26 |
-| LogInjectionTest.java:2050:55:2050:62 | source(...) : Object | LogInjectionTest.java:2050:25:2050:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:26 |
-| LogInjectionTest.java:2051:35:2051:42 | source(...) : Object | LogInjectionTest.java:2051:26:2051:42 | (...)... | provenance | Src:MaD:536 Sink:MaD:27 |
-| LogInjectionTest.java:2052:56:2052:63 | source(...) : Object | LogInjectionTest.java:2052:26:2052:63 | (...)... | provenance | Src:MaD:536 Sink:MaD:27 |
-| LogInjectionTest.java:2053:36:2053:43 | source(...) : Object | LogInjectionTest.java:2053:27:2053:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:28 |
-| LogInjectionTest.java:2054:57:2054:64 | source(...) : Object | LogInjectionTest.java:2054:27:2054:64 | (...)... | provenance | Src:MaD:536 Sink:MaD:28 |
-| LogInjectionTest.java:2055:34:2055:41 | source(...) : Object | LogInjectionTest.java:2055:25:2055:41 | (...)... | provenance | Src:MaD:536 Sink:MaD:29 |
-| LogInjectionTest.java:2056:55:2056:62 | source(...) : Object | LogInjectionTest.java:2056:25:2056:62 | (...)... | provenance | Src:MaD:536 Sink:MaD:29 |
-| LogInjectionTest.java:2057:36:2057:43 | source(...) : Object | LogInjectionTest.java:2057:27:2057:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:52 |
-| LogInjectionTest.java:2058:57:2058:64 | source(...) : Object | LogInjectionTest.java:2058:27:2058:64 | (...)... | provenance | Src:MaD:536 Sink:MaD:52 |
-| LogInjectionTest.java:2059:37:2059:44 | source(...) : Object | LogInjectionTest.java:2059:28:2059:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:53 |
-| LogInjectionTest.java:2060:58:2060:65 | source(...) : Object | LogInjectionTest.java:2060:28:2060:65 | (...)... | provenance | Src:MaD:536 Sink:MaD:53 |
-| LogInjectionTest.java:2061:38:2061:45 | source(...) : Object | LogInjectionTest.java:2061:29:2061:45 | (...)... | provenance | Src:MaD:536 Sink:MaD:21 |
-| LogInjectionTest.java:2062:53:2062:60 | source(...) : Object | LogInjectionTest.java:2062:44:2062:60 | (...)... | provenance | Src:MaD:536 Sink:MaD:21 |
-| LogInjectionTest.java:2063:38:2063:45 | source(...) : Object | LogInjectionTest.java:2063:29:2063:45 | (...)... | provenance | Src:MaD:536 Sink:MaD:22 |
-| LogInjectionTest.java:2064:53:2064:60 | source(...) : Object | LogInjectionTest.java:2064:44:2064:60 | (...)... | provenance | Src:MaD:536 Sink:MaD:22 |
-| LogInjectionTest.java:2065:68:2065:75 | source(...) : Object | LogInjectionTest.java:2065:59:2065:75 | (...)... | provenance | Src:MaD:536 Sink:MaD:22 |
-| LogInjectionTest.java:2066:38:2066:45 | source(...) : Object | LogInjectionTest.java:2066:29:2066:45 | (...)... | provenance | Src:MaD:536 Sink:MaD:23 |
-| LogInjectionTest.java:2067:53:2067:60 | source(...) : Object | LogInjectionTest.java:2067:44:2067:60 | (...)... | provenance | Src:MaD:536 Sink:MaD:23 |
-| LogInjectionTest.java:2068:59:2068:81 | {...} : Object[] [[]] : Object | LogInjectionTest.java:2068:59:2068:81 | new Object[] | provenance | Sink:MaD:23 |
-| LogInjectionTest.java:2068:73:2068:80 | source(...) : Object | LogInjectionTest.java:2068:59:2068:81 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:2069:37:2069:44 | source(...) : Object | LogInjectionTest.java:2069:28:2069:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:24 |
-| LogInjectionTest.java:2070:52:2070:59 | source(...) : Object | LogInjectionTest.java:2070:43:2070:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:24 |
-| LogInjectionTest.java:2071:37:2071:44 | source(...) : Object | LogInjectionTest.java:2071:28:2071:44 | (...)... | provenance | Src:MaD:536 Sink:MaD:25 |
-| LogInjectionTest.java:2072:52:2072:59 | source(...) : Object | LogInjectionTest.java:2072:43:2072:59 | (...)... | provenance | Src:MaD:536 Sink:MaD:25 |
-| LogInjectionTest.java:2073:67:2073:74 | source(...) : Object | LogInjectionTest.java:2073:58:2073:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:25 |
-| LogInjectionTest.java:2074:65:2074:72 | source(...) : Object | LogInjectionTest.java:2074:56:2074:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:30 |
-| LogInjectionTest.java:2075:65:2075:72 | source(...) : Object | LogInjectionTest.java:2075:56:2075:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:31 |
-| LogInjectionTest.java:2077:65:2077:72 | source(...) : Object | LogInjectionTest.java:2077:56:2077:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:32 |
-| LogInjectionTest.java:2078:71:2078:92 | {...} : Object[] [[]] : Object | LogInjectionTest.java:2078:71:2078:92 | new Object[] | provenance | Sink:MaD:32 |
-| LogInjectionTest.java:2078:84:2078:91 | source(...) : Object | LogInjectionTest.java:2078:71:2078:92 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:2079:65:2079:72 | source(...) : Object | LogInjectionTest.java:2079:56:2079:72 | (...)... | provenance | Src:MaD:536 Sink:MaD:33 |
-| LogInjectionTest.java:2080:86:2080:93 | source(...) : Object | LogInjectionTest.java:2080:56:2080:93 | (...)... | provenance | Src:MaD:536 Sink:MaD:34 |
-| LogInjectionTest.java:2081:104:2081:111 | source(...) : Object | LogInjectionTest.java:2081:74:2081:111 | (...)... | provenance | Src:MaD:536 Sink:MaD:35 |
-| LogInjectionTest.java:2082:36:2082:43 | source(...) : Object | LogInjectionTest.java:2082:24:2082:43 | (...)... | provenance | Src:MaD:536 Sink:MaD:36 |
-| LogInjectionTest.java:2083:66:2083:73 | source(...) : Object | LogInjectionTest.java:2083:57:2083:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:37 |
-| LogInjectionTest.java:2084:81:2084:88 | source(...) : Object | LogInjectionTest.java:2084:72:2084:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:37 |
-| LogInjectionTest.java:2085:96:2085:103 | source(...) : Object | LogInjectionTest.java:2085:87:2085:103 | (...)... | provenance | Src:MaD:536 Sink:MaD:37 |
-| LogInjectionTest.java:2086:66:2086:73 | source(...) : Object | LogInjectionTest.java:2086:57:2086:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:38 |
-| LogInjectionTest.java:2087:81:2087:88 | source(...) : Object | LogInjectionTest.java:2087:72:2087:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:38 |
-| LogInjectionTest.java:2088:96:2088:103 | source(...) : Object | LogInjectionTest.java:2088:87:2088:103 | (...)... | provenance | Src:MaD:536 Sink:MaD:38 |
-| LogInjectionTest.java:2090:66:2090:73 | source(...) : Object | LogInjectionTest.java:2090:57:2090:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:39 |
-| LogInjectionTest.java:2091:81:2091:88 | source(...) : Object | LogInjectionTest.java:2091:72:2091:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:39 |
-| LogInjectionTest.java:2092:96:2092:103 | source(...) : Object | LogInjectionTest.java:2092:87:2092:103 | (...)... | provenance | Src:MaD:536 Sink:MaD:39 |
-| LogInjectionTest.java:2093:102:2093:124 | {...} : Object[] [[]] : Object | LogInjectionTest.java:2093:102:2093:124 | new Object[] | provenance | Sink:MaD:39 |
-| LogInjectionTest.java:2093:116:2093:123 | source(...) : Object | LogInjectionTest.java:2093:102:2093:124 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:2094:66:2094:73 | source(...) : Object | LogInjectionTest.java:2094:57:2094:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:40 |
-| LogInjectionTest.java:2095:81:2095:88 | source(...) : Object | LogInjectionTest.java:2095:72:2095:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:40 |
-| LogInjectionTest.java:2096:96:2096:103 | source(...) : Object | LogInjectionTest.java:2096:87:2096:103 | (...)... | provenance | Src:MaD:536 Sink:MaD:40 |
-| LogInjectionTest.java:2097:66:2097:73 | source(...) : Object | LogInjectionTest.java:2097:57:2097:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:41 |
-| LogInjectionTest.java:2098:81:2098:88 | source(...) : Object | LogInjectionTest.java:2098:72:2098:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:41 |
-| LogInjectionTest.java:2099:117:2099:124 | source(...) : Object | LogInjectionTest.java:2099:87:2099:124 | (...)... | provenance | Src:MaD:536 Sink:MaD:41 |
-| LogInjectionTest.java:2100:66:2100:73 | source(...) : Object | LogInjectionTest.java:2100:57:2100:73 | (...)... | provenance | Src:MaD:536 Sink:MaD:42 |
-| LogInjectionTest.java:2101:81:2101:88 | source(...) : Object | LogInjectionTest.java:2101:72:2101:88 | (...)... | provenance | Src:MaD:536 Sink:MaD:42 |
-| LogInjectionTest.java:2102:135:2102:142 | source(...) : Object | LogInjectionTest.java:2102:105:2102:142 | (...)... | provenance | Src:MaD:536 Sink:MaD:43 |
-| LogInjectionTest.java:2103:67:2103:74 | source(...) : Object | LogInjectionTest.java:2103:58:2103:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:44 |
-| LogInjectionTest.java:2104:82:2104:89 | source(...) : Object | LogInjectionTest.java:2104:73:2104:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:44 |
-| LogInjectionTest.java:2105:120:2105:127 | source(...) : Object | LogInjectionTest.java:2105:111:2105:127 | (...)... | provenance | Src:MaD:536 Sink:MaD:45 |
-| LogInjectionTest.java:2106:126:2106:148 | {...} : Object[] [[]] : Object | LogInjectionTest.java:2106:126:2106:148 | new Object[] | provenance | Sink:MaD:45 |
-| LogInjectionTest.java:2106:140:2106:147 | source(...) : Object | LogInjectionTest.java:2106:126:2106:148 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:2107:67:2107:74 | source(...) : Object | LogInjectionTest.java:2107:58:2107:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:46 |
-| LogInjectionTest.java:2108:82:2108:89 | source(...) : Object | LogInjectionTest.java:2108:73:2108:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:46 |
-| LogInjectionTest.java:2109:120:2109:127 | source(...) : Object | LogInjectionTest.java:2109:111:2109:127 | (...)... | provenance | Src:MaD:536 Sink:MaD:47 |
-| LogInjectionTest.java:2110:67:2110:74 | source(...) : Object | LogInjectionTest.java:2110:58:2110:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:48 |
-| LogInjectionTest.java:2111:82:2111:89 | source(...) : Object | LogInjectionTest.java:2111:73:2111:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:48 |
-| LogInjectionTest.java:2112:97:2112:104 | source(...) : Object | LogInjectionTest.java:2112:88:2112:104 | (...)... | provenance | Src:MaD:536 Sink:MaD:48 |
-| LogInjectionTest.java:2113:112:2113:119 | source(...) : Object | LogInjectionTest.java:2113:103:2113:119 | (...)... | provenance | Src:MaD:536 Sink:MaD:48 |
-| LogInjectionTest.java:2114:67:2114:74 | source(...) : Object | LogInjectionTest.java:2114:58:2114:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:49 |
-| LogInjectionTest.java:2115:82:2115:89 | source(...) : Object | LogInjectionTest.java:2115:73:2115:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:49 |
-| LogInjectionTest.java:2116:97:2116:104 | source(...) : Object | LogInjectionTest.java:2116:88:2116:104 | (...)... | provenance | Src:MaD:536 Sink:MaD:49 |
-| LogInjectionTest.java:2117:112:2117:119 | source(...) : Object | LogInjectionTest.java:2117:103:2117:119 | (...)... | provenance | Src:MaD:536 Sink:MaD:49 |
-| LogInjectionTest.java:2119:67:2119:74 | source(...) : Object | LogInjectionTest.java:2119:58:2119:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:50 |
-| LogInjectionTest.java:2120:82:2120:89 | source(...) : Object | LogInjectionTest.java:2120:73:2120:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:50 |
-| LogInjectionTest.java:2121:97:2121:104 | source(...) : Object | LogInjectionTest.java:2121:88:2121:104 | (...)... | provenance | Src:MaD:536 Sink:MaD:50 |
-| LogInjectionTest.java:2122:112:2122:119 | source(...) : Object | LogInjectionTest.java:2122:103:2122:119 | (...)... | provenance | Src:MaD:536 Sink:MaD:50 |
-| LogInjectionTest.java:2123:118:2123:140 | {...} : Object[] [[]] : Object | LogInjectionTest.java:2123:118:2123:140 | new Object[] | provenance | Sink:MaD:50 |
-| LogInjectionTest.java:2123:132:2123:139 | source(...) : Object | LogInjectionTest.java:2123:118:2123:140 | {...} : Object[] [[]] : Object | provenance | Src:MaD:536  |
-| LogInjectionTest.java:2124:67:2124:74 | source(...) : Object | LogInjectionTest.java:2124:58:2124:74 | (...)... | provenance | Src:MaD:536 Sink:MaD:51 |
-| LogInjectionTest.java:2125:82:2125:89 | source(...) : Object | LogInjectionTest.java:2125:73:2125:89 | (...)... | provenance | Src:MaD:536 Sink:MaD:51 |
-| LogInjectionTest.java:2126:97:2126:104 | source(...) : Object | LogInjectionTest.java:2126:88:2126:104 | (...)... | provenance | Src:MaD:536 Sink:MaD:51 |
-| LogInjectionTest.java:2127:112:2127:119 | source(...) : Object | LogInjectionTest.java:2127:103:2127:119 | (...)... | provenance | Src:MaD:536 Sink:MaD:51 |
-| LogInjectionTest.java:2131:45:2131:52 | source(...) : Object | LogInjectionTest.java:2131:36:2131:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:1 |
-| LogInjectionTest.java:2132:45:2132:52 | source(...) : Object | LogInjectionTest.java:2132:36:2132:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:4 |
-| LogInjectionTest.java:2133:45:2133:52 | source(...) : Object | LogInjectionTest.java:2133:36:2133:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:3 |
-| LogInjectionTest.java:2134:45:2134:52 | source(...) : Object | LogInjectionTest.java:2134:36:2134:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:5 |
-| LogInjectionTest.java:2135:45:2135:52 | source(...) : Object | LogInjectionTest.java:2135:36:2135:52 | (...)... | provenance | Src:MaD:536 Sink:MaD:2 |
-| LogInjectionTest.java:2136:47:2136:54 | source(...) : Object | LogInjectionTest.java:2136:38:2136:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:6 |
-| LogInjectionTest.java:2141:47:2141:54 | source(...) : Object | LogInjectionTest.java:2141:38:2141:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:54 |
-| LogInjectionTest.java:2143:47:2143:54 | source(...) : Object | LogInjectionTest.java:2143:38:2143:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:55 |
-| LogInjectionTest.java:2145:47:2145:54 | source(...) : Object | LogInjectionTest.java:2145:38:2145:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:56 |
-| LogInjectionTest.java:2147:47:2147:54 | source(...) : Object | LogInjectionTest.java:2147:38:2147:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:57 |
-| LogInjectionTest.java:2149:47:2149:54 | source(...) : Object | LogInjectionTest.java:2149:38:2149:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:58 |
-| LogInjectionTest.java:2151:47:2151:54 | source(...) : Object | LogInjectionTest.java:2151:38:2151:54 | (...)... | provenance | Src:MaD:536 Sink:MaD:59 |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:16:22:16:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:17:22:17:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:19:22:19:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:20:22:20:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:21:22:21:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:22:41:22:46 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:24:22:24:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:25:22:25:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:27:22:27:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:28:22:28:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:29:22:29:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:31:22:31:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:32:22:32:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:34:22:34:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:35:22:35:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:37:22:37:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:38:22:38:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:40:22:40:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:41:22:41:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:43:22:43:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:44:22:44:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:46:22:46:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:47:22:47:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:48:22:48:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:49:22:49:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | LibrarySanitizers.java:50:22:50:27 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:16:22:16:27 | source : String | LibrarySanitizers.java:16:22:16:47 | replace(...) | provenance | MaD:540 Sink:MaD:101 |
+| LibrarySanitizers.java:17:22:17:27 | source : String | LibrarySanitizers.java:17:22:17:47 | replace(...) | provenance | MaD:540 Sink:MaD:101 |
+| LibrarySanitizers.java:19:22:19:27 | source : String | LibrarySanitizers.java:19:22:19:47 | replace(...) | provenance | MaD:540 Sink:MaD:101 |
+| LibrarySanitizers.java:20:22:20:27 | source : String | LibrarySanitizers.java:20:22:20:47 | replace(...) | provenance | MaD:540 Sink:MaD:101 |
+| LibrarySanitizers.java:21:22:21:27 | source : String | LibrarySanitizers.java:21:22:21:57 | replace(...) | provenance | MaD:540 Sink:MaD:101 |
+| LibrarySanitizers.java:22:41:22:46 | source : String | LibrarySanitizers.java:22:22:22:47 | replace(...) | provenance | MaD:539 Sink:MaD:101 |
+| LibrarySanitizers.java:24:22:24:27 | source : String | LibrarySanitizers.java:24:22:24:47 | replace(...) | provenance | MaD:540 Sink:MaD:101 |
+| LibrarySanitizers.java:25:22:25:27 | source : String | LibrarySanitizers.java:25:22:25:47 | replace(...) | provenance | MaD:540 Sink:MaD:101 |
+| LibrarySanitizers.java:27:22:27:27 | source : String | LibrarySanitizers.java:27:22:27:47 | replace(...) | provenance | MaD:540 Sink:MaD:101 |
+| LibrarySanitizers.java:28:22:28:27 | source : String | LibrarySanitizers.java:28:22:28:47 | replace(...) | provenance | MaD:540 Sink:MaD:101 |
+| LibrarySanitizers.java:29:22:29:27 | source : String | LibrarySanitizers.java:29:22:29:45 | replace(...) | provenance | MaD:540 Sink:MaD:101 |
+| LibrarySanitizers.java:31:22:31:27 | source : String | LibrarySanitizers.java:31:22:31:50 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:32:22:32:27 | source : String | LibrarySanitizers.java:32:22:32:50 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:34:22:34:27 | source : String | LibrarySanitizers.java:34:22:34:50 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:35:22:35:27 | source : String | LibrarySanitizers.java:35:22:35:50 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:37:22:37:27 | source : String | LibrarySanitizers.java:37:22:37:51 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:38:22:38:27 | source : String | LibrarySanitizers.java:38:22:38:51 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:40:22:40:27 | source : String | LibrarySanitizers.java:40:22:40:51 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:41:22:41:27 | source : String | LibrarySanitizers.java:41:22:41:51 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:43:22:43:27 | source : String | LibrarySanitizers.java:43:22:43:51 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:44:22:44:27 | source : String | LibrarySanitizers.java:44:22:44:51 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:46:22:46:27 | source : String | LibrarySanitizers.java:46:22:46:57 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:47:22:47:27 | source : String | LibrarySanitizers.java:47:22:47:57 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:48:22:48:27 | source : String | LibrarySanitizers.java:48:22:48:57 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:49:22:49:27 | source : String | LibrarySanitizers.java:49:22:49:57 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:50:22:50:27 | source : String | LibrarySanitizers.java:50:22:50:58 | replaceAll(...) | provenance | MaD:541 Sink:MaD:101 |
+| LibrarySanitizers.java:72:25:72:32 | source(...) : String | LibrarySanitizers.java:82:41:82:46 | source : String | provenance | Src:MaD:536  |
+| LibrarySanitizers.java:82:41:82:46 | source : String | LibrarySanitizers.java:82:22:82:47 | removeFrom(...) | provenance | MaD:538 Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:39:26:39:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:45:26:45:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:51:26:51:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:57:26:57:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:63:26:63:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:69:26:69:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:75:26:75:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:81:26:81:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:87:26:87:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:93:26:93:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:101:26:101:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:107:26:107:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:113:26:113:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:119:26:119:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:125:26:125:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:131:26:131:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:135:26:135:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:137:26:137:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:141:26:141:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:143:26:143:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:147:26:147:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:25:35:41 | (...)... : String | LogInjectionTest.java:153:26:153:31 | source | provenance | Sink:MaD:101 |
+| LogInjectionTest.java:35:34:35:41 | source(...) : Object | LogInjectionTest.java:35:25:35:41 | (...)... : String | provenance | Src:MaD:537  |
+| LogInjectionTest.java:165:48:165:55 | source(...) : Object | LogInjectionTest.java:165:39:165:55 | (...)... | provenance | Src:MaD:537 Sink:MaD:60 |
+| LogInjectionTest.java:175:41:175:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:175:41:175:63 | new Object[] | provenance | Sink:MaD:61 |
+| LogInjectionTest.java:175:55:175:62 | source(...) : Object | LogInjectionTest.java:175:41:175:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:185:41:185:48 | source(...) : Object | LogInjectionTest.java:185:26:185:48 | (...)... | provenance | Src:MaD:537 Sink:MaD:76 |
+| LogInjectionTest.java:186:41:186:48 | source(...) : Object | LogInjectionTest.java:186:26:186:48 | (...)... | provenance | Src:MaD:537 Sink:MaD:77 |
+| LogInjectionTest.java:187:56:187:63 | source(...) : Object | LogInjectionTest.java:187:41:187:63 | (...)... | provenance | Src:MaD:537 Sink:MaD:78 |
+| LogInjectionTest.java:188:56:188:63 | source(...) : Object | LogInjectionTest.java:188:41:188:63 | (...)... | provenance | Src:MaD:537 Sink:MaD:79 |
+| LogInjectionTest.java:189:51:189:58 | source(...) : Object | LogInjectionTest.java:189:41:189:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:80 |
+| LogInjectionTest.java:190:59:190:66 | source(...) : Object | LogInjectionTest.java:190:41:190:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:81 |
+| LogInjectionTest.java:191:59:191:66 | source(...) : Object | LogInjectionTest.java:191:41:191:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:82 |
+| LogInjectionTest.java:193:50:193:57 | source(...) : Object | LogInjectionTest.java:193:41:193:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:83 |
+| LogInjectionTest.java:194:50:194:57 | source(...) : Object | LogInjectionTest.java:194:41:194:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:93 |
+| LogInjectionTest.java:195:56:195:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:195:56:195:78 | new Object[] | provenance | Sink:MaD:93 |
+| LogInjectionTest.java:195:70:195:77 | source(...) : Object | LogInjectionTest.java:195:56:195:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:196:65:196:72 | source(...) : Object | LogInjectionTest.java:196:56:196:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:84 |
+| LogInjectionTest.java:197:50:197:57 | source(...) : Object | LogInjectionTest.java:197:41:197:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:84 |
+| LogInjectionTest.java:198:80:198:87 | source(...) : Object | LogInjectionTest.java:198:71:198:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:85 |
+| LogInjectionTest.java:199:65:199:72 | source(...) : Object | LogInjectionTest.java:199:56:199:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:85 |
+| LogInjectionTest.java:200:50:200:57 | source(...) : Object | LogInjectionTest.java:200:41:200:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:85 |
+| LogInjectionTest.java:201:95:201:102 | source(...) : Object | LogInjectionTest.java:201:86:201:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:86 |
+| LogInjectionTest.java:202:80:202:87 | source(...) : Object | LogInjectionTest.java:202:71:202:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:86 |
+| LogInjectionTest.java:203:65:203:72 | source(...) : Object | LogInjectionTest.java:203:56:203:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:86 |
+| LogInjectionTest.java:204:50:204:57 | source(...) : Object | LogInjectionTest.java:204:41:204:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:86 |
+| LogInjectionTest.java:205:110:205:117 | source(...) : Object | LogInjectionTest.java:205:101:205:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:87 |
+| LogInjectionTest.java:206:95:206:102 | source(...) : Object | LogInjectionTest.java:206:86:206:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:87 |
+| LogInjectionTest.java:207:80:207:87 | source(...) : Object | LogInjectionTest.java:207:71:207:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:87 |
+| LogInjectionTest.java:208:65:208:72 | source(...) : Object | LogInjectionTest.java:208:56:208:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:87 |
+| LogInjectionTest.java:209:50:209:57 | source(...) : Object | LogInjectionTest.java:209:41:209:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:87 |
+| LogInjectionTest.java:210:125:210:132 | source(...) : Object | LogInjectionTest.java:210:116:210:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:88 |
+| LogInjectionTest.java:211:110:211:117 | source(...) : Object | LogInjectionTest.java:211:101:211:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:88 |
+| LogInjectionTest.java:212:95:212:102 | source(...) : Object | LogInjectionTest.java:212:86:212:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:88 |
+| LogInjectionTest.java:213:80:213:87 | source(...) : Object | LogInjectionTest.java:213:71:213:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:88 |
+| LogInjectionTest.java:214:65:214:72 | source(...) : Object | LogInjectionTest.java:214:56:214:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:88 |
+| LogInjectionTest.java:215:50:215:57 | source(...) : Object | LogInjectionTest.java:215:41:215:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:88 |
+| LogInjectionTest.java:216:140:216:147 | source(...) : Object | LogInjectionTest.java:216:131:216:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:89 |
+| LogInjectionTest.java:217:125:217:132 | source(...) : Object | LogInjectionTest.java:217:116:217:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:89 |
+| LogInjectionTest.java:218:110:218:117 | source(...) : Object | LogInjectionTest.java:218:101:218:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:89 |
+| LogInjectionTest.java:219:95:219:102 | source(...) : Object | LogInjectionTest.java:219:86:219:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:89 |
+| LogInjectionTest.java:220:80:220:87 | source(...) : Object | LogInjectionTest.java:220:71:220:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:89 |
+| LogInjectionTest.java:221:65:221:72 | source(...) : Object | LogInjectionTest.java:221:56:221:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:89 |
+| LogInjectionTest.java:222:50:222:57 | source(...) : Object | LogInjectionTest.java:222:41:222:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:89 |
+| LogInjectionTest.java:223:155:223:162 | source(...) : Object | LogInjectionTest.java:223:146:223:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:90 |
+| LogInjectionTest.java:224:140:224:147 | source(...) : Object | LogInjectionTest.java:224:131:224:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:90 |
+| LogInjectionTest.java:225:125:225:132 | source(...) : Object | LogInjectionTest.java:225:116:225:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:90 |
+| LogInjectionTest.java:226:110:226:117 | source(...) : Object | LogInjectionTest.java:226:101:226:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:90 |
+| LogInjectionTest.java:227:95:227:102 | source(...) : Object | LogInjectionTest.java:227:86:227:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:90 |
+| LogInjectionTest.java:228:80:228:87 | source(...) : Object | LogInjectionTest.java:228:71:228:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:90 |
+| LogInjectionTest.java:229:65:229:72 | source(...) : Object | LogInjectionTest.java:229:56:229:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:90 |
+| LogInjectionTest.java:230:50:230:57 | source(...) : Object | LogInjectionTest.java:230:41:230:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:90 |
+| LogInjectionTest.java:231:170:231:177 | source(...) : Object | LogInjectionTest.java:231:161:231:177 | (...)... | provenance | Src:MaD:537 Sink:MaD:91 |
+| LogInjectionTest.java:232:155:232:162 | source(...) : Object | LogInjectionTest.java:232:146:232:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:91 |
+| LogInjectionTest.java:233:140:233:147 | source(...) : Object | LogInjectionTest.java:233:131:233:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:91 |
+| LogInjectionTest.java:234:125:234:132 | source(...) : Object | LogInjectionTest.java:234:116:234:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:91 |
+| LogInjectionTest.java:235:110:235:117 | source(...) : Object | LogInjectionTest.java:235:101:235:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:91 |
+| LogInjectionTest.java:236:95:236:102 | source(...) : Object | LogInjectionTest.java:236:86:236:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:91 |
+| LogInjectionTest.java:237:80:237:87 | source(...) : Object | LogInjectionTest.java:237:71:237:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:91 |
+| LogInjectionTest.java:238:65:238:72 | source(...) : Object | LogInjectionTest.java:238:56:238:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:91 |
+| LogInjectionTest.java:239:50:239:57 | source(...) : Object | LogInjectionTest.java:239:41:239:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:91 |
+| LogInjectionTest.java:240:185:240:192 | source(...) : Object | LogInjectionTest.java:240:176:240:192 | (...)... | provenance | Src:MaD:537 Sink:MaD:92 |
+| LogInjectionTest.java:241:170:241:177 | source(...) : Object | LogInjectionTest.java:241:161:241:177 | (...)... | provenance | Src:MaD:537 Sink:MaD:92 |
+| LogInjectionTest.java:242:155:242:162 | source(...) : Object | LogInjectionTest.java:242:146:242:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:92 |
+| LogInjectionTest.java:243:140:243:147 | source(...) : Object | LogInjectionTest.java:243:131:243:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:92 |
+| LogInjectionTest.java:244:125:244:132 | source(...) : Object | LogInjectionTest.java:244:116:244:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:92 |
+| LogInjectionTest.java:245:110:245:117 | source(...) : Object | LogInjectionTest.java:245:101:245:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:92 |
+| LogInjectionTest.java:246:95:246:102 | source(...) : Object | LogInjectionTest.java:246:86:246:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:92 |
+| LogInjectionTest.java:247:80:247:87 | source(...) : Object | LogInjectionTest.java:247:71:247:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:92 |
+| LogInjectionTest.java:248:65:248:72 | source(...) : Object | LogInjectionTest.java:248:56:248:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:92 |
+| LogInjectionTest.java:249:50:249:57 | source(...) : Object | LogInjectionTest.java:249:41:249:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:92 |
+| LogInjectionTest.java:250:50:250:57 | source(...) : Object | LogInjectionTest.java:250:41:250:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:84 |
+| LogInjectionTest.java:251:70:251:77 | source(...) : Object | LogInjectionTest.java:251:56:251:77 | (...)... | provenance | Src:MaD:537 Sink:MaD:84 |
+| LogInjectionTest.java:252:50:252:57 | source(...) : Object | LogInjectionTest.java:252:41:252:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:94 |
+| LogInjectionTest.java:253:55:253:62 | source(...) : Object | LogInjectionTest.java:253:41:253:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:95 |
+| LogInjectionTest.java:254:55:254:62 | source(...) : Object | LogInjectionTest.java:254:41:254:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:96 |
+| LogInjectionTest.java:255:44:255:51 | source(...) : Object | LogInjectionTest.java:255:26:255:51 | (...)... | provenance | Src:MaD:537 Sink:MaD:99 |
+| LogInjectionTest.java:256:44:256:51 | source(...) : Object | LogInjectionTest.java:256:26:256:51 | (...)... | provenance | Src:MaD:537 Sink:MaD:100 |
+| LogInjectionTest.java:257:36:257:43 | source(...) : Object | LogInjectionTest.java:257:26:257:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:97 |
+| LogInjectionTest.java:258:36:258:43 | source(...) : Object | LogInjectionTest.java:258:26:258:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:98 |
+| LogInjectionTest.java:261:35:261:42 | source(...) : Object | LogInjectionTest.java:261:26:261:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:101 |
+| LogInjectionTest.java:262:35:262:42 | source(...) : Object | LogInjectionTest.java:262:26:262:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:111 |
+| LogInjectionTest.java:263:41:263:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:263:41:263:63 | new Object[] | provenance | Sink:MaD:111 |
+| LogInjectionTest.java:263:55:263:62 | source(...) : Object | LogInjectionTest.java:263:41:263:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:264:50:264:57 | source(...) : Object | LogInjectionTest.java:264:41:264:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:102 |
+| LogInjectionTest.java:265:35:265:42 | source(...) : Object | LogInjectionTest.java:265:26:265:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:102 |
+| LogInjectionTest.java:266:65:266:72 | source(...) : Object | LogInjectionTest.java:266:56:266:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:103 |
+| LogInjectionTest.java:267:50:267:57 | source(...) : Object | LogInjectionTest.java:267:41:267:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:103 |
+| LogInjectionTest.java:268:35:268:42 | source(...) : Object | LogInjectionTest.java:268:26:268:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:103 |
+| LogInjectionTest.java:269:80:269:87 | source(...) : Object | LogInjectionTest.java:269:71:269:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:104 |
+| LogInjectionTest.java:270:65:270:72 | source(...) : Object | LogInjectionTest.java:270:56:270:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:104 |
+| LogInjectionTest.java:271:50:271:57 | source(...) : Object | LogInjectionTest.java:271:41:271:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:104 |
+| LogInjectionTest.java:272:35:272:42 | source(...) : Object | LogInjectionTest.java:272:26:272:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:104 |
+| LogInjectionTest.java:273:95:273:102 | source(...) : Object | LogInjectionTest.java:273:86:273:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:105 |
+| LogInjectionTest.java:274:80:274:87 | source(...) : Object | LogInjectionTest.java:274:71:274:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:105 |
+| LogInjectionTest.java:275:65:275:72 | source(...) : Object | LogInjectionTest.java:275:56:275:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:105 |
+| LogInjectionTest.java:276:50:276:57 | source(...) : Object | LogInjectionTest.java:276:41:276:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:105 |
+| LogInjectionTest.java:277:35:277:42 | source(...) : Object | LogInjectionTest.java:277:26:277:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:105 |
+| LogInjectionTest.java:278:110:278:117 | source(...) : Object | LogInjectionTest.java:278:101:278:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:106 |
+| LogInjectionTest.java:279:95:279:102 | source(...) : Object | LogInjectionTest.java:279:86:279:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:106 |
+| LogInjectionTest.java:280:80:280:87 | source(...) : Object | LogInjectionTest.java:280:71:280:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:106 |
+| LogInjectionTest.java:281:65:281:72 | source(...) : Object | LogInjectionTest.java:281:56:281:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:106 |
+| LogInjectionTest.java:282:50:282:57 | source(...) : Object | LogInjectionTest.java:282:41:282:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:106 |
+| LogInjectionTest.java:283:35:283:42 | source(...) : Object | LogInjectionTest.java:283:26:283:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:106 |
+| LogInjectionTest.java:284:125:284:132 | source(...) : Object | LogInjectionTest.java:284:116:284:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:107 |
+| LogInjectionTest.java:285:110:285:117 | source(...) : Object | LogInjectionTest.java:285:101:285:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:107 |
+| LogInjectionTest.java:286:95:286:102 | source(...) : Object | LogInjectionTest.java:286:86:286:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:107 |
+| LogInjectionTest.java:287:80:287:87 | source(...) : Object | LogInjectionTest.java:287:71:287:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:107 |
+| LogInjectionTest.java:288:65:288:72 | source(...) : Object | LogInjectionTest.java:288:56:288:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:107 |
+| LogInjectionTest.java:289:50:289:57 | source(...) : Object | LogInjectionTest.java:289:41:289:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:107 |
+| LogInjectionTest.java:290:35:290:42 | source(...) : Object | LogInjectionTest.java:290:26:290:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:107 |
+| LogInjectionTest.java:291:140:291:147 | source(...) : Object | LogInjectionTest.java:291:131:291:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:108 |
+| LogInjectionTest.java:292:125:292:132 | source(...) : Object | LogInjectionTest.java:292:116:292:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:108 |
+| LogInjectionTest.java:293:110:293:117 | source(...) : Object | LogInjectionTest.java:293:101:293:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:108 |
+| LogInjectionTest.java:294:95:294:102 | source(...) : Object | LogInjectionTest.java:294:86:294:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:108 |
+| LogInjectionTest.java:295:80:295:87 | source(...) : Object | LogInjectionTest.java:295:71:295:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:108 |
+| LogInjectionTest.java:296:65:296:72 | source(...) : Object | LogInjectionTest.java:296:56:296:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:108 |
+| LogInjectionTest.java:297:50:297:57 | source(...) : Object | LogInjectionTest.java:297:41:297:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:108 |
+| LogInjectionTest.java:298:35:298:42 | source(...) : Object | LogInjectionTest.java:298:26:298:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:108 |
+| LogInjectionTest.java:299:155:299:162 | source(...) : Object | LogInjectionTest.java:299:146:299:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:109 |
+| LogInjectionTest.java:300:140:300:147 | source(...) : Object | LogInjectionTest.java:300:131:300:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:109 |
+| LogInjectionTest.java:301:125:301:132 | source(...) : Object | LogInjectionTest.java:301:116:301:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:109 |
+| LogInjectionTest.java:302:110:302:117 | source(...) : Object | LogInjectionTest.java:302:101:302:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:109 |
+| LogInjectionTest.java:303:95:303:102 | source(...) : Object | LogInjectionTest.java:303:86:303:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:109 |
+| LogInjectionTest.java:304:80:304:87 | source(...) : Object | LogInjectionTest.java:304:71:304:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:109 |
+| LogInjectionTest.java:305:65:305:72 | source(...) : Object | LogInjectionTest.java:305:56:305:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:109 |
+| LogInjectionTest.java:306:50:306:57 | source(...) : Object | LogInjectionTest.java:306:41:306:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:109 |
+| LogInjectionTest.java:307:35:307:42 | source(...) : Object | LogInjectionTest.java:307:26:307:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:109 |
+| LogInjectionTest.java:308:170:308:177 | source(...) : Object | LogInjectionTest.java:308:161:308:177 | (...)... | provenance | Src:MaD:537 Sink:MaD:110 |
+| LogInjectionTest.java:309:155:309:162 | source(...) : Object | LogInjectionTest.java:309:146:309:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:110 |
+| LogInjectionTest.java:310:140:310:147 | source(...) : Object | LogInjectionTest.java:310:131:310:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:110 |
+| LogInjectionTest.java:311:125:311:132 | source(...) : Object | LogInjectionTest.java:311:116:311:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:110 |
+| LogInjectionTest.java:312:110:312:117 | source(...) : Object | LogInjectionTest.java:312:101:312:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:110 |
+| LogInjectionTest.java:313:95:313:102 | source(...) : Object | LogInjectionTest.java:313:86:313:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:110 |
+| LogInjectionTest.java:314:80:314:87 | source(...) : Object | LogInjectionTest.java:314:71:314:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:110 |
+| LogInjectionTest.java:315:65:315:72 | source(...) : Object | LogInjectionTest.java:315:56:315:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:110 |
+| LogInjectionTest.java:316:50:316:57 | source(...) : Object | LogInjectionTest.java:316:41:316:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:110 |
+| LogInjectionTest.java:317:35:317:42 | source(...) : Object | LogInjectionTest.java:317:26:317:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:110 |
+| LogInjectionTest.java:318:35:318:42 | source(...) : Object | LogInjectionTest.java:318:26:318:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:102 |
+| LogInjectionTest.java:319:55:319:62 | source(...) : Object | LogInjectionTest.java:319:41:319:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:102 |
+| LogInjectionTest.java:320:35:320:42 | source(...) : Object | LogInjectionTest.java:320:26:320:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:112 |
+| LogInjectionTest.java:321:40:321:47 | source(...) : Object | LogInjectionTest.java:321:26:321:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:113 |
+| LogInjectionTest.java:322:40:322:47 | source(...) : Object | LogInjectionTest.java:322:26:322:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:114 |
+| LogInjectionTest.java:323:41:323:48 | source(...) : Object | LogInjectionTest.java:323:26:323:48 | (...)... | provenance | Src:MaD:537 Sink:MaD:115 |
+| LogInjectionTest.java:324:41:324:48 | source(...) : Object | LogInjectionTest.java:324:26:324:48 | (...)... | provenance | Src:MaD:537 Sink:MaD:116 |
+| LogInjectionTest.java:325:56:325:63 | source(...) : Object | LogInjectionTest.java:325:41:325:63 | (...)... | provenance | Src:MaD:537 Sink:MaD:117 |
+| LogInjectionTest.java:326:56:326:63 | source(...) : Object | LogInjectionTest.java:326:41:326:63 | (...)... | provenance | Src:MaD:537 Sink:MaD:118 |
+| LogInjectionTest.java:327:51:327:58 | source(...) : Object | LogInjectionTest.java:327:41:327:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:119 |
+| LogInjectionTest.java:328:59:328:66 | source(...) : Object | LogInjectionTest.java:328:41:328:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:120 |
+| LogInjectionTest.java:329:59:329:66 | source(...) : Object | LogInjectionTest.java:329:41:329:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:121 |
+| LogInjectionTest.java:331:50:331:57 | source(...) : Object | LogInjectionTest.java:331:41:331:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:122 |
+| LogInjectionTest.java:332:50:332:57 | source(...) : Object | LogInjectionTest.java:332:41:332:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:132 |
+| LogInjectionTest.java:333:56:333:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:333:56:333:78 | new Object[] | provenance | Sink:MaD:132 |
+| LogInjectionTest.java:333:70:333:77 | source(...) : Object | LogInjectionTest.java:333:56:333:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:334:65:334:72 | source(...) : Object | LogInjectionTest.java:334:56:334:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:123 |
+| LogInjectionTest.java:335:50:335:57 | source(...) : Object | LogInjectionTest.java:335:41:335:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:123 |
+| LogInjectionTest.java:336:80:336:87 | source(...) : Object | LogInjectionTest.java:336:71:336:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:124 |
+| LogInjectionTest.java:337:65:337:72 | source(...) : Object | LogInjectionTest.java:337:56:337:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:124 |
+| LogInjectionTest.java:338:50:338:57 | source(...) : Object | LogInjectionTest.java:338:41:338:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:124 |
+| LogInjectionTest.java:339:95:339:102 | source(...) : Object | LogInjectionTest.java:339:86:339:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:125 |
+| LogInjectionTest.java:340:80:340:87 | source(...) : Object | LogInjectionTest.java:340:71:340:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:125 |
+| LogInjectionTest.java:341:65:341:72 | source(...) : Object | LogInjectionTest.java:341:56:341:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:125 |
+| LogInjectionTest.java:342:50:342:57 | source(...) : Object | LogInjectionTest.java:342:41:342:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:125 |
+| LogInjectionTest.java:343:110:343:117 | source(...) : Object | LogInjectionTest.java:343:101:343:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:126 |
+| LogInjectionTest.java:344:95:344:102 | source(...) : Object | LogInjectionTest.java:344:86:344:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:126 |
+| LogInjectionTest.java:345:80:345:87 | source(...) : Object | LogInjectionTest.java:345:71:345:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:126 |
+| LogInjectionTest.java:346:65:346:72 | source(...) : Object | LogInjectionTest.java:346:56:346:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:126 |
+| LogInjectionTest.java:347:50:347:57 | source(...) : Object | LogInjectionTest.java:347:41:347:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:126 |
+| LogInjectionTest.java:348:125:348:132 | source(...) : Object | LogInjectionTest.java:348:116:348:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:127 |
+| LogInjectionTest.java:349:110:349:117 | source(...) : Object | LogInjectionTest.java:349:101:349:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:127 |
+| LogInjectionTest.java:350:95:350:102 | source(...) : Object | LogInjectionTest.java:350:86:350:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:127 |
+| LogInjectionTest.java:351:80:351:87 | source(...) : Object | LogInjectionTest.java:351:71:351:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:127 |
+| LogInjectionTest.java:352:65:352:72 | source(...) : Object | LogInjectionTest.java:352:56:352:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:127 |
+| LogInjectionTest.java:353:50:353:57 | source(...) : Object | LogInjectionTest.java:353:41:353:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:127 |
+| LogInjectionTest.java:354:140:354:147 | source(...) : Object | LogInjectionTest.java:354:131:354:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:128 |
+| LogInjectionTest.java:355:125:355:132 | source(...) : Object | LogInjectionTest.java:355:116:355:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:128 |
+| LogInjectionTest.java:356:110:356:117 | source(...) : Object | LogInjectionTest.java:356:101:356:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:128 |
+| LogInjectionTest.java:357:95:357:102 | source(...) : Object | LogInjectionTest.java:357:86:357:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:128 |
+| LogInjectionTest.java:358:80:358:87 | source(...) : Object | LogInjectionTest.java:358:71:358:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:128 |
+| LogInjectionTest.java:359:65:359:72 | source(...) : Object | LogInjectionTest.java:359:56:359:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:128 |
+| LogInjectionTest.java:360:50:360:57 | source(...) : Object | LogInjectionTest.java:360:41:360:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:128 |
+| LogInjectionTest.java:361:155:361:162 | source(...) : Object | LogInjectionTest.java:361:146:361:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:129 |
+| LogInjectionTest.java:362:140:362:147 | source(...) : Object | LogInjectionTest.java:362:131:362:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:129 |
+| LogInjectionTest.java:363:125:363:132 | source(...) : Object | LogInjectionTest.java:363:116:363:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:129 |
+| LogInjectionTest.java:364:110:364:117 | source(...) : Object | LogInjectionTest.java:364:101:364:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:129 |
+| LogInjectionTest.java:365:95:365:102 | source(...) : Object | LogInjectionTest.java:365:86:365:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:129 |
+| LogInjectionTest.java:366:80:366:87 | source(...) : Object | LogInjectionTest.java:366:71:366:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:129 |
+| LogInjectionTest.java:367:65:367:72 | source(...) : Object | LogInjectionTest.java:367:56:367:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:129 |
+| LogInjectionTest.java:368:50:368:57 | source(...) : Object | LogInjectionTest.java:368:41:368:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:129 |
+| LogInjectionTest.java:369:170:369:177 | source(...) : Object | LogInjectionTest.java:369:161:369:177 | (...)... | provenance | Src:MaD:537 Sink:MaD:130 |
+| LogInjectionTest.java:370:155:370:162 | source(...) : Object | LogInjectionTest.java:370:146:370:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:130 |
+| LogInjectionTest.java:371:140:371:147 | source(...) : Object | LogInjectionTest.java:371:131:371:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:130 |
+| LogInjectionTest.java:372:125:372:132 | source(...) : Object | LogInjectionTest.java:372:116:372:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:130 |
+| LogInjectionTest.java:373:110:373:117 | source(...) : Object | LogInjectionTest.java:373:101:373:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:130 |
+| LogInjectionTest.java:374:95:374:102 | source(...) : Object | LogInjectionTest.java:374:86:374:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:130 |
+| LogInjectionTest.java:375:80:375:87 | source(...) : Object | LogInjectionTest.java:375:71:375:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:130 |
+| LogInjectionTest.java:376:65:376:72 | source(...) : Object | LogInjectionTest.java:376:56:376:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:130 |
+| LogInjectionTest.java:377:50:377:57 | source(...) : Object | LogInjectionTest.java:377:41:377:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:130 |
+| LogInjectionTest.java:378:185:378:192 | source(...) : Object | LogInjectionTest.java:378:176:378:192 | (...)... | provenance | Src:MaD:537 Sink:MaD:131 |
+| LogInjectionTest.java:379:170:379:177 | source(...) : Object | LogInjectionTest.java:379:161:379:177 | (...)... | provenance | Src:MaD:537 Sink:MaD:131 |
+| LogInjectionTest.java:380:155:380:162 | source(...) : Object | LogInjectionTest.java:380:146:380:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:131 |
+| LogInjectionTest.java:381:140:381:147 | source(...) : Object | LogInjectionTest.java:381:131:381:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:131 |
+| LogInjectionTest.java:382:125:382:132 | source(...) : Object | LogInjectionTest.java:382:116:382:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:131 |
+| LogInjectionTest.java:383:110:383:117 | source(...) : Object | LogInjectionTest.java:383:101:383:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:131 |
+| LogInjectionTest.java:384:95:384:102 | source(...) : Object | LogInjectionTest.java:384:86:384:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:131 |
+| LogInjectionTest.java:385:80:385:87 | source(...) : Object | LogInjectionTest.java:385:71:385:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:131 |
+| LogInjectionTest.java:386:65:386:72 | source(...) : Object | LogInjectionTest.java:386:56:386:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:131 |
+| LogInjectionTest.java:387:50:387:57 | source(...) : Object | LogInjectionTest.java:387:41:387:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:131 |
+| LogInjectionTest.java:388:50:388:57 | source(...) : Object | LogInjectionTest.java:388:41:388:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:123 |
+| LogInjectionTest.java:389:70:389:77 | source(...) : Object | LogInjectionTest.java:389:56:389:77 | (...)... | provenance | Src:MaD:537 Sink:MaD:123 |
+| LogInjectionTest.java:390:50:390:57 | source(...) : Object | LogInjectionTest.java:390:41:390:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:133 |
+| LogInjectionTest.java:391:55:391:62 | source(...) : Object | LogInjectionTest.java:391:41:391:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:134 |
+| LogInjectionTest.java:392:55:392:62 | source(...) : Object | LogInjectionTest.java:392:41:392:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:135 |
+| LogInjectionTest.java:393:44:393:51 | source(...) : Object | LogInjectionTest.java:393:26:393:51 | (...)... | provenance | Src:MaD:537 Sink:MaD:138 |
+| LogInjectionTest.java:394:44:394:51 | source(...) : Object | LogInjectionTest.java:394:26:394:51 | (...)... | provenance | Src:MaD:537 Sink:MaD:139 |
+| LogInjectionTest.java:395:36:395:43 | source(...) : Object | LogInjectionTest.java:395:26:395:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:136 |
+| LogInjectionTest.java:396:36:396:43 | source(...) : Object | LogInjectionTest.java:396:26:396:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:137 |
+| LogInjectionTest.java:399:35:399:42 | source(...) : Object | LogInjectionTest.java:399:26:399:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:140 |
+| LogInjectionTest.java:400:35:400:42 | source(...) : Object | LogInjectionTest.java:400:26:400:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:150 |
+| LogInjectionTest.java:401:41:401:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:401:41:401:63 | new Object[] | provenance | Sink:MaD:150 |
+| LogInjectionTest.java:401:55:401:62 | source(...) : Object | LogInjectionTest.java:401:41:401:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:402:50:402:57 | source(...) : Object | LogInjectionTest.java:402:41:402:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:141 |
+| LogInjectionTest.java:403:35:403:42 | source(...) : Object | LogInjectionTest.java:403:26:403:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:141 |
+| LogInjectionTest.java:404:65:404:72 | source(...) : Object | LogInjectionTest.java:404:56:404:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:142 |
+| LogInjectionTest.java:405:50:405:57 | source(...) : Object | LogInjectionTest.java:405:41:405:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:142 |
+| LogInjectionTest.java:406:35:406:42 | source(...) : Object | LogInjectionTest.java:406:26:406:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:142 |
+| LogInjectionTest.java:407:80:407:87 | source(...) : Object | LogInjectionTest.java:407:71:407:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:143 |
+| LogInjectionTest.java:408:65:408:72 | source(...) : Object | LogInjectionTest.java:408:56:408:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:143 |
+| LogInjectionTest.java:409:50:409:57 | source(...) : Object | LogInjectionTest.java:409:41:409:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:143 |
+| LogInjectionTest.java:410:35:410:42 | source(...) : Object | LogInjectionTest.java:410:26:410:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:143 |
+| LogInjectionTest.java:411:95:411:102 | source(...) : Object | LogInjectionTest.java:411:86:411:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:144 |
+| LogInjectionTest.java:412:80:412:87 | source(...) : Object | LogInjectionTest.java:412:71:412:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:144 |
+| LogInjectionTest.java:413:65:413:72 | source(...) : Object | LogInjectionTest.java:413:56:413:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:144 |
+| LogInjectionTest.java:414:50:414:57 | source(...) : Object | LogInjectionTest.java:414:41:414:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:144 |
+| LogInjectionTest.java:415:35:415:42 | source(...) : Object | LogInjectionTest.java:415:26:415:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:144 |
+| LogInjectionTest.java:416:110:416:117 | source(...) : Object | LogInjectionTest.java:416:101:416:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:145 |
+| LogInjectionTest.java:417:95:417:102 | source(...) : Object | LogInjectionTest.java:417:86:417:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:145 |
+| LogInjectionTest.java:418:80:418:87 | source(...) : Object | LogInjectionTest.java:418:71:418:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:145 |
+| LogInjectionTest.java:419:65:419:72 | source(...) : Object | LogInjectionTest.java:419:56:419:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:145 |
+| LogInjectionTest.java:420:50:420:57 | source(...) : Object | LogInjectionTest.java:420:41:420:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:145 |
+| LogInjectionTest.java:421:35:421:42 | source(...) : Object | LogInjectionTest.java:421:26:421:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:145 |
+| LogInjectionTest.java:422:125:422:132 | source(...) : Object | LogInjectionTest.java:422:116:422:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:146 |
+| LogInjectionTest.java:423:110:423:117 | source(...) : Object | LogInjectionTest.java:423:101:423:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:146 |
+| LogInjectionTest.java:424:95:424:102 | source(...) : Object | LogInjectionTest.java:424:86:424:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:146 |
+| LogInjectionTest.java:425:80:425:87 | source(...) : Object | LogInjectionTest.java:425:71:425:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:146 |
+| LogInjectionTest.java:426:65:426:72 | source(...) : Object | LogInjectionTest.java:426:56:426:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:146 |
+| LogInjectionTest.java:427:50:427:57 | source(...) : Object | LogInjectionTest.java:427:41:427:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:146 |
+| LogInjectionTest.java:428:35:428:42 | source(...) : Object | LogInjectionTest.java:428:26:428:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:146 |
+| LogInjectionTest.java:429:140:429:147 | source(...) : Object | LogInjectionTest.java:429:131:429:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:147 |
+| LogInjectionTest.java:430:125:430:132 | source(...) : Object | LogInjectionTest.java:430:116:430:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:147 |
+| LogInjectionTest.java:431:110:431:117 | source(...) : Object | LogInjectionTest.java:431:101:431:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:147 |
+| LogInjectionTest.java:432:95:432:102 | source(...) : Object | LogInjectionTest.java:432:86:432:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:147 |
+| LogInjectionTest.java:433:80:433:87 | source(...) : Object | LogInjectionTest.java:433:71:433:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:147 |
+| LogInjectionTest.java:434:65:434:72 | source(...) : Object | LogInjectionTest.java:434:56:434:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:147 |
+| LogInjectionTest.java:435:50:435:57 | source(...) : Object | LogInjectionTest.java:435:41:435:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:147 |
+| LogInjectionTest.java:436:35:436:42 | source(...) : Object | LogInjectionTest.java:436:26:436:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:147 |
+| LogInjectionTest.java:437:155:437:162 | source(...) : Object | LogInjectionTest.java:437:146:437:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:148 |
+| LogInjectionTest.java:438:140:438:147 | source(...) : Object | LogInjectionTest.java:438:131:438:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:148 |
+| LogInjectionTest.java:439:125:439:132 | source(...) : Object | LogInjectionTest.java:439:116:439:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:148 |
+| LogInjectionTest.java:440:110:440:117 | source(...) : Object | LogInjectionTest.java:440:101:440:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:148 |
+| LogInjectionTest.java:441:95:441:102 | source(...) : Object | LogInjectionTest.java:441:86:441:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:148 |
+| LogInjectionTest.java:442:80:442:87 | source(...) : Object | LogInjectionTest.java:442:71:442:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:148 |
+| LogInjectionTest.java:443:65:443:72 | source(...) : Object | LogInjectionTest.java:443:56:443:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:148 |
+| LogInjectionTest.java:444:50:444:57 | source(...) : Object | LogInjectionTest.java:444:41:444:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:148 |
+| LogInjectionTest.java:445:35:445:42 | source(...) : Object | LogInjectionTest.java:445:26:445:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:148 |
+| LogInjectionTest.java:446:170:446:177 | source(...) : Object | LogInjectionTest.java:446:161:446:177 | (...)... | provenance | Src:MaD:537 Sink:MaD:149 |
+| LogInjectionTest.java:447:155:447:162 | source(...) : Object | LogInjectionTest.java:447:146:447:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:149 |
+| LogInjectionTest.java:448:140:448:147 | source(...) : Object | LogInjectionTest.java:448:131:448:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:149 |
+| LogInjectionTest.java:449:125:449:132 | source(...) : Object | LogInjectionTest.java:449:116:449:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:149 |
+| LogInjectionTest.java:450:110:450:117 | source(...) : Object | LogInjectionTest.java:450:101:450:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:149 |
+| LogInjectionTest.java:451:95:451:102 | source(...) : Object | LogInjectionTest.java:451:86:451:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:149 |
+| LogInjectionTest.java:452:80:452:87 | source(...) : Object | LogInjectionTest.java:452:71:452:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:149 |
+| LogInjectionTest.java:453:65:453:72 | source(...) : Object | LogInjectionTest.java:453:56:453:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:149 |
+| LogInjectionTest.java:454:50:454:57 | source(...) : Object | LogInjectionTest.java:454:41:454:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:149 |
+| LogInjectionTest.java:455:35:455:42 | source(...) : Object | LogInjectionTest.java:455:26:455:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:149 |
+| LogInjectionTest.java:456:35:456:42 | source(...) : Object | LogInjectionTest.java:456:26:456:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:141 |
+| LogInjectionTest.java:457:55:457:62 | source(...) : Object | LogInjectionTest.java:457:41:457:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:141 |
+| LogInjectionTest.java:458:35:458:42 | source(...) : Object | LogInjectionTest.java:458:26:458:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:151 |
+| LogInjectionTest.java:459:40:459:47 | source(...) : Object | LogInjectionTest.java:459:26:459:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:152 |
+| LogInjectionTest.java:460:40:460:47 | source(...) : Object | LogInjectionTest.java:460:26:460:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:153 |
+| LogInjectionTest.java:461:41:461:48 | source(...) : Object | LogInjectionTest.java:461:26:461:48 | (...)... | provenance | Src:MaD:537 Sink:MaD:154 |
+| LogInjectionTest.java:462:41:462:48 | source(...) : Object | LogInjectionTest.java:462:26:462:48 | (...)... | provenance | Src:MaD:537 Sink:MaD:155 |
+| LogInjectionTest.java:463:56:463:63 | source(...) : Object | LogInjectionTest.java:463:41:463:63 | (...)... | provenance | Src:MaD:537 Sink:MaD:156 |
+| LogInjectionTest.java:464:56:464:63 | source(...) : Object | LogInjectionTest.java:464:41:464:63 | (...)... | provenance | Src:MaD:537 Sink:MaD:157 |
+| LogInjectionTest.java:465:51:465:58 | source(...) : Object | LogInjectionTest.java:465:41:465:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:158 |
+| LogInjectionTest.java:466:59:466:66 | source(...) : Object | LogInjectionTest.java:466:41:466:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:159 |
+| LogInjectionTest.java:467:59:467:66 | source(...) : Object | LogInjectionTest.java:467:41:467:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:160 |
+| LogInjectionTest.java:469:50:469:57 | source(...) : Object | LogInjectionTest.java:469:41:469:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:161 |
+| LogInjectionTest.java:470:50:470:57 | source(...) : Object | LogInjectionTest.java:470:41:470:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:171 |
+| LogInjectionTest.java:471:56:471:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:471:56:471:78 | new Object[] | provenance | Sink:MaD:171 |
+| LogInjectionTest.java:471:70:471:77 | source(...) : Object | LogInjectionTest.java:471:56:471:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:472:65:472:72 | source(...) : Object | LogInjectionTest.java:472:56:472:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:162 |
+| LogInjectionTest.java:473:50:473:57 | source(...) : Object | LogInjectionTest.java:473:41:473:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:162 |
+| LogInjectionTest.java:474:80:474:87 | source(...) : Object | LogInjectionTest.java:474:71:474:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:163 |
+| LogInjectionTest.java:475:65:475:72 | source(...) : Object | LogInjectionTest.java:475:56:475:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:163 |
+| LogInjectionTest.java:476:50:476:57 | source(...) : Object | LogInjectionTest.java:476:41:476:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:163 |
+| LogInjectionTest.java:477:95:477:102 | source(...) : Object | LogInjectionTest.java:477:86:477:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:164 |
+| LogInjectionTest.java:478:80:478:87 | source(...) : Object | LogInjectionTest.java:478:71:478:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:164 |
+| LogInjectionTest.java:479:65:479:72 | source(...) : Object | LogInjectionTest.java:479:56:479:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:164 |
+| LogInjectionTest.java:480:50:480:57 | source(...) : Object | LogInjectionTest.java:480:41:480:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:164 |
+| LogInjectionTest.java:481:110:481:117 | source(...) : Object | LogInjectionTest.java:481:101:481:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:165 |
+| LogInjectionTest.java:482:95:482:102 | source(...) : Object | LogInjectionTest.java:482:86:482:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:165 |
+| LogInjectionTest.java:483:80:483:87 | source(...) : Object | LogInjectionTest.java:483:71:483:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:165 |
+| LogInjectionTest.java:484:65:484:72 | source(...) : Object | LogInjectionTest.java:484:56:484:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:165 |
+| LogInjectionTest.java:485:50:485:57 | source(...) : Object | LogInjectionTest.java:485:41:485:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:165 |
+| LogInjectionTest.java:486:125:486:132 | source(...) : Object | LogInjectionTest.java:486:116:486:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:166 |
+| LogInjectionTest.java:487:110:487:117 | source(...) : Object | LogInjectionTest.java:487:101:487:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:166 |
+| LogInjectionTest.java:488:95:488:102 | source(...) : Object | LogInjectionTest.java:488:86:488:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:166 |
+| LogInjectionTest.java:489:80:489:87 | source(...) : Object | LogInjectionTest.java:489:71:489:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:166 |
+| LogInjectionTest.java:490:65:490:72 | source(...) : Object | LogInjectionTest.java:490:56:490:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:166 |
+| LogInjectionTest.java:491:50:491:57 | source(...) : Object | LogInjectionTest.java:491:41:491:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:166 |
+| LogInjectionTest.java:492:140:492:147 | source(...) : Object | LogInjectionTest.java:492:131:492:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:167 |
+| LogInjectionTest.java:493:125:493:132 | source(...) : Object | LogInjectionTest.java:493:116:493:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:167 |
+| LogInjectionTest.java:494:110:494:117 | source(...) : Object | LogInjectionTest.java:494:101:494:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:167 |
+| LogInjectionTest.java:495:95:495:102 | source(...) : Object | LogInjectionTest.java:495:86:495:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:167 |
+| LogInjectionTest.java:496:80:496:87 | source(...) : Object | LogInjectionTest.java:496:71:496:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:167 |
+| LogInjectionTest.java:497:65:497:72 | source(...) : Object | LogInjectionTest.java:497:56:497:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:167 |
+| LogInjectionTest.java:498:50:498:57 | source(...) : Object | LogInjectionTest.java:498:41:498:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:167 |
+| LogInjectionTest.java:499:155:499:162 | source(...) : Object | LogInjectionTest.java:499:146:499:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:168 |
+| LogInjectionTest.java:500:140:500:147 | source(...) : Object | LogInjectionTest.java:500:131:500:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:168 |
+| LogInjectionTest.java:501:125:501:132 | source(...) : Object | LogInjectionTest.java:501:116:501:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:168 |
+| LogInjectionTest.java:502:110:502:117 | source(...) : Object | LogInjectionTest.java:502:101:502:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:168 |
+| LogInjectionTest.java:503:95:503:102 | source(...) : Object | LogInjectionTest.java:503:86:503:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:168 |
+| LogInjectionTest.java:504:80:504:87 | source(...) : Object | LogInjectionTest.java:504:71:504:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:168 |
+| LogInjectionTest.java:505:65:505:72 | source(...) : Object | LogInjectionTest.java:505:56:505:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:168 |
+| LogInjectionTest.java:506:50:506:57 | source(...) : Object | LogInjectionTest.java:506:41:506:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:168 |
+| LogInjectionTest.java:507:170:507:177 | source(...) : Object | LogInjectionTest.java:507:161:507:177 | (...)... | provenance | Src:MaD:537 Sink:MaD:169 |
+| LogInjectionTest.java:508:155:508:162 | source(...) : Object | LogInjectionTest.java:508:146:508:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:169 |
+| LogInjectionTest.java:509:140:509:147 | source(...) : Object | LogInjectionTest.java:509:131:509:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:169 |
+| LogInjectionTest.java:510:125:510:132 | source(...) : Object | LogInjectionTest.java:510:116:510:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:169 |
+| LogInjectionTest.java:511:110:511:117 | source(...) : Object | LogInjectionTest.java:511:101:511:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:169 |
+| LogInjectionTest.java:512:95:512:102 | source(...) : Object | LogInjectionTest.java:512:86:512:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:169 |
+| LogInjectionTest.java:513:80:513:87 | source(...) : Object | LogInjectionTest.java:513:71:513:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:169 |
+| LogInjectionTest.java:514:65:514:72 | source(...) : Object | LogInjectionTest.java:514:56:514:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:169 |
+| LogInjectionTest.java:515:50:515:57 | source(...) : Object | LogInjectionTest.java:515:41:515:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:169 |
+| LogInjectionTest.java:516:185:516:192 | source(...) : Object | LogInjectionTest.java:516:176:516:192 | (...)... | provenance | Src:MaD:537 Sink:MaD:170 |
+| LogInjectionTest.java:517:170:517:177 | source(...) : Object | LogInjectionTest.java:517:161:517:177 | (...)... | provenance | Src:MaD:537 Sink:MaD:170 |
+| LogInjectionTest.java:518:155:518:162 | source(...) : Object | LogInjectionTest.java:518:146:518:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:170 |
+| LogInjectionTest.java:519:140:519:147 | source(...) : Object | LogInjectionTest.java:519:131:519:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:170 |
+| LogInjectionTest.java:520:125:520:132 | source(...) : Object | LogInjectionTest.java:520:116:520:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:170 |
+| LogInjectionTest.java:521:110:521:117 | source(...) : Object | LogInjectionTest.java:521:101:521:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:170 |
+| LogInjectionTest.java:522:95:522:102 | source(...) : Object | LogInjectionTest.java:522:86:522:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:170 |
+| LogInjectionTest.java:523:80:523:87 | source(...) : Object | LogInjectionTest.java:523:71:523:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:170 |
+| LogInjectionTest.java:524:65:524:72 | source(...) : Object | LogInjectionTest.java:524:56:524:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:170 |
+| LogInjectionTest.java:525:50:525:57 | source(...) : Object | LogInjectionTest.java:525:41:525:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:170 |
+| LogInjectionTest.java:526:50:526:57 | source(...) : Object | LogInjectionTest.java:526:41:526:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:162 |
+| LogInjectionTest.java:527:70:527:77 | source(...) : Object | LogInjectionTest.java:527:56:527:77 | (...)... | provenance | Src:MaD:537 Sink:MaD:162 |
+| LogInjectionTest.java:528:50:528:57 | source(...) : Object | LogInjectionTest.java:528:41:528:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:172 |
+| LogInjectionTest.java:529:55:529:62 | source(...) : Object | LogInjectionTest.java:529:41:529:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:173 |
+| LogInjectionTest.java:530:55:530:62 | source(...) : Object | LogInjectionTest.java:530:41:530:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:174 |
+| LogInjectionTest.java:531:44:531:51 | source(...) : Object | LogInjectionTest.java:531:26:531:51 | (...)... | provenance | Src:MaD:537 Sink:MaD:177 |
+| LogInjectionTest.java:532:44:532:51 | source(...) : Object | LogInjectionTest.java:532:26:532:51 | (...)... | provenance | Src:MaD:537 Sink:MaD:178 |
+| LogInjectionTest.java:533:36:533:43 | source(...) : Object | LogInjectionTest.java:533:26:533:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:175 |
+| LogInjectionTest.java:534:36:534:43 | source(...) : Object | LogInjectionTest.java:534:26:534:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:176 |
+| LogInjectionTest.java:537:35:537:42 | source(...) : Object | LogInjectionTest.java:537:26:537:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:179 |
+| LogInjectionTest.java:538:35:538:42 | source(...) : Object | LogInjectionTest.java:538:26:538:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:189 |
+| LogInjectionTest.java:539:41:539:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:539:41:539:63 | new Object[] | provenance | Sink:MaD:189 |
+| LogInjectionTest.java:539:55:539:62 | source(...) : Object | LogInjectionTest.java:539:41:539:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:540:50:540:57 | source(...) : Object | LogInjectionTest.java:540:41:540:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:180 |
+| LogInjectionTest.java:541:35:541:42 | source(...) : Object | LogInjectionTest.java:541:26:541:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:180 |
+| LogInjectionTest.java:542:65:542:72 | source(...) : Object | LogInjectionTest.java:542:56:542:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:181 |
+| LogInjectionTest.java:543:50:543:57 | source(...) : Object | LogInjectionTest.java:543:41:543:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:181 |
+| LogInjectionTest.java:544:35:544:42 | source(...) : Object | LogInjectionTest.java:544:26:544:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:181 |
+| LogInjectionTest.java:545:80:545:87 | source(...) : Object | LogInjectionTest.java:545:71:545:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:182 |
+| LogInjectionTest.java:546:65:546:72 | source(...) : Object | LogInjectionTest.java:546:56:546:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:182 |
+| LogInjectionTest.java:547:50:547:57 | source(...) : Object | LogInjectionTest.java:547:41:547:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:182 |
+| LogInjectionTest.java:548:35:548:42 | source(...) : Object | LogInjectionTest.java:548:26:548:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:182 |
+| LogInjectionTest.java:549:95:549:102 | source(...) : Object | LogInjectionTest.java:549:86:549:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:183 |
+| LogInjectionTest.java:550:80:550:87 | source(...) : Object | LogInjectionTest.java:550:71:550:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:183 |
+| LogInjectionTest.java:551:65:551:72 | source(...) : Object | LogInjectionTest.java:551:56:551:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:183 |
+| LogInjectionTest.java:552:50:552:57 | source(...) : Object | LogInjectionTest.java:552:41:552:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:183 |
+| LogInjectionTest.java:553:35:553:42 | source(...) : Object | LogInjectionTest.java:553:26:553:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:183 |
+| LogInjectionTest.java:554:110:554:117 | source(...) : Object | LogInjectionTest.java:554:101:554:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:184 |
+| LogInjectionTest.java:555:95:555:102 | source(...) : Object | LogInjectionTest.java:555:86:555:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:184 |
+| LogInjectionTest.java:556:80:556:87 | source(...) : Object | LogInjectionTest.java:556:71:556:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:184 |
+| LogInjectionTest.java:557:65:557:72 | source(...) : Object | LogInjectionTest.java:557:56:557:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:184 |
+| LogInjectionTest.java:558:50:558:57 | source(...) : Object | LogInjectionTest.java:558:41:558:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:184 |
+| LogInjectionTest.java:559:35:559:42 | source(...) : Object | LogInjectionTest.java:559:26:559:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:184 |
+| LogInjectionTest.java:560:125:560:132 | source(...) : Object | LogInjectionTest.java:560:116:560:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:185 |
+| LogInjectionTest.java:561:110:561:117 | source(...) : Object | LogInjectionTest.java:561:101:561:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:185 |
+| LogInjectionTest.java:562:95:562:102 | source(...) : Object | LogInjectionTest.java:562:86:562:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:185 |
+| LogInjectionTest.java:563:80:563:87 | source(...) : Object | LogInjectionTest.java:563:71:563:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:185 |
+| LogInjectionTest.java:564:65:564:72 | source(...) : Object | LogInjectionTest.java:564:56:564:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:185 |
+| LogInjectionTest.java:565:50:565:57 | source(...) : Object | LogInjectionTest.java:565:41:565:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:185 |
+| LogInjectionTest.java:566:35:566:42 | source(...) : Object | LogInjectionTest.java:566:26:566:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:185 |
+| LogInjectionTest.java:567:140:567:147 | source(...) : Object | LogInjectionTest.java:567:131:567:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:186 |
+| LogInjectionTest.java:568:125:568:132 | source(...) : Object | LogInjectionTest.java:568:116:568:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:186 |
+| LogInjectionTest.java:569:110:569:117 | source(...) : Object | LogInjectionTest.java:569:101:569:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:186 |
+| LogInjectionTest.java:570:95:570:102 | source(...) : Object | LogInjectionTest.java:570:86:570:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:186 |
+| LogInjectionTest.java:571:80:571:87 | source(...) : Object | LogInjectionTest.java:571:71:571:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:186 |
+| LogInjectionTest.java:572:65:572:72 | source(...) : Object | LogInjectionTest.java:572:56:572:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:186 |
+| LogInjectionTest.java:573:50:573:57 | source(...) : Object | LogInjectionTest.java:573:41:573:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:186 |
+| LogInjectionTest.java:574:35:574:42 | source(...) : Object | LogInjectionTest.java:574:26:574:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:186 |
+| LogInjectionTest.java:575:155:575:162 | source(...) : Object | LogInjectionTest.java:575:146:575:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:187 |
+| LogInjectionTest.java:576:140:576:147 | source(...) : Object | LogInjectionTest.java:576:131:576:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:187 |
+| LogInjectionTest.java:577:125:577:132 | source(...) : Object | LogInjectionTest.java:577:116:577:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:187 |
+| LogInjectionTest.java:578:110:578:117 | source(...) : Object | LogInjectionTest.java:578:101:578:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:187 |
+| LogInjectionTest.java:579:95:579:102 | source(...) : Object | LogInjectionTest.java:579:86:579:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:187 |
+| LogInjectionTest.java:580:80:580:87 | source(...) : Object | LogInjectionTest.java:580:71:580:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:187 |
+| LogInjectionTest.java:581:65:581:72 | source(...) : Object | LogInjectionTest.java:581:56:581:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:187 |
+| LogInjectionTest.java:582:50:582:57 | source(...) : Object | LogInjectionTest.java:582:41:582:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:187 |
+| LogInjectionTest.java:583:35:583:42 | source(...) : Object | LogInjectionTest.java:583:26:583:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:187 |
+| LogInjectionTest.java:584:170:584:177 | source(...) : Object | LogInjectionTest.java:584:161:584:177 | (...)... | provenance | Src:MaD:537 Sink:MaD:188 |
+| LogInjectionTest.java:585:155:585:162 | source(...) : Object | LogInjectionTest.java:585:146:585:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:188 |
+| LogInjectionTest.java:586:140:586:147 | source(...) : Object | LogInjectionTest.java:586:131:586:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:188 |
+| LogInjectionTest.java:587:125:587:132 | source(...) : Object | LogInjectionTest.java:587:116:587:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:188 |
+| LogInjectionTest.java:588:110:588:117 | source(...) : Object | LogInjectionTest.java:588:101:588:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:188 |
+| LogInjectionTest.java:589:95:589:102 | source(...) : Object | LogInjectionTest.java:589:86:589:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:188 |
+| LogInjectionTest.java:590:80:590:87 | source(...) : Object | LogInjectionTest.java:590:71:590:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:188 |
+| LogInjectionTest.java:591:65:591:72 | source(...) : Object | LogInjectionTest.java:591:56:591:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:188 |
+| LogInjectionTest.java:592:50:592:57 | source(...) : Object | LogInjectionTest.java:592:41:592:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:188 |
+| LogInjectionTest.java:593:35:593:42 | source(...) : Object | LogInjectionTest.java:593:26:593:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:188 |
+| LogInjectionTest.java:594:35:594:42 | source(...) : Object | LogInjectionTest.java:594:26:594:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:180 |
+| LogInjectionTest.java:595:55:595:62 | source(...) : Object | LogInjectionTest.java:595:41:595:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:180 |
+| LogInjectionTest.java:596:35:596:42 | source(...) : Object | LogInjectionTest.java:596:26:596:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:190 |
+| LogInjectionTest.java:597:40:597:47 | source(...) : Object | LogInjectionTest.java:597:26:597:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:191 |
+| LogInjectionTest.java:598:40:598:47 | source(...) : Object | LogInjectionTest.java:598:26:598:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:192 |
+| LogInjectionTest.java:599:40:599:47 | source(...) : Object | LogInjectionTest.java:599:25:599:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:193 |
+| LogInjectionTest.java:600:40:600:47 | source(...) : Object | LogInjectionTest.java:600:25:600:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:194 |
+| LogInjectionTest.java:601:55:601:62 | source(...) : Object | LogInjectionTest.java:601:40:601:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:195 |
+| LogInjectionTest.java:602:55:602:62 | source(...) : Object | LogInjectionTest.java:602:40:602:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:196 |
+| LogInjectionTest.java:603:50:603:57 | source(...) : Object | LogInjectionTest.java:603:40:603:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:197 |
+| LogInjectionTest.java:604:58:604:65 | source(...) : Object | LogInjectionTest.java:604:40:604:65 | (...)... | provenance | Src:MaD:537 Sink:MaD:198 |
+| LogInjectionTest.java:605:58:605:65 | source(...) : Object | LogInjectionTest.java:605:40:605:65 | (...)... | provenance | Src:MaD:537 Sink:MaD:199 |
+| LogInjectionTest.java:607:49:607:56 | source(...) : Object | LogInjectionTest.java:607:40:607:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:200 |
+| LogInjectionTest.java:608:49:608:56 | source(...) : Object | LogInjectionTest.java:608:40:608:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:210 |
+| LogInjectionTest.java:609:55:609:77 | {...} : Object[] [[]] : Object | LogInjectionTest.java:609:55:609:77 | new Object[] | provenance | Sink:MaD:210 |
+| LogInjectionTest.java:609:69:609:76 | source(...) : Object | LogInjectionTest.java:609:55:609:77 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:610:64:610:71 | source(...) : Object | LogInjectionTest.java:610:55:610:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:201 |
+| LogInjectionTest.java:611:49:611:56 | source(...) : Object | LogInjectionTest.java:611:40:611:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:201 |
+| LogInjectionTest.java:612:79:612:86 | source(...) : Object | LogInjectionTest.java:612:70:612:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:202 |
+| LogInjectionTest.java:613:64:613:71 | source(...) : Object | LogInjectionTest.java:613:55:613:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:202 |
+| LogInjectionTest.java:614:49:614:56 | source(...) : Object | LogInjectionTest.java:614:40:614:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:202 |
+| LogInjectionTest.java:615:94:615:101 | source(...) : Object | LogInjectionTest.java:615:85:615:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:203 |
+| LogInjectionTest.java:616:79:616:86 | source(...) : Object | LogInjectionTest.java:616:70:616:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:203 |
+| LogInjectionTest.java:617:64:617:71 | source(...) : Object | LogInjectionTest.java:617:55:617:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:203 |
+| LogInjectionTest.java:618:49:618:56 | source(...) : Object | LogInjectionTest.java:618:40:618:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:203 |
+| LogInjectionTest.java:619:109:619:116 | source(...) : Object | LogInjectionTest.java:619:100:619:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:204 |
+| LogInjectionTest.java:620:94:620:101 | source(...) : Object | LogInjectionTest.java:620:85:620:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:204 |
+| LogInjectionTest.java:621:79:621:86 | source(...) : Object | LogInjectionTest.java:621:70:621:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:204 |
+| LogInjectionTest.java:622:64:622:71 | source(...) : Object | LogInjectionTest.java:622:55:622:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:204 |
+| LogInjectionTest.java:623:49:623:56 | source(...) : Object | LogInjectionTest.java:623:40:623:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:204 |
+| LogInjectionTest.java:624:124:624:131 | source(...) : Object | LogInjectionTest.java:624:115:624:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:205 |
+| LogInjectionTest.java:625:109:625:116 | source(...) : Object | LogInjectionTest.java:625:100:625:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:205 |
+| LogInjectionTest.java:626:94:626:101 | source(...) : Object | LogInjectionTest.java:626:85:626:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:205 |
+| LogInjectionTest.java:627:79:627:86 | source(...) : Object | LogInjectionTest.java:627:70:627:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:205 |
+| LogInjectionTest.java:628:64:628:71 | source(...) : Object | LogInjectionTest.java:628:55:628:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:205 |
+| LogInjectionTest.java:629:49:629:56 | source(...) : Object | LogInjectionTest.java:629:40:629:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:205 |
+| LogInjectionTest.java:630:139:630:146 | source(...) : Object | LogInjectionTest.java:630:130:630:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:206 |
+| LogInjectionTest.java:631:124:631:131 | source(...) : Object | LogInjectionTest.java:631:115:631:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:206 |
+| LogInjectionTest.java:632:109:632:116 | source(...) : Object | LogInjectionTest.java:632:100:632:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:206 |
+| LogInjectionTest.java:633:94:633:101 | source(...) : Object | LogInjectionTest.java:633:85:633:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:206 |
+| LogInjectionTest.java:634:79:634:86 | source(...) : Object | LogInjectionTest.java:634:70:634:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:206 |
+| LogInjectionTest.java:635:64:635:71 | source(...) : Object | LogInjectionTest.java:635:55:635:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:206 |
+| LogInjectionTest.java:636:49:636:56 | source(...) : Object | LogInjectionTest.java:636:40:636:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:206 |
+| LogInjectionTest.java:637:154:637:161 | source(...) : Object | LogInjectionTest.java:637:145:637:161 | (...)... | provenance | Src:MaD:537 Sink:MaD:207 |
+| LogInjectionTest.java:638:139:638:146 | source(...) : Object | LogInjectionTest.java:638:130:638:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:207 |
+| LogInjectionTest.java:639:124:639:131 | source(...) : Object | LogInjectionTest.java:639:115:639:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:207 |
+| LogInjectionTest.java:640:109:640:116 | source(...) : Object | LogInjectionTest.java:640:100:640:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:207 |
+| LogInjectionTest.java:641:94:641:101 | source(...) : Object | LogInjectionTest.java:641:85:641:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:207 |
+| LogInjectionTest.java:642:79:642:86 | source(...) : Object | LogInjectionTest.java:642:70:642:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:207 |
+| LogInjectionTest.java:643:64:643:71 | source(...) : Object | LogInjectionTest.java:643:55:643:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:207 |
+| LogInjectionTest.java:644:49:644:56 | source(...) : Object | LogInjectionTest.java:644:40:644:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:207 |
+| LogInjectionTest.java:645:169:645:176 | source(...) : Object | LogInjectionTest.java:645:160:645:176 | (...)... | provenance | Src:MaD:537 Sink:MaD:208 |
+| LogInjectionTest.java:646:154:646:161 | source(...) : Object | LogInjectionTest.java:646:145:646:161 | (...)... | provenance | Src:MaD:537 Sink:MaD:208 |
+| LogInjectionTest.java:647:139:647:146 | source(...) : Object | LogInjectionTest.java:647:130:647:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:208 |
+| LogInjectionTest.java:648:124:648:131 | source(...) : Object | LogInjectionTest.java:648:115:648:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:208 |
+| LogInjectionTest.java:649:109:649:116 | source(...) : Object | LogInjectionTest.java:649:100:649:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:208 |
+| LogInjectionTest.java:650:94:650:101 | source(...) : Object | LogInjectionTest.java:650:85:650:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:208 |
+| LogInjectionTest.java:651:79:651:86 | source(...) : Object | LogInjectionTest.java:651:70:651:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:208 |
+| LogInjectionTest.java:652:64:652:71 | source(...) : Object | LogInjectionTest.java:652:55:652:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:208 |
+| LogInjectionTest.java:653:49:653:56 | source(...) : Object | LogInjectionTest.java:653:40:653:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:208 |
+| LogInjectionTest.java:654:184:654:191 | source(...) : Object | LogInjectionTest.java:654:175:654:191 | (...)... | provenance | Src:MaD:537 Sink:MaD:209 |
+| LogInjectionTest.java:655:169:655:176 | source(...) : Object | LogInjectionTest.java:655:160:655:176 | (...)... | provenance | Src:MaD:537 Sink:MaD:209 |
+| LogInjectionTest.java:656:154:656:161 | source(...) : Object | LogInjectionTest.java:656:145:656:161 | (...)... | provenance | Src:MaD:537 Sink:MaD:209 |
+| LogInjectionTest.java:657:139:657:146 | source(...) : Object | LogInjectionTest.java:657:130:657:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:209 |
+| LogInjectionTest.java:658:124:658:131 | source(...) : Object | LogInjectionTest.java:658:115:658:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:209 |
+| LogInjectionTest.java:659:109:659:116 | source(...) : Object | LogInjectionTest.java:659:100:659:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:209 |
+| LogInjectionTest.java:660:94:660:101 | source(...) : Object | LogInjectionTest.java:660:85:660:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:209 |
+| LogInjectionTest.java:661:79:661:86 | source(...) : Object | LogInjectionTest.java:661:70:661:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:209 |
+| LogInjectionTest.java:662:64:662:71 | source(...) : Object | LogInjectionTest.java:662:55:662:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:209 |
+| LogInjectionTest.java:663:49:663:56 | source(...) : Object | LogInjectionTest.java:663:40:663:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:209 |
+| LogInjectionTest.java:664:49:664:56 | source(...) : Object | LogInjectionTest.java:664:40:664:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:201 |
+| LogInjectionTest.java:665:69:665:76 | source(...) : Object | LogInjectionTest.java:665:55:665:76 | (...)... | provenance | Src:MaD:537 Sink:MaD:201 |
+| LogInjectionTest.java:666:49:666:56 | source(...) : Object | LogInjectionTest.java:666:40:666:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:211 |
+| LogInjectionTest.java:667:54:667:61 | source(...) : Object | LogInjectionTest.java:667:40:667:61 | (...)... | provenance | Src:MaD:537 Sink:MaD:212 |
+| LogInjectionTest.java:668:54:668:61 | source(...) : Object | LogInjectionTest.java:668:40:668:61 | (...)... | provenance | Src:MaD:537 Sink:MaD:213 |
+| LogInjectionTest.java:669:43:669:50 | source(...) : Object | LogInjectionTest.java:669:25:669:50 | (...)... | provenance | Src:MaD:537 Sink:MaD:216 |
+| LogInjectionTest.java:670:43:670:50 | source(...) : Object | LogInjectionTest.java:670:25:670:50 | (...)... | provenance | Src:MaD:537 Sink:MaD:217 |
+| LogInjectionTest.java:671:35:671:42 | source(...) : Object | LogInjectionTest.java:671:25:671:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:214 |
+| LogInjectionTest.java:672:35:672:42 | source(...) : Object | LogInjectionTest.java:672:25:672:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:215 |
+| LogInjectionTest.java:675:34:675:41 | source(...) : Object | LogInjectionTest.java:675:25:675:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:218 |
+| LogInjectionTest.java:676:34:676:41 | source(...) : Object | LogInjectionTest.java:676:25:676:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:228 |
+| LogInjectionTest.java:677:40:677:62 | {...} : Object[] [[]] : Object | LogInjectionTest.java:677:40:677:62 | new Object[] | provenance | Sink:MaD:228 |
+| LogInjectionTest.java:677:54:677:61 | source(...) : Object | LogInjectionTest.java:677:40:677:62 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:678:49:678:56 | source(...) : Object | LogInjectionTest.java:678:40:678:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:219 |
+| LogInjectionTest.java:679:34:679:41 | source(...) : Object | LogInjectionTest.java:679:25:679:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:219 |
+| LogInjectionTest.java:680:64:680:71 | source(...) : Object | LogInjectionTest.java:680:55:680:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:220 |
+| LogInjectionTest.java:681:49:681:56 | source(...) : Object | LogInjectionTest.java:681:40:681:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:220 |
+| LogInjectionTest.java:682:34:682:41 | source(...) : Object | LogInjectionTest.java:682:25:682:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:220 |
+| LogInjectionTest.java:683:79:683:86 | source(...) : Object | LogInjectionTest.java:683:70:683:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:221 |
+| LogInjectionTest.java:684:64:684:71 | source(...) : Object | LogInjectionTest.java:684:55:684:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:221 |
+| LogInjectionTest.java:685:49:685:56 | source(...) : Object | LogInjectionTest.java:685:40:685:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:221 |
+| LogInjectionTest.java:686:34:686:41 | source(...) : Object | LogInjectionTest.java:686:25:686:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:221 |
+| LogInjectionTest.java:687:94:687:101 | source(...) : Object | LogInjectionTest.java:687:85:687:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:222 |
+| LogInjectionTest.java:688:79:688:86 | source(...) : Object | LogInjectionTest.java:688:70:688:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:222 |
+| LogInjectionTest.java:689:64:689:71 | source(...) : Object | LogInjectionTest.java:689:55:689:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:222 |
+| LogInjectionTest.java:690:49:690:56 | source(...) : Object | LogInjectionTest.java:690:40:690:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:222 |
+| LogInjectionTest.java:691:34:691:41 | source(...) : Object | LogInjectionTest.java:691:25:691:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:222 |
+| LogInjectionTest.java:692:109:692:116 | source(...) : Object | LogInjectionTest.java:692:100:692:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:223 |
+| LogInjectionTest.java:693:94:693:101 | source(...) : Object | LogInjectionTest.java:693:85:693:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:223 |
+| LogInjectionTest.java:694:79:694:86 | source(...) : Object | LogInjectionTest.java:694:70:694:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:223 |
+| LogInjectionTest.java:695:64:695:71 | source(...) : Object | LogInjectionTest.java:695:55:695:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:223 |
+| LogInjectionTest.java:696:49:696:56 | source(...) : Object | LogInjectionTest.java:696:40:696:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:223 |
+| LogInjectionTest.java:697:34:697:41 | source(...) : Object | LogInjectionTest.java:697:25:697:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:223 |
+| LogInjectionTest.java:698:124:698:131 | source(...) : Object | LogInjectionTest.java:698:115:698:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:224 |
+| LogInjectionTest.java:699:109:699:116 | source(...) : Object | LogInjectionTest.java:699:100:699:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:224 |
+| LogInjectionTest.java:700:94:700:101 | source(...) : Object | LogInjectionTest.java:700:85:700:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:224 |
+| LogInjectionTest.java:701:79:701:86 | source(...) : Object | LogInjectionTest.java:701:70:701:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:224 |
+| LogInjectionTest.java:702:64:702:71 | source(...) : Object | LogInjectionTest.java:702:55:702:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:224 |
+| LogInjectionTest.java:703:49:703:56 | source(...) : Object | LogInjectionTest.java:703:40:703:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:224 |
+| LogInjectionTest.java:704:34:704:41 | source(...) : Object | LogInjectionTest.java:704:25:704:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:224 |
+| LogInjectionTest.java:705:139:705:146 | source(...) : Object | LogInjectionTest.java:705:130:705:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:225 |
+| LogInjectionTest.java:706:124:706:131 | source(...) : Object | LogInjectionTest.java:706:115:706:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:225 |
+| LogInjectionTest.java:707:109:707:116 | source(...) : Object | LogInjectionTest.java:707:100:707:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:225 |
+| LogInjectionTest.java:708:94:708:101 | source(...) : Object | LogInjectionTest.java:708:85:708:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:225 |
+| LogInjectionTest.java:709:79:709:86 | source(...) : Object | LogInjectionTest.java:709:70:709:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:225 |
+| LogInjectionTest.java:710:64:710:71 | source(...) : Object | LogInjectionTest.java:710:55:710:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:225 |
+| LogInjectionTest.java:711:49:711:56 | source(...) : Object | LogInjectionTest.java:711:40:711:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:225 |
+| LogInjectionTest.java:712:34:712:41 | source(...) : Object | LogInjectionTest.java:712:25:712:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:225 |
+| LogInjectionTest.java:713:154:713:161 | source(...) : Object | LogInjectionTest.java:713:145:713:161 | (...)... | provenance | Src:MaD:537 Sink:MaD:226 |
+| LogInjectionTest.java:714:139:714:146 | source(...) : Object | LogInjectionTest.java:714:130:714:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:226 |
+| LogInjectionTest.java:715:124:715:131 | source(...) : Object | LogInjectionTest.java:715:115:715:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:226 |
+| LogInjectionTest.java:716:109:716:116 | source(...) : Object | LogInjectionTest.java:716:100:716:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:226 |
+| LogInjectionTest.java:717:94:717:101 | source(...) : Object | LogInjectionTest.java:717:85:717:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:226 |
+| LogInjectionTest.java:718:79:718:86 | source(...) : Object | LogInjectionTest.java:718:70:718:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:226 |
+| LogInjectionTest.java:719:64:719:71 | source(...) : Object | LogInjectionTest.java:719:55:719:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:226 |
+| LogInjectionTest.java:720:49:720:56 | source(...) : Object | LogInjectionTest.java:720:40:720:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:226 |
+| LogInjectionTest.java:721:34:721:41 | source(...) : Object | LogInjectionTest.java:721:25:721:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:226 |
+| LogInjectionTest.java:722:169:722:176 | source(...) : Object | LogInjectionTest.java:722:160:722:176 | (...)... | provenance | Src:MaD:537 Sink:MaD:227 |
+| LogInjectionTest.java:723:154:723:161 | source(...) : Object | LogInjectionTest.java:723:145:723:161 | (...)... | provenance | Src:MaD:537 Sink:MaD:227 |
+| LogInjectionTest.java:724:139:724:146 | source(...) : Object | LogInjectionTest.java:724:130:724:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:227 |
+| LogInjectionTest.java:725:124:725:131 | source(...) : Object | LogInjectionTest.java:725:115:725:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:227 |
+| LogInjectionTest.java:726:109:726:116 | source(...) : Object | LogInjectionTest.java:726:100:726:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:227 |
+| LogInjectionTest.java:727:94:727:101 | source(...) : Object | LogInjectionTest.java:727:85:727:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:227 |
+| LogInjectionTest.java:728:79:728:86 | source(...) : Object | LogInjectionTest.java:728:70:728:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:227 |
+| LogInjectionTest.java:729:64:729:71 | source(...) : Object | LogInjectionTest.java:729:55:729:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:227 |
+| LogInjectionTest.java:730:49:730:56 | source(...) : Object | LogInjectionTest.java:730:40:730:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:227 |
+| LogInjectionTest.java:731:34:731:41 | source(...) : Object | LogInjectionTest.java:731:25:731:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:227 |
+| LogInjectionTest.java:732:34:732:41 | source(...) : Object | LogInjectionTest.java:732:25:732:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:219 |
+| LogInjectionTest.java:733:54:733:61 | source(...) : Object | LogInjectionTest.java:733:40:733:61 | (...)... | provenance | Src:MaD:537 Sink:MaD:219 |
+| LogInjectionTest.java:734:34:734:41 | source(...) : Object | LogInjectionTest.java:734:25:734:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:229 |
+| LogInjectionTest.java:735:39:735:46 | source(...) : Object | LogInjectionTest.java:735:25:735:46 | (...)... | provenance | Src:MaD:537 Sink:MaD:230 |
+| LogInjectionTest.java:736:39:736:46 | source(...) : Object | LogInjectionTest.java:736:25:736:46 | (...)... | provenance | Src:MaD:537 Sink:MaD:231 |
+| LogInjectionTest.java:737:53:737:60 | source(...) : Object | LogInjectionTest.java:737:38:737:60 | (...)... | provenance | Src:MaD:537 Sink:MaD:232 |
+| LogInjectionTest.java:738:53:738:60 | source(...) : Object | LogInjectionTest.java:738:38:738:60 | (...)... | provenance | Src:MaD:537 Sink:MaD:233 |
+| LogInjectionTest.java:739:68:739:75 | source(...) : Object | LogInjectionTest.java:739:53:739:75 | (...)... | provenance | Src:MaD:537 Sink:MaD:234 |
+| LogInjectionTest.java:740:68:740:75 | source(...) : Object | LogInjectionTest.java:740:53:740:75 | (...)... | provenance | Src:MaD:537 Sink:MaD:235 |
+| LogInjectionTest.java:741:63:741:70 | source(...) : Object | LogInjectionTest.java:741:53:741:70 | (...)... | provenance | Src:MaD:537 Sink:MaD:236 |
+| LogInjectionTest.java:742:71:742:78 | source(...) : Object | LogInjectionTest.java:742:53:742:78 | (...)... | provenance | Src:MaD:537 Sink:MaD:237 |
+| LogInjectionTest.java:743:71:743:78 | source(...) : Object | LogInjectionTest.java:743:53:743:78 | (...)... | provenance | Src:MaD:537 Sink:MaD:238 |
+| LogInjectionTest.java:745:62:745:69 | source(...) : Object | LogInjectionTest.java:745:53:745:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:239 |
+| LogInjectionTest.java:746:62:746:69 | source(...) : Object | LogInjectionTest.java:746:53:746:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:249 |
+| LogInjectionTest.java:747:68:747:90 | {...} : Object[] [[]] : Object | LogInjectionTest.java:747:68:747:90 | new Object[] | provenance | Sink:MaD:249 |
+| LogInjectionTest.java:747:82:747:89 | source(...) : Object | LogInjectionTest.java:747:68:747:90 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:748:77:748:84 | source(...) : Object | LogInjectionTest.java:748:68:748:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:240 |
+| LogInjectionTest.java:749:62:749:69 | source(...) : Object | LogInjectionTest.java:749:53:749:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:240 |
+| LogInjectionTest.java:750:92:750:99 | source(...) : Object | LogInjectionTest.java:750:83:750:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:241 |
+| LogInjectionTest.java:751:77:751:84 | source(...) : Object | LogInjectionTest.java:751:68:751:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:241 |
+| LogInjectionTest.java:752:62:752:69 | source(...) : Object | LogInjectionTest.java:752:53:752:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:241 |
+| LogInjectionTest.java:753:107:753:114 | source(...) : Object | LogInjectionTest.java:753:98:753:114 | (...)... | provenance | Src:MaD:537 Sink:MaD:242 |
+| LogInjectionTest.java:754:92:754:99 | source(...) : Object | LogInjectionTest.java:754:83:754:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:242 |
+| LogInjectionTest.java:755:77:755:84 | source(...) : Object | LogInjectionTest.java:755:68:755:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:242 |
+| LogInjectionTest.java:756:62:756:69 | source(...) : Object | LogInjectionTest.java:756:53:756:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:242 |
+| LogInjectionTest.java:757:122:757:129 | source(...) : Object | LogInjectionTest.java:757:113:757:129 | (...)... | provenance | Src:MaD:537 Sink:MaD:243 |
+| LogInjectionTest.java:758:107:758:114 | source(...) : Object | LogInjectionTest.java:758:98:758:114 | (...)... | provenance | Src:MaD:537 Sink:MaD:243 |
+| LogInjectionTest.java:759:92:759:99 | source(...) : Object | LogInjectionTest.java:759:83:759:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:243 |
+| LogInjectionTest.java:760:77:760:84 | source(...) : Object | LogInjectionTest.java:760:68:760:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:243 |
+| LogInjectionTest.java:761:62:761:69 | source(...) : Object | LogInjectionTest.java:761:53:761:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:243 |
+| LogInjectionTest.java:762:137:762:144 | source(...) : Object | LogInjectionTest.java:762:128:762:144 | (...)... | provenance | Src:MaD:537 Sink:MaD:244 |
+| LogInjectionTest.java:763:122:763:129 | source(...) : Object | LogInjectionTest.java:763:113:763:129 | (...)... | provenance | Src:MaD:537 Sink:MaD:244 |
+| LogInjectionTest.java:764:107:764:114 | source(...) : Object | LogInjectionTest.java:764:98:764:114 | (...)... | provenance | Src:MaD:537 Sink:MaD:244 |
+| LogInjectionTest.java:765:92:765:99 | source(...) : Object | LogInjectionTest.java:765:83:765:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:244 |
+| LogInjectionTest.java:766:77:766:84 | source(...) : Object | LogInjectionTest.java:766:68:766:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:244 |
+| LogInjectionTest.java:767:62:767:69 | source(...) : Object | LogInjectionTest.java:767:53:767:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:244 |
+| LogInjectionTest.java:768:152:768:159 | source(...) : Object | LogInjectionTest.java:768:143:768:159 | (...)... | provenance | Src:MaD:537 Sink:MaD:245 |
+| LogInjectionTest.java:769:137:769:144 | source(...) : Object | LogInjectionTest.java:769:128:769:144 | (...)... | provenance | Src:MaD:537 Sink:MaD:245 |
+| LogInjectionTest.java:770:122:770:129 | source(...) : Object | LogInjectionTest.java:770:113:770:129 | (...)... | provenance | Src:MaD:537 Sink:MaD:245 |
+| LogInjectionTest.java:771:107:771:114 | source(...) : Object | LogInjectionTest.java:771:98:771:114 | (...)... | provenance | Src:MaD:537 Sink:MaD:245 |
+| LogInjectionTest.java:772:92:772:99 | source(...) : Object | LogInjectionTest.java:772:83:772:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:245 |
+| LogInjectionTest.java:773:77:773:84 | source(...) : Object | LogInjectionTest.java:773:68:773:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:245 |
+| LogInjectionTest.java:774:62:774:69 | source(...) : Object | LogInjectionTest.java:774:53:774:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:245 |
+| LogInjectionTest.java:775:167:775:174 | source(...) : Object | LogInjectionTest.java:775:158:775:174 | (...)... | provenance | Src:MaD:537 Sink:MaD:246 |
+| LogInjectionTest.java:776:152:776:159 | source(...) : Object | LogInjectionTest.java:776:143:776:159 | (...)... | provenance | Src:MaD:537 Sink:MaD:246 |
+| LogInjectionTest.java:777:137:777:144 | source(...) : Object | LogInjectionTest.java:777:128:777:144 | (...)... | provenance | Src:MaD:537 Sink:MaD:246 |
+| LogInjectionTest.java:778:122:778:129 | source(...) : Object | LogInjectionTest.java:778:113:778:129 | (...)... | provenance | Src:MaD:537 Sink:MaD:246 |
+| LogInjectionTest.java:779:107:779:114 | source(...) : Object | LogInjectionTest.java:779:98:779:114 | (...)... | provenance | Src:MaD:537 Sink:MaD:246 |
+| LogInjectionTest.java:780:92:780:99 | source(...) : Object | LogInjectionTest.java:780:83:780:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:246 |
+| LogInjectionTest.java:781:77:781:84 | source(...) : Object | LogInjectionTest.java:781:68:781:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:246 |
+| LogInjectionTest.java:782:62:782:69 | source(...) : Object | LogInjectionTest.java:782:53:782:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:246 |
+| LogInjectionTest.java:783:182:783:189 | source(...) : Object | LogInjectionTest.java:783:173:783:189 | (...)... | provenance | Src:MaD:537 Sink:MaD:247 |
+| LogInjectionTest.java:784:167:784:174 | source(...) : Object | LogInjectionTest.java:784:158:784:174 | (...)... | provenance | Src:MaD:537 Sink:MaD:247 |
+| LogInjectionTest.java:785:152:785:159 | source(...) : Object | LogInjectionTest.java:785:143:785:159 | (...)... | provenance | Src:MaD:537 Sink:MaD:247 |
+| LogInjectionTest.java:786:137:786:144 | source(...) : Object | LogInjectionTest.java:786:128:786:144 | (...)... | provenance | Src:MaD:537 Sink:MaD:247 |
+| LogInjectionTest.java:787:122:787:129 | source(...) : Object | LogInjectionTest.java:787:113:787:129 | (...)... | provenance | Src:MaD:537 Sink:MaD:247 |
+| LogInjectionTest.java:788:107:788:114 | source(...) : Object | LogInjectionTest.java:788:98:788:114 | (...)... | provenance | Src:MaD:537 Sink:MaD:247 |
+| LogInjectionTest.java:789:92:789:99 | source(...) : Object | LogInjectionTest.java:789:83:789:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:247 |
+| LogInjectionTest.java:790:77:790:84 | source(...) : Object | LogInjectionTest.java:790:68:790:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:247 |
+| LogInjectionTest.java:791:62:791:69 | source(...) : Object | LogInjectionTest.java:791:53:791:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:247 |
+| LogInjectionTest.java:792:197:792:204 | source(...) : Object | LogInjectionTest.java:792:188:792:204 | (...)... | provenance | Src:MaD:537 Sink:MaD:248 |
+| LogInjectionTest.java:793:182:793:189 | source(...) : Object | LogInjectionTest.java:793:173:793:189 | (...)... | provenance | Src:MaD:537 Sink:MaD:248 |
+| LogInjectionTest.java:794:167:794:174 | source(...) : Object | LogInjectionTest.java:794:158:794:174 | (...)... | provenance | Src:MaD:537 Sink:MaD:248 |
+| LogInjectionTest.java:795:152:795:159 | source(...) : Object | LogInjectionTest.java:795:143:795:159 | (...)... | provenance | Src:MaD:537 Sink:MaD:248 |
+| LogInjectionTest.java:796:137:796:144 | source(...) : Object | LogInjectionTest.java:796:128:796:144 | (...)... | provenance | Src:MaD:537 Sink:MaD:248 |
+| LogInjectionTest.java:797:122:797:129 | source(...) : Object | LogInjectionTest.java:797:113:797:129 | (...)... | provenance | Src:MaD:537 Sink:MaD:248 |
+| LogInjectionTest.java:798:107:798:114 | source(...) : Object | LogInjectionTest.java:798:98:798:114 | (...)... | provenance | Src:MaD:537 Sink:MaD:248 |
+| LogInjectionTest.java:799:92:799:99 | source(...) : Object | LogInjectionTest.java:799:83:799:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:248 |
+| LogInjectionTest.java:800:77:800:84 | source(...) : Object | LogInjectionTest.java:800:68:800:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:248 |
+| LogInjectionTest.java:801:62:801:69 | source(...) : Object | LogInjectionTest.java:801:53:801:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:248 |
+| LogInjectionTest.java:802:62:802:69 | source(...) : Object | LogInjectionTest.java:802:53:802:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:240 |
+| LogInjectionTest.java:803:82:803:89 | source(...) : Object | LogInjectionTest.java:803:68:803:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:240 |
+| LogInjectionTest.java:804:62:804:69 | source(...) : Object | LogInjectionTest.java:804:53:804:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:250 |
+| LogInjectionTest.java:805:67:805:74 | source(...) : Object | LogInjectionTest.java:805:53:805:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:251 |
+| LogInjectionTest.java:806:67:806:74 | source(...) : Object | LogInjectionTest.java:806:53:806:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:252 |
+| LogInjectionTest.java:807:56:807:63 | source(...) : Object | LogInjectionTest.java:807:38:807:63 | (...)... | provenance | Src:MaD:537 Sink:MaD:255 |
+| LogInjectionTest.java:808:56:808:63 | source(...) : Object | LogInjectionTest.java:808:38:808:63 | (...)... | provenance | Src:MaD:537 Sink:MaD:256 |
+| LogInjectionTest.java:809:48:809:55 | source(...) : Object | LogInjectionTest.java:809:38:809:55 | (...)... | provenance | Src:MaD:537 Sink:MaD:253 |
+| LogInjectionTest.java:810:48:810:55 | source(...) : Object | LogInjectionTest.java:810:38:810:55 | (...)... | provenance | Src:MaD:537 Sink:MaD:254 |
+| LogInjectionTest.java:813:47:813:54 | source(...) : Object | LogInjectionTest.java:813:38:813:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:257 |
+| LogInjectionTest.java:814:47:814:54 | source(...) : Object | LogInjectionTest.java:814:38:814:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:267 |
+| LogInjectionTest.java:815:53:815:75 | {...} : Object[] [[]] : Object | LogInjectionTest.java:815:53:815:75 | new Object[] | provenance | Sink:MaD:267 |
+| LogInjectionTest.java:815:67:815:74 | source(...) : Object | LogInjectionTest.java:815:53:815:75 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:816:62:816:69 | source(...) : Object | LogInjectionTest.java:816:53:816:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:258 |
+| LogInjectionTest.java:817:47:817:54 | source(...) : Object | LogInjectionTest.java:817:38:817:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:258 |
+| LogInjectionTest.java:818:77:818:84 | source(...) : Object | LogInjectionTest.java:818:68:818:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:259 |
+| LogInjectionTest.java:819:62:819:69 | source(...) : Object | LogInjectionTest.java:819:53:819:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:259 |
+| LogInjectionTest.java:820:47:820:54 | source(...) : Object | LogInjectionTest.java:820:38:820:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:259 |
+| LogInjectionTest.java:821:92:821:99 | source(...) : Object | LogInjectionTest.java:821:83:821:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:260 |
+| LogInjectionTest.java:822:77:822:84 | source(...) : Object | LogInjectionTest.java:822:68:822:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:260 |
+| LogInjectionTest.java:823:62:823:69 | source(...) : Object | LogInjectionTest.java:823:53:823:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:260 |
+| LogInjectionTest.java:824:47:824:54 | source(...) : Object | LogInjectionTest.java:824:38:824:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:260 |
+| LogInjectionTest.java:825:107:825:114 | source(...) : Object | LogInjectionTest.java:825:98:825:114 | (...)... | provenance | Src:MaD:537 Sink:MaD:261 |
+| LogInjectionTest.java:826:92:826:99 | source(...) : Object | LogInjectionTest.java:826:83:826:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:261 |
+| LogInjectionTest.java:827:77:827:84 | source(...) : Object | LogInjectionTest.java:827:68:827:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:261 |
+| LogInjectionTest.java:828:62:828:69 | source(...) : Object | LogInjectionTest.java:828:53:828:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:261 |
+| LogInjectionTest.java:829:47:829:54 | source(...) : Object | LogInjectionTest.java:829:38:829:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:261 |
+| LogInjectionTest.java:830:122:830:129 | source(...) : Object | LogInjectionTest.java:830:113:830:129 | (...)... | provenance | Src:MaD:537 Sink:MaD:262 |
+| LogInjectionTest.java:831:107:831:114 | source(...) : Object | LogInjectionTest.java:831:98:831:114 | (...)... | provenance | Src:MaD:537 Sink:MaD:262 |
+| LogInjectionTest.java:832:92:832:99 | source(...) : Object | LogInjectionTest.java:832:83:832:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:262 |
+| LogInjectionTest.java:833:77:833:84 | source(...) : Object | LogInjectionTest.java:833:68:833:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:262 |
+| LogInjectionTest.java:834:62:834:69 | source(...) : Object | LogInjectionTest.java:834:53:834:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:262 |
+| LogInjectionTest.java:835:47:835:54 | source(...) : Object | LogInjectionTest.java:835:38:835:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:262 |
+| LogInjectionTest.java:836:137:836:144 | source(...) : Object | LogInjectionTest.java:836:128:836:144 | (...)... | provenance | Src:MaD:537 Sink:MaD:263 |
+| LogInjectionTest.java:837:122:837:129 | source(...) : Object | LogInjectionTest.java:837:113:837:129 | (...)... | provenance | Src:MaD:537 Sink:MaD:263 |
+| LogInjectionTest.java:838:107:838:114 | source(...) : Object | LogInjectionTest.java:838:98:838:114 | (...)... | provenance | Src:MaD:537 Sink:MaD:263 |
+| LogInjectionTest.java:839:92:839:99 | source(...) : Object | LogInjectionTest.java:839:83:839:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:263 |
+| LogInjectionTest.java:840:77:840:84 | source(...) : Object | LogInjectionTest.java:840:68:840:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:263 |
+| LogInjectionTest.java:841:62:841:69 | source(...) : Object | LogInjectionTest.java:841:53:841:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:263 |
+| LogInjectionTest.java:842:47:842:54 | source(...) : Object | LogInjectionTest.java:842:38:842:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:263 |
+| LogInjectionTest.java:843:152:843:159 | source(...) : Object | LogInjectionTest.java:843:143:843:159 | (...)... | provenance | Src:MaD:537 Sink:MaD:264 |
+| LogInjectionTest.java:844:137:844:144 | source(...) : Object | LogInjectionTest.java:844:128:844:144 | (...)... | provenance | Src:MaD:537 Sink:MaD:264 |
+| LogInjectionTest.java:845:122:845:129 | source(...) : Object | LogInjectionTest.java:845:113:845:129 | (...)... | provenance | Src:MaD:537 Sink:MaD:264 |
+| LogInjectionTest.java:846:107:846:114 | source(...) : Object | LogInjectionTest.java:846:98:846:114 | (...)... | provenance | Src:MaD:537 Sink:MaD:264 |
+| LogInjectionTest.java:847:92:847:99 | source(...) : Object | LogInjectionTest.java:847:83:847:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:264 |
+| LogInjectionTest.java:848:77:848:84 | source(...) : Object | LogInjectionTest.java:848:68:848:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:264 |
+| LogInjectionTest.java:849:62:849:69 | source(...) : Object | LogInjectionTest.java:849:53:849:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:264 |
+| LogInjectionTest.java:850:47:850:54 | source(...) : Object | LogInjectionTest.java:850:38:850:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:264 |
+| LogInjectionTest.java:851:167:851:174 | source(...) : Object | LogInjectionTest.java:851:158:851:174 | (...)... | provenance | Src:MaD:537 Sink:MaD:265 |
+| LogInjectionTest.java:852:152:852:159 | source(...) : Object | LogInjectionTest.java:852:143:852:159 | (...)... | provenance | Src:MaD:537 Sink:MaD:265 |
+| LogInjectionTest.java:853:137:853:144 | source(...) : Object | LogInjectionTest.java:853:128:853:144 | (...)... | provenance | Src:MaD:537 Sink:MaD:265 |
+| LogInjectionTest.java:854:122:854:129 | source(...) : Object | LogInjectionTest.java:854:113:854:129 | (...)... | provenance | Src:MaD:537 Sink:MaD:265 |
+| LogInjectionTest.java:855:107:855:114 | source(...) : Object | LogInjectionTest.java:855:98:855:114 | (...)... | provenance | Src:MaD:537 Sink:MaD:265 |
+| LogInjectionTest.java:856:92:856:99 | source(...) : Object | LogInjectionTest.java:856:83:856:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:265 |
+| LogInjectionTest.java:857:77:857:84 | source(...) : Object | LogInjectionTest.java:857:68:857:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:265 |
+| LogInjectionTest.java:858:62:858:69 | source(...) : Object | LogInjectionTest.java:858:53:858:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:265 |
+| LogInjectionTest.java:859:47:859:54 | source(...) : Object | LogInjectionTest.java:859:38:859:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:265 |
+| LogInjectionTest.java:860:182:860:189 | source(...) : Object | LogInjectionTest.java:860:173:860:189 | (...)... | provenance | Src:MaD:537 Sink:MaD:266 |
+| LogInjectionTest.java:861:167:861:174 | source(...) : Object | LogInjectionTest.java:861:158:861:174 | (...)... | provenance | Src:MaD:537 Sink:MaD:266 |
+| LogInjectionTest.java:862:152:862:159 | source(...) : Object | LogInjectionTest.java:862:143:862:159 | (...)... | provenance | Src:MaD:537 Sink:MaD:266 |
+| LogInjectionTest.java:863:137:863:144 | source(...) : Object | LogInjectionTest.java:863:128:863:144 | (...)... | provenance | Src:MaD:537 Sink:MaD:266 |
+| LogInjectionTest.java:864:122:864:129 | source(...) : Object | LogInjectionTest.java:864:113:864:129 | (...)... | provenance | Src:MaD:537 Sink:MaD:266 |
+| LogInjectionTest.java:865:107:865:114 | source(...) : Object | LogInjectionTest.java:865:98:865:114 | (...)... | provenance | Src:MaD:537 Sink:MaD:266 |
+| LogInjectionTest.java:866:92:866:99 | source(...) : Object | LogInjectionTest.java:866:83:866:99 | (...)... | provenance | Src:MaD:537 Sink:MaD:266 |
+| LogInjectionTest.java:867:77:867:84 | source(...) : Object | LogInjectionTest.java:867:68:867:84 | (...)... | provenance | Src:MaD:537 Sink:MaD:266 |
+| LogInjectionTest.java:868:62:868:69 | source(...) : Object | LogInjectionTest.java:868:53:868:69 | (...)... | provenance | Src:MaD:537 Sink:MaD:266 |
+| LogInjectionTest.java:869:47:869:54 | source(...) : Object | LogInjectionTest.java:869:38:869:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:266 |
+| LogInjectionTest.java:870:47:870:54 | source(...) : Object | LogInjectionTest.java:870:38:870:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:258 |
+| LogInjectionTest.java:871:67:871:74 | source(...) : Object | LogInjectionTest.java:871:53:871:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:258 |
+| LogInjectionTest.java:872:47:872:54 | source(...) : Object | LogInjectionTest.java:872:38:872:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:268 |
+| LogInjectionTest.java:873:52:873:59 | source(...) : Object | LogInjectionTest.java:873:38:873:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:269 |
+| LogInjectionTest.java:874:52:874:59 | source(...) : Object | LogInjectionTest.java:874:38:874:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:270 |
+| LogInjectionTest.java:875:41:875:48 | source(...) : Object | LogInjectionTest.java:875:26:875:48 | (...)... | provenance | Src:MaD:537 Sink:MaD:274 |
+| LogInjectionTest.java:876:41:876:48 | source(...) : Object | LogInjectionTest.java:876:26:876:48 | (...)... | provenance | Src:MaD:537 Sink:MaD:275 |
+| LogInjectionTest.java:877:56:877:63 | source(...) : Object | LogInjectionTest.java:877:41:877:63 | (...)... | provenance | Src:MaD:537 Sink:MaD:276 |
+| LogInjectionTest.java:878:56:878:63 | source(...) : Object | LogInjectionTest.java:878:41:878:63 | (...)... | provenance | Src:MaD:537 Sink:MaD:277 |
+| LogInjectionTest.java:879:51:879:58 | source(...) : Object | LogInjectionTest.java:879:41:879:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:278 |
+| LogInjectionTest.java:880:59:880:66 | source(...) : Object | LogInjectionTest.java:880:41:880:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:279 |
+| LogInjectionTest.java:881:59:881:66 | source(...) : Object | LogInjectionTest.java:881:41:881:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:280 |
+| LogInjectionTest.java:883:50:883:57 | source(...) : Object | LogInjectionTest.java:883:41:883:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:281 |
+| LogInjectionTest.java:884:50:884:57 | source(...) : Object | LogInjectionTest.java:884:41:884:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:291 |
+| LogInjectionTest.java:885:56:885:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:885:56:885:78 | new Object[] | provenance | Sink:MaD:291 |
+| LogInjectionTest.java:885:70:885:77 | source(...) : Object | LogInjectionTest.java:885:56:885:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:886:65:886:72 | source(...) : Object | LogInjectionTest.java:886:56:886:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:282 |
+| LogInjectionTest.java:887:50:887:57 | source(...) : Object | LogInjectionTest.java:887:41:887:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:282 |
+| LogInjectionTest.java:888:80:888:87 | source(...) : Object | LogInjectionTest.java:888:71:888:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:283 |
+| LogInjectionTest.java:889:65:889:72 | source(...) : Object | LogInjectionTest.java:889:56:889:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:283 |
+| LogInjectionTest.java:890:50:890:57 | source(...) : Object | LogInjectionTest.java:890:41:890:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:283 |
+| LogInjectionTest.java:891:95:891:102 | source(...) : Object | LogInjectionTest.java:891:86:891:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:284 |
+| LogInjectionTest.java:892:80:892:87 | source(...) : Object | LogInjectionTest.java:892:71:892:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:284 |
+| LogInjectionTest.java:893:65:893:72 | source(...) : Object | LogInjectionTest.java:893:56:893:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:284 |
+| LogInjectionTest.java:894:50:894:57 | source(...) : Object | LogInjectionTest.java:894:41:894:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:284 |
+| LogInjectionTest.java:895:110:895:117 | source(...) : Object | LogInjectionTest.java:895:101:895:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:285 |
+| LogInjectionTest.java:896:95:896:102 | source(...) : Object | LogInjectionTest.java:896:86:896:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:285 |
+| LogInjectionTest.java:897:80:897:87 | source(...) : Object | LogInjectionTest.java:897:71:897:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:285 |
+| LogInjectionTest.java:898:65:898:72 | source(...) : Object | LogInjectionTest.java:898:56:898:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:285 |
+| LogInjectionTest.java:899:50:899:57 | source(...) : Object | LogInjectionTest.java:899:41:899:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:285 |
+| LogInjectionTest.java:900:125:900:132 | source(...) : Object | LogInjectionTest.java:900:116:900:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:286 |
+| LogInjectionTest.java:901:110:901:117 | source(...) : Object | LogInjectionTest.java:901:101:901:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:286 |
+| LogInjectionTest.java:902:95:902:102 | source(...) : Object | LogInjectionTest.java:902:86:902:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:286 |
+| LogInjectionTest.java:903:80:903:87 | source(...) : Object | LogInjectionTest.java:903:71:903:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:286 |
+| LogInjectionTest.java:904:65:904:72 | source(...) : Object | LogInjectionTest.java:904:56:904:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:286 |
+| LogInjectionTest.java:905:50:905:57 | source(...) : Object | LogInjectionTest.java:905:41:905:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:286 |
+| LogInjectionTest.java:906:140:906:147 | source(...) : Object | LogInjectionTest.java:906:131:906:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:287 |
+| LogInjectionTest.java:907:125:907:132 | source(...) : Object | LogInjectionTest.java:907:116:907:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:287 |
+| LogInjectionTest.java:908:110:908:117 | source(...) : Object | LogInjectionTest.java:908:101:908:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:287 |
+| LogInjectionTest.java:909:95:909:102 | source(...) : Object | LogInjectionTest.java:909:86:909:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:287 |
+| LogInjectionTest.java:910:80:910:87 | source(...) : Object | LogInjectionTest.java:910:71:910:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:287 |
+| LogInjectionTest.java:911:65:911:72 | source(...) : Object | LogInjectionTest.java:911:56:911:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:287 |
+| LogInjectionTest.java:912:50:912:57 | source(...) : Object | LogInjectionTest.java:912:41:912:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:287 |
+| LogInjectionTest.java:913:155:913:162 | source(...) : Object | LogInjectionTest.java:913:146:913:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:288 |
+| LogInjectionTest.java:914:140:914:147 | source(...) : Object | LogInjectionTest.java:914:131:914:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:288 |
+| LogInjectionTest.java:915:125:915:132 | source(...) : Object | LogInjectionTest.java:915:116:915:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:288 |
+| LogInjectionTest.java:916:110:916:117 | source(...) : Object | LogInjectionTest.java:916:101:916:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:288 |
+| LogInjectionTest.java:917:95:917:102 | source(...) : Object | LogInjectionTest.java:917:86:917:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:288 |
+| LogInjectionTest.java:918:80:918:87 | source(...) : Object | LogInjectionTest.java:918:71:918:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:288 |
+| LogInjectionTest.java:919:65:919:72 | source(...) : Object | LogInjectionTest.java:919:56:919:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:288 |
+| LogInjectionTest.java:920:50:920:57 | source(...) : Object | LogInjectionTest.java:920:41:920:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:288 |
+| LogInjectionTest.java:921:170:921:177 | source(...) : Object | LogInjectionTest.java:921:161:921:177 | (...)... | provenance | Src:MaD:537 Sink:MaD:289 |
+| LogInjectionTest.java:922:155:922:162 | source(...) : Object | LogInjectionTest.java:922:146:922:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:289 |
+| LogInjectionTest.java:923:140:923:147 | source(...) : Object | LogInjectionTest.java:923:131:923:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:289 |
+| LogInjectionTest.java:924:125:924:132 | source(...) : Object | LogInjectionTest.java:924:116:924:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:289 |
+| LogInjectionTest.java:925:110:925:117 | source(...) : Object | LogInjectionTest.java:925:101:925:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:289 |
+| LogInjectionTest.java:926:95:926:102 | source(...) : Object | LogInjectionTest.java:926:86:926:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:289 |
+| LogInjectionTest.java:927:80:927:87 | source(...) : Object | LogInjectionTest.java:927:71:927:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:289 |
+| LogInjectionTest.java:928:65:928:72 | source(...) : Object | LogInjectionTest.java:928:56:928:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:289 |
+| LogInjectionTest.java:929:50:929:57 | source(...) : Object | LogInjectionTest.java:929:41:929:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:289 |
+| LogInjectionTest.java:930:185:930:192 | source(...) : Object | LogInjectionTest.java:930:176:930:192 | (...)... | provenance | Src:MaD:537 Sink:MaD:290 |
+| LogInjectionTest.java:931:170:931:177 | source(...) : Object | LogInjectionTest.java:931:161:931:177 | (...)... | provenance | Src:MaD:537 Sink:MaD:290 |
+| LogInjectionTest.java:932:155:932:162 | source(...) : Object | LogInjectionTest.java:932:146:932:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:290 |
+| LogInjectionTest.java:933:140:933:147 | source(...) : Object | LogInjectionTest.java:933:131:933:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:290 |
+| LogInjectionTest.java:934:125:934:132 | source(...) : Object | LogInjectionTest.java:934:116:934:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:290 |
+| LogInjectionTest.java:935:110:935:117 | source(...) : Object | LogInjectionTest.java:935:101:935:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:290 |
+| LogInjectionTest.java:936:95:936:102 | source(...) : Object | LogInjectionTest.java:936:86:936:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:290 |
+| LogInjectionTest.java:937:80:937:87 | source(...) : Object | LogInjectionTest.java:937:71:937:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:290 |
+| LogInjectionTest.java:938:65:938:72 | source(...) : Object | LogInjectionTest.java:938:56:938:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:290 |
+| LogInjectionTest.java:939:50:939:57 | source(...) : Object | LogInjectionTest.java:939:41:939:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:290 |
+| LogInjectionTest.java:940:50:940:57 | source(...) : Object | LogInjectionTest.java:940:41:940:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:282 |
+| LogInjectionTest.java:941:70:941:77 | source(...) : Object | LogInjectionTest.java:941:56:941:77 | (...)... | provenance | Src:MaD:537 Sink:MaD:282 |
+| LogInjectionTest.java:942:50:942:57 | source(...) : Object | LogInjectionTest.java:942:41:942:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:292 |
+| LogInjectionTest.java:943:55:943:62 | source(...) : Object | LogInjectionTest.java:943:41:943:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:293 |
+| LogInjectionTest.java:944:55:944:62 | source(...) : Object | LogInjectionTest.java:944:41:944:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:294 |
+| LogInjectionTest.java:945:44:945:51 | source(...) : Object | LogInjectionTest.java:945:26:945:51 | (...)... | provenance | Src:MaD:537 Sink:MaD:297 |
+| LogInjectionTest.java:946:44:946:51 | source(...) : Object | LogInjectionTest.java:946:26:946:51 | (...)... | provenance | Src:MaD:537 Sink:MaD:298 |
+| LogInjectionTest.java:947:36:947:43 | source(...) : Object | LogInjectionTest.java:947:26:947:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:295 |
+| LogInjectionTest.java:948:36:948:43 | source(...) : Object | LogInjectionTest.java:948:26:948:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:296 |
+| LogInjectionTest.java:951:35:951:42 | source(...) : Object | LogInjectionTest.java:951:26:951:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:299 |
+| LogInjectionTest.java:952:35:952:42 | source(...) : Object | LogInjectionTest.java:952:26:952:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:309 |
+| LogInjectionTest.java:953:41:953:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:953:41:953:63 | new Object[] | provenance | Sink:MaD:309 |
+| LogInjectionTest.java:953:55:953:62 | source(...) : Object | LogInjectionTest.java:953:41:953:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:954:50:954:57 | source(...) : Object | LogInjectionTest.java:954:41:954:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:300 |
+| LogInjectionTest.java:955:35:955:42 | source(...) : Object | LogInjectionTest.java:955:26:955:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:300 |
+| LogInjectionTest.java:956:65:956:72 | source(...) : Object | LogInjectionTest.java:956:56:956:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:301 |
+| LogInjectionTest.java:957:50:957:57 | source(...) : Object | LogInjectionTest.java:957:41:957:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:301 |
+| LogInjectionTest.java:958:35:958:42 | source(...) : Object | LogInjectionTest.java:958:26:958:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:301 |
+| LogInjectionTest.java:959:80:959:87 | source(...) : Object | LogInjectionTest.java:959:71:959:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:302 |
+| LogInjectionTest.java:960:65:960:72 | source(...) : Object | LogInjectionTest.java:960:56:960:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:302 |
+| LogInjectionTest.java:961:50:961:57 | source(...) : Object | LogInjectionTest.java:961:41:961:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:302 |
+| LogInjectionTest.java:962:35:962:42 | source(...) : Object | LogInjectionTest.java:962:26:962:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:302 |
+| LogInjectionTest.java:963:95:963:102 | source(...) : Object | LogInjectionTest.java:963:86:963:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:303 |
+| LogInjectionTest.java:964:80:964:87 | source(...) : Object | LogInjectionTest.java:964:71:964:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:303 |
+| LogInjectionTest.java:965:65:965:72 | source(...) : Object | LogInjectionTest.java:965:56:965:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:303 |
+| LogInjectionTest.java:966:50:966:57 | source(...) : Object | LogInjectionTest.java:966:41:966:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:303 |
+| LogInjectionTest.java:967:35:967:42 | source(...) : Object | LogInjectionTest.java:967:26:967:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:303 |
+| LogInjectionTest.java:968:110:968:117 | source(...) : Object | LogInjectionTest.java:968:101:968:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:304 |
+| LogInjectionTest.java:969:95:969:102 | source(...) : Object | LogInjectionTest.java:969:86:969:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:304 |
+| LogInjectionTest.java:970:80:970:87 | source(...) : Object | LogInjectionTest.java:970:71:970:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:304 |
+| LogInjectionTest.java:971:65:971:72 | source(...) : Object | LogInjectionTest.java:971:56:971:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:304 |
+| LogInjectionTest.java:972:50:972:57 | source(...) : Object | LogInjectionTest.java:972:41:972:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:304 |
+| LogInjectionTest.java:973:35:973:42 | source(...) : Object | LogInjectionTest.java:973:26:973:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:304 |
+| LogInjectionTest.java:974:125:974:132 | source(...) : Object | LogInjectionTest.java:974:116:974:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:305 |
+| LogInjectionTest.java:975:110:975:117 | source(...) : Object | LogInjectionTest.java:975:101:975:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:305 |
+| LogInjectionTest.java:976:95:976:102 | source(...) : Object | LogInjectionTest.java:976:86:976:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:305 |
+| LogInjectionTest.java:977:80:977:87 | source(...) : Object | LogInjectionTest.java:977:71:977:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:305 |
+| LogInjectionTest.java:978:65:978:72 | source(...) : Object | LogInjectionTest.java:978:56:978:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:305 |
+| LogInjectionTest.java:979:50:979:57 | source(...) : Object | LogInjectionTest.java:979:41:979:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:305 |
+| LogInjectionTest.java:980:35:980:42 | source(...) : Object | LogInjectionTest.java:980:26:980:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:305 |
+| LogInjectionTest.java:981:140:981:147 | source(...) : Object | LogInjectionTest.java:981:131:981:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:306 |
+| LogInjectionTest.java:982:125:982:132 | source(...) : Object | LogInjectionTest.java:982:116:982:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:306 |
+| LogInjectionTest.java:983:110:983:117 | source(...) : Object | LogInjectionTest.java:983:101:983:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:306 |
+| LogInjectionTest.java:984:95:984:102 | source(...) : Object | LogInjectionTest.java:984:86:984:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:306 |
+| LogInjectionTest.java:985:80:985:87 | source(...) : Object | LogInjectionTest.java:985:71:985:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:306 |
+| LogInjectionTest.java:986:65:986:72 | source(...) : Object | LogInjectionTest.java:986:56:986:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:306 |
+| LogInjectionTest.java:987:50:987:57 | source(...) : Object | LogInjectionTest.java:987:41:987:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:306 |
+| LogInjectionTest.java:988:35:988:42 | source(...) : Object | LogInjectionTest.java:988:26:988:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:306 |
+| LogInjectionTest.java:989:155:989:162 | source(...) : Object | LogInjectionTest.java:989:146:989:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:307 |
+| LogInjectionTest.java:990:140:990:147 | source(...) : Object | LogInjectionTest.java:990:131:990:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:307 |
+| LogInjectionTest.java:991:125:991:132 | source(...) : Object | LogInjectionTest.java:991:116:991:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:307 |
+| LogInjectionTest.java:992:110:992:117 | source(...) : Object | LogInjectionTest.java:992:101:992:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:307 |
+| LogInjectionTest.java:993:95:993:102 | source(...) : Object | LogInjectionTest.java:993:86:993:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:307 |
+| LogInjectionTest.java:994:80:994:87 | source(...) : Object | LogInjectionTest.java:994:71:994:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:307 |
+| LogInjectionTest.java:995:65:995:72 | source(...) : Object | LogInjectionTest.java:995:56:995:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:307 |
+| LogInjectionTest.java:996:50:996:57 | source(...) : Object | LogInjectionTest.java:996:41:996:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:307 |
+| LogInjectionTest.java:997:35:997:42 | source(...) : Object | LogInjectionTest.java:997:26:997:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:307 |
+| LogInjectionTest.java:998:170:998:177 | source(...) : Object | LogInjectionTest.java:998:161:998:177 | (...)... | provenance | Src:MaD:537 Sink:MaD:308 |
+| LogInjectionTest.java:999:155:999:162 | source(...) : Object | LogInjectionTest.java:999:146:999:162 | (...)... | provenance | Src:MaD:537 Sink:MaD:308 |
+| LogInjectionTest.java:1000:140:1000:147 | source(...) : Object | LogInjectionTest.java:1000:131:1000:147 | (...)... | provenance | Src:MaD:537 Sink:MaD:308 |
+| LogInjectionTest.java:1001:125:1001:132 | source(...) : Object | LogInjectionTest.java:1001:116:1001:132 | (...)... | provenance | Src:MaD:537 Sink:MaD:308 |
+| LogInjectionTest.java:1002:110:1002:117 | source(...) : Object | LogInjectionTest.java:1002:101:1002:117 | (...)... | provenance | Src:MaD:537 Sink:MaD:308 |
+| LogInjectionTest.java:1003:95:1003:102 | source(...) : Object | LogInjectionTest.java:1003:86:1003:102 | (...)... | provenance | Src:MaD:537 Sink:MaD:308 |
+| LogInjectionTest.java:1004:80:1004:87 | source(...) : Object | LogInjectionTest.java:1004:71:1004:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:308 |
+| LogInjectionTest.java:1005:65:1005:72 | source(...) : Object | LogInjectionTest.java:1005:56:1005:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:308 |
+| LogInjectionTest.java:1006:50:1006:57 | source(...) : Object | LogInjectionTest.java:1006:41:1006:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:308 |
+| LogInjectionTest.java:1007:35:1007:42 | source(...) : Object | LogInjectionTest.java:1007:26:1007:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:308 |
+| LogInjectionTest.java:1008:35:1008:42 | source(...) : Object | LogInjectionTest.java:1008:26:1008:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:300 |
+| LogInjectionTest.java:1009:55:1009:62 | source(...) : Object | LogInjectionTest.java:1009:41:1009:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:300 |
+| LogInjectionTest.java:1010:35:1010:42 | source(...) : Object | LogInjectionTest.java:1010:26:1010:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:310 |
+| LogInjectionTest.java:1011:40:1011:47 | source(...) : Object | LogInjectionTest.java:1011:26:1011:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:311 |
+| LogInjectionTest.java:1012:40:1012:47 | source(...) : Object | LogInjectionTest.java:1012:26:1012:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:312 |
+| LogInjectionTest.java:1013:40:1013:47 | source(...) : Object | LogInjectionTest.java:1013:25:1013:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:321 |
+| LogInjectionTest.java:1014:40:1014:47 | source(...) : Object | LogInjectionTest.java:1014:25:1014:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:322 |
+| LogInjectionTest.java:1015:55:1015:62 | source(...) : Object | LogInjectionTest.java:1015:40:1015:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:323 |
+| LogInjectionTest.java:1016:55:1016:62 | source(...) : Object | LogInjectionTest.java:1016:40:1016:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:324 |
+| LogInjectionTest.java:1017:50:1017:57 | source(...) : Object | LogInjectionTest.java:1017:40:1017:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:325 |
+| LogInjectionTest.java:1018:58:1018:65 | source(...) : Object | LogInjectionTest.java:1018:40:1018:65 | (...)... | provenance | Src:MaD:537 Sink:MaD:326 |
+| LogInjectionTest.java:1019:58:1019:65 | source(...) : Object | LogInjectionTest.java:1019:40:1019:65 | (...)... | provenance | Src:MaD:537 Sink:MaD:327 |
+| LogInjectionTest.java:1021:49:1021:56 | source(...) : Object | LogInjectionTest.java:1021:40:1021:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:328 |
+| LogInjectionTest.java:1022:49:1022:56 | source(...) : Object | LogInjectionTest.java:1022:40:1022:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:338 |
+| LogInjectionTest.java:1023:55:1023:77 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1023:55:1023:77 | new Object[] | provenance | Sink:MaD:338 |
+| LogInjectionTest.java:1023:69:1023:76 | source(...) : Object | LogInjectionTest.java:1023:55:1023:77 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1024:64:1024:71 | source(...) : Object | LogInjectionTest.java:1024:55:1024:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:329 |
+| LogInjectionTest.java:1025:49:1025:56 | source(...) : Object | LogInjectionTest.java:1025:40:1025:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:329 |
+| LogInjectionTest.java:1026:79:1026:86 | source(...) : Object | LogInjectionTest.java:1026:70:1026:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:330 |
+| LogInjectionTest.java:1027:64:1027:71 | source(...) : Object | LogInjectionTest.java:1027:55:1027:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:330 |
+| LogInjectionTest.java:1028:49:1028:56 | source(...) : Object | LogInjectionTest.java:1028:40:1028:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:330 |
+| LogInjectionTest.java:1029:94:1029:101 | source(...) : Object | LogInjectionTest.java:1029:85:1029:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:331 |
+| LogInjectionTest.java:1030:79:1030:86 | source(...) : Object | LogInjectionTest.java:1030:70:1030:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:331 |
+| LogInjectionTest.java:1031:64:1031:71 | source(...) : Object | LogInjectionTest.java:1031:55:1031:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:331 |
+| LogInjectionTest.java:1032:49:1032:56 | source(...) : Object | LogInjectionTest.java:1032:40:1032:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:331 |
+| LogInjectionTest.java:1033:109:1033:116 | source(...) : Object | LogInjectionTest.java:1033:100:1033:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:332 |
+| LogInjectionTest.java:1034:94:1034:101 | source(...) : Object | LogInjectionTest.java:1034:85:1034:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:332 |
+| LogInjectionTest.java:1035:79:1035:86 | source(...) : Object | LogInjectionTest.java:1035:70:1035:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:332 |
+| LogInjectionTest.java:1036:64:1036:71 | source(...) : Object | LogInjectionTest.java:1036:55:1036:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:332 |
+| LogInjectionTest.java:1037:49:1037:56 | source(...) : Object | LogInjectionTest.java:1037:40:1037:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:332 |
+| LogInjectionTest.java:1038:124:1038:131 | source(...) : Object | LogInjectionTest.java:1038:115:1038:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:333 |
+| LogInjectionTest.java:1039:109:1039:116 | source(...) : Object | LogInjectionTest.java:1039:100:1039:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:333 |
+| LogInjectionTest.java:1040:94:1040:101 | source(...) : Object | LogInjectionTest.java:1040:85:1040:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:333 |
+| LogInjectionTest.java:1041:79:1041:86 | source(...) : Object | LogInjectionTest.java:1041:70:1041:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:333 |
+| LogInjectionTest.java:1042:64:1042:71 | source(...) : Object | LogInjectionTest.java:1042:55:1042:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:333 |
+| LogInjectionTest.java:1043:49:1043:56 | source(...) : Object | LogInjectionTest.java:1043:40:1043:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:333 |
+| LogInjectionTest.java:1044:139:1044:146 | source(...) : Object | LogInjectionTest.java:1044:130:1044:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:334 |
+| LogInjectionTest.java:1045:124:1045:131 | source(...) : Object | LogInjectionTest.java:1045:115:1045:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:334 |
+| LogInjectionTest.java:1046:109:1046:116 | source(...) : Object | LogInjectionTest.java:1046:100:1046:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:334 |
+| LogInjectionTest.java:1047:94:1047:101 | source(...) : Object | LogInjectionTest.java:1047:85:1047:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:334 |
+| LogInjectionTest.java:1048:79:1048:86 | source(...) : Object | LogInjectionTest.java:1048:70:1048:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:334 |
+| LogInjectionTest.java:1049:64:1049:71 | source(...) : Object | LogInjectionTest.java:1049:55:1049:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:334 |
+| LogInjectionTest.java:1050:49:1050:56 | source(...) : Object | LogInjectionTest.java:1050:40:1050:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:334 |
+| LogInjectionTest.java:1051:154:1051:161 | source(...) : Object | LogInjectionTest.java:1051:145:1051:161 | (...)... | provenance | Src:MaD:537 Sink:MaD:335 |
+| LogInjectionTest.java:1052:139:1052:146 | source(...) : Object | LogInjectionTest.java:1052:130:1052:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:335 |
+| LogInjectionTest.java:1053:124:1053:131 | source(...) : Object | LogInjectionTest.java:1053:115:1053:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:335 |
+| LogInjectionTest.java:1054:109:1054:116 | source(...) : Object | LogInjectionTest.java:1054:100:1054:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:335 |
+| LogInjectionTest.java:1055:94:1055:101 | source(...) : Object | LogInjectionTest.java:1055:85:1055:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:335 |
+| LogInjectionTest.java:1056:79:1056:86 | source(...) : Object | LogInjectionTest.java:1056:70:1056:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:335 |
+| LogInjectionTest.java:1057:64:1057:71 | source(...) : Object | LogInjectionTest.java:1057:55:1057:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:335 |
+| LogInjectionTest.java:1058:49:1058:56 | source(...) : Object | LogInjectionTest.java:1058:40:1058:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:335 |
+| LogInjectionTest.java:1059:169:1059:176 | source(...) : Object | LogInjectionTest.java:1059:160:1059:176 | (...)... | provenance | Src:MaD:537 Sink:MaD:336 |
+| LogInjectionTest.java:1060:154:1060:161 | source(...) : Object | LogInjectionTest.java:1060:145:1060:161 | (...)... | provenance | Src:MaD:537 Sink:MaD:336 |
+| LogInjectionTest.java:1061:139:1061:146 | source(...) : Object | LogInjectionTest.java:1061:130:1061:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:336 |
+| LogInjectionTest.java:1062:124:1062:131 | source(...) : Object | LogInjectionTest.java:1062:115:1062:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:336 |
+| LogInjectionTest.java:1063:109:1063:116 | source(...) : Object | LogInjectionTest.java:1063:100:1063:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:336 |
+| LogInjectionTest.java:1064:94:1064:101 | source(...) : Object | LogInjectionTest.java:1064:85:1064:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:336 |
+| LogInjectionTest.java:1065:79:1065:86 | source(...) : Object | LogInjectionTest.java:1065:70:1065:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:336 |
+| LogInjectionTest.java:1066:64:1066:71 | source(...) : Object | LogInjectionTest.java:1066:55:1066:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:336 |
+| LogInjectionTest.java:1067:49:1067:56 | source(...) : Object | LogInjectionTest.java:1067:40:1067:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:336 |
+| LogInjectionTest.java:1068:184:1068:191 | source(...) : Object | LogInjectionTest.java:1068:175:1068:191 | (...)... | provenance | Src:MaD:537 Sink:MaD:337 |
+| LogInjectionTest.java:1069:169:1069:176 | source(...) : Object | LogInjectionTest.java:1069:160:1069:176 | (...)... | provenance | Src:MaD:537 Sink:MaD:337 |
+| LogInjectionTest.java:1070:154:1070:161 | source(...) : Object | LogInjectionTest.java:1070:145:1070:161 | (...)... | provenance | Src:MaD:537 Sink:MaD:337 |
+| LogInjectionTest.java:1071:139:1071:146 | source(...) : Object | LogInjectionTest.java:1071:130:1071:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:337 |
+| LogInjectionTest.java:1072:124:1072:131 | source(...) : Object | LogInjectionTest.java:1072:115:1072:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:337 |
+| LogInjectionTest.java:1073:109:1073:116 | source(...) : Object | LogInjectionTest.java:1073:100:1073:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:337 |
+| LogInjectionTest.java:1074:94:1074:101 | source(...) : Object | LogInjectionTest.java:1074:85:1074:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:337 |
+| LogInjectionTest.java:1075:79:1075:86 | source(...) : Object | LogInjectionTest.java:1075:70:1075:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:337 |
+| LogInjectionTest.java:1076:64:1076:71 | source(...) : Object | LogInjectionTest.java:1076:55:1076:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:337 |
+| LogInjectionTest.java:1077:49:1077:56 | source(...) : Object | LogInjectionTest.java:1077:40:1077:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:337 |
+| LogInjectionTest.java:1078:49:1078:56 | source(...) : Object | LogInjectionTest.java:1078:40:1078:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:329 |
+| LogInjectionTest.java:1079:69:1079:76 | source(...) : Object | LogInjectionTest.java:1079:55:1079:76 | (...)... | provenance | Src:MaD:537 Sink:MaD:329 |
+| LogInjectionTest.java:1080:49:1080:56 | source(...) : Object | LogInjectionTest.java:1080:40:1080:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:339 |
+| LogInjectionTest.java:1081:54:1081:61 | source(...) : Object | LogInjectionTest.java:1081:40:1081:61 | (...)... | provenance | Src:MaD:537 Sink:MaD:340 |
+| LogInjectionTest.java:1082:54:1082:61 | source(...) : Object | LogInjectionTest.java:1082:40:1082:61 | (...)... | provenance | Src:MaD:537 Sink:MaD:341 |
+| LogInjectionTest.java:1083:43:1083:50 | source(...) : Object | LogInjectionTest.java:1083:25:1083:50 | (...)... | provenance | Src:MaD:537 Sink:MaD:344 |
+| LogInjectionTest.java:1084:43:1084:50 | source(...) : Object | LogInjectionTest.java:1084:25:1084:50 | (...)... | provenance | Src:MaD:537 Sink:MaD:345 |
+| LogInjectionTest.java:1085:35:1085:42 | source(...) : Object | LogInjectionTest.java:1085:25:1085:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:342 |
+| LogInjectionTest.java:1086:35:1086:42 | source(...) : Object | LogInjectionTest.java:1086:25:1086:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:343 |
+| LogInjectionTest.java:1089:34:1089:41 | source(...) : Object | LogInjectionTest.java:1089:25:1089:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:346 |
+| LogInjectionTest.java:1090:34:1090:41 | source(...) : Object | LogInjectionTest.java:1090:25:1090:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:356 |
+| LogInjectionTest.java:1091:40:1091:62 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1091:40:1091:62 | new Object[] | provenance | Sink:MaD:356 |
+| LogInjectionTest.java:1091:54:1091:61 | source(...) : Object | LogInjectionTest.java:1091:40:1091:62 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1092:49:1092:56 | source(...) : Object | LogInjectionTest.java:1092:40:1092:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:347 |
+| LogInjectionTest.java:1093:34:1093:41 | source(...) : Object | LogInjectionTest.java:1093:25:1093:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:347 |
+| LogInjectionTest.java:1094:64:1094:71 | source(...) : Object | LogInjectionTest.java:1094:55:1094:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:348 |
+| LogInjectionTest.java:1095:49:1095:56 | source(...) : Object | LogInjectionTest.java:1095:40:1095:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:348 |
+| LogInjectionTest.java:1096:34:1096:41 | source(...) : Object | LogInjectionTest.java:1096:25:1096:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:348 |
+| LogInjectionTest.java:1097:79:1097:86 | source(...) : Object | LogInjectionTest.java:1097:70:1097:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:349 |
+| LogInjectionTest.java:1098:64:1098:71 | source(...) : Object | LogInjectionTest.java:1098:55:1098:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:349 |
+| LogInjectionTest.java:1099:49:1099:56 | source(...) : Object | LogInjectionTest.java:1099:40:1099:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:349 |
+| LogInjectionTest.java:1100:34:1100:41 | source(...) : Object | LogInjectionTest.java:1100:25:1100:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:349 |
+| LogInjectionTest.java:1101:94:1101:101 | source(...) : Object | LogInjectionTest.java:1101:85:1101:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:350 |
+| LogInjectionTest.java:1102:79:1102:86 | source(...) : Object | LogInjectionTest.java:1102:70:1102:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:350 |
+| LogInjectionTest.java:1103:64:1103:71 | source(...) : Object | LogInjectionTest.java:1103:55:1103:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:350 |
+| LogInjectionTest.java:1104:49:1104:56 | source(...) : Object | LogInjectionTest.java:1104:40:1104:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:350 |
+| LogInjectionTest.java:1105:34:1105:41 | source(...) : Object | LogInjectionTest.java:1105:25:1105:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:350 |
+| LogInjectionTest.java:1106:109:1106:116 | source(...) : Object | LogInjectionTest.java:1106:100:1106:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:351 |
+| LogInjectionTest.java:1107:94:1107:101 | source(...) : Object | LogInjectionTest.java:1107:85:1107:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:351 |
+| LogInjectionTest.java:1108:79:1108:86 | source(...) : Object | LogInjectionTest.java:1108:70:1108:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:351 |
+| LogInjectionTest.java:1109:64:1109:71 | source(...) : Object | LogInjectionTest.java:1109:55:1109:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:351 |
+| LogInjectionTest.java:1110:49:1110:56 | source(...) : Object | LogInjectionTest.java:1110:40:1110:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:351 |
+| LogInjectionTest.java:1111:34:1111:41 | source(...) : Object | LogInjectionTest.java:1111:25:1111:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:351 |
+| LogInjectionTest.java:1112:124:1112:131 | source(...) : Object | LogInjectionTest.java:1112:115:1112:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:352 |
+| LogInjectionTest.java:1113:109:1113:116 | source(...) : Object | LogInjectionTest.java:1113:100:1113:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:352 |
+| LogInjectionTest.java:1114:94:1114:101 | source(...) : Object | LogInjectionTest.java:1114:85:1114:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:352 |
+| LogInjectionTest.java:1115:79:1115:86 | source(...) : Object | LogInjectionTest.java:1115:70:1115:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:352 |
+| LogInjectionTest.java:1116:64:1116:71 | source(...) : Object | LogInjectionTest.java:1116:55:1116:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:352 |
+| LogInjectionTest.java:1117:49:1117:56 | source(...) : Object | LogInjectionTest.java:1117:40:1117:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:352 |
+| LogInjectionTest.java:1118:34:1118:41 | source(...) : Object | LogInjectionTest.java:1118:25:1118:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:352 |
+| LogInjectionTest.java:1119:139:1119:146 | source(...) : Object | LogInjectionTest.java:1119:130:1119:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:353 |
+| LogInjectionTest.java:1120:124:1120:131 | source(...) : Object | LogInjectionTest.java:1120:115:1120:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:353 |
+| LogInjectionTest.java:1121:109:1121:116 | source(...) : Object | LogInjectionTest.java:1121:100:1121:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:353 |
+| LogInjectionTest.java:1122:94:1122:101 | source(...) : Object | LogInjectionTest.java:1122:85:1122:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:353 |
+| LogInjectionTest.java:1123:79:1123:86 | source(...) : Object | LogInjectionTest.java:1123:70:1123:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:353 |
+| LogInjectionTest.java:1124:64:1124:71 | source(...) : Object | LogInjectionTest.java:1124:55:1124:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:353 |
+| LogInjectionTest.java:1125:49:1125:56 | source(...) : Object | LogInjectionTest.java:1125:40:1125:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:353 |
+| LogInjectionTest.java:1126:34:1126:41 | source(...) : Object | LogInjectionTest.java:1126:25:1126:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:353 |
+| LogInjectionTest.java:1127:154:1127:161 | source(...) : Object | LogInjectionTest.java:1127:145:1127:161 | (...)... | provenance | Src:MaD:537 Sink:MaD:354 |
+| LogInjectionTest.java:1128:139:1128:146 | source(...) : Object | LogInjectionTest.java:1128:130:1128:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:354 |
+| LogInjectionTest.java:1129:124:1129:131 | source(...) : Object | LogInjectionTest.java:1129:115:1129:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:354 |
+| LogInjectionTest.java:1130:109:1130:116 | source(...) : Object | LogInjectionTest.java:1130:100:1130:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:354 |
+| LogInjectionTest.java:1131:94:1131:101 | source(...) : Object | LogInjectionTest.java:1131:85:1131:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:354 |
+| LogInjectionTest.java:1132:79:1132:86 | source(...) : Object | LogInjectionTest.java:1132:70:1132:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:354 |
+| LogInjectionTest.java:1133:64:1133:71 | source(...) : Object | LogInjectionTest.java:1133:55:1133:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:354 |
+| LogInjectionTest.java:1134:49:1134:56 | source(...) : Object | LogInjectionTest.java:1134:40:1134:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:354 |
+| LogInjectionTest.java:1135:34:1135:41 | source(...) : Object | LogInjectionTest.java:1135:25:1135:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:354 |
+| LogInjectionTest.java:1136:169:1136:176 | source(...) : Object | LogInjectionTest.java:1136:160:1136:176 | (...)... | provenance | Src:MaD:537 Sink:MaD:355 |
+| LogInjectionTest.java:1137:154:1137:161 | source(...) : Object | LogInjectionTest.java:1137:145:1137:161 | (...)... | provenance | Src:MaD:537 Sink:MaD:355 |
+| LogInjectionTest.java:1138:139:1138:146 | source(...) : Object | LogInjectionTest.java:1138:130:1138:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:355 |
+| LogInjectionTest.java:1139:124:1139:131 | source(...) : Object | LogInjectionTest.java:1139:115:1139:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:355 |
+| LogInjectionTest.java:1140:109:1140:116 | source(...) : Object | LogInjectionTest.java:1140:100:1140:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:355 |
+| LogInjectionTest.java:1141:94:1141:101 | source(...) : Object | LogInjectionTest.java:1141:85:1141:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:355 |
+| LogInjectionTest.java:1142:79:1142:86 | source(...) : Object | LogInjectionTest.java:1142:70:1142:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:355 |
+| LogInjectionTest.java:1143:64:1143:71 | source(...) : Object | LogInjectionTest.java:1143:55:1143:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:355 |
+| LogInjectionTest.java:1144:49:1144:56 | source(...) : Object | LogInjectionTest.java:1144:40:1144:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:355 |
+| LogInjectionTest.java:1145:34:1145:41 | source(...) : Object | LogInjectionTest.java:1145:25:1145:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:355 |
+| LogInjectionTest.java:1146:34:1146:41 | source(...) : Object | LogInjectionTest.java:1146:25:1146:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:347 |
+| LogInjectionTest.java:1147:54:1147:61 | source(...) : Object | LogInjectionTest.java:1147:40:1147:61 | (...)... | provenance | Src:MaD:537 Sink:MaD:347 |
+| LogInjectionTest.java:1148:34:1148:41 | source(...) : Object | LogInjectionTest.java:1148:25:1148:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:357 |
+| LogInjectionTest.java:1149:39:1149:46 | source(...) : Object | LogInjectionTest.java:1149:25:1149:46 | (...)... | provenance | Src:MaD:537 Sink:MaD:358 |
+| LogInjectionTest.java:1150:39:1150:46 | source(...) : Object | LogInjectionTest.java:1150:25:1150:46 | (...)... | provenance | Src:MaD:537 Sink:MaD:359 |
+| LogInjectionTest.java:1152:65:1152:72 | source(...) : Object | LogInjectionTest.java:1152:55:1152:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:271 |
+| LogInjectionTest.java:1153:48:1153:55 | source(...) : Object | LogInjectionTest.java:1153:39:1153:55 | (...)... | provenance | Src:MaD:537 Sink:MaD:272 |
+| LogInjectionTest.java:1154:45:1154:67 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1154:45:1154:67 | new Object[] | provenance | Sink:MaD:272 |
+| LogInjectionTest.java:1154:59:1154:66 | source(...) : Object | LogInjectionTest.java:1154:45:1154:67 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1155:42:1155:49 | source(...) : Object | LogInjectionTest.java:1155:33:1155:49 | (...)... | provenance | Src:MaD:537 Sink:MaD:273 |
+| LogInjectionTest.java:1156:39:1156:61 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1156:39:1156:61 | new Object[] | provenance | Sink:MaD:273 |
+| LogInjectionTest.java:1156:53:1156:60 | source(...) : Object | LogInjectionTest.java:1156:39:1156:61 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1157:41:1157:48 | source(...) : Object | LogInjectionTest.java:1157:31:1157:48 | (...)... | provenance | Src:MaD:537 Sink:MaD:313 |
+| LogInjectionTest.java:1158:40:1158:47 | source(...) : Object | LogInjectionTest.java:1158:31:1158:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:314 |
+| LogInjectionTest.java:1159:46:1159:68 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1159:46:1159:68 | new Object[] | provenance | Sink:MaD:314 |
+| LogInjectionTest.java:1159:60:1159:67 | source(...) : Object | LogInjectionTest.java:1159:46:1159:68 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1160:40:1160:47 | source(...) : Object | LogInjectionTest.java:1160:31:1160:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:315 |
+| LogInjectionTest.java:1161:46:1161:67 | (...)... : Supplier | LogInjectionTest.java:1161:13:1161:68 | new ..[] { .. } | provenance | Sink:MaD:315 |
+| LogInjectionTest.java:1161:60:1161:67 | source(...) : Object | LogInjectionTest.java:1161:46:1161:67 | (...)... : Supplier | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1162:31:1162:52 | (...)... : Supplier | LogInjectionTest.java:1162:13:1162:53 | new ..[] { .. } | provenance | Sink:MaD:316 |
+| LogInjectionTest.java:1162:45:1162:52 | source(...) : Object | LogInjectionTest.java:1162:31:1162:52 | (...)... : Supplier | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1163:45:1163:52 | source(...) : Object | LogInjectionTest.java:1163:30:1163:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:317 |
+| LogInjectionTest.java:1164:45:1164:52 | source(...) : Object | LogInjectionTest.java:1164:30:1164:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:318 |
+| LogInjectionTest.java:1166:40:1166:47 | source(...) : Object | LogInjectionTest.java:1166:30:1166:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:319 |
+| LogInjectionTest.java:1169:39:1169:46 | source(...) : Object | LogInjectionTest.java:1169:30:1169:46 | (...)... | provenance | Src:MaD:537 Sink:MaD:320 |
+| LogInjectionTest.java:1174:40:1174:47 | source(...) : Object | LogInjectionTest.java:1174:25:1174:47 | (...)... | provenance | Src:MaD:537 Sink:MaD:62 |
+| LogInjectionTest.java:1175:35:1175:42 | source(...) : Object | LogInjectionTest.java:1175:25:1175:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:63 |
+| LogInjectionTest.java:1177:34:1177:41 | source(...) : Object | LogInjectionTest.java:1177:25:1177:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:65 |
+| LogInjectionTest.java:1178:34:1178:41 | source(...) : Object | LogInjectionTest.java:1178:25:1178:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:75 |
+| LogInjectionTest.java:1179:40:1179:62 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1179:40:1179:62 | new Object[] | provenance | Sink:MaD:75 |
+| LogInjectionTest.java:1179:54:1179:61 | source(...) : Object | LogInjectionTest.java:1179:40:1179:62 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1182:49:1182:56 | source(...) : Object | LogInjectionTest.java:1182:40:1182:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:66 |
+| LogInjectionTest.java:1183:34:1183:41 | source(...) : Object | LogInjectionTest.java:1183:25:1183:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:66 |
+| LogInjectionTest.java:1184:64:1184:71 | source(...) : Object | LogInjectionTest.java:1184:55:1184:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:67 |
+| LogInjectionTest.java:1185:49:1185:56 | source(...) : Object | LogInjectionTest.java:1185:40:1185:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:67 |
+| LogInjectionTest.java:1186:34:1186:41 | source(...) : Object | LogInjectionTest.java:1186:25:1186:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:67 |
+| LogInjectionTest.java:1187:79:1187:86 | source(...) : Object | LogInjectionTest.java:1187:70:1187:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:68 |
+| LogInjectionTest.java:1188:64:1188:71 | source(...) : Object | LogInjectionTest.java:1188:55:1188:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:68 |
+| LogInjectionTest.java:1189:49:1189:56 | source(...) : Object | LogInjectionTest.java:1189:40:1189:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:68 |
+| LogInjectionTest.java:1190:34:1190:41 | source(...) : Object | LogInjectionTest.java:1190:25:1190:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:68 |
+| LogInjectionTest.java:1191:94:1191:101 | source(...) : Object | LogInjectionTest.java:1191:85:1191:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:69 |
+| LogInjectionTest.java:1192:79:1192:86 | source(...) : Object | LogInjectionTest.java:1192:70:1192:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:69 |
+| LogInjectionTest.java:1193:64:1193:71 | source(...) : Object | LogInjectionTest.java:1193:55:1193:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:69 |
+| LogInjectionTest.java:1194:49:1194:56 | source(...) : Object | LogInjectionTest.java:1194:40:1194:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:69 |
+| LogInjectionTest.java:1195:34:1195:41 | source(...) : Object | LogInjectionTest.java:1195:25:1195:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:69 |
+| LogInjectionTest.java:1196:109:1196:116 | source(...) : Object | LogInjectionTest.java:1196:100:1196:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:70 |
+| LogInjectionTest.java:1197:94:1197:101 | source(...) : Object | LogInjectionTest.java:1197:85:1197:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:70 |
+| LogInjectionTest.java:1198:79:1198:86 | source(...) : Object | LogInjectionTest.java:1198:70:1198:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:70 |
+| LogInjectionTest.java:1199:64:1199:71 | source(...) : Object | LogInjectionTest.java:1199:55:1199:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:70 |
+| LogInjectionTest.java:1200:49:1200:56 | source(...) : Object | LogInjectionTest.java:1200:40:1200:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:70 |
+| LogInjectionTest.java:1201:34:1201:41 | source(...) : Object | LogInjectionTest.java:1201:25:1201:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:70 |
+| LogInjectionTest.java:1202:124:1202:131 | source(...) : Object | LogInjectionTest.java:1202:115:1202:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:71 |
+| LogInjectionTest.java:1203:109:1203:116 | source(...) : Object | LogInjectionTest.java:1203:100:1203:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:71 |
+| LogInjectionTest.java:1204:94:1204:101 | source(...) : Object | LogInjectionTest.java:1204:85:1204:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:71 |
+| LogInjectionTest.java:1205:79:1205:86 | source(...) : Object | LogInjectionTest.java:1205:70:1205:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:71 |
+| LogInjectionTest.java:1206:64:1206:71 | source(...) : Object | LogInjectionTest.java:1206:55:1206:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:71 |
+| LogInjectionTest.java:1207:49:1207:56 | source(...) : Object | LogInjectionTest.java:1207:40:1207:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:71 |
+| LogInjectionTest.java:1208:34:1208:41 | source(...) : Object | LogInjectionTest.java:1208:25:1208:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:71 |
+| LogInjectionTest.java:1209:139:1209:146 | source(...) : Object | LogInjectionTest.java:1209:130:1209:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:72 |
+| LogInjectionTest.java:1210:124:1210:131 | source(...) : Object | LogInjectionTest.java:1210:115:1210:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:72 |
+| LogInjectionTest.java:1211:109:1211:116 | source(...) : Object | LogInjectionTest.java:1211:100:1211:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:72 |
+| LogInjectionTest.java:1212:94:1212:101 | source(...) : Object | LogInjectionTest.java:1212:85:1212:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:72 |
+| LogInjectionTest.java:1213:79:1213:86 | source(...) : Object | LogInjectionTest.java:1213:70:1213:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:72 |
+| LogInjectionTest.java:1214:64:1214:71 | source(...) : Object | LogInjectionTest.java:1214:55:1214:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:72 |
+| LogInjectionTest.java:1215:49:1215:56 | source(...) : Object | LogInjectionTest.java:1215:40:1215:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:72 |
+| LogInjectionTest.java:1216:34:1216:41 | source(...) : Object | LogInjectionTest.java:1216:25:1216:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:72 |
+| LogInjectionTest.java:1217:154:1217:161 | source(...) : Object | LogInjectionTest.java:1217:145:1217:161 | (...)... | provenance | Src:MaD:537 Sink:MaD:73 |
+| LogInjectionTest.java:1218:139:1218:146 | source(...) : Object | LogInjectionTest.java:1218:130:1218:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:73 |
+| LogInjectionTest.java:1219:124:1219:131 | source(...) : Object | LogInjectionTest.java:1219:115:1219:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:73 |
+| LogInjectionTest.java:1220:109:1220:116 | source(...) : Object | LogInjectionTest.java:1220:100:1220:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:73 |
+| LogInjectionTest.java:1221:94:1221:101 | source(...) : Object | LogInjectionTest.java:1221:85:1221:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:73 |
+| LogInjectionTest.java:1222:79:1222:86 | source(...) : Object | LogInjectionTest.java:1222:70:1222:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:73 |
+| LogInjectionTest.java:1223:64:1223:71 | source(...) : Object | LogInjectionTest.java:1223:55:1223:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:73 |
+| LogInjectionTest.java:1224:49:1224:56 | source(...) : Object | LogInjectionTest.java:1224:40:1224:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:73 |
+| LogInjectionTest.java:1225:34:1225:41 | source(...) : Object | LogInjectionTest.java:1225:25:1225:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:73 |
+| LogInjectionTest.java:1226:169:1226:176 | source(...) : Object | LogInjectionTest.java:1226:160:1226:176 | (...)... | provenance | Src:MaD:537 Sink:MaD:74 |
+| LogInjectionTest.java:1227:154:1227:161 | source(...) : Object | LogInjectionTest.java:1227:145:1227:161 | (...)... | provenance | Src:MaD:537 Sink:MaD:74 |
+| LogInjectionTest.java:1228:139:1228:146 | source(...) : Object | LogInjectionTest.java:1228:130:1228:146 | (...)... | provenance | Src:MaD:537 Sink:MaD:74 |
+| LogInjectionTest.java:1229:124:1229:131 | source(...) : Object | LogInjectionTest.java:1229:115:1229:131 | (...)... | provenance | Src:MaD:537 Sink:MaD:74 |
+| LogInjectionTest.java:1230:109:1230:116 | source(...) : Object | LogInjectionTest.java:1230:100:1230:116 | (...)... | provenance | Src:MaD:537 Sink:MaD:74 |
+| LogInjectionTest.java:1231:94:1231:101 | source(...) : Object | LogInjectionTest.java:1231:85:1231:101 | (...)... | provenance | Src:MaD:537 Sink:MaD:74 |
+| LogInjectionTest.java:1232:79:1232:86 | source(...) : Object | LogInjectionTest.java:1232:70:1232:86 | (...)... | provenance | Src:MaD:537 Sink:MaD:74 |
+| LogInjectionTest.java:1233:64:1233:71 | source(...) : Object | LogInjectionTest.java:1233:55:1233:71 | (...)... | provenance | Src:MaD:537 Sink:MaD:74 |
+| LogInjectionTest.java:1234:49:1234:56 | source(...) : Object | LogInjectionTest.java:1234:40:1234:56 | (...)... | provenance | Src:MaD:537 Sink:MaD:74 |
+| LogInjectionTest.java:1235:34:1235:41 | source(...) : Object | LogInjectionTest.java:1235:25:1235:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:74 |
+| LogInjectionTest.java:1237:34:1237:41 | source(...) : Object | LogInjectionTest.java:1237:25:1237:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:66 |
+| LogInjectionTest.java:1238:54:1238:61 | source(...) : Object | LogInjectionTest.java:1238:40:1238:61 | (...)... | provenance | Src:MaD:537 Sink:MaD:66 |
+| LogInjectionTest.java:1239:39:1239:46 | source(...) : Object | LogInjectionTest.java:1239:25:1239:46 | (...)... | provenance | Src:MaD:537 Sink:MaD:64 |
+| LogInjectionTest.java:1259:57:1259:79 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1259:57:1259:79 | new Object[] | provenance | Sink:MaD:360 |
+| LogInjectionTest.java:1259:71:1259:78 | source(...) : Object | LogInjectionTest.java:1259:57:1259:79 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1267:57:1267:79 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1267:57:1267:79 | new Object[] | provenance | Sink:MaD:369 |
+| LogInjectionTest.java:1267:71:1267:78 | source(...) : Object | LogInjectionTest.java:1267:57:1267:79 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1275:57:1275:79 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1275:57:1275:79 | new Object[] | provenance | Sink:MaD:378 |
+| LogInjectionTest.java:1275:71:1275:78 | source(...) : Object | LogInjectionTest.java:1275:57:1275:79 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1283:56:1283:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1283:56:1283:78 | new Object[] | provenance | Sink:MaD:387 |
+| LogInjectionTest.java:1283:70:1283:77 | source(...) : Object | LogInjectionTest.java:1283:56:1283:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1291:57:1291:79 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1291:57:1291:79 | new Object[] | provenance | Sink:MaD:405 |
+| LogInjectionTest.java:1291:71:1291:78 | source(...) : Object | LogInjectionTest.java:1291:57:1291:79 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1299:56:1299:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1299:56:1299:78 | new Object[] | provenance | Sink:MaD:414 |
+| LogInjectionTest.java:1299:70:1299:77 | source(...) : Object | LogInjectionTest.java:1299:56:1299:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1308:94:1308:116 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1308:94:1308:116 | new Object[] | provenance | Sink:MaD:396 |
+| LogInjectionTest.java:1308:108:1308:115 | source(...) : Object | LogInjectionTest.java:1308:94:1308:116 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1309:52:1309:59 | source(...) : Object | LogInjectionTest.java:1309:43:1309:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:361 |
+| LogInjectionTest.java:1310:37:1310:44 | source(...) : Object | LogInjectionTest.java:1310:28:1310:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:361 |
+| LogInjectionTest.java:1311:52:1311:59 | source(...) : Object | LogInjectionTest.java:1311:43:1311:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:365 |
+| LogInjectionTest.java:1312:37:1312:44 | source(...) : Object | LogInjectionTest.java:1312:28:1312:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:365 |
+| LogInjectionTest.java:1313:37:1313:44 | source(...) : Object | LogInjectionTest.java:1313:28:1313:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:364 |
+| LogInjectionTest.java:1314:37:1314:44 | source(...) : Object | LogInjectionTest.java:1314:28:1314:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:368 |
+| LogInjectionTest.java:1315:43:1315:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1315:43:1315:65 | new Object[] | provenance | Sink:MaD:364 |
+| LogInjectionTest.java:1315:57:1315:64 | source(...) : Object | LogInjectionTest.java:1315:43:1315:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1316:43:1316:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1316:43:1316:65 | new Object[] | provenance | Sink:MaD:368 |
+| LogInjectionTest.java:1316:57:1316:64 | source(...) : Object | LogInjectionTest.java:1316:43:1316:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1317:67:1317:74 | source(...) : Object | LogInjectionTest.java:1317:58:1317:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:362 |
+| LogInjectionTest.java:1318:52:1318:59 | source(...) : Object | LogInjectionTest.java:1318:43:1318:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:362 |
+| LogInjectionTest.java:1319:37:1319:44 | source(...) : Object | LogInjectionTest.java:1319:28:1319:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:362 |
+| LogInjectionTest.java:1320:67:1320:74 | source(...) : Object | LogInjectionTest.java:1320:58:1320:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:366 |
+| LogInjectionTest.java:1321:52:1321:59 | source(...) : Object | LogInjectionTest.java:1321:43:1321:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:366 |
+| LogInjectionTest.java:1322:37:1322:44 | source(...) : Object | LogInjectionTest.java:1322:28:1322:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:366 |
+| LogInjectionTest.java:1323:82:1323:89 | source(...) : Object | LogInjectionTest.java:1323:73:1323:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:363 |
+| LogInjectionTest.java:1324:67:1324:74 | source(...) : Object | LogInjectionTest.java:1324:58:1324:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:363 |
+| LogInjectionTest.java:1325:52:1325:59 | source(...) : Object | LogInjectionTest.java:1325:43:1325:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:363 |
+| LogInjectionTest.java:1326:37:1326:44 | source(...) : Object | LogInjectionTest.java:1326:28:1326:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:363 |
+| LogInjectionTest.java:1327:82:1327:89 | source(...) : Object | LogInjectionTest.java:1327:73:1327:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:367 |
+| LogInjectionTest.java:1328:67:1328:74 | source(...) : Object | LogInjectionTest.java:1328:58:1328:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:367 |
+| LogInjectionTest.java:1329:52:1329:59 | source(...) : Object | LogInjectionTest.java:1329:43:1329:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:367 |
+| LogInjectionTest.java:1330:37:1330:44 | source(...) : Object | LogInjectionTest.java:1330:28:1330:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:367 |
+| LogInjectionTest.java:1331:52:1331:59 | source(...) : Object | LogInjectionTest.java:1331:43:1331:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:370 |
+| LogInjectionTest.java:1332:37:1332:44 | source(...) : Object | LogInjectionTest.java:1332:28:1332:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:370 |
+| LogInjectionTest.java:1333:52:1333:59 | source(...) : Object | LogInjectionTest.java:1333:43:1333:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:374 |
+| LogInjectionTest.java:1334:37:1334:44 | source(...) : Object | LogInjectionTest.java:1334:28:1334:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:374 |
+| LogInjectionTest.java:1335:37:1335:44 | source(...) : Object | LogInjectionTest.java:1335:28:1335:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:373 |
+| LogInjectionTest.java:1336:37:1336:44 | source(...) : Object | LogInjectionTest.java:1336:28:1336:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:377 |
+| LogInjectionTest.java:1337:43:1337:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1337:43:1337:65 | new Object[] | provenance | Sink:MaD:373 |
+| LogInjectionTest.java:1337:57:1337:64 | source(...) : Object | LogInjectionTest.java:1337:43:1337:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1338:43:1338:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1338:43:1338:65 | new Object[] | provenance | Sink:MaD:377 |
+| LogInjectionTest.java:1338:57:1338:64 | source(...) : Object | LogInjectionTest.java:1338:43:1338:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1339:67:1339:74 | source(...) : Object | LogInjectionTest.java:1339:58:1339:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:371 |
+| LogInjectionTest.java:1340:52:1340:59 | source(...) : Object | LogInjectionTest.java:1340:43:1340:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:371 |
+| LogInjectionTest.java:1341:37:1341:44 | source(...) : Object | LogInjectionTest.java:1341:28:1341:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:371 |
+| LogInjectionTest.java:1342:67:1342:74 | source(...) : Object | LogInjectionTest.java:1342:58:1342:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:375 |
+| LogInjectionTest.java:1343:52:1343:59 | source(...) : Object | LogInjectionTest.java:1343:43:1343:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:375 |
+| LogInjectionTest.java:1344:37:1344:44 | source(...) : Object | LogInjectionTest.java:1344:28:1344:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:375 |
+| LogInjectionTest.java:1345:82:1345:89 | source(...) : Object | LogInjectionTest.java:1345:73:1345:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:372 |
+| LogInjectionTest.java:1346:67:1346:74 | source(...) : Object | LogInjectionTest.java:1346:58:1346:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:372 |
+| LogInjectionTest.java:1347:52:1347:59 | source(...) : Object | LogInjectionTest.java:1347:43:1347:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:372 |
+| LogInjectionTest.java:1348:37:1348:44 | source(...) : Object | LogInjectionTest.java:1348:28:1348:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:372 |
+| LogInjectionTest.java:1349:82:1349:89 | source(...) : Object | LogInjectionTest.java:1349:73:1349:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:376 |
+| LogInjectionTest.java:1350:67:1350:74 | source(...) : Object | LogInjectionTest.java:1350:58:1350:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:376 |
+| LogInjectionTest.java:1351:52:1351:59 | source(...) : Object | LogInjectionTest.java:1351:43:1351:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:376 |
+| LogInjectionTest.java:1352:37:1352:44 | source(...) : Object | LogInjectionTest.java:1352:28:1352:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:376 |
+| LogInjectionTest.java:1353:52:1353:59 | source(...) : Object | LogInjectionTest.java:1353:43:1353:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:379 |
+| LogInjectionTest.java:1354:37:1354:44 | source(...) : Object | LogInjectionTest.java:1354:28:1354:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:379 |
+| LogInjectionTest.java:1355:52:1355:59 | source(...) : Object | LogInjectionTest.java:1355:43:1355:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:383 |
+| LogInjectionTest.java:1356:37:1356:44 | source(...) : Object | LogInjectionTest.java:1356:28:1356:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:383 |
+| LogInjectionTest.java:1357:37:1357:44 | source(...) : Object | LogInjectionTest.java:1357:28:1357:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:382 |
+| LogInjectionTest.java:1358:37:1358:44 | source(...) : Object | LogInjectionTest.java:1358:28:1358:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:386 |
+| LogInjectionTest.java:1359:43:1359:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1359:43:1359:65 | new Object[] | provenance | Sink:MaD:382 |
+| LogInjectionTest.java:1359:57:1359:64 | source(...) : Object | LogInjectionTest.java:1359:43:1359:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1360:43:1360:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1360:43:1360:65 | new Object[] | provenance | Sink:MaD:386 |
+| LogInjectionTest.java:1360:57:1360:64 | source(...) : Object | LogInjectionTest.java:1360:43:1360:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1361:67:1361:74 | source(...) : Object | LogInjectionTest.java:1361:58:1361:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:380 |
+| LogInjectionTest.java:1362:52:1362:59 | source(...) : Object | LogInjectionTest.java:1362:43:1362:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:380 |
+| LogInjectionTest.java:1363:37:1363:44 | source(...) : Object | LogInjectionTest.java:1363:28:1363:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:380 |
+| LogInjectionTest.java:1364:67:1364:74 | source(...) : Object | LogInjectionTest.java:1364:58:1364:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:384 |
+| LogInjectionTest.java:1365:52:1365:59 | source(...) : Object | LogInjectionTest.java:1365:43:1365:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:384 |
+| LogInjectionTest.java:1366:37:1366:44 | source(...) : Object | LogInjectionTest.java:1366:28:1366:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:384 |
+| LogInjectionTest.java:1367:82:1367:89 | source(...) : Object | LogInjectionTest.java:1367:73:1367:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:381 |
+| LogInjectionTest.java:1368:67:1368:74 | source(...) : Object | LogInjectionTest.java:1368:58:1368:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:381 |
+| LogInjectionTest.java:1369:52:1369:59 | source(...) : Object | LogInjectionTest.java:1369:43:1369:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:381 |
+| LogInjectionTest.java:1370:37:1370:44 | source(...) : Object | LogInjectionTest.java:1370:28:1370:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:381 |
+| LogInjectionTest.java:1371:82:1371:89 | source(...) : Object | LogInjectionTest.java:1371:73:1371:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:385 |
+| LogInjectionTest.java:1372:67:1372:74 | source(...) : Object | LogInjectionTest.java:1372:58:1372:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:385 |
+| LogInjectionTest.java:1373:52:1373:59 | source(...) : Object | LogInjectionTest.java:1373:43:1373:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:385 |
+| LogInjectionTest.java:1374:37:1374:44 | source(...) : Object | LogInjectionTest.java:1374:28:1374:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:385 |
+| LogInjectionTest.java:1375:51:1375:58 | source(...) : Object | LogInjectionTest.java:1375:42:1375:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:388 |
+| LogInjectionTest.java:1376:36:1376:43 | source(...) : Object | LogInjectionTest.java:1376:27:1376:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:388 |
+| LogInjectionTest.java:1377:51:1377:58 | source(...) : Object | LogInjectionTest.java:1377:42:1377:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:392 |
+| LogInjectionTest.java:1378:36:1378:43 | source(...) : Object | LogInjectionTest.java:1378:27:1378:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:392 |
+| LogInjectionTest.java:1379:36:1379:43 | source(...) : Object | LogInjectionTest.java:1379:27:1379:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:391 |
+| LogInjectionTest.java:1380:36:1380:43 | source(...) : Object | LogInjectionTest.java:1380:27:1380:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:395 |
+| LogInjectionTest.java:1381:42:1381:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1381:42:1381:64 | new Object[] | provenance | Sink:MaD:391 |
+| LogInjectionTest.java:1381:56:1381:63 | source(...) : Object | LogInjectionTest.java:1381:42:1381:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1382:42:1382:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1382:42:1382:64 | new Object[] | provenance | Sink:MaD:395 |
+| LogInjectionTest.java:1382:56:1382:63 | source(...) : Object | LogInjectionTest.java:1382:42:1382:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1383:66:1383:73 | source(...) : Object | LogInjectionTest.java:1383:57:1383:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:389 |
+| LogInjectionTest.java:1384:51:1384:58 | source(...) : Object | LogInjectionTest.java:1384:42:1384:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:389 |
+| LogInjectionTest.java:1385:36:1385:43 | source(...) : Object | LogInjectionTest.java:1385:27:1385:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:389 |
+| LogInjectionTest.java:1386:66:1386:73 | source(...) : Object | LogInjectionTest.java:1386:57:1386:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:393 |
+| LogInjectionTest.java:1387:51:1387:58 | source(...) : Object | LogInjectionTest.java:1387:42:1387:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:393 |
+| LogInjectionTest.java:1388:36:1388:43 | source(...) : Object | LogInjectionTest.java:1388:27:1388:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:393 |
+| LogInjectionTest.java:1389:81:1389:88 | source(...) : Object | LogInjectionTest.java:1389:72:1389:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:390 |
+| LogInjectionTest.java:1390:66:1390:73 | source(...) : Object | LogInjectionTest.java:1390:57:1390:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:390 |
+| LogInjectionTest.java:1391:51:1391:58 | source(...) : Object | LogInjectionTest.java:1391:42:1391:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:390 |
+| LogInjectionTest.java:1392:36:1392:43 | source(...) : Object | LogInjectionTest.java:1392:27:1392:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:390 |
+| LogInjectionTest.java:1393:81:1393:88 | source(...) : Object | LogInjectionTest.java:1393:72:1393:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:394 |
+| LogInjectionTest.java:1394:66:1394:73 | source(...) : Object | LogInjectionTest.java:1394:57:1394:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:394 |
+| LogInjectionTest.java:1395:51:1395:58 | source(...) : Object | LogInjectionTest.java:1395:42:1395:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:394 |
+| LogInjectionTest.java:1396:36:1396:43 | source(...) : Object | LogInjectionTest.java:1396:27:1396:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:394 |
+| LogInjectionTest.java:1397:89:1397:96 | source(...) : Object | LogInjectionTest.java:1397:80:1397:96 | (...)... | provenance | Src:MaD:537 Sink:MaD:397 |
+| LogInjectionTest.java:1398:74:1398:81 | source(...) : Object | LogInjectionTest.java:1398:65:1398:81 | (...)... | provenance | Src:MaD:537 Sink:MaD:397 |
+| LogInjectionTest.java:1399:89:1399:96 | source(...) : Object | LogInjectionTest.java:1399:80:1399:96 | (...)... | provenance | Src:MaD:537 Sink:MaD:401 |
+| LogInjectionTest.java:1400:74:1400:81 | source(...) : Object | LogInjectionTest.java:1400:65:1400:81 | (...)... | provenance | Src:MaD:537 Sink:MaD:401 |
+| LogInjectionTest.java:1401:74:1401:81 | source(...) : Object | LogInjectionTest.java:1401:65:1401:81 | (...)... | provenance | Src:MaD:537 Sink:MaD:400 |
+| LogInjectionTest.java:1402:74:1402:81 | source(...) : Object | LogInjectionTest.java:1402:65:1402:81 | (...)... | provenance | Src:MaD:537 Sink:MaD:404 |
+| LogInjectionTest.java:1403:80:1403:102 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1403:80:1403:102 | new Object[] | provenance | Sink:MaD:400 |
+| LogInjectionTest.java:1403:94:1403:101 | source(...) : Object | LogInjectionTest.java:1403:80:1403:102 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1404:80:1404:102 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1404:80:1404:102 | new Object[] | provenance | Sink:MaD:404 |
+| LogInjectionTest.java:1404:94:1404:101 | source(...) : Object | LogInjectionTest.java:1404:80:1404:102 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1405:104:1405:111 | source(...) : Object | LogInjectionTest.java:1405:95:1405:111 | (...)... | provenance | Src:MaD:537 Sink:MaD:398 |
+| LogInjectionTest.java:1406:89:1406:96 | source(...) : Object | LogInjectionTest.java:1406:80:1406:96 | (...)... | provenance | Src:MaD:537 Sink:MaD:398 |
+| LogInjectionTest.java:1407:74:1407:81 | source(...) : Object | LogInjectionTest.java:1407:65:1407:81 | (...)... | provenance | Src:MaD:537 Sink:MaD:398 |
+| LogInjectionTest.java:1408:104:1408:111 | source(...) : Object | LogInjectionTest.java:1408:95:1408:111 | (...)... | provenance | Src:MaD:537 Sink:MaD:402 |
+| LogInjectionTest.java:1409:89:1409:96 | source(...) : Object | LogInjectionTest.java:1409:80:1409:96 | (...)... | provenance | Src:MaD:537 Sink:MaD:402 |
+| LogInjectionTest.java:1410:74:1410:81 | source(...) : Object | LogInjectionTest.java:1410:65:1410:81 | (...)... | provenance | Src:MaD:537 Sink:MaD:402 |
+| LogInjectionTest.java:1411:119:1411:126 | source(...) : Object | LogInjectionTest.java:1411:110:1411:126 | (...)... | provenance | Src:MaD:537 Sink:MaD:399 |
+| LogInjectionTest.java:1412:104:1412:111 | source(...) : Object | LogInjectionTest.java:1412:95:1412:111 | (...)... | provenance | Src:MaD:537 Sink:MaD:399 |
+| LogInjectionTest.java:1413:89:1413:96 | source(...) : Object | LogInjectionTest.java:1413:80:1413:96 | (...)... | provenance | Src:MaD:537 Sink:MaD:399 |
+| LogInjectionTest.java:1414:74:1414:81 | source(...) : Object | LogInjectionTest.java:1414:65:1414:81 | (...)... | provenance | Src:MaD:537 Sink:MaD:399 |
+| LogInjectionTest.java:1415:119:1415:126 | source(...) : Object | LogInjectionTest.java:1415:110:1415:126 | (...)... | provenance | Src:MaD:537 Sink:MaD:403 |
+| LogInjectionTest.java:1416:104:1416:111 | source(...) : Object | LogInjectionTest.java:1416:95:1416:111 | (...)... | provenance | Src:MaD:537 Sink:MaD:403 |
+| LogInjectionTest.java:1417:89:1417:96 | source(...) : Object | LogInjectionTest.java:1417:80:1417:96 | (...)... | provenance | Src:MaD:537 Sink:MaD:403 |
+| LogInjectionTest.java:1418:74:1418:81 | source(...) : Object | LogInjectionTest.java:1418:65:1418:81 | (...)... | provenance | Src:MaD:537 Sink:MaD:403 |
+| LogInjectionTest.java:1419:52:1419:59 | source(...) : Object | LogInjectionTest.java:1419:43:1419:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:406 |
+| LogInjectionTest.java:1420:37:1420:44 | source(...) : Object | LogInjectionTest.java:1420:28:1420:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:406 |
+| LogInjectionTest.java:1421:52:1421:59 | source(...) : Object | LogInjectionTest.java:1421:43:1421:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:410 |
+| LogInjectionTest.java:1422:37:1422:44 | source(...) : Object | LogInjectionTest.java:1422:28:1422:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:410 |
+| LogInjectionTest.java:1423:37:1423:44 | source(...) : Object | LogInjectionTest.java:1423:28:1423:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:409 |
+| LogInjectionTest.java:1424:37:1424:44 | source(...) : Object | LogInjectionTest.java:1424:28:1424:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:413 |
+| LogInjectionTest.java:1425:43:1425:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1425:43:1425:65 | new Object[] | provenance | Sink:MaD:409 |
+| LogInjectionTest.java:1425:57:1425:64 | source(...) : Object | LogInjectionTest.java:1425:43:1425:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1426:43:1426:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1426:43:1426:65 | new Object[] | provenance | Sink:MaD:413 |
+| LogInjectionTest.java:1426:57:1426:64 | source(...) : Object | LogInjectionTest.java:1426:43:1426:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1427:67:1427:74 | source(...) : Object | LogInjectionTest.java:1427:58:1427:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:407 |
+| LogInjectionTest.java:1428:52:1428:59 | source(...) : Object | LogInjectionTest.java:1428:43:1428:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:407 |
+| LogInjectionTest.java:1429:37:1429:44 | source(...) : Object | LogInjectionTest.java:1429:28:1429:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:407 |
+| LogInjectionTest.java:1430:67:1430:74 | source(...) : Object | LogInjectionTest.java:1430:58:1430:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:411 |
+| LogInjectionTest.java:1431:52:1431:59 | source(...) : Object | LogInjectionTest.java:1431:43:1431:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:411 |
+| LogInjectionTest.java:1432:37:1432:44 | source(...) : Object | LogInjectionTest.java:1432:28:1432:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:411 |
+| LogInjectionTest.java:1433:82:1433:89 | source(...) : Object | LogInjectionTest.java:1433:73:1433:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:408 |
+| LogInjectionTest.java:1434:67:1434:74 | source(...) : Object | LogInjectionTest.java:1434:58:1434:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:408 |
+| LogInjectionTest.java:1435:52:1435:59 | source(...) : Object | LogInjectionTest.java:1435:43:1435:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:408 |
+| LogInjectionTest.java:1436:37:1436:44 | source(...) : Object | LogInjectionTest.java:1436:28:1436:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:408 |
+| LogInjectionTest.java:1437:82:1437:89 | source(...) : Object | LogInjectionTest.java:1437:73:1437:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:412 |
+| LogInjectionTest.java:1438:67:1438:74 | source(...) : Object | LogInjectionTest.java:1438:58:1438:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:412 |
+| LogInjectionTest.java:1439:52:1439:59 | source(...) : Object | LogInjectionTest.java:1439:43:1439:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:412 |
+| LogInjectionTest.java:1440:37:1440:44 | source(...) : Object | LogInjectionTest.java:1440:28:1440:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:412 |
+| LogInjectionTest.java:1441:51:1441:58 | source(...) : Object | LogInjectionTest.java:1441:42:1441:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:415 |
+| LogInjectionTest.java:1442:36:1442:43 | source(...) : Object | LogInjectionTest.java:1442:27:1442:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:415 |
+| LogInjectionTest.java:1443:51:1443:58 | source(...) : Object | LogInjectionTest.java:1443:42:1443:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:419 |
+| LogInjectionTest.java:1444:36:1444:43 | source(...) : Object | LogInjectionTest.java:1444:27:1444:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:419 |
+| LogInjectionTest.java:1445:36:1445:43 | source(...) : Object | LogInjectionTest.java:1445:27:1445:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:418 |
+| LogInjectionTest.java:1446:36:1446:43 | source(...) : Object | LogInjectionTest.java:1446:27:1446:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:422 |
+| LogInjectionTest.java:1447:42:1447:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1447:42:1447:64 | new Object[] | provenance | Sink:MaD:418 |
+| LogInjectionTest.java:1447:56:1447:63 | source(...) : Object | LogInjectionTest.java:1447:42:1447:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1448:42:1448:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1448:42:1448:64 | new Object[] | provenance | Sink:MaD:422 |
+| LogInjectionTest.java:1448:56:1448:63 | source(...) : Object | LogInjectionTest.java:1448:42:1448:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1449:66:1449:73 | source(...) : Object | LogInjectionTest.java:1449:57:1449:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:416 |
+| LogInjectionTest.java:1450:51:1450:58 | source(...) : Object | LogInjectionTest.java:1450:42:1450:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:416 |
+| LogInjectionTest.java:1451:36:1451:43 | source(...) : Object | LogInjectionTest.java:1451:27:1451:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:416 |
+| LogInjectionTest.java:1452:66:1452:73 | source(...) : Object | LogInjectionTest.java:1452:57:1452:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:420 |
+| LogInjectionTest.java:1453:51:1453:58 | source(...) : Object | LogInjectionTest.java:1453:42:1453:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:420 |
+| LogInjectionTest.java:1454:36:1454:43 | source(...) : Object | LogInjectionTest.java:1454:27:1454:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:420 |
+| LogInjectionTest.java:1455:81:1455:88 | source(...) : Object | LogInjectionTest.java:1455:72:1455:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:417 |
+| LogInjectionTest.java:1456:66:1456:73 | source(...) : Object | LogInjectionTest.java:1456:57:1456:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:417 |
+| LogInjectionTest.java:1457:51:1457:58 | source(...) : Object | LogInjectionTest.java:1457:42:1457:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:417 |
+| LogInjectionTest.java:1458:36:1458:43 | source(...) : Object | LogInjectionTest.java:1458:27:1458:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:417 |
+| LogInjectionTest.java:1459:81:1459:88 | source(...) : Object | LogInjectionTest.java:1459:72:1459:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:421 |
+| LogInjectionTest.java:1460:66:1460:73 | source(...) : Object | LogInjectionTest.java:1460:57:1460:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:421 |
+| LogInjectionTest.java:1461:51:1461:58 | source(...) : Object | LogInjectionTest.java:1461:42:1461:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:421 |
+| LogInjectionTest.java:1462:36:1462:43 | source(...) : Object | LogInjectionTest.java:1462:27:1462:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:421 |
+| LogInjectionTest.java:1474:56:1474:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1474:56:1474:78 | new Object[] | provenance | Sink:MaD:360 |
+| LogInjectionTest.java:1474:56:1474:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1474:56:1474:78 | new Object[] | provenance | Sink:MaD:423 |
+| LogInjectionTest.java:1474:70:1474:77 | source(...) : Object | LogInjectionTest.java:1474:56:1474:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1482:56:1482:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1482:56:1482:78 | new Object[] | provenance | Sink:MaD:369 |
+| LogInjectionTest.java:1482:56:1482:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1482:56:1482:78 | new Object[] | provenance | Sink:MaD:432 |
+| LogInjectionTest.java:1482:70:1482:77 | source(...) : Object | LogInjectionTest.java:1482:56:1482:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1490:56:1490:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1490:56:1490:78 | new Object[] | provenance | Sink:MaD:378 |
+| LogInjectionTest.java:1490:56:1490:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1490:56:1490:78 | new Object[] | provenance | Sink:MaD:441 |
+| LogInjectionTest.java:1490:70:1490:77 | source(...) : Object | LogInjectionTest.java:1490:56:1490:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1498:55:1498:77 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1498:55:1498:77 | new Object[] | provenance | Sink:MaD:387 |
+| LogInjectionTest.java:1498:55:1498:77 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1498:55:1498:77 | new Object[] | provenance | Sink:MaD:450 |
+| LogInjectionTest.java:1498:69:1498:76 | source(...) : Object | LogInjectionTest.java:1498:55:1498:77 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1506:56:1506:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1506:56:1506:78 | new Object[] | provenance | Sink:MaD:405 |
+| LogInjectionTest.java:1506:56:1506:78 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1506:56:1506:78 | new Object[] | provenance | Sink:MaD:468 |
+| LogInjectionTest.java:1506:70:1506:77 | source(...) : Object | LogInjectionTest.java:1506:56:1506:78 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1514:55:1514:77 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1514:55:1514:77 | new Object[] | provenance | Sink:MaD:414 |
+| LogInjectionTest.java:1514:55:1514:77 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1514:55:1514:77 | new Object[] | provenance | Sink:MaD:477 |
+| LogInjectionTest.java:1514:69:1514:76 | source(...) : Object | LogInjectionTest.java:1514:55:1514:77 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1523:93:1523:115 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1523:93:1523:115 | new Object[] | provenance | Sink:MaD:396 |
+| LogInjectionTest.java:1523:93:1523:115 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1523:93:1523:115 | new Object[] | provenance | Sink:MaD:459 |
+| LogInjectionTest.java:1523:107:1523:114 | source(...) : Object | LogInjectionTest.java:1523:93:1523:115 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1524:51:1524:58 | source(...) : Object | LogInjectionTest.java:1524:42:1524:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:361 |
+| LogInjectionTest.java:1524:51:1524:58 | source(...) : Object | LogInjectionTest.java:1524:42:1524:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:424 |
+| LogInjectionTest.java:1525:36:1525:43 | source(...) : Object | LogInjectionTest.java:1525:27:1525:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:361 |
+| LogInjectionTest.java:1525:36:1525:43 | source(...) : Object | LogInjectionTest.java:1525:27:1525:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:424 |
+| LogInjectionTest.java:1526:51:1526:58 | source(...) : Object | LogInjectionTest.java:1526:42:1526:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:365 |
+| LogInjectionTest.java:1526:51:1526:58 | source(...) : Object | LogInjectionTest.java:1526:42:1526:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:428 |
+| LogInjectionTest.java:1527:36:1527:43 | source(...) : Object | LogInjectionTest.java:1527:27:1527:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:365 |
+| LogInjectionTest.java:1527:36:1527:43 | source(...) : Object | LogInjectionTest.java:1527:27:1527:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:428 |
+| LogInjectionTest.java:1528:36:1528:43 | source(...) : Object | LogInjectionTest.java:1528:27:1528:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:364 |
+| LogInjectionTest.java:1528:36:1528:43 | source(...) : Object | LogInjectionTest.java:1528:27:1528:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:427 |
+| LogInjectionTest.java:1529:36:1529:43 | source(...) : Object | LogInjectionTest.java:1529:27:1529:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:368 |
+| LogInjectionTest.java:1529:36:1529:43 | source(...) : Object | LogInjectionTest.java:1529:27:1529:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:431 |
+| LogInjectionTest.java:1530:42:1530:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1530:42:1530:64 | new Object[] | provenance | Sink:MaD:364 |
+| LogInjectionTest.java:1530:42:1530:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1530:42:1530:64 | new Object[] | provenance | Sink:MaD:427 |
+| LogInjectionTest.java:1530:56:1530:63 | source(...) : Object | LogInjectionTest.java:1530:42:1530:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1531:42:1531:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1531:42:1531:64 | new Object[] | provenance | Sink:MaD:368 |
+| LogInjectionTest.java:1531:42:1531:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1531:42:1531:64 | new Object[] | provenance | Sink:MaD:431 |
+| LogInjectionTest.java:1531:56:1531:63 | source(...) : Object | LogInjectionTest.java:1531:42:1531:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1532:66:1532:73 | source(...) : Object | LogInjectionTest.java:1532:57:1532:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:362 |
+| LogInjectionTest.java:1532:66:1532:73 | source(...) : Object | LogInjectionTest.java:1532:57:1532:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:425 |
+| LogInjectionTest.java:1533:51:1533:58 | source(...) : Object | LogInjectionTest.java:1533:42:1533:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:362 |
+| LogInjectionTest.java:1533:51:1533:58 | source(...) : Object | LogInjectionTest.java:1533:42:1533:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:425 |
+| LogInjectionTest.java:1534:36:1534:43 | source(...) : Object | LogInjectionTest.java:1534:27:1534:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:362 |
+| LogInjectionTest.java:1534:36:1534:43 | source(...) : Object | LogInjectionTest.java:1534:27:1534:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:425 |
+| LogInjectionTest.java:1535:66:1535:73 | source(...) : Object | LogInjectionTest.java:1535:57:1535:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:366 |
+| LogInjectionTest.java:1535:66:1535:73 | source(...) : Object | LogInjectionTest.java:1535:57:1535:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:429 |
+| LogInjectionTest.java:1536:51:1536:58 | source(...) : Object | LogInjectionTest.java:1536:42:1536:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:366 |
+| LogInjectionTest.java:1536:51:1536:58 | source(...) : Object | LogInjectionTest.java:1536:42:1536:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:429 |
+| LogInjectionTest.java:1537:36:1537:43 | source(...) : Object | LogInjectionTest.java:1537:27:1537:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:366 |
+| LogInjectionTest.java:1537:36:1537:43 | source(...) : Object | LogInjectionTest.java:1537:27:1537:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:429 |
+| LogInjectionTest.java:1538:81:1538:88 | source(...) : Object | LogInjectionTest.java:1538:72:1538:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:363 |
+| LogInjectionTest.java:1538:81:1538:88 | source(...) : Object | LogInjectionTest.java:1538:72:1538:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:426 |
+| LogInjectionTest.java:1539:66:1539:73 | source(...) : Object | LogInjectionTest.java:1539:57:1539:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:363 |
+| LogInjectionTest.java:1539:66:1539:73 | source(...) : Object | LogInjectionTest.java:1539:57:1539:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:426 |
+| LogInjectionTest.java:1540:51:1540:58 | source(...) : Object | LogInjectionTest.java:1540:42:1540:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:363 |
+| LogInjectionTest.java:1540:51:1540:58 | source(...) : Object | LogInjectionTest.java:1540:42:1540:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:426 |
+| LogInjectionTest.java:1541:36:1541:43 | source(...) : Object | LogInjectionTest.java:1541:27:1541:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:363 |
+| LogInjectionTest.java:1541:36:1541:43 | source(...) : Object | LogInjectionTest.java:1541:27:1541:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:426 |
+| LogInjectionTest.java:1542:81:1542:88 | source(...) : Object | LogInjectionTest.java:1542:72:1542:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:367 |
+| LogInjectionTest.java:1542:81:1542:88 | source(...) : Object | LogInjectionTest.java:1542:72:1542:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:430 |
+| LogInjectionTest.java:1543:66:1543:73 | source(...) : Object | LogInjectionTest.java:1543:57:1543:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:367 |
+| LogInjectionTest.java:1543:66:1543:73 | source(...) : Object | LogInjectionTest.java:1543:57:1543:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:430 |
+| LogInjectionTest.java:1544:51:1544:58 | source(...) : Object | LogInjectionTest.java:1544:42:1544:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:367 |
+| LogInjectionTest.java:1544:51:1544:58 | source(...) : Object | LogInjectionTest.java:1544:42:1544:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:430 |
+| LogInjectionTest.java:1545:36:1545:43 | source(...) : Object | LogInjectionTest.java:1545:27:1545:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:367 |
+| LogInjectionTest.java:1545:36:1545:43 | source(...) : Object | LogInjectionTest.java:1545:27:1545:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:430 |
+| LogInjectionTest.java:1546:51:1546:58 | source(...) : Object | LogInjectionTest.java:1546:42:1546:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:370 |
+| LogInjectionTest.java:1546:51:1546:58 | source(...) : Object | LogInjectionTest.java:1546:42:1546:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:433 |
+| LogInjectionTest.java:1547:36:1547:43 | source(...) : Object | LogInjectionTest.java:1547:27:1547:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:370 |
+| LogInjectionTest.java:1547:36:1547:43 | source(...) : Object | LogInjectionTest.java:1547:27:1547:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:433 |
+| LogInjectionTest.java:1548:51:1548:58 | source(...) : Object | LogInjectionTest.java:1548:42:1548:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:374 |
+| LogInjectionTest.java:1548:51:1548:58 | source(...) : Object | LogInjectionTest.java:1548:42:1548:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:437 |
+| LogInjectionTest.java:1549:36:1549:43 | source(...) : Object | LogInjectionTest.java:1549:27:1549:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:374 |
+| LogInjectionTest.java:1549:36:1549:43 | source(...) : Object | LogInjectionTest.java:1549:27:1549:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:437 |
+| LogInjectionTest.java:1550:36:1550:43 | source(...) : Object | LogInjectionTest.java:1550:27:1550:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:373 |
+| LogInjectionTest.java:1550:36:1550:43 | source(...) : Object | LogInjectionTest.java:1550:27:1550:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:436 |
+| LogInjectionTest.java:1551:36:1551:43 | source(...) : Object | LogInjectionTest.java:1551:27:1551:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:377 |
+| LogInjectionTest.java:1551:36:1551:43 | source(...) : Object | LogInjectionTest.java:1551:27:1551:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:440 |
+| LogInjectionTest.java:1552:42:1552:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1552:42:1552:64 | new Object[] | provenance | Sink:MaD:373 |
+| LogInjectionTest.java:1552:42:1552:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1552:42:1552:64 | new Object[] | provenance | Sink:MaD:436 |
+| LogInjectionTest.java:1552:56:1552:63 | source(...) : Object | LogInjectionTest.java:1552:42:1552:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1553:42:1553:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1553:42:1553:64 | new Object[] | provenance | Sink:MaD:377 |
+| LogInjectionTest.java:1553:42:1553:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1553:42:1553:64 | new Object[] | provenance | Sink:MaD:440 |
+| LogInjectionTest.java:1553:56:1553:63 | source(...) : Object | LogInjectionTest.java:1553:42:1553:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1554:66:1554:73 | source(...) : Object | LogInjectionTest.java:1554:57:1554:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:371 |
+| LogInjectionTest.java:1554:66:1554:73 | source(...) : Object | LogInjectionTest.java:1554:57:1554:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:434 |
+| LogInjectionTest.java:1555:51:1555:58 | source(...) : Object | LogInjectionTest.java:1555:42:1555:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:371 |
+| LogInjectionTest.java:1555:51:1555:58 | source(...) : Object | LogInjectionTest.java:1555:42:1555:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:434 |
+| LogInjectionTest.java:1556:36:1556:43 | source(...) : Object | LogInjectionTest.java:1556:27:1556:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:371 |
+| LogInjectionTest.java:1556:36:1556:43 | source(...) : Object | LogInjectionTest.java:1556:27:1556:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:434 |
+| LogInjectionTest.java:1557:66:1557:73 | source(...) : Object | LogInjectionTest.java:1557:57:1557:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:375 |
+| LogInjectionTest.java:1557:66:1557:73 | source(...) : Object | LogInjectionTest.java:1557:57:1557:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:438 |
+| LogInjectionTest.java:1558:51:1558:58 | source(...) : Object | LogInjectionTest.java:1558:42:1558:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:375 |
+| LogInjectionTest.java:1558:51:1558:58 | source(...) : Object | LogInjectionTest.java:1558:42:1558:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:438 |
+| LogInjectionTest.java:1559:36:1559:43 | source(...) : Object | LogInjectionTest.java:1559:27:1559:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:375 |
+| LogInjectionTest.java:1559:36:1559:43 | source(...) : Object | LogInjectionTest.java:1559:27:1559:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:438 |
+| LogInjectionTest.java:1560:81:1560:88 | source(...) : Object | LogInjectionTest.java:1560:72:1560:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:372 |
+| LogInjectionTest.java:1560:81:1560:88 | source(...) : Object | LogInjectionTest.java:1560:72:1560:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:435 |
+| LogInjectionTest.java:1561:66:1561:73 | source(...) : Object | LogInjectionTest.java:1561:57:1561:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:372 |
+| LogInjectionTest.java:1561:66:1561:73 | source(...) : Object | LogInjectionTest.java:1561:57:1561:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:435 |
+| LogInjectionTest.java:1562:51:1562:58 | source(...) : Object | LogInjectionTest.java:1562:42:1562:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:372 |
+| LogInjectionTest.java:1562:51:1562:58 | source(...) : Object | LogInjectionTest.java:1562:42:1562:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:435 |
+| LogInjectionTest.java:1563:36:1563:43 | source(...) : Object | LogInjectionTest.java:1563:27:1563:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:372 |
+| LogInjectionTest.java:1563:36:1563:43 | source(...) : Object | LogInjectionTest.java:1563:27:1563:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:435 |
+| LogInjectionTest.java:1564:81:1564:88 | source(...) : Object | LogInjectionTest.java:1564:72:1564:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:376 |
+| LogInjectionTest.java:1564:81:1564:88 | source(...) : Object | LogInjectionTest.java:1564:72:1564:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:439 |
+| LogInjectionTest.java:1565:66:1565:73 | source(...) : Object | LogInjectionTest.java:1565:57:1565:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:376 |
+| LogInjectionTest.java:1565:66:1565:73 | source(...) : Object | LogInjectionTest.java:1565:57:1565:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:439 |
+| LogInjectionTest.java:1566:51:1566:58 | source(...) : Object | LogInjectionTest.java:1566:42:1566:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:376 |
+| LogInjectionTest.java:1566:51:1566:58 | source(...) : Object | LogInjectionTest.java:1566:42:1566:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:439 |
+| LogInjectionTest.java:1567:36:1567:43 | source(...) : Object | LogInjectionTest.java:1567:27:1567:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:376 |
+| LogInjectionTest.java:1567:36:1567:43 | source(...) : Object | LogInjectionTest.java:1567:27:1567:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:439 |
+| LogInjectionTest.java:1568:51:1568:58 | source(...) : Object | LogInjectionTest.java:1568:42:1568:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:379 |
+| LogInjectionTest.java:1568:51:1568:58 | source(...) : Object | LogInjectionTest.java:1568:42:1568:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:442 |
+| LogInjectionTest.java:1569:36:1569:43 | source(...) : Object | LogInjectionTest.java:1569:27:1569:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:379 |
+| LogInjectionTest.java:1569:36:1569:43 | source(...) : Object | LogInjectionTest.java:1569:27:1569:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:442 |
+| LogInjectionTest.java:1570:51:1570:58 | source(...) : Object | LogInjectionTest.java:1570:42:1570:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:383 |
+| LogInjectionTest.java:1570:51:1570:58 | source(...) : Object | LogInjectionTest.java:1570:42:1570:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:446 |
+| LogInjectionTest.java:1571:36:1571:43 | source(...) : Object | LogInjectionTest.java:1571:27:1571:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:383 |
+| LogInjectionTest.java:1571:36:1571:43 | source(...) : Object | LogInjectionTest.java:1571:27:1571:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:446 |
+| LogInjectionTest.java:1572:36:1572:43 | source(...) : Object | LogInjectionTest.java:1572:27:1572:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:382 |
+| LogInjectionTest.java:1572:36:1572:43 | source(...) : Object | LogInjectionTest.java:1572:27:1572:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:445 |
+| LogInjectionTest.java:1573:36:1573:43 | source(...) : Object | LogInjectionTest.java:1573:27:1573:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:386 |
+| LogInjectionTest.java:1573:36:1573:43 | source(...) : Object | LogInjectionTest.java:1573:27:1573:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:449 |
+| LogInjectionTest.java:1574:42:1574:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1574:42:1574:64 | new Object[] | provenance | Sink:MaD:382 |
+| LogInjectionTest.java:1574:42:1574:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1574:42:1574:64 | new Object[] | provenance | Sink:MaD:445 |
+| LogInjectionTest.java:1574:56:1574:63 | source(...) : Object | LogInjectionTest.java:1574:42:1574:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1575:42:1575:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1575:42:1575:64 | new Object[] | provenance | Sink:MaD:386 |
+| LogInjectionTest.java:1575:42:1575:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1575:42:1575:64 | new Object[] | provenance | Sink:MaD:449 |
+| LogInjectionTest.java:1575:56:1575:63 | source(...) : Object | LogInjectionTest.java:1575:42:1575:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1576:66:1576:73 | source(...) : Object | LogInjectionTest.java:1576:57:1576:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:380 |
+| LogInjectionTest.java:1576:66:1576:73 | source(...) : Object | LogInjectionTest.java:1576:57:1576:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:443 |
+| LogInjectionTest.java:1577:51:1577:58 | source(...) : Object | LogInjectionTest.java:1577:42:1577:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:380 |
+| LogInjectionTest.java:1577:51:1577:58 | source(...) : Object | LogInjectionTest.java:1577:42:1577:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:443 |
+| LogInjectionTest.java:1578:36:1578:43 | source(...) : Object | LogInjectionTest.java:1578:27:1578:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:380 |
+| LogInjectionTest.java:1578:36:1578:43 | source(...) : Object | LogInjectionTest.java:1578:27:1578:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:443 |
+| LogInjectionTest.java:1579:66:1579:73 | source(...) : Object | LogInjectionTest.java:1579:57:1579:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:384 |
+| LogInjectionTest.java:1579:66:1579:73 | source(...) : Object | LogInjectionTest.java:1579:57:1579:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:447 |
+| LogInjectionTest.java:1580:51:1580:58 | source(...) : Object | LogInjectionTest.java:1580:42:1580:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:384 |
+| LogInjectionTest.java:1580:51:1580:58 | source(...) : Object | LogInjectionTest.java:1580:42:1580:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:447 |
+| LogInjectionTest.java:1581:36:1581:43 | source(...) : Object | LogInjectionTest.java:1581:27:1581:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:384 |
+| LogInjectionTest.java:1581:36:1581:43 | source(...) : Object | LogInjectionTest.java:1581:27:1581:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:447 |
+| LogInjectionTest.java:1582:81:1582:88 | source(...) : Object | LogInjectionTest.java:1582:72:1582:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:381 |
+| LogInjectionTest.java:1582:81:1582:88 | source(...) : Object | LogInjectionTest.java:1582:72:1582:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:444 |
+| LogInjectionTest.java:1583:66:1583:73 | source(...) : Object | LogInjectionTest.java:1583:57:1583:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:381 |
+| LogInjectionTest.java:1583:66:1583:73 | source(...) : Object | LogInjectionTest.java:1583:57:1583:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:444 |
+| LogInjectionTest.java:1584:51:1584:58 | source(...) : Object | LogInjectionTest.java:1584:42:1584:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:381 |
+| LogInjectionTest.java:1584:51:1584:58 | source(...) : Object | LogInjectionTest.java:1584:42:1584:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:444 |
+| LogInjectionTest.java:1585:36:1585:43 | source(...) : Object | LogInjectionTest.java:1585:27:1585:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:381 |
+| LogInjectionTest.java:1585:36:1585:43 | source(...) : Object | LogInjectionTest.java:1585:27:1585:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:444 |
+| LogInjectionTest.java:1586:81:1586:88 | source(...) : Object | LogInjectionTest.java:1586:72:1586:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:385 |
+| LogInjectionTest.java:1586:81:1586:88 | source(...) : Object | LogInjectionTest.java:1586:72:1586:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:448 |
+| LogInjectionTest.java:1587:66:1587:73 | source(...) : Object | LogInjectionTest.java:1587:57:1587:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:385 |
+| LogInjectionTest.java:1587:66:1587:73 | source(...) : Object | LogInjectionTest.java:1587:57:1587:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:448 |
+| LogInjectionTest.java:1588:51:1588:58 | source(...) : Object | LogInjectionTest.java:1588:42:1588:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:385 |
+| LogInjectionTest.java:1588:51:1588:58 | source(...) : Object | LogInjectionTest.java:1588:42:1588:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:448 |
+| LogInjectionTest.java:1589:36:1589:43 | source(...) : Object | LogInjectionTest.java:1589:27:1589:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:385 |
+| LogInjectionTest.java:1589:36:1589:43 | source(...) : Object | LogInjectionTest.java:1589:27:1589:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:448 |
+| LogInjectionTest.java:1590:50:1590:57 | source(...) : Object | LogInjectionTest.java:1590:41:1590:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:388 |
+| LogInjectionTest.java:1590:50:1590:57 | source(...) : Object | LogInjectionTest.java:1590:41:1590:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:451 |
+| LogInjectionTest.java:1591:35:1591:42 | source(...) : Object | LogInjectionTest.java:1591:26:1591:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:388 |
+| LogInjectionTest.java:1591:35:1591:42 | source(...) : Object | LogInjectionTest.java:1591:26:1591:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:451 |
+| LogInjectionTest.java:1592:50:1592:57 | source(...) : Object | LogInjectionTest.java:1592:41:1592:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:392 |
+| LogInjectionTest.java:1592:50:1592:57 | source(...) : Object | LogInjectionTest.java:1592:41:1592:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:455 |
+| LogInjectionTest.java:1593:35:1593:42 | source(...) : Object | LogInjectionTest.java:1593:26:1593:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:392 |
+| LogInjectionTest.java:1593:35:1593:42 | source(...) : Object | LogInjectionTest.java:1593:26:1593:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:455 |
+| LogInjectionTest.java:1594:35:1594:42 | source(...) : Object | LogInjectionTest.java:1594:26:1594:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:391 |
+| LogInjectionTest.java:1594:35:1594:42 | source(...) : Object | LogInjectionTest.java:1594:26:1594:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:454 |
+| LogInjectionTest.java:1595:35:1595:42 | source(...) : Object | LogInjectionTest.java:1595:26:1595:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:395 |
+| LogInjectionTest.java:1595:35:1595:42 | source(...) : Object | LogInjectionTest.java:1595:26:1595:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:458 |
+| LogInjectionTest.java:1596:41:1596:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1596:41:1596:63 | new Object[] | provenance | Sink:MaD:391 |
+| LogInjectionTest.java:1596:41:1596:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1596:41:1596:63 | new Object[] | provenance | Sink:MaD:454 |
+| LogInjectionTest.java:1596:55:1596:62 | source(...) : Object | LogInjectionTest.java:1596:41:1596:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1597:41:1597:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1597:41:1597:63 | new Object[] | provenance | Sink:MaD:395 |
+| LogInjectionTest.java:1597:41:1597:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1597:41:1597:63 | new Object[] | provenance | Sink:MaD:458 |
+| LogInjectionTest.java:1597:55:1597:62 | source(...) : Object | LogInjectionTest.java:1597:41:1597:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1598:65:1598:72 | source(...) : Object | LogInjectionTest.java:1598:56:1598:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:389 |
+| LogInjectionTest.java:1598:65:1598:72 | source(...) : Object | LogInjectionTest.java:1598:56:1598:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:452 |
+| LogInjectionTest.java:1599:50:1599:57 | source(...) : Object | LogInjectionTest.java:1599:41:1599:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:389 |
+| LogInjectionTest.java:1599:50:1599:57 | source(...) : Object | LogInjectionTest.java:1599:41:1599:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:452 |
+| LogInjectionTest.java:1600:35:1600:42 | source(...) : Object | LogInjectionTest.java:1600:26:1600:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:389 |
+| LogInjectionTest.java:1600:35:1600:42 | source(...) : Object | LogInjectionTest.java:1600:26:1600:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:452 |
+| LogInjectionTest.java:1601:65:1601:72 | source(...) : Object | LogInjectionTest.java:1601:56:1601:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:393 |
+| LogInjectionTest.java:1601:65:1601:72 | source(...) : Object | LogInjectionTest.java:1601:56:1601:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:456 |
+| LogInjectionTest.java:1602:50:1602:57 | source(...) : Object | LogInjectionTest.java:1602:41:1602:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:393 |
+| LogInjectionTest.java:1602:50:1602:57 | source(...) : Object | LogInjectionTest.java:1602:41:1602:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:456 |
+| LogInjectionTest.java:1603:35:1603:42 | source(...) : Object | LogInjectionTest.java:1603:26:1603:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:393 |
+| LogInjectionTest.java:1603:35:1603:42 | source(...) : Object | LogInjectionTest.java:1603:26:1603:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:456 |
+| LogInjectionTest.java:1604:80:1604:87 | source(...) : Object | LogInjectionTest.java:1604:71:1604:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:390 |
+| LogInjectionTest.java:1604:80:1604:87 | source(...) : Object | LogInjectionTest.java:1604:71:1604:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:453 |
+| LogInjectionTest.java:1605:65:1605:72 | source(...) : Object | LogInjectionTest.java:1605:56:1605:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:390 |
+| LogInjectionTest.java:1605:65:1605:72 | source(...) : Object | LogInjectionTest.java:1605:56:1605:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:453 |
+| LogInjectionTest.java:1606:50:1606:57 | source(...) : Object | LogInjectionTest.java:1606:41:1606:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:390 |
+| LogInjectionTest.java:1606:50:1606:57 | source(...) : Object | LogInjectionTest.java:1606:41:1606:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:453 |
+| LogInjectionTest.java:1607:35:1607:42 | source(...) : Object | LogInjectionTest.java:1607:26:1607:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:390 |
+| LogInjectionTest.java:1607:35:1607:42 | source(...) : Object | LogInjectionTest.java:1607:26:1607:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:453 |
+| LogInjectionTest.java:1608:80:1608:87 | source(...) : Object | LogInjectionTest.java:1608:71:1608:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:394 |
+| LogInjectionTest.java:1608:80:1608:87 | source(...) : Object | LogInjectionTest.java:1608:71:1608:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:457 |
+| LogInjectionTest.java:1609:65:1609:72 | source(...) : Object | LogInjectionTest.java:1609:56:1609:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:394 |
+| LogInjectionTest.java:1609:65:1609:72 | source(...) : Object | LogInjectionTest.java:1609:56:1609:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:457 |
+| LogInjectionTest.java:1610:50:1610:57 | source(...) : Object | LogInjectionTest.java:1610:41:1610:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:394 |
+| LogInjectionTest.java:1610:50:1610:57 | source(...) : Object | LogInjectionTest.java:1610:41:1610:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:457 |
+| LogInjectionTest.java:1611:35:1611:42 | source(...) : Object | LogInjectionTest.java:1611:26:1611:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:394 |
+| LogInjectionTest.java:1611:35:1611:42 | source(...) : Object | LogInjectionTest.java:1611:26:1611:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:457 |
+| LogInjectionTest.java:1612:88:1612:95 | source(...) : Object | LogInjectionTest.java:1612:79:1612:95 | (...)... | provenance | Src:MaD:537 Sink:MaD:397 |
+| LogInjectionTest.java:1612:88:1612:95 | source(...) : Object | LogInjectionTest.java:1612:79:1612:95 | (...)... | provenance | Src:MaD:537 Sink:MaD:460 |
+| LogInjectionTest.java:1613:73:1613:80 | source(...) : Object | LogInjectionTest.java:1613:64:1613:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:397 |
+| LogInjectionTest.java:1613:73:1613:80 | source(...) : Object | LogInjectionTest.java:1613:64:1613:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:460 |
+| LogInjectionTest.java:1614:88:1614:95 | source(...) : Object | LogInjectionTest.java:1614:79:1614:95 | (...)... | provenance | Src:MaD:537 Sink:MaD:401 |
+| LogInjectionTest.java:1614:88:1614:95 | source(...) : Object | LogInjectionTest.java:1614:79:1614:95 | (...)... | provenance | Src:MaD:537 Sink:MaD:464 |
+| LogInjectionTest.java:1615:73:1615:80 | source(...) : Object | LogInjectionTest.java:1615:64:1615:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:401 |
+| LogInjectionTest.java:1615:73:1615:80 | source(...) : Object | LogInjectionTest.java:1615:64:1615:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:464 |
+| LogInjectionTest.java:1616:73:1616:80 | source(...) : Object | LogInjectionTest.java:1616:64:1616:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:400 |
+| LogInjectionTest.java:1616:73:1616:80 | source(...) : Object | LogInjectionTest.java:1616:64:1616:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:463 |
+| LogInjectionTest.java:1617:73:1617:80 | source(...) : Object | LogInjectionTest.java:1617:64:1617:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:404 |
+| LogInjectionTest.java:1617:73:1617:80 | source(...) : Object | LogInjectionTest.java:1617:64:1617:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:467 |
+| LogInjectionTest.java:1618:79:1618:101 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1618:79:1618:101 | new Object[] | provenance | Sink:MaD:400 |
+| LogInjectionTest.java:1618:79:1618:101 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1618:79:1618:101 | new Object[] | provenance | Sink:MaD:463 |
+| LogInjectionTest.java:1618:93:1618:100 | source(...) : Object | LogInjectionTest.java:1618:79:1618:101 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1619:79:1619:101 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1619:79:1619:101 | new Object[] | provenance | Sink:MaD:404 |
+| LogInjectionTest.java:1619:79:1619:101 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1619:79:1619:101 | new Object[] | provenance | Sink:MaD:467 |
+| LogInjectionTest.java:1619:93:1619:100 | source(...) : Object | LogInjectionTest.java:1619:79:1619:101 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1620:103:1620:110 | source(...) : Object | LogInjectionTest.java:1620:94:1620:110 | (...)... | provenance | Src:MaD:537 Sink:MaD:398 |
+| LogInjectionTest.java:1620:103:1620:110 | source(...) : Object | LogInjectionTest.java:1620:94:1620:110 | (...)... | provenance | Src:MaD:537 Sink:MaD:461 |
+| LogInjectionTest.java:1621:88:1621:95 | source(...) : Object | LogInjectionTest.java:1621:79:1621:95 | (...)... | provenance | Src:MaD:537 Sink:MaD:398 |
+| LogInjectionTest.java:1621:88:1621:95 | source(...) : Object | LogInjectionTest.java:1621:79:1621:95 | (...)... | provenance | Src:MaD:537 Sink:MaD:461 |
+| LogInjectionTest.java:1622:73:1622:80 | source(...) : Object | LogInjectionTest.java:1622:64:1622:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:398 |
+| LogInjectionTest.java:1622:73:1622:80 | source(...) : Object | LogInjectionTest.java:1622:64:1622:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:461 |
+| LogInjectionTest.java:1623:103:1623:110 | source(...) : Object | LogInjectionTest.java:1623:94:1623:110 | (...)... | provenance | Src:MaD:537 Sink:MaD:402 |
+| LogInjectionTest.java:1623:103:1623:110 | source(...) : Object | LogInjectionTest.java:1623:94:1623:110 | (...)... | provenance | Src:MaD:537 Sink:MaD:465 |
+| LogInjectionTest.java:1624:88:1624:95 | source(...) : Object | LogInjectionTest.java:1624:79:1624:95 | (...)... | provenance | Src:MaD:537 Sink:MaD:402 |
+| LogInjectionTest.java:1624:88:1624:95 | source(...) : Object | LogInjectionTest.java:1624:79:1624:95 | (...)... | provenance | Src:MaD:537 Sink:MaD:465 |
+| LogInjectionTest.java:1625:73:1625:80 | source(...) : Object | LogInjectionTest.java:1625:64:1625:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:402 |
+| LogInjectionTest.java:1625:73:1625:80 | source(...) : Object | LogInjectionTest.java:1625:64:1625:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:465 |
+| LogInjectionTest.java:1626:118:1626:125 | source(...) : Object | LogInjectionTest.java:1626:109:1626:125 | (...)... | provenance | Src:MaD:537 Sink:MaD:399 |
+| LogInjectionTest.java:1626:118:1626:125 | source(...) : Object | LogInjectionTest.java:1626:109:1626:125 | (...)... | provenance | Src:MaD:537 Sink:MaD:462 |
+| LogInjectionTest.java:1627:103:1627:110 | source(...) : Object | LogInjectionTest.java:1627:94:1627:110 | (...)... | provenance | Src:MaD:537 Sink:MaD:399 |
+| LogInjectionTest.java:1627:103:1627:110 | source(...) : Object | LogInjectionTest.java:1627:94:1627:110 | (...)... | provenance | Src:MaD:537 Sink:MaD:462 |
+| LogInjectionTest.java:1628:88:1628:95 | source(...) : Object | LogInjectionTest.java:1628:79:1628:95 | (...)... | provenance | Src:MaD:537 Sink:MaD:399 |
+| LogInjectionTest.java:1628:88:1628:95 | source(...) : Object | LogInjectionTest.java:1628:79:1628:95 | (...)... | provenance | Src:MaD:537 Sink:MaD:462 |
+| LogInjectionTest.java:1629:73:1629:80 | source(...) : Object | LogInjectionTest.java:1629:64:1629:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:399 |
+| LogInjectionTest.java:1629:73:1629:80 | source(...) : Object | LogInjectionTest.java:1629:64:1629:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:462 |
+| LogInjectionTest.java:1630:118:1630:125 | source(...) : Object | LogInjectionTest.java:1630:109:1630:125 | (...)... | provenance | Src:MaD:537 Sink:MaD:403 |
+| LogInjectionTest.java:1630:118:1630:125 | source(...) : Object | LogInjectionTest.java:1630:109:1630:125 | (...)... | provenance | Src:MaD:537 Sink:MaD:466 |
+| LogInjectionTest.java:1631:103:1631:110 | source(...) : Object | LogInjectionTest.java:1631:94:1631:110 | (...)... | provenance | Src:MaD:537 Sink:MaD:403 |
+| LogInjectionTest.java:1631:103:1631:110 | source(...) : Object | LogInjectionTest.java:1631:94:1631:110 | (...)... | provenance | Src:MaD:537 Sink:MaD:466 |
+| LogInjectionTest.java:1632:88:1632:95 | source(...) : Object | LogInjectionTest.java:1632:79:1632:95 | (...)... | provenance | Src:MaD:537 Sink:MaD:403 |
+| LogInjectionTest.java:1632:88:1632:95 | source(...) : Object | LogInjectionTest.java:1632:79:1632:95 | (...)... | provenance | Src:MaD:537 Sink:MaD:466 |
+| LogInjectionTest.java:1633:73:1633:80 | source(...) : Object | LogInjectionTest.java:1633:64:1633:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:403 |
+| LogInjectionTest.java:1633:73:1633:80 | source(...) : Object | LogInjectionTest.java:1633:64:1633:80 | (...)... | provenance | Src:MaD:537 Sink:MaD:466 |
+| LogInjectionTest.java:1634:51:1634:58 | source(...) : Object | LogInjectionTest.java:1634:42:1634:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:406 |
+| LogInjectionTest.java:1634:51:1634:58 | source(...) : Object | LogInjectionTest.java:1634:42:1634:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:469 |
+| LogInjectionTest.java:1635:36:1635:43 | source(...) : Object | LogInjectionTest.java:1635:27:1635:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:406 |
+| LogInjectionTest.java:1635:36:1635:43 | source(...) : Object | LogInjectionTest.java:1635:27:1635:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:469 |
+| LogInjectionTest.java:1636:51:1636:58 | source(...) : Object | LogInjectionTest.java:1636:42:1636:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:410 |
+| LogInjectionTest.java:1636:51:1636:58 | source(...) : Object | LogInjectionTest.java:1636:42:1636:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:473 |
+| LogInjectionTest.java:1637:36:1637:43 | source(...) : Object | LogInjectionTest.java:1637:27:1637:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:410 |
+| LogInjectionTest.java:1637:36:1637:43 | source(...) : Object | LogInjectionTest.java:1637:27:1637:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:473 |
+| LogInjectionTest.java:1638:36:1638:43 | source(...) : Object | LogInjectionTest.java:1638:27:1638:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:409 |
+| LogInjectionTest.java:1638:36:1638:43 | source(...) : Object | LogInjectionTest.java:1638:27:1638:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:472 |
+| LogInjectionTest.java:1639:36:1639:43 | source(...) : Object | LogInjectionTest.java:1639:27:1639:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:413 |
+| LogInjectionTest.java:1639:36:1639:43 | source(...) : Object | LogInjectionTest.java:1639:27:1639:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:476 |
+| LogInjectionTest.java:1640:42:1640:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1640:42:1640:64 | new Object[] | provenance | Sink:MaD:409 |
+| LogInjectionTest.java:1640:42:1640:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1640:42:1640:64 | new Object[] | provenance | Sink:MaD:472 |
+| LogInjectionTest.java:1640:56:1640:63 | source(...) : Object | LogInjectionTest.java:1640:42:1640:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1641:42:1641:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1641:42:1641:64 | new Object[] | provenance | Sink:MaD:413 |
+| LogInjectionTest.java:1641:42:1641:64 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1641:42:1641:64 | new Object[] | provenance | Sink:MaD:476 |
+| LogInjectionTest.java:1641:56:1641:63 | source(...) : Object | LogInjectionTest.java:1641:42:1641:64 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1642:66:1642:73 | source(...) : Object | LogInjectionTest.java:1642:57:1642:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:407 |
+| LogInjectionTest.java:1642:66:1642:73 | source(...) : Object | LogInjectionTest.java:1642:57:1642:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:470 |
+| LogInjectionTest.java:1643:51:1643:58 | source(...) : Object | LogInjectionTest.java:1643:42:1643:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:407 |
+| LogInjectionTest.java:1643:51:1643:58 | source(...) : Object | LogInjectionTest.java:1643:42:1643:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:470 |
+| LogInjectionTest.java:1644:36:1644:43 | source(...) : Object | LogInjectionTest.java:1644:27:1644:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:407 |
+| LogInjectionTest.java:1644:36:1644:43 | source(...) : Object | LogInjectionTest.java:1644:27:1644:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:470 |
+| LogInjectionTest.java:1645:66:1645:73 | source(...) : Object | LogInjectionTest.java:1645:57:1645:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:411 |
+| LogInjectionTest.java:1645:66:1645:73 | source(...) : Object | LogInjectionTest.java:1645:57:1645:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:474 |
+| LogInjectionTest.java:1646:51:1646:58 | source(...) : Object | LogInjectionTest.java:1646:42:1646:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:411 |
+| LogInjectionTest.java:1646:51:1646:58 | source(...) : Object | LogInjectionTest.java:1646:42:1646:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:474 |
+| LogInjectionTest.java:1647:36:1647:43 | source(...) : Object | LogInjectionTest.java:1647:27:1647:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:411 |
+| LogInjectionTest.java:1647:36:1647:43 | source(...) : Object | LogInjectionTest.java:1647:27:1647:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:474 |
+| LogInjectionTest.java:1648:81:1648:88 | source(...) : Object | LogInjectionTest.java:1648:72:1648:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:408 |
+| LogInjectionTest.java:1648:81:1648:88 | source(...) : Object | LogInjectionTest.java:1648:72:1648:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:471 |
+| LogInjectionTest.java:1649:66:1649:73 | source(...) : Object | LogInjectionTest.java:1649:57:1649:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:408 |
+| LogInjectionTest.java:1649:66:1649:73 | source(...) : Object | LogInjectionTest.java:1649:57:1649:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:471 |
+| LogInjectionTest.java:1650:51:1650:58 | source(...) : Object | LogInjectionTest.java:1650:42:1650:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:408 |
+| LogInjectionTest.java:1650:51:1650:58 | source(...) : Object | LogInjectionTest.java:1650:42:1650:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:471 |
+| LogInjectionTest.java:1651:36:1651:43 | source(...) : Object | LogInjectionTest.java:1651:27:1651:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:408 |
+| LogInjectionTest.java:1651:36:1651:43 | source(...) : Object | LogInjectionTest.java:1651:27:1651:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:471 |
+| LogInjectionTest.java:1652:81:1652:88 | source(...) : Object | LogInjectionTest.java:1652:72:1652:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:412 |
+| LogInjectionTest.java:1652:81:1652:88 | source(...) : Object | LogInjectionTest.java:1652:72:1652:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:475 |
+| LogInjectionTest.java:1653:66:1653:73 | source(...) : Object | LogInjectionTest.java:1653:57:1653:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:412 |
+| LogInjectionTest.java:1653:66:1653:73 | source(...) : Object | LogInjectionTest.java:1653:57:1653:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:475 |
+| LogInjectionTest.java:1654:51:1654:58 | source(...) : Object | LogInjectionTest.java:1654:42:1654:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:412 |
+| LogInjectionTest.java:1654:51:1654:58 | source(...) : Object | LogInjectionTest.java:1654:42:1654:58 | (...)... | provenance | Src:MaD:537 Sink:MaD:475 |
+| LogInjectionTest.java:1655:36:1655:43 | source(...) : Object | LogInjectionTest.java:1655:27:1655:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:412 |
+| LogInjectionTest.java:1655:36:1655:43 | source(...) : Object | LogInjectionTest.java:1655:27:1655:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:475 |
+| LogInjectionTest.java:1656:50:1656:57 | source(...) : Object | LogInjectionTest.java:1656:41:1656:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:415 |
+| LogInjectionTest.java:1656:50:1656:57 | source(...) : Object | LogInjectionTest.java:1656:41:1656:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:478 |
+| LogInjectionTest.java:1657:35:1657:42 | source(...) : Object | LogInjectionTest.java:1657:26:1657:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:415 |
+| LogInjectionTest.java:1657:35:1657:42 | source(...) : Object | LogInjectionTest.java:1657:26:1657:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:478 |
+| LogInjectionTest.java:1658:50:1658:57 | source(...) : Object | LogInjectionTest.java:1658:41:1658:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:419 |
+| LogInjectionTest.java:1658:50:1658:57 | source(...) : Object | LogInjectionTest.java:1658:41:1658:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:482 |
+| LogInjectionTest.java:1659:35:1659:42 | source(...) : Object | LogInjectionTest.java:1659:26:1659:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:419 |
+| LogInjectionTest.java:1659:35:1659:42 | source(...) : Object | LogInjectionTest.java:1659:26:1659:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:482 |
+| LogInjectionTest.java:1660:35:1660:42 | source(...) : Object | LogInjectionTest.java:1660:26:1660:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:418 |
+| LogInjectionTest.java:1660:35:1660:42 | source(...) : Object | LogInjectionTest.java:1660:26:1660:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:481 |
+| LogInjectionTest.java:1661:35:1661:42 | source(...) : Object | LogInjectionTest.java:1661:26:1661:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:422 |
+| LogInjectionTest.java:1661:35:1661:42 | source(...) : Object | LogInjectionTest.java:1661:26:1661:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:485 |
+| LogInjectionTest.java:1662:41:1662:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1662:41:1662:63 | new Object[] | provenance | Sink:MaD:418 |
+| LogInjectionTest.java:1662:41:1662:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1662:41:1662:63 | new Object[] | provenance | Sink:MaD:481 |
+| LogInjectionTest.java:1662:55:1662:62 | source(...) : Object | LogInjectionTest.java:1662:41:1662:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1663:41:1663:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1663:41:1663:63 | new Object[] | provenance | Sink:MaD:422 |
+| LogInjectionTest.java:1663:41:1663:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1663:41:1663:63 | new Object[] | provenance | Sink:MaD:485 |
+| LogInjectionTest.java:1663:55:1663:62 | source(...) : Object | LogInjectionTest.java:1663:41:1663:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1664:65:1664:72 | source(...) : Object | LogInjectionTest.java:1664:56:1664:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:416 |
+| LogInjectionTest.java:1664:65:1664:72 | source(...) : Object | LogInjectionTest.java:1664:56:1664:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:479 |
+| LogInjectionTest.java:1665:50:1665:57 | source(...) : Object | LogInjectionTest.java:1665:41:1665:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:416 |
+| LogInjectionTest.java:1665:50:1665:57 | source(...) : Object | LogInjectionTest.java:1665:41:1665:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:479 |
+| LogInjectionTest.java:1666:35:1666:42 | source(...) : Object | LogInjectionTest.java:1666:26:1666:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:416 |
+| LogInjectionTest.java:1666:35:1666:42 | source(...) : Object | LogInjectionTest.java:1666:26:1666:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:479 |
+| LogInjectionTest.java:1667:65:1667:72 | source(...) : Object | LogInjectionTest.java:1667:56:1667:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:420 |
+| LogInjectionTest.java:1667:65:1667:72 | source(...) : Object | LogInjectionTest.java:1667:56:1667:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:483 |
+| LogInjectionTest.java:1668:50:1668:57 | source(...) : Object | LogInjectionTest.java:1668:41:1668:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:420 |
+| LogInjectionTest.java:1668:50:1668:57 | source(...) : Object | LogInjectionTest.java:1668:41:1668:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:483 |
+| LogInjectionTest.java:1669:35:1669:42 | source(...) : Object | LogInjectionTest.java:1669:26:1669:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:420 |
+| LogInjectionTest.java:1669:35:1669:42 | source(...) : Object | LogInjectionTest.java:1669:26:1669:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:483 |
+| LogInjectionTest.java:1670:80:1670:87 | source(...) : Object | LogInjectionTest.java:1670:71:1670:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:417 |
+| LogInjectionTest.java:1670:80:1670:87 | source(...) : Object | LogInjectionTest.java:1670:71:1670:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:480 |
+| LogInjectionTest.java:1671:65:1671:72 | source(...) : Object | LogInjectionTest.java:1671:56:1671:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:417 |
+| LogInjectionTest.java:1671:65:1671:72 | source(...) : Object | LogInjectionTest.java:1671:56:1671:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:480 |
+| LogInjectionTest.java:1672:50:1672:57 | source(...) : Object | LogInjectionTest.java:1672:41:1672:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:417 |
+| LogInjectionTest.java:1672:50:1672:57 | source(...) : Object | LogInjectionTest.java:1672:41:1672:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:480 |
+| LogInjectionTest.java:1673:35:1673:42 | source(...) : Object | LogInjectionTest.java:1673:26:1673:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:417 |
+| LogInjectionTest.java:1673:35:1673:42 | source(...) : Object | LogInjectionTest.java:1673:26:1673:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:480 |
+| LogInjectionTest.java:1674:80:1674:87 | source(...) : Object | LogInjectionTest.java:1674:71:1674:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:421 |
+| LogInjectionTest.java:1674:80:1674:87 | source(...) : Object | LogInjectionTest.java:1674:71:1674:87 | (...)... | provenance | Src:MaD:537 Sink:MaD:484 |
+| LogInjectionTest.java:1675:65:1675:72 | source(...) : Object | LogInjectionTest.java:1675:56:1675:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:421 |
+| LogInjectionTest.java:1675:65:1675:72 | source(...) : Object | LogInjectionTest.java:1675:56:1675:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:484 |
+| LogInjectionTest.java:1676:50:1676:57 | source(...) : Object | LogInjectionTest.java:1676:41:1676:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:421 |
+| LogInjectionTest.java:1676:50:1676:57 | source(...) : Object | LogInjectionTest.java:1676:41:1676:57 | (...)... | provenance | Src:MaD:537 Sink:MaD:484 |
+| LogInjectionTest.java:1677:35:1677:42 | source(...) : Object | LogInjectionTest.java:1677:26:1677:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:421 |
+| LogInjectionTest.java:1677:35:1677:42 | source(...) : Object | LogInjectionTest.java:1677:26:1677:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:484 |
+| LogInjectionTest.java:1682:34:1682:41 | source(...) : Object | LogInjectionTest.java:1682:25:1682:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:490 |
+| LogInjectionTest.java:1683:34:1683:41 | source(...) : Object | LogInjectionTest.java:1683:25:1683:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:490 |
+| LogInjectionTest.java:1683:34:1683:41 | source(...) : Object | LogInjectionTest.java:1683:25:1683:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:486 |
+| LogInjectionTest.java:1685:34:1685:41 | source(...) : Object | LogInjectionTest.java:1685:25:1685:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:490 |
+| LogInjectionTest.java:1685:34:1685:41 | source(...) : Object | LogInjectionTest.java:1685:25:1685:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:488 |
+| LogInjectionTest.java:1686:40:1686:62 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1686:40:1686:62 | new Object[] | provenance | Sink:MaD:488 |
+| LogInjectionTest.java:1686:54:1686:61 | source(...) : Object | LogInjectionTest.java:1686:40:1686:62 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1687:34:1687:41 | source(...) : Object | LogInjectionTest.java:1687:25:1687:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:490 |
+| LogInjectionTest.java:1687:34:1687:41 | source(...) : Object | LogInjectionTest.java:1687:25:1687:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:487 |
+| LogInjectionTest.java:1690:55:1690:62 | source(...) : Object | LogInjectionTest.java:1690:25:1690:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:490 |
+| LogInjectionTest.java:1690:55:1690:62 | source(...) : Object | LogInjectionTest.java:1690:25:1690:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:489 |
+| LogInjectionTest.java:1695:35:1695:42 | source(...) : Object | LogInjectionTest.java:1695:26:1695:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:495 |
+| LogInjectionTest.java:1696:35:1696:42 | source(...) : Object | LogInjectionTest.java:1696:26:1696:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:496 |
+| LogInjectionTest.java:1698:35:1698:42 | source(...) : Object | LogInjectionTest.java:1698:26:1698:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:498 |
+| LogInjectionTest.java:1699:41:1699:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1699:41:1699:63 | new Object[] | provenance | Sink:MaD:498 |
+| LogInjectionTest.java:1699:55:1699:62 | source(...) : Object | LogInjectionTest.java:1699:41:1699:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1700:35:1700:42 | source(...) : Object | LogInjectionTest.java:1700:26:1700:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:497 |
+| LogInjectionTest.java:1703:35:1703:42 | source(...) : Object | LogInjectionTest.java:1703:26:1703:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:499 |
+| LogInjectionTest.java:1704:60:1704:67 | source(...) : Object | LogInjectionTest.java:1704:51:1704:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:491 |
+| LogInjectionTest.java:1705:60:1705:67 | source(...) : Object | LogInjectionTest.java:1705:51:1705:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:492 |
+| LogInjectionTest.java:1707:60:1707:67 | source(...) : Object | LogInjectionTest.java:1707:51:1707:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:494 |
+| LogInjectionTest.java:1708:66:1708:88 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1708:66:1708:88 | new Object[] | provenance | Sink:MaD:494 |
+| LogInjectionTest.java:1708:80:1708:87 | source(...) : Object | LogInjectionTest.java:1708:66:1708:88 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1709:60:1709:67 | source(...) : Object | LogInjectionTest.java:1709:51:1709:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:493 |
+| LogInjectionTest.java:1712:60:1712:67 | source(...) : Object | LogInjectionTest.java:1712:51:1712:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:494 |
+| LogInjectionTest.java:1713:66:1713:73 | source(...) : Object | LogInjectionTest.java:1713:13:1713:104 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:494 |
+| LogInjectionTest.java:1714:81:1714:88 | source(...) : Object | LogInjectionTest.java:1714:13:1714:104 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:494 |
+| LogInjectionTest.java:1715:96:1715:103 | source(...) : Object | LogInjectionTest.java:1715:13:1715:104 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:494 |
+| LogInjectionTest.java:1716:35:1716:42 | source(...) : Object | LogInjectionTest.java:1716:26:1716:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:504 |
+| LogInjectionTest.java:1717:35:1717:42 | source(...) : Object | LogInjectionTest.java:1717:26:1717:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:505 |
+| LogInjectionTest.java:1719:35:1719:42 | source(...) : Object | LogInjectionTest.java:1719:26:1719:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:507 |
+| LogInjectionTest.java:1720:41:1720:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1720:41:1720:63 | new Object[] | provenance | Sink:MaD:507 |
+| LogInjectionTest.java:1720:55:1720:62 | source(...) : Object | LogInjectionTest.java:1720:41:1720:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1721:35:1721:42 | source(...) : Object | LogInjectionTest.java:1721:26:1721:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:506 |
+| LogInjectionTest.java:1724:35:1724:42 | source(...) : Object | LogInjectionTest.java:1724:26:1724:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:508 |
+| LogInjectionTest.java:1725:60:1725:67 | source(...) : Object | LogInjectionTest.java:1725:51:1725:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:500 |
+| LogInjectionTest.java:1726:60:1726:67 | source(...) : Object | LogInjectionTest.java:1726:51:1726:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:501 |
+| LogInjectionTest.java:1728:60:1728:67 | source(...) : Object | LogInjectionTest.java:1728:51:1728:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:503 |
+| LogInjectionTest.java:1729:66:1729:88 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1729:66:1729:88 | new Object[] | provenance | Sink:MaD:503 |
+| LogInjectionTest.java:1729:80:1729:87 | source(...) : Object | LogInjectionTest.java:1729:66:1729:88 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1730:60:1730:67 | source(...) : Object | LogInjectionTest.java:1730:51:1730:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:502 |
+| LogInjectionTest.java:1733:60:1733:67 | source(...) : Object | LogInjectionTest.java:1733:51:1733:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:503 |
+| LogInjectionTest.java:1734:66:1734:73 | source(...) : Object | LogInjectionTest.java:1734:13:1734:104 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:503 |
+| LogInjectionTest.java:1735:81:1735:88 | source(...) : Object | LogInjectionTest.java:1735:13:1735:104 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:503 |
+| LogInjectionTest.java:1736:96:1736:103 | source(...) : Object | LogInjectionTest.java:1736:13:1736:104 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:503 |
+| LogInjectionTest.java:1737:34:1737:41 | source(...) : Object | LogInjectionTest.java:1737:25:1737:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:513 |
+| LogInjectionTest.java:1738:34:1738:41 | source(...) : Object | LogInjectionTest.java:1738:25:1738:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:514 |
+| LogInjectionTest.java:1740:34:1740:41 | source(...) : Object | LogInjectionTest.java:1740:25:1740:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:516 |
+| LogInjectionTest.java:1741:40:1741:62 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1741:40:1741:62 | new Object[] | provenance | Sink:MaD:516 |
+| LogInjectionTest.java:1741:54:1741:61 | source(...) : Object | LogInjectionTest.java:1741:40:1741:62 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1742:34:1742:41 | source(...) : Object | LogInjectionTest.java:1742:25:1742:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:515 |
+| LogInjectionTest.java:1745:34:1745:41 | source(...) : Object | LogInjectionTest.java:1745:25:1745:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:517 |
+| LogInjectionTest.java:1746:59:1746:66 | source(...) : Object | LogInjectionTest.java:1746:50:1746:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:509 |
+| LogInjectionTest.java:1747:59:1747:66 | source(...) : Object | LogInjectionTest.java:1747:50:1747:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:510 |
+| LogInjectionTest.java:1749:59:1749:66 | source(...) : Object | LogInjectionTest.java:1749:50:1749:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:512 |
+| LogInjectionTest.java:1750:65:1750:87 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1750:65:1750:87 | new Object[] | provenance | Sink:MaD:512 |
+| LogInjectionTest.java:1750:79:1750:86 | source(...) : Object | LogInjectionTest.java:1750:65:1750:87 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1751:59:1751:66 | source(...) : Object | LogInjectionTest.java:1751:50:1751:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:511 |
+| LogInjectionTest.java:1754:59:1754:66 | source(...) : Object | LogInjectionTest.java:1754:50:1754:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:512 |
+| LogInjectionTest.java:1755:65:1755:72 | source(...) : Object | LogInjectionTest.java:1755:13:1755:103 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:512 |
+| LogInjectionTest.java:1756:80:1756:87 | source(...) : Object | LogInjectionTest.java:1756:13:1756:103 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:512 |
+| LogInjectionTest.java:1757:95:1757:102 | source(...) : Object | LogInjectionTest.java:1757:13:1757:103 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:512 |
+| LogInjectionTest.java:1758:35:1758:42 | source(...) : Object | LogInjectionTest.java:1758:26:1758:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:522 |
+| LogInjectionTest.java:1759:35:1759:42 | source(...) : Object | LogInjectionTest.java:1759:26:1759:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:523 |
+| LogInjectionTest.java:1761:35:1761:42 | source(...) : Object | LogInjectionTest.java:1761:26:1761:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:525 |
+| LogInjectionTest.java:1762:41:1762:63 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1762:41:1762:63 | new Object[] | provenance | Sink:MaD:525 |
+| LogInjectionTest.java:1762:55:1762:62 | source(...) : Object | LogInjectionTest.java:1762:41:1762:63 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1763:35:1763:42 | source(...) : Object | LogInjectionTest.java:1763:26:1763:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:524 |
+| LogInjectionTest.java:1766:35:1766:42 | source(...) : Object | LogInjectionTest.java:1766:26:1766:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:526 |
+| LogInjectionTest.java:1767:60:1767:67 | source(...) : Object | LogInjectionTest.java:1767:51:1767:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:518 |
+| LogInjectionTest.java:1768:60:1768:67 | source(...) : Object | LogInjectionTest.java:1768:51:1768:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:519 |
+| LogInjectionTest.java:1770:60:1770:67 | source(...) : Object | LogInjectionTest.java:1770:51:1770:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:521 |
+| LogInjectionTest.java:1771:66:1771:88 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1771:66:1771:88 | new Object[] | provenance | Sink:MaD:521 |
+| LogInjectionTest.java:1771:80:1771:87 | source(...) : Object | LogInjectionTest.java:1771:66:1771:88 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1772:60:1772:67 | source(...) : Object | LogInjectionTest.java:1772:51:1772:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:520 |
+| LogInjectionTest.java:1775:60:1775:67 | source(...) : Object | LogInjectionTest.java:1775:51:1775:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:521 |
+| LogInjectionTest.java:1776:66:1776:73 | source(...) : Object | LogInjectionTest.java:1776:13:1776:104 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:521 |
+| LogInjectionTest.java:1777:81:1777:88 | source(...) : Object | LogInjectionTest.java:1777:13:1777:104 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:521 |
+| LogInjectionTest.java:1778:96:1778:103 | source(...) : Object | LogInjectionTest.java:1778:13:1778:104 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:521 |
+| LogInjectionTest.java:1779:34:1779:41 | source(...) : Object | LogInjectionTest.java:1779:25:1779:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:531 |
+| LogInjectionTest.java:1780:34:1780:41 | source(...) : Object | LogInjectionTest.java:1780:25:1780:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:532 |
+| LogInjectionTest.java:1782:34:1782:41 | source(...) : Object | LogInjectionTest.java:1782:25:1782:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:534 |
+| LogInjectionTest.java:1783:40:1783:62 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1783:40:1783:62 | new Object[] | provenance | Sink:MaD:534 |
+| LogInjectionTest.java:1783:54:1783:61 | source(...) : Object | LogInjectionTest.java:1783:40:1783:62 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1784:34:1784:41 | source(...) : Object | LogInjectionTest.java:1784:25:1784:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:533 |
+| LogInjectionTest.java:1787:34:1787:41 | source(...) : Object | LogInjectionTest.java:1787:25:1787:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:535 |
+| LogInjectionTest.java:1788:59:1788:66 | source(...) : Object | LogInjectionTest.java:1788:50:1788:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:527 |
+| LogInjectionTest.java:1789:59:1789:66 | source(...) : Object | LogInjectionTest.java:1789:50:1789:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:528 |
+| LogInjectionTest.java:1791:59:1791:66 | source(...) : Object | LogInjectionTest.java:1791:50:1791:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:530 |
+| LogInjectionTest.java:1792:65:1792:87 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1792:65:1792:87 | new Object[] | provenance | Sink:MaD:530 |
+| LogInjectionTest.java:1792:79:1792:86 | source(...) : Object | LogInjectionTest.java:1792:65:1792:87 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1793:59:1793:66 | source(...) : Object | LogInjectionTest.java:1793:50:1793:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:529 |
+| LogInjectionTest.java:1796:59:1796:66 | source(...) : Object | LogInjectionTest.java:1796:50:1796:66 | (...)... | provenance | Src:MaD:537 Sink:MaD:530 |
+| LogInjectionTest.java:1797:65:1797:72 | source(...) : Object | LogInjectionTest.java:1797:13:1797:103 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:530 |
+| LogInjectionTest.java:1798:80:1798:87 | source(...) : Object | LogInjectionTest.java:1798:13:1798:103 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:530 |
+| LogInjectionTest.java:1799:95:1799:102 | source(...) : Object | LogInjectionTest.java:1799:13:1799:103 | new ..[] { .. } | provenance | Src:MaD:537  Sink:MaD:530 |
+| LogInjectionTest.java:1820:37:1820:44 | source(...) : Object | LogInjectionTest.java:1820:28:1820:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:19 |
+| LogInjectionTest.java:1821:43:1821:65 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1821:43:1821:65 | new Object[] | provenance | Sink:MaD:19 |
+| LogInjectionTest.java:1821:57:1821:64 | source(...) : Object | LogInjectionTest.java:1821:43:1821:65 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1823:30:1823:37 | source(...) : Object | LogInjectionTest.java:1823:21:1823:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1824:45:1824:52 | source(...) : Object | LogInjectionTest.java:1824:36:1824:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:7 |
+| LogInjectionTest.java:1825:30:1825:37 | source(...) : Object | LogInjectionTest.java:1825:21:1825:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1826:60:1826:67 | source(...) : Object | LogInjectionTest.java:1826:51:1826:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:8 |
+| LogInjectionTest.java:1827:45:1827:52 | source(...) : Object | LogInjectionTest.java:1827:36:1827:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:8 |
+| LogInjectionTest.java:1828:30:1828:37 | source(...) : Object | LogInjectionTest.java:1828:21:1828:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1829:75:1829:82 | source(...) : Object | LogInjectionTest.java:1829:66:1829:82 | (...)... | provenance | Src:MaD:537 Sink:MaD:9 |
+| LogInjectionTest.java:1830:60:1830:67 | source(...) : Object | LogInjectionTest.java:1830:51:1830:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:9 |
+| LogInjectionTest.java:1831:45:1831:52 | source(...) : Object | LogInjectionTest.java:1831:36:1831:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:9 |
+| LogInjectionTest.java:1832:30:1832:37 | source(...) : Object | LogInjectionTest.java:1832:21:1832:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1833:90:1833:97 | source(...) : Object | LogInjectionTest.java:1833:81:1833:97 | (...)... | provenance | Src:MaD:537 Sink:MaD:10 |
+| LogInjectionTest.java:1834:75:1834:82 | source(...) : Object | LogInjectionTest.java:1834:66:1834:82 | (...)... | provenance | Src:MaD:537 Sink:MaD:10 |
+| LogInjectionTest.java:1835:60:1835:67 | source(...) : Object | LogInjectionTest.java:1835:51:1835:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:10 |
+| LogInjectionTest.java:1836:45:1836:52 | source(...) : Object | LogInjectionTest.java:1836:36:1836:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:10 |
+| LogInjectionTest.java:1837:30:1837:37 | source(...) : Object | LogInjectionTest.java:1837:21:1837:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1838:105:1838:112 | source(...) : Object | LogInjectionTest.java:1838:96:1838:112 | (...)... | provenance | Src:MaD:537 Sink:MaD:11 |
+| LogInjectionTest.java:1839:90:1839:97 | source(...) : Object | LogInjectionTest.java:1839:81:1839:97 | (...)... | provenance | Src:MaD:537 Sink:MaD:11 |
+| LogInjectionTest.java:1840:75:1840:82 | source(...) : Object | LogInjectionTest.java:1840:66:1840:82 | (...)... | provenance | Src:MaD:537 Sink:MaD:11 |
+| LogInjectionTest.java:1841:60:1841:67 | source(...) : Object | LogInjectionTest.java:1841:51:1841:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:11 |
+| LogInjectionTest.java:1842:45:1842:52 | source(...) : Object | LogInjectionTest.java:1842:36:1842:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:11 |
+| LogInjectionTest.java:1843:30:1843:37 | source(...) : Object | LogInjectionTest.java:1843:21:1843:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1844:120:1844:127 | source(...) : Object | LogInjectionTest.java:1844:111:1844:127 | (...)... | provenance | Src:MaD:537 Sink:MaD:12 |
+| LogInjectionTest.java:1845:105:1845:112 | source(...) : Object | LogInjectionTest.java:1845:96:1845:112 | (...)... | provenance | Src:MaD:537 Sink:MaD:12 |
+| LogInjectionTest.java:1846:90:1846:97 | source(...) : Object | LogInjectionTest.java:1846:81:1846:97 | (...)... | provenance | Src:MaD:537 Sink:MaD:12 |
+| LogInjectionTest.java:1847:75:1847:82 | source(...) : Object | LogInjectionTest.java:1847:66:1847:82 | (...)... | provenance | Src:MaD:537 Sink:MaD:12 |
+| LogInjectionTest.java:1848:60:1848:67 | source(...) : Object | LogInjectionTest.java:1848:51:1848:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:12 |
+| LogInjectionTest.java:1849:45:1849:52 | source(...) : Object | LogInjectionTest.java:1849:36:1849:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:12 |
+| LogInjectionTest.java:1850:30:1850:37 | source(...) : Object | LogInjectionTest.java:1850:21:1850:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1851:135:1851:142 | source(...) : Object | LogInjectionTest.java:1851:126:1851:142 | (...)... | provenance | Src:MaD:537 Sink:MaD:13 |
+| LogInjectionTest.java:1852:120:1852:127 | source(...) : Object | LogInjectionTest.java:1852:111:1852:127 | (...)... | provenance | Src:MaD:537 Sink:MaD:13 |
+| LogInjectionTest.java:1853:105:1853:112 | source(...) : Object | LogInjectionTest.java:1853:96:1853:112 | (...)... | provenance | Src:MaD:537 Sink:MaD:13 |
+| LogInjectionTest.java:1854:90:1854:97 | source(...) : Object | LogInjectionTest.java:1854:81:1854:97 | (...)... | provenance | Src:MaD:537 Sink:MaD:13 |
+| LogInjectionTest.java:1855:75:1855:82 | source(...) : Object | LogInjectionTest.java:1855:66:1855:82 | (...)... | provenance | Src:MaD:537 Sink:MaD:13 |
+| LogInjectionTest.java:1856:60:1856:67 | source(...) : Object | LogInjectionTest.java:1856:51:1856:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:13 |
+| LogInjectionTest.java:1857:45:1857:52 | source(...) : Object | LogInjectionTest.java:1857:36:1857:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:13 |
+| LogInjectionTest.java:1858:30:1858:37 | source(...) : Object | LogInjectionTest.java:1858:21:1858:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1859:150:1859:157 | source(...) : Object | LogInjectionTest.java:1859:141:1859:157 | (...)... | provenance | Src:MaD:537 Sink:MaD:14 |
+| LogInjectionTest.java:1860:135:1860:142 | source(...) : Object | LogInjectionTest.java:1860:126:1860:142 | (...)... | provenance | Src:MaD:537 Sink:MaD:14 |
+| LogInjectionTest.java:1861:120:1861:127 | source(...) : Object | LogInjectionTest.java:1861:111:1861:127 | (...)... | provenance | Src:MaD:537 Sink:MaD:14 |
+| LogInjectionTest.java:1862:105:1862:112 | source(...) : Object | LogInjectionTest.java:1862:96:1862:112 | (...)... | provenance | Src:MaD:537 Sink:MaD:14 |
+| LogInjectionTest.java:1863:90:1863:97 | source(...) : Object | LogInjectionTest.java:1863:81:1863:97 | (...)... | provenance | Src:MaD:537 Sink:MaD:14 |
+| LogInjectionTest.java:1864:75:1864:82 | source(...) : Object | LogInjectionTest.java:1864:66:1864:82 | (...)... | provenance | Src:MaD:537 Sink:MaD:14 |
+| LogInjectionTest.java:1865:60:1865:67 | source(...) : Object | LogInjectionTest.java:1865:51:1865:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:14 |
+| LogInjectionTest.java:1866:45:1866:52 | source(...) : Object | LogInjectionTest.java:1866:36:1866:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:14 |
+| LogInjectionTest.java:1867:30:1867:37 | source(...) : Object | LogInjectionTest.java:1867:21:1867:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1868:165:1868:172 | source(...) : Object | LogInjectionTest.java:1868:156:1868:172 | (...)... | provenance | Src:MaD:537 Sink:MaD:15 |
+| LogInjectionTest.java:1869:150:1869:157 | source(...) : Object | LogInjectionTest.java:1869:141:1869:157 | (...)... | provenance | Src:MaD:537 Sink:MaD:15 |
+| LogInjectionTest.java:1870:135:1870:142 | source(...) : Object | LogInjectionTest.java:1870:126:1870:142 | (...)... | provenance | Src:MaD:537 Sink:MaD:15 |
+| LogInjectionTest.java:1871:120:1871:127 | source(...) : Object | LogInjectionTest.java:1871:111:1871:127 | (...)... | provenance | Src:MaD:537 Sink:MaD:15 |
+| LogInjectionTest.java:1872:105:1872:112 | source(...) : Object | LogInjectionTest.java:1872:96:1872:112 | (...)... | provenance | Src:MaD:537 Sink:MaD:15 |
+| LogInjectionTest.java:1873:90:1873:97 | source(...) : Object | LogInjectionTest.java:1873:81:1873:97 | (...)... | provenance | Src:MaD:537 Sink:MaD:15 |
+| LogInjectionTest.java:1874:75:1874:82 | source(...) : Object | LogInjectionTest.java:1874:66:1874:82 | (...)... | provenance | Src:MaD:537 Sink:MaD:15 |
+| LogInjectionTest.java:1875:60:1875:67 | source(...) : Object | LogInjectionTest.java:1875:51:1875:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:15 |
+| LogInjectionTest.java:1876:45:1876:52 | source(...) : Object | LogInjectionTest.java:1876:36:1876:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:15 |
+| LogInjectionTest.java:1877:30:1877:37 | source(...) : Object | LogInjectionTest.java:1877:21:1877:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1878:180:1878:187 | source(...) : Object | LogInjectionTest.java:1878:171:1878:187 | (...)... | provenance | Src:MaD:537 Sink:MaD:16 |
+| LogInjectionTest.java:1879:165:1879:172 | source(...) : Object | LogInjectionTest.java:1879:156:1879:172 | (...)... | provenance | Src:MaD:537 Sink:MaD:16 |
+| LogInjectionTest.java:1880:150:1880:157 | source(...) : Object | LogInjectionTest.java:1880:141:1880:157 | (...)... | provenance | Src:MaD:537 Sink:MaD:16 |
+| LogInjectionTest.java:1881:135:1881:142 | source(...) : Object | LogInjectionTest.java:1881:126:1881:142 | (...)... | provenance | Src:MaD:537 Sink:MaD:16 |
+| LogInjectionTest.java:1882:120:1882:127 | source(...) : Object | LogInjectionTest.java:1882:111:1882:127 | (...)... | provenance | Src:MaD:537 Sink:MaD:16 |
+| LogInjectionTest.java:1883:105:1883:112 | source(...) : Object | LogInjectionTest.java:1883:96:1883:112 | (...)... | provenance | Src:MaD:537 Sink:MaD:16 |
+| LogInjectionTest.java:1884:90:1884:97 | source(...) : Object | LogInjectionTest.java:1884:81:1884:97 | (...)... | provenance | Src:MaD:537 Sink:MaD:16 |
+| LogInjectionTest.java:1885:75:1885:82 | source(...) : Object | LogInjectionTest.java:1885:66:1885:82 | (...)... | provenance | Src:MaD:537 Sink:MaD:16 |
+| LogInjectionTest.java:1886:60:1886:67 | source(...) : Object | LogInjectionTest.java:1886:51:1886:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:16 |
+| LogInjectionTest.java:1887:45:1887:52 | source(...) : Object | LogInjectionTest.java:1887:36:1887:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:16 |
+| LogInjectionTest.java:1888:30:1888:37 | source(...) : Object | LogInjectionTest.java:1888:21:1888:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1889:186:1889:207 | {...} : Object[] [[]] : Object | LogInjectionTest.java:1889:186:1889:207 | new Object[] | provenance | Sink:MaD:17 |
+| LogInjectionTest.java:1889:199:1889:206 | source(...) : Object | LogInjectionTest.java:1889:186:1889:207 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:1890:180:1890:187 | source(...) : Object | LogInjectionTest.java:1890:171:1890:187 | (...)... | provenance | Src:MaD:537 Sink:MaD:17 |
+| LogInjectionTest.java:1891:165:1891:172 | source(...) : Object | LogInjectionTest.java:1891:156:1891:172 | (...)... | provenance | Src:MaD:537 Sink:MaD:17 |
+| LogInjectionTest.java:1892:150:1892:157 | source(...) : Object | LogInjectionTest.java:1892:141:1892:157 | (...)... | provenance | Src:MaD:537 Sink:MaD:17 |
+| LogInjectionTest.java:1893:135:1893:142 | source(...) : Object | LogInjectionTest.java:1893:126:1893:142 | (...)... | provenance | Src:MaD:537 Sink:MaD:17 |
+| LogInjectionTest.java:1894:120:1894:127 | source(...) : Object | LogInjectionTest.java:1894:111:1894:127 | (...)... | provenance | Src:MaD:537 Sink:MaD:17 |
+| LogInjectionTest.java:1895:105:1895:112 | source(...) : Object | LogInjectionTest.java:1895:96:1895:112 | (...)... | provenance | Src:MaD:537 Sink:MaD:17 |
+| LogInjectionTest.java:1896:90:1896:97 | source(...) : Object | LogInjectionTest.java:1896:81:1896:97 | (...)... | provenance | Src:MaD:537 Sink:MaD:17 |
+| LogInjectionTest.java:1897:75:1897:82 | source(...) : Object | LogInjectionTest.java:1897:66:1897:82 | (...)... | provenance | Src:MaD:537 Sink:MaD:17 |
+| LogInjectionTest.java:1898:60:1898:67 | source(...) : Object | LogInjectionTest.java:1898:51:1898:67 | (...)... | provenance | Src:MaD:537 Sink:MaD:17 |
+| LogInjectionTest.java:1899:45:1899:52 | source(...) : Object | LogInjectionTest.java:1899:36:1899:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:17 |
+| LogInjectionTest.java:1900:30:1900:37 | source(...) : Object | LogInjectionTest.java:1900:21:1900:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1902:30:1902:37 | source(...) : Object | LogInjectionTest.java:1902:21:1902:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1903:30:1903:37 | source(...) : Object | LogInjectionTest.java:1903:21:1903:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1904:30:1904:37 | source(...) : Object | LogInjectionTest.java:1904:21:1904:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1905:30:1905:37 | source(...) : Object | LogInjectionTest.java:1905:21:1905:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1906:30:1906:37 | source(...) : Object | LogInjectionTest.java:1906:21:1906:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1907:30:1907:37 | source(...) : Object | LogInjectionTest.java:1907:21:1907:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1909:30:1909:37 | source(...) : Object | LogInjectionTest.java:1909:21:1909:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1911:30:1911:37 | source(...) : Object | LogInjectionTest.java:1911:21:1911:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1913:30:1913:37 | source(...) : Object | LogInjectionTest.java:1913:21:1913:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1915:30:1915:37 | source(...) : Object | LogInjectionTest.java:1915:21:1915:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1917:30:1917:37 | source(...) : Object | LogInjectionTest.java:1917:21:1917:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1919:30:1919:37 | source(...) : Object | LogInjectionTest.java:1919:21:1919:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1921:30:1921:37 | source(...) : Object | LogInjectionTest.java:1921:21:1921:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1923:30:1923:37 | source(...) : Object | LogInjectionTest.java:1923:21:1923:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1925:30:1925:37 | source(...) : Object | LogInjectionTest.java:1925:21:1925:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1927:30:1927:37 | source(...) : Object | LogInjectionTest.java:1927:21:1927:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1929:30:1929:37 | source(...) : Object | LogInjectionTest.java:1929:21:1929:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1931:30:1931:37 | source(...) : Object | LogInjectionTest.java:1931:21:1931:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1933:30:1933:37 | source(...) : Object | LogInjectionTest.java:1933:21:1933:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1935:30:1935:37 | source(...) : Object | LogInjectionTest.java:1935:21:1935:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1937:30:1937:37 | source(...) : Object | LogInjectionTest.java:1937:21:1937:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1939:30:1939:37 | source(...) : Object | LogInjectionTest.java:1939:21:1939:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1940:30:1940:37 | source(...) : Object | LogInjectionTest.java:1940:21:1940:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1941:30:1941:37 | source(...) : Object | LogInjectionTest.java:1941:21:1941:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1942:30:1942:37 | source(...) : Object | LogInjectionTest.java:1942:21:1942:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1943:30:1943:37 | source(...) : Object | LogInjectionTest.java:1943:21:1943:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1944:30:1944:37 | source(...) : Object | LogInjectionTest.java:1944:21:1944:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1945:30:1945:37 | source(...) : Object | LogInjectionTest.java:1945:21:1945:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1946:30:1946:37 | source(...) : Object | LogInjectionTest.java:1946:21:1946:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1947:30:1947:37 | source(...) : Object | LogInjectionTest.java:1947:21:1947:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1948:30:1948:37 | source(...) : Object | LogInjectionTest.java:1948:21:1948:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1949:30:1949:37 | source(...) : Object | LogInjectionTest.java:1949:21:1949:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1950:30:1950:37 | source(...) : Object | LogInjectionTest.java:1950:21:1950:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1951:30:1951:37 | source(...) : Object | LogInjectionTest.java:1951:21:1951:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1952:30:1952:37 | source(...) : Object | LogInjectionTest.java:1952:21:1952:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1953:30:1953:37 | source(...) : Object | LogInjectionTest.java:1953:21:1953:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1954:30:1954:37 | source(...) : Object | LogInjectionTest.java:1954:21:1954:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1955:30:1955:37 | source(...) : Object | LogInjectionTest.java:1955:21:1955:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1956:30:1956:37 | source(...) : Object | LogInjectionTest.java:1956:21:1956:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1957:30:1957:37 | source(...) : Object | LogInjectionTest.java:1957:21:1957:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1958:30:1958:37 | source(...) : Object | LogInjectionTest.java:1958:21:1958:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1959:30:1959:37 | source(...) : Object | LogInjectionTest.java:1959:21:1959:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1960:30:1960:37 | source(...) : Object | LogInjectionTest.java:1960:21:1960:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1961:30:1961:37 | source(...) : Object | LogInjectionTest.java:1961:21:1961:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1962:30:1962:37 | source(...) : Object | LogInjectionTest.java:1962:21:1962:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1963:30:1963:37 | source(...) : Object | LogInjectionTest.java:1963:21:1963:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1964:30:1964:37 | source(...) : Object | LogInjectionTest.java:1964:21:1964:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1965:30:1965:37 | source(...) : Object | LogInjectionTest.java:1965:21:1965:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1966:30:1966:37 | source(...) : Object | LogInjectionTest.java:1966:21:1966:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1967:30:1967:37 | source(...) : Object | LogInjectionTest.java:1967:21:1967:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1968:30:1968:37 | source(...) : Object | LogInjectionTest.java:1968:21:1968:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1969:30:1969:37 | source(...) : Object | LogInjectionTest.java:1969:21:1969:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1970:30:1970:37 | source(...) : Object | LogInjectionTest.java:1970:21:1970:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1971:30:1971:37 | source(...) : Object | LogInjectionTest.java:1971:21:1971:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1972:30:1972:37 | source(...) : Object | LogInjectionTest.java:1972:21:1972:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1973:30:1973:37 | source(...) : Object | LogInjectionTest.java:1973:21:1973:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1974:30:1974:37 | source(...) : Object | LogInjectionTest.java:1974:21:1974:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1975:30:1975:37 | source(...) : Object | LogInjectionTest.java:1975:21:1975:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1976:30:1976:37 | source(...) : Object | LogInjectionTest.java:1976:21:1976:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1977:30:1977:37 | source(...) : Object | LogInjectionTest.java:1977:21:1977:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1978:30:1978:37 | source(...) : Object | LogInjectionTest.java:1978:21:1978:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1979:30:1979:37 | source(...) : Object | LogInjectionTest.java:1979:21:1979:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1980:30:1980:37 | source(...) : Object | LogInjectionTest.java:1980:21:1980:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1981:30:1981:37 | source(...) : Object | LogInjectionTest.java:1981:21:1981:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1982:30:1982:37 | source(...) : Object | LogInjectionTest.java:1982:21:1982:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1983:30:1983:37 | source(...) : Object | LogInjectionTest.java:1983:21:1983:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1984:30:1984:37 | source(...) : Object | LogInjectionTest.java:1984:21:1984:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1985:30:1985:37 | source(...) : Object | LogInjectionTest.java:1985:21:1985:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1986:30:1986:37 | source(...) : Object | LogInjectionTest.java:1986:21:1986:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1987:30:1987:37 | source(...) : Object | LogInjectionTest.java:1987:21:1987:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1988:30:1988:37 | source(...) : Object | LogInjectionTest.java:1988:21:1988:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1989:30:1989:37 | source(...) : Object | LogInjectionTest.java:1989:21:1989:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1990:30:1990:37 | source(...) : Object | LogInjectionTest.java:1990:21:1990:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1991:30:1991:37 | source(...) : Object | LogInjectionTest.java:1991:21:1991:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1992:30:1992:37 | source(...) : Object | LogInjectionTest.java:1992:21:1992:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1993:30:1993:37 | source(...) : Object | LogInjectionTest.java:1993:21:1993:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1994:30:1994:37 | source(...) : Object | LogInjectionTest.java:1994:21:1994:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1995:30:1995:37 | source(...) : Object | LogInjectionTest.java:1995:21:1995:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1996:30:1996:37 | source(...) : Object | LogInjectionTest.java:1996:21:1996:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1997:30:1997:37 | source(...) : Object | LogInjectionTest.java:1997:21:1997:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1998:30:1998:37 | source(...) : Object | LogInjectionTest.java:1998:21:1998:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:1999:30:1999:37 | source(...) : Object | LogInjectionTest.java:1999:21:1999:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:2000:30:2000:37 | source(...) : Object | LogInjectionTest.java:2000:21:2000:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:2001:30:2001:37 | source(...) : Object | LogInjectionTest.java:2001:21:2001:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:2002:30:2002:37 | source(...) : Object | LogInjectionTest.java:2002:21:2002:37 | (...)... | provenance | Src:MaD:537 Sink:MaD:18 |
+| LogInjectionTest.java:2007:36:2007:43 | source(...) : Object | LogInjectionTest.java:2007:27:2007:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:20 |
+| LogInjectionTest.java:2008:57:2008:64 | source(...) : Object | LogInjectionTest.java:2008:27:2008:64 | (...)... | provenance | Src:MaD:537 Sink:MaD:20 |
+| LogInjectionTest.java:2009:34:2009:41 | source(...) : Object | LogInjectionTest.java:2009:25:2009:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:26 |
+| LogInjectionTest.java:2010:55:2010:62 | source(...) : Object | LogInjectionTest.java:2010:25:2010:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:26 |
+| LogInjectionTest.java:2011:35:2011:42 | source(...) : Object | LogInjectionTest.java:2011:26:2011:42 | (...)... | provenance | Src:MaD:537 Sink:MaD:27 |
+| LogInjectionTest.java:2012:56:2012:63 | source(...) : Object | LogInjectionTest.java:2012:26:2012:63 | (...)... | provenance | Src:MaD:537 Sink:MaD:27 |
+| LogInjectionTest.java:2013:36:2013:43 | source(...) : Object | LogInjectionTest.java:2013:27:2013:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:28 |
+| LogInjectionTest.java:2014:57:2014:64 | source(...) : Object | LogInjectionTest.java:2014:27:2014:64 | (...)... | provenance | Src:MaD:537 Sink:MaD:28 |
+| LogInjectionTest.java:2015:34:2015:41 | source(...) : Object | LogInjectionTest.java:2015:25:2015:41 | (...)... | provenance | Src:MaD:537 Sink:MaD:29 |
+| LogInjectionTest.java:2016:55:2016:62 | source(...) : Object | LogInjectionTest.java:2016:25:2016:62 | (...)... | provenance | Src:MaD:537 Sink:MaD:29 |
+| LogInjectionTest.java:2017:36:2017:43 | source(...) : Object | LogInjectionTest.java:2017:27:2017:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:52 |
+| LogInjectionTest.java:2018:57:2018:64 | source(...) : Object | LogInjectionTest.java:2018:27:2018:64 | (...)... | provenance | Src:MaD:537 Sink:MaD:52 |
+| LogInjectionTest.java:2019:37:2019:44 | source(...) : Object | LogInjectionTest.java:2019:28:2019:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:53 |
+| LogInjectionTest.java:2020:58:2020:65 | source(...) : Object | LogInjectionTest.java:2020:28:2020:65 | (...)... | provenance | Src:MaD:537 Sink:MaD:53 |
+| LogInjectionTest.java:2021:38:2021:45 | source(...) : Object | LogInjectionTest.java:2021:29:2021:45 | (...)... | provenance | Src:MaD:537 Sink:MaD:21 |
+| LogInjectionTest.java:2022:53:2022:60 | source(...) : Object | LogInjectionTest.java:2022:44:2022:60 | (...)... | provenance | Src:MaD:537 Sink:MaD:21 |
+| LogInjectionTest.java:2023:38:2023:45 | source(...) : Object | LogInjectionTest.java:2023:29:2023:45 | (...)... | provenance | Src:MaD:537 Sink:MaD:22 |
+| LogInjectionTest.java:2024:53:2024:60 | source(...) : Object | LogInjectionTest.java:2024:44:2024:60 | (...)... | provenance | Src:MaD:537 Sink:MaD:22 |
+| LogInjectionTest.java:2025:68:2025:75 | source(...) : Object | LogInjectionTest.java:2025:59:2025:75 | (...)... | provenance | Src:MaD:537 Sink:MaD:22 |
+| LogInjectionTest.java:2026:38:2026:45 | source(...) : Object | LogInjectionTest.java:2026:29:2026:45 | (...)... | provenance | Src:MaD:537 Sink:MaD:23 |
+| LogInjectionTest.java:2027:53:2027:60 | source(...) : Object | LogInjectionTest.java:2027:44:2027:60 | (...)... | provenance | Src:MaD:537 Sink:MaD:23 |
+| LogInjectionTest.java:2028:59:2028:81 | {...} : Object[] [[]] : Object | LogInjectionTest.java:2028:59:2028:81 | new Object[] | provenance | Sink:MaD:23 |
+| LogInjectionTest.java:2028:73:2028:80 | source(...) : Object | LogInjectionTest.java:2028:59:2028:81 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:2029:37:2029:44 | source(...) : Object | LogInjectionTest.java:2029:28:2029:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:24 |
+| LogInjectionTest.java:2030:52:2030:59 | source(...) : Object | LogInjectionTest.java:2030:43:2030:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:24 |
+| LogInjectionTest.java:2031:37:2031:44 | source(...) : Object | LogInjectionTest.java:2031:28:2031:44 | (...)... | provenance | Src:MaD:537 Sink:MaD:25 |
+| LogInjectionTest.java:2032:52:2032:59 | source(...) : Object | LogInjectionTest.java:2032:43:2032:59 | (...)... | provenance | Src:MaD:537 Sink:MaD:25 |
+| LogInjectionTest.java:2033:67:2033:74 | source(...) : Object | LogInjectionTest.java:2033:58:2033:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:25 |
+| LogInjectionTest.java:2034:65:2034:72 | source(...) : Object | LogInjectionTest.java:2034:56:2034:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:30 |
+| LogInjectionTest.java:2035:65:2035:72 | source(...) : Object | LogInjectionTest.java:2035:56:2035:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:31 |
+| LogInjectionTest.java:2037:65:2037:72 | source(...) : Object | LogInjectionTest.java:2037:56:2037:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:32 |
+| LogInjectionTest.java:2038:71:2038:92 | {...} : Object[] [[]] : Object | LogInjectionTest.java:2038:71:2038:92 | new Object[] | provenance | Sink:MaD:32 |
+| LogInjectionTest.java:2038:84:2038:91 | source(...) : Object | LogInjectionTest.java:2038:71:2038:92 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:2039:65:2039:72 | source(...) : Object | LogInjectionTest.java:2039:56:2039:72 | (...)... | provenance | Src:MaD:537 Sink:MaD:33 |
+| LogInjectionTest.java:2040:86:2040:93 | source(...) : Object | LogInjectionTest.java:2040:56:2040:93 | (...)... | provenance | Src:MaD:537 Sink:MaD:34 |
+| LogInjectionTest.java:2041:104:2041:111 | source(...) : Object | LogInjectionTest.java:2041:74:2041:111 | (...)... | provenance | Src:MaD:537 Sink:MaD:35 |
+| LogInjectionTest.java:2042:36:2042:43 | source(...) : Object | LogInjectionTest.java:2042:24:2042:43 | (...)... | provenance | Src:MaD:537 Sink:MaD:36 |
+| LogInjectionTest.java:2043:66:2043:73 | source(...) : Object | LogInjectionTest.java:2043:57:2043:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:37 |
+| LogInjectionTest.java:2044:81:2044:88 | source(...) : Object | LogInjectionTest.java:2044:72:2044:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:37 |
+| LogInjectionTest.java:2045:96:2045:103 | source(...) : Object | LogInjectionTest.java:2045:87:2045:103 | (...)... | provenance | Src:MaD:537 Sink:MaD:37 |
+| LogInjectionTest.java:2046:66:2046:73 | source(...) : Object | LogInjectionTest.java:2046:57:2046:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:38 |
+| LogInjectionTest.java:2047:81:2047:88 | source(...) : Object | LogInjectionTest.java:2047:72:2047:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:38 |
+| LogInjectionTest.java:2048:96:2048:103 | source(...) : Object | LogInjectionTest.java:2048:87:2048:103 | (...)... | provenance | Src:MaD:537 Sink:MaD:38 |
+| LogInjectionTest.java:2050:66:2050:73 | source(...) : Object | LogInjectionTest.java:2050:57:2050:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:39 |
+| LogInjectionTest.java:2051:81:2051:88 | source(...) : Object | LogInjectionTest.java:2051:72:2051:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:39 |
+| LogInjectionTest.java:2052:96:2052:103 | source(...) : Object | LogInjectionTest.java:2052:87:2052:103 | (...)... | provenance | Src:MaD:537 Sink:MaD:39 |
+| LogInjectionTest.java:2053:102:2053:124 | {...} : Object[] [[]] : Object | LogInjectionTest.java:2053:102:2053:124 | new Object[] | provenance | Sink:MaD:39 |
+| LogInjectionTest.java:2053:116:2053:123 | source(...) : Object | LogInjectionTest.java:2053:102:2053:124 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:2054:66:2054:73 | source(...) : Object | LogInjectionTest.java:2054:57:2054:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:40 |
+| LogInjectionTest.java:2055:81:2055:88 | source(...) : Object | LogInjectionTest.java:2055:72:2055:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:40 |
+| LogInjectionTest.java:2056:96:2056:103 | source(...) : Object | LogInjectionTest.java:2056:87:2056:103 | (...)... | provenance | Src:MaD:537 Sink:MaD:40 |
+| LogInjectionTest.java:2057:66:2057:73 | source(...) : Object | LogInjectionTest.java:2057:57:2057:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:41 |
+| LogInjectionTest.java:2058:81:2058:88 | source(...) : Object | LogInjectionTest.java:2058:72:2058:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:41 |
+| LogInjectionTest.java:2059:117:2059:124 | source(...) : Object | LogInjectionTest.java:2059:87:2059:124 | (...)... | provenance | Src:MaD:537 Sink:MaD:41 |
+| LogInjectionTest.java:2060:66:2060:73 | source(...) : Object | LogInjectionTest.java:2060:57:2060:73 | (...)... | provenance | Src:MaD:537 Sink:MaD:42 |
+| LogInjectionTest.java:2061:81:2061:88 | source(...) : Object | LogInjectionTest.java:2061:72:2061:88 | (...)... | provenance | Src:MaD:537 Sink:MaD:42 |
+| LogInjectionTest.java:2062:135:2062:142 | source(...) : Object | LogInjectionTest.java:2062:105:2062:142 | (...)... | provenance | Src:MaD:537 Sink:MaD:43 |
+| LogInjectionTest.java:2063:67:2063:74 | source(...) : Object | LogInjectionTest.java:2063:58:2063:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:44 |
+| LogInjectionTest.java:2064:82:2064:89 | source(...) : Object | LogInjectionTest.java:2064:73:2064:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:44 |
+| LogInjectionTest.java:2065:120:2065:127 | source(...) : Object | LogInjectionTest.java:2065:111:2065:127 | (...)... | provenance | Src:MaD:537 Sink:MaD:45 |
+| LogInjectionTest.java:2066:126:2066:148 | {...} : Object[] [[]] : Object | LogInjectionTest.java:2066:126:2066:148 | new Object[] | provenance | Sink:MaD:45 |
+| LogInjectionTest.java:2066:140:2066:147 | source(...) : Object | LogInjectionTest.java:2066:126:2066:148 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:2067:67:2067:74 | source(...) : Object | LogInjectionTest.java:2067:58:2067:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:46 |
+| LogInjectionTest.java:2068:82:2068:89 | source(...) : Object | LogInjectionTest.java:2068:73:2068:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:46 |
+| LogInjectionTest.java:2069:120:2069:127 | source(...) : Object | LogInjectionTest.java:2069:111:2069:127 | (...)... | provenance | Src:MaD:537 Sink:MaD:47 |
+| LogInjectionTest.java:2070:67:2070:74 | source(...) : Object | LogInjectionTest.java:2070:58:2070:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:48 |
+| LogInjectionTest.java:2071:82:2071:89 | source(...) : Object | LogInjectionTest.java:2071:73:2071:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:48 |
+| LogInjectionTest.java:2072:97:2072:104 | source(...) : Object | LogInjectionTest.java:2072:88:2072:104 | (...)... | provenance | Src:MaD:537 Sink:MaD:48 |
+| LogInjectionTest.java:2073:112:2073:119 | source(...) : Object | LogInjectionTest.java:2073:103:2073:119 | (...)... | provenance | Src:MaD:537 Sink:MaD:48 |
+| LogInjectionTest.java:2074:67:2074:74 | source(...) : Object | LogInjectionTest.java:2074:58:2074:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:49 |
+| LogInjectionTest.java:2075:82:2075:89 | source(...) : Object | LogInjectionTest.java:2075:73:2075:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:49 |
+| LogInjectionTest.java:2076:97:2076:104 | source(...) : Object | LogInjectionTest.java:2076:88:2076:104 | (...)... | provenance | Src:MaD:537 Sink:MaD:49 |
+| LogInjectionTest.java:2077:112:2077:119 | source(...) : Object | LogInjectionTest.java:2077:103:2077:119 | (...)... | provenance | Src:MaD:537 Sink:MaD:49 |
+| LogInjectionTest.java:2079:67:2079:74 | source(...) : Object | LogInjectionTest.java:2079:58:2079:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:50 |
+| LogInjectionTest.java:2080:82:2080:89 | source(...) : Object | LogInjectionTest.java:2080:73:2080:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:50 |
+| LogInjectionTest.java:2081:97:2081:104 | source(...) : Object | LogInjectionTest.java:2081:88:2081:104 | (...)... | provenance | Src:MaD:537 Sink:MaD:50 |
+| LogInjectionTest.java:2082:112:2082:119 | source(...) : Object | LogInjectionTest.java:2082:103:2082:119 | (...)... | provenance | Src:MaD:537 Sink:MaD:50 |
+| LogInjectionTest.java:2083:118:2083:140 | {...} : Object[] [[]] : Object | LogInjectionTest.java:2083:118:2083:140 | new Object[] | provenance | Sink:MaD:50 |
+| LogInjectionTest.java:2083:132:2083:139 | source(...) : Object | LogInjectionTest.java:2083:118:2083:140 | {...} : Object[] [[]] : Object | provenance | Src:MaD:537  |
+| LogInjectionTest.java:2084:67:2084:74 | source(...) : Object | LogInjectionTest.java:2084:58:2084:74 | (...)... | provenance | Src:MaD:537 Sink:MaD:51 |
+| LogInjectionTest.java:2085:82:2085:89 | source(...) : Object | LogInjectionTest.java:2085:73:2085:89 | (...)... | provenance | Src:MaD:537 Sink:MaD:51 |
+| LogInjectionTest.java:2086:97:2086:104 | source(...) : Object | LogInjectionTest.java:2086:88:2086:104 | (...)... | provenance | Src:MaD:537 Sink:MaD:51 |
+| LogInjectionTest.java:2087:112:2087:119 | source(...) : Object | LogInjectionTest.java:2087:103:2087:119 | (...)... | provenance | Src:MaD:537 Sink:MaD:51 |
+| LogInjectionTest.java:2091:45:2091:52 | source(...) : Object | LogInjectionTest.java:2091:36:2091:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:1 |
+| LogInjectionTest.java:2092:45:2092:52 | source(...) : Object | LogInjectionTest.java:2092:36:2092:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:4 |
+| LogInjectionTest.java:2093:45:2093:52 | source(...) : Object | LogInjectionTest.java:2093:36:2093:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:3 |
+| LogInjectionTest.java:2094:45:2094:52 | source(...) : Object | LogInjectionTest.java:2094:36:2094:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:5 |
+| LogInjectionTest.java:2095:45:2095:52 | source(...) : Object | LogInjectionTest.java:2095:36:2095:52 | (...)... | provenance | Src:MaD:537 Sink:MaD:2 |
+| LogInjectionTest.java:2096:47:2096:54 | source(...) : Object | LogInjectionTest.java:2096:38:2096:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:6 |
+| LogInjectionTest.java:2101:47:2101:54 | source(...) : Object | LogInjectionTest.java:2101:38:2101:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:54 |
+| LogInjectionTest.java:2103:47:2103:54 | source(...) : Object | LogInjectionTest.java:2103:38:2103:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:55 |
+| LogInjectionTest.java:2105:47:2105:54 | source(...) : Object | LogInjectionTest.java:2105:38:2105:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:56 |
+| LogInjectionTest.java:2107:47:2107:54 | source(...) : Object | LogInjectionTest.java:2107:38:2107:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:57 |
+| LogInjectionTest.java:2109:47:2109:54 | source(...) : Object | LogInjectionTest.java:2109:38:2109:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:58 |
+| LogInjectionTest.java:2111:47:2111:54 | source(...) : Object | LogInjectionTest.java:2111:38:2111:54 | (...)... | provenance | Src:MaD:537 Sink:MaD:59 |
 models
 | 1 | Sink: android.util; Log; true; d; ; ; Argument[1]; log-injection; manual |
 | 2 | Sink: android.util; Log; true; e; ; ; Argument[1]; log-injection; manual |
@@ -4435,145 +4440,232 @@ models
 | 533 | Sink: org.slf4j; Logger; true; warn; (String,Object,Object); ; Argument[0..2]; log-injection; manual |
 | 534 | Sink: org.slf4j; Logger; true; warn; (String,Object[]); ; Argument[0..1]; log-injection; manual |
 | 535 | Sink: org.slf4j; Logger; true; warn; (String,Throwable); ; Argument[0]; log-injection; manual |
-| 536 | Source: loginjection; LogInjectionTest; false; source; (); ; ReturnValue; remote; manual |
-| 537 | Summary: java.lang; String; false; replace; ; ; Argument[this]; ReturnValue; taint; manual |
-| 538 | Summary: java.lang; String; false; replaceAll; ; ; Argument[this]; ReturnValue; taint; manual |
+| 536 | Source: loginjection; LibrarySanitizers; false; source; (); ; ReturnValue; remote; manual |
+| 537 | Source: loginjection; LogInjectionTest; false; source; (); ; ReturnValue; remote; manual |
+| 538 | Summary: com.google.common.base; CharMatcher; true; removeFrom; (CharSequence); ; Argument[0]; ReturnValue; taint; manual |
+| 539 | Summary: java.lang; String; false; replace; ; ; Argument[1]; ReturnValue; taint; manual |
+| 540 | Summary: java.lang; String; false; replace; ; ; Argument[this]; ReturnValue; taint; manual |
+| 541 | Summary: java.lang; String; false; replaceAll; ; ; Argument[this]; ReturnValue; taint; manual |
 nodes
+| LibrarySanitizers.java:12:25:12:32 | source(...) : String | semmle.label | source(...) : String |
+| LibrarySanitizers.java:16:22:16:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:16:22:16:47 | replace(...) | semmle.label | replace(...) |
+| LibrarySanitizers.java:17:22:17:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:17:22:17:47 | replace(...) | semmle.label | replace(...) |
+| LibrarySanitizers.java:19:22:19:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:19:22:19:47 | replace(...) | semmle.label | replace(...) |
+| LibrarySanitizers.java:20:22:20:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:20:22:20:47 | replace(...) | semmle.label | replace(...) |
+| LibrarySanitizers.java:21:22:21:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:21:22:21:57 | replace(...) | semmle.label | replace(...) |
+| LibrarySanitizers.java:22:22:22:47 | replace(...) | semmle.label | replace(...) |
+| LibrarySanitizers.java:22:41:22:46 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:24:22:24:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:24:22:24:47 | replace(...) | semmle.label | replace(...) |
+| LibrarySanitizers.java:25:22:25:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:25:22:25:47 | replace(...) | semmle.label | replace(...) |
+| LibrarySanitizers.java:27:22:27:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:27:22:27:47 | replace(...) | semmle.label | replace(...) |
+| LibrarySanitizers.java:28:22:28:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:28:22:28:47 | replace(...) | semmle.label | replace(...) |
+| LibrarySanitizers.java:29:22:29:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:29:22:29:45 | replace(...) | semmle.label | replace(...) |
+| LibrarySanitizers.java:31:22:31:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:31:22:31:50 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:32:22:32:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:32:22:32:50 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:34:22:34:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:34:22:34:50 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:35:22:35:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:35:22:35:50 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:37:22:37:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:37:22:37:51 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:38:22:38:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:38:22:38:51 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:40:22:40:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:40:22:40:51 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:41:22:41:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:41:22:41:51 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:43:22:43:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:43:22:43:51 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:44:22:44:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:44:22:44:51 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:46:22:46:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:46:22:46:57 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:47:22:47:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:47:22:47:57 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:48:22:48:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:48:22:48:57 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:49:22:49:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:49:22:49:57 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:50:22:50:27 | source : String | semmle.label | source : String |
+| LibrarySanitizers.java:50:22:50:58 | replaceAll(...) | semmle.label | replaceAll(...) |
+| LibrarySanitizers.java:72:25:72:32 | source(...) : String | semmle.label | source(...) : String |
+| LibrarySanitizers.java:82:22:82:47 | removeFrom(...) | semmle.label | removeFrom(...) |
+| LibrarySanitizers.java:82:41:82:46 | source : String | semmle.label | source : String |
 | LogInjectionTest.java:35:25:35:41 | (...)... : String | semmle.label | (...)... : String |
 | LogInjectionTest.java:35:34:35:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:38:22:38:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:38:22:38:47 | replace(...) | semmle.label | replace(...) |
-| LogInjectionTest.java:39:22:39:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:39:22:39:47 | replace(...) | semmle.label | replace(...) |
-| LogInjectionTest.java:41:22:41:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:41:22:41:47 | replace(...) | semmle.label | replace(...) |
-| LogInjectionTest.java:42:22:42:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:42:22:42:47 | replace(...) | semmle.label | replace(...) |
-| LogInjectionTest.java:43:22:43:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:43:22:43:57 | replace(...) | semmle.label | replace(...) |
-| LogInjectionTest.java:45:22:45:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:45:22:45:47 | replace(...) | semmle.label | replace(...) |
-| LogInjectionTest.java:46:22:46:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:46:22:46:47 | replace(...) | semmle.label | replace(...) |
-| LogInjectionTest.java:48:22:48:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:48:22:48:47 | replace(...) | semmle.label | replace(...) |
-| LogInjectionTest.java:49:22:49:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:49:22:49:47 | replace(...) | semmle.label | replace(...) |
-| LogInjectionTest.java:50:22:50:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:50:22:50:45 | replace(...) | semmle.label | replace(...) |
-| LogInjectionTest.java:52:22:52:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:52:22:52:50 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:53:22:53:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:53:22:53:50 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:55:22:55:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:55:22:55:50 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:56:22:56:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:56:22:56:50 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:58:22:58:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:58:22:58:51 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:59:22:59:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:59:22:59:51 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:61:22:61:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:61:22:61:51 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:62:22:62:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:62:22:62:51 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:64:22:64:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:64:22:64:51 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:65:22:65:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:65:22:65:51 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:67:22:67:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:67:22:67:57 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:68:22:68:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:68:22:68:57 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:69:22:69:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:69:22:69:57 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:70:22:70:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:70:22:70:57 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:71:22:71:27 | source : String | semmle.label | source : String |
-| LogInjectionTest.java:71:22:71:58 | replaceAll(...) | semmle.label | replaceAll(...) |
-| LogInjectionTest.java:75:25:75:41 | (...)... : String | semmle.label | (...)... : String |
-| LogInjectionTest.java:75:34:75:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:79:26:79:31 | source | semmle.label | source |
-| LogInjectionTest.java:85:26:85:31 | source | semmle.label | source |
-| LogInjectionTest.java:91:26:91:31 | source | semmle.label | source |
-| LogInjectionTest.java:97:26:97:31 | source | semmle.label | source |
-| LogInjectionTest.java:103:26:103:31 | source | semmle.label | source |
-| LogInjectionTest.java:109:26:109:31 | source | semmle.label | source |
-| LogInjectionTest.java:115:26:115:31 | source | semmle.label | source |
-| LogInjectionTest.java:121:26:121:31 | source | semmle.label | source |
-| LogInjectionTest.java:127:26:127:31 | source | semmle.label | source |
-| LogInjectionTest.java:133:26:133:31 | source | semmle.label | source |
+| LogInjectionTest.java:39:26:39:31 | source | semmle.label | source |
+| LogInjectionTest.java:45:26:45:31 | source | semmle.label | source |
+| LogInjectionTest.java:51:26:51:31 | source | semmle.label | source |
+| LogInjectionTest.java:57:26:57:31 | source | semmle.label | source |
+| LogInjectionTest.java:63:26:63:31 | source | semmle.label | source |
+| LogInjectionTest.java:69:26:69:31 | source | semmle.label | source |
+| LogInjectionTest.java:75:26:75:31 | source | semmle.label | source |
+| LogInjectionTest.java:81:26:81:31 | source | semmle.label | source |
+| LogInjectionTest.java:87:26:87:31 | source | semmle.label | source |
+| LogInjectionTest.java:93:26:93:31 | source | semmle.label | source |
+| LogInjectionTest.java:101:26:101:31 | source | semmle.label | source |
+| LogInjectionTest.java:107:26:107:31 | source | semmle.label | source |
+| LogInjectionTest.java:113:26:113:31 | source | semmle.label | source |
+| LogInjectionTest.java:119:26:119:31 | source | semmle.label | source |
+| LogInjectionTest.java:125:26:125:31 | source | semmle.label | source |
+| LogInjectionTest.java:131:26:131:31 | source | semmle.label | source |
+| LogInjectionTest.java:135:26:135:31 | source | semmle.label | source |
+| LogInjectionTest.java:137:26:137:31 | source | semmle.label | source |
 | LogInjectionTest.java:141:26:141:31 | source | semmle.label | source |
+| LogInjectionTest.java:143:26:143:31 | source | semmle.label | source |
 | LogInjectionTest.java:147:26:147:31 | source | semmle.label | source |
 | LogInjectionTest.java:153:26:153:31 | source | semmle.label | source |
-| LogInjectionTest.java:159:26:159:31 | source | semmle.label | source |
-| LogInjectionTest.java:165:26:165:31 | source | semmle.label | source |
-| LogInjectionTest.java:171:26:171:31 | source | semmle.label | source |
-| LogInjectionTest.java:175:26:175:31 | source | semmle.label | source |
-| LogInjectionTest.java:177:26:177:31 | source | semmle.label | source |
-| LogInjectionTest.java:181:26:181:31 | source | semmle.label | source |
-| LogInjectionTest.java:183:26:183:31 | source | semmle.label | source |
-| LogInjectionTest.java:187:26:187:31 | source | semmle.label | source |
-| LogInjectionTest.java:193:26:193:31 | source | semmle.label | source |
-| LogInjectionTest.java:205:39:205:55 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:205:48:205:55 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:206:28:206:35 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:207:28:207:35 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:208:28:208:35 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:209:28:209:35 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:210:28:210:35 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:211:28:211:35 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:212:44:212:51 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:213:27:213:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:214:27:214:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:215:41:215:63 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:215:41:215:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:215:55:215:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:216:32:216:39 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:217:32:217:39 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:218:38:218:45 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:219:27:219:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:220:27:220:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:225:26:225:48 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:225:41:225:48 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:226:26:226:48 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:226:41:226:48 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:227:41:227:63 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:227:56:227:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:228:41:228:63 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:228:56:228:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:229:41:229:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:229:51:229:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:230:41:230:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:230:59:230:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:231:41:231:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:231:59:231:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:232:41:232:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:233:41:233:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:233:50:233:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:234:41:234:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:234:50:234:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:235:56:235:78 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:235:56:235:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:235:70:235:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:236:56:236:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:236:65:236:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:237:41:237:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:237:50:237:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:238:71:238:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:238:80:238:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:239:56:239:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:239:65:239:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:240:41:240:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:240:50:240:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:241:86:241:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:241:95:241:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:242:71:242:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:242:80:242:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:243:56:243:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:243:65:243:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:244:41:244:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:244:50:244:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:165:39:165:55 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:165:48:165:55 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:166:28:166:35 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:167:28:167:35 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:168:28:168:35 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:169:28:169:35 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:170:28:170:35 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:171:28:171:35 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:172:44:172:51 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:173:27:173:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:174:27:174:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:175:41:175:63 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:175:41:175:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:175:55:175:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:176:32:176:39 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:177:32:177:39 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:178:38:178:45 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:179:27:179:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:180:27:180:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:185:26:185:48 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:185:41:185:48 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:186:26:186:48 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:186:41:186:48 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:187:41:187:63 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:187:56:187:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:188:41:188:63 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:188:56:188:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:189:41:189:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:189:51:189:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:190:41:190:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:190:59:190:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:191:41:191:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:191:59:191:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:192:41:192:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:193:41:193:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:193:50:193:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:194:41:194:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:194:50:194:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:195:56:195:78 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:195:56:195:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:195:70:195:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:196:56:196:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:196:65:196:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:197:41:197:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:197:50:197:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:198:71:198:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:198:80:198:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:199:56:199:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:199:65:199:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:200:41:200:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:200:50:200:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:201:86:201:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:201:95:201:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:202:71:202:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:202:80:202:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:203:56:203:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:203:65:203:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:204:41:204:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:204:50:204:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:205:101:205:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:205:110:205:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:206:86:206:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:206:95:206:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:207:71:207:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:207:80:207:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:208:56:208:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:208:65:208:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:209:41:209:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:209:50:209:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:210:116:210:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:210:125:210:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:211:101:211:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:211:110:211:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:212:86:212:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:212:95:212:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:213:71:213:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:213:80:213:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:214:56:214:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:214:65:214:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:215:41:215:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:215:50:215:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:216:131:216:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:216:140:216:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:217:116:217:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:217:125:217:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:218:101:218:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:218:110:218:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:219:86:219:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:219:95:219:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:220:71:220:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:220:80:220:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:221:56:221:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:221:65:221:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:222:41:222:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:222:50:222:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:223:146:223:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:223:155:223:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:224:131:224:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:224:140:224:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:225:116:225:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:225:125:225:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:226:101:226:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:226:110:226:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:227:86:227:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:227:95:227:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:228:71:228:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:228:80:228:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:229:56:229:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:229:65:229:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:230:41:230:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:230:50:230:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:231:161:231:177 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:231:170:231:177 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:232:146:232:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:232:155:232:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:233:131:233:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:233:140:233:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:234:116:234:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:234:125:234:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:235:101:235:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:235:110:235:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:236:86:236:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:236:95:236:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:237:71:237:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:237:80:237:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:238:56:238:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:238:65:238:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:239:41:239:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:239:50:239:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:240:176:240:192 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:240:185:240:192 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:241:161:241:177 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:241:170:241:177 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:242:146:242:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:242:155:242:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:243:131:243:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:243:140:243:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:244:116:244:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:244:125:244:132 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:245:101:245:117 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:245:110:245:117 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:246:86:246:102 | (...)... | semmle.label | (...)... |
@@ -4584,74 +4676,73 @@ nodes
 | LogInjectionTest.java:248:65:248:72 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:249:41:249:57 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:249:50:249:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:250:116:250:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:250:125:250:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:251:101:251:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:251:110:251:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:252:86:252:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:252:95:252:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:253:71:253:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:253:80:253:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:254:56:254:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:254:65:254:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:255:41:255:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:255:50:255:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:256:131:256:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:256:140:256:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:257:116:257:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:257:125:257:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:258:101:258:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:258:110:258:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:259:86:259:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:259:95:259:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:260:71:260:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:260:80:260:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:261:56:261:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:261:65:261:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:262:41:262:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:262:50:262:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:263:146:263:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:263:155:263:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:264:131:264:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:264:140:264:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:265:116:265:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:265:125:265:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:266:101:266:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:266:110:266:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:267:86:267:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:267:95:267:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:268:71:268:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:268:80:268:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:269:56:269:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:269:65:269:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:270:41:270:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:270:50:270:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:271:161:271:177 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:271:170:271:177 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:272:146:272:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:272:155:272:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:273:131:273:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:273:140:273:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:274:116:274:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:274:125:274:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:275:101:275:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:275:110:275:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:276:86:276:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:276:95:276:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:277:71:277:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:277:80:277:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:278:56:278:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:278:65:278:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:279:41:279:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:279:50:279:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:280:176:280:192 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:280:185:280:192 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:281:161:281:177 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:281:170:281:177 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:282:146:282:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:282:155:282:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:283:131:283:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:283:140:283:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:250:41:250:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:250:50:250:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:251:56:251:77 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:251:70:251:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:252:41:252:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:252:50:252:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:253:41:253:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:253:55:253:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:254:41:254:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:254:55:254:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:255:26:255:51 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:255:44:255:51 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:256:26:256:51 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:256:44:256:51 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:257:26:257:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:257:36:257:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:258:26:258:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:258:36:258:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:259:26:259:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:260:26:260:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:261:26:261:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:261:35:261:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:262:26:262:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:262:35:262:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:263:41:263:63 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:263:41:263:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:263:55:263:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:264:41:264:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:264:50:264:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:265:26:265:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:265:35:265:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:266:56:266:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:266:65:266:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:267:41:267:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:267:50:267:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:268:26:268:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:268:35:268:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:269:71:269:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:269:80:269:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:270:56:270:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:270:65:270:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:271:41:271:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:271:50:271:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:272:26:272:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:272:35:272:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:273:86:273:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:273:95:273:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:274:71:274:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:274:80:274:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:275:56:275:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:275:65:275:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:276:41:276:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:276:50:276:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:277:26:277:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:277:35:277:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:278:101:278:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:278:110:278:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:279:86:279:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:279:95:279:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:280:71:280:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:280:80:280:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:281:56:281:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:281:65:281:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:282:41:282:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:282:50:282:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:283:26:283:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:283:35:283:42 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:284:116:284:132 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:284:125:284:132 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:285:101:285:117 | (...)... | semmle.label | (...)... |
@@ -4664,51 +4755,52 @@ nodes
 | LogInjectionTest.java:288:65:288:72 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:289:41:289:57 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:289:50:289:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:290:41:290:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:290:50:290:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:291:56:291:77 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:291:70:291:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:292:41:292:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:292:50:292:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:293:41:293:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:293:55:293:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:294:41:294:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:294:55:294:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:295:26:295:51 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:295:44:295:51 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:296:26:296:51 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:296:44:296:51 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:297:26:297:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:297:36:297:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:298:26:298:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:298:36:298:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:299:26:299:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:300:26:300:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:301:26:301:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:301:35:301:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:302:26:302:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:302:35:302:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:303:41:303:63 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:303:41:303:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:303:55:303:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:304:41:304:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:304:50:304:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:305:26:305:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:305:35:305:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:306:56:306:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:306:65:306:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:307:41:307:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:307:50:307:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:308:26:308:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:308:35:308:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:309:71:309:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:309:80:309:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:310:56:310:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:310:65:310:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:311:41:311:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:311:50:311:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:312:26:312:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:312:35:312:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:290:26:290:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:290:35:290:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:291:131:291:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:291:140:291:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:292:116:292:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:292:125:292:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:293:101:293:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:293:110:293:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:294:86:294:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:294:95:294:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:295:71:295:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:295:80:295:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:296:56:296:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:296:65:296:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:297:41:297:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:297:50:297:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:298:26:298:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:298:35:298:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:299:146:299:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:299:155:299:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:300:131:300:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:300:140:300:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:301:116:301:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:301:125:301:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:302:101:302:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:302:110:302:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:303:86:303:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:303:95:303:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:304:71:304:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:304:80:304:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:305:56:305:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:305:65:305:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:306:41:306:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:306:50:306:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:307:26:307:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:307:35:307:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:308:161:308:177 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:308:170:308:177 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:309:146:309:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:309:155:309:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:310:131:310:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:310:140:310:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:311:116:311:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:311:125:311:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:312:101:312:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:312:110:312:117 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:313:86:313:102 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:313:95:313:102 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:314:71:314:87 | (...)... | semmle.label | (...)... |
@@ -4719,136 +4811,136 @@ nodes
 | LogInjectionTest.java:316:50:316:57 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:317:26:317:42 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:317:35:317:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:318:101:318:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:318:110:318:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:319:86:319:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:319:95:319:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:320:71:320:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:320:80:320:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:321:56:321:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:321:65:321:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:322:41:322:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:322:50:322:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:323:26:323:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:323:35:323:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:324:116:324:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:324:125:324:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:325:101:325:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:325:110:325:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:326:86:326:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:326:95:326:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:327:71:327:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:327:80:327:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:328:56:328:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:328:65:328:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:329:41:329:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:329:50:329:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:330:26:330:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:330:35:330:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:331:131:331:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:331:140:331:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:332:116:332:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:332:125:332:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:333:101:333:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:333:110:333:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:334:86:334:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:334:95:334:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:335:71:335:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:335:80:335:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:336:56:336:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:336:65:336:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:337:41:337:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:337:50:337:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:338:26:338:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:338:35:338:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:339:146:339:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:339:155:339:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:340:131:340:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:340:140:340:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:341:116:341:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:341:125:341:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:342:101:342:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:342:110:342:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:343:86:343:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:343:95:343:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:344:71:344:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:344:80:344:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:345:56:345:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:345:65:345:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:346:41:346:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:346:50:346:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:347:26:347:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:347:35:347:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:348:161:348:177 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:348:170:348:177 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:349:146:349:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:349:155:349:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:350:131:350:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:350:140:350:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:351:116:351:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:351:125:351:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:352:101:352:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:352:110:352:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:353:86:353:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:353:95:353:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:354:71:354:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:354:80:354:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:355:56:355:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:355:65:355:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:356:41:356:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:356:50:356:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:357:26:357:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:357:35:357:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:358:26:358:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:358:35:358:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:359:41:359:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:359:55:359:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:360:26:360:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:360:35:360:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:361:26:361:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:361:40:361:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:362:26:362:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:362:40:362:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:363:26:363:48 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:363:41:363:48 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:364:26:364:48 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:364:41:364:48 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:365:41:365:63 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:365:56:365:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:366:41:366:63 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:366:56:366:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:367:41:367:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:367:51:367:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:368:41:368:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:368:59:368:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:369:41:369:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:369:59:369:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:370:41:370:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:371:41:371:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:371:50:371:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:372:41:372:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:372:50:372:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:373:56:373:78 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:373:56:373:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:373:70:373:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:374:56:374:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:374:65:374:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:375:41:375:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:375:50:375:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:376:71:376:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:376:80:376:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:377:56:377:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:377:65:377:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:378:41:378:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:378:50:378:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:379:86:379:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:379:95:379:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:380:71:380:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:380:80:380:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:381:56:381:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:381:65:381:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:382:41:382:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:382:50:382:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:318:26:318:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:318:35:318:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:319:41:319:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:319:55:319:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:320:26:320:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:320:35:320:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:321:26:321:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:321:40:321:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:322:26:322:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:322:40:322:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:323:26:323:48 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:323:41:323:48 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:324:26:324:48 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:324:41:324:48 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:325:41:325:63 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:325:56:325:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:326:41:326:63 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:326:56:326:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:327:41:327:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:327:51:327:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:328:41:328:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:328:59:328:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:329:41:329:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:329:59:329:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:330:41:330:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:331:41:331:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:331:50:331:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:332:41:332:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:332:50:332:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:333:56:333:78 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:333:56:333:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:333:70:333:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:334:56:334:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:334:65:334:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:335:41:335:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:335:50:335:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:336:71:336:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:336:80:336:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:337:56:337:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:337:65:337:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:338:41:338:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:338:50:338:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:339:86:339:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:339:95:339:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:340:71:340:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:340:80:340:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:341:56:341:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:341:65:341:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:342:41:342:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:342:50:342:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:343:101:343:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:343:110:343:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:344:86:344:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:344:95:344:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:345:71:345:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:345:80:345:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:346:56:346:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:346:65:346:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:347:41:347:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:347:50:347:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:348:116:348:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:348:125:348:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:349:101:349:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:349:110:349:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:350:86:350:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:350:95:350:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:351:71:351:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:351:80:351:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:352:56:352:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:352:65:352:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:353:41:353:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:353:50:353:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:354:131:354:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:354:140:354:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:355:116:355:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:355:125:355:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:356:101:356:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:356:110:356:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:357:86:357:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:357:95:357:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:358:71:358:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:358:80:358:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:359:56:359:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:359:65:359:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:360:41:360:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:360:50:360:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:361:146:361:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:361:155:361:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:362:131:362:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:362:140:362:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:363:116:363:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:363:125:363:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:364:101:364:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:364:110:364:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:365:86:365:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:365:95:365:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:366:71:366:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:366:80:366:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:367:56:367:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:367:65:367:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:368:41:368:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:368:50:368:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:369:161:369:177 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:369:170:369:177 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:370:146:370:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:370:155:370:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:371:131:371:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:371:140:371:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:372:116:372:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:372:125:372:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:373:101:373:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:373:110:373:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:374:86:374:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:374:95:374:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:375:71:375:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:375:80:375:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:376:56:376:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:376:65:376:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:377:41:377:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:377:50:377:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:378:176:378:192 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:378:185:378:192 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:379:161:379:177 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:379:170:379:177 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:380:146:380:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:380:155:380:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:381:131:381:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:381:140:381:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:382:116:382:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:382:125:382:132 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:383:101:383:117 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:383:110:383:117 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:384:86:384:102 | (...)... | semmle.label | (...)... |
@@ -4859,74 +4951,73 @@ nodes
 | LogInjectionTest.java:386:65:386:72 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:387:41:387:57 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:387:50:387:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:388:116:388:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:388:125:388:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:389:101:389:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:389:110:389:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:390:86:390:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:390:95:390:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:391:71:391:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:391:80:391:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:392:56:392:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:392:65:392:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:393:41:393:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:393:50:393:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:394:131:394:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:394:140:394:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:395:116:395:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:395:125:395:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:396:101:396:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:396:110:396:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:397:86:397:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:397:95:397:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:398:71:398:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:398:80:398:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:399:56:399:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:399:65:399:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:400:41:400:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:400:50:400:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:401:146:401:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:401:155:401:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:402:131:402:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:402:140:402:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:403:116:403:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:403:125:403:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:404:101:404:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:404:110:404:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:405:86:405:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:405:95:405:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:406:71:406:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:406:80:406:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:407:56:407:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:407:65:407:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:408:41:408:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:408:50:408:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:409:161:409:177 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:409:170:409:177 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:410:146:410:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:410:155:410:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:411:131:411:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:411:140:411:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:412:116:412:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:412:125:412:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:413:101:413:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:413:110:413:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:414:86:414:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:414:95:414:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:415:71:415:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:415:80:415:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:416:56:416:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:416:65:416:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:417:41:417:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:417:50:417:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:418:176:418:192 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:418:185:418:192 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:419:161:419:177 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:419:170:419:177 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:420:146:420:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:420:155:420:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:421:131:421:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:421:140:421:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:388:41:388:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:388:50:388:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:389:56:389:77 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:389:70:389:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:390:41:390:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:390:50:390:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:391:41:391:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:391:55:391:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:392:41:392:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:392:55:392:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:393:26:393:51 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:393:44:393:51 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:394:26:394:51 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:394:44:394:51 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:395:26:395:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:395:36:395:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:396:26:396:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:396:36:396:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:397:26:397:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:398:26:398:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:399:26:399:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:399:35:399:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:400:26:400:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:400:35:400:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:401:41:401:63 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:401:41:401:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:401:55:401:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:402:41:402:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:402:50:402:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:403:26:403:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:403:35:403:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:404:56:404:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:404:65:404:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:405:41:405:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:405:50:405:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:406:26:406:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:406:35:406:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:407:71:407:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:407:80:407:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:408:56:408:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:408:65:408:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:409:41:409:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:409:50:409:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:410:26:410:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:410:35:410:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:411:86:411:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:411:95:411:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:412:71:412:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:412:80:412:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:413:56:413:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:413:65:413:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:414:41:414:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:414:50:414:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:415:26:415:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:415:35:415:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:416:101:416:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:416:110:416:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:417:86:417:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:417:95:417:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:418:71:418:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:418:80:418:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:419:56:419:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:419:65:419:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:420:41:420:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:420:50:420:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:421:26:421:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:421:35:421:42 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:422:116:422:132 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:422:125:422:132 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:423:101:423:117 | (...)... | semmle.label | (...)... |
@@ -4939,51 +5030,52 @@ nodes
 | LogInjectionTest.java:426:65:426:72 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:427:41:427:57 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:427:50:427:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:428:41:428:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:428:50:428:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:429:56:429:77 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:429:70:429:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:430:41:430:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:430:50:430:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:431:41:431:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:431:55:431:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:432:41:432:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:432:55:432:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:433:26:433:51 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:433:44:433:51 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:434:26:434:51 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:434:44:434:51 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:435:26:435:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:435:36:435:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:436:26:436:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:436:36:436:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:437:26:437:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:438:26:438:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:439:26:439:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:439:35:439:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:440:26:440:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:440:35:440:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:441:41:441:63 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:441:41:441:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:441:55:441:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:442:41:442:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:442:50:442:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:443:26:443:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:443:35:443:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:444:56:444:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:444:65:444:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:445:41:445:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:445:50:445:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:446:26:446:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:446:35:446:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:447:71:447:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:447:80:447:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:448:56:448:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:448:65:448:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:449:41:449:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:449:50:449:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:450:26:450:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:450:35:450:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:428:26:428:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:428:35:428:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:429:131:429:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:429:140:429:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:430:116:430:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:430:125:430:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:431:101:431:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:431:110:431:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:432:86:432:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:432:95:432:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:433:71:433:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:433:80:433:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:434:56:434:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:434:65:434:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:435:41:435:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:435:50:435:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:436:26:436:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:436:35:436:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:437:146:437:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:437:155:437:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:438:131:438:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:438:140:438:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:439:116:439:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:439:125:439:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:440:101:440:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:440:110:440:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:441:86:441:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:441:95:441:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:442:71:442:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:442:80:442:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:443:56:443:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:443:65:443:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:444:41:444:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:444:50:444:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:445:26:445:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:445:35:445:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:446:161:446:177 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:446:170:446:177 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:447:146:447:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:447:155:447:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:448:131:448:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:448:140:448:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:449:116:449:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:449:125:449:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:450:101:450:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:450:110:450:117 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:451:86:451:102 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:451:95:451:102 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:452:71:452:87 | (...)... | semmle.label | (...)... |
@@ -4994,136 +5086,136 @@ nodes
 | LogInjectionTest.java:454:50:454:57 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:455:26:455:42 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:455:35:455:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:456:101:456:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:456:110:456:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:457:86:457:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:457:95:457:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:458:71:458:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:458:80:458:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:459:56:459:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:459:65:459:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:460:41:460:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:460:50:460:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:461:26:461:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:461:35:461:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:462:116:462:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:462:125:462:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:463:101:463:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:463:110:463:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:464:86:464:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:464:95:464:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:465:71:465:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:465:80:465:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:466:56:466:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:466:65:466:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:467:41:467:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:467:50:467:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:468:26:468:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:468:35:468:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:469:131:469:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:469:140:469:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:470:116:470:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:470:125:470:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:471:101:471:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:471:110:471:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:472:86:472:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:472:95:472:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:473:71:473:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:473:80:473:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:474:56:474:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:474:65:474:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:475:41:475:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:475:50:475:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:476:26:476:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:476:35:476:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:477:146:477:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:477:155:477:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:478:131:478:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:478:140:478:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:479:116:479:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:479:125:479:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:480:101:480:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:480:110:480:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:481:86:481:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:481:95:481:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:482:71:482:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:482:80:482:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:483:56:483:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:483:65:483:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:484:41:484:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:484:50:484:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:485:26:485:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:485:35:485:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:486:161:486:177 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:486:170:486:177 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:487:146:487:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:487:155:487:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:488:131:488:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:488:140:488:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:489:116:489:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:489:125:489:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:490:101:490:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:490:110:490:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:491:86:491:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:491:95:491:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:492:71:492:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:492:80:492:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:493:56:493:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:493:65:493:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:494:41:494:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:494:50:494:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:495:26:495:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:495:35:495:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:496:26:496:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:496:35:496:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:497:41:497:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:497:55:497:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:498:26:498:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:498:35:498:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:499:26:499:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:499:40:499:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:500:26:500:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:500:40:500:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:501:26:501:48 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:501:41:501:48 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:502:26:502:48 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:502:41:502:48 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:503:41:503:63 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:503:56:503:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:504:41:504:63 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:504:56:504:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:505:41:505:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:505:51:505:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:506:41:506:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:506:59:506:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:507:41:507:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:507:59:507:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:508:41:508:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:509:41:509:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:509:50:509:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:510:41:510:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:510:50:510:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:511:56:511:78 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:511:56:511:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:511:70:511:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:512:56:512:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:512:65:512:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:513:41:513:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:513:50:513:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:514:71:514:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:514:80:514:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:515:56:515:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:515:65:515:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:516:41:516:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:516:50:516:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:517:86:517:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:517:95:517:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:518:71:518:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:518:80:518:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:519:56:519:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:519:65:519:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:520:41:520:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:520:50:520:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:456:26:456:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:456:35:456:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:457:41:457:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:457:55:457:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:458:26:458:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:458:35:458:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:459:26:459:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:459:40:459:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:460:26:460:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:460:40:460:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:461:26:461:48 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:461:41:461:48 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:462:26:462:48 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:462:41:462:48 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:463:41:463:63 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:463:56:463:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:464:41:464:63 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:464:56:464:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:465:41:465:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:465:51:465:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:466:41:466:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:466:59:466:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:467:41:467:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:467:59:467:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:468:41:468:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:469:41:469:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:469:50:469:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:470:41:470:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:470:50:470:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:471:56:471:78 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:471:56:471:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:471:70:471:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:472:56:472:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:472:65:472:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:473:41:473:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:473:50:473:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:474:71:474:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:474:80:474:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:475:56:475:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:475:65:475:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:476:41:476:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:476:50:476:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:477:86:477:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:477:95:477:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:478:71:478:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:478:80:478:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:479:56:479:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:479:65:479:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:480:41:480:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:480:50:480:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:481:101:481:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:481:110:481:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:482:86:482:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:482:95:482:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:483:71:483:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:483:80:483:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:484:56:484:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:484:65:484:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:485:41:485:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:485:50:485:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:486:116:486:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:486:125:486:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:487:101:487:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:487:110:487:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:488:86:488:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:488:95:488:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:489:71:489:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:489:80:489:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:490:56:490:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:490:65:490:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:491:41:491:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:491:50:491:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:492:131:492:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:492:140:492:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:493:116:493:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:493:125:493:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:494:101:494:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:494:110:494:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:495:86:495:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:495:95:495:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:496:71:496:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:496:80:496:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:497:56:497:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:497:65:497:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:498:41:498:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:498:50:498:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:499:146:499:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:499:155:499:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:500:131:500:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:500:140:500:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:501:116:501:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:501:125:501:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:502:101:502:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:502:110:502:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:503:86:503:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:503:95:503:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:504:71:504:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:504:80:504:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:505:56:505:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:505:65:505:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:506:41:506:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:506:50:506:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:507:161:507:177 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:507:170:507:177 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:508:146:508:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:508:155:508:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:509:131:509:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:509:140:509:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:510:116:510:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:510:125:510:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:511:101:511:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:511:110:511:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:512:86:512:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:512:95:512:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:513:71:513:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:513:80:513:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:514:56:514:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:514:65:514:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:515:41:515:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:515:50:515:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:516:176:516:192 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:516:185:516:192 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:517:161:517:177 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:517:170:517:177 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:518:146:518:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:518:155:518:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:519:131:519:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:519:140:519:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:520:116:520:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:520:125:520:132 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:521:101:521:117 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:521:110:521:117 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:522:86:522:102 | (...)... | semmle.label | (...)... |
@@ -5134,74 +5226,73 @@ nodes
 | LogInjectionTest.java:524:65:524:72 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:525:41:525:57 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:525:50:525:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:526:116:526:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:526:125:526:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:527:101:527:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:527:110:527:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:528:86:528:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:528:95:528:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:529:71:529:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:529:80:529:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:530:56:530:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:530:65:530:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:531:41:531:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:531:50:531:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:532:131:532:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:532:140:532:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:533:116:533:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:533:125:533:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:534:101:534:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:534:110:534:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:535:86:535:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:535:95:535:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:536:71:536:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:536:80:536:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:537:56:537:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:537:65:537:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:538:41:538:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:538:50:538:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:539:146:539:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:539:155:539:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:540:131:540:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:540:140:540:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:541:116:541:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:541:125:541:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:542:101:542:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:542:110:542:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:543:86:543:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:543:95:543:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:544:71:544:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:544:80:544:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:545:56:545:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:545:65:545:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:546:41:546:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:546:50:546:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:547:161:547:177 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:547:170:547:177 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:548:146:548:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:548:155:548:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:549:131:549:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:549:140:549:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:550:116:550:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:550:125:550:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:551:101:551:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:551:110:551:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:552:86:552:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:552:95:552:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:553:71:553:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:553:80:553:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:554:56:554:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:554:65:554:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:555:41:555:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:555:50:555:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:556:176:556:192 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:556:185:556:192 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:557:161:557:177 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:557:170:557:177 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:558:146:558:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:558:155:558:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:559:131:559:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:559:140:559:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:526:41:526:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:526:50:526:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:527:56:527:77 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:527:70:527:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:528:41:528:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:528:50:528:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:529:41:529:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:529:55:529:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:530:41:530:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:530:55:530:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:531:26:531:51 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:531:44:531:51 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:532:26:532:51 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:532:44:532:51 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:533:26:533:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:533:36:533:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:534:26:534:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:534:36:534:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:535:26:535:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:536:26:536:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:537:26:537:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:537:35:537:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:538:26:538:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:538:35:538:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:539:41:539:63 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:539:41:539:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:539:55:539:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:540:41:540:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:540:50:540:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:541:26:541:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:541:35:541:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:542:56:542:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:542:65:542:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:543:41:543:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:543:50:543:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:544:26:544:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:544:35:544:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:545:71:545:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:545:80:545:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:546:56:546:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:546:65:546:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:547:41:547:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:547:50:547:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:548:26:548:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:548:35:548:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:549:86:549:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:549:95:549:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:550:71:550:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:550:80:550:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:551:56:551:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:551:65:551:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:552:41:552:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:552:50:552:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:553:26:553:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:553:35:553:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:554:101:554:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:554:110:554:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:555:86:555:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:555:95:555:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:556:71:556:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:556:80:556:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:557:56:557:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:557:65:557:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:558:41:558:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:558:50:558:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:559:26:559:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:559:35:559:42 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:560:116:560:132 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:560:125:560:132 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:561:101:561:117 | (...)... | semmle.label | (...)... |
@@ -5214,51 +5305,52 @@ nodes
 | LogInjectionTest.java:564:65:564:72 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:565:41:565:57 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:565:50:565:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:566:41:566:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:566:50:566:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:567:56:567:77 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:567:70:567:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:568:41:568:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:568:50:568:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:569:41:569:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:569:55:569:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:570:41:570:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:570:55:570:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:571:26:571:51 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:571:44:571:51 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:572:26:572:51 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:572:44:572:51 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:573:26:573:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:573:36:573:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:574:26:574:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:574:36:574:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:575:26:575:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:576:26:576:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:577:26:577:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:577:35:577:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:578:26:578:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:578:35:578:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:579:41:579:63 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:579:41:579:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:579:55:579:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:580:41:580:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:580:50:580:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:581:26:581:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:581:35:581:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:582:56:582:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:582:65:582:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:583:41:583:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:583:50:583:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:584:26:584:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:584:35:584:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:585:71:585:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:585:80:585:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:586:56:586:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:586:65:586:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:587:41:587:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:587:50:587:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:588:26:588:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:588:35:588:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:566:26:566:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:566:35:566:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:567:131:567:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:567:140:567:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:568:116:568:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:568:125:568:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:569:101:569:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:569:110:569:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:570:86:570:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:570:95:570:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:571:71:571:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:571:80:571:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:572:56:572:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:572:65:572:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:573:41:573:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:573:50:573:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:574:26:574:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:574:35:574:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:575:146:575:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:575:155:575:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:576:131:576:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:576:140:576:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:577:116:577:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:577:125:577:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:578:101:578:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:578:110:578:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:579:86:579:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:579:95:579:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:580:71:580:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:580:80:580:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:581:56:581:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:581:65:581:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:582:41:582:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:582:50:582:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:583:26:583:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:583:35:583:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:584:161:584:177 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:584:170:584:177 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:585:146:585:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:585:155:585:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:586:131:586:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:586:140:586:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:587:116:587:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:587:125:587:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:588:101:588:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:588:110:588:117 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:589:86:589:102 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:589:95:589:102 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:590:71:590:87 | (...)... | semmle.label | (...)... |
@@ -5269,136 +5361,136 @@ nodes
 | LogInjectionTest.java:592:50:592:57 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:593:26:593:42 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:593:35:593:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:594:101:594:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:594:110:594:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:595:86:595:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:595:95:595:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:596:71:596:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:596:80:596:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:597:56:597:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:597:65:597:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:598:41:598:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:598:50:598:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:599:26:599:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:599:35:599:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:600:116:600:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:600:125:600:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:601:101:601:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:601:110:601:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:602:86:602:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:602:95:602:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:603:71:603:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:603:80:603:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:604:56:604:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:604:65:604:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:605:41:605:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:605:50:605:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:606:26:606:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:606:35:606:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:607:131:607:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:607:140:607:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:608:116:608:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:608:125:608:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:609:101:609:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:609:110:609:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:610:86:610:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:610:95:610:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:611:71:611:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:611:80:611:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:612:56:612:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:612:65:612:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:613:41:613:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:613:50:613:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:614:26:614:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:614:35:614:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:615:146:615:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:615:155:615:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:616:131:616:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:616:140:616:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:617:116:617:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:617:125:617:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:618:101:618:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:618:110:618:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:619:86:619:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:619:95:619:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:620:71:620:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:620:80:620:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:621:56:621:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:621:65:621:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:622:41:622:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:622:50:622:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:623:26:623:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:623:35:623:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:624:161:624:177 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:624:170:624:177 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:625:146:625:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:625:155:625:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:626:131:626:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:626:140:626:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:627:116:627:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:627:125:627:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:628:101:628:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:628:110:628:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:629:86:629:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:629:95:629:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:630:71:630:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:630:80:630:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:631:56:631:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:631:65:631:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:632:41:632:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:632:50:632:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:633:26:633:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:633:35:633:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:634:26:634:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:634:35:634:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:635:41:635:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:635:55:635:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:636:26:636:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:636:35:636:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:637:26:637:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:637:40:637:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:638:26:638:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:638:40:638:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:639:25:639:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:639:40:639:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:640:25:640:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:640:40:640:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:641:40:641:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:641:55:641:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:642:40:642:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:642:55:642:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:643:40:643:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:643:50:643:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:644:40:644:65 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:644:58:644:65 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:645:40:645:65 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:645:58:645:65 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:646:40:646:47 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:647:40:647:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:647:49:647:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:648:40:648:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:648:49:648:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:649:55:649:77 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:649:55:649:77 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:649:69:649:76 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:650:55:650:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:650:64:650:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:651:40:651:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:651:49:651:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:652:70:652:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:652:79:652:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:653:55:653:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:653:64:653:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:654:40:654:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:654:49:654:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:655:85:655:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:655:94:655:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:656:70:656:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:656:79:656:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:657:55:657:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:657:64:657:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:658:40:658:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:658:49:658:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:594:26:594:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:594:35:594:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:595:41:595:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:595:55:595:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:596:26:596:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:596:35:596:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:597:26:597:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:597:40:597:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:598:26:598:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:598:40:598:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:599:25:599:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:599:40:599:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:600:25:600:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:600:40:600:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:601:40:601:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:601:55:601:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:602:40:602:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:602:55:602:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:603:40:603:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:603:50:603:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:604:40:604:65 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:604:58:604:65 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:605:40:605:65 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:605:58:605:65 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:606:40:606:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:607:40:607:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:607:49:607:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:608:40:608:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:608:49:608:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:609:55:609:77 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:609:55:609:77 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:609:69:609:76 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:610:55:610:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:610:64:610:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:611:40:611:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:611:49:611:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:612:70:612:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:612:79:612:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:613:55:613:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:613:64:613:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:614:40:614:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:614:49:614:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:615:85:615:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:615:94:615:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:616:70:616:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:616:79:616:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:617:55:617:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:617:64:617:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:618:40:618:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:618:49:618:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:619:100:619:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:619:109:619:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:620:85:620:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:620:94:620:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:621:70:621:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:621:79:621:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:622:55:622:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:622:64:622:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:623:40:623:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:623:49:623:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:624:115:624:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:624:124:624:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:625:100:625:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:625:109:625:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:626:85:626:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:626:94:626:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:627:70:627:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:627:79:627:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:628:55:628:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:628:64:628:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:629:40:629:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:629:49:629:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:630:130:630:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:630:139:630:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:631:115:631:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:631:124:631:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:632:100:632:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:632:109:632:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:633:85:633:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:633:94:633:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:634:70:634:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:634:79:634:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:635:55:635:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:635:64:635:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:636:40:636:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:636:49:636:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:637:145:637:161 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:637:154:637:161 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:638:130:638:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:638:139:638:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:639:115:639:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:639:124:639:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:640:100:640:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:640:109:640:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:641:85:641:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:641:94:641:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:642:70:642:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:642:79:642:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:643:55:643:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:643:64:643:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:644:40:644:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:644:49:644:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:645:160:645:176 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:645:169:645:176 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:646:145:646:161 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:646:154:646:161 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:647:130:647:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:647:139:647:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:648:115:648:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:648:124:648:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:649:100:649:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:649:109:649:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:650:85:650:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:650:94:650:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:651:70:651:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:651:79:651:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:652:55:652:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:652:64:652:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:653:40:653:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:653:49:653:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:654:175:654:191 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:654:184:654:191 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:655:160:655:176 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:655:169:655:176 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:656:145:656:161 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:656:154:656:161 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:657:130:657:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:657:139:657:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:658:115:658:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:658:124:658:131 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:659:100:659:116 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:659:109:659:116 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:660:85:660:101 | (...)... | semmle.label | (...)... |
@@ -5409,74 +5501,73 @@ nodes
 | LogInjectionTest.java:662:64:662:71 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:663:40:663:56 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:663:49:663:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:664:115:664:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:664:124:664:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:665:100:665:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:665:109:665:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:666:85:666:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:666:94:666:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:667:70:667:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:667:79:667:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:668:55:668:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:668:64:668:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:669:40:669:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:669:49:669:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:670:130:670:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:670:139:670:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:671:115:671:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:671:124:671:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:672:100:672:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:672:109:672:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:673:85:673:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:673:94:673:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:674:70:674:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:674:79:674:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:675:55:675:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:675:64:675:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:676:40:676:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:676:49:676:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:677:145:677:161 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:677:154:677:161 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:678:130:678:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:678:139:678:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:679:115:679:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:679:124:679:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:680:100:680:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:680:109:680:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:681:85:681:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:681:94:681:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:682:70:682:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:682:79:682:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:683:55:683:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:683:64:683:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:684:40:684:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:684:49:684:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:685:160:685:176 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:685:169:685:176 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:686:145:686:161 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:686:154:686:161 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:687:130:687:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:687:139:687:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:688:115:688:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:688:124:688:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:689:100:689:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:689:109:689:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:690:85:690:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:690:94:690:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:691:70:691:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:691:79:691:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:692:55:692:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:692:64:692:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:693:40:693:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:693:49:693:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:694:175:694:191 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:694:184:694:191 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:695:160:695:176 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:695:169:695:176 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:696:145:696:161 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:696:154:696:161 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:697:130:697:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:697:139:697:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:664:40:664:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:664:49:664:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:665:55:665:76 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:665:69:665:76 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:666:40:666:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:666:49:666:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:667:40:667:61 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:667:54:667:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:668:40:668:61 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:668:54:668:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:669:25:669:50 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:669:43:669:50 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:670:25:670:50 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:670:43:670:50 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:671:25:671:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:671:35:671:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:672:25:672:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:672:35:672:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:673:25:673:32 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:674:25:674:32 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:675:25:675:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:675:34:675:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:676:25:676:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:676:34:676:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:677:40:677:62 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:677:40:677:62 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:677:54:677:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:678:40:678:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:678:49:678:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:679:25:679:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:679:34:679:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:680:55:680:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:680:64:680:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:681:40:681:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:681:49:681:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:682:25:682:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:682:34:682:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:683:70:683:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:683:79:683:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:684:55:684:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:684:64:684:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:685:40:685:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:685:49:685:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:686:25:686:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:686:34:686:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:687:85:687:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:687:94:687:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:688:70:688:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:688:79:688:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:689:55:689:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:689:64:689:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:690:40:690:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:690:49:690:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:691:25:691:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:691:34:691:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:692:100:692:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:692:109:692:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:693:85:693:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:693:94:693:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:694:70:694:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:694:79:694:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:695:55:695:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:695:64:695:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:696:40:696:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:696:49:696:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:697:25:697:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:697:34:697:41 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:698:115:698:131 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:698:124:698:131 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:699:100:699:116 | (...)... | semmle.label | (...)... |
@@ -5489,51 +5580,52 @@ nodes
 | LogInjectionTest.java:702:64:702:71 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:703:40:703:56 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:703:49:703:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:704:40:704:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:704:49:704:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:705:55:705:76 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:705:69:705:76 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:706:40:706:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:706:49:706:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:707:40:707:61 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:707:54:707:61 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:708:40:708:61 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:708:54:708:61 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:709:25:709:50 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:709:43:709:50 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:710:25:710:50 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:710:43:710:50 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:711:25:711:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:711:35:711:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:712:25:712:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:712:35:712:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:713:25:713:32 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:714:25:714:32 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:715:25:715:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:715:34:715:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:716:25:716:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:716:34:716:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:717:40:717:62 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:717:40:717:62 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:717:54:717:61 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:718:40:718:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:718:49:718:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:719:25:719:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:719:34:719:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:720:55:720:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:720:64:720:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:721:40:721:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:721:49:721:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:722:25:722:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:722:34:722:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:723:70:723:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:723:79:723:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:724:55:724:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:724:64:724:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:725:40:725:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:725:49:725:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:726:25:726:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:726:34:726:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:704:25:704:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:704:34:704:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:705:130:705:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:705:139:705:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:706:115:706:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:706:124:706:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:707:100:707:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:707:109:707:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:708:85:708:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:708:94:708:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:709:70:709:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:709:79:709:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:710:55:710:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:710:64:710:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:711:40:711:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:711:49:711:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:712:25:712:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:712:34:712:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:713:145:713:161 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:713:154:713:161 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:714:130:714:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:714:139:714:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:715:115:715:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:715:124:715:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:716:100:716:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:716:109:716:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:717:85:717:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:717:94:717:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:718:70:718:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:718:79:718:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:719:55:719:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:719:64:719:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:720:40:720:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:720:49:720:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:721:25:721:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:721:34:721:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:722:160:722:176 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:722:169:722:176 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:723:145:723:161 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:723:154:723:161 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:724:130:724:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:724:139:724:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:725:115:725:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:725:124:725:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:726:100:726:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:726:109:726:116 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:727:85:727:101 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:727:94:727:101 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:728:70:728:86 | (...)... | semmle.label | (...)... |
@@ -5544,136 +5636,136 @@ nodes
 | LogInjectionTest.java:730:49:730:56 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:731:25:731:41 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:731:34:731:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:732:100:732:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:732:109:732:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:733:85:733:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:733:94:733:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:734:70:734:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:734:79:734:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:735:55:735:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:735:64:735:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:736:40:736:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:736:49:736:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:737:25:737:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:737:34:737:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:738:115:738:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:738:124:738:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:739:100:739:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:739:109:739:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:740:85:740:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:740:94:740:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:741:70:741:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:741:79:741:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:742:55:742:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:742:64:742:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:743:40:743:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:743:49:743:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:744:25:744:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:744:34:744:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:745:130:745:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:745:139:745:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:746:115:746:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:746:124:746:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:747:100:747:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:747:109:747:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:748:85:748:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:748:94:748:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:749:70:749:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:749:79:749:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:750:55:750:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:750:64:750:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:751:40:751:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:751:49:751:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:752:25:752:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:752:34:752:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:753:145:753:161 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:753:154:753:161 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:754:130:754:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:754:139:754:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:755:115:755:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:755:124:755:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:756:100:756:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:756:109:756:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:757:85:757:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:757:94:757:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:758:70:758:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:758:79:758:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:759:55:759:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:759:64:759:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:760:40:760:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:760:49:760:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:761:25:761:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:761:34:761:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:762:160:762:176 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:762:169:762:176 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:763:145:763:161 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:763:154:763:161 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:764:130:764:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:764:139:764:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:765:115:765:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:765:124:765:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:766:100:766:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:766:109:766:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:767:85:767:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:767:94:767:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:768:70:768:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:768:79:768:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:769:55:769:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:769:64:769:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:770:40:770:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:770:49:770:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:771:25:771:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:771:34:771:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:772:25:772:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:772:34:772:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:773:40:773:61 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:773:54:773:61 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:774:25:774:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:774:34:774:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:775:25:775:46 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:775:39:775:46 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:776:25:776:46 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:776:39:776:46 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:777:38:777:60 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:777:53:777:60 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:778:38:778:60 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:778:53:778:60 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:779:53:779:75 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:779:68:779:75 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:780:53:780:75 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:780:68:780:75 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:781:53:781:70 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:781:63:781:70 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:782:53:782:78 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:782:71:782:78 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:783:53:783:78 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:783:71:783:78 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:784:53:784:60 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:785:53:785:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:785:62:785:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:786:53:786:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:786:62:786:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:787:68:787:90 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:787:68:787:90 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:787:82:787:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:788:68:788:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:788:77:788:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:789:53:789:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:789:62:789:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:790:83:790:99 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:790:92:790:99 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:791:68:791:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:791:77:791:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:792:53:792:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:792:62:792:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:793:98:793:114 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:793:107:793:114 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:794:83:794:99 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:794:92:794:99 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:795:68:795:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:795:77:795:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:796:53:796:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:796:62:796:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:732:25:732:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:732:34:732:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:733:40:733:61 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:733:54:733:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:734:25:734:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:734:34:734:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:735:25:735:46 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:735:39:735:46 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:736:25:736:46 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:736:39:736:46 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:737:38:737:60 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:737:53:737:60 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:738:38:738:60 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:738:53:738:60 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:739:53:739:75 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:739:68:739:75 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:740:53:740:75 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:740:68:740:75 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:741:53:741:70 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:741:63:741:70 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:742:53:742:78 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:742:71:742:78 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:743:53:743:78 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:743:71:743:78 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:744:53:744:60 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:745:53:745:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:745:62:745:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:746:53:746:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:746:62:746:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:747:68:747:90 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:747:68:747:90 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:747:82:747:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:748:68:748:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:748:77:748:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:749:53:749:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:749:62:749:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:750:83:750:99 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:750:92:750:99 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:751:68:751:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:751:77:751:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:752:53:752:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:752:62:752:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:753:98:753:114 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:753:107:753:114 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:754:83:754:99 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:754:92:754:99 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:755:68:755:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:755:77:755:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:756:53:756:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:756:62:756:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:757:113:757:129 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:757:122:757:129 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:758:98:758:114 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:758:107:758:114 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:759:83:759:99 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:759:92:759:99 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:760:68:760:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:760:77:760:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:761:53:761:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:761:62:761:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:762:128:762:144 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:762:137:762:144 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:763:113:763:129 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:763:122:763:129 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:764:98:764:114 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:764:107:764:114 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:765:83:765:99 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:765:92:765:99 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:766:68:766:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:766:77:766:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:767:53:767:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:767:62:767:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:768:143:768:159 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:768:152:768:159 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:769:128:769:144 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:769:137:769:144 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:770:113:770:129 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:770:122:770:129 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:771:98:771:114 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:771:107:771:114 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:772:83:772:99 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:772:92:772:99 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:773:68:773:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:773:77:773:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:774:53:774:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:774:62:774:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:775:158:775:174 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:775:167:775:174 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:776:143:776:159 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:776:152:776:159 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:777:128:777:144 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:777:137:777:144 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:778:113:778:129 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:778:122:778:129 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:779:98:779:114 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:779:107:779:114 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:780:83:780:99 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:780:92:780:99 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:781:68:781:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:781:77:781:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:782:53:782:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:782:62:782:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:783:173:783:189 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:783:182:783:189 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:784:158:784:174 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:784:167:784:174 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:785:143:785:159 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:785:152:785:159 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:786:128:786:144 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:786:137:786:144 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:787:113:787:129 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:787:122:787:129 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:788:98:788:114 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:788:107:788:114 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:789:83:789:99 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:789:92:789:99 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:790:68:790:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:790:77:790:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:791:53:791:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:791:62:791:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:792:188:792:204 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:792:197:792:204 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:793:173:793:189 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:793:182:793:189 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:794:158:794:174 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:794:167:794:174 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:795:143:795:159 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:795:152:795:159 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:796:128:796:144 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:796:137:796:144 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:797:113:797:129 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:797:122:797:129 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:798:98:798:114 | (...)... | semmle.label | (...)... |
@@ -5684,74 +5776,73 @@ nodes
 | LogInjectionTest.java:800:77:800:84 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:801:53:801:69 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:801:62:801:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:802:128:802:144 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:802:137:802:144 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:803:113:803:129 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:803:122:803:129 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:804:98:804:114 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:804:107:804:114 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:805:83:805:99 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:805:92:805:99 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:806:68:806:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:806:77:806:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:807:53:807:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:807:62:807:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:808:143:808:159 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:808:152:808:159 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:809:128:809:144 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:809:137:809:144 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:810:113:810:129 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:810:122:810:129 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:811:98:811:114 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:811:107:811:114 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:812:83:812:99 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:812:92:812:99 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:813:68:813:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:813:77:813:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:814:53:814:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:814:62:814:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:815:158:815:174 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:815:167:815:174 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:816:143:816:159 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:816:152:816:159 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:817:128:817:144 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:817:137:817:144 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:818:113:818:129 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:818:122:818:129 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:819:98:819:114 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:819:107:819:114 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:820:83:820:99 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:820:92:820:99 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:821:68:821:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:821:77:821:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:822:53:822:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:822:62:822:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:823:173:823:189 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:823:182:823:189 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:824:158:824:174 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:824:167:824:174 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:825:143:825:159 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:825:152:825:159 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:826:128:826:144 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:826:137:826:144 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:827:113:827:129 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:827:122:827:129 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:828:98:828:114 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:828:107:828:114 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:829:83:829:99 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:829:92:829:99 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:830:68:830:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:830:77:830:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:831:53:831:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:831:62:831:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:832:188:832:204 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:832:197:832:204 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:833:173:833:189 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:833:182:833:189 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:834:158:834:174 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:834:167:834:174 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:835:143:835:159 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:835:152:835:159 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:802:53:802:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:802:62:802:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:803:68:803:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:803:82:803:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:804:53:804:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:804:62:804:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:805:53:805:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:805:67:805:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:806:53:806:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:806:67:806:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:807:38:807:63 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:807:56:807:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:808:38:808:63 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:808:56:808:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:809:38:809:55 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:809:48:809:55 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:810:38:810:55 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:810:48:810:55 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:811:38:811:45 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:812:38:812:45 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:813:38:813:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:813:47:813:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:814:38:814:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:814:47:814:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:815:53:815:75 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:815:53:815:75 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:815:67:815:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:816:53:816:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:816:62:816:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:817:38:817:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:817:47:817:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:818:68:818:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:818:77:818:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:819:53:819:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:819:62:819:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:820:38:820:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:820:47:820:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:821:83:821:99 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:821:92:821:99 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:822:68:822:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:822:77:822:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:823:53:823:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:823:62:823:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:824:38:824:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:824:47:824:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:825:98:825:114 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:825:107:825:114 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:826:83:826:99 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:826:92:826:99 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:827:68:827:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:827:77:827:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:828:53:828:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:828:62:828:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:829:38:829:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:829:47:829:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:830:113:830:129 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:830:122:830:129 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:831:98:831:114 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:831:107:831:114 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:832:83:832:99 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:832:92:832:99 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:833:68:833:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:833:77:833:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:834:53:834:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:834:62:834:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:835:38:835:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:835:47:835:54 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:836:128:836:144 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:836:137:836:144 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:837:113:837:129 | (...)... | semmle.label | (...)... |
@@ -5764,51 +5855,52 @@ nodes
 | LogInjectionTest.java:840:77:840:84 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:841:53:841:69 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:841:62:841:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:842:53:842:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:842:62:842:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:843:68:843:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:843:82:843:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:844:53:844:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:844:62:844:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:845:53:845:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:845:67:845:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:846:53:846:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:846:67:846:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:847:38:847:63 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:847:56:847:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:848:38:848:63 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:848:56:848:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:849:38:849:55 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:849:48:849:55 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:850:38:850:55 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:850:48:850:55 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:851:38:851:45 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:852:38:852:45 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:853:38:853:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:853:47:853:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:854:38:854:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:854:47:854:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:855:53:855:75 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:855:53:855:75 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:855:67:855:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:856:53:856:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:856:62:856:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:857:38:857:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:857:47:857:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:858:68:858:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:858:77:858:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:859:53:859:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:859:62:859:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:860:38:860:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:860:47:860:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:861:83:861:99 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:861:92:861:99 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:862:68:862:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:862:77:862:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:863:53:863:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:863:62:863:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:864:38:864:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:864:47:864:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:842:38:842:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:842:47:842:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:843:143:843:159 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:843:152:843:159 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:844:128:844:144 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:844:137:844:144 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:845:113:845:129 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:845:122:845:129 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:846:98:846:114 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:846:107:846:114 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:847:83:847:99 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:847:92:847:99 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:848:68:848:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:848:77:848:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:849:53:849:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:849:62:849:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:850:38:850:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:850:47:850:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:851:158:851:174 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:851:167:851:174 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:852:143:852:159 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:852:152:852:159 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:853:128:853:144 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:853:137:853:144 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:854:113:854:129 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:854:122:854:129 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:855:98:855:114 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:855:107:855:114 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:856:83:856:99 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:856:92:856:99 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:857:68:857:84 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:857:77:857:84 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:858:53:858:69 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:858:62:858:69 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:859:38:859:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:859:47:859:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:860:173:860:189 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:860:182:860:189 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:861:158:861:174 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:861:167:861:174 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:862:143:862:159 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:862:152:862:159 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:863:128:863:144 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:863:137:863:144 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:864:113:864:129 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:864:122:864:129 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:865:98:865:114 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:865:107:865:114 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:866:83:866:99 | (...)... | semmle.label | (...)... |
@@ -5819,136 +5911,136 @@ nodes
 | LogInjectionTest.java:868:62:868:69 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:869:38:869:54 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:869:47:869:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:870:113:870:129 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:870:122:870:129 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:871:98:871:114 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:871:107:871:114 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:872:83:872:99 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:872:92:872:99 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:873:68:873:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:873:77:873:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:874:53:874:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:874:62:874:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:875:38:875:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:875:47:875:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:876:128:876:144 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:876:137:876:144 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:877:113:877:129 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:877:122:877:129 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:878:98:878:114 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:878:107:878:114 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:879:83:879:99 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:879:92:879:99 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:880:68:880:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:880:77:880:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:881:53:881:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:881:62:881:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:882:38:882:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:882:47:882:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:883:143:883:159 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:883:152:883:159 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:884:128:884:144 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:884:137:884:144 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:885:113:885:129 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:885:122:885:129 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:886:98:886:114 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:886:107:886:114 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:887:83:887:99 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:887:92:887:99 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:888:68:888:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:888:77:888:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:889:53:889:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:889:62:889:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:890:38:890:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:890:47:890:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:891:158:891:174 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:891:167:891:174 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:892:143:892:159 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:892:152:892:159 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:893:128:893:144 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:893:137:893:144 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:894:113:894:129 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:894:122:894:129 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:895:98:895:114 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:895:107:895:114 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:896:83:896:99 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:896:92:896:99 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:897:68:897:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:897:77:897:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:898:53:898:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:898:62:898:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:899:38:899:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:899:47:899:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:900:173:900:189 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:900:182:900:189 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:901:158:901:174 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:901:167:901:174 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:902:143:902:159 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:902:152:902:159 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:903:128:903:144 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:903:137:903:144 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:904:113:904:129 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:904:122:904:129 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:905:98:905:114 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:905:107:905:114 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:906:83:906:99 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:906:92:906:99 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:907:68:907:84 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:907:77:907:84 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:908:53:908:69 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:908:62:908:69 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:909:38:909:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:909:47:909:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:910:38:910:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:910:47:910:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:911:53:911:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:911:67:911:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:912:38:912:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:912:47:912:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:913:38:913:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:913:52:913:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:914:38:914:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:914:52:914:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:915:26:915:48 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:915:41:915:48 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:916:26:916:48 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:916:41:916:48 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:917:41:917:63 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:917:56:917:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:918:41:918:63 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:918:56:918:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:919:41:919:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:919:51:919:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:920:41:920:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:920:59:920:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:921:41:921:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:921:59:921:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:922:41:922:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:923:41:923:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:923:50:923:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:924:41:924:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:924:50:924:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:925:56:925:78 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:925:56:925:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:925:70:925:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:926:56:926:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:926:65:926:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:927:41:927:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:927:50:927:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:928:71:928:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:928:80:928:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:929:56:929:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:929:65:929:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:930:41:930:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:930:50:930:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:931:86:931:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:931:95:931:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:932:71:932:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:932:80:932:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:933:56:933:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:933:65:933:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:934:41:934:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:934:50:934:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:870:38:870:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:870:47:870:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:871:53:871:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:871:67:871:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:872:38:872:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:872:47:872:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:873:38:873:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:873:52:873:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:874:38:874:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:874:52:874:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:875:26:875:48 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:875:41:875:48 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:876:26:876:48 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:876:41:876:48 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:877:41:877:63 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:877:56:877:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:878:41:878:63 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:878:56:878:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:879:41:879:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:879:51:879:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:880:41:880:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:880:59:880:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:881:41:881:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:881:59:881:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:882:41:882:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:883:41:883:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:883:50:883:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:884:41:884:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:884:50:884:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:885:56:885:78 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:885:56:885:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:885:70:885:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:886:56:886:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:886:65:886:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:887:41:887:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:887:50:887:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:888:71:888:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:888:80:888:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:889:56:889:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:889:65:889:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:890:41:890:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:890:50:890:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:891:86:891:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:891:95:891:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:892:71:892:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:892:80:892:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:893:56:893:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:893:65:893:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:894:41:894:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:894:50:894:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:895:101:895:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:895:110:895:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:896:86:896:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:896:95:896:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:897:71:897:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:897:80:897:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:898:56:898:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:898:65:898:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:899:41:899:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:899:50:899:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:900:116:900:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:900:125:900:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:901:101:901:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:901:110:901:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:902:86:902:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:902:95:902:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:903:71:903:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:903:80:903:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:904:56:904:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:904:65:904:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:905:41:905:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:905:50:905:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:906:131:906:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:906:140:906:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:907:116:907:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:907:125:907:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:908:101:908:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:908:110:908:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:909:86:909:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:909:95:909:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:910:71:910:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:910:80:910:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:911:56:911:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:911:65:911:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:912:41:912:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:912:50:912:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:913:146:913:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:913:155:913:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:914:131:914:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:914:140:914:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:915:116:915:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:915:125:915:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:916:101:916:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:916:110:916:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:917:86:917:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:917:95:917:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:918:71:918:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:918:80:918:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:919:56:919:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:919:65:919:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:920:41:920:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:920:50:920:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:921:161:921:177 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:921:170:921:177 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:922:146:922:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:922:155:922:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:923:131:923:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:923:140:923:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:924:116:924:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:924:125:924:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:925:101:925:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:925:110:925:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:926:86:926:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:926:95:926:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:927:71:927:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:927:80:927:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:928:56:928:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:928:65:928:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:929:41:929:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:929:50:929:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:930:176:930:192 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:930:185:930:192 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:931:161:931:177 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:931:170:931:177 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:932:146:932:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:932:155:932:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:933:131:933:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:933:140:933:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:934:116:934:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:934:125:934:132 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:935:101:935:117 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:935:110:935:117 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:936:86:936:102 | (...)... | semmle.label | (...)... |
@@ -5959,74 +6051,73 @@ nodes
 | LogInjectionTest.java:938:65:938:72 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:939:41:939:57 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:939:50:939:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:940:116:940:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:940:125:940:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:941:101:941:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:941:110:941:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:942:86:942:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:942:95:942:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:943:71:943:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:943:80:943:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:944:56:944:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:944:65:944:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:945:41:945:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:945:50:945:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:946:131:946:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:946:140:946:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:947:116:947:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:947:125:947:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:948:101:948:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:948:110:948:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:949:86:949:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:949:95:949:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:950:71:950:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:950:80:950:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:951:56:951:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:951:65:951:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:952:41:952:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:952:50:952:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:953:146:953:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:953:155:953:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:954:131:954:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:954:140:954:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:955:116:955:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:955:125:955:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:956:101:956:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:956:110:956:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:957:86:957:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:957:95:957:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:958:71:958:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:958:80:958:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:959:56:959:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:959:65:959:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:960:41:960:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:960:50:960:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:961:161:961:177 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:961:170:961:177 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:962:146:962:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:962:155:962:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:963:131:963:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:963:140:963:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:964:116:964:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:964:125:964:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:965:101:965:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:965:110:965:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:966:86:966:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:966:95:966:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:967:71:967:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:967:80:967:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:968:56:968:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:968:65:968:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:969:41:969:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:969:50:969:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:970:176:970:192 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:970:185:970:192 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:971:161:971:177 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:971:170:971:177 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:972:146:972:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:972:155:972:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:973:131:973:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:973:140:973:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:940:41:940:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:940:50:940:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:941:56:941:77 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:941:70:941:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:942:41:942:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:942:50:942:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:943:41:943:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:943:55:943:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:944:41:944:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:944:55:944:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:945:26:945:51 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:945:44:945:51 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:946:26:946:51 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:946:44:946:51 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:947:26:947:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:947:36:947:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:948:26:948:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:948:36:948:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:949:26:949:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:950:26:950:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:951:26:951:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:951:35:951:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:952:26:952:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:952:35:952:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:953:41:953:63 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:953:41:953:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:953:55:953:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:954:41:954:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:954:50:954:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:955:26:955:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:955:35:955:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:956:56:956:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:956:65:956:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:957:41:957:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:957:50:957:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:958:26:958:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:958:35:958:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:959:71:959:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:959:80:959:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:960:56:960:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:960:65:960:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:961:41:961:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:961:50:961:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:962:26:962:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:962:35:962:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:963:86:963:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:963:95:963:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:964:71:964:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:964:80:964:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:965:56:965:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:965:65:965:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:966:41:966:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:966:50:966:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:967:26:967:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:967:35:967:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:968:101:968:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:968:110:968:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:969:86:969:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:969:95:969:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:970:71:970:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:970:80:970:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:971:56:971:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:971:65:971:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:972:41:972:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:972:50:972:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:973:26:973:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:973:35:973:42 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:974:116:974:132 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:974:125:974:132 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:975:101:975:117 | (...)... | semmle.label | (...)... |
@@ -6039,51 +6130,52 @@ nodes
 | LogInjectionTest.java:978:65:978:72 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:979:41:979:57 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:979:50:979:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:980:41:980:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:980:50:980:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:981:56:981:77 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:981:70:981:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:982:41:982:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:982:50:982:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:983:41:983:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:983:55:983:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:984:41:984:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:984:55:984:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:985:26:985:51 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:985:44:985:51 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:986:26:986:51 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:986:44:986:51 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:987:26:987:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:987:36:987:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:988:26:988:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:988:36:988:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:989:26:989:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:990:26:990:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:991:26:991:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:991:35:991:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:992:26:992:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:992:35:992:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:993:41:993:63 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:993:41:993:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:993:55:993:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:994:41:994:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:994:50:994:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:995:26:995:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:995:35:995:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:996:56:996:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:996:65:996:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:997:41:997:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:997:50:997:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:998:26:998:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:998:35:998:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:999:71:999:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:999:80:999:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1000:56:1000:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1000:65:1000:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1001:41:1001:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1001:50:1001:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1002:26:1002:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1002:35:1002:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:980:26:980:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:980:35:980:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:981:131:981:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:981:140:981:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:982:116:982:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:982:125:982:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:983:101:983:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:983:110:983:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:984:86:984:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:984:95:984:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:985:71:985:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:985:80:985:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:986:56:986:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:986:65:986:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:987:41:987:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:987:50:987:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:988:26:988:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:988:35:988:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:989:146:989:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:989:155:989:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:990:131:990:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:990:140:990:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:991:116:991:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:991:125:991:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:992:101:992:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:992:110:992:117 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:993:86:993:102 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:993:95:993:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:994:71:994:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:994:80:994:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:995:56:995:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:995:65:995:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:996:41:996:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:996:50:996:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:997:26:997:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:997:35:997:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:998:161:998:177 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:998:170:998:177 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:999:146:999:162 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:999:155:999:162 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1000:131:1000:147 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1000:140:1000:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1001:116:1001:132 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1001:125:1001:132 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1002:101:1002:117 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1002:110:1002:117 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1003:86:1003:102 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1003:95:1003:102 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1004:71:1004:87 | (...)... | semmle.label | (...)... |
@@ -6094,136 +6186,136 @@ nodes
 | LogInjectionTest.java:1006:50:1006:57 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1007:26:1007:42 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1007:35:1007:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1008:101:1008:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1008:110:1008:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1009:86:1009:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1009:95:1009:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1010:71:1010:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1010:80:1010:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1011:56:1011:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1011:65:1011:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1012:41:1012:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1012:50:1012:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1013:26:1013:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1013:35:1013:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1014:116:1014:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1014:125:1014:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1015:101:1015:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1015:110:1015:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1016:86:1016:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1016:95:1016:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1017:71:1017:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1017:80:1017:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1018:56:1018:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1018:65:1018:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1019:41:1019:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1019:50:1019:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1020:26:1020:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1020:35:1020:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1021:131:1021:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1021:140:1021:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1022:116:1022:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1022:125:1022:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1023:101:1023:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1023:110:1023:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1024:86:1024:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1024:95:1024:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1025:71:1025:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1025:80:1025:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1026:56:1026:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1026:65:1026:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1027:41:1027:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1027:50:1027:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1028:26:1028:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1028:35:1028:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1029:146:1029:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1029:155:1029:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1030:131:1030:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1030:140:1030:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1031:116:1031:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1031:125:1031:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1032:101:1032:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1032:110:1032:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1033:86:1033:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1033:95:1033:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1034:71:1034:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1034:80:1034:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1035:56:1035:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1035:65:1035:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1036:41:1036:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1036:50:1036:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1037:26:1037:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1037:35:1037:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1038:161:1038:177 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1038:170:1038:177 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1039:146:1039:162 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1039:155:1039:162 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1040:131:1040:147 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1040:140:1040:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1041:116:1041:132 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1041:125:1041:132 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1042:101:1042:117 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1042:110:1042:117 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1043:86:1043:102 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1043:95:1043:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1044:71:1044:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1044:80:1044:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1045:56:1045:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1045:65:1045:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1046:41:1046:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1046:50:1046:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1047:26:1047:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1047:35:1047:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1048:26:1048:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1048:35:1048:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1049:41:1049:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1049:55:1049:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1050:26:1050:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1050:35:1050:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1051:26:1051:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1051:40:1051:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1052:26:1052:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1052:40:1052:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1053:25:1053:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1053:40:1053:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1054:25:1054:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1054:40:1054:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1055:40:1055:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1055:55:1055:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1056:40:1056:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1056:55:1056:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1057:40:1057:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1057:50:1057:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1058:40:1058:65 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1058:58:1058:65 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1059:40:1059:65 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1059:58:1059:65 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1060:40:1060:47 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1061:40:1061:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1061:49:1061:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1062:40:1062:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1062:49:1062:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1063:55:1063:77 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1063:55:1063:77 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1063:69:1063:76 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1064:55:1064:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1064:64:1064:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1065:40:1065:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1065:49:1065:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1066:70:1066:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1066:79:1066:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1067:55:1067:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1067:64:1067:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1068:40:1068:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1068:49:1068:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1069:85:1069:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1069:94:1069:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1070:70:1070:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1070:79:1070:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1071:55:1071:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1071:64:1071:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1072:40:1072:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1072:49:1072:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1008:26:1008:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1008:35:1008:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1009:41:1009:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1009:55:1009:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1010:26:1010:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1010:35:1010:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1011:26:1011:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1011:40:1011:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1012:26:1012:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1012:40:1012:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1013:25:1013:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1013:40:1013:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1014:25:1014:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1014:40:1014:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1015:40:1015:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1015:55:1015:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1016:40:1016:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1016:55:1016:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1017:40:1017:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1017:50:1017:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1018:40:1018:65 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1018:58:1018:65 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1019:40:1019:65 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1019:58:1019:65 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1020:40:1020:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1021:40:1021:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1021:49:1021:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1022:40:1022:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1022:49:1022:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1023:55:1023:77 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1023:55:1023:77 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1023:69:1023:76 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1024:55:1024:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1024:64:1024:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1025:40:1025:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1025:49:1025:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1026:70:1026:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1026:79:1026:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1027:55:1027:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1027:64:1027:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1028:40:1028:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1028:49:1028:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1029:85:1029:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1029:94:1029:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1030:70:1030:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1030:79:1030:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1031:55:1031:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1031:64:1031:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1032:40:1032:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1032:49:1032:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1033:100:1033:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1033:109:1033:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1034:85:1034:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1034:94:1034:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1035:70:1035:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1035:79:1035:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1036:55:1036:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1036:64:1036:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1037:40:1037:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1037:49:1037:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1038:115:1038:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1038:124:1038:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1039:100:1039:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1039:109:1039:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1040:85:1040:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1040:94:1040:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1041:70:1041:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1041:79:1041:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1042:55:1042:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1042:64:1042:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1043:40:1043:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1043:49:1043:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1044:130:1044:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1044:139:1044:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1045:115:1045:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1045:124:1045:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1046:100:1046:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1046:109:1046:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1047:85:1047:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1047:94:1047:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1048:70:1048:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1048:79:1048:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1049:55:1049:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1049:64:1049:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1050:40:1050:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1050:49:1050:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1051:145:1051:161 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1051:154:1051:161 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1052:130:1052:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1052:139:1052:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1053:115:1053:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1053:124:1053:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1054:100:1054:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1054:109:1054:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1055:85:1055:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1055:94:1055:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1056:70:1056:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1056:79:1056:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1057:55:1057:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1057:64:1057:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1058:40:1058:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1058:49:1058:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1059:160:1059:176 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1059:169:1059:176 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1060:145:1060:161 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1060:154:1060:161 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1061:130:1061:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1061:139:1061:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1062:115:1062:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1062:124:1062:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1063:100:1063:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1063:109:1063:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1064:85:1064:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1064:94:1064:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1065:70:1065:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1065:79:1065:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1066:55:1066:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1066:64:1066:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1067:40:1067:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1067:49:1067:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1068:175:1068:191 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1068:184:1068:191 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1069:160:1069:176 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1069:169:1069:176 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1070:145:1070:161 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1070:154:1070:161 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1071:130:1071:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1071:139:1071:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1072:115:1072:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1072:124:1072:131 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1073:100:1073:116 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1073:109:1073:116 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1074:85:1074:101 | (...)... | semmle.label | (...)... |
@@ -6234,74 +6326,73 @@ nodes
 | LogInjectionTest.java:1076:64:1076:71 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1077:40:1077:56 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1077:49:1077:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1078:115:1078:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1078:124:1078:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1079:100:1079:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1079:109:1079:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1080:85:1080:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1080:94:1080:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1081:70:1081:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1081:79:1081:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1082:55:1082:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1082:64:1082:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1083:40:1083:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1083:49:1083:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1084:130:1084:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1084:139:1084:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1085:115:1085:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1085:124:1085:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1086:100:1086:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1086:109:1086:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1087:85:1087:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1087:94:1087:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1088:70:1088:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1088:79:1088:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1089:55:1089:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1089:64:1089:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1090:40:1090:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1090:49:1090:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1091:145:1091:161 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1091:154:1091:161 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1092:130:1092:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1092:139:1092:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1093:115:1093:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1093:124:1093:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1094:100:1094:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1094:109:1094:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1095:85:1095:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1095:94:1095:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1096:70:1096:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1096:79:1096:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1097:55:1097:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1097:64:1097:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1098:40:1098:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1098:49:1098:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1099:160:1099:176 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1099:169:1099:176 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1100:145:1100:161 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1100:154:1100:161 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1101:130:1101:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1101:139:1101:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1102:115:1102:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1102:124:1102:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1103:100:1103:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1103:109:1103:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1104:85:1104:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1104:94:1104:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1105:70:1105:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1105:79:1105:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1106:55:1106:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1106:64:1106:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1107:40:1107:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1107:49:1107:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1108:175:1108:191 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1108:184:1108:191 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1109:160:1109:176 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1109:169:1109:176 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1110:145:1110:161 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1110:154:1110:161 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1111:130:1111:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1111:139:1111:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1078:40:1078:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1078:49:1078:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1079:55:1079:76 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1079:69:1079:76 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1080:40:1080:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1080:49:1080:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1081:40:1081:61 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1081:54:1081:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1082:40:1082:61 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1082:54:1082:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1083:25:1083:50 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1083:43:1083:50 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1084:25:1084:50 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1084:43:1084:50 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1085:25:1085:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1085:35:1085:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1086:25:1086:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1086:35:1086:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1087:25:1087:32 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1088:25:1088:32 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1089:25:1089:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1089:34:1089:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1090:25:1090:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1090:34:1090:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1091:40:1091:62 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1091:40:1091:62 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1091:54:1091:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1092:40:1092:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1092:49:1092:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1093:25:1093:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1093:34:1093:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1094:55:1094:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1094:64:1094:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1095:40:1095:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1095:49:1095:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1096:25:1096:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1096:34:1096:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1097:70:1097:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1097:79:1097:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1098:55:1098:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1098:64:1098:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1099:40:1099:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1099:49:1099:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1100:25:1100:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1100:34:1100:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1101:85:1101:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1101:94:1101:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1102:70:1102:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1102:79:1102:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1103:55:1103:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1103:64:1103:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1104:40:1104:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1104:49:1104:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1105:25:1105:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1105:34:1105:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1106:100:1106:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1106:109:1106:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1107:85:1107:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1107:94:1107:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1108:70:1108:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1108:79:1108:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1109:55:1109:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1109:64:1109:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1110:40:1110:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1110:49:1110:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1111:25:1111:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1111:34:1111:41 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1112:115:1112:131 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1112:124:1112:131 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1113:100:1113:116 | (...)... | semmle.label | (...)... |
@@ -6314,51 +6405,52 @@ nodes
 | LogInjectionTest.java:1116:64:1116:71 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1117:40:1117:56 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1117:49:1117:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1118:40:1118:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1118:49:1118:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1119:55:1119:76 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1119:69:1119:76 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1120:40:1120:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1120:49:1120:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1121:40:1121:61 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1121:54:1121:61 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1122:40:1122:61 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1122:54:1122:61 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1123:25:1123:50 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1123:43:1123:50 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1124:25:1124:50 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1124:43:1124:50 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1125:25:1125:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1125:35:1125:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1126:25:1126:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1126:35:1126:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1127:25:1127:32 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1128:25:1128:32 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1129:25:1129:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1129:34:1129:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1130:25:1130:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1130:34:1130:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1131:40:1131:62 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1131:40:1131:62 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1131:54:1131:61 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1132:40:1132:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1132:49:1132:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1133:25:1133:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1133:34:1133:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1134:55:1134:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1134:64:1134:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1135:40:1135:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1135:49:1135:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1136:25:1136:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1136:34:1136:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1137:70:1137:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1137:79:1137:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1138:55:1138:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1138:64:1138:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1139:40:1139:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1139:49:1139:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1140:25:1140:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1140:34:1140:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1118:25:1118:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1118:34:1118:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1119:130:1119:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1119:139:1119:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1120:115:1120:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1120:124:1120:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1121:100:1121:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1121:109:1121:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1122:85:1122:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1122:94:1122:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1123:70:1123:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1123:79:1123:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1124:55:1124:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1124:64:1124:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1125:40:1125:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1125:49:1125:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1126:25:1126:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1126:34:1126:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1127:145:1127:161 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1127:154:1127:161 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1128:130:1128:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1128:139:1128:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1129:115:1129:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1129:124:1129:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1130:100:1130:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1130:109:1130:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1131:85:1131:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1131:94:1131:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1132:70:1132:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1132:79:1132:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1133:55:1133:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1133:64:1133:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1134:40:1134:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1134:49:1134:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1135:25:1135:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1135:34:1135:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1136:160:1136:176 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1136:169:1136:176 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1137:145:1137:161 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1137:154:1137:161 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1138:130:1138:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1138:139:1138:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1139:115:1139:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1139:124:1139:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1140:100:1140:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1140:109:1140:116 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1141:85:1141:101 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1141:94:1141:101 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1142:70:1142:86 | (...)... | semmle.label | (...)... |
@@ -6369,166 +6461,166 @@ nodes
 | LogInjectionTest.java:1144:49:1144:56 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1145:25:1145:41 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1145:34:1145:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1146:100:1146:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1146:109:1146:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1147:85:1147:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1147:94:1147:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1148:70:1148:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1148:79:1148:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1149:55:1149:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1149:64:1149:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1150:40:1150:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1150:49:1150:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1151:25:1151:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1151:34:1151:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1152:115:1152:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1152:124:1152:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1153:100:1153:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1153:109:1153:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1154:85:1154:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1154:94:1154:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1155:70:1155:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1155:79:1155:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1156:55:1156:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1156:64:1156:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1157:40:1157:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1157:49:1157:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1158:25:1158:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1158:34:1158:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1159:130:1159:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1159:139:1159:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1160:115:1160:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1160:124:1160:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1161:100:1161:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1161:109:1161:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1162:85:1162:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1162:94:1162:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1163:70:1163:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1163:79:1163:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1164:55:1164:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1164:64:1164:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1165:40:1165:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1165:49:1165:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1166:25:1166:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1166:34:1166:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1167:145:1167:161 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1167:154:1167:161 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1168:130:1168:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1168:139:1168:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1169:115:1169:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1169:124:1169:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1170:100:1170:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1170:109:1170:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1171:85:1171:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1171:94:1171:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1172:70:1172:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1172:79:1172:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1173:55:1173:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1173:64:1173:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1174:40:1174:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1174:49:1174:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1175:25:1175:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1175:34:1175:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1176:160:1176:176 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1176:169:1176:176 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1177:145:1177:161 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1177:154:1177:161 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1178:130:1178:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1178:139:1178:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1179:115:1179:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1179:124:1179:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1180:100:1180:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1180:109:1180:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1181:85:1181:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1181:94:1181:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1182:70:1182:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1182:79:1182:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1183:55:1183:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1183:64:1183:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1184:40:1184:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1184:49:1184:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1185:25:1185:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1185:34:1185:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1146:25:1146:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1146:34:1146:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1147:40:1147:61 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1147:54:1147:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1148:25:1148:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1148:34:1148:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1149:25:1149:46 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1149:39:1149:46 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1150:25:1150:46 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1150:39:1150:46 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1152:55:1152:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1152:65:1152:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1153:39:1153:55 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1153:48:1153:55 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1154:45:1154:67 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1154:45:1154:67 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1154:59:1154:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1155:33:1155:49 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1155:42:1155:49 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1156:39:1156:61 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1156:39:1156:61 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1156:53:1156:60 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1157:31:1157:48 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1157:41:1157:48 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1158:31:1158:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1158:40:1158:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1159:46:1159:68 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1159:46:1159:68 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1159:60:1159:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1160:31:1160:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1160:40:1160:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1161:13:1161:68 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1161:46:1161:67 | (...)... : Supplier | semmle.label | (...)... : Supplier |
+| LogInjectionTest.java:1161:60:1161:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1162:13:1162:53 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1162:31:1162:52 | (...)... : Supplier | semmle.label | (...)... : Supplier |
+| LogInjectionTest.java:1162:45:1162:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1163:30:1163:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1163:45:1163:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1164:30:1164:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1164:45:1164:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1165:51:1165:58 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1166:30:1166:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1166:40:1166:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1167:46:1167:53 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1168:30:1168:37 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1169:30:1169:46 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1169:39:1169:46 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1170:45:1170:52 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1174:25:1174:47 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1174:40:1174:47 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1175:25:1175:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1175:35:1175:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1176:25:1176:32 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1177:25:1177:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1177:34:1177:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1178:25:1178:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1178:34:1178:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1179:40:1179:62 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1179:40:1179:62 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1179:54:1179:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1180:40:1180:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1182:40:1182:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1182:49:1182:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1183:25:1183:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1183:34:1183:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1184:55:1184:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1184:64:1184:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1185:40:1185:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1185:49:1185:56 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1186:25:1186:41 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1186:34:1186:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1187:40:1187:61 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1187:54:1187:61 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1188:25:1188:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1188:34:1188:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1189:25:1189:46 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1189:39:1189:46 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1190:25:1190:46 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1190:39:1190:46 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1192:55:1192:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1192:65:1192:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1193:39:1193:55 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1193:48:1193:55 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1194:45:1194:67 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1194:45:1194:67 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1194:59:1194:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1195:33:1195:49 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1195:42:1195:49 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1196:39:1196:61 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1196:39:1196:61 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1196:53:1196:60 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1197:31:1197:48 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1197:41:1197:48 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1198:31:1198:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1198:40:1198:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1199:46:1199:68 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1199:46:1199:68 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1199:60:1199:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1200:31:1200:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1200:40:1200:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1201:13:1201:68 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1201:46:1201:67 | (...)... : Supplier | semmle.label | (...)... : Supplier |
-| LogInjectionTest.java:1201:60:1201:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1202:13:1202:53 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1202:31:1202:52 | (...)... : Supplier | semmle.label | (...)... : Supplier |
-| LogInjectionTest.java:1202:45:1202:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1203:30:1203:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1203:45:1203:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1204:30:1204:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1204:45:1204:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1205:51:1205:58 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1206:30:1206:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1206:40:1206:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1207:46:1207:53 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1208:30:1208:37 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1209:30:1209:46 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1209:39:1209:46 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1210:45:1210:52 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1214:25:1214:47 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1214:40:1214:47 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1215:25:1215:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1215:35:1215:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1216:25:1216:32 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1217:25:1217:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1217:34:1217:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1218:25:1218:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1218:34:1218:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1219:40:1219:62 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1219:40:1219:62 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1219:54:1219:61 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1220:40:1220:47 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1222:40:1222:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1222:49:1222:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1223:25:1223:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1223:34:1223:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1224:55:1224:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1224:64:1224:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1225:40:1225:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1225:49:1225:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1226:25:1226:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1226:34:1226:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1227:70:1227:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1227:79:1227:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1228:55:1228:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1228:64:1228:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1229:40:1229:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1229:49:1229:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1230:25:1230:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1230:34:1230:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1187:70:1187:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1187:79:1187:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1188:55:1188:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1188:64:1188:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1189:40:1189:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1189:49:1189:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1190:25:1190:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1190:34:1190:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1191:85:1191:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1191:94:1191:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1192:70:1192:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1192:79:1192:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1193:55:1193:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1193:64:1193:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1194:40:1194:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1194:49:1194:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1195:25:1195:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1195:34:1195:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1196:100:1196:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1196:109:1196:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1197:85:1197:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1197:94:1197:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1198:70:1198:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1198:79:1198:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1199:55:1199:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1199:64:1199:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1200:40:1200:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1200:49:1200:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1201:25:1201:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1201:34:1201:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1202:115:1202:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1202:124:1202:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1203:100:1203:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1203:109:1203:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1204:85:1204:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1204:94:1204:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1205:70:1205:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1205:79:1205:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1206:55:1206:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1206:64:1206:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1207:40:1207:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1207:49:1207:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1208:25:1208:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1208:34:1208:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1209:130:1209:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1209:139:1209:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1210:115:1210:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1210:124:1210:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1211:100:1211:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1211:109:1211:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1212:85:1212:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1212:94:1212:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1213:70:1213:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1213:79:1213:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1214:55:1214:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1214:64:1214:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1215:40:1215:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1215:49:1215:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1216:25:1216:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1216:34:1216:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1217:145:1217:161 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1217:154:1217:161 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1218:130:1218:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1218:139:1218:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1219:115:1219:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1219:124:1219:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1220:100:1220:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1220:109:1220:116 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1221:85:1221:101 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1221:94:1221:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1222:70:1222:86 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1222:79:1222:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1223:55:1223:71 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1223:64:1223:71 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1224:40:1224:56 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1224:49:1224:56 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1225:25:1225:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1225:34:1225:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1226:160:1226:176 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1226:169:1226:176 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1227:145:1227:161 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1227:154:1227:161 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1228:130:1228:146 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1228:139:1228:146 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1229:115:1229:131 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1229:124:1229:131 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1230:100:1230:116 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1230:109:1230:116 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1231:85:1231:101 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1231:94:1231:101 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1232:70:1232:86 | (...)... | semmle.label | (...)... |
@@ -6539,179 +6631,183 @@ nodes
 | LogInjectionTest.java:1234:49:1234:56 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1235:25:1235:41 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1235:34:1235:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1236:100:1236:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1236:109:1236:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1237:85:1237:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1237:94:1237:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1238:70:1238:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1238:79:1238:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1239:55:1239:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1239:64:1239:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1240:40:1240:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1240:49:1240:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1241:25:1241:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1241:34:1241:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1242:115:1242:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1242:124:1242:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1243:100:1243:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1243:109:1243:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1244:85:1244:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1244:94:1244:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1245:70:1245:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1245:79:1245:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1246:55:1246:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1246:64:1246:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1247:40:1247:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1247:49:1247:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1248:25:1248:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1248:34:1248:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1249:130:1249:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1249:139:1249:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1250:115:1250:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1250:124:1250:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1251:100:1251:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1251:109:1251:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1252:85:1252:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1252:94:1252:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1253:70:1253:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1253:79:1253:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1254:55:1254:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1254:64:1254:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1255:40:1255:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1255:49:1255:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1256:25:1256:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1256:34:1256:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1257:145:1257:161 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1257:154:1257:161 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1258:130:1258:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1258:139:1258:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1259:115:1259:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1259:124:1259:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1260:100:1260:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1260:109:1260:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1261:85:1261:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1261:94:1261:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1262:70:1262:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1262:79:1262:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1263:55:1263:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1263:64:1263:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1264:40:1264:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1264:49:1264:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1265:25:1265:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1265:34:1265:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1266:160:1266:176 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1266:169:1266:176 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1267:145:1267:161 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1267:154:1267:161 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1268:130:1268:146 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1268:139:1268:146 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1269:115:1269:131 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1269:124:1269:131 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1270:100:1270:116 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1270:109:1270:116 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1271:85:1271:101 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1271:94:1271:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1272:70:1272:86 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1272:79:1272:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1273:55:1273:71 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1273:64:1273:71 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1274:40:1274:56 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1274:49:1274:56 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1275:25:1275:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1275:34:1275:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1277:25:1277:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1277:34:1277:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1278:40:1278:61 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1278:54:1278:61 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1279:25:1279:46 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1279:39:1279:46 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1283:23:1283:30 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1284:23:1284:30 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1285:23:1285:30 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1286:22:1286:29 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1287:23:1287:30 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1288:22:1288:29 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1293:27:1293:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1294:27:1294:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1298:42:1298:49 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1299:57:1299:79 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1299:57:1299:79 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1299:71:1299:78 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1300:42:1300:49 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1301:27:1301:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1302:27:1302:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1306:42:1306:49 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1307:57:1307:79 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1307:57:1307:79 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1307:71:1307:78 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1308:42:1308:49 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1309:27:1309:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1310:27:1310:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1314:42:1314:49 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1315:57:1315:79 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1315:57:1315:79 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1315:71:1315:78 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1316:42:1316:49 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1317:26:1317:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1318:26:1318:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1322:41:1322:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1323:56:1323:78 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1323:56:1323:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1323:70:1323:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1324:41:1324:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1325:27:1325:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1326:27:1326:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1330:42:1330:49 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1331:57:1331:79 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1331:57:1331:79 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1331:71:1331:78 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1332:42:1332:49 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1333:26:1333:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1334:26:1334:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1338:41:1338:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1339:56:1339:78 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1339:56:1339:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1339:70:1339:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1340:41:1340:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1341:64:1341:71 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1342:64:1342:71 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1346:79:1346:86 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1347:79:1347:86 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1348:94:1348:116 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1348:94:1348:116 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1348:108:1348:115 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1349:43:1349:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1349:52:1349:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1350:28:1350:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1350:37:1350:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1237:25:1237:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1237:34:1237:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1238:40:1238:61 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1238:54:1238:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1239:25:1239:46 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1239:39:1239:46 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1243:23:1243:30 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1244:23:1244:30 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1245:23:1245:30 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1246:22:1246:29 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1247:23:1247:30 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1248:22:1248:29 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1253:27:1253:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1254:27:1254:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1258:42:1258:49 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1259:57:1259:79 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1259:57:1259:79 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1259:71:1259:78 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1260:42:1260:49 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1261:27:1261:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1262:27:1262:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1266:42:1266:49 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1267:57:1267:79 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1267:57:1267:79 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1267:71:1267:78 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1268:42:1268:49 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1269:27:1269:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1270:27:1270:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1274:42:1274:49 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1275:57:1275:79 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1275:57:1275:79 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1275:71:1275:78 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1276:42:1276:49 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1277:26:1277:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1278:26:1278:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1282:41:1282:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1283:56:1283:78 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1283:56:1283:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1283:70:1283:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1284:41:1284:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1285:27:1285:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1286:27:1286:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1290:42:1290:49 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1291:57:1291:79 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1291:57:1291:79 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1291:71:1291:78 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1292:42:1292:49 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1293:26:1293:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1294:26:1294:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1298:41:1298:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1299:56:1299:78 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1299:56:1299:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1299:70:1299:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1300:41:1300:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1301:64:1301:71 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1302:64:1302:71 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1306:79:1306:86 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1307:79:1307:86 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1308:94:1308:116 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1308:94:1308:116 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1308:108:1308:115 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1309:43:1309:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1309:52:1309:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1310:28:1310:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1310:37:1310:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1311:43:1311:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1311:52:1311:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1312:28:1312:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1312:37:1312:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1313:28:1313:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1313:37:1313:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1314:28:1314:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1314:37:1314:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1315:43:1315:65 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1315:43:1315:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1315:57:1315:64 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1316:43:1316:65 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1316:43:1316:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1316:57:1316:64 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1317:58:1317:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1317:67:1317:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1318:43:1318:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1318:52:1318:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1319:28:1319:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1319:37:1319:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1320:58:1320:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1320:67:1320:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1321:43:1321:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1321:52:1321:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1322:28:1322:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1322:37:1322:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1323:73:1323:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1323:82:1323:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1324:58:1324:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1324:67:1324:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1325:43:1325:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1325:52:1325:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1326:28:1326:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1326:37:1326:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1327:73:1327:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1327:82:1327:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1328:58:1328:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1328:67:1328:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1329:43:1329:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1329:52:1329:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1330:28:1330:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1330:37:1330:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1331:43:1331:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1331:52:1331:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1332:28:1332:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1332:37:1332:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1333:43:1333:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1333:52:1333:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1334:28:1334:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1334:37:1334:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1335:28:1335:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1335:37:1335:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1336:28:1336:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1336:37:1336:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1337:43:1337:65 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1337:43:1337:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1337:57:1337:64 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1338:43:1338:65 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1338:43:1338:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1338:57:1338:64 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1339:58:1339:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1339:67:1339:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1340:43:1340:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1340:52:1340:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1341:28:1341:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1341:37:1341:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1342:58:1342:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1342:67:1342:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1343:43:1343:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1343:52:1343:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1344:28:1344:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1344:37:1344:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1345:73:1345:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1345:82:1345:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1346:58:1346:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1346:67:1346:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1347:43:1347:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1347:52:1347:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1348:28:1348:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1348:37:1348:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1349:73:1349:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1349:82:1349:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1350:58:1350:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1350:67:1350:74 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1351:43:1351:59 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1351:52:1351:59 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1352:28:1352:44 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1352:37:1352:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1353:28:1353:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1353:37:1353:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1353:43:1353:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1353:52:1353:59 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1354:28:1354:44 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1354:37:1354:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1355:43:1355:65 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1355:43:1355:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1355:57:1355:64 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1356:43:1356:65 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1356:43:1356:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1356:57:1356:64 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1357:58:1357:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1357:67:1357:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1358:43:1358:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1358:52:1358:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1359:28:1359:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1359:37:1359:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1360:58:1360:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1360:67:1360:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1361:43:1361:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1361:52:1361:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1362:28:1362:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1362:37:1362:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1363:73:1363:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1363:82:1363:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1355:43:1355:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1355:52:1355:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1356:28:1356:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1356:37:1356:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1357:28:1357:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1357:37:1357:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1358:28:1358:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1358:37:1358:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1359:43:1359:65 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1359:43:1359:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1359:57:1359:64 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1360:43:1360:65 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1360:43:1360:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1360:57:1360:64 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1361:58:1361:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1361:67:1361:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1362:43:1362:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1362:52:1362:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1363:28:1363:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1363:37:1363:44 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1364:58:1364:74 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1364:67:1364:74 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1365:43:1365:59 | (...)... | semmle.label | (...)... |
@@ -6726,363 +6822,363 @@ nodes
 | LogInjectionTest.java:1369:52:1369:59 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1370:28:1370:44 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1370:37:1370:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1371:43:1371:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1371:52:1371:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1372:28:1372:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1372:37:1372:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1371:73:1371:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1371:82:1371:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1372:58:1372:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1372:67:1372:74 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1373:43:1373:59 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1373:52:1373:59 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1374:28:1374:44 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1374:37:1374:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1375:28:1375:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1375:37:1375:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1376:28:1376:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1376:37:1376:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1377:43:1377:65 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1377:43:1377:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1377:57:1377:64 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1378:43:1378:65 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1378:43:1378:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1378:57:1378:64 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1379:58:1379:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1379:67:1379:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1380:43:1380:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1380:52:1380:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1381:28:1381:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1381:37:1381:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1382:58:1382:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1382:67:1382:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1383:43:1383:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1383:52:1383:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1384:28:1384:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1384:37:1384:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1385:73:1385:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1385:82:1385:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1386:58:1386:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1386:67:1386:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1387:43:1387:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1387:52:1387:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1388:28:1388:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1388:37:1388:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1389:73:1389:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1389:82:1389:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1390:58:1390:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1390:67:1390:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1391:43:1391:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1391:52:1391:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1392:28:1392:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1392:37:1392:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1393:43:1393:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1393:52:1393:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1394:28:1394:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1394:37:1394:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1395:43:1395:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1395:52:1395:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1396:28:1396:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1396:37:1396:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1397:28:1397:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1397:37:1397:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1398:28:1398:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1398:37:1398:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1399:43:1399:65 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1399:43:1399:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1399:57:1399:64 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1400:43:1400:65 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1400:43:1400:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1400:57:1400:64 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1401:58:1401:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1401:67:1401:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1402:43:1402:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1402:52:1402:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1403:28:1403:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1403:37:1403:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1404:58:1404:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1404:67:1404:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1405:43:1405:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1405:52:1405:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1406:28:1406:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1406:37:1406:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1407:73:1407:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1407:82:1407:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1408:58:1408:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1408:67:1408:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1409:43:1409:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1409:52:1409:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1410:28:1410:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1410:37:1410:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1411:73:1411:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1411:82:1411:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1412:58:1412:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1412:67:1412:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1413:43:1413:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1413:52:1413:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1414:28:1414:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1414:37:1414:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1415:42:1415:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1415:51:1415:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1416:27:1416:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1416:36:1416:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1417:42:1417:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1417:51:1417:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1418:27:1418:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1418:36:1418:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1419:27:1419:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1419:36:1419:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1420:27:1420:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1420:36:1420:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1421:42:1421:64 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1421:42:1421:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1421:56:1421:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1422:42:1422:64 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1422:42:1422:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1422:56:1422:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1423:57:1423:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1423:66:1423:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1424:42:1424:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1424:51:1424:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1425:27:1425:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1425:36:1425:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1426:57:1426:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1426:66:1426:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1427:42:1427:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1427:51:1427:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1428:27:1428:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1428:36:1428:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1429:72:1429:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1429:81:1429:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1430:57:1430:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1430:66:1430:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1431:42:1431:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1431:51:1431:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1432:27:1432:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1432:36:1432:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1433:72:1433:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1433:81:1433:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1434:57:1434:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1434:66:1434:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1435:42:1435:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1435:51:1435:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1436:27:1436:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1436:36:1436:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1437:80:1437:96 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1437:89:1437:96 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1438:65:1438:81 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1438:74:1438:81 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1439:80:1439:96 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1439:89:1439:96 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1440:65:1440:81 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1440:74:1440:81 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1441:65:1441:81 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1441:74:1441:81 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1442:65:1442:81 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1442:74:1442:81 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1443:80:1443:102 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1443:80:1443:102 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1443:94:1443:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1444:80:1444:102 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1444:80:1444:102 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1444:94:1444:101 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1445:95:1445:111 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1445:104:1445:111 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1446:80:1446:96 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1446:89:1446:96 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1447:65:1447:81 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1447:74:1447:81 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1448:95:1448:111 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1448:104:1448:111 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1449:80:1449:96 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1449:89:1449:96 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1450:65:1450:81 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1450:74:1450:81 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1451:110:1451:126 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1451:119:1451:126 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1452:95:1452:111 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1452:104:1452:111 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1453:80:1453:96 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1453:89:1453:96 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1454:65:1454:81 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1454:74:1454:81 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1455:110:1455:126 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1455:119:1455:126 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1456:95:1456:111 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1456:104:1456:111 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1457:80:1457:96 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1457:89:1457:96 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1458:65:1458:81 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1458:74:1458:81 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1459:43:1459:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1459:52:1459:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1460:28:1460:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1460:37:1460:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1461:43:1461:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1461:52:1461:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1462:28:1462:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1462:37:1462:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1463:28:1463:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1463:37:1463:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1464:28:1464:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1464:37:1464:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1465:43:1465:65 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1465:43:1465:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1465:57:1465:64 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1466:43:1466:65 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1466:43:1466:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1466:57:1466:64 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1467:58:1467:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1467:67:1467:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1468:43:1468:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1468:52:1468:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1469:28:1469:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1469:37:1469:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1470:58:1470:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1470:67:1470:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1471:43:1471:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1471:52:1471:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1472:28:1472:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1472:37:1472:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1473:73:1473:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1473:82:1473:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1474:58:1474:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1474:67:1474:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1475:43:1475:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1475:52:1475:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1476:28:1476:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1476:37:1476:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1477:73:1477:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1477:82:1477:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1478:58:1478:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1478:67:1478:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1479:43:1479:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1479:52:1479:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1480:28:1480:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1480:37:1480:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1481:42:1481:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1481:51:1481:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1482:27:1482:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1482:36:1482:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1483:42:1483:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1483:51:1483:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1484:27:1484:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1484:36:1484:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1485:27:1485:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1485:36:1485:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1486:27:1486:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1486:36:1486:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1487:42:1487:64 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1487:42:1487:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1487:56:1487:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1488:42:1488:64 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1488:42:1488:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1488:56:1488:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1489:57:1489:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1489:66:1489:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1490:42:1490:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1490:51:1490:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1491:27:1491:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1491:36:1491:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1492:57:1492:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1492:66:1492:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1493:42:1493:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1493:51:1493:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1494:27:1494:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1494:36:1494:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1495:72:1495:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1495:81:1495:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1496:57:1496:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1496:66:1496:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1497:42:1497:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1497:51:1497:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1498:27:1498:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1498:36:1498:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1499:72:1499:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1499:81:1499:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1500:57:1500:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1500:66:1500:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1501:42:1501:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1501:51:1501:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1502:27:1502:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1502:36:1502:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1508:26:1508:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1509:26:1509:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1513:41:1513:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1514:56:1514:78 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1514:56:1514:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1514:70:1514:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1515:41:1515:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1516:26:1516:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1517:26:1517:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1521:41:1521:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1522:56:1522:78 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1522:56:1522:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1522:70:1522:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1523:41:1523:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1524:26:1524:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1525:26:1525:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1529:41:1529:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1530:56:1530:78 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1530:56:1530:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1530:70:1530:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1531:41:1531:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1532:25:1532:32 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1533:25:1533:32 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1537:40:1537:47 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1538:55:1538:77 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1538:55:1538:77 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1538:69:1538:76 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1539:40:1539:47 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1540:26:1540:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1541:26:1541:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1545:41:1545:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1546:56:1546:78 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1546:56:1546:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1546:70:1546:77 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1547:41:1547:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1548:25:1548:32 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1549:25:1549:32 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1553:40:1553:47 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1554:55:1554:77 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1554:55:1554:77 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1554:69:1554:76 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1555:40:1555:47 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1556:63:1556:70 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1557:63:1557:70 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1561:78:1561:85 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1562:78:1562:85 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1563:93:1563:115 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1563:93:1563:115 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1563:107:1563:114 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1564:42:1564:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1564:51:1564:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1565:27:1565:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1565:36:1565:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1375:42:1375:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1375:51:1375:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1376:27:1376:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1376:36:1376:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1377:42:1377:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1377:51:1377:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1378:27:1378:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1378:36:1378:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1379:27:1379:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1379:36:1379:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1380:27:1380:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1380:36:1380:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1381:42:1381:64 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1381:42:1381:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1381:56:1381:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1382:42:1382:64 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1382:42:1382:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1382:56:1382:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1383:57:1383:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1383:66:1383:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1384:42:1384:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1384:51:1384:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1385:27:1385:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1385:36:1385:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1386:57:1386:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1386:66:1386:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1387:42:1387:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1387:51:1387:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1388:27:1388:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1388:36:1388:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1389:72:1389:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1389:81:1389:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1390:57:1390:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1390:66:1390:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1391:42:1391:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1391:51:1391:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1392:27:1392:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1392:36:1392:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1393:72:1393:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1393:81:1393:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1394:57:1394:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1394:66:1394:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1395:42:1395:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1395:51:1395:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1396:27:1396:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1396:36:1396:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1397:80:1397:96 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1397:89:1397:96 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1398:65:1398:81 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1398:74:1398:81 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1399:80:1399:96 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1399:89:1399:96 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1400:65:1400:81 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1400:74:1400:81 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1401:65:1401:81 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1401:74:1401:81 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1402:65:1402:81 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1402:74:1402:81 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1403:80:1403:102 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1403:80:1403:102 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1403:94:1403:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1404:80:1404:102 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1404:80:1404:102 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1404:94:1404:101 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1405:95:1405:111 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1405:104:1405:111 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1406:80:1406:96 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1406:89:1406:96 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1407:65:1407:81 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1407:74:1407:81 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1408:95:1408:111 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1408:104:1408:111 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1409:80:1409:96 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1409:89:1409:96 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1410:65:1410:81 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1410:74:1410:81 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1411:110:1411:126 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1411:119:1411:126 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1412:95:1412:111 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1412:104:1412:111 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1413:80:1413:96 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1413:89:1413:96 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1414:65:1414:81 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1414:74:1414:81 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1415:110:1415:126 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1415:119:1415:126 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1416:95:1416:111 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1416:104:1416:111 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1417:80:1417:96 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1417:89:1417:96 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1418:65:1418:81 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1418:74:1418:81 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1419:43:1419:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1419:52:1419:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1420:28:1420:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1420:37:1420:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1421:43:1421:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1421:52:1421:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1422:28:1422:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1422:37:1422:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1423:28:1423:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1423:37:1423:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1424:28:1424:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1424:37:1424:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1425:43:1425:65 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1425:43:1425:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1425:57:1425:64 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1426:43:1426:65 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1426:43:1426:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1426:57:1426:64 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1427:58:1427:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1427:67:1427:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1428:43:1428:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1428:52:1428:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1429:28:1429:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1429:37:1429:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1430:58:1430:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1430:67:1430:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1431:43:1431:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1431:52:1431:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1432:28:1432:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1432:37:1432:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1433:73:1433:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1433:82:1433:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1434:58:1434:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1434:67:1434:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1435:43:1435:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1435:52:1435:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1436:28:1436:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1436:37:1436:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1437:73:1437:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1437:82:1437:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1438:58:1438:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1438:67:1438:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1439:43:1439:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1439:52:1439:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1440:28:1440:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1440:37:1440:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1441:42:1441:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1441:51:1441:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1442:27:1442:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1442:36:1442:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1443:42:1443:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1443:51:1443:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1444:27:1444:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1444:36:1444:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1445:27:1445:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1445:36:1445:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1446:27:1446:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1446:36:1446:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1447:42:1447:64 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1447:42:1447:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1447:56:1447:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1448:42:1448:64 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1448:42:1448:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1448:56:1448:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1449:57:1449:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1449:66:1449:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1450:42:1450:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1450:51:1450:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1451:27:1451:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1451:36:1451:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1452:57:1452:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1452:66:1452:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1453:42:1453:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1453:51:1453:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1454:27:1454:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1454:36:1454:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1455:72:1455:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1455:81:1455:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1456:57:1456:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1456:66:1456:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1457:42:1457:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1457:51:1457:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1458:27:1458:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1458:36:1458:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1459:72:1459:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1459:81:1459:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1460:57:1460:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1460:66:1460:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1461:42:1461:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1461:51:1461:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1462:27:1462:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1462:36:1462:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1468:26:1468:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1469:26:1469:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1473:41:1473:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1474:56:1474:78 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1474:56:1474:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1474:70:1474:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1475:41:1475:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1476:26:1476:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1477:26:1477:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1481:41:1481:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1482:56:1482:78 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1482:56:1482:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1482:70:1482:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1483:41:1483:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1484:26:1484:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1485:26:1485:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1489:41:1489:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1490:56:1490:78 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1490:56:1490:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1490:70:1490:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1491:41:1491:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1492:25:1492:32 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1493:25:1493:32 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1497:40:1497:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1498:55:1498:77 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1498:55:1498:77 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1498:69:1498:76 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1499:40:1499:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1500:26:1500:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1501:26:1501:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1505:41:1505:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1506:56:1506:78 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1506:56:1506:78 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1506:70:1506:77 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1507:41:1507:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1508:25:1508:32 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1509:25:1509:32 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1513:40:1513:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1514:55:1514:77 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1514:55:1514:77 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1514:69:1514:76 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1515:40:1515:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1516:63:1516:70 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1517:63:1517:70 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1521:78:1521:85 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1522:78:1522:85 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1523:93:1523:115 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1523:93:1523:115 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1523:107:1523:114 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1524:42:1524:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1524:51:1524:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1525:27:1525:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1525:36:1525:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1526:42:1526:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1526:51:1526:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1527:27:1527:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1527:36:1527:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1528:27:1528:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1528:36:1528:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1529:27:1529:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1529:36:1529:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1530:42:1530:64 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1530:42:1530:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1530:56:1530:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1531:42:1531:64 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1531:42:1531:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1531:56:1531:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1532:57:1532:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1532:66:1532:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1533:42:1533:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1533:51:1533:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1534:27:1534:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1534:36:1534:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1535:57:1535:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1535:66:1535:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1536:42:1536:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1536:51:1536:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1537:27:1537:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1537:36:1537:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1538:72:1538:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1538:81:1538:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1539:57:1539:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1539:66:1539:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1540:42:1540:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1540:51:1540:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1541:27:1541:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1541:36:1541:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1542:72:1542:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1542:81:1542:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1543:57:1543:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1543:66:1543:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1544:42:1544:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1544:51:1544:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1545:27:1545:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1545:36:1545:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1546:42:1546:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1546:51:1546:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1547:27:1547:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1547:36:1547:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1548:42:1548:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1548:51:1548:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1549:27:1549:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1549:36:1549:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1550:27:1550:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1550:36:1550:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1551:27:1551:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1551:36:1551:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1552:42:1552:64 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1552:42:1552:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1552:56:1552:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1553:42:1553:64 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1553:42:1553:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1553:56:1553:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1554:57:1554:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1554:66:1554:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1555:42:1555:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1555:51:1555:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1556:27:1556:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1556:36:1556:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1557:57:1557:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1557:66:1557:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1558:42:1558:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1558:51:1558:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1559:27:1559:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1559:36:1559:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1560:72:1560:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1560:81:1560:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1561:57:1561:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1561:66:1561:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1562:42:1562:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1562:51:1562:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1563:27:1563:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1563:36:1563:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1564:72:1564:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1564:81:1564:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1565:57:1565:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1565:66:1565:73 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1566:42:1566:58 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1566:51:1566:58 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1567:27:1567:43 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1567:36:1567:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1568:27:1568:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1568:36:1568:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1568:42:1568:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1568:51:1568:58 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1569:27:1569:43 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1569:36:1569:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1570:42:1570:64 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1570:42:1570:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1570:56:1570:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1571:42:1571:64 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1571:42:1571:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1571:56:1571:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1572:57:1572:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1572:66:1572:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1573:42:1573:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1573:51:1573:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1574:27:1574:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1574:36:1574:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1575:57:1575:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1575:66:1575:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1576:42:1576:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1576:51:1576:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1577:27:1577:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1577:36:1577:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1578:72:1578:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1578:81:1578:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1570:42:1570:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1570:51:1570:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1571:27:1571:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1571:36:1571:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1572:27:1572:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1572:36:1572:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1573:27:1573:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1573:36:1573:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1574:42:1574:64 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1574:42:1574:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1574:56:1574:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1575:42:1575:64 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1575:42:1575:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1575:56:1575:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1576:57:1576:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1576:66:1576:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1577:42:1577:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1577:51:1577:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1578:27:1578:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1578:36:1578:43 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1579:57:1579:73 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1579:66:1579:73 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1580:42:1580:58 | (...)... | semmle.label | (...)... |
@@ -7097,526 +7193,522 @@ nodes
 | LogInjectionTest.java:1584:51:1584:58 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1585:27:1585:43 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1585:36:1585:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1586:42:1586:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1586:51:1586:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1587:27:1587:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1587:36:1587:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1586:72:1586:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1586:81:1586:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1587:57:1587:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1587:66:1587:73 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1588:42:1588:58 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1588:51:1588:58 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1589:27:1589:43 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1589:36:1589:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1590:27:1590:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1590:36:1590:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1591:27:1591:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1591:36:1591:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1592:42:1592:64 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1592:42:1592:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1592:56:1592:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1593:42:1593:64 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1593:42:1593:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1593:56:1593:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1594:57:1594:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1594:66:1594:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1595:42:1595:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1595:51:1595:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1596:27:1596:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1596:36:1596:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1597:57:1597:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1597:66:1597:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1598:42:1598:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1598:51:1598:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1599:27:1599:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1599:36:1599:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1600:72:1600:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1600:81:1600:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1601:57:1601:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1601:66:1601:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1602:42:1602:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1602:51:1602:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1603:27:1603:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1603:36:1603:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1604:72:1604:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1604:81:1604:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1605:57:1605:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1605:66:1605:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1606:42:1606:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1606:51:1606:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1607:27:1607:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1607:36:1607:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1608:42:1608:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1608:51:1608:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1609:27:1609:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1609:36:1609:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1610:42:1610:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1610:51:1610:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1611:27:1611:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1611:36:1611:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1612:27:1612:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1612:36:1612:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1613:27:1613:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1613:36:1613:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1614:42:1614:64 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1614:42:1614:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1614:56:1614:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1615:42:1615:64 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1615:42:1615:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1615:56:1615:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1616:57:1616:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1616:66:1616:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1617:42:1617:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1617:51:1617:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1618:27:1618:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1618:36:1618:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1619:57:1619:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1619:66:1619:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1620:42:1620:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1620:51:1620:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1621:27:1621:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1621:36:1621:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1622:72:1622:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1622:81:1622:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1623:57:1623:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1623:66:1623:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1624:42:1624:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1624:51:1624:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1625:27:1625:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1625:36:1625:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1626:72:1626:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1626:81:1626:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1627:57:1627:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1627:66:1627:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1628:42:1628:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1628:51:1628:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1629:27:1629:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1629:36:1629:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1630:41:1630:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1630:50:1630:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1631:26:1631:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1631:35:1631:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1632:41:1632:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1632:50:1632:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1633:26:1633:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1633:35:1633:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1634:26:1634:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1634:35:1634:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1635:26:1635:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1635:35:1635:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1636:41:1636:63 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1636:41:1636:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1636:55:1636:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1637:41:1637:63 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1637:41:1637:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1637:55:1637:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1638:56:1638:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1638:65:1638:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1639:41:1639:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1639:50:1639:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1640:26:1640:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1640:35:1640:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1641:56:1641:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1641:65:1641:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1642:41:1642:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1642:50:1642:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1643:26:1643:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1643:35:1643:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1644:71:1644:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1644:80:1644:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1645:56:1645:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1645:65:1645:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1646:41:1646:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1646:50:1646:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1647:26:1647:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1647:35:1647:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1648:71:1648:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1648:80:1648:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1649:56:1649:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1649:65:1649:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1650:41:1650:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1650:50:1650:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1651:26:1651:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1651:35:1651:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1652:79:1652:95 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1652:88:1652:95 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1653:64:1653:80 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1653:73:1653:80 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1654:79:1654:95 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1654:88:1654:95 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1655:64:1655:80 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1655:73:1655:80 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1656:64:1656:80 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1656:73:1656:80 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1657:64:1657:80 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1657:73:1657:80 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1658:79:1658:101 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1658:79:1658:101 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1658:93:1658:100 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1659:79:1659:101 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1659:79:1659:101 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1659:93:1659:100 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1660:94:1660:110 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1660:103:1660:110 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1661:79:1661:95 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1661:88:1661:95 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1662:64:1662:80 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1662:73:1662:80 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1663:94:1663:110 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1663:103:1663:110 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1664:79:1664:95 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1664:88:1664:95 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1665:64:1665:80 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1665:73:1665:80 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1666:109:1666:125 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1666:118:1666:125 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1667:94:1667:110 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1667:103:1667:110 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1668:79:1668:95 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1668:88:1668:95 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1669:64:1669:80 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1669:73:1669:80 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1670:109:1670:125 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1670:118:1670:125 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1671:94:1671:110 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1671:103:1671:110 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1672:79:1672:95 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1672:88:1672:95 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1673:64:1673:80 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1673:73:1673:80 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1674:42:1674:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1674:51:1674:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1675:27:1675:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1675:36:1675:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1676:42:1676:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1676:51:1676:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1677:27:1677:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1677:36:1677:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1678:27:1678:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1678:36:1678:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1679:27:1679:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1679:36:1679:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1680:42:1680:64 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1680:42:1680:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1680:56:1680:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1681:42:1681:64 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1681:42:1681:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1681:56:1681:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1682:57:1682:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1682:66:1682:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1683:42:1683:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1683:51:1683:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1684:27:1684:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1684:36:1684:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1685:57:1685:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1685:66:1685:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1686:42:1686:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1686:51:1686:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1687:27:1687:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1687:36:1687:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1688:72:1688:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1688:81:1688:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1689:57:1689:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1689:66:1689:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1690:42:1690:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1690:51:1690:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1691:27:1691:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1691:36:1691:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1692:72:1692:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1692:81:1692:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1693:57:1693:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1693:66:1693:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1694:42:1694:58 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1694:51:1694:58 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1695:27:1695:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1695:36:1695:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1696:41:1696:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1696:50:1696:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1697:26:1697:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1697:35:1697:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1698:41:1698:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1698:50:1698:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1699:26:1699:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1699:35:1699:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1590:41:1590:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1590:50:1590:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1591:26:1591:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1591:35:1591:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1592:41:1592:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1592:50:1592:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1593:26:1593:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1593:35:1593:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1594:26:1594:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1594:35:1594:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1595:26:1595:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1595:35:1595:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1596:41:1596:63 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1596:41:1596:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1596:55:1596:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1597:41:1597:63 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1597:41:1597:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1597:55:1597:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1598:56:1598:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1598:65:1598:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1599:41:1599:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1599:50:1599:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1600:26:1600:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1600:35:1600:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1601:56:1601:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1601:65:1601:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1602:41:1602:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1602:50:1602:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1603:26:1603:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1603:35:1603:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1604:71:1604:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1604:80:1604:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1605:56:1605:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1605:65:1605:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1606:41:1606:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1606:50:1606:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1607:26:1607:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1607:35:1607:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1608:71:1608:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1608:80:1608:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1609:56:1609:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1609:65:1609:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1610:41:1610:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1610:50:1610:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1611:26:1611:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1611:35:1611:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1612:79:1612:95 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1612:88:1612:95 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1613:64:1613:80 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1613:73:1613:80 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1614:79:1614:95 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1614:88:1614:95 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1615:64:1615:80 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1615:73:1615:80 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1616:64:1616:80 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1616:73:1616:80 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1617:64:1617:80 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1617:73:1617:80 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1618:79:1618:101 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1618:79:1618:101 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1618:93:1618:100 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1619:79:1619:101 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1619:79:1619:101 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1619:93:1619:100 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1620:94:1620:110 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1620:103:1620:110 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1621:79:1621:95 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1621:88:1621:95 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1622:64:1622:80 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1622:73:1622:80 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1623:94:1623:110 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1623:103:1623:110 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1624:79:1624:95 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1624:88:1624:95 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1625:64:1625:80 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1625:73:1625:80 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1626:109:1626:125 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1626:118:1626:125 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1627:94:1627:110 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1627:103:1627:110 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1628:79:1628:95 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1628:88:1628:95 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1629:64:1629:80 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1629:73:1629:80 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1630:109:1630:125 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1630:118:1630:125 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1631:94:1631:110 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1631:103:1631:110 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1632:79:1632:95 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1632:88:1632:95 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1633:64:1633:80 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1633:73:1633:80 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1634:42:1634:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1634:51:1634:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1635:27:1635:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1635:36:1635:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1636:42:1636:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1636:51:1636:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1637:27:1637:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1637:36:1637:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1638:27:1638:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1638:36:1638:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1639:27:1639:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1639:36:1639:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1640:42:1640:64 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1640:42:1640:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1640:56:1640:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1641:42:1641:64 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1641:42:1641:64 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1641:56:1641:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1642:57:1642:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1642:66:1642:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1643:42:1643:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1643:51:1643:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1644:27:1644:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1644:36:1644:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1645:57:1645:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1645:66:1645:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1646:42:1646:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1646:51:1646:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1647:27:1647:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1647:36:1647:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1648:72:1648:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1648:81:1648:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1649:57:1649:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1649:66:1649:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1650:42:1650:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1650:51:1650:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1651:27:1651:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1651:36:1651:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1652:72:1652:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1652:81:1652:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1653:57:1653:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1653:66:1653:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1654:42:1654:58 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1654:51:1654:58 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1655:27:1655:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1655:36:1655:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1656:41:1656:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1656:50:1656:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1657:26:1657:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1657:35:1657:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1658:41:1658:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1658:50:1658:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1659:26:1659:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1659:35:1659:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1660:26:1660:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1660:35:1660:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1661:26:1661:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1661:35:1661:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1662:41:1662:63 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1662:41:1662:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1662:55:1662:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1663:41:1663:63 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1663:41:1663:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1663:55:1663:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1664:56:1664:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1664:65:1664:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1665:41:1665:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1665:50:1665:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1666:26:1666:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1666:35:1666:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1667:56:1667:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1667:65:1667:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1668:41:1668:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1668:50:1668:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1669:26:1669:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1669:35:1669:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1670:71:1670:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1670:80:1670:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1671:56:1671:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1671:65:1671:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1672:41:1672:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1672:50:1672:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1673:26:1673:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1673:35:1673:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1674:71:1674:87 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1674:80:1674:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1675:56:1675:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1675:65:1675:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1676:41:1676:57 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1676:50:1676:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1677:26:1677:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1677:35:1677:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1682:25:1682:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1682:34:1682:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1683:25:1683:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1683:34:1683:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1684:40:1684:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1685:25:1685:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1685:34:1685:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1686:40:1686:62 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1686:40:1686:62 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1686:54:1686:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1687:25:1687:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1687:34:1687:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1688:40:1688:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1689:55:1689:62 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1690:25:1690:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1690:55:1690:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1695:26:1695:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1695:35:1695:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1696:26:1696:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1696:35:1696:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1697:41:1697:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1698:26:1698:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1698:35:1698:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1699:41:1699:63 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1699:41:1699:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1699:55:1699:62 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1700:26:1700:42 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1700:35:1700:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1701:26:1701:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1701:35:1701:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1702:41:1702:63 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1702:41:1702:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1702:55:1702:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1703:41:1703:63 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1703:41:1703:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1703:55:1703:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1704:56:1704:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1704:65:1704:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1705:41:1705:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1705:50:1705:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1706:26:1706:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1706:35:1706:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1707:56:1707:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1707:65:1707:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1708:41:1708:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1708:50:1708:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1709:26:1709:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1709:35:1709:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1710:71:1710:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1710:80:1710:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1711:56:1711:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1711:65:1711:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1712:41:1712:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1712:50:1712:57 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1713:26:1713:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1713:35:1713:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1714:71:1714:87 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1714:80:1714:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1715:56:1715:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1715:65:1715:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1716:41:1716:57 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1716:50:1716:57 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1701:41:1701:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1702:56:1702:63 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1703:26:1703:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1703:35:1703:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1704:51:1704:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1704:60:1704:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1705:51:1705:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1705:60:1705:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1706:66:1706:73 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1707:51:1707:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1707:60:1707:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1708:66:1708:88 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1708:66:1708:88 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1708:80:1708:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1709:51:1709:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1709:60:1709:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1710:66:1710:73 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1711:81:1711:88 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1712:51:1712:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1712:60:1712:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1713:13:1713:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1713:66:1713:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1714:13:1714:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1714:81:1714:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1715:13:1715:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1715:96:1715:103 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1716:26:1716:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1716:35:1716:42 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1717:26:1717:42 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1717:35:1717:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1722:25:1722:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1722:34:1722:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1723:25:1723:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1723:34:1723:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1724:40:1724:47 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1725:25:1725:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1725:34:1725:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1726:40:1726:62 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1726:40:1726:62 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1726:54:1726:61 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1727:25:1727:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1727:34:1727:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1728:40:1728:47 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1729:55:1729:62 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1730:25:1730:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1730:55:1730:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1735:26:1735:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1735:35:1735:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1736:26:1736:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1736:35:1736:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1737:41:1737:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1738:26:1738:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1738:35:1738:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1739:41:1739:63 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1739:41:1739:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1739:55:1739:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1740:26:1740:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1740:35:1740:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1741:41:1741:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1742:56:1742:63 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1743:26:1743:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1743:35:1743:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1744:51:1744:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1744:60:1744:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1745:51:1745:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1745:60:1745:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1746:66:1746:73 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1747:51:1747:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1747:60:1747:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1748:66:1748:88 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1748:66:1748:88 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1748:80:1748:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1749:51:1749:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1749:60:1749:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1750:66:1750:73 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1751:81:1751:88 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1752:51:1752:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1752:60:1752:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1753:13:1753:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1753:66:1753:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1754:13:1754:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1754:81:1754:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1755:13:1755:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1755:96:1755:103 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1756:26:1756:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1756:35:1756:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1757:26:1757:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1757:35:1757:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1758:41:1758:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1718:41:1718:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1719:26:1719:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1719:35:1719:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1720:41:1720:63 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1720:41:1720:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1720:55:1720:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1721:26:1721:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1721:35:1721:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1722:41:1722:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1723:56:1723:63 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1724:26:1724:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1724:35:1724:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1725:51:1725:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1725:60:1725:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1726:51:1726:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1726:60:1726:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1727:66:1727:73 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1728:51:1728:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1728:60:1728:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1729:66:1729:88 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1729:66:1729:88 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1729:80:1729:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1730:51:1730:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1730:60:1730:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1731:66:1731:73 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1732:81:1732:88 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1733:51:1733:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1733:60:1733:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1734:13:1734:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1734:66:1734:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1735:13:1735:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1735:81:1735:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1736:13:1736:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1736:96:1736:103 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1737:25:1737:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1737:34:1737:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1738:25:1738:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1738:34:1738:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1739:40:1739:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1740:25:1740:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1740:34:1740:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1741:40:1741:62 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1741:40:1741:62 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1741:54:1741:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1742:25:1742:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1742:34:1742:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1743:40:1743:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1744:55:1744:62 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1745:25:1745:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1745:34:1745:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1746:50:1746:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1746:59:1746:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1747:50:1747:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1747:59:1747:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1748:65:1748:72 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1749:50:1749:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1749:59:1749:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1750:65:1750:87 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1750:65:1750:87 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1750:79:1750:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1751:50:1751:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1751:59:1751:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1752:65:1752:72 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1753:80:1753:87 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1754:50:1754:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1754:59:1754:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1755:13:1755:103 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1755:65:1755:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1756:13:1756:103 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1756:80:1756:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1757:13:1757:103 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1757:95:1757:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1758:26:1758:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1758:35:1758:42 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1759:26:1759:42 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1759:35:1759:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1760:41:1760:63 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1760:41:1760:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1760:55:1760:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1760:41:1760:48 | source(...) | semmle.label | source(...) |
 | LogInjectionTest.java:1761:26:1761:42 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1761:35:1761:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1762:41:1762:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1763:56:1763:63 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1764:26:1764:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1764:35:1764:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1765:51:1765:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1765:60:1765:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1766:51:1766:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1766:60:1766:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1767:66:1767:73 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1762:41:1762:63 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1762:41:1762:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1762:55:1762:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1763:26:1763:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1763:35:1763:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1764:41:1764:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1765:56:1765:63 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1766:26:1766:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1766:35:1766:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1767:51:1767:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1767:60:1767:67 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1768:51:1768:67 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1768:60:1768:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1769:66:1769:88 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1769:66:1769:88 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1769:80:1769:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1769:66:1769:73 | source(...) | semmle.label | source(...) |
 | LogInjectionTest.java:1770:51:1770:67 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1770:60:1770:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1771:66:1771:73 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1772:81:1772:88 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1773:51:1773:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1773:60:1773:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1774:13:1774:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1774:66:1774:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1775:13:1775:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1775:81:1775:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1771:66:1771:88 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1771:66:1771:88 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1771:80:1771:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1772:51:1772:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1772:60:1772:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1773:66:1773:73 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1774:81:1774:88 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1775:51:1775:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1775:60:1775:67 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1776:13:1776:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1776:96:1776:103 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1777:25:1777:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1777:34:1777:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1778:25:1778:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1778:34:1778:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1779:40:1779:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1776:66:1776:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1777:13:1777:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1777:81:1777:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1778:13:1778:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1778:96:1778:103 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1779:25:1779:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1779:34:1779:41 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1780:25:1780:41 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1780:34:1780:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1781:40:1781:62 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1781:40:1781:62 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1781:54:1781:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1781:40:1781:47 | source(...) | semmle.label | source(...) |
 | LogInjectionTest.java:1782:25:1782:41 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1782:34:1782:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1783:40:1783:47 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1784:55:1784:62 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1785:25:1785:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1785:34:1785:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1786:50:1786:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1786:59:1786:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1787:50:1787:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1787:59:1787:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1788:65:1788:72 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1783:40:1783:62 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1783:40:1783:62 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1783:54:1783:61 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1784:25:1784:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1784:34:1784:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1785:40:1785:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1786:55:1786:62 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1787:25:1787:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1787:34:1787:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1788:50:1788:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1788:59:1788:66 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1789:50:1789:66 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1789:59:1789:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1790:65:1790:87 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1790:65:1790:87 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1790:79:1790:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1790:65:1790:72 | source(...) | semmle.label | source(...) |
 | LogInjectionTest.java:1791:50:1791:66 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1791:59:1791:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1792:65:1792:72 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1793:80:1793:87 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1794:50:1794:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1794:59:1794:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1795:13:1795:103 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1795:65:1795:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1796:13:1796:103 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1796:80:1796:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1792:65:1792:87 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1792:65:1792:87 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1792:79:1792:86 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1793:50:1793:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1793:59:1793:66 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1794:65:1794:72 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1795:80:1795:87 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1796:50:1796:66 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1796:59:1796:66 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1797:13:1797:103 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1797:95:1797:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1798:26:1798:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1798:35:1798:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1799:26:1799:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1799:35:1799:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1800:41:1800:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1801:26:1801:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1801:35:1801:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1802:41:1802:63 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1802:41:1802:63 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1802:55:1802:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1803:26:1803:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1803:35:1803:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1804:41:1804:48 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1805:56:1805:63 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1806:26:1806:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1806:35:1806:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1807:51:1807:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1807:60:1807:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1808:51:1808:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1808:60:1808:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1809:66:1809:73 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1810:51:1810:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1810:60:1810:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1811:66:1811:88 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1811:66:1811:88 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1811:80:1811:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1812:51:1812:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1812:60:1812:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1813:66:1813:73 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1814:81:1814:88 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1815:51:1815:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1815:60:1815:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1816:13:1816:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1816:66:1816:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1817:13:1817:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1817:81:1817:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1818:13:1818:104 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1818:96:1818:103 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1819:25:1819:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1819:34:1819:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1820:25:1820:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1820:34:1820:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1821:40:1821:47 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1822:25:1822:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1822:34:1822:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1823:40:1823:62 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1823:40:1823:62 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1823:54:1823:61 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1824:25:1824:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1824:34:1824:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1825:40:1825:47 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1826:55:1826:62 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1827:25:1827:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1827:34:1827:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1828:50:1828:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1828:59:1828:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1829:50:1829:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1829:59:1829:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1830:65:1830:72 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1831:50:1831:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1831:59:1831:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1832:65:1832:87 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1832:65:1832:87 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1832:79:1832:86 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1833:50:1833:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1833:59:1833:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1834:65:1834:72 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1835:80:1835:87 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1836:50:1836:66 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1836:59:1836:66 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1837:13:1837:103 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1837:65:1837:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1838:13:1838:103 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1838:80:1838:87 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1839:13:1839:103 | new ..[] { .. } | semmle.label | new ..[] { .. } |
-| LogInjectionTest.java:1839:95:1839:102 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1844:33:1844:40 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1845:26:1845:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1846:26:1846:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1847:26:1847:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1848:26:1848:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1849:25:1849:32 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1850:25:1850:32 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1851:26:1851:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1852:26:1852:33 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1853:25:1853:32 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1854:25:1854:32 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1855:27:1855:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1856:27:1856:34 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:1860:28:1860:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1860:37:1860:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1861:43:1861:65 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1861:43:1861:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1861:57:1861:64 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1863:21:1863:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1863:30:1863:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1864:36:1864:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1864:45:1864:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1865:21:1865:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1865:30:1865:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1866:51:1866:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1866:60:1866:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1867:36:1867:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1867:45:1867:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1868:21:1868:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1868:30:1868:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1869:66:1869:82 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1869:75:1869:82 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1870:51:1870:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1870:60:1870:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1871:36:1871:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1871:45:1871:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1872:21:1872:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1872:30:1872:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1797:65:1797:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1798:13:1798:103 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1798:80:1798:87 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1799:13:1799:103 | new ..[] { .. } | semmle.label | new ..[] { .. } |
+| LogInjectionTest.java:1799:95:1799:102 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1804:33:1804:40 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1805:26:1805:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1806:26:1806:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1807:26:1807:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1808:26:1808:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1809:25:1809:32 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1810:25:1810:32 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1811:26:1811:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1812:26:1812:33 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1813:25:1813:32 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1814:25:1814:32 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1815:27:1815:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1816:27:1816:34 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1820:28:1820:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1820:37:1820:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1821:43:1821:65 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1821:43:1821:65 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1821:57:1821:64 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1823:21:1823:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1823:30:1823:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1824:36:1824:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1824:45:1824:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1825:21:1825:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1825:30:1825:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1826:51:1826:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1826:60:1826:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1827:36:1827:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1827:45:1827:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1828:21:1828:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1828:30:1828:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1829:66:1829:82 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1829:75:1829:82 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1830:51:1830:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1830:60:1830:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1831:36:1831:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1831:45:1831:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1832:21:1832:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1832:30:1832:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1833:81:1833:97 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1833:90:1833:97 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1834:66:1834:82 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1834:75:1834:82 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1835:51:1835:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1835:60:1835:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1836:36:1836:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1836:45:1836:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1837:21:1837:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1837:30:1837:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1838:96:1838:112 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1838:105:1838:112 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1839:81:1839:97 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1839:90:1839:97 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1840:66:1840:82 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1840:75:1840:82 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1841:51:1841:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1841:60:1841:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1842:36:1842:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1842:45:1842:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1843:21:1843:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1843:30:1843:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1844:111:1844:127 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1844:120:1844:127 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1845:96:1845:112 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1845:105:1845:112 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1846:81:1846:97 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1846:90:1846:97 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1847:66:1847:82 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1847:75:1847:82 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1848:51:1848:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1848:60:1848:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1849:36:1849:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1849:45:1849:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1850:21:1850:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1850:30:1850:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1851:126:1851:142 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1851:135:1851:142 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1852:111:1852:127 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1852:120:1852:127 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1853:96:1853:112 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1853:105:1853:112 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1854:81:1854:97 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1854:90:1854:97 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1855:66:1855:82 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1855:75:1855:82 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1856:51:1856:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1856:60:1856:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1857:36:1857:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1857:45:1857:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1858:21:1858:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1858:30:1858:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1859:141:1859:157 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1859:150:1859:157 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1860:126:1860:142 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1860:135:1860:142 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1861:111:1861:127 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1861:120:1861:127 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1862:96:1862:112 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1862:105:1862:112 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1863:81:1863:97 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1863:90:1863:97 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1864:66:1864:82 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1864:75:1864:82 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1865:51:1865:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1865:60:1865:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1866:36:1866:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1866:45:1866:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1867:21:1867:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1867:30:1867:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1868:156:1868:172 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1868:165:1868:172 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1869:141:1869:157 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1869:150:1869:157 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1870:126:1870:142 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1870:135:1870:142 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1871:111:1871:127 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1871:120:1871:127 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1872:96:1872:112 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1872:105:1872:112 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1873:81:1873:97 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1873:90:1873:97 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1874:66:1874:82 | (...)... | semmle.label | (...)... |
@@ -7627,133 +7719,117 @@ nodes
 | LogInjectionTest.java:1876:45:1876:52 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1877:21:1877:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1877:30:1877:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1878:96:1878:112 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1878:105:1878:112 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1879:81:1879:97 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1879:90:1879:97 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1880:66:1880:82 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1880:75:1880:82 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1881:51:1881:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1881:60:1881:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1882:36:1882:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1882:45:1882:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1883:21:1883:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1883:30:1883:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1884:111:1884:127 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1884:120:1884:127 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1885:96:1885:112 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1885:105:1885:112 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1886:81:1886:97 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1886:90:1886:97 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1887:66:1887:82 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1887:75:1887:82 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1888:51:1888:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1888:60:1888:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1889:36:1889:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1889:45:1889:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1890:21:1890:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1890:30:1890:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1891:126:1891:142 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1891:135:1891:142 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1892:111:1892:127 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1892:120:1892:127 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1893:96:1893:112 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1893:105:1893:112 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1894:81:1894:97 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1894:90:1894:97 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1895:66:1895:82 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1895:75:1895:82 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1896:51:1896:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1896:60:1896:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1897:36:1897:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1897:45:1897:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1898:21:1898:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1898:30:1898:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1899:141:1899:157 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1899:150:1899:157 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1900:126:1900:142 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1900:135:1900:142 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1901:111:1901:127 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1901:120:1901:127 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1902:96:1902:112 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1902:105:1902:112 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1903:81:1903:97 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1903:90:1903:97 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1904:66:1904:82 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1904:75:1904:82 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1905:51:1905:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1905:60:1905:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1906:36:1906:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1906:45:1906:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1878:171:1878:187 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1878:180:1878:187 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1879:156:1879:172 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1879:165:1879:172 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1880:141:1880:157 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1880:150:1880:157 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1881:126:1881:142 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1881:135:1881:142 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1882:111:1882:127 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1882:120:1882:127 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1883:96:1883:112 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1883:105:1883:112 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1884:81:1884:97 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1884:90:1884:97 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1885:66:1885:82 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1885:75:1885:82 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1886:51:1886:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1886:60:1886:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1887:36:1887:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1887:45:1887:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1888:21:1888:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1888:30:1888:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1889:186:1889:207 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:1889:186:1889:207 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:1889:199:1889:206 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1890:171:1890:187 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1890:180:1890:187 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1891:156:1891:172 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1891:165:1891:172 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1892:141:1892:157 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1892:150:1892:157 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1893:126:1893:142 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1893:135:1893:142 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1894:111:1894:127 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1894:120:1894:127 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1895:96:1895:112 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1895:105:1895:112 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1896:81:1896:97 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1896:90:1896:97 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1897:66:1897:82 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1897:75:1897:82 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1898:51:1898:67 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1898:60:1898:67 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1899:36:1899:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1899:45:1899:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1900:21:1900:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1900:30:1900:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1902:21:1902:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1902:30:1902:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1903:21:1903:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1903:30:1903:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1904:21:1904:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1904:30:1904:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1905:21:1905:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1905:30:1905:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1906:21:1906:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1906:30:1906:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1907:21:1907:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1907:30:1907:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1908:156:1908:172 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1908:165:1908:172 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1909:141:1909:157 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1909:150:1909:157 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1910:126:1910:142 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1910:135:1910:142 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1911:111:1911:127 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1911:120:1911:127 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1912:96:1912:112 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1912:105:1912:112 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1913:81:1913:97 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1913:90:1913:97 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1914:66:1914:82 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1914:75:1914:82 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1915:51:1915:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1915:60:1915:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1916:36:1916:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1916:45:1916:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1908:36:1908:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1909:21:1909:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1909:30:1909:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1910:36:1910:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1911:21:1911:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1911:30:1911:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1912:36:1912:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1913:21:1913:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1913:30:1913:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1914:36:1914:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1915:21:1915:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1915:30:1915:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1916:36:1916:43 | source(...) | semmle.label | source(...) |
 | LogInjectionTest.java:1917:21:1917:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1917:30:1917:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1918:171:1918:187 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1918:180:1918:187 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1919:156:1919:172 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1919:165:1919:172 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1920:141:1920:157 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1920:150:1920:157 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1921:126:1921:142 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1921:135:1921:142 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1922:111:1922:127 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1922:120:1922:127 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1923:96:1923:112 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1923:105:1923:112 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1924:81:1924:97 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1924:90:1924:97 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1925:66:1925:82 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1925:75:1925:82 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1926:51:1926:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1926:60:1926:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1927:36:1927:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1927:45:1927:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1928:21:1928:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1928:30:1928:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1929:186:1929:207 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:1929:186:1929:207 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:1929:199:1929:206 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1930:171:1930:187 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1930:180:1930:187 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1931:156:1931:172 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1931:165:1931:172 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1932:141:1932:157 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1932:150:1932:157 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1933:126:1933:142 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1933:135:1933:142 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1934:111:1934:127 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1934:120:1934:127 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1935:96:1935:112 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1935:105:1935:112 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1936:81:1936:97 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1936:90:1936:97 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1937:66:1937:82 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1937:75:1937:82 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1938:51:1938:67 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1938:60:1938:67 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1939:36:1939:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:1939:45:1939:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1918:36:1918:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1919:21:1919:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1919:30:1919:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1920:36:1920:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1921:21:1921:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1921:30:1921:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1922:36:1922:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1923:21:1923:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1923:30:1923:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1924:43:1924:50 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1925:21:1925:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1925:30:1925:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1926:41:1926:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1927:21:1927:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1927:30:1927:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1928:46:1928:53 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1929:21:1929:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1929:30:1929:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1930:47:1930:54 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1931:21:1931:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1931:30:1931:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1932:39:1932:46 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1933:21:1933:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1933:30:1933:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1934:40:1934:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1935:21:1935:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1935:30:1935:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1936:47:1936:54 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1937:21:1937:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1937:30:1937:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1938:48:1938:55 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1939:21:1939:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1939:30:1939:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1940:21:1940:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1940:30:1940:37 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:1941:21:1941:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1941:30:1941:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1942:21:1942:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1942:30:1942:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1943:21:1943:37 | (...)... | semmle.label | (...)... |
@@ -7766,52 +7842,68 @@ nodes
 | LogInjectionTest.java:1946:30:1946:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1947:21:1947:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1947:30:1947:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1948:36:1948:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1948:21:1948:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1948:30:1948:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1949:21:1949:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1949:30:1949:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1950:36:1950:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1950:21:1950:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1950:30:1950:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1951:21:1951:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1951:30:1951:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1952:36:1952:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1952:21:1952:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1952:30:1952:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1953:21:1953:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1953:30:1953:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1954:36:1954:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1954:21:1954:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1954:30:1954:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1955:21:1955:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1955:30:1955:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1956:36:1956:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1956:21:1956:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1956:30:1956:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1957:21:1957:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1957:30:1957:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1958:36:1958:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1958:21:1958:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1958:30:1958:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1959:21:1959:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1959:30:1959:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1960:36:1960:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1960:21:1960:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1960:30:1960:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1961:21:1961:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1961:30:1961:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1962:36:1962:43 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1962:21:1962:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1962:30:1962:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1963:21:1963:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1963:30:1963:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1964:43:1964:50 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1964:21:1964:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1964:30:1964:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1965:21:1965:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1965:30:1965:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1966:41:1966:48 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1966:21:1966:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1966:30:1966:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1967:21:1967:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1967:30:1967:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1968:46:1968:53 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1968:21:1968:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1968:30:1968:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1969:21:1969:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1969:30:1969:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1970:47:1970:54 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1970:21:1970:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1970:30:1970:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1971:21:1971:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1971:30:1971:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1972:39:1972:46 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1972:21:1972:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1972:30:1972:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1973:21:1973:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1973:30:1973:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1974:40:1974:47 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1974:21:1974:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1974:30:1974:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1975:21:1975:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1975:30:1975:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1976:47:1976:54 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1976:21:1976:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1976:30:1976:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1977:21:1977:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1977:30:1977:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:1978:48:1978:55 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:1978:21:1978:37 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:1978:30:1978:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1979:21:1979:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:1979:30:1979:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:1980:21:1980:37 | (...)... | semmle.label | (...)... |
@@ -7860,272 +7952,192 @@ nodes
 | LogInjectionTest.java:2001:30:2001:37 | source(...) : Object | semmle.label | source(...) : Object |
 | LogInjectionTest.java:2002:21:2002:37 | (...)... | semmle.label | (...)... |
 | LogInjectionTest.java:2002:30:2002:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2003:21:2003:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2003:30:2003:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2004:21:2004:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2004:30:2004:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2005:21:2005:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2005:30:2005:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2006:21:2006:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2006:30:2006:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2007:21:2007:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2007:30:2007:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2008:21:2008:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2008:30:2008:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2009:21:2009:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2009:30:2009:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2010:21:2010:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2010:30:2010:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2011:21:2011:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2011:30:2011:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2012:21:2012:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2012:30:2012:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2013:21:2013:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2013:30:2013:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2014:21:2014:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2014:30:2014:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2015:21:2015:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2015:30:2015:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2016:21:2016:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2016:30:2016:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2017:21:2017:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2017:30:2017:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2018:21:2018:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2018:30:2018:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2019:21:2019:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2019:30:2019:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2020:21:2020:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2020:30:2020:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2021:21:2021:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2021:30:2021:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2022:21:2022:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2022:30:2022:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2023:21:2023:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2023:30:2023:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2024:21:2024:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2024:30:2024:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2025:21:2025:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2025:30:2025:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2026:21:2026:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2026:30:2026:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2027:21:2027:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2027:30:2027:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2028:21:2028:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2028:30:2028:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2029:21:2029:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2029:30:2029:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2030:21:2030:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2030:30:2030:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2031:21:2031:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2031:30:2031:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2032:21:2032:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2032:30:2032:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2033:21:2033:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2033:30:2033:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2034:21:2034:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2034:30:2034:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2035:21:2035:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2035:30:2035:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2036:21:2036:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2036:30:2036:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2037:21:2037:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2037:30:2037:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2038:21:2038:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2038:30:2038:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2039:21:2039:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2039:30:2039:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2040:21:2040:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2040:30:2040:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2041:21:2041:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2041:30:2041:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2042:21:2042:37 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2042:30:2042:37 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2047:27:2047:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2047:36:2047:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2048:27:2048:64 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2048:57:2048:64 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2049:25:2049:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2049:34:2049:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2050:25:2050:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2050:55:2050:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2051:26:2051:42 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2051:35:2051:42 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2052:26:2052:63 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2052:56:2052:63 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2053:27:2053:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2053:36:2053:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2054:27:2054:64 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2054:57:2054:64 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2055:25:2055:41 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2055:34:2055:41 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2056:25:2056:62 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2056:55:2056:62 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2057:27:2057:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2057:36:2057:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2058:27:2058:64 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2058:57:2058:64 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2059:28:2059:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2059:37:2059:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2060:28:2060:65 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2060:58:2060:65 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2061:29:2061:45 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2061:38:2061:45 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2062:44:2062:60 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2062:53:2062:60 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2063:29:2063:45 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2063:38:2063:45 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2064:44:2064:60 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2064:53:2064:60 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2065:59:2065:75 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2065:68:2065:75 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2066:29:2066:45 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2066:38:2066:45 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2067:44:2067:60 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2067:53:2067:60 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2068:59:2068:81 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:2068:59:2068:81 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:2068:73:2068:80 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2069:28:2069:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2069:37:2069:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2070:43:2070:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2070:52:2070:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2071:28:2071:44 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2071:37:2071:44 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2072:43:2072:59 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2072:52:2072:59 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2073:58:2073:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2073:67:2073:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2074:56:2074:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2074:65:2074:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2075:56:2075:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2075:65:2075:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2076:71:2076:78 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:2077:56:2077:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2077:65:2077:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2078:71:2078:92 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:2078:71:2078:92 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:2078:84:2078:91 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2079:56:2079:72 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2079:65:2079:72 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2080:56:2080:93 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2080:86:2080:93 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2081:74:2081:111 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2081:104:2081:111 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2082:24:2082:43 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2082:36:2082:43 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2083:57:2083:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2083:66:2083:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2084:72:2084:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2084:81:2084:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2085:87:2085:103 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2085:96:2085:103 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2086:57:2086:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2086:66:2086:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2087:72:2087:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2087:81:2087:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2088:87:2088:103 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2088:96:2088:103 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2089:102:2089:109 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:2090:57:2090:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2090:66:2090:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2091:72:2091:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2091:81:2091:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2092:87:2092:103 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2092:96:2092:103 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2093:102:2093:124 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:2093:102:2093:124 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:2093:116:2093:123 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2094:57:2094:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2094:66:2094:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2095:72:2095:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2095:81:2095:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2096:87:2096:103 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2096:96:2096:103 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2097:57:2097:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2097:66:2097:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2098:72:2098:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2098:81:2098:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2099:87:2099:124 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2099:117:2099:124 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2100:57:2100:73 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2100:66:2100:73 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2101:72:2101:88 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2101:81:2101:88 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2102:105:2102:142 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2102:135:2102:142 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2103:58:2103:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2103:67:2103:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2104:73:2104:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2104:82:2104:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2105:111:2105:127 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2105:120:2105:127 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2106:126:2106:148 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:2106:126:2106:148 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:2106:140:2106:147 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2107:58:2107:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2107:67:2107:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2108:73:2108:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2108:82:2108:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2109:111:2109:127 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2109:120:2109:127 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2110:58:2110:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2110:67:2110:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2111:73:2111:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2111:82:2111:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2112:88:2112:104 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2112:97:2112:104 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2113:103:2113:119 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2113:112:2113:119 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2114:58:2114:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2114:67:2114:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2115:73:2115:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2115:82:2115:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2116:88:2116:104 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2116:97:2116:104 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2117:103:2117:119 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2117:112:2117:119 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2118:118:2118:125 | source(...) | semmle.label | source(...) |
-| LogInjectionTest.java:2119:58:2119:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2119:67:2119:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2120:73:2120:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2120:82:2120:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2121:88:2121:104 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2121:97:2121:104 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2122:103:2122:119 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2122:112:2122:119 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2123:118:2123:140 | new Object[] | semmle.label | new Object[] |
-| LogInjectionTest.java:2123:118:2123:140 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
-| LogInjectionTest.java:2123:132:2123:139 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2124:58:2124:74 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2124:67:2124:74 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2125:73:2125:89 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2125:82:2125:89 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2126:88:2126:104 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2126:97:2126:104 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2127:103:2127:119 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2127:112:2127:119 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2131:36:2131:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2131:45:2131:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2132:36:2132:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2132:45:2132:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2133:36:2133:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2133:45:2133:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2134:36:2134:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2134:45:2134:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2135:36:2135:52 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2135:45:2135:52 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2136:38:2136:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2136:47:2136:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2141:38:2141:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2141:47:2141:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2143:38:2143:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2143:47:2143:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2145:38:2145:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2145:47:2145:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2147:38:2147:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2147:47:2147:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2149:38:2149:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2149:47:2149:54 | source(...) : Object | semmle.label | source(...) : Object |
-| LogInjectionTest.java:2151:38:2151:54 | (...)... | semmle.label | (...)... |
-| LogInjectionTest.java:2151:47:2151:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2007:27:2007:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2007:36:2007:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2008:27:2008:64 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2008:57:2008:64 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2009:25:2009:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2009:34:2009:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2010:25:2010:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2010:55:2010:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2011:26:2011:42 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2011:35:2011:42 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2012:26:2012:63 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2012:56:2012:63 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2013:27:2013:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2013:36:2013:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2014:27:2014:64 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2014:57:2014:64 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2015:25:2015:41 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2015:34:2015:41 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2016:25:2016:62 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2016:55:2016:62 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2017:27:2017:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2017:36:2017:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2018:27:2018:64 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2018:57:2018:64 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2019:28:2019:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2019:37:2019:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2020:28:2020:65 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2020:58:2020:65 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2021:29:2021:45 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2021:38:2021:45 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2022:44:2022:60 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2022:53:2022:60 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2023:29:2023:45 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2023:38:2023:45 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2024:44:2024:60 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2024:53:2024:60 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2025:59:2025:75 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2025:68:2025:75 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2026:29:2026:45 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2026:38:2026:45 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2027:44:2027:60 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2027:53:2027:60 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2028:59:2028:81 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:2028:59:2028:81 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:2028:73:2028:80 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2029:28:2029:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2029:37:2029:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2030:43:2030:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2030:52:2030:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2031:28:2031:44 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2031:37:2031:44 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2032:43:2032:59 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2032:52:2032:59 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2033:58:2033:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2033:67:2033:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2034:56:2034:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2034:65:2034:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2035:56:2035:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2035:65:2035:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2036:71:2036:78 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:2037:56:2037:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2037:65:2037:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2038:71:2038:92 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:2038:71:2038:92 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:2038:84:2038:91 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2039:56:2039:72 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2039:65:2039:72 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2040:56:2040:93 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2040:86:2040:93 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2041:74:2041:111 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2041:104:2041:111 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2042:24:2042:43 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2042:36:2042:43 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2043:57:2043:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2043:66:2043:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2044:72:2044:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2044:81:2044:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2045:87:2045:103 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2045:96:2045:103 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2046:57:2046:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2046:66:2046:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2047:72:2047:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2047:81:2047:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2048:87:2048:103 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2048:96:2048:103 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2049:102:2049:109 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:2050:57:2050:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2050:66:2050:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2051:72:2051:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2051:81:2051:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2052:87:2052:103 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2052:96:2052:103 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2053:102:2053:124 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:2053:102:2053:124 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:2053:116:2053:123 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2054:57:2054:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2054:66:2054:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2055:72:2055:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2055:81:2055:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2056:87:2056:103 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2056:96:2056:103 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2057:57:2057:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2057:66:2057:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2058:72:2058:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2058:81:2058:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2059:87:2059:124 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2059:117:2059:124 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2060:57:2060:73 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2060:66:2060:73 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2061:72:2061:88 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2061:81:2061:88 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2062:105:2062:142 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2062:135:2062:142 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2063:58:2063:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2063:67:2063:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2064:73:2064:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2064:82:2064:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2065:111:2065:127 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2065:120:2065:127 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2066:126:2066:148 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:2066:126:2066:148 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:2066:140:2066:147 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2067:58:2067:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2067:67:2067:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2068:73:2068:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2068:82:2068:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2069:111:2069:127 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2069:120:2069:127 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2070:58:2070:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2070:67:2070:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2071:73:2071:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2071:82:2071:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2072:88:2072:104 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2072:97:2072:104 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2073:103:2073:119 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2073:112:2073:119 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2074:58:2074:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2074:67:2074:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2075:73:2075:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2075:82:2075:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2076:88:2076:104 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2076:97:2076:104 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2077:103:2077:119 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2077:112:2077:119 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2078:118:2078:125 | source(...) | semmle.label | source(...) |
+| LogInjectionTest.java:2079:58:2079:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2079:67:2079:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2080:73:2080:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2080:82:2080:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2081:88:2081:104 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2081:97:2081:104 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2082:103:2082:119 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2082:112:2082:119 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2083:118:2083:140 | new Object[] | semmle.label | new Object[] |
+| LogInjectionTest.java:2083:118:2083:140 | {...} : Object[] [[]] : Object | semmle.label | {...} : Object[] [[]] : Object |
+| LogInjectionTest.java:2083:132:2083:139 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2084:58:2084:74 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2084:67:2084:74 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2085:73:2085:89 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2085:82:2085:89 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2086:88:2086:104 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2086:97:2086:104 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2087:103:2087:119 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2087:112:2087:119 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2091:36:2091:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2091:45:2091:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2092:36:2092:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2092:45:2092:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2093:36:2093:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2093:45:2093:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2094:36:2094:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2094:45:2094:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2095:36:2095:52 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2095:45:2095:52 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2096:38:2096:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2096:47:2096:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2101:38:2101:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2101:47:2101:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2103:38:2103:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2103:47:2103:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2105:38:2105:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2105:47:2105:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2107:38:2107:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2107:47:2107:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2109:38:2109:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2109:47:2109:54 | source(...) : Object | semmle.label | source(...) : Object |
+| LogInjectionTest.java:2111:38:2111:54 | (...)... | semmle.label | (...)... |
+| LogInjectionTest.java:2111:47:2111:54 | source(...) : Object | semmle.label | source(...) : Object |
 subpaths
diff --git a/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.ext.yml b/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.ext.yml
index b9c9ffc5b940..9f394aa6faa9 100644
--- a/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.ext.yml
+++ b/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.ext.yml
@@ -6,3 +6,4 @@ extensions:
       - ["loginjection", "LogInjectionTest", False, "source", "()", "", "ReturnValue", "remote", "manual"]
       - ["loginjection", "LogInjectionTest", False, "validatedInput", "()", "", "ReturnValue", "remote", "manual"]
       - ["loginjection", "LogInjectionTest", False, "validatedInputField", "", "", "", "remote", "manual"]
+      - ["loginjection", "LibrarySanitizers", False, "source", "()", "", "ReturnValue", "remote", "manual"]
diff --git a/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.java b/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.java
index 00d986c09121..fd2f4914de77 100644
--- a/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.java
+++ b/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.java
@@ -31,46 +31,6 @@ public Object source() {
         return null;
     }
 
-    public void testSanitizers() {
-        String source = (String) source(); // $ Source
-        Logger logger = null;
-        logger.debug(source.replace("\n", "")); // Safe
-        logger.debug(source.replace("\n", "\n")); // $ Alert
-        logger.debug(source.replace("\n", "\r")); // $ Alert
-        logger.debug(source.replace("\r", "")); // Safe
-        logger.debug(source.replace("\r", "\n")); // $ Alert
-        logger.debug(source.replace("\r", "\r")); // $ Alert
-        logger.debug(source.replace("something_else", "")); // $ Alert
-        logger.debug(source.replace('\n', '_')); // Safe
-        logger.debug(source.replace('\n', '\n')); // $ Alert
-        logger.debug(source.replace('\n', '\r')); // $ Alert
-        logger.debug(source.replace('\r', '_')); // Safe
-        logger.debug(source.replace('\r', '\n')); // $ Alert
-        logger.debug(source.replace('\r', '\r')); // $ Alert
-        logger.debug(source.replace('-', '_')); // $ Alert
-        logger.debug(source.replaceAll("\n", "")); // Safe
-        logger.debug(source.replaceAll("\n", "\n")); // $ Alert
-        logger.debug(source.replaceAll("\n", "\r")); // $ Alert
-        logger.debug(source.replaceAll("\r", "")); // Safe
-        logger.debug(source.replaceAll("\r", "\n")); // $ Alert
-        logger.debug(source.replaceAll("\r", "\r")); // $ Alert
-        logger.debug(source.replaceAll("\\n", "")); // Safe
-        logger.debug(source.replaceAll("\\n", "\n")); // $ Alert
-        logger.debug(source.replaceAll("\\n", "\r")); // $ Alert
-        logger.debug(source.replaceAll("\\r", "")); // Safe
-        logger.debug(source.replaceAll("\\r", "\n")); // $ Alert
-        logger.debug(source.replaceAll("\\r", "\r")); // $ Alert
-        logger.debug(source.replaceAll("\\R", "")); // Safe
-        logger.debug(source.replaceAll("\\R", "\n")); // $ Alert
-        logger.debug(source.replaceAll("\\R", "\r")); // $ Alert
-        logger.debug(source.replaceAll("[^a-zA-Z]", "")); // Safe
-        logger.debug(source.replaceAll("[^a-zA-Z]", "\n")); // $ Alert
-        logger.debug(source.replaceAll("[^a-zA-Z]", "\r")); // $ Alert
-        logger.debug(source.replaceAll("[^a-zA-Z\n]", "")); // $ Alert
-        logger.debug(source.replaceAll("[^a-zA-Z\r]", "")); // $ Alert
-        logger.debug(source.replaceAll("[^a-zA-Z\\R]", "")); // $ Alert
-    }
-
     public void testGuards() {
         String source = (String) source(); // $ Source
         Logger logger = null;
diff --git a/java/ql/test/query-tests/security/CWE-117/options b/java/ql/test/query-tests/security/CWE-117/options
index b0b3d9323e95..d846ae691a91 100644
--- a/java/ql/test/query-tests/security/CWE-117/options
+++ b/java/ql/test/query-tests/security/CWE-117/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/javax-validation-constraints:${testdir}/../../../stubs/apache-log4j-1.2.17:${testdir}/../../../stubs/apache-log4j-2.14.1:${testdir}/../../../stubs/apache-commons-logging-1.2:${testdir}/../../../stubs/jboss-logging-3.4.2:${testdir}/../../../stubs/slf4j-2.0.0:${testdir}/../../../stubs/scijava-common-2.87.1:${testdir}/../../../stubs/flogger-0.7.1:${testdir}/../../../stubs/google-android-9.0.0:${testdir}/../../../stubs/apache-cxf
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/javax-validation-constraints:${testdir}/../../../stubs/apache-log4j-1.2.17:${testdir}/../../../stubs/apache-log4j-2.14.1:${testdir}/../../../stubs/apache-commons-logging-1.2:${testdir}/../../../stubs/apache-commons-lang3-3.7:${testdir}/../../../stubs/apache-commons-text-1.9:${testdir}/../../../stubs/guava-30.0:${testdir}/../../../stubs/owasp-java-encoder:${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/jboss-logging-3.4.2:${testdir}/../../../stubs/slf4j-2.0.0:${testdir}/../../../stubs/scijava-common-2.87.1:${testdir}/../../../stubs/flogger-0.7.1:${testdir}/../../../stubs/google-android-9.0.0:${testdir}/../../../stubs/apache-cxf
diff --git a/java/ql/test/query-tests/security/CWE-601/semmle/tests/HostComparisonRedirect.java b/java/ql/test/query-tests/security/CWE-601/semmle/tests/HostComparisonRedirect.java
new file mode 100644
index 000000000000..2b300e5f1301
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-601/semmle/tests/HostComparisonRedirect.java
@@ -0,0 +1,289 @@
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class HostComparisonRedirect {
+    public void unguarded(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        response.sendRedirect(uri.toString()); // $ Alert
+    }
+
+    public void directEquals(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        if ("example.com".equals(uri.getHost())) {
+            response.sendRedirect(uri.toString());
+        }
+    }
+
+    public void directEqualsIgnoreCase(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        if ("example.com".equalsIgnoreCase(uri.getHost())) {
+            response.sendRedirect(uri.toString());
+        }
+    }
+
+    public void reversedEqualsIgnoreCase(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        if (uri.getHost().equalsIgnoreCase("example.com")) {
+            response.sendRedirect(uri.toString());
+        }
+    }
+
+    public void localEquals(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if ("example.com".equals(host)) {
+            response.sendRedirect(uri.toString());
+        }
+    }
+
+    public void localEqualsIgnoreCase(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if ("example.com".equalsIgnoreCase(host)) {
+            response.sendRedirect(uri.toString());
+        }
+    }
+
+    public void streamEquals(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ SPURIOUS: Source
+        if (Arrays.stream(new String[]{"example.com"}).anyMatch(uri.getHost()::equals)) {
+            response.sendRedirect(uri.toString()); // $ SPURIOUS: Alert
+        }
+    }
+
+    public void reportedStreamHelper(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ SPURIOUS: Source
+        if (isAllowedStream(uri.getHost(), "example.com")) {
+            response.sendRedirect(uri.toString()); // $ SPURIOUS: Alert
+        }
+    }
+
+    private static boolean isAllowedStream(String host, String... allowedHosts) {
+        return Arrays.stream(allowedHosts).anyMatch(host::equalsIgnoreCase);
+    }
+
+    public void reportedLoopHelper(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ SPURIOUS: Source
+        if (isAllowedLoop(uri.getHost(), "example.com")) {
+            response.sendRedirect(uri.toString()); // $ SPURIOUS: Alert
+        }
+    }
+
+    private static boolean isAllowedLoop(String host, String... allowedHosts) {
+        for (String allowed : allowedHosts) {
+            if (allowed.equalsIgnoreCase(host)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void wrongBranch(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        if (!"example.com".equals(uri.getHost())) {
+            response.sendRedirect(uri.toString()); // $ Alert
+        }
+    }
+
+    public void differentUri(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI checked = new URI(request.getParameter("checked"));
+        URI used = new URI(request.getParameter("url")); // $ Source
+        if ("example.com".equals(checked.getHost())) {
+            response.sendRedirect(used.toString()); // $ Alert
+        }
+    }
+
+    public void constantUrl(HttpServletResponse response) throws Exception {
+        response.sendRedirect("https://example.com/");
+    }
+
+    public void caseInsensitiveWrongBranch(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        if (!"example.com".equalsIgnoreCase(uri.getHost())) {
+            response.sendRedirect(uri.toString()); // $ Alert
+        }
+    }
+
+    public void caseInsensitiveDifferentUri(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI checked = new URI(request.getParameter("checked"));
+        URI used = new URI(request.getParameter("url")); // $ Source
+        if ("example.com".equalsIgnoreCase(checked.getHost())) {
+            response.sendRedirect(used.toString()); // $ Alert
+        }
+    }
+
+    public void reassignedHost(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        String host = uri.getHost();
+        host = "example.com";
+        if ("example.com".equalsIgnoreCase(host)) {
+            response.sendRedirect(uri.toString()); // $ Alert
+        }
+    }
+
+    public void conditionallyReassignedHost(HttpServletRequest request, HttpServletResponse response, boolean skip) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        String host = uri.getHost();
+        if (skip) {
+            host = "example.com";
+        }
+        if ("example.com".equalsIgnoreCase(host)) {
+            response.sendRedirect(uri.toString()); // $ Alert
+        }
+    }
+
+    public void reassignedUri(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI("https://example.com/");
+        String host = uri.getHost();
+        uri = new URI(request.getParameter("url")); // $ Source
+        if ("example.com".equalsIgnoreCase(host)) {
+            response.sendRedirect(uri.toString()); // $ Alert
+        }
+    }
+
+    public void untrustedComparison(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        if (request.getParameter("allowed").equalsIgnoreCase(uri.getHost())) {
+            response.sendRedirect(uri.toString()); // $ Alert
+        }
+    }
+
+    public void unrelatedComparison(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        if (new FakeComparison().equalsIgnoreCase(uri.getHost())) {
+            response.sendRedirect(uri.toString()); // $ Alert
+        }
+    }
+
+    private static class FakeComparison {
+        boolean equalsIgnoreCase(String host) {
+            return true;
+        }
+    }
+
+    public void aliasChain(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        String alias = host;
+        String secondAlias = alias;
+        if ("example.com".equalsIgnoreCase(secondAlias)) {
+            response.sendRedirect(uri.toString());
+        }
+    }
+
+    public void finallyOverwrite(HttpServletRequest request, HttpServletResponse response, boolean skip) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        String host = uri.getHost();
+        try {
+            if (skip) return;
+            host = "example.com";
+        } finally {
+            if ("example.com".equalsIgnoreCase(host)) {
+                response.sendRedirect(uri.toString()); // $ Alert
+            }
+        }
+    }
+
+    public void rejectionReturns(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if (!"example.com".equalsIgnoreCase(host)) return;
+        response.sendRedirect(uri.toString());
+    }
+
+    private static final String ALLOWED_HOST = "example.com";
+
+    public void constantAllowlistField(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if (ALLOWED_HOST.equalsIgnoreCase(host)) {
+            response.sendRedirect(uri.toString());
+        }
+    }
+
+    public void constantCollection(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if (Set.of("example.com", "example.org").contains(host)) {
+            response.sendRedirect(uri.toString());
+        }
+    }
+
+    public void normalizedConstantCollection(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if (Set.of("EXAMPLE.COM", "EXAMPLE.ORG").contains(host.toUpperCase())) {
+            response.sendRedirect(uri.toString());
+        }
+    }
+
+    public void nullContainingCollection(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        String host = uri.getHost();
+        if (Arrays.asList("example.com", null).contains(host)) {
+            response.sendRedirect(uri.toString()); // $ Alert
+        }
+    }
+
+    public void nullContainingCollectionWithNonNullHost(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if (host != null && Arrays.asList("example.com", null).contains(host)) {
+            response.sendRedirect(uri.toString());
+        }
+    }
+
+    public void untrustedCollection(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        String host = uri.getHost();
+        if (Set.of(request.getParameter("allowed")).contains(host)) {
+            response.sendRedirect(uri.toString()); // $ Alert
+        }
+    }
+
+    public void orBypass(HttpServletRequest request, HttpServletResponse response, boolean skip) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        String host = uri.getHost();
+        if ("example.com".equalsIgnoreCase(host) || skip) {
+            response.sendRedirect(uri.toString()); // $ Alert
+        }
+    }
+
+    public void assignmentCast(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        Object value = uri.getHost();
+        String host = (String) value;
+        if ("example.com".equalsIgnoreCase(host)) {
+            response.sendRedirect(uri.toString());
+        }
+    }
+
+    public void comparisonCast(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        Object host = uri.getHost();
+        if ("example.com".equalsIgnoreCase((String) host)) {
+            response.sendRedirect(uri.toString());
+        }
+    }
+
+    public void castHostOverwrite(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        Object host = uri.getHost();
+        host = "example.com";
+        if ("example.com".equalsIgnoreCase((String) host)) {
+            response.sendRedirect(uri.toString()); // $ Alert
+        }
+    }
+
+    public void castHostConditionalOverwrite(HttpServletRequest request, HttpServletResponse response, boolean skip) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        Object host = uri.getHost();
+        if (skip) host = "example.com";
+        if ("example.com".equalsIgnoreCase((String) host)) {
+            response.sendRedirect(uri.toString()); // $ Alert
+        }
+    }
+}
diff --git a/java/ql/test/query-tests/security/CWE-601/semmle/tests/MicronautUrlRedirect.java b/java/ql/test/query-tests/security/CWE-601/semmle/tests/MicronautUrlRedirect.java
new file mode 100644
index 000000000000..755d0e51cdc2
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-601/semmle/tests/MicronautUrlRedirect.java
@@ -0,0 +1,40 @@
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.QueryValue;
+import io.micronaut.http.HttpResponse;
+import io.micronaut.http.MutableHttpResponse;
+import java.net.URI;
+
+@Controller("/redirect")
+public class MicronautUrlRedirect {
+
+    @Get("/bad")
+    public MutableHttpResponse<?> bad(@QueryValue String target) { // $ Source
+        // BAD: user-controlled redirect target
+        return HttpResponse.redirect(URI.create(target)); // $ Alert
+    }
+
+    @Get("/good")
+    public MutableHttpResponse<?> good(@QueryValue String target) {
+        // GOOD: redirect to a fixed URL
+        if ("home".equals(target)) {
+            return HttpResponse.redirect(URI.create("/home"));
+        }
+        return HttpResponse.ok();
+    }
+
+    @Get("/permanent")
+    public MutableHttpResponse<?> permanent(@QueryValue String target) { // $ Source
+        return HttpResponse.permanentRedirect(URI.create(target)); // $ Alert
+    }
+
+    @Get("/see-other")
+    public MutableHttpResponse<?> seeOther(@QueryValue String target) { // $ Source
+        return HttpResponse.seeOther(URI.create(target)); // $ Alert
+    }
+
+    @Get("/temporary")
+    public MutableHttpResponse<?> temporary(@QueryValue String target) { // $ Source
+        return HttpResponse.temporaryRedirect(URI.create(target)); // $ Alert
+    }
+}
diff --git a/java/ql/test/query-tests/security/CWE-601/semmle/tests/UrlRedirect.expected b/java/ql/test/query-tests/security/CWE-601/semmle/tests/UrlRedirect.expected
index fdd602c616bf..c677916dd36d 100644
--- a/java/ql/test/query-tests/security/CWE-601/semmle/tests/UrlRedirect.expected
+++ b/java/ql/test/query-tests/security/CWE-601/semmle/tests/UrlRedirect.expected
@@ -1,4 +1,27 @@
 #select
+| HostComparisonRedirect.java:10:31:10:44 | toString(...) | HostComparisonRedirect.java:9:27:9:53 | getParameter(...) : String | HostComparisonRedirect.java:10:31:10:44 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:9:27:9:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:53:35:53:48 | toString(...) | HostComparisonRedirect.java:51:27:51:53 | getParameter(...) : String | HostComparisonRedirect.java:53:35:53:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:51:27:51:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:60:35:60:48 | toString(...) | HostComparisonRedirect.java:58:27:58:53 | getParameter(...) : String | HostComparisonRedirect.java:60:35:60:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:58:27:58:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:71:35:71:48 | toString(...) | HostComparisonRedirect.java:69:27:69:53 | getParameter(...) : String | HostComparisonRedirect.java:71:35:71:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:69:27:69:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:87:35:87:48 | toString(...) | HostComparisonRedirect.java:85:27:85:53 | getParameter(...) : String | HostComparisonRedirect.java:87:35:87:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:85:27:85:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:95:35:95:49 | toString(...) | HostComparisonRedirect.java:93:28:93:54 | getParameter(...) : String | HostComparisonRedirect.java:95:35:95:49 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:93:28:93:54 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:106:35:106:48 | toString(...) | HostComparisonRedirect.java:104:27:104:53 | getParameter(...) : String | HostComparisonRedirect.java:106:35:106:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:104:27:104:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:114:35:114:49 | toString(...) | HostComparisonRedirect.java:112:28:112:54 | getParameter(...) : String | HostComparisonRedirect.java:114:35:114:49 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:112:28:112:54 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:123:35:123:48 | toString(...) | HostComparisonRedirect.java:119:27:119:53 | getParameter(...) : String | HostComparisonRedirect.java:123:35:123:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:119:27:119:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:134:35:134:48 | toString(...) | HostComparisonRedirect.java:128:27:128:53 | getParameter(...) : String | HostComparisonRedirect.java:134:35:134:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:128:27:128:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:143:35:143:48 | toString(...) | HostComparisonRedirect.java:141:23:141:49 | getParameter(...) : String | HostComparisonRedirect.java:143:35:143:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:141:23:141:49 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:150:35:150:48 | toString(...) | HostComparisonRedirect.java:148:27:148:53 | getParameter(...) : String | HostComparisonRedirect.java:150:35:150:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:148:27:148:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:157:35:157:48 | toString(...) | HostComparisonRedirect.java:155:27:155:53 | getParameter(...) : String | HostComparisonRedirect.java:157:35:157:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:155:27:155:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:185:39:185:52 | toString(...) | HostComparisonRedirect.java:178:27:178:53 | getParameter(...) : String | HostComparisonRedirect.java:185:39:185:52 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:178:27:178:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:227:35:227:48 | toString(...) | HostComparisonRedirect.java:224:27:224:53 | getParameter(...) : String | HostComparisonRedirect.java:227:35:227:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:224:27:224:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:243:35:243:48 | toString(...) | HostComparisonRedirect.java:240:27:240:53 | getParameter(...) : String | HostComparisonRedirect.java:243:35:243:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:240:27:240:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:251:35:251:48 | toString(...) | HostComparisonRedirect.java:248:27:248:53 | getParameter(...) : String | HostComparisonRedirect.java:251:35:251:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:248:27:248:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:277:35:277:48 | toString(...) | HostComparisonRedirect.java:273:27:273:53 | getParameter(...) : String | HostComparisonRedirect.java:277:35:277:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:273:27:273:53 | getParameter(...) | user-provided value |
+| HostComparisonRedirect.java:286:35:286:48 | toString(...) | HostComparisonRedirect.java:282:27:282:53 | getParameter(...) : String | HostComparisonRedirect.java:286:35:286:48 | toString(...) | Untrusted URL redirection depends on a $@. | HostComparisonRedirect.java:282:27:282:53 | getParameter(...) | user-provided value |
+| MicronautUrlRedirect.java:14:38:14:55 | create(...) | MicronautUrlRedirect.java:12:39:12:63 | target : String | MicronautUrlRedirect.java:14:38:14:55 | create(...) | Untrusted URL redirection depends on a $@. | MicronautUrlRedirect.java:12:39:12:63 | target | user-provided value |
+| MicronautUrlRedirect.java:28:47:28:64 | create(...) | MicronautUrlRedirect.java:27:45:27:69 | target : String | MicronautUrlRedirect.java:28:47:28:64 | create(...) | Untrusted URL redirection depends on a $@. | MicronautUrlRedirect.java:27:45:27:69 | target | user-provided value |
+| MicronautUrlRedirect.java:33:38:33:55 | create(...) | MicronautUrlRedirect.java:32:44:32:68 | target : String | MicronautUrlRedirect.java:33:38:33:55 | create(...) | Untrusted URL redirection depends on a $@. | MicronautUrlRedirect.java:32:44:32:68 | target | user-provided value |
+| MicronautUrlRedirect.java:38:47:38:64 | create(...) | MicronautUrlRedirect.java:37:45:37:69 | target : String | MicronautUrlRedirect.java:38:47:38:64 | create(...) | Untrusted URL redirection depends on a $@. | MicronautUrlRedirect.java:37:45:37:69 | target | user-provided value |
 | UrlRedirect2.java:27:25:27:54 | getParameter(...) | UrlRedirect2.java:27:25:27:54 | getParameter(...) | UrlRedirect2.java:27:25:27:54 | getParameter(...) | Untrusted URL redirection depends on a $@. | UrlRedirect2.java:27:25:27:54 | getParameter(...) | user-provided value |
 | UrlRedirect.java:23:25:23:54 | getParameter(...) | UrlRedirect.java:23:25:23:54 | getParameter(...) | UrlRedirect.java:23:25:23:54 | getParameter(...) | Untrusted URL redirection depends on a $@. | UrlRedirect.java:23:25:23:54 | getParameter(...) | user-provided value |
 | UrlRedirect.java:32:25:32:67 | weakCleanup(...) | UrlRedirect.java:32:37:32:66 | getParameter(...) : String | UrlRedirect.java:32:25:32:67 | weakCleanup(...) | Untrusted URL redirection depends on a $@. | UrlRedirect.java:32:37:32:66 | getParameter(...) | user-provided value |
@@ -6,17 +29,177 @@
 | UrlRedirect.java:42:43:42:72 | getParameter(...) | UrlRedirect.java:42:43:42:72 | getParameter(...) | UrlRedirect.java:42:43:42:72 | getParameter(...) | Untrusted URL redirection depends on a $@. | UrlRedirect.java:42:43:42:72 | getParameter(...) | user-provided value |
 | mad/Test.java:14:22:14:38 | (...)... | mad/Test.java:9:16:9:41 | getParameter(...) : String | mad/Test.java:14:22:14:38 | (...)... | Untrusted URL redirection depends on a $@. | mad/Test.java:9:16:9:41 | getParameter(...) | user-provided value |
 edges
-| UrlRedirect.java:32:37:32:66 | getParameter(...) : String | UrlRedirect.java:32:25:32:67 | weakCleanup(...) | provenance | Src:MaD:2 MaD:3 |
-| UrlRedirect.java:32:37:32:66 | getParameter(...) : String | UrlRedirect.java:45:28:45:39 | input : String | provenance | Src:MaD:2  |
+| HostComparisonRedirect.java:9:19:9:54 | new URI(...) : URI | HostComparisonRedirect.java:10:31:10:33 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:9:27:9:53 | getParameter(...) : String | HostComparisonRedirect.java:9:19:9:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:10:31:10:33 | uri : URI | HostComparisonRedirect.java:10:31:10:44 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:51:19:51:54 | new URI(...) : URI | HostComparisonRedirect.java:53:35:53:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:51:27:51:53 | getParameter(...) : String | HostComparisonRedirect.java:51:19:51:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:53:35:53:37 | uri : URI | HostComparisonRedirect.java:53:35:53:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:58:19:58:54 | new URI(...) : URI | HostComparisonRedirect.java:60:35:60:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:58:27:58:53 | getParameter(...) : String | HostComparisonRedirect.java:58:19:58:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:60:35:60:37 | uri : URI | HostComparisonRedirect.java:60:35:60:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:69:19:69:54 | new URI(...) : URI | HostComparisonRedirect.java:71:35:71:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:69:27:69:53 | getParameter(...) : String | HostComparisonRedirect.java:69:19:69:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:71:35:71:37 | uri : URI | HostComparisonRedirect.java:71:35:71:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:85:19:85:54 | new URI(...) : URI | HostComparisonRedirect.java:87:35:87:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:85:27:85:53 | getParameter(...) : String | HostComparisonRedirect.java:85:19:85:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:87:35:87:37 | uri : URI | HostComparisonRedirect.java:87:35:87:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:93:20:93:55 | new URI(...) : URI | HostComparisonRedirect.java:95:35:95:38 | used : URI | provenance |  |
+| HostComparisonRedirect.java:93:28:93:54 | getParameter(...) : String | HostComparisonRedirect.java:93:20:93:55 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:95:35:95:38 | used : URI | HostComparisonRedirect.java:95:35:95:49 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:104:19:104:54 | new URI(...) : URI | HostComparisonRedirect.java:106:35:106:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:104:27:104:53 | getParameter(...) : String | HostComparisonRedirect.java:104:19:104:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:106:35:106:37 | uri : URI | HostComparisonRedirect.java:106:35:106:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:112:20:112:55 | new URI(...) : URI | HostComparisonRedirect.java:114:35:114:38 | used : URI | provenance |  |
+| HostComparisonRedirect.java:112:28:112:54 | getParameter(...) : String | HostComparisonRedirect.java:112:20:112:55 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:114:35:114:38 | used : URI | HostComparisonRedirect.java:114:35:114:49 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:119:19:119:54 | new URI(...) : URI | HostComparisonRedirect.java:123:35:123:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:119:27:119:53 | getParameter(...) : String | HostComparisonRedirect.java:119:19:119:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:123:35:123:37 | uri : URI | HostComparisonRedirect.java:123:35:123:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:128:19:128:54 | new URI(...) : URI | HostComparisonRedirect.java:134:35:134:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:128:27:128:53 | getParameter(...) : String | HostComparisonRedirect.java:128:19:128:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:134:35:134:37 | uri : URI | HostComparisonRedirect.java:134:35:134:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:141:15:141:50 | new URI(...) : URI | HostComparisonRedirect.java:143:35:143:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:141:23:141:49 | getParameter(...) : String | HostComparisonRedirect.java:141:15:141:50 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:143:35:143:37 | uri : URI | HostComparisonRedirect.java:143:35:143:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:148:19:148:54 | new URI(...) : URI | HostComparisonRedirect.java:150:35:150:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:148:27:148:53 | getParameter(...) : String | HostComparisonRedirect.java:148:19:148:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:150:35:150:37 | uri : URI | HostComparisonRedirect.java:150:35:150:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:155:19:155:54 | new URI(...) : URI | HostComparisonRedirect.java:157:35:157:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:155:27:155:53 | getParameter(...) : String | HostComparisonRedirect.java:155:19:155:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:157:35:157:37 | uri : URI | HostComparisonRedirect.java:157:35:157:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:178:19:178:54 | new URI(...) : URI | HostComparisonRedirect.java:185:39:185:41 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:178:27:178:53 | getParameter(...) : String | HostComparisonRedirect.java:178:19:178:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:185:39:185:41 | uri : URI | HostComparisonRedirect.java:185:39:185:52 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:224:19:224:54 | new URI(...) : URI | HostComparisonRedirect.java:227:35:227:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:224:27:224:53 | getParameter(...) : String | HostComparisonRedirect.java:224:19:224:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:227:35:227:37 | uri : URI | HostComparisonRedirect.java:227:35:227:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:240:19:240:54 | new URI(...) : URI | HostComparisonRedirect.java:243:35:243:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:240:27:240:53 | getParameter(...) : String | HostComparisonRedirect.java:240:19:240:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:243:35:243:37 | uri : URI | HostComparisonRedirect.java:243:35:243:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:248:19:248:54 | new URI(...) : URI | HostComparisonRedirect.java:251:35:251:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:248:27:248:53 | getParameter(...) : String | HostComparisonRedirect.java:248:19:248:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:251:35:251:37 | uri : URI | HostComparisonRedirect.java:251:35:251:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:273:19:273:54 | new URI(...) : URI | HostComparisonRedirect.java:277:35:277:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:273:27:273:53 | getParameter(...) : String | HostComparisonRedirect.java:273:19:273:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:277:35:277:37 | uri : URI | HostComparisonRedirect.java:277:35:277:48 | toString(...) | provenance | MaD:10 |
+| HostComparisonRedirect.java:282:19:282:54 | new URI(...) : URI | HostComparisonRedirect.java:286:35:286:37 | uri : URI | provenance |  |
+| HostComparisonRedirect.java:282:27:282:53 | getParameter(...) : String | HostComparisonRedirect.java:282:19:282:54 | new URI(...) : URI | provenance | Src:MaD:6 MaD:8 |
+| HostComparisonRedirect.java:286:35:286:37 | uri : URI | HostComparisonRedirect.java:286:35:286:48 | toString(...) | provenance | MaD:10 |
+| MicronautUrlRedirect.java:12:39:12:63 | target : String | MicronautUrlRedirect.java:14:49:14:54 | target : String | provenance |  |
+| MicronautUrlRedirect.java:14:49:14:54 | target : String | MicronautUrlRedirect.java:14:38:14:55 | create(...) | provenance | MaD:9 Sink:MaD:2 |
+| MicronautUrlRedirect.java:27:45:27:69 | target : String | MicronautUrlRedirect.java:28:58:28:63 | target : String | provenance |  |
+| MicronautUrlRedirect.java:28:58:28:63 | target : String | MicronautUrlRedirect.java:28:47:28:64 | create(...) | provenance | MaD:9 Sink:MaD:1 |
+| MicronautUrlRedirect.java:32:44:32:68 | target : String | MicronautUrlRedirect.java:33:49:33:54 | target : String | provenance |  |
+| MicronautUrlRedirect.java:33:49:33:54 | target : String | MicronautUrlRedirect.java:33:38:33:55 | create(...) | provenance | MaD:9 Sink:MaD:3 |
+| MicronautUrlRedirect.java:37:45:37:69 | target : String | MicronautUrlRedirect.java:38:58:38:63 | target : String | provenance |  |
+| MicronautUrlRedirect.java:38:58:38:63 | target : String | MicronautUrlRedirect.java:38:47:38:64 | create(...) | provenance | MaD:9 Sink:MaD:4 |
+| UrlRedirect.java:32:37:32:66 | getParameter(...) : String | UrlRedirect.java:32:25:32:67 | weakCleanup(...) | provenance | Src:MaD:6 MaD:7 |
+| UrlRedirect.java:32:37:32:66 | getParameter(...) : String | UrlRedirect.java:45:28:45:39 | input : String | provenance | Src:MaD:6  |
 | UrlRedirect.java:45:28:45:39 | input : String | UrlRedirect.java:46:10:46:14 | input : String | provenance |  |
-| UrlRedirect.java:46:10:46:14 | input : String | UrlRedirect.java:46:10:46:40 | replaceAll(...) : String | provenance | MaD:3 |
-| mad/Test.java:9:16:9:41 | getParameter(...) : String | mad/Test.java:14:31:14:38 | source(...) : String | provenance | Src:MaD:2  |
-| mad/Test.java:14:31:14:38 | source(...) : String | mad/Test.java:14:22:14:38 | (...)... | provenance | Sink:MaD:1 |
+| UrlRedirect.java:46:10:46:14 | input : String | UrlRedirect.java:46:10:46:40 | replaceAll(...) : String | provenance | MaD:7 |
+| mad/Test.java:9:16:9:41 | getParameter(...) : String | mad/Test.java:14:31:14:38 | source(...) : String | provenance | Src:MaD:6  |
+| mad/Test.java:14:31:14:38 | source(...) : String | mad/Test.java:14:22:14:38 | (...)... | provenance | Sink:MaD:5 |
 models
-| 1 | Sink: org.kohsuke.stapler; HttpResponses; true; redirectTo; (String); ; Argument[0]; url-redirection; ai-manual |
-| 2 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
-| 3 | Summary: java.lang; String; false; replaceAll; ; ; Argument[this]; ReturnValue; taint; manual |
+| 1 | Sink: io.micronaut.http; HttpResponse; true; permanentRedirect; (URI); ; Argument[0]; url-redirection; manual |
+| 2 | Sink: io.micronaut.http; HttpResponse; true; redirect; (URI); ; Argument[0]; url-redirection; manual |
+| 3 | Sink: io.micronaut.http; HttpResponse; true; seeOther; (URI); ; Argument[0]; url-redirection; manual |
+| 4 | Sink: io.micronaut.http; HttpResponse; true; temporaryRedirect; (URI); ; Argument[0]; url-redirection; manual |
+| 5 | Sink: org.kohsuke.stapler; HttpResponses; true; redirectTo; (String); ; Argument[0]; url-redirection; ai-manual |
+| 6 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 7 | Summary: java.lang; String; false; replaceAll; ; ; Argument[this]; ReturnValue; taint; manual |
+| 8 | Summary: java.net; URI; false; URI; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 9 | Summary: java.net; URI; false; create; ; ; Argument[0]; ReturnValue; taint; manual |
+| 10 | Summary: java.net; URI; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
 nodes
+| HostComparisonRedirect.java:9:19:9:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:9:27:9:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:10:31:10:33 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:10:31:10:44 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:51:19:51:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:51:27:51:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:53:35:53:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:53:35:53:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:58:19:58:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:58:27:58:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:60:35:60:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:60:35:60:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:69:19:69:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:69:27:69:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:71:35:71:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:71:35:71:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:85:19:85:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:85:27:85:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:87:35:87:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:87:35:87:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:93:20:93:55 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:93:28:93:54 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:95:35:95:38 | used : URI | semmle.label | used : URI |
+| HostComparisonRedirect.java:95:35:95:49 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:104:19:104:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:104:27:104:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:106:35:106:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:106:35:106:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:112:20:112:55 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:112:28:112:54 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:114:35:114:38 | used : URI | semmle.label | used : URI |
+| HostComparisonRedirect.java:114:35:114:49 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:119:19:119:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:119:27:119:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:123:35:123:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:123:35:123:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:128:19:128:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:128:27:128:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:134:35:134:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:134:35:134:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:141:15:141:50 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:141:23:141:49 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:143:35:143:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:143:35:143:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:148:19:148:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:148:27:148:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:150:35:150:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:150:35:150:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:155:19:155:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:155:27:155:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:157:35:157:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:157:35:157:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:178:19:178:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:178:27:178:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:185:39:185:41 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:185:39:185:52 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:224:19:224:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:224:27:224:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:227:35:227:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:227:35:227:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:240:19:240:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:240:27:240:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:243:35:243:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:243:35:243:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:248:19:248:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:248:27:248:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:251:35:251:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:251:35:251:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:273:19:273:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:273:27:273:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:277:35:277:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:277:35:277:48 | toString(...) | semmle.label | toString(...) |
+| HostComparisonRedirect.java:282:19:282:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparisonRedirect.java:282:27:282:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparisonRedirect.java:286:35:286:37 | uri : URI | semmle.label | uri : URI |
+| HostComparisonRedirect.java:286:35:286:48 | toString(...) | semmle.label | toString(...) |
+| MicronautUrlRedirect.java:12:39:12:63 | target : String | semmle.label | target : String |
+| MicronautUrlRedirect.java:14:38:14:55 | create(...) | semmle.label | create(...) |
+| MicronautUrlRedirect.java:14:49:14:54 | target : String | semmle.label | target : String |
+| MicronautUrlRedirect.java:27:45:27:69 | target : String | semmle.label | target : String |
+| MicronautUrlRedirect.java:28:47:28:64 | create(...) | semmle.label | create(...) |
+| MicronautUrlRedirect.java:28:58:28:63 | target : String | semmle.label | target : String |
+| MicronautUrlRedirect.java:32:44:32:68 | target : String | semmle.label | target : String |
+| MicronautUrlRedirect.java:33:38:33:55 | create(...) | semmle.label | create(...) |
+| MicronautUrlRedirect.java:33:49:33:54 | target : String | semmle.label | target : String |
+| MicronautUrlRedirect.java:37:45:37:69 | target : String | semmle.label | target : String |
+| MicronautUrlRedirect.java:38:47:38:64 | create(...) | semmle.label | create(...) |
+| MicronautUrlRedirect.java:38:58:38:63 | target : String | semmle.label | target : String |
 | UrlRedirect2.java:27:25:27:54 | getParameter(...) | semmle.label | getParameter(...) |
 | UrlRedirect.java:23:25:23:54 | getParameter(...) | semmle.label | getParameter(...) |
 | UrlRedirect.java:32:25:32:67 | weakCleanup(...) | semmle.label | weakCleanup(...) |
diff --git a/java/ql/test/query-tests/security/CWE-601/semmle/tests/options b/java/ql/test/query-tests/security/CWE-601/semmle/tests/options
index 637c329a9143..e0a964b29dc4 100644
--- a/java/ql/test/query-tests/security/CWE-601/semmle/tests/options
+++ b/java/ql/test/query-tests/security/CWE-601/semmle/tests/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/servlet-api-2.4:${testdir}/../../../../../stubs/stapler-1.263:${testdir}/../../../../../stubs/javax-servlet-2.5:${testdir}/../../../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../../../stubs/saxon-xqj-9.x:${testdir}/../../../../../stubs/apache-commons-beanutils:${testdir}/../../../../../stubs/dom4j-2.1.1:${testdir}/../../../../../stubs/apache-commons-lang:${testdir}/../../../../../stubs/jaxen-1.2.0
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/micronaut-4.x:${testdir}/../../../../../stubs/servlet-api-2.4:${testdir}/../../../../../stubs/stapler-1.263:${testdir}/../../../../../stubs/javax-servlet-2.5:${testdir}/../../../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../../../stubs/saxon-xqj-9.x:${testdir}/../../../../../stubs/apache-commons-beanutils:${testdir}/../../../../../stubs/dom4j-2.1.1:${testdir}/../../../../../stubs/apache-commons-lang:${testdir}/../../../../../stubs/jaxen-1.2.0
diff --git a/java/ql/test/query-tests/security/CWE-611/SecureXmlFactoriesTests.java b/java/ql/test/query-tests/security/CWE-611/SecureXmlFactoriesTests.java
new file mode 100644
index 000000000000..77c6dccfed73
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-611/SecureXmlFactoriesTests.java
@@ -0,0 +1,77 @@
+import java.net.Socket;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
+
+import org.apache.commons.xml.secure.SecureDocumentBuilderFactory;
+import org.apache.commons.xml.secure.SecureSAXParserFactory;
+import org.apache.commons.xml.secure.SecureSchemaFactory;
+import org.apache.commons.xml.secure.SecureTransformerFactory;
+import org.apache.commons.xml.secure.SecureXMLInputFactory;
+
+// Every factory returned by the `org.apache.commons.xml.secure.SecureXxxFactory` classes is
+// already hardened against XXE, so the parsers created from them must not be reported.
+public class SecureXmlFactoriesTests {
+
+  public void hardenedDocumentBuilder(Socket sock) throws Exception {
+    DocumentBuilderFactory factory = SecureDocumentBuilderFactory.newInstance();
+    DocumentBuilder builder = factory.newDocumentBuilder();
+    builder.parse(sock.getInputStream()); // safe
+  }
+
+  public void hardenedDocumentBuilderChained(Socket sock) throws Exception {
+    SecureDocumentBuilderFactory.newDefaultNSInstance().newDocumentBuilder().parse(sock.getInputStream()); // safe
+  }
+
+  public void hardenedSaxParser(Socket sock) throws Exception {
+    SAXParserFactory factory = SecureSAXParserFactory.newInstance();
+    SAXParser parser = factory.newSAXParser();
+    parser.parse(sock.getInputStream(), new DefaultHandler()); // safe
+  }
+
+  public void hardenedSaxParserXmlReader(Socket sock) throws Exception {
+    SAXParser parser = SecureSAXParserFactory.newNSInstance().newSAXParser();
+    XMLReader reader = parser.getXMLReader();
+    reader.parse(new org.xml.sax.InputSource(sock.getInputStream())); // safe
+  }
+
+  public void hardenedXmlInputFactory(Socket sock) throws Exception {
+    XMLInputFactory factory = SecureXMLInputFactory.newFactory();
+    factory.createXMLStreamReader(sock.getInputStream()); // safe
+    factory.createXMLEventReader(sock.getInputStream()); // safe
+  }
+
+  public void hardenedXmlInputFactoryDefault(Socket sock) throws Exception {
+    XMLInputFactory factory = SecureXMLInputFactory.newDefaultFactory();
+    factory.createXMLStreamReader(sock.getInputStream()); // safe
+  }
+
+  public void hardenedTransformer(Socket sock) throws Exception {
+    TransformerFactory tf = SecureTransformerFactory.newInstance();
+    Transformer transformer = tf.newTransformer();
+    transformer.transform(new StreamSource(sock.getInputStream()), null); // safe
+    tf.newTransformer(new StreamSource(sock.getInputStream())); // safe
+  }
+
+  public void hardenedTransformerDefault(Socket sock) throws Exception {
+    TransformerFactory tf = SecureTransformerFactory.newDefaultInstance();
+    tf.newTransformer(new StreamSource(sock.getInputStream())); // safe
+  }
+
+  public void hardenedSchema(Socket sock) throws Exception {
+    SchemaFactory factory = SecureSchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+    Schema schema = factory.newSchema(new StreamSource(sock.getInputStream())); // safe
+  }
+}
diff --git a/java/ql/test/query-tests/security/CWE-611/options b/java/ql/test/query-tests/security/CWE-611/options
index 190e6b2af0c6..c7186f87c849 100644
--- a/java/ql/test/query-tests/security/CWE-611/options
+++ b/java/ql/test/query-tests/security/CWE-611/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/jdom-1.1.3:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/simple-xml-2.7.1:${testdir}/../../../stubs/jaxb-api-2.3.1:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/apache-commons-digester3-3.2:${testdir}/../../../stubs/servlet-api-2.4/:${testdir}/../../../stubs/rundeck-api-java-client-13.2:${testdir}/../../../stubs/springframework-5.8.x/:${testdir}/../../../stubs/mdht-1.2.0/:${testdir}/../../../stubs/woodstox-core-6.4.0
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/jdom-1.1.3:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/simple-xml-2.7.1:${testdir}/../../../stubs/jaxb-api-2.3.1:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/apache-commons-digester3-3.2:${testdir}/../../../stubs/servlet-api-2.4/:${testdir}/../../../stubs/rundeck-api-java-client-13.2:${testdir}/../../../stubs/springframework-5.8.x/:${testdir}/../../../stubs/mdht-1.2.0/:${testdir}/../../../stubs/woodstox-core-6.4.0:${testdir}/../../../stubs/apache-commons-secure-xml-1.0.0
diff --git a/java/ql/test/query-tests/security/CWE-918/HostComparison.java b/java/ql/test/query-tests/security/CWE-918/HostComparison.java
new file mode 100644
index 000000000000..143d33599c38
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-918/HostComparison.java
@@ -0,0 +1,288 @@
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
+
+public class HostComparison {
+    public void unguarded(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        uri.toURL().openConnection(); // $ Alert
+    }
+
+    public void directEquals(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        if ("example.com".equals(uri.getHost())) {
+            uri.toURL().openConnection();
+        }
+    }
+
+    public void directEqualsIgnoreCase(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        if ("example.com".equalsIgnoreCase(uri.getHost())) {
+            uri.toURL().openConnection();
+        }
+    }
+
+    public void reversedEqualsIgnoreCase(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        if (uri.getHost().equalsIgnoreCase("example.com")) {
+            uri.toURL().openConnection();
+        }
+    }
+
+    public void localEquals(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if ("example.com".equals(host)) {
+            uri.toURL().openConnection();
+        }
+    }
+
+    public void localEqualsIgnoreCase(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if ("example.com".equalsIgnoreCase(host)) {
+            uri.toURL().openConnection();
+        }
+    }
+
+    public void streamEquals(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ SPURIOUS: Source
+        if (Arrays.stream(new String[]{"example.com"}).anyMatch(uri.getHost()::equals)) {
+            uri.toURL().openConnection(); // $ SPURIOUS: Alert
+        }
+    }
+
+    public void reportedStreamHelper(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ SPURIOUS: Source
+        if (isAllowedStream(uri.getHost(), "example.com")) {
+            uri.toURL().openConnection(); // $ SPURIOUS: Alert
+        }
+    }
+
+    private static boolean isAllowedStream(String host, String... allowedHosts) {
+        return Arrays.stream(allowedHosts).anyMatch(host::equalsIgnoreCase);
+    }
+
+    public void reportedLoopHelper(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ SPURIOUS: Source
+        if (isAllowedLoop(uri.getHost(), "example.com")) {
+            uri.toURL().openConnection(); // $ SPURIOUS: Alert
+        }
+    }
+
+    private static boolean isAllowedLoop(String host, String... allowedHosts) {
+        for (String allowed : allowedHosts) {
+            if (allowed.equalsIgnoreCase(host)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void wrongBranch(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        if (!"example.com".equals(uri.getHost())) {
+            uri.toURL().openConnection(); // $ Alert
+        }
+    }
+
+    public void differentUri(HttpServletRequest request) throws Exception {
+        URI checked = new URI(request.getParameter("checked"));
+        URI used = new URI(request.getParameter("url")); // $ Source
+        if ("example.com".equals(checked.getHost())) {
+            used.toURL().openConnection(); // $ Alert
+        }
+    }
+
+    public void constantUrl() throws Exception {
+        new URI("https://example.com/").toURL().openConnection();
+    }
+
+    public void caseInsensitiveWrongBranch(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        if (!"example.com".equalsIgnoreCase(uri.getHost())) {
+            uri.toURL().openConnection(); // $ Alert
+        }
+    }
+
+    public void caseInsensitiveDifferentUri(HttpServletRequest request) throws Exception {
+        URI checked = new URI(request.getParameter("checked"));
+        URI used = new URI(request.getParameter("url")); // $ Source
+        if ("example.com".equalsIgnoreCase(checked.getHost())) {
+            used.toURL().openConnection(); // $ Alert
+        }
+    }
+
+    public void reassignedHost(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        String host = uri.getHost();
+        host = "example.com";
+        if ("example.com".equalsIgnoreCase(host)) {
+            uri.toURL().openConnection(); // $ Alert
+        }
+    }
+
+    public void conditionallyReassignedHost(HttpServletRequest request, boolean skip) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        String host = uri.getHost();
+        if (skip) {
+            host = "example.com";
+        }
+        if ("example.com".equalsIgnoreCase(host)) {
+            uri.toURL().openConnection(); // $ Alert
+        }
+    }
+
+    public void reassignedUri(HttpServletRequest request) throws Exception {
+        URI uri = new URI("https://example.com/");
+        String host = uri.getHost();
+        uri = new URI(request.getParameter("url")); // $ Source
+        if ("example.com".equalsIgnoreCase(host)) {
+            uri.toURL().openConnection(); // $ Alert
+        }
+    }
+
+    public void untrustedComparison(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        if (request.getParameter("allowed").equalsIgnoreCase(uri.getHost())) {
+            uri.toURL().openConnection(); // $ Alert
+        }
+    }
+
+    public void unrelatedComparison(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        if (new FakeComparison().equalsIgnoreCase(uri.getHost())) {
+            uri.toURL().openConnection(); // $ Alert
+        }
+    }
+
+    private static class FakeComparison {
+        boolean equalsIgnoreCase(String host) {
+            return true;
+        }
+    }
+
+    public void aliasChain(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        String alias = host;
+        String secondAlias = alias;
+        if ("example.com".equalsIgnoreCase(secondAlias)) {
+            uri.toURL().openConnection();
+        }
+    }
+
+    public void finallyOverwrite(HttpServletRequest request, boolean skip) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        String host = uri.getHost();
+        try {
+            if (skip) return;
+            host = "example.com";
+        } finally {
+            if ("example.com".equalsIgnoreCase(host)) {
+                uri.toURL().openConnection(); // $ Alert
+            }
+        }
+    }
+
+    public void rejectionReturns(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if (!"example.com".equalsIgnoreCase(host)) return;
+        uri.toURL().openConnection();
+    }
+
+    private static final String ALLOWED_HOST = "example.com";
+
+    public void constantAllowlistField(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if (ALLOWED_HOST.equalsIgnoreCase(host)) {
+            uri.toURL().openConnection();
+        }
+    }
+
+    public void constantCollection(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if (Set.of("example.com", "example.org").contains(host)) {
+            uri.toURL().openConnection();
+        }
+    }
+
+    public void normalizedConstantCollection(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if (Set.of("EXAMPLE.COM", "EXAMPLE.ORG").contains(host.toUpperCase())) {
+            uri.toURL().openConnection();
+        }
+    }
+
+    public void nullContainingCollection(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        String host = uri.getHost();
+        if (Arrays.asList("example.com", null).contains(host)) {
+            uri.toURL().openConnection(); // $ Alert
+        }
+    }
+
+    public void nullContainingCollectionWithNonNullHost(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        String host = uri.getHost();
+        if (host != null && Arrays.asList("example.com", null).contains(host)) {
+            uri.toURL().openConnection();
+        }
+    }
+
+    public void untrustedCollection(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        String host = uri.getHost();
+        if (Set.of(request.getParameter("allowed")).contains(host)) {
+            uri.toURL().openConnection(); // $ Alert
+        }
+    }
+
+    public void orBypass(HttpServletRequest request, boolean skip) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        String host = uri.getHost();
+        if ("example.com".equalsIgnoreCase(host) || skip) {
+            uri.toURL().openConnection(); // $ Alert
+        }
+    }
+
+    public void assignmentCast(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        Object value = uri.getHost();
+        String host = (String) value;
+        if ("example.com".equalsIgnoreCase(host)) {
+            uri.toURL().openConnection();
+        }
+    }
+
+    public void comparisonCast(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url"));
+        Object host = uri.getHost();
+        if ("example.com".equalsIgnoreCase((String) host)) {
+            uri.toURL().openConnection();
+        }
+    }
+
+    public void castHostOverwrite(HttpServletRequest request) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        Object host = uri.getHost();
+        host = "example.com";
+        if ("example.com".equalsIgnoreCase((String) host)) {
+            uri.toURL().openConnection(); // $ Alert
+        }
+    }
+
+    public void castHostConditionalOverwrite(HttpServletRequest request, boolean skip) throws Exception {
+        URI uri = new URI(request.getParameter("url")); // $ Source
+        Object host = uri.getHost();
+        if (skip) host = "example.com";
+        if ("example.com".equalsIgnoreCase((String) host)) {
+            uri.toURL().openConnection(); // $ Alert
+        }
+    }
+}
diff --git a/java/ql/test/query-tests/security/CWE-918/MicronautSSRF.java b/java/ql/test/query-tests/security/CWE-918/MicronautSSRF.java
new file mode 100644
index 000000000000..8426390a35f6
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-918/MicronautSSRF.java
@@ -0,0 +1,49 @@
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.QueryValue;
+import io.micronaut.http.client.HttpClient;
+import io.micronaut.http.HttpRequest;
+import io.micronaut.http.uri.UriBuilder;
+import java.net.URI;
+
+@Controller("/ssrf")
+public class MicronautSSRF {
+
+    private HttpClient client;
+
+    @Get("/retrieve")
+    public String testRetrieve(@QueryValue String url) { // $ Source
+        return client.toBlocking().retrieve(url); // $ Alert
+    }
+
+    @Get("/exchange-string")
+    public Object testExchangeWithString(@QueryValue String url) { // $ Source
+        return client.toBlocking().exchange(url); // $ Alert
+    }
+
+    @Get("/retrieve-typed")
+    public Object testRetrieveTyped(@QueryValue String url) { // $ Source
+        return client.toBlocking().retrieve(url, String.class); // $ Alert
+    }
+
+    @Get("/uri-builder")
+    public String testUriBuilder(@QueryValue String host) { // $ Source
+        URI uri = UriBuilder.of("http://example.com").host(host).build();
+        return client.toBlocking().retrieve(uri.toString()); // $ Alert
+    }
+
+    @Get("/blocking-request")
+    public Object testBlockingRequest(@QueryValue String url) { // $ Source
+        return client.toBlocking().exchange(HttpRequest.GET(url)); // $ Alert
+    }
+
+    @Get("/non-blocking")
+    public Object testNonBlocking(@QueryValue String url) { // $ Source
+        return client.exchange(url); // $ Alert
+    }
+
+    @Get("/non-blocking-request")
+    public Object testNonBlockingRequest(@QueryValue String url) { // $ Source
+        return client.exchange(HttpRequest.GET(url)); // $ Alert
+    }
+}
diff --git a/java/ql/test/query-tests/security/CWE-918/RequestForgery.expected b/java/ql/test/query-tests/security/CWE-918/RequestForgery.expected
index cd1481bcd440..8995e286cef3 100644
--- a/java/ql/test/query-tests/security/CWE-918/RequestForgery.expected
+++ b/java/ql/test/query-tests/security/CWE-918/RequestForgery.expected
@@ -210,6 +210,25 @@
 | ApacheHttpSSRFVersion5.java:388:44:388:46 | uri | ApacheHttpSSRFVersion5.java:372:30:372:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:388:44:388:46 | uri | Potential server-side request forgery due to a $@. | ApacheHttpSSRFVersion5.java:372:30:372:56 | getParameter(...) | user-provided value |
 | ApacheHttpSSRFVersion5.java:390:24:390:26 | uri | ApacheHttpSSRFVersion5.java:372:30:372:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:390:24:390:26 | uri | Potential server-side request forgery due to a $@. | ApacheHttpSSRFVersion5.java:372:30:372:56 | getParameter(...) | user-provided value |
 | ApacheHttpSSRFVersion5.java:394:24:394:26 | uri | ApacheHttpSSRFVersion5.java:372:30:372:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:394:24:394:26 | uri | Potential server-side request forgery due to a $@. | ApacheHttpSSRFVersion5.java:372:30:372:56 | getParameter(...) | user-provided value |
+| HostComparison.java:9:9:9:19 | toURL(...) | HostComparison.java:8:27:8:53 | getParameter(...) : String | HostComparison.java:9:9:9:19 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:8:27:8:53 | getParameter(...) | user-provided value |
+| HostComparison.java:52:13:52:23 | toURL(...) | HostComparison.java:50:27:50:53 | getParameter(...) : String | HostComparison.java:52:13:52:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:50:27:50:53 | getParameter(...) | user-provided value |
+| HostComparison.java:59:13:59:23 | toURL(...) | HostComparison.java:57:27:57:53 | getParameter(...) : String | HostComparison.java:59:13:59:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:57:27:57:53 | getParameter(...) | user-provided value |
+| HostComparison.java:70:13:70:23 | toURL(...) | HostComparison.java:68:27:68:53 | getParameter(...) : String | HostComparison.java:70:13:70:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:68:27:68:53 | getParameter(...) | user-provided value |
+| HostComparison.java:86:13:86:23 | toURL(...) | HostComparison.java:84:27:84:53 | getParameter(...) : String | HostComparison.java:86:13:86:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:84:27:84:53 | getParameter(...) | user-provided value |
+| HostComparison.java:94:13:94:24 | toURL(...) | HostComparison.java:92:28:92:54 | getParameter(...) : String | HostComparison.java:94:13:94:24 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:92:28:92:54 | getParameter(...) | user-provided value |
+| HostComparison.java:105:13:105:23 | toURL(...) | HostComparison.java:103:27:103:53 | getParameter(...) : String | HostComparison.java:105:13:105:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:103:27:103:53 | getParameter(...) | user-provided value |
+| HostComparison.java:113:13:113:24 | toURL(...) | HostComparison.java:111:28:111:54 | getParameter(...) : String | HostComparison.java:113:13:113:24 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:111:28:111:54 | getParameter(...) | user-provided value |
+| HostComparison.java:122:13:122:23 | toURL(...) | HostComparison.java:118:27:118:53 | getParameter(...) : String | HostComparison.java:122:13:122:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:118:27:118:53 | getParameter(...) | user-provided value |
+| HostComparison.java:133:13:133:23 | toURL(...) | HostComparison.java:127:27:127:53 | getParameter(...) : String | HostComparison.java:133:13:133:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:127:27:127:53 | getParameter(...) | user-provided value |
+| HostComparison.java:142:13:142:23 | toURL(...) | HostComparison.java:140:23:140:49 | getParameter(...) : String | HostComparison.java:142:13:142:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:140:23:140:49 | getParameter(...) | user-provided value |
+| HostComparison.java:149:13:149:23 | toURL(...) | HostComparison.java:147:27:147:53 | getParameter(...) : String | HostComparison.java:149:13:149:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:147:27:147:53 | getParameter(...) | user-provided value |
+| HostComparison.java:156:13:156:23 | toURL(...) | HostComparison.java:154:27:154:53 | getParameter(...) : String | HostComparison.java:156:13:156:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:154:27:154:53 | getParameter(...) | user-provided value |
+| HostComparison.java:184:17:184:27 | toURL(...) | HostComparison.java:177:27:177:53 | getParameter(...) : String | HostComparison.java:184:17:184:27 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:177:27:177:53 | getParameter(...) | user-provided value |
+| HostComparison.java:226:13:226:23 | toURL(...) | HostComparison.java:223:27:223:53 | getParameter(...) : String | HostComparison.java:226:13:226:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:223:27:223:53 | getParameter(...) | user-provided value |
+| HostComparison.java:242:13:242:23 | toURL(...) | HostComparison.java:239:27:239:53 | getParameter(...) : String | HostComparison.java:242:13:242:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:239:27:239:53 | getParameter(...) | user-provided value |
+| HostComparison.java:250:13:250:23 | toURL(...) | HostComparison.java:247:27:247:53 | getParameter(...) : String | HostComparison.java:250:13:250:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:247:27:247:53 | getParameter(...) | user-provided value |
+| HostComparison.java:276:13:276:23 | toURL(...) | HostComparison.java:272:27:272:53 | getParameter(...) : String | HostComparison.java:276:13:276:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:272:27:272:53 | getParameter(...) | user-provided value |
+| HostComparison.java:285:13:285:23 | toURL(...) | HostComparison.java:281:27:281:53 | getParameter(...) : String | HostComparison.java:285:13:285:23 | toURL(...) | Potential server-side request forgery due to a $@. | HostComparison.java:281:27:281:53 | getParameter(...) | user-provided value |
 | JakartaWsSSRF.java:15:23:15:25 | url | JakartaWsSSRF.java:14:22:14:48 | getParameter(...) : String | JakartaWsSSRF.java:15:23:15:25 | url | Potential server-side request forgery due to a $@. | JakartaWsSSRF.java:14:22:14:48 | getParameter(...) | user-provided value |
 | JavaNetHttpSSRF.java:30:32:30:35 | url1 | JavaNetHttpSSRF.java:25:27:25:53 | getParameter(...) : String | JavaNetHttpSSRF.java:30:32:30:35 | url1 | Potential server-side request forgery due to a $@. | JavaNetHttpSSRF.java:25:27:25:53 | getParameter(...) | user-provided value |
 | JavaNetHttpSSRF.java:33:32:33:35 | url1 | JavaNetHttpSSRF.java:25:27:25:53 | getParameter(...) : String | JavaNetHttpSSRF.java:33:32:33:35 | url1 | Potential server-side request forgery due to a $@. | JavaNetHttpSSRF.java:25:27:25:53 | getParameter(...) | user-provided value |
@@ -235,6 +254,13 @@
 | JdbcUrlSSRF.java:86:19:86:25 | jdbcUrl | JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:86:19:86:25 | jdbcUrl | Potential server-side request forgery due to a $@. | JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) | user-provided value |
 | JdbcUrlSSRF.java:87:19:87:25 | jdbcUrl | JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:87:19:87:25 | jdbcUrl | Potential server-side request forgery due to a $@. | JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) | user-provided value |
 | JdbcUrlSSRF.java:88:19:88:25 | jdbcUrl | JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:88:19:88:25 | jdbcUrl | Potential server-side request forgery due to a $@. | JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) | user-provided value |
+| MicronautSSRF.java:16:45:16:47 | url | MicronautSSRF.java:15:32:15:53 | url : String | MicronautSSRF.java:16:45:16:47 | url | Potential server-side request forgery due to a $@. | MicronautSSRF.java:15:32:15:53 | url | user-provided value |
+| MicronautSSRF.java:21:45:21:47 | url | MicronautSSRF.java:20:42:20:63 | url : String | MicronautSSRF.java:21:45:21:47 | url | Potential server-side request forgery due to a $@. | MicronautSSRF.java:20:42:20:63 | url | user-provided value |
+| MicronautSSRF.java:26:45:26:47 | url | MicronautSSRF.java:25:37:25:58 | url : String | MicronautSSRF.java:26:45:26:47 | url | Potential server-side request forgery due to a $@. | MicronautSSRF.java:25:37:25:58 | url | user-provided value |
+| MicronautSSRF.java:32:45:32:58 | toString(...) | MicronautSSRF.java:30:34:30:56 | host : String | MicronautSSRF.java:32:45:32:58 | toString(...) | Potential server-side request forgery due to a $@. | MicronautSSRF.java:30:34:30:56 | host | user-provided value |
+| MicronautSSRF.java:37:45:37:64 | GET(...) | MicronautSSRF.java:36:39:36:60 | url : String | MicronautSSRF.java:37:45:37:64 | GET(...) | Potential server-side request forgery due to a $@. | MicronautSSRF.java:36:39:36:60 | url | user-provided value |
+| MicronautSSRF.java:42:32:42:34 | url | MicronautSSRF.java:41:35:41:56 | url : String | MicronautSSRF.java:42:32:42:34 | url | Potential server-side request forgery due to a $@. | MicronautSSRF.java:41:35:41:56 | url | user-provided value |
+| MicronautSSRF.java:47:32:47:51 | GET(...) | MicronautSSRF.java:46:42:46:63 | url : String | MicronautSSRF.java:47:32:47:51 | GET(...) | Potential server-side request forgery due to a $@. | MicronautSSRF.java:46:42:46:63 | url | user-provided value |
 | ReactiveWebClientSSRF.java:16:52:16:54 | url | ReactiveWebClientSSRF.java:15:26:15:52 | getParameter(...) : String | ReactiveWebClientSSRF.java:16:52:16:54 | url | Potential server-side request forgery due to a $@. | ReactiveWebClientSSRF.java:15:26:15:52 | getParameter(...) | user-provided value |
 | ReactiveWebClientSSRF.java:35:30:35:32 | url | ReactiveWebClientSSRF.java:32:26:32:52 | getParameter(...) : String | ReactiveWebClientSSRF.java:35:30:35:32 | url | Potential server-side request forgery due to a $@. | ReactiveWebClientSSRF.java:32:26:32:52 | getParameter(...) | user-provided value |
 | ReactiveWebClientSSRF.java:57:26:57:26 | p | ReactiveWebClientSSRF.java:55:24:55:50 | getParameter(...) : String | ReactiveWebClientSSRF.java:57:26:57:26 | p | Potential server-side request forgery due to a $@. | ReactiveWebClientSSRF.java:55:24:55:50 | getParameter(...) | user-provided value |
@@ -388,1035 +414,1134 @@
 | mad/Test.java:107:15:107:31 | (...)... | mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:107:15:107:31 | (...)... | Potential server-side request forgery due to a $@. | mad/Test.java:26:16:26:41 | getParameter(...) | user-provided value |
 | mad/Test.java:112:15:112:31 | (...)... | mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:112:15:112:31 | (...)... | Potential server-side request forgery due to a $@. | mad/Test.java:26:16:26:41 | getParameter(...) | user-provided value |
 edges
-| ApacheHttpClientExecuteSSRF.java:23:29:23:56 | getParameter(...) : String | ApacheHttpClientExecuteSSRF.java:25:42:25:47 | source : String | provenance | Src:MaD:286  |
-| ApacheHttpClientExecuteSSRF.java:23:29:23:56 | getParameter(...) : String | ApacheHttpClientExecuteSSRF.java:27:56:27:61 | source | provenance | Src:MaD:286 Sink:MaD:220 |
-| ApacheHttpClientExecuteSSRF.java:23:29:23:56 | getParameter(...) : String | ApacheHttpClientExecuteSSRF.java:27:56:27:61 | source : String | provenance | Src:MaD:286  |
-| ApacheHttpClientExecuteSSRF.java:25:29:25:48 | new HttpHost(...) : HttpHost | ApacheHttpClientExecuteSSRF.java:32:28:32:31 | host | provenance | Sink:MaD:228 |
-| ApacheHttpClientExecuteSSRF.java:25:29:25:48 | new HttpHost(...) : HttpHost | ApacheHttpClientExecuteSSRF.java:33:28:33:31 | host | provenance | Sink:MaD:229 |
-| ApacheHttpClientExecuteSSRF.java:25:29:25:48 | new HttpHost(...) : HttpHost | ApacheHttpClientExecuteSSRF.java:34:28:34:31 | host | provenance | Sink:MaD:230 |
-| ApacheHttpClientExecuteSSRF.java:25:29:25:48 | new HttpHost(...) : HttpHost | ApacheHttpClientExecuteSSRF.java:35:28:35:31 | host | provenance | Sink:MaD:231 |
-| ApacheHttpClientExecuteSSRF.java:25:42:25:47 | source : String | ApacheHttpClientExecuteSSRF.java:25:29:25:48 | new HttpHost(...) : HttpHost | provenance | MaD:309 |
-| ApacheHttpClientExecuteSSRF.java:27:37:27:62 | get(...) : RequestBuilder | ApacheHttpClientExecuteSSRF.java:27:37:27:70 | build(...) : HttpUriRequest | provenance | MaD:306 |
-| ApacheHttpClientExecuteSSRF.java:27:37:27:70 | build(...) : HttpUriRequest | ApacheHttpClientExecuteSSRF.java:36:28:36:33 | uriReq | provenance | Sink:MaD:232 |
-| ApacheHttpClientExecuteSSRF.java:27:37:27:70 | build(...) : HttpUriRequest | ApacheHttpClientExecuteSSRF.java:37:28:37:33 | uriReq | provenance | Sink:MaD:233 |
-| ApacheHttpClientExecuteSSRF.java:27:37:27:70 | build(...) : HttpUriRequest | ApacheHttpClientExecuteSSRF.java:38:28:38:33 | uriReq | provenance | Sink:MaD:234 |
-| ApacheHttpClientExecuteSSRF.java:27:37:27:70 | build(...) : HttpUriRequest | ApacheHttpClientExecuteSSRF.java:39:28:39:33 | uriReq | provenance | Sink:MaD:235 |
-| ApacheHttpClientExecuteSSRF.java:27:56:27:61 | source : String | ApacheHttpClientExecuteSSRF.java:27:37:27:62 | get(...) : RequestBuilder | provenance | MaD:307 |
-| ApacheHttpSSRF.java:27:27:27:53 | getParameter(...) : String | ApacheHttpSSRF.java:28:31:28:34 | sink : String | provenance | Src:MaD:286  |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:30:43:30:45 | uri | provenance | Sink:MaD:211 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:32:29:32:31 | uri | provenance | Sink:MaD:217 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:34:26:34:28 | uri | provenance | Sink:MaD:212 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:35:26:35:28 | uri | provenance | Sink:MaD:215 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:36:25:36:27 | uri | provenance | Sink:MaD:216 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:37:28:37:30 | uri | provenance | Sink:MaD:210 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:38:29:38:31 | uri | provenance | Sink:MaD:213 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:39:27:39:29 | uri | provenance | Sink:MaD:218 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:40:27:40:29 | uri | provenance | Sink:MaD:214 |
+| ApacheHttpClientExecuteSSRF.java:23:29:23:56 | getParameter(...) : String | ApacheHttpClientExecuteSSRF.java:25:42:25:47 | source : String | provenance | Src:MaD:292  |
+| ApacheHttpClientExecuteSSRF.java:23:29:23:56 | getParameter(...) : String | ApacheHttpClientExecuteSSRF.java:27:56:27:61 | source | provenance | Src:MaD:292 Sink:MaD:226 |
+| ApacheHttpClientExecuteSSRF.java:23:29:23:56 | getParameter(...) : String | ApacheHttpClientExecuteSSRF.java:27:56:27:61 | source : String | provenance | Src:MaD:292  |
+| ApacheHttpClientExecuteSSRF.java:25:29:25:48 | new HttpHost(...) : HttpHost | ApacheHttpClientExecuteSSRF.java:32:28:32:31 | host | provenance | Sink:MaD:234 |
+| ApacheHttpClientExecuteSSRF.java:25:29:25:48 | new HttpHost(...) : HttpHost | ApacheHttpClientExecuteSSRF.java:33:28:33:31 | host | provenance | Sink:MaD:235 |
+| ApacheHttpClientExecuteSSRF.java:25:29:25:48 | new HttpHost(...) : HttpHost | ApacheHttpClientExecuteSSRF.java:34:28:34:31 | host | provenance | Sink:MaD:236 |
+| ApacheHttpClientExecuteSSRF.java:25:29:25:48 | new HttpHost(...) : HttpHost | ApacheHttpClientExecuteSSRF.java:35:28:35:31 | host | provenance | Sink:MaD:237 |
+| ApacheHttpClientExecuteSSRF.java:25:42:25:47 | source : String | ApacheHttpClientExecuteSSRF.java:25:29:25:48 | new HttpHost(...) : HttpHost | provenance | MaD:319 |
+| ApacheHttpClientExecuteSSRF.java:27:37:27:62 | get(...) : RequestBuilder | ApacheHttpClientExecuteSSRF.java:27:37:27:70 | build(...) : HttpUriRequest | provenance | MaD:316 |
+| ApacheHttpClientExecuteSSRF.java:27:37:27:70 | build(...) : HttpUriRequest | ApacheHttpClientExecuteSSRF.java:36:28:36:33 | uriReq | provenance | Sink:MaD:238 |
+| ApacheHttpClientExecuteSSRF.java:27:37:27:70 | build(...) : HttpUriRequest | ApacheHttpClientExecuteSSRF.java:37:28:37:33 | uriReq | provenance | Sink:MaD:239 |
+| ApacheHttpClientExecuteSSRF.java:27:37:27:70 | build(...) : HttpUriRequest | ApacheHttpClientExecuteSSRF.java:38:28:38:33 | uriReq | provenance | Sink:MaD:240 |
+| ApacheHttpClientExecuteSSRF.java:27:37:27:70 | build(...) : HttpUriRequest | ApacheHttpClientExecuteSSRF.java:39:28:39:33 | uriReq | provenance | Sink:MaD:241 |
+| ApacheHttpClientExecuteSSRF.java:27:56:27:61 | source : String | ApacheHttpClientExecuteSSRF.java:27:37:27:62 | get(...) : RequestBuilder | provenance | MaD:317 |
+| ApacheHttpSSRF.java:27:27:27:53 | getParameter(...) : String | ApacheHttpSSRF.java:28:31:28:34 | sink : String | provenance | Src:MaD:292  |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:30:43:30:45 | uri | provenance | Sink:MaD:217 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:32:29:32:31 | uri | provenance | Sink:MaD:223 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:34:26:34:28 | uri | provenance | Sink:MaD:218 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:35:26:35:28 | uri | provenance | Sink:MaD:221 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:36:25:36:27 | uri | provenance | Sink:MaD:222 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:37:28:37:30 | uri | provenance | Sink:MaD:216 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:38:29:38:31 | uri | provenance | Sink:MaD:219 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:39:27:39:29 | uri | provenance | Sink:MaD:224 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:40:27:40:29 | uri | provenance | Sink:MaD:220 |
 | ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:42:62:42:64 | uri : URI | provenance |  |
 | ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:43:41:43:43 | uri : URI | provenance |  |
 | ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:44:41:44:43 | uri : URI | provenance |  |
 | ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:46:77:46:79 | uri : URI | provenance |  |
 | ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:47:56:47:58 | uri : URI | provenance |  |
 | ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:48:56:48:58 | uri : URI | provenance |  |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:50:32:50:34 | uri | provenance | Sink:MaD:220 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:51:33:51:35 | uri | provenance | Sink:MaD:224 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:52:32:52:34 | uri | provenance | Sink:MaD:225 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:53:35:53:37 | uri | provenance | Sink:MaD:219 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:54:36:54:38 | uri | provenance | Sink:MaD:222 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:55:33:55:35 | uri | provenance | Sink:MaD:221 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:56:34:56:36 | uri | provenance | Sink:MaD:227 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:57:34:57:36 | uri | provenance | Sink:MaD:223 |
-| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:58:43:58:45 | uri | provenance | Sink:MaD:226 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:50:32:50:34 | uri | provenance | Sink:MaD:226 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:51:33:51:35 | uri | provenance | Sink:MaD:230 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:52:32:52:34 | uri | provenance | Sink:MaD:231 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:53:35:53:37 | uri | provenance | Sink:MaD:225 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:54:36:54:38 | uri | provenance | Sink:MaD:228 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:55:33:55:35 | uri | provenance | Sink:MaD:227 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:56:34:56:36 | uri | provenance | Sink:MaD:233 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:57:34:57:36 | uri | provenance | Sink:MaD:229 |
+| ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:58:43:58:45 | uri | provenance | Sink:MaD:232 |
 | ApacheHttpSSRF.java:28:31:28:34 | sink : String | ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | provenance | Config |
-| ApacheHttpSSRF.java:28:31:28:34 | sink : String | ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | provenance | MaD:294 |
-| ApacheHttpSSRF.java:42:62:42:64 | uri : URI | ApacheHttpSSRF.java:42:62:42:75 | toString(...) : String | provenance | MaD:297 |
-| ApacheHttpSSRF.java:42:62:42:75 | toString(...) : String | ApacheHttpSSRF.java:42:34:42:82 | new BasicRequestLine(...) | provenance | MaD:308 Sink:MaD:239 |
-| ApacheHttpSSRF.java:43:41:43:43 | uri : URI | ApacheHttpSSRF.java:43:41:43:54 | toString(...) | provenance | MaD:297 Sink:MaD:240 |
-| ApacheHttpSSRF.java:44:41:44:43 | uri : URI | ApacheHttpSSRF.java:44:41:44:54 | toString(...) | provenance | MaD:297 Sink:MaD:241 |
-| ApacheHttpSSRF.java:46:77:46:79 | uri : URI | ApacheHttpSSRF.java:46:77:46:90 | toString(...) : String | provenance | MaD:297 |
-| ApacheHttpSSRF.java:46:77:46:90 | toString(...) : String | ApacheHttpSSRF.java:46:49:46:97 | new BasicRequestLine(...) | provenance | MaD:308 Sink:MaD:236 |
-| ApacheHttpSSRF.java:47:56:47:58 | uri : URI | ApacheHttpSSRF.java:47:56:47:69 | toString(...) | provenance | MaD:297 Sink:MaD:237 |
-| ApacheHttpSSRF.java:48:56:48:58 | uri : URI | ApacheHttpSSRF.java:48:56:48:69 | toString(...) | provenance | MaD:297 Sink:MaD:238 |
-| ApacheHttpSSRFVersion5.java:41:30:41:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:42:31:42:37 | uriSink : String | provenance | Src:MaD:286  |
+| ApacheHttpSSRF.java:28:31:28:34 | sink : String | ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | provenance | MaD:304 |
+| ApacheHttpSSRF.java:42:62:42:64 | uri : URI | ApacheHttpSSRF.java:42:62:42:75 | toString(...) : String | provenance | MaD:307 |
+| ApacheHttpSSRF.java:42:62:42:75 | toString(...) : String | ApacheHttpSSRF.java:42:34:42:82 | new BasicRequestLine(...) | provenance | MaD:318 Sink:MaD:245 |
+| ApacheHttpSSRF.java:43:41:43:43 | uri : URI | ApacheHttpSSRF.java:43:41:43:54 | toString(...) | provenance | MaD:307 Sink:MaD:246 |
+| ApacheHttpSSRF.java:44:41:44:43 | uri : URI | ApacheHttpSSRF.java:44:41:44:54 | toString(...) | provenance | MaD:307 Sink:MaD:247 |
+| ApacheHttpSSRF.java:46:77:46:79 | uri : URI | ApacheHttpSSRF.java:46:77:46:90 | toString(...) : String | provenance | MaD:307 |
+| ApacheHttpSSRF.java:46:77:46:90 | toString(...) : String | ApacheHttpSSRF.java:46:49:46:97 | new BasicRequestLine(...) | provenance | MaD:318 Sink:MaD:242 |
+| ApacheHttpSSRF.java:47:56:47:58 | uri : URI | ApacheHttpSSRF.java:47:56:47:69 | toString(...) | provenance | MaD:307 Sink:MaD:243 |
+| ApacheHttpSSRF.java:48:56:48:58 | uri : URI | ApacheHttpSSRF.java:48:56:48:69 | toString(...) | provenance | MaD:307 Sink:MaD:244 |
+| ApacheHttpSSRFVersion5.java:41:30:41:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:42:31:42:37 | uriSink : String | provenance | Src:MaD:292  |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:49:54:49:56 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:50:54:50:56 | uri | provenance | Sink:MaD:40 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:50:54:50:56 | uri | provenance | Sink:MaD:46 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:51:48:51:50 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:52:48:52:50 | uri | provenance | Sink:MaD:42 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:52:48:52:50 | uri | provenance | Sink:MaD:48 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:55:38:55:40 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:56:38:56:40 | uri | provenance | Sink:MaD:45 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:56:38:56:40 | uri | provenance | Sink:MaD:51 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:59:35:59:37 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:60:35:60:37 | uri | provenance | Sink:MaD:48 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:60:35:60:37 | uri | provenance | Sink:MaD:54 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:63:36:63:38 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:64:36:64:38 | uri | provenance | Sink:MaD:51 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:64:36:64:38 | uri | provenance | Sink:MaD:57 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:67:39:67:41 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:68:39:68:41 | uri | provenance | Sink:MaD:54 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:68:39:68:41 | uri | provenance | Sink:MaD:60 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:71:37:71:39 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:72:37:72:39 | uri | provenance | Sink:MaD:57 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:72:37:72:39 | uri | provenance | Sink:MaD:63 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:75:36:75:38 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:76:36:76:38 | uri | provenance | Sink:MaD:60 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:76:36:76:38 | uri | provenance | Sink:MaD:66 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:79:35:79:37 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:80:35:80:37 | uri | provenance | Sink:MaD:63 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:80:35:80:37 | uri | provenance | Sink:MaD:69 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:83:37:83:39 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:84:37:84:39 | uri | provenance | Sink:MaD:66 |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:88:51:88:53 | uri | provenance | Sink:MaD:68 |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:92:51:92:53 | uri | provenance | Sink:MaD:70 |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:94:45:94:47 | uri | provenance | Sink:MaD:72 |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:97:54:97:56 | uri | provenance | Sink:MaD:74 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:84:37:84:39 | uri | provenance | Sink:MaD:72 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:88:51:88:53 | uri | provenance | Sink:MaD:74 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:92:51:92:53 | uri | provenance | Sink:MaD:76 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:94:45:94:47 | uri | provenance | Sink:MaD:78 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:97:54:97:56 | uri | provenance | Sink:MaD:80 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:98:48:98:50 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:99:48:99:50 | uri | provenance | Sink:MaD:76 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:99:48:99:50 | uri | provenance | Sink:MaD:82 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:103:55:103:57 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:104:55:104:57 | uri | provenance | Sink:MaD:79 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:104:55:104:57 | uri | provenance | Sink:MaD:85 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:105:49:105:51 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:106:49:106:51 | uri | provenance | Sink:MaD:81 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:106:49:106:51 | uri | provenance | Sink:MaD:87 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:109:39:109:41 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:110:39:110:41 | uri | provenance | Sink:MaD:84 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:110:39:110:41 | uri | provenance | Sink:MaD:90 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:113:36:113:38 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:114:36:114:38 | uri | provenance | Sink:MaD:87 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:114:36:114:38 | uri | provenance | Sink:MaD:93 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:117:37:117:39 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:118:37:118:39 | uri | provenance | Sink:MaD:90 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:118:37:118:39 | uri | provenance | Sink:MaD:96 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:121:40:121:42 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:122:40:122:42 | uri | provenance | Sink:MaD:93 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:122:40:122:42 | uri | provenance | Sink:MaD:99 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:125:38:125:40 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:126:38:126:40 | uri | provenance | Sink:MaD:96 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:126:38:126:40 | uri | provenance | Sink:MaD:102 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:129:37:129:39 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:130:37:130:39 | uri | provenance | Sink:MaD:99 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:130:37:130:39 | uri | provenance | Sink:MaD:105 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:133:36:133:38 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:134:36:134:38 | uri | provenance | Sink:MaD:102 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:134:36:134:38 | uri | provenance | Sink:MaD:108 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:137:38:137:40 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:138:38:138:40 | uri | provenance | Sink:MaD:105 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:138:38:138:40 | uri | provenance | Sink:MaD:111 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:141:41:141:43 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:142:41:142:43 | uri | provenance | Sink:MaD:107 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:142:41:142:43 | uri | provenance | Sink:MaD:113 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:144:38:144:40 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:145:38:145:40 | uri | provenance | Sink:MaD:109 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:145:38:145:40 | uri | provenance | Sink:MaD:115 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:147:39:147:41 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:148:39:148:41 | uri | provenance | Sink:MaD:111 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:148:39:148:41 | uri | provenance | Sink:MaD:117 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:150:42:150:44 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:151:42:151:44 | uri | provenance | Sink:MaD:113 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:151:42:151:44 | uri | provenance | Sink:MaD:119 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:153:40:153:42 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:154:40:154:42 | uri | provenance | Sink:MaD:115 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:154:40:154:42 | uri | provenance | Sink:MaD:121 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:156:39:156:41 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:157:39:157:41 | uri | provenance | Sink:MaD:117 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:157:39:157:41 | uri | provenance | Sink:MaD:123 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:159:38:159:40 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:160:38:160:40 | uri | provenance | Sink:MaD:119 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:160:38:160:40 | uri | provenance | Sink:MaD:125 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:164:47:164:49 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:165:47:165:49 | uri | provenance | Sink:MaD:206 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:165:47:165:49 | uri | provenance | Sink:MaD:212 |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:167:40:167:42 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:168:40:168:42 | uri | provenance | Sink:MaD:121 |
+| ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:168:40:168:42 | uri | provenance | Sink:MaD:127 |
 | ApacheHttpSSRFVersion5.java:42:31:42:37 | uriSink : String | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | provenance | Config |
-| ApacheHttpSSRFVersion5.java:42:31:42:37 | uriSink : String | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | provenance | MaD:294 |
-| ApacheHttpSSRFVersion5.java:44:31:44:58 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:45:42:45:49 | hostSink : String | provenance | Src:MaD:286  |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:48:54:48:57 | host | provenance | Sink:MaD:38 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:54:38:54:41 | host | provenance | Sink:MaD:43 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:58:35:58:38 | host | provenance | Sink:MaD:46 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:62:36:62:39 | host | provenance | Sink:MaD:49 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:66:39:66:42 | host | provenance | Sink:MaD:52 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:70:37:70:40 | host | provenance | Sink:MaD:55 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:74:36:74:39 | host | provenance | Sink:MaD:58 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:78:35:78:38 | host | provenance | Sink:MaD:61 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:82:37:82:40 | host | provenance | Sink:MaD:64 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:87:51:87:54 | host | provenance | Sink:MaD:67 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:91:51:91:54 | host | provenance | Sink:MaD:69 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:93:45:93:48 | host | provenance | Sink:MaD:71 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:96:54:96:57 | host | provenance | Sink:MaD:73 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:102:55:102:58 | host | provenance | Sink:MaD:77 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:108:39:108:42 | host | provenance | Sink:MaD:82 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:112:36:112:39 | host | provenance | Sink:MaD:85 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:116:37:116:40 | host | provenance | Sink:MaD:88 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:120:40:120:43 | host | provenance | Sink:MaD:91 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:124:38:124:41 | host | provenance | Sink:MaD:94 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:128:37:128:40 | host | provenance | Sink:MaD:97 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:132:36:132:39 | host | provenance | Sink:MaD:100 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:136:38:136:41 | host | provenance | Sink:MaD:103 |
-| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:162:52:162:55 | host | provenance | Sink:MaD:204 |
-| ApacheHttpSSRFVersion5.java:45:42:45:49 | hostSink : String | ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | provenance | MaD:305 |
-| ApacheHttpSSRFVersion5.java:49:54:49:56 | uri : URI | ApacheHttpSSRFVersion5.java:49:54:49:67 | toString(...) | provenance | MaD:297 Sink:MaD:39 |
-| ApacheHttpSSRFVersion5.java:51:48:51:50 | uri : URI | ApacheHttpSSRFVersion5.java:51:48:51:61 | toString(...) | provenance | MaD:297 Sink:MaD:41 |
-| ApacheHttpSSRFVersion5.java:55:38:55:40 | uri : URI | ApacheHttpSSRFVersion5.java:55:38:55:51 | toString(...) | provenance | MaD:297 Sink:MaD:44 |
-| ApacheHttpSSRFVersion5.java:59:35:59:37 | uri : URI | ApacheHttpSSRFVersion5.java:59:35:59:48 | toString(...) | provenance | MaD:297 Sink:MaD:47 |
-| ApacheHttpSSRFVersion5.java:63:36:63:38 | uri : URI | ApacheHttpSSRFVersion5.java:63:36:63:49 | toString(...) | provenance | MaD:297 Sink:MaD:50 |
-| ApacheHttpSSRFVersion5.java:67:39:67:41 | uri : URI | ApacheHttpSSRFVersion5.java:67:39:67:52 | toString(...) | provenance | MaD:297 Sink:MaD:53 |
-| ApacheHttpSSRFVersion5.java:71:37:71:39 | uri : URI | ApacheHttpSSRFVersion5.java:71:37:71:50 | toString(...) | provenance | MaD:297 Sink:MaD:56 |
-| ApacheHttpSSRFVersion5.java:75:36:75:38 | uri : URI | ApacheHttpSSRFVersion5.java:75:36:75:49 | toString(...) | provenance | MaD:297 Sink:MaD:59 |
-| ApacheHttpSSRFVersion5.java:79:35:79:37 | uri : URI | ApacheHttpSSRFVersion5.java:79:35:79:48 | toString(...) | provenance | MaD:297 Sink:MaD:62 |
-| ApacheHttpSSRFVersion5.java:83:37:83:39 | uri : URI | ApacheHttpSSRFVersion5.java:83:37:83:50 | toString(...) | provenance | MaD:297 Sink:MaD:65 |
-| ApacheHttpSSRFVersion5.java:98:48:98:50 | uri : URI | ApacheHttpSSRFVersion5.java:98:48:98:61 | toString(...) | provenance | MaD:297 Sink:MaD:75 |
-| ApacheHttpSSRFVersion5.java:103:55:103:57 | uri : URI | ApacheHttpSSRFVersion5.java:103:55:103:68 | toString(...) | provenance | MaD:297 Sink:MaD:78 |
-| ApacheHttpSSRFVersion5.java:105:49:105:51 | uri : URI | ApacheHttpSSRFVersion5.java:105:49:105:62 | toString(...) | provenance | MaD:297 Sink:MaD:80 |
-| ApacheHttpSSRFVersion5.java:109:39:109:41 | uri : URI | ApacheHttpSSRFVersion5.java:109:39:109:52 | toString(...) | provenance | MaD:297 Sink:MaD:83 |
-| ApacheHttpSSRFVersion5.java:113:36:113:38 | uri : URI | ApacheHttpSSRFVersion5.java:113:36:113:49 | toString(...) | provenance | MaD:297 Sink:MaD:86 |
-| ApacheHttpSSRFVersion5.java:117:37:117:39 | uri : URI | ApacheHttpSSRFVersion5.java:117:37:117:50 | toString(...) | provenance | MaD:297 Sink:MaD:89 |
-| ApacheHttpSSRFVersion5.java:121:40:121:42 | uri : URI | ApacheHttpSSRFVersion5.java:121:40:121:53 | toString(...) | provenance | MaD:297 Sink:MaD:92 |
-| ApacheHttpSSRFVersion5.java:125:38:125:40 | uri : URI | ApacheHttpSSRFVersion5.java:125:38:125:51 | toString(...) | provenance | MaD:297 Sink:MaD:95 |
-| ApacheHttpSSRFVersion5.java:129:37:129:39 | uri : URI | ApacheHttpSSRFVersion5.java:129:37:129:50 | toString(...) | provenance | MaD:297 Sink:MaD:98 |
-| ApacheHttpSSRFVersion5.java:133:36:133:38 | uri : URI | ApacheHttpSSRFVersion5.java:133:36:133:49 | toString(...) | provenance | MaD:297 Sink:MaD:101 |
-| ApacheHttpSSRFVersion5.java:137:38:137:40 | uri : URI | ApacheHttpSSRFVersion5.java:137:38:137:51 | toString(...) | provenance | MaD:297 Sink:MaD:104 |
-| ApacheHttpSSRFVersion5.java:141:41:141:43 | uri : URI | ApacheHttpSSRFVersion5.java:141:41:141:54 | toString(...) | provenance | MaD:297 Sink:MaD:106 |
-| ApacheHttpSSRFVersion5.java:144:38:144:40 | uri : URI | ApacheHttpSSRFVersion5.java:144:38:144:51 | toString(...) | provenance | MaD:297 Sink:MaD:108 |
-| ApacheHttpSSRFVersion5.java:147:39:147:41 | uri : URI | ApacheHttpSSRFVersion5.java:147:39:147:52 | toString(...) | provenance | MaD:297 Sink:MaD:110 |
-| ApacheHttpSSRFVersion5.java:150:42:150:44 | uri : URI | ApacheHttpSSRFVersion5.java:150:42:150:55 | toString(...) | provenance | MaD:297 Sink:MaD:112 |
-| ApacheHttpSSRFVersion5.java:153:40:153:42 | uri : URI | ApacheHttpSSRFVersion5.java:153:40:153:53 | toString(...) | provenance | MaD:297 Sink:MaD:114 |
-| ApacheHttpSSRFVersion5.java:156:39:156:41 | uri : URI | ApacheHttpSSRFVersion5.java:156:39:156:52 | toString(...) | provenance | MaD:297 Sink:MaD:116 |
-| ApacheHttpSSRFVersion5.java:159:38:159:40 | uri : URI | ApacheHttpSSRFVersion5.java:159:38:159:51 | toString(...) | provenance | MaD:297 Sink:MaD:118 |
-| ApacheHttpSSRFVersion5.java:164:47:164:49 | uri : URI | ApacheHttpSSRFVersion5.java:164:47:164:60 | toString(...) | provenance | MaD:297 Sink:MaD:205 |
-| ApacheHttpSSRFVersion5.java:167:40:167:42 | uri : URI | ApacheHttpSSRFVersion5.java:167:40:167:53 | toString(...) | provenance | MaD:297 Sink:MaD:120 |
-| ApacheHttpSSRFVersion5.java:180:30:180:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:181:31:181:37 | uriSink : String | provenance | Src:MaD:286  |
+| ApacheHttpSSRFVersion5.java:42:31:42:37 | uriSink : String | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | provenance | MaD:304 |
+| ApacheHttpSSRFVersion5.java:44:31:44:58 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:45:42:45:49 | hostSink : String | provenance | Src:MaD:292  |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:48:54:48:57 | host | provenance | Sink:MaD:44 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:54:38:54:41 | host | provenance | Sink:MaD:49 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:58:35:58:38 | host | provenance | Sink:MaD:52 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:62:36:62:39 | host | provenance | Sink:MaD:55 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:66:39:66:42 | host | provenance | Sink:MaD:58 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:70:37:70:40 | host | provenance | Sink:MaD:61 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:74:36:74:39 | host | provenance | Sink:MaD:64 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:78:35:78:38 | host | provenance | Sink:MaD:67 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:82:37:82:40 | host | provenance | Sink:MaD:70 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:87:51:87:54 | host | provenance | Sink:MaD:73 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:91:51:91:54 | host | provenance | Sink:MaD:75 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:93:45:93:48 | host | provenance | Sink:MaD:77 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:96:54:96:57 | host | provenance | Sink:MaD:79 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:102:55:102:58 | host | provenance | Sink:MaD:83 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:108:39:108:42 | host | provenance | Sink:MaD:88 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:112:36:112:39 | host | provenance | Sink:MaD:91 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:116:37:116:40 | host | provenance | Sink:MaD:94 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:120:40:120:43 | host | provenance | Sink:MaD:97 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:124:38:124:41 | host | provenance | Sink:MaD:100 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:128:37:128:40 | host | provenance | Sink:MaD:103 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:132:36:132:39 | host | provenance | Sink:MaD:106 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:136:38:136:41 | host | provenance | Sink:MaD:109 |
+| ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:162:52:162:55 | host | provenance | Sink:MaD:210 |
+| ApacheHttpSSRFVersion5.java:45:42:45:49 | hostSink : String | ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | provenance | MaD:315 |
+| ApacheHttpSSRFVersion5.java:49:54:49:56 | uri : URI | ApacheHttpSSRFVersion5.java:49:54:49:67 | toString(...) | provenance | MaD:307 Sink:MaD:45 |
+| ApacheHttpSSRFVersion5.java:51:48:51:50 | uri : URI | ApacheHttpSSRFVersion5.java:51:48:51:61 | toString(...) | provenance | MaD:307 Sink:MaD:47 |
+| ApacheHttpSSRFVersion5.java:55:38:55:40 | uri : URI | ApacheHttpSSRFVersion5.java:55:38:55:51 | toString(...) | provenance | MaD:307 Sink:MaD:50 |
+| ApacheHttpSSRFVersion5.java:59:35:59:37 | uri : URI | ApacheHttpSSRFVersion5.java:59:35:59:48 | toString(...) | provenance | MaD:307 Sink:MaD:53 |
+| ApacheHttpSSRFVersion5.java:63:36:63:38 | uri : URI | ApacheHttpSSRFVersion5.java:63:36:63:49 | toString(...) | provenance | MaD:307 Sink:MaD:56 |
+| ApacheHttpSSRFVersion5.java:67:39:67:41 | uri : URI | ApacheHttpSSRFVersion5.java:67:39:67:52 | toString(...) | provenance | MaD:307 Sink:MaD:59 |
+| ApacheHttpSSRFVersion5.java:71:37:71:39 | uri : URI | ApacheHttpSSRFVersion5.java:71:37:71:50 | toString(...) | provenance | MaD:307 Sink:MaD:62 |
+| ApacheHttpSSRFVersion5.java:75:36:75:38 | uri : URI | ApacheHttpSSRFVersion5.java:75:36:75:49 | toString(...) | provenance | MaD:307 Sink:MaD:65 |
+| ApacheHttpSSRFVersion5.java:79:35:79:37 | uri : URI | ApacheHttpSSRFVersion5.java:79:35:79:48 | toString(...) | provenance | MaD:307 Sink:MaD:68 |
+| ApacheHttpSSRFVersion5.java:83:37:83:39 | uri : URI | ApacheHttpSSRFVersion5.java:83:37:83:50 | toString(...) | provenance | MaD:307 Sink:MaD:71 |
+| ApacheHttpSSRFVersion5.java:98:48:98:50 | uri : URI | ApacheHttpSSRFVersion5.java:98:48:98:61 | toString(...) | provenance | MaD:307 Sink:MaD:81 |
+| ApacheHttpSSRFVersion5.java:103:55:103:57 | uri : URI | ApacheHttpSSRFVersion5.java:103:55:103:68 | toString(...) | provenance | MaD:307 Sink:MaD:84 |
+| ApacheHttpSSRFVersion5.java:105:49:105:51 | uri : URI | ApacheHttpSSRFVersion5.java:105:49:105:62 | toString(...) | provenance | MaD:307 Sink:MaD:86 |
+| ApacheHttpSSRFVersion5.java:109:39:109:41 | uri : URI | ApacheHttpSSRFVersion5.java:109:39:109:52 | toString(...) | provenance | MaD:307 Sink:MaD:89 |
+| ApacheHttpSSRFVersion5.java:113:36:113:38 | uri : URI | ApacheHttpSSRFVersion5.java:113:36:113:49 | toString(...) | provenance | MaD:307 Sink:MaD:92 |
+| ApacheHttpSSRFVersion5.java:117:37:117:39 | uri : URI | ApacheHttpSSRFVersion5.java:117:37:117:50 | toString(...) | provenance | MaD:307 Sink:MaD:95 |
+| ApacheHttpSSRFVersion5.java:121:40:121:42 | uri : URI | ApacheHttpSSRFVersion5.java:121:40:121:53 | toString(...) | provenance | MaD:307 Sink:MaD:98 |
+| ApacheHttpSSRFVersion5.java:125:38:125:40 | uri : URI | ApacheHttpSSRFVersion5.java:125:38:125:51 | toString(...) | provenance | MaD:307 Sink:MaD:101 |
+| ApacheHttpSSRFVersion5.java:129:37:129:39 | uri : URI | ApacheHttpSSRFVersion5.java:129:37:129:50 | toString(...) | provenance | MaD:307 Sink:MaD:104 |
+| ApacheHttpSSRFVersion5.java:133:36:133:38 | uri : URI | ApacheHttpSSRFVersion5.java:133:36:133:49 | toString(...) | provenance | MaD:307 Sink:MaD:107 |
+| ApacheHttpSSRFVersion5.java:137:38:137:40 | uri : URI | ApacheHttpSSRFVersion5.java:137:38:137:51 | toString(...) | provenance | MaD:307 Sink:MaD:110 |
+| ApacheHttpSSRFVersion5.java:141:41:141:43 | uri : URI | ApacheHttpSSRFVersion5.java:141:41:141:54 | toString(...) | provenance | MaD:307 Sink:MaD:112 |
+| ApacheHttpSSRFVersion5.java:144:38:144:40 | uri : URI | ApacheHttpSSRFVersion5.java:144:38:144:51 | toString(...) | provenance | MaD:307 Sink:MaD:114 |
+| ApacheHttpSSRFVersion5.java:147:39:147:41 | uri : URI | ApacheHttpSSRFVersion5.java:147:39:147:52 | toString(...) | provenance | MaD:307 Sink:MaD:116 |
+| ApacheHttpSSRFVersion5.java:150:42:150:44 | uri : URI | ApacheHttpSSRFVersion5.java:150:42:150:55 | toString(...) | provenance | MaD:307 Sink:MaD:118 |
+| ApacheHttpSSRFVersion5.java:153:40:153:42 | uri : URI | ApacheHttpSSRFVersion5.java:153:40:153:53 | toString(...) | provenance | MaD:307 Sink:MaD:120 |
+| ApacheHttpSSRFVersion5.java:156:39:156:41 | uri : URI | ApacheHttpSSRFVersion5.java:156:39:156:52 | toString(...) | provenance | MaD:307 Sink:MaD:122 |
+| ApacheHttpSSRFVersion5.java:159:38:159:40 | uri : URI | ApacheHttpSSRFVersion5.java:159:38:159:51 | toString(...) | provenance | MaD:307 Sink:MaD:124 |
+| ApacheHttpSSRFVersion5.java:164:47:164:49 | uri : URI | ApacheHttpSSRFVersion5.java:164:47:164:60 | toString(...) | provenance | MaD:307 Sink:MaD:211 |
+| ApacheHttpSSRFVersion5.java:167:40:167:42 | uri : URI | ApacheHttpSSRFVersion5.java:167:40:167:53 | toString(...) | provenance | MaD:307 Sink:MaD:126 |
+| ApacheHttpSSRFVersion5.java:180:30:180:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:181:31:181:37 | uriSink : String | provenance | Src:MaD:292  |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:184:56:184:58 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:185:56:185:58 | uri | provenance | Sink:MaD:123 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:185:56:185:58 | uri | provenance | Sink:MaD:129 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:186:50:186:52 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:187:50:187:52 | uri | provenance | Sink:MaD:125 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:187:50:187:52 | uri | provenance | Sink:MaD:131 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:189:40:189:42 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:190:40:190:42 | uri | provenance | Sink:MaD:127 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:190:40:190:42 | uri | provenance | Sink:MaD:133 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:192:37:192:39 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:193:37:193:39 | uri | provenance | Sink:MaD:129 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:193:37:193:39 | uri | provenance | Sink:MaD:135 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:195:38:195:40 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:196:38:196:40 | uri | provenance | Sink:MaD:131 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:196:38:196:40 | uri | provenance | Sink:MaD:137 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:198:41:198:43 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:199:41:199:43 | uri | provenance | Sink:MaD:133 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:199:41:199:43 | uri | provenance | Sink:MaD:139 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:201:39:201:41 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:202:39:202:41 | uri | provenance | Sink:MaD:135 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:202:39:202:41 | uri | provenance | Sink:MaD:141 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:204:38:204:40 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:205:38:205:40 | uri | provenance | Sink:MaD:137 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:205:38:205:40 | uri | provenance | Sink:MaD:143 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:207:37:207:39 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:208:37:208:39 | uri | provenance | Sink:MaD:139 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:208:37:208:39 | uri | provenance | Sink:MaD:145 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:210:39:210:41 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:211:39:211:41 | uri | provenance | Sink:MaD:141 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:211:39:211:41 | uri | provenance | Sink:MaD:147 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:214:28:214:30 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:215:28:215:30 | uri | provenance | Sink:MaD:143 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:215:28:215:30 | uri | provenance | Sink:MaD:149 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:217:25:217:27 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:218:25:218:27 | uri | provenance | Sink:MaD:145 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:218:25:218:27 | uri | provenance | Sink:MaD:151 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:220:26:220:28 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:221:26:221:28 | uri | provenance | Sink:MaD:147 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:221:26:221:28 | uri | provenance | Sink:MaD:153 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:223:29:223:31 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:224:29:224:31 | uri | provenance | Sink:MaD:149 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:224:29:224:31 | uri | provenance | Sink:MaD:155 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:226:27:226:29 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:227:27:227:29 | uri | provenance | Sink:MaD:151 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:227:27:227:29 | uri | provenance | Sink:MaD:157 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:229:26:229:28 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:230:26:230:28 | uri | provenance | Sink:MaD:153 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:230:26:230:28 | uri | provenance | Sink:MaD:159 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:232:25:232:27 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:233:25:233:27 | uri | provenance | Sink:MaD:155 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:233:25:233:27 | uri | provenance | Sink:MaD:161 |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:235:27:235:29 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:236:27:236:29 | uri | provenance | Sink:MaD:157 |
-| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:239:46:239:48 | uri | provenance | Sink:MaD:158 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:236:27:236:29 | uri | provenance | Sink:MaD:163 |
+| ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:239:46:239:48 | uri | provenance | Sink:MaD:164 |
 | ApacheHttpSSRFVersion5.java:181:31:181:37 | uriSink : String | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | provenance | Config |
-| ApacheHttpSSRFVersion5.java:181:31:181:37 | uriSink : String | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | provenance | MaD:294 |
-| ApacheHttpSSRFVersion5.java:184:56:184:58 | uri : URI | ApacheHttpSSRFVersion5.java:184:56:184:69 | toString(...) | provenance | MaD:297 Sink:MaD:122 |
-| ApacheHttpSSRFVersion5.java:186:50:186:52 | uri : URI | ApacheHttpSSRFVersion5.java:186:50:186:63 | toString(...) | provenance | MaD:297 Sink:MaD:124 |
-| ApacheHttpSSRFVersion5.java:189:40:189:42 | uri : URI | ApacheHttpSSRFVersion5.java:189:40:189:53 | toString(...) | provenance | MaD:297 Sink:MaD:126 |
-| ApacheHttpSSRFVersion5.java:192:37:192:39 | uri : URI | ApacheHttpSSRFVersion5.java:192:37:192:50 | toString(...) | provenance | MaD:297 Sink:MaD:128 |
-| ApacheHttpSSRFVersion5.java:195:38:195:40 | uri : URI | ApacheHttpSSRFVersion5.java:195:38:195:51 | toString(...) | provenance | MaD:297 Sink:MaD:130 |
-| ApacheHttpSSRFVersion5.java:198:41:198:43 | uri : URI | ApacheHttpSSRFVersion5.java:198:41:198:54 | toString(...) | provenance | MaD:297 Sink:MaD:132 |
-| ApacheHttpSSRFVersion5.java:201:39:201:41 | uri : URI | ApacheHttpSSRFVersion5.java:201:39:201:52 | toString(...) | provenance | MaD:297 Sink:MaD:134 |
-| ApacheHttpSSRFVersion5.java:204:38:204:40 | uri : URI | ApacheHttpSSRFVersion5.java:204:38:204:51 | toString(...) | provenance | MaD:297 Sink:MaD:136 |
-| ApacheHttpSSRFVersion5.java:207:37:207:39 | uri : URI | ApacheHttpSSRFVersion5.java:207:37:207:50 | toString(...) | provenance | MaD:297 Sink:MaD:138 |
-| ApacheHttpSSRFVersion5.java:210:39:210:41 | uri : URI | ApacheHttpSSRFVersion5.java:210:39:210:52 | toString(...) | provenance | MaD:297 Sink:MaD:140 |
-| ApacheHttpSSRFVersion5.java:214:28:214:30 | uri : URI | ApacheHttpSSRFVersion5.java:214:28:214:41 | toString(...) | provenance | MaD:297 Sink:MaD:142 |
-| ApacheHttpSSRFVersion5.java:217:25:217:27 | uri : URI | ApacheHttpSSRFVersion5.java:217:25:217:38 | toString(...) | provenance | MaD:297 Sink:MaD:144 |
-| ApacheHttpSSRFVersion5.java:220:26:220:28 | uri : URI | ApacheHttpSSRFVersion5.java:220:26:220:39 | toString(...) | provenance | MaD:297 Sink:MaD:146 |
-| ApacheHttpSSRFVersion5.java:223:29:223:31 | uri : URI | ApacheHttpSSRFVersion5.java:223:29:223:42 | toString(...) | provenance | MaD:297 Sink:MaD:148 |
-| ApacheHttpSSRFVersion5.java:226:27:226:29 | uri : URI | ApacheHttpSSRFVersion5.java:226:27:226:40 | toString(...) | provenance | MaD:297 Sink:MaD:150 |
-| ApacheHttpSSRFVersion5.java:229:26:229:28 | uri : URI | ApacheHttpSSRFVersion5.java:229:26:229:39 | toString(...) | provenance | MaD:297 Sink:MaD:152 |
-| ApacheHttpSSRFVersion5.java:232:25:232:27 | uri : URI | ApacheHttpSSRFVersion5.java:232:25:232:38 | toString(...) | provenance | MaD:297 Sink:MaD:154 |
-| ApacheHttpSSRFVersion5.java:235:27:235:29 | uri : URI | ApacheHttpSSRFVersion5.java:235:27:235:40 | toString(...) | provenance | MaD:297 Sink:MaD:156 |
-| ApacheHttpSSRFVersion5.java:251:30:251:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:252:31:252:37 | uriSink : String | provenance | Src:MaD:286  |
-| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:255:44:255:46 | uri | provenance | Sink:MaD:159 |
+| ApacheHttpSSRFVersion5.java:181:31:181:37 | uriSink : String | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | provenance | MaD:304 |
+| ApacheHttpSSRFVersion5.java:184:56:184:58 | uri : URI | ApacheHttpSSRFVersion5.java:184:56:184:69 | toString(...) | provenance | MaD:307 Sink:MaD:128 |
+| ApacheHttpSSRFVersion5.java:186:50:186:52 | uri : URI | ApacheHttpSSRFVersion5.java:186:50:186:63 | toString(...) | provenance | MaD:307 Sink:MaD:130 |
+| ApacheHttpSSRFVersion5.java:189:40:189:42 | uri : URI | ApacheHttpSSRFVersion5.java:189:40:189:53 | toString(...) | provenance | MaD:307 Sink:MaD:132 |
+| ApacheHttpSSRFVersion5.java:192:37:192:39 | uri : URI | ApacheHttpSSRFVersion5.java:192:37:192:50 | toString(...) | provenance | MaD:307 Sink:MaD:134 |
+| ApacheHttpSSRFVersion5.java:195:38:195:40 | uri : URI | ApacheHttpSSRFVersion5.java:195:38:195:51 | toString(...) | provenance | MaD:307 Sink:MaD:136 |
+| ApacheHttpSSRFVersion5.java:198:41:198:43 | uri : URI | ApacheHttpSSRFVersion5.java:198:41:198:54 | toString(...) | provenance | MaD:307 Sink:MaD:138 |
+| ApacheHttpSSRFVersion5.java:201:39:201:41 | uri : URI | ApacheHttpSSRFVersion5.java:201:39:201:52 | toString(...) | provenance | MaD:307 Sink:MaD:140 |
+| ApacheHttpSSRFVersion5.java:204:38:204:40 | uri : URI | ApacheHttpSSRFVersion5.java:204:38:204:51 | toString(...) | provenance | MaD:307 Sink:MaD:142 |
+| ApacheHttpSSRFVersion5.java:207:37:207:39 | uri : URI | ApacheHttpSSRFVersion5.java:207:37:207:50 | toString(...) | provenance | MaD:307 Sink:MaD:144 |
+| ApacheHttpSSRFVersion5.java:210:39:210:41 | uri : URI | ApacheHttpSSRFVersion5.java:210:39:210:52 | toString(...) | provenance | MaD:307 Sink:MaD:146 |
+| ApacheHttpSSRFVersion5.java:214:28:214:30 | uri : URI | ApacheHttpSSRFVersion5.java:214:28:214:41 | toString(...) | provenance | MaD:307 Sink:MaD:148 |
+| ApacheHttpSSRFVersion5.java:217:25:217:27 | uri : URI | ApacheHttpSSRFVersion5.java:217:25:217:38 | toString(...) | provenance | MaD:307 Sink:MaD:150 |
+| ApacheHttpSSRFVersion5.java:220:26:220:28 | uri : URI | ApacheHttpSSRFVersion5.java:220:26:220:39 | toString(...) | provenance | MaD:307 Sink:MaD:152 |
+| ApacheHttpSSRFVersion5.java:223:29:223:31 | uri : URI | ApacheHttpSSRFVersion5.java:223:29:223:42 | toString(...) | provenance | MaD:307 Sink:MaD:154 |
+| ApacheHttpSSRFVersion5.java:226:27:226:29 | uri : URI | ApacheHttpSSRFVersion5.java:226:27:226:40 | toString(...) | provenance | MaD:307 Sink:MaD:156 |
+| ApacheHttpSSRFVersion5.java:229:26:229:28 | uri : URI | ApacheHttpSSRFVersion5.java:229:26:229:39 | toString(...) | provenance | MaD:307 Sink:MaD:158 |
+| ApacheHttpSSRFVersion5.java:232:25:232:27 | uri : URI | ApacheHttpSSRFVersion5.java:232:25:232:38 | toString(...) | provenance | MaD:307 Sink:MaD:160 |
+| ApacheHttpSSRFVersion5.java:235:27:235:29 | uri : URI | ApacheHttpSSRFVersion5.java:235:27:235:40 | toString(...) | provenance | MaD:307 Sink:MaD:162 |
+| ApacheHttpSSRFVersion5.java:251:30:251:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:252:31:252:37 | uriSink : String | provenance | Src:MaD:292  |
+| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:255:44:255:46 | uri | provenance | Sink:MaD:165 |
 | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:256:38:256:40 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:257:38:257:40 | uri | provenance | Sink:MaD:161 |
+| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:257:38:257:40 | uri | provenance | Sink:MaD:167 |
 | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:259:28:259:30 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:260:28:260:30 | uri | provenance | Sink:MaD:163 |
+| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:260:28:260:30 | uri | provenance | Sink:MaD:169 |
 | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:262:25:262:27 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:263:25:263:27 | uri | provenance | Sink:MaD:165 |
+| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:263:25:263:27 | uri | provenance | Sink:MaD:171 |
 | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:265:26:265:28 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:266:26:266:28 | uri | provenance | Sink:MaD:167 |
+| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:266:26:266:28 | uri | provenance | Sink:MaD:173 |
 | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:268:29:268:31 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:269:29:269:31 | uri | provenance | Sink:MaD:169 |
+| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:269:29:269:31 | uri | provenance | Sink:MaD:175 |
 | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:271:27:271:29 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:272:27:272:29 | uri | provenance | Sink:MaD:171 |
+| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:272:27:272:29 | uri | provenance | Sink:MaD:177 |
 | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:274:26:274:28 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:275:26:275:28 | uri | provenance | Sink:MaD:173 |
+| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:275:26:275:28 | uri | provenance | Sink:MaD:179 |
 | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:277:25:277:27 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:278:25:278:27 | uri | provenance | Sink:MaD:175 |
+| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:278:25:278:27 | uri | provenance | Sink:MaD:181 |
 | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:280:27:280:29 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:281:27:281:29 | uri | provenance | Sink:MaD:177 |
+| ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:281:27:281:29 | uri | provenance | Sink:MaD:183 |
 | ApacheHttpSSRFVersion5.java:252:31:252:37 | uriSink : String | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | provenance | Config |
-| ApacheHttpSSRFVersion5.java:252:31:252:37 | uriSink : String | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | provenance | MaD:294 |
-| ApacheHttpSSRFVersion5.java:256:38:256:40 | uri : URI | ApacheHttpSSRFVersion5.java:256:38:256:51 | toString(...) | provenance | MaD:297 Sink:MaD:160 |
-| ApacheHttpSSRFVersion5.java:259:28:259:30 | uri : URI | ApacheHttpSSRFVersion5.java:259:28:259:41 | toString(...) | provenance | MaD:297 Sink:MaD:162 |
-| ApacheHttpSSRFVersion5.java:262:25:262:27 | uri : URI | ApacheHttpSSRFVersion5.java:262:25:262:38 | toString(...) | provenance | MaD:297 Sink:MaD:164 |
-| ApacheHttpSSRFVersion5.java:265:26:265:28 | uri : URI | ApacheHttpSSRFVersion5.java:265:26:265:39 | toString(...) | provenance | MaD:297 Sink:MaD:166 |
-| ApacheHttpSSRFVersion5.java:268:29:268:31 | uri : URI | ApacheHttpSSRFVersion5.java:268:29:268:42 | toString(...) | provenance | MaD:297 Sink:MaD:168 |
-| ApacheHttpSSRFVersion5.java:271:27:271:29 | uri : URI | ApacheHttpSSRFVersion5.java:271:27:271:40 | toString(...) | provenance | MaD:297 Sink:MaD:170 |
-| ApacheHttpSSRFVersion5.java:274:26:274:28 | uri : URI | ApacheHttpSSRFVersion5.java:274:26:274:39 | toString(...) | provenance | MaD:297 Sink:MaD:172 |
-| ApacheHttpSSRFVersion5.java:277:25:277:27 | uri : URI | ApacheHttpSSRFVersion5.java:277:25:277:38 | toString(...) | provenance | MaD:297 Sink:MaD:174 |
-| ApacheHttpSSRFVersion5.java:280:27:280:29 | uri : URI | ApacheHttpSSRFVersion5.java:280:27:280:40 | toString(...) | provenance | MaD:297 Sink:MaD:176 |
-| ApacheHttpSSRFVersion5.java:295:30:295:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:296:31:296:37 | uriSink : String | provenance | Src:MaD:286  |
+| ApacheHttpSSRFVersion5.java:252:31:252:37 | uriSink : String | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | provenance | MaD:304 |
+| ApacheHttpSSRFVersion5.java:256:38:256:40 | uri : URI | ApacheHttpSSRFVersion5.java:256:38:256:51 | toString(...) | provenance | MaD:307 Sink:MaD:166 |
+| ApacheHttpSSRFVersion5.java:259:28:259:30 | uri : URI | ApacheHttpSSRFVersion5.java:259:28:259:41 | toString(...) | provenance | MaD:307 Sink:MaD:168 |
+| ApacheHttpSSRFVersion5.java:262:25:262:27 | uri : URI | ApacheHttpSSRFVersion5.java:262:25:262:38 | toString(...) | provenance | MaD:307 Sink:MaD:170 |
+| ApacheHttpSSRFVersion5.java:265:26:265:28 | uri : URI | ApacheHttpSSRFVersion5.java:265:26:265:39 | toString(...) | provenance | MaD:307 Sink:MaD:172 |
+| ApacheHttpSSRFVersion5.java:268:29:268:31 | uri : URI | ApacheHttpSSRFVersion5.java:268:29:268:42 | toString(...) | provenance | MaD:307 Sink:MaD:174 |
+| ApacheHttpSSRFVersion5.java:271:27:271:29 | uri : URI | ApacheHttpSSRFVersion5.java:271:27:271:40 | toString(...) | provenance | MaD:307 Sink:MaD:176 |
+| ApacheHttpSSRFVersion5.java:274:26:274:28 | uri : URI | ApacheHttpSSRFVersion5.java:274:26:274:39 | toString(...) | provenance | MaD:307 Sink:MaD:178 |
+| ApacheHttpSSRFVersion5.java:277:25:277:27 | uri : URI | ApacheHttpSSRFVersion5.java:277:25:277:38 | toString(...) | provenance | MaD:307 Sink:MaD:180 |
+| ApacheHttpSSRFVersion5.java:280:27:280:29 | uri : URI | ApacheHttpSSRFVersion5.java:280:27:280:40 | toString(...) | provenance | MaD:307 Sink:MaD:182 |
+| ApacheHttpSSRFVersion5.java:295:30:295:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:296:31:296:37 | uriSink : String | provenance | Src:MaD:292  |
 | ApacheHttpSSRFVersion5.java:296:23:296:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:308:60:308:62 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:296:23:296:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:309:60:309:62 | uri | provenance | Sink:MaD:209 |
+| ApacheHttpSSRFVersion5.java:296:23:296:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:309:60:309:62 | uri | provenance | Sink:MaD:215 |
 | ApacheHttpSSRFVersion5.java:296:23:296:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:313:53:313:55 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:296:23:296:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:314:53:314:55 | uri | provenance | Sink:MaD:209 |
+| ApacheHttpSSRFVersion5.java:296:23:296:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:314:53:314:55 | uri | provenance | Sink:MaD:215 |
 | ApacheHttpSSRFVersion5.java:296:31:296:37 | uriSink : String | ApacheHttpSSRFVersion5.java:296:23:296:38 | new URI(...) : URI | provenance | Config |
-| ApacheHttpSSRFVersion5.java:296:31:296:37 | uriSink : String | ApacheHttpSSRFVersion5.java:296:23:296:38 | new URI(...) : URI | provenance | MaD:294 |
-| ApacheHttpSSRFVersion5.java:298:31:298:58 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:299:42:299:49 | hostSink : String | provenance | Src:MaD:286  |
-| ApacheHttpSSRFVersion5.java:299:29:299:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:303:34:303:37 | host | provenance | Sink:MaD:178 |
-| ApacheHttpSSRFVersion5.java:299:29:299:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:304:34:304:37 | host | provenance | Sink:MaD:179 |
-| ApacheHttpSSRFVersion5.java:299:42:299:49 | hostSink : String | ApacheHttpSSRFVersion5.java:299:29:299:50 | new HttpHost(...) : HttpHost | provenance | MaD:305 |
-| ApacheHttpSSRFVersion5.java:308:60:308:62 | uri : URI | ApacheHttpSSRFVersion5.java:308:60:308:73 | toString(...) | provenance | MaD:297 Sink:MaD:208 |
-| ApacheHttpSSRFVersion5.java:313:53:313:55 | uri : URI | ApacheHttpSSRFVersion5.java:313:53:313:66 | toString(...) | provenance | MaD:297 Sink:MaD:208 |
-| ApacheHttpSSRFVersion5.java:326:30:326:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:327:31:327:37 | uriSink : String | provenance | Src:MaD:286  |
+| ApacheHttpSSRFVersion5.java:296:31:296:37 | uriSink : String | ApacheHttpSSRFVersion5.java:296:23:296:38 | new URI(...) : URI | provenance | MaD:304 |
+| ApacheHttpSSRFVersion5.java:298:31:298:58 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:299:42:299:49 | hostSink : String | provenance | Src:MaD:292  |
+| ApacheHttpSSRFVersion5.java:299:29:299:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:303:34:303:37 | host | provenance | Sink:MaD:184 |
+| ApacheHttpSSRFVersion5.java:299:29:299:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:304:34:304:37 | host | provenance | Sink:MaD:185 |
+| ApacheHttpSSRFVersion5.java:299:42:299:49 | hostSink : String | ApacheHttpSSRFVersion5.java:299:29:299:50 | new HttpHost(...) : HttpHost | provenance | MaD:315 |
+| ApacheHttpSSRFVersion5.java:308:60:308:62 | uri : URI | ApacheHttpSSRFVersion5.java:308:60:308:73 | toString(...) | provenance | MaD:307 Sink:MaD:214 |
+| ApacheHttpSSRFVersion5.java:313:53:313:55 | uri : URI | ApacheHttpSSRFVersion5.java:313:53:313:66 | toString(...) | provenance | MaD:307 Sink:MaD:214 |
+| ApacheHttpSSRFVersion5.java:326:30:326:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:327:31:327:37 | uriSink : String | provenance | Src:MaD:292  |
 | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:333:42:333:44 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:334:42:334:44 | uri | provenance | Sink:MaD:181 |
+| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:334:42:334:44 | uri | provenance | Sink:MaD:187 |
 | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:336:39:336:41 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:337:39:337:41 | uri | provenance | Sink:MaD:183 |
+| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:337:39:337:41 | uri | provenance | Sink:MaD:189 |
 | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:339:40:339:42 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:340:40:340:42 | uri | provenance | Sink:MaD:185 |
+| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:340:40:340:42 | uri | provenance | Sink:MaD:191 |
 | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:342:43:342:45 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:343:43:343:45 | uri | provenance | Sink:MaD:187 |
+| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:343:43:343:45 | uri | provenance | Sink:MaD:193 |
 | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:345:41:345:43 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:346:41:346:43 | uri | provenance | Sink:MaD:189 |
+| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:346:41:346:43 | uri | provenance | Sink:MaD:195 |
 | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:348:40:348:42 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:349:40:349:42 | uri | provenance | Sink:MaD:191 |
+| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:349:40:349:42 | uri | provenance | Sink:MaD:197 |
 | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:351:39:351:41 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:352:39:352:41 | uri | provenance | Sink:MaD:193 |
+| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:352:39:352:41 | uri | provenance | Sink:MaD:199 |
 | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:356:48:356:50 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:357:48:357:50 | uri | provenance | Sink:MaD:206 |
+| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:357:48:357:50 | uri | provenance | Sink:MaD:212 |
 | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:359:41:359:43 | uri : URI | provenance |  |
-| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:360:41:360:43 | uri | provenance | Sink:MaD:195 |
+| ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:360:41:360:43 | uri | provenance | Sink:MaD:201 |
 | ApacheHttpSSRFVersion5.java:327:31:327:37 | uriSink : String | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | provenance | Config |
-| ApacheHttpSSRFVersion5.java:327:31:327:37 | uriSink : String | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | provenance | MaD:294 |
-| ApacheHttpSSRFVersion5.java:329:31:329:58 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:330:42:330:49 | hostSink : String | provenance | Src:MaD:286  |
-| ApacheHttpSSRFVersion5.java:330:29:330:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:354:53:354:56 | host | provenance | Sink:MaD:204 |
-| ApacheHttpSSRFVersion5.java:330:42:330:49 | hostSink : String | ApacheHttpSSRFVersion5.java:330:29:330:50 | new HttpHost(...) : HttpHost | provenance | MaD:305 |
-| ApacheHttpSSRFVersion5.java:333:42:333:44 | uri : URI | ApacheHttpSSRFVersion5.java:333:42:333:55 | toString(...) | provenance | MaD:297 Sink:MaD:180 |
-| ApacheHttpSSRFVersion5.java:336:39:336:41 | uri : URI | ApacheHttpSSRFVersion5.java:336:39:336:52 | toString(...) | provenance | MaD:297 Sink:MaD:182 |
-| ApacheHttpSSRFVersion5.java:339:40:339:42 | uri : URI | ApacheHttpSSRFVersion5.java:339:40:339:53 | toString(...) | provenance | MaD:297 Sink:MaD:184 |
-| ApacheHttpSSRFVersion5.java:342:43:342:45 | uri : URI | ApacheHttpSSRFVersion5.java:342:43:342:56 | toString(...) | provenance | MaD:297 Sink:MaD:186 |
-| ApacheHttpSSRFVersion5.java:345:41:345:43 | uri : URI | ApacheHttpSSRFVersion5.java:345:41:345:54 | toString(...) | provenance | MaD:297 Sink:MaD:188 |
-| ApacheHttpSSRFVersion5.java:348:40:348:42 | uri : URI | ApacheHttpSSRFVersion5.java:348:40:348:53 | toString(...) | provenance | MaD:297 Sink:MaD:190 |
-| ApacheHttpSSRFVersion5.java:351:39:351:41 | uri : URI | ApacheHttpSSRFVersion5.java:351:39:351:52 | toString(...) | provenance | MaD:297 Sink:MaD:192 |
-| ApacheHttpSSRFVersion5.java:356:48:356:50 | uri : URI | ApacheHttpSSRFVersion5.java:356:48:356:61 | toString(...) | provenance | MaD:297 Sink:MaD:205 |
-| ApacheHttpSSRFVersion5.java:359:41:359:43 | uri : URI | ApacheHttpSSRFVersion5.java:359:41:359:54 | toString(...) | provenance | MaD:297 Sink:MaD:194 |
-| ApacheHttpSSRFVersion5.java:372:30:372:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:373:31:373:37 | uriSink : String | provenance | Src:MaD:286  |
-| ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:380:57:380:59 | uri | provenance | Sink:MaD:197 |
-| ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:382:51:382:53 | uri | provenance | Sink:MaD:199 |
-| ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:386:50:386:52 | uri | provenance | Sink:MaD:201 |
-| ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:388:44:388:46 | uri | provenance | Sink:MaD:203 |
-| ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:390:24:390:26 | uri | provenance | Sink:MaD:207 |
-| ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:394:24:394:26 | uri | provenance | Sink:MaD:207 |
+| ApacheHttpSSRFVersion5.java:327:31:327:37 | uriSink : String | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | provenance | MaD:304 |
+| ApacheHttpSSRFVersion5.java:329:31:329:58 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:330:42:330:49 | hostSink : String | provenance | Src:MaD:292  |
+| ApacheHttpSSRFVersion5.java:330:29:330:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:354:53:354:56 | host | provenance | Sink:MaD:210 |
+| ApacheHttpSSRFVersion5.java:330:42:330:49 | hostSink : String | ApacheHttpSSRFVersion5.java:330:29:330:50 | new HttpHost(...) : HttpHost | provenance | MaD:315 |
+| ApacheHttpSSRFVersion5.java:333:42:333:44 | uri : URI | ApacheHttpSSRFVersion5.java:333:42:333:55 | toString(...) | provenance | MaD:307 Sink:MaD:186 |
+| ApacheHttpSSRFVersion5.java:336:39:336:41 | uri : URI | ApacheHttpSSRFVersion5.java:336:39:336:52 | toString(...) | provenance | MaD:307 Sink:MaD:188 |
+| ApacheHttpSSRFVersion5.java:339:40:339:42 | uri : URI | ApacheHttpSSRFVersion5.java:339:40:339:53 | toString(...) | provenance | MaD:307 Sink:MaD:190 |
+| ApacheHttpSSRFVersion5.java:342:43:342:45 | uri : URI | ApacheHttpSSRFVersion5.java:342:43:342:56 | toString(...) | provenance | MaD:307 Sink:MaD:192 |
+| ApacheHttpSSRFVersion5.java:345:41:345:43 | uri : URI | ApacheHttpSSRFVersion5.java:345:41:345:54 | toString(...) | provenance | MaD:307 Sink:MaD:194 |
+| ApacheHttpSSRFVersion5.java:348:40:348:42 | uri : URI | ApacheHttpSSRFVersion5.java:348:40:348:53 | toString(...) | provenance | MaD:307 Sink:MaD:196 |
+| ApacheHttpSSRFVersion5.java:351:39:351:41 | uri : URI | ApacheHttpSSRFVersion5.java:351:39:351:52 | toString(...) | provenance | MaD:307 Sink:MaD:198 |
+| ApacheHttpSSRFVersion5.java:356:48:356:50 | uri : URI | ApacheHttpSSRFVersion5.java:356:48:356:61 | toString(...) | provenance | MaD:307 Sink:MaD:211 |
+| ApacheHttpSSRFVersion5.java:359:41:359:43 | uri : URI | ApacheHttpSSRFVersion5.java:359:41:359:54 | toString(...) | provenance | MaD:307 Sink:MaD:200 |
+| ApacheHttpSSRFVersion5.java:372:30:372:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:373:31:373:37 | uriSink : String | provenance | Src:MaD:292  |
+| ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:380:57:380:59 | uri | provenance | Sink:MaD:203 |
+| ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:382:51:382:53 | uri | provenance | Sink:MaD:205 |
+| ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:386:50:386:52 | uri | provenance | Sink:MaD:207 |
+| ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:388:44:388:46 | uri | provenance | Sink:MaD:209 |
+| ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:390:24:390:26 | uri | provenance | Sink:MaD:213 |
+| ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:394:24:394:26 | uri | provenance | Sink:MaD:213 |
 | ApacheHttpSSRFVersion5.java:373:31:373:37 | uriSink : String | ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | provenance | Config |
-| ApacheHttpSSRFVersion5.java:373:31:373:37 | uriSink : String | ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | provenance | MaD:294 |
-| ApacheHttpSSRFVersion5.java:375:31:375:58 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:376:42:376:49 | hostSink : String | provenance | Src:MaD:286  |
-| ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:379:57:379:60 | host | provenance | Sink:MaD:196 |
-| ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:381:51:381:54 | host | provenance | Sink:MaD:198 |
-| ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:385:50:385:53 | host | provenance | Sink:MaD:200 |
-| ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:387:44:387:47 | host | provenance | Sink:MaD:202 |
-| ApacheHttpSSRFVersion5.java:376:42:376:49 | hostSink : String | ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | provenance | MaD:305 |
-| JakartaWsSSRF.java:14:22:14:48 | getParameter(...) : String | JakartaWsSSRF.java:15:23:15:25 | url | provenance | Src:MaD:286 Sink:MaD:3 |
-| JavaNetHttpSSRF.java:25:27:25:53 | getParameter(...) : String | JavaNetHttpSSRF.java:26:31:26:34 | sink : String | provenance | Src:MaD:286  |
-| JavaNetHttpSSRF.java:26:23:26:35 | new URI(...) : URI | JavaNetHttpSSRF.java:39:59:39:61 | uri | provenance | Sink:MaD:6 |
+| ApacheHttpSSRFVersion5.java:373:31:373:37 | uriSink : String | ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | provenance | MaD:304 |
+| ApacheHttpSSRFVersion5.java:375:31:375:58 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:376:42:376:49 | hostSink : String | provenance | Src:MaD:292  |
+| ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:379:57:379:60 | host | provenance | Sink:MaD:202 |
+| ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:381:51:381:54 | host | provenance | Sink:MaD:204 |
+| ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:385:50:385:53 | host | provenance | Sink:MaD:206 |
+| ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:387:44:387:47 | host | provenance | Sink:MaD:208 |
+| ApacheHttpSSRFVersion5.java:376:42:376:49 | hostSink : String | ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | provenance | MaD:315 |
+| HostComparison.java:8:19:8:54 | new URI(...) : URI | HostComparison.java:9:9:9:11 | uri : URI | provenance |  |
+| HostComparison.java:8:27:8:53 | getParameter(...) : String | HostComparison.java:8:19:8:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:8:27:8:53 | getParameter(...) : String | HostComparison.java:8:19:8:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:9:9:9:11 | uri : URI | HostComparison.java:9:9:9:19 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:50:19:50:54 | new URI(...) : URI | HostComparison.java:52:13:52:15 | uri : URI | provenance |  |
+| HostComparison.java:50:27:50:53 | getParameter(...) : String | HostComparison.java:50:19:50:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:50:27:50:53 | getParameter(...) : String | HostComparison.java:50:19:50:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:52:13:52:15 | uri : URI | HostComparison.java:52:13:52:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:57:19:57:54 | new URI(...) : URI | HostComparison.java:59:13:59:15 | uri : URI | provenance |  |
+| HostComparison.java:57:27:57:53 | getParameter(...) : String | HostComparison.java:57:19:57:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:57:27:57:53 | getParameter(...) : String | HostComparison.java:57:19:57:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:59:13:59:15 | uri : URI | HostComparison.java:59:13:59:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:68:19:68:54 | new URI(...) : URI | HostComparison.java:70:13:70:15 | uri : URI | provenance |  |
+| HostComparison.java:68:27:68:53 | getParameter(...) : String | HostComparison.java:68:19:68:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:68:27:68:53 | getParameter(...) : String | HostComparison.java:68:19:68:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:70:13:70:15 | uri : URI | HostComparison.java:70:13:70:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:84:19:84:54 | new URI(...) : URI | HostComparison.java:86:13:86:15 | uri : URI | provenance |  |
+| HostComparison.java:84:27:84:53 | getParameter(...) : String | HostComparison.java:84:19:84:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:84:27:84:53 | getParameter(...) : String | HostComparison.java:84:19:84:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:86:13:86:15 | uri : URI | HostComparison.java:86:13:86:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:92:20:92:55 | new URI(...) : URI | HostComparison.java:94:13:94:16 | used : URI | provenance |  |
+| HostComparison.java:92:28:92:54 | getParameter(...) : String | HostComparison.java:92:20:92:55 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:92:28:92:54 | getParameter(...) : String | HostComparison.java:92:20:92:55 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:94:13:94:16 | used : URI | HostComparison.java:94:13:94:24 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:103:19:103:54 | new URI(...) : URI | HostComparison.java:105:13:105:15 | uri : URI | provenance |  |
+| HostComparison.java:103:27:103:53 | getParameter(...) : String | HostComparison.java:103:19:103:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:103:27:103:53 | getParameter(...) : String | HostComparison.java:103:19:103:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:105:13:105:15 | uri : URI | HostComparison.java:105:13:105:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:111:20:111:55 | new URI(...) : URI | HostComparison.java:113:13:113:16 | used : URI | provenance |  |
+| HostComparison.java:111:28:111:54 | getParameter(...) : String | HostComparison.java:111:20:111:55 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:111:28:111:54 | getParameter(...) : String | HostComparison.java:111:20:111:55 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:113:13:113:16 | used : URI | HostComparison.java:113:13:113:24 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:118:19:118:54 | new URI(...) : URI | HostComparison.java:122:13:122:15 | uri : URI | provenance |  |
+| HostComparison.java:118:27:118:53 | getParameter(...) : String | HostComparison.java:118:19:118:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:118:27:118:53 | getParameter(...) : String | HostComparison.java:118:19:118:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:122:13:122:15 | uri : URI | HostComparison.java:122:13:122:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:127:19:127:54 | new URI(...) : URI | HostComparison.java:133:13:133:15 | uri : URI | provenance |  |
+| HostComparison.java:127:27:127:53 | getParameter(...) : String | HostComparison.java:127:19:127:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:127:27:127:53 | getParameter(...) : String | HostComparison.java:127:19:127:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:133:13:133:15 | uri : URI | HostComparison.java:133:13:133:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:140:15:140:50 | new URI(...) : URI | HostComparison.java:142:13:142:15 | uri : URI | provenance |  |
+| HostComparison.java:140:23:140:49 | getParameter(...) : String | HostComparison.java:140:15:140:50 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:140:23:140:49 | getParameter(...) : String | HostComparison.java:140:15:140:50 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:142:13:142:15 | uri : URI | HostComparison.java:142:13:142:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:147:19:147:54 | new URI(...) : URI | HostComparison.java:149:13:149:15 | uri : URI | provenance |  |
+| HostComparison.java:147:27:147:53 | getParameter(...) : String | HostComparison.java:147:19:147:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:147:27:147:53 | getParameter(...) : String | HostComparison.java:147:19:147:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:149:13:149:15 | uri : URI | HostComparison.java:149:13:149:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:154:19:154:54 | new URI(...) : URI | HostComparison.java:156:13:156:15 | uri : URI | provenance |  |
+| HostComparison.java:154:27:154:53 | getParameter(...) : String | HostComparison.java:154:19:154:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:154:27:154:53 | getParameter(...) : String | HostComparison.java:154:19:154:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:156:13:156:15 | uri : URI | HostComparison.java:156:13:156:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:177:19:177:54 | new URI(...) : URI | HostComparison.java:184:17:184:19 | uri : URI | provenance |  |
+| HostComparison.java:177:27:177:53 | getParameter(...) : String | HostComparison.java:177:19:177:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:177:27:177:53 | getParameter(...) : String | HostComparison.java:177:19:177:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:184:17:184:19 | uri : URI | HostComparison.java:184:17:184:27 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:223:19:223:54 | new URI(...) : URI | HostComparison.java:226:13:226:15 | uri : URI | provenance |  |
+| HostComparison.java:223:27:223:53 | getParameter(...) : String | HostComparison.java:223:19:223:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:223:27:223:53 | getParameter(...) : String | HostComparison.java:223:19:223:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:226:13:226:15 | uri : URI | HostComparison.java:226:13:226:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:239:19:239:54 | new URI(...) : URI | HostComparison.java:242:13:242:15 | uri : URI | provenance |  |
+| HostComparison.java:239:27:239:53 | getParameter(...) : String | HostComparison.java:239:19:239:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:239:27:239:53 | getParameter(...) : String | HostComparison.java:239:19:239:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:242:13:242:15 | uri : URI | HostComparison.java:242:13:242:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:247:19:247:54 | new URI(...) : URI | HostComparison.java:250:13:250:15 | uri : URI | provenance |  |
+| HostComparison.java:247:27:247:53 | getParameter(...) : String | HostComparison.java:247:19:247:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:247:27:247:53 | getParameter(...) : String | HostComparison.java:247:19:247:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:250:13:250:15 | uri : URI | HostComparison.java:250:13:250:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:272:19:272:54 | new URI(...) : URI | HostComparison.java:276:13:276:15 | uri : URI | provenance |  |
+| HostComparison.java:272:27:272:53 | getParameter(...) : String | HostComparison.java:272:19:272:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:272:27:272:53 | getParameter(...) : String | HostComparison.java:272:19:272:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:276:13:276:15 | uri : URI | HostComparison.java:276:13:276:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| HostComparison.java:281:19:281:54 | new URI(...) : URI | HostComparison.java:285:13:285:15 | uri : URI | provenance |  |
+| HostComparison.java:281:27:281:53 | getParameter(...) : String | HostComparison.java:281:19:281:54 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| HostComparison.java:281:27:281:53 | getParameter(...) : String | HostComparison.java:281:19:281:54 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| HostComparison.java:285:13:285:15 | uri : URI | HostComparison.java:285:13:285:23 | toURL(...) | provenance | MaD:308 Sink:MaD:15 |
+| JakartaWsSSRF.java:14:22:14:48 | getParameter(...) : String | JakartaWsSSRF.java:15:23:15:25 | url | provenance | Src:MaD:292 Sink:MaD:9 |
+| JavaNetHttpSSRF.java:25:27:25:53 | getParameter(...) : String | JavaNetHttpSSRF.java:26:31:26:34 | sink : String | provenance | Src:MaD:292  |
+| JavaNetHttpSSRF.java:26:23:26:35 | new URI(...) : URI | JavaNetHttpSSRF.java:39:59:39:61 | uri | provenance | Sink:MaD:12 |
 | JavaNetHttpSSRF.java:26:31:26:34 | sink : String | JavaNetHttpSSRF.java:26:23:26:35 | new URI(...) : URI | provenance | Config |
-| JavaNetHttpSSRF.java:26:31:26:34 | sink : String | JavaNetHttpSSRF.java:26:23:26:35 | new URI(...) : URI | provenance | MaD:294 |
+| JavaNetHttpSSRF.java:26:31:26:34 | sink : String | JavaNetHttpSSRF.java:26:23:26:35 | new URI(...) : URI | provenance | MaD:304 |
 | JavaNetHttpSSRF.java:26:31:26:34 | sink : String | JavaNetHttpSSRF.java:27:40:27:43 | sink : String | provenance |  |
-| JavaNetHttpSSRF.java:27:24:27:57 | new URI(...) : URI | JavaNetHttpSSRF.java:38:65:38:68 | uri2 | provenance | Sink:MaD:5 |
+| JavaNetHttpSSRF.java:27:24:27:57 | new URI(...) : URI | JavaNetHttpSSRF.java:38:65:38:68 | uri2 | provenance | Sink:MaD:11 |
 | JavaNetHttpSSRF.java:27:40:27:43 | sink : String | JavaNetHttpSSRF.java:27:24:27:57 | new URI(...) : URI | provenance | Config |
-| JavaNetHttpSSRF.java:27:40:27:43 | sink : String | JavaNetHttpSSRF.java:27:24:27:57 | new URI(...) : URI | provenance | MaD:295 |
+| JavaNetHttpSSRF.java:27:40:27:43 | sink : String | JavaNetHttpSSRF.java:27:24:27:57 | new URI(...) : URI | provenance | MaD:305 |
 | JavaNetHttpSSRF.java:27:40:27:43 | sink : String | JavaNetHttpSSRF.java:28:32:28:35 | sink : String | provenance |  |
-| JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | JavaNetHttpSSRF.java:30:32:30:35 | url1 | provenance | Sink:MaD:9 |
-| JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | JavaNetHttpSSRF.java:33:32:33:35 | url1 | provenance | Sink:MaD:9 |
-| JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | JavaNetHttpSSRF.java:34:30:34:33 | url1 | provenance | Sink:MaD:10 |
+| JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | JavaNetHttpSSRF.java:30:32:30:35 | url1 | provenance | Sink:MaD:15 |
+| JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | JavaNetHttpSSRF.java:33:32:33:35 | url1 | provenance | Sink:MaD:15 |
+| JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | JavaNetHttpSSRF.java:34:30:34:33 | url1 | provenance | Sink:MaD:16 |
 | JavaNetHttpSSRF.java:28:32:28:35 | sink : String | JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | provenance | Config |
-| JavaNetHttpSSRF.java:28:32:28:35 | sink : String | JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | provenance | MaD:299 |
-| JaxWsSSRF.java:14:22:14:48 | getParameter(...) : String | JaxWsSSRF.java:15:23:15:25 | url | provenance | Src:MaD:286 Sink:MaD:23 |
-| JdbcUrlSSRF.java:21:26:21:56 | getParameter(...) : String | JdbcUrlSSRF.java:26:28:26:34 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:17 |
-| JdbcUrlSSRF.java:21:26:21:56 | getParameter(...) : String | JdbcUrlSSRF.java:28:41:28:47 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:18 |
-| JdbcUrlSSRF.java:21:26:21:56 | getParameter(...) : String | JdbcUrlSSRF.java:29:41:29:47 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:20 |
-| JdbcUrlSSRF.java:21:26:21:56 | getParameter(...) : String | JdbcUrlSSRF.java:30:41:30:47 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:19 |
-| JdbcUrlSSRF.java:21:26:21:56 | getParameter(...) : String | JdbcUrlSSRF.java:32:27:32:33 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:250 |
-| JdbcUrlSSRF.java:40:26:40:56 | getParameter(...) : String | JdbcUrlSSRF.java:43:27:43:33 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:2 |
-| JdbcUrlSSRF.java:40:26:40:56 | getParameter(...) : String | JdbcUrlSSRF.java:48:23:48:29 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:2 |
-| JdbcUrlSSRF.java:40:26:40:56 | getParameter(...) : String | JdbcUrlSSRF.java:52:38:52:44 | jdbcUrl : String | provenance | Src:MaD:286  |
+| JavaNetHttpSSRF.java:28:32:28:35 | sink : String | JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | provenance | MaD:309 |
+| JaxWsSSRF.java:14:22:14:48 | getParameter(...) : String | JaxWsSSRF.java:15:23:15:25 | url | provenance | Src:MaD:292 Sink:MaD:29 |
+| JdbcUrlSSRF.java:21:26:21:56 | getParameter(...) : String | JdbcUrlSSRF.java:26:28:26:34 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:23 |
+| JdbcUrlSSRF.java:21:26:21:56 | getParameter(...) : String | JdbcUrlSSRF.java:28:41:28:47 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:24 |
+| JdbcUrlSSRF.java:21:26:21:56 | getParameter(...) : String | JdbcUrlSSRF.java:29:41:29:47 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:26 |
+| JdbcUrlSSRF.java:21:26:21:56 | getParameter(...) : String | JdbcUrlSSRF.java:30:41:30:47 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:25 |
+| JdbcUrlSSRF.java:21:26:21:56 | getParameter(...) : String | JdbcUrlSSRF.java:32:27:32:33 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:256 |
+| JdbcUrlSSRF.java:40:26:40:56 | getParameter(...) : String | JdbcUrlSSRF.java:43:27:43:33 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:2 |
+| JdbcUrlSSRF.java:40:26:40:56 | getParameter(...) : String | JdbcUrlSSRF.java:48:23:48:29 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:2 |
+| JdbcUrlSSRF.java:40:26:40:56 | getParameter(...) : String | JdbcUrlSSRF.java:52:38:52:44 | jdbcUrl : String | provenance | Src:MaD:292  |
 | JdbcUrlSSRF.java:52:9:52:13 | props : Properties | JdbcUrlSSRF.java:54:49:54:53 | props | provenance | Sink:MaD:1 |
 | JdbcUrlSSRF.java:52:9:52:13 | props [post update] : Properties [<map.value>] : String | JdbcUrlSSRF.java:54:49:54:53 | props | provenance | Sink:MaD:1 |
 | JdbcUrlSSRF.java:52:38:52:44 | jdbcUrl : String | JdbcUrlSSRF.java:52:9:52:13 | props : Properties | provenance | Config |
-| JdbcUrlSSRF.java:52:38:52:44 | jdbcUrl : String | JdbcUrlSSRF.java:52:9:52:13 | props [post update] : Properties [<map.value>] : String | provenance | MaD:304 |
-| JdbcUrlSSRF.java:60:26:60:56 | getParameter(...) : String | JdbcUrlSSRF.java:65:27:65:33 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:265 |
-| JdbcUrlSSRF.java:60:26:60:56 | getParameter(...) : String | JdbcUrlSSRF.java:67:75:67:81 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:266 |
-| JdbcUrlSSRF.java:60:26:60:56 | getParameter(...) : String | JdbcUrlSSRF.java:70:75:70:81 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:268 |
-| JdbcUrlSSRF.java:60:26:60:56 | getParameter(...) : String | JdbcUrlSSRF.java:73:75:73:81 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:267 |
-| JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:82:21:82:27 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:243 |
-| JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:83:21:83:27 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:244 |
-| JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:84:21:84:27 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:245 |
-| JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:86:19:86:25 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:246 |
-| JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:87:19:87:25 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:247 |
-| JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:88:19:88:25 | jdbcUrl | provenance | Src:MaD:286 Sink:MaD:248 |
-| ReactiveWebClientSSRF.java:15:26:15:52 | getParameter(...) : String | ReactiveWebClientSSRF.java:16:52:16:54 | url | provenance | Src:MaD:286 Sink:MaD:283 |
-| ReactiveWebClientSSRF.java:32:26:32:52 | getParameter(...) : String | ReactiveWebClientSSRF.java:35:30:35:32 | url | provenance | Src:MaD:286 Sink:MaD:281 |
-| ReactiveWebClientSSRF.java:55:24:55:50 | getParameter(...) : String | ReactiveWebClientSSRF.java:57:26:57:26 | p | provenance | Src:MaD:286 Sink:MaD:282 |
-| ReactiveWebClientSSRF.java:62:25:62:51 | getParameter(...) : String | ReactiveWebClientSSRF.java:64:46:64:71 | ... + ... : String | provenance | Src:MaD:286  |
-| ReactiveWebClientSSRF.java:64:46:64:71 | ... + ... : String | ReactiveWebClientSSRF.java:64:26:64:72 | create(...) | provenance | Config Sink:MaD:282 |
-| ReactiveWebClientSSRF.java:64:46:64:71 | ... + ... : String | ReactiveWebClientSSRF.java:64:26:64:72 | create(...) | provenance | MaD:296 Sink:MaD:282 |
-| SanitizationTests.java:22:23:22:58 | new URI(...) : URI | SanitizationTests.java:25:52:25:54 | uri | provenance | Sink:MaD:6 |
+| JdbcUrlSSRF.java:52:38:52:44 | jdbcUrl : String | JdbcUrlSSRF.java:52:9:52:13 | props [post update] : Properties [<map.value>] : String | provenance | MaD:314 |
+| JdbcUrlSSRF.java:60:26:60:56 | getParameter(...) : String | JdbcUrlSSRF.java:65:27:65:33 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:271 |
+| JdbcUrlSSRF.java:60:26:60:56 | getParameter(...) : String | JdbcUrlSSRF.java:67:75:67:81 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:272 |
+| JdbcUrlSSRF.java:60:26:60:56 | getParameter(...) : String | JdbcUrlSSRF.java:70:75:70:81 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:274 |
+| JdbcUrlSSRF.java:60:26:60:56 | getParameter(...) : String | JdbcUrlSSRF.java:73:75:73:81 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:273 |
+| JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:82:21:82:27 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:249 |
+| JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:83:21:83:27 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:250 |
+| JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:84:21:84:27 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:251 |
+| JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:86:19:86:25 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:252 |
+| JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:87:19:87:25 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:253 |
+| JdbcUrlSSRF.java:80:26:80:56 | getParameter(...) : String | JdbcUrlSSRF.java:88:19:88:25 | jdbcUrl | provenance | Src:MaD:292 Sink:MaD:254 |
+| MicronautSSRF.java:15:32:15:53 | url : String | MicronautSSRF.java:16:45:16:47 | url | provenance | Sink:MaD:5 |
+| MicronautSSRF.java:20:42:20:63 | url : String | MicronautSSRF.java:21:45:21:47 | url | provenance | Sink:MaD:4 |
+| MicronautSSRF.java:25:37:25:58 | url : String | MicronautSSRF.java:26:45:26:47 | url | provenance | Sink:MaD:6 |
+| MicronautSSRF.java:30:34:30:56 | host : String | MicronautSSRF.java:31:60:31:63 | host : String | provenance |  |
+| MicronautSSRF.java:31:19:31:64 | host(...) : UriBuilder | MicronautSSRF.java:31:19:31:72 | build(...) : URI | provenance | MaD:293 |
+| MicronautSSRF.java:31:19:31:72 | build(...) : URI | MicronautSSRF.java:32:45:32:47 | uri : URI | provenance |  |
+| MicronautSSRF.java:31:60:31:63 | host : String | MicronautSSRF.java:31:19:31:64 | host(...) : UriBuilder | provenance | MaD:294+MaD:295 |
+| MicronautSSRF.java:32:45:32:47 | uri : URI | MicronautSSRF.java:32:45:32:58 | toString(...) | provenance | MaD:307 Sink:MaD:5 |
+| MicronautSSRF.java:36:39:36:60 | url : String | MicronautSSRF.java:37:61:37:63 | url : String | provenance |  |
+| MicronautSSRF.java:37:61:37:63 | url : String | MicronautSSRF.java:37:45:37:64 | GET(...) | provenance | MaD:296 Sink:MaD:3 |
+| MicronautSSRF.java:41:35:41:56 | url : String | MicronautSSRF.java:42:32:42:34 | url | provenance | Sink:MaD:8 |
+| MicronautSSRF.java:46:42:46:63 | url : String | MicronautSSRF.java:47:48:47:50 | url : String | provenance |  |
+| MicronautSSRF.java:47:48:47:50 | url : String | MicronautSSRF.java:47:32:47:51 | GET(...) | provenance | MaD:296 Sink:MaD:7 |
+| ReactiveWebClientSSRF.java:15:26:15:52 | getParameter(...) : String | ReactiveWebClientSSRF.java:16:52:16:54 | url | provenance | Src:MaD:292 Sink:MaD:289 |
+| ReactiveWebClientSSRF.java:32:26:32:52 | getParameter(...) : String | ReactiveWebClientSSRF.java:35:30:35:32 | url | provenance | Src:MaD:292 Sink:MaD:287 |
+| ReactiveWebClientSSRF.java:55:24:55:50 | getParameter(...) : String | ReactiveWebClientSSRF.java:57:26:57:26 | p | provenance | Src:MaD:292 Sink:MaD:288 |
+| ReactiveWebClientSSRF.java:62:25:62:51 | getParameter(...) : String | ReactiveWebClientSSRF.java:64:46:64:71 | ... + ... : String | provenance | Src:MaD:292  |
+| ReactiveWebClientSSRF.java:64:46:64:71 | ... + ... : String | ReactiveWebClientSSRF.java:64:26:64:72 | create(...) | provenance | Config Sink:MaD:288 |
+| ReactiveWebClientSSRF.java:64:46:64:71 | ... + ... : String | ReactiveWebClientSSRF.java:64:26:64:72 | create(...) | provenance | MaD:306 Sink:MaD:288 |
+| SanitizationTests.java:22:23:22:58 | new URI(...) : URI | SanitizationTests.java:25:52:25:54 | uri | provenance | Sink:MaD:12 |
 | SanitizationTests.java:22:23:22:58 | new URI(...) : URI | SanitizationTests.java:25:52:25:54 | uri : URI | provenance |  |
-| SanitizationTests.java:22:31:22:57 | getParameter(...) : String | SanitizationTests.java:22:23:22:58 | new URI(...) : URI | provenance | Src:MaD:286 Config |
-| SanitizationTests.java:22:31:22:57 | getParameter(...) : String | SanitizationTests.java:22:23:22:58 | new URI(...) : URI | provenance | Src:MaD:286 MaD:294 |
-| SanitizationTests.java:25:29:25:55 | newBuilder(...) : Builder | SanitizationTests.java:25:29:25:63 | build(...) : HttpRequest | provenance | MaD:292 |
-| SanitizationTests.java:25:29:25:63 | build(...) : HttpRequest | SanitizationTests.java:26:25:26:25 | r | provenance | Sink:MaD:4 |
-| SanitizationTests.java:25:52:25:54 | uri : URI | SanitizationTests.java:25:29:25:55 | newBuilder(...) : Builder | provenance | MaD:293 |
-| SanitizationTests.java:78:33:78:63 | getParameter(...) : String | SanitizationTests.java:79:67:79:76 | unsafeUri3 : String | provenance | Src:MaD:286  |
-| SanitizationTests.java:79:36:79:78 | newBuilder(...) : Builder | SanitizationTests.java:79:36:79:86 | build(...) : HttpRequest | provenance | MaD:292 |
-| SanitizationTests.java:79:36:79:86 | build(...) : HttpRequest | SanitizationTests.java:80:25:80:32 | unsafer3 | provenance | Sink:MaD:4 |
-| SanitizationTests.java:79:59:79:77 | new URI(...) : URI | SanitizationTests.java:79:36:79:78 | newBuilder(...) : Builder | provenance | MaD:293 |
-| SanitizationTests.java:79:67:79:76 | unsafeUri3 : String | SanitizationTests.java:79:59:79:77 | new URI(...) | provenance | Config Sink:MaD:6 |
-| SanitizationTests.java:79:67:79:76 | unsafeUri3 : String | SanitizationTests.java:79:59:79:77 | new URI(...) | provenance | MaD:294 Sink:MaD:6 |
+| SanitizationTests.java:22:31:22:57 | getParameter(...) : String | SanitizationTests.java:22:23:22:58 | new URI(...) : URI | provenance | Src:MaD:292 Config |
+| SanitizationTests.java:22:31:22:57 | getParameter(...) : String | SanitizationTests.java:22:23:22:58 | new URI(...) : URI | provenance | Src:MaD:292 MaD:304 |
+| SanitizationTests.java:25:29:25:55 | newBuilder(...) : Builder | SanitizationTests.java:25:29:25:63 | build(...) : HttpRequest | provenance | MaD:302 |
+| SanitizationTests.java:25:29:25:63 | build(...) : HttpRequest | SanitizationTests.java:26:25:26:25 | r | provenance | Sink:MaD:10 |
+| SanitizationTests.java:25:52:25:54 | uri : URI | SanitizationTests.java:25:29:25:55 | newBuilder(...) : Builder | provenance | MaD:303 |
+| SanitizationTests.java:78:33:78:63 | getParameter(...) : String | SanitizationTests.java:79:67:79:76 | unsafeUri3 : String | provenance | Src:MaD:292  |
+| SanitizationTests.java:79:36:79:78 | newBuilder(...) : Builder | SanitizationTests.java:79:36:79:86 | build(...) : HttpRequest | provenance | MaD:302 |
+| SanitizationTests.java:79:36:79:86 | build(...) : HttpRequest | SanitizationTests.java:80:25:80:32 | unsafer3 | provenance | Sink:MaD:10 |
+| SanitizationTests.java:79:59:79:77 | new URI(...) : URI | SanitizationTests.java:79:36:79:78 | newBuilder(...) : Builder | provenance | MaD:303 |
+| SanitizationTests.java:79:67:79:76 | unsafeUri3 : String | SanitizationTests.java:79:59:79:77 | new URI(...) | provenance | Config Sink:MaD:12 |
+| SanitizationTests.java:79:67:79:76 | unsafeUri3 : String | SanitizationTests.java:79:59:79:77 | new URI(...) | provenance | MaD:304 Sink:MaD:12 |
 | SanitizationTests.java:79:67:79:76 | unsafeUri3 : String | SanitizationTests.java:79:59:79:77 | new URI(...) : URI | provenance | Config |
-| SanitizationTests.java:79:67:79:76 | unsafeUri3 : String | SanitizationTests.java:79:59:79:77 | new URI(...) : URI | provenance | MaD:294 |
-| SanitizationTests.java:82:49:82:79 | getParameter(...) : String | SanitizationTests.java:83:67:83:76 | unsafeUri4 : String | provenance | Src:MaD:286  |
-| SanitizationTests.java:83:36:83:78 | newBuilder(...) : Builder | SanitizationTests.java:83:36:83:86 | build(...) : HttpRequest | provenance | MaD:292 |
-| SanitizationTests.java:83:36:83:86 | build(...) : HttpRequest | SanitizationTests.java:84:25:84:32 | unsafer4 | provenance | Sink:MaD:4 |
-| SanitizationTests.java:83:59:83:77 | new URI(...) : URI | SanitizationTests.java:83:36:83:78 | newBuilder(...) : Builder | provenance | MaD:293 |
-| SanitizationTests.java:83:67:83:76 | unsafeUri4 : String | SanitizationTests.java:83:59:83:77 | new URI(...) | provenance | Config Sink:MaD:6 |
-| SanitizationTests.java:83:67:83:76 | unsafeUri4 : String | SanitizationTests.java:83:59:83:77 | new URI(...) | provenance | MaD:294 Sink:MaD:6 |
+| SanitizationTests.java:79:67:79:76 | unsafeUri3 : String | SanitizationTests.java:79:59:79:77 | new URI(...) : URI | provenance | MaD:304 |
+| SanitizationTests.java:82:49:82:79 | getParameter(...) : String | SanitizationTests.java:83:67:83:76 | unsafeUri4 : String | provenance | Src:MaD:292  |
+| SanitizationTests.java:83:36:83:78 | newBuilder(...) : Builder | SanitizationTests.java:83:36:83:86 | build(...) : HttpRequest | provenance | MaD:302 |
+| SanitizationTests.java:83:36:83:86 | build(...) : HttpRequest | SanitizationTests.java:84:25:84:32 | unsafer4 | provenance | Sink:MaD:10 |
+| SanitizationTests.java:83:59:83:77 | new URI(...) : URI | SanitizationTests.java:83:36:83:78 | newBuilder(...) : Builder | provenance | MaD:303 |
+| SanitizationTests.java:83:67:83:76 | unsafeUri4 : String | SanitizationTests.java:83:59:83:77 | new URI(...) | provenance | Config Sink:MaD:12 |
+| SanitizationTests.java:83:67:83:76 | unsafeUri4 : String | SanitizationTests.java:83:59:83:77 | new URI(...) | provenance | MaD:304 Sink:MaD:12 |
 | SanitizationTests.java:83:67:83:76 | unsafeUri4 : String | SanitizationTests.java:83:59:83:77 | new URI(...) : URI | provenance | Config |
-| SanitizationTests.java:83:67:83:76 | unsafeUri4 : String | SanitizationTests.java:83:59:83:77 | new URI(...) : URI | provenance | MaD:294 |
+| SanitizationTests.java:83:67:83:76 | unsafeUri4 : String | SanitizationTests.java:83:59:83:77 | new URI(...) : URI | provenance | MaD:304 |
 | SanitizationTests.java:87:13:87:22 | unsafeUri5 [post update] : StringBuilder | SanitizationTests.java:88:67:88:76 | unsafeUri5 : StringBuilder | provenance |  |
-| SanitizationTests.java:87:31:87:61 | getParameter(...) : String | SanitizationTests.java:87:13:87:22 | unsafeUri5 [post update] : StringBuilder | provenance | Src:MaD:286 MaD:287 |
-| SanitizationTests.java:88:36:88:89 | newBuilder(...) : Builder | SanitizationTests.java:88:36:88:97 | build(...) : HttpRequest | provenance | MaD:292 |
-| SanitizationTests.java:88:36:88:97 | build(...) : HttpRequest | SanitizationTests.java:89:25:89:32 | unsafer5 | provenance | Sink:MaD:4 |
-| SanitizationTests.java:88:59:88:88 | new URI(...) : URI | SanitizationTests.java:88:36:88:89 | newBuilder(...) : Builder | provenance | MaD:293 |
-| SanitizationTests.java:88:67:88:76 | unsafeUri5 : StringBuilder | SanitizationTests.java:88:67:88:87 | toString(...) : String | provenance | MaD:289 |
-| SanitizationTests.java:88:67:88:87 | toString(...) : String | SanitizationTests.java:88:59:88:88 | new URI(...) | provenance | Config Sink:MaD:6 |
-| SanitizationTests.java:88:67:88:87 | toString(...) : String | SanitizationTests.java:88:59:88:88 | new URI(...) | provenance | MaD:294 Sink:MaD:6 |
+| SanitizationTests.java:87:31:87:61 | getParameter(...) : String | SanitizationTests.java:87:13:87:22 | unsafeUri5 [post update] : StringBuilder | provenance | Src:MaD:292 MaD:297 |
+| SanitizationTests.java:88:36:88:89 | newBuilder(...) : Builder | SanitizationTests.java:88:36:88:97 | build(...) : HttpRequest | provenance | MaD:302 |
+| SanitizationTests.java:88:36:88:97 | build(...) : HttpRequest | SanitizationTests.java:89:25:89:32 | unsafer5 | provenance | Sink:MaD:10 |
+| SanitizationTests.java:88:59:88:88 | new URI(...) : URI | SanitizationTests.java:88:36:88:89 | newBuilder(...) : Builder | provenance | MaD:303 |
+| SanitizationTests.java:88:67:88:76 | unsafeUri5 : StringBuilder | SanitizationTests.java:88:67:88:87 | toString(...) : String | provenance | MaD:299 |
+| SanitizationTests.java:88:67:88:87 | toString(...) : String | SanitizationTests.java:88:59:88:88 | new URI(...) | provenance | Config Sink:MaD:12 |
+| SanitizationTests.java:88:67:88:87 | toString(...) : String | SanitizationTests.java:88:59:88:88 | new URI(...) | provenance | MaD:304 Sink:MaD:12 |
 | SanitizationTests.java:88:67:88:87 | toString(...) : String | SanitizationTests.java:88:59:88:88 | new URI(...) : URI | provenance | Config |
-| SanitizationTests.java:88:67:88:87 | toString(...) : String | SanitizationTests.java:88:59:88:88 | new URI(...) : URI | provenance | MaD:294 |
+| SanitizationTests.java:88:67:88:87 | toString(...) : String | SanitizationTests.java:88:59:88:88 | new URI(...) : URI | provenance | MaD:304 |
 | SanitizationTests.java:91:40:91:87 | new StringBuilder(...) : StringBuilder | SanitizationTests.java:93:68:93:77 | unafeUri5a : StringBuilder | provenance |  |
-| SanitizationTests.java:91:58:91:86 | getParameter(...) : String | SanitizationTests.java:91:40:91:87 | new StringBuilder(...) : StringBuilder | provenance | Src:MaD:286 MaD:291 |
-| SanitizationTests.java:93:37:93:90 | newBuilder(...) : Builder | SanitizationTests.java:93:37:93:98 | build(...) : HttpRequest | provenance | MaD:292 |
-| SanitizationTests.java:93:37:93:98 | build(...) : HttpRequest | SanitizationTests.java:94:25:94:33 | unsafer5a | provenance | Sink:MaD:4 |
-| SanitizationTests.java:93:60:93:89 | new URI(...) : URI | SanitizationTests.java:93:37:93:90 | newBuilder(...) : Builder | provenance | MaD:293 |
-| SanitizationTests.java:93:68:93:77 | unafeUri5a : StringBuilder | SanitizationTests.java:93:68:93:88 | toString(...) : String | provenance | MaD:289 |
-| SanitizationTests.java:93:68:93:88 | toString(...) : String | SanitizationTests.java:93:60:93:89 | new URI(...) | provenance | Config Sink:MaD:6 |
-| SanitizationTests.java:93:68:93:88 | toString(...) : String | SanitizationTests.java:93:60:93:89 | new URI(...) | provenance | MaD:294 Sink:MaD:6 |
+| SanitizationTests.java:91:58:91:86 | getParameter(...) : String | SanitizationTests.java:91:40:91:87 | new StringBuilder(...) : StringBuilder | provenance | Src:MaD:292 MaD:301 |
+| SanitizationTests.java:93:37:93:90 | newBuilder(...) : Builder | SanitizationTests.java:93:37:93:98 | build(...) : HttpRequest | provenance | MaD:302 |
+| SanitizationTests.java:93:37:93:98 | build(...) : HttpRequest | SanitizationTests.java:94:25:94:33 | unsafer5a | provenance | Sink:MaD:10 |
+| SanitizationTests.java:93:60:93:89 | new URI(...) : URI | SanitizationTests.java:93:37:93:90 | newBuilder(...) : Builder | provenance | MaD:303 |
+| SanitizationTests.java:93:68:93:77 | unafeUri5a : StringBuilder | SanitizationTests.java:93:68:93:88 | toString(...) : String | provenance | MaD:299 |
+| SanitizationTests.java:93:68:93:88 | toString(...) : String | SanitizationTests.java:93:60:93:89 | new URI(...) | provenance | Config Sink:MaD:12 |
+| SanitizationTests.java:93:68:93:88 | toString(...) : String | SanitizationTests.java:93:60:93:89 | new URI(...) | provenance | MaD:304 Sink:MaD:12 |
 | SanitizationTests.java:93:68:93:88 | toString(...) : String | SanitizationTests.java:93:60:93:89 | new URI(...) : URI | provenance | Config |
-| SanitizationTests.java:93:68:93:88 | toString(...) : String | SanitizationTests.java:93:60:93:89 | new URI(...) : URI | provenance | MaD:294 |
+| SanitizationTests.java:93:68:93:88 | toString(...) : String | SanitizationTests.java:93:60:93:89 | new URI(...) : URI | provenance | MaD:304 |
 | SanitizationTests.java:96:41:96:105 | append(...) : StringBuilder | SanitizationTests.java:98:68:98:78 | unsafeUri5b : StringBuilder | provenance |  |
-| SanitizationTests.java:96:42:96:89 | new StringBuilder(...) : StringBuilder | SanitizationTests.java:96:41:96:105 | append(...) : StringBuilder | provenance | MaD:288 |
-| SanitizationTests.java:96:60:96:88 | getParameter(...) : String | SanitizationTests.java:96:42:96:89 | new StringBuilder(...) : StringBuilder | provenance | Src:MaD:286 MaD:291 |
-| SanitizationTests.java:98:37:98:91 | newBuilder(...) : Builder | SanitizationTests.java:98:37:98:99 | build(...) : HttpRequest | provenance | MaD:292 |
-| SanitizationTests.java:98:37:98:99 | build(...) : HttpRequest | SanitizationTests.java:99:25:99:33 | unsafer5b | provenance | Sink:MaD:4 |
-| SanitizationTests.java:98:60:98:90 | new URI(...) : URI | SanitizationTests.java:98:37:98:91 | newBuilder(...) : Builder | provenance | MaD:293 |
-| SanitizationTests.java:98:68:98:78 | unsafeUri5b : StringBuilder | SanitizationTests.java:98:68:98:89 | toString(...) : String | provenance | MaD:289 |
-| SanitizationTests.java:98:68:98:89 | toString(...) : String | SanitizationTests.java:98:60:98:90 | new URI(...) | provenance | Config Sink:MaD:6 |
-| SanitizationTests.java:98:68:98:89 | toString(...) : String | SanitizationTests.java:98:60:98:90 | new URI(...) | provenance | MaD:294 Sink:MaD:6 |
+| SanitizationTests.java:96:42:96:89 | new StringBuilder(...) : StringBuilder | SanitizationTests.java:96:41:96:105 | append(...) : StringBuilder | provenance | MaD:298 |
+| SanitizationTests.java:96:60:96:88 | getParameter(...) : String | SanitizationTests.java:96:42:96:89 | new StringBuilder(...) : StringBuilder | provenance | Src:MaD:292 MaD:301 |
+| SanitizationTests.java:98:37:98:91 | newBuilder(...) : Builder | SanitizationTests.java:98:37:98:99 | build(...) : HttpRequest | provenance | MaD:302 |
+| SanitizationTests.java:98:37:98:99 | build(...) : HttpRequest | SanitizationTests.java:99:25:99:33 | unsafer5b | provenance | Sink:MaD:10 |
+| SanitizationTests.java:98:60:98:90 | new URI(...) : URI | SanitizationTests.java:98:37:98:91 | newBuilder(...) : Builder | provenance | MaD:303 |
+| SanitizationTests.java:98:68:98:78 | unsafeUri5b : StringBuilder | SanitizationTests.java:98:68:98:89 | toString(...) : String | provenance | MaD:299 |
+| SanitizationTests.java:98:68:98:89 | toString(...) : String | SanitizationTests.java:98:60:98:90 | new URI(...) | provenance | Config Sink:MaD:12 |
+| SanitizationTests.java:98:68:98:89 | toString(...) : String | SanitizationTests.java:98:60:98:90 | new URI(...) | provenance | MaD:304 Sink:MaD:12 |
 | SanitizationTests.java:98:68:98:89 | toString(...) : String | SanitizationTests.java:98:60:98:90 | new URI(...) : URI | provenance | Config |
-| SanitizationTests.java:98:68:98:89 | toString(...) : String | SanitizationTests.java:98:60:98:90 | new URI(...) : URI | provenance | MaD:294 |
+| SanitizationTests.java:98:68:98:89 | toString(...) : String | SanitizationTests.java:98:60:98:90 | new URI(...) : URI | provenance | MaD:304 |
 | SanitizationTests.java:101:41:101:106 | append(...) : StringBuilder | SanitizationTests.java:103:68:103:78 | unsafeUri5c : StringBuilder | provenance |  |
-| SanitizationTests.java:101:77:101:105 | getParameter(...) : String | SanitizationTests.java:101:41:101:106 | append(...) : StringBuilder | provenance | Src:MaD:286 MaD:287+MaD:288 |
-| SanitizationTests.java:103:37:103:91 | newBuilder(...) : Builder | SanitizationTests.java:103:37:103:99 | build(...) : HttpRequest | provenance | MaD:292 |
-| SanitizationTests.java:103:37:103:99 | build(...) : HttpRequest | SanitizationTests.java:104:25:104:33 | unsafer5c | provenance | Sink:MaD:4 |
-| SanitizationTests.java:103:60:103:90 | new URI(...) : URI | SanitizationTests.java:103:37:103:91 | newBuilder(...) : Builder | provenance | MaD:293 |
-| SanitizationTests.java:103:68:103:78 | unsafeUri5c : StringBuilder | SanitizationTests.java:103:68:103:89 | toString(...) : String | provenance | MaD:289 |
-| SanitizationTests.java:103:68:103:89 | toString(...) : String | SanitizationTests.java:103:60:103:90 | new URI(...) | provenance | Config Sink:MaD:6 |
-| SanitizationTests.java:103:68:103:89 | toString(...) : String | SanitizationTests.java:103:60:103:90 | new URI(...) | provenance | MaD:294 Sink:MaD:6 |
+| SanitizationTests.java:101:77:101:105 | getParameter(...) : String | SanitizationTests.java:101:41:101:106 | append(...) : StringBuilder | provenance | Src:MaD:292 MaD:297+MaD:298 |
+| SanitizationTests.java:103:37:103:91 | newBuilder(...) : Builder | SanitizationTests.java:103:37:103:99 | build(...) : HttpRequest | provenance | MaD:302 |
+| SanitizationTests.java:103:37:103:99 | build(...) : HttpRequest | SanitizationTests.java:104:25:104:33 | unsafer5c | provenance | Sink:MaD:10 |
+| SanitizationTests.java:103:60:103:90 | new URI(...) : URI | SanitizationTests.java:103:37:103:91 | newBuilder(...) : Builder | provenance | MaD:303 |
+| SanitizationTests.java:103:68:103:78 | unsafeUri5c : StringBuilder | SanitizationTests.java:103:68:103:89 | toString(...) : String | provenance | MaD:299 |
+| SanitizationTests.java:103:68:103:89 | toString(...) : String | SanitizationTests.java:103:60:103:90 | new URI(...) | provenance | Config Sink:MaD:12 |
+| SanitizationTests.java:103:68:103:89 | toString(...) : String | SanitizationTests.java:103:60:103:90 | new URI(...) | provenance | MaD:304 Sink:MaD:12 |
 | SanitizationTests.java:103:68:103:89 | toString(...) : String | SanitizationTests.java:103:60:103:90 | new URI(...) : URI | provenance | Config |
-| SanitizationTests.java:103:68:103:89 | toString(...) : String | SanitizationTests.java:103:60:103:90 | new URI(...) : URI | provenance | MaD:294 |
+| SanitizationTests.java:103:68:103:89 | toString(...) : String | SanitizationTests.java:103:60:103:90 | new URI(...) : URI | provenance | MaD:304 |
 | SanitizationTests.java:106:33:106:104 | format(...) : String | SanitizationTests.java:107:67:107:76 | unsafeUri6 : String | provenance |  |
-| SanitizationTests.java:106:33:106:104 | new ..[] { .. } : Object[] [[]] : String | SanitizationTests.java:106:33:106:104 | format(...) : String | provenance | MaD:290 |
-| SanitizationTests.java:106:73:106:103 | getParameter(...) : String | SanitizationTests.java:106:33:106:104 | new ..[] { .. } : Object[] [[]] : String | provenance | Src:MaD:286  |
-| SanitizationTests.java:107:36:107:78 | newBuilder(...) : Builder | SanitizationTests.java:107:36:107:86 | build(...) : HttpRequest | provenance | MaD:292 |
-| SanitizationTests.java:107:36:107:86 | build(...) : HttpRequest | SanitizationTests.java:108:25:108:32 | unsafer6 | provenance | Sink:MaD:4 |
-| SanitizationTests.java:107:59:107:77 | new URI(...) : URI | SanitizationTests.java:107:36:107:78 | newBuilder(...) : Builder | provenance | MaD:293 |
-| SanitizationTests.java:107:67:107:76 | unsafeUri6 : String | SanitizationTests.java:107:59:107:77 | new URI(...) | provenance | Config Sink:MaD:6 |
-| SanitizationTests.java:107:67:107:76 | unsafeUri6 : String | SanitizationTests.java:107:59:107:77 | new URI(...) | provenance | MaD:294 Sink:MaD:6 |
+| SanitizationTests.java:106:33:106:104 | new ..[] { .. } : Object[] [[]] : String | SanitizationTests.java:106:33:106:104 | format(...) : String | provenance | MaD:300 |
+| SanitizationTests.java:106:73:106:103 | getParameter(...) : String | SanitizationTests.java:106:33:106:104 | new ..[] { .. } : Object[] [[]] : String | provenance | Src:MaD:292  |
+| SanitizationTests.java:107:36:107:78 | newBuilder(...) : Builder | SanitizationTests.java:107:36:107:86 | build(...) : HttpRequest | provenance | MaD:302 |
+| SanitizationTests.java:107:36:107:86 | build(...) : HttpRequest | SanitizationTests.java:108:25:108:32 | unsafer6 | provenance | Sink:MaD:10 |
+| SanitizationTests.java:107:59:107:77 | new URI(...) : URI | SanitizationTests.java:107:36:107:78 | newBuilder(...) : Builder | provenance | MaD:303 |
+| SanitizationTests.java:107:67:107:76 | unsafeUri6 : String | SanitizationTests.java:107:59:107:77 | new URI(...) | provenance | Config Sink:MaD:12 |
+| SanitizationTests.java:107:67:107:76 | unsafeUri6 : String | SanitizationTests.java:107:59:107:77 | new URI(...) | provenance | MaD:304 Sink:MaD:12 |
 | SanitizationTests.java:107:67:107:76 | unsafeUri6 : String | SanitizationTests.java:107:59:107:77 | new URI(...) : URI | provenance | Config |
-| SanitizationTests.java:107:67:107:76 | unsafeUri6 : String | SanitizationTests.java:107:59:107:77 | new URI(...) : URI | provenance | MaD:294 |
+| SanitizationTests.java:107:67:107:76 | unsafeUri6 : String | SanitizationTests.java:107:59:107:77 | new URI(...) : URI | provenance | MaD:304 |
 | SanitizationTests.java:110:33:110:110 | format(...) : String | SanitizationTests.java:111:67:111:76 | unsafeUri7 : String | provenance |  |
-| SanitizationTests.java:110:33:110:110 | new ..[] { .. } : Object[] [[]] : String | SanitizationTests.java:110:33:110:110 | format(...) : String | provenance | MaD:290 |
-| SanitizationTests.java:110:56:110:86 | getParameter(...) : String | SanitizationTests.java:110:33:110:110 | new ..[] { .. } : Object[] [[]] : String | provenance | Src:MaD:286  |
-| SanitizationTests.java:111:36:111:78 | newBuilder(...) : Builder | SanitizationTests.java:111:36:111:86 | build(...) : HttpRequest | provenance | MaD:292 |
-| SanitizationTests.java:111:36:111:86 | build(...) : HttpRequest | SanitizationTests.java:112:25:112:32 | unsafer7 | provenance | Sink:MaD:4 |
-| SanitizationTests.java:111:59:111:77 | new URI(...) : URI | SanitizationTests.java:111:36:111:78 | newBuilder(...) : Builder | provenance | MaD:293 |
-| SanitizationTests.java:111:67:111:76 | unsafeUri7 : String | SanitizationTests.java:111:59:111:77 | new URI(...) | provenance | Config Sink:MaD:6 |
-| SanitizationTests.java:111:67:111:76 | unsafeUri7 : String | SanitizationTests.java:111:59:111:77 | new URI(...) | provenance | MaD:294 Sink:MaD:6 |
+| SanitizationTests.java:110:33:110:110 | new ..[] { .. } : Object[] [[]] : String | SanitizationTests.java:110:33:110:110 | format(...) : String | provenance | MaD:300 |
+| SanitizationTests.java:110:56:110:86 | getParameter(...) : String | SanitizationTests.java:110:33:110:110 | new ..[] { .. } : Object[] [[]] : String | provenance | Src:MaD:292  |
+| SanitizationTests.java:111:36:111:78 | newBuilder(...) : Builder | SanitizationTests.java:111:36:111:86 | build(...) : HttpRequest | provenance | MaD:302 |
+| SanitizationTests.java:111:36:111:86 | build(...) : HttpRequest | SanitizationTests.java:112:25:112:32 | unsafer7 | provenance | Sink:MaD:10 |
+| SanitizationTests.java:111:59:111:77 | new URI(...) : URI | SanitizationTests.java:111:36:111:78 | newBuilder(...) : Builder | provenance | MaD:303 |
+| SanitizationTests.java:111:67:111:76 | unsafeUri7 : String | SanitizationTests.java:111:59:111:77 | new URI(...) | provenance | Config Sink:MaD:12 |
+| SanitizationTests.java:111:67:111:76 | unsafeUri7 : String | SanitizationTests.java:111:59:111:77 | new URI(...) | provenance | MaD:304 Sink:MaD:12 |
 | SanitizationTests.java:111:67:111:76 | unsafeUri7 : String | SanitizationTests.java:111:59:111:77 | new URI(...) : URI | provenance | Config |
-| SanitizationTests.java:111:67:111:76 | unsafeUri7 : String | SanitizationTests.java:111:59:111:77 | new URI(...) : URI | provenance | MaD:294 |
+| SanitizationTests.java:111:67:111:76 | unsafeUri7 : String | SanitizationTests.java:111:59:111:77 | new URI(...) : URI | provenance | MaD:304 |
 | SanitizationTests.java:114:33:114:110 | format(...) : String | SanitizationTests.java:115:67:115:76 | unsafeUri8 : String | provenance |  |
-| SanitizationTests.java:114:33:114:110 | new ..[] { .. } : Object[] [[]] : String | SanitizationTests.java:114:33:114:110 | format(...) : String | provenance | MaD:290 |
-| SanitizationTests.java:114:55:114:85 | getParameter(...) : String | SanitizationTests.java:114:33:114:110 | new ..[] { .. } : Object[] [[]] : String | provenance | Src:MaD:286  |
-| SanitizationTests.java:115:36:115:78 | newBuilder(...) : Builder | SanitizationTests.java:115:36:115:86 | build(...) : HttpRequest | provenance | MaD:292 |
-| SanitizationTests.java:115:36:115:86 | build(...) : HttpRequest | SanitizationTests.java:116:25:116:32 | unsafer8 | provenance | Sink:MaD:4 |
-| SanitizationTests.java:115:59:115:77 | new URI(...) : URI | SanitizationTests.java:115:36:115:78 | newBuilder(...) : Builder | provenance | MaD:293 |
-| SanitizationTests.java:115:67:115:76 | unsafeUri8 : String | SanitizationTests.java:115:59:115:77 | new URI(...) | provenance | Config Sink:MaD:6 |
-| SanitizationTests.java:115:67:115:76 | unsafeUri8 : String | SanitizationTests.java:115:59:115:77 | new URI(...) | provenance | MaD:294 Sink:MaD:6 |
+| SanitizationTests.java:114:33:114:110 | new ..[] { .. } : Object[] [[]] : String | SanitizationTests.java:114:33:114:110 | format(...) : String | provenance | MaD:300 |
+| SanitizationTests.java:114:55:114:85 | getParameter(...) : String | SanitizationTests.java:114:33:114:110 | new ..[] { .. } : Object[] [[]] : String | provenance | Src:MaD:292  |
+| SanitizationTests.java:115:36:115:78 | newBuilder(...) : Builder | SanitizationTests.java:115:36:115:86 | build(...) : HttpRequest | provenance | MaD:302 |
+| SanitizationTests.java:115:36:115:86 | build(...) : HttpRequest | SanitizationTests.java:116:25:116:32 | unsafer8 | provenance | Sink:MaD:10 |
+| SanitizationTests.java:115:59:115:77 | new URI(...) : URI | SanitizationTests.java:115:36:115:78 | newBuilder(...) : Builder | provenance | MaD:303 |
+| SanitizationTests.java:115:67:115:76 | unsafeUri8 : String | SanitizationTests.java:115:59:115:77 | new URI(...) | provenance | Config Sink:MaD:12 |
+| SanitizationTests.java:115:67:115:76 | unsafeUri8 : String | SanitizationTests.java:115:59:115:77 | new URI(...) | provenance | MaD:304 Sink:MaD:12 |
 | SanitizationTests.java:115:67:115:76 | unsafeUri8 : String | SanitizationTests.java:115:59:115:77 | new URI(...) : URI | provenance | Config |
-| SanitizationTests.java:115:67:115:76 | unsafeUri8 : String | SanitizationTests.java:115:59:115:77 | new URI(...) : URI | provenance | MaD:294 |
-| SanitizationTests.java:118:33:118:63 | getParameter(...) : String | SanitizationTests.java:119:67:119:76 | unsafeUri9 : String | provenance | Src:MaD:286  |
-| SanitizationTests.java:119:36:119:78 | newBuilder(...) : Builder | SanitizationTests.java:119:36:119:86 | build(...) : HttpRequest | provenance | MaD:292 |
-| SanitizationTests.java:119:36:119:86 | build(...) : HttpRequest | SanitizationTests.java:120:25:120:32 | unsafer9 | provenance | Sink:MaD:4 |
-| SanitizationTests.java:119:59:119:77 | new URI(...) : URI | SanitizationTests.java:119:36:119:78 | newBuilder(...) : Builder | provenance | MaD:293 |
-| SanitizationTests.java:119:67:119:76 | unsafeUri9 : String | SanitizationTests.java:119:59:119:77 | new URI(...) | provenance | Config Sink:MaD:6 |
-| SanitizationTests.java:119:67:119:76 | unsafeUri9 : String | SanitizationTests.java:119:59:119:77 | new URI(...) | provenance | MaD:294 Sink:MaD:6 |
+| SanitizationTests.java:115:67:115:76 | unsafeUri8 : String | SanitizationTests.java:115:59:115:77 | new URI(...) : URI | provenance | MaD:304 |
+| SanitizationTests.java:118:33:118:63 | getParameter(...) : String | SanitizationTests.java:119:67:119:76 | unsafeUri9 : String | provenance | Src:MaD:292  |
+| SanitizationTests.java:119:36:119:78 | newBuilder(...) : Builder | SanitizationTests.java:119:36:119:86 | build(...) : HttpRequest | provenance | MaD:302 |
+| SanitizationTests.java:119:36:119:86 | build(...) : HttpRequest | SanitizationTests.java:120:25:120:32 | unsafer9 | provenance | Sink:MaD:10 |
+| SanitizationTests.java:119:59:119:77 | new URI(...) : URI | SanitizationTests.java:119:36:119:78 | newBuilder(...) : Builder | provenance | MaD:303 |
+| SanitizationTests.java:119:67:119:76 | unsafeUri9 : String | SanitizationTests.java:119:59:119:77 | new URI(...) | provenance | Config Sink:MaD:12 |
+| SanitizationTests.java:119:67:119:76 | unsafeUri9 : String | SanitizationTests.java:119:59:119:77 | new URI(...) | provenance | MaD:304 Sink:MaD:12 |
 | SanitizationTests.java:119:67:119:76 | unsafeUri9 : String | SanitizationTests.java:119:59:119:77 | new URI(...) : URI | provenance | Config |
-| SanitizationTests.java:119:67:119:76 | unsafeUri9 : String | SanitizationTests.java:119:59:119:77 | new URI(...) : URI | provenance | MaD:294 |
+| SanitizationTests.java:119:67:119:76 | unsafeUri9 : String | SanitizationTests.java:119:59:119:77 | new URI(...) : URI | provenance | MaD:304 |
 | SanitizationTests.java:122:34:122:126 | format(...) : String | SanitizationTests.java:123:68:123:78 | unsafeUri10 : String | provenance |  |
-| SanitizationTests.java:122:34:122:126 | new ..[] { .. } : Object[] [[]] : String | SanitizationTests.java:122:34:122:126 | format(...) : String | provenance | MaD:290 |
-| SanitizationTests.java:122:94:122:125 | getParameter(...) : String | SanitizationTests.java:122:34:122:126 | new ..[] { .. } : Object[] [[]] : String | provenance | Src:MaD:286  |
-| SanitizationTests.java:123:37:123:80 | newBuilder(...) : Builder | SanitizationTests.java:123:37:123:88 | build(...) : HttpRequest | provenance | MaD:292 |
-| SanitizationTests.java:123:37:123:88 | build(...) : HttpRequest | SanitizationTests.java:124:25:124:33 | unsafer10 | provenance | Sink:MaD:4 |
-| SanitizationTests.java:123:60:123:79 | new URI(...) : URI | SanitizationTests.java:123:37:123:80 | newBuilder(...) : Builder | provenance | MaD:293 |
-| SanitizationTests.java:123:68:123:78 | unsafeUri10 : String | SanitizationTests.java:123:60:123:79 | new URI(...) | provenance | Config Sink:MaD:6 |
-| SanitizationTests.java:123:68:123:78 | unsafeUri10 : String | SanitizationTests.java:123:60:123:79 | new URI(...) | provenance | MaD:294 Sink:MaD:6 |
+| SanitizationTests.java:122:34:122:126 | new ..[] { .. } : Object[] [[]] : String | SanitizationTests.java:122:34:122:126 | format(...) : String | provenance | MaD:300 |
+| SanitizationTests.java:122:94:122:125 | getParameter(...) : String | SanitizationTests.java:122:34:122:126 | new ..[] { .. } : Object[] [[]] : String | provenance | Src:MaD:292  |
+| SanitizationTests.java:123:37:123:80 | newBuilder(...) : Builder | SanitizationTests.java:123:37:123:88 | build(...) : HttpRequest | provenance | MaD:302 |
+| SanitizationTests.java:123:37:123:88 | build(...) : HttpRequest | SanitizationTests.java:124:25:124:33 | unsafer10 | provenance | Sink:MaD:10 |
+| SanitizationTests.java:123:60:123:79 | new URI(...) : URI | SanitizationTests.java:123:37:123:80 | newBuilder(...) : Builder | provenance | MaD:303 |
+| SanitizationTests.java:123:68:123:78 | unsafeUri10 : String | SanitizationTests.java:123:60:123:79 | new URI(...) | provenance | Config Sink:MaD:12 |
+| SanitizationTests.java:123:68:123:78 | unsafeUri10 : String | SanitizationTests.java:123:60:123:79 | new URI(...) | provenance | MaD:304 Sink:MaD:12 |
 | SanitizationTests.java:123:68:123:78 | unsafeUri10 : String | SanitizationTests.java:123:60:123:79 | new URI(...) : URI | provenance | Config |
-| SanitizationTests.java:123:68:123:78 | unsafeUri10 : String | SanitizationTests.java:123:60:123:79 | new URI(...) : URI | provenance | MaD:294 |
-| SanitizationTests.java:177:31:177:114 | newBuilder(...) : Builder | SanitizationTests.java:177:31:177:122 | build(...) : HttpRequest | provenance | MaD:292 |
-| SanitizationTests.java:177:31:177:122 | build(...) : HttpRequest | SanitizationTests.java:178:25:178:27 | r18 | provenance | Sink:MaD:4 |
-| SanitizationTests.java:177:54:177:113 | new URI(...) : URI | SanitizationTests.java:177:31:177:114 | newBuilder(...) : Builder | provenance | MaD:293 |
-| SanitizationTests.java:177:62:177:112 | getFromList(...) : String | SanitizationTests.java:177:54:177:113 | new URI(...) | provenance | Config Sink:MaD:6 |
-| SanitizationTests.java:177:62:177:112 | getFromList(...) : String | SanitizationTests.java:177:54:177:113 | new URI(...) | provenance | MaD:294 Sink:MaD:6 |
+| SanitizationTests.java:123:68:123:78 | unsafeUri10 : String | SanitizationTests.java:123:60:123:79 | new URI(...) : URI | provenance | MaD:304 |
+| SanitizationTests.java:177:31:177:114 | newBuilder(...) : Builder | SanitizationTests.java:177:31:177:122 | build(...) : HttpRequest | provenance | MaD:302 |
+| SanitizationTests.java:177:31:177:122 | build(...) : HttpRequest | SanitizationTests.java:178:25:178:27 | r18 | provenance | Sink:MaD:10 |
+| SanitizationTests.java:177:54:177:113 | new URI(...) : URI | SanitizationTests.java:177:31:177:114 | newBuilder(...) : Builder | provenance | MaD:303 |
+| SanitizationTests.java:177:62:177:112 | getFromList(...) : String | SanitizationTests.java:177:54:177:113 | new URI(...) | provenance | Config Sink:MaD:12 |
+| SanitizationTests.java:177:62:177:112 | getFromList(...) : String | SanitizationTests.java:177:54:177:113 | new URI(...) | provenance | MaD:304 Sink:MaD:12 |
 | SanitizationTests.java:177:62:177:112 | getFromList(...) : String | SanitizationTests.java:177:54:177:113 | new URI(...) : URI | provenance | Config |
-| SanitizationTests.java:177:62:177:112 | getFromList(...) : String | SanitizationTests.java:177:54:177:113 | new URI(...) : URI | provenance | MaD:294 |
-| SanitizationTests.java:177:74:177:111 | of(...) : List [<element>] : String | SanitizationTests.java:177:62:177:112 | getFromList(...) : String | provenance | MaD:301 |
+| SanitizationTests.java:177:62:177:112 | getFromList(...) : String | SanitizationTests.java:177:54:177:113 | new URI(...) : URI | provenance | MaD:304 |
+| SanitizationTests.java:177:74:177:111 | of(...) : List [<element>] : String | SanitizationTests.java:177:62:177:112 | getFromList(...) : String | provenance | MaD:311 |
 | SanitizationTests.java:177:74:177:111 | of(...) : List [<element>] : String | SanitizationTests.java:199:31:199:112 | list : List [<element>] : String | provenance |  |
-| SanitizationTests.java:177:82:177:110 | getParameter(...) : String | SanitizationTests.java:177:74:177:111 | of(...) : List [<element>] : String | provenance | Src:MaD:286 MaD:300 |
+| SanitizationTests.java:177:82:177:110 | getParameter(...) : String | SanitizationTests.java:177:74:177:111 | of(...) : List [<element>] : String | provenance | Src:MaD:292 MaD:310 |
 | SanitizationTests.java:199:31:199:112 | list : List [<element>] : String | SanitizationTests.java:200:16:200:19 | list : List [<element>] : String | provenance |  |
-| SanitizationTests.java:200:16:200:19 | list : List [<element>] : String | SanitizationTests.java:200:16:200:26 | get(...) : String | provenance | MaD:301 |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:32:39:32:59 | ... + ... | provenance | Src:MaD:286 Sink:MaD:272 |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:33:69:33:82 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:34:73:34:86 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:35:87:35:100 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:38:83:38:96 | fooResourceUrl : String | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:40:105:40:118 | fooResourceUrl : String | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:43:35:43:48 | fooResourceUrl | provenance | Src:MaD:286 Sink:MaD:270 |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:44:91:44:104 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:45:95:45:108 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:46:109:46:122 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:49:105:49:118 | fooResourceUrl : String | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:51:127:51:140 | fooResourceUrl : String | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:54:34:54:47 | fooResourceUrl | provenance | Src:MaD:286 Sink:MaD:271 |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:55:79:55:92 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:56:83:56:96 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:57:97:57:110 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:60:93:60:106 | fooResourceUrl : String | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:62:115:62:128 | fooResourceUrl : String | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:65:39:65:52 | fooResourceUrl | provenance | Src:MaD:286 Sink:MaD:273 |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:66:69:66:82 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:67:73:67:86 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:68:87:68:100 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:71:83:71:96 | fooResourceUrl : String | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:73:105:73:118 | fooResourceUrl : String | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:76:41:76:54 | fooResourceUrl | provenance | Src:MaD:286 Sink:MaD:276 |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:77:93:77:106 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:78:97:78:110 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:79:111:79:124 | fooResourceUrl | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:82:107:82:120 | fooResourceUrl : String | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:84:129:84:142 | fooResourceUrl : String | provenance | Src:MaD:286  |
-| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | provenance | Src:MaD:286  |
-| SpringSSRF.java:38:83:38:96 | fooResourceUrl : String | SpringSSRF.java:38:69:38:97 | of(...) | provenance | MaD:302 |
-| SpringSSRF.java:40:105:40:118 | fooResourceUrl : String | SpringSSRF.java:40:69:40:119 | of(...) | provenance | MaD:303 |
-| SpringSSRF.java:49:105:49:118 | fooResourceUrl : String | SpringSSRF.java:49:91:49:119 | of(...) | provenance | MaD:302 |
-| SpringSSRF.java:51:127:51:140 | fooResourceUrl : String | SpringSSRF.java:51:91:51:141 | of(...) | provenance | MaD:303 |
-| SpringSSRF.java:60:93:60:106 | fooResourceUrl : String | SpringSSRF.java:60:79:60:107 | of(...) | provenance | MaD:302 |
-| SpringSSRF.java:62:115:62:128 | fooResourceUrl : String | SpringSSRF.java:62:79:62:129 | of(...) | provenance | MaD:303 |
-| SpringSSRF.java:71:83:71:96 | fooResourceUrl : String | SpringSSRF.java:71:69:71:97 | of(...) | provenance | MaD:302 |
-| SpringSSRF.java:73:105:73:118 | fooResourceUrl : String | SpringSSRF.java:73:69:73:119 | of(...) | provenance | MaD:303 |
-| SpringSSRF.java:82:107:82:120 | fooResourceUrl : String | SpringSSRF.java:82:93:82:121 | of(...) | provenance | MaD:302 |
-| SpringSSRF.java:84:129:84:142 | fooResourceUrl : String | SpringSSRF.java:84:93:84:143 | of(...) | provenance | MaD:303 |
-| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:87:40:87:62 | new URI(...) | provenance | Config Sink:MaD:277 |
-| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:87:40:87:62 | new URI(...) | provenance | MaD:294 Sink:MaD:277 |
+| SanitizationTests.java:200:16:200:19 | list : List [<element>] : String | SanitizationTests.java:200:16:200:26 | get(...) : String | provenance | MaD:311 |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:32:39:32:59 | ... + ... | provenance | Src:MaD:292 Sink:MaD:278 |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:33:69:33:82 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:34:73:34:86 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:35:87:35:100 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:38:83:38:96 | fooResourceUrl : String | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:40:105:40:118 | fooResourceUrl : String | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:43:35:43:48 | fooResourceUrl | provenance | Src:MaD:292 Sink:MaD:276 |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:44:91:44:104 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:45:95:45:108 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:46:109:46:122 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:49:105:49:118 | fooResourceUrl : String | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:51:127:51:140 | fooResourceUrl : String | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:54:34:54:47 | fooResourceUrl | provenance | Src:MaD:292 Sink:MaD:277 |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:55:79:55:92 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:56:83:56:96 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:57:97:57:110 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:60:93:60:106 | fooResourceUrl : String | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:62:115:62:128 | fooResourceUrl : String | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:65:39:65:52 | fooResourceUrl | provenance | Src:MaD:292 Sink:MaD:279 |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:66:69:66:82 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:67:73:67:86 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:68:87:68:100 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:71:83:71:96 | fooResourceUrl : String | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:73:105:73:118 | fooResourceUrl : String | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:76:41:76:54 | fooResourceUrl | provenance | Src:MaD:292 Sink:MaD:282 |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:77:93:77:106 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:78:97:78:110 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:79:111:79:124 | fooResourceUrl | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:82:107:82:120 | fooResourceUrl : String | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:84:129:84:142 | fooResourceUrl : String | provenance | Src:MaD:292  |
+| SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | provenance | Src:MaD:292  |
+| SpringSSRF.java:38:83:38:96 | fooResourceUrl : String | SpringSSRF.java:38:69:38:97 | of(...) | provenance | MaD:312 |
+| SpringSSRF.java:40:105:40:118 | fooResourceUrl : String | SpringSSRF.java:40:69:40:119 | of(...) | provenance | MaD:313 |
+| SpringSSRF.java:49:105:49:118 | fooResourceUrl : String | SpringSSRF.java:49:91:49:119 | of(...) | provenance | MaD:312 |
+| SpringSSRF.java:51:127:51:140 | fooResourceUrl : String | SpringSSRF.java:51:91:51:141 | of(...) | provenance | MaD:313 |
+| SpringSSRF.java:60:93:60:106 | fooResourceUrl : String | SpringSSRF.java:60:79:60:107 | of(...) | provenance | MaD:312 |
+| SpringSSRF.java:62:115:62:128 | fooResourceUrl : String | SpringSSRF.java:62:79:62:129 | of(...) | provenance | MaD:313 |
+| SpringSSRF.java:71:83:71:96 | fooResourceUrl : String | SpringSSRF.java:71:69:71:97 | of(...) | provenance | MaD:312 |
+| SpringSSRF.java:73:105:73:118 | fooResourceUrl : String | SpringSSRF.java:73:69:73:119 | of(...) | provenance | MaD:313 |
+| SpringSSRF.java:82:107:82:120 | fooResourceUrl : String | SpringSSRF.java:82:93:82:121 | of(...) | provenance | MaD:312 |
+| SpringSSRF.java:84:129:84:142 | fooResourceUrl : String | SpringSSRF.java:84:93:84:143 | of(...) | provenance | MaD:313 |
+| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:87:40:87:62 | new URI(...) | provenance | Config Sink:MaD:283 |
+| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:87:40:87:62 | new URI(...) | provenance | MaD:304 Sink:MaD:283 |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:88:92:88:105 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:89:96:89:109 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:90:110:90:123 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:93:106:93:119 | fooResourceUrl : String | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:95:128:95:141 | fooResourceUrl : String | provenance |  |
-| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:98:42:98:55 | fooResourceUrl | provenance | Sink:MaD:278 |
+| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:98:42:98:55 | fooResourceUrl | provenance | Sink:MaD:284 |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:99:80:99:93 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:100:84:100:97 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:101:98:101:111 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:104:94:104:107 | fooResourceUrl : String | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:106:116:106:129 | fooResourceUrl : String | provenance |  |
-| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:109:40:109:53 | fooResourceUrl | provenance | Sink:MaD:279 |
+| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:109:40:109:53 | fooResourceUrl | provenance | Sink:MaD:285 |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:110:92:110:105 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:111:96:111:109 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:112:110:112:123 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:115:106:115:119 | fooResourceUrl : String | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:117:128:117:141 | fooResourceUrl : String | provenance |  |
-| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:120:30:120:43 | fooResourceUrl | provenance | Sink:MaD:280 |
+| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:120:30:120:43 | fooResourceUrl | provenance | Sink:MaD:286 |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:121:68:121:81 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:122:72:122:85 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:123:86:123:99 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:126:82:126:95 | fooResourceUrl : String | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:128:104:128:117 | fooResourceUrl : String | provenance |  |
-| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:131:33:131:46 | fooResourceUrl | provenance | Sink:MaD:269 |
+| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:131:33:131:46 | fooResourceUrl | provenance | Sink:MaD:275 |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:132:49:132:62 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:133:53:133:66 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:134:67:134:80 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:137:63:137:76 | fooResourceUrl : String | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:139:85:139:98 | fooResourceUrl : String | provenance |  |
-| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:142:41:142:54 | fooResourceUrl | provenance | Sink:MaD:274 |
+| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:142:41:142:54 | fooResourceUrl | provenance | Sink:MaD:280 |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:143:57:143:70 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:144:61:144:74 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:145:75:145:88 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:148:71:148:84 | fooResourceUrl : String | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:150:93:150:106 | fooResourceUrl : String | provenance |  |
-| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:153:42:153:55 | fooResourceUrl | provenance | Sink:MaD:275 |
+| SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:153:42:153:55 | fooResourceUrl | provenance | Sink:MaD:281 |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:154:58:154:71 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:155:62:155:75 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:156:76:156:89 | fooResourceUrl | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:159:72:159:85 | fooResourceUrl : String | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:161:94:161:107 | fooResourceUrl : String | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:166:35:166:48 | fooResourceUrl : String | provenance |  |
-| SpringSSRF.java:93:106:93:119 | fooResourceUrl : String | SpringSSRF.java:93:92:93:120 | of(...) | provenance | MaD:302 |
-| SpringSSRF.java:95:128:95:141 | fooResourceUrl : String | SpringSSRF.java:95:92:95:142 | of(...) | provenance | MaD:303 |
-| SpringSSRF.java:104:94:104:107 | fooResourceUrl : String | SpringSSRF.java:104:80:104:108 | of(...) | provenance | MaD:302 |
-| SpringSSRF.java:106:116:106:129 | fooResourceUrl : String | SpringSSRF.java:106:80:106:130 | of(...) | provenance | MaD:303 |
-| SpringSSRF.java:115:106:115:119 | fooResourceUrl : String | SpringSSRF.java:115:92:115:120 | of(...) | provenance | MaD:302 |
-| SpringSSRF.java:117:128:117:141 | fooResourceUrl : String | SpringSSRF.java:117:92:117:142 | of(...) | provenance | MaD:303 |
-| SpringSSRF.java:126:82:126:95 | fooResourceUrl : String | SpringSSRF.java:126:68:126:96 | of(...) | provenance | MaD:302 |
-| SpringSSRF.java:128:104:128:117 | fooResourceUrl : String | SpringSSRF.java:128:68:128:118 | of(...) | provenance | MaD:303 |
-| SpringSSRF.java:137:63:137:76 | fooResourceUrl : String | SpringSSRF.java:137:49:137:77 | of(...) | provenance | MaD:302 |
-| SpringSSRF.java:139:85:139:98 | fooResourceUrl : String | SpringSSRF.java:139:49:139:99 | of(...) | provenance | MaD:303 |
-| SpringSSRF.java:148:71:148:84 | fooResourceUrl : String | SpringSSRF.java:148:57:148:85 | of(...) | provenance | MaD:302 |
-| SpringSSRF.java:150:93:150:106 | fooResourceUrl : String | SpringSSRF.java:150:57:150:107 | of(...) | provenance | MaD:303 |
-| SpringSSRF.java:159:72:159:85 | fooResourceUrl : String | SpringSSRF.java:159:58:159:86 | of(...) | provenance | MaD:302 |
-| SpringSSRF.java:161:94:161:107 | fooResourceUrl : String | SpringSSRF.java:161:58:161:108 | of(...) | provenance | MaD:303 |
-| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:168:44:168:46 | uri | provenance | Sink:MaD:263 |
-| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:170:35:170:37 | uri | provenance | Sink:MaD:258 |
-| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:171:35:171:37 | uri | provenance | Sink:MaD:264 |
-| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:172:38:172:40 | uri | provenance | Sink:MaD:257 |
-| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:173:39:173:41 | uri | provenance | Sink:MaD:261 |
-| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:174:37:174:39 | uri | provenance | Sink:MaD:262 |
-| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:175:36:175:38 | uri | provenance | Sink:MaD:259 |
-| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:176:44:176:46 | uri | provenance | Sink:MaD:260 |
+| SpringSSRF.java:93:106:93:119 | fooResourceUrl : String | SpringSSRF.java:93:92:93:120 | of(...) | provenance | MaD:312 |
+| SpringSSRF.java:95:128:95:141 | fooResourceUrl : String | SpringSSRF.java:95:92:95:142 | of(...) | provenance | MaD:313 |
+| SpringSSRF.java:104:94:104:107 | fooResourceUrl : String | SpringSSRF.java:104:80:104:108 | of(...) | provenance | MaD:312 |
+| SpringSSRF.java:106:116:106:129 | fooResourceUrl : String | SpringSSRF.java:106:80:106:130 | of(...) | provenance | MaD:313 |
+| SpringSSRF.java:115:106:115:119 | fooResourceUrl : String | SpringSSRF.java:115:92:115:120 | of(...) | provenance | MaD:312 |
+| SpringSSRF.java:117:128:117:141 | fooResourceUrl : String | SpringSSRF.java:117:92:117:142 | of(...) | provenance | MaD:313 |
+| SpringSSRF.java:126:82:126:95 | fooResourceUrl : String | SpringSSRF.java:126:68:126:96 | of(...) | provenance | MaD:312 |
+| SpringSSRF.java:128:104:128:117 | fooResourceUrl : String | SpringSSRF.java:128:68:128:118 | of(...) | provenance | MaD:313 |
+| SpringSSRF.java:137:63:137:76 | fooResourceUrl : String | SpringSSRF.java:137:49:137:77 | of(...) | provenance | MaD:312 |
+| SpringSSRF.java:139:85:139:98 | fooResourceUrl : String | SpringSSRF.java:139:49:139:99 | of(...) | provenance | MaD:313 |
+| SpringSSRF.java:148:71:148:84 | fooResourceUrl : String | SpringSSRF.java:148:57:148:85 | of(...) | provenance | MaD:312 |
+| SpringSSRF.java:150:93:150:106 | fooResourceUrl : String | SpringSSRF.java:150:57:150:107 | of(...) | provenance | MaD:313 |
+| SpringSSRF.java:159:72:159:85 | fooResourceUrl : String | SpringSSRF.java:159:58:159:86 | of(...) | provenance | MaD:312 |
+| SpringSSRF.java:161:94:161:107 | fooResourceUrl : String | SpringSSRF.java:161:58:161:108 | of(...) | provenance | MaD:313 |
+| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:168:44:168:46 | uri | provenance | Sink:MaD:269 |
+| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:170:35:170:37 | uri | provenance | Sink:MaD:264 |
+| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:171:35:171:37 | uri | provenance | Sink:MaD:270 |
+| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:172:38:172:40 | uri | provenance | Sink:MaD:263 |
+| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:173:39:173:41 | uri | provenance | Sink:MaD:267 |
+| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:174:37:174:39 | uri | provenance | Sink:MaD:268 |
+| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:175:36:175:38 | uri | provenance | Sink:MaD:265 |
+| SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:176:44:176:46 | uri | provenance | Sink:MaD:266 |
 | SpringSSRF.java:166:35:166:48 | fooResourceUrl : String | SpringSSRF.java:166:27:166:49 | new URI(...) : URI | provenance | Config |
-| SpringSSRF.java:166:35:166:48 | fooResourceUrl : String | SpringSSRF.java:166:27:166:49 | new URI(...) : URI | provenance | MaD:294 |
+| SpringSSRF.java:166:35:166:48 | fooResourceUrl : String | SpringSSRF.java:166:27:166:49 | new URI(...) : URI | provenance | MaD:304 |
 | SpringSSRF.java:166:35:166:48 | fooResourceUrl : String | SpringSSRF.java:179:35:179:48 | fooResourceUrl : String | provenance |  |
-| SpringSSRF.java:179:27:179:49 | new URI(...) : URI | SpringSSRF.java:182:49:182:51 | uri | provenance | Sink:MaD:251 |
-| SpringSSRF.java:179:27:179:49 | new URI(...) : URI | SpringSSRF.java:183:58:183:60 | uri | provenance | Sink:MaD:252 |
-| SpringSSRF.java:179:27:179:49 | new URI(...) : URI | SpringSSRF.java:184:57:184:59 | uri | provenance | Sink:MaD:253 |
-| SpringSSRF.java:179:27:179:49 | new URI(...) : URI | SpringSSRF.java:185:66:185:68 | uri | provenance | Sink:MaD:255 |
-| SpringSSRF.java:179:27:179:49 | new URI(...) : URI | SpringSSRF.java:186:57:186:59 | uri | provenance | Sink:MaD:254 |
-| SpringSSRF.java:179:27:179:49 | new URI(...) : URI | SpringSSRF.java:187:66:187:68 | uri | provenance | Sink:MaD:256 |
+| SpringSSRF.java:179:27:179:49 | new URI(...) : URI | SpringSSRF.java:182:49:182:51 | uri | provenance | Sink:MaD:257 |
+| SpringSSRF.java:179:27:179:49 | new URI(...) : URI | SpringSSRF.java:183:58:183:60 | uri | provenance | Sink:MaD:258 |
+| SpringSSRF.java:179:27:179:49 | new URI(...) : URI | SpringSSRF.java:184:57:184:59 | uri | provenance | Sink:MaD:259 |
+| SpringSSRF.java:179:27:179:49 | new URI(...) : URI | SpringSSRF.java:185:66:185:68 | uri | provenance | Sink:MaD:261 |
+| SpringSSRF.java:179:27:179:49 | new URI(...) : URI | SpringSSRF.java:186:57:186:59 | uri | provenance | Sink:MaD:260 |
+| SpringSSRF.java:179:27:179:49 | new URI(...) : URI | SpringSSRF.java:187:66:187:68 | uri | provenance | Sink:MaD:262 |
 | SpringSSRF.java:179:35:179:48 | fooResourceUrl : String | SpringSSRF.java:179:27:179:49 | new URI(...) : URI | provenance | Config |
-| SpringSSRF.java:179:35:179:48 | fooResourceUrl : String | SpringSSRF.java:179:27:179:49 | new URI(...) : URI | provenance | MaD:294 |
-| URLClassLoaderSSRF.java:16:26:16:52 | getParameter(...) : String | URLClassLoaderSSRF.java:17:31:17:33 | url : String | provenance | Src:MaD:286  |
+| SpringSSRF.java:179:35:179:48 | fooResourceUrl : String | SpringSSRF.java:179:27:179:49 | new URI(...) : URI | provenance | MaD:304 |
+| URLClassLoaderSSRF.java:16:26:16:52 | getParameter(...) : String | URLClassLoaderSSRF.java:17:31:17:33 | url : String | provenance | Src:MaD:292  |
 | URLClassLoaderSSRF.java:17:23:17:34 | new URI(...) : URI | URLClassLoaderSSRF.java:18:74:18:76 | uri : URI | provenance |  |
 | URLClassLoaderSSRF.java:17:31:17:33 | url : String | URLClassLoaderSSRF.java:17:23:17:34 | new URI(...) : URI | provenance | Config |
-| URLClassLoaderSSRF.java:17:31:17:33 | url : String | URLClassLoaderSSRF.java:17:23:17:34 | new URI(...) : URI | provenance | MaD:294 |
-| URLClassLoaderSSRF.java:18:64:18:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:18:64:18:85 | new URL[] | provenance | Sink:MaD:13 |
-| URLClassLoaderSSRF.java:18:64:18:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:18:64:18:85 | new URL[] | provenance | Sink:MaD:13 |
-| URLClassLoaderSSRF.java:18:74:18:76 | uri : URI | URLClassLoaderSSRF.java:18:74:18:84 | toURL(...) : URL | provenance | MaD:298 |
+| URLClassLoaderSSRF.java:17:31:17:33 | url : String | URLClassLoaderSSRF.java:17:23:17:34 | new URI(...) : URI | provenance | MaD:304 |
+| URLClassLoaderSSRF.java:18:64:18:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:18:64:18:85 | new URL[] | provenance | Sink:MaD:19 |
+| URLClassLoaderSSRF.java:18:64:18:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:18:64:18:85 | new URL[] | provenance | Sink:MaD:19 |
+| URLClassLoaderSSRF.java:18:74:18:76 | uri : URI | URLClassLoaderSSRF.java:18:74:18:84 | toURL(...) : URL | provenance | MaD:308 |
 | URLClassLoaderSSRF.java:18:74:18:84 | toURL(...) : URL | URLClassLoaderSSRF.java:18:64:18:85 | {...} : URL[] [[]] : URL | provenance |  |
-| URLClassLoaderSSRF.java:28:26:28:52 | getParameter(...) : String | URLClassLoaderSSRF.java:29:31:29:33 | url : String | provenance | Src:MaD:286  |
+| URLClassLoaderSSRF.java:28:26:28:52 | getParameter(...) : String | URLClassLoaderSSRF.java:29:31:29:33 | url : String | provenance | Src:MaD:292  |
 | URLClassLoaderSSRF.java:29:23:29:34 | new URI(...) : URI | URLClassLoaderSSRF.java:30:74:30:76 | uri : URI | provenance |  |
 | URLClassLoaderSSRF.java:29:31:29:33 | url : String | URLClassLoaderSSRF.java:29:23:29:34 | new URI(...) : URI | provenance | Config |
-| URLClassLoaderSSRF.java:29:31:29:33 | url : String | URLClassLoaderSSRF.java:29:23:29:34 | new URI(...) : URI | provenance | MaD:294 |
-| URLClassLoaderSSRF.java:30:64:30:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:30:64:30:85 | new URL[] | provenance | Sink:MaD:14 |
-| URLClassLoaderSSRF.java:30:64:30:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:30:64:30:85 | new URL[] | provenance | Sink:MaD:14 |
-| URLClassLoaderSSRF.java:30:74:30:76 | uri : URI | URLClassLoaderSSRF.java:30:74:30:84 | toURL(...) : URL | provenance | MaD:298 |
+| URLClassLoaderSSRF.java:29:31:29:33 | url : String | URLClassLoaderSSRF.java:29:23:29:34 | new URI(...) : URI | provenance | MaD:304 |
+| URLClassLoaderSSRF.java:30:64:30:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:30:64:30:85 | new URL[] | provenance | Sink:MaD:20 |
+| URLClassLoaderSSRF.java:30:64:30:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:30:64:30:85 | new URL[] | provenance | Sink:MaD:20 |
+| URLClassLoaderSSRF.java:30:74:30:76 | uri : URI | URLClassLoaderSSRF.java:30:74:30:84 | toURL(...) : URL | provenance | MaD:308 |
 | URLClassLoaderSSRF.java:30:74:30:84 | toURL(...) : URL | URLClassLoaderSSRF.java:30:64:30:85 | {...} : URL[] [[]] : URL | provenance |  |
-| URLClassLoaderSSRF.java:40:26:40:52 | getParameter(...) : String | URLClassLoaderSSRF.java:41:31:41:33 | url : String | provenance | Src:MaD:286  |
+| URLClassLoaderSSRF.java:40:26:40:52 | getParameter(...) : String | URLClassLoaderSSRF.java:41:31:41:33 | url : String | provenance | Src:MaD:292  |
 | URLClassLoaderSSRF.java:41:23:41:34 | new URI(...) : URI | URLClassLoaderSSRF.java:44:74:44:76 | uri : URI | provenance |  |
 | URLClassLoaderSSRF.java:41:31:41:33 | url : String | URLClassLoaderSSRF.java:41:23:41:34 | new URI(...) : URI | provenance | Config |
-| URLClassLoaderSSRF.java:41:31:41:33 | url : String | URLClassLoaderSSRF.java:41:23:41:34 | new URI(...) : URI | provenance | MaD:294 |
-| URLClassLoaderSSRF.java:44:64:44:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:44:64:44:85 | new URL[] | provenance | Sink:MaD:15 |
-| URLClassLoaderSSRF.java:44:64:44:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:44:64:44:85 | new URL[] | provenance | Sink:MaD:15 |
-| URLClassLoaderSSRF.java:44:74:44:76 | uri : URI | URLClassLoaderSSRF.java:44:74:44:84 | toURL(...) : URL | provenance | MaD:298 |
+| URLClassLoaderSSRF.java:41:31:41:33 | url : String | URLClassLoaderSSRF.java:41:23:41:34 | new URI(...) : URI | provenance | MaD:304 |
+| URLClassLoaderSSRF.java:44:64:44:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:44:64:44:85 | new URL[] | provenance | Sink:MaD:21 |
+| URLClassLoaderSSRF.java:44:64:44:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:44:64:44:85 | new URL[] | provenance | Sink:MaD:21 |
+| URLClassLoaderSSRF.java:44:74:44:76 | uri : URI | URLClassLoaderSSRF.java:44:74:44:84 | toURL(...) : URL | provenance | MaD:308 |
 | URLClassLoaderSSRF.java:44:74:44:84 | toURL(...) : URL | URLClassLoaderSSRF.java:44:64:44:85 | {...} : URL[] [[]] : URL | provenance |  |
-| URLClassLoaderSSRF.java:54:26:54:52 | getParameter(...) : String | URLClassLoaderSSRF.java:55:31:55:33 | url : String | provenance | Src:MaD:286  |
+| URLClassLoaderSSRF.java:54:26:54:52 | getParameter(...) : String | URLClassLoaderSSRF.java:55:31:55:33 | url : String | provenance | Src:MaD:292  |
 | URLClassLoaderSSRF.java:55:23:55:34 | new URI(...) : URI | URLClassLoaderSSRF.java:56:82:56:84 | uri : URI | provenance |  |
 | URLClassLoaderSSRF.java:55:31:55:33 | url : String | URLClassLoaderSSRF.java:55:23:55:34 | new URI(...) : URI | provenance | Config |
-| URLClassLoaderSSRF.java:55:31:55:33 | url : String | URLClassLoaderSSRF.java:55:23:55:34 | new URI(...) : URI | provenance | MaD:294 |
-| URLClassLoaderSSRF.java:56:72:56:93 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:56:72:56:93 | new URL[] | provenance | Sink:MaD:16 |
-| URLClassLoaderSSRF.java:56:82:56:84 | uri : URI | URLClassLoaderSSRF.java:56:82:56:92 | toURL(...) : URL | provenance | MaD:298 |
+| URLClassLoaderSSRF.java:55:31:55:33 | url : String | URLClassLoaderSSRF.java:55:23:55:34 | new URI(...) : URI | provenance | MaD:304 |
+| URLClassLoaderSSRF.java:56:72:56:93 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:56:72:56:93 | new URL[] | provenance | Sink:MaD:22 |
+| URLClassLoaderSSRF.java:56:82:56:84 | uri : URI | URLClassLoaderSSRF.java:56:82:56:92 | toURL(...) : URL | provenance | MaD:308 |
 | URLClassLoaderSSRF.java:56:82:56:92 | toURL(...) : URL | URLClassLoaderSSRF.java:56:72:56:93 | {...} : URL[] [[]] : URL | provenance |  |
-| URLClassLoaderSSRF.java:66:26:66:52 | getParameter(...) : String | URLClassLoaderSSRF.java:67:31:67:33 | url : String | provenance | Src:MaD:286  |
+| URLClassLoaderSSRF.java:66:26:66:52 | getParameter(...) : String | URLClassLoaderSSRF.java:67:31:67:33 | url : String | provenance | Src:MaD:292  |
 | URLClassLoaderSSRF.java:67:23:67:34 | new URI(...) : URI | URLClassLoaderSSRF.java:70:31:70:33 | uri : URI | provenance |  |
 | URLClassLoaderSSRF.java:67:31:67:33 | url : String | URLClassLoaderSSRF.java:67:23:67:34 | new URI(...) : URI | provenance | Config |
-| URLClassLoaderSSRF.java:67:31:67:33 | url : String | URLClassLoaderSSRF.java:67:23:67:34 | new URI(...) : URI | provenance | MaD:294 |
-| URLClassLoaderSSRF.java:70:21:70:42 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:70:21:70:42 | new URL[] | provenance | Sink:MaD:11 |
-| URLClassLoaderSSRF.java:70:21:70:42 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:70:21:70:42 | new URL[] | provenance | Sink:MaD:11 |
-| URLClassLoaderSSRF.java:70:31:70:33 | uri : URI | URLClassLoaderSSRF.java:70:31:70:41 | toURL(...) : URL | provenance | MaD:298 |
+| URLClassLoaderSSRF.java:67:31:67:33 | url : String | URLClassLoaderSSRF.java:67:23:67:34 | new URI(...) : URI | provenance | MaD:304 |
+| URLClassLoaderSSRF.java:70:21:70:42 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:70:21:70:42 | new URL[] | provenance | Sink:MaD:17 |
+| URLClassLoaderSSRF.java:70:21:70:42 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:70:21:70:42 | new URL[] | provenance | Sink:MaD:17 |
+| URLClassLoaderSSRF.java:70:31:70:33 | uri : URI | URLClassLoaderSSRF.java:70:31:70:41 | toURL(...) : URL | provenance | MaD:308 |
 | URLClassLoaderSSRF.java:70:31:70:41 | toURL(...) : URL | URLClassLoaderSSRF.java:70:21:70:42 | {...} : URL[] [[]] : URL | provenance |  |
-| URLClassLoaderSSRF.java:83:26:83:52 | getParameter(...) : String | URLClassLoaderSSRF.java:84:31:84:33 | url : String | provenance | Src:MaD:286  |
+| URLClassLoaderSSRF.java:83:26:83:52 | getParameter(...) : String | URLClassLoaderSSRF.java:84:31:84:33 | url : String | provenance | Src:MaD:292  |
 | URLClassLoaderSSRF.java:84:23:84:34 | new URI(...) : URI | URLClassLoaderSSRF.java:89:31:89:33 | uri : URI | provenance |  |
 | URLClassLoaderSSRF.java:84:31:84:33 | url : String | URLClassLoaderSSRF.java:84:23:84:34 | new URI(...) : URI | provenance | Config |
-| URLClassLoaderSSRF.java:84:31:84:33 | url : String | URLClassLoaderSSRF.java:84:23:84:34 | new URI(...) : URI | provenance | MaD:294 |
-| URLClassLoaderSSRF.java:89:21:89:42 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:89:21:89:42 | new URL[] | provenance | Sink:MaD:12 |
-| URLClassLoaderSSRF.java:89:21:89:42 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:89:21:89:42 | new URL[] | provenance | Sink:MaD:12 |
-| URLClassLoaderSSRF.java:89:31:89:33 | uri : URI | URLClassLoaderSSRF.java:89:31:89:41 | toURL(...) : URL | provenance | MaD:298 |
+| URLClassLoaderSSRF.java:84:31:84:33 | url : String | URLClassLoaderSSRF.java:84:23:84:34 | new URI(...) : URI | provenance | MaD:304 |
+| URLClassLoaderSSRF.java:89:21:89:42 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:89:21:89:42 | new URL[] | provenance | Sink:MaD:18 |
+| URLClassLoaderSSRF.java:89:21:89:42 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:89:21:89:42 | new URL[] | provenance | Sink:MaD:18 |
+| URLClassLoaderSSRF.java:89:31:89:33 | uri : URI | URLClassLoaderSSRF.java:89:31:89:41 | toURL(...) : URL | provenance | MaD:308 |
 | URLClassLoaderSSRF.java:89:31:89:41 | toURL(...) : URL | URLClassLoaderSSRF.java:89:21:89:42 | {...} : URL[] [[]] : URL | provenance |  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:31:40:31:47 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:36:16:36:23 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:38:36:38:43 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:40:16:40:23 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:45:40:45:47 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:47:40:47:47 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:49:36:49:43 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:51:36:51:43 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:53:36:53:43 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:55:44:55:51 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:57:38:57:45 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:59:44:59:51 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:61:53:61:60 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:63:32:63:39 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:65:44:65:51 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:67:32:67:39 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:69:33:69:40 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:71:53:71:60 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:74:58:74:65 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:76:62:76:69 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:78:52:78:59 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:80:34:80:41 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:82:40:82:47 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:84:40:84:47 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:86:50:86:57 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:92:33:92:40 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:97:35:97:42 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:102:32:102:39 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:107:24:107:31 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:112:24:112:31 | source(...) : String | provenance | Src:MaD:286  |
-| mad/Test.java:31:40:31:47 | source(...) : String | mad/Test.java:31:24:31:47 | (...)... | provenance | Sink:MaD:7 |
-| mad/Test.java:36:16:36:23 | source(...) : String | mad/Test.java:36:10:36:23 | (...)... | provenance | Sink:MaD:9 |
-| mad/Test.java:38:36:38:43 | source(...) : String | mad/Test.java:38:28:38:43 | (...)... | provenance | Sink:MaD:8 |
-| mad/Test.java:40:16:40:23 | source(...) : String | mad/Test.java:40:10:40:23 | (...)... | provenance | Sink:MaD:10 |
-| mad/Test.java:45:40:45:47 | source(...) : String | mad/Test.java:45:32:45:47 | (...)... | provenance | Sink:MaD:11 |
-| mad/Test.java:45:40:45:47 | source(...) : String | mad/Test.java:45:32:45:47 | (...)... | provenance | Sink:MaD:11 |
-| mad/Test.java:47:40:47:47 | source(...) : String | mad/Test.java:47:32:47:47 | (...)... | provenance | Sink:MaD:12 |
-| mad/Test.java:47:40:47:47 | source(...) : String | mad/Test.java:47:32:47:47 | (...)... | provenance | Sink:MaD:12 |
-| mad/Test.java:49:36:49:43 | source(...) : String | mad/Test.java:49:28:49:43 | (...)... | provenance | Sink:MaD:13 |
-| mad/Test.java:49:36:49:43 | source(...) : String | mad/Test.java:49:28:49:43 | (...)... | provenance | Sink:MaD:13 |
-| mad/Test.java:51:36:51:43 | source(...) : String | mad/Test.java:51:28:51:43 | (...)... | provenance | Sink:MaD:14 |
-| mad/Test.java:51:36:51:43 | source(...) : String | mad/Test.java:51:28:51:43 | (...)... | provenance | Sink:MaD:14 |
-| mad/Test.java:53:36:53:43 | source(...) : String | mad/Test.java:53:28:53:43 | (...)... | provenance | Sink:MaD:15 |
-| mad/Test.java:53:36:53:43 | source(...) : String | mad/Test.java:53:28:53:43 | (...)... | provenance | Sink:MaD:15 |
-| mad/Test.java:55:44:55:51 | source(...) : String | mad/Test.java:55:36:55:51 | (...)... | provenance | Sink:MaD:16 |
-| mad/Test.java:57:38:57:45 | source(...) : String | mad/Test.java:57:32:57:45 | (...)... | provenance | Sink:MaD:25 |
-| mad/Test.java:59:44:59:51 | source(...) : String | mad/Test.java:59:38:59:51 | (...)... | provenance | Sink:MaD:26 |
-| mad/Test.java:61:53:61:60 | source(...) : String | mad/Test.java:61:47:61:60 | (...)... | provenance | Sink:MaD:24 |
-| mad/Test.java:63:32:63:39 | source(...) : String | mad/Test.java:63:26:63:39 | (...)... | provenance | Sink:MaD:28 |
-| mad/Test.java:65:44:65:51 | source(...) : String | mad/Test.java:65:38:65:51 | (...)... | provenance | Sink:MaD:29 |
-| mad/Test.java:67:32:67:39 | source(...) : String | mad/Test.java:67:26:67:39 | (...)... | provenance | Sink:MaD:27 |
-| mad/Test.java:69:33:69:40 | source(...) : String | mad/Test.java:69:27:69:40 | (...)... | provenance | Sink:MaD:22 |
-| mad/Test.java:71:53:71:60 | source(...) : String | mad/Test.java:71:47:71:60 | (...)... | provenance | Sink:MaD:30 |
-| mad/Test.java:74:58:74:65 | source(...) : String | mad/Test.java:74:50:74:65 | (...)... | provenance | Sink:MaD:32 |
-| mad/Test.java:76:62:76:69 | source(...) : String | mad/Test.java:76:50:76:69 | (...)... | provenance | Sink:MaD:31 |
-| mad/Test.java:78:52:78:59 | source(...) : String | mad/Test.java:78:43:78:59 | (...)... | provenance | Sink:MaD:33 |
-| mad/Test.java:80:34:80:41 | source(...) : String | mad/Test.java:80:25:80:41 | (...)... | provenance | Sink:MaD:34 |
-| mad/Test.java:82:40:82:47 | source(...) : String | mad/Test.java:82:31:82:47 | (...)... | provenance | Sink:MaD:35 |
-| mad/Test.java:84:40:84:47 | source(...) : String | mad/Test.java:84:31:84:47 | (...)... | provenance | Sink:MaD:36 |
-| mad/Test.java:86:50:86:57 | source(...) : String | mad/Test.java:86:41:86:57 | (...)... | provenance | Sink:MaD:37 |
-| mad/Test.java:92:33:92:40 | source(...) : String | mad/Test.java:92:24:92:40 | (...)... | provenance | Sink:MaD:21 |
-| mad/Test.java:97:35:97:42 | source(...) : String | mad/Test.java:97:29:97:42 | (...)... | provenance | Sink:MaD:242 |
-| mad/Test.java:102:32:102:39 | source(...) : String | mad/Test.java:102:26:102:39 | (...)... | provenance | Sink:MaD:249 |
-| mad/Test.java:107:24:107:31 | source(...) : String | mad/Test.java:107:15:107:31 | (...)... | provenance | Sink:MaD:285 |
-| mad/Test.java:112:24:112:31 | source(...) : String | mad/Test.java:112:15:112:31 | (...)... | provenance | Sink:MaD:284 |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:31:40:31:47 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:36:16:36:23 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:38:36:38:43 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:40:16:40:23 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:45:40:45:47 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:47:40:47:47 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:49:36:49:43 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:51:36:51:43 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:53:36:53:43 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:55:44:55:51 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:57:38:57:45 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:59:44:59:51 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:61:53:61:60 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:63:32:63:39 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:65:44:65:51 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:67:32:67:39 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:69:33:69:40 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:71:53:71:60 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:74:58:74:65 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:76:62:76:69 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:78:52:78:59 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:80:34:80:41 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:82:40:82:47 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:84:40:84:47 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:86:50:86:57 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:92:33:92:40 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:97:35:97:42 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:102:32:102:39 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:107:24:107:31 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:112:24:112:31 | source(...) : String | provenance | Src:MaD:292  |
+| mad/Test.java:31:40:31:47 | source(...) : String | mad/Test.java:31:24:31:47 | (...)... | provenance | Sink:MaD:13 |
+| mad/Test.java:36:16:36:23 | source(...) : String | mad/Test.java:36:10:36:23 | (...)... | provenance | Sink:MaD:15 |
+| mad/Test.java:38:36:38:43 | source(...) : String | mad/Test.java:38:28:38:43 | (...)... | provenance | Sink:MaD:14 |
+| mad/Test.java:40:16:40:23 | source(...) : String | mad/Test.java:40:10:40:23 | (...)... | provenance | Sink:MaD:16 |
+| mad/Test.java:45:40:45:47 | source(...) : String | mad/Test.java:45:32:45:47 | (...)... | provenance | Sink:MaD:17 |
+| mad/Test.java:45:40:45:47 | source(...) : String | mad/Test.java:45:32:45:47 | (...)... | provenance | Sink:MaD:17 |
+| mad/Test.java:47:40:47:47 | source(...) : String | mad/Test.java:47:32:47:47 | (...)... | provenance | Sink:MaD:18 |
+| mad/Test.java:47:40:47:47 | source(...) : String | mad/Test.java:47:32:47:47 | (...)... | provenance | Sink:MaD:18 |
+| mad/Test.java:49:36:49:43 | source(...) : String | mad/Test.java:49:28:49:43 | (...)... | provenance | Sink:MaD:19 |
+| mad/Test.java:49:36:49:43 | source(...) : String | mad/Test.java:49:28:49:43 | (...)... | provenance | Sink:MaD:19 |
+| mad/Test.java:51:36:51:43 | source(...) : String | mad/Test.java:51:28:51:43 | (...)... | provenance | Sink:MaD:20 |
+| mad/Test.java:51:36:51:43 | source(...) : String | mad/Test.java:51:28:51:43 | (...)... | provenance | Sink:MaD:20 |
+| mad/Test.java:53:36:53:43 | source(...) : String | mad/Test.java:53:28:53:43 | (...)... | provenance | Sink:MaD:21 |
+| mad/Test.java:53:36:53:43 | source(...) : String | mad/Test.java:53:28:53:43 | (...)... | provenance | Sink:MaD:21 |
+| mad/Test.java:55:44:55:51 | source(...) : String | mad/Test.java:55:36:55:51 | (...)... | provenance | Sink:MaD:22 |
+| mad/Test.java:57:38:57:45 | source(...) : String | mad/Test.java:57:32:57:45 | (...)... | provenance | Sink:MaD:31 |
+| mad/Test.java:59:44:59:51 | source(...) : String | mad/Test.java:59:38:59:51 | (...)... | provenance | Sink:MaD:32 |
+| mad/Test.java:61:53:61:60 | source(...) : String | mad/Test.java:61:47:61:60 | (...)... | provenance | Sink:MaD:30 |
+| mad/Test.java:63:32:63:39 | source(...) : String | mad/Test.java:63:26:63:39 | (...)... | provenance | Sink:MaD:34 |
+| mad/Test.java:65:44:65:51 | source(...) : String | mad/Test.java:65:38:65:51 | (...)... | provenance | Sink:MaD:35 |
+| mad/Test.java:67:32:67:39 | source(...) : String | mad/Test.java:67:26:67:39 | (...)... | provenance | Sink:MaD:33 |
+| mad/Test.java:69:33:69:40 | source(...) : String | mad/Test.java:69:27:69:40 | (...)... | provenance | Sink:MaD:28 |
+| mad/Test.java:71:53:71:60 | source(...) : String | mad/Test.java:71:47:71:60 | (...)... | provenance | Sink:MaD:36 |
+| mad/Test.java:74:58:74:65 | source(...) : String | mad/Test.java:74:50:74:65 | (...)... | provenance | Sink:MaD:38 |
+| mad/Test.java:76:62:76:69 | source(...) : String | mad/Test.java:76:50:76:69 | (...)... | provenance | Sink:MaD:37 |
+| mad/Test.java:78:52:78:59 | source(...) : String | mad/Test.java:78:43:78:59 | (...)... | provenance | Sink:MaD:39 |
+| mad/Test.java:80:34:80:41 | source(...) : String | mad/Test.java:80:25:80:41 | (...)... | provenance | Sink:MaD:40 |
+| mad/Test.java:82:40:82:47 | source(...) : String | mad/Test.java:82:31:82:47 | (...)... | provenance | Sink:MaD:41 |
+| mad/Test.java:84:40:84:47 | source(...) : String | mad/Test.java:84:31:84:47 | (...)... | provenance | Sink:MaD:42 |
+| mad/Test.java:86:50:86:57 | source(...) : String | mad/Test.java:86:41:86:57 | (...)... | provenance | Sink:MaD:43 |
+| mad/Test.java:92:33:92:40 | source(...) : String | mad/Test.java:92:24:92:40 | (...)... | provenance | Sink:MaD:27 |
+| mad/Test.java:97:35:97:42 | source(...) : String | mad/Test.java:97:29:97:42 | (...)... | provenance | Sink:MaD:248 |
+| mad/Test.java:102:32:102:39 | source(...) : String | mad/Test.java:102:26:102:39 | (...)... | provenance | Sink:MaD:255 |
+| mad/Test.java:107:24:107:31 | source(...) : String | mad/Test.java:107:15:107:31 | (...)... | provenance | Sink:MaD:291 |
+| mad/Test.java:112:24:112:31 | source(...) : String | mad/Test.java:112:15:112:31 | (...)... | provenance | Sink:MaD:290 |
 models
 | 1 | Sink: com.zaxxer.hikari; HikariConfig; false; HikariConfig; (Properties); ; Argument[0]; request-forgery; manual |
 | 2 | Sink: com.zaxxer.hikari; HikariConfig; false; setJdbcUrl; (String); ; Argument[0]; request-forgery; manual |
-| 3 | Sink: jakarta.ws.rs.client; Client; true; target; ; ; Argument[0]; request-forgery; manual |
-| 4 | Sink: java.net.http; HttpClient; true; send; (HttpRequest,HttpResponse$BodyHandler); ; Argument[0]; request-forgery; ai-manual |
-| 5 | Sink: java.net.http; HttpRequest$Builder; false; uri; ; ; Argument[0]; request-forgery; manual |
-| 6 | Sink: java.net.http; HttpRequest; false; newBuilder; ; ; Argument[0]; request-forgery; manual |
-| 7 | Sink: java.net; DatagramSocket; true; connect; (SocketAddress); ; Argument[0]; request-forgery; ai-manual |
-| 8 | Sink: java.net; URL; false; openConnection; (Proxy); ; Argument[0]; request-forgery; ai-manual |
-| 9 | Sink: java.net; URL; false; openConnection; ; ; Argument[this]; request-forgery; manual |
-| 10 | Sink: java.net; URL; false; openStream; ; ; Argument[this]; request-forgery; manual |
-| 11 | Sink: java.net; URLClassLoader; false; URLClassLoader; (String,URL[],ClassLoader); ; Argument[1]; request-forgery; manual |
-| 12 | Sink: java.net; URLClassLoader; false; URLClassLoader; (String,URL[],ClassLoader,URLStreamHandlerFactory); ; Argument[1]; request-forgery; manual |
-| 13 | Sink: java.net; URLClassLoader; false; URLClassLoader; (URL[]); ; Argument[0]; request-forgery; manual |
-| 14 | Sink: java.net; URLClassLoader; false; URLClassLoader; (URL[],ClassLoader); ; Argument[0]; request-forgery; manual |
-| 15 | Sink: java.net; URLClassLoader; false; URLClassLoader; (URL[],ClassLoader,URLStreamHandlerFactory); ; Argument[0]; request-forgery; manual |
-| 16 | Sink: java.net; URLClassLoader; false; newInstance; ; ; Argument[0]; request-forgery; manual |
-| 17 | Sink: java.sql; Driver; false; connect; (String,Properties); ; Argument[0]; request-forgery; manual |
-| 18 | Sink: java.sql; DriverManager; false; getConnection; (String); ; Argument[0]; request-forgery; manual |
-| 19 | Sink: java.sql; DriverManager; false; getConnection; (String,Properties); ; Argument[0]; request-forgery; manual |
-| 20 | Sink: java.sql; DriverManager; false; getConnection; (String,String,String); ; Argument[0]; request-forgery; manual |
-| 21 | Sink: javafx.scene.web; WebEngine; false; load; (String); ; Argument[0]; request-forgery; ai-manual |
-| 22 | Sink: javax.activation; URLDataSource; true; URLDataSource; ; ; Argument[0]; request-forgery; manual |
-| 23 | Sink: javax.ws.rs.client; Client; true; target; ; ; Argument[0]; request-forgery; manual |
-| 24 | Sink: org.apache.commons.jelly; JellyContext; true; JellyContext; (JellyContext,URL); ; Argument[1]; request-forgery; ai-manual |
-| 25 | Sink: org.apache.commons.jelly; JellyContext; true; JellyContext; (JellyContext,URL,URL); ; Argument[1]; request-forgery; ai-manual |
-| 26 | Sink: org.apache.commons.jelly; JellyContext; true; JellyContext; (JellyContext,URL,URL); ; Argument[2]; request-forgery; ai-manual |
-| 27 | Sink: org.apache.commons.jelly; JellyContext; true; JellyContext; (URL); ; Argument[0]; request-forgery; ai-manual |
-| 28 | Sink: org.apache.commons.jelly; JellyContext; true; JellyContext; (URL,URL); ; Argument[0]; request-forgery; ai-manual |
-| 29 | Sink: org.apache.commons.jelly; JellyContext; true; JellyContext; (URL,URL); ; Argument[1]; request-forgery; ai-manual |
-| 30 | Sink: org.apache.cxf.catalog; OASISCatalogManager; true; loadCatalog; (URL); ; Argument[0]; request-forgery; manual |
-| 31 | Sink: org.apache.cxf.common.classloader; ClassLoaderUtils; true; getURLClassLoader; (List,ClassLoader); ; Argument[0]; request-forgery; manual |
-| 32 | Sink: org.apache.cxf.common.classloader; ClassLoaderUtils; true; getURLClassLoader; (URL[],ClassLoader); ; Argument[0]; request-forgery; manual |
-| 33 | Sink: org.apache.cxf.resource; ExtendedURIResolver; true; resolve; (String,String); ; Argument[0]; request-forgery; manual |
-| 34 | Sink: org.apache.cxf.resource; URIResolver; true; URIResolver; (String); ; Argument[0]; request-forgery; manual |
-| 35 | Sink: org.apache.cxf.resource; URIResolver; true; URIResolver; (String,String); ; Argument[1]; request-forgery; manual |
-| 36 | Sink: org.apache.cxf.resource; URIResolver; true; URIResolver; (String,String,Class); ; Argument[1]; request-forgery; manual |
-| 37 | Sink: org.apache.cxf.resource; URIResolver; true; resolve; (String,String,Class); ; Argument[1]; request-forgery; manual |
-| 38 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; create; (Method,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
-| 39 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; create; (Method,String); ; Argument[1]; request-forgery; hq-manual |
-| 40 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; create; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
-| 41 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; create; (String,String); ; Argument[1]; request-forgery; hq-manual |
-| 42 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; create; (String,URI); ; Argument[1]; request-forgery; hq-manual |
-| 43 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; delete; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 44 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; delete; (String); ; Argument[0]; request-forgery; hq-manual |
-| 45 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; delete; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 46 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; get; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 47 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; get; (String); ; Argument[0]; request-forgery; hq-manual |
-| 48 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; get; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 49 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; head; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 50 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; head; (String); ; Argument[0]; request-forgery; hq-manual |
-| 51 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; head; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 52 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; options; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 53 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; options; (String); ; Argument[0]; request-forgery; hq-manual |
-| 54 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; options; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 55 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; patch; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 56 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; patch; (String); ; Argument[0]; request-forgery; hq-manual |
-| 57 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; patch; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 58 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; post; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 59 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; post; (String); ; Argument[0]; request-forgery; hq-manual |
-| 60 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; post; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 61 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; put; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 62 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; put; (String); ; Argument[0]; request-forgery; hq-manual |
-| 63 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; put; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 64 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; trace; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 65 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; trace; (String); ; Argument[0]; request-forgery; hq-manual |
-| 66 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; trace; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 67 | Sink: org.apache.hc.client5.http.async.methods; ConfigurableHttpRequest; true; ConfigurableHttpRequest; (String,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
-| 68 | Sink: org.apache.hc.client5.http.async.methods; ConfigurableHttpRequest; true; ConfigurableHttpRequest; (String,URI); ; Argument[1]; request-forgery; hq-manual |
-| 69 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; SimpleHttpRequest; (Method,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
-| 70 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; SimpleHttpRequest; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
-| 71 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; SimpleHttpRequest; (String,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
-| 72 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; SimpleHttpRequest; (String,URI); ; Argument[1]; request-forgery; hq-manual |
-| 73 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; create; (Method,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
-| 74 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; create; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
-| 75 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; create; (String,String); ; Argument[1]; request-forgery; hq-manual |
-| 76 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; create; (String,URI); ; Argument[1]; request-forgery; hq-manual |
-| 77 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; create; (Method,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
-| 78 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; create; (Method,String); ; Argument[1]; request-forgery; hq-manual |
-| 79 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; create; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
-| 80 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; create; (String,String); ; Argument[1]; request-forgery; hq-manual |
-| 81 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; create; (String,URI); ; Argument[1]; request-forgery; hq-manual |
-| 82 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; delete; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 83 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; delete; (String); ; Argument[0]; request-forgery; hq-manual |
-| 84 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; delete; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 85 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; get; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 86 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; get; (String); ; Argument[0]; request-forgery; hq-manual |
-| 87 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; get; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 88 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; head; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 89 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; head; (String); ; Argument[0]; request-forgery; hq-manual |
-| 90 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; head; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 91 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; options; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 92 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; options; (String); ; Argument[0]; request-forgery; hq-manual |
-| 93 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; options; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 94 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; patch; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 95 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; patch; (String); ; Argument[0]; request-forgery; hq-manual |
-| 96 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; patch; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 97 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; post; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 98 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; post; (String); ; Argument[0]; request-forgery; hq-manual |
-| 99 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; post; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 100 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; put; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 101 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; put; (String); ; Argument[0]; request-forgery; hq-manual |
-| 102 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; put; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 103 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; trace; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
-| 104 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; trace; (String); ; Argument[0]; request-forgery; hq-manual |
-| 105 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; trace; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 106 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; delete; (String); ; Argument[0]; request-forgery; hq-manual |
-| 107 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; delete; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 108 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; get; (String); ; Argument[0]; request-forgery; hq-manual |
-| 109 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; get; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 110 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; head; (String); ; Argument[0]; request-forgery; hq-manual |
-| 111 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; head; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 112 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; options; (String); ; Argument[0]; request-forgery; hq-manual |
-| 113 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; options; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 114 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; patch; (String); ; Argument[0]; request-forgery; hq-manual |
-| 115 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; patch; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 116 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; post; (String); ; Argument[0]; request-forgery; hq-manual |
-| 117 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; post; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 118 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; put; (String); ; Argument[0]; request-forgery; hq-manual |
-| 119 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; put; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 120 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; trace; (String); ; Argument[0]; request-forgery; hq-manual |
-| 121 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; trace; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 122 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; create; (Method,String); ; Argument[1]; request-forgery; hq-manual |
-| 123 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; create; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
-| 124 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; create; (String,String); ; Argument[1]; request-forgery; hq-manual |
-| 125 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; create; (String,URI); ; Argument[1]; request-forgery; hq-manual |
-| 126 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; delete; (String); ; Argument[0]; request-forgery; hq-manual |
-| 127 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; delete; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 128 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; get; (String); ; Argument[0]; request-forgery; hq-manual |
-| 129 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; get; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 130 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; head; (String); ; Argument[0]; request-forgery; hq-manual |
-| 131 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; head; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 132 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; options; (String); ; Argument[0]; request-forgery; hq-manual |
-| 133 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; options; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 134 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; patch; (String); ; Argument[0]; request-forgery; hq-manual |
-| 135 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; patch; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 136 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; post; (String); ; Argument[0]; request-forgery; hq-manual |
-| 137 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; post; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 138 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; put; (String); ; Argument[0]; request-forgery; hq-manual |
-| 139 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; put; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 140 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; trace; (String); ; Argument[0]; request-forgery; hq-manual |
-| 141 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; trace; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 142 | Sink: org.apache.hc.client5.http.classic.methods; HttpDelete; true; HttpDelete; (String); ; Argument[0]; request-forgery; hq-manual |
-| 143 | Sink: org.apache.hc.client5.http.classic.methods; HttpDelete; true; HttpDelete; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 144 | Sink: org.apache.hc.client5.http.classic.methods; HttpGet; true; HttpGet; (String); ; Argument[0]; request-forgery; hq-manual |
-| 145 | Sink: org.apache.hc.client5.http.classic.methods; HttpGet; true; HttpGet; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 146 | Sink: org.apache.hc.client5.http.classic.methods; HttpHead; true; HttpHead; (String); ; Argument[0]; request-forgery; hq-manual |
-| 147 | Sink: org.apache.hc.client5.http.classic.methods; HttpHead; true; HttpHead; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 148 | Sink: org.apache.hc.client5.http.classic.methods; HttpOptions; true; HttpOptions; (String); ; Argument[0]; request-forgery; hq-manual |
-| 149 | Sink: org.apache.hc.client5.http.classic.methods; HttpOptions; true; HttpOptions; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 150 | Sink: org.apache.hc.client5.http.classic.methods; HttpPatch; true; HttpPatch; (String); ; Argument[0]; request-forgery; hq-manual |
-| 151 | Sink: org.apache.hc.client5.http.classic.methods; HttpPatch; true; HttpPatch; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 152 | Sink: org.apache.hc.client5.http.classic.methods; HttpPost; true; HttpPost; (String); ; Argument[0]; request-forgery; hq-manual |
-| 153 | Sink: org.apache.hc.client5.http.classic.methods; HttpPost; true; HttpPost; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 154 | Sink: org.apache.hc.client5.http.classic.methods; HttpPut; true; HttpPut; (String); ; Argument[0]; request-forgery; hq-manual |
-| 155 | Sink: org.apache.hc.client5.http.classic.methods; HttpPut; true; HttpPut; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 156 | Sink: org.apache.hc.client5.http.classic.methods; HttpTrace; true; HttpTrace; (String); ; Argument[0]; request-forgery; hq-manual |
-| 157 | Sink: org.apache.hc.client5.http.classic.methods; HttpTrace; true; HttpTrace; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 158 | Sink: org.apache.hc.client5.http.classic.methods; HttpUriRequestBase; true; HttpUriRequestBase; (String,URI); ; Argument[1]; request-forgery; hq-manual |
-| 159 | Sink: org.apache.hc.client5.http.fluent; Request; true; create; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
-| 160 | Sink: org.apache.hc.client5.http.fluent; Request; true; create; (String,String); ; Argument[1]; request-forgery; hq-manual |
-| 161 | Sink: org.apache.hc.client5.http.fluent; Request; true; create; (String,URI); ; Argument[1]; request-forgery; hq-manual |
-| 162 | Sink: org.apache.hc.client5.http.fluent; Request; true; delete; (String); ; Argument[0]; request-forgery; hq-manual |
-| 163 | Sink: org.apache.hc.client5.http.fluent; Request; true; delete; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 164 | Sink: org.apache.hc.client5.http.fluent; Request; true; get; (String); ; Argument[0]; request-forgery; hq-manual |
-| 165 | Sink: org.apache.hc.client5.http.fluent; Request; true; get; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 166 | Sink: org.apache.hc.client5.http.fluent; Request; true; head; (String); ; Argument[0]; request-forgery; hq-manual |
-| 167 | Sink: org.apache.hc.client5.http.fluent; Request; true; head; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 168 | Sink: org.apache.hc.client5.http.fluent; Request; true; options; (String); ; Argument[0]; request-forgery; hq-manual |
-| 169 | Sink: org.apache.hc.client5.http.fluent; Request; true; options; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 170 | Sink: org.apache.hc.client5.http.fluent; Request; true; patch; (String); ; Argument[0]; request-forgery; hq-manual |
-| 171 | Sink: org.apache.hc.client5.http.fluent; Request; true; patch; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 172 | Sink: org.apache.hc.client5.http.fluent; Request; true; post; (String); ; Argument[0]; request-forgery; hq-manual |
-| 173 | Sink: org.apache.hc.client5.http.fluent; Request; true; post; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 174 | Sink: org.apache.hc.client5.http.fluent; Request; true; put; (String); ; Argument[0]; request-forgery; hq-manual |
-| 175 | Sink: org.apache.hc.client5.http.fluent; Request; true; put; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 176 | Sink: org.apache.hc.client5.http.fluent; Request; true; trace; (String); ; Argument[0]; request-forgery; hq-manual |
-| 177 | Sink: org.apache.hc.client5.http.fluent; Request; true; trace; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 178 | Sink: org.apache.hc.core5.http.impl.bootstrap; HttpAsyncRequester; true; connect; (HttpHost,Timeout); ; Argument[0]; request-forgery; hq-manual |
-| 179 | Sink: org.apache.hc.core5.http.impl.bootstrap; HttpAsyncRequester; true; connect; (HttpHost,Timeout,Object,FutureCallback); ; Argument[0]; request-forgery; hq-manual |
-| 180 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; delete; (String); ; Argument[0]; request-forgery; hq-manual |
-| 181 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; delete; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 182 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; get; (String); ; Argument[0]; request-forgery; hq-manual |
-| 183 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; get; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 184 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; head; (String); ; Argument[0]; request-forgery; hq-manual |
-| 185 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; head; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 186 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; options; (String); ; Argument[0]; request-forgery; hq-manual |
-| 187 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; options; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 188 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; patch; (String); ; Argument[0]; request-forgery; hq-manual |
-| 189 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; patch; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 190 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; post; (String); ; Argument[0]; request-forgery; hq-manual |
-| 191 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; post; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 192 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; put; (String); ; Argument[0]; request-forgery; hq-manual |
-| 193 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; put; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 194 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; trace; (String); ; Argument[0]; request-forgery; hq-manual |
-| 195 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; trace; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 196 | Sink: org.apache.hc.core5.http.message; BasicClassicHttpRequest; true; BasicClassicHttpRequest; (Method,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
-| 197 | Sink: org.apache.hc.core5.http.message; BasicClassicHttpRequest; true; BasicClassicHttpRequest; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
-| 198 | Sink: org.apache.hc.core5.http.message; BasicClassicHttpRequest; true; BasicClassicHttpRequest; (String,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
-| 199 | Sink: org.apache.hc.core5.http.message; BasicClassicHttpRequest; true; BasicClassicHttpRequest; (String,URI); ; Argument[1]; request-forgery; hq-manual |
-| 200 | Sink: org.apache.hc.core5.http.message; BasicHttpRequest; true; BasicHttpRequest; (Method,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
-| 201 | Sink: org.apache.hc.core5.http.message; BasicHttpRequest; true; BasicHttpRequest; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
-| 202 | Sink: org.apache.hc.core5.http.message; BasicHttpRequest; true; BasicHttpRequest; (String,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
-| 203 | Sink: org.apache.hc.core5.http.message; BasicHttpRequest; true; BasicHttpRequest; (String,URI); ; Argument[1]; request-forgery; hq-manual |
-| 204 | Sink: org.apache.hc.core5.http.support; AbstractRequestBuilder; true; setHttpHost; (HttpHost); ; Argument[0]; request-forgery; hq-manual |
-| 205 | Sink: org.apache.hc.core5.http.support; AbstractRequestBuilder; true; setUri; (String); ; Argument[0]; request-forgery; hq-manual |
-| 206 | Sink: org.apache.hc.core5.http.support; AbstractRequestBuilder; true; setUri; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 207 | Sink: org.apache.hc.core5.http; HttpRequest; true; setUri; (URI); ; Argument[0]; request-forgery; hq-manual |
-| 208 | Sink: org.apache.hc.core5.http; HttpRequestFactory; true; newHttpRequest; (String,String); ; Argument[1]; request-forgery; hq-manual |
-| 209 | Sink: org.apache.hc.core5.http; HttpRequestFactory; true; newHttpRequest; (String,URI); ; Argument[1]; request-forgery; hq-manual |
-| 210 | Sink: org.apache.http.client.methods; HttpDelete; false; HttpDelete; ; ; Argument[0]; request-forgery; manual |
-| 211 | Sink: org.apache.http.client.methods; HttpGet; false; HttpGet; ; ; Argument[0]; request-forgery; manual |
-| 212 | Sink: org.apache.http.client.methods; HttpHead; false; HttpHead; ; ; Argument[0]; request-forgery; manual |
-| 213 | Sink: org.apache.http.client.methods; HttpOptions; false; HttpOptions; ; ; Argument[0]; request-forgery; manual |
-| 214 | Sink: org.apache.http.client.methods; HttpPatch; false; HttpPatch; ; ; Argument[0]; request-forgery; manual |
-| 215 | Sink: org.apache.http.client.methods; HttpPost; false; HttpPost; ; ; Argument[0]; request-forgery; manual |
-| 216 | Sink: org.apache.http.client.methods; HttpPut; false; HttpPut; ; ; Argument[0]; request-forgery; manual |
-| 217 | Sink: org.apache.http.client.methods; HttpRequestBase; true; setURI; ; ; Argument[0]; request-forgery; manual |
-| 218 | Sink: org.apache.http.client.methods; HttpTrace; false; HttpTrace; ; ; Argument[0]; request-forgery; manual |
-| 219 | Sink: org.apache.http.client.methods; RequestBuilder; false; delete; ; ; Argument[0]; request-forgery; manual |
-| 220 | Sink: org.apache.http.client.methods; RequestBuilder; false; get; ; ; Argument[0]; request-forgery; manual |
-| 221 | Sink: org.apache.http.client.methods; RequestBuilder; false; head; ; ; Argument[0]; request-forgery; manual |
-| 222 | Sink: org.apache.http.client.methods; RequestBuilder; false; options; ; ; Argument[0]; request-forgery; manual |
-| 223 | Sink: org.apache.http.client.methods; RequestBuilder; false; patch; ; ; Argument[0]; request-forgery; manual |
-| 224 | Sink: org.apache.http.client.methods; RequestBuilder; false; post; ; ; Argument[0]; request-forgery; manual |
-| 225 | Sink: org.apache.http.client.methods; RequestBuilder; false; put; ; ; Argument[0]; request-forgery; manual |
-| 226 | Sink: org.apache.http.client.methods; RequestBuilder; false; setUri; ; ; Argument[0]; request-forgery; manual |
-| 227 | Sink: org.apache.http.client.methods; RequestBuilder; false; trace; ; ; Argument[0]; request-forgery; manual |
-| 228 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpHost,HttpRequest); ; Argument[0]; request-forgery; ai-manual |
-| 229 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpHost,HttpRequest,HttpContext); ; Argument[0]; request-forgery; ai-manual |
-| 230 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpHost,HttpRequest,ResponseHandler); ; Argument[0]; request-forgery; ai-manual |
-| 231 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpHost,HttpRequest,ResponseHandler,HttpContext); ; Argument[0]; request-forgery; ai-manual |
-| 232 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpUriRequest); ; Argument[0]; request-forgery; ai-manual |
-| 233 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpUriRequest,HttpContext); ; Argument[0]; request-forgery; ai-manual |
-| 234 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpUriRequest,ResponseHandler); ; Argument[0]; request-forgery; ai-manual |
-| 235 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpUriRequest,ResponseHandler,HttpContext); ; Argument[0]; request-forgery; ai-manual |
-| 236 | Sink: org.apache.http.message; BasicHttpEntityEnclosingRequest; false; BasicHttpEntityEnclosingRequest; (RequestLine); ; Argument[0]; request-forgery; manual |
-| 237 | Sink: org.apache.http.message; BasicHttpEntityEnclosingRequest; false; BasicHttpEntityEnclosingRequest; (String,String); ; Argument[1]; request-forgery; manual |
-| 238 | Sink: org.apache.http.message; BasicHttpEntityEnclosingRequest; false; BasicHttpEntityEnclosingRequest; (String,String,ProtocolVersion); ; Argument[1]; request-forgery; manual |
-| 239 | Sink: org.apache.http.message; BasicHttpRequest; false; BasicHttpRequest; (RequestLine); ; Argument[0]; request-forgery; manual |
-| 240 | Sink: org.apache.http.message; BasicHttpRequest; false; BasicHttpRequest; (String,String); ; Argument[1]; request-forgery; manual |
-| 241 | Sink: org.apache.http.message; BasicHttpRequest; false; BasicHttpRequest; (String,String,ProtocolVersion); ; Argument[1]; request-forgery; manual |
-| 242 | Sink: org.codehaus.cargo.container.installer; ZipURLInstaller; true; ZipURLInstaller; (URL,String,String); ; Argument[0]; request-forgery; ai-manual |
-| 243 | Sink: org.jdbi.v3.core; Jdbi; false; create; (String); ; Argument[0]; request-forgery; manual |
-| 244 | Sink: org.jdbi.v3.core; Jdbi; false; create; (String,Properties); ; Argument[0]; request-forgery; manual |
-| 245 | Sink: org.jdbi.v3.core; Jdbi; false; create; (String,String,String); ; Argument[0]; request-forgery; manual |
-| 246 | Sink: org.jdbi.v3.core; Jdbi; false; open; (String); ; Argument[0]; request-forgery; manual |
-| 247 | Sink: org.jdbi.v3.core; Jdbi; false; open; (String,Properties); ; Argument[0]; request-forgery; manual |
-| 248 | Sink: org.jdbi.v3.core; Jdbi; false; open; (String,String,String); ; Argument[0]; request-forgery; manual |
-| 249 | Sink: org.kohsuke.stapler; HttpResponses; true; staticResource; (URL); ; Argument[0]; request-forgery; ai-manual |
-| 250 | Sink: org.springframework.boot.jdbc; DataSourceBuilder; false; url; (String); ; Argument[0]; request-forgery; manual |
-| 251 | Sink: org.springframework.http; RequestEntity; false; RequestEntity; (HttpMethod,URI); ; Argument[1]; request-forgery; manual |
-| 252 | Sink: org.springframework.http; RequestEntity; false; RequestEntity; (MultiValueMap,HttpMethod,URI); ; Argument[2]; request-forgery; manual |
-| 253 | Sink: org.springframework.http; RequestEntity; false; RequestEntity; (Object,HttpMethod,URI); ; Argument[2]; request-forgery; manual |
-| 254 | Sink: org.springframework.http; RequestEntity; false; RequestEntity; (Object,HttpMethod,URI,Type); ; Argument[2]; request-forgery; manual |
-| 255 | Sink: org.springframework.http; RequestEntity; false; RequestEntity; (Object,MultiValueMap,HttpMethod,URI); ; Argument[3]; request-forgery; manual |
-| 256 | Sink: org.springframework.http; RequestEntity; false; RequestEntity; (Object,MultiValueMap,HttpMethod,URI,Type); ; Argument[3]; request-forgery; manual |
-| 257 | Sink: org.springframework.http; RequestEntity; false; delete; ; ; Argument[0]; request-forgery; manual |
-| 258 | Sink: org.springframework.http; RequestEntity; false; get; ; ; Argument[0]; request-forgery; manual |
-| 259 | Sink: org.springframework.http; RequestEntity; false; head; ; ; Argument[0]; request-forgery; manual |
-| 260 | Sink: org.springframework.http; RequestEntity; false; method; ; ; Argument[1]; request-forgery; manual |
-| 261 | Sink: org.springframework.http; RequestEntity; false; options; ; ; Argument[0]; request-forgery; manual |
-| 262 | Sink: org.springframework.http; RequestEntity; false; patch; ; ; Argument[0]; request-forgery; manual |
-| 263 | Sink: org.springframework.http; RequestEntity; false; post; ; ; Argument[0]; request-forgery; manual |
-| 264 | Sink: org.springframework.http; RequestEntity; false; put; ; ; Argument[0]; request-forgery; manual |
-| 265 | Sink: org.springframework.jdbc.datasource; AbstractDriverBasedDataSource; false; setUrl; (String); ; Argument[0]; request-forgery; manual |
-| 266 | Sink: org.springframework.jdbc.datasource; DriverManagerDataSource; false; DriverManagerDataSource; (String); ; Argument[0]; request-forgery; manual |
-| 267 | Sink: org.springframework.jdbc.datasource; DriverManagerDataSource; false; DriverManagerDataSource; (String,Properties); ; Argument[0]; request-forgery; manual |
-| 268 | Sink: org.springframework.jdbc.datasource; DriverManagerDataSource; false; DriverManagerDataSource; (String,String,String); ; Argument[0]; request-forgery; manual |
-| 269 | Sink: org.springframework.web.client; RestTemplate; false; delete; ; ; Argument[0]; request-forgery; manual |
-| 270 | Sink: org.springframework.web.client; RestTemplate; false; exchange; ; ; Argument[0]; request-forgery; manual |
-| 271 | Sink: org.springframework.web.client; RestTemplate; false; execute; ; ; Argument[0]; request-forgery; manual |
-| 272 | Sink: org.springframework.web.client; RestTemplate; false; getForEntity; ; ; Argument[0]; request-forgery; manual |
-| 273 | Sink: org.springframework.web.client; RestTemplate; false; getForObject; ; ; Argument[0]; request-forgery; manual |
-| 274 | Sink: org.springframework.web.client; RestTemplate; false; headForHeaders; ; ; Argument[0]; request-forgery; manual |
-| 275 | Sink: org.springframework.web.client; RestTemplate; false; optionsForAllow; ; ; Argument[0]; request-forgery; manual |
-| 276 | Sink: org.springframework.web.client; RestTemplate; false; patchForObject; ; ; Argument[0]; request-forgery; manual |
-| 277 | Sink: org.springframework.web.client; RestTemplate; false; postForEntity; ; ; Argument[0]; request-forgery; manual |
-| 278 | Sink: org.springframework.web.client; RestTemplate; false; postForLocation; ; ; Argument[0]; request-forgery; manual |
-| 279 | Sink: org.springframework.web.client; RestTemplate; false; postForObject; ; ; Argument[0]; request-forgery; manual |
-| 280 | Sink: org.springframework.web.client; RestTemplate; false; put; ; ; Argument[0]; request-forgery; manual |
-| 281 | Sink: org.springframework.web.reactive.function.client; WebClient$Builder; false; baseUrl; ; ; Argument[0]; request-forgery; manual |
-| 282 | Sink: org.springframework.web.reactive.function.client; WebClient$UriSpec; true; uri; ; ; Argument[0]; request-forgery; manual |
-| 283 | Sink: org.springframework.web.reactive.function.client; WebClient; false; create; ; ; Argument[0]; request-forgery; manual |
-| 284 | Sink: play.libs.ws; StandaloneWSClient; true; url; ; ; Argument[0]; request-forgery; manual |
-| 285 | Sink: play.libs.ws; WSClient; true; url; ; ; Argument[0]; request-forgery; manual |
-| 286 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
-| 287 | Summary: java.lang; AbstractStringBuilder; true; append; ; ; Argument[0]; Argument[this]; taint; manual |
-| 288 | Summary: java.lang; AbstractStringBuilder; true; append; ; ; Argument[this]; ReturnValue; value; manual |
-| 289 | Summary: java.lang; CharSequence; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 290 | Summary: java.lang; String; false; format; (String,Object[]); ; Argument[1].ArrayElement; ReturnValue; taint; manual |
-| 291 | Summary: java.lang; StringBuilder; true; StringBuilder; ; ; Argument[0]; Argument[this]; taint; manual |
-| 292 | Summary: java.net.http; HttpRequest$Builder; true; build; (); ; Argument[this]; ReturnValue; taint; df-generated |
-| 293 | Summary: java.net.http; HttpRequest; true; newBuilder; (URI); ; Argument[0]; ReturnValue; taint; df-generated |
-| 294 | Summary: java.net; URI; false; URI; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 295 | Summary: java.net; URI; false; URI; (String,String,String); ; Argument[1]; Argument[this]; taint; ai-manual |
-| 296 | Summary: java.net; URI; false; create; ; ; Argument[0]; ReturnValue; taint; manual |
-| 297 | Summary: java.net; URI; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 298 | Summary: java.net; URI; false; toURL; ; ; Argument[this]; ReturnValue; taint; manual |
-| 299 | Summary: java.net; URL; false; URL; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 300 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 301 | Summary: java.util; List; true; get; (int); ; Argument[this].Element; ReturnValue; value; manual |
-| 302 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
-| 303 | Summary: java.util; Map; false; of; ; ; Argument[3]; ReturnValue.MapValue; value; manual |
-| 304 | Summary: java.util; Properties; true; setProperty; (String,String); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 305 | Summary: org.apache.hc.core5.http; HttpHost; true; HttpHost; (String); ; Argument[0]; Argument[this]; taint; hq-manual |
-| 306 | Summary: org.apache.http.client.methods; RequestBuilder; true; build; (); ; Argument[this]; ReturnValue; taint; ai-manual |
-| 307 | Summary: org.apache.http.client.methods; RequestBuilder; true; get; (String); ; Argument[0]; ReturnValue; taint; ai-manual |
-| 308 | Summary: org.apache.http.message; BasicRequestLine; false; BasicRequestLine; ; ; Argument[1]; Argument[this]; taint; manual |
-| 309 | Summary: org.apache.http; HttpHost; true; HttpHost; (String); ; Argument[0]; Argument[this]; taint; hq-manual |
+| 3 | Sink: io.micronaut.http.client; BlockingHttpClient; true; exchange; (HttpRequest); ; Argument[0]; request-forgery; manual |
+| 4 | Sink: io.micronaut.http.client; BlockingHttpClient; true; exchange; (String); ; Argument[0]; request-forgery; manual |
+| 5 | Sink: io.micronaut.http.client; BlockingHttpClient; true; retrieve; (String); ; Argument[0]; request-forgery; manual |
+| 6 | Sink: io.micronaut.http.client; BlockingHttpClient; true; retrieve; (String,Class); ; Argument[0]; request-forgery; manual |
+| 7 | Sink: io.micronaut.http.client; HttpClient; true; exchange; (HttpRequest); ; Argument[0]; request-forgery; manual |
+| 8 | Sink: io.micronaut.http.client; HttpClient; true; exchange; (String); ; Argument[0]; request-forgery; manual |
+| 9 | Sink: jakarta.ws.rs.client; Client; true; target; ; ; Argument[0]; request-forgery; manual |
+| 10 | Sink: java.net.http; HttpClient; true; send; (HttpRequest,HttpResponse$BodyHandler); ; Argument[0]; request-forgery; ai-manual |
+| 11 | Sink: java.net.http; HttpRequest$Builder; false; uri; ; ; Argument[0]; request-forgery; manual |
+| 12 | Sink: java.net.http; HttpRequest; false; newBuilder; ; ; Argument[0]; request-forgery; manual |
+| 13 | Sink: java.net; DatagramSocket; true; connect; (SocketAddress); ; Argument[0]; request-forgery; ai-manual |
+| 14 | Sink: java.net; URL; false; openConnection; (Proxy); ; Argument[0]; request-forgery; ai-manual |
+| 15 | Sink: java.net; URL; false; openConnection; ; ; Argument[this]; request-forgery; manual |
+| 16 | Sink: java.net; URL; false; openStream; ; ; Argument[this]; request-forgery; manual |
+| 17 | Sink: java.net; URLClassLoader; false; URLClassLoader; (String,URL[],ClassLoader); ; Argument[1]; request-forgery; manual |
+| 18 | Sink: java.net; URLClassLoader; false; URLClassLoader; (String,URL[],ClassLoader,URLStreamHandlerFactory); ; Argument[1]; request-forgery; manual |
+| 19 | Sink: java.net; URLClassLoader; false; URLClassLoader; (URL[]); ; Argument[0]; request-forgery; manual |
+| 20 | Sink: java.net; URLClassLoader; false; URLClassLoader; (URL[],ClassLoader); ; Argument[0]; request-forgery; manual |
+| 21 | Sink: java.net; URLClassLoader; false; URLClassLoader; (URL[],ClassLoader,URLStreamHandlerFactory); ; Argument[0]; request-forgery; manual |
+| 22 | Sink: java.net; URLClassLoader; false; newInstance; ; ; Argument[0]; request-forgery; manual |
+| 23 | Sink: java.sql; Driver; false; connect; (String,Properties); ; Argument[0]; request-forgery; manual |
+| 24 | Sink: java.sql; DriverManager; false; getConnection; (String); ; Argument[0]; request-forgery; manual |
+| 25 | Sink: java.sql; DriverManager; false; getConnection; (String,Properties); ; Argument[0]; request-forgery; manual |
+| 26 | Sink: java.sql; DriverManager; false; getConnection; (String,String,String); ; Argument[0]; request-forgery; manual |
+| 27 | Sink: javafx.scene.web; WebEngine; false; load; (String); ; Argument[0]; request-forgery; ai-manual |
+| 28 | Sink: javax.activation; URLDataSource; true; URLDataSource; ; ; Argument[0]; request-forgery; manual |
+| 29 | Sink: javax.ws.rs.client; Client; true; target; ; ; Argument[0]; request-forgery; manual |
+| 30 | Sink: org.apache.commons.jelly; JellyContext; true; JellyContext; (JellyContext,URL); ; Argument[1]; request-forgery; ai-manual |
+| 31 | Sink: org.apache.commons.jelly; JellyContext; true; JellyContext; (JellyContext,URL,URL); ; Argument[1]; request-forgery; ai-manual |
+| 32 | Sink: org.apache.commons.jelly; JellyContext; true; JellyContext; (JellyContext,URL,URL); ; Argument[2]; request-forgery; ai-manual |
+| 33 | Sink: org.apache.commons.jelly; JellyContext; true; JellyContext; (URL); ; Argument[0]; request-forgery; ai-manual |
+| 34 | Sink: org.apache.commons.jelly; JellyContext; true; JellyContext; (URL,URL); ; Argument[0]; request-forgery; ai-manual |
+| 35 | Sink: org.apache.commons.jelly; JellyContext; true; JellyContext; (URL,URL); ; Argument[1]; request-forgery; ai-manual |
+| 36 | Sink: org.apache.cxf.catalog; OASISCatalogManager; true; loadCatalog; (URL); ; Argument[0]; request-forgery; manual |
+| 37 | Sink: org.apache.cxf.common.classloader; ClassLoaderUtils; true; getURLClassLoader; (List,ClassLoader); ; Argument[0]; request-forgery; manual |
+| 38 | Sink: org.apache.cxf.common.classloader; ClassLoaderUtils; true; getURLClassLoader; (URL[],ClassLoader); ; Argument[0]; request-forgery; manual |
+| 39 | Sink: org.apache.cxf.resource; ExtendedURIResolver; true; resolve; (String,String); ; Argument[0]; request-forgery; manual |
+| 40 | Sink: org.apache.cxf.resource; URIResolver; true; URIResolver; (String); ; Argument[0]; request-forgery; manual |
+| 41 | Sink: org.apache.cxf.resource; URIResolver; true; URIResolver; (String,String); ; Argument[1]; request-forgery; manual |
+| 42 | Sink: org.apache.cxf.resource; URIResolver; true; URIResolver; (String,String,Class); ; Argument[1]; request-forgery; manual |
+| 43 | Sink: org.apache.cxf.resource; URIResolver; true; resolve; (String,String,Class); ; Argument[1]; request-forgery; manual |
+| 44 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; create; (Method,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
+| 45 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; create; (Method,String); ; Argument[1]; request-forgery; hq-manual |
+| 46 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; create; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
+| 47 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; create; (String,String); ; Argument[1]; request-forgery; hq-manual |
+| 48 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; create; (String,URI); ; Argument[1]; request-forgery; hq-manual |
+| 49 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; delete; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 50 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; delete; (String); ; Argument[0]; request-forgery; hq-manual |
+| 51 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; delete; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 52 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; get; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 53 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; get; (String); ; Argument[0]; request-forgery; hq-manual |
+| 54 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; get; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 55 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; head; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 56 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; head; (String); ; Argument[0]; request-forgery; hq-manual |
+| 57 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; head; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 58 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; options; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 59 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; options; (String); ; Argument[0]; request-forgery; hq-manual |
+| 60 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; options; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 61 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; patch; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 62 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; patch; (String); ; Argument[0]; request-forgery; hq-manual |
+| 63 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; patch; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 64 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; post; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 65 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; post; (String); ; Argument[0]; request-forgery; hq-manual |
+| 66 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; post; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 67 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; put; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 68 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; put; (String); ; Argument[0]; request-forgery; hq-manual |
+| 69 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; put; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 70 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; trace; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 71 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; trace; (String); ; Argument[0]; request-forgery; hq-manual |
+| 72 | Sink: org.apache.hc.client5.http.async.methods; BasicHttpRequests; true; trace; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 73 | Sink: org.apache.hc.client5.http.async.methods; ConfigurableHttpRequest; true; ConfigurableHttpRequest; (String,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
+| 74 | Sink: org.apache.hc.client5.http.async.methods; ConfigurableHttpRequest; true; ConfigurableHttpRequest; (String,URI); ; Argument[1]; request-forgery; hq-manual |
+| 75 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; SimpleHttpRequest; (Method,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
+| 76 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; SimpleHttpRequest; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
+| 77 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; SimpleHttpRequest; (String,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
+| 78 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; SimpleHttpRequest; (String,URI); ; Argument[1]; request-forgery; hq-manual |
+| 79 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; create; (Method,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
+| 80 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; create; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
+| 81 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; create; (String,String); ; Argument[1]; request-forgery; hq-manual |
+| 82 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequest; true; create; (String,URI); ; Argument[1]; request-forgery; hq-manual |
+| 83 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; create; (Method,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
+| 84 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; create; (Method,String); ; Argument[1]; request-forgery; hq-manual |
+| 85 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; create; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
+| 86 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; create; (String,String); ; Argument[1]; request-forgery; hq-manual |
+| 87 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; create; (String,URI); ; Argument[1]; request-forgery; hq-manual |
+| 88 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; delete; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 89 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; delete; (String); ; Argument[0]; request-forgery; hq-manual |
+| 90 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; delete; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 91 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; get; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 92 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; get; (String); ; Argument[0]; request-forgery; hq-manual |
+| 93 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; get; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 94 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; head; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 95 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; head; (String); ; Argument[0]; request-forgery; hq-manual |
+| 96 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; head; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 97 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; options; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 98 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; options; (String); ; Argument[0]; request-forgery; hq-manual |
+| 99 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; options; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 100 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; patch; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 101 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; patch; (String); ; Argument[0]; request-forgery; hq-manual |
+| 102 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; patch; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 103 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; post; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 104 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; post; (String); ; Argument[0]; request-forgery; hq-manual |
+| 105 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; post; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 106 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; put; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 107 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; put; (String); ; Argument[0]; request-forgery; hq-manual |
+| 108 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; put; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 109 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; trace; (HttpHost,String); ; Argument[0]; request-forgery; hq-manual |
+| 110 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; trace; (String); ; Argument[0]; request-forgery; hq-manual |
+| 111 | Sink: org.apache.hc.client5.http.async.methods; SimpleHttpRequests; true; trace; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 112 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; delete; (String); ; Argument[0]; request-forgery; hq-manual |
+| 113 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; delete; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 114 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; get; (String); ; Argument[0]; request-forgery; hq-manual |
+| 115 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; get; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 116 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; head; (String); ; Argument[0]; request-forgery; hq-manual |
+| 117 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; head; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 118 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; options; (String); ; Argument[0]; request-forgery; hq-manual |
+| 119 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; options; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 120 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; patch; (String); ; Argument[0]; request-forgery; hq-manual |
+| 121 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; patch; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 122 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; post; (String); ; Argument[0]; request-forgery; hq-manual |
+| 123 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; post; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 124 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; put; (String); ; Argument[0]; request-forgery; hq-manual |
+| 125 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; put; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 126 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; trace; (String); ; Argument[0]; request-forgery; hq-manual |
+| 127 | Sink: org.apache.hc.client5.http.async.methods; SimpleRequestBuilder; true; trace; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 128 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; create; (Method,String); ; Argument[1]; request-forgery; hq-manual |
+| 129 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; create; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
+| 130 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; create; (String,String); ; Argument[1]; request-forgery; hq-manual |
+| 131 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; create; (String,URI); ; Argument[1]; request-forgery; hq-manual |
+| 132 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; delete; (String); ; Argument[0]; request-forgery; hq-manual |
+| 133 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; delete; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 134 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; get; (String); ; Argument[0]; request-forgery; hq-manual |
+| 135 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; get; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 136 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; head; (String); ; Argument[0]; request-forgery; hq-manual |
+| 137 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; head; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 138 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; options; (String); ; Argument[0]; request-forgery; hq-manual |
+| 139 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; options; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 140 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; patch; (String); ; Argument[0]; request-forgery; hq-manual |
+| 141 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; patch; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 142 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; post; (String); ; Argument[0]; request-forgery; hq-manual |
+| 143 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; post; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 144 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; put; (String); ; Argument[0]; request-forgery; hq-manual |
+| 145 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; put; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 146 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; trace; (String); ; Argument[0]; request-forgery; hq-manual |
+| 147 | Sink: org.apache.hc.client5.http.classic.methods; ClassicHttpRequests; true; trace; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 148 | Sink: org.apache.hc.client5.http.classic.methods; HttpDelete; true; HttpDelete; (String); ; Argument[0]; request-forgery; hq-manual |
+| 149 | Sink: org.apache.hc.client5.http.classic.methods; HttpDelete; true; HttpDelete; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 150 | Sink: org.apache.hc.client5.http.classic.methods; HttpGet; true; HttpGet; (String); ; Argument[0]; request-forgery; hq-manual |
+| 151 | Sink: org.apache.hc.client5.http.classic.methods; HttpGet; true; HttpGet; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 152 | Sink: org.apache.hc.client5.http.classic.methods; HttpHead; true; HttpHead; (String); ; Argument[0]; request-forgery; hq-manual |
+| 153 | Sink: org.apache.hc.client5.http.classic.methods; HttpHead; true; HttpHead; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 154 | Sink: org.apache.hc.client5.http.classic.methods; HttpOptions; true; HttpOptions; (String); ; Argument[0]; request-forgery; hq-manual |
+| 155 | Sink: org.apache.hc.client5.http.classic.methods; HttpOptions; true; HttpOptions; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 156 | Sink: org.apache.hc.client5.http.classic.methods; HttpPatch; true; HttpPatch; (String); ; Argument[0]; request-forgery; hq-manual |
+| 157 | Sink: org.apache.hc.client5.http.classic.methods; HttpPatch; true; HttpPatch; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 158 | Sink: org.apache.hc.client5.http.classic.methods; HttpPost; true; HttpPost; (String); ; Argument[0]; request-forgery; hq-manual |
+| 159 | Sink: org.apache.hc.client5.http.classic.methods; HttpPost; true; HttpPost; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 160 | Sink: org.apache.hc.client5.http.classic.methods; HttpPut; true; HttpPut; (String); ; Argument[0]; request-forgery; hq-manual |
+| 161 | Sink: org.apache.hc.client5.http.classic.methods; HttpPut; true; HttpPut; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 162 | Sink: org.apache.hc.client5.http.classic.methods; HttpTrace; true; HttpTrace; (String); ; Argument[0]; request-forgery; hq-manual |
+| 163 | Sink: org.apache.hc.client5.http.classic.methods; HttpTrace; true; HttpTrace; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 164 | Sink: org.apache.hc.client5.http.classic.methods; HttpUriRequestBase; true; HttpUriRequestBase; (String,URI); ; Argument[1]; request-forgery; hq-manual |
+| 165 | Sink: org.apache.hc.client5.http.fluent; Request; true; create; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
+| 166 | Sink: org.apache.hc.client5.http.fluent; Request; true; create; (String,String); ; Argument[1]; request-forgery; hq-manual |
+| 167 | Sink: org.apache.hc.client5.http.fluent; Request; true; create; (String,URI); ; Argument[1]; request-forgery; hq-manual |
+| 168 | Sink: org.apache.hc.client5.http.fluent; Request; true; delete; (String); ; Argument[0]; request-forgery; hq-manual |
+| 169 | Sink: org.apache.hc.client5.http.fluent; Request; true; delete; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 170 | Sink: org.apache.hc.client5.http.fluent; Request; true; get; (String); ; Argument[0]; request-forgery; hq-manual |
+| 171 | Sink: org.apache.hc.client5.http.fluent; Request; true; get; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 172 | Sink: org.apache.hc.client5.http.fluent; Request; true; head; (String); ; Argument[0]; request-forgery; hq-manual |
+| 173 | Sink: org.apache.hc.client5.http.fluent; Request; true; head; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 174 | Sink: org.apache.hc.client5.http.fluent; Request; true; options; (String); ; Argument[0]; request-forgery; hq-manual |
+| 175 | Sink: org.apache.hc.client5.http.fluent; Request; true; options; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 176 | Sink: org.apache.hc.client5.http.fluent; Request; true; patch; (String); ; Argument[0]; request-forgery; hq-manual |
+| 177 | Sink: org.apache.hc.client5.http.fluent; Request; true; patch; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 178 | Sink: org.apache.hc.client5.http.fluent; Request; true; post; (String); ; Argument[0]; request-forgery; hq-manual |
+| 179 | Sink: org.apache.hc.client5.http.fluent; Request; true; post; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 180 | Sink: org.apache.hc.client5.http.fluent; Request; true; put; (String); ; Argument[0]; request-forgery; hq-manual |
+| 181 | Sink: org.apache.hc.client5.http.fluent; Request; true; put; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 182 | Sink: org.apache.hc.client5.http.fluent; Request; true; trace; (String); ; Argument[0]; request-forgery; hq-manual |
+| 183 | Sink: org.apache.hc.client5.http.fluent; Request; true; trace; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 184 | Sink: org.apache.hc.core5.http.impl.bootstrap; HttpAsyncRequester; true; connect; (HttpHost,Timeout); ; Argument[0]; request-forgery; hq-manual |
+| 185 | Sink: org.apache.hc.core5.http.impl.bootstrap; HttpAsyncRequester; true; connect; (HttpHost,Timeout,Object,FutureCallback); ; Argument[0]; request-forgery; hq-manual |
+| 186 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; delete; (String); ; Argument[0]; request-forgery; hq-manual |
+| 187 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; delete; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 188 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; get; (String); ; Argument[0]; request-forgery; hq-manual |
+| 189 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; get; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 190 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; head; (String); ; Argument[0]; request-forgery; hq-manual |
+| 191 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; head; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 192 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; options; (String); ; Argument[0]; request-forgery; hq-manual |
+| 193 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; options; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 194 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; patch; (String); ; Argument[0]; request-forgery; hq-manual |
+| 195 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; patch; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 196 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; post; (String); ; Argument[0]; request-forgery; hq-manual |
+| 197 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; post; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 198 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; put; (String); ; Argument[0]; request-forgery; hq-manual |
+| 199 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; put; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 200 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; trace; (String); ; Argument[0]; request-forgery; hq-manual |
+| 201 | Sink: org.apache.hc.core5.http.io.support; ClassicRequestBuilder; true; trace; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 202 | Sink: org.apache.hc.core5.http.message; BasicClassicHttpRequest; true; BasicClassicHttpRequest; (Method,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
+| 203 | Sink: org.apache.hc.core5.http.message; BasicClassicHttpRequest; true; BasicClassicHttpRequest; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
+| 204 | Sink: org.apache.hc.core5.http.message; BasicClassicHttpRequest; true; BasicClassicHttpRequest; (String,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
+| 205 | Sink: org.apache.hc.core5.http.message; BasicClassicHttpRequest; true; BasicClassicHttpRequest; (String,URI); ; Argument[1]; request-forgery; hq-manual |
+| 206 | Sink: org.apache.hc.core5.http.message; BasicHttpRequest; true; BasicHttpRequest; (Method,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
+| 207 | Sink: org.apache.hc.core5.http.message; BasicHttpRequest; true; BasicHttpRequest; (Method,URI); ; Argument[1]; request-forgery; hq-manual |
+| 208 | Sink: org.apache.hc.core5.http.message; BasicHttpRequest; true; BasicHttpRequest; (String,HttpHost,String); ; Argument[1]; request-forgery; hq-manual |
+| 209 | Sink: org.apache.hc.core5.http.message; BasicHttpRequest; true; BasicHttpRequest; (String,URI); ; Argument[1]; request-forgery; hq-manual |
+| 210 | Sink: org.apache.hc.core5.http.support; AbstractRequestBuilder; true; setHttpHost; (HttpHost); ; Argument[0]; request-forgery; hq-manual |
+| 211 | Sink: org.apache.hc.core5.http.support; AbstractRequestBuilder; true; setUri; (String); ; Argument[0]; request-forgery; hq-manual |
+| 212 | Sink: org.apache.hc.core5.http.support; AbstractRequestBuilder; true; setUri; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 213 | Sink: org.apache.hc.core5.http; HttpRequest; true; setUri; (URI); ; Argument[0]; request-forgery; hq-manual |
+| 214 | Sink: org.apache.hc.core5.http; HttpRequestFactory; true; newHttpRequest; (String,String); ; Argument[1]; request-forgery; hq-manual |
+| 215 | Sink: org.apache.hc.core5.http; HttpRequestFactory; true; newHttpRequest; (String,URI); ; Argument[1]; request-forgery; hq-manual |
+| 216 | Sink: org.apache.http.client.methods; HttpDelete; false; HttpDelete; ; ; Argument[0]; request-forgery; manual |
+| 217 | Sink: org.apache.http.client.methods; HttpGet; false; HttpGet; ; ; Argument[0]; request-forgery; manual |
+| 218 | Sink: org.apache.http.client.methods; HttpHead; false; HttpHead; ; ; Argument[0]; request-forgery; manual |
+| 219 | Sink: org.apache.http.client.methods; HttpOptions; false; HttpOptions; ; ; Argument[0]; request-forgery; manual |
+| 220 | Sink: org.apache.http.client.methods; HttpPatch; false; HttpPatch; ; ; Argument[0]; request-forgery; manual |
+| 221 | Sink: org.apache.http.client.methods; HttpPost; false; HttpPost; ; ; Argument[0]; request-forgery; manual |
+| 222 | Sink: org.apache.http.client.methods; HttpPut; false; HttpPut; ; ; Argument[0]; request-forgery; manual |
+| 223 | Sink: org.apache.http.client.methods; HttpRequestBase; true; setURI; ; ; Argument[0]; request-forgery; manual |
+| 224 | Sink: org.apache.http.client.methods; HttpTrace; false; HttpTrace; ; ; Argument[0]; request-forgery; manual |
+| 225 | Sink: org.apache.http.client.methods; RequestBuilder; false; delete; ; ; Argument[0]; request-forgery; manual |
+| 226 | Sink: org.apache.http.client.methods; RequestBuilder; false; get; ; ; Argument[0]; request-forgery; manual |
+| 227 | Sink: org.apache.http.client.methods; RequestBuilder; false; head; ; ; Argument[0]; request-forgery; manual |
+| 228 | Sink: org.apache.http.client.methods; RequestBuilder; false; options; ; ; Argument[0]; request-forgery; manual |
+| 229 | Sink: org.apache.http.client.methods; RequestBuilder; false; patch; ; ; Argument[0]; request-forgery; manual |
+| 230 | Sink: org.apache.http.client.methods; RequestBuilder; false; post; ; ; Argument[0]; request-forgery; manual |
+| 231 | Sink: org.apache.http.client.methods; RequestBuilder; false; put; ; ; Argument[0]; request-forgery; manual |
+| 232 | Sink: org.apache.http.client.methods; RequestBuilder; false; setUri; ; ; Argument[0]; request-forgery; manual |
+| 233 | Sink: org.apache.http.client.methods; RequestBuilder; false; trace; ; ; Argument[0]; request-forgery; manual |
+| 234 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpHost,HttpRequest); ; Argument[0]; request-forgery; ai-manual |
+| 235 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpHost,HttpRequest,HttpContext); ; Argument[0]; request-forgery; ai-manual |
+| 236 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpHost,HttpRequest,ResponseHandler); ; Argument[0]; request-forgery; ai-manual |
+| 237 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpHost,HttpRequest,ResponseHandler,HttpContext); ; Argument[0]; request-forgery; ai-manual |
+| 238 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpUriRequest); ; Argument[0]; request-forgery; ai-manual |
+| 239 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpUriRequest,HttpContext); ; Argument[0]; request-forgery; ai-manual |
+| 240 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpUriRequest,ResponseHandler); ; Argument[0]; request-forgery; ai-manual |
+| 241 | Sink: org.apache.http.client; HttpClient; true; execute; (HttpUriRequest,ResponseHandler,HttpContext); ; Argument[0]; request-forgery; ai-manual |
+| 242 | Sink: org.apache.http.message; BasicHttpEntityEnclosingRequest; false; BasicHttpEntityEnclosingRequest; (RequestLine); ; Argument[0]; request-forgery; manual |
+| 243 | Sink: org.apache.http.message; BasicHttpEntityEnclosingRequest; false; BasicHttpEntityEnclosingRequest; (String,String); ; Argument[1]; request-forgery; manual |
+| 244 | Sink: org.apache.http.message; BasicHttpEntityEnclosingRequest; false; BasicHttpEntityEnclosingRequest; (String,String,ProtocolVersion); ; Argument[1]; request-forgery; manual |
+| 245 | Sink: org.apache.http.message; BasicHttpRequest; false; BasicHttpRequest; (RequestLine); ; Argument[0]; request-forgery; manual |
+| 246 | Sink: org.apache.http.message; BasicHttpRequest; false; BasicHttpRequest; (String,String); ; Argument[1]; request-forgery; manual |
+| 247 | Sink: org.apache.http.message; BasicHttpRequest; false; BasicHttpRequest; (String,String,ProtocolVersion); ; Argument[1]; request-forgery; manual |
+| 248 | Sink: org.codehaus.cargo.container.installer; ZipURLInstaller; true; ZipURLInstaller; (URL,String,String); ; Argument[0]; request-forgery; ai-manual |
+| 249 | Sink: org.jdbi.v3.core; Jdbi; false; create; (String); ; Argument[0]; request-forgery; manual |
+| 250 | Sink: org.jdbi.v3.core; Jdbi; false; create; (String,Properties); ; Argument[0]; request-forgery; manual |
+| 251 | Sink: org.jdbi.v3.core; Jdbi; false; create; (String,String,String); ; Argument[0]; request-forgery; manual |
+| 252 | Sink: org.jdbi.v3.core; Jdbi; false; open; (String); ; Argument[0]; request-forgery; manual |
+| 253 | Sink: org.jdbi.v3.core; Jdbi; false; open; (String,Properties); ; Argument[0]; request-forgery; manual |
+| 254 | Sink: org.jdbi.v3.core; Jdbi; false; open; (String,String,String); ; Argument[0]; request-forgery; manual |
+| 255 | Sink: org.kohsuke.stapler; HttpResponses; true; staticResource; (URL); ; Argument[0]; request-forgery; ai-manual |
+| 256 | Sink: org.springframework.boot.jdbc; DataSourceBuilder; false; url; (String); ; Argument[0]; request-forgery; manual |
+| 257 | Sink: org.springframework.http; RequestEntity; false; RequestEntity; (HttpMethod,URI); ; Argument[1]; request-forgery; manual |
+| 258 | Sink: org.springframework.http; RequestEntity; false; RequestEntity; (MultiValueMap,HttpMethod,URI); ; Argument[2]; request-forgery; manual |
+| 259 | Sink: org.springframework.http; RequestEntity; false; RequestEntity; (Object,HttpMethod,URI); ; Argument[2]; request-forgery; manual |
+| 260 | Sink: org.springframework.http; RequestEntity; false; RequestEntity; (Object,HttpMethod,URI,Type); ; Argument[2]; request-forgery; manual |
+| 261 | Sink: org.springframework.http; RequestEntity; false; RequestEntity; (Object,MultiValueMap,HttpMethod,URI); ; Argument[3]; request-forgery; manual |
+| 262 | Sink: org.springframework.http; RequestEntity; false; RequestEntity; (Object,MultiValueMap,HttpMethod,URI,Type); ; Argument[3]; request-forgery; manual |
+| 263 | Sink: org.springframework.http; RequestEntity; false; delete; ; ; Argument[0]; request-forgery; manual |
+| 264 | Sink: org.springframework.http; RequestEntity; false; get; ; ; Argument[0]; request-forgery; manual |
+| 265 | Sink: org.springframework.http; RequestEntity; false; head; ; ; Argument[0]; request-forgery; manual |
+| 266 | Sink: org.springframework.http; RequestEntity; false; method; ; ; Argument[1]; request-forgery; manual |
+| 267 | Sink: org.springframework.http; RequestEntity; false; options; ; ; Argument[0]; request-forgery; manual |
+| 268 | Sink: org.springframework.http; RequestEntity; false; patch; ; ; Argument[0]; request-forgery; manual |
+| 269 | Sink: org.springframework.http; RequestEntity; false; post; ; ; Argument[0]; request-forgery; manual |
+| 270 | Sink: org.springframework.http; RequestEntity; false; put; ; ; Argument[0]; request-forgery; manual |
+| 271 | Sink: org.springframework.jdbc.datasource; AbstractDriverBasedDataSource; false; setUrl; (String); ; Argument[0]; request-forgery; manual |
+| 272 | Sink: org.springframework.jdbc.datasource; DriverManagerDataSource; false; DriverManagerDataSource; (String); ; Argument[0]; request-forgery; manual |
+| 273 | Sink: org.springframework.jdbc.datasource; DriverManagerDataSource; false; DriverManagerDataSource; (String,Properties); ; Argument[0]; request-forgery; manual |
+| 274 | Sink: org.springframework.jdbc.datasource; DriverManagerDataSource; false; DriverManagerDataSource; (String,String,String); ; Argument[0]; request-forgery; manual |
+| 275 | Sink: org.springframework.web.client; RestTemplate; false; delete; ; ; Argument[0]; request-forgery; manual |
+| 276 | Sink: org.springframework.web.client; RestTemplate; false; exchange; ; ; Argument[0]; request-forgery; manual |
+| 277 | Sink: org.springframework.web.client; RestTemplate; false; execute; ; ; Argument[0]; request-forgery; manual |
+| 278 | Sink: org.springframework.web.client; RestTemplate; false; getForEntity; ; ; Argument[0]; request-forgery; manual |
+| 279 | Sink: org.springframework.web.client; RestTemplate; false; getForObject; ; ; Argument[0]; request-forgery; manual |
+| 280 | Sink: org.springframework.web.client; RestTemplate; false; headForHeaders; ; ; Argument[0]; request-forgery; manual |
+| 281 | Sink: org.springframework.web.client; RestTemplate; false; optionsForAllow; ; ; Argument[0]; request-forgery; manual |
+| 282 | Sink: org.springframework.web.client; RestTemplate; false; patchForObject; ; ; Argument[0]; request-forgery; manual |
+| 283 | Sink: org.springframework.web.client; RestTemplate; false; postForEntity; ; ; Argument[0]; request-forgery; manual |
+| 284 | Sink: org.springframework.web.client; RestTemplate; false; postForLocation; ; ; Argument[0]; request-forgery; manual |
+| 285 | Sink: org.springframework.web.client; RestTemplate; false; postForObject; ; ; Argument[0]; request-forgery; manual |
+| 286 | Sink: org.springframework.web.client; RestTemplate; false; put; ; ; Argument[0]; request-forgery; manual |
+| 287 | Sink: org.springframework.web.reactive.function.client; WebClient$Builder; false; baseUrl; ; ; Argument[0]; request-forgery; manual |
+| 288 | Sink: org.springframework.web.reactive.function.client; WebClient$UriSpec; true; uri; ; ; Argument[0]; request-forgery; manual |
+| 289 | Sink: org.springframework.web.reactive.function.client; WebClient; false; create; ; ; Argument[0]; request-forgery; manual |
+| 290 | Sink: play.libs.ws; StandaloneWSClient; true; url; ; ; Argument[0]; request-forgery; manual |
+| 291 | Sink: play.libs.ws; WSClient; true; url; ; ; Argument[0]; request-forgery; manual |
+| 292 | Source: javax.servlet; ServletRequest; false; getParameter; (String); ; ReturnValue; remote; manual |
+| 293 | Summary: io.micronaut.http.uri; UriBuilder; true; build; (); ; Argument[this]; ReturnValue; taint; manual |
+| 294 | Summary: io.micronaut.http.uri; UriBuilder; true; host; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 295 | Summary: io.micronaut.http.uri; UriBuilder; true; host; (String); ; Argument[this]; ReturnValue; value; manual |
+| 296 | Summary: io.micronaut.http; HttpRequest; true; GET; (String); ; Argument[0]; ReturnValue; taint; manual |
+| 297 | Summary: java.lang; AbstractStringBuilder; true; append; ; ; Argument[0]; Argument[this]; taint; manual |
+| 298 | Summary: java.lang; AbstractStringBuilder; true; append; ; ; Argument[this]; ReturnValue; value; manual |
+| 299 | Summary: java.lang; CharSequence; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 300 | Summary: java.lang; String; false; format; (String,Object[]); ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 301 | Summary: java.lang; StringBuilder; true; StringBuilder; ; ; Argument[0]; Argument[this]; taint; manual |
+| 302 | Summary: java.net.http; HttpRequest$Builder; true; build; (); ; Argument[this]; ReturnValue; taint; df-generated |
+| 303 | Summary: java.net.http; HttpRequest; true; newBuilder; (URI); ; Argument[0]; ReturnValue; taint; df-generated |
+| 304 | Summary: java.net; URI; false; URI; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 305 | Summary: java.net; URI; false; URI; (String,String,String); ; Argument[1]; Argument[this]; taint; ai-manual |
+| 306 | Summary: java.net; URI; false; create; ; ; Argument[0]; ReturnValue; taint; manual |
+| 307 | Summary: java.net; URI; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 308 | Summary: java.net; URI; false; toURL; ; ; Argument[this]; ReturnValue; taint; manual |
+| 309 | Summary: java.net; URL; false; URL; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 310 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
+| 311 | Summary: java.util; List; true; get; (int); ; Argument[this].Element; ReturnValue; value; manual |
+| 312 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 313 | Summary: java.util; Map; false; of; ; ; Argument[3]; ReturnValue.MapValue; value; manual |
+| 314 | Summary: java.util; Properties; true; setProperty; (String,String); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 315 | Summary: org.apache.hc.core5.http; HttpHost; true; HttpHost; (String); ; Argument[0]; Argument[this]; taint; hq-manual |
+| 316 | Summary: org.apache.http.client.methods; RequestBuilder; true; build; (); ; Argument[this]; ReturnValue; taint; ai-manual |
+| 317 | Summary: org.apache.http.client.methods; RequestBuilder; true; get; (String); ; Argument[0]; ReturnValue; taint; ai-manual |
+| 318 | Summary: org.apache.http.message; BasicRequestLine; false; BasicRequestLine; ; ; Argument[1]; Argument[this]; taint; manual |
+| 319 | Summary: org.apache.http; HttpHost; true; HttpHost; (String); ; Argument[0]; Argument[this]; taint; hq-manual |
 nodes
 | ApacheHttpClientExecuteSSRF.java:23:29:23:56 | getParameter(...) : String | semmle.label | getParameter(...) : String |
 | ApacheHttpClientExecuteSSRF.java:25:29:25:48 | new HttpHost(...) : HttpHost | semmle.label | new HttpHost(...) : HttpHost |
@@ -1744,6 +1869,82 @@ nodes
 | ApacheHttpSSRFVersion5.java:388:44:388:46 | uri | semmle.label | uri |
 | ApacheHttpSSRFVersion5.java:390:24:390:26 | uri | semmle.label | uri |
 | ApacheHttpSSRFVersion5.java:394:24:394:26 | uri | semmle.label | uri |
+| HostComparison.java:8:19:8:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:8:27:8:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:9:9:9:11 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:9:9:9:19 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:50:19:50:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:50:27:50:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:52:13:52:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:52:13:52:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:57:19:57:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:57:27:57:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:59:13:59:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:59:13:59:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:68:19:68:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:68:27:68:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:70:13:70:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:70:13:70:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:84:19:84:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:84:27:84:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:86:13:86:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:86:13:86:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:92:20:92:55 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:92:28:92:54 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:94:13:94:16 | used : URI | semmle.label | used : URI |
+| HostComparison.java:94:13:94:24 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:103:19:103:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:103:27:103:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:105:13:105:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:105:13:105:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:111:20:111:55 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:111:28:111:54 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:113:13:113:16 | used : URI | semmle.label | used : URI |
+| HostComparison.java:113:13:113:24 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:118:19:118:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:118:27:118:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:122:13:122:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:122:13:122:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:127:19:127:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:127:27:127:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:133:13:133:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:133:13:133:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:140:15:140:50 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:140:23:140:49 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:142:13:142:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:142:13:142:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:147:19:147:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:147:27:147:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:149:13:149:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:149:13:149:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:154:19:154:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:154:27:154:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:156:13:156:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:156:13:156:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:177:19:177:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:177:27:177:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:184:17:184:19 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:184:17:184:27 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:223:19:223:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:223:27:223:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:226:13:226:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:226:13:226:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:239:19:239:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:239:27:239:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:242:13:242:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:242:13:242:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:247:19:247:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:247:27:247:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:250:13:250:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:250:13:250:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:272:19:272:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:272:27:272:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:276:13:276:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:276:13:276:23 | toURL(...) | semmle.label | toURL(...) |
+| HostComparison.java:281:19:281:54 | new URI(...) : URI | semmle.label | new URI(...) : URI |
+| HostComparison.java:281:27:281:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
+| HostComparison.java:285:13:285:15 | uri : URI | semmle.label | uri : URI |
+| HostComparison.java:285:13:285:23 | toURL(...) | semmle.label | toURL(...) |
 | JakartaWsSSRF.java:14:22:14:48 | getParameter(...) : String | semmle.label | getParameter(...) : String |
 | JakartaWsSSRF.java:15:23:15:25 | url | semmle.label | url |
 | JavaNetHttpSSRF.java:25:27:25:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
@@ -1785,6 +1986,26 @@ nodes
 | JdbcUrlSSRF.java:86:19:86:25 | jdbcUrl | semmle.label | jdbcUrl |
 | JdbcUrlSSRF.java:87:19:87:25 | jdbcUrl | semmle.label | jdbcUrl |
 | JdbcUrlSSRF.java:88:19:88:25 | jdbcUrl | semmle.label | jdbcUrl |
+| MicronautSSRF.java:15:32:15:53 | url : String | semmle.label | url : String |
+| MicronautSSRF.java:16:45:16:47 | url | semmle.label | url |
+| MicronautSSRF.java:20:42:20:63 | url : String | semmle.label | url : String |
+| MicronautSSRF.java:21:45:21:47 | url | semmle.label | url |
+| MicronautSSRF.java:25:37:25:58 | url : String | semmle.label | url : String |
+| MicronautSSRF.java:26:45:26:47 | url | semmle.label | url |
+| MicronautSSRF.java:30:34:30:56 | host : String | semmle.label | host : String |
+| MicronautSSRF.java:31:19:31:64 | host(...) : UriBuilder | semmle.label | host(...) : UriBuilder |
+| MicronautSSRF.java:31:19:31:72 | build(...) : URI | semmle.label | build(...) : URI |
+| MicronautSSRF.java:31:60:31:63 | host : String | semmle.label | host : String |
+| MicronautSSRF.java:32:45:32:47 | uri : URI | semmle.label | uri : URI |
+| MicronautSSRF.java:32:45:32:58 | toString(...) | semmle.label | toString(...) |
+| MicronautSSRF.java:36:39:36:60 | url : String | semmle.label | url : String |
+| MicronautSSRF.java:37:45:37:64 | GET(...) | semmle.label | GET(...) |
+| MicronautSSRF.java:37:61:37:63 | url : String | semmle.label | url : String |
+| MicronautSSRF.java:41:35:41:56 | url : String | semmle.label | url : String |
+| MicronautSSRF.java:42:32:42:34 | url | semmle.label | url |
+| MicronautSSRF.java:46:42:46:63 | url : String | semmle.label | url : String |
+| MicronautSSRF.java:47:32:47:51 | GET(...) | semmle.label | GET(...) |
+| MicronautSSRF.java:47:48:47:50 | url : String | semmle.label | url : String |
 | ReactiveWebClientSSRF.java:15:26:15:52 | getParameter(...) : String | semmle.label | getParameter(...) : String |
 | ReactiveWebClientSSRF.java:16:52:16:54 | url | semmle.label | url |
 | ReactiveWebClientSSRF.java:32:26:32:52 | getParameter(...) : String | semmle.label | getParameter(...) : String |
diff --git a/java/ql/test/query-tests/security/CWE-918/options b/java/ql/test/query-tests/security/CWE-918/options
index a5b2bf58d434..0c708f266d0b 100644
--- a/java/ql/test/query-tests/security/CWE-918/options
+++ b/java/ql/test/query-tests/security/CWE-918/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -source 11 -target 11 -cp ${testdir}/../../../stubs/javax-validation-constraints:${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/javax-ws-rs-api-2.1.1:${testdir}/../../../stubs/javax-ws-rs-api-3.0.0:${testdir}/../../../stubs/apache-http-4.4.13/:${testdir}/../../../stubs/apache-http-client-4.4.13:${testdir}/../../../stubs/projectreactor-3.4.3/:${testdir}/../../../stubs/postgresql-42.3.3/:${testdir}/../../../stubs/HikariCP-3.4.5/:${testdir}/../../../stubs/spring-jdbc-5.3.8/:${testdir}/../../../stubs/jdbi3-core-3.27.2/:${testdir}/../../../stubs/cargo:${testdir}/../../../stubs/javafx-web:${testdir}/../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/stapler-1.263:${testdir}/../../../stubs/javax-servlet-2.5:${testdir}/../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../stubs/saxon-xqj-9.x:${testdir}/../../../stubs/apache-commons-beanutils:${testdir}/../../../stubs/apache-commons-lang:${testdir}/../../../stubs/apache-http-5:${testdir}/../../../stubs/playframework-2.6.x:${testdir}/../../../stubs/jaxws-api-2.0:${testdir}/../../../stubs/apache-cxf
+//semmle-extractor-options: --javac-args -source 11 -target 11 -cp ${testdir}/../../../stubs/micronaut-4.x:${testdir}/../../../stubs/javax-validation-constraints:${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/javax-ws-rs-api-2.1.1:${testdir}/../../../stubs/javax-ws-rs-api-3.0.0:${testdir}/../../../stubs/apache-http-4.4.13/:${testdir}/../../../stubs/apache-http-client-4.4.13:${testdir}/../../../stubs/projectreactor-3.4.3/:${testdir}/../../../stubs/postgresql-42.3.3/:${testdir}/../../../stubs/HikariCP-3.4.5/:${testdir}/../../../stubs/spring-jdbc-5.3.8/:${testdir}/../../../stubs/jdbi3-core-3.27.2/:${testdir}/../../../stubs/cargo:${testdir}/../../../stubs/javafx-web:${testdir}/../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/stapler-1.263:${testdir}/../../../stubs/javax-servlet-2.5:${testdir}/../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../stubs/saxon-xqj-9.x:${testdir}/../../../stubs/apache-commons-beanutils:${testdir}/../../../stubs/apache-commons-lang:${testdir}/../../../stubs/apache-http-5:${testdir}/../../../stubs/playframework-2.6.x:${testdir}/../../../stubs/jaxws-api-2.0:${testdir}/../../../stubs/apache-cxf
diff --git a/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureDocumentBuilderFactory.java b/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureDocumentBuilderFactory.java
new file mode 100644
index 000000000000..22011e425aa2
--- /dev/null
+++ b/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureDocumentBuilderFactory.java
@@ -0,0 +1,34 @@
+// Minimal stub of org.apache.commons.xml.secure.SecureDocumentBuilderFactory for testing purposes
+
+package org.apache.commons.xml.secure;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+public final class SecureDocumentBuilderFactory {
+
+    public static DocumentBuilderFactory newDefaultInstance() {
+        return null;
+    }
+
+    public static DocumentBuilderFactory newDefaultNSInstance() {
+        return null;
+    }
+
+    public static DocumentBuilderFactory newInstance() {
+        return null;
+    }
+
+    public static DocumentBuilderFactory newInstance(final String factoryClassName, final ClassLoader classLoader) {
+        return null;
+    }
+
+    public static DocumentBuilderFactory newNSInstance() {
+        return null;
+    }
+
+    public static DocumentBuilderFactory newNSInstance(final String factoryClassName, final ClassLoader classLoader) {
+        return null;
+    }
+
+    private SecureDocumentBuilderFactory() {}
+}
diff --git a/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureSAXParserFactory.java b/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureSAXParserFactory.java
new file mode 100644
index 000000000000..4a0adcb44617
--- /dev/null
+++ b/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureSAXParserFactory.java
@@ -0,0 +1,34 @@
+// Minimal stub of org.apache.commons.xml.secure.SecureSAXParserFactory for testing purposes
+
+package org.apache.commons.xml.secure;
+
+import javax.xml.parsers.SAXParserFactory;
+
+public final class SecureSAXParserFactory {
+
+    public static SAXParserFactory newDefaultInstance() {
+        return null;
+    }
+
+    public static SAXParserFactory newDefaultNSInstance() {
+        return null;
+    }
+
+    public static SAXParserFactory newInstance() {
+        return null;
+    }
+
+    public static SAXParserFactory newInstance(final String factoryClassName, final ClassLoader classLoader) {
+        return null;
+    }
+
+    public static SAXParserFactory newNSInstance() {
+        return null;
+    }
+
+    public static SAXParserFactory newNSInstance(final String factoryClassName, final ClassLoader classLoader) {
+        return null;
+    }
+
+    private SecureSAXParserFactory() {}
+}
diff --git a/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureSchemaFactory.java b/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureSchemaFactory.java
new file mode 100644
index 000000000000..5c0d5ac258de
--- /dev/null
+++ b/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureSchemaFactory.java
@@ -0,0 +1,23 @@
+// Minimal stub of org.apache.commons.xml.secure.SecureSchemaFactory for testing purposes
+
+package org.apache.commons.xml.secure;
+
+import javax.xml.validation.SchemaFactory;
+
+public final class SecureSchemaFactory {
+
+    public static SchemaFactory newDefaultInstance() {
+        return null;
+    }
+
+    public static SchemaFactory newInstance(final String schemaLanguage) {
+        return null;
+    }
+
+    public static SchemaFactory newInstance(final String schemaLanguage, final String factoryClassName,
+            final ClassLoader classLoader) {
+        return null;
+    }
+
+    private SecureSchemaFactory() {}
+}
diff --git a/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureTransformerFactory.java b/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureTransformerFactory.java
new file mode 100644
index 000000000000..c51bb648ca10
--- /dev/null
+++ b/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureTransformerFactory.java
@@ -0,0 +1,22 @@
+// Minimal stub of org.apache.commons.xml.secure.SecureTransformerFactory for testing purposes
+
+package org.apache.commons.xml.secure;
+
+import javax.xml.transform.TransformerFactory;
+
+public final class SecureTransformerFactory {
+
+    public static TransformerFactory newDefaultInstance() {
+        return null;
+    }
+
+    public static TransformerFactory newInstance() {
+        return null;
+    }
+
+    public static TransformerFactory newInstance(final String factoryClassName, final ClassLoader classLoader) {
+        return null;
+    }
+
+    private SecureTransformerFactory() {}
+}
diff --git a/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureXMLInputFactory.java b/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureXMLInputFactory.java
new file mode 100644
index 000000000000..7116d3c14ae4
--- /dev/null
+++ b/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureXMLInputFactory.java
@@ -0,0 +1,26 @@
+// Minimal stub of org.apache.commons.xml.secure.SecureXMLInputFactory for testing purposes
+
+package org.apache.commons.xml.secure;
+
+import javax.xml.stream.XMLInputFactory;
+
+public final class SecureXMLInputFactory {
+
+    public static XMLInputFactory newDefaultFactory() {
+        return null;
+    }
+
+    public static XMLInputFactory newFactory() {
+        return null;
+    }
+
+    public static XMLInputFactory newFactory(final String factoryId, final ClassLoader classLoader) {
+        return null;
+    }
+
+    public static XMLInputFactory newInstance() {
+        return null;
+    }
+
+    private SecureXMLInputFactory() {}
+}
diff --git a/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureXPathFactory.java b/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureXPathFactory.java
new file mode 100644
index 000000000000..b7bc969bf7f7
--- /dev/null
+++ b/java/ql/test/stubs/apache-commons-secure-xml-1.0.0/org/apache/commons/xml/secure/SecureXPathFactory.java
@@ -0,0 +1,28 @@
+// Minimal stub of org.apache.commons.xml.secure.SecureXPathFactory for testing purposes
+
+package org.apache.commons.xml.secure;
+
+import javax.xml.xpath.XPathFactory;
+import javax.xml.xpath.XPathFactoryConfigurationException;
+
+public final class SecureXPathFactory {
+
+    public static XPathFactory newDefaultInstance() {
+        return null;
+    }
+
+    public static XPathFactory newInstance() {
+        return null;
+    }
+
+    public static XPathFactory newInstance(final String uri) throws XPathFactoryConfigurationException {
+        return null;
+    }
+
+    public static XPathFactory newInstance(final String uri, final String factoryClassName, final ClassLoader classLoader)
+            throws XPathFactoryConfigurationException {
+        return null;
+    }
+
+    private SecureXPathFactory() {}
+}
diff --git a/java/ql/test/stubs/apache-commons-text-1.9/org/apache/commons/text/StringEscapeUtils.java b/java/ql/test/stubs/apache-commons-text-1.9/org/apache/commons/text/StringEscapeUtils.java
new file mode 100644
index 000000000000..feebf83d4218
--- /dev/null
+++ b/java/ql/test/stubs/apache-commons-text-1.9/org/apache/commons/text/StringEscapeUtils.java
@@ -0,0 +1,9 @@
+// Generated automatically from org.apache.commons.text.StringEscapeUtils for testing purposes
+
+package org.apache.commons.text;
+
+public class StringEscapeUtils {
+    public static String escapeJava(String input) {
+        return null;
+    }
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/LICENSE.txt b/java/ql/test/stubs/micronaut-4.x/LICENSE.txt
new file mode 100644
index 000000000000..b5312355281c
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/LICENSE.txt
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/context/annotation/Property.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/context/annotation/Property.java
new file mode 100644
index 000000000000..01d4eadc6d10
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/context/annotation/Property.java
@@ -0,0 +1,11 @@
+package io.micronaut.context.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD})
+public @interface Property {
+    String name();
+    String defaultValue() default "";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/context/annotation/Value.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/context/annotation/Value.java
new file mode 100644
index 000000000000..ac8ffd8ed9ca
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/context/annotation/Value.java
@@ -0,0 +1,10 @@
+package io.micronaut.context.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD})
+public @interface Value {
+    String value() default "";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/core/convert/value/ConvertibleMultiValues.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/core/convert/value/ConvertibleMultiValues.java
new file mode 100644
index 000000000000..2635af3d75cb
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/core/convert/value/ConvertibleMultiValues.java
@@ -0,0 +1,10 @@
+package io.micronaut.core.convert.value;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface ConvertibleMultiValues<V> extends ConvertibleValues<List<V>> {
+    V get(CharSequence name);
+    List<V> getAll(CharSequence name);
+    Optional<V> getFirst(CharSequence name);
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/core/convert/value/ConvertibleValues.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/core/convert/value/ConvertibleValues.java
new file mode 100644
index 000000000000..bb32d5493578
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/core/convert/value/ConvertibleValues.java
@@ -0,0 +1,15 @@
+package io.micronaut.core.convert.value;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+public interface ConvertibleValues<V> extends Iterable<Map.Entry<String, V>> {
+    Map<String, V> asMap();
+    Properties asProperties();
+    V getValue(CharSequence name);
+    Iterator<Map.Entry<String, V>> iterator();
+    Map<String, V> subMap(String prefix, Class<?> valueType);
+    Collection<V> values();
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/core/type/Argument.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/core/type/Argument.java
new file mode 100644
index 000000000000..bc9c5da866c6
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/core/type/Argument.java
@@ -0,0 +1,4 @@
+package io.micronaut.core.type;
+
+public class Argument<T> {
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/data/annotation/Query.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/data/annotation/Query.java
new file mode 100644
index 000000000000..7648782800ff
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/data/annotation/Query.java
@@ -0,0 +1,10 @@
+package io.micronaut.data.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface Query {
+    String value() default "";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/data/annotation/Repository.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/data/annotation/Repository.java
new file mode 100644
index 000000000000..2ee674ab54d2
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/data/annotation/Repository.java
@@ -0,0 +1,10 @@
+package io.micronaut.data.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface Repository {
+    String value() default "";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/data/repository/CrudRepository.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/data/repository/CrudRepository.java
new file mode 100644
index 000000000000..22ff8a431bf1
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/data/repository/CrudRepository.java
@@ -0,0 +1,15 @@
+package io.micronaut.data.repository;
+
+import java.util.Optional;
+
+public interface CrudRepository<E, ID> extends GenericRepository<E, ID> {
+    <S extends E> S save(S entity);
+    <S extends E> Iterable<S> saveAll(Iterable<S> entities);
+    Optional<E> findById(ID id);
+    boolean existsById(ID id);
+    Iterable<E> findAll();
+    long count();
+    void deleteById(ID id);
+    void delete(E entity);
+    void deleteAll();
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/data/repository/GenericRepository.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/data/repository/GenericRepository.java
new file mode 100644
index 000000000000..1e213dd6a60b
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/data/repository/GenericRepository.java
@@ -0,0 +1,4 @@
+package io.micronaut.data.repository;
+
+public interface GenericRepository<E, ID> {
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpHeaders.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpHeaders.java
new file mode 100644
index 000000000000..440e1928b813
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpHeaders.java
@@ -0,0 +1,6 @@
+package io.micronaut.http;
+
+import io.micronaut.core.convert.value.ConvertibleMultiValues;
+
+public interface HttpHeaders extends ConvertibleMultiValues<String> {
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpMethod.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpMethod.java
new file mode 100644
index 000000000000..efcb9cb22f44
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpMethod.java
@@ -0,0 +1,5 @@
+package io.micronaut.http;
+
+public enum HttpMethod {
+    GET, POST, PUT, DELETE, PATCH, HEAD, OPTIONS, TRACE;
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpParameters.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpParameters.java
new file mode 100644
index 000000000000..2d0253d1304e
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpParameters.java
@@ -0,0 +1,6 @@
+package io.micronaut.http;
+
+import io.micronaut.core.convert.value.ConvertibleMultiValues;
+
+public interface HttpParameters extends ConvertibleMultiValues<String> {
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpRequest.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpRequest.java
new file mode 100644
index 000000000000..15429d6d4be4
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpRequest.java
@@ -0,0 +1,35 @@
+package io.micronaut.http;
+
+import java.net.URI;
+import java.util.Optional;
+import io.micronaut.http.cookie.Cookies;
+
+public interface HttpRequest<B> {
+    Cookies getCookies();
+    HttpHeaders getHeaders();
+    HttpParameters getParameters();
+    Optional<B> getBody();
+    URI getUri();
+    String getPath();
+    Optional<MediaType> getContentType();
+    long getContentLength();
+    HttpMethod getMethod();
+    String getMethodName();
+
+    static <T> HttpRequest<T> GET(String uri) { return null; }
+    static <T> HttpRequest<T> GET(URI uri) { return null; }
+    static <T> HttpRequest<T> POST(String uri, T body) { return null; }
+    static <T> HttpRequest<T> POST(URI uri, T body) { return null; }
+    static <T> HttpRequest<T> PUT(String uri, T body) { return null; }
+    static <T> HttpRequest<T> PUT(URI uri, T body) { return null; }
+    static HttpRequest<?> DELETE(String uri) { return null; }
+    static <T> HttpRequest<T> DELETE(String uri, T body) { return null; }
+    static HttpRequest<?> DELETE(URI uri) { return null; }
+    static <T> HttpRequest<T> DELETE(URI uri, T body) { return null; }
+    static <T> HttpRequest<T> PATCH(String uri, T body) { return null; }
+    static <T> HttpRequest<T> PATCH(URI uri, T body) { return null; }
+    static HttpRequest<?> HEAD(String uri) { return null; }
+    static HttpRequest<?> HEAD(URI uri) { return null; }
+    static HttpRequest<?> OPTIONS(String uri) { return null; }
+    static HttpRequest<?> OPTIONS(URI uri) { return null; }
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpResponse.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpResponse.java
new file mode 100644
index 000000000000..c56f8f2ab3fe
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpResponse.java
@@ -0,0 +1,21 @@
+package io.micronaut.http;
+
+import java.net.URI;
+import java.util.Optional;
+
+public interface HttpResponse<B> {
+    HttpStatus getStatus();
+    int code();
+    HttpHeaders getHeaders();
+    Optional<B> getBody();
+
+    static <T> MutableHttpResponse<T> ok() { return null; }
+    static <T> MutableHttpResponse<T> ok(T body) { return null; }
+    static MutableHttpResponse<?> redirect(URI location) { return null; }
+    static MutableHttpResponse<?> permanentRedirect(URI location) { return null; }
+    static MutableHttpResponse<?> seeOther(URI location) { return null; }
+    static MutableHttpResponse<?> temporaryRedirect(URI location) { return null; }
+    static MutableHttpResponse<?> notFound() { return null; }
+    static MutableHttpResponse<?> badRequest() { return null; }
+    static MutableHttpResponse<?> serverError() { return null; }
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpStatus.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpStatus.java
new file mode 100644
index 000000000000..ba0dd346b968
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/HttpStatus.java
@@ -0,0 +1,30 @@
+package io.micronaut.http;
+
+public enum HttpStatus {
+    OK(200),
+    CREATED(201),
+    ACCEPTED(202),
+    NO_CONTENT(204),
+    MOVED_PERMANENTLY(301),
+    FOUND(302),
+    SEE_OTHER(303),
+    NOT_MODIFIED(304),
+    TEMPORARY_REDIRECT(307),
+    BAD_REQUEST(400),
+    UNAUTHORIZED(401),
+    FORBIDDEN(403),
+    NOT_FOUND(404),
+    METHOD_NOT_ALLOWED(405),
+    INTERNAL_SERVER_ERROR(500),
+    SERVICE_UNAVAILABLE(503);
+
+    private final int code;
+
+    HttpStatus(int code) {
+        this.code = code;
+    }
+
+    public int getCode() {
+        return code;
+    }
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/MediaType.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/MediaType.java
new file mode 100644
index 000000000000..644af26a8db6
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/MediaType.java
@@ -0,0 +1,15 @@
+package io.micronaut.http;
+
+public class MediaType {
+    public static final String APPLICATION_JSON = "application/json";
+    public static final String TEXT_PLAIN = "text/plain";
+    public static final String TEXT_HTML = "text/html";
+    public static final String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
+    public static final String MULTIPART_FORM_DATA = "multipart/form-data";
+    public static final String APPLICATION_XML = "application/xml";
+    public static final String APPLICATION_OCTET_STREAM = "application/octet-stream";
+
+    public MediaType(String name) {}
+
+    public String getName() { return null; }
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/MutableHttpResponse.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/MutableHttpResponse.java
new file mode 100644
index 000000000000..37a6db7c917d
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/MutableHttpResponse.java
@@ -0,0 +1,11 @@
+package io.micronaut.http;
+
+public interface MutableHttpResponse<B> extends HttpResponse<B> {
+    MutableHttpResponse<B> header(CharSequence name, CharSequence value);
+    MutableHttpResponse<B> headers(java.util.Map<CharSequence, CharSequence> headers);
+    MutableHttpResponse<B> contentType(MediaType mediaType);
+    MutableHttpResponse<B> contentType(CharSequence mediaType);
+    MutableHttpResponse<B> status(HttpStatus status);
+    MutableHttpResponse<B> status(int status);
+    <T> MutableHttpResponse<T> body(T body);
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Body.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Body.java
new file mode 100644
index 000000000000..93942052e0e8
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Body.java
@@ -0,0 +1,10 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.PARAMETER})
+public @interface Body {
+    String value() default "";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Controller.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Controller.java
new file mode 100644
index 000000000000..184cd210fa8b
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Controller.java
@@ -0,0 +1,10 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface Controller {
+    String value() default "/";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/CookieValue.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/CookieValue.java
new file mode 100644
index 000000000000..c6a3378b7773
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/CookieValue.java
@@ -0,0 +1,10 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.PARAMETER})
+public @interface CookieValue {
+    String value() default "";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/CustomHttpMethod.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/CustomHttpMethod.java
new file mode 100644
index 000000000000..a59722cdb170
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/CustomHttpMethod.java
@@ -0,0 +1,11 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface CustomHttpMethod {
+    String value() default "/";
+    String method();
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Delete.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Delete.java
new file mode 100644
index 000000000000..22c32802ec4b
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Delete.java
@@ -0,0 +1,11 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface Delete {
+    String value() default "/";
+    String uri() default "/";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Error.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Error.java
new file mode 100644
index 000000000000..f1fddc4ef280
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Error.java
@@ -0,0 +1,13 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Error {
+    Class<? extends Throwable> exception() default Throwable.class;
+    boolean global() default false;
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Get.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Get.java
new file mode 100644
index 000000000000..15d50fc111ea
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Get.java
@@ -0,0 +1,11 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface Get {
+    String value() default "/";
+    String uri() default "/";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Head.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Head.java
new file mode 100644
index 000000000000..291e82b1012b
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Head.java
@@ -0,0 +1,11 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface Head {
+    String value() default "/";
+    String uri() default "/";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Header.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Header.java
new file mode 100644
index 000000000000..98da750e1355
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Header.java
@@ -0,0 +1,10 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.PARAMETER})
+public @interface Header {
+    String value() default "";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Options.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Options.java
new file mode 100644
index 000000000000..f2653ec3ea3b
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Options.java
@@ -0,0 +1,11 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface Options {
+    String value() default "/";
+    String uri() default "/";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Part.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Part.java
new file mode 100644
index 000000000000..39b0f508a9c2
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Part.java
@@ -0,0 +1,10 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.PARAMETER})
+public @interface Part {
+    String value() default "";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Patch.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Patch.java
new file mode 100644
index 000000000000..5f206769761c
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Patch.java
@@ -0,0 +1,11 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface Patch {
+    String value() default "/";
+    String uri() default "/";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/PathVariable.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/PathVariable.java
new file mode 100644
index 000000000000..08c7365ebe19
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/PathVariable.java
@@ -0,0 +1,10 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.PARAMETER})
+public @interface PathVariable {
+    String value() default "";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Post.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Post.java
new file mode 100644
index 000000000000..933474e17bfc
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Post.java
@@ -0,0 +1,11 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface Post {
+    String value() default "/";
+    String uri() default "/";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Put.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Put.java
new file mode 100644
index 000000000000..743961bd74ea
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Put.java
@@ -0,0 +1,11 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface Put {
+    String value() default "/";
+    String uri() default "/";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/QueryValue.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/QueryValue.java
new file mode 100644
index 000000000000..3c4378294aa7
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/QueryValue.java
@@ -0,0 +1,10 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.PARAMETER})
+public @interface QueryValue {
+    String value() default "";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/RequestAttribute.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/RequestAttribute.java
new file mode 100644
index 000000000000..67bd01516816
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/RequestAttribute.java
@@ -0,0 +1,10 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.PARAMETER})
+public @interface RequestAttribute {
+    String value() default "";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/RequestBean.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/RequestBean.java
new file mode 100644
index 000000000000..d1c69ac82f55
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/RequestBean.java
@@ -0,0 +1,11 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface RequestBean {
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Trace.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Trace.java
new file mode 100644
index 000000000000..de9b352e6801
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/annotation/Trace.java
@@ -0,0 +1,11 @@
+package io.micronaut.http.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface Trace {
+    String value() default "/";
+    String uri() default "/";
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/client/BlockingHttpClient.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/client/BlockingHttpClient.java
new file mode 100644
index 000000000000..e22737a0a703
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/client/BlockingHttpClient.java
@@ -0,0 +1,22 @@
+package io.micronaut.http.client;
+
+import io.micronaut.http.HttpRequest;
+import io.micronaut.http.HttpResponse;
+import io.micronaut.core.type.Argument;
+
+public interface BlockingHttpClient {
+    <I, O> HttpResponse<O> exchange(HttpRequest<I> request, Class<O> bodyType);
+    <I, O> HttpResponse<O> exchange(HttpRequest<I> request, Argument<O> bodyType);
+    <I, O, E> HttpResponse<O> exchange(HttpRequest<I> request, Argument<O> bodyType, Argument<E> errorType);
+    <I, O> HttpResponse<O> exchange(HttpRequest<I> request);
+    <I> String retrieve(HttpRequest<I> request);
+    <I, O> O retrieve(HttpRequest<I> request, Class<O> bodyType);
+    <I, O> O retrieve(HttpRequest<I> request, Argument<O> bodyType);
+    <I, O, E> O retrieve(HttpRequest<I> request, Argument<O> bodyType, Argument<E> errorType);
+    String retrieve(String uri);
+    <O> O retrieve(String uri, Class<O> bodyType);
+    <O, E> O retrieve(String uri, Class<O> bodyType, Class<E> errorType);
+    String exchange(String uri);
+    <O> HttpResponse<O> exchange(String uri, Class<O> bodyType);
+    <O, E> HttpResponse<O> exchange(String uri, Class<O> bodyType, Class<E> errorType);
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/client/HttpClient.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/client/HttpClient.java
new file mode 100644
index 000000000000..f0b53483926b
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/client/HttpClient.java
@@ -0,0 +1,19 @@
+package io.micronaut.http.client;
+
+import io.micronaut.http.HttpRequest;
+import io.micronaut.core.type.Argument;
+
+public interface HttpClient {
+    BlockingHttpClient toBlocking();
+    Object exchange(HttpRequest<?> request);
+    <O> Object exchange(HttpRequest<?> request, Class<O> bodyType);
+    <O> Object exchange(HttpRequest<?> request, Argument<O> bodyType);
+    <O, E> Object exchange(HttpRequest<?> request, Argument<O> bodyType, Argument<E> errorType);
+    Object exchange(String uri);
+    <O> Object exchange(String uri, Class<O> bodyType);
+    Object retrieve(HttpRequest<?> request);
+    <O> Object retrieve(HttpRequest<?> request, Class<O> bodyType);
+    <O> Object retrieve(HttpRequest<?> request, Argument<O> bodyType);
+    <O, E> Object retrieve(HttpRequest<?> request, Argument<O> bodyType, Argument<E> errorType);
+    Object retrieve(String uri);
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/cookie/Cookie.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/cookie/Cookie.java
new file mode 100644
index 000000000000..62f8dd31101d
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/cookie/Cookie.java
@@ -0,0 +1,11 @@
+package io.micronaut.http.cookie;
+
+public interface Cookie {
+    String getName();
+    String getValue();
+    String getDomain();
+    String getPath();
+    boolean isHttpOnly();
+    boolean isSecure();
+    long getMaxAge();
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/cookie/Cookies.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/cookie/Cookies.java
new file mode 100644
index 000000000000..6a24e572918f
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/cookie/Cookies.java
@@ -0,0 +1,11 @@
+package io.micronaut.http.cookie;
+
+import io.micronaut.core.convert.value.ConvertibleValues;
+import java.util.Optional;
+import java.util.Set;
+
+public interface Cookies extends ConvertibleValues<Cookie> {
+    Set<Cookie> getAll();
+    Optional<Cookie> findCookie(CharSequence name);
+    Cookie get(CharSequence name);
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/multipart/CompletedFileUpload.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/multipart/CompletedFileUpload.java
new file mode 100644
index 000000000000..597421bd81c3
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/multipart/CompletedFileUpload.java
@@ -0,0 +1,14 @@
+package io.micronaut.http.multipart;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Optional;
+import io.micronaut.http.MediaType;
+
+public interface CompletedFileUpload {
+    String getFilename();
+    byte[] getBytes() throws IOException;
+    InputStream getInputStream() throws IOException;
+    long getSize();
+    Optional<MediaType> getContentType();
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/uri/UriBuilder.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/uri/UriBuilder.java
new file mode 100644
index 000000000000..028bde03179c
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/http/uri/UriBuilder.java
@@ -0,0 +1,19 @@
+package io.micronaut.http.uri;
+
+import java.net.URI;
+import java.util.Map;
+
+public interface UriBuilder {
+    static UriBuilder of(CharSequence uri) { return null; }
+    static UriBuilder of(URI uri) { return null; }
+    UriBuilder host(String host);
+    UriBuilder path(String path);
+    UriBuilder queryParam(String name, Object... values);
+    UriBuilder replacePath(String path);
+    UriBuilder replaceQueryParam(String name, Object... values);
+    UriBuilder scheme(String scheme);
+    UriBuilder userInfo(String userInfo);
+    UriBuilder fragment(String fragment);
+    URI build();
+    URI expand(Map<String, ? super Object> values);
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/security/annotation/Secured.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/security/annotation/Secured.java
new file mode 100644
index 000000000000..a5cb5d0e2502
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/security/annotation/Secured.java
@@ -0,0 +1,10 @@
+package io.micronaut.security.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+public @interface Secured {
+    String[] value();
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/CloseReason.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/CloseReason.java
new file mode 100644
index 000000000000..47be261e3cfc
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/CloseReason.java
@@ -0,0 +1,4 @@
+package io.micronaut.websocket;
+
+public class CloseReason {
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/WebSocketSession.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/WebSocketSession.java
new file mode 100644
index 000000000000..dab20391373e
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/WebSocketSession.java
@@ -0,0 +1,13 @@
+package io.micronaut.websocket;
+
+import java.util.Optional;
+import java.util.Set;
+
+public interface WebSocketSession {
+    String getId();
+    Set<? extends WebSocketSession> getOpenSessions();
+    Optional<String> getCurrentRequest();
+    boolean isOpen();
+    boolean isSecure();
+    void close();
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/annotation/OnClose.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/annotation/OnClose.java
new file mode 100644
index 000000000000..ba7fdeef0b9b
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/annotation/OnClose.java
@@ -0,0 +1,9 @@
+package io.micronaut.websocket.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface OnClose {
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/annotation/OnMessage.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/annotation/OnMessage.java
new file mode 100644
index 000000000000..cb2cb13e7697
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/annotation/OnMessage.java
@@ -0,0 +1,9 @@
+package io.micronaut.websocket.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface OnMessage {
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/annotation/OnOpen.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/annotation/OnOpen.java
new file mode 100644
index 000000000000..5c1332b006bc
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/annotation/OnOpen.java
@@ -0,0 +1,9 @@
+package io.micronaut.websocket.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface OnOpen {
+}
diff --git a/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/annotation/ServerWebSocket.java b/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/annotation/ServerWebSocket.java
new file mode 100644
index 000000000000..e4b873d47206
--- /dev/null
+++ b/java/ql/test/stubs/micronaut-4.x/io/micronaut/websocket/annotation/ServerWebSocket.java
@@ -0,0 +1,10 @@
+package io.micronaut.websocket.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface ServerWebSocket {
+    String value() default "/";
+}
diff --git a/java/ql/test/stubs/owasp-java-encoder/org/owasp/encoder/Encode.java b/java/ql/test/stubs/owasp-java-encoder/org/owasp/encoder/Encode.java
new file mode 100644
index 000000000000..a06c5ab140ed
--- /dev/null
+++ b/java/ql/test/stubs/owasp-java-encoder/org/owasp/encoder/Encode.java
@@ -0,0 +1,9 @@
+// Generated automatically from org.owasp.encoder.Encode for testing purposes
+
+package org.owasp.encoder;
+
+public final class Encode {
+    public static String forJava(String input) {
+        return null;
+    }
+}
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/Generics.java b/java/ql/test/utils/modelgenerator/dataflow/p/Generics.java
new file mode 100644
index 000000000000..46d81c8bb7ae
--- /dev/null
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/Generics.java
@@ -0,0 +1,62 @@
+package p;
+
+public class Generics {
+
+  public class Generic1<T> {
+    // heuristic-summary=p;Generics$Generic1;true;ReturnParam;(Object);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;Generics$Generic1;true;ReturnParam;(Object);;Argument[0];ReturnValue;value;dfc-generated
+    public T ReturnParam(T input) {
+      return input;
+    }
+
+    public T StubImplementation(T input) {
+      return null;
+    }
+  }
+
+  public class DerivedGeneric extends Generic1<String> {
+    // heuristic-summary=p;Generics$Generic1;true;ReturnParam;(Object);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;Generics$Generic1;true;ReturnParam;(Object);;Argument[0];ReturnValue;value;dfc-generated
+    @Override
+      public String ReturnParam(String input) {
+        return input;
+      }
+
+    // heuristic-summary=p;Generics$Generic1;true;StubImplementation;(Object);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;Generics$Generic1;true;StubImplementation;(Object);;Argument[0];ReturnValue;value;dfc-generated
+    @Override
+    public String StubImplementation(String input) {
+      return input;
+    }
+  }
+
+  public class Generic2<T> {
+    // heuristic-summary=p;Generics$Generic2;true;ReturnParam;(Object);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;Generics$Generic2;true;ReturnParam;(Object);;Argument[0];ReturnValue;value;dfc-generated
+    public T ReturnParam(T input) {
+      return input;
+    }
+
+    public T StubImplementation(T input) {
+      return null;
+    }
+  }
+
+  public class NestedGeneric<T> extends Generic2<String> { }
+
+  public class DerivedNestedGeneric extends NestedGeneric<Integer> {
+    // heuristic-summary=p;Generics$Generic2;true;ReturnParam;(Object);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;Generics$Generic2;true;ReturnParam;(Object);;Argument[0];ReturnValue;value;dfc-generated
+    @Override
+    public String ReturnParam(String input) {
+      return input;
+    }
+
+    // heuristic-summary=p;Generics$Generic2;true;StubImplementation;(Object);;Argument[0];ReturnValue;value;df-generated
+    // contentbased-summary=p;Generics$Generic2;true;StubImplementation;(Object);;Argument[0];ReturnValue;value;dfc-generated
+    @Override
+    public String StubImplementation(String input) {
+      return input;
+    }
+  }
+}
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/Joiner.java b/java/ql/test/utils/modelgenerator/dataflow/p/Joiner.java
index ffe68e6722db..6412d1293b9d 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/Joiner.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/Joiner.java
@@ -82,6 +82,7 @@ public String toString() {
   }
 
   // heuristic-summary=p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;df-generated
+  // heuristic-summary=p;Joiner;false;add;(CharSequence);;Argument[0];Argument[this];taint;df-generated
   // contentbased-summary=p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;dfc-generated
   // MISSING content based summaries for "elts". This could be a synthetic field.
   public Joiner add(CharSequence newElement) {
@@ -107,6 +108,7 @@ private int checkAddLength(int oldLen, int inc) {
   }
 
   // heuristic-summary=p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;df-generated
+  // heuristic-summary=p;Joiner;false;merge;(Joiner);;Argument[0];Argument[this];taint;df-generated
   // contentbased-summary=p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;dfc-generated
   // MISSING content based summaries for "elts". This could be a synthetic field.
   public Joiner merge(Joiner other) {
diff --git a/javascript/externs/web/streamsapi.js b/javascript/externs/web/streamsapi.js
index 4a335775aadb..2e936a1b7a13 100644
--- a/javascript/externs/web/streamsapi.js
+++ b/javascript/externs/web/streamsapi.js
@@ -38,9 +38,27 @@ var QueuingStrategy;
 
 
 /**
+ * A transform stream (https://streams.spec.whatwg.org/#transform-stream).
  * @record
  */
-function TransformStream() {};
+function ITransformStream() {};
+
+/** @type {!WritableStream} */
+ITransformStream.prototype.writable;
+
+/** @type {!ReadableStream} */
+ITransformStream.prototype.readable;
+
+
+/**
+ * @constructor
+ * @implements {ITransformStream}
+ * @param {Object=} transformer
+ * @param {!QueuingStrategy=} writableStrategy
+ * @param {!QueuingStrategy=} readableStrategy
+ * @see https://streams.spec.whatwg.org/#ts-class
+ */
+function TransformStream(transformer, writableStrategy, readableStrategy) {};
 
 /** @type {!WritableStream} */
 TransformStream.prototype.writable;
@@ -120,7 +138,7 @@ ReadableStream.prototype.cancel = function(reason) {};
 ReadableStream.prototype.getReader = function(opt_options) {};
 
 /**
- * @param {!TransformStream} transform
+ * @param {!ITransformStream} transform
  * @param {!PipeOptions=} opt_options
  * @return {!ReadableStream}
  * @see https://streams.spec.whatwg.org/#rs-pipe-through
diff --git a/javascript/externs/web/webstorage.js b/javascript/externs/web/webstorage.js
index eee69d258145..7a41cccdd430 100644
--- a/javascript/externs/web/webstorage.js
+++ b/javascript/externs/web/webstorage.js
@@ -97,16 +97,40 @@ WindowLocalStorage.prototype.localStorage;
  */
 Window.prototype.localStorage;
 
+/**
+ * @record
+ * @extends {EventInit}
+ * @see https://html.spec.whatwg.org/multipage/webstorage.html#dictdef-storageeventinit
+ */
+function StorageEventInit() {}
+
+/** @type {(?string|undefined)} */
+StorageEventInit.prototype.key;
+
+/** @type {(?string|undefined)} */
+StorageEventInit.prototype.oldValue;
+
+/** @type {(?string|undefined)} */
+StorageEventInit.prototype.newValue;
+
+/** @type {(string|undefined)} */
+StorageEventInit.prototype.url;
+
+/** @type {(?Storage|undefined)} */
+StorageEventInit.prototype.storageArea;
+
 /**
  * This is the storage event interface.
- * @see http://www.w3.org/TR/2011/CR-webstorage-20111208/#the-storage-event
+ * @see https://html.spec.whatwg.org/multipage/webstorage.html#the-storageevent-interface
  * @extends {Event}
  * @constructor
+ * @param {string} type
+ * @param {StorageEventInit=} opt_eventInitDict
  */
-function StorageEvent() {}
+function StorageEvent(type, opt_eventInitDict) {}
 
 /**
- * @type {string}
+ * @type {?string}
  */
 StorageEvent.prototype.key;
 
@@ -132,17 +156,16 @@ StorageEvent.prototype.storageArea;
 
 /**
  * @param {string} typeArg
- * @param {boolean} canBubbleArg
- * @param {boolean} cancelableArg
- * @param {string} keyArg
- * @param {?string} oldValueArg
- * @param {?string} newValueArg
- * @param {string} urlArg
- * @param {?Storage} storageAreaArg
+ * @param {boolean=} canBubbleArg
+ * @param {boolean=} cancelableArg
+ * @param {?string=} keyArg
+ * @param {?string=} oldValueArg
+ * @param {?string=} newValueArg
+ * @param {string=} urlArg
+ * @param {?Storage=} storageAreaArg
  * @return {void}
  */
 StorageEvent.prototype.initStorageEvent = function(typeArg, canBubbleArg,
                                                    cancelableArg, keyArg,
                                                    oldValueArg, newValueArg,
                                                    urlArg, storageAreaArg) {};
-
diff --git a/javascript/extractor/lib/typescript/src/ast_extractor.ts b/javascript/extractor/lib/typescript/src/ast_extractor.ts
index 3dbc8a52d641..ac3b8eb69ed6 100644
--- a/javascript/extractor/lib/typescript/src/ast_extractor.ts
+++ b/javascript/extractor/lib/typescript/src/ast_extractor.ts
@@ -1,5 +1,4 @@
-import * as ts from "./typescript";
-import { Project } from "./common";
+import * as ts from "typescript";
 
 /**
  * Interface that exposes some internal properties we rely on, as well as
@@ -27,27 +26,6 @@ export interface Token {
     text: string;
 }
 
-function hasOwnProperty(o: object, p: string) {
-    return o && Object.prototype.hasOwnProperty.call(o, p);
-}
-
-// build our own copy of `ts.SyntaxKind` without `First*`/`Last*` markers
-let SyntaxKind: { [id: number]: string } = [];
-for (let p in ts.SyntaxKind) {
-    if (!hasOwnProperty(ts.SyntaxKind, p)) {
-        continue;
-    }
-    // skip numeric indices
-    if (+p === +p) {
-        continue;
-    }
-    // skip `First*`/`Last*`
-    if (p.substring(0, 5) === "First" || p.substring(0, 4) === "Last") {
-        continue;
-    }
-    SyntaxKind[ts.SyntaxKind[p] as any] = p;
-}
-
 let skipWhiteSpace = /(?:\s|\/\/.*|\/\*[^]*?\*\/)*/g;
 
 /**
@@ -61,18 +39,7 @@ function forEachNode(ast: ts.Node, callback: (node: ts.Node) => void) {
     visit(ast);
 }
 
-function tryGetTypeOfNode(typeChecker: ts.TypeChecker, node: AugmentedNode): ts.Type | null {
-    try {
-        return typeChecker.getTypeAtLocation(node);
-    } catch (e) {
-        let sourceFile = node.getSourceFile();
-        let { line, character } = sourceFile.getLineAndCharacterOfPosition(node.pos);
-        console.warn(`Could not compute type of ${ts.SyntaxKind[node.kind]} at ${sourceFile.fileName}:${line + 1}:${character + 1}`);
-        return null;
-    }
-}
-
-export function augmentAst(ast: AugmentedSourceFile, code: string, project: Project | null) {
+export function augmentAst(ast: AugmentedSourceFile, code: string) {
     ast.$lineStarts = ast.getLineStarts();
 
     /**
@@ -164,10 +131,9 @@ export function augmentAst(ast: AugmentedSourceFile, code: string, project: Proj
         }
 
         if (ts.isVariableDeclarationList(node as any)) {
-            let tz = ts as any;
-            if (typeof tz.isLet === "function" && tz.isLet(node) || (node.flags & ts.NodeFlags.Let)) {
+            if (node.flags & ts.NodeFlags.Let) {
                 node.$declarationKind = "let";
-            } else if (typeof tz.isConst === "function" && tz.isConst(node) || (node.flags & ts.NodeFlags.Const)) {
+            } else if (node.flags & ts.NodeFlags.Const) {
                 node.$declarationKind = "const";
             } else {
                 node.$declarationKind = "var";
diff --git a/javascript/extractor/lib/typescript/src/common.ts b/javascript/extractor/lib/typescript/src/common.ts
deleted file mode 100644
index 9276a567bb08..000000000000
--- a/javascript/extractor/lib/typescript/src/common.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import * as ts from "./typescript";
-
-export class Project {
-  public program: ts.Program = null;
-  private host: ts.CompilerHost;
-
-  constructor(
-    public tsConfig: string,
-    public config: ts.ParsedCommandLine,
-    public packageEntryPoints: Map<string, string>) {
-
-    let host = ts.createCompilerHost(config.options, true);
-    host.trace = undefined; // Disable tracing which would otherwise go to standard out
-    this.host = host;
-  }
-
-  public unload(): void {
-    this.program = null;
-  }
-
-  public load(): void {
-    const { config, host } = this;
-    this.program = ts.createProgram(config.fileNames, config.options, host);
-  }
-
-  /**
-   * Discards the old compiler instance and starts a new one.
-   */
-  public reload(): void {
-    // Ensure all references to the old compiler instance
-    // are cleared before calling `createProgram`.
-    this.unload();
-    this.load();
-  }
-}
diff --git a/javascript/extractor/lib/typescript/src/main.ts b/javascript/extractor/lib/typescript/src/main.ts
index 0630213c7431..7ca31c428123 100644
--- a/javascript/extractor/lib/typescript/src/main.ts
+++ b/javascript/extractor/lib/typescript/src/main.ts
@@ -33,12 +33,9 @@
 
 import * as pathlib from "path";
 import * as readline from "readline";
-import * as ts from "./typescript";
+import * as ts from "typescript";
 import * as ast_extractor from "./ast_extractor";
 
-import { Project } from "./common";
-import { VirtualSourceRoot } from "./virtual_source_root";
-
 // Remove limit on stack trace depth.
 Error.stackTraceLimit = Infinity;
 
@@ -46,13 +43,6 @@ interface ParseCommand {
     command: "parse";
     filename: string;
 }
-interface LoadCommand {
-    tsConfig: string;
-    sourceRoot: string | null;
-    virtualSourceRoot: string | null;
-    packageEntryPoints: [string, string][];
-    packageJsonFiles: [string, string][];
-}
 interface ResetCommand {
     command: "reset";
 }
@@ -70,93 +60,15 @@ type Command = ParseCommand | ResetCommand | QuitCommand | PrepareFilesCommand |
 
 /** The state to be shared between commands. */
 class State {
-    public project: Project = null;
-
     /** List of files that have been requested. */
     public pendingFiles: string[] = [];
     public pendingFileIndex = 0;
 
     /** Next response to be delivered. */
     public pendingResponse: string = null;
-
-    /** Map from `package.json` files to their contents. */
-    public parsedPackageJson = new Map<string, any>();
-
-    /** Map from `package.json` files to the file referenced in its `types` or `typings` field. */
-    public packageTypings = new Map<string, string | undefined>();
-
-    /** Map from file path to the enclosing `package.json` file, if any. Will not traverse outside node_modules. */
-    public enclosingPackageJson = new Map<string, string | undefined>();
 }
 let state = new State();
 
-const reloadMemoryThresholdMb = getEnvironmentVariable("SEMMLE_TYPESCRIPT_MEMORY_THRESHOLD", Number, 1000);
-
-function getPackageJson(file: string): any {
-    let cache = state.parsedPackageJson;
-    if (cache.has(file)) return cache.get(file);
-    let result = getPackageJsonRaw(file);
-    cache.set(file, result);
-    return result;
-}
-
-function getPackageJsonRaw(file: string): any {
-    if (!ts.sys.fileExists(file)) return undefined;
-    try {
-        let json = JSON.parse(ts.sys.readFile(file));
-        if (typeof json !== 'object') return undefined;
-        return json;
-    } catch (e) {
-        return undefined;
-    }
-}
-
-function getPackageTypings(file: string): string | undefined {
-    let cache = state.packageTypings;
-    if (cache.has(file)) return cache.get(file);
-    let result = getPackageTypingsRaw(file);
-    cache.set(file, result);
-    return result;
-}
-
-function getPackageTypingsRaw(packageJsonFile: string): string | undefined {
-    let json = getPackageJson(packageJsonFile);
-    if (json == null) return undefined;
-    let typings = json.types || json.typings; // "types" and "typings" are aliases
-    if (typeof typings !== 'string') return undefined;
-    let absolutePath = pathlib.join(pathlib.dirname(packageJsonFile), typings);
-    if (ts.sys.directoryExists(absolutePath)) {
-        absolutePath = pathlib.join(absolutePath, 'index.d.ts');
-    } else if (!absolutePath.endsWith('.ts')) {
-        absolutePath += '.d.ts';
-    }
-    if (!ts.sys.fileExists(absolutePath)) return undefined;
-    return ts.sys.resolvePath(absolutePath);
-}
-
-function getEnclosingPackageJson(file: string): string | undefined {
-    let cache = state.packageTypings;
-    if (cache.has(file)) return cache.get(file);
-    let result = getEnclosingPackageJsonRaw(file);
-    cache.set(file, result);
-    return result;
-}
-
-function getEnclosingPackageJsonRaw(file: string): string | undefined {
-    let packageJson = pathlib.join(file, 'package.json');
-    if (ts.sys.fileExists(packageJson)) {
-        return packageJson;
-    }
-    if (pathlib.basename(file) === 'node_modules') {
-        return undefined;
-    }
-    let dirname = pathlib.dirname(file);
-    if (dirname.length < file.length) {
-        return getEnclosingPackageJson(dirname);
-    }
-    return undefined;
-}
-
 /**
  * Debugging method for finding cycles in the TypeScript AST. Should not be used in production.
  *
@@ -330,7 +242,6 @@ function extractFile(filename: string): string {
 function prepareNextFile() {
     if (state.pendingResponse != null) return;
     if (state.pendingFileIndex < state.pendingFiles.length) {
-        checkMemoryUsage();
         let nextFilename = state.pendingFiles[state.pendingFileIndex];
         state.pendingResponse = extractFile(nextFilename);
     }
@@ -368,13 +279,12 @@ function isExtractableSourceFile(ast: ast_extractor.AugmentedSourceFile): boolea
 }
 
 /**
- * Gets the AST and source code for the given file, either from
- * an already-open project, or by parsing the file.
+ * Gets the AST and source code by parsing the given file.
  */
 function getAstForFile(filename: string): ts.SourceFile {
     let { ast, code } = parseSingleFile(filename);
     if (ast != null && isExtractableSourceFile(ast)) {
-        ast_extractor.augmentAst(ast, code, null);
+        ast_extractor.augmentAst(ast, code);
     }
     return ast;
 }
@@ -401,7 +311,6 @@ function parseSingleFile(filename: string): { ast: ts.SourceFile, code: string }
     // parse `filename` with minimial checking
     let compilerOptions: ts.CompilerOptions = {
         experimentalDecorators: true,
-        experimentalAsyncFunctions: true,
         jsx: ts.JsxEmit.Preserve,
         noResolve: true,
     };
@@ -413,98 +322,6 @@ function parseSingleFile(filename: string): { ast: ts.SourceFile, code: string }
     return { ast, code };
 }
 
-/**
- * Matches a path segment referencing a package in a node_modules folder, and extracts
- * two capture groups: the package name, and the relative path in the package.
- *
- * For example `lib/node_modules/@foo/bar/src/index.js` extracts the capture groups [`@foo/bar`, `src/index.js`].
- */
-const nodeModulesRex = /[/\\]node_modules[/\\]((?:@[\w.-]+[/\\])?\w[\w.-]*)[/\\](.*)/;
-
-interface LoadedConfig {
-    config: ts.ParsedCommandLine;
-    basePath: string;
-    packageEntryPoints: Map<string, string>;
-    packageJsonFiles: Map<string, string>;
-    virtualSourceRoot: VirtualSourceRoot;
-    ownFiles: string[];
-}
-
-function loadTsConfig(command: LoadCommand): LoadedConfig {
-    let tsConfig = ts.readConfigFile(command.tsConfig, ts.sys.readFile);
-    let basePath = pathlib.dirname(command.tsConfig);
-
-    let packageEntryPoints = new Map(command.packageEntryPoints);
-    let packageJsonFiles = new Map(command.packageJsonFiles);
-    let virtualSourceRoot = new VirtualSourceRoot(command.sourceRoot, command.virtualSourceRoot);
-
-    /**
-     * Rewrites path segments of form `node_modules/PACK/suffix` to be relative to
-     * the location of package PACK in the source tree, if it exists.
-     */
-    function redirectNodeModulesPath(path: string) {
-        let nodeModulesMatch = nodeModulesRex.exec(path);
-        if (nodeModulesMatch == null) return null;
-        let packageName = nodeModulesMatch[1];
-        let packageJsonFile = packageJsonFiles.get(packageName);
-        if (packageJsonFile == null) return null;
-        let packageDir = pathlib.dirname(packageJsonFile);
-        let suffix = nodeModulesMatch[2];
-        let finalPath = pathlib.join(packageDir, suffix);
-        if (!ts.sys.fileExists(finalPath)) return null;
-        return finalPath;
-    }
-
-    /**
-     * Create the host passed to the tsconfig.json parser.
-     *
-     * We override its file system access in case there is an "extends"
-     * clause pointing into "./node_modules", which must be redirected to
-     * the location of an installed package or a checked-in package.
-     */
-    let parseConfigHost: ts.ParseConfigHost = {
-        useCaseSensitiveFileNames: true,
-        readDirectory: (rootDir, extensions, excludes?, includes?, depth?) => {
-            // Perform the glob matching in both real and virtual source roots.
-            let exclusions = excludes == null ? [] : [...excludes];
-            if (virtualSourceRoot.virtualSourceRoot != null) {
-                // qltest puts the virtual source root inside the real source root (.testproj).
-                // Make sure we don't find files inside the virtual source root in this pass.
-                exclusions.push(virtualSourceRoot.virtualSourceRoot);
-            }
-            let originalResults = ts.sys.readDirectory(rootDir, extensions, exclusions, includes, depth)
-            let virtualDir = virtualSourceRoot.toVirtualPath(rootDir);
-            if (virtualDir == null) {
-                return originalResults;
-            }
-            // Make sure glob matching does not to discover anything in node_modules.
-            let virtualExclusions = excludes == null ? [] : [...excludes];
-            virtualExclusions.push('**/node_modules/**/*');
-            let virtualResults = ts.sys.readDirectory(virtualDir, extensions, virtualExclusions, includes, depth)
-            return [...originalResults, ...virtualResults];
-        },
-        fileExists: (path: string) => {
-            return ts.sys.fileExists(path)
-                || virtualSourceRoot.toVirtualPathIfFileExists(path) != null
-                || redirectNodeModulesPath(path) != null;
-        },
-        readFile: (path: string) => {
-            if (!ts.sys.fileExists(path)) {
-                let virtualPath = virtualSourceRoot.toVirtualPathIfFileExists(path);
-                if (virtualPath != null) return ts.sys.readFile(virtualPath);
-                virtualPath = redirectNodeModulesPath(path);
-                if (virtualPath != null) return ts.sys.readFile(virtualPath);
-            }
-            return ts.sys.readFile(path);
-        }
-    };
-    let config = ts.parseJsonConfigFileContent(tsConfig.config, parseConfigHost, basePath);
-
-    let ownFiles = config.fileNames.map(file => pathlib.resolve(file));
-
-    return { config, basePath, packageJsonFiles, packageEntryPoints, virtualSourceRoot, ownFiles };
-}
-
 function handleResetCommand(command: ResetCommand) {
     reset();
     console.log(JSON.stringify({
@@ -533,37 +350,6 @@ function reset() {
     state = new State();
 }
 
-function getEnvironmentVariable<T>(name: string, parse: (x: string) => T, defaultValue: T) {
-    let value = process.env[name];
-    return value != null ? parse(value) : defaultValue;
-}
-
-/**
- * Whether the memory usage was last observed to be above the threshold for restarting the TypeScript compiler.
- *
- * This is to prevent repeatedly restarting the compiler if the GC does not immediately bring us below the
- * threshold again.
- */
-let hasReloadedSinceExceedingThreshold = false;
-
-/**
- * If memory usage has moved above a the threshold, reboot the TypeScript compiler instance.
- *
- * Make sure to call this only when stdout has been flushed.
- */
-function checkMemoryUsage() {
-    let bytesUsed = process.memoryUsage().heapUsed;
-    let megabytesUsed = bytesUsed / 1000000;
-    if (!hasReloadedSinceExceedingThreshold && megabytesUsed > reloadMemoryThresholdMb && state.project != null) {
-        console.warn('Restarting TypeScript compiler due to memory usage');
-        state.project.reload();
-        hasReloadedSinceExceedingThreshold = true;
-    }
-    else if (hasReloadedSinceExceedingThreshold && megabytesUsed < reloadMemoryThresholdMb) {
-        hasReloadedSinceExceedingThreshold = false;
-    }
-}
-
 function runReadLineInterface() {
     reset();
     let rl = readline.createInterface({ input: process.stdin, output: process.stdout });
diff --git a/javascript/extractor/lib/typescript/src/typescript.d.ts b/javascript/extractor/lib/typescript/src/typescript.d.ts
deleted file mode 100644
index 769a318e7249..000000000000
--- a/javascript/extractor/lib/typescript/src/typescript.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import * as ts from "typescript";
-export = ts;
diff --git a/javascript/extractor/lib/typescript/src/typescript.js b/javascript/extractor/lib/typescript/src/typescript.js
deleted file mode 100644
index f469e2e098dd..000000000000
--- a/javascript/extractor/lib/typescript/src/typescript.js
+++ /dev/null
@@ -1,7 +0,0 @@
-let overridePath = process.env['SEMMLE_TYPESCRIPT_HOME'];
-
-if (overridePath != null) {
-  module.exports = require(overridePath);
-} else {
-  module.exports = require('typescript');
-}
diff --git a/javascript/extractor/lib/typescript/src/virtual_source_root.ts b/javascript/extractor/lib/typescript/src/virtual_source_root.ts
deleted file mode 100644
index 6ca9a580b566..000000000000
--- a/javascript/extractor/lib/typescript/src/virtual_source_root.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import * as pathlib from "path";
-import * as ts from "./typescript";
-
-/**
- * Mapping from the real source root to the virtual source root,
- * a directory whose folder structure mirrors the real source root, but with `node_modules` installed.
- */
-export class VirtualSourceRoot {
-  constructor(
-    public sourceRoot: string | null,
-
-    /**
-     * Directory whose folder structure mirrors the real source root, but with `node_modules` installed,
-     * or undefined if no virtual source root exists.
-     */
-    public virtualSourceRoot: string | null,
-  ) {}
-
-  private static translate(oldRoot: string, newRoot: string, path: string) {
-    if (!oldRoot || !newRoot) return null;
-    let relative = pathlib.relative(oldRoot, path);
-    if (relative.startsWith('..') || pathlib.isAbsolute(relative)) return null;
-    return pathlib.join(newRoot, relative);
-  }
-
-  /**
-   * Maps a path under the real source root to the corresponding path in the virtual source root.
-   *
-   * Returns `null` for paths already in the virtual source root.
-   */
-  public toVirtualPath(path: string) {
-    let { virtualSourceRoot } = this;
-    if (path.startsWith(virtualSourceRoot)) {
-      // 'qltest' creates a virtual source root inside the real source root.
-      // Make sure such files don't appear to be inside the real source root.
-      return null;
-    }
-    return VirtualSourceRoot.translate(this.sourceRoot, virtualSourceRoot, path);
-  }
-
-  /**
-   * Maps a path under the virtual source root to the corresponding path in the real source root.
-   */
-  public fromVirtualPath(path: string) {
-    return VirtualSourceRoot.translate(this.virtualSourceRoot, this.sourceRoot, path);
-  }
-
-  /**
-   * Maps a path under the real source root to the corresponding path in the virtual source root.
-   */
-  public toVirtualPathIfFileExists(path: string) {
-    let virtualPath = this.toVirtualPath(path);
-    if (virtualPath != null && ts.sys.fileExists(virtualPath)) {
-        return virtualPath;
-    }
-    return null;
-  }
-
-  /**
-   * Maps a path under the real source root to the corresponding path in the virtual source root.
-   */
-  public toVirtualPathIfDirectoryExists(path: string) {
-    let virtualPath = this.toVirtualPath(path);
-    if (virtualPath != null && ts.sys.directoryExists(virtualPath)) {
-        return virtualPath;
-    }
-    return null;
-  }
-}
diff --git a/javascript/extractor/src/com/semmle/jcorn/AngularExpressionParser.java b/javascript/extractor/src/com/semmle/jcorn/AngularExpressionParser.java
index 79c1a1e30dbe..f3245d573352 100644
--- a/javascript/extractor/src/com/semmle/jcorn/AngularExpressionParser.java
+++ b/javascript/extractor/src/com/semmle/jcorn/AngularExpressionParser.java
@@ -30,14 +30,13 @@ protected Expression buildBinary(
       boolean logical) {
     // Angular pipe expression: `x|f:a` is desugared to `f(x, a)`
     if (op.equals("|")) {
-      DestructuringErrors refDestructuringErrors = new DestructuringErrors();
       List<Expression> arguments = new ArrayList<>();
       arguments.add(left);
       while (this.type == TokenType.colon) {
         this.next();
         int argStartPos = this.pos;
         Position argStartLocation = this.curPosition();
-        Expression arg = parseMaybeUnary(refDestructuringErrors, false);
+        Expression arg = parseMaybeUnary(false);
         arguments.add(parseExprOp(arg, argStartPos, argStartLocation, TokenType.plusMin.binop, true));
       }
       SourceLocation loc = new SourceLocation(startLoc);
@@ -50,10 +49,10 @@ protected Expression buildBinary(
   }
 
   @Override
-  protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
+  protected Expression parseExprAtom() {
     // Parse postfix "!" operator
     Position startLoc = this.startLoc;
-    Expression expr = super.parseExprAtom(refDestructuringErrors);
+    Expression expr = super.parseExprAtom();
     if (this.type == TokenType.prefix && "!".equals(this.value)) {
       this.next(); // consume "!" token
       return finishNode(new NonNullAssertion(new SourceLocation(startLoc), expr));
diff --git a/javascript/extractor/src/com/semmle/jcorn/CustomParser.java b/javascript/extractor/src/com/semmle/jcorn/CustomParser.java
index 7170aa3e5217..cb963a4cd380 100644
--- a/javascript/extractor/src/com/semmle/jcorn/CustomParser.java
+++ b/javascript/extractor/src/com/semmle/jcorn/CustomParser.java
@@ -90,7 +90,7 @@ protected CatchClause parseCatchClause(Position startLoc) {
     if (this.eat(TokenType.parenL)) {
       param = this.parseBindingAtom();
       this.checkLVal(param, true, null);
-      if (this.eat(TokenType._if)) guard = this.parseExpression(false, null);
+      if (this.eat(TokenType._if)) guard = this.parseExpression(false);
       this.expect(TokenType.parenR);
     } else if (!options.esnext()) {
       this.unexpected();
@@ -123,7 +123,7 @@ protected Statement parseVarStatement(Position startLoc, String kind) {
   }
 
   @Override
-  protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
+  protected Expression parseExprAtom() {
     Position startLoc = this.startLoc;
     if (options.mozExtensions() && this.isContextual("let")) {
       this.next();
@@ -141,9 +141,9 @@ protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
       if (this.type == TokenType.comma
           || this.type == TokenType.bracketR
           || this.type == TokenType.ellipsis) {
-        elements = this.parseExprList(TokenType.bracketR, true, true, refDestructuringErrors);
+        elements = this.parseExprList(TokenType.bracketR, true, true);
       } else {
-        Expression firstExpr = this.parseMaybeAssign(false, refDestructuringErrors, null);
+        Expression firstExpr = this.parseMaybeAssign(false, null);
         // check whether this is a postfix array comprehension
         if (this.type == TokenType._for || this.type == TokenType._if) {
           ComprehensionExpression c = this.parseComprehension(startLoc, false, firstExpr);
@@ -154,7 +154,7 @@ protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
           elements = new ArrayList<Expression>();
           elements.add(firstExpr);
           elements.addAll(
-              this.parseExprList(TokenType.bracketR, true, true, refDestructuringErrors));
+              this.parseExprList(TokenType.bracketR, true, true));
         }
       }
       return this.finishNode(new ArrayExpression(new SourceLocation(startLoc), elements));
@@ -164,7 +164,7 @@ protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
       Identifier buildinName = this.parseIdent(true);
       Identifier name = this.finishNode(new Identifier(new SourceLocation(startLoc), "%" + buildinName.getName()));
       this.expect(TokenType.parenL);
-      List<Expression> args = this.parseExprList(TokenType.parenR, false, false, null);
+      List<Expression> args = this.parseExprList(TokenType.parenR, false, false);
       CallExpression node =
           new CallExpression(
               new SourceLocation(startLoc), name, new ArrayList<>(), args, false, false);
@@ -184,7 +184,7 @@ protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
       }
       return attr;
     } else {
-      return super.parseExprAtom(refDestructuringErrors);
+      return super.parseExprAtom();
     }
   }
 
@@ -197,7 +197,7 @@ protected Node parseLetExpression(Position startLoc, boolean maybeStatement) {
     if (this.type == TokenType.braceL) {
       if (!maybeStatement) {
         // must be the start of an object literal
-        Expression body = this.parseObj(false, null);
+        Expression body = this.parseObj(false);
         return this.finishNode(
             new LetExpression(new SourceLocation(startLoc), decl.getDeclarations(), body));
       }
@@ -212,7 +212,7 @@ protected Node parseLetExpression(Position startLoc, boolean maybeStatement) {
       return this.finishNode(
           new LetStatement(new SourceLocation(startLoc), decl.getDeclarations(), body));
     } else {
-      Expression body = this.parseExpression(false, null);
+      Expression body = this.parseExpression(false);
       return this.finishNode(
           new LetExpression(new SourceLocation(startLoc), decl.getDeclarations(), body));
     }
@@ -283,13 +283,12 @@ private boolean eatDoubleColon() {
 
   // accept `yield` in non-generator functions
   @Override
-  protected Expression parseMaybeAssign(
-      boolean noIn, DestructuringErrors refDestructuringErrors, AfterLeftParse afterLeftParse) {
+  protected Expression parseMaybeAssign(boolean noIn, AfterLeftParse afterLeftParse) {
     if (options.mozExtensions() && isContextual("yield")) {
       if (!this.inFunction) this.raise(this.startLoc, "Yield not in function");
       return this.parseYield();
     }
-    return super.parseMaybeAssign(noIn, refDestructuringErrors, afterLeftParse);
+    return super.parseMaybeAssign(noIn, afterLeftParse);
   }
 
   // add parsing of comprehensions
@@ -309,12 +308,12 @@ protected ComprehensionExpression parseComprehension(
       } else {
         this.expect(TokenType._in);
       }
-      Expression right = this.parseExpression(false, null);
+      Expression right = this.parseExpression(false);
       this.expect(TokenType.parenR);
       blocks.add(this.finishNode(new ComprehensionBlock(blockStart, (IPattern) left, right, of)));
     }
     Expression filter = this.eat(TokenType._if) ? this.parseParenExpression() : null;
-    if (body == null) body = this.parseExpression(false, null);
+    if (body == null) body = this.parseExpression(false);
 
     return new ComprehensionExpression(
         new SourceLocation(startLoc), body, blocks, filter, isGenerator);
@@ -353,13 +352,11 @@ protected Expression parseParenAndDistinguishExpression(boolean canBeArrow) {
 
   @Override
   protected boolean parseParenthesisedExpression(
-      DestructuringErrors refDestructuringErrors,
       boolean allowTrailingComma,
       ParenthesisedExpressions parenExprs,
       boolean first) {
     boolean cont =
-        super.parseParenthesisedExpression(
-            refDestructuringErrors, allowTrailingComma, parenExprs, first);
+        super.parseParenthesisedExpression(allowTrailingComma, parenExprs, first);
     if (options.mozExtensions() && parenExprs.exprList.size() == 1 && this.type == TokenType._for) {
       Expression body = parenExprs.exprList.remove(0);
       ComprehensionExpression c = parseComprehension(body.getLoc().getStart(), true, body);
@@ -399,7 +396,7 @@ protected Expression parseNew() {
         && options.mozExtensions()
         && !canInsertSemicolon()
         && this.type == TokenType.braceL) {
-      ((NewExpression) res).getArguments().add(this.parseObj(false, null));
+      ((NewExpression) res).getArguments().add(this.parseObj(false));
       res = this.finishNode(res);
     }
     return res;
@@ -465,7 +462,7 @@ protected Pair<Expression, Boolean> parseSubscript(
     if (options.e4x() && this.eat(TokenType.dot)) {
       SourceLocation start = new SourceLocation(startLoc);
       if (this.eat(TokenType.parenL)) {
-        Expression filter = parseExpression(false, null);
+        Expression filter = parseExpression(false);
         this.expect(TokenType.parenR);
         return Pair.make(this.finishNode(new XMLFilterExpression(start, base, filter)), true);
       }
@@ -515,7 +512,7 @@ protected Expression parsePropertySelector(SourceLocation start) {
    */
   protected Expression parseAttributeIdentifier(SourceLocation start) {
     if (this.eat(TokenType.bracketL)) {
-      Expression idx = parseExpression(false, null);
+      Expression idx = parseExpression(false);
       this.expect(TokenType.bracketR);
       return this.finishNode(new XMLAttributeSelector(start, idx, true));
     } else {
@@ -533,7 +530,7 @@ protected Expression parseDecoratorBody() {
       // followed by a right bracket, which will later be converted by
       // `decoratorToAttributeSelector` below
       List<Expression> elements = new ArrayList<>();
-      elements.add(parseExpression(false, null));
+      elements.add(parseExpression(false));
       this.expect(TokenType.bracketR);
       return this.finishNode(new ArrayExpression(start, elements));
     }
diff --git a/javascript/extractor/src/com/semmle/jcorn/ESNextParser.java b/javascript/extractor/src/com/semmle/jcorn/ESNextParser.java
index 1eff68a30385..edc6fb9bf632 100644
--- a/javascript/extractor/src/com/semmle/jcorn/ESNextParser.java
+++ b/javascript/extractor/src/com/semmle/jcorn/ESNextParser.java
@@ -59,17 +59,14 @@ public ESNextParser(Options options, String input, int startPos) {
    */
 
   @Override
-  protected Property parseProperty(
-      boolean isPattern,
-      DestructuringErrors refDestructuringErrors,
-      Map<String, PropInfo> propHash) {
+  protected Property parseProperty(boolean isPattern, Map<String, PropInfo> propHash) {
     Position start = this.startLoc;
 
     List<Decorator> decorators = parseDecorators();
 
     Property prop = null;
     if (this.type == TokenType.ellipsis) {
-      SpreadElement spread = this.parseSpread(null);
+      SpreadElement spread = this.parseSpread();
       Expression val;
       if (isPattern) val = new RestElement(spread.getLoc(), spread.getArgument());
       else val = spread;
@@ -79,7 +76,7 @@ protected Property parseProperty(
                   new SourceLocation(start), null, val, Property.Kind.INIT.name(), false, false));
     }
 
-    if (prop == null) prop = super.parseProperty(isPattern, refDestructuringErrors, propHash);
+    if (prop == null) prop = super.parseProperty(isPattern, propHash);
 
     prop.addDecorators(decorators);
 
@@ -129,7 +126,7 @@ protected FieldDefinition parseFieldDefinition(PropertyInfo pi, boolean isStatic
       this.next();
       boolean oldInFunc = this.inFunction;
       this.inFunction = true;
-      value = parseMaybeAssign(false, null, null);
+      value = parseMaybeAssign(false, null);
       this.inFunction = oldInFunc;
     }
     this.semicolon();
@@ -220,7 +217,7 @@ protected Statement parseStatement(boolean declaration, boolean topLevel, Set<St
   }
 
   @Override
-  protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
+  protected Expression parseExprAtom() {
     if (this.type == at) {
       List<Decorator> decorators = parseDecorators();
       ClassExpression ce = (ClassExpression) this.parseClass(startLoc, false);
@@ -232,7 +229,7 @@ protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
       this.next();
       int innerStart = this.start;
       Position innerStartLoc = this.startLoc;
-      Expression callee = parseSubscripts(parseExprAtom(null), innerStart, innerStartLoc, true);
+      Expression callee = parseSubscripts(parseExprAtom(), innerStart, innerStartLoc, true);
       if (!(callee instanceof MemberExpression))
         this.raiseRecoverable(callee, "Binding should be performed on a member expression.");
       return this.finishNode(new BindExpression(startLoc, null, callee));
@@ -246,7 +243,7 @@ protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
       this.expect(TokenType.parenL);
       return parseDynamicImport(startLoc);
     }
-    return super.parseExprAtom(refDestructuringErrors);
+    return super.parseExprAtom();
   }
 
   @Override
@@ -373,7 +370,7 @@ private boolean functionBind() {
   protected Pair<Expression, Boolean> parseSubscript(
       Expression base, Position startLoc, boolean noCalls) {
     if (!noCalls && this.eat(doubleColon)) {
-      Expression callee = parseSubscripts(parseExprAtom(null), this.start, this.startLoc, true);
+      Expression callee = parseSubscripts(parseExprAtom(), this.start, this.startLoc, true);
       BindExpression bind = new BindExpression(new SourceLocation(startLoc), base, callee);
       return Pair.make(this.finishNode(bind), true);
     }
@@ -438,11 +435,11 @@ private MetaProperty parseImportMeta(Position loc) {
    * already been consumed.
    */
   private DynamicImport parseDynamicImport(Position startLoc) {
-    Expression source = parseMaybeAssign(false, null, null);
+    Expression source = parseMaybeAssign(false, null);
     Expression attributes = null;
     if (this.eat(TokenType.comma)) {
       if (this.type != TokenType.parenR) { // Skip if the comma was a trailing comma
-        attributes = this.parseMaybeAssign(false, null, null);
+        attributes = this.parseMaybeAssign(false, null);
         this.eat(TokenType.comma); // Allow trailing comma
       }
     }
diff --git a/javascript/extractor/src/com/semmle/jcorn/Parser.java b/javascript/extractor/src/com/semmle/jcorn/Parser.java
index b0bc89645597..c7c88fef7517 100644
--- a/javascript/extractor/src/com/semmle/jcorn/Parser.java
+++ b/javascript/extractor/src/com/semmle/jcorn/Parser.java
@@ -118,6 +118,9 @@
  * 4.0.3</a>, but does not support plugins, and always tracks full source locations.
  */
 public class Parser {
+  private static final Pattern LEGACY_MODULE_IMPORT_TAIL =
+      Pattern.compile("\\s+[A-Za-z_$][A-Za-z0-9_$]*\\s+from\\s*['\"]");
+
   protected final Options options;
   protected final Set<String> keywords;
   private final Set<String> reservedWords, reservedWordsStrict, reservedWordsStrictBind;
@@ -790,7 +793,8 @@ private Token readRegexp() {
       String validFlags = "gim";
       if (this.options.ecmaVersion() >= 6) validFlags = "gimuy";
       if (this.options.ecmaVersion() >= 9) validFlags = "gimsuy";
-      if (this.options.ecmaVersion() >= 15) validFlags = "gimsuyv";
+      if (this.options.ecmaVersion() >= 13) validFlags = "dgimsuy";
+      if (this.options.ecmaVersion() >= 15) validFlags = "dgimsuyv";
       if (!mods.matches("^[" + validFlags + "]*$"))
         this.raise(start, "Invalid regular expression flag");
       if (mods.indexOf('u') >= 0) {
@@ -1235,32 +1239,6 @@ protected void unexpected() {
     unexpected((Integer) null);
   }
 
-  public static class DestructuringErrors {
-    private int shorthandAssign, trailingComma;
-
-    public void reset() {
-      this.shorthandAssign = 0;
-      this.trailingComma = 0;
-    }
-  }
-
-  protected boolean checkPatternErrors(
-      DestructuringErrors refDestructuringErrors, boolean andThrow) {
-    int trailing = refDestructuringErrors != null ? refDestructuringErrors.trailingComma : 0;
-    if (!andThrow) return trailing != 0;
-    if (trailing != 0) this.raise(trailing, "Comma is not permitted after the rest element");
-    return false;
-  }
-
-  protected boolean checkExpressionErrors(
-      DestructuringErrors refDestructuringErrors, boolean andThrow) {
-    int pos = refDestructuringErrors != null ? refDestructuringErrors.shorthandAssign : 0;
-    if (!andThrow) return pos != 0;
-    if (pos != 0)
-      this.raise(pos, "Shorthand property assignments are valid only in destructuring patterns");
-    return false;
-  }
-
   private void checkYieldAwaitInDefaultParams() {
     if (this.yieldPos > 0 && (this.awaitPos == 0 || this.yieldPos < this.awaitPos))
       this.raise(this.yieldPos, "Yield expression cannot be a default value");
@@ -1363,20 +1341,16 @@ private void checkPropClash(Property prop, Map<String, PropInfo> propHash) {
   // and, *if* the syntactic construct they handle is present, wrap
   // the AST node that the inner parser gave them in another node.
 
-  // Parse a full expression. The optional arguments are used to
-  // forbid the `in` operator (in for loops initalization expressions)
-  // and provide reference for storing '=' operator inside shorthand
-  // property assignment in contexts where both object expression
-  // and object pattern might appear (so it's possible to raise
-  // delayed syntax error at correct position).
-  protected Expression parseExpression(boolean noIn, DestructuringErrors refDestructuringErrors) {
+  // Parse a full expression. The argument is used to forbid the `in` operator
+  // (in for loops initialization expressions).
+  protected Expression parseExpression(boolean noIn) {
     Position startLoc = this.startLoc;
-    Expression expr = this.parseMaybeAssign(noIn, refDestructuringErrors, null);
+    Expression expr = this.parseMaybeAssign(noIn, null);
     if (this.type == TokenType.comma) {
       List<Expression> expressions = CollectionUtil.makeList(expr);
       SequenceExpression node = new SequenceExpression(new SourceLocation(startLoc), expressions);
       while (this.eat(TokenType.comma))
-        expressions.add(this.parseMaybeAssign(noIn, refDestructuringErrors, null));
+        expressions.add(this.parseMaybeAssign(noIn, null));
       return this.finishNode(node);
     }
     return expr;
@@ -1388,46 +1362,32 @@ public interface AfterLeftParse {
 
   // Parse an assignment expression. This includes applications of
   // operators like `+=`.
-  protected Expression parseMaybeAssign(
-      boolean noIn, DestructuringErrors refDestructuringErrors, AfterLeftParse afterLeftParse) {
+  protected Expression parseMaybeAssign(boolean noIn, AfterLeftParse afterLeftParse) {
     if (this.inGenerator && this.isContextual("yield")) return this.parseYield();
 
-    boolean ownDestructuringErrors = false;
-    if (refDestructuringErrors == null) {
-      refDestructuringErrors = new DestructuringErrors();
-      ownDestructuringErrors = true;
-    }
     int startPos = this.start;
     Position startLoc = this.startLoc;
     if (this.type == TokenType.parenL || this.type == TokenType.name)
       this.potentialArrowAt = this.start;
-    Expression left = this.parseMaybeConditional(noIn, refDestructuringErrors);
+    Expression left = this.parseMaybeConditional(noIn);
     if (afterLeftParse != null) left = afterLeftParse.call(left, startPos, startLoc);
     if (this.type.isAssign) {
-      this.checkPatternErrors(refDestructuringErrors, true);
-      if (!ownDestructuringErrors) refDestructuringErrors.reset();
       Expression l = this.type == TokenType.eq ? (Expression) this.toAssignable(left, false) : left;
-      refDestructuringErrors.shorthandAssign =
-          0; // reset because shorthand default was used correctly
       String operator = String.valueOf(this.value);
       this.checkLVal(l, false, null);
       this.next();
-      Expression r = this.parseMaybeAssign(noIn, null, null);
+      Expression r = this.parseMaybeAssign(noIn, null);
       AssignmentExpression node =
           new AssignmentExpression(new SourceLocation(startLoc), operator, l, r);
       return this.finishNode(node);
-    } else {
-      if (ownDestructuringErrors) this.checkExpressionErrors(refDestructuringErrors, true);
     }
     return left;
   }
 
   // Parse a ternary conditional (`?:`) operator.
-  protected Expression parseMaybeConditional(
-      boolean noIn, DestructuringErrors refDestructuringErrors) {
+  protected Expression parseMaybeConditional(boolean noIn) {
     Position startLoc = this.startLoc;
-    Expression expr = this.parseExprOps(noIn, refDestructuringErrors);
-    if (this.checkExpressionErrors(refDestructuringErrors, false)) return expr;
+    Expression expr = this.parseExprOps(noIn);
     if (this.eat(TokenType.question)) {
       return parseConditionalRest(noIn, startLoc, expr);
     }
@@ -1435,20 +1395,19 @@ protected Expression parseMaybeConditional(
   }
 
   protected Expression parseConditionalRest(boolean noIn, Position start, Expression test) {
-    Expression consequent = this.parseMaybeAssign(false, null, null);
+    Expression consequent = this.parseMaybeAssign(false, null);
     this.expect(TokenType.colon);
-    Expression alternate = this.parseMaybeAssign(noIn, null, null);
+    Expression alternate = this.parseMaybeAssign(noIn, null);
     ConditionalExpression node =
         new ConditionalExpression(new SourceLocation(start), test, consequent, alternate);
     return this.finishNode(node);
   }
 
   // Start the precedence parser.
-  protected Expression parseExprOps(boolean noIn, DestructuringErrors refDestructuringErrors) {
+  protected Expression parseExprOps(boolean noIn) {
     int startPos = this.start;
     Position startLoc = this.startLoc;
-    Expression expr = this.parseMaybeUnary(refDestructuringErrors, false);
-    if (this.checkExpressionErrors(refDestructuringErrors, false)) return expr;
+    Expression expr = this.parseMaybeUnary(false);
     return this.parseExprOp(expr, startPos, startLoc, -1, noIn);
   }
 
@@ -1468,7 +1427,7 @@ protected Expression parseExprOp(
         int startPos = this.start;
         Position startLoc = this.startLoc;
         Expression right =
-            this.parseExprOp(this.parseMaybeUnary(null, false), startPos, startLoc, prec, noIn);
+            this.parseExprOp(this.parseMaybeUnary(false), startPos, startLoc, prec, noIn);
         Expression node = this.buildBinary(leftStartPos, leftStartLoc, left, right, op, logical);
         return this.parseExprOp(node, leftStartPos, leftStartLoc, minPrec, noIn);
       }
@@ -1492,8 +1451,7 @@ protected Expression buildBinary(
   }
 
   // Parse unary operators, both prefix and postfix.
-  protected Expression parseMaybeUnary(
-      DestructuringErrors refDestructuringErrors, boolean sawUnary) {
+  protected Expression parseMaybeUnary(boolean sawUnary) {
     int startPos = this.start;
     Position startLoc = this.startLoc;
     Expression expr;
@@ -1504,21 +1462,19 @@ protected Expression parseMaybeUnary(
       String operator = String.valueOf(this.value);
       boolean update = this.type == TokenType.incDec;
       this.next();
-      Expression argument = this.parseMaybeUnary(null, true);
+      Expression argument = this.parseMaybeUnary(true);
       SourceLocation loc = new SourceLocation(startLoc);
       Expression node =
           update
               ? new UpdateExpression(loc, operator, argument, true)
               : new UnaryExpression(loc, operator, argument, true);
-      this.checkExpressionErrors(refDestructuringErrors, true);
       if (update) this.checkLVal(argument, false, null);
       else if (this.strict && operator.equals("delete") && argument instanceof Identifier)
         this.raiseRecoverable(node, "Deleting local variable in strict mode");
       else sawUnary = true;
       expr = this.finishNode(node);
     } else {
-      expr = this.parseExprSubscripts(refDestructuringErrors);
-      if (this.checkExpressionErrors(refDestructuringErrors, false)) return expr;
+      expr = this.parseExprSubscripts();
       while (this.type.isPostfix && !this.canInsertSemicolon()) {
         UpdateExpression node =
             new UpdateExpression(
@@ -1531,20 +1487,19 @@ else if (this.strict && operator.equals("delete") && argument instanceof Identif
 
     if (!sawUnary && this.eat(TokenType.starstar))
       return this.buildBinary(
-          startPos, startLoc, expr, this.parseMaybeUnary(null, false), "**", false);
+          startPos, startLoc, expr, this.parseMaybeUnary(false), "**", false);
     else return expr;
   }
 
   // Parse call, dot, and `[]`-subscript expressions.
-  protected Expression parseExprSubscripts(DestructuringErrors refDestructuringErrors) {
+  protected Expression parseExprSubscripts() {
     int startPos = this.start;
     Position startLoc = this.startLoc;
-    Expression expr = this.parseExprAtom(refDestructuringErrors);
+    Expression expr = this.parseExprAtom();
     boolean skipArrowSubscripts =
         expr instanceof ArrowFunctionExpression
             && !inputSubstring(this.lastTokStart, this.lastTokEnd).equals(")");
-    if (this.checkExpressionErrors(refDestructuringErrors, false) || skipArrowSubscripts)
-      return expr;
+    if (skipArrowSubscripts) return expr;
     return this.parseSubscripts(expr, startPos, startLoc, false);
   }
 
@@ -1574,28 +1529,24 @@ protected Pair<Expression, Boolean> parseSubscript(
           new MemberExpression(
               new SourceLocation(startLoc),
               base,
-              this.parseExpression(false, null),
+              this.parseExpression(false),
               true,
               optional,
               Chainable.isOnOptionalChain(optional, base));
       this.expect(TokenType.bracketR);
       return Pair.make(this.finishNode(node), true);
     } else if (!noCalls && this.eat(TokenType.parenL)) {
-      DestructuringErrors refDestructuringErrors = new DestructuringErrors();
       int oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos;
       this.yieldPos = 0;
       this.awaitPos = 0;
       List<Expression> exprList =
-          this.parseExprList(
-              TokenType.parenR, this.options.ecmaVersion() >= 8, false, refDestructuringErrors);
+          this.parseExprList(TokenType.parenR, this.options.ecmaVersion() >= 8, false);
       if (maybeAsyncArrow && shouldParseAsyncArrow()) {
-        this.checkPatternErrors(refDestructuringErrors, true);
         this.checkYieldAwaitInDefaultParams();
         this.yieldPos = oldYieldPos;
         this.awaitPos = oldAwaitPos;
         return Pair.make(this.parseArrowExpression(startLoc, exprList, true), false);
       }
-      this.checkExpressionErrors(refDestructuringErrors, true);
       if (oldYieldPos > 0) this.yieldPos = oldYieldPos;
       if (oldAwaitPos > 0) this.awaitPos = oldAwaitPos;
       CallExpression node =
@@ -1638,7 +1589,7 @@ protected boolean shouldParseAsyncArrow() {
   // expression, an expression started by a keyword like `function` or
   // `new`, or an expression wrapped in punctuation like `()`, `[]`,
   // or `{}`.
-  protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
+  protected Expression parseExprAtom() {
     Expression node;
     boolean canBeArrow = this.potentialArrowAt == this.start;
     if (this.type == TokenType._super) {
@@ -1696,12 +1647,11 @@ protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
     } else if (this.type == TokenType.bracketL) {
       Position startLoc = this.startLoc;
       this.next();
-      List<Expression> elements =
-          this.parseExprList(TokenType.bracketR, true, true, refDestructuringErrors);
+      List<Expression> elements = this.parseExprList(TokenType.bracketR, true, true);
       node = new ArrayExpression(new SourceLocation(startLoc), elements);
       return this.finishNode(node);
     } else if (this.type == TokenType.braceL) {
-      return this.parseObj(false, refDestructuringErrors);
+      return this.parseObj(false);
     } else if (this.type == TokenType._function) {
       Position startLoc = this.startLoc;
       this.next();
@@ -1730,7 +1680,7 @@ protected Literal parseLiteral(TokenType tokenType, Object value) {
 
   protected Expression parseParenExpression() {
     this.expect(TokenType.parenL);
-    Expression val = this.parseExpression(false, null);
+    Expression val = this.parseExpression(false);
     this.expect(TokenType.parenR);
     return val;
   }
@@ -1741,12 +1691,10 @@ protected Expression parseParenAndDistinguishExpression(boolean canBeArrow) {
     if (this.options.ecmaVersion() >= 6) {
       this.next();
 
-      DestructuringErrors refDestructuringErrors = new DestructuringErrors();
       int oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos;
-      ParenthesisedExpressions parenExprs = parseParenthesisedExpressions(refDestructuringErrors);
+      ParenthesisedExpressions parenExprs = parseParenthesisedExpressions();
 
       if (canBeArrow && !this.canInsertSemicolon() && this.eat(TokenType.arrow)) {
-        this.checkPatternErrors(refDestructuringErrors, true);
         this.checkYieldAwaitInDefaultParams();
         if (parenExprs.innerParenStart != 0) this.unexpected(parenExprs.innerParenStart);
         this.yieldPos = oldYieldPos;
@@ -1757,7 +1705,6 @@ protected Expression parseParenAndDistinguishExpression(boolean canBeArrow) {
       if (parenExprs.exprList.isEmpty() || parenExprs.lastIsComma)
         this.unexpected(this.lastTokStart);
       if (parenExprs.spreadStart != 0) this.unexpected(parenExprs.spreadStart);
-      this.checkExpressionErrors(refDestructuringErrors, true);
       if (oldYieldPos > 0) this.yieldPos = oldYieldPos;
       if (oldAwaitPos > 0) this.awaitPos = oldAwaitPos;
 
@@ -1799,8 +1746,7 @@ protected static class ParenthesisedExpressions {
     boolean lastIsComma;
   }
 
-  protected ParenthesisedExpressions parseParenthesisedExpressions(
-      DestructuringErrors refDestructuringErrors) {
+  protected ParenthesisedExpressions parseParenthesisedExpressions() {
     boolean allowTrailingComma = this.options.ecmaVersion() >= 8;
     ParenthesisedExpressions parenExprs = new ParenthesisedExpressions();
     parenExprs.startLoc = this.startLoc;
@@ -1810,8 +1756,7 @@ protected ParenthesisedExpressions parseParenthesisedExpressions(
     while (this.type != TokenType.parenR) {
       if (first) first = false;
       else this.expect(TokenType.comma);
-      if (!parseParenthesisedExpression(
-          refDestructuringErrors, allowTrailingComma, parenExprs, first)) break;
+      if (!parseParenthesisedExpression(allowTrailingComma, parenExprs, first)) break;
     }
     parenExprs.endLoc = this.startLoc;
     this.expect(TokenType.parenR);
@@ -1825,7 +1770,6 @@ protected ParenthesisedExpressions parseParenthesisedExpressions(
    * @return true if more expressions may follow this one, false if it must be the last one
    */
   protected boolean parseParenthesisedExpression(
-      DestructuringErrors refDestructuringErrors,
       boolean allowTrailingComma,
       ParenthesisedExpressions parenExprs,
       boolean first) {
@@ -1834,16 +1778,15 @@ protected boolean parseParenthesisedExpression(
       return false;
     } else if (this.type == TokenType.ellipsis) {
       parenExprs.spreadStart = this.start;
-      parenExprs.exprList.add(this.parseParenItem(this.parseRest(false), -1, null));
-      if (this.type == TokenType.comma)
-        this.raise(this.startLoc, "Comma is not permitted after the rest element");
+      parenExprs.exprList.add(this.parseParenItem(this.parseRest(), -1, null));
+      this.eat(TokenType.comma);
       return false;
     } else {
       if (this.type == TokenType.parenL && parenExprs.innerParenStart == 0) {
         parenExprs.innerParenStart = this.start;
       }
       parenExprs.exprList.add(
-          this.parseMaybeAssign(false, refDestructuringErrors, this::parseParenItem));
+          this.parseMaybeAssign(false, this::parseParenItem));
     }
     return true;
   }
@@ -1875,7 +1818,7 @@ protected Expression parseNew() {
     int innerStartPos = this.start;
     Position innerStartLoc = this.startLoc;
     Expression callee =
-        this.parseSubscripts(this.parseExprAtom(null), innerStartPos, innerStartLoc, true);
+        this.parseSubscripts(this.parseExprAtom(), innerStartPos, innerStartLoc, true);
 
     if (Chainable.isOnOptionalChain(false, callee))
       this.raise(callee, "An optional chain may not be used in a `new` expression.");
@@ -1887,7 +1830,7 @@ protected Expression parseNewArguments(Position startLoc, Expression callee) {
     List<Expression> arguments;
     if (this.eat(TokenType.parenL))
       arguments =
-          this.parseExprList(TokenType.parenR, this.options.ecmaVersion() >= 8, false, null);
+          this.parseExprList(TokenType.parenR, this.options.ecmaVersion() >= 8, false);
     else arguments = new ArrayList<Expression>();
     NewExpression node =
         new NewExpression(new SourceLocation(startLoc), callee, new ArrayList<>(), arguments);
@@ -1922,7 +1865,7 @@ protected TemplateLiteral parseTemplate(boolean isTagged) {
     List<TemplateElement> quasis = CollectionUtil.makeList(curElt);
     while (!curElt.isTail()) {
       this.expect(TokenType.dollarBraceL);
-      expressions.add(this.parseExpression(false, null));
+      expressions.add(this.parseExpression(false));
       this.expect(TokenType.braceR);
       quasis.add(curElt = this.parseTemplateElement(isTagged));
     }
@@ -1954,7 +1897,7 @@ MethodDefinition.Kind getMethodKind() {
   }
 
   // Parse an object literal or binding pattern.
-  protected Expression parseObj(boolean isPattern, DestructuringErrors refDestructuringErrors) {
+  protected Expression parseObj(boolean isPattern) {
     Position startLoc = this.startLoc;
     if (!isPattern && options.allowGeneratedCodeExprs() && charAt(pos) == '{') {
       // Parse mustache-style placeholder expression: {{ ... }} or {{{ ... }}}
@@ -1974,7 +1917,7 @@ protected Expression parseObj(boolean isPattern, DestructuringErrors refDestruct
         first = false;
       }
 
-      properties.add(this.finishNode(parseProperty(isPattern, refDestructuringErrors, propHash)));
+      properties.add(this.finishNode(parseProperty(isPattern, propHash)));
     }
     SourceLocation loc = new SourceLocation(startLoc);
     Expression node =
@@ -2018,10 +1961,7 @@ protected Expression parseGeneratedCodeExpr(Position startLoc, String openingDel
         bodyToken.getValue()));
   }
 
-  protected Property parseProperty(
-      boolean isPattern,
-      DestructuringErrors refDestructuringErrors,
-      Map<String, PropInfo> propHash) {
+  protected Property parseProperty(boolean isPattern, Map<String, PropInfo> propHash) {
     Position propStartLoc = this.startLoc;
     boolean isGenerator = false;
     if (this.options.ecmaVersion() >= 6) {
@@ -2036,7 +1976,7 @@ protected Property parseProperty(
     } else {
       pi.isAsync = false;
     }
-    this.parsePropertyValue(pi, refDestructuringErrors);
+    this.parsePropertyValue(pi);
     Property prop =
         new Property(
             new SourceLocation(pi.startLoc), pi.key, pi.value, pi.kind, pi.computed, pi.method);
@@ -2057,14 +1997,14 @@ private boolean isAsyncProp(PropertyInfo pi) {
         && !this.canInsertSemicolon();
   }
 
-  protected void parsePropertyValue(PropertyInfo pi, DestructuringErrors refDestructuringErrors) {
+  protected void parsePropertyValue(PropertyInfo pi) {
     if ((pi.isGenerator || pi.isAsync) && this.type == TokenType.colon) this.unexpected();
 
     if (this.eat(TokenType.colon)) {
       pi.value =
           pi.isPattern
               ? this.parseMaybeDefault(this.startLoc, null)
-              : this.parseMaybeAssign(false, refDestructuringErrors, null);
+              : this.parseMaybeAssign(false, null);
       pi.kind = "init";
     } else if (this.options.ecmaVersion() >= 6 && this.type == TokenType.parenL) {
       if (pi.isPattern) this.unexpected();
@@ -2077,7 +2017,9 @@ protected void parsePropertyValue(PropertyInfo pi, DestructuringErrors refDestru
         && pi.key instanceof Identifier
         && (((Identifier) pi.key).getName().equals("get")
             || ((Identifier) pi.key).getName().equals("set"))
-        && (this.type != TokenType.comma && this.type != TokenType.braceR)) {
+        && (this.type != TokenType.comma
+            && this.type != TokenType.braceR
+            && this.type != TokenType.eq)) {
       if (pi.isGenerator || pi.isAsync || pi.isPattern) this.unexpected();
       pi.kind = ((Identifier) pi.key).getName();
       PropertyInfo pi2 = new PropertyInfo(false, false, this.startLoc);
@@ -2104,9 +2046,7 @@ protected void parsePropertyValue(PropertyInfo pi, DestructuringErrors refDestru
       pi.kind = "init";
       if (pi.isPattern) {
         pi.value = this.parseMaybeDefault(pi.startLoc, pi.key);
-      } else if (this.type == TokenType.eq && refDestructuringErrors != null) {
-        if (refDestructuringErrors.shorthandAssign == 0)
-          refDestructuringErrors.shorthandAssign = this.start;
+      } else if (this.type == TokenType.eq) {
         pi.value = this.parseMaybeDefault(pi.startLoc, pi.key);
       } else {
         pi.value = pi.key;
@@ -2119,14 +2059,14 @@ protected void parsePropertyValue(PropertyInfo pi, DestructuringErrors refDestru
   protected void parsePropertyName(PropertyInfo result) {
     if (this.options.ecmaVersion() >= 6) {
       if (this.eat(TokenType.bracketL)) {
-        result.key = this.parseMaybeAssign(false, null, null);
+        result.key = this.parseMaybeAssign(false, null);
         result.computed = true;
         this.expect(TokenType.bracketR);
         return;
       }
     }
     if (this.type == TokenType.num || this.type == TokenType.string)
-      result.key = this.parseExprAtom(null);
+      result.key = this.parseExprAtom();
     else result.key = this.parseIdent(true);
   }
 
@@ -2143,7 +2083,7 @@ protected FunctionExpression parseMethod(boolean isGenerator, boolean isAsync) {
 
     this.expect(TokenType.parenL);
     List<Expression> params =
-        this.parseBindingList(TokenType.parenR, false, this.options.ecmaVersion() >= 8, false);
+        this.parseBindingList(TokenType.parenR, false, this.options.ecmaVersion() >= 8);
     this.checkYieldAwaitInDefaultParams();
     boolean generator = this.options.ecmaVersion() >= 6 && isGenerator;
     Node body = this.parseFunctionBody(null, params, false);
@@ -2187,7 +2127,7 @@ protected Node parseFunctionBody(
     boolean isExpression = isArrowFunction && this.type != TokenType.braceL;
     Node body;
     if (isExpression) {
-      body = this.parseMaybeAssign(false, null, null);
+      body = this.parseMaybeAssign(false, null);
     } else {
       // Start a new scope with regard to labels and the `inFunction`
       // flag (restore them to their old value afterwards).
@@ -2243,10 +2183,7 @@ protected void checkParams(List<? extends INode> params) {
   // nothing in between them to be parsed as `null` (which is needed
   // for array literals).
   protected List<Expression> parseExprList(
-      TokenType close,
-      boolean allowTrailingComma,
-      boolean allowEmpty,
-      DestructuringErrors refDestructuringErrors) {
+      TokenType close, boolean allowTrailingComma, boolean allowEmpty) {
     List<Expression> elts = new ArrayList<Expression>();
     boolean first = true;
     while (!this.eat(close)) {
@@ -2261,14 +2198,9 @@ protected List<Expression> parseExprList(
       if (allowEmpty && this.type == TokenType.comma) {
         elt = null;
       } else if (this.type == TokenType.ellipsis) {
-        elt = this.processExprListItem(this.parseSpread(refDestructuringErrors));
-        if (this.type == TokenType.comma
-            && refDestructuringErrors != null
-            && refDestructuringErrors.trailingComma == 0) {
-          refDestructuringErrors.trailingComma = this.start;
-        }
+        elt = this.processExprListItem(this.parseSpread());
       } else
-        elt = this.processExprListItem(this.parseMaybeAssign(false, refDestructuringErrors, null));
+        elt = this.processExprListItem(this.parseMaybeAssign(false, null));
       elts.add(elt);
     }
     return elts;
@@ -2292,9 +2224,9 @@ protected Identifier parseIdent(boolean liberal) {
           && (this.options.ecmaVersion() >= 6
               || inputSubstring(this.start, this.end).indexOf("\\") == -1))
         this.raiseRecoverable(this.start, "The keyword '" + this.value + "' is reserved");
-      if (!isPrivateField && this.inGenerator && this.value.equals("yield"))
+      if (!liberal && !isPrivateField && this.inGenerator && this.value.equals("yield"))
         this.raiseRecoverable(this.start, "Can not use 'yield' as identifier inside a generator");
-      if (!isPrivateField && this.inAsync && this.value.equals("await"))
+      if (!liberal && !isPrivateField && this.inAsync && this.value.equals("await"))
         this.raiseRecoverable(
             this.start, "Can not use 'await' as identifier inside an async function");
       name = String.valueOf(this.value);
@@ -2331,7 +2263,7 @@ protected YieldExpression parseYield() {
       argument = null;
     } else {
       delegate = this.eat(TokenType.star);
-      argument = this.parseMaybeAssign(false, null, null);
+      argument = this.parseMaybeAssign(false, null);
     }
     YieldExpression node = new YieldExpression(new SourceLocation(startLoc), argument, delegate);
     return this.finishNode(node);
@@ -2340,7 +2272,7 @@ protected YieldExpression parseYield() {
   protected AwaitExpression parseAwait() {
     Position startLoc = this.startLoc;
     this.next();
-    Expression argument = this.parseMaybeUnary(null, true);
+    Expression argument = this.parseMaybeUnary(true);
     AwaitExpression node = new AwaitExpression(new SourceLocation(startLoc), argument);
     return this.finishNode(node);
   }
@@ -2429,17 +2361,11 @@ protected List<Expression> toAssignableList(List<Expression> exprList, boolean i
       } else if (last != null && last instanceof SpreadElement) {
         Expression arg = ((SpreadElement) last).getArgument();
         arg = (Expression) this.toAssignable(arg, isBinding);
-        if (!(arg instanceof Identifier
-            || arg instanceof MemberExpression
-            || arg instanceof ArrayPattern)) this.unexpected(arg.getLoc().getStart());
+        if (!(arg instanceof IPattern || arg instanceof MemberExpression))
+          this.unexpected(arg.getLoc().getStart());
         exprList.set(end - 1, last = new RestElement(last.getLoc(), arg));
         --end;
       }
-
-      if (isBinding
-          && last instanceof RestElement
-          && !(((RestElement) last).getArgument() instanceof Identifier))
-        this.unexpected(((RestElement) last).getArgument().getLoc().getStart());
     }
     for (int i = 0; i < end; ++i)
       exprList.set(i, (Expression) this.toAssignable(exprList.get(i), isBinding));
@@ -2447,27 +2373,18 @@ protected List<Expression> toAssignableList(List<Expression> exprList, boolean i
   }
 
   // Parses spread element.
-  protected SpreadElement parseSpread(DestructuringErrors refDestructuringErrors) {
+  protected SpreadElement parseSpread() {
     Position start = this.startLoc;
     this.next();
     SpreadElement node =
-        new SpreadElement(
-            new SourceLocation(start), this.parseMaybeAssign(false, refDestructuringErrors, null));
+        new SpreadElement(new SourceLocation(start), this.parseMaybeAssign(false, null));
     return this.finishNode(node);
   }
 
-  protected RestElement parseRest(boolean allowNonIdent) {
+  protected RestElement parseRest() {
     Position start = this.startLoc;
     this.next();
-
-    // RestElement inside of a function parameter must be an identifier
-    Expression argument = null;
-    if (allowNonIdent)
-      if (this.type == TokenType.name) argument = this.parseIdent(false);
-      else this.unexpected();
-    else if (this.type == TokenType.name || this.type == TokenType.bracketL)
-      argument = this.parseBindingAtom();
-    else this.unexpected();
+    Expression argument = this.parseBindingAtom();
     RestElement node = new RestElement(new SourceLocation(start), argument);
     return this.finishNode(node);
   }
@@ -2479,18 +2396,18 @@ protected Expression parseBindingAtom() {
     if (this.type == TokenType.bracketL) {
       Position start = this.startLoc;
       this.next();
-      List<Expression> elements = this.parseBindingList(TokenType.bracketR, true, true, false);
+      List<Expression> elements = this.parseBindingList(TokenType.bracketR, true, true);
       ArrayPattern node = new ArrayPattern(new SourceLocation(start), elements);
       return this.finishNode(node);
     }
 
-    if (this.type == TokenType.braceL) return this.parseObj(true, null);
+    if (this.type == TokenType.braceL) return this.parseObj(true);
 
     return this.parseIdent(false);
   }
 
   protected List<Expression> parseBindingList(
-      TokenType close, boolean allowEmpty, boolean allowTrailingComma, boolean allowNonIdent) {
+      TokenType close, boolean allowEmpty, boolean allowTrailingComma) {
     List<Expression> result = new ArrayList<Expression>();
     boolean first = true;
     while (!this.eat(close)) {
@@ -2501,9 +2418,8 @@ protected List<Expression> parseBindingList(
       } else if (allowTrailingComma && this.afterTrailingComma(close, false)) {
         break;
       } else if (this.type == TokenType.ellipsis) {
-        result.add(this.processBindingListItem(this.parseRest(allowNonIdent)));
-        if (this.type == TokenType.comma)
-          this.raise(this.start, "Comma is not permitted after the rest element");
+        result.add(this.processBindingListItem(this.parseRest()));
+        this.eat(TokenType.comma);
         this.expect(close);
         break;
       } else {
@@ -2523,7 +2439,7 @@ protected Expression parseMaybeDefault(Position startLoc, Expression left) {
     if (this.options.ecmaVersion() < 6 || !this.eat(TokenType.eq)) return left;
     AssignmentPattern node =
         new AssignmentPattern(
-            new SourceLocation(startLoc), "=", left, this.parseMaybeAssign(false, null, null));
+            new SourceLocation(startLoc), "=", left, this.parseMaybeAssign(false, null));
     return this.finishNode(node);
   }
 
@@ -2717,6 +2633,18 @@ boolean isUsingDecl() {
         && Identifiers.isIdentifierChar(this.input.codePointAt(next), false);
   }
 
+  /**
+   * Checks for the abandoned ES6 draft namespace-import syntax:
+   * {@code module namespace from "module-name";}.
+   */
+  boolean isLegacyModuleImport() {
+    if (this.type != TokenType.name || !this.value.equals("module")) return false;
+
+    Matcher matcher = LEGACY_MODULE_IMPORT_TAIL.matcher(this.input);
+    matcher.region(this.pos, this.input.length());
+    return matcher.lookingAt();
+  }
+
   /**
    * Parse a single statement.
    *
@@ -2779,6 +2707,10 @@ protected Statement parseStatement(boolean declaration, boolean topLevel, Set<St
       return this.parseBlock(false);
     } else if (starttype == TokenType.semi) {
       return this.parseEmptyStatement(startLoc);
+    } else if (topLevel && this.isLegacyModuleImport()) {
+      if (!this.options.allowImportExportEverywhere() && !this.inModule)
+        this.raise(this.start, "Legacy module imports may appear only with 'sourceType: module'");
+      return this.parseLegacyModuleImport(startLoc);
     } else if (starttype == TokenType._export || starttype == TokenType._import) {
       if (!this.options.allowImportExportEverywhere()) {
         if (!topLevel)
@@ -2806,7 +2738,7 @@ protected Statement parseStatement(boolean declaration, boolean topLevel, Set<St
       // next token is a colon and the expression was a simple
       // Identifier node, we switch to interpreting it as a label.
       String maybeName = String.valueOf(this.value);
-      Expression expr = this.parseExpression(false, null);
+      Expression expr = this.parseExpression(false);
       if (starttype == TokenType.name && expr instanceof Identifier && this.eat(TokenType.colon))
         return this.parseLabeledStatement(startLoc, maybeName, (Identifier) expr);
       else return this.parseExpressionStatement(declaration, startLoc, expr);
@@ -2889,16 +2821,12 @@ protected Statement parseForStatement(Position startLoc) {
         return this.parseForIn(startLoc, init);
       return this.parseFor(startLoc, init);
     }
-    DestructuringErrors refDestructuringErrors = new DestructuringErrors();
-    Expression init = this.parseExpression(true, refDestructuringErrors);
+    Expression init = this.parseExpression(true);
     if (this.type == TokenType._in
         || (this.options.ecmaVersion() >= 6 && this.isContextual("of"))) {
-      this.checkPatternErrors(refDestructuringErrors, true);
       init = (Expression) this.toAssignable(init, false);
       this.checkLVal(init, false, null);
       return this.parseForIn(startLoc, init);
-    } else {
-      this.checkExpressionErrors(refDestructuringErrors, true);
     }
     return this.parseFor(startLoc, init);
   }
@@ -2952,7 +2880,7 @@ protected ReturnStatement parseReturnStatement(Position startLoc) {
     if (this.eagerlyTrySemicolon()) {
       argument = null;
     } else {
-      argument = this.parseExpression(false, null);
+      argument = this.parseExpression(false);
       this.semicolon();
     }
     return this.finishNode(new ReturnStatement(new SourceLocation(startLoc), argument));
@@ -2985,7 +2913,7 @@ protected SwitchStatement parseSwitchStatement(Position startLoc) {
         curConsequent = new ArrayList<Statement>();
         this.next();
         if (isCase) {
-          curTest = this.parseExpression(false, null);
+          curTest = this.parseExpression(false);
         } else {
           if (sawDefault) this.raiseRecoverable(this.lastTokStart, "Multiple default clauses");
           sawDefault = true;
@@ -3011,7 +2939,7 @@ protected ThrowStatement parseThrowStatement(Position startLoc) {
     this.next();
     if (inputSubstring(this.lastTokEnd, this.start).matches("(?s).*(?:" + lineBreak + ").*"))
       this.raise(this.lastTokEnd, "Illegal newline after throw");
-    Expression argument = this.parseExpression(false, null);
+    Expression argument = this.parseExpression(false);
     this.semicolon();
     return this.finishNode(new ThrowStatement(new SourceLocation(startLoc), argument));
   }
@@ -3124,9 +3052,9 @@ protected BlockStatement parseBlock(boolean allowStrict) {
   // expression.
   protected ForStatement parseFor(Position startLoc, Node init) {
     this.expect(TokenType.semi);
-    Expression test = this.type == TokenType.semi ? null : this.parseExpression(false, null);
+    Expression test = this.type == TokenType.semi ? null : this.parseExpression(false);
     this.expect(TokenType.semi);
-    Expression update = this.type == TokenType.parenR ? null : this.parseExpression(false, null);
+    Expression update = this.type == TokenType.parenR ? null : this.parseExpression(false);
     this.expect(TokenType.parenR);
     Statement body = this.parseStatement(false, false);
     this.labels.pop();
@@ -3140,7 +3068,7 @@ protected Statement parseForIn(Position startLoc, Node left) {
     SourceLocation loc = new SourceLocation(startLoc);
     boolean isForIn = this.type == TokenType._in;
     this.next();
-    Expression right = this.parseExpression(false, null);
+    Expression right = this.parseExpression(false);
     this.expect(TokenType.parenR);
     Statement body = this.parseStatement(false, false);
     this.labels.pop();
@@ -3158,7 +3086,7 @@ protected VariableDeclaration parseVar(Position startLoc, boolean isFor, String
       Expression id = this.parseVarId();
       Expression init = null;
       if (this.eat(TokenType.eq)) {
-        init = this.parseMaybeAssign(isFor, null, null);
+        init = this.parseMaybeAssign(isFor, null);
       } else if ((kind.equals("const") || kind.equals("using"))
           && !(this.type == TokenType._in
               || (this.options.ecmaVersion() >= 6 && this.isContextual("of")))) {
@@ -3260,7 +3188,7 @@ protected IFunction parseFunctionRest(
   protected List<Expression> parseFunctionParams() {
     this.expect(TokenType.parenL);
     List<Expression> params =
-        this.parseBindingList(TokenType.parenR, false, this.options.ecmaVersion() >= 8, true);
+        this.parseBindingList(TokenType.parenR, false, this.options.ecmaVersion() >= 8);
     this.checkYieldAwaitInDefaultParams();
     return params;
   }
@@ -3395,7 +3323,7 @@ protected Identifier parseClassId(boolean isStatement) {
   }
 
   protected Expression parseClassSuper() {
-    return this.eat(TokenType._extends) ? this.parseExprSubscripts(null) : null;
+    return this.eat(TokenType._extends) ? this.parseExprSubscripts() : null;
   }
 
   // Parses module export declaration.
@@ -3442,7 +3370,7 @@ protected ExportDeclaration parseExportRest(SourceLocation loc, Set<String> expo
               new ClassDeclaration(ce.getLoc(), ce.getClassDef(), noDeclareKeyword, notAbstract);
         else declaration = ce;
       } else {
-        declaration = this.parseMaybeAssign(false, null, null);
+        declaration = this.parseMaybeAssign(false, null);
         this.semicolon();
       }
       return this.finishNode(new ExportDefaultDeclaration(loc, declaration));
@@ -3477,7 +3405,7 @@ protected ExportDeclaration parseExportRest(SourceLocation loc, Set<String> expo
   protected Expression parseExportFrom(
       List<ExportSpecifier> specifiers, Expression source, boolean expectFrom) {
     if (this.eatContextual("from")) {
-      if (this.type == TokenType.string) source = this.parseExprAtom(null);
+      if (this.type == TokenType.string) source = this.parseExprAtom();
       else this.unexpected();
     } else {
       if (expectFrom) this.unexpected();
@@ -3556,7 +3484,7 @@ protected List<ExportSpecifier> parseExportSpecifiers(Set<String> exports) {
       } else {
         if (this.type == TokenType.string) {
           // e.g. `export { Foo_new as "Foo::new" }`
-          Expression string = this.parseExprAtom(null);
+          Expression string = this.parseExprAtom();
           String str = ((Literal)string).getStringValue();
           exported = this.finishNode(new Identifier(loc, str));
         } else {
@@ -3576,13 +3504,36 @@ protected Statement parseImport(Position startLoc) {
     return parseImportRest(loc);
   }
 
+  /**
+   * Parses {@code module namespace from "module-name";} as the equivalent namespace import
+   * {@code import * as namespace from "module-name";}.
+   */
+  protected ImportDeclaration parseLegacyModuleImport(Position startLoc) {
+    SourceLocation loc = new SourceLocation(startLoc);
+    this.next();
+
+    SourceLocation specifierLoc = new SourceLocation(this.startLoc);
+    Identifier local = this.parseIdent(false);
+    this.checkLVal(local, true, null);
+    this.expectContextual("from");
+    if (this.type != TokenType.string) this.unexpected();
+    Literal source = (Literal) this.parseExprAtom();
+    this.semicolon();
+
+    List<ImportSpecifier> specifiers = new ArrayList<ImportSpecifier>();
+    specifiers.add(this.finishNode(new ImportNamespaceSpecifier(specifierLoc, local)));
+    return this.finishNode(
+        new ImportDeclaration(
+            loc, specifiers, source, null, ImportPhaseModifier.NONE));
+  }
+
   protected Expression parseImportOrExportAttributesAndSemicolon() {
     Expression result = null;
     if (!this.eagerlyTrySemicolon()) {
       if (!this.eatContextual("assert")) {
         this.expect(TokenType._with);
       }
-      result = this.parseObj(false, null);
+      result = this.parseObj(false);
       this.semicolon();
     }
     return result;
@@ -3595,12 +3546,12 @@ protected ImportDeclaration parseImportRest(SourceLocation loc) {
     // import '...'
     if (this.type == TokenType.string) {
       specifiers = new ArrayList<ImportSpecifier>();
-      source = (Literal) this.parseExprAtom(null);
+      source = (Literal) this.parseExprAtom();
     } else {
       specifiers = this.parseImportSpecifiers(phaseModifier);
       this.expectContextual("from");
       if (this.type != TokenType.string) this.unexpected();
-      source = (Literal) this.parseExprAtom(null);
+      source = (Literal) this.parseExprAtom();
     }
     Expression attributes = this.parseImportOrExportAttributesAndSemicolon();
     if (specifiers == null) return null;
@@ -3655,7 +3606,7 @@ protected ImportSpecifier parseImportSpecifier() {
     if (this.type == TokenType.string) {
       // Arbitrary Module Namespace Identifiers
       // e.g. `import { "Foo::new" as Foo_new } from "./foo.wasm"`
-      Expression string = this.parseExprAtom(null);
+      Expression string = this.parseExprAtom();
       String str = ((Literal)string).getStringValue();
       imported = this.finishNode(new Identifier(loc, str));
       // only makes sense if there is a local identifier
diff --git a/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java b/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java
index 7475994c27ed..ec7d4c74e4ad 100644
--- a/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java
+++ b/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java
@@ -237,7 +237,7 @@ private void flowParseDeclareModule(Position start) {
     this.next();
 
     if (this.type == TokenType.string) {
-      this.parseExprAtom(null);
+      this.parseExprAtom();
     } else {
       this.parseIdent(false);
     }
@@ -458,7 +458,7 @@ private void flowParseTypeParameterInstantiation() {
 
   private void flowParseObjectPropertyKey() {
     if (this.type == TokenType.num || this.type == TokenType.string) {
-      this.parseExprAtom(null);
+      this.parseExprAtom();
     } else if ("@@iterator".equals(inputSubstring(start, start + 10))) {
       // allow `@@iterator` as property name; this doesn't appear to be standard Flow syntax,
       // but is used a few times in react-native
@@ -1158,9 +1158,8 @@ protected Expression parseConditionalRest(boolean noIn, Position start, Expressi
   }
 
   @Override
-  protected ParenthesisedExpressions parseParenthesisedExpressions(
-      DestructuringErrors refDestructuringErrors) {
-    ParenthesisedExpressions pe = super.parseParenthesisedExpressions(refDestructuringErrors);
+  protected ParenthesisedExpressions parseParenthesisedExpressions() {
+    ParenthesisedExpressions pe = super.parseParenthesisedExpressions();
 
     // handle return types for arrow functions
     if (flow() && this.type == TokenType.colon) {
@@ -1218,14 +1217,14 @@ protected FieldDefinition parseFieldDefinition(PropertyInfo pi, boolean isStatic
 
   // parse type parameters for object method shorthand
   @Override
-  protected void parsePropertyValue(PropertyInfo pi, DestructuringErrors refDestructuringErrors) {
+  protected void parsePropertyValue(PropertyInfo pi) {
     // method shorthand
     if (flow() && this.isRelational("<")) {
       this.flowParseTypeParameterDeclaration();
       if (this.type != TokenType.parenL) this.unexpected();
     }
 
-    super.parsePropertyValue(pi, refDestructuringErrors);
+    super.parsePropertyValue(pi);
   }
 
   @Override
diff --git a/javascript/extractor/src/com/semmle/jcorn/jsx/JSXParser.java b/javascript/extractor/src/com/semmle/jcorn/jsx/JSXParser.java
index 6deec72809c3..cabdb9c1e4fd 100644
--- a/javascript/extractor/src/com/semmle/jcorn/jsx/JSXParser.java
+++ b/javascript/extractor/src/com/semmle/jcorn/jsx/JSXParser.java
@@ -276,7 +276,7 @@ private INode jsx_parseAttributeValue() {
         this.raise(node, "JSX attributes must only be assigned a non-empty expression");
       return node;
     } else if (type == jsxTagStart || type == string) {
-      return this.parseExprAtom(null);
+      return this.parseExprAtom();
     } else {
       this.raise(this.start, "JSX value should be either an expression or a quoted JSX text");
       return null;
@@ -298,7 +298,7 @@ private JSXExpressionContainer jsx_parseExpressionContainer() {
     this.next();
     INode expression;
     if (this.type == braceR) expression = this.jsx_parseEmptyExpression();
-    else expression = this.parseExpression(false, null);
+    else expression = this.parseExpression(false);
     this.expect(braceR);
     return this.finishNode(new JSXExpressionContainer(loc, expression));
   }
@@ -308,7 +308,7 @@ private IJSXAttribute jsx_parseAttribute() {
     SourceLocation loc = new SourceLocation(this.startLoc);
     if (this.eat(braceL)) {
       this.expect(ellipsis);
-      Expression argument = this.parseMaybeAssign(false, null, null);
+      Expression argument = this.parseMaybeAssign(false, null);
       this.expect(braceR);
       return this.finishNode(new JSXSpreadAttribute(loc, argument));
     }
@@ -358,7 +358,7 @@ private JSXElement jsx_parseElementAt(Position startLoc) {
           }
           children.add(this.jsx_parseElementAt(startLoc));
         } else if (type == jsxText) {
-          children.add(this.parseExprAtom(null));
+          children.add(this.parseExprAtom());
         } else if (type == braceL) {
           children.add(this.jsx_parseExpressionContainer());
         } else {
@@ -389,13 +389,13 @@ private JSXElement jsx_parseElement() {
   }
 
   @Override
-  protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
+  protected Expression parseExprAtom() {
     if (this.type == jsxText) {
       return this.parseLiteral(this.type, this.value);
     } else if (this.type == jsxTagStart) {
       return this.jsx_parseElement();
     } else {
-      return super.parseExprAtom(refDestructuringErrors);
+      return super.parseExprAtom();
     }
   }
 
diff --git a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
index d88897819211..b6cdfa44a7db 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
@@ -404,6 +404,9 @@ private void setupFilters() {
     patterns.add("**/*tsconfig*.json");
     patterns.add("**/codeql-javascript-*.json");
 
+    // exclude lock files that are not explicitly included via `LGTM_INDEX_FILTERS`
+    patterns.add("-**/*.lock");
+
     // include any explicitly specified extensions
     for (String extension : fileTypes.keySet()) patterns.add("**/*" + extension);
 
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ExtractorConfig.java b/javascript/extractor/src/com/semmle/js/extractor/ExtractorConfig.java
index 538ac1a43679..69823f85af6f 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/ExtractorConfig.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/ExtractorConfig.java
@@ -224,7 +224,7 @@ public Set<String> getPredefinedGlobals() {
   /** Should textual information be extracted into the lines/4 relation? */
   private boolean extractLines;
 
-  /** Override amount of RAM to allocate to the TypeScript compiler. */
+  /** Override the amount of RAM for the Node.js process.  */
   private int typescriptRam;
 
   /** The default character encoding to use for parsing source files. */
diff --git a/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java
index 70d6677855d5..5247b2e506ef 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java
@@ -321,7 +321,7 @@ public boolean isTrapCachingAllowed() {
       }
     },
 
-    YAML(".raml", ".yaml", ".yml") {
+    YAML(".lock", ".raml", ".yaml", ".yml") {
       @Override
       public IExtractor mkExtractor(ExtractorConfig config, ExtractorState state) {
         return new YAMLExtractor(config);
diff --git a/javascript/extractor/src/com/semmle/js/extractor/Main.java b/javascript/extractor/src/com/semmle/js/extractor/Main.java
index 03ef253f357e..62a061a52158 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/Main.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/Main.java
@@ -376,7 +376,7 @@ private ArgsParser addArgs(ArgsParser argsParser) {
     argsParser.addFlag(
         P_TYPESCRIPT_RAM,
         1,
-        "Amount of memory allocated to the TypeScript compiler process. The default is 1G.");
+        "Amount of memory assigned to the Node.js process's V8 old-space limit. The default is 1G.");
     argsParser.addToleratedFlag(P_DEBUG_EXCLUSIONS, 0);
     argsParser.addTrailingParam("files", "Files and directories to extract.");
     return argsParser;
diff --git a/javascript/extractor/src/com/semmle/ts/extractor/TypeScriptParser.java b/javascript/extractor/src/com/semmle/ts/extractor/TypeScriptParser.java
index 09f05b2d9e0b..b54ee7f32332 100644
--- a/javascript/extractor/src/com/semmle/ts/extractor/TypeScriptParser.java
+++ b/javascript/extractor/src/com/semmle/ts/extractor/TypeScriptParser.java
@@ -101,19 +101,16 @@ public class TypeScriptParser {
    * set to indicate the maximum heap space usable by the Node.js process, in addition to its
    * "reserve memory".
    *
-   * <p>Defaults to 1.0 GB (for a total heap space of 1.4 GB by default).
+   * <p>Defaults to 2000 MB (for a total heap space of 2400 MB by default).
    */
   public static final String TYPESCRIPT_RAM_SUFFIX = "TYPESCRIPT_RAM";
 
   /**
    * An environment variable (without the <code>SEMMLE_</code> or <code>LGTM_</code> prefix), that can be
-   * set to indicate the amount of heap space the Node.js process should reserve for extracting
-   * individual files.
+   * set to indicate the additional heap space added to <code>TYPESCRIPT_RAM</code> when setting the
+   * Node.js heap limit.
    *
-   * <p>When less than this amount of memory is available, the TypeScript compiler instance is
-   * restarted to free space.
-   *
-   * <p>Defaults to 400 MB (for a total heap space of 1.4 GB by default).
+   * <p>Defaults to 400 MB (for a total heap space of 2400 MB by default).
    */
   public static final String TYPESCRIPT_RAM_RESERVE_SUFFIX = "TYPESCRIPT_RAM_RESERVE";
 
@@ -163,7 +160,7 @@ public class TypeScriptParser {
   /** Metadata requested immediately after starting the TypeScript parser. */
   private TypeScriptParserMetadata metadata;
 
-  /** Sets the amount of RAM to allocate to the TypeScript compiler.s */
+  /** Sets the amount of RAM for the Node.js process's V8 old-space limit.  */
   public void setTypescriptRam(int megabytes) {
     this.typescriptRam = megabytes;
   }
@@ -306,7 +303,6 @@ private void setupParserWrapper() {
 
     ProcessBuilder pb = new ProcessBuilder(cmd);
     parserWrapperCommand = StringUtil.glue(" ", cmd);
-    pb.environment().put("SEMMLE_TYPESCRIPT_MEMORY_THRESHOLD", "" + mainMemoryMb);
 
     try {
       pb.redirectError(Redirect.INHERIT); // Forward stderr to our own stderr.
diff --git a/javascript/extractor/test/com/semmle/js/extractor/test/RobustnessTests.java b/javascript/extractor/test/com/semmle/js/extractor/test/RobustnessTests.java
index 1bc64fc8ffa6..d5f8c0d1d812 100644
--- a/javascript/extractor/test/com/semmle/js/extractor/test/RobustnessTests.java
+++ b/javascript/extractor/test/com/semmle/js/extractor/test/RobustnessTests.java
@@ -1,11 +1,14 @@
 package com.semmle.js.extractor.test;
 
+import com.semmle.jcorn.CustomParser;
 import com.semmle.jcorn.Options;
 import com.semmle.jcorn.Parser;
+import com.semmle.jcorn.SyntaxError;
 import com.semmle.util.io.WholeIO;
 import com.semmle.util.tests.TestPaths;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class RobustnessTests {
@@ -16,4 +19,31 @@ public void letLookheadTest() {
     String src = new WholeIO(StandardCharsets.UTF_8.name()).strictread(test);
     new Parser(new Options(), src, 0).parse();
   }
+
+  @Test
+  public void permissiveDestructuringTest() {
+    String src =
+        """
+        ({ shorthand = 1 });
+        ([...rest,] = values);
+        function f(...args,) {}
+        function g(...[first, { nested }],) {}
+        const arrow = (...args,) => args;
+        const destructuringArrow = (...{ value },) => value;
+        async (...[first, { nested }],) => first;
+        ({ method(...{ value },) {} });
+        """;
+    new Parser(new Options(), src, 0).parse();
+  }
+
+  @Test
+  public void parenthesizedRestParameterTest() {
+    try {
+      new CustomParser(new Options().preserveParens(true), "async(...(x)) => x", 0)
+          .parse();
+      Assert.fail("Expected syntax error, but parsing succeeded.");
+    } catch (SyntaxError expected) {
+      Assert.assertEquals("Unexpected token (1:9)", expected.getMessage());
+    }
+  }
 }
diff --git a/javascript/extractor/tests/es2015/input/import8.js b/javascript/extractor/tests/es2015/input/import8.js
new file mode 100644
index 000000000000..90b02b5fc001
--- /dev/null
+++ b/javascript/extractor/tests/es2015/input/import8.js
@@ -0,0 +1 @@
+module Utils from "./utils";
\ No newline at end of file
diff --git a/javascript/extractor/tests/es2015/input/property_pattern_with_default.js b/javascript/extractor/tests/es2015/input/property_pattern_with_default.js
index 44586cea06f0..de86a549c996 100644
--- a/javascript/extractor/tests/es2015/input/property_pattern_with_default.js
+++ b/javascript/extractor/tests/es2015/input/property_pattern_with_default.js
@@ -1 +1,21 @@
-({x = 1}) => x;
\ No newline at end of file
+({x = 1}) => x;
+
+const example = ({ set = {}, unset = [] }, replacements) => {
+  return { set, unset };
+};
+({ get = {}, set = [] }) => ({ get, set });
+async ({ get = 1, set = 2 } = {}) => ({ get, set });
+
+let get, set;
+({ get = 1, set = 2 } = {});
+function defaults({ get = 1, set = 2 }) {
+  return { get, set };
+}
+
+({
+  get value() { return get; },
+  set value(v) { set = v; },
+  get,
+  set
+});
+({ get() {}, set(value) {} });
\ No newline at end of file
diff --git a/javascript/extractor/tests/es2015/output/trap/import8.js.trap b/javascript/extractor/tests/es2015/output/trap/import8.js.trap
new file mode 100644
index 000000000000..f794ba427c7e
--- /dev/null
+++ b/javascript/extractor/tests/es2015/output/trap/import8.js.trap
@@ -0,0 +1,115 @@
+#10000=@"/import8.js;sourcefile"
+files(#10000,"/import8.js")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=@"global_scope"
+scopes(#20000,0)
+#20001=@"script;{#10000},1,1"
+#20002=*
+lines(#20002,#20001,"module Utils from ""./utils"";","")
+#20003=@"loc,{#10000},1,1,1,28"
+locations_default(#20003,#10000,1,1,1,28)
+hasLocation(#20002,#20003)
+numlines(#20001,1,1,0)
+#20004=*
+tokeninfo(#20004,6,#20001,0,"module")
+#20005=@"loc,{#10000},1,1,1,6"
+locations_default(#20005,#10000,1,1,1,6)
+hasLocation(#20004,#20005)
+#20006=*
+tokeninfo(#20006,6,#20001,1,"Utils")
+#20007=@"loc,{#10000},1,8,1,12"
+locations_default(#20007,#10000,1,8,1,12)
+hasLocation(#20006,#20007)
+#20008=*
+tokeninfo(#20008,6,#20001,2,"from")
+#20009=@"loc,{#10000},1,14,1,17"
+locations_default(#20009,#10000,1,14,1,17)
+hasLocation(#20008,#20009)
+#20010=*
+tokeninfo(#20010,4,#20001,3,"""./utils""")
+#20011=@"loc,{#10000},1,19,1,27"
+locations_default(#20011,#10000,1,19,1,27)
+hasLocation(#20010,#20011)
+#20012=*
+tokeninfo(#20012,8,#20001,4,";")
+#20013=@"loc,{#10000},1,28,1,28"
+locations_default(#20013,#10000,1,28,1,28)
+hasLocation(#20012,#20013)
+#20014=*
+tokeninfo(#20014,0,#20001,5,"")
+#20015=@"loc,{#10000},1,29,1,28"
+locations_default(#20015,#10000,1,29,1,28)
+hasLocation(#20014,#20015)
+toplevels(#20001,0)
+hasLocation(#20001,#20003)
+#20016=@"var;{Utils};{#20000}"
+variables(#20016,"Utils",#20000)
+#20017=@"local_type_name;{Utils};{#20000}"
+local_type_names(#20017,"Utils",#20000)
+#20018=@"local_namespace_name;{Utils};{#20000}"
+local_namespace_names(#20018,"Utils",#20000)
+variables(#20016,"Utils",#20000)
+local_type_names(#20017,"Utils",#20000)
+local_namespace_names(#20018,"Utils",#20000)
+#20019=@"var;{this};{#20000}"
+variables(#20019,"this",#20000)
+#20020=*
+stmts(#20020,27,#20001,0,"module  ... utils"";")
+hasLocation(#20020,#20003)
+stmt_containers(#20020,#20001)
+#20021=*
+exprs(#20021,4,#20020,-1,"""./utils""")
+hasLocation(#20021,#20011)
+enclosing_stmt(#20021,#20020)
+expr_containers(#20021,#20001)
+literals("./utils","""./utils""",#20021)
+#20022=*
+regexpterm(#20022,1,#20021,0,"./utils")
+#20023=@"loc,{#10000},1,20,1,26"
+locations_default(#20023,#10000,1,20,1,26)
+hasLocation(#20022,#20023)
+#20024=*
+regexpterm(#20024,12,#20022,0,".")
+#20025=@"loc,{#10000},1,20,1,20"
+locations_default(#20025,#10000,1,20,1,20)
+hasLocation(#20024,#20025)
+#20026=*
+regexpterm(#20026,14,#20022,1,"/utils")
+#20027=@"loc,{#10000},1,21,1,26"
+locations_default(#20027,#10000,1,21,1,26)
+hasLocation(#20026,#20027)
+regexp_const_value(#20026,"/utils")
+#20028=*
+exprs(#20028,85,#20020,0,"Utils f ... utils"";")
+#20029=@"loc,{#10000},1,8,1,28"
+locations_default(#20029,#10000,1,8,1,28)
+hasLocation(#20028,#20029)
+enclosing_stmt(#20028,#20020)
+expr_containers(#20028,#20001)
+#20030=*
+exprs(#20030,78,#20028,1,"Utils")
+hasLocation(#20030,#20007)
+enclosing_stmt(#20030,#20020)
+expr_containers(#20030,#20001)
+literals("Utils","Utils",#20030)
+decl(#20030,#20016)
+typedecl(#20030,#20017)
+namespacedecl(#20030,#20018)
+#20031=*
+entry_cfg_node(#20031,#20001)
+#20032=@"loc,{#10000},1,1,1,0"
+locations_default(#20032,#10000,1,1,1,0)
+hasLocation(#20031,#20032)
+#20033=*
+exit_cfg_node(#20033,#20001)
+hasLocation(#20033,#20015)
+successor(#20020,#20033)
+successor(#20028,#20020)
+successor(#20031,#20028)
+numlines(#10000,1,1,0)
+filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap b/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap
index f93e2fb0ceda..ffb291c35c15 100644
--- a/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap
@@ -10,145 +10,2184 @@ hasLocation(#10000,#10002)
 scopes(#20000,0)
 #20001=@"script;{#10000},1,1"
 #20002=*
-lines(#20002,#20001,"({x = 1}) => x;","")
+lines(#20002,#20001,"({x = 1}) => x;","
+")
 #20003=@"loc,{#10000},1,1,1,15"
 locations_default(#20003,#10000,1,1,1,15)
 hasLocation(#20002,#20003)
-numlines(#20001,1,1,0)
 #20004=*
-tokeninfo(#20004,8,#20001,0,"(")
-#20005=@"loc,{#10000},1,1,1,1"
-locations_default(#20005,#10000,1,1,1,1)
+lines(#20004,#20001,"","
+")
+#20005=@"loc,{#10000},2,1,2,0"
+locations_default(#20005,#10000,2,1,2,0)
 hasLocation(#20004,#20005)
 #20006=*
-tokeninfo(#20006,8,#20001,1,"{")
-#20007=@"loc,{#10000},1,2,1,2"
-locations_default(#20007,#10000,1,2,1,2)
+lines(#20006,#20001,"const example = ({ set = {}, unset = [] }, replacements) => {","
+")
+#20007=@"loc,{#10000},3,1,3,61"
+locations_default(#20007,#10000,3,1,3,61)
 hasLocation(#20006,#20007)
 #20008=*
-tokeninfo(#20008,6,#20001,2,"x")
-#20009=@"loc,{#10000},1,3,1,3"
-locations_default(#20009,#10000,1,3,1,3)
+lines(#20008,#20001,"  return { set, unset };","
+")
+#20009=@"loc,{#10000},4,1,4,24"
+locations_default(#20009,#10000,4,1,4,24)
 hasLocation(#20008,#20009)
+indentation(#10000,4," ",2)
 #20010=*
-tokeninfo(#20010,8,#20001,3,"=")
-#20011=@"loc,{#10000},1,5,1,5"
-locations_default(#20011,#10000,1,5,1,5)
+lines(#20010,#20001,"};","
+")
+#20011=@"loc,{#10000},5,1,5,2"
+locations_default(#20011,#10000,5,1,5,2)
 hasLocation(#20010,#20011)
 #20012=*
-tokeninfo(#20012,3,#20001,4,"1")
-#20013=@"loc,{#10000},1,7,1,7"
-locations_default(#20013,#10000,1,7,1,7)
+lines(#20012,#20001,"({ get = {}, set = [] }) => ({ get, set });","
+")
+#20013=@"loc,{#10000},6,1,6,43"
+locations_default(#20013,#10000,6,1,6,43)
 hasLocation(#20012,#20013)
 #20014=*
-tokeninfo(#20014,8,#20001,5,"}")
-#20015=@"loc,{#10000},1,8,1,8"
-locations_default(#20015,#10000,1,8,1,8)
+lines(#20014,#20001,"async ({ get = 1, set = 2 } = {}) => ({ get, set });","
+")
+#20015=@"loc,{#10000},7,1,7,52"
+locations_default(#20015,#10000,7,1,7,52)
 hasLocation(#20014,#20015)
 #20016=*
-tokeninfo(#20016,8,#20001,6,")")
-#20017=@"loc,{#10000},1,9,1,9"
-locations_default(#20017,#10000,1,9,1,9)
+lines(#20016,#20001,"","
+")
+#20017=@"loc,{#10000},8,1,8,0"
+locations_default(#20017,#10000,8,1,8,0)
 hasLocation(#20016,#20017)
 #20018=*
-tokeninfo(#20018,8,#20001,7,"=>")
-#20019=@"loc,{#10000},1,11,1,12"
-locations_default(#20019,#10000,1,11,1,12)
+lines(#20018,#20001,"let get, set;","
+")
+#20019=@"loc,{#10000},9,1,9,13"
+locations_default(#20019,#10000,9,1,9,13)
 hasLocation(#20018,#20019)
 #20020=*
-tokeninfo(#20020,6,#20001,8,"x")
-#20021=@"loc,{#10000},1,14,1,14"
-locations_default(#20021,#10000,1,14,1,14)
+lines(#20020,#20001,"({ get = 1, set = 2 } = {});","
+")
+#20021=@"loc,{#10000},10,1,10,28"
+locations_default(#20021,#10000,10,1,10,28)
 hasLocation(#20020,#20021)
 #20022=*
-tokeninfo(#20022,8,#20001,9,";")
-#20023=@"loc,{#10000},1,15,1,15"
-locations_default(#20023,#10000,1,15,1,15)
+lines(#20022,#20001,"function defaults({ get = 1, set = 2 }) {","
+")
+#20023=@"loc,{#10000},11,1,11,41"
+locations_default(#20023,#10000,11,1,11,41)
 hasLocation(#20022,#20023)
 #20024=*
-tokeninfo(#20024,0,#20001,10,"")
-#20025=@"loc,{#10000},1,16,1,15"
-locations_default(#20025,#10000,1,16,1,15)
+lines(#20024,#20001,"  return { get, set };","
+")
+#20025=@"loc,{#10000},12,1,12,22"
+locations_default(#20025,#10000,12,1,12,22)
 hasLocation(#20024,#20025)
-toplevels(#20001,0)
-hasLocation(#20001,#20003)
-#20026=@"var;{this};{#20000}"
-variables(#20026,"this",#20000)
-#20027=*
-stmts(#20027,2,#20001,0,"({x = 1}) => x;")
-hasLocation(#20027,#20003)
-stmt_containers(#20027,#20001)
+indentation(#10000,12," ",2)
+#20026=*
+lines(#20026,#20001,"}","
+")
+#20027=@"loc,{#10000},13,1,13,1"
+locations_default(#20027,#10000,13,1,13,1)
+hasLocation(#20026,#20027)
 #20028=*
-exprs(#20028,65,#20027,0,"({x = 1}) => x")
-#20029=@"loc,{#10000},1,1,1,14"
-locations_default(#20029,#10000,1,1,1,14)
+lines(#20028,#20001,"","
+")
+#20029=@"loc,{#10000},14,1,14,0"
+locations_default(#20029,#10000,14,1,14,0)
 hasLocation(#20028,#20029)
-enclosing_stmt(#20028,#20027)
-expr_containers(#20028,#20001)
 #20030=*
-scopes(#20030,1)
-scopenodes(#20028,#20030)
-scopenesting(#20030,#20000)
-#20031=@"var;{x};{#20030}"
-variables(#20031,"x",#20030)
+lines(#20030,#20001,"({","
+")
+#20031=@"loc,{#10000},15,1,15,2"
+locations_default(#20031,#10000,15,1,15,2)
+hasLocation(#20030,#20031)
 #20032=*
-exprs(#20032,68,#20028,0,"{x = 1}")
-#20033=@"loc,{#10000},1,2,1,8"
-locations_default(#20033,#10000,1,2,1,8)
+lines(#20032,#20001,"  get value() { return get; },","
+")
+#20033=@"loc,{#10000},16,1,16,30"
+locations_default(#20033,#10000,16,1,16,30)
 hasLocation(#20032,#20033)
-expr_containers(#20032,#20028)
+indentation(#10000,16," ",2)
 #20034=*
-properties(#20034,#20032,0,0,"x = 1")
-#20035=@"loc,{#10000},1,3,1,7"
-locations_default(#20035,#10000,1,3,1,7)
+lines(#20034,#20001,"  set value(v) { set = v; },","
+")
+#20035=@"loc,{#10000},17,1,17,28"
+locations_default(#20035,#10000,17,1,17,28)
 hasLocation(#20034,#20035)
+indentation(#10000,17," ",2)
 #20036=*
-exprs(#20036,0,#20034,0,"x")
-hasLocation(#20036,#20009)
-expr_containers(#20036,#20028)
-literals("x","x",#20036)
-#20037=*
-exprs(#20037,78,#20034,1,"x")
-hasLocation(#20037,#20009)
-expr_containers(#20037,#20028)
-literals("x","x",#20037)
-decl(#20037,#20031)
+lines(#20036,#20001,"  get,","
+")
+#20037=@"loc,{#10000},18,1,18,6"
+locations_default(#20037,#10000,18,1,18,6)
+hasLocation(#20036,#20037)
+indentation(#10000,18," ",2)
 #20038=*
-exprs(#20038,3,#20034,2,"1")
-hasLocation(#20038,#20013)
-expr_containers(#20038,#20028)
-literals("1","1",#20038)
-#20039=*
-exprs(#20039,79,#20028,-2,"x")
-hasLocation(#20039,#20021)
-expr_containers(#20039,#20028)
-literals("x","x",#20039)
-bind(#20039,#20031)
+lines(#20038,#20001,"  set","
+")
+#20039=@"loc,{#10000},19,1,19,5"
+locations_default(#20039,#10000,19,1,19,5)
+hasLocation(#20038,#20039)
+indentation(#10000,19," ",2)
 #20040=*
-entry_cfg_node(#20040,#20001)
-#20041=@"loc,{#10000},1,1,1,0"
-locations_default(#20041,#10000,1,1,1,0)
+lines(#20040,#20001,"});","
+")
+#20041=@"loc,{#10000},20,1,20,3"
+locations_default(#20041,#10000,20,1,20,3)
 hasLocation(#20040,#20041)
 #20042=*
-exit_cfg_node(#20042,#20001)
-hasLocation(#20042,#20025)
-successor(#20027,#20028)
-successor(#20028,#20042)
-#20043=*
-entry_cfg_node(#20043,#20028)
-hasLocation(#20043,#20041)
+lines(#20042,#20001,"({ get() {}, set(value) {} });","")
+#20043=@"loc,{#10000},21,1,21,30"
+locations_default(#20043,#10000,21,1,21,30)
+hasLocation(#20042,#20043)
+numlines(#20001,21,18,0)
 #20044=*
-exit_cfg_node(#20044,#20028)
-#20045=@"loc,{#10000},1,15,1,14"
-locations_default(#20045,#10000,1,15,1,14)
+tokeninfo(#20044,8,#20001,0,"(")
+#20045=@"loc,{#10000},1,1,1,1"
+locations_default(#20045,#10000,1,1,1,1)
 hasLocation(#20044,#20045)
-successor(#20039,#20044)
-successor(#20032,#20036)
-successor(#20038,#20034)
-successor(#20037,#20038)
-successor(#20036,#20037)
-successor(#20034,#20039)
-successor(#20043,#20032)
-successor(#20040,#20027)
-numlines(#10000,1,1,0)
+#20046=*
+tokeninfo(#20046,8,#20001,1,"{")
+#20047=@"loc,{#10000},1,2,1,2"
+locations_default(#20047,#10000,1,2,1,2)
+hasLocation(#20046,#20047)
+#20048=*
+tokeninfo(#20048,6,#20001,2,"x")
+#20049=@"loc,{#10000},1,3,1,3"
+locations_default(#20049,#10000,1,3,1,3)
+hasLocation(#20048,#20049)
+#20050=*
+tokeninfo(#20050,8,#20001,3,"=")
+#20051=@"loc,{#10000},1,5,1,5"
+locations_default(#20051,#10000,1,5,1,5)
+hasLocation(#20050,#20051)
+#20052=*
+tokeninfo(#20052,3,#20001,4,"1")
+#20053=@"loc,{#10000},1,7,1,7"
+locations_default(#20053,#10000,1,7,1,7)
+hasLocation(#20052,#20053)
+#20054=*
+tokeninfo(#20054,8,#20001,5,"}")
+#20055=@"loc,{#10000},1,8,1,8"
+locations_default(#20055,#10000,1,8,1,8)
+hasLocation(#20054,#20055)
+#20056=*
+tokeninfo(#20056,8,#20001,6,")")
+#20057=@"loc,{#10000},1,9,1,9"
+locations_default(#20057,#10000,1,9,1,9)
+hasLocation(#20056,#20057)
+#20058=*
+tokeninfo(#20058,8,#20001,7,"=>")
+#20059=@"loc,{#10000},1,11,1,12"
+locations_default(#20059,#10000,1,11,1,12)
+hasLocation(#20058,#20059)
+#20060=*
+tokeninfo(#20060,6,#20001,8,"x")
+#20061=@"loc,{#10000},1,14,1,14"
+locations_default(#20061,#10000,1,14,1,14)
+hasLocation(#20060,#20061)
+#20062=*
+tokeninfo(#20062,8,#20001,9,";")
+#20063=@"loc,{#10000},1,15,1,15"
+locations_default(#20063,#10000,1,15,1,15)
+hasLocation(#20062,#20063)
+#20064=*
+tokeninfo(#20064,7,#20001,10,"const")
+#20065=@"loc,{#10000},3,1,3,5"
+locations_default(#20065,#10000,3,1,3,5)
+hasLocation(#20064,#20065)
+#20066=*
+tokeninfo(#20066,6,#20001,11,"example")
+#20067=@"loc,{#10000},3,7,3,13"
+locations_default(#20067,#10000,3,7,3,13)
+hasLocation(#20066,#20067)
+#20068=*
+tokeninfo(#20068,8,#20001,12,"=")
+#20069=@"loc,{#10000},3,15,3,15"
+locations_default(#20069,#10000,3,15,3,15)
+hasLocation(#20068,#20069)
+#20070=*
+tokeninfo(#20070,8,#20001,13,"(")
+#20071=@"loc,{#10000},3,17,3,17"
+locations_default(#20071,#10000,3,17,3,17)
+hasLocation(#20070,#20071)
+#20072=*
+tokeninfo(#20072,8,#20001,14,"{")
+#20073=@"loc,{#10000},3,18,3,18"
+locations_default(#20073,#10000,3,18,3,18)
+hasLocation(#20072,#20073)
+#20074=*
+tokeninfo(#20074,6,#20001,15,"set")
+#20075=@"loc,{#10000},3,20,3,22"
+locations_default(#20075,#10000,3,20,3,22)
+hasLocation(#20074,#20075)
+#20076=*
+tokeninfo(#20076,8,#20001,16,"=")
+#20077=@"loc,{#10000},3,24,3,24"
+locations_default(#20077,#10000,3,24,3,24)
+hasLocation(#20076,#20077)
+#20078=*
+tokeninfo(#20078,8,#20001,17,"{")
+#20079=@"loc,{#10000},3,26,3,26"
+locations_default(#20079,#10000,3,26,3,26)
+hasLocation(#20078,#20079)
+#20080=*
+tokeninfo(#20080,8,#20001,18,"}")
+#20081=@"loc,{#10000},3,27,3,27"
+locations_default(#20081,#10000,3,27,3,27)
+hasLocation(#20080,#20081)
+#20082=*
+tokeninfo(#20082,8,#20001,19,",")
+#20083=@"loc,{#10000},3,28,3,28"
+locations_default(#20083,#10000,3,28,3,28)
+hasLocation(#20082,#20083)
+#20084=*
+tokeninfo(#20084,6,#20001,20,"unset")
+#20085=@"loc,{#10000},3,30,3,34"
+locations_default(#20085,#10000,3,30,3,34)
+hasLocation(#20084,#20085)
+#20086=*
+tokeninfo(#20086,8,#20001,21,"=")
+#20087=@"loc,{#10000},3,36,3,36"
+locations_default(#20087,#10000,3,36,3,36)
+hasLocation(#20086,#20087)
+#20088=*
+tokeninfo(#20088,8,#20001,22,"[")
+#20089=@"loc,{#10000},3,38,3,38"
+locations_default(#20089,#10000,3,38,3,38)
+hasLocation(#20088,#20089)
+#20090=*
+tokeninfo(#20090,8,#20001,23,"]")
+#20091=@"loc,{#10000},3,39,3,39"
+locations_default(#20091,#10000,3,39,3,39)
+hasLocation(#20090,#20091)
+#20092=*
+tokeninfo(#20092,8,#20001,24,"}")
+#20093=@"loc,{#10000},3,41,3,41"
+locations_default(#20093,#10000,3,41,3,41)
+hasLocation(#20092,#20093)
+#20094=*
+tokeninfo(#20094,8,#20001,25,",")
+#20095=@"loc,{#10000},3,42,3,42"
+locations_default(#20095,#10000,3,42,3,42)
+hasLocation(#20094,#20095)
+#20096=*
+tokeninfo(#20096,6,#20001,26,"replacements")
+#20097=@"loc,{#10000},3,44,3,55"
+locations_default(#20097,#10000,3,44,3,55)
+hasLocation(#20096,#20097)
+#20098=*
+tokeninfo(#20098,8,#20001,27,")")
+#20099=@"loc,{#10000},3,56,3,56"
+locations_default(#20099,#10000,3,56,3,56)
+hasLocation(#20098,#20099)
+#20100=*
+tokeninfo(#20100,8,#20001,28,"=>")
+#20101=@"loc,{#10000},3,58,3,59"
+locations_default(#20101,#10000,3,58,3,59)
+hasLocation(#20100,#20101)
+#20102=*
+tokeninfo(#20102,8,#20001,29,"{")
+#20103=@"loc,{#10000},3,61,3,61"
+locations_default(#20103,#10000,3,61,3,61)
+hasLocation(#20102,#20103)
+#20104=*
+tokeninfo(#20104,7,#20001,30,"return")
+#20105=@"loc,{#10000},4,3,4,8"
+locations_default(#20105,#10000,4,3,4,8)
+hasLocation(#20104,#20105)
+#20106=*
+tokeninfo(#20106,8,#20001,31,"{")
+#20107=@"loc,{#10000},4,10,4,10"
+locations_default(#20107,#10000,4,10,4,10)
+hasLocation(#20106,#20107)
+#20108=*
+tokeninfo(#20108,6,#20001,32,"set")
+#20109=@"loc,{#10000},4,12,4,14"
+locations_default(#20109,#10000,4,12,4,14)
+hasLocation(#20108,#20109)
+#20110=*
+tokeninfo(#20110,8,#20001,33,",")
+#20111=@"loc,{#10000},4,15,4,15"
+locations_default(#20111,#10000,4,15,4,15)
+hasLocation(#20110,#20111)
+#20112=*
+tokeninfo(#20112,6,#20001,34,"unset")
+#20113=@"loc,{#10000},4,17,4,21"
+locations_default(#20113,#10000,4,17,4,21)
+hasLocation(#20112,#20113)
+#20114=*
+tokeninfo(#20114,8,#20001,35,"}")
+#20115=@"loc,{#10000},4,23,4,23"
+locations_default(#20115,#10000,4,23,4,23)
+hasLocation(#20114,#20115)
+#20116=*
+tokeninfo(#20116,8,#20001,36,";")
+#20117=@"loc,{#10000},4,24,4,24"
+locations_default(#20117,#10000,4,24,4,24)
+hasLocation(#20116,#20117)
+#20118=*
+tokeninfo(#20118,8,#20001,37,"}")
+#20119=@"loc,{#10000},5,1,5,1"
+locations_default(#20119,#10000,5,1,5,1)
+hasLocation(#20118,#20119)
+#20120=*
+tokeninfo(#20120,8,#20001,38,";")
+#20121=@"loc,{#10000},5,2,5,2"
+locations_default(#20121,#10000,5,2,5,2)
+hasLocation(#20120,#20121)
+#20122=*
+tokeninfo(#20122,8,#20001,39,"(")
+#20123=@"loc,{#10000},6,1,6,1"
+locations_default(#20123,#10000,6,1,6,1)
+hasLocation(#20122,#20123)
+#20124=*
+tokeninfo(#20124,8,#20001,40,"{")
+#20125=@"loc,{#10000},6,2,6,2"
+locations_default(#20125,#10000,6,2,6,2)
+hasLocation(#20124,#20125)
+#20126=*
+tokeninfo(#20126,6,#20001,41,"get")
+#20127=@"loc,{#10000},6,4,6,6"
+locations_default(#20127,#10000,6,4,6,6)
+hasLocation(#20126,#20127)
+#20128=*
+tokeninfo(#20128,8,#20001,42,"=")
+#20129=@"loc,{#10000},6,8,6,8"
+locations_default(#20129,#10000,6,8,6,8)
+hasLocation(#20128,#20129)
+#20130=*
+tokeninfo(#20130,8,#20001,43,"{")
+#20131=@"loc,{#10000},6,10,6,10"
+locations_default(#20131,#10000,6,10,6,10)
+hasLocation(#20130,#20131)
+#20132=*
+tokeninfo(#20132,8,#20001,44,"}")
+#20133=@"loc,{#10000},6,11,6,11"
+locations_default(#20133,#10000,6,11,6,11)
+hasLocation(#20132,#20133)
+#20134=*
+tokeninfo(#20134,8,#20001,45,",")
+#20135=@"loc,{#10000},6,12,6,12"
+locations_default(#20135,#10000,6,12,6,12)
+hasLocation(#20134,#20135)
+#20136=*
+tokeninfo(#20136,6,#20001,46,"set")
+#20137=@"loc,{#10000},6,14,6,16"
+locations_default(#20137,#10000,6,14,6,16)
+hasLocation(#20136,#20137)
+#20138=*
+tokeninfo(#20138,8,#20001,47,"=")
+#20139=@"loc,{#10000},6,18,6,18"
+locations_default(#20139,#10000,6,18,6,18)
+hasLocation(#20138,#20139)
+#20140=*
+tokeninfo(#20140,8,#20001,48,"[")
+#20141=@"loc,{#10000},6,20,6,20"
+locations_default(#20141,#10000,6,20,6,20)
+hasLocation(#20140,#20141)
+#20142=*
+tokeninfo(#20142,8,#20001,49,"]")
+#20143=@"loc,{#10000},6,21,6,21"
+locations_default(#20143,#10000,6,21,6,21)
+hasLocation(#20142,#20143)
+#20144=*
+tokeninfo(#20144,8,#20001,50,"}")
+#20145=@"loc,{#10000},6,23,6,23"
+locations_default(#20145,#10000,6,23,6,23)
+hasLocation(#20144,#20145)
+#20146=*
+tokeninfo(#20146,8,#20001,51,")")
+#20147=@"loc,{#10000},6,24,6,24"
+locations_default(#20147,#10000,6,24,6,24)
+hasLocation(#20146,#20147)
+#20148=*
+tokeninfo(#20148,8,#20001,52,"=>")
+#20149=@"loc,{#10000},6,26,6,27"
+locations_default(#20149,#10000,6,26,6,27)
+hasLocation(#20148,#20149)
+#20150=*
+tokeninfo(#20150,8,#20001,53,"(")
+#20151=@"loc,{#10000},6,29,6,29"
+locations_default(#20151,#10000,6,29,6,29)
+hasLocation(#20150,#20151)
+#20152=*
+tokeninfo(#20152,8,#20001,54,"{")
+#20153=@"loc,{#10000},6,30,6,30"
+locations_default(#20153,#10000,6,30,6,30)
+hasLocation(#20152,#20153)
+#20154=*
+tokeninfo(#20154,6,#20001,55,"get")
+#20155=@"loc,{#10000},6,32,6,34"
+locations_default(#20155,#10000,6,32,6,34)
+hasLocation(#20154,#20155)
+#20156=*
+tokeninfo(#20156,8,#20001,56,",")
+#20157=@"loc,{#10000},6,35,6,35"
+locations_default(#20157,#10000,6,35,6,35)
+hasLocation(#20156,#20157)
+#20158=*
+tokeninfo(#20158,6,#20001,57,"set")
+#20159=@"loc,{#10000},6,37,6,39"
+locations_default(#20159,#10000,6,37,6,39)
+hasLocation(#20158,#20159)
+#20160=*
+tokeninfo(#20160,8,#20001,58,"}")
+#20161=@"loc,{#10000},6,41,6,41"
+locations_default(#20161,#10000,6,41,6,41)
+hasLocation(#20160,#20161)
+#20162=*
+tokeninfo(#20162,8,#20001,59,")")
+#20163=@"loc,{#10000},6,42,6,42"
+locations_default(#20163,#10000,6,42,6,42)
+hasLocation(#20162,#20163)
+#20164=*
+tokeninfo(#20164,8,#20001,60,";")
+#20165=@"loc,{#10000},6,43,6,43"
+locations_default(#20165,#10000,6,43,6,43)
+hasLocation(#20164,#20165)
+#20166=*
+tokeninfo(#20166,6,#20001,61,"async")
+#20167=@"loc,{#10000},7,1,7,5"
+locations_default(#20167,#10000,7,1,7,5)
+hasLocation(#20166,#20167)
+#20168=*
+tokeninfo(#20168,8,#20001,62,"(")
+#20169=@"loc,{#10000},7,7,7,7"
+locations_default(#20169,#10000,7,7,7,7)
+hasLocation(#20168,#20169)
+#20170=*
+tokeninfo(#20170,8,#20001,63,"{")
+#20171=@"loc,{#10000},7,8,7,8"
+locations_default(#20171,#10000,7,8,7,8)
+hasLocation(#20170,#20171)
+#20172=*
+tokeninfo(#20172,6,#20001,64,"get")
+#20173=@"loc,{#10000},7,10,7,12"
+locations_default(#20173,#10000,7,10,7,12)
+hasLocation(#20172,#20173)
+#20174=*
+tokeninfo(#20174,8,#20001,65,"=")
+#20175=@"loc,{#10000},7,14,7,14"
+locations_default(#20175,#10000,7,14,7,14)
+hasLocation(#20174,#20175)
+#20176=*
+tokeninfo(#20176,3,#20001,66,"1")
+#20177=@"loc,{#10000},7,16,7,16"
+locations_default(#20177,#10000,7,16,7,16)
+hasLocation(#20176,#20177)
+#20178=*
+tokeninfo(#20178,8,#20001,67,",")
+#20179=@"loc,{#10000},7,17,7,17"
+locations_default(#20179,#10000,7,17,7,17)
+hasLocation(#20178,#20179)
+#20180=*
+tokeninfo(#20180,6,#20001,68,"set")
+#20181=@"loc,{#10000},7,19,7,21"
+locations_default(#20181,#10000,7,19,7,21)
+hasLocation(#20180,#20181)
+#20182=*
+tokeninfo(#20182,8,#20001,69,"=")
+#20183=@"loc,{#10000},7,23,7,23"
+locations_default(#20183,#10000,7,23,7,23)
+hasLocation(#20182,#20183)
+#20184=*
+tokeninfo(#20184,3,#20001,70,"2")
+#20185=@"loc,{#10000},7,25,7,25"
+locations_default(#20185,#10000,7,25,7,25)
+hasLocation(#20184,#20185)
+#20186=*
+tokeninfo(#20186,8,#20001,71,"}")
+#20187=@"loc,{#10000},7,27,7,27"
+locations_default(#20187,#10000,7,27,7,27)
+hasLocation(#20186,#20187)
+#20188=*
+tokeninfo(#20188,8,#20001,72,"=")
+#20189=@"loc,{#10000},7,29,7,29"
+locations_default(#20189,#10000,7,29,7,29)
+hasLocation(#20188,#20189)
+#20190=*
+tokeninfo(#20190,8,#20001,73,"{")
+#20191=@"loc,{#10000},7,31,7,31"
+locations_default(#20191,#10000,7,31,7,31)
+hasLocation(#20190,#20191)
+#20192=*
+tokeninfo(#20192,8,#20001,74,"}")
+#20193=@"loc,{#10000},7,32,7,32"
+locations_default(#20193,#10000,7,32,7,32)
+hasLocation(#20192,#20193)
+#20194=*
+tokeninfo(#20194,8,#20001,75,")")
+#20195=@"loc,{#10000},7,33,7,33"
+locations_default(#20195,#10000,7,33,7,33)
+hasLocation(#20194,#20195)
+#20196=*
+tokeninfo(#20196,8,#20001,76,"=>")
+#20197=@"loc,{#10000},7,35,7,36"
+locations_default(#20197,#10000,7,35,7,36)
+hasLocation(#20196,#20197)
+#20198=*
+tokeninfo(#20198,8,#20001,77,"(")
+#20199=@"loc,{#10000},7,38,7,38"
+locations_default(#20199,#10000,7,38,7,38)
+hasLocation(#20198,#20199)
+#20200=*
+tokeninfo(#20200,8,#20001,78,"{")
+#20201=@"loc,{#10000},7,39,7,39"
+locations_default(#20201,#10000,7,39,7,39)
+hasLocation(#20200,#20201)
+#20202=*
+tokeninfo(#20202,6,#20001,79,"get")
+#20203=@"loc,{#10000},7,41,7,43"
+locations_default(#20203,#10000,7,41,7,43)
+hasLocation(#20202,#20203)
+#20204=*
+tokeninfo(#20204,8,#20001,80,",")
+#20205=@"loc,{#10000},7,44,7,44"
+locations_default(#20205,#10000,7,44,7,44)
+hasLocation(#20204,#20205)
+#20206=*
+tokeninfo(#20206,6,#20001,81,"set")
+#20207=@"loc,{#10000},7,46,7,48"
+locations_default(#20207,#10000,7,46,7,48)
+hasLocation(#20206,#20207)
+#20208=*
+tokeninfo(#20208,8,#20001,82,"}")
+#20209=@"loc,{#10000},7,50,7,50"
+locations_default(#20209,#10000,7,50,7,50)
+hasLocation(#20208,#20209)
+#20210=*
+tokeninfo(#20210,8,#20001,83,")")
+#20211=@"loc,{#10000},7,51,7,51"
+locations_default(#20211,#10000,7,51,7,51)
+hasLocation(#20210,#20211)
+#20212=*
+tokeninfo(#20212,8,#20001,84,";")
+#20213=@"loc,{#10000},7,52,7,52"
+locations_default(#20213,#10000,7,52,7,52)
+hasLocation(#20212,#20213)
+#20214=*
+tokeninfo(#20214,7,#20001,85,"let")
+#20215=@"loc,{#10000},9,1,9,3"
+locations_default(#20215,#10000,9,1,9,3)
+hasLocation(#20214,#20215)
+#20216=*
+tokeninfo(#20216,6,#20001,86,"get")
+#20217=@"loc,{#10000},9,5,9,7"
+locations_default(#20217,#10000,9,5,9,7)
+hasLocation(#20216,#20217)
+#20218=*
+tokeninfo(#20218,8,#20001,87,",")
+#20219=@"loc,{#10000},9,8,9,8"
+locations_default(#20219,#10000,9,8,9,8)
+hasLocation(#20218,#20219)
+#20220=*
+tokeninfo(#20220,6,#20001,88,"set")
+#20221=@"loc,{#10000},9,10,9,12"
+locations_default(#20221,#10000,9,10,9,12)
+hasLocation(#20220,#20221)
+#20222=*
+tokeninfo(#20222,8,#20001,89,";")
+#20223=@"loc,{#10000},9,13,9,13"
+locations_default(#20223,#10000,9,13,9,13)
+hasLocation(#20222,#20223)
+#20224=*
+tokeninfo(#20224,8,#20001,90,"(")
+#20225=@"loc,{#10000},10,1,10,1"
+locations_default(#20225,#10000,10,1,10,1)
+hasLocation(#20224,#20225)
+#20226=*
+tokeninfo(#20226,8,#20001,91,"{")
+#20227=@"loc,{#10000},10,2,10,2"
+locations_default(#20227,#10000,10,2,10,2)
+hasLocation(#20226,#20227)
+#20228=*
+tokeninfo(#20228,6,#20001,92,"get")
+#20229=@"loc,{#10000},10,4,10,6"
+locations_default(#20229,#10000,10,4,10,6)
+hasLocation(#20228,#20229)
+#20230=*
+tokeninfo(#20230,8,#20001,93,"=")
+#20231=@"loc,{#10000},10,8,10,8"
+locations_default(#20231,#10000,10,8,10,8)
+hasLocation(#20230,#20231)
+#20232=*
+tokeninfo(#20232,3,#20001,94,"1")
+#20233=@"loc,{#10000},10,10,10,10"
+locations_default(#20233,#10000,10,10,10,10)
+hasLocation(#20232,#20233)
+#20234=*
+tokeninfo(#20234,8,#20001,95,",")
+#20235=@"loc,{#10000},10,11,10,11"
+locations_default(#20235,#10000,10,11,10,11)
+hasLocation(#20234,#20235)
+#20236=*
+tokeninfo(#20236,6,#20001,96,"set")
+#20237=@"loc,{#10000},10,13,10,15"
+locations_default(#20237,#10000,10,13,10,15)
+hasLocation(#20236,#20237)
+#20238=*
+tokeninfo(#20238,8,#20001,97,"=")
+#20239=@"loc,{#10000},10,17,10,17"
+locations_default(#20239,#10000,10,17,10,17)
+hasLocation(#20238,#20239)
+#20240=*
+tokeninfo(#20240,3,#20001,98,"2")
+#20241=@"loc,{#10000},10,19,10,19"
+locations_default(#20241,#10000,10,19,10,19)
+hasLocation(#20240,#20241)
+#20242=*
+tokeninfo(#20242,8,#20001,99,"}")
+#20243=@"loc,{#10000},10,21,10,21"
+locations_default(#20243,#10000,10,21,10,21)
+hasLocation(#20242,#20243)
+#20244=*
+tokeninfo(#20244,8,#20001,100,"=")
+#20245=@"loc,{#10000},10,23,10,23"
+locations_default(#20245,#10000,10,23,10,23)
+hasLocation(#20244,#20245)
+#20246=*
+tokeninfo(#20246,8,#20001,101,"{")
+#20247=@"loc,{#10000},10,25,10,25"
+locations_default(#20247,#10000,10,25,10,25)
+hasLocation(#20246,#20247)
+#20248=*
+tokeninfo(#20248,8,#20001,102,"}")
+#20249=@"loc,{#10000},10,26,10,26"
+locations_default(#20249,#10000,10,26,10,26)
+hasLocation(#20248,#20249)
+#20250=*
+tokeninfo(#20250,8,#20001,103,")")
+#20251=@"loc,{#10000},10,27,10,27"
+locations_default(#20251,#10000,10,27,10,27)
+hasLocation(#20250,#20251)
+#20252=*
+tokeninfo(#20252,8,#20001,104,";")
+#20253=@"loc,{#10000},10,28,10,28"
+locations_default(#20253,#10000,10,28,10,28)
+hasLocation(#20252,#20253)
+#20254=*
+tokeninfo(#20254,7,#20001,105,"function")
+#20255=@"loc,{#10000},11,1,11,8"
+locations_default(#20255,#10000,11,1,11,8)
+hasLocation(#20254,#20255)
+#20256=*
+tokeninfo(#20256,6,#20001,106,"defaults")
+#20257=@"loc,{#10000},11,10,11,17"
+locations_default(#20257,#10000,11,10,11,17)
+hasLocation(#20256,#20257)
+#20258=*
+tokeninfo(#20258,8,#20001,107,"(")
+#20259=@"loc,{#10000},11,18,11,18"
+locations_default(#20259,#10000,11,18,11,18)
+hasLocation(#20258,#20259)
+#20260=*
+tokeninfo(#20260,8,#20001,108,"{")
+#20261=@"loc,{#10000},11,19,11,19"
+locations_default(#20261,#10000,11,19,11,19)
+hasLocation(#20260,#20261)
+#20262=*
+tokeninfo(#20262,6,#20001,109,"get")
+#20263=@"loc,{#10000},11,21,11,23"
+locations_default(#20263,#10000,11,21,11,23)
+hasLocation(#20262,#20263)
+#20264=*
+tokeninfo(#20264,8,#20001,110,"=")
+#20265=@"loc,{#10000},11,25,11,25"
+locations_default(#20265,#10000,11,25,11,25)
+hasLocation(#20264,#20265)
+#20266=*
+tokeninfo(#20266,3,#20001,111,"1")
+#20267=@"loc,{#10000},11,27,11,27"
+locations_default(#20267,#10000,11,27,11,27)
+hasLocation(#20266,#20267)
+#20268=*
+tokeninfo(#20268,8,#20001,112,",")
+#20269=@"loc,{#10000},11,28,11,28"
+locations_default(#20269,#10000,11,28,11,28)
+hasLocation(#20268,#20269)
+#20270=*
+tokeninfo(#20270,6,#20001,113,"set")
+#20271=@"loc,{#10000},11,30,11,32"
+locations_default(#20271,#10000,11,30,11,32)
+hasLocation(#20270,#20271)
+#20272=*
+tokeninfo(#20272,8,#20001,114,"=")
+#20273=@"loc,{#10000},11,34,11,34"
+locations_default(#20273,#10000,11,34,11,34)
+hasLocation(#20272,#20273)
+#20274=*
+tokeninfo(#20274,3,#20001,115,"2")
+#20275=@"loc,{#10000},11,36,11,36"
+locations_default(#20275,#10000,11,36,11,36)
+hasLocation(#20274,#20275)
+#20276=*
+tokeninfo(#20276,8,#20001,116,"}")
+#20277=@"loc,{#10000},11,38,11,38"
+locations_default(#20277,#10000,11,38,11,38)
+hasLocation(#20276,#20277)
+#20278=*
+tokeninfo(#20278,8,#20001,117,")")
+#20279=@"loc,{#10000},11,39,11,39"
+locations_default(#20279,#10000,11,39,11,39)
+hasLocation(#20278,#20279)
+#20280=*
+tokeninfo(#20280,8,#20001,118,"{")
+#20281=@"loc,{#10000},11,41,11,41"
+locations_default(#20281,#10000,11,41,11,41)
+hasLocation(#20280,#20281)
+#20282=*
+tokeninfo(#20282,7,#20001,119,"return")
+#20283=@"loc,{#10000},12,3,12,8"
+locations_default(#20283,#10000,12,3,12,8)
+hasLocation(#20282,#20283)
+#20284=*
+tokeninfo(#20284,8,#20001,120,"{")
+#20285=@"loc,{#10000},12,10,12,10"
+locations_default(#20285,#10000,12,10,12,10)
+hasLocation(#20284,#20285)
+#20286=*
+tokeninfo(#20286,6,#20001,121,"get")
+#20287=@"loc,{#10000},12,12,12,14"
+locations_default(#20287,#10000,12,12,12,14)
+hasLocation(#20286,#20287)
+#20288=*
+tokeninfo(#20288,8,#20001,122,",")
+#20289=@"loc,{#10000},12,15,12,15"
+locations_default(#20289,#10000,12,15,12,15)
+hasLocation(#20288,#20289)
+#20290=*
+tokeninfo(#20290,6,#20001,123,"set")
+#20291=@"loc,{#10000},12,17,12,19"
+locations_default(#20291,#10000,12,17,12,19)
+hasLocation(#20290,#20291)
+#20292=*
+tokeninfo(#20292,8,#20001,124,"}")
+#20293=@"loc,{#10000},12,21,12,21"
+locations_default(#20293,#10000,12,21,12,21)
+hasLocation(#20292,#20293)
+#20294=*
+tokeninfo(#20294,8,#20001,125,";")
+#20295=@"loc,{#10000},12,22,12,22"
+locations_default(#20295,#10000,12,22,12,22)
+hasLocation(#20294,#20295)
+#20296=*
+tokeninfo(#20296,8,#20001,126,"}")
+hasLocation(#20296,#20027)
+#20297=*
+tokeninfo(#20297,8,#20001,127,"(")
+#20298=@"loc,{#10000},15,1,15,1"
+locations_default(#20298,#10000,15,1,15,1)
+hasLocation(#20297,#20298)
+#20299=*
+tokeninfo(#20299,8,#20001,128,"{")
+#20300=@"loc,{#10000},15,2,15,2"
+locations_default(#20300,#10000,15,2,15,2)
+hasLocation(#20299,#20300)
+#20301=*
+tokeninfo(#20301,6,#20001,129,"get")
+#20302=@"loc,{#10000},16,3,16,5"
+locations_default(#20302,#10000,16,3,16,5)
+hasLocation(#20301,#20302)
+#20303=*
+tokeninfo(#20303,6,#20001,130,"value")
+#20304=@"loc,{#10000},16,7,16,11"
+locations_default(#20304,#10000,16,7,16,11)
+hasLocation(#20303,#20304)
+#20305=*
+tokeninfo(#20305,8,#20001,131,"(")
+#20306=@"loc,{#10000},16,12,16,12"
+locations_default(#20306,#10000,16,12,16,12)
+hasLocation(#20305,#20306)
+#20307=*
+tokeninfo(#20307,8,#20001,132,")")
+#20308=@"loc,{#10000},16,13,16,13"
+locations_default(#20308,#10000,16,13,16,13)
+hasLocation(#20307,#20308)
+#20309=*
+tokeninfo(#20309,8,#20001,133,"{")
+#20310=@"loc,{#10000},16,15,16,15"
+locations_default(#20310,#10000,16,15,16,15)
+hasLocation(#20309,#20310)
+#20311=*
+tokeninfo(#20311,7,#20001,134,"return")
+#20312=@"loc,{#10000},16,17,16,22"
+locations_default(#20312,#10000,16,17,16,22)
+hasLocation(#20311,#20312)
+#20313=*
+tokeninfo(#20313,6,#20001,135,"get")
+#20314=@"loc,{#10000},16,24,16,26"
+locations_default(#20314,#10000,16,24,16,26)
+hasLocation(#20313,#20314)
+#20315=*
+tokeninfo(#20315,8,#20001,136,";")
+#20316=@"loc,{#10000},16,27,16,27"
+locations_default(#20316,#10000,16,27,16,27)
+hasLocation(#20315,#20316)
+#20317=*
+tokeninfo(#20317,8,#20001,137,"}")
+#20318=@"loc,{#10000},16,29,16,29"
+locations_default(#20318,#10000,16,29,16,29)
+hasLocation(#20317,#20318)
+#20319=*
+tokeninfo(#20319,8,#20001,138,",")
+#20320=@"loc,{#10000},16,30,16,30"
+locations_default(#20320,#10000,16,30,16,30)
+hasLocation(#20319,#20320)
+#20321=*
+tokeninfo(#20321,6,#20001,139,"set")
+#20322=@"loc,{#10000},17,3,17,5"
+locations_default(#20322,#10000,17,3,17,5)
+hasLocation(#20321,#20322)
+#20323=*
+tokeninfo(#20323,6,#20001,140,"value")
+#20324=@"loc,{#10000},17,7,17,11"
+locations_default(#20324,#10000,17,7,17,11)
+hasLocation(#20323,#20324)
+#20325=*
+tokeninfo(#20325,8,#20001,141,"(")
+#20326=@"loc,{#10000},17,12,17,12"
+locations_default(#20326,#10000,17,12,17,12)
+hasLocation(#20325,#20326)
+#20327=*
+tokeninfo(#20327,6,#20001,142,"v")
+#20328=@"loc,{#10000},17,13,17,13"
+locations_default(#20328,#10000,17,13,17,13)
+hasLocation(#20327,#20328)
+#20329=*
+tokeninfo(#20329,8,#20001,143,")")
+#20330=@"loc,{#10000},17,14,17,14"
+locations_default(#20330,#10000,17,14,17,14)
+hasLocation(#20329,#20330)
+#20331=*
+tokeninfo(#20331,8,#20001,144,"{")
+#20332=@"loc,{#10000},17,16,17,16"
+locations_default(#20332,#10000,17,16,17,16)
+hasLocation(#20331,#20332)
+#20333=*
+tokeninfo(#20333,6,#20001,145,"set")
+#20334=@"loc,{#10000},17,18,17,20"
+locations_default(#20334,#10000,17,18,17,20)
+hasLocation(#20333,#20334)
+#20335=*
+tokeninfo(#20335,8,#20001,146,"=")
+#20336=@"loc,{#10000},17,22,17,22"
+locations_default(#20336,#10000,17,22,17,22)
+hasLocation(#20335,#20336)
+#20337=*
+tokeninfo(#20337,6,#20001,147,"v")
+#20338=@"loc,{#10000},17,24,17,24"
+locations_default(#20338,#10000,17,24,17,24)
+hasLocation(#20337,#20338)
+#20339=*
+tokeninfo(#20339,8,#20001,148,";")
+#20340=@"loc,{#10000},17,25,17,25"
+locations_default(#20340,#10000,17,25,17,25)
+hasLocation(#20339,#20340)
+#20341=*
+tokeninfo(#20341,8,#20001,149,"}")
+#20342=@"loc,{#10000},17,27,17,27"
+locations_default(#20342,#10000,17,27,17,27)
+hasLocation(#20341,#20342)
+#20343=*
+tokeninfo(#20343,8,#20001,150,",")
+#20344=@"loc,{#10000},17,28,17,28"
+locations_default(#20344,#10000,17,28,17,28)
+hasLocation(#20343,#20344)
+#20345=*
+tokeninfo(#20345,6,#20001,151,"get")
+#20346=@"loc,{#10000},18,3,18,5"
+locations_default(#20346,#10000,18,3,18,5)
+hasLocation(#20345,#20346)
+#20347=*
+tokeninfo(#20347,8,#20001,152,",")
+#20348=@"loc,{#10000},18,6,18,6"
+locations_default(#20348,#10000,18,6,18,6)
+hasLocation(#20347,#20348)
+#20349=*
+tokeninfo(#20349,6,#20001,153,"set")
+#20350=@"loc,{#10000},19,3,19,5"
+locations_default(#20350,#10000,19,3,19,5)
+hasLocation(#20349,#20350)
+#20351=*
+tokeninfo(#20351,8,#20001,154,"}")
+#20352=@"loc,{#10000},20,1,20,1"
+locations_default(#20352,#10000,20,1,20,1)
+hasLocation(#20351,#20352)
+#20353=*
+tokeninfo(#20353,8,#20001,155,")")
+#20354=@"loc,{#10000},20,2,20,2"
+locations_default(#20354,#10000,20,2,20,2)
+hasLocation(#20353,#20354)
+#20355=*
+tokeninfo(#20355,8,#20001,156,";")
+#20356=@"loc,{#10000},20,3,20,3"
+locations_default(#20356,#10000,20,3,20,3)
+hasLocation(#20355,#20356)
+#20357=*
+tokeninfo(#20357,8,#20001,157,"(")
+#20358=@"loc,{#10000},21,1,21,1"
+locations_default(#20358,#10000,21,1,21,1)
+hasLocation(#20357,#20358)
+#20359=*
+tokeninfo(#20359,8,#20001,158,"{")
+#20360=@"loc,{#10000},21,2,21,2"
+locations_default(#20360,#10000,21,2,21,2)
+hasLocation(#20359,#20360)
+#20361=*
+tokeninfo(#20361,6,#20001,159,"get")
+#20362=@"loc,{#10000},21,4,21,6"
+locations_default(#20362,#10000,21,4,21,6)
+hasLocation(#20361,#20362)
+#20363=*
+tokeninfo(#20363,8,#20001,160,"(")
+#20364=@"loc,{#10000},21,7,21,7"
+locations_default(#20364,#10000,21,7,21,7)
+hasLocation(#20363,#20364)
+#20365=*
+tokeninfo(#20365,8,#20001,161,")")
+#20366=@"loc,{#10000},21,8,21,8"
+locations_default(#20366,#10000,21,8,21,8)
+hasLocation(#20365,#20366)
+#20367=*
+tokeninfo(#20367,8,#20001,162,"{")
+#20368=@"loc,{#10000},21,10,21,10"
+locations_default(#20368,#10000,21,10,21,10)
+hasLocation(#20367,#20368)
+#20369=*
+tokeninfo(#20369,8,#20001,163,"}")
+#20370=@"loc,{#10000},21,11,21,11"
+locations_default(#20370,#10000,21,11,21,11)
+hasLocation(#20369,#20370)
+#20371=*
+tokeninfo(#20371,8,#20001,164,",")
+#20372=@"loc,{#10000},21,12,21,12"
+locations_default(#20372,#10000,21,12,21,12)
+hasLocation(#20371,#20372)
+#20373=*
+tokeninfo(#20373,6,#20001,165,"set")
+#20374=@"loc,{#10000},21,14,21,16"
+locations_default(#20374,#10000,21,14,21,16)
+hasLocation(#20373,#20374)
+#20375=*
+tokeninfo(#20375,8,#20001,166,"(")
+#20376=@"loc,{#10000},21,17,21,17"
+locations_default(#20376,#10000,21,17,21,17)
+hasLocation(#20375,#20376)
+#20377=*
+tokeninfo(#20377,6,#20001,167,"value")
+#20378=@"loc,{#10000},21,18,21,22"
+locations_default(#20378,#10000,21,18,21,22)
+hasLocation(#20377,#20378)
+#20379=*
+tokeninfo(#20379,8,#20001,168,")")
+#20380=@"loc,{#10000},21,23,21,23"
+locations_default(#20380,#10000,21,23,21,23)
+hasLocation(#20379,#20380)
+#20381=*
+tokeninfo(#20381,8,#20001,169,"{")
+#20382=@"loc,{#10000},21,25,21,25"
+locations_default(#20382,#10000,21,25,21,25)
+hasLocation(#20381,#20382)
+#20383=*
+tokeninfo(#20383,8,#20001,170,"}")
+#20384=@"loc,{#10000},21,26,21,26"
+locations_default(#20384,#10000,21,26,21,26)
+hasLocation(#20383,#20384)
+#20385=*
+tokeninfo(#20385,8,#20001,171,"}")
+#20386=@"loc,{#10000},21,28,21,28"
+locations_default(#20386,#10000,21,28,21,28)
+hasLocation(#20385,#20386)
+#20387=*
+tokeninfo(#20387,8,#20001,172,")")
+#20388=@"loc,{#10000},21,29,21,29"
+locations_default(#20388,#10000,21,29,21,29)
+hasLocation(#20387,#20388)
+#20389=*
+tokeninfo(#20389,8,#20001,173,";")
+#20390=@"loc,{#10000},21,30,21,30"
+locations_default(#20390,#10000,21,30,21,30)
+hasLocation(#20389,#20390)
+#20391=*
+tokeninfo(#20391,0,#20001,174,"")
+#20392=@"loc,{#10000},21,31,21,30"
+locations_default(#20392,#10000,21,31,21,30)
+hasLocation(#20391,#20392)
+toplevels(#20001,0)
+#20393=@"loc,{#10000},1,1,21,30"
+locations_default(#20393,#10000,1,1,21,30)
+hasLocation(#20001,#20393)
+#20394=@"var;{defaults};{#20000}"
+variables(#20394,"defaults",#20000)
+#20395=@"var;{example};{#20000}"
+variables(#20395,"example",#20000)
+#20396=@"var;{get};{#20000}"
+variables(#20396,"get",#20000)
+#20397=@"var;{set};{#20000}"
+variables(#20397,"set",#20000)
+#20398=@"var;{this};{#20000}"
+variables(#20398,"this",#20000)
+#20399=*
+stmts(#20399,2,#20001,0,"({x = 1}) => x;")
+hasLocation(#20399,#20003)
+stmt_containers(#20399,#20001)
+#20400=*
+exprs(#20400,65,#20399,0,"({x = 1}) => x")
+#20401=@"loc,{#10000},1,1,1,14"
+locations_default(#20401,#10000,1,1,1,14)
+hasLocation(#20400,#20401)
+enclosing_stmt(#20400,#20399)
+expr_containers(#20400,#20001)
+#20402=*
+scopes(#20402,1)
+scopenodes(#20400,#20402)
+scopenesting(#20402,#20000)
+#20403=@"var;{x};{#20402}"
+variables(#20403,"x",#20402)
+#20404=*
+exprs(#20404,68,#20400,0,"{x = 1}")
+#20405=@"loc,{#10000},1,2,1,8"
+locations_default(#20405,#10000,1,2,1,8)
+hasLocation(#20404,#20405)
+expr_containers(#20404,#20400)
+#20406=*
+properties(#20406,#20404,0,0,"x = 1")
+#20407=@"loc,{#10000},1,3,1,7"
+locations_default(#20407,#10000,1,3,1,7)
+hasLocation(#20406,#20407)
+#20408=*
+exprs(#20408,0,#20406,0,"x")
+hasLocation(#20408,#20049)
+expr_containers(#20408,#20400)
+literals("x","x",#20408)
+#20409=*
+exprs(#20409,78,#20406,1,"x")
+hasLocation(#20409,#20049)
+expr_containers(#20409,#20400)
+literals("x","x",#20409)
+decl(#20409,#20403)
+#20410=*
+exprs(#20410,3,#20406,2,"1")
+hasLocation(#20410,#20053)
+expr_containers(#20410,#20400)
+literals("1","1",#20410)
+#20411=*
+exprs(#20411,79,#20400,-2,"x")
+hasLocation(#20411,#20061)
+expr_containers(#20411,#20400)
+literals("x","x",#20411)
+bind(#20411,#20403)
+#20412=*
+stmts(#20412,22,#20001,1,"const e ... t };\n};")
+#20413=@"loc,{#10000},3,1,5,2"
+locations_default(#20413,#10000,3,1,5,2)
+hasLocation(#20412,#20413)
+stmt_containers(#20412,#20001)
+#20414=*
+exprs(#20414,64,#20412,0,"example ... et };\n}")
+#20415=@"loc,{#10000},3,7,5,1"
+locations_default(#20415,#10000,3,7,5,1)
+hasLocation(#20414,#20415)
+enclosing_stmt(#20414,#20412)
+expr_containers(#20414,#20001)
+#20416=*
+exprs(#20416,78,#20414,0,"example")
+hasLocation(#20416,#20067)
+enclosing_stmt(#20416,#20412)
+expr_containers(#20416,#20001)
+literals("example","example",#20416)
+decl(#20416,#20395)
+#20417=*
+exprs(#20417,65,#20414,1,"({ set  ... et };\n}")
+#20418=@"loc,{#10000},3,17,5,1"
+locations_default(#20418,#10000,3,17,5,1)
+hasLocation(#20417,#20418)
+enclosing_stmt(#20417,#20412)
+expr_containers(#20417,#20001)
+#20419=*
+scopes(#20419,1)
+scopenodes(#20417,#20419)
+scopenesting(#20419,#20000)
+#20420=@"var;{set};{#20419}"
+variables(#20420,"set",#20419)
+#20421=@"var;{unset};{#20419}"
+variables(#20421,"unset",#20419)
+#20422=*
+exprs(#20422,68,#20417,0,"{ set = ...  = [] }")
+#20423=@"loc,{#10000},3,18,3,41"
+locations_default(#20423,#10000,3,18,3,41)
+hasLocation(#20422,#20423)
+expr_containers(#20422,#20417)
+#20424=*
+properties(#20424,#20422,0,0,"set = {}")
+#20425=@"loc,{#10000},3,20,3,27"
+locations_default(#20425,#10000,3,20,3,27)
+hasLocation(#20424,#20425)
+#20426=*
+exprs(#20426,0,#20424,0,"set")
+hasLocation(#20426,#20075)
+expr_containers(#20426,#20417)
+literals("set","set",#20426)
+#20427=*
+exprs(#20427,78,#20424,1,"set")
+hasLocation(#20427,#20075)
+expr_containers(#20427,#20417)
+literals("set","set",#20427)
+decl(#20427,#20420)
+#20428=*
+exprs(#20428,8,#20424,2,"{}")
+#20429=@"loc,{#10000},3,26,3,27"
+locations_default(#20429,#10000,3,26,3,27)
+hasLocation(#20428,#20429)
+expr_containers(#20428,#20417)
+#20430=*
+properties(#20430,#20422,1,0,"unset = []")
+#20431=@"loc,{#10000},3,30,3,39"
+locations_default(#20431,#10000,3,30,3,39)
+hasLocation(#20430,#20431)
+#20432=*
+exprs(#20432,0,#20430,0,"unset")
+hasLocation(#20432,#20085)
+expr_containers(#20432,#20417)
+literals("unset","unset",#20432)
+#20433=*
+exprs(#20433,78,#20430,1,"unset")
+hasLocation(#20433,#20085)
+expr_containers(#20433,#20417)
+literals("unset","unset",#20433)
+decl(#20433,#20421)
+#20434=*
+exprs(#20434,7,#20430,2,"[]")
+#20435=@"loc,{#10000},3,38,3,39"
+locations_default(#20435,#10000,3,38,3,39)
+hasLocation(#20434,#20435)
+expr_containers(#20434,#20417)
+array_size(#20434,0)
+#20436=@"var;{replacements};{#20419}"
+variables(#20436,"replacements",#20419)
+#20437=*
+exprs(#20437,78,#20417,1,"replacements")
+hasLocation(#20437,#20097)
+expr_containers(#20437,#20417)
+literals("replacements","replacements",#20437)
+decl(#20437,#20436)
+#20438=*
+stmts(#20438,1,#20417,-2,"{\n  ret ... et };\n}")
+#20439=@"loc,{#10000},3,61,5,1"
+locations_default(#20439,#10000,3,61,5,1)
+hasLocation(#20438,#20439)
+stmt_containers(#20438,#20417)
+#20440=*
+stmts(#20440,9,#20438,0,"return  ... nset };")
+#20441=@"loc,{#10000},4,3,4,24"
+locations_default(#20441,#10000,4,3,4,24)
+hasLocation(#20440,#20441)
+stmt_containers(#20440,#20417)
+#20442=*
+exprs(#20442,8,#20440,0,"{ set, unset }")
+#20443=@"loc,{#10000},4,10,4,23"
+locations_default(#20443,#10000,4,10,4,23)
+hasLocation(#20442,#20443)
+enclosing_stmt(#20442,#20440)
+expr_containers(#20442,#20417)
+#20444=*
+properties(#20444,#20442,0,0,"set")
+hasLocation(#20444,#20109)
+#20445=*
+exprs(#20445,0,#20444,0,"set")
+hasLocation(#20445,#20109)
+enclosing_stmt(#20445,#20440)
+expr_containers(#20445,#20417)
+literals("set","set",#20445)
+#20446=*
+exprs(#20446,79,#20444,1,"set")
+hasLocation(#20446,#20109)
+enclosing_stmt(#20446,#20440)
+expr_containers(#20446,#20417)
+literals("set","set",#20446)
+bind(#20446,#20420)
+#20447=*
+properties(#20447,#20442,1,0,"unset")
+hasLocation(#20447,#20113)
+#20448=*
+exprs(#20448,0,#20447,0,"unset")
+hasLocation(#20448,#20113)
+enclosing_stmt(#20448,#20440)
+expr_containers(#20448,#20417)
+literals("unset","unset",#20448)
+#20449=*
+exprs(#20449,79,#20447,1,"unset")
+hasLocation(#20449,#20113)
+enclosing_stmt(#20449,#20440)
+expr_containers(#20449,#20417)
+literals("unset","unset",#20449)
+bind(#20449,#20421)
+#20450=*
+stmts(#20450,2,#20001,2,"({ get  ... set });")
+hasLocation(#20450,#20013)
+stmt_containers(#20450,#20001)
+#20451=*
+exprs(#20451,65,#20450,0,"({ get  ...  set })")
+#20452=@"loc,{#10000},6,1,6,42"
+locations_default(#20452,#10000,6,1,6,42)
+hasLocation(#20451,#20452)
+enclosing_stmt(#20451,#20450)
+expr_containers(#20451,#20001)
+#20453=*
+scopes(#20453,1)
+scopenodes(#20451,#20453)
+scopenesting(#20453,#20000)
+#20454=@"var;{get};{#20453}"
+variables(#20454,"get",#20453)
+#20455=@"var;{set};{#20453}"
+variables(#20455,"set",#20453)
+#20456=*
+exprs(#20456,68,#20451,0,"{ get = ...  = [] }")
+#20457=@"loc,{#10000},6,2,6,23"
+locations_default(#20457,#10000,6,2,6,23)
+hasLocation(#20456,#20457)
+expr_containers(#20456,#20451)
+#20458=*
+properties(#20458,#20456,0,0,"get = {}")
+#20459=@"loc,{#10000},6,4,6,11"
+locations_default(#20459,#10000,6,4,6,11)
+hasLocation(#20458,#20459)
+#20460=*
+exprs(#20460,0,#20458,0,"get")
+hasLocation(#20460,#20127)
+expr_containers(#20460,#20451)
+literals("get","get",#20460)
+#20461=*
+exprs(#20461,78,#20458,1,"get")
+hasLocation(#20461,#20127)
+expr_containers(#20461,#20451)
+literals("get","get",#20461)
+decl(#20461,#20454)
+#20462=*
+exprs(#20462,8,#20458,2,"{}")
+#20463=@"loc,{#10000},6,10,6,11"
+locations_default(#20463,#10000,6,10,6,11)
+hasLocation(#20462,#20463)
+expr_containers(#20462,#20451)
+#20464=*
+properties(#20464,#20456,1,0,"set = []")
+#20465=@"loc,{#10000},6,14,6,21"
+locations_default(#20465,#10000,6,14,6,21)
+hasLocation(#20464,#20465)
+#20466=*
+exprs(#20466,0,#20464,0,"set")
+hasLocation(#20466,#20137)
+expr_containers(#20466,#20451)
+literals("set","set",#20466)
+#20467=*
+exprs(#20467,78,#20464,1,"set")
+hasLocation(#20467,#20137)
+expr_containers(#20467,#20451)
+literals("set","set",#20467)
+decl(#20467,#20455)
+#20468=*
+exprs(#20468,7,#20464,2,"[]")
+#20469=@"loc,{#10000},6,20,6,21"
+locations_default(#20469,#10000,6,20,6,21)
+hasLocation(#20468,#20469)
+expr_containers(#20468,#20451)
+array_size(#20468,0)
+#20470=*
+exprs(#20470,63,#20451,-2,"({ get, set })")
+#20471=@"loc,{#10000},6,29,6,42"
+locations_default(#20471,#10000,6,29,6,42)
+hasLocation(#20470,#20471)
+expr_containers(#20470,#20451)
+#20472=*
+exprs(#20472,8,#20470,0,"{ get, set }")
+#20473=@"loc,{#10000},6,30,6,41"
+locations_default(#20473,#10000,6,30,6,41)
+hasLocation(#20472,#20473)
+expr_containers(#20472,#20451)
+#20474=*
+properties(#20474,#20472,0,0,"get")
+hasLocation(#20474,#20155)
+#20475=*
+exprs(#20475,0,#20474,0,"get")
+hasLocation(#20475,#20155)
+expr_containers(#20475,#20451)
+literals("get","get",#20475)
+#20476=*
+exprs(#20476,79,#20474,1,"get")
+hasLocation(#20476,#20155)
+expr_containers(#20476,#20451)
+literals("get","get",#20476)
+bind(#20476,#20454)
+#20477=*
+properties(#20477,#20472,1,0,"set")
+hasLocation(#20477,#20159)
+#20478=*
+exprs(#20478,0,#20477,0,"set")
+hasLocation(#20478,#20159)
+expr_containers(#20478,#20451)
+literals("set","set",#20478)
+#20479=*
+exprs(#20479,79,#20477,1,"set")
+hasLocation(#20479,#20159)
+expr_containers(#20479,#20451)
+literals("set","set",#20479)
+bind(#20479,#20455)
+#20480=*
+stmts(#20480,2,#20001,3,"async ( ... set });")
+hasLocation(#20480,#20015)
+stmt_containers(#20480,#20001)
+#20481=*
+exprs(#20481,65,#20480,0,"async ( ...  set })")
+#20482=@"loc,{#10000},7,1,7,51"
+locations_default(#20482,#10000,7,1,7,51)
+hasLocation(#20481,#20482)
+enclosing_stmt(#20481,#20480)
+expr_containers(#20481,#20001)
+#20483=*
+scopes(#20483,1)
+scopenodes(#20481,#20483)
+scopenesting(#20483,#20000)
+#20484=@"var;{get};{#20483}"
+variables(#20484,"get",#20483)
+#20485=@"var;{set};{#20483}"
+variables(#20485,"set",#20483)
+#20486=*
+exprs(#20486,68,#20481,0,"{ get = 1, set = 2 }")
+#20487=@"loc,{#10000},7,8,7,27"
+locations_default(#20487,#10000,7,8,7,27)
+hasLocation(#20486,#20487)
+expr_containers(#20486,#20481)
+#20488=*
+properties(#20488,#20486,0,0,"get = 1")
+#20489=@"loc,{#10000},7,10,7,16"
+locations_default(#20489,#10000,7,10,7,16)
+hasLocation(#20488,#20489)
+#20490=*
+exprs(#20490,0,#20488,0,"get")
+hasLocation(#20490,#20173)
+expr_containers(#20490,#20481)
+literals("get","get",#20490)
+#20491=*
+exprs(#20491,78,#20488,1,"get")
+hasLocation(#20491,#20173)
+expr_containers(#20491,#20481)
+literals("get","get",#20491)
+decl(#20491,#20484)
+#20492=*
+exprs(#20492,3,#20488,2,"1")
+hasLocation(#20492,#20177)
+expr_containers(#20492,#20481)
+literals("1","1",#20492)
+#20493=*
+properties(#20493,#20486,1,0,"set = 2")
+#20494=@"loc,{#10000},7,19,7,25"
+locations_default(#20494,#10000,7,19,7,25)
+hasLocation(#20493,#20494)
+#20495=*
+exprs(#20495,0,#20493,0,"set")
+hasLocation(#20495,#20181)
+expr_containers(#20495,#20481)
+literals("set","set",#20495)
+#20496=*
+exprs(#20496,78,#20493,1,"set")
+hasLocation(#20496,#20181)
+expr_containers(#20496,#20481)
+literals("set","set",#20496)
+decl(#20496,#20485)
+#20497=*
+exprs(#20497,3,#20493,2,"2")
+hasLocation(#20497,#20185)
+expr_containers(#20497,#20481)
+literals("2","2",#20497)
+#20498=*
+exprs(#20498,8,#20481,-5,"{}")
+#20499=@"loc,{#10000},7,31,7,32"
+locations_default(#20499,#10000,7,31,7,32)
+hasLocation(#20498,#20499)
+expr_containers(#20498,#20481)
+is_async(#20481)
+#20500=*
+exprs(#20500,63,#20481,-2,"({ get, set })")
+#20501=@"loc,{#10000},7,38,7,51"
+locations_default(#20501,#10000,7,38,7,51)
+hasLocation(#20500,#20501)
+expr_containers(#20500,#20481)
+#20502=*
+exprs(#20502,8,#20500,0,"{ get, set }")
+#20503=@"loc,{#10000},7,39,7,50"
+locations_default(#20503,#10000,7,39,7,50)
+hasLocation(#20502,#20503)
+expr_containers(#20502,#20481)
+#20504=*
+properties(#20504,#20502,0,0,"get")
+hasLocation(#20504,#20203)
+#20505=*
+exprs(#20505,0,#20504,0,"get")
+hasLocation(#20505,#20203)
+expr_containers(#20505,#20481)
+literals("get","get",#20505)
+#20506=*
+exprs(#20506,79,#20504,1,"get")
+hasLocation(#20506,#20203)
+expr_containers(#20506,#20481)
+literals("get","get",#20506)
+bind(#20506,#20484)
+#20507=*
+properties(#20507,#20502,1,0,"set")
+hasLocation(#20507,#20207)
+#20508=*
+exprs(#20508,0,#20507,0,"set")
+hasLocation(#20508,#20207)
+expr_containers(#20508,#20481)
+literals("set","set",#20508)
+#20509=*
+exprs(#20509,79,#20507,1,"set")
+hasLocation(#20509,#20207)
+expr_containers(#20509,#20481)
+literals("set","set",#20509)
+bind(#20509,#20485)
+#20510=*
+stmts(#20510,23,#20001,4,"let get, set;")
+hasLocation(#20510,#20019)
+stmt_containers(#20510,#20001)
+#20511=*
+exprs(#20511,64,#20510,0,"get")
+hasLocation(#20511,#20217)
+enclosing_stmt(#20511,#20510)
+expr_containers(#20511,#20001)
+#20512=*
+exprs(#20512,78,#20511,0,"get")
+hasLocation(#20512,#20217)
+enclosing_stmt(#20512,#20510)
+expr_containers(#20512,#20001)
+literals("get","get",#20512)
+decl(#20512,#20396)
+#20513=*
+exprs(#20513,64,#20510,1,"set")
+hasLocation(#20513,#20221)
+enclosing_stmt(#20513,#20510)
+expr_containers(#20513,#20001)
+#20514=*
+exprs(#20514,78,#20513,0,"set")
+hasLocation(#20514,#20221)
+enclosing_stmt(#20514,#20510)
+expr_containers(#20514,#20001)
+literals("set","set",#20514)
+decl(#20514,#20397)
+#20515=*
+stmts(#20515,2,#20001,5,"({ get  ...  = {});")
+hasLocation(#20515,#20021)
+stmt_containers(#20515,#20001)
+#20516=*
+exprs(#20516,63,#20515,0,"({ get  ... } = {})")
+#20517=@"loc,{#10000},10,1,10,27"
+locations_default(#20517,#10000,10,1,10,27)
+hasLocation(#20516,#20517)
+enclosing_stmt(#20516,#20515)
+expr_containers(#20516,#20001)
+#20518=*
+exprs(#20518,47,#20516,0,"{ get = ...  } = {}")
+#20519=@"loc,{#10000},10,2,10,26"
+locations_default(#20519,#10000,10,2,10,26)
+hasLocation(#20518,#20519)
+enclosing_stmt(#20518,#20515)
+expr_containers(#20518,#20001)
+#20520=*
+exprs(#20520,68,#20518,0,"{ get = 1, set = 2 }")
+#20521=@"loc,{#10000},10,2,10,21"
+locations_default(#20521,#10000,10,2,10,21)
+hasLocation(#20520,#20521)
+enclosing_stmt(#20520,#20515)
+expr_containers(#20520,#20001)
+#20522=*
+properties(#20522,#20520,0,0,"get = 1")
+#20523=@"loc,{#10000},10,4,10,10"
+locations_default(#20523,#10000,10,4,10,10)
+hasLocation(#20522,#20523)
+#20524=*
+exprs(#20524,0,#20522,0,"get")
+hasLocation(#20524,#20229)
+enclosing_stmt(#20524,#20515)
+expr_containers(#20524,#20001)
+literals("get","get",#20524)
+#20525=*
+exprs(#20525,79,#20522,1,"get")
+hasLocation(#20525,#20229)
+enclosing_stmt(#20525,#20515)
+expr_containers(#20525,#20001)
+literals("get","get",#20525)
+bind(#20525,#20396)
+#20526=*
+exprs(#20526,3,#20522,2,"1")
+hasLocation(#20526,#20233)
+enclosing_stmt(#20526,#20515)
+expr_containers(#20526,#20001)
+literals("1","1",#20526)
+#20527=*
+properties(#20527,#20520,1,0,"set = 2")
+#20528=@"loc,{#10000},10,13,10,19"
+locations_default(#20528,#10000,10,13,10,19)
+hasLocation(#20527,#20528)
+#20529=*
+exprs(#20529,0,#20527,0,"set")
+hasLocation(#20529,#20237)
+enclosing_stmt(#20529,#20515)
+expr_containers(#20529,#20001)
+literals("set","set",#20529)
+#20530=*
+exprs(#20530,79,#20527,1,"set")
+hasLocation(#20530,#20237)
+enclosing_stmt(#20530,#20515)
+expr_containers(#20530,#20001)
+literals("set","set",#20530)
+bind(#20530,#20397)
+#20531=*
+exprs(#20531,3,#20527,2,"2")
+hasLocation(#20531,#20241)
+enclosing_stmt(#20531,#20515)
+expr_containers(#20531,#20001)
+literals("2","2",#20531)
+#20532=*
+exprs(#20532,8,#20518,1,"{}")
+#20533=@"loc,{#10000},10,25,10,26"
+locations_default(#20533,#10000,10,25,10,26)
+hasLocation(#20532,#20533)
+enclosing_stmt(#20532,#20515)
+expr_containers(#20532,#20001)
+#20534=*
+stmts(#20534,17,#20001,6,"functio ... et };\n}")
+#20535=@"loc,{#10000},11,1,13,1"
+locations_default(#20535,#10000,11,1,13,1)
+hasLocation(#20534,#20535)
+stmt_containers(#20534,#20001)
+#20536=*
+exprs(#20536,78,#20534,-1,"defaults")
+hasLocation(#20536,#20257)
+expr_containers(#20536,#20534)
+literals("defaults","defaults",#20536)
+decl(#20536,#20394)
+#20537=*
+scopes(#20537,1)
+scopenodes(#20534,#20537)
+scopenesting(#20537,#20000)
+#20538=@"var;{this};{#20537}"
+variables(#20538,"this",#20537)
+#20539=@"var;{get};{#20537}"
+variables(#20539,"get",#20537)
+#20540=@"var;{set};{#20537}"
+variables(#20540,"set",#20537)
+#20541=*
+exprs(#20541,68,#20534,0,"{ get = 1, set = 2 }")
+#20542=@"loc,{#10000},11,19,11,38"
+locations_default(#20542,#10000,11,19,11,38)
+hasLocation(#20541,#20542)
+expr_containers(#20541,#20534)
+#20543=*
+properties(#20543,#20541,0,0,"get = 1")
+#20544=@"loc,{#10000},11,21,11,27"
+locations_default(#20544,#10000,11,21,11,27)
+hasLocation(#20543,#20544)
+#20545=*
+exprs(#20545,0,#20543,0,"get")
+hasLocation(#20545,#20263)
+expr_containers(#20545,#20534)
+literals("get","get",#20545)
+#20546=*
+exprs(#20546,78,#20543,1,"get")
+hasLocation(#20546,#20263)
+expr_containers(#20546,#20534)
+literals("get","get",#20546)
+decl(#20546,#20539)
+#20547=*
+exprs(#20547,3,#20543,2,"1")
+hasLocation(#20547,#20267)
+expr_containers(#20547,#20534)
+literals("1","1",#20547)
+#20548=*
+properties(#20548,#20541,1,0,"set = 2")
+#20549=@"loc,{#10000},11,30,11,36"
+locations_default(#20549,#10000,11,30,11,36)
+hasLocation(#20548,#20549)
+#20550=*
+exprs(#20550,0,#20548,0,"set")
+hasLocation(#20550,#20271)
+expr_containers(#20550,#20534)
+literals("set","set",#20550)
+#20551=*
+exprs(#20551,78,#20548,1,"set")
+hasLocation(#20551,#20271)
+expr_containers(#20551,#20534)
+literals("set","set",#20551)
+decl(#20551,#20540)
+#20552=*
+exprs(#20552,3,#20548,2,"2")
+hasLocation(#20552,#20275)
+expr_containers(#20552,#20534)
+literals("2","2",#20552)
+#20553=@"var;{arguments};{#20537}"
+variables(#20553,"arguments",#20537)
+is_arguments_object(#20553)
+#20554=*
+stmts(#20554,1,#20534,-2,"{\n  ret ... et };\n}")
+#20555=@"loc,{#10000},11,41,13,1"
+locations_default(#20555,#10000,11,41,13,1)
+hasLocation(#20554,#20555)
+stmt_containers(#20554,#20534)
+#20556=*
+stmts(#20556,9,#20554,0,"return { get, set };")
+#20557=@"loc,{#10000},12,3,12,22"
+locations_default(#20557,#10000,12,3,12,22)
+hasLocation(#20556,#20557)
+stmt_containers(#20556,#20534)
+#20558=*
+exprs(#20558,8,#20556,0,"{ get, set }")
+#20559=@"loc,{#10000},12,10,12,21"
+locations_default(#20559,#10000,12,10,12,21)
+hasLocation(#20558,#20559)
+enclosing_stmt(#20558,#20556)
+expr_containers(#20558,#20534)
+#20560=*
+properties(#20560,#20558,0,0,"get")
+hasLocation(#20560,#20287)
+#20561=*
+exprs(#20561,0,#20560,0,"get")
+hasLocation(#20561,#20287)
+enclosing_stmt(#20561,#20556)
+expr_containers(#20561,#20534)
+literals("get","get",#20561)
+#20562=*
+exprs(#20562,79,#20560,1,"get")
+hasLocation(#20562,#20287)
+enclosing_stmt(#20562,#20556)
+expr_containers(#20562,#20534)
+literals("get","get",#20562)
+bind(#20562,#20539)
+#20563=*
+properties(#20563,#20558,1,0,"set")
+hasLocation(#20563,#20291)
+#20564=*
+exprs(#20564,0,#20563,0,"set")
+hasLocation(#20564,#20291)
+enclosing_stmt(#20564,#20556)
+expr_containers(#20564,#20534)
+literals("set","set",#20564)
+#20565=*
+exprs(#20565,79,#20563,1,"set")
+hasLocation(#20565,#20291)
+enclosing_stmt(#20565,#20556)
+expr_containers(#20565,#20534)
+literals("set","set",#20565)
+bind(#20565,#20540)
+#20566=*
+stmts(#20566,2,#20001,7,"({\n  ge ... set\n});")
+#20567=@"loc,{#10000},15,1,20,3"
+locations_default(#20567,#10000,15,1,20,3)
+hasLocation(#20566,#20567)
+stmt_containers(#20566,#20001)
+#20568=*
+exprs(#20568,63,#20566,0,"({\n  ge ...  set\n})")
+#20569=@"loc,{#10000},15,1,20,2"
+locations_default(#20569,#10000,15,1,20,2)
+hasLocation(#20568,#20569)
+enclosing_stmt(#20568,#20566)
+expr_containers(#20568,#20001)
+#20570=*
+exprs(#20570,8,#20568,0,"{\n  get ...   set\n}")
+#20571=@"loc,{#10000},15,2,20,1"
+locations_default(#20571,#10000,15,2,20,1)
+hasLocation(#20570,#20571)
+enclosing_stmt(#20570,#20566)
+expr_containers(#20570,#20001)
+#20572=*
+properties(#20572,#20570,0,1,"get val ...  get; }")
+#20573=@"loc,{#10000},16,3,16,29"
+locations_default(#20573,#10000,16,3,16,29)
+hasLocation(#20572,#20573)
+#20574=*
+exprs(#20574,0,#20572,0,"value")
+hasLocation(#20574,#20304)
+enclosing_stmt(#20574,#20566)
+expr_containers(#20574,#20001)
+literals("value","value",#20574)
+#20575=*
+exprs(#20575,9,#20572,1,"() { return get; }")
+#20576=@"loc,{#10000},16,12,16,29"
+locations_default(#20576,#10000,16,12,16,29)
+hasLocation(#20575,#20576)
+enclosing_stmt(#20575,#20566)
+expr_containers(#20575,#20001)
+#20577=*
+scopes(#20577,1)
+scopenodes(#20575,#20577)
+scopenesting(#20577,#20000)
+#20578=@"var;{this};{#20577}"
+variables(#20578,"this",#20577)
+#20579=@"var;{arguments};{#20577}"
+variables(#20579,"arguments",#20577)
+is_arguments_object(#20579)
+#20580=*
+stmts(#20580,1,#20575,-2,"{ return get; }")
+#20581=@"loc,{#10000},16,15,16,29"
+locations_default(#20581,#10000,16,15,16,29)
+hasLocation(#20580,#20581)
+stmt_containers(#20580,#20575)
+#20582=*
+stmts(#20582,9,#20580,0,"return get;")
+#20583=@"loc,{#10000},16,17,16,27"
+locations_default(#20583,#10000,16,17,16,27)
+hasLocation(#20582,#20583)
+stmt_containers(#20582,#20575)
+#20584=*
+exprs(#20584,79,#20582,0,"get")
+hasLocation(#20584,#20314)
+enclosing_stmt(#20584,#20582)
+expr_containers(#20584,#20575)
+literals("get","get",#20584)
+bind(#20584,#20396)
+#20585=*
+properties(#20585,#20570,1,2,"set val ...  = v; }")
+#20586=@"loc,{#10000},17,3,17,27"
+locations_default(#20586,#10000,17,3,17,27)
+hasLocation(#20585,#20586)
+#20587=*
+exprs(#20587,0,#20585,0,"value")
+hasLocation(#20587,#20324)
+enclosing_stmt(#20587,#20566)
+expr_containers(#20587,#20001)
+literals("value","value",#20587)
+#20588=*
+exprs(#20588,9,#20585,1,"(v) { set = v; }")
+#20589=@"loc,{#10000},17,12,17,27"
+locations_default(#20589,#10000,17,12,17,27)
+hasLocation(#20588,#20589)
+enclosing_stmt(#20588,#20566)
+expr_containers(#20588,#20001)
+#20590=*
+scopes(#20590,1)
+scopenodes(#20588,#20590)
+scopenesting(#20590,#20000)
+#20591=@"var;{this};{#20590}"
+variables(#20591,"this",#20590)
+#20592=@"var;{v};{#20590}"
+variables(#20592,"v",#20590)
+#20593=*
+exprs(#20593,78,#20588,0,"v")
+hasLocation(#20593,#20328)
+expr_containers(#20593,#20588)
+literals("v","v",#20593)
+decl(#20593,#20592)
+#20594=@"var;{arguments};{#20590}"
+variables(#20594,"arguments",#20590)
+is_arguments_object(#20594)
+#20595=*
+stmts(#20595,1,#20588,-2,"{ set = v; }")
+#20596=@"loc,{#10000},17,16,17,27"
+locations_default(#20596,#10000,17,16,17,27)
+hasLocation(#20595,#20596)
+stmt_containers(#20595,#20588)
+#20597=*
+stmts(#20597,2,#20595,0,"set = v;")
+#20598=@"loc,{#10000},17,18,17,25"
+locations_default(#20598,#10000,17,18,17,25)
+hasLocation(#20597,#20598)
+stmt_containers(#20597,#20588)
+#20599=*
+exprs(#20599,47,#20597,0,"set = v")
+#20600=@"loc,{#10000},17,18,17,24"
+locations_default(#20600,#10000,17,18,17,24)
+hasLocation(#20599,#20600)
+enclosing_stmt(#20599,#20597)
+expr_containers(#20599,#20588)
+#20601=*
+exprs(#20601,79,#20599,0,"set")
+hasLocation(#20601,#20334)
+enclosing_stmt(#20601,#20597)
+expr_containers(#20601,#20588)
+literals("set","set",#20601)
+bind(#20601,#20397)
+#20602=*
+exprs(#20602,79,#20599,1,"v")
+hasLocation(#20602,#20338)
+enclosing_stmt(#20602,#20597)
+expr_containers(#20602,#20588)
+literals("v","v",#20602)
+bind(#20602,#20592)
+#20603=*
+properties(#20603,#20570,2,0,"get")
+hasLocation(#20603,#20346)
+#20604=*
+exprs(#20604,0,#20603,0,"get")
+hasLocation(#20604,#20346)
+enclosing_stmt(#20604,#20566)
+expr_containers(#20604,#20001)
+literals("get","get",#20604)
+#20605=*
+exprs(#20605,79,#20603,1,"get")
+hasLocation(#20605,#20346)
+enclosing_stmt(#20605,#20566)
+expr_containers(#20605,#20001)
+literals("get","get",#20605)
+bind(#20605,#20396)
+#20606=*
+properties(#20606,#20570,3,0,"set")
+hasLocation(#20606,#20350)
+#20607=*
+exprs(#20607,0,#20606,0,"set")
+hasLocation(#20607,#20350)
+enclosing_stmt(#20607,#20566)
+expr_containers(#20607,#20001)
+literals("set","set",#20607)
+#20608=*
+exprs(#20608,79,#20606,1,"set")
+hasLocation(#20608,#20350)
+enclosing_stmt(#20608,#20566)
+expr_containers(#20608,#20001)
+literals("set","set",#20608)
+bind(#20608,#20397)
+#20609=*
+stmts(#20609,2,#20001,8,"({ get( ...  {} });")
+hasLocation(#20609,#20043)
+stmt_containers(#20609,#20001)
+#20610=*
+exprs(#20610,63,#20609,0,"({ get( ... ) {} })")
+#20611=@"loc,{#10000},21,1,21,29"
+locations_default(#20611,#10000,21,1,21,29)
+hasLocation(#20610,#20611)
+enclosing_stmt(#20610,#20609)
+expr_containers(#20610,#20001)
+#20612=*
+exprs(#20612,8,#20610,0,"{ get() ... e) {} }")
+#20613=@"loc,{#10000},21,2,21,28"
+locations_default(#20613,#10000,21,2,21,28)
+hasLocation(#20612,#20613)
+enclosing_stmt(#20612,#20609)
+expr_containers(#20612,#20001)
+#20614=*
+properties(#20614,#20612,0,0,"get() {}")
+#20615=@"loc,{#10000},21,4,21,11"
+locations_default(#20615,#10000,21,4,21,11)
+hasLocation(#20614,#20615)
+#20616=*
+exprs(#20616,0,#20614,0,"get")
+hasLocation(#20616,#20362)
+enclosing_stmt(#20616,#20609)
+expr_containers(#20616,#20001)
+literals("get","get",#20616)
+#20617=*
+exprs(#20617,9,#20614,1,"() {}")
+#20618=@"loc,{#10000},21,7,21,11"
+locations_default(#20618,#10000,21,7,21,11)
+hasLocation(#20617,#20618)
+enclosing_stmt(#20617,#20609)
+expr_containers(#20617,#20001)
+#20619=*
+scopes(#20619,1)
+scopenodes(#20617,#20619)
+scopenesting(#20619,#20000)
+#20620=@"var;{this};{#20619}"
+variables(#20620,"this",#20619)
+#20621=@"var;{arguments};{#20619}"
+variables(#20621,"arguments",#20619)
+is_arguments_object(#20621)
+#20622=*
+stmts(#20622,1,#20617,-2,"{}")
+#20623=@"loc,{#10000},21,10,21,11"
+locations_default(#20623,#10000,21,10,21,11)
+hasLocation(#20622,#20623)
+stmt_containers(#20622,#20617)
+is_method(#20614)
+#20624=*
+properties(#20624,#20612,1,0,"set(value) {}")
+#20625=@"loc,{#10000},21,14,21,26"
+locations_default(#20625,#10000,21,14,21,26)
+hasLocation(#20624,#20625)
+#20626=*
+exprs(#20626,0,#20624,0,"set")
+hasLocation(#20626,#20374)
+enclosing_stmt(#20626,#20609)
+expr_containers(#20626,#20001)
+literals("set","set",#20626)
+#20627=*
+exprs(#20627,9,#20624,1,"(value) {}")
+#20628=@"loc,{#10000},21,17,21,26"
+locations_default(#20628,#10000,21,17,21,26)
+hasLocation(#20627,#20628)
+enclosing_stmt(#20627,#20609)
+expr_containers(#20627,#20001)
+#20629=*
+scopes(#20629,1)
+scopenodes(#20627,#20629)
+scopenesting(#20629,#20000)
+#20630=@"var;{this};{#20629}"
+variables(#20630,"this",#20629)
+#20631=@"var;{value};{#20629}"
+variables(#20631,"value",#20629)
+#20632=*
+exprs(#20632,78,#20627,0,"value")
+hasLocation(#20632,#20378)
+expr_containers(#20632,#20627)
+literals("value","value",#20632)
+decl(#20632,#20631)
+#20633=@"var;{arguments};{#20629}"
+variables(#20633,"arguments",#20629)
+is_arguments_object(#20633)
+#20634=*
+stmts(#20634,1,#20627,-2,"{}")
+#20635=@"loc,{#10000},21,25,21,26"
+locations_default(#20635,#10000,21,25,21,26)
+hasLocation(#20634,#20635)
+stmt_containers(#20634,#20627)
+is_method(#20624)
+#20636=*
+entry_cfg_node(#20636,#20001)
+#20637=@"loc,{#10000},1,1,1,0"
+locations_default(#20637,#10000,1,1,1,0)
+hasLocation(#20636,#20637)
+#20638=*
+exit_cfg_node(#20638,#20001)
+hasLocation(#20638,#20392)
+successor(#20609,#20610)
+successor(#20610,#20612)
+successor(#20612,#20616)
+successor(#20627,#20624)
+#20639=*
+entry_cfg_node(#20639,#20627)
+#20640=@"loc,{#10000},21,17,21,16"
+locations_default(#20640,#10000,21,17,21,16)
+hasLocation(#20639,#20640)
+#20641=*
+exit_cfg_node(#20641,#20627)
+#20642=@"loc,{#10000},21,27,21,26"
+locations_default(#20642,#10000,21,27,21,26)
+hasLocation(#20641,#20642)
+successor(#20634,#20641)
+successor(#20632,#20634)
+successor(#20639,#20632)
+successor(#20626,#20627)
+successor(#20624,#20638)
+successor(#20617,#20614)
+#20643=*
+entry_cfg_node(#20643,#20617)
+#20644=@"loc,{#10000},21,7,21,6"
+locations_default(#20644,#10000,21,7,21,6)
+hasLocation(#20643,#20644)
+#20645=*
+exit_cfg_node(#20645,#20617)
+#20646=@"loc,{#10000},21,12,21,11"
+locations_default(#20646,#10000,21,12,21,11)
+hasLocation(#20645,#20646)
+successor(#20622,#20645)
+successor(#20643,#20622)
+successor(#20616,#20617)
+successor(#20614,#20626)
+successor(#20566,#20568)
+successor(#20568,#20570)
+successor(#20570,#20574)
+successor(#20608,#20606)
+successor(#20607,#20608)
+successor(#20606,#20609)
+successor(#20605,#20603)
+successor(#20604,#20605)
+successor(#20603,#20607)
+successor(#20588,#20585)
+#20647=*
+entry_cfg_node(#20647,#20588)
+#20648=@"loc,{#10000},17,12,17,11"
+locations_default(#20648,#10000,17,12,17,11)
+hasLocation(#20647,#20648)
+#20649=*
+exit_cfg_node(#20649,#20588)
+#20650=@"loc,{#10000},17,28,17,27"
+locations_default(#20650,#10000,17,28,17,27)
+hasLocation(#20649,#20650)
+successor(#20597,#20601)
+successor(#20602,#20599)
+successor(#20601,#20602)
+successor(#20599,#20649)
+successor(#20595,#20597)
+successor(#20593,#20595)
+successor(#20647,#20593)
+successor(#20587,#20588)
+successor(#20585,#20604)
+successor(#20575,#20572)
+#20651=*
+entry_cfg_node(#20651,#20575)
+#20652=@"loc,{#10000},16,12,16,11"
+locations_default(#20652,#10000,16,12,16,11)
+hasLocation(#20651,#20652)
+#20653=*
+exit_cfg_node(#20653,#20575)
+#20654=@"loc,{#10000},16,30,16,29"
+locations_default(#20654,#10000,16,30,16,29)
+hasLocation(#20653,#20654)
+successor(#20584,#20582)
+successor(#20582,#20653)
+successor(#20580,#20584)
+successor(#20651,#20580)
+successor(#20574,#20575)
+successor(#20572,#20587)
+successor(#20534,#20566)
+#20655=*
+entry_cfg_node(#20655,#20534)
+#20656=@"loc,{#10000},11,1,11,0"
+locations_default(#20656,#10000,11,1,11,0)
+hasLocation(#20655,#20656)
+#20657=*
+exit_cfg_node(#20657,#20534)
+#20658=@"loc,{#10000},13,2,13,1"
+locations_default(#20658,#10000,13,2,13,1)
+hasLocation(#20657,#20658)
+successor(#20558,#20561)
+successor(#20565,#20563)
+successor(#20564,#20565)
+successor(#20563,#20556)
+successor(#20562,#20560)
+successor(#20561,#20562)
+successor(#20560,#20564)
+successor(#20556,#20657)
+successor(#20554,#20558)
+successor(#20541,#20545)
+successor(#20552,#20548)
+successor(#20551,#20552)
+successor(#20550,#20551)
+successor(#20548,#20554)
+successor(#20547,#20543)
+successor(#20546,#20547)
+successor(#20545,#20546)
+successor(#20543,#20550)
+successor(#20655,#20541)
+successor(#20515,#20516)
+successor(#20516,#20532)
+successor(#20520,#20524)
+successor(#20531,#20527)
+successor(#20530,#20531)
+successor(#20529,#20530)
+successor(#20527,#20518)
+successor(#20526,#20522)
+successor(#20525,#20526)
+successor(#20524,#20525)
+successor(#20522,#20529)
+successor(#20532,#20520)
+successor(#20518,#20534)
+successor(#20510,#20512)
+successor(#20514,#20513)
+successor(#20513,#20515)
+successor(#20512,#20511)
+successor(#20511,#20514)
+successor(#20480,#20481)
+successor(#20481,#20510)
+#20659=*
+entry_cfg_node(#20659,#20481)
+#20660=@"loc,{#10000},7,1,7,0"
+locations_default(#20660,#10000,7,1,7,0)
+hasLocation(#20659,#20660)
+#20661=*
+exit_cfg_node(#20661,#20481)
+#20662=@"loc,{#10000},7,52,7,51"
+locations_default(#20662,#10000,7,52,7,51)
+hasLocation(#20661,#20662)
+successor(#20500,#20502)
+successor(#20502,#20505)
+successor(#20509,#20507)
+successor(#20508,#20509)
+successor(#20507,#20661)
+successor(#20506,#20504)
+successor(#20505,#20506)
+successor(#20504,#20508)
+successor(#20486,#20490)
+successor(#20497,#20493)
+successor(#20496,#20497)
+successor(#20495,#20496)
+successor(#20493,#20500)
+successor(#20492,#20488)
+successor(#20491,#20492)
+successor(#20490,#20491)
+successor(#20488,#20495)
+successor(#20498,#20486)
+successor(#20659,#20498)
+successor(#20450,#20451)
+successor(#20451,#20480)
+#20663=*
+entry_cfg_node(#20663,#20451)
+#20664=@"loc,{#10000},6,1,6,0"
+locations_default(#20664,#10000,6,1,6,0)
+hasLocation(#20663,#20664)
+#20665=*
+exit_cfg_node(#20665,#20451)
+#20666=@"loc,{#10000},6,43,6,42"
+locations_default(#20666,#10000,6,43,6,42)
+hasLocation(#20665,#20666)
+successor(#20470,#20472)
+successor(#20472,#20475)
+successor(#20479,#20477)
+successor(#20478,#20479)
+successor(#20477,#20665)
+successor(#20476,#20474)
+successor(#20475,#20476)
+successor(#20474,#20478)
+successor(#20456,#20460)
+successor(#20468,#20464)
+successor(#20467,#20468)
+successor(#20466,#20467)
+successor(#20464,#20470)
+successor(#20462,#20458)
+successor(#20461,#20462)
+successor(#20460,#20461)
+successor(#20458,#20466)
+successor(#20663,#20456)
+successor(#20412,#20416)
+successor(#20417,#20414)
+#20667=*
+entry_cfg_node(#20667,#20417)
+#20668=@"loc,{#10000},3,17,3,16"
+locations_default(#20668,#10000,3,17,3,16)
+hasLocation(#20667,#20668)
+#20669=*
+exit_cfg_node(#20669,#20417)
+#20670=@"loc,{#10000},5,2,5,1"
+locations_default(#20670,#10000,5,2,5,1)
+hasLocation(#20669,#20670)
+successor(#20442,#20445)
+successor(#20449,#20447)
+successor(#20448,#20449)
+successor(#20447,#20440)
+successor(#20446,#20444)
+successor(#20445,#20446)
+successor(#20444,#20448)
+successor(#20440,#20669)
+successor(#20438,#20442)
+successor(#20437,#20438)
+successor(#20422,#20426)
+successor(#20434,#20430)
+successor(#20433,#20434)
+successor(#20432,#20433)
+successor(#20430,#20437)
+successor(#20428,#20424)
+successor(#20427,#20428)
+successor(#20426,#20427)
+successor(#20424,#20432)
+successor(#20667,#20422)
+successor(#20416,#20417)
+successor(#20414,#20450)
+successor(#20399,#20400)
+successor(#20400,#20412)
+#20671=*
+entry_cfg_node(#20671,#20400)
+hasLocation(#20671,#20637)
+#20672=*
+exit_cfg_node(#20672,#20400)
+#20673=@"loc,{#10000},1,15,1,14"
+locations_default(#20673,#10000,1,15,1,14)
+hasLocation(#20672,#20673)
+successor(#20411,#20672)
+successor(#20404,#20408)
+successor(#20410,#20406)
+successor(#20409,#20410)
+successor(#20408,#20409)
+successor(#20406,#20411)
+successor(#20671,#20404)
+successor(#20536,#20399)
+successor(#20636,#20536)
+numlines(#10000,21,18,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/restparms2.js.trap b/javascript/extractor/tests/es2015/output/trap/restparms2.js.trap
index e6faa776dd50..924b02a736d4 100644
--- a/javascript/extractor/tests/es2015/output/trap/restparms2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/restparms2.js.trap
@@ -9,27 +9,178 @@ hasLocation(#10000,#10002)
 #20000=@"global_scope"
 scopes(#20000,0)
 #20001=@"script;{#10000},1,1"
-toplevels(#20001,0)
-#20002=@"loc,{#10000},1,1,1,1"
-locations_default(#20002,#10000,1,1,1,1)
-hasLocation(#20001,#20002)
-#20003=*
-js_parse_errors(#20003,#20001,"Error: Unexpected token","function f(x, ...[y, z]) {
-")
-#20004=@"loc,{#10000},1,18,1,18"
-locations_default(#20004,#10000,1,18,1,18)
-hasLocation(#20003,#20004)
-#20005=*
-lines(#20005,#20001,"function f(x, ...[y, z]) {","
+#20002=*
+lines(#20002,#20001,"function f(x, ...[y, z]) {","
 ")
-#20006=@"loc,{#10000},1,1,1,26"
-locations_default(#20006,#10000,1,1,1,26)
-hasLocation(#20005,#20006)
-#20007=*
-lines(#20007,#20001,"}","")
-#20008=@"loc,{#10000},2,1,2,1"
-locations_default(#20008,#10000,2,1,2,1)
-hasLocation(#20007,#20008)
-numlines(#20001,2,0,0)
-numlines(#10000,2,0,0)
+#20003=@"loc,{#10000},1,1,1,26"
+locations_default(#20003,#10000,1,1,1,26)
+hasLocation(#20002,#20003)
+#20004=*
+lines(#20004,#20001,"}","")
+#20005=@"loc,{#10000},2,1,2,1"
+locations_default(#20005,#10000,2,1,2,1)
+hasLocation(#20004,#20005)
+numlines(#20001,2,2,0)
+#20006=*
+tokeninfo(#20006,7,#20001,0,"function")
+#20007=@"loc,{#10000},1,1,1,8"
+locations_default(#20007,#10000,1,1,1,8)
+hasLocation(#20006,#20007)
+#20008=*
+tokeninfo(#20008,6,#20001,1,"f")
+#20009=@"loc,{#10000},1,10,1,10"
+locations_default(#20009,#10000,1,10,1,10)
+hasLocation(#20008,#20009)
+#20010=*
+tokeninfo(#20010,8,#20001,2,"(")
+#20011=@"loc,{#10000},1,11,1,11"
+locations_default(#20011,#10000,1,11,1,11)
+hasLocation(#20010,#20011)
+#20012=*
+tokeninfo(#20012,6,#20001,3,"x")
+#20013=@"loc,{#10000},1,12,1,12"
+locations_default(#20013,#10000,1,12,1,12)
+hasLocation(#20012,#20013)
+#20014=*
+tokeninfo(#20014,8,#20001,4,",")
+#20015=@"loc,{#10000},1,13,1,13"
+locations_default(#20015,#10000,1,13,1,13)
+hasLocation(#20014,#20015)
+#20016=*
+tokeninfo(#20016,8,#20001,5,"...")
+#20017=@"loc,{#10000},1,15,1,17"
+locations_default(#20017,#10000,1,15,1,17)
+hasLocation(#20016,#20017)
+#20018=*
+tokeninfo(#20018,8,#20001,6,"[")
+#20019=@"loc,{#10000},1,18,1,18"
+locations_default(#20019,#10000,1,18,1,18)
+hasLocation(#20018,#20019)
+#20020=*
+tokeninfo(#20020,6,#20001,7,"y")
+#20021=@"loc,{#10000},1,19,1,19"
+locations_default(#20021,#10000,1,19,1,19)
+hasLocation(#20020,#20021)
+#20022=*
+tokeninfo(#20022,8,#20001,8,",")
+#20023=@"loc,{#10000},1,20,1,20"
+locations_default(#20023,#10000,1,20,1,20)
+hasLocation(#20022,#20023)
+#20024=*
+tokeninfo(#20024,6,#20001,9,"z")
+#20025=@"loc,{#10000},1,22,1,22"
+locations_default(#20025,#10000,1,22,1,22)
+hasLocation(#20024,#20025)
+#20026=*
+tokeninfo(#20026,8,#20001,10,"]")
+#20027=@"loc,{#10000},1,23,1,23"
+locations_default(#20027,#10000,1,23,1,23)
+hasLocation(#20026,#20027)
+#20028=*
+tokeninfo(#20028,8,#20001,11,")")
+#20029=@"loc,{#10000},1,24,1,24"
+locations_default(#20029,#10000,1,24,1,24)
+hasLocation(#20028,#20029)
+#20030=*
+tokeninfo(#20030,8,#20001,12,"{")
+#20031=@"loc,{#10000},1,26,1,26"
+locations_default(#20031,#10000,1,26,1,26)
+hasLocation(#20030,#20031)
+#20032=*
+tokeninfo(#20032,8,#20001,13,"}")
+hasLocation(#20032,#20005)
+#20033=*
+tokeninfo(#20033,0,#20001,14,"")
+#20034=@"loc,{#10000},2,2,2,1"
+locations_default(#20034,#10000,2,2,2,1)
+hasLocation(#20033,#20034)
+toplevels(#20001,0)
+#20035=@"loc,{#10000},1,1,2,1"
+locations_default(#20035,#10000,1,1,2,1)
+hasLocation(#20001,#20035)
+#20036=@"var;{f};{#20000}"
+variables(#20036,"f",#20000)
+#20037=@"var;{this};{#20000}"
+variables(#20037,"this",#20000)
+#20038=*
+stmts(#20038,17,#20001,0,"functio ... z]) {\n}")
+hasLocation(#20038,#20035)
+stmt_containers(#20038,#20001)
+#20039=*
+exprs(#20039,78,#20038,-1,"f")
+hasLocation(#20039,#20009)
+expr_containers(#20039,#20038)
+literals("f","f",#20039)
+decl(#20039,#20036)
+#20040=*
+scopes(#20040,1)
+scopenodes(#20038,#20040)
+scopenesting(#20040,#20000)
+#20041=@"var;{this};{#20040}"
+variables(#20041,"this",#20040)
+#20042=@"var;{x};{#20040}"
+variables(#20042,"x",#20040)
+#20043=*
+exprs(#20043,78,#20038,0,"x")
+hasLocation(#20043,#20013)
+expr_containers(#20043,#20038)
+literals("x","x",#20043)
+decl(#20043,#20042)
+#20044=@"var;{y};{#20040}"
+variables(#20044,"y",#20040)
+#20045=@"var;{z};{#20040}"
+variables(#20045,"z",#20040)
+#20046=*
+exprs(#20046,67,#20038,1,"[y, z]")
+#20047=@"loc,{#10000},1,18,1,23"
+locations_default(#20047,#10000,1,18,1,23)
+hasLocation(#20046,#20047)
+expr_containers(#20046,#20038)
+#20048=*
+exprs(#20048,78,#20046,0,"y")
+hasLocation(#20048,#20021)
+expr_containers(#20048,#20038)
+literals("y","y",#20048)
+decl(#20048,#20044)
+#20049=*
+exprs(#20049,78,#20046,1,"z")
+hasLocation(#20049,#20025)
+expr_containers(#20049,#20038)
+literals("z","z",#20049)
+decl(#20049,#20045)
+array_size(#20046,2)
+#20050=@"var;{arguments};{#20040}"
+variables(#20050,"arguments",#20040)
+is_arguments_object(#20050)
+has_rest_parameter(#20038)
+#20051=*
+stmts(#20051,1,#20038,-2,"{\n}")
+#20052=@"loc,{#10000},1,26,2,1"
+locations_default(#20052,#10000,1,26,2,1)
+hasLocation(#20051,#20052)
+stmt_containers(#20051,#20038)
+#20053=*
+entry_cfg_node(#20053,#20001)
+#20054=@"loc,{#10000},1,1,1,0"
+locations_default(#20054,#10000,1,1,1,0)
+hasLocation(#20053,#20054)
+#20055=*
+exit_cfg_node(#20055,#20001)
+hasLocation(#20055,#20034)
+successor(#20038,#20055)
+#20056=*
+entry_cfg_node(#20056,#20038)
+hasLocation(#20056,#20054)
+#20057=*
+exit_cfg_node(#20057,#20038)
+hasLocation(#20057,#20034)
+successor(#20051,#20057)
+successor(#20046,#20048)
+successor(#20049,#20051)
+successor(#20048,#20049)
+successor(#20043,#20046)
+successor(#20056,#20043)
+successor(#20039,#20038)
+successor(#20053,#20039)
+numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2022/input/d-flag.js b/javascript/extractor/tests/es2022/input/d-flag.js
new file mode 100644
index 000000000000..be7fb5d6841f
--- /dev/null
+++ b/javascript/extractor/tests/es2022/input/d-flag.js
@@ -0,0 +1,5 @@
+const pattern = /import/dg;
+
+function target() {
+  return pattern;
+}
\ No newline at end of file
diff --git a/javascript/extractor/tests/es2022/options.json b/javascript/extractor/tests/es2022/options.json
new file mode 100644
index 000000000000..075583ca1f63
--- /dev/null
+++ b/javascript/extractor/tests/es2022/options.json
@@ -0,0 +1,3 @@
+{
+    "experimental": true
+}
diff --git a/javascript/extractor/tests/es2022/output/trap/d-flag.js.trap b/javascript/extractor/tests/es2022/output/trap/d-flag.js.trap
new file mode 100644
index 000000000000..c8a92cf06a3e
--- /dev/null
+++ b/javascript/extractor/tests/es2022/output/trap/d-flag.js.trap
@@ -0,0 +1,224 @@
+#10000=@"/d-flag.js;sourcefile"
+files(#10000,"/d-flag.js")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=@"global_scope"
+scopes(#20000,0)
+#20001=@"script;{#10000},1,1"
+#20002=*
+lines(#20002,#20001,"const pattern = /import/dg;","
+")
+#20003=@"loc,{#10000},1,1,1,27"
+locations_default(#20003,#10000,1,1,1,27)
+hasLocation(#20002,#20003)
+#20004=*
+lines(#20004,#20001,"","
+")
+#20005=@"loc,{#10000},2,1,2,0"
+locations_default(#20005,#10000,2,1,2,0)
+hasLocation(#20004,#20005)
+#20006=*
+lines(#20006,#20001,"function target() {","
+")
+#20007=@"loc,{#10000},3,1,3,19"
+locations_default(#20007,#10000,3,1,3,19)
+hasLocation(#20006,#20007)
+#20008=*
+lines(#20008,#20001,"  return pattern;","
+")
+#20009=@"loc,{#10000},4,1,4,17"
+locations_default(#20009,#10000,4,1,4,17)
+hasLocation(#20008,#20009)
+indentation(#10000,4," ",2)
+#20010=*
+lines(#20010,#20001,"}","")
+#20011=@"loc,{#10000},5,1,5,1"
+locations_default(#20011,#10000,5,1,5,1)
+hasLocation(#20010,#20011)
+numlines(#20001,5,4,0)
+#20012=*
+tokeninfo(#20012,7,#20001,0,"const")
+#20013=@"loc,{#10000},1,1,1,5"
+locations_default(#20013,#10000,1,1,1,5)
+hasLocation(#20012,#20013)
+#20014=*
+tokeninfo(#20014,6,#20001,1,"pattern")
+#20015=@"loc,{#10000},1,7,1,13"
+locations_default(#20015,#10000,1,7,1,13)
+hasLocation(#20014,#20015)
+#20016=*
+tokeninfo(#20016,8,#20001,2,"=")
+#20017=@"loc,{#10000},1,15,1,15"
+locations_default(#20017,#10000,1,15,1,15)
+hasLocation(#20016,#20017)
+#20018=*
+tokeninfo(#20018,5,#20001,3,"/import/dg")
+#20019=@"loc,{#10000},1,17,1,26"
+locations_default(#20019,#10000,1,17,1,26)
+hasLocation(#20018,#20019)
+#20020=*
+tokeninfo(#20020,8,#20001,4,";")
+#20021=@"loc,{#10000},1,27,1,27"
+locations_default(#20021,#10000,1,27,1,27)
+hasLocation(#20020,#20021)
+#20022=*
+tokeninfo(#20022,7,#20001,5,"function")
+#20023=@"loc,{#10000},3,1,3,8"
+locations_default(#20023,#10000,3,1,3,8)
+hasLocation(#20022,#20023)
+#20024=*
+tokeninfo(#20024,6,#20001,6,"target")
+#20025=@"loc,{#10000},3,10,3,15"
+locations_default(#20025,#10000,3,10,3,15)
+hasLocation(#20024,#20025)
+#20026=*
+tokeninfo(#20026,8,#20001,7,"(")
+#20027=@"loc,{#10000},3,16,3,16"
+locations_default(#20027,#10000,3,16,3,16)
+hasLocation(#20026,#20027)
+#20028=*
+tokeninfo(#20028,8,#20001,8,")")
+#20029=@"loc,{#10000},3,17,3,17"
+locations_default(#20029,#10000,3,17,3,17)
+hasLocation(#20028,#20029)
+#20030=*
+tokeninfo(#20030,8,#20001,9,"{")
+#20031=@"loc,{#10000},3,19,3,19"
+locations_default(#20031,#10000,3,19,3,19)
+hasLocation(#20030,#20031)
+#20032=*
+tokeninfo(#20032,7,#20001,10,"return")
+#20033=@"loc,{#10000},4,3,4,8"
+locations_default(#20033,#10000,4,3,4,8)
+hasLocation(#20032,#20033)
+#20034=*
+tokeninfo(#20034,6,#20001,11,"pattern")
+#20035=@"loc,{#10000},4,10,4,16"
+locations_default(#20035,#10000,4,10,4,16)
+hasLocation(#20034,#20035)
+#20036=*
+tokeninfo(#20036,8,#20001,12,";")
+#20037=@"loc,{#10000},4,17,4,17"
+locations_default(#20037,#10000,4,17,4,17)
+hasLocation(#20036,#20037)
+#20038=*
+tokeninfo(#20038,8,#20001,13,"}")
+hasLocation(#20038,#20011)
+#20039=*
+tokeninfo(#20039,0,#20001,14,"")
+#20040=@"loc,{#10000},5,2,5,1"
+locations_default(#20040,#10000,5,2,5,1)
+hasLocation(#20039,#20040)
+toplevels(#20001,0)
+#20041=@"loc,{#10000},1,1,5,1"
+locations_default(#20041,#10000,1,1,5,1)
+hasLocation(#20001,#20041)
+#20042=@"var;{target};{#20000}"
+variables(#20042,"target",#20000)
+#20043=@"var;{pattern};{#20000}"
+variables(#20043,"pattern",#20000)
+#20044=@"var;{this};{#20000}"
+variables(#20044,"this",#20000)
+#20045=*
+stmts(#20045,22,#20001,0,"const p ... ort/dg;")
+hasLocation(#20045,#20003)
+stmt_containers(#20045,#20001)
+#20046=*
+exprs(#20046,64,#20045,0,"pattern = /import/dg")
+#20047=@"loc,{#10000},1,7,1,26"
+locations_default(#20047,#10000,1,7,1,26)
+hasLocation(#20046,#20047)
+enclosing_stmt(#20046,#20045)
+expr_containers(#20046,#20001)
+#20048=*
+exprs(#20048,78,#20046,0,"pattern")
+hasLocation(#20048,#20015)
+enclosing_stmt(#20048,#20045)
+expr_containers(#20048,#20001)
+literals("pattern","pattern",#20048)
+decl(#20048,#20043)
+#20049=*
+exprs(#20049,5,#20046,1,"/import/dg")
+hasLocation(#20049,#20019)
+enclosing_stmt(#20049,#20045)
+expr_containers(#20049,#20001)
+literals("/import/dg","/import/dg",#20049)
+#20050=*
+regexpterm(#20050,14,#20049,0,"import")
+#20051=@"loc,{#10000},1,18,1,23"
+locations_default(#20051,#10000,1,18,1,23)
+hasLocation(#20050,#20051)
+regexp_const_value(#20050,"import")
+#20052=*
+stmts(#20052,17,#20001,1,"functio ... tern;\n}")
+#20053=@"loc,{#10000},3,1,5,1"
+locations_default(#20053,#10000,3,1,5,1)
+hasLocation(#20052,#20053)
+stmt_containers(#20052,#20001)
+#20054=*
+exprs(#20054,78,#20052,-1,"target")
+hasLocation(#20054,#20025)
+expr_containers(#20054,#20052)
+literals("target","target",#20054)
+decl(#20054,#20042)
+#20055=*
+scopes(#20055,1)
+scopenodes(#20052,#20055)
+scopenesting(#20055,#20000)
+#20056=@"var;{this};{#20055}"
+variables(#20056,"this",#20055)
+#20057=@"var;{arguments};{#20055}"
+variables(#20057,"arguments",#20055)
+is_arguments_object(#20057)
+#20058=*
+stmts(#20058,1,#20052,-2,"{\n  ret ... tern;\n}")
+#20059=@"loc,{#10000},3,19,5,1"
+locations_default(#20059,#10000,3,19,5,1)
+hasLocation(#20058,#20059)
+stmt_containers(#20058,#20052)
+#20060=*
+stmts(#20060,9,#20058,0,"return pattern;")
+#20061=@"loc,{#10000},4,3,4,17"
+locations_default(#20061,#10000,4,3,4,17)
+hasLocation(#20060,#20061)
+stmt_containers(#20060,#20052)
+#20062=*
+exprs(#20062,79,#20060,0,"pattern")
+hasLocation(#20062,#20035)
+enclosing_stmt(#20062,#20060)
+expr_containers(#20062,#20052)
+literals("pattern","pattern",#20062)
+bind(#20062,#20043)
+#20063=*
+entry_cfg_node(#20063,#20001)
+#20064=@"loc,{#10000},1,1,1,0"
+locations_default(#20064,#10000,1,1,1,0)
+hasLocation(#20063,#20064)
+#20065=*
+exit_cfg_node(#20065,#20001)
+hasLocation(#20065,#20040)
+successor(#20052,#20065)
+#20066=*
+entry_cfg_node(#20066,#20052)
+#20067=@"loc,{#10000},3,1,3,0"
+locations_default(#20067,#10000,3,1,3,0)
+hasLocation(#20066,#20067)
+#20068=*
+exit_cfg_node(#20068,#20052)
+hasLocation(#20068,#20040)
+successor(#20062,#20060)
+successor(#20060,#20068)
+successor(#20058,#20062)
+successor(#20066,#20058)
+successor(#20045,#20048)
+successor(#20049,#20046)
+successor(#20048,#20049)
+successor(#20046,#20052)
+successor(#20054,#20045)
+successor(#20063,#20054)
+numlines(#10000,5,4,0)
+filetype(#10000,"javascript")
diff --git a/javascript/ql/lib/CHANGELOG.md b/javascript/ql/lib/CHANGELOG.md
index c0217aee81e7..b36191fe8c22 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,3 +1,63 @@
+## 3.0.0
+
+### Breaking Changes
+
+* The `SEMMLE_TYPESCRIPT_HOME` environment variable is no longer supported. The JavaScript/TypeScript extractor now ignores the environment variable and always uses its bundled TypeScript compiler.
+
+### Minor Analysis Improvements
+
+* Added taint steps for `String.prototype.trimStart`, `trimEnd`, and `normalize`.
+* Fixed the flow summary for `Array.prototype.flatMap`. The `thisArg` argument now flows to the callback's `this` instead of its index parameter.
+
+## 2.10.4
+
+No user-facing changes.
+
+## 2.10.3
+
+### Minor Analysis Improvements
+
+* The Workflow SDK directives `"use workflow"` and `"use step"` are now recognized as known directives, so the `js/unknown-directive` query no longer flags them.
+
+### Bug Fixes
+
+* Improved Hapi route handler and request input tracking through custom route registration helpers and higher-order function wrappers.
+
+## 2.10.2
+
+### Minor Analysis Improvements
+
+* Fastify servers reached through a chainable configuration method, such as `fastify().withTypeProvider<T>()` or `fastify().setValidatorCompiler(...)`, are now recognized as the same server instance. Routes registered on such an instance are now attributed to their server, which may add results for queries such as `js/missing-rate-limiting` where routes were previously not recognized at all, and remove false positives where a globally registered plugin guards them.
+
+## 2.10.1
+
+No user-facing changes.
+
+## 2.10.0
+
+### New Features
+
+- Added support for recognizing the React Native Worklets `"worklet"` directive as a known directive.
+
+### Minor Analysis Improvements
+
+* Added support for regular expressions using the `d` flag.
+
+## 2.9.0
+
+### Major Analysis Improvements
+
+* It is now possible for custom models to refer to specific files in the codebase, using a package name of form `file:<path>`. The model should describe the public exports
+  of that file. This can be used to derive sources and sinks in code that imports the file, but note that sources and sinks will not generally be placed within the file itself.
+  For example, a source model `['file:lib/service.js', 'Member[getData].ReturnValue', 'remote']` could identify `require('../lib/service').getData()` as a source.
+
+### Minor Analysis Improvements
+
+* JavaScript security queries using the `response` threat model now track promise-wrapped client response data into promise fulfillment values. This may improve results for queries such as `js/xss` when response data is consumed through `.then(...)` chains.
+* The route object returned by Vue Router's `useRoute()` Composition API is now recognized as a client-side remote flow source, covering its `query`, `params`, `path`, `fullPath`, and `hash` members. These members are additionally reported under the corresponding `browser-url-query`, `browser-url-path`, and `browser-url-fragment` threat models.
+* Added flow models for Vue's `ref`, `shallowRef`, `toRef`, `reactive`, and `computed` Composition API helpers.
+* Added support for treating declared `inputs` properties in Sails Action2 controller files as remote flow sources. This may improve results for security queries such as `js/path-injection`.
+
 ## 2.8.2
 
 No user-facing changes.
@@ -618,7 +678,7 @@ No user-facing changes.
 
 ### New Features
 
-* Improved support for [Restify](http://restify.com/) framework, leading to more results when scanning applications developed with this framework.
+* Improved support for [Restify](https://restify.com/) framework, leading to more results when scanning applications developed with this framework.
 * Added support for the [Spife](https://github.com/npm/spife) framework.
 
 ### Minor Analysis Improvements
diff --git a/javascript/ql/lib/change-notes/2026-07-07-sails-action2-inputs.md b/javascript/ql/lib/change-notes/2026-07-07-sails-action2-inputs.md
deleted file mode 100644
index 72b5fda6137b..000000000000
--- a/javascript/ql/lib/change-notes/2026-07-07-sails-action2-inputs.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added support for treating declared `inputs` properties in Sails Action2 controller files as remote flow sources. This may improve results for security queries such as `js/path-injection`.
diff --git a/javascript/ql/lib/change-notes/2026-07-16-vue-router-useRoute-query.md b/javascript/ql/lib/change-notes/2026-07-16-vue-router-useRoute-query.md
deleted file mode 100644
index 973af15aae03..000000000000
--- a/javascript/ql/lib/change-notes/2026-07-16-vue-router-useRoute-query.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* The route object returned by Vue Router's `useRoute()` Composition API is now recognized as a client-side remote flow source, covering its `query`, `params`, `path`, `fullPath`, and `hash` members. These members are additionally reported under the corresponding `browser-url-query`, `browser-url-path`, and `browser-url-fragment` threat models.
-* Added flow models for Vue's `ref`, `shallowRef`, `toRef`, `reactive`, and `computed` Composition API helpers.
diff --git a/javascript/ql/lib/change-notes/2026-07-31-file-scoped-models.md b/javascript/ql/lib/change-notes/2026-07-31-file-scoped-models.md
deleted file mode 100644
index b3df112a1f1d..000000000000
--- a/javascript/ql/lib/change-notes/2026-07-31-file-scoped-models.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: majorAnalysis
----
-* It is now possible for custom models to refer to specific files in the codebase, using a package name of form `file:<path>`. The model should describe the public exports
-  of that file. This can be used to derive sources and sinks in code that imports the file, but note that sources and sinks will not generally be placed within the file itself.
-  For example, a source model `['file:lib/service.js', 'Member[getData].ReturnValue', 'remote']` could identify `require('../lib/service').getData()` as a source.
diff --git a/javascript/ql/lib/change-notes/2026-10-03-mcp-models.md b/javascript/ql/lib/change-notes/2026-10-03-mcp-models.md
new file mode 100644
index 000000000000..ca66290407be
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2026-10-03-mcp-models.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added modeling of the `@modelcontextprotocol/sdk` and `@modelcontextprotocol/server` (the official Model Context Protocol SDK) and `fastmcp` npm packages. The arguments of MCP tool, resource and prompt callbacks and the requests that handlers of the low-level `Server` receive are now sources of the opt-in `ai` threat model, as their values are produced by a language model. The request headers and the bearer token that the SDK passes to a callback are sources of the `remote` threat model.
diff --git a/javascript/ql/lib/change-notes/2026-10-03-zod.md b/javascript/ql/lib/change-notes/2026-10-03-zod.md
new file mode 100644
index 000000000000..5bd9d32240a2
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2026-10-03-zod.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added flow summaries for schema parsing with the `zod` npm package: data now flows from the argument of `parse`, `safeParse`, `parseAsync` and `safeParseAsync` to the parsed result.
diff --git a/javascript/ql/lib/change-notes/2026-10-22-multiline-regexp-sanitizer.md b/javascript/ql/lib/change-notes/2026-10-22-multiline-regexp-sanitizer.md
new file mode 100644
index 000000000000..d77bd99c1b0e
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2026-10-22-multiline-regexp-sanitizer.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Regular expression checks using multiline (`m`) or unknown flags are no longer treated as generic taint sanitizers just because the pattern is anchored with `^` and `$`. This can reveal previously missed alerts, including command injection and reflected cross-site scripting.
diff --git a/javascript/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md b/javascript/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md
new file mode 100644
index 000000000000..f97ae0b25b6e
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The sensitive data heuristics treat names built on `trusted_schema`, such as SQLite's `set_trusted_schema` setting, as non-sensitive. This removes false positive results from queries that use the sensitive data library (for example `js/clear-text-logging`).
diff --git a/javascript/ql/lib/change-notes/released/0.4.0.md b/javascript/ql/lib/change-notes/released/0.4.0.md
index cc1366d2ca26..14c1902fb4c9 100644
--- a/javascript/ql/lib/change-notes/released/0.4.0.md
+++ b/javascript/ql/lib/change-notes/released/0.4.0.md
@@ -2,7 +2,7 @@
 
 ### New Features
 
-* Improved support for [Restify](http://restify.com/) framework, leading to more results when scanning applications developed with this framework.
+* Improved support for [Restify](https://restify.com/) framework, leading to more results when scanning applications developed with this framework.
 * Added support for the [Spife](https://github.com/npm/spife) framework.
 
 ### Minor Analysis Improvements
diff --git a/javascript/ql/lib/change-notes/released/2.10.0.md b/javascript/ql/lib/change-notes/released/2.10.0.md
new file mode 100644
index 000000000000..341f9813e3fb
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.10.0.md
@@ -0,0 +1,9 @@
+## 2.10.0
+
+### New Features
+
+- Added support for recognizing the React Native Worklets `"worklet"` directive as a known directive.
+
+### Minor Analysis Improvements
+
+* Added support for regular expressions using the `d` flag.
diff --git a/javascript/ql/lib/change-notes/released/2.10.1.md b/javascript/ql/lib/change-notes/released/2.10.1.md
new file mode 100644
index 000000000000..e1113832b1c6
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.10.1.md
@@ -0,0 +1,3 @@
+## 2.10.1
+
+No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/2.10.2.md b/javascript/ql/lib/change-notes/released/2.10.2.md
new file mode 100644
index 000000000000..94c749202ceb
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.10.2.md
@@ -0,0 +1,5 @@
+## 2.10.2
+
+### Minor Analysis Improvements
+
+* Fastify servers reached through a chainable configuration method, such as `fastify().withTypeProvider<T>()` or `fastify().setValidatorCompiler(...)`, are now recognized as the same server instance. Routes registered on such an instance are now attributed to their server, which may add results for queries such as `js/missing-rate-limiting` where routes were previously not recognized at all, and remove false positives where a globally registered plugin guards them.
diff --git a/javascript/ql/lib/change-notes/released/2.10.3.md b/javascript/ql/lib/change-notes/released/2.10.3.md
new file mode 100644
index 000000000000..5f25878cac20
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.10.3.md
@@ -0,0 +1,9 @@
+## 2.10.3
+
+### Minor Analysis Improvements
+
+* The Workflow SDK directives `"use workflow"` and `"use step"` are now recognized as known directives, so the `js/unknown-directive` query no longer flags them.
+
+### Bug Fixes
+
+* Improved Hapi route handler and request input tracking through custom route registration helpers and higher-order function wrappers.
diff --git a/javascript/ql/lib/change-notes/released/2.10.4.md b/javascript/ql/lib/change-notes/released/2.10.4.md
new file mode 100644
index 000000000000..755ad628fc97
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.10.4.md
@@ -0,0 +1,3 @@
+## 2.10.4
+
+No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/2.9.0.md b/javascript/ql/lib/change-notes/released/2.9.0.md
new file mode 100644
index 000000000000..6892fa665580
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.9.0.md
@@ -0,0 +1,14 @@
+## 2.9.0
+
+### Major Analysis Improvements
+
+* It is now possible for custom models to refer to specific files in the codebase, using a package name of form `file:<path>`. The model should describe the public exports
+  of that file. This can be used to derive sources and sinks in code that imports the file, but note that sources and sinks will not generally be placed within the file itself.
+  For example, a source model `['file:lib/service.js', 'Member[getData].ReturnValue', 'remote']` could identify `require('../lib/service').getData()` as a source.
+
+### Minor Analysis Improvements
+
+* JavaScript security queries using the `response` threat model now track promise-wrapped client response data into promise fulfillment values. This may improve results for queries such as `js/xss` when response data is consumed through `.then(...)` chains.
+* The route object returned by Vue Router's `useRoute()` Composition API is now recognized as a client-side remote flow source, covering its `query`, `params`, `path`, `fullPath`, and `hash` members. These members are additionally reported under the corresponding `browser-url-query`, `browser-url-path`, and `browser-url-fragment` threat models.
+* Added flow models for Vue's `ref`, `shallowRef`, `toRef`, `reactive`, and `computed` Composition API helpers.
+* Added support for treating declared `inputs` properties in Sails Action2 controller files as remote flow sources. This may improve results for security queries such as `js/path-injection`.
diff --git a/javascript/ql/lib/change-notes/released/3.0.0.md b/javascript/ql/lib/change-notes/released/3.0.0.md
new file mode 100644
index 000000000000..07f4ae5ed88f
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/3.0.0.md
@@ -0,0 +1,10 @@
+## 3.0.0
+
+### Breaking Changes
+
+* The `SEMMLE_TYPESCRIPT_HOME` environment variable is no longer supported. The JavaScript/TypeScript extractor now ignores the environment variable and always uses its bundled TypeScript compiler.
+
+### Minor Analysis Improvements
+
+* Added taint steps for `String.prototype.trimStart`, `trimEnd`, and `normalize`.
+* Fixed the flow summary for `Array.prototype.flatMap`. The `thisArg` argument now flows to the callback's `this` instead of its index parameter.
diff --git a/javascript/ql/lib/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
index 49d300fe06bf..33d3a2cd1139 100644
--- a/javascript/ql/lib/codeql-pack.release.yml
+++ b/javascript/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.8.2
+lastReleaseVersion: 3.0.0
diff --git a/javascript/ql/lib/ext/fastmcp.model.yml b/javascript/ql/lib/ext/fastmcp.model.yml
new file mode 100644
index 000000000000..bc784820c864
--- /dev/null
+++ b/javascript/ql/lib/ext/fastmcp.model.yml
@@ -0,0 +1,15 @@
+# Sources for MCP servers built with the npm package "fastmcp": the arguments of tools, resource
+# templates and prompts.
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: typeModel
+    data:
+      - ["fastmcp.FastMCP", "fastmcp", "Member[FastMCP].Instance"]
+
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sourceModel
+    data:
+      - ["fastmcp.FastMCP", "Member[addTool].Argument[0].Member[execute].Parameter[0]", "ai"]
+      - ["fastmcp.FastMCP", "Member[addResourceTemplate,addPrompt].Argument[0].Member[load].Parameter[0]", "ai"]
diff --git a/javascript/ql/lib/ext/mcp.model.yml b/javascript/ql/lib/ext/mcp.model.yml
new file mode 100644
index 000000000000..30b3bb599947
--- /dev/null
+++ b/javascript/ql/lib/ext/mcp.model.yml
@@ -0,0 +1,36 @@
+# Sources for MCP servers built with the TypeScript SDK: "@modelcontextprotocol/sdk" (1.x) and
+# "@modelcontextprotocol/server" (2.x). The arguments of tool, prompt and resource callbacks are
+# input the server receives through MCP, and so are the transport headers and the bearer token the
+# SDK hands to a callback.
+#
+# A package name that contains a dot must be quoted with single quotes; otherwise CodeQL reads the
+# text after the first dot as a type name.
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: typeModel
+    data:
+      - ["@modelcontextprotocol/sdk.McpServer", "'@modelcontextprotocol/sdk/server/mcp.js'", "Member[McpServer].Instance"]
+      - ["@modelcontextprotocol/sdk.McpServer", "@modelcontextprotocol/sdk/server/mcp", "Member[McpServer].Instance"]
+      - ["@modelcontextprotocol/sdk.McpServer", "@modelcontextprotocol/server", "Member[McpServer].Instance"]
+      - ["@modelcontextprotocol/sdk.McpServer", "'@modelcontextprotocol/sdk/server/mcp.js'.McpServer", ""]
+      - ["@modelcontextprotocol/sdk.Server", "'@modelcontextprotocol/sdk/server/index.js'", "Member[Server].Instance"]
+      - ["@modelcontextprotocol/sdk.Server", "@modelcontextprotocol/sdk/server/index", "Member[Server].Instance"]
+      - ["@modelcontextprotocol/sdk.Server", "@modelcontextprotocol/server", "Member[Server].Instance"]
+      - ["@modelcontextprotocol/sdk.Server", "@modelcontextprotocol/sdk.McpServer", "Member[server]"]
+
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sourceModel
+    data:
+      # High-level server: the callback is the last argument; its first parameter holds the arguments
+      - ["@modelcontextprotocol/sdk.McpServer", "Member[tool,registerTool,prompt,registerPrompt].Argument[1..].Parameter[0]", "ai"]
+      - ["@modelcontextprotocol/sdk.McpServer", "Member[resource,registerResource].Argument[1..].Parameter[0,1]", "ai"]
+      # Transport headers and the bearer token: `extra` in 1.x, `ctx` in 2.x
+      - ["@modelcontextprotocol/sdk.McpServer", "Member[tool,registerTool,prompt,registerPrompt].Argument[1..].Parameter[1,2].Member[requestInfo].Member[headers]", "remote"]
+      - ["@modelcontextprotocol/sdk.McpServer", "Member[tool,registerTool,prompt,registerPrompt].Argument[1..].Parameter[1,2].Member[authInfo].Member[token]", "remote"]
+      - ["@modelcontextprotocol/sdk.McpServer", "Member[tool,registerTool,prompt,registerPrompt].Argument[1..].Parameter[1,2].Member[http].Member[req].Member[headers].Member[get].ReturnValue", "remote"]
+      - ["@modelcontextprotocol/sdk.McpServer", "Member[tool,registerTool,prompt,registerPrompt].Argument[1..].Parameter[1,2].Member[http].Member[authInfo].Member[token]", "remote"]
+      # Low-level server: request handlers receive the request; custom methods (2.x) its params
+      - ["@modelcontextprotocol/sdk.Server", "Member[setRequestHandler].Argument[1].Parameter[0].Member[params]", "ai"]
+      - ["@modelcontextprotocol/sdk.Server", "Member[setRequestHandler].Argument[2].Parameter[0]", "ai"]
diff --git a/javascript/ql/lib/ext/zod.model.yml b/javascript/ql/lib/ext/zod.model.yml
new file mode 100644
index 000000000000..234a0aec9d01
--- /dev/null
+++ b/javascript/ql/lib/ext/zod.model.yml
@@ -0,0 +1,16 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: typeModel
+    data:
+      - ["zod", "zod/v3", ""]
+      - ["zod", "zod/v4", ""]
+
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: summaryModel
+    data:
+      - ["zod", "Fuzzy.Member[parse]", "Argument[0]", "ReturnValue", "value"]
+      - ["zod", "Fuzzy.Member[safeParse]", "Argument[0]", "ReturnValue.Member[data]", "value"]
+      - ["zod", "Fuzzy.Member[parseAsync]", "Argument[0]", "ReturnValue.Awaited", "value"]
+      - ["zod", "Fuzzy.Member[safeParseAsync]", "Argument[0]", "ReturnValue.Awaited.Member[data]", "value"]
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index 6e10c05aa596..d42fdd6cb52e 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.8.3-dev
+version: 3.0.1-dev
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
diff --git a/javascript/ql/lib/semmle/javascript/Extend.qll b/javascript/ql/lib/semmle/javascript/Extend.qll
index b871a74a03b7..d592929dc0ec 100644
--- a/javascript/ql/lib/semmle/javascript/Extend.qll
+++ b/javascript/ql/lib/semmle/javascript/Extend.qll
@@ -146,6 +146,17 @@ private class ExtendCallShallow extends ExtendCall {
   override predicate isDeep() { none() }
 }
 
+/** A shallow extend call of form `mergeDescriptors(dst, src)`. */
+private class MergeDescriptorsCall extends ExtendCall {
+  MergeDescriptorsCall() { this = DataFlow::moduleImport("merge-descriptors").getACall() }
+
+  override DataFlow::Node getASourceOperand() { result = this.getArgument(1) }
+
+  override DataFlow::Node getDestinationOperand() { result = this.getArgument(0) }
+
+  override predicate isDeep() { none() }
+}
+
 /**
  * A shallow extend call of form `extend(src1, src2, ...)`.
  */
diff --git a/javascript/ql/lib/semmle/javascript/Regexp.qll b/javascript/ql/lib/semmle/javascript/Regexp.qll
index c42df3939c22..49702214bc62 100644
--- a/javascript/ql/lib/semmle/javascript/Regexp.qll
+++ b/javascript/ql/lib/semmle/javascript/Regexp.qll
@@ -1275,16 +1275,26 @@ module RegExp {
   bindingset[flags]
   predicate maybeDotAll(string flags) { flags = unknownFlag() or isDotAll(flags) }
 
-  /** Holds if `term` and all of its disjuncts are anchored on both ends. */
+  /**
+   * Holds if `term` and all of its disjuncts are anchored to both ends of the input.
+   *
+   * Does not hold if a regular expression using the term has multiline or unknown flags.
+   */
   predicate isFullyAnchoredTerm(RegExpTerm term) {
-    exists(RegExpSequence seq | term = seq |
-      seq.getChild(0) instanceof RegExpCaret and
-      seq.getLastChild() instanceof RegExpDollar
+    not exists(DataFlow::RegExpCreationNode regexp |
+      regexp.getRoot() = term.getRootTerm() and
+      maybeMultiline(regexp.tryGetFlags())
+    ) and
+    (
+      exists(RegExpSequence seq | term = seq |
+        seq.getChild(0) instanceof RegExpCaret and
+        seq.getLastChild() instanceof RegExpDollar
+      )
+      or
+      isFullyAnchoredTerm(term.(RegExpGroup).getAChild())
+      or
+      isFullyAnchoredAlt(term, term.getNumChild())
     )
-    or
-    isFullyAnchoredTerm(term.(RegExpGroup).getAChild())
-    or
-    isFullyAnchoredAlt(term, term.getNumChild())
   }
 
   /** Holds if the first `i` disjuncts of `term` are fully anchored. */
@@ -1330,6 +1340,8 @@ module RegExp {
    *
    * Specifically, whitelisting regexps such as `^(foo|bar)$` sanitize matches in the true case.
    * Inverted character classes such as `[^a-z]` or `\W` sanitize matches in the false case.
+   * Anchored terms do not sanitize matches if a regular expression using the term has
+   * multiline or unknown flags.
    */
   predicate isGenericRegExpSanitizer(RegExpTerm term, boolean outcome) {
     term.isRootTerm() and
diff --git a/javascript/ql/lib/semmle/javascript/Stmt.qll b/javascript/ql/lib/semmle/javascript/Stmt.qll
index 6a757cc1d6ca..e709c7217eb2 100644
--- a/javascript/ql/lib/semmle/javascript/Stmt.qll
+++ b/javascript/ql/lib/semmle/javascript/Stmt.qll
@@ -475,6 +475,47 @@ module Directive {
   class UseCacheDirective extends KnownDirective {
     UseCacheDirective() { this.getDirectiveText().regexpMatch("use cache(:.*)?") }
   }
+
+  /**
+   * A React Native Worklets worklet directive.
+   *
+   * Example:
+   *
+   * ```
+   * function myWorklet() {
+   *   "worklet";
+   * }
+   * ```
+   */
+  class WorkletDirective extends KnownDirective {
+    WorkletDirective() { this.getDirectiveText() = "worklet" }
+  }
+
+  /**
+   * A Workflow SDK `use workflow` directive.
+   *
+   * Example:
+   *
+   * ```
+   * "use workflow";
+   * ```
+   */
+  class UseWorkflowDirective extends KnownDirective {
+    UseWorkflowDirective() { this.getDirectiveText() = "use workflow" }
+  }
+
+  /**
+   * A Workflow SDK `use step` directive.
+   *
+   * Example:
+   *
+   * ```
+   * "use step";
+   * ```
+   */
+  class UseStepDirective extends KnownDirective {
+    UseStepDirective() { this.getDirectiveText() = "use step" }
+  }
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll b/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
index 862cf1b84274..5d7895b53dbc 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
@@ -455,10 +455,10 @@ module TaintTracking {
             name =
               [
                 "anchor", "big", "blink", "bold", "concat", "fixed", "fontcolor", "fontsize",
-                "italics", "link", "padEnd", "padStart", "repeat", "replace", "replaceAll", "slice",
-                "small", "strike", "sub", "substr", "substring", "sup", "toLocaleLowerCase",
-                "toLocaleUpperCase", "toLowerCase", "toUpperCase", "trim", "trimLeft", "trimRight",
-                "toWellFormed"
+                "italics", "link", "normalize", "padEnd", "padStart", "repeat", "replace",
+                "replaceAll", "slice", "small", "strike", "sub", "substr", "substring", "sup",
+                "toLocaleLowerCase", "toLocaleUpperCase", "toLowerCase", "toUpperCase", "trim",
+                "trimEnd", "trimLeft", "trimRight", "trimStart", "toWellFormed"
               ]
             or
             // sorted, interesting, properties of Object.prototype
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll
index 922dd5acc869..1c3eb1dc9e31 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll
@@ -65,6 +65,8 @@ class FlowSummaryNode extends DataFlow::Node, TFlowSummaryNode {
 
   cached
   override string toString() { result = this.getSummaryNode().toString() }
+
+  override Location getLocation() { result = this.getSummaryNode().getLocation() }
 }
 
 class FlowSummaryDynamicParameterArrayNode extends DataFlow::Node,
@@ -541,7 +543,7 @@ predicate isArgumentNode(ArgumentNode n, DataFlowCall call, ArgumentPosition pos
 DataFlowCallable nodeGetEnclosingCallable(Node node) {
   result.asSourceCallable() = node.getContainer()
   or
-  result.asLibraryCallable() = node.(FlowSummaryNode).getSummarizedCallable()
+  result = node.(FlowSummaryNode).getSummaryNode().getEnclosingCallable()
   or
   result.asLibraryCallable() = node.(FlowSummaryDynamicParameterArrayNode).getSummarizedCallable()
   or
@@ -1212,8 +1214,7 @@ private predicate valuePreservingStep(Node node1, Node node2) {
   or
   node2 = FlowSteps::getThrowTarget(node1)
   or
-  FlowSummaryPrivate::Steps::summaryLocalStep(node1, node2.(FlowSummaryNode).getSummaryNode(), true,
-    _) // TODO: preserve 'model'
+  FlowSummaryPrivate::Steps::summaryLocalStep(node1, node2, true, _) // TODO: preserve 'model'
 }
 
 predicate knownSourceModel(Node sink, string model) { none() }
@@ -1365,8 +1366,7 @@ predicate jumpStep(Node node1, Node node2) {
   node1.getContainer() != node2.getContainer() and
   not excludedJumpStep(node1, node2)
   or
-  FlowSummaryPrivate::Steps::summaryJumpStep(node1.(FlowSummaryNode).getSummaryNode(),
-    node2.(FlowSummaryNode).getSummaryNode())
+  FlowSummaryPrivate::Steps::summaryJumpStep(node1, node2)
   or
   DataFlow::AdditionalFlowStep::jumpStep(node1, node2)
 }
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSummaryPrivate.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSummaryPrivate.qll
index a7519f4180b4..8678095904a8 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSummaryPrivate.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSummaryPrivate.qll
@@ -12,18 +12,24 @@ private import sharedlib.FlowSummaryImpl::Private as Private
 private import sharedlib.FlowSummaryImpl::Public
 private import codeql.dataflow.internal.AccessPathSyntax as AccessPathSyntax
 private import semmle.javascript.internal.flow_summaries.ExceptionFlow
+private import codeql.util.Void
 
 /**
  * A class of callables that are candidates for flow summary modeling.
  */
-class SummarizedCallableBase = string;
+class SummarizedCallableBase extends string {
+  bindingset[this]
+  SummarizedCallableBase() { exists(this) }
 
-class SourceBase extends Unit {
-  SourceBase() { none() }
+  Location getLocation() { none() }
 }
 
-class SinkBase extends Unit {
-  SinkBase() { none() }
+class FlowSummaryCallBase extends Void {
+  Location getLocation() { none() }
+}
+
+DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
+  result.asLibraryCallable() = c
 }
 
 /** Gets the parameter position representing a callback itself, if any. */
@@ -141,8 +147,22 @@ string encodeArgumentPosition(ArgumentPosition pos) {
 /** Gets the return kind corresponding to specification `"ReturnValue"`. */
 ReturnKind getStandardReturnValueKind() { result = MkNormalReturnKind() and Stage::ref() }
 
-private module FlowSummaryStepInput implements Private::StepsInputSig {
-  Private::SummaryNode getSummaryNode(DataFlow::Node n) {
+private module Input2 implements Private::InputSig2 {
+  private import codeql.util.Void
+
+  class SourceSinkReportingElement extends Void {
+    Location getLocation() { none() }
+
+    DataFlowCallable getEnclosingCallable() { none() }
+
+    SourceSinkReportingElement getASuccessor(Private::SummaryComponent sc) { none() }
+  }
+}
+
+import Private::Make2<Input2> as Impl2
+
+private module FlowSummaryStepInput implements Impl2::StepsInputSig {
+  Impl2::SummaryNode getSummaryNode(DataFlow::Node n) {
     result = n.(FlowSummaryNode).getSummaryNode()
   }
 
@@ -156,12 +176,6 @@ private module FlowSummaryStepInput implements Private::StepsInputSig {
         ]
     )
   }
-
-  DataFlowCallable getSourceNodeEnclosingCallable(SourceBase source) { none() }
-
-  DataFlow::Node getSourceNode(SourceBase source, Private::SummaryComponentStack s) { none() }
-
-  DataFlow::Node getSinkNode(SinkBase sink, Private::SummaryComponent sc) { none() }
 }
 
 module Steps = Private::Steps<FlowSummaryStepInput>;
@@ -238,7 +252,10 @@ ArgumentPosition decodeUnknownArgumentPosition(AccessPathSyntax::AccessPathToken
  * `encodeContent` predicate.
  */
 bindingset[token]
-ContentSet decodeUnknownContent(AccessPathSyntax::AccessPathTokenBase token) { none() }
+ContentSet decodeUnknownContent(AccessPathSyntax::AccessPathTokenBase token) {
+  token.getName() = "Member" and
+  result.asPropertyName() = token.getAnArgument()
+}
 
 /**
  * Gets a return kind corresponding to the unknown token `token`.
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/FunctionWrapperSteps.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/FunctionWrapperSteps.qll
index dda1ac7ae34f..60fdb119b70f 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/FunctionWrapperSteps.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/FunctionWrapperSteps.qll
@@ -145,3 +145,41 @@ private module Cached {
 }
 
 import Cached
+
+/** Gets a value referring to a forwarding-wrapper around `func`. */
+private DataFlow::SourceNode trackWrappedFunction(
+  DataFlow::FunctionNode func, DataFlow::TypeTracker t
+) {
+  t.start() and
+  functionOneWayForwardingStep(func, result) and
+  // Exclude functions since ordinary call edges can handle that case.
+  // This will typically match calls to a "wrapper factory".
+  not result instanceof DataFlow::FunctionNode
+  or
+  functionOneWayForwardingStep(trackWrappedFunction(func, t.continue()), result)
+  or
+  exists(DataFlow::TypeTracker t2 | result = trackWrappedFunction(func, t2).track(t2, t))
+}
+
+/** Gets a value referring to a forwarding-wrapper around `func`. */
+DataFlow::SourceNode trackWrappedFunction(DataFlow::SourceNode func) {
+  result = trackWrappedFunction(func, DataFlow::TypeTracker::end())
+}
+
+/**
+ * Data flow into a concrete function invoked through a forwarding wrapper.
+ *
+ * Only arguments with a statically known position and a corresponding non-rest parameter are
+ * modeled.
+ */
+private class FunctionWrapperCallStep extends DataFlow::SharedFlowStep {
+  override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
+    exists(DataFlow::CallNode call, DataFlow::FunctionNode wrapped, int index |
+      call = trackWrappedFunction(wrapped).getACall() and
+      pred = call.getArgument(index) and
+      succ = wrapped.getParameter(index) and
+      // A rest parameter receives an array, not the argument at this index.
+      not succ.(DataFlow::ParameterNode).isRestParameter()
+    )
+  }
+}
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/TaintTrackingPrivate.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/TaintTrackingPrivate.qll
index e7b3a6e5658a..61678d6fbdab 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/TaintTrackingPrivate.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/TaintTrackingPrivate.qll
@@ -12,8 +12,7 @@ cached
 predicate defaultAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
   TaintTracking::AdditionalTaintStep::step(node1, node2)
   or
-  FlowSummaryPrivate::Steps::summaryLocalStep(node1, node2.(FlowSummaryNode).getSummaryNode(),
-    false, _) // TODO: preserve 'model' parameter
+  FlowSummaryPrivate::Steps::summaryLocalStep(node1, node2, false, _) // TODO: preserve 'model' parameter
   or
   // Convert steps out of array elements to plain taint steps
   FlowSummaryPrivate::Steps::summaryReadStep(node1.(FlowSummaryNode).getSummaryNode(),
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/DataFlowArg.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/DataFlowArg.qll
index 0f0966cb27c9..494a216696d5 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/DataFlowArg.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/DataFlowArg.qll
@@ -29,8 +29,6 @@ module JSFlowSummary implements FlowSummaryImpl::InputSig<Location, JSDataFlow>
   private import semmle.javascript.dataflow.internal.FlowSummaryPrivate as FlowSummaryPrivate
   import FlowSummaryPrivate
 
-  class FlowSummaryCallBase = Void;
-
   overlay[local]
   predicate callableFromSource(SummarizedCallableBase c) { none() }
 
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/FlowSummaryImpl.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/FlowSummaryImpl.qll
index bf370eb9a271..93245cdf9088 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/FlowSummaryImpl.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/FlowSummaryImpl.qll
@@ -1,4 +1,13 @@
 private import semmle.javascript.Locations
 private import codeql.dataflow.internal.FlowSummaryImpl
 private import DataFlowArg
-import Make<Location, JSDataFlow, JSFlowSummary>
+private import semmle.javascript.dataflow.internal.FlowSummaryPrivate as Priv
+
+private module Impl = Make<Location, JSDataFlow, JSFlowSummary>;
+
+module Private {
+  import Impl::Private
+  import Priv::Impl2
+}
+
+module Public = Impl::Public;
diff --git a/javascript/ql/lib/semmle/javascript/dependencies/SemVer.qll b/javascript/ql/lib/semmle/javascript/dependencies/SemVer.qll
index 1d091e9219c9..a869856076d5 100644
--- a/javascript/ql/lib/semmle/javascript/dependencies/SemVer.qll
+++ b/javascript/ql/lib/semmle/javascript/dependencies/SemVer.qll
@@ -3,6 +3,7 @@
  */
 
 import semmle.javascript.dependencies.Dependencies
+private import codeql.util.SemVer
 
 /**
  * A SemVer-formatted version string in a dependency.
@@ -15,59 +16,38 @@ class DependencySemVer extends string {
 
   DependencySemVer() {
     dep.info(_, this) and
-    normalized = normalizeSemver(this)
+    normalized = padSemVer(this)
   }
 
   /**
    * Holds if this version may be before `last`.
    */
   bindingset[last]
-  predicate maybeBefore(string last) { normalized < normalizeSemver(last) }
+  predicate maybeBefore(string last) { normalized < padSemVer(last) }
 
   /**
    * Holds if this version may be after `first`.
    */
   bindingset[first]
-  predicate maybeAfter(string first) { normalizeSemver(first) < normalized }
+  predicate maybeAfter(string first) { padSemVer(first) < normalized }
 
   /**
    * Holds if this version may be between `first` (inclusive) and `last` (exclusive).
    */
   bindingset[first, last]
   predicate maybeBetween(string first, string last) {
-    normalizeSemver(first) <= normalized and
-    normalized < normalizeSemver(last)
+    padSemVer(first) <= normalized and
+    normalized < padSemVer(last)
   }
 
   /**
    * Holds if this version is equivalent to `other`.
    */
   bindingset[other]
-  predicate is(string other) { normalized = normalizeSemver(other) }
+  predicate is(string other) { normalized = padSemVer(other) }
 
   /**
    * Gets the dependency that uses this string.
    */
   Dependency getDependency() { result = dep }
 }
-
-bindingset[str]
-private string leftPad(string str) { result = ("000" + str).suffix(str.length()) }
-
-/**
- * Normalizes a SemVer string such that the lexicographical ordering
- * of two normalized strings is consistent with the SemVer ordering.
- *
- * Pre-release information and build metadata is not yet supported.
- */
-bindingset[orig]
-private string normalizeSemver(string orig) {
-  exists(string pattern, string major, string minor, string patch |
-    pattern = "(\\d+)\\.(\\d+)\\.(\\d+)" and
-    major = orig.regexpCapture(pattern, 1) and
-    minor = orig.regexpCapture(pattern, 2) and
-    patch = orig.regexpCapture(pattern, 3)
-  |
-    result = leftPad(major) + "." + leftPad(minor) + "." + leftPad(patch)
-  )
-}
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll b/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll
index 9da93400ef92..fabf0a6d38f5 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll
@@ -1016,6 +1016,18 @@ module ClientRequest {
     override string getSourceType() { result = "HTTP response data" }
   }
 
+  /**
+   * A taint step from promise-wrapped response data to the value that the promise resolves to.
+   */
+  private class ClientRequestResponsePromiseStep extends TaintTracking::SharedTaintStep {
+    override predicate promiseStep(DataFlow::Node node1, DataFlow::Node node2) {
+      exists(ClientRequest r |
+        r.getAResponseDataNode(_, true).getALocalSource().flowsTo(node1) and
+        PromiseFlow::loadStep(node1, node2, Promises::valueProp())
+      )
+    }
+  }
+
   /**
    * An additional taint step that captures taint propagation from the receiver of fetch response methods
    * (such as "json", "text", "blob", and "arrayBuffer") to the call result.
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Fastify.qll b/javascript/ql/lib/semmle/javascript/frameworks/Fastify.qll
index 26dde3fc78bd..63b6072d8ffa 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Fastify.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Fastify.qll
@@ -21,6 +21,27 @@ module Fastify {
     StandardServerDefinition() { this = DataFlow::moduleImport("fastify").getAnInvocation() }
   }
 
+  /**
+   * Gets the name of a chainable Fastify configuration method, that is, a method that
+   * configures the server instance and returns that same instance, so that a call to it
+   * still refers to the server.
+   *
+   * Plugin, hook and route registration (`register`, `addHook`, `onClose`, and the
+   * shorthand route methods) returns the server as well, but is deliberately excluded
+   * here, because it already has a meaning in the routing model for Fastify. The
+   * lifecycle methods `after` and `ready` are excluded too: `after` returns the server
+   * only when it is given a callback, and `ready` never does.
+   */
+  private string chainableConfigMethodName() {
+    result =
+      [
+        "withTypeProvider", "addSchema", "addHttpMethod", "addContentTypeParser", "decorate",
+        "decorateRequest", "decorateReply", "setValidatorCompiler", "setSerializerCompiler",
+        "setSchemaController", "setReplySerializer", "setSchemaErrorFormatter", "setErrorHandler",
+        "setNotFoundHandler", "setGenReqId", "setChildLoggerFactory"
+      ]
+  }
+
   /** Gets a data flow node referring to a fastify server. */
   private DataFlow::SourceNode server(DataFlow::SourceNode creation, DataFlow::TypeTracker t) {
     t.start() and
@@ -31,6 +52,11 @@ module Fastify {
     t.start() and
     result = pluginCallback(creation).(DataFlow::FunctionNode).getParameter(0)
     or
+    // server.withTypeProvider<T>(), server.setValidatorCompiler(...), and friends return
+    // the server itself, so the result of such a call still refers to it.
+    t.start() and
+    result = server(creation).getAMethodCall(chainableConfigMethodName())
+    or
     exists(DataFlow::TypeTracker t2 | result = server(creation, t2).track(t2, t))
   }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Hapi.qll b/javascript/ql/lib/semmle/javascript/frameworks/Hapi.qll
index a6dbf40d1e06..36618bffb351 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Hapi.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Hapi.qll
@@ -4,6 +4,7 @@
 
 import javascript
 import semmle.javascript.frameworks.HTTP
+private import semmle.javascript.dataflow.internal.CallGraphs
 
 module Hapi {
   /**
@@ -101,6 +102,19 @@ module Hapi {
     override RequestSource src;
   }
 
+  private DataFlow::SourceNode requestInputRef(
+    RouteHandler rh, string property, DataFlow::TypeTracker t
+  ) {
+    t.start() and
+    result = rh.getARequestSource().ref().getAPropertyRead(property)
+    or
+    exists(DataFlow::TypeTracker t2 | result = requestInputRef(rh, property, t2).track(t2, t))
+  }
+
+  private DataFlow::SourceNode requestInputRef(RouteHandler rh, string property) {
+    result = requestInputRef(rh, property, DataFlow::TypeTracker::end())
+  }
+
   /**
    * An access to a user-controlled Hapi request input.
    */
@@ -115,18 +129,18 @@ module Hapi {
           // `request.rawPayload`
           this.(DataFlow::PropRead).accesses(request, "rawPayload")
           or
-          exists(DataFlow::PropRead payload |
-            // `request.payload.name`
-            payload.accesses(request, "payload") and
-            this.(DataFlow::PropRead).accesses(payload, _)
-          )
+          // `request.payload` is an object, so prefer a property read if possible.
+          if exists(requestInputRef(rh, "payload").getAPropertyRead())
+          then this = requestInputRef(rh, "payload").getAPropertyRead()
+          else this = rh.getARequestSource().ref().getAPropertyRead("payload")
         )
         or
         kind = "parameter" and
-        exists(DataFlow::PropRead query |
-          // `request.query.name`
-          query.accesses(request, ["query", "params"]) and
-          this.(DataFlow::PropRead).accesses(query, _)
+        exists(string property | property = ["query", "params"] |
+          // These are objects, so prefer a property read if possible.
+          if exists(requestInputRef(rh, property).getAPropertyRead())
+          then this = requestInputRef(rh, property).getAPropertyRead()
+          else this = rh.getARequestSource().ref().getAPropertyRead(property)
         )
         or
         exists(DataFlow::PropRead url |
@@ -199,30 +213,10 @@ module Hapi {
    */
   class RouteSetup extends DataFlow::MethodCallNode, Http::Servers::StandardRouteSetup {
     ServerDefinition server;
-    DataFlow::Node handler;
 
     RouteSetup() {
       server.ref().getAMethodCall() = this and
-      (
-        // server.route({ handler: fun })
-        this.getMethodName() = "route" and
-        this.getOptionArgument(0, "handler") = handler
-        or
-        // server.ext('/', fun)
-        this.getMethodName() = "ext" and
-        handler = this.getArgument(1)
-        or
-        // server.route([{ handler(request){}])
-        this.getMethodName() = "route" and
-        handler =
-          this.getArgument(0)
-              .getALocalSource()
-              .(DataFlow::ArrayCreationNode)
-              .getAnElement()
-              .getALocalSource()
-              .getAPropertySource("handler")
-              .getAFunctionValue()
-      )
+      this.getMethodName() = ["route", "ext"]
     }
 
     override DataFlow::SourceNode getARouteHandler() {
@@ -233,11 +227,45 @@ module Hapi {
       t.start() and
       result = this.getRouteHandler().getALocalSource()
       or
-      exists(DataFlow::TypeBackTracker t2 | result = this.getARouteHandler(t2).backtrack(t2, t))
+      this.getMethodName() = "route" and
+      t.isInProp("handler") and
+      result = this.getArgument(0).getALocalSource()
+      or
+      exists(DataFlow::TypeBackTracker t2, DataFlow::SourceNode succ |
+        succ = this.getARouteHandler(t2)
+      |
+        result = succ.backtrack(t2, t)
+        or
+        Http::routeHandlerStep(result, succ) and
+        t = t2
+        or
+        DataFlow::SharedFlowStep::storeStep(result.getALocalUse(), succ,
+          DataFlow::PseudoProperties::arrayElement()) and
+        t = t2.continue()
+      )
     }
 
     pragma[noinline]
-    private DataFlow::Node getRouteHandler() { result = handler }
+    private DataFlow::Node getRouteHandler() {
+      // server.route({ handler: fun })
+      this.getMethodName() = "route" and
+      this.getOptionArgument(0, "handler") = result
+      or
+      // server.ext('/', fun)
+      this.getMethodName() = "ext" and
+      result = this.getArgument(1)
+      or
+      // server.route([{ handler(request){}])
+      this.getMethodName() = "route" and
+      result =
+        this.getArgument(0)
+            .getALocalSource()
+            .(DataFlow::ArrayCreationNode)
+            .getAnElement()
+            .getALocalSource()
+            .getAPropertySource("handler")
+            .getAFunctionValue()
+    }
 
     override DataFlow::Node getServer() { result = server }
   }
@@ -263,6 +291,56 @@ module Hapi {
     }
   }
 
+  private DataFlow::SourceNode routeDefinitionRef(
+    DataFlow::ObjectLiteralNode definition, DataFlow::TypeTracker t
+  ) {
+    t.start() and
+    result = definition
+    or
+    exists(DataFlow::TypeTracker t2 | result = routeDefinitionRef(definition, t2).track(t2, t))
+  }
+
+  private predicate handlerRegistration(
+    DataFlow::FunctionNode handler, DataFlow::ObjectLiteralNode definition
+  ) {
+    exists(
+      DataFlow::CallNode registration, DataFlow::FunctionNode registrar,
+      DataFlow::ParameterNode handlerParameter, DataFlow::SourceNode handlerRef, int index
+    |
+      registration.getACallee() = registrar.getFunction() and
+      handlerParameter = registrar.getParameter(index) and
+      handlerParameter.flowsTo(definition.getAPropertyWrite("handler").getRhs()) and
+      (
+        handlerRef = handler
+        or
+        handlerRef = CallGraph::callgraphStep(handler, DataFlow::TypeTracker::end())
+      ) and
+      handlerRef.flowsTo(registration.getArgument(index))
+    )
+  }
+
+  /** Data flow through handlers stored in route definitions by registration helpers. */
+  private class RegisteredHandlerCallStep extends DataFlow::SharedFlowStep {
+    DataFlow::CallNode call;
+    DataFlow::FunctionNode handler;
+
+    RegisteredHandlerCallStep() {
+      exists(DataFlow::ObjectLiteralNode definition, DataFlow::PropRead handlerRead |
+        handlerRegistration(handler, definition) and
+        handlerRead.getPropertyName() = "handler" and
+        routeDefinitionRef(definition, DataFlow::TypeTracker::end()).flowsTo(handlerRead.getBase()) and
+        call.getCalleeNode() = handlerRead
+      )
+    }
+
+    override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
+      exists(int index |
+        pred = call.getArgument(index) and
+        succ = handler.getParameter(index)
+      )
+    }
+  }
+
   /**
    * A function that looks like a Hapi route handler and flows to a route setup.
    */
diff --git a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Arrays.qll b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Arrays.qll
index 984a9537003e..3f17de1a1d37 100644
--- a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Arrays.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Arrays.qll
@@ -290,7 +290,7 @@ class FlatMap extends SummarizedCallable::Range {
       output = "Argument[0].Parameter[2]"
       or
       input = "Argument[1]" and
-      output = "Argument[0].Parameter[1]"
+      output = "Argument[0].Parameter[this]"
       or
       input = "Argument[0].ReturnValue." + ["ArrayElement", "WithoutArrayElement"] and
       output = "ReturnValue.ArrayElement"
diff --git a/javascript/ql/lib/utils/test/InlineExpectationsTestQuery.ql b/javascript/ql/lib/utils/test/InlineExpectationsTestQuery.ql
index 55892be75d79..068f69d0013c 100644
--- a/javascript/ql/lib/utils/test/InlineExpectationsTestQuery.ql
+++ b/javascript/ql/lib/utils/test/InlineExpectationsTestQuery.ql
@@ -6,16 +6,4 @@ private import javascript
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>
diff --git a/javascript/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll b/javascript/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
index 42eb94230ae6..d73cdcd321b5 100644
--- a/javascript/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/javascript/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
@@ -8,6 +8,16 @@ module Impl implements InlineExpectationsTestSig {
 
   class Location = JS::Location;
 
+  string getRelativeUrl(Location location) {
+    exists(JS::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
+
   abstract private class ExpectationCommentImpl extends Locatable {
     abstract string getContents();
 
diff --git a/javascript/ql/src/CHANGELOG.md b/javascript/ql/src/CHANGELOG.md
index 2e8bcd543c25..d0a66885fac5 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,3 +1,43 @@
+## 2.5.0
+
+### Query Metadata Changes
+
+* The `external/cwe/cwe-730` tag has been removed from `js/redos`, `js/polynomial-redos`, `js/regex-injection`, `js/regex-injection-more-sources`, `js/server-crash` and `js/loop-bound-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
+
+### Minor Analysis Improvements
+
+* The `js/invalid-prototype-value` query no longer reports computed `__proto__` properties in object literals.
+
+## 2.4.8
+
+No user-facing changes.
+
+## 2.4.7
+
+No user-facing changes.
+
+## 2.4.6
+
+No user-facing changes.
+
+## 2.4.5
+
+### Minor Analysis Improvements
+
+* HTML files are now included in file-coverage stats, and will start showing up on the status page for CodeQL under "Scanned Files".
+
+## 2.4.4
+
+### Minor Analysis Improvements
+
+* The `js/superfluous-trailing-arguments` query no longer reports valid arguments passed to the `TransformStream` constructor.
+
+## 2.4.3
+
+### Minor Analysis Improvements
+
+* The `js/missing-rate-limiting` query now recognizes the `@fastify/rate-limit` package as a rate limiter.
+
 ## 2.4.2
 
 No user-facing changes.
diff --git a/javascript/ql/src/Comments/TodoComments.qhelp b/javascript/ql/src/Comments/TodoComments.qhelp
index 1b6650493108..eb7db3b7bbb4 100644
--- a/javascript/ql/src/Comments/TodoComments.qhelp
+++ b/javascript/ql/src/Comments/TodoComments.qhelp
@@ -44,7 +44,7 @@ Approxion:
 </li>
 <li>
 Wikipedia:
-<a href="http://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Tags">Comment tags</a>.
+<a href="https://en.wikipedia.org/wiki/Comment_%28computer_programming%29#Tags">Comment tags</a>.
 </li>
 
 
diff --git a/javascript/ql/src/Declarations/DeadStore.inc.qhelp b/javascript/ql/src/Declarations/DeadStore.inc.qhelp
index 4f6591a657f8..6d35e1833c60 100644
--- a/javascript/ql/src/Declarations/DeadStore.inc.qhelp
+++ b/javascript/ql/src/Declarations/DeadStore.inc.qhelp
@@ -41,7 +41,7 @@ succeeded or not, the value of <code>result</code> should be checked, perhaps li
 <references>
 
 
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Dead_store">Dead store</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Dead_store">Dead store</a>.</li>
 
 
 
diff --git a/javascript/ql/src/LanguageFeatures/Eval.qhelp b/javascript/ql/src/LanguageFeatures/Eval.qhelp
index 16fdcbee6301..c49594445d7d 100644
--- a/javascript/ql/src/LanguageFeatures/Eval.qhelp
+++ b/javascript/ql/src/LanguageFeatures/Eval.qhelp
@@ -18,7 +18,7 @@ In many cases, better alternatives are available and should be used instead.
 There are few genuine uses of <code>eval</code> and <code>Function</code>. If you are trying to
 assign to a property whose name is not known until runtime, use a computed property access. If you
 are trying to evaluate a string to a JSON object, use <code>JSON.parse</code>. In other cases,
-you may be able to use the <a href="http://en.wikipedia.org/wiki/Interpreter_pattern">Interpreter
+you may be able to use the <a href="https://en.wikipedia.org/wiki/Interpreter_pattern">Interpreter
 pattern</a>.
 </p>
 
diff --git a/javascript/ql/src/LanguageFeatures/InvalidPrototype.ql b/javascript/ql/src/LanguageFeatures/InvalidPrototype.ql
index 8770d8dc2713..cc1b5861916a 100644
--- a/javascript/ql/src/LanguageFeatures/InvalidPrototype.ql
+++ b/javascript/ql/src/LanguageFeatures/InvalidPrototype.ql
@@ -21,7 +21,11 @@ private import semmle.javascript.dataflow.InferredTypes
  */
 predicate isProto(DataFlow::AnalyzedNode e) {
   // `o.__proto__ = e`, `{ __proto__: e }`, ...
-  e = any(DataFlow::PropWrite pwn | pwn.getPropertyName() = "__proto__").getRhs()
+  e =
+    any(DataFlow::PropWrite pwn |
+      pwn.getPropertyName() = "__proto__" and
+      not pwn.getWriteNode().(Property).isComputed()
+    ).getRhs()
   or
   // Object.create(e)
   e = DataFlow::globalVarRef("Object").getAMemberCall("create").getArgument(0)
diff --git a/javascript/ql/src/Metrics/FCyclomaticComplexity.qhelp b/javascript/ql/src/Metrics/FCyclomaticComplexity.qhelp
index 329557ec67e7..6f94b7f9de30 100644
--- a/javascript/ql/src/Metrics/FCyclomaticComplexity.qhelp
+++ b/javascript/ql/src/Metrics/FCyclomaticComplexity.qhelp
@@ -67,10 +67,10 @@ T. J. McCabe, <em>A Complexity Measure</em>. IEEE Transactions on Software Engin
 Dave Thomas, <a href="http://www.jot.fm/issues/issue_2005_01/column1/">Refactoring as Meta Programming?</a>, in Journal of Object Technology, vol. 4, no. 1, January-February 2005, pp. 7-11.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Code_refactoring">Code refactoring</a>
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Code_refactoring">Code refactoring</a>
 </li>
 
 </references>
diff --git a/javascript/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.inc.qhelp b/javascript/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.inc.qhelp
index 6fc36156c110..47e4c871dbe0 100644
--- a/javascript/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.inc.qhelp
+++ b/javascript/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.inc.qhelp
@@ -27,7 +27,7 @@ a shared library or module.
 <references> 
 
 
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Duplicate_code">Duplicate code</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Duplicate_code">Duplicate code</a>.</li>
 <li>M. Fowler, <em>Refactoring</em>. Addison-Wesley, 1999.</li>
 
 
diff --git a/javascript/ql/src/Metrics/FLinesOfSimilarCodeCommon.inc.qhelp b/javascript/ql/src/Metrics/FLinesOfSimilarCodeCommon.inc.qhelp
index 07cae328b237..80cb9ace858b 100644
--- a/javascript/ql/src/Metrics/FLinesOfSimilarCodeCommon.inc.qhelp
+++ b/javascript/ql/src/Metrics/FLinesOfSimilarCodeCommon.inc.qhelp
@@ -28,7 +28,7 @@ that can be reused across modules.
 <references> 
 
 
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Duplicate_code">Duplicate code</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Duplicate_code">Duplicate code</a>.</li>
 <li>M. Fowler, <em>Refactoring</em>. Addison-Wesley, 1999.</li>
 
 
diff --git a/javascript/ql/src/Metrics/FunCyclomaticComplexity.qhelp b/javascript/ql/src/Metrics/FunCyclomaticComplexity.qhelp
index ab4594d76905..ac18aa8cf5a6 100644
--- a/javascript/ql/src/Metrics/FunCyclomaticComplexity.qhelp
+++ b/javascript/ql/src/Metrics/FunCyclomaticComplexity.qhelp
@@ -34,7 +34,7 @@ M. Fowler. <em>Refactoring</em>. Addison-Wesley, 1999.
 T. J. McCabe. <em>A Complexity Measure</em>. IEEE Transactions on Software Engineering, SE-2(4), December 1976.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>.
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cyclomatic_complexity">Cyclomatic complexity</a>.
 </li>
 
 
diff --git a/javascript/ql/src/Performance/PolynomialReDoS.ql b/javascript/ql/src/Performance/PolynomialReDoS.ql
index 7a4e72136f4a..7f30ef4b389e 100644
--- a/javascript/ql/src/Performance/PolynomialReDoS.ql
+++ b/javascript/ql/src/Performance/PolynomialReDoS.ql
@@ -9,7 +9,6 @@
  * @id js/polynomial-redos
  * @tags security
  *       external/cwe/cwe-1333
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/javascript/ql/src/Performance/ReDoS.ql b/javascript/ql/src/Performance/ReDoS.ql
index cf4f80c34cef..dfa7f83dfa77 100644
--- a/javascript/ql/src/Performance/ReDoS.ql
+++ b/javascript/ql/src/Performance/ReDoS.ql
@@ -10,7 +10,6 @@
  * @id js/redos
  * @tags security
  *       external/cwe/cwe-1333
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/javascript/ql/src/Security/CWE-078/CommandInjection.inc.qhelp b/javascript/ql/src/Security/CWE-078/CommandInjection.inc.qhelp
index 5e598d235950..063c7ac34649 100644
--- a/javascript/ql/src/Security/CWE-078/CommandInjection.inc.qhelp
+++ b/javascript/ql/src/Security/CWE-078/CommandInjection.inc.qhelp
@@ -53,7 +53,7 @@ against an allowlist of safe characters before using it:</p>
 <references>
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 <li>
 npm:
diff --git a/javascript/ql/src/Security/CWE-078/IndirectCommandInjection.qhelp b/javascript/ql/src/Security/CWE-078/IndirectCommandInjection.qhelp
index 83ddaef0814f..ec81d76761da 100644
--- a/javascript/ql/src/Security/CWE-078/IndirectCommandInjection.qhelp
+++ b/javascript/ql/src/Security/CWE-078/IndirectCommandInjection.qhelp
@@ -106,7 +106,7 @@ into an array of arguments instead.
 
 		<li>
 			OWASP:
-			<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+			<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 		</li>
 
 		<li>
diff --git a/javascript/ql/src/Security/CWE-078/SecondOrderCommandInjection.qhelp b/javascript/ql/src/Security/CWE-078/SecondOrderCommandInjection.qhelp
index d85b4c232889..4c377cb913cd 100644
--- a/javascript/ql/src/Security/CWE-078/SecondOrderCommandInjection.qhelp
+++ b/javascript/ql/src/Security/CWE-078/SecondOrderCommandInjection.qhelp
@@ -40,7 +40,7 @@ being passed to the shell command.
 <references>
 <li>Max Justicz: <a href="https://justi.cz/security/2021/04/20/cocoapods-rce.html">Hacking 3,000,000 apps at once through CocoaPods</a>.</li>
 <li>Git: <a href="https://git-scm.com/docs/git-ls-remote/2.22.0#Documentation/git-ls-remote.txt---upload-packltexecgt">Git - git-ls-remote Documentation</a>.</li>
-<li>OWASP: <a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.</li>
+<li>OWASP: <a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.</li>
 
 </references>
 </qhelp>
diff --git a/javascript/ql/src/Security/CWE-078/ShellCommandInjectionFromEnvironment.qhelp b/javascript/ql/src/Security/CWE-078/ShellCommandInjectionFromEnvironment.qhelp
index 8937b67a420a..e5d3660639b0 100644
--- a/javascript/ql/src/Security/CWE-078/ShellCommandInjectionFromEnvironment.qhelp
+++ b/javascript/ql/src/Security/CWE-078/ShellCommandInjectionFromEnvironment.qhelp
@@ -96,7 +96,7 @@
 
 	<li>
 		OWASP:
-		<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+		<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 	</li>
 
 </references>
diff --git a/javascript/ql/src/Security/CWE-078/UnsafeShellCommandConstruction.qhelp b/javascript/ql/src/Security/CWE-078/UnsafeShellCommandConstruction.qhelp
index e2829cf85e01..d35b0f34721d 100644
--- a/javascript/ql/src/Security/CWE-078/UnsafeShellCommandConstruction.qhelp
+++ b/javascript/ql/src/Security/CWE-078/UnsafeShellCommandConstruction.qhelp
@@ -102,7 +102,7 @@
 
 	<li>
 		OWASP:
-		<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+		<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 	</li>
 
 	<li>
diff --git a/javascript/ql/src/Security/CWE-078/UselessUseOfCat.qhelp b/javascript/ql/src/Security/CWE-078/UselessUseOfCat.qhelp
index 5ef218bdf59b..72780659f83a 100644
--- a/javascript/ql/src/Security/CWE-078/UselessUseOfCat.qhelp
+++ b/javascript/ql/src/Security/CWE-078/UselessUseOfCat.qhelp
@@ -36,7 +36,7 @@ and if the input is user-controlled, a command injection attack can happen.</p>
 </example>
 <references>
 
-<li>OWASP: <a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.</li>
+<li>OWASP: <a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.</li>
 <li>Node.js: <a href="https://nodejs.org/api/fs.html">File System API</a>.</li>
 <li><a href="http://porkmail.org/era/unix/award.html#cat">The Useless Use of Cat Award</a>.</li>
 
diff --git a/javascript/ql/src/Security/CWE-079/ExceptionXss.qhelp b/javascript/ql/src/Security/CWE-079/ExceptionXss.qhelp
index 7ab1038b067e..6b0c8d98fe1f 100644
--- a/javascript/ql/src/Security/CWE-079/ExceptionXss.qhelp
+++ b/javascript/ql/src/Security/CWE-079/ExceptionXss.qhelp
@@ -61,7 +61,7 @@ OWASP
 Scripting</a>.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 </li>
 </references>
 </qhelp>
diff --git a/javascript/ql/src/Security/CWE-079/ReflectedXss.qhelp b/javascript/ql/src/Security/CWE-079/ReflectedXss.qhelp
index dcbf0ba6f071..f7925eb0bbef 100644
--- a/javascript/ql/src/Security/CWE-079/ReflectedXss.qhelp
+++ b/javascript/ql/src/Security/CWE-079/ReflectedXss.qhelp
@@ -46,7 +46,7 @@ OWASP
 Scripting</a>.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 </li>
 </references>
 </qhelp>
diff --git a/javascript/ql/src/Security/CWE-079/StoredXss.qhelp b/javascript/ql/src/Security/CWE-079/StoredXss.qhelp
index 0e6ed6456c97..2cefb7eefe62 100644
--- a/javascript/ql/src/Security/CWE-079/StoredXss.qhelp
+++ b/javascript/ql/src/Security/CWE-079/StoredXss.qhelp
@@ -57,7 +57,7 @@
 		Scripting</a>.
 	</li>
 	<li>
-		Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+		Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 	</li>
 </references>
 </qhelp>
diff --git a/javascript/ql/src/Security/CWE-079/UnsafeHtmlConstruction.qhelp b/javascript/ql/src/Security/CWE-079/UnsafeHtmlConstruction.qhelp
index 4ab53d1964fd..715a0a0776a3 100644
--- a/javascript/ql/src/Security/CWE-079/UnsafeHtmlConstruction.qhelp
+++ b/javascript/ql/src/Security/CWE-079/UnsafeHtmlConstruction.qhelp
@@ -71,7 +71,7 @@
 		Scripting</a>.
 	</li>
 	<li>
-		Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+		Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 	</li>
 </references>
 </qhelp>
diff --git a/javascript/ql/src/Security/CWE-079/UnsafeJQueryPlugin.qhelp b/javascript/ql/src/Security/CWE-079/UnsafeJQueryPlugin.qhelp
index ea3fa3be486f..835a8ddc420e 100644
--- a/javascript/ql/src/Security/CWE-079/UnsafeJQueryPlugin.qhelp
+++ b/javascript/ql/src/Security/CWE-079/UnsafeJQueryPlugin.qhelp
@@ -89,7 +89,7 @@
 			Scripting</a>.
 		</li>
 		<li>
-			Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+			Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 		</li>
 		<li>
 			jQuery: <a href="https://learn.jquery.com/plugins/basic-plugin-creation/">Plugin creation</a>.
diff --git a/javascript/ql/src/Security/CWE-079/Xss.inc.qhelp b/javascript/ql/src/Security/CWE-079/Xss.inc.qhelp
index c974c87b1882..448b21b4dc41 100644
--- a/javascript/ql/src/Security/CWE-079/Xss.inc.qhelp
+++ b/javascript/ql/src/Security/CWE-079/Xss.inc.qhelp
@@ -51,7 +51,7 @@ OWASP
 Scripting</a>.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 </li>
 </references>
 </qhelp>
diff --git a/javascript/ql/src/Security/CWE-079/XssThroughDom.qhelp b/javascript/ql/src/Security/CWE-079/XssThroughDom.qhelp
index f3c6d27c5de6..eab572a60983 100644
--- a/javascript/ql/src/Security/CWE-079/XssThroughDom.qhelp
+++ b/javascript/ql/src/Security/CWE-079/XssThroughDom.qhelp
@@ -64,7 +64,7 @@ OWASP
 Scripting</a>.
 </li>
 <li>
-Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 </li>
 </references>
 </qhelp>
diff --git a/javascript/ql/src/Security/CWE-116/IncompleteHtmlAttributeSanitization.qhelp b/javascript/ql/src/Security/CWE-116/IncompleteHtmlAttributeSanitization.qhelp
index 7abe4844dfd1..666f982c9092 100644
--- a/javascript/ql/src/Security/CWE-116/IncompleteHtmlAttributeSanitization.qhelp
+++ b/javascript/ql/src/Security/CWE-116/IncompleteHtmlAttributeSanitization.qhelp
@@ -91,7 +91,7 @@
 			<a href="https://owasp.org/www-community/Types_of_Cross-Site_Scripting">Types of Cross-Site</a>.
 		</li>
 		<li>
-			Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+			Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 		</li>
 	</references>
 
diff --git a/javascript/ql/src/Security/CWE-116/UnsafeHtmlExpansion.qhelp b/javascript/ql/src/Security/CWE-116/UnsafeHtmlExpansion.qhelp
index 3a70e87933cb..284377b9f3db 100644
--- a/javascript/ql/src/Security/CWE-116/UnsafeHtmlExpansion.qhelp
+++ b/javascript/ql/src/Security/CWE-116/UnsafeHtmlExpansion.qhelp
@@ -101,7 +101,7 @@
 			<a href="https://owasp.org/www-community/Types_of_Cross-Site_Scripting">Types of Cross-Site</a>.
 		</li>
 		<li>
-			Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+			Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 		</li>
 	</references>
 
diff --git a/javascript/ql/src/Security/CWE-338/InsecureRandomness.qhelp b/javascript/ql/src/Security/CWE-338/InsecureRandomness.qhelp
index 83786a014a0b..2005452f4fbb 100644
--- a/javascript/ql/src/Security/CWE-338/InsecureRandomness.qhelp
+++ b/javascript/ql/src/Security/CWE-338/InsecureRandomness.qhelp
@@ -68,7 +68,7 @@
 	</example>
 
 	<references>
-		<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Pseudorandom_number_generator">Pseudo-random number generator</a>.</li>
+		<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Pseudorandom_number_generator">Pseudo-random number generator</a>.</li>
 		<li>Mozilla Developer Network: <a href="https://developer.mozilla.org/en-US/docs/Web/API/Crypto/getRandomValues">Crypto: getRandomValues()</a>.</li>
 		<li>NodeJS: <a href="https://nodejs.org/api/crypto.html#crypto_crypto_randombytes_size_callback">crypto.randomBytes</a></li>
 	</references>
diff --git a/javascript/ql/src/Security/CWE-730/RegExpInjection.ql b/javascript/ql/src/Security/CWE-730/RegExpInjection.ql
index 4260c5e23eee..78b754680e61 100644
--- a/javascript/ql/src/Security/CWE-730/RegExpInjection.ql
+++ b/javascript/ql/src/Security/CWE-730/RegExpInjection.ql
@@ -9,7 +9,6 @@
  * @precision high
  * @id js/regex-injection
  * @tags security
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/javascript/ql/src/Security/CWE-730/ServerCrash.ql b/javascript/ql/src/Security/CWE-730/ServerCrash.ql
index 1da328392c21..08043bf8c7fe 100644
--- a/javascript/ql/src/Security/CWE-730/ServerCrash.ql
+++ b/javascript/ql/src/Security/CWE-730/ServerCrash.ql
@@ -9,7 +9,6 @@
  * @id js/server-crash
  * @tags security
  *       external/cwe/cwe-248
- *       external/cwe/cwe-730
  */
 
 import javascript
diff --git a/javascript/ql/src/Security/CWE-834/LoopBoundInjection.ql b/javascript/ql/src/Security/CWE-834/LoopBoundInjection.ql
index 8a8c74e9847d..fab30358322f 100644
--- a/javascript/ql/src/Security/CWE-834/LoopBoundInjection.ql
+++ b/javascript/ql/src/Security/CWE-834/LoopBoundInjection.ql
@@ -8,7 +8,6 @@
  * @id js/loop-bound-injection
  * @tags security
  *       external/cwe/cwe-834
- *       external/cwe/cwe-730
  * @precision high
  */
 
diff --git a/javascript/ql/src/Statements/DanglingElse.qhelp b/javascript/ql/src/Statements/DanglingElse.qhelp
index 23ca8fd03f38..8c6004a7f122 100644
--- a/javascript/ql/src/Statements/DanglingElse.qhelp
+++ b/javascript/ql/src/Statements/DanglingElse.qhelp
@@ -52,7 +52,7 @@ curly braces:
 <references>
 
 
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Dangling_else">Dangling else</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Dangling_else">Dangling else</a>.</li>
 
 </references>
 </qhelp>
diff --git a/javascript/ql/src/Statements/UnreachableStatement.qhelp b/javascript/ql/src/Statements/UnreachableStatement.qhelp
index 71997740b0bb..122a9ebd3baa 100644
--- a/javascript/ql/src/Statements/UnreachableStatement.qhelp
+++ b/javascript/ql/src/Statements/UnreachableStatement.qhelp
@@ -37,7 +37,7 @@ To correct this issue, remove the spurious semicolon:
 <references>
 
 
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Unreachable_code">Unreachable code</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Unreachable_code">Unreachable code</a>.</li>
 
 </references>
 </qhelp>
diff --git a/javascript/ql/src/change-notes/2026-07-22-fastify-rate-limit.md b/javascript/ql/src/change-notes/2026-07-22-fastify-rate-limit.md
deleted file mode 100644
index 55e23b9dc111..000000000000
--- a/javascript/ql/src/change-notes/2026-07-22-fastify-rate-limit.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The `js/missing-rate-limiting` query now recognizes the `@fastify/rate-limit` package as a rate limiter.
diff --git a/javascript/ql/src/change-notes/2026-10-21-storageevent-constructor-arity.md b/javascript/ql/src/change-notes/2026-10-21-storageevent-constructor-arity.md
new file mode 100644
index 000000000000..4ebe50525e99
--- /dev/null
+++ b/javascript/ql/src/change-notes/2026-10-21-storageevent-constructor-arity.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Valid arguments passed to the `StorageEvent` constructor no longer produce alerts from `js/superfluous-trailing-arguments`.
\ No newline at end of file
diff --git a/javascript/ql/src/change-notes/released/2.4.3.md b/javascript/ql/src/change-notes/released/2.4.3.md
new file mode 100644
index 000000000000..11f57d32a7a9
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.4.3.md
@@ -0,0 +1,5 @@
+## 2.4.3
+
+### Minor Analysis Improvements
+
+* The `js/missing-rate-limiting` query now recognizes the `@fastify/rate-limit` package as a rate limiter.
diff --git a/javascript/ql/src/change-notes/released/2.4.4.md b/javascript/ql/src/change-notes/released/2.4.4.md
new file mode 100644
index 000000000000..3d5e2f6a593e
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.4.4.md
@@ -0,0 +1,5 @@
+## 2.4.4
+
+### Minor Analysis Improvements
+
+* The `js/superfluous-trailing-arguments` query no longer reports valid arguments passed to the `TransformStream` constructor.
diff --git a/javascript/ql/src/change-notes/released/2.4.5.md b/javascript/ql/src/change-notes/released/2.4.5.md
new file mode 100644
index 000000000000..1aa2fab3f616
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.4.5.md
@@ -0,0 +1,5 @@
+## 2.4.5
+
+### Minor Analysis Improvements
+
+* HTML files are now included in file-coverage stats, and will start showing up on the status page for CodeQL under "Scanned Files".
diff --git a/javascript/ql/src/change-notes/released/2.4.6.md b/javascript/ql/src/change-notes/released/2.4.6.md
new file mode 100644
index 000000000000..9c588051a43a
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.4.6.md
@@ -0,0 +1,3 @@
+## 2.4.6
+
+No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/2.4.7.md b/javascript/ql/src/change-notes/released/2.4.7.md
new file mode 100644
index 000000000000..a281729de6d8
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.4.7.md
@@ -0,0 +1,3 @@
+## 2.4.7
+
+No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/2.4.8.md b/javascript/ql/src/change-notes/released/2.4.8.md
new file mode 100644
index 000000000000..b26883844325
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.4.8.md
@@ -0,0 +1,3 @@
+## 2.4.8
+
+No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/2.5.0.md b/javascript/ql/src/change-notes/released/2.5.0.md
new file mode 100644
index 000000000000..a632bb631969
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.5.0.md
@@ -0,0 +1,9 @@
+## 2.5.0
+
+### Query Metadata Changes
+
+* The `external/cwe/cwe-730` tag has been removed from `js/redos`, `js/polynomial-redos`, `js/regex-injection`, `js/regex-injection-more-sources`, `js/server-crash` and `js/loop-bound-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
+
+### Minor Analysis Improvements
+
+* The `js/invalid-prototype-value` query no longer reports computed `__proto__` properties in object literals.
diff --git a/javascript/ql/src/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
index 660b0f7e51c9..a1e889c054a7 100644
--- a/javascript/ql/src/codeql-pack.release.yml
+++ b/javascript/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.4.2
+lastReleaseVersion: 2.5.0
diff --git a/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-730/RegExpInjection.ql b/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-730/RegExpInjection.ql
index b0e761257cb5..ea0f35b332ea 100644
--- a/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-730/RegExpInjection.ql
+++ b/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-730/RegExpInjection.ql
@@ -10,7 +10,6 @@
  * @id js/regex-injection-more-sources
  * @tags experimental
  *       security
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index 1c534df4d85b..d7104940af11 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 2.4.3-dev
+version: 2.5.1-dev
 groups:
   - javascript
   - queries
diff --git a/javascript/ql/test/library-tests/AwaitPropertyName/AwaitPropertyName.expected b/javascript/ql/test/library-tests/AwaitPropertyName/AwaitPropertyName.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/javascript/ql/test/library-tests/AwaitPropertyName/AwaitPropertyName.ql b/javascript/ql/test/library-tests/AwaitPropertyName/AwaitPropertyName.ql
new file mode 100644
index 000000000000..939784b52eab
--- /dev/null
+++ b/javascript/ql/test/library-tests/AwaitPropertyName/AwaitPropertyName.ql
@@ -0,0 +1,4 @@
+import javascript
+
+from JSParseError err
+select err
diff --git a/javascript/ql/test/library-tests/AwaitPropertyName/options b/javascript/ql/test/library-tests/AwaitPropertyName/options
new file mode 100644
index 000000000000..13f987b19caf
--- /dev/null
+++ b/javascript/ql/test/library-tests/AwaitPropertyName/options
@@ -0,0 +1 @@
+semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/library-tests/AwaitPropertyName/tst.js b/javascript/ql/test/library-tests/AwaitPropertyName/tst.js
new file mode 100644
index 000000000000..4edc377402c0
--- /dev/null
+++ b/javascript/ql/test/library-tests/AwaitPropertyName/tst.js
@@ -0,0 +1,10 @@
+const pool = { await() { return 42; } };
+const generator = { yield() { return 42; } };
+
+async function issue22499() {
+  return await pool.await();
+}
+
+function* yieldPropertyName() {
+  return generator.yield();
+}
diff --git a/javascript/ql/test/library-tests/Directives/KnownDirective.expected b/javascript/ql/test/library-tests/Directives/KnownDirective.expected
index 065c0954f747..50fb4593dcf4 100644
--- a/javascript/ql/test/library-tests/Directives/KnownDirective.expected
+++ b/javascript/ql/test/library-tests/Directives/KnownDirective.expected
@@ -1,20 +1,24 @@
 | tst.js:1:1:1:13 | 'use strict'; | use strict |
 | tst.js:2:1:2:10 | 'use asm'; | use asm |
 | tst.js:3:1:3:9 | 'bundle'; | bundle |
-| tst.js:4:1:4:13 | 'use server'; | use server |
-| tst.js:5:1:5:13 | 'use client'; | use client |
-| tst.js:6:1:6:11 | 'use memo'; | use memo |
-| tst.js:7:1:7:14 | 'use no memo'; | use no memo |
-| tst.js:8:1:8:12 | 'use cache'; | use cache |
-| tst.js:9:1:9:20 | 'use cache: remote'; | use cache: remote |
-| tst.js:10:1:10:21 | 'use ca ... ivate'; | use cache: private |
-| tst.js:19:3:19:12 | 'use asm'; | use asm |
-| tst.js:20:3:20:11 | 'bundle'; | bundle |
-| tst.js:21:3:21:15 | 'use server'; | use server |
-| tst.js:22:3:22:15 | 'use client'; | use client |
-| tst.js:23:3:23:13 | 'use memo'; | use memo |
-| tst.js:24:3:24:16 | 'use no memo'; | use no memo |
-| tst.js:25:3:25:14 | 'use cache'; | use cache |
-| tst.js:26:3:26:22 | 'use cache: remote'; | use cache: remote |
-| tst.js:27:3:27:23 | 'use ca ... ivate'; | use cache: private |
-| tst.js:34:5:34:17 | 'use strict'; | use strict |
+| tst.js:4:1:4:10 | 'worklet'; | worklet |
+| tst.js:5:1:5:13 | 'use server'; | use server |
+| tst.js:6:1:6:13 | 'use client'; | use client |
+| tst.js:7:1:7:11 | 'use memo'; | use memo |
+| tst.js:8:1:8:14 | 'use no memo'; | use no memo |
+| tst.js:9:1:9:12 | 'use cache'; | use cache |
+| tst.js:10:1:10:20 | 'use cache: remote'; | use cache: remote |
+| tst.js:11:1:11:21 | 'use ca ... ivate'; | use cache: private |
+| tst.js:20:3:20:12 | 'use asm'; | use asm |
+| tst.js:21:3:21:11 | 'bundle'; | bundle |
+| tst.js:22:3:22:12 | 'worklet'; | worklet |
+| tst.js:23:3:23:15 | 'use server'; | use server |
+| tst.js:24:3:24:15 | 'use client'; | use client |
+| tst.js:25:3:25:13 | 'use memo'; | use memo |
+| tst.js:26:3:26:16 | 'use no memo'; | use no memo |
+| tst.js:27:3:27:14 | 'use cache'; | use cache |
+| tst.js:28:3:28:22 | 'use cache: remote'; | use cache: remote |
+| tst.js:29:3:29:23 | 'use ca ... ivate'; | use cache: private |
+| tst.js:30:3:30:17 | 'use workflow'; | use workflow |
+| tst.js:31:3:31:13 | 'use step'; | use step |
+| tst.js:38:5:38:17 | 'use strict'; | use strict |
diff --git a/javascript/ql/test/library-tests/Directives/tst.js b/javascript/ql/test/library-tests/Directives/tst.js
index 7c7676322a4a..676972b99825 100644
--- a/javascript/ql/test/library-tests/Directives/tst.js
+++ b/javascript/ql/test/library-tests/Directives/tst.js
@@ -1,6 +1,7 @@
 'use strict'; // this is a directive
 'use asm'; // and so is this
 'bundle';// and this
+'worklet';
 'use server';
 'use client';
 'use memo';
@@ -18,6 +19,7 @@ function f() {
   'use\x20strict'; // this is a directive, though not a strict mode directive
   'use asm'; // and so is this
   'bundle';
+  'worklet';
   'use server';
   'use client';
   'use memo';
@@ -25,6 +27,8 @@ function f() {
   'use cache';
   'use cache: remote';
   'use cache: private';
+  'use workflow';
+  'use step';
   ;
   'use strict'; // but this isn't a directive
 }
diff --git a/javascript/ql/test/library-tests/Extend/ExtendCalls.expected b/javascript/ql/test/library-tests/Extend/ExtendCalls.expected
index a4c66634f7cb..f77739770720 100644
--- a/javascript/ql/test/library-tests/Extend/ExtendCalls.expected
+++ b/javascript/ql/test/library-tests/Extend/ExtendCalls.expected
@@ -29,17 +29,18 @@
 | tst.js:64:1:64:48 | checkSh ... arg())) | OK |
 | tst.js:65:1:65:54 | checkSh ... arg())) | OK |
 | tst.js:66:1:66:45 | checkSh ... arg())) | OK |
-| tst.js:67:1:67:52 | checkSh ... arg())) | OK |
-| tst.js:68:1:68:53 | checkSh ... arg())) | OK |
+| tst.js:67:1:67:57 | checkSh ... arg())) | OK |
+| tst.js:68:1:68:52 | checkSh ... arg())) | OK |
 | tst.js:69:1:69:53 | checkSh ... arg())) | OK |
-| tst.js:70:1:70:55 | checkSh ... arg())) | OK |
-| tst.js:71:1:71:52 | checkSh ... arg())) | OK |
-| tst.js:72:1:72:51 | checkSh ... arg())) | OK |
+| tst.js:70:1:70:53 | checkSh ... arg())) | OK |
+| tst.js:71:1:71:55 | checkSh ... arg())) | OK |
+| tst.js:72:1:72:52 | checkSh ... arg())) | OK |
 | tst.js:73:1:73:51 | checkSh ... arg())) | OK |
-| tst.js:74:1:74:53 | checkSh ... arg())) | OK |
+| tst.js:74:1:74:51 | checkSh ... arg())) | OK |
 | tst.js:75:1:75:53 | checkSh ... arg())) | OK |
-| tst.js:79:1:79:45 | checkSh ... arg())) | OK |
-| tst.js:80:1:80:55 | checkSh ... arg())) | OK |
-| tst.js:81:1:81:51 | checkSh ... arg())) | OK |
-| tst.js:85:1:85:44 | checkDe ... arg())) | OK |
-| tst.js:86:1:86:61 | checkDe ... arg())) | OK |
+| tst.js:76:1:76:53 | checkSh ... arg())) | OK |
+| tst.js:80:1:80:45 | checkSh ... arg())) | OK |
+| tst.js:81:1:81:55 | checkSh ... arg())) | OK |
+| tst.js:82:1:82:51 | checkSh ... arg())) | OK |
+| tst.js:86:1:86:44 | checkDe ... arg())) | OK |
+| tst.js:87:1:87:61 | checkDe ... arg())) | OK |
diff --git a/javascript/ql/test/library-tests/Extend/package.json b/javascript/ql/test/library-tests/Extend/package.json
index dd73e8e0a5ec..c18a62e2c71e 100644
--- a/javascript/ql/test/library-tests/Extend/package.json
+++ b/javascript/ql/test/library-tests/Extend/package.json
@@ -17,6 +17,7 @@
 		"lodash.mergewith": "^4.6.1",
 		"merge": "^1.2.0",
 		"merge-deep": "^3.0.2",
+		"merge-descriptors": "^1.0.3",
 		"merge-options": "^1.0.1",
 		"mixin-deep": "^2.0.0",
 		"mixin-object": "^3.0.0",
diff --git a/javascript/ql/test/library-tests/Extend/tst.js b/javascript/ql/test/library-tests/Extend/tst.js
index 500178e3e5d3..dc92a2564efc 100644
--- a/javascript/ql/test/library-tests/Extend/tst.js
+++ b/javascript/ql/test/library-tests/Extend/tst.js
@@ -64,6 +64,7 @@ checkShallow(Object.assign(base(), arg()));
 checkShallow(require("defaults")(base(), arg()));
 checkShallow(require("extend-shallow")(base(), arg()));
 checkShallow(require("merge")(base(), arg()));
+checkShallow(require("merge-descriptors")(base(), arg()));
 checkShallow(require("mixin-object")(base(), arg()));
 checkShallow(require("object-assign")(base(), arg()));
 checkShallow(require("object.assign")(base(), arg()));
diff --git a/javascript/ql/test/library-tests/FlowSummary/CaptureConsistency.expected b/javascript/ql/test/library-tests/FlowSummary/CaptureConsistency.expected
index 35f4edcf1fb9..e331f0ddde45 100644
--- a/javascript/ql/test/library-tests/FlowSummary/CaptureConsistency.expected
+++ b/javascript/ql/test/library-tests/FlowSummary/CaptureConsistency.expected
@@ -15,3 +15,4 @@ closureAliasMustBeInSameScope
 variableAccessAstNesting
 uniqueCallableLocation
 consistencyOverview
+ambiguousReadNode
diff --git a/javascript/ql/test/library-tests/FlowSummary/DataFlowConsistency.expected b/javascript/ql/test/library-tests/FlowSummary/DataFlowConsistency.expected
index 51612c5b97ae..84608216a9ff 100644
--- a/javascript/ql/test/library-tests/FlowSummary/DataFlowConsistency.expected
+++ b/javascript/ql/test/library-tests/FlowSummary/DataFlowConsistency.expected
@@ -18,6 +18,7 @@ postIsInSameCallable
 reverseRead
 | tst.js:109:11:113:3 | [dynamic parameter array] | Origin of readStep is missing a PostUpdateNode. |
 | tst.js:267:28:267:31 | map3 | Origin of readStep is missing a PostUpdateNode. |
+| tst.js:305:30:305:43 | constructedMap | Origin of readStep is missing a PostUpdateNode. |
 argHasPostUpdate
 postWithInFlow
 viableImplInCallContextTooLarge
diff --git a/javascript/ql/test/library-tests/FlowSummary/tst.js b/javascript/ql/test/library-tests/FlowSummary/tst.js
index f3bf8513840e..a006f9c4230f 100644
--- a/javascript/ql/test/library-tests/FlowSummary/tst.js
+++ b/javascript/ql/test/library-tests/FlowSummary/tst.js
@@ -299,3 +299,11 @@ function m18() {
   sink(dynamicParam1("safe", ...[source()])); // NOT OK
   sink(dynamicParam1(source(), ...["safe"])); // OK
 }
+
+function m19() {
+  const constructedMap = new Map([["key", source()]]);
+  for (const [key, value] of constructedMap) {
+    sink(key);   // OK
+    sink(value); // NOT OK
+  }
+}
\ No newline at end of file
diff --git a/javascript/ql/test/library-tests/RegExpSanitizer/decorators.ts b/javascript/ql/test/library-tests/RegExpSanitizer/decorators.ts
new file mode 100644
index 000000000000..d987723ee7ea
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExpSanitizer/decorators.ts
@@ -0,0 +1,22 @@
+import { Matches } from "class-validator";
+
+class Validated {
+    @Matches(/^\w+$/) // $ sanitizer
+    singleLine: string;
+
+    @Matches(/^\w+$/m)
+    multiline: string;
+
+    @Matches(new RegExp("^\\w+$")) // $ sanitizer
+    constructedSingleLine: string;
+
+    @Matches(new RegExp("^\\w+$", "m"))
+    constructedMultiline: string;
+
+    @Matches("^\\w+$", "i") // $ sanitizer
+    stringSingleLine: string;
+
+    // Separate flags for string patterns are not currently covered by the sanitizer model.
+    @Matches("^\\w+$", "m") // $ SPURIOUS: sanitizer
+    stringMultiline: string;
+}
diff --git a/javascript/ql/test/library-tests/RegExpSanitizer/guards.js b/javascript/ql/test/library-tests/RegExpSanitizer/guards.js
new file mode 100644
index 000000000000..5428a1d0fe51
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExpSanitizer/guards.js
@@ -0,0 +1,123 @@
+function literals() {
+    const value = source();
+    sink(value); // $ flow
+
+    if (/^[\w.-]+$/m.test(value)) {
+        sink(value); // $ flow
+    }
+    if (/^[\w.-]+$/.test(value)) {
+        sink(value);
+    } else {
+        sink(value); // $ flow
+    }
+    if (/^[\w.-]+$/i.test(value)) {
+        sink(value);
+    }
+    if (/^[\w.-]+$/s.test(value)) {
+        sink(value);
+    }
+    if (/^[\w.-]+$/m.exec(value)) {
+        sink(value); // $ flow
+    }
+    if (/^[\w.-]+$/.exec(value)) {
+        sink(value);
+    }
+    if (value.match(/^[\w.-]+$/m)) {
+        sink(value); // $ flow
+    }
+    if (value.match(/^[\w.-]+$/)) {
+        sink(value);
+    }
+    if (value.match("^[\\w.-]+$")) {
+        sink(value);
+    }
+    if (value.matchAll(/^[\w.-]+$/gm)) {
+        sink(value); // $ flow
+    }
+}
+
+function references() {
+    const value = source();
+    const regexp = /^[\w.-]+$/m;
+    if (regexp.test(value)) {
+        sink(value); // $ flow
+    }
+    let match;
+    if (match = regexp.exec(value)) {
+        sink(value); // $ flow
+    }
+}
+
+function constructors(flags) {
+    const value = source();
+    if (new RegExp("^[\\w.-]+$", "m").test(value)) {
+        sink(value); // $ flow
+    }
+    if (RegExp("^[\\w.-]+$", "im").test(value)) {
+        sink(value); // $ flow
+    }
+    const multiline = "m";
+    if (new RegExp("^[\\w.-]+$", multiline).test(value)) {
+        sink(value); // $ flow
+    }
+    if (new RegExp("^[\\w.-]+$", flags).test(value)) {
+        sink(value); // $ flow
+    }
+    if (new RegExp("^[\\w.-]+$").test(value)) {
+        sink(value);
+    }
+    if (new RegExp("^[\\w.-]+$", "").test(value)) {
+        sink(value);
+    }
+    if (new RegExp("^[\\w.-]+$", "i").test(value)) {
+        sink(value);
+    }
+    if (new RegExp(/^[\w.-]+$/m).test(value)) {
+        sink(value); // $ flow
+    }
+    if (new RegExp(/^[\w.-]+$/, "m").test(value)) {
+        sink(value); // $ flow
+    }
+}
+
+function overriddenFlags() {
+    const value = source();
+    // Explicit overrides removing a literal's `m` flag are not currently covered by the sanitizer model.
+    if (new RegExp(/^[\w.-]+$/m, "").test(value)) {
+        sink(value); // $ SPURIOUS: flow
+    }
+    if (new RegExp(/^[\w.-]+$/m, "i").test(value)) {
+        sink(value); // $ SPURIOUS: flow
+    }
+}
+
+function groupsAndAlternatives() {
+    const value = source();
+    if (/(^[\w.-]+$)/m.test(value)) {
+        sink(value); // $ flow
+    }
+    if (/(^[\w.-]+$)/.test(value)) {
+        sink(value);
+    }
+    if (/^foo$|^bar$/m.test(value)) {
+        sink(value); // $ flow
+    }
+    if (/^foo$|^bar$/.test(value)) {
+        sink(value);
+    }
+}
+
+function negativeChecks(flags) {
+    const value = source();
+    if (/[^a-z]/m.test(value)) {
+        sink(value); // $ flow
+    } else {
+        sink(value);
+    }
+    if (!/\W/m.test(value)) {
+        sink(value);
+    }
+    if (!new RegExp("[^a-z]", flags).test(value)) {
+        sink(value);
+    }
+}
diff --git a/javascript/ql/test/library-tests/RegExpSanitizer/routes.js b/javascript/ql/test/library-tests/RegExpSanitizer/routes.js
new file mode 100644
index 000000000000..dabde8e13636
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExpSanitizer/routes.js
@@ -0,0 +1,36 @@
+const cp = require("child_process");
+const app = require("express")();
+
+app.get("/a", (req, res) => {
+    const dir = req.query.dir;
+    if (/^[\w.-]+$/m.test(dir)) {
+        cp.exec("ls " + dir); // $ command-injection
+    }
+    res.send("ok");
+});
+
+app.get("/b", (req, res) => {
+    const dir = req.query.dir;
+    if (/^[\w.-]+$/.test(dir)) {
+        cp.exec("ls " + dir);
+    }
+    res.send("ok");
+});
+
+app.get("/c", (req, res) => {
+    cp.exec("ls " + req.query.dir); // $ command-injection
+    res.send("ok");
+});
+
+app.get("/d", (req, res) => {
+    const name = req.query.name;
+    if (/^\w+$/m.test(name)) {
+        res.send("<p>Hello " + name + "</p>"); // $ reflected-xss
+    } else {
+        res.send("bad name");
+    }
+});
+
+app.get("/e", (req, res) => {
+    res.send("<p>Hello " + req.query.name + "</p>"); // $ reflected-xss
+});
diff --git a/javascript/ql/test/library-tests/RegExpSanitizer/test.expected b/javascript/ql/test/library-tests/RegExpSanitizer/test.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/javascript/ql/test/library-tests/RegExpSanitizer/test.ql b/javascript/ql/test/library-tests/RegExpSanitizer/test.ql
new file mode 100644
index 000000000000..107b616d81bd
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExpSanitizer/test.ql
@@ -0,0 +1,40 @@
+import javascript
+import utils.test.InlineExpectationsTest
+import semmle.javascript.frameworks.ClassValidator
+import semmle.javascript.security.dataflow.CommandInjectionQuery as CommandInjection
+import semmle.javascript.security.dataflow.ReflectedXssQuery as ReflectedXss
+
+module TestConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    source.(DataFlow::CallNode).getCalleeName() = "source"
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    sink = any(DataFlow::CallNode call | call.getCalleeName() = "sink").getArgument(0)
+  }
+}
+
+module TestFlow = TaintTracking::Global<TestConfig>;
+
+module InlineTest implements TestSig {
+  string getARelevantTag() { result = ["flow", "command-injection", "reflected-xss", "sanitizer"] }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    element = "" and
+    value = "" and
+    exists(DataFlow::Node node |
+      location = node.getLocation() and
+      (
+        tag = "flow" and TestFlow::flowTo(node)
+        or
+        tag = "command-injection" and CommandInjection::CommandInjectionFlow::flowTo(node)
+        or
+        tag = "reflected-xss" and ReflectedXss::ReflectedXssFlow::flowTo(node)
+        or
+        tag = "sanitizer" and node = ClassValidator::sanitizingDecorator()
+      )
+    )
+  }
+}
+
+import MakeTest<InlineTest>
diff --git a/javascript/ql/test/library-tests/TripleDot/array-flatmap.js b/javascript/ql/test/library-tests/TripleDot/array-flatmap.js
new file mode 100644
index 000000000000..72cf0699b991
--- /dev/null
+++ b/javascript/ql/test/library-tests/TripleDot/array-flatmap.js
@@ -0,0 +1,7 @@
+function flatMapThisArg() {
+    [0].flatMap(function (x, i) {
+        sink(this); // $ hasValueFlow=flatMap.thisArg
+        sink(i); // OK - the index, not thisArg
+        return [];
+    }, source('flatMap.thisArg'));
+}
diff --git a/javascript/ql/test/library-tests/TripleDot/string-trim.js b/javascript/ql/test/library-tests/TripleDot/string-trim.js
new file mode 100644
index 000000000000..4fe19d24f895
--- /dev/null
+++ b/javascript/ql/test/library-tests/TripleDot/string-trim.js
@@ -0,0 +1,6 @@
+function trimming() {
+    sink(source('trimStart').trimStart()); // $ hasTaintFlow=trimStart
+    sink(source('trimEnd').trimEnd()); // $ hasTaintFlow=trimEnd
+    sink(source('normalize').normalize('NFC')); // $ hasTaintFlow=normalize
+    sink(source('trimLeft').trimLeft()); // $ hasTaintFlow=trimLeft
+}
diff --git a/javascript/ql/test/library-tests/TripleDot/tst.js b/javascript/ql/test/library-tests/TripleDot/tst.js
index 6f776264e84f..f7aedbdcf339 100644
--- a/javascript/ql/test/library-tests/TripleDot/tst.js
+++ b/javascript/ql/test/library-tests/TripleDot/tst.js
@@ -172,3 +172,19 @@ function t16() {
     sink(array[2]); // $ hasValueFlow=t16.1
     sink(array); // $ hasTaintFlow=t16.1
 }
+
+function t17() {
+    function target(...[x, y]) {
+        sink(x); // $ hasValueFlow=t17.1
+        sink(y); // $ hasValueFlow=t17.2
+    }
+    target(source("t17.1"), source("t17.2"), source("t17.3"));
+}
+
+function t18() {
+    function target(...{0: x, 1: y}) {
+        sink(x); // $ hasValueFlow=t18.1
+        sink(y); // $ hasValueFlow=t18.2
+    }
+    target(source("t18.1"), source("t18.2"), source("t18.3"));
+}
diff --git a/javascript/ql/test/library-tests/frameworks/fastify/src/fastify.js b/javascript/ql/test/library-tests/frameworks/fastify/src/fastify.js
index 8c5264b50e8f..c65b739d726c 100644
--- a/javascript/ql/test/library-tests/frameworks/fastify/src/fastify.js
+++ b/javascript/ql/test/library-tests/frameworks/fastify/src/fastify.js
@@ -90,3 +90,13 @@ fastifyWithObjects4.post(
     request.params;
   }
 );
+
+// the server is reached through a chainable configuration method, which returns the
+// same instance
+var fastifyChained = require("fastify")().withTypeProvider();
+fastifyChained.get(
+  "/",
+  /* handler */ (request, reply) => {
+    reply.send({ hello: "world" }); // response
+  }
+);
diff --git a/javascript/ql/test/library-tests/frameworks/fastify/tests.expected b/javascript/ql/test/library-tests/frameworks/fastify/tests.expected
index a0f2fd1db671..e2b3b303a6ea 100644
--- a/javascript/ql/test/library-tests/frameworks/fastify/tests.expected
+++ b/javascript/ql/test/library-tests/frameworks/fastify/tests.expected
@@ -7,6 +7,7 @@ test_RouteSetup
 | src/fastify.js:63:1:70:1 | fastify ... ;\\n  }\\n) |
 | src/fastify.js:74:1:81:1 | fastify ... ;\\n  }\\n) |
 | src/fastify.js:85:1:92:1 | fastify ... ;\\n  }\\n) |
+| src/fastify.js:97:1:102:1 | fastify ... e\\n  }\\n) |
 test_HeaderAccess
 | src/fastify.js:39:5:39:24 | request.headers.name | name |
 test_RouteHandler
@@ -25,6 +26,7 @@ test_RouteHandler
 | src/fastify.js:65:17:69:3 | functio ... ms;\\n  } | src/fastify.js:61:27:61:46 | require("fastify")() |
 | src/fastify.js:76:17:80:3 | functio ... ms;\\n  } | src/fastify.js:72:27:72:46 | require("fastify")() |
 | src/fastify.js:87:17:91:3 | functio ... ms;\\n  } | src/fastify.js:83:27:83:46 | require("fastify")() |
+| src/fastify.js:99:17:101:3 | (reques ... nse\\n  } | src/fastify.js:96:22:96:41 | require("fastify")() |
 test_HeaderDefinition
 | src/fastify.js:42:5:42:33 | reply.h ... value") | src/fastify.js:34:17:46:3 | functio ... eam\\n  } |
 | src/fastify.js:43:5:43:36 | reply.h ... lue" }) | src/fastify.js:34:17:46:3 | functio ... eam\\n  } |
@@ -34,6 +36,7 @@ test_ServerDefinition
 | src/fastify.js:61:27:61:46 | require("fastify")() |
 | src/fastify.js:72:27:72:46 | require("fastify")() |
 | src/fastify.js:83:27:83:46 | require("fastify")() |
+| src/fastify.js:96:22:96:41 | require("fastify")() |
 test_RedirectInvocation
 | src/fastify.js:44:5:44:29 | reply.r ... e, url) | src/fastify.js:34:17:46:3 | functio ... eam\\n  } |
 test_RequestInputAccess
@@ -57,6 +60,7 @@ test_ResponseSendArgument
 | src/fastify.js:6:12:6:29 | { hello: "world" } | src/fastify.js:5:17:7:3 | async ( ... nse\\n  } |
 | src/fastify.js:27:16:27:33 | { hello: "world" } | src/fastify.js:26:17:28:3 | (reques ... nse\\n  } |
 | src/fastify.js:45:16:45:22 | payload | src/fastify.js:34:17:46:3 | functio ... eam\\n  } |
+| src/fastify.js:100:16:100:33 | { hello: "world" } | src/fastify.js:99:17:101:3 | (reques ... nse\\n  } |
 test_RouteSetup_getServer
 | src/fastify.js:3:1:8:1 | fastify ... e\\n  }\\n) | src/fastify.js:1:15:1:34 | require("fastify")() |
 | src/fastify.js:10:1:21:2 | fastify ... > {}\\n}) | src/fastify.js:1:15:1:34 | require("fastify")() |
@@ -66,6 +70,7 @@ test_RouteSetup_getServer
 | src/fastify.js:63:1:70:1 | fastify ... ;\\n  }\\n) | src/fastify.js:61:27:61:46 | require("fastify")() |
 | src/fastify.js:74:1:81:1 | fastify ... ;\\n  }\\n) | src/fastify.js:72:27:72:46 | require("fastify")() |
 | src/fastify.js:85:1:92:1 | fastify ... ;\\n  }\\n) | src/fastify.js:83:27:83:46 | require("fastify")() |
+| src/fastify.js:97:1:102:1 | fastify ... e\\n  }\\n) | src/fastify.js:96:22:96:41 | require("fastify")() |
 test_HeaderDefinition_defines
 | src/fastify.js:42:5:42:33 | reply.h ... value") | name | value |
 | src/fastify.js:43:5:43:36 | reply.h ... lue" }) | name | value |
@@ -85,6 +90,7 @@ test_RouteSetup_getARouteHandler
 | src/fastify.js:63:1:70:1 | fastify ... ;\\n  }\\n) | src/fastify.js:65:17:69:3 | functio ... ms;\\n  } |
 | src/fastify.js:74:1:81:1 | fastify ... ;\\n  }\\n) | src/fastify.js:76:17:80:3 | functio ... ms;\\n  } |
 | src/fastify.js:85:1:92:1 | fastify ... ;\\n  }\\n) | src/fastify.js:87:17:91:3 | functio ... ms;\\n  } |
+| src/fastify.js:97:1:102:1 | fastify ... e\\n  }\\n) | src/fastify.js:99:17:101:3 | (reques ... nse\\n  } |
 test_RouteHandler_getARequestExpr
 | src/fastify.js:5:17:7:3 | async ( ... nse\\n  } | src/fastify.js:5:24:5:30 | request |
 | src/fastify.js:13:28:13:55 | (reques ... ) => {} | src/fastify.js:13:29:13:35 | request |
@@ -122,6 +128,7 @@ test_RouteHandler_getARequestExpr
 | src/fastify.js:87:17:91:3 | functio ... ms;\\n  } | src/fastify.js:88:5:88:11 | request |
 | src/fastify.js:87:17:91:3 | functio ... ms;\\n  } | src/fastify.js:89:5:89:11 | request |
 | src/fastify.js:87:17:91:3 | functio ... ms;\\n  } | src/fastify.js:90:5:90:11 | request |
+| src/fastify.js:99:17:101:3 | (reques ... nse\\n  } | src/fastify.js:99:18:99:24 | request |
 test_HeaderDefinition_getAHeaderName
 | src/fastify.js:42:5:42:33 | reply.h ... value") | name |
 | src/fastify.js:43:5:43:36 | reply.h ... lue" }) | name |
diff --git a/javascript/ql/test/library-tests/frameworks/hapi/WrappedRouteFlow.qll b/javascript/ql/test/library-tests/frameworks/hapi/WrappedRouteFlow.qll
new file mode 100644
index 000000000000..930167bd9cc7
--- /dev/null
+++ b/javascript/ql/test/library-tests/frameworks/hapi/WrappedRouteFlow.qll
@@ -0,0 +1,15 @@
+import javascript
+
+module WrappedRouteConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof Http::RequestInputAccess }
+
+  predicate isSink(DataFlow::Node sink) {
+    sink = DataFlow::globalVarRef("sink").getACall().getArgument(0)
+  }
+}
+
+module WrappedRouteTaint = TaintTracking::Global<WrappedRouteConfig>;
+
+query predicate test_WrappedRouteFlow(DataFlow::Node source, DataFlow::Node sink) {
+  WrappedRouteTaint::flow(source, sink)
+}
diff --git a/javascript/ql/test/library-tests/frameworks/hapi/src/hapi.js b/javascript/ql/test/library-tests/frameworks/hapi/src/hapi.js
index 467c0e801595..bfc2ebe8a020 100644
--- a/javascript/ql/test/library-tests/frameworks/hapi/src/hapi.js
+++ b/javascript/ql/test/library-tests/frameworks/hapi/src/hapi.js
@@ -19,8 +19,8 @@ server2.ext('onPreResponse', function handler3(request, reply) { // HTTP::RouteH
 
 function handler4(request, reply){
   request.rawPayload;
-  request.payload.foo;
-  request.query.bar;
+  getRequest(request).payload.foo;
+  getRequest(request).query.bar; getRequest(request).params.bar;
   request.url.path;
   request.headers.baz;
   request.state.token;
@@ -34,3 +34,7 @@ function getHandler() {
     return function (req, h){}
 }
 server2.route({handler: getHandler()});
+
+function getRequest(request) {
+  return request;
+}
diff --git a/javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route-cache.js b/javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route-cache.js
new file mode 100644
index 000000000000..7b1e7c59f008
--- /dev/null
+++ b/javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route-cache.js
@@ -0,0 +1,7 @@
+function createCached(fn) {
+  return async function (...args) {
+    return fn(...args);
+  };
+}
+
+module.exports = { createCached };
diff --git a/javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route-configurator.js b/javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route-configurator.js
new file mode 100644
index 000000000000..fcb26aad8fa0
--- /dev/null
+++ b/javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route-configurator.js
@@ -0,0 +1,30 @@
+const endpoints = [];
+
+function apiEndpoint(method, path, handler) {
+  endpoints.push({ method, path, handler });
+}
+
+function createRouteConfig(method, path, handler) {
+  const hapiHandler = async function (request, h) {
+    return handler(request.params, request.query, request.payload);
+  };
+
+  return {
+    method,
+    path,
+    handler: hapiHandler,
+  };
+}
+
+function registerEndpoints(server, serviceInstance) {
+  for (const definition of endpoints) {
+    const wrapped = async (params, query, payload) => {
+      return definition.handler.call(serviceInstance, params, query, payload);
+    };
+
+    const config = createRouteConfig(definition.method, definition.path, wrapped);
+    server.route(config);
+  }
+}
+
+module.exports = { apiEndpoint, registerEndpoints };
diff --git a/javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route-service.js b/javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route-service.js
new file mode 100644
index 000000000000..9e495b8e0fde
--- /dev/null
+++ b/javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route-service.js
@@ -0,0 +1,15 @@
+const { createCached } = require("./wrapped-route-cache");
+
+class ReportService {
+  async runQuery(filter) {
+    sink(filter);
+  }
+}
+
+const service = new ReportService();
+
+const getReportCached = createCached(async function (filter) {
+  return service.runQuery(filter);
+});
+
+module.exports = { getReportCached };
diff --git a/javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route.js b/javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route.js
new file mode 100644
index 000000000000..319b57f8c348
--- /dev/null
+++ b/javascript/ql/test/library-tests/frameworks/hapi/src/wrapped-route.js
@@ -0,0 +1,22 @@
+const Hapi = require("@hapi/hapi");
+const {
+  apiEndpoint,
+  registerEndpoints,
+} = require("./wrapped-route-configurator");
+const { getReportCached } = require("./wrapped-route-service");
+
+class ReportRoutes {
+  async getReport(params, query) {
+    return getReportCached(query.filter);
+  }
+}
+
+apiEndpoint("GET", "/reports", ReportRoutes.prototype.getReport);
+
+async function main() {
+  const server = Hapi.server();
+  registerEndpoints(server, new ReportRoutes());
+  return server;
+}
+
+main();
diff --git a/javascript/ql/test/library-tests/frameworks/hapi/tests.expected b/javascript/ql/test/library-tests/frameworks/hapi/tests.expected
index 730bae77bf93..6d53a86165f8 100644
--- a/javascript/ql/test/library-tests/frameworks/hapi/tests.expected
+++ b/javascript/ql/test/library-tests/frameworks/hapi/tests.expected
@@ -14,6 +14,7 @@ test_RouteSetup
 | src/hapihapi.js:17:1:18:2 | server2 ... dler\\n}) |
 | src/hapihapi.js:29:1:29:20 | server2.route(route) |
 | src/hapihapi.js:36:1:36:38 | server2 ... ler()}) |
+| src/wrapped-route-configurator.js:26:5:26:24 | server.route(config) |
 test_RequestExpr
 | src/hapi.js:13:32:13:38 | request | src/hapi.js:13:14:15:5 | functio ... n\\n    } |
 | src/hapi.js:13:32:13:38 | request | src/hapi.js:13:14:15:5 | functio ... n\\n    } |
@@ -22,12 +23,20 @@ test_RequestExpr
 | src/hapi.js:20:19:20:25 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapi.js:20:19:20:25 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapi.js:21:3:21:9 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
-| src/hapi.js:22:3:22:9 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
-| src/hapi.js:23:3:23:9 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapi.js:22:3:22:21 | getRequest(request) | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapi.js:22:14:22:20 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapi.js:23:3:23:21 | getRequest(request) | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapi.js:23:14:23:20 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapi.js:23:34:23:52 | getRequest(request) | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapi.js:23:45:23:51 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapi.js:24:3:24:9 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapi.js:25:3:25:9 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapi.js:26:3:26:9 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapi.js:34:22:34:24 | req | src/hapi.js:34:12:34:30 | function (req, h){} |
+| src/hapi.js:38:1:40:1 | return of function getRequest | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapi.js:38:21:38:27 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapi.js:38:21:38:27 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapi.js:39:10:39:16 | request | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapiglue.js:13:32:13:38 | request | src/hapiglue.js:13:14:15:5 | functio ... n\\n    } |
 | src/hapiglue.js:13:32:13:38 | request | src/hapiglue.js:13:14:15:5 | functio ... n\\n    } |
 | src/hapiglue.js:14:9:14:15 | request | src/hapiglue.js:13:14:15:5 | functio ... n\\n    } |
@@ -56,6 +65,11 @@ test_RequestExpr
 | src/hapihapi.js:25:3:25:9 | request | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapihapi.js:26:3:26:9 | request | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapihapi.js:34:22:34:24 | req | src/hapihapi.js:34:12:34:30 | function (req, h){} |
+| src/wrapped-route-configurator.js:8:39:8:45 | request | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
+| src/wrapped-route-configurator.js:8:39:8:45 | request | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
+| src/wrapped-route-configurator.js:9:20:9:26 | request | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
+| src/wrapped-route-configurator.js:9:36:9:42 | request | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
+| src/wrapped-route-configurator.js:9:51:9:57 | request | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
 test_HeaderAccess
 | src/hapi.js:25:3:25:21 | request.headers.baz | baz |
 | src/hapiglue.js:27:3:27:21 | request.headers.baz | baz |
@@ -80,6 +94,7 @@ test_RouteHandler
 | src/hapihapi.js:17:30:18:1 | functio ... ndler\\n} | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
 | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
 | src/hapihapi.js:34:12:34:30 | function (req, h){} | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
+| src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } | src/wrapped-route.js:17:18:17:30 | Hapi.server() |
 test_HeaderDefinition
 | src/hapi.js:14:9:14:46 | request ... 1', '') | src/hapi.js:13:14:15:5 | functio ... n\\n    } |
 | src/hapiglue.js:14:9:14:46 | request ... 1', '') | src/hapiglue.js:13:14:15:5 | functio ... n\\n    } |
@@ -93,10 +108,12 @@ test_ServerDefinition
 | src/hapiglue.js:44:45:44:51 | server_ |
 | src/hapihapi.js:1:15:1:50 | new (re ... erver() |
 | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
+| src/wrapped-route.js:17:18:17:30 | Hapi.server() |
 test_RequestInputAccess
 | src/hapi.js:21:3:21:20 | request.rawPayload | body | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
-| src/hapi.js:22:3:22:21 | request.payload.foo | body | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
-| src/hapi.js:23:3:23:19 | request.query.bar | parameter | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapi.js:22:3:22:33 | getRequ ... oad.foo | body | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapi.js:23:3:23:31 | getRequ ... ery.bar | parameter | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapi.js:23:34:23:63 | getRequ ... ams.bar | parameter | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapi.js:24:3:24:18 | request.url.path | url | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapi.js:25:3:25:21 | request.headers.baz | header | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapi.js:26:3:26:21 | request.state.token | cookie | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
@@ -114,6 +131,9 @@ test_RequestInputAccess
 | src/hapihapi.js:24:3:24:18 | request.url.path | url | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapihapi.js:25:3:25:21 | request.headers.baz | header | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapihapi.js:26:3:26:21 | request.state.token | cookie | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/wrapped-route-configurator.js:9:20:9:33 | request.params | parameter | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
+| src/wrapped-route-configurator.js:9:36:9:48 | request.query | parameter | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
+| src/wrapped-route-configurator.js:9:51:9:65 | request.payload | body | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
 test_RouteSetup_getServer
 | src/hapi.js:7:1:9:2 | server2 ... ler1\\n}) | src/hapi.js:4:15:4:31 | new Hapi.Server() |
 | src/hapi.js:12:1:15:7 | server2 ...     }}) | src/hapi.js:4:15:4:31 | new Hapi.Server() |
@@ -130,6 +150,7 @@ test_RouteSetup_getServer
 | src/hapihapi.js:17:1:18:2 | server2 ... dler\\n}) | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
 | src/hapihapi.js:29:1:29:20 | server2.route(route) | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
 | src/hapihapi.js:36:1:36:38 | server2 ... ler()}) | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
+| src/wrapped-route-configurator.js:26:5:26:24 | server.route(config) | src/wrapped-route.js:17:18:17:30 | Hapi.server() |
 test_HeaderDefinition_defines
 | src/hapi.js:14:9:14:46 | request ... 1', '') | header1 |  |
 | src/hapiglue.js:14:9:14:46 | request ... 1', '') | header1 |  |
@@ -156,6 +177,7 @@ test_RouteSetup_getARouteHandler
 | src/hapihapi.js:36:1:36:38 | server2 ... ler()}) | src/hapihapi.js:33:1:35:1 | return of function getHandler |
 | src/hapihapi.js:36:1:36:38 | server2 ... ler()}) | src/hapihapi.js:34:12:34:30 | function (req, h){} |
 | src/hapihapi.js:36:1:36:38 | server2 ... ler()}) | src/hapihapi.js:36:25:36:36 | getHandler() |
+| src/wrapped-route-configurator.js:26:5:26:24 | server.route(config) | src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } |
 test_RouteHandler_getARequestExpr
 | src/hapi.js:13:14:15:5 | functio ... n\\n    } | src/hapi.js:13:32:13:38 | request |
 | src/hapi.js:13:14:15:5 | functio ... n\\n    } | src/hapi.js:13:32:13:38 | request |
@@ -164,11 +186,19 @@ test_RouteHandler_getARequestExpr
 | src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:20:19:20:25 | request |
 | src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:20:19:20:25 | request |
 | src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:21:3:21:9 | request |
-| src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:22:3:22:9 | request |
-| src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:23:3:23:9 | request |
+| src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:22:3:22:21 | getRequest(request) |
+| src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:22:14:22:20 | request |
+| src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:23:3:23:21 | getRequest(request) |
+| src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:23:14:23:20 | request |
+| src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:23:34:23:52 | getRequest(request) |
+| src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:23:45:23:51 | request |
 | src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:24:3:24:9 | request |
 | src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:25:3:25:9 | request |
 | src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:26:3:26:9 | request |
+| src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:38:1:40:1 | return of function getRequest |
+| src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:38:21:38:27 | request |
+| src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:38:21:38:27 | request |
+| src/hapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapi.js:39:10:39:16 | request |
 | src/hapi.js:34:12:34:30 | function (req, h){} | src/hapi.js:34:22:34:24 | req |
 | src/hapiglue.js:13:14:15:5 | functio ... n\\n    } | src/hapiglue.js:13:32:13:38 | request |
 | src/hapiglue.js:13:14:15:5 | functio ... n\\n    } | src/hapiglue.js:13:32:13:38 | request |
@@ -198,6 +228,11 @@ test_RouteHandler_getARequestExpr
 | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:25:3:25:9 | request |
 | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:26:3:26:9 | request |
 | src/hapihapi.js:34:12:34:30 | function (req, h){} | src/hapihapi.js:34:22:34:24 | req |
+| src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } | src/wrapped-route-configurator.js:8:39:8:45 | request |
+| src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } | src/wrapped-route-configurator.js:8:39:8:45 | request |
+| src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } | src/wrapped-route-configurator.js:9:20:9:26 | request |
+| src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } | src/wrapped-route-configurator.js:9:36:9:42 | request |
+| src/wrapped-route-configurator.js:8:23:10:3 | async f ... d);\\n  } | src/wrapped-route-configurator.js:9:51:9:57 | request |
 test_HeaderDefinition_getAHeaderName
 | src/hapi.js:14:9:14:46 | request ... 1', '') | header1 |
 | src/hapiglue.js:14:9:14:46 | request ... 1', '') | header1 |
@@ -206,3 +241,5 @@ test_RouteHandler_getAResponseHeader
 | src/hapi.js:13:14:15:5 | functio ... n\\n    } | header1 | src/hapi.js:14:9:14:46 | request ... 1', '') |
 | src/hapiglue.js:13:14:15:5 | functio ... n\\n    } | header1 | src/hapiglue.js:14:9:14:46 | request ... 1', '') |
 | src/hapihapi.js:13:14:15:5 | functio ... n\\n    } | header1 | src/hapihapi.js:14:9:14:46 | request ... 1', '') |
+test_WrappedRouteFlow
+| src/wrapped-route-configurator.js:9:36:9:48 | request.query | src/wrapped-route-service.js:5:10:5:15 | filter |
diff --git a/javascript/ql/test/library-tests/frameworks/hapi/tests.ql b/javascript/ql/test/library-tests/frameworks/hapi/tests.ql
index 396381b2b239..541c165d5e7f 100644
--- a/javascript/ql/test/library-tests/frameworks/hapi/tests.ql
+++ b/javascript/ql/test/library-tests/frameworks/hapi/tests.ql
@@ -12,3 +12,4 @@ import RouteSetup_getARouteHandler
 import RouteHandler
 import RequestExpr
 import RouteHandler_getARequestExpr
+import WrappedRouteFlow
diff --git a/javascript/ql/test/library-tests/threat-models/ai-enabled/ActiveAiThreatModel.expected b/javascript/ql/test/library-tests/threat-models/ai-enabled/ActiveAiThreatModel.expected
new file mode 100644
index 000000000000..be236f3a50c0
--- /dev/null
+++ b/javascript/ql/test/library-tests/threat-models/ai-enabled/ActiveAiThreatModel.expected
@@ -0,0 +1 @@
+| ai |
diff --git a/javascript/ql/test/library-tests/threat-models/ai-enabled/ActiveAiThreatModel.ext.yml b/javascript/ql/test/library-tests/threat-models/ai-enabled/ActiveAiThreatModel.ext.yml
new file mode 100644
index 000000000000..e30874b74455
--- /dev/null
+++ b/javascript/ql/test/library-tests/threat-models/ai-enabled/ActiveAiThreatModel.ext.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/threat-models
+      extensible: threatModelConfiguration
+    data:
+      - ["ai", true, 0]
diff --git a/javascript/ql/test/library-tests/threat-models/ai-enabled/ActiveAiThreatModel.ql b/javascript/ql/test/library-tests/threat-models/ai-enabled/ActiveAiThreatModel.ql
new file mode 100644
index 000000000000..298fb583532d
--- /dev/null
+++ b/javascript/ql/test/library-tests/threat-models/ai-enabled/ActiveAiThreatModel.ql
@@ -0,0 +1,6 @@
+private import codeql.threatmodels.ThreatModels
+
+where
+  knownThreatModel("ai") and
+  currentThreatModel("ai")
+select "ai"
diff --git a/javascript/ql/test/library-tests/threat-models/sources/fastmcp.ts b/javascript/ql/test/library-tests/threat-models/sources/fastmcp.ts
new file mode 100644
index 000000000000..82c07f02c4e9
--- /dev/null
+++ b/javascript/ql/test/library-tests/threat-models/sources/fastmcp.ts
@@ -0,0 +1,43 @@
+import { FastMCP } from "fastmcp";
+import { z } from "zod";
+
+declare function SINK(value: unknown): void;
+
+const server = new FastMCP({ name: "test", version: "1.0.0" });
+
+server.addTool({
+  name: "run",
+  parameters: z.object({ command: z.string() }),
+  execute: async (args) => { // $ threat-source=ai
+    SINK(args.command); // $ hasFlow
+    return "";
+  },
+});
+
+server.addResourceTemplate({
+  uriTemplate: "note://{name}",
+  name: "note",
+  arguments: [{ name: "name" }],
+  async load({ name }) { // $ threat-source=ai
+    SINK(name); // $ hasFlow
+    return { text: "" };
+  },
+});
+
+server.addPrompt({
+  name: "summarize",
+  arguments: [{ name: "topic" }],
+  load: async ({ topic }) => { // $ threat-source=ai
+    SINK(topic); // $ hasFlow
+    return "";
+  },
+});
+
+// A static resource takes no arguments: no source.
+server.addResource({
+  uri: "file:///log",
+  name: "log",
+  async load() {
+    return { text: "" };
+  },
+});
diff --git a/javascript/ql/test/library-tests/threat-models/sources/mcp.ts b/javascript/ql/test/library-tests/threat-models/sources/mcp.ts
new file mode 100644
index 000000000000..1e8310d6a2f1
--- /dev/null
+++ b/javascript/ql/test/library-tests/threat-models/sources/mcp.ts
@@ -0,0 +1,112 @@
+import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { McpServer, ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpServer as McpServerNoSuffix } from "@modelcontextprotocol/sdk/server/mcp";
+import { CallToolRequestSchema } from "@modelcontextprotocol/sdk/types.js";
+import { McpServer as McpServerV2, Server as ServerV2 } from "@modelcontextprotocol/server";
+import { z } from "zod";
+
+declare function SINK(value: unknown): void;
+
+const server = new McpServer({ name: "test", version: "1.0.0" });
+
+// Tools and prompts: the first parameter of the callback holds the arguments.
+server.tool("run", { command: z.string() }, async ({ command }) => { // $ threat-source=ai
+  SINK(command); // $ hasFlow
+  return { content: [] };
+});
+
+server.tool("read", "Read a file", { path: z.string() }, async (args) => { // $ threat-source=ai
+  SINK(args.path); // $ hasFlow
+  return { content: [] };
+});
+
+server.registerTool("fetch", { inputSchema: { url: z.string() } }, async ({ url }) => { // $ threat-source=ai
+  SINK(url); // $ hasFlow
+  return { content: [] };
+});
+
+async function namedHandler({ target }: { target: string }) { // $ threat-source=ai
+  SINK(target); // $ hasFlow
+  return { content: [] };
+}
+server.tool("remove", { target: z.string() }, namedHandler);
+
+server.prompt("summarize", { topic: z.string() }, ({ topic }) => { // $ threat-source=ai
+  SINK(topic); // $ hasFlow
+  return { messages: [] };
+});
+
+server.registerPrompt("explain", { argsSchema: { file: z.string() } }, ({ file }) => { // $ threat-source=ai
+  SINK(file); // $ hasFlow
+  return { messages: [] };
+});
+
+// Resources: the URI and the variables of the template.
+server.resource("note", new ResourceTemplate("note://{name}", { list: undefined }), async (uri, { name }) => { // $ threat-source=ai
+  SINK(uri.href); // $ hasFlow
+  SINK(name); // $ hasFlow
+  return { contents: [] };
+});
+
+server.registerResource("page", new ResourceTemplate("page://{host}", { list: undefined }), {}, async (uri, variables) => { // $ threat-source=ai
+  SINK(variables.host); // $ hasFlow
+  return { contents: [] };
+});
+
+// The request headers and the bearer token that the SDK hands to a callback.
+server.tool("forward", { id: z.string() }, async (_args, extra) => { // $ threat-source=ai
+  SINK(extra.requestInfo?.headers["x-target"]); // $ hasFlow threat-source=remote
+  SINK(extra.authInfo?.token); // $ hasFlow threat-source=remote
+  SINK(extra.sessionId);
+  return { content: [] };
+});
+
+// The low-level server: handlers receive the request.
+const lowLevel = new Server({ name: "test", version: "1.0.0" }, { capabilities: { tools: {} } });
+lowLevel.setRequestHandler(CallToolRequestSchema, async (request) => {
+  SINK(request.params.arguments?.command); // $ hasFlow threat-source=ai
+  return { content: [] };
+});
+
+server.server.setRequestHandler(CallToolRequestSchema, async (request) => {
+  SINK(request.params.name); // $ hasFlow threat-source=ai
+  return { content: [] };
+});
+
+// An import path without the file suffix, and a server that arrives as a typed parameter.
+new McpServerNoSuffix({ name: "test", version: "1.0.0" }).tool("run", { command: z.string() }, async ({ command }) => { // $ threat-source=ai
+  SINK(command); // $ hasFlow
+  return { content: [] };
+});
+
+export function register(target: McpServer) {
+  target.tool("run", { command: z.string() }, async ({ command }) => { // $ threat-source=ai
+    SINK(command); // $ hasFlow
+    return { content: [] };
+  });
+}
+
+// Version 2 of the SDK: one package, and a context object instead of `extra`.
+const serverV2 = new McpServerV2({ name: "test", version: "2.0.0" });
+serverV2.registerTool("fetch", { inputSchema: z.object({ url: z.string() }) }, async ({ url }, ctx) => { // $ threat-source=ai
+  SINK(url); // $ hasFlow
+  SINK(ctx.http?.req.headers.get("x-target")); // $ hasFlow threat-source=remote
+  SINK(ctx.http?.authInfo?.token); // $ hasFlow threat-source=remote
+  return { content: [] };
+});
+
+const lowLevelV2 = new ServerV2({ name: "test", version: "2.0.0" });
+lowLevelV2.setRequestHandler("tools/call", async (request) => {
+  SINK(request.params.arguments); // $ hasFlow threat-source=ai
+  return { content: [] };
+});
+
+lowLevelV2.setRequestHandler("acme/search", { params: z.object({ query: z.string() }), result: z.object({}) }, async (params) => { // $ threat-source=ai
+  SINK(params.query); // $ hasFlow
+  return {};
+});
+
+// Not registered with a server: no source.
+export function notAHandler(command: string) {
+  SINK(command);
+}
diff --git a/javascript/ql/test/library-tests/threat-models/sources/zod.ts b/javascript/ql/test/library-tests/threat-models/sources/zod.ts
new file mode 100644
index 000000000000..fa5177540fbb
--- /dev/null
+++ b/javascript/ql/test/library-tests/threat-models/sources/zod.ts
@@ -0,0 +1,30 @@
+import { z } from "zod";
+import * as z4 from "zod/v4";
+
+declare function SINK(value: unknown): void;
+
+const raw = JSON.parse(process.argv[2]); // $ threat-source=commandargs
+
+const Options = z.object({ command: z.string() });
+const NextOptions = z4.object({ command: z4.string() });
+
+SINK(Options.parse(raw).command); // $ hasFlow
+SINK(NextOptions.parse(raw).command); // $ hasFlow
+
+const checked = Options.safeParse(raw);
+if (checked.success) {
+  SINK(checked.data.command); // $ hasFlow
+}
+SINK(checked.error);
+
+async function later() {
+  SINK((await Options.parseAsync(raw)).command); // $ hasFlow
+
+  const result = await Options.safeParseAsync(raw);
+  if (result.success) {
+    SINK(result.data.command); // $ hasFlow
+  }
+}
+
+// A value that did not come from a source stays clean.
+SINK(Options.parse({ command: "ls" }).command);
diff --git a/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.expected b/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.expected
index 4d089fdba5be..d19dd5d69d88 100644
--- a/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.expected
+++ b/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.expected
@@ -11,7 +11,7 @@
 | UnknownDirective.js:12:5:12:17 | "use struct;" | Unknown directive: 'use struct;'. |
 | UnknownDirective.js:13:5:13:17 | "Use Strict"; | Unknown directive: 'Use Strict'. |
 | UnknownDirective.js:14:5:14:14 | "use bar"; | Unknown directive: 'use bar'. |
-| UnknownDirective.js:43:5:43:17 | "[0, 0, 0];"; | Unknown directive: '[0, 0, 0];'. |
-| UnknownDirective.js:44:5:44:65 | "[0, 0, ... , 0];"; | Unknown directive: '[0, 0, 0, 0, 0, 0, 0 ... (truncated)'. |
-| UnknownDirective.js:50:5:50:15 | ":nomunge"; | Unknown directive: ':nomunge'. |
-| UnknownDirective.js:51:5:51:30 | "foo(), ... munge"; | Unknown directive: 'foo(), bar, baz:nomu ... (truncated)'. |
+| UnknownDirective.js:45:5:45:17 | "[0, 0, 0];"; | Unknown directive: '[0, 0, 0];'. |
+| UnknownDirective.js:46:5:46:65 | "[0, 0, ... , 0];"; | Unknown directive: '[0, 0, 0, 0, 0, 0, 0 ... (truncated)'. |
+| UnknownDirective.js:52:5:52:15 | ":nomunge"; | Unknown directive: ':nomunge'. |
+| UnknownDirective.js:53:5:53:30 | "foo(), ... munge"; | Unknown directive: 'foo(), bar, baz:nomu ... (truncated)'. |
diff --git a/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.js b/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.js
index 78c0d79f2c1a..5e4d18a381e0 100644
--- a/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.js
+++ b/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.js
@@ -37,6 +37,8 @@ function good() {
     "use cache";
     "use cache: remote";
     "use cache: private";
+    "use workflow";
+    "use step";
 }
 
 function data() {
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/InvalidPrototype.expected b/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/InvalidPrototype.expected
index a1c3430e8958..c696da0d083d 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/InvalidPrototype.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/InvalidPrototype.expected
@@ -2,3 +2,5 @@
 | tst.js:8:27:8:28 | 42 | Values of type number cannot be used as prototypes. |
 | tst.js:9:15:9:18 | true | Values of type boolean cannot be used as prototypes. |
 | tst.js:10:1:10:10 | "function" | Values of type string cannot be used as prototypes. |
+| tst.js:15:25:15:26 | 42 | Values of type number cannot be used as prototypes. |
+| tst.js:17:19:17:20 | 42 | Values of type number cannot be used as prototypes. |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/tst.js
index 5c12a3b7d853..bae1a60843c1 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/tst.js
@@ -9,3 +9,9 @@ Object.setPrototypeOf(o2, 42);                  // $ Alert
 Object.create(true);                            // $ Alert
 "function".isPrototypeOf(o2);                   // $ Alert
 
+var o3 = { ["__proto__"]: 42 };
+var o4 = { ["__proto__"]: null };
+
+var o5 = { "__proto__": 42 };                  // $ Alert
+var o6 = {};
+o6["__proto__"] = 42;                          // $ Alert
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/SpuriousArguments.expected b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/SpuriousArguments.expected
index b88dd7d68e80..2ee2f0a55f4e 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/SpuriousArguments.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/SpuriousArguments.expected
@@ -7,7 +7,9 @@
 | reflection.js:6:15:6:15 | 1 | Superfluous argument passed to $@. | reflection.js:1:1:1:23 | functio ... eturn;} | function f0 |
 | reflection.js:7:15:7:18 | 1 | Superfluous arguments passed to $@. | reflection.js:1:1:1:23 | functio ... eturn;} | function f0 |
 | reflection.js:12:18:12:18 | 2 | Superfluous argument passed to $@. | reflection.js:2:1:2:24 | functio ... eturn;} | function f1 |
+| storageEvent.js:14:33:14:39 | "extra" | Superfluous argument passed to $@. | externs.js:55:1:55:49 | functio ... ict) {} | function StorageEvent |
 | thisparameter.ts:4:11:4:12 | 45 | Superfluous argument passed to $@. | thisparameter.ts:1:1:1:45 | functio ... eturn;} | function foo |
+| transformstream.ts:15:33:15:34 | {} | Superfluous argument passed to $@. | externs.js:48:1:48:76 | functio ... egy) {} | function TransformStream |
 | tst.js:10:3:10:5 | g() | Superfluous argument passed to $@. | tst.js:1:1:4:1 | functio ... x+19;\\n} | function f |
 | tst.js:31:15:31:18 | 2 | Superfluous arguments passed to $@. | externs.js:34:1:34:27 | functio ... str) {} | function String |
 | tst.js:34:4:34:5 | 42 | Superfluous argument passed to $@. | tst.js:35:4:35:23 | function() {return;} | anonymous function |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/externs.js b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/externs.js
index c8a88126efbf..f4a58aeb59bf 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/externs.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/externs.js
@@ -39,4 +39,19 @@ function Number() {}
 
 Number.parseFloat = function(num) {};
 
+/**
+ * @param {*=} transformer
+ * @param {*=} writableStrategy
+ * @param {*=} readableStrategy
+ * @constructor
+ */
+function TransformStream(transformer, writableStrategy, readableStrategy) {}
+
+/**
+ * @constructor
+ * @param {string} type
+ * @param {StorageEventInit=} opt_eventInitDict
+ */
+function StorageEvent(type, opt_eventInitDict) {}
+
 /** @externs */
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/storageEvent.js b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/storageEvent.js
new file mode 100644
index 000000000000..43b709ca861a
--- /dev/null
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/storageEvent.js
@@ -0,0 +1,14 @@
+new StorageEvent("storage");
+new StorageEvent("storage", {});
+new StorageEvent("storage", { key: "k", newValue: "v" });
+new StorageEvent("storage", {
+  key: null,
+  oldValue: null,
+  newValue: null,
+  url: "",
+  storageArea: null,
+  bubbles: false,
+  cancelable: false,
+  composed: false
+});
+new StorageEvent("storage", {}, "extra"); // $ Alert
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/transformstream.ts b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/transformstream.ts
new file mode 100644
index 000000000000..161ffc4fcf7b
--- /dev/null
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/transformstream.ts
@@ -0,0 +1,15 @@
+class CustomTransformStream extends TransformStream<Uint8Array, number | string> {
+  constructor() {
+    super({
+      transform(chunk, controller) {
+        controller.enqueue(chunk);
+      }
+    });
+  }
+}
+
+new TransformStream();
+new TransformStream({});
+new TransformStream({}, {});
+new TransformStream({}, {}, {});
+new TransformStream({}, {}, {}, {}); // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/Xss.expected b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/Xss.expected
index 99cafddc41d2..8d4eae0a7083 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/Xss.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/Xss.expected
@@ -1,5 +1,19 @@
 #select
+| fetch-promise-chain.js:21:47:21:49 | row | fetch-promise-chain.js:7:3:7:12 | fetch(url) | fetch-promise-chain.js:21:47:21:49 | row | Cross-site scripting vulnerability due to $@. | fetch-promise-chain.js:7:3:7:12 | fetch(url) | user-provided value |
+| fetch-promise-chain.js:30:33:30:36 | text | fetch-promise-chain.js:27:3:27:23 | fetch(" ... ssage") | fetch-promise-chain.js:30:33:30:36 | text | Cross-site scripting vulnerability due to $@. | fetch-promise-chain.js:27:3:27:23 | fetch(" ... ssage") | user-provided value |
+| fetch-promise-chain.js:47:33:47:44 | data.message | fetch-promise-chain.js:43:19:43:39 | fetch(" ... ssage") | fetch-promise-chain.js:47:33:47:44 | data.message | Cross-site scripting vulnerability due to $@. | fetch-promise-chain.js:43:19:43:39 | fetch(" ... ssage") | user-provided value |
+| fetch-promise-chain.js:57:33:57:36 | text | fetch-promise-chain.js:53:13:53:33 | fetch(" ... ssage") | fetch-promise-chain.js:57:33:57:36 | text | Cross-site scripting vulnerability due to $@. | fetch-promise-chain.js:53:13:53:33 | fetch(" ... ssage") | user-provided value |
+| fetch-promise-chain.js:67:55:67:66 | item.message | fetch-promise-chain.js:62:3:62:23 | fetch(" ... ssage") | fetch-promise-chain.js:67:55:67:66 | item.message | Cross-site scripting vulnerability due to $@. | fetch-promise-chain.js:62:3:62:23 | fetch(" ... ssage") | user-provided value |
+| fetch-promise-chain.js:76:33:76:39 | message | fetch-promise-chain.js:73:3:73:23 | fetch(" ... ssage") | fetch-promise-chain.js:76:33:76:39 | message | Cross-site scripting vulnerability due to $@. | fetch-promise-chain.js:73:3:73:23 | fetch(" ... ssage") | user-provided value |
+| fetch-promise-chain.js:84:33:84:44 | data.message | fetch-promise-chain.js:81:3:81:23 | fetch(" ... ssage") | fetch-promise-chain.js:84:33:84:44 | data.message | Cross-site scripting vulnerability due to $@. | fetch-promise-chain.js:81:3:81:23 | fetch(" ... ssage") | user-provided value |
+| fetch-promise-chain.js:93:31:93:42 | data.message | fetch-promise-chain.js:90:5:90:25 | fetch(" ... ssage") | fetch-promise-chain.js:93:31:93:42 | data.message | Cross-site scripting vulnerability due to $@. | fetch-promise-chain.js:90:5:90:25 | fetch(" ... ssage") | user-provided value |
+| fetch-promise-chain.js:102:33:102:47 | payload.message | fetch-promise-chain.js:98:3:98:23 | fetch(" ... ssage") | fetch-promise-chain.js:102:33:102:47 | payload.message | Cross-site scripting vulnerability due to $@. | fetch-promise-chain.js:98:3:98:23 | fetch(" ... ssage") | user-provided value |
 | interceptors.js:9:56:9:72 | userGeneratedHtml | interceptors.js:7:6:7:13 | response | interceptors.js:9:56:9:72 | userGeneratedHtml | Cross-site scripting vulnerability due to $@. | interceptors.js:7:6:7:13 | response | user-provided value |
+| non-fetch-promise-chain.js:5:33:5:36 | body | non-fetch-promise-chain.js:3:3:3:35 | rp("htt ... ssage") | non-fetch-promise-chain.js:5:33:5:36 | body | Cross-site scripting vulnerability due to $@. | non-fetch-promise-chain.js:3:3:3:35 | rp("htt ... ssage") | user-provided value |
+| non-fetch-promise-chain.js:13:33:13:44 | data.message | non-fetch-promise-chain.js:11:3:11:56 | rp({ ur ... true }) | non-fetch-promise-chain.js:13:33:13:44 | data.message | Cross-site scripting vulnerability due to $@. | non-fetch-promise-chain.js:11:3:11:56 | rp({ ur ... true }) | user-provided value |
+| non-fetch-promise-chain.js:21:31:21:51 | respons ... message | non-fetch-promise-chain.js:19:19:19:58 | axios.g ... ssage") | non-fetch-promise-chain.js:21:31:21:51 | respons ... message | Cross-site scripting vulnerability due to $@. | non-fetch-promise-chain.js:19:19:19:58 | axios.g ... ssage") | user-provided value |
+| non-fetch-promise-chain.js:29:33:29:53 | respons ... message | non-fetch-promise-chain.js:27:3:27:46 | needle( ... ssage") | non-fetch-promise-chain.js:29:33:29:53 | respons ... message | Cross-site scripting vulnerability due to $@. | non-fetch-promise-chain.js:27:3:27:46 | needle( ... ssage") | user-provided value |
+| non-fetch-promise-chain.js:37:33:37:45 | response.text | non-fetch-promise-chain.js:35:3:35:47 | superag ... ssage") | non-fetch-promise-chain.js:37:33:37:45 | response.text | Cross-site scripting vulnerability due to $@. | non-fetch-promise-chain.js:35:3:35:47 | superag ... ssage") | user-provided value |
 | test.jsx:27:29:27:32 | data | test.jsx:5:28:5:63 | fetch(" ... ntent") | test.jsx:27:29:27:32 | data | Cross-site scripting vulnerability due to $@. | test.jsx:5:28:5:63 | fetch(" ... ntent") | user-provided value |
 | test.ts:21:57:21:76 | response.description | test.ts:8:9:8:79 | this.#h ... query') | test.ts:21:57:21:76 | response.description | Cross-site scripting vulnerability due to $@. | test.ts:8:9:8:79 | this.#h ... query') | user-provided value |
 | test.ts:24:36:24:90 | `<h2>${ ... o}</p>` | test.ts:8:9:8:79 | this.#h ... query') | test.ts:24:36:24:90 | `<h2>${ ... o}</p>` | Cross-site scripting vulnerability due to $@. | test.ts:8:9:8:79 | this.#h ... query') | user-provided value |
@@ -19,9 +33,121 @@
 | testUseQueries2.vue:40:10:40:23 | v-html=data3 | testUseQueries2.vue:12:28:12:41 | fetch("${id}") | testUseQueries2.vue:40:10:40:23 | v-html=data3 | Cross-site scripting vulnerability due to $@. | testUseQueries2.vue:12:28:12:41 | fetch("${id}") | user-provided value |
 | testUseQueries.vue:25:10:25:23 | v-html=data2 | testUseQueries.vue:11:36:11:49 | fetch("${id}") | testUseQueries.vue:25:10:25:23 | v-html=data2 | Cross-site scripting vulnerability due to $@. | testUseQueries.vue:11:36:11:49 | fetch("${id}") | user-provided value |
 edges
+| fetch-promise-chain.js:7:3:7:12 | fetch(url) | fetch-promise-chain.js:8:11:8:18 | response | provenance |  |
+| fetch-promise-chain.js:7:3:8:38 | fetch(u ... json()) [PromiseValue] | fetch-promise-chain.js:9:11:9:14 | data | provenance |  |
+| fetch-promise-chain.js:8:11:8:18 | response | fetch-promise-chain.js:8:23:8:30 | response | provenance |  |
+| fetch-promise-chain.js:8:23:8:30 | response | fetch-promise-chain.js:8:23:8:37 | response.json() | provenance |  |
+| fetch-promise-chain.js:8:23:8:37 | response.json() | fetch-promise-chain.js:7:3:8:38 | fetch(u ... json()) [PromiseValue] | provenance |  |
+| fetch-promise-chain.js:9:11:9:14 | data | fetch-promise-chain.js:13:7:13:10 | data | provenance |  |
+| fetch-promise-chain.js:13:7:13:10 | data | fetch-promise-chain.js:13:7:13:16 | data.items | provenance |  |
+| fetch-promise-chain.js:13:7:13:16 | data.items | fetch-promise-chain.js:13:26:13:29 | item | provenance |  |
+| fetch-promise-chain.js:13:26:13:29 | item | fetch-promise-chain.js:14:55:14:58 | item | provenance |  |
+| fetch-promise-chain.js:13:26:13:29 | item | fetch-promise-chain.js:16:17:16:20 | item | provenance |  |
+| fetch-promise-chain.js:13:26:13:29 | item | fetch-promise-chain.js:17:17:17:20 | item | provenance |  |
+| fetch-promise-chain.js:13:26:13:29 | item | fetch-promise-chain.js:18:17:18:20 | item | provenance |  |
+| fetch-promise-chain.js:14:15:14:18 | link | fetch-promise-chain.js:19:17:19:20 | link | provenance |  |
+| fetch-promise-chain.js:14:22:14:88 | `<a hre ... ge</a>` | fetch-promise-chain.js:14:15:14:18 | link | provenance |  |
+| fetch-promise-chain.js:14:55:14:58 | item | fetch-promise-chain.js:14:55:14:68 | item.messageId | provenance |  |
+| fetch-promise-chain.js:14:55:14:68 | item.messageId | fetch-promise-chain.js:14:22:14:88 | `<a hre ... ge</a>` | provenance |  |
+| fetch-promise-chain.js:15:15:15:17 | row | fetch-promise-chain.js:21:47:21:49 | row | provenance |  |
+| fetch-promise-chain.js:15:21:20:14 | `<tr>\\n  ...  </tr>` | fetch-promise-chain.js:15:15:15:17 | row | provenance |  |
+| fetch-promise-chain.js:16:17:16:20 | item | fetch-promise-chain.js:16:17:16:32 | item.createdDate | provenance |  |
+| fetch-promise-chain.js:16:17:16:32 | item.createdDate | fetch-promise-chain.js:15:21:20:14 | `<tr>\\n  ...  </tr>` | provenance |  |
+| fetch-promise-chain.js:17:17:17:20 | item | fetch-promise-chain.js:17:17:17:30 | item.messageId | provenance |  |
+| fetch-promise-chain.js:17:17:17:30 | item.messageId | fetch-promise-chain.js:15:21:20:14 | `<tr>\\n  ...  </tr>` | provenance |  |
+| fetch-promise-chain.js:18:17:18:20 | item | fetch-promise-chain.js:18:17:18:33 | item.target ?? "" | provenance |  |
+| fetch-promise-chain.js:18:17:18:33 | item.target ?? "" | fetch-promise-chain.js:15:21:20:14 | `<tr>\\n  ...  </tr>` | provenance |  |
+| fetch-promise-chain.js:19:17:19:20 | link | fetch-promise-chain.js:15:21:20:14 | `<tr>\\n  ...  </tr>` | provenance |  |
+| fetch-promise-chain.js:27:3:27:23 | fetch(" ... ssage") | fetch-promise-chain.js:28:11:28:18 | response | provenance |  |
+| fetch-promise-chain.js:27:3:28:38 | fetch(" ... text()) [PromiseValue] | fetch-promise-chain.js:29:11:29:14 | text | provenance |  |
+| fetch-promise-chain.js:28:11:28:18 | response | fetch-promise-chain.js:28:23:28:30 | response | provenance |  |
+| fetch-promise-chain.js:28:23:28:30 | response | fetch-promise-chain.js:28:23:28:37 | response.text() | provenance |  |
+| fetch-promise-chain.js:28:23:28:37 | response.text() | fetch-promise-chain.js:27:3:28:38 | fetch(" ... text()) [PromiseValue] | provenance |  |
+| fetch-promise-chain.js:29:11:29:14 | text | fetch-promise-chain.js:30:33:30:36 | text | provenance |  |
+| fetch-promise-chain.js:43:9:43:15 | request | fetch-promise-chain.js:44:3:44:9 | request | provenance |  |
+| fetch-promise-chain.js:43:19:43:39 | fetch(" ... ssage") | fetch-promise-chain.js:43:9:43:15 | request | provenance |  |
+| fetch-promise-chain.js:44:3:44:9 | request | fetch-promise-chain.js:45:11:45:18 | response | provenance |  |
+| fetch-promise-chain.js:44:3:45:38 | request ... json()) [PromiseValue] | fetch-promise-chain.js:46:11:46:14 | data | provenance |  |
+| fetch-promise-chain.js:45:11:45:18 | response | fetch-promise-chain.js:45:23:45:30 | response | provenance |  |
+| fetch-promise-chain.js:45:23:45:30 | response | fetch-promise-chain.js:45:23:45:37 | response.json() | provenance |  |
+| fetch-promise-chain.js:45:23:45:37 | response.json() | fetch-promise-chain.js:44:3:45:38 | request ... json()) [PromiseValue] | provenance |  |
+| fetch-promise-chain.js:46:11:46:14 | data | fetch-promise-chain.js:47:33:47:36 | data | provenance |  |
+| fetch-promise-chain.js:47:33:47:36 | data | fetch-promise-chain.js:47:33:47:44 | data.message | provenance |  |
+| fetch-promise-chain.js:53:3:53:9 | request | fetch-promise-chain.js:54:3:54:9 | request | provenance |  |
+| fetch-promise-chain.js:53:13:53:33 | fetch(" ... ssage") | fetch-promise-chain.js:53:3:53:9 | request | provenance |  |
+| fetch-promise-chain.js:54:3:54:9 | request | fetch-promise-chain.js:55:11:55:18 | response | provenance |  |
+| fetch-promise-chain.js:54:3:55:38 | request ... text()) [PromiseValue] | fetch-promise-chain.js:56:11:56:14 | text | provenance |  |
+| fetch-promise-chain.js:55:11:55:18 | response | fetch-promise-chain.js:55:23:55:30 | response | provenance |  |
+| fetch-promise-chain.js:55:23:55:30 | response | fetch-promise-chain.js:55:23:55:37 | response.text() | provenance |  |
+| fetch-promise-chain.js:55:23:55:37 | response.text() | fetch-promise-chain.js:54:3:55:38 | request ... text()) [PromiseValue] | provenance |  |
+| fetch-promise-chain.js:56:11:56:14 | text | fetch-promise-chain.js:57:33:57:36 | text | provenance |  |
+| fetch-promise-chain.js:62:3:62:23 | fetch(" ... ssage") | fetch-promise-chain.js:63:11:63:18 | response | provenance |  |
+| fetch-promise-chain.js:62:3:63:38 | fetch(" ... json()) [PromiseValue] | fetch-promise-chain.js:62:3:64:29 | fetch(" ... .items) [PromiseValue] | provenance |  |
+| fetch-promise-chain.js:62:3:63:38 | fetch(" ... json()) [PromiseValue] | fetch-promise-chain.js:64:11:64:14 | data | provenance |  |
+| fetch-promise-chain.js:62:3:64:29 | fetch(" ... .items) [PromiseValue] | fetch-promise-chain.js:65:11:65:15 | items | provenance |  |
+| fetch-promise-chain.js:63:11:63:18 | response | fetch-promise-chain.js:63:23:63:30 | response | provenance |  |
+| fetch-promise-chain.js:63:23:63:30 | response | fetch-promise-chain.js:63:23:63:37 | response.json() | provenance |  |
+| fetch-promise-chain.js:63:23:63:37 | response.json() | fetch-promise-chain.js:62:3:63:38 | fetch(" ... json()) [PromiseValue] | provenance |  |
+| fetch-promise-chain.js:64:11:64:14 | data | fetch-promise-chain.js:64:19:64:22 | data | provenance |  |
+| fetch-promise-chain.js:64:19:64:22 | data | fetch-promise-chain.js:64:19:64:28 | data.items | provenance |  |
+| fetch-promise-chain.js:65:11:65:15 | items | fetch-promise-chain.js:66:7:66:11 | items | provenance |  |
+| fetch-promise-chain.js:66:7:66:11 | items | fetch-promise-chain.js:66:21:66:24 | item | provenance |  |
+| fetch-promise-chain.js:66:21:66:24 | item | fetch-promise-chain.js:67:55:67:58 | item | provenance |  |
+| fetch-promise-chain.js:67:55:67:58 | item | fetch-promise-chain.js:67:55:67:66 | item.message | provenance |  |
+| fetch-promise-chain.js:73:3:73:23 | fetch(" ... ssage") | fetch-promise-chain.js:74:11:74:18 | response | provenance |  |
+| fetch-promise-chain.js:73:3:74:38 | fetch(" ... json()) [PromiseValue] | fetch-promise-chain.js:75:12:75:22 | { message } | provenance |  |
+| fetch-promise-chain.js:74:11:74:18 | response | fetch-promise-chain.js:74:23:74:30 | response | provenance |  |
+| fetch-promise-chain.js:74:23:74:30 | response | fetch-promise-chain.js:74:23:74:37 | response.json() | provenance |  |
+| fetch-promise-chain.js:74:23:74:37 | response.json() | fetch-promise-chain.js:73:3:74:38 | fetch(" ... json()) [PromiseValue] | provenance |  |
+| fetch-promise-chain.js:75:12:75:22 | { message } | fetch-promise-chain.js:75:14:75:20 | message | provenance |  |
+| fetch-promise-chain.js:75:14:75:20 | message | fetch-promise-chain.js:76:33:76:39 | message | provenance |  |
+| fetch-promise-chain.js:81:3:81:23 | fetch(" ... ssage") | fetch-promise-chain.js:82:17:82:24 | response | provenance |  |
+| fetch-promise-chain.js:81:3:82:50 | fetch(" ... json()) [PromiseValue] | fetch-promise-chain.js:83:11:83:14 | data | provenance |  |
+| fetch-promise-chain.js:82:17:82:24 | response | fetch-promise-chain.js:82:35:82:42 | response | provenance |  |
+| fetch-promise-chain.js:82:29:82:49 | await r ... .json() | fetch-promise-chain.js:81:3:82:50 | fetch(" ... json()) [PromiseValue] | provenance |  |
+| fetch-promise-chain.js:82:35:82:42 | response | fetch-promise-chain.js:82:35:82:49 | response.json() | provenance |  |
+| fetch-promise-chain.js:82:35:82:49 | response.json() | fetch-promise-chain.js:82:29:82:49 | await r ... .json() | provenance |  |
+| fetch-promise-chain.js:83:11:83:14 | data | fetch-promise-chain.js:84:33:84:36 | data | provenance |  |
+| fetch-promise-chain.js:84:33:84:36 | data | fetch-promise-chain.js:84:33:84:44 | data.message | provenance |  |
+| fetch-promise-chain.js:89:3:92:4 | Promise ... ))\\n  ]) [PromiseValue, 0] | fetch-promise-chain.js:92:12:92:17 | [data] [0] | provenance |  |
+| fetch-promise-chain.js:89:15:92:3 | [\\n    f ... ())\\n  ] [0, PromiseValue] | fetch-promise-chain.js:89:3:92:4 | Promise ... ))\\n  ]) [PromiseValue, 0] | provenance |  |
+| fetch-promise-chain.js:90:5:90:25 | fetch(" ... ssage") | fetch-promise-chain.js:91:13:91:20 | response | provenance |  |
+| fetch-promise-chain.js:90:5:91:40 | fetch(" ... json()) [PromiseValue] | fetch-promise-chain.js:89:15:92:3 | [\\n    f ... ())\\n  ] [0, PromiseValue] | provenance |  |
+| fetch-promise-chain.js:91:13:91:20 | response | fetch-promise-chain.js:91:25:91:32 | response | provenance |  |
+| fetch-promise-chain.js:91:25:91:32 | response | fetch-promise-chain.js:91:25:91:39 | response.json() | provenance |  |
+| fetch-promise-chain.js:91:25:91:39 | response.json() | fetch-promise-chain.js:90:5:91:40 | fetch(" ... json()) [PromiseValue] | provenance |  |
+| fetch-promise-chain.js:92:12:92:17 | [data] [0] | fetch-promise-chain.js:92:13:92:16 | data | provenance |  |
+| fetch-promise-chain.js:92:13:92:16 | data | fetch-promise-chain.js:92:13:92:16 | data | provenance |  |
+| fetch-promise-chain.js:92:13:92:16 | data | fetch-promise-chain.js:93:31:93:34 | data | provenance |  |
+| fetch-promise-chain.js:93:31:93:34 | data | fetch-promise-chain.js:93:31:93:42 | data.message | provenance |  |
+| fetch-promise-chain.js:98:3:98:23 | fetch(" ... ssage") | fetch-promise-chain.js:99:11:99:18 | response | provenance |  |
+| fetch-promise-chain.js:98:3:99:38 | fetch(" ... json()) [PromiseValue] | fetch-promise-chain.js:100:11:100:14 | data | provenance |  |
+| fetch-promise-chain.js:99:11:99:18 | response | fetch-promise-chain.js:99:23:99:30 | response | provenance |  |
+| fetch-promise-chain.js:99:23:99:30 | response | fetch-promise-chain.js:99:23:99:37 | response.json() | provenance |  |
+| fetch-promise-chain.js:99:23:99:37 | response.json() | fetch-promise-chain.js:98:3:99:38 | fetch(" ... json()) [PromiseValue] | provenance |  |
+| fetch-promise-chain.js:100:11:100:14 | data | fetch-promise-chain.js:101:23:101:26 | data | provenance |  |
+| fetch-promise-chain.js:101:13:101:19 | payload | fetch-promise-chain.js:102:33:102:39 | payload | provenance |  |
+| fetch-promise-chain.js:101:23:101:26 | data | fetch-promise-chain.js:101:13:101:19 | payload | provenance |  |
+| fetch-promise-chain.js:102:33:102:39 | payload | fetch-promise-chain.js:102:33:102:47 | payload.message | provenance |  |
 | interceptors.js:7:6:7:13 | response | interceptors.js:8:35:8:42 | response | provenance |  |
 | interceptors.js:8:15:8:31 | userGeneratedHtml | interceptors.js:9:56:9:72 | userGeneratedHtml | provenance |  |
 | interceptors.js:8:35:8:42 | response | interceptors.js:8:15:8:31 | userGeneratedHtml | provenance |  |
+| non-fetch-promise-chain.js:3:3:3:35 | rp("htt ... ssage") | non-fetch-promise-chain.js:4:11:4:14 | body | provenance |  |
+| non-fetch-promise-chain.js:4:11:4:14 | body | non-fetch-promise-chain.js:5:33:5:36 | body | provenance |  |
+| non-fetch-promise-chain.js:11:3:11:56 | rp({ ur ... true }) | non-fetch-promise-chain.js:12:11:12:14 | data | provenance |  |
+| non-fetch-promise-chain.js:12:11:12:14 | data | non-fetch-promise-chain.js:13:33:13:36 | data | provenance |  |
+| non-fetch-promise-chain.js:13:33:13:36 | data | non-fetch-promise-chain.js:13:33:13:44 | data.message | provenance |  |
+| non-fetch-promise-chain.js:19:9:19:15 | request | non-fetch-promise-chain.js:20:3:20:9 | request | provenance |  |
+| non-fetch-promise-chain.js:19:19:19:58 | axios.g ... ssage") | non-fetch-promise-chain.js:19:9:19:15 | request | provenance |  |
+| non-fetch-promise-chain.js:20:3:20:9 | request | non-fetch-promise-chain.js:20:16:20:23 | response | provenance |  |
+| non-fetch-promise-chain.js:20:16:20:23 | response | non-fetch-promise-chain.js:21:31:21:38 | response | provenance |  |
+| non-fetch-promise-chain.js:21:31:21:38 | response | non-fetch-promise-chain.js:21:31:21:51 | respons ... message | provenance |  |
+| non-fetch-promise-chain.js:27:3:27:46 | needle( ... ssage") | non-fetch-promise-chain.js:28:11:28:18 | response | provenance |  |
+| non-fetch-promise-chain.js:28:11:28:18 | response | non-fetch-promise-chain.js:29:33:29:40 | response | provenance |  |
+| non-fetch-promise-chain.js:29:33:29:40 | response | non-fetch-promise-chain.js:29:33:29:53 | respons ... message | provenance |  |
+| non-fetch-promise-chain.js:35:3:35:47 | superag ... ssage") | non-fetch-promise-chain.js:36:11:36:18 | response | provenance |  |
+| non-fetch-promise-chain.js:36:11:36:18 | response | non-fetch-promise-chain.js:37:33:37:40 | response | provenance |  |
+| non-fetch-promise-chain.js:37:33:37:40 | response | non-fetch-promise-chain.js:37:33:37:45 | response.text | provenance |  |
 | test.jsx:5:11:5:18 | response | test.jsx:6:24:6:31 | response | provenance |  |
 | test.jsx:5:22:5:63 | await f ... ntent") | test.jsx:5:11:5:18 | response | provenance |  |
 | test.jsx:5:28:5:63 | fetch(" ... ntent") | test.jsx:5:22:5:63 | await f ... ntent") | provenance |  |
@@ -100,10 +226,133 @@ edges
 | testUseQueries.vue:12:20:12:34 | response.json() | testUseQueries.vue:18:22:18:36 | results[0].data | provenance |  |
 | testUseQueries.vue:18:22:18:36 | results[0].data | testUseQueries.vue:25:10:25:23 | v-html=data2 | provenance |  |
 nodes
+| fetch-promise-chain.js:7:3:7:12 | fetch(url) | semmle.label | fetch(url) |
+| fetch-promise-chain.js:7:3:8:38 | fetch(u ... json()) [PromiseValue] | semmle.label | fetch(u ... json()) [PromiseValue] |
+| fetch-promise-chain.js:8:11:8:18 | response | semmle.label | response |
+| fetch-promise-chain.js:8:23:8:30 | response | semmle.label | response |
+| fetch-promise-chain.js:8:23:8:37 | response.json() | semmle.label | response.json() |
+| fetch-promise-chain.js:9:11:9:14 | data | semmle.label | data |
+| fetch-promise-chain.js:13:7:13:10 | data | semmle.label | data |
+| fetch-promise-chain.js:13:7:13:16 | data.items | semmle.label | data.items |
+| fetch-promise-chain.js:13:26:13:29 | item | semmle.label | item |
+| fetch-promise-chain.js:14:15:14:18 | link | semmle.label | link |
+| fetch-promise-chain.js:14:22:14:88 | `<a hre ... ge</a>` | semmle.label | `<a hre ... ge</a>` |
+| fetch-promise-chain.js:14:55:14:58 | item | semmle.label | item |
+| fetch-promise-chain.js:14:55:14:68 | item.messageId | semmle.label | item.messageId |
+| fetch-promise-chain.js:15:15:15:17 | row | semmle.label | row |
+| fetch-promise-chain.js:15:21:20:14 | `<tr>\\n  ...  </tr>` | semmle.label | `<tr>\\n  ...  </tr>` |
+| fetch-promise-chain.js:16:17:16:20 | item | semmle.label | item |
+| fetch-promise-chain.js:16:17:16:32 | item.createdDate | semmle.label | item.createdDate |
+| fetch-promise-chain.js:17:17:17:20 | item | semmle.label | item |
+| fetch-promise-chain.js:17:17:17:30 | item.messageId | semmle.label | item.messageId |
+| fetch-promise-chain.js:18:17:18:20 | item | semmle.label | item |
+| fetch-promise-chain.js:18:17:18:33 | item.target ?? "" | semmle.label | item.target ?? "" |
+| fetch-promise-chain.js:19:17:19:20 | link | semmle.label | link |
+| fetch-promise-chain.js:21:47:21:49 | row | semmle.label | row |
+| fetch-promise-chain.js:27:3:27:23 | fetch(" ... ssage") | semmle.label | fetch(" ... ssage") |
+| fetch-promise-chain.js:27:3:28:38 | fetch(" ... text()) [PromiseValue] | semmle.label | fetch(" ... text()) [PromiseValue] |
+| fetch-promise-chain.js:28:11:28:18 | response | semmle.label | response |
+| fetch-promise-chain.js:28:23:28:30 | response | semmle.label | response |
+| fetch-promise-chain.js:28:23:28:37 | response.text() | semmle.label | response.text() |
+| fetch-promise-chain.js:29:11:29:14 | text | semmle.label | text |
+| fetch-promise-chain.js:30:33:30:36 | text | semmle.label | text |
+| fetch-promise-chain.js:43:9:43:15 | request | semmle.label | request |
+| fetch-promise-chain.js:43:19:43:39 | fetch(" ... ssage") | semmle.label | fetch(" ... ssage") |
+| fetch-promise-chain.js:44:3:44:9 | request | semmle.label | request |
+| fetch-promise-chain.js:44:3:45:38 | request ... json()) [PromiseValue] | semmle.label | request ... json()) [PromiseValue] |
+| fetch-promise-chain.js:45:11:45:18 | response | semmle.label | response |
+| fetch-promise-chain.js:45:23:45:30 | response | semmle.label | response |
+| fetch-promise-chain.js:45:23:45:37 | response.json() | semmle.label | response.json() |
+| fetch-promise-chain.js:46:11:46:14 | data | semmle.label | data |
+| fetch-promise-chain.js:47:33:47:36 | data | semmle.label | data |
+| fetch-promise-chain.js:47:33:47:44 | data.message | semmle.label | data.message |
+| fetch-promise-chain.js:53:3:53:9 | request | semmle.label | request |
+| fetch-promise-chain.js:53:13:53:33 | fetch(" ... ssage") | semmle.label | fetch(" ... ssage") |
+| fetch-promise-chain.js:54:3:54:9 | request | semmle.label | request |
+| fetch-promise-chain.js:54:3:55:38 | request ... text()) [PromiseValue] | semmle.label | request ... text()) [PromiseValue] |
+| fetch-promise-chain.js:55:11:55:18 | response | semmle.label | response |
+| fetch-promise-chain.js:55:23:55:30 | response | semmle.label | response |
+| fetch-promise-chain.js:55:23:55:37 | response.text() | semmle.label | response.text() |
+| fetch-promise-chain.js:56:11:56:14 | text | semmle.label | text |
+| fetch-promise-chain.js:57:33:57:36 | text | semmle.label | text |
+| fetch-promise-chain.js:62:3:62:23 | fetch(" ... ssage") | semmle.label | fetch(" ... ssage") |
+| fetch-promise-chain.js:62:3:63:38 | fetch(" ... json()) [PromiseValue] | semmle.label | fetch(" ... json()) [PromiseValue] |
+| fetch-promise-chain.js:62:3:64:29 | fetch(" ... .items) [PromiseValue] | semmle.label | fetch(" ... .items) [PromiseValue] |
+| fetch-promise-chain.js:63:11:63:18 | response | semmle.label | response |
+| fetch-promise-chain.js:63:23:63:30 | response | semmle.label | response |
+| fetch-promise-chain.js:63:23:63:37 | response.json() | semmle.label | response.json() |
+| fetch-promise-chain.js:64:11:64:14 | data | semmle.label | data |
+| fetch-promise-chain.js:64:19:64:22 | data | semmle.label | data |
+| fetch-promise-chain.js:64:19:64:28 | data.items | semmle.label | data.items |
+| fetch-promise-chain.js:65:11:65:15 | items | semmle.label | items |
+| fetch-promise-chain.js:66:7:66:11 | items | semmle.label | items |
+| fetch-promise-chain.js:66:21:66:24 | item | semmle.label | item |
+| fetch-promise-chain.js:67:55:67:58 | item | semmle.label | item |
+| fetch-promise-chain.js:67:55:67:66 | item.message | semmle.label | item.message |
+| fetch-promise-chain.js:73:3:73:23 | fetch(" ... ssage") | semmle.label | fetch(" ... ssage") |
+| fetch-promise-chain.js:73:3:74:38 | fetch(" ... json()) [PromiseValue] | semmle.label | fetch(" ... json()) [PromiseValue] |
+| fetch-promise-chain.js:74:11:74:18 | response | semmle.label | response |
+| fetch-promise-chain.js:74:23:74:30 | response | semmle.label | response |
+| fetch-promise-chain.js:74:23:74:37 | response.json() | semmle.label | response.json() |
+| fetch-promise-chain.js:75:12:75:22 | { message } | semmle.label | { message } |
+| fetch-promise-chain.js:75:14:75:20 | message | semmle.label | message |
+| fetch-promise-chain.js:76:33:76:39 | message | semmle.label | message |
+| fetch-promise-chain.js:81:3:81:23 | fetch(" ... ssage") | semmle.label | fetch(" ... ssage") |
+| fetch-promise-chain.js:81:3:82:50 | fetch(" ... json()) [PromiseValue] | semmle.label | fetch(" ... json()) [PromiseValue] |
+| fetch-promise-chain.js:82:17:82:24 | response | semmle.label | response |
+| fetch-promise-chain.js:82:29:82:49 | await r ... .json() | semmle.label | await r ... .json() |
+| fetch-promise-chain.js:82:35:82:42 | response | semmle.label | response |
+| fetch-promise-chain.js:82:35:82:49 | response.json() | semmle.label | response.json() |
+| fetch-promise-chain.js:83:11:83:14 | data | semmle.label | data |
+| fetch-promise-chain.js:84:33:84:36 | data | semmle.label | data |
+| fetch-promise-chain.js:84:33:84:44 | data.message | semmle.label | data.message |
+| fetch-promise-chain.js:89:3:92:4 | Promise ... ))\\n  ]) [PromiseValue, 0] | semmle.label | Promise ... ))\\n  ]) [PromiseValue, 0] |
+| fetch-promise-chain.js:89:15:92:3 | [\\n    f ... ())\\n  ] [0, PromiseValue] | semmle.label | [\\n    f ... ())\\n  ] [0, PromiseValue] |
+| fetch-promise-chain.js:90:5:90:25 | fetch(" ... ssage") | semmle.label | fetch(" ... ssage") |
+| fetch-promise-chain.js:90:5:91:40 | fetch(" ... json()) [PromiseValue] | semmle.label | fetch(" ... json()) [PromiseValue] |
+| fetch-promise-chain.js:91:13:91:20 | response | semmle.label | response |
+| fetch-promise-chain.js:91:25:91:32 | response | semmle.label | response |
+| fetch-promise-chain.js:91:25:91:39 | response.json() | semmle.label | response.json() |
+| fetch-promise-chain.js:92:12:92:17 | [data] [0] | semmle.label | [data] [0] |
+| fetch-promise-chain.js:92:13:92:16 | data | semmle.label | data |
+| fetch-promise-chain.js:92:13:92:16 | data | semmle.label | data |
+| fetch-promise-chain.js:93:31:93:34 | data | semmle.label | data |
+| fetch-promise-chain.js:93:31:93:42 | data.message | semmle.label | data.message |
+| fetch-promise-chain.js:98:3:98:23 | fetch(" ... ssage") | semmle.label | fetch(" ... ssage") |
+| fetch-promise-chain.js:98:3:99:38 | fetch(" ... json()) [PromiseValue] | semmle.label | fetch(" ... json()) [PromiseValue] |
+| fetch-promise-chain.js:99:11:99:18 | response | semmle.label | response |
+| fetch-promise-chain.js:99:23:99:30 | response | semmle.label | response |
+| fetch-promise-chain.js:99:23:99:37 | response.json() | semmle.label | response.json() |
+| fetch-promise-chain.js:100:11:100:14 | data | semmle.label | data |
+| fetch-promise-chain.js:101:13:101:19 | payload | semmle.label | payload |
+| fetch-promise-chain.js:101:23:101:26 | data | semmle.label | data |
+| fetch-promise-chain.js:102:33:102:39 | payload | semmle.label | payload |
+| fetch-promise-chain.js:102:33:102:47 | payload.message | semmle.label | payload.message |
 | interceptors.js:7:6:7:13 | response | semmle.label | response |
 | interceptors.js:8:15:8:31 | userGeneratedHtml | semmle.label | userGeneratedHtml |
 | interceptors.js:8:35:8:42 | response | semmle.label | response |
 | interceptors.js:9:56:9:72 | userGeneratedHtml | semmle.label | userGeneratedHtml |
+| non-fetch-promise-chain.js:3:3:3:35 | rp("htt ... ssage") | semmle.label | rp("htt ... ssage") |
+| non-fetch-promise-chain.js:4:11:4:14 | body | semmle.label | body |
+| non-fetch-promise-chain.js:5:33:5:36 | body | semmle.label | body |
+| non-fetch-promise-chain.js:11:3:11:56 | rp({ ur ... true }) | semmle.label | rp({ ur ... true }) |
+| non-fetch-promise-chain.js:12:11:12:14 | data | semmle.label | data |
+| non-fetch-promise-chain.js:13:33:13:36 | data | semmle.label | data |
+| non-fetch-promise-chain.js:13:33:13:44 | data.message | semmle.label | data.message |
+| non-fetch-promise-chain.js:19:9:19:15 | request | semmle.label | request |
+| non-fetch-promise-chain.js:19:19:19:58 | axios.g ... ssage") | semmle.label | axios.g ... ssage") |
+| non-fetch-promise-chain.js:20:3:20:9 | request | semmle.label | request |
+| non-fetch-promise-chain.js:20:16:20:23 | response | semmle.label | response |
+| non-fetch-promise-chain.js:21:31:21:38 | response | semmle.label | response |
+| non-fetch-promise-chain.js:21:31:21:51 | respons ... message | semmle.label | respons ... message |
+| non-fetch-promise-chain.js:27:3:27:46 | needle( ... ssage") | semmle.label | needle( ... ssage") |
+| non-fetch-promise-chain.js:28:11:28:18 | response | semmle.label | response |
+| non-fetch-promise-chain.js:29:33:29:40 | response | semmle.label | response |
+| non-fetch-promise-chain.js:29:33:29:53 | respons ... message | semmle.label | respons ... message |
+| non-fetch-promise-chain.js:35:3:35:47 | superag ... ssage") | semmle.label | superag ... ssage") |
+| non-fetch-promise-chain.js:36:11:36:18 | response | semmle.label | response |
+| non-fetch-promise-chain.js:37:33:37:40 | response | semmle.label | response |
+| non-fetch-promise-chain.js:37:33:37:45 | response.text | semmle.label | response.text |
 | test.jsx:5:11:5:18 | response | semmle.label | response |
 | test.jsx:5:22:5:63 | await f ... ntent") | semmle.label | await f ... ntent") |
 | test.jsx:5:28:5:63 | fetch(" ... ntent") | semmle.label | fetch(" ... ntent") |
@@ -197,3 +446,4 @@ nodes
 | testUseQueries.vue:18:22:18:36 | results[0].data | semmle.label | results[0].data |
 | testUseQueries.vue:25:10:25:23 | v-html=data2 | semmle.label | v-html=data2 |
 subpaths
+| fetch-promise-chain.js:62:3:63:38 | fetch(" ... json()) [PromiseValue] | fetch-promise-chain.js:64:11:64:14 | data | fetch-promise-chain.js:64:19:64:28 | data.items | fetch-promise-chain.js:62:3:64:29 | fetch(" ... .items) [PromiseValue] |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/fetch-promise-chain.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/fetch-promise-chain.js
new file mode 100644
index 000000000000..ee6f6731f136
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/fetch-promise-chain.js
@@ -0,0 +1,145 @@
+function insertMessageRows(pageSize, continuationToken) {
+  let url = "?handler=LoadMessageLogs&pageSize=" + pageSize;
+  if (continuationToken) {
+    url += "&continuationToken=" + encodeURIComponent(continuationToken);
+  }
+
+  fetch(url) // $ Source[js/xss]
+    .then(response => response.json())
+    .then(data => {
+      const tbody = document.querySelector("#tblMessageLogs tbody");
+      tbody.innerHTML = "";
+
+      data.items.forEach(item => {
+        const link = `<a href="/MessageLogs/Details/${item.messageId}">View message</a>`;
+        const row = `<tr>
+          <td>${item.createdDate}</td>
+          <td>${item.messageId}</td>
+          <td>${item.target ?? ""}</td>
+          <td>${link}</td>
+        </tr>`;
+        tbody.insertAdjacentHTML("beforeend", row); // $ Alert[js/xss]
+      });
+    });
+}
+
+function insertPlainTextResponse() {
+  fetch("/api/message") // $ Source[js/xss]
+    .then(response => response.text())
+    .then(text => {
+      document.body.innerHTML = text; // $ Alert[js/xss]
+    });
+}
+
+function assignTextContent() {
+  fetch("/api/message")
+    .then(response => response.json())
+    .then(data => {
+      document.body.textContent = data.message;
+    });
+}
+
+function insertAliasedFetchResponse() {
+  const request = fetch("/api/message"); // $ Source[js/xss]
+  request
+    .then(response => response.json())
+    .then(data => {
+      document.body.innerHTML = data.message; // $ Alert[js/xss]
+    });
+}
+
+function insertReassignedFetchResponse() {
+  let request;
+  request = fetch("/api/message"); // $ Source[js/xss]
+  request
+    .then(response => response.text())
+    .then(text => {
+      document.body.innerHTML = text; // $ Alert[js/xss]
+    });
+}
+
+function insertMessageAfterMultipleThenHops() {
+  fetch("/api/message") // $ Source[js/xss]
+    .then(response => response.json())
+    .then(data => data.items)
+    .then(items => {
+      items.forEach(item => {
+        document.body.insertAdjacentHTML("beforeend", item.message); // $ Alert[js/xss]
+      });
+    });
+}
+
+function insertDestructuredMessage() {
+  fetch("/api/message") // $ Source[js/xss]
+    .then(response => response.json())
+    .then(({ message }) => {
+      document.body.innerHTML = message; // $ Alert[js/xss]
+    });
+}
+
+function insertMessageFromAsyncThenCallback() {
+  fetch("/api/message") // $ Source[js/xss]
+    .then(async response => await response.json())
+    .then(data => {
+      document.body.innerHTML = data.message; // $ Alert[js/xss]
+    });
+}
+
+function insertPromiseAllMessage() {
+  Promise.all([
+    fetch("/api/message") // $ Source[js/xss]
+      .then(response => response.json())
+  ]).then(([data]) => {
+    document.body.innerHTML = data.message; // $ Alert[js/xss]
+  });
+}
+
+function insertAliasedDataMessage() {
+  fetch("/api/message") // $ Source[js/xss]
+    .then(response => response.json())
+    .then(data => {
+      const payload = data;
+      document.body.innerHTML = payload.message; // $ Alert[js/xss]
+    });
+}
+
+function insertSanitizedHtml() {
+  fetch("/api/message")
+    .then(response => response.text())
+    .then(text => {
+      document.body.innerHTML = DOMPurify.sanitize(text);
+    });
+}
+
+function assignInputValue() {
+  fetch("/api/message")
+    .then(response => response.text())
+    .then(text => {
+      document.querySelector("input").value = text;
+    });
+}
+
+function assignSafeAttributes() {
+  fetch("/api/message")
+    .then(response => response.text())
+    .then(text => {
+      const element = document.querySelector("div");
+      element.setAttribute("title", text);
+      element.setAttribute("aria-label", text);
+    });
+}
+
+function catchDoesNotInventResponseValue() {
+  fetch("/api/message")
+    .catch(error => {
+      document.body.innerHTML = error.message;
+    });
+}
+
+function finallyDoesNotInventResponseValue() {
+  let text = "";
+  fetch("/api/message")
+    .finally(() => {
+      document.body.innerHTML = text;
+    });
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/non-fetch-promise-chain.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/non-fetch-promise-chain.js
new file mode 100644
index 000000000000..2996c9012fa8
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/non-fetch-promise-chain.js
@@ -0,0 +1,47 @@
+function insertRequestPromiseBody() {
+  const rp = require("request-promise-native");
+  rp("https://example.com/message") // $ Source[js/xss]
+    .then(body => {
+      document.body.innerHTML = body; // $ Alert[js/xss]
+    });
+}
+
+function insertRequestPromiseJsonBody() {
+  const rp = require("request-promise");
+  rp({ uri: "https://example.com/message", json: true }) // $ Source[js/xss]
+    .then(data => {
+      document.body.innerHTML = data.message; // $ Alert[js/xss]
+    });
+}
+
+function insertAxiosResponseData() {
+  const axios = require("axios");
+  const request = axios.get("https://example.com/message"); // $ Source[js/xss]
+  request.then(response => {
+    document.body.innerHTML = response.data.message; // $ Alert[js/xss]
+  });
+}
+
+function insertNeedleResponseBody() {
+  const needle = require("needle");
+  needle("get", "https://example.com/message") // $ Source[js/xss]
+    .then(response => {
+      document.body.innerHTML = response.body.message; // $ Alert[js/xss]
+    });
+}
+
+function insertSuperagentResponseText() {
+  const superagent = require("superagent");
+  superagent.get("https://example.com/message") // $ Source[js/xss]
+    .then(response => {
+      document.body.innerHTML = response.text; // $ Alert[js/xss]
+    });
+}
+
+function assignAxiosResponseToInputValue() {
+  const axios = require("axios");
+  axios.get("https://example.com/message")
+    .then(response => {
+      document.querySelector("input").value = response.data.message;
+    });
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/MissingRateLimiting.expected b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/MissingRateLimiting.expected
index 5e2265f64b49..e8e1be279447 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/MissingRateLimiting.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/MissingRateLimiting.expected
@@ -11,3 +11,5 @@
 | tst.js:88:24:88:40 | expensiveHandler1 | This route handler performs $@, but is not rate-limited. | tst.js:14:40:14:46 | login() | authorization |
 | tst.js:111:28:111:44 | expensiveHandler1 | This route handler performs $@, but is not rate-limited. | tst.js:14:40:14:46 | login() | authorization |
 | tst.js:116:39:116:55 | expensiveHandler1 | This route handler performs $@, but is not rate-limited. | tst.js:14:40:14:46 | login() | authorization |
+| tst.js:130:35:130:51 | expensiveHandler1 | This route handler performs $@, but is not rate-limited. | tst.js:14:40:14:46 | login() | authorization |
+| tst.js:161:35:161:51 | expensiveHandler1 | This route handler performs $@, but is not rate-limited. | tst.js:14:40:14:46 | login() | authorization |
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst.js b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst.js
index 7ff0c067fb51..7c5f1708ff6c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst.js
@@ -116,3 +116,46 @@ const fastifyApp3 = require('fastify')();
 fastifyApp3.get('/before-rate-limit', expensiveHandler1); // $ Alert
 fastifyApp3.register(require('@fastify/rate-limit'));
 fastifyApp3.get('/after-rate-limit', expensiveHandler1);
+
+// the server instance is reached through a chainable configuration method, which
+// returns the same instance
+const fastifyApp4 = require('fastify')().withTypeProvider();
+
+fastifyApp4.register(require('@fastify/rate-limit'));
+fastifyApp4.get('/after-rate-limit', expensiveHandler1);
+
+// same, but with no rate limiter registered at all, so the route is genuinely unguarded
+const fastifyApp5 = require('fastify')().withTypeProvider();
+
+fastifyApp5.get('/no-rate-limit', expensiveHandler1); // $ Alert
+
+// several configuration methods chained together
+const fastifyApp6 = require('fastify')()
+  .withTypeProvider()
+  .setValidatorCompiler(compiler)
+  .addContentTypeParser('application/json', parser)
+  .decorate('answer', 42);
+
+fastifyApp6.register(require('@fastify/rate-limit'));
+fastifyApp6.get('/after-rate-limit', expensiveHandler1);
+
+// the chained instance is returned from a factory function, so reaching it requires
+// tracking the value across the call rather than only through local references
+function makeFastifyApp() {
+  return require('fastify')().withTypeProvider();
+}
+
+const fastifyApp7 = makeFastifyApp();
+
+fastifyApp7.register(require('@fastify/rate-limit'));
+fastifyApp7.get('/after-rate-limit', expensiveHandler1);
+
+// same, from a separate factory so that the server above does not share its creation
+// site, and no rate limiter is registered on it
+function makeUnguardedFastifyApp() {
+  return require('fastify')().withTypeProvider();
+}
+
+const fastifyApp8 = makeUnguardedFastifyApp();
+
+fastifyApp8.get('/no-rate-limit', expensiveHandler1); // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-912/tst.js b/javascript/ql/test/query-tests/Security/CWE-912/tst.js
index 00e89fd11e6f..7e54e4e51aba 100644
--- a/javascript/ql/test/query-tests/Security/CWE-912/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-912/tst.js
@@ -25,17 +25,17 @@ try {
         stream.end();
       });
     });
-    response.on('error', () => 
-    { 
-	fs.writeFile("/tmp/test", "error occured"); // OK - static data written to file
+    response.on('error', () =>
+    {
+	fs.writeFile("/tmp/test", "error occurred"); // OK - static data written to file
     });
-  }).on('error', () => 
-  { 
-      let error = "error occured";
+  }).on('error', () =>
+  {
+      let error = "error occurred";
       let writeStream = fs.createWriteStream('/usr/good/errorlog.txt');
       writeStream.write(error);  // OK - static data written to file stream
       writeStream.end();
   });
 }
 catch (e) {
-}
\ No newline at end of file
+}
diff --git a/javascript/resources/codeql-extractor.yml b/javascript/resources/codeql-extractor.yml
index bfc99d826fc5..b7c4999385dd 100644
--- a/javascript/resources/codeql-extractor.yml
+++ b/javascript/resources/codeql-extractor.yml
@@ -25,15 +25,23 @@ file_coverage_languages:
     display_name: Vue.js component
     scc_languages:
       - Vue
+  - name: html
+    display_name: HTML
+    scc_languages:
+      - HTML
+      - XHTML
 github_api_languages:
   - JavaScript
   - TypeScript
   - Vue
+  - HTML
 scc_languages:
   - JavaScript
   - TypeScript
   - TypeScript Typings
   - Vue
+  - HTML
+  - XHTML
 file_types:
   - name: javascript
     display_name: JavaScript
diff --git a/javascript/resources/tools/autobuild.cmd b/javascript/resources/tools/autobuild.cmd
index 72feddeab124..36365b4caade 100644
--- a/javascript/resources/tools/autobuild.cmd
+++ b/javascript/resources/tools/autobuild.cmd
@@ -3,7 +3,7 @@ SETLOCAL EnableDelayedExpansion
 
 set jvm_args=-Xss16m
 
-rem If CODEQL_RAM is set, use half for Java and half for TS.
+rem If CODEQL_RAM is set, use half for Java and half for Node.js.
 if NOT [%CODEQL_RAM%] == [] (
     set /a "half_ram=CODEQL_RAM/2"
     set LGTM_TYPESCRIPT_RAM=!half_ram!
diff --git a/javascript/resources/tools/autobuild.sh b/javascript/resources/tools/autobuild.sh
index 7aaaf2878284..4f9fc7858fa9 100755
--- a/javascript/resources/tools/autobuild.sh
+++ b/javascript/resources/tools/autobuild.sh
@@ -4,7 +4,7 @@ set -eu
 
 jvm_args=-Xss16m
 
-# If CODEQL_RAM is set, use half for Java and half for TS.
+# If CODEQL_RAM is set, use half for Java and half for Node.js.
 if [ -n "${CODEQL_RAM:-}" ] ; then
     half_ram="$(( CODEQL_RAM / 2 ))"
     LGTM_TYPESCRIPT_RAM="$half_ram"
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-1.1.3.bazel b/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-1.1.3.bazel
index 19fb311dc775..5f823494433a 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-1.1.3.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-1.1.3.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstream-0.6.18.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstream-0.6.18.bazel
index c447208da1e7..9d3a69739bcb 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstream-0.6.18.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstream-0.6.18.bazel
@@ -57,12 +57,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -74,13 +76,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -88,6 +101,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-1.0.10.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-1.0.10.bazel
index 5646802d7c87..e0a90aacc31a 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-1.0.10.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-1.0.10.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-parse-0.2.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-parse-0.2.6.bazel
index a3db2f4cf0e2..bfb7497fc54d 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-parse-0.2.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-parse-0.2.6.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-query-1.1.2.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-query-1.1.2.bazel
index 974053fa2105..bebe3d1a0424 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-query-1.1.2.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-query-1.1.2.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-wincon-3.0.7.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-wincon-3.0.7.bazel
index 4e55fe14335f..3839fef1c5cf 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-wincon-3.0.7.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-wincon-3.0.7.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.95.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.95.bazel
index c2bbc00cde76..bbe8f270261c 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.95.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.95.bazel
@@ -60,12 +60,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -77,13 +79,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -91,6 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -103,7 +117,7 @@ rust_library(
     }),
     version = "1.0.95",
     deps = [
-        "@vendor_py__anyhow-1.0.95//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -113,6 +127,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -145,6 +162,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    emit_warnings = False,
     pkg_name = "anyhow",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.bazel b/misc/bazel/3rdparty/py_deps/BUILD.bazel
index 86bfde266419..df40f78ce256 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.bazel
@@ -80,37 +80,37 @@ alias(
 )
 
 alias(
-    name = "tree-sitter-0.24.7",
-    actual = "@vendor_py__tree-sitter-0.24.7//:tree_sitter",
+    name = "serde_json-1.0.138",
+    actual = "@vendor_py__serde_json-1.0.138//:serde_json",
     tags = ["manual"],
 )
 
 alias(
-    name = "tree-sitter",
-    actual = "@vendor_py__tree-sitter-0.24.7//:tree_sitter",
+    name = "serde_json",
+    actual = "@vendor_py__serde_json-1.0.138//:serde_json",
     tags = ["manual"],
 )
 
 alias(
-    name = "tree-sitter-graph-0.12.0",
-    actual = "@vendor_py__tree-sitter-graph-0.12.0//:tree_sitter_graph",
+    name = "tree-sitter-0.24.7",
+    actual = "@vendor_py__tree-sitter-0.24.7//:tree_sitter",
     tags = ["manual"],
 )
 
 alias(
-    name = "tree-sitter-graph",
-    actual = "@vendor_py__tree-sitter-graph-0.12.0//:tree_sitter_graph",
+    name = "tree-sitter",
+    actual = "@vendor_py__tree-sitter-0.24.7//:tree_sitter",
     tags = ["manual"],
 )
 
 alias(
-    name = "tsp-0.19.0",
-    actual = "@vendor_py__tsp-0.19.0//:tsp",
+    name = "tree-sitter-graph-0.12.0",
+    actual = "@vendor_py__tree-sitter-graph-0.12.0//:tree_sitter_graph",
     tags = ["manual"],
 )
 
 alias(
-    name = "tsp",
-    actual = "@vendor_py__tsp-0.19.0//:tsp",
+    name = "tree-sitter-graph",
+    actual = "@vendor_py__tree-sitter-graph-0.12.0//:tree_sitter_graph",
     tags = ["manual"],
 )
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.cc-1.2.14.bazel b/misc/bazel/3rdparty/py_deps/BUILD.cc-1.2.14.bazel
index eb579ddb2fe5..22e41d54d09d 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.cc-1.2.14.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.cc-1.2.14.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel b/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel
index 7846c81d4b7f..9099429bdcac 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel
@@ -61,12 +61,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -78,13 +80,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -92,6 +105,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel b/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel
index 9e32f334ec28..8ec27b8b424c 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel
@@ -60,12 +60,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -77,13 +79,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -91,6 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.clap_lex-0.7.4.bazel b/misc/bazel/3rdparty/py_deps/BUILD.clap_lex-0.7.4.bazel
index 7e672468ebb7..34397e853e23 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.clap_lex-0.7.4.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.clap_lex-0.7.4.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.colorchoice-1.0.3.bazel b/misc/bazel/3rdparty/py_deps/BUILD.colorchoice-1.0.3.bazel
index f9a26a33bf39..7d7fb7efd74d 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.colorchoice-1.0.3.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.colorchoice-1.0.3.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.is_terminal_polyfill-1.70.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
index acd21224d113..74d0dc6e84bc 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
@@ -55,12 +55,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -72,13 +74,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -86,6 +99,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.14.bazel b/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.14.bazel
index 1121f1c6fa81..5ba2691a61ec 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.14.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.14.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.25.bazel b/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.25.bazel
index a6e892fc3e2d..64a54cfa02da 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.25.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.25.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.7.4.bazel b/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.7.4.bazel
index 92c05c115761..1f136ad74de9 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.7.4.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.7.4.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.once_cell-1.20.3.bazel b/misc/bazel/3rdparty/py_deps/BUILD.once_cell-1.20.3.bazel
index d9b023658c41..1cf15b80473f 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.once_cell-1.20.3.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.once_cell-1.20.3.bazel
@@ -58,12 +58,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -75,13 +77,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -89,6 +102,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.93.bazel b/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.93.bazel
index de386a5fb136..9df42dc41a0b 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.93.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.93.bazel
@@ -60,12 +60,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -77,13 +79,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -91,6 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -103,7 +117,7 @@ rust_library(
     }),
     version = "1.0.93",
     deps = [
-        "@vendor_py__proc-macro2-1.0.93//:build_script_build",
+        ":build_script_build",
         "@vendor_py__unicode-ident-1.0.16//:unicode_ident",
     ],
 )
@@ -114,6 +128,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -146,6 +163,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "proc-macro2",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.38.bazel b/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.38.bazel
index fd1be0541615..e96d25a87e94 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.38.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.38.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.regex-1.11.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.regex-1.11.1.bazel
index 4363055577d1..bb4f042072da 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.regex-1.11.1.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.regex-1.11.1.bazel
@@ -71,12 +71,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -88,13 +90,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -102,6 +115,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.regex-automata-0.4.9.bazel b/misc/bazel/3rdparty/py_deps/BUILD.regex-automata-0.4.9.bazel
index ed2546bbd8af..6317b89c3fbc 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.regex-automata-0.4.9.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.regex-automata-0.4.9.bazel
@@ -76,12 +76,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -93,13 +95,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -107,6 +120,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.8.5.bazel b/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.8.5.bazel
index 59c590873031..0ea7871f674b 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.8.5.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.8.5.bazel
@@ -64,12 +64,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -81,13 +83,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -95,6 +108,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.19.bazel b/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.19.bazel
index 275c416bec69..f756ea90397e 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.19.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.19.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.217.bazel b/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.217.bazel
index 04b9339ef8e8..33cdcbef5b9f 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.217.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.217.bazel
@@ -60,12 +60,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -77,13 +79,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -91,6 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -103,7 +117,7 @@ rust_library(
     }),
     version = "1.0.217",
     deps = [
-        "@vendor_py__serde-1.0.217//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -113,6 +127,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -145,6 +162,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    emit_warnings = False,
     pkg_name = "serde",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.serde_derive-1.0.217.bazel b/misc/bazel/3rdparty/py_deps/BUILD.serde_derive-1.0.217.bazel
index 3836976f89e6..0f6df23c96d8 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.serde_derive-1.0.217.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.serde_derive-1.0.217.bazel
@@ -52,12 +52,14 @@ rust_proc_macro(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_proc_macro(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.138.bazel b/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.138.bazel
index c36081cf1331..65b784a58ad5 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.138.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.138.bazel
@@ -60,12 +60,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -77,13 +79,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -91,6 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -103,11 +117,11 @@ rust_library(
     }),
     version = "1.0.138",
     deps = [
+        ":build_script_build",
         "@vendor_py__itoa-1.0.14//:itoa",
         "@vendor_py__memchr-2.7.4//:memchr",
         "@vendor_py__ryu-1.0.19//:ryu",
         "@vendor_py__serde-1.0.217//:serde",
-        "@vendor_py__serde_json-1.0.138//:build_script_build",
     ],
 )
 
@@ -117,6 +131,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -149,6 +166,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "serde_json",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.shlex-1.3.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.shlex-1.3.0.bazel
index 8de318e16ce3..a90a6e7bd1aa 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.shlex-1.3.0.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.shlex-1.3.0.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.14.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.14.0.bazel
index afc560f32d27..23c92f59d61d 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.14.0.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.14.0.bazel
@@ -55,12 +55,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -72,13 +74,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -86,6 +99,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.streaming-iterator-0.1.9.bazel b/misc/bazel/3rdparty/py_deps/BUILD.streaming-iterator-0.1.9.bazel
index 1fb4f82d40ba..41789510f89f 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.streaming-iterator-0.1.9.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.streaming-iterator-0.1.9.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.11.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.11.1.bazel
index a350fe401c64..6e9f2bcc7888 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.11.1.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.11.1.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.syn-2.0.98.bazel b/misc/bazel/3rdparty/py_deps/BUILD.syn-2.0.98.bazel
index 756de2c409a7..9e5abb1b354b 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.syn-2.0.98.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.syn-2.0.98.bazel
@@ -60,12 +60,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -77,13 +79,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -91,6 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.69.bazel b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.69.bazel
index 4c5de7875052..9580296b4be6 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.69.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.69.bazel
@@ -59,12 +59,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -76,13 +78,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -90,6 +103,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -102,7 +116,7 @@ rust_library(
     }),
     version = "1.0.69",
     deps = [
-        "@vendor_py__thiserror-1.0.69//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -112,6 +126,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -140,6 +157,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "thiserror",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.69.bazel b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.69.bazel
index f2b15bc166fd..180c8002ff85 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.69.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.69.bazel
@@ -52,12 +52,14 @@ rust_proc_macro(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_proc_macro(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.24.7.bazel b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.24.7.bazel
index 475770bc9575..e42c064f9a96 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.24.7.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.24.7.bazel
@@ -60,12 +60,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -77,13 +79,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -91,6 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -103,10 +117,10 @@ rust_library(
     }),
     version = "0.24.7",
     deps = [
+        ":build_script_build",
         "@vendor_py__regex-1.11.1//:regex",
         "@vendor_py__regex-syntax-0.8.5//:regex_syntax",
         "@vendor_py__streaming-iterator-0.1.9//:streaming_iterator",
-        "@vendor_py__tree-sitter-0.24.7//:build_script_build",
         "@vendor_py__tree-sitter-language-0.1.5//:tree_sitter_language",
     ],
 )
@@ -117,6 +131,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -149,6 +166,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     links = "tree-sitter",
     pkg_name = "tree-sitter",
     rustc_env_files = [
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.12.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.12.0.bazel
index 3a5a51895a64..a723d4b76a4c 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.12.0.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.12.0.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-language-0.1.5.bazel b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-language-0.1.5.bazel
index e35100f228a8..598297b63abf 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-language-0.1.5.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-language-0.1.5.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.unicode-ident-1.0.16.bazel b/misc/bazel/3rdparty/py_deps/BUILD.unicode-ident-1.0.16.bazel
index 9754167cc21f..ae11f61dee30 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.unicode-ident-1.0.16.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.unicode-ident-1.0.16.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.utf8parse-0.2.2.bazel b/misc/bazel/3rdparty/py_deps/BUILD.utf8parse-0.2.2.bazel
index 813c2349a879..0add161c5aa8 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.utf8parse-0.2.2.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.utf8parse-0.2.2.bazel
@@ -55,12 +55,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -72,13 +74,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -86,6 +99,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows-sys-0.59.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows-sys-0.59.0.bazel
index 1c3cf791f0f4..c6c654a891d8 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows-sys-0.59.0.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows-sys-0.59.0.bazel
@@ -59,12 +59,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -76,13 +78,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -90,6 +103,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows-targets-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows-targets-0.52.6.bazel
index eab2d9200442..709038f51c06 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows-targets-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows-targets-0.52.6.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
index 413560f9a9a4..a71850308dc4 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,7 +113,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor_py__windows_aarch64_gnullvm-0.52.6//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -109,6 +123,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -137,6 +154,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "windows_aarch64_gnullvm",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
index 41270f37827d..6a599b3f4d9c 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,7 +113,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor_py__windows_aarch64_msvc-0.52.6//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -109,6 +123,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -137,6 +154,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "windows_aarch64_msvc",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnu-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnu-0.52.6.bazel
index 635e04fb829f..3a5460fff15f 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnu-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnu-0.52.6.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,7 +113,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor_py__windows_i686_gnu-0.52.6//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -109,6 +123,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -137,6 +154,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "windows_i686_gnu",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
index aa701fa5f9e1..09ff7272136f 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,7 +113,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor_py__windows_i686_gnullvm-0.52.6//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -109,6 +123,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -137,6 +154,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "windows_i686_gnullvm",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_msvc-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_msvc-0.52.6.bazel
index 51a7afa148f3..3d04941b0bbb 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_msvc-0.52.6.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,7 +113,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor_py__windows_i686_msvc-0.52.6//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -109,6 +123,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -137,6 +154,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "windows_i686_msvc",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
index 95bb840fe66c..361ecbd90202 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,7 +113,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor_py__windows_x86_64_gnu-0.52.6//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -109,6 +123,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -137,6 +154,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "windows_x86_64_gnu",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
index e7cc05336f3f..b862c99fe5ef 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,7 +113,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor_py__windows_x86_64_gnullvm-0.52.6//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -109,6 +123,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -137,6 +154,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "windows_x86_64_gnullvm",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
index dd7abf4671c5..adbd306abe2a 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,7 +113,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor_py__windows_x86_64_msvc-0.52.6//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -109,6 +123,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -137,6 +154,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "windows_x86_64_msvc",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/py_deps/anyhow-1.0.95/BUILD.bazel b/misc/bazel/3rdparty/py_deps/anyhow-1.0.95/BUILD.bazel
new file mode 100644
index 000000000000..37bc215de0df
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/anyhow-1.0.95/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "anyhow-1.0.95",
+    actual = "@vendor_py__anyhow-1.0.95//:anyhow",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/anyhow/BUILD.bazel b/misc/bazel/3rdparty/py_deps/anyhow/BUILD.bazel
new file mode 100644
index 000000000000..d9ce76974ca2
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/anyhow/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "anyhow",
+    actual = "@vendor_py__anyhow-1.0.95//:anyhow",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/cc-1.2.14/BUILD.bazel b/misc/bazel/3rdparty/py_deps/cc-1.2.14/BUILD.bazel
new file mode 100644
index 000000000000..a16530a5d741
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/cc-1.2.14/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "cc-1.2.14",
+    actual = "@vendor_py__cc-1.2.14//:cc",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/cc/BUILD.bazel b/misc/bazel/3rdparty/py_deps/cc/BUILD.bazel
new file mode 100644
index 000000000000..d8c3fb6ea8d0
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/cc/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "cc",
+    actual = "@vendor_py__cc-1.2.14//:cc",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/clap-4.5.30/BUILD.bazel b/misc/bazel/3rdparty/py_deps/clap-4.5.30/BUILD.bazel
new file mode 100644
index 000000000000..8ebf45139946
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/clap-4.5.30/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "clap-4.5.30",
+    actual = "@vendor_py__clap-4.5.30//:clap",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/clap/BUILD.bazel b/misc/bazel/3rdparty/py_deps/clap/BUILD.bazel
new file mode 100644
index 000000000000..ee7c930d1645
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/clap/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "clap",
+    actual = "@vendor_py__clap-4.5.30//:clap",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/crates.bzl b/misc/bazel/3rdparty/py_deps/crates.bzl
index 3979d0073368..ac9849d0407b 100644
--- a/misc/bazel/3rdparty/py_deps/crates.bzl
+++ b/misc/bazel/3rdparty/py_deps/crates.bzl
@@ -1,21 +1,498 @@
 ###############################################################################
 # @generated
-# This file is auto-generated by the cargo-bazel tool.
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
 #
-# DO NOT MODIFY: Local changes may be replaced in future executions.
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
 ###############################################################################
-"""Rules for defining repositories for remote `crates_vendor` repositories"""
+"""
+# `crates_repository` API
 
+- [aliases](#aliases)
+- [crate_edition](#crate_edition)
+- [crate_deps](#crate_deps)
+- [all_crate_deps](#all_crate_deps)
+- [crate_repositories](#crate_repositories)
+
+"""
+
+load("@bazel_skylib//lib:selects.bzl", "selects")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+load("@rules_rust//crate_universe:defs.bzl", "crates_vendor_remote_repository")
+
+###############################################################################
+# MACROS API
+###############################################################################
+
+# An identifier that represent common dependencies (unconditional).
+_COMMON_CONDITION = ""
+
+def _flatten_dependency_maps(all_dependency_maps):
+    """Flatten a list of dependency maps into one dictionary.
+
+    Dependency maps have the following structure:
+
+    ```python
+    DEPENDENCIES_MAP = {
+        # The first key in the map is a Bazel package
+        # name of the workspace this file is defined in.
+        "workspace_member_package": {
+
+            # Not all dependencies are supported for all platforms.
+            # the condition key is the condition required to be true
+            # on the host platform.
+            "condition": {
+
+                # An alias to a crate target.     # The label of the crate target the
+                # Aliases are only crate names.   # package name refers to.
+                "package_name":                   "@full//:label",
+            }
+        }
+    }
+    ```
+
+    Args:
+        all_dependency_maps (list): A list of dicts as described above
+
+    Returns:
+        dict: A dictionary as described above
+    """
+    dependencies = {}
+
+    for workspace_deps_map in all_dependency_maps:
+        for pkg_name, conditional_deps_map in workspace_deps_map.items():
+            if pkg_name not in dependencies:
+                non_frozen_map = dict()
+                for key, values in conditional_deps_map.items():
+                    non_frozen_map.update({key: dict(values.items())})
+                dependencies.setdefault(pkg_name, non_frozen_map)
+                continue
+
+            for condition, deps_map in conditional_deps_map.items():
+                # If the condition has not been recorded, do so and continue
+                if condition not in dependencies[pkg_name]:
+                    dependencies[pkg_name].setdefault(condition, dict(deps_map.items()))
+                    continue
+
+                # Alert on any miss-matched dependencies
+                inconsistent_entries = []
+                for crate_name, crate_label in deps_map.items():
+                    existing = dependencies[pkg_name][condition].get(crate_name)
+                    if existing and existing != crate_label:
+                        inconsistent_entries.append((crate_name, existing, crate_label))
+                    dependencies[pkg_name][condition].update({crate_name: crate_label})
+
+    return dependencies
+
+def crate_deps(deps, package_name = None):
+    """Finds the fully qualified label of the requested crates for the package where this macro is called.
+
+    Args:
+        deps (list): The desired list of crate targets.
+        package_name (str, optional): The package name of the set of dependencies to look up.
+            Defaults to `native.package_name()`.
+
+    Returns:
+        list: A list of labels to generated rust targets (str)
+    """
+
+    if not deps:
+        return []
+
+    if package_name == None:
+        package_name = native.package_name()
+
+    # Join both sets of dependencies
+    dependencies = _flatten_dependency_maps([
+        _NORMAL_DEPENDENCIES,
+        _NORMAL_DEV_DEPENDENCIES,
+        _PROC_MACRO_DEPENDENCIES,
+        _PROC_MACRO_DEV_DEPENDENCIES,
+        _BUILD_DEPENDENCIES,
+        _BUILD_PROC_MACRO_DEPENDENCIES,
+    ]).pop(package_name, {})
+
+    # Combine all conditional packages so we can easily index over a flat list
+    # TODO: Perhaps this should actually return select statements and maintain
+    # the conditionals of the dependencies
+    flat_deps = {}
+    for deps_set in dependencies.values():
+        for crate_name, crate_label in deps_set.items():
+            flat_deps.update({crate_name: crate_label})
+
+    missing_crates = []
+    crate_targets = []
+    for crate_target in deps:
+        if crate_target not in flat_deps:
+            missing_crates.append(crate_target)
+        else:
+            crate_targets.append(flat_deps[crate_target])
+
+    if missing_crates:
+        fail("Could not find crates `{}` among dependencies of `{}`. Available dependencies were `{}`".format(
+            missing_crates,
+            package_name,
+            dependencies,
+        ))
+
+    return crate_targets
+
+def crate_edition(package_name = None):
+    """Finds the Rust edition for the package where this macro is called.
+
+    Args:
+        package_name (str, optional): The package name whose edition should be
+            looked up. Defaults to `native.package_name()` when unset.
+
+    Returns:
+        str: The Rust edition declared by the package's Cargo.toml file.
+    """
+    if package_name == None:
+        package_name = native.package_name()
+
+    if package_name not in _CRATE_EDITIONS:
+        fail("Tried to get crate_edition for package " + package_name + " but that package had no Cargo.toml file")
+
+    return _CRATE_EDITIONS[package_name]
+
+def all_crate_deps(
+        normal = False,
+        normal_dev = False,
+        proc_macro = False,
+        proc_macro_dev = False,
+        build = False,
+        build_proc_macro = False,
+        package_name = None):
+    """Finds the fully qualified label of all requested direct crate dependencies \
+    for the package where this macro is called.
+
+    If no parameters are set, all normal dependencies are returned. Setting any one flag will
+    otherwise impact the contents of the returned list.
+
+    Args:
+        normal (bool, optional): If True, normal dependencies are included in the
+            output list.
+        normal_dev (bool, optional): If True, normal dev dependencies will be
+            included in the output list.
+        proc_macro (bool, optional): If True, proc_macro dependencies are included
+            in the output list.
+        proc_macro_dev (bool, optional): If True, dev proc_macro dependencies are
+            included in the output list.
+        build (bool, optional): If True, build dependencies are included
+            in the output list.
+        build_proc_macro (bool, optional): If True, build proc_macro dependencies are
+            included in the output list.
+        package_name (str, optional): The package name of the set of dependencies to look up.
+            Defaults to `native.package_name()` when unset.
+
+    Returns:
+        list: A list of labels to generated rust targets (str)
+    """
+
+    if package_name == None:
+        package_name = native.package_name()
+
+    # Determine the relevant maps to use
+    all_dependency_maps = []
+    if normal:
+        all_dependency_maps.append(_NORMAL_DEPENDENCIES)
+    if normal_dev:
+        all_dependency_maps.append(_NORMAL_DEV_DEPENDENCIES)
+    if proc_macro:
+        all_dependency_maps.append(_PROC_MACRO_DEPENDENCIES)
+    if proc_macro_dev:
+        all_dependency_maps.append(_PROC_MACRO_DEV_DEPENDENCIES)
+    if build:
+        all_dependency_maps.append(_BUILD_DEPENDENCIES)
+    if build_proc_macro:
+        all_dependency_maps.append(_BUILD_PROC_MACRO_DEPENDENCIES)
+
+    # Default to always using normal dependencies
+    if not all_dependency_maps:
+        all_dependency_maps.append(_NORMAL_DEPENDENCIES)
+
+    dependencies = _flatten_dependency_maps(all_dependency_maps).pop(package_name, None)
+
+    if not dependencies:
+        if dependencies == None:
+            fail("Tried to get all_crate_deps for package " + package_name + " but that package had no Cargo.toml file")
+        else:
+            return []
+
+    crate_deps = list(dependencies.pop(_COMMON_CONDITION, {}).values())
+    for condition, deps in dependencies.items():
+        crate_deps += selects.with_or({
+            tuple(_CONDITIONS[condition]): deps.values(),
+            "//conditions:default": [],
+        })
+
+    return crate_deps
+
+def aliases(
+        normal = False,
+        normal_dev = False,
+        proc_macro = False,
+        proc_macro_dev = False,
+        build = False,
+        build_proc_macro = False,
+        package_name = None):
+    """Produces a map of Crate alias names to their original label
+
+    If no dependency kinds are specified, `normal` and `proc_macro` are used by default.
+    Setting any one flag will otherwise determine the contents of the returned dict.
+
+    Args:
+        normal (bool, optional): If True, normal dependencies are included in the
+            output list.
+        normal_dev (bool, optional): If True, normal dev dependencies will be
+            included in the output list..
+        proc_macro (bool, optional): If True, proc_macro dependencies are included
+            in the output list.
+        proc_macro_dev (bool, optional): If True, dev proc_macro dependencies are
+            included in the output list.
+        build (bool, optional): If True, build dependencies are included
+            in the output list.
+        build_proc_macro (bool, optional): If True, build proc_macro dependencies are
+            included in the output list.
+        package_name (str, optional): The package name of the set of dependencies to look up.
+            Defaults to `native.package_name()` when unset.
+
+    Returns:
+        dict: The aliases of all associated packages
+    """
+    if package_name == None:
+        package_name = native.package_name()
 
-# buildifier: disable=bzl-visibility
-load("@rules_rust//crate_universe/private:crates_vendor.bzl", "crates_vendor_remote_repository")
+    # Determine the relevant maps to use
+    all_aliases_maps = []
+    if normal:
+        all_aliases_maps.append(_NORMAL_ALIASES)
+    if normal_dev:
+        all_aliases_maps.append(_NORMAL_DEV_ALIASES)
+    if proc_macro:
+        all_aliases_maps.append(_PROC_MACRO_ALIASES)
+    if proc_macro_dev:
+        all_aliases_maps.append(_PROC_MACRO_DEV_ALIASES)
+    if build:
+        all_aliases_maps.append(_BUILD_ALIASES)
+    if build_proc_macro:
+        all_aliases_maps.append(_BUILD_PROC_MACRO_ALIASES)
 
-# buildifier: disable=bzl-visibility
-load("//misc/bazel/3rdparty/py_deps:defs.bzl", _crate_repositories = "crate_repositories")
+    # Default to always using normal aliases
+    if not all_aliases_maps:
+        all_aliases_maps.append(_NORMAL_ALIASES)
+        all_aliases_maps.append(_PROC_MACRO_ALIASES)
+
+    aliases = _flatten_dependency_maps(all_aliases_maps).pop(package_name, None)
+
+    if not aliases:
+        return dict()
+
+    common_items = aliases.pop(_COMMON_CONDITION, {}).items()
+
+    # If there are only common items in the dictionary, immediately return them
+    if not len(aliases.keys()) == 1:
+        return dict(common_items)
+
+    # Build a single select statement where each conditional has accounted for the
+    # common set of aliases.
+    crate_aliases = {"//conditions:default": dict(common_items)}
+    for condition, deps in aliases.items():
+        condition_triples = _CONDITIONS[condition]
+        for triple in condition_triples:
+            if triple in crate_aliases:
+                crate_aliases[triple].update(deps)
+            else:
+                crate_aliases.update({triple: dict(deps.items() + common_items)})
+
+    return select(crate_aliases)
+
+###############################################################################
+# WORKSPACE MEMBER DEPS, ALIASES, AND EDITIONS
+###############################################################################
+
+_CRATE_EDITIONS = {
+    "python/extractor/tsg-python": "2024",
+    "python/extractor/tsg-python/tsp": "2024",
+}
+
+_NORMAL_DEPENDENCIES = {
+    "python/extractor/tsg-python": {
+        _COMMON_CONDITION: {
+            "anyhow": Label("@vendor_py//anyhow-1.0.95"),
+            "clap": Label("@vendor_py//clap-4.5.30"),
+            "regex": Label("@vendor_py//regex-1.11.1"),
+            "serde_json": Label("@vendor_py//serde_json-1.0.138"),
+            "tree-sitter": Label("@vendor_py//tree-sitter-0.24.7"),
+            "tree-sitter-graph": Label("@vendor_py//tree-sitter-graph-0.12.0"),
+        },
+    },
+    "python/extractor/tsg-python/tsp": {
+        _COMMON_CONDITION: {
+            "tree-sitter": Label("@vendor_py//tree-sitter-0.24.7"),
+        },
+    },
+}
+
+_NORMAL_ALIASES = {
+    "python/extractor/tsg-python": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "python/extractor/tsg-python/tsp": {
+        _COMMON_CONDITION: {
+        },
+    },
+}
+
+_NORMAL_DEV_DEPENDENCIES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_NORMAL_DEV_ALIASES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_PROC_MACRO_DEPENDENCIES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_PROC_MACRO_ALIASES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_PROC_MACRO_DEV_DEPENDENCIES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_PROC_MACRO_DEV_ALIASES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_BUILD_DEPENDENCIES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+        _COMMON_CONDITION: {
+            "cc": Label("@vendor_py//cc-1.2.14"),
+        },
+    },
+}
+
+_BUILD_ALIASES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+        _COMMON_CONDITION: {
+        },
+    },
+}
+
+_BUILD_PROC_MACRO_DEPENDENCIES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_BUILD_PROC_MACRO_ALIASES = {
+    "python/extractor/tsg-python": {
+    },
+    "python/extractor/tsg-python/tsp": {
+    },
+}
+
+_CONDITIONS = {
+    "aarch64-apple-darwin": ["@rules_rust//rust/platform:aarch64-apple-darwin"],
+    "aarch64-apple-ios": ["@rules_rust//rust/platform:aarch64-apple-ios"],
+    "aarch64-apple-ios-macabi": ["@rules_rust//rust/platform:aarch64-apple-ios-macabi"],
+    "aarch64-apple-ios-sim": ["@rules_rust//rust/platform:aarch64-apple-ios-sim"],
+    "aarch64-linux-android": ["@rules_rust//rust/platform:aarch64-linux-android"],
+    "aarch64-pc-windows-gnullvm": [],
+    "aarch64-pc-windows-msvc": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
+    "aarch64-unknown-fuchsia": ["@rules_rust//rust/platform:aarch64-unknown-fuchsia"],
+    "aarch64-unknown-linux-gnu": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu"],
+    "aarch64-unknown-nixos-gnu": ["@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"],
+    "aarch64-unknown-none": ["@rules_rust//rust/platform:aarch64-unknown-none"],
+    "aarch64-unknown-nto-qnx710": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"],
+    "aarch64-unknown-uefi": ["@rules_rust//rust/platform:aarch64-unknown-uefi"],
+    "arm-unknown-linux-gnueabi": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi"],
+    "arm-unknown-linux-musleabi": ["@rules_rust//rust/platform:arm-unknown-linux-musleabi"],
+    "armv7-linux-androideabi": ["@rules_rust//rust/platform:armv7-linux-androideabi"],
+    "armv7-unknown-linux-gnueabi": ["@rules_rust//rust/platform:armv7-unknown-linux-gnueabi"],
+    "cfg(all(any(target_arch = \"x86_64\", target_arch = \"arm64ec\"), target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "cfg(all(target_arch = \"aarch64\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
+    "cfg(all(target_arch = \"x86\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
+    "cfg(all(target_arch = \"x86\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
+    "cfg(all(target_arch = \"x86_64\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(any())": [],
+    "cfg(windows)": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "i686-apple-darwin": ["@rules_rust//rust/platform:i686-apple-darwin"],
+    "i686-linux-android": ["@rules_rust//rust/platform:i686-linux-android"],
+    "i686-pc-windows-gnullvm": [],
+    "i686-pc-windows-msvc": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
+    "i686-unknown-freebsd": ["@rules_rust//rust/platform:i686-unknown-freebsd"],
+    "i686-unknown-linux-gnu": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
+    "loongarch64-unknown-linux-gnu": ["@rules_rust//rust/platform:loongarch64-unknown-linux-gnu"],
+    "mips-unknown-linux-gnu": ["@rules_rust//rust/platform:mips-unknown-linux-gnu"],
+    "powerpc-unknown-linux-gnu": ["@rules_rust//rust/platform:powerpc-unknown-linux-gnu"],
+    "riscv32imac-unknown-none-elf": ["@rules_rust//rust/platform:riscv32imac-unknown-none-elf"],
+    "riscv32imc-unknown-none-elf": ["@rules_rust//rust/platform:riscv32imc-unknown-none-elf"],
+    "riscv64gc-unknown-fuchsia": ["@rules_rust//rust/platform:riscv64gc-unknown-fuchsia"],
+    "riscv64gc-unknown-linux-gnu": ["@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu"],
+    "riscv64gc-unknown-none-elf": ["@rules_rust//rust/platform:riscv64gc-unknown-none-elf"],
+    "s390x-unknown-linux-gnu": ["@rules_rust//rust/platform:s390x-unknown-linux-gnu"],
+    "sparc64-unknown-linux-gnu": ["@rules_rust//rust/platform:sparc64-unknown-linux-gnu"],
+    "sparc64-unknown-netbsd": ["@rules_rust//rust/platform:sparc64-unknown-netbsd"],
+    "sparc64-unknown-openbsd": ["@rules_rust//rust/platform:sparc64-unknown-openbsd"],
+    "thumbv6m-none-eabi": ["@rules_rust//rust/platform:thumbv6m-none-eabi"],
+    "thumbv7em-none-eabi": ["@rules_rust//rust/platform:thumbv7em-none-eabi"],
+    "thumbv7em-none-eabihf": ["@rules_rust//rust/platform:thumbv7em-none-eabihf"],
+    "thumbv7m-none-eabi": ["@rules_rust//rust/platform:thumbv7m-none-eabi"],
+    "thumbv8m.main-none-eabi": ["@rules_rust//rust/platform:thumbv8m.main-none-eabi"],
+    "thumbv8m.main-none-eabihf": ["@rules_rust//rust/platform:thumbv8m.main-none-eabihf"],
+    "wasm32-unknown-emscripten": ["@rules_rust//rust/platform:wasm32-unknown-emscripten"],
+    "wasm32-unknown-unknown": ["@rules_rust//rust/platform:wasm32-unknown-unknown"],
+    "wasm32-wasip1": ["@rules_rust//rust/platform:wasm32-wasip1"],
+    "wasm32-wasip1-threads": ["@rules_rust//rust/platform:wasm32-wasip1-threads"],
+    "wasm32-wasip2": ["@rules_rust//rust/platform:wasm32-wasip2"],
+    "x86_64-apple-darwin": ["@rules_rust//rust/platform:x86_64-apple-darwin"],
+    "x86_64-apple-ios": ["@rules_rust//rust/platform:x86_64-apple-ios"],
+    "x86_64-apple-ios-macabi": ["@rules_rust//rust/platform:x86_64-apple-ios-macabi"],
+    "x86_64-linux-android": ["@rules_rust//rust/platform:x86_64-linux-android"],
+    "x86_64-pc-windows-gnullvm": [],
+    "x86_64-pc-windows-msvc": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "x86_64-unknown-freebsd": ["@rules_rust//rust/platform:x86_64-unknown-freebsd"],
+    "x86_64-unknown-fuchsia": ["@rules_rust//rust/platform:x86_64-unknown-fuchsia"],
+    "x86_64-unknown-linux-gnu": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu"],
+    "x86_64-unknown-nixos-gnu": ["@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "x86_64-unknown-none": ["@rules_rust//rust/platform:x86_64-unknown-none"],
+    "x86_64-unknown-uefi": ["@rules_rust//rust/platform:x86_64-unknown-uefi"],
+}
+
+###############################################################################
 
 def crate_repositories():
-    """Generates repositories for vendored crates.
+    """A macro for defining repositories for all generated crates.
 
     Returns:
       A list of repos visible to the module through the module extension.
@@ -23,10 +500,497 @@ def crate_repositories():
     maybe(
         crates_vendor_remote_repository,
         name = "vendor_py",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.bazel"),
-        defs_module = Label("//misc/bazel/3rdparty/py_deps:defs.bzl"),
+        # Lean interface: just point at `crates.bzl`; the repo rule
+        # derives the sibling `BUILD.bazel` and `defs.bzl`.
+        crates_module = Label("//misc/bazel/3rdparty/py_deps:crates.bzl"),
+    )
+    maybe(
+        http_archive,
+        name = "vendor_py__aho-corasick-1.1.3",
+        sha256 = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/aho-corasick/1.1.3/download"],
+        strip_prefix = "aho-corasick-1.1.3",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.aho-corasick-1.1.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__anstream-0.6.18",
+        sha256 = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstream/0.6.18/download"],
+        strip_prefix = "anstream-0.6.18",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.anstream-0.6.18.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__anstyle-1.0.10",
+        sha256 = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstyle/1.0.10/download"],
+        strip_prefix = "anstyle-1.0.10",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.anstyle-1.0.10.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__anstyle-parse-0.2.6",
+        sha256 = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstyle-parse/0.2.6/download"],
+        strip_prefix = "anstyle-parse-0.2.6",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.anstyle-parse-0.2.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__anstyle-query-1.1.2",
+        sha256 = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstyle-query/1.1.2/download"],
+        strip_prefix = "anstyle-query-1.1.2",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.anstyle-query-1.1.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__anstyle-wincon-3.0.7",
+        sha256 = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstyle-wincon/3.0.7/download"],
+        strip_prefix = "anstyle-wincon-3.0.7",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.anstyle-wincon-3.0.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__anyhow-1.0.95",
+        sha256 = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anyhow/1.0.95/download"],
+        strip_prefix = "anyhow-1.0.95",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.anyhow-1.0.95.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__cc-1.2.14",
+        sha256 = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cc/1.2.14/download"],
+        strip_prefix = "cc-1.2.14",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.cc-1.2.14.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__clap-4.5.30",
+        sha256 = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/clap/4.5.30/download"],
+        strip_prefix = "clap-4.5.30",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap-4.5.30.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__clap_builder-4.5.30",
+        sha256 = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/clap_builder/4.5.30/download"],
+        strip_prefix = "clap_builder-4.5.30",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap_builder-4.5.30.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__clap_lex-0.7.4",
+        sha256 = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/clap_lex/0.7.4/download"],
+        strip_prefix = "clap_lex-0.7.4",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap_lex-0.7.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__colorchoice-1.0.3",
+        sha256 = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/colorchoice/1.0.3/download"],
+        strip_prefix = "colorchoice-1.0.3",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.colorchoice-1.0.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__is_terminal_polyfill-1.70.1",
+        sha256 = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/is_terminal_polyfill/1.70.1/download"],
+        strip_prefix = "is_terminal_polyfill-1.70.1",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.is_terminal_polyfill-1.70.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__itoa-1.0.14",
+        sha256 = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/itoa/1.0.14/download"],
+        strip_prefix = "itoa-1.0.14",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.itoa-1.0.14.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__log-0.4.25",
+        sha256 = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/log/0.4.25/download"],
+        strip_prefix = "log-0.4.25",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.log-0.4.25.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__memchr-2.7.4",
+        sha256 = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/memchr/2.7.4/download"],
+        strip_prefix = "memchr-2.7.4",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.memchr-2.7.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__once_cell-1.20.3",
+        sha256 = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/once_cell/1.20.3/download"],
+        strip_prefix = "once_cell-1.20.3",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.once_cell-1.20.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__proc-macro2-1.0.93",
+        sha256 = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/proc-macro2/1.0.93/download"],
+        strip_prefix = "proc-macro2-1.0.93",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.proc-macro2-1.0.93.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__quote-1.0.38",
+        sha256 = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/quote/1.0.38/download"],
+        strip_prefix = "quote-1.0.38",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.quote-1.0.38.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__regex-1.11.1",
+        sha256 = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/regex/1.11.1/download"],
+        strip_prefix = "regex-1.11.1",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.regex-1.11.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__regex-automata-0.4.9",
+        sha256 = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/regex-automata/0.4.9/download"],
+        strip_prefix = "regex-automata-0.4.9",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.regex-automata-0.4.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__regex-syntax-0.8.5",
+        sha256 = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/regex-syntax/0.8.5/download"],
+        strip_prefix = "regex-syntax-0.8.5",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.regex-syntax-0.8.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__ryu-1.0.19",
+        sha256 = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ryu/1.0.19/download"],
+        strip_prefix = "ryu-1.0.19",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.ryu-1.0.19.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__serde-1.0.217",
+        sha256 = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde/1.0.217/download"],
+        strip_prefix = "serde-1.0.217",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.serde-1.0.217.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__serde_derive-1.0.217",
+        sha256 = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_derive/1.0.217/download"],
+        strip_prefix = "serde_derive-1.0.217",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.serde_derive-1.0.217.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__serde_json-1.0.138",
+        sha256 = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_json/1.0.138/download"],
+        strip_prefix = "serde_json-1.0.138",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.serde_json-1.0.138.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__shlex-1.3.0",
+        sha256 = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/shlex/1.3.0/download"],
+        strip_prefix = "shlex-1.3.0",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.shlex-1.3.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__smallvec-1.14.0",
+        sha256 = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/smallvec/1.14.0/download"],
+        strip_prefix = "smallvec-1.14.0",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.smallvec-1.14.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__streaming-iterator-0.1.9",
+        sha256 = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/streaming-iterator/0.1.9/download"],
+        strip_prefix = "streaming-iterator-0.1.9",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.streaming-iterator-0.1.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__strsim-0.11.1",
+        sha256 = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/strsim/0.11.1/download"],
+        strip_prefix = "strsim-0.11.1",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.strsim-0.11.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__syn-2.0.98",
+        sha256 = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/syn/2.0.98/download"],
+        strip_prefix = "syn-2.0.98",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.syn-2.0.98.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__thiserror-1.0.69",
+        sha256 = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/thiserror/1.0.69/download"],
+        strip_prefix = "thiserror-1.0.69",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.thiserror-1.0.69.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__thiserror-impl-1.0.69",
+        sha256 = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/thiserror-impl/1.0.69/download"],
+        strip_prefix = "thiserror-impl-1.0.69",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.thiserror-impl-1.0.69.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__tree-sitter-0.24.7",
+        sha256 = "a5387dffa7ffc7d2dae12b50c6f7aab8ff79d6210147c6613561fc3d474c6f75",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter/0.24.7/download"],
+        strip_prefix = "tree-sitter-0.24.7",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-0.24.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__tree-sitter-graph-0.12.0",
+        sha256 = "63f86eb73c7d891c4b9b6fe4d4e63dd94c506e4788af7c2296afdcfbeea626cc",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-graph/0.12.0/download"],
+        strip_prefix = "tree-sitter-graph-0.12.0",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-graph-0.12.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__tree-sitter-language-0.1.5",
+        sha256 = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-language/0.1.5/download"],
+        strip_prefix = "tree-sitter-language-0.1.5",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-language-0.1.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__unicode-ident-1.0.16",
+        sha256 = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/unicode-ident/1.0.16/download"],
+        strip_prefix = "unicode-ident-1.0.16",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.unicode-ident-1.0.16.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__utf8parse-0.2.2",
+        sha256 = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/utf8parse/0.2.2/download"],
+        strip_prefix = "utf8parse-0.2.2",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.utf8parse-0.2.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__windows-sys-0.59.0",
+        sha256 = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-sys/0.59.0/download"],
+        strip_prefix = "windows-sys-0.59.0",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows-sys-0.59.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__windows-targets-0.52.6",
+        sha256 = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-targets/0.52.6/download"],
+        strip_prefix = "windows-targets-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows-targets-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__windows_aarch64_gnullvm-0.52.6",
+        sha256 = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_aarch64_gnullvm/0.52.6/download"],
+        strip_prefix = "windows_aarch64_gnullvm-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_aarch64_gnullvm-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__windows_aarch64_msvc-0.52.6",
+        sha256 = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_aarch64_msvc/0.52.6/download"],
+        strip_prefix = "windows_aarch64_msvc-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_aarch64_msvc-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__windows_i686_gnu-0.52.6",
+        sha256 = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_i686_gnu/0.52.6/download"],
+        strip_prefix = "windows_i686_gnu-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_i686_gnu-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__windows_i686_gnullvm-0.52.6",
+        sha256 = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_i686_gnullvm/0.52.6/download"],
+        strip_prefix = "windows_i686_gnullvm-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_i686_gnullvm-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__windows_i686_msvc-0.52.6",
+        sha256 = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_i686_msvc/0.52.6/download"],
+        strip_prefix = "windows_i686_msvc-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_i686_msvc-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__windows_x86_64_gnu-0.52.6",
+        sha256 = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_x86_64_gnu/0.52.6/download"],
+        strip_prefix = "windows_x86_64_gnu-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_x86_64_gnu-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__windows_x86_64_gnullvm-0.52.6",
+        sha256 = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_x86_64_gnullvm/0.52.6/download"],
+        strip_prefix = "windows_x86_64_gnullvm-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_x86_64_gnullvm-0.52.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__windows_x86_64_msvc-0.52.6",
+        sha256 = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_x86_64_msvc/0.52.6/download"],
+        strip_prefix = "windows_x86_64_msvc-0.52.6",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_x86_64_msvc-0.52.6.bazel"),
     )
 
-    direct_deps = [struct(repo = "vendor_py", is_dev_dep = False)]
-    direct_deps.extend(_crate_repositories())
-    return direct_deps
+    return [
+        struct(repo = "vendor_py", is_dev_dep = False),
+        struct(repo = "vendor_py__anyhow-1.0.95", is_dev_dep = False),
+        struct(repo = "vendor_py__cc-1.2.14", is_dev_dep = False),
+        struct(repo = "vendor_py__clap-4.5.30", is_dev_dep = False),
+        struct(repo = "vendor_py__regex-1.11.1", is_dev_dep = False),
+        struct(repo = "vendor_py__serde_json-1.0.138", is_dev_dep = False),
+        struct(repo = "vendor_py__tree-sitter-0.24.7", is_dev_dep = False),
+        struct(repo = "vendor_py__tree-sitter-graph-0.12.0", is_dev_dep = False),
+    ]
diff --git a/misc/bazel/3rdparty/py_deps/defs.bzl b/misc/bazel/3rdparty/py_deps/defs.bzl
index 70e6051ac930..0aa81f443fb2 100644
--- a/misc/bazel/3rdparty/py_deps/defs.bzl
+++ b/misc/bazel/3rdparty/py_deps/defs.bzl
@@ -5,943 +5,19 @@
 #
 #     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
 ###############################################################################
-"""
-# `crates_repository` API
-
-- [aliases](#aliases)
-- [crate_deps](#crate_deps)
-- [all_crate_deps](#all_crate_deps)
-- [crate_repositories](#crate_repositories)
-
-"""
-
-load("@bazel_skylib//lib:selects.bzl", "selects")
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-
-###############################################################################
-# MACROS API
-###############################################################################
-
-# An identifier that represent common dependencies (unconditional).
-_COMMON_CONDITION = ""
-
-def _flatten_dependency_maps(all_dependency_maps):
-    """Flatten a list of dependency maps into one dictionary.
-
-    Dependency maps have the following structure:
-
-    ```python
-    DEPENDENCIES_MAP = {
-        # The first key in the map is a Bazel package
-        # name of the workspace this file is defined in.
-        "workspace_member_package": {
-
-            # Not all dependencies are supported for all platforms.
-            # the condition key is the condition required to be true
-            # on the host platform.
-            "condition": {
-
-                # An alias to a crate target.     # The label of the crate target the
-                # Aliases are only crate names.   # package name refers to.
-                "package_name":                   "@full//:label",
-            }
-        }
-    }
-    ```
-
-    Args:
-        all_dependency_maps (list): A list of dicts as described above
-
-    Returns:
-        dict: A dictionary as described above
-    """
-    dependencies = {}
-
-    for workspace_deps_map in all_dependency_maps:
-        for pkg_name, conditional_deps_map in workspace_deps_map.items():
-            if pkg_name not in dependencies:
-                non_frozen_map = dict()
-                for key, values in conditional_deps_map.items():
-                    non_frozen_map.update({key: dict(values.items())})
-                dependencies.setdefault(pkg_name, non_frozen_map)
-                continue
-
-            for condition, deps_map in conditional_deps_map.items():
-                # If the condition has not been recorded, do so and continue
-                if condition not in dependencies[pkg_name]:
-                    dependencies[pkg_name].setdefault(condition, dict(deps_map.items()))
-                    continue
-
-                # Alert on any miss-matched dependencies
-                inconsistent_entries = []
-                for crate_name, crate_label in deps_map.items():
-                    existing = dependencies[pkg_name][condition].get(crate_name)
-                    if existing and existing != crate_label:
-                        inconsistent_entries.append((crate_name, existing, crate_label))
-                    dependencies[pkg_name][condition].update({crate_name: crate_label})
-
-    return dependencies
-
-def crate_deps(deps, package_name = None):
-    """Finds the fully qualified label of the requested crates for the package where this macro is called.
-
-    Args:
-        deps (list): The desired list of crate targets.
-        package_name (str, optional): The package name of the set of dependencies to look up.
-            Defaults to `native.package_name()`.
-
-    Returns:
-        list: A list of labels to generated rust targets (str)
-    """
-
-    if not deps:
-        return []
-
-    if package_name == None:
-        package_name = native.package_name()
-
-    # Join both sets of dependencies
-    dependencies = _flatten_dependency_maps([
-        _NORMAL_DEPENDENCIES,
-        _NORMAL_DEV_DEPENDENCIES,
-        _PROC_MACRO_DEPENDENCIES,
-        _PROC_MACRO_DEV_DEPENDENCIES,
-        _BUILD_DEPENDENCIES,
-        _BUILD_PROC_MACRO_DEPENDENCIES,
-    ]).pop(package_name, {})
-
-    # Combine all conditional packages so we can easily index over a flat list
-    # TODO: Perhaps this should actually return select statements and maintain
-    # the conditionals of the dependencies
-    flat_deps = {}
-    for deps_set in dependencies.values():
-        for crate_name, crate_label in deps_set.items():
-            flat_deps.update({crate_name: crate_label})
-
-    missing_crates = []
-    crate_targets = []
-    for crate_target in deps:
-        if crate_target not in flat_deps:
-            missing_crates.append(crate_target)
-        else:
-            crate_targets.append(flat_deps[crate_target])
-
-    if missing_crates:
-        fail("Could not find crates `{}` among dependencies of `{}`. Available dependencies were `{}`".format(
-            missing_crates,
-            package_name,
-            dependencies,
-        ))
-
-    return crate_targets
-
-def all_crate_deps(
-        normal = False,
-        normal_dev = False,
-        proc_macro = False,
-        proc_macro_dev = False,
-        build = False,
-        build_proc_macro = False,
-        package_name = None):
-    """Finds the fully qualified label of all requested direct crate dependencies \
-    for the package where this macro is called.
-
-    If no parameters are set, all normal dependencies are returned. Setting any one flag will
-    otherwise impact the contents of the returned list.
-
-    Args:
-        normal (bool, optional): If True, normal dependencies are included in the
-            output list.
-        normal_dev (bool, optional): If True, normal dev dependencies will be
-            included in the output list.
-        proc_macro (bool, optional): If True, proc_macro dependencies are included
-            in the output list.
-        proc_macro_dev (bool, optional): If True, dev proc_macro dependencies are
-            included in the output list.
-        build (bool, optional): If True, build dependencies are included
-            in the output list.
-        build_proc_macro (bool, optional): If True, build proc_macro dependencies are
-            included in the output list.
-        package_name (str, optional): The package name of the set of dependencies to look up.
-            Defaults to `native.package_name()` when unset.
-
-    Returns:
-        list: A list of labels to generated rust targets (str)
-    """
-
-    if package_name == None:
-        package_name = native.package_name()
-
-    # Determine the relevant maps to use
-    all_dependency_maps = []
-    if normal:
-        all_dependency_maps.append(_NORMAL_DEPENDENCIES)
-    if normal_dev:
-        all_dependency_maps.append(_NORMAL_DEV_DEPENDENCIES)
-    if proc_macro:
-        all_dependency_maps.append(_PROC_MACRO_DEPENDENCIES)
-    if proc_macro_dev:
-        all_dependency_maps.append(_PROC_MACRO_DEV_DEPENDENCIES)
-    if build:
-        all_dependency_maps.append(_BUILD_DEPENDENCIES)
-    if build_proc_macro:
-        all_dependency_maps.append(_BUILD_PROC_MACRO_DEPENDENCIES)
-
-    # Default to always using normal dependencies
-    if not all_dependency_maps:
-        all_dependency_maps.append(_NORMAL_DEPENDENCIES)
-
-    dependencies = _flatten_dependency_maps(all_dependency_maps).pop(package_name, None)
-
-    if not dependencies:
-        if dependencies == None:
-            fail("Tried to get all_crate_deps for package " + package_name + " but that package had no Cargo.toml file")
-        else:
-            return []
-
-    crate_deps = list(dependencies.pop(_COMMON_CONDITION, {}).values())
-    for condition, deps in dependencies.items():
-        crate_deps += selects.with_or({
-            tuple(_CONDITIONS[condition]): deps.values(),
-            "//conditions:default": [],
-        })
-
-    return crate_deps
-
-def aliases(
-        normal = False,
-        normal_dev = False,
-        proc_macro = False,
-        proc_macro_dev = False,
-        build = False,
-        build_proc_macro = False,
-        package_name = None):
-    """Produces a map of Crate alias names to their original label
-
-    If no dependency kinds are specified, `normal` and `proc_macro` are used by default.
-    Setting any one flag will otherwise determine the contents of the returned dict.
-
-    Args:
-        normal (bool, optional): If True, normal dependencies are included in the
-            output list.
-        normal_dev (bool, optional): If True, normal dev dependencies will be
-            included in the output list..
-        proc_macro (bool, optional): If True, proc_macro dependencies are included
-            in the output list.
-        proc_macro_dev (bool, optional): If True, dev proc_macro dependencies are
-            included in the output list.
-        build (bool, optional): If True, build dependencies are included
-            in the output list.
-        build_proc_macro (bool, optional): If True, build proc_macro dependencies are
-            included in the output list.
-        package_name (str, optional): The package name of the set of dependencies to look up.
-            Defaults to `native.package_name()` when unset.
-
-    Returns:
-        dict: The aliases of all associated packages
-    """
-    if package_name == None:
-        package_name = native.package_name()
-
-    # Determine the relevant maps to use
-    all_aliases_maps = []
-    if normal:
-        all_aliases_maps.append(_NORMAL_ALIASES)
-    if normal_dev:
-        all_aliases_maps.append(_NORMAL_DEV_ALIASES)
-    if proc_macro:
-        all_aliases_maps.append(_PROC_MACRO_ALIASES)
-    if proc_macro_dev:
-        all_aliases_maps.append(_PROC_MACRO_DEV_ALIASES)
-    if build:
-        all_aliases_maps.append(_BUILD_ALIASES)
-    if build_proc_macro:
-        all_aliases_maps.append(_BUILD_PROC_MACRO_ALIASES)
-
-    # Default to always using normal aliases
-    if not all_aliases_maps:
-        all_aliases_maps.append(_NORMAL_ALIASES)
-        all_aliases_maps.append(_PROC_MACRO_ALIASES)
-
-    aliases = _flatten_dependency_maps(all_aliases_maps).pop(package_name, None)
-
-    if not aliases:
-        return dict()
-
-    common_items = aliases.pop(_COMMON_CONDITION, {}).items()
-
-    # If there are only common items in the dictionary, immediately return them
-    if not len(aliases.keys()) == 1:
-        return dict(common_items)
-
-    # Build a single select statement where each conditional has accounted for the
-    # common set of aliases.
-    crate_aliases = {"//conditions:default": dict(common_items)}
-    for condition, deps in aliases.items():
-        condition_triples = _CONDITIONS[condition]
-        for triple in condition_triples:
-            if triple in crate_aliases:
-                crate_aliases[triple].update(deps)
-            else:
-                crate_aliases.update({triple: dict(deps.items() + common_items)})
-
-    return select(crate_aliases)
-
-###############################################################################
-# WORKSPACE MEMBER DEPS AND ALIASES
-###############################################################################
-
-_NORMAL_DEPENDENCIES = {
-    "python/extractor/tsg-python": {
-        _COMMON_CONDITION: {
-            "anyhow": Label("@vendor_py__anyhow-1.0.95//:anyhow"),
-            "clap": Label("@vendor_py__clap-4.5.30//:clap"),
-            "regex": Label("@vendor_py__regex-1.11.1//:regex"),
-            "tree-sitter": Label("@vendor_py__tree-sitter-0.24.7//:tree_sitter"),
-            "tree-sitter-graph": Label("@vendor_py__tree-sitter-graph-0.12.0//:tree_sitter_graph"),
-        },
-    },
-    "python/extractor/tsg-python/tsp": {
-        _COMMON_CONDITION: {
-            "tree-sitter": Label("@vendor_py__tree-sitter-0.24.7//:tree_sitter"),
-        },
-    },
-}
-
-_NORMAL_ALIASES = {
-    "python/extractor/tsg-python": {
-        _COMMON_CONDITION: {
-        },
-    },
-    "python/extractor/tsg-python/tsp": {
-        _COMMON_CONDITION: {
-        },
-    },
-}
-
-_NORMAL_DEV_DEPENDENCIES = {
-    "python/extractor/tsg-python": {
-    },
-    "python/extractor/tsg-python/tsp": {
-    },
-}
-
-_NORMAL_DEV_ALIASES = {
-    "python/extractor/tsg-python": {
-    },
-    "python/extractor/tsg-python/tsp": {
-    },
-}
-
-_PROC_MACRO_DEPENDENCIES = {
-    "python/extractor/tsg-python": {
-    },
-    "python/extractor/tsg-python/tsp": {
-    },
-}
-
-_PROC_MACRO_ALIASES = {
-    "python/extractor/tsg-python": {
-    },
-    "python/extractor/tsg-python/tsp": {
-    },
-}
-
-_PROC_MACRO_DEV_DEPENDENCIES = {
-    "python/extractor/tsg-python": {
-    },
-    "python/extractor/tsg-python/tsp": {
-    },
-}
-
-_PROC_MACRO_DEV_ALIASES = {
-    "python/extractor/tsg-python": {
-    },
-    "python/extractor/tsg-python/tsp": {
-    },
-}
-
-_BUILD_DEPENDENCIES = {
-    "python/extractor/tsg-python": {
-    },
-    "python/extractor/tsg-python/tsp": {
-        _COMMON_CONDITION: {
-            "cc": Label("@vendor_py__cc-1.2.14//:cc"),
-        },
-    },
-}
-
-_BUILD_ALIASES = {
-    "python/extractor/tsg-python": {
-    },
-    "python/extractor/tsg-python/tsp": {
-        _COMMON_CONDITION: {
-        },
-    },
-}
-
-_BUILD_PROC_MACRO_DEPENDENCIES = {
-    "python/extractor/tsg-python": {
-    },
-    "python/extractor/tsg-python/tsp": {
-    },
-}
-
-_BUILD_PROC_MACRO_ALIASES = {
-    "python/extractor/tsg-python": {
-    },
-    "python/extractor/tsg-python/tsp": {
-    },
-}
-
-_CONDITIONS = {
-    "aarch64-apple-darwin": ["@rules_rust//rust/platform:aarch64-apple-darwin"],
-    "aarch64-apple-ios": ["@rules_rust//rust/platform:aarch64-apple-ios"],
-    "aarch64-apple-ios-sim": ["@rules_rust//rust/platform:aarch64-apple-ios-sim"],
-    "aarch64-linux-android": ["@rules_rust//rust/platform:aarch64-linux-android"],
-    "aarch64-pc-windows-gnullvm": [],
-    "aarch64-pc-windows-msvc": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
-    "aarch64-unknown-fuchsia": ["@rules_rust//rust/platform:aarch64-unknown-fuchsia"],
-    "aarch64-unknown-linux-gnu": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu"],
-    "aarch64-unknown-nixos-gnu": ["@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"],
-    "aarch64-unknown-nto-qnx710": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"],
-    "aarch64-unknown-uefi": ["@rules_rust//rust/platform:aarch64-unknown-uefi"],
-    "arm-unknown-linux-gnueabi": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi"],
-    "arm-unknown-linux-musleabi": ["@rules_rust//rust/platform:arm-unknown-linux-musleabi"],
-    "armv7-linux-androideabi": ["@rules_rust//rust/platform:armv7-linux-androideabi"],
-    "armv7-unknown-linux-gnueabi": ["@rules_rust//rust/platform:armv7-unknown-linux-gnueabi"],
-    "cfg(all(any(target_arch = \"x86_64\", target_arch = \"arm64ec\"), target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
-    "cfg(all(target_arch = \"aarch64\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
-    "cfg(all(target_arch = \"x86\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
-    "cfg(all(target_arch = \"x86\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
-    "cfg(all(target_arch = \"x86_64\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "cfg(any())": [],
-    "cfg(windows)": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
-    "i686-apple-darwin": ["@rules_rust//rust/platform:i686-apple-darwin"],
-    "i686-linux-android": ["@rules_rust//rust/platform:i686-linux-android"],
-    "i686-pc-windows-gnullvm": [],
-    "i686-pc-windows-msvc": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
-    "i686-unknown-freebsd": ["@rules_rust//rust/platform:i686-unknown-freebsd"],
-    "i686-unknown-linux-gnu": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
-    "powerpc-unknown-linux-gnu": ["@rules_rust//rust/platform:powerpc-unknown-linux-gnu"],
-    "riscv32imc-unknown-none-elf": ["@rules_rust//rust/platform:riscv32imc-unknown-none-elf"],
-    "riscv64gc-unknown-linux-gnu": ["@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu"],
-    "riscv64gc-unknown-none-elf": ["@rules_rust//rust/platform:riscv64gc-unknown-none-elf"],
-    "s390x-unknown-linux-gnu": ["@rules_rust//rust/platform:s390x-unknown-linux-gnu"],
-    "thumbv7em-none-eabi": ["@rules_rust//rust/platform:thumbv7em-none-eabi"],
-    "thumbv8m.main-none-eabi": ["@rules_rust//rust/platform:thumbv8m.main-none-eabi"],
-    "wasm32-unknown-emscripten": ["@rules_rust//rust/platform:wasm32-unknown-emscripten"],
-    "wasm32-unknown-unknown": ["@rules_rust//rust/platform:wasm32-unknown-unknown"],
-    "wasm32-wasip1": ["@rules_rust//rust/platform:wasm32-wasip1"],
-    "wasm32-wasip1-threads": ["@rules_rust//rust/platform:wasm32-wasip1-threads"],
-    "wasm32-wasip2": ["@rules_rust//rust/platform:wasm32-wasip2"],
-    "x86_64-apple-darwin": ["@rules_rust//rust/platform:x86_64-apple-darwin"],
-    "x86_64-apple-ios": ["@rules_rust//rust/platform:x86_64-apple-ios"],
-    "x86_64-linux-android": ["@rules_rust//rust/platform:x86_64-linux-android"],
-    "x86_64-pc-windows-gnullvm": [],
-    "x86_64-pc-windows-msvc": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
-    "x86_64-unknown-freebsd": ["@rules_rust//rust/platform:x86_64-unknown-freebsd"],
-    "x86_64-unknown-fuchsia": ["@rules_rust//rust/platform:x86_64-unknown-fuchsia"],
-    "x86_64-unknown-linux-gnu": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu"],
-    "x86_64-unknown-nixos-gnu": ["@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "x86_64-unknown-none": ["@rules_rust//rust/platform:x86_64-unknown-none"],
-    "x86_64-unknown-uefi": ["@rules_rust//rust/platform:x86_64-unknown-uefi"],
-}
-
-###############################################################################
-
-def crate_repositories():
-    """A macro for defining repositories for all generated crates.
-
-    Returns:
-      A list of repos visible to the module through the module extension.
-    """
-    maybe(
-        http_archive,
-        name = "vendor_py__aho-corasick-1.1.3",
-        sha256 = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/aho-corasick/1.1.3/download"],
-        strip_prefix = "aho-corasick-1.1.3",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.aho-corasick-1.1.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__anstream-0.6.18",
-        sha256 = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstream/0.6.18/download"],
-        strip_prefix = "anstream-0.6.18",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.anstream-0.6.18.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__anstyle-1.0.10",
-        sha256 = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle/1.0.10/download"],
-        strip_prefix = "anstyle-1.0.10",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.anstyle-1.0.10.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__anstyle-parse-0.2.6",
-        sha256 = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle-parse/0.2.6/download"],
-        strip_prefix = "anstyle-parse-0.2.6",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.anstyle-parse-0.2.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__anstyle-query-1.1.2",
-        sha256 = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle-query/1.1.2/download"],
-        strip_prefix = "anstyle-query-1.1.2",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.anstyle-query-1.1.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__anstyle-wincon-3.0.7",
-        sha256 = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle-wincon/3.0.7/download"],
-        strip_prefix = "anstyle-wincon-3.0.7",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.anstyle-wincon-3.0.7.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__anyhow-1.0.95",
-        sha256 = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anyhow/1.0.95/download"],
-        strip_prefix = "anyhow-1.0.95",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.anyhow-1.0.95.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__cc-1.2.14",
-        sha256 = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cc/1.2.14/download"],
-        strip_prefix = "cc-1.2.14",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.cc-1.2.14.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__clap-4.5.30",
-        sha256 = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap/4.5.30/download"],
-        strip_prefix = "clap-4.5.30",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap-4.5.30.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__clap_builder-4.5.30",
-        sha256 = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap_builder/4.5.30/download"],
-        strip_prefix = "clap_builder-4.5.30",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap_builder-4.5.30.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__clap_lex-0.7.4",
-        sha256 = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap_lex/0.7.4/download"],
-        strip_prefix = "clap_lex-0.7.4",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap_lex-0.7.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__colorchoice-1.0.3",
-        sha256 = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/colorchoice/1.0.3/download"],
-        strip_prefix = "colorchoice-1.0.3",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.colorchoice-1.0.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__is_terminal_polyfill-1.70.1",
-        sha256 = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/is_terminal_polyfill/1.70.1/download"],
-        strip_prefix = "is_terminal_polyfill-1.70.1",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.is_terminal_polyfill-1.70.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__itoa-1.0.14",
-        sha256 = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/itoa/1.0.14/download"],
-        strip_prefix = "itoa-1.0.14",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.itoa-1.0.14.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__log-0.4.25",
-        sha256 = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/log/0.4.25/download"],
-        strip_prefix = "log-0.4.25",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.log-0.4.25.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__memchr-2.7.4",
-        sha256 = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/memchr/2.7.4/download"],
-        strip_prefix = "memchr-2.7.4",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.memchr-2.7.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__once_cell-1.20.3",
-        sha256 = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/once_cell/1.20.3/download"],
-        strip_prefix = "once_cell-1.20.3",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.once_cell-1.20.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__proc-macro2-1.0.93",
-        sha256 = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/proc-macro2/1.0.93/download"],
-        strip_prefix = "proc-macro2-1.0.93",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.proc-macro2-1.0.93.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__quote-1.0.38",
-        sha256 = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/quote/1.0.38/download"],
-        strip_prefix = "quote-1.0.38",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.quote-1.0.38.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__regex-1.11.1",
-        sha256 = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex/1.11.1/download"],
-        strip_prefix = "regex-1.11.1",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.regex-1.11.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__regex-automata-0.4.9",
-        sha256 = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex-automata/0.4.9/download"],
-        strip_prefix = "regex-automata-0.4.9",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.regex-automata-0.4.9.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__regex-syntax-0.8.5",
-        sha256 = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex-syntax/0.8.5/download"],
-        strip_prefix = "regex-syntax-0.8.5",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.regex-syntax-0.8.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__ryu-1.0.19",
-        sha256 = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ryu/1.0.19/download"],
-        strip_prefix = "ryu-1.0.19",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.ryu-1.0.19.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__serde-1.0.217",
-        sha256 = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde/1.0.217/download"],
-        strip_prefix = "serde-1.0.217",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.serde-1.0.217.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__serde_derive-1.0.217",
-        sha256 = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_derive/1.0.217/download"],
-        strip_prefix = "serde_derive-1.0.217",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.serde_derive-1.0.217.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__serde_json-1.0.138",
-        sha256 = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_json/1.0.138/download"],
-        strip_prefix = "serde_json-1.0.138",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.serde_json-1.0.138.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__shlex-1.3.0",
-        sha256 = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/shlex/1.3.0/download"],
-        strip_prefix = "shlex-1.3.0",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.shlex-1.3.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__smallvec-1.14.0",
-        sha256 = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/smallvec/1.14.0/download"],
-        strip_prefix = "smallvec-1.14.0",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.smallvec-1.14.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__streaming-iterator-0.1.9",
-        sha256 = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/streaming-iterator/0.1.9/download"],
-        strip_prefix = "streaming-iterator-0.1.9",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.streaming-iterator-0.1.9.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__strsim-0.11.1",
-        sha256 = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/strsim/0.11.1/download"],
-        strip_prefix = "strsim-0.11.1",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.strsim-0.11.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__syn-2.0.98",
-        sha256 = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/syn/2.0.98/download"],
-        strip_prefix = "syn-2.0.98",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.syn-2.0.98.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__thiserror-1.0.69",
-        sha256 = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/thiserror/1.0.69/download"],
-        strip_prefix = "thiserror-1.0.69",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.thiserror-1.0.69.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__thiserror-impl-1.0.69",
-        sha256 = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/thiserror-impl/1.0.69/download"],
-        strip_prefix = "thiserror-impl-1.0.69",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.thiserror-impl-1.0.69.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__tree-sitter-0.24.7",
-        sha256 = "a5387dffa7ffc7d2dae12b50c6f7aab8ff79d6210147c6613561fc3d474c6f75",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter/0.24.7/download"],
-        strip_prefix = "tree-sitter-0.24.7",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-0.24.7.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__tree-sitter-graph-0.12.0",
-        sha256 = "63f86eb73c7d891c4b9b6fe4d4e63dd94c506e4788af7c2296afdcfbeea626cc",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter-graph/0.12.0/download"],
-        strip_prefix = "tree-sitter-graph-0.12.0",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-graph-0.12.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__tree-sitter-language-0.1.5",
-        sha256 = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter-language/0.1.5/download"],
-        strip_prefix = "tree-sitter-language-0.1.5",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-language-0.1.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__unicode-ident-1.0.16",
-        sha256 = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/unicode-ident/1.0.16/download"],
-        strip_prefix = "unicode-ident-1.0.16",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.unicode-ident-1.0.16.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__utf8parse-0.2.2",
-        sha256 = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/utf8parse/0.2.2/download"],
-        strip_prefix = "utf8parse-0.2.2",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.utf8parse-0.2.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__windows-sys-0.59.0",
-        sha256 = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-sys/0.59.0/download"],
-        strip_prefix = "windows-sys-0.59.0",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows-sys-0.59.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__windows-targets-0.52.6",
-        sha256 = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-targets/0.52.6/download"],
-        strip_prefix = "windows-targets-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows-targets-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__windows_aarch64_gnullvm-0.52.6",
-        sha256 = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_aarch64_gnullvm/0.52.6/download"],
-        strip_prefix = "windows_aarch64_gnullvm-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_aarch64_gnullvm-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__windows_aarch64_msvc-0.52.6",
-        sha256 = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_aarch64_msvc/0.52.6/download"],
-        strip_prefix = "windows_aarch64_msvc-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_aarch64_msvc-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__windows_i686_gnu-0.52.6",
-        sha256 = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_i686_gnu/0.52.6/download"],
-        strip_prefix = "windows_i686_gnu-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_i686_gnu-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__windows_i686_gnullvm-0.52.6",
-        sha256 = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_i686_gnullvm/0.52.6/download"],
-        strip_prefix = "windows_i686_gnullvm-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_i686_gnullvm-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__windows_i686_msvc-0.52.6",
-        sha256 = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_i686_msvc/0.52.6/download"],
-        strip_prefix = "windows_i686_msvc-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_i686_msvc-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__windows_x86_64_gnu-0.52.6",
-        sha256 = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_x86_64_gnu/0.52.6/download"],
-        strip_prefix = "windows_x86_64_gnu-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_x86_64_gnu-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__windows_x86_64_gnullvm-0.52.6",
-        sha256 = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_x86_64_gnullvm/0.52.6/download"],
-        strip_prefix = "windows_x86_64_gnullvm-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_x86_64_gnullvm-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_py__windows_x86_64_msvc-0.52.6",
-        sha256 = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_x86_64_msvc/0.52.6/download"],
-        strip_prefix = "windows_x86_64_msvc-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.windows_x86_64_msvc-0.52.6.bazel"),
-    )
-
-    return [
-        struct(repo = "vendor_py__anyhow-1.0.95", is_dev_dep = False),
-        struct(repo = "vendor_py__cc-1.2.14", is_dev_dep = False),
-        struct(repo = "vendor_py__clap-4.5.30", is_dev_dep = False),
-        struct(repo = "vendor_py__regex-1.11.1", is_dev_dep = False),
-        struct(repo = "vendor_py__tree-sitter-0.24.7", is_dev_dep = False),
-        struct(repo = "vendor_py__tree-sitter-graph-0.12.0", is_dev_dep = False),
-    ]
+"""Deprecated: re-exports the crate_universe macros from `:crates.bzl`."""
+
+load(
+    ":crates.bzl",
+    _aliases = "aliases",
+    _all_crate_deps = "all_crate_deps",
+    _crate_deps = "crate_deps",
+    _crate_edition = "crate_edition",
+    _crate_repositories = "crate_repositories",
+)
+
+aliases = _aliases
+all_crate_deps = _all_crate_deps
+crate_deps = _crate_deps
+crate_edition = _crate_edition
+crate_repositories = _crate_repositories
diff --git a/misc/bazel/3rdparty/py_deps/regex-1.11.1/BUILD.bazel b/misc/bazel/3rdparty/py_deps/regex-1.11.1/BUILD.bazel
new file mode 100644
index 000000000000..325b1acac5e6
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/regex-1.11.1/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "regex-1.11.1",
+    actual = "@vendor_py__regex-1.11.1//:regex",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/regex/BUILD.bazel b/misc/bazel/3rdparty/py_deps/regex/BUILD.bazel
new file mode 100644
index 000000000000..9968c5afe14a
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/regex/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "regex",
+    actual = "@vendor_py__regex-1.11.1//:regex",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/serde_json-1.0.138/BUILD.bazel b/misc/bazel/3rdparty/py_deps/serde_json-1.0.138/BUILD.bazel
new file mode 100644
index 000000000000..8898be6f6a9f
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/serde_json-1.0.138/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "serde_json-1.0.138",
+    actual = "@vendor_py__serde_json-1.0.138//:serde_json",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/serde_json/BUILD.bazel b/misc/bazel/3rdparty/py_deps/serde_json/BUILD.bazel
new file mode 100644
index 000000000000..16e0ac1ca72d
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/serde_json/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "serde_json",
+    actual = "@vendor_py__serde_json-1.0.138//:serde_json",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/tree-sitter-0.24.7/BUILD.bazel b/misc/bazel/3rdparty/py_deps/tree-sitter-0.24.7/BUILD.bazel
new file mode 100644
index 000000000000..8d7ea5705f95
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/tree-sitter-0.24.7/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-0.24.7",
+    actual = "@vendor_py__tree-sitter-0.24.7//:tree_sitter",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/tree-sitter-graph-0.12.0/BUILD.bazel b/misc/bazel/3rdparty/py_deps/tree-sitter-graph-0.12.0/BUILD.bazel
new file mode 100644
index 000000000000..f460a84e4181
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/tree-sitter-graph-0.12.0/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-graph-0.12.0",
+    actual = "@vendor_py__tree-sitter-graph-0.12.0//:tree_sitter_graph",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/tree-sitter-graph/BUILD.bazel b/misc/bazel/3rdparty/py_deps/tree-sitter-graph/BUILD.bazel
new file mode 100644
index 000000000000..3ed15473bc90
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/tree-sitter-graph/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-graph",
+    actual = "@vendor_py__tree-sitter-graph-0.12.0//:tree_sitter_graph",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/py_deps/tree-sitter/BUILD.bazel b/misc/bazel/3rdparty/py_deps/tree-sitter/BUILD.bazel
new file mode 100644
index 000000000000..9bd226f8164d
--- /dev/null
+++ b/misc/bazel/3rdparty/py_deps/tree-sitter/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter",
+    actual = "@vendor_py__tree-sitter-0.24.7//:tree_sitter",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.1.bazel
index 2a2e575fd128..366019a460c1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.1.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel
deleted file mode 100644
index 29ac012c7637..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "aho_corasick",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "perf-literal",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=aho-corasick",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.1.3",
-    deps = [
-        "@vendor_ts__memchr-2.7.5//:memchr",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.5.bazel
new file mode 100644
index 000000000000..981ae89bc50f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.5.bazel
@@ -0,0 +1,119 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "aho_corasick",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "perf-literal",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=aho-corasick",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.5",
+    deps = [
+        "@vendor_ts__memchr-2.8.3//:memchr",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel
index 4fe1a5ae3dba..cfd6564b49db 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel
@@ -55,12 +55,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -72,13 +74,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -86,6 +99,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel
index 165cf9da2fdb..89c7235b0a49 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -95,6 +109,6 @@ rust_library(
     }),
     version = "0.1.5",
     deps = [
-        "@vendor_ts__libc-0.2.175//:libc",
+        "@vendor_ts__libc-0.2.189//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.20.bazel
deleted file mode 100644
index bd6489b11e33..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.20.bazel
+++ /dev/null
@@ -1,121 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "anstream",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "auto",
-        "default",
-        "wincon",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=anstream",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.6.20",
-    deps = [
-        "@vendor_ts__anstyle-1.0.11//:anstyle",
-        "@vendor_ts__anstyle-parse-0.2.7//:anstyle_parse",
-        "@vendor_ts__anstyle-query-1.1.4//:anstyle_query",
-        "@vendor_ts__colorchoice-1.0.4//:colorchoice",
-        "@vendor_ts__is_terminal_polyfill-1.70.1//:is_terminal_polyfill",
-        "@vendor_ts__utf8parse-0.2.2//:utf8parse",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__anstyle-wincon-3.0.10//:anstyle_wincon",  # aarch64-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__anstyle-wincon-3.0.10//:anstyle_wincon",  # i686-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__anstyle-wincon-3.0.10//:anstyle_wincon",  # x86_64-pc-windows-msvc
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-1.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-1.0.0.bazel
new file mode 100644
index 000000000000..025f95da7ac1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-1.0.0.bazel
@@ -0,0 +1,135 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "anstream",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "auto",
+        "default",
+        "wincon",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anstream",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.0",
+    deps = [
+        "@vendor_ts__anstyle-1.0.14//:anstyle",
+        "@vendor_ts__anstyle-parse-1.0.0//:anstyle_parse",
+        "@vendor_ts__anstyle-query-1.1.5//:anstyle_query",
+        "@vendor_ts__colorchoice-1.0.5//:colorchoice",
+        "@vendor_ts__is_terminal_polyfill-1.70.2//:is_terminal_polyfill",
+        "@vendor_ts__utf8parse-0.2.2//:utf8parse",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__anstyle-wincon-3.0.11//:anstyle_wincon",  # aarch64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__anstyle-wincon-3.0.11//:anstyle_wincon",  # i686-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__anstyle-wincon-3.0.11//:anstyle_wincon",  # x86_64-pc-windows-msvc
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.11.bazel
deleted file mode 100644
index 1739823d66f4..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.11.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "anstyle",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=anstyle",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.11",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.14.bazel
new file mode 100644
index 000000000000..d60ac181c7fa
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.14.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "anstyle",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anstyle",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.14",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.7.bazel
deleted file mode 100644
index d2c9594f554a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.7.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "anstyle_parse",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "utf8",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=anstyle-parse",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.7",
-    deps = [
-        "@vendor_ts__utf8parse-0.2.2//:utf8parse",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-1.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-1.0.0.bazel
new file mode 100644
index 000000000000..68ebf2e32ffd
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-1.0.0.bazel
@@ -0,0 +1,118 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "anstyle_parse",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "utf8",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anstyle-parse",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.0",
+    deps = [
+        "@vendor_ts__utf8parse-0.2.2//:utf8parse",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.4.bazel
deleted file mode 100644
index fe3361ea4119..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.4.bazel
+++ /dev/null
@@ -1,109 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "anstyle_query",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=anstyle-query",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.1.4",
-    deps = select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.5.bazel
new file mode 100644
index 000000000000..6db11937a90b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.5.bazel
@@ -0,0 +1,123 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "anstyle_query",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anstyle-query",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.5",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.10.bazel
deleted file mode 100644
index 822d2d90ec43..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.10.bazel
+++ /dev/null
@@ -1,114 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "anstyle_wincon",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=anstyle-wincon",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "3.0.10",
-    deps = [
-        "@vendor_ts__anstyle-1.0.11//:anstyle",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__once_cell_polyfill-1.70.1//:once_cell_polyfill",  # cfg(windows)
-            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__once_cell_polyfill-1.70.1//:once_cell_polyfill",  # cfg(windows)
-            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__once_cell_polyfill-1.70.1//:once_cell_polyfill",  # cfg(windows)
-            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.11.bazel
new file mode 100644
index 000000000000..f7c9faa76301
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.11.bazel
@@ -0,0 +1,128 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "anstyle_wincon",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anstyle-wincon",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "3.0.11",
+    deps = [
+        "@vendor_ts__anstyle-1.0.14//:anstyle",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__once_cell_polyfill-1.70.2//:once_cell_polyfill",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__once_cell_polyfill-1.70.2//:once_cell_polyfill",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__once_cell_polyfill-1.70.2//:once_cell_polyfill",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.100.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.100.bazel
deleted file mode 100644
index 48f6fcce1426..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.100.bazel
+++ /dev/null
@@ -1,170 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "anyhow",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=anyhow",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.100",
-    deps = [
-        "@vendor_ts__anyhow-1.0.100//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "anyhow",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=anyhow",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.100",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.104.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.104.bazel
new file mode 100644
index 000000000000..c9287efb9470
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.104.bazel
@@ -0,0 +1,188 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "anyhow",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anyhow",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.104",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "anyhow",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anyhow",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.104",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel
deleted file mode 100644
index 4a1e9ba79158..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "argfile",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=argfile",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.1",
-    deps = [
-        "@vendor_ts__fs-err-2.11.0//:fs_err",
-        "@vendor_ts__os_str_bytes-7.1.1//:os_str_bytes",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.6.bazel
deleted file mode 100644
index 4f70598af859..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.6.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "arrayvec",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=arrayvec",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.7.6",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.8.bazel
new file mode 100644
index 000000000000..03a8ac873d3e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.8.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "arrayvec",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=arrayvec",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.7.8",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.1.bazel
index dfa4a0f21eb2..4c1080884944 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.1.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,6 +113,6 @@ rust_library(
     }),
     version = "0.6.1",
     deps = [
-        "@vendor_ts__bytemuck-1.23.2//:bytemuck",
+        "@vendor_ts__bytemuck-1.25.0//:bytemuck",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.0.bazel
deleted file mode 100644
index 8eb4be76a1b8..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.0.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "autocfg",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=autocfg",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.5.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.1.bazel
new file mode 100644
index 000000000000..415d4c0423bf
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.1.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "autocfg",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=autocfg",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.5.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.22.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.22.1.bazel
deleted file mode 100644
index 089c4eb1ba86..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.22.1.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "base64",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=base64",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.22.1",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.23.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.23.1.bazel
new file mode 100644
index 000000000000..4b53a4f2273d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.23.1.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "base64",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=base64",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.23.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
index e4e959491d45..377f236a841b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
@@ -32,26 +32,14 @@ filegroup(
 
 # Workspace Member Dependencies
 alias(
-    name = "anyhow-1.0.100",
-    actual = "@vendor_ts__anyhow-1.0.100//:anyhow",
+    name = "anyhow-1.0.104",
+    actual = "@vendor_ts__anyhow-1.0.104//:anyhow",
     tags = ["manual"],
 )
 
 alias(
     name = "anyhow",
-    actual = "@vendor_ts__anyhow-1.0.100//:anyhow",
-    tags = ["manual"],
-)
-
-alias(
-    name = "argfile-0.2.1",
-    actual = "@vendor_ts__argfile-0.2.1//:argfile",
-    tags = ["manual"],
-)
-
-alias(
-    name = "argfile",
-    actual = "@vendor_ts__argfile-0.2.1//:argfile",
+    actual = "@vendor_ts__anyhow-1.0.104//:anyhow",
     tags = ["manual"],
 )
 
@@ -68,26 +56,26 @@ alias(
 )
 
 alias(
-    name = "chrono-0.4.42",
-    actual = "@vendor_ts__chrono-0.4.42//:chrono",
+    name = "chrono-0.4.45",
+    actual = "@vendor_ts__chrono-0.4.45//:chrono",
     tags = ["manual"],
 )
 
 alias(
     name = "chrono",
-    actual = "@vendor_ts__chrono-0.4.42//:chrono",
+    actual = "@vendor_ts__chrono-0.4.45//:chrono",
     tags = ["manual"],
 )
 
 alias(
-    name = "clap-4.5.48",
-    actual = "@vendor_ts__clap-4.5.48//:clap",
+    name = "clap-4.6.7",
+    actual = "@vendor_ts__clap-4.6.7//:clap",
     tags = ["manual"],
 )
 
 alias(
     name = "clap",
-    actual = "@vendor_ts__clap-4.5.48//:clap",
+    actual = "@vendor_ts__clap-4.6.7//:clap",
     tags = ["manual"],
 )
 
@@ -104,14 +92,14 @@ alias(
 )
 
 alias(
-    name = "either-1.15.0",
-    actual = "@vendor_ts__either-1.15.0//:either",
+    name = "either-1.19.0",
+    actual = "@vendor_ts__either-1.19.0//:either",
     tags = ["manual"],
 )
 
 alias(
     name = "either",
-    actual = "@vendor_ts__either-1.15.0//:either",
+    actual = "@vendor_ts__either-1.19.0//:either",
     tags = ["manual"],
 )
 
@@ -140,62 +128,62 @@ alias(
 )
 
 alias(
-    name = "flate2-1.1.2",
-    actual = "@vendor_ts__flate2-1.1.2//:flate2",
+    name = "flate2-1.1.9",
+    actual = "@vendor_ts__flate2-1.1.9//:flate2",
     tags = ["manual"],
 )
 
 alias(
     name = "flate2",
-    actual = "@vendor_ts__flate2-1.1.2//:flate2",
+    actual = "@vendor_ts__flate2-1.1.9//:flate2",
     tags = ["manual"],
 )
 
 alias(
-    name = "glob-0.3.3",
-    actual = "@vendor_ts__glob-0.3.3//:glob",
+    name = "glob-0.3.4",
+    actual = "@vendor_ts__glob-0.3.4//:glob",
     tags = ["manual"],
 )
 
 alias(
     name = "glob",
-    actual = "@vendor_ts__glob-0.3.3//:glob",
+    actual = "@vendor_ts__glob-0.3.4//:glob",
     tags = ["manual"],
 )
 
 alias(
-    name = "globset-0.4.16",
-    actual = "@vendor_ts__globset-0.4.16//:globset",
+    name = "globset-0.4.18",
+    actual = "@vendor_ts__globset-0.4.18//:globset",
     tags = ["manual"],
 )
 
 alias(
     name = "globset",
-    actual = "@vendor_ts__globset-0.4.16//:globset",
+    actual = "@vendor_ts__globset-0.4.18//:globset",
     tags = ["manual"],
 )
 
 alias(
-    name = "itertools-0.14.0",
-    actual = "@vendor_ts__itertools-0.14.0//:itertools",
+    name = "itertools-0.15.0",
+    actual = "@vendor_ts__itertools-0.15.0//:itertools",
     tags = ["manual"],
 )
 
 alias(
     name = "itertools",
-    actual = "@vendor_ts__itertools-0.14.0//:itertools",
+    actual = "@vendor_ts__itertools-0.15.0//:itertools",
     tags = ["manual"],
 )
 
 alias(
-    name = "lazy_static-1.5.0",
-    actual = "@vendor_ts__lazy_static-1.5.0//:lazy_static",
+    name = "lazy_static-1.5.1",
+    actual = "@vendor_ts__lazy_static-1.5.1//:lazy_static",
     tags = ["manual"],
 )
 
 alias(
     name = "lazy_static",
-    actual = "@vendor_ts__lazy_static-1.5.0//:lazy_static",
+    actual = "@vendor_ts__lazy_static-1.5.1//:lazy_static",
     tags = ["manual"],
 )
 
@@ -236,296 +224,320 @@ alias(
 )
 
 alias(
-    name = "proc-macro2-1.0.101",
-    actual = "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+    name = "proc-macro2-1.0.107",
+    actual = "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
     tags = ["manual"],
 )
 
 alias(
     name = "proc-macro2",
-    actual = "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+    actual = "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
     tags = ["manual"],
 )
 
 alias(
-    name = "quote-1.0.41",
-    actual = "@vendor_ts__quote-1.0.41//:quote",
+    name = "quote-1.0.47",
+    actual = "@vendor_ts__quote-1.0.47//:quote",
     tags = ["manual"],
 )
 
 alias(
     name = "quote",
-    actual = "@vendor_ts__quote-1.0.41//:quote",
+    actual = "@vendor_ts__quote-1.0.47//:quote",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_base_db-0.0.301",
-    actual = "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
+    name = "ra_ap_base_db-0.0.358",
+    actual = "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_base_db",
-    actual = "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
+    actual = "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_cfg-0.0.301",
-    actual = "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
+    name = "ra_ap_cfg-0.0.358",
+    actual = "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_cfg",
-    actual = "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
+    actual = "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir-0.0.301",
-    actual = "@vendor_ts__ra_ap_hir-0.0.301//:ra_ap_hir",
+    name = "ra_ap_hir-0.0.358",
+    actual = "@vendor_ts__ra_ap_hir-0.0.358//:ra_ap_hir",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir",
-    actual = "@vendor_ts__ra_ap_hir-0.0.301//:ra_ap_hir",
+    actual = "@vendor_ts__ra_ap_hir-0.0.358//:ra_ap_hir",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir_def-0.0.301",
-    actual = "@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def",
+    name = "ra_ap_hir_def-0.0.358",
+    actual = "@vendor_ts__ra_ap_hir_def-0.0.358//:ra_ap_hir_def",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir_def",
-    actual = "@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def",
+    actual = "@vendor_ts__ra_ap_hir_def-0.0.358//:ra_ap_hir_def",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir_expand-0.0.301",
-    actual = "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand",
+    name = "ra_ap_hir_expand-0.0.358",
+    actual = "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir_expand",
-    actual = "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand",
+    actual = "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir_ty-0.0.301",
-    actual = "@vendor_ts__ra_ap_hir_ty-0.0.301//:ra_ap_hir_ty",
+    name = "ra_ap_hir_ty-0.0.358",
+    actual = "@vendor_ts__ra_ap_hir_ty-0.0.358//:ra_ap_hir_ty",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir_ty",
-    actual = "@vendor_ts__ra_ap_hir_ty-0.0.301//:ra_ap_hir_ty",
+    actual = "@vendor_ts__ra_ap_hir_ty-0.0.358//:ra_ap_hir_ty",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_ide_db-0.0.301",
-    actual = "@vendor_ts__ra_ap_ide_db-0.0.301//:ra_ap_ide_db",
+    name = "ra_ap_ide_db-0.0.358",
+    actual = "@vendor_ts__ra_ap_ide_db-0.0.358//:ra_ap_ide_db",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_ide_db",
-    actual = "@vendor_ts__ra_ap_ide_db-0.0.301//:ra_ap_ide_db",
+    actual = "@vendor_ts__ra_ap_ide_db-0.0.358//:ra_ap_ide_db",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_intern-0.0.301",
-    actual = "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+    name = "ra_ap_intern-0.0.358",
+    actual = "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_intern",
-    actual = "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+    actual = "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_load-cargo-0.0.301",
-    actual = "@vendor_ts__ra_ap_load-cargo-0.0.301//:ra_ap_load_cargo",
+    name = "ra_ap_load-cargo-0.0.358",
+    actual = "@vendor_ts__ra_ap_load-cargo-0.0.358//:ra_ap_load_cargo",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_load-cargo",
-    actual = "@vendor_ts__ra_ap_load-cargo-0.0.301//:ra_ap_load_cargo",
+    actual = "@vendor_ts__ra_ap_load-cargo-0.0.358//:ra_ap_load_cargo",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_parser-0.0.301",
-    actual = "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
+    name = "ra_ap_parser-0.0.358",
+    actual = "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_parser",
-    actual = "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
+    actual = "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_paths-0.0.301",
-    actual = "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths",
+    name = "ra_ap_paths-0.0.358",
+    actual = "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_paths",
-    actual = "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths",
+    actual = "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_project_model-0.0.301",
-    actual = "@vendor_ts__ra_ap_project_model-0.0.301//:ra_ap_project_model",
+    name = "ra_ap_project_model-0.0.358",
+    actual = "@vendor_ts__ra_ap_project_model-0.0.358//:ra_ap_project_model",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_project_model",
-    actual = "@vendor_ts__ra_ap_project_model-0.0.301//:ra_ap_project_model",
+    actual = "@vendor_ts__ra_ap_project_model-0.0.358//:ra_ap_project_model",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_span-0.0.301",
-    actual = "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
+    name = "ra_ap_span-0.0.358",
+    actual = "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_span",
-    actual = "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
+    actual = "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_stdx-0.0.301",
-    actual = "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+    name = "ra_ap_stdx-0.0.358",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
     tags = ["manual"],
 )
 
 alias(
-    name = "stdx-0.0.301",
-    actual = "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+    name = "stdx-0.0.358",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
     tags = ["manual"],
 )
 
 alias(
     name = "stdx",
-    actual = "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_syntax-0.0.301",
-    actual = "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
+    name = "ra_ap_syntax-0.0.358",
+    actual = "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_syntax",
-    actual = "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
+    actual = "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_syntax-bridge-0.0.358",
+    actual = "@vendor_ts__ra_ap_syntax-bridge-0.0.358//:ra_ap_syntax_bridge",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_syntax-bridge",
+    actual = "@vendor_ts__ra_ap_syntax-bridge-0.0.358//:ra_ap_syntax_bridge",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_vfs-0.0.301",
-    actual = "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
+    name = "ra_ap_toolchain-0.0.358",
+    actual = "@vendor_ts__ra_ap_toolchain-0.0.358//:ra_ap_toolchain",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_toolchain",
+    actual = "@vendor_ts__ra_ap_toolchain-0.0.358//:ra_ap_toolchain",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_vfs-0.0.358",
+    actual = "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_vfs",
-    actual = "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
+    actual = "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs",
     tags = ["manual"],
 )
 
 alias(
-    name = "rand-0.9.2",
-    actual = "@vendor_ts__rand-0.9.2//:rand",
+    name = "rand-0.10.3",
+    actual = "@vendor_ts__rand-0.10.3//:rand",
     tags = ["manual"],
 )
 
 alias(
     name = "rand",
-    actual = "@vendor_ts__rand-0.9.2//:rand",
+    actual = "@vendor_ts__rand-0.10.3//:rand",
     tags = ["manual"],
 )
 
 alias(
-    name = "rayon-1.11.0",
-    actual = "@vendor_ts__rayon-1.11.0//:rayon",
+    name = "rayon-1.12.0",
+    actual = "@vendor_ts__rayon-1.12.0//:rayon",
     tags = ["manual"],
 )
 
 alias(
     name = "rayon",
-    actual = "@vendor_ts__rayon-1.11.0//:rayon",
+    actual = "@vendor_ts__rayon-1.12.0//:rayon",
     tags = ["manual"],
 )
 
 alias(
-    name = "regex-1.11.3",
-    actual = "@vendor_ts__regex-1.11.3//:regex",
+    name = "regex-1.13.1",
+    actual = "@vendor_ts__regex-1.13.1//:regex",
     tags = ["manual"],
 )
 
 alias(
     name = "regex",
-    actual = "@vendor_ts__regex-1.11.3//:regex",
+    actual = "@vendor_ts__regex-1.13.1//:regex",
     tags = ["manual"],
 )
 
 alias(
-    name = "serde-1.0.228",
-    actual = "@vendor_ts__serde-1.0.228//:serde",
+    name = "serde-1.0.229",
+    actual = "@vendor_ts__serde-1.0.229//:serde",
     tags = ["manual"],
 )
 
 alias(
     name = "serde",
-    actual = "@vendor_ts__serde-1.0.228//:serde",
+    actual = "@vendor_ts__serde-1.0.229//:serde",
     tags = ["manual"],
 )
 
 alias(
-    name = "serde_json-1.0.145",
-    actual = "@vendor_ts__serde_json-1.0.145//:serde_json",
+    name = "serde_json-1.0.154",
+    actual = "@vendor_ts__serde_json-1.0.154//:serde_json",
     tags = ["manual"],
 )
 
 alias(
     name = "serde_json",
-    actual = "@vendor_ts__serde_json-1.0.145//:serde_json",
+    actual = "@vendor_ts__serde_json-1.0.154//:serde_json",
     tags = ["manual"],
 )
 
 alias(
-    name = "serde_with-3.14.1",
-    actual = "@vendor_ts__serde_with-3.14.1//:serde_with",
+    name = "serde_with-3.24.0",
+    actual = "@vendor_ts__serde_with-3.24.0//:serde_with",
     tags = ["manual"],
 )
 
 alias(
     name = "serde_with",
-    actual = "@vendor_ts__serde_with-3.14.1//:serde_with",
+    actual = "@vendor_ts__serde_with-3.24.0//:serde_with",
     tags = ["manual"],
 )
 
@@ -542,50 +554,38 @@ alias(
 )
 
 alias(
-    name = "swift-syntax-rs-0.1.0",
-    actual = "@vendor_ts__swift-syntax-rs-0.1.0//:swift_syntax_rs",
-    tags = ["manual"],
-)
-
-alias(
-    name = "swift-syntax-rs",
-    actual = "@vendor_ts__swift-syntax-rs-0.1.0//:swift_syntax_rs",
-    tags = ["manual"],
-)
-
-alias(
-    name = "syn-2.0.106",
-    actual = "@vendor_ts__syn-2.0.106//:syn",
+    name = "syn-3.0.9",
+    actual = "@vendor_ts__syn-3.0.9//:syn",
     tags = ["manual"],
 )
 
 alias(
     name = "syn",
-    actual = "@vendor_ts__syn-2.0.106//:syn",
+    actual = "@vendor_ts__syn-3.0.9//:syn",
     tags = ["manual"],
 )
 
 alias(
-    name = "toml-0.9.7",
-    actual = "@vendor_ts__toml-0.9.7//:toml",
+    name = "toml-1.1.8+spec-1.1.0",
+    actual = "@vendor_ts__toml-1.1.8-spec-1.1.0//:toml",
     tags = ["manual"],
 )
 
 alias(
     name = "toml",
-    actual = "@vendor_ts__toml-0.9.7//:toml",
+    actual = "@vendor_ts__toml-1.1.8-spec-1.1.0//:toml",
     tags = ["manual"],
 )
 
 alias(
-    name = "tracing-0.1.41",
-    actual = "@vendor_ts__tracing-0.1.41//:tracing",
+    name = "tracing-0.1.44",
+    actual = "@vendor_ts__tracing-0.1.44//:tracing",
     tags = ["manual"],
 )
 
 alias(
     name = "tracing",
-    actual = "@vendor_ts__tracing-0.1.41//:tracing",
+    actual = "@vendor_ts__tracing-0.1.44//:tracing",
     tags = ["manual"],
 )
 
@@ -602,26 +602,26 @@ alias(
 )
 
 alias(
-    name = "tracing-subscriber-0.3.20",
-    actual = "@vendor_ts__tracing-subscriber-0.3.20//:tracing_subscriber",
+    name = "tracing-subscriber-0.3.23",
+    actual = "@vendor_ts__tracing-subscriber-0.3.23//:tracing_subscriber",
     tags = ["manual"],
 )
 
 alias(
     name = "tracing-subscriber",
-    actual = "@vendor_ts__tracing-subscriber-0.3.20//:tracing_subscriber",
+    actual = "@vendor_ts__tracing-subscriber-0.3.23//:tracing_subscriber",
     tags = ["manual"],
 )
 
 alias(
-    name = "tree-sitter-0.26.8",
-    actual = "@vendor_ts__tree-sitter-0.26.8//:tree_sitter",
+    name = "tree-sitter-0.26.9",
+    actual = "@vendor_ts__tree-sitter-0.26.9//:tree_sitter",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter",
-    actual = "@vendor_ts__tree-sitter-0.26.8//:tree_sitter",
+    actual = "@vendor_ts__tree-sitter-0.26.9//:tree_sitter",
     tags = ["manual"],
 )
 
@@ -650,14 +650,14 @@ alias(
 )
 
 alias(
-    name = "tree-sitter-python-0.23.6",
-    actual = "@vendor_ts__tree-sitter-python-0.23.6//:tree_sitter_python",
+    name = "tree-sitter-python-0.25.0",
+    actual = "@vendor_ts__tree-sitter-python-0.25.0//:tree_sitter_python",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter-python",
-    actual = "@vendor_ts__tree-sitter-python-0.23.6//:tree_sitter_python",
+    actual = "@vendor_ts__tree-sitter-python-0.25.0//:tree_sitter_python",
     tags = ["manual"],
 )
 
@@ -686,14 +686,14 @@ alias(
 )
 
 alias(
-    name = "triomphe-0.1.14",
-    actual = "@vendor_ts__triomphe-0.1.14//:triomphe",
+    name = "triomphe-0.1.17",
+    actual = "@vendor_ts__triomphe-0.1.17//:triomphe",
     tags = ["manual"],
 )
 
 alias(
     name = "triomphe",
-    actual = "@vendor_ts__triomphe-0.1.14//:triomphe",
+    actual = "@vendor_ts__triomphe-0.1.17//:triomphe",
     tags = ["manual"],
 )
 
@@ -710,13 +710,13 @@ alias(
 )
 
 alias(
-    name = "zstd-0.13.3",
-    actual = "@vendor_ts__zstd-0.13.3//:zstd",
+    name = "zstd-0.14.2",
+    actual = "@vendor_ts__zstd-0.14.2//:zstd",
     tags = ["manual"],
 )
 
 alias(
     name = "zstd",
-    actual = "@vendor_ts__zstd-0.13.3//:zstd",
+    actual = "@vendor_ts__zstd-0.14.2//:zstd",
     tags = ["manual"],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-1.3.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-1.3.2.bazel
index 3c554f70f16d..ed1afd8c2206 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-1.3.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-1.3.2.bazel
@@ -34,9 +34,6 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "default",
-    ],
     crate_root = "src/lib.rs",
     edition = "2018",
     rustc_env_files = [
@@ -55,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -72,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -86,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.13.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.13.2.bazel
new file mode 100644
index 000000000000..a3299640ec07
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.13.2.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "bitflags",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=bitflags",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.13.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.9.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.9.4.bazel
deleted file mode 100644
index 1e9bde485ea4..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.9.4.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "bitflags",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=bitflags",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.9.4",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.7.bazel
deleted file mode 100644
index cdf0bd3bcde6..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.7.bazel
+++ /dev/null
@@ -1,165 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "borsh",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=borsh",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.5.7",
-    deps = [
-        "@vendor_ts__borsh-1.5.7//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "borsh",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=borsh",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.5.7",
-    visibility = ["//visibility:private"],
-    deps = [
-        "@vendor_ts__cfg_aliases-0.2.1//:cfg_aliases",
-    ],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.8.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.8.1.bazel
new file mode 100644
index 000000000000..1eb13ca6ae9f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.8.1.bazel
@@ -0,0 +1,183 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "borsh",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=borsh",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.8.1",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    emit_warnings = False,
+    pkg_name = "borsh",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=borsh",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.8.1",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor_ts__cfg_aliases-0.2.2//:cfg_aliases",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.14.bazel
index 1238ed9a02bf..819b934ab728 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.14.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.14.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bs58-0.5.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bs58-0.5.1.bazel
new file mode 100644
index 000000000000..af86c7435264
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bs58-0.5.1.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "bs58",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=bs58",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.5.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.12.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.12.0.bazel
deleted file mode 100644
index efe6232bbf79..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.12.0.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "bstr",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=bstr",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.12.0",
-    deps = [
-        "@vendor_ts__memchr-2.7.5//:memchr",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.12.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.12.1.bazel
new file mode 100644
index 000000000000..b081b908de87
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.12.1.bazel
@@ -0,0 +1,118 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "bstr",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=bstr",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.12.1",
+    deps = [
+        "@vendor_ts__memchr-2.8.3//:memchr",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.19.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.19.0.bazel
deleted file mode 100644
index 223a747c07a0..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.19.0.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "bumpalo",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=bumpalo",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "3.19.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.20.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.20.3.bazel
new file mode 100644
index 000000000000..557cc44f2661
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.20.3.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "bumpalo",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=bumpalo",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "3.20.3",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.23.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.23.2.bazel
deleted file mode 100644
index 6ef9d8ce9187..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.23.2.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "bytemuck",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=bytemuck",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.23.2",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.25.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.25.0.bazel
new file mode 100644
index 000000000000..d7ccd6d4bb76
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.25.0.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "bytemuck",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=bytemuck",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.25.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytes-1.12.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytes-1.12.1.bazel
new file mode 100644
index 000000000000..1c58ac64f985
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytes-1.12.1.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "bytes",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=bytes",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.12.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.12.bazel
deleted file mode 100644
index 250bb124b510..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.12.bazel
+++ /dev/null
@@ -1,171 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "camino",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "serde",
-        "serde1",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=camino",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.1.12",
-    deps = [
-        "@vendor_ts__camino-1.1.12//:build_script_build",
-        "@vendor_ts__serde-1.0.228//:serde",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "serde",
-        "serde1",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "camino",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=camino",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.1.12",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.2.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.2.6.bazel
new file mode 100644
index 000000000000..3180d6ac3a19
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.2.6.bazel
@@ -0,0 +1,187 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "camino",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "serde1",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=camino",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.2.6",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__serde_core-1.0.229//:serde_core",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "serde1",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "camino",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=camino",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.2.6",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.2.0.bazel
deleted file mode 100644
index 1a1a383b6390..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.2.0.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "cargo_platform",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=cargo-platform",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.0",
-    deps = [
-        "@vendor_ts__serde-1.0.228//:serde",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.3.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.3.3.bazel
new file mode 100644
index 000000000000..73de9722da6b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.3.3.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "cargo_platform",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cargo-platform",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.3",
+    deps = [
+        "@vendor_ts__serde_core-1.0.229//:serde_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.8.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.8.2.bazel
deleted file mode 100644
index 79d9696b3cd8..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.8.2.bazel
+++ /dev/null
@@ -1,107 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "cargo_util_schemas",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=cargo-util-schemas",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.2",
-    deps = [
-        "@vendor_ts__semver-1.0.28//:semver",
-        "@vendor_ts__serde-1.0.228//:serde",
-        "@vendor_ts__serde-untagged-0.1.8//:serde_untagged",
-        "@vendor_ts__serde-value-0.7.0//:serde_value",
-        "@vendor_ts__thiserror-2.0.18//:thiserror",
-        "@vendor_ts__toml-0.8.23//:toml",
-        "@vendor_ts__unicode-xid-0.2.6//:unicode_xid",
-        "@vendor_ts__url-2.5.7//:url",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.21.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.21.0.bazel
deleted file mode 100644
index 10cd194b507d..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.21.0.bazel
+++ /dev/null
@@ -1,109 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "cargo_metadata",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=cargo_metadata",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.21.0",
-    deps = [
-        "@vendor_ts__camino-1.1.12//:camino",
-        "@vendor_ts__cargo-platform-0.2.0//:cargo_platform",
-        "@vendor_ts__cargo-util-schemas-0.8.2//:cargo_util_schemas",
-        "@vendor_ts__semver-1.0.28//:semver",
-        "@vendor_ts__serde-1.0.228//:serde",
-        "@vendor_ts__serde_json-1.0.145//:serde_json",
-        "@vendor_ts__thiserror-2.0.18//:thiserror",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.23.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.23.1.bazel
new file mode 100644
index 000000000000..cf41820c13b2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.23.1.bazel
@@ -0,0 +1,122 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "cargo_metadata",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cargo_metadata",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.23.1",
+    deps = [
+        "@vendor_ts__camino-1.2.6//:camino",
+        "@vendor_ts__cargo-platform-0.3.3//:cargo_platform",
+        "@vendor_ts__semver-1.0.28//:semver",
+        "@vendor_ts__serde-1.0.229//:serde",
+        "@vendor_ts__serde_json-1.0.154//:serde_json",
+        "@vendor_ts__thiserror-2.0.20//:thiserror",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.61.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.61.bazel
deleted file mode 100644
index 4071cd592439..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.61.bazel
+++ /dev/null
@@ -1,143 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "cc",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "parallel",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=cc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.2.61",
-    deps = [
-        "@vendor_ts__find-msvc-tools-0.1.9//:find_msvc_tools",
-        "@vendor_ts__jobserver-0.1.34//:jobserver",
-        "@vendor_ts__shlex-1.3.0//:shlex",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # aarch64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # aarch64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # arm-unknown-linux-gnueabi
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # i686-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # powerpc-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # riscv64gc-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # s390x-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # x86_64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.175//:libc",  # x86_64-unknown-freebsd
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # x86_64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.4.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.4.6.bazel
new file mode 100644
index 000000000000..0b3c82a27505
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.4.6.bazel
@@ -0,0 +1,160 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "cc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "parallel",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.4.6",
+    deps = [
+        "@vendor_ts__find-msvc-tools-0.1.12//:find_msvc_tools",
+        "@vendor_ts__jobserver-0.1.35//:jobserver",
+        "@vendor_ts__shlex-2.0.1//:shlex",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # aarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # arm-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # i686-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # loongarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # riscv64gc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # x86_64-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # x86_64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.3.bazel
deleted file mode 100644
index 66d5b40eb232..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.3.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "cfg_if",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=cfg-if",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.3",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.4.bazel
new file mode 100644
index 000000000000..d4bd1e6e175c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.4.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "cfg_if",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cfg-if",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.4",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.1.bazel
deleted file mode 100644
index 3845773a67b4..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.1.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "cfg_aliases",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=cfg_aliases",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.1",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.2.bazel
new file mode 100644
index 000000000000..2fb7dabb61f8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.2.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "cfg_aliases",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cfg_aliases",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chacha20-0.10.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chacha20-0.10.2.bazel
new file mode 100644
index 000000000000..61bbea6c8b7a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chacha20-0.10.2.bazel
@@ -0,0 +1,168 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "chacha20",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "rng",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=chacha20",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.10.2",
+    deps = [
+        "@vendor_ts__cfg-if-1.0.4//:cfg_if",
+        "@vendor_ts__rand_core-0.10.1//:rand_core",
+    ] + select({
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [
+            "@vendor_ts__cpufeatures-0.3.1//:cpufeatures",  # cfg(any(target_arch = "x86_64", target_arch = "x86"))
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.103.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.103.0.bazel
deleted file mode 100644
index d43c7b6b893d..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.103.0.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "chalk_derive",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=chalk-derive",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.103.0",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-        "@vendor_ts__synstructure-0.13.2//:synstructure",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.104.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.104.0.bazel
index c7b526db2fb6..ddebd069a0fe 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.104.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.104.0.bazel
@@ -52,12 +52,14 @@ rust_proc_macro(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_proc_macro(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -95,9 +109,9 @@ rust_proc_macro(
     }),
     version = "0.104.0",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
         "@vendor_ts__synstructure-0.13.2//:synstructure",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.103.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.103.0.bazel
deleted file mode 100644
index 7f20b012de96..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.103.0.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "chalk_ir",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    proc_macro_deps = [
-        "@vendor_ts__chalk-derive-0.103.0//:chalk_derive",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=chalk-ir",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.103.0",
-    deps = [
-        "@vendor_ts__bitflags-2.9.4//:bitflags",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.104.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.104.0.bazel
index 2d796bef0b65..df1202b8b8e8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.104.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.104.0.bazel
@@ -55,12 +55,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -72,13 +74,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -86,6 +99,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -98,6 +112,6 @@ rust_library(
     }),
     version = "0.104.0",
     deps = [
-        "@vendor_ts__bitflags-2.9.4//:bitflags",
+        "@vendor_ts__bitflags-2.13.2//:bitflags",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.103.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.103.0.bazel
deleted file mode 100644
index b5bb39ea428c..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.103.0.bazel
+++ /dev/null
@@ -1,106 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "chalk_recursive",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    proc_macro_deps = [
-        "@vendor_ts__chalk-derive-0.103.0//:chalk_derive",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=chalk-recursive",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.103.0",
-    deps = [
-        "@vendor_ts__chalk-ir-0.103.0//:chalk_ir",
-        "@vendor_ts__chalk-solve-0.103.0//:chalk_solve",
-        "@vendor_ts__rustc-hash-1.1.0//:rustc_hash",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.103.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.103.0.bazel
deleted file mode 100644
index 4fb684fec28b..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.103.0.bazel
+++ /dev/null
@@ -1,109 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "chalk_solve",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    proc_macro_deps = [
-        "@vendor_ts__chalk-derive-0.103.0//:chalk_derive",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=chalk-solve",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.103.0",
-    deps = [
-        "@vendor_ts__chalk-ir-0.103.0//:chalk_ir",
-        "@vendor_ts__ena-0.14.3//:ena",
-        "@vendor_ts__indexmap-2.14.0//:indexmap",
-        "@vendor_ts__itertools-0.12.1//:itertools",
-        "@vendor_ts__petgraph-0.6.5//:petgraph",
-        "@vendor_ts__rustc-hash-1.1.0//:rustc_hash",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.42.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.42.bazel
deleted file mode 100644
index 41e2b0285ecc..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.42.bazel
+++ /dev/null
@@ -1,212 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "chrono",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "clock",
-        "default",
-        "iana-time-zone",
-        "js-sys",
-        "now",
-        "oldtime",
-        "serde",
-        "std",
-        "wasm-bindgen",
-        "wasmbind",
-        "winapi",
-        "windows-link",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=chrono",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.42",
-    deps = [
-        "@vendor_ts__num-traits-0.2.19//:num_traits",
-        "@vendor_ts__serde-1.0.228//:serde",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-apple-ios
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-apple-ios-sim
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-linux-android
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-link-0.2.0//:windows_link",  # aarch64-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-unknown-fuchsia
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-unknown-nto-qnx710
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # arm-unknown-linux-gnueabi
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # arm-unknown-linux-musleabi
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # armv7-linux-androideabi
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # armv7-unknown-linux-gnueabi
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # i686-apple-darwin
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # i686-linux-android
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-link-0.2.0//:windows_link",  # i686-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # i686-unknown-freebsd
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # i686-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # powerpc-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # riscv64gc-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # s390x-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # wasm32-unknown-emscripten
-        ],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [
-            "@vendor_ts__js-sys-0.3.78//:js_sys",  # wasm32-unknown-unknown
-            "@vendor_ts__wasm-bindgen-0.2.101//:wasm_bindgen",  # wasm32-unknown-unknown
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-apple-ios
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-linux-android
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-link-0.2.0//:windows_link",  # x86_64-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-unknown-freebsd
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-unknown-fuchsia
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.45.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.45.bazel
new file mode 100644
index 000000000000..1b4e09146988
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.45.bazel
@@ -0,0 +1,250 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "chrono",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "clock",
+        "default",
+        "iana-time-zone",
+        "js-sys",
+        "now",
+        "oldtime",
+        "serde",
+        "std",
+        "wasm-bindgen",
+        "wasmbind",
+        "winapi",
+        "windows-link",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=chrono",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.45",
+    deps = [
+        "@vendor_ts__num-traits-0.2.19//:num_traits",
+        "@vendor_ts__serde-1.0.229//:serde",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # aarch64-apple-ios
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # aarch64-apple-ios-macabi
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # aarch64-apple-ios-sim
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # aarch64-linux-android
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-link-0.2.1//:windows_link",  # aarch64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # aarch64-unknown-fuchsia
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # aarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # aarch64-unknown-nto-qnx710
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # arm-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # arm-unknown-linux-musleabi
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # armv7-linux-androideabi
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # armv7-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # i686-apple-darwin
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # i686-linux-android
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-link-0.2.1//:windows_link",  # i686-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # i686-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # i686-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # loongarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # mips-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # riscv64gc-unknown-fuchsia
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # riscv64gc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # sparc64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # sparc64-unknown-netbsd
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # sparc64-unknown-openbsd
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # wasm32-unknown-emscripten
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [
+            "@vendor_ts__js-sys-0.3.103//:js_sys",  # wasm32-unknown-unknown
+            "@vendor_ts__wasm-bindgen-0.2.126//:wasm_bindgen",  # wasm32-unknown-unknown
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # x86_64-apple-ios
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # x86_64-apple-ios-macabi
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # x86_64-linux-android
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-link-0.2.1//:windows_link",  # x86_64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # x86_64-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # x86_64-unknown-fuchsia
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # x86_64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.65//:iana_time_zone",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.48.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.48.bazel
deleted file mode 100644
index 1ef4252fc093..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.48.bazel
+++ /dev/null
@@ -1,113 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "clap",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "color",
-        "default",
-        "derive",
-        "error-context",
-        "help",
-        "std",
-        "suggestions",
-        "usage",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__clap_derive-4.5.47//:clap_derive",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=clap",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "4.5.48",
-    deps = [
-        "@vendor_ts__clap_builder-4.5.48//:clap_builder",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.6.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.6.7.bazel
new file mode 100644
index 000000000000..afafcf99b7f3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.6.7.bazel
@@ -0,0 +1,127 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "clap",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "color",
+        "default",
+        "derive",
+        "error-context",
+        "help",
+        "std",
+        "suggestions",
+        "usage",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__clap_derive-4.6.7//:clap_derive",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=clap",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "4.6.7",
+    deps = [
+        "@vendor_ts__clap_builder-4.6.7//:clap_builder",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.48.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.48.bazel
deleted file mode 100644
index f15804a69287..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.48.bazel
+++ /dev/null
@@ -1,111 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "clap_builder",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "color",
-        "error-context",
-        "help",
-        "std",
-        "suggestions",
-        "usage",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=clap_builder",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "4.5.48",
-    deps = [
-        "@vendor_ts__anstream-0.6.20//:anstream",
-        "@vendor_ts__anstyle-1.0.11//:anstyle",
-        "@vendor_ts__clap_lex-0.7.5//:clap_lex",
-        "@vendor_ts__strsim-0.11.1//:strsim",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.6.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.6.7.bazel
new file mode 100644
index 000000000000..1c641a988b0f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.6.7.bazel
@@ -0,0 +1,125 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "clap_builder",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "color",
+        "error-context",
+        "help",
+        "std",
+        "suggestions",
+        "usage",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=clap_builder",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "4.6.7",
+    deps = [
+        "@vendor_ts__anstream-1.0.0//:anstream",
+        "@vendor_ts__anstyle-1.0.14//:anstyle",
+        "@vendor_ts__clap_lex-1.1.1//:clap_lex",
+        "@vendor_ts__strsim-0.11.1//:strsim",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.47.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.47.bazel
deleted file mode 100644
index d203b2121e87..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.47.bazel
+++ /dev/null
@@ -1,106 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "clap_derive",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=clap_derive",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "4.5.47",
-    deps = [
-        "@vendor_ts__heck-0.5.0//:heck",
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.6.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.6.7.bazel
new file mode 100644
index 000000000000..e1b037abc136
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.6.7.bazel
@@ -0,0 +1,120 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "clap_derive",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=clap_derive",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "4.6.7",
+    deps = [
+        "@vendor_ts__heck-0.5.0//:heck",
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-3.0.9//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.5.bazel
deleted file mode 100644
index a5a6cca1fe85..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.5.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "clap_lex",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=clap_lex",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.7.5",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-1.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-1.1.1.bazel
new file mode 100644
index 000000000000..b986bd49a2ff
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-1.1.1.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "clap_lex",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=clap_lex",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cobs-0.3.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cobs-0.3.0.bazel
new file mode 100644
index 000000000000..7ccc36c1b404
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cobs-0.3.0.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "cobs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cobs",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.0",
+    deps = [
+        "@vendor_ts__thiserror-2.0.20//:thiserror",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.4.bazel
deleted file mode 100644
index 5956c5ff8f7f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.4.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "colorchoice",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=colorchoice",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.4",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.5.bazel
new file mode 100644
index 000000000000..083214c2ec83
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.5.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "colorchoice",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=colorchoice",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.5",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.core-foundation-sys-0.8.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.core-foundation-sys-0.8.7.bazel
index fdbed4c6dc75..9be39ffb26d8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.core-foundation-sys-0.8.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.core-foundation-sys-0.8.7.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.countme-3.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.countme-3.0.1.bazel
index 24e1b277c8e6..1ebbc222c8c0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.countme-3.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.countme-3.0.1.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.1.0.bazel
deleted file mode 100644
index ca4a3e64b05f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.1.0.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "cov_mark",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "enable",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=cov-mark",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.1.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.2.0.bazel
new file mode 100644
index 000000000000..acd27bf8b539
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.2.0.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "cov_mark",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "enable",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cov-mark",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.2.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cpufeatures-0.3.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cpufeatures-0.3.1.bazel
new file mode 100644
index 000000000000..32cf7f63e27d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cpufeatures-0.3.1.bazel
@@ -0,0 +1,138 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "cpufeatures",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=cpufeatures",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.1",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_arch = "aarch64", target_vendor = "apple"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_arch = "aarch64", target_vendor = "apple"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_arch = "aarch64", target_vendor = "apple"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_arch = "aarch64", target_vendor = "apple"))
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_arch = "aarch64", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_arch = "aarch64", target_os = "linux"))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_arch = "aarch64", target_os = "linux"))
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_arch = "loongarch64", target_os = "linux"))
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.5.0.bazel
index 46c3fb30a597..9b3f592cc34d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.5.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.5.0.bazel
@@ -60,12 +60,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -77,13 +79,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -91,6 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -103,8 +117,8 @@ rust_library(
     }),
     version = "1.5.0",
     deps = [
-        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
-        "@vendor_ts__crc32fast-1.5.0//:build_script_build",
+        ":build_script_build",
+        "@vendor_ts__cfg-if-1.0.4//:cfg_if",
     ],
 )
 
@@ -114,6 +128,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -146,6 +163,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "crc32fast",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.15.bazel
deleted file mode 100644
index 3a6999466ae1..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.15.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "crossbeam_channel",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=crossbeam-channel",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.5.15",
-    deps = [
-        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.17.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.17.bazel
new file mode 100644
index 000000000000..9b6519fbb399
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.17.bazel
@@ -0,0 +1,118 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "crossbeam_channel",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-channel",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.5.17",
+    deps = [
+        "@vendor_ts__crossbeam-utils-0.8.23//:crossbeam_utils",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel
deleted file mode 100644
index 5d08b0a7259b..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "crossbeam_deque",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=crossbeam-deque",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.6",
-    deps = [
-        "@vendor_ts__crossbeam-epoch-0.9.18//:crossbeam_epoch",
-        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.8.bazel
new file mode 100644
index 000000000000..7b0843bd4d8e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.8.bazel
@@ -0,0 +1,190 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "crossbeam_deque",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-deque",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.8",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__crossbeam-epoch-0.9.21//:crossbeam_epoch",
+        "@vendor_ts__crossbeam-utils-0.8.23//:crossbeam_utils",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "crossbeam-deque",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-deque",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.8.8",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel
deleted file mode 100644
index bded5897eb8e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "crossbeam_epoch",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=crossbeam-epoch",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.9.18",
-    deps = [
-        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.21.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.21.bazel
new file mode 100644
index 000000000000..a0d9b27a60b5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.21.bazel
@@ -0,0 +1,189 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "crossbeam_epoch",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-epoch",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.21",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__crossbeam-utils-0.8.23//:crossbeam_utils",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "crossbeam-epoch",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-epoch",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.9.21",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel
deleted file mode 100644
index 18797ac294ca..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "crossbeam_queue",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=crossbeam-queue",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.3.12",
-    deps = [
-        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.14.bazel
new file mode 100644
index 000000000000..07bd4d3f7565
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.14.bazel
@@ -0,0 +1,119 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "crossbeam_queue",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-queue",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.14",
+    deps = [
+        "@vendor_ts__crossbeam-utils-0.8.23//:crossbeam_utils",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel
deleted file mode 100644
index ba484864b400..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel
+++ /dev/null
@@ -1,170 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "crossbeam_utils",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=crossbeam-utils",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.21",
-    deps = [
-        "@vendor_ts__crossbeam-utils-0.8.21//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "crossbeam-utils",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=crossbeam-utils",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.8.21",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.23.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.23.bazel
new file mode 100644
index 000000000000..cde028f5e7e3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.23.bazel
@@ -0,0 +1,188 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "crossbeam_utils",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-utils",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.23",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "crossbeam-utils",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-utils",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.8.23",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.21.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.21.3.bazel
deleted file mode 100644
index a9572a79a814..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.21.3.bazel
+++ /dev/null
@@ -1,107 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "darling",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "suggestions",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__darling_macro-0.21.3//:darling_macro",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=darling",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.21.3",
-    deps = [
-        "@vendor_ts__darling_core-0.21.3//:darling_core",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.24.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.24.1.bazel
new file mode 100644
index 000000000000..8ab407c520b5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.24.1.bazel
@@ -0,0 +1,121 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "darling",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "suggestions",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor_ts__darling_macro-0.24.1//:darling_macro",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=darling",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.24.1",
+    deps = [
+        "@vendor_ts__darling_core-0.24.1//:darling_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.21.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.21.3.bazel
deleted file mode 100644
index 22e3ea592f61..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.21.3.bazel
+++ /dev/null
@@ -1,109 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "darling_core",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "strsim",
-        "suggestions",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=darling_core",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.21.3",
-    deps = [
-        "@vendor_ts__fnv-1.0.7//:fnv",
-        "@vendor_ts__ident_case-1.0.1//:ident_case",
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__strsim-0.11.1//:strsim",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.24.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.24.1.bazel
new file mode 100644
index 000000000000..7edc6a17fc7c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.24.1.bazel
@@ -0,0 +1,122 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "darling_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "strsim",
+        "suggestions",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=darling_core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.24.1",
+    deps = [
+        "@vendor_ts__ident_case-1.0.1//:ident_case",
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__strsim-0.11.1//:strsim",
+        "@vendor_ts__syn-3.0.9//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.21.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.21.3.bazel
deleted file mode 100644
index 99c3af7e2e4f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.21.3.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "darling_macro",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=darling_macro",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.21.3",
-    deps = [
-        "@vendor_ts__darling_core-0.21.3//:darling_core",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.24.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.24.1.bazel
new file mode 100644
index 000000000000..65c54ccf86b9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.24.1.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "darling_macro",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=darling_macro",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.24.1",
+    deps = [
+        "@vendor_ts__darling_core-0.24.1//:darling_core",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-3.0.9//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-6.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-6.1.0.bazel
deleted file mode 100644
index c9a20e45392f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-6.1.0.bazel
+++ /dev/null
@@ -1,109 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "dashmap",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "inline",
-        "raw-api",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=dashmap",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "6.1.0",
-    deps = [
-        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
-        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
-        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
-        "@vendor_ts__lock_api-0.4.13//:lock_api",
-        "@vendor_ts__once_cell-1.21.3//:once_cell",
-        "@vendor_ts__parking_lot_core-0.9.11//:parking_lot_core",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-6.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-6.2.1.bazel
new file mode 100644
index 000000000000..3317487d5e55
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-6.2.1.bazel
@@ -0,0 +1,123 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "dashmap",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "inline",
+        "raw-api",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=dashmap",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "6.2.1",
+    deps = [
+        "@vendor_ts__cfg-if-1.0.4//:cfg_if",
+        "@vendor_ts__crossbeam-utils-0.8.23//:crossbeam_utils",
+        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
+        "@vendor_ts__lock_api-0.4.14//:lock_api",
+        "@vendor_ts__once_cell-1.21.4//:once_cell",
+        "@vendor_ts__parking_lot_core-0.9.12//:parking_lot_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.defmt-1.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.defmt-1.1.1.bazel
new file mode 100644
index 000000000000..2d2e8cb5ed5d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.defmt-1.1.1.bazel
@@ -0,0 +1,185 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "defmt",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor_ts__defmt-macros-1.1.1//:defmt_macros",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=defmt",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.1",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__bitflags-1.3.2//:bitflags",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    links = "defmt",
+    pkg_name = "defmt",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=defmt",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.1.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.defmt-macros-1.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.defmt-macros-1.1.1.bazel
new file mode 100644
index 000000000000..aac6952874a0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.defmt-macros-1.1.1.bazel
@@ -0,0 +1,184 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "defmt_macros",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=defmt-macros",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.1",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__defmt-parser-1.0.0//:defmt_parser",
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "defmt-macros",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=defmt-macros",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.1.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.defmt-parser-1.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.defmt-parser-1.0.0.bazel
new file mode 100644
index 000000000000..a551c929855c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.defmt-parser-1.0.0.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "defmt_parser",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=defmt-parser",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.0",
+    deps = [
+        "@vendor_ts__thiserror-2.0.20//:thiserror",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.5.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.5.3.bazel
deleted file mode 100644
index 850713a2e455..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.5.3.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "deranged",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=deranged",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.5.3",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.5.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.5.8.bazel
new file mode 100644
index 000000000000..49a4bcf90619
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.5.8.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "deranged",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=deranged",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.5.8",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.derive-where-1.6.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.derive-where-1.6.1.bazel
new file mode 100644
index 000000000000..640008bde8eb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.derive-where-1.6.1.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "derive_where",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=derive-where",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.6.1",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.displaydoc-0.2.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.displaydoc-0.2.5.bazel
deleted file mode 100644
index 41aae8ab1ecc..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.displaydoc-0.2.5.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "displaydoc",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=displaydoc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.5",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dissimilar-1.0.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dissimilar-1.0.11.bazel
new file mode 100644
index 000000000000..fe2313763436
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dissimilar-1.0.11.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "dissimilar",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=dissimilar",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.11",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.drop_bomb-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.drop_bomb-0.1.5.bazel
index d63db7ce6aa5..d34c3b953ea5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.drop_bomb-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.drop_bomb-0.1.5.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel
index c47d2917bf68..4af007fda360 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.20.bazel
index 40f78950a02f..ab82405b98e9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.20.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.20.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel
deleted file mode 100644
index f0853ff36b75..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "either",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-        "use_std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=either",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.15.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.19.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.19.0.bazel
new file mode 100644
index 000000000000..3993e8f4f986
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.19.0.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "either",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+        "use_std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=either",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.19.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.embedded-io-0.4.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.embedded-io-0.4.0.bazel
new file mode 100644
index 000000000000..3e4b84dba6f5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.embedded-io-0.4.0.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "embedded_io",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=embedded-io",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.embedded-io-0.6.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.embedded-io-0.6.1.bazel
new file mode 100644
index 000000000000..a4c634d7a8c2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.embedded-io-0.6.1.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "embedded_io",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=embedded-io",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.6.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel
deleted file mode 100644
index c59d0a9a3162..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ena",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ena",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.14.3",
-    deps = [
-        "@vendor_ts__log-0.4.28//:log",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.4.bazel
new file mode 100644
index 000000000000..7022cc97e43d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.4.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ena",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ena",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.14.4",
+    deps = [
+        "@vendor_ts__log-0.4.34//:log",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
index c88ddeb86a83..a40f6a3aac71 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel
index fc81caebaa98..a42e4a599bcb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
index 6776c8f8f2fb..dcf8733b237c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
index cd8250d7be68..d3c6c44cf730 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
index 3466817c9f05..f9b6e9842b8a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
index e98585004e60..5639d7c37ca8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding_index_tests-0.1.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding_index_tests-0.1.4.bazel
index 987bc9667d30..08e7f5248170 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding_index_tests-0.1.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding_index_tests-0.1.4.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.2.bazel
index 251b726dcc9d..b27eec3e1acc 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.2.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.erased-serde-0.4.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.erased-serde-0.4.6.bazel
deleted file mode 100644
index 7c25af547746..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.erased-serde-0.4.6.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "erased_serde",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=erased-serde",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.6",
-    deps = [
-        "@vendor_ts__serde-1.0.228//:serde",
-        "@vendor_ts__typeid-1.0.3//:typeid",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel
index 4bb767ff10e1..d7587ad876cb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel
@@ -63,12 +63,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -80,13 +82,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -94,6 +107,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -106,9 +120,9 @@ rust_library(
     }),
     version = "0.10.19",
     deps = [
-        "@vendor_ts__figment-0.10.19//:build_script_build",
+        ":build_script_build",
         "@vendor_ts__pear-0.2.9//:pear",
-        "@vendor_ts__serde-1.0.228//:serde",
+        "@vendor_ts__serde-1.0.229//:serde",
         "@vendor_ts__serde_yaml-0.9.34-deprecated//:serde_yaml",
         "@vendor_ts__uncased-0.9.10//:uncased",
     ] + select({
@@ -139,18 +153,36 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
             "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
             "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [
             "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [
             "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [
             "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
             "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
@@ -176,6 +208,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -211,6 +246,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    emit_warnings = False,
     pkg_name = "figment",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.find-msvc-tools-0.1.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.find-msvc-tools-0.1.12.bazel
new file mode 100644
index 000000000000..0fa51018e605
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.find-msvc-tools-0.1.12.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "find_msvc_tools",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=find-msvc-tools",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.12",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.find-msvc-tools-0.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.find-msvc-tools-0.1.9.bazel
deleted file mode 100644
index 12cd2ecbe0cc..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.find-msvc-tools-0.1.9.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "find_msvc_tools",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=find-msvc-tools",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.9",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.4.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.4.2.bazel
deleted file mode 100644
index b41f13ec6e51..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.4.2.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "fixedbitset",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=fixedbitset",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.2",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.5.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.5.7.bazel
new file mode 100644
index 000000000000..c2449e91c3db
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.5.7.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "fixedbitset",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=fixedbitset",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.5.7",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.2.bazel
deleted file mode 100644
index efc1a622b666..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.2.bazel
+++ /dev/null
@@ -1,107 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "flate2",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "any_impl",
-        "default",
-        "miniz_oxide",
-        "rust_backend",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=flate2",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.1.2",
-    deps = [
-        "@vendor_ts__crc32fast-1.5.0//:crc32fast",
-        "@vendor_ts__miniz_oxide-0.8.9//:miniz_oxide",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.9.bazel
new file mode 100644
index 000000000000..561edd0aaf02
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.9.bazel
@@ -0,0 +1,121 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "flate2",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "any_impl",
+        "default",
+        "miniz_oxide",
+        "rust_backend",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=flate2",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.9",
+    deps = [
+        "@vendor_ts__crc32fast-1.5.0//:crc32fast",
+        "@vendor_ts__miniz_oxide-0.8.9//:miniz_oxide",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fnv-1.0.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fnv-1.0.7.bazel
deleted file mode 100644
index 80252992a212..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fnv-1.0.7.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "fnv",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=fnv",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.7",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel
index 8fc2c7d51b89..f5fb0c95b311 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.2.0.bazel
new file mode 100644
index 000000000000..3cce27df7f0b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.2.0.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "foldhash",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=foldhash",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.form_urlencoded-1.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.form_urlencoded-1.2.2.bazel
deleted file mode 100644
index 7d4cbdcdecb7..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.form_urlencoded-1.2.2.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "form_urlencoded",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=form_urlencoded",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.2.2",
-    deps = [
-        "@vendor_ts__percent-encoding-2.3.2//:percent_encoding",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-2.11.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-2.11.0.bazel
deleted file mode 100644
index 657e1cd8a4aa..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-2.11.0.bazel
+++ /dev/null
@@ -1,165 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "fs_err",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=fs-err",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.11.0",
-    deps = [
-        "@vendor_ts__fs-err-2.11.0//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "fs-err",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=fs-err",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "2.11.0",
-    visibility = ["//visibility:private"],
-    deps = [
-        "@vendor_ts__autocfg-1.5.0//:autocfg",
-    ],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel
index cb938292839d..8634bb1c5976 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -95,6 +109,6 @@ rust_library(
     }),
     version = "4.1.0",
     deps = [
-        "@vendor_ts__libc-0.2.175//:libc",
+        "@vendor_ts__libc-0.2.189//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
index 484accede2c0..24a3312e0c75 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
@@ -59,12 +59,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -76,13 +78,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -90,6 +103,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -102,7 +116,7 @@ rust_library(
     }),
     version = "0.4.7",
     deps = [
-        "@vendor_ts__fst-0.4.7//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -112,6 +126,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -143,6 +160,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    emit_warnings = False,
     pkg_name = "fst",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.futures-core-0.3.34.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.futures-core-0.3.34.bazel
new file mode 100644
index 000000000000..445ed8434c8a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.futures-core-0.3.34.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "futures_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=futures-core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.34",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.futures-task-0.3.34.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.futures-task-0.3.34.bazel
new file mode 100644
index 000000000000..eeaeffa74a4f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.futures-task-0.3.34.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "futures_task",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=futures-task",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.34",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.futures-util-0.3.34.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.futures-util-0.3.34.bazel
new file mode 100644
index 000000000000..fb6225136bc4
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.futures-util-0.3.34.bazel
@@ -0,0 +1,122 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "futures_util",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "slab",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=futures-util",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.34",
+    deps = [
+        "@vendor_ts__futures-core-0.3.34//:futures_core",
+        "@vendor_ts__futures-task-0.3.34//:futures_task",
+        "@vendor_ts__pin-project-lite-0.2.17//:pin_project_lite",
+        "@vendor_ts__slab-0.4.12//:slab",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.3.bazel
deleted file mode 100644
index d09e3ce7a4a5..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.3.bazel
+++ /dev/null
@@ -1,249 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "getrandom",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=getrandom",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.3.3",
-    deps = [
-        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
-        "@vendor_ts__getrandom-0.3.3//:build_script_build",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "haiku", target_os = "redox", target_os = "nto", target_os = "aix"))
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", target_os = "cygwin", all(target_os = "horizon", target_arch = "arm")))
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
-        ],
-        "@rules_rust//rust/platform:wasm32-wasip2": [
-            "@vendor_ts__wasi-0.14.5-wasi-0.2.4//:wasi",  # cfg(all(target_arch = "wasm32", target_os = "wasi", target_env = "p2"))
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", target_os = "cygwin", all(target_os = "horizon", target_arch = "arm")))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "//conditions:default": [],
-    }),
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "std",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "getrandom",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=getrandom",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.3.3",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.4.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.4.3.bazel
new file mode 100644
index 000000000000..c76fa3da0cc7
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.4.3.bazel
@@ -0,0 +1,288 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "getrandom",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "std",
+        "sys_rng",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=getrandom",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.3",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__cfg-if-1.0.4//:cfg_if",
+        "@vendor_ts__rand_core-0.10.1//:rand_core",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "haiku", target_os = "redox", target_os = "nto", target_os = "aix"))
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", target_os = "cygwin", all(target_os = "horizon", target_arch = "arm")))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(target_os = "netbsd")
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", target_os = "cygwin", all(target_os = "horizon", target_arch = "arm")))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "//conditions:default": [],
+    }),
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "std",
+        "sys_rng",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2024",
+    emit_warnings = False,
+    pkg_name = "getrandom",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=getrandom",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.4.3",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.3.bazel
deleted file mode 100644
index d26541b4fca7..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.3.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "glob",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=glob",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.3.3",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.4.bazel
new file mode 100644
index 000000000000..78f5d7eabe26
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.4.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "glob",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=glob",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.4",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.16.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.16.bazel
deleted file mode 100644
index 0f83adee8e78..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.16.bazel
+++ /dev/null
@@ -1,108 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "globset",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "log",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=globset",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.16",
-    deps = [
-        "@vendor_ts__aho-corasick-1.1.3//:aho_corasick",
-        "@vendor_ts__bstr-1.12.0//:bstr",
-        "@vendor_ts__log-0.4.28//:log",
-        "@vendor_ts__regex-automata-0.4.11//:regex_automata",
-        "@vendor_ts__regex-syntax-0.8.6//:regex_syntax",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.18.bazel
new file mode 100644
index 000000000000..210ccec89fe6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.18.bazel
@@ -0,0 +1,122 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "globset",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "log",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=globset",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.18",
+    deps = [
+        "@vendor_ts__aho-corasick-1.1.5//:aho_corasick",
+        "@vendor_ts__bstr-1.12.1//:bstr",
+        "@vendor_ts__log-0.4.34//:log",
+        "@vendor_ts__regex-automata-0.4.18//:regex_automata",
+        "@vendor_ts__regex-syntax-0.8.11//:regex_syntax",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.12.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.12.3.bazel
index 83f146a6367b..61e09392a88e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.12.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.12.3.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel
index a485aa4c1e62..ab62494e42b5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.5.bazel
index a51bce9391ac..229875d1f585 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.5.bazel
@@ -35,12 +35,8 @@ rust_library(
         ],
     ),
     crate_features = [
-        "allocator-api2",
-        "default",
         "default-hasher",
-        "equivalent",
         "inline-more",
-        "raw-entry",
     ],
     crate_root = "src/lib.rs",
     edition = "2021",
@@ -60,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -77,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -91,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -103,8 +113,6 @@ rust_library(
     }),
     version = "0.15.5",
     deps = [
-        "@vendor_ts__allocator-api2-0.2.21//:allocator_api2",
-        "@vendor_ts__equivalent-1.0.2//:equivalent",
         "@vendor_ts__foldhash-0.1.5//:foldhash",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.17.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.17.1.bazel
index eba4862da685..325a8717ae7f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.17.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.17.1.bazel
@@ -34,6 +34,14 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
+    crate_features = [
+        "allocator-api2",
+        "default",
+        "default-hasher",
+        "equivalent",
+        "inline-more",
+        "raw-entry",
+    ],
     crate_root = "src/lib.rs",
     edition = "2024",
     rustc_env_files = [
@@ -52,12 +60,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +79,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -94,4 +116,9 @@ rust_library(
         "//conditions:default": ["@platforms//:incompatible"],
     }),
     version = "0.17.1",
+    deps = [
+        "@vendor_ts__allocator-api2-0.2.21//:allocator_api2",
+        "@vendor_ts__equivalent-1.0.2//:equivalent",
+        "@vendor_ts__foldhash-0.2.0//:foldhash",
+    ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashlink-0.10.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashlink-0.10.0.bazel
deleted file mode 100644
index badd7cb27219..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashlink-0.10.0.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "hashlink",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=hashlink",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.10.0",
-    deps = [
-        "@vendor_ts__hashbrown-0.15.5//:hashbrown",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashlink-0.12.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashlink-0.12.1.bazel
new file mode 100644
index 000000000000..4a3e80181bd0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashlink-0.12.1.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "hashlink",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=hashlink",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.12.1",
+    deps = [
+        "@vendor_ts__hashbrown-0.17.1//:hashbrown",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.5.0.bazel
index a8e52fe9b29f..c7a45752f2b9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.5.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.5.0.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.5.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.5.2.bazel
index 0db33a0a48a1..ee417cfe2923 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.5.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.5.2.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hex-0.4.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hex-0.4.3.bazel
index 702f649e1109..d0b43f01e73c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hex-0.4.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hex-0.4.3.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel
deleted file mode 100644
index 97b2f5a5b94b..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel
+++ /dev/null
@@ -1,109 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "home",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=home",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.5.11",
-    deps = select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.63.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.63.bazel
deleted file mode 100644
index d66d4803a463..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.63.bazel
+++ /dev/null
@@ -1,147 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "iana_time_zone",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "fallback",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=iana-time-zone",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.63",
-    deps = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-core-0.61.2//:windows_core",  # cfg(target_os = "windows")
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-core-0.61.2//:windows_core",  # cfg(target_os = "windows")
-        ],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [
-            "@vendor_ts__js-sys-0.3.78//:js_sys",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
-            "@vendor_ts__log-0.4.28//:log",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
-            "@vendor_ts__wasm-bindgen-0.2.101//:wasm_bindgen",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-core-0.61.2//:windows_core",  # cfg(target_os = "windows")
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.65.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.65.bazel
new file mode 100644
index 000000000000..d42d31e6d7f1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.65.bazel
@@ -0,0 +1,167 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "iana_time_zone",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "fallback",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=iana-time-zone",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.65",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-core-0.62.2//:windows_core",  # cfg(target_os = "windows")
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-core-0.62.2//:windows_core",  # cfg(target_os = "windows")
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [
+            "@vendor_ts__js-sys-0.3.103//:js_sys",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
+            "@vendor_ts__log-0.4.34//:log",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
+            "@vendor_ts__wasm-bindgen-0.2.126//:wasm_bindgen",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-core-0.62.2//:windows_core",  # cfg(target_os = "windows")
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel
index 582c31e06fb7..bfcce6b02c07 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,7 +113,7 @@ rust_library(
     }),
     version = "0.1.2",
     deps = [
-        "@vendor_ts__iana-time-zone-haiku-0.1.2//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -109,6 +123,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -137,6 +154,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    emit_warnings = False,
     pkg_name = "iana-time-zone-haiku",
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -154,7 +172,7 @@ cargo_build_script(
     version = "0.1.2",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.61//:cc",
+        "@vendor_ts__cc-1.4.6//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_collections-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_collections-2.0.0.bazel
deleted file mode 100644
index 4d6d31338250..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_collections-2.0.0.bazel
+++ /dev/null
@@ -1,106 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "icu_collections",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__displaydoc-0.2.5//:displaydoc",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=icu_collections",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.0",
-    deps = [
-        "@vendor_ts__potential_utf-0.1.3//:potential_utf",
-        "@vendor_ts__yoke-0.8.0//:yoke",
-        "@vendor_ts__zerofrom-0.1.6//:zerofrom",
-        "@vendor_ts__zerovec-0.11.4//:zerovec",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_locale_core-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_locale_core-2.0.0.bazel
deleted file mode 100644
index b0cb71a32999..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_locale_core-2.0.0.bazel
+++ /dev/null
@@ -1,109 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "icu_locale_core",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "zerovec",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__displaydoc-0.2.5//:displaydoc",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=icu_locale_core",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.0",
-    deps = [
-        "@vendor_ts__litemap-0.8.0//:litemap",
-        "@vendor_ts__tinystr-0.8.1//:tinystr",
-        "@vendor_ts__writeable-0.6.1//:writeable",
-        "@vendor_ts__zerovec-0.11.4//:zerovec",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer-2.0.0.bazel
deleted file mode 100644
index 460c5de79a2a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer-2.0.0.bazel
+++ /dev/null
@@ -1,110 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "icu_normalizer",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "compiled_data",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__displaydoc-0.2.5//:displaydoc",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=icu_normalizer",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.0",
-    deps = [
-        "@vendor_ts__icu_collections-2.0.0//:icu_collections",
-        "@vendor_ts__icu_normalizer_data-2.0.0//:icu_normalizer_data",
-        "@vendor_ts__icu_provider-2.0.0//:icu_provider",
-        "@vendor_ts__smallvec-1.15.1//:smallvec",
-        "@vendor_ts__zerovec-0.11.4//:zerovec",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer_data-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer_data-2.0.0.bazel
deleted file mode 100644
index f5367ece66c1..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer_data-2.0.0.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "icu_normalizer_data",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=icu_normalizer_data",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.0",
-    deps = [
-        "@vendor_ts__icu_normalizer_data-2.0.0//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "icu_normalizer_data",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=icu_normalizer_data",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "2.0.0",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties-2.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties-2.0.1.bazel
deleted file mode 100644
index 4416b8253053..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties-2.0.1.bazel
+++ /dev/null
@@ -1,112 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "icu_properties",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "compiled_data",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__displaydoc-0.2.5//:displaydoc",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=icu_properties",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.1",
-    deps = [
-        "@vendor_ts__icu_collections-2.0.0//:icu_collections",
-        "@vendor_ts__icu_locale_core-2.0.0//:icu_locale_core",
-        "@vendor_ts__icu_properties_data-2.0.1//:icu_properties_data",
-        "@vendor_ts__icu_provider-2.0.0//:icu_provider",
-        "@vendor_ts__potential_utf-0.1.3//:potential_utf",
-        "@vendor_ts__zerotrie-0.2.2//:zerotrie",
-        "@vendor_ts__zerovec-0.11.4//:zerovec",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties_data-2.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties_data-2.0.1.bazel
deleted file mode 100644
index e7aa78908e36..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties_data-2.0.1.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "icu_properties_data",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=icu_properties_data",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.1",
-    deps = [
-        "@vendor_ts__icu_properties_data-2.0.1//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "icu_properties_data",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=icu_properties_data",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "2.0.1",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_provider-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_provider-2.0.0.bazel
deleted file mode 100644
index 08e96e830c79..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_provider-2.0.0.bazel
+++ /dev/null
@@ -1,114 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "icu_provider",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "baked",
-        "zerotrie",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__displaydoc-0.2.5//:displaydoc",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=icu_provider",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.0",
-    deps = [
-        "@vendor_ts__icu_locale_core-2.0.0//:icu_locale_core",
-        "@vendor_ts__stable_deref_trait-1.2.0//:stable_deref_trait",
-        "@vendor_ts__tinystr-0.8.1//:tinystr",
-        "@vendor_ts__writeable-0.6.1//:writeable",
-        "@vendor_ts__yoke-0.8.0//:yoke",
-        "@vendor_ts__zerofrom-0.1.6//:zerofrom",
-        "@vendor_ts__zerotrie-0.2.2//:zerotrie",
-        "@vendor_ts__zerovec-0.11.4//:zerovec",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ident_case-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ident_case-1.0.1.bazel
index 44123d039086..770ac5e274a0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ident_case-1.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ident_case-1.0.1.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna-1.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna-1.1.0.bazel
deleted file mode 100644
index afb404176fd2..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna-1.1.0.bazel
+++ /dev/null
@@ -1,107 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "idna",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "compiled_data",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=idna",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.1.0",
-    deps = [
-        "@vendor_ts__idna_adapter-1.2.1//:idna_adapter",
-        "@vendor_ts__smallvec-1.15.1//:smallvec",
-        "@vendor_ts__utf8_iter-1.0.4//:utf8_iter",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna_adapter-1.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna_adapter-1.2.1.bazel
deleted file mode 100644
index 7f44f43eac20..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna_adapter-1.2.1.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "idna_adapter",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "compiled_data",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=idna_adapter",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.2.1",
-    deps = [
-        "@vendor_ts__icu_normalizer-2.0.0//:icu_normalizer",
-        "@vendor_ts__icu_properties-2.0.1//:icu_properties",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-1.9.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-1.9.3.bazel
index 13298f4aa2cd..faf4a2cbfc2a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-1.9.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-1.9.3.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,8 +113,8 @@ rust_library(
     }),
     version = "1.9.3",
     deps = [
+        ":build_script_build",
         "@vendor_ts__hashbrown-0.12.3//:hashbrown",
-        "@vendor_ts__indexmap-1.9.3//:build_script_build",
     ],
 )
 
@@ -110,6 +124,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -138,6 +155,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "indexmap",
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -155,7 +173,7 @@ cargo_build_script(
     version = "1.9.3",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__autocfg-1.5.0//:autocfg",
+        "@vendor_ts__autocfg-1.5.1//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.14.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.14.0.bazel
deleted file mode 100644
index 5a727af4c881..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.14.0.bazel
+++ /dev/null
@@ -1,107 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "indexmap",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "serde",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=indexmap",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.14.0",
-    deps = [
-        "@vendor_ts__equivalent-1.0.2//:equivalent",
-        "@vendor_ts__hashbrown-0.17.1//:hashbrown",
-        "@vendor_ts__serde_core-1.0.228//:serde_core",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.14.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.14.2.bazel
new file mode 100644
index 000000000000..0ef88f07acd5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.14.2.bazel
@@ -0,0 +1,121 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "indexmap",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "serde",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=indexmap",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.14.2",
+    deps = [
+        "@vendor_ts__equivalent-1.0.2//:equivalent",
+        "@vendor_ts__hashbrown-0.17.1//:hashbrown",
+        "@vendor_ts__serde_core-1.0.229//:serde_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inlinable_string-0.1.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inlinable_string-0.1.15.bazel
index 662494b3e799..42bdb1d1ea94 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inlinable_string-0.1.15.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inlinable_string-0.1.15.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel
deleted file mode 100644
index 6be5e3be9d96..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "inotify",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=inotify",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.11.0",
-    deps = [
-        "@vendor_ts__bitflags-2.9.4//:bitflags",
-        "@vendor_ts__inotify-sys-0.1.5//:inotify_sys",
-        "@vendor_ts__libc-0.2.175//:libc",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.5.bazel
new file mode 100644
index 000000000000..822309e10a1e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.5.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "inotify",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=inotify",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.11.5",
+    deps = [
+        "@vendor_ts__bitflags-2.13.2//:bitflags",
+        "@vendor_ts__inotify-sys-0.1.8//:inotify_sys",
+        "@vendor_ts__libc-0.2.189//:libc",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel
deleted file mode 100644
index 9316b8d907c5..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "inotify_sys",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=inotify-sys",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.5",
-    deps = [
-        "@vendor_ts__libc-0.2.175//:libc",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.8.bazel
new file mode 100644
index 000000000000..ce66bf4697ce
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.8.bazel
@@ -0,0 +1,181 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "inotify_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=inotify-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.8",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__libc-0.2.189//:libc",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2015",
+    emit_warnings = False,
+    pkg_name = "inotify-sys",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=inotify-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.1.8",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.intrusive-collections-0.10.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.intrusive-collections-0.10.3.bazel
new file mode 100644
index 000000000000..5ffd8047cf8c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.intrusive-collections-0.10.3.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "intrusive_collections",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=intrusive-collections",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.10.3",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.intrusive-collections-0.9.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.intrusive-collections-0.9.7.bazel
deleted file mode 100644
index ee299069b1e2..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.intrusive-collections-0.9.7.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "intrusive_collections",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=intrusive-collections",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.9.7",
-    deps = [
-        "@vendor_ts__memoffset-0.9.1//:memoffset",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inventory-0.3.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inventory-0.3.24.bazel
new file mode 100644
index 000000000000..1604efc8843d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inventory-0.3.24.bazel
@@ -0,0 +1,129 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "inventory",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = select({
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__rustversion-1.0.23//:rustversion",  # cfg(target_family = "wasm")
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [
+            "@vendor_ts__rustversion-1.0.23//:rustversion",  # cfg(target_family = "wasm")
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip1": [
+            "@vendor_ts__rustversion-1.0.23//:rustversion",  # cfg(target_family = "wasm")
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [
+            "@vendor_ts__rustversion-1.0.23//:rustversion",  # cfg(target_family = "wasm")
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip2": [
+            "@vendor_ts__rustversion-1.0.23//:rustversion",  # cfg(target_family = "wasm")
+        ],
+        "//conditions:default": [],
+    }),
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=inventory",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.24",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
deleted file mode 100644
index 637041b51c3c..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "is_terminal_polyfill",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=is_terminal_polyfill",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.70.1",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.2.bazel
new file mode 100644
index 000000000000..28647bcddb12
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.2.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "is_terminal_polyfill",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=is_terminal_polyfill",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.70.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel
deleted file mode 100644
index ff3ee2442f86..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "itertools",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "use_alloc",
-        "use_std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=itertools",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.12.1",
-    deps = [
-        "@vendor_ts__either-1.15.0//:either",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel
deleted file mode 100644
index 6e2c04598d0b..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "itertools",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "use_alloc",
-        "use_std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=itertools",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.14.0",
-    deps = [
-        "@vendor_ts__either-1.15.0//:either",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.15.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.15.0.bazel
new file mode 100644
index 000000000000..25a065273681
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.15.0.bazel
@@ -0,0 +1,119 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "itertools",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "use_alloc",
+        "use_std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=itertools",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.15.0",
+    deps = [
+        "@vendor_ts__either-1.19.0//:either",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.15.bazel
deleted file mode 100644
index 57e6f406e902..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.15.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "itoa",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=itoa",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.15",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.18.bazel
new file mode 100644
index 000000000000..2e31d3416e16
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.18.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "itoa",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=itoa",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.18",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-0.2.37.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-0.2.37.bazel
new file mode 100644
index 000000000000..2261d90eea7d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-0.2.37.bazel
@@ -0,0 +1,127 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "jiff",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__jiff-core-0.1.1//:jiff_core": "jcore",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=jiff",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.37",
+    deps = [
+        "@vendor_ts__jiff-core-0.1.1//:jiff_core",
+    ] + select({
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [
+            "@vendor_ts__portable-atomic-1.15.0//:portable_atomic",  # cfg(not(target_has_atomic = "ptr"))
+            "@vendor_ts__portable-atomic-util-0.2.7//:portable_atomic_util",  # cfg(not(target_has_atomic = "ptr"))
+        ],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [
+            "@vendor_ts__portable-atomic-1.15.0//:portable_atomic",  # cfg(not(target_has_atomic = "ptr"))
+            "@vendor_ts__portable-atomic-util-0.2.7//:portable_atomic_util",  # cfg(not(target_has_atomic = "ptr"))
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-core-0.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-core-0.1.1.bazel
new file mode 100644
index 000000000000..a936e3984f65
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-core-0.1.1.bazel
@@ -0,0 +1,117 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "jiff_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "std",
+        "tz-fat",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=jiff-core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-static-0.2.37.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-static-0.2.37.bazel
new file mode 100644
index 000000000000..85ed83e8a7bc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-static-0.2.37.bazel
@@ -0,0 +1,120 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "jiff_static",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__jiff-core-0.1.1//:jiff_core": "jcore",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=jiff-static",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.37",
+    deps = [
+        "@vendor_ts__jiff-core-0.1.1//:jiff_core",
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-tzdb-0.1.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-tzdb-0.1.8.bazel
new file mode 100644
index 000000000000..61d90354df0a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-tzdb-0.1.8.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "jiff_tzdb",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=jiff-tzdb",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.8",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-tzdb-platform-0.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-tzdb-platform-0.1.3.bazel
new file mode 100644
index 000000000000..b80683752d65
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jiff-tzdb-platform-0.1.3.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "jiff_tzdb_platform",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=jiff-tzdb-platform",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.3",
+    deps = [
+        "@vendor_ts__jiff-tzdb-0.1.8//:jiff_tzdb",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.34.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.34.bazel
deleted file mode 100644
index 2546f6c8a77f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.34.bazel
+++ /dev/null
@@ -1,190 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "jobserver",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=jobserver",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.34",
-    deps = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__getrandom-0.3.3//:getrandom",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__getrandom-0.3.3//:getrandom",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__getrandom-0.3.3//:getrandom",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.35.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.35.bazel
new file mode 100644
index 000000000000..e872e35e75d6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.35.bazel
@@ -0,0 +1,228 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "jobserver",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=jobserver",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.35",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__getrandom-0.4.3//:getrandom",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__getrandom-0.4.3//:getrandom",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__getrandom-0.4.3//:getrandom",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-1.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-1.0.0.bazel
index 91f0e1ff55dc..68d72020f269 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-1.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-1.0.0.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.103.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.103.bazel
new file mode 100644
index 000000000000..20b1136b7fdc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.103.bazel
@@ -0,0 +1,121 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "js_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+        "unsafe-eval",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=js-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.103",
+    deps = [
+        "@vendor_ts__cfg-if-1.0.4//:cfg_if",
+        "@vendor_ts__futures-util-0.3.34//:futures_util",
+        "@vendor_ts__wasm-bindgen-0.2.126//:wasm_bindgen",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.78.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.78.bazel
deleted file mode 100644
index 91569ee35263..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.78.bazel
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "js_sys",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=js-sys",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.3.78",
-    deps = [
-        "@vendor_ts__once_cell-1.21.3//:once_cell",
-        "@vendor_ts__wasm-bindgen-0.2.101//:wasm_bindgen",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.1.1.bazel
deleted file mode 100644
index 3943bd7e1b94..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.1.1.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "kqueue",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=kqueue",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.1.1",
-    deps = [
-        "@vendor_ts__kqueue-sys-1.0.4//:kqueue_sys",
-        "@vendor_ts__libc-0.2.175//:libc",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.2.1.bazel
new file mode 100644
index 000000000000..27ea3fa9e689
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.2.1.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "kqueue",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=kqueue",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.2.1",
+    deps = [
+        "@vendor_ts__kqueue-sys-1.1.2//:kqueue_sys",
+        "@vendor_ts__libc-0.2.189//:libc",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel
deleted file mode 100644
index dadf3b16e818..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "kqueue_sys",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=kqueue-sys",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.4",
-    deps = [
-        "@vendor_ts__bitflags-1.3.2//:bitflags",
-        "@vendor_ts__libc-0.2.175//:libc",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.1.2.bazel
new file mode 100644
index 000000000000..db1303bf6151
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.1.2.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "kqueue_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=kqueue-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.2",
+    deps = [
+        "@vendor_ts__bitflags-2.13.2//:bitflags",
+        "@vendor_ts__libc-0.2.189//:libc",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.la-arena-0.3.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.la-arena-0.3.1.bazel
index ab216fe6e836..4cdba493eb02 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.la-arena-0.3.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.la-arena-0.3.1.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.0.bazel
deleted file mode 100644
index c81cfa64f50f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.0.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "lazy_static",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=lazy_static",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.5.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.1.bazel
new file mode 100644
index 000000000000..924e9f9bebdb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.1.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "lazy_static",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=lazy_static",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.5.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.175.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.175.bazel
deleted file mode 100644
index b63baa0019d2..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.175.bazel
+++ /dev/null
@@ -1,170 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "libc",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=libc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.175",
-    deps = [
-        "@vendor_ts__libc-0.2.175//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "libc",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=libc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.2.175",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.189.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.189.bazel
new file mode 100644
index 000000000000..35e53c4cc1fc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.189.bazel
@@ -0,0 +1,188 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "libc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=libc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.189",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "libc",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=libc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.2.189",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
index 423b236b28f8..be72d8afbb9b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.litemap-0.8.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.litemap-0.8.0.bazel
deleted file mode 100644
index 47c9e11a8b9f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.litemap-0.8.0.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "litemap",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=litemap",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.13.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.13.bazel
deleted file mode 100644
index 465339500a56..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.13.bazel
+++ /dev/null
@@ -1,174 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "lock_api",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "atomic_usize",
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=lock_api",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.13",
-    deps = [
-        "@vendor_ts__lock_api-0.4.13//:build_script_build",
-        "@vendor_ts__scopeguard-1.2.0//:scopeguard",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "atomic_usize",
-        "default",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "lock_api",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=lock_api",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.4.13",
-    visibility = ["//visibility:private"],
-    deps = [
-        "@vendor_ts__autocfg-1.5.0//:autocfg",
-    ],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.14.bazel
new file mode 100644
index 000000000000..74a5e5e3a2ba
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.14.bazel
@@ -0,0 +1,118 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "lock_api",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "atomic_usize",
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=lock_api",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.14",
+    deps = [
+        "@vendor_ts__scopeguard-1.2.0//:scopeguard",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel
index 45798b37ab70..57290190484b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,6 +113,6 @@ rust_library(
     }),
     version = "0.3.9",
     deps = [
-        "@vendor_ts__log-0.4.28//:log",
+        "@vendor_ts__log-0.4.34//:log",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.28.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.28.bazel
deleted file mode 100644
index 26a8978cb1bf..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.28.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "log",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=log",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.28",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.34.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.34.bazel
new file mode 100644
index 000000000000..34db345d92d9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.34.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "log",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=log",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.34",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.2.0.bazel
index 3e43dd562abe..c877503707cd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.2.0.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -95,6 +109,6 @@ rust_library(
     }),
     version = "0.2.0",
     deps = [
-        "@vendor_ts__regex-automata-0.4.11//:regex_automata",
+        "@vendor_ts__regex-automata-0.4.18//:regex_automata",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.5.bazel
deleted file mode 100644
index 2338b0077dad..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.5.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "memchr",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=memchr",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.7.5",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.8.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.8.3.bazel
new file mode 100644
index 000000000000..a38c7e01d3b2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.8.3.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "memchr",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=memchr",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.8.3",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memoffset-0.9.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memoffset-0.9.1.bazel
index 8bac1c6d8e7b..c73bff82a637 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memoffset-0.9.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memoffset-0.9.1.bazel
@@ -59,12 +59,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -76,13 +78,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -90,6 +103,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -102,7 +116,7 @@ rust_library(
     }),
     version = "0.9.1",
     deps = [
-        "@vendor_ts__memoffset-0.9.1//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -112,6 +126,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -143,6 +160,7 @@ cargo_build_script(
         ],
     ),
     edition = "2015",
+    emit_warnings = False,
     pkg_name = "memoffset",
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -160,7 +178,7 @@ cargo_build_script(
     version = "0.9.1",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__autocfg-1.5.0//:autocfg",
+        "@vendor_ts__autocfg-1.5.1//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.9.bazel
index 48322b462ca4..f55a1fb1ab58 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.9.bazel
@@ -35,6 +35,8 @@ rust_library(
         ],
     ),
     crate_features = [
+        "simd",
+        "simd-adler32",
         "with-alloc",
     ],
     crate_root = "src/lib.rs",
@@ -55,12 +57,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -72,13 +76,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -86,6 +101,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,5 +115,6 @@ rust_library(
     version = "0.8.9",
     deps = [
         "@vendor_ts__adler2-2.0.1//:adler2",
+        "@vendor_ts__simd-adler32-0.3.9//:simd_adler32",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.4.bazel
deleted file mode 100644
index 4b6fcc8c864e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.4.bazel
+++ /dev/null
@@ -1,210 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "mio",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "log",
-        "os-ext",
-        "os-poll",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=mio",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.4",
-    deps = [
-        "@vendor_ts__log-0.4.28//:log",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:wasm32-wasip1": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(target_os = "wasi")
-            "@vendor_ts__wasi-0.11.1-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
-        ],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(target_os = "wasi")
-            "@vendor_ts__wasi-0.11.1-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
-        ],
-        "@rules_rust//rust/platform:wasm32-wasip2": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(target_os = "wasi")
-            "@vendor_ts__wasi-0.11.1-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.2.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.2.3.bazel
new file mode 100644
index 000000000000..e356c2a05c49
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.2.3.bazel
@@ -0,0 +1,248 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "mio",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "log",
+        "os-ext",
+        "os-poll",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=mio",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.2.3",
+    deps = [
+        "@vendor_ts__log-0.4.34//:log",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip1": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+            "@vendor_ts__wasi-0.11.1-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+            "@vendor_ts__wasi-0.11.1-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip2": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+            "@vendor_ts__wasi-0.11.1-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.1.bazel
index aa7509dd1fea..28a3ed8de154 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.1.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -95,6 +109,6 @@ rust_library(
     }),
     version = "0.6.1",
     deps = [
-        "@vendor_ts__windows-sys-0.61.0//:windows_sys",
+        "@vendor_ts__windows-sys-0.61.2//:windows_sys",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel
index 51e1d88fe23f..0d3a0189083f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -96,6 +110,6 @@ rust_library(
     version = "0.9.0",
     deps = [
         "@vendor_ts__log-0.3.9//:log",
-        "@vendor_ts__serde-1.0.228//:serde",
+        "@vendor_ts__serde-1.0.229//:serde",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nohash-hasher-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nohash-hasher-0.2.0.bazel
index ea49f4108a10..27c83ecc9202 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nohash-hasher-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nohash-hasher-0.2.0.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.2.0.bazel
index 0c838f2c6c31..191e88cdf858 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.2.0.bazel
@@ -57,12 +57,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -74,13 +76,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -88,6 +101,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -100,111 +114,139 @@ rust_library(
     }),
     version = "8.2.0",
     deps = [
-        "@vendor_ts__libc-0.2.175//:libc",
-        "@vendor_ts__log-0.4.28//:log",
-        "@vendor_ts__notify-types-2.0.0//:notify_types",
+        "@vendor_ts__libc-0.2.189//:libc",
+        "@vendor_ts__log-0.4.34//:log",
+        "@vendor_ts__notify-types-2.1.0//:notify_types",
         "@vendor_ts__walkdir-2.5.0//:walkdir",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__bitflags-2.9.4//:bitflags",  # cfg(target_os = "macos")
+            "@vendor_ts__bitflags-2.13.2//:bitflags",  # cfg(target_os = "macos")
             "@vendor_ts__fsevent-sys-4.1.0//:fsevent_sys",  # aarch64-apple-darwin
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__kqueue-1.2.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [
+            "@vendor_ts__kqueue-1.2.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__kqueue-1.2.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
             "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__bitflags-2.9.4//:bitflags",  # cfg(target_os = "macos")
+            "@vendor_ts__bitflags-2.13.2//:bitflags",  # cfg(target_os = "macos")
             "@vendor_ts__fsevent-sys-4.1.0//:fsevent_sys",  # i686-apple-darwin
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
             "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__kqueue-1.2.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [
+            "@vendor_ts__kqueue-1.2.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [
+            "@vendor_ts__kqueue-1.2.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__bitflags-2.9.4//:bitflags",  # cfg(target_os = "macos")
+            "@vendor_ts__bitflags-2.13.2//:bitflags",  # cfg(target_os = "macos")
             "@vendor_ts__fsevent-sys-4.1.0//:fsevent_sys",  # x86_64-apple-darwin
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__kqueue-1.2.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [
+            "@vendor_ts__kqueue-1.2.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
             "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__kqueue-1.2.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__inotify-0.11.5//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.2.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel
deleted file mode 100644
index f690f5b42495..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "notify_types",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=notify-types",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.1.0.bazel
new file mode 100644
index 000000000000..12ebcc06828d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.1.0.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "notify_types",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=notify-types",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.1.0",
+    deps = [
+        "@vendor_ts__bitflags-2.13.2//:bitflags",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.50.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.50.1.bazel
deleted file mode 100644
index 03714107c726..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.50.1.bazel
+++ /dev/null
@@ -1,121 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "nu_ansi_term",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": {
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys": "windows",  # cfg(windows)
-        },
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": {
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys": "windows",  # cfg(windows)
-        },
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": {
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys": "windows",  # cfg(windows)
-        },
-        "//conditions:default": {},
-    }),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=nu-ansi-term",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.50.1",
-    deps = select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.50.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.50.3.bazel
new file mode 100644
index 000000000000..b4a8fdace476
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.50.3.bazel
@@ -0,0 +1,139 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "nu_ansi_term",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": {
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys": "windows",  # cfg(windows)
+        },
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": {
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys": "windows",  # cfg(windows)
+        },
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": {
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys": "windows",  # cfg(windows)
+        },
+        "//conditions:default": {},
+    }),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=nu-ansi-term",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.50.3",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.1.0.bazel
deleted file mode 100644
index 587cbdf418fa..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.1.0.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "num_conv",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=num-conv",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.2.2.bazel
new file mode 100644
index 000000000000..03632f0fb2b1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.2.2.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "num_conv",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=num-conv",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-traits-0.2.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-traits-0.2.19.bazel
index 6b95a1d7743c..51f0bbe45773 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-traits-0.2.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-traits-0.2.19.bazel
@@ -60,12 +60,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -77,13 +79,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -91,6 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -103,7 +117,7 @@ rust_library(
     }),
     version = "0.2.19",
     deps = [
-        "@vendor_ts__num-traits-0.2.19//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -113,6 +127,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -145,6 +162,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "num-traits",
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -162,7 +180,7 @@ cargo_build_script(
     version = "0.2.19",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__autocfg-1.5.0//:autocfg",
+        "@vendor_ts__autocfg-1.5.1//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.17.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.17.0.bazel
index 00293e65e2da..20c627687939 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.17.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.17.0.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -96,118 +110,160 @@ rust_library(
     version = "1.17.0",
     deps = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:wasm32-wasip1": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:wasm32-wasip1-threads": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:wasm32-wasip2": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-none": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(not(windows))
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_threads-0.1.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_threads-0.1.7.bazel
new file mode 100644
index 000000000000..10e74e9406a0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_threads-0.1.7.bazel
@@ -0,0 +1,144 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "num_threads",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=num_threads",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.7",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.3.bazel
deleted file mode 100644
index d10ec0a4bceb..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.3.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "once_cell",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "default",
-        "race",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=once_cell",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.21.3",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.4.bazel
new file mode 100644
index 000000000000..047adef58f3f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.4.bazel
@@ -0,0 +1,117 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "once_cell",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "race",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=once_cell",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.21.4",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell_polyfill-1.70.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell_polyfill-1.70.1.bazel
deleted file mode 100644
index 968db54eafe3..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell_polyfill-1.70.1.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "once_cell_polyfill",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=once_cell_polyfill",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.70.1",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell_polyfill-1.70.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell_polyfill-1.70.2.bazel
new file mode 100644
index 000000000000..66335b9ae297
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell_polyfill-1.70.2.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "once_cell_polyfill",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=once_cell_polyfill",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.70.2",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.5.bazel
index 72de567588ff..b4b5dd2dfebd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.5.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ordered-float-2.10.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ordered-float-2.10.1.bazel
deleted file mode 100644
index 58f67759d31e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ordered-float-2.10.1.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ordered_float",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ordered-float",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.10.1",
-    deps = [
-        "@vendor_ts__num-traits-0.2.19//:num_traits",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.1.1.bazel
deleted file mode 100644
index 05f864c1758a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.1.1.bazel
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "os_str_bytes",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "memchr",
-        "raw_os_str",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=os_str_bytes",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "7.1.1",
-    deps = [
-        "@vendor_ts__memchr-2.7.5//:memchr",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.papaya-0.2.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.papaya-0.2.3.bazel
deleted file mode 100644
index 27bb71298a83..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.papaya-0.2.3.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "papaya",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=papaya",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.3",
-    deps = [
-        "@vendor_ts__equivalent-1.0.2//:equivalent",
-        "@vendor_ts__seize-0.5.0//:seize",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.4.bazel
deleted file mode 100644
index b93d8562fad0..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.4.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "parking_lot",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=parking_lot",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.12.4",
-    deps = [
-        "@vendor_ts__lock_api-0.4.13//:lock_api",
-        "@vendor_ts__parking_lot_core-0.9.11//:parking_lot_core",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.5.bazel
new file mode 100644
index 000000000000..8de33bedb62b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.5.bazel
@@ -0,0 +1,118 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "parking_lot",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=parking_lot",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.12.5",
+    deps = [
+        "@vendor_ts__lock_api-0.4.14//:lock_api",
+        "@vendor_ts__parking_lot_core-0.9.12//:parking_lot_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.11.bazel
deleted file mode 100644
index f2199e602c2b..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.11.bazel
+++ /dev/null
@@ -1,256 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "parking_lot_core",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=parking_lot_core",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.9.11",
-    deps = [
-        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
-        "@vendor_ts__parking_lot_core-0.9.11//:build_script_build",
-        "@vendor_ts__smallvec-1.15.1//:smallvec",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "//conditions:default": [],
-    }),
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "parking_lot_core",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=parking_lot_core",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.9.11",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.12.bazel
new file mode 100644
index 000000000000..be0500fc5bc9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.12.bazel
@@ -0,0 +1,298 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "parking_lot_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=parking_lot_core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.12",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__cfg-if-1.0.4//:cfg_if",
+        "@vendor_ts__smallvec-1.16.1//:smallvec",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-link-0.2.1//:windows_link",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-link-0.2.1//:windows_link",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-link-0.2.1//:windows_link",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "//conditions:default": [],
+    }),
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "parking_lot_core",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=parking_lot_core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.9.12",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel
index ccc776593759..7b28f1c5a61d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel
@@ -60,12 +60,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -77,13 +79,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -91,6 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel
index 2b0175999d4a..a58caad84f9d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel
@@ -52,12 +52,14 @@ rust_proc_macro(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_proc_macro(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -95,9 +109,9 @@ rust_proc_macro(
     }),
     version = "0.2.9",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
         "@vendor_ts__proc-macro2-diagnostics-0.10.1//:proc_macro2_diagnostics",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.percent-encoding-2.3.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.percent-encoding-2.3.2.bazel
deleted file mode 100644
index 8a8d1e9e3c97..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.percent-encoding-2.3.2.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "percent_encoding",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=percent-encoding",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.3.2",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel
deleted file mode 100644
index 8ba85de58daa..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "perf_event",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=perf-event",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.7",
-    deps = [
-        "@vendor_ts__libc-0.2.175//:libc",
-        "@vendor_ts__perf-event-open-sys-1.0.1//:perf_event_open_sys",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.8.bazel
new file mode 100644
index 000000000000..865a3b35a227
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.8.bazel
@@ -0,0 +1,119 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "perf_event",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "hooks",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=perf-event",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.8",
+    deps = [
+        "@vendor_ts__libc-0.2.189//:libc",
+        "@vendor_ts__perf-event-open-sys-4.0.0//:perf_event_open_sys",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel
deleted file mode 100644
index 120842ef4fbb..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "perf_event_open_sys",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=perf-event-open-sys",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.1",
-    deps = [
-        "@vendor_ts__libc-0.2.175//:libc",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-4.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-4.0.0.bazel
new file mode 100644
index 000000000000..db745c0fcff3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-4.0.0.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "perf_event_open_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=perf-event-open-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "4.0.0",
+    deps = [
+        "@vendor_ts__libc-0.2.189//:libc",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel
deleted file mode 100644
index 675b426dd1ab..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel
+++ /dev/null
@@ -1,107 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "petgraph",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "graphmap",
-        "matrix_graph",
-        "stable_graph",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=petgraph",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.6.5",
-    deps = [
-        "@vendor_ts__fixedbitset-0.4.2//:fixedbitset",
-        "@vendor_ts__indexmap-2.14.0//:indexmap",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.8.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.8.3.bazel
new file mode 100644
index 000000000000..43c76a33a8bb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.8.3.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "petgraph",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=petgraph",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.3",
+    deps = [
+        "@vendor_ts__fixedbitset-0.5.7//:fixedbitset",
+        "@vendor_ts__hashbrown-0.15.5//:hashbrown",
+        "@vendor_ts__indexmap-2.14.2//:indexmap",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.16.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.16.bazel
deleted file mode 100644
index 9234efd2e0e2..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.16.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "pin_project_lite",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=pin-project-lite",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.16",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.17.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.17.bazel
new file mode 100644
index 000000000000..807403395d70
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.17.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "pin_project_lite",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=pin-project-lite",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.17",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.32.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.32.bazel
deleted file mode 100644
index 806b9c904c78..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.32.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "pkg_config",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=pkg-config",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.3.32",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.34.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.34.bazel
new file mode 100644
index 000000000000..e804786a0a81
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.34.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "pkg_config",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=pkg-config",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.34",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.1.bazel
deleted file mode 100644
index ba1a8734eaa8..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.1.bazel
+++ /dev/null
@@ -1,170 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "portable_atomic",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "fallback",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=portable-atomic",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.11.1",
-    deps = [
-        "@vendor_ts__portable-atomic-1.11.1//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "fallback",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "portable-atomic",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=portable-atomic",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.11.1",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.15.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.15.0.bazel
new file mode 100644
index 000000000000..61c8da82b6a0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.15.0.bazel
@@ -0,0 +1,188 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "portable_atomic",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "fallback",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=portable-atomic",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.15.0",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "fallback",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    emit_warnings = False,
+    pkg_name = "portable-atomic",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=portable-atomic",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.15.0",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-util-0.2.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-util-0.2.7.bazel
new file mode 100644
index 000000000000..f6932bfe0c52
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-util-0.2.7.bazel
@@ -0,0 +1,181 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "portable_atomic_util",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=portable-atomic-util",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.7",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__portable-atomic-1.15.0//:portable_atomic",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    emit_warnings = False,
+    pkg_name = "portable-atomic-util",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=portable-atomic-util",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.2.7",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.postcard-1.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.postcard-1.1.3.bazel
new file mode 100644
index 000000000000..3dcb2b442489
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.postcard-1.1.3.bazel
@@ -0,0 +1,118 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "postcard",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=postcard",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.3",
+    deps = [
+        "@vendor_ts__cobs-0.3.0//:cobs",
+        "@vendor_ts__serde-1.0.229//:serde",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.potential_utf-0.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.potential_utf-0.1.3.bazel
deleted file mode 100644
index 4a5d00884b13..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.potential_utf-0.1.3.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "potential_utf",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "zerovec",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=potential_utf",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.3",
-    deps = [
-        "@vendor_ts__zerovec-0.11.4//:zerovec",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.powerfmt-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.powerfmt-0.2.0.bazel
index 4f67e7c1603c..1013a7b9d154 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.powerfmt-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.powerfmt-0.2.0.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.21.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.21.bazel
deleted file mode 100644
index a4b01dcbc67f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.21.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ppv_lite86",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "simd",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ppv-lite86",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.21",
-    deps = [
-        "@vendor_ts__zerocopy-0.8.27//:zerocopy",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.101.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.101.bazel
deleted file mode 100644
index bb23160f9b8f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.101.bazel
+++ /dev/null
@@ -1,171 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "proc_macro2",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "proc-macro",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=proc-macro2",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.101",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:build_script_build",
-        "@vendor_ts__unicode-ident-1.0.19//:unicode_ident",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "proc-macro",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "proc-macro2",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=proc-macro2",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.101",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.107.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.107.bazel
new file mode 100644
index 000000000000..c3092d17e1b5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.107.bazel
@@ -0,0 +1,189 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "proc_macro2",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=proc-macro2",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.107",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__unicode-ident-1.0.24//:unicode_ident",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "proc-macro2",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=proc-macro2",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.107",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel
index 9a309e0d43a0..41d7d223dcf9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel
@@ -61,12 +61,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -78,13 +80,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -92,6 +105,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -104,10 +118,10 @@ rust_library(
     }),
     version = "0.10.1",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__proc-macro2-diagnostics-0.10.1//:build_script_build",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
+        ":build_script_build",
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
         "@vendor_ts__yansi-1.0.1//:yansi",
     ],
 )
@@ -118,6 +132,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -151,6 +168,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    emit_warnings = False,
     pkg_name = "proc-macro2-diagnostics",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.41.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.41.bazel
deleted file mode 100644
index 621cfb33ab4e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.41.bazel
+++ /dev/null
@@ -1,171 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "quote",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "proc-macro",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=quote",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.41",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "proc-macro",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "quote",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=quote",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.41",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.47.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.47.bazel
new file mode 100644
index 000000000000..023e519e589f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.47.bazel
@@ -0,0 +1,189 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "quote",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=quote",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.47",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "quote",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=quote",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.47",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.r-efi-5.3.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.r-efi-5.3.0.bazel
deleted file mode 100644
index d71877ee91cf..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.r-efi-5.3.0.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "r_efi",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=r-efi",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "5.3.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.r-efi-6.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.r-efi-6.0.0.bazel
new file mode 100644
index 000000000000..c54aa50642ef
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.r-efi-6.0.0.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "r_efi",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=r-efi",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "6.0.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.123.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.123.0.bazel
deleted file mode 100644
index 6222aecac162..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.123.0.bazel
+++ /dev/null
@@ -1,107 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_rustc_abi",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra-ap-rustc_hashes-0.123.0//:ra_ap_rustc_hashes": "rustc_hashes",
-        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index": "rustc_index",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra-ap-rustc_abi",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.123.0",
-    deps = [
-        "@vendor_ts__bitflags-2.9.4//:bitflags",
-        "@vendor_ts__ra-ap-rustc_hashes-0.123.0//:ra_ap_rustc_hashes",
-        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.166.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.166.0.bazel
new file mode 100644
index 000000000000..fae4969b2eeb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.166.0.bazel
@@ -0,0 +1,121 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_rustc_abi",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra-ap-rustc_hashes-0.166.0//:ra_ap_rustc_hashes": "rustc_hashes",
+        "@vendor_ts__ra-ap-rustc_index-0.166.0//:ra_ap_rustc_index": "rustc_index",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_abi",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.166.0",
+    deps = [
+        "@vendor_ts__bitflags-2.13.2//:bitflags",
+        "@vendor_ts__ra-ap-rustc_hashes-0.166.0//:ra_ap_rustc_hashes",
+        "@vendor_ts__ra-ap-rustc_index-0.166.0//:ra_ap_rustc_index",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_ast_ir-0.166.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_ast_ir-0.166.0.bazel
new file mode 100644
index 000000000000..73996835548e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_ast_ir-0.166.0.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_rustc_ast_ir",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_ast_ir",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.166.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.123.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.123.0.bazel
deleted file mode 100644
index 6d510190f025..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.123.0.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_rustc_hashes",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra-ap-rustc_hashes",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.123.0",
-    deps = [
-        "@vendor_ts__rustc-stable-hash-0.1.2//:rustc_stable_hash",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.166.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.166.0.bazel
new file mode 100644
index 000000000000..04517cb7a77c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.166.0.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_rustc_hashes",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_hashes",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.166.0",
+    deps = [
+        "@vendor_ts__rustc-stable-hash-0.1.2//:rustc_stable_hash",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.123.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.123.0.bazel
deleted file mode 100644
index b8d5f8af922f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.123.0.bazel
+++ /dev/null
@@ -1,106 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_rustc_index",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra-ap-rustc_index_macros-0.123.0//:ra_ap_rustc_index_macros": "rustc_index_macros",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    proc_macro_deps = [
-        "@vendor_ts__ra-ap-rustc_index_macros-0.123.0//:ra_ap_rustc_index_macros",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra-ap-rustc_index",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.123.0",
-    deps = [
-        "@vendor_ts__smallvec-1.15.1//:smallvec",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.166.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.166.0.bazel
new file mode 100644
index 000000000000..055cc9ee4ef7
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.166.0.bazel
@@ -0,0 +1,117 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_rustc_index",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra-ap-rustc_index_macros-0.166.0//:ra_ap_rustc_index_macros": "rustc_index_macros",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__ra-ap-rustc_index_macros-0.166.0//:ra_ap_rustc_index_macros",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_index",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.166.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.123.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.123.0.bazel
deleted file mode 100644
index f25a9e197681..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.123.0.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "ra_ap_rustc_index_macros",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra-ap-rustc_index_macros",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.123.0",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.166.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.166.0.bazel
new file mode 100644
index 000000000000..8422321314e8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.166.0.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "ra_ap_rustc_index_macros",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_index_macros",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.166.0",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.121.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.121.0.bazel
deleted file mode 100644
index 1ba187aeb8f2..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.121.0.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_rustc_lexer",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra-ap-rustc_lexer",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.121.0",
-    deps = [
-        "@vendor_ts__memchr-2.7.5//:memchr",
-        "@vendor_ts__unicode-properties-0.1.3//:unicode_properties",
-        "@vendor_ts__unicode-xid-0.2.6//:unicode_xid",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.123.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.123.0.bazel
deleted file mode 100644
index 5ed4bd3f912f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.123.0.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_rustc_lexer",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra-ap-rustc_lexer",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.123.0",
-    deps = [
-        "@vendor_ts__memchr-2.7.5//:memchr",
-        "@vendor_ts__unicode-properties-0.1.3//:unicode_properties",
-        "@vendor_ts__unicode-xid-0.2.6//:unicode_xid",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.166.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.166.0.bazel
new file mode 100644
index 000000000000..e5311d5f6f1f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.166.0.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_rustc_lexer",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_lexer",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.166.0",
+    deps = [
+        "@vendor_ts__memchr-2.8.3//:memchr",
+        "@vendor_ts__unicode-ident-1.0.24//:unicode_ident",
+        "@vendor_ts__unicode-properties-0.1.4//:unicode_properties",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_next_trait_solver-0.166.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_next_trait_solver-0.166.0.bazel
new file mode 100644
index 000000000000..2de07b89a3ba
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_next_trait_solver-0.166.0.bazel
@@ -0,0 +1,125 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_rustc_next_trait_solver",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra-ap-rustc_index-0.166.0//:ra_ap_rustc_index": "rustc_index",
+        "@vendor_ts__ra-ap-rustc_type_ir-0.166.0//:ra_ap_rustc_type_ir": "rustc_type_ir",
+        "@vendor_ts__ra-ap-rustc_type_ir_macros-0.166.0//:ra_ap_rustc_type_ir_macros": "rustc_type_ir_macros",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__derive-where-1.6.1//:derive_where",
+        "@vendor_ts__ra-ap-rustc_type_ir_macros-0.166.0//:ra_ap_rustc_type_ir_macros",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_next_trait_solver",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.166.0",
+    deps = [
+        "@vendor_ts__ra-ap-rustc_index-0.166.0//:ra_ap_rustc_index",
+        "@vendor_ts__ra-ap-rustc_type_ir-0.166.0//:ra_ap_rustc_type_ir",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.121.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.121.0.bazel
deleted file mode 100644
index 987599aa9648..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.121.0.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_rustc_parse_format",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra-ap-rustc_lexer-0.121.0//:ra_ap_rustc_lexer": "rustc_lexer",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra-ap-rustc_parse_format",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.121.0",
-    deps = [
-        "@vendor_ts__ra-ap-rustc_lexer-0.121.0//:ra_ap_rustc_lexer",
-        "@vendor_ts__rustc-literal-escaper-0.0.4//:rustc_literal_escaper",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.166.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.166.0.bazel
new file mode 100644
index 000000000000..f77643fc2192
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.166.0.bazel
@@ -0,0 +1,118 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_rustc_parse_format",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra-ap-rustc_lexer-0.166.0//:ra_ap_rustc_lexer": "rustc_lexer",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_parse_format",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.166.0",
+    deps = [
+        "@vendor_ts__ra-ap-rustc_lexer-0.166.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__rustc-literal-escaper-0.0.7//:rustc_literal_escaper",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel
deleted file mode 100644
index e81038a00849..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel
+++ /dev/null
@@ -1,107 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_rustc_pattern_analysis",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index": "rustc_index",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra-ap-rustc_pattern_analysis",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.123.0",
-    deps = [
-        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:rustc_apfloat",
-        "@vendor_ts__smallvec-1.15.1//:smallvec",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.166.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.166.0.bazel
new file mode 100644
index 000000000000..1fe3c0b1972c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.166.0.bazel
@@ -0,0 +1,121 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_rustc_pattern_analysis",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra-ap-rustc_index-0.166.0//:ra_ap_rustc_index": "rustc_index",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_pattern_analysis",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.166.0",
+    deps = [
+        "@vendor_ts__ra-ap-rustc_index-0.166.0//:ra_ap_rustc_index",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:rustc_apfloat",
+        "@vendor_ts__smallvec-1.16.1//:smallvec",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_type_ir-0.166.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_type_ir-0.166.0.bazel
new file mode 100644
index 000000000000..cea34a4a5d61
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_type_ir-0.166.0.bazel
@@ -0,0 +1,134 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_rustc_type_ir",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra-ap-rustc_abi-0.166.0//:ra_ap_rustc_abi": "rustc_abi",
+        "@vendor_ts__ra-ap-rustc_ast_ir-0.166.0//:ra_ap_rustc_ast_ir": "rustc_ast_ir",
+        "@vendor_ts__ra-ap-rustc_index-0.166.0//:ra_ap_rustc_index": "rustc_index",
+        "@vendor_ts__ra-ap-rustc_type_ir_macros-0.166.0//:ra_ap_rustc_type_ir_macros": "rustc_type_ir_macros",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__derive-where-1.6.1//:derive_where",
+        "@vendor_ts__ra-ap-rustc_type_ir_macros-0.166.0//:ra_ap_rustc_type_ir_macros",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_type_ir",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.166.0",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.8//:arrayvec",
+        "@vendor_ts__bitflags-2.13.2//:bitflags",
+        "@vendor_ts__ena-0.14.4//:ena",
+        "@vendor_ts__indexmap-2.14.2//:indexmap",
+        "@vendor_ts__ra-ap-rustc_abi-0.166.0//:ra_ap_rustc_abi",
+        "@vendor_ts__ra-ap-rustc_ast_ir-0.166.0//:ra_ap_rustc_ast_ir",
+        "@vendor_ts__ra-ap-rustc_index-0.166.0//:ra_ap_rustc_index",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__smallvec-1.16.1//:smallvec",
+        "@vendor_ts__thin-vec-0.2.19//:thin_vec",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_type_ir_macros-0.166.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_type_ir_macros-0.166.0.bazel
new file mode 100644
index 000000000000..98d73e9a8506
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_type_ir_macros-0.166.0.bazel
@@ -0,0 +1,117 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "ra_ap_rustc_type_ir_macros",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_type_ir_macros",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.166.0",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
+        "@vendor_ts__synstructure-0.13.2//:synstructure",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.301.bazel
deleted file mode 100644
index 073916cafe78..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.301.bazel
+++ /dev/null
@@ -1,124 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_base_db",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs": "vfs",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    proc_macro_deps = [
-        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_base_db",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__dashmap-6.1.0//:dashmap",
-        "@vendor_ts__indexmap-2.14.0//:indexmap",
-        "@vendor_ts__la-arena-0.3.1//:la_arena",
-        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-0.23.0//:salsa",
-        "@vendor_ts__semver-1.0.28//:semver",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-        "@vendor_ts__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.358.bazel
new file mode 100644
index 000000000000..13bf573c6df0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.358.bazel
@@ -0,0 +1,136 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_base_db",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs": "vfs",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_base_db",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__dashmap-6.2.1//:dashmap",
+        "@vendor_ts__indexmap-2.14.2//:indexmap",
+        "@vendor_ts__la-arena-0.3.1//:la_arena",
+        "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__salsa-0.28.5//:salsa",
+        "@vendor_ts__semver-1.0.28//:semver",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+        "@vendor_ts__triomphe-0.1.17//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.301.bazel
deleted file mode 100644
index 35af421f0231..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.301.bazel
+++ /dev/null
@@ -1,110 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_cfg",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "tt",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_cfg",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.358.bazel
new file mode 100644
index 000000000000..876d550c864c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.358.bazel
@@ -0,0 +1,128 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_cfg",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "syntax",
+        "tt",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_cfg",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.301.bazel
deleted file mode 100644
index 50b4f2e87d15..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.301.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_edition",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_edition",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.358.bazel
new file mode 100644
index 000000000000..c248177801f3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.358.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_edition",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_edition",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.301.bazel
deleted file mode 100644
index 2d77b3cb351a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.301.bazel
+++ /dev/null
@@ -1,129 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_hir",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def": "hir_def",
-        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand": "hir_expand",
-        "@vendor_ts__ra_ap_hir_ty-0.0.301//:ra_ap_hir_ty": "hir_ty",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_hir",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__arrayvec-0.7.6//:arrayvec",
-        "@vendor_ts__either-1.15.0//:either",
-        "@vendor_ts__indexmap-2.14.0//:indexmap",
-        "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def",
-        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand",
-        "@vendor_ts__ra_ap_hir_ty-0.0.301//:ra_ap_hir_ty",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__smallvec-1.15.1//:smallvec",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-        "@vendor_ts__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.358.bazel
new file mode 100644
index 000000000000..957fb30602d5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.358.bazel
@@ -0,0 +1,146 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_hir",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_hir_def-0.0.358//:ra_ap_hir_def": "hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_hir_ty-0.0.358//:ra_ap_hir_ty": "hir_ty",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_hir",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.8//:arrayvec",
+        "@vendor_ts__either-1.19.0//:either",
+        "@vendor_ts__itertools-0.15.0//:itertools",
+        "@vendor_ts__la-arena-0.3.1//:la_arena",
+        "@vendor_ts__ra-ap-rustc_type_ir-0.166.0//:ra_ap_rustc_type_ir",
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_hir_def-0.0.358//:ra_ap_hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_hir_ty-0.0.358//:ra_ap_hir_ty",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__salsa-0.28.5//:salsa",
+        "@vendor_ts__serde_json-1.0.154//:serde_json",
+        "@vendor_ts__smallvec-1.16.1//:smallvec",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+        "@vendor_ts__triomphe-0.1.17//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.301.bazel
deleted file mode 100644
index caaa0ae151ed..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.301.bazel
+++ /dev/null
@@ -1,143 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_hir_def",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand": "hir_expand",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_mbe-0.0.301//:ra_ap_mbe": "mbe",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    proc_macro_deps = [
-        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_hir_def",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__arrayvec-0.7.6//:arrayvec",
-        "@vendor_ts__bitflags-2.9.4//:bitflags",
-        "@vendor_ts__cov-mark-2.1.0//:cov_mark",
-        "@vendor_ts__drop_bomb-0.1.5//:drop_bomb",
-        "@vendor_ts__either-1.15.0//:either",
-        "@vendor_ts__fst-0.4.7//:fst",
-        "@vendor_ts__indexmap-2.14.0//:indexmap",
-        "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__la-arena-0.3.1//:la_arena",
-        "@vendor_ts__ra-ap-rustc_abi-0.123.0//:ra_ap_rustc_abi",
-        "@vendor_ts__ra-ap-rustc_parse_format-0.121.0//:ra_ap_rustc_parse_format",
-        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
-        "@vendor_ts__ra_ap_mbe-0.0.301//:ra_ap_mbe",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:rustc_apfloat",
-        "@vendor_ts__salsa-0.23.0//:salsa",
-        "@vendor_ts__smallvec-1.15.1//:smallvec",
-        "@vendor_ts__text-size-1.1.1//:text_size",
-        "@vendor_ts__thin-vec-0.2.14//:thin_vec",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-        "@vendor_ts__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.358.bazel
new file mode 100644
index 000000000000..8c67a6292383
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.358.bazel
@@ -0,0 +1,152 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_hir_def",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.358//:ra_ap_syntax_bridge": "syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_hir_def",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.8//:arrayvec",
+        "@vendor_ts__bitflags-2.13.2//:bitflags",
+        "@vendor_ts__cov-mark-2.2.0//:cov_mark",
+        "@vendor_ts__drop_bomb-0.1.5//:drop_bomb",
+        "@vendor_ts__either-1.19.0//:either",
+        "@vendor_ts__fst-0.4.7//:fst",
+        "@vendor_ts__indexmap-2.14.2//:indexmap",
+        "@vendor_ts__itertools-0.15.0//:itertools",
+        "@vendor_ts__la-arena-0.3.1//:la_arena",
+        "@vendor_ts__ra-ap-rustc_abi-0.166.0//:ra_ap_rustc_abi",
+        "@vendor_ts__ra-ap-rustc_parse_format-0.166.0//:ra_ap_rustc_parse_format",
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.358//:ra_ap_syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:rustc_apfloat",
+        "@vendor_ts__salsa-0.28.5//:salsa",
+        "@vendor_ts__smallvec-1.16.1//:smallvec",
+        "@vendor_ts__thin-vec-0.2.19//:thin_vec",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+        "@vendor_ts__triomphe-0.1.17//:triomphe",
+        "@vendor_ts__unicode-ident-1.0.24//:unicode_ident",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.301.bazel
deleted file mode 100644
index 1593a5a8db93..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.301.bazel
+++ /dev/null
@@ -1,134 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_hir_expand",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_mbe-0.0.301//:ra_ap_mbe": "mbe",
-        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_syntax-bridge-0.0.301//:ra_ap_syntax_bridge": "syntax_bridge",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    proc_macro_deps = [
-        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_hir_expand",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__cov-mark-2.1.0//:cov_mark",
-        "@vendor_ts__either-1.15.0//:either",
-        "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
-        "@vendor_ts__ra_ap_mbe-0.0.301//:ra_ap_mbe",
-        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_syntax-bridge-0.0.301//:ra_ap_syntax_bridge",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-0.23.0//:salsa",
-        "@vendor_ts__smallvec-1.15.1//:smallvec",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-        "@vendor_ts__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.358.bazel
new file mode 100644
index 000000000000..e9fac9c13d8a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.358.bazel
@@ -0,0 +1,144 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_hir_expand",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_mbe-0.0.358//:ra_ap_mbe": "mbe",
+        "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.358//:ra_ap_syntax_bridge": "syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_hir_expand",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__cov-mark-2.2.0//:cov_mark",
+        "@vendor_ts__either-1.19.0//:either",
+        "@vendor_ts__itertools-0.15.0//:itertools",
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+        "@vendor_ts__ra_ap_mbe-0.0.358//:ra_ap_mbe",
+        "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.358//:ra_ap_syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__salsa-0.28.5//:salsa",
+        "@vendor_ts__smallvec-1.16.1//:smallvec",
+        "@vendor_ts__thin-vec-0.2.19//:thin_vec",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+        "@vendor_ts__triomphe-0.1.17//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.301.bazel
deleted file mode 100644
index 23f08b414914..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.301.bazel
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_hir_ty",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def": "hir_def",
-        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand": "hir_expand",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    proc_macro_deps = [
-        "@vendor_ts__chalk-derive-0.103.0//:chalk_derive",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_hir_ty",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__arrayvec-0.7.6//:arrayvec",
-        "@vendor_ts__bitflags-2.9.4//:bitflags",
-        "@vendor_ts__chalk-ir-0.103.0//:chalk_ir",
-        "@vendor_ts__chalk-recursive-0.103.0//:chalk_recursive",
-        "@vendor_ts__chalk-solve-0.103.0//:chalk_solve",
-        "@vendor_ts__cov-mark-2.1.0//:cov_mark",
-        "@vendor_ts__either-1.15.0//:either",
-        "@vendor_ts__ena-0.14.3//:ena",
-        "@vendor_ts__indexmap-2.14.0//:indexmap",
-        "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__la-arena-0.3.1//:la_arena",
-        "@vendor_ts__oorandom-11.1.5//:oorandom",
-        "@vendor_ts__ra-ap-rustc_abi-0.123.0//:ra_ap_rustc_abi",
-        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index",
-        "@vendor_ts__ra-ap-rustc_pattern_analysis-0.123.0//:ra_ap_rustc_pattern_analysis",
-        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def",
-        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:rustc_apfloat",
-        "@vendor_ts__salsa-0.23.0//:salsa",
-        "@vendor_ts__scoped-tls-1.0.1//:scoped_tls",
-        "@vendor_ts__smallvec-1.15.1//:smallvec",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-        "@vendor_ts__triomphe-0.1.14//:triomphe",
-        "@vendor_ts__typed-arena-2.0.2//:typed_arena",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.358.bazel
new file mode 100644
index 000000000000..0d4432043557
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.358.bazel
@@ -0,0 +1,161 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_hir_ty",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_hir_def-0.0.358//:ra_ap_hir_def": "hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_macros-0.0.358//:ra_ap_macros": "macros",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax": "syntax",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__ra_ap_macros-0.0.358//:ra_ap_macros",
+        "@vendor_ts__serde_derive-1.0.229//:serde_derive",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_hir_ty",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.8//:arrayvec",
+        "@vendor_ts__bitflags-2.13.2//:bitflags",
+        "@vendor_ts__cov-mark-2.2.0//:cov_mark",
+        "@vendor_ts__either-1.19.0//:either",
+        "@vendor_ts__ena-0.14.4//:ena",
+        "@vendor_ts__indexmap-2.14.2//:indexmap",
+        "@vendor_ts__itertools-0.15.0//:itertools",
+        "@vendor_ts__la-arena-0.3.1//:la_arena",
+        "@vendor_ts__oorandom-11.1.5//:oorandom",
+        "@vendor_ts__petgraph-0.8.3//:petgraph",
+        "@vendor_ts__ra-ap-rustc_abi-0.166.0//:ra_ap_rustc_abi",
+        "@vendor_ts__ra-ap-rustc_ast_ir-0.166.0//:ra_ap_rustc_ast_ir",
+        "@vendor_ts__ra-ap-rustc_index-0.166.0//:ra_ap_rustc_index",
+        "@vendor_ts__ra-ap-rustc_next_trait_solver-0.166.0//:ra_ap_rustc_next_trait_solver",
+        "@vendor_ts__ra-ap-rustc_pattern_analysis-0.166.0//:ra_ap_rustc_pattern_analysis",
+        "@vendor_ts__ra-ap-rustc_type_ir-0.166.0//:ra_ap_rustc_type_ir",
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_hir_def-0.0.358//:ra_ap_hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:rustc_apfloat",
+        "@vendor_ts__salsa-0.28.5//:salsa",
+        "@vendor_ts__serde-1.0.229//:serde",
+        "@vendor_ts__smallvec-1.16.1//:smallvec",
+        "@vendor_ts__thin-vec-0.2.19//:thin_vec",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+        "@vendor_ts__tracing-subscriber-0.3.23//:tracing_subscriber",
+        "@vendor_ts__tracing-tree-0.4.1//:tracing_tree",
+        "@vendor_ts__triomphe-0.1.17//:triomphe",
+        "@vendor_ts__typed-arena-2.0.2//:typed_arena",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.301.bazel
deleted file mode 100644
index b004cb57d399..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.301.bazel
+++ /dev/null
@@ -1,138 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_ide_db",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_hir-0.0.301//:ra_ap_hir": "hir",
-        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_profile-0.0.301//:ra_ap_profile": "profile",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs": "vfs",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    proc_macro_deps = [
-        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_ide_db",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__arrayvec-0.7.6//:arrayvec",
-        "@vendor_ts__bitflags-2.9.4//:bitflags",
-        "@vendor_ts__cov-mark-2.1.0//:cov_mark",
-        "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
-        "@vendor_ts__either-1.15.0//:either",
-        "@vendor_ts__fst-0.4.7//:fst",
-        "@vendor_ts__indexmap-2.14.0//:indexmap",
-        "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__line-index-0.1.2//:line_index",
-        "@vendor_ts__memchr-2.7.5//:memchr",
-        "@vendor_ts__nohash-hasher-0.2.0//:nohash_hasher",
-        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_hir-0.0.301//:ra_ap_hir",
-        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
-        "@vendor_ts__ra_ap_profile-0.0.301//:ra_ap_profile",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
-        "@vendor_ts__rayon-1.11.0//:rayon",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-0.23.0//:salsa",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-        "@vendor_ts__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.358.bazel
new file mode 100644
index 000000000000..146010851f1a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.358.bazel
@@ -0,0 +1,158 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_ide_db",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_hir-0.0.358//:ra_ap_hir": "hir",
+        "@vendor_ts__ra_ap_macros-0.0.358//:ra_ap_macros": "macros",
+        "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_profile-0.0.358//:ra_ap_profile": "profile",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_test_fixture-0.0.358//:ra_ap_test_fixture": "test_fixture",
+        "@vendor_ts__ra_ap_test_utils-0.0.358//:ra_ap_test_utils": "test_utils",
+        "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs": "vfs",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__ra_ap_macros-0.0.358//:ra_ap_macros",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_ide_db",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.8//:arrayvec",
+        "@vendor_ts__bitflags-2.13.2//:bitflags",
+        "@vendor_ts__cov-mark-2.2.0//:cov_mark",
+        "@vendor_ts__crossbeam-channel-0.5.17//:crossbeam_channel",
+        "@vendor_ts__either-1.19.0//:either",
+        "@vendor_ts__fst-0.4.7//:fst",
+        "@vendor_ts__itertools-0.15.0//:itertools",
+        "@vendor_ts__line-index-0.1.2//:line_index",
+        "@vendor_ts__memchr-2.8.3//:memchr",
+        "@vendor_ts__nohash-hasher-0.2.0//:nohash_hasher",
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_hir-0.0.358//:ra_ap_hir",
+        "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser",
+        "@vendor_ts__ra_ap_profile-0.0.358//:ra_ap_profile",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_test_fixture-0.0.358//:ra_ap_test_fixture",
+        "@vendor_ts__ra_ap_test_utils-0.0.358//:ra_ap_test_utils",
+        "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs",
+        "@vendor_ts__rayon-1.12.0//:rayon",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__salsa-0.28.5//:salsa",
+        "@vendor_ts__smallvec-1.16.1//:smallvec",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+        "@vendor_ts__triomphe-0.1.17//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.301.bazel
deleted file mode 100644
index 9216daa25b57..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.301.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_intern",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_intern",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__dashmap-6.1.0//:dashmap",
-        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.358.bazel
new file mode 100644
index 000000000000..ebb3b1e3d789
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.358.bazel
@@ -0,0 +1,119 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_intern",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_intern",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.8//:arrayvec",
+        "@vendor_ts__dashmap-6.2.1//:dashmap",
+        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
+        "@vendor_ts__rayon-1.12.0//:rayon",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__triomphe-0.1.17//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.301.bazel
deleted file mode 100644
index cc43b8dd6306..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.301.bazel
+++ /dev/null
@@ -1,123 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_load_cargo",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand": "hir_expand",
-        "@vendor_ts__ra_ap_ide_db-0.0.301//:ra_ap_ide_db": "ide_db",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_proc_macro_api-0.0.301//:ra_ap_proc_macro_api": "proc_macro_api",
-        "@vendor_ts__ra_ap_project_model-0.0.301//:ra_ap_project_model": "project_model",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
-        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs": "vfs",
-        "@vendor_ts__ra_ap_vfs-notify-0.0.301//:ra_ap_vfs_notify": "vfs_notify",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_load-cargo",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__anyhow-1.0.100//:anyhow",
-        "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
-        "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand",
-        "@vendor_ts__ra_ap_ide_db-0.0.301//:ra_ap_ide_db",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
-        "@vendor_ts__ra_ap_proc_macro_api-0.0.301//:ra_ap_proc_macro_api",
-        "@vendor_ts__ra_ap_project_model-0.0.301//:ra_ap_project_model",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
-        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
-        "@vendor_ts__ra_ap_vfs-notify-0.0.301//:ra_ap_vfs_notify",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.358.bazel
new file mode 100644
index 000000000000..5c706830a4c6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.358.bazel
@@ -0,0 +1,137 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_load_cargo",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_ide_db-0.0.358//:ra_ap_ide_db": "ide_db",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_proc_macro_api-0.0.358//:ra_ap_proc_macro_api": "proc_macro_api",
+        "@vendor_ts__ra_ap_project_model-0.0.358//:ra_ap_project_model": "project_model",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs": "vfs",
+        "@vendor_ts__ra_ap_vfs-notify-0.0.358//:ra_ap_vfs_notify": "vfs_notify",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_load-cargo",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__anyhow-1.0.104//:anyhow",
+        "@vendor_ts__crossbeam-channel-0.5.17//:crossbeam_channel",
+        "@vendor_ts__itertools-0.15.0//:itertools",
+        "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_ide_db-0.0.358//:ra_ap_ide_db",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+        "@vendor_ts__ra_ap_proc_macro_api-0.0.358//:ra_ap_proc_macro_api",
+        "@vendor_ts__ra_ap_project_model-0.0.358//:ra_ap_project_model",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt",
+        "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs",
+        "@vendor_ts__ra_ap_vfs-notify-0.0.358//:ra_ap_vfs_notify",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_macros-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_macros-0.0.358.bazel
new file mode 100644
index 000000000000..dd4bf47183a7
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_macros-0.0.358.bazel
@@ -0,0 +1,117 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "ra_ap_macros",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_macros",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
+        "@vendor_ts__synstructure-0.13.2//:synstructure",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.301.bazel
deleted file mode 100644
index bdf4d2970741..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.301.bazel
+++ /dev/null
@@ -1,118 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_mbe",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-bridge-0.0.301//:ra_ap_syntax_bridge": "syntax_bridge",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_mbe",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__arrayvec-0.7.6//:arrayvec",
-        "@vendor_ts__cov-mark-2.1.0//:cov_mark",
-        "@vendor_ts__ra-ap-rustc_lexer-0.123.0//:ra_ap_rustc_lexer",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
-        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-bridge-0.0.301//:ra_ap_syntax_bridge",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__smallvec-1.15.1//:smallvec",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.358.bazel
new file mode 100644
index 000000000000..4dad10228692
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.358.bazel
@@ -0,0 +1,134 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_mbe",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.358//:ra_ap_syntax_bridge": "syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_mbe",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.8//:arrayvec",
+        "@vendor_ts__bitflags-2.13.2//:bitflags",
+        "@vendor_ts__cov-mark-2.2.0//:cov_mark",
+        "@vendor_ts__ra-ap-rustc_lexer-0.166.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+        "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.358//:ra_ap_syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__salsa-0.28.5//:salsa",
+        "@vendor_ts__smallvec-1.16.1//:smallvec",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.301.bazel
deleted file mode 100644
index 2134a4d9cbc2..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.301.bazel
+++ /dev/null
@@ -1,111 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_parser",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_edition-0.0.301//:ra_ap_edition": "edition",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "tracing",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_parser",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__drop_bomb-0.1.5//:drop_bomb",
-        "@vendor_ts__ra-ap-rustc_lexer-0.123.0//:ra_ap_rustc_lexer",
-        "@vendor_ts__ra_ap_edition-0.0.301//:ra_ap_edition",
-        "@vendor_ts__rustc-literal-escaper-0.0.4//:rustc_literal_escaper",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.358.bazel
new file mode 100644
index 000000000000..7939864da411
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.358.bazel
@@ -0,0 +1,125 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_parser",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_edition-0.0.358//:ra_ap_edition": "edition",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_parser",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__drop_bomb-0.1.5//:drop_bomb",
+        "@vendor_ts__ra-ap-rustc_lexer-0.166.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_edition-0.0.358//:ra_ap_edition",
+        "@vendor_ts__rustc-literal-escaper-0.0.7//:rustc_literal_escaper",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+        "@vendor_ts__winnow-0.7.13//:winnow",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.301.bazel
deleted file mode 100644
index 5210ea74ec8e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.301.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_paths",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "serde1",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_paths",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__camino-1.1.12//:camino",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.358.bazel
new file mode 100644
index 000000000000..a889589d6def
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.358.bazel
@@ -0,0 +1,117 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_paths",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "serde1",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_paths",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__camino-1.2.6//:camino",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.301.bazel
deleted file mode 100644
index f0e9033583f7..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.301.bazel
+++ /dev/null
@@ -1,119 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_proc_macro_api",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths": "paths",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    proc_macro_deps = [
-        "@vendor_ts__serde_derive-1.0.228//:serde_derive",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_proc_macro_api",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__indexmap-2.14.0//:indexmap",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
-        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__serde-1.0.228//:serde",
-        "@vendor_ts__serde_json-1.0.145//:serde_json",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.358.bazel
new file mode 100644
index 000000000000..297cce48499b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.358.bazel
@@ -0,0 +1,139 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_proc_macro_api",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__serde_derive-1.0.229//:serde_derive",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_proc_macro_api",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__indexmap-2.14.2//:indexmap",
+        "@vendor_ts__postcard-1.1.3//:postcard",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+        "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt",
+        "@vendor_ts__rayon-1.12.0//:rayon",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__semver-1.0.28//:semver",
+        "@vendor_ts__serde-1.0.229//:serde",
+        "@vendor_ts__serde_json-1.0.154//:serde_json",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.301.bazel
deleted file mode 100644
index cb28397b3ab3..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.301.bazel
+++ /dev/null
@@ -1,154 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_profile",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_profile",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
-            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
-            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
-            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
-            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
-            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
-            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
-            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
-        ],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
-            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
-            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
-            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
-            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.358.bazel
new file mode 100644
index 000000000000..f188b99f623a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.358.bazel
@@ -0,0 +1,167 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_profile",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_profile",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__perf-event-0.4.8//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos"), any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__perf-event-0.4.8//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos"), any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")))
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__perf-event-0.4.8//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos"), any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")))
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+        ],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__perf-event-0.4.8//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos"), any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__perf-event-0.4.8//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos"), any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")))
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.301.bazel
deleted file mode 100644
index 0939c28b54b1..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.301.bazel
+++ /dev/null
@@ -1,129 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_project_model",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths": "paths",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_toolchain-0.0.301//:ra_ap_toolchain": "toolchain",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    proc_macro_deps = [
-        "@vendor_ts__serde_derive-1.0.228//:serde_derive",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_project_model",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__anyhow-1.0.100//:anyhow",
-        "@vendor_ts__cargo_metadata-0.21.0//:cargo_metadata",
-        "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__la-arena-0.3.1//:la_arena",
-        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
-        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_toolchain-0.0.301//:ra_ap_toolchain",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__semver-1.0.28//:semver",
-        "@vendor_ts__serde-1.0.228//:serde",
-        "@vendor_ts__serde_json-1.0.145//:serde_json",
-        "@vendor_ts__temp-dir-0.1.16//:temp_dir",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-        "@vendor_ts__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.358.bazel
new file mode 100644
index 000000000000..e719e4c05330
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.358.bazel
@@ -0,0 +1,146 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_project_model",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_toolchain-0.0.358//:ra_ap_toolchain": "toolchain",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__serde_derive-1.0.229//:serde_derive",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_project_model",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__anyhow-1.0.104//:anyhow",
+        "@vendor_ts__cargo_metadata-0.23.1//:cargo_metadata",
+        "@vendor_ts__itertools-0.15.0//:itertools",
+        "@vendor_ts__la-arena-0.3.1//:la_arena",
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+        "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_toolchain-0.0.358//:ra_ap_toolchain",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__semver-1.0.28//:semver",
+        "@vendor_ts__serde-1.0.229//:serde",
+        "@vendor_ts__serde_json-1.0.154//:serde_json",
+        "@vendor_ts__toml-1.1.8-spec-1.1.0//:toml",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+        "@vendor_ts__triomphe-0.1.17//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.301.bazel
deleted file mode 100644
index ccd6eb8aefa3..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.301.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "ra_ap_query_group_macro",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_query-group-macro",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.301.bazel
deleted file mode 100644
index 0b47ce033472..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.301.bazel
+++ /dev/null
@@ -1,116 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_span",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs": "vfs",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "salsa",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_span",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
-        "@vendor_ts__la-arena-0.3.1//:la_arena",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-0.23.0//:salsa",
-        "@vendor_ts__text-size-1.1.1//:text_size",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.358.bazel
new file mode 100644
index 000000000000..0f8fcc8ba492
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.358.bazel
@@ -0,0 +1,130 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_span",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs": "vfs",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "salsa",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_span",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__hashbrown-0.17.1//:hashbrown",
+        "@vendor_ts__la-arena-0.3.1//:la_arena",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__salsa-0.28.5//:salsa",
+        "@vendor_ts__text-size-1.1.1//:text_size",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.301.bazel
deleted file mode 100644
index 41c6f4f8cc72..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.301.bazel
+++ /dev/null
@@ -1,199 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_stdx",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_stdx",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
-        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
-        "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__jod-thread-1.0.0//:jod_thread",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__miow-0.6.1//:miow",  # cfg(windows)
-            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__miow-0.6.1//:miow",  # cfg(windows)
-            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__miow-0.6.1//:miow",  # cfg(windows)
-            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.358.bazel
new file mode 100644
index 000000000000..b58a65cb9a08
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.358.bazel
@@ -0,0 +1,237 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_stdx",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_stdx",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__crossbeam-channel-0.5.17//:crossbeam_channel",
+        "@vendor_ts__crossbeam-utils-0.8.23//:crossbeam_utils",
+        "@vendor_ts__itertools-0.15.0//:itertools",
+        "@vendor_ts__jod-thread-1.0.0//:jod_thread",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__miow-0.6.1//:miow",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__miow-0.6.1//:miow",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__miow-0.6.1//:miow",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # cfg(unix)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.301.bazel
deleted file mode 100644
index e5548afe6ab0..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.301.bazel
+++ /dev/null
@@ -1,114 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_syntax",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_syntax",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__either-1.15.0//:either",
-        "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__rowan-0.15.15//:rowan",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__rustc-literal-escaper-0.0.4//:rustc_literal_escaper",
-        "@vendor_ts__smol_str-0.3.2//:smol_str",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-        "@vendor_ts__triomphe-0.1.14//:triomphe",
-    ],
-)
-exports_files(["rust.ungram"])
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.358.bazel
new file mode 100644
index 000000000000..877cda956c98
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.358.bazel
@@ -0,0 +1,133 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_syntax",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_syntax",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__either-1.19.0//:either",
+        "@vendor_ts__itertools-0.15.0//:itertools",
+        "@vendor_ts__ra-ap-rustc_lexer-0.166.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__rowan-0.17.0//:rowan",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__rustc-literal-escaper-0.0.7//:rustc_literal_escaper",
+        "@vendor_ts__smallvec-1.16.1//:smallvec",
+        "@vendor_ts__smol_str-0.3.6//:smol_str",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+        "@vendor_ts__triomphe-0.1.17//:triomphe",
+    ],
+)
+exports_files(["rust.ungram"])
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.301.bazel
deleted file mode 100644
index 646c0f8c2f45..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.301.bazel
+++ /dev/null
@@ -1,114 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_syntax_bridge",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_syntax-bridge",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
-        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
-        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.358.bazel
new file mode 100644
index 000000000000..c08fa8bf8d02
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.358.bazel
@@ -0,0 +1,128 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_syntax_bridge",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_syntax-bridge",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+        "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_test_fixture-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_test_fixture-0.0.358.bazel
new file mode 100644
index 000000000000..14ed4c4ca7ce
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_test_fixture-0.0.358.bazel
@@ -0,0 +1,137 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_test_fixture",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_test_utils-0.0.358//:ra_ap_test_utils": "test_utils",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_test_fixture",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+        "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_test_utils-0.0.358//:ra_ap_test_utils",
+        "@vendor_ts__ra_ap_tt-0.0.358//:ra_ap_tt",
+        "@vendor_ts__triomphe-0.1.17//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_test_utils-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_test_utils-0.0.358.bazel
new file mode 100644
index 000000000000..d3aecef42996
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_test_utils-0.0.358.bazel
@@ -0,0 +1,124 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_test_utils",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_profile-0.0.358//:ra_ap_profile": "profile",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_test_utils",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__dissimilar-1.0.11//:dissimilar",
+        "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths",
+        "@vendor_ts__ra_ap_profile-0.0.358//:ra_ap_profile",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__text-size-1.1.1//:text_size",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.301.bazel
deleted file mode 100644
index 2956a594ec11..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.301.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_toolchain",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_toolchain",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__camino-1.1.12//:camino",
-        "@vendor_ts__home-0.5.11//:home",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.358.bazel
new file mode 100644
index 000000000000..e1cba866558c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.358.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_toolchain",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_toolchain",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__camino-1.2.6//:camino",
+        "@vendor_ts__semver-1.0.28//:semver",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.301.bazel
deleted file mode 100644
index e5b2117f769c..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.301.bazel
+++ /dev/null
@@ -1,108 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_tt",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_tt",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__arrayvec-0.7.6//:arrayvec",
-        "@vendor_ts__ra-ap-rustc_lexer-0.123.0//:ra_ap_rustc_lexer",
-        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__text-size-1.1.1//:text_size",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.358.bazel
new file mode 100644
index 000000000000..943afa2c67e0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.358.bazel
@@ -0,0 +1,125 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_tt",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_tt",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.8//:arrayvec",
+        "@vendor_ts__ra-ap-rustc_lexer-0.166.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__text-size-1.1.1//:text_size",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.301.bazel
deleted file mode 100644
index 4508df3a376f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.301.bazel
+++ /dev/null
@@ -1,111 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_vfs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths": "paths",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_vfs",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
-        "@vendor_ts__fst-0.4.7//:fst",
-        "@vendor_ts__indexmap-2.14.0//:indexmap",
-        "@vendor_ts__nohash-hasher-0.2.0//:nohash_hasher",
-        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.358.bazel
new file mode 100644
index 000000000000..d27a35d12c30
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.358.bazel
@@ -0,0 +1,125 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_vfs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_vfs",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__crossbeam-channel-0.5.17//:crossbeam_channel",
+        "@vendor_ts__fst-0.4.7//:fst",
+        "@vendor_ts__indexmap-2.14.2//:indexmap",
+        "@vendor_ts__nohash-hasher-0.2.0//:nohash_hasher",
+        "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.301.bazel
deleted file mode 100644
index e0c3859bfa37..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.301.bazel
+++ /dev/null
@@ -1,113 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ra_ap_vfs_notify",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths": "paths",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs": "vfs",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_vfs-notify",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.301",
-    deps = [
-        "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
-        "@vendor_ts__notify-8.2.0//:notify",
-        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths",
-        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
-        "@vendor_ts__rayon-1.11.0//:rayon",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-        "@vendor_ts__walkdir-2.5.0//:walkdir",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.358.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.358.bazel
new file mode 100644
index 000000000000..e560b480a75f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.358.bazel
@@ -0,0 +1,127 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_vfs_notify",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs": "vfs",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_vfs-notify",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.358",
+    deps = [
+        "@vendor_ts__crossbeam-channel-0.5.17//:crossbeam_channel",
+        "@vendor_ts__notify-8.2.0//:notify",
+        "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths",
+        "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs",
+        "@vendor_ts__rayon-1.12.0//:rayon",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+        "@vendor_ts__walkdir-2.5.0//:walkdir",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.10.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.10.3.bazel
new file mode 100644
index 000000000000..2bf175ab21f5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.10.3.bazel
@@ -0,0 +1,124 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "rand",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "std",
+        "std_rng",
+        "sys_rng",
+        "thread_rng",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rand",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.10.3",
+    deps = [
+        "@vendor_ts__chacha20-0.10.2//:chacha20",
+        "@vendor_ts__getrandom-0.4.3//:getrandom",
+        "@vendor_ts__rand_core-0.10.1//:rand_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.2.bazel
deleted file mode 100644
index adf2414f3af0..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.2.bazel
+++ /dev/null
@@ -1,110 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "rand",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "default",
-        "os_rng",
-        "small_rng",
-        "std",
-        "std_rng",
-        "thread_rng",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rand",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.9.2",
-    deps = [
-        "@vendor_ts__rand_chacha-0.9.0//:rand_chacha",
-        "@vendor_ts__rand_core-0.9.3//:rand_core",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.9.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.9.0.bazel
deleted file mode 100644
index 63fd0014d763..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.9.0.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "rand_chacha",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rand_chacha",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.9.0",
-    deps = [
-        "@vendor_ts__ppv-lite86-0.2.21//:ppv_lite86",
-        "@vendor_ts__rand_core-0.9.3//:rand_core",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.10.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.10.1.bazel
new file mode 100644
index 000000000000..ab4f39373fa0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.10.1.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "rand_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rand_core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.10.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.3.bazel
deleted file mode 100644
index 0ae8f72c2617..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.3.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "rand_core",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "os_rng",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rand_core",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.9.3",
-    deps = [
-        "@vendor_ts__getrandom-0.3.3//:getrandom",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.11.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.11.0.bazel
deleted file mode 100644
index c867d354a77c..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.11.0.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "rayon",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rayon",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.11.0",
-    deps = [
-        "@vendor_ts__either-1.15.0//:either",
-        "@vendor_ts__rayon-core-1.13.0//:rayon_core",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.12.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.12.0.bazel
new file mode 100644
index 000000000000..a0da12a70abc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.12.0.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "rayon",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rayon",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.12.0",
+    deps = [
+        "@vendor_ts__either-1.19.0//:either",
+        "@vendor_ts__rayon-core-1.13.0//:rayon_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.13.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.13.0.bazel
index 29542077f377..69949736422b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.13.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.13.0.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,9 +113,9 @@ rust_library(
     }),
     version = "1.13.0",
     deps = [
-        "@vendor_ts__crossbeam-deque-0.8.6//:crossbeam_deque",
-        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
-        "@vendor_ts__rayon-core-1.13.0//:build_script_build",
+        ":build_script_build",
+        "@vendor_ts__crossbeam-deque-0.8.8//:crossbeam_deque",
+        "@vendor_ts__crossbeam-utils-0.8.23//:crossbeam_utils",
     ],
 )
 
@@ -111,6 +125,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -139,6 +156,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     links = "rayon-core",
     pkg_name = "rayon-core",
     rustc_env_files = [
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.17.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.17.bazel
deleted file mode 100644
index ec928fcac82c..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.17.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "syscall",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=redox_syscall",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.5.17",
-    deps = [
-        "@vendor_ts__bitflags-2.9.4//:bitflags",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.18.bazel
new file mode 100644
index 000000000000..c5f6187dd6e9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.18.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "syscall",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=redox_syscall",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.5.18",
+    deps = [
+        "@vendor_ts__bitflags-2.13.2//:bitflags",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.24.bazel
deleted file mode 100644
index 8b96305dfa7a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.24.bazel
+++ /dev/null
@@ -1,165 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ref_cast",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__ref-cast-impl-1.0.24//:ref_cast_impl",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ref-cast",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.24",
-    deps = [
-        "@vendor_ts__ref-cast-1.0.24//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "ref-cast",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ref-cast",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.24",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.26.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.26.bazel
new file mode 100644
index 000000000000..22041bab17ea
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.26.bazel
@@ -0,0 +1,183 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ref_cast",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor_ts__ref-cast-impl-1.0.26//:ref_cast_impl",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ref-cast",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.26",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "ref-cast",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ref-cast",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.26",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.24.bazel
deleted file mode 100644
index 56045a5d8dde..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.24.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "ref_cast_impl",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ref-cast-impl",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.24",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.26.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.26.bazel
new file mode 100644
index 000000000000..0188c1ca52e4
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.26.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "ref_cast_impl",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ref-cast-impl",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.26",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-3.0.9//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.3.bazel
deleted file mode 100644
index 2dff7cf54448..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.3.bazel
+++ /dev/null
@@ -1,122 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "regex",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "perf",
-        "perf-backtrack",
-        "perf-cache",
-        "perf-dfa",
-        "perf-inline",
-        "perf-literal",
-        "perf-onepass",
-        "std",
-        "unicode",
-        "unicode-age",
-        "unicode-bool",
-        "unicode-case",
-        "unicode-gencat",
-        "unicode-perl",
-        "unicode-script",
-        "unicode-segment",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=regex",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.11.3",
-    deps = [
-        "@vendor_ts__aho-corasick-1.1.3//:aho_corasick",
-        "@vendor_ts__memchr-2.7.5//:memchr",
-        "@vendor_ts__regex-automata-0.4.11//:regex_automata",
-        "@vendor_ts__regex-syntax-0.8.6//:regex_syntax",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.13.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.13.1.bazel
new file mode 100644
index 000000000000..1606766a09e9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.13.1.bazel
@@ -0,0 +1,136 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "regex",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "perf",
+        "perf-backtrack",
+        "perf-cache",
+        "perf-dfa",
+        "perf-inline",
+        "perf-literal",
+        "perf-onepass",
+        "std",
+        "unicode",
+        "unicode-age",
+        "unicode-bool",
+        "unicode-case",
+        "unicode-gencat",
+        "unicode-perl",
+        "unicode-script",
+        "unicode-segment",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=regex",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.13.1",
+    deps = [
+        "@vendor_ts__aho-corasick-1.1.5//:aho_corasick",
+        "@vendor_ts__memchr-2.8.3//:memchr",
+        "@vendor_ts__regex-automata-0.4.18//:regex_automata",
+        "@vendor_ts__regex-syntax-0.8.11//:regex_syntax",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.11.bazel
deleted file mode 100644
index 77270d5287f7..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.11.bazel
+++ /dev/null
@@ -1,130 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "regex_automata",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "dfa-build",
-        "dfa-onepass",
-        "dfa-search",
-        "hybrid",
-        "meta",
-        "nfa",
-        "nfa-backtrack",
-        "nfa-pikevm",
-        "nfa-thompson",
-        "perf",
-        "perf-inline",
-        "perf-literal",
-        "perf-literal-multisubstring",
-        "perf-literal-substring",
-        "std",
-        "syntax",
-        "unicode",
-        "unicode-age",
-        "unicode-bool",
-        "unicode-case",
-        "unicode-gencat",
-        "unicode-perl",
-        "unicode-script",
-        "unicode-segment",
-        "unicode-word-boundary",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=regex-automata",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.11",
-    deps = [
-        "@vendor_ts__aho-corasick-1.1.3//:aho_corasick",
-        "@vendor_ts__memchr-2.7.5//:memchr",
-        "@vendor_ts__regex-syntax-0.8.6//:regex_syntax",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.18.bazel
new file mode 100644
index 000000000000..2ede58def494
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.18.bazel
@@ -0,0 +1,144 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "regex_automata",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "dfa-build",
+        "dfa-onepass",
+        "dfa-search",
+        "hybrid",
+        "meta",
+        "nfa",
+        "nfa-backtrack",
+        "nfa-pikevm",
+        "nfa-thompson",
+        "perf",
+        "perf-inline",
+        "perf-literal",
+        "perf-literal-multisubstring",
+        "perf-literal-substring",
+        "std",
+        "syntax",
+        "unicode",
+        "unicode-age",
+        "unicode-bool",
+        "unicode-case",
+        "unicode-gencat",
+        "unicode-perl",
+        "unicode-script",
+        "unicode-segment",
+        "unicode-word-boundary",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=regex-automata",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.18",
+    deps = [
+        "@vendor_ts__aho-corasick-1.1.5//:aho_corasick",
+        "@vendor_ts__memchr-2.8.3//:memchr",
+        "@vendor_ts__regex-syntax-0.8.11//:regex_syntax",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.11.bazel
new file mode 100644
index 000000000000..efbbec5bc01c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.11.bazel
@@ -0,0 +1,123 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "regex_syntax",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+        "unicode",
+        "unicode-age",
+        "unicode-bool",
+        "unicode-case",
+        "unicode-gencat",
+        "unicode-perl",
+        "unicode-script",
+        "unicode-segment",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=regex-syntax",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.11",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.6.bazel
deleted file mode 100644
index 20579d899f00..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.6.bazel
+++ /dev/null
@@ -1,109 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "regex_syntax",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-        "unicode",
-        "unicode-age",
-        "unicode-bool",
-        "unicode-case",
-        "unicode-gencat",
-        "unicode-perl",
-        "unicode-script",
-        "unicode-segment",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=regex-syntax",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.6",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel
deleted file mode 100644
index 45eaa325827e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "rowan",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rowan",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.15.15",
-    deps = [
-        "@vendor_ts__countme-3.0.1//:countme",
-        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
-        "@vendor_ts__memoffset-0.9.1//:memoffset",
-        "@vendor_ts__rustc-hash-1.1.0//:rustc_hash",
-        "@vendor_ts__text-size-1.1.1//:text_size",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.17.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.17.0.bazel
new file mode 100644
index 000000000000..b69da541f8c6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.17.0.bazel
@@ -0,0 +1,118 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "rowan",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rowan",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.17.0",
+    deps = [
+        "@vendor_ts__countme-3.0.1//:countme",
+        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
+        "@vendor_ts__memoffset-0.9.1//:memoffset",
+        "@vendor_ts__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor_ts__text-size-1.1.1//:text_size",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-1.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-1.1.0.bazel
index c2d2a8ecadbd..5494c11f99dc 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-1.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-1.1.0.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel
deleted file mode 100644
index 233e17d90857..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "rustc_hash",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rustc-hash",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.1.1",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.3.bazel
new file mode 100644
index 000000000000..378015edccf1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.3.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "rustc_hash",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rustc-hash",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.1.3",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.4.bazel
deleted file mode 100644
index 8a273994a826..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.4.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "rustc_literal_escaper",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rustc-literal-escaper",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.4",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.7.bazel
new file mode 100644
index 000000000000..5988f46c20ee
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.7.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "rustc_literal_escaper",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rustc-literal-escaper",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.7",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.2.bazel
index 0803a2e277ee..ecee3c545b73 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.2.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel
index 0bf752345746..35f52ea1c617 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,9 +113,9 @@ rust_library(
     }),
     version = "0.2.3+llvm-462a31f5a5ab",
     deps = [
-        "@vendor_ts__bitflags-2.9.4//:bitflags",
-        "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:build_script_build",
-        "@vendor_ts__smallvec-1.15.1//:smallvec",
+        ":build_script_build",
+        "@vendor_ts__bitflags-2.13.2//:bitflags",
+        "@vendor_ts__smallvec-1.16.1//:smallvec",
     ],
 )
 
@@ -111,6 +125,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -139,6 +156,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "rustc_apfloat",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.22.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.22.bazel
deleted file mode 100644
index 442f3ba05905..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.22.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "rustversion",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rustversion",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.22",
-    deps = [
-        "@vendor_ts__rustversion-1.0.22//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build/build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "rustversion",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rustversion",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.22",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.23.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.23.bazel
new file mode 100644
index 000000000000..57a22a4437a5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.23.bazel
@@ -0,0 +1,180 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "rustversion",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rustversion",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.23",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build/build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    emit_warnings = False,
+    pkg_name = "rustversion",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rustversion",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.23",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.20.bazel
deleted file mode 100644
index 8550c107af8a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.20.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ryu",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ryu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.20",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.23.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.23.bazel
new file mode 100644
index 000000000000..2bcb69c9e5ee
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.23.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ryu",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ryu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.23",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.23.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.23.0.bazel
deleted file mode 100644
index 5e02ff49c087..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.23.0.bazel
+++ /dev/null
@@ -1,124 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "salsa",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "macros",
-        "rayon",
-        "salsa_unstable",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=salsa",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.23.0",
-    deps = [
-        "@vendor_ts__boxcar-0.2.14//:boxcar",
-        "@vendor_ts__crossbeam-queue-0.3.12//:crossbeam_queue",
-        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
-        "@vendor_ts__hashbrown-0.15.5//:hashbrown",
-        "@vendor_ts__hashlink-0.10.0//:hashlink",
-        "@vendor_ts__indexmap-2.14.0//:indexmap",
-        "@vendor_ts__intrusive-collections-0.9.7//:intrusive_collections",
-        "@vendor_ts__papaya-0.2.3//:papaya",
-        "@vendor_ts__parking_lot-0.12.4//:parking_lot",
-        "@vendor_ts__portable-atomic-1.11.1//:portable_atomic",
-        "@vendor_ts__rayon-1.11.0//:rayon",
-        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-macro-rules-0.23.0//:salsa_macro_rules",
-        "@vendor_ts__smallvec-1.15.1//:smallvec",
-        "@vendor_ts__thin-vec-0.2.14//:thin_vec",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.28.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.28.5.bazel
new file mode 100644
index 000000000000..060fa5375bab
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.28.5.bazel
@@ -0,0 +1,141 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "salsa",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "inventory",
+        "macros",
+        "rayon",
+        "salsa_unstable",
+        "triomphe",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__salsa-macros-0.28.5//:salsa_macros",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=salsa",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.28.5",
+    deps = [
+        "@vendor_ts__boxcar-0.2.14//:boxcar",
+        "@vendor_ts__crossbeam-queue-0.3.14//:crossbeam_queue",
+        "@vendor_ts__crossbeam-utils-0.8.23//:crossbeam_utils",
+        "@vendor_ts__hashbrown-0.17.1//:hashbrown",
+        "@vendor_ts__hashlink-0.12.1//:hashlink",
+        "@vendor_ts__indexmap-2.14.2//:indexmap",
+        "@vendor_ts__intrusive-collections-0.10.3//:intrusive_collections",
+        "@vendor_ts__inventory-0.3.24//:inventory",
+        "@vendor_ts__parking_lot-0.12.5//:parking_lot",
+        "@vendor_ts__portable-atomic-1.15.0//:portable_atomic",
+        "@vendor_ts__rayon-1.12.0//:rayon",
+        "@vendor_ts__rustc-hash-2.1.3//:rustc_hash",
+        "@vendor_ts__salsa-macro-rules-0.28.5//:salsa_macro_rules",
+        "@vendor_ts__smallvec-1.16.1//:smallvec",
+        "@vendor_ts__thin-vec-0.2.19//:thin_vec",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+        "@vendor_ts__triomphe-0.1.17//:triomphe",
+        "@vendor_ts__typeid-1.0.3//:typeid",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.23.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.23.0.bazel
deleted file mode 100644
index a3cc0e24a369..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.23.0.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "salsa_macro_rules",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=salsa-macro-rules",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.23.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.28.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.28.5.bazel
new file mode 100644
index 000000000000..95431e6bb612
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.28.5.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "salsa_macro_rules",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=salsa-macro-rules",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.28.5",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.23.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.23.0.bazel
deleted file mode 100644
index 5d9bd4b09356..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.23.0.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "salsa_macros",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=salsa-macros",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.23.0",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-        "@vendor_ts__synstructure-0.13.2//:synstructure",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.28.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.28.5.bazel
new file mode 100644
index 000000000000..c9245e7bdf1d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.28.5.bazel
@@ -0,0 +1,119 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "salsa_macros",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=salsa-macros",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.28.5",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-3.0.9//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel
index 1ae75e4d777f..e0b9957e4d90 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-0.9.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-0.9.0.bazel
index 69546680a9fb..b63d1f69f370 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-0.9.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-0.9.0.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -96,8 +110,8 @@ rust_library(
     version = "0.9.0",
     deps = [
         "@vendor_ts__dyn-clone-1.0.20//:dyn_clone",
-        "@vendor_ts__ref-cast-1.0.24//:ref_cast",
-        "@vendor_ts__serde-1.0.228//:serde",
-        "@vendor_ts__serde_json-1.0.145//:serde_json",
+        "@vendor_ts__ref-cast-1.0.26//:ref_cast",
+        "@vendor_ts__serde-1.0.229//:serde",
+        "@vendor_ts__serde_json-1.0.154//:serde_json",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-1.0.4.bazel
deleted file mode 100644
index 1fe84d175b39..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-1.0.4.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "schemars",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=schemars",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.4",
-    deps = [
-        "@vendor_ts__dyn-clone-1.0.20//:dyn_clone",
-        "@vendor_ts__ref-cast-1.0.24//:ref_cast",
-        "@vendor_ts__serde-1.0.228//:serde",
-        "@vendor_ts__serde_json-1.0.145//:serde_json",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-1.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-1.2.2.bazel
new file mode 100644
index 000000000000..fae6717e0db4
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-1.2.2.bazel
@@ -0,0 +1,117 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "schemars",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=schemars",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.2.2",
+    deps = [
+        "@vendor_ts__dyn-clone-1.0.20//:dyn_clone",
+        "@vendor_ts__ref-cast-1.0.26//:ref_cast",
+        "@vendor_ts__serde-1.0.229//:serde",
+        "@vendor_ts__serde_json-1.0.154//:serde_json",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scoped-tls-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scoped-tls-1.0.1.bazel
deleted file mode 100644
index 83ffd8145e73..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scoped-tls-1.0.1.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "scoped_tls",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=scoped-tls",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.1",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scopeguard-1.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scopeguard-1.2.0.bazel
index fd65460b9772..ff559c5d5732 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scopeguard-1.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scopeguard-1.2.0.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.seize-0.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.seize-0.5.0.bazel
deleted file mode 100644
index 192a60880283..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.seize-0.5.0.bazel
+++ /dev/null
@@ -1,117 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "seize",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "fast-barrier",
-        "libc",
-        "windows-sys",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=seize",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.5.0",
-    deps = [
-        "@vendor_ts__libc-0.2.175//:libc",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # aarch64-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # i686-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # x86_64-pc-windows-msvc
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.28.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.28.bazel
index 5c659d959e2c..99f3f9859eff 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.28.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.28.bazel
@@ -23,7 +23,7 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__serde_core-1.0.228//:serde_core": "serde",
+        "@vendor_ts__serde_core-1.0.229//:serde_core": "serde",
     },
     compile_data = glob(
         include = ["**"],
@@ -60,12 +60,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -77,13 +79,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -91,6 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -103,6 +117,6 @@ rust_library(
     }),
     version = "1.0.28",
     deps = [
-        "@vendor_ts__serde_core-1.0.228//:serde_core",
+        "@vendor_ts__serde_core-1.0.229//:serde_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.228.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.228.bazel
deleted file mode 100644
index f21954648d62..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.228.bazel
+++ /dev/null
@@ -1,180 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "serde",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "default",
-        "derive",
-        "serde_derive",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__serde_derive-1.0.228//:serde_derive",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.228",
-    deps = [
-        "@vendor_ts__serde-1.0.228//:build_script_build",
-        "@vendor_ts__serde_core-1.0.228//:serde_core",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "default",
-        "derive",
-        "serde_derive",
-        "std",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "serde",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.228",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.229.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.229.bazel
new file mode 100644
index 000000000000..2220c221cb00
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.229.bazel
@@ -0,0 +1,198 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "serde",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "derive",
+        "serde_derive",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor_ts__serde_derive-1.0.229//:serde_derive",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.229",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__serde_core-1.0.229//:serde_core",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "derive",
+        "serde_derive",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "serde",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.229",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-untagged-0.1.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-untagged-0.1.8.bazel
deleted file mode 100644
index 099925888d56..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-untagged-0.1.8.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "serde_untagged",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde-untagged",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.8",
-    deps = [
-        "@vendor_ts__erased-serde-0.4.6//:erased_serde",
-        "@vendor_ts__serde-1.0.228//:serde",
-        "@vendor_ts__typeid-1.0.3//:typeid",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-value-0.7.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-value-0.7.0.bazel
deleted file mode 100644
index 5ccd9ac3b516..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-value-0.7.0.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "serde_value",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde-value",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.7.0",
-    deps = [
-        "@vendor_ts__ordered-float-2.10.1//:ordered_float",
-        "@vendor_ts__serde-1.0.228//:serde",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_core-1.0.228.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_core-1.0.228.bazel
deleted file mode 100644
index 4f597ff13aca..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_core-1.0.228.bazel
+++ /dev/null
@@ -1,172 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "serde_core",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "result",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde_core",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.228",
-    deps = [
-        "@vendor_ts__serde_core-1.0.228//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "result",
-        "std",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "serde_core",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde_core",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.228",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_core-1.0.229.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_core-1.0.229.bazel
new file mode 100644
index 000000000000..77c22a839fe1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_core-1.0.229.bazel
@@ -0,0 +1,192 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "serde_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "result",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.229",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "result",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "serde_core",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.229",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.228.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.228.bazel
deleted file mode 100644
index f6d5b8be14a9..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.228.bazel
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "serde_derive",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde_derive",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.228",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.229.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.229.bazel
new file mode 100644
index 000000000000..dae15b8c4e9e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.229.bazel
@@ -0,0 +1,119 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "serde_derive",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_derive",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.229",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-3.0.9//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.145.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.145.bazel
deleted file mode 100644
index dbbf22985e33..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.145.bazel
+++ /dev/null
@@ -1,347 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "serde_json",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-        "unbounded_depth",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "indexmap",  # aarch64-apple-darwin
-            "preserve_order",  # aarch64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "indexmap",  # aarch64-pc-windows-msvc
-            "preserve_order",  # aarch64-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "indexmap",  # aarch64-unknown-linux-gnu
-            "preserve_order",  # aarch64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "indexmap",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
-            "preserve_order",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "indexmap",  # arm-unknown-linux-gnueabi
-            "preserve_order",  # arm-unknown-linux-gnueabi
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "indexmap",  # i686-pc-windows-msvc
-            "preserve_order",  # i686-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "indexmap",  # i686-unknown-linux-gnu
-            "preserve_order",  # i686-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "indexmap",  # powerpc-unknown-linux-gnu
-            "preserve_order",  # powerpc-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "indexmap",  # riscv64gc-unknown-linux-gnu
-            "preserve_order",  # riscv64gc-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "indexmap",  # s390x-unknown-linux-gnu
-            "preserve_order",  # s390x-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "indexmap",  # x86_64-apple-darwin
-            "preserve_order",  # x86_64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "indexmap",  # x86_64-pc-windows-msvc
-            "preserve_order",  # x86_64-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "indexmap",  # x86_64-unknown-freebsd
-            "preserve_order",  # x86_64-unknown-freebsd
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "indexmap",  # x86_64-unknown-linux-gnu
-            "preserve_order",  # x86_64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "indexmap",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
-            "preserve_order",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
-        ],
-        "//conditions:default": [],
-    }),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde_json",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.145",
-    deps = [
-        "@vendor_ts__itoa-1.0.15//:itoa",
-        "@vendor_ts__memchr-2.7.5//:memchr",
-        "@vendor_ts__ryu-1.0.20//:ryu",
-        "@vendor_ts__serde_core-1.0.228//:serde_core",
-        "@vendor_ts__serde_json-1.0.145//:build_script_build",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # aarch64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # aarch64-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # aarch64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # arm-unknown-linux-gnueabi
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # i686-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # i686-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # powerpc-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # riscv64gc-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # s390x-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # x86_64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # x86_64-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # x86_64-unknown-freebsd
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # x86_64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__indexmap-2.14.0//:indexmap",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
-        ],
-        "//conditions:default": [],
-    }),
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-        "unbounded_depth",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "indexmap",  # aarch64-apple-darwin
-            "preserve_order",  # aarch64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "indexmap",  # aarch64-pc-windows-msvc
-            "preserve_order",  # aarch64-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "indexmap",  # aarch64-unknown-linux-gnu
-            "preserve_order",  # aarch64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "indexmap",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
-            "preserve_order",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "indexmap",  # arm-unknown-linux-gnueabi
-            "preserve_order",  # arm-unknown-linux-gnueabi
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "indexmap",  # i686-pc-windows-msvc
-            "preserve_order",  # i686-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "indexmap",  # i686-unknown-linux-gnu
-            "preserve_order",  # i686-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "indexmap",  # powerpc-unknown-linux-gnu
-            "preserve_order",  # powerpc-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "indexmap",  # riscv64gc-unknown-linux-gnu
-            "preserve_order",  # riscv64gc-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "indexmap",  # s390x-unknown-linux-gnu
-            "preserve_order",  # s390x-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "indexmap",  # x86_64-apple-darwin
-            "preserve_order",  # x86_64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "indexmap",  # x86_64-pc-windows-msvc
-            "preserve_order",  # x86_64-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "indexmap",  # x86_64-unknown-freebsd
-            "preserve_order",  # x86_64-unknown-freebsd
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "indexmap",  # x86_64-unknown-linux-gnu
-            "preserve_order",  # x86_64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "indexmap",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
-            "preserve_order",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
-        ],
-        "//conditions:default": [],
-    }),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "serde_json",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde_json",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.145",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.154.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.154.bazel
new file mode 100644
index 000000000000..f2da5b9d499f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.154.bazel
@@ -0,0 +1,424 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "serde_json",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+        "unbounded_depth",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "alloc",  # aarch64-apple-darwin
+            "indexmap",  # aarch64-apple-darwin
+            "preserve_order",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "alloc",  # aarch64-pc-windows-msvc
+            "indexmap",  # aarch64-pc-windows-msvc
+            "preserve_order",  # aarch64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "alloc",  # aarch64-unknown-linux-gnu
+            "indexmap",  # aarch64-unknown-linux-gnu
+            "preserve_order",  # aarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "alloc",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+            "indexmap",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+            "preserve_order",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "alloc",  # arm-unknown-linux-gnueabi
+            "indexmap",  # arm-unknown-linux-gnueabi
+            "preserve_order",  # arm-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "alloc",  # i686-pc-windows-msvc
+            "indexmap",  # i686-pc-windows-msvc
+            "preserve_order",  # i686-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "alloc",  # i686-unknown-linux-gnu
+            "indexmap",  # i686-unknown-linux-gnu
+            "preserve_order",  # i686-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "alloc",  # loongarch64-unknown-linux-gnu
+            "indexmap",  # loongarch64-unknown-linux-gnu
+            "preserve_order",  # loongarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "alloc",  # powerpc-unknown-linux-gnu
+            "indexmap",  # powerpc-unknown-linux-gnu
+            "preserve_order",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "alloc",  # riscv64gc-unknown-linux-gnu
+            "indexmap",  # riscv64gc-unknown-linux-gnu
+            "preserve_order",  # riscv64gc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "alloc",  # s390x-unknown-linux-gnu
+            "indexmap",  # s390x-unknown-linux-gnu
+            "preserve_order",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "alloc",  # x86_64-apple-darwin
+            "indexmap",  # x86_64-apple-darwin
+            "preserve_order",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "alloc",  # x86_64-pc-windows-msvc
+            "indexmap",  # x86_64-pc-windows-msvc
+            "preserve_order",  # x86_64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "alloc",  # x86_64-unknown-freebsd
+            "indexmap",  # x86_64-unknown-freebsd
+            "preserve_order",  # x86_64-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "alloc",  # x86_64-unknown-linux-gnu
+            "indexmap",  # x86_64-unknown-linux-gnu
+            "preserve_order",  # x86_64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "alloc",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+            "indexmap",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+            "preserve_order",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+        ],
+        "//conditions:default": [],
+    }),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_json",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.154",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__itoa-1.0.18//:itoa",
+        "@vendor_ts__memchr-2.8.3//:memchr",
+        "@vendor_ts__serde_core-1.0.229//:serde_core",
+        "@vendor_ts__zmij-1.0.23//:zmij",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # aarch64-apple-darwin
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # aarch64-pc-windows-msvc
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # aarch64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # aarch64-unknown-linux-gnu
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # aarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # arm-unknown-linux-gnueabi
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # arm-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # i686-pc-windows-msvc
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # i686-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # i686-unknown-linux-gnu
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # i686-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # loongarch64-unknown-linux-gnu
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # loongarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # powerpc-unknown-linux-gnu
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # riscv64gc-unknown-linux-gnu
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # riscv64gc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # s390x-unknown-linux-gnu
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # x86_64-apple-darwin
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # x86_64-pc-windows-msvc
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # x86_64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # x86_64-unknown-freebsd
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # x86_64-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # x86_64-unknown-linux-gnu
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # x86_64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__foldhash-0.2.0//:foldhash",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+            "@vendor_ts__indexmap-2.14.2//:indexmap",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+        ],
+        "//conditions:default": [],
+    }),
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+        "unbounded_depth",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "alloc",  # aarch64-apple-darwin
+            "indexmap",  # aarch64-apple-darwin
+            "preserve_order",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "alloc",  # aarch64-pc-windows-msvc
+            "indexmap",  # aarch64-pc-windows-msvc
+            "preserve_order",  # aarch64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "alloc",  # aarch64-unknown-linux-gnu
+            "indexmap",  # aarch64-unknown-linux-gnu
+            "preserve_order",  # aarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "alloc",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+            "indexmap",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+            "preserve_order",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "alloc",  # arm-unknown-linux-gnueabi
+            "indexmap",  # arm-unknown-linux-gnueabi
+            "preserve_order",  # arm-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "alloc",  # i686-pc-windows-msvc
+            "indexmap",  # i686-pc-windows-msvc
+            "preserve_order",  # i686-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "alloc",  # i686-unknown-linux-gnu
+            "indexmap",  # i686-unknown-linux-gnu
+            "preserve_order",  # i686-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "alloc",  # loongarch64-unknown-linux-gnu
+            "indexmap",  # loongarch64-unknown-linux-gnu
+            "preserve_order",  # loongarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "alloc",  # powerpc-unknown-linux-gnu
+            "indexmap",  # powerpc-unknown-linux-gnu
+            "preserve_order",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "alloc",  # riscv64gc-unknown-linux-gnu
+            "indexmap",  # riscv64gc-unknown-linux-gnu
+            "preserve_order",  # riscv64gc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "alloc",  # s390x-unknown-linux-gnu
+            "indexmap",  # s390x-unknown-linux-gnu
+            "preserve_order",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "alloc",  # x86_64-apple-darwin
+            "indexmap",  # x86_64-apple-darwin
+            "preserve_order",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "alloc",  # x86_64-pc-windows-msvc
+            "indexmap",  # x86_64-pc-windows-msvc
+            "preserve_order",  # x86_64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "alloc",  # x86_64-unknown-freebsd
+            "indexmap",  # x86_64-unknown-freebsd
+            "preserve_order",  # x86_64-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "alloc",  # x86_64-unknown-linux-gnu
+            "indexmap",  # x86_64-unknown-linux-gnu
+            "preserve_order",  # x86_64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "alloc",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+            "indexmap",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+            "preserve_order",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+        ],
+        "//conditions:default": [],
+    }),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "serde_json",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_json",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.154",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.9.bazel
deleted file mode 100644
index c5d9c5336e6a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.9.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "serde_spanned",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "serde",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde_spanned",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.6.9",
-    deps = [
-        "@vendor_ts__serde-1.0.228//:serde",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.0.2.bazel
deleted file mode 100644
index ac82ae1e149a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.0.2.bazel
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "serde_spanned",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "serde",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde_spanned",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.2",
-    deps = [
-        "@vendor_ts__serde_core-1.0.228//:serde_core",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.1.2.bazel
new file mode 100644
index 000000000000..9d4e88482b26
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.1.2.bazel
@@ -0,0 +1,119 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "serde_spanned",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "serde",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_spanned",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.2",
+    deps = [
+        "@vendor_ts__serde_core-1.0.229//:serde_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.14.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.14.1.bazel
deleted file mode 100644
index 2500ec6a49ba..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.14.1.bazel
+++ /dev/null
@@ -1,110 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "serde_with",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "default",
-        "macros",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__serde_derive-1.0.228//:serde_derive",
-        "@vendor_ts__serde_with_macros-3.14.1//:serde_with_macros",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde_with",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "3.14.1",
-    deps = [
-        "@vendor_ts__serde-1.0.228//:serde",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.24.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.24.0.bazel
new file mode 100644
index 000000000000..58dda0cfa3a2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.24.0.bazel
@@ -0,0 +1,123 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "serde_with",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "macros",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor_ts__serde_with_macros-3.24.0//:serde_with_macros",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_with",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "3.24.0",
+    deps = [
+        "@vendor_ts__serde_core-1.0.229//:serde_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.14.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.14.1.bazel
deleted file mode 100644
index fe552ca2a284..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.14.1.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "serde_with_macros",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde_with_macros",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "3.14.1",
-    deps = [
-        "@vendor_ts__darling-0.21.3//:darling",
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.24.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.24.0.bazel
new file mode 100644
index 000000000000..0e61403140cc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.24.0.bazel
@@ -0,0 +1,117 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "serde_with_macros",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_with_macros",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "3.24.0",
+    deps = [
+        "@vendor_ts__darling-0.24.1//:darling",
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-3.0.9//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel
index 1cb0484417b3..389ed80cdf6d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -95,10 +109,10 @@ rust_library(
     }),
     version = "0.9.34+deprecated",
     deps = [
-        "@vendor_ts__indexmap-2.14.0//:indexmap",
-        "@vendor_ts__itoa-1.0.15//:itoa",
-        "@vendor_ts__ryu-1.0.20//:ryu",
-        "@vendor_ts__serde-1.0.228//:serde",
+        "@vendor_ts__indexmap-2.14.2//:indexmap",
+        "@vendor_ts__itoa-1.0.18//:itoa",
+        "@vendor_ts__ryu-1.0.23//:ryu",
+        "@vendor_ts__serde-1.0.229//:serde",
         "@vendor_ts__unsafe-libyaml-0.2.11//:unsafe_libyaml",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
index 504c16d3ed6b..79e330f02c6f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -95,6 +109,6 @@ rust_library(
     }),
     version = "0.1.7",
     deps = [
-        "@vendor_ts__lazy_static-1.5.0//:lazy_static",
+        "@vendor_ts__lazy_static-1.5.1//:lazy_static",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-1.3.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-1.3.0.bazel
deleted file mode 100644
index 1b3b26b2284d..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-1.3.0.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "shlex",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=shlex",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.3.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-2.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-2.0.1.bazel
new file mode 100644
index 000000000000..bea3634108c8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-2.0.1.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "shlex",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=shlex",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.0.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.simd-adler32-0.3.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.simd-adler32-0.3.9.bazel
new file mode 100644
index 000000000000..14aff999aed9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.simd-adler32-0.3.9.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "simd_adler32",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=simd-adler32",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.9",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.slab-0.4.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.slab-0.4.12.bazel
new file mode 100644
index 000000000000..5ed0ffdc88d2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.slab-0.4.12.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "slab",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=slab",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.12",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.15.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.15.1.bazel
deleted file mode 100644
index 9ffaf6afce71..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.15.1.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "smallvec",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "const_generics",
-        "const_new",
-        "union",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=smallvec",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.15.1",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.16.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.16.1.bazel
new file mode 100644
index 000000000000..a9c032f5e256
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.16.1.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "smallvec",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "const_generics",
+        "const_new",
+        "union",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=smallvec",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.16.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.2.bazel
deleted file mode 100644
index 954df9a6361e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.2.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "smol_str",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=smol_str",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.3.2",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.6.bazel
new file mode 100644
index 000000000000..593ebef66f05
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.6.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "smol_str",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=smol_str",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.6",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.0.bazel
deleted file mode 100644
index a726ed9d70a7..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.0.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "stable_deref_trait",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=stable_deref_trait",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.2.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.1.bazel
new file mode 100644
index 000000000000..7cb24c5d60aa
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.1.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "stable_deref_trait",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=stable_deref_trait",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.2.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.streaming-iterator-0.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.streaming-iterator-0.1.9.bazel
index 7f8b002061e4..1f0a245f1e20 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.streaming-iterator-0.1.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.streaming-iterator-0.1.9.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.strsim-0.11.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.strsim-0.11.1.bazel
index 2d86e10662ea..b190d4b87cf1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.strsim-0.11.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.strsim-0.11.1.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.106.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.106.bazel
deleted file mode 100644
index 50cde9ced991..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.106.bazel
+++ /dev/null
@@ -1,115 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "syn",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "clone-impls",
-        "default",
-        "derive",
-        "extra-traits",
-        "fold",
-        "full",
-        "parsing",
-        "printing",
-        "proc-macro",
-        "visit",
-        "visit-mut",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=syn",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.106",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__unicode-ident-1.0.19//:unicode_ident",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.119.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.119.bazel
new file mode 100644
index 000000000000..f5e0f0a7ec87
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.119.bazel
@@ -0,0 +1,128 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "syn",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "clone-impls",
+        "default",
+        "derive",
+        "extra-traits",
+        "full",
+        "parsing",
+        "printing",
+        "proc-macro",
+        "visit",
+        "visit-mut",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=syn",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.0.119",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__unicode-ident-1.0.24//:unicode_ident",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-3.0.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-3.0.9.bazel
new file mode 100644
index 000000000000..1f354fa72b62
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-3.0.9.bazel
@@ -0,0 +1,128 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "syn",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "clone-impls",
+        "default",
+        "derive",
+        "extra-traits",
+        "full",
+        "parsing",
+        "printing",
+        "proc-macro",
+        "visit",
+        "visit-mut",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=syn",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "3.0.9",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__unicode-ident-1.0.24//:unicode_ident",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.2.bazel
index fa9cc6081a5a..be3992f7ccfa 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.2.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,8 +113,8 @@ rust_library(
     }),
     version = "0.13.2",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.temp-dir-0.1.16.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.temp-dir-0.1.16.bazel
deleted file mode 100644
index 37f2db5c2100..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.temp-dir-0.1.16.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "temp_dir",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=temp-dir",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.16",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.text-size-1.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.text-size-1.1.1.bazel
index 7dadc9eea336..f2e388606b76 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.text-size-1.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.text-size-1.1.1.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.14.bazel
deleted file mode 100644
index c930359eefe1..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.14.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "thin_vec",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=thin-vec",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.14",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.19.bazel
new file mode 100644
index 000000000000..de2c84e7302b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.19.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "thin_vec",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=thin-vec",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.19",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.18.bazel
deleted file mode 100644
index 7ba5989625a1..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.18.bazel
+++ /dev/null
@@ -1,173 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "thiserror",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__thiserror-impl-2.0.18//:thiserror_impl",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=thiserror",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.18",
-    deps = [
-        "@vendor_ts__thiserror-2.0.18//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "thiserror",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=thiserror",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "2.0.18",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.20.bazel
new file mode 100644
index 000000000000..e093791a02e9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.20.bazel
@@ -0,0 +1,191 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "thiserror",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor_ts__thiserror-impl-2.0.20//:thiserror_impl",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=thiserror",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.0.20",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "thiserror",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=thiserror",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "2.0.20",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.18.bazel
deleted file mode 100644
index 1c39cdf06597..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.18.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "thiserror_impl",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=thiserror-impl",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.18",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.20.bazel
new file mode 100644
index 000000000000..20cc61c7e5ed
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.20.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "thiserror_impl",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=thiserror-impl",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.0.20",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-3.0.9//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.10.bazel
new file mode 100644
index 000000000000..1fc17eecf9a7
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.10.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "thread_local",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=thread_local",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.10",
+    deps = [
+        "@vendor_ts__cfg-if-1.0.4//:cfg_if",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.9.bazel
deleted file mode 100644
index 01efca587901..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.9.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "thread_local",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=thread_local",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.1.9",
-    deps = [
-        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.43.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.43.bazel
deleted file mode 100644
index c3ee5405393c..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.43.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "time",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=time",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.3.43",
-    deps = [
-        "@vendor_ts__deranged-0.5.3//:deranged",
-        "@vendor_ts__num-conv-0.1.0//:num_conv",
-        "@vendor_ts__powerfmt-0.2.0//:powerfmt",
-        "@vendor_ts__time-core-0.1.6//:time_core",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.55.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.55.bazel
new file mode 100644
index 000000000000..bf34b09e3da5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.55.bazel
@@ -0,0 +1,266 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "time",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "formatting",
+        "local-offset",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=time",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.55",
+    deps = [
+        "@vendor_ts__deranged-0.5.8//:deranged",
+        "@vendor_ts__num-conv-0.2.2//:num_conv",
+        "@vendor_ts__powerfmt-0.2.0//:powerfmt",
+        "@vendor_ts__time-core-0.1.9//:time_core",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # aarch64-apple-darwin
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # aarch64-apple-ios
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # aarch64-apple-ios
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # aarch64-apple-ios-macabi
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # aarch64-apple-ios-macabi
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__libc-0.2.189//:libc",  # aarch64-apple-ios-sim
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # aarch64-apple-ios-sim
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # aarch64-linux-android
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # aarch64-linux-android
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # aarch64-unknown-fuchsia
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # aarch64-unknown-fuchsia
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # aarch64-unknown-linux-gnu
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # aarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor_ts__libc-0.2.189//:libc",  # aarch64-unknown-nto-qnx710
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # aarch64-unknown-nto-qnx710
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # arm-unknown-linux-gnueabi
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # arm-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # arm-unknown-linux-musleabi
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # arm-unknown-linux-musleabi
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # armv7-linux-androideabi
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # armv7-linux-androideabi
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # armv7-unknown-linux-gnueabi
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # armv7-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # i686-apple-darwin
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # i686-apple-darwin
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # i686-linux-android
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # i686-linux-android
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # i686-unknown-freebsd
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # i686-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # i686-unknown-linux-gnu
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # i686-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # loongarch64-unknown-linux-gnu
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # loongarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # mips-unknown-linux-gnu
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # mips-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # powerpc-unknown-linux-gnu
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # riscv64gc-unknown-fuchsia
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # riscv64gc-unknown-fuchsia
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # riscv64gc-unknown-linux-gnu
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # riscv64gc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # s390x-unknown-linux-gnu
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # sparc64-unknown-linux-gnu
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # sparc64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # sparc64-unknown-netbsd
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # sparc64-unknown-netbsd
+        ],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # sparc64-unknown-openbsd
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # sparc64-unknown-openbsd
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__libc-0.2.189//:libc",  # wasm32-unknown-emscripten
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # wasm32-unknown-emscripten
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__libc-0.2.189//:libc",  # x86_64-apple-darwin
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__libc-0.2.189//:libc",  # x86_64-apple-ios
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # x86_64-apple-ios
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [
+            "@vendor_ts__libc-0.2.189//:libc",  # x86_64-apple-ios-macabi
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # x86_64-apple-ios-macabi
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__libc-0.2.189//:libc",  # x86_64-linux-android
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # x86_64-linux-android
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.189//:libc",  # x86_64-unknown-freebsd
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # x86_64-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.189//:libc",  # x86_64-unknown-fuchsia
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # x86_64-unknown-fuchsia
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # x86_64-unknown-linux-gnu
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # x86_64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.189//:libc",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+            "@vendor_ts__num_threads-0.1.7//:num_threads",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.6.bazel
deleted file mode 100644
index 57d22c65064b..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.6.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "time_core",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=time-core",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.6",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.9.bazel
new file mode 100644
index 000000000000..d370410ee040
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.9.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "time_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=time-core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.9",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.24.bazel
deleted file mode 100644
index 08d61498717e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.24.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "time_macros",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=time-macros",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.24",
-    deps = [
-        "@vendor_ts__num-conv-0.1.0//:num_conv",
-        "@vendor_ts__time-core-0.1.6//:time_core",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.32.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.32.bazel
new file mode 100644
index 000000000000..76521c772978
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.32.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "time_macros",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=time-macros",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.32",
+    deps = [
+        "@vendor_ts__num-conv-0.2.2//:num_conv",
+        "@vendor_ts__time-core-0.1.9//:time_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinystr-0.8.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinystr-0.8.1.bazel
deleted file mode 100644
index 896bfb0dd66a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinystr-0.8.1.bazel
+++ /dev/null
@@ -1,107 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "tinystr",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "zerovec",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__displaydoc-0.2.5//:displaydoc",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=tinystr",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.1",
-    deps = [
-        "@vendor_ts__zerovec-0.11.4//:zerovec",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinyvec-1.13.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinyvec-1.13.3.bazel
new file mode 100644
index 000000000000..fe2861891787
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinyvec-1.13.3.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "tinyvec",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tinyvec",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.13.3",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.23.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.23.bazel
deleted file mode 100644
index 50cb78eec1e8..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.23.bazel
+++ /dev/null
@@ -1,108 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "toml",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "display",
-        "parse",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=toml",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.23",
-    deps = [
-        "@vendor_ts__serde-1.0.228//:serde",
-        "@vendor_ts__serde_spanned-0.6.9//:serde_spanned",
-        "@vendor_ts__toml_datetime-0.6.11//:toml_datetime",
-        "@vendor_ts__toml_edit-0.22.27//:toml_edit",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.9.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.9.7.bazel
deleted file mode 100644
index fad5edad1a26..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.9.7.bazel
+++ /dev/null
@@ -1,112 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "toml",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "display",
-        "parse",
-        "serde",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=toml",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.9.7",
-    deps = [
-        "@vendor_ts__serde_core-1.0.228//:serde_core",
-        "@vendor_ts__serde_spanned-1.0.2//:serde_spanned",
-        "@vendor_ts__toml_datetime-0.7.2//:toml_datetime",
-        "@vendor_ts__toml_parser-1.1.2-spec-1.1.0//:toml_parser",
-        "@vendor_ts__toml_writer-1.0.3//:toml_writer",
-        "@vendor_ts__winnow-0.7.13//:winnow",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-1.1.8+spec-1.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-1.1.8+spec-1.1.0.bazel
new file mode 100644
index 000000000000..9a121614fdf6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-1.1.8+spec-1.1.0.bazel
@@ -0,0 +1,126 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "toml",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "display",
+        "parse",
+        "serde",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=toml",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.8+spec-1.1.0",
+    deps = [
+        "@vendor_ts__serde_core-1.0.229//:serde_core",
+        "@vendor_ts__serde_spanned-1.1.2//:serde_spanned",
+        "@vendor_ts__toml_datetime-1.1.2-spec-1.1.0//:toml_datetime",
+        "@vendor_ts__toml_parser-1.1.5-spec-1.1.0//:toml_parser",
+        "@vendor_ts__toml_writer-1.1.3-spec-1.1.0//:toml_writer",
+        "@vendor_ts__winnow-1.0.4//:winnow",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.11.bazel
deleted file mode 100644
index 2673acb9f664..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.11.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "toml_datetime",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "serde",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=toml_datetime",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.6.11",
-    deps = [
-        "@vendor_ts__serde-1.0.228//:serde",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.7.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.7.2.bazel
deleted file mode 100644
index f0a1a3502d03..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.7.2.bazel
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "toml_datetime",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "serde",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=toml_datetime",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.7.2",
-    deps = [
-        "@vendor_ts__serde_core-1.0.228//:serde_core",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-1.1.2+spec-1.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-1.1.2+spec-1.1.0.bazel
new file mode 100644
index 000000000000..be80b5f33721
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-1.1.2+spec-1.1.0.bazel
@@ -0,0 +1,119 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "toml_datetime",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "serde",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=toml_datetime",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.2+spec-1.1.0",
+    deps = [
+        "@vendor_ts__serde_core-1.0.229//:serde_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.27.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.27.bazel
deleted file mode 100644
index bdee26270825..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.27.bazel
+++ /dev/null
@@ -1,110 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "toml_edit",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "display",
-        "parse",
-        "serde",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=toml_edit",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.22.27",
-    deps = [
-        "@vendor_ts__indexmap-2.14.0//:indexmap",
-        "@vendor_ts__serde-1.0.228//:serde",
-        "@vendor_ts__serde_spanned-0.6.9//:serde_spanned",
-        "@vendor_ts__toml_datetime-0.6.11//:toml_datetime",
-        "@vendor_ts__toml_write-0.1.2//:toml_write",
-        "@vendor_ts__winnow-0.7.13//:winnow",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.1.2+spec-1.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.1.2+spec-1.1.0.bazel
deleted file mode 100644
index 3e9b84dd8a92..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.1.2+spec-1.1.0.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "toml_parser",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2024",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=toml_parser",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.1.2+spec-1.1.0",
-    deps = [
-        "@vendor_ts__winnow-1.0.2//:winnow",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.1.5+spec-1.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.1.5+spec-1.1.0.bazel
new file mode 100644
index 000000000000..617dce2d6be6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.1.5+spec-1.1.0.bazel
@@ -0,0 +1,118 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "toml_parser",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=toml_parser",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.5+spec-1.1.0",
+    deps = [
+        "@vendor_ts__winnow-1.0.4//:winnow",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_write-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_write-0.1.2.bazel
deleted file mode 100644
index 61e730c79391..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_write-0.1.2.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "toml_write",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=toml_write",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.2",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.0.3.bazel
deleted file mode 100644
index 2bed2419242d..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.0.3.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "toml_writer",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=toml_writer",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.3",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.1.3+spec-1.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.1.3+spec-1.1.0.bazel
new file mode 100644
index 000000000000..a3ec93c688ac
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.1.3+spec-1.1.0.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "toml_writer",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=toml_writer",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.3+spec-1.1.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.41.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.41.bazel
deleted file mode 100644
index 183d4cdd5865..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.41.bazel
+++ /dev/null
@@ -1,110 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "tracing",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "attributes",
-        "default",
-        "std",
-        "tracing-attributes",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    proc_macro_deps = [
-        "@vendor_ts__tracing-attributes-0.1.30//:tracing_attributes",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=tracing",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.41",
-    deps = [
-        "@vendor_ts__pin-project-lite-0.2.16//:pin_project_lite",
-        "@vendor_ts__tracing-core-0.1.34//:tracing_core",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.44.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.44.bazel
new file mode 100644
index 000000000000..ece67ce59d90
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.44.bazel
@@ -0,0 +1,124 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "tracing",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "attributes",
+        "default",
+        "std",
+        "tracing-attributes",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    proc_macro_deps = [
+        "@vendor_ts__tracing-attributes-0.1.31//:tracing_attributes",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tracing",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.44",
+    deps = [
+        "@vendor_ts__pin-project-lite-0.2.17//:pin_project_lite",
+        "@vendor_ts__tracing-core-0.1.36//:tracing_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.30.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.30.bazel
deleted file mode 100644
index 8f607d2a3218..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.30.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "tracing_attributes",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=tracing-attributes",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.30",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.31.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.31.bazel
new file mode 100644
index 000000000000..5492d72cbf3c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.31.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "tracing_attributes",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tracing-attributes",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.31",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.34.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.34.bazel
deleted file mode 100644
index c30ffdd41dfe..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.34.bazel
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "tracing_core",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "once_cell",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=tracing-core",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.34",
-    deps = [
-        "@vendor_ts__once_cell-1.21.3//:once_cell",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.36.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.36.bazel
new file mode 100644
index 000000000000..6b3918366163
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.36.bazel
@@ -0,0 +1,119 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "tracing_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "once_cell",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tracing-core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.36",
+    deps = [
+        "@vendor_ts__once_cell-1.21.4//:once_cell",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel
index 23e0eab2f412..0e6854943c45 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,8 +113,8 @@ rust_library(
     }),
     version = "0.2.0",
     deps = [
-        "@vendor_ts__lazy_static-1.5.0//:lazy_static",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-        "@vendor_ts__tracing-subscriber-0.3.20//:tracing_subscriber",
+        "@vendor_ts__lazy_static-1.5.1//:lazy_static",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+        "@vendor_ts__tracing-subscriber-0.3.23//:tracing_subscriber",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel
index 9cd5f33c7cd2..19253c5027bf 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,8 +113,8 @@ rust_library(
     }),
     version = "0.2.0",
     deps = [
-        "@vendor_ts__log-0.4.28//:log",
-        "@vendor_ts__once_cell-1.21.3//:once_cell",
-        "@vendor_ts__tracing-core-0.1.34//:tracing_core",
+        "@vendor_ts__log-0.4.34//:log",
+        "@vendor_ts__once_cell-1.21.4//:once_cell",
+        "@vendor_ts__tracing-core-0.1.36//:tracing_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.20.bazel
deleted file mode 100644
index f0c94ca745b6..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.20.bazel
+++ /dev/null
@@ -1,126 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "tracing_subscriber",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "ansi",
-        "default",
-        "env-filter",
-        "fmt",
-        "matchers",
-        "nu-ansi-term",
-        "once_cell",
-        "registry",
-        "sharded-slab",
-        "smallvec",
-        "std",
-        "thread_local",
-        "tracing",
-        "tracing-log",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=tracing-subscriber",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.3.20",
-    deps = [
-        "@vendor_ts__matchers-0.2.0//:matchers",
-        "@vendor_ts__nu-ansi-term-0.50.1//:nu_ansi_term",
-        "@vendor_ts__once_cell-1.21.3//:once_cell",
-        "@vendor_ts__regex-automata-0.4.11//:regex_automata",
-        "@vendor_ts__sharded-slab-0.1.7//:sharded_slab",
-        "@vendor_ts__smallvec-1.15.1//:smallvec",
-        "@vendor_ts__thread_local-1.1.9//:thread_local",
-        "@vendor_ts__tracing-0.1.41//:tracing",
-        "@vendor_ts__tracing-core-0.1.34//:tracing_core",
-        "@vendor_ts__tracing-log-0.2.0//:tracing_log",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.23.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.23.bazel
new file mode 100644
index 000000000000..d4a774010a0a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.23.bazel
@@ -0,0 +1,143 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "tracing_subscriber",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "ansi",
+        "default",
+        "env-filter",
+        "fmt",
+        "local-time",
+        "matchers",
+        "nu-ansi-term",
+        "once_cell",
+        "registry",
+        "sharded-slab",
+        "smallvec",
+        "std",
+        "thread_local",
+        "time",
+        "tracing",
+        "tracing-log",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tracing-subscriber",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.23",
+    deps = [
+        "@vendor_ts__matchers-0.2.0//:matchers",
+        "@vendor_ts__nu-ansi-term-0.50.3//:nu_ansi_term",
+        "@vendor_ts__once_cell-1.21.4//:once_cell",
+        "@vendor_ts__regex-automata-0.4.18//:regex_automata",
+        "@vendor_ts__sharded-slab-0.1.7//:sharded_slab",
+        "@vendor_ts__smallvec-1.16.1//:smallvec",
+        "@vendor_ts__thread_local-1.1.10//:thread_local",
+        "@vendor_ts__time-0.3.55//:time",
+        "@vendor_ts__tracing-0.1.44//:tracing",
+        "@vendor_ts__tracing-core-0.1.36//:tracing_core",
+        "@vendor_ts__tracing-log-0.2.0//:tracing_log",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-tree-0.4.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-tree-0.4.1.bazel
new file mode 100644
index 000000000000..947115d28467
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-tree-0.4.1.bazel
@@ -0,0 +1,121 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "tracing_tree",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "tracing-log",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tracing-tree",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.1",
+    deps = [
+        "@vendor_ts__nu-ansi-term-0.50.3//:nu_ansi_term",
+        "@vendor_ts__tracing-core-0.1.36//:tracing_core",
+        "@vendor_ts__tracing-log-0.2.0//:tracing_log",
+        "@vendor_ts__tracing-subscriber-0.3.23//:tracing_subscriber",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.26.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.26.8.bazel
deleted file mode 100644
index 98cdfaa4d2fd..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.26.8.bazel
+++ /dev/null
@@ -1,179 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "tree_sitter",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "binding_rust/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=tree-sitter",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.26.8",
-    deps = [
-        "@vendor_ts__regex-1.11.3//:regex",
-        "@vendor_ts__regex-syntax-0.8.6//:regex_syntax",
-        "@vendor_ts__streaming-iterator-0.1.9//:streaming_iterator",
-        "@vendor_ts__tree-sitter-0.26.8//:build_script_build",
-        "@vendor_ts__tree-sitter-language-0.1.5//:tree_sitter_language",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "binding_rust/build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    links = "tree-sitter",
-    pkg_name = "tree-sitter",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=tree-sitter",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.26.8",
-    visibility = ["//visibility:private"],
-    deps = [
-        "@vendor_ts__cc-1.2.61//:cc",
-        "@vendor_ts__serde_json-1.0.145//:serde_json",
-    ],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.26.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.26.9.bazel
new file mode 100644
index 000000000000..4aa778674503
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.26.9.bazel
@@ -0,0 +1,200 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "tree_sitter",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "binding_rust/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.26.9",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__regex-1.13.1//:regex",
+        "@vendor_ts__regex-syntax-0.8.11//:regex_syntax",
+        "@vendor_ts__streaming-iterator-0.1.9//:streaming_iterator",
+        "@vendor_ts__tree-sitter-language-0.1.7//:tree_sitter_language",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "binding_rust/build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    link_deps = [
+        "@vendor_ts__tree-sitter-language-0.1.7//:tree_sitter_language",
+    ],
+    links = "tree-sitter",
+    pkg_name = "tree-sitter",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.26.9",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor_ts__cc-1.4.6//:cc",
+        "@vendor_ts__serde_json-1.0.154//:serde_json",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.25.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.25.0.bazel
index 57cf6cd860bf..2d0165a2704b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.25.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.25.0.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,8 +113,8 @@ rust_library(
     }),
     version = "0.25.0",
     deps = [
-        "@vendor_ts__tree-sitter-embedded-template-0.25.0//:build_script_build",
-        "@vendor_ts__tree-sitter-language-0.1.5//:tree_sitter_language",
+        ":build_script_build",
+        "@vendor_ts__tree-sitter-language-0.1.7//:tree_sitter_language",
     ],
 )
 
@@ -110,6 +124,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -138,6 +155,10 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
+    link_deps = [
+        "@vendor_ts__tree-sitter-language-0.1.7//:tree_sitter_language",
+    ],
     pkg_name = "tree-sitter-embedded-template",
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -155,7 +176,7 @@ cargo_build_script(
     version = "0.25.0",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.61//:cc",
+        "@vendor_ts__cc-1.4.6//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-json-0.24.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-json-0.24.8.bazel
index 245539d02e73..48d231edb66b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-json-0.24.8.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-json-0.24.8.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,8 +113,8 @@ rust_library(
     }),
     version = "0.24.8",
     deps = [
-        "@vendor_ts__tree-sitter-json-0.24.8//:build_script_build",
-        "@vendor_ts__tree-sitter-language-0.1.5//:tree_sitter_language",
+        ":build_script_build",
+        "@vendor_ts__tree-sitter-language-0.1.7//:tree_sitter_language",
     ],
 )
 
@@ -110,6 +124,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -138,6 +155,10 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
+    link_deps = [
+        "@vendor_ts__tree-sitter-language-0.1.7//:tree_sitter_language",
+    ],
     pkg_name = "tree-sitter-json",
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -155,7 +176,7 @@ cargo_build_script(
     version = "0.24.8",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.61//:cc",
+        "@vendor_ts__cc-1.4.6//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.5.bazel
deleted file mode 100644
index b950d1343c87..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.5.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "tree_sitter_language",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "language.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=tree-sitter-language",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.5",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.7.bazel
new file mode 100644
index 000000000000..05c885e79e33
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.7.bazel
@@ -0,0 +1,181 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "tree_sitter_language",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/language.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-language",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.7",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    links = "tree-sitter-language",
+    pkg_name = "tree-sitter-language",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-language",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.1.7",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-python-0.23.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-python-0.23.6.bazel
deleted file mode 100644
index fc7a098193a4..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-python-0.23.6.bazel
+++ /dev/null
@@ -1,166 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "tree_sitter_python",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "bindings/rust/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=tree-sitter-python",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.23.6",
-    deps = [
-        "@vendor_ts__tree-sitter-language-0.1.5//:tree_sitter_language",
-        "@vendor_ts__tree-sitter-python-0.23.6//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "bindings/rust/build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "tree-sitter-python",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=tree-sitter-python",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.23.6",
-    visibility = ["//visibility:private"],
-    deps = [
-        "@vendor_ts__cc-1.2.61//:cc",
-    ],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-python-0.25.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-python-0.25.0.bazel
new file mode 100644
index 000000000000..fc0b81db0b9f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-python-0.25.0.bazel
@@ -0,0 +1,187 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "tree_sitter_python",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "bindings/rust/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-python",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.25.0",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__tree-sitter-language-0.1.7//:tree_sitter_language",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "bindings/rust/build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    link_deps = [
+        "@vendor_ts__tree-sitter-language-0.1.7//:tree_sitter_language",
+    ],
+    pkg_name = "tree-sitter-python",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=tree-sitter-python",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.25.0",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor_ts__cc-1.4.6//:cc",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ql-0.23.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ql-0.23.1.bazel
index 6d68d04cf007..8da26e26062e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ql-0.23.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ql-0.23.1.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,8 +113,8 @@ rust_library(
     }),
     version = "0.23.1",
     deps = [
-        "@vendor_ts__tree-sitter-language-0.1.5//:tree_sitter_language",
-        "@vendor_ts__tree-sitter-ql-0.23.1//:build_script_build",
+        ":build_script_build",
+        "@vendor_ts__tree-sitter-language-0.1.7//:tree_sitter_language",
     ],
 )
 
@@ -110,6 +124,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -138,6 +155,10 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
+    link_deps = [
+        "@vendor_ts__tree-sitter-language-0.1.7//:tree_sitter_language",
+    ],
     pkg_name = "tree-sitter-ql",
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -155,7 +176,7 @@ cargo_build_script(
     version = "0.23.1",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.61//:cc",
+        "@vendor_ts__cc-1.4.6//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ruby-0.23.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ruby-0.23.1.bazel
index 855b75133117..11361f8187e8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ruby-0.23.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ruby-0.23.1.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,8 +113,8 @@ rust_library(
     }),
     version = "0.23.1",
     deps = [
-        "@vendor_ts__tree-sitter-language-0.1.5//:tree_sitter_language",
-        "@vendor_ts__tree-sitter-ruby-0.23.1//:build_script_build",
+        ":build_script_build",
+        "@vendor_ts__tree-sitter-language-0.1.7//:tree_sitter_language",
     ],
 )
 
@@ -110,6 +124,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -138,6 +155,10 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
+    link_deps = [
+        "@vendor_ts__tree-sitter-language-0.1.7//:tree_sitter_language",
+    ],
     pkg_name = "tree-sitter-ruby",
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -155,7 +176,7 @@ cargo_build_script(
     version = "0.23.1",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.61//:cc",
+        "@vendor_ts__cc-1.4.6//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel
deleted file mode 100644
index f1774bfb2f03..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel
+++ /dev/null
@@ -1,107 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "triomphe",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "serde",
-        "stable_deref_trait",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=triomphe",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.14",
-    deps = [
-        "@vendor_ts__serde-1.0.228//:serde",
-        "@vendor_ts__stable_deref_trait-1.2.0//:stable_deref_trait",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.17.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.17.bazel
new file mode 100644
index 000000000000..e0e8340be9a8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.17.bazel
@@ -0,0 +1,121 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "triomphe",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "serde",
+        "stable_deref_trait",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=triomphe",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.17",
+    deps = [
+        "@vendor_ts__serde-1.0.229//:serde",
+        "@vendor_ts__stable_deref_trait-1.2.1//:stable_deref_trait",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typed-arena-2.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typed-arena-2.0.2.bazel
index 1cf6200569b7..5ac61a32e29a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typed-arena-2.0.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typed-arena-2.0.2.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typeid-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typeid-1.0.3.bazel
index 0e5737ac61b9..624ed06a5020 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typeid-1.0.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typeid-1.0.3.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,7 +113,7 @@ rust_library(
     }),
     version = "1.0.3",
     deps = [
-        "@vendor_ts__typeid-1.0.3//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -109,6 +123,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -137,6 +154,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    emit_warnings = False,
     pkg_name = "typeid",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel
index f677429c07b0..7f0f8dceb676 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel
@@ -60,12 +60,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -77,13 +79,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -91,6 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -103,7 +117,7 @@ rust_library(
     }),
     version = "0.9.10",
     deps = [
-        "@vendor_ts__uncased-0.9.10//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -113,6 +127,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -145,6 +162,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    emit_warnings = False,
     pkg_name = "uncased",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ungrammar-1.16.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ungrammar-1.16.1.bazel
index 680143ae6066..cf77a6b9e3f6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ungrammar-1.16.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ungrammar-1.16.1.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.19.bazel
deleted file mode 100644
index 75aa1ff078af..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.19.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "unicode_ident",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=unicode-ident",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.19",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.24.bazel
new file mode 100644
index 000000000000..d58603f3d061
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.24.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "unicode_ident",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=unicode-ident",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.24",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.3.bazel
deleted file mode 100644
index b621e469421f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.3.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "unicode_properties",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "emoji",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=unicode-properties",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.3",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.4.bazel
new file mode 100644
index 000000000000..6919d16178db
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.4.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "unicode_properties",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "emoji",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=unicode-properties",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.4",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-xid-0.2.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-xid-0.2.6.bazel
deleted file mode 100644
index c5725abf313e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-xid-0.2.6.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "unicode_xid",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=unicode-xid",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.6",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unsafe-libyaml-0.2.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unsafe-libyaml-0.2.11.bazel
index c5a1e9accf98..29f5365ccb0a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unsafe-libyaml-0.2.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unsafe-libyaml-0.2.11.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.url-2.5.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.url-2.5.7.bazel
deleted file mode 100644
index 043bed2ca2c0..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.url-2.5.7.bazel
+++ /dev/null
@@ -1,108 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "url",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "serde",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=url",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.5.7",
-    deps = [
-        "@vendor_ts__form_urlencoded-1.2.2//:form_urlencoded",
-        "@vendor_ts__idna-1.1.0//:idna",
-        "@vendor_ts__percent-encoding-2.3.2//:percent_encoding",
-        "@vendor_ts__serde-1.0.228//:serde",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8_iter-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8_iter-1.0.4.bazel
deleted file mode 100644
index 9ebd1462558c..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8_iter-1.0.4.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "utf8_iter",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=utf8_iter",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.4",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8parse-0.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8parse-0.2.2.bazel
index 186b6221a216..02c3a6cd642c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8parse-0.2.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8parse-0.2.2.bazel
@@ -55,12 +55,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -72,13 +74,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -86,6 +99,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.1.bazel
index 73f685b51f74..6c39ef5040f0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.1.bazel
@@ -56,12 +56,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -73,13 +75,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -87,6 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -99,7 +113,7 @@ rust_library(
     }),
     version = "0.1.1",
     deps = [
-        "@vendor_ts__valuable-0.1.1//:build_script_build",
+        ":build_script_build",
     ],
 )
 
@@ -109,6 +123,9 @@ cargo_build_script(
         include = ["**/*.rs"],
         allow_empty = True,
     ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
     compile_data = glob(
         include = ["**"],
         allow_empty = True,
@@ -137,6 +154,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    emit_warnings = False,
     pkg_name = "valuable",
     rustc_env_files = [
         ":cargo_toml_env_vars",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.version_check-0.9.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.version_check-0.9.5.bazel
index e742e2f5c3cf..53f8adea521b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.version_check-0.9.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.version_check-0.9.5.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel
index eaa6ea808b41..f06e6079fcd4 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel
index 1544ed0659e1..f7e58c23dc21 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.14.5+wasi-0.2.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.14.5+wasi-0.2.4.bazel
deleted file mode 100644
index a5826f5cea2e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.14.5+wasi-0.2.4.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "wasi",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=wasi",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.14.5+wasi-0.2.4",
-    deps = [
-        "@vendor_ts__wasip2-1.0.0-wasi-0.2.4//:wasip2",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasip2-1.0.0+wasi-0.2.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasip2-1.0.0+wasi-0.2.4.bazel
deleted file mode 100644
index 9de7c19c3c21..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasip2-1.0.0+wasi-0.2.4.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "wasip2",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=wasip2",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.0+wasi-0.2.4",
-    deps = [
-        "@vendor_ts__wit-bindgen-0.45.1//:wit_bindgen",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.101.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.101.bazel
deleted file mode 100644
index 91c146904b67..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.101.bazel
+++ /dev/null
@@ -1,184 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "wasm_bindgen",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "msrv",
-        "rustversion",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__rustversion-1.0.22//:rustversion",
-        "@vendor_ts__wasm-bindgen-macro-0.2.101//:wasm_bindgen_macro",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=wasm-bindgen",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.101",
-    deps = [
-        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
-        "@vendor_ts__once_cell-1.21.3//:once_cell",
-        "@vendor_ts__wasm-bindgen-0.2.101//:build_script_build",
-        "@vendor_ts__wasm-bindgen-shared-0.2.101//:wasm_bindgen_shared",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "msrv",
-        "rustversion",
-        "std",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    link_deps = [
-        "@vendor_ts__wasm-bindgen-shared-0.2.101//:wasm_bindgen_shared",
-    ],
-    pkg_name = "wasm-bindgen",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=wasm-bindgen",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.2.101",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.126.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.126.bazel
new file mode 100644
index 000000000000..5196e83bfea5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.126.bazel
@@ -0,0 +1,203 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "wasm_bindgen",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor_ts__wasm-bindgen-macro-0.2.126//:wasm_bindgen_macro",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.126",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__cfg-if-1.0.4//:cfg_if",
+        "@vendor_ts__once_cell-1.21.4//:once_cell",
+        "@vendor_ts__wasm-bindgen-shared-0.2.126//:wasm_bindgen_shared",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__rustversion-1.0.23//:rustversion": "rustversion_compat",
+    },
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    link_deps = [
+        "@vendor_ts__wasm-bindgen-shared-0.2.126//:wasm_bindgen_shared",
+    ],
+    pkg_name = "wasm-bindgen",
+    proc_macro_deps = [
+        "@vendor_ts__rustversion-1.0.23//:rustversion",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.2.126",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.101.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.101.bazel
deleted file mode 100644
index 8bd3515bef87..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.101.bazel
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "wasm_bindgen_backend",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=wasm-bindgen-backend",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.101",
-    deps = [
-        "@vendor_ts__bumpalo-3.19.0//:bumpalo",
-        "@vendor_ts__log-0.4.28//:log",
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-        "@vendor_ts__wasm-bindgen-shared-0.2.101//:wasm_bindgen_shared",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.101.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.101.bazel
deleted file mode 100644
index 3e207f054b06..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.101.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "wasm_bindgen_macro",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=wasm-bindgen-macro",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.101",
-    deps = [
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__wasm-bindgen-macro-support-0.2.101//:wasm_bindgen_macro_support",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.126.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.126.bazel
new file mode 100644
index 000000000000..df70de65c444
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.126.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "wasm_bindgen_macro",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen-macro",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.126",
+    deps = [
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__wasm-bindgen-macro-support-0.2.126//:wasm_bindgen_macro_support",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.101.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.101.bazel
deleted file mode 100644
index b2276e1a6386..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.101.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "wasm_bindgen_macro_support",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=wasm-bindgen-macro-support",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.101",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-        "@vendor_ts__wasm-bindgen-backend-0.2.101//:wasm_bindgen_backend",
-        "@vendor_ts__wasm-bindgen-shared-0.2.101//:wasm_bindgen_shared",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.126.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.126.bazel
new file mode 100644
index 000000000000..7c52a0e5bf5b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.126.bazel
@@ -0,0 +1,118 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "wasm_bindgen_macro_support",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen-macro-support",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.126",
+    deps = [
+        "@vendor_ts__bumpalo-3.20.3//:bumpalo",
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
+        "@vendor_ts__wasm-bindgen-shared-0.2.126//:wasm_bindgen_shared",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.101.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.101.bazel
deleted file mode 100644
index bb7bc40362a1..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.101.bazel
+++ /dev/null
@@ -1,164 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "wasm_bindgen_shared",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=wasm-bindgen-shared",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.101",
-    deps = [
-        "@vendor_ts__unicode-ident-1.0.19//:unicode_ident",
-        "@vendor_ts__wasm-bindgen-shared-0.2.101//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    links = "wasm_bindgen",
-    pkg_name = "wasm-bindgen-shared",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=wasm-bindgen-shared",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.2.101",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.126.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.126.bazel
new file mode 100644
index 000000000000..ef1f6b611b91
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.126.bazel
@@ -0,0 +1,182 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "wasm_bindgen_shared",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen-shared",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.126",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__unicode-ident-1.0.24//:unicode_ident",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    links = "wasm_bindgen",
+    pkg_name = "wasm-bindgen-shared",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen-shared",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.2.126",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.11.bazel
index 8730541d4ab4..aa22ba8aa845 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.11.bazel
@@ -52,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -69,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -83,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -96,13 +110,13 @@ rust_library(
     version = "0.1.11",
     deps = select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.61.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.61.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.61.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.61.2//:windows_sys",  # cfg(windows)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.61.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.61.2.bazel
deleted file mode 100644
index df42bab2c4fc..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.61.2.bazel
+++ /dev/null
@@ -1,106 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_core",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__windows-implement-0.60.0//:windows_implement",
-        "@vendor_ts__windows-interface-0.59.1//:windows_interface",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows-core",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.61.2",
-    deps = [
-        "@vendor_ts__windows-link-0.1.3//:windows_link",
-        "@vendor_ts__windows-result-0.3.4//:windows_result",
-        "@vendor_ts__windows-strings-0.4.2//:windows_strings",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.62.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.62.2.bazel
new file mode 100644
index 000000000000..9c25dbc2cf07
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.62.2.bazel
@@ -0,0 +1,120 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_core",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor_ts__windows-implement-0.60.2//:windows_implement",
+        "@vendor_ts__windows-interface-0.59.3//:windows_interface",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-core",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.62.2",
+    deps = [
+        "@vendor_ts__windows-link-0.2.1//:windows_link",
+        "@vendor_ts__windows-result-0.4.1//:windows_result",
+        "@vendor_ts__windows-strings-0.5.1//:windows_strings",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.0.bazel
deleted file mode 100644
index 4477961b0a8f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.0.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "windows_implement",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows-implement",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.60.0",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.2.bazel
new file mode 100644
index 000000000000..f56579bb8914
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.2.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "windows_implement",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-implement",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.60.2",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.1.bazel
deleted file mode 100644
index cc4f0390337a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.1.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "windows_interface",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows-interface",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.59.1",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.3.bazel
new file mode 100644
index 000000000000..15a70be5f9e0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.3.bazel
@@ -0,0 +1,116 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "windows_interface",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-interface",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.59.3",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+        "@vendor_ts__quote-1.0.47//:quote",
+        "@vendor_ts__syn-2.0.119//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.3.bazel
deleted file mode 100644
index 469607d7d5ba..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.3.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_link",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows-link",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.3",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.2.0.bazel
deleted file mode 100644
index e093251e525f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.2.0.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_link",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows-link",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.2.1.bazel
new file mode 100644
index 000000000000..fb7f1fbd19f0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.2.1.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_link",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-link",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.3.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.3.4.bazel
deleted file mode 100644
index c86097f47b33..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.3.4.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_result",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows-result",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.3.4",
-    deps = [
-        "@vendor_ts__windows-link-0.1.3//:windows_link",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.4.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.4.1.bazel
new file mode 100644
index 000000000000..0a7a13911845
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.4.1.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_result",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-result",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.1",
+    deps = [
+        "@vendor_ts__windows-link-0.2.1//:windows_link",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.4.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.4.2.bazel
deleted file mode 100644
index 1cfcc59e7edc..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.4.2.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_strings",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows-strings",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.2",
-    deps = [
-        "@vendor_ts__windows-link-0.1.3//:windows_link",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.5.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.5.1.bazel
new file mode 100644
index 000000000000..489d1f4df56d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.5.1.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_strings",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-strings",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.5.1",
+    deps = [
+        "@vendor_ts__windows-link-0.2.1//:windows_link",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel
deleted file mode 100644
index 9aee199dc0a8..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel
+++ /dev/null
@@ -1,111 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_sys",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "Win32",
-        "Win32_Foundation",
-        "Win32_Security",
-        "Win32_Storage",
-        "Win32_Storage_FileSystem",
-        "Win32_System",
-        "Win32_System_Console",
-        "Win32_System_Threading",
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows-sys",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.52.0",
-    deps = [
-        "@vendor_ts__windows-targets-0.52.6//:windows_targets",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel
deleted file mode 100644
index b3222f2a6588..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel
+++ /dev/null
@@ -1,109 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_sys",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "Win32",
-        "Win32_Foundation",
-        "Win32_System",
-        "Win32_System_Com",
-        "Win32_UI",
-        "Win32_UI_Shell",
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows-sys",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.59.0",
-    deps = [
-        "@vendor_ts__windows-targets-0.52.6//:windows_targets",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.60.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.60.2.bazel
index 2008e7287ac1..57adfbaf7396 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.60.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.60.2.bazel
@@ -41,9 +41,7 @@ rust_library(
         "Win32_Storage",
         "Win32_Storage_FileSystem",
         "Win32_System",
-        "Win32_System_Console",
         "Win32_System_IO",
-        "Win32_System_ProcessStatus",
         "Win32_System_Threading",
         "Win32_System_WindowsProgramming",
         "default",
@@ -66,12 +64,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -83,13 +83,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -97,6 +108,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
@@ -109,6 +121,6 @@ rust_library(
     }),
     version = "0.60.2",
     deps = [
-        "@vendor_ts__windows-targets-0.53.3//:windows_targets",
+        "@vendor_ts__windows-targets-0.53.5//:windows_targets",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.61.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.61.0.bazel
deleted file mode 100644
index a6f072e5b2a9..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.61.0.bazel
+++ /dev/null
@@ -1,116 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_sys",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "Win32",
-        "Win32_Foundation",
-        "Win32_Networking",
-        "Win32_Networking_WinSock",
-        "Win32_Security",
-        "Win32_Storage",
-        "Win32_Storage_FileSystem",
-        "Win32_System",
-        "Win32_System_Console",
-        "Win32_System_IO",
-        "Win32_System_Pipes",
-        "Win32_System_SystemInformation",
-        "Win32_System_Threading",
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows-sys",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.61.0",
-    deps = [
-        "@vendor_ts__windows-link-0.2.0//:windows_link",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.61.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.61.2.bazel
new file mode 100644
index 000000000000..33701268ca7f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.61.2.bazel
@@ -0,0 +1,131 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "Win32",
+        "Win32_Foundation",
+        "Win32_Networking",
+        "Win32_Networking_WinSock",
+        "Win32_Security",
+        "Win32_Storage",
+        "Win32_Storage_FileSystem",
+        "Win32_System",
+        "Win32_System_Console",
+        "Win32_System_IO",
+        "Win32_System_Pipes",
+        "Win32_System_ProcessStatus",
+        "Win32_System_SystemInformation",
+        "Win32_System_Threading",
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.61.2",
+    deps = [
+        "@vendor_ts__windows-link-0.2.1//:windows_link",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel
deleted file mode 100644
index 82fb2acfc31d..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel
+++ /dev/null
@@ -1,118 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_targets",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows-targets",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.52.6",
-    deps = select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows_aarch64_msvc-0.52.6//:windows_aarch64_msvc",  # cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows_i686_msvc-0.52.6//:windows_i686_msvc",  # cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__windows_i686_gnu-0.52.6//:windows_i686_gnu",  # cfg(all(target_arch = "x86", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows_x86_64_msvc-0.52.6//:windows_x86_64_msvc",  # cfg(all(any(target_arch = "x86_64", target_arch = "arm64ec"), target_env = "msvc", not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__windows_x86_64_gnu-0.52.6//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__windows_x86_64_gnu-0.52.6//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.3.bazel
deleted file mode 100644
index 56bad6b11749..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.3.bazel
+++ /dev/null
@@ -1,118 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_targets",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows-targets",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.53.3",
-    deps = select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows_aarch64_msvc-0.53.0//:windows_aarch64_msvc",  # cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows_i686_msvc-0.53.0//:windows_i686_msvc",  # cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__windows_i686_gnu-0.53.0//:windows_i686_gnu",  # cfg(all(target_arch = "x86", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows_x86_64_msvc-0.53.0//:windows_x86_64_msvc",  # cfg(all(any(target_arch = "x86_64", target_arch = "arm64ec"), target_env = "msvc", not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__windows_x86_64_gnu-0.53.0//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__windows_x86_64_gnu-0.53.0//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.5.bazel
new file mode 100644
index 000000000000..ddb43af5038a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.5.bazel
@@ -0,0 +1,132 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_targets",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-targets",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.53.5",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows_aarch64_msvc-0.53.1//:windows_aarch64_msvc",  # cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows_i686_msvc-0.53.1//:windows_i686_msvc",  # cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__windows_i686_gnu-0.53.1//:windows_i686_gnu",  # cfg(all(target_arch = "x86", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows_x86_64_msvc-0.53.1//:windows_x86_64_msvc",  # cfg(all(any(target_arch = "x86_64", target_arch = "arm64ec"), target_env = "msvc", not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__windows_x86_64_gnu-0.53.1//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__windows_x86_64_gnu-0.53.1//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
deleted file mode 100644
index 633de17430dd..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_aarch64_gnullvm",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_aarch64_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.52.6",
-    deps = [
-        "@vendor_ts__windows_aarch64_gnullvm-0.52.6//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_aarch64_gnullvm",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_aarch64_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.52.6",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.0.bazel
deleted file mode 100644
index 00807d34df33..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.0.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_aarch64_gnullvm",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_aarch64_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.53.0",
-    deps = [
-        "@vendor_ts__windows_aarch64_gnullvm-0.53.0//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_aarch64_gnullvm",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_aarch64_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.53.0",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.1.bazel
new file mode 100644
index 000000000000..02c278ced29f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.1.bazel
@@ -0,0 +1,180 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_aarch64_gnullvm",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_aarch64_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.53.1",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "windows_aarch64_gnullvm",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_aarch64_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.53.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
deleted file mode 100644
index 2aa1466d81d1..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_aarch64_msvc",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_aarch64_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.52.6",
-    deps = [
-        "@vendor_ts__windows_aarch64_msvc-0.52.6//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_aarch64_msvc",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_aarch64_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.52.6",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.0.bazel
deleted file mode 100644
index e66c8c46945d..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.0.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_aarch64_msvc",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_aarch64_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.53.0",
-    deps = [
-        "@vendor_ts__windows_aarch64_msvc-0.53.0//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_aarch64_msvc",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_aarch64_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.53.0",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.1.bazel
new file mode 100644
index 000000000000..946a0f928d57
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.1.bazel
@@ -0,0 +1,180 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_aarch64_msvc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_aarch64_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.53.1",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "windows_aarch64_msvc",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_aarch64_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.53.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel
deleted file mode 100644
index d30adc2538ff..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_i686_gnu",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.52.6",
-    deps = [
-        "@vendor_ts__windows_i686_gnu-0.52.6//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_i686_gnu",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.52.6",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.0.bazel
deleted file mode 100644
index 437938cf2422..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.0.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_i686_gnu",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.53.0",
-    deps = [
-        "@vendor_ts__windows_i686_gnu-0.53.0//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_i686_gnu",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.53.0",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.1.bazel
new file mode 100644
index 000000000000..2d7d004f36bc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.1.bazel
@@ -0,0 +1,180 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_i686_gnu",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.53.1",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "windows_i686_gnu",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.53.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
deleted file mode 100644
index 5d18a1d418f4..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_i686_gnullvm",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.52.6",
-    deps = [
-        "@vendor_ts__windows_i686_gnullvm-0.52.6//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_i686_gnullvm",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.52.6",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.0.bazel
deleted file mode 100644
index 51364c25a81e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.0.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_i686_gnullvm",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.53.0",
-    deps = [
-        "@vendor_ts__windows_i686_gnullvm-0.53.0//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_i686_gnullvm",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.53.0",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.1.bazel
new file mode 100644
index 000000000000..25d3f685a265
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.1.bazel
@@ -0,0 +1,180 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_i686_gnullvm",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.53.1",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "windows_i686_gnullvm",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.53.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel
deleted file mode 100644
index 977fc0c5575b..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_i686_msvc",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.52.6",
-    deps = [
-        "@vendor_ts__windows_i686_msvc-0.52.6//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_i686_msvc",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.52.6",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.0.bazel
deleted file mode 100644
index ca459bbcb837..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.0.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_i686_msvc",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.53.0",
-    deps = [
-        "@vendor_ts__windows_i686_msvc-0.53.0//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_i686_msvc",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.53.0",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.1.bazel
new file mode 100644
index 000000000000..97e63f090732
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.1.bazel
@@ -0,0 +1,180 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_i686_msvc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.53.1",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "windows_i686_msvc",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_i686_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.53.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
deleted file mode 100644
index b446bfdbb5b7..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_x86_64_gnu",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.52.6",
-    deps = [
-        "@vendor_ts__windows_x86_64_gnu-0.52.6//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_x86_64_gnu",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.52.6",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.0.bazel
deleted file mode 100644
index e8ffe9e4cbf1..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.0.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_x86_64_gnu",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.53.0",
-    deps = [
-        "@vendor_ts__windows_x86_64_gnu-0.53.0//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_x86_64_gnu",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.53.0",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.1.bazel
new file mode 100644
index 000000000000..e3bf7fcabf28
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.1.bazel
@@ -0,0 +1,180 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_x86_64_gnu",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.53.1",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "windows_x86_64_gnu",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_gnu",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.53.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
deleted file mode 100644
index 31d4d5a8b6fd..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_x86_64_gnullvm",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.52.6",
-    deps = [
-        "@vendor_ts__windows_x86_64_gnullvm-0.52.6//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_x86_64_gnullvm",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.52.6",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.0.bazel
deleted file mode 100644
index df9e56de61d5..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.0.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_x86_64_gnullvm",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.53.0",
-    deps = [
-        "@vendor_ts__windows_x86_64_gnullvm-0.53.0//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_x86_64_gnullvm",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.53.0",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.1.bazel
new file mode 100644
index 000000000000..89147d16e842
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.1.bazel
@@ -0,0 +1,180 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_x86_64_gnullvm",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.53.1",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "windows_x86_64_gnullvm",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_gnullvm",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.53.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
deleted file mode 100644
index 99ef607128c6..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_x86_64_msvc",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.52.6",
-    deps = [
-        "@vendor_ts__windows_x86_64_msvc-0.52.6//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_x86_64_msvc",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.52.6",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.0.bazel
deleted file mode 100644
index ceaf0cb63373..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.0.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_x86_64_msvc",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.53.0",
-    deps = [
-        "@vendor_ts__windows_x86_64_msvc-0.53.0//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "windows_x86_64_msvc",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.53.0",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.1.bazel
new file mode 100644
index 000000000000..3acc471f4e47
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.1.bazel
@@ -0,0 +1,180 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_x86_64_msvc",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.53.1",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "windows_x86_64_msvc",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows_x86_64_msvc",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.53.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.13.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.13.bazel
index 997a4bf65d4d..77104b8c7a76 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.13.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.13.bazel
@@ -34,11 +34,6 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "alloc",
-        "default",
-        "std",
-    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_env_files = [
@@ -57,12 +52,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -74,13 +71,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -88,6 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-1.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-1.0.2.bazel
deleted file mode 100644
index 995dce1204f2..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-1.0.2.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "winnow",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=winnow",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.2",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-1.0.4.bazel
new file mode 100644
index 000000000000..bb9365849004
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-1.0.4.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "winnow",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winnow",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.4",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-0.45.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-0.45.1.bazel
deleted file mode 100644
index 4960067c91a8..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-0.45.1.bazel
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "wit_bindgen",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=wit-bindgen",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.45.1",
-    deps = [
-        "@vendor_ts__wit-bindgen-0.45.1//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "wit-bindgen",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=wit-bindgen",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.45.1",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.writeable-0.6.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.writeable-0.6.1.bazel
deleted file mode 100644
index 28b6f63ce6fe..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.writeable-0.6.1.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "writeable",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=writeable",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.6.1",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yansi-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yansi-1.0.1.bazel
index 8770902865a6..7413db1aac9b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yansi-1.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yansi-1.0.1.bazel
@@ -57,12 +57,14 @@ rust_library(
     target_compatible_with = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [],
         "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
         "@rules_rust//rust/platform:aarch64-linux-android": [],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
@@ -74,13 +76,24 @@ rust_library(
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
@@ -88,6 +101,7 @@ rust_library(
         "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-0.8.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-0.8.0.bazel
deleted file mode 100644
index ecef8b52a73d..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-0.8.0.bazel
+++ /dev/null
@@ -1,109 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "yoke",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "derive",
-        "zerofrom",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__yoke-derive-0.8.0//:yoke_derive",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=yoke",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.0",
-    deps = [
-        "@vendor_ts__stable_deref_trait-1.2.0//:stable_deref_trait",
-        "@vendor_ts__zerofrom-0.1.6//:zerofrom",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-derive-0.8.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-derive-0.8.0.bazel
deleted file mode 100644
index 1529534e17b2..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-derive-0.8.0.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "yoke_derive",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=yoke-derive",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.0",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-        "@vendor_ts__synstructure-0.13.2//:synstructure",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.27.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.27.bazel
deleted file mode 100644
index e0fee3f0f2ec..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.27.bazel
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "zerocopy",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "simd",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=zerocopy",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.27",
-    deps = [
-        "@vendor_ts__zerocopy-0.8.27//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "simd",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "zerocopy",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=zerocopy",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.8.27",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.27.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.27.bazel
deleted file mode 100644
index 11df1449c962..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.27.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "zerocopy_derive",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=zerocopy-derive",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.27",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-0.1.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-0.1.6.bazel
deleted file mode 100644
index fbb85d748c8f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-0.1.6.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "zerofrom",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "derive",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__zerofrom-derive-0.1.6//:zerofrom_derive",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=zerofrom",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.6",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-derive-0.1.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-derive-0.1.6.bazel
deleted file mode 100644
index ff9c1ef21429..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-derive-0.1.6.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "zerofrom_derive",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=zerofrom-derive",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.6",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-        "@vendor_ts__synstructure-0.13.2//:synstructure",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerotrie-0.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerotrie-0.2.2.bazel
deleted file mode 100644
index 1bcd44131b7e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerotrie-0.2.2.bazel
+++ /dev/null
@@ -1,108 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "zerotrie",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "yoke",
-        "zerofrom",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__displaydoc-0.2.5//:displaydoc",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=zerotrie",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.2",
-    deps = [
-        "@vendor_ts__yoke-0.8.0//:yoke",
-        "@vendor_ts__zerofrom-0.1.6//:zerofrom",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-0.11.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-0.11.4.bazel
deleted file mode 100644
index a8fe8f8c7e9e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-0.11.4.bazel
+++ /dev/null
@@ -1,109 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "zerovec",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "derive",
-        "yoke",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__zerovec-derive-0.11.1//:zerovec_derive",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=zerovec",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.11.4",
-    deps = [
-        "@vendor_ts__yoke-0.8.0//:yoke",
-        "@vendor_ts__zerofrom-0.1.6//:zerofrom",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-derive-0.11.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-derive-0.11.1.bazel
deleted file mode 100644
index ace3c224c5df..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-derive-0.11.1.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "zerovec_derive",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=zerovec-derive",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.11.1",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
-        "@vendor_ts__quote-1.0.41//:quote",
-        "@vendor_ts__syn-2.0.106//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zmij-1.0.23.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zmij-1.0.23.bazel
new file mode 100644
index 000000000000..f63a34bcf541
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zmij-1.0.23.bazel
@@ -0,0 +1,180 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "zmij",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=zmij",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.23",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    emit_warnings = False,
+    pkg_name = "zmij",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=zmij",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.23",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.13.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.13.3.bazel
deleted file mode 100644
index ff3e776a7f8a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.13.3.bazel
+++ /dev/null
@@ -1,106 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "zstd",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "arrays",
-        "default",
-        "legacy",
-        "zdict_builder",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=zstd",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.13.3",
-    deps = [
-        "@vendor_ts__zstd-safe-7.2.4//:zstd_safe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.14.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.14.2.bazel
new file mode 100644
index 000000000000..bfb375070baf
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.14.2.bazel
@@ -0,0 +1,120 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "zstd",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "arrays",
+        "default",
+        "legacy",
+        "zdict_builder",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=zstd",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.14.2",
+    deps = [
+        "@vendor_ts__zstd-safe-8.1.0//:zstd_safe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-7.2.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-7.2.4.bazel
deleted file mode 100644
index eed1e00af815..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-7.2.4.bazel
+++ /dev/null
@@ -1,178 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "zstd_safe",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "arrays",
-        "legacy",
-        "std",
-        "zdict_builder",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=zstd-safe",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "7.2.4",
-    deps = [
-        "@vendor_ts__zstd-safe-7.2.4//:build_script_build",
-        "@vendor_ts__zstd-sys-2.0.16-zstd.1.5.7//:zstd_sys",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "arrays",
-        "legacy",
-        "std",
-        "zdict_builder",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    link_deps = [
-        "@vendor_ts__zstd-sys-2.0.16-zstd.1.5.7//:zstd_sys",
-    ],
-    pkg_name = "zstd-safe",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=zstd-safe",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "7.2.4",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-8.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-8.1.0.bazel
new file mode 100644
index 000000000000..cfbb2587d828
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-8.1.0.bazel
@@ -0,0 +1,196 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "zstd_safe",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "arrays",
+        "legacy",
+        "std",
+        "zdict_builder",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=zstd-safe",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "8.1.0",
+    deps = [
+        ":build_script_build",
+        "@vendor_ts__zstd-sys-2.1.1-zstd.1.5.7//:zstd_sys",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "arrays",
+        "legacy",
+        "std",
+        "zdict_builder",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    emit_warnings = False,
+    link_deps = [
+        "@vendor_ts__zstd-sys-2.1.1-zstd.1.5.7//:zstd_sys",
+    ],
+    pkg_name = "zstd-safe",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=zstd-safe",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "8.1.0",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.16+zstd.1.5.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.16+zstd.1.5.7.bazel
deleted file mode 100644
index f2a70faf4640..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.16+zstd.1.5.7.bazel
+++ /dev/null
@@ -1,177 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "zstd_sys",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "legacy",
-        "std",
-        "zdict_builder",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=zstd-sys",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
-        "@rules_rust//rust/platform:wasm32-wasip2": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.16+zstd.1.5.7",
-    deps = [
-        "@vendor_ts__zstd-sys-2.0.16-zstd.1.5.7//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "legacy",
-        "std",
-        "zdict_builder",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    links = "zstd",
-    pkg_name = "zstd-sys",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=zstd-sys",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "2.0.16+zstd.1.5.7",
-    visibility = ["//visibility:private"],
-    deps = [
-        "@vendor_ts__cc-1.2.61//:cc",
-        "@vendor_ts__pkg-config-0.3.32//:pkg_config",
-    ],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.1.1+zstd.1.5.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.1.1+zstd.1.5.7.bazel
new file mode 100644
index 000000000000..1b3fc3037397
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.1.1+zstd.1.5.7.bazel
@@ -0,0 +1,195 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "zstd_sys",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "legacy",
+        "std",
+        "zdict_builder",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=zstd-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-none": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:mips-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:sparc64-unknown-netbsd": [],
+        "@rules_rust//rust/platform:sparc64-unknown-openbsd": [],
+        "@rules_rust//rust/platform:thumbv6m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabihf": [],
+        "@rules_rust//rust/platform:thumbv7m-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.1.1+zstd.1.5.7",
+    deps = [
+        ":build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    build_script_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "legacy",
+        "std",
+        "zdict_builder",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    emit_warnings = False,
+    links = "zstd",
+    pkg_name = "zstd-sys",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=zstd-sys",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "2.1.1+zstd.1.5.7",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@vendor_ts__cc-1.4.6//:cc",
+        "@vendor_ts__pkg-config-0.3.34//:pkg_config",
+    ],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/anyhow-1.0.104/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/anyhow-1.0.104/BUILD.bazel
new file mode 100644
index 000000000000..2e3ccd2c4a3d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/anyhow-1.0.104/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "anyhow-1.0.104",
+    actual = "@vendor_ts__anyhow-1.0.104//:anyhow",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/anyhow/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/anyhow/BUILD.bazel
new file mode 100644
index 000000000000..6e60cef6e1ce
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/anyhow/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "anyhow",
+    actual = "@vendor_ts__anyhow-1.0.104//:anyhow",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/chalk-ir-0.104.0/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/chalk-ir-0.104.0/BUILD.bazel
new file mode 100644
index 000000000000..565b781b3307
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/chalk-ir-0.104.0/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "chalk-ir-0.104.0",
+    actual = "@vendor_ts__chalk-ir-0.104.0//:chalk_ir",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/chalk-ir/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/chalk-ir/BUILD.bazel
new file mode 100644
index 000000000000..4595c6513ded
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/chalk-ir/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "chalk-ir",
+    actual = "@vendor_ts__chalk-ir-0.104.0//:chalk_ir",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/chrono-0.4.45/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/chrono-0.4.45/BUILD.bazel
new file mode 100644
index 000000000000..205761e16dc2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/chrono-0.4.45/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "chrono-0.4.45",
+    actual = "@vendor_ts__chrono-0.4.45//:chrono",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/chrono/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/chrono/BUILD.bazel
new file mode 100644
index 000000000000..a750c43750ab
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/chrono/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "chrono",
+    actual = "@vendor_ts__chrono-0.4.45//:chrono",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/clap-4.6.7/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/clap-4.6.7/BUILD.bazel
new file mode 100644
index 000000000000..55dafa3616dc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/clap-4.6.7/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "clap-4.6.7",
+    actual = "@vendor_ts__clap-4.6.7//:clap",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/clap/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/clap/BUILD.bazel
new file mode 100644
index 000000000000..045054183a1d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/clap/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "clap",
+    actual = "@vendor_ts__clap-4.6.7//:clap",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl
index 6d6d80ef58ce..326e095a8d5b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl
@@ -1,21 +1,877 @@
 ###############################################################################
 # @generated
-# This file is auto-generated by the cargo-bazel tool.
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
 #
-# DO NOT MODIFY: Local changes may be replaced in future executions.
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
 ###############################################################################
-"""Rules for defining repositories for remote `crates_vendor` repositories"""
+"""
+# `crates_repository` API
 
+- [aliases](#aliases)
+- [crate_edition](#crate_edition)
+- [crate_deps](#crate_deps)
+- [all_crate_deps](#all_crate_deps)
+- [crate_repositories](#crate_repositories)
+
+"""
+
+load("@bazel_skylib//lib:selects.bzl", "selects")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+load("@rules_rust//crate_universe:defs.bzl", "crates_vendor_remote_repository")
+
+###############################################################################
+# MACROS API
+###############################################################################
+
+# An identifier that represent common dependencies (unconditional).
+_COMMON_CONDITION = ""
+
+def _flatten_dependency_maps(all_dependency_maps):
+    """Flatten a list of dependency maps into one dictionary.
+
+    Dependency maps have the following structure:
+
+    ```python
+    DEPENDENCIES_MAP = {
+        # The first key in the map is a Bazel package
+        # name of the workspace this file is defined in.
+        "workspace_member_package": {
+
+            # Not all dependencies are supported for all platforms.
+            # the condition key is the condition required to be true
+            # on the host platform.
+            "condition": {
+
+                # An alias to a crate target.     # The label of the crate target the
+                # Aliases are only crate names.   # package name refers to.
+                "package_name":                   "@full//:label",
+            }
+        }
+    }
+    ```
+
+    Args:
+        all_dependency_maps (list): A list of dicts as described above
+
+    Returns:
+        dict: A dictionary as described above
+    """
+    dependencies = {}
+
+    for workspace_deps_map in all_dependency_maps:
+        for pkg_name, conditional_deps_map in workspace_deps_map.items():
+            if pkg_name not in dependencies:
+                non_frozen_map = dict()
+                for key, values in conditional_deps_map.items():
+                    non_frozen_map.update({key: dict(values.items())})
+                dependencies.setdefault(pkg_name, non_frozen_map)
+                continue
+
+            for condition, deps_map in conditional_deps_map.items():
+                # If the condition has not been recorded, do so and continue
+                if condition not in dependencies[pkg_name]:
+                    dependencies[pkg_name].setdefault(condition, dict(deps_map.items()))
+                    continue
+
+                # Alert on any miss-matched dependencies
+                inconsistent_entries = []
+                for crate_name, crate_label in deps_map.items():
+                    existing = dependencies[pkg_name][condition].get(crate_name)
+                    if existing and existing != crate_label:
+                        inconsistent_entries.append((crate_name, existing, crate_label))
+                    dependencies[pkg_name][condition].update({crate_name: crate_label})
+
+    return dependencies
+
+def crate_deps(deps, package_name = None):
+    """Finds the fully qualified label of the requested crates for the package where this macro is called.
+
+    Args:
+        deps (list): The desired list of crate targets.
+        package_name (str, optional): The package name of the set of dependencies to look up.
+            Defaults to `native.package_name()`.
+
+    Returns:
+        list: A list of labels to generated rust targets (str)
+    """
+
+    if not deps:
+        return []
+
+    if package_name == None:
+        package_name = native.package_name()
+
+    # Join both sets of dependencies
+    dependencies = _flatten_dependency_maps([
+        _NORMAL_DEPENDENCIES,
+        _NORMAL_DEV_DEPENDENCIES,
+        _PROC_MACRO_DEPENDENCIES,
+        _PROC_MACRO_DEV_DEPENDENCIES,
+        _BUILD_DEPENDENCIES,
+        _BUILD_PROC_MACRO_DEPENDENCIES,
+    ]).pop(package_name, {})
+
+    # Combine all conditional packages so we can easily index over a flat list
+    # TODO: Perhaps this should actually return select statements and maintain
+    # the conditionals of the dependencies
+    flat_deps = {}
+    for deps_set in dependencies.values():
+        for crate_name, crate_label in deps_set.items():
+            flat_deps.update({crate_name: crate_label})
+
+    missing_crates = []
+    crate_targets = []
+    for crate_target in deps:
+        if crate_target not in flat_deps:
+            missing_crates.append(crate_target)
+        else:
+            crate_targets.append(flat_deps[crate_target])
+
+    if missing_crates:
+        fail("Could not find crates `{}` among dependencies of `{}`. Available dependencies were `{}`".format(
+            missing_crates,
+            package_name,
+            dependencies,
+        ))
+
+    return crate_targets
+
+def crate_edition(package_name = None):
+    """Finds the Rust edition for the package where this macro is called.
+
+    Args:
+        package_name (str, optional): The package name whose edition should be
+            looked up. Defaults to `native.package_name()` when unset.
+
+    Returns:
+        str: The Rust edition declared by the package's Cargo.toml file.
+    """
+    if package_name == None:
+        package_name = native.package_name()
+
+    if package_name not in _CRATE_EDITIONS:
+        fail("Tried to get crate_edition for package " + package_name + " but that package had no Cargo.toml file")
+
+    return _CRATE_EDITIONS[package_name]
+
+def all_crate_deps(
+        normal = False,
+        normal_dev = False,
+        proc_macro = False,
+        proc_macro_dev = False,
+        build = False,
+        build_proc_macro = False,
+        package_name = None):
+    """Finds the fully qualified label of all requested direct crate dependencies \
+    for the package where this macro is called.
+
+    If no parameters are set, all normal dependencies are returned. Setting any one flag will
+    otherwise impact the contents of the returned list.
+
+    Args:
+        normal (bool, optional): If True, normal dependencies are included in the
+            output list.
+        normal_dev (bool, optional): If True, normal dev dependencies will be
+            included in the output list.
+        proc_macro (bool, optional): If True, proc_macro dependencies are included
+            in the output list.
+        proc_macro_dev (bool, optional): If True, dev proc_macro dependencies are
+            included in the output list.
+        build (bool, optional): If True, build dependencies are included
+            in the output list.
+        build_proc_macro (bool, optional): If True, build proc_macro dependencies are
+            included in the output list.
+        package_name (str, optional): The package name of the set of dependencies to look up.
+            Defaults to `native.package_name()` when unset.
+
+    Returns:
+        list: A list of labels to generated rust targets (str)
+    """
+
+    if package_name == None:
+        package_name = native.package_name()
+
+    # Determine the relevant maps to use
+    all_dependency_maps = []
+    if normal:
+        all_dependency_maps.append(_NORMAL_DEPENDENCIES)
+    if normal_dev:
+        all_dependency_maps.append(_NORMAL_DEV_DEPENDENCIES)
+    if proc_macro:
+        all_dependency_maps.append(_PROC_MACRO_DEPENDENCIES)
+    if proc_macro_dev:
+        all_dependency_maps.append(_PROC_MACRO_DEV_DEPENDENCIES)
+    if build:
+        all_dependency_maps.append(_BUILD_DEPENDENCIES)
+    if build_proc_macro:
+        all_dependency_maps.append(_BUILD_PROC_MACRO_DEPENDENCIES)
+
+    # Default to always using normal dependencies
+    if not all_dependency_maps:
+        all_dependency_maps.append(_NORMAL_DEPENDENCIES)
+
+    dependencies = _flatten_dependency_maps(all_dependency_maps).pop(package_name, None)
+
+    if not dependencies:
+        if dependencies == None:
+            fail("Tried to get all_crate_deps for package " + package_name + " but that package had no Cargo.toml file")
+        else:
+            return []
+
+    crate_deps = list(dependencies.pop(_COMMON_CONDITION, {}).values())
+    for condition, deps in dependencies.items():
+        crate_deps += selects.with_or({
+            tuple(_CONDITIONS[condition]): deps.values(),
+            "//conditions:default": [],
+        })
+
+    return crate_deps
+
+def aliases(
+        normal = False,
+        normal_dev = False,
+        proc_macro = False,
+        proc_macro_dev = False,
+        build = False,
+        build_proc_macro = False,
+        package_name = None):
+    """Produces a map of Crate alias names to their original label
+
+    If no dependency kinds are specified, `normal` and `proc_macro` are used by default.
+    Setting any one flag will otherwise determine the contents of the returned dict.
+
+    Args:
+        normal (bool, optional): If True, normal dependencies are included in the
+            output list.
+        normal_dev (bool, optional): If True, normal dev dependencies will be
+            included in the output list..
+        proc_macro (bool, optional): If True, proc_macro dependencies are included
+            in the output list.
+        proc_macro_dev (bool, optional): If True, dev proc_macro dependencies are
+            included in the output list.
+        build (bool, optional): If True, build dependencies are included
+            in the output list.
+        build_proc_macro (bool, optional): If True, build proc_macro dependencies are
+            included in the output list.
+        package_name (str, optional): The package name of the set of dependencies to look up.
+            Defaults to `native.package_name()` when unset.
+
+    Returns:
+        dict: The aliases of all associated packages
+    """
+    if package_name == None:
+        package_name = native.package_name()
+
+    # Determine the relevant maps to use
+    all_aliases_maps = []
+    if normal:
+        all_aliases_maps.append(_NORMAL_ALIASES)
+    if normal_dev:
+        all_aliases_maps.append(_NORMAL_DEV_ALIASES)
+    if proc_macro:
+        all_aliases_maps.append(_PROC_MACRO_ALIASES)
+    if proc_macro_dev:
+        all_aliases_maps.append(_PROC_MACRO_DEV_ALIASES)
+    if build:
+        all_aliases_maps.append(_BUILD_ALIASES)
+    if build_proc_macro:
+        all_aliases_maps.append(_BUILD_PROC_MACRO_ALIASES)
+
+    # Default to always using normal aliases
+    if not all_aliases_maps:
+        all_aliases_maps.append(_NORMAL_ALIASES)
+        all_aliases_maps.append(_PROC_MACRO_ALIASES)
+
+    aliases = _flatten_dependency_maps(all_aliases_maps).pop(package_name, None)
+
+    if not aliases:
+        return dict()
+
+    common_items = aliases.pop(_COMMON_CONDITION, {}).items()
+
+    # If there are only common items in the dictionary, immediately return them
+    if not len(aliases.keys()) == 1:
+        return dict(common_items)
+
+    # Build a single select statement where each conditional has accounted for the
+    # common set of aliases.
+    crate_aliases = {"//conditions:default": dict(common_items)}
+    for condition, deps in aliases.items():
+        condition_triples = _CONDITIONS[condition]
+        for triple in condition_triples:
+            if triple in crate_aliases:
+                crate_aliases[triple].update(deps)
+            else:
+                crate_aliases.update({triple: dict(deps.items() + common_items)})
 
-# buildifier: disable=bzl-visibility
-load("@rules_rust//crate_universe/private:crates_vendor.bzl", "crates_vendor_remote_repository")
+    return select(crate_aliases)
 
-# buildifier: disable=bzl-visibility
-load("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl", _crate_repositories = "crate_repositories")
+###############################################################################
+# WORKSPACE MEMBER DEPS, ALIASES, AND EDITIONS
+###############################################################################
+
+_CRATE_EDITIONS = {
+    "ruby/extractor": "2024",
+    "rust/ast-generator": "2024",
+    "rust/autobuild": "2024",
+    "rust/extractor": "2024",
+    "rust/extractor/macros": "2024",
+    "shared/tree-sitter-extractor": "2024",
+    "shared/yeast": "2021",
+    "shared/yeast-macros": "2021",
+    "shared/yeast-schema": "2021",
+    "unified/extractor": "2024",
+    "unified/swift-syntax-rs": "2024",
+}
+
+_NORMAL_DEPENDENCIES = {
+    "ruby/extractor": {
+        _COMMON_CONDITION: {
+            "clap": Label("@vendor_ts//clap-4.6.7"),
+            "encoding": Label("@vendor_ts//encoding-0.2.33"),
+            "lazy_static": Label("@vendor_ts//lazy_static-1.5.1"),
+            "rayon": Label("@vendor_ts//rayon-1.12.0"),
+            "regex": Label("@vendor_ts//regex-1.13.1"),
+            "serde_json": Label("@vendor_ts//serde_json-1.0.154"),
+            "tracing": Label("@vendor_ts//tracing-0.1.44"),
+            "tracing-subscriber": Label("@vendor_ts//tracing-subscriber-0.3.23"),
+            "tree-sitter": Label("@vendor_ts//tree-sitter-0.26.9"),
+            "tree-sitter-embedded-template": Label("@vendor_ts//tree-sitter-embedded-template-0.25.0"),
+            "tree-sitter-ruby": Label("@vendor_ts//tree-sitter-ruby-0.23.1"),
+        },
+    },
+    "rust/ast-generator": {
+        _COMMON_CONDITION: {
+            "anyhow": Label("@vendor_ts//anyhow-1.0.104"),
+            "either": Label("@vendor_ts//either-1.19.0"),
+            "itertools": Label("@vendor_ts//itertools-0.15.0"),
+            "mustache": Label("@vendor_ts//mustache-0.9.0"),
+            "proc-macro2": Label("@vendor_ts//proc-macro2-1.0.107"),
+            "quote": Label("@vendor_ts//quote-1.0.47"),
+            "serde": Label("@vendor_ts//serde-1.0.229"),
+            "stdx": Label("@vendor_ts//ra_ap_stdx-0.0.358"),
+            "ungrammar": Label("@vendor_ts//ungrammar-1.16.1"),
+        },
+    },
+    "rust/autobuild": {
+    },
+    "rust/extractor": {
+        _COMMON_CONDITION: {
+            "anyhow": Label("@vendor_ts//anyhow-1.0.104"),
+            "chalk-ir": Label("@vendor_ts//chalk-ir-0.104.0"),
+            "chrono": Label("@vendor_ts//chrono-0.4.45"),
+            "clap": Label("@vendor_ts//clap-4.6.7"),
+            "dunce": Label("@vendor_ts//dunce-1.0.5"),
+            "figment": Label("@vendor_ts//figment-0.10.19"),
+            "glob": Label("@vendor_ts//glob-0.3.4"),
+            "itertools": Label("@vendor_ts//itertools-0.15.0"),
+            "mustache": Label("@vendor_ts//mustache-0.9.0"),
+            "num-traits": Label("@vendor_ts//num-traits-0.2.19"),
+            "ra_ap_base_db": Label("@vendor_ts//ra_ap_base_db-0.0.358"),
+            "ra_ap_cfg": Label("@vendor_ts//ra_ap_cfg-0.0.358"),
+            "ra_ap_hir": Label("@vendor_ts//ra_ap_hir-0.0.358"),
+            "ra_ap_hir_def": Label("@vendor_ts//ra_ap_hir_def-0.0.358"),
+            "ra_ap_hir_expand": Label("@vendor_ts//ra_ap_hir_expand-0.0.358"),
+            "ra_ap_hir_ty": Label("@vendor_ts//ra_ap_hir_ty-0.0.358"),
+            "ra_ap_ide_db": Label("@vendor_ts//ra_ap_ide_db-0.0.358"),
+            "ra_ap_intern": Label("@vendor_ts//ra_ap_intern-0.0.358"),
+            "ra_ap_load-cargo": Label("@vendor_ts//ra_ap_load-cargo-0.0.358"),
+            "ra_ap_parser": Label("@vendor_ts//ra_ap_parser-0.0.358"),
+            "ra_ap_paths": Label("@vendor_ts//ra_ap_paths-0.0.358"),
+            "ra_ap_project_model": Label("@vendor_ts//ra_ap_project_model-0.0.358"),
+            "ra_ap_span": Label("@vendor_ts//ra_ap_span-0.0.358"),
+            "ra_ap_syntax": Label("@vendor_ts//ra_ap_syntax-0.0.358"),
+            "ra_ap_syntax-bridge": Label("@vendor_ts//ra_ap_syntax-bridge-0.0.358"),
+            "ra_ap_toolchain": Label("@vendor_ts//ra_ap_toolchain-0.0.358"),
+            "ra_ap_vfs": Label("@vendor_ts//ra_ap_vfs-0.0.358"),
+            "serde": Label("@vendor_ts//serde-1.0.229"),
+            "serde_json": Label("@vendor_ts//serde_json-1.0.154"),
+            "serde_with": Label("@vendor_ts//serde_with-3.24.0"),
+            "toml": Label("@vendor_ts//toml-1.1.8+spec-1.1.0"),
+            "tracing": Label("@vendor_ts//tracing-0.1.44"),
+            "tracing-flame": Label("@vendor_ts//tracing-flame-0.2.0"),
+            "tracing-subscriber": Label("@vendor_ts//tracing-subscriber-0.3.23"),
+            "triomphe": Label("@vendor_ts//triomphe-0.1.17"),
+        },
+    },
+    "rust/extractor/macros": {
+        _COMMON_CONDITION: {
+            "quote": Label("@vendor_ts//quote-1.0.47"),
+            "syn": Label("@vendor_ts//syn-3.0.9"),
+        },
+    },
+    "shared/tree-sitter-extractor": {
+        _COMMON_CONDITION: {
+            "chrono": Label("@vendor_ts//chrono-0.4.45"),
+            "encoding": Label("@vendor_ts//encoding-0.2.33"),
+            "flate2": Label("@vendor_ts//flate2-1.1.9"),
+            "globset": Label("@vendor_ts//globset-0.4.18"),
+            "lazy_static": Label("@vendor_ts//lazy_static-1.5.1"),
+            "num_cpus": Label("@vendor_ts//num_cpus-1.17.0"),
+            "rayon": Label("@vendor_ts//rayon-1.12.0"),
+            "regex": Label("@vendor_ts//regex-1.13.1"),
+            "serde": Label("@vendor_ts//serde-1.0.229"),
+            "serde_json": Label("@vendor_ts//serde_json-1.0.154"),
+            "tracing": Label("@vendor_ts//tracing-0.1.44"),
+            "tracing-subscriber": Label("@vendor_ts//tracing-subscriber-0.3.23"),
+            "tree-sitter": Label("@vendor_ts//tree-sitter-0.26.9"),
+            "zstd": Label("@vendor_ts//zstd-0.14.2"),
+        },
+    },
+    "shared/yeast": {
+        _COMMON_CONDITION: {
+            "clap": Label("@vendor_ts//clap-4.6.7"),
+            "serde": Label("@vendor_ts//serde-1.0.229"),
+            "serde_json": Label("@vendor_ts//serde_json-1.0.154"),
+            "serde_yaml": Label("@vendor_ts//serde_yaml-0.9.34+deprecated"),
+            "tree-sitter": Label("@vendor_ts//tree-sitter-0.26.9"),
+            "tree-sitter-python": Label("@vendor_ts//tree-sitter-python-0.25.0"),
+            "tree-sitter-ruby": Label("@vendor_ts//tree-sitter-ruby-0.23.1"),
+        },
+    },
+    "shared/yeast-macros": {
+        _COMMON_CONDITION: {
+            "proc-macro2": Label("@vendor_ts//proc-macro2-1.0.107"),
+            "quote": Label("@vendor_ts//quote-1.0.47"),
+            "syn": Label("@vendor_ts//syn-3.0.9"),
+        },
+    },
+    "shared/yeast-schema": {
+        _COMMON_CONDITION: {
+            "serde": Label("@vendor_ts//serde-1.0.229"),
+            "serde_json": Label("@vendor_ts//serde_json-1.0.154"),
+            "serde_yaml": Label("@vendor_ts//serde_yaml-0.9.34+deprecated"),
+        },
+    },
+    "unified/extractor": {
+        _COMMON_CONDITION: {
+            "clap": Label("@vendor_ts//clap-4.6.7"),
+            "encoding": Label("@vendor_ts//encoding-0.2.33"),
+            "lazy_static": Label("@vendor_ts//lazy_static-1.5.1"),
+            "rayon": Label("@vendor_ts//rayon-1.12.0"),
+            "regex": Label("@vendor_ts//regex-1.13.1"),
+            "serde": Label("@vendor_ts//serde-1.0.229"),
+            "serde_json": Label("@vendor_ts//serde_json-1.0.154"),
+            "tracing": Label("@vendor_ts//tracing-0.1.44"),
+            "tracing-subscriber": Label("@vendor_ts//tracing-subscriber-0.3.23"),
+        },
+    },
+    "unified/swift-syntax-rs": {
+    },
+}
+
+_NORMAL_ALIASES = {
+    "ruby/extractor": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "rust/ast-generator": {
+        _COMMON_CONDITION: {
+            Label("@vendor_ts//ra_ap_stdx-0.0.358"): "stdx",
+        },
+    },
+    "rust/autobuild": {
+    },
+    "rust/extractor": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "rust/extractor/macros": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "shared/tree-sitter-extractor": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "shared/yeast": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "shared/yeast-macros": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "shared/yeast-schema": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "unified/extractor": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "unified/swift-syntax-rs": {
+    },
+}
+
+_NORMAL_DEV_DEPENDENCIES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/autobuild": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+        _COMMON_CONDITION: {
+            "rand": Label("@vendor_ts//rand-0.10.3"),
+            "tree-sitter-json": Label("@vendor_ts//tree-sitter-json-0.24.8"),
+            "tree-sitter-ql": Label("@vendor_ts//tree-sitter-ql-0.23.1"),
+        },
+    },
+    "shared/yeast": {
+    },
+    "shared/yeast-macros": {
+    },
+    "shared/yeast-schema": {
+    },
+    "unified/extractor": {
+    },
+    "unified/swift-syntax-rs": {
+    },
+}
+
+_NORMAL_DEV_ALIASES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/autobuild": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "shared/yeast": {
+    },
+    "shared/yeast-macros": {
+    },
+    "shared/yeast-schema": {
+    },
+    "unified/extractor": {
+    },
+    "unified/swift-syntax-rs": {
+    },
+}
+
+_PROC_MACRO_DEPENDENCIES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/autobuild": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+    "shared/yeast": {
+    },
+    "shared/yeast-macros": {
+    },
+    "shared/yeast-schema": {
+    },
+    "unified/extractor": {
+    },
+    "unified/swift-syntax-rs": {
+    },
+}
+
+_PROC_MACRO_ALIASES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/autobuild": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+    "shared/yeast": {
+    },
+    "shared/yeast-macros": {
+    },
+    "shared/yeast-schema": {
+    },
+    "unified/extractor": {
+    },
+    "unified/swift-syntax-rs": {
+    },
+}
+
+_PROC_MACRO_DEV_DEPENDENCIES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/autobuild": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+    "shared/yeast": {
+    },
+    "shared/yeast-macros": {
+    },
+    "shared/yeast-schema": {
+    },
+    "unified/extractor": {
+    },
+    "unified/swift-syntax-rs": {
+    },
+}
+
+_PROC_MACRO_DEV_ALIASES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/autobuild": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "shared/yeast": {
+    },
+    "shared/yeast-macros": {
+    },
+    "shared/yeast-schema": {
+    },
+    "unified/extractor": {
+    },
+    "unified/swift-syntax-rs": {
+    },
+}
+
+_BUILD_DEPENDENCIES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/autobuild": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+    "shared/yeast": {
+    },
+    "shared/yeast-macros": {
+    },
+    "shared/yeast-schema": {
+    },
+    "unified/extractor": {
+    },
+    "unified/swift-syntax-rs": {
+    },
+}
+
+_BUILD_ALIASES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/autobuild": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+    "shared/yeast": {
+    },
+    "shared/yeast-macros": {
+    },
+    "shared/yeast-schema": {
+    },
+    "unified/extractor": {
+    },
+    "unified/swift-syntax-rs": {
+    },
+}
+
+_BUILD_PROC_MACRO_DEPENDENCIES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/autobuild": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+    "shared/yeast": {
+    },
+    "shared/yeast-macros": {
+    },
+    "shared/yeast-schema": {
+    },
+    "unified/extractor": {
+    },
+    "unified/swift-syntax-rs": {
+    },
+}
+
+_BUILD_PROC_MACRO_ALIASES = {
+    "ruby/extractor": {
+    },
+    "rust/ast-generator": {
+    },
+    "rust/autobuild": {
+    },
+    "rust/extractor": {
+    },
+    "rust/extractor/macros": {
+    },
+    "shared/tree-sitter-extractor": {
+    },
+    "shared/yeast": {
+    },
+    "shared/yeast-macros": {
+    },
+    "shared/yeast-schema": {
+    },
+    "unified/extractor": {
+    },
+    "unified/swift-syntax-rs": {
+    },
+}
+
+_CONDITIONS = {
+    "aarch64-apple-darwin": ["@rules_rust//rust/platform:aarch64-apple-darwin"],
+    "aarch64-apple-ios": ["@rules_rust//rust/platform:aarch64-apple-ios"],
+    "aarch64-apple-ios-macabi": ["@rules_rust//rust/platform:aarch64-apple-ios-macabi"],
+    "aarch64-apple-ios-sim": ["@rules_rust//rust/platform:aarch64-apple-ios-sim"],
+    "aarch64-linux-android": ["@rules_rust//rust/platform:aarch64-linux-android"],
+    "aarch64-pc-windows-gnullvm": [],
+    "aarch64-pc-windows-msvc": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
+    "aarch64-unknown-fuchsia": ["@rules_rust//rust/platform:aarch64-unknown-fuchsia"],
+    "aarch64-unknown-linux-gnu": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"],
+    "aarch64-unknown-nixos-gnu": ["@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"],
+    "aarch64-unknown-none": ["@rules_rust//rust/platform:aarch64-unknown-none"],
+    "aarch64-unknown-nto-qnx710": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"],
+    "aarch64-unknown-uefi": ["@rules_rust//rust/platform:aarch64-unknown-uefi"],
+    "arm-unknown-linux-gnueabi": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi"],
+    "arm-unknown-linux-musleabi": ["@rules_rust//rust/platform:arm-unknown-linux-musleabi"],
+    "armv7-linux-androideabi": ["@rules_rust//rust/platform:armv7-linux-androideabi"],
+    "armv7-unknown-linux-gnueabi": ["@rules_rust//rust/platform:armv7-unknown-linux-gnueabi"],
+    "cfg(all(any(target_arch = \"x86_64\", target_arch = \"arm64ec\"), target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "cfg(all(any(target_os = \"linux\", target_os = \"android\"), not(any(all(target_os = \"linux\", target_env = \"\"), getrandom_backend = \"custom\", getrandom_backend = \"linux_raw\", getrandom_backend = \"rdrand\", getrandom_backend = \"rndr\"))))": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu", "@rules_rust//rust/platform:mips-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:sparc64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(all(target_arch = \"aarch64\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
+    "cfg(all(target_arch = \"aarch64\", target_os = \"android\"))": ["@rules_rust//rust/platform:aarch64-linux-android"],
+    "cfg(all(target_arch = \"aarch64\", target_os = \"linux\"))": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"],
+    "cfg(all(target_arch = \"aarch64\", target_vendor = \"apple\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-macabi", "@rules_rust//rust/platform:aarch64-apple-ios-sim"],
+    "cfg(all(target_arch = \"loongarch64\", target_os = \"linux\"))": ["@rules_rust//rust/platform:loongarch64-unknown-linux-gnu"],
+    "cfg(all(target_arch = \"wasm32\", target_os = \"unknown\"))": ["@rules_rust//rust/platform:wasm32-unknown-unknown"],
+    "cfg(all(target_arch = \"x86\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
+    "cfg(all(target_arch = \"x86\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
+    "cfg(all(target_arch = \"x86_64\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(all(target_os = \"linux\", not(target_env = \"ohos\"), any(target_arch = \"x86\", target_arch = \"x86_64\", target_arch = \"aarch64\")))": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(all(target_os = \"linux\", target_env = \"gnu\"))": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu", "@rules_rust//rust/platform:mips-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:sparc64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(all(target_os = \"uefi\", getrandom_backend = \"efi_rng\"))": [],
+    "cfg(any())": [],
+    "cfg(any(target_arch = \"x86_64\", target_arch = \"x86\"))": ["@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-apple-ios-macabi", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none", "@rules_rust//rust/platform:x86_64-unknown-uefi"],
+    "cfg(any(target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"hurd\", target_os = \"illumos\", target_os = \"cygwin\", all(target_os = \"horizon\", target_arch = \"arm\")))": ["@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-freebsd"],
+    "cfg(any(target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonflybsd\", target_os = \"ios\"))": ["@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-macabi", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:sparc64-unknown-netbsd", "@rules_rust//rust/platform:sparc64-unknown-openbsd", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-apple-ios-macabi", "@rules_rust//rust/platform:x86_64-unknown-freebsd"],
+    "cfg(any(target_os = \"haiku\", target_os = \"redox\", target_os = \"nto\", target_os = \"aix\"))": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"],
+    "cfg(any(target_os = \"ios\", target_os = \"visionos\", target_os = \"watchos\", target_os = \"tvos\"))": ["@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-macabi", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-apple-ios-macabi"],
+    "cfg(any(target_os = \"linux\", target_os = \"android\"))": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu", "@rules_rust//rust/platform:mips-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:sparc64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(any(target_os = \"macos\", target_os = \"ios\", target_os = \"freebsd\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-macabi", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-apple-ios-macabi", "@rules_rust//rust/platform:x86_64-unknown-freebsd"],
+    "cfg(any(target_os = \"macos\", target_os = \"openbsd\", target_os = \"vita\", target_os = \"emscripten\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:sparc64-unknown-openbsd", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:x86_64-apple-darwin"],
+    "cfg(any(target_pointer_width = \"8\", target_pointer_width = \"16\", target_pointer_width = \"32\"))": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:mips-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imac-unknown-none-elf", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:thumbv6m-none-eabi", "@rules_rust//rust/platform:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv7em-none-eabihf", "@rules_rust//rust/platform:thumbv7m-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabihf", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2"],
+    "cfg(any(unix, target_os = \"hermit\", target_os = \"wasi\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-macabi", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-fuchsia", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu", "@rules_rust//rust/platform:mips-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:sparc64-unknown-linux-gnu", "@rules_rust//rust/platform:sparc64-unknown-netbsd", "@rules_rust//rust/platform:sparc64-unknown-openbsd", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-apple-ios-macabi", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(not(target_has_atomic = \"ptr\"))": ["@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:thumbv6m-none-eabi"],
+    "cfg(not(windows))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-macabi", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-fuchsia", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-none", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:aarch64-unknown-uefi", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu", "@rules_rust//rust/platform:mips-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imac-unknown-none-elf", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-none-elf", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:sparc64-unknown-linux-gnu", "@rules_rust//rust/platform:sparc64-unknown-netbsd", "@rules_rust//rust/platform:sparc64-unknown-openbsd", "@rules_rust//rust/platform:thumbv6m-none-eabi", "@rules_rust//rust/platform:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv7em-none-eabihf", "@rules_rust//rust/platform:thumbv7m-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabihf", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-apple-ios-macabi", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none", "@rules_rust//rust/platform:x86_64-unknown-uefi"],
+    "cfg(target_family = \"wasm\")": ["@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2"],
+    "cfg(target_os = \"android\")": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:x86_64-linux-android"],
+    "cfg(target_os = \"haiku\")": [],
+    "cfg(target_os = \"hermit\")": [],
+    "cfg(target_os = \"macos\")": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin"],
+    "cfg(target_os = \"netbsd\")": ["@rules_rust//rust/platform:sparc64-unknown-netbsd"],
+    "cfg(target_os = \"redox\")": [],
+    "cfg(target_os = \"solaris\")": [],
+    "cfg(target_os = \"vxworks\")": [],
+    "cfg(target_os = \"wasi\")": ["@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2"],
+    "cfg(target_os = \"windows\")": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "cfg(target_vendor = \"apple\")": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-macabi", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-apple-ios-macabi"],
+    "cfg(unix)": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-macabi", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-fuchsia", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu", "@rules_rust//rust/platform:mips-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-fuchsia", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:sparc64-unknown-linux-gnu", "@rules_rust//rust/platform:sparc64-unknown-netbsd", "@rules_rust//rust/platform:sparc64-unknown-openbsd", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-apple-ios-macabi", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(windows)": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "cfg(windows_raw_dylib)": [],
+    "i686-apple-darwin": ["@rules_rust//rust/platform:i686-apple-darwin"],
+    "i686-linux-android": ["@rules_rust//rust/platform:i686-linux-android"],
+    "i686-pc-windows-gnullvm": [],
+    "i686-pc-windows-msvc": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
+    "i686-unknown-freebsd": ["@rules_rust//rust/platform:i686-unknown-freebsd"],
+    "i686-unknown-linux-gnu": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
+    "loongarch64-unknown-linux-gnu": ["@rules_rust//rust/platform:loongarch64-unknown-linux-gnu"],
+    "mips-unknown-linux-gnu": ["@rules_rust//rust/platform:mips-unknown-linux-gnu"],
+    "powerpc-unknown-linux-gnu": ["@rules_rust//rust/platform:powerpc-unknown-linux-gnu"],
+    "riscv32imac-unknown-none-elf": ["@rules_rust//rust/platform:riscv32imac-unknown-none-elf"],
+    "riscv32imc-unknown-none-elf": ["@rules_rust//rust/platform:riscv32imc-unknown-none-elf"],
+    "riscv64gc-unknown-fuchsia": ["@rules_rust//rust/platform:riscv64gc-unknown-fuchsia"],
+    "riscv64gc-unknown-linux-gnu": ["@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu"],
+    "riscv64gc-unknown-none-elf": ["@rules_rust//rust/platform:riscv64gc-unknown-none-elf"],
+    "s390x-unknown-linux-gnu": ["@rules_rust//rust/platform:s390x-unknown-linux-gnu"],
+    "sparc64-unknown-linux-gnu": ["@rules_rust//rust/platform:sparc64-unknown-linux-gnu"],
+    "sparc64-unknown-netbsd": ["@rules_rust//rust/platform:sparc64-unknown-netbsd"],
+    "sparc64-unknown-openbsd": ["@rules_rust//rust/platform:sparc64-unknown-openbsd"],
+    "thumbv6m-none-eabi": ["@rules_rust//rust/platform:thumbv6m-none-eabi"],
+    "thumbv7em-none-eabi": ["@rules_rust//rust/platform:thumbv7em-none-eabi"],
+    "thumbv7em-none-eabihf": ["@rules_rust//rust/platform:thumbv7em-none-eabihf"],
+    "thumbv7m-none-eabi": ["@rules_rust//rust/platform:thumbv7m-none-eabi"],
+    "thumbv8m.main-none-eabi": ["@rules_rust//rust/platform:thumbv8m.main-none-eabi"],
+    "thumbv8m.main-none-eabihf": ["@rules_rust//rust/platform:thumbv8m.main-none-eabihf"],
+    "wasm32-unknown-emscripten": ["@rules_rust//rust/platform:wasm32-unknown-emscripten"],
+    "wasm32-unknown-unknown": ["@rules_rust//rust/platform:wasm32-unknown-unknown"],
+    "wasm32-wasip1": ["@rules_rust//rust/platform:wasm32-wasip1"],
+    "wasm32-wasip1-threads": ["@rules_rust//rust/platform:wasm32-wasip1-threads"],
+    "wasm32-wasip2": ["@rules_rust//rust/platform:wasm32-wasip2"],
+    "x86_64-apple-darwin": ["@rules_rust//rust/platform:x86_64-apple-darwin"],
+    "x86_64-apple-ios": ["@rules_rust//rust/platform:x86_64-apple-ios"],
+    "x86_64-apple-ios-macabi": ["@rules_rust//rust/platform:x86_64-apple-ios-macabi"],
+    "x86_64-linux-android": ["@rules_rust//rust/platform:x86_64-linux-android"],
+    "x86_64-pc-windows-gnullvm": [],
+    "x86_64-pc-windows-msvc": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "x86_64-unknown-freebsd": ["@rules_rust//rust/platform:x86_64-unknown-freebsd"],
+    "x86_64-unknown-fuchsia": ["@rules_rust//rust/platform:x86_64-unknown-fuchsia"],
+    "x86_64-unknown-linux-gnu": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "x86_64-unknown-nixos-gnu": ["@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "x86_64-unknown-none": ["@rules_rust//rust/platform:x86_64-unknown-none"],
+    "x86_64-unknown-uefi": ["@rules_rust//rust/platform:x86_64-unknown-uefi"],
+}
+
+###############################################################################
 
 def crate_repositories():
-    """Generates repositories for vendored crates.
+    """A macro for defining repositories for all generated crates.
 
     Returns:
       A list of repos visible to the module through the module extension.
@@ -23,10 +879,3207 @@ def crate_repositories():
     maybe(
         crates_vendor_remote_repository,
         name = "vendor_ts",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bazel"),
-        defs_module = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl"),
+        # Lean interface: just point at `crates.bzl`; the repo rule
+        # derives the sibling `BUILD.bazel` and `defs.bzl`.
+        crates_module = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:crates.bzl"),
+    )
+    maybe(
+        http_archive,
+        name = "vendor_ts__adler2-2.0.1",
+        sha256 = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/adler2/2.0.1/download"],
+        strip_prefix = "adler2-2.0.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.adler2-2.0.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__aho-corasick-1.1.5",
+        sha256 = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/aho-corasick/1.1.5/download"],
+        strip_prefix = "aho-corasick-1.1.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.aho-corasick-1.1.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__allocator-api2-0.2.21",
+        sha256 = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/allocator-api2/0.2.21/download"],
+        strip_prefix = "allocator-api2-0.2.21",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.allocator-api2-0.2.21.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__android_system_properties-0.1.5",
+        sha256 = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/android_system_properties/0.1.5/download"],
+        strip_prefix = "android_system_properties-0.1.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.android_system_properties-0.1.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__anstream-1.0.0",
+        sha256 = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstream/1.0.0/download"],
+        strip_prefix = "anstream-1.0.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstream-1.0.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__anstyle-1.0.14",
+        sha256 = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstyle/1.0.14/download"],
+        strip_prefix = "anstyle-1.0.14",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-1.0.14.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__anstyle-parse-1.0.0",
+        sha256 = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstyle-parse/1.0.0/download"],
+        strip_prefix = "anstyle-parse-1.0.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-parse-1.0.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__anstyle-query-1.1.5",
+        sha256 = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstyle-query/1.1.5/download"],
+        strip_prefix = "anstyle-query-1.1.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-query-1.1.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__anstyle-wincon-3.0.11",
+        sha256 = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anstyle-wincon/3.0.11/download"],
+        strip_prefix = "anstyle-wincon-3.0.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-wincon-3.0.11.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__anyhow-1.0.104",
+        sha256 = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/anyhow/1.0.104/download"],
+        strip_prefix = "anyhow-1.0.104",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anyhow-1.0.104.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__arrayvec-0.7.8",
+        sha256 = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/arrayvec/0.7.8/download"],
+        strip_prefix = "arrayvec-0.7.8",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.arrayvec-0.7.8.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__atomic-0.6.1",
+        sha256 = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/atomic/0.6.1/download"],
+        strip_prefix = "atomic-0.6.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.atomic-0.6.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__autocfg-1.5.1",
+        sha256 = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/autocfg/1.5.1/download"],
+        strip_prefix = "autocfg-1.5.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.autocfg-1.5.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__base64-0.23.1",
+        sha256 = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/base64/0.23.1/download"],
+        strip_prefix = "base64-0.23.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.base64-0.23.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__bitflags-1.3.2",
+        sha256 = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/bitflags/1.3.2/download"],
+        strip_prefix = "bitflags-1.3.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bitflags-1.3.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__bitflags-2.13.2",
+        sha256 = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/bitflags/2.13.2/download"],
+        strip_prefix = "bitflags-2.13.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bitflags-2.13.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__borsh-1.8.1",
+        sha256 = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/borsh/1.8.1/download"],
+        strip_prefix = "borsh-1.8.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.borsh-1.8.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__boxcar-0.2.14",
+        sha256 = "36f64beae40a84da1b4b26ff2761a5b895c12adc41dc25aaee1c4f2bbfe97a6e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/boxcar/0.2.14/download"],
+        strip_prefix = "boxcar-0.2.14",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.boxcar-0.2.14.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__bs58-0.5.1",
+        sha256 = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/bs58/0.5.1/download"],
+        strip_prefix = "bs58-0.5.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bs58-0.5.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__bstr-1.12.1",
+        sha256 = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/bstr/1.12.1/download"],
+        strip_prefix = "bstr-1.12.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bstr-1.12.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__bumpalo-3.20.3",
+        sha256 = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/bumpalo/3.20.3/download"],
+        strip_prefix = "bumpalo-3.20.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bumpalo-3.20.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__bytemuck-1.25.0",
+        sha256 = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/bytemuck/1.25.0/download"],
+        strip_prefix = "bytemuck-1.25.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bytemuck-1.25.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__bytes-1.12.1",
+        sha256 = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/bytes/1.12.1/download"],
+        strip_prefix = "bytes-1.12.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bytes-1.12.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__camino-1.2.6",
+        sha256 = "bbbad30e4b4c14a39e3cc8aed085a12a327257c316619c93581e017bc52be591",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/camino/1.2.6/download"],
+        strip_prefix = "camino-1.2.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.camino-1.2.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__cargo-platform-0.3.3",
+        sha256 = "dd0061da739915fae12ea00e16397555ed4371a6bb285431aab930f61b0aa4ba",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cargo-platform/0.3.3/download"],
+        strip_prefix = "cargo-platform-0.3.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo-platform-0.3.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__cargo_metadata-0.23.1",
+        sha256 = "ef987d17b0a113becdd19d3d0022d04d7ef41f9efe4f3fb63ac44ba61df3ade9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cargo_metadata/0.23.1/download"],
+        strip_prefix = "cargo_metadata-0.23.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo_metadata-0.23.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__cc-1.4.6",
+        sha256 = "a3eb0f42d6c360dc3f8a821f6bf2fdea7f72bfd36b3076eb0e6d1e9e0752fff4",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cc/1.4.6/download"],
+        strip_prefix = "cc-1.4.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cc-1.4.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__cfg-if-1.0.4",
+        sha256 = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cfg-if/1.0.4/download"],
+        strip_prefix = "cfg-if-1.0.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cfg-if-1.0.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__cfg_aliases-0.2.2",
+        sha256 = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cfg_aliases/0.2.2/download"],
+        strip_prefix = "cfg_aliases-0.2.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cfg_aliases-0.2.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__chacha20-0.10.2",
+        sha256 = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/chacha20/0.10.2/download"],
+        strip_prefix = "chacha20-0.10.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chacha20-0.10.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__chalk-derive-0.104.0",
+        sha256 = "9ea9b1e80910f66ae87c772247591432032ef3f6a67367ff17f8343db05beafa",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/chalk-derive/0.104.0/download"],
+        strip_prefix = "chalk-derive-0.104.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-derive-0.104.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__chalk-ir-0.104.0",
+        sha256 = "7047a516de16226cd17344d41a319d0ea1064bf9e60bd612ab341ab4a34bbfa8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/chalk-ir/0.104.0/download"],
+        strip_prefix = "chalk-ir-0.104.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-ir-0.104.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__chrono-0.4.45",
+        sha256 = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/chrono/0.4.45/download"],
+        strip_prefix = "chrono-0.4.45",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chrono-0.4.45.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__clap-4.6.7",
+        sha256 = "aa8876b300ab35ba921adea3dfd70157a46249b33f95c9084ae5709785478946",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/clap/4.6.7/download"],
+        strip_prefix = "clap-4.6.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap-4.6.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__clap_builder-4.6.7",
+        sha256 = "ec0797fb7aeb1406c84efac526901f7ec3ead2124f946b494e72879d4b54704d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/clap_builder/4.6.7/download"],
+        strip_prefix = "clap_builder-4.6.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_builder-4.6.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__clap_derive-4.6.7",
+        sha256 = "f9c751b79415d4e559e3d1fcf128e09e720eb673a06d26cf6f392d37d75b66e0",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/clap_derive/4.6.7/download"],
+        strip_prefix = "clap_derive-4.6.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_derive-4.6.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__clap_lex-1.1.1",
+        sha256 = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/clap_lex/1.1.1/download"],
+        strip_prefix = "clap_lex-1.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_lex-1.1.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__cobs-0.3.0",
+        sha256 = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cobs/0.3.0/download"],
+        strip_prefix = "cobs-0.3.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cobs-0.3.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__colorchoice-1.0.5",
+        sha256 = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/colorchoice/1.0.5/download"],
+        strip_prefix = "colorchoice-1.0.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.colorchoice-1.0.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__core-foundation-sys-0.8.7",
+        sha256 = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/core-foundation-sys/0.8.7/download"],
+        strip_prefix = "core-foundation-sys-0.8.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.core-foundation-sys-0.8.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__countme-3.0.1",
+        sha256 = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/countme/3.0.1/download"],
+        strip_prefix = "countme-3.0.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.countme-3.0.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__cov-mark-2.2.0",
+        sha256 = "90863d8442510cddf7f46618c4f92413774635771a3e80830c8b30d183420b14",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cov-mark/2.2.0/download"],
+        strip_prefix = "cov-mark-2.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cov-mark-2.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__cpufeatures-0.3.1",
+        sha256 = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/cpufeatures/0.3.1/download"],
+        strip_prefix = "cpufeatures-0.3.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cpufeatures-0.3.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__crc32fast-1.5.0",
+        sha256 = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/crc32fast/1.5.0/download"],
+        strip_prefix = "crc32fast-1.5.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crc32fast-1.5.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__crossbeam-channel-0.5.17",
+        sha256 = "98b0cc327b5bc766e7fda9c9260cc0fa81b43a8e240440422dff70788e3f9ef1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/crossbeam-channel/0.5.17/download"],
+        strip_prefix = "crossbeam-channel-0.5.17",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-channel-0.5.17.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__crossbeam-deque-0.8.8",
+        sha256 = "622f3fc73690be383c7214310406f28a90e6edeadc3cea882f9d71e495b9711a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/crossbeam-deque/0.8.8/download"],
+        strip_prefix = "crossbeam-deque-0.8.8",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-deque-0.8.8.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__crossbeam-epoch-0.9.21",
+        sha256 = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/crossbeam-epoch/0.9.21/download"],
+        strip_prefix = "crossbeam-epoch-0.9.21",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-epoch-0.9.21.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__crossbeam-queue-0.3.14",
+        sha256 = "03e8bd762f7479489c70ed6c768ddca99d7296857de437a68dcb2a94365b3fae",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/crossbeam-queue/0.3.14/download"],
+        strip_prefix = "crossbeam-queue-0.3.14",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-queue-0.3.14.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__crossbeam-utils-0.8.23",
+        sha256 = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/crossbeam-utils/0.8.23/download"],
+        strip_prefix = "crossbeam-utils-0.8.23",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-utils-0.8.23.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__darling-0.24.1",
+        sha256 = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/darling/0.24.1/download"],
+        strip_prefix = "darling-0.24.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling-0.24.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__darling_core-0.24.1",
+        sha256 = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/darling_core/0.24.1/download"],
+        strip_prefix = "darling_core-0.24.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_core-0.24.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__darling_macro-0.24.1",
+        sha256 = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/darling_macro/0.24.1/download"],
+        strip_prefix = "darling_macro-0.24.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_macro-0.24.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__dashmap-6.2.1",
+        sha256 = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/dashmap/6.2.1/download"],
+        strip_prefix = "dashmap-6.2.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.dashmap-6.2.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__defmt-1.1.1",
+        sha256 = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/defmt/1.1.1/download"],
+        strip_prefix = "defmt-1.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.defmt-1.1.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__defmt-macros-1.1.1",
+        sha256 = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/defmt-macros/1.1.1/download"],
+        strip_prefix = "defmt-macros-1.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.defmt-macros-1.1.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__defmt-parser-1.0.0",
+        sha256 = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/defmt-parser/1.0.0/download"],
+        strip_prefix = "defmt-parser-1.0.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.defmt-parser-1.0.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__deranged-0.5.8",
+        sha256 = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/deranged/0.5.8/download"],
+        strip_prefix = "deranged-0.5.8",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.deranged-0.5.8.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__derive-where-1.6.1",
+        sha256 = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/derive-where/1.6.1/download"],
+        strip_prefix = "derive-where-1.6.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.derive-where-1.6.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__dissimilar-1.0.11",
+        sha256 = "aeda16ab4059c5fd2a83f2b9c9e9c981327b18aa8e3b313f7e6563799d4f093e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/dissimilar/1.0.11/download"],
+        strip_prefix = "dissimilar-1.0.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.dissimilar-1.0.11.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__drop_bomb-0.1.5",
+        sha256 = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/drop_bomb/0.1.5/download"],
+        strip_prefix = "drop_bomb-0.1.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.drop_bomb-0.1.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__dunce-1.0.5",
+        sha256 = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/dunce/1.0.5/download"],
+        strip_prefix = "dunce-1.0.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.dunce-1.0.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__dyn-clone-1.0.20",
+        sha256 = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/dyn-clone/1.0.20/download"],
+        strip_prefix = "dyn-clone-1.0.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.dyn-clone-1.0.20.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__either-1.19.0",
+        sha256 = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/either/1.19.0/download"],
+        strip_prefix = "either-1.19.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.either-1.19.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__embedded-io-0.4.0",
+        sha256 = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/embedded-io/0.4.0/download"],
+        strip_prefix = "embedded-io-0.4.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.embedded-io-0.4.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__embedded-io-0.6.1",
+        sha256 = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/embedded-io/0.6.1/download"],
+        strip_prefix = "embedded-io-0.6.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.embedded-io-0.6.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ena-0.14.4",
+        sha256 = "eabffdaee24bd1bf95c5ef7cec31260444317e72ea56c4c91750e8b7ee58d5f1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ena/0.14.4/download"],
+        strip_prefix = "ena-0.14.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ena-0.14.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__encoding-0.2.33",
+        sha256 = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding/0.2.33/download"],
+        strip_prefix = "encoding-0.2.33",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-0.2.33.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__encoding-index-japanese-1.20141219.5",
+        sha256 = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding-index-japanese/1.20141219.5/download"],
+        strip_prefix = "encoding-index-japanese-1.20141219.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-japanese-1.20141219.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__encoding-index-korean-1.20141219.5",
+        sha256 = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding-index-korean/1.20141219.5/download"],
+        strip_prefix = "encoding-index-korean-1.20141219.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-korean-1.20141219.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__encoding-index-simpchinese-1.20141219.5",
+        sha256 = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding-index-simpchinese/1.20141219.5/download"],
+        strip_prefix = "encoding-index-simpchinese-1.20141219.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-simpchinese-1.20141219.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__encoding-index-singlebyte-1.20141219.5",
+        sha256 = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding-index-singlebyte/1.20141219.5/download"],
+        strip_prefix = "encoding-index-singlebyte-1.20141219.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-singlebyte-1.20141219.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__encoding-index-tradchinese-1.20141219.5",
+        sha256 = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding-index-tradchinese/1.20141219.5/download"],
+        strip_prefix = "encoding-index-tradchinese-1.20141219.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-tradchinese-1.20141219.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__encoding_index_tests-0.1.4",
+        sha256 = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/encoding_index_tests/0.1.4/download"],
+        strip_prefix = "encoding_index_tests-0.1.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding_index_tests-0.1.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__equivalent-1.0.2",
+        sha256 = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/equivalent/1.0.2/download"],
+        strip_prefix = "equivalent-1.0.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.equivalent-1.0.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__figment-0.10.19",
+        sha256 = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/figment/0.10.19/download"],
+        strip_prefix = "figment-0.10.19",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.figment-0.10.19.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__find-msvc-tools-0.1.12",
+        sha256 = "3e0f1c7c3a72c66fd80abe965175f7523475c0489a87d3ff9d6e8c87d87a9d2d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/find-msvc-tools/0.1.12/download"],
+        strip_prefix = "find-msvc-tools-0.1.12",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.find-msvc-tools-0.1.12.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__fixedbitset-0.5.7",
+        sha256 = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/fixedbitset/0.5.7/download"],
+        strip_prefix = "fixedbitset-0.5.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fixedbitset-0.5.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__flate2-1.1.9",
+        sha256 = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/flate2/1.1.9/download"],
+        strip_prefix = "flate2-1.1.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.flate2-1.1.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__foldhash-0.1.5",
+        sha256 = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/foldhash/0.1.5/download"],
+        strip_prefix = "foldhash-0.1.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.foldhash-0.1.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__foldhash-0.2.0",
+        sha256 = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/foldhash/0.2.0/download"],
+        strip_prefix = "foldhash-0.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.foldhash-0.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__fsevent-sys-4.1.0",
+        sha256 = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/fsevent-sys/4.1.0/download"],
+        strip_prefix = "fsevent-sys-4.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fsevent-sys-4.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__fst-0.4.7",
+        sha256 = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/fst/0.4.7/download"],
+        strip_prefix = "fst-0.4.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fst-0.4.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__futures-core-0.3.34",
+        sha256 = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/futures-core/0.3.34/download"],
+        strip_prefix = "futures-core-0.3.34",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.futures-core-0.3.34.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__futures-task-0.3.34",
+        sha256 = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/futures-task/0.3.34/download"],
+        strip_prefix = "futures-task-0.3.34",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.futures-task-0.3.34.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__futures-util-0.3.34",
+        sha256 = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/futures-util/0.3.34/download"],
+        strip_prefix = "futures-util-0.3.34",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.futures-util-0.3.34.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__getrandom-0.4.3",
+        sha256 = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/getrandom/0.4.3/download"],
+        strip_prefix = "getrandom-0.4.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.getrandom-0.4.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__glob-0.3.4",
+        sha256 = "e4eba85ea1d0a966a983acd07deee566e67395d2d96b6fb39e62b5a833f1eb0b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/glob/0.3.4/download"],
+        strip_prefix = "glob-0.3.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.glob-0.3.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__globset-0.4.18",
+        sha256 = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/globset/0.4.18/download"],
+        strip_prefix = "globset-0.4.18",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.globset-0.4.18.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__hashbrown-0.12.3",
+        sha256 = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hashbrown/0.12.3/download"],
+        strip_prefix = "hashbrown-0.12.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.12.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__hashbrown-0.14.5",
+        sha256 = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hashbrown/0.14.5/download"],
+        strip_prefix = "hashbrown-0.14.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.14.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__hashbrown-0.15.5",
+        sha256 = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hashbrown/0.15.5/download"],
+        strip_prefix = "hashbrown-0.15.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.15.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__hashbrown-0.17.1",
+        sha256 = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hashbrown/0.17.1/download"],
+        strip_prefix = "hashbrown-0.17.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.17.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__hashlink-0.12.1",
+        sha256 = "32069d97bb81e38fa67eab65e3393bf804bb85969f2bc06bf13f64aef5aba248",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hashlink/0.12.1/download"],
+        strip_prefix = "hashlink-0.12.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashlink-0.12.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__heck-0.5.0",
+        sha256 = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/heck/0.5.0/download"],
+        strip_prefix = "heck-0.5.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.heck-0.5.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__hermit-abi-0.5.2",
+        sha256 = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hermit-abi/0.5.2/download"],
+        strip_prefix = "hermit-abi-0.5.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hermit-abi-0.5.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__hex-0.4.3",
+        sha256 = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/hex/0.4.3/download"],
+        strip_prefix = "hex-0.4.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hex-0.4.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__iana-time-zone-0.1.65",
+        sha256 = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/iana-time-zone/0.1.65/download"],
+        strip_prefix = "iana-time-zone-0.1.65",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.iana-time-zone-0.1.65.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__iana-time-zone-haiku-0.1.2",
+        sha256 = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/iana-time-zone-haiku/0.1.2/download"],
+        strip_prefix = "iana-time-zone-haiku-0.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.iana-time-zone-haiku-0.1.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ident_case-1.0.1",
+        sha256 = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ident_case/1.0.1/download"],
+        strip_prefix = "ident_case-1.0.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ident_case-1.0.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__indexmap-1.9.3",
+        sha256 = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/indexmap/1.9.3/download"],
+        strip_prefix = "indexmap-1.9.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.indexmap-1.9.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__indexmap-2.14.2",
+        sha256 = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/indexmap/2.14.2/download"],
+        strip_prefix = "indexmap-2.14.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.indexmap-2.14.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__inlinable_string-0.1.15",
+        sha256 = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/inlinable_string/0.1.15/download"],
+        strip_prefix = "inlinable_string-0.1.15",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inlinable_string-0.1.15.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__inotify-0.11.5",
+        sha256 = "4cc00ea907cab49550b7da656f80ebb97be1b997d931fbcd28d39734e17ce592",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/inotify/0.11.5/download"],
+        strip_prefix = "inotify-0.11.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inotify-0.11.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__inotify-sys-0.1.8",
+        sha256 = "c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/inotify-sys/0.1.8/download"],
+        strip_prefix = "inotify-sys-0.1.8",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inotify-sys-0.1.8.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__intrusive-collections-0.10.3",
+        sha256 = "4275b20e6057cd7733fd8df8a5a31701e4fe44497dad0f3fa0e1c4fb971506be",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/intrusive-collections/0.10.3/download"],
+        strip_prefix = "intrusive-collections-0.10.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.intrusive-collections-0.10.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__inventory-0.3.24",
+        sha256 = "a4f0c30c76f2f4ccee3fe55a2435f691ca00c0e4bd87abe4f4a851b1d4dac39b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/inventory/0.3.24/download"],
+        strip_prefix = "inventory-0.3.24",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inventory-0.3.24.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__is_terminal_polyfill-1.70.2",
+        sha256 = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/is_terminal_polyfill/1.70.2/download"],
+        strip_prefix = "is_terminal_polyfill-1.70.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.is_terminal_polyfill-1.70.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__itertools-0.15.0",
+        sha256 = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/itertools/0.15.0/download"],
+        strip_prefix = "itertools-0.15.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.itertools-0.15.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__itoa-1.0.18",
+        sha256 = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/itoa/1.0.18/download"],
+        strip_prefix = "itoa-1.0.18",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.itoa-1.0.18.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__jiff-0.2.37",
+        sha256 = "0ab1baf72f08796de0260609515130699b890ac25f30e610ad894bc5856cafdb",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/jiff/0.2.37/download"],
+        strip_prefix = "jiff-0.2.37",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.jiff-0.2.37.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__jiff-core-0.1.1",
+        sha256 = "5e52fe76043ccecc9005d2305ebaadf7d7fc0cc89ca6baa10a94d6bc68c7128c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/jiff-core/0.1.1/download"],
+        strip_prefix = "jiff-core-0.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.jiff-core-0.1.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__jiff-static-0.2.37",
+        sha256 = "378268a1116ad67ae6228701118ac9f491d78fda38a40a1f1a9e1348de6f7212",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/jiff-static/0.2.37/download"],
+        strip_prefix = "jiff-static-0.2.37",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.jiff-static-0.2.37.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__jiff-tzdb-0.1.8",
+        sha256 = "142bd39932ad231f10513df9ab62661fead8719872150b7ad02a2df79f4e141e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/jiff-tzdb/0.1.8/download"],
+        strip_prefix = "jiff-tzdb-0.1.8",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.jiff-tzdb-0.1.8.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__jiff-tzdb-platform-0.1.3",
+        sha256 = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/jiff-tzdb-platform/0.1.3/download"],
+        strip_prefix = "jiff-tzdb-platform-0.1.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.jiff-tzdb-platform-0.1.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__jobserver-0.1.35",
+        sha256 = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/jobserver/0.1.35/download"],
+        strip_prefix = "jobserver-0.1.35",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.jobserver-0.1.35.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__jod-thread-1.0.0",
+        sha256 = "a037eddb7d28de1d0fc42411f501b53b75838d313908078d6698d064f3029b24",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/jod-thread/1.0.0/download"],
+        strip_prefix = "jod-thread-1.0.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.jod-thread-1.0.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__js-sys-0.3.103",
+        sha256 = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/js-sys/0.3.103/download"],
+        strip_prefix = "js-sys-0.3.103",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.js-sys-0.3.103.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__kqueue-1.2.1",
+        sha256 = "8d763e5b24120b4ddf50de6c92308156765aabfbbccebf401da7cff2d70a41ea",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/kqueue/1.2.1/download"],
+        strip_prefix = "kqueue-1.2.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.kqueue-1.2.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__kqueue-sys-1.1.2",
+        sha256 = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/kqueue-sys/1.1.2/download"],
+        strip_prefix = "kqueue-sys-1.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.kqueue-sys-1.1.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__la-arena-0.3.1",
+        sha256 = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/la-arena/0.3.1/download"],
+        strip_prefix = "la-arena-0.3.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.la-arena-0.3.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__lazy_static-1.5.1",
+        sha256 = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/lazy_static/1.5.1/download"],
+        strip_prefix = "lazy_static-1.5.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.lazy_static-1.5.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__libc-0.2.189",
+        sha256 = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/libc/0.2.189/download"],
+        strip_prefix = "libc-0.2.189",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.libc-0.2.189.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__line-index-0.1.2",
+        sha256 = "3e27e0ed5a392a7f5ba0b3808a2afccff16c64933312c84b57618b49d1209bd2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/line-index/0.1.2/download"],
+        strip_prefix = "line-index-0.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.line-index-0.1.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__lock_api-0.4.14",
+        sha256 = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/lock_api/0.4.14/download"],
+        strip_prefix = "lock_api-0.4.14",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.lock_api-0.4.14.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__log-0.3.9",
+        sha256 = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/log/0.3.9/download"],
+        strip_prefix = "log-0.3.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.log-0.3.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__log-0.4.34",
+        sha256 = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/log/0.4.34/download"],
+        strip_prefix = "log-0.4.34",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.log-0.4.34.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__matchers-0.2.0",
+        sha256 = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/matchers/0.2.0/download"],
+        strip_prefix = "matchers-0.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.matchers-0.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__memchr-2.8.3",
+        sha256 = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/memchr/2.8.3/download"],
+        strip_prefix = "memchr-2.8.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.memchr-2.8.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__memoffset-0.9.1",
+        sha256 = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/memoffset/0.9.1/download"],
+        strip_prefix = "memoffset-0.9.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.memoffset-0.9.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__miniz_oxide-0.8.9",
+        sha256 = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/miniz_oxide/0.8.9/download"],
+        strip_prefix = "miniz_oxide-0.8.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.miniz_oxide-0.8.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__mio-1.2.3",
+        sha256 = "4b18443e9c262bfe8fa82f51666e2642c53393f7e5c27b3e1aeab922cff5b9d8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/mio/1.2.3/download"],
+        strip_prefix = "mio-1.2.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.mio-1.2.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__miow-0.6.1",
+        sha256 = "536bfad37a309d62069485248eeaba1e8d9853aaf951caaeaed0585a95346f08",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/miow/0.6.1/download"],
+        strip_prefix = "miow-0.6.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.miow-0.6.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__mustache-0.9.0",
+        sha256 = "51956ef1c5d20a1384524d91e616fb44dfc7d8f249bf696d49c97dd3289ecab5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/mustache/0.9.0/download"],
+        strip_prefix = "mustache-0.9.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.mustache-0.9.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__nohash-hasher-0.2.0",
+        sha256 = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/nohash-hasher/0.2.0/download"],
+        strip_prefix = "nohash-hasher-0.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.nohash-hasher-0.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__notify-8.2.0",
+        sha256 = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/notify/8.2.0/download"],
+        strip_prefix = "notify-8.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.notify-8.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__notify-types-2.1.0",
+        sha256 = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/notify-types/2.1.0/download"],
+        strip_prefix = "notify-types-2.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.notify-types-2.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__nu-ansi-term-0.50.3",
+        sha256 = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/nu-ansi-term/0.50.3/download"],
+        strip_prefix = "nu-ansi-term-0.50.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.nu-ansi-term-0.50.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__num-conv-0.2.2",
+        sha256 = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/num-conv/0.2.2/download"],
+        strip_prefix = "num-conv-0.2.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.num-conv-0.2.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__num-traits-0.2.19",
+        sha256 = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/num-traits/0.2.19/download"],
+        strip_prefix = "num-traits-0.2.19",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.num-traits-0.2.19.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__num_cpus-1.17.0",
+        sha256 = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/num_cpus/1.17.0/download"],
+        strip_prefix = "num_cpus-1.17.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.num_cpus-1.17.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__num_threads-0.1.7",
+        sha256 = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/num_threads/0.1.7/download"],
+        strip_prefix = "num_threads-0.1.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.num_threads-0.1.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__once_cell-1.21.4",
+        sha256 = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/once_cell/1.21.4/download"],
+        strip_prefix = "once_cell-1.21.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.once_cell-1.21.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__once_cell_polyfill-1.70.2",
+        sha256 = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/once_cell_polyfill/1.70.2/download"],
+        strip_prefix = "once_cell_polyfill-1.70.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.once_cell_polyfill-1.70.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__oorandom-11.1.5",
+        sha256 = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/oorandom/11.1.5/download"],
+        strip_prefix = "oorandom-11.1.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.oorandom-11.1.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__parking_lot-0.12.5",
+        sha256 = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/parking_lot/0.12.5/download"],
+        strip_prefix = "parking_lot-0.12.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot-0.12.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__parking_lot_core-0.9.12",
+        sha256 = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/parking_lot_core/0.9.12/download"],
+        strip_prefix = "parking_lot_core-0.9.12",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot_core-0.9.12.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__pear-0.2.9",
+        sha256 = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/pear/0.2.9/download"],
+        strip_prefix = "pear-0.2.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.pear-0.2.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__pear_codegen-0.2.9",
+        sha256 = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/pear_codegen/0.2.9/download"],
+        strip_prefix = "pear_codegen-0.2.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.pear_codegen-0.2.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__perf-event-0.4.8",
+        sha256 = "b4d6393d9238342159080d79b78cb59c67399a8e7ecfa5d410bd614169e4e823",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/perf-event/0.4.8/download"],
+        strip_prefix = "perf-event-0.4.8",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.perf-event-0.4.8.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__perf-event-open-sys-4.0.0",
+        sha256 = "7c44fb1c7651a45a3652c4afc6e754e40b3d6e6556f1487e2b230bfc4f33c2a8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/perf-event-open-sys/4.0.0/download"],
+        strip_prefix = "perf-event-open-sys-4.0.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.perf-event-open-sys-4.0.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__petgraph-0.8.3",
+        sha256 = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/petgraph/0.8.3/download"],
+        strip_prefix = "petgraph-0.8.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.petgraph-0.8.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__pin-project-lite-0.2.17",
+        sha256 = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/pin-project-lite/0.2.17/download"],
+        strip_prefix = "pin-project-lite-0.2.17",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.pin-project-lite-0.2.17.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__pkg-config-0.3.34",
+        sha256 = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/pkg-config/0.3.34/download"],
+        strip_prefix = "pkg-config-0.3.34",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.pkg-config-0.3.34.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__portable-atomic-1.15.0",
+        sha256 = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/portable-atomic/1.15.0/download"],
+        strip_prefix = "portable-atomic-1.15.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.portable-atomic-1.15.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__portable-atomic-util-0.2.7",
+        sha256 = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/portable-atomic-util/0.2.7/download"],
+        strip_prefix = "portable-atomic-util-0.2.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.portable-atomic-util-0.2.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__postcard-1.1.3",
+        sha256 = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/postcard/1.1.3/download"],
+        strip_prefix = "postcard-1.1.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.postcard-1.1.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__powerfmt-0.2.0",
+        sha256 = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/powerfmt/0.2.0/download"],
+        strip_prefix = "powerfmt-0.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.powerfmt-0.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__proc-macro2-1.0.107",
+        sha256 = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/proc-macro2/1.0.107/download"],
+        strip_prefix = "proc-macro2-1.0.107",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.proc-macro2-1.0.107.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__proc-macro2-diagnostics-0.10.1",
+        sha256 = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/proc-macro2-diagnostics/0.10.1/download"],
+        strip_prefix = "proc-macro2-diagnostics-0.10.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.proc-macro2-diagnostics-0.10.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__quote-1.0.47",
+        sha256 = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/quote/1.0.47/download"],
+        strip_prefix = "quote-1.0.47",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.quote-1.0.47.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__r-efi-6.0.0",
+        sha256 = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/r-efi/6.0.0/download"],
+        strip_prefix = "r-efi-6.0.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.r-efi-6.0.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra-ap-rustc_abi-0.166.0",
+        sha256 = "e2cf1b1ffe31b6226c00b40cddfda65002b7729f9f4ed2d547b5856cdab0011c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_abi/0.166.0/download"],
+        strip_prefix = "ra-ap-rustc_abi-0.166.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_abi-0.166.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra-ap-rustc_ast_ir-0.166.0",
+        sha256 = "2ef42605e36e1305e815ccfc8830eb870f74d78534bca19a61629149536d8e98",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_ast_ir/0.166.0/download"],
+        strip_prefix = "ra-ap-rustc_ast_ir-0.166.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_ast_ir-0.166.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra-ap-rustc_hashes-0.166.0",
+        sha256 = "b9f5542968215c17275920791b2fa13a43014287506ed0450777c79845102e86",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_hashes/0.166.0/download"],
+        strip_prefix = "ra-ap-rustc_hashes-0.166.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_hashes-0.166.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra-ap-rustc_index-0.166.0",
+        sha256 = "1d9e47b9ca7d92cfb0d6653503adbabd41938b84474317397a664326b208d6c6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_index/0.166.0/download"],
+        strip_prefix = "ra-ap-rustc_index-0.166.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index-0.166.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra-ap-rustc_index_macros-0.166.0",
+        sha256 = "4d744a7a2852a22f06210bcff9e4667ed0cacbfbe94894cc294044d25e876341",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_index_macros/0.166.0/download"],
+        strip_prefix = "ra-ap-rustc_index_macros-0.166.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index_macros-0.166.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra-ap-rustc_lexer-0.166.0",
+        sha256 = "527c12b3731b7d0692498012810b85b2b8dfdb8b514321ed6afc434bd1c70191",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_lexer/0.166.0/download"],
+        strip_prefix = "ra-ap-rustc_lexer-0.166.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_lexer-0.166.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra-ap-rustc_next_trait_solver-0.166.0",
+        sha256 = "a7a9663a8d7c369e934aac2b74a638537ad7eb4be75b4530d765384dc071c936",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_next_trait_solver/0.166.0/download"],
+        strip_prefix = "ra-ap-rustc_next_trait_solver-0.166.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_next_trait_solver-0.166.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra-ap-rustc_parse_format-0.166.0",
+        sha256 = "2c038b7a8b0f784d4e441ad8ab991fbbdaa5e0be482e59c639a846a1c8126951",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_parse_format/0.166.0/download"],
+        strip_prefix = "ra-ap-rustc_parse_format-0.166.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_parse_format-0.166.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra-ap-rustc_pattern_analysis-0.166.0",
+        sha256 = "42ca286f90e99bb97cd9274c088f3c874a05d1ee90cabf40a3928afedabe99fd",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_pattern_analysis/0.166.0/download"],
+        strip_prefix = "ra-ap-rustc_pattern_analysis-0.166.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_pattern_analysis-0.166.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra-ap-rustc_type_ir-0.166.0",
+        sha256 = "26d6efb6008f665a9485e0afecf9f4950a6c4bedd8ddd330a9df8986a6c0160b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_type_ir/0.166.0/download"],
+        strip_prefix = "ra-ap-rustc_type_ir-0.166.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_type_ir-0.166.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra-ap-rustc_type_ir_macros-0.166.0",
+        sha256 = "5f4fd2355e2bbf1f343c730f623596efc6e465b5e3685b606a437567ebb75bf8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_type_ir_macros/0.166.0/download"],
+        strip_prefix = "ra-ap-rustc_type_ir_macros-0.166.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_type_ir_macros-0.166.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_base_db-0.0.358",
+        sha256 = "8a5bf74ba5606b902ada6b8964ac4f22080ac6d73c297f8d4981885843b25fa4",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_base_db/0.0.358/download"],
+        strip_prefix = "ra_ap_base_db-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_base_db-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_cfg-0.0.358",
+        sha256 = "1dc63ce4a2acd1591cac5d5ad1d4f0549bd9069f4aad59acbf600a4d4881a8c9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_cfg/0.0.358/download"],
+        strip_prefix = "ra_ap_cfg-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_cfg-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_edition-0.0.358",
+        sha256 = "1e95437d4702879e3851c80580524f36025589b3eeaec3f7798cdf88671c130b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_edition/0.0.358/download"],
+        strip_prefix = "ra_ap_edition-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_edition-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_hir-0.0.358",
+        sha256 = "9464cf1121d47a72dffa58c31603b5f06139747b3d848c3b87f63a6da283abb5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_hir/0.0.358/download"],
+        strip_prefix = "ra_ap_hir-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_hir_def-0.0.358",
+        sha256 = "7ef811f35ed1c394d27a7e0d79869aa4891108496736597b87bbc632a4eee1ec",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_hir_def/0.0.358/download"],
+        strip_prefix = "ra_ap_hir_def-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_def-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_hir_expand-0.0.358",
+        sha256 = "f8ffb0602b9cc8b4647b902db5c4fca4a8a37ba7a20f28424aed64c7dd2866d6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_hir_expand/0.0.358/download"],
+        strip_prefix = "ra_ap_hir_expand-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_expand-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_hir_ty-0.0.358",
+        sha256 = "725f913d562b8d794035bc3bcc3e62adf09b843e11b443750bf8a7027ec1d3bf",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_hir_ty/0.0.358/download"],
+        strip_prefix = "ra_ap_hir_ty-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_ty-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_ide_db-0.0.358",
+        sha256 = "f08b0f04a8fecbe4a1b04cd0b03d5b0c8495a2a5de50638c6d66b5c3aba133ac",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_ide_db/0.0.358/download"],
+        strip_prefix = "ra_ap_ide_db-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_ide_db-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_intern-0.0.358",
+        sha256 = "51fddd20c482af576865ab697077cbf1b61b7d30214ab250ce3aa83f0af41eb2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_intern/0.0.358/download"],
+        strip_prefix = "ra_ap_intern-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_intern-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_load-cargo-0.0.358",
+        sha256 = "ee8bbf755a6d81544cd576150986601069918ab46fa5677275ce3b9cc875bc73",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_load-cargo/0.0.358/download"],
+        strip_prefix = "ra_ap_load-cargo-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_load-cargo-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_macros-0.0.358",
+        sha256 = "ea5d97f56b9082903327327d70a45f6df69f8fb02880c0040f0e21f1b4983093",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_macros/0.0.358/download"],
+        strip_prefix = "ra_ap_macros-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_macros-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_mbe-0.0.358",
+        sha256 = "e2b58d33d66aa5ae520204e9920063dcd78a60a610726be70a2c2a9cb1cbe563",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_mbe/0.0.358/download"],
+        strip_prefix = "ra_ap_mbe-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_mbe-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_parser-0.0.358",
+        sha256 = "64b1543d3639a969f5cb4d55a94154ef672f5e1c873b6161407f5705e3164bbc",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_parser/0.0.358/download"],
+        strip_prefix = "ra_ap_parser-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_parser-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_paths-0.0.358",
+        sha256 = "781f81610b0333e60fabdcf4f9ea8a76a7eeff2cda2be6d8f8ad7b9b53985488",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_paths/0.0.358/download"],
+        strip_prefix = "ra_ap_paths-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_paths-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_proc_macro_api-0.0.358",
+        sha256 = "d312f10722d4fa59b93cdbfa534d36a0d2d4a3b18dfad6825d5146afccb41223",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_proc_macro_api/0.0.358/download"],
+        strip_prefix = "ra_ap_proc_macro_api-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_proc_macro_api-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_profile-0.0.358",
+        sha256 = "72f43ed3bd40c9f338192cbcaf7169d68d1bb69c66667e127e0ac368bb1bdb68",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_profile/0.0.358/download"],
+        strip_prefix = "ra_ap_profile-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_profile-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_project_model-0.0.358",
+        sha256 = "f41727333563bc6cd3299ae5e389d6c1d7f11821b01aa1026aead8c161487de8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_project_model/0.0.358/download"],
+        strip_prefix = "ra_ap_project_model-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_project_model-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_span-0.0.358",
+        sha256 = "98543730b25d99687b95ca1bd4a0f326366eb7a55caf6e847b70ee3c2ac89206",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_span/0.0.358/download"],
+        strip_prefix = "ra_ap_span-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_span-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_stdx-0.0.358",
+        sha256 = "60c564fa8518154e983d5c49be54bfc970cd91ba5b7fd9be07289e1965aa42cc",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_stdx/0.0.358/download"],
+        strip_prefix = "ra_ap_stdx-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_stdx-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_syntax-0.0.358",
+        sha256 = "e3b6f7b5310d58d302b6e654b7b7013676a94c462e9e21ae2152d49e5d067ae1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_syntax/0.0.358/download"],
+        strip_prefix = "ra_ap_syntax-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_syntax-bridge-0.0.358",
+        sha256 = "e1ab9a9f42057119efdc9b17530bcd12a5ca7feda2a3cca07cc2ab7e58fd9840",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_syntax-bridge/0.0.358/download"],
+        strip_prefix = "ra_ap_syntax-bridge-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-bridge-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_test_fixture-0.0.358",
+        sha256 = "bd1102bb800326b4d872487d1cbff8c8dfda9951c2c18185a49b927a2fd21bf7",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_test_fixture/0.0.358/download"],
+        strip_prefix = "ra_ap_test_fixture-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_test_fixture-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_test_utils-0.0.358",
+        sha256 = "2e950ae6ab036ed2d85694222c9ac6c167fd470588af47c354f08c8381787f90",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_test_utils/0.0.358/download"],
+        strip_prefix = "ra_ap_test_utils-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_test_utils-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_toolchain-0.0.358",
+        sha256 = "aa57909e3770cfb80af82bc502aaf1f8041219244923828fb3dccb93e39fd9e3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_toolchain/0.0.358/download"],
+        strip_prefix = "ra_ap_toolchain-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_toolchain-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_tt-0.0.358",
+        sha256 = "6767bfe5e71541eef3b764098e0a9ec77864978f610900f8bedfa85151dd58b1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_tt/0.0.358/download"],
+        strip_prefix = "ra_ap_tt-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_tt-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_vfs-0.0.358",
+        sha256 = "613e9b9ce9dfb085c980497b712624eca7ec7312c41bc2855ef8cdc245c33dab",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_vfs/0.0.358/download"],
+        strip_prefix = "ra_ap_vfs-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_vfs-notify-0.0.358",
+        sha256 = "fd876ebc2872e591cb525395877fc2f3b826fc5a71907dc5e449ab0614b184f3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_vfs-notify/0.0.358/download"],
+        strip_prefix = "ra_ap_vfs-notify-0.0.358",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-notify-0.0.358.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rand-0.10.3",
+        sha256 = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rand/0.10.3/download"],
+        strip_prefix = "rand-0.10.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand-0.10.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rand_core-0.10.1",
+        sha256 = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rand_core/0.10.1/download"],
+        strip_prefix = "rand_core-0.10.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand_core-0.10.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rayon-1.12.0",
+        sha256 = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rayon/1.12.0/download"],
+        strip_prefix = "rayon-1.12.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rayon-1.12.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rayon-core-1.13.0",
+        sha256 = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rayon-core/1.13.0/download"],
+        strip_prefix = "rayon-core-1.13.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rayon-core-1.13.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__redox_syscall-0.5.18",
+        sha256 = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/redox_syscall/0.5.18/download"],
+        strip_prefix = "redox_syscall-0.5.18",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.redox_syscall-0.5.18.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ref-cast-1.0.26",
+        sha256 = "216e8f773d7923bcba9ceb86a86c93cabb3903a11872fc3f138c49630e50b96d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ref-cast/1.0.26/download"],
+        strip_prefix = "ref-cast-1.0.26",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ref-cast-1.0.26.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ref-cast-impl-1.0.26",
+        sha256 = "2c9283685feec7d69af75fb0e858d5e7378f33fe4fc699383b2916ab9273e03c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ref-cast-impl/1.0.26/download"],
+        strip_prefix = "ref-cast-impl-1.0.26",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ref-cast-impl-1.0.26.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__regex-1.13.1",
+        sha256 = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/regex/1.13.1/download"],
+        strip_prefix = "regex-1.13.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-1.13.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__regex-automata-0.4.18",
+        sha256 = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/regex-automata/0.4.18/download"],
+        strip_prefix = "regex-automata-0.4.18",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-automata-0.4.18.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__regex-syntax-0.8.11",
+        sha256 = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/regex-syntax/0.8.11/download"],
+        strip_prefix = "regex-syntax-0.8.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-syntax-0.8.11.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rowan-0.17.0",
+        sha256 = "14b574c58582fa59fa43a2feb6608b8744184659f08a2e0117e4b8224d95ed61",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rowan/0.17.0/download"],
+        strip_prefix = "rowan-0.17.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rowan-0.17.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rustc-hash-1.1.0",
+        sha256 = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rustc-hash/1.1.0/download"],
+        strip_prefix = "rustc-hash-1.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-hash-1.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rustc-hash-2.1.3",
+        sha256 = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rustc-hash/2.1.3/download"],
+        strip_prefix = "rustc-hash-2.1.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-hash-2.1.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rustc-literal-escaper-0.0.7",
+        sha256 = "8be87abb9e40db7466e0681dc8ecd9dcfd40360cb10b4c8fe24a7c4c3669b198",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rustc-literal-escaper/0.0.7/download"],
+        strip_prefix = "rustc-literal-escaper-0.0.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-literal-escaper-0.0.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rustc-stable-hash-0.1.2",
+        sha256 = "781442f29170c5c93b7185ad559492601acdc71d5bb0706f5868094f45cfcd08",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rustc-stable-hash/0.1.2/download"],
+        strip_prefix = "rustc-stable-hash-0.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-stable-hash-0.1.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab",
+        sha256 = "486c2179b4796f65bfe2ee33679acf0927ac83ecf583ad6c91c3b4570911b9ad",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rustc_apfloat/0.2.3+llvm-462a31f5a5ab/download"],
+        strip_prefix = "rustc_apfloat-0.2.3+llvm-462a31f5a5ab",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rustversion-1.0.23",
+        sha256 = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rustversion/1.0.23/download"],
+        strip_prefix = "rustversion-1.0.23",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustversion-1.0.23.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ryu-1.0.23",
+        sha256 = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ryu/1.0.23/download"],
+        strip_prefix = "ryu-1.0.23",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ryu-1.0.23.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__salsa-0.28.5",
+        sha256 = "27d2e6e19e39591cd99c01ac4141544b4d012cfd0831348629b8187fa9fe6d34",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/salsa/0.28.5/download"],
+        strip_prefix = "salsa-0.28.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-0.28.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__salsa-macro-rules-0.28.5",
+        sha256 = "baf90a551c38f25ed8489111d3d5827aa18e1b85963f5e6a298505b1d1e2cb7e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/salsa-macro-rules/0.28.5/download"],
+        strip_prefix = "salsa-macro-rules-0.28.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macro-rules-0.28.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__salsa-macros-0.28.5",
+        sha256 = "69dd77f86ec10e72e314f4ddf7c44c8d349e73cdff1aad524ba9668603fb0549",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/salsa-macros/0.28.5/download"],
+        strip_prefix = "salsa-macros-0.28.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macros-0.28.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__same-file-1.0.6",
+        sha256 = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/same-file/1.0.6/download"],
+        strip_prefix = "same-file-1.0.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.same-file-1.0.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__schemars-0.9.0",
+        sha256 = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/schemars/0.9.0/download"],
+        strip_prefix = "schemars-0.9.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.schemars-0.9.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__schemars-1.2.2",
+        sha256 = "687274d293b6cdc6e73e0fee520bf2049650090d7164f87672d212a3c530cf4a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/schemars/1.2.2/download"],
+        strip_prefix = "schemars-1.2.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.schemars-1.2.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__scopeguard-1.2.0",
+        sha256 = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/scopeguard/1.2.0/download"],
+        strip_prefix = "scopeguard-1.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.scopeguard-1.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__semver-1.0.28",
+        sha256 = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/semver/1.0.28/download"],
+        strip_prefix = "semver-1.0.28",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.semver-1.0.28.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__serde-1.0.229",
+        sha256 = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde/1.0.229/download"],
+        strip_prefix = "serde-1.0.229",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde-1.0.229.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__serde_core-1.0.229",
+        sha256 = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_core/1.0.229/download"],
+        strip_prefix = "serde_core-1.0.229",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_core-1.0.229.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__serde_derive-1.0.229",
+        sha256 = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_derive/1.0.229/download"],
+        strip_prefix = "serde_derive-1.0.229",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_derive-1.0.229.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__serde_json-1.0.154",
+        sha256 = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_json/1.0.154/download"],
+        strip_prefix = "serde_json-1.0.154",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_json-1.0.154.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__serde_spanned-1.1.2",
+        sha256 = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_spanned/1.1.2/download"],
+        strip_prefix = "serde_spanned-1.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_spanned-1.1.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__serde_with-3.24.0",
+        sha256 = "df9adc193c780ef8f159aee8b61e2d5801aaa555e6eb0947fe45530ec506296f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_with/3.24.0/download"],
+        strip_prefix = "serde_with-3.24.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with-3.24.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__serde_with_macros-3.24.0",
+        sha256 = "3e17bbc68e28663bbbb90df47e058aa7eda4fb445b89fe70457bb94fbccf6e49",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_with_macros/3.24.0/download"],
+        strip_prefix = "serde_with_macros-3.24.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with_macros-3.24.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__serde_yaml-0.9.34-deprecated",
+        sha256 = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_yaml/0.9.34+deprecated/download"],
+        strip_prefix = "serde_yaml-0.9.34+deprecated",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_yaml-0.9.34+deprecated.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__sharded-slab-0.1.7",
+        sha256 = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/sharded-slab/0.1.7/download"],
+        strip_prefix = "sharded-slab-0.1.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.sharded-slab-0.1.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__shlex-2.0.1",
+        sha256 = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/shlex/2.0.1/download"],
+        strip_prefix = "shlex-2.0.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.shlex-2.0.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__simd-adler32-0.3.9",
+        sha256 = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/simd-adler32/0.3.9/download"],
+        strip_prefix = "simd-adler32-0.3.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.simd-adler32-0.3.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__slab-0.4.12",
+        sha256 = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/slab/0.4.12/download"],
+        strip_prefix = "slab-0.4.12",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.slab-0.4.12.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__smallvec-1.16.1",
+        sha256 = "ba467056f1b547ed52077911161fc86985becbc60e8e1857c8a144dab0def891",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/smallvec/1.16.1/download"],
+        strip_prefix = "smallvec-1.16.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.smallvec-1.16.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__smol_str-0.3.6",
+        sha256 = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/smol_str/0.3.6/download"],
+        strip_prefix = "smol_str-0.3.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.smol_str-0.3.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__stable_deref_trait-1.2.1",
+        sha256 = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/stable_deref_trait/1.2.1/download"],
+        strip_prefix = "stable_deref_trait-1.2.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.stable_deref_trait-1.2.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__streaming-iterator-0.1.9",
+        sha256 = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/streaming-iterator/0.1.9/download"],
+        strip_prefix = "streaming-iterator-0.1.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.streaming-iterator-0.1.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__strsim-0.11.1",
+        sha256 = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/strsim/0.11.1/download"],
+        strip_prefix = "strsim-0.11.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.strsim-0.11.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__syn-2.0.119",
+        sha256 = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/syn/2.0.119/download"],
+        strip_prefix = "syn-2.0.119",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.syn-2.0.119.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__syn-3.0.9",
+        sha256 = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/syn/3.0.9/download"],
+        strip_prefix = "syn-3.0.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.syn-3.0.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__synstructure-0.13.2",
+        sha256 = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/synstructure/0.13.2/download"],
+        strip_prefix = "synstructure-0.13.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.synstructure-0.13.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__text-size-1.1.1",
+        sha256 = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/text-size/1.1.1/download"],
+        strip_prefix = "text-size-1.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.text-size-1.1.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__thin-vec-0.2.19",
+        sha256 = "79def32ffcd477db1ff26f76dab9e3a91f0bd42a85ca96577089b24623056f9d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/thin-vec/0.2.19/download"],
+        strip_prefix = "thin-vec-0.2.19",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thin-vec-0.2.19.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__thiserror-2.0.20",
+        sha256 = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/thiserror/2.0.20/download"],
+        strip_prefix = "thiserror-2.0.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-2.0.20.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__thiserror-impl-2.0.20",
+        sha256 = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/thiserror-impl/2.0.20/download"],
+        strip_prefix = "thiserror-impl-2.0.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-impl-2.0.20.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__thread_local-1.1.10",
+        sha256 = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/thread_local/1.1.10/download"],
+        strip_prefix = "thread_local-1.1.10",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thread_local-1.1.10.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__time-0.3.55",
+        sha256 = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/time/0.3.55/download"],
+        strip_prefix = "time-0.3.55",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-0.3.55.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__time-core-0.1.9",
+        sha256 = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/time-core/0.1.9/download"],
+        strip_prefix = "time-core-0.1.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-core-0.1.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__time-macros-0.2.32",
+        sha256 = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/time-macros/0.2.32/download"],
+        strip_prefix = "time-macros-0.2.32",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-macros-0.2.32.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tinyvec-1.13.3",
+        sha256 = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tinyvec/1.13.3/download"],
+        strip_prefix = "tinyvec-1.13.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tinyvec-1.13.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__toml-1.1.8-spec-1.1.0",
+        sha256 = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/toml/1.1.8+spec-1.1.0/download"],
+        strip_prefix = "toml-1.1.8+spec-1.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml-1.1.8+spec-1.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__toml_datetime-1.1.2-spec-1.1.0",
+        sha256 = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/toml_datetime/1.1.2+spec-1.1.0/download"],
+        strip_prefix = "toml_datetime-1.1.2+spec-1.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_datetime-1.1.2+spec-1.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__toml_parser-1.1.5-spec-1.1.0",
+        sha256 = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/toml_parser/1.1.5+spec-1.1.0/download"],
+        strip_prefix = "toml_parser-1.1.5+spec-1.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_parser-1.1.5+spec-1.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__toml_writer-1.1.3-spec-1.1.0",
+        sha256 = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/toml_writer/1.1.3+spec-1.1.0/download"],
+        strip_prefix = "toml_writer-1.1.3+spec-1.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_writer-1.1.3+spec-1.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tracing-0.1.44",
+        sha256 = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tracing/0.1.44/download"],
+        strip_prefix = "tracing-0.1.44",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-0.1.44.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tracing-attributes-0.1.31",
+        sha256 = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tracing-attributes/0.1.31/download"],
+        strip_prefix = "tracing-attributes-0.1.31",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-attributes-0.1.31.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tracing-core-0.1.36",
+        sha256 = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tracing-core/0.1.36/download"],
+        strip_prefix = "tracing-core-0.1.36",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-core-0.1.36.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tracing-flame-0.2.0",
+        sha256 = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tracing-flame/0.2.0/download"],
+        strip_prefix = "tracing-flame-0.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-flame-0.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tracing-log-0.2.0",
+        sha256 = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tracing-log/0.2.0/download"],
+        strip_prefix = "tracing-log-0.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-log-0.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tracing-subscriber-0.3.23",
+        sha256 = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tracing-subscriber/0.3.23/download"],
+        strip_prefix = "tracing-subscriber-0.3.23",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-subscriber-0.3.23.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tracing-tree-0.4.1",
+        sha256 = "ac87aa03b6a4d5a7e4810d1a80c19601dbe0f8a837e9177f23af721c7ba7beec",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tracing-tree/0.4.1/download"],
+        strip_prefix = "tracing-tree-0.4.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-tree-0.4.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tree-sitter-0.26.9",
+        sha256 = "4dab76d0b724ba557954125188cf0633a1ca43199ced82d95c7b9c32cc3de1f3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter/0.26.9/download"],
+        strip_prefix = "tree-sitter-0.26.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-0.26.9.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tree-sitter-embedded-template-0.25.0",
+        sha256 = "833d528e8fcb4e49ddb04d4d6450ddb8ac08f282a58fec94ce981c9c5dbf7e3a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-embedded-template/0.25.0/download"],
+        strip_prefix = "tree-sitter-embedded-template-0.25.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-embedded-template-0.25.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tree-sitter-json-0.24.8",
+        sha256 = "4d727acca406c0020cffc6cf35516764f36c8e3dc4408e5ebe2cb35a947ec471",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-json/0.24.8/download"],
+        strip_prefix = "tree-sitter-json-0.24.8",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-json-0.24.8.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tree-sitter-language-0.1.7",
+        sha256 = "009994f150cc0cd50ff54917d5bc8bffe8cad10ca10d81c34da2ec421ae61782",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-language/0.1.7/download"],
+        strip_prefix = "tree-sitter-language-0.1.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-language-0.1.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tree-sitter-python-0.25.0",
+        sha256 = "6bf85fd39652e740bf60f46f4cda9492c3a9ad75880575bf14960f775cb74a1c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-python/0.25.0/download"],
+        strip_prefix = "tree-sitter-python-0.25.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-python-0.25.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tree-sitter-ql-0.23.1",
+        sha256 = "80b7bcaf39acefbb199417a6ec2fd0c038083ba115da3e4f4426c820dc76d386",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-ql/0.23.1/download"],
+        strip_prefix = "tree-sitter-ql-0.23.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-ql-0.23.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__tree-sitter-ruby-0.23.1",
+        sha256 = "be0484ea4ef6bb9c575b4fdabde7e31340a8d2dbc7d52b321ac83da703249f95",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-ruby/0.23.1/download"],
+        strip_prefix = "tree-sitter-ruby-0.23.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-ruby-0.23.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__triomphe-0.1.17",
+        sha256 = "0d15f4f5898bcfc5d8a8e45ed30b2f108d710c1a2e5489dbf80e078f707181bc",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/triomphe/0.1.17/download"],
+        strip_prefix = "triomphe-0.1.17",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.triomphe-0.1.17.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__typed-arena-2.0.2",
+        sha256 = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/typed-arena/2.0.2/download"],
+        strip_prefix = "typed-arena-2.0.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.typed-arena-2.0.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__typeid-1.0.3",
+        sha256 = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/typeid/1.0.3/download"],
+        strip_prefix = "typeid-1.0.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.typeid-1.0.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__uncased-0.9.10",
+        sha256 = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/uncased/0.9.10/download"],
+        strip_prefix = "uncased-0.9.10",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.uncased-0.9.10.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ungrammar-1.16.1",
+        sha256 = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ungrammar/1.16.1/download"],
+        strip_prefix = "ungrammar-1.16.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ungrammar-1.16.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__unicode-ident-1.0.24",
+        sha256 = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/unicode-ident/1.0.24/download"],
+        strip_prefix = "unicode-ident-1.0.24",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-ident-1.0.24.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__unicode-properties-0.1.4",
+        sha256 = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/unicode-properties/0.1.4/download"],
+        strip_prefix = "unicode-properties-0.1.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-properties-0.1.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__unsafe-libyaml-0.2.11",
+        sha256 = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/unsafe-libyaml/0.2.11/download"],
+        strip_prefix = "unsafe-libyaml-0.2.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unsafe-libyaml-0.2.11.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__utf8parse-0.2.2",
+        sha256 = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/utf8parse/0.2.2/download"],
+        strip_prefix = "utf8parse-0.2.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.utf8parse-0.2.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__valuable-0.1.1",
+        sha256 = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/valuable/0.1.1/download"],
+        strip_prefix = "valuable-0.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.valuable-0.1.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__version_check-0.9.5",
+        sha256 = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/version_check/0.9.5/download"],
+        strip_prefix = "version_check-0.9.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.version_check-0.9.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__walkdir-2.5.0",
+        sha256 = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/walkdir/2.5.0/download"],
+        strip_prefix = "walkdir-2.5.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.walkdir-2.5.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__wasi-0.11.1-wasi-snapshot-preview1",
+        sha256 = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasi/0.11.1+wasi-snapshot-preview1/download"],
+        strip_prefix = "wasi-0.11.1+wasi-snapshot-preview1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__wasm-bindgen-0.2.126",
+        sha256 = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasm-bindgen/0.2.126/download"],
+        strip_prefix = "wasm-bindgen-0.2.126",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-0.2.126.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__wasm-bindgen-macro-0.2.126",
+        sha256 = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasm-bindgen-macro/0.2.126/download"],
+        strip_prefix = "wasm-bindgen-macro-0.2.126",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-0.2.126.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__wasm-bindgen-macro-support-0.2.126",
+        sha256 = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasm-bindgen-macro-support/0.2.126/download"],
+        strip_prefix = "wasm-bindgen-macro-support-0.2.126",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-support-0.2.126.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__wasm-bindgen-shared-0.2.126",
+        sha256 = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasm-bindgen-shared/0.2.126/download"],
+        strip_prefix = "wasm-bindgen-shared-0.2.126",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-shared-0.2.126.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__winapi-util-0.1.11",
+        sha256 = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/winapi-util/0.1.11/download"],
+        strip_prefix = "winapi-util-0.1.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winapi-util-0.1.11.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-core-0.62.2",
+        sha256 = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-core/0.62.2/download"],
+        strip_prefix = "windows-core-0.62.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-core-0.62.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-implement-0.60.2",
+        sha256 = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-implement/0.60.2/download"],
+        strip_prefix = "windows-implement-0.60.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-implement-0.60.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-interface-0.59.3",
+        sha256 = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-interface/0.59.3/download"],
+        strip_prefix = "windows-interface-0.59.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-interface-0.59.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-link-0.2.1",
+        sha256 = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-link/0.2.1/download"],
+        strip_prefix = "windows-link-0.2.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-link-0.2.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-result-0.4.1",
+        sha256 = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-result/0.4.1/download"],
+        strip_prefix = "windows-result-0.4.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-result-0.4.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-strings-0.5.1",
+        sha256 = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-strings/0.5.1/download"],
+        strip_prefix = "windows-strings-0.5.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-strings-0.5.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-sys-0.60.2",
+        sha256 = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-sys/0.60.2/download"],
+        strip_prefix = "windows-sys-0.60.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-sys-0.60.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-sys-0.61.2",
+        sha256 = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-sys/0.61.2/download"],
+        strip_prefix = "windows-sys-0.61.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-sys-0.61.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-targets-0.53.5",
+        sha256 = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-targets/0.53.5/download"],
+        strip_prefix = "windows-targets-0.53.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-targets-0.53.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows_aarch64_gnullvm-0.53.1",
+        sha256 = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_aarch64_gnullvm/0.53.1/download"],
+        strip_prefix = "windows_aarch64_gnullvm-0.53.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_gnullvm-0.53.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows_aarch64_msvc-0.53.1",
+        sha256 = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_aarch64_msvc/0.53.1/download"],
+        strip_prefix = "windows_aarch64_msvc-0.53.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_msvc-0.53.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows_i686_gnu-0.53.1",
+        sha256 = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_i686_gnu/0.53.1/download"],
+        strip_prefix = "windows_i686_gnu-0.53.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_gnu-0.53.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows_i686_gnullvm-0.53.1",
+        sha256 = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_i686_gnullvm/0.53.1/download"],
+        strip_prefix = "windows_i686_gnullvm-0.53.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_gnullvm-0.53.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows_i686_msvc-0.53.1",
+        sha256 = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_i686_msvc/0.53.1/download"],
+        strip_prefix = "windows_i686_msvc-0.53.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_msvc-0.53.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows_x86_64_gnu-0.53.1",
+        sha256 = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_x86_64_gnu/0.53.1/download"],
+        strip_prefix = "windows_x86_64_gnu-0.53.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnu-0.53.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows_x86_64_gnullvm-0.53.1",
+        sha256 = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_x86_64_gnullvm/0.53.1/download"],
+        strip_prefix = "windows_x86_64_gnullvm-0.53.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnullvm-0.53.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows_x86_64_msvc-0.53.1",
+        sha256 = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows_x86_64_msvc/0.53.1/download"],
+        strip_prefix = "windows_x86_64_msvc-0.53.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_msvc-0.53.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__winnow-0.7.13",
+        sha256 = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/winnow/0.7.13/download"],
+        strip_prefix = "winnow-0.7.13",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winnow-0.7.13.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__winnow-1.0.4",
+        sha256 = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/winnow/1.0.4/download"],
+        strip_prefix = "winnow-1.0.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winnow-1.0.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__yansi-1.0.1",
+        sha256 = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/yansi/1.0.1/download"],
+        strip_prefix = "yansi-1.0.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.yansi-1.0.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__zmij-1.0.23",
+        sha256 = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/zmij/1.0.23/download"],
+        strip_prefix = "zmij-1.0.23",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zmij-1.0.23.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__zstd-0.14.2",
+        sha256 = "057cfd910cfac363a0ada849592624b4c9ff2e10bef504c3433810d78ed96f93",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/zstd/0.14.2/download"],
+        strip_prefix = "zstd-0.14.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zstd-0.14.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__zstd-safe-8.1.0",
+        sha256 = "bdd44c6a7284e91f3717755b24315a302edd9153a01f753c3cba3d765e8eafac",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/zstd-safe/8.1.0/download"],
+        strip_prefix = "zstd-safe-8.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zstd-safe-8.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__zstd-sys-2.1.1-zstd.1.5.7",
+        sha256 = "aeec9eaf2dffbbd09201e23bd0ffcbaa33bb8e9266a10734fd7ed90a85eca078",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/zstd-sys/2.1.1+zstd.1.5.7/download"],
+        strip_prefix = "zstd-sys-2.1.1+zstd.1.5.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zstd-sys-2.1.1+zstd.1.5.7.bazel"),
     )
 
-    direct_deps = [struct(repo = "vendor_ts", is_dev_dep = False)]
-    direct_deps.extend(_crate_repositories())
-    return direct_deps
+    return [
+        struct(repo = "vendor_ts", is_dev_dep = False),
+        struct(repo = "vendor_ts__anyhow-1.0.104", is_dev_dep = False),
+        struct(repo = "vendor_ts__chalk-ir-0.104.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__chrono-0.4.45", is_dev_dep = False),
+        struct(repo = "vendor_ts__clap-4.6.7", is_dev_dep = False),
+        struct(repo = "vendor_ts__dunce-1.0.5", is_dev_dep = False),
+        struct(repo = "vendor_ts__either-1.19.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__encoding-0.2.33", is_dev_dep = False),
+        struct(repo = "vendor_ts__figment-0.10.19", is_dev_dep = False),
+        struct(repo = "vendor_ts__flate2-1.1.9", is_dev_dep = False),
+        struct(repo = "vendor_ts__glob-0.3.4", is_dev_dep = False),
+        struct(repo = "vendor_ts__globset-0.4.18", is_dev_dep = False),
+        struct(repo = "vendor_ts__itertools-0.15.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__lazy_static-1.5.1", is_dev_dep = False),
+        struct(repo = "vendor_ts__mustache-0.9.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__num-traits-0.2.19", is_dev_dep = False),
+        struct(repo = "vendor_ts__num_cpus-1.17.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__proc-macro2-1.0.107", is_dev_dep = False),
+        struct(repo = "vendor_ts__quote-1.0.47", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_base_db-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_cfg-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir_def-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir_expand-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir_ty-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_ide_db-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_intern-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_load-cargo-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_parser-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_paths-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_project_model-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_span-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_stdx-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_syntax-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_syntax-bridge-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_toolchain-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_vfs-0.0.358", is_dev_dep = False),
+        struct(repo = "vendor_ts__rayon-1.12.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__regex-1.13.1", is_dev_dep = False),
+        struct(repo = "vendor_ts__serde-1.0.229", is_dev_dep = False),
+        struct(repo = "vendor_ts__serde_json-1.0.154", is_dev_dep = False),
+        struct(repo = "vendor_ts__serde_with-3.24.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__serde_yaml-0.9.34-deprecated", is_dev_dep = False),
+        struct(repo = "vendor_ts__syn-3.0.9", is_dev_dep = False),
+        struct(repo = "vendor_ts__toml-1.1.8-spec-1.1.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__tracing-0.1.44", is_dev_dep = False),
+        struct(repo = "vendor_ts__tracing-flame-0.2.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__tracing-subscriber-0.3.23", is_dev_dep = False),
+        struct(repo = "vendor_ts__tree-sitter-0.26.9", is_dev_dep = False),
+        struct(repo = "vendor_ts__tree-sitter-embedded-template-0.25.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__tree-sitter-python-0.25.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__tree-sitter-ruby-0.23.1", is_dev_dep = False),
+        struct(repo = "vendor_ts__triomphe-0.1.17", is_dev_dep = False),
+        struct(repo = "vendor_ts__ungrammar-1.16.1", is_dev_dep = False),
+        struct(repo = "vendor_ts__zstd-0.14.2", is_dev_dep = False),
+        struct(repo = "vendor_ts__rand-0.10.3", is_dev_dep = True),
+        struct(repo = "vendor_ts__tree-sitter-json-0.24.8", is_dev_dep = True),
+        struct(repo = "vendor_ts__tree-sitter-ql-0.23.1", is_dev_dep = True),
+    ]
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
index be869ecf7388..6e5c75f885e5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
@@ -5,4358 +5,19 @@
 #
 #     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
 ###############################################################################
-"""
-# `crates_repository` API
-
-- [aliases](#aliases)
-- [crate_deps](#crate_deps)
-- [all_crate_deps](#all_crate_deps)
-- [crate_repositories](#crate_repositories)
-
-"""
-
-load("@bazel_skylib//lib:selects.bzl", "selects")
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-
-###############################################################################
-# MACROS API
-###############################################################################
-
-# An identifier that represent common dependencies (unconditional).
-_COMMON_CONDITION = ""
-
-def _flatten_dependency_maps(all_dependency_maps):
-    """Flatten a list of dependency maps into one dictionary.
-
-    Dependency maps have the following structure:
-
-    ```python
-    DEPENDENCIES_MAP = {
-        # The first key in the map is a Bazel package
-        # name of the workspace this file is defined in.
-        "workspace_member_package": {
-
-            # Not all dependencies are supported for all platforms.
-            # the condition key is the condition required to be true
-            # on the host platform.
-            "condition": {
-
-                # An alias to a crate target.     # The label of the crate target the
-                # Aliases are only crate names.   # package name refers to.
-                "package_name":                   "@full//:label",
-            }
-        }
-    }
-    ```
-
-    Args:
-        all_dependency_maps (list): A list of dicts as described above
-
-    Returns:
-        dict: A dictionary as described above
-    """
-    dependencies = {}
-
-    for workspace_deps_map in all_dependency_maps:
-        for pkg_name, conditional_deps_map in workspace_deps_map.items():
-            if pkg_name not in dependencies:
-                non_frozen_map = dict()
-                for key, values in conditional_deps_map.items():
-                    non_frozen_map.update({key: dict(values.items())})
-                dependencies.setdefault(pkg_name, non_frozen_map)
-                continue
-
-            for condition, deps_map in conditional_deps_map.items():
-                # If the condition has not been recorded, do so and continue
-                if condition not in dependencies[pkg_name]:
-                    dependencies[pkg_name].setdefault(condition, dict(deps_map.items()))
-                    continue
-
-                # Alert on any miss-matched dependencies
-                inconsistent_entries = []
-                for crate_name, crate_label in deps_map.items():
-                    existing = dependencies[pkg_name][condition].get(crate_name)
-                    if existing and existing != crate_label:
-                        inconsistent_entries.append((crate_name, existing, crate_label))
-                    dependencies[pkg_name][condition].update({crate_name: crate_label})
-
-    return dependencies
-
-def crate_deps(deps, package_name = None):
-    """Finds the fully qualified label of the requested crates for the package where this macro is called.
-
-    Args:
-        deps (list): The desired list of crate targets.
-        package_name (str, optional): The package name of the set of dependencies to look up.
-            Defaults to `native.package_name()`.
-
-    Returns:
-        list: A list of labels to generated rust targets (str)
-    """
-
-    if not deps:
-        return []
-
-    if package_name == None:
-        package_name = native.package_name()
-
-    # Join both sets of dependencies
-    dependencies = _flatten_dependency_maps([
-        _NORMAL_DEPENDENCIES,
-        _NORMAL_DEV_DEPENDENCIES,
-        _PROC_MACRO_DEPENDENCIES,
-        _PROC_MACRO_DEV_DEPENDENCIES,
-        _BUILD_DEPENDENCIES,
-        _BUILD_PROC_MACRO_DEPENDENCIES,
-    ]).pop(package_name, {})
-
-    # Combine all conditional packages so we can easily index over a flat list
-    # TODO: Perhaps this should actually return select statements and maintain
-    # the conditionals of the dependencies
-    flat_deps = {}
-    for deps_set in dependencies.values():
-        for crate_name, crate_label in deps_set.items():
-            flat_deps.update({crate_name: crate_label})
-
-    missing_crates = []
-    crate_targets = []
-    for crate_target in deps:
-        if crate_target not in flat_deps:
-            missing_crates.append(crate_target)
-        else:
-            crate_targets.append(flat_deps[crate_target])
-
-    if missing_crates:
-        fail("Could not find crates `{}` among dependencies of `{}`. Available dependencies were `{}`".format(
-            missing_crates,
-            package_name,
-            dependencies,
-        ))
-
-    return crate_targets
-
-def all_crate_deps(
-        normal = False,
-        normal_dev = False,
-        proc_macro = False,
-        proc_macro_dev = False,
-        build = False,
-        build_proc_macro = False,
-        package_name = None):
-    """Finds the fully qualified label of all requested direct crate dependencies \
-    for the package where this macro is called.
-
-    If no parameters are set, all normal dependencies are returned. Setting any one flag will
-    otherwise impact the contents of the returned list.
-
-    Args:
-        normal (bool, optional): If True, normal dependencies are included in the
-            output list.
-        normal_dev (bool, optional): If True, normal dev dependencies will be
-            included in the output list.
-        proc_macro (bool, optional): If True, proc_macro dependencies are included
-            in the output list.
-        proc_macro_dev (bool, optional): If True, dev proc_macro dependencies are
-            included in the output list.
-        build (bool, optional): If True, build dependencies are included
-            in the output list.
-        build_proc_macro (bool, optional): If True, build proc_macro dependencies are
-            included in the output list.
-        package_name (str, optional): The package name of the set of dependencies to look up.
-            Defaults to `native.package_name()` when unset.
-
-    Returns:
-        list: A list of labels to generated rust targets (str)
-    """
-
-    if package_name == None:
-        package_name = native.package_name()
-
-    # Determine the relevant maps to use
-    all_dependency_maps = []
-    if normal:
-        all_dependency_maps.append(_NORMAL_DEPENDENCIES)
-    if normal_dev:
-        all_dependency_maps.append(_NORMAL_DEV_DEPENDENCIES)
-    if proc_macro:
-        all_dependency_maps.append(_PROC_MACRO_DEPENDENCIES)
-    if proc_macro_dev:
-        all_dependency_maps.append(_PROC_MACRO_DEV_DEPENDENCIES)
-    if build:
-        all_dependency_maps.append(_BUILD_DEPENDENCIES)
-    if build_proc_macro:
-        all_dependency_maps.append(_BUILD_PROC_MACRO_DEPENDENCIES)
-
-    # Default to always using normal dependencies
-    if not all_dependency_maps:
-        all_dependency_maps.append(_NORMAL_DEPENDENCIES)
-
-    dependencies = _flatten_dependency_maps(all_dependency_maps).pop(package_name, None)
-
-    if not dependencies:
-        if dependencies == None:
-            fail("Tried to get all_crate_deps for package " + package_name + " but that package had no Cargo.toml file")
-        else:
-            return []
-
-    crate_deps = list(dependencies.pop(_COMMON_CONDITION, {}).values())
-    for condition, deps in dependencies.items():
-        crate_deps += selects.with_or({
-            tuple(_CONDITIONS[condition]): deps.values(),
-            "//conditions:default": [],
-        })
-
-    return crate_deps
-
-def aliases(
-        normal = False,
-        normal_dev = False,
-        proc_macro = False,
-        proc_macro_dev = False,
-        build = False,
-        build_proc_macro = False,
-        package_name = None):
-    """Produces a map of Crate alias names to their original label
-
-    If no dependency kinds are specified, `normal` and `proc_macro` are used by default.
-    Setting any one flag will otherwise determine the contents of the returned dict.
-
-    Args:
-        normal (bool, optional): If True, normal dependencies are included in the
-            output list.
-        normal_dev (bool, optional): If True, normal dev dependencies will be
-            included in the output list..
-        proc_macro (bool, optional): If True, proc_macro dependencies are included
-            in the output list.
-        proc_macro_dev (bool, optional): If True, dev proc_macro dependencies are
-            included in the output list.
-        build (bool, optional): If True, build dependencies are included
-            in the output list.
-        build_proc_macro (bool, optional): If True, build proc_macro dependencies are
-            included in the output list.
-        package_name (str, optional): The package name of the set of dependencies to look up.
-            Defaults to `native.package_name()` when unset.
-
-    Returns:
-        dict: The aliases of all associated packages
-    """
-    if package_name == None:
-        package_name = native.package_name()
-
-    # Determine the relevant maps to use
-    all_aliases_maps = []
-    if normal:
-        all_aliases_maps.append(_NORMAL_ALIASES)
-    if normal_dev:
-        all_aliases_maps.append(_NORMAL_DEV_ALIASES)
-    if proc_macro:
-        all_aliases_maps.append(_PROC_MACRO_ALIASES)
-    if proc_macro_dev:
-        all_aliases_maps.append(_PROC_MACRO_DEV_ALIASES)
-    if build:
-        all_aliases_maps.append(_BUILD_ALIASES)
-    if build_proc_macro:
-        all_aliases_maps.append(_BUILD_PROC_MACRO_ALIASES)
-
-    # Default to always using normal aliases
-    if not all_aliases_maps:
-        all_aliases_maps.append(_NORMAL_ALIASES)
-        all_aliases_maps.append(_PROC_MACRO_ALIASES)
-
-    aliases = _flatten_dependency_maps(all_aliases_maps).pop(package_name, None)
-
-    if not aliases:
-        return dict()
-
-    common_items = aliases.pop(_COMMON_CONDITION, {}).items()
-
-    # If there are only common items in the dictionary, immediately return them
-    if not len(aliases.keys()) == 1:
-        return dict(common_items)
-
-    # Build a single select statement where each conditional has accounted for the
-    # common set of aliases.
-    crate_aliases = {"//conditions:default": dict(common_items)}
-    for condition, deps in aliases.items():
-        condition_triples = _CONDITIONS[condition]
-        for triple in condition_triples:
-            if triple in crate_aliases:
-                crate_aliases[triple].update(deps)
-            else:
-                crate_aliases.update({triple: dict(deps.items() + common_items)})
-
-    return select(crate_aliases)
-
-###############################################################################
-# WORKSPACE MEMBER DEPS AND ALIASES
-###############################################################################
-
-_NORMAL_DEPENDENCIES = {
-    "ruby/extractor": {
-        _COMMON_CONDITION: {
-            "clap": Label("@vendor_ts__clap-4.5.48//:clap"),
-            "encoding": Label("@vendor_ts__encoding-0.2.33//:encoding"),
-            "lazy_static": Label("@vendor_ts__lazy_static-1.5.0//:lazy_static"),
-            "rayon": Label("@vendor_ts__rayon-1.11.0//:rayon"),
-            "regex": Label("@vendor_ts__regex-1.11.3//:regex"),
-            "serde_json": Label("@vendor_ts__serde_json-1.0.145//:serde_json"),
-            "tracing": Label("@vendor_ts__tracing-0.1.41//:tracing"),
-            "tracing-subscriber": Label("@vendor_ts__tracing-subscriber-0.3.20//:tracing_subscriber"),
-            "tree-sitter": Label("@vendor_ts__tree-sitter-0.26.8//:tree_sitter"),
-            "tree-sitter-embedded-template": Label("@vendor_ts__tree-sitter-embedded-template-0.25.0//:tree_sitter_embedded_template"),
-            "tree-sitter-ruby": Label("@vendor_ts__tree-sitter-ruby-0.23.1//:tree_sitter_ruby"),
-        },
-    },
-    "rust/ast-generator": {
-        _COMMON_CONDITION: {
-            "anyhow": Label("@vendor_ts__anyhow-1.0.100//:anyhow"),
-            "either": Label("@vendor_ts__either-1.15.0//:either"),
-            "itertools": Label("@vendor_ts__itertools-0.14.0//:itertools"),
-            "mustache": Label("@vendor_ts__mustache-0.9.0//:mustache"),
-            "proc-macro2": Label("@vendor_ts__proc-macro2-1.0.101//:proc_macro2"),
-            "quote": Label("@vendor_ts__quote-1.0.41//:quote"),
-            "serde": Label("@vendor_ts__serde-1.0.228//:serde"),
-            "stdx": Label("@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx"),
-            "ungrammar": Label("@vendor_ts__ungrammar-1.16.1//:ungrammar"),
-        },
-    },
-    "rust/autobuild": {
-    },
-    "rust/extractor": {
-        _COMMON_CONDITION: {
-            "anyhow": Label("@vendor_ts__anyhow-1.0.100//:anyhow"),
-            "argfile": Label("@vendor_ts__argfile-0.2.1//:argfile"),
-            "chalk-ir": Label("@vendor_ts__chalk-ir-0.104.0//:chalk_ir"),
-            "chrono": Label("@vendor_ts__chrono-0.4.42//:chrono"),
-            "clap": Label("@vendor_ts__clap-4.5.48//:clap"),
-            "dunce": Label("@vendor_ts__dunce-1.0.5//:dunce"),
-            "figment": Label("@vendor_ts__figment-0.10.19//:figment"),
-            "glob": Label("@vendor_ts__glob-0.3.3//:glob"),
-            "itertools": Label("@vendor_ts__itertools-0.14.0//:itertools"),
-            "mustache": Label("@vendor_ts__mustache-0.9.0//:mustache"),
-            "num-traits": Label("@vendor_ts__num-traits-0.2.19//:num_traits"),
-            "ra_ap_base_db": Label("@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db"),
-            "ra_ap_cfg": Label("@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg"),
-            "ra_ap_hir": Label("@vendor_ts__ra_ap_hir-0.0.301//:ra_ap_hir"),
-            "ra_ap_hir_def": Label("@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def"),
-            "ra_ap_hir_expand": Label("@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand"),
-            "ra_ap_hir_ty": Label("@vendor_ts__ra_ap_hir_ty-0.0.301//:ra_ap_hir_ty"),
-            "ra_ap_ide_db": Label("@vendor_ts__ra_ap_ide_db-0.0.301//:ra_ap_ide_db"),
-            "ra_ap_intern": Label("@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern"),
-            "ra_ap_load-cargo": Label("@vendor_ts__ra_ap_load-cargo-0.0.301//:ra_ap_load_cargo"),
-            "ra_ap_parser": Label("@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser"),
-            "ra_ap_paths": Label("@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths"),
-            "ra_ap_project_model": Label("@vendor_ts__ra_ap_project_model-0.0.301//:ra_ap_project_model"),
-            "ra_ap_span": Label("@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span"),
-            "ra_ap_syntax": Label("@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax"),
-            "ra_ap_vfs": Label("@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs"),
-            "serde": Label("@vendor_ts__serde-1.0.228//:serde"),
-            "serde_json": Label("@vendor_ts__serde_json-1.0.145//:serde_json"),
-            "serde_with": Label("@vendor_ts__serde_with-3.14.1//:serde_with"),
-            "toml": Label("@vendor_ts__toml-0.9.7//:toml"),
-            "tracing": Label("@vendor_ts__tracing-0.1.41//:tracing"),
-            "tracing-flame": Label("@vendor_ts__tracing-flame-0.2.0//:tracing_flame"),
-            "tracing-subscriber": Label("@vendor_ts__tracing-subscriber-0.3.20//:tracing_subscriber"),
-            "triomphe": Label("@vendor_ts__triomphe-0.1.14//:triomphe"),
-        },
-    },
-    "rust/extractor/macros": {
-        _COMMON_CONDITION: {
-            "quote": Label("@vendor_ts__quote-1.0.41//:quote"),
-            "syn": Label("@vendor_ts__syn-2.0.106//:syn"),
-        },
-    },
-    "shared/tree-sitter-extractor": {
-        _COMMON_CONDITION: {
-            "chrono": Label("@vendor_ts__chrono-0.4.42//:chrono"),
-            "encoding": Label("@vendor_ts__encoding-0.2.33//:encoding"),
-            "flate2": Label("@vendor_ts__flate2-1.1.2//:flate2"),
-            "globset": Label("@vendor_ts__globset-0.4.16//:globset"),
-            "lazy_static": Label("@vendor_ts__lazy_static-1.5.0//:lazy_static"),
-            "num_cpus": Label("@vendor_ts__num_cpus-1.17.0//:num_cpus"),
-            "rayon": Label("@vendor_ts__rayon-1.11.0//:rayon"),
-            "regex": Label("@vendor_ts__regex-1.11.3//:regex"),
-            "serde": Label("@vendor_ts__serde-1.0.228//:serde"),
-            "serde_json": Label("@vendor_ts__serde_json-1.0.145//:serde_json"),
-            "tracing": Label("@vendor_ts__tracing-0.1.41//:tracing"),
-            "tracing-subscriber": Label("@vendor_ts__tracing-subscriber-0.3.20//:tracing_subscriber"),
-            "tree-sitter": Label("@vendor_ts__tree-sitter-0.26.8//:tree_sitter"),
-            "zstd": Label("@vendor_ts__zstd-0.13.3//:zstd"),
-        },
-    },
-    "shared/yeast": {
-        _COMMON_CONDITION: {
-            "clap": Label("@vendor_ts__clap-4.5.48//:clap"),
-            "serde": Label("@vendor_ts__serde-1.0.228//:serde"),
-            "serde_json": Label("@vendor_ts__serde_json-1.0.145//:serde_json"),
-            "serde_yaml": Label("@vendor_ts__serde_yaml-0.9.34-deprecated//:serde_yaml"),
-            "tree-sitter": Label("@vendor_ts__tree-sitter-0.26.8//:tree_sitter"),
-            "tree-sitter-python": Label("@vendor_ts__tree-sitter-python-0.23.6//:tree_sitter_python"),
-            "tree-sitter-ruby": Label("@vendor_ts__tree-sitter-ruby-0.23.1//:tree_sitter_ruby"),
-        },
-    },
-    "shared/yeast-macros": {
-        _COMMON_CONDITION: {
-            "proc-macro2": Label("@vendor_ts__proc-macro2-1.0.101//:proc_macro2"),
-            "quote": Label("@vendor_ts__quote-1.0.41//:quote"),
-            "syn": Label("@vendor_ts__syn-2.0.106//:syn"),
-        },
-    },
-    "shared/yeast-schema": {
-        _COMMON_CONDITION: {
-            "serde": Label("@vendor_ts__serde-1.0.228//:serde"),
-            "serde_json": Label("@vendor_ts__serde_json-1.0.145//:serde_json"),
-            "serde_yaml": Label("@vendor_ts__serde_yaml-0.9.34-deprecated//:serde_yaml"),
-        },
-    },
-    "unified/extractor": {
-        _COMMON_CONDITION: {
-            "clap": Label("@vendor_ts__clap-4.5.48//:clap"),
-            "encoding": Label("@vendor_ts__encoding-0.2.33//:encoding"),
-            "lazy_static": Label("@vendor_ts__lazy_static-1.5.0//:lazy_static"),
-            "rayon": Label("@vendor_ts__rayon-1.11.0//:rayon"),
-            "regex": Label("@vendor_ts__regex-1.11.3//:regex"),
-            "serde_json": Label("@vendor_ts__serde_json-1.0.145//:serde_json"),
-            "tracing": Label("@vendor_ts__tracing-0.1.41//:tracing"),
-            "tracing-subscriber": Label("@vendor_ts__tracing-subscriber-0.3.20//:tracing_subscriber"),
-        },
-    },
-    "unified/swift-syntax-rs": {
-        _COMMON_CONDITION: {
-        },
-    },
-}
-
-_NORMAL_ALIASES = {
-    "ruby/extractor": {
-        _COMMON_CONDITION: {
-        },
-    },
-    "rust/ast-generator": {
-        _COMMON_CONDITION: {
-            Label("@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx"): "stdx",
-        },
-    },
-    "rust/autobuild": {
-    },
-    "rust/extractor": {
-        _COMMON_CONDITION: {
-        },
-    },
-    "rust/extractor/macros": {
-        _COMMON_CONDITION: {
-        },
-    },
-    "shared/tree-sitter-extractor": {
-        _COMMON_CONDITION: {
-        },
-    },
-    "shared/yeast": {
-        _COMMON_CONDITION: {
-        },
-    },
-    "shared/yeast-macros": {
-        _COMMON_CONDITION: {
-        },
-    },
-    "shared/yeast-schema": {
-        _COMMON_CONDITION: {
-        },
-    },
-    "unified/extractor": {
-        _COMMON_CONDITION: {
-        },
-    },
-    "unified/swift-syntax-rs": {
-        _COMMON_CONDITION: {
-        },
-    },
-}
-
-_NORMAL_DEV_DEPENDENCIES = {
-    "ruby/extractor": {
-    },
-    "rust/ast-generator": {
-    },
-    "rust/autobuild": {
-    },
-    "rust/extractor": {
-    },
-    "rust/extractor/macros": {
-    },
-    "shared/tree-sitter-extractor": {
-        _COMMON_CONDITION: {
-            "rand": Label("@vendor_ts__rand-0.9.2//:rand"),
-            "tree-sitter-json": Label("@vendor_ts__tree-sitter-json-0.24.8//:tree_sitter_json"),
-            "tree-sitter-ql": Label("@vendor_ts__tree-sitter-ql-0.23.1//:tree_sitter_ql"),
-        },
-    },
-    "shared/yeast": {
-    },
-    "shared/yeast-macros": {
-    },
-    "shared/yeast-schema": {
-    },
-    "unified/extractor": {
-    },
-    "unified/swift-syntax-rs": {
-    },
-}
-
-_NORMAL_DEV_ALIASES = {
-    "ruby/extractor": {
-    },
-    "rust/ast-generator": {
-    },
-    "rust/autobuild": {
-    },
-    "rust/extractor": {
-    },
-    "rust/extractor/macros": {
-    },
-    "shared/tree-sitter-extractor": {
-        _COMMON_CONDITION: {
-        },
-    },
-    "shared/yeast": {
-    },
-    "shared/yeast-macros": {
-    },
-    "shared/yeast-schema": {
-    },
-    "unified/extractor": {
-    },
-    "unified/swift-syntax-rs": {
-    },
-}
-
-_PROC_MACRO_DEPENDENCIES = {
-    "ruby/extractor": {
-    },
-    "rust/ast-generator": {
-    },
-    "rust/autobuild": {
-    },
-    "rust/extractor": {
-    },
-    "rust/extractor/macros": {
-    },
-    "shared/tree-sitter-extractor": {
-    },
-    "shared/yeast": {
-    },
-    "shared/yeast-macros": {
-    },
-    "shared/yeast-schema": {
-    },
-    "unified/extractor": {
-    },
-    "unified/swift-syntax-rs": {
-    },
-}
-
-_PROC_MACRO_ALIASES = {
-    "ruby/extractor": {
-    },
-    "rust/ast-generator": {
-    },
-    "rust/autobuild": {
-    },
-    "rust/extractor": {
-    },
-    "rust/extractor/macros": {
-    },
-    "shared/tree-sitter-extractor": {
-    },
-    "shared/yeast": {
-    },
-    "shared/yeast-macros": {
-    },
-    "shared/yeast-schema": {
-    },
-    "unified/extractor": {
-    },
-    "unified/swift-syntax-rs": {
-    },
-}
-
-_PROC_MACRO_DEV_DEPENDENCIES = {
-    "ruby/extractor": {
-    },
-    "rust/ast-generator": {
-    },
-    "rust/autobuild": {
-    },
-    "rust/extractor": {
-    },
-    "rust/extractor/macros": {
-    },
-    "shared/tree-sitter-extractor": {
-    },
-    "shared/yeast": {
-    },
-    "shared/yeast-macros": {
-    },
-    "shared/yeast-schema": {
-    },
-    "unified/extractor": {
-    },
-    "unified/swift-syntax-rs": {
-    },
-}
-
-_PROC_MACRO_DEV_ALIASES = {
-    "ruby/extractor": {
-    },
-    "rust/ast-generator": {
-    },
-    "rust/autobuild": {
-    },
-    "rust/extractor": {
-    },
-    "rust/extractor/macros": {
-    },
-    "shared/tree-sitter-extractor": {
-        _COMMON_CONDITION: {
-        },
-    },
-    "shared/yeast": {
-    },
-    "shared/yeast-macros": {
-    },
-    "shared/yeast-schema": {
-    },
-    "unified/extractor": {
-    },
-    "unified/swift-syntax-rs": {
-    },
-}
-
-_BUILD_DEPENDENCIES = {
-    "ruby/extractor": {
-    },
-    "rust/ast-generator": {
-    },
-    "rust/autobuild": {
-    },
-    "rust/extractor": {
-    },
-    "rust/extractor/macros": {
-    },
-    "shared/tree-sitter-extractor": {
-    },
-    "shared/yeast": {
-    },
-    "shared/yeast-macros": {
-    },
-    "shared/yeast-schema": {
-    },
-    "unified/extractor": {
-    },
-    "unified/swift-syntax-rs": {
-    },
-}
-
-_BUILD_ALIASES = {
-    "ruby/extractor": {
-    },
-    "rust/ast-generator": {
-    },
-    "rust/autobuild": {
-    },
-    "rust/extractor": {
-    },
-    "rust/extractor/macros": {
-    },
-    "shared/tree-sitter-extractor": {
-    },
-    "shared/yeast": {
-    },
-    "shared/yeast-macros": {
-    },
-    "shared/yeast-schema": {
-    },
-    "unified/extractor": {
-    },
-    "unified/swift-syntax-rs": {
-    },
-}
-
-_BUILD_PROC_MACRO_DEPENDENCIES = {
-    "ruby/extractor": {
-    },
-    "rust/ast-generator": {
-    },
-    "rust/autobuild": {
-    },
-    "rust/extractor": {
-    },
-    "rust/extractor/macros": {
-    },
-    "shared/tree-sitter-extractor": {
-    },
-    "shared/yeast": {
-    },
-    "shared/yeast-macros": {
-    },
-    "shared/yeast-schema": {
-    },
-    "unified/extractor": {
-    },
-    "unified/swift-syntax-rs": {
-    },
-}
-
-_BUILD_PROC_MACRO_ALIASES = {
-    "ruby/extractor": {
-    },
-    "rust/ast-generator": {
-    },
-    "rust/autobuild": {
-    },
-    "rust/extractor": {
-    },
-    "rust/extractor/macros": {
-    },
-    "shared/tree-sitter-extractor": {
-    },
-    "shared/yeast": {
-    },
-    "shared/yeast-macros": {
-    },
-    "shared/yeast-schema": {
-    },
-    "unified/extractor": {
-    },
-    "unified/swift-syntax-rs": {
-    },
-}
-
-_CONDITIONS = {
-    "aarch64-apple-darwin": ["@rules_rust//rust/platform:aarch64-apple-darwin"],
-    "aarch64-apple-ios": ["@rules_rust//rust/platform:aarch64-apple-ios"],
-    "aarch64-apple-ios-sim": ["@rules_rust//rust/platform:aarch64-apple-ios-sim"],
-    "aarch64-linux-android": ["@rules_rust//rust/platform:aarch64-linux-android"],
-    "aarch64-pc-windows-gnullvm": [],
-    "aarch64-pc-windows-msvc": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
-    "aarch64-unknown-fuchsia": ["@rules_rust//rust/platform:aarch64-unknown-fuchsia"],
-    "aarch64-unknown-linux-gnu": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"],
-    "aarch64-unknown-nixos-gnu": ["@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"],
-    "aarch64-unknown-nto-qnx710": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"],
-    "aarch64-unknown-uefi": ["@rules_rust//rust/platform:aarch64-unknown-uefi"],
-    "arm-unknown-linux-gnueabi": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi"],
-    "arm-unknown-linux-musleabi": ["@rules_rust//rust/platform:arm-unknown-linux-musleabi"],
-    "armv7-linux-androideabi": ["@rules_rust//rust/platform:armv7-linux-androideabi"],
-    "armv7-unknown-linux-gnueabi": ["@rules_rust//rust/platform:armv7-unknown-linux-gnueabi"],
-    "cfg(all(any(target_arch = \"x86_64\", target_arch = \"arm64ec\"), target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
-    "cfg(all(any(target_os = \"linux\", target_os = \"android\"), not(any(all(target_os = \"linux\", target_env = \"\"), getrandom_backend = \"custom\", getrandom_backend = \"linux_raw\", getrandom_backend = \"rdrand\", getrandom_backend = \"rndr\"))))": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "cfg(all(target_arch = \"aarch64\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
-    "cfg(all(target_arch = \"wasm32\", target_os = \"unknown\"))": ["@rules_rust//rust/platform:wasm32-unknown-unknown"],
-    "cfg(all(target_arch = \"wasm32\", target_os = \"wasi\", target_env = \"p2\"))": ["@rules_rust//rust/platform:wasm32-wasip2"],
-    "cfg(all(target_arch = \"x86\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
-    "cfg(all(target_arch = \"x86\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
-    "cfg(all(target_arch = \"x86_64\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "cfg(all(target_os = \"linux\", not(target_env = \"ohos\")))": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "cfg(all(target_os = \"linux\", target_env = \"gnu\"))": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "cfg(all(target_os = \"uefi\", getrandom_backend = \"efi_rng\"))": [],
-    "cfg(any())": [],
-    "cfg(any(target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"hurd\", target_os = \"illumos\", target_os = \"cygwin\", all(target_os = \"horizon\", target_arch = \"arm\")))": ["@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-freebsd"],
-    "cfg(any(target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonflybsd\", target_os = \"ios\"))": ["@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-unknown-freebsd"],
-    "cfg(any(target_os = \"haiku\", target_os = \"redox\", target_os = \"nto\", target_os = \"aix\"))": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"],
-    "cfg(any(target_os = \"ios\", target_os = \"visionos\", target_os = \"watchos\", target_os = \"tvos\"))": ["@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:x86_64-apple-ios"],
-    "cfg(any(target_os = \"linux\", target_os = \"android\"))": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "cfg(any(target_os = \"macos\", target_os = \"openbsd\", target_os = \"vita\", target_os = \"emscripten\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:x86_64-apple-darwin"],
-    "cfg(any(target_pointer_width = \"8\", target_pointer_width = \"16\", target_pointer_width = \"32\"))": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2"],
-    "cfg(not(windows))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-fuchsia", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:aarch64-unknown-uefi", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-none-elf", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none", "@rules_rust//rust/platform:x86_64-unknown-uefi"],
-    "cfg(target_os = \"android\")": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:x86_64-linux-android"],
-    "cfg(target_os = \"haiku\")": [],
-    "cfg(target_os = \"hermit\")": [],
-    "cfg(target_os = \"macos\")": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin"],
-    "cfg(target_os = \"netbsd\")": [],
-    "cfg(target_os = \"redox\")": [],
-    "cfg(target_os = \"solaris\")": [],
-    "cfg(target_os = \"vxworks\")": [],
-    "cfg(target_os = \"wasi\")": ["@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2"],
-    "cfg(target_os = \"windows\")": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
-    "cfg(target_vendor = \"apple\")": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios"],
-    "cfg(unix)": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-fuchsia", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "cfg(windows)": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
-    "cfg(windows_raw_dylib)": [],
-    "i686-apple-darwin": ["@rules_rust//rust/platform:i686-apple-darwin"],
-    "i686-linux-android": ["@rules_rust//rust/platform:i686-linux-android"],
-    "i686-pc-windows-gnullvm": [],
-    "i686-pc-windows-msvc": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
-    "i686-unknown-freebsd": ["@rules_rust//rust/platform:i686-unknown-freebsd"],
-    "i686-unknown-linux-gnu": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
-    "powerpc-unknown-linux-gnu": ["@rules_rust//rust/platform:powerpc-unknown-linux-gnu"],
-    "riscv32imc-unknown-none-elf": ["@rules_rust//rust/platform:riscv32imc-unknown-none-elf"],
-    "riscv64gc-unknown-linux-gnu": ["@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu"],
-    "riscv64gc-unknown-none-elf": ["@rules_rust//rust/platform:riscv64gc-unknown-none-elf"],
-    "s390x-unknown-linux-gnu": ["@rules_rust//rust/platform:s390x-unknown-linux-gnu"],
-    "thumbv7em-none-eabi": ["@rules_rust//rust/platform:thumbv7em-none-eabi"],
-    "thumbv8m.main-none-eabi": ["@rules_rust//rust/platform:thumbv8m.main-none-eabi"],
-    "wasm32-unknown-emscripten": ["@rules_rust//rust/platform:wasm32-unknown-emscripten"],
-    "wasm32-unknown-unknown": ["@rules_rust//rust/platform:wasm32-unknown-unknown"],
-    "wasm32-wasip1": ["@rules_rust//rust/platform:wasm32-wasip1"],
-    "wasm32-wasip1-threads": ["@rules_rust//rust/platform:wasm32-wasip1-threads"],
-    "wasm32-wasip2": ["@rules_rust//rust/platform:wasm32-wasip2"],
-    "x86_64-apple-darwin": ["@rules_rust//rust/platform:x86_64-apple-darwin"],
-    "x86_64-apple-ios": ["@rules_rust//rust/platform:x86_64-apple-ios"],
-    "x86_64-linux-android": ["@rules_rust//rust/platform:x86_64-linux-android"],
-    "x86_64-pc-windows-gnullvm": [],
-    "x86_64-pc-windows-msvc": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
-    "x86_64-unknown-freebsd": ["@rules_rust//rust/platform:x86_64-unknown-freebsd"],
-    "x86_64-unknown-fuchsia": ["@rules_rust//rust/platform:x86_64-unknown-fuchsia"],
-    "x86_64-unknown-linux-gnu": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "x86_64-unknown-nixos-gnu": ["@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "x86_64-unknown-none": ["@rules_rust//rust/platform:x86_64-unknown-none"],
-    "x86_64-unknown-uefi": ["@rules_rust//rust/platform:x86_64-unknown-uefi"],
-}
-
-###############################################################################
-
-def crate_repositories():
-    """A macro for defining repositories for all generated crates.
-
-    Returns:
-      A list of repos visible to the module through the module extension.
-    """
-    maybe(
-        http_archive,
-        name = "vendor_ts__adler2-2.0.1",
-        sha256 = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/adler2/2.0.1/download"],
-        strip_prefix = "adler2-2.0.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.adler2-2.0.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__aho-corasick-1.1.3",
-        sha256 = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/aho-corasick/1.1.3/download"],
-        strip_prefix = "aho-corasick-1.1.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.aho-corasick-1.1.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__allocator-api2-0.2.21",
-        sha256 = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/allocator-api2/0.2.21/download"],
-        strip_prefix = "allocator-api2-0.2.21",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.allocator-api2-0.2.21.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__android_system_properties-0.1.5",
-        sha256 = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/android_system_properties/0.1.5/download"],
-        strip_prefix = "android_system_properties-0.1.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.android_system_properties-0.1.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__anstream-0.6.20",
-        sha256 = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstream/0.6.20/download"],
-        strip_prefix = "anstream-0.6.20",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstream-0.6.20.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__anstyle-1.0.11",
-        sha256 = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle/1.0.11/download"],
-        strip_prefix = "anstyle-1.0.11",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-1.0.11.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__anstyle-parse-0.2.7",
-        sha256 = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle-parse/0.2.7/download"],
-        strip_prefix = "anstyle-parse-0.2.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-parse-0.2.7.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__anstyle-query-1.1.4",
-        sha256 = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle-query/1.1.4/download"],
-        strip_prefix = "anstyle-query-1.1.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-query-1.1.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__anstyle-wincon-3.0.10",
-        sha256 = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle-wincon/3.0.10/download"],
-        strip_prefix = "anstyle-wincon-3.0.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-wincon-3.0.10.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__anyhow-1.0.100",
-        sha256 = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anyhow/1.0.100/download"],
-        strip_prefix = "anyhow-1.0.100",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anyhow-1.0.100.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__argfile-0.2.1",
-        sha256 = "0a1cc0ba69de57db40674c66f7cf2caee3981ddef084388482c95c0e2133e5e8",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/argfile/0.2.1/download"],
-        strip_prefix = "argfile-0.2.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.argfile-0.2.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__arrayvec-0.7.6",
-        sha256 = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/arrayvec/0.7.6/download"],
-        strip_prefix = "arrayvec-0.7.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.arrayvec-0.7.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__atomic-0.6.1",
-        sha256 = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/atomic/0.6.1/download"],
-        strip_prefix = "atomic-0.6.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.atomic-0.6.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__autocfg-1.5.0",
-        sha256 = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/autocfg/1.5.0/download"],
-        strip_prefix = "autocfg-1.5.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.autocfg-1.5.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__base64-0.22.1",
-        sha256 = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/base64/0.22.1/download"],
-        strip_prefix = "base64-0.22.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.base64-0.22.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__bitflags-1.3.2",
-        sha256 = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/bitflags/1.3.2/download"],
-        strip_prefix = "bitflags-1.3.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bitflags-1.3.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__bitflags-2.9.4",
-        sha256 = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/bitflags/2.9.4/download"],
-        strip_prefix = "bitflags-2.9.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bitflags-2.9.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__borsh-1.5.7",
-        sha256 = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/borsh/1.5.7/download"],
-        strip_prefix = "borsh-1.5.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.borsh-1.5.7.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__boxcar-0.2.14",
-        sha256 = "36f64beae40a84da1b4b26ff2761a5b895c12adc41dc25aaee1c4f2bbfe97a6e",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/boxcar/0.2.14/download"],
-        strip_prefix = "boxcar-0.2.14",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.boxcar-0.2.14.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__bstr-1.12.0",
-        sha256 = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/bstr/1.12.0/download"],
-        strip_prefix = "bstr-1.12.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bstr-1.12.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__bumpalo-3.19.0",
-        sha256 = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/bumpalo/3.19.0/download"],
-        strip_prefix = "bumpalo-3.19.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bumpalo-3.19.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__bytemuck-1.23.2",
-        sha256 = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/bytemuck/1.23.2/download"],
-        strip_prefix = "bytemuck-1.23.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bytemuck-1.23.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__camino-1.1.12",
-        sha256 = "dd0b03af37dad7a14518b7691d81acb0f8222604ad3d1b02f6b4bed5188c0cd5",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/camino/1.1.12/download"],
-        strip_prefix = "camino-1.1.12",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.camino-1.1.12.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__cargo-platform-0.2.0",
-        sha256 = "84982c6c0ae343635a3a4ee6dedef965513735c8b183caa7289fa6e27399ebd4",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cargo-platform/0.2.0/download"],
-        strip_prefix = "cargo-platform-0.2.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo-platform-0.2.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__cargo-util-schemas-0.8.2",
-        sha256 = "7dc1a6f7b5651af85774ae5a34b4e8be397d9cf4bc063b7e6dbd99a841837830",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cargo-util-schemas/0.8.2/download"],
-        strip_prefix = "cargo-util-schemas-0.8.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo-util-schemas-0.8.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__cargo_metadata-0.21.0",
-        sha256 = "5cfca2aaa699835ba88faf58a06342a314a950d2b9686165e038286c30316868",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cargo_metadata/0.21.0/download"],
-        strip_prefix = "cargo_metadata-0.21.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo_metadata-0.21.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__cc-1.2.61",
-        sha256 = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cc/1.2.61/download"],
-        strip_prefix = "cc-1.2.61",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cc-1.2.61.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__cfg-if-1.0.3",
-        sha256 = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cfg-if/1.0.3/download"],
-        strip_prefix = "cfg-if-1.0.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cfg-if-1.0.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__cfg_aliases-0.2.1",
-        sha256 = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cfg_aliases/0.2.1/download"],
-        strip_prefix = "cfg_aliases-0.2.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cfg_aliases-0.2.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__chalk-derive-0.103.0",
-        sha256 = "eb4899682de915ca7c0b025bdd0a3d34c75fe12184122fda6805a7baddaa293c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/chalk-derive/0.103.0/download"],
-        strip_prefix = "chalk-derive-0.103.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-derive-0.103.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__chalk-derive-0.104.0",
-        sha256 = "9ea9b1e80910f66ae87c772247591432032ef3f6a67367ff17f8343db05beafa",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/chalk-derive/0.104.0/download"],
-        strip_prefix = "chalk-derive-0.104.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-derive-0.104.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__chalk-ir-0.103.0",
-        sha256 = "90a37d2ab99352b4caca135061e7b4ac67024b648c28ed0b787feec4bea4caed",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/chalk-ir/0.103.0/download"],
-        strip_prefix = "chalk-ir-0.103.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-ir-0.103.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__chalk-ir-0.104.0",
-        sha256 = "7047a516de16226cd17344d41a319d0ea1064bf9e60bd612ab341ab4a34bbfa8",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/chalk-ir/0.104.0/download"],
-        strip_prefix = "chalk-ir-0.104.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-ir-0.104.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__chalk-recursive-0.103.0",
-        sha256 = "c855be60e646664bc37c2496d3dc81ca5ef60520930e5e0f0057a0575aff6c19",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/chalk-recursive/0.103.0/download"],
-        strip_prefix = "chalk-recursive-0.103.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-recursive-0.103.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__chalk-solve-0.103.0",
-        sha256 = "477ac6cdfd2013e9f93b09b036c2b607a67b2e728f4777b8422d55a79e9e3a34",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/chalk-solve/0.103.0/download"],
-        strip_prefix = "chalk-solve-0.103.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-solve-0.103.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__chrono-0.4.42",
-        sha256 = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/chrono/0.4.42/download"],
-        strip_prefix = "chrono-0.4.42",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chrono-0.4.42.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__clap-4.5.48",
-        sha256 = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap/4.5.48/download"],
-        strip_prefix = "clap-4.5.48",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap-4.5.48.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__clap_builder-4.5.48",
-        sha256 = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap_builder/4.5.48/download"],
-        strip_prefix = "clap_builder-4.5.48",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_builder-4.5.48.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__clap_derive-4.5.47",
-        sha256 = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap_derive/4.5.47/download"],
-        strip_prefix = "clap_derive-4.5.47",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_derive-4.5.47.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__clap_lex-0.7.5",
-        sha256 = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap_lex/0.7.5/download"],
-        strip_prefix = "clap_lex-0.7.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_lex-0.7.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__colorchoice-1.0.4",
-        sha256 = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/colorchoice/1.0.4/download"],
-        strip_prefix = "colorchoice-1.0.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.colorchoice-1.0.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__core-foundation-sys-0.8.7",
-        sha256 = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/core-foundation-sys/0.8.7/download"],
-        strip_prefix = "core-foundation-sys-0.8.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.core-foundation-sys-0.8.7.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__countme-3.0.1",
-        sha256 = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/countme/3.0.1/download"],
-        strip_prefix = "countme-3.0.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.countme-3.0.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__cov-mark-2.1.0",
-        sha256 = "3f1d92727879fb4f24cec33a35e3bff74035541326cbc12ad44ba8886d1927b0",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cov-mark/2.1.0/download"],
-        strip_prefix = "cov-mark-2.1.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cov-mark-2.1.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__crc32fast-1.5.0",
-        sha256 = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/crc32fast/1.5.0/download"],
-        strip_prefix = "crc32fast-1.5.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crc32fast-1.5.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__crossbeam-channel-0.5.15",
-        sha256 = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/crossbeam-channel/0.5.15/download"],
-        strip_prefix = "crossbeam-channel-0.5.15",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-channel-0.5.15.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__crossbeam-deque-0.8.6",
-        sha256 = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/crossbeam-deque/0.8.6/download"],
-        strip_prefix = "crossbeam-deque-0.8.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-deque-0.8.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__crossbeam-epoch-0.9.18",
-        sha256 = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/crossbeam-epoch/0.9.18/download"],
-        strip_prefix = "crossbeam-epoch-0.9.18",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-epoch-0.9.18.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__crossbeam-queue-0.3.12",
-        sha256 = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/crossbeam-queue/0.3.12/download"],
-        strip_prefix = "crossbeam-queue-0.3.12",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-queue-0.3.12.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__crossbeam-utils-0.8.21",
-        sha256 = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/crossbeam-utils/0.8.21/download"],
-        strip_prefix = "crossbeam-utils-0.8.21",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-utils-0.8.21.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__darling-0.21.3",
-        sha256 = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/darling/0.21.3/download"],
-        strip_prefix = "darling-0.21.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling-0.21.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__darling_core-0.21.3",
-        sha256 = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/darling_core/0.21.3/download"],
-        strip_prefix = "darling_core-0.21.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_core-0.21.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__darling_macro-0.21.3",
-        sha256 = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/darling_macro/0.21.3/download"],
-        strip_prefix = "darling_macro-0.21.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_macro-0.21.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__dashmap-6.1.0",
-        sha256 = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/dashmap/6.1.0/download"],
-        strip_prefix = "dashmap-6.1.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.dashmap-6.1.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__deranged-0.5.3",
-        sha256 = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/deranged/0.5.3/download"],
-        strip_prefix = "deranged-0.5.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.deranged-0.5.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__displaydoc-0.2.5",
-        sha256 = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/displaydoc/0.2.5/download"],
-        strip_prefix = "displaydoc-0.2.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.displaydoc-0.2.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__drop_bomb-0.1.5",
-        sha256 = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/drop_bomb/0.1.5/download"],
-        strip_prefix = "drop_bomb-0.1.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.drop_bomb-0.1.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__dunce-1.0.5",
-        sha256 = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/dunce/1.0.5/download"],
-        strip_prefix = "dunce-1.0.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.dunce-1.0.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__dyn-clone-1.0.20",
-        sha256 = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/dyn-clone/1.0.20/download"],
-        strip_prefix = "dyn-clone-1.0.20",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.dyn-clone-1.0.20.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__either-1.15.0",
-        sha256 = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/either/1.15.0/download"],
-        strip_prefix = "either-1.15.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.either-1.15.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ena-0.14.3",
-        sha256 = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ena/0.14.3/download"],
-        strip_prefix = "ena-0.14.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ena-0.14.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__encoding-0.2.33",
-        sha256 = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/encoding/0.2.33/download"],
-        strip_prefix = "encoding-0.2.33",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-0.2.33.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__encoding-index-japanese-1.20141219.5",
-        sha256 = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/encoding-index-japanese/1.20141219.5/download"],
-        strip_prefix = "encoding-index-japanese-1.20141219.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-japanese-1.20141219.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__encoding-index-korean-1.20141219.5",
-        sha256 = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/encoding-index-korean/1.20141219.5/download"],
-        strip_prefix = "encoding-index-korean-1.20141219.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-korean-1.20141219.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__encoding-index-simpchinese-1.20141219.5",
-        sha256 = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/encoding-index-simpchinese/1.20141219.5/download"],
-        strip_prefix = "encoding-index-simpchinese-1.20141219.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-simpchinese-1.20141219.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__encoding-index-singlebyte-1.20141219.5",
-        sha256 = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/encoding-index-singlebyte/1.20141219.5/download"],
-        strip_prefix = "encoding-index-singlebyte-1.20141219.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-singlebyte-1.20141219.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__encoding-index-tradchinese-1.20141219.5",
-        sha256 = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/encoding-index-tradchinese/1.20141219.5/download"],
-        strip_prefix = "encoding-index-tradchinese-1.20141219.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding-index-tradchinese-1.20141219.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__encoding_index_tests-0.1.4",
-        sha256 = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/encoding_index_tests/0.1.4/download"],
-        strip_prefix = "encoding_index_tests-0.1.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.encoding_index_tests-0.1.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__equivalent-1.0.2",
-        sha256 = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/equivalent/1.0.2/download"],
-        strip_prefix = "equivalent-1.0.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.equivalent-1.0.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__erased-serde-0.4.6",
-        sha256 = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/erased-serde/0.4.6/download"],
-        strip_prefix = "erased-serde-0.4.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.erased-serde-0.4.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__figment-0.10.19",
-        sha256 = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/figment/0.10.19/download"],
-        strip_prefix = "figment-0.10.19",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.figment-0.10.19.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__find-msvc-tools-0.1.9",
-        sha256 = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/find-msvc-tools/0.1.9/download"],
-        strip_prefix = "find-msvc-tools-0.1.9",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.find-msvc-tools-0.1.9.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__fixedbitset-0.4.2",
-        sha256 = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/fixedbitset/0.4.2/download"],
-        strip_prefix = "fixedbitset-0.4.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fixedbitset-0.4.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__flate2-1.1.2",
-        sha256 = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/flate2/1.1.2/download"],
-        strip_prefix = "flate2-1.1.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.flate2-1.1.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__fnv-1.0.7",
-        sha256 = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/fnv/1.0.7/download"],
-        strip_prefix = "fnv-1.0.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fnv-1.0.7.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__foldhash-0.1.5",
-        sha256 = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/foldhash/0.1.5/download"],
-        strip_prefix = "foldhash-0.1.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.foldhash-0.1.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__form_urlencoded-1.2.2",
-        sha256 = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/form_urlencoded/1.2.2/download"],
-        strip_prefix = "form_urlencoded-1.2.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.form_urlencoded-1.2.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__fs-err-2.11.0",
-        sha256 = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/fs-err/2.11.0/download"],
-        strip_prefix = "fs-err-2.11.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fs-err-2.11.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__fsevent-sys-4.1.0",
-        sha256 = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/fsevent-sys/4.1.0/download"],
-        strip_prefix = "fsevent-sys-4.1.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fsevent-sys-4.1.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__fst-0.4.7",
-        sha256 = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/fst/0.4.7/download"],
-        strip_prefix = "fst-0.4.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fst-0.4.7.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__getrandom-0.3.3",
-        sha256 = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/getrandom/0.3.3/download"],
-        strip_prefix = "getrandom-0.3.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.getrandom-0.3.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__glob-0.3.3",
-        sha256 = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/glob/0.3.3/download"],
-        strip_prefix = "glob-0.3.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.glob-0.3.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__globset-0.4.16",
-        sha256 = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/globset/0.4.16/download"],
-        strip_prefix = "globset-0.4.16",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.globset-0.4.16.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__hashbrown-0.12.3",
-        sha256 = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/hashbrown/0.12.3/download"],
-        strip_prefix = "hashbrown-0.12.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.12.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__hashbrown-0.14.5",
-        sha256 = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/hashbrown/0.14.5/download"],
-        strip_prefix = "hashbrown-0.14.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.14.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__hashbrown-0.15.5",
-        sha256 = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/hashbrown/0.15.5/download"],
-        strip_prefix = "hashbrown-0.15.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.15.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__hashbrown-0.17.1",
-        sha256 = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/hashbrown/0.17.1/download"],
-        strip_prefix = "hashbrown-0.17.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.17.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__hashlink-0.10.0",
-        sha256 = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/hashlink/0.10.0/download"],
-        strip_prefix = "hashlink-0.10.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashlink-0.10.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__heck-0.5.0",
-        sha256 = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/heck/0.5.0/download"],
-        strip_prefix = "heck-0.5.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.heck-0.5.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__hermit-abi-0.5.2",
-        sha256 = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/hermit-abi/0.5.2/download"],
-        strip_prefix = "hermit-abi-0.5.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hermit-abi-0.5.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__hex-0.4.3",
-        sha256 = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/hex/0.4.3/download"],
-        strip_prefix = "hex-0.4.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hex-0.4.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__home-0.5.11",
-        sha256 = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/home/0.5.11/download"],
-        strip_prefix = "home-0.5.11",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.home-0.5.11.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__iana-time-zone-0.1.63",
-        sha256 = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/iana-time-zone/0.1.63/download"],
-        strip_prefix = "iana-time-zone-0.1.63",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.iana-time-zone-0.1.63.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__iana-time-zone-haiku-0.1.2",
-        sha256 = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/iana-time-zone-haiku/0.1.2/download"],
-        strip_prefix = "iana-time-zone-haiku-0.1.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.iana-time-zone-haiku-0.1.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__icu_collections-2.0.0",
-        sha256 = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/icu_collections/2.0.0/download"],
-        strip_prefix = "icu_collections-2.0.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.icu_collections-2.0.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__icu_locale_core-2.0.0",
-        sha256 = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/icu_locale_core/2.0.0/download"],
-        strip_prefix = "icu_locale_core-2.0.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.icu_locale_core-2.0.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__icu_normalizer-2.0.0",
-        sha256 = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/icu_normalizer/2.0.0/download"],
-        strip_prefix = "icu_normalizer-2.0.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.icu_normalizer-2.0.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__icu_normalizer_data-2.0.0",
-        sha256 = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/icu_normalizer_data/2.0.0/download"],
-        strip_prefix = "icu_normalizer_data-2.0.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.icu_normalizer_data-2.0.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__icu_properties-2.0.1",
-        sha256 = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/icu_properties/2.0.1/download"],
-        strip_prefix = "icu_properties-2.0.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.icu_properties-2.0.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__icu_properties_data-2.0.1",
-        sha256 = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/icu_properties_data/2.0.1/download"],
-        strip_prefix = "icu_properties_data-2.0.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.icu_properties_data-2.0.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__icu_provider-2.0.0",
-        sha256 = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/icu_provider/2.0.0/download"],
-        strip_prefix = "icu_provider-2.0.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.icu_provider-2.0.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ident_case-1.0.1",
-        sha256 = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ident_case/1.0.1/download"],
-        strip_prefix = "ident_case-1.0.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ident_case-1.0.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__idna-1.1.0",
-        sha256 = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/idna/1.1.0/download"],
-        strip_prefix = "idna-1.1.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.idna-1.1.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__idna_adapter-1.2.1",
-        sha256 = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/idna_adapter/1.2.1/download"],
-        strip_prefix = "idna_adapter-1.2.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.idna_adapter-1.2.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__indexmap-1.9.3",
-        sha256 = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/indexmap/1.9.3/download"],
-        strip_prefix = "indexmap-1.9.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.indexmap-1.9.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__indexmap-2.14.0",
-        sha256 = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/indexmap/2.14.0/download"],
-        strip_prefix = "indexmap-2.14.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.indexmap-2.14.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__inlinable_string-0.1.15",
-        sha256 = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/inlinable_string/0.1.15/download"],
-        strip_prefix = "inlinable_string-0.1.15",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inlinable_string-0.1.15.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__inotify-0.11.0",
-        sha256 = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/inotify/0.11.0/download"],
-        strip_prefix = "inotify-0.11.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inotify-0.11.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__inotify-sys-0.1.5",
-        sha256 = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/inotify-sys/0.1.5/download"],
-        strip_prefix = "inotify-sys-0.1.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inotify-sys-0.1.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__intrusive-collections-0.9.7",
-        sha256 = "189d0897e4cbe8c75efedf3502c18c887b05046e59d28404d4d8e46cbc4d1e86",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/intrusive-collections/0.9.7/download"],
-        strip_prefix = "intrusive-collections-0.9.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.intrusive-collections-0.9.7.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__is_terminal_polyfill-1.70.1",
-        sha256 = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/is_terminal_polyfill/1.70.1/download"],
-        strip_prefix = "is_terminal_polyfill-1.70.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.is_terminal_polyfill-1.70.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__itertools-0.12.1",
-        sha256 = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/itertools/0.12.1/download"],
-        strip_prefix = "itertools-0.12.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.itertools-0.12.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__itertools-0.14.0",
-        sha256 = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/itertools/0.14.0/download"],
-        strip_prefix = "itertools-0.14.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.itertools-0.14.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__itoa-1.0.15",
-        sha256 = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/itoa/1.0.15/download"],
-        strip_prefix = "itoa-1.0.15",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.itoa-1.0.15.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__jobserver-0.1.34",
-        sha256 = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/jobserver/0.1.34/download"],
-        strip_prefix = "jobserver-0.1.34",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.jobserver-0.1.34.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__jod-thread-1.0.0",
-        sha256 = "a037eddb7d28de1d0fc42411f501b53b75838d313908078d6698d064f3029b24",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/jod-thread/1.0.0/download"],
-        strip_prefix = "jod-thread-1.0.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.jod-thread-1.0.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__js-sys-0.3.78",
-        sha256 = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/js-sys/0.3.78/download"],
-        strip_prefix = "js-sys-0.3.78",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.js-sys-0.3.78.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__kqueue-1.1.1",
-        sha256 = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/kqueue/1.1.1/download"],
-        strip_prefix = "kqueue-1.1.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.kqueue-1.1.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__kqueue-sys-1.0.4",
-        sha256 = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/kqueue-sys/1.0.4/download"],
-        strip_prefix = "kqueue-sys-1.0.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.kqueue-sys-1.0.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__la-arena-0.3.1",
-        sha256 = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/la-arena/0.3.1/download"],
-        strip_prefix = "la-arena-0.3.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.la-arena-0.3.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__lazy_static-1.5.0",
-        sha256 = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/lazy_static/1.5.0/download"],
-        strip_prefix = "lazy_static-1.5.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.lazy_static-1.5.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__libc-0.2.175",
-        sha256 = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/libc/0.2.175/download"],
-        strip_prefix = "libc-0.2.175",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.libc-0.2.175.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__line-index-0.1.2",
-        sha256 = "3e27e0ed5a392a7f5ba0b3808a2afccff16c64933312c84b57618b49d1209bd2",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/line-index/0.1.2/download"],
-        strip_prefix = "line-index-0.1.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.line-index-0.1.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__litemap-0.8.0",
-        sha256 = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/litemap/0.8.0/download"],
-        strip_prefix = "litemap-0.8.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.litemap-0.8.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__lock_api-0.4.13",
-        sha256 = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/lock_api/0.4.13/download"],
-        strip_prefix = "lock_api-0.4.13",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.lock_api-0.4.13.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__log-0.3.9",
-        sha256 = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/log/0.3.9/download"],
-        strip_prefix = "log-0.3.9",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.log-0.3.9.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__log-0.4.28",
-        sha256 = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/log/0.4.28/download"],
-        strip_prefix = "log-0.4.28",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.log-0.4.28.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__matchers-0.2.0",
-        sha256 = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/matchers/0.2.0/download"],
-        strip_prefix = "matchers-0.2.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.matchers-0.2.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__memchr-2.7.5",
-        sha256 = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/memchr/2.7.5/download"],
-        strip_prefix = "memchr-2.7.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.memchr-2.7.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__memoffset-0.9.1",
-        sha256 = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/memoffset/0.9.1/download"],
-        strip_prefix = "memoffset-0.9.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.memoffset-0.9.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__miniz_oxide-0.8.9",
-        sha256 = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/miniz_oxide/0.8.9/download"],
-        strip_prefix = "miniz_oxide-0.8.9",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.miniz_oxide-0.8.9.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__mio-1.0.4",
-        sha256 = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/mio/1.0.4/download"],
-        strip_prefix = "mio-1.0.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.mio-1.0.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__miow-0.6.1",
-        sha256 = "536bfad37a309d62069485248eeaba1e8d9853aaf951caaeaed0585a95346f08",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/miow/0.6.1/download"],
-        strip_prefix = "miow-0.6.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.miow-0.6.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__mustache-0.9.0",
-        sha256 = "51956ef1c5d20a1384524d91e616fb44dfc7d8f249bf696d49c97dd3289ecab5",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/mustache/0.9.0/download"],
-        strip_prefix = "mustache-0.9.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.mustache-0.9.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__nohash-hasher-0.2.0",
-        sha256 = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/nohash-hasher/0.2.0/download"],
-        strip_prefix = "nohash-hasher-0.2.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.nohash-hasher-0.2.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__notify-8.2.0",
-        sha256 = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/notify/8.2.0/download"],
-        strip_prefix = "notify-8.2.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.notify-8.2.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__notify-types-2.0.0",
-        sha256 = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/notify-types/2.0.0/download"],
-        strip_prefix = "notify-types-2.0.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.notify-types-2.0.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__nu-ansi-term-0.50.1",
-        sha256 = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/nu-ansi-term/0.50.1/download"],
-        strip_prefix = "nu-ansi-term-0.50.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.nu-ansi-term-0.50.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__num-conv-0.1.0",
-        sha256 = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/num-conv/0.1.0/download"],
-        strip_prefix = "num-conv-0.1.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.num-conv-0.1.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__num-traits-0.2.19",
-        sha256 = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/num-traits/0.2.19/download"],
-        strip_prefix = "num-traits-0.2.19",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.num-traits-0.2.19.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__num_cpus-1.17.0",
-        sha256 = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/num_cpus/1.17.0/download"],
-        strip_prefix = "num_cpus-1.17.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.num_cpus-1.17.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__once_cell-1.21.3",
-        sha256 = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/once_cell/1.21.3/download"],
-        strip_prefix = "once_cell-1.21.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.once_cell-1.21.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__once_cell_polyfill-1.70.1",
-        sha256 = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/once_cell_polyfill/1.70.1/download"],
-        strip_prefix = "once_cell_polyfill-1.70.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.once_cell_polyfill-1.70.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__oorandom-11.1.5",
-        sha256 = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/oorandom/11.1.5/download"],
-        strip_prefix = "oorandom-11.1.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.oorandom-11.1.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ordered-float-2.10.1",
-        sha256 = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ordered-float/2.10.1/download"],
-        strip_prefix = "ordered-float-2.10.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ordered-float-2.10.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__os_str_bytes-7.1.1",
-        sha256 = "63eceb7b5d757011a87d08eb2123db15d87fb0c281f65d101ce30a1e96c3ad5c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/os_str_bytes/7.1.1/download"],
-        strip_prefix = "os_str_bytes-7.1.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.os_str_bytes-7.1.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__papaya-0.2.3",
-        sha256 = "f92dd0b07c53a0a0c764db2ace8c541dc47320dad97c2200c2a637ab9dd2328f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/papaya/0.2.3/download"],
-        strip_prefix = "papaya-0.2.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.papaya-0.2.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__parking_lot-0.12.4",
-        sha256 = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/parking_lot/0.12.4/download"],
-        strip_prefix = "parking_lot-0.12.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot-0.12.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__parking_lot_core-0.9.11",
-        sha256 = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/parking_lot_core/0.9.11/download"],
-        strip_prefix = "parking_lot_core-0.9.11",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot_core-0.9.11.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__pear-0.2.9",
-        sha256 = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/pear/0.2.9/download"],
-        strip_prefix = "pear-0.2.9",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.pear-0.2.9.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__pear_codegen-0.2.9",
-        sha256 = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/pear_codegen/0.2.9/download"],
-        strip_prefix = "pear_codegen-0.2.9",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.pear_codegen-0.2.9.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__percent-encoding-2.3.2",
-        sha256 = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/percent-encoding/2.3.2/download"],
-        strip_prefix = "percent-encoding-2.3.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.percent-encoding-2.3.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__perf-event-0.4.7",
-        sha256 = "5396562cd2eaa828445d6d34258ae21ee1eb9d40fe626ca7f51c8dccb4af9d66",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/perf-event/0.4.7/download"],
-        strip_prefix = "perf-event-0.4.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.perf-event-0.4.7.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__perf-event-open-sys-1.0.1",
-        sha256 = "ce9bedf5da2c234fdf2391ede2b90fabf585355f33100689bc364a3ea558561a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/perf-event-open-sys/1.0.1/download"],
-        strip_prefix = "perf-event-open-sys-1.0.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.perf-event-open-sys-1.0.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__petgraph-0.6.5",
-        sha256 = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/petgraph/0.6.5/download"],
-        strip_prefix = "petgraph-0.6.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.petgraph-0.6.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__pin-project-lite-0.2.16",
-        sha256 = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/pin-project-lite/0.2.16/download"],
-        strip_prefix = "pin-project-lite-0.2.16",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.pin-project-lite-0.2.16.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__pkg-config-0.3.32",
-        sha256 = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/pkg-config/0.3.32/download"],
-        strip_prefix = "pkg-config-0.3.32",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.pkg-config-0.3.32.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__portable-atomic-1.11.1",
-        sha256 = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/portable-atomic/1.11.1/download"],
-        strip_prefix = "portable-atomic-1.11.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.portable-atomic-1.11.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__potential_utf-0.1.3",
-        sha256 = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/potential_utf/0.1.3/download"],
-        strip_prefix = "potential_utf-0.1.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.potential_utf-0.1.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__powerfmt-0.2.0",
-        sha256 = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/powerfmt/0.2.0/download"],
-        strip_prefix = "powerfmt-0.2.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.powerfmt-0.2.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ppv-lite86-0.2.21",
-        sha256 = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ppv-lite86/0.2.21/download"],
-        strip_prefix = "ppv-lite86-0.2.21",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ppv-lite86-0.2.21.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__proc-macro2-1.0.101",
-        sha256 = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/proc-macro2/1.0.101/download"],
-        strip_prefix = "proc-macro2-1.0.101",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.proc-macro2-1.0.101.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__proc-macro2-diagnostics-0.10.1",
-        sha256 = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/proc-macro2-diagnostics/0.10.1/download"],
-        strip_prefix = "proc-macro2-diagnostics-0.10.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.proc-macro2-diagnostics-0.10.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__quote-1.0.41",
-        sha256 = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/quote/1.0.41/download"],
-        strip_prefix = "quote-1.0.41",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.quote-1.0.41.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__r-efi-5.3.0",
-        sha256 = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/r-efi/5.3.0/download"],
-        strip_prefix = "r-efi-5.3.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.r-efi-5.3.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra-ap-rustc_abi-0.123.0",
-        sha256 = "f18c877575c259d127072e9bfc41d985202262fb4d6bfdae3d1252147c2562c2",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_abi/0.123.0/download"],
-        strip_prefix = "ra-ap-rustc_abi-0.123.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_abi-0.123.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra-ap-rustc_hashes-0.123.0",
-        sha256 = "2439ed1df3472443133b66949f81080dff88089b42f825761455463709ee1cad",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_hashes/0.123.0/download"],
-        strip_prefix = "ra-ap-rustc_hashes-0.123.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_hashes-0.123.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra-ap-rustc_index-0.123.0",
-        sha256 = "57a24fe0be21be1f8ebc21dcb40129214fb4cefb0f2753f3d46b6dbe656a1a45",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_index/0.123.0/download"],
-        strip_prefix = "ra-ap-rustc_index-0.123.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index-0.123.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra-ap-rustc_index_macros-0.123.0",
-        sha256 = "844a27ddcad0116facae2df8e741fd788662cf93dc13029cd864f2b8013b81f9",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_index_macros/0.123.0/download"],
-        strip_prefix = "ra-ap-rustc_index_macros-0.123.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index_macros-0.123.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra-ap-rustc_lexer-0.121.0",
-        sha256 = "22944e31fb91e9b3e75bcbc91e37d958b8c0825a6160927f2856831d2ce83b36",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_lexer/0.121.0/download"],
-        strip_prefix = "ra-ap-rustc_lexer-0.121.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_lexer-0.121.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra-ap-rustc_lexer-0.123.0",
-        sha256 = "2b734cfcb577d09877799a22742f1bd398be6c00bc428d9de56d48d11ece5771",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_lexer/0.123.0/download"],
-        strip_prefix = "ra-ap-rustc_lexer-0.123.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_lexer-0.123.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra-ap-rustc_parse_format-0.121.0",
-        sha256 = "81057891bc2063ad9e353f29462fbc47a0f5072560af34428ae9313aaa5e9d97",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_parse_format/0.121.0/download"],
-        strip_prefix = "ra-ap-rustc_parse_format-0.121.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_parse_format-0.121.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra-ap-rustc_pattern_analysis-0.123.0",
-        sha256 = "75b0ee1f059b9dea0818c6c7267478926eee95ba4c7dcf89c8db32fa165d3904",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_pattern_analysis/0.123.0/download"],
-        strip_prefix = "ra-ap-rustc_pattern_analysis-0.123.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_base_db-0.0.301",
-        sha256 = "e876bb2c3e52a8d4e6684526a2d4e81f9d028b939ee4dc5dc775fe10deb44d59",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_base_db/0.0.301/download"],
-        strip_prefix = "ra_ap_base_db-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_base_db-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_cfg-0.0.301",
-        sha256 = "3a0b56eb4536ce6d2431932c4d337aeeaf7bb22c9249b38cbe80677b5881228f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_cfg/0.0.301/download"],
-        strip_prefix = "ra_ap_cfg-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_cfg-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_edition-0.0.301",
-        sha256 = "1bdc6cbe42c63ca78611bae82bfc8db24864f33dccc813697c5fde43a0907285",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_edition/0.0.301/download"],
-        strip_prefix = "ra_ap_edition-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_edition-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_hir-0.0.301",
-        sha256 = "ebffdc134eccabc17209d7760cfff7fd12ed18ab6e21188c5e084b97aa38504c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir/0.0.301/download"],
-        strip_prefix = "ra_ap_hir-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_hir_def-0.0.301",
-        sha256 = "81d2337ef59550392d42aa997aa1105a3d6d1c2b3a583c777786bc4a0a074fd5",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir_def/0.0.301/download"],
-        strip_prefix = "ra_ap_hir_def-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_def-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_hir_expand-0.0.301",
-        sha256 = "97cf8ececb2743a819d8299a408e17f164dd1a1004d65936b3d5493b55330326",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir_expand/0.0.301/download"],
-        strip_prefix = "ra_ap_hir_expand-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_expand-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_hir_ty-0.0.301",
-        sha256 = "bc004e1099ba766a61500c27d34eb5cd336430d0a89a9620315a90d7a202a73a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir_ty/0.0.301/download"],
-        strip_prefix = "ra_ap_hir_ty-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_ty-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_ide_db-0.0.301",
-        sha256 = "d2acb572d6dbeb1c96d0339890ba91298b8f5f0ab22648da4ee2b4ab77dbc3fe",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_ide_db/0.0.301/download"],
-        strip_prefix = "ra_ap_ide_db-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_ide_db-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_intern-0.0.301",
-        sha256 = "14586c2c4781b69fdd0c505972d9bff8c162a8740537a3ee506faff686d9a20d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_intern/0.0.301/download"],
-        strip_prefix = "ra_ap_intern-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_intern-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_load-cargo-0.0.301",
-        sha256 = "50ce5546b3e3414507ab4d12348d0a28748062e33a1448895c68466d0b015503",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_load-cargo/0.0.301/download"],
-        strip_prefix = "ra_ap_load-cargo-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_load-cargo-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_mbe-0.0.301",
-        sha256 = "67333c6405797cb64aafb994b9a179157b30beeda2352e203e800be2b184a22d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_mbe/0.0.301/download"],
-        strip_prefix = "ra_ap_mbe-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_mbe-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_parser-0.0.301",
-        sha256 = "3a3b92b8b147c0826b83e70ad44e3c98e94201fc93e1f09396c43b4d7958c22a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_parser/0.0.301/download"],
-        strip_prefix = "ra_ap_parser-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_parser-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_paths-0.0.301",
-        sha256 = "d4991f3d57fac0def7822bebfeb159c8d7b58c824bf82044b765c54f2c0971e2",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_paths/0.0.301/download"],
-        strip_prefix = "ra_ap_paths-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_paths-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_proc_macro_api-0.0.301",
-        sha256 = "45db9e2df587d56f0738afa89fb2c100ff7c1e9cbe49e07f6a8b62342832211b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_proc_macro_api/0.0.301/download"],
-        strip_prefix = "ra_ap_proc_macro_api-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_proc_macro_api-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_profile-0.0.301",
-        sha256 = "19981637b8ee4160e228c815a7fef3944b5c0555d6af41a931be92d68978bc6c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_profile/0.0.301/download"],
-        strip_prefix = "ra_ap_profile-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_profile-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_project_model-0.0.301",
-        sha256 = "5bda0769fd6ca949fdd5917acb68ddc2c143745614ddd94ef38b376838611cf8",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_project_model/0.0.301/download"],
-        strip_prefix = "ra_ap_project_model-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_project_model-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_query-group-macro-0.0.301",
-        sha256 = "5f182a4b05f004eabaa83250a5de7ea3a13a92c88f3cbe98bfa1880cd9fbce0a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_query-group-macro/0.0.301/download"],
-        strip_prefix = "ra_ap_query-group-macro-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_query-group-macro-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_span-0.0.301",
-        sha256 = "ca6f9fa2de07f5cccf431674b90e82c1fe1ea2339db3b3869eec44d135de09a4",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_span/0.0.301/download"],
-        strip_prefix = "ra_ap_span-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_span-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_stdx-0.0.301",
-        sha256 = "aa770adb32896fcba934b464ac3bd179163ba2b0766e275eed5b4e262e08492b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_stdx/0.0.301/download"],
-        strip_prefix = "ra_ap_stdx-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_stdx-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_syntax-0.0.301",
-        sha256 = "6e9e1393281ad5c635239d353ed3cfbf28c8d0af03d0c61a3b24b31d1143b17f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_syntax/0.0.301/download"],
-        strip_prefix = "ra_ap_syntax-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_syntax-bridge-0.0.301",
-        sha256 = "684e6ff1008ee5340335888f0453d94bb38950f110059a51f1818c7f6a56a807",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_syntax-bridge/0.0.301/download"],
-        strip_prefix = "ra_ap_syntax-bridge-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-bridge-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_toolchain-0.0.301",
-        sha256 = "61969c5f72af03a9837e077c2d939d87a5c863623725c461777c352664a3bb03",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_toolchain/0.0.301/download"],
-        strip_prefix = "ra_ap_toolchain-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_toolchain-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_tt-0.0.301",
-        sha256 = "fb87c7b35572c18a580ea811e970b94875fad5ac7cfa8644266a59081044f959",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_tt/0.0.301/download"],
-        strip_prefix = "ra_ap_tt-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_tt-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_vfs-0.0.301",
-        sha256 = "6c174d6b9b7a7f54687df7e00c3e75ed6f082a7943a9afb1d54f33c0c12773de",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_vfs/0.0.301/download"],
-        strip_prefix = "ra_ap_vfs-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ra_ap_vfs-notify-0.0.301",
-        sha256 = "04f6fce8d47c7ce9b8f2cd0e5a55f8fc4878d6043e61f46cde4391d3a5c6086f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_vfs-notify/0.0.301/download"],
-        strip_prefix = "ra_ap_vfs-notify-0.0.301",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-notify-0.0.301.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rand-0.9.2",
-        sha256 = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rand/0.9.2/download"],
-        strip_prefix = "rand-0.9.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand-0.9.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rand_chacha-0.9.0",
-        sha256 = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rand_chacha/0.9.0/download"],
-        strip_prefix = "rand_chacha-0.9.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand_chacha-0.9.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rand_core-0.9.3",
-        sha256 = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rand_core/0.9.3/download"],
-        strip_prefix = "rand_core-0.9.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand_core-0.9.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rayon-1.11.0",
-        sha256 = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rayon/1.11.0/download"],
-        strip_prefix = "rayon-1.11.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rayon-1.11.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rayon-core-1.13.0",
-        sha256 = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rayon-core/1.13.0/download"],
-        strip_prefix = "rayon-core-1.13.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rayon-core-1.13.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__redox_syscall-0.5.17",
-        sha256 = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/redox_syscall/0.5.17/download"],
-        strip_prefix = "redox_syscall-0.5.17",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.redox_syscall-0.5.17.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ref-cast-1.0.24",
-        sha256 = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ref-cast/1.0.24/download"],
-        strip_prefix = "ref-cast-1.0.24",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ref-cast-1.0.24.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ref-cast-impl-1.0.24",
-        sha256 = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ref-cast-impl/1.0.24/download"],
-        strip_prefix = "ref-cast-impl-1.0.24",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ref-cast-impl-1.0.24.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__regex-1.11.3",
-        sha256 = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex/1.11.3/download"],
-        strip_prefix = "regex-1.11.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-1.11.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__regex-automata-0.4.11",
-        sha256 = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex-automata/0.4.11/download"],
-        strip_prefix = "regex-automata-0.4.11",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-automata-0.4.11.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__regex-syntax-0.8.6",
-        sha256 = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex-syntax/0.8.6/download"],
-        strip_prefix = "regex-syntax-0.8.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-syntax-0.8.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rowan-0.15.15",
-        sha256 = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rowan/0.15.15/download"],
-        strip_prefix = "rowan-0.15.15",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rowan-0.15.15.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rustc-hash-1.1.0",
-        sha256 = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rustc-hash/1.1.0/download"],
-        strip_prefix = "rustc-hash-1.1.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-hash-1.1.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rustc-hash-2.1.1",
-        sha256 = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rustc-hash/2.1.1/download"],
-        strip_prefix = "rustc-hash-2.1.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-hash-2.1.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rustc-literal-escaper-0.0.4",
-        sha256 = "ab03008eb631b703dd16978282ae36c73282e7922fe101a4bd072a40ecea7b8b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rustc-literal-escaper/0.0.4/download"],
-        strip_prefix = "rustc-literal-escaper-0.0.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-literal-escaper-0.0.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rustc-stable-hash-0.1.2",
-        sha256 = "781442f29170c5c93b7185ad559492601acdc71d5bb0706f5868094f45cfcd08",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rustc-stable-hash/0.1.2/download"],
-        strip_prefix = "rustc-stable-hash-0.1.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-stable-hash-0.1.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab",
-        sha256 = "486c2179b4796f65bfe2ee33679acf0927ac83ecf583ad6c91c3b4570911b9ad",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rustc_apfloat/0.2.3+llvm-462a31f5a5ab/download"],
-        strip_prefix = "rustc_apfloat-0.2.3+llvm-462a31f5a5ab",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rustversion-1.0.22",
-        sha256 = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rustversion/1.0.22/download"],
-        strip_prefix = "rustversion-1.0.22",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustversion-1.0.22.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ryu-1.0.20",
-        sha256 = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ryu/1.0.20/download"],
-        strip_prefix = "ryu-1.0.20",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ryu-1.0.20.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__salsa-0.23.0",
-        sha256 = "2e235afdb8e510f38a07138fbe5a0b64691894358a9c0cbd813b1aade110efc9",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/salsa/0.23.0/download"],
-        strip_prefix = "salsa-0.23.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-0.23.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__salsa-macro-rules-0.23.0",
-        sha256 = "2edb86a7e9c91f6d30c9ce054312721dbe773a162db27bbfae834d16177b30ce",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/salsa-macro-rules/0.23.0/download"],
-        strip_prefix = "salsa-macro-rules-0.23.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macro-rules-0.23.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__salsa-macros-0.23.0",
-        sha256 = "d0778d6e209051bc4e75acfe83bcd7848601ec3dbe9c3dbb982829020e9128af",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/salsa-macros/0.23.0/download"],
-        strip_prefix = "salsa-macros-0.23.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macros-0.23.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__same-file-1.0.6",
-        sha256 = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/same-file/1.0.6/download"],
-        strip_prefix = "same-file-1.0.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.same-file-1.0.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__schemars-0.9.0",
-        sha256 = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/schemars/0.9.0/download"],
-        strip_prefix = "schemars-0.9.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.schemars-0.9.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__schemars-1.0.4",
-        sha256 = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/schemars/1.0.4/download"],
-        strip_prefix = "schemars-1.0.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.schemars-1.0.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__scoped-tls-1.0.1",
-        sha256 = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/scoped-tls/1.0.1/download"],
-        strip_prefix = "scoped-tls-1.0.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.scoped-tls-1.0.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__scopeguard-1.2.0",
-        sha256 = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/scopeguard/1.2.0/download"],
-        strip_prefix = "scopeguard-1.2.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.scopeguard-1.2.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__seize-0.5.0",
-        sha256 = "e4b8d813387d566f627f3ea1b914c068aac94c40ae27ec43f5f33bde65abefe7",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/seize/0.5.0/download"],
-        strip_prefix = "seize-0.5.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.seize-0.5.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__semver-1.0.28",
-        sha256 = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/semver/1.0.28/download"],
-        strip_prefix = "semver-1.0.28",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.semver-1.0.28.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__serde-1.0.228",
-        sha256 = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde/1.0.228/download"],
-        strip_prefix = "serde-1.0.228",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde-1.0.228.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__serde-untagged-0.1.8",
-        sha256 = "34836a629bcbc6f1afdf0907a744870039b1e14c0561cb26094fa683b158eff3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde-untagged/0.1.8/download"],
-        strip_prefix = "serde-untagged-0.1.8",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde-untagged-0.1.8.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__serde-value-0.7.0",
-        sha256 = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde-value/0.7.0/download"],
-        strip_prefix = "serde-value-0.7.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde-value-0.7.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__serde_core-1.0.228",
-        sha256 = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_core/1.0.228/download"],
-        strip_prefix = "serde_core-1.0.228",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_core-1.0.228.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__serde_derive-1.0.228",
-        sha256 = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_derive/1.0.228/download"],
-        strip_prefix = "serde_derive-1.0.228",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_derive-1.0.228.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__serde_json-1.0.145",
-        sha256 = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_json/1.0.145/download"],
-        strip_prefix = "serde_json-1.0.145",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_json-1.0.145.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__serde_spanned-0.6.9",
-        sha256 = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_spanned/0.6.9/download"],
-        strip_prefix = "serde_spanned-0.6.9",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_spanned-0.6.9.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__serde_spanned-1.0.2",
-        sha256 = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_spanned/1.0.2/download"],
-        strip_prefix = "serde_spanned-1.0.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_spanned-1.0.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__serde_with-3.14.1",
-        sha256 = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_with/3.14.1/download"],
-        strip_prefix = "serde_with-3.14.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with-3.14.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__serde_with_macros-3.14.1",
-        sha256 = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_with_macros/3.14.1/download"],
-        strip_prefix = "serde_with_macros-3.14.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with_macros-3.14.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__serde_yaml-0.9.34-deprecated",
-        sha256 = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_yaml/0.9.34+deprecated/download"],
-        strip_prefix = "serde_yaml-0.9.34+deprecated",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_yaml-0.9.34+deprecated.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__sharded-slab-0.1.7",
-        sha256 = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/sharded-slab/0.1.7/download"],
-        strip_prefix = "sharded-slab-0.1.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.sharded-slab-0.1.7.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__shlex-1.3.0",
-        sha256 = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/shlex/1.3.0/download"],
-        strip_prefix = "shlex-1.3.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.shlex-1.3.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__smallvec-1.15.1",
-        sha256 = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/smallvec/1.15.1/download"],
-        strip_prefix = "smallvec-1.15.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.smallvec-1.15.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__smol_str-0.3.2",
-        sha256 = "9676b89cd56310a87b93dec47b11af744f34d5fc9f367b829474eec0a891350d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/smol_str/0.3.2/download"],
-        strip_prefix = "smol_str-0.3.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.smol_str-0.3.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__stable_deref_trait-1.2.0",
-        sha256 = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/stable_deref_trait/1.2.0/download"],
-        strip_prefix = "stable_deref_trait-1.2.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.stable_deref_trait-1.2.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__streaming-iterator-0.1.9",
-        sha256 = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/streaming-iterator/0.1.9/download"],
-        strip_prefix = "streaming-iterator-0.1.9",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.streaming-iterator-0.1.9.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__strsim-0.11.1",
-        sha256 = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/strsim/0.11.1/download"],
-        strip_prefix = "strsim-0.11.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.strsim-0.11.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__syn-2.0.106",
-        sha256 = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/syn/2.0.106/download"],
-        strip_prefix = "syn-2.0.106",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.syn-2.0.106.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__synstructure-0.13.2",
-        sha256 = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/synstructure/0.13.2/download"],
-        strip_prefix = "synstructure-0.13.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.synstructure-0.13.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__temp-dir-0.1.16",
-        sha256 = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/temp-dir/0.1.16/download"],
-        strip_prefix = "temp-dir-0.1.16",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.temp-dir-0.1.16.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__text-size-1.1.1",
-        sha256 = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/text-size/1.1.1/download"],
-        strip_prefix = "text-size-1.1.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.text-size-1.1.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__thin-vec-0.2.14",
-        sha256 = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/thin-vec/0.2.14/download"],
-        strip_prefix = "thin-vec-0.2.14",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thin-vec-0.2.14.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__thiserror-2.0.18",
-        sha256 = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/thiserror/2.0.18/download"],
-        strip_prefix = "thiserror-2.0.18",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-2.0.18.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__thiserror-impl-2.0.18",
-        sha256 = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/thiserror-impl/2.0.18/download"],
-        strip_prefix = "thiserror-impl-2.0.18",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-impl-2.0.18.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__thread_local-1.1.9",
-        sha256 = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/thread_local/1.1.9/download"],
-        strip_prefix = "thread_local-1.1.9",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thread_local-1.1.9.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__time-0.3.43",
-        sha256 = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/time/0.3.43/download"],
-        strip_prefix = "time-0.3.43",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-0.3.43.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__time-core-0.1.6",
-        sha256 = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/time-core/0.1.6/download"],
-        strip_prefix = "time-core-0.1.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-core-0.1.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__time-macros-0.2.24",
-        sha256 = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/time-macros/0.2.24/download"],
-        strip_prefix = "time-macros-0.2.24",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-macros-0.2.24.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tinystr-0.8.1",
-        sha256 = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tinystr/0.8.1/download"],
-        strip_prefix = "tinystr-0.8.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tinystr-0.8.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__toml-0.8.23",
-        sha256 = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/toml/0.8.23/download"],
-        strip_prefix = "toml-0.8.23",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml-0.8.23.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__toml-0.9.7",
-        sha256 = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/toml/0.9.7/download"],
-        strip_prefix = "toml-0.9.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml-0.9.7.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__toml_datetime-0.6.11",
-        sha256 = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/toml_datetime/0.6.11/download"],
-        strip_prefix = "toml_datetime-0.6.11",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_datetime-0.6.11.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__toml_datetime-0.7.2",
-        sha256 = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/toml_datetime/0.7.2/download"],
-        strip_prefix = "toml_datetime-0.7.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_datetime-0.7.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__toml_edit-0.22.27",
-        sha256 = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/toml_edit/0.22.27/download"],
-        strip_prefix = "toml_edit-0.22.27",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_edit-0.22.27.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__toml_parser-1.1.2-spec-1.1.0",
-        sha256 = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/toml_parser/1.1.2+spec-1.1.0/download"],
-        strip_prefix = "toml_parser-1.1.2+spec-1.1.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_parser-1.1.2+spec-1.1.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__toml_write-0.1.2",
-        sha256 = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/toml_write/0.1.2/download"],
-        strip_prefix = "toml_write-0.1.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_write-0.1.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__toml_writer-1.0.3",
-        sha256 = "d163a63c116ce562a22cda521fcc4d79152e7aba014456fb5eb442f6d6a10109",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/toml_writer/1.0.3/download"],
-        strip_prefix = "toml_writer-1.0.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_writer-1.0.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tracing-0.1.41",
-        sha256 = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tracing/0.1.41/download"],
-        strip_prefix = "tracing-0.1.41",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-0.1.41.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tracing-attributes-0.1.30",
-        sha256 = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tracing-attributes/0.1.30/download"],
-        strip_prefix = "tracing-attributes-0.1.30",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-attributes-0.1.30.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tracing-core-0.1.34",
-        sha256 = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tracing-core/0.1.34/download"],
-        strip_prefix = "tracing-core-0.1.34",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-core-0.1.34.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tracing-flame-0.2.0",
-        sha256 = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tracing-flame/0.2.0/download"],
-        strip_prefix = "tracing-flame-0.2.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-flame-0.2.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tracing-log-0.2.0",
-        sha256 = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tracing-log/0.2.0/download"],
-        strip_prefix = "tracing-log-0.2.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-log-0.2.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tracing-subscriber-0.3.20",
-        sha256 = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tracing-subscriber/0.3.20/download"],
-        strip_prefix = "tracing-subscriber-0.3.20",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-subscriber-0.3.20.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tree-sitter-0.26.8",
-        sha256 = "887bd495d0582c5e3e0d8ece2233666169fa56a9644d172fc22ad179ab2d0538",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter/0.26.8/download"],
-        strip_prefix = "tree-sitter-0.26.8",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-0.26.8.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tree-sitter-embedded-template-0.25.0",
-        sha256 = "833d528e8fcb4e49ddb04d4d6450ddb8ac08f282a58fec94ce981c9c5dbf7e3a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter-embedded-template/0.25.0/download"],
-        strip_prefix = "tree-sitter-embedded-template-0.25.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-embedded-template-0.25.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tree-sitter-json-0.24.8",
-        sha256 = "4d727acca406c0020cffc6cf35516764f36c8e3dc4408e5ebe2cb35a947ec471",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter-json/0.24.8/download"],
-        strip_prefix = "tree-sitter-json-0.24.8",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-json-0.24.8.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tree-sitter-language-0.1.5",
-        sha256 = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter-language/0.1.5/download"],
-        strip_prefix = "tree-sitter-language-0.1.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-language-0.1.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tree-sitter-python-0.23.6",
-        sha256 = "3d065aaa27f3aaceaf60c1f0e0ac09e1cb9eb8ed28e7bcdaa52129cffc7f4b04",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter-python/0.23.6/download"],
-        strip_prefix = "tree-sitter-python-0.23.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-python-0.23.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tree-sitter-ql-0.23.1",
-        sha256 = "80b7bcaf39acefbb199417a6ec2fd0c038083ba115da3e4f4426c820dc76d386",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter-ql/0.23.1/download"],
-        strip_prefix = "tree-sitter-ql-0.23.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-ql-0.23.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__tree-sitter-ruby-0.23.1",
-        sha256 = "be0484ea4ef6bb9c575b4fdabde7e31340a8d2dbc7d52b321ac83da703249f95",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter-ruby/0.23.1/download"],
-        strip_prefix = "tree-sitter-ruby-0.23.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-ruby-0.23.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__triomphe-0.1.14",
-        sha256 = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/triomphe/0.1.14/download"],
-        strip_prefix = "triomphe-0.1.14",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.triomphe-0.1.14.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__typed-arena-2.0.2",
-        sha256 = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/typed-arena/2.0.2/download"],
-        strip_prefix = "typed-arena-2.0.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.typed-arena-2.0.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__typeid-1.0.3",
-        sha256 = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/typeid/1.0.3/download"],
-        strip_prefix = "typeid-1.0.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.typeid-1.0.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__uncased-0.9.10",
-        sha256 = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/uncased/0.9.10/download"],
-        strip_prefix = "uncased-0.9.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.uncased-0.9.10.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__ungrammar-1.16.1",
-        sha256 = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ungrammar/1.16.1/download"],
-        strip_prefix = "ungrammar-1.16.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ungrammar-1.16.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__unicode-ident-1.0.19",
-        sha256 = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/unicode-ident/1.0.19/download"],
-        strip_prefix = "unicode-ident-1.0.19",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-ident-1.0.19.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__unicode-properties-0.1.3",
-        sha256 = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/unicode-properties/0.1.3/download"],
-        strip_prefix = "unicode-properties-0.1.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-properties-0.1.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__unicode-xid-0.2.6",
-        sha256 = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/unicode-xid/0.2.6/download"],
-        strip_prefix = "unicode-xid-0.2.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-xid-0.2.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__unsafe-libyaml-0.2.11",
-        sha256 = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/unsafe-libyaml/0.2.11/download"],
-        strip_prefix = "unsafe-libyaml-0.2.11",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unsafe-libyaml-0.2.11.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__url-2.5.7",
-        sha256 = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/url/2.5.7/download"],
-        strip_prefix = "url-2.5.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.url-2.5.7.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__utf8_iter-1.0.4",
-        sha256 = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/utf8_iter/1.0.4/download"],
-        strip_prefix = "utf8_iter-1.0.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.utf8_iter-1.0.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__utf8parse-0.2.2",
-        sha256 = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/utf8parse/0.2.2/download"],
-        strip_prefix = "utf8parse-0.2.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.utf8parse-0.2.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__valuable-0.1.1",
-        sha256 = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/valuable/0.1.1/download"],
-        strip_prefix = "valuable-0.1.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.valuable-0.1.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__version_check-0.9.5",
-        sha256 = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/version_check/0.9.5/download"],
-        strip_prefix = "version_check-0.9.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.version_check-0.9.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__walkdir-2.5.0",
-        sha256 = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/walkdir/2.5.0/download"],
-        strip_prefix = "walkdir-2.5.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.walkdir-2.5.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__wasi-0.11.1-wasi-snapshot-preview1",
-        sha256 = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasi/0.11.1+wasi-snapshot-preview1/download"],
-        strip_prefix = "wasi-0.11.1+wasi-snapshot-preview1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__wasi-0.14.5-wasi-0.2.4",
-        sha256 = "a4494f6290a82f5fe584817a676a34b9d6763e8d9d18204009fb31dceca98fd4",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasi/0.14.5+wasi-0.2.4/download"],
-        strip_prefix = "wasi-0.14.5+wasi-0.2.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasi-0.14.5+wasi-0.2.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__wasip2-1.0.0-wasi-0.2.4",
-        sha256 = "03fa2761397e5bd52002cd7e73110c71af2109aca4e521a9f40473fe685b0a24",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasip2/1.0.0+wasi-0.2.4/download"],
-        strip_prefix = "wasip2-1.0.0+wasi-0.2.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasip2-1.0.0+wasi-0.2.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__wasm-bindgen-0.2.101",
-        sha256 = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen/0.2.101/download"],
-        strip_prefix = "wasm-bindgen-0.2.101",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-0.2.101.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__wasm-bindgen-backend-0.2.101",
-        sha256 = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen-backend/0.2.101/download"],
-        strip_prefix = "wasm-bindgen-backend-0.2.101",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-backend-0.2.101.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__wasm-bindgen-macro-0.2.101",
-        sha256 = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen-macro/0.2.101/download"],
-        strip_prefix = "wasm-bindgen-macro-0.2.101",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-0.2.101.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__wasm-bindgen-macro-support-0.2.101",
-        sha256 = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen-macro-support/0.2.101/download"],
-        strip_prefix = "wasm-bindgen-macro-support-0.2.101",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-support-0.2.101.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__wasm-bindgen-shared-0.2.101",
-        sha256 = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen-shared/0.2.101/download"],
-        strip_prefix = "wasm-bindgen-shared-0.2.101",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-shared-0.2.101.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__winapi-util-0.1.11",
-        sha256 = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/winapi-util/0.1.11/download"],
-        strip_prefix = "winapi-util-0.1.11",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winapi-util-0.1.11.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows-core-0.61.2",
-        sha256 = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-core/0.61.2/download"],
-        strip_prefix = "windows-core-0.61.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-core-0.61.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows-implement-0.60.0",
-        sha256 = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-implement/0.60.0/download"],
-        strip_prefix = "windows-implement-0.60.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-implement-0.60.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows-interface-0.59.1",
-        sha256 = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-interface/0.59.1/download"],
-        strip_prefix = "windows-interface-0.59.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-interface-0.59.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows-link-0.1.3",
-        sha256 = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-link/0.1.3/download"],
-        strip_prefix = "windows-link-0.1.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-link-0.1.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows-link-0.2.0",
-        sha256 = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-link/0.2.0/download"],
-        strip_prefix = "windows-link-0.2.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-link-0.2.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows-result-0.3.4",
-        sha256 = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-result/0.3.4/download"],
-        strip_prefix = "windows-result-0.3.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-result-0.3.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows-strings-0.4.2",
-        sha256 = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-strings/0.4.2/download"],
-        strip_prefix = "windows-strings-0.4.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-strings-0.4.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows-sys-0.52.0",
-        sha256 = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-sys/0.52.0/download"],
-        strip_prefix = "windows-sys-0.52.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-sys-0.52.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows-sys-0.59.0",
-        sha256 = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-sys/0.59.0/download"],
-        strip_prefix = "windows-sys-0.59.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-sys-0.59.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows-sys-0.60.2",
-        sha256 = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-sys/0.60.2/download"],
-        strip_prefix = "windows-sys-0.60.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-sys-0.60.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows-sys-0.61.0",
-        sha256 = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-sys/0.61.0/download"],
-        strip_prefix = "windows-sys-0.61.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-sys-0.61.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows-targets-0.52.6",
-        sha256 = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-targets/0.52.6/download"],
-        strip_prefix = "windows-targets-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-targets-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows-targets-0.53.3",
-        sha256 = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-targets/0.53.3/download"],
-        strip_prefix = "windows-targets-0.53.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-targets-0.53.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_aarch64_gnullvm-0.52.6",
-        sha256 = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_aarch64_gnullvm/0.52.6/download"],
-        strip_prefix = "windows_aarch64_gnullvm-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_gnullvm-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_aarch64_gnullvm-0.53.0",
-        sha256 = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_aarch64_gnullvm/0.53.0/download"],
-        strip_prefix = "windows_aarch64_gnullvm-0.53.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_gnullvm-0.53.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_aarch64_msvc-0.52.6",
-        sha256 = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_aarch64_msvc/0.52.6/download"],
-        strip_prefix = "windows_aarch64_msvc-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_msvc-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_aarch64_msvc-0.53.0",
-        sha256 = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_aarch64_msvc/0.53.0/download"],
-        strip_prefix = "windows_aarch64_msvc-0.53.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_msvc-0.53.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_i686_gnu-0.52.6",
-        sha256 = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_i686_gnu/0.52.6/download"],
-        strip_prefix = "windows_i686_gnu-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_gnu-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_i686_gnu-0.53.0",
-        sha256 = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_i686_gnu/0.53.0/download"],
-        strip_prefix = "windows_i686_gnu-0.53.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_gnu-0.53.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_i686_gnullvm-0.52.6",
-        sha256 = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_i686_gnullvm/0.52.6/download"],
-        strip_prefix = "windows_i686_gnullvm-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_gnullvm-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_i686_gnullvm-0.53.0",
-        sha256 = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_i686_gnullvm/0.53.0/download"],
-        strip_prefix = "windows_i686_gnullvm-0.53.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_gnullvm-0.53.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_i686_msvc-0.52.6",
-        sha256 = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_i686_msvc/0.52.6/download"],
-        strip_prefix = "windows_i686_msvc-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_msvc-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_i686_msvc-0.53.0",
-        sha256 = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_i686_msvc/0.53.0/download"],
-        strip_prefix = "windows_i686_msvc-0.53.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_msvc-0.53.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_x86_64_gnu-0.52.6",
-        sha256 = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_x86_64_gnu/0.52.6/download"],
-        strip_prefix = "windows_x86_64_gnu-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnu-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_x86_64_gnu-0.53.0",
-        sha256 = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_x86_64_gnu/0.53.0/download"],
-        strip_prefix = "windows_x86_64_gnu-0.53.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnu-0.53.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_x86_64_gnullvm-0.52.6",
-        sha256 = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_x86_64_gnullvm/0.52.6/download"],
-        strip_prefix = "windows_x86_64_gnullvm-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnullvm-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_x86_64_gnullvm-0.53.0",
-        sha256 = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_x86_64_gnullvm/0.53.0/download"],
-        strip_prefix = "windows_x86_64_gnullvm-0.53.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnullvm-0.53.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_x86_64_msvc-0.52.6",
-        sha256 = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_x86_64_msvc/0.52.6/download"],
-        strip_prefix = "windows_x86_64_msvc-0.52.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_msvc-0.52.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_x86_64_msvc-0.53.0",
-        sha256 = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_x86_64_msvc/0.53.0/download"],
-        strip_prefix = "windows_x86_64_msvc-0.53.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_msvc-0.53.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__winnow-0.7.13",
-        sha256 = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/winnow/0.7.13/download"],
-        strip_prefix = "winnow-0.7.13",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winnow-0.7.13.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__winnow-1.0.2",
-        sha256 = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/winnow/1.0.2/download"],
-        strip_prefix = "winnow-1.0.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winnow-1.0.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__wit-bindgen-0.45.1",
-        sha256 = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wit-bindgen/0.45.1/download"],
-        strip_prefix = "wit-bindgen-0.45.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wit-bindgen-0.45.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__writeable-0.6.1",
-        sha256 = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/writeable/0.6.1/download"],
-        strip_prefix = "writeable-0.6.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.writeable-0.6.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__yansi-1.0.1",
-        sha256 = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/yansi/1.0.1/download"],
-        strip_prefix = "yansi-1.0.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.yansi-1.0.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__yoke-0.8.0",
-        sha256 = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/yoke/0.8.0/download"],
-        strip_prefix = "yoke-0.8.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.yoke-0.8.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__yoke-derive-0.8.0",
-        sha256 = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/yoke-derive/0.8.0/download"],
-        strip_prefix = "yoke-derive-0.8.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.yoke-derive-0.8.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__zerocopy-0.8.27",
-        sha256 = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerocopy/0.8.27/download"],
-        strip_prefix = "zerocopy-0.8.27",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-0.8.27.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__zerocopy-derive-0.8.27",
-        sha256 = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerocopy-derive/0.8.27/download"],
-        strip_prefix = "zerocopy-derive-0.8.27",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-derive-0.8.27.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__zerofrom-0.1.6",
-        sha256 = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerofrom/0.1.6/download"],
-        strip_prefix = "zerofrom-0.1.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerofrom-0.1.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__zerofrom-derive-0.1.6",
-        sha256 = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerofrom-derive/0.1.6/download"],
-        strip_prefix = "zerofrom-derive-0.1.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerofrom-derive-0.1.6.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__zerotrie-0.2.2",
-        sha256 = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerotrie/0.2.2/download"],
-        strip_prefix = "zerotrie-0.2.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerotrie-0.2.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__zerovec-0.11.4",
-        sha256 = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerovec/0.11.4/download"],
-        strip_prefix = "zerovec-0.11.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerovec-0.11.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__zerovec-derive-0.11.1",
-        sha256 = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerovec-derive/0.11.1/download"],
-        strip_prefix = "zerovec-derive-0.11.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerovec-derive-0.11.1.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__zstd-0.13.3",
-        sha256 = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zstd/0.13.3/download"],
-        strip_prefix = "zstd-0.13.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zstd-0.13.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__zstd-safe-7.2.4",
-        sha256 = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zstd-safe/7.2.4/download"],
-        strip_prefix = "zstd-safe-7.2.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zstd-safe-7.2.4.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__zstd-sys-2.0.16-zstd.1.5.7",
-        sha256 = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zstd-sys/2.0.16+zstd.1.5.7/download"],
-        strip_prefix = "zstd-sys-2.0.16+zstd.1.5.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zstd-sys-2.0.16+zstd.1.5.7.bazel"),
-    )
-
-    return [
-        struct(repo = "vendor_ts__anyhow-1.0.100", is_dev_dep = False),
-        struct(repo = "vendor_ts__argfile-0.2.1", is_dev_dep = False),
-        struct(repo = "vendor_ts__chalk-ir-0.104.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__chrono-0.4.42", is_dev_dep = False),
-        struct(repo = "vendor_ts__clap-4.5.48", is_dev_dep = False),
-        struct(repo = "vendor_ts__dunce-1.0.5", is_dev_dep = False),
-        struct(repo = "vendor_ts__either-1.15.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__encoding-0.2.33", is_dev_dep = False),
-        struct(repo = "vendor_ts__figment-0.10.19", is_dev_dep = False),
-        struct(repo = "vendor_ts__flate2-1.1.2", is_dev_dep = False),
-        struct(repo = "vendor_ts__glob-0.3.3", is_dev_dep = False),
-        struct(repo = "vendor_ts__globset-0.4.16", is_dev_dep = False),
-        struct(repo = "vendor_ts__itertools-0.14.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__lazy_static-1.5.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__mustache-0.9.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__num-traits-0.2.19", is_dev_dep = False),
-        struct(repo = "vendor_ts__num_cpus-1.17.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__proc-macro2-1.0.101", is_dev_dep = False),
-        struct(repo = "vendor_ts__quote-1.0.41", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_base_db-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_cfg-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_hir-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_hir_def-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_hir_expand-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_hir_ty-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_ide_db-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_intern-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_load-cargo-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_parser-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_paths-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_project_model-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_span-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_stdx-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_syntax-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_vfs-0.0.301", is_dev_dep = False),
-        struct(repo = "vendor_ts__rayon-1.11.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__regex-1.11.3", is_dev_dep = False),
-        struct(repo = "vendor_ts__serde-1.0.228", is_dev_dep = False),
-        struct(repo = "vendor_ts__serde_json-1.0.145", is_dev_dep = False),
-        struct(repo = "vendor_ts__serde_with-3.14.1", is_dev_dep = False),
-        struct(repo = "vendor_ts__serde_yaml-0.9.34-deprecated", is_dev_dep = False),
-        struct(repo = "vendor_ts__syn-2.0.106", is_dev_dep = False),
-        struct(repo = "vendor_ts__toml-0.9.7", is_dev_dep = False),
-        struct(repo = "vendor_ts__tracing-0.1.41", is_dev_dep = False),
-        struct(repo = "vendor_ts__tracing-flame-0.2.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__tracing-subscriber-0.3.20", is_dev_dep = False),
-        struct(repo = "vendor_ts__tree-sitter-0.26.8", is_dev_dep = False),
-        struct(repo = "vendor_ts__tree-sitter-embedded-template-0.25.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__tree-sitter-python-0.23.6", is_dev_dep = False),
-        struct(repo = "vendor_ts__tree-sitter-ruby-0.23.1", is_dev_dep = False),
-        struct(repo = "vendor_ts__triomphe-0.1.14", is_dev_dep = False),
-        struct(repo = "vendor_ts__ungrammar-1.16.1", is_dev_dep = False),
-        struct(repo = "vendor_ts__zstd-0.13.3", is_dev_dep = False),
-        struct(repo = "vendor_ts__rand-0.9.2", is_dev_dep = True),
-        struct(repo = "vendor_ts__tree-sitter-json-0.24.8", is_dev_dep = True),
-        struct(repo = "vendor_ts__tree-sitter-ql-0.23.1", is_dev_dep = True),
-    ]
+"""Deprecated: re-exports the crate_universe macros from `:crates.bzl`."""
+
+load(
+    ":crates.bzl",
+    _aliases = "aliases",
+    _all_crate_deps = "all_crate_deps",
+    _crate_deps = "crate_deps",
+    _crate_edition = "crate_edition",
+    _crate_repositories = "crate_repositories",
+)
+
+aliases = _aliases
+all_crate_deps = _all_crate_deps
+crate_deps = _crate_deps
+crate_edition = _crate_edition
+crate_repositories = _crate_repositories
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/dunce-1.0.5/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/dunce-1.0.5/BUILD.bazel
new file mode 100644
index 000000000000..51a71fbd99cc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/dunce-1.0.5/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "dunce-1.0.5",
+    actual = "@vendor_ts__dunce-1.0.5//:dunce",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/dunce/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/dunce/BUILD.bazel
new file mode 100644
index 000000000000..20a395e2a06b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/dunce/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "dunce",
+    actual = "@vendor_ts__dunce-1.0.5//:dunce",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/either-1.19.0/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/either-1.19.0/BUILD.bazel
new file mode 100644
index 000000000000..7bdf7be23063
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/either-1.19.0/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "either-1.19.0",
+    actual = "@vendor_ts__either-1.19.0//:either",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/either/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/either/BUILD.bazel
new file mode 100644
index 000000000000..0ce5780c3250
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/either/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "either",
+    actual = "@vendor_ts__either-1.19.0//:either",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/encoding-0.2.33/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/encoding-0.2.33/BUILD.bazel
new file mode 100644
index 000000000000..afa34162b826
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/encoding-0.2.33/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "encoding-0.2.33",
+    actual = "@vendor_ts__encoding-0.2.33//:encoding",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/encoding/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/encoding/BUILD.bazel
new file mode 100644
index 000000000000..3cdf487b2c0e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/encoding/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "encoding",
+    actual = "@vendor_ts__encoding-0.2.33//:encoding",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/figment-0.10.19/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/figment-0.10.19/BUILD.bazel
new file mode 100644
index 000000000000..5440d01deff9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/figment-0.10.19/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "figment-0.10.19",
+    actual = "@vendor_ts__figment-0.10.19//:figment",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/figment/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/figment/BUILD.bazel
new file mode 100644
index 000000000000..0ed2dd8af57c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/figment/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "figment",
+    actual = "@vendor_ts__figment-0.10.19//:figment",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/flate2-1.1.9/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/flate2-1.1.9/BUILD.bazel
new file mode 100644
index 000000000000..01b260daea49
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/flate2-1.1.9/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "flate2-1.1.9",
+    actual = "@vendor_ts__flate2-1.1.9//:flate2",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/flate2/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/flate2/BUILD.bazel
new file mode 100644
index 000000000000..75cab3adff50
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/flate2/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "flate2",
+    actual = "@vendor_ts__flate2-1.1.9//:flate2",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/glob-0.3.4/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/glob-0.3.4/BUILD.bazel
new file mode 100644
index 000000000000..af2be4898b7b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/glob-0.3.4/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "glob-0.3.4",
+    actual = "@vendor_ts__glob-0.3.4//:glob",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/glob/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/glob/BUILD.bazel
new file mode 100644
index 000000000000..7d7180483c6b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/glob/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "glob",
+    actual = "@vendor_ts__glob-0.3.4//:glob",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/globset-0.4.18/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/globset-0.4.18/BUILD.bazel
new file mode 100644
index 000000000000..c55adf24540c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/globset-0.4.18/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "globset-0.4.18",
+    actual = "@vendor_ts__globset-0.4.18//:globset",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/globset/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/globset/BUILD.bazel
new file mode 100644
index 000000000000..227ab092ee04
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/globset/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "globset",
+    actual = "@vendor_ts__globset-0.4.18//:globset",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/itertools-0.15.0/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/itertools-0.15.0/BUILD.bazel
new file mode 100644
index 000000000000..e1a51d621c4d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/itertools-0.15.0/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "itertools-0.15.0",
+    actual = "@vendor_ts__itertools-0.15.0//:itertools",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/itertools/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/itertools/BUILD.bazel
new file mode 100644
index 000000000000..ede210e8f3fb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/itertools/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "itertools",
+    actual = "@vendor_ts__itertools-0.15.0//:itertools",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/lazy_static-1.5.1/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/lazy_static-1.5.1/BUILD.bazel
new file mode 100644
index 000000000000..25498c7c5079
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/lazy_static-1.5.1/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "lazy_static-1.5.1",
+    actual = "@vendor_ts__lazy_static-1.5.1//:lazy_static",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/lazy_static/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/lazy_static/BUILD.bazel
new file mode 100644
index 000000000000..206948748f1f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/lazy_static/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "lazy_static",
+    actual = "@vendor_ts__lazy_static-1.5.1//:lazy_static",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/mustache-0.9.0/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/mustache-0.9.0/BUILD.bazel
new file mode 100644
index 000000000000..efad57611492
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/mustache-0.9.0/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "mustache-0.9.0",
+    actual = "@vendor_ts__mustache-0.9.0//:mustache",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/mustache/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/mustache/BUILD.bazel
new file mode 100644
index 000000000000..23dee02bded5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/mustache/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "mustache",
+    actual = "@vendor_ts__mustache-0.9.0//:mustache",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/num-traits-0.2.19/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/num-traits-0.2.19/BUILD.bazel
new file mode 100644
index 000000000000..2a511d29c9d8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/num-traits-0.2.19/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "num-traits-0.2.19",
+    actual = "@vendor_ts__num-traits-0.2.19//:num_traits",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/num-traits/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/num-traits/BUILD.bazel
new file mode 100644
index 000000000000..62ca3f42144e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/num-traits/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "num-traits",
+    actual = "@vendor_ts__num-traits-0.2.19//:num_traits",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/num_cpus-1.17.0/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/num_cpus-1.17.0/BUILD.bazel
new file mode 100644
index 000000000000..3faa31f5f803
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/num_cpus-1.17.0/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "num_cpus-1.17.0",
+    actual = "@vendor_ts__num_cpus-1.17.0//:num_cpus",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/num_cpus/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/num_cpus/BUILD.bazel
new file mode 100644
index 000000000000..ee8b9b8c23cc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/num_cpus/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "num_cpus",
+    actual = "@vendor_ts__num_cpus-1.17.0//:num_cpus",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/proc-macro2-1.0.107/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/proc-macro2-1.0.107/BUILD.bazel
new file mode 100644
index 000000000000..f18b6a1a57a3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/proc-macro2-1.0.107/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "proc-macro2-1.0.107",
+    actual = "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/proc-macro2/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/proc-macro2/BUILD.bazel
new file mode 100644
index 000000000000..cda647ad06ec
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/proc-macro2/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "proc-macro2",
+    actual = "@vendor_ts__proc-macro2-1.0.107//:proc_macro2",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/quote-1.0.47/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/quote-1.0.47/BUILD.bazel
new file mode 100644
index 000000000000..fad5a98cf61a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/quote-1.0.47/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "quote-1.0.47",
+    actual = "@vendor_ts__quote-1.0.47//:quote",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/quote/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/quote/BUILD.bazel
new file mode 100644
index 000000000000..30a4bb96671a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/quote/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "quote",
+    actual = "@vendor_ts__quote-1.0.47//:quote",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_base_db-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_base_db-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..3343044f50a3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_base_db-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_base_db-0.0.358",
+    actual = "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_base_db/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_base_db/BUILD.bazel
new file mode 100644
index 000000000000..d53305a3f7e6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_base_db/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_base_db",
+    actual = "@vendor_ts__ra_ap_base_db-0.0.358//:ra_ap_base_db",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_cfg-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_cfg-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..c70a54558a27
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_cfg-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_cfg-0.0.358",
+    actual = "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_cfg/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_cfg/BUILD.bazel
new file mode 100644
index 000000000000..4f1956c96089
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_cfg/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_cfg",
+    actual = "@vendor_ts__ra_ap_cfg-0.0.358//:ra_ap_cfg",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..1f991743bab4
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_hir-0.0.358",
+    actual = "@vendor_ts__ra_ap_hir-0.0.358//:ra_ap_hir",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir/BUILD.bazel
new file mode 100644
index 000000000000..984a1eabed57
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_hir",
+    actual = "@vendor_ts__ra_ap_hir-0.0.358//:ra_ap_hir",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_def-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_def-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..3fd1be68ba0a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_def-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_hir_def-0.0.358",
+    actual = "@vendor_ts__ra_ap_hir_def-0.0.358//:ra_ap_hir_def",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_def/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_def/BUILD.bazel
new file mode 100644
index 000000000000..8829ce1e6d2d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_def/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_hir_def",
+    actual = "@vendor_ts__ra_ap_hir_def-0.0.358//:ra_ap_hir_def",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_expand-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_expand-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..09b29bd3e261
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_expand-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_hir_expand-0.0.358",
+    actual = "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_expand/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_expand/BUILD.bazel
new file mode 100644
index 000000000000..4da55dd818eb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_expand/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_hir_expand",
+    actual = "@vendor_ts__ra_ap_hir_expand-0.0.358//:ra_ap_hir_expand",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_ty-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_ty-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..28df700eb416
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_ty-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_hir_ty-0.0.358",
+    actual = "@vendor_ts__ra_ap_hir_ty-0.0.358//:ra_ap_hir_ty",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_ty/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_ty/BUILD.bazel
new file mode 100644
index 000000000000..2a9f01f05ea9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_hir_ty/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_hir_ty",
+    actual = "@vendor_ts__ra_ap_hir_ty-0.0.358//:ra_ap_hir_ty",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_ide_db-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_ide_db-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..24f6746fd6c3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_ide_db-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_ide_db-0.0.358",
+    actual = "@vendor_ts__ra_ap_ide_db-0.0.358//:ra_ap_ide_db",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_ide_db/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_ide_db/BUILD.bazel
new file mode 100644
index 000000000000..183214158c2b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_ide_db/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_ide_db",
+    actual = "@vendor_ts__ra_ap_ide_db-0.0.358//:ra_ap_ide_db",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_intern-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_intern-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..bdc78e1c1e6c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_intern-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_intern-0.0.358",
+    actual = "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_intern/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_intern/BUILD.bazel
new file mode 100644
index 000000000000..81fe0aac228b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_intern/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_intern",
+    actual = "@vendor_ts__ra_ap_intern-0.0.358//:ra_ap_intern",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_load-cargo-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_load-cargo-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..e8ef30f9f11d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_load-cargo-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_load-cargo-0.0.358",
+    actual = "@vendor_ts__ra_ap_load-cargo-0.0.358//:ra_ap_load_cargo",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_load-cargo/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_load-cargo/BUILD.bazel
new file mode 100644
index 000000000000..f8362b81a1cf
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_load-cargo/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_load-cargo",
+    actual = "@vendor_ts__ra_ap_load-cargo-0.0.358//:ra_ap_load_cargo",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_parser-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_parser-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..ad0c6024b301
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_parser-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_parser-0.0.358",
+    actual = "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_parser/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_parser/BUILD.bazel
new file mode 100644
index 000000000000..74b326081672
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_parser/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_parser",
+    actual = "@vendor_ts__ra_ap_parser-0.0.358//:ra_ap_parser",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_paths-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_paths-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..57153f4c94db
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_paths-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_paths-0.0.358",
+    actual = "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_paths/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_paths/BUILD.bazel
new file mode 100644
index 000000000000..635b9a7e998d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_paths/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_paths",
+    actual = "@vendor_ts__ra_ap_paths-0.0.358//:ra_ap_paths",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_project_model-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_project_model-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..2326d2c57dd0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_project_model-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_project_model-0.0.358",
+    actual = "@vendor_ts__ra_ap_project_model-0.0.358//:ra_ap_project_model",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_project_model/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_project_model/BUILD.bazel
new file mode 100644
index 000000000000..7e3ad7f8cb83
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_project_model/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_project_model",
+    actual = "@vendor_ts__ra_ap_project_model-0.0.358//:ra_ap_project_model",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_span-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_span-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..afd572a3145f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_span-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_span-0.0.358",
+    actual = "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_span/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_span/BUILD.bazel
new file mode 100644
index 000000000000..46b8ac6807f0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_span/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_span",
+    actual = "@vendor_ts__ra_ap_span-0.0.358//:ra_ap_span",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_stdx-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_stdx-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..21a7e2085bf5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_stdx-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_stdx-0.0.358",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_syntax-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_syntax-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..c5c18cd5a946
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_syntax-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_syntax-0.0.358",
+    actual = "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_syntax-bridge-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_syntax-bridge-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..2ccfb6860927
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_syntax-bridge-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_syntax-bridge-0.0.358",
+    actual = "@vendor_ts__ra_ap_syntax-bridge-0.0.358//:ra_ap_syntax_bridge",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_syntax-bridge/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_syntax-bridge/BUILD.bazel
new file mode 100644
index 000000000000..a0ed5ed5553d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_syntax-bridge/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_syntax-bridge",
+    actual = "@vendor_ts__ra_ap_syntax-bridge-0.0.358//:ra_ap_syntax_bridge",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_syntax/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_syntax/BUILD.bazel
new file mode 100644
index 000000000000..b1a2fb1fcf80
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_syntax/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_syntax",
+    actual = "@vendor_ts__ra_ap_syntax-0.0.358//:ra_ap_syntax",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_toolchain-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_toolchain-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..ff5ec4456d79
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_toolchain-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_toolchain-0.0.358",
+    actual = "@vendor_ts__ra_ap_toolchain-0.0.358//:ra_ap_toolchain",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_toolchain/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_toolchain/BUILD.bazel
new file mode 100644
index 000000000000..0b5e443df034
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_toolchain/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_toolchain",
+    actual = "@vendor_ts__ra_ap_toolchain-0.0.358//:ra_ap_toolchain",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_vfs-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_vfs-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..cbdbbeac89fb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_vfs-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_vfs-0.0.358",
+    actual = "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_vfs/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_vfs/BUILD.bazel
new file mode 100644
index 000000000000..ba944314362e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_vfs/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ra_ap_vfs",
+    actual = "@vendor_ts__ra_ap_vfs-0.0.358//:ra_ap_vfs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/rand-0.10.3/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/rand-0.10.3/BUILD.bazel
new file mode 100644
index 000000000000..5cf1998a5cd0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/rand-0.10.3/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "rand-0.10.3",
+    actual = "@vendor_ts__rand-0.10.3//:rand",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/rand/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/rand/BUILD.bazel
new file mode 100644
index 000000000000..ddf617c23fe9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/rand/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "rand",
+    actual = "@vendor_ts__rand-0.10.3//:rand",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/rayon-1.12.0/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/rayon-1.12.0/BUILD.bazel
new file mode 100644
index 000000000000..375eae0288e9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/rayon-1.12.0/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "rayon-1.12.0",
+    actual = "@vendor_ts__rayon-1.12.0//:rayon",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/rayon/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/rayon/BUILD.bazel
new file mode 100644
index 000000000000..456a6693f51a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/rayon/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "rayon",
+    actual = "@vendor_ts__rayon-1.12.0//:rayon",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/regex-1.13.1/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/regex-1.13.1/BUILD.bazel
new file mode 100644
index 000000000000..392a18a9b79b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/regex-1.13.1/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "regex-1.13.1",
+    actual = "@vendor_ts__regex-1.13.1//:regex",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/regex/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/regex/BUILD.bazel
new file mode 100644
index 000000000000..36658463cff8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/regex/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "regex",
+    actual = "@vendor_ts__regex-1.13.1//:regex",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde-1.0.229/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde-1.0.229/BUILD.bazel
new file mode 100644
index 000000000000..da47d9e809ca
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde-1.0.229/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "serde-1.0.229",
+    actual = "@vendor_ts__serde-1.0.229//:serde",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde/BUILD.bazel
new file mode 100644
index 000000000000..667e68cba9c5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "serde",
+    actual = "@vendor_ts__serde-1.0.229//:serde",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_json-1.0.154/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_json-1.0.154/BUILD.bazel
new file mode 100644
index 000000000000..a12c7c21968f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_json-1.0.154/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "serde_json-1.0.154",
+    actual = "@vendor_ts__serde_json-1.0.154//:serde_json",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_json/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_json/BUILD.bazel
new file mode 100644
index 000000000000..5eaea3a8c219
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_json/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "serde_json",
+    actual = "@vendor_ts__serde_json-1.0.154//:serde_json",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_with-3.24.0/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_with-3.24.0/BUILD.bazel
new file mode 100644
index 000000000000..db827ed8cd50
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_with-3.24.0/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "serde_with-3.24.0",
+    actual = "@vendor_ts__serde_with-3.24.0//:serde_with",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_with/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_with/BUILD.bazel
new file mode 100644
index 000000000000..683145788e91
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_with/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "serde_with",
+    actual = "@vendor_ts__serde_with-3.24.0//:serde_with",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_yaml-0.9.34+deprecated/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_yaml-0.9.34+deprecated/BUILD.bazel
new file mode 100644
index 000000000000..b4d5322e507f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_yaml-0.9.34+deprecated/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "serde_yaml-0.9.34+deprecated",
+    actual = "@vendor_ts__serde_yaml-0.9.34-deprecated//:serde_yaml",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_yaml/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_yaml/BUILD.bazel
new file mode 100644
index 000000000000..a6bbe7aa33ff
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/serde_yaml/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "serde_yaml",
+    actual = "@vendor_ts__serde_yaml-0.9.34-deprecated//:serde_yaml",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/stdx-0.0.358/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/stdx-0.0.358/BUILD.bazel
new file mode 100644
index 000000000000..7e019cae293e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/stdx-0.0.358/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "stdx-0.0.358",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/stdx/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/stdx/BUILD.bazel
new file mode 100644
index 000000000000..1e17a5746fd3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/stdx/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "stdx",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.358//:ra_ap_stdx",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/syn-3.0.9/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/syn-3.0.9/BUILD.bazel
new file mode 100644
index 000000000000..ec0c039b77ad
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/syn-3.0.9/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "syn-3.0.9",
+    actual = "@vendor_ts__syn-3.0.9//:syn",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/syn/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/syn/BUILD.bazel
new file mode 100644
index 000000000000..cc4c5ac7627c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/syn/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "syn",
+    actual = "@vendor_ts__syn-3.0.9//:syn",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/toml-1.1.8+spec-1.1.0/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/toml-1.1.8+spec-1.1.0/BUILD.bazel
new file mode 100644
index 000000000000..379acf63250b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/toml-1.1.8+spec-1.1.0/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "toml-1.1.8+spec-1.1.0",
+    actual = "@vendor_ts__toml-1.1.8-spec-1.1.0//:toml",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/toml/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/toml/BUILD.bazel
new file mode 100644
index 000000000000..26ed5567d2f3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/toml/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "toml",
+    actual = "@vendor_ts__toml-1.1.8-spec-1.1.0//:toml",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-0.1.44/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-0.1.44/BUILD.bazel
new file mode 100644
index 000000000000..35e591002a36
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-0.1.44/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tracing-0.1.44",
+    actual = "@vendor_ts__tracing-0.1.44//:tracing",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-flame-0.2.0/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-flame-0.2.0/BUILD.bazel
new file mode 100644
index 000000000000..2c641a961ed2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-flame-0.2.0/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tracing-flame-0.2.0",
+    actual = "@vendor_ts__tracing-flame-0.2.0//:tracing_flame",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-flame/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-flame/BUILD.bazel
new file mode 100644
index 000000000000..b2746239b9b2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-flame/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tracing-flame",
+    actual = "@vendor_ts__tracing-flame-0.2.0//:tracing_flame",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-subscriber-0.3.23/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-subscriber-0.3.23/BUILD.bazel
new file mode 100644
index 000000000000..8d69c6f00c98
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-subscriber-0.3.23/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tracing-subscriber-0.3.23",
+    actual = "@vendor_ts__tracing-subscriber-0.3.23//:tracing_subscriber",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-subscriber/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-subscriber/BUILD.bazel
new file mode 100644
index 000000000000..bd028fa3c4cd
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing-subscriber/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tracing-subscriber",
+    actual = "@vendor_ts__tracing-subscriber-0.3.23//:tracing_subscriber",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing/BUILD.bazel
new file mode 100644
index 000000000000..7c70f0946694
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tracing/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tracing",
+    actual = "@vendor_ts__tracing-0.1.44//:tracing",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-0.26.9/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-0.26.9/BUILD.bazel
new file mode 100644
index 000000000000..bb089d3bae5b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-0.26.9/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-0.26.9",
+    actual = "@vendor_ts__tree-sitter-0.26.9//:tree_sitter",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-embedded-template-0.25.0/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-embedded-template-0.25.0/BUILD.bazel
new file mode 100644
index 000000000000..8cdd2b80ef48
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-embedded-template-0.25.0/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-embedded-template-0.25.0",
+    actual = "@vendor_ts__tree-sitter-embedded-template-0.25.0//:tree_sitter_embedded_template",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-embedded-template/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-embedded-template/BUILD.bazel
new file mode 100644
index 000000000000..44c55f4f1356
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-embedded-template/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-embedded-template",
+    actual = "@vendor_ts__tree-sitter-embedded-template-0.25.0//:tree_sitter_embedded_template",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-json-0.24.8/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-json-0.24.8/BUILD.bazel
new file mode 100644
index 000000000000..ac225cb7190f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-json-0.24.8/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-json-0.24.8",
+    actual = "@vendor_ts__tree-sitter-json-0.24.8//:tree_sitter_json",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-json/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-json/BUILD.bazel
new file mode 100644
index 000000000000..984766ca7f00
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-json/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-json",
+    actual = "@vendor_ts__tree-sitter-json-0.24.8//:tree_sitter_json",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-python-0.25.0/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-python-0.25.0/BUILD.bazel
new file mode 100644
index 000000000000..e457a6d859bc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-python-0.25.0/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-python-0.25.0",
+    actual = "@vendor_ts__tree-sitter-python-0.25.0//:tree_sitter_python",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-python/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-python/BUILD.bazel
new file mode 100644
index 000000000000..83d48c1d99af
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-python/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-python",
+    actual = "@vendor_ts__tree-sitter-python-0.25.0//:tree_sitter_python",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-ql-0.23.1/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-ql-0.23.1/BUILD.bazel
new file mode 100644
index 000000000000..e825552920d1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-ql-0.23.1/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-ql-0.23.1",
+    actual = "@vendor_ts__tree-sitter-ql-0.23.1//:tree_sitter_ql",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-ql/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-ql/BUILD.bazel
new file mode 100644
index 000000000000..acf0db48ed55
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-ql/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-ql",
+    actual = "@vendor_ts__tree-sitter-ql-0.23.1//:tree_sitter_ql",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-ruby-0.23.1/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-ruby-0.23.1/BUILD.bazel
new file mode 100644
index 000000000000..1848cc88cefe
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-ruby-0.23.1/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-ruby-0.23.1",
+    actual = "@vendor_ts__tree-sitter-ruby-0.23.1//:tree_sitter_ruby",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-ruby/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-ruby/BUILD.bazel
new file mode 100644
index 000000000000..ec85d9a20497
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter-ruby/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter-ruby",
+    actual = "@vendor_ts__tree-sitter-ruby-0.23.1//:tree_sitter_ruby",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter/BUILD.bazel
new file mode 100644
index 000000000000..8ecd89c77e5b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/tree-sitter/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "tree-sitter",
+    actual = "@vendor_ts__tree-sitter-0.26.9//:tree_sitter",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/triomphe-0.1.17/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/triomphe-0.1.17/BUILD.bazel
new file mode 100644
index 000000000000..35905640f69a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/triomphe-0.1.17/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "triomphe-0.1.17",
+    actual = "@vendor_ts__triomphe-0.1.17//:triomphe",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/triomphe/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/triomphe/BUILD.bazel
new file mode 100644
index 000000000000..e08a4a0e17f1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/triomphe/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "triomphe",
+    actual = "@vendor_ts__triomphe-0.1.17//:triomphe",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ungrammar-1.16.1/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ungrammar-1.16.1/BUILD.bazel
new file mode 100644
index 000000000000..3c2dbccf074d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ungrammar-1.16.1/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ungrammar-1.16.1",
+    actual = "@vendor_ts__ungrammar-1.16.1//:ungrammar",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/ungrammar/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ungrammar/BUILD.bazel
new file mode 100644
index 000000000000..ed687cea91b3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/ungrammar/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "ungrammar",
+    actual = "@vendor_ts__ungrammar-1.16.1//:ungrammar",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/zstd-0.14.2/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/zstd-0.14.2/BUILD.bazel
new file mode 100644
index 000000000000..16189941d6b7
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/zstd-0.14.2/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "zstd-0.14.2",
+    actual = "@vendor_ts__zstd-0.14.2//:zstd",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/zstd/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/zstd/BUILD.bazel
new file mode 100644
index 000000000000..8f7bf83b6f89
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/zstd/BUILD.bazel
@@ -0,0 +1,15 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "zstd",
+    actual = "@vendor_ts__zstd-0.14.2//:zstd",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/lfs.bzl b/misc/bazel/lfs.bzl
index daba8331dc36..c0e2cd7a8b12 100644
--- a/misc/bazel/lfs.bzl
+++ b/misc/bazel/lfs.bzl
@@ -28,29 +28,42 @@ def lfs_smudge(repository_ctx, srcs, *, extract = False, stripPrefix = None, exe
             res = repository_ctx.download([], src.basename, sha256 = info, allow_fail = True, executable = executable)
             if not res.success:
                 remote.append(src)
-        if remote:
-            infos = probe(remote)
-            for src, info in zip(remote, infos):
-                sha256, _, url = info.partition(" ")
-                repository_ctx.report_progress("downloading remote %s" % src.basename)
-                repository_ctx.download(url, src.basename, sha256 = sha256, executable = executable)
-        if extract:
-            for src in srcs:
-                repository_ctx.report_progress("extracting %s" % src.basename)
-                repository_ctx.extract(src.basename, stripPrefix = stripPrefix)
-                repository_ctx.delete(src.basename)
+    if remote:
+        infos = probe(remote)
+        for src, info in zip(remote, infos):
+            sha256, _, url = info.partition(" ")
+            repository_ctx.report_progress("downloading remote %s" % src.basename)
+            repository_ctx.download(url, src.basename, sha256 = sha256, executable = executable)
+    if extract:
+        for src in srcs:
+            repository_ctx.report_progress("extracting %s" % src.basename)
+            repository_ctx.extract(src.basename, stripPrefix = stripPrefix)
+            repository_ctx.delete(src.basename)
 
-def _download_and_extract_lfs(repository_ctx):
+def _add_build_file(repository_ctx):
     attr = repository_ctx.attr
-    src = repository_ctx.path(attr.src)
     if attr.build_file_content and attr.build_file:
         fail("You should specify only one among build_file_content and build_file for rule @%s" % repository_ctx.name)
-    lfs_smudge(repository_ctx, [src], extract = True, stripPrefix = attr.strip_prefix)
     if attr.build_file_content:
         repository_ctx.file("BUILD.bazel", attr.build_file_content)
     elif attr.build_file:
         repository_ctx.symlink(attr.build_file, "BUILD.bazel")
 
+def _download_and_extract_lfs_archive(repository_ctx):
+    attr = repository_ctx.attr
+    lfs_smudge(repository_ctx, [repository_ctx.path(attr.src)], extract = True, stripPrefix = attr.strip_prefix)
+    _add_build_file(repository_ctx)
+
+def _download_and_extract_lfs_archives(repository_ctx):
+    for src in repository_ctx.attr.srcs:
+        lfs_smudge(
+            repository_ctx,
+            [repository_ctx.path(src)],
+            extract = True,
+            stripPrefix = repository_ctx.attr.strip_prefix,
+        )
+    _add_build_file(repository_ctx)
+
 def _download_lfs(repository_ctx):
     attr = repository_ctx.attr
     if int(bool(attr.srcs)) + int(bool(attr.dir)) != 1:
@@ -83,18 +96,30 @@ def _download_lfs(repository_ctx):
         'alias(name = "file", actual = "//:%s", visibility = ["//visibility:public"])\n' % name,
     )
 
+_lfs_archive_attrs = {
+    "build_file": attr.label(doc = "The file to use as the BUILD file for this repository. " +
+                                   "Either build_file or build_file_content can be specified, but not both."),
+    "build_file_content": attr.string(doc = "The content for the BUILD file for this repository. " +
+                                            "Either build_file or build_file_content can be specified, but not both."),
+    "strip_prefix": attr.string(default = "", doc = "A directory prefix to strip from the extracted files."),
+}
+
 lfs_archive = repository_rule(
     doc = "Export the contents from an on-demand LFS archive. The corresponding path should be added to be ignored " +
           "in `.lfsconfig`.",
-    implementation = _download_and_extract_lfs,
+    implementation = _download_and_extract_lfs_archive,
     attrs = {
         "src": attr.label(mandatory = True, doc = "Local path to the LFS archive to extract."),
-        "build_file_content": attr.string(doc = "The content for the BUILD file for this repository. " +
-                                                "Either build_file or build_file_content can be specified, but not both."),
-        "build_file": attr.label(doc = "The file to use as the BUILD file for this repository. " +
-                                       "Either build_file or build_file_content can be specified, but not both."),
-        "strip_prefix": attr.string(default = "", doc = "A directory prefix to strip from the extracted files. "),
-    },
+    } | _lfs_archive_attrs,
+)
+
+lfs_archives = repository_rule(
+    doc = "Overlay the contents from on-demand LFS archives. The corresponding paths should be added to be ignored " +
+          "in `.lfsconfig`.",
+    implementation = _download_and_extract_lfs_archives,
+    attrs = {
+        "srcs": attr.label_list(doc = "Local paths to the LFS archives to extract in order.", mandatory = True),
+    } | _lfs_archive_attrs,
 )
 
 lfs_files = repository_rule(
diff --git a/misc/bazel/registry/modules/fmt/12.2.0.bcr.1-codeql.1/MODULE.bazel b/misc/bazel/registry/modules/fmt/12.2.0.bcr.1-codeql.1/MODULE.bazel
new file mode 100644
index 000000000000..891da68529ab
--- /dev/null
+++ b/misc/bazel/registry/modules/fmt/12.2.0.bcr.1-codeql.1/MODULE.bazel
@@ -0,0 +1,10 @@
+module(
+    name = "fmt",
+    version = "12.2.0.bcr.1-codeql.1",
+    bazel_compatibility = [">=7.2.1"],
+    compatibility_level = 10,
+)
+
+bazel_dep(name = "package_metadata", version = "0.0.13")
+bazel_dep(name = "rules_cc", version = "0.2.20")
+bazel_dep(name = "rules_license", version = "1.0.0")
diff --git a/misc/bazel/registry/modules/fmt/12.2.0.bcr.1-codeql.1/overlay/BUILD.bazel b/misc/bazel/registry/modules/fmt/12.2.0.bcr.1-codeql.1/overlay/BUILD.bazel
new file mode 100644
index 000000000000..c4fd22326fa4
--- /dev/null
+++ b/misc/bazel/registry/modules/fmt/12.2.0.bcr.1-codeql.1/overlay/BUILD.bazel
@@ -0,0 +1,59 @@
+load("@package_metadata//licenses/rules:license.bzl", package_metadata_license = "license")
+load("@package_metadata//purl:purl.bzl", "purl")
+load("@package_metadata//rules:package_metadata.bzl", "package_metadata")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_license//rules:license.bzl", "license")
+
+package(
+    default_package_metadata = [
+        ":license",
+        ":package_metadata",
+    ],
+)
+
+exports_files([
+    "LICENSE",
+])
+
+license(
+    name = "license",
+    license_kinds = ["@rules_license//licenses/spdx:MIT"],
+    license_text = "LICENSE",
+)
+
+package_metadata_license(
+    name = "package_metadata_license",
+    kind = "@package_metadata//licenses/spdx:MIT",
+    text = "LICENSE",
+    visibility = ["//visibility:public"],
+)
+
+package_metadata(
+    name = "package_metadata",
+    attributes = [":package_metadata_license"],
+    purl = purl.bazel(
+        module_name(),
+        module_version(),
+    ),
+    visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "fmt",
+    srcs = [
+        #"src/fmt.cc", # No C++ module support, yet in Bazel (https://github.com/bazelbuild/bazel/pull/19940)
+        "src/format.cc",
+        "src/os.cc",
+    ],
+    hdrs = glob([
+        "include/fmt/*.h",
+    ]),
+    # CodeQL change: disable UTF8 support, it's causing issues on Windows
+    defines = select({
+        "@rules_cc//cc/compiler:msvc-cl": ["FMT_UNICODE=0"],
+        "//conditions:default": [],
+    }),
+    includes = ["include"],
+    strip_include_prefix = "include",  # workaround: only needed on some macOS systems (see https://github.com/bazelbuild/bazel-central-registry/issues/1537)
+    visibility = ["//visibility:public"],
+)
diff --git a/misc/bazel/registry/modules/fmt/12.2.0.bcr.1-codeql.1/overlay/MODULE.bazel b/misc/bazel/registry/modules/fmt/12.2.0.bcr.1-codeql.1/overlay/MODULE.bazel
new file mode 100644
index 000000000000..891da68529ab
--- /dev/null
+++ b/misc/bazel/registry/modules/fmt/12.2.0.bcr.1-codeql.1/overlay/MODULE.bazel
@@ -0,0 +1,10 @@
+module(
+    name = "fmt",
+    version = "12.2.0.bcr.1-codeql.1",
+    bazel_compatibility = [">=7.2.1"],
+    compatibility_level = 10,
+)
+
+bazel_dep(name = "package_metadata", version = "0.0.13")
+bazel_dep(name = "rules_cc", version = "0.2.20")
+bazel_dep(name = "rules_license", version = "1.0.0")
diff --git a/misc/bazel/registry/modules/fmt/12.2.0.bcr.1-codeql.1/source.json b/misc/bazel/registry/modules/fmt/12.2.0.bcr.1-codeql.1/source.json
new file mode 100644
index 000000000000..8f71b59eed3d
--- /dev/null
+++ b/misc/bazel/registry/modules/fmt/12.2.0.bcr.1-codeql.1/source.json
@@ -0,0 +1,9 @@
+{
+    "url": "https://github.com/fmtlib/fmt/releases/download/12.2.0/fmt-12.2.0.zip",
+    "integrity": "sha256-ovSo1RF4+VTkwzkAf3ft12ugyy42+HpI5aVAPZvlh48=",
+    "strip_prefix": "fmt-12.2.0",
+    "overlay": {
+        "BUILD.bazel": "sha256-Zn5kky5jBkuqoek9UpzuHX4sTkqyhUKnjENJwJxRCEI=",
+        "MODULE.bazel": "sha256-WdW/GI1Ho1qVF/BZ8ZQTa71rB8F5QHkLv07kySMJfGI="
+    }
+}
diff --git a/misc/bazel/registry/modules/fmt/metadata.json b/misc/bazel/registry/modules/fmt/metadata.json
index ca5dd4861536..c72f6183f12c 100644
--- a/misc/bazel/registry/modules/fmt/metadata.json
+++ b/misc/bazel/registry/modules/fmt/metadata.json
@@ -16,6 +16,7 @@
         "github:fmtlib/fmt"
     ],
     "versions": [
+        "12.2.0.bcr.1-codeql.1",
         "12.1.0-codeql.1"
     ],
     "yanked_versions": {}
diff --git a/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/MODULE.bazel b/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/MODULE.bazel
new file mode 100644
index 000000000000..7926db651b9a
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/MODULE.bazel
@@ -0,0 +1,78 @@
+"rules_dotnet"
+
+module(
+    name = "rules_dotnet",
+    version = "0.22.2-codeql.1",
+    bazel_compatibility = [">=8.0.0"],
+    compatibility_level = 0,
+)
+
+dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
+dotnet.toolchain(dotnet_version = "10.0.201")
+
+# This toolchain is used for building the apphost shimmer only. The apphost shimmer
+# can not be buit with the toolchain that the end-user picks because the apphost builder
+# always targets the latest SDK and the end-user can pick an older SDK that is incompatible with the apphost builder.
+dotnet.toolchain(
+    name = "dotnet_apphost",
+    dotnet_version = "10.0.201",
+)
+use_repo(dotnet, "dotnet_toolchains")
+
+# These toolchains are used to build the apphost shimmer
+use_repo(dotnet, "dotnet_apphost_x86_64-unknown-linux-gnu")
+use_repo(dotnet, "dotnet_apphost_arm64-unknown-linux-gnu")
+use_repo(dotnet, "dotnet_apphost_aarch64-apple-darwin")
+use_repo(dotnet, "dotnet_apphost_x86_64-apple-darwin")
+use_repo(dotnet, "dotnet_apphost_x86_64-pc-windows-msvc")
+use_repo(dotnet, "dotnet_apphost_arm64-pc-windows-msvc")
+
+register_toolchains("@dotnet_toolchains//:all")
+
+paket2bazel_dependencies_extension = use_extension("@rules_dotnet//dotnet:paket.paket2bazel_dependencies_extension.bzl", "paket2bazel_dependencies_extension")
+use_repo(paket2bazel_dependencies_extension, "paket.paket2bazel_dependencies")
+
+rules_dotnet_nuget_packages_extension = use_extension("@rules_dotnet//dotnet:paket.rules_dotnet_nuget_packages_extension.bzl", "rules_dotnet_nuget_packages_extension")
+use_repo(rules_dotnet_nuget_packages_extension, "paket.rules_dotnet_nuget_packages")
+
+targeting_packs_extension = use_extension("@rules_dotnet//dotnet/private/sdk/targeting_packs:dotnet.targeting_packs_extension.bzl", "targeting_packs_extension")
+use_repo(targeting_packs_extension, "dotnet.targeting_packs")
+
+runtime_packs_extension = use_extension("@rules_dotnet//dotnet/private/sdk/runtime_packs:dotnet.runtime_packs_extension.bzl", "runtime_packs_extension")
+use_repo(runtime_packs_extension, "dotnet.runtime_packs")
+
+apphost_packs_extension = use_extension("@rules_dotnet//dotnet/private/sdk/apphost_packs:dotnet.apphost_packs_extension.bzl", "apphost_packs_extension")
+use_repo(apphost_packs_extension, "dotnet.apphost_packs")
+
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "bazel_lib", version = "3.0.0")
+bazel_dep(name = "rules_shell", version = "0.6.1")
+
+# Dev dependencies
+bazel_dep(name = "rules_pkg", version = "1.1.0", dev_dependency = True)
+bazel_dep(name = "gazelle", version = "0.51.3", dev_dependency = True, repo_name = "bazel_gazelle")
+bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.9.0", dev_dependency = True)
+bazel_dep(name = "rules_cc", version = "0.2.19", dev_dependency = True)
+bazel_dep(name = "rules_testing", version = "0.8.0", dev_dependency = True)
+bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
+bazel_dep(name = "dotnet_test_resources_other_repo", version = "", dev_dependency = True)
+local_path_override(
+    module_name = "dotnet_test_resources_other_repo",
+    path = "dotnet/private/tests/resources/other_repo",
+)
+
+rules_dotnet_dev_nuget_packages_extension = use_extension("@rules_dotnet//dotnet:paket.rules_dotnet_dev_nuget_packages_extension.bzl", "rules_dotnet_dev_nuget_packages_extension", dev_dependency = True)
+use_repo(rules_dotnet_dev_nuget_packages_extension, "paket.rules_dotnet_dev_nuget_packages")
+
+rules_dotnet_nuget_resource_assemblies_tests_extension = use_extension("@rules_dotnet//dotnet:paket.rules_dotnet_nuget_resource_assemblies_tests_extension.bzl", "rules_dotnet_nuget_resource_assemblies_tests_extension", dev_dependency = True)
+use_repo(rules_dotnet_nuget_resource_assemblies_tests_extension, "paket.rules_dotnet_nuget_resource_assemblies_tests")
+
+internal_dev_deps = use_extension("@rules_dotnet//dotnet:internal_dev_deps.bzl", "internal_dev_deps", dev_dependency = True)
+use_repo(internal_dev_deps, "buildkite_config")
+
+rules_dotnet_framework_override_not_provided_tests_extension = use_extension("@rules_dotnet//dotnet:paket.rules_dotnet_framework_override_not_provided_tests_extension.bzl", "rules_dotnet_framework_override_not_provided_tests_extension", dev_dependency = True)
+use_repo(rules_dotnet_framework_override_not_provided_tests_extension, "paket.rules_dotnet_framework_override_not_provided_tests")
+
+rules_dotnet_nuget_tool_tests_extension = use_extension("@rules_dotnet//dotnet:paket.rules_dotnet_nuget_tool_tests_extension.bzl", "rules_dotnet_nuget_tool_tests_extension", dev_dependency = True)
+use_repo(rules_dotnet_nuget_tool_tests_extension, "paket.rules_dotnet_nuget_tool_tests")
diff --git a/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/patches/module_dot_bazel_version.patch b/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/patches/module_dot_bazel_version.patch
new file mode 100644
index 000000000000..77bb1fd4fa68
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/patches/module_dot_bazel_version.patch
@@ -0,0 +1,5 @@
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -6 +6 @@
+-    version = "0.0.0",
++    version = "0.22.2-codeql.1",
diff --git a/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/patches/revert_additional_files_in_nuget_archive.patch b/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/patches/revert_additional_files_in_nuget_archive.patch
new file mode 100644
index 000000000000..3464a24c3585
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/patches/revert_additional_files_in_nuget_archive.patch
@@ -0,0 +1,5 @@
+--- a/dotnet/private/rules/nuget/nuget_archive.bzl
++++ b/dotnet/private/rules/nuget/nuget_archive.bzl
+@@ -142 +142 @@
+-    if file.endswith(tfm) or file.endswith(tfm + "/"):
++    if file.find("/", tfm_end + 1) != -1:
diff --git a/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/source.json b/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/source.json
new file mode 100644
index 000000000000..ad8f2d5a999e
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/source.json
@@ -0,0 +1,11 @@
+{
+    "integrity": "sha256-zjXa0Y2zHNaDI7Vo3AnGicxtdewW66FRDM0Si7XxJk4=",
+    "strip_prefix": "rules_dotnet-0.22.2",
+    "docs_url": "https://github.com/bazel-contrib/rules_dotnet/releases/download/v0.22.2/rules_dotnet-v0.22.2.docs.tar.gz",
+    "url": "https://github.com/bazel-contrib/rules_dotnet/releases/download/v0.22.2/rules_dotnet-v0.22.2.tar.gz",
+    "patches": {
+        "module_dot_bazel_version.patch": "sha256-jS0bNBAwNeJOylIjBXVvQApWA4+pWAxWuD2FBbaBHX4=",
+        "revert_additional_files_in_nuget_archive.patch": "sha256-DgXRtEr+vmKXPJnWNDEmDw7VqFCpGh6zrHyVBclQ+/Q="
+    },
+    "patch_strip": 1
+}
diff --git a/misc/bazel/registry/modules/rules_dotnet/metadata.json b/misc/bazel/registry/modules/rules_dotnet/metadata.json
index ea34a05cfb68..5ad41f8dadbc 100644
--- a/misc/bazel/registry/modules/rules_dotnet/metadata.json
+++ b/misc/bazel/registry/modules/rules_dotnet/metadata.json
@@ -13,6 +13,7 @@
         "github:bazel-contrib/rules_dotnet"
     ],
     "versions": [
+        "0.22.2-codeql.1",
         "0.21.5-codeql.1"
     ],
     "yanked_versions": {}
diff --git a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/MODULE.bazel b/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/MODULE.bazel
deleted file mode 100644
index ec37914a8f73..000000000000
--- a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/MODULE.bazel
+++ /dev/null
@@ -1,38 +0,0 @@
-module(
-    name = "rules_kotlin",
-    version = "2.2.2-codeql.1",
-    compatibility_level = 1,
-    repo_name = "rules_kotlin",
-)
-
-bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "rules_java", version = "8.9.0")
-bazel_dep(name = "rules_android", version = "0.6.4")
-bazel_dep(name = "bazel_features", version = "1.25.0")
-bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
-bazel_dep(name = "rules_proto", version = "6.0.2", repo_name = "rules_proto")
-bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "py_absl")
-bazel_dep(name = "rules_cc", version = "0.0.16")
-bazel_dep(name = "bazel_worker_api", version = "0.0.8")
-bazel_dep(name = "bazel_worker_java", version = "0.0.8")
-
-rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
-use_repo(rules_java_toolchains, "remote_java_tools")
-
-rules_kotlin_extensions = use_extension(
-    "//src/main/starlark/core/repositories:bzlmod_setup.bzl",
-    "rules_kotlin_extensions",
-)
-use_repo(
-    rules_kotlin_extensions,
-    "com_github_google_ksp",
-    "com_github_jetbrains_kotlin",
-    "com_github_pinterest_ktlint",
-    "kotlin_build_tools_impl",
-    "kotlinx_serialization_core_jvm",
-    "kotlinx_serialization_json",
-    "kotlinx_serialization_json_jvm",
-)
-
-register_toolchains("//kotlin/internal:default_toolchain")
diff --git a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_add_language_version_option.patch b/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_add_language_version_option.patch
deleted file mode 100644
index 795d1f88f387..000000000000
--- a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_add_language_version_option.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/src/main/starlark/core/options/opts.kotlinc.bzl	2000-01-01 01:00:00.000000000 +0100
-+++ b/src/main/starlark/core/options/opts.kotlinc.bzl	2025-11-17 16:51:01.012063056 +0100
-@@ -51,6 +51,11 @@
-         return None
-     return ["-Xjdk-release=%s" % version]
-
-+def _map_language_version_to_flag(version):
-+    if not version:
-+        return None
-+    return ["-language-version=%s" % version, "-api-version=%s" % version]
-+
- _KOPTS_ALL = {
-     "include_stdlibs": struct(
-         args = dict(
-@@ -495,6 +500,15 @@
-         value_to_flag = None,
-         map_value_to_flag = _map_warning_level,
-     ),
-+    "language_version": struct(
-+        args = dict(
-+            default = "1.9",
-+            doc = "-language-version",
-+        ),
-+        type = attr.string,
-+        value_to_flag = None,
-+        map_value_to_flag = _map_language_version_to_flag,
-+    ),
- }
-
- def _merge(key, rule_defined):
diff --git a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/source.json b/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/source.json
deleted file mode 100644
index 7025fb00a273..000000000000
--- a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/source.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "integrity": "sha256-QR2yavs0ksyDUbW1NJkxUir+LFTyZRttEncwoSVtD2A=",
-    "url": "https://github.com/bazelbuild/rules_kotlin/releases/download/v2.2.2/rules_kotlin-v2.2.2.tar.gz",
-    "patches": {
-        "codeql_add_language_version_option.patch": "sha256-HoH8NWXxmYHmm/SxaugRdXgMntvcQx5gRLW2yQIvWhM=",
-        "codeql_do_not_emit_jdeps.patch": "sha256-cg06knW+Eq13qHCaelbnZka/WnGPvRrcqXHtpXsy/rA="
-    },
-    "patch_strip": 1
-}
diff --git a/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/MODULE.bazel b/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/MODULE.bazel
new file mode 100644
index 000000000000..16139faa4dec
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/MODULE.bazel
@@ -0,0 +1,39 @@
+"""Bazel module manifest for the released rules_kotlin package."""
+
+module(
+    name = "rules_kotlin",
+    version = "2.4.21-codeql.1",
+    compatibility_level = 1,
+    repo_name = "rules_kotlin",
+)
+
+bazel_dep(name = "platforms", version = "0.0.11")
+bazel_dep(name = "bazel_skylib", version = "1.8.2")
+bazel_dep(name = "rules_java", version = "8.9.0")
+bazel_dep(name = "rules_license", version = "1.0.0")
+bazel_dep(name = "rules_android", version = "0.7.3")
+bazel_dep(name = "bazel_features", version = "1.39.0")
+bazel_dep(name = "bazel_lib", version = "3.1.0")
+
+rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
+use_repo(rules_java_toolchains, "remote_java_tools")
+
+rules_kotlin_extensions = use_extension(
+    "//src/main/starlark/core/repositories:bzlmod_setup.bzl",
+    "rules_kotlin_extensions",
+)
+use_repo(
+    rules_kotlin_extensions,
+    "btapi_impl",
+    "com_github_google_ksp",
+    "com_github_jetbrains_kotlin",
+    "com_github_pinterest_ktlint",
+    "jarjar",
+    "kotlin_build_tools_api",
+    "kotlinx_coroutines_core_jvm",
+    "kotlinx_serialization_core_jvm",
+    "kotlinx_serialization_json",
+    "kotlinx_serialization_json_jvm",
+)
+
+register_toolchains("//kotlin:default_toolchain")
diff --git a/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/patches/codeql_add_language_version_option.patch b/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/patches/codeql_add_language_version_option.patch
new file mode 100644
index 000000000000..105b80afe186
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/patches/codeql_add_language_version_option.patch
@@ -0,0 +1,15 @@
+CodeQL still builds extractors with Kotlin 1.8 and 1.9 language/API versions.
+Keep those supported and keep the API version aligned with the language version.
+--- a/src/main/starlark/core/options/opts.kotlinc.bzl
++++ b/src/main/starlark/core/options/opts.kotlinc.bzl
+@@ -93,9 +93,7 @@
+ def _map_language_version_to_flag(version):
+     if not version:
+         return None
+-    if int(version.split(".")[0]) < 2:
+-        fail("rules_kotlin requires language_version 2.0 or newer; got %s" % version)
+-    return ["-language-version=%s" % version]
++    return ["-language-version=%s" % version, "-api-version=%s" % version]
+ 
+ def _map_xxlanguage_to_flag(values):
+     return ["-XXLanguage:%s" % v for v in values]
diff --git a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_do_not_emit_jdeps.patch b/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/patches/codeql_do_not_emit_jdeps.patch
similarity index 94%
rename from misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_do_not_emit_jdeps.patch
rename to misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/patches/codeql_do_not_emit_jdeps.patch
index 838750ba12eb..aeda6be2c569 100644
--- a/misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_do_not_emit_jdeps.patch
+++ b/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/patches/codeql_do_not_emit_jdeps.patch
@@ -4,7 +4,7 @@ allows us to not have to specify that option (and therefore pull in `rules_kotli
 internal repo.
 --- a/kotlin/settings/BUILD.bazel
 +++ b/kotlin/settings/BUILD.bazel
-@@ -16,6 +16,6 @@ release_archive(
+@@ -16,7 +16,7 @@
  # Flag that controls the emission of jdeps files during kotlin jvm compilation.
  bool_flag(
      name = "jvm_emit_jdeps",
@@ -12,4 +12,4 @@ internal repo.
 +    build_setting_default = False,
      visibility = ["//visibility:public"],
  )
-
+ 
diff --git a/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/patches/codeql_do_not_propagate_kotlin_warning_mode_to_javac.patch b/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/patches/codeql_do_not_propagate_kotlin_warning_mode_to_javac.patch
new file mode 100644
index 000000000000..1f9eac1636c8
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/patches/codeql_do_not_propagate_kotlin_warning_mode_to_javac.patch
@@ -0,0 +1,28 @@
+rules_kotlin 2.4 propagates the Kotlin warning mode to javac, so the extractor's
+Kotlin warn = "error" setting also makes Java warnings fatal. This breaks the
+Java 8 target with JDK 25's obsolete source/target option warnings. Keep Kotlin
+warnings-as-errors for Kotlin compilation without changing javac warning behavior.
+--- a/kotlin/internal/jvm/compile.bzl
++++ b/kotlin/internal/jvm/compile.bzl
+@@ -1162,21 +1162,6 @@
+             for flag in javac_options_to_flags(plugin[JavacOptions])
+         ])
+ 
+-        # Compile the Java half with the same warning mode as the kotlin part, unless the javac
+-        # options (or a plugin's) already set one: a single `warn` value governs the whole target.
+-        # A per-diagnostic level in `x_warning_level` limits the derivation, because javac has no
+-        # equivalent of `-Xwarning-level`. A diagnostic kept at `warning` or `disabled` under
+-        # `warn = "error"` must not turn every javac warning into an error, and a diagnostic raised
+-        # to `warning` or `error` under `warn = "off"` must not silence every javac warning.
+-        if "-nowarn" not in javac_opts and "-Werror" not in javac_opts:
+-            kotlinc_warn = getattr(kotlinc_options, "warn", None) if kotlinc_options else None
+-            warning_levels = (getattr(kotlinc_options, "x_warning_level", None) if kotlinc_options else None) or {}
+-            levels = warning_levels.values()
+-            if kotlinc_warn == "off" and "error" not in levels and "warning" not in levels:
+-                javac_opts.append("-nowarn")
+-            elif kotlinc_warn == "error" and "warning" not in levels and "disabled" not in levels:
+-                javac_opts.append("-Werror")
+-
+         java_info = java_common.compile(
+             ctx,
+             source_files = srcs.java,
diff --git a/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/source.json b/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/source.json
new file mode 100644
index 000000000000..9556aa0286b4
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_kotlin/2.4.21-codeql.1/source.json
@@ -0,0 +1,10 @@
+{
+    "integrity": "sha256-qjJVRS2+m1LaK6d4fwhl8QeAWIUQnznD1br8IaUhvLY=",
+    "url": "https://github.com/bazel-contrib/rules_kotlin/releases/download/v2.4.21/rules_kotlin-v2.4.21.tar.gz",
+    "patches": {
+        "codeql_add_language_version_option.patch": "sha256-ml0fzhPwNozMi6yKtEn9YLM8LSQE4BWiimdwYzennCo=",
+        "codeql_do_not_emit_jdeps.patch": "sha256-yoBFnSWJyeF+gyhX+03TMTnRxUQJjup/f/KORdxVsAE=",
+        "codeql_do_not_propagate_kotlin_warning_mode_to_javac.patch": "sha256-TvfKfINvi1/tcLq3HDUs2doD4kr8AkMv0nsZvUHPjwg="
+    },
+    "patch_strip": 1
+}
diff --git a/misc/bazel/registry/modules/rules_kotlin/metadata.json b/misc/bazel/registry/modules/rules_kotlin/metadata.json
index ea756f783643..bb307a93badf 100644
--- a/misc/bazel/registry/modules/rules_kotlin/metadata.json
+++ b/misc/bazel/registry/modules/rules_kotlin/metadata.json
@@ -1,5 +1,5 @@
 {
-    "homepage": "https://github.com/bazelbuild/rules_kotlin",
+    "homepage": "https://github.com/bazel-contrib/rules_kotlin",
     "maintainers": [
         {
             "email": "ben@ben.cm",
@@ -18,10 +18,11 @@
         }
     ],
     "repository": [
-        "github:bazelbuild/rules_kotlin"
+        "github:bazelbuild/rules_kotlin",
+        "github:bazel-contrib/rules_kotlin"
     ],
     "versions": [
-        "2.2.2-codeql.1"
+        "2.4.21-codeql.1"
     ],
     "yanked_versions": {}
 }
diff --git a/misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.3/MODULE.bazel b/misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.3/MODULE.bazel
new file mode 100644
index 000000000000..df425921773f
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.3/MODULE.bazel
@@ -0,0 +1,79 @@
+"""rules_swift MODULE.bazel file"""
+
+module(
+    name = "rules_swift",
+    version = "4.0.0-rc5-codeql.3",
+    bazel_compatibility = [">=8.0.0"],
+    compatibility_level = 3,
+)
+
+bazel_dep(name = "abseil-cpp", version = "20250814.1")
+bazel_dep(name = "apple_support", version = "2.8.0")
+bazel_dep(name = "bazel_linux_packages", version = "0.4.1")
+bazel_dep(name = "bazel_features", version = "1.51.0")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1")
+bazel_dep(name = "platforms", version = "0.0.11")
+bazel_dep(name = "protobuf", version = "34.0.bcr.1")
+bazel_dep(name = "rules_cc", version = "0.2.14")
+bazel_dep(name = "rules_shell", version = "0.3.0")
+bazel_dep(name = "swift_argument_parser", version = "1.7.0")
+
+apt = use_extension("@bazel_linux_packages//apt:extensions.bzl", "apt")
+apt.ubuntu(
+    name = "swift_ubuntu22.04_sysroot",
+    architectures = ["amd64"],
+    lockfile = "//swift/internal/extensions:ubuntu22.04_sysroot.lock.json",
+    packages = [
+        "libc6-dev",
+        "libcurl4-openssl-dev",
+        "libstdc++-11-dev",
+        "libxml2-dev",
+        "linux-libc-dev",
+        "zlib1g-dev",
+    ],
+    suites = ["jammy"],
+)
+apt.ubuntu(
+    name = "swift_ubuntu22.04_aarch64_sysroot",
+    architectures = ["arm64"],
+    lockfile = "//swift/internal/extensions:ubuntu22.04_aarch64_sysroot.lock.json",
+    packages = [
+        "libc6-dev",
+        "libcurl4-openssl-dev",
+        "libstdc++-11-dev",
+        "libxml2-dev",
+        "linux-libc-dev",
+        "zlib1g-dev",
+    ],
+    suites = ["jammy"],
+)
+use_repo(
+    apt,
+    "swift_ubuntu22.04_aarch64_sysroot",
+    "swift_ubuntu22.04_sysroot",
+)
+
+swift_autoconfiguration = use_repo_rule("//swift/internal:swift_autoconfiguration.bzl", "swift_autoconfiguration")
+
+swift_autoconfiguration(name = "rules_swift_local_config")
+
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "rules_swift_index_import_5_8",
+    build_file = "//third_party:rules_swift_index_import/BUILD.overlay",
+    canonical_id = "index-import-5.8",
+    sha256 = "28c1ffa39d99e74ed70623899b207b41f79214c498c603915aef55972a851a15",
+    urls = ["https://github.com/MobileNativeFoundation/index-import/releases/download/5.8.0.1/index-import.tar.gz"],
+)
+
+http_archive(
+    name = "rules_swift_index_import_6_1",
+    build_file = "//third_party:rules_swift_index_import/BUILD.overlay",
+    canonical_id = "index-import-6.1",
+    sha256 = "9a54fc1674af6031125a9884480a1e31e1bcf48b8f558b3e8bcc6b6fcd6e8b61",
+    urls = ["https://github.com/MobileNativeFoundation/index-import/releases/download/6.1.0.1/index-import.tar.gz"],
+)
+
+register_toolchains("//swift/toolchains:all")
diff --git a/misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.3/patches/external_static_runtime.patch b/misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.3/patches/external_static_runtime.patch
new file mode 100644
index 000000000000..6614436073bb
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.3/patches/external_static_runtime.patch
@@ -0,0 +1,242 @@
+diff --git a/swift/extensions.bzl b/swift/extensions.bzl
+index b77f636..1255ba7 100644
+--- a/swift/extensions.bzl
++++ b/swift/extensions.bzl
+@@ -191,6 +191,7 @@ def _standalone_toolchain_impl(module_ctx):
+                 name = repository_name,
+                 sha256 = sha256,
+                 platform = platform,
++                static_runtime = toolchain.static_runtime if platform != "xcode" else None,
+                 swift_version = swift_version,
+             )
+             toolchains_build_file_content += toolchains_for_platform(
+@@ -266,6 +267,9 @@ their hashes. For instance:
+ `bazel run @rules_swift//tools/swift-releases -- list 6.2.4`
+ """,
+     ),
++    "static_runtime": attr.label(
++        doc = "External static runtime package to attach to the generated execution toolchains.",
++    ),
+     "swift_version": attr.string(doc = "Version of the swift toolchain to be installed. Cannot be used concurrently with `swift_version_file`"),
+     "swift_version_file": attr.label(doc = "A label to the .swift_version file to use. Cannot be used concurrently with `swift_version`"),
+ })
+diff --git a/swift/internal/extensions/standalone_toolchain.bzl b/swift/internal/extensions/standalone_toolchain.bzl
+index 801aad7..119ded9 100644
+--- a/swift/internal/extensions/standalone_toolchain.bzl
++++ b/swift/internal/extensions/standalone_toolchain.bzl
+@@ -100,6 +100,9 @@ def _standalone_toolchain_impl(repository_ctx):
+         "BUILD.bazel",
+         repository_ctx.attr._build_template,
+         substitutions = {
++            "{external_static_runtime}": (
++                '    external_static_runtime = "{}",'.format(repository_ctx.attr.static_runtime) if repository_ctx.attr.static_runtime else ""
++            ),
+             "{swift_version}": repository_ctx.attr.swift_version,
+         },
+     )
+@@ -117,6 +120,9 @@ standalone_toolchain = repository_rule(
+         "sha256": attr.string(
+             doc = "The expected SHA-256 of the file downloaded. This must match the SHA-256 of the file downloaded.",
+         ),
++        "static_runtime": attr.label(
++            doc = "External static runtime package used by this execution toolchain.",
++        ),
+         "swift_version": attr.string(
+             doc = "Version of the swift toolchain to be installed.",
+             mandatory = True,
+diff --git a/swift/internal/extensions/toolchain.BUILD b/swift/internal/extensions/toolchain.BUILD
+index 1304dc2..ee77866 100644
+--- a/swift/internal/extensions/toolchain.BUILD
++++ b/swift/internal/extensions/toolchain.BUILD
+@@ -364,6 +364,7 @@ swift_toolchain(
+         ),
+         "//conditions:default": [],
+     }),
++{external_static_runtime}
+     swift_tools = "tools",
+     version_file = ".swift-version",
+ )
+diff --git a/swift/toolchains/BUILD b/swift/toolchains/BUILD
+index 1a8db31..fff0879 100644
+--- a/swift/toolchains/BUILD
++++ b/swift/toolchains/BUILD
+@@ -155,6 +155,7 @@ bzl_library(
+         "//swift/internal:features",
+         "//swift/internal:providers",
+         "//swift/internal:target_triples",
++        "//swift/internal:toolchain_utils",
+         "//swift/internal:utils",
+         "//swift/internal:wmo",
+         "//swift/toolchains/config:action_config",
+diff --git a/swift/toolchains/swift_toolchain.bzl b/swift/toolchains/swift_toolchain.bzl
+index 9fc2a49..6f10573 100644
+--- a/swift/toolchains/swift_toolchain.bzl
++++ b/swift/toolchains/swift_toolchain.bzl
+@@ -69,6 +69,11 @@ load(
+     "SwiftModuleAliasesInfo",
+ )
+ load("//swift/internal:target_triples.bzl", "target_triples")
++load(
++    "//swift/internal:toolchain_utils.bzl",
++    "get_swift_toolchain",
++    "use_swift_toolchain",
++)
+ load(
+     "//swift/internal:utils.bzl",
+     "collect_cross_import_overlays",
+@@ -101,6 +106,64 @@ load(
+ )
+ load("//swift/toolchains/config:tool_config.bzl", "ToolConfigInfo")
+-
++
++SwiftStaticRuntimeInfo = provider(
++    fields = {
++        "copts": "Compiler options required to use the runtime.",
++        "files": "Runtime and SDK files required by compile and link actions.",
++        "linkopts": "Linker options required to link the runtime.",
++        "root": "Execution-root-relative path to the runtime SDK.",
++    },
++)
++
++def _swift_static_runtime_impl(ctx):
++    root = ctx.label.workspace_root
++    files = depset(ctx.files.files)
++
++    def expand_root(options):
++        return [option.replace("{root}", root) for option in options]
++
++    return [
++        DefaultInfo(files = files),
++        SwiftStaticRuntimeInfo(
++            copts = expand_root(ctx.attr.copts),
++            files = files,
++            linkopts = expand_root(ctx.attr.linkopts),
++            root = root,
++        ),
++    ]
++
++swift_static_runtime = rule(
++    implementation = _swift_static_runtime_impl,
++    attrs = {
++        "copts": attr.string_list(),
++        "files": attr.label_list(allow_files = True, mandatory = True),
++        "linkopts": attr.string_list(),
++    },
++)
++
++def _swift_runtime_impl(ctx):
++    runtime_cc_info = get_swift_toolchain(ctx).dynamic_runtime_cc_info
++    files = []
++    if runtime_cc_info:
++        for linker_input in runtime_cc_info.linking_context.linker_inputs.to_list():
++            for library in linker_input.libraries:
++                dynamic_library = getattr(library, "dynamic_library", None)
++                if dynamic_library:
++                    files.append(dynamic_library)
++    runtime = depset(files)
++    providers = [DefaultInfo(
++        files = runtime,
++        runfiles = ctx.runfiles(transitive_files = runtime),
++    )]
++    if runtime_cc_info:
++        providers.append(runtime_cc_info)
++    return providers
++
++swift_runtime = rule(
++    implementation = _swift_runtime_impl,
++    toolchains = use_swift_toolchain(),
++)
++
+ def _swift_compile_resource_set(_os, inputs_size):
+     # The `os` argument is unused, but the Starlark API requires both
+     # positional arguments.
+@@ -662,6 +725,7 @@ def _resolve_sdkroot(ctx, cc_toolchain):
+-
++
+ def _swift_toolchain_impl(ctx):
+     toolchain_root = ctx.attr.root
++    external_static_runtime = ctx.attr.external_static_runtime[SwiftStaticRuntimeInfo] if ctx.attr.external_static_runtime else None
+     cc_toolchain = find_cc_toolchain(ctx)
+     target_system_name = _parse_target_system_name(
+         arch = ctx.attr.arch,
+@@ -684,7 +748,7 @@ def _swift_toolchain_impl(ctx):
+              "before invoking Bazel, or configure a Bazel LLVM CC toolchain. " +
+              "The current CC toolchain is configured to use '{}'.".format(cc_toolchain.compiler))
+-
++
+-    sdkroot = _resolve_sdkroot(ctx, cc_toolchain)
++    sdkroot = external_static_runtime.root if external_static_runtime else _resolve_sdkroot(ctx, cc_toolchain)
+-
++
+     if ctx.attr.swift_tools:
+         if ctx.attr.swift_executable:
+@@ -740,6 +804,18 @@ def _swift_toolchain_impl(ctx):
+             ctx.attr.linkopts,
+             ctx.files.linker_inputs,
+         )
++    elif external_static_runtime:
++        swift_linkopts_cc_info = CcInfo(
++            linking_context = cc_common.create_linking_context(
++                linker_inputs = depset([
++                    cc_common.create_linker_input(
++                        owner = ctx.label,
++                        user_link_flags = depset(external_static_runtime.linkopts),
++                        additional_inputs = external_static_runtime.files,
++                    ),
++                ]),
++            ),
++        )
+     else:
+         (
+             swift_linkopts_cc_info,
+@@ -763,6 +839,8 @@ def _swift_toolchain_impl(ctx):
+         swiftcopts.extend(ctx.attr._exec_copts[BuildSettingInfo].value)
+     else:
+         swiftcopts.extend(ctx.attr._copts[BuildSettingInfo].value)
++    if external_static_runtime:
++        swiftcopts.extend(external_static_runtime.copts)
+-
++
+     # Combine build mode features, autoconfigured features, and required
+     # features.
+@@ -774,7 +852,7 @@ def _swift_toolchain_impl(ctx):
+         target_triple = target_triple,
+     ))
+-
++
+-    if apple_common.dotted_version(ctx.attr.parsed_version) >= apple_common.dotted_version("6.3"):
++    if not external_static_runtime and apple_common.dotted_version(ctx.attr.parsed_version) >= apple_common.dotted_version("6.3"):
+         requested_features.append(SWIFT_FEATURE__SUPPORTS_HERMETIC_SWIFTMODULE)
+-
++
+     requested_features.extend(ctx.features)
+@@ -787,6 +865,8 @@ def _swift_toolchain_impl(ctx):
+     additional_tools = [ctx.file.version_file]
+     if ctx.attr.swift_tools:
+         additional_tools += ctx.attr.swift_tools[SwiftToolsInfo].additional_inputs
++    if external_static_runtime:
++        additional_tools += external_static_runtime.files.to_list()
+-
++
+     all_tool_configs = _all_tool_configs(
+         env = ctx.attr.env,
+@@ -873,7 +953,7 @@ def _swift_toolchain_impl(ctx):
+         system_modules = collect_implicit_deps_providers([]),
+         implicit_system_modules = collect_implicit_deps_providers([]),
+         swift_worker = ctx.attr._worker[DefaultInfo].files_to_run,
+-        const_protocols_to_gather = ctx.file.const_protocols_to_gather,
++        const_protocols_to_gather = None if external_static_runtime else ctx.file.const_protocols_to_gather,
+         test_configuration = struct(
+             binary_name = "{name}",
+             env = env,
+@@ -952,6 +1032,10 @@ context.
+ """,
+                 allow_files = True,
+             ),
++            "external_static_runtime": attr.label(
++                doc = "External static Swift runtime and SDK to use instead of the compiler's runtimes.",
++                providers = [[SwiftStaticRuntimeInfo]],
++            ),
+             "static_runtime": attr.label_list(
+                 doc = """\
+ Static Swift runtime archives and supporting linker files that are passed to
diff --git a/misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.3/patches/register_downloaded_macos_toolchain.patch b/misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.3/patches/register_downloaded_macos_toolchain.patch
new file mode 100644
index 000000000000..730735b9e09e
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.3/patches/register_downloaded_macos_toolchain.patch
@@ -0,0 +1,110 @@
+diff --git a/swift/internal/extensions/toolchains.bzl b/swift/internal/extensions/toolchains.bzl
+--- a/swift/internal/extensions/toolchains.bzl
++++ b/swift/internal/extensions/toolchains.bzl
+@@ -132,12 +132,11 @@ def toolchains_for_platform(platform, toolchain_repository):
+         toolchain_repository = toolchain_repository,
+     )
+ 
+-    if platform != "xcode":
+-        content += _EXEC_TOOLCHAIN_PLATFORM.format(
+-            exec_compatible_with = _exec_compatible_with_for_platform(platform),
+-            platform = platform,
+-            toolchain_repository = toolchain_repository,
+-        )
++    content += _EXEC_TOOLCHAIN_PLATFORM.format(
++        exec_compatible_with = _exec_compatible_with_for_platform(platform),
++        platform = platform,
++        toolchain_repository = toolchain_repository,
++    )
+ 
+     if platform in (
+         "ubuntu22.04",
+diff --git a/swift/toolchains/swift_toolchain.bzl b/swift/toolchains/swift_toolchain.bzl
+--- a/swift/toolchains/swift_toolchain.bzl
++++ b/swift/toolchains/swift_toolchain.bzl
+@@ -605,10 +605,14 @@ def _parse_target_system_name(*, arch, os, target_system_name):
+     """Returns the target system name set by the CC toolchain or attempts to create one based on the OS and arch."""
+ 
+     if target_system_name and target_system_name != "local":
++        if os == "macos" and target_system_name.endswith(("-macos", "-macosx")):
++            return target_system_name + "10.15"
+         return target_system_name
+ 
+     if os == "linux":
+         return "%s-unknown-linux-gnu" % arch
++    elif os == "macos":
++        return "%s-apple-macos10.15" % arch
+     elif os == "windows":
+         # The MSVC cc toolchain reports a `target_gnu_system_name` of "local",
+         # so synthesize the triple.
+@@ -706,5 +710,16 @@ def _swift_toolchain_impl(ctx):
+     elif ctx.attr.os == "none":
+         swift_linkopts_cc_info = CcInfo()
++    elif ctx.attr.os == "macos":
++        macos_linkopts = ["-L{}".format(paths.join(toolchain_root, "lib/swift/macosx"))]
++        if sdkroot:
++            macos_linkopts.append("-L{}".format(paths.join(sdkroot, "usr/lib/swift")))
++        swift_linkopts_cc_info = _swift_sdk_linkopts_cc_info(
++            ctx.label,
++            macos_linkopts,
++            ctx.attr.swift_tools[SwiftToolsInfo].additional_inputs if ctx.attr.swift_tools else [],
++        )
++        dynamic_runtime_cc_info = None
++        static_runtime_cc_info = None
+     elif ctx.attr.os == "android":
+         if not sdkroot:
+             fail("Android toolchain requires a sysroot to be set, either via the `sdkroot` attribute or by using a CC toolchain that provides one.")
+diff --git a/swift/internal/extensions/toolchain.BUILD b/swift/internal/extensions/toolchain.BUILD
+--- a/swift/internal/extensions/toolchain.BUILD
++++ b/swift/internal/extensions/toolchain.BUILD
+@@ -333,17 +333,22 @@ swift_toolchain(
+     features = [
+         "swift._supports_upcoming_features",
+         "swift.no_embed_debug_module",
+-        "swift.use_autolink_extract",
+-        "swift.lld_gc_workaround",
+-        "swift.use_module_wrap",
+         # TODO: This should be removed so that private headers can be used with
+         # explicit modules, but the build targets for CgRPC need to be cleaned up
+         # first because they contain C++ code.
+         "swift.module_map_no_private_headers",
+-    ],
++    ] + select({
++        "@platforms//os:linux": [
++            "swift.lld_gc_workaround",
++            "swift.use_autolink_extract",
++            "swift.use_module_wrap",
++        ],
++        "//conditions:default": [],
++    }),
+     os = select({
+         "@platforms//os:linux": "linux",
+         "@platforms//os:macos": "macos",
+     }),
+     parsed_version = "{swift_version}",
++    sdkroot = "{macos_sdkroot}",
+     static_runtime = select({
+diff --git a/swift/internal/extensions/standalone_toolchain.bzl b/swift/internal/extensions/standalone_toolchain.bzl
+index 119ded9..b7065b7 100644
+--- a/swift/internal/extensions/standalone_toolchain.bzl
++++ b/swift/internal/extensions/standalone_toolchain.bzl
+@@ -95,6 +95,11 @@ def _standalone_toolchain_impl(repository_ctx):
+             strip_prefix = filename.removesuffix(".tar.gz"),
+         )
+ 
++    macos_sdkroot = ""
++    if repository_ctx.attr.platform == "xcode":
++        macos_sdkroot = _run(repository_ctx, ["xcrun", "--sdk", "macosx", "--show-sdk-path"])
++        repository_ctx.watch(macos_sdkroot)
++
+     repository_ctx.file(".swift-version", repository_ctx.attr.swift_version)
+     repository_ctx.template(
+         "BUILD.bazel",
+@@ -103,6 +108,7 @@ def _standalone_toolchain_impl(repository_ctx):
+             "{external_static_runtime}": (
+                 '    external_static_runtime = "{}",'.format(repository_ctx.attr.static_runtime) if repository_ctx.attr.static_runtime else ""
+             ),
++            "{macos_sdkroot}": macos_sdkroot,
+             "{swift_version}": repository_ctx.attr.swift_version,
+         },
+     )
diff --git a/misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.3/source.json b/misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.3/source.json
new file mode 100644
index 000000000000..71710b254ccf
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.3/source.json
@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-Ly2lS4AlZJMiyqAxKHyCB+2pGeP5aYkQ6zv8QheeSTI=",
+    "url": "https://github.com/bazelbuild/rules_swift/releases/download/4.0.0-rc5/rules_swift.4.0.0-rc5.tar.gz",
+    "patches": {
+        "external_static_runtime.patch": "sha256-bnyDyK3dU+vmNVKr16y0vMrtkUSYlVOkWtIBVtjqBGw=",
+        "register_downloaded_macos_toolchain.patch": "sha256-w6/S2LEFXEFE+eLUeowKl4mQ5bLvb2SxQknXfXEglyE="
+    },
+    "patch_strip": 1
+}
diff --git a/misc/bazel/registry/modules/rules_swift/metadata.json b/misc/bazel/registry/modules/rules_swift/metadata.json
new file mode 100644
index 000000000000..da9cf33a95eb
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_swift/metadata.json
@@ -0,0 +1,11 @@
+{
+    "homepage": "https://github.com/bazelbuild/rules_swift",
+    "maintainers": [],
+    "repository": [
+        "github:bazelbuild/rules_swift"
+    ],
+    "versions": [
+        "4.0.0-rc5-codeql.3"
+    ],
+    "yanked_versions": {}
+}
diff --git a/misc/codegen/generators/qlgen.py b/misc/codegen/generators/qlgen.py
index c3848917c49e..2b836b2706d8 100755
--- a/misc/codegen/generators/qlgen.py
+++ b/misc/codegen/generators/qlgen.py
@@ -83,6 +83,8 @@ def _humanize(s: str) -> str:
 
 
 _format_re = re.compile(r"\{(\w+)\}")
+# Regular expression to find manual `toStringImpl`s
+_to_string_impl_re = re.compile(r"\bstring\s+toStringImpl\s*\(")
 
 
 def _get_doc(cls: schema.Class, prop: schema.Property, plural=None):
@@ -117,6 +119,7 @@ def _get_doc(cls: schema.Class, prop: schema.Property, plural=None):
 @dataclasses.dataclass
 class Resolver:
     lookup: typing.Dict[str, schema.ClassBase]
+    custom_to_string_impls: typing.Set[str] = dataclasses.field(default_factory=set)
     _property_cache: typing.Dict[tuple[int, int], ql.Property] = dataclasses.field(
         default_factory=dict, init=False
     )
@@ -237,6 +240,10 @@ def get_ql_class(self, cls: schema.Class) -> ql.Class:
                 hideable="ql_hideable" in cls.pragmas,
                 internal="ql_internal" in cls.pragmas,
                 cfg=cls.cfg,
+                to_string_impl_from_primary_class=bool(
+                    cls.pragmas.get("ql_to_string_impl_from_primary_class")
+                )
+                and cls.name not in self.custom_to_string_impls,
             )
         return self._class_cache[cache_key]
 
@@ -496,7 +503,15 @@ def generate(opts, renderer):
 
     data = schemaloader.load_file(input)
 
-    resolver = Resolver(data.classes)
+    # Schema class names whose wrapper define a manual `toStringImpl`
+    custom_to_string_impls = {
+        cls.name
+        for cls in data.classes.values()
+        if not cls.imported
+        and (stub_out / _get_path_impl(cls)).is_file()
+        and _to_string_impl_re.search((stub_out / _get_path_impl(cls)).read_text())
+    }
+    resolver = Resolver(data.classes, custom_to_string_impls)
 
     classes = {
         name: resolver.get_ql_class(cls)
@@ -522,7 +537,6 @@ def generate(opts, renderer):
     with renderer.manage(
         generated=generated, stubs=stubs, registry=registry, force=opts.force
     ) as renderer:
-
         db_classes = [
             cls for name, cls in classes.items() if not data.classes[name].synth
         ]
diff --git a/misc/codegen/lib/ql.py b/misc/codegen/lib/ql.py
index 503570c2adc3..7b4434a42e8a 100644
--- a/misc/codegen/lib/ql.py
+++ b/misc/codegen/lib/ql.py
@@ -117,6 +117,7 @@ class Class:
     doc: List[str] = field(default_factory=list)
     hideable: bool = False
     cfg: bool = False
+    to_string_impl_from_primary_class: bool = False
 
     def __post_init__(self):
         def get_bases(bases):
diff --git a/misc/codegen/lib/schemadefs.py b/misc/codegen/lib/schemadefs.py
index 125951701c9b..de648c0f8e4a 100644
--- a/misc/codegen/lib/schemadefs.py
+++ b/misc/codegen/lib/schemadefs.py
@@ -252,7 +252,7 @@ def __getitem__(self, item):
 
 use_for_null = _ClassPragma("null")
 
-qltest.add(_ClassPragma("skip"))
+qltest.add(_Pragma("skip"))
 qltest.add(_ClassPragma("collapse_hierarchy"))
 qltest.add(_ClassPragma("uncollapse_hierarchy"))
 qltest.add(
@@ -263,6 +263,12 @@ def __getitem__(self, item):
 
 ql.add(_Parametrized(_ClassPragma("default_doc_name"), factory=lambda doc: doc))
 ql.add(_ClassPragma("hideable", inherited=True))
+ql.add(
+    _Parametrized(
+        _ClassPragma("to_string_impl_from_primary_class", inherited=True),
+        factory=lambda enabled: enabled,
+    )
+)
 ql.add(_Pragma("internal"))
 ql.add(_Parametrized(_Pragma("name"), factory=lambda name: name))
 ql.add(_Parametrized(_PropertyPragma("db_table_name"), factory=lambda name: name))
diff --git a/misc/codegen/templates/ql_class.mustache b/misc/codegen/templates/ql_class.mustache
index e80e0b0eebda..391c096afa31 100644
--- a/misc/codegen/templates/ql_class.mustache
+++ b/misc/codegen/templates/ql_class.mustache
@@ -77,6 +77,10 @@ module Generated {
     {{/root}}
     {{#final}}
     override string getAPrimaryQlClass() { result = "{{name}}" }
+    {{#to_string_impl_from_primary_class}}
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+    {{/to_string_impl_from_primary_class}}
     {{/final}}
     {{#properties}}
 
diff --git a/misc/codegen/test/test_qlgen.py b/misc/codegen/test/test_qlgen.py
index a2434432390f..7e5bce3a06c1 100644
--- a/misc/codegen/test/test_qlgen.py
+++ b/misc/codegen/test/test_qlgen.py
@@ -196,6 +196,59 @@ def test_one_empty_class(generate_classes):
     }
 
 
+def test_to_string_impl_from_primary_class(generate_classes):
+    assert generate_classes(
+        [
+            schema.Class(
+                "A",
+                derived={"B"},
+                pragmas={"ql_to_string_impl_from_primary_class": True},
+            ),
+            schema.Class(
+                "B",
+                bases=["A"],
+                pragmas={"ql_to_string_impl_from_primary_class": True},
+            ),
+        ]
+    ) == {
+        "A.qll": (
+            a_ql_class_public(name="A"),
+            a_ql_stub(name="A"),
+            a_ql_class(
+                name="A",
+                imports=[stub_import_prefix + "A"],
+                to_string_impl_from_primary_class=True,
+            ),
+        ),
+        "B.qll": (
+            a_ql_class_public(name="B", imports=[stub_import_prefix + "A"]),
+            a_ql_stub(name="B"),
+            a_ql_class(
+                name="B",
+                final=True,
+                bases=["A"],
+                bases_impl=["AImpl::A"],
+                imports=[
+                    stub_import_prefix_internal + "AImpl::Impl as AImpl",
+                ],
+                to_string_impl_from_primary_class=True,
+            ),
+        ),
+    }
+
+
+def test_to_string_impl_from_primary_class_is_not_generated_when_custom():
+    cls = schema.Class(
+        "A",
+        pragmas={"ql_to_string_impl_from_primary_class": True},
+    )
+    # Pass `A` as a class with a custom `toStringImpl`
+    resolver = qlgen.Resolver({"A": cls}, {"A"})
+
+    # Resolving `A` gives a class where `to_string_impl_from_primary_class` does not hold.
+    assert not resolver.get_ql_class(cls).to_string_impl_from_primary_class
+
+
 def test_one_empty_internal_class(generate_classes):
     assert generate_classes([schema.Class("A", pragmas=["ql_internal"])]) == {
         "A.qll": (
diff --git a/misc/codegen/test/test_schemaloader.py b/misc/codegen/test/test_schemaloader.py
index 5e8ba91b742a..cdfc684ef391 100644
--- a/misc/codegen/test/test_schemaloader.py
+++ b/misc/codegen/test/test_schemaloader.py
@@ -382,6 +382,29 @@ class A:
     }
 
 
+def test_inherited_to_string_impl_from_primary_class_pragma():
+    @load
+    class data:
+        @defs.ql.to_string_impl_from_primary_class(True)
+        class A:
+            pass
+
+        class B(A):
+            pass
+
+        @defs.ql.to_string_impl_from_primary_class(False)
+        class C(B):
+            pass
+
+        class D(C):
+            pass
+
+    assert data.classes["A"].pragmas["ql_to_string_impl_from_primary_class"] is True
+    assert data.classes["B"].pragmas["ql_to_string_impl_from_primary_class"] is True
+    assert data.classes["C"].pragmas["ql_to_string_impl_from_primary_class"] is False
+    assert data.classes["D"].pragmas["ql_to_string_impl_from_primary_class"] is False
+
+
 def test_synth_from_class():
     @load
     class data:
diff --git a/misc/pytest/lib/query_suites.py b/misc/pytest/lib/query_suites.py
index fcbb1f16bde0..1e70008f65bc 100644
--- a/misc/pytest/lib/query_suites.py
+++ b/misc/pytest/lib/query_suites.py
@@ -9,8 +9,8 @@ def ret(query_suite):
         actual = sorted(actual.splitlines())
         actual = [os.path.relpath(q, semmle_code_dir) for q in actual]
         actual_file_name = query_suite + '.actual'
-        expected_files.add(actual_file_name)
-        (cwd / actual_file_name).write_text('\n'.join(actual) + '\n')
+        with expected_files.add(actual_file_name) as f:
+            f.write('\n'.join(actual) + '\n')
     return ret
 
 @pytest.fixture
@@ -25,6 +25,6 @@ def ret(lang_folder_name, query_suites):
         not_included = sorted(set(all_queries) - included_in_qls)
         not_included = [os.path.relpath(q, semmle_code_dir) for q in not_included]
         not_included_file_name = 'not_included_in_qls.actual'
-        expected_files.add(not_included_file_name)
-        (cwd / not_included_file_name).write_text('\n'.join(not_included) + '\n')
+        with expected_files.add(not_included_file_name) as f:
+            f.write('\n'.join(not_included) + '\n')
     return ret
diff --git a/misc/scripts/accept-expected-changes-from-ci.py b/misc/scripts/accept-expected-changes-from-ci.py
index e5f583044d40..0b50c5c42b50 100755
--- a/misc/scripts/accept-expected-changes-from-ci.py
+++ b/misc/scripts/accept-expected-changes-from-ci.py
@@ -208,7 +208,7 @@ def get_log_content(status: GithubStatus) -> str:
     LOGGER.debug(f"'{status.context}': Getting logs")
     if status.job_ids:
         contents = [subprocess.check_output(
-            ["gh", "api", f"/repos/{status.nwo}/actions/jobs/{job_id}/logs"],
+            ["gh", "api", f"/repos/{status.nwo}/actions/jobs/{job_id}/logs", "--allow-escape-sequences"],
         ).decode("utf-8") for job_id in status.job_ids]
         content = "\n".join(contents)
     else:
@@ -275,7 +275,7 @@ def main(pr_number: Optional[int], sha_override: Optional[str] = None, force=Fal
 
     lang_test_failures: List[GithubStatus] = list()
     for status in newest_status.values():
-        if " Language Tests" in status.context or status.context in supported_internal_status_language_test_names:
+        if " Language Tests" in status.context and not " Language Tests Windows" in status.context or status.context in supported_internal_status_language_test_names:
             if status.state == "failure":
                 lang_test_failures.append(status)
             elif status.state == "pending":
diff --git a/misc/scripts/check-query-ids.py b/misc/scripts/check-query-ids.py
index 4158b992ec7c..a11ce03b5328 100755
--- a/misc/scripts/check-query-ids.py
+++ b/misc/scripts/check-query-ids.py
@@ -20,7 +20,8 @@ def main():
     query_ids: Dict[str, List[str]] = {}
 
     # Just check src folders for now to avoid churn
-    for query_path in Path().glob("**/src/**/*.ql"):
+    # The glob can yield the same file more than once when its path contains several `src` folders.
+    for query_path in sorted(set(Path().glob("**/src/**/*.ql"))):
         # Skip compiled query packs
         if any(p == ".codeql" for p in query_path.parts):
             continue
diff --git a/misc/scripts/models-as-data/bulk_generate_mad.py b/misc/scripts/models-as-data/bulk_generate_mad.py
index e2de5038206e..7238f030c561 100755
--- a/misc/scripts/models-as-data/bulk_generate_mad.py
+++ b/misc/scripts/models-as-data/bulk_generate_mad.py
@@ -241,6 +241,7 @@ def generate_models(config, args, project: Project, database_dir: str) -> None:
     generator.with_summaries = should_generate_summaries(project)
     generator.threads = args.codeql_threads
     generator.ram = args.codeql_ram
+    generator.extension_format = args.extension_format
     if config.get("single-file", False):
         generator.single_file = name
     else:
@@ -430,10 +431,11 @@ def download_and_decompress(analyzed_database: dict) -> str:
 def clean_up_mad_destination_for_project(config, name: str):
     target = pathlib.Path(config["destination"], name)
     if config.get("single-file", False):
-        target = target.with_suffix(".model.yml")
-        if target.exists():
-            print(f"Deleting existing MaD file at {target}")
-            target.unlink()
+        for extension in (".model.json", ".model.yml"):
+            model_target = target.with_suffix(extension)
+            if model_target.exists():
+                print(f"Deleting existing MaD file at {model_target}")
+                model_target.unlink()
     elif target.exists():
         print(f"Deleting existing MaD directory at {target}")
         shutil.rmtree(target, ignore_errors=True)
@@ -543,6 +545,12 @@ def main(config, args) -> None:
         help="What `--threads` value to pass to `codeql` (default %(default)s)",
         default=0,
     )
+    parser.add_argument(
+        "--extension-format",
+        choices=["json", "yaml"],
+        default="yaml",
+        help="Format for the generated data extension files (default %(default)s)",
+    )
     args = parser.parse_args()
 
     # Load config file
diff --git a/misc/scripts/models-as-data/convert_extensions.py b/misc/scripts/models-as-data/convert_extensions.py
index 01a10dae5ffd..62ba64acf44e 100644
--- a/misc/scripts/models-as-data/convert_extensions.py
+++ b/misc/scripts/models-as-data/convert_extensions.py
@@ -8,25 +8,6 @@
 import tempfile
 
 
-def quote_if_needed(v):
-    # string columns
-    if type(v) is str:
-        return '"' + v + '"'
-    # bool column
-    return str(v)
-
-
-def parseData(data):
-    rows = [{}, {}]
-    for row in data:
-        d = map(quote_if_needed, row)
-        provenance = row[-1]
-        targetRows = rows[1] if provenance.endswith("generated") else rows[0]
-        helpers.insert_update(targetRows, row[0], "      - [" + ", ".join(d) + "]\n")
-
-    return rows
-
-
 class Converter:
     def __init__(self, language, dbDir):
         self.language = language
@@ -38,6 +19,7 @@ def __init__(self, language, dbDir):
         )
         self.extDir = os.path.join(self.codeQlRoot, f"{self.language}/ql/lib/ext/")
         self.dirname = "modelconverter"
+        # N.B. change this to .model.json to change the output format:
         self.modelFileExtension = ".model.yml"
         self.workDir = tempfile.mkdtemp()
 
@@ -63,48 +45,38 @@ def runQuery(self, query):
         )
         return helpers.readData(self.workDir, resultBqrs)
 
-    def asAddsTo(self, rows, predicate):
-        extensions = [{}, {}]
-        for i in range(2):
-            for key in rows[i]:
-                extensions[i][key] = helpers.addsToTemplate.format(
-                    f"codeql/{self.language}-all", predicate, rows[i][key]
-                )
-
-        return extensions
-
-    def getAddsTo(self, query, predicate):
+    def merge_query_results(self, query, predicate, mergers):
         data = self.runQuery(query)
-        rows = parseData(data)
-        return self.asAddsTo(rows, predicate)
-
-    def makeContent(self):
-        summaries = self.getAddsTo("ExtractSummaries.ql", helpers.summaryModelPredicate)
-        sources = self.getAddsTo("ExtractSources.ql", helpers.sourceModelPredicate)
-        sinks = self.getAddsTo("ExtractSinks.ql", helpers.sinkModelPredicate)
-        neutrals = self.getAddsTo("ExtractNeutrals.ql", helpers.neutralModelPredicate)
-        return [
-            helpers.merge(sources[0], sinks[0], summaries[0], neutrals[0]),
-            helpers.merge(sources[1], sinks[1], summaries[1], neutrals[1]),
+        for row in data:
+            provenance = row[-1]
+            namespace = row[0]
+            target_merger = (
+                mergers[1] if provenance.endswith("generated") else mergers[0]
+            )
+            target_merger.add_row(namespace, predicate, row)
+
+    def make_extensions(self):
+        mergers = [
+            helpers.ExtensionMerger(f"codeql/{self.language}-all"),
+            helpers.ExtensionMerger(f"codeql/{self.language}-all"),
         ]
+        self.merge_query_results(
+            "ExtractSummaries.ql", helpers.summaryModelPredicate, mergers
+        )
+        self.merge_query_results(
+            "ExtractSources.ql", helpers.sourceModelPredicate, mergers
+        )
+        self.merge_query_results("ExtractSinks.ql", helpers.sinkModelPredicate, mergers)
+        self.merge_query_results(
+            "ExtractNeutrals.ql", helpers.neutralModelPredicate, mergers
+        )
+        return mergers
+
+    def run(self):
+        mergers = self.make_extensions()
 
-    def save(self, extensions):
         # Create directory if it doesn't exist
         os.makedirs(self.extDir, exist_ok=True)
 
-        # Create a file for each namespace and save models.
-        extensionTemplate = """extensions:
-{0}"""
-        for entry in extensions[0]:
-            with open(self.extDir + "/" + entry + self.modelFileExtension, "w") as f:
-                f.write(extensionTemplate.format(extensions[0][entry]))
-
-        for entry in extensions[1]:
-            with open(
-                self.extDir + "/generated/" + entry + self.modelFileExtension, "w"
-            ) as f:
-                f.write(extensionTemplate.format(extensions[1][entry]))
-
-    def run(self):
-        extensions = self.makeContent()
-        self.save(extensions)
+        mergers[0].save(self.extDir, self.modelFileExtension)
+        mergers[1].save(self.extDir + "/generated", self.modelFileExtension)
diff --git a/misc/scripts/models-as-data/data_extension_file.py b/misc/scripts/models-as-data/data_extension_file.py
new file mode 100644
index 000000000000..2f0d6bcd1ccf
--- /dev/null
+++ b/misc/scripts/models-as-data/data_extension_file.py
@@ -0,0 +1,76 @@
+import json
+
+
+class DataExtensionFile:
+    """Simple class for representing a data extension file and writing it to disk in a
+    pretty-printed YAML or JSON format."""
+
+    def __init__(self, pack):
+        self.pack = pack
+        # predicate -> dict of tuples (used as an ordered set)
+        self.predicates = {}
+
+    def add_rows(self, predicate, rows):
+        """Add the rows, which can be any collection of any collection of string/boolean values."""
+        if predicate not in self.predicates:
+            self.predicates[predicate] = dict()
+        d = self.predicates[predicate]
+        for row in rows:
+            # To be agnostic about the type of collection used for rows, convert each one to a
+            # tuple. Insert the tuple as a key in the dict, associating it with a dummy value.
+            d[tuple(row)] = None
+
+    def yaml_for_value(self, value):
+        # if is boolean:
+        if isinstance(value, bool):
+            # json.dumps would produce lower-case "true" or "false". Even though that's valid YAML,
+            # we have historically used the upper-case variants.
+            return "True" if value else "False"
+        return json.dumps(value)
+
+    def yaml_for_row(self, row):
+        return f"[{', '.join(self.yaml_for_value(value) for value in row)}]"
+
+    def yaml_for_predicate(self, predicate):
+        return f"""  - addsTo:
+      pack: {self.pack}
+      extensible: {predicate}
+    data:
+      - {'\n      - '.join(self.yaml_for_row(row) for row in self.predicates[predicate].keys())}
+"""
+
+    def write_yaml(self, f):
+        # It would be preferable to use a YAML serialization library, but this lets us control the
+        # formatting e.g. to produce one line per tuple.
+        f.write("# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.\n")
+        f.write("extensions:\n")
+        for predicate in sorted(self.predicates.keys()):
+            f.write(self.yaml_for_predicate(predicate))
+
+    def json_for_row(self, row):
+        return "[" + ", ".join(json.dumps(value) for value in row) + "]"
+
+    def json_for_predicate(self, predicate):
+        return f"""    {{
+      "addsTo": {{
+        "pack": "{self.pack}",
+        "extensible": "{predicate}"
+      }},
+      "data": [
+        {',\n        '.join(self.json_for_row(row) for row in self.predicates[predicate].keys())}
+      ]
+    }}"""
+
+    def write_json(self, f):
+        # It would be preferable to use a serializer like Python's json.dumps, but it can't
+        # pretty-print with one line per tuple.
+        f.write("// THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.\n")
+        f.write("{\n")
+        f.write('  "extensions": [\n')
+        for i, predicate in enumerate(self.predicates):
+            if i > 0:
+                f.write(",\n")
+            f.write(self.json_for_predicate(predicate))
+        f.write("\n")
+        f.write("  ]\n")
+        f.write("}")
diff --git a/misc/scripts/models-as-data/generate_mad.py b/misc/scripts/models-as-data/generate_mad.py
index d78d5b10cc5d..25b2fb9ae887 100755
--- a/misc/scripts/models-as-data/generate_mad.py
+++ b/misc/scripts/models-as-data/generate_mad.py
@@ -6,29 +6,8 @@
 import subprocess
 import sys
 import tempfile
-import re
 import argparse
 
-
-def quote_if_needed(row):
-    if row != "true" and row != "false":
-        return '"' + row + '"'
-    # subtypes column
-    return row[0].upper() + row[1:]
-
-
-def parseData(data):
-    rows = {}
-
-    for row in data:
-        d = row[0].split(";")
-        namespace = d[0]
-        d = map(quote_if_needed, d)
-        helpers.insert_update(rows, namespace, "      - [" + ", ".join(d) + "]\n")
-
-    return rows
-
-
 description = """\
 This generates summary, source, sink and neutral models for the code in the database.
 The files will be placed in `LANGUAGE/ql/lib/ext/generated/modelgenerator/DIR`"""
@@ -54,6 +33,7 @@ class Generator:
     threads = 0
     folder = ""
     single_file = None
+    extension_format = "yaml"
 
     def __init__(self, language=None):
         self.language = language
@@ -140,6 +120,12 @@ def make():
             "--single-file",
             help="Generate a single file with all models instead of separate files for each namespace, using provided argument as the base filename.",
         )
+        p.add_argument(
+            "--extension-format",
+            choices=["json", "yaml"],
+            default="yaml",
+            help="Format for the generated data extension files (default %(default)s)",
+        )
         generator = p.parse_args(namespace=Generator())
 
         if (
@@ -182,91 +168,84 @@ def runQuery(self, query):
 
         return helpers.readData(self.workDir, resultBqrs)
 
-    def asAddsTo(self, rows, predicate):
-        extensions = {}
-        for key in rows:
-            extensions[key] = helpers.addsToTemplate.format(
-                f"codeql/{self.language}-all", predicate, rows[key]
-            )
-        return extensions
-
-    def getAddsTo(self, query, predicate):
+    def convert_if_needed(self, value):
+        # Convert a string value to a boolean if it is "true" or "false". Otherwise, return the original
+        # value as a string. Since no extensible predicate currently uses integers, don't attempt to
+        # convert numeric strings to integers.
+        if value == "true":
+            return True
+        if value == "false":
+            return False
+        return value
+
+    def merge_query_results(self, query, predicate, merger):
         data = self.runQuery(query)
-        rows = parseData(data)
-        if self.single_file and rows:
-            rows = {self.single_file: "".join(rows.values())}
-        return self.asAddsTo(rows, predicate)
+        for row in data:
+            d = row[0].split(";")
+            namespace = d[0]
+            d = list(map(self.convert_if_needed, d))
+            if self.single_file:
+                merger.add_row(self.single_file, predicate, d)
+            else:
+                merger.add_row(namespace, predicate, d)
+
+    def make_extensions(self):
+        merger = helpers.ExtensionMerger(f"codeql/{self.language}-all")
 
-    def makeContent(self):
-        summaryAddsTo = {}
         if self.with_summaries:
-            summaryAddsTo = self.getAddsTo(
-                "CaptureSummaryModels.ql", helpers.summaryModelPredicate
+            self.merge_query_results(
+                "CaptureSummaryModels.ql", helpers.summaryModelPredicate, merger
             )
 
-        sinkAddsTo = {}
         if self.with_sinks:
-            sinkAddsTo = self.getAddsTo(
-                "CaptureSinkModels.ql", helpers.sinkModelPredicate
+            self.merge_query_results(
+                "CaptureSinkModels.ql", helpers.sinkModelPredicate, merger
             )
 
-        sourceAddsTo = {}
         if self.with_sources:
-            sourceAddsTo = self.getAddsTo(
-                "CaptureSourceModels.ql", helpers.sourceModelPredicate
+            self.merge_query_results(
+                "CaptureSourceModels.ql", helpers.sourceModelPredicate, merger
             )
 
-        neutralAddsTo = {}
         if self.with_neutrals:
-            neutralAddsTo = self.getAddsTo(
-                "CaptureNeutralModels.ql", helpers.neutralModelPredicate
+            self.merge_query_results(
+                "CaptureNeutralModels.ql", helpers.neutralModelPredicate, merger
             )
 
-        return helpers.merge(summaryAddsTo, sinkAddsTo, sourceAddsTo, neutralAddsTo)
+        return merger
 
-    def makeTypeBasedContent(self):
+    def make_type_based_extensions(self):
+        merger = helpers.ExtensionMerger(f"codeql/{self.language}-all")
         if self.with_typebased_summaries:
-            typeBasedSummaryAddsTo = self.getAddsTo(
-                "CaptureTypeBasedSummaryModels.ql", helpers.summaryModelPredicate
-            )
-        else:
-            typeBasedSummaryAddsTo = {}
-
-        return typeBasedSummaryAddsTo
-
-    def save(self, extensions, extension):
-        # Create a file for each namespace and save models.
-        extensionTemplate = """# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-{0}"""
-        for entry in extensions:
-            # Replace problematic characters with dashes, and collapse multiple dashes.
-            sanitizedEntry = re.sub(
-                r"-+", "-", entry.replace("/", "-").replace(":", "-")
+            self.merge_query_results(
+                "CaptureTypeBasedSummaryModels.ql",
+                helpers.summaryModelPredicate,
+                merger,
             )
-            target = os.path.join(self.generated_frameworks, sanitizedEntry + extension)
-            with open(target, "w") as f:
-                f.write(extensionTemplate.format(extensions[entry]))
-            print("Models as data extensions written to " + target)
+        return merger
 
     def run(self):
-        content = self.makeContent()
-        typeBasedContent = self.makeTypeBasedContent()
+        merger = self.make_extensions()
+        type_based_extensions = self.make_type_based_extensions()
 
         if self.dry_run:
             print("Models as data extensions generated, but not written to file.")
             sys.exit(0)
 
+        file_extension = ".json" if self.extension_format == "json" else ".yml"
+
         if (
             self.with_sinks
             or self.with_sources
             or self.with_summaries
             or self.with_neutrals
         ):
-            self.save(content, ".model.yml")
+            merger.save(self.generated_frameworks, f".model{file_extension}")
 
         if self.with_typebased_summaries:
-            self.save(typeBasedContent, ".typebased.model.yml")
+            type_based_extensions.save(
+                self.generated_frameworks, f".typebased.model{file_extension}"
+            )
 
 
 if __name__ == "__main__":
diff --git a/misc/scripts/models-as-data/helpers.py b/misc/scripts/models-as-data/helpers.py
index 580523f4bec6..966ce372bd15 100644
--- a/misc/scripts/models-as-data/helpers.py
+++ b/misc/scripts/models-as-data/helpers.py
@@ -2,17 +2,56 @@
 import os
 import shutil
 import subprocess
+import re
+import data_extension_file
 
 # Shared strings.
 summaryModelPredicate = "summaryModel"
 sinkModelPredicate = "sinkModel"
 sourceModelPredicate = "sourceModel"
 neutralModelPredicate = "neutralModel"
-addsToTemplate = """  - addsTo:
-      pack: {0}
-      extensible: {1}
-    data:
-{2}"""
+
+
+class ExtensionMerger:
+    """Helper class for accumulating tuples grouped by namespace and predicate, and generating data
+    extensions for them."""
+
+    def __init__(self, pack):
+        self.pack = pack
+        # namespace -> predicate -> dict of tuples (used as an ordered set)
+        self.namespaces = {}
+
+    def add_row(self, namespace, predicate, row):
+        """Add the row, which can be any type of collection of string/boolean values, to the set of
+        tuples for the given namespace and predicate."""
+        if namespace not in self.namespaces:
+            self.namespaces[namespace] = {}
+        if predicate not in self.namespaces[namespace]:
+            self.namespaces[namespace][predicate] = dict()
+        self.namespaces[namespace][predicate][tuple(row)] = None
+
+    def save(self, dir, file_extension):
+        """Save the accumulated rows as data extension files in the specified directory. Each
+        namespace will result in a separate file, with the file name derived from the namespace,
+        plus the given file extension."""
+        # Create a file for each namespace and save models.
+        for namespace in self.namespaces:
+            extension = data_extension_file.DataExtensionFile(self.pack)
+            for predicate in self.namespaces[namespace]:
+                extension.add_rows(
+                    predicate, self.namespaces[namespace][predicate].keys()
+                )
+            # Replace problematic characters with dashes, and collapse multiple dashes.
+            sanitized_namespace = re.sub(
+                r"-+", "-", namespace.replace("/", "-").replace(":", "-")
+            )
+            target = os.path.join(dir, f"{sanitized_namespace}{file_extension}")
+            with open(target, "w") as f:
+                if file_extension.endswith(".json"):
+                    extension.write_json(f)
+                else:
+                    extension.write_yaml(f)
+            print("Models as data extensions written to " + target)
 
 
 def remove_dir(dirName):
diff --git a/misc/suite-helpers/CHANGELOG.md b/misc/suite-helpers/CHANGELOG.md
index 2e398f4824df..f6f103a7e8d0 100644
--- a/misc/suite-helpers/CHANGELOG.md
+++ b/misc/suite-helpers/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.0.61
+
+No user-facing changes.
+
+## 1.0.60
+
+No user-facing changes.
+
+## 1.0.59
+
+No user-facing changes.
+
+## 1.0.58
+
+No user-facing changes.
+
+## 1.0.57
+
+No user-facing changes.
+
+## 1.0.56
+
+No user-facing changes.
+
+## 1.0.55
+
+No user-facing changes.
+
 ## 1.0.54
 
 No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.55.md b/misc/suite-helpers/change-notes/released/1.0.55.md
new file mode 100644
index 000000000000..fd53dce64a9f
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.55.md
@@ -0,0 +1,3 @@
+## 1.0.55
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.56.md b/misc/suite-helpers/change-notes/released/1.0.56.md
new file mode 100644
index 000000000000..3b784cb7d975
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.56.md
@@ -0,0 +1,3 @@
+## 1.0.56
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.57.md b/misc/suite-helpers/change-notes/released/1.0.57.md
new file mode 100644
index 000000000000..18a94c4bca4a
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.57.md
@@ -0,0 +1,3 @@
+## 1.0.57
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.58.md b/misc/suite-helpers/change-notes/released/1.0.58.md
new file mode 100644
index 000000000000..f43459b898c0
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.58.md
@@ -0,0 +1,3 @@
+## 1.0.58
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.59.md b/misc/suite-helpers/change-notes/released/1.0.59.md
new file mode 100644
index 000000000000..071c0337a4d5
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.59.md
@@ -0,0 +1,3 @@
+## 1.0.59
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.60.md b/misc/suite-helpers/change-notes/released/1.0.60.md
new file mode 100644
index 000000000000..74ecf38fafa0
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.60.md
@@ -0,0 +1,3 @@
+## 1.0.60
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.61.md b/misc/suite-helpers/change-notes/released/1.0.61.md
new file mode 100644
index 000000000000..432f5481ee83
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.61.md
@@ -0,0 +1,3 @@
+## 1.0.61
+
+No user-facing changes.
diff --git a/misc/suite-helpers/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
index c3c3b0f4418a..1319f4fe8fde 100644
--- a/misc/suite-helpers/codeql-pack.release.yml
+++ b/misc/suite-helpers/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.54
+lastReleaseVersion: 1.0.61
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index 12203ff110fa..037ffbb300c5 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.55-dev
+version: 1.0.62-dev
 groups: shared
 warnOnImplicitThis: true
diff --git a/python/extractor/cli-integration-test/parser-telemetry/repo_dir/old_parser.py b/python/extractor/cli-integration-test/parser-telemetry/repo_dir/old_parser.py
new file mode 100644
index 000000000000..7d4290a117a4
--- /dev/null
+++ b/python/extractor/cli-integration-test/parser-telemetry/repo_dir/old_parser.py
@@ -0,0 +1 @@
+x = 1
diff --git a/python/extractor/cli-integration-test/parser-telemetry/repo_dir/tree_sitter_parser.py b/python/extractor/cli-integration-test/parser-telemetry/repo_dir/tree_sitter_parser.py
new file mode 100644
index 000000000000..08a86e1f4c6d
--- /dev/null
+++ b/python/extractor/cli-integration-test/parser-telemetry/repo_dir/tree_sitter_parser.py
@@ -0,0 +1,3 @@
+match 1:
+    case 1:
+        pass
diff --git a/python/extractor/cli-integration-test/parser-telemetry/test.sh b/python/extractor/cli-integration-test/parser-telemetry/test.sh
new file mode 100755
index 000000000000..86219c86bf12
--- /dev/null
+++ b/python/extractor/cli-integration-test/parser-telemetry/test.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -Eeuo pipefail # see https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
+
+set -x
+
+CODEQL=${CODEQL:-codeql}
+
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+cd "$SCRIPTDIR"
+
+rm -rf db
+
+$CODEQL database create db --language python --source-root repo_dir/
+python3 test_parser_telemetry.py db
+
+rm -rf db
diff --git a/python/extractor/cli-integration-test/parser-telemetry/test_parser_telemetry.py b/python/extractor/cli-integration-test/parser-telemetry/test_parser_telemetry.py
new file mode 100644
index 000000000000..c848f63eacd5
--- /dev/null
+++ b/python/extractor/cli-integration-test/parser-telemetry/test_parser_telemetry.py
@@ -0,0 +1,25 @@
+import glob
+import json
+import os
+import sys
+
+
+database = sys.argv[1]
+diagnostics = []
+diagnostic_dir = os.path.join(database, "diagnostic", "extractors", "python")
+for path in glob.glob(os.path.join(diagnostic_dir, "*.jsonl")):
+    with open(path) as diagnostic_file:
+        diagnostics.extend(json.loads(line) for line in diagnostic_file)
+parser_statistics = [
+    diagnostic
+    for diagnostic in diagnostics
+    if diagnostic["source"]["id"] == "py/extractor/parser-statistics"
+]
+actual = (
+    sum(diagnostic["attributes"]["old_parser_file_count"] for diagnostic in parser_statistics),
+    sum(
+        diagnostic["attributes"]["tree_sitter_parser_file_count"]
+        for diagnostic in parser_statistics
+    ),
+)
+assert actual == (1, 1), actual
diff --git a/python/extractor/cli-integration-test/writing-diagnostics/diagnostics.expected b/python/extractor/cli-integration-test/writing-diagnostics/diagnostics.expected
index 12a241ad7b68..4b6fceb48faf 100644
--- a/python/extractor/cli-integration-test/writing-diagnostics/diagnostics.expected
+++ b/python/extractor/cli-integration-test/writing-diagnostics/diagnostics.expected
@@ -161,3 +161,24 @@
     "telemetry": true
   }
 }
+{
+  "attributes": {
+    "extractor_flags": "default",
+    "extractor_version": "7.1.10",
+    "python_analysis_version": "3.12",
+    "python_runtime_version": "3.12.3"
+  },
+  "markdownMessage": "Internal telemetry for the Python extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "python",
+    "id": "py/extractor/summary",
+    "name": "Python extractor telemetry"
+  },
+  "timestamp": "2026-09-01T13:41:33.056818Z",
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
diff --git a/python/extractor/cli-integration-test/writing-diagnostics/test_diagnostics_output.py b/python/extractor/cli-integration-test/writing-diagnostics/test_diagnostics_output.py
index 0dce022a0f95..4108b9731943 100644
--- a/python/extractor/cli-integration-test/writing-diagnostics/test_diagnostics_output.py
+++ b/python/extractor/cli-integration-test/writing-diagnostics/test_diagnostics_output.py
@@ -1,7 +1,28 @@
 import os
 import sys
+import glob
+import json
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "..", "integration-tests"))
 import diagnostics_test_utils
 
 test_db = "db"
-diagnostics_test_utils.check_diagnostics(".", test_db, skip_attributes=True)
+diagnostics = []
+diagnostic_dir = os.path.join(test_db, "diagnostic", "extractors", "python")
+for path in glob.glob(os.path.join(diagnostic_dir, "*.jsonl")):
+    with open(path) as diagnostic_file:
+        diagnostics.extend(json.loads(line) for line in diagnostic_file)
+summary = [
+    diagnostic
+    for diagnostic in diagnostics
+    if diagnostic["source"]["id"] == "py/extractor/summary"
+]
+assert len(summary) == 1
+assert summary[0]["attributes"]["extractor_flags"] == "default"
+diagnostics_test_utils.check_diagnostics(
+    ".",
+    test_db,
+    skip_attributes=True,
+    replacements={
+        r'"py/extractor/parser-statistics"': '"cli/py/extractor/parser-statistics"'
+    },
+)
diff --git a/python/extractor/extending-the-parser.md b/python/extractor/extending-the-parser.md
index 55bdd6c2a0d1..54b11d4ff855 100644
--- a/python/extractor/extending-the-parser.md
+++ b/python/extractor/extending-the-parser.md
@@ -43,7 +43,7 @@ This grammar can be found in the `grammar.js` file in the `tsg-python/tsp` subdi
 Note that whenever changes are made to `grammar.js`, you must regenerate the parser files by running
 
 ```sh
-tree-sitter generate
+tree-sitter generate --abi 14
 ```
 
 inside the `tsp` directory.
@@ -51,13 +51,20 @@ You'll need to install the `tree-sitter` CLI in order to run this command.
 One way to install it is to use `cargo`:
 
 ```sh
-cargo install tree-sitter-cli
+cargo install tree-sitter-cli --version 0.25.10 --locked
 ```
 
 (This presupposes you have `cargo` available, but you'll need this anyway when compiling `tsg-python`.)
 
 Once the parser files have been regenerated, they'll get picked up automatically when `tsg-python` is rebuilt.
 
+The identifier rule supplements the generator's Unicode 16 properties with the
+Unicode 17 `XID_Start` and `XID_Continue` additions from the Unicode Character
+Database. Keep both sets of additions in sync when updating Unicode support.
+Once the generator includes Unicode 17, these additions can be removed.
+The `unicode_identifiers_new.py` parser fixture and `unicode17-identifiers` QL test
+cover extraction independently of the host Python interpreter's Unicode version.
+
 > Pro-tip: When you're done with your parser changes, and go to commit these to a branch, put the autogenerated files in their own commit.
 > This makes it easier to review the changes, and if you need to go back and regenerate the files again, it's easy to modify just that commit.
 
diff --git a/python/extractor/semmle/cmdline.py b/python/extractor/semmle/cmdline.py
index 47007c065fdc..213a1f4affae 100644
--- a/python/extractor/semmle/cmdline.py
+++ b/python/extractor/semmle/cmdline.py
@@ -1,4 +1,4 @@
-from optparse import OptionParser, OptionGroup, HelpFormatter
+from optparse import Option, OptionParser, OptionGroup, HelpFormatter
 import shlex
 import sys
 import os
@@ -8,9 +8,21 @@
 from semmle.util import VERSION
 
 
+DEFAULT_AUTOBUILDER_FLAGS = {"R", "c", "v", "verbosity", "z"}
+
+
+class RecordingOption(Option):
+    def process(self, opt, value, values, parser):
+        flag = (self._short_opts or self._long_opts)[0].lstrip("-")
+        if flag not in DEFAULT_AUTOBUILDER_FLAGS:
+            parser.extractor_flags.add(flag)
+        return Option.process(self, opt, value, values, parser)
+
+
 def make_parser():
     '''Parse command_line, returning options, arguments'''
-    parser = OptionParser(add_help_option=False, version='%s' % VERSION)
+    parser = OptionParser(option_class=RecordingOption, add_help_option=False, version='%s' % VERSION)
+    parser.extractor_flags = set()
 
     import_options = OptionGroup(parser, "Import following options",
         description="Note that -a -n -g and -t are included for backwards compatibility. They are ignored")
@@ -172,6 +184,7 @@ def parse(command_line):
                     setattr(options, attr, dval)
         args.extend(extra_args)
     del options.file
+    options.extractor_flags = sorted(parser.extractor_flags)
     if options.help:
         if options.verbose:
             for opt in parser._get_all_options():
diff --git a/python/extractor/semmle/extractors/module_printer.py b/python/extractor/semmle/extractors/module_printer.py
index d2f4a6cc92bd..aeaa8e63f5eb 100644
--- a/python/extractor/semmle/extractors/module_printer.py
+++ b/python/extractor/semmle/extractors/module_printer.py
@@ -6,9 +6,9 @@ class ModulePrinter(object):
 
     name = "module printer"
 
-    def __init__(self, options, trap_folder, src_archive, renamer, logger):
+    def __init__(self, options, trap_folder, src_archive, renamer, logger, diagnostics_writer):
         self.logger = logger
-        self.py_extractor = PythonExtractor(options, trap_folder, src_archive, logger)
+        self.py_extractor = PythonExtractor(options, trap_folder, src_archive, logger, diagnostics_writer)
 
     def process(self, unit):
         imports = ()
diff --git a/python/extractor/semmle/extractors/py_extractor.py b/python/extractor/semmle/extractors/py_extractor.py
index 8014063b3cb8..3b5a37fb7a96 100644
--- a/python/extractor/semmle/extractors/py_extractor.py
+++ b/python/extractor/semmle/extractors/py_extractor.py
@@ -16,6 +16,7 @@ def __init__(self, options, trap_folder, src_archive, logger: Logger, diagnostic
         self.module_extractor = extractor.Extractor.from_options(options, trap_folder, src_archive, logger, diagnostics_writer)
         self.finder = finder.Finder.from_options_and_env(options, logger)
         self.importer = imports.importer_from_options(options, self.finder, logger)
+        self.diagnostics_writer = diagnostics_writer
 
     def _get_module_and_imports(self, unit):
         if not isinstance(unit, util.FileExtractable):
@@ -24,7 +25,7 @@ def _get_module_and_imports(self, unit):
         module = self.finder.from_extractable(unit)
         if module is None:
             return None, ()
-        py_module = module.load(self.logger)
+        py_module = module.load(self.logger, self.diagnostics_writer)
         if py_module is None:
             return None, ()
         imports = set(mod.get_extractable() for mod in self.importer.get_imports(module, py_module))
diff --git a/python/extractor/semmle/logging.py b/python/extractor/semmle/logging.py
index 31805040bf6d..652ab810d0fb 100644
--- a/python/extractor/semmle/logging.py
+++ b/python/extractor/semmle/logging.py
@@ -8,6 +8,9 @@
 import multiprocessing
 import enum
 import datetime
+import platform
+
+from semmle.util import VERSION, get_analysis_version
 
 
 #Use standard Semmle logging levels
@@ -65,6 +68,14 @@ def write_message_with_proc(level, proc_id, text):
 
 _logging_process = None
 
+def format_message(fmt, args):
+    '''Applies `%`-formatting to `fmt`, but only when there are arguments to interpolate.
+
+    This mirrors the standard library's `logging` behaviour, and means that a message that has
+    already been formatted -- and may therefore contain arbitrary `%` directives coming from the
+    code being analysed -- is passed through unharmed.'''
+    return fmt % args if args else fmt
+
 def stop():
     _logging_process.join()
 
@@ -105,7 +116,7 @@ def log(self, level, fmt, *args):
         '''Log a message in a process safe fashion.
         Message will be of the form [level] fmt%args.'''
         if level <= self.level:
-            txt = fmt % args
+            txt = format_message(fmt, args)
             try:
                 self.queue.put((self.color | level, self.proc_id, txt), False)
             except Exception:
@@ -347,6 +358,24 @@ def with_timestamp(self, timestamp):
         self.timestamp = timestamp
         return self
 
+def extractor_telemetry_message(extractor_flags):
+    return (DiagnosticMessage(Source("py/extractor/summary", "Python extractor telemetry"), Severity.NOTE)
+            .markdown("Internal telemetry for the Python extractor.\n\nNo action needed.")
+            .attribute("python_analysis_version", get_analysis_version())
+            .attribute("python_runtime_version", platform.python_version())
+            .attribute("extractor_version", VERSION)
+            .attribute("extractor_flags", " ".join(extractor_flags) or "default")
+            .telemetry()
+    )
+
+def parser_statistics_telemetry_message(old_parser_file_count, tree_sitter_parser_file_count):
+    return (DiagnosticMessage(Source("py/extractor/parser-statistics", "Python parser statistics"), Severity.NOTE)
+            .markdown("Internal parser telemetry for the Python extractor.\n\nNo action needed.")
+            .attribute("old_parser_file_count", old_parser_file_count)
+            .attribute("tree_sitter_parser_file_count", tree_sitter_parser_file_count)
+            .telemetry()
+    )
+
 def get_stack_trace_lines():
     """Creates a stack trace for inclusion into the `attributes` part of a diagnostic message.
     Limits the size of the stack trace to 5000 characters, so as to not make the SARIF file overly big.
diff --git a/python/extractor/semmle/populator.py b/python/extractor/semmle/populator.py
index a1be196ffaf6..603a7e2ddaca 100644
--- a/python/extractor/semmle/populator.py
+++ b/python/extractor/semmle/populator.py
@@ -65,6 +65,11 @@ def main(sys_path = sys.path[:]):
     if options.language_version:
         last_version = options.language_version[-1]
         update_analysis_version(last_version)
+        # Worker processes are spawned rather than forked on macOS, so they do
+        # not inherit the value set above; they re-read it from the environment
+        # as this module did on import. Set it there too, or `--lang` would take
+        # effect in this process only, and on one platform only.
+        os.environ["CODEQL_EXTRACTOR_PYTHON_ANALYSIS_VERSION"] = last_version
 
     found_py2 = False
     if get_analysis_major_version() == 2 and options.extract_stdlib:
diff --git a/python/extractor/semmle/python/finder.py b/python/extractor/semmle/python/finder.py
index 632ef920d055..46e63f5e578f 100644
--- a/python/extractor/semmle/python/finder.py
+++ b/python/extractor/semmle/python/finder.py
@@ -65,8 +65,8 @@ def all_sub_modules(self):
     def get_extractable(self):
         return FileExtractable(self.path)
 
-    def load(self, logger=None):
-        return PythonSourceModule(self.name, self.path, logger=logger)
+    def load(self, logger, diagnostics_writer):
+        return PythonSourceModule(self.name, self.path, logger=logger, diagnostics_writer=diagnostics_writer)
 
     def __str__(self):
         return "Python module at %s" % self.path
diff --git a/python/extractor/semmle/python/imports.py b/python/extractor/semmle/python/imports.py
index 8da7df474480..98b848d3a688 100644
--- a/python/extractor/semmle/python/imports.py
+++ b/python/extractor/semmle/python/imports.py
@@ -252,6 +252,6 @@ def importer_from_options(options, finder, logger):
         importer = CachingModuleImporter(options.trap_cache, finder, logger)
     except Exception as ex:
         if options.trap_cache is not None:
-            logger.warn("Failed to create caching importer: %s", ex)
+            logger.warning("Failed to create caching importer: %s", ex)
         importer = ModuleImporter(finder, logger)
     return importer
diff --git a/python/extractor/semmle/python/modules.py b/python/extractor/semmle/python/modules.py
index 810c4e060f7b..7192f97cfb11 100644
--- a/python/extractor/semmle/python/modules.py
+++ b/python/extractor/semmle/python/modules.py
@@ -18,7 +18,7 @@ class PythonSourceModule(object):
 
     kind = None
 
-    def __init__(self, name, path, logger, bytes_source = None):
+    def __init__(self, name, path, logger, diagnostics_writer, bytes_source = None):
         assert isinstance(path, str), path
         self.name = name # May be None
         self.path = path
@@ -34,6 +34,7 @@ def __init__(self, name, path, logger, bytes_source = None):
         self._line_types = None
         self._comments = None
         self._tokens = None
+        self.diagnostics_writer = diagnostics_writer
         self.logger = logger
         with timers["decode"]:
             self.encoding, self.bytes_source  = semmle.python.parser.tokenizer.encoding_from_source(bytes_source)
@@ -113,6 +114,7 @@ def old_py_ast(self):
                 self.logger.debug("Trying old parser on %s", self.path)
                 self._py_ast = semmle.python.parser.parse(self.tokens, self.logger)
                 self.logger.debug("Old parser successful on %s", self.path)
+                self.diagnostics_writer.record_old_parser()
         else:
             self.logger.debug("Found (during old_py_ast) parse tree for %s in cache", self.path)
         return self._py_ast
@@ -147,6 +149,7 @@ def py_ast(self):
                             self.logger.debug("Trying tsg-python on %s", self.path)
                             self._py_ast = semmle.python.parser.tsg_parser.parse(self.path, self.logger)
                             self.logger.debug("tsg-python successful on %s", self.path)
+                            self.diagnostics_writer.record_tree_sitter_parser()
                         else:
                             self.logger.debug("Found (during py_ast) parse tree for %s in cache", self.path)
                     return self._py_ast
diff --git a/python/extractor/semmle/python/parser/ast.py b/python/extractor/semmle/python/parser/ast.py
index e1843131554a..9a1cea1ae62e 100644
--- a/python/extractor/semmle/python/parser/ast.py
+++ b/python/extractor/semmle/python/parser/ast.py
@@ -1,6 +1,7 @@
 from blib2to3.pgen2 import token
 from ast import literal_eval
 from semmle.python import ast
+from semmle.util import get_analysis_major_version
 from blib2to3.pgen2.parse import ParseError
 import sys
 
@@ -981,7 +982,20 @@ def visit_except_clause(self, node):
         if len(node.children) > 1:
             type = self.visit(node.children[1], LOAD)
         if len(node.children) > 3:
-            name = self.visit(node.children[3], STORE)
+            # The grammar rule `'except' [test [(',' | 'as') test]]` is shared
+            # between two incompatible readings of a fourth child, so the
+            # separator token and the analysis version together decide:
+            #   `except A as e:`  binds an alias, in every version;
+            #   `except A, e:`    binds an alias when extracting Python 2, where
+            #                     that is the canonical idiom;
+            #   `except A, B:`    is an unparenthesized tuple of exception types
+            #                     otherwise -- PEP 758, Python 3.14+.
+            if is_token(node.children[2], "as") or get_analysis_major_version() == 2:
+                name = self.visit(node.children[3], STORE)
+            else:
+                elts = [type, self.visit(node.children[3], LOAD)]
+                type = ast.Tuple(elts, LOAD)
+                set_location(type, node.children[1].start, node.children[3].end)
         return type, name
 
     def visit_del_stmt(self, node):
diff --git a/python/extractor/semmle/python/parser/dump_ast.py b/python/extractor/semmle/python/parser/dump_ast.py
index 802bed8fac24..97abb502e59a 100644
--- a/python/extractor/semmle/python/parser/dump_ast.py
+++ b/python/extractor/semmle/python/parser/dump_ast.py
@@ -99,12 +99,12 @@ def visit(self, node, level=0, visited=None):
 class StdoutLogger(logging.Logger):
     error_count = 0
     def log(self, level, fmt, *args):
-        sys.stdout.write(fmt % args + "\n")
+        sys.stdout.write(logging.format_message(fmt, args) + "\n")
 
     def info(self, fmt, *args):
         self.log(logging.INFO, fmt, *args)
 
-    def warn(self, fmt, *args):
+    def warning(self, fmt, *args):
         self.log(logging.WARN, fmt, *args)
         self.error_count += 1
 
@@ -119,7 +119,8 @@ def reset_error_count(self):
         self.error_count = 0
 
 def old_parser(inputfile, logger):
-    mod = PythonSourceModule(None, inputfile, logger)
+    from semmle.worker import DiagnosticsWriter
+    mod = PythonSourceModule(None, inputfile, logger, DiagnosticsWriter(0))
     logger.close()
     return mod.old_py_ast
 
diff --git a/python/extractor/semmle/python/parser/tsg_parser.py b/python/extractor/semmle/python/parser/tsg_parser.py
index 356faf249ed3..fa199ddf4f3d 100644
--- a/python/extractor/semmle/python/parser/tsg_parser.py
+++ b/python/extractor/semmle/python/parser/tsg_parser.py
@@ -3,6 +3,7 @@
 # Functions and classes used for parsing Python files using `tree-sitter-graph`
 
 from ast import literal_eval
+import json
 import sys
 import os
 import semmle.python.parser
@@ -113,67 +114,76 @@ def __repr__(self):
     cargo_file = os.path.join(tsg_python_path, "Cargo.toml")
     tsg_command = ["cargo", "run", "--quiet", "--release", "--manifest-path="+cargo_file]
 
+def _decode_tsg_value(value):
+    value_type = value["type"]
+    if value_type == "null":
+        return None
+    if value_type in ("bool", "int", "string"):
+        return value[value_type]
+    if value_type == "list":
+        return [_decode_tsg_value(item) for item in value["values"]]
+    if value_type == "graphNode":
+        return Node(value["id"])
+    raise ValueError("Unsupported TSG value type '{}'".format(value_type))
+
+def _decode_tsg_node_attributes(encoded_attrs, path, logger):
+    # Decode every attribute first so location information is available if string decoding fails.
+    attrs = {
+        key: _decode_tsg_value(value)
+        for key, value in encoded_attrs.items()
+    }
+    if "s" not in attrs:
+        return attrs
+
+    try:
+        attrs["s"] = evaluate_string(attrs["s"])
+    except Exception as ex:
+        loc = ":".join(str(i) for i in get_location_info(attrs))
+        error = ex.args[0] if ex.args else "unknown"
+        logger.warning(
+            "Error '{}' while parsing value {} at {}:{}\n".format(
+                error, repr(attrs["s"]), path, loc
+            )
+        )
+    return attrs
+
+def _format_node_attributes(attrs):
+    return repr(dict(sorted(attrs.items())))
+
 def read_tsg_python_output(path, logger):
+    command_args = tsg_command + [path]
+    p = subprocess.Popen(command_args, stdout=subprocess.PIPE)
+    stdout, _ = p.communicate()
+    if p.returncode:
+        raise subprocess.CalledProcessError(p.returncode, command_args, stdout)
+
     # Mapping from node id (an integer) to a dictionary containing attribute data.
     node_attr = {}
     # Mapping a start node to a map from attribute names to lists of (value, end_node) pairs.
     edge_attr = {}
 
-    command_args = tsg_command + [path]
-    p = subprocess.Popen(command_args, stdout=subprocess.PIPE)
-    for line in p.stdout:
-        line = line.decode(sys.getfilesystemencoding())
-        line = line.rstrip()
-        if line.startswith("node"): # e.g. `node 5`
-            current_node = int(line.split(" ")[1])
-            d = {}
-            node_attr[current_node] = d
-            in_node = True
-        elif line.startswith("edge"): # e.g. `edge 5 -> 6`
-            current_start, current_end = tuple(map(int, line[4:].split("->")))
-            d = edge_attr.setdefault(current_start, {})
-            in_node = False
-        else: # attribute, e.g. `_kind: "Class"`
-            key, value = line[2:].split(": ", 1)
-            if value.startswith("[graph node"): # e.g. `_skip_to: [graph node 5]`
-                value = Node(int(value.split(" ")[2][:-1]))
-            elif value == "#true": # e.g. `_is_parenthesised: #true`
-                value = True
-            elif value == "#false": # e.g. `top: #false`
-                value = False
-            elif value == "#null": # e.g. `exc: #null`
-                value = None
-            else: # literal values, e.g. `name: "k1.k2"` or `level: 5`
-                try:
-                    if key =="s" and value[0] == '"': # e.g. `s: "k1.k2"`
-                        value = evaluate_string(value)
-                    else:
-                        value  = literal_eval(value)
-                        if isinstance(value, bytes):
-                            try:
-                                value = value.decode(sys.getfilesystemencoding())
-                            except UnicodeDecodeError:
-                                # just include the bytes as-is
-                                pass
-                except Exception as ex:
-                    # We may not know the location at this point -- for instance if we forgot to set
-                    # it -- but `get_location_info` will degrade gracefully in this case.
-                    loc = ":".join(str(i) for i in get_location_info(d))
-                    error = ex.args[0] if ex.args else "unknown"
-                    logger.warning("Error '{}' while parsing value {} at {}:{}\n".format(error, repr(value), path, loc))
-            if in_node:
-                d[key] = value
-            else:
-                d.setdefault(key, []).append((value, current_end))
-    p.stdout.close()
-    p.terminate()
-    p.wait()
+    for encoded_node in json.loads(stdout):
+        current_node = encoded_node["id"]
+        attrs = _decode_tsg_node_attributes(encoded_node["attrs"], path, logger)
+        node_attr[current_node] = attrs
+        if attrs.get("_kind") == "SyntaxErrorNode":
+            lineno, offset, _, _ = get_location_info(attrs)
+            exc = SyntaxError("Syntax Error")
+            exc.lineno = lineno
+            exc.offset = offset
+            raise exc
+        for encoded_edge in encoded_node["edges"]:
+            current_end = encoded_edge["sink"]
+            edge_fields = edge_attr.setdefault(current_node, {})
+            for key, value in encoded_edge["attrs"].items():
+                value = _decode_tsg_value(value)
+                edge_fields.setdefault(key, []).append((value, current_end))
     logger.debug("Read {} nodes and {} edges from TSG output".format(len(node_attr), len(edge_attr)))
     return node_attr, edge_attr
 
-def evaluate_string(s):
-    s = literal_eval(s)
-    prefix, quotes, content = split_string(s, None)
+def evaluate_string(source_literal):
+    """Evaluates Python string literal text that has already been decoded from the wire format."""
+    prefix, quotes, content = split_string(source_literal, None)
     ends_with_illegal_character = False
     # If the string ends with the same quote character as the outer quotes (and/or backslashes)
     # (e.g. the first string part of `f"""hello"{0}"""`), we must take care to not accidently create
@@ -202,7 +212,11 @@ def get_context(id, node_attr, path, logger):
 
     while "ctx" not in node_attr[id]:
         if "_inherited_ctx" not in node_attr[id]:
-            logger.error("No context for node {} in file {} with attributes {}\n".format(id, path, node_attr[id]))
+            logger.error(
+                "No context for node {} in file {} with attributes {}\n".format(
+                    id, path, _format_node_attributes(node_attr[id])
+                )
+            )
             # A missing context is most likely to be a "load", so return that.
             return ast.Load()
         id = node_attr[id]["_inherited_ctx"].id
@@ -314,7 +328,11 @@ def parse(path, logger):
             nodes[id] = attrs["_is_literal"]
             continue
         if "_kind" not in attrs:
-            logger.error("Error: Graph node {} with attributes {} has no `_kind`!\n".format(id, attrs))
+            logger.error(
+                "Error: Graph node {} with attributes {} has no `_kind`!\n".format(
+                    id, _format_node_attributes(attrs)
+                )
+            )
             continue
         # This is not the node we are looking for (so don't bother creating it).
         if "_skip_to" in attrs:
@@ -338,12 +356,6 @@ def parse(path, logger):
         node.lineno, node.col_offset, end_line, end_column = get_location_info(attrs)
         node._end = (end_line, end_column)
 
-        if isinstance(node, SyntaxErrorNode):
-            exc = SyntaxError("Syntax Error")
-            exc.lineno = node.lineno
-            exc.offset = node.col_offset
-            raise exc
-
         # Set up context information, if any
         if "ctx" in expected_fields:
             node.ctx = get_context(id, node_attr, path, logger)
@@ -352,7 +364,7 @@ def parse(path, logger):
             if field.startswith("_"): continue
             if field == "ctx": continue
             if field != "parenthesised" and field not in expected_fields:
-                logger.warning("Unknown field {} found among {} in node {}\n".format(field, attrs, id))
+                logger.warning("Unknown field {} found among {} in node {}\n".format(field, _format_node_attributes(attrs), id))
 
             # For fields that point to other AST nodes.
             if isinstance(val, Node):
diff --git a/python/extractor/semmle/python/passes/flow.py b/python/extractor/semmle/python/passes/flow.py
index 9f434fe0c4c8..a100bbae7c9c 100755
--- a/python/extractor/semmle/python/passes/flow.py
+++ b/python/extractor/semmle/python/passes/flow.py
@@ -12,7 +12,7 @@
 from semmle.python.passes import unroller
 from semmle.python import modules
 import semmle.graph as graph
-from semmle.logging import Logger
+from semmle.logging import Logger, format_message
 
 __all__ = [ 'FlowPass' ]
 
@@ -1916,7 +1916,8 @@ def write_ssa_phi(out, phi, arg):
         import semmle.python.parser.tsg_parser
         parsed_ast = semmle.python.parser.tsg_parser.parse(inputfile, FakeLogger())
     else:
-        module = modules.PythonSourceModule("__main__", inputfile, FakeLogger())
+        from semmle.worker import DiagnosticsWriter
+        module = modules.PythonSourceModule("__main__", inputfile, FakeLogger(), DiagnosticsWriter(0))
         parsed_ast = module.ast
     FlowPass(options.split, options.prune, options.unroll).extract(parsed_ast, writer)
     writer.close()
@@ -1924,7 +1925,7 @@ def write_ssa_phi(out, phi, arg):
 class FakeLogger(object):
 
     def debug(self, fmt, *args):
-        print(fmt % args)
+        print(format_message(fmt, args))
 
     def traceback(self):
         print(traceback.format_exc())
diff --git a/python/extractor/semmle/util.py b/python/extractor/semmle/util.py
index 00651ace8314..8c67a6f97558 100644
--- a/python/extractor/semmle/util.py
+++ b/python/extractor/semmle/util.py
@@ -10,7 +10,7 @@
 
 #Semantic version of extractor.
 #Update this if any changes are made
-VERSION = "7.1.8"
+VERSION = "7.2.1"
 
 PY_EXTENSIONS = ".py", ".pyw"
 
diff --git a/python/extractor/semmle/worker.py b/python/extractor/semmle/worker.py
index 96761a01c77e..15b7b556bf88 100644
--- a/python/extractor/semmle/worker.py
+++ b/python/extractor/semmle/worker.py
@@ -10,7 +10,8 @@
 from semmle.extractors import SuperExtractor, ModulePrinter, SkippedBuiltin
 from semmle.profiling import get_profiler
 from semmle.path_rename import renamer_from_options_and_env
-from semmle.logging import WARN, recursion_error_message, internal_error_message, Logger
+from semmle.logging import WARN, recursion_error_message, internal_error_message, extractor_telemetry_message, Logger
+from semmle.logging import parser_statistics_telemetry_message
 from semmle.util import FileExtractable, FolderExtractable
 
 class ExtractorFailure(Exception):
@@ -39,7 +40,7 @@ def __init__(self, max_depth, logger: Logger):
                     changed_paths = data.get('changes', [])
                     self.overlay_changes = { os.path.abspath(p) for p in changed_paths }
             except (IOError, ValueError) as e:
-                logger.warn("Failed to read overlay changes from '%s' (falling back to full extraction): %s", overlay_changes_file, e)
+                logger.warning("Failed to read overlay changes from '%s' (falling back to full extraction): %s", overlay_changes_file, e)
                 self.overlay_changes = None
 
     def add_root(self, mod):
@@ -239,9 +240,35 @@ def _drain_queue(queue):
         #Emptied queue as best we can.
         pass
 
+def _write_extractor_telemetry(diagnostics_writer, logger: Logger, extractor_flags):
+    try:
+        diagnostics_writer.write(extractor_telemetry_message(extractor_flags))
+    except OSError as ex:
+        logger.warning("Failed to write extractor telemetry: %s", ex)
+
+def _write_parser_statistics_telemetry(diagnostics_writer, logger: Logger):
+    counts = diagnostics_writer.parser_statistics()
+    if counts == (0, 0):
+        return
+    try:
+        diagnostics_writer.write(parser_statistics_telemetry_message(*counts))
+    except OSError as ex:
+        logger.warning("Failed to write parser statistics telemetry: %s", ex)
+
 class DiagnosticsWriter(object):
     def __init__(self, proc_id):
         self.proc_id = proc_id
+        self.old_parser_file_count = 0
+        self.tree_sitter_parser_file_count = 0
+
+    def record_old_parser(self):
+        self.old_parser_file_count += 1
+
+    def record_tree_sitter_parser(self):
+        self.tree_sitter_parser_file_count += 1
+
+    def parser_statistics(self):
+        return self.old_parser_file_count, self.tree_sitter_parser_file_count
 
     def write(self, message):
         dir = os.environ.get("CODEQL_EXTRACTOR_PYTHON_DIAGNOSTIC_DIR")
@@ -276,9 +303,11 @@ def _extract_loop(proc_id, queue, trap_dir, archive, options, reply_queue, logge
         reply_queue.put(("INTERRUPT", None, None))
         sys.exit(2)
     logger.set_process_id(proc_id)
+    if write_global_data:
+        _write_extractor_telemetry(diagnostics_writer, logger, options.extractor_flags)
     try:
         if options.trace_only:
-            extractor = ModulePrinter(options, trap_dir, archive, renamer, logger)
+            extractor = ModulePrinter(options, trap_dir, archive, renamer, logger, diagnostics_writer)
         else:
             extractor = SuperExtractor(options, trap_dir, archive, renamer, logger, diagnostics_writer)
         profiler = get_profiler(options, id, logger)
@@ -291,6 +320,7 @@ def _extract_loop(proc_id, queue, trap_dir, archive, options, reply_queue, logge
                     if write_global_data:
                         extractor.write_global_data()
                     extractor.close()
+                    _write_parser_statistics_telemetry(diagnostics_writer, logger)
                     return
                 try:
                     start = time.time()
@@ -344,4 +374,5 @@ def _extract_loop(proc_id, queue, trap_dir, archive, options, reply_queue, logge
     except _Empty:
         #Cleared queue enough to avoid deadlock.
         pass
+    _write_parser_statistics_telemetry(diagnostics_writer, logger)
     sys.exit(2)
diff --git a/python/extractor/tests/parser/exceptions_relaxed.py b/python/extractor/tests/parser/exceptions_relaxed.py
new file mode 100644
index 000000000000..a0dea76dfa81
--- /dev/null
+++ b/python/extractor/tests/parser/exceptions_relaxed.py
@@ -0,0 +1,10 @@
+try:
+    a
+except b, c:
+    d
+except (e, f):
+    g
+except h as i:
+    j
+except k:
+    l
diff --git a/python/extractor/tests/parser/match_new.expected b/python/extractor/tests/parser/match_new.expected
index b71bda010bab..38fd31de6d12 100644
--- a/python/extractor/tests/parser/match_new.expected
+++ b/python/extractor/tests/parser/match_new.expected
@@ -1,4 +1,4 @@
-Module: [1, 0] - [43, 0]
+Module: [1, 0] - [61, 0]
   body: [
     Match: [1, 0] - [3, 19]
       subject:
@@ -85,7 +85,7 @@ Module: [1, 0] - [43, 0]
               literal:
                 BinOp: [8, 9] - [8, 18]
                   left:
-                    UnaryOp: [8, 10] - [8, 11]
+                    UnaryOp: [8, 9] - [8, 11]
                       op: USub
                       operand:
                         Num: [8, 10] - [8, 11]
@@ -104,7 +104,7 @@ Module: [1, 0] - [43, 0]
           pattern:
             MatchLiteralPattern: [10, 9] - [10, 11]
               literal:
-                UnaryOp: [10, 10] - [10, 11]
+                UnaryOp: [10, 9] - [10, 11]
                   op: USub
                   operand:
                     Num: [10, 10] - [10, 11]
@@ -131,7 +131,7 @@ Module: [1, 0] - [43, 0]
               literal:
                 BinOp: [14, 9] - [14, 16]
                   left:
-                    UnaryOp: [14, 10] - [14, 13]
+                    UnaryOp: [14, 9] - [14, 13]
                       op: USub
                       operand:
                         Num: [14, 10] - [14, 13]
@@ -379,4 +379,210 @@ Module: [1, 0] - [43, 0]
             Pass: [42, 8] - [42, 12]
           ]
       ]
+    Match: [44, 0] - [60, 12]
+      subject:
+        Name: [44, 6] - [44, 11]
+          variable: Variable('value', None)
+          ctx: Load
+      cases: [
+        Case: [45, 4] - [46, 12]
+          pattern:
+            MatchLiteralPattern: [45, 9] - [45, 11]
+              literal:
+                UnaryOp: [45, 9] - [45, 11]
+                  op: UAdd
+                  operand:
+                    Num: [45, 10] - [45, 11]
+                      n: 1
+                      text: '1'
+          guard: None
+          body: [
+            Pass: [46, 8] - [46, 12]
+          ]
+        Case: [47, 4] - [48, 12]
+          pattern:
+            MatchLiteralPattern: [47, 9] - [47, 13]
+              literal:
+                UnaryOp: [47, 9] - [47, 13]
+                  op: UAdd
+                  operand:
+                    Num: [47, 10] - [47, 13]
+                      n: 1.5
+                      text: '1.5'
+          guard: None
+          body: [
+            Pass: [48, 8] - [48, 12]
+          ]
+        Case: [49, 4] - [50, 12]
+          pattern:
+            MatchLiteralPattern: [49, 9] - [49, 12]
+              literal:
+                UnaryOp: [49, 9] - [49, 12]
+                  op: UAdd
+                  operand:
+                    Num: [49, 10] - [49, 12]
+                      n: 2j
+                      text: '2j'
+          guard: None
+          body: [
+            Pass: [50, 8] - [50, 12]
+          ]
+        Case: [51, 4] - [52, 12]
+          pattern:
+            MatchLiteralPattern: [51, 9] - [51, 14]
+              literal:
+                BinOp: [51, 9] - [51, 14]
+                  left:
+                    UnaryOp: [51, 9] - [51, 11]
+                      op: UAdd
+                      operand:
+                        Num: [51, 10] - [51, 11]
+                          n: 1
+                          text: '1'
+                  op: Add
+                  right:
+                    Num: [51, 12] - [51, 14]
+                      n: 2j
+                      text: '2j'
+          guard: None
+          body: [
+            Pass: [52, 8] - [52, 12]
+          ]
+        Case: [53, 4] - [54, 12]
+          pattern:
+            MatchLiteralPattern: [53, 9] - [53, 14]
+              literal:
+                BinOp: [53, 9] - [53, 14]
+                  left:
+                    UnaryOp: [53, 9] - [53, 11]
+                      op: UAdd
+                      operand:
+                        Num: [53, 10] - [53, 11]
+                          n: 1
+                          text: '1'
+                  op: Sub
+                  right:
+                    Num: [53, 12] - [53, 14]
+                      n: 2j
+                      text: '2j'
+          guard: None
+          body: [
+            Pass: [54, 8] - [54, 12]
+          ]
+        Case: [55, 4] - [56, 12]
+          pattern:
+            MatchOrPattern: [55, 9] - [55, 30]
+              patterns: [
+                MatchLiteralPattern: [55, 9] - [55, 14]
+                  literal:
+                    UnaryOp: [55, 9] - [55, 14]
+                      op: UAdd
+                      operand:
+                        Num: [55, 10] - [55, 14]
+                          n: 16
+                          text: '0x10'
+                MatchLiteralPattern: [55, 17] - [55, 22]
+                  literal:
+                    UnaryOp: [55, 17] - [55, 22]
+                      op: UAdd
+                      operand:
+                        Num: [55, 18] - [55, 22]
+                          n: 8
+                          text: '0o10'
+                MatchLiteralPattern: [55, 25] - [55, 30]
+                  literal:
+                    UnaryOp: [55, 25] - [55, 30]
+                      op: UAdd
+                      operand:
+                        Num: [55, 26] - [55, 30]
+                          n: 2
+                          text: '0b10'
+              ]
+          guard: None
+          body: [
+            Pass: [56, 8] - [56, 12]
+          ]
+        Case: [57, 4] - [58, 12]
+          pattern:
+            MatchSequencePattern: [57, 9] - [57, 19]
+              patterns: [
+                MatchLiteralPattern: [57, 10] - [57, 12]
+                  literal:
+                    UnaryOp: [57, 10] - [57, 12]
+                      op: UAdd
+                      operand:
+                        Num: [57, 11] - [57, 12]
+                          n: 0
+                          text: '0'
+                MatchLiteralPattern: [57, 14] - [57, 18]
+                  literal:
+                    UnaryOp: [57, 14] - [57, 18]
+                      op: USub
+                      operand:
+                        Num: [57, 15] - [57, 18]
+                          n: 0.0
+                          text: '0.0'
+              ]
+          guard: None
+          body: [
+            Pass: [58, 8] - [58, 12]
+          ]
+        Case: [59, 4] - [60, 12]
+          pattern:
+            MatchMappingPattern: [59, 9] - [59, 33]
+              mappings: [
+                MatchKeyValuePattern: [59, 10] - [59, 15]
+                  key:
+                    MatchLiteralPattern: [59, 10] - [59, 12]
+                      literal:
+                        UnaryOp: [59, 10] - [59, 12]
+                          op: UAdd
+                          operand:
+                            Num: [59, 11] - [59, 12]
+                              n: 1
+                              text: '1'
+                  value:
+                    MatchCapturePattern: [59, 14] - [59, 15]
+                      variable:
+                        Name: [59, 14] - [59, 15]
+                          variable: Variable('x', None)
+                          ctx: Store
+                MatchKeyValuePattern: [59, 17] - [59, 24]
+                  key:
+                    MatchLiteralPattern: [59, 17] - [59, 21]
+                      literal:
+                        UnaryOp: [59, 17] - [59, 21]
+                          op: UAdd
+                          operand:
+                            Num: [59, 18] - [59, 21]
+                              n: 1.5
+                              text: '1.5'
+                  value:
+                    MatchCapturePattern: [59, 23] - [59, 24]
+                      variable:
+                        Name: [59, 23] - [59, 24]
+                          variable: Variable('y', None)
+                          ctx: Store
+                MatchKeyValuePattern: [59, 26] - [59, 32]
+                  key:
+                    MatchLiteralPattern: [59, 26] - [59, 29]
+                      literal:
+                        UnaryOp: [59, 26] - [59, 29]
+                          op: UAdd
+                          operand:
+                            Num: [59, 27] - [59, 29]
+                              n: 2j
+                              text: '2j'
+                  value:
+                    MatchCapturePattern: [59, 31] - [59, 32]
+                      variable:
+                        Name: [59, 31] - [59, 32]
+                          variable: Variable('z', None)
+                          ctx: Store
+              ]
+          guard: None
+          body: [
+            Pass: [60, 8] - [60, 12]
+          ]
+      ]
   ]
diff --git a/python/extractor/tests/parser/match_new.py b/python/extractor/tests/parser/match_new.py
index 99a06de5b08c..61953c95f0ab 100644
--- a/python/extractor/tests/parser/match_new.py
+++ b/python/extractor/tests/parser/match_new.py
@@ -40,3 +40,21 @@ def soft_keywords():
 match z:
     case w:
         pass
+
+match value:
+    case +1:
+        pass
+    case +1.5:
+        pass
+    case +2j:
+        pass
+    case +1+2j:
+        pass
+    case +1-2j:
+        pass
+    case +0x10 | +0o10 | +0b10:
+        pass
+    case [+0, -0.0]:
+        pass
+    case {+1: x, +1.5: y, +2j: z}:
+        pass
diff --git a/python/extractor/tests/parser/type_parameters_new.expected b/python/extractor/tests/parser/type_parameters_new.expected
new file mode 100644
index 000000000000..0ebf6b14cb20
--- /dev/null
+++ b/python/extractor/tests/parser/type_parameters_new.expected
@@ -0,0 +1,88 @@
+Module: [1, 0] - [12, 0]
+  body: [
+    TypeAlias: [1, 0] - [3, 5]
+      name:
+        Name: [1, 5] - [1, 10]
+          variable: Variable('Alias', None)
+          ctx: Store
+      type_parameters: [
+        TypeVar: [2, 4] - [2, 5]
+          name:
+            Name: [2, 4] - [2, 5]
+              variable: Variable('T', None)
+              ctx: Store
+          bound: None
+          default: None
+      ]
+      value:
+        Name: [3, 4] - [3, 5]
+          variable: Variable('T', None)
+          ctx: Load
+    Assign: [5, 0] - [7, 4]
+      targets: [
+        Name: [5, 4] - [5, 12]
+          variable: Variable('function', None)
+          ctx: Store
+      ]
+      value:
+        FunctionExpr: [5, 0] - [7, 4]
+          name: 'function'
+          args:
+            arguments
+              defaults: []
+              kw_defaults: []
+              annotations: []
+              varargannotation: None
+              kwargannotation: None
+              kw_annotations: []
+          returns: None
+          inner_scope:
+            Function: [5, 0] - [7, 4]
+              name: 'function'
+              type_parameters: [
+                TypeVar: [6, 4] - [6, 5]
+                  name:
+                    Name: [6, 4] - [6, 5]
+                      variable: Variable('T', None)
+                      ctx: Store
+                  bound: None
+                  default: None
+              ]
+              args: []
+              vararg: None
+              kwonlyargs: []
+              kwarg: None
+              body: [
+                Expr: [7, 5] - [7, 8]
+                  value:
+                    Ellipsis: [7, 5] - [7, 8]
+              ]
+    Assign: [9, 0] - [11, 2]
+      targets: [
+        Name: [9, 6] - [9, 11]
+          variable: Variable('Class', None)
+          ctx: Store
+      ]
+      value:
+        ClassExpr: [9, 0] - [11, 2]
+          name: 'Class'
+          type_parameters: [
+            TypeVar: [10, 4] - [10, 5]
+              name:
+                Name: [10, 4] - [10, 5]
+                  variable: Variable('T', None)
+                  ctx: Store
+              bound: None
+              default: None
+          ]
+          bases: []
+          keywords: []
+          inner_scope:
+            Class: [9, 0] - [11, 2]
+              name: 'Class'
+              body: [
+                Expr: [11, 3] - [11, 6]
+                  value:
+                    Ellipsis: [11, 3] - [11, 6]
+              ]
+  ]
diff --git a/python/extractor/tests/parser/type_parameters_new.py b/python/extractor/tests/parser/type_parameters_new.py
new file mode 100644
index 000000000000..2bb8c1324305
--- /dev/null
+++ b/python/extractor/tests/parser/type_parameters_new.py
@@ -0,0 +1,11 @@
+type Alias[
+    T,
+] = T
+
+def function[
+    T,
+](): ...
+
+class Class[
+    T,
+]: ...
diff --git a/python/extractor/tests/parser/unicode_escapes_new.expected b/python/extractor/tests/parser/unicode_escapes_new.expected
new file mode 100644
index 000000000000..ed1ba2237543
--- /dev/null
+++ b/python/extractor/tests/parser/unicode_escapes_new.expected
@@ -0,0 +1,150 @@
+Module: [6, 0] - [29, 0]
+  body: [
+    TypeAlias: [6, 0] - [6, 12]
+      name:
+        Name: [6, 5] - [6, 6]
+          variable: Variable('X', None)
+          ctx: Store
+      type_parameters: []
+      value:
+        Name: [6, 9] - [6, 12]
+          variable: Variable('int', None)
+          ctx: Load
+    Assign: [9, 0] - [9, 37]
+      targets: [
+        Name: [9, 0] - [9, 4]
+          variable: Variable('warn', None)
+          ctx: Store
+      ]
+      value:
+        Str: [9, 7] - [9, 37]
+          s: '⚠️  problem %s: %s'
+          prefix: '"'
+          implicitly_concatenated_parts: None
+    Assign: [10, 0] - [10, 35]
+      targets: [
+        Name: [10, 0] - [10, 8]
+          variable: Variable('warn_raw', None)
+          ctx: Store
+      ]
+      value:
+        Str: [10, 11] - [10, 35]
+          s: '⚠️  problem %s: %s'
+          prefix: '"'
+          implicitly_concatenated_parts: None
+    Assign: [13, 0] - [13, 19]
+      targets: [
+        Name: [13, 0] - [13, 3]
+          variable: Variable('zwj', None)
+          ctx: Store
+      ]
+      value:
+        Str: [13, 6] - [13, 19]
+          s: '👨\u200d💻'
+          prefix: '"'
+          implicitly_concatenated_parts: None
+    Assign: [16, 0] - [16, 14]
+      targets: [
+        Name: [16, 0] - [16, 3]
+          variable: Variable('nfd', None)
+          ctx: Store
+      ]
+      value:
+        Str: [16, 6] - [16, 14]
+          s: 'café'
+          prefix: '"'
+          implicitly_concatenated_parts: None
+    Assign: [17, 0] - [17, 28]
+      targets: [
+        Name: [17, 0] - [17, 11]
+          variable: Variable('soft_hyphen', None)
+          ctx: Store
+      ]
+      value:
+        Str: [17, 14] - [17, 28]
+          s: 'soft\xadhyphen'
+          prefix: '"'
+          implicitly_concatenated_parts: None
+    Assign: [20, 0] - [20, 12]
+      targets: [
+        Name: [20, 0] - [20, 6]
+          variable: Variable('café', None)
+          ctx: Store
+      ]
+      value:
+        Name: [20, 9] - [20, 12]
+          variable: Variable('nfd', None)
+          ctx: Load
+    Assign: [23, 0] - [23, 23]
+      targets: [
+        Name: [23, 0] - [23, 3]
+          variable: Variable('raw', None)
+          ctx: Store
+      ]
+      value:
+        Str: [23, 6] - [23, 23]
+          s: '⚠️\\u{fe0f}'
+          prefix: 'r"'
+          implicitly_concatenated_parts: None
+    Assign: [24, 0] - [24, 23]
+      targets: [
+        Name: [24, 0] - [24, 6]
+          variable: Variable('joined', None)
+          ctx: Store
+      ]
+      value:
+        JoinedStr: [24, 9] - [24, 23]
+          values: [
+            Str: [24, 9] - [24, 12]
+              s: ''
+              prefix: 'f"'
+              implicitly_concatenated_parts: None
+            Name: [24, 12] - [24, 15]
+              variable: Variable('zwj', None)
+              ctx: Load
+            Str: [24, 15] - [24, 23]
+              s: '⚠️'
+              prefix: 'f"'
+              implicitly_concatenated_parts: None
+          ]
+    Assign: [25, 0] - [25, 37]
+      targets: [
+        Name: [25, 0] - [25, 12]
+          variable: Variable('concatenated', None)
+          ctx: Store
+      ]
+      value:
+        Str: [25, 15] - [25, 37]
+          s: '⚠️👨\u200d💻'
+          prefix: '"'
+          implicitly_concatenated_parts: [
+            StringPart: [25, 15] - [25, 23]
+              prefix: '"'
+              text: '"⚠️"'
+              s: '⚠️'
+            StringPart: [25, 24] - [25, 37]
+              prefix: '"'
+              text: '"👨\u200d💻"'
+              s: '👨\u200d💻'
+          ]
+    Assign: [28, 0] - [28, 17]
+      targets: [
+        Name: [28, 0] - [28, 1]
+          variable: Variable('d', None)
+          ctx: Store
+      ]
+      value:
+        Dict: [28, 4] - [28, 17]
+          items: [
+            KeyValuePair: [28, 5] - [28, 16]
+              key:
+                Str: [28, 5] - [28, 13]
+                  s: '⚠️'
+                  prefix: '"'
+                  implicitly_concatenated_parts: None
+              value:
+                Num: [28, 15] - [28, 16]
+                  n: 1
+                  text: '1'
+          ]
+  ]
diff --git a/python/extractor/tests/parser/unicode_escapes_new.py b/python/extractor/tests/parser/unicode_escapes_new.py
new file mode 100644
index 000000000000..72cc435be7ef
--- /dev/null
+++ b/python/extractor/tests/parser/unicode_escapes_new.py
@@ -0,0 +1,28 @@
+# Characters that Rust's `Debug` formatting escapes as `\u{...}` when `tsg-python` serialises the
+# source text. See https://github.com/github/codeql/issues/22435.
+
+# PEP 695 syntax is what makes the old parser bail out and hand the file to `tsg-python` in the
+# first place, so keep the reported reproducer intact.
+type X = int
+
+# U+FE0F variation selector, next to a `%` directive.
+warn = "\u26a0\ufe0f  problem %s: %s"
+warn_raw = "⚠️  problem %s: %s"
+
+# U+200D zero width joiner.
+zwj = "👨‍💻"
+
+# Combining acute accent (NFD), and a soft hyphen.
+nfd = "café"
+soft_hyphen = "soft­hyphen"
+
+# Combining marks are valid in identifiers too.
+café = nfd
+
+# In f-strings, raw strings and implicit concatenations too.
+raw = r"⚠️\u{fe0f}"
+joined = f"{zwj}⚠️"
+concatenated = "⚠️" "👨‍💻"
+
+# ... and outside of string literals.
+d = {"⚠️": 1}  # comment with ⚠️ and 👨‍💻
diff --git a/python/extractor/tests/parser/unicode_identifiers_new.expected b/python/extractor/tests/parser/unicode_identifiers_new.expected
new file mode 100644
index 000000000000..b7655aa835ee
--- /dev/null
+++ b/python/extractor/tests/parser/unicode_identifiers_new.expected
@@ -0,0 +1,108 @@
+Module: [2, 0] - [12, 0]
+  body: [
+    Assign: [2, 0] - [2, 7]
+      targets: [
+        Name: [2, 0] - [2, 3]
+          variable: Variable('\u088f', None)
+          ctx: Store
+      ]
+      value:
+        Num: [2, 6] - [2, 7]
+          n: 1
+          text: '1'
+    Assign: [3, 0] - [3, 8]
+      targets: [
+        Name: [3, 0] - [3, 4]
+          variable: Variable('\U0001e6c0', None)
+          ctx: Store
+      ]
+      value:
+        Num: [3, 7] - [3, 8]
+          n: 2
+          text: '2'
+    Assign: [4, 0] - [4, 8]
+      targets: [
+        Name: [4, 0] - [4, 4]
+          variable: Variable('\U000323b0', None)
+          ctx: Store
+      ]
+      value:
+        Num: [4, 7] - [4, 8]
+          n: 3
+          text: '3'
+    Assign: [5, 0] - [5, 8]
+      targets: [
+        Name: [5, 0] - [5, 4]
+          variable: Variable('\U00011db0', None)
+          ctx: Store
+      ]
+      value:
+        Num: [5, 7] - [5, 8]
+          n: 4
+          text: '4'
+    Assign: [8, 0] - [8, 8]
+      targets: [
+        Name: [8, 0] - [8, 4]
+          variable: Variable('a\u1acf', None)
+          ctx: Store
+      ]
+      value:
+        Num: [8, 7] - [8, 8]
+          n: 5
+          text: '5'
+    Assign: [9, 0] - [9, 9]
+      targets: [
+        Name: [9, 0] - [9, 5]
+          variable: Variable('a\U00011de0', None)
+          ctx: Store
+      ]
+      value:
+        Num: [9, 8] - [9, 9]
+          n: 6
+          text: '6'
+    Assign: [11, 0] - [11, 48]
+      targets: [
+        Name: [11, 0] - [11, 6]
+          variable: Variable('result', None)
+          ctx: Store
+      ]
+      value:
+        BinOp: [11, 9] - [11, 48]
+          left:
+            BinOp: [11, 9] - [11, 40]
+              left:
+                BinOp: [11, 9] - [11, 33]
+                  left:
+                    BinOp: [11, 9] - [11, 26]
+                      left:
+                        BinOp: [11, 9] - [11, 19]
+                          left:
+                            Name: [11, 9] - [11, 12]
+                              variable: Variable('\u088f', None)
+                              ctx: Load
+                          op: Add
+                          right:
+                            Name: [11, 15] - [11, 19]
+                              variable: Variable('\U0001e6c0', None)
+                              ctx: Load
+                      op: Add
+                      right:
+                        Name: [11, 22] - [11, 26]
+                          variable: Variable('\U000323b0', None)
+                          ctx: Load
+                  op: Add
+                  right:
+                    Name: [11, 29] - [11, 33]
+                      variable: Variable('\U00011db0', None)
+                      ctx: Load
+              op: Add
+              right:
+                Name: [11, 36] - [11, 40]
+                  variable: Variable('a\u1acf', None)
+                  ctx: Load
+          op: Add
+          right:
+            Name: [11, 43] - [11, 48]
+              variable: Variable('a\U00011de0', None)
+              ctx: Load
+  ]
diff --git a/python/extractor/tests/parser/unicode_identifiers_new.py b/python/extractor/tests/parser/unicode_identifiers_new.py
new file mode 100644
index 000000000000..ef91ffd3eca9
--- /dev/null
+++ b/python/extractor/tests/parser/unicode_identifiers_new.py
@@ -0,0 +1,11 @@
+# Unicode 17 identifier starts: Arabic, Tai Yo, CJK Extension J, and Tolong Siki.
+࢏ = 1
+𞛀 = 2
+𲎰 = 3
+𑶰 = 4
+
+# Unicode 17 identifier continuations: a combining mark and a decimal digit.
+a᫏ = 5
+a𑷠 = 6
+
+result = ࢏ + 𞛀 + 𲎰 + 𑶰 + a᫏ + a𑷠
diff --git a/python/extractor/tests/test_cmdline.py b/python/extractor/tests/test_cmdline.py
new file mode 100644
index 000000000000..76f2fe951b57
--- /dev/null
+++ b/python/extractor/tests/test_cmdline.py
@@ -0,0 +1,34 @@
+from semmle import cmdline
+
+
+def test_records_flags_without_values():
+    options, args = cmdline.parse(
+        [
+            "--verbosity=3",
+            "-zall",
+            "-R",
+            "/src",
+            "-vv",
+            "--path",
+            "/lib",
+            "-p",
+            "/other-lib",
+            "module",
+        ]
+    )
+
+    assert options.extractor_flags == ["p"]
+    assert args == ["module"]
+
+
+def test_records_flags_from_option_file(tmp_path):
+    options_file = tmp_path / "extractor-options"
+    options_file.write_text("--colorize --max-import-depth 2")
+
+    options, _ = cmdline.parse(["-f", str(options_file)])
+
+    assert options.extractor_flags == [
+        "colorize",
+        "f",
+        "max-import-depth",
+    ]
diff --git a/python/extractor/tests/test_diagnostics.py b/python/extractor/tests/test_diagnostics.py
new file mode 100644
index 000000000000..ddfd22436de9
--- /dev/null
+++ b/python/extractor/tests/test_diagnostics.py
@@ -0,0 +1,167 @@
+import platform
+
+from semmle import logging
+from semmle import util
+from semmle import worker
+from semmle.python.modules import PythonSourceModule
+
+
+def test_extractor_telemetry_message(mocker):
+    mocker.patch("semmle.logging.get_analysis_version", return_value="3.13")
+
+    message = logging.extractor_telemetry_message(["colorize", "p"]).to_dict()
+    message.pop("timestamp")
+
+    assert message == {
+        "source": {
+            "id": "py/extractor/summary",
+            "name": "Python extractor telemetry",
+            "extractorName": "python",
+        },
+        "severity": "note",
+        "markdownMessage": "Internal telemetry for the Python extractor.\n\nNo action needed.",
+        "visibility": {
+            "statusPage": False,
+            "cliSummaryTable": False,
+            "telemetry": True,
+        },
+        "attributes": {
+            "python_analysis_version": "3.13",
+            "python_runtime_version": platform.python_version(),
+            "extractor_version": util.VERSION,
+            "extractor_flags": "colorize p",
+        },
+    }
+
+
+def test_parser_statistics_telemetry_message():
+    message = logging.parser_statistics_telemetry_message(
+        old_parser_file_count=12, tree_sitter_parser_file_count=3
+    ).to_dict()
+    message.pop("timestamp")
+
+    assert message == {
+        "source": {
+            "id": "py/extractor/parser-statistics",
+            "name": "Python parser statistics",
+            "extractorName": "python",
+        },
+        "severity": "note",
+        "markdownMessage": "Internal parser telemetry for the Python extractor.\n\nNo action needed.",
+        "visibility": {
+            "statusPage": False,
+            "cliSummaryTable": False,
+            "telemetry": True,
+        },
+        "attributes": {
+            "old_parser_file_count": 12,
+            "tree_sitter_parser_file_count": 3,
+        },
+    }
+
+
+def test_extractor_telemetry_message_includes_empty_flags():
+    message = logging.extractor_telemetry_message([]).to_dict()
+
+    assert message["attributes"]["extractor_flags"] == "default"
+
+
+def test_write_extractor_telemetry(mocker):
+    diagnostics_writer = mocker.Mock()
+    logger = mocker.Mock()
+
+    worker._write_extractor_telemetry(diagnostics_writer, logger, ["quiet"])
+
+    diagnostics_writer.write.assert_called_once()
+    assert diagnostics_writer.write.call_args.args[0].to_dict()["attributes"] == {
+        "python_analysis_version": util.get_analysis_version(),
+        "python_runtime_version": platform.python_version(),
+        "extractor_version": util.VERSION,
+        "extractor_flags": "quiet",
+    }
+    logger.warning.assert_not_called()
+
+
+def test_write_extractor_telemetry_handles_io_error(mocker):
+    diagnostics_writer = mocker.Mock()
+    diagnostics_writer.write.side_effect = OSError("write failed")
+    logger = mocker.Mock()
+
+    worker._write_extractor_telemetry(diagnostics_writer, logger, [])
+
+    logger.warning.assert_called_once_with(
+        "Failed to write extractor telemetry: %s", diagnostics_writer.write.side_effect
+    )
+
+
+def test_write_parser_statistics_telemetry(mocker):
+    diagnostics_writer = mocker.Mock()
+    diagnostics_writer.parser_statistics.return_value = (1, 1)
+    logger = mocker.Mock()
+
+    worker._write_parser_statistics_telemetry(diagnostics_writer, logger)
+
+    diagnostics_writer.write.assert_called_once()
+    assert diagnostics_writer.write.call_args.args[0].to_dict()["attributes"] == {
+        "old_parser_file_count": 1,
+        "tree_sitter_parser_file_count": 1,
+    }
+    logger.warning.assert_not_called()
+
+
+def test_does_not_write_empty_parser_statistics_telemetry(mocker):
+    diagnostics_writer = mocker.Mock()
+    diagnostics_writer.parser_statistics.return_value = (0, 0)
+    logger = mocker.Mock()
+
+    worker._write_parser_statistics_telemetry(diagnostics_writer, logger)
+
+    diagnostics_writer.write.assert_not_called()
+    logger.warning.assert_not_called()
+
+
+def test_records_old_parser_usage_once(mocker, monkeypatch):
+    monkeypatch.delenv("CODEQL_PYTHON_DISABLE_OLD_PARSER", raising=False)
+    monkeypatch.delenv("CODEQL_PYTHON_DISABLE_TSG_PARSER", raising=False)
+    old_ast = object()
+    mocker.patch("semmle.python.parser.parse", return_value=old_ast)
+    diagnostics_writer = worker.DiagnosticsWriter(1)
+    module = PythonSourceModule(
+        None,
+        "test.py",
+        mocker.Mock(),
+        diagnostics_writer,
+        bytes_source=b"x = 1\n",
+    )
+
+    parsed_ast = module.py_ast
+    # Access the cached AST again to verify that it is not counted twice.
+    _ = module.py_ast
+
+    assert parsed_ast is old_ast
+    assert diagnostics_writer.parser_statistics() == (1, 0)
+
+
+def test_records_tree_sitter_parser_usage_once(mocker, monkeypatch):
+    monkeypatch.delenv("CODEQL_PYTHON_DISABLE_OLD_PARSER", raising=False)
+    monkeypatch.delenv("CODEQL_PYTHON_DISABLE_TSG_PARSER", raising=False)
+    tree_sitter_ast = object()
+    mocker.patch("semmle.python.parser.parse", side_effect=SyntaxError("old parser failed"))
+    mocker.patch(
+        "semmle.python.parser.tsg_parser.parse", return_value=tree_sitter_ast
+    )
+    diagnostics_writer = worker.DiagnosticsWriter(1)
+    module = PythonSourceModule(
+        None,
+        "test.py",
+        mocker.Mock(),
+        diagnostics_writer,
+        bytes_source=b"x = 1\n",
+    )
+
+    parsed_ast = module.py_ast
+    # Access the cached AST again to verify that it is not counted twice.
+    _ = module.py_ast
+
+    assert parsed_ast is tree_sitter_ast
+    assert diagnostics_writer.parser_statistics() == (0, 1)
diff --git a/python/extractor/tests/test_tsg_parser.py b/python/extractor/tests/test_tsg_parser.py
new file mode 100644
index 000000000000..eedba8085f28
--- /dev/null
+++ b/python/extractor/tests/test_tsg_parser.py
@@ -0,0 +1,122 @@
+import unittest
+import unittest.mock
+import json
+
+from semmle.logging import format_message
+from semmle.python.parser.tsg_parser import Node, evaluate_string, read_tsg_python_output
+
+
+class JsonOutputTest(unittest.TestCase):
+    def test_decodes_nodes_edges_and_attribute_values(self):
+        output = json.dumps(
+            [
+                {
+                    "id": 0,
+                    "edges": [
+                        {
+                            "sink": 1,
+                            "attrs": {"body": {"type": "int", "int": 0}},
+                        }
+                    ],
+                    "attrs": {
+                        "_kind": {"type": "string", "string": "Module"},
+                        "_location": {
+                            "type": "list",
+                            "values": [
+                                {"type": "int", "int": 0},
+                                {"type": "int", "int": 0},
+                                {"type": "int", "int": 1},
+                                {"type": "int", "int": 0},
+                            ],
+                        },
+                    },
+                },
+                {
+                    "id": 1,
+                    "edges": [],
+                    "attrs": {
+                        "_kind": {"type": "string", "string": "Name"},
+                        "variable": {
+                            "type": "string",
+                            "string": "caf\u00e9 \u26a0\ufe0f \U0001f4be",
+                        },
+                        "s": {
+                            "type": "string",
+                            "string": '"\u26a0\ufe0f  problem %s: %s"',
+                        },
+                        "is_async": {"type": "bool", "bool": True},
+                        "optional": {"type": "null"},
+                        "_skip_to": {"type": "graphNode", "id": 0},
+                    },
+                },
+            ]
+        ).encode("utf-8")
+
+        process = unittest.mock.Mock()
+        process.communicate.return_value = (output, None)
+        process.returncode = 0
+        with unittest.mock.patch(
+            "semmle.python.parser.tsg_parser.subprocess.Popen", return_value=process
+        ):
+            node_attr, edge_attr = read_tsg_python_output(
+                "test.py", unittest.mock.Mock()
+            )
+
+        self.assertEqual(node_attr[1]["variable"], "caf\u00e9 \u26a0\ufe0f \U0001f4be")
+        self.assertEqual(node_attr[1]["s"], "\u26a0\ufe0f  problem %s: %s")
+        self.assertIs(node_attr[1]["is_async"], True)
+        self.assertIsNone(node_attr[1]["optional"])
+        self.assertIsInstance(node_attr[1]["_skip_to"], Node)
+        self.assertEqual(node_attr[1]["_skip_to"].id, 0)
+        self.assertEqual(edge_attr, {0: {"body": [(0, 1)]}})
+
+    def test_evaluate_string_on_reported_value(self):
+        value = '"\u26a0\ufe0f  problem %s: %s"'
+        self.assertEqual(evaluate_string(value), "\u26a0\ufe0f  problem %s: %s")
+
+    def test_syntax_error_node_raises(self):
+        output = json.dumps(
+            [
+                {
+                    "id": 0,
+                    "edges": [],
+                    "attrs": {
+                        "_kind": {"type": "string", "string": "SyntaxErrorNode"},
+                        "_location": {
+                            "type": "list",
+                            "values": [
+                                {"type": "int", "int": 4},
+                                {"type": "int", "int": 5},
+                                {"type": "int", "int": 4},
+                                {"type": "int", "int": 6},
+                            ],
+                        },
+                        "source": {"type": "string", "string": "!"},
+                    },
+                }
+            ]
+        ).encode("utf-8")
+
+        process = unittest.mock.Mock()
+        process.communicate.return_value = (output, None)
+        process.returncode = 0
+        with unittest.mock.patch(
+            "semmle.python.parser.tsg_parser.subprocess.Popen", return_value=process
+        ):
+            with self.assertRaises(SyntaxError) as raised:
+                read_tsg_python_output("test.py", unittest.mock.Mock())
+
+        self.assertEqual(raised.exception.lineno, 5)
+        self.assertEqual(raised.exception.offset, 5)
+
+
+class FormatMessageTest(unittest.TestCase):
+    """A pre-formatted log message may contain `%` directives coming from the analysed source, and
+    must not be `%`-formatted again."""
+
+    def test_no_arguments(self):
+        message = "Error while parsing value '%s: %s'"
+        self.assertEqual(format_message(message, ()), message)
+
+    def test_with_arguments(self):
+        self.assertEqual(format_message("%s and %s", ("a", "b")), "a and b")
diff --git a/python/extractor/tsg-python/Cargo.lock b/python/extractor/tsg-python/Cargo.lock
index f3604d1a3870..9c2e616354e3 100644
--- a/python/extractor/tsg-python/Cargo.lock
+++ b/python/extractor/tsg-python/Cargo.lock
@@ -321,6 +321,7 @@ dependencies = [
  "anyhow",
  "clap",
  "regex",
+ "serde_json",
  "tree-sitter",
  "tree-sitter-graph",
  "tsp",
diff --git a/python/extractor/tsg-python/Cargo.toml b/python/extractor/tsg-python/Cargo.toml
index f02fb06931b2..378f8698b654 100644
--- a/python/extractor/tsg-python/Cargo.toml
+++ b/python/extractor/tsg-python/Cargo.toml
@@ -14,3 +14,4 @@ tree-sitter = "=0.24.7"
 tree-sitter-graph = "0.12.0"
 tsp = {path = "tsp"}
 clap = "4.5"
+serde_json = "1.0"
diff --git a/python/extractor/tsg-python/python.tsg b/python/extractor/tsg-python/python.tsg
index c832f7e63219..9cf35d8fd542 100644
--- a/python/extractor/tsg-python/python.tsg
+++ b/python/extractor/tsg-python/python.tsg
@@ -2825,9 +2825,13 @@
     var left_node = #null
     if some @prefix_op {
         set left_node = (ast-node @left "UnaryOp")
-        attr (left_node) _start_location = (location-start @prefix_op)
+        attr (left_node) _location_start = (location-start @prefix_op)
         attr (left_node) operand = @left.node
-        attr (left_node) op = "usub"
+        if (eq (source-text @prefix_op) "+") {
+            attr (left_node) op = "uadd"
+        } else {
+            attr (left_node) op = "usub"
+        }
     } else {
         set left_node = @left.node
     }
diff --git a/python/extractor/tsg-python/src/main.rs b/python/extractor/tsg-python/src/main.rs
index 6e07a8cd86e7..2885203bc039 100644
--- a/python/extractor/tsg-python/src/main.rs
+++ b/python/extractor/tsg-python/src/main.rs
@@ -710,6 +710,6 @@ fn main() -> Result<()> {
         add_syntax_error_nodes(&mut graph, &syntax_errors);
     }
 
-    print!("{}", graph.pretty_print());
+    serde_json::to_writer(std::io::stdout().lock(), &graph)?;
     Ok(())
 }
diff --git a/python/extractor/tsg-python/tsp/bindings/rust/lib.rs b/python/extractor/tsg-python/tsp/bindings/rust/lib.rs
index 560277354f2a..33a32e703f3b 100644
--- a/python/extractor/tsg-python/tsp/bindings/rust/lib.rs
+++ b/python/extractor/tsg-python/tsp/bindings/rust/lib.rs
@@ -62,7 +62,7 @@ mod tests {
     fn can_load_grammar() {
         let mut parser = tree_sitter::Parser::new();
         parser
-            .set_language(super::language())
+            .set_language(&super::language())
             .expect("Error loading Python grammar");
     }
 }
diff --git a/python/extractor/tsg-python/tsp/grammar.js b/python/extractor/tsg-python/tsp/grammar.js
index 8f4dd8d7cf64..687c700c12ca 100644
--- a/python/extractor/tsg-python/tsp/grammar.js
+++ b/python/extractor/tsg-python/tsp/grammar.js
@@ -22,6 +22,49 @@ const PREC = {
   call: 21,
 }
 
+// The generator's Unicode properties currently use Unicode 16. Supplement them with
+// the Unicode 17 XID additions for Python 3.15. These can be removed once the generator
+// includes Unicode 17: https://www.unicode.org/Public/17.0.0/ucd/DerivedCoreProperties.txt
+const UNICODE17_XID_START = [
+  String.raw`\u{88F}`,
+  String.raw`\u{C5C}`,
+  String.raw`\u{CDC}`,
+  String.raw`\u{A7CE}-\u{A7CF}`,
+  String.raw`\u{A7D2}`,
+  String.raw`\u{A7D4}`,
+  String.raw`\u{A7F1}`,
+  String.raw`\u{10940}-\u{10959}`,
+  String.raw`\u{10EC5}-\u{10EC7}`,
+  String.raw`\u{11DB0}-\u{11DDB}`,
+  String.raw`\u{16EA0}-\u{16EB8}`,
+  String.raw`\u{16EBB}-\u{16ED3}`,
+  String.raw`\u{16FF2}-\u{16FF6}`,
+  String.raw`\u{187F8}-\u{187FF}`,
+  String.raw`\u{18D09}-\u{18D1E}`,
+  String.raw`\u{18D80}-\u{18DF2}`,
+  String.raw`\u{1E6C0}-\u{1E6DE}`,
+  String.raw`\u{1E6E0}-\u{1E6E2}`,
+  String.raw`\u{1E6E4}-\u{1E6E5}`,
+  String.raw`\u{1E6E7}-\u{1E6ED}`,
+  String.raw`\u{1E6F0}-\u{1E6F4}`,
+  String.raw`\u{1E6FE}-\u{1E6FF}`,
+  String.raw`\u{2B73A}-\u{2B73F}`,
+  String.raw`\u{2CEA2}-\u{2CEAD}`,
+  String.raw`\u{323B0}-\u{33479}`,
+].join('');
+
+const UNICODE17_XID_CONTINUE = UNICODE17_XID_START + [
+  String.raw`\u{1ACF}-\u{1ADD}`,
+  String.raw`\u{1AE0}-\u{1AEB}`,
+  String.raw`\u{10EFA}-\u{10EFB}`,
+  String.raw`\u{11B60}-\u{11B67}`,
+  String.raw`\u{11DE0}-\u{11DE9}`,
+  String.raw`\u{1E6E3}`,
+  String.raw`\u{1E6E6}`,
+  String.raw`\u{1E6EE}-\u{1E6EF}`,
+  String.raw`\u{1E6F5}`,
+].join('');
+
 module.exports = grammar({
   name: 'python',
 
@@ -426,7 +469,7 @@ module.exports = grammar({
 
     match_literal_pattern: $ => choice(
       seq(
-        optional(field('prefix_operator', '-')),
+        optional(field('prefix_operator', choice('-', '+'))),
         field('real', choice($.integer, $.float)),
         optional(seq(
           field('operator', choice('+', '-')),
@@ -595,6 +638,7 @@ module.exports = grammar({
     type_parameters: $ => seq(
       '[',
       commaSep1(field('type_parameter', $._type_parameter)),
+      optional(','),
       ']'
     ),
 
@@ -1220,7 +1264,10 @@ module.exports = grammar({
       ))
     },
 
-    identifier: $ => /[_\p{XID_Start}][_\p{XID_Continue}]*/,
+    identifier: $ => new RegExp(
+      `[_\\p{XID_Start}${UNICODE17_XID_START}][_\\p{XID_Continue}${UNICODE17_XID_CONTINUE}]*`,
+      'u'
+    ),
 
     keyword_identifier: $ => prec(-3, alias(
       choice(
diff --git a/python/extractor/tsg-python/tsp/src/grammar.json b/python/extractor/tsg-python/tsp/src/grammar.json
index 8fb9763034ef..c8fe7ff9dea5 100644
--- a/python/extractor/tsg-python/tsp/src/grammar.json
+++ b/python/extractor/tsg-python/tsp/src/grammar.json
@@ -1792,8 +1792,17 @@
                   "type": "FIELD",
                   "name": "prefix_operator",
                   "content": {
-                    "type": "STRING",
-                    "value": "-"
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": "-"
+                      },
+                      {
+                        "type": "STRING",
+                        "value": "+"
+                      }
+                    ]
                   }
                 },
                 {
@@ -3016,6 +3025,18 @@
             }
           ]
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ","
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "STRING",
           "value": "]"
@@ -6756,7 +6777,8 @@
     },
     "identifier": {
       "type": "PATTERN",
-      "value": "[_\\p{XID_Start}][_\\p{XID_Continue}]*"
+      "value": "[_\\p{XID_Start}\\u{88F}\\u{C5C}\\u{CDC}\\u{A7CE}-\\u{A7CF}\\u{A7D2}\\u{A7D4}\\u{A7F1}\\u{10940}-\\u{10959}\\u{10EC5}-\\u{10EC7}\\u{11DB0}-\\u{11DDB}\\u{16EA0}-\\u{16EB8}\\u{16EBB}-\\u{16ED3}\\u{16FF2}-\\u{16FF6}\\u{187F8}-\\u{187FF}\\u{18D09}-\\u{18D1E}\\u{18D80}-\\u{18DF2}\\u{1E6C0}-\\u{1E6DE}\\u{1E6E0}-\\u{1E6E2}\\u{1E6E4}-\\u{1E6E5}\\u{1E6E7}-\\u{1E6ED}\\u{1E6F0}-\\u{1E6F4}\\u{1E6FE}-\\u{1E6FF}\\u{2B73A}-\\u{2B73F}\\u{2CEA2}-\\u{2CEAD}\\u{323B0}-\\u{33479}][_\\p{XID_Continue}\\u{88F}\\u{C5C}\\u{CDC}\\u{A7CE}-\\u{A7CF}\\u{A7D2}\\u{A7D4}\\u{A7F1}\\u{10940}-\\u{10959}\\u{10EC5}-\\u{10EC7}\\u{11DB0}-\\u{11DDB}\\u{16EA0}-\\u{16EB8}\\u{16EBB}-\\u{16ED3}\\u{16FF2}-\\u{16FF6}\\u{187F8}-\\u{187FF}\\u{18D09}-\\u{18D1E}\\u{18D80}-\\u{18DF2}\\u{1E6C0}-\\u{1E6DE}\\u{1E6E0}-\\u{1E6E2}\\u{1E6E4}-\\u{1E6E5}\\u{1E6E7}-\\u{1E6ED}\\u{1E6F0}-\\u{1E6F4}\\u{1E6FE}-\\u{1E6FF}\\u{2B73A}-\\u{2B73F}\\u{2CEA2}-\\u{2CEAD}\\u{323B0}-\\u{33479}\\u{1ACF}-\\u{1ADD}\\u{1AE0}-\\u{1AEB}\\u{10EFA}-\\u{10EFB}\\u{11B60}-\\u{11B67}\\u{11DE0}-\\u{11DE9}\\u{1E6E3}\\u{1E6E6}\\u{1E6EE}-\\u{1E6EF}\\u{1E6F5}]*",
+      "flags": "u"
     },
     "keyword_identifier": {
       "type": "PREC",
diff --git a/python/extractor/tsg-python/tsp/src/node-types.json b/python/extractor/tsg-python/tsp/src/node-types.json
index 6579591c6522..03cdee9b3670 100644
--- a/python/extractor/tsg-python/tsp/src/node-types.json
+++ b/python/extractor/tsg-python/tsp/src/node-types.json
@@ -2510,6 +2510,10 @@
         "multiple": false,
         "required": false,
         "types": [
+          {
+            "type": "+",
+            "named": false
+          },
           {
             "type": "-",
             "named": false
diff --git a/python/extractor/tsg-python/tsp/src/parser.c b/python/extractor/tsg-python/tsp/src/parser.c
index 16db1b93d977..622fe5f902d3 100644
--- a/python/extractor/tsg-python/tsp/src/parser.c
+++ b/python/extractor/tsg-python/tsp/src/parser.c
@@ -1,4 +1,4 @@
-/* Automatically @generated by tree-sitter */
+/* Automatically @generated by tree-sitter v0.25.10 */
 
 #include "tree_sitter/parser.h"
 
@@ -7,7 +7,7 @@
 #endif
 
 #define LANGUAGE_VERSION 14
-#define STATE_COUNT 1755
+#define STATE_COUNT 1759
 #define LARGE_STATE_COUNT 157
 #define SYMBOL_COUNT 292
 #define ALIAS_COUNT 3
@@ -3088,8 +3088,8 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [1] = 1,
   [2] = 2,
   [3] = 3,
-  [4] = 4,
-  [5] = 2,
+  [4] = 2,
+  [5] = 5,
   [6] = 6,
   [7] = 7,
   [8] = 8,
@@ -3116,8 +3116,8 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [29] = 29,
   [30] = 30,
   [31] = 31,
-  [32] = 4,
-  [33] = 6,
+  [32] = 5,
+  [33] = 7,
   [34] = 8,
   [35] = 9,
   [36] = 10,
@@ -3143,13 +3143,13 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [56] = 30,
   [57] = 31,
   [58] = 3,
-  [59] = 7,
+  [59] = 6,
   [60] = 60,
   [61] = 60,
   [62] = 62,
-  [63] = 60,
-  [64] = 64,
-  [65] = 62,
+  [63] = 63,
+  [64] = 60,
+  [65] = 63,
   [66] = 66,
   [67] = 66,
   [68] = 68,
@@ -3161,7 +3161,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [74] = 74,
   [75] = 75,
   [76] = 76,
-  [77] = 75,
+  [77] = 77,
   [78] = 78,
   [79] = 79,
   [80] = 80,
@@ -3169,54 +3169,54 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [82] = 82,
   [83] = 83,
   [84] = 84,
-  [85] = 85,
-  [86] = 86,
-  [87] = 87,
-  [88] = 88,
-  [89] = 89,
-  [90] = 69,
-  [91] = 74,
-  [92] = 70,
-  [93] = 76,
-  [94] = 68,
-  [95] = 95,
-  [96] = 81,
-  [97] = 71,
-  [98] = 87,
-  [99] = 79,
+  [85] = 70,
+  [86] = 75,
+  [87] = 72,
+  [88] = 73,
+  [89] = 74,
+  [90] = 79,
+  [91] = 91,
+  [92] = 81,
+  [93] = 93,
+  [94] = 83,
+  [95] = 91,
+  [96] = 93,
+  [97] = 97,
+  [98] = 97,
+  [99] = 76,
   [100] = 100,
-  [101] = 95,
-  [102] = 80,
+  [101] = 100,
+  [102] = 102,
   [103] = 103,
-  [104] = 100,
-  [105] = 103,
+  [104] = 68,
+  [105] = 102,
   [106] = 106,
-  [107] = 107,
-  [108] = 107,
-  [109] = 82,
+  [107] = 103,
+  [108] = 78,
+  [109] = 109,
   [110] = 110,
-  [111] = 110,
-  [112] = 83,
+  [111] = 106,
+  [112] = 112,
   [113] = 113,
-  [114] = 84,
-  [115] = 115,
-  [116] = 113,
-  [117] = 85,
-  [118] = 115,
+  [114] = 109,
+  [115] = 80,
+  [116] = 116,
+  [117] = 110,
+  [118] = 69,
   [119] = 119,
-  [120] = 72,
-  [121] = 86,
-  [122] = 73,
-  [123] = 106,
+  [120] = 112,
+  [121] = 71,
+  [122] = 113,
+  [123] = 82,
   [124] = 119,
-  [125] = 88,
-  [126] = 89,
+  [125] = 116,
+  [126] = 84,
   [127] = 127,
   [128] = 128,
-  [129] = 127,
-  [130] = 127,
-  [131] = 128,
-  [132] = 128,
+  [129] = 128,
+  [130] = 128,
+  [131] = 127,
+  [132] = 127,
   [133] = 133,
   [134] = 134,
   [135] = 135,
@@ -3224,31 +3224,31 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [137] = 137,
   [138] = 136,
   [139] = 136,
-  [140] = 136,
-  [141] = 141,
-  [142] = 137,
-  [143] = 143,
-  [144] = 144,
-  [145] = 136,
-  [146] = 136,
-  [147] = 137,
-  [148] = 135,
+  [140] = 140,
+  [141] = 136,
+  [142] = 142,
+  [143] = 137,
+  [144] = 136,
+  [145] = 145,
+  [146] = 137,
+  [147] = 135,
+  [148] = 137,
   [149] = 134,
-  [150] = 137,
-  [151] = 137,
+  [150] = 136,
+  [151] = 145,
   [152] = 137,
-  [153] = 144,
+  [153] = 137,
   [154] = 154,
   [155] = 155,
   [156] = 156,
   [157] = 157,
-  [158] = 157,
+  [158] = 158,
   [159] = 159,
-  [160] = 159,
+  [160] = 160,
   [161] = 161,
-  [162] = 162,
-  [163] = 159,
-  [164] = 164,
+  [162] = 158,
+  [163] = 161,
+  [164] = 158,
   [165] = 165,
   [166] = 165,
   [167] = 165,
@@ -3258,97 +3258,97 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [171] = 171,
   [172] = 172,
   [173] = 173,
-  [174] = 173,
+  [174] = 171,
   [175] = 175,
   [176] = 176,
   [177] = 177,
   [178] = 178,
-  [179] = 169,
+  [179] = 179,
   [180] = 180,
-  [181] = 178,
+  [181] = 169,
   [182] = 182,
   [183] = 183,
-  [184] = 184,
-  [185] = 171,
-  [186] = 178,
-  [187] = 172,
-  [188] = 178,
-  [189] = 184,
-  [190] = 190,
+  [184] = 172,
+  [185] = 173,
+  [186] = 180,
+  [187] = 187,
+  [188] = 180,
+  [189] = 179,
+  [190] = 180,
   [191] = 191,
   [192] = 192,
   [193] = 193,
   [194] = 194,
-  [195] = 193,
-  [196] = 194,
-  [197] = 173,
+  [195] = 195,
+  [196] = 196,
+  [197] = 197,
   [198] = 198,
-  [199] = 191,
-  [200] = 200,
+  [199] = 199,
+  [200] = 173,
   [201] = 201,
   [202] = 202,
   [203] = 172,
-  [204] = 198,
-  [205] = 191,
-  [206] = 200,
-  [207] = 201,
-  [208] = 208,
-  [209] = 209,
-  [210] = 208,
-  [211] = 171,
-  [212] = 208,
-  [213] = 192,
+  [204] = 193,
+  [205] = 194,
+  [206] = 206,
+  [207] = 198,
+  [208] = 195,
+  [209] = 196,
+  [210] = 198,
+  [211] = 199,
+  [212] = 201,
+  [213] = 213,
   [214] = 214,
-  [215] = 192,
+  [215] = 191,
   [216] = 193,
   [217] = 194,
-  [218] = 198,
-  [219] = 191,
-  [220] = 200,
-  [221] = 201,
-  [222] = 209,
-  [223] = 208,
-  [224] = 224,
-  [225] = 193,
-  [226] = 194,
-  [227] = 198,
-  [228] = 228,
-  [229] = 200,
-  [230] = 201,
-  [231] = 209,
-  [232] = 208,
-  [233] = 233,
-  [234] = 209,
-  [235] = 208,
-  [236] = 209,
-  [237] = 209,
+  [218] = 195,
+  [219] = 196,
+  [220] = 214,
+  [221] = 198,
+  [222] = 199,
+  [223] = 171,
+  [224] = 214,
+  [225] = 191,
+  [226] = 193,
+  [227] = 194,
+  [228] = 195,
+  [229] = 196,
+  [230] = 198,
+  [231] = 199,
+  [232] = 191,
+  [233] = 198,
+  [234] = 199,
+  [235] = 199,
+  [236] = 201,
+  [237] = 214,
   [238] = 238,
-  [239] = 238,
+  [239] = 239,
   [240] = 240,
   [241] = 238,
-  [242] = 238,
+  [242] = 242,
   [243] = 243,
-  [244] = 244,
-  [245] = 245,
+  [244] = 238,
+  [245] = 238,
   [246] = 246,
   [247] = 247,
   [248] = 248,
   [249] = 249,
   [250] = 250,
-  [251] = 248,
-  [252] = 252,
-  [253] = 249,
+  [251] = 251,
+  [252] = 247,
+  [253] = 250,
   [254] = 254,
-  [255] = 254,
-  [256] = 254,
-  [257] = 257,
+  [255] = 255,
+  [256] = 255,
+  [257] = 254,
   [258] = 258,
-  [259] = 257,
+  [259] = 258,
   [260] = 258,
-  [261] = 257,
+  [261] = 254,
   [262] = 258,
-  [263] = 257,
-  [264] = 258,
+  [263] = 254,
+  [264] = 255,
   [265] = 265,
   [266] = 266,
   [267] = 267,
@@ -3356,23 +3356,23 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [269] = 269,
   [270] = 270,
   [271] = 271,
-  [272] = 266,
+  [272] = 272,
   [273] = 273,
   [274] = 274,
   [275] = 275,
-  [276] = 276,
-  [277] = 270,
+  [276] = 271,
+  [277] = 265,
   [278] = 278,
   [279] = 279,
   [280] = 280,
-  [281] = 275,
-  [282] = 267,
-  [283] = 278,
-  [284] = 284,
-  [285] = 284,
-  [286] = 280,
-  [287] = 274,
-  [288] = 271,
+  [281] = 269,
+  [282] = 282,
+  [283] = 272,
+  [284] = 270,
+  [285] = 274,
+  [286] = 278,
+  [287] = 268,
+  [288] = 275,
   [289] = 289,
   [290] = 290,
   [291] = 291,
@@ -3380,7 +3380,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [293] = 293,
   [294] = 294,
   [295] = 295,
-  [296] = 296,
+  [296] = 290,
   [297] = 297,
   [298] = 298,
   [299] = 299,
@@ -3388,9 +3388,9 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [301] = 301,
   [302] = 302,
   [303] = 303,
-  [304] = 292,
-  [305] = 295,
-  [306] = 290,
+  [304] = 300,
+  [305] = 305,
+  [306] = 291,
   [307] = 307,
   [308] = 308,
   [309] = 309,
@@ -3399,29 +3399,29 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [312] = 312,
   [313] = 313,
   [314] = 314,
-  [315] = 315,
-  [316] = 312,
+  [315] = 314,
+  [316] = 316,
   [317] = 317,
   [318] = 318,
   [319] = 319,
-  [320] = 320,
+  [320] = 318,
   [321] = 321,
   [322] = 322,
-  [323] = 323,
-  [324] = 314,
-  [325] = 311,
-  [326] = 326,
-  [327] = 321,
-  [328] = 318,
-  [329] = 322,
-  [330] = 326,
-  [331] = 315,
-  [332] = 320,
-  [333] = 333,
-  [334] = 333,
-  [335] = 323,
-  [336] = 336,
-  [337] = 319,
+  [323] = 321,
+  [324] = 324,
+  [325] = 325,
+  [326] = 313,
+  [327] = 327,
+  [328] = 312,
+  [329] = 329,
+  [330] = 324,
+  [331] = 331,
+  [332] = 329,
+  [333] = 317,
+  [334] = 331,
+  [335] = 325,
+  [336] = 322,
+  [337] = 316,
   [338] = 338,
   [339] = 339,
   [340] = 340,
@@ -3429,175 +3429,175 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [342] = 342,
   [343] = 343,
   [344] = 344,
-  [345] = 345,
-  [346] = 346,
-  [347] = 347,
+  [345] = 339,
+  [346] = 341,
+  [347] = 342,
   [348] = 348,
   [349] = 349,
   [350] = 350,
-  [351] = 346,
+  [351] = 351,
   [352] = 352,
   [353] = 353,
   [354] = 354,
-  [355] = 355,
+  [355] = 350,
   [356] = 356,
-  [357] = 342,
-  [358] = 338,
-  [359] = 339,
+  [357] = 357,
+  [358] = 358,
+  [359] = 359,
   [360] = 360,
   [361] = 361,
-  [362] = 362,
+  [362] = 343,
   [363] = 363,
   [364] = 364,
-  [365] = 353,
-  [366] = 354,
-  [367] = 346,
-  [368] = 342,
-  [369] = 355,
-  [370] = 346,
-  [371] = 349,
-  [372] = 372,
-  [373] = 353,
-  [374] = 374,
-  [375] = 355,
-  [376] = 338,
-  [377] = 339,
-  [378] = 360,
-  [379] = 342,
-  [380] = 353,
-  [381] = 360,
-  [382] = 338,
-  [383] = 339,
-  [384] = 360,
+  [365] = 354,
+  [366] = 366,
+  [367] = 367,
+  [368] = 338,
+  [369] = 369,
+  [370] = 352,
+  [371] = 344,
+  [372] = 343,
+  [373] = 363,
+  [374] = 344,
+  [375] = 338,
+  [376] = 339,
+  [377] = 340,
+  [378] = 378,
+  [379] = 341,
+  [380] = 380,
+  [381] = 381,
+  [382] = 382,
+  [383] = 341,
+  [384] = 349,
   [385] = 342,
   [386] = 386,
   [387] = 387,
-  [388] = 349,
-  [389] = 372,
-  [390] = 349,
-  [391] = 372,
-  [392] = 350,
+  [388] = 342,
+  [389] = 389,
+  [390] = 338,
+  [391] = 391,
+  [392] = 392,
   [393] = 393,
-  [394] = 394,
-  [395] = 374,
-  [396] = 372,
-  [397] = 374,
+  [394] = 349,
+  [395] = 350,
+  [396] = 382,
+  [397] = 352,
   [398] = 398,
-  [399] = 372,
-  [400] = 400,
-  [401] = 343,
-  [402] = 398,
-  [403] = 403,
-  [404] = 404,
-  [405] = 405,
-  [406] = 346,
-  [407] = 407,
-  [408] = 346,
-  [409] = 374,
-  [410] = 353,
-  [411] = 355,
-  [412] = 338,
-  [413] = 339,
-  [414] = 360,
-  [415] = 342,
-  [416] = 372,
-  [417] = 417,
-  [418] = 403,
-  [419] = 353,
-  [420] = 403,
-  [421] = 354,
-  [422] = 403,
-  [423] = 403,
-  [424] = 345,
-  [425] = 425,
-  [426] = 355,
-  [427] = 425,
-  [428] = 339,
-  [429] = 429,
-  [430] = 360,
-  [431] = 394,
-  [432] = 403,
-  [433] = 338,
-  [434] = 434,
-  [435] = 405,
-  [436] = 348,
-  [437] = 347,
-  [438] = 355,
+  [399] = 349,
+  [400] = 350,
+  [401] = 350,
+  [402] = 339,
+  [403] = 361,
+  [404] = 343,
+  [405] = 363,
+  [406] = 344,
+  [407] = 393,
+  [408] = 340,
+  [409] = 339,
+  [410] = 340,
+  [411] = 338,
+  [412] = 341,
+  [413] = 343,
+  [414] = 344,
+  [415] = 339,
+  [416] = 340,
+  [417] = 341,
+  [418] = 342,
+  [419] = 350,
+  [420] = 420,
+  [421] = 393,
+  [422] = 422,
+  [423] = 393,
+  [424] = 393,
+  [425] = 393,
+  [426] = 378,
+  [427] = 359,
+  [428] = 428,
+  [429] = 342,
+  [430] = 338,
+  [431] = 422,
+  [432] = 352,
+  [433] = 343,
+  [434] = 344,
+  [435] = 389,
+  [436] = 351,
+  [437] = 380,
+  [438] = 340,
   [439] = 439,
   [440] = 440,
   [441] = 441,
   [442] = 442,
   [443] = 443,
   [444] = 444,
-  [445] = 444,
+  [445] = 445,
   [446] = 446,
   [447] = 447,
   [448] = 448,
-  [449] = 448,
-  [450] = 450,
-  [451] = 439,
-  [452] = 452,
-  [453] = 453,
-  [454] = 447,
-  [455] = 455,
-  [456] = 441,
-  [457] = 457,
-  [458] = 457,
-  [459] = 455,
-  [460] = 442,
-  [461] = 440,
-  [462] = 443,
-  [463] = 446,
-  [464] = 450,
+  [449] = 449,
+  [450] = 439,
+  [451] = 451,
+  [452] = 443,
+  [453] = 441,
+  [454] = 442,
+  [455] = 445,
+  [456] = 456,
+  [457] = 456,
+  [458] = 458,
+  [459] = 440,
+  [460] = 446,
+  [461] = 447,
+  [462] = 451,
+  [463] = 448,
+  [464] = 449,
   [465] = 465,
   [466] = 466,
   [467] = 467,
   [468] = 468,
   [469] = 469,
-  [470] = 470,
-  [471] = 471,
+  [470] = 467,
+  [471] = 469,
   [472] = 472,
   [473] = 473,
-  [474] = 474,
+  [474] = 468,
   [475] = 475,
   [476] = 476,
-  [477] = 475,
+  [477] = 477,
   [478] = 478,
-  [479] = 473,
+  [479] = 479,
   [480] = 480,
   [481] = 480,
-  [482] = 474,
+  [482] = 482,
   [483] = 483,
-  [484] = 476,
-  [485] = 483,
-  [486] = 486,
-  [487] = 467,
-  [488] = 468,
-  [489] = 472,
-  [490] = 486,
-  [491] = 478,
-  [492] = 317,
+  [484] = 472,
+  [485] = 465,
+  [486] = 477,
+  [487] = 487,
+  [488] = 466,
+  [489] = 487,
+  [490] = 479,
+  [491] = 473,
+  [492] = 492,
   [493] = 493,
   [494] = 494,
   [495] = 495,
-  [496] = 496,
-  [497] = 493,
-  [498] = 498,
+  [496] = 495,
+  [497] = 497,
+  [498] = 497,
   [499] = 499,
   [500] = 500,
-  [501] = 501,
-  [502] = 502,
-  [503] = 313,
-  [504] = 496,
-  [505] = 498,
+  [501] = 493,
+  [502] = 319,
+  [503] = 503,
+  [504] = 327,
+  [505] = 505,
   [506] = 506,
   [507] = 507,
-  [508] = 507,
-  [509] = 506,
-  [510] = 510,
-  [511] = 500,
-  [512] = 502,
-  [513] = 501,
+  [508] = 508,
+  [509] = 492,
+  [510] = 506,
+  [511] = 503,
+  [512] = 494,
+  [513] = 508,
   [514] = 514,
   [515] = 515,
   [516] = 516,
@@ -3610,21 +3610,21 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [523] = 523,
   [524] = 524,
   [525] = 525,
-  [526] = 526,
-  [527] = 527,
-  [528] = 528,
+  [526] = 517,
+  [527] = 518,
+  [528] = 525,
   [529] = 529,
-  [530] = 530,
+  [530] = 529,
   [531] = 531,
-  [532] = 532,
+  [532] = 531,
   [533] = 533,
-  [534] = 534,
+  [534] = 533,
   [535] = 535,
   [536] = 536,
   [537] = 537,
   [538] = 538,
   [539] = 539,
-  [540] = 533,
+  [540] = 540,
   [541] = 541,
   [542] = 542,
   [543] = 543,
@@ -3633,74 +3633,74 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [546] = 546,
   [547] = 547,
   [548] = 548,
-  [549] = 529,
+  [549] = 549,
   [550] = 550,
-  [551] = 531,
-  [552] = 538,
+  [551] = 551,
+  [552] = 552,
   [553] = 553,
   [554] = 554,
-  [555] = 544,
+  [555] = 555,
   [556] = 556,
-  [557] = 554,
-  [558] = 545,
+  [557] = 557,
+  [558] = 558,
   [559] = 559,
   [560] = 560,
-  [561] = 519,
-  [562] = 539,
-  [563] = 520,
-  [564] = 556,
-  [565] = 521,
+  [561] = 561,
+  [562] = 562,
+  [563] = 563,
+  [564] = 564,
+  [565] = 535,
   [566] = 566,
-  [567] = 525,
-  [568] = 526,
-  [569] = 530,
-  [570] = 532,
-  [571] = 535,
+  [567] = 567,
+  [568] = 568,
+  [569] = 569,
+  [570] = 570,
+  [571] = 536,
   [572] = 537,
-  [573] = 541,
-  [574] = 543,
-  [575] = 547,
-  [576] = 548,
-  [577] = 550,
-  [578] = 566,
-  [579] = 579,
-  [580] = 580,
-  [581] = 581,
-  [582] = 579,
-  [583] = 583,
-  [584] = 584,
-  [585] = 585,
-  [586] = 586,
-  [587] = 587,
-  [588] = 528,
-  [589] = 589,
-  [590] = 536,
-  [591] = 542,
-  [592] = 553,
-  [593] = 546,
-  [594] = 580,
-  [595] = 595,
-  [596] = 596,
-  [597] = 516,
-  [598] = 517,
-  [599] = 518,
-  [600] = 581,
-  [601] = 586,
-  [602] = 522,
-  [603] = 523,
-  [604] = 559,
-  [605] = 534,
-  [606] = 595,
-  [607] = 596,
-  [608] = 514,
-  [609] = 583,
-  [610] = 584,
-  [611] = 611,
-  [612] = 587,
-  [613] = 585,
-  [614] = 614,
-  [615] = 560,
-  [616] = 611,
+  [573] = 515,
+  [574] = 569,
+  [575] = 538,
+  [576] = 576,
+  [577] = 539,
+  [578] = 540,
+  [579] = 541,
+  [580] = 542,
+  [581] = 543,
+  [582] = 544,
+  [583] = 545,
+  [584] = 546,
+  [585] = 547,
+  [586] = 548,
+  [587] = 549,
+  [588] = 550,
+  [589] = 551,
+  [590] = 552,
+  [591] = 553,
+  [592] = 554,
+  [593] = 555,
+  [594] = 594,
+  [595] = 519,
+  [596] = 556,
+  [597] = 557,
+  [598] = 558,
+  [599] = 559,
+  [600] = 522,
+  [601] = 560,
+  [602] = 523,
+  [603] = 524,
+  [604] = 561,
+  [605] = 562,
+  [606] = 563,
+  [607] = 564,
+  [608] = 516,
+  [609] = 514,
+  [610] = 566,
+  [611] = 567,
+  [612] = 568,
+  [613] = 613,
+  [614] = 570,
+  [615] = 615,
+  [616] = 613,
   [617] = 617,
   [618] = 618,
   [619] = 619,
@@ -3714,74 +3714,74 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [627] = 627,
   [628] = 628,
   [629] = 629,
-  [630] = 629,
+  [630] = 630,
   [631] = 631,
   [632] = 632,
   [633] = 633,
   [634] = 634,
-  [635] = 626,
-  [636] = 626,
+  [635] = 635,
+  [636] = 636,
   [637] = 637,
-  [638] = 638,
+  [638] = 628,
   [639] = 639,
   [640] = 640,
-  [641] = 634,
-  [642] = 628,
-  [643] = 628,
-  [644] = 644,
-  [645] = 644,
-  [646] = 629,
-  [647] = 633,
-  [648] = 648,
-  [649] = 634,
-  [650] = 637,
-  [651] = 648,
-  [652] = 633,
-  [653] = 626,
-  [654] = 640,
-  [655] = 631,
-  [656] = 629,
-  [657] = 644,
-  [658] = 648,
-  [659] = 638,
-  [660] = 638,
-  [661] = 644,
-  [662] = 634,
-  [663] = 637,
-  [664] = 631,
-  [665] = 629,
-  [666] = 626,
-  [667] = 638,
-  [668] = 631,
-  [669] = 648,
-  [670] = 648,
-  [671] = 633,
-  [672] = 634,
-  [673] = 628,
-  [674] = 644,
-  [675] = 633,
-  [676] = 634,
-  [677] = 637,
-  [678] = 640,
-  [679] = 640,
-  [680] = 631,
-  [681] = 629,
-  [682] = 626,
-  [683] = 638,
-  [684] = 640,
-  [685] = 685,
-  [686] = 648,
-  [687] = 633,
-  [688] = 628,
-  [689] = 631,
-  [690] = 690,
-  [691] = 638,
-  [692] = 628,
-  [693] = 693,
-  [694] = 694,
-  [695] = 637,
-  [696] = 637,
-  [697] = 644,
+  [641] = 626,
+  [642] = 632,
+  [643] = 633,
+  [644] = 634,
+  [645] = 635,
+  [646] = 636,
+  [647] = 637,
+  [648] = 628,
+  [649] = 639,
+  [650] = 640,
+  [651] = 651,
+  [652] = 639,
+  [653] = 640,
+  [654] = 626,
+  [655] = 632,
+  [656] = 633,
+  [657] = 634,
+  [658] = 635,
+  [659] = 636,
+  [660] = 637,
+  [661] = 628,
+  [662] = 639,
+  [663] = 663,
+  [664] = 626,
+  [665] = 632,
+  [666] = 633,
+  [667] = 634,
+  [668] = 635,
+  [669] = 636,
+  [670] = 637,
+  [671] = 628,
+  [672] = 639,
+  [673] = 640,
+  [674] = 651,
+  [675] = 675,
+  [676] = 676,
+  [677] = 626,
+  [678] = 632,
+  [679] = 651,
+  [680] = 633,
+  [681] = 634,
+  [682] = 635,
+  [683] = 651,
+  [684] = 636,
+  [685] = 651,
+  [686] = 626,
+  [687] = 632,
+  [688] = 633,
+  [689] = 634,
+  [690] = 635,
+  [691] = 636,
+  [692] = 637,
+  [693] = 628,
+  [694] = 637,
+  [695] = 639,
+  [696] = 640,
+  [697] = 651,
   [698] = 698,
   [699] = 640,
   [700] = 700,
@@ -3789,7 +3789,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [702] = 702,
   [703] = 703,
   [704] = 704,
-  [705] = 704,
+  [705] = 705,
   [706] = 706,
   [707] = 707,
   [708] = 708,
@@ -3819,306 +3819,306 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [732] = 732,
   [733] = 733,
   [734] = 734,
-  [735] = 735,
+  [735] = 728,
   [736] = 736,
   [737] = 737,
   [738] = 738,
   [739] = 739,
   [740] = 740,
   [741] = 741,
-  [742] = 739,
+  [742] = 742,
   [743] = 743,
-  [744] = 744,
-  [745] = 745,
+  [744] = 739,
+  [745] = 676,
   [746] = 746,
   [747] = 747,
   [748] = 748,
-  [749] = 690,
-  [750] = 693,
-  [751] = 751,
-  [752] = 752,
-  [753] = 685,
-  [754] = 627,
-  [755] = 751,
-  [756] = 752,
-  [757] = 757,
-  [758] = 743,
-  [759] = 744,
-  [760] = 745,
-  [761] = 746,
-  [762] = 740,
-  [763] = 741,
-  [764] = 757,
-  [765] = 748,
-  [766] = 747,
-  [767] = 736,
-  [768] = 685,
-  [769] = 627,
-  [770] = 690,
-  [771] = 693,
-  [772] = 698,
-  [773] = 704,
-  [774] = 774,
-  [775] = 704,
-  [776] = 685,
-  [777] = 627,
-  [778] = 778,
-  [779] = 694,
-  [780] = 704,
-  [781] = 694,
-  [782] = 698,
-  [783] = 737,
-  [784] = 690,
-  [785] = 693,
-  [786] = 778,
-  [787] = 774,
+  [749] = 749,
+  [750] = 742,
+  [751] = 746,
+  [752] = 743,
+  [753] = 747,
+  [754] = 754,
+  [755] = 755,
+  [756] = 748,
+  [757] = 675,
+  [758] = 758,
+  [759] = 740,
+  [760] = 741,
+  [761] = 755,
+  [762] = 631,
+  [763] = 754,
+  [764] = 758,
+  [765] = 749,
+  [766] = 630,
+  [767] = 728,
+  [768] = 708,
+  [769] = 769,
+  [770] = 728,
+  [771] = 698,
+  [772] = 627,
+  [773] = 773,
+  [774] = 630,
+  [775] = 631,
+  [776] = 675,
+  [777] = 676,
+  [778] = 675,
+  [779] = 676,
+  [780] = 728,
+  [781] = 630,
+  [782] = 631,
+  [783] = 698,
+  [784] = 627,
+  [785] = 773,
+  [786] = 769,
+  [787] = 707,
   [788] = 741,
-  [789] = 704,
-  [790] = 694,
-  [791] = 698,
-  [792] = 702,
-  [793] = 701,
-  [794] = 703,
-  [795] = 700,
-  [796] = 751,
-  [797] = 752,
-  [798] = 757,
-  [799] = 747,
-  [800] = 740,
+  [789] = 742,
+  [790] = 743,
+  [791] = 739,
+  [792] = 748,
+  [793] = 755,
+  [794] = 758,
+  [795] = 754,
+  [796] = 749,
+  [797] = 740,
+  [798] = 741,
+  [799] = 742,
+  [800] = 743,
   [801] = 739,
-  [802] = 743,
-  [803] = 744,
-  [804] = 748,
-  [805] = 747,
-  [806] = 745,
-  [807] = 746,
+  [802] = 748,
+  [803] = 755,
+  [804] = 758,
+  [805] = 740,
+  [806] = 754,
+  [807] = 749,
   [808] = 747,
-  [809] = 752,
-  [810] = 757,
-  [811] = 739,
-  [812] = 743,
-  [813] = 744,
-  [814] = 745,
-  [815] = 746,
-  [816] = 740,
-  [817] = 741,
-  [818] = 748,
-  [819] = 751,
-  [820] = 752,
-  [821] = 757,
-  [822] = 739,
+  [809] = 746,
+  [810] = 810,
+  [811] = 728,
+  [812] = 746,
+  [813] = 813,
+  [814] = 698,
+  [815] = 627,
+  [816] = 700,
+  [817] = 703,
+  [818] = 747,
+  [819] = 747,
+  [820] = 701,
+  [821] = 702,
+  [822] = 742,
   [823] = 743,
-  [824] = 744,
-  [825] = 745,
-  [826] = 746,
-  [827] = 740,
-  [828] = 741,
-  [829] = 748,
-  [830] = 751,
-  [831] = 778,
-  [832] = 778,
-  [833] = 748,
-  [834] = 701,
-  [835] = 774,
-  [836] = 774,
-  [837] = 778,
-  [838] = 515,
-  [839] = 747,
-  [840] = 700,
-  [841] = 841,
-  [842] = 614,
-  [843] = 702,
-  [844] = 751,
-  [845] = 752,
-  [846] = 702,
+  [824] = 739,
+  [825] = 748,
+  [826] = 755,
+  [827] = 758,
+  [828] = 754,
+  [829] = 749,
+  [830] = 740,
+  [831] = 741,
+  [832] = 813,
+  [833] = 746,
+  [834] = 834,
+  [835] = 742,
+  [836] = 836,
+  [837] = 618,
+  [838] = 701,
+  [839] = 754,
+  [840] = 749,
+  [841] = 576,
+  [842] = 773,
+  [843] = 746,
+  [844] = 520,
+  [845] = 747,
+  [846] = 703,
   [847] = 701,
-  [848] = 703,
-  [849] = 617,
-  [850] = 494,
-  [851] = 524,
-  [852] = 703,
-  [853] = 700,
-  [854] = 774,
+  [848] = 848,
+  [849] = 849,
+  [850] = 850,
+  [851] = 851,
+  [852] = 702,
+  [853] = 769,
+  [854] = 617,
   [855] = 855,
-  [856] = 757,
-  [857] = 857,
-  [858] = 858,
-  [859] = 618,
-  [860] = 470,
+  [856] = 773,
+  [857] = 739,
+  [858] = 507,
+  [859] = 700,
+  [860] = 860,
   [861] = 861,
-  [862] = 739,
-  [863] = 743,
-  [864] = 744,
-  [865] = 745,
-  [866] = 746,
-  [867] = 740,
-  [868] = 741,
-  [869] = 869,
-  [870] = 869,
-  [871] = 871,
-  [872] = 499,
-  [873] = 734,
-  [874] = 723,
-  [875] = 724,
-  [876] = 313,
-  [877] = 723,
-  [878] = 707,
-  [879] = 725,
-  [880] = 726,
-  [881] = 727,
-  [882] = 728,
-  [883] = 729,
-  [884] = 730,
-  [885] = 731,
-  [886] = 732,
-  [887] = 733,
-  [888] = 734,
-  [889] = 735,
-  [890] = 709,
-  [891] = 710,
-  [892] = 736,
-  [893] = 737,
-  [894] = 711,
+  [862] = 702,
+  [863] = 741,
+  [864] = 773,
+  [865] = 700,
+  [866] = 755,
+  [867] = 867,
+  [868] = 868,
+  [869] = 703,
+  [870] = 505,
+  [871] = 758,
+  [872] = 748,
+  [873] = 743,
+  [874] = 740,
+  [875] = 594,
+  [876] = 769,
+  [877] = 482,
+  [878] = 769,
+  [879] = 734,
+  [880] = 715,
+  [881] = 716,
+  [882] = 718,
+  [883] = 719,
+  [884] = 738,
+  [885] = 721,
+  [886] = 736,
+  [887] = 737,
+  [888] = 720,
+  [889] = 711,
+  [890] = 705,
+  [891] = 707,
+  [892] = 892,
+  [893] = 714,
+  [894] = 710,
   [895] = 708,
-  [896] = 896,
-  [897] = 897,
-  [898] = 725,
-  [899] = 712,
-  [900] = 716,
-  [901] = 713,
-  [902] = 714,
-  [903] = 726,
-  [904] = 727,
-  [905] = 728,
-  [906] = 317,
-  [907] = 778,
-  [908] = 729,
-  [909] = 730,
+  [896] = 736,
+  [897] = 717,
+  [898] = 737,
+  [899] = 720,
+  [900] = 711,
+  [901] = 723,
+  [902] = 723,
+  [903] = 724,
+  [904] = 731,
+  [905] = 734,
+  [906] = 709,
+  [907] = 520,
+  [908] = 713,
+  [909] = 773,
   [910] = 731,
-  [911] = 706,
-  [912] = 715,
-  [913] = 774,
-  [914] = 515,
-  [915] = 736,
-  [916] = 737,
-  [917] = 614,
-  [918] = 706,
-  [919] = 715,
+  [911] = 769,
+  [912] = 730,
+  [913] = 706,
+  [914] = 707,
+  [915] = 715,
+  [916] = 716,
+  [917] = 708,
+  [918] = 718,
+  [919] = 705,
   [920] = 719,
-  [921] = 709,
-  [922] = 710,
-  [923] = 707,
-  [924] = 524,
-  [925] = 708,
-  [926] = 738,
-  [927] = 713,
-  [928] = 721,
-  [929] = 724,
-  [930] = 722,
+  [921] = 725,
+  [922] = 738,
+  [923] = 726,
+  [924] = 727,
+  [925] = 729,
+  [926] = 732,
+  [927] = 710,
+  [928] = 713,
+  [929] = 722,
+  [930] = 714,
   [931] = 931,
-  [932] = 711,
-  [933] = 716,
-  [934] = 934,
+  [932] = 932,
+  [933] = 327,
+  [934] = 724,
   [935] = 935,
-  [936] = 714,
-  [937] = 717,
-  [938] = 718,
-  [939] = 939,
-  [940] = 719,
-  [941] = 732,
-  [942] = 733,
-  [943] = 718,
-  [944] = 738,
-  [945] = 735,
-  [946] = 721,
-  [947] = 717,
-  [948] = 722,
-  [949] = 720,
-  [950] = 720,
+  [936] = 721,
+  [937] = 722,
+  [938] = 730,
+  [939] = 717,
+  [940] = 725,
+  [941] = 704,
+  [942] = 726,
+  [943] = 706,
+  [944] = 712,
+  [945] = 727,
+  [946] = 729,
+  [947] = 733,
+  [948] = 732,
+  [949] = 594,
+  [950] = 704,
   [951] = 712,
-  [952] = 722,
-  [953] = 708,
-  [954] = 709,
-  [955] = 710,
-  [956] = 711,
-  [957] = 712,
-  [958] = 713,
-  [959] = 317,
-  [960] = 715,
-  [961] = 716,
-  [962] = 717,
-  [963] = 718,
-  [964] = 719,
-  [965] = 738,
-  [966] = 721,
-  [967] = 723,
-  [968] = 724,
-  [969] = 313,
-  [970] = 725,
-  [971] = 726,
-  [972] = 727,
-  [973] = 728,
-  [974] = 729,
+  [952] = 733,
+  [953] = 319,
+  [954] = 576,
+  [955] = 709,
+  [956] = 327,
+  [957] = 729,
+  [958] = 721,
+  [959] = 732,
+  [960] = 734,
+  [961] = 704,
+  [962] = 712,
+  [963] = 733,
+  [964] = 319,
+  [965] = 717,
+  [966] = 737,
+  [967] = 714,
+  [968] = 723,
+  [969] = 725,
+  [970] = 726,
+  [971] = 867,
+  [972] = 731,
+  [973] = 836,
+  [974] = 705,
   [975] = 730,
-  [976] = 731,
-  [977] = 732,
-  [978] = 733,
-  [979] = 734,
-  [980] = 735,
-  [981] = 981,
-  [982] = 982,
-  [983] = 983,
-  [984] = 858,
+  [976] = 706,
+  [977] = 709,
+  [978] = 710,
+  [979] = 713,
+  [980] = 722,
+  [981] = 715,
+  [982] = 716,
+  [983] = 718,
+  [984] = 719,
   [985] = 720,
-  [986] = 857,
-  [987] = 987,
-  [988] = 706,
-  [989] = 707,
-  [990] = 714,
+  [986] = 738,
+  [987] = 711,
+  [988] = 736,
+  [989] = 724,
+  [990] = 727,
   [991] = 991,
   [992] = 992,
   [993] = 993,
   [994] = 994,
   [995] = 995,
   [996] = 996,
-  [997] = 997,
-  [998] = 997,
-  [999] = 996,
+  [997] = 996,
+  [998] = 998,
+  [999] = 998,
   [1000] = 1000,
-  [1001] = 996,
+  [1001] = 1001,
   [1002] = 1002,
-  [1003] = 996,
-  [1004] = 997,
+  [1003] = 1003,
+  [1004] = 998,
   [1005] = 1005,
   [1006] = 1006,
-  [1007] = 1007,
-  [1008] = 997,
+  [1007] = 998,
+  [1008] = 996,
   [1009] = 1009,
-  [1010] = 1010,
+  [1010] = 998,
   [1011] = 1011,
-  [1012] = 1012,
-  [1013] = 1013,
-  [1014] = 997,
-  [1015] = 996,
-  [1016] = 997,
-  [1017] = 1017,
-  [1018] = 1018,
-  [1019] = 996,
+  [1012] = 996,
+  [1013] = 996,
+  [1014] = 1014,
+  [1015] = 1015,
+  [1016] = 1016,
+  [1017] = 998,
+  [1018] = 996,
+  [1019] = 1019,
   [1020] = 1020,
-  [1021] = 1021,
+  [1021] = 1020,
   [1022] = 1022,
-  [1023] = 1021,
-  [1024] = 1021,
-  [1025] = 1021,
-  [1026] = 1021,
-  [1027] = 1021,
-  [1028] = 1028,
+  [1023] = 1023,
+  [1024] = 1020,
+  [1025] = 1020,
+  [1026] = 1020,
+  [1027] = 1027,
+  [1028] = 1020,
   [1029] = 1029,
   [1030] = 1030,
   [1031] = 1031,
-  [1032] = 1031,
-  [1033] = 1033,
-  [1034] = 1033,
+  [1032] = 1032,
+  [1033] = 1031,
+  [1034] = 1032,
   [1035] = 1035,
   [1036] = 1035,
   [1037] = 1037,
@@ -4130,57 +4130,57 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [1043] = 1043,
   [1044] = 1044,
   [1045] = 1045,
-  [1046] = 1046,
+  [1046] = 1042,
   [1047] = 1041,
-  [1048] = 1048,
-  [1049] = 1044,
+  [1048] = 1045,
+  [1049] = 1049,
   [1050] = 1040,
-  [1051] = 1046,
+  [1051] = 1051,
   [1052] = 1052,
-  [1053] = 1053,
-  [1054] = 1044,
-  [1055] = 1040,
-  [1056] = 1052,
-  [1057] = 1046,
-  [1058] = 1052,
-  [1059] = 1044,
-  [1060] = 1044,
-  [1061] = 1040,
-  [1062] = 1046,
-  [1063] = 1041,
-  [1064] = 1064,
-  [1065] = 1046,
-  [1066] = 1052,
-  [1067] = 1041,
-  [1068] = 1068,
+  [1053] = 1042,
+  [1054] = 1051,
+  [1055] = 1055,
+  [1056] = 1056,
+  [1057] = 1040,
+  [1058] = 1041,
+  [1059] = 1040,
+  [1060] = 1041,
+  [1061] = 1045,
+  [1062] = 1042,
+  [1063] = 1051,
+  [1064] = 1051,
+  [1065] = 1045,
+  [1066] = 1040,
+  [1067] = 1067,
+  [1068] = 1045,
   [1069] = 1069,
   [1070] = 1070,
   [1071] = 1071,
-  [1072] = 1072,
+  [1072] = 1071,
   [1073] = 1073,
-  [1074] = 1070,
-  [1075] = 1075,
-  [1076] = 1072,
+  [1074] = 1074,
+  [1075] = 1071,
+  [1076] = 1076,
   [1077] = 1077,
   [1078] = 1078,
-  [1079] = 1079,
+  [1079] = 1074,
   [1080] = 1080,
   [1081] = 1081,
   [1082] = 1082,
   [1083] = 1071,
-  [1084] = 1070,
-  [1085] = 1077,
-  [1086] = 1070,
-  [1087] = 1075,
-  [1088] = 1073,
-  [1089] = 1082,
-  [1090] = 1080,
-  [1091] = 1081,
-  [1092] = 1080,
-  [1093] = 1075,
-  [1094] = 1075,
-  [1095] = 1080,
-  [1096] = 1069,
+  [1084] = 1078,
+  [1085] = 1082,
+  [1086] = 1086,
+  [1087] = 1070,
+  [1088] = 1077,
+  [1089] = 1070,
+  [1090] = 1073,
+  [1091] = 1080,
+  [1092] = 1077,
+  [1093] = 1077,
+  [1094] = 1076,
+  [1095] = 1081,
+  [1096] = 1070,
   [1097] = 1097,
   [1098] = 1098,
   [1099] = 1099,
@@ -4192,141 +4192,141 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [1105] = 1105,
   [1106] = 1106,
   [1107] = 1107,
-  [1108] = 1108,
-  [1109] = 1098,
-  [1110] = 1110,
+  [1108] = 1106,
+  [1109] = 1109,
+  [1110] = 1082,
   [1111] = 1111,
-  [1112] = 1071,
+  [1112] = 1037,
   [1113] = 1113,
   [1114] = 1114,
-  [1115] = 1073,
+  [1115] = 1080,
   [1116] = 1116,
-  [1117] = 1117,
-  [1118] = 1077,
-  [1119] = 1119,
+  [1117] = 1078,
+  [1118] = 1074,
+  [1119] = 1081,
   [1120] = 1120,
-  [1121] = 1072,
-  [1122] = 1122,
-  [1123] = 1081,
+  [1121] = 1082,
+  [1122] = 1073,
+  [1123] = 1076,
   [1124] = 1124,
   [1125] = 1125,
-  [1126] = 1037,
-  [1127] = 1127,
+  [1126] = 1126,
+  [1127] = 1076,
   [1128] = 1128,
-  [1129] = 1038,
+  [1129] = 1129,
   [1130] = 1130,
-  [1131] = 1037,
+  [1131] = 1130,
   [1132] = 1132,
   [1133] = 1133,
   [1134] = 1134,
-  [1135] = 1135,
-  [1136] = 1136,
+  [1135] = 1080,
+  [1136] = 1078,
   [1137] = 1137,
-  [1138] = 1138,
-  [1139] = 1098,
-  [1140] = 1140,
+  [1138] = 1100,
+  [1139] = 1078,
+  [1140] = 1073,
   [1141] = 1141,
-  [1142] = 1142,
+  [1142] = 1037,
   [1143] = 1143,
-  [1144] = 1120,
+  [1144] = 1144,
   [1145] = 1038,
-  [1146] = 1146,
-  [1147] = 1069,
+  [1146] = 1080,
+  [1147] = 1147,
   [1148] = 1148,
   [1149] = 1149,
   [1150] = 1150,
   [1151] = 1151,
-  [1152] = 1081,
+  [1152] = 1152,
   [1153] = 1081,
-  [1154] = 1077,
-  [1155] = 1073,
-  [1156] = 1069,
-  [1157] = 1071,
-  [1158] = 1158,
-  [1159] = 1098,
-  [1160] = 1160,
-  [1161] = 1082,
-  [1162] = 1077,
+  [1154] = 1154,
+  [1155] = 1155,
+  [1156] = 1156,
+  [1157] = 1157,
+  [1158] = 1074,
+  [1159] = 1159,
+  [1160] = 1081,
+  [1161] = 1038,
+  [1162] = 1162,
   [1163] = 1082,
-  [1164] = 1073,
-  [1165] = 1069,
-  [1166] = 1072,
-  [1167] = 1071,
-  [1168] = 1082,
-  [1169] = 1125,
-  [1170] = 1072,
-  [1171] = 1171,
-  [1172] = 1146,
+  [1164] = 1164,
+  [1165] = 1073,
+  [1166] = 1166,
+  [1167] = 1167,
+  [1168] = 1106,
+  [1169] = 1076,
+  [1170] = 1170,
+  [1171] = 1126,
+  [1172] = 1074,
   [1173] = 1173,
   [1174] = 1174,
-  [1175] = 1107,
-  [1176] = 1176,
+  [1175] = 1128,
+  [1176] = 1106,
   [1177] = 1177,
   [1178] = 1178,
   [1179] = 1179,
   [1180] = 1180,
   [1181] = 1181,
-  [1182] = 1077,
+  [1182] = 1182,
   [1183] = 1183,
   [1184] = 1184,
   [1185] = 1185,
-  [1186] = 1186,
-  [1187] = 1187,
+  [1186] = 1074,
+  [1187] = 1081,
   [1188] = 1082,
   [1189] = 1073,
-  [1190] = 1069,
-  [1191] = 1191,
-  [1192] = 1192,
+  [1190] = 1076,
+  [1191] = 1080,
+  [1192] = 1078,
   [1193] = 1193,
-  [1194] = 1184,
-  [1195] = 1195,
-  [1196] = 1186,
-  [1197] = 1072,
-  [1198] = 1037,
-  [1199] = 1199,
-  [1200] = 1200,
-  [1201] = 1071,
+  [1194] = 1194,
+  [1195] = 1128,
+  [1196] = 1196,
+  [1197] = 1100,
+  [1198] = 1198,
+  [1199] = 1183,
+  [1200] = 1128,
+  [1201] = 1185,
   [1202] = 1202,
   [1203] = 1203,
   [1204] = 1204,
   [1205] = 1205,
-  [1206] = 1203,
-  [1207] = 1184,
-  [1208] = 1177,
-  [1209] = 1193,
-  [1210] = 1107,
-  [1211] = 1186,
-  [1212] = 1186,
-  [1213] = 1213,
-  [1214] = 1081,
-  [1215] = 1195,
-  [1216] = 1183,
-  [1217] = 1202,
-  [1218] = 1204,
-  [1219] = 1120,
-  [1220] = 1125,
-  [1221] = 1199,
+  [1206] = 1206,
+  [1207] = 1130,
+  [1208] = 1208,
+  [1209] = 1209,
+  [1210] = 1210,
+  [1211] = 1211,
+  [1212] = 1212,
+  [1213] = 1202,
+  [1214] = 1205,
+  [1215] = 1215,
+  [1216] = 1216,
+  [1217] = 1183,
+  [1218] = 1202,
+  [1219] = 1183,
+  [1220] = 1202,
+  [1221] = 1221,
   [1222] = 1222,
   [1223] = 1223,
-  [1224] = 1224,
-  [1225] = 1225,
-  [1226] = 1202,
-  [1227] = 1204,
-  [1228] = 1203,
-  [1229] = 1202,
-  [1230] = 1204,
+  [1224] = 1179,
+  [1225] = 1182,
+  [1226] = 1194,
+  [1227] = 1215,
+  [1228] = 1038,
+  [1229] = 1229,
+  [1230] = 1037,
   [1231] = 1231,
   [1232] = 1203,
-  [1233] = 1038,
-  [1234] = 1234,
-  [1235] = 1235,
-  [1236] = 1184,
-  [1237] = 1237,
-  [1238] = 1125,
-  [1239] = 1239,
-  [1240] = 1240,
+  [1233] = 1233,
+  [1234] = 1222,
+  [1235] = 1179,
+  [1236] = 1182,
+  [1237] = 1222,
+  [1238] = 1179,
+  [1239] = 1182,
+  [1240] = 1222,
   [1241] = 1241,
-  [1242] = 1039,
+  [1242] = 1242,
   [1243] = 1243,
   [1244] = 1244,
   [1245] = 1245,
@@ -4335,307 +4335,307 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [1248] = 1248,
   [1249] = 1249,
   [1250] = 1250,
-  [1251] = 1245,
+  [1251] = 1039,
   [1252] = 1252,
   [1253] = 1253,
   [1254] = 1254,
   [1255] = 1255,
-  [1256] = 1256,
+  [1256] = 1246,
   [1257] = 1257,
   [1258] = 1258,
   [1259] = 1259,
   [1260] = 1260,
-  [1261] = 1261,
-  [1262] = 1256,
+  [1261] = 1259,
+  [1262] = 1262,
   [1263] = 1263,
   [1264] = 1264,
-  [1265] = 1253,
+  [1265] = 1265,
   [1266] = 1266,
-  [1267] = 1267,
+  [1267] = 1252,
   [1268] = 1268,
-  [1269] = 1269,
-  [1270] = 1249,
-  [1271] = 1231,
+  [1269] = 1262,
+  [1270] = 1270,
+  [1271] = 1271,
   [1272] = 1272,
-  [1273] = 1272,
-  [1274] = 1243,
-  [1275] = 1275,
-  [1276] = 1276,
-  [1277] = 1276,
+  [1273] = 1271,
+  [1274] = 1274,
+  [1275] = 1274,
+  [1276] = 1206,
+  [1277] = 1277,
   [1278] = 1278,
-  [1279] = 1250,
+  [1279] = 1279,
   [1280] = 1280,
-  [1281] = 1281,
+  [1281] = 1265,
   [1282] = 1282,
   [1283] = 1283,
-  [1284] = 1284,
+  [1284] = 1253,
   [1285] = 1285,
-  [1286] = 1272,
-  [1287] = 1287,
-  [1288] = 1243,
+  [1286] = 1286,
+  [1287] = 1205,
+  [1288] = 1288,
   [1289] = 1289,
-  [1290] = 1290,
+  [1290] = 1055,
   [1291] = 1291,
-  [1292] = 1224,
-  [1293] = 1053,
+  [1292] = 1292,
+  [1293] = 1286,
   [1294] = 1294,
   [1295] = 1295,
-  [1296] = 1289,
+  [1296] = 1296,
   [1297] = 1297,
-  [1298] = 1298,
-  [1299] = 1249,
+  [1298] = 1265,
+  [1299] = 1299,
   [1300] = 1300,
-  [1301] = 1291,
+  [1301] = 1301,
   [1302] = 1302,
-  [1303] = 1303,
+  [1303] = 1243,
   [1304] = 1304,
   [1305] = 1305,
   [1306] = 1306,
   [1307] = 1307,
   [1308] = 1308,
-  [1309] = 1309,
+  [1309] = 1295,
   [1310] = 1310,
   [1311] = 1311,
   [1312] = 1312,
   [1313] = 1313,
-  [1314] = 1285,
-  [1315] = 1315,
-  [1316] = 1199,
+  [1314] = 1274,
+  [1315] = 1301,
+  [1316] = 1316,
   [1317] = 1317,
   [1318] = 1318,
   [1319] = 1319,
   [1320] = 1320,
-  [1321] = 1321,
+  [1321] = 1271,
   [1322] = 1322,
   [1323] = 1323,
   [1324] = 1324,
   [1325] = 1325,
   [1326] = 1326,
-  [1327] = 1327,
+  [1327] = 1326,
   [1328] = 1328,
-  [1329] = 1329,
-  [1330] = 1330,
+  [1329] = 1328,
+  [1330] = 1292,
   [1331] = 1331,
   [1332] = 1332,
   [1333] = 1333,
   [1334] = 1334,
   [1335] = 1335,
   [1336] = 1336,
-  [1337] = 1300,
-  [1338] = 1304,
+  [1337] = 1337,
+  [1338] = 1338,
   [1339] = 1339,
-  [1340] = 1324,
+  [1340] = 1340,
   [1341] = 1341,
   [1342] = 1342,
   [1343] = 1343,
   [1344] = 1344,
   [1345] = 1345,
-  [1346] = 1345,
-  [1347] = 1347,
-  [1348] = 1348,
+  [1346] = 1301,
+  [1347] = 1056,
+  [1348] = 1067,
   [1349] = 1349,
   [1350] = 1350,
-  [1351] = 1328,
-  [1352] = 1352,
-  [1353] = 1347,
+  [1351] = 1299,
+  [1352] = 1320,
+  [1353] = 1334,
   [1354] = 1354,
   [1355] = 1355,
-  [1356] = 1330,
+  [1356] = 1356,
   [1357] = 1357,
   [1358] = 1358,
   [1359] = 1359,
-  [1360] = 1360,
-  [1361] = 1347,
-  [1362] = 1290,
+  [1360] = 1337,
+  [1361] = 1361,
+  [1362] = 1326,
   [1363] = 1363,
   [1364] = 1364,
-  [1365] = 1347,
-  [1366] = 1366,
-  [1367] = 1347,
+  [1365] = 1328,
+  [1366] = 1334,
+  [1367] = 1367,
   [1368] = 1368,
-  [1369] = 1068,
+  [1369] = 1369,
   [1370] = 1370,
-  [1371] = 1359,
-  [1372] = 1372,
-  [1373] = 1043,
+  [1371] = 1371,
+  [1372] = 1334,
+  [1373] = 1373,
   [1374] = 1374,
-  [1375] = 1334,
-  [1376] = 1350,
-  [1377] = 1363,
-  [1378] = 1331,
-  [1379] = 1379,
-  [1380] = 1380,
-  [1381] = 1381,
+  [1375] = 1375,
+  [1376] = 1334,
+  [1377] = 1355,
+  [1378] = 1359,
+  [1379] = 1331,
+  [1380] = 1332,
+  [1381] = 1356,
   [1382] = 1382,
-  [1383] = 1383,
-  [1384] = 1302,
+  [1383] = 1336,
+  [1384] = 1384,
   [1385] = 1385,
-  [1386] = 1370,
-  [1387] = 1347,
+  [1386] = 1386,
+  [1387] = 1387,
   [1388] = 1388,
   [1389] = 1389,
-  [1390] = 1390,
-  [1391] = 1391,
+  [1390] = 1297,
+  [1391] = 1382,
   [1392] = 1392,
-  [1393] = 1291,
-  [1394] = 1394,
+  [1393] = 1393,
+  [1394] = 1334,
   [1395] = 1395,
   [1396] = 1396,
   [1397] = 1397,
-  [1398] = 1396,
-  [1399] = 1328,
+  [1398] = 1398,
+  [1399] = 1399,
   [1400] = 1400,
   [1401] = 1401,
-  [1402] = 1345,
-  [1403] = 1397,
+  [1402] = 1340,
+  [1403] = 1333,
   [1404] = 1404,
   [1405] = 1405,
   [1406] = 1406,
   [1407] = 1407,
   [1408] = 1408,
-  [1409] = 1409,
+  [1409] = 701,
   [1410] = 1410,
   [1411] = 1411,
   [1412] = 1412,
   [1413] = 1413,
-  [1414] = 1335,
-  [1415] = 1336,
+  [1414] = 1414,
+  [1415] = 1415,
   [1416] = 1416,
   [1417] = 1417,
   [1418] = 1418,
   [1419] = 1419,
-  [1420] = 1420,
+  [1420] = 1388,
   [1421] = 1421,
-  [1422] = 1422,
+  [1422] = 1410,
   [1423] = 1423,
   [1424] = 1424,
-  [1425] = 1425,
-  [1426] = 1426,
-  [1427] = 1427,
-  [1428] = 1428,
+  [1425] = 1389,
+  [1426] = 1407,
+  [1427] = 1245,
+  [1428] = 1416,
   [1429] = 1429,
   [1430] = 1430,
-  [1431] = 1281,
+  [1431] = 1430,
   [1432] = 1432,
   [1433] = 1433,
   [1434] = 1434,
   [1435] = 1435,
-  [1436] = 1436,
-  [1437] = 1437,
-  [1438] = 1329,
+  [1436] = 1414,
+  [1437] = 1407,
+  [1438] = 1438,
   [1439] = 1439,
-  [1440] = 1339,
+  [1440] = 1440,
   [1441] = 1441,
   [1442] = 1442,
   [1443] = 1443,
   [1444] = 1444,
-  [1445] = 1406,
-  [1446] = 1446,
-  [1447] = 1432,
-  [1448] = 1448,
-  [1449] = 1449,
-  [1450] = 1449,
+  [1445] = 1441,
+  [1446] = 1244,
+  [1447] = 1441,
+  [1448] = 1442,
+  [1449] = 1416,
+  [1450] = 1450,
   [1451] = 1451,
-  [1452] = 1452,
-  [1453] = 1453,
+  [1452] = 1430,
+  [1453] = 1443,
   [1454] = 1454,
-  [1455] = 1455,
-  [1456] = 1412,
-  [1457] = 1413,
-  [1458] = 1434,
-  [1459] = 1441,
-  [1460] = 1460,
-  [1461] = 1432,
-  [1462] = 1462,
-  [1463] = 1259,
-  [1464] = 1432,
+  [1455] = 1433,
+  [1456] = 1434,
+  [1457] = 1414,
+  [1458] = 1408,
+  [1459] = 1407,
+  [1460] = 1441,
+  [1461] = 1461,
+  [1462] = 1442,
+  [1463] = 1443,
+  [1464] = 1464,
   [1465] = 1465,
-  [1466] = 1449,
-  [1467] = 1327,
-  [1468] = 1452,
-  [1469] = 1453,
-  [1470] = 1454,
-  [1471] = 1471,
-  [1472] = 1412,
-  [1473] = 1413,
+  [1466] = 1419,
+  [1467] = 1467,
+  [1468] = 1468,
+  [1469] = 1469,
+  [1470] = 700,
+  [1471] = 1433,
+  [1472] = 1472,
+  [1473] = 1473,
   [1474] = 1474,
-  [1475] = 1434,
-  [1476] = 1441,
+  [1475] = 1475,
+  [1476] = 1467,
   [1477] = 1477,
   [1478] = 1478,
-  [1479] = 1449,
-  [1480] = 1480,
+  [1479] = 1479,
+  [1480] = 1442,
   [1481] = 1481,
-  [1482] = 1452,
-  [1483] = 1481,
+  [1482] = 1423,
+  [1483] = 1443,
   [1484] = 1484,
-  [1485] = 702,
-  [1486] = 1452,
+  [1485] = 1485,
+  [1486] = 1345,
   [1487] = 1487,
   [1488] = 1488,
   [1489] = 1489,
-  [1490] = 1453,
-  [1491] = 1491,
+  [1490] = 1250,
+  [1491] = 1357,
   [1492] = 1492,
   [1493] = 1493,
-  [1494] = 1494,
-  [1495] = 1407,
-  [1496] = 1452,
-  [1497] = 1453,
-  [1498] = 1498,
-  [1499] = 1499,
-  [1500] = 1500,
-  [1501] = 1454,
-  [1502] = 1435,
-  [1503] = 1465,
+  [1494] = 1324,
+  [1495] = 1495,
+  [1496] = 1430,
+  [1497] = 1497,
+  [1498] = 1400,
+  [1499] = 1406,
+  [1500] = 1433,
+  [1501] = 1501,
+  [1502] = 1502,
+  [1503] = 1503,
   [1504] = 1504,
   [1505] = 1505,
-  [1506] = 1506,
+  [1506] = 1434,
   [1507] = 1507,
-  [1508] = 1260,
-  [1509] = 703,
+  [1508] = 1508,
+  [1509] = 1509,
   [1510] = 1510,
   [1511] = 1511,
-  [1512] = 1512,
+  [1512] = 1414,
   [1513] = 1513,
   [1514] = 1514,
   [1515] = 1515,
-  [1516] = 1383,
-  [1517] = 1275,
-  [1518] = 1454,
-  [1519] = 1487,
-  [1520] = 1491,
-  [1521] = 1412,
+  [1516] = 1516,
+  [1517] = 1497,
+  [1518] = 1518,
+  [1519] = 1416,
+  [1520] = 1520,
+  [1521] = 1521,
   [1522] = 1522,
-  [1523] = 1413,
-  [1524] = 1524,
+  [1523] = 1523,
+  [1524] = 1433,
   [1525] = 1434,
-  [1526] = 1441,
-  [1527] = 1492,
+  [1526] = 1526,
+  [1527] = 1527,
   [1528] = 1528,
-  [1529] = 1358,
-  [1530] = 1515,
-  [1531] = 1405,
+  [1529] = 1481,
+  [1530] = 1432,
+  [1531] = 1531,
   [1532] = 1532,
-  [1533] = 333,
-  [1534] = 1534,
-  [1535] = 1535,
+  [1533] = 1415,
+  [1534] = 1411,
+  [1535] = 1258,
   [1536] = 1536,
   [1537] = 1537,
-  [1538] = 1538,
-  [1539] = 1539,
+  [1538] = 1439,
+  [1539] = 1196,
   [1540] = 1540,
   [1541] = 1541,
-  [1542] = 1442,
+  [1542] = 1542,
   [1543] = 1543,
   [1544] = 1544,
   [1545] = 1545,
   [1546] = 1546,
   [1547] = 1547,
-  [1548] = 1538,
+  [1548] = 1548,
   [1549] = 1549,
   [1550] = 1550,
-  [1551] = 1551,
+  [1551] = 313,
   [1552] = 1552,
   [1553] = 1553,
   [1554] = 1554,
@@ -4644,75 +4644,75 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [1557] = 1557,
   [1558] = 1558,
   [1559] = 1559,
-  [1560] = 1546,
-  [1561] = 1561,
-  [1562] = 1562,
+  [1560] = 1560,
+  [1561] = 318,
+  [1562] = 1557,
   [1563] = 1563,
-  [1564] = 1551,
+  [1564] = 1564,
   [1565] = 1565,
   [1566] = 1566,
   [1567] = 1567,
   [1568] = 1568,
-  [1569] = 1237,
+  [1569] = 1569,
   [1570] = 1570,
   [1571] = 1571,
   [1572] = 1572,
   [1573] = 1573,
   [1574] = 1574,
   [1575] = 1575,
-  [1576] = 1544,
+  [1576] = 1576,
   [1577] = 1577,
   [1578] = 1578,
   [1579] = 1579,
   [1580] = 1580,
   [1581] = 1581,
-  [1582] = 318,
-  [1583] = 311,
-  [1584] = 1584,
-  [1585] = 1585,
+  [1582] = 1582,
+  [1583] = 1583,
+  [1584] = 1580,
+  [1585] = 1574,
   [1586] = 1586,
-  [1587] = 1587,
-  [1588] = 1573,
-  [1589] = 1589,
-  [1590] = 1573,
-  [1591] = 1591,
+  [1587] = 1557,
+  [1588] = 1576,
+  [1589] = 317,
+  [1590] = 1575,
+  [1591] = 1573,
   [1592] = 1592,
   [1593] = 1593,
-  [1594] = 1547,
+  [1594] = 1594,
   [1595] = 1595,
   [1596] = 1596,
-  [1597] = 1572,
-  [1598] = 312,
-  [1599] = 1574,
-  [1600] = 1428,
+  [1597] = 1597,
+  [1598] = 1598,
+  [1599] = 1599,
+  [1600] = 1600,
   [1601] = 1601,
   [1602] = 1602,
   [1603] = 1603,
   [1604] = 1604,
   [1605] = 1605,
-  [1606] = 1507,
-  [1607] = 326,
-  [1608] = 1608,
-  [1609] = 1609,
-  [1610] = 1610,
-  [1611] = 1611,
-  [1612] = 1541,
+  [1606] = 1606,
+  [1607] = 1593,
+  [1608] = 1520,
+  [1609] = 1586,
+  [1610] = 325,
+  [1611] = 314,
+  [1612] = 1612,
   [1613] = 1613,
   [1614] = 1614,
-  [1615] = 1615,
-  [1616] = 1616,
-  [1617] = 1616,
+  [1615] = 1429,
+  [1616] = 1600,
+  [1617] = 1617,
   [1618] = 1618,
   [1619] = 1619,
   [1620] = 1620,
   [1621] = 1621,
   [1622] = 1622,
-  [1623] = 1623,
+  [1623] = 1622,
   [1624] = 1624,
   [1625] = 1625,
   [1626] = 1626,
   [1627] = 1627,
-  [1628] = 1618,
+  [1628] = 1627,
   [1629] = 1629,
   [1630] = 1630,
   [1631] = 1631,
@@ -4721,124 +4721,128 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [1634] = 1634,
   [1635] = 1635,
   [1636] = 1636,
-  [1637] = 1635,
-  [1638] = 1638,
-  [1639] = 1639,
-  [1640] = 1615,
-  [1641] = 1641,
+  [1637] = 1618,
+  [1638] = 1617,
+  [1639] = 1635,
+  [1640] = 1640,
+  [1641] = 1627,
   [1642] = 1642,
-  [1643] = 1643,
-  [1644] = 1630,
-  [1645] = 1636,
-  [1646] = 1646,
+  [1643] = 1618,
+  [1644] = 1644,
+  [1645] = 1645,
+  [1646] = 1629,
   [1647] = 1647,
   [1648] = 1648,
-  [1649] = 1643,
+  [1649] = 1632,
   [1650] = 1650,
   [1651] = 1651,
   [1652] = 1652,
   [1653] = 1653,
   [1654] = 1654,
-  [1655] = 1654,
-  [1656] = 1621,
-  [1657] = 1657,
-  [1658] = 1657,
+  [1655] = 1655,
+  [1656] = 1656,
+  [1657] = 1648,
+  [1658] = 1644,
   [1659] = 1659,
-  [1660] = 1614,
-  [1661] = 1647,
+  [1660] = 1660,
+  [1661] = 1632,
   [1662] = 1662,
-  [1663] = 1634,
+  [1663] = 1640,
   [1664] = 1664,
   [1665] = 1665,
-  [1666] = 1624,
-  [1667] = 1639,
-  [1668] = 1631,
-  [1669] = 1657,
-  [1670] = 1670,
-  [1671] = 1671,
-  [1672] = 1619,
-  [1673] = 1618,
-  [1674] = 1674,
+  [1666] = 1666,
+  [1667] = 1645,
+  [1668] = 1668,
+  [1669] = 1669,
+  [1670] = 1620,
+  [1671] = 1642,
+  [1672] = 1672,
+  [1673] = 1653,
+  [1674] = 1633,
   [1675] = 1675,
-  [1676] = 1676,
-  [1677] = 1651,
+  [1676] = 1645,
+  [1677] = 1677,
   [1678] = 1678,
   [1679] = 1679,
-  [1680] = 1665,
-  [1681] = 1631,
+  [1680] = 1680,
+  [1681] = 1636,
   [1682] = 1682,
   [1683] = 1683,
-  [1684] = 1615,
-  [1685] = 1664,
-  [1686] = 1654,
-  [1687] = 1629,
-  [1688] = 1624,
-  [1689] = 1689,
-  [1690] = 1690,
-  [1691] = 1639,
-  [1692] = 1657,
-  [1693] = 1632,
-  [1694] = 1614,
-  [1695] = 1676,
+  [1684] = 1660,
+  [1685] = 1685,
+  [1686] = 1686,
+  [1687] = 1686,
+  [1688] = 1688,
+  [1689] = 1642,
+  [1690] = 1664,
+  [1691] = 1680,
+  [1692] = 1622,
+  [1693] = 1626,
+  [1694] = 1694,
+  [1695] = 1695,
   [1696] = 1696,
-  [1697] = 1639,
-  [1698] = 1619,
+  [1697] = 1697,
+  [1698] = 1698,
   [1699] = 1699,
-  [1700] = 1664,
-  [1701] = 1626,
-  [1702] = 1619,
-  [1703] = 1631,
-  [1704] = 1704,
-  [1705] = 1705,
+  [1700] = 1688,
+  [1701] = 1683,
+  [1702] = 1620,
+  [1703] = 1642,
+  [1704] = 1683,
+  [1705] = 1644,
   [1706] = 1706,
-  [1707] = 1707,
-  [1708] = 1708,
+  [1707] = 1652,
+  [1708] = 1621,
   [1709] = 1709,
-  [1710] = 1619,
-  [1711] = 1618,
-  [1712] = 1712,
-  [1713] = 1675,
-  [1714] = 1665,
-  [1715] = 1648,
-  [1716] = 1613,
-  [1717] = 1676,
-  [1718] = 1718,
-  [1719] = 1622,
-  [1720] = 1683,
-  [1721] = 1654,
-  [1722] = 1675,
-  [1723] = 1659,
-  [1724] = 1665,
-  [1725] = 1725,
-  [1726] = 1726,
-  [1727] = 1624,
-  [1728] = 1676,
-  [1729] = 1639,
-  [1730] = 1619,
+  [1710] = 1686,
+  [1711] = 1711,
+  [1712] = 1664,
+  [1713] = 1664,
+  [1714] = 1688,
+  [1715] = 1683,
+  [1716] = 1716,
+  [1717] = 1683,
+  [1718] = 1683,
+  [1719] = 1644,
+  [1720] = 1620,
+  [1721] = 1620,
+  [1722] = 1722,
+  [1723] = 1621,
+  [1724] = 1624,
+  [1725] = 1675,
+  [1726] = 1622,
+  [1727] = 1727,
+  [1728] = 1627,
+  [1729] = 1727,
+  [1730] = 1632,
   [1731] = 1731,
-  [1732] = 1639,
-  [1733] = 1664,
-  [1734] = 1641,
-  [1735] = 1614,
+  [1732] = 1732,
+  [1733] = 1733,
+  [1734] = 1688,
+  [1735] = 1735,
   [1736] = 1736,
-  [1737] = 1615,
+  [1737] = 1737,
   [1738] = 1738,
-  [1739] = 1736,
-  [1740] = 1740,
-  [1741] = 1646,
-  [1742] = 1742,
-  [1743] = 1743,
-  [1744] = 1744,
-  [1745] = 1699,
-  [1746] = 1705,
-  [1747] = 1642,
+  [1739] = 1620,
+  [1740] = 1735,
+  [1741] = 1741,
+  [1742] = 1669,
+  [1743] = 1618,
+  [1744] = 1651,
+  [1745] = 1621,
+  [1746] = 1630,
+  [1747] = 1686,
   [1748] = 1748,
-  [1749] = 1740,
-  [1750] = 1748,
-  [1751] = 1718,
-  [1752] = 1752,
-  [1753] = 1725,
-  [1754] = 1675,
+  [1749] = 1625,
+  [1750] = 1738,
+  [1751] = 1709,
+  [1752] = 1655,
+  [1753] = 1665,
+  [1754] = 1754,
+  [1755] = 1754,
+  [1756] = 1645,
+  [1757] = 1748,
+  [1758] = 1695,
 };
 
 static const TSCharacterRange sym_identifier_character_set_1[] = {
@@ -4848,7 +4852,7 @@ static const TSCharacterRange sym_identifier_character_set_1[] = {
   {0x531, 0x556}, {0x559, 0x559}, {0x560, 0x588}, {0x5d0, 0x5ea}, {0x5ef, 0x5f2}, {0x620, 0x64a}, {0x66e, 0x66f}, {0x671, 0x6d3},
   {0x6d5, 0x6d5}, {0x6e5, 0x6e6}, {0x6ee, 0x6ef}, {0x6fa, 0x6fc}, {0x6ff, 0x6ff}, {0x710, 0x710}, {0x712, 0x72f}, {0x74d, 0x7a5},
   {0x7b1, 0x7b1}, {0x7ca, 0x7ea}, {0x7f4, 0x7f5}, {0x7fa, 0x7fa}, {0x800, 0x815}, {0x81a, 0x81a}, {0x824, 0x824}, {0x828, 0x828},
-  {0x840, 0x858}, {0x860, 0x86a}, {0x870, 0x887}, {0x889, 0x88e}, {0x8a0, 0x8c9}, {0x904, 0x939}, {0x93d, 0x93d}, {0x950, 0x950},
+  {0x840, 0x858}, {0x860, 0x86a}, {0x870, 0x887}, {0x889, 0x88f}, {0x8a0, 0x8c9}, {0x904, 0x939}, {0x93d, 0x93d}, {0x950, 0x950},
   {0x958, 0x961}, {0x971, 0x980}, {0x985, 0x98c}, {0x98f, 0x990}, {0x993, 0x9a8}, {0x9aa, 0x9b0}, {0x9b2, 0x9b2}, {0x9b6, 0x9b9},
   {0x9bd, 0x9bd}, {0x9ce, 0x9ce}, {0x9dc, 0x9dd}, {0x9df, 0x9e1}, {0x9f0, 0x9f1}, {0x9fc, 0x9fc}, {0xa05, 0xa0a}, {0xa0f, 0xa10},
   {0xa13, 0xa28}, {0xa2a, 0xa30}, {0xa32, 0xa33}, {0xa35, 0xa36}, {0xa38, 0xa39}, {0xa59, 0xa5c}, {0xa5e, 0xa5e}, {0xa72, 0xa74},
@@ -4856,8 +4860,8 @@ static const TSCharacterRange sym_identifier_character_set_1[] = {
   {0xae0, 0xae1}, {0xaf9, 0xaf9}, {0xb05, 0xb0c}, {0xb0f, 0xb10}, {0xb13, 0xb28}, {0xb2a, 0xb30}, {0xb32, 0xb33}, {0xb35, 0xb39},
   {0xb3d, 0xb3d}, {0xb5c, 0xb5d}, {0xb5f, 0xb61}, {0xb71, 0xb71}, {0xb83, 0xb83}, {0xb85, 0xb8a}, {0xb8e, 0xb90}, {0xb92, 0xb95},
   {0xb99, 0xb9a}, {0xb9c, 0xb9c}, {0xb9e, 0xb9f}, {0xba3, 0xba4}, {0xba8, 0xbaa}, {0xbae, 0xbb9}, {0xbd0, 0xbd0}, {0xc05, 0xc0c},
-  {0xc0e, 0xc10}, {0xc12, 0xc28}, {0xc2a, 0xc39}, {0xc3d, 0xc3d}, {0xc58, 0xc5a}, {0xc5d, 0xc5d}, {0xc60, 0xc61}, {0xc80, 0xc80},
-  {0xc85, 0xc8c}, {0xc8e, 0xc90}, {0xc92, 0xca8}, {0xcaa, 0xcb3}, {0xcb5, 0xcb9}, {0xcbd, 0xcbd}, {0xcdd, 0xcde}, {0xce0, 0xce1},
+  {0xc0e, 0xc10}, {0xc12, 0xc28}, {0xc2a, 0xc39}, {0xc3d, 0xc3d}, {0xc58, 0xc5a}, {0xc5c, 0xc5d}, {0xc60, 0xc61}, {0xc80, 0xc80},
+  {0xc85, 0xc8c}, {0xc8e, 0xc90}, {0xc92, 0xca8}, {0xcaa, 0xcb3}, {0xcb5, 0xcb9}, {0xcbd, 0xcbd}, {0xcdc, 0xcde}, {0xce0, 0xce1},
   {0xcf1, 0xcf2}, {0xd04, 0xd0c}, {0xd0e, 0xd10}, {0xd12, 0xd3a}, {0xd3d, 0xd3d}, {0xd4e, 0xd4e}, {0xd54, 0xd56}, {0xd5f, 0xd61},
   {0xd7a, 0xd7f}, {0xd85, 0xd96}, {0xd9a, 0xdb1}, {0xdb3, 0xdbb}, {0xdbd, 0xdbd}, {0xdc0, 0xdc6}, {0xe01, 0xe30}, {0xe32, 0xe32},
   {0xe40, 0xe46}, {0xe81, 0xe82}, {0xe84, 0xe84}, {0xe86, 0xe8a}, {0xe8c, 0xea3}, {0xea5, 0xea5}, {0xea7, 0xeb0}, {0xeb2, 0xeb2},
@@ -4880,54 +4884,55 @@ static const TSCharacterRange sym_identifier_character_set_1[] = {
   {0x2db8, 0x2dbe}, {0x2dc0, 0x2dc6}, {0x2dc8, 0x2dce}, {0x2dd0, 0x2dd6}, {0x2dd8, 0x2dde}, {0x3005, 0x3007}, {0x3021, 0x3029}, {0x3031, 0x3035},
   {0x3038, 0x303c}, {0x3041, 0x3096}, {0x309d, 0x309f}, {0x30a1, 0x30fa}, {0x30fc, 0x30ff}, {0x3105, 0x312f}, {0x3131, 0x318e}, {0x31a0, 0x31bf},
   {0x31f0, 0x31ff}, {0x3400, 0x4dbf}, {0x4e00, 0xa48c}, {0xa4d0, 0xa4fd}, {0xa500, 0xa60c}, {0xa610, 0xa61f}, {0xa62a, 0xa62b}, {0xa640, 0xa66e},
-  {0xa67f, 0xa69d}, {0xa6a0, 0xa6ef}, {0xa717, 0xa71f}, {0xa722, 0xa788}, {0xa78b, 0xa7cd}, {0xa7d0, 0xa7d1}, {0xa7d3, 0xa7d3}, {0xa7d5, 0xa7dc},
-  {0xa7f2, 0xa801}, {0xa803, 0xa805}, {0xa807, 0xa80a}, {0xa80c, 0xa822}, {0xa840, 0xa873}, {0xa882, 0xa8b3}, {0xa8f2, 0xa8f7}, {0xa8fb, 0xa8fb},
-  {0xa8fd, 0xa8fe}, {0xa90a, 0xa925}, {0xa930, 0xa946}, {0xa960, 0xa97c}, {0xa984, 0xa9b2}, {0xa9cf, 0xa9cf}, {0xa9e0, 0xa9e4}, {0xa9e6, 0xa9ef},
-  {0xa9fa, 0xa9fe}, {0xaa00, 0xaa28}, {0xaa40, 0xaa42}, {0xaa44, 0xaa4b}, {0xaa60, 0xaa76}, {0xaa7a, 0xaa7a}, {0xaa7e, 0xaaaf}, {0xaab1, 0xaab1},
-  {0xaab5, 0xaab6}, {0xaab9, 0xaabd}, {0xaac0, 0xaac0}, {0xaac2, 0xaac2}, {0xaadb, 0xaadd}, {0xaae0, 0xaaea}, {0xaaf2, 0xaaf4}, {0xab01, 0xab06},
-  {0xab09, 0xab0e}, {0xab11, 0xab16}, {0xab20, 0xab26}, {0xab28, 0xab2e}, {0xab30, 0xab5a}, {0xab5c, 0xab69}, {0xab70, 0xabe2}, {0xac00, 0xd7a3},
-  {0xd7b0, 0xd7c6}, {0xd7cb, 0xd7fb}, {0xf900, 0xfa6d}, {0xfa70, 0xfad9}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17}, {0xfb1d, 0xfb1d}, {0xfb1f, 0xfb28},
-  {0xfb2a, 0xfb36}, {0xfb38, 0xfb3c}, {0xfb3e, 0xfb3e}, {0xfb40, 0xfb41}, {0xfb43, 0xfb44}, {0xfb46, 0xfbb1}, {0xfbd3, 0xfc5d}, {0xfc64, 0xfd3d},
-  {0xfd50, 0xfd8f}, {0xfd92, 0xfdc7}, {0xfdf0, 0xfdf9}, {0xfe71, 0xfe71}, {0xfe73, 0xfe73}, {0xfe77, 0xfe77}, {0xfe79, 0xfe79}, {0xfe7b, 0xfe7b},
-  {0xfe7d, 0xfe7d}, {0xfe7f, 0xfefc}, {0xff21, 0xff3a}, {0xff41, 0xff5a}, {0xff66, 0xff9d}, {0xffa0, 0xffbe}, {0xffc2, 0xffc7}, {0xffca, 0xffcf},
-  {0xffd2, 0xffd7}, {0xffda, 0xffdc}, {0x10000, 0x1000b}, {0x1000d, 0x10026}, {0x10028, 0x1003a}, {0x1003c, 0x1003d}, {0x1003f, 0x1004d}, {0x10050, 0x1005d},
-  {0x10080, 0x100fa}, {0x10140, 0x10174}, {0x10280, 0x1029c}, {0x102a0, 0x102d0}, {0x10300, 0x1031f}, {0x1032d, 0x1034a}, {0x10350, 0x10375}, {0x10380, 0x1039d},
-  {0x103a0, 0x103c3}, {0x103c8, 0x103cf}, {0x103d1, 0x103d5}, {0x10400, 0x1049d}, {0x104b0, 0x104d3}, {0x104d8, 0x104fb}, {0x10500, 0x10527}, {0x10530, 0x10563},
-  {0x10570, 0x1057a}, {0x1057c, 0x1058a}, {0x1058c, 0x10592}, {0x10594, 0x10595}, {0x10597, 0x105a1}, {0x105a3, 0x105b1}, {0x105b3, 0x105b9}, {0x105bb, 0x105bc},
-  {0x105c0, 0x105f3}, {0x10600, 0x10736}, {0x10740, 0x10755}, {0x10760, 0x10767}, {0x10780, 0x10785}, {0x10787, 0x107b0}, {0x107b2, 0x107ba}, {0x10800, 0x10805},
-  {0x10808, 0x10808}, {0x1080a, 0x10835}, {0x10837, 0x10838}, {0x1083c, 0x1083c}, {0x1083f, 0x10855}, {0x10860, 0x10876}, {0x10880, 0x1089e}, {0x108e0, 0x108f2},
-  {0x108f4, 0x108f5}, {0x10900, 0x10915}, {0x10920, 0x10939}, {0x10980, 0x109b7}, {0x109be, 0x109bf}, {0x10a00, 0x10a00}, {0x10a10, 0x10a13}, {0x10a15, 0x10a17},
-  {0x10a19, 0x10a35}, {0x10a60, 0x10a7c}, {0x10a80, 0x10a9c}, {0x10ac0, 0x10ac7}, {0x10ac9, 0x10ae4}, {0x10b00, 0x10b35}, {0x10b40, 0x10b55}, {0x10b60, 0x10b72},
-  {0x10b80, 0x10b91}, {0x10c00, 0x10c48}, {0x10c80, 0x10cb2}, {0x10cc0, 0x10cf2}, {0x10d00, 0x10d23}, {0x10d4a, 0x10d65}, {0x10d6f, 0x10d85}, {0x10e80, 0x10ea9},
-  {0x10eb0, 0x10eb1}, {0x10ec2, 0x10ec4}, {0x10f00, 0x10f1c}, {0x10f27, 0x10f27}, {0x10f30, 0x10f45}, {0x10f70, 0x10f81}, {0x10fb0, 0x10fc4}, {0x10fe0, 0x10ff6},
-  {0x11003, 0x11037}, {0x11071, 0x11072}, {0x11075, 0x11075}, {0x11083, 0x110af}, {0x110d0, 0x110e8}, {0x11103, 0x11126}, {0x11144, 0x11144}, {0x11147, 0x11147},
-  {0x11150, 0x11172}, {0x11176, 0x11176}, {0x11183, 0x111b2}, {0x111c1, 0x111c4}, {0x111da, 0x111da}, {0x111dc, 0x111dc}, {0x11200, 0x11211}, {0x11213, 0x1122b},
-  {0x1123f, 0x11240}, {0x11280, 0x11286}, {0x11288, 0x11288}, {0x1128a, 0x1128d}, {0x1128f, 0x1129d}, {0x1129f, 0x112a8}, {0x112b0, 0x112de}, {0x11305, 0x1130c},
-  {0x1130f, 0x11310}, {0x11313, 0x11328}, {0x1132a, 0x11330}, {0x11332, 0x11333}, {0x11335, 0x11339}, {0x1133d, 0x1133d}, {0x11350, 0x11350}, {0x1135d, 0x11361},
-  {0x11380, 0x11389}, {0x1138b, 0x1138b}, {0x1138e, 0x1138e}, {0x11390, 0x113b5}, {0x113b7, 0x113b7}, {0x113d1, 0x113d1}, {0x113d3, 0x113d3}, {0x11400, 0x11434},
-  {0x11447, 0x1144a}, {0x1145f, 0x11461}, {0x11480, 0x114af}, {0x114c4, 0x114c5}, {0x114c7, 0x114c7}, {0x11580, 0x115ae}, {0x115d8, 0x115db}, {0x11600, 0x1162f},
-  {0x11644, 0x11644}, {0x11680, 0x116aa}, {0x116b8, 0x116b8}, {0x11700, 0x1171a}, {0x11740, 0x11746}, {0x11800, 0x1182b}, {0x118a0, 0x118df}, {0x118ff, 0x11906},
-  {0x11909, 0x11909}, {0x1190c, 0x11913}, {0x11915, 0x11916}, {0x11918, 0x1192f}, {0x1193f, 0x1193f}, {0x11941, 0x11941}, {0x119a0, 0x119a7}, {0x119aa, 0x119d0},
-  {0x119e1, 0x119e1}, {0x119e3, 0x119e3}, {0x11a00, 0x11a00}, {0x11a0b, 0x11a32}, {0x11a3a, 0x11a3a}, {0x11a50, 0x11a50}, {0x11a5c, 0x11a89}, {0x11a9d, 0x11a9d},
-  {0x11ab0, 0x11af8}, {0x11bc0, 0x11be0}, {0x11c00, 0x11c08}, {0x11c0a, 0x11c2e}, {0x11c40, 0x11c40}, {0x11c72, 0x11c8f}, {0x11d00, 0x11d06}, {0x11d08, 0x11d09},
-  {0x11d0b, 0x11d30}, {0x11d46, 0x11d46}, {0x11d60, 0x11d65}, {0x11d67, 0x11d68}, {0x11d6a, 0x11d89}, {0x11d98, 0x11d98}, {0x11ee0, 0x11ef2}, {0x11f02, 0x11f02},
-  {0x11f04, 0x11f10}, {0x11f12, 0x11f33}, {0x11fb0, 0x11fb0}, {0x12000, 0x12399}, {0x12400, 0x1246e}, {0x12480, 0x12543}, {0x12f90, 0x12ff0}, {0x13000, 0x1342f},
-  {0x13441, 0x13446}, {0x13460, 0x143fa}, {0x14400, 0x14646}, {0x16100, 0x1611d}, {0x16800, 0x16a38}, {0x16a40, 0x16a5e}, {0x16a70, 0x16abe}, {0x16ad0, 0x16aed},
-  {0x16b00, 0x16b2f}, {0x16b40, 0x16b43}, {0x16b63, 0x16b77}, {0x16b7d, 0x16b8f}, {0x16d40, 0x16d6c}, {0x16e40, 0x16e7f}, {0x16f00, 0x16f4a}, {0x16f50, 0x16f50},
-  {0x16f93, 0x16f9f}, {0x16fe0, 0x16fe1}, {0x16fe3, 0x16fe3}, {0x17000, 0x187f7}, {0x18800, 0x18cd5}, {0x18cff, 0x18d08}, {0x1aff0, 0x1aff3}, {0x1aff5, 0x1affb},
-  {0x1affd, 0x1affe}, {0x1b000, 0x1b122}, {0x1b132, 0x1b132}, {0x1b150, 0x1b152}, {0x1b155, 0x1b155}, {0x1b164, 0x1b167}, {0x1b170, 0x1b2fb}, {0x1bc00, 0x1bc6a},
-  {0x1bc70, 0x1bc7c}, {0x1bc80, 0x1bc88}, {0x1bc90, 0x1bc99}, {0x1d400, 0x1d454}, {0x1d456, 0x1d49c}, {0x1d49e, 0x1d49f}, {0x1d4a2, 0x1d4a2}, {0x1d4a5, 0x1d4a6},
-  {0x1d4a9, 0x1d4ac}, {0x1d4ae, 0x1d4b9}, {0x1d4bb, 0x1d4bb}, {0x1d4bd, 0x1d4c3}, {0x1d4c5, 0x1d505}, {0x1d507, 0x1d50a}, {0x1d50d, 0x1d514}, {0x1d516, 0x1d51c},
-  {0x1d51e, 0x1d539}, {0x1d53b, 0x1d53e}, {0x1d540, 0x1d544}, {0x1d546, 0x1d546}, {0x1d54a, 0x1d550}, {0x1d552, 0x1d6a5}, {0x1d6a8, 0x1d6c0}, {0x1d6c2, 0x1d6da},
-  {0x1d6dc, 0x1d6fa}, {0x1d6fc, 0x1d714}, {0x1d716, 0x1d734}, {0x1d736, 0x1d74e}, {0x1d750, 0x1d76e}, {0x1d770, 0x1d788}, {0x1d78a, 0x1d7a8}, {0x1d7aa, 0x1d7c2},
-  {0x1d7c4, 0x1d7cb}, {0x1df00, 0x1df1e}, {0x1df25, 0x1df2a}, {0x1e030, 0x1e06d}, {0x1e100, 0x1e12c}, {0x1e137, 0x1e13d}, {0x1e14e, 0x1e14e}, {0x1e290, 0x1e2ad},
-  {0x1e2c0, 0x1e2eb}, {0x1e4d0, 0x1e4eb}, {0x1e5d0, 0x1e5ed}, {0x1e5f0, 0x1e5f0}, {0x1e7e0, 0x1e7e6}, {0x1e7e8, 0x1e7eb}, {0x1e7ed, 0x1e7ee}, {0x1e7f0, 0x1e7fe},
+  {0xa67f, 0xa69d}, {0xa6a0, 0xa6ef}, {0xa717, 0xa71f}, {0xa722, 0xa788}, {0xa78b, 0xa7dc}, {0xa7f1, 0xa801}, {0xa803, 0xa805}, {0xa807, 0xa80a},
+  {0xa80c, 0xa822}, {0xa840, 0xa873}, {0xa882, 0xa8b3}, {0xa8f2, 0xa8f7}, {0xa8fb, 0xa8fb}, {0xa8fd, 0xa8fe}, {0xa90a, 0xa925}, {0xa930, 0xa946},
+  {0xa960, 0xa97c}, {0xa984, 0xa9b2}, {0xa9cf, 0xa9cf}, {0xa9e0, 0xa9e4}, {0xa9e6, 0xa9ef}, {0xa9fa, 0xa9fe}, {0xaa00, 0xaa28}, {0xaa40, 0xaa42},
+  {0xaa44, 0xaa4b}, {0xaa60, 0xaa76}, {0xaa7a, 0xaa7a}, {0xaa7e, 0xaaaf}, {0xaab1, 0xaab1}, {0xaab5, 0xaab6}, {0xaab9, 0xaabd}, {0xaac0, 0xaac0},
+  {0xaac2, 0xaac2}, {0xaadb, 0xaadd}, {0xaae0, 0xaaea}, {0xaaf2, 0xaaf4}, {0xab01, 0xab06}, {0xab09, 0xab0e}, {0xab11, 0xab16}, {0xab20, 0xab26},
+  {0xab28, 0xab2e}, {0xab30, 0xab5a}, {0xab5c, 0xab69}, {0xab70, 0xabe2}, {0xac00, 0xd7a3}, {0xd7b0, 0xd7c6}, {0xd7cb, 0xd7fb}, {0xf900, 0xfa6d},
+  {0xfa70, 0xfad9}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17}, {0xfb1d, 0xfb1d}, {0xfb1f, 0xfb28}, {0xfb2a, 0xfb36}, {0xfb38, 0xfb3c}, {0xfb3e, 0xfb3e},
+  {0xfb40, 0xfb41}, {0xfb43, 0xfb44}, {0xfb46, 0xfbb1}, {0xfbd3, 0xfc5d}, {0xfc64, 0xfd3d}, {0xfd50, 0xfd8f}, {0xfd92, 0xfdc7}, {0xfdf0, 0xfdf9},
+  {0xfe71, 0xfe71}, {0xfe73, 0xfe73}, {0xfe77, 0xfe77}, {0xfe79, 0xfe79}, {0xfe7b, 0xfe7b}, {0xfe7d, 0xfe7d}, {0xfe7f, 0xfefc}, {0xff21, 0xff3a},
+  {0xff41, 0xff5a}, {0xff66, 0xff9d}, {0xffa0, 0xffbe}, {0xffc2, 0xffc7}, {0xffca, 0xffcf}, {0xffd2, 0xffd7}, {0xffda, 0xffdc}, {0x10000, 0x1000b},
+  {0x1000d, 0x10026}, {0x10028, 0x1003a}, {0x1003c, 0x1003d}, {0x1003f, 0x1004d}, {0x10050, 0x1005d}, {0x10080, 0x100fa}, {0x10140, 0x10174}, {0x10280, 0x1029c},
+  {0x102a0, 0x102d0}, {0x10300, 0x1031f}, {0x1032d, 0x1034a}, {0x10350, 0x10375}, {0x10380, 0x1039d}, {0x103a0, 0x103c3}, {0x103c8, 0x103cf}, {0x103d1, 0x103d5},
+  {0x10400, 0x1049d}, {0x104b0, 0x104d3}, {0x104d8, 0x104fb}, {0x10500, 0x10527}, {0x10530, 0x10563}, {0x10570, 0x1057a}, {0x1057c, 0x1058a}, {0x1058c, 0x10592},
+  {0x10594, 0x10595}, {0x10597, 0x105a1}, {0x105a3, 0x105b1}, {0x105b3, 0x105b9}, {0x105bb, 0x105bc}, {0x105c0, 0x105f3}, {0x10600, 0x10736}, {0x10740, 0x10755},
+  {0x10760, 0x10767}, {0x10780, 0x10785}, {0x10787, 0x107b0}, {0x107b2, 0x107ba}, {0x10800, 0x10805}, {0x10808, 0x10808}, {0x1080a, 0x10835}, {0x10837, 0x10838},
+  {0x1083c, 0x1083c}, {0x1083f, 0x10855}, {0x10860, 0x10876}, {0x10880, 0x1089e}, {0x108e0, 0x108f2}, {0x108f4, 0x108f5}, {0x10900, 0x10915}, {0x10920, 0x10939},
+  {0x10940, 0x10959}, {0x10980, 0x109b7}, {0x109be, 0x109bf}, {0x10a00, 0x10a00}, {0x10a10, 0x10a13}, {0x10a15, 0x10a17}, {0x10a19, 0x10a35}, {0x10a60, 0x10a7c},
+  {0x10a80, 0x10a9c}, {0x10ac0, 0x10ac7}, {0x10ac9, 0x10ae4}, {0x10b00, 0x10b35}, {0x10b40, 0x10b55}, {0x10b60, 0x10b72}, {0x10b80, 0x10b91}, {0x10c00, 0x10c48},
+  {0x10c80, 0x10cb2}, {0x10cc0, 0x10cf2}, {0x10d00, 0x10d23}, {0x10d4a, 0x10d65}, {0x10d6f, 0x10d85}, {0x10e80, 0x10ea9}, {0x10eb0, 0x10eb1}, {0x10ec2, 0x10ec7},
+  {0x10f00, 0x10f1c}, {0x10f27, 0x10f27}, {0x10f30, 0x10f45}, {0x10f70, 0x10f81}, {0x10fb0, 0x10fc4}, {0x10fe0, 0x10ff6}, {0x11003, 0x11037}, {0x11071, 0x11072},
+  {0x11075, 0x11075}, {0x11083, 0x110af}, {0x110d0, 0x110e8}, {0x11103, 0x11126}, {0x11144, 0x11144}, {0x11147, 0x11147}, {0x11150, 0x11172}, {0x11176, 0x11176},
+  {0x11183, 0x111b2}, {0x111c1, 0x111c4}, {0x111da, 0x111da}, {0x111dc, 0x111dc}, {0x11200, 0x11211}, {0x11213, 0x1122b}, {0x1123f, 0x11240}, {0x11280, 0x11286},
+  {0x11288, 0x11288}, {0x1128a, 0x1128d}, {0x1128f, 0x1129d}, {0x1129f, 0x112a8}, {0x112b0, 0x112de}, {0x11305, 0x1130c}, {0x1130f, 0x11310}, {0x11313, 0x11328},
+  {0x1132a, 0x11330}, {0x11332, 0x11333}, {0x11335, 0x11339}, {0x1133d, 0x1133d}, {0x11350, 0x11350}, {0x1135d, 0x11361}, {0x11380, 0x11389}, {0x1138b, 0x1138b},
+  {0x1138e, 0x1138e}, {0x11390, 0x113b5}, {0x113b7, 0x113b7}, {0x113d1, 0x113d1}, {0x113d3, 0x113d3}, {0x11400, 0x11434}, {0x11447, 0x1144a}, {0x1145f, 0x11461},
+  {0x11480, 0x114af}, {0x114c4, 0x114c5}, {0x114c7, 0x114c7}, {0x11580, 0x115ae}, {0x115d8, 0x115db}, {0x11600, 0x1162f}, {0x11644, 0x11644}, {0x11680, 0x116aa},
+  {0x116b8, 0x116b8}, {0x11700, 0x1171a}, {0x11740, 0x11746}, {0x11800, 0x1182b}, {0x118a0, 0x118df}, {0x118ff, 0x11906}, {0x11909, 0x11909}, {0x1190c, 0x11913},
+  {0x11915, 0x11916}, {0x11918, 0x1192f}, {0x1193f, 0x1193f}, {0x11941, 0x11941}, {0x119a0, 0x119a7}, {0x119aa, 0x119d0}, {0x119e1, 0x119e1}, {0x119e3, 0x119e3},
+  {0x11a00, 0x11a00}, {0x11a0b, 0x11a32}, {0x11a3a, 0x11a3a}, {0x11a50, 0x11a50}, {0x11a5c, 0x11a89}, {0x11a9d, 0x11a9d}, {0x11ab0, 0x11af8}, {0x11bc0, 0x11be0},
+  {0x11c00, 0x11c08}, {0x11c0a, 0x11c2e}, {0x11c40, 0x11c40}, {0x11c72, 0x11c8f}, {0x11d00, 0x11d06}, {0x11d08, 0x11d09}, {0x11d0b, 0x11d30}, {0x11d46, 0x11d46},
+  {0x11d60, 0x11d65}, {0x11d67, 0x11d68}, {0x11d6a, 0x11d89}, {0x11d98, 0x11d98}, {0x11db0, 0x11ddb}, {0x11ee0, 0x11ef2}, {0x11f02, 0x11f02}, {0x11f04, 0x11f10},
+  {0x11f12, 0x11f33}, {0x11fb0, 0x11fb0}, {0x12000, 0x12399}, {0x12400, 0x1246e}, {0x12480, 0x12543}, {0x12f90, 0x12ff0}, {0x13000, 0x1342f}, {0x13441, 0x13446},
+  {0x13460, 0x143fa}, {0x14400, 0x14646}, {0x16100, 0x1611d}, {0x16800, 0x16a38}, {0x16a40, 0x16a5e}, {0x16a70, 0x16abe}, {0x16ad0, 0x16aed}, {0x16b00, 0x16b2f},
+  {0x16b40, 0x16b43}, {0x16b63, 0x16b77}, {0x16b7d, 0x16b8f}, {0x16d40, 0x16d6c}, {0x16e40, 0x16e7f}, {0x16ea0, 0x16eb8}, {0x16ebb, 0x16ed3}, {0x16f00, 0x16f4a},
+  {0x16f50, 0x16f50}, {0x16f93, 0x16f9f}, {0x16fe0, 0x16fe1}, {0x16fe3, 0x16fe3}, {0x16ff2, 0x16ff6}, {0x17000, 0x18cd5}, {0x18cff, 0x18d1e}, {0x18d80, 0x18df2},
+  {0x1aff0, 0x1aff3}, {0x1aff5, 0x1affb}, {0x1affd, 0x1affe}, {0x1b000, 0x1b122}, {0x1b132, 0x1b132}, {0x1b150, 0x1b152}, {0x1b155, 0x1b155}, {0x1b164, 0x1b167},
+  {0x1b170, 0x1b2fb}, {0x1bc00, 0x1bc6a}, {0x1bc70, 0x1bc7c}, {0x1bc80, 0x1bc88}, {0x1bc90, 0x1bc99}, {0x1d400, 0x1d454}, {0x1d456, 0x1d49c}, {0x1d49e, 0x1d49f},
+  {0x1d4a2, 0x1d4a2}, {0x1d4a5, 0x1d4a6}, {0x1d4a9, 0x1d4ac}, {0x1d4ae, 0x1d4b9}, {0x1d4bb, 0x1d4bb}, {0x1d4bd, 0x1d4c3}, {0x1d4c5, 0x1d505}, {0x1d507, 0x1d50a},
+  {0x1d50d, 0x1d514}, {0x1d516, 0x1d51c}, {0x1d51e, 0x1d539}, {0x1d53b, 0x1d53e}, {0x1d540, 0x1d544}, {0x1d546, 0x1d546}, {0x1d54a, 0x1d550}, {0x1d552, 0x1d6a5},
+  {0x1d6a8, 0x1d6c0}, {0x1d6c2, 0x1d6da}, {0x1d6dc, 0x1d6fa}, {0x1d6fc, 0x1d714}, {0x1d716, 0x1d734}, {0x1d736, 0x1d74e}, {0x1d750, 0x1d76e}, {0x1d770, 0x1d788},
+  {0x1d78a, 0x1d7a8}, {0x1d7aa, 0x1d7c2}, {0x1d7c4, 0x1d7cb}, {0x1df00, 0x1df1e}, {0x1df25, 0x1df2a}, {0x1e030, 0x1e06d}, {0x1e100, 0x1e12c}, {0x1e137, 0x1e13d},
+  {0x1e14e, 0x1e14e}, {0x1e290, 0x1e2ad}, {0x1e2c0, 0x1e2eb}, {0x1e4d0, 0x1e4eb}, {0x1e5d0, 0x1e5ed}, {0x1e5f0, 0x1e5f0}, {0x1e6c0, 0x1e6de}, {0x1e6e0, 0x1e6e2},
+  {0x1e6e4, 0x1e6e5}, {0x1e6e7, 0x1e6ed}, {0x1e6f0, 0x1e6f4}, {0x1e6fe, 0x1e6ff}, {0x1e7e0, 0x1e7e6}, {0x1e7e8, 0x1e7eb}, {0x1e7ed, 0x1e7ee}, {0x1e7f0, 0x1e7fe},
   {0x1e800, 0x1e8c4}, {0x1e900, 0x1e943}, {0x1e94b, 0x1e94b}, {0x1ee00, 0x1ee03}, {0x1ee05, 0x1ee1f}, {0x1ee21, 0x1ee22}, {0x1ee24, 0x1ee24}, {0x1ee27, 0x1ee27},
   {0x1ee29, 0x1ee32}, {0x1ee34, 0x1ee37}, {0x1ee39, 0x1ee39}, {0x1ee3b, 0x1ee3b}, {0x1ee42, 0x1ee42}, {0x1ee47, 0x1ee47}, {0x1ee49, 0x1ee49}, {0x1ee4b, 0x1ee4b},
   {0x1ee4d, 0x1ee4f}, {0x1ee51, 0x1ee52}, {0x1ee54, 0x1ee54}, {0x1ee57, 0x1ee57}, {0x1ee59, 0x1ee59}, {0x1ee5b, 0x1ee5b}, {0x1ee5d, 0x1ee5d}, {0x1ee5f, 0x1ee5f},
   {0x1ee61, 0x1ee62}, {0x1ee64, 0x1ee64}, {0x1ee67, 0x1ee6a}, {0x1ee6c, 0x1ee72}, {0x1ee74, 0x1ee77}, {0x1ee79, 0x1ee7c}, {0x1ee7e, 0x1ee7e}, {0x1ee80, 0x1ee89},
-  {0x1ee8b, 0x1ee9b}, {0x1eea1, 0x1eea3}, {0x1eea5, 0x1eea9}, {0x1eeab, 0x1eebb}, {0x20000, 0x2a6df}, {0x2a700, 0x2b739}, {0x2b740, 0x2b81d}, {0x2b820, 0x2cea1},
-  {0x2ceb0, 0x2ebe0}, {0x2ebf0, 0x2ee5d}, {0x2f800, 0x2fa1d}, {0x30000, 0x3134a}, {0x31350, 0x323af},
+  {0x1ee8b, 0x1ee9b}, {0x1eea1, 0x1eea3}, {0x1eea5, 0x1eea9}, {0x1eeab, 0x1eebb}, {0x20000, 0x2a6df}, {0x2a700, 0x2b81d}, {0x2b820, 0x2cead}, {0x2ceb0, 0x2ebe0},
+  {0x2ebf0, 0x2ee5d}, {0x2f800, 0x2fa1d}, {0x30000, 0x3134a}, {0x31350, 0x33479},
 };
 
 static const TSCharacterRange sym_identifier_character_set_2[] = {
@@ -4937,7 +4942,7 @@ static const TSCharacterRange sym_identifier_character_set_2[] = {
   {0x483, 0x487}, {0x48a, 0x52f}, {0x531, 0x556}, {0x559, 0x559}, {0x560, 0x588}, {0x591, 0x5bd}, {0x5bf, 0x5bf}, {0x5c1, 0x5c2},
   {0x5c4, 0x5c5}, {0x5c7, 0x5c7}, {0x5d0, 0x5ea}, {0x5ef, 0x5f2}, {0x610, 0x61a}, {0x620, 0x669}, {0x66e, 0x6d3}, {0x6d5, 0x6dc},
   {0x6df, 0x6e8}, {0x6ea, 0x6fc}, {0x6ff, 0x6ff}, {0x710, 0x74a}, {0x74d, 0x7b1}, {0x7c0, 0x7f5}, {0x7fa, 0x7fa}, {0x7fd, 0x7fd},
-  {0x800, 0x82d}, {0x840, 0x85b}, {0x860, 0x86a}, {0x870, 0x887}, {0x889, 0x88e}, {0x897, 0x8e1}, {0x8e3, 0x963}, {0x966, 0x96f},
+  {0x800, 0x82d}, {0x840, 0x85b}, {0x860, 0x86a}, {0x870, 0x887}, {0x889, 0x88f}, {0x897, 0x8e1}, {0x8e3, 0x963}, {0x966, 0x96f},
   {0x971, 0x983}, {0x985, 0x98c}, {0x98f, 0x990}, {0x993, 0x9a8}, {0x9aa, 0x9b0}, {0x9b2, 0x9b2}, {0x9b6, 0x9b9}, {0x9bc, 0x9c4},
   {0x9c7, 0x9c8}, {0x9cb, 0x9ce}, {0x9d7, 0x9d7}, {0x9dc, 0x9dd}, {0x9df, 0x9e3}, {0x9e6, 0x9f1}, {0x9fc, 0x9fc}, {0x9fe, 0x9fe},
   {0xa01, 0xa03}, {0xa05, 0xa0a}, {0xa0f, 0xa10}, {0xa13, 0xa28}, {0xa2a, 0xa30}, {0xa32, 0xa33}, {0xa35, 0xa36}, {0xa38, 0xa39},
@@ -4948,9 +4953,9 @@ static const TSCharacterRange sym_identifier_character_set_2[] = {
   {0xb55, 0xb57}, {0xb5c, 0xb5d}, {0xb5f, 0xb63}, {0xb66, 0xb6f}, {0xb71, 0xb71}, {0xb82, 0xb83}, {0xb85, 0xb8a}, {0xb8e, 0xb90},
   {0xb92, 0xb95}, {0xb99, 0xb9a}, {0xb9c, 0xb9c}, {0xb9e, 0xb9f}, {0xba3, 0xba4}, {0xba8, 0xbaa}, {0xbae, 0xbb9}, {0xbbe, 0xbc2},
   {0xbc6, 0xbc8}, {0xbca, 0xbcd}, {0xbd0, 0xbd0}, {0xbd7, 0xbd7}, {0xbe6, 0xbef}, {0xc00, 0xc0c}, {0xc0e, 0xc10}, {0xc12, 0xc28},
-  {0xc2a, 0xc39}, {0xc3c, 0xc44}, {0xc46, 0xc48}, {0xc4a, 0xc4d}, {0xc55, 0xc56}, {0xc58, 0xc5a}, {0xc5d, 0xc5d}, {0xc60, 0xc63},
+  {0xc2a, 0xc39}, {0xc3c, 0xc44}, {0xc46, 0xc48}, {0xc4a, 0xc4d}, {0xc55, 0xc56}, {0xc58, 0xc5a}, {0xc5c, 0xc5d}, {0xc60, 0xc63},
   {0xc66, 0xc6f}, {0xc80, 0xc83}, {0xc85, 0xc8c}, {0xc8e, 0xc90}, {0xc92, 0xca8}, {0xcaa, 0xcb3}, {0xcb5, 0xcb9}, {0xcbc, 0xcc4},
-  {0xcc6, 0xcc8}, {0xcca, 0xccd}, {0xcd5, 0xcd6}, {0xcdd, 0xcde}, {0xce0, 0xce3}, {0xce6, 0xcef}, {0xcf1, 0xcf3}, {0xd00, 0xd0c},
+  {0xcc6, 0xcc8}, {0xcca, 0xccd}, {0xcd5, 0xcd6}, {0xcdc, 0xcde}, {0xce0, 0xce3}, {0xce6, 0xcef}, {0xcf1, 0xcf3}, {0xd00, 0xd0c},
   {0xd0e, 0xd10}, {0xd12, 0xd44}, {0xd46, 0xd48}, {0xd4a, 0xd4e}, {0xd54, 0xd57}, {0xd5f, 0xd63}, {0xd66, 0xd6f}, {0xd7a, 0xd7f},
   {0xd81, 0xd83}, {0xd85, 0xd96}, {0xd9a, 0xdb1}, {0xdb3, 0xdbb}, {0xdbd, 0xdbd}, {0xdc0, 0xdc6}, {0xdca, 0xdca}, {0xdcf, 0xdd4},
   {0xdd6, 0xdd6}, {0xdd8, 0xddf}, {0xde6, 0xdef}, {0xdf2, 0xdf3}, {0xe01, 0xe3a}, {0xe40, 0xe4e}, {0xe50, 0xe59}, {0xe81, 0xe82},
@@ -4964,73 +4969,74 @@ static const TSCharacterRange sym_identifier_character_set_2[] = {
   {0x1740, 0x1753}, {0x1760, 0x176c}, {0x176e, 0x1770}, {0x1772, 0x1773}, {0x1780, 0x17d3}, {0x17d7, 0x17d7}, {0x17dc, 0x17dd}, {0x17e0, 0x17e9},
   {0x180b, 0x180d}, {0x180f, 0x1819}, {0x1820, 0x1878}, {0x1880, 0x18aa}, {0x18b0, 0x18f5}, {0x1900, 0x191e}, {0x1920, 0x192b}, {0x1930, 0x193b},
   {0x1946, 0x196d}, {0x1970, 0x1974}, {0x1980, 0x19ab}, {0x19b0, 0x19c9}, {0x19d0, 0x19da}, {0x1a00, 0x1a1b}, {0x1a20, 0x1a5e}, {0x1a60, 0x1a7c},
-  {0x1a7f, 0x1a89}, {0x1a90, 0x1a99}, {0x1aa7, 0x1aa7}, {0x1ab0, 0x1abd}, {0x1abf, 0x1ace}, {0x1b00, 0x1b4c}, {0x1b50, 0x1b59}, {0x1b6b, 0x1b73},
-  {0x1b80, 0x1bf3}, {0x1c00, 0x1c37}, {0x1c40, 0x1c49}, {0x1c4d, 0x1c7d}, {0x1c80, 0x1c8a}, {0x1c90, 0x1cba}, {0x1cbd, 0x1cbf}, {0x1cd0, 0x1cd2},
-  {0x1cd4, 0x1cfa}, {0x1d00, 0x1f15}, {0x1f18, 0x1f1d}, {0x1f20, 0x1f45}, {0x1f48, 0x1f4d}, {0x1f50, 0x1f57}, {0x1f59, 0x1f59}, {0x1f5b, 0x1f5b},
-  {0x1f5d, 0x1f5d}, {0x1f5f, 0x1f7d}, {0x1f80, 0x1fb4}, {0x1fb6, 0x1fbc}, {0x1fbe, 0x1fbe}, {0x1fc2, 0x1fc4}, {0x1fc6, 0x1fcc}, {0x1fd0, 0x1fd3},
-  {0x1fd6, 0x1fdb}, {0x1fe0, 0x1fec}, {0x1ff2, 0x1ff4}, {0x1ff6, 0x1ffc}, {0x200c, 0x200d}, {0x203f, 0x2040}, {0x2054, 0x2054}, {0x2071, 0x2071},
-  {0x207f, 0x207f}, {0x2090, 0x209c}, {0x20d0, 0x20dc}, {0x20e1, 0x20e1}, {0x20e5, 0x20f0}, {0x2102, 0x2102}, {0x2107, 0x2107}, {0x210a, 0x2113},
-  {0x2115, 0x2115}, {0x2118, 0x211d}, {0x2124, 0x2124}, {0x2126, 0x2126}, {0x2128, 0x2128}, {0x212a, 0x2139}, {0x213c, 0x213f}, {0x2145, 0x2149},
-  {0x214e, 0x214e}, {0x2160, 0x2188}, {0x2c00, 0x2ce4}, {0x2ceb, 0x2cf3}, {0x2d00, 0x2d25}, {0x2d27, 0x2d27}, {0x2d2d, 0x2d2d}, {0x2d30, 0x2d67},
-  {0x2d6f, 0x2d6f}, {0x2d7f, 0x2d96}, {0x2da0, 0x2da6}, {0x2da8, 0x2dae}, {0x2db0, 0x2db6}, {0x2db8, 0x2dbe}, {0x2dc0, 0x2dc6}, {0x2dc8, 0x2dce},
-  {0x2dd0, 0x2dd6}, {0x2dd8, 0x2dde}, {0x2de0, 0x2dff}, {0x3005, 0x3007}, {0x3021, 0x302f}, {0x3031, 0x3035}, {0x3038, 0x303c}, {0x3041, 0x3096},
-  {0x3099, 0x309a}, {0x309d, 0x309f}, {0x30a1, 0x30ff}, {0x3105, 0x312f}, {0x3131, 0x318e}, {0x31a0, 0x31bf}, {0x31f0, 0x31ff}, {0x3400, 0x4dbf},
-  {0x4e00, 0xa48c}, {0xa4d0, 0xa4fd}, {0xa500, 0xa60c}, {0xa610, 0xa62b}, {0xa640, 0xa66f}, {0xa674, 0xa67d}, {0xa67f, 0xa6f1}, {0xa717, 0xa71f},
-  {0xa722, 0xa788}, {0xa78b, 0xa7cd}, {0xa7d0, 0xa7d1}, {0xa7d3, 0xa7d3}, {0xa7d5, 0xa7dc}, {0xa7f2, 0xa827}, {0xa82c, 0xa82c}, {0xa840, 0xa873},
-  {0xa880, 0xa8c5}, {0xa8d0, 0xa8d9}, {0xa8e0, 0xa8f7}, {0xa8fb, 0xa8fb}, {0xa8fd, 0xa92d}, {0xa930, 0xa953}, {0xa960, 0xa97c}, {0xa980, 0xa9c0},
-  {0xa9cf, 0xa9d9}, {0xa9e0, 0xa9fe}, {0xaa00, 0xaa36}, {0xaa40, 0xaa4d}, {0xaa50, 0xaa59}, {0xaa60, 0xaa76}, {0xaa7a, 0xaac2}, {0xaadb, 0xaadd},
-  {0xaae0, 0xaaef}, {0xaaf2, 0xaaf6}, {0xab01, 0xab06}, {0xab09, 0xab0e}, {0xab11, 0xab16}, {0xab20, 0xab26}, {0xab28, 0xab2e}, {0xab30, 0xab5a},
-  {0xab5c, 0xab69}, {0xab70, 0xabea}, {0xabec, 0xabed}, {0xabf0, 0xabf9}, {0xac00, 0xd7a3}, {0xd7b0, 0xd7c6}, {0xd7cb, 0xd7fb}, {0xf900, 0xfa6d},
-  {0xfa70, 0xfad9}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17}, {0xfb1d, 0xfb28}, {0xfb2a, 0xfb36}, {0xfb38, 0xfb3c}, {0xfb3e, 0xfb3e}, {0xfb40, 0xfb41},
-  {0xfb43, 0xfb44}, {0xfb46, 0xfbb1}, {0xfbd3, 0xfc5d}, {0xfc64, 0xfd3d}, {0xfd50, 0xfd8f}, {0xfd92, 0xfdc7}, {0xfdf0, 0xfdf9}, {0xfe00, 0xfe0f},
-  {0xfe20, 0xfe2f}, {0xfe33, 0xfe34}, {0xfe4d, 0xfe4f}, {0xfe71, 0xfe71}, {0xfe73, 0xfe73}, {0xfe77, 0xfe77}, {0xfe79, 0xfe79}, {0xfe7b, 0xfe7b},
-  {0xfe7d, 0xfe7d}, {0xfe7f, 0xfefc}, {0xff10, 0xff19}, {0xff21, 0xff3a}, {0xff3f, 0xff3f}, {0xff41, 0xff5a}, {0xff65, 0xffbe}, {0xffc2, 0xffc7},
-  {0xffca, 0xffcf}, {0xffd2, 0xffd7}, {0xffda, 0xffdc}, {0x10000, 0x1000b}, {0x1000d, 0x10026}, {0x10028, 0x1003a}, {0x1003c, 0x1003d}, {0x1003f, 0x1004d},
-  {0x10050, 0x1005d}, {0x10080, 0x100fa}, {0x10140, 0x10174}, {0x101fd, 0x101fd}, {0x10280, 0x1029c}, {0x102a0, 0x102d0}, {0x102e0, 0x102e0}, {0x10300, 0x1031f},
-  {0x1032d, 0x1034a}, {0x10350, 0x1037a}, {0x10380, 0x1039d}, {0x103a0, 0x103c3}, {0x103c8, 0x103cf}, {0x103d1, 0x103d5}, {0x10400, 0x1049d}, {0x104a0, 0x104a9},
-  {0x104b0, 0x104d3}, {0x104d8, 0x104fb}, {0x10500, 0x10527}, {0x10530, 0x10563}, {0x10570, 0x1057a}, {0x1057c, 0x1058a}, {0x1058c, 0x10592}, {0x10594, 0x10595},
-  {0x10597, 0x105a1}, {0x105a3, 0x105b1}, {0x105b3, 0x105b9}, {0x105bb, 0x105bc}, {0x105c0, 0x105f3}, {0x10600, 0x10736}, {0x10740, 0x10755}, {0x10760, 0x10767},
-  {0x10780, 0x10785}, {0x10787, 0x107b0}, {0x107b2, 0x107ba}, {0x10800, 0x10805}, {0x10808, 0x10808}, {0x1080a, 0x10835}, {0x10837, 0x10838}, {0x1083c, 0x1083c},
-  {0x1083f, 0x10855}, {0x10860, 0x10876}, {0x10880, 0x1089e}, {0x108e0, 0x108f2}, {0x108f4, 0x108f5}, {0x10900, 0x10915}, {0x10920, 0x10939}, {0x10980, 0x109b7},
-  {0x109be, 0x109bf}, {0x10a00, 0x10a03}, {0x10a05, 0x10a06}, {0x10a0c, 0x10a13}, {0x10a15, 0x10a17}, {0x10a19, 0x10a35}, {0x10a38, 0x10a3a}, {0x10a3f, 0x10a3f},
-  {0x10a60, 0x10a7c}, {0x10a80, 0x10a9c}, {0x10ac0, 0x10ac7}, {0x10ac9, 0x10ae6}, {0x10b00, 0x10b35}, {0x10b40, 0x10b55}, {0x10b60, 0x10b72}, {0x10b80, 0x10b91},
-  {0x10c00, 0x10c48}, {0x10c80, 0x10cb2}, {0x10cc0, 0x10cf2}, {0x10d00, 0x10d27}, {0x10d30, 0x10d39}, {0x10d40, 0x10d65}, {0x10d69, 0x10d6d}, {0x10d6f, 0x10d85},
-  {0x10e80, 0x10ea9}, {0x10eab, 0x10eac}, {0x10eb0, 0x10eb1}, {0x10ec2, 0x10ec4}, {0x10efc, 0x10f1c}, {0x10f27, 0x10f27}, {0x10f30, 0x10f50}, {0x10f70, 0x10f85},
-  {0x10fb0, 0x10fc4}, {0x10fe0, 0x10ff6}, {0x11000, 0x11046}, {0x11066, 0x11075}, {0x1107f, 0x110ba}, {0x110c2, 0x110c2}, {0x110d0, 0x110e8}, {0x110f0, 0x110f9},
-  {0x11100, 0x11134}, {0x11136, 0x1113f}, {0x11144, 0x11147}, {0x11150, 0x11173}, {0x11176, 0x11176}, {0x11180, 0x111c4}, {0x111c9, 0x111cc}, {0x111ce, 0x111da},
-  {0x111dc, 0x111dc}, {0x11200, 0x11211}, {0x11213, 0x11237}, {0x1123e, 0x11241}, {0x11280, 0x11286}, {0x11288, 0x11288}, {0x1128a, 0x1128d}, {0x1128f, 0x1129d},
-  {0x1129f, 0x112a8}, {0x112b0, 0x112ea}, {0x112f0, 0x112f9}, {0x11300, 0x11303}, {0x11305, 0x1130c}, {0x1130f, 0x11310}, {0x11313, 0x11328}, {0x1132a, 0x11330},
-  {0x11332, 0x11333}, {0x11335, 0x11339}, {0x1133b, 0x11344}, {0x11347, 0x11348}, {0x1134b, 0x1134d}, {0x11350, 0x11350}, {0x11357, 0x11357}, {0x1135d, 0x11363},
-  {0x11366, 0x1136c}, {0x11370, 0x11374}, {0x11380, 0x11389}, {0x1138b, 0x1138b}, {0x1138e, 0x1138e}, {0x11390, 0x113b5}, {0x113b7, 0x113c0}, {0x113c2, 0x113c2},
-  {0x113c5, 0x113c5}, {0x113c7, 0x113ca}, {0x113cc, 0x113d3}, {0x113e1, 0x113e2}, {0x11400, 0x1144a}, {0x11450, 0x11459}, {0x1145e, 0x11461}, {0x11480, 0x114c5},
-  {0x114c7, 0x114c7}, {0x114d0, 0x114d9}, {0x11580, 0x115b5}, {0x115b8, 0x115c0}, {0x115d8, 0x115dd}, {0x11600, 0x11640}, {0x11644, 0x11644}, {0x11650, 0x11659},
-  {0x11680, 0x116b8}, {0x116c0, 0x116c9}, {0x116d0, 0x116e3}, {0x11700, 0x1171a}, {0x1171d, 0x1172b}, {0x11730, 0x11739}, {0x11740, 0x11746}, {0x11800, 0x1183a},
-  {0x118a0, 0x118e9}, {0x118ff, 0x11906}, {0x11909, 0x11909}, {0x1190c, 0x11913}, {0x11915, 0x11916}, {0x11918, 0x11935}, {0x11937, 0x11938}, {0x1193b, 0x11943},
-  {0x11950, 0x11959}, {0x119a0, 0x119a7}, {0x119aa, 0x119d7}, {0x119da, 0x119e1}, {0x119e3, 0x119e4}, {0x11a00, 0x11a3e}, {0x11a47, 0x11a47}, {0x11a50, 0x11a99},
-  {0x11a9d, 0x11a9d}, {0x11ab0, 0x11af8}, {0x11bc0, 0x11be0}, {0x11bf0, 0x11bf9}, {0x11c00, 0x11c08}, {0x11c0a, 0x11c36}, {0x11c38, 0x11c40}, {0x11c50, 0x11c59},
+  {0x1a7f, 0x1a89}, {0x1a90, 0x1a99}, {0x1aa7, 0x1aa7}, {0x1ab0, 0x1abd}, {0x1abf, 0x1add}, {0x1ae0, 0x1aeb}, {0x1b00, 0x1b4c}, {0x1b50, 0x1b59},
+  {0x1b6b, 0x1b73}, {0x1b80, 0x1bf3}, {0x1c00, 0x1c37}, {0x1c40, 0x1c49}, {0x1c4d, 0x1c7d}, {0x1c80, 0x1c8a}, {0x1c90, 0x1cba}, {0x1cbd, 0x1cbf},
+  {0x1cd0, 0x1cd2}, {0x1cd4, 0x1cfa}, {0x1d00, 0x1f15}, {0x1f18, 0x1f1d}, {0x1f20, 0x1f45}, {0x1f48, 0x1f4d}, {0x1f50, 0x1f57}, {0x1f59, 0x1f59},
+  {0x1f5b, 0x1f5b}, {0x1f5d, 0x1f5d}, {0x1f5f, 0x1f7d}, {0x1f80, 0x1fb4}, {0x1fb6, 0x1fbc}, {0x1fbe, 0x1fbe}, {0x1fc2, 0x1fc4}, {0x1fc6, 0x1fcc},
+  {0x1fd0, 0x1fd3}, {0x1fd6, 0x1fdb}, {0x1fe0, 0x1fec}, {0x1ff2, 0x1ff4}, {0x1ff6, 0x1ffc}, {0x200c, 0x200d}, {0x203f, 0x2040}, {0x2054, 0x2054},
+  {0x2071, 0x2071}, {0x207f, 0x207f}, {0x2090, 0x209c}, {0x20d0, 0x20dc}, {0x20e1, 0x20e1}, {0x20e5, 0x20f0}, {0x2102, 0x2102}, {0x2107, 0x2107},
+  {0x210a, 0x2113}, {0x2115, 0x2115}, {0x2118, 0x211d}, {0x2124, 0x2124}, {0x2126, 0x2126}, {0x2128, 0x2128}, {0x212a, 0x2139}, {0x213c, 0x213f},
+  {0x2145, 0x2149}, {0x214e, 0x214e}, {0x2160, 0x2188}, {0x2c00, 0x2ce4}, {0x2ceb, 0x2cf3}, {0x2d00, 0x2d25}, {0x2d27, 0x2d27}, {0x2d2d, 0x2d2d},
+  {0x2d30, 0x2d67}, {0x2d6f, 0x2d6f}, {0x2d7f, 0x2d96}, {0x2da0, 0x2da6}, {0x2da8, 0x2dae}, {0x2db0, 0x2db6}, {0x2db8, 0x2dbe}, {0x2dc0, 0x2dc6},
+  {0x2dc8, 0x2dce}, {0x2dd0, 0x2dd6}, {0x2dd8, 0x2dde}, {0x2de0, 0x2dff}, {0x3005, 0x3007}, {0x3021, 0x302f}, {0x3031, 0x3035}, {0x3038, 0x303c},
+  {0x3041, 0x3096}, {0x3099, 0x309a}, {0x309d, 0x309f}, {0x30a1, 0x30ff}, {0x3105, 0x312f}, {0x3131, 0x318e}, {0x31a0, 0x31bf}, {0x31f0, 0x31ff},
+  {0x3400, 0x4dbf}, {0x4e00, 0xa48c}, {0xa4d0, 0xa4fd}, {0xa500, 0xa60c}, {0xa610, 0xa62b}, {0xa640, 0xa66f}, {0xa674, 0xa67d}, {0xa67f, 0xa6f1},
+  {0xa717, 0xa71f}, {0xa722, 0xa788}, {0xa78b, 0xa7dc}, {0xa7f1, 0xa827}, {0xa82c, 0xa82c}, {0xa840, 0xa873}, {0xa880, 0xa8c5}, {0xa8d0, 0xa8d9},
+  {0xa8e0, 0xa8f7}, {0xa8fb, 0xa8fb}, {0xa8fd, 0xa92d}, {0xa930, 0xa953}, {0xa960, 0xa97c}, {0xa980, 0xa9c0}, {0xa9cf, 0xa9d9}, {0xa9e0, 0xa9fe},
+  {0xaa00, 0xaa36}, {0xaa40, 0xaa4d}, {0xaa50, 0xaa59}, {0xaa60, 0xaa76}, {0xaa7a, 0xaac2}, {0xaadb, 0xaadd}, {0xaae0, 0xaaef}, {0xaaf2, 0xaaf6},
+  {0xab01, 0xab06}, {0xab09, 0xab0e}, {0xab11, 0xab16}, {0xab20, 0xab26}, {0xab28, 0xab2e}, {0xab30, 0xab5a}, {0xab5c, 0xab69}, {0xab70, 0xabea},
+  {0xabec, 0xabed}, {0xabf0, 0xabf9}, {0xac00, 0xd7a3}, {0xd7b0, 0xd7c6}, {0xd7cb, 0xd7fb}, {0xf900, 0xfa6d}, {0xfa70, 0xfad9}, {0xfb00, 0xfb06},
+  {0xfb13, 0xfb17}, {0xfb1d, 0xfb28}, {0xfb2a, 0xfb36}, {0xfb38, 0xfb3c}, {0xfb3e, 0xfb3e}, {0xfb40, 0xfb41}, {0xfb43, 0xfb44}, {0xfb46, 0xfbb1},
+  {0xfbd3, 0xfc5d}, {0xfc64, 0xfd3d}, {0xfd50, 0xfd8f}, {0xfd92, 0xfdc7}, {0xfdf0, 0xfdf9}, {0xfe00, 0xfe0f}, {0xfe20, 0xfe2f}, {0xfe33, 0xfe34},
+  {0xfe4d, 0xfe4f}, {0xfe71, 0xfe71}, {0xfe73, 0xfe73}, {0xfe77, 0xfe77}, {0xfe79, 0xfe79}, {0xfe7b, 0xfe7b}, {0xfe7d, 0xfe7d}, {0xfe7f, 0xfefc},
+  {0xff10, 0xff19}, {0xff21, 0xff3a}, {0xff3f, 0xff3f}, {0xff41, 0xff5a}, {0xff65, 0xffbe}, {0xffc2, 0xffc7}, {0xffca, 0xffcf}, {0xffd2, 0xffd7},
+  {0xffda, 0xffdc}, {0x10000, 0x1000b}, {0x1000d, 0x10026}, {0x10028, 0x1003a}, {0x1003c, 0x1003d}, {0x1003f, 0x1004d}, {0x10050, 0x1005d}, {0x10080, 0x100fa},
+  {0x10140, 0x10174}, {0x101fd, 0x101fd}, {0x10280, 0x1029c}, {0x102a0, 0x102d0}, {0x102e0, 0x102e0}, {0x10300, 0x1031f}, {0x1032d, 0x1034a}, {0x10350, 0x1037a},
+  {0x10380, 0x1039d}, {0x103a0, 0x103c3}, {0x103c8, 0x103cf}, {0x103d1, 0x103d5}, {0x10400, 0x1049d}, {0x104a0, 0x104a9}, {0x104b0, 0x104d3}, {0x104d8, 0x104fb},
+  {0x10500, 0x10527}, {0x10530, 0x10563}, {0x10570, 0x1057a}, {0x1057c, 0x1058a}, {0x1058c, 0x10592}, {0x10594, 0x10595}, {0x10597, 0x105a1}, {0x105a3, 0x105b1},
+  {0x105b3, 0x105b9}, {0x105bb, 0x105bc}, {0x105c0, 0x105f3}, {0x10600, 0x10736}, {0x10740, 0x10755}, {0x10760, 0x10767}, {0x10780, 0x10785}, {0x10787, 0x107b0},
+  {0x107b2, 0x107ba}, {0x10800, 0x10805}, {0x10808, 0x10808}, {0x1080a, 0x10835}, {0x10837, 0x10838}, {0x1083c, 0x1083c}, {0x1083f, 0x10855}, {0x10860, 0x10876},
+  {0x10880, 0x1089e}, {0x108e0, 0x108f2}, {0x108f4, 0x108f5}, {0x10900, 0x10915}, {0x10920, 0x10939}, {0x10940, 0x10959}, {0x10980, 0x109b7}, {0x109be, 0x109bf},
+  {0x10a00, 0x10a03}, {0x10a05, 0x10a06}, {0x10a0c, 0x10a13}, {0x10a15, 0x10a17}, {0x10a19, 0x10a35}, {0x10a38, 0x10a3a}, {0x10a3f, 0x10a3f}, {0x10a60, 0x10a7c},
+  {0x10a80, 0x10a9c}, {0x10ac0, 0x10ac7}, {0x10ac9, 0x10ae6}, {0x10b00, 0x10b35}, {0x10b40, 0x10b55}, {0x10b60, 0x10b72}, {0x10b80, 0x10b91}, {0x10c00, 0x10c48},
+  {0x10c80, 0x10cb2}, {0x10cc0, 0x10cf2}, {0x10d00, 0x10d27}, {0x10d30, 0x10d39}, {0x10d40, 0x10d65}, {0x10d69, 0x10d6d}, {0x10d6f, 0x10d85}, {0x10e80, 0x10ea9},
+  {0x10eab, 0x10eac}, {0x10eb0, 0x10eb1}, {0x10ec2, 0x10ec7}, {0x10efa, 0x10f1c}, {0x10f27, 0x10f27}, {0x10f30, 0x10f50}, {0x10f70, 0x10f85}, {0x10fb0, 0x10fc4},
+  {0x10fe0, 0x10ff6}, {0x11000, 0x11046}, {0x11066, 0x11075}, {0x1107f, 0x110ba}, {0x110c2, 0x110c2}, {0x110d0, 0x110e8}, {0x110f0, 0x110f9}, {0x11100, 0x11134},
+  {0x11136, 0x1113f}, {0x11144, 0x11147}, {0x11150, 0x11173}, {0x11176, 0x11176}, {0x11180, 0x111c4}, {0x111c9, 0x111cc}, {0x111ce, 0x111da}, {0x111dc, 0x111dc},
+  {0x11200, 0x11211}, {0x11213, 0x11237}, {0x1123e, 0x11241}, {0x11280, 0x11286}, {0x11288, 0x11288}, {0x1128a, 0x1128d}, {0x1128f, 0x1129d}, {0x1129f, 0x112a8},
+  {0x112b0, 0x112ea}, {0x112f0, 0x112f9}, {0x11300, 0x11303}, {0x11305, 0x1130c}, {0x1130f, 0x11310}, {0x11313, 0x11328}, {0x1132a, 0x11330}, {0x11332, 0x11333},
+  {0x11335, 0x11339}, {0x1133b, 0x11344}, {0x11347, 0x11348}, {0x1134b, 0x1134d}, {0x11350, 0x11350}, {0x11357, 0x11357}, {0x1135d, 0x11363}, {0x11366, 0x1136c},
+  {0x11370, 0x11374}, {0x11380, 0x11389}, {0x1138b, 0x1138b}, {0x1138e, 0x1138e}, {0x11390, 0x113b5}, {0x113b7, 0x113c0}, {0x113c2, 0x113c2}, {0x113c5, 0x113c5},
+  {0x113c7, 0x113ca}, {0x113cc, 0x113d3}, {0x113e1, 0x113e2}, {0x11400, 0x1144a}, {0x11450, 0x11459}, {0x1145e, 0x11461}, {0x11480, 0x114c5}, {0x114c7, 0x114c7},
+  {0x114d0, 0x114d9}, {0x11580, 0x115b5}, {0x115b8, 0x115c0}, {0x115d8, 0x115dd}, {0x11600, 0x11640}, {0x11644, 0x11644}, {0x11650, 0x11659}, {0x11680, 0x116b8},
+  {0x116c0, 0x116c9}, {0x116d0, 0x116e3}, {0x11700, 0x1171a}, {0x1171d, 0x1172b}, {0x11730, 0x11739}, {0x11740, 0x11746}, {0x11800, 0x1183a}, {0x118a0, 0x118e9},
+  {0x118ff, 0x11906}, {0x11909, 0x11909}, {0x1190c, 0x11913}, {0x11915, 0x11916}, {0x11918, 0x11935}, {0x11937, 0x11938}, {0x1193b, 0x11943}, {0x11950, 0x11959},
+  {0x119a0, 0x119a7}, {0x119aa, 0x119d7}, {0x119da, 0x119e1}, {0x119e3, 0x119e4}, {0x11a00, 0x11a3e}, {0x11a47, 0x11a47}, {0x11a50, 0x11a99}, {0x11a9d, 0x11a9d},
+  {0x11ab0, 0x11af8}, {0x11b60, 0x11b67}, {0x11bc0, 0x11be0}, {0x11bf0, 0x11bf9}, {0x11c00, 0x11c08}, {0x11c0a, 0x11c36}, {0x11c38, 0x11c40}, {0x11c50, 0x11c59},
   {0x11c72, 0x11c8f}, {0x11c92, 0x11ca7}, {0x11ca9, 0x11cb6}, {0x11d00, 0x11d06}, {0x11d08, 0x11d09}, {0x11d0b, 0x11d36}, {0x11d3a, 0x11d3a}, {0x11d3c, 0x11d3d},
   {0x11d3f, 0x11d47}, {0x11d50, 0x11d59}, {0x11d60, 0x11d65}, {0x11d67, 0x11d68}, {0x11d6a, 0x11d8e}, {0x11d90, 0x11d91}, {0x11d93, 0x11d98}, {0x11da0, 0x11da9},
-  {0x11ee0, 0x11ef6}, {0x11f00, 0x11f10}, {0x11f12, 0x11f3a}, {0x11f3e, 0x11f42}, {0x11f50, 0x11f5a}, {0x11fb0, 0x11fb0}, {0x12000, 0x12399}, {0x12400, 0x1246e},
-  {0x12480, 0x12543}, {0x12f90, 0x12ff0}, {0x13000, 0x1342f}, {0x13440, 0x13455}, {0x13460, 0x143fa}, {0x14400, 0x14646}, {0x16100, 0x16139}, {0x16800, 0x16a38},
-  {0x16a40, 0x16a5e}, {0x16a60, 0x16a69}, {0x16a70, 0x16abe}, {0x16ac0, 0x16ac9}, {0x16ad0, 0x16aed}, {0x16af0, 0x16af4}, {0x16b00, 0x16b36}, {0x16b40, 0x16b43},
-  {0x16b50, 0x16b59}, {0x16b63, 0x16b77}, {0x16b7d, 0x16b8f}, {0x16d40, 0x16d6c}, {0x16d70, 0x16d79}, {0x16e40, 0x16e7f}, {0x16f00, 0x16f4a}, {0x16f4f, 0x16f87},
-  {0x16f8f, 0x16f9f}, {0x16fe0, 0x16fe1}, {0x16fe3, 0x16fe4}, {0x16ff0, 0x16ff1}, {0x17000, 0x187f7}, {0x18800, 0x18cd5}, {0x18cff, 0x18d08}, {0x1aff0, 0x1aff3},
-  {0x1aff5, 0x1affb}, {0x1affd, 0x1affe}, {0x1b000, 0x1b122}, {0x1b132, 0x1b132}, {0x1b150, 0x1b152}, {0x1b155, 0x1b155}, {0x1b164, 0x1b167}, {0x1b170, 0x1b2fb},
-  {0x1bc00, 0x1bc6a}, {0x1bc70, 0x1bc7c}, {0x1bc80, 0x1bc88}, {0x1bc90, 0x1bc99}, {0x1bc9d, 0x1bc9e}, {0x1ccf0, 0x1ccf9}, {0x1cf00, 0x1cf2d}, {0x1cf30, 0x1cf46},
-  {0x1d165, 0x1d169}, {0x1d16d, 0x1d172}, {0x1d17b, 0x1d182}, {0x1d185, 0x1d18b}, {0x1d1aa, 0x1d1ad}, {0x1d242, 0x1d244}, {0x1d400, 0x1d454}, {0x1d456, 0x1d49c},
-  {0x1d49e, 0x1d49f}, {0x1d4a2, 0x1d4a2}, {0x1d4a5, 0x1d4a6}, {0x1d4a9, 0x1d4ac}, {0x1d4ae, 0x1d4b9}, {0x1d4bb, 0x1d4bb}, {0x1d4bd, 0x1d4c3}, {0x1d4c5, 0x1d505},
-  {0x1d507, 0x1d50a}, {0x1d50d, 0x1d514}, {0x1d516, 0x1d51c}, {0x1d51e, 0x1d539}, {0x1d53b, 0x1d53e}, {0x1d540, 0x1d544}, {0x1d546, 0x1d546}, {0x1d54a, 0x1d550},
-  {0x1d552, 0x1d6a5}, {0x1d6a8, 0x1d6c0}, {0x1d6c2, 0x1d6da}, {0x1d6dc, 0x1d6fa}, {0x1d6fc, 0x1d714}, {0x1d716, 0x1d734}, {0x1d736, 0x1d74e}, {0x1d750, 0x1d76e},
-  {0x1d770, 0x1d788}, {0x1d78a, 0x1d7a8}, {0x1d7aa, 0x1d7c2}, {0x1d7c4, 0x1d7cb}, {0x1d7ce, 0x1d7ff}, {0x1da00, 0x1da36}, {0x1da3b, 0x1da6c}, {0x1da75, 0x1da75},
-  {0x1da84, 0x1da84}, {0x1da9b, 0x1da9f}, {0x1daa1, 0x1daaf}, {0x1df00, 0x1df1e}, {0x1df25, 0x1df2a}, {0x1e000, 0x1e006}, {0x1e008, 0x1e018}, {0x1e01b, 0x1e021},
-  {0x1e023, 0x1e024}, {0x1e026, 0x1e02a}, {0x1e030, 0x1e06d}, {0x1e08f, 0x1e08f}, {0x1e100, 0x1e12c}, {0x1e130, 0x1e13d}, {0x1e140, 0x1e149}, {0x1e14e, 0x1e14e},
-  {0x1e290, 0x1e2ae}, {0x1e2c0, 0x1e2f9}, {0x1e4d0, 0x1e4f9}, {0x1e5d0, 0x1e5fa}, {0x1e7e0, 0x1e7e6}, {0x1e7e8, 0x1e7eb}, {0x1e7ed, 0x1e7ee}, {0x1e7f0, 0x1e7fe},
-  {0x1e800, 0x1e8c4}, {0x1e8d0, 0x1e8d6}, {0x1e900, 0x1e94b}, {0x1e950, 0x1e959}, {0x1ee00, 0x1ee03}, {0x1ee05, 0x1ee1f}, {0x1ee21, 0x1ee22}, {0x1ee24, 0x1ee24},
-  {0x1ee27, 0x1ee27}, {0x1ee29, 0x1ee32}, {0x1ee34, 0x1ee37}, {0x1ee39, 0x1ee39}, {0x1ee3b, 0x1ee3b}, {0x1ee42, 0x1ee42}, {0x1ee47, 0x1ee47}, {0x1ee49, 0x1ee49},
-  {0x1ee4b, 0x1ee4b}, {0x1ee4d, 0x1ee4f}, {0x1ee51, 0x1ee52}, {0x1ee54, 0x1ee54}, {0x1ee57, 0x1ee57}, {0x1ee59, 0x1ee59}, {0x1ee5b, 0x1ee5b}, {0x1ee5d, 0x1ee5d},
-  {0x1ee5f, 0x1ee5f}, {0x1ee61, 0x1ee62}, {0x1ee64, 0x1ee64}, {0x1ee67, 0x1ee6a}, {0x1ee6c, 0x1ee72}, {0x1ee74, 0x1ee77}, {0x1ee79, 0x1ee7c}, {0x1ee7e, 0x1ee7e},
-  {0x1ee80, 0x1ee89}, {0x1ee8b, 0x1ee9b}, {0x1eea1, 0x1eea3}, {0x1eea5, 0x1eea9}, {0x1eeab, 0x1eebb}, {0x1fbf0, 0x1fbf9}, {0x20000, 0x2a6df}, {0x2a700, 0x2b739},
-  {0x2b740, 0x2b81d}, {0x2b820, 0x2cea1}, {0x2ceb0, 0x2ebe0}, {0x2ebf0, 0x2ee5d}, {0x2f800, 0x2fa1d}, {0x30000, 0x3134a}, {0x31350, 0x323af}, {0xe0100, 0xe01ef},
+  {0x11db0, 0x11ddb}, {0x11de0, 0x11de9}, {0x11ee0, 0x11ef6}, {0x11f00, 0x11f10}, {0x11f12, 0x11f3a}, {0x11f3e, 0x11f42}, {0x11f50, 0x11f5a}, {0x11fb0, 0x11fb0},
+  {0x12000, 0x12399}, {0x12400, 0x1246e}, {0x12480, 0x12543}, {0x12f90, 0x12ff0}, {0x13000, 0x1342f}, {0x13440, 0x13455}, {0x13460, 0x143fa}, {0x14400, 0x14646},
+  {0x16100, 0x16139}, {0x16800, 0x16a38}, {0x16a40, 0x16a5e}, {0x16a60, 0x16a69}, {0x16a70, 0x16abe}, {0x16ac0, 0x16ac9}, {0x16ad0, 0x16aed}, {0x16af0, 0x16af4},
+  {0x16b00, 0x16b36}, {0x16b40, 0x16b43}, {0x16b50, 0x16b59}, {0x16b63, 0x16b77}, {0x16b7d, 0x16b8f}, {0x16d40, 0x16d6c}, {0x16d70, 0x16d79}, {0x16e40, 0x16e7f},
+  {0x16ea0, 0x16eb8}, {0x16ebb, 0x16ed3}, {0x16f00, 0x16f4a}, {0x16f4f, 0x16f87}, {0x16f8f, 0x16f9f}, {0x16fe0, 0x16fe1}, {0x16fe3, 0x16fe4}, {0x16ff0, 0x16ff6},
+  {0x17000, 0x18cd5}, {0x18cff, 0x18d1e}, {0x18d80, 0x18df2}, {0x1aff0, 0x1aff3}, {0x1aff5, 0x1affb}, {0x1affd, 0x1affe}, {0x1b000, 0x1b122}, {0x1b132, 0x1b132},
+  {0x1b150, 0x1b152}, {0x1b155, 0x1b155}, {0x1b164, 0x1b167}, {0x1b170, 0x1b2fb}, {0x1bc00, 0x1bc6a}, {0x1bc70, 0x1bc7c}, {0x1bc80, 0x1bc88}, {0x1bc90, 0x1bc99},
+  {0x1bc9d, 0x1bc9e}, {0x1ccf0, 0x1ccf9}, {0x1cf00, 0x1cf2d}, {0x1cf30, 0x1cf46}, {0x1d165, 0x1d169}, {0x1d16d, 0x1d172}, {0x1d17b, 0x1d182}, {0x1d185, 0x1d18b},
+  {0x1d1aa, 0x1d1ad}, {0x1d242, 0x1d244}, {0x1d400, 0x1d454}, {0x1d456, 0x1d49c}, {0x1d49e, 0x1d49f}, {0x1d4a2, 0x1d4a2}, {0x1d4a5, 0x1d4a6}, {0x1d4a9, 0x1d4ac},
+  {0x1d4ae, 0x1d4b9}, {0x1d4bb, 0x1d4bb}, {0x1d4bd, 0x1d4c3}, {0x1d4c5, 0x1d505}, {0x1d507, 0x1d50a}, {0x1d50d, 0x1d514}, {0x1d516, 0x1d51c}, {0x1d51e, 0x1d539},
+  {0x1d53b, 0x1d53e}, {0x1d540, 0x1d544}, {0x1d546, 0x1d546}, {0x1d54a, 0x1d550}, {0x1d552, 0x1d6a5}, {0x1d6a8, 0x1d6c0}, {0x1d6c2, 0x1d6da}, {0x1d6dc, 0x1d6fa},
+  {0x1d6fc, 0x1d714}, {0x1d716, 0x1d734}, {0x1d736, 0x1d74e}, {0x1d750, 0x1d76e}, {0x1d770, 0x1d788}, {0x1d78a, 0x1d7a8}, {0x1d7aa, 0x1d7c2}, {0x1d7c4, 0x1d7cb},
+  {0x1d7ce, 0x1d7ff}, {0x1da00, 0x1da36}, {0x1da3b, 0x1da6c}, {0x1da75, 0x1da75}, {0x1da84, 0x1da84}, {0x1da9b, 0x1da9f}, {0x1daa1, 0x1daaf}, {0x1df00, 0x1df1e},
+  {0x1df25, 0x1df2a}, {0x1e000, 0x1e006}, {0x1e008, 0x1e018}, {0x1e01b, 0x1e021}, {0x1e023, 0x1e024}, {0x1e026, 0x1e02a}, {0x1e030, 0x1e06d}, {0x1e08f, 0x1e08f},
+  {0x1e100, 0x1e12c}, {0x1e130, 0x1e13d}, {0x1e140, 0x1e149}, {0x1e14e, 0x1e14e}, {0x1e290, 0x1e2ae}, {0x1e2c0, 0x1e2f9}, {0x1e4d0, 0x1e4f9}, {0x1e5d0, 0x1e5fa},
+  {0x1e6c0, 0x1e6de}, {0x1e6e0, 0x1e6f5}, {0x1e6fe, 0x1e6ff}, {0x1e7e0, 0x1e7e6}, {0x1e7e8, 0x1e7eb}, {0x1e7ed, 0x1e7ee}, {0x1e7f0, 0x1e7fe}, {0x1e800, 0x1e8c4},
+  {0x1e8d0, 0x1e8d6}, {0x1e900, 0x1e94b}, {0x1e950, 0x1e959}, {0x1ee00, 0x1ee03}, {0x1ee05, 0x1ee1f}, {0x1ee21, 0x1ee22}, {0x1ee24, 0x1ee24}, {0x1ee27, 0x1ee27},
+  {0x1ee29, 0x1ee32}, {0x1ee34, 0x1ee37}, {0x1ee39, 0x1ee39}, {0x1ee3b, 0x1ee3b}, {0x1ee42, 0x1ee42}, {0x1ee47, 0x1ee47}, {0x1ee49, 0x1ee49}, {0x1ee4b, 0x1ee4b},
+  {0x1ee4d, 0x1ee4f}, {0x1ee51, 0x1ee52}, {0x1ee54, 0x1ee54}, {0x1ee57, 0x1ee57}, {0x1ee59, 0x1ee59}, {0x1ee5b, 0x1ee5b}, {0x1ee5d, 0x1ee5d}, {0x1ee5f, 0x1ee5f},
+  {0x1ee61, 0x1ee62}, {0x1ee64, 0x1ee64}, {0x1ee67, 0x1ee6a}, {0x1ee6c, 0x1ee72}, {0x1ee74, 0x1ee77}, {0x1ee79, 0x1ee7c}, {0x1ee7e, 0x1ee7e}, {0x1ee80, 0x1ee89},
+  {0x1ee8b, 0x1ee9b}, {0x1eea1, 0x1eea3}, {0x1eea5, 0x1eea9}, {0x1eeab, 0x1eebb}, {0x1fbf0, 0x1fbf9}, {0x20000, 0x2a6df}, {0x2a700, 0x2b81d}, {0x2b820, 0x2cead},
+  {0x2ceb0, 0x2ebe0}, {0x2ebf0, 0x2ee5d}, {0x2f800, 0x2fa1d}, {0x30000, 0x3134a}, {0x31350, 0x33479}, {0xe0100, 0xe01ef},
 };
 
 static bool ts_lex(TSLexer *lexer, TSStateId state) {
@@ -5074,7 +5080,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 0x2060 ||
           lookahead == 0xfeff) SKIP(50);
       if (('1' <= lookahead && lookahead <= '9')) ADVANCE(130);
-      if (set_contains(sym_identifier_character_set_1, 685, lookahead)) ADVANCE(140);
+      if (set_contains(sym_identifier_character_set_1, 692, lookahead)) ADVANCE(140);
       END_STATE();
     case 1:
       if (lookahead == '\n') SKIP(14);
@@ -5175,7 +5181,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 0x2060 ||
           lookahead == 0xfeff) SKIP(14);
       if (('1' <= lookahead && lookahead <= '9')) ADVANCE(130);
-      if (set_contains(sym_identifier_character_set_1, 685, lookahead)) ADVANCE(140);
+      if (set_contains(sym_identifier_character_set_1, 692, lookahead)) ADVANCE(140);
       END_STATE();
     case 15:
       ADVANCE_MAP(
@@ -5208,7 +5214,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 0x200b ||
           lookahead == 0x2060 ||
           lookahead == 0xfeff) SKIP(15);
-      if (set_contains(sym_identifier_character_set_1, 685, lookahead)) ADVANCE(140);
+      if (set_contains(sym_identifier_character_set_1, 692, lookahead)) ADVANCE(140);
       END_STATE();
     case 16:
       ADVANCE_MAP(
@@ -5242,7 +5248,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 0x200b ||
           lookahead == 0x2060 ||
           lookahead == 0xfeff) SKIP(16);
-      if (set_contains(sym_identifier_character_set_1, 685, lookahead)) ADVANCE(140);
+      if (set_contains(sym_identifier_character_set_1, 692, lookahead)) ADVANCE(140);
       END_STATE();
     case 17:
       if (lookahead == '#') ADVANCE(141);
@@ -5438,7 +5444,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 0x2060 ||
           lookahead == 0xfeff) SKIP(50);
       if (('1' <= lookahead && lookahead <= '9')) ADVANCE(130);
-      if (set_contains(sym_identifier_character_set_1, 685, lookahead)) ADVANCE(140);
+      if (set_contains(sym_identifier_character_set_1, 692, lookahead)) ADVANCE(140);
       END_STATE();
     case 51:
       if (eof) ADVANCE(52);
@@ -5477,7 +5483,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 0x2060 ||
           lookahead == 0xfeff) SKIP(51);
       if (('1' <= lookahead && lookahead <= '9')) ADVANCE(130);
-      if (set_contains(sym_identifier_character_set_1, 685, lookahead)) ADVANCE(140);
+      if (set_contains(sym_identifier_character_set_1, 692, lookahead)) ADVANCE(140);
       END_STATE();
     case 52:
       ACCEPT_TOKEN(ts_builtin_sym_end);
@@ -5896,7 +5902,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 140:
       ACCEPT_TOKEN(sym_identifier);
-      if (set_contains(sym_identifier_character_set_2, 800, lookahead)) ADVANCE(140);
+      if (set_contains(sym_identifier_character_set_2, 806, lookahead)) ADVANCE(140);
       END_STATE();
     case 141:
       ACCEPT_TOKEN(sym_comment);
@@ -6530,9 +6536,9 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [59] = {.lex_state = 51, .external_lex_state = 3},
   [60] = {.lex_state = 51, .external_lex_state = 3},
   [61] = {.lex_state = 51, .external_lex_state = 3},
-  [62] = {.lex_state = 51, .external_lex_state = 3},
+  [62] = {.lex_state = 51, .external_lex_state = 2},
   [63] = {.lex_state = 51, .external_lex_state = 3},
-  [64] = {.lex_state = 51, .external_lex_state = 2},
+  [64] = {.lex_state = 51, .external_lex_state = 3},
   [65] = {.lex_state = 51, .external_lex_state = 2},
   [66] = {.lex_state = 51, .external_lex_state = 4},
   [67] = {.lex_state = 51, .external_lex_state = 4},
@@ -6545,8 +6551,8 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [74] = {.lex_state = 51, .external_lex_state = 5},
   [75] = {.lex_state = 51, .external_lex_state = 5},
   [76] = {.lex_state = 51, .external_lex_state = 5},
-  [77] = {.lex_state = 51, .external_lex_state = 5},
-  [78] = {.lex_state = 51, .external_lex_state = 4},
+  [77] = {.lex_state = 51, .external_lex_state = 4},
+  [78] = {.lex_state = 51, .external_lex_state = 5},
   [79] = {.lex_state = 51, .external_lex_state = 5},
   [80] = {.lex_state = 51, .external_lex_state = 5},
   [81] = {.lex_state = 51, .external_lex_state = 5},
@@ -6607,18 +6613,18 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [136] = {.lex_state = 51, .external_lex_state = 2},
   [137] = {.lex_state = 51, .external_lex_state = 2},
   [138] = {.lex_state = 51, .external_lex_state = 2},
-  [139] = {.lex_state = 14, .external_lex_state = 2},
-  [140] = {.lex_state = 51, .external_lex_state = 4},
-  [141] = {.lex_state = 51, .external_lex_state = 2},
+  [139] = {.lex_state = 51, .external_lex_state = 4},
+  [140] = {.lex_state = 51, .external_lex_state = 2},
+  [141] = {.lex_state = 14, .external_lex_state = 2},
   [142] = {.lex_state = 51, .external_lex_state = 2},
   [143] = {.lex_state = 51, .external_lex_state = 2},
   [144] = {.lex_state = 51, .external_lex_state = 2},
   [145] = {.lex_state = 51, .external_lex_state = 2},
-  [146] = {.lex_state = 51, .external_lex_state = 2},
-  [147] = {.lex_state = 14, .external_lex_state = 2},
-  [148] = {.lex_state = 51, .external_lex_state = 2},
+  [146] = {.lex_state = 14, .external_lex_state = 2},
+  [147] = {.lex_state = 51, .external_lex_state = 2},
+  [148] = {.lex_state = 51, .external_lex_state = 4},
   [149] = {.lex_state = 51, .external_lex_state = 2},
-  [150] = {.lex_state = 51, .external_lex_state = 4},
+  [150] = {.lex_state = 51, .external_lex_state = 2},
   [151] = {.lex_state = 51, .external_lex_state = 2},
   [152] = {.lex_state = 51, .external_lex_state = 2},
   [153] = {.lex_state = 51, .external_lex_state = 2},
@@ -6646,29 +6652,29 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [175] = {.lex_state = 51, .external_lex_state = 2},
   [176] = {.lex_state = 51, .external_lex_state = 2},
   [177] = {.lex_state = 51, .external_lex_state = 2},
-  [178] = {.lex_state = 51, .external_lex_state = 2},
-  [179] = {.lex_state = 51, .external_lex_state = 4},
+  [178] = {.lex_state = 51, .external_lex_state = 4},
+  [179] = {.lex_state = 51, .external_lex_state = 2},
   [180] = {.lex_state = 51, .external_lex_state = 2},
-  [181] = {.lex_state = 51, .external_lex_state = 2},
-  [182] = {.lex_state = 51, .external_lex_state = 4},
+  [181] = {.lex_state = 51, .external_lex_state = 4},
+  [182] = {.lex_state = 51, .external_lex_state = 2},
   [183] = {.lex_state = 51, .external_lex_state = 2},
-  [184] = {.lex_state = 51, .external_lex_state = 2},
+  [184] = {.lex_state = 14, .external_lex_state = 2},
   [185] = {.lex_state = 14, .external_lex_state = 2},
   [186] = {.lex_state = 51, .external_lex_state = 2},
-  [187] = {.lex_state = 14, .external_lex_state = 2},
+  [187] = {.lex_state = 51, .external_lex_state = 2},
   [188] = {.lex_state = 51, .external_lex_state = 2},
   [189] = {.lex_state = 51, .external_lex_state = 2},
   [190] = {.lex_state = 51, .external_lex_state = 2},
   [191] = {.lex_state = 51, .external_lex_state = 2},
-  [192] = {.lex_state = 51, .external_lex_state = 2},
+  [192] = {.lex_state = 51, .external_lex_state = 4},
   [193] = {.lex_state = 51, .external_lex_state = 2},
   [194] = {.lex_state = 51, .external_lex_state = 2},
   [195] = {.lex_state = 51, .external_lex_state = 2},
   [196] = {.lex_state = 51, .external_lex_state = 2},
-  [197] = {.lex_state = 51, .external_lex_state = 4},
+  [197] = {.lex_state = 51, .external_lex_state = 2},
   [198] = {.lex_state = 51, .external_lex_state = 2},
   [199] = {.lex_state = 51, .external_lex_state = 2},
-  [200] = {.lex_state = 51, .external_lex_state = 2},
+  [200] = {.lex_state = 51, .external_lex_state = 4},
   [201] = {.lex_state = 51, .external_lex_state = 2},
   [202] = {.lex_state = 51, .external_lex_state = 2},
   [203] = {.lex_state = 51, .external_lex_state = 4},
@@ -6679,7 +6685,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [208] = {.lex_state = 51, .external_lex_state = 2},
   [209] = {.lex_state = 51, .external_lex_state = 2},
   [210] = {.lex_state = 51, .external_lex_state = 2},
-  [211] = {.lex_state = 51, .external_lex_state = 4},
+  [211] = {.lex_state = 51, .external_lex_state = 2},
   [212] = {.lex_state = 51, .external_lex_state = 2},
   [213] = {.lex_state = 51, .external_lex_state = 2},
   [214] = {.lex_state = 51, .external_lex_state = 2},
@@ -6691,7 +6697,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [220] = {.lex_state = 51, .external_lex_state = 2},
   [221] = {.lex_state = 51, .external_lex_state = 2},
   [222] = {.lex_state = 51, .external_lex_state = 2},
-  [223] = {.lex_state = 51, .external_lex_state = 2},
+  [223] = {.lex_state = 51, .external_lex_state = 4},
   [224] = {.lex_state = 51, .external_lex_state = 2},
   [225] = {.lex_state = 51, .external_lex_state = 2},
   [226] = {.lex_state = 51, .external_lex_state = 2},
@@ -6701,7 +6707,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [230] = {.lex_state = 51, .external_lex_state = 2},
   [231] = {.lex_state = 51, .external_lex_state = 2},
   [232] = {.lex_state = 51, .external_lex_state = 2},
-  [233] = {.lex_state = 51, .external_lex_state = 4},
+  [233] = {.lex_state = 51, .external_lex_state = 2},
   [234] = {.lex_state = 51, .external_lex_state = 2},
   [235] = {.lex_state = 51, .external_lex_state = 2},
   [236] = {.lex_state = 51, .external_lex_state = 2},
@@ -6734,8 +6740,8 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [263] = {.lex_state = 51, .external_lex_state = 2},
   [264] = {.lex_state = 51, .external_lex_state = 2},
   [265] = {.lex_state = 51, .external_lex_state = 2},
-  [266] = {.lex_state = 51, .external_lex_state = 3},
-  [267] = {.lex_state = 51, .external_lex_state = 3},
+  [266] = {.lex_state = 51, .external_lex_state = 2},
+  [267] = {.lex_state = 51, .external_lex_state = 2},
   [268] = {.lex_state = 51, .external_lex_state = 2},
   [269] = {.lex_state = 51, .external_lex_state = 2},
   [270] = {.lex_state = 51, .external_lex_state = 2},
@@ -6743,32 +6749,32 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [272] = {.lex_state = 51, .external_lex_state = 2},
   [273] = {.lex_state = 51, .external_lex_state = 2},
   [274] = {.lex_state = 51, .external_lex_state = 2},
-  [275] = {.lex_state = 51, .external_lex_state = 3},
-  [276] = {.lex_state = 51, .external_lex_state = 2},
-  [277] = {.lex_state = 51, .external_lex_state = 2},
+  [275] = {.lex_state = 51, .external_lex_state = 2},
+  [276] = {.lex_state = 51, .external_lex_state = 3},
+  [277] = {.lex_state = 51, .external_lex_state = 3},
   [278] = {.lex_state = 51, .external_lex_state = 2},
   [279] = {.lex_state = 51, .external_lex_state = 2},
   [280] = {.lex_state = 51, .external_lex_state = 2},
   [281] = {.lex_state = 51, .external_lex_state = 2},
   [282] = {.lex_state = 51, .external_lex_state = 2},
-  [283] = {.lex_state = 51, .external_lex_state = 3},
-  [284] = {.lex_state = 51, .external_lex_state = 2},
-  [285] = {.lex_state = 51, .external_lex_state = 2},
+  [283] = {.lex_state = 51, .external_lex_state = 2},
+  [284] = {.lex_state = 51, .external_lex_state = 3},
+  [285] = {.lex_state = 51, .external_lex_state = 3},
   [286] = {.lex_state = 51, .external_lex_state = 2},
   [287] = {.lex_state = 51, .external_lex_state = 2},
   [288] = {.lex_state = 51, .external_lex_state = 2},
-  [289] = {.lex_state = 51, .external_lex_state = 2},
+  [289] = {.lex_state = 51, .external_lex_state = 4},
   [290] = {.lex_state = 51, .external_lex_state = 2},
-  [291] = {.lex_state = 51, .external_lex_state = 4},
+  [291] = {.lex_state = 51, .external_lex_state = 2},
   [292] = {.lex_state = 51, .external_lex_state = 2},
   [293] = {.lex_state = 51, .external_lex_state = 2},
-  [294] = {.lex_state = 51, .external_lex_state = 2},
+  [294] = {.lex_state = 51, .external_lex_state = 4},
   [295] = {.lex_state = 51, .external_lex_state = 2},
-  [296] = {.lex_state = 51, .external_lex_state = 4},
+  [296] = {.lex_state = 51, .external_lex_state = 2},
   [297] = {.lex_state = 51, .external_lex_state = 2},
   [298] = {.lex_state = 51, .external_lex_state = 2},
   [299] = {.lex_state = 51, .external_lex_state = 2},
-  [300] = {.lex_state = 51, .external_lex_state = 4},
+  [300] = {.lex_state = 51, .external_lex_state = 2},
   [301] = {.lex_state = 51, .external_lex_state = 4},
   [302] = {.lex_state = 51, .external_lex_state = 2},
   [303] = {.lex_state = 51, .external_lex_state = 2},
@@ -6778,34 +6784,34 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [307] = {.lex_state = 51, .external_lex_state = 2},
   [308] = {.lex_state = 51, .external_lex_state = 2},
   [309] = {.lex_state = 51, .external_lex_state = 2},
-  [310] = {.lex_state = 51, .external_lex_state = 2},
+  [310] = {.lex_state = 51, .external_lex_state = 4},
   [311] = {.lex_state = 51, .external_lex_state = 2},
   [312] = {.lex_state = 51, .external_lex_state = 2},
-  [313] = {.lex_state = 16},
+  [313] = {.lex_state = 51, .external_lex_state = 2},
   [314] = {.lex_state = 51, .external_lex_state = 2},
-  [315] = {.lex_state = 51, .external_lex_state = 2},
+  [315] = {.lex_state = 51, .external_lex_state = 3},
   [316] = {.lex_state = 51, .external_lex_state = 3},
-  [317] = {.lex_state = 16},
+  [317] = {.lex_state = 51, .external_lex_state = 3},
   [318] = {.lex_state = 51, .external_lex_state = 3},
-  [319] = {.lex_state = 51, .external_lex_state = 2},
-  [320] = {.lex_state = 51, .external_lex_state = 3},
-  [321] = {.lex_state = 51, .external_lex_state = 3},
-  [322] = {.lex_state = 51, .external_lex_state = 3},
-  [323] = {.lex_state = 51, .external_lex_state = 2},
+  [319] = {.lex_state = 16},
+  [320] = {.lex_state = 51, .external_lex_state = 2},
+  [321] = {.lex_state = 51, .external_lex_state = 2},
+  [322] = {.lex_state = 51, .external_lex_state = 2},
+  [323] = {.lex_state = 51, .external_lex_state = 3},
   [324] = {.lex_state = 51, .external_lex_state = 3},
   [325] = {.lex_state = 51, .external_lex_state = 3},
-  [326] = {.lex_state = 51, .external_lex_state = 2},
-  [327] = {.lex_state = 51, .external_lex_state = 2},
-  [328] = {.lex_state = 51, .external_lex_state = 2},
+  [326] = {.lex_state = 51, .external_lex_state = 3},
+  [327] = {.lex_state = 16},
+  [328] = {.lex_state = 51, .external_lex_state = 3},
   [329] = {.lex_state = 51, .external_lex_state = 2},
-  [330] = {.lex_state = 51, .external_lex_state = 3},
+  [330] = {.lex_state = 51, .external_lex_state = 2},
   [331] = {.lex_state = 51, .external_lex_state = 3},
-  [332] = {.lex_state = 51, .external_lex_state = 2},
-  [333] = {.lex_state = 51, .external_lex_state = 3},
+  [332] = {.lex_state = 51, .external_lex_state = 3},
+  [333] = {.lex_state = 51, .external_lex_state = 2},
   [334] = {.lex_state = 51, .external_lex_state = 2},
   [335] = {.lex_state = 51, .external_lex_state = 2},
   [336] = {.lex_state = 51, .external_lex_state = 2},
-  [337] = {.lex_state = 51, .external_lex_state = 3},
+  [337] = {.lex_state = 51, .external_lex_state = 2},
   [338] = {.lex_state = 51, .external_lex_state = 2},
   [339] = {.lex_state = 51, .external_lex_state = 2},
   [340] = {.lex_state = 51, .external_lex_state = 2},
@@ -6815,10 +6821,10 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [344] = {.lex_state = 51, .external_lex_state = 2},
   [345] = {.lex_state = 51, .external_lex_state = 2},
   [346] = {.lex_state = 51, .external_lex_state = 2},
-  [347] = {.lex_state = 16, .external_lex_state = 6},
+  [347] = {.lex_state = 51, .external_lex_state = 2},
   [348] = {.lex_state = 51, .external_lex_state = 2},
   [349] = {.lex_state = 51, .external_lex_state = 2},
-  [350] = {.lex_state = 51, .external_lex_state = 3},
+  [350] = {.lex_state = 51, .external_lex_state = 2},
   [351] = {.lex_state = 51, .external_lex_state = 2},
   [352] = {.lex_state = 51, .external_lex_state = 2},
   [353] = {.lex_state = 51, .external_lex_state = 2},
@@ -6848,7 +6854,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [377] = {.lex_state = 51, .external_lex_state = 2},
   [378] = {.lex_state = 51, .external_lex_state = 2},
   [379] = {.lex_state = 51, .external_lex_state = 2},
-  [380] = {.lex_state = 51, .external_lex_state = 2},
+  [380] = {.lex_state = 16, .external_lex_state = 6},
   [381] = {.lex_state = 51, .external_lex_state = 2},
   [382] = {.lex_state = 51, .external_lex_state = 2},
   [383] = {.lex_state = 51, .external_lex_state = 2},
@@ -6864,7 +6870,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [393] = {.lex_state = 51, .external_lex_state = 2},
   [394] = {.lex_state = 51, .external_lex_state = 2},
   [395] = {.lex_state = 51, .external_lex_state = 2},
-  [396] = {.lex_state = 51, .external_lex_state = 2},
+  [396] = {.lex_state = 51, .external_lex_state = 3},
   [397] = {.lex_state = 51, .external_lex_state = 2},
   [398] = {.lex_state = 51, .external_lex_state = 2},
   [399] = {.lex_state = 51, .external_lex_state = 2},
@@ -6907,171 +6913,171 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [436] = {.lex_state = 51, .external_lex_state = 2},
   [437] = {.lex_state = 16, .external_lex_state = 6},
   [438] = {.lex_state = 51, .external_lex_state = 2},
-  [439] = {.lex_state = 51, .external_lex_state = 3},
+  [439] = {.lex_state = 51, .external_lex_state = 2},
   [440] = {.lex_state = 51, .external_lex_state = 3},
-  [441] = {.lex_state = 51, .external_lex_state = 2},
-  [442] = {.lex_state = 51, .external_lex_state = 2},
-  [443] = {.lex_state = 51, .external_lex_state = 2},
-  [444] = {.lex_state = 51, .external_lex_state = 3},
-  [445] = {.lex_state = 51, .external_lex_state = 2},
-  [446] = {.lex_state = 51, .external_lex_state = 2},
-  [447] = {.lex_state = 51, .external_lex_state = 2},
+  [441] = {.lex_state = 51, .external_lex_state = 3},
+  [442] = {.lex_state = 51, .external_lex_state = 3},
+  [443] = {.lex_state = 51, .external_lex_state = 3},
+  [444] = {.lex_state = 16, .external_lex_state = 6},
+  [445] = {.lex_state = 51, .external_lex_state = 3},
+  [446] = {.lex_state = 51, .external_lex_state = 3},
+  [447] = {.lex_state = 51, .external_lex_state = 3},
   [448] = {.lex_state = 51, .external_lex_state = 3},
-  [449] = {.lex_state = 51, .external_lex_state = 2},
-  [450] = {.lex_state = 51, .external_lex_state = 2},
+  [449] = {.lex_state = 51, .external_lex_state = 3},
+  [450] = {.lex_state = 51, .external_lex_state = 3},
   [451] = {.lex_state = 51, .external_lex_state = 2},
-  [452] = {.lex_state = 16, .external_lex_state = 7},
-  [453] = {.lex_state = 16, .external_lex_state = 6},
-  [454] = {.lex_state = 51, .external_lex_state = 3},
+  [452] = {.lex_state = 51, .external_lex_state = 2},
+  [453] = {.lex_state = 51, .external_lex_state = 2},
+  [454] = {.lex_state = 51, .external_lex_state = 2},
   [455] = {.lex_state = 51, .external_lex_state = 2},
   [456] = {.lex_state = 51, .external_lex_state = 3},
   [457] = {.lex_state = 51, .external_lex_state = 2},
-  [458] = {.lex_state = 51, .external_lex_state = 3},
-  [459] = {.lex_state = 51, .external_lex_state = 3},
-  [460] = {.lex_state = 51, .external_lex_state = 3},
+  [458] = {.lex_state = 16, .external_lex_state = 7},
+  [459] = {.lex_state = 51, .external_lex_state = 2},
+  [460] = {.lex_state = 51, .external_lex_state = 2},
   [461] = {.lex_state = 51, .external_lex_state = 2},
   [462] = {.lex_state = 51, .external_lex_state = 3},
-  [463] = {.lex_state = 51, .external_lex_state = 3},
-  [464] = {.lex_state = 51, .external_lex_state = 3},
+  [463] = {.lex_state = 51, .external_lex_state = 2},
+  [464] = {.lex_state = 51, .external_lex_state = 2},
   [465] = {.lex_state = 51, .external_lex_state = 2},
   [466] = {.lex_state = 51, .external_lex_state = 2},
   [467] = {.lex_state = 51, .external_lex_state = 2},
   [468] = {.lex_state = 51, .external_lex_state = 2},
-  [469] = {.lex_state = 16, .external_lex_state = 6},
-  [470] = {.lex_state = 16},
-  [471] = {.lex_state = 51, .external_lex_state = 2},
+  [469] = {.lex_state = 51, .external_lex_state = 2},
+  [470] = {.lex_state = 51, .external_lex_state = 3},
+  [471] = {.lex_state = 51, .external_lex_state = 3},
   [472] = {.lex_state = 51, .external_lex_state = 2},
-  [473] = {.lex_state = 51, .external_lex_state = 2},
-  [474] = {.lex_state = 51, .external_lex_state = 2},
+  [473] = {.lex_state = 51, .external_lex_state = 3},
+  [474] = {.lex_state = 51, .external_lex_state = 3},
   [475] = {.lex_state = 51, .external_lex_state = 2},
   [476] = {.lex_state = 51, .external_lex_state = 2},
-  [477] = {.lex_state = 51, .external_lex_state = 3},
+  [477] = {.lex_state = 51, .external_lex_state = 2},
   [478] = {.lex_state = 51, .external_lex_state = 2},
-  [479] = {.lex_state = 51, .external_lex_state = 3},
-  [480] = {.lex_state = 51, .external_lex_state = 3},
-  [481] = {.lex_state = 51, .external_lex_state = 2},
-  [482] = {.lex_state = 51, .external_lex_state = 3},
-  [483] = {.lex_state = 51, .external_lex_state = 2},
+  [479] = {.lex_state = 51, .external_lex_state = 2},
+  [480] = {.lex_state = 51, .external_lex_state = 2},
+  [481] = {.lex_state = 51, .external_lex_state = 3},
+  [482] = {.lex_state = 16},
+  [483] = {.lex_state = 16, .external_lex_state = 6},
   [484] = {.lex_state = 51, .external_lex_state = 3},
   [485] = {.lex_state = 51, .external_lex_state = 3},
   [486] = {.lex_state = 51, .external_lex_state = 3},
   [487] = {.lex_state = 51, .external_lex_state = 3},
   [488] = {.lex_state = 51, .external_lex_state = 3},
-  [489] = {.lex_state = 51, .external_lex_state = 3},
-  [490] = {.lex_state = 51, .external_lex_state = 2},
-  [491] = {.lex_state = 51, .external_lex_state = 3},
-  [492] = {.lex_state = 16, .external_lex_state = 6},
-  [493] = {.lex_state = 51, .external_lex_state = 2},
-  [494] = {.lex_state = 16, .external_lex_state = 6},
-  [495] = {.lex_state = 51, .external_lex_state = 2},
+  [489] = {.lex_state = 51, .external_lex_state = 2},
+  [490] = {.lex_state = 51, .external_lex_state = 3},
+  [491] = {.lex_state = 51, .external_lex_state = 2},
+  [492] = {.lex_state = 51, .external_lex_state = 2},
+  [493] = {.lex_state = 51, .external_lex_state = 3},
+  [494] = {.lex_state = 51, .external_lex_state = 2},
+  [495] = {.lex_state = 51, .external_lex_state = 3},
   [496] = {.lex_state = 51, .external_lex_state = 2},
   [497] = {.lex_state = 51, .external_lex_state = 3},
   [498] = {.lex_state = 51, .external_lex_state = 2},
-  [499] = {.lex_state = 16, .external_lex_state = 6},
-  [500] = {.lex_state = 51, .external_lex_state = 3},
+  [499] = {.lex_state = 51, .external_lex_state = 2},
+  [500] = {.lex_state = 51, .external_lex_state = 2},
   [501] = {.lex_state = 51, .external_lex_state = 2},
-  [502] = {.lex_state = 51, .external_lex_state = 3},
-  [503] = {.lex_state = 16, .external_lex_state = 6},
-  [504] = {.lex_state = 51, .external_lex_state = 3},
-  [505] = {.lex_state = 51, .external_lex_state = 3},
-  [506] = {.lex_state = 51, .external_lex_state = 2},
-  [507] = {.lex_state = 51, .external_lex_state = 3},
+  [502] = {.lex_state = 16, .external_lex_state = 6},
+  [503] = {.lex_state = 51, .external_lex_state = 2},
+  [504] = {.lex_state = 16, .external_lex_state = 6},
+  [505] = {.lex_state = 16, .external_lex_state = 6},
+  [506] = {.lex_state = 51, .external_lex_state = 3},
+  [507] = {.lex_state = 16, .external_lex_state = 6},
   [508] = {.lex_state = 51, .external_lex_state = 2},
-  [509] = {.lex_state = 51, .external_lex_state = 2},
+  [509] = {.lex_state = 51, .external_lex_state = 3},
   [510] = {.lex_state = 51, .external_lex_state = 2},
-  [511] = {.lex_state = 51, .external_lex_state = 2},
+  [511] = {.lex_state = 51, .external_lex_state = 3},
   [512] = {.lex_state = 51, .external_lex_state = 2},
   [513] = {.lex_state = 51, .external_lex_state = 2},
   [514] = {.lex_state = 51, .external_lex_state = 3},
-  [515] = {.lex_state = 16, .external_lex_state = 6},
-  [516] = {.lex_state = 51, .external_lex_state = 2},
+  [515] = {.lex_state = 51, .external_lex_state = 2},
+  [516] = {.lex_state = 51, .external_lex_state = 3},
   [517] = {.lex_state = 51, .external_lex_state = 2},
   [518] = {.lex_state = 51, .external_lex_state = 2},
-  [519] = {.lex_state = 51, .external_lex_state = 2},
-  [520] = {.lex_state = 51, .external_lex_state = 2},
+  [519] = {.lex_state = 51, .external_lex_state = 3},
+  [520] = {.lex_state = 16, .external_lex_state = 6},
   [521] = {.lex_state = 51, .external_lex_state = 2},
-  [522] = {.lex_state = 51, .external_lex_state = 2},
-  [523] = {.lex_state = 51, .external_lex_state = 2},
-  [524] = {.lex_state = 16, .external_lex_state = 6},
+  [522] = {.lex_state = 51, .external_lex_state = 3},
+  [523] = {.lex_state = 51, .external_lex_state = 3},
+  [524] = {.lex_state = 51, .external_lex_state = 3},
   [525] = {.lex_state = 51, .external_lex_state = 2},
-  [526] = {.lex_state = 51, .external_lex_state = 2},
-  [527] = {.lex_state = 51, .external_lex_state = 2},
-  [528] = {.lex_state = 51, .external_lex_state = 2},
+  [526] = {.lex_state = 51, .external_lex_state = 3},
+  [527] = {.lex_state = 51, .external_lex_state = 3},
+  [528] = {.lex_state = 51, .external_lex_state = 3},
   [529] = {.lex_state = 51, .external_lex_state = 2},
-  [530] = {.lex_state = 51, .external_lex_state = 2},
+  [530] = {.lex_state = 51, .external_lex_state = 3},
   [531] = {.lex_state = 51, .external_lex_state = 2},
-  [532] = {.lex_state = 51, .external_lex_state = 2},
-  [533] = {.lex_state = 51, .external_lex_state = 2},
-  [534] = {.lex_state = 51, .external_lex_state = 3},
-  [535] = {.lex_state = 51, .external_lex_state = 2},
-  [536] = {.lex_state = 51, .external_lex_state = 2},
-  [537] = {.lex_state = 51, .external_lex_state = 2},
-  [538] = {.lex_state = 51, .external_lex_state = 2},
-  [539] = {.lex_state = 51, .external_lex_state = 2},
+  [532] = {.lex_state = 51, .external_lex_state = 3},
+  [533] = {.lex_state = 51, .external_lex_state = 3},
+  [534] = {.lex_state = 51, .external_lex_state = 2},
+  [535] = {.lex_state = 51, .external_lex_state = 3},
+  [536] = {.lex_state = 51, .external_lex_state = 3},
+  [537] = {.lex_state = 51, .external_lex_state = 3},
+  [538] = {.lex_state = 51, .external_lex_state = 3},
+  [539] = {.lex_state = 51, .external_lex_state = 3},
   [540] = {.lex_state = 51, .external_lex_state = 3},
-  [541] = {.lex_state = 51, .external_lex_state = 2},
-  [542] = {.lex_state = 51, .external_lex_state = 2},
-  [543] = {.lex_state = 51, .external_lex_state = 2},
+  [541] = {.lex_state = 51, .external_lex_state = 3},
+  [542] = {.lex_state = 51, .external_lex_state = 3},
+  [543] = {.lex_state = 51, .external_lex_state = 3},
   [544] = {.lex_state = 51, .external_lex_state = 3},
   [545] = {.lex_state = 51, .external_lex_state = 3},
   [546] = {.lex_state = 51, .external_lex_state = 3},
-  [547] = {.lex_state = 51, .external_lex_state = 2},
-  [548] = {.lex_state = 51, .external_lex_state = 2},
+  [547] = {.lex_state = 51, .external_lex_state = 3},
+  [548] = {.lex_state = 51, .external_lex_state = 3},
   [549] = {.lex_state = 51, .external_lex_state = 3},
-  [550] = {.lex_state = 51, .external_lex_state = 2},
+  [550] = {.lex_state = 51, .external_lex_state = 3},
   [551] = {.lex_state = 51, .external_lex_state = 3},
   [552] = {.lex_state = 51, .external_lex_state = 3},
-  [553] = {.lex_state = 51, .external_lex_state = 2},
+  [553] = {.lex_state = 51, .external_lex_state = 3},
   [554] = {.lex_state = 51, .external_lex_state = 3},
-  [555] = {.lex_state = 51, .external_lex_state = 2},
+  [555] = {.lex_state = 51, .external_lex_state = 3},
   [556] = {.lex_state = 51, .external_lex_state = 3},
-  [557] = {.lex_state = 51, .external_lex_state = 2},
-  [558] = {.lex_state = 51, .external_lex_state = 2},
+  [557] = {.lex_state = 51, .external_lex_state = 3},
+  [558] = {.lex_state = 51, .external_lex_state = 3},
   [559] = {.lex_state = 51, .external_lex_state = 3},
   [560] = {.lex_state = 51, .external_lex_state = 3},
   [561] = {.lex_state = 51, .external_lex_state = 3},
   [562] = {.lex_state = 51, .external_lex_state = 3},
   [563] = {.lex_state = 51, .external_lex_state = 3},
-  [564] = {.lex_state = 51, .external_lex_state = 2},
-  [565] = {.lex_state = 51, .external_lex_state = 3},
-  [566] = {.lex_state = 51, .external_lex_state = 2},
+  [564] = {.lex_state = 51, .external_lex_state = 3},
+  [565] = {.lex_state = 51, .external_lex_state = 2},
+  [566] = {.lex_state = 51, .external_lex_state = 3},
   [567] = {.lex_state = 51, .external_lex_state = 3},
   [568] = {.lex_state = 51, .external_lex_state = 3},
-  [569] = {.lex_state = 51, .external_lex_state = 3},
+  [569] = {.lex_state = 51, .external_lex_state = 2},
   [570] = {.lex_state = 51, .external_lex_state = 3},
-  [571] = {.lex_state = 51, .external_lex_state = 3},
-  [572] = {.lex_state = 51, .external_lex_state = 3},
+  [571] = {.lex_state = 51, .external_lex_state = 2},
+  [572] = {.lex_state = 51, .external_lex_state = 2},
   [573] = {.lex_state = 51, .external_lex_state = 3},
   [574] = {.lex_state = 51, .external_lex_state = 3},
-  [575] = {.lex_state = 51, .external_lex_state = 3},
-  [576] = {.lex_state = 51, .external_lex_state = 3},
-  [577] = {.lex_state = 51, .external_lex_state = 3},
-  [578] = {.lex_state = 51, .external_lex_state = 3},
-  [579] = {.lex_state = 51, .external_lex_state = 3},
-  [580] = {.lex_state = 51, .external_lex_state = 3},
-  [581] = {.lex_state = 51, .external_lex_state = 3},
+  [575] = {.lex_state = 51, .external_lex_state = 2},
+  [576] = {.lex_state = 16, .external_lex_state = 6},
+  [577] = {.lex_state = 51, .external_lex_state = 2},
+  [578] = {.lex_state = 51, .external_lex_state = 2},
+  [579] = {.lex_state = 51, .external_lex_state = 2},
+  [580] = {.lex_state = 51, .external_lex_state = 2},
+  [581] = {.lex_state = 51, .external_lex_state = 2},
   [582] = {.lex_state = 51, .external_lex_state = 2},
-  [583] = {.lex_state = 51, .external_lex_state = 3},
-  [584] = {.lex_state = 51, .external_lex_state = 3},
-  [585] = {.lex_state = 51, .external_lex_state = 3},
-  [586] = {.lex_state = 51, .external_lex_state = 3},
-  [587] = {.lex_state = 51, .external_lex_state = 3},
-  [588] = {.lex_state = 51, .external_lex_state = 3},
+  [583] = {.lex_state = 51, .external_lex_state = 2},
+  [584] = {.lex_state = 51, .external_lex_state = 2},
+  [585] = {.lex_state = 51, .external_lex_state = 2},
+  [586] = {.lex_state = 51, .external_lex_state = 2},
+  [587] = {.lex_state = 51, .external_lex_state = 2},
+  [588] = {.lex_state = 51, .external_lex_state = 2},
   [589] = {.lex_state = 51, .external_lex_state = 2},
-  [590] = {.lex_state = 51, .external_lex_state = 3},
-  [591] = {.lex_state = 51, .external_lex_state = 3},
-  [592] = {.lex_state = 51, .external_lex_state = 3},
+  [590] = {.lex_state = 51, .external_lex_state = 2},
+  [591] = {.lex_state = 51, .external_lex_state = 2},
+  [592] = {.lex_state = 51, .external_lex_state = 2},
   [593] = {.lex_state = 51, .external_lex_state = 2},
-  [594] = {.lex_state = 51, .external_lex_state = 2},
-  [595] = {.lex_state = 51, .external_lex_state = 3},
-  [596] = {.lex_state = 51, .external_lex_state = 3},
-  [597] = {.lex_state = 51, .external_lex_state = 3},
-  [598] = {.lex_state = 51, .external_lex_state = 3},
-  [599] = {.lex_state = 51, .external_lex_state = 3},
+  [594] = {.lex_state = 16, .external_lex_state = 6},
+  [595] = {.lex_state = 51, .external_lex_state = 2},
+  [596] = {.lex_state = 51, .external_lex_state = 2},
+  [597] = {.lex_state = 51, .external_lex_state = 2},
+  [598] = {.lex_state = 51, .external_lex_state = 2},
+  [599] = {.lex_state = 51, .external_lex_state = 2},
   [600] = {.lex_state = 51, .external_lex_state = 2},
   [601] = {.lex_state = 51, .external_lex_state = 2},
-  [602] = {.lex_state = 51, .external_lex_state = 3},
-  [603] = {.lex_state = 51, .external_lex_state = 3},
+  [602] = {.lex_state = 51, .external_lex_state = 2},
+  [603] = {.lex_state = 51, .external_lex_state = 2},
   [604] = {.lex_state = 51, .external_lex_state = 2},
   [605] = {.lex_state = 51, .external_lex_state = 2},
   [606] = {.lex_state = 51, .external_lex_state = 2},
@@ -7082,7 +7088,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [611] = {.lex_state = 51, .external_lex_state = 2},
   [612] = {.lex_state = 51, .external_lex_state = 2},
   [613] = {.lex_state = 51, .external_lex_state = 2},
-  [614] = {.lex_state = 16, .external_lex_state = 6},
+  [614] = {.lex_state = 51, .external_lex_state = 2},
   [615] = {.lex_state = 51, .external_lex_state = 2},
   [616] = {.lex_state = 51, .external_lex_state = 3},
   [617] = {.lex_state = 16},
@@ -7098,8 +7104,8 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [627] = {.lex_state = 16, .external_lex_state = 8},
   [628] = {.lex_state = 51, .external_lex_state = 2},
   [629] = {.lex_state = 51, .external_lex_state = 2},
-  [630] = {.lex_state = 51, .external_lex_state = 2},
-  [631] = {.lex_state = 51, .external_lex_state = 2},
+  [630] = {.lex_state = 16, .external_lex_state = 9},
+  [631] = {.lex_state = 16, .external_lex_state = 8},
   [632] = {.lex_state = 51, .external_lex_state = 2},
   [633] = {.lex_state = 51, .external_lex_state = 2},
   [634] = {.lex_state = 51, .external_lex_state = 2},
@@ -7143,8 +7149,8 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [672] = {.lex_state = 51, .external_lex_state = 2},
   [673] = {.lex_state = 51, .external_lex_state = 2},
   [674] = {.lex_state = 51, .external_lex_state = 2},
-  [675] = {.lex_state = 51, .external_lex_state = 2},
-  [676] = {.lex_state = 51, .external_lex_state = 2},
+  [675] = {.lex_state = 16, .external_lex_state = 9},
+  [676] = {.lex_state = 16, .external_lex_state = 8},
   [677] = {.lex_state = 51, .external_lex_state = 2},
   [678] = {.lex_state = 51, .external_lex_state = 2},
   [679] = {.lex_state = 51, .external_lex_state = 2},
@@ -7153,30 +7159,30 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [682] = {.lex_state = 51, .external_lex_state = 2},
   [683] = {.lex_state = 51, .external_lex_state = 2},
   [684] = {.lex_state = 51, .external_lex_state = 2},
-  [685] = {.lex_state = 16, .external_lex_state = 9},
+  [685] = {.lex_state = 51, .external_lex_state = 2},
   [686] = {.lex_state = 51, .external_lex_state = 2},
   [687] = {.lex_state = 51, .external_lex_state = 2},
   [688] = {.lex_state = 51, .external_lex_state = 2},
   [689] = {.lex_state = 51, .external_lex_state = 2},
-  [690] = {.lex_state = 16, .external_lex_state = 9},
+  [690] = {.lex_state = 51, .external_lex_state = 2},
   [691] = {.lex_state = 51, .external_lex_state = 2},
   [692] = {.lex_state = 51, .external_lex_state = 2},
-  [693] = {.lex_state = 16, .external_lex_state = 8},
-  [694] = {.lex_state = 16, .external_lex_state = 9},
+  [693] = {.lex_state = 51, .external_lex_state = 2},
+  [694] = {.lex_state = 51, .external_lex_state = 2},
   [695] = {.lex_state = 51, .external_lex_state = 2},
   [696] = {.lex_state = 51, .external_lex_state = 2},
   [697] = {.lex_state = 51, .external_lex_state = 2},
-  [698] = {.lex_state = 16, .external_lex_state = 8},
+  [698] = {.lex_state = 16, .external_lex_state = 9},
   [699] = {.lex_state = 51, .external_lex_state = 2},
-  [700] = {.lex_state = 16, .external_lex_state = 8},
-  [701] = {.lex_state = 16, .external_lex_state = 8},
-  [702] = {.lex_state = 16, .external_lex_state = 9},
-  [703] = {.lex_state = 16, .external_lex_state = 9},
+  [700] = {.lex_state = 16, .external_lex_state = 9},
+  [701] = {.lex_state = 16, .external_lex_state = 9},
+  [702] = {.lex_state = 16, .external_lex_state = 8},
+  [703] = {.lex_state = 16, .external_lex_state = 8},
   [704] = {.lex_state = 16},
   [705] = {.lex_state = 16},
   [706] = {.lex_state = 16},
-  [707] = {.lex_state = 16},
-  [708] = {.lex_state = 16},
+  [707] = {.lex_state = 15},
+  [708] = {.lex_state = 15},
   [709] = {.lex_state = 16},
   [710] = {.lex_state = 16},
   [711] = {.lex_state = 16},
@@ -7204,8 +7210,8 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [733] = {.lex_state = 16},
   [734] = {.lex_state = 16},
   [735] = {.lex_state = 16},
-  [736] = {.lex_state = 15},
-  [737] = {.lex_state = 15},
+  [736] = {.lex_state = 16},
+  [737] = {.lex_state = 16},
   [738] = {.lex_state = 16},
   [739] = {.lex_state = 16},
   [740] = {.lex_state = 16},
@@ -7213,83 +7219,83 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [742] = {.lex_state = 16},
   [743] = {.lex_state = 16},
   [744] = {.lex_state = 16},
-  [745] = {.lex_state = 16},
+  [745] = {.lex_state = 16, .external_lex_state = 8},
   [746] = {.lex_state = 16},
   [747] = {.lex_state = 16},
   [748] = {.lex_state = 16},
-  [749] = {.lex_state = 16, .external_lex_state = 9},
-  [750] = {.lex_state = 16, .external_lex_state = 8},
+  [749] = {.lex_state = 16},
+  [750] = {.lex_state = 16},
   [751] = {.lex_state = 16},
   [752] = {.lex_state = 16},
-  [753] = {.lex_state = 16, .external_lex_state = 9},
-  [754] = {.lex_state = 16, .external_lex_state = 8},
+  [753] = {.lex_state = 16},
+  [754] = {.lex_state = 16},
   [755] = {.lex_state = 16},
   [756] = {.lex_state = 16},
-  [757] = {.lex_state = 16},
+  [757] = {.lex_state = 16, .external_lex_state = 9},
   [758] = {.lex_state = 16},
   [759] = {.lex_state = 16},
   [760] = {.lex_state = 16},
   [761] = {.lex_state = 16},
-  [762] = {.lex_state = 16},
+  [762] = {.lex_state = 16, .external_lex_state = 8},
   [763] = {.lex_state = 16},
   [764] = {.lex_state = 16},
   [765] = {.lex_state = 16},
-  [766] = {.lex_state = 16},
+  [766] = {.lex_state = 16, .external_lex_state = 9},
   [767] = {.lex_state = 16},
-  [768] = {.lex_state = 15, .external_lex_state = 9},
-  [769] = {.lex_state = 15, .external_lex_state = 8},
-  [770] = {.lex_state = 16, .external_lex_state = 7},
-  [771] = {.lex_state = 16, .external_lex_state = 10},
-  [772] = {.lex_state = 16, .external_lex_state = 10},
-  [773] = {.lex_state = 16, .external_lex_state = 6},
-  [774] = {.lex_state = 16},
-  [775] = {.lex_state = 16},
-  [776] = {.lex_state = 16, .external_lex_state = 7},
-  [777] = {.lex_state = 16, .external_lex_state = 10},
-  [778] = {.lex_state = 16},
-  [779] = {.lex_state = 16, .external_lex_state = 7},
-  [780] = {.lex_state = 15},
-  [781] = {.lex_state = 15, .external_lex_state = 9},
-  [782] = {.lex_state = 15, .external_lex_state = 8},
-  [783] = {.lex_state = 16},
-  [784] = {.lex_state = 15, .external_lex_state = 9},
-  [785] = {.lex_state = 15, .external_lex_state = 8},
+  [768] = {.lex_state = 16},
+  [769] = {.lex_state = 16},
+  [770] = {.lex_state = 15},
+  [771] = {.lex_state = 15, .external_lex_state = 9},
+  [772] = {.lex_state = 15, .external_lex_state = 8},
+  [773] = {.lex_state = 16},
+  [774] = {.lex_state = 15, .external_lex_state = 9},
+  [775] = {.lex_state = 15, .external_lex_state = 8},
+  [776] = {.lex_state = 15, .external_lex_state = 9},
+  [777] = {.lex_state = 15, .external_lex_state = 8},
+  [778] = {.lex_state = 16, .external_lex_state = 7},
+  [779] = {.lex_state = 16, .external_lex_state = 10},
+  [780] = {.lex_state = 16, .external_lex_state = 6},
+  [781] = {.lex_state = 16, .external_lex_state = 7},
+  [782] = {.lex_state = 16, .external_lex_state = 10},
+  [783] = {.lex_state = 16, .external_lex_state = 7},
+  [784] = {.lex_state = 16, .external_lex_state = 10},
+  [785] = {.lex_state = 16},
   [786] = {.lex_state = 16},
   [787] = {.lex_state = 16},
   [788] = {.lex_state = 16, .external_lex_state = 6},
-  [789] = {.lex_state = 16},
-  [790] = {.lex_state = 16, .external_lex_state = 9},
-  [791] = {.lex_state = 16, .external_lex_state = 8},
-  [792] = {.lex_state = 16, .external_lex_state = 9},
-  [793] = {.lex_state = 16, .external_lex_state = 8},
-  [794] = {.lex_state = 16, .external_lex_state = 9},
-  [795] = {.lex_state = 16, .external_lex_state = 8},
-  [796] = {.lex_state = 16, .external_lex_state = 6},
-  [797] = {.lex_state = 16, .external_lex_state = 6},
-  [798] = {.lex_state = 16, .external_lex_state = 6},
+  [789] = {.lex_state = 15},
+  [790] = {.lex_state = 15},
+  [791] = {.lex_state = 15},
+  [792] = {.lex_state = 15},
+  [793] = {.lex_state = 15},
+  [794] = {.lex_state = 15},
+  [795] = {.lex_state = 15},
+  [796] = {.lex_state = 15},
+  [797] = {.lex_state = 15},
+  [798] = {.lex_state = 15},
   [799] = {.lex_state = 16, .external_lex_state = 6},
   [800] = {.lex_state = 16, .external_lex_state = 6},
   [801] = {.lex_state = 16, .external_lex_state = 6},
   [802] = {.lex_state = 16, .external_lex_state = 6},
   [803] = {.lex_state = 16, .external_lex_state = 6},
-  [804] = {.lex_state = 15},
-  [805] = {.lex_state = 15},
+  [804] = {.lex_state = 16, .external_lex_state = 6},
+  [805] = {.lex_state = 16, .external_lex_state = 6},
   [806] = {.lex_state = 16, .external_lex_state = 6},
   [807] = {.lex_state = 16, .external_lex_state = 6},
   [808] = {.lex_state = 16},
-  [809] = {.lex_state = 15},
-  [810] = {.lex_state = 15},
-  [811] = {.lex_state = 15},
+  [809] = {.lex_state = 16, .external_lex_state = 6},
+  [810] = {.lex_state = 51, .external_lex_state = 2},
+  [811] = {.lex_state = 16},
   [812] = {.lex_state = 15},
-  [813] = {.lex_state = 15},
-  [814] = {.lex_state = 15},
-  [815] = {.lex_state = 15},
-  [816] = {.lex_state = 15},
-  [817] = {.lex_state = 15},
+  [813] = {.lex_state = 51, .external_lex_state = 2},
+  [814] = {.lex_state = 16, .external_lex_state = 9},
+  [815] = {.lex_state = 16, .external_lex_state = 8},
+  [816] = {.lex_state = 16, .external_lex_state = 9},
+  [817] = {.lex_state = 16, .external_lex_state = 8},
   [818] = {.lex_state = 16, .external_lex_state = 6},
-  [819] = {.lex_state = 16},
-  [820] = {.lex_state = 16},
-  [821] = {.lex_state = 16},
+  [819] = {.lex_state = 15},
+  [820] = {.lex_state = 16, .external_lex_state = 9},
+  [821] = {.lex_state = 16, .external_lex_state = 8},
   [822] = {.lex_state = 16},
   [823] = {.lex_state = 16},
   [824] = {.lex_state = 16},
@@ -7298,55 +7304,55 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [827] = {.lex_state = 16},
   [828] = {.lex_state = 16},
   [829] = {.lex_state = 16},
-  [830] = {.lex_state = 15},
-  [831] = {.lex_state = 16, .external_lex_state = 6},
-  [832] = {.lex_state = 15},
+  [830] = {.lex_state = 16},
+  [831] = {.lex_state = 16},
+  [832] = {.lex_state = 51, .external_lex_state = 2},
   [833] = {.lex_state = 16},
-  [834] = {.lex_state = 15, .external_lex_state = 8},
-  [835] = {.lex_state = 16, .external_lex_state = 6},
-  [836] = {.lex_state = 15},
+  [834] = {.lex_state = 51, .external_lex_state = 2},
+  [835] = {.lex_state = 16},
+  [836] = {.lex_state = 16},
   [837] = {.lex_state = 16},
-  [838] = {.lex_state = 16},
+  [838] = {.lex_state = 15, .external_lex_state = 9},
   [839] = {.lex_state = 16},
-  [840] = {.lex_state = 15, .external_lex_state = 8},
-  [841] = {.lex_state = 51, .external_lex_state = 2},
-  [842] = {.lex_state = 16},
-  [843] = {.lex_state = 16, .external_lex_state = 7},
+  [840] = {.lex_state = 16},
+  [841] = {.lex_state = 16},
+  [842] = {.lex_state = 15},
+  [843] = {.lex_state = 16},
   [844] = {.lex_state = 16},
   [845] = {.lex_state = 16},
-  [846] = {.lex_state = 15, .external_lex_state = 9},
-  [847] = {.lex_state = 16, .external_lex_state = 10},
-  [848] = {.lex_state = 15, .external_lex_state = 9},
-  [849] = {.lex_state = 16},
-  [850] = {.lex_state = 16},
-  [851] = {.lex_state = 16},
-  [852] = {.lex_state = 16, .external_lex_state = 7},
-  [853] = {.lex_state = 16, .external_lex_state = 10},
+  [846] = {.lex_state = 15, .external_lex_state = 8},
+  [847] = {.lex_state = 16, .external_lex_state = 7},
+  [848] = {.lex_state = 51, .external_lex_state = 2},
+  [849] = {.lex_state = 51, .external_lex_state = 2},
+  [850] = {.lex_state = 51, .external_lex_state = 2},
+  [851] = {.lex_state = 51, .external_lex_state = 2},
+  [852] = {.lex_state = 16, .external_lex_state = 10},
+  [853] = {.lex_state = 15},
   [854] = {.lex_state = 16},
   [855] = {.lex_state = 16},
-  [856] = {.lex_state = 16},
+  [856] = {.lex_state = 16, .external_lex_state = 6},
   [857] = {.lex_state = 16},
   [858] = {.lex_state = 16},
-  [859] = {.lex_state = 16},
-  [860] = {.lex_state = 16},
+  [859] = {.lex_state = 16, .external_lex_state = 7},
+  [860] = {.lex_state = 51, .external_lex_state = 2},
   [861] = {.lex_state = 51, .external_lex_state = 2},
-  [862] = {.lex_state = 16},
+  [862] = {.lex_state = 15, .external_lex_state = 8},
   [863] = {.lex_state = 16},
   [864] = {.lex_state = 16},
-  [865] = {.lex_state = 16},
+  [865] = {.lex_state = 15, .external_lex_state = 9},
   [866] = {.lex_state = 16},
   [867] = {.lex_state = 16},
   [868] = {.lex_state = 16},
-  [869] = {.lex_state = 51, .external_lex_state = 2},
-  [870] = {.lex_state = 51, .external_lex_state = 2},
+  [869] = {.lex_state = 16, .external_lex_state = 10},
+  [870] = {.lex_state = 16},
   [871] = {.lex_state = 16},
   [872] = {.lex_state = 16},
-  [873] = {.lex_state = 16, .external_lex_state = 6},
-  [874] = {.lex_state = 15},
-  [875] = {.lex_state = 15},
-  [876] = {.lex_state = 15},
-  [877] = {.lex_state = 16, .external_lex_state = 6},
-  [878] = {.lex_state = 15},
+  [873] = {.lex_state = 16},
+  [874] = {.lex_state = 16},
+  [875] = {.lex_state = 16},
+  [876] = {.lex_state = 16},
+  [877] = {.lex_state = 16},
+  [878] = {.lex_state = 16, .external_lex_state = 6},
   [879] = {.lex_state = 15},
   [880] = {.lex_state = 15},
   [881] = {.lex_state = 15},
@@ -7358,72 +7364,72 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [887] = {.lex_state = 15},
   [888] = {.lex_state = 15},
   [889] = {.lex_state = 15},
-  [890] = {.lex_state = 15},
-  [891] = {.lex_state = 15},
-  [892] = {.lex_state = 16},
-  [893] = {.lex_state = 16},
-  [894] = {.lex_state = 15},
+  [890] = {.lex_state = 16, .external_lex_state = 6},
+  [891] = {.lex_state = 16, .external_lex_state = 6},
+  [892] = {.lex_state = 51, .external_lex_state = 2},
+  [893] = {.lex_state = 15},
+  [894] = {.lex_state = 16, .external_lex_state = 6},
   [895] = {.lex_state = 16, .external_lex_state = 6},
-  [896] = {.lex_state = 51, .external_lex_state = 2},
-  [897] = {.lex_state = 51, .external_lex_state = 2},
+  [896] = {.lex_state = 16, .external_lex_state = 6},
+  [897] = {.lex_state = 16, .external_lex_state = 6},
   [898] = {.lex_state = 16, .external_lex_state = 6},
-  [899] = {.lex_state = 15},
+  [899] = {.lex_state = 16, .external_lex_state = 6},
   [900] = {.lex_state = 16, .external_lex_state = 6},
   [901] = {.lex_state = 15},
-  [902] = {.lex_state = 15},
+  [902] = {.lex_state = 16, .external_lex_state = 6},
   [903] = {.lex_state = 16, .external_lex_state = 6},
   [904] = {.lex_state = 16, .external_lex_state = 6},
   [905] = {.lex_state = 16, .external_lex_state = 6},
-  [906] = {.lex_state = 15},
+  [906] = {.lex_state = 16, .external_lex_state = 6},
   [907] = {.lex_state = 16},
   [908] = {.lex_state = 16, .external_lex_state = 6},
-  [909] = {.lex_state = 16, .external_lex_state = 6},
-  [910] = {.lex_state = 16, .external_lex_state = 6},
-  [911] = {.lex_state = 16, .external_lex_state = 6},
+  [909] = {.lex_state = 16},
+  [910] = {.lex_state = 15},
+  [911] = {.lex_state = 16},
   [912] = {.lex_state = 15},
-  [913] = {.lex_state = 16},
+  [913] = {.lex_state = 15},
   [914] = {.lex_state = 16},
   [915] = {.lex_state = 16, .external_lex_state = 6},
   [916] = {.lex_state = 16, .external_lex_state = 6},
   [917] = {.lex_state = 16},
-  [918] = {.lex_state = 15},
-  [919] = {.lex_state = 16, .external_lex_state = 6},
+  [918] = {.lex_state = 16, .external_lex_state = 6},
+  [919] = {.lex_state = 15},
   [920] = {.lex_state = 16, .external_lex_state = 6},
   [921] = {.lex_state = 16, .external_lex_state = 6},
   [922] = {.lex_state = 16, .external_lex_state = 6},
   [923] = {.lex_state = 16, .external_lex_state = 6},
-  [924] = {.lex_state = 16},
-  [925] = {.lex_state = 15},
+  [924] = {.lex_state = 16, .external_lex_state = 6},
+  [925] = {.lex_state = 16, .external_lex_state = 6},
   [926] = {.lex_state = 16, .external_lex_state = 6},
-  [927] = {.lex_state = 16, .external_lex_state = 6},
-  [928] = {.lex_state = 16, .external_lex_state = 6},
-  [929] = {.lex_state = 16, .external_lex_state = 6},
+  [927] = {.lex_state = 15},
+  [928] = {.lex_state = 15},
+  [929] = {.lex_state = 15},
   [930] = {.lex_state = 16, .external_lex_state = 6},
   [931] = {.lex_state = 51, .external_lex_state = 2},
-  [932] = {.lex_state = 16, .external_lex_state = 6},
+  [932] = {.lex_state = 51, .external_lex_state = 2},
   [933] = {.lex_state = 15},
-  [934] = {.lex_state = 51, .external_lex_state = 2},
+  [934] = {.lex_state = 15},
   [935] = {.lex_state = 51, .external_lex_state = 2},
   [936] = {.lex_state = 16, .external_lex_state = 6},
-  [937] = {.lex_state = 15},
-  [938] = {.lex_state = 15},
-  [939] = {.lex_state = 51, .external_lex_state = 2},
+  [937] = {.lex_state = 16, .external_lex_state = 6},
+  [938] = {.lex_state = 16, .external_lex_state = 6},
+  [939] = {.lex_state = 15},
   [940] = {.lex_state = 15},
   [941] = {.lex_state = 16, .external_lex_state = 6},
-  [942] = {.lex_state = 16, .external_lex_state = 6},
+  [942] = {.lex_state = 15},
   [943] = {.lex_state = 16, .external_lex_state = 6},
-  [944] = {.lex_state = 15},
-  [945] = {.lex_state = 16, .external_lex_state = 6},
+  [944] = {.lex_state = 16, .external_lex_state = 6},
+  [945] = {.lex_state = 15},
   [946] = {.lex_state = 15},
   [947] = {.lex_state = 16, .external_lex_state = 6},
   [948] = {.lex_state = 15},
-  [949] = {.lex_state = 15},
-  [950] = {.lex_state = 16, .external_lex_state = 6},
-  [951] = {.lex_state = 16, .external_lex_state = 6},
-  [952] = {.lex_state = 16},
-  [953] = {.lex_state = 16},
+  [949] = {.lex_state = 16},
+  [950] = {.lex_state = 15},
+  [951] = {.lex_state = 15},
+  [952] = {.lex_state = 15},
+  [953] = {.lex_state = 15},
   [954] = {.lex_state = 16},
-  [955] = {.lex_state = 16},
+  [955] = {.lex_state = 15},
   [956] = {.lex_state = 16},
   [957] = {.lex_state = 16},
   [958] = {.lex_state = 16},
@@ -7449,13 +7455,13 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [978] = {.lex_state = 16},
   [979] = {.lex_state = 16},
   [980] = {.lex_state = 16},
-  [981] = {.lex_state = 51, .external_lex_state = 2},
-  [982] = {.lex_state = 51, .external_lex_state = 2},
-  [983] = {.lex_state = 51, .external_lex_state = 2},
+  [981] = {.lex_state = 16},
+  [982] = {.lex_state = 16},
+  [983] = {.lex_state = 16},
   [984] = {.lex_state = 16},
   [985] = {.lex_state = 16},
   [986] = {.lex_state = 16},
-  [987] = {.lex_state = 51, .external_lex_state = 2},
+  [987] = {.lex_state = 16},
   [988] = {.lex_state = 16},
   [989] = {.lex_state = 16},
   [990] = {.lex_state = 16},
@@ -7464,67 +7470,67 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [993] = {.lex_state = 51, .external_lex_state = 2},
   [994] = {.lex_state = 51, .external_lex_state = 2},
   [995] = {.lex_state = 51, .external_lex_state = 2},
-  [996] = {.lex_state = 0},
-  [997] = {.lex_state = 51},
+  [996] = {.lex_state = 51},
+  [997] = {.lex_state = 0},
   [998] = {.lex_state = 0},
   [999] = {.lex_state = 51},
-  [1000] = {.lex_state = 51},
-  [1001] = {.lex_state = 0, .external_lex_state = 6},
-  [1002] = {.lex_state = 51},
-  [1003] = {.lex_state = 14},
+  [1000] = {.lex_state = 51, .external_lex_state = 2},
+  [1001] = {.lex_state = 51},
+  [1002] = {.lex_state = 51, .external_lex_state = 2},
+  [1003] = {.lex_state = 51, .external_lex_state = 2},
   [1004] = {.lex_state = 14},
   [1005] = {.lex_state = 51},
-  [1006] = {.lex_state = 51, .external_lex_state = 2},
-  [1007] = {.lex_state = 51, .external_lex_state = 2},
+  [1006] = {.lex_state = 16},
+  [1007] = {.lex_state = 0, .external_lex_state = 6},
   [1008] = {.lex_state = 0, .external_lex_state = 6},
   [1009] = {.lex_state = 51},
-  [1010] = {.lex_state = 51, .external_lex_state = 2},
+  [1010] = {.lex_state = 51},
   [1011] = {.lex_state = 16},
   [1012] = {.lex_state = 51},
-  [1013] = {.lex_state = 16},
+  [1013] = {.lex_state = 14},
   [1014] = {.lex_state = 51},
   [1015] = {.lex_state = 51},
-  [1016] = {.lex_state = 51},
-  [1017] = {.lex_state = 16},
+  [1016] = {.lex_state = 16},
+  [1017] = {.lex_state = 51},
   [1018] = {.lex_state = 51},
   [1019] = {.lex_state = 51},
   [1020] = {.lex_state = 51},
   [1021] = {.lex_state = 51},
   [1022] = {.lex_state = 51},
-  [1023] = {.lex_state = 51},
+  [1023] = {.lex_state = 51, .external_lex_state = 2},
   [1024] = {.lex_state = 51},
   [1025] = {.lex_state = 51},
   [1026] = {.lex_state = 51},
   [1027] = {.lex_state = 51},
-  [1028] = {.lex_state = 0},
-  [1029] = {.lex_state = 51, .external_lex_state = 2},
+  [1028] = {.lex_state = 51},
+  [1029] = {.lex_state = 0},
   [1030] = {.lex_state = 51},
-  [1031] = {.lex_state = 0},
+  [1031] = {.lex_state = 51},
   [1032] = {.lex_state = 51},
   [1033] = {.lex_state = 0},
-  [1034] = {.lex_state = 51},
+  [1034] = {.lex_state = 0},
   [1035] = {.lex_state = 0},
   [1036] = {.lex_state = 0},
   [1037] = {.lex_state = 51},
   [1038] = {.lex_state = 51},
   [1039] = {.lex_state = 16},
   [1040] = {.lex_state = 18, .external_lex_state = 11},
-  [1041] = {.lex_state = 51},
-  [1042] = {.lex_state = 16},
-  [1043] = {.lex_state = 51, .external_lex_state = 8},
+  [1041] = {.lex_state = 18, .external_lex_state = 11},
+  [1042] = {.lex_state = 18, .external_lex_state = 11},
+  [1043] = {.lex_state = 16},
   [1044] = {.lex_state = 18, .external_lex_state = 11},
   [1045] = {.lex_state = 18, .external_lex_state = 11},
   [1046] = {.lex_state = 18, .external_lex_state = 11},
-  [1047] = {.lex_state = 51},
-  [1048] = {.lex_state = 0},
-  [1049] = {.lex_state = 18, .external_lex_state = 11},
+  [1047] = {.lex_state = 18, .external_lex_state = 11},
+  [1048] = {.lex_state = 18, .external_lex_state = 11},
+  [1049] = {.lex_state = 0},
   [1050] = {.lex_state = 18, .external_lex_state = 11},
-  [1051] = {.lex_state = 18, .external_lex_state = 11},
-  [1052] = {.lex_state = 18, .external_lex_state = 11},
-  [1053] = {.lex_state = 16},
-  [1054] = {.lex_state = 18, .external_lex_state = 11},
-  [1055] = {.lex_state = 18, .external_lex_state = 11},
-  [1056] = {.lex_state = 18, .external_lex_state = 11},
+  [1051] = {.lex_state = 51},
+  [1052] = {.lex_state = 16},
+  [1053] = {.lex_state = 18, .external_lex_state = 11},
+  [1054] = {.lex_state = 51},
+  [1055] = {.lex_state = 16},
+  [1056] = {.lex_state = 51, .external_lex_state = 9},
   [1057] = {.lex_state = 18, .external_lex_state = 11},
   [1058] = {.lex_state = 18, .external_lex_state = 11},
   [1059] = {.lex_state = 18, .external_lex_state = 11},
@@ -7532,394 +7538,394 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1061] = {.lex_state = 18, .external_lex_state = 11},
   [1062] = {.lex_state = 18, .external_lex_state = 11},
   [1063] = {.lex_state = 51},
-  [1064] = {.lex_state = 16},
+  [1064] = {.lex_state = 51},
   [1065] = {.lex_state = 18, .external_lex_state = 11},
   [1066] = {.lex_state = 18, .external_lex_state = 11},
-  [1067] = {.lex_state = 51},
-  [1068] = {.lex_state = 51, .external_lex_state = 9},
-  [1069] = {.lex_state = 0},
+  [1067] = {.lex_state = 51, .external_lex_state = 8},
+  [1068] = {.lex_state = 18, .external_lex_state = 11},
+  [1069] = {.lex_state = 51},
   [1070] = {.lex_state = 0},
-  [1071] = {.lex_state = 51},
+  [1071] = {.lex_state = 0},
   [1072] = {.lex_state = 0},
   [1073] = {.lex_state = 0},
   [1074] = {.lex_state = 0},
   [1075] = {.lex_state = 0},
-  [1076] = {.lex_state = 51},
+  [1076] = {.lex_state = 0},
   [1077] = {.lex_state = 0},
-  [1078] = {.lex_state = 51},
+  [1078] = {.lex_state = 0},
   [1079] = {.lex_state = 51},
-  [1080] = {.lex_state = 0},
+  [1080] = {.lex_state = 51},
   [1081] = {.lex_state = 51},
-  [1082] = {.lex_state = 0},
+  [1082] = {.lex_state = 51},
   [1083] = {.lex_state = 0},
-  [1084] = {.lex_state = 0},
-  [1085] = {.lex_state = 51},
-  [1086] = {.lex_state = 0},
+  [1084] = {.lex_state = 51},
+  [1085] = {.lex_state = 0},
+  [1086] = {.lex_state = 51},
   [1087] = {.lex_state = 0},
-  [1088] = {.lex_state = 51},
-  [1089] = {.lex_state = 51},
-  [1090] = {.lex_state = 0},
+  [1088] = {.lex_state = 0},
+  [1089] = {.lex_state = 0},
+  [1090] = {.lex_state = 51},
   [1091] = {.lex_state = 0},
   [1092] = {.lex_state = 0},
   [1093] = {.lex_state = 0},
-  [1094] = {.lex_state = 0},
+  [1094] = {.lex_state = 51},
   [1095] = {.lex_state = 0},
-  [1096] = {.lex_state = 51},
-  [1097] = {.lex_state = 0},
+  [1096] = {.lex_state = 0},
+  [1097] = {.lex_state = 14},
   [1098] = {.lex_state = 0},
-  [1099] = {.lex_state = 0},
-  [1100] = {.lex_state = 0},
-  [1101] = {.lex_state = 51},
-  [1102] = {.lex_state = 51},
-  [1103] = {.lex_state = 14},
+  [1099] = {.lex_state = 51},
+  [1100] = {.lex_state = 14},
+  [1101] = {.lex_state = 0},
+  [1102] = {.lex_state = 0},
+  [1103] = {.lex_state = 0},
   [1104] = {.lex_state = 0},
   [1105] = {.lex_state = 51},
   [1106] = {.lex_state = 0},
-  [1107] = {.lex_state = 14},
-  [1108] = {.lex_state = 0},
-  [1109] = {.lex_state = 51},
-  [1110] = {.lex_state = 51},
+  [1107] = {.lex_state = 51},
+  [1108] = {.lex_state = 51},
+  [1109] = {.lex_state = 0},
+  [1110] = {.lex_state = 0, .external_lex_state = 6},
   [1111] = {.lex_state = 51},
-  [1112] = {.lex_state = 0, .external_lex_state = 6},
-  [1113] = {.lex_state = 0},
+  [1112] = {.lex_state = 14},
+  [1113] = {.lex_state = 51},
   [1114] = {.lex_state = 51},
-  [1115] = {.lex_state = 0, .external_lex_state = 6},
+  [1115] = {.lex_state = 14},
   [1116] = {.lex_state = 51},
-  [1117] = {.lex_state = 51},
-  [1118] = {.lex_state = 0, .external_lex_state = 6},
-  [1119] = {.lex_state = 18, .external_lex_state = 11},
-  [1120] = {.lex_state = 14},
-  [1121] = {.lex_state = 0, .external_lex_state = 6},
-  [1122] = {.lex_state = 0},
-  [1123] = {.lex_state = 0, .external_lex_state = 6},
-  [1124] = {.lex_state = 51},
+  [1117] = {.lex_state = 0, .external_lex_state = 6},
+  [1118] = {.lex_state = 51},
+  [1119] = {.lex_state = 51},
+  [1120] = {.lex_state = 51},
+  [1121] = {.lex_state = 51},
+  [1122] = {.lex_state = 51},
+  [1123] = {.lex_state = 51},
+  [1124] = {.lex_state = 0},
   [1125] = {.lex_state = 51},
-  [1126] = {.lex_state = 0, .external_lex_state = 6},
-  [1127] = {.lex_state = 51},
-  [1128] = {.lex_state = 51},
-  [1129] = {.lex_state = 0, .external_lex_state = 6},
-  [1130] = {.lex_state = 51},
-  [1131] = {.lex_state = 14},
+  [1126] = {.lex_state = 0},
+  [1127] = {.lex_state = 0, .external_lex_state = 6},
+  [1128] = {.lex_state = 14},
+  [1129] = {.lex_state = 0},
+  [1130] = {.lex_state = 14},
+  [1131] = {.lex_state = 51},
   [1132] = {.lex_state = 51},
   [1133] = {.lex_state = 51},
   [1134] = {.lex_state = 51},
-  [1135] = {.lex_state = 0},
-  [1136] = {.lex_state = 51},
+  [1135] = {.lex_state = 51},
+  [1136] = {.lex_state = 14},
   [1137] = {.lex_state = 0, .external_lex_state = 6},
-  [1138] = {.lex_state = 51},
-  [1139] = {.lex_state = 0, .external_lex_state = 6},
-  [1140] = {.lex_state = 51},
+  [1138] = {.lex_state = 0},
+  [1139] = {.lex_state = 51},
+  [1140] = {.lex_state = 0, .external_lex_state = 6},
   [1141] = {.lex_state = 51},
-  [1142] = {.lex_state = 51},
-  [1143] = {.lex_state = 51},
+  [1142] = {.lex_state = 0, .external_lex_state = 6},
+  [1143] = {.lex_state = 18, .external_lex_state = 11},
   [1144] = {.lex_state = 51},
-  [1145] = {.lex_state = 14},
-  [1146] = {.lex_state = 0},
-  [1147] = {.lex_state = 0, .external_lex_state = 6},
+  [1145] = {.lex_state = 0, .external_lex_state = 6},
+  [1146] = {.lex_state = 0, .external_lex_state = 6},
+  [1147] = {.lex_state = 0},
   [1148] = {.lex_state = 51},
-  [1149] = {.lex_state = 18, .external_lex_state = 11},
+  [1149] = {.lex_state = 51},
   [1150] = {.lex_state = 51},
-  [1151] = {.lex_state = 51},
-  [1152] = {.lex_state = 14},
-  [1153] = {.lex_state = 51},
+  [1151] = {.lex_state = 0},
+  [1152] = {.lex_state = 51},
+  [1153] = {.lex_state = 0, .external_lex_state = 6},
   [1154] = {.lex_state = 51},
   [1155] = {.lex_state = 51},
   [1156] = {.lex_state = 51},
   [1157] = {.lex_state = 51},
-  [1158] = {.lex_state = 51},
-  [1159] = {.lex_state = 14},
-  [1160] = {.lex_state = 16},
-  [1161] = {.lex_state = 0, .external_lex_state = 6},
-  [1162] = {.lex_state = 14},
-  [1163] = {.lex_state = 51},
-  [1164] = {.lex_state = 14},
+  [1158] = {.lex_state = 14},
+  [1159] = {.lex_state = 0},
+  [1160] = {.lex_state = 14},
+  [1161] = {.lex_state = 14},
+  [1162] = {.lex_state = 0},
+  [1163] = {.lex_state = 14},
+  [1164] = {.lex_state = 51},
   [1165] = {.lex_state = 14},
   [1166] = {.lex_state = 51},
-  [1167] = {.lex_state = 14},
+  [1167] = {.lex_state = 51},
   [1168] = {.lex_state = 14},
   [1169] = {.lex_state = 14},
-  [1170] = {.lex_state = 14},
+  [1170] = {.lex_state = 18, .external_lex_state = 11},
   [1171] = {.lex_state = 0},
-  [1172] = {.lex_state = 0},
+  [1172] = {.lex_state = 0, .external_lex_state = 6},
   [1173] = {.lex_state = 0},
-  [1174] = {.lex_state = 0},
-  [1175] = {.lex_state = 0},
-  [1176] = {.lex_state = 51},
-  [1177] = {.lex_state = 51},
+  [1174] = {.lex_state = 51},
+  [1175] = {.lex_state = 51},
+  [1176] = {.lex_state = 0, .external_lex_state = 6},
+  [1177] = {.lex_state = 16},
   [1178] = {.lex_state = 0},
   [1179] = {.lex_state = 0},
   [1180] = {.lex_state = 0},
   [1181] = {.lex_state = 0, .external_lex_state = 6},
-  [1182] = {.lex_state = 51},
+  [1182] = {.lex_state = 0},
   [1183] = {.lex_state = 0},
   [1184] = {.lex_state = 0},
   [1185] = {.lex_state = 0},
-  [1186] = {.lex_state = 0},
-  [1187] = {.lex_state = 0},
+  [1186] = {.lex_state = 51},
+  [1187] = {.lex_state = 51},
   [1188] = {.lex_state = 51},
   [1189] = {.lex_state = 51},
   [1190] = {.lex_state = 51},
-  [1191] = {.lex_state = 0, .external_lex_state = 6},
+  [1191] = {.lex_state = 51},
   [1192] = {.lex_state = 51},
-  [1193] = {.lex_state = 51},
-  [1194] = {.lex_state = 0},
-  [1195] = {.lex_state = 0},
-  [1196] = {.lex_state = 0},
-  [1197] = {.lex_state = 51},
+  [1193] = {.lex_state = 0},
+  [1194] = {.lex_state = 51},
+  [1195] = {.lex_state = 0, .external_lex_state = 6},
+  [1196] = {.lex_state = 14},
+  [1197] = {.lex_state = 0, .external_lex_state = 6},
   [1198] = {.lex_state = 51},
   [1199] = {.lex_state = 0},
   [1200] = {.lex_state = 0},
-  [1201] = {.lex_state = 51},
+  [1201] = {.lex_state = 0},
   [1202] = {.lex_state = 0},
   [1203] = {.lex_state = 0},
-  [1204] = {.lex_state = 0},
+  [1204] = {.lex_state = 0, .external_lex_state = 6},
   [1205] = {.lex_state = 0},
-  [1206] = {.lex_state = 0},
-  [1207] = {.lex_state = 0},
-  [1208] = {.lex_state = 51},
-  [1209] = {.lex_state = 51},
+  [1206] = {.lex_state = 51},
+  [1207] = {.lex_state = 0, .external_lex_state = 6},
+  [1208] = {.lex_state = 0, .external_lex_state = 6},
+  [1209] = {.lex_state = 16},
   [1210] = {.lex_state = 0, .external_lex_state = 6},
-  [1211] = {.lex_state = 0},
-  [1212] = {.lex_state = 0},
-  [1213] = {.lex_state = 16},
-  [1214] = {.lex_state = 51},
-  [1215] = {.lex_state = 0},
+  [1211] = {.lex_state = 0, .external_lex_state = 6},
+  [1212] = {.lex_state = 0, .external_lex_state = 6},
+  [1213] = {.lex_state = 0},
+  [1214] = {.lex_state = 14},
+  [1215] = {.lex_state = 51},
   [1216] = {.lex_state = 0},
   [1217] = {.lex_state = 0},
   [1218] = {.lex_state = 0},
-  [1219] = {.lex_state = 0, .external_lex_state = 6},
-  [1220] = {.lex_state = 0, .external_lex_state = 6},
-  [1221] = {.lex_state = 14},
+  [1219] = {.lex_state = 0},
+  [1220] = {.lex_state = 0},
+  [1221] = {.lex_state = 0},
   [1222] = {.lex_state = 0},
-  [1223] = {.lex_state = 0, .external_lex_state = 6},
+  [1223] = {.lex_state = 51},
   [1224] = {.lex_state = 0},
-  [1225] = {.lex_state = 0, .external_lex_state = 6},
-  [1226] = {.lex_state = 0},
-  [1227] = {.lex_state = 0},
-  [1228] = {.lex_state = 0},
+  [1225] = {.lex_state = 0},
+  [1226] = {.lex_state = 51},
+  [1227] = {.lex_state = 51},
+  [1228] = {.lex_state = 51},
   [1229] = {.lex_state = 0},
-  [1230] = {.lex_state = 0},
-  [1231] = {.lex_state = 51},
+  [1230] = {.lex_state = 51},
+  [1231] = {.lex_state = 0},
   [1232] = {.lex_state = 0},
-  [1233] = {.lex_state = 51},
+  [1233] = {.lex_state = 0, .external_lex_state = 6},
   [1234] = {.lex_state = 0},
-  [1235] = {.lex_state = 0, .external_lex_state = 6},
+  [1235] = {.lex_state = 0},
   [1236] = {.lex_state = 0},
-  [1237] = {.lex_state = 14},
+  [1237] = {.lex_state = 0},
   [1238] = {.lex_state = 0},
-  [1239] = {.lex_state = 0, .external_lex_state = 6},
-  [1240] = {.lex_state = 51},
-  [1241] = {.lex_state = 0, .external_lex_state = 6},
-  [1242] = {.lex_state = 16, .external_lex_state = 6},
-  [1243] = {.lex_state = 51},
-  [1244] = {.lex_state = 51},
-  [1245] = {.lex_state = 16, .external_lex_state = 6},
-  [1246] = {.lex_state = 51},
-  [1247] = {.lex_state = 0, .external_lex_state = 6},
-  [1248] = {.lex_state = 18, .external_lex_state = 11},
+  [1239] = {.lex_state = 0},
+  [1240] = {.lex_state = 0},
+  [1241] = {.lex_state = 0},
+  [1242] = {.lex_state = 0},
+  [1243] = {.lex_state = 0},
+  [1244] = {.lex_state = 18, .external_lex_state = 11},
+  [1245] = {.lex_state = 18, .external_lex_state = 11},
+  [1246] = {.lex_state = 16, .external_lex_state = 6},
+  [1247] = {.lex_state = 51},
+  [1248] = {.lex_state = 0},
   [1249] = {.lex_state = 51},
-  [1250] = {.lex_state = 51},
-  [1251] = {.lex_state = 16},
-  [1252] = {.lex_state = 18, .external_lex_state = 11},
+  [1250] = {.lex_state = 18, .external_lex_state = 11},
+  [1251] = {.lex_state = 16, .external_lex_state = 6},
+  [1252] = {.lex_state = 16},
   [1253] = {.lex_state = 51},
   [1254] = {.lex_state = 51},
-  [1255] = {.lex_state = 0, .external_lex_state = 6},
+  [1255] = {.lex_state = 0},
   [1256] = {.lex_state = 16},
-  [1257] = {.lex_state = 0},
-  [1258] = {.lex_state = 0},
-  [1259] = {.lex_state = 18, .external_lex_state = 11},
-  [1260] = {.lex_state = 18, .external_lex_state = 11},
+  [1257] = {.lex_state = 51},
+  [1258] = {.lex_state = 18, .external_lex_state = 11},
+  [1259] = {.lex_state = 51},
+  [1260] = {.lex_state = 51},
   [1261] = {.lex_state = 51},
-  [1262] = {.lex_state = 16, .external_lex_state = 6},
-  [1263] = {.lex_state = 51},
+  [1262] = {.lex_state = 51},
+  [1263] = {.lex_state = 0},
   [1264] = {.lex_state = 51},
   [1265] = {.lex_state = 51},
-  [1266] = {.lex_state = 51},
-  [1267] = {.lex_state = 51},
-  [1268] = {.lex_state = 0},
-  [1269] = {.lex_state = 16},
-  [1270] = {.lex_state = 14},
-  [1271] = {.lex_state = 0, .external_lex_state = 6},
-  [1272] = {.lex_state = 14},
-  [1273] = {.lex_state = 51},
+  [1266] = {.lex_state = 0, .external_lex_state = 6},
+  [1267] = {.lex_state = 16, .external_lex_state = 6},
+  [1268] = {.lex_state = 0, .external_lex_state = 6},
+  [1269] = {.lex_state = 51},
+  [1270] = {.lex_state = 0, .external_lex_state = 6},
+  [1271] = {.lex_state = 51},
+  [1272] = {.lex_state = 51},
+  [1273] = {.lex_state = 14},
   [1274] = {.lex_state = 14},
-  [1275] = {.lex_state = 18, .external_lex_state = 11},
-  [1276] = {.lex_state = 51},
-  [1277] = {.lex_state = 51},
-  [1278] = {.lex_state = 0, .external_lex_state = 6},
+  [1275] = {.lex_state = 51},
+  [1276] = {.lex_state = 0, .external_lex_state = 6},
+  [1277] = {.lex_state = 18, .external_lex_state = 11},
+  [1278] = {.lex_state = 51},
   [1279] = {.lex_state = 51},
-  [1280] = {.lex_state = 51},
-  [1281] = {.lex_state = 18, .external_lex_state = 11},
+  [1280] = {.lex_state = 18, .external_lex_state = 11},
+  [1281] = {.lex_state = 14},
   [1282] = {.lex_state = 51},
-  [1283] = {.lex_state = 0},
-  [1284] = {.lex_state = 0, .external_lex_state = 6},
-  [1285] = {.lex_state = 51},
-  [1286] = {.lex_state = 0, .external_lex_state = 6},
-  [1287] = {.lex_state = 10},
-  [1288] = {.lex_state = 0, .external_lex_state = 6},
-  [1289] = {.lex_state = 14},
-  [1290] = {.lex_state = 0, .external_lex_state = 6},
-  [1291] = {.lex_state = 51},
-  [1292] = {.lex_state = 0},
-  [1293] = {.lex_state = 16, .external_lex_state = 6},
+  [1283] = {.lex_state = 16},
+  [1284] = {.lex_state = 51},
+  [1285] = {.lex_state = 0},
+  [1286] = {.lex_state = 14},
+  [1287] = {.lex_state = 0, .external_lex_state = 6},
+  [1288] = {.lex_state = 10},
+  [1289] = {.lex_state = 0},
+  [1290] = {.lex_state = 16, .external_lex_state = 6},
+  [1291] = {.lex_state = 0, .external_lex_state = 6},
+  [1292] = {.lex_state = 0, .external_lex_state = 6},
+  [1293] = {.lex_state = 14},
   [1294] = {.lex_state = 0},
-  [1295] = {.lex_state = 0, .external_lex_state = 6},
-  [1296] = {.lex_state = 14},
-  [1297] = {.lex_state = 0},
-  [1298] = {.lex_state = 0},
+  [1295] = {.lex_state = 51},
+  [1296] = {.lex_state = 0, .external_lex_state = 6},
+  [1297] = {.lex_state = 0, .external_lex_state = 6},
+  [1298] = {.lex_state = 0, .external_lex_state = 6},
   [1299] = {.lex_state = 0, .external_lex_state = 6},
   [1300] = {.lex_state = 0, .external_lex_state = 6},
-  [1301] = {.lex_state = 14},
-  [1302] = {.lex_state = 0, .external_lex_state = 6},
+  [1301] = {.lex_state = 51},
+  [1302] = {.lex_state = 0},
   [1303] = {.lex_state = 0},
   [1304] = {.lex_state = 0, .external_lex_state = 6},
   [1305] = {.lex_state = 10},
   [1306] = {.lex_state = 0},
-  [1307] = {.lex_state = 51},
+  [1307] = {.lex_state = 0},
   [1308] = {.lex_state = 0},
-  [1309] = {.lex_state = 0},
-  [1310] = {.lex_state = 0},
+  [1309] = {.lex_state = 51},
+  [1310] = {.lex_state = 51},
   [1311] = {.lex_state = 0},
-  [1312] = {.lex_state = 51},
-  [1313] = {.lex_state = 0, .external_lex_state = 6},
-  [1314] = {.lex_state = 51},
-  [1315] = {.lex_state = 10},
-  [1316] = {.lex_state = 0, .external_lex_state = 6},
-  [1317] = {.lex_state = 0},
+  [1312] = {.lex_state = 0},
+  [1313] = {.lex_state = 0},
+  [1314] = {.lex_state = 0, .external_lex_state = 6},
+  [1315] = {.lex_state = 14},
+  [1316] = {.lex_state = 0},
+  [1317] = {.lex_state = 10},
   [1318] = {.lex_state = 0},
-  [1319] = {.lex_state = 0, .external_lex_state = 6},
-  [1320] = {.lex_state = 0},
-  [1321] = {.lex_state = 0},
-  [1322] = {.lex_state = 0, .external_lex_state = 6},
-  [1323] = {.lex_state = 0, .external_lex_state = 6},
-  [1324] = {.lex_state = 0},
-  [1325] = {.lex_state = 51},
+  [1319] = {.lex_state = 0},
+  [1320] = {.lex_state = 0, .external_lex_state = 6},
+  [1321] = {.lex_state = 0, .external_lex_state = 6},
+  [1322] = {.lex_state = 0},
+  [1323] = {.lex_state = 51},
+  [1324] = {.lex_state = 0, .external_lex_state = 6},
+  [1325] = {.lex_state = 0, .external_lex_state = 6},
   [1326] = {.lex_state = 0, .external_lex_state = 6},
   [1327] = {.lex_state = 0, .external_lex_state = 6},
   [1328] = {.lex_state = 0, .external_lex_state = 6},
   [1329] = {.lex_state = 0, .external_lex_state = 6},
-  [1330] = {.lex_state = 14},
-  [1331] = {.lex_state = 51},
-  [1332] = {.lex_state = 0, .external_lex_state = 6},
-  [1333] = {.lex_state = 51},
+  [1330] = {.lex_state = 0},
+  [1331] = {.lex_state = 0},
+  [1332] = {.lex_state = 0},
+  [1333] = {.lex_state = 0},
   [1334] = {.lex_state = 0},
   [1335] = {.lex_state = 0, .external_lex_state = 6},
-  [1336] = {.lex_state = 0, .external_lex_state = 6},
-  [1337] = {.lex_state = 0},
+  [1336] = {.lex_state = 51},
+  [1337] = {.lex_state = 14},
   [1338] = {.lex_state = 0},
-  [1339] = {.lex_state = 0, .external_lex_state = 6},
+  [1339] = {.lex_state = 0},
   [1340] = {.lex_state = 0},
   [1341] = {.lex_state = 0},
-  [1342] = {.lex_state = 0},
-  [1343] = {.lex_state = 16},
-  [1344] = {.lex_state = 0},
-  [1345] = {.lex_state = 0, .external_lex_state = 6},
+  [1342] = {.lex_state = 0, .external_lex_state = 6},
+  [1343] = {.lex_state = 0, .external_lex_state = 6},
+  [1344] = {.lex_state = 0, .external_lex_state = 6},
+  [1345] = {.lex_state = 51},
   [1346] = {.lex_state = 0, .external_lex_state = 6},
-  [1347] = {.lex_state = 0},
-  [1348] = {.lex_state = 51},
-  [1349] = {.lex_state = 0},
-  [1350] = {.lex_state = 51},
-  [1351] = {.lex_state = 0, .external_lex_state = 6},
-  [1352] = {.lex_state = 16},
+  [1347] = {.lex_state = 51, .external_lex_state = 9},
+  [1348] = {.lex_state = 51, .external_lex_state = 8},
+  [1349] = {.lex_state = 0, .external_lex_state = 6},
+  [1350] = {.lex_state = 0, .external_lex_state = 6},
+  [1351] = {.lex_state = 0},
+  [1352] = {.lex_state = 0},
   [1353] = {.lex_state = 0},
   [1354] = {.lex_state = 0},
-  [1355] = {.lex_state = 0},
-  [1356] = {.lex_state = 14},
-  [1357] = {.lex_state = 0},
-  [1358] = {.lex_state = 51},
+  [1355] = {.lex_state = 51},
+  [1356] = {.lex_state = 51},
+  [1357] = {.lex_state = 0, .external_lex_state = 6},
+  [1358] = {.lex_state = 0},
   [1359] = {.lex_state = 51},
-  [1360] = {.lex_state = 0},
-  [1361] = {.lex_state = 0},
-  [1362] = {.lex_state = 0},
-  [1363] = {.lex_state = 51},
-  [1364] = {.lex_state = 51},
-  [1365] = {.lex_state = 0},
-  [1366] = {.lex_state = 0, .external_lex_state = 6},
-  [1367] = {.lex_state = 0},
-  [1368] = {.lex_state = 0, .external_lex_state = 6},
-  [1369] = {.lex_state = 51, .external_lex_state = 9},
-  [1370] = {.lex_state = 51},
+  [1360] = {.lex_state = 14},
+  [1361] = {.lex_state = 51},
+  [1362] = {.lex_state = 0, .external_lex_state = 6},
+  [1363] = {.lex_state = 0, .external_lex_state = 6},
+  [1364] = {.lex_state = 0},
+  [1365] = {.lex_state = 0, .external_lex_state = 6},
+  [1366] = {.lex_state = 0},
+  [1367] = {.lex_state = 0, .external_lex_state = 6},
+  [1368] = {.lex_state = 0},
+  [1369] = {.lex_state = 0},
+  [1370] = {.lex_state = 0},
   [1371] = {.lex_state = 51},
-  [1372] = {.lex_state = 0, .external_lex_state = 6},
-  [1373] = {.lex_state = 51, .external_lex_state = 8},
+  [1372] = {.lex_state = 0},
+  [1373] = {.lex_state = 0},
   [1374] = {.lex_state = 0},
   [1375] = {.lex_state = 0},
-  [1376] = {.lex_state = 51},
+  [1376] = {.lex_state = 0},
   [1377] = {.lex_state = 51},
   [1378] = {.lex_state = 51},
   [1379] = {.lex_state = 0},
-  [1380] = {.lex_state = 0, .external_lex_state = 6},
-  [1381] = {.lex_state = 0},
+  [1380] = {.lex_state = 0},
+  [1381] = {.lex_state = 51},
   [1382] = {.lex_state = 51},
   [1383] = {.lex_state = 51},
-  [1384] = {.lex_state = 0},
-  [1385] = {.lex_state = 0},
-  [1386] = {.lex_state = 51},
-  [1387] = {.lex_state = 0},
+  [1384] = {.lex_state = 16},
+  [1385] = {.lex_state = 0, .external_lex_state = 6},
+  [1386] = {.lex_state = 0, .external_lex_state = 6},
+  [1387] = {.lex_state = 51},
   [1388] = {.lex_state = 0, .external_lex_state = 6},
-  [1389] = {.lex_state = 0},
-  [1390] = {.lex_state = 0, .external_lex_state = 6},
-  [1391] = {.lex_state = 0},
-  [1392] = {.lex_state = 0, .external_lex_state = 6},
-  [1393] = {.lex_state = 0, .external_lex_state = 6},
-  [1394] = {.lex_state = 0, .external_lex_state = 6},
-  [1395] = {.lex_state = 51},
-  [1396] = {.lex_state = 0},
-  [1397] = {.lex_state = 0},
-  [1398] = {.lex_state = 0},
+  [1389] = {.lex_state = 0, .external_lex_state = 6},
+  [1390] = {.lex_state = 0},
+  [1391] = {.lex_state = 51},
+  [1392] = {.lex_state = 16},
+  [1393] = {.lex_state = 51},
+  [1394] = {.lex_state = 0},
+  [1395] = {.lex_state = 0},
+  [1396] = {.lex_state = 0, .external_lex_state = 6},
+  [1397] = {.lex_state = 51},
+  [1398] = {.lex_state = 51},
   [1399] = {.lex_state = 0, .external_lex_state = 6},
   [1400] = {.lex_state = 51},
   [1401] = {.lex_state = 0, .external_lex_state = 6},
-  [1402] = {.lex_state = 0, .external_lex_state = 6},
+  [1402] = {.lex_state = 0},
   [1403] = {.lex_state = 0},
-  [1404] = {.lex_state = 0, .external_lex_state = 6},
-  [1405] = {.lex_state = 0},
-  [1406] = {.lex_state = 51},
-  [1407] = {.lex_state = 51},
-  [1408] = {.lex_state = 51},
-  [1409] = {.lex_state = 0},
-  [1410] = {.lex_state = 51},
-  [1411] = {.lex_state = 0, .external_lex_state = 6},
+  [1404] = {.lex_state = 0},
+  [1405] = {.lex_state = 51},
+  [1406] = {.lex_state = 0, .external_lex_state = 6},
+  [1407] = {.lex_state = 0},
+  [1408] = {.lex_state = 0},
+  [1409] = {.lex_state = 0, .external_lex_state = 6},
+  [1410] = {.lex_state = 14},
+  [1411] = {.lex_state = 0},
   [1412] = {.lex_state = 0},
   [1413] = {.lex_state = 0},
   [1414] = {.lex_state = 0},
   [1415] = {.lex_state = 0},
   [1416] = {.lex_state = 0},
-  [1417] = {.lex_state = 51},
+  [1417] = {.lex_state = 0},
   [1418] = {.lex_state = 0},
-  [1419] = {.lex_state = 0},
+  [1419] = {.lex_state = 14},
   [1420] = {.lex_state = 0},
-  [1421] = {.lex_state = 0},
-  [1422] = {.lex_state = 51},
-  [1423] = {.lex_state = 0},
-  [1424] = {.lex_state = 0},
-  [1425] = {.lex_state = 0, .external_lex_state = 6},
+  [1421] = {.lex_state = 10},
+  [1422] = {.lex_state = 14},
+  [1423] = {.lex_state = 51},
+  [1424] = {.lex_state = 51},
+  [1425] = {.lex_state = 0},
   [1426] = {.lex_state = 0},
-  [1427] = {.lex_state = 0},
-  [1428] = {.lex_state = 0, .external_lex_state = 6},
-  [1429] = {.lex_state = 0},
+  [1427] = {.lex_state = 10},
+  [1428] = {.lex_state = 0},
+  [1429] = {.lex_state = 0, .external_lex_state = 6},
   [1430] = {.lex_state = 0},
-  [1431] = {.lex_state = 10},
+  [1431] = {.lex_state = 0},
   [1432] = {.lex_state = 0},
   [1433] = {.lex_state = 0},
   [1434] = {.lex_state = 0},
-  [1435] = {.lex_state = 14},
-  [1436] = {.lex_state = 0, .external_lex_state = 6},
-  [1437] = {.lex_state = 51},
+  [1435] = {.lex_state = 51},
+  [1436] = {.lex_state = 0},
+  [1437] = {.lex_state = 0},
   [1438] = {.lex_state = 0},
-  [1439] = {.lex_state = 0},
-  [1440] = {.lex_state = 0},
+  [1439] = {.lex_state = 0, .external_lex_state = 6},
+  [1440] = {.lex_state = 51},
   [1441] = {.lex_state = 0},
-  [1442] = {.lex_state = 0, .external_lex_state = 6},
+  [1442] = {.lex_state = 0},
   [1443] = {.lex_state = 0},
   [1444] = {.lex_state = 0},
   [1445] = {.lex_state = 0},
-  [1446] = {.lex_state = 0, .external_lex_state = 6},
+  [1446] = {.lex_state = 10},
   [1447] = {.lex_state = 0},
   [1448] = {.lex_state = 0},
   [1449] = {.lex_state = 0},
   [1450] = {.lex_state = 0},
-  [1451] = {.lex_state = 16},
+  [1451] = {.lex_state = 0},
   [1452] = {.lex_state = 0},
   [1453] = {.lex_state = 0},
   [1454] = {.lex_state = 0},
@@ -7929,97 +7935,97 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1458] = {.lex_state = 0},
   [1459] = {.lex_state = 0},
   [1460] = {.lex_state = 0},
-  [1461] = {.lex_state = 0},
+  [1461] = {.lex_state = 51},
   [1462] = {.lex_state = 0},
-  [1463] = {.lex_state = 10},
-  [1464] = {.lex_state = 0},
+  [1463] = {.lex_state = 0},
+  [1464] = {.lex_state = 51},
   [1465] = {.lex_state = 0},
-  [1466] = {.lex_state = 0},
-  [1467] = {.lex_state = 0},
+  [1466] = {.lex_state = 14},
+  [1467] = {.lex_state = 51},
   [1468] = {.lex_state = 0},
   [1469] = {.lex_state = 0},
-  [1470] = {.lex_state = 0},
+  [1470] = {.lex_state = 0, .external_lex_state = 6},
   [1471] = {.lex_state = 0},
   [1472] = {.lex_state = 0},
-  [1473] = {.lex_state = 0},
-  [1474] = {.lex_state = 51},
-  [1475] = {.lex_state = 0},
+  [1473] = {.lex_state = 51},
+  [1474] = {.lex_state = 0},
+  [1475] = {.lex_state = 0, .external_lex_state = 6},
   [1476] = {.lex_state = 0},
   [1477] = {.lex_state = 0},
-  [1478] = {.lex_state = 51},
-  [1479] = {.lex_state = 0},
+  [1478] = {.lex_state = 0},
+  [1479] = {.lex_state = 51},
   [1480] = {.lex_state = 0},
   [1481] = {.lex_state = 51},
-  [1482] = {.lex_state = 0},
+  [1482] = {.lex_state = 51},
   [1483] = {.lex_state = 0},
   [1484] = {.lex_state = 0},
-  [1485] = {.lex_state = 0, .external_lex_state = 6},
-  [1486] = {.lex_state = 0},
+  [1485] = {.lex_state = 0},
+  [1486] = {.lex_state = 0, .external_lex_state = 6},
   [1487] = {.lex_state = 51},
-  [1488] = {.lex_state = 0},
+  [1488] = {.lex_state = 0, .external_lex_state = 6},
   [1489] = {.lex_state = 0},
-  [1490] = {.lex_state = 0},
-  [1491] = {.lex_state = 51},
-  [1492] = {.lex_state = 14},
+  [1490] = {.lex_state = 10},
+  [1491] = {.lex_state = 0},
+  [1492] = {.lex_state = 0},
   [1493] = {.lex_state = 0},
-  [1494] = {.lex_state = 51},
-  [1495] = {.lex_state = 51},
+  [1494] = {.lex_state = 0},
+  [1495] = {.lex_state = 0},
   [1496] = {.lex_state = 0},
   [1497] = {.lex_state = 0},
-  [1498] = {.lex_state = 0},
-  [1499] = {.lex_state = 10},
+  [1498] = {.lex_state = 51},
+  [1499] = {.lex_state = 0},
   [1500] = {.lex_state = 0},
   [1501] = {.lex_state = 0},
-  [1502] = {.lex_state = 14},
+  [1502] = {.lex_state = 0},
   [1503] = {.lex_state = 0},
-  [1504] = {.lex_state = 0},
+  [1504] = {.lex_state = 16},
   [1505] = {.lex_state = 0},
   [1506] = {.lex_state = 0},
-  [1507] = {.lex_state = 51},
-  [1508] = {.lex_state = 10},
-  [1509] = {.lex_state = 0, .external_lex_state = 6},
-  [1510] = {.lex_state = 51},
-  [1511] = {.lex_state = 0},
-  [1512] = {.lex_state = 51},
-  [1513] = {.lex_state = 0},
-  [1514] = {.lex_state = 0},
-  [1515] = {.lex_state = 0},
+  [1507] = {.lex_state = 0},
+  [1508] = {.lex_state = 0},
+  [1509] = {.lex_state = 51},
+  [1510] = {.lex_state = 0},
+  [1511] = {.lex_state = 51},
+  [1512] = {.lex_state = 0},
+  [1513] = {.lex_state = 0, .external_lex_state = 6},
+  [1514] = {.lex_state = 0, .external_lex_state = 6},
+  [1515] = {.lex_state = 51},
   [1516] = {.lex_state = 51},
-  [1517] = {.lex_state = 10},
-  [1518] = {.lex_state = 0},
+  [1517] = {.lex_state = 51},
+  [1518] = {.lex_state = 51},
   [1519] = {.lex_state = 0},
   [1520] = {.lex_state = 51},
   [1521] = {.lex_state = 0},
-  [1522] = {.lex_state = 51},
+  [1522] = {.lex_state = 0},
   [1523] = {.lex_state = 0},
-  [1524] = {.lex_state = 51},
+  [1524] = {.lex_state = 0},
   [1525] = {.lex_state = 0},
-  [1526] = {.lex_state = 0},
-  [1527] = {.lex_state = 14},
+  [1526] = {.lex_state = 51},
+  [1527] = {.lex_state = 0},
   [1528] = {.lex_state = 0},
-  [1529] = {.lex_state = 0, .external_lex_state = 6},
-  [1530] = {.lex_state = 0},
+  [1529] = {.lex_state = 51},
+  [1530] = {.lex_state = 51},
   [1531] = {.lex_state = 0},
   [1532] = {.lex_state = 0},
   [1533] = {.lex_state = 0},
   [1534] = {.lex_state = 0},
-  [1535] = {.lex_state = 0},
-  [1536] = {.lex_state = 17},
+  [1535] = {.lex_state = 10},
+  [1536] = {.lex_state = 0},
   [1537] = {.lex_state = 0},
-  [1538] = {.lex_state = 17},
-  [1539] = {.lex_state = 0},
-  [1540] = {.lex_state = 0},
-  [1541] = {.lex_state = 17},
+  [1538] = {.lex_state = 0},
+  [1539] = {.lex_state = 0, .external_lex_state = 6},
+  [1540] = {.lex_state = 0, .external_lex_state = 6},
+  [1541] = {.lex_state = 0},
   [1542] = {.lex_state = 0},
-  [1543] = {.lex_state = 16},
-  [1544] = {.lex_state = 17},
-  [1545] = {.lex_state = 0, .external_lex_state = 6},
-  [1546] = {.lex_state = 17},
-  [1547] = {.lex_state = 51},
-  [1548] = {.lex_state = 17},
-  [1549] = {.lex_state = 0},
-  [1550] = {.lex_state = 17},
-  [1551] = {.lex_state = 51},
+  [1543] = {.lex_state = 0},
+  [1544] = {.lex_state = 16},
+  [1545] = {.lex_state = 0},
+  [1546] = {.lex_state = 0},
+  [1547] = {.lex_state = 0},
+  [1548] = {.lex_state = 0, .external_lex_state = 6},
+  [1549] = {.lex_state = 0, .external_lex_state = 6},
+  [1550] = {.lex_state = 0, .external_lex_state = 6},
+  [1551] = {.lex_state = 0},
   [1552] = {.lex_state = 0, .external_lex_state = 6},
   [1553] = {.lex_state = 0},
   [1554] = {.lex_state = 0, .external_lex_state = 6},
@@ -8027,72 +8033,72 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1556] = {.lex_state = 0},
   [1557] = {.lex_state = 0},
   [1558] = {.lex_state = 0},
-  [1559] = {.lex_state = 0, .external_lex_state = 6},
-  [1560] = {.lex_state = 17},
-  [1561] = {.lex_state = 0, .external_lex_state = 6},
+  [1559] = {.lex_state = 0},
+  [1560] = {.lex_state = 0},
+  [1561] = {.lex_state = 0},
   [1562] = {.lex_state = 0},
   [1563] = {.lex_state = 0},
-  [1564] = {.lex_state = 51},
+  [1564] = {.lex_state = 0, .external_lex_state = 6},
   [1565] = {.lex_state = 0, .external_lex_state = 6},
-  [1566] = {.lex_state = 0},
+  [1566] = {.lex_state = 0, .external_lex_state = 6},
   [1567] = {.lex_state = 0},
-  [1568] = {.lex_state = 0},
-  [1569] = {.lex_state = 0, .external_lex_state = 6},
-  [1570] = {.lex_state = 0},
-  [1571] = {.lex_state = 0, .external_lex_state = 6},
-  [1572] = {.lex_state = 0},
-  [1573] = {.lex_state = 0},
-  [1574] = {.lex_state = 0},
-  [1575] = {.lex_state = 0},
+  [1568] = {.lex_state = 0, .external_lex_state = 6},
+  [1569] = {.lex_state = 0},
+  [1570] = {.lex_state = 0, .external_lex_state = 6},
+  [1571] = {.lex_state = 0},
+  [1572] = {.lex_state = 0, .external_lex_state = 6},
+  [1573] = {.lex_state = 17},
+  [1574] = {.lex_state = 17},
+  [1575] = {.lex_state = 17},
   [1576] = {.lex_state = 17},
   [1577] = {.lex_state = 0},
-  [1578] = {.lex_state = 0, .external_lex_state = 6},
+  [1578] = {.lex_state = 0},
   [1579] = {.lex_state = 0, .external_lex_state = 6},
-  [1580] = {.lex_state = 0, .external_lex_state = 6},
+  [1580] = {.lex_state = 51},
   [1581] = {.lex_state = 0, .external_lex_state = 6},
   [1582] = {.lex_state = 0},
-  [1583] = {.lex_state = 0},
-  [1584] = {.lex_state = 0, .external_lex_state = 6},
-  [1585] = {.lex_state = 0, .external_lex_state = 6},
-  [1586] = {.lex_state = 0, .external_lex_state = 6},
+  [1583] = {.lex_state = 17},
+  [1584] = {.lex_state = 51},
+  [1585] = {.lex_state = 17},
+  [1586] = {.lex_state = 0},
   [1587] = {.lex_state = 0},
-  [1588] = {.lex_state = 0},
-  [1589] = {.lex_state = 0, .external_lex_state = 6},
-  [1590] = {.lex_state = 0},
-  [1591] = {.lex_state = 0, .external_lex_state = 6},
+  [1588] = {.lex_state = 17},
+  [1589] = {.lex_state = 0},
+  [1590] = {.lex_state = 17},
+  [1591] = {.lex_state = 17},
   [1592] = {.lex_state = 0},
   [1593] = {.lex_state = 0},
-  [1594] = {.lex_state = 51},
-  [1595] = {.lex_state = 0},
+  [1594] = {.lex_state = 0},
+  [1595] = {.lex_state = 0, .external_lex_state = 6},
   [1596] = {.lex_state = 0, .external_lex_state = 6},
-  [1597] = {.lex_state = 0},
-  [1598] = {.lex_state = 0},
-  [1599] = {.lex_state = 0},
-  [1600] = {.lex_state = 0},
-  [1601] = {.lex_state = 0},
-  [1602] = {.lex_state = 0},
-  [1603] = {.lex_state = 0, .external_lex_state = 6},
+  [1597] = {.lex_state = 0, .external_lex_state = 6},
+  [1598] = {.lex_state = 0, .external_lex_state = 6},
+  [1599] = {.lex_state = 17},
+  [1600] = {.lex_state = 51},
+  [1601] = {.lex_state = 0, .external_lex_state = 6},
+  [1602] = {.lex_state = 0, .external_lex_state = 6},
+  [1603] = {.lex_state = 0},
   [1604] = {.lex_state = 0},
-  [1605] = {.lex_state = 0, .external_lex_state = 6},
-  [1606] = {.lex_state = 51},
+  [1605] = {.lex_state = 0},
+  [1606] = {.lex_state = 0},
   [1607] = {.lex_state = 0},
-  [1608] = {.lex_state = 0, .external_lex_state = 6},
+  [1608] = {.lex_state = 51},
   [1609] = {.lex_state = 0},
-  [1610] = {.lex_state = 0, .external_lex_state = 6},
+  [1610] = {.lex_state = 0},
   [1611] = {.lex_state = 0},
-  [1612] = {.lex_state = 17},
-  [1613] = {.lex_state = 51},
-  [1614] = {.lex_state = 0},
+  [1612] = {.lex_state = 0},
+  [1613] = {.lex_state = 0},
+  [1614] = {.lex_state = 0, .external_lex_state = 6},
   [1615] = {.lex_state = 0},
-  [1616] = {.lex_state = 0},
-  [1617] = {.lex_state = 0},
+  [1616] = {.lex_state = 51},
+  [1617] = {.lex_state = 51},
   [1618] = {.lex_state = 0},
   [1619] = {.lex_state = 0},
   [1620] = {.lex_state = 0},
   [1621] = {.lex_state = 0},
-  [1622] = {.lex_state = 51},
+  [1622] = {.lex_state = 0},
   [1623] = {.lex_state = 0},
-  [1624] = {.lex_state = 0},
+  [1624] = {.lex_state = 51},
   [1625] = {.lex_state = 0},
   [1626] = {.lex_state = 51},
   [1627] = {.lex_state = 0},
@@ -8100,72 +8106,72 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1629] = {.lex_state = 51},
   [1630] = {.lex_state = 51},
   [1631] = {.lex_state = 0},
-  [1632] = {.lex_state = 51},
-  [1633] = {.lex_state = 0},
-  [1634] = {.lex_state = 51},
+  [1632] = {.lex_state = 0},
+  [1633] = {.lex_state = 51},
+  [1634] = {.lex_state = 0},
   [1635] = {.lex_state = 51},
   [1636] = {.lex_state = 51},
-  [1637] = {.lex_state = 51},
-  [1638] = {.lex_state = 0},
+  [1637] = {.lex_state = 0},
+  [1638] = {.lex_state = 51},
   [1639] = {.lex_state = 51},
-  [1640] = {.lex_state = 0},
+  [1640] = {.lex_state = 51},
   [1641] = {.lex_state = 0},
-  [1642] = {.lex_state = 51},
-  [1643] = {.lex_state = 51},
-  [1644] = {.lex_state = 51},
-  [1645] = {.lex_state = 51},
-  [1646] = {.lex_state = 0},
+  [1642] = {.lex_state = 0},
+  [1643] = {.lex_state = 0},
+  [1644] = {.lex_state = 0},
+  [1645] = {.lex_state = 0},
+  [1646] = {.lex_state = 51},
   [1647] = {.lex_state = 51},
   [1648] = {.lex_state = 51},
-  [1649] = {.lex_state = 51},
+  [1649] = {.lex_state = 0},
   [1650] = {.lex_state = 0},
-  [1651] = {.lex_state = 0},
+  [1651] = {.lex_state = 51},
   [1652] = {.lex_state = 51},
-  [1653] = {.lex_state = 0},
+  [1653] = {.lex_state = 51},
   [1654] = {.lex_state = 0},
   [1655] = {.lex_state = 0},
   [1656] = {.lex_state = 0},
-  [1657] = {.lex_state = 0},
+  [1657] = {.lex_state = 51},
   [1658] = {.lex_state = 0},
-  [1659] = {.lex_state = 0},
+  [1659] = {.lex_state = 51},
   [1660] = {.lex_state = 0},
-  [1661] = {.lex_state = 51},
+  [1661] = {.lex_state = 0},
   [1662] = {.lex_state = 0},
   [1663] = {.lex_state = 51},
   [1664] = {.lex_state = 0},
   [1665] = {.lex_state = 0},
   [1666] = {.lex_state = 0},
-  [1667] = {.lex_state = 51},
+  [1667] = {.lex_state = 0},
   [1668] = {.lex_state = 0},
   [1669] = {.lex_state = 0},
   [1670] = {.lex_state = 0},
   [1671] = {.lex_state = 0},
   [1672] = {.lex_state = 0},
-  [1673] = {.lex_state = 0},
-  [1674] = {.lex_state = 0},
+  [1673] = {.lex_state = 51},
+  [1674] = {.lex_state = 51},
   [1675] = {.lex_state = 0},
   [1676] = {.lex_state = 0},
   [1677] = {.lex_state = 0},
   [1678] = {.lex_state = 0},
-  [1679] = {.lex_state = 0},
+  [1679] = {.lex_state = 51},
   [1680] = {.lex_state = 0},
-  [1681] = {.lex_state = 0},
+  [1681] = {.lex_state = 51},
   [1682] = {.lex_state = 0},
   [1683] = {.lex_state = 51},
   [1684] = {.lex_state = 0},
-  [1685] = {.lex_state = 0},
+  [1685] = {.lex_state = 51},
   [1686] = {.lex_state = 0},
-  [1687] = {.lex_state = 51},
+  [1687] = {.lex_state = 0},
   [1688] = {.lex_state = 0},
-  [1689] = {.lex_state = 51},
+  [1689] = {.lex_state = 0},
   [1690] = {.lex_state = 0},
-  [1691] = {.lex_state = 51},
+  [1691] = {.lex_state = 0},
   [1692] = {.lex_state = 0},
   [1693] = {.lex_state = 51},
-  [1694] = {.lex_state = 0},
+  [1694] = {.lex_state = 51},
   [1695] = {.lex_state = 0},
   [1696] = {.lex_state = 0},
-  [1697] = {.lex_state = 51},
+  [1697] = {.lex_state = 0},
   [1698] = {.lex_state = 0},
   [1699] = {.lex_state = 0},
   [1700] = {.lex_state = 0},
@@ -8174,33 +8180,33 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1703] = {.lex_state = 0},
   [1704] = {.lex_state = 51},
   [1705] = {.lex_state = 0},
-  [1706] = {.lex_state = 51},
-  [1707] = {.lex_state = 0},
+  [1706] = {.lex_state = 0},
+  [1707] = {.lex_state = 51},
   [1708] = {.lex_state = 0},
-  [1709] = {.lex_state = 0},
+  [1709] = {.lex_state = 51},
   [1710] = {.lex_state = 0},
-  [1711] = {.lex_state = 0},
+  [1711] = {.lex_state = 51},
   [1712] = {.lex_state = 0},
   [1713] = {.lex_state = 0},
   [1714] = {.lex_state = 0},
   [1715] = {.lex_state = 51},
-  [1716] = {.lex_state = 51},
-  [1717] = {.lex_state = 0},
-  [1718] = {.lex_state = 0},
-  [1719] = {.lex_state = 51},
-  [1720] = {.lex_state = 51},
+  [1716] = {.lex_state = 0},
+  [1717] = {.lex_state = 51},
+  [1718] = {.lex_state = 51},
+  [1719] = {.lex_state = 0},
+  [1720] = {.lex_state = 0},
   [1721] = {.lex_state = 0},
   [1722] = {.lex_state = 0},
   [1723] = {.lex_state = 0},
-  [1724] = {.lex_state = 0},
-  [1725] = {.lex_state = 51},
-  [1726] = {.lex_state = 51},
+  [1724] = {.lex_state = 51},
+  [1725] = {.lex_state = 0},
+  [1726] = {.lex_state = 0},
   [1727] = {.lex_state = 0},
   [1728] = {.lex_state = 0},
-  [1729] = {.lex_state = 51},
+  [1729] = {.lex_state = 0},
   [1730] = {.lex_state = 0},
   [1731] = {.lex_state = 0},
-  [1732] = {.lex_state = 51},
+  [1732] = {.lex_state = 0},
   [1733] = {.lex_state = 0},
   [1734] = {.lex_state = 0},
   [1735] = {.lex_state = 0},
@@ -8212,17 +8218,21 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1741] = {.lex_state = 0},
   [1742] = {.lex_state = 0},
   [1743] = {.lex_state = 0},
-  [1744] = {.lex_state = 0},
+  [1744] = {.lex_state = 51},
   [1745] = {.lex_state = 0},
-  [1746] = {.lex_state = 0},
-  [1747] = {.lex_state = 51},
-  [1748] = {.lex_state = 0},
+  [1746] = {.lex_state = 51},
+  [1747] = {.lex_state = 0},
+  [1748] = {.lex_state = 51},
   [1749] = {.lex_state = 0},
   [1750] = {.lex_state = 0},
-  [1751] = {.lex_state = 0},
-  [1752] = {.lex_state = 51},
-  [1753] = {.lex_state = 51},
+  [1751] = {.lex_state = 51},
+  [1752] = {.lex_state = 0},
+  [1753] = {.lex_state = 0},
   [1754] = {.lex_state = 0},
+  [1755] = {.lex_state = 0},
+  [1756] = {.lex_state = 0},
+  [1757] = {.lex_state = 51},
+  [1758] = {.lex_state = 0},
 };
 
 static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
@@ -8335,75 +8345,75 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(1),
   },
   [STATE(1)] = {
-    [sym_module] = STATE(1708),
-    [sym__statement] = STATE(64),
-    [sym__simple_statements] = STATE(64),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_if_statement] = STATE(64),
-    [sym_for_statement] = STATE(64),
-    [sym_while_statement] = STATE(64),
-    [sym_try_statement] = STATE(64),
-    [sym_with_statement] = STATE(64),
-    [sym_match_statement] = STATE(64),
-    [sym_function_definition] = STATE(64),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_class_definition] = STATE(64),
-    [sym_decorated_definition] = STATE(64),
-    [sym_decorator] = STATE(1172),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_module] = STATE(1737),
+    [sym__statement] = STATE(62),
+    [sym__simple_statements] = STATE(62),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_if_statement] = STATE(62),
+    [sym_for_statement] = STATE(62),
+    [sym_while_statement] = STATE(62),
+    [sym_try_statement] = STATE(62),
+    [sym_with_statement] = STATE(62),
+    [sym_match_statement] = STATE(62),
+    [sym_function_definition] = STATE(62),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_class_definition] = STATE(62),
+    [sym_decorated_definition] = STATE(62),
+    [sym_decorator] = STATE(1171),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(64),
-    [aux_sym_decorated_definition_repeat1] = STATE(1172),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(62),
+    [aux_sym_decorated_definition_repeat1] = STATE(1171),
     [ts_builtin_sym_end] = ACTIONS(5),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
@@ -8454,75 +8464,75 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(2)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(491),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(316),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -8575,19 +8585,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(3)] = {
     [sym__statement] = STATE(60),
     [sym__simple_statements] = STATE(60),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(60),
     [sym_for_statement] = STATE(60),
     [sym_while_statement] = STATE(60),
@@ -8595,53 +8605,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(60),
     [sym_match_statement] = STATE(60),
     [sym_function_definition] = STATE(60),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(60),
     [sym_decorated_definition] = STATE(60),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(1195),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(1232),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(60),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -8694,19 +8704,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(4)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -8714,53 +8724,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(329),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(337),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -8813,19 +8823,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(5)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -8833,53 +8843,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(478),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(472),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -8932,19 +8942,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(6)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -8952,53 +8962,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(604),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(534),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -9051,19 +9061,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(7)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -9071,53 +9081,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(615),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(571),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -9170,19 +9180,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(8)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -9190,53 +9200,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(525),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(579),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -9289,19 +9299,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(9)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -9309,53 +9319,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(541),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(585),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -9408,19 +9418,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(10)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -9428,53 +9438,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(547),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(587),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -9527,19 +9537,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(11)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -9547,53 +9557,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(550),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(589),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -9646,19 +9656,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(12)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -9666,53 +9676,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(582),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(591),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -9765,19 +9775,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(13)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -9785,53 +9795,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(490),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(466),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -9884,19 +9894,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(14)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -9904,53 +9914,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(447),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(453),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -10003,19 +10013,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(15)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -10023,53 +10033,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(609),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(596),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -10122,19 +10132,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(16)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -10142,53 +10152,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(601),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(599),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -10241,19 +10251,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(17)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -10261,53 +10271,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(612),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(601),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -10360,19 +10370,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(18)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -10380,53 +10390,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(512),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(510),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -10479,19 +10489,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(19)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -10499,53 +10509,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(468),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(469),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -10598,138 +10608,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [STATE(20)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(542),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
-    [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_lazy] = ACTIONS(9),
-    [anon_sym_import] = ACTIONS(11),
-    [anon_sym_from] = ACTIONS(13),
-    [anon_sym_LPAREN] = ACTIONS(15),
-    [anon_sym_STAR] = ACTIONS(17),
-    [anon_sym_print] = ACTIONS(19),
-    [anon_sym_assert] = ACTIONS(21),
-    [anon_sym_return] = ACTIONS(23),
-    [anon_sym_del] = ACTIONS(25),
-    [anon_sym_raise] = ACTIONS(27),
-    [anon_sym_pass] = ACTIONS(29),
-    [anon_sym_break] = ACTIONS(31),
-    [anon_sym_continue] = ACTIONS(33),
-    [anon_sym_if] = ACTIONS(87),
-    [anon_sym_async] = ACTIONS(89),
-    [anon_sym_for] = ACTIONS(91),
-    [anon_sym_while] = ACTIONS(93),
-    [anon_sym_try] = ACTIONS(95),
-    [anon_sym_with] = ACTIONS(97),
-    [anon_sym_match] = ACTIONS(99),
-    [anon_sym_DASH] = ACTIONS(49),
-    [anon_sym_PLUS] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
-    [anon_sym_LBRACE] = ACTIONS(53),
-    [anon_sym_STAR_STAR] = ACTIONS(55),
-    [anon_sym_def] = ACTIONS(101),
-    [anon_sym_global] = ACTIONS(59),
-    [anon_sym_nonlocal] = ACTIONS(61),
-    [anon_sym_exec] = ACTIONS(63),
-    [anon_sym_type] = ACTIONS(65),
-    [anon_sym_class] = ACTIONS(103),
-    [anon_sym_AT] = ACTIONS(69),
-    [anon_sym_not] = ACTIONS(71),
-    [anon_sym_TILDE] = ACTIONS(49),
-    [anon_sym_lambda] = ACTIONS(73),
-    [anon_sym_yield] = ACTIONS(75),
-    [sym_ellipsis] = ACTIONS(77),
-    [sym_integer] = ACTIONS(79),
-    [sym_float] = ACTIONS(77),
-    [anon_sym_await] = ACTIONS(81),
-    [sym_true] = ACTIONS(79),
-    [sym_false] = ACTIONS(79),
-    [sym_none] = ACTIONS(79),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(109),
-    [sym__string_start] = ACTIONS(83),
-    [sym__template_string_start] = ACTIONS(85),
-  },
-  [STATE(21)] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -10737,291 +10628,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(455),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
-    [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_lazy] = ACTIONS(9),
-    [anon_sym_import] = ACTIONS(11),
-    [anon_sym_from] = ACTIONS(13),
-    [anon_sym_LPAREN] = ACTIONS(15),
-    [anon_sym_STAR] = ACTIONS(17),
-    [anon_sym_print] = ACTIONS(19),
-    [anon_sym_assert] = ACTIONS(21),
-    [anon_sym_return] = ACTIONS(23),
-    [anon_sym_del] = ACTIONS(25),
-    [anon_sym_raise] = ACTIONS(27),
-    [anon_sym_pass] = ACTIONS(29),
-    [anon_sym_break] = ACTIONS(31),
-    [anon_sym_continue] = ACTIONS(33),
-    [anon_sym_if] = ACTIONS(87),
-    [anon_sym_async] = ACTIONS(89),
-    [anon_sym_for] = ACTIONS(91),
-    [anon_sym_while] = ACTIONS(93),
-    [anon_sym_try] = ACTIONS(95),
-    [anon_sym_with] = ACTIONS(97),
-    [anon_sym_match] = ACTIONS(99),
-    [anon_sym_DASH] = ACTIONS(49),
-    [anon_sym_PLUS] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
-    [anon_sym_LBRACE] = ACTIONS(53),
-    [anon_sym_STAR_STAR] = ACTIONS(55),
-    [anon_sym_def] = ACTIONS(101),
-    [anon_sym_global] = ACTIONS(59),
-    [anon_sym_nonlocal] = ACTIONS(61),
-    [anon_sym_exec] = ACTIONS(63),
-    [anon_sym_type] = ACTIONS(65),
-    [anon_sym_class] = ACTIONS(103),
-    [anon_sym_AT] = ACTIONS(69),
-    [anon_sym_not] = ACTIONS(71),
-    [anon_sym_TILDE] = ACTIONS(49),
-    [anon_sym_lambda] = ACTIONS(73),
-    [anon_sym_yield] = ACTIONS(75),
-    [sym_ellipsis] = ACTIONS(77),
-    [sym_integer] = ACTIONS(79),
-    [sym_float] = ACTIONS(77),
-    [anon_sym_await] = ACTIONS(81),
-    [sym_true] = ACTIONS(79),
-    [sym_false] = ACTIONS(79),
-    [sym_none] = ACTIONS(79),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(109),
-    [sym__string_start] = ACTIONS(83),
-    [sym__template_string_start] = ACTIONS(85),
-  },
-  [STATE(22)] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(496),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
-    [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_lazy] = ACTIONS(9),
-    [anon_sym_import] = ACTIONS(11),
-    [anon_sym_from] = ACTIONS(13),
-    [anon_sym_LPAREN] = ACTIONS(15),
-    [anon_sym_STAR] = ACTIONS(17),
-    [anon_sym_print] = ACTIONS(19),
-    [anon_sym_assert] = ACTIONS(21),
-    [anon_sym_return] = ACTIONS(23),
-    [anon_sym_del] = ACTIONS(25),
-    [anon_sym_raise] = ACTIONS(27),
-    [anon_sym_pass] = ACTIONS(29),
-    [anon_sym_break] = ACTIONS(31),
-    [anon_sym_continue] = ACTIONS(33),
-    [anon_sym_if] = ACTIONS(87),
-    [anon_sym_async] = ACTIONS(89),
-    [anon_sym_for] = ACTIONS(91),
-    [anon_sym_while] = ACTIONS(93),
-    [anon_sym_try] = ACTIONS(95),
-    [anon_sym_with] = ACTIONS(97),
-    [anon_sym_match] = ACTIONS(99),
-    [anon_sym_DASH] = ACTIONS(49),
-    [anon_sym_PLUS] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
-    [anon_sym_LBRACE] = ACTIONS(53),
-    [anon_sym_STAR_STAR] = ACTIONS(55),
-    [anon_sym_def] = ACTIONS(101),
-    [anon_sym_global] = ACTIONS(59),
-    [anon_sym_nonlocal] = ACTIONS(61),
-    [anon_sym_exec] = ACTIONS(63),
-    [anon_sym_type] = ACTIONS(65),
-    [anon_sym_class] = ACTIONS(103),
-    [anon_sym_AT] = ACTIONS(69),
-    [anon_sym_not] = ACTIONS(71),
-    [anon_sym_TILDE] = ACTIONS(49),
-    [anon_sym_lambda] = ACTIONS(73),
-    [anon_sym_yield] = ACTIONS(75),
-    [sym_ellipsis] = ACTIONS(77),
-    [sym_integer] = ACTIONS(79),
-    [sym_float] = ACTIONS(77),
-    [anon_sym_await] = ACTIONS(81),
-    [sym_true] = ACTIONS(79),
-    [sym_false] = ACTIONS(79),
-    [sym_none] = ACTIONS(79),
-    [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(109),
-    [sym__string_start] = ACTIONS(83),
-    [sym__template_string_start] = ACTIONS(85),
-  },
-  [STATE(23)] = {
-    [sym__statement] = STATE(61),
-    [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(61),
-    [sym_for_statement] = STATE(61),
-    [sym_while_statement] = STATE(61),
-    [sym_try_statement] = STATE(61),
-    [sym_with_statement] = STATE(61),
-    [sym_match_statement] = STATE(61),
-    [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(61),
-    [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
+    [sym_decorator] = STATE(1126),
     [sym_block] = STATE(606),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -11071,22 +10724,22 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(24)] = {
+  [STATE(21)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -11094,53 +10747,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(472),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(455),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -11190,22 +10843,22 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(25)] = {
+  [STATE(22)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -11213,53 +10866,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(517),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(496),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -11309,22 +10962,22 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(26)] = {
+  [STATE(23)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -11332,53 +10985,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(442),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(610),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -11428,22 +11081,22 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(27)] = {
+  [STATE(24)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -11451,53 +11104,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(508),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(477),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -11547,22 +11200,22 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(28)] = {
+  [STATE(25)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -11570,53 +11223,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(522),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(613),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -11666,22 +11319,22 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(29)] = {
+  [STATE(26)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -11689,53 +11342,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(523),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(460),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -11785,22 +11438,22 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(30)] = {
+  [STATE(27)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -11808,53 +11461,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(450),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(492),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -11904,22 +11557,22 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(31)] = {
+  [STATE(28)] = {
     [sym__statement] = STATE(61),
     [sym__simple_statements] = STATE(61),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
     [sym_if_statement] = STATE(61),
     [sym_for_statement] = STATE(61),
     [sym_while_statement] = STATE(61),
@@ -11927,53 +11580,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(61),
     [sym_match_statement] = STATE(61),
     [sym_function_definition] = STATE(61),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
     [sym_class_definition] = STATE(61),
     [sym_decorated_definition] = STATE(61),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(451),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(515),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(61),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -12023,76 +11676,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(32)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(322),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(29)] = {
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(569),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -12138,80 +11791,80 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(79),
     [sym_none] = ACTIONS(79),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(105),
+    [sym__dedent] = ACTIONS(109),
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(33)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(559),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(30)] = {
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(464),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -12257,80 +11910,80 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(79),
     [sym_none] = ACTIONS(79),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(105),
+    [sym__dedent] = ACTIONS(109),
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(34)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(567),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(31)] = {
+    [sym__statement] = STATE(61),
+    [sym__simple_statements] = STATE(61),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(61),
+    [sym_for_statement] = STATE(61),
+    [sym_while_statement] = STATE(61),
+    [sym_try_statement] = STATE(61),
+    [sym_with_statement] = STATE(61),
+    [sym_match_statement] = STATE(61),
+    [sym_function_definition] = STATE(61),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(61),
+    [sym_decorated_definition] = STATE(61),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(439),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(61),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -12376,80 +12029,80 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(79),
     [sym_none] = ACTIONS(79),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(105),
+    [sym__dedent] = ACTIONS(109),
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(35)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(573),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(32)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(484),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -12499,76 +12152,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(36)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(575),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(33)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(536),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -12618,76 +12271,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(37)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(577),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(34)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(541),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -12737,76 +12390,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(38)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(579),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(35)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(547),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -12856,76 +12509,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(39)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(486),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(36)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(549),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -12975,76 +12628,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(40)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(454),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(37)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(551),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -13094,76 +12747,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(41)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(583),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(38)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(553),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -13213,76 +12866,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(42)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(586),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(39)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(488),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -13332,76 +12985,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(43)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(587),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(40)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(441),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -13451,76 +13104,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(44)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(502),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(41)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(556),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -13570,76 +13223,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(45)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(488),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(42)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(559),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -13689,76 +13342,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(46)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(591),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(43)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(560),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -13808,76 +13461,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(47)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(459),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(44)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(506),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -13927,76 +13580,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(48)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(504),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(45)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(471),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -14046,76 +13699,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(49)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(595),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(46)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(563),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -14165,76 +13818,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(50)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(489),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(47)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(445),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -14284,76 +13937,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(51)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(598),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(48)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(495),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -14403,76 +14056,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(52)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(460),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(49)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(566),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -14522,76 +14175,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(53)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(507),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(50)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(486),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -14641,76 +14294,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(54)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(602),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(51)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(616),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -14760,76 +14413,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(55)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(603),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(52)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(446),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -14879,76 +14532,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(56)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(464),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(53)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(509),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -14998,76 +14651,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(57)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(439),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(54)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(573),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -15117,76 +14770,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(58)] = {
-    [sym__statement] = STATE(60),
-    [sym__simple_statements] = STATE(60),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(60),
-    [sym_for_statement] = STATE(60),
-    [sym_while_statement] = STATE(60),
-    [sym_try_statement] = STATE(60),
-    [sym_with_statement] = STATE(60),
-    [sym_match_statement] = STATE(60),
-    [sym_function_definition] = STATE(60),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(60),
-    [sym_decorated_definition] = STATE(60),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(1215),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(55)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(574),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(60),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -15232,80 +14885,80 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(79),
     [sym_none] = ACTIONS(79),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(107),
+    [sym__dedent] = ACTIONS(105),
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(59)] = {
-    [sym__statement] = STATE(63),
-    [sym__simple_statements] = STATE(63),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(63),
-    [sym_for_statement] = STATE(63),
-    [sym_while_statement] = STATE(63),
-    [sym_try_statement] = STATE(63),
-    [sym_with_statement] = STATE(63),
-    [sym_match_statement] = STATE(63),
-    [sym_function_definition] = STATE(63),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(63),
-    [sym_decorated_definition] = STATE(63),
-    [sym_decorator] = STATE(1146),
-    [sym_block] = STATE(560),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(56)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(449),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(63),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -15355,75 +15008,76 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(60)] = {
-    [sym__statement] = STATE(62),
-    [sym__simple_statements] = STATE(62),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(62),
-    [sym_for_statement] = STATE(62),
-    [sym_while_statement] = STATE(62),
-    [sym_try_statement] = STATE(62),
-    [sym_with_statement] = STATE(62),
-    [sym_match_statement] = STATE(62),
-    [sym_function_definition] = STATE(62),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(62),
-    [sym_decorated_definition] = STATE(62),
-    [sym_decorator] = STATE(1146),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(57)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(450),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(62),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -15469,79 +15123,80 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(79),
     [sym_none] = ACTIONS(79),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(111),
+    [sym__dedent] = ACTIONS(105),
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(61)] = {
-    [sym__statement] = STATE(62),
-    [sym__simple_statements] = STATE(62),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(62),
-    [sym_for_statement] = STATE(62),
-    [sym_while_statement] = STATE(62),
-    [sym_try_statement] = STATE(62),
-    [sym_with_statement] = STATE(62),
-    [sym_match_statement] = STATE(62),
-    [sym_function_definition] = STATE(62),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(62),
-    [sym_decorated_definition] = STATE(62),
-    [sym_decorator] = STATE(1146),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(58)] = {
+    [sym__statement] = STATE(60),
+    [sym__simple_statements] = STATE(60),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(60),
+    [sym_for_statement] = STATE(60),
+    [sym_while_statement] = STATE(60),
+    [sym_try_statement] = STATE(60),
+    [sym_with_statement] = STATE(60),
+    [sym_match_statement] = STATE(60),
+    [sym_function_definition] = STATE(60),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(60),
+    [sym_decorated_definition] = STATE(60),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(1203),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(62),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(60),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -15587,197 +15242,198 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(79),
     [sym_none] = ACTIONS(79),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(113),
+    [sym__dedent] = ACTIONS(107),
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(62)] = {
-    [sym__statement] = STATE(62),
-    [sym__simple_statements] = STATE(62),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(62),
-    [sym_for_statement] = STATE(62),
-    [sym_while_statement] = STATE(62),
-    [sym_try_statement] = STATE(62),
-    [sym_with_statement] = STATE(62),
-    [sym_match_statement] = STATE(62),
-    [sym_function_definition] = STATE(62),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(62),
-    [sym_decorated_definition] = STATE(62),
-    [sym_decorator] = STATE(1146),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(59)] = {
+    [sym__statement] = STATE(64),
+    [sym__simple_statements] = STATE(64),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(64),
+    [sym_for_statement] = STATE(64),
+    [sym_while_statement] = STATE(64),
+    [sym_try_statement] = STATE(64),
+    [sym_with_statement] = STATE(64),
+    [sym_match_statement] = STATE(64),
+    [sym_function_definition] = STATE(64),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(64),
+    [sym_decorated_definition] = STATE(64),
+    [sym_decorator] = STATE(1126),
+    [sym_block] = STATE(533),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(62),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
-    [sym_identifier] = ACTIONS(115),
-    [anon_sym_lazy] = ACTIONS(118),
-    [anon_sym_import] = ACTIONS(121),
-    [anon_sym_from] = ACTIONS(124),
-    [anon_sym_LPAREN] = ACTIONS(127),
-    [anon_sym_STAR] = ACTIONS(130),
-    [anon_sym_print] = ACTIONS(133),
-    [anon_sym_assert] = ACTIONS(136),
-    [anon_sym_return] = ACTIONS(139),
-    [anon_sym_del] = ACTIONS(142),
-    [anon_sym_raise] = ACTIONS(145),
-    [anon_sym_pass] = ACTIONS(148),
-    [anon_sym_break] = ACTIONS(151),
-    [anon_sym_continue] = ACTIONS(154),
-    [anon_sym_if] = ACTIONS(157),
-    [anon_sym_async] = ACTIONS(160),
-    [anon_sym_for] = ACTIONS(163),
-    [anon_sym_while] = ACTIONS(166),
-    [anon_sym_try] = ACTIONS(169),
-    [anon_sym_with] = ACTIONS(172),
-    [anon_sym_match] = ACTIONS(175),
-    [anon_sym_DASH] = ACTIONS(178),
-    [anon_sym_PLUS] = ACTIONS(178),
-    [anon_sym_LBRACK] = ACTIONS(181),
-    [anon_sym_LBRACE] = ACTIONS(184),
-    [anon_sym_STAR_STAR] = ACTIONS(187),
-    [anon_sym_def] = ACTIONS(190),
-    [anon_sym_global] = ACTIONS(193),
-    [anon_sym_nonlocal] = ACTIONS(196),
-    [anon_sym_exec] = ACTIONS(199),
-    [anon_sym_type] = ACTIONS(202),
-    [anon_sym_class] = ACTIONS(205),
-    [anon_sym_AT] = ACTIONS(208),
-    [anon_sym_not] = ACTIONS(211),
-    [anon_sym_TILDE] = ACTIONS(178),
-    [anon_sym_lambda] = ACTIONS(214),
-    [anon_sym_yield] = ACTIONS(217),
-    [sym_ellipsis] = ACTIONS(220),
-    [sym_integer] = ACTIONS(223),
-    [sym_float] = ACTIONS(220),
-    [anon_sym_await] = ACTIONS(226),
-    [sym_true] = ACTIONS(223),
-    [sym_false] = ACTIONS(223),
-    [sym_none] = ACTIONS(223),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(64),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_lazy] = ACTIONS(9),
+    [anon_sym_import] = ACTIONS(11),
+    [anon_sym_from] = ACTIONS(13),
+    [anon_sym_LPAREN] = ACTIONS(15),
+    [anon_sym_STAR] = ACTIONS(17),
+    [anon_sym_print] = ACTIONS(19),
+    [anon_sym_assert] = ACTIONS(21),
+    [anon_sym_return] = ACTIONS(23),
+    [anon_sym_del] = ACTIONS(25),
+    [anon_sym_raise] = ACTIONS(27),
+    [anon_sym_pass] = ACTIONS(29),
+    [anon_sym_break] = ACTIONS(31),
+    [anon_sym_continue] = ACTIONS(33),
+    [anon_sym_if] = ACTIONS(87),
+    [anon_sym_async] = ACTIONS(89),
+    [anon_sym_for] = ACTIONS(91),
+    [anon_sym_while] = ACTIONS(93),
+    [anon_sym_try] = ACTIONS(95),
+    [anon_sym_with] = ACTIONS(97),
+    [anon_sym_match] = ACTIONS(99),
+    [anon_sym_DASH] = ACTIONS(49),
+    [anon_sym_PLUS] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACE] = ACTIONS(53),
+    [anon_sym_STAR_STAR] = ACTIONS(55),
+    [anon_sym_def] = ACTIONS(101),
+    [anon_sym_global] = ACTIONS(59),
+    [anon_sym_nonlocal] = ACTIONS(61),
+    [anon_sym_exec] = ACTIONS(63),
+    [anon_sym_type] = ACTIONS(65),
+    [anon_sym_class] = ACTIONS(103),
+    [anon_sym_AT] = ACTIONS(69),
+    [anon_sym_not] = ACTIONS(71),
+    [anon_sym_TILDE] = ACTIONS(49),
+    [anon_sym_lambda] = ACTIONS(73),
+    [anon_sym_yield] = ACTIONS(75),
+    [sym_ellipsis] = ACTIONS(77),
+    [sym_integer] = ACTIONS(79),
+    [sym_float] = ACTIONS(77),
+    [anon_sym_await] = ACTIONS(81),
+    [sym_true] = ACTIONS(79),
+    [sym_false] = ACTIONS(79),
+    [sym_none] = ACTIONS(79),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(229),
-    [sym__string_start] = ACTIONS(231),
-    [sym__template_string_start] = ACTIONS(234),
+    [sym__dedent] = ACTIONS(105),
+    [sym__string_start] = ACTIONS(83),
+    [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(63)] = {
-    [sym__statement] = STATE(62),
-    [sym__simple_statements] = STATE(62),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_if_statement] = STATE(62),
-    [sym_for_statement] = STATE(62),
-    [sym_while_statement] = STATE(62),
-    [sym_try_statement] = STATE(62),
-    [sym_with_statement] = STATE(62),
-    [sym_match_statement] = STATE(62),
-    [sym_function_definition] = STATE(62),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_class_definition] = STATE(62),
-    [sym_decorated_definition] = STATE(62),
-    [sym_decorator] = STATE(1146),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+  [STATE(60)] = {
+    [sym__statement] = STATE(63),
+    [sym__simple_statements] = STATE(63),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(63),
+    [sym_for_statement] = STATE(63),
+    [sym_while_statement] = STATE(63),
+    [sym_try_statement] = STATE(63),
+    [sym_with_statement] = STATE(63),
+    [sym_match_statement] = STATE(63),
+    [sym_function_definition] = STATE(63),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(63),
+    [sym_decorated_definition] = STATE(63),
+    [sym_decorator] = STATE(1126),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [aux_sym_module_repeat1] = STATE(62),
-    [aux_sym_decorated_definition_repeat1] = STATE(1146),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(63),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -15823,26 +15479,144 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_false] = ACTIONS(79),
     [sym_none] = ACTIONS(79),
     [sym_comment] = ACTIONS(3),
-    [sym__dedent] = ACTIONS(237),
+    [sym__dedent] = ACTIONS(111),
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
-  [STATE(64)] = {
+  [STATE(61)] = {
+    [sym__statement] = STATE(63),
+    [sym__simple_statements] = STATE(63),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(63),
+    [sym_for_statement] = STATE(63),
+    [sym_while_statement] = STATE(63),
+    [sym_try_statement] = STATE(63),
+    [sym_with_statement] = STATE(63),
+    [sym_match_statement] = STATE(63),
+    [sym_function_definition] = STATE(63),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(63),
+    [sym_decorated_definition] = STATE(63),
+    [sym_decorator] = STATE(1126),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
+    [sym_pattern_list] = STATE(1030),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(63),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_lazy] = ACTIONS(9),
+    [anon_sym_import] = ACTIONS(11),
+    [anon_sym_from] = ACTIONS(13),
+    [anon_sym_LPAREN] = ACTIONS(15),
+    [anon_sym_STAR] = ACTIONS(17),
+    [anon_sym_print] = ACTIONS(19),
+    [anon_sym_assert] = ACTIONS(21),
+    [anon_sym_return] = ACTIONS(23),
+    [anon_sym_del] = ACTIONS(25),
+    [anon_sym_raise] = ACTIONS(27),
+    [anon_sym_pass] = ACTIONS(29),
+    [anon_sym_break] = ACTIONS(31),
+    [anon_sym_continue] = ACTIONS(33),
+    [anon_sym_if] = ACTIONS(87),
+    [anon_sym_async] = ACTIONS(89),
+    [anon_sym_for] = ACTIONS(91),
+    [anon_sym_while] = ACTIONS(93),
+    [anon_sym_try] = ACTIONS(95),
+    [anon_sym_with] = ACTIONS(97),
+    [anon_sym_match] = ACTIONS(99),
+    [anon_sym_DASH] = ACTIONS(49),
+    [anon_sym_PLUS] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACE] = ACTIONS(53),
+    [anon_sym_STAR_STAR] = ACTIONS(55),
+    [anon_sym_def] = ACTIONS(101),
+    [anon_sym_global] = ACTIONS(59),
+    [anon_sym_nonlocal] = ACTIONS(61),
+    [anon_sym_exec] = ACTIONS(63),
+    [anon_sym_type] = ACTIONS(65),
+    [anon_sym_class] = ACTIONS(103),
+    [anon_sym_AT] = ACTIONS(69),
+    [anon_sym_not] = ACTIONS(71),
+    [anon_sym_TILDE] = ACTIONS(49),
+    [anon_sym_lambda] = ACTIONS(73),
+    [anon_sym_yield] = ACTIONS(75),
+    [sym_ellipsis] = ACTIONS(77),
+    [sym_integer] = ACTIONS(79),
+    [sym_float] = ACTIONS(77),
+    [anon_sym_await] = ACTIONS(81),
+    [sym_true] = ACTIONS(79),
+    [sym_false] = ACTIONS(79),
+    [sym_none] = ACTIONS(79),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(113),
+    [sym__string_start] = ACTIONS(83),
+    [sym__template_string_start] = ACTIONS(85),
+  },
+  [STATE(62)] = {
     [sym__statement] = STATE(65),
     [sym__simple_statements] = STATE(65),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
     [sym_if_statement] = STATE(65),
     [sym_for_statement] = STATE(65),
     [sym_while_statement] = STATE(65),
@@ -15850,53 +15624,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(65),
     [sym_match_statement] = STATE(65),
     [sym_function_definition] = STATE(65),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
     [sym_class_definition] = STATE(65),
     [sym_decorated_definition] = STATE(65),
-    [sym_decorator] = STATE(1172),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1171),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(65),
-    [aux_sym_decorated_definition_repeat1] = STATE(1172),
-    [ts_builtin_sym_end] = ACTIONS(239),
+    [aux_sym_decorated_definition_repeat1] = STATE(1171),
+    [ts_builtin_sym_end] = ACTIONS(115),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -15945,22 +15719,258 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
+  [STATE(63)] = {
+    [sym__statement] = STATE(63),
+    [sym__simple_statements] = STATE(63),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(63),
+    [sym_for_statement] = STATE(63),
+    [sym_while_statement] = STATE(63),
+    [sym_try_statement] = STATE(63),
+    [sym_with_statement] = STATE(63),
+    [sym_match_statement] = STATE(63),
+    [sym_function_definition] = STATE(63),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(63),
+    [sym_decorated_definition] = STATE(63),
+    [sym_decorator] = STATE(1126),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
+    [sym_pattern_list] = STATE(1030),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(63),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
+    [sym_identifier] = ACTIONS(117),
+    [anon_sym_lazy] = ACTIONS(120),
+    [anon_sym_import] = ACTIONS(123),
+    [anon_sym_from] = ACTIONS(126),
+    [anon_sym_LPAREN] = ACTIONS(129),
+    [anon_sym_STAR] = ACTIONS(132),
+    [anon_sym_print] = ACTIONS(135),
+    [anon_sym_assert] = ACTIONS(138),
+    [anon_sym_return] = ACTIONS(141),
+    [anon_sym_del] = ACTIONS(144),
+    [anon_sym_raise] = ACTIONS(147),
+    [anon_sym_pass] = ACTIONS(150),
+    [anon_sym_break] = ACTIONS(153),
+    [anon_sym_continue] = ACTIONS(156),
+    [anon_sym_if] = ACTIONS(159),
+    [anon_sym_async] = ACTIONS(162),
+    [anon_sym_for] = ACTIONS(165),
+    [anon_sym_while] = ACTIONS(168),
+    [anon_sym_try] = ACTIONS(171),
+    [anon_sym_with] = ACTIONS(174),
+    [anon_sym_match] = ACTIONS(177),
+    [anon_sym_DASH] = ACTIONS(180),
+    [anon_sym_PLUS] = ACTIONS(180),
+    [anon_sym_LBRACK] = ACTIONS(183),
+    [anon_sym_LBRACE] = ACTIONS(186),
+    [anon_sym_STAR_STAR] = ACTIONS(189),
+    [anon_sym_def] = ACTIONS(192),
+    [anon_sym_global] = ACTIONS(195),
+    [anon_sym_nonlocal] = ACTIONS(198),
+    [anon_sym_exec] = ACTIONS(201),
+    [anon_sym_type] = ACTIONS(204),
+    [anon_sym_class] = ACTIONS(207),
+    [anon_sym_AT] = ACTIONS(210),
+    [anon_sym_not] = ACTIONS(213),
+    [anon_sym_TILDE] = ACTIONS(180),
+    [anon_sym_lambda] = ACTIONS(216),
+    [anon_sym_yield] = ACTIONS(219),
+    [sym_ellipsis] = ACTIONS(222),
+    [sym_integer] = ACTIONS(225),
+    [sym_float] = ACTIONS(222),
+    [anon_sym_await] = ACTIONS(228),
+    [sym_true] = ACTIONS(225),
+    [sym_false] = ACTIONS(225),
+    [sym_none] = ACTIONS(225),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(231),
+    [sym__string_start] = ACTIONS(233),
+    [sym__template_string_start] = ACTIONS(236),
+  },
+  [STATE(64)] = {
+    [sym__statement] = STATE(63),
+    [sym__simple_statements] = STATE(63),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_if_statement] = STATE(63),
+    [sym_for_statement] = STATE(63),
+    [sym_while_statement] = STATE(63),
+    [sym_try_statement] = STATE(63),
+    [sym_with_statement] = STATE(63),
+    [sym_match_statement] = STATE(63),
+    [sym_function_definition] = STATE(63),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_class_definition] = STATE(63),
+    [sym_decorated_definition] = STATE(63),
+    [sym_decorator] = STATE(1126),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
+    [sym_pattern_list] = STATE(1030),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [aux_sym_module_repeat1] = STATE(63),
+    [aux_sym_decorated_definition_repeat1] = STATE(1126),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_lazy] = ACTIONS(9),
+    [anon_sym_import] = ACTIONS(11),
+    [anon_sym_from] = ACTIONS(13),
+    [anon_sym_LPAREN] = ACTIONS(15),
+    [anon_sym_STAR] = ACTIONS(17),
+    [anon_sym_print] = ACTIONS(19),
+    [anon_sym_assert] = ACTIONS(21),
+    [anon_sym_return] = ACTIONS(23),
+    [anon_sym_del] = ACTIONS(25),
+    [anon_sym_raise] = ACTIONS(27),
+    [anon_sym_pass] = ACTIONS(29),
+    [anon_sym_break] = ACTIONS(31),
+    [anon_sym_continue] = ACTIONS(33),
+    [anon_sym_if] = ACTIONS(87),
+    [anon_sym_async] = ACTIONS(89),
+    [anon_sym_for] = ACTIONS(91),
+    [anon_sym_while] = ACTIONS(93),
+    [anon_sym_try] = ACTIONS(95),
+    [anon_sym_with] = ACTIONS(97),
+    [anon_sym_match] = ACTIONS(99),
+    [anon_sym_DASH] = ACTIONS(49),
+    [anon_sym_PLUS] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACE] = ACTIONS(53),
+    [anon_sym_STAR_STAR] = ACTIONS(55),
+    [anon_sym_def] = ACTIONS(101),
+    [anon_sym_global] = ACTIONS(59),
+    [anon_sym_nonlocal] = ACTIONS(61),
+    [anon_sym_exec] = ACTIONS(63),
+    [anon_sym_type] = ACTIONS(65),
+    [anon_sym_class] = ACTIONS(103),
+    [anon_sym_AT] = ACTIONS(69),
+    [anon_sym_not] = ACTIONS(71),
+    [anon_sym_TILDE] = ACTIONS(49),
+    [anon_sym_lambda] = ACTIONS(73),
+    [anon_sym_yield] = ACTIONS(75),
+    [sym_ellipsis] = ACTIONS(77),
+    [sym_integer] = ACTIONS(79),
+    [sym_float] = ACTIONS(77),
+    [anon_sym_await] = ACTIONS(81),
+    [sym_true] = ACTIONS(79),
+    [sym_false] = ACTIONS(79),
+    [sym_none] = ACTIONS(79),
+    [sym_comment] = ACTIONS(3),
+    [sym__dedent] = ACTIONS(239),
+    [sym__string_start] = ACTIONS(83),
+    [sym__template_string_start] = ACTIONS(85),
+  },
   [STATE(65)] = {
     [sym__statement] = STATE(65),
     [sym__simple_statements] = STATE(65),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
     [sym_if_statement] = STATE(65),
     [sym_for_statement] = STATE(65),
     [sym_while_statement] = STATE(65),
@@ -15968,67 +15978,67 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_with_statement] = STATE(65),
     [sym_match_statement] = STATE(65),
     [sym_function_definition] = STATE(65),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
     [sym_class_definition] = STATE(65),
     [sym_decorated_definition] = STATE(65),
-    [sym_decorator] = STATE(1172),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_decorator] = STATE(1171),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [aux_sym_module_repeat1] = STATE(65),
-    [aux_sym_decorated_definition_repeat1] = STATE(1172),
-    [ts_builtin_sym_end] = ACTIONS(229),
-    [sym_identifier] = ACTIONS(115),
-    [anon_sym_lazy] = ACTIONS(118),
-    [anon_sym_import] = ACTIONS(121),
-    [anon_sym_from] = ACTIONS(124),
-    [anon_sym_LPAREN] = ACTIONS(127),
-    [anon_sym_STAR] = ACTIONS(130),
-    [anon_sym_print] = ACTIONS(133),
-    [anon_sym_assert] = ACTIONS(136),
-    [anon_sym_return] = ACTIONS(139),
-    [anon_sym_del] = ACTIONS(142),
-    [anon_sym_raise] = ACTIONS(145),
-    [anon_sym_pass] = ACTIONS(148),
-    [anon_sym_break] = ACTIONS(151),
-    [anon_sym_continue] = ACTIONS(154),
+    [aux_sym_decorated_definition_repeat1] = STATE(1171),
+    [ts_builtin_sym_end] = ACTIONS(231),
+    [sym_identifier] = ACTIONS(117),
+    [anon_sym_lazy] = ACTIONS(120),
+    [anon_sym_import] = ACTIONS(123),
+    [anon_sym_from] = ACTIONS(126),
+    [anon_sym_LPAREN] = ACTIONS(129),
+    [anon_sym_STAR] = ACTIONS(132),
+    [anon_sym_print] = ACTIONS(135),
+    [anon_sym_assert] = ACTIONS(138),
+    [anon_sym_return] = ACTIONS(141),
+    [anon_sym_del] = ACTIONS(144),
+    [anon_sym_raise] = ACTIONS(147),
+    [anon_sym_pass] = ACTIONS(150),
+    [anon_sym_break] = ACTIONS(153),
+    [anon_sym_continue] = ACTIONS(156),
     [anon_sym_if] = ACTIONS(241),
     [anon_sym_async] = ACTIONS(244),
     [anon_sym_for] = ACTIONS(247),
@@ -16036,64 +16046,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_try] = ACTIONS(253),
     [anon_sym_with] = ACTIONS(256),
     [anon_sym_match] = ACTIONS(259),
-    [anon_sym_DASH] = ACTIONS(178),
-    [anon_sym_PLUS] = ACTIONS(178),
-    [anon_sym_LBRACK] = ACTIONS(181),
-    [anon_sym_LBRACE] = ACTIONS(184),
-    [anon_sym_STAR_STAR] = ACTIONS(187),
+    [anon_sym_DASH] = ACTIONS(180),
+    [anon_sym_PLUS] = ACTIONS(180),
+    [anon_sym_LBRACK] = ACTIONS(183),
+    [anon_sym_LBRACE] = ACTIONS(186),
+    [anon_sym_STAR_STAR] = ACTIONS(189),
     [anon_sym_def] = ACTIONS(262),
-    [anon_sym_global] = ACTIONS(193),
-    [anon_sym_nonlocal] = ACTIONS(196),
-    [anon_sym_exec] = ACTIONS(199),
-    [anon_sym_type] = ACTIONS(202),
+    [anon_sym_global] = ACTIONS(195),
+    [anon_sym_nonlocal] = ACTIONS(198),
+    [anon_sym_exec] = ACTIONS(201),
+    [anon_sym_type] = ACTIONS(204),
     [anon_sym_class] = ACTIONS(265),
-    [anon_sym_AT] = ACTIONS(208),
-    [anon_sym_not] = ACTIONS(211),
-    [anon_sym_TILDE] = ACTIONS(178),
-    [anon_sym_lambda] = ACTIONS(214),
-    [anon_sym_yield] = ACTIONS(217),
-    [sym_ellipsis] = ACTIONS(220),
-    [sym_integer] = ACTIONS(223),
-    [sym_float] = ACTIONS(220),
-    [anon_sym_await] = ACTIONS(226),
-    [sym_true] = ACTIONS(223),
-    [sym_false] = ACTIONS(223),
-    [sym_none] = ACTIONS(223),
+    [anon_sym_AT] = ACTIONS(210),
+    [anon_sym_not] = ACTIONS(213),
+    [anon_sym_TILDE] = ACTIONS(180),
+    [anon_sym_lambda] = ACTIONS(216),
+    [anon_sym_yield] = ACTIONS(219),
+    [sym_ellipsis] = ACTIONS(222),
+    [sym_integer] = ACTIONS(225),
+    [sym_float] = ACTIONS(222),
+    [anon_sym_await] = ACTIONS(228),
+    [sym_true] = ACTIONS(225),
+    [sym_false] = ACTIONS(225),
+    [sym_none] = ACTIONS(225),
     [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(231),
-    [sym__template_string_start] = ACTIONS(234),
+    [sym__string_start] = ACTIONS(233),
+    [sym__template_string_start] = ACTIONS(236),
   },
   [STATE(66)] = {
-    [sym_named_expression] = STATE(1037),
-    [sym_list_splat] = STATE(1573),
-    [sym_dictionary_splat] = STATE(1573),
-    [sym_expression_list] = STATE(1725),
-    [sym_expression] = STATE(1277),
-    [sym_primary_expression] = STATE(704),
-    [sym_not_operator] = STATE(1037),
-    [sym_boolean_operator] = STATE(1037),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_comparison_operator] = STATE(1037),
-    [sym_lambda] = STATE(1037),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_conditional_expression] = STATE(1037),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
+    [sym_named_expression] = STATE(1038),
+    [sym_list_splat] = STATE(1562),
+    [sym_dictionary_splat] = STATE(1562),
+    [sym_expression_list] = STATE(1748),
+    [sym_expression] = STATE(1261),
+    [sym_primary_expression] = STATE(728),
+    [sym_not_operator] = STATE(1038),
+    [sym_boolean_operator] = STATE(1038),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_comparison_operator] = STATE(1038),
+    [sym_lambda] = STATE(1038),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_conditional_expression] = STATE(1038),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
     [sym_identifier] = ACTIONS(268),
     [anon_sym_lazy] = ACTIONS(270),
     [anon_sym_DOT] = ACTIONS(272),
@@ -16164,36 +16174,36 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(317),
   },
   [STATE(67)] = {
-    [sym_named_expression] = STATE(1037),
-    [sym_list_splat] = STATE(1573),
-    [sym_dictionary_splat] = STATE(1573),
-    [sym_expression_list] = STATE(1753),
-    [sym_expression] = STATE(1276),
-    [sym_primary_expression] = STATE(704),
-    [sym_not_operator] = STATE(1037),
-    [sym_boolean_operator] = STATE(1037),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_comparison_operator] = STATE(1037),
-    [sym_lambda] = STATE(1037),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_conditional_expression] = STATE(1037),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
+    [sym_named_expression] = STATE(1038),
+    [sym_list_splat] = STATE(1562),
+    [sym_dictionary_splat] = STATE(1562),
+    [sym_expression_list] = STATE(1757),
+    [sym_expression] = STATE(1259),
+    [sym_primary_expression] = STATE(728),
+    [sym_not_operator] = STATE(1038),
+    [sym_boolean_operator] = STATE(1038),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_comparison_operator] = STATE(1038),
+    [sym_lambda] = STATE(1038),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_conditional_expression] = STATE(1038),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
     [sym_identifier] = ACTIONS(268),
     [anon_sym_lazy] = ACTIONS(270),
     [anon_sym_DOT] = ACTIONS(272),
@@ -16264,61 +16274,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(317),
   },
   [STATE(68)] = {
-    [sym__simple_statements] = STATE(616),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(522),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -16362,61 +16372,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(69)] = {
-    [sym__simple_statements] = STATE(493),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(461),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -16460,61 +16470,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(70)] = {
-    [sym__simple_statements] = STATE(320),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(575),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -16558,61 +16568,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(71)] = {
-    [sym__simple_statements] = STATE(477),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(463),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -16656,61 +16666,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(72)] = {
-    [sym__simple_statements] = STATE(544),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(580),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -16754,61 +16764,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(73)] = {
-    [sym__simple_statements] = STATE(514),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(479),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -16852,61 +16862,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(74)] = {
-    [sym__simple_statements] = STATE(483),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(459),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -16950,61 +16960,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(75)] = {
-    [sym__simple_statements] = STATE(551),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(328),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -17048,61 +17058,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(76)] = {
-    [sym__simple_statements] = STATE(594),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(474),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -17146,146 +17156,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(77)] = {
-    [sym__simple_statements] = STATE(531),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
-    [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [sym_identifier] = ACTIONS(7),
-    [anon_sym_lazy] = ACTIONS(9),
-    [anon_sym_import] = ACTIONS(11),
-    [anon_sym_from] = ACTIONS(13),
-    [anon_sym_LPAREN] = ACTIONS(15),
-    [anon_sym_STAR] = ACTIONS(17),
-    [anon_sym_print] = ACTIONS(19),
-    [anon_sym_assert] = ACTIONS(21),
-    [anon_sym_return] = ACTIONS(23),
-    [anon_sym_del] = ACTIONS(25),
-    [anon_sym_raise] = ACTIONS(27),
-    [anon_sym_pass] = ACTIONS(29),
-    [anon_sym_break] = ACTIONS(31),
-    [anon_sym_continue] = ACTIONS(33),
-    [anon_sym_async] = ACTIONS(319),
-    [anon_sym_match] = ACTIONS(319),
-    [anon_sym_DASH] = ACTIONS(49),
-    [anon_sym_PLUS] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(51),
-    [anon_sym_LBRACE] = ACTIONS(53),
-    [anon_sym_STAR_STAR] = ACTIONS(55),
-    [anon_sym_global] = ACTIONS(59),
-    [anon_sym_nonlocal] = ACTIONS(61),
-    [anon_sym_exec] = ACTIONS(63),
-    [anon_sym_type] = ACTIONS(65),
-    [anon_sym_not] = ACTIONS(71),
-    [anon_sym_TILDE] = ACTIONS(49),
-    [anon_sym_lambda] = ACTIONS(73),
-    [anon_sym_yield] = ACTIONS(75),
-    [sym_ellipsis] = ACTIONS(77),
-    [sym_integer] = ACTIONS(79),
-    [sym_float] = ACTIONS(77),
-    [anon_sym_await] = ACTIONS(81),
-    [sym_true] = ACTIONS(79),
-    [sym_false] = ACTIONS(79),
-    [sym_none] = ACTIONS(79),
-    [sym_comment] = ACTIONS(3),
-    [sym__newline] = ACTIONS(357),
-    [sym__indent] = ACTIONS(359),
-    [sym__string_start] = ACTIONS(83),
-    [sym__template_string_start] = ACTIONS(85),
-  },
-  [STATE(78)] = {
-    [sym_chevron] = STATE(1323),
-    [sym_named_expression] = STATE(1126),
-    [sym_expression] = STATE(1223),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_attribute] = STATE(950),
-    [sym_subscript] = STATE(950),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [sym_identifier] = ACTIONS(361),
-    [anon_sym_lazy] = ACTIONS(363),
+    [sym_chevron] = STATE(1335),
+    [sym_named_expression] = STATE(1145),
+    [sym_expression] = STATE(1204),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_attribute] = STATE(905),
+    [sym_subscript] = STATE(905),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [sym_identifier] = ACTIONS(357),
+    [anon_sym_lazy] = ACTIONS(359),
     [anon_sym_DOT] = ACTIONS(272),
     [anon_sym_LPAREN] = ACTIONS(303),
     [anon_sym_COMMA] = ACTIONS(277),
     [anon_sym_STAR] = ACTIONS(272),
-    [anon_sym_print] = ACTIONS(363),
-    [anon_sym_GT_GT] = ACTIONS(365),
+    [anon_sym_print] = ACTIONS(359),
+    [anon_sym_GT_GT] = ACTIONS(361),
     [anon_sym_COLON_EQ] = ACTIONS(283),
     [anon_sym_if] = ACTIONS(272),
     [anon_sym_COLON] = ACTIONS(285),
-    [anon_sym_async] = ACTIONS(363),
+    [anon_sym_async] = ACTIONS(359),
     [anon_sym_in] = ACTIONS(272),
-    [anon_sym_match] = ACTIONS(363),
+    [anon_sym_match] = ACTIONS(359),
     [anon_sym_PIPE] = ACTIONS(272),
     [anon_sym_DASH] = ACTIONS(272),
     [anon_sym_PLUS] = ACTIONS(272),
@@ -17293,8 +17205,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_LBRACE] = ACTIONS(53),
     [anon_sym_STAR_STAR] = ACTIONS(272),
     [anon_sym_EQ] = ACTIONS(285),
-    [anon_sym_exec] = ACTIONS(363),
-    [anon_sym_type] = ACTIONS(363),
+    [anon_sym_exec] = ACTIONS(359),
+    [anon_sym_type] = ACTIONS(359),
     [anon_sym_AT] = ACTIONS(272),
     [anon_sym_not] = ACTIONS(272),
     [anon_sym_and] = ACTIONS(272),
@@ -17331,7 +17243,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_ellipsis] = ACTIONS(77),
     [sym_integer] = ACTIONS(79),
     [sym_float] = ACTIONS(77),
-    [anon_sym_await] = ACTIONS(367),
+    [anon_sym_await] = ACTIONS(363),
     [sym_true] = ACTIONS(79),
     [sym_false] = ACTIONS(79),
     [sym_none] = ACTIONS(79),
@@ -17341,62 +17253,160 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(83),
     [sym__template_string_start] = ACTIONS(85),
   },
+  [STATE(78)] = {
+    [sym__simple_statements] = STATE(514),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
+    [sym_pattern_list] = STATE(1030),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [sym_identifier] = ACTIONS(7),
+    [anon_sym_lazy] = ACTIONS(9),
+    [anon_sym_import] = ACTIONS(11),
+    [anon_sym_from] = ACTIONS(13),
+    [anon_sym_LPAREN] = ACTIONS(15),
+    [anon_sym_STAR] = ACTIONS(17),
+    [anon_sym_print] = ACTIONS(19),
+    [anon_sym_assert] = ACTIONS(21),
+    [anon_sym_return] = ACTIONS(23),
+    [anon_sym_del] = ACTIONS(25),
+    [anon_sym_raise] = ACTIONS(27),
+    [anon_sym_pass] = ACTIONS(29),
+    [anon_sym_break] = ACTIONS(31),
+    [anon_sym_continue] = ACTIONS(33),
+    [anon_sym_async] = ACTIONS(319),
+    [anon_sym_match] = ACTIONS(319),
+    [anon_sym_DASH] = ACTIONS(49),
+    [anon_sym_PLUS] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(51),
+    [anon_sym_LBRACE] = ACTIONS(53),
+    [anon_sym_STAR_STAR] = ACTIONS(55),
+    [anon_sym_global] = ACTIONS(59),
+    [anon_sym_nonlocal] = ACTIONS(61),
+    [anon_sym_exec] = ACTIONS(63),
+    [anon_sym_type] = ACTIONS(65),
+    [anon_sym_not] = ACTIONS(71),
+    [anon_sym_TILDE] = ACTIONS(49),
+    [anon_sym_lambda] = ACTIONS(73),
+    [anon_sym_yield] = ACTIONS(75),
+    [sym_ellipsis] = ACTIONS(77),
+    [sym_integer] = ACTIONS(79),
+    [sym_float] = ACTIONS(77),
+    [anon_sym_await] = ACTIONS(81),
+    [sym_true] = ACTIONS(79),
+    [sym_false] = ACTIONS(79),
+    [sym_none] = ACTIONS(79),
+    [sym_comment] = ACTIONS(3),
+    [sym__newline] = ACTIONS(365),
+    [sym__indent] = ACTIONS(367),
+    [sym__string_start] = ACTIONS(83),
+    [sym__template_string_start] = ACTIONS(85),
+  },
   [STATE(79)] = {
-    [sym__simple_statements] = STATE(561),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(582),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -17440,61 +17450,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(80)] = {
-    [sym__simple_statements] = STATE(562),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(527),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -17538,61 +17548,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(81)] = {
-    [sym__simple_statements] = STATE(441),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(586),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -17636,61 +17646,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(82)] = {
-    [sym__simple_statements] = STATE(568),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(535),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -17734,61 +17744,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(83)] = {
-    [sym__simple_statements] = STATE(482),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(588),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -17832,61 +17842,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(84)] = {
-    [sym__simple_statements] = STATE(448),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(537),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -17930,61 +17940,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(85)] = {
-    [sym__simple_statements] = STATE(570),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(538),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -18028,61 +18038,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(86)] = {
-    [sym__simple_statements] = STATE(574),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(312),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -18126,61 +18136,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(87)] = {
-    [sym__simple_statements] = STATE(511),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(542),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -18224,61 +18234,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(88)] = {
-    [sym__simple_statements] = STATE(576),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(490),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -18322,61 +18332,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(89)] = {
-    [sym__simple_statements] = STATE(613),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(440),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -18420,61 +18430,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(90)] = {
-    [sym__simple_statements] = STATE(497),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(544),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -18518,61 +18528,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(91)] = {
-    [sym__simple_statements] = STATE(485),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(503),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -18616,61 +18626,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(92)] = {
-    [sym__simple_statements] = STATE(332),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(548),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -18714,61 +18724,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(93)] = {
-    [sym__simple_statements] = STATE(580),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(489),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -18812,61 +18822,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(94)] = {
-    [sym__simple_statements] = STATE(611),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(550),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -18910,61 +18920,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(95)] = {
-    [sym__simple_statements] = STATE(467),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(511),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -19008,61 +19018,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(96)] = {
-    [sym__simple_statements] = STATE(456),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(487),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -19106,61 +19116,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(97)] = {
-    [sym__simple_statements] = STATE(475),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(592),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -19204,61 +19214,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(98)] = {
-    [sym__simple_statements] = STATE(500),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(554),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -19302,61 +19312,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(99)] = {
-    [sym__simple_statements] = STATE(519),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(468),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -19400,61 +19410,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(100)] = {
-    [sym__simple_statements] = STATE(536),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(442),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -19498,61 +19508,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(101)] = {
-    [sym__simple_statements] = STATE(487),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(454),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -19596,61 +19606,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(102)] = {
-    [sym__simple_statements] = STATE(539),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(493),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -19694,61 +19704,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(103)] = {
-    [sym__simple_statements] = STATE(457),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(558),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -19792,61 +19802,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(104)] = {
-    [sym__simple_statements] = STATE(590),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(600),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -19890,61 +19900,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(105)] = {
-    [sym__simple_statements] = STATE(458),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(501),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -19988,61 +19998,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(106)] = {
-    [sym__simple_statements] = STATE(1216),
-    [sym_import_statement] = STATE(1402),
-    [sym_future_import_statement] = STATE(1402),
-    [sym_import_from_statement] = STATE(1402),
-    [sym_print_statement] = STATE(1402),
-    [sym_assert_statement] = STATE(1402),
-    [sym_expression_statement] = STATE(1402),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1402),
-    [sym_delete_statement] = STATE(1402),
-    [sym_raise_statement] = STATE(1402),
-    [sym_pass_statement] = STATE(1402),
-    [sym_break_statement] = STATE(1402),
-    [sym_continue_statement] = STATE(1402),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1402),
-    [sym_nonlocal_statement] = STATE(1402),
-    [sym_exec_statement] = STATE(1402),
-    [sym_type_alias_statement] = STATE(1402),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(470),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -20086,61 +20096,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(107)] = {
-    [sym__simple_statements] = STATE(498),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(598),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -20184,61 +20194,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(108)] = {
-    [sym__simple_statements] = STATE(505),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(609),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -20282,61 +20292,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(109)] = {
-    [sym__simple_statements] = STATE(526),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(562),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -20380,61 +20390,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(110)] = {
-    [sym__simple_statements] = STATE(596),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(443),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -20478,61 +20488,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(111)] = {
-    [sym__simple_statements] = STATE(607),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(467),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -20576,61 +20586,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(112)] = {
-    [sym__simple_statements] = STATE(474),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(497),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -20674,61 +20684,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(113)] = {
-    [sym__simple_statements] = STATE(599),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(567),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -20772,61 +20782,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(114)] = {
-    [sym__simple_statements] = STATE(449),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(605),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -20870,61 +20880,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(115)] = {
-    [sym__simple_statements] = STATE(462),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(518),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -20968,61 +20978,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(116)] = {
-    [sym__simple_statements] = STATE(518),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(570),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -21066,61 +21076,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(117)] = {
-    [sym__simple_statements] = STATE(532),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(452),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -21164,61 +21174,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(118)] = {
-    [sym__simple_statements] = STATE(443),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(447),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -21262,61 +21272,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(119)] = {
-    [sym__simple_statements] = STATE(463),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(1185),
+    [sym_import_statement] = STATE(1326),
+    [sym_future_import_statement] = STATE(1326),
+    [sym_import_from_statement] = STATE(1326),
+    [sym_print_statement] = STATE(1326),
+    [sym_assert_statement] = STATE(1326),
+    [sym_expression_statement] = STATE(1326),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1326),
+    [sym_delete_statement] = STATE(1326),
+    [sym_raise_statement] = STATE(1326),
+    [sym_pass_statement] = STATE(1326),
+    [sym_break_statement] = STATE(1326),
+    [sym_continue_statement] = STATE(1326),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1326),
+    [sym_nonlocal_statement] = STATE(1326),
+    [sym_exec_statement] = STATE(1326),
+    [sym_type_alias_statement] = STATE(1326),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -21360,61 +21370,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(120)] = {
-    [sym__simple_statements] = STATE(555),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(498),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -21458,61 +21468,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(121)] = {
-    [sym__simple_statements] = STATE(543),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(448),
+    [sym_import_statement] = STATE(1362),
+    [sym_future_import_statement] = STATE(1362),
+    [sym_import_from_statement] = STATE(1362),
+    [sym_print_statement] = STATE(1362),
+    [sym_assert_statement] = STATE(1362),
+    [sym_expression_statement] = STATE(1362),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1362),
+    [sym_delete_statement] = STATE(1362),
+    [sym_raise_statement] = STATE(1362),
+    [sym_pass_statement] = STATE(1362),
+    [sym_break_statement] = STATE(1362),
+    [sym_continue_statement] = STATE(1362),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1362),
+    [sym_nonlocal_statement] = STATE(1362),
+    [sym_exec_statement] = STATE(1362),
+    [sym_type_alias_statement] = STATE(1362),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -21556,61 +21566,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(122)] = {
-    [sym__simple_statements] = STATE(608),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(611),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -21654,61 +21664,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(123)] = {
-    [sym__simple_statements] = STATE(1183),
-    [sym_import_statement] = STATE(1402),
-    [sym_future_import_statement] = STATE(1402),
-    [sym_import_from_statement] = STATE(1402),
-    [sym_print_statement] = STATE(1402),
-    [sym_assert_statement] = STATE(1402),
-    [sym_expression_statement] = STATE(1402),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1402),
-    [sym_delete_statement] = STATE(1402),
-    [sym_raise_statement] = STATE(1402),
-    [sym_pass_statement] = STATE(1402),
-    [sym_break_statement] = STATE(1402),
-    [sym_continue_statement] = STATE(1402),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1402),
-    [sym_nonlocal_statement] = STATE(1402),
-    [sym_exec_statement] = STATE(1402),
-    [sym_type_alias_statement] = STATE(1402),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(565),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -21752,61 +21762,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(124)] = {
-    [sym__simple_statements] = STATE(446),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(1201),
+    [sym_import_statement] = STATE(1326),
+    [sym_future_import_statement] = STATE(1326),
+    [sym_import_from_statement] = STATE(1326),
+    [sym_print_statement] = STATE(1326),
+    [sym_assert_statement] = STATE(1326),
+    [sym_expression_statement] = STATE(1326),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1326),
+    [sym_delete_statement] = STATE(1326),
+    [sym_raise_statement] = STATE(1326),
+    [sym_pass_statement] = STATE(1326),
+    [sym_break_statement] = STATE(1326),
+    [sym_continue_statement] = STATE(1326),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1326),
+    [sym_nonlocal_statement] = STATE(1326),
+    [sym_exec_statement] = STATE(1326),
+    [sym_type_alias_statement] = STATE(1326),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -21850,61 +21860,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(125)] = {
-    [sym__simple_statements] = STATE(548),
-    [sym_import_statement] = STATE(1346),
-    [sym_future_import_statement] = STATE(1346),
-    [sym_import_from_statement] = STATE(1346),
-    [sym_print_statement] = STATE(1346),
-    [sym_assert_statement] = STATE(1346),
-    [sym_expression_statement] = STATE(1346),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1346),
-    [sym_delete_statement] = STATE(1346),
-    [sym_raise_statement] = STATE(1346),
-    [sym_pass_statement] = STATE(1346),
-    [sym_break_statement] = STATE(1346),
-    [sym_continue_statement] = STATE(1346),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1346),
-    [sym_nonlocal_statement] = STATE(1346),
-    [sym_exec_statement] = STATE(1346),
-    [sym_type_alias_statement] = STATE(1346),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(614),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -21948,61 +21958,61 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(126)] = {
-    [sym__simple_statements] = STATE(585),
-    [sym_import_statement] = STATE(1345),
-    [sym_future_import_statement] = STATE(1345),
-    [sym_import_from_statement] = STATE(1345),
-    [sym_print_statement] = STATE(1345),
-    [sym_assert_statement] = STATE(1345),
-    [sym_expression_statement] = STATE(1345),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1345),
-    [sym_delete_statement] = STATE(1345),
-    [sym_raise_statement] = STATE(1345),
-    [sym_pass_statement] = STATE(1345),
-    [sym_break_statement] = STATE(1345),
-    [sym_continue_statement] = STATE(1345),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1345),
-    [sym_nonlocal_statement] = STATE(1345),
-    [sym_exec_statement] = STATE(1345),
-    [sym_type_alias_statement] = STATE(1345),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym__simple_statements] = STATE(572),
+    [sym_import_statement] = STATE(1327),
+    [sym_future_import_statement] = STATE(1327),
+    [sym_import_from_statement] = STATE(1327),
+    [sym_print_statement] = STATE(1327),
+    [sym_assert_statement] = STATE(1327),
+    [sym_expression_statement] = STATE(1327),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1327),
+    [sym_delete_statement] = STATE(1327),
+    [sym_raise_statement] = STATE(1327),
+    [sym_pass_statement] = STATE(1327),
+    [sym_break_statement] = STATE(1327),
+    [sym_continue_statement] = STATE(1327),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1327),
+    [sym_nonlocal_statement] = STATE(1327),
+    [sym_exec_statement] = STATE(1327),
+    [sym_type_alias_statement] = STATE(1327),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -22046,60 +22056,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(127)] = {
-    [sym_import_statement] = STATE(1578),
-    [sym_future_import_statement] = STATE(1578),
-    [sym_import_from_statement] = STATE(1578),
-    [sym_print_statement] = STATE(1578),
-    [sym_assert_statement] = STATE(1578),
-    [sym_expression_statement] = STATE(1578),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1578),
-    [sym_delete_statement] = STATE(1578),
-    [sym_raise_statement] = STATE(1578),
-    [sym_pass_statement] = STATE(1578),
-    [sym_break_statement] = STATE(1578),
-    [sym_continue_statement] = STATE(1578),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1578),
-    [sym_nonlocal_statement] = STATE(1578),
-    [sym_exec_statement] = STATE(1578),
-    [sym_type_alias_statement] = STATE(1578),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_import_statement] = STATE(1614),
+    [sym_future_import_statement] = STATE(1614),
+    [sym_import_from_statement] = STATE(1614),
+    [sym_print_statement] = STATE(1614),
+    [sym_assert_statement] = STATE(1614),
+    [sym_expression_statement] = STATE(1614),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1614),
+    [sym_delete_statement] = STATE(1614),
+    [sym_raise_statement] = STATE(1614),
+    [sym_pass_statement] = STATE(1614),
+    [sym_break_statement] = STATE(1614),
+    [sym_continue_statement] = STATE(1614),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1614),
+    [sym_nonlocal_statement] = STATE(1614),
+    [sym_exec_statement] = STATE(1614),
+    [sym_type_alias_statement] = STATE(1614),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -22142,60 +22152,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(128)] = {
-    [sym_import_statement] = STATE(1578),
-    [sym_future_import_statement] = STATE(1578),
-    [sym_import_from_statement] = STATE(1578),
-    [sym_print_statement] = STATE(1578),
-    [sym_assert_statement] = STATE(1578),
-    [sym_expression_statement] = STATE(1578),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1578),
-    [sym_delete_statement] = STATE(1578),
-    [sym_raise_statement] = STATE(1578),
-    [sym_pass_statement] = STATE(1578),
-    [sym_break_statement] = STATE(1578),
-    [sym_continue_statement] = STATE(1578),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1578),
-    [sym_nonlocal_statement] = STATE(1578),
-    [sym_exec_statement] = STATE(1578),
-    [sym_type_alias_statement] = STATE(1578),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_import_statement] = STATE(1614),
+    [sym_future_import_statement] = STATE(1614),
+    [sym_import_from_statement] = STATE(1614),
+    [sym_print_statement] = STATE(1614),
+    [sym_assert_statement] = STATE(1614),
+    [sym_expression_statement] = STATE(1614),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1614),
+    [sym_delete_statement] = STATE(1614),
+    [sym_raise_statement] = STATE(1614),
+    [sym_pass_statement] = STATE(1614),
+    [sym_break_statement] = STATE(1614),
+    [sym_continue_statement] = STATE(1614),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1614),
+    [sym_nonlocal_statement] = STATE(1614),
+    [sym_exec_statement] = STATE(1614),
+    [sym_type_alias_statement] = STATE(1614),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -22238,60 +22248,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(129)] = {
-    [sym_import_statement] = STATE(1578),
-    [sym_future_import_statement] = STATE(1578),
-    [sym_import_from_statement] = STATE(1578),
-    [sym_print_statement] = STATE(1578),
-    [sym_assert_statement] = STATE(1578),
-    [sym_expression_statement] = STATE(1578),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1578),
-    [sym_delete_statement] = STATE(1578),
-    [sym_raise_statement] = STATE(1578),
-    [sym_pass_statement] = STATE(1578),
-    [sym_break_statement] = STATE(1578),
-    [sym_continue_statement] = STATE(1578),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1578),
-    [sym_nonlocal_statement] = STATE(1578),
-    [sym_exec_statement] = STATE(1578),
-    [sym_type_alias_statement] = STATE(1578),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_import_statement] = STATE(1614),
+    [sym_future_import_statement] = STATE(1614),
+    [sym_import_from_statement] = STATE(1614),
+    [sym_print_statement] = STATE(1614),
+    [sym_assert_statement] = STATE(1614),
+    [sym_expression_statement] = STATE(1614),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1614),
+    [sym_delete_statement] = STATE(1614),
+    [sym_raise_statement] = STATE(1614),
+    [sym_pass_statement] = STATE(1614),
+    [sym_break_statement] = STATE(1614),
+    [sym_continue_statement] = STATE(1614),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1614),
+    [sym_nonlocal_statement] = STATE(1614),
+    [sym_exec_statement] = STATE(1614),
+    [sym_type_alias_statement] = STATE(1614),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -22334,60 +22344,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(130)] = {
-    [sym_import_statement] = STATE(1578),
-    [sym_future_import_statement] = STATE(1578),
-    [sym_import_from_statement] = STATE(1578),
-    [sym_print_statement] = STATE(1578),
-    [sym_assert_statement] = STATE(1578),
-    [sym_expression_statement] = STATE(1578),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1578),
-    [sym_delete_statement] = STATE(1578),
-    [sym_raise_statement] = STATE(1578),
-    [sym_pass_statement] = STATE(1578),
-    [sym_break_statement] = STATE(1578),
-    [sym_continue_statement] = STATE(1578),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1578),
-    [sym_nonlocal_statement] = STATE(1578),
-    [sym_exec_statement] = STATE(1578),
-    [sym_type_alias_statement] = STATE(1578),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_import_statement] = STATE(1614),
+    [sym_future_import_statement] = STATE(1614),
+    [sym_import_from_statement] = STATE(1614),
+    [sym_print_statement] = STATE(1614),
+    [sym_assert_statement] = STATE(1614),
+    [sym_expression_statement] = STATE(1614),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1614),
+    [sym_delete_statement] = STATE(1614),
+    [sym_raise_statement] = STATE(1614),
+    [sym_pass_statement] = STATE(1614),
+    [sym_break_statement] = STATE(1614),
+    [sym_continue_statement] = STATE(1614),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1614),
+    [sym_nonlocal_statement] = STATE(1614),
+    [sym_exec_statement] = STATE(1614),
+    [sym_type_alias_statement] = STATE(1614),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -22430,60 +22440,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(131)] = {
-    [sym_import_statement] = STATE(1578),
-    [sym_future_import_statement] = STATE(1578),
-    [sym_import_from_statement] = STATE(1578),
-    [sym_print_statement] = STATE(1578),
-    [sym_assert_statement] = STATE(1578),
-    [sym_expression_statement] = STATE(1578),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1578),
-    [sym_delete_statement] = STATE(1578),
-    [sym_raise_statement] = STATE(1578),
-    [sym_pass_statement] = STATE(1578),
-    [sym_break_statement] = STATE(1578),
-    [sym_continue_statement] = STATE(1578),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1578),
-    [sym_nonlocal_statement] = STATE(1578),
-    [sym_exec_statement] = STATE(1578),
-    [sym_type_alias_statement] = STATE(1578),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_import_statement] = STATE(1614),
+    [sym_future_import_statement] = STATE(1614),
+    [sym_import_from_statement] = STATE(1614),
+    [sym_print_statement] = STATE(1614),
+    [sym_assert_statement] = STATE(1614),
+    [sym_expression_statement] = STATE(1614),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1614),
+    [sym_delete_statement] = STATE(1614),
+    [sym_raise_statement] = STATE(1614),
+    [sym_pass_statement] = STATE(1614),
+    [sym_break_statement] = STATE(1614),
+    [sym_continue_statement] = STATE(1614),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1614),
+    [sym_nonlocal_statement] = STATE(1614),
+    [sym_exec_statement] = STATE(1614),
+    [sym_type_alias_statement] = STATE(1614),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -22526,60 +22536,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(132)] = {
-    [sym_import_statement] = STATE(1578),
-    [sym_future_import_statement] = STATE(1578),
-    [sym_import_from_statement] = STATE(1578),
-    [sym_print_statement] = STATE(1578),
-    [sym_assert_statement] = STATE(1578),
-    [sym_expression_statement] = STATE(1578),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1578),
-    [sym_delete_statement] = STATE(1578),
-    [sym_raise_statement] = STATE(1578),
-    [sym_pass_statement] = STATE(1578),
-    [sym_break_statement] = STATE(1578),
-    [sym_continue_statement] = STATE(1578),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1578),
-    [sym_nonlocal_statement] = STATE(1578),
-    [sym_exec_statement] = STATE(1578),
-    [sym_type_alias_statement] = STATE(1578),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_import_statement] = STATE(1614),
+    [sym_future_import_statement] = STATE(1614),
+    [sym_import_from_statement] = STATE(1614),
+    [sym_print_statement] = STATE(1614),
+    [sym_assert_statement] = STATE(1614),
+    [sym_expression_statement] = STATE(1614),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1614),
+    [sym_delete_statement] = STATE(1614),
+    [sym_raise_statement] = STATE(1614),
+    [sym_pass_statement] = STATE(1614),
+    [sym_break_statement] = STATE(1614),
+    [sym_continue_statement] = STATE(1614),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1614),
+    [sym_nonlocal_statement] = STATE(1614),
+    [sym_exec_statement] = STATE(1614),
+    [sym_type_alias_statement] = STATE(1614),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -22622,60 +22632,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(133)] = {
-    [sym_import_statement] = STATE(1578),
-    [sym_future_import_statement] = STATE(1578),
-    [sym_import_from_statement] = STATE(1578),
-    [sym_print_statement] = STATE(1578),
-    [sym_assert_statement] = STATE(1578),
-    [sym_expression_statement] = STATE(1578),
-    [sym_named_expression] = STATE(1126),
-    [sym_return_statement] = STATE(1578),
-    [sym_delete_statement] = STATE(1578),
-    [sym_raise_statement] = STATE(1578),
-    [sym_pass_statement] = STATE(1578),
-    [sym_break_statement] = STATE(1578),
-    [sym_continue_statement] = STATE(1578),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_global_statement] = STATE(1578),
-    [sym_nonlocal_statement] = STATE(1578),
-    [sym_exec_statement] = STATE(1578),
-    [sym_type_alias_statement] = STATE(1578),
-    [sym_expression_list] = STATE(1545),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1191),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1545),
-    [sym_augmented_assignment] = STATE(1545),
+    [sym_import_statement] = STATE(1614),
+    [sym_future_import_statement] = STATE(1614),
+    [sym_import_from_statement] = STATE(1614),
+    [sym_print_statement] = STATE(1614),
+    [sym_assert_statement] = STATE(1614),
+    [sym_expression_statement] = STATE(1614),
+    [sym_named_expression] = STATE(1145),
+    [sym_return_statement] = STATE(1614),
+    [sym_delete_statement] = STATE(1614),
+    [sym_raise_statement] = STATE(1614),
+    [sym_pass_statement] = STATE(1614),
+    [sym_break_statement] = STATE(1614),
+    [sym_continue_statement] = STATE(1614),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_global_statement] = STATE(1614),
+    [sym_nonlocal_statement] = STATE(1614),
+    [sym_exec_statement] = STATE(1614),
+    [sym_type_alias_statement] = STATE(1614),
+    [sym_expression_list] = STATE(1570),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1233),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1570),
+    [sym_augmented_assignment] = STATE(1570),
     [sym_pattern_list] = STATE(1030),
-    [sym_yield] = STATE(1545),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_yield] = STATE(1570),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(9),
     [anon_sym_import] = ACTIONS(11),
@@ -22717,26 +22727,26 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(134)] = {
-    [sym_primary_expression] = STATE(799),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_attribute] = STATE(950),
-    [sym_subscript] = STATE(950),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym_primary_expression] = STATE(818),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_attribute] = STATE(905),
+    [sym_subscript] = STATE(905),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(79),
     [anon_sym_lazy] = ACTIONS(573),
     [anon_sym_DOT] = ACTIONS(272),
@@ -22806,26 +22816,26 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(135)] = {
-    [sym_primary_expression] = STATE(766),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
+    [sym_primary_expression] = STATE(747),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
     [sym_identifier] = ACTIONS(311),
     [anon_sym_lazy] = ACTIONS(583),
     [anon_sym_DOT] = ACTIONS(272),
@@ -22893,26 +22903,26 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(317),
   },
   [STATE(136)] = {
-    [sym_primary_expression] = STATE(766),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
+    [sym_primary_expression] = STATE(747),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
     [sym_identifier] = ACTIONS(311),
     [anon_sym_lazy] = ACTIONS(583),
     [anon_sym_DOT] = ACTIONS(272),
@@ -22971,26 +22981,26 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(317),
   },
   [STATE(137)] = {
-    [sym_primary_expression] = STATE(766),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
+    [sym_primary_expression] = STATE(747),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
     [sym_identifier] = ACTIONS(311),
     [anon_sym_lazy] = ACTIONS(583),
     [anon_sym_DOT] = ACTIONS(272),
@@ -23048,26 +23058,26 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(317),
   },
   [STATE(138)] = {
-    [sym_primary_expression] = STATE(747),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
+    [sym_primary_expression] = STATE(753),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
     [sym_identifier] = ACTIONS(311),
     [anon_sym_lazy] = ACTIONS(583),
     [anon_sym_DOT] = ACTIONS(272),
@@ -23125,26 +23135,178 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(317),
   },
   [STATE(139)] = {
-    [sym_primary_expression] = STATE(805),
-    [sym_binary_operator] = STATE(949),
-    [sym_unary_operator] = STATE(949),
-    [sym_attribute] = STATE(949),
-    [sym_subscript] = STATE(949),
-    [sym_call] = STATE(949),
-    [sym_list] = STATE(949),
-    [sym_set] = STATE(949),
-    [sym_tuple] = STATE(949),
-    [sym_dictionary] = STATE(949),
-    [sym_list_comprehension] = STATE(949),
-    [sym_dictionary_comprehension] = STATE(949),
-    [sym_set_comprehension] = STATE(949),
-    [sym_generator_expression] = STATE(949),
-    [sym_parenthesized_expression] = STATE(949),
-    [sym_concatenated_string] = STATE(949),
-    [sym_string] = STATE(781),
-    [sym_concatenated_template_string] = STATE(949),
-    [sym_template_string] = STATE(782),
-    [sym_await] = STATE(949),
+    [sym_primary_expression] = STATE(818),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_attribute] = STATE(905),
+    [sym_subscript] = STATE(905),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [sym_identifier] = ACTIONS(79),
+    [anon_sym_lazy] = ACTIONS(573),
+    [anon_sym_DOT] = ACTIONS(272),
+    [anon_sym_from] = ACTIONS(272),
+    [anon_sym_LPAREN] = ACTIONS(575),
+    [anon_sym_COMMA] = ACTIONS(303),
+    [anon_sym_STAR] = ACTIONS(272),
+    [anon_sym_print] = ACTIONS(573),
+    [anon_sym_GT_GT] = ACTIONS(303),
+    [anon_sym_COLON_EQ] = ACTIONS(283),
+    [anon_sym_if] = ACTIONS(272),
+    [anon_sym_async] = ACTIONS(573),
+    [anon_sym_in] = ACTIONS(272),
+    [anon_sym_match] = ACTIONS(573),
+    [anon_sym_PIPE] = ACTIONS(303),
+    [anon_sym_DASH] = ACTIONS(49),
+    [anon_sym_PLUS] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(579),
+    [anon_sym_LBRACE] = ACTIONS(53),
+    [anon_sym_STAR_STAR] = ACTIONS(303),
+    [anon_sym_EQ] = ACTIONS(272),
+    [anon_sym_exec] = ACTIONS(573),
+    [anon_sym_type] = ACTIONS(573),
+    [anon_sym_AT] = ACTIONS(303),
+    [anon_sym_not] = ACTIONS(272),
+    [anon_sym_and] = ACTIONS(272),
+    [anon_sym_or] = ACTIONS(272),
+    [anon_sym_SLASH] = ACTIONS(272),
+    [anon_sym_PERCENT] = ACTIONS(303),
+    [anon_sym_SLASH_SLASH] = ACTIONS(303),
+    [anon_sym_AMP] = ACTIONS(303),
+    [anon_sym_CARET] = ACTIONS(303),
+    [anon_sym_LT_LT] = ACTIONS(303),
+    [anon_sym_TILDE] = ACTIONS(49),
+    [anon_sym_LT] = ACTIONS(272),
+    [anon_sym_LT_EQ] = ACTIONS(303),
+    [anon_sym_EQ_EQ] = ACTIONS(303),
+    [anon_sym_BANG_EQ] = ACTIONS(303),
+    [anon_sym_GT_EQ] = ACTIONS(303),
+    [anon_sym_GT] = ACTIONS(272),
+    [anon_sym_LT_GT] = ACTIONS(303),
+    [anon_sym_is] = ACTIONS(272),
+    [sym_ellipsis] = ACTIONS(77),
+    [sym_integer] = ACTIONS(79),
+    [sym_float] = ACTIONS(77),
+    [anon_sym_await] = ACTIONS(581),
+    [sym_true] = ACTIONS(79),
+    [sym_false] = ACTIONS(79),
+    [sym_none] = ACTIONS(79),
+    [sym_comment] = ACTIONS(3),
+    [anon_sym_SEMI] = ACTIONS(303),
+    [sym__newline] = ACTIONS(303),
+    [sym__string_start] = ACTIONS(83),
+    [sym__template_string_start] = ACTIONS(85),
+  },
+  [STATE(140)] = {
+    [sym_primary_expression] = STATE(747),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
+    [sym_identifier] = ACTIONS(311),
+    [anon_sym_lazy] = ACTIONS(583),
+    [anon_sym_DOT] = ACTIONS(272),
+    [anon_sym_LPAREN] = ACTIONS(585),
+    [anon_sym_RPAREN] = ACTIONS(307),
+    [anon_sym_COMMA] = ACTIONS(307),
+    [anon_sym_STAR] = ACTIONS(272),
+    [anon_sym_print] = ACTIONS(583),
+    [anon_sym_GT_GT] = ACTIONS(272),
+    [anon_sym_COLON] = ACTIONS(307),
+    [anon_sym_async] = ACTIONS(583),
+    [anon_sym_in] = ACTIONS(285),
+    [anon_sym_match] = ACTIONS(583),
+    [anon_sym_PIPE] = ACTIONS(272),
+    [anon_sym_DASH] = ACTIONS(594),
+    [anon_sym_PLUS] = ACTIONS(594),
+    [anon_sym_LBRACK] = ACTIONS(596),
+    [anon_sym_RBRACK] = ACTIONS(307),
+    [anon_sym_LBRACE] = ACTIONS(293),
+    [anon_sym_STAR_STAR] = ACTIONS(272),
+    [anon_sym_EQ] = ACTIONS(307),
+    [anon_sym_exec] = ACTIONS(583),
+    [anon_sym_type] = ACTIONS(583),
+    [anon_sym_AT] = ACTIONS(272),
+    [anon_sym_SLASH] = ACTIONS(272),
+    [anon_sym_PERCENT] = ACTIONS(272),
+    [anon_sym_SLASH_SLASH] = ACTIONS(272),
+    [anon_sym_AMP] = ACTIONS(272),
+    [anon_sym_CARET] = ACTIONS(272),
+    [anon_sym_LT_LT] = ACTIONS(272),
+    [anon_sym_TILDE] = ACTIONS(301),
+    [anon_sym_PLUS_EQ] = ACTIONS(307),
+    [anon_sym_DASH_EQ] = ACTIONS(307),
+    [anon_sym_STAR_EQ] = ACTIONS(307),
+    [anon_sym_SLASH_EQ] = ACTIONS(307),
+    [anon_sym_AT_EQ] = ACTIONS(307),
+    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(307),
+    [anon_sym_PERCENT_EQ] = ACTIONS(307),
+    [anon_sym_STAR_STAR_EQ] = ACTIONS(307),
+    [anon_sym_GT_GT_EQ] = ACTIONS(307),
+    [anon_sym_LT_LT_EQ] = ACTIONS(307),
+    [anon_sym_AMP_EQ] = ACTIONS(307),
+    [anon_sym_CARET_EQ] = ACTIONS(307),
+    [anon_sym_PIPE_EQ] = ACTIONS(307),
+    [sym_ellipsis] = ACTIONS(309),
+    [sym_integer] = ACTIONS(311),
+    [sym_float] = ACTIONS(309),
+    [anon_sym_await] = ACTIONS(600),
+    [sym_true] = ACTIONS(311),
+    [sym_false] = ACTIONS(311),
+    [sym_none] = ACTIONS(311),
+    [sym_comment] = ACTIONS(3),
+    [sym__string_start] = ACTIONS(315),
+    [sym__template_string_start] = ACTIONS(317),
+  },
+  [STATE(141)] = {
+    [sym_primary_expression] = STATE(819),
+    [sym_binary_operator] = STATE(879),
+    [sym_unary_operator] = STATE(879),
+    [sym_attribute] = STATE(879),
+    [sym_subscript] = STATE(879),
+    [sym_call] = STATE(879),
+    [sym_list] = STATE(879),
+    [sym_set] = STATE(879),
+    [sym_tuple] = STATE(879),
+    [sym_dictionary] = STATE(879),
+    [sym_list_comprehension] = STATE(879),
+    [sym_dictionary_comprehension] = STATE(879),
+    [sym_set_comprehension] = STATE(879),
+    [sym_generator_expression] = STATE(879),
+    [sym_parenthesized_expression] = STATE(879),
+    [sym_concatenated_string] = STATE(879),
+    [sym_string] = STATE(771),
+    [sym_concatenated_template_string] = STATE(879),
+    [sym_template_string] = STATE(772),
+    [sym_await] = STATE(879),
     [sym_identifier] = ACTIONS(612),
     [anon_sym_lazy] = ACTIONS(614),
     [anon_sym_DOT] = ACTIONS(272),
@@ -23200,124 +23362,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(630),
     [sym__template_string_start] = ACTIONS(632),
   },
-  [STATE(140)] = {
-    [sym_primary_expression] = STATE(799),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_attribute] = STATE(950),
-    [sym_subscript] = STATE(950),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [sym_identifier] = ACTIONS(79),
-    [anon_sym_lazy] = ACTIONS(573),
-    [anon_sym_DOT] = ACTIONS(272),
-    [anon_sym_from] = ACTIONS(272),
-    [anon_sym_LPAREN] = ACTIONS(575),
-    [anon_sym_COMMA] = ACTIONS(303),
-    [anon_sym_STAR] = ACTIONS(272),
-    [anon_sym_print] = ACTIONS(573),
-    [anon_sym_GT_GT] = ACTIONS(303),
-    [anon_sym_COLON_EQ] = ACTIONS(283),
-    [anon_sym_if] = ACTIONS(272),
-    [anon_sym_async] = ACTIONS(573),
-    [anon_sym_in] = ACTIONS(272),
-    [anon_sym_match] = ACTIONS(573),
-    [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(49),
-    [anon_sym_PLUS] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(579),
-    [anon_sym_LBRACE] = ACTIONS(53),
-    [anon_sym_STAR_STAR] = ACTIONS(303),
-    [anon_sym_EQ] = ACTIONS(272),
-    [anon_sym_exec] = ACTIONS(573),
-    [anon_sym_type] = ACTIONS(573),
-    [anon_sym_AT] = ACTIONS(303),
-    [anon_sym_not] = ACTIONS(272),
-    [anon_sym_and] = ACTIONS(272),
-    [anon_sym_or] = ACTIONS(272),
-    [anon_sym_SLASH] = ACTIONS(272),
-    [anon_sym_PERCENT] = ACTIONS(303),
-    [anon_sym_SLASH_SLASH] = ACTIONS(303),
-    [anon_sym_AMP] = ACTIONS(303),
-    [anon_sym_CARET] = ACTIONS(303),
-    [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(49),
-    [anon_sym_LT] = ACTIONS(272),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(272),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(272),
-    [sym_ellipsis] = ACTIONS(77),
-    [sym_integer] = ACTIONS(79),
-    [sym_float] = ACTIONS(77),
-    [anon_sym_await] = ACTIONS(581),
-    [sym_true] = ACTIONS(79),
-    [sym_false] = ACTIONS(79),
-    [sym_none] = ACTIONS(79),
-    [sym_comment] = ACTIONS(3),
-    [anon_sym_SEMI] = ACTIONS(303),
-    [sym__newline] = ACTIONS(303),
-    [sym__string_start] = ACTIONS(83),
-    [sym__template_string_start] = ACTIONS(85),
-  },
-  [STATE(141)] = {
-    [sym_primary_expression] = STATE(766),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
+  [STATE(142)] = {
+    [sym_primary_expression] = STATE(747),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
     [sym_identifier] = ACTIONS(311),
     [anon_sym_lazy] = ACTIONS(583),
     [anon_sym_DOT] = ACTIONS(272),
     [anon_sym_LPAREN] = ACTIONS(585),
-    [anon_sym_RPAREN] = ACTIONS(307),
-    [anon_sym_COMMA] = ACTIONS(307),
+    [anon_sym_RPAREN] = ACTIONS(598),
+    [anon_sym_COMMA] = ACTIONS(598),
     [anon_sym_STAR] = ACTIONS(272),
     [anon_sym_print] = ACTIONS(583),
     [anon_sym_GT_GT] = ACTIONS(272),
-    [anon_sym_COLON] = ACTIONS(307),
+    [anon_sym_COLON] = ACTIONS(598),
     [anon_sym_async] = ACTIONS(583),
-    [anon_sym_in] = ACTIONS(285),
+    [anon_sym_in] = ACTIONS(592),
     [anon_sym_match] = ACTIONS(583),
     [anon_sym_PIPE] = ACTIONS(272),
     [anon_sym_DASH] = ACTIONS(594),
     [anon_sym_PLUS] = ACTIONS(594),
     [anon_sym_LBRACK] = ACTIONS(596),
-    [anon_sym_RBRACK] = ACTIONS(307),
+    [anon_sym_RBRACK] = ACTIONS(598),
     [anon_sym_LBRACE] = ACTIONS(293),
     [anon_sym_STAR_STAR] = ACTIONS(272),
-    [anon_sym_EQ] = ACTIONS(307),
+    [anon_sym_EQ] = ACTIONS(598),
     [anon_sym_exec] = ACTIONS(583),
     [anon_sym_type] = ACTIONS(583),
     [anon_sym_AT] = ACTIONS(272),
@@ -23328,19 +23414,19 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_CARET] = ACTIONS(272),
     [anon_sym_LT_LT] = ACTIONS(272),
     [anon_sym_TILDE] = ACTIONS(301),
-    [anon_sym_PLUS_EQ] = ACTIONS(307),
-    [anon_sym_DASH_EQ] = ACTIONS(307),
-    [anon_sym_STAR_EQ] = ACTIONS(307),
-    [anon_sym_SLASH_EQ] = ACTIONS(307),
-    [anon_sym_AT_EQ] = ACTIONS(307),
-    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(307),
-    [anon_sym_PERCENT_EQ] = ACTIONS(307),
-    [anon_sym_STAR_STAR_EQ] = ACTIONS(307),
-    [anon_sym_GT_GT_EQ] = ACTIONS(307),
-    [anon_sym_LT_LT_EQ] = ACTIONS(307),
-    [anon_sym_AMP_EQ] = ACTIONS(307),
-    [anon_sym_CARET_EQ] = ACTIONS(307),
-    [anon_sym_PIPE_EQ] = ACTIONS(307),
+    [anon_sym_PLUS_EQ] = ACTIONS(598),
+    [anon_sym_DASH_EQ] = ACTIONS(598),
+    [anon_sym_STAR_EQ] = ACTIONS(598),
+    [anon_sym_SLASH_EQ] = ACTIONS(598),
+    [anon_sym_AT_EQ] = ACTIONS(598),
+    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(598),
+    [anon_sym_PERCENT_EQ] = ACTIONS(598),
+    [anon_sym_STAR_STAR_EQ] = ACTIONS(598),
+    [anon_sym_GT_GT_EQ] = ACTIONS(598),
+    [anon_sym_LT_LT_EQ] = ACTIONS(598),
+    [anon_sym_AMP_EQ] = ACTIONS(598),
+    [anon_sym_CARET_EQ] = ACTIONS(598),
+    [anon_sym_PIPE_EQ] = ACTIONS(598),
     [sym_ellipsis] = ACTIONS(309),
     [sym_integer] = ACTIONS(311),
     [sym_float] = ACTIONS(309),
@@ -23352,27 +23438,27 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(315),
     [sym__template_string_start] = ACTIONS(317),
   },
-  [STATE(142)] = {
-    [sym_primary_expression] = STATE(747),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
+  [STATE(143)] = {
+    [sym_primary_expression] = STATE(753),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
     [sym_identifier] = ACTIONS(311),
     [anon_sym_lazy] = ACTIONS(583),
     [anon_sym_DOT] = ACTIONS(272),
@@ -23428,127 +23514,51 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(315),
     [sym__template_string_start] = ACTIONS(317),
   },
-  [STATE(143)] = {
-    [sym_primary_expression] = STATE(766),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
-    [sym_identifier] = ACTIONS(311),
-    [anon_sym_lazy] = ACTIONS(583),
-    [anon_sym_DOT] = ACTIONS(272),
-    [anon_sym_LPAREN] = ACTIONS(585),
-    [anon_sym_RPAREN] = ACTIONS(598),
-    [anon_sym_COMMA] = ACTIONS(598),
-    [anon_sym_STAR] = ACTIONS(272),
-    [anon_sym_print] = ACTIONS(583),
-    [anon_sym_GT_GT] = ACTIONS(272),
-    [anon_sym_COLON] = ACTIONS(598),
-    [anon_sym_async] = ACTIONS(583),
-    [anon_sym_in] = ACTIONS(592),
-    [anon_sym_match] = ACTIONS(583),
-    [anon_sym_PIPE] = ACTIONS(272),
-    [anon_sym_DASH] = ACTIONS(594),
-    [anon_sym_PLUS] = ACTIONS(594),
-    [anon_sym_LBRACK] = ACTIONS(596),
-    [anon_sym_RBRACK] = ACTIONS(598),
-    [anon_sym_LBRACE] = ACTIONS(293),
-    [anon_sym_STAR_STAR] = ACTIONS(272),
-    [anon_sym_EQ] = ACTIONS(598),
-    [anon_sym_exec] = ACTIONS(583),
-    [anon_sym_type] = ACTIONS(583),
-    [anon_sym_AT] = ACTIONS(272),
-    [anon_sym_SLASH] = ACTIONS(272),
-    [anon_sym_PERCENT] = ACTIONS(272),
-    [anon_sym_SLASH_SLASH] = ACTIONS(272),
-    [anon_sym_AMP] = ACTIONS(272),
-    [anon_sym_CARET] = ACTIONS(272),
-    [anon_sym_LT_LT] = ACTIONS(272),
-    [anon_sym_TILDE] = ACTIONS(301),
-    [anon_sym_PLUS_EQ] = ACTIONS(598),
-    [anon_sym_DASH_EQ] = ACTIONS(598),
-    [anon_sym_STAR_EQ] = ACTIONS(598),
-    [anon_sym_SLASH_EQ] = ACTIONS(598),
-    [anon_sym_AT_EQ] = ACTIONS(598),
-    [anon_sym_SLASH_SLASH_EQ] = ACTIONS(598),
-    [anon_sym_PERCENT_EQ] = ACTIONS(598),
-    [anon_sym_STAR_STAR_EQ] = ACTIONS(598),
-    [anon_sym_GT_GT_EQ] = ACTIONS(598),
-    [anon_sym_LT_LT_EQ] = ACTIONS(598),
-    [anon_sym_AMP_EQ] = ACTIONS(598),
-    [anon_sym_CARET_EQ] = ACTIONS(598),
-    [anon_sym_PIPE_EQ] = ACTIONS(598),
-    [sym_ellipsis] = ACTIONS(309),
-    [sym_integer] = ACTIONS(311),
-    [sym_float] = ACTIONS(309),
-    [anon_sym_await] = ACTIONS(600),
-    [sym_true] = ACTIONS(311),
-    [sym_false] = ACTIONS(311),
-    [sym_none] = ACTIONS(311),
-    [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(315),
-    [sym__template_string_start] = ACTIONS(317),
-  },
   [STATE(144)] = {
-    [sym_primary_expression] = STATE(747),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
-    [sym_identifier] = ACTIONS(311),
-    [anon_sym_lazy] = ACTIONS(583),
+    [sym_primary_expression] = STATE(845),
+    [sym_binary_operator] = STATE(960),
+    [sym_unary_operator] = STATE(960),
+    [sym_attribute] = STATE(960),
+    [sym_subscript] = STATE(960),
+    [sym_call] = STATE(960),
+    [sym_list] = STATE(960),
+    [sym_set] = STATE(960),
+    [sym_tuple] = STATE(960),
+    [sym_dictionary] = STATE(960),
+    [sym_list_comprehension] = STATE(960),
+    [sym_dictionary_comprehension] = STATE(960),
+    [sym_set_comprehension] = STATE(960),
+    [sym_generator_expression] = STATE(960),
+    [sym_parenthesized_expression] = STATE(960),
+    [sym_concatenated_string] = STATE(960),
+    [sym_string] = STATE(814),
+    [sym_concatenated_template_string] = STATE(960),
+    [sym_template_string] = STATE(815),
+    [sym_await] = STATE(960),
+    [sym_identifier] = ACTIONS(634),
+    [anon_sym_lazy] = ACTIONS(636),
     [anon_sym_DOT] = ACTIONS(272),
-    [anon_sym_LPAREN] = ACTIONS(602),
+    [anon_sym_LPAREN] = ACTIONS(638),
     [anon_sym_RPAREN] = ACTIONS(303),
     [anon_sym_COMMA] = ACTIONS(303),
+    [anon_sym_as] = ACTIONS(272),
     [anon_sym_STAR] = ACTIONS(272),
-    [anon_sym_print] = ACTIONS(583),
+    [anon_sym_print] = ACTIONS(636),
     [anon_sym_GT_GT] = ACTIONS(303),
-    [anon_sym_COLON_EQ] = ACTIONS(604),
+    [anon_sym_COLON_EQ] = ACTIONS(640),
     [anon_sym_if] = ACTIONS(272),
-    [anon_sym_async] = ACTIONS(583),
-    [anon_sym_for] = ACTIONS(272),
+    [anon_sym_COLON] = ACTIONS(272),
+    [anon_sym_async] = ACTIONS(636),
     [anon_sym_in] = ACTIONS(272),
-    [anon_sym_match] = ACTIONS(583),
+    [anon_sym_match] = ACTIONS(636),
     [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(606),
-    [anon_sym_PLUS] = ACTIONS(606),
-    [anon_sym_LBRACK] = ACTIONS(608),
-    [anon_sym_LBRACE] = ACTIONS(293),
+    [anon_sym_DASH] = ACTIONS(642),
+    [anon_sym_PLUS] = ACTIONS(642),
+    [anon_sym_LBRACK] = ACTIONS(644),
+    [anon_sym_LBRACE] = ACTIONS(646),
     [anon_sym_STAR_STAR] = ACTIONS(303),
-    [anon_sym_EQ] = ACTIONS(634),
-    [anon_sym_exec] = ACTIONS(583),
-    [anon_sym_type] = ACTIONS(583),
+    [anon_sym_exec] = ACTIONS(636),
+    [anon_sym_type] = ACTIONS(636),
     [anon_sym_AT] = ACTIONS(303),
     [anon_sym_not] = ACTIONS(272),
     [anon_sym_and] = ACTIONS(272),
@@ -23559,7 +23569,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_AMP] = ACTIONS(303),
     [anon_sym_CARET] = ACTIONS(303),
     [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(606),
+    [anon_sym_TILDE] = ACTIONS(642),
     [anon_sym_LT] = ACTIONS(272),
     [anon_sym_LT_EQ] = ACTIONS(303),
     [anon_sym_EQ_EQ] = ACTIONS(303),
@@ -23568,60 +23578,60 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_GT] = ACTIONS(272),
     [anon_sym_LT_GT] = ACTIONS(303),
     [anon_sym_is] = ACTIONS(272),
-    [sym_ellipsis] = ACTIONS(309),
-    [sym_integer] = ACTIONS(311),
-    [sym_float] = ACTIONS(309),
-    [anon_sym_await] = ACTIONS(610),
-    [sym_true] = ACTIONS(311),
-    [sym_false] = ACTIONS(311),
-    [sym_none] = ACTIONS(311),
+    [sym_ellipsis] = ACTIONS(648),
+    [sym_integer] = ACTIONS(634),
+    [sym_float] = ACTIONS(648),
+    [anon_sym_await] = ACTIONS(650),
+    [sym_true] = ACTIONS(634),
+    [sym_false] = ACTIONS(634),
+    [sym_none] = ACTIONS(634),
     [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(315),
-    [sym__template_string_start] = ACTIONS(317),
+    [sym__string_start] = ACTIONS(652),
+    [sym__template_string_start] = ACTIONS(654),
   },
   [STATE(145)] = {
-    [sym_primary_expression] = STATE(808),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
+    [sym_primary_expression] = STATE(753),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
     [sym_identifier] = ACTIONS(311),
     [anon_sym_lazy] = ACTIONS(583),
     [anon_sym_DOT] = ACTIONS(272),
-    [anon_sym_LPAREN] = ACTIONS(636),
+    [anon_sym_LPAREN] = ACTIONS(602),
+    [anon_sym_RPAREN] = ACTIONS(303),
     [anon_sym_COMMA] = ACTIONS(303),
     [anon_sym_STAR] = ACTIONS(272),
     [anon_sym_print] = ACTIONS(583),
     [anon_sym_GT_GT] = ACTIONS(303),
-    [anon_sym_COLON_EQ] = ACTIONS(638),
+    [anon_sym_COLON_EQ] = ACTIONS(604),
     [anon_sym_if] = ACTIONS(272),
-    [anon_sym_COLON] = ACTIONS(272),
     [anon_sym_async] = ACTIONS(583),
     [anon_sym_for] = ACTIONS(272),
     [anon_sym_in] = ACTIONS(272),
     [anon_sym_match] = ACTIONS(583),
     [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(640),
-    [anon_sym_PLUS] = ACTIONS(640),
-    [anon_sym_LBRACK] = ACTIONS(642),
+    [anon_sym_DASH] = ACTIONS(606),
+    [anon_sym_PLUS] = ACTIONS(606),
+    [anon_sym_LBRACK] = ACTIONS(608),
     [anon_sym_LBRACE] = ACTIONS(293),
-    [anon_sym_RBRACE] = ACTIONS(303),
     [anon_sym_STAR_STAR] = ACTIONS(303),
+    [anon_sym_EQ] = ACTIONS(656),
     [anon_sym_exec] = ACTIONS(583),
     [anon_sym_type] = ACTIONS(583),
     [anon_sym_AT] = ACTIONS(303),
@@ -23634,7 +23644,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_AMP] = ACTIONS(303),
     [anon_sym_CARET] = ACTIONS(303),
     [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(640),
+    [anon_sym_TILDE] = ACTIONS(606),
     [anon_sym_LT] = ACTIONS(272),
     [anon_sym_LT_EQ] = ACTIONS(303),
     [anon_sym_EQ_EQ] = ACTIONS(303),
@@ -23646,7 +23656,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_ellipsis] = ACTIONS(309),
     [sym_integer] = ACTIONS(311),
     [sym_float] = ACTIONS(309),
-    [anon_sym_await] = ACTIONS(644),
+    [anon_sym_await] = ACTIONS(610),
     [sym_true] = ACTIONS(311),
     [sym_false] = ACTIONS(311),
     [sym_none] = ACTIONS(311),
@@ -23655,101 +23665,26 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(317),
   },
   [STATE(146)] = {
-    [sym_primary_expression] = STATE(839),
-    [sym_binary_operator] = STATE(985),
-    [sym_unary_operator] = STATE(985),
-    [sym_attribute] = STATE(985),
-    [sym_subscript] = STATE(985),
-    [sym_call] = STATE(985),
-    [sym_list] = STATE(985),
-    [sym_set] = STATE(985),
-    [sym_tuple] = STATE(985),
-    [sym_dictionary] = STATE(985),
-    [sym_list_comprehension] = STATE(985),
-    [sym_dictionary_comprehension] = STATE(985),
-    [sym_set_comprehension] = STATE(985),
-    [sym_generator_expression] = STATE(985),
-    [sym_parenthesized_expression] = STATE(985),
-    [sym_concatenated_string] = STATE(985),
-    [sym_string] = STATE(790),
-    [sym_concatenated_template_string] = STATE(985),
-    [sym_template_string] = STATE(791),
-    [sym_await] = STATE(985),
-    [sym_identifier] = ACTIONS(646),
-    [anon_sym_lazy] = ACTIONS(648),
-    [anon_sym_DOT] = ACTIONS(272),
-    [anon_sym_LPAREN] = ACTIONS(650),
-    [anon_sym_RPAREN] = ACTIONS(303),
-    [anon_sym_COMMA] = ACTIONS(303),
-    [anon_sym_as] = ACTIONS(272),
-    [anon_sym_STAR] = ACTIONS(272),
-    [anon_sym_print] = ACTIONS(648),
-    [anon_sym_GT_GT] = ACTIONS(303),
-    [anon_sym_COLON_EQ] = ACTIONS(652),
-    [anon_sym_if] = ACTIONS(272),
-    [anon_sym_COLON] = ACTIONS(272),
-    [anon_sym_async] = ACTIONS(648),
-    [anon_sym_in] = ACTIONS(272),
-    [anon_sym_match] = ACTIONS(648),
-    [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(654),
-    [anon_sym_PLUS] = ACTIONS(654),
-    [anon_sym_LBRACK] = ACTIONS(656),
-    [anon_sym_LBRACE] = ACTIONS(658),
-    [anon_sym_STAR_STAR] = ACTIONS(303),
-    [anon_sym_exec] = ACTIONS(648),
-    [anon_sym_type] = ACTIONS(648),
-    [anon_sym_AT] = ACTIONS(303),
-    [anon_sym_not] = ACTIONS(272),
-    [anon_sym_and] = ACTIONS(272),
-    [anon_sym_or] = ACTIONS(272),
-    [anon_sym_SLASH] = ACTIONS(272),
-    [anon_sym_PERCENT] = ACTIONS(303),
-    [anon_sym_SLASH_SLASH] = ACTIONS(303),
-    [anon_sym_AMP] = ACTIONS(303),
-    [anon_sym_CARET] = ACTIONS(303),
-    [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(654),
-    [anon_sym_LT] = ACTIONS(272),
-    [anon_sym_LT_EQ] = ACTIONS(303),
-    [anon_sym_EQ_EQ] = ACTIONS(303),
-    [anon_sym_BANG_EQ] = ACTIONS(303),
-    [anon_sym_GT_EQ] = ACTIONS(303),
-    [anon_sym_GT] = ACTIONS(272),
-    [anon_sym_LT_GT] = ACTIONS(303),
-    [anon_sym_is] = ACTIONS(272),
-    [sym_ellipsis] = ACTIONS(660),
-    [sym_integer] = ACTIONS(646),
-    [sym_float] = ACTIONS(660),
-    [anon_sym_await] = ACTIONS(662),
-    [sym_true] = ACTIONS(646),
-    [sym_false] = ACTIONS(646),
-    [sym_none] = ACTIONS(646),
-    [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(664),
-    [sym__template_string_start] = ACTIONS(666),
-  },
-  [STATE(147)] = {
-    [sym_primary_expression] = STATE(805),
-    [sym_binary_operator] = STATE(949),
-    [sym_unary_operator] = STATE(949),
-    [sym_attribute] = STATE(949),
-    [sym_subscript] = STATE(949),
-    [sym_call] = STATE(949),
-    [sym_list] = STATE(949),
-    [sym_set] = STATE(949),
-    [sym_tuple] = STATE(949),
-    [sym_dictionary] = STATE(949),
-    [sym_list_comprehension] = STATE(949),
-    [sym_dictionary_comprehension] = STATE(949),
-    [sym_set_comprehension] = STATE(949),
-    [sym_generator_expression] = STATE(949),
-    [sym_parenthesized_expression] = STATE(949),
-    [sym_concatenated_string] = STATE(949),
-    [sym_string] = STATE(781),
-    [sym_concatenated_template_string] = STATE(949),
-    [sym_template_string] = STATE(782),
-    [sym_await] = STATE(949),
+    [sym_primary_expression] = STATE(819),
+    [sym_binary_operator] = STATE(879),
+    [sym_unary_operator] = STATE(879),
+    [sym_attribute] = STATE(879),
+    [sym_subscript] = STATE(879),
+    [sym_call] = STATE(879),
+    [sym_list] = STATE(879),
+    [sym_set] = STATE(879),
+    [sym_tuple] = STATE(879),
+    [sym_dictionary] = STATE(879),
+    [sym_list_comprehension] = STATE(879),
+    [sym_dictionary_comprehension] = STATE(879),
+    [sym_set_comprehension] = STATE(879),
+    [sym_generator_expression] = STATE(879),
+    [sym_parenthesized_expression] = STATE(879),
+    [sym_concatenated_string] = STATE(879),
+    [sym_string] = STATE(771),
+    [sym_concatenated_template_string] = STATE(879),
+    [sym_template_string] = STATE(772),
+    [sym_await] = STATE(879),
     [sym_identifier] = ACTIONS(612),
     [anon_sym_lazy] = ACTIONS(614),
     [anon_sym_DOT] = ACTIONS(272),
@@ -23804,27 +23739,27 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(630),
     [sym__template_string_start] = ACTIONS(632),
   },
-  [STATE(148)] = {
-    [sym_primary_expression] = STATE(747),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
+  [STATE(147)] = {
+    [sym_primary_expression] = STATE(753),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
     [sym_identifier] = ACTIONS(311),
     [anon_sym_lazy] = ACTIONS(583),
     [anon_sym_DOT] = ACTIONS(272),
@@ -23879,27 +23814,102 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__string_start] = ACTIONS(315),
     [sym__template_string_start] = ACTIONS(317),
   },
+  [STATE(148)] = {
+    [sym_primary_expression] = STATE(818),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_attribute] = STATE(905),
+    [sym_subscript] = STATE(905),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
+    [sym_identifier] = ACTIONS(79),
+    [anon_sym_lazy] = ACTIONS(573),
+    [anon_sym_DOT] = ACTIONS(272),
+    [anon_sym_from] = ACTIONS(272),
+    [anon_sym_LPAREN] = ACTIONS(575),
+    [anon_sym_COMMA] = ACTIONS(303),
+    [anon_sym_STAR] = ACTIONS(272),
+    [anon_sym_print] = ACTIONS(573),
+    [anon_sym_GT_GT] = ACTIONS(303),
+    [anon_sym_if] = ACTIONS(272),
+    [anon_sym_async] = ACTIONS(573),
+    [anon_sym_in] = ACTIONS(272),
+    [anon_sym_match] = ACTIONS(573),
+    [anon_sym_PIPE] = ACTIONS(303),
+    [anon_sym_DASH] = ACTIONS(49),
+    [anon_sym_PLUS] = ACTIONS(49),
+    [anon_sym_LBRACK] = ACTIONS(579),
+    [anon_sym_LBRACE] = ACTIONS(53),
+    [anon_sym_STAR_STAR] = ACTIONS(303),
+    [anon_sym_EQ] = ACTIONS(272),
+    [anon_sym_exec] = ACTIONS(573),
+    [anon_sym_type] = ACTIONS(573),
+    [anon_sym_AT] = ACTIONS(303),
+    [anon_sym_not] = ACTIONS(272),
+    [anon_sym_and] = ACTIONS(272),
+    [anon_sym_or] = ACTIONS(272),
+    [anon_sym_SLASH] = ACTIONS(272),
+    [anon_sym_PERCENT] = ACTIONS(303),
+    [anon_sym_SLASH_SLASH] = ACTIONS(303),
+    [anon_sym_AMP] = ACTIONS(303),
+    [anon_sym_CARET] = ACTIONS(303),
+    [anon_sym_LT_LT] = ACTIONS(303),
+    [anon_sym_TILDE] = ACTIONS(49),
+    [anon_sym_LT] = ACTIONS(272),
+    [anon_sym_LT_EQ] = ACTIONS(303),
+    [anon_sym_EQ_EQ] = ACTIONS(303),
+    [anon_sym_BANG_EQ] = ACTIONS(303),
+    [anon_sym_GT_EQ] = ACTIONS(303),
+    [anon_sym_GT] = ACTIONS(272),
+    [anon_sym_LT_GT] = ACTIONS(303),
+    [anon_sym_is] = ACTIONS(272),
+    [sym_ellipsis] = ACTIONS(77),
+    [sym_integer] = ACTIONS(79),
+    [sym_float] = ACTIONS(77),
+    [anon_sym_await] = ACTIONS(581),
+    [sym_true] = ACTIONS(79),
+    [sym_false] = ACTIONS(79),
+    [sym_none] = ACTIONS(79),
+    [sym_comment] = ACTIONS(3),
+    [anon_sym_SEMI] = ACTIONS(303),
+    [sym__newline] = ACTIONS(303),
+    [sym__string_start] = ACTIONS(83),
+    [sym__template_string_start] = ACTIONS(85),
+  },
   [STATE(149)] = {
-    [sym_primary_expression] = STATE(747),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
+    [sym_primary_expression] = STATE(753),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
     [sym_identifier] = ACTIONS(311),
     [anon_sym_lazy] = ACTIONS(583),
     [anon_sym_DOT] = ACTIONS(272),
@@ -23955,48 +23965,50 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(317),
   },
   [STATE(150)] = {
-    [sym_primary_expression] = STATE(799),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_attribute] = STATE(950),
-    [sym_subscript] = STATE(950),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
-    [sym_identifier] = ACTIONS(79),
-    [anon_sym_lazy] = ACTIONS(573),
+    [sym_primary_expression] = STATE(808),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
+    [sym_identifier] = ACTIONS(311),
+    [anon_sym_lazy] = ACTIONS(583),
     [anon_sym_DOT] = ACTIONS(272),
-    [anon_sym_from] = ACTIONS(272),
-    [anon_sym_LPAREN] = ACTIONS(575),
+    [anon_sym_LPAREN] = ACTIONS(658),
     [anon_sym_COMMA] = ACTIONS(303),
     [anon_sym_STAR] = ACTIONS(272),
-    [anon_sym_print] = ACTIONS(573),
+    [anon_sym_print] = ACTIONS(583),
     [anon_sym_GT_GT] = ACTIONS(303),
+    [anon_sym_COLON_EQ] = ACTIONS(660),
     [anon_sym_if] = ACTIONS(272),
-    [anon_sym_async] = ACTIONS(573),
+    [anon_sym_COLON] = ACTIONS(272),
+    [anon_sym_async] = ACTIONS(583),
+    [anon_sym_for] = ACTIONS(272),
     [anon_sym_in] = ACTIONS(272),
-    [anon_sym_match] = ACTIONS(573),
+    [anon_sym_match] = ACTIONS(583),
     [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(49),
-    [anon_sym_PLUS] = ACTIONS(49),
-    [anon_sym_LBRACK] = ACTIONS(579),
-    [anon_sym_LBRACE] = ACTIONS(53),
+    [anon_sym_DASH] = ACTIONS(662),
+    [anon_sym_PLUS] = ACTIONS(662),
+    [anon_sym_LBRACK] = ACTIONS(664),
+    [anon_sym_LBRACE] = ACTIONS(293),
+    [anon_sym_RBRACE] = ACTIONS(303),
     [anon_sym_STAR_STAR] = ACTIONS(303),
-    [anon_sym_EQ] = ACTIONS(272),
-    [anon_sym_exec] = ACTIONS(573),
-    [anon_sym_type] = ACTIONS(573),
+    [anon_sym_exec] = ACTIONS(583),
+    [anon_sym_type] = ACTIONS(583),
     [anon_sym_AT] = ACTIONS(303),
     [anon_sym_not] = ACTIONS(272),
     [anon_sym_and] = ACTIONS(272),
@@ -24007,7 +24019,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_AMP] = ACTIONS(303),
     [anon_sym_CARET] = ACTIONS(303),
     [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(49),
+    [anon_sym_TILDE] = ACTIONS(662),
     [anon_sym_LT] = ACTIONS(272),
     [anon_sym_LT_EQ] = ACTIONS(303),
     [anon_sym_EQ_EQ] = ACTIONS(303),
@@ -24016,61 +24028,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_GT] = ACTIONS(272),
     [anon_sym_LT_GT] = ACTIONS(303),
     [anon_sym_is] = ACTIONS(272),
-    [sym_ellipsis] = ACTIONS(77),
-    [sym_integer] = ACTIONS(79),
-    [sym_float] = ACTIONS(77),
-    [anon_sym_await] = ACTIONS(581),
-    [sym_true] = ACTIONS(79),
-    [sym_false] = ACTIONS(79),
-    [sym_none] = ACTIONS(79),
+    [sym_ellipsis] = ACTIONS(309),
+    [sym_integer] = ACTIONS(311),
+    [sym_float] = ACTIONS(309),
+    [anon_sym_await] = ACTIONS(666),
+    [sym_true] = ACTIONS(311),
+    [sym_false] = ACTIONS(311),
+    [sym_none] = ACTIONS(311),
     [sym_comment] = ACTIONS(3),
-    [anon_sym_SEMI] = ACTIONS(303),
-    [sym__newline] = ACTIONS(303),
-    [sym__string_start] = ACTIONS(83),
-    [sym__template_string_start] = ACTIONS(85),
+    [sym__string_start] = ACTIONS(315),
+    [sym__template_string_start] = ACTIONS(317),
   },
   [STATE(151)] = {
-    [sym_primary_expression] = STATE(808),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
+    [sym_primary_expression] = STATE(747),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
     [sym_identifier] = ACTIONS(311),
     [anon_sym_lazy] = ACTIONS(583),
     [anon_sym_DOT] = ACTIONS(272),
-    [anon_sym_LPAREN] = ACTIONS(636),
+    [anon_sym_LPAREN] = ACTIONS(585),
+    [anon_sym_RPAREN] = ACTIONS(303),
     [anon_sym_COMMA] = ACTIONS(303),
     [anon_sym_STAR] = ACTIONS(272),
     [anon_sym_print] = ACTIONS(583),
     [anon_sym_GT_GT] = ACTIONS(303),
+    [anon_sym_COLON_EQ] = ACTIONS(590),
     [anon_sym_if] = ACTIONS(272),
-    [anon_sym_COLON] = ACTIONS(303),
     [anon_sym_async] = ACTIONS(583),
-    [anon_sym_for] = ACTIONS(272),
     [anon_sym_in] = ACTIONS(272),
     [anon_sym_match] = ACTIONS(583),
     [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(640),
-    [anon_sym_PLUS] = ACTIONS(640),
-    [anon_sym_LBRACK] = ACTIONS(642),
+    [anon_sym_DASH] = ACTIONS(301),
+    [anon_sym_PLUS] = ACTIONS(301),
+    [anon_sym_LBRACK] = ACTIONS(596),
     [anon_sym_LBRACE] = ACTIONS(293),
-    [anon_sym_RBRACE] = ACTIONS(303),
     [anon_sym_STAR_STAR] = ACTIONS(303),
+    [anon_sym_EQ] = ACTIONS(656),
     [anon_sym_exec] = ACTIONS(583),
     [anon_sym_type] = ACTIONS(583),
     [anon_sym_AT] = ACTIONS(303),
@@ -24083,7 +24093,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_AMP] = ACTIONS(303),
     [anon_sym_CARET] = ACTIONS(303),
     [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(640),
+    [anon_sym_TILDE] = ACTIONS(301),
     [anon_sym_LT] = ACTIONS(272),
     [anon_sym_LT_EQ] = ACTIONS(303),
     [anon_sym_EQ_EQ] = ACTIONS(303),
@@ -24095,7 +24105,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_ellipsis] = ACTIONS(309),
     [sym_integer] = ACTIONS(311),
     [sym_float] = ACTIONS(309),
-    [anon_sym_await] = ACTIONS(644),
+    [anon_sym_await] = ACTIONS(600),
     [sym_true] = ACTIONS(311),
     [sym_false] = ACTIONS(311),
     [sym_none] = ACTIONS(311),
@@ -24104,49 +24114,49 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(317),
   },
   [STATE(152)] = {
-    [sym_primary_expression] = STATE(839),
-    [sym_binary_operator] = STATE(985),
-    [sym_unary_operator] = STATE(985),
-    [sym_attribute] = STATE(985),
-    [sym_subscript] = STATE(985),
-    [sym_call] = STATE(985),
-    [sym_list] = STATE(985),
-    [sym_set] = STATE(985),
-    [sym_tuple] = STATE(985),
-    [sym_dictionary] = STATE(985),
-    [sym_list_comprehension] = STATE(985),
-    [sym_dictionary_comprehension] = STATE(985),
-    [sym_set_comprehension] = STATE(985),
-    [sym_generator_expression] = STATE(985),
-    [sym_parenthesized_expression] = STATE(985),
-    [sym_concatenated_string] = STATE(985),
-    [sym_string] = STATE(790),
-    [sym_concatenated_template_string] = STATE(985),
-    [sym_template_string] = STATE(791),
-    [sym_await] = STATE(985),
-    [sym_identifier] = ACTIONS(646),
-    [anon_sym_lazy] = ACTIONS(648),
+    [sym_primary_expression] = STATE(845),
+    [sym_binary_operator] = STATE(960),
+    [sym_unary_operator] = STATE(960),
+    [sym_attribute] = STATE(960),
+    [sym_subscript] = STATE(960),
+    [sym_call] = STATE(960),
+    [sym_list] = STATE(960),
+    [sym_set] = STATE(960),
+    [sym_tuple] = STATE(960),
+    [sym_dictionary] = STATE(960),
+    [sym_list_comprehension] = STATE(960),
+    [sym_dictionary_comprehension] = STATE(960),
+    [sym_set_comprehension] = STATE(960),
+    [sym_generator_expression] = STATE(960),
+    [sym_parenthesized_expression] = STATE(960),
+    [sym_concatenated_string] = STATE(960),
+    [sym_string] = STATE(814),
+    [sym_concatenated_template_string] = STATE(960),
+    [sym_template_string] = STATE(815),
+    [sym_await] = STATE(960),
+    [sym_identifier] = ACTIONS(634),
+    [anon_sym_lazy] = ACTIONS(636),
     [anon_sym_DOT] = ACTIONS(272),
-    [anon_sym_LPAREN] = ACTIONS(650),
+    [anon_sym_LPAREN] = ACTIONS(638),
     [anon_sym_RPAREN] = ACTIONS(303),
     [anon_sym_COMMA] = ACTIONS(303),
     [anon_sym_as] = ACTIONS(272),
     [anon_sym_STAR] = ACTIONS(272),
-    [anon_sym_print] = ACTIONS(648),
+    [anon_sym_print] = ACTIONS(636),
     [anon_sym_GT_GT] = ACTIONS(303),
     [anon_sym_if] = ACTIONS(272),
     [anon_sym_COLON] = ACTIONS(303),
-    [anon_sym_async] = ACTIONS(648),
+    [anon_sym_async] = ACTIONS(636),
     [anon_sym_in] = ACTIONS(272),
-    [anon_sym_match] = ACTIONS(648),
+    [anon_sym_match] = ACTIONS(636),
     [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(654),
-    [anon_sym_PLUS] = ACTIONS(654),
-    [anon_sym_LBRACK] = ACTIONS(656),
-    [anon_sym_LBRACE] = ACTIONS(658),
+    [anon_sym_DASH] = ACTIONS(642),
+    [anon_sym_PLUS] = ACTIONS(642),
+    [anon_sym_LBRACK] = ACTIONS(644),
+    [anon_sym_LBRACE] = ACTIONS(646),
     [anon_sym_STAR_STAR] = ACTIONS(303),
-    [anon_sym_exec] = ACTIONS(648),
-    [anon_sym_type] = ACTIONS(648),
+    [anon_sym_exec] = ACTIONS(636),
+    [anon_sym_type] = ACTIONS(636),
     [anon_sym_AT] = ACTIONS(303),
     [anon_sym_not] = ACTIONS(272),
     [anon_sym_and] = ACTIONS(272),
@@ -24157,7 +24167,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_AMP] = ACTIONS(303),
     [anon_sym_CARET] = ACTIONS(303),
     [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(654),
+    [anon_sym_TILDE] = ACTIONS(642),
     [anon_sym_LT] = ACTIONS(272),
     [anon_sym_LT_EQ] = ACTIONS(303),
     [anon_sym_EQ_EQ] = ACTIONS(303),
@@ -24166,59 +24176,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_GT] = ACTIONS(272),
     [anon_sym_LT_GT] = ACTIONS(303),
     [anon_sym_is] = ACTIONS(272),
-    [sym_ellipsis] = ACTIONS(660),
-    [sym_integer] = ACTIONS(646),
-    [sym_float] = ACTIONS(660),
-    [anon_sym_await] = ACTIONS(662),
-    [sym_true] = ACTIONS(646),
-    [sym_false] = ACTIONS(646),
-    [sym_none] = ACTIONS(646),
+    [sym_ellipsis] = ACTIONS(648),
+    [sym_integer] = ACTIONS(634),
+    [sym_float] = ACTIONS(648),
+    [anon_sym_await] = ACTIONS(650),
+    [sym_true] = ACTIONS(634),
+    [sym_false] = ACTIONS(634),
+    [sym_none] = ACTIONS(634),
     [sym_comment] = ACTIONS(3),
-    [sym__string_start] = ACTIONS(664),
-    [sym__template_string_start] = ACTIONS(666),
+    [sym__string_start] = ACTIONS(652),
+    [sym__template_string_start] = ACTIONS(654),
   },
   [STATE(153)] = {
-    [sym_primary_expression] = STATE(766),
-    [sym_binary_operator] = STATE(720),
-    [sym_unary_operator] = STATE(720),
-    [sym_attribute] = STATE(720),
-    [sym_subscript] = STATE(720),
-    [sym_call] = STATE(720),
-    [sym_list] = STATE(720),
-    [sym_set] = STATE(720),
-    [sym_tuple] = STATE(720),
-    [sym_dictionary] = STATE(720),
-    [sym_list_comprehension] = STATE(720),
-    [sym_dictionary_comprehension] = STATE(720),
-    [sym_set_comprehension] = STATE(720),
-    [sym_generator_expression] = STATE(720),
-    [sym_parenthesized_expression] = STATE(720),
-    [sym_concatenated_string] = STATE(720),
-    [sym_string] = STATE(694),
-    [sym_concatenated_template_string] = STATE(720),
-    [sym_template_string] = STATE(698),
-    [sym_await] = STATE(720),
+    [sym_primary_expression] = STATE(808),
+    [sym_binary_operator] = STATE(734),
+    [sym_unary_operator] = STATE(734),
+    [sym_attribute] = STATE(734),
+    [sym_subscript] = STATE(734),
+    [sym_call] = STATE(734),
+    [sym_list] = STATE(734),
+    [sym_set] = STATE(734),
+    [sym_tuple] = STATE(734),
+    [sym_dictionary] = STATE(734),
+    [sym_list_comprehension] = STATE(734),
+    [sym_dictionary_comprehension] = STATE(734),
+    [sym_set_comprehension] = STATE(734),
+    [sym_generator_expression] = STATE(734),
+    [sym_parenthesized_expression] = STATE(734),
+    [sym_concatenated_string] = STATE(734),
+    [sym_string] = STATE(698),
+    [sym_concatenated_template_string] = STATE(734),
+    [sym_template_string] = STATE(627),
+    [sym_await] = STATE(734),
     [sym_identifier] = ACTIONS(311),
     [anon_sym_lazy] = ACTIONS(583),
     [anon_sym_DOT] = ACTIONS(272),
-    [anon_sym_LPAREN] = ACTIONS(585),
-    [anon_sym_RPAREN] = ACTIONS(303),
+    [anon_sym_LPAREN] = ACTIONS(658),
     [anon_sym_COMMA] = ACTIONS(303),
     [anon_sym_STAR] = ACTIONS(272),
     [anon_sym_print] = ACTIONS(583),
     [anon_sym_GT_GT] = ACTIONS(303),
-    [anon_sym_COLON_EQ] = ACTIONS(590),
     [anon_sym_if] = ACTIONS(272),
+    [anon_sym_COLON] = ACTIONS(303),
     [anon_sym_async] = ACTIONS(583),
+    [anon_sym_for] = ACTIONS(272),
     [anon_sym_in] = ACTIONS(272),
     [anon_sym_match] = ACTIONS(583),
     [anon_sym_PIPE] = ACTIONS(303),
-    [anon_sym_DASH] = ACTIONS(301),
-    [anon_sym_PLUS] = ACTIONS(301),
-    [anon_sym_LBRACK] = ACTIONS(596),
+    [anon_sym_DASH] = ACTIONS(662),
+    [anon_sym_PLUS] = ACTIONS(662),
+    [anon_sym_LBRACK] = ACTIONS(664),
     [anon_sym_LBRACE] = ACTIONS(293),
+    [anon_sym_RBRACE] = ACTIONS(303),
     [anon_sym_STAR_STAR] = ACTIONS(303),
-    [anon_sym_EQ] = ACTIONS(634),
     [anon_sym_exec] = ACTIONS(583),
     [anon_sym_type] = ACTIONS(583),
     [anon_sym_AT] = ACTIONS(303),
@@ -24231,7 +24241,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_AMP] = ACTIONS(303),
     [anon_sym_CARET] = ACTIONS(303),
     [anon_sym_LT_LT] = ACTIONS(303),
-    [anon_sym_TILDE] = ACTIONS(301),
+    [anon_sym_TILDE] = ACTIONS(662),
     [anon_sym_LT] = ACTIONS(272),
     [anon_sym_LT_EQ] = ACTIONS(303),
     [anon_sym_EQ_EQ] = ACTIONS(303),
@@ -24243,7 +24253,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_ellipsis] = ACTIONS(309),
     [sym_integer] = ACTIONS(311),
     [sym_float] = ACTIONS(309),
-    [anon_sym_await] = ACTIONS(600),
+    [anon_sym_await] = ACTIONS(666),
     [sym_true] = ACTIONS(311),
     [sym_false] = ACTIONS(311),
     [sym_none] = ACTIONS(311),
@@ -24252,45 +24262,45 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(317),
   },
   [STATE(154)] = {
-    [sym_named_expression] = STATE(1126),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_expression_list] = STATE(1586),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1181),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1586),
-    [sym_augmented_assignment] = STATE(1586),
+    [sym_named_expression] = STATE(1145),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_expression_list] = STATE(1595),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1210),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1595),
+    [sym_augmented_assignment] = STATE(1595),
     [sym_pattern_list] = STATE(1030),
-    [sym__right_hand_side] = STATE(1586),
-    [sym_yield] = STATE(1586),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym__right_hand_side] = STATE(1595),
+    [sym_yield] = STATE(1595),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(319),
     [anon_sym_LPAREN] = ACTIONS(15),
@@ -24321,45 +24331,45 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(155)] = {
-    [sym_named_expression] = STATE(1126),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_expression_list] = STATE(1608),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1181),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1608),
-    [sym_augmented_assignment] = STATE(1608),
+    [sym_named_expression] = STATE(1145),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_expression_list] = STATE(1596),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1210),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1596),
+    [sym_augmented_assignment] = STATE(1596),
     [sym_pattern_list] = STATE(1030),
-    [sym__right_hand_side] = STATE(1608),
-    [sym_yield] = STATE(1608),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym__right_hand_side] = STATE(1596),
+    [sym_yield] = STATE(1596),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(319),
     [anon_sym_LPAREN] = ACTIONS(15),
@@ -24390,45 +24400,45 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__template_string_start] = ACTIONS(85),
   },
   [STATE(156)] = {
-    [sym_named_expression] = STATE(1126),
-    [sym_list_splat] = STATE(1590),
-    [sym_dictionary_splat] = STATE(1590),
-    [sym_expression_list] = STATE(1610),
-    [sym_pattern] = STATE(1020),
-    [sym_tuple_pattern] = STATE(1005),
-    [sym_list_pattern] = STATE(1005),
-    [sym_list_splat_pattern] = STATE(1005),
-    [sym_expression] = STATE(1181),
-    [sym_primary_expression] = STATE(773),
-    [sym_not_operator] = STATE(1126),
-    [sym_boolean_operator] = STATE(1126),
-    [sym_binary_operator] = STATE(950),
-    [sym_unary_operator] = STATE(950),
-    [sym_comparison_operator] = STATE(1126),
-    [sym_lambda] = STATE(1126),
-    [sym_assignment] = STATE(1610),
-    [sym_augmented_assignment] = STATE(1610),
+    [sym_named_expression] = STATE(1145),
+    [sym_list_splat] = STATE(1557),
+    [sym_dictionary_splat] = STATE(1557),
+    [sym_expression_list] = STATE(1601),
+    [sym_pattern] = STATE(1022),
+    [sym_tuple_pattern] = STATE(1014),
+    [sym_list_pattern] = STATE(1014),
+    [sym_list_splat_pattern] = STATE(1014),
+    [sym_expression] = STATE(1210),
+    [sym_primary_expression] = STATE(780),
+    [sym_not_operator] = STATE(1145),
+    [sym_boolean_operator] = STATE(1145),
+    [sym_binary_operator] = STATE(905),
+    [sym_unary_operator] = STATE(905),
+    [sym_comparison_operator] = STATE(1145),
+    [sym_lambda] = STATE(1145),
+    [sym_assignment] = STATE(1601),
+    [sym_augmented_assignment] = STATE(1601),
     [sym_pattern_list] = STATE(1030),
-    [sym__right_hand_side] = STATE(1610),
-    [sym_yield] = STATE(1610),
-    [sym_attribute] = STATE(614),
-    [sym_subscript] = STATE(614),
-    [sym_call] = STATE(950),
-    [sym_list] = STATE(950),
-    [sym_set] = STATE(950),
-    [sym_tuple] = STATE(950),
-    [sym_dictionary] = STATE(950),
-    [sym_list_comprehension] = STATE(950),
-    [sym_dictionary_comprehension] = STATE(950),
-    [sym_set_comprehension] = STATE(950),
-    [sym_generator_expression] = STATE(950),
-    [sym_parenthesized_expression] = STATE(950),
-    [sym_conditional_expression] = STATE(1126),
-    [sym_concatenated_string] = STATE(950),
-    [sym_string] = STATE(779),
-    [sym_concatenated_template_string] = STATE(950),
-    [sym_template_string] = STATE(772),
-    [sym_await] = STATE(950),
+    [sym__right_hand_side] = STATE(1601),
+    [sym_yield] = STATE(1601),
+    [sym_attribute] = STATE(594),
+    [sym_subscript] = STATE(594),
+    [sym_call] = STATE(905),
+    [sym_list] = STATE(905),
+    [sym_set] = STATE(905),
+    [sym_tuple] = STATE(905),
+    [sym_dictionary] = STATE(905),
+    [sym_list_comprehension] = STATE(905),
+    [sym_dictionary_comprehension] = STATE(905),
+    [sym_set_comprehension] = STATE(905),
+    [sym_generator_expression] = STATE(905),
+    [sym_parenthesized_expression] = STATE(905),
+    [sym_conditional_expression] = STATE(1145),
+    [sym_concatenated_string] = STATE(905),
+    [sym_string] = STATE(783),
+    [sym_concatenated_template_string] = STATE(905),
+    [sym_template_string] = STATE(784),
+    [sym_await] = STATE(905),
     [sym_identifier] = ACTIONS(7),
     [anon_sym_lazy] = ACTIONS(319),
     [anon_sym_LPAREN] = ACTIONS(15),
@@ -24488,37 +24498,37 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_yield,
     ACTIONS(686), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1070), 1,
+    STATE(1089), 1,
       sym_expression,
-    STATE(1217), 1,
+    STATE(1231), 1,
       sym_list_splat,
-    STATE(1294), 1,
-      sym_parenthesized_list_splat,
-    STATE(1355), 1,
+    STATE(1358), 1,
       sym_pattern,
-    STATE(1461), 1,
+    STATE(1501), 1,
+      sym_parenthesized_list_splat,
+    STATE(1519), 1,
       sym_yield,
-    STATE(1721), 1,
-      sym__collection_elements,
-    STATE(1742), 1,
+    STATE(1668), 1,
       sym__patterns,
+    STATE(1689), 1,
+      sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(917), 2,
+    STATE(949), 2,
       sym_attribute,
       sym_subscript,
     ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1005), 3,
+    STATE(1014), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -24534,14 +24544,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 15,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -24557,7 +24567,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [127] = 31,
+  [127] = 30,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -24583,38 +24593,37 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(686), 1,
       anon_sym_await,
     ACTIONS(688), 1,
-      anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+      anon_sym_RBRACK,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1086), 1,
+    STATE(1088), 1,
       sym_expression,
-    STATE(1202), 1,
+    STATE(1179), 1,
       sym_list_splat,
-    STATE(1294), 1,
-      sym_parenthesized_list_splat,
-    STATE(1355), 1,
+    STATE(1358), 1,
       sym_pattern,
-    STATE(1432), 1,
-      sym_yield,
-    STATE(1686), 1,
-      sym__collection_elements,
-    STATE(1742), 1,
+    STATE(1736), 1,
       sym__patterns,
+    STATE(1747), 1,
+      sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(917), 2,
+    STATE(949), 2,
       sym_attribute,
       sym_subscript,
+    STATE(1318), 2,
+      sym_parenthesized_list_splat,
+      sym_yield,
     ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1005), 3,
+    STATE(1014), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -24630,14 +24639,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 15,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -24653,63 +24662,47 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [254] = 30,
+  [252] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(301), 1,
+      anon_sym_TILDE,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(668), 1,
+    ACTIONS(690), 1,
       sym_identifier,
-    ACTIONS(672), 1,
+    ACTIONS(694), 1,
       anon_sym_LPAREN,
-    ACTIONS(676), 1,
+    ACTIONS(696), 1,
       anon_sym_STAR,
-    ACTIONS(678), 1,
+    ACTIONS(700), 1,
+      anon_sym_in,
+    ACTIONS(702), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
-      anon_sym_not,
-    ACTIONS(682), 1,
-      anon_sym_lambda,
-    ACTIONS(684), 1,
-      anon_sym_yield,
-    ACTIONS(686), 1,
+    ACTIONS(704), 1,
       anon_sym_await,
-    ACTIONS(690), 1,
-      anon_sym_RBRACK,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
-      sym_primary_expression,
-    STATE(1080), 1,
-      sym_expression,
-    STATE(1204), 1,
-      sym_list_splat,
-    STATE(1355), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(1009), 1,
       sym_pattern,
-    STATE(1657), 1,
-      sym__collection_elements,
-    STATE(1690), 1,
-      sym__patterns,
+    STATE(1016), 1,
+      sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(917), 2,
-      sym_attribute,
-      sym_subscript,
-    STATE(1294), 2,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(606), 3,
+    ACTIONS(594), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1005), 3,
+    STATE(875), 2,
+      sym_attribute,
+      sym_subscript,
+    STATE(1014), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -24718,21 +24711,30 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(670), 6,
+    ACTIONS(692), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-    STATE(720), 15,
+    ACTIONS(698), 15,
+      anon_sym_COLON,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -24748,63 +24750,47 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [379] = 30,
+  [363] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(301), 1,
+      anon_sym_TILDE,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(668), 1,
+    ACTIONS(690), 1,
       sym_identifier,
-    ACTIONS(672), 1,
+    ACTIONS(694), 1,
       anon_sym_LPAREN,
-    ACTIONS(676), 1,
+    ACTIONS(696), 1,
       anon_sym_STAR,
-    ACTIONS(678), 1,
+    ACTIONS(702), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
-      anon_sym_not,
-    ACTIONS(682), 1,
-      anon_sym_lambda,
-    ACTIONS(684), 1,
-      anon_sym_yield,
-    ACTIONS(686), 1,
+    ACTIONS(704), 1,
       anon_sym_await,
-    ACTIONS(692), 1,
-      anon_sym_RBRACK,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(708), 1,
+      anon_sym_in,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
-      sym_primary_expression,
-    STATE(1095), 1,
-      sym_expression,
-    STATE(1218), 1,
-      sym_list_splat,
-    STATE(1355), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(1009), 1,
       sym_pattern,
-    STATE(1690), 1,
-      sym__patterns,
-    STATE(1692), 1,
-      sym__collection_elements,
+    STATE(1016), 1,
+      sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(917), 2,
-      sym_attribute,
-      sym_subscript,
-    STATE(1294), 2,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(606), 3,
+    ACTIONS(594), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1005), 3,
+    STATE(875), 2,
+      sym_attribute,
+      sym_subscript,
+    STATE(1014), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -24813,21 +24799,30 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(670), 6,
+    ACTIONS(692), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-    STATE(720), 15,
+    ACTIONS(706), 15,
+      anon_sym_COLON,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -24843,47 +24838,64 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [504] = 23,
+  [474] = 31,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(301), 1,
-      anon_sym_TILDE,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(694), 1,
+    ACTIONS(668), 1,
       sym_identifier,
-    ACTIONS(698), 1,
+    ACTIONS(672), 1,
       anon_sym_LPAREN,
-    ACTIONS(700), 1,
+    ACTIONS(676), 1,
       anon_sym_STAR,
-    ACTIONS(704), 1,
-      anon_sym_in,
-    ACTIONS(706), 1,
+    ACTIONS(678), 1,
       anon_sym_LBRACK,
-    ACTIONS(708), 1,
+    ACTIONS(680), 1,
+      anon_sym_not,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
+    ACTIONS(684), 1,
+      anon_sym_yield,
+    ACTIONS(686), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(710), 1,
+      anon_sym_RPAREN,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1002), 1,
-      sym_pattern,
-    STATE(1017), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
+    STATE(1089), 1,
+      sym_expression,
+    STATE(1222), 1,
+      sym_list_splat,
+    STATE(1318), 1,
+      sym_parenthesized_list_splat,
+    STATE(1358), 1,
+      sym_pattern,
+    STATE(1519), 1,
+      sym_yield,
+    STATE(1668), 1,
+      sym__patterns,
+    STATE(1689), 1,
+      sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(594), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(842), 2,
+    STATE(949), 2,
       sym_attribute,
       sym_subscript,
-    STATE(1005), 3,
+    ACTIONS(606), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1014), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -24892,30 +24904,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(696), 6,
+    ACTIONS(670), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    ACTIONS(702), 15,
-      anon_sym_COLON,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    STATE(720), 15,
+    STATE(1038), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -24931,47 +24934,63 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [615] = 23,
+  [601] = 30,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(301), 1,
-      anon_sym_TILDE,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(694), 1,
+    ACTIONS(668), 1,
       sym_identifier,
-    ACTIONS(698), 1,
+    ACTIONS(672), 1,
       anon_sym_LPAREN,
-    ACTIONS(700), 1,
+    ACTIONS(676), 1,
       anon_sym_STAR,
-    ACTIONS(706), 1,
+    ACTIONS(678), 1,
       anon_sym_LBRACK,
-    ACTIONS(708), 1,
+    ACTIONS(680), 1,
+      anon_sym_not,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
+    ACTIONS(684), 1,
+      anon_sym_yield,
+    ACTIONS(686), 1,
       anon_sym_await,
     ACTIONS(712), 1,
-      anon_sym_in,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+      anon_sym_RBRACK,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1002), 1,
-      sym_pattern,
-    STATE(1017), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
+    STATE(1077), 1,
+      sym_expression,
+    STATE(1224), 1,
+      sym_list_splat,
+    STATE(1358), 1,
+      sym_pattern,
+    STATE(1686), 1,
+      sym__collection_elements,
+    STATE(1736), 1,
+      sym__patterns,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(594), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(842), 2,
+    STATE(949), 2,
       sym_attribute,
       sym_subscript,
-    STATE(1005), 3,
+    STATE(1318), 2,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(606), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1014), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -24980,30 +24999,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(696), 6,
+    ACTIONS(670), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    ACTIONS(710), 15,
-      anon_sym_COLON,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    STATE(720), 15,
+    STATE(1038), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -25019,7 +25029,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [726] = 30,
+  [726] = 31,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -25045,37 +25055,38 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(686), 1,
       anon_sym_await,
     ACTIONS(714), 1,
-      anon_sym_RBRACK,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+      anon_sym_RPAREN,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1080), 1,
+    STATE(1087), 1,
       sym_expression,
-    STATE(1204), 1,
+    STATE(1240), 1,
       sym_list_splat,
-    STATE(1355), 1,
+    STATE(1318), 1,
+      sym_parenthesized_list_splat,
+    STATE(1358), 1,
       sym_pattern,
-    STATE(1657), 1,
+    STATE(1416), 1,
+      sym_yield,
+    STATE(1642), 1,
       sym__collection_elements,
-    STATE(1690), 1,
+    STATE(1668), 1,
       sym__patterns,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(917), 2,
+    STATE(949), 2,
       sym_attribute,
       sym_subscript,
-    STATE(1294), 2,
-      sym_parenthesized_list_splat,
-      sym_yield,
     ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1005), 3,
+    STATE(1014), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -25091,14 +25102,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 15,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -25114,7 +25125,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [851] = 31,
+  [853] = 30,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -25140,38 +25151,37 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(686), 1,
       anon_sym_await,
     ACTIONS(716), 1,
-      anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+      anon_sym_RBRACK,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1086), 1,
+    STATE(1077), 1,
       sym_expression,
-    STATE(1187), 1,
+    STATE(1224), 1,
       sym_list_splat,
-    STATE(1355), 1,
+    STATE(1358), 1,
       sym_pattern,
-    STATE(1432), 1,
-      sym_yield,
-    STATE(1455), 1,
-      sym_parenthesized_list_splat,
     STATE(1686), 1,
       sym__collection_elements,
-    STATE(1742), 1,
+    STATE(1736), 1,
       sym__patterns,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(917), 2,
+    STATE(949), 2,
       sym_attribute,
       sym_subscript,
+    STATE(1318), 2,
+      sym_parenthesized_list_splat,
+      sym_yield,
     ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1005), 3,
+    STATE(1014), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -25187,14 +25197,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 15,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -25219,7 +25229,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(642), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
     ACTIONS(684), 1,
       anon_sym_yield,
@@ -25241,28 +25251,28 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(736), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(775), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(767), 1,
       sym_primary_expression,
-    STATE(1047), 1,
+    STATE(1054), 1,
       sym_expression,
-    STATE(1203), 1,
+    STATE(1225), 1,
       sym_list_splat,
-    STATE(1727), 1,
+    STATE(1688), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1207), 2,
+    STATE(1199), 2,
       sym_dictionary_splat,
       sym_pair,
-    STATE(1294), 2,
+    STATE(1318), 2,
       sym_parenthesized_list_splat,
       sym_yield,
-    ACTIONS(640), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -25278,14 +25288,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -25312,7 +25322,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(642), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
     ACTIONS(684), 1,
       anon_sym_yield,
@@ -25334,28 +25344,28 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
     ACTIONS(740), 1,
       anon_sym_RBRACE,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(775), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(767), 1,
       sym_primary_expression,
-    STATE(1063), 1,
+    STATE(1051), 1,
       sym_expression,
-    STATE(1206), 1,
+    STATE(1182), 1,
       sym_list_splat,
-    STATE(1624), 1,
+    STATE(1734), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1236), 2,
+    STATE(1183), 2,
       sym_dictionary_splat,
       sym_pair,
-    STATE(1294), 2,
+    STATE(1318), 2,
       sym_parenthesized_list_splat,
       sym_yield,
-    ACTIONS(640), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -25371,14 +25381,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -25405,7 +25415,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(642), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
     ACTIONS(684), 1,
       anon_sym_yield,
@@ -25427,28 +25437,28 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
     ACTIONS(744), 1,
       anon_sym_RBRACE,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(775), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(767), 1,
       sym_primary_expression,
-    STATE(1041), 1,
+    STATE(1063), 1,
       sym_expression,
-    STATE(1232), 1,
+    STATE(1236), 1,
       sym_list_splat,
-    STATE(1666), 1,
+    STATE(1714), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1194), 2,
+    STATE(1217), 2,
       sym_dictionary_splat,
       sym_pair,
-    STATE(1294), 2,
+    STATE(1318), 2,
       sym_parenthesized_list_splat,
       sym_yield,
-    ACTIONS(640), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -25464,14 +25474,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -25498,7 +25508,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(642), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
     ACTIONS(684), 1,
       anon_sym_yield,
@@ -25520,28 +25530,28 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
     ACTIONS(748), 1,
       anon_sym_RBRACE,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(775), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(767), 1,
       sym_primary_expression,
-    STATE(1067), 1,
+    STATE(1064), 1,
       sym_expression,
-    STATE(1228), 1,
+    STATE(1239), 1,
       sym_list_splat,
-    STATE(1688), 1,
+    STATE(1700), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1184), 2,
+    STATE(1219), 2,
       sym_dictionary_splat,
       sym_pair,
-    STATE(1294), 2,
+    STATE(1318), 2,
       sym_parenthesized_list_splat,
       sym_yield,
-    ACTIONS(640), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -25557,14 +25567,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -25609,20 +25619,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(764), 1,
       anon_sym_await,
-    STATE(780), 1,
+    STATE(770), 1,
       sym_primary_expression,
-    STATE(781), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(1107), 1,
+    STATE(1100), 1,
       sym_expression,
-    STATE(1237), 1,
+    STATE(1196), 1,
       sym_expression_list,
     ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1588), 2,
+    STATE(1587), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(620), 3,
@@ -25646,14 +25656,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -25698,20 +25708,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_from,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1175), 1,
+    STATE(1138), 1,
       sym_expression,
-    STATE(1237), 1,
+    STATE(1196), 1,
       sym_expression_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1573), 2,
+    STATE(1562), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(301), 3,
@@ -25735,14 +25745,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -25785,18 +25795,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1144), 1,
+    STATE(1131), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1291), 2,
+    STATE(1301), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(301), 3,
@@ -25821,14 +25831,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -25871,18 +25881,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1144), 1,
+    STATE(1131), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1291), 2,
+    STATE(1301), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(301), 3,
@@ -25894,7 +25904,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(770), 5,
+    ACTIONS(772), 5,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -25907,14 +25917,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -25957,18 +25967,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1144), 1,
+    STATE(1131), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1291), 2,
+    STATE(1301), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(301), 3,
@@ -25980,7 +25990,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(772), 5,
+    ACTIONS(770), 5,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -25993,14 +26003,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -26043,18 +26053,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
     ACTIONS(776), 1,
       anon_sym_STAR_STAR,
-    STATE(780), 1,
+    STATE(770), 1,
       sym_primary_expression,
-    STATE(781), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(1120), 1,
+    STATE(1130), 1,
       sym_expression,
     ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1301), 2,
+    STATE(1315), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(620), 3,
@@ -26066,7 +26076,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(772), 4,
+    ACTIONS(770), 4,
       anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_COLON2,
@@ -26078,14 +26088,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -26128,13 +26138,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LPAREN,
     ACTIONS(782), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1179), 1,
+    STATE(1221), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -26147,7 +26157,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-    STATE(1354), 3,
+    STATE(1375), 3,
       sym_list_splat,
       sym_parenthesized_list_splat,
       sym_yield,
@@ -26163,14 +26173,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -26188,74 +26198,78 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [2244] = 24,
+  [2244] = 28,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
+    ACTIONS(680), 1,
+      anon_sym_not,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
     ACTIONS(684), 1,
       anon_sym_yield,
-    ACTIONS(768), 1,
-      anon_sym_not,
-    ACTIONS(778), 1,
+    ACTIONS(784), 1,
+      sym_identifier,
+    ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(782), 1,
+    ACTIONS(790), 1,
+      anon_sym_RPAREN,
+    ACTIONS(792), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(794), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1179), 1,
+    STATE(1049), 1,
       sym_expression,
+    STATE(1234), 1,
+      sym_list_splat,
+    STATE(1318), 1,
+      sym_parenthesized_list_splat,
+    STATE(1428), 1,
+      sym_yield,
+    STATE(1485), 1,
+      sym_with_item,
+    STATE(1703), 1,
+      sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(780), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-    STATE(1354), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -26273,39 +26287,45 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [2353] = 24,
+  [2361] = 26,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
+    ACTIONS(55), 1,
+      anon_sym_STAR_STAR,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
     ACTIONS(305), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
     ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(684), 1,
-      anon_sym_yield,
+    ACTIONS(756), 1,
+      anon_sym_STAR,
     ACTIONS(768), 1,
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(782), 1,
-      anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(796), 1,
+      sym_identifier,
+    ACTIONS(800), 1,
+      anon_sym_RPAREN,
+    ACTIONS(802), 1,
+      anon_sym_COMMA,
+    ACTIONS(804), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1179), 1,
+    STATE(1263), 1,
       sym_expression,
+    STATE(1506), 1,
+      sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
@@ -26313,34 +26333,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(780), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-    STATE(1354), 3,
+    STATE(1455), 3,
       sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
+      sym_dictionary_splat,
+      sym_keyword_argument,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -26358,77 +26374,76 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [2462] = 27,
+  [2474] = 26,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_LBRACE,
     ACTIONS(55), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(608), 1,
-      anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(71), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(726), 1,
-      anon_sym_STAR,
-    ACTIONS(784), 1,
+    ACTIONS(83), 1,
+      sym__string_start,
+    ACTIONS(85), 1,
+      sym__template_string_start,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(788), 1,
-      anon_sym_LPAREN,
-    ACTIONS(790), 1,
-      anon_sym_RPAREN,
-    ACTIONS(792), 1,
-      anon_sym_COMMA,
-    ACTIONS(794), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
-    STATE(694), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    ACTIONS(756), 1,
+      anon_sym_STAR,
+    ACTIONS(806), 1,
+      anon_sym_from,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(705), 1,
-      sym_primary_expression,
-    STATE(1087), 1,
+    STATE(1137), 1,
       sym_expression,
-    STATE(1212), 1,
-      sym_list_splat,
-    STATE(1490), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
+    STATE(1514), 1,
+      sym_expression_list,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1486), 2,
+    ACTIONS(808), 2,
+      sym__newline,
+      anon_sym_SEMI,
+    STATE(1557), 2,
+      sym_list_splat,
       sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(606), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(786), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -26446,76 +26461,75 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [2577] = 26,
+  [2587] = 25,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_LBRACE,
     ACTIONS(55), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(616), 1,
+      anon_sym_LPAREN,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(624), 1,
+      anon_sym_LBRACE,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(750), 1,
       sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
     ACTIONS(756), 1,
       anon_sym_STAR,
-    ACTIONS(796), 1,
-      anon_sym_from,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    ACTIONS(760), 1,
+      anon_sym_not,
+    ACTIONS(762), 1,
+      anon_sym_lambda,
+    ACTIONS(764), 1,
+      anon_sym_await,
+    ACTIONS(810), 1,
+      anon_sym_yield,
+    STATE(770), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(1210), 1,
+    STATE(772), 1,
+      sym_template_string,
+    STATE(1097), 1,
       sym_expression,
-    STATE(1569), 1,
-      sym_expression_list,
-    ACTIONS(77), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(758), 2,
-      sym__newline,
-      anon_sym_SEMI,
-    STATE(1590), 2,
+    STATE(1587), 2,
       sym_list_splat,
       sym_dictionary_splat,
-    ACTIONS(49), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    STATE(1293), 3,
+      sym_expression_list,
+      sym_yield,
+      sym__f_expression,
+    ACTIONS(612), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(752), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -26533,74 +26547,77 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [2690] = 24,
+  [2698] = 27,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
+    ACTIONS(55), 1,
+      anon_sym_STAR_STAR,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(684), 1,
-      anon_sym_yield,
-    ACTIONS(768), 1,
+    ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(778), 1,
-      anon_sym_LPAREN,
-    ACTIONS(782), 1,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
+    ACTIONS(726), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(788), 1,
+      anon_sym_LPAREN,
+    ACTIONS(800), 1,
+      anon_sym_RPAREN,
+    ACTIONS(802), 1,
+      anon_sym_COMMA,
+    ACTIONS(812), 1,
+      sym_identifier,
+    ACTIONS(816), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1179), 1,
+    STATE(1083), 1,
       sym_expression,
+    STATE(1202), 1,
+      sym_list_splat,
+    STATE(1506), 1,
+      sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    STATE(1500), 2,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(798), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-    STATE(1354), 3,
-      sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(814), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -26618,77 +26635,76 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [2799] = 27,
+  [2813] = 26,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_LBRACE,
     ACTIONS(55), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(608), 1,
-      anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(71), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(726), 1,
-      anon_sym_STAR,
-    ACTIONS(784), 1,
+    ACTIONS(83), 1,
+      sym__string_start,
+    ACTIONS(85), 1,
+      sym__template_string_start,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(788), 1,
-      anon_sym_LPAREN,
-    ACTIONS(794), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
-    ACTIONS(800), 1,
-      anon_sym_RPAREN,
-    ACTIONS(802), 1,
-      anon_sym_COMMA,
-    STATE(694), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    ACTIONS(756), 1,
+      anon_sym_STAR,
+    ACTIONS(818), 1,
+      anon_sym_from,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(705), 1,
-      sym_primary_expression,
-    STATE(1094), 1,
+    STATE(1197), 1,
       sym_expression,
-    STATE(1211), 1,
-      sym_list_splat,
-    STATE(1497), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
+    STATE(1539), 1,
+      sym_expression_list,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1496), 2,
+    ACTIONS(758), 2,
+      sym__newline,
+      anon_sym_SEMI,
+    STATE(1557), 2,
+      sym_list_splat,
       sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(606), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(786), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -26706,76 +26722,74 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [2914] = 26,
+  [2926] = 24,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(268), 1,
+      sym_identifier,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(55), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
+    ACTIONS(305), 1,
       anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(313), 1,
+      anon_sym_await,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(756), 1,
+    ACTIONS(684), 1,
+      anon_sym_yield,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    ACTIONS(778), 1,
+      anon_sym_LPAREN,
+    ACTIONS(782), 1,
       anon_sym_STAR,
-    ACTIONS(804), 1,
-      anon_sym_from,
-    STATE(772), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(1137), 1,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1221), 1,
       sym_expression,
-    STATE(1446), 1,
-      sym_expression_list,
-    ACTIONS(77), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(806), 2,
-      sym__newline,
-      anon_sym_SEMI,
-    STATE(1590), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(49), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(780), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+    STATE(1375), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -26793,78 +26807,74 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [3027] = 28,
+  [3035] = 24,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(608), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
-      anon_sym_not,
-    ACTIONS(682), 1,
-      anon_sym_lambda,
     ACTIONS(684), 1,
       anon_sym_yield,
-    ACTIONS(788), 1,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(812), 1,
-      anon_sym_RPAREN,
-    ACTIONS(814), 1,
+    ACTIONS(782), 1,
       anon_sym_STAR,
-    ACTIONS(816), 1,
-      anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1048), 1,
+    STATE(1221), 1,
       sym_expression,
-    STATE(1226), 1,
-      sym_list_splat,
-    STATE(1294), 1,
-      sym_parenthesized_list_splat,
-    STATE(1447), 1,
-      sym_yield,
-    STATE(1484), 1,
-      sym_with_item,
-    STATE(1654), 1,
-      sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
+    ACTIONS(780), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+    STATE(1375), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -26882,11 +26892,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [3144] = 25,
+  [3144] = 24,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(55), 1,
-      anon_sym_STAR_STAR,
     ACTIONS(616), 1,
       anon_sym_LPAREN,
     ACTIONS(622), 1,
@@ -26899,43 +26907,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym__template_string_start,
     ACTIONS(750), 1,
       sym_identifier,
-    ACTIONS(756), 1,
-      anon_sym_STAR,
     ACTIONS(760), 1,
       anon_sym_not,
     ACTIONS(762), 1,
       anon_sym_lambda,
     ACTIONS(764), 1,
       anon_sym_await,
-    ACTIONS(818), 1,
-      anon_sym_yield,
-    STATE(780), 1,
+    ACTIONS(774), 1,
+      anon_sym_STAR,
+    ACTIONS(776), 1,
+      anon_sym_STAR_STAR,
+    STATE(770), 1,
       sym_primary_expression,
-    STATE(781), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(1103), 1,
+    STATE(1130), 1,
       sym_expression,
     ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1588), 2,
+    STATE(1315), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1296), 3,
-      sym_expression_list,
-      sym_yield,
-      sym__f_expression,
     ACTIONS(612), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
+    ACTIONS(772), 4,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_COLON2,
+      sym_type_conversion,
     ACTIONS(752), 6,
       anon_sym_lazy,
       anon_sym_print,
@@ -26943,14 +26952,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -26968,7 +26977,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [3255] = 24,
+  [3253] = 24,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(616), 1,
@@ -26993,18 +27002,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
     ACTIONS(776), 1,
       anon_sym_STAR_STAR,
-    STATE(780), 1,
+    STATE(770), 1,
       sym_primary_expression,
-    STATE(781), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(1120), 1,
+    STATE(1130), 1,
       sym_expression,
     ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1301), 2,
+    STATE(1315), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(620), 3,
@@ -27028,14 +27037,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -27053,7 +27062,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [3364] = 27,
+  [3362] = 27,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -27072,32 +27081,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(726), 1,
       anon_sym_STAR,
-    ACTIONS(784), 1,
-      sym_identifier,
     ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(794), 1,
+    ACTIONS(812), 1,
+      sym_identifier,
+    ACTIONS(816), 1,
       anon_sym_await,
     ACTIONS(820), 1,
       anon_sym_RPAREN,
     ACTIONS(822), 1,
       anon_sym_COMMA,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1093), 1,
+    STATE(1075), 1,
       sym_expression,
-    STATE(1186), 1,
+    STATE(1218), 1,
       sym_list_splat,
-    STATE(1453), 1,
+    STATE(1434), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1452), 2,
+    STATE(1433), 2,
       sym_dictionary_splat,
       sym_keyword_argument,
     ACTIONS(606), 3,
@@ -27109,21 +27118,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(786), 6,
+    ACTIONS(814), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -27141,74 +27150,74 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [3479] = 24,
+  [3477] = 24,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(268), 1,
+      sym_identifier,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(630), 1,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(750), 1,
-      sym_identifier,
-    ACTIONS(760), 1,
+    ACTIONS(596), 1,
+      anon_sym_LBRACK,
+    ACTIONS(684), 1,
+      anon_sym_yield,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(762), 1,
-      anon_sym_lambda,
-    ACTIONS(764), 1,
-      anon_sym_await,
-    ACTIONS(774), 1,
+    ACTIONS(778), 1,
+      anon_sym_LPAREN,
+    ACTIONS(782), 1,
       anon_sym_STAR,
-    ACTIONS(776), 1,
-      anon_sym_STAR_STAR,
-    STATE(780), 1,
-      sym_primary_expression,
-    STATE(781), 1,
-      sym_string,
-    STATE(782), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1120), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1221), 1,
       sym_expression,
-    ACTIONS(626), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1301), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(620), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 4,
+    ACTIONS(824), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+    STATE(1375), 3,
+      sym_list_splat,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(770), 4,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-    ACTIONS(752), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -27226,7 +27235,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [3588] = 27,
+  [3586] = 27,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -27245,32 +27254,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(726), 1,
       anon_sym_STAR,
-    ACTIONS(784), 1,
-      sym_identifier,
     ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(794), 1,
+    ACTIONS(812), 1,
+      sym_identifier,
+    ACTIONS(816), 1,
       anon_sym_await,
-    ACTIONS(824), 1,
-      anon_sym_RPAREN,
     ACTIONS(826), 1,
+      anon_sym_RPAREN,
+    ACTIONS(828), 1,
       anon_sym_COMMA,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1075), 1,
+    STATE(1071), 1,
       sym_expression,
-    STATE(1196), 1,
+    STATE(1220), 1,
       sym_list_splat,
-    STATE(1469), 1,
+    STATE(1456), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1482), 2,
+    STATE(1471), 2,
       sym_dictionary_splat,
       sym_keyword_argument,
     ACTIONS(606), 3,
@@ -27282,21 +27291,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(786), 6,
+    ACTIONS(814), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -27314,7 +27323,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [3703] = 25,
+  [3701] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -27339,27 +27348,27 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(764), 1,
       anon_sym_await,
-    ACTIONS(818), 1,
+    ACTIONS(810), 1,
       anon_sym_yield,
-    STATE(780), 1,
+    STATE(770), 1,
       sym_primary_expression,
-    STATE(781), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(1103), 1,
+    STATE(1097), 1,
       sym_expression,
     ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1588), 2,
+    STATE(1587), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1289), 3,
+    STATE(1286), 3,
       sym_expression_list,
       sym_yield,
       sym__f_expression,
@@ -27375,14 +27384,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -27400,76 +27409,77 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [3814] = 26,
+  [3812] = 27,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
       anon_sym_STAR_STAR,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(756), 1,
-      anon_sym_STAR,
-    ACTIONS(768), 1,
+    ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(778), 1,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
+    ACTIONS(726), 1,
+      anon_sym_STAR,
+    ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(800), 1,
-      anon_sym_RPAREN,
-    ACTIONS(802), 1,
-      anon_sym_COMMA,
-    ACTIONS(828), 1,
+    ACTIONS(812), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(816), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(830), 1,
+      anon_sym_RPAREN,
+    ACTIONS(832), 1,
+      anon_sym_COMMA,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1258), 1,
+    STATE(1072), 1,
       sym_expression,
-    STATE(1497), 1,
+    STATE(1213), 1,
+      sym_list_splat,
+    STATE(1525), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    STATE(1524), 2,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1468), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(814), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -27508,21 +27518,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
     ACTIONS(834), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -27531,7 +27541,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -27540,21 +27550,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -27572,76 +27582,74 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [4037] = 27,
+  [4037] = 25,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(608), 1,
-      anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(55), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(71), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(684), 1,
-      anon_sym_yield,
-    ACTIONS(788), 1,
-      anon_sym_LPAREN,
-    ACTIONS(808), 1,
+    ACTIONS(83), 1,
+      sym__string_start,
+    ACTIONS(85), 1,
+      sym__template_string_start,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(814), 1,
-      anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
-    ACTIONS(836), 1,
-      anon_sym_RPAREN,
-    STATE(694), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    ACTIONS(756), 1,
+      anon_sym_STAR,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(705), 1,
-      sym_primary_expression,
-    STATE(1086), 1,
+    STATE(1211), 1,
       sym_expression,
-    STATE(1187), 1,
-      sym_list_splat,
-    STATE(1432), 1,
-      sym_yield,
-    STATE(1455), 1,
-      sym_parenthesized_list_splat,
-    STATE(1686), 1,
-      sym__collection_elements,
-    ACTIONS(309), 2,
+    STATE(1598), 1,
+      sym_expression_list,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(836), 2,
+      sym__newline,
+      anon_sym_SEMI,
+    STATE(1557), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -27659,7 +27667,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [4151] = 25,
+  [4147] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -27680,21 +27688,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
     ACTIONS(838), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -27703,7 +27711,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -27712,21 +27720,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -27744,7 +27752,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [4261] = 25,
+  [4257] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -27765,21 +27773,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
     ACTIONS(840), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -27788,7 +27796,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -27797,21 +27805,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -27829,7 +27837,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [4371] = 25,
+  [4367] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -27850,21 +27858,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
     ACTIONS(842), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -27873,7 +27881,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -27882,21 +27890,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -27914,7 +27922,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [4481] = 25,
+  [4477] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -27935,21 +27943,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
     ACTIONS(844), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -27958,7 +27966,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -27967,21 +27975,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -27999,74 +28007,72 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [4591] = 25,
+  [4587] = 23,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(846), 1,
-      anon_sym_from,
-    ACTIONS(848), 1,
-      anon_sym_STAR,
+    ACTIONS(680), 1,
+      anon_sym_not,
+    ACTIONS(784), 1,
+      sym_identifier,
+    ACTIONS(794), 1,
+      anon_sym_await,
     ACTIONS(850), 1,
-      anon_sym_STAR_STAR,
-    STATE(772), 1,
+      anon_sym_lambda,
+    STATE(627), 1,
       sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(1219), 1,
+    STATE(735), 1,
+      sym_primary_expression,
+    STATE(1102), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(772), 2,
-      sym__newline,
-      anon_sym_SEMI,
-    STATE(1393), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(49), 3,
+    STATE(1180), 2,
+      sym__expression_within_for_in_clause,
+      sym_lambda_within_for_in_clause,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(846), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+    ACTIONS(848), 3,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(786), 5,
       anon_sym_lazy,
       anon_sym_print,
-      anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28084,74 +28090,76 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [4701] = 25,
+  [4693] = 27,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(55), 1,
-      anon_sym_STAR_STAR,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(756), 1,
-      anon_sym_STAR,
-    ACTIONS(768), 1,
+    ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(778), 1,
-      anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
+    ACTIONS(684), 1,
+      anon_sym_yield,
+    ACTIONS(784), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(788), 1,
+      anon_sym_LPAREN,
+    ACTIONS(792), 1,
+      anon_sym_STAR,
+    ACTIONS(794), 1,
       anon_sym_await,
     ACTIONS(852), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1087), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1240), 1,
+      sym_list_splat,
+    STATE(1318), 1,
       sym_parenthesized_list_splat,
+    STATE(1416), 1,
+      sym_yield,
+    STATE(1642), 1,
+      sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28169,74 +28177,75 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [4811] = 25,
+  [4807] = 26,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(55), 1,
-      anon_sym_STAR_STAR,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(756), 1,
-      anon_sym_STAR,
-    ACTIONS(768), 1,
+    ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(778), 1,
-      anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
+    ACTIONS(684), 1,
+      anon_sym_yield,
+    ACTIONS(784), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(788), 1,
+      anon_sym_LPAREN,
+    ACTIONS(792), 1,
+      anon_sym_STAR,
+    ACTIONS(794), 1,
       anon_sym_await,
     ACTIONS(854), 1,
-      anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+      anon_sym_RBRACK,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1088), 1,
       sym_expression,
-    STATE(1540), 1,
-      sym_parenthesized_list_splat,
+    STATE(1179), 1,
+      sym_list_splat,
+    STATE(1747), 1,
+      sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    STATE(1318), 2,
+      sym_parenthesized_list_splat,
+      sym_yield,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28254,74 +28263,74 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [4921] = 25,
+  [4919] = 25,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(55), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(596), 1,
-      anon_sym_LBRACK,
-    ACTIONS(756), 1,
-      anon_sym_STAR,
-    ACTIONS(768), 1,
-      anon_sym_not,
-    ACTIONS(778), 1,
-      anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
     ACTIONS(856), 1,
-      anon_sym_RPAREN,
-    STATE(694), 1,
+      anon_sym_from,
+    ACTIONS(858), 1,
+      anon_sym_STAR,
+    ACTIONS(860), 1,
+      anon_sym_STAR_STAR,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1207), 1,
       sym_expression,
-    STATE(1540), 1,
-      sym_parenthesized_list_splat,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(770), 2,
+      sym__newline,
+      anon_sym_SEMI,
+    STATE(1346), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28339,74 +28348,76 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [5031] = 25,
+  [5029] = 27,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(55), 1,
-      anon_sym_STAR_STAR,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(756), 1,
-      anon_sym_STAR,
-    ACTIONS(768), 1,
+    ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(778), 1,
-      anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
+    ACTIONS(684), 1,
+      anon_sym_yield,
+    ACTIONS(784), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(788), 1,
+      anon_sym_LPAREN,
+    ACTIONS(792), 1,
+      anon_sym_STAR,
+    ACTIONS(794), 1,
       anon_sym_await,
-    ACTIONS(858), 1,
+    ACTIONS(862), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1089), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1231), 1,
+      sym_list_splat,
+    STATE(1501), 1,
       sym_parenthesized_list_splat,
+    STATE(1519), 1,
+      sym_yield,
+    STATE(1689), 1,
+      sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28424,7 +28435,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [5141] = 23,
+  [5143] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -28439,35 +28450,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(808), 1,
+    ACTIONS(784), 1,
       sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    ACTIONS(864), 1,
+    ACTIONS(850), 1,
       anon_sym_lambda,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1097), 1,
+    STATE(1102), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1222), 2,
+    STATE(1180), 2,
       sym__expression_within_for_in_clause,
       sym_lambda_within_for_in_clause,
     ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(860), 3,
+    ACTIONS(864), 3,
       anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-    ACTIONS(862), 3,
+    ACTIONS(866), 3,
       anon_sym_if,
       anon_sym_async,
       anon_sym_for,
@@ -28476,20 +28487,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 5,
+    ACTIONS(786), 5,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28507,7 +28518,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [5247] = 25,
+  [5249] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
@@ -28520,35 +28531,35 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
     ACTIONS(575), 1,
       anon_sym_LPAREN,
     ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(848), 1,
+    ACTIONS(858), 1,
       anon_sym_STAR,
-    ACTIONS(850), 1,
+    ACTIONS(860), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(866), 1,
+    ACTIONS(868), 1,
       anon_sym_from,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(780), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(1219), 1,
+    STATE(784), 1,
+      sym_template_string,
+    STATE(1207), 1,
       sym_expression,
     ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(770), 2,
+    ACTIONS(772), 2,
       sym__newline,
       anon_sym_SEMI,
-    STATE(1393), 2,
+    STATE(1346), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(49), 3,
@@ -28560,21 +28571,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28592,7 +28603,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [5357] = 25,
+  [5359] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -28613,21 +28624,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
-    ACTIONS(868), 1,
+    ACTIONS(870), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -28636,7 +28647,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -28645,21 +28656,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28677,7 +28688,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [5467] = 25,
+  [5469] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -28698,21 +28709,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
-    ACTIONS(870), 1,
+    ACTIONS(872), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -28721,7 +28732,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -28730,21 +28741,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28762,74 +28773,72 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [5577] = 25,
+  [5579] = 23,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(55), 1,
-      anon_sym_STAR_STAR,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(596), 1,
+    ACTIONS(602), 1,
+      anon_sym_LPAREN,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(756), 1,
-      anon_sym_STAR,
-    ACTIONS(768), 1,
+    ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(778), 1,
-      anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(784), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    ACTIONS(872), 1,
-      anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(850), 1,
+      anon_sym_lambda,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1102), 1,
       sym_expression,
-    STATE(1540), 1,
-      sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    STATE(1180), 2,
+      sym__expression_within_for_in_clause,
+      sym_lambda_within_for_in_clause,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
+    ACTIONS(874), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+    ACTIONS(876), 3,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(786), 5,
       anon_sym_lazy,
       anon_sym_print,
-      anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28847,74 +28856,76 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [5687] = 25,
+  [5685] = 27,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(55), 1,
-      anon_sym_STAR_STAR,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(756), 1,
-      anon_sym_STAR,
-    ACTIONS(768), 1,
+    ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(778), 1,
-      anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
+    ACTIONS(684), 1,
+      anon_sym_yield,
+    ACTIONS(784), 1,
       sym_identifier,
-    ACTIONS(832), 1,
-      anon_sym_await,
-    ACTIONS(874), 1,
+    ACTIONS(788), 1,
+      anon_sym_LPAREN,
+    ACTIONS(790), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(792), 1,
+      anon_sym_STAR,
+    ACTIONS(794), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1089), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1222), 1,
+      sym_list_splat,
+    STATE(1318), 1,
       sym_parenthesized_list_splat,
+    STATE(1519), 1,
+      sym_yield,
+    STATE(1689), 1,
+      sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -28932,75 +28943,74 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [5797] = 26,
+  [5799] = 25,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(55), 1,
+      anon_sym_STAR_STAR,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(608), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(756), 1,
+      anon_sym_STAR,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
-      anon_sym_lambda,
-    ACTIONS(684), 1,
-      anon_sym_yield,
-    ACTIONS(788), 1,
+    ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(814), 1,
-      anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
-    ACTIONS(876), 1,
-      anon_sym_RBRACK,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(878), 1,
+      anon_sym_RPAREN,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1080), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1204), 1,
-      sym_list_splat,
-    STATE(1657), 1,
-      sym__collection_elements,
+    STATE(1543), 1,
+      sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1294), 2,
-      sym_parenthesized_list_splat,
-      sym_yield,
-    ACTIONS(606), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
+    STATE(1542), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29018,76 +29028,74 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [5909] = 27,
+  [5909] = 25,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(55), 1,
+      anon_sym_STAR_STAR,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(608), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(756), 1,
+      anon_sym_STAR,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
-      anon_sym_lambda,
-    ACTIONS(684), 1,
-      anon_sym_yield,
-    ACTIONS(788), 1,
+    ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(814), 1,
-      anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
-    ACTIONS(878), 1,
+    ACTIONS(880), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1070), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1217), 1,
-      sym_list_splat,
-    STATE(1294), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
-    STATE(1461), 1,
-      sym_yield,
-    STATE(1721), 1,
-      sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
+    STATE(1542), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29105,7 +29113,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [6023] = 26,
+  [6019] = 27,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -29122,34 +29130,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(684), 1,
       anon_sym_yield,
+    ACTIONS(784), 1,
+      sym_identifier,
     ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(814), 1,
+    ACTIONS(792), 1,
       anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    ACTIONS(880), 1,
-      anon_sym_RBRACK,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(862), 1,
+      anon_sym_RPAREN,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1095), 1,
+    STATE(1070), 1,
       sym_expression,
-    STATE(1218), 1,
+    STATE(1237), 1,
       sym_list_splat,
-    STATE(1692), 1,
+    STATE(1318), 1,
+      sym_parenthesized_list_splat,
+    STATE(1449), 1,
+      sym_yield,
+    STATE(1671), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1294), 2,
-      sym_parenthesized_list_splat,
-      sym_yield,
     ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -29159,106 +29168,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
-      anon_sym_lazy,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1037), 6,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-    STATE(720), 17,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [6135] = 25,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
-      sym__string_start,
-    ACTIONS(85), 1,
-      sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
-    ACTIONS(848), 1,
-      anon_sym_STAR,
-    ACTIONS(850), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(866), 1,
-      anon_sym_from,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
-      sym_string,
-    STATE(1219), 1,
-      sym_expression,
-    ACTIONS(77), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(770), 2,
-      sym__newline,
-      anon_sym_SEMI,
-    STATE(1393), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(49), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(79), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29276,7 +29200,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [6245] = 26,
+  [6133] = 26,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -29293,32 +29217,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(684), 1,
       anon_sym_yield,
+    ACTIONS(784), 1,
+      sym_identifier,
     ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(814), 1,
+    ACTIONS(792), 1,
       anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
     ACTIONS(882), 1,
       anon_sym_RBRACK,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1080), 1,
+    STATE(1077), 1,
       sym_expression,
-    STATE(1204), 1,
+    STATE(1224), 1,
       sym_list_splat,
-    STATE(1657), 1,
+    STATE(1686), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1294), 2,
+    STATE(1318), 2,
       sym_parenthesized_list_splat,
       sym_yield,
     ACTIONS(606), 3,
@@ -29330,21 +29254,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29362,7 +29286,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [6357] = 27,
+  [6245] = 27,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -29379,31 +29303,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(684), 1,
       anon_sym_yield,
+    ACTIONS(784), 1,
+      sym_identifier,
     ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(812), 1,
+    ACTIONS(790), 1,
       anon_sym_RPAREN,
-    ACTIONS(814), 1,
+    ACTIONS(792), 1,
       anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1086), 1,
+    STATE(1089), 1,
       sym_expression,
-    STATE(1187), 1,
+    STATE(1231), 1,
       sym_list_splat,
-    STATE(1432), 1,
-      sym_yield,
-    STATE(1455), 1,
+    STATE(1501), 1,
       sym_parenthesized_list_splat,
-    STATE(1686), 1,
+    STATE(1519), 1,
+      sym_yield,
+    STATE(1689), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -29417,21 +29341,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29449,7 +29373,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [6471] = 23,
+  [6359] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -29464,24 +29388,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(808), 1,
+    ACTIONS(784), 1,
       sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    ACTIONS(864), 1,
+    ACTIONS(850), 1,
       anon_sym_lambda,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1097), 1,
+    STATE(1102), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1222), 2,
+    STATE(1180), 2,
       sym__expression_within_for_in_clause,
       sym_lambda_within_for_in_clause,
     ACTIONS(606), 3,
@@ -29501,20 +29425,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 5,
+    ACTIONS(786), 5,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29532,76 +29456,74 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [6577] = 27,
+  [6465] = 25,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(55), 1,
+      anon_sym_STAR_STAR,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(608), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(756), 1,
+      anon_sym_STAR,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
-      anon_sym_lambda,
-    ACTIONS(684), 1,
-      anon_sym_yield,
-    ACTIONS(788), 1,
+    ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(814), 1,
-      anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
     ACTIONS(888), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1086), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1187), 1,
-      sym_list_splat,
-    STATE(1432), 1,
-      sym_yield,
-    STATE(1455), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
-    STATE(1686), 1,
-      sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
+    STATE(1542), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29619,7 +29541,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [6691] = 25,
+  [6575] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -29640,21 +29562,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
     ACTIONS(890), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -29663,7 +29585,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -29672,21 +29594,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29704,7 +29626,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [6801] = 25,
+  [6685] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -29725,21 +29647,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
     ACTIONS(892), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -29748,7 +29670,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -29757,21 +29679,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29789,7 +29711,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [6911] = 25,
+  [6795] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -29810,21 +29732,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
     ACTIONS(894), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -29833,7 +29755,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -29842,21 +29764,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29874,7 +29796,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [7021] = 25,
+  [6905] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -29895,21 +29817,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
     ACTIONS(896), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -29918,7 +29840,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -29927,21 +29849,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -29959,7 +29881,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [7131] = 25,
+  [7015] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -29980,21 +29902,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
     ACTIONS(898), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -30003,7 +29925,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -30012,21 +29934,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -30044,7 +29966,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [7241] = 25,
+  [7125] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -30065,21 +29987,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
     ACTIONS(900), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -30088,7 +30010,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -30097,21 +30019,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -30129,7 +30051,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [7351] = 27,
+  [7235] = 27,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -30146,31 +30068,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(684), 1,
       anon_sym_yield,
+    ACTIONS(784), 1,
+      sym_identifier,
     ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(814), 1,
+    ACTIONS(792), 1,
       anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    ACTIONS(888), 1,
+    ACTIONS(862), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1086), 1,
+    STATE(1089), 1,
       sym_expression,
-    STATE(1202), 1,
+    STATE(1222), 1,
       sym_list_splat,
-    STATE(1294), 1,
+    STATE(1318), 1,
       sym_parenthesized_list_splat,
-    STATE(1432), 1,
+    STATE(1519), 1,
       sym_yield,
-    STATE(1686), 1,
+    STATE(1689), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -30184,21 +30106,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -30216,7 +30138,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [7465] = 26,
+  [7349] = 26,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -30233,32 +30155,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(684), 1,
       anon_sym_yield,
+    ACTIONS(784), 1,
+      sym_identifier,
     ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(814), 1,
+    ACTIONS(792), 1,
       anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
     ACTIONS(902), 1,
       anon_sym_RBRACK,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1092), 1,
+    STATE(1093), 1,
       sym_expression,
-    STATE(1230), 1,
+    STATE(1238), 1,
       sym_list_splat,
-    STATE(1658), 1,
+    STATE(1687), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1294), 2,
+    STATE(1318), 2,
       sym_parenthesized_list_splat,
       sym_yield,
     ACTIONS(606), 3,
@@ -30270,21 +30192,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -30302,72 +30224,74 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [7577] = 23,
+  [7461] = 25,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
+      anon_sym_lambda,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
-      anon_sym_LPAREN,
-    ACTIONS(608), 1,
-      anon_sym_LBRACK,
-    ACTIONS(680), 1,
-      anon_sym_not,
-    ACTIONS(808), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
-    ACTIONS(864), 1,
-      anon_sym_lambda,
-    STATE(694), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    ACTIONS(856), 1,
+      anon_sym_from,
+    ACTIONS(858), 1,
+      anon_sym_STAR,
+    ACTIONS(860), 1,
+      anon_sym_STAR_STAR,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(705), 1,
-      sym_primary_expression,
-    STATE(1097), 1,
+    STATE(1207), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1222), 2,
-      sym__expression_within_for_in_clause,
-      sym_lambda_within_for_in_clause,
-    ACTIONS(606), 3,
+    ACTIONS(770), 2,
+      sym__newline,
+      anon_sym_SEMI,
+    STATE(1346), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(904), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-    ACTIONS(906), 3,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 5,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
+      anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -30385,7 +30309,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [7683] = 25,
+  [7571] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -30406,21 +30330,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
-    ACTIONS(908), 1,
+    ACTIONS(904), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -30429,7 +30353,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -30438,21 +30362,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -30470,7 +30394,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [7793] = 25,
+  [7681] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -30491,21 +30415,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
-    ACTIONS(910), 1,
+    ACTIONS(906), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -30514,7 +30438,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -30523,21 +30447,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -30555,7 +30479,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [7903] = 25,
+  [7791] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -30576,21 +30500,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
-    ACTIONS(912), 1,
+    ACTIONS(908), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -30599,7 +30523,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -30608,21 +30532,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -30640,72 +30564,74 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [8013] = 23,
+  [7901] = 25,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(55), 1,
+      anon_sym_STAR_STAR,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
-      anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(756), 1,
+      anon_sym_STAR,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(808), 1,
+    ACTIONS(778), 1,
+      anon_sym_LPAREN,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
-    ACTIONS(864), 1,
-      anon_sym_lambda,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(910), 1,
+      anon_sym_RPAREN,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1097), 1,
+    STATE(1308), 1,
       sym_expression,
+    STATE(1543), 1,
+      sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1222), 2,
-      sym__expression_within_for_in_clause,
-      sym_lambda_within_for_in_clause,
-    ACTIONS(606), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(914), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-    ACTIONS(916), 3,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+    STATE(1542), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 5,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
+      anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -30723,7 +30649,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [8119] = 25,
+  [8011] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -30744,21 +30670,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
-    ACTIONS(918), 1,
+    ACTIONS(912), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -30767,7 +30693,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -30776,21 +30702,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -30808,7 +30734,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [8229] = 25,
+  [8121] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -30829,21 +30755,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(778), 1,
       anon_sym_LPAREN,
-    ACTIONS(828), 1,
+    ACTIONS(796), 1,
       sym_identifier,
-    ACTIONS(832), 1,
+    ACTIONS(804), 1,
       anon_sym_await,
-    ACTIONS(920), 1,
+    ACTIONS(914), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1540), 1,
+    STATE(1543), 1,
       sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -30852,7 +30778,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
+    STATE(1542), 3,
       sym_list_splat,
       sym_dictionary_splat,
       sym_keyword_argument,
@@ -30861,21 +30787,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -30893,7 +30819,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [8339] = 27,
+  [8231] = 27,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -30910,31 +30836,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(684), 1,
       anon_sym_yield,
+    ACTIONS(784), 1,
+      sym_identifier,
     ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(814), 1,
+    ACTIONS(792), 1,
       anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    ACTIONS(836), 1,
+    ACTIONS(916), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1086), 1,
+    STATE(1089), 1,
       sym_expression,
-    STATE(1202), 1,
+    STATE(1222), 1,
       sym_list_splat,
-    STATE(1294), 1,
+    STATE(1318), 1,
       sym_parenthesized_list_splat,
-    STATE(1432), 1,
+    STATE(1519), 1,
       sym_yield,
-    STATE(1686), 1,
+    STATE(1689), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -30948,21 +30874,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -30980,7 +30906,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [8453] = 26,
+  [8345] = 26,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -30997,32 +30923,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(684), 1,
       anon_sym_yield,
+    ACTIONS(784), 1,
+      sym_identifier,
     ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(814), 1,
+    ACTIONS(792), 1,
       anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
     ACTIONS(902), 1,
       anon_sym_RBRACK,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1080), 1,
+    STATE(1077), 1,
       sym_expression,
-    STATE(1204), 1,
+    STATE(1224), 1,
       sym_list_splat,
-    STATE(1657), 1,
+    STATE(1686), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1294), 2,
+    STATE(1318), 2,
       sym_parenthesized_list_splat,
       sym_yield,
     ACTIONS(606), 3,
@@ -31034,21 +30960,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31066,74 +30992,74 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [8565] = 25,
+  [8457] = 25,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_LBRACE,
     ACTIONS(55), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(305), 1,
       anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
     ACTIONS(756), 1,
       anon_sym_STAR,
-    STATE(772), 1,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    ACTIONS(778), 1,
+      anon_sym_LPAREN,
+    ACTIONS(796), 1,
+      sym_identifier,
+    ACTIONS(804), 1,
+      anon_sym_await,
+    ACTIONS(918), 1,
+      anon_sym_RPAREN,
+    STATE(627), 1,
       sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(1235), 1,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1308), 1,
       sym_expression,
-    STATE(1591), 1,
-      sym_expression_list,
-    ACTIONS(77), 2,
+    STATE(1543), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(922), 2,
-      sym__newline,
-      anon_sym_SEMI,
-    STATE(1590), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(49), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    STATE(1542), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31151,7 +31077,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [8675] = 27,
+  [8567] = 27,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -31168,31 +31094,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(684), 1,
       anon_sym_yield,
+    ACTIONS(784), 1,
+      sym_identifier,
     ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(812), 1,
+    ACTIONS(790), 1,
       anon_sym_RPAREN,
-    ACTIONS(814), 1,
+    ACTIONS(792), 1,
       anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1074), 1,
+    STATE(1096), 1,
       sym_expression,
-    STATE(1226), 1,
+    STATE(1234), 1,
       sym_list_splat,
-    STATE(1294), 1,
+    STATE(1318), 1,
       sym_parenthesized_list_splat,
-    STATE(1447), 1,
+    STATE(1428), 1,
       sym_yield,
-    STATE(1654), 1,
+    STATE(1703), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -31206,21 +31132,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31238,7 +31164,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [8789] = 26,
+  [8681] = 26,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -31255,32 +31181,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(684), 1,
       anon_sym_yield,
+    ACTIONS(784), 1,
+      sym_identifier,
     ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(814), 1,
+    ACTIONS(792), 1,
       anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    ACTIONS(876), 1,
+    ACTIONS(920), 1,
       anon_sym_RBRACK,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1090), 1,
+    STATE(1092), 1,
       sym_expression,
-    STATE(1227), 1,
+    STATE(1235), 1,
       sym_list_splat,
-    STATE(1669), 1,
+    STATE(1710), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1294), 2,
+    STATE(1318), 2,
       sym_parenthesized_list_splat,
       sym_yield,
     ACTIONS(606), 3,
@@ -31292,21 +31218,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31324,7 +31250,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [8901] = 27,
+  [8793] = 26,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -31341,35 +31267,34 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(684), 1,
       anon_sym_yield,
+    ACTIONS(784), 1,
+      sym_identifier,
     ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(812), 1,
-      anon_sym_RPAREN,
-    ACTIONS(814), 1,
+    ACTIONS(792), 1,
       anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(920), 1,
+      anon_sym_RBRACK,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1086), 1,
+    STATE(1077), 1,
       sym_expression,
-    STATE(1202), 1,
+    STATE(1224), 1,
       sym_list_splat,
-    STATE(1294), 1,
-      sym_parenthesized_list_splat,
-    STATE(1432), 1,
-      sym_yield,
     STATE(1686), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
+    STATE(1318), 2,
+      sym_parenthesized_list_splat,
+      sym_yield,
     ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -31379,21 +31304,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31411,7 +31336,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [9015] = 27,
+  [8905] = 27,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -31428,31 +31353,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(684), 1,
       anon_sym_yield,
+    ACTIONS(784), 1,
+      sym_identifier,
     ACTIONS(788), 1,
       anon_sym_LPAREN,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(814), 1,
+    ACTIONS(792), 1,
       anon_sym_STAR,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    ACTIONS(888), 1,
+    ACTIONS(916), 1,
       anon_sym_RPAREN,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1084), 1,
+    STATE(1089), 1,
       sym_expression,
-    STATE(1229), 1,
+    STATE(1231), 1,
       sym_list_splat,
-    STATE(1294), 1,
+    STATE(1501), 1,
       sym_parenthesized_list_splat,
-    STATE(1464), 1,
+    STATE(1519), 1,
       sym_yield,
-    STATE(1655), 1,
+    STATE(1689), 1,
       sym__collection_elements,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -31466,21 +31391,106 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [9019] = 25,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(55), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(596), 1,
+      anon_sym_LBRACK,
+    ACTIONS(756), 1,
+      anon_sym_STAR,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    ACTIONS(778), 1,
+      anon_sym_LPAREN,
+    ACTIONS(796), 1,
+      sym_identifier,
+    ACTIONS(804), 1,
+      anon_sym_await,
+    ACTIONS(922), 1,
+      anon_sym_RPAREN,
+    STATE(627), 1,
+      sym_template_string,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1308), 1,
+      sym_expression,
+    STATE(1543), 1,
+      sym_parenthesized_list_splat,
+    ACTIONS(309), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(301), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1542), 3,
+      sym_list_splat,
+      sym_dictionary_splat,
+      sym_keyword_argument,
+    ACTIONS(311), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(798), 6,
+      anon_sym_lazy,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1038), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31523,15 +31533,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
     ACTIONS(924), 1,
       anon_sym_COLON,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1246), 1,
+    STATE(1247), 1,
       sym_expression,
-    STATE(1614), 1,
+    STATE(1667), 1,
       sym_index_expression_list,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -31540,7 +31550,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1454), 3,
+    STATE(1457), 3,
       sym_list_splat,
       sym__index_expression,
       sym_slice,
@@ -31556,14 +31566,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31606,16 +31616,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
     ACTIONS(924), 1,
       anon_sym_COLON,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(926), 1,
+      anon_sym_RBRACK,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1246), 1,
+    STATE(1247), 1,
       sym_expression,
-    STATE(1694), 1,
-      sym_index_expression_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
@@ -31623,7 +31633,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1470), 3,
+    STATE(1560), 3,
       sym_list_splat,
       sym__index_expression,
       sym_slice,
@@ -31639,14 +31649,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31679,25 +31689,25 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
+    ACTIONS(585), 1,
+      anon_sym_LPAREN,
     ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(684), 1,
-      anon_sym_yield,
     ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(778), 1,
-      anon_sym_LPAREN,
-    ACTIONS(780), 1,
-      anon_sym_RPAREN,
     ACTIONS(782), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(924), 1,
+      anon_sym_COLON,
+    ACTIONS(928), 1,
+      anon_sym_RBRACK,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1179), 1,
+    STATE(1247), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -31706,10 +31716,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1354), 3,
+    STATE(1560), 3,
       sym_list_splat,
-      sym_parenthesized_list_splat,
-      sym_yield,
+      sym__index_expression,
+      sym_slice,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
@@ -31722,14 +31732,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31772,15 +31782,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
     ACTIONS(924), 1,
       anon_sym_COLON,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1246), 1,
+    STATE(1247), 1,
       sym_expression,
-    STATE(1660), 1,
+    STATE(1676), 1,
       sym_index_expression_list,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -31789,7 +31799,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1501), 3,
+    STATE(1512), 3,
       sym_list_splat,
       sym__index_expression,
       sym_slice,
@@ -31805,14 +31815,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31845,26 +31855,26 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
-      anon_sym_LPAREN,
     ACTIONS(596), 1,
       anon_sym_LBRACK,
+    ACTIONS(684), 1,
+      anon_sym_yield,
     ACTIONS(768), 1,
       anon_sym_not,
+    ACTIONS(778), 1,
+      anon_sym_LPAREN,
+    ACTIONS(780), 1,
+      anon_sym_RPAREN,
     ACTIONS(782), 1,
       anon_sym_STAR,
-    ACTIONS(924), 1,
-      anon_sym_COLON,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1246), 1,
+    STATE(1221), 1,
       sym_expression,
-    STATE(1735), 1,
-      sym_index_expression_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
@@ -31872,10 +31882,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1518), 3,
+    STATE(1375), 3,
       sym_list_splat,
-      sym__index_expression,
-      sym_slice,
+      sym_parenthesized_list_splat,
+      sym_yield,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
@@ -31888,14 +31898,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31916,38 +31926,38 @@ static const uint16_t ts_small_parse_table[] = {
   [9664] = 24,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
+    ACTIONS(55), 1,
+      anon_sym_STAR_STAR,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
     ACTIONS(305), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
-      anon_sym_LPAREN,
     ACTIONS(596), 1,
       anon_sym_LBRACK,
+    ACTIONS(756), 1,
+      anon_sym_STAR,
     ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(782), 1,
-      anon_sym_STAR,
-    ACTIONS(924), 1,
-      anon_sym_COLON,
-    ACTIONS(926), 1,
-      anon_sym_RBRACK,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(778), 1,
+      anon_sym_LPAREN,
+    ACTIONS(796), 1,
+      sym_identifier,
+    ACTIONS(804), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1246), 1,
+    STATE(1308), 1,
       sym_expression,
+    STATE(1543), 1,
+      sym_parenthesized_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
@@ -31955,30 +31965,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1535), 3,
+    STATE(1542), 3,
       sym_list_splat,
-      sym__index_expression,
-      sym_slice,
+      sym_dictionary_splat,
+      sym_keyword_argument,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(798), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -31996,11 +32006,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [9771] = 18,
+  [9771] = 24,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
@@ -32009,53 +32025,53 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LPAREN,
     ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(600), 1,
-      anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    ACTIONS(782), 1,
+      anon_sym_STAR,
+    ACTIONS(924), 1,
+      anon_sym_COLON,
+    STATE(627), 1,
       sym_template_string,
-    STATE(766), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
+    STATE(1247), 1,
+      sym_expression,
+    STATE(1756), 1,
+      sym_index_expression_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(272), 3,
-      anon_sym_DOT,
-      anon_sym_STAR,
-      anon_sym_SLASH,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(928), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-    ACTIONS(311), 5,
+    STATE(1436), 3,
+      sym_list_splat,
+      sym__index_expression,
+      sym_slice,
+    ACTIONS(311), 4,
       sym_integer,
-      sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(583), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    ACTIONS(303), 9,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-    STATE(720), 17,
+    STATE(1038), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -32073,7 +32089,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [9866] = 24,
+  [9878] = 24,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -32098,16 +32114,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
     ACTIONS(924), 1,
       anon_sym_COLON,
-    ACTIONS(930), 1,
-      anon_sym_RBRACK,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1246), 1,
+    STATE(1247), 1,
       sym_expression,
+    STATE(1645), 1,
+      sym_index_expression_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
@@ -32115,7 +32131,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1535), 3,
+    STATE(1414), 3,
       sym_list_splat,
       sym__index_expression,
       sym_slice,
@@ -32131,14 +32147,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -32156,72 +32172,148 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [9973] = 24,
+  [9985] = 18,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(585), 1,
+      anon_sym_LPAREN,
+    ACTIONS(596), 1,
+      anon_sym_LBRACK,
+    ACTIONS(600), 1,
+      anon_sym_await,
+    STATE(627), 1,
+      sym_template_string,
+    STATE(698), 1,
+      sym_string,
+    STATE(747), 1,
+      sym_primary_expression,
+    ACTIONS(309), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(272), 3,
+      anon_sym_DOT,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(301), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(930), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+    ACTIONS(311), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(583), 6,
+      anon_sym_lazy,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    ACTIONS(303), 9,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+    STATE(734), 17,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [10080] = 24,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
       anon_sym_STAR_STAR,
+    ACTIONS(268), 1,
+      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
     ACTIONS(305), 1,
       anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
+    ACTIONS(585), 1,
+      anon_sym_LPAREN,
     ACTIONS(596), 1,
       anon_sym_LBRACK,
     ACTIONS(756), 1,
       anon_sym_STAR,
     ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(778), 1,
-      anon_sym_LPAREN,
-    ACTIONS(828), 1,
-      sym_identifier,
-    ACTIONS(832), 1,
-      anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1321), 1,
+    STATE(1269), 1,
       sym_expression,
-    STATE(1540), 1,
-      sym_parenthesized_list_splat,
+    STATE(1674), 1,
+      sym_expression_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
+    STATE(1562), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1539), 3,
-      sym_list_splat,
-      sym_dictionary_splat,
-      sym_keyword_argument,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(830), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -32239,7 +32331,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [10080] = 24,
+  [10186] = 24,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
@@ -32254,9 +32346,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
     ACTIONS(575), 1,
       anon_sym_LPAREN,
@@ -32264,20 +32356,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(756), 1,
       anon_sym_STAR,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(780), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(1239), 1,
+    STATE(784), 1,
+      sym_template_string,
+    STATE(1212), 1,
       sym_expression,
-    STATE(1554), 1,
+    STATE(1549), 1,
       sym_expression_list,
     ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1590), 2,
+    STATE(1557), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(49), 3,
@@ -32289,21 +32381,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -32321,11 +32413,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [10186] = 24,
+  [10292] = 23,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(55), 1,
-      anon_sym_STAR_STAR,
     ACTIONS(268), 1,
       sym_identifier,
     ACTIONS(293), 1,
@@ -32342,30 +32432,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LPAREN,
     ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(756), 1,
-      anon_sym_STAR,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(782), 1,
+      anon_sym_STAR,
+    ACTIONS(924), 1,
+      anon_sym_COLON,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1265), 1,
+    STATE(1247), 1,
       sym_expression,
-    STATE(1645), 1,
-      sym_expression_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1573), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
+    STATE(1560), 3,
+      sym_list_splat,
+      sym__index_expression,
+      sym_slice,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
@@ -32378,14 +32469,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -32403,7 +32494,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [10292] = 24,
+  [10396] = 24,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -32428,20 +32519,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1279), 1,
+    STATE(1253), 1,
       sym_expression,
-    STATE(1687), 1,
+    STATE(1663), 1,
       sym_expression_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1573), 2,
+    STATE(1562), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(301), 3,
@@ -32460,14 +32551,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -32485,7 +32576,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [10398] = 23,
+  [10502] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -32510,13 +32601,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LPAREN,
     ACTIONS(782), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1179), 1,
+    STATE(1221), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -32525,7 +32616,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1354), 3,
+    STATE(1375), 3,
       sym_list_splat,
       sym_parenthesized_list_splat,
       sym_yield,
@@ -32541,14 +32632,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -32566,7 +32657,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [10502] = 24,
+  [10606] = 24,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -32591,20 +32682,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1253), 1,
+    STATE(1262), 1,
       sym_expression,
-    STATE(1636), 1,
+    STATE(1633), 1,
       sym_expression_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1573), 2,
+    STATE(1562), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(301), 3,
@@ -32623,14 +32714,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -32648,9 +32739,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [10608] = 23,
+  [10712] = 24,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(55), 1,
+      anon_sym_STAR_STAR,
     ACTIONS(268), 1,
       sym_identifier,
     ACTIONS(293), 1,
@@ -32667,31 +32760,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LPAREN,
     ACTIONS(596), 1,
       anon_sym_LBRACK,
+    ACTIONS(756), 1,
+      anon_sym_STAR,
     ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(782), 1,
-      anon_sym_STAR,
-    ACTIONS(924), 1,
-      anon_sym_COLON,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1246), 1,
+    STATE(1284), 1,
       sym_expression,
+    STATE(1640), 1,
+      sym_expression_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
+    STATE(1562), 2,
+      sym_list_splat,
+      sym_dictionary_splat,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1535), 3,
-      sym_list_splat,
-      sym__index_expression,
-      sym_slice,
     ACTIONS(311), 4,
       sym_integer,
       sym_true,
@@ -32704,14 +32796,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -32729,7 +32821,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [10712] = 24,
+  [10818] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -32750,26 +32842,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LPAREN,
     ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(756), 1,
-      anon_sym_STAR,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(932), 1,
+      anon_sym_RBRACE,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1250), 1,
+    STATE(1405), 1,
       sym_expression,
-    STATE(1629), 1,
-      sym_expression_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1573), 2,
-      sym_list_splat,
+    STATE(1612), 2,
       sym_dictionary_splat,
+      sym_pair,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -32786,94 +32876,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-    STATE(720), 17,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [10818] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
-      anon_sym_LBRACE,
-    ACTIONS(630), 1,
-      sym__string_start,
-    ACTIONS(632), 1,
-      sym__template_string_start,
-    ACTIONS(750), 1,
-      sym_identifier,
-    ACTIONS(760), 1,
-      anon_sym_not,
-    ACTIONS(762), 1,
-      anon_sym_lambda,
-    ACTIONS(764), 1,
-      anon_sym_await,
-    ACTIONS(774), 1,
-      anon_sym_STAR,
-    ACTIONS(776), 1,
-      anon_sym_STAR_STAR,
-    STATE(780), 1,
-      sym_primary_expression,
-    STATE(781), 1,
-      sym_string,
-    STATE(782), 1,
-      sym_template_string,
-    STATE(1120), 1,
-      sym_expression,
-    ACTIONS(626), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1301), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(620), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(612), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(752), 6,
-      anon_sym_lazy,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1131), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -32892,86 +32902,6 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_template_string,
       sym_await,
   [10921] = 23,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
-      sym__string_start,
-    ACTIONS(85), 1,
-      sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
-    ACTIONS(848), 1,
-      anon_sym_STAR,
-    ACTIONS(850), 1,
-      anon_sym_STAR_STAR,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
-      sym_string,
-    STATE(1219), 1,
-      sym_expression,
-    ACTIONS(77), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1393), 2,
-      sym_list_splat,
-      sym_dictionary_splat,
-    ACTIONS(49), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(79), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(363), 6,
-      anon_sym_lazy,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1126), 6,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-    STATE(950), 17,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [11024] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -32996,18 +32926,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1144), 1,
+    STATE(1131), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1291), 2,
+    STATE(1301), 2,
       sym_list_splat,
       sym_dictionary_splat,
     ACTIONS(301), 3,
@@ -33026,14 +32956,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33051,69 +32981,69 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [11127] = 23,
+  [11024] = 23,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(55), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(616), 1,
+      anon_sym_LPAREN,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(624), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
-      anon_sym_LPAREN,
-    ACTIONS(596), 1,
-      anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(750), 1,
+      sym_identifier,
+    ACTIONS(760), 1,
       anon_sym_not,
-    ACTIONS(932), 1,
-      anon_sym_RBRACE,
-    STATE(694), 1,
+    ACTIONS(762), 1,
+      anon_sym_lambda,
+    ACTIONS(764), 1,
+      anon_sym_await,
+    ACTIONS(774), 1,
+      anon_sym_STAR,
+    ACTIONS(776), 1,
+      anon_sym_STAR_STAR,
+    STATE(770), 1,
+      sym_primary_expression,
+    STATE(771), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1395), 1,
+    STATE(1130), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1567), 2,
+    STATE(1315), 2,
+      sym_list_splat,
       sym_dictionary_splat,
-      sym_pair,
-    ACTIONS(301), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(612), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(752), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33131,7 +33061,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [11230] = 23,
+  [11127] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -33156,18 +33086,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(934), 1,
       anon_sym_RBRACE,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1395), 1,
+    STATE(1405), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1567), 2,
+    STATE(1612), 2,
       sym_dictionary_splat,
       sym_pair,
     ACTIONS(301), 3,
@@ -33186,14 +33116,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33211,7 +33141,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [11333] = 23,
+  [11230] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -33236,18 +33166,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(936), 1,
       anon_sym_RBRACE,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1395), 1,
+    STATE(1405), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1567), 2,
+    STATE(1612), 2,
       sym_dictionary_splat,
       sym_pair,
     ACTIONS(301), 3,
@@ -33266,14 +33196,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33291,7 +33221,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [11436] = 23,
+  [11333] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -33316,18 +33246,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(938), 1,
       anon_sym_RBRACE,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1395), 1,
+    STATE(1405), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1567), 2,
+    STATE(1612), 2,
       sym_dictionary_splat,
       sym_pair,
     ACTIONS(301), 3,
@@ -33346,14 +33276,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33371,7 +33301,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [11539] = 23,
+  [11436] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -33396,18 +33326,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(940), 1,
       anon_sym_RBRACE,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1395), 1,
+    STATE(1405), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1567), 2,
+    STATE(1612), 2,
       sym_dictionary_splat,
       sym_pair,
     ACTIONS(301), 3,
@@ -33426,14 +33356,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33451,7 +33381,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [11642] = 23,
+  [11539] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -33476,18 +33406,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(942), 1,
       anon_sym_RBRACE,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1395), 1,
+    STATE(1405), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1567), 2,
+    STATE(1612), 2,
       sym_dictionary_splat,
       sym_pair,
     ACTIONS(301), 3,
@@ -33506,14 +33436,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33531,7 +33461,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [11745] = 23,
+  [11642] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -33556,18 +33486,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(944), 1,
       anon_sym_RBRACE,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1395), 1,
+    STATE(1405), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1567), 2,
+    STATE(1612), 2,
       sym_dictionary_splat,
       sym_pair,
     ACTIONS(301), 3,
@@ -33586,14 +33516,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33611,7 +33541,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [11848] = 23,
+  [11745] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(55), 1,
@@ -33636,18 +33566,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(946), 1,
       anon_sym_RBRACE,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1395), 1,
+    STATE(1405), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1567), 2,
+    STATE(1612), 2,
       sym_dictionary_splat,
       sym_pair,
     ACTIONS(301), 3,
@@ -33666,14 +33596,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33691,67 +33621,69 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [11951] = 22,
+  [11848] = 23,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(55), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(357), 1,
+      sym_identifier,
+    ACTIONS(363), 1,
+      anon_sym_await,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(768), 1,
-      anon_sym_not,
-    STATE(694), 1,
+    ACTIONS(858), 1,
+      anon_sym_STAR,
+    ACTIONS(860), 1,
+      anon_sym_STAR_STAR,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1395), 1,
+    STATE(1207), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1567), 2,
+    STATE(1346), 2,
+      sym_list_splat,
       sym_dictionary_splat,
-      sym_pair,
-    ACTIONS(301), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33769,7 +33701,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [12051] = 9,
+  [11951] = 9,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(952), 1,
@@ -33778,17 +33710,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_except,
     ACTIONS(956), 1,
       anon_sym_finally,
-    STATE(480), 1,
+    STATE(491), 1,
       sym_else_clause,
-    STATE(554), 1,
+    STATE(584), 1,
       sym_finally_clause,
-    STATE(331), 2,
+    STATE(334), 2,
       sym_except_group_clause,
       aux_sym_try_statement_repeat2,
-    ACTIONS(950), 13,
-      sym__dedent,
+    ACTIONS(948), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -33799,7 +33731,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(948), 34,
+    ACTIONS(950), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -33834,72 +33766,85 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [12125] = 9,
+  [12025] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(952), 1,
-      anon_sym_else,
-    ACTIONS(954), 1,
-      anon_sym_except,
-    ACTIONS(956), 1,
-      anon_sym_finally,
-    STATE(484), 1,
-      sym_else_clause,
-    STATE(572), 1,
-      sym_finally_clause,
-    STATE(331), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    ACTIONS(960), 13,
-      sym__dedent,
+    ACTIONS(268), 1,
+      sym_identifier,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
+    ACTIONS(315), 1,
       sym__string_start,
+    ACTIONS(317), 1,
       sym__template_string_start,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    ACTIONS(960), 1,
+      anon_sym_COLON,
+    STATE(627), 1,
+      sym_template_string,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1264), 1,
+      sym_expression,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(958), 34,
+    ACTIONS(958), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(301), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(311), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(270), 6,
       anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
       anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
       anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
       anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
       anon_sym_exec,
       anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [12199] = 23,
+    STATE(1038), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(734), 17,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [12125] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -33922,18 +33867,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(782), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1231), 1,
+    STATE(1206), 1,
       sym_expression,
-    STATE(1333), 1,
-      sym_type,
-    STATE(1358), 1,
+    STATE(1345), 1,
       sym_list_splat,
+    STATE(1440), 1,
+      sym_type,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
@@ -33953,14 +33898,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -33978,68 +33923,68 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [12301] = 23,
+  [12227] = 23,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(268), 1,
+      sym_identifier,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
+    ACTIONS(305), 1,
       anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(313), 1,
+      anon_sym_await,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(962), 1,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    ACTIONS(782), 1,
       anon_sym_STAR,
-    STATE(772), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(1271), 1,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1206), 1,
       sym_expression,
-    STATE(1436), 1,
-      sym_type,
-    STATE(1529), 1,
+    STATE(1345), 1,
       sym_list_splat,
-    ACTIONS(77), 2,
+    STATE(1657), 1,
+      sym_type,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -34057,68 +34002,68 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [12403] = 23,
+  [12329] = 23,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(656), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(968), 1,
+    ACTIONS(966), 1,
       anon_sym_STAR,
-    ACTIONS(970), 1,
+    ACTIONS(968), 1,
       anon_sym_COLON,
-    ACTIONS(972), 1,
+    ACTIONS(970), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
+    ACTIONS(972), 1,
       anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(974), 1,
       anon_sym_await,
-    STATE(789), 1,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(790), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(1177), 1,
+    STATE(1194), 1,
       sym_expression,
-    STATE(1594), 1,
+    STATE(1600), 1,
       sym_exception_list,
-    ACTIONS(660), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -34136,102 +34081,88 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [12505] = 23,
+  [12431] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(952), 1,
+      anon_sym_else,
+    ACTIONS(956), 1,
+      anon_sym_finally,
+    ACTIONS(980), 1,
+      anon_sym_except,
+    STATE(465), 1,
+      sym_else_clause,
+    STATE(529), 1,
+      sym_finally_clause,
+    STATE(330), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    ACTIONS(976), 13,
       sym__string_start,
-    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
-      anon_sym_LBRACK,
-    ACTIONS(768), 1,
-      anon_sym_not,
-    ACTIONS(782), 1,
-      anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
-      sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1231), 1,
-      sym_expression,
-    STATE(1358), 1,
-      sym_list_splat,
-    STATE(1643), 1,
-      sym_type,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(270), 6,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(978), 34,
       anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
       anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
       anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
       anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-    STATE(720), 17,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [12607] = 9,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [12505] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
+    ACTIONS(952), 1,
       anon_sym_else,
+    ACTIONS(956), 1,
+      anon_sym_finally,
     ACTIONS(980), 1,
       anon_sym_except,
-    ACTIONS(982), 1,
-      anon_sym_finally,
-    STATE(481), 1,
+    STATE(491), 1,
       sym_else_clause,
-    STATE(557), 1,
+    STATE(584), 1,
       sym_finally_clause,
-    STATE(315), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    ACTIONS(950), 13,
+    STATE(330), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    ACTIONS(948), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -34245,7 +34176,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(948), 34,
+    ACTIONS(950), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -34280,7 +34211,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [12681] = 23,
+  [12579] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -34303,17 +34234,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(782), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1231), 1,
+    STATE(1206), 1,
       sym_expression,
-    STATE(1358), 1,
+    STATE(1345), 1,
       sym_list_splat,
-    STATE(1494), 1,
+    STATE(1653), 1,
       sym_type,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -34334,14 +34265,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -34359,9 +34290,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [12783] = 23,
+  [12681] = 22,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(55), 1,
+      anon_sym_STAR_STAR,
     ACTIONS(268), 1,
       sym_identifier,
     ACTIONS(293), 1,
@@ -34380,23 +34313,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(782), 1,
-      anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1231), 1,
+    STATE(1405), 1,
       sym_expression,
-    STATE(1358), 1,
-      sym_list_splat,
-    STATE(1715), 1,
-      sym_type,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
+    STATE(1612), 2,
+      sym_dictionary_splat,
+      sym_pair,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -34413,14 +34343,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -34438,26 +34368,26 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [12885] = 9,
+  [12781] = 9,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(952), 1,
       anon_sym_else,
+    ACTIONS(954), 1,
+      anon_sym_except,
     ACTIONS(956), 1,
       anon_sym_finally,
-    ACTIONS(984), 1,
-      anon_sym_except,
-    STATE(484), 1,
+    STATE(465), 1,
       sym_else_clause,
-    STATE(572), 1,
+    STATE(529), 1,
       sym_finally_clause,
-    STATE(324), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    ACTIONS(960), 13,
-      sym__dedent,
+    STATE(334), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+    ACTIONS(976), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -34468,7 +34398,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(958), 34,
+    ACTIONS(978), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -34503,7 +34433,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [12959] = 22,
+  [12855] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -34524,22 +34454,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(988), 1,
-      anon_sym_COLON,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(782), 1,
+      anon_sym_STAR,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1264), 1,
+    STATE(1206), 1,
       sym_expression,
+    STATE(1345), 1,
+      sym_list_splat,
+    STATE(1707), 1,
+      sym_type,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(986), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -34556,14 +34487,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -34581,105 +34512,91 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [13059] = 23,
+  [12957] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
-      anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(982), 1,
+      anon_sym_else,
+    ACTIONS(984), 1,
+      anon_sym_except,
+    ACTIONS(986), 1,
+      anon_sym_finally,
+    STATE(473), 1,
+      sym_else_clause,
+    STATE(546), 1,
+      sym_finally_clause,
+    STATE(324), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    ACTIONS(948), 13,
+      sym__dedent,
       sym__string_start,
-    ACTIONS(666), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
-      sym_identifier,
-    ACTIONS(972), 1,
-      anon_sym_not,
-    ACTIONS(974), 1,
-      anon_sym_lambda,
-    ACTIONS(976), 1,
-      anon_sym_await,
-    ACTIONS(990), 1,
-      anon_sym_STAR,
-    ACTIONS(992), 1,
-      anon_sym_COLON,
-    STATE(789), 1,
-      sym_primary_expression,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
-      sym_template_string,
-    STATE(1208), 1,
-      sym_expression,
-    STATE(1547), 1,
-      sym_exception_list,
-    ACTIONS(660), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(654), 3,
+      anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(966), 6,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(950), 34,
       anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
       anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
       anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
       anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-    STATE(985), 17,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [13161] = 9,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [13031] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
-      anon_sym_else,
     ACTIONS(982), 1,
+      anon_sym_else,
+    ACTIONS(986), 1,
       anon_sym_finally,
-    ACTIONS(994), 1,
+    ACTIONS(988), 1,
       anon_sym_except,
-    STATE(481), 1,
+    STATE(473), 1,
       sym_else_clause,
-    STATE(557), 1,
+    STATE(546), 1,
       sym_finally_clause,
-    STATE(314), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    ACTIONS(950), 13,
+    STATE(331), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+    ACTIONS(948), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -34690,7 +34607,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(948), 34,
+    ACTIONS(950), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -34725,7 +34642,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [13235] = 22,
+  [13105] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -34746,22 +34663,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(998), 1,
-      anon_sym_COLON,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(782), 1,
+      anon_sym_STAR,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1244), 1,
+    STATE(1206), 1,
       sym_expression,
+    STATE(1345), 1,
+      sym_list_splat,
+    STATE(1629), 1,
+      sym_type,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(996), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -34778,14 +34696,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -34803,7 +34721,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [13335] = 23,
+  [13207] = 22,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -34824,23 +34742,22 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(782), 1,
-      anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(992), 1,
+      anon_sym_COLON,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1231), 1,
+    STATE(1249), 1,
       sym_expression,
-    STATE(1358), 1,
-      sym_list_splat,
-    STATE(1630), 1,
-      sym_type,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
+    ACTIONS(990), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -34857,14 +34774,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -34882,91 +34799,342 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [13437] = 9,
+  [13307] = 23,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
-      anon_sym_else,
-    ACTIONS(982), 1,
-      anon_sym_finally,
-    ACTIONS(994), 1,
-      anon_sym_except,
-    STATE(476), 1,
-      sym_else_clause,
-    STATE(537), 1,
-      sym_finally_clause,
-    STATE(314), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    ACTIONS(960), 13,
+    ACTIONS(53), 1,
+      anon_sym_LBRACE,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
+      anon_sym_lambda,
+    ACTIONS(83), 1,
       sym__string_start,
+    ACTIONS(85), 1,
       sym__template_string_start,
-      ts_builtin_sym_end,
+    ACTIONS(357), 1,
+      sym_identifier,
+    ACTIONS(363), 1,
+      anon_sym_await,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    ACTIONS(994), 1,
+      anon_sym_STAR,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
+      sym_string,
+    STATE(784), 1,
+      sym_template_string,
+    STATE(1276), 1,
+      sym_expression,
+    STATE(1486), 1,
+      sym_list_splat,
+    STATE(1488), 1,
+      sym_type,
+    ACTIONS(77), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(79), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(359), 6,
+      anon_sym_lazy,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1145), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(905), 17,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [13409] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    ACTIONS(962), 1,
+      sym_identifier,
+    ACTIONS(970), 1,
+      anon_sym_not,
+    ACTIONS(972), 1,
+      anon_sym_lambda,
+    ACTIONS(974), 1,
+      anon_sym_await,
+    ACTIONS(996), 1,
+      anon_sym_STAR,
+    ACTIONS(998), 1,
+      anon_sym_COLON,
+    STATE(811), 1,
+      sym_primary_expression,
+    STATE(814), 1,
+      sym_string,
+    STATE(815), 1,
+      sym_template_string,
+    STATE(1226), 1,
+      sym_expression,
+    STATE(1616), 1,
+      sym_exception_list,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(958), 34,
+    ACTIONS(642), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(634), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(964), 6,
       anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
       anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
       anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
       anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
       anon_sym_exec,
       anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
+    STATE(1228), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(960), 17,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [13511] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(305), 1,
       anon_sym_lambda,
-      anon_sym_yield,
+    ACTIONS(313), 1,
+      anon_sym_await,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(585), 1,
+      anon_sym_LPAREN,
+    ACTIONS(596), 1,
+      anon_sym_LBRACK,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    ACTIONS(782), 1,
+      anon_sym_STAR,
+    STATE(627), 1,
+      sym_template_string,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1206), 1,
+      sym_expression,
+    STATE(1345), 1,
+      sym_list_splat,
+    STATE(1387), 1,
+      sym_type,
+    ACTIONS(309), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(301), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(311), 4,
       sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(270), 6,
+      anon_sym_lazy,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1038), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(734), 17,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [13613] = 23,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(268), 1,
       sym_identifier,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
       anon_sym_await,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(585), 1,
+      anon_sym_LPAREN,
+    ACTIONS(596), 1,
+      anon_sym_LBRACK,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    ACTIONS(782), 1,
+      anon_sym_STAR,
+    STATE(627), 1,
+      sym_template_string,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1206), 1,
+      sym_expression,
+    STATE(1345), 1,
+      sym_list_splat,
+    STATE(1673), 1,
+      sym_type,
+    ACTIONS(309), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(301), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(311), 4,
+      sym_integer,
       sym_true,
       sym_false,
       sym_none,
-  [13511] = 9,
+    ACTIONS(270), 6,
+      anon_sym_lazy,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1038), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(734), 17,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [13715] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
+    ACTIONS(982), 1,
       anon_sym_else,
-    ACTIONS(980), 1,
+    ACTIONS(984), 1,
       anon_sym_except,
-    ACTIONS(982), 1,
+    ACTIONS(986), 1,
       anon_sym_finally,
-    STATE(476), 1,
+    STATE(485), 1,
       sym_else_clause,
-    STATE(537), 1,
+    STATE(530), 1,
       sym_finally_clause,
-    STATE(315), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    ACTIONS(960), 13,
+    STATE(324), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    ACTIONS(976), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -34977,7 +35145,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(958), 34,
+    ACTIONS(978), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -35012,23 +35180,23 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [13585] = 9,
+  [13789] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(952), 1,
+    ACTIONS(982), 1,
       anon_sym_else,
-    ACTIONS(956), 1,
+    ACTIONS(986), 1,
       anon_sym_finally,
-    ACTIONS(984), 1,
+    ACTIONS(988), 1,
       anon_sym_except,
-    STATE(480), 1,
+    STATE(485), 1,
       sym_else_clause,
-    STATE(554), 1,
+    STATE(530), 1,
       sym_finally_clause,
-    STATE(324), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    ACTIONS(950), 13,
+    STATE(331), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+    ACTIONS(976), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -35042,7 +35210,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(948), 34,
+    ACTIONS(978), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -35077,7 +35245,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [13659] = 23,
+  [13863] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -35100,17 +35268,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(782), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1231), 1,
+    STATE(1206), 1,
       sym_expression,
-    STATE(1358), 1,
+    STATE(1345), 1,
       sym_list_splat,
-    STATE(1747), 1,
+    STATE(1646), 1,
       sym_type,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -35131,14 +35299,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -35156,7 +35324,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [13761] = 23,
+  [13965] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -35179,17 +35347,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(782), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1231), 1,
+    STATE(1206), 1,
       sym_expression,
-    STATE(1358), 1,
+    STATE(1345), 1,
       sym_list_splat,
-    STATE(1642), 1,
+    STATE(1648), 1,
       sym_type,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -35210,14 +35378,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -35235,7 +35403,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [13863] = 23,
+  [14067] = 23,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -35258,17 +35426,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(782), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1231), 1,
+    STATE(1206), 1,
       sym_expression,
-    STATE(1358), 1,
+    STATE(1345), 1,
       sym_list_splat,
-    STATE(1644), 1,
+    STATE(1652), 1,
       sym_type,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -35289,14 +35457,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -35314,68 +35482,65 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [13965] = 23,
+  [14169] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(357), 1,
+      sym_identifier,
+    ACTIONS(363), 1,
+      anon_sym_await,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(768), 1,
-      anon_sym_not,
-    ACTIONS(782), 1,
-      anon_sym_STAR,
-    STATE(694), 1,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1231), 1,
+    STATE(1266), 1,
       sym_expression,
-    STATE(1358), 1,
-      sym_list_splat,
-    STATE(1648), 1,
-      sym_type,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(1000), 2,
+      sym__newline,
+      anon_sym_SEMI,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -35393,68 +35558,66 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [14067] = 23,
+  [14266] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
-      anon_sym_LPAREN,
-    ACTIONS(596), 1,
-      anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(962), 1,
+      sym_identifier,
+    ACTIONS(968), 1,
+      anon_sym_COLON,
+    ACTIONS(970), 1,
       anon_sym_not,
-    ACTIONS(782), 1,
-      anon_sym_STAR,
-    STATE(694), 1,
+    ACTIONS(972), 1,
+      anon_sym_lambda,
+    ACTIONS(974), 1,
+      anon_sym_await,
+    STATE(811), 1,
+      sym_primary_expression,
+    STATE(814), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1231), 1,
+    STATE(1194), 1,
       sym_expression,
-    STATE(1358), 1,
-      sym_list_splat,
-    STATE(1649), 1,
-      sym_type,
-    ACTIONS(309), 2,
+    STATE(1600), 1,
+      sym_exception_list,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -35472,66 +35635,66 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [14169] = 22,
+  [14365] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(972), 1,
+    ACTIONS(970), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
+    ACTIONS(972), 1,
       anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(974), 1,
       anon_sym_await,
-    ACTIONS(1000), 1,
-      anon_sym_RPAREN,
-    STATE(789), 1,
+    ACTIONS(1002), 1,
+      anon_sym_LPAREN,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(790), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(1192), 1,
+    STATE(1223), 1,
       sym_expression,
-    STATE(1522), 1,
+    STATE(1473), 1,
       sym_with_item,
-    ACTIONS(660), 2,
+    STATE(1693), 1,
+      sym_with_clause,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -35549,66 +35712,65 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [14268] = 22,
+  [14464] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
-      sym_identifier,
-    ACTIONS(972), 1,
+    ACTIONS(602), 1,
+      anon_sym_LPAREN,
+    ACTIONS(608), 1,
+      anon_sym_LBRACK,
+    ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
-      anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(784), 1,
+      sym_identifier,
+    ACTIONS(794), 1,
       anon_sym_await,
-    ACTIONS(1002), 1,
-      anon_sym_LPAREN,
-    STATE(789), 1,
-      sym_primary_expression,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
+    ACTIONS(850), 1,
+      anon_sym_lambda,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1192), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
+      sym_primary_expression,
+    STATE(1102), 1,
       sym_expression,
-    STATE(1478), 1,
-      sym_with_item,
-    STATE(1719), 1,
-      sym_with_clause,
-    ACTIONS(660), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    STATE(1178), 2,
+      sym__expression_within_for_in_clause,
+      sym_lambda_within_for_in_clause,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -35626,65 +35788,65 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [14367] = 21,
+  [14561] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
+    ACTIONS(680), 1,
+      anon_sym_not,
+    ACTIONS(784), 1,
+      sym_identifier,
+    ACTIONS(794), 1,
+      anon_sym_await,
+    ACTIONS(850), 1,
+      anon_sym_lambda,
+    STATE(627), 1,
       sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(1278), 1,
+    STATE(735), 1,
+      sym_primary_expression,
+    STATE(1102), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1004), 2,
-      sym__newline,
-      anon_sym_SEMI,
-    ACTIONS(49), 3,
+    STATE(1180), 2,
+      sym__expression_within_for_in_clause,
+      sym_lambda_within_for_in_clause,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -35702,142 +35864,65 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [14464] = 22,
+  [14658] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(964), 1,
-      sym_identifier,
-    ACTIONS(970), 1,
-      anon_sym_COLON,
-    ACTIONS(972), 1,
+    ACTIONS(71), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(976), 1,
-      anon_sym_await,
-    STATE(789), 1,
-      sym_primary_expression,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
-      sym_template_string,
-    STATE(1177), 1,
-      sym_expression,
-    STATE(1594), 1,
-      sym_exception_list,
-    ACTIONS(660), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(654), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(646), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(966), 6,
-      anon_sym_lazy,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1198), 6,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-    STATE(985), 17,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [14563] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
-      anon_sym_LPAREN,
-    ACTIONS(608), 1,
-      anon_sym_LBRACK,
-    ACTIONS(680), 1,
-      anon_sym_not,
-    ACTIONS(808), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
-    ACTIONS(864), 1,
-      anon_sym_lambda,
-    STATE(694), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(705), 1,
-      sym_primary_expression,
-    STATE(1104), 1,
+    STATE(1266), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1178), 2,
-      sym__expression_within_for_in_clause,
-      sym_lambda_within_for_in_clause,
-    ACTIONS(606), 3,
+    ACTIONS(1004), 2,
+      sym__newline,
+      anon_sym_SEMI,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -35855,7 +35940,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [14660] = 22,
+  [14755] = 21,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -35876,21 +35961,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(782), 1,
-      anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1317), 1,
+    STATE(1312), 1,
       sym_expression,
-    STATE(1566), 1,
-      sym_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
+    ACTIONS(1006), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -35907,14 +35991,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -35932,142 +36016,66 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [14759] = 22,
+  [14852] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(656), 1,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(972), 1,
+    ACTIONS(970), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
+    ACTIONS(972), 1,
       anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(974), 1,
       anon_sym_await,
-    ACTIONS(1002), 1,
-      anon_sym_LPAREN,
-    STATE(789), 1,
+    ACTIONS(998), 1,
+      anon_sym_COLON,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(790), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(791), 1,
-      sym_template_string,
-    STATE(1192), 1,
-      sym_expression,
-    STATE(1478), 1,
-      sym_with_item,
-    STATE(1716), 1,
-      sym_with_clause,
-    ACTIONS(660), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(654), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(646), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(966), 6,
-      anon_sym_lazy,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1198), 6,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-    STATE(985), 17,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [14858] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
-      sym__string_start,
-    ACTIONS(85), 1,
-      sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
-    STATE(772), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
-      sym_string,
-    STATE(1278), 1,
+    STATE(1226), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    STATE(1616), 1,
+      sym_exception_list,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1006), 2,
-      sym__newline,
-      anon_sym_SEMI,
-    ACTIONS(49), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36085,7 +36093,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [14955] = 21,
+  [14951] = 21,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -36106,13 +36114,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1320), 1,
+    STATE(1316), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -36136,14 +36144,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36161,65 +36169,66 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [15052] = 21,
+  [15048] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
-      anon_sym_LPAREN,
-    ACTIONS(596), 1,
-      anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(962), 1,
+      sym_identifier,
+    ACTIONS(970), 1,
       anon_sym_not,
-    STATE(694), 1,
+    ACTIONS(972), 1,
+      anon_sym_lambda,
+    ACTIONS(974), 1,
+      anon_sym_await,
+    ACTIONS(1010), 1,
+      anon_sym_RPAREN,
+    STATE(811), 1,
+      sym_primary_expression,
+    STATE(814), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1303), 1,
+    STATE(1223), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    STATE(1511), 1,
+      sym_with_item,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1010), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(301), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36237,7 +36246,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [15149] = 21,
+  [15147] = 21,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -36252,24 +36261,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(808), 1,
+    ACTIONS(784), 1,
       sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    ACTIONS(864), 1,
+    ACTIONS(850), 1,
       anon_sym_lambda,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1097), 1,
+    STATE(1102), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1174), 2,
+    STATE(1173), 2,
       sym__expression_within_for_in_clause,
       sym_lambda_within_for_in_clause,
     ACTIONS(606), 3,
@@ -36281,21 +36290,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36313,65 +36322,66 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [15246] = 21,
+  [15244] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(970), 1,
+      anon_sym_not,
+    ACTIONS(972), 1,
+      anon_sym_lambda,
+    ACTIONS(974), 1,
       anon_sym_await,
-    ACTIONS(575), 1,
+    ACTIONS(1002), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(1278), 1,
+    STATE(815), 1,
+      sym_template_string,
+    STATE(1223), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    STATE(1473), 1,
+      sym_with_item,
+    STATE(1709), 1,
+      sym_with_clause,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1012), 2,
-      sym__newline,
-      anon_sym_SEMI,
-    ACTIONS(49), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36402,26 +36412,26 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
     ACTIONS(575), 1,
       anon_sym_LPAREN,
     ACTIONS(579), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(780), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(1278), 1,
+    STATE(784), 1,
+      sym_template_string,
+    STATE(1266), 1,
       sym_expression,
     ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1014), 2,
+    ACTIONS(1012), 2,
       sym__newline,
       anon_sym_SEMI,
     ACTIONS(49), 3,
@@ -36433,21 +36443,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36480,24 +36490,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(808), 1,
+    ACTIONS(784), 1,
       sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    ACTIONS(864), 1,
+    ACTIONS(850), 1,
       anon_sym_lambda,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1097), 1,
+    STATE(1103), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1135), 2,
+    STATE(1184), 2,
       sym__expression_within_for_in_clause,
       sym_lambda_within_for_in_clause,
     ACTIONS(606), 3,
@@ -36509,21 +36519,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36541,7 +36551,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [15537] = 21,
+  [15537] = 22,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -36562,20 +36572,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(782), 1,
+      anon_sym_STAR,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1318), 1,
+    STATE(1289), 1,
       sym_expression,
+    STATE(1537), 1,
+      sym_list_splat,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1016), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -36592,14 +36603,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36617,66 +36628,66 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [15634] = 22,
+  [15636] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(972), 1,
+    ACTIONS(970), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
+    ACTIONS(972), 1,
       anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(974), 1,
       anon_sym_await,
-    ACTIONS(992), 1,
-      anon_sym_COLON,
-    STATE(789), 1,
+    ACTIONS(1002), 1,
+      anon_sym_LPAREN,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(790), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(1208), 1,
+    STATE(1223), 1,
       sym_expression,
-    STATE(1547), 1,
-      sym_exception_list,
-    ACTIONS(660), 2,
+    STATE(1473), 1,
+      sym_with_item,
+    STATE(1751), 1,
+      sym_with_clause,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36694,66 +36705,65 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [15733] = 22,
+  [15735] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
-      anon_sym_LBRACE,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(268), 1,
       sym_identifier,
-    ACTIONS(972), 1,
-      anon_sym_not,
-    ACTIONS(974), 1,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(305), 1,
       anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(313), 1,
       anon_sym_await,
-    ACTIONS(1002), 1,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    STATE(789), 1,
-      sym_primary_expression,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
+    ACTIONS(596), 1,
+      anon_sym_LBRACK,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1192), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1319), 1,
       sym_expression,
-    STATE(1478), 1,
-      sym_with_item,
-    STATE(1613), 1,
-      sym_with_clause,
-    ACTIONS(660), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(1014), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36774,63 +36784,63 @@ static const uint16_t ts_small_parse_table[] = {
   [15832] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(656), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(972), 1,
+    ACTIONS(970), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
+    ACTIONS(972), 1,
       anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(974), 1,
       anon_sym_await,
     ACTIONS(1002), 1,
       anon_sym_LPAREN,
-    STATE(789), 1,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(790), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(1192), 1,
+    STATE(1223), 1,
       sym_expression,
-    STATE(1478), 1,
+    STATE(1473), 1,
       sym_with_item,
-    STATE(1622), 1,
+    STATE(1626), 1,
       sym_with_clause,
-    ACTIONS(660), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36851,39 +36861,39 @@ static const uint16_t ts_small_parse_table[] = {
   [15931] = 21,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(816), 1,
-      anon_sym_await,
-    ACTIONS(864), 1,
-      anon_sym_lambda,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1097), 1,
+    STATE(1322), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1222), 2,
-      sym__expression_within_for_in_clause,
-      sym_lambda_within_for_in_clause,
-    ACTIONS(606), 3,
+    ACTIONS(1016), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -36892,21 +36902,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -36939,24 +36949,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(808), 1,
+    ACTIONS(784), 1,
       sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    ACTIONS(864), 1,
+    ACTIONS(850), 1,
       anon_sym_lambda,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1099), 1,
+    STATE(1098), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(1205), 2,
+    STATE(1242), 2,
       sym__expression_within_for_in_clause,
       sym_lambda_within_for_in_clause,
     ACTIONS(606), 3,
@@ -36968,21 +36978,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -37003,63 +37013,63 @@ static const uint16_t ts_small_parse_table[] = {
   [16125] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(656), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(972), 1,
+    ACTIONS(970), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
+    ACTIONS(972), 1,
       anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(974), 1,
       anon_sym_await,
     ACTIONS(1018), 1,
       anon_sym_RPAREN,
-    STATE(789), 1,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(790), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(1192), 1,
+    STATE(1223), 1,
       sym_expression,
-    STATE(1522), 1,
+    STATE(1511), 1,
       sym_with_item,
-    ACTIONS(660), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -37080,62 +37090,62 @@ static const uint16_t ts_small_parse_table[] = {
   [16224] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(357), 1,
+      sym_identifier,
+    ACTIONS(363), 1,
+      anon_sym_await,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(768), 1,
-      anon_sym_not,
-    STATE(694), 1,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1283), 1,
+    STATE(1266), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
     ACTIONS(1020), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(301), 3,
+      sym__newline,
+      anon_sym_SEMI,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -37153,9 +37163,94 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [16321] = 3,
+  [16321] = 21,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
+      anon_sym_LBRACE,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    ACTIONS(962), 1,
+      sym_identifier,
+    ACTIONS(970), 1,
+      anon_sym_not,
+    ACTIONS(972), 1,
+      anon_sym_lambda,
+    ACTIONS(974), 1,
+      anon_sym_await,
+    STATE(811), 1,
+      sym_primary_expression,
+    STATE(814), 1,
+      sym_string,
+    STATE(815), 1,
+      sym_template_string,
+    STATE(1223), 1,
+      sym_expression,
+    STATE(1511), 1,
+      sym_with_item,
+    ACTIONS(648), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(642), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(634), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(964), 6,
+      anon_sym_lazy,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1228), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(960), 17,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [16417] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(952), 1,
+      anon_sym_else,
+    ACTIONS(1026), 1,
+      anon_sym_elif,
+    STATE(329), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(480), 1,
+      sym_elif_clause,
+    STATE(517), 1,
+      sym_else_clause,
     ACTIONS(1022), 13,
       sym__string_start,
       sym__template_string_start,
@@ -37170,7 +37265,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1024), 39,
+    ACTIONS(1024), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -37184,17 +37279,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
-      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -37210,10 +37300,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [16381] = 3,
+  [16487] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1026), 13,
+    ACTIONS(1028), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -37227,7 +37317,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1028), 39,
+    ACTIONS(1030), 39,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -37267,72 +37357,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [16441] = 3,
+  [16547] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1032), 17,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1030), 35,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [16501] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1038), 1,
-      anon_sym_except,
-    STATE(314), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    ACTIONS(1034), 13,
+    ACTIONS(1032), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -37346,7 +37374,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1036), 36,
+    ACTIONS(1034), 39,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -37360,14 +37388,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
+      anon_sym_elif,
       anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
+      anon_sym_except,
       anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
+      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -37383,18 +37414,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [16565] = 5,
+  [16607] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1045), 1,
-      anon_sym_except,
-    STATE(315), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    ACTIONS(1041), 13,
+    ACTIONS(1032), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -37405,7 +37431,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1043), 36,
+    ACTIONS(1034), 39,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -37419,14 +37445,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
+      anon_sym_elif,
       anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
+      anon_sym_except,
       anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
+      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -37442,10 +37471,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [16629] = 3,
+  [16667] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1026), 13,
+    ACTIONS(982), 1,
+      anon_sym_else,
+    ACTIONS(1040), 1,
+      anon_sym_elif,
+    STATE(323), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(481), 1,
+      sym_elif_clause,
+    STATE(540), 1,
+      sym_else_clause,
+    ACTIONS(1038), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -37459,7 +37498,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1028), 39,
+    ACTIONS(1036), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -37473,17 +37512,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
-      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -37499,67 +37533,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [16689] = 3,
+  [16737] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1050), 17,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_EQ,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1048), 35,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [16749] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1054), 13,
+    ACTIONS(1044), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -37573,7 +37550,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1052), 39,
+    ACTIONS(1042), 39,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -37613,23 +37590,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [16809] = 8,
+  [16797] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
-      anon_sym_else,
-    ACTIONS(1060), 1,
-      anon_sym_elif,
-    STATE(392), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(473), 1,
-      sym_elif_clause,
-    STATE(566), 1,
-      sym_else_clause,
-    ACTIONS(1056), 13,
+    ACTIONS(1048), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -37640,7 +37607,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1058), 34,
+    ACTIONS(1046), 39,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -37654,12 +37621,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
+      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -37675,85 +37647,70 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [16879] = 8,
+  [16857] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(952), 1,
-      anon_sym_else,
-    ACTIONS(1066), 1,
-      anon_sym_elif,
-    STATE(321), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(479), 1,
-      sym_elif_clause,
-    STATE(549), 1,
-      sym_else_clause,
-    ACTIONS(1064), 13,
-      sym__dedent,
-      sym__string_start,
-      sym__template_string_start,
-      anon_sym_LPAREN,
+    ACTIONS(1052), 17,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
       anon_sym_STAR_STAR,
+      anon_sym_EQ,
       anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1062), 34,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1050), 35,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
       anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
       anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [16949] = 8,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [16917] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(952), 1,
-      anon_sym_else,
-    ACTIONS(1066), 1,
-      anon_sym_elif,
-    STATE(350), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(479), 1,
-      sym_elif_clause,
-    STATE(563), 1,
-      sym_else_clause,
-    ACTIONS(1070), 13,
-      sym__dedent,
+    ACTIONS(1048), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -37764,7 +37721,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1068), 34,
+    ACTIONS(1046), 39,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -37778,12 +37735,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
+      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -37799,23 +37761,23 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [17019] = 8,
+  [16977] = 8,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(952), 1,
       anon_sym_else,
-    ACTIONS(1066), 1,
+    ACTIONS(1026), 1,
       anon_sym_elif,
-    STATE(337), 1,
+    STATE(382), 1,
       aux_sym_if_statement_repeat1,
-    STATE(479), 1,
+    STATE(480), 1,
       sym_elif_clause,
-    STATE(565), 1,
+    STATE(590), 1,
       sym_else_clause,
-    ACTIONS(1074), 13,
-      sym__dedent,
+    ACTIONS(1054), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -37826,7 +37788,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1072), 34,
+    ACTIONS(1056), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -37861,64 +37823,64 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [17089] = 21,
+  [17047] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(656), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(972), 1,
+    ACTIONS(970), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
+    ACTIONS(972), 1,
       anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(974), 1,
       anon_sym_await,
-    STATE(789), 1,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(790), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(1193), 1,
+    STATE(1215), 1,
       sym_expression,
-    STATE(1564), 1,
+    STATE(1584), 1,
       sym_exception_list,
-    ACTIONS(660), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -37936,15 +37898,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [17185] = 5,
+  [17143] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1076), 1,
-      anon_sym_except,
-    STATE(324), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-    ACTIONS(1034), 13,
+    ACTIONS(982), 1,
+      anon_sym_else,
+    ACTIONS(1040), 1,
+      anon_sym_elif,
+    STATE(396), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(481), 1,
+      sym_elif_clause,
+    STATE(552), 1,
+      sym_else_clause,
+    ACTIONS(1054), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -37958,7 +37925,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1036), 36,
+    ACTIONS(1056), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -37972,12 +37939,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
       anon_sym_def,
@@ -37995,10 +37960,15 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [17249] = 3,
+  [17213] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1022), 13,
+    ACTIONS(1062), 1,
+      anon_sym_except,
+    STATE(324), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    ACTIONS(1060), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -38012,7 +37982,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1024), 39,
+    ACTIONS(1058), 36,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -38026,17 +37996,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_elif,
       anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_except,
       anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
-      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -38052,13 +38019,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [17309] = 3,
+  [17277] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1079), 13,
+    ACTIONS(1067), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -38069,7 +38036,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1081), 39,
+    ACTIONS(1065), 39,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -38109,23 +38076,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [17369] = 8,
+  [17337] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
-      anon_sym_else,
-    ACTIONS(1060), 1,
-      anon_sym_elif,
-    STATE(392), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(473), 1,
-      sym_elif_clause,
-    STATE(520), 1,
-      sym_else_clause,
-    ACTIONS(1070), 13,
+    ACTIONS(1028), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -38136,7 +38093,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1068), 34,
+    ACTIONS(1030), 39,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -38150,12 +38107,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
+      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -38171,13 +38133,80 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [17439] = 3,
+  [17397] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1054), 13,
+    ACTIONS(1071), 17,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_EQ,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1069), 35,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [17457] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(982), 1,
+      anon_sym_else,
+    ACTIONS(1040), 1,
+      anon_sym_elif,
+    STATE(332), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(481), 1,
+      sym_elif_clause,
+    STATE(526), 1,
+      sym_else_clause,
+    ACTIONS(1022), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -38188,7 +38217,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1052), 39,
+    ACTIONS(1024), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -38202,17 +38231,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
-      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -38228,20 +38252,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [17499] = 8,
+  [17527] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
+    ACTIONS(952), 1,
       anon_sym_else,
-    ACTIONS(1060), 1,
+    ACTIONS(1026), 1,
       anon_sym_elif,
-    STATE(319), 1,
+    STATE(382), 1,
       aux_sym_if_statement_repeat1,
-    STATE(473), 1,
+    STATE(480), 1,
       sym_elif_clause,
-    STATE(521), 1,
+    STATE(577), 1,
       sym_else_clause,
-    ACTIONS(1074), 13,
+    ACTIONS(1073), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -38255,7 +38279,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1072), 34,
+    ACTIONS(1075), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -38290,13 +38314,18 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [17569] = 3,
+  [17597] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1079), 13,
-      sym__dedent,
+    ACTIONS(1077), 1,
+      anon_sym_except,
+    STATE(330), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    ACTIONS(1060), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -38307,7 +38336,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1081), 39,
+    ACTIONS(1058), 36,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -38321,17 +38350,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_elif,
       anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_except,
       anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
-      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -38347,15 +38373,15 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [17629] = 5,
+  [17661] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1083), 1,
+    ACTIONS(1084), 1,
       anon_sym_except,
     STATE(331), 2,
       sym_except_group_clause,
       aux_sym_try_statement_repeat2,
-    ACTIONS(1041), 13,
+    ACTIONS(1082), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -38369,7 +38395,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1043), 36,
+    ACTIONS(1080), 36,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -38406,23 +38432,23 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [17693] = 8,
+  [17725] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
+    ACTIONS(982), 1,
       anon_sym_else,
-    ACTIONS(1060), 1,
+    ACTIONS(1040), 1,
       anon_sym_elif,
-    STATE(327), 1,
+    STATE(396), 1,
       aux_sym_if_statement_repeat1,
-    STATE(473), 1,
+    STATE(481), 1,
       sym_elif_clause,
-    STATE(529), 1,
+    STATE(539), 1,
       sym_else_clause,
-    ACTIONS(1064), 13,
+    ACTIONS(1073), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -38433,7 +38459,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1062), 34,
+    ACTIONS(1075), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -38468,13 +38494,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [17763] = 3,
+  [17795] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1088), 13,
-      sym__dedent,
+    ACTIONS(1044), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -38485,7 +38511,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1086), 39,
+    ACTIONS(1042), 39,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -38525,10 +38551,15 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [17823] = 3,
+  [17855] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1088), 13,
+    ACTIONS(1087), 1,
+      anon_sym_except,
+    STATE(334), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+    ACTIONS(1082), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -38542,7 +38573,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1086), 39,
+    ACTIONS(1080), 36,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -38556,17 +38587,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_elif,
       anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_except,
       anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
-      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -38582,139 +38610,121 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [17883] = 21,
+  [17919] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
-      anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(1067), 13,
       sym__string_start,
-    ACTIONS(666), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
-      sym_identifier,
-    ACTIONS(972), 1,
-      anon_sym_not,
-    ACTIONS(974), 1,
-      anon_sym_lambda,
-    ACTIONS(976), 1,
-      anon_sym_await,
-    STATE(789), 1,
-      sym_primary_expression,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
-      sym_template_string,
-    STATE(1209), 1,
-      sym_expression,
-    STATE(1551), 1,
-      sym_exception_list,
-    ACTIONS(660), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(654), 3,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(966), 6,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1065), 39,
       anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
       anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
       anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
+      anon_sym_with,
       anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-    STATE(985), 17,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
   [17979] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(656), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(972), 1,
+    ACTIONS(970), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
+    ACTIONS(972), 1,
       anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(974), 1,
       anon_sym_await,
-    STATE(789), 1,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(790), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(1192), 1,
+    STATE(1227), 1,
       sym_expression,
-    STATE(1522), 1,
-      sym_with_item,
-    ACTIONS(660), 2,
+    STATE(1580), 1,
+      sym_exception_list,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -38737,18 +38747,18 @@ static const uint16_t ts_small_parse_table[] = {
       sym_comment,
     ACTIONS(952), 1,
       anon_sym_else,
-    ACTIONS(1066), 1,
+    ACTIONS(1026), 1,
       anon_sym_elif,
-    STATE(350), 1,
+    STATE(321), 1,
       aux_sym_if_statement_repeat1,
-    STATE(479), 1,
+    STATE(480), 1,
       sym_elif_clause,
     STATE(578), 1,
       sym_else_clause,
-    ACTIONS(1056), 13,
-      sym__dedent,
+    ACTIONS(1038), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -38759,7 +38769,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1058), 34,
+    ACTIONS(1036), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -38797,59 +38807,59 @@ static const uint16_t ts_small_parse_table[] = {
   [18145] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
-      anon_sym_LPAREN,
-    ACTIONS(608), 1,
-      anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(962), 1,
+      sym_identifier,
+    ACTIONS(970), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
+    ACTIONS(972), 1,
       anon_sym_lambda,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(974), 1,
       anon_sym_await,
-    STATE(694), 1,
+    STATE(811), 1,
+      sym_primary_expression,
+    STATE(814), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(705), 1,
-      sym_primary_expression,
-    STATE(1069), 1,
+    STATE(1186), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -38870,59 +38880,59 @@ static const uint16_t ts_small_parse_table[] = {
   [18238] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(970), 1,
+      anon_sym_not,
+    ACTIONS(972), 1,
+      anon_sym_lambda,
+    ACTIONS(974), 1,
       anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(1112), 1,
+    STATE(815), 1,
+      sym_template_string,
+    STATE(1189), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -38943,59 +38953,59 @@ static const uint16_t ts_small_parse_table[] = {
   [18331] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(970), 1,
+      anon_sym_not,
+    ACTIONS(972), 1,
+      anon_sym_lambda,
+    ACTIONS(974), 1,
       anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(1241), 1,
+    STATE(815), 1,
+      sym_template_string,
+    STATE(1190), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -39016,59 +39026,59 @@ static const uint16_t ts_small_parse_table[] = {
   [18424] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(970), 1,
+      anon_sym_not,
+    ACTIONS(972), 1,
+      anon_sym_lambda,
+    ACTIONS(974), 1,
       anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(1295), 1,
+    STATE(815), 1,
+      sym_template_string,
+    STATE(1191), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -39089,59 +39099,59 @@ static const uint16_t ts_small_parse_table[] = {
   [18517] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
-      anon_sym_LPAREN,
-    ACTIONS(608), 1,
-      anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(962), 1,
+      sym_identifier,
+    ACTIONS(970), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
+    ACTIONS(972), 1,
       anon_sym_lambda,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(974), 1,
       anon_sym_await,
-    STATE(694), 1,
+    STATE(811), 1,
+      sym_primary_expression,
+    STATE(814), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(705), 1,
-      sym_primary_expression,
-    STATE(1072), 1,
+    STATE(1192), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -39159,67 +39169,66 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [18610] = 21,
+  [18610] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(616), 1,
+      anon_sym_LPAREN,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(624), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(315), 1,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
-      anon_sym_LPAREN,
-    ACTIONS(596), 1,
-      anon_sym_LBRACK,
-    ACTIONS(768), 1,
-      anon_sym_not,
-    ACTIONS(1090), 1,
+    ACTIONS(750), 1,
       sym_identifier,
-    ACTIONS(1094), 1,
+    ACTIONS(760), 1,
+      anon_sym_not,
+    ACTIONS(762), 1,
+      anon_sym_lambda,
+    ACTIONS(764), 1,
       anon_sym_await,
-    STATE(694), 1,
+    STATE(770), 1,
+      sym_primary_expression,
+    STATE(771), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1109), 1,
+    STATE(1160), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    STATE(470), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(612), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(1092), 6,
+    ACTIONS(752), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 15,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
       sym_call,
       sym_list,
       sym_set,
@@ -39233,62 +39242,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [18705] = 20,
+  [18703] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(616), 1,
+      anon_sym_LPAREN,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(624), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
-      anon_sym_LPAREN,
-    ACTIONS(596), 1,
-      anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(750), 1,
+      sym_identifier,
+    ACTIONS(760), 1,
       anon_sym_not,
-    STATE(694), 1,
+    ACTIONS(762), 1,
+      anon_sym_lambda,
+    ACTIONS(764), 1,
+      anon_sym_await,
+    STATE(770), 1,
+      sym_primary_expression,
+    STATE(771), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1268), 1,
+    STATE(1163), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(612), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(752), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -39306,62 +39315,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [18798] = 20,
+  [18796] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(616), 1,
+      anon_sym_LPAREN,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(624), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
-      anon_sym_LPAREN,
-    ACTIONS(596), 1,
-      anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(750), 1,
+      sym_identifier,
+    ACTIONS(760), 1,
       anon_sym_not,
-    STATE(694), 1,
+    ACTIONS(762), 1,
+      anon_sym_lambda,
+    ACTIONS(764), 1,
+      anon_sym_await,
+    STATE(770), 1,
+      sym_primary_expression,
+    STATE(771), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1386), 1,
+    STATE(1165), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(612), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(752), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -39379,62 +39388,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [18891] = 20,
+  [18889] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(616), 1,
+      anon_sym_LPAREN,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(624), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(750), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(760), 1,
+      anon_sym_not,
+    ACTIONS(762), 1,
+      anon_sym_lambda,
+    ACTIONS(764), 1,
       anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(770), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(1123), 1,
+    STATE(772), 1,
+      sym_template_string,
+    STATE(1115), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(612), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(752), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -39452,125 +39461,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [18984] = 10,
+  [18982] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(277), 1,
-      anon_sym_COMMA,
-    ACTIONS(283), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1096), 1,
-      anon_sym_for,
-    ACTIONS(1098), 1,
-      anon_sym_with,
-    ACTIONS(1100), 1,
-      anon_sym_def,
-    ACTIONS(285), 2,
-      anon_sym_COLON,
-      anon_sym_EQ,
-    ACTIONS(307), 13,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(272), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 16,
-      sym__newline,
-      anon_sym_DOT,
+    ACTIONS(616), 1,
       anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_in,
+    ACTIONS(622), 1,
       anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_SEMI,
-  [19057] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(624), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
-      anon_sym_LPAREN,
-    ACTIONS(596), 1,
-      anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(750), 1,
+      sym_identifier,
+    ACTIONS(760), 1,
       anon_sym_not,
-    STATE(694), 1,
+    ACTIONS(762), 1,
+      anon_sym_lambda,
+    ACTIONS(764), 1,
+      anon_sym_await,
+    STATE(770), 1,
+      sym_primary_expression,
+    STATE(771), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1331), 1,
+    STATE(1136), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(612), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(752), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -39588,62 +39534,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [19150] = 20,
+  [19075] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(357), 1,
+      sym_identifier,
+    ACTIONS(363), 1,
+      anon_sym_await,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(768), 1,
-      anon_sym_not,
-    STATE(694), 1,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1125), 1,
+    STATE(1304), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -39661,121 +39607,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [19243] = 6,
+  [19168] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1106), 1,
-      anon_sym_elif,
-    STATE(350), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(479), 1,
-      sym_elif_clause,
-    ACTIONS(1104), 13,
-      sym__dedent,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(315), 1,
       sym__string_start,
+    ACTIONS(317), 1,
       sym__template_string_start,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1102), 35,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
+    ACTIONS(680), 1,
       anon_sym_not,
+    ACTIONS(682), 1,
       anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [19308] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
-      anon_sym_LBRACE,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(784), 1,
       sym_identifier,
-    ACTIONS(972), 1,
-      anon_sym_not,
-    ACTIONS(974), 1,
-      anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    STATE(789), 1,
-      sym_primary_expression,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1214), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
+      sym_primary_expression,
+    STATE(1200), 1,
       sym_expression,
-    ACTIONS(660), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -39793,62 +39680,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [19401] = 20,
+  [19261] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
+    ACTIONS(680), 1,
+      anon_sym_not,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
+    ACTIONS(784), 1,
+      sym_identifier,
+    ACTIONS(794), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(1255), 1,
+    STATE(735), 1,
+      sym_primary_expression,
+    STATE(1037), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -39866,7 +39753,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [19494] = 20,
+  [19354] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -39887,13 +39774,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1085), 1,
+    STATE(1336), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -39914,14 +39801,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -39939,62 +39826,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [19587] = 20,
+  [19447] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(630), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(750), 1,
-      sym_identifier,
-    ACTIONS(760), 1,
+    ACTIONS(602), 1,
+      anon_sym_LPAREN,
+    ACTIONS(608), 1,
+      anon_sym_LBRACK,
+    ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(762), 1,
+    ACTIONS(682), 1,
       anon_sym_lambda,
-    ACTIONS(764), 1,
+    ACTIONS(784), 1,
+      sym_identifier,
+    ACTIONS(794), 1,
       anon_sym_await,
-    STATE(780), 1,
-      sym_primary_expression,
-    STATE(781), 1,
-      sym_string,
-    STATE(782), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1221), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
+      sym_primary_expression,
+    STATE(1106), 1,
       sym_expression,
-    ACTIONS(626), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(752), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -40012,62 +39899,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [19680] = 20,
+  [19540] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(357), 1,
+      sym_identifier,
+    ACTIONS(363), 1,
+      anon_sym_await,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(768), 1,
-      anon_sym_not,
-    STATE(694), 1,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1088), 1,
+    STATE(1350), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -40085,39 +39972,39 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [19773] = 20,
+  [19633] = 20,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
-      anon_sym_lambda,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(816), 1,
-      anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1171), 1,
+    STATE(1303), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -40126,21 +40013,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -40158,7 +40045,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [19866] = 20,
+  [19726] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
@@ -40171,21 +40058,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
     ACTIONS(575), 1,
       anon_sym_LPAREN,
     ACTIONS(579), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(780), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(1121), 1,
+    STATE(784), 1,
+      sym_template_string,
+    STATE(1142), 1,
       sym_expression,
     ACTIONS(77), 2,
       sym_ellipsis,
@@ -40199,21 +40086,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -40231,62 +40118,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [19959] = 20,
+  [19819] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(357), 1,
+      sym_identifier,
+    ACTIONS(363), 1,
+      anon_sym_await,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(768), 1,
-      anon_sym_not,
-    STATE(694), 1,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1096), 1,
+    STATE(1268), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -40304,62 +40191,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [20052] = 20,
+  [19912] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(357), 1,
+      sym_identifier,
+    ACTIONS(363), 1,
+      anon_sym_await,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(768), 1,
-      anon_sym_not,
-    STATE(694), 1,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1071), 1,
+    STATE(1291), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -40377,7 +40264,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [20145] = 20,
+  [20005] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -40398,13 +40285,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1089), 1,
+    STATE(1255), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -40425,14 +40312,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -40450,7 +40337,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [20238] = 20,
+  [20098] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -40471,13 +40358,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1267), 1,
+    STATE(1359), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -40498,14 +40385,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -40523,62 +40410,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [20331] = 20,
+  [20191] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(357), 1,
+      sym_identifier,
+    ACTIONS(363), 1,
+      anon_sym_await,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(768), 1,
-      anon_sym_not,
-    STATE(694), 1,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1297), 1,
+    STATE(1208), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -40596,17 +40483,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [20424] = 20,
+  [20284] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
     ACTIONS(305), 1,
       anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
@@ -40617,17 +40500,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(1090), 1,
+      sym_identifier,
+    ACTIONS(1094), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1298), 1,
+    STATE(1108), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
+    STATE(482), 2,
+      sym_attribute,
+      sym_subscript,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -40637,25 +40527,23 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(1092), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
       sym_call,
       sym_list,
       sym_set,
@@ -40669,7 +40557,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [20517] = 20,
+  [20379] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
@@ -40682,94 +40570,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
     ACTIONS(575), 1,
       anon_sym_LPAREN,
     ACTIONS(579), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(780), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(1313), 1,
-      sym_expression,
-    ACTIONS(77), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(49), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(79), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(363), 6,
-      anon_sym_lazy,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1126), 6,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-    STATE(950), 17,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [20610] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
-      sym__string_start,
-    ACTIONS(85), 1,
-      sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
-    STATE(772), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
-      sym_string,
-    STATE(1118), 1,
+    STATE(1153), 1,
       sym_expression,
     ACTIONS(77), 2,
       sym_ellipsis,
@@ -40783,21 +40598,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -40815,7 +40630,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [20703] = 20,
+  [20472] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
@@ -40828,21 +40643,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
     ACTIONS(575), 1,
       anon_sym_LPAREN,
     ACTIONS(579), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(780), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(1316), 1,
+    STATE(784), 1,
+      sym_template_string,
+    STATE(1287), 1,
       sym_expression,
     ACTIONS(77), 2,
       sym_ellipsis,
@@ -40856,21 +40671,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -40888,7 +40703,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [20796] = 20,
+  [20565] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -40909,13 +40724,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1081), 1,
+    STATE(1257), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -40936,14 +40751,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -40961,39 +40776,39 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [20889] = 20,
+  [20658] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(680), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
+    ACTIONS(784), 1,
+      sym_identifier,
+    ACTIONS(794), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1076), 1,
+    STATE(1243), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -41002,21 +40817,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41034,7 +40849,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [20982] = 20,
+  [20751] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
@@ -41047,21 +40862,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
     ACTIONS(575), 1,
       anon_sym_LPAREN,
     ACTIONS(579), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(780), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(1115), 1,
+    STATE(784), 1,
+      sym_template_string,
+    STATE(1181), 1,
       sym_expression,
     ACTIONS(77), 2,
       sym_ellipsis,
@@ -41075,94 +40890,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
-      anon_sym_lazy,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(1126), 6,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-    STATE(950), 17,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [21075] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
-      anon_sym_LBRACE,
-    ACTIONS(630), 1,
-      sym__string_start,
-    ACTIONS(632), 1,
-      sym__template_string_start,
-    ACTIONS(750), 1,
-      sym_identifier,
-    ACTIONS(760), 1,
-      anon_sym_not,
-    ACTIONS(762), 1,
-      anon_sym_lambda,
-    ACTIONS(764), 1,
-      anon_sym_await,
-    STATE(780), 1,
-      sym_primary_expression,
-    STATE(781), 1,
-      sym_string,
-    STATE(782), 1,
-      sym_template_string,
-    STATE(1152), 1,
-      sym_expression,
-    ACTIONS(626), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(620), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(612), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(752), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41180,7 +40922,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [21168] = 20,
+  [20844] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
@@ -41193,21 +40935,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
     ACTIONS(575), 1,
       anon_sym_LPAREN,
     ACTIONS(579), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(780), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(1220), 1,
+    STATE(784), 1,
+      sym_template_string,
+    STATE(1296), 1,
       sym_expression,
     ACTIONS(77), 2,
       sym_ellipsis,
@@ -41221,21 +40963,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41253,39 +40995,39 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [21261] = 20,
+  [20937] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(680), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
+    ACTIONS(784), 1,
+      sym_identifier,
+    ACTIONS(794), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1038), 1,
+    STATE(1074), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -41294,21 +41036,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41326,62 +41068,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [21354] = 20,
+  [21030] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
+      anon_sym_lambda,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(972), 1,
-      anon_sym_not,
-    ACTIONS(974), 1,
-      anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
-    STATE(789), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    STATE(780), 1,
       sym_primary_expression,
-    STATE(790), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(1182), 1,
+    STATE(1300), 1,
       sym_expression,
-    ACTIONS(660), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41399,62 +41141,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [21447] = 20,
+  [21123] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(630), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
+      anon_sym_lambda,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(750), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(760), 1,
-      anon_sym_not,
-    ACTIONS(762), 1,
-      anon_sym_lambda,
-    ACTIONS(764), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
     STATE(780), 1,
       sym_primary_expression,
-    STATE(781), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(1159), 1,
+    STATE(1176), 1,
       sym_expression,
-    ACTIONS(626), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(752), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41472,62 +41214,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [21540] = 20,
+  [21216] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
+      anon_sym_lambda,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(972), 1,
-      anon_sym_not,
-    ACTIONS(974), 1,
-      anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
-    STATE(789), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    STATE(780), 1,
       sym_primary_expression,
-    STATE(790), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(1189), 1,
+    STATE(1110), 1,
       sym_expression,
-    ACTIONS(660), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41545,62 +41287,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [21633] = 20,
+  [21309] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
-      sym_identifier,
-    ACTIONS(972), 1,
+    ACTIONS(602), 1,
+      anon_sym_LPAREN,
+    ACTIONS(608), 1,
+      anon_sym_LBRACK,
+    ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
+    ACTIONS(682), 1,
       anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(784), 1,
+      sym_identifier,
+    ACTIONS(794), 1,
       anon_sym_await,
-    STATE(789), 1,
-      sym_primary_expression,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1190), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
+      sym_primary_expression,
+    STATE(1095), 1,
       sym_expression,
-    ACTIONS(660), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41618,62 +41360,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [21726] = 20,
+  [21402] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(268), 1,
+      sym_identifier,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
-      sym_identifier,
-    ACTIONS(972), 1,
+    ACTIONS(585), 1,
+      anon_sym_LPAREN,
+    ACTIONS(596), 1,
+      anon_sym_LBRACK,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
-      anon_sym_lambda,
-    ACTIONS(976), 1,
-      anon_sym_await,
-    STATE(789), 1,
-      sym_primary_expression,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1201), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1205), 1,
       sym_expression,
-    ACTIONS(660), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41691,62 +41433,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [21819] = 20,
+  [21495] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
-      sym_identifier,
-    ACTIONS(972), 1,
+    ACTIONS(602), 1,
+      anon_sym_LPAREN,
+    ACTIONS(608), 1,
+      anon_sym_LBRACK,
+    ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
+    ACTIONS(682), 1,
       anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(784), 1,
+      sym_identifier,
+    ACTIONS(794), 1,
       anon_sym_await,
-    STATE(789), 1,
-      sym_primary_expression,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1188), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
+      sym_primary_expression,
+    STATE(1085), 1,
       sym_expression,
-    ACTIONS(660), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41764,62 +41506,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [21912] = 20,
+  [21588] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
+      anon_sym_lambda,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(972), 1,
-      anon_sym_not,
-    ACTIONS(974), 1,
-      anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
-    STATE(789), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    STATE(780), 1,
       sym_primary_expression,
-    STATE(790), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(1197), 1,
+    STATE(1172), 1,
       sym_expression,
-    ACTIONS(660), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41837,62 +41579,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [22005] = 20,
+  [21681] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(630), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(750), 1,
-      sym_identifier,
-    ACTIONS(760), 1,
+    ACTIONS(602), 1,
+      anon_sym_LPAREN,
+    ACTIONS(608), 1,
+      anon_sym_LBRACK,
+    ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(762), 1,
+    ACTIONS(682), 1,
       anon_sym_lambda,
-    ACTIONS(764), 1,
+    ACTIONS(784), 1,
+      sym_identifier,
+    ACTIONS(794), 1,
       anon_sym_await,
-    STATE(780), 1,
-      sym_primary_expression,
-    STATE(781), 1,
-      sym_string,
-    STATE(782), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1162), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
+      sym_primary_expression,
+    STATE(1073), 1,
       sym_expression,
-    ACTIONS(626), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(752), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41910,62 +41652,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [22098] = 20,
+  [21774] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
+    ACTIONS(680), 1,
+      anon_sym_not,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
+    ACTIONS(784), 1,
+      sym_identifier,
+    ACTIONS(794), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(1161), 1,
+    STATE(735), 1,
+      sym_primary_expression,
+    STATE(1076), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -41983,62 +41725,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [22191] = 20,
+  [21867] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(268), 1,
+      sym_identifier,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(630), 1,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(750), 1,
-      sym_identifier,
-    ACTIONS(760), 1,
+    ACTIONS(585), 1,
+      anon_sym_LPAREN,
+    ACTIONS(596), 1,
+      anon_sym_LBRACK,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(762), 1,
-      anon_sym_lambda,
-    ACTIONS(764), 1,
-      anon_sym_await,
-    STATE(780), 1,
-      sym_primary_expression,
-    STATE(781), 1,
-      sym_string,
-    STATE(782), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1165), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1355), 1,
       sym_expression,
-    ACTIONS(626), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(752), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42056,62 +41798,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [22284] = 20,
+  [21960] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(630), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(750), 1,
-      sym_identifier,
-    ACTIONS(760), 1,
+    ACTIONS(602), 1,
+      anon_sym_LPAREN,
+    ACTIONS(608), 1,
+      anon_sym_LBRACK,
+    ACTIONS(680), 1,
       anon_sym_not,
-    ACTIONS(762), 1,
+    ACTIONS(682), 1,
       anon_sym_lambda,
-    ACTIONS(764), 1,
+    ACTIONS(784), 1,
+      sym_identifier,
+    ACTIONS(794), 1,
       anon_sym_await,
-    STATE(780), 1,
-      sym_primary_expression,
-    STATE(781), 1,
-      sym_string,
-    STATE(782), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1167), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
+      sym_primary_expression,
+    STATE(1091), 1,
       sym_expression,
-    ACTIONS(626), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(752), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42129,62 +41871,125 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [22377] = 20,
+  [22053] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
+    ACTIONS(277), 1,
+      anon_sym_COMMA,
+    ACTIONS(283), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1096), 1,
+      anon_sym_for,
+    ACTIONS(1098), 1,
+      anon_sym_with,
+    ACTIONS(1100), 1,
+      anon_sym_def,
+    ACTIONS(285), 2,
+      anon_sym_COLON,
+      anon_sym_EQ,
+    ACTIONS(307), 13,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(272), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(303), 16,
+      sym__newline,
+      anon_sym_DOT,
       anon_sym_LPAREN,
-    ACTIONS(622), 1,
+      anon_sym_if,
+      anon_sym_in,
       anon_sym_LBRACK,
-    ACTIONS(624), 1,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_SEMI,
+  [22126] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(630), 1,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(750), 1,
-      sym_identifier,
-    ACTIONS(760), 1,
+    ACTIONS(585), 1,
+      anon_sym_LPAREN,
+    ACTIONS(596), 1,
+      anon_sym_LBRACK,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(762), 1,
-      anon_sym_lambda,
-    ACTIONS(764), 1,
-      anon_sym_await,
-    STATE(780), 1,
-      sym_primary_expression,
-    STATE(781), 1,
-      sym_string,
-    STATE(782), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1168), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1260), 1,
       sym_expression,
-    ACTIONS(626), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(752), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42202,80 +42007,66 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [22470] = 20,
+  [22219] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
-      anon_sym_LBRACE,
-    ACTIONS(630), 1,
+    ACTIONS(1106), 1,
+      anon_sym_elif,
+    STATE(382), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(480), 1,
+      sym_elif_clause,
+    ACTIONS(1102), 13,
       sym__string_start,
-    ACTIONS(632), 1,
       sym__template_string_start,
-    ACTIONS(750), 1,
-      sym_identifier,
-    ACTIONS(760), 1,
-      anon_sym_not,
-    ACTIONS(762), 1,
-      anon_sym_lambda,
-    ACTIONS(764), 1,
-      anon_sym_await,
-    STATE(780), 1,
-      sym_primary_expression,
-    STATE(781), 1,
-      sym_string,
-    STATE(782), 1,
-      sym_template_string,
-    STATE(1170), 1,
-      sym_expression,
-    ACTIONS(626), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(620), 3,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_TILDE,
-    ACTIONS(612), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(752), 6,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1104), 35,
       anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
       anon_sym_print,
-      anon_sym_async,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
       anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
-      sym_named_expression,
-      sym_not_operator,
-      sym_boolean_operator,
-      sym_comparison_operator,
-      sym_lambda,
-      sym_conditional_expression,
-    STATE(949), 17,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [22563] = 20,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [22284] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
@@ -42288,21 +42079,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
     ACTIONS(575), 1,
       anon_sym_LPAREN,
     ACTIONS(579), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(780), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(1326), 1,
+    STATE(784), 1,
+      sym_template_string,
+    STATE(1146), 1,
       sym_expression,
     ACTIONS(77), 2,
       sym_ellipsis,
@@ -42316,21 +42107,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42348,62 +42139,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [22656] = 20,
+  [22377] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(268), 1,
+      sym_identifier,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
+    ACTIONS(305), 1,
       anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(313), 1,
+      anon_sym_await,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    STATE(627), 1,
       sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(1247), 1,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1175), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42421,62 +42212,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [22749] = 20,
+  [22470] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(630), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
+      anon_sym_lambda,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(750), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(760), 1,
-      anon_sym_not,
-    ACTIONS(762), 1,
-      anon_sym_lambda,
-    ACTIONS(764), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
     STATE(780), 1,
       sym_primary_expression,
-    STATE(781), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(1169), 1,
+    STATE(1117), 1,
       sym_expression,
-    ACTIONS(626), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(752), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42494,62 +42285,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [22842] = 20,
+  [22563] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(268), 1,
+      sym_identifier,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
-      sym_identifier,
-    ACTIONS(972), 1,
+    ACTIONS(585), 1,
+      anon_sym_LPAREN,
+    ACTIONS(596), 1,
+      anon_sym_LBRACK,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
-      anon_sym_lambda,
-    ACTIONS(976), 1,
-      anon_sym_await,
-    STATE(789), 1,
-      sym_primary_expression,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1233), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1306), 1,
       sym_expression,
-    ACTIONS(660), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42567,39 +42358,39 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [22935] = 20,
+  [22656] = 20,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
-      anon_sym_lambda,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(816), 1,
-      anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1238), 1,
+    STATE(1307), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -42608,21 +42399,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42640,7 +42431,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [23028] = 20,
+  [22749] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -42657,17 +42448,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(682), 1,
       anon_sym_lambda,
-    ACTIONS(808), 1,
+    ACTIONS(784), 1,
       sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1038), 1,
+    STATE(1078), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -42681,21 +42472,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42713,121 +42504,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [23121] = 6,
+  [22842] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1109), 1,
-      anon_sym_elif,
-    STATE(392), 1,
-      aux_sym_if_statement_repeat1,
-    STATE(473), 1,
-      sym_elif_clause,
-    ACTIONS(1104), 13,
-      sym__string_start,
-      sym__template_string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1102), 35,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
+    ACTIONS(268), 1,
       sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [23186] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
+    ACTIONS(305), 1,
       anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(313), 1,
+      anon_sym_await,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    STATE(627), 1,
       sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(1278), 1,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1391), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42845,7 +42577,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [23279] = 20,
+  [22935] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -42866,13 +42598,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1350), 1,
+    STATE(1079), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -42893,14 +42625,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42918,62 +42650,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [23372] = 20,
+  [23028] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(602), 1,
-      anon_sym_LPAREN,
-    ACTIONS(608), 1,
-      anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(71), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
+    ACTIONS(73), 1,
       anon_sym_lambda,
-    ACTIONS(808), 1,
+    ACTIONS(83), 1,
+      sym__string_start,
+    ACTIONS(85), 1,
+      sym__template_string_start,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
-    STATE(694), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(705), 1,
-      sym_primary_expression,
-    STATE(1098), 1,
+    STATE(1270), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -42991,62 +42723,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [23465] = 20,
+  [23121] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(970), 1,
+      anon_sym_not,
+    ACTIONS(972), 1,
+      anon_sym_lambda,
+    ACTIONS(974), 1,
       anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(1129), 1,
+    STATE(815), 1,
+      sym_template_string,
+    STATE(1272), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -43064,7 +42796,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [23558] = 20,
+  [23214] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(268), 1,
@@ -43085,13 +42817,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1109), 1,
+    STATE(1353), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -43112,14 +42844,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -43137,39 +42869,112 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [23651] = 20,
+  [23307] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_LBRACE,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
+      anon_sym_lambda,
+    ACTIONS(83), 1,
+      sym__string_start,
+    ACTIONS(85), 1,
+      sym__template_string_start,
+    ACTIONS(357), 1,
+      sym_identifier,
+    ACTIONS(363), 1,
+      anon_sym_await,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
+      sym_string,
+    STATE(784), 1,
+      sym_template_string,
+    STATE(1195), 1,
+      sym_expression,
+    ACTIONS(77), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(49), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(79), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(359), 6,
+      anon_sym_lazy,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1145), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(905), 17,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [23400] = 20,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
-      anon_sym_lambda,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(816), 1,
-      anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1224), 1,
+    STATE(1037), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -43178,21 +42983,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -43210,7 +43015,66 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [23744] = 20,
+  [23493] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1109), 1,
+      anon_sym_elif,
+    STATE(396), 1,
+      aux_sym_if_statement_repeat1,
+    STATE(481), 1,
+      sym_elif_clause,
+    ACTIONS(1102), 13,
+      sym__dedent,
+      sym__string_start,
+      sym__template_string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1104), 35,
+      anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [23558] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(616), 1,
@@ -43231,13 +43095,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(764), 1,
       anon_sym_await,
-    STATE(780), 1,
+    STATE(770), 1,
       sym_primary_expression,
-    STATE(781), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(1145), 1,
+    STATE(1168), 1,
       sym_expression,
     ACTIONS(626), 2,
       sym_ellipsis,
@@ -43258,14 +43122,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -43283,62 +43147,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [23837] = 20,
+  [23651] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(268), 1,
+      sym_identifier,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
+    ACTIONS(305), 1,
       anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(313), 1,
+      anon_sym_await,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    STATE(627), 1,
       sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(1225), 1,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1397), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -43356,67 +43220,66 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [23930] = 21,
+  [23744] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(616), 1,
+      anon_sym_LPAREN,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(624), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
-      anon_sym_LPAREN,
-    ACTIONS(608), 1,
-      anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(750), 1,
+      sym_identifier,
+    ACTIONS(760), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
+    ACTIONS(762), 1,
       anon_sym_lambda,
-    ACTIONS(1112), 1,
-      sym_identifier,
-    ACTIONS(1116), 1,
+    ACTIONS(764), 1,
       anon_sym_await,
-    STATE(694), 1,
+    STATE(770), 1,
+      sym_primary_expression,
+    STATE(771), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(705), 1,
-      sym_primary_expression,
-    STATE(1098), 1,
+    STATE(1128), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    STATE(470), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(606), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(612), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(1114), 6,
+    ACTIONS(752), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 15,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
       sym_call,
       sym_list,
       sym_set,
@@ -43430,62 +43293,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [24025] = 20,
+  [23837] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
-      anon_sym_LPAREN,
-    ACTIONS(596), 1,
-      anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(962), 1,
+      sym_identifier,
+    ACTIONS(970), 1,
       anon_sym_not,
-    STATE(694), 1,
+    ACTIONS(972), 1,
+      anon_sym_lambda,
+    ACTIONS(974), 1,
+      anon_sym_await,
+    STATE(811), 1,
+      sym_primary_expression,
+    STATE(814), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1292), 1,
+    STATE(1230), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -43503,62 +43366,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [24118] = 20,
+  [23930] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(616), 1,
+      anon_sym_LPAREN,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(624), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
-      anon_sym_LPAREN,
-    ACTIONS(596), 1,
-      anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(750), 1,
+      sym_identifier,
+    ACTIONS(760), 1,
       anon_sym_not,
-    STATE(694), 1,
+    ACTIONS(762), 1,
+      anon_sym_lambda,
+    ACTIONS(764), 1,
+      anon_sym_await,
+    STATE(770), 1,
+      sym_primary_expression,
+    STATE(771), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1347), 1,
+    STATE(1112), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(612), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(752), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -43576,7 +43439,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [24211] = 20,
+  [24023] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
@@ -43589,21 +43452,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
     ACTIONS(575), 1,
       anon_sym_LPAREN,
     ACTIONS(579), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(780), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(1284), 1,
+    STATE(784), 1,
+      sym_template_string,
+    STATE(1140), 1,
       sym_expression,
     ACTIONS(77), 2,
       sym_ellipsis,
@@ -43617,21 +43480,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -43649,39 +43512,42 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [24304] = 20,
+  [24116] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(680), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(682), 1,
+      anon_sym_lambda,
+    ACTIONS(1112), 1,
+      sym_identifier,
+    ACTIONS(1116), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1363), 1,
+    STATE(1106), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    STATE(482), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -43690,25 +43556,23 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(1114), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
       sym_call,
       sym_list,
       sym_set,
@@ -43722,39 +43586,39 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [24397] = 20,
+  [24211] = 20,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
-      anon_sym_lambda,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(816), 1,
-      anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1091), 1,
+    STATE(1081), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -43763,21 +43627,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -43795,62 +43659,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [24490] = 20,
+  [24304] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(616), 1,
+      anon_sym_LPAREN,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(624), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(750), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(760), 1,
+      anon_sym_not,
+    ACTIONS(762), 1,
+      anon_sym_lambda,
+    ACTIONS(764), 1,
       anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(770), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(1319), 1,
+    STATE(772), 1,
+      sym_template_string,
+    STATE(1214), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(612), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(752), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -43868,39 +43732,39 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [24583] = 20,
+  [24397] = 20,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(718), 1,
-      sym_identifier,
-    ACTIONS(732), 1,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(734), 1,
-      anon_sym_lambda,
-    ACTIONS(736), 1,
-      anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(775), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1153), 1,
+    STATE(1082), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -43909,21 +43773,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(720), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -43941,62 +43805,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [24676] = 20,
+  [24490] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(268), 1,
+      sym_identifier,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
+    ACTIONS(305), 1,
       anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(313), 1,
+      anon_sym_await,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
-      sym_identifier,
-    ACTIONS(367), 1,
-      anon_sym_await,
-    ACTIONS(575), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    STATE(772), 1,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    STATE(627), 1,
       sym_template_string,
-    STATE(773), 1,
-      sym_primary_expression,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(1139), 1,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1334), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44014,62 +43878,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [24769] = 20,
+  [24583] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
+      anon_sym_lambda,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
-      anon_sym_LPAREN,
-    ACTIONS(642), 1,
-      anon_sym_LBRACK,
-    ACTIONS(718), 1,
+    ACTIONS(357), 1,
       sym_identifier,
-    ACTIONS(732), 1,
-      anon_sym_not,
-    ACTIONS(734), 1,
-      anon_sym_lambda,
-    ACTIONS(736), 1,
+    ACTIONS(363), 1,
       anon_sym_await,
-    STATE(694), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(775), 1,
-      sym_primary_expression,
-    STATE(1154), 1,
+    STATE(1127), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(79), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(720), 6,
+    ACTIONS(359), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1145), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44087,39 +43951,112 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [24862] = 20,
+  [24676] = 20,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(718), 1,
-      sym_identifier,
-    ACTIONS(732), 1,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(734), 1,
+    STATE(627), 1,
+      sym_template_string,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
+      sym_primary_expression,
+    STATE(1090), 1,
+      sym_expression,
+    ACTIONS(309), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(301), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(311), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(270), 6,
+      anon_sym_lazy,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1038), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(734), 17,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [24769] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(305), 1,
       anon_sym_lambda,
-    ACTIONS(736), 1,
+    ACTIONS(313), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(585), 1,
+      anon_sym_LPAREN,
+    ACTIONS(596), 1,
+      anon_sym_LBRACK,
+    ACTIONS(768), 1,
+      anon_sym_not,
+    STATE(627), 1,
       sym_template_string,
-    STATE(775), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1155), 1,
+    STATE(1094), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -44128,21 +44065,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(720), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44160,7 +44097,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [24955] = 20,
+  [24862] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -44169,9 +44106,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
     ACTIONS(718), 1,
       sym_identifier,
@@ -44181,18 +44118,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(736), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(775), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(767), 1,
       sym_primary_expression,
-    STATE(1156), 1,
+    STATE(1118), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -44208,14 +44145,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44233,39 +44170,39 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [25048] = 20,
+  [24955] = 20,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(718), 1,
-      sym_identifier,
-    ACTIONS(732), 1,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(734), 1,
-      anon_sym_lambda,
-    ACTIONS(736), 1,
-      anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(775), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1157), 1,
+    STATE(1080), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -44274,21 +44211,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(720), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44306,7 +44243,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [25141] = 20,
+  [25048] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -44315,9 +44252,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
     ACTIONS(718), 1,
       sym_identifier,
@@ -44327,18 +44264,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(736), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(775), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(767), 1,
       sym_primary_expression,
-    STATE(1163), 1,
+    STATE(1119), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -44354,14 +44291,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44379,7 +44316,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [25234] = 20,
+  [25141] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -44388,9 +44325,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
     ACTIONS(718), 1,
       sym_identifier,
@@ -44400,18 +44337,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(736), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(775), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(767), 1,
       sym_primary_expression,
-    STATE(1166), 1,
+    STATE(1121), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -44427,14 +44364,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44452,7 +44389,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [25327] = 20,
+  [25234] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -44461,9 +44398,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
     ACTIONS(718), 1,
       sym_identifier,
@@ -44473,18 +44410,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(736), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(775), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(767), 1,
       sym_primary_expression,
-    STATE(1038), 1,
+    STATE(1122), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -44500,14 +44437,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44525,62 +44462,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [25420] = 20,
+  [25327] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(664), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(964), 1,
+    ACTIONS(658), 1,
+      anon_sym_LPAREN,
+    ACTIONS(664), 1,
+      anon_sym_LBRACK,
+    ACTIONS(718), 1,
       sym_identifier,
-    ACTIONS(972), 1,
+    ACTIONS(732), 1,
       anon_sym_not,
-    ACTIONS(974), 1,
+    ACTIONS(734), 1,
       anon_sym_lambda,
-    ACTIONS(976), 1,
+    ACTIONS(736), 1,
       anon_sym_await,
-    STATE(789), 1,
-      sym_primary_expression,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1266), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(767), 1,
+      sym_primary_expression,
+    STATE(1123), 1,
       sym_expression,
-    ACTIONS(660), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 4,
+    ACTIONS(311), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(966), 6,
+    ACTIONS(720), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1198), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(985), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44598,39 +44535,39 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [25513] = 20,
+  [25420] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(718), 1,
+      sym_identifier,
+    ACTIONS(732), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(734), 1,
+      anon_sym_lambda,
+    ACTIONS(736), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(767), 1,
       sym_primary_expression,
-    STATE(1353), 1,
+    STATE(1135), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -44639,21 +44576,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(720), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44671,7 +44608,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [25606] = 20,
+  [25513] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -44680,30 +44617,30 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(718), 1,
+      sym_identifier,
+    ACTIONS(732), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
+    ACTIONS(734), 1,
       anon_sym_lambda,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(736), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(767), 1,
       sym_primary_expression,
-    STATE(1077), 1,
+    STATE(1139), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -44712,21 +44649,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(720), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44744,39 +44681,39 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [25699] = 20,
+  [25606] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(718), 1,
+      sym_identifier,
+    ACTIONS(732), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    ACTIONS(734), 1,
+      anon_sym_lambda,
+    ACTIONS(736), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(767), 1,
       sym_primary_expression,
-    STATE(1361), 1,
+    STATE(1037), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -44785,21 +44722,94 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(720), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [25699] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(53), 1,
+      anon_sym_LBRACE,
+    ACTIONS(71), 1,
+      anon_sym_not,
+    ACTIONS(73), 1,
+      anon_sym_lambda,
+    ACTIONS(83), 1,
+      sym__string_start,
+    ACTIONS(85), 1,
+      sym__template_string_start,
+    ACTIONS(357), 1,
+      sym_identifier,
+    ACTIONS(363), 1,
+      anon_sym_await,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    STATE(780), 1,
+      sym_primary_expression,
+    STATE(783), 1,
+      sym_string,
+    STATE(784), 1,
+      sym_template_string,
+    STATE(1266), 1,
+      sym_expression,
+    ACTIONS(77), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(49), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(79), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(359), 6,
+      anon_sym_lazy,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(1145), 6,
+      sym_named_expression,
+      sym_not_operator,
+      sym_boolean_operator,
+      sym_comparison_operator,
+      sym_lambda,
+      sym_conditional_expression,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44838,13 +44848,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1199), 1,
+    STATE(1366), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -44865,14 +44875,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44911,13 +44921,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1387), 1,
+    STATE(1356), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -44938,14 +44948,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -44984,13 +44994,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1367), 1,
+    STATE(1372), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -45011,14 +45021,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -45057,13 +45067,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1370), 1,
+    STATE(1394), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -45084,14 +45094,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -45130,13 +45140,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1371), 1,
+    STATE(1376), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -45157,14 +45167,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -45185,36 +45195,36 @@ static const uint16_t ts_small_parse_table[] = {
   [26257] = 20,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(268), 1,
+      sym_identifier,
     ACTIONS(293), 1,
       anon_sym_LBRACE,
+    ACTIONS(305), 1,
+      anon_sym_lambda,
+    ACTIONS(313), 1,
+      anon_sym_await,
     ACTIONS(315), 1,
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(768), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
-      anon_sym_lambda,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(816), 1,
-      anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1073), 1,
+    STATE(1377), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -45223,21 +45233,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(270), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -45276,13 +45286,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1359), 1,
+    STATE(1378), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -45303,14 +45313,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -45345,17 +45355,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
     ACTIONS(682), 1,
       anon_sym_lambda,
-    ACTIONS(808), 1,
+    ACTIONS(784), 1,
       sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(794), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(705), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(735), 1,
       sym_primary_expression,
-    STATE(1083), 1,
+    STATE(1159), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -45369,21 +45379,21 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(786), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -45422,13 +45432,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1325), 1,
+    STATE(1084), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -45449,14 +45459,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -45477,59 +45487,59 @@ static const uint16_t ts_small_parse_table[] = {
   [26629] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(616), 1,
+      anon_sym_LPAREN,
+    ACTIONS(622), 1,
+      anon_sym_LBRACK,
+    ACTIONS(624), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
-      anon_sym_LPAREN,
-    ACTIONS(608), 1,
-      anon_sym_LBRACK,
-    ACTIONS(680), 1,
+    ACTIONS(750), 1,
+      sym_identifier,
+    ACTIONS(760), 1,
       anon_sym_not,
-    ACTIONS(682), 1,
+    ACTIONS(762), 1,
       anon_sym_lambda,
-    ACTIONS(808), 1,
-      sym_identifier,
-    ACTIONS(816), 1,
+    ACTIONS(764), 1,
       anon_sym_await,
-    STATE(694), 1,
+    STATE(770), 1,
+      sym_primary_expression,
+    STATE(771), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(705), 1,
-      sym_primary_expression,
-    STATE(1082), 1,
+    STATE(1158), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(612), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(810), 6,
+    ACTIONS(752), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -45568,13 +45578,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1376), 1,
+    STATE(1381), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -45595,14 +45605,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -45641,13 +45651,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1365), 1,
+    STATE(1108), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -45668,14 +45678,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -45696,59 +45706,59 @@ static const uint16_t ts_small_parse_table[] = {
   [26908] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(71), 1,
-      anon_sym_not,
-    ACTIONS(73), 1,
-      anon_sym_lambda,
-    ACTIONS(83), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(361), 1,
+    ACTIONS(962), 1,
       sym_identifier,
-    ACTIONS(367), 1,
+    ACTIONS(970), 1,
+      anon_sym_not,
+    ACTIONS(972), 1,
+      anon_sym_lambda,
+    ACTIONS(974), 1,
       anon_sym_await,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(773), 1,
+    STATE(811), 1,
       sym_primary_expression,
-    STATE(779), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(1147), 1,
+    STATE(815), 1,
+      sym_template_string,
+    STATE(1187), 1,
       sym_expression,
-    ACTIONS(77), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(363), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1126), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(950), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -45769,59 +45779,59 @@ static const uint16_t ts_small_parse_table[] = {
   [27001] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(268), 1,
-      sym_identifier,
-    ACTIONS(293), 1,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(305), 1,
-      anon_sym_lambda,
-    ACTIONS(313), 1,
-      anon_sym_await,
-    ACTIONS(315), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
-      anon_sym_LPAREN,
-    ACTIONS(596), 1,
-      anon_sym_LBRACK,
-    ACTIONS(768), 1,
+    ACTIONS(962), 1,
+      sym_identifier,
+    ACTIONS(970), 1,
       anon_sym_not,
-    STATE(694), 1,
+    ACTIONS(972), 1,
+      anon_sym_lambda,
+    ACTIONS(974), 1,
+      anon_sym_await,
+    STATE(811), 1,
+      sym_primary_expression,
+    STATE(814), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(704), 1,
-      sym_primary_expression,
-    STATE(1261), 1,
+    STATE(1188), 1,
       sym_expression,
-    ACTIONS(309), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(634), 4,
       sym_integer,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(270), 6,
+    ACTIONS(964), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1228), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -45860,13 +45870,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1377), 1,
+    STATE(1382), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -45887,14 +45897,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -45933,13 +45943,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(768), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(704), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(728), 1,
       sym_primary_expression,
-    STATE(1378), 1,
+    STATE(1383), 1,
       sym_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -45960,14 +45970,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1037), 6,
+    STATE(1038), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -46069,13 +46079,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_lambda,
     ACTIONS(764), 1,
       anon_sym_await,
-    STATE(780), 1,
+    STATE(770), 1,
       sym_primary_expression,
-    STATE(781), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(1164), 1,
+    STATE(1169), 1,
       sym_expression,
     ACTIONS(626), 2,
       sym_ellipsis,
@@ -46096,14 +46106,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(1131), 6,
+    STATE(1161), 6,
       sym_named_expression,
       sym_not_operator,
       sym_boolean_operator,
       sym_comparison_operator,
       sym_lambda,
       sym_conditional_expression,
-    STATE(949), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -46124,10 +46134,10 @@ static const uint16_t ts_small_parse_table[] = {
   [27446] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1126), 13,
-      sym__dedent,
+    ACTIONS(1124), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -46138,7 +46148,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1124), 37,
+    ACTIONS(1126), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -46176,14 +46186,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27504] = 5,
+  [27504] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1132), 1,
-      anon_sym_case,
-    STATE(444), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
     ACTIONS(1130), 13,
       sym__dedent,
       sym__string_start,
@@ -46198,7 +46203,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1128), 34,
+    ACTIONS(1128), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -46212,10 +46217,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
+      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
       anon_sym_def,
@@ -46233,13 +46241,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27566] = 3,
+  [27562] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1134), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -46250,7 +46258,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1136), 37,
+    ACTIONS(1132), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -46288,13 +46296,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27624] = 3,
+  [27620] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1138), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -46305,7 +46313,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1140), 37,
+    ACTIONS(1136), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -46343,13 +46351,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27682] = 3,
+  [27678] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1142), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -46360,7 +46368,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1144), 37,
+    ACTIONS(1140), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -46398,15 +46406,71 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27740] = 5,
+  [27736] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1150), 1,
-      anon_sym_case,
-    STATE(444), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
-    ACTIONS(1148), 13,
+    ACTIONS(277), 1,
+      anon_sym_COMMA,
+    ACTIONS(283), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1144), 1,
+      anon_sym_import,
+    ACTIONS(1146), 1,
+      anon_sym_from,
+    ACTIONS(285), 2,
+      anon_sym_COLON,
+      anon_sym_EQ,
+    ACTIONS(307), 13,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(272), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(303), 16,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_SEMI,
+  [27806] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1150), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -46420,7 +46484,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1146), 34,
+    ACTIONS(1148), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -46434,10 +46498,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
+      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
       anon_sym_def,
@@ -46455,18 +46522,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27802] = 5,
+  [27864] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1153), 1,
-      anon_sym_case,
-    STATE(445), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
-    ACTIONS(1148), 13,
+    ACTIONS(1154), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -46477,7 +46539,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1146), 34,
+    ACTIONS(1152), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -46491,10 +46553,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
+      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
       anon_sym_def,
@@ -46512,13 +46577,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27864] = 3,
+  [27922] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1156), 13,
+    ACTIONS(1158), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -46529,7 +46594,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1158), 37,
+    ACTIONS(1156), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -46567,13 +46632,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27922] = 3,
+  [27980] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1160), 13,
+    ACTIONS(1162), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -46584,7 +46649,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1162), 37,
+    ACTIONS(1160), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -46622,7 +46687,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [27980] = 3,
+  [28038] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1166), 13,
@@ -46677,13 +46742,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28038] = 3,
+  [28096] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1166), 13,
+    ACTIONS(1124), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -46694,7 +46759,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1164), 37,
+    ACTIONS(1126), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -46732,9 +46797,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28096] = 3,
+  [28154] = 5,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(1172), 1,
+      anon_sym_case,
+    STATE(451), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
     ACTIONS(1168), 13,
       sym__string_start,
       sym__template_string_start,
@@ -46749,7 +46819,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1170), 37,
+    ACTIONS(1170), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -46763,13 +46833,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
       anon_sym_def,
@@ -46787,10 +46854,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28154] = 3,
+  [28216] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1126), 13,
+    ACTIONS(1142), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -46804,7 +46871,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1124), 37,
+    ACTIONS(1140), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -46842,135 +46909,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28212] = 9,
+  [28274] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(277), 1,
-      anon_sym_COMMA,
-    ACTIONS(283), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1172), 1,
-      sym__string_start,
-    STATE(1411), 1,
-      sym_string,
-    ACTIONS(285), 2,
-      anon_sym_COLON,
-      anon_sym_EQ,
-    ACTIONS(307), 13,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(272), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 16,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_SEMI,
-  [28282] = 9,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(277), 1,
-      anon_sym_COMMA,
-    ACTIONS(283), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1174), 1,
-      anon_sym_import,
-    ACTIONS(1176), 1,
-      anon_sym_from,
-    ACTIONS(285), 2,
-      anon_sym_COLON,
-      anon_sym_EQ,
-    ACTIONS(307), 13,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(272), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 16,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_SEMI,
-  [28352] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1160), 13,
-      sym__dedent,
+    ACTIONS(1134), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -46981,7 +46926,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1162), 37,
+    ACTIONS(1132), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -47019,10 +46964,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28410] = 3,
+  [28332] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1178), 13,
+    ACTIONS(1138), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -47036,7 +46981,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1180), 37,
+    ACTIONS(1136), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -47074,13 +47019,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28468] = 3,
+  [28390] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1134), 13,
-      sym__dedent,
+    ACTIONS(1150), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -47091,7 +47036,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1136), 37,
+    ACTIONS(1148), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -47129,13 +47074,18 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28526] = 3,
+  [28448] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1182), 13,
+    ACTIONS(1179), 1,
+      anon_sym_case,
+    STATE(462), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
+    ACTIONS(1177), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -47146,7 +47096,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1184), 37,
+    ACTIONS(1175), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -47160,13 +47110,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
       anon_sym_def,
@@ -47184,13 +47131,18 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28584] = 3,
+  [28510] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1182), 13,
-      sym__dedent,
+    ACTIONS(1181), 1,
+      anon_sym_case,
+    STATE(451), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
+    ACTIONS(1177), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -47201,7 +47153,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1184), 37,
+    ACTIONS(1175), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -47215,13 +47167,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
       anon_sym_def,
@@ -47239,13 +47188,74 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
+  [28572] = 9,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(277), 1,
+      anon_sym_COMMA,
+    ACTIONS(283), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1183), 1,
+      sym__string_start,
+    STATE(1475), 1,
+      sym_string,
+    ACTIONS(285), 2,
+      anon_sym_COLON,
+      anon_sym_EQ,
+    ACTIONS(307), 13,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(272), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(303), 16,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_SEMI,
   [28642] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1178), 13,
-      sym__dedent,
+    ACTIONS(1130), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -47256,7 +47266,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1180), 37,
+    ACTIONS(1128), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -47297,10 +47307,10 @@ static const uint16_t ts_small_parse_table[] = {
   [28700] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1138), 13,
-      sym__dedent,
+    ACTIONS(1154), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -47311,7 +47321,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1140), 37,
+    ACTIONS(1152), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -47349,15 +47359,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28758] = 5,
+  [28758] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1186), 1,
-      anon_sym_case,
-    STATE(445), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
-    ACTIONS(1130), 13,
+    ACTIONS(1158), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -47371,7 +47376,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1128), 34,
+    ACTIONS(1156), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -47385,10 +47390,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
+      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
+      anon_sym_except,
+      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
       anon_sym_def,
@@ -47406,10 +47414,15 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28820] = 3,
+  [28816] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1142), 13,
+    ACTIONS(1185), 1,
+      anon_sym_case,
+    STATE(462), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
+    ACTIONS(1168), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -47423,7 +47436,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1144), 37,
+    ACTIONS(1170), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -47437,13 +47450,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_except,
-      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
       anon_sym_def,
@@ -47464,10 +47474,10 @@ static const uint16_t ts_small_parse_table[] = {
   [28878] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1156), 13,
-      sym__dedent,
+    ACTIONS(1162), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -47478,7 +47488,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1158), 37,
+    ACTIONS(1160), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -47519,10 +47529,10 @@ static const uint16_t ts_small_parse_table[] = {
   [28936] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1168), 13,
-      sym__dedent,
+    ACTIONS(1166), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -47533,7 +47543,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1170), 37,
+    ACTIONS(1164), 37,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -47571,155 +47581,122 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [28994] = 22,
+  [28994] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(956), 1,
+      anon_sym_finally,
+    STATE(583), 1,
+      sym_finally_clause,
+    ACTIONS(1188), 13,
       sym__string_start,
-    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(694), 1,
-      sym_identifier,
-    ACTIONS(698), 1,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
-    ACTIONS(706), 1,
-      anon_sym_LBRACK,
-    ACTIONS(708), 1,
-      anon_sym_await,
-    ACTIONS(1188), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1190), 1,
-      anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
-      sym_template_string,
-    STATE(1017), 1,
-      sym_primary_expression,
-    STATE(1355), 1,
-      sym_pattern,
-    STATE(1742), 1,
-      sym__patterns,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(842), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_TILDE,
-    STATE(1005), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(696), 6,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1190), 34,
       anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
       anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
       anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
       anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [29089] = 21,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29055] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(952), 1,
+      anon_sym_else,
+    STATE(607), 1,
+      sym_else_clause,
+    ACTIONS(1192), 13,
       sym__string_start,
-    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(694), 1,
-      sym_identifier,
-    ACTIONS(698), 1,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
-    ACTIONS(706), 1,
-      anon_sym_LBRACK,
-    ACTIONS(708), 1,
-      anon_sym_await,
-    ACTIONS(1190), 1,
-      anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
-      sym_template_string,
-    STATE(1002), 1,
-      sym_pattern,
-    STATE(1017), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1192), 2,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-    STATE(842), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_TILDE,
-    STATE(1005), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(696), 6,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1194), 34,
       anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
       anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
       anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
       anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [29182] = 3,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [29116] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1194), 13,
+    ACTIONS(1196), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -47733,7 +47710,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1196), 36,
+    ACTIONS(1198), 36,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -47770,14 +47747,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [29239] = 5,
+  [29173] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
+    ACTIONS(952), 1,
       anon_sym_else,
-    STATE(516), 1,
+    STATE(525), 1,
       sym_else_clause,
-    ACTIONS(1198), 13,
+    ACTIONS(1200), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -47791,7 +47768,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1200), 34,
+    ACTIONS(1202), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -47826,198 +47803,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [29300] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(277), 1,
-      anon_sym_COMMA,
-    ACTIONS(283), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1202), 1,
-      sym_identifier,
-    ACTIONS(285), 2,
-      anon_sym_COLON,
-      anon_sym_EQ,
-    ACTIONS(303), 10,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_LBRACK,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_SEMI,
-    ACTIONS(307), 13,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(272), 21,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-      anon_sym_is,
-  [29367] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1213), 1,
-      anon_sym_EQ,
-    ACTIONS(1206), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(1211), 14,
-      anon_sym_COLON,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(1209), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1204), 16,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [29430] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(694), 1,
-      sym_identifier,
-    ACTIONS(698), 1,
-      anon_sym_LPAREN,
-    ACTIONS(706), 1,
-      anon_sym_LBRACK,
-    ACTIONS(708), 1,
-      anon_sym_await,
-    ACTIONS(1190), 1,
-      anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
-      sym_template_string,
-    STATE(1002), 1,
-      sym_pattern,
-    STATE(1017), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1215), 2,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-    STATE(842), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1005), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(696), 6,
-      anon_sym_lazy,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(720), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [29523] = 3,
+  [29234] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1217), 13,
+    ACTIONS(952), 1,
+      anon_sym_else,
+    STATE(612), 1,
+      sym_else_clause,
+    ACTIONS(1204), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -48031,7 +47824,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1219), 36,
+    ACTIONS(1206), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48045,8 +47838,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
@@ -48068,13 +47859,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [29580] = 3,
+  [29295] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1221), 13,
+    ACTIONS(1196), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -48085,7 +47876,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1223), 36,
+    ACTIONS(1198), 36,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48122,17 +47913,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [29637] = 5,
+  [29352] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
+    ACTIONS(982), 1,
       anon_sym_else,
-    STATE(600), 1,
+    STATE(568), 1,
       sym_else_clause,
-    ACTIONS(1225), 13,
+    ACTIONS(1204), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -48143,7 +47934,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1227), 34,
+    ACTIONS(1206), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48178,14 +47969,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [29698] = 5,
+  [29413] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
+    ACTIONS(952), 1,
       anon_sym_else,
-    STATE(538), 1,
+    STATE(581), 1,
       sym_else_clause,
-    ACTIONS(1229), 13,
+    ACTIONS(1208), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -48199,7 +47990,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1231), 34,
+    ACTIONS(1210), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48234,17 +48025,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [29759] = 5,
+  [29474] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(982), 1,
+    ACTIONS(986), 1,
       anon_sym_finally,
-    STATE(610), 1,
+    STATE(557), 1,
       sym_finally_clause,
-    ACTIONS(1233), 13,
+    ACTIONS(1214), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -48255,7 +48046,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1235), 34,
+    ACTIONS(1212), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48290,14 +48081,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [29820] = 5,
+  [29535] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(952), 1,
+    ACTIONS(982), 1,
       anon_sym_else,
-    STATE(552), 1,
+    STATE(528), 1,
       sym_else_clause,
-    ACTIONS(1229), 13,
+    ACTIONS(1200), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -48311,7 +48102,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1231), 34,
+    ACTIONS(1202), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48346,127 +48137,158 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [29881] = 5,
+  [29596] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
-      anon_sym_else,
-    STATE(530), 1,
-      sym_else_clause,
-    ACTIONS(1237), 13,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(315), 1,
       sym__string_start,
+    ACTIONS(317), 1,
       sym__template_string_start,
-      ts_builtin_sym_end,
+    ACTIONS(690), 1,
+      sym_identifier,
+    ACTIONS(694), 1,
       anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(702), 1,
       anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
+    ACTIONS(704), 1,
+      anon_sym_await,
+    ACTIONS(1216), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1218), 1,
+      anon_sym_STAR,
+    STATE(627), 1,
+      sym_template_string,
+    STATE(698), 1,
+      sym_string,
+    STATE(1016), 1,
+      sym_primary_expression,
+    STATE(1358), 1,
+      sym_pattern,
+    STATE(1668), 1,
+      sym__patterns,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1239), 34,
+    STATE(875), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(301), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1014), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(311), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(692), 6,
       anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
       anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
       anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
       anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
       anon_sym_exec,
       anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29942] = 3,
+    STATE(734), 15,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [29691] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1221), 13,
-      sym__dedent,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(315), 1,
       sym__string_start,
+    ACTIONS(317), 1,
       sym__template_string_start,
+    ACTIONS(690), 1,
+      sym_identifier,
+    ACTIONS(694), 1,
       anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(702), 1,
       anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
+    ACTIONS(704), 1,
+      anon_sym_await,
+    ACTIONS(1218), 1,
+      anon_sym_STAR,
+    STATE(627), 1,
+      sym_template_string,
+    STATE(698), 1,
+      sym_string,
+    STATE(1009), 1,
+      sym_pattern,
+    STATE(1016), 1,
+      sym_primary_expression,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1223), 36,
+    ACTIONS(1220), 2,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+    STATE(875), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(301), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1014), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(311), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(692), 6,
       anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
       anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
       anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
       anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
       anon_sym_exec,
       anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [29999] = 5,
+    STATE(734), 15,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [29784] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(956), 1,
-      anon_sym_finally,
-    STATE(571), 1,
-      sym_finally_clause,
-    ACTIONS(1243), 13,
-      sym__dedent,
+    ACTIONS(1222), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -48477,7 +48299,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1241), 34,
+    ACTIONS(1224), 36,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48491,6 +48313,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
@@ -48512,73 +48336,89 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [30060] = 5,
+  [29841] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(982), 1,
-      anon_sym_finally,
-    STATE(535), 1,
-      sym_finally_clause,
-    ACTIONS(1243), 13,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(315), 1,
       sym__string_start,
+    ACTIONS(317), 1,
       sym__template_string_start,
-      ts_builtin_sym_end,
+    ACTIONS(690), 1,
+      sym_identifier,
+    ACTIONS(694), 1,
       anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(702), 1,
       anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
+    ACTIONS(704), 1,
+      anon_sym_await,
+    ACTIONS(1218), 1,
+      anon_sym_STAR,
+    STATE(627), 1,
+      sym_template_string,
+    STATE(698), 1,
+      sym_string,
+    STATE(1009), 1,
+      sym_pattern,
+    STATE(1016), 1,
+      sym_primary_expression,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1241), 34,
+    ACTIONS(1226), 2,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+    STATE(875), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(301), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1014), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(311), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(692), 6,
       anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
       anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
       anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
       anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
       anon_sym_exec,
       anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [30121] = 5,
+    STATE(734), 15,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [29934] = 5,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(952), 1,
       anon_sym_else,
-    STATE(581), 1,
+    STATE(593), 1,
       sym_else_clause,
-    ACTIONS(1225), 13,
-      sym__dedent,
+    ACTIONS(1228), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -48589,7 +48429,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1227), 34,
+    ACTIONS(1230), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48624,14 +48464,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [30182] = 5,
+  [29995] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
-      anon_sym_else,
-    STATE(528), 1,
-      sym_else_clause,
-    ACTIONS(1245), 13,
+    ACTIONS(1232), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -48645,7 +48481,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1247), 34,
+    ACTIONS(1234), 36,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48659,6 +48495,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
@@ -48680,14 +48518,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [30243] = 5,
+  [30052] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(956), 1,
-      anon_sym_finally,
-    STATE(584), 1,
-      sym_finally_clause,
-    ACTIONS(1233), 13,
+    ACTIONS(1232), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -48701,7 +48535,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1235), 34,
+    ACTIONS(1234), 36,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48715,6 +48549,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
+      anon_sym_elif,
+      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
@@ -48736,35 +48572,151 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [30304] = 5,
+  [30109] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(952), 1,
-      anon_sym_else,
-    STATE(588), 1,
-      sym_else_clause,
-    ACTIONS(1245), 13,
-      sym__dedent,
-      sym__string_start,
-      sym__template_string_start,
-      anon_sym_LPAREN,
+    ACTIONS(1245), 1,
+      anon_sym_EQ,
+    ACTIONS(1238), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(1243), 14,
+      anon_sym_COLON,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(1241), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1247), 34,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1236), 16,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [30172] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(277), 1,
+      anon_sym_COMMA,
+    ACTIONS(283), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1247), 1,
+      sym_identifier,
+    ACTIONS(285), 2,
+      anon_sym_COLON,
+      anon_sym_EQ,
+    ACTIONS(303), 10,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_LBRACK,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_SEMI,
+    ACTIONS(307), 13,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(272), 21,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+      anon_sym_is,
+  [30239] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(982), 1,
+      anon_sym_else,
+    STATE(543), 1,
+      sym_else_clause,
+    ACTIONS(1208), 13,
+      sym__dedent,
+      sym__string_start,
+      sym__template_string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1210), 34,
+      anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
       anon_sym_del,
       anon_sym_raise,
       anon_sym_pass,
@@ -48792,14 +48744,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [30365] = 5,
+  [30300] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(952), 1,
-      anon_sym_else,
-    STATE(592), 1,
-      sym_else_clause,
-    ACTIONS(1251), 13,
+    ACTIONS(986), 1,
+      anon_sym_finally,
+    STATE(545), 1,
+      sym_finally_clause,
+    ACTIONS(1188), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -48813,7 +48765,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1249), 34,
+    ACTIONS(1190), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48848,10 +48800,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [30426] = 3,
+  [30361] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1194), 13,
+    ACTIONS(1222), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -48865,7 +48817,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1196), 36,
+    ACTIONS(1224), 36,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48902,14 +48854,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [30483] = 5,
+  [30418] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(952), 1,
+    ACTIONS(982), 1,
       anon_sym_else,
-    STATE(597), 1,
+    STATE(561), 1,
       sym_else_clause,
-    ACTIONS(1198), 13,
+    ACTIONS(1251), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -48923,7 +48875,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1200), 34,
+    ACTIONS(1249), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48958,10 +48910,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [30544] = 3,
+  [30479] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1217), 13,
+    ACTIONS(982), 1,
+      anon_sym_else,
+    STATE(564), 1,
+      sym_else_clause,
+    ACTIONS(1192), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -48975,7 +48931,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1219), 36,
+    ACTIONS(1194), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -48989,8 +48945,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_break,
       anon_sym_continue,
       anon_sym_if,
-      anon_sym_elif,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_while,
@@ -49012,12 +48966,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [30601] = 5,
+  [30540] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(978), 1,
+    ACTIONS(952), 1,
       anon_sym_else,
-    STATE(553), 1,
+    STATE(604), 1,
       sym_else_clause,
     ACTIONS(1251), 13,
       sym__string_start,
@@ -49068,14 +49022,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [30662] = 5,
+  [30601] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(952), 1,
+    ACTIONS(982), 1,
       anon_sym_else,
-    STATE(569), 1,
+    STATE(555), 1,
       sym_else_clause,
-    ACTIONS(1237), 13,
+    ACTIONS(1228), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -49089,7 +49043,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1239), 34,
+    ACTIONS(1230), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -49124,60 +49078,63 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [30723] = 3,
+  [30662] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1050), 16,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
+    ACTIONS(956), 1,
+      anon_sym_finally,
+    STATE(597), 1,
+      sym_finally_clause,
+    ACTIONS(1214), 13,
+      sym__string_start,
+      sym__template_string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
       anon_sym_STAR_STAR,
-      anon_sym_EQ,
       anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1048), 32,
-      sym__newline,
-      anon_sym_DOT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1212), 34,
+      anon_sym_lazy,
+      anon_sym_import,
       anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_LBRACK,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
       anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-      anon_sym_SEMI,
-  [30779] = 3,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30723] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1253), 13,
@@ -49212,9 +49169,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
+      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -49230,64 +49187,60 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [30835] = 7,
+  [30779] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(277), 1,
-      anon_sym_COMMA,
-    ACTIONS(283), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(285), 2,
-      anon_sym_COLON,
-      anon_sym_EQ,
-    ACTIONS(307), 13,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(272), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
+    ACTIONS(1259), 13,
+      sym__dedent,
+      sym__string_start,
+      sym__template_string_start,
+      anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 16,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1257), 35,
+      anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
       anon_sym_if,
-      anon_sym_in,
-      anon_sym_LBRACK,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_case,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
       anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_SEMI,
-  [30899] = 21,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [30835] = 21,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -49296,37 +49249,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(694), 1,
+    ACTIONS(690), 1,
       sym_identifier,
-    ACTIONS(698), 1,
+    ACTIONS(694), 1,
       anon_sym_LPAREN,
-    ACTIONS(706), 1,
+    ACTIONS(702), 1,
       anon_sym_LBRACK,
-    ACTIONS(708), 1,
+    ACTIONS(704), 1,
       anon_sym_await,
-    ACTIONS(1190), 1,
+    ACTIONS(1218), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1017), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(1016), 1,
       sym_primary_expression,
-    STATE(1504), 1,
+    STATE(1534), 1,
       sym_pattern,
-    STATE(1674), 1,
+    STATE(1755), 1,
       sym_pattern_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(842), 2,
+    STATE(875), 2,
       sym_attribute,
       sym_subscript,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1005), 3,
+    STATE(1014), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -49335,14 +49288,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(696), 6,
+    ACTIONS(692), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 15,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -49358,13 +49311,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [30991] = 3,
+  [30927] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1257), 13,
+    ACTIONS(1263), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -49375,7 +49328,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1259), 35,
+    ACTIONS(1261), 35,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -49411,13 +49364,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [31047] = 3,
+  [30983] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1253), 13,
-      sym__dedent,
+    ACTIONS(1263), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -49428,7 +49381,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1255), 35,
+    ACTIONS(1261), 35,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -49446,9 +49399,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
+      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -49464,13 +49417,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [31103] = 3,
+  [31039] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1261), 13,
+    ACTIONS(1267), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -49481,7 +49434,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1263), 35,
+    ACTIONS(1265), 35,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -49517,70 +49470,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [31159] = 7,
+  [31095] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1265), 1,
-      anon_sym_COMMA,
-    ACTIONS(1268), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1270), 2,
-      anon_sym_COLON,
-      anon_sym_EQ,
-    ACTIONS(1272), 13,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(1209), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1204), 16,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_SEMI,
-  [31223] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1276), 13,
-      sym__dedent,
+    ACTIONS(1267), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -49591,7 +49487,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1274), 35,
+    ACTIONS(1265), 35,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -49627,7 +49523,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [31279] = 21,
+  [31151] = 21,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -49636,37 +49532,108 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(694), 1,
+    ACTIONS(690), 1,
       sym_identifier,
-    ACTIONS(698), 1,
+    ACTIONS(694), 1,
       anon_sym_LPAREN,
-    ACTIONS(706), 1,
+    ACTIONS(702), 1,
       anon_sym_LBRACK,
-    ACTIONS(708), 1,
+    ACTIONS(704), 1,
       anon_sym_await,
-    ACTIONS(1190), 1,
+    ACTIONS(1218), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
+    STATE(627), 1,
+      sym_template_string,
     STATE(698), 1,
+      sym_string,
+    STATE(1016), 1,
+      sym_primary_expression,
+    STATE(1469), 1,
+      sym_pattern,
+    STATE(1731), 1,
+      sym_pattern_list,
+    ACTIONS(309), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(875), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(301), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1014), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(311), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(692), 6,
+      anon_sym_lazy,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(734), 15,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [31243] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(690), 1,
+      sym_identifier,
+    ACTIONS(694), 1,
+      anon_sym_LPAREN,
+    ACTIONS(702), 1,
+      anon_sym_LBRACK,
+    ACTIONS(704), 1,
+      anon_sym_await,
+    ACTIONS(1218), 1,
+      anon_sym_STAR,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1017), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(1016), 1,
       sym_primary_expression,
-    STATE(1515), 1,
+    STATE(1472), 1,
       sym_pattern,
-    STATE(1750), 1,
+    STATE(1619), 1,
       sym_pattern_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(842), 2,
+    STATE(875), 2,
       sym_attribute,
       sym_subscript,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1005), 3,
+    STATE(1014), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -49675,14 +49642,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(696), 6,
+    ACTIONS(692), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 15,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -49698,13 +49665,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [31371] = 3,
+  [31335] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1280), 13,
-      sym__dedent,
+    ACTIONS(1259), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -49715,7 +49682,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1278), 35,
+    ACTIONS(1257), 35,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -49733,9 +49700,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
+      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -49751,10 +49718,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [31427] = 3,
+  [31391] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1032), 16,
+    ACTIONS(1052), 16,
       anon_sym_STAR,
       anon_sym_GT_GT,
       anon_sym_PIPE,
@@ -49771,7 +49738,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_LT,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1030), 32,
+    ACTIONS(1050), 32,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -49804,13 +49771,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
       anon_sym_SEMI,
-  [31483] = 3,
+  [31447] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1257), 13,
-      sym__dedent,
+    ACTIONS(1269), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -49821,7 +49788,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1259), 35,
+    ACTIONS(1271), 35,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -49839,9 +49806,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
+      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
-      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -49857,10 +49824,120 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [31539] = 3,
+  [31503] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1071), 16,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_EQ,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1069), 32,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+      anon_sym_SEMI,
+  [31559] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1273), 1,
+      anon_sym_COMMA,
+    ACTIONS(1276), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1278), 2,
+      anon_sym_COLON,
+      anon_sym_EQ,
+    ACTIONS(1280), 13,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(1241), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1236), 16,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_SEMI,
+  [31623] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1261), 13,
+    ACTIONS(1284), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -49874,7 +49951,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1263), 35,
+    ACTIONS(1282), 35,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -49892,9 +49969,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
+      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
-      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -49910,7 +49987,64 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [31595] = 21,
+  [31679] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(277), 1,
+      anon_sym_COMMA,
+    ACTIONS(283), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(285), 2,
+      anon_sym_COLON,
+      anon_sym_EQ,
+    ACTIONS(307), 13,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(272), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(303), 16,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_SEMI,
+  [31743] = 21,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -49919,37 +50053,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(694), 1,
+    ACTIONS(690), 1,
       sym_identifier,
-    ACTIONS(698), 1,
+    ACTIONS(694), 1,
       anon_sym_LPAREN,
-    ACTIONS(706), 1,
+    ACTIONS(702), 1,
       anon_sym_LBRACK,
-    ACTIONS(708), 1,
+    ACTIONS(704), 1,
       anon_sym_await,
-    ACTIONS(1190), 1,
+    ACTIONS(1218), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1017), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(1016), 1,
       sym_primary_expression,
-    STATE(1531), 1,
+    STATE(1415), 1,
       sym_pattern,
-    STATE(1751), 1,
+    STATE(1655), 1,
       sym_pattern_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(842), 2,
+    STATE(875), 2,
       sym_attribute,
       sym_subscript,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1005), 3,
+    STATE(1014), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -49958,14 +50092,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(696), 6,
+    ACTIONS(692), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 15,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -49981,10 +50115,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [31687] = 3,
+  [31835] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1284), 13,
+    ACTIONS(1253), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -49998,7 +50132,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1282), 35,
+    ACTIONS(1255), 35,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -50034,7 +50168,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [31743] = 3,
+  [31891] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1284), 13,
@@ -50069,9 +50203,62 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
+      anon_sym_finally,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [31947] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1269), 13,
+      sym__dedent,
+      sym__string_start,
+      sym__template_string_start,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1271), 35,
+      anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
-      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -50087,7 +50274,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [31799] = 21,
+  [32003] = 21,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -50096,37 +50283,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(694), 1,
+    ACTIONS(690), 1,
       sym_identifier,
-    ACTIONS(698), 1,
+    ACTIONS(694), 1,
       anon_sym_LPAREN,
-    ACTIONS(706), 1,
+    ACTIONS(702), 1,
       anon_sym_LBRACK,
-    ACTIONS(708), 1,
+    ACTIONS(704), 1,
       anon_sym_await,
-    ACTIONS(1190), 1,
+    ACTIONS(1218), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1017), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(1016), 1,
       sym_primary_expression,
-    STATE(1405), 1,
+    STATE(1411), 1,
       sym_pattern,
-    STATE(1718), 1,
+    STATE(1754), 1,
       sym_pattern_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(842), 2,
+    STATE(875), 2,
       sym_attribute,
       sym_subscript,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1005), 3,
+    STATE(1014), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -50135,14 +50322,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(696), 6,
+    ACTIONS(692), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 15,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -50158,7 +50345,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [31891] = 21,
+  [32095] = 21,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -50167,37 +50354,37 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(694), 1,
+    ACTIONS(690), 1,
       sym_identifier,
-    ACTIONS(698), 1,
+    ACTIONS(694), 1,
       anon_sym_LPAREN,
-    ACTIONS(706), 1,
+    ACTIONS(702), 1,
       anon_sym_LBRACK,
-    ACTIONS(708), 1,
+    ACTIONS(704), 1,
       anon_sym_await,
-    ACTIONS(1190), 1,
+    ACTIONS(1218), 1,
       anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1017), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(1016), 1,
       sym_primary_expression,
-    STATE(1532), 1,
+    STATE(1533), 1,
       sym_pattern,
-    STATE(1678), 1,
+    STATE(1752), 1,
       sym_pattern_list,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(842), 2,
+    STATE(875), 2,
       sym_attribute,
       sym_subscript,
     ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    STATE(1005), 3,
+    STATE(1014), 3,
       sym_tuple_pattern,
       sym_list_pattern,
       sym_list_splat_pattern,
@@ -50206,14 +50393,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(696), 6,
+    ACTIONS(692), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 15,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -50229,13 +50416,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [31983] = 3,
+  [32187] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1276), 13,
+    ACTIONS(1288), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -50246,7 +50433,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1274), 35,
+    ACTIONS(1286), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -50266,7 +50453,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_try,
       anon_sym_with,
       anon_sym_match,
-      anon_sym_case,
       anon_sym_def,
       anon_sym_global,
       anon_sym_nonlocal,
@@ -50282,10 +50468,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [32039] = 3,
+  [32242] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1280), 13,
+    ACTIONS(1290), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -50299,7 +50485,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1278), 35,
+    ACTIONS(1292), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -50317,7 +50503,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_for,
       anon_sym_while,
       anon_sym_try,
-      anon_sym_finally,
       anon_sym_with,
       anon_sym_match,
       anon_sym_def,
@@ -50335,84 +50520,65 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [32095] = 21,
+  [32297] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(1296), 13,
+      sym__dedent,
       sym__string_start,
-    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(694), 1,
-      sym_identifier,
-    ACTIONS(698), 1,
       anon_sym_LPAREN,
-    ACTIONS(706), 1,
-      anon_sym_LBRACK,
-    ACTIONS(708), 1,
-      anon_sym_await,
-    ACTIONS(1190), 1,
-      anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
-      sym_template_string,
-    STATE(1017), 1,
-      sym_primary_expression,
-    STATE(1530), 1,
-      sym_pattern,
-    STATE(1748), 1,
-      sym_pattern_list,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(842), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_TILDE,
-    STATE(1005), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(696), 6,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1294), 34,
       anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
       anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
       anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
       anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [32187] = 3,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [32352] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1288), 13,
-      sym__dedent,
+    ACTIONS(1298), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -50423,7 +50589,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1286), 34,
+    ACTIONS(1300), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -50458,65 +50624,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [32242] = 6,
+  [32407] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1292), 1,
-      anon_sym_COMMA,
-    ACTIONS(1299), 1,
-      anon_sym_EQ,
-    ACTIONS(1297), 14,
-      anon_sym_COLON,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(1295), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1290), 16,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_SEMI,
-  [32303] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1301), 13,
+    ACTIONS(1302), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -50530,7 +50641,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1303), 34,
+    ACTIONS(1304), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -50565,13 +50676,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [32358] = 3,
+  [32462] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1305), 13,
+    ACTIONS(976), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -50582,7 +50693,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1307), 34,
+    ACTIONS(978), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -50617,13 +50728,137 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [32413] = 3,
+  [32517] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1308), 1,
+      anon_sym_COMMA,
+    ACTIONS(1315), 1,
+      anon_sym_EQ,
+    ACTIONS(1313), 14,
+      anon_sym_COLON,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(1311), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1306), 16,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_SEMI,
+  [32578] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1309), 13,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(690), 1,
+      sym_identifier,
+    ACTIONS(694), 1,
+      anon_sym_LPAREN,
+    ACTIONS(702), 1,
+      anon_sym_LBRACK,
+    ACTIONS(704), 1,
+      anon_sym_await,
+    ACTIONS(1218), 1,
+      anon_sym_STAR,
+    STATE(627), 1,
+      sym_template_string,
+    STATE(698), 1,
+      sym_string,
+    STATE(1016), 1,
+      sym_primary_expression,
+    STATE(1515), 1,
+      sym_pattern,
+    ACTIONS(309), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(875), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(301), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1014), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(311), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(692), 6,
+      anon_sym_lazy,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(734), 15,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [32667] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1319), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -50634,7 +50869,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1311), 34,
+    ACTIONS(1317), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -50669,13 +50904,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [32468] = 3,
+  [32722] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1313), 13,
+    ACTIONS(1323), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -50686,7 +50921,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1315), 34,
+    ACTIONS(1321), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -50721,13 +50956,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [32523] = 3,
+  [32777] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1317), 13,
+    ACTIONS(1327), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -50738,7 +50973,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1319), 34,
+    ACTIONS(1325), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -50773,10 +51008,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [32578] = 3,
+  [32832] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1321), 13,
+    ACTIONS(1329), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -50790,7 +51025,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1323), 34,
+    ACTIONS(1331), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -50825,13 +51060,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [32633] = 3,
+  [32887] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1325), 13,
+    ACTIONS(1298), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -50842,7 +51077,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1327), 34,
+    ACTIONS(1300), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -50877,13 +51112,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [32688] = 3,
+  [32942] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1329), 13,
+    ACTIONS(1302), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -50894,7 +51129,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1331), 34,
+    ACTIONS(1304), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -50929,68 +51164,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [32743] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1335), 1,
-      anon_sym_COMMA,
-    ACTIONS(1342), 1,
-      anon_sym_EQ,
-    ACTIONS(1340), 14,
-      anon_sym_COLON,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(1338), 15,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1333), 16,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_LBRACK,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_SEMI,
-  [32804] = 3,
+  [32997] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1344), 13,
+    ACTIONS(1329), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -51001,7 +51181,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1346), 34,
+    ACTIONS(1331), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -51036,10 +51216,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [32859] = 3,
+  [33052] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1348), 13,
+    ACTIONS(1188), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -51053,7 +51233,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1350), 34,
+    ACTIONS(1190), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -51088,82 +51268,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [32914] = 20,
+  [33107] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(694), 1,
-      sym_identifier,
-    ACTIONS(698), 1,
-      anon_sym_LPAREN,
-    ACTIONS(706), 1,
-      anon_sym_LBRACK,
-    ACTIONS(708), 1,
-      anon_sym_await,
-    ACTIONS(1190), 1,
-      anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
-      sym_template_string,
-    STATE(1017), 1,
-      sym_primary_expression,
-    STATE(1524), 1,
-      sym_pattern,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(842), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1005), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(696), 6,
-      anon_sym_lazy,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(720), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [33003] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1352), 13,
+    ACTIONS(1188), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -51174,7 +51285,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1354), 34,
+    ACTIONS(1190), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -51209,10 +51320,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [33058] = 3,
+  [33162] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1356), 13,
+    ACTIONS(948), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -51226,7 +51337,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1358), 34,
+    ACTIONS(950), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -51261,218 +51372,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [33113] = 3,
+  [33217] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1360), 13,
-      sym__string_start,
-      sym__template_string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1362), 34,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [33168] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1364), 13,
-      sym__string_start,
-      sym__template_string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1366), 34,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [33223] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1368), 13,
-      sym__string_start,
-      sym__template_string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1370), 34,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [33278] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(950), 13,
-      sym__string_start,
-      sym__template_string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(948), 34,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [33333] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1374), 13,
+    ACTIONS(948), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -51486,59 +51389,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1372), 34,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [33388] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1376), 13,
-      sym__string_start,
-      sym__template_string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1378), 34,
+    ACTIONS(950), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -51573,13 +51424,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [33443] = 3,
+  [33272] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1380), 13,
+    ACTIONS(1335), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -51590,7 +51441,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1382), 34,
+    ACTIONS(1333), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -51625,10 +51476,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [33498] = 3,
+  [33327] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1233), 13,
+    ACTIONS(1335), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -51642,7 +51493,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1235), 34,
+    ACTIONS(1333), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -51677,13 +51528,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [33553] = 3,
+  [33382] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1384), 13,
+    ACTIONS(1339), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -51694,7 +51545,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1386), 34,
+    ACTIONS(1337), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -51729,13 +51580,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [33608] = 3,
+  [33437] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1388), 13,
+    ACTIONS(1343), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -51746,7 +51597,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1390), 34,
+    ACTIONS(1341), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -51781,10 +51632,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [33663] = 3,
+  [33492] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(950), 13,
+    ACTIONS(1347), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -51798,7 +51649,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(948), 34,
+    ACTIONS(1345), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -51833,13 +51684,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [33718] = 3,
+  [33547] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1392), 13,
+    ACTIONS(1351), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -51850,7 +51701,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1394), 34,
+    ACTIONS(1349), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -51885,13 +51736,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [33773] = 3,
+  [33602] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1396), 13,
+    ACTIONS(1355), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -51902,7 +51753,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1398), 34,
+    ACTIONS(1353), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -51937,13 +51788,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [33828] = 3,
+  [33657] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1400), 13,
+    ACTIONS(1359), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -51954,7 +51805,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1402), 34,
+    ACTIONS(1357), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -51989,10 +51840,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [33883] = 3,
+  [33712] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1406), 13,
+    ACTIONS(1363), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -52006,7 +51857,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1404), 34,
+    ACTIONS(1361), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52041,10 +51892,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [33938] = 3,
+  [33767] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1410), 13,
+    ACTIONS(1367), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -52058,7 +51909,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1408), 34,
+    ACTIONS(1365), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52093,10 +51944,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [33993] = 3,
+  [33822] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1414), 13,
+    ACTIONS(1371), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -52110,7 +51961,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1412), 34,
+    ACTIONS(1369), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52145,114 +51996,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [34048] = 3,
+  [33877] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1416), 13,
-      sym__string_start,
-      sym__template_string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1418), 34,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [34103] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1420), 13,
-      sym__string_start,
-      sym__template_string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1422), 34,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [34158] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1356), 13,
+    ACTIONS(1375), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -52266,7 +52013,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1358), 34,
+    ACTIONS(1373), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52301,62 +52048,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [34213] = 3,
+  [33932] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1424), 13,
-      sym__string_start,
-      sym__template_string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1426), 34,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [34268] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1364), 13,
+    ACTIONS(1379), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -52370,7 +52065,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1366), 34,
+    ACTIONS(1377), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52405,10 +52100,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [34323] = 3,
+  [33987] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1384), 13,
+    ACTIONS(1214), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -52422,59 +52117,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1386), 34,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [34378] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1428), 13,
-      sym__string_start,
-      sym__template_string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1430), 34,
+    ACTIONS(1212), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52509,10 +52152,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [34433] = 3,
+  [34042] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1243), 13,
+    ACTIONS(1383), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -52526,59 +52169,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1241), 34,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
-      anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [34488] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1406), 13,
-      sym__string_start,
-      sym__template_string_start,
-      ts_builtin_sym_end,
-      anon_sym_LPAREN,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1404), 34,
+    ACTIONS(1381), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52613,10 +52204,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [34543] = 3,
+  [34097] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(960), 13,
+    ACTIONS(1387), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -52630,7 +52221,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(958), 34,
+    ACTIONS(1385), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52665,13 +52256,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [34598] = 3,
+  [34152] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1243), 13,
+    ACTIONS(1391), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -52682,7 +52273,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1241), 34,
+    ACTIONS(1389), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52717,13 +52308,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [34653] = 3,
+  [34207] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1410), 13,
+    ACTIONS(1395), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -52734,7 +52325,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1408), 34,
+    ACTIONS(1393), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52769,10 +52360,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [34708] = 3,
+  [34262] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1434), 13,
+    ACTIONS(1399), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -52786,7 +52377,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1432), 34,
+    ACTIONS(1397), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52821,10 +52412,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [34763] = 3,
+  [34317] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1438), 13,
+    ACTIONS(1403), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -52838,7 +52429,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1436), 34,
+    ACTIONS(1401), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52873,10 +52464,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [34818] = 3,
+  [34372] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1313), 13,
+    ACTIONS(1407), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -52890,7 +52481,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1315), 34,
+    ACTIONS(1405), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52925,10 +52516,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [34873] = 3,
+  [34427] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1388), 13,
+    ACTIONS(1411), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -52942,7 +52533,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1390), 34,
+    ACTIONS(1409), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -52977,10 +52568,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [34928] = 3,
+  [34482] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1317), 13,
+    ACTIONS(1415), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -52994,7 +52585,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1319), 34,
+    ACTIONS(1413), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53029,13 +52620,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [34983] = 3,
+  [34537] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(960), 13,
+    ACTIONS(1419), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -53046,7 +52637,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(958), 34,
+    ACTIONS(1417), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53081,10 +52672,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35038] = 3,
+  [34592] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1321), 13,
+    ACTIONS(1423), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -53098,7 +52689,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1323), 34,
+    ACTIONS(1421), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53133,13 +52724,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35093] = 3,
+  [34647] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1440), 13,
+    ACTIONS(1427), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -53150,7 +52741,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1442), 34,
+    ACTIONS(1425), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53185,10 +52776,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35148] = 3,
+  [34702] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1344), 13,
+    ACTIONS(1431), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -53202,7 +52793,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1346), 34,
+    ACTIONS(1429), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53237,10 +52828,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35203] = 3,
+  [34757] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1348), 13,
+    ACTIONS(1435), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -53254,7 +52845,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1350), 34,
+    ACTIONS(1433), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53289,10 +52880,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35258] = 3,
+  [34812] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1360), 13,
+    ACTIONS(1439), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -53306,7 +52897,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1362), 34,
+    ACTIONS(1437), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53341,10 +52932,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35313] = 3,
+  [34867] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1368), 13,
+    ACTIONS(1443), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -53358,7 +52949,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1370), 34,
+    ACTIONS(1441), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53393,10 +52984,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35368] = 3,
+  [34922] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1376), 13,
+    ACTIONS(1447), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -53410,7 +53001,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1378), 34,
+    ACTIONS(1445), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53445,10 +53036,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35423] = 3,
+  [34977] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1233), 13,
+    ACTIONS(1451), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -53462,7 +53053,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1235), 34,
+    ACTIONS(1449), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53497,13 +53088,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35478] = 3,
+  [35032] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1392), 13,
-      sym__dedent,
+    ACTIONS(1339), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -53514,7 +53105,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1394), 34,
+    ACTIONS(1337), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53549,10 +53140,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35533] = 3,
+  [35087] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1400), 13,
+    ACTIONS(1455), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -53566,7 +53157,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1402), 34,
+    ACTIONS(1453), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53601,10 +53192,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35588] = 3,
+  [35142] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1416), 13,
+    ACTIONS(1459), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -53618,7 +53209,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1418), 34,
+    ACTIONS(1457), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53653,10 +53244,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35643] = 3,
+  [35197] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1420), 13,
+    ACTIONS(1463), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -53670,7 +53261,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1422), 34,
+    ACTIONS(1461), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53705,13 +53296,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35698] = 3,
+  [35252] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1424), 13,
-      sym__dedent,
+    ACTIONS(1465), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -53722,7 +53313,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1426), 34,
+    ACTIONS(1467), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53757,10 +53348,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35753] = 3,
+  [35307] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1440), 13,
+    ACTIONS(1471), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -53774,7 +53365,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1442), 34,
+    ACTIONS(1469), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53809,13 +53400,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35808] = 3,
+  [35362] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1446), 13,
-      sym__dedent,
+    ACTIONS(1343), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -53826,7 +53417,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1444), 34,
+    ACTIONS(1341), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53861,13 +53452,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35863] = 3,
+  [35417] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1450), 13,
-      sym__dedent,
+    ACTIONS(1347), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -53878,7 +53469,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1448), 34,
+    ACTIONS(1345), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53913,10 +53504,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35918] = 3,
+  [35472] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1454), 13,
+    ACTIONS(1290), 13,
       sym__dedent,
       sym__string_start,
       sym__template_string_start,
@@ -53930,7 +53521,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1452), 34,
+    ACTIONS(1292), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -53965,13 +53556,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [35973] = 3,
+  [35527] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1446), 13,
+    ACTIONS(1465), 13,
+      sym__dedent,
       sym__string_start,
       sym__template_string_start,
-      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -53982,7 +53573,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1444), 34,
+    ACTIONS(1467), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54017,13 +53608,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36028] = 3,
+  [35582] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1458), 13,
-      sym__dedent,
+    ACTIONS(1351), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -54034,7 +53625,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1456), 34,
+    ACTIONS(1349), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54069,65 +53660,68 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36083] = 3,
+  [35637] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1462), 13,
-      sym__dedent,
-      sym__string_start,
-      sym__template_string_start,
-      anon_sym_LPAREN,
+    ACTIONS(1475), 1,
+      anon_sym_COMMA,
+    ACTIONS(1482), 1,
+      anon_sym_EQ,
+    ACTIONS(1480), 14,
+      anon_sym_COLON,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(1478), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
-      anon_sym_TILDE,
-      sym_ellipsis,
-      sym_float,
-    ACTIONS(1460), 34,
-      anon_sym_lazy,
-      anon_sym_import,
-      anon_sym_from,
-      anon_sym_STAR,
-      anon_sym_print,
-      anon_sym_assert,
-      anon_sym_return,
-      anon_sym_del,
-      anon_sym_raise,
-      anon_sym_pass,
-      anon_sym_break,
-      anon_sym_continue,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1473), 16,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_while,
-      anon_sym_try,
-      anon_sym_with,
-      anon_sym_match,
-      anon_sym_def,
-      anon_sym_global,
-      anon_sym_nonlocal,
-      anon_sym_exec,
-      anon_sym_type,
-      anon_sym_class,
+      anon_sym_in,
+      anon_sym_LBRACK,
       anon_sym_not,
-      anon_sym_lambda,
-      anon_sym_yield,
-      sym_integer,
-      sym_identifier,
-      anon_sym_await,
-      sym_true,
-      sym_false,
-      sym_none,
-  [36138] = 3,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_SEMI,
+  [35698] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1466), 13,
-      sym__dedent,
+    ACTIONS(1355), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -54138,7 +53732,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1464), 34,
+    ACTIONS(1353), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54173,13 +53767,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36193] = 3,
+  [35753] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1470), 13,
-      sym__dedent,
+    ACTIONS(1359), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -54190,7 +53784,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1468), 34,
+    ACTIONS(1357), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54225,13 +53819,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36248] = 3,
+  [35808] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1474), 13,
-      sym__dedent,
+    ACTIONS(1363), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -54242,7 +53836,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1472), 34,
+    ACTIONS(1361), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54277,13 +53871,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36303] = 3,
+  [35863] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1352), 13,
-      sym__dedent,
+    ACTIONS(1367), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -54294,7 +53888,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1354), 34,
+    ACTIONS(1365), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54329,82 +53923,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36358] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(694), 1,
-      sym_identifier,
-    ACTIONS(698), 1,
-      anon_sym_LPAREN,
-    ACTIONS(706), 1,
-      anon_sym_LBRACK,
-    ACTIONS(708), 1,
-      anon_sym_await,
-    ACTIONS(1190), 1,
-      anon_sym_STAR,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
-      sym_template_string,
-    STATE(1002), 1,
-      sym_pattern,
-    STATE(1017), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(842), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    STATE(1005), 3,
-      sym_tuple_pattern,
-      sym_list_pattern,
-      sym_list_splat_pattern,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(696), 6,
-      anon_sym_lazy,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(720), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [36447] = 3,
+  [35918] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1380), 13,
-      sym__dedent,
+    ACTIONS(1371), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -54415,7 +53940,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1382), 34,
+    ACTIONS(1369), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54450,13 +53975,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36502] = 3,
+  [35973] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1396), 13,
-      sym__dedent,
+    ACTIONS(1375), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -54467,7 +53992,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1398), 34,
+    ACTIONS(1373), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54502,13 +54027,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36557] = 3,
+  [36028] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1428), 13,
-      sym__dedent,
+    ACTIONS(1379), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -54519,7 +54044,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1430), 34,
+    ACTIONS(1377), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54554,10 +54079,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36612] = 3,
+  [36083] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1414), 13,
+    ACTIONS(1214), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -54571,7 +54096,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1412), 34,
+    ACTIONS(1212), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54606,10 +54131,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36667] = 3,
+  [36138] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1450), 13,
+    ACTIONS(1383), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -54623,7 +54148,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1448), 34,
+    ACTIONS(1381), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54658,13 +54183,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36722] = 3,
+  [36193] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1478), 13,
-      sym__dedent,
+    ACTIONS(1387), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -54675,7 +54200,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1476), 34,
+    ACTIONS(1385), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54710,13 +54235,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36777] = 3,
+  [36248] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1482), 13,
-      sym__dedent,
+    ACTIONS(1391), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -54727,7 +54252,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1480), 34,
+    ACTIONS(1389), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54762,13 +54287,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36832] = 3,
+  [36303] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1301), 13,
-      sym__dedent,
+    ACTIONS(1395), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -54779,7 +54304,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1303), 34,
+    ACTIONS(1393), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54814,13 +54339,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36887] = 3,
+  [36358] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1305), 13,
-      sym__dedent,
+    ACTIONS(1399), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -54831,7 +54356,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1307), 34,
+    ACTIONS(1397), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54866,13 +54391,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36942] = 3,
+  [36413] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1309), 13,
-      sym__dedent,
+    ACTIONS(1403), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -54883,7 +54408,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1311), 34,
+    ACTIONS(1401), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54918,10 +54443,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [36997] = 3,
+  [36468] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1454), 13,
+    ACTIONS(1407), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -54935,7 +54460,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1452), 34,
+    ACTIONS(1405), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -54970,10 +54495,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37052] = 3,
+  [36523] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1470), 13,
+    ACTIONS(1411), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -54987,7 +54512,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1468), 34,
+    ACTIONS(1409), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55022,13 +54547,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37107] = 3,
+  [36578] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1325), 13,
-      sym__dedent,
+    ACTIONS(1415), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -55039,7 +54564,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1327), 34,
+    ACTIONS(1413), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55074,13 +54599,68 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37162] = 3,
+  [36633] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1329), 13,
-      sym__dedent,
+    ACTIONS(1273), 1,
+      anon_sym_COMMA,
+    ACTIONS(1278), 1,
+      anon_sym_EQ,
+    ACTIONS(1280), 14,
+      anon_sym_COLON,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+    ACTIONS(1241), 15,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1236), 16,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_LBRACK,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_SEMI,
+  [36694] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(976), 13,
       sym__string_start,
       sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
@@ -55091,7 +54671,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1331), 34,
+    ACTIONS(978), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55126,10 +54706,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37217] = 3,
+  [36749] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1434), 13,
+    ACTIONS(1419), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -55143,7 +54723,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1432), 34,
+    ACTIONS(1417), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55178,10 +54758,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37272] = 3,
+  [36804] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1374), 13,
+    ACTIONS(1423), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -55195,7 +54775,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1372), 34,
+    ACTIONS(1421), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55230,10 +54810,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37327] = 3,
+  [36859] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1478), 13,
+    ACTIONS(1427), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -55247,7 +54827,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1476), 34,
+    ACTIONS(1425), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55282,10 +54862,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37382] = 3,
+  [36914] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1482), 13,
+    ACTIONS(1431), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -55299,7 +54879,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1480), 34,
+    ACTIONS(1429), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55334,10 +54914,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37437] = 3,
+  [36969] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1288), 13,
+    ACTIONS(1319), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -55351,7 +54931,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1286), 34,
+    ACTIONS(1317), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55386,10 +54966,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37492] = 3,
+  [37024] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1458), 13,
+    ACTIONS(1435), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -55403,7 +54983,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1456), 34,
+    ACTIONS(1433), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55438,10 +55018,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37547] = 3,
+  [37079] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1462), 13,
+    ACTIONS(1323), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -55455,7 +55035,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1460), 34,
+    ACTIONS(1321), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55490,10 +55070,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37602] = 3,
+  [37134] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1484), 13,
+    ACTIONS(1327), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -55507,7 +55087,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1486), 34,
+    ACTIONS(1325), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55542,10 +55122,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37657] = 3,
+  [37189] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1474), 13,
+    ACTIONS(1439), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -55559,7 +55139,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1472), 34,
+    ACTIONS(1437), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55594,10 +55174,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37712] = 3,
+  [37244] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1466), 13,
+    ACTIONS(1443), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -55611,7 +55191,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1464), 34,
+    ACTIONS(1441), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55646,65 +55226,426 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
-  [37767] = 6,
+  [37299] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1265), 1,
-      anon_sym_COMMA,
-    ACTIONS(1270), 1,
-      anon_sym_EQ,
-    ACTIONS(1272), 14,
-      anon_sym_COLON,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-    ACTIONS(1209), 15,
+    ACTIONS(1447), 13,
+      sym__string_start,
+      sym__template_string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1445), 34,
+      anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
       anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [37354] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1451), 13,
+      sym__string_start,
+      sym__template_string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1204), 16,
-      sym__newline,
-      anon_sym_DOT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1449), 34,
+      anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [37409] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1296), 13,
+      sym__string_start,
+      sym__template_string_start,
+      ts_builtin_sym_end,
       anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1294), 34,
+      anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
       anon_sym_if,
-      anon_sym_in,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [37464] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1288), 13,
+      sym__string_start,
+      sym__template_string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1286), 34,
+      anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
       anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_SEMI,
-  [37828] = 3,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [37519] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1455), 13,
+      sym__string_start,
+      sym__template_string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1453), 34,
+      anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [37574] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1459), 13,
+      sym__string_start,
+      sym__template_string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1457), 34,
+      anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [37629] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1463), 13,
+      sym__string_start,
+      sym__template_string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1461), 34,
+      anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [37684] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1484), 13,
+      sym__string_start,
+      sym__template_string_start,
+      ts_builtin_sym_end,
+      anon_sym_LPAREN,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_TILDE,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(1486), 34,
+      anon_sym_lazy,
+      anon_sym_import,
+      anon_sym_from,
+      anon_sym_STAR,
+      anon_sym_print,
+      anon_sym_assert,
+      anon_sym_return,
+      anon_sym_del,
+      anon_sym_raise,
+      anon_sym_pass,
+      anon_sym_break,
+      anon_sym_continue,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_while,
+      anon_sym_try,
+      anon_sym_with,
+      anon_sym_match,
+      anon_sym_def,
+      anon_sym_global,
+      anon_sym_nonlocal,
+      anon_sym_exec,
+      anon_sym_type,
+      anon_sym_class,
+      anon_sym_not,
+      anon_sym_lambda,
+      anon_sym_yield,
+      sym_integer,
+      sym_identifier,
+      anon_sym_await,
+      sym_true,
+      sym_false,
+      sym_none,
+  [37739] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1438), 13,
+    ACTIONS(1471), 13,
       sym__string_start,
       sym__template_string_start,
       ts_builtin_sym_end,
@@ -55718,7 +55659,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       sym_ellipsis,
       sym_float,
-    ACTIONS(1436), 34,
+    ACTIONS(1469), 34,
       anon_sym_lazy,
       anon_sym_import,
       anon_sym_from,
@@ -55753,6 +55694,75 @@ static const uint16_t ts_small_parse_table[] = {
       sym_true,
       sym_false,
       sym_none,
+  [37794] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(690), 1,
+      sym_identifier,
+    ACTIONS(694), 1,
+      anon_sym_LPAREN,
+    ACTIONS(702), 1,
+      anon_sym_LBRACK,
+    ACTIONS(704), 1,
+      anon_sym_await,
+    ACTIONS(1218), 1,
+      anon_sym_STAR,
+    STATE(627), 1,
+      sym_template_string,
+    STATE(698), 1,
+      sym_string,
+    STATE(1009), 1,
+      sym_pattern,
+    STATE(1016), 1,
+      sym_primary_expression,
+    ACTIONS(309), 2,
+      sym_ellipsis,
+      sym_float,
+    STATE(875), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(301), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    STATE(1014), 3,
+      sym_tuple_pattern,
+      sym_list_pattern,
+      sym_list_splat_pattern,
+    ACTIONS(311), 4,
+      sym_integer,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(692), 6,
+      anon_sym_lazy,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(734), 15,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
   [37883] = 3,
     ACTIONS(3), 1,
       sym_comment,
@@ -55808,14 +55818,14 @@ static const uint16_t ts_small_parse_table[] = {
   [37938] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1206), 1,
+    ACTIONS(587), 1,
       anon_sym_COMMA,
-    ACTIONS(1488), 1,
+    ACTIONS(590), 1,
       anon_sym_COLON_EQ,
-    ACTIONS(1213), 2,
+    ACTIONS(592), 2,
       anon_sym_COLON,
       anon_sym_EQ,
-    ACTIONS(1211), 13,
+    ACTIONS(598), 13,
       anon_sym_PLUS_EQ,
       anon_sym_DASH_EQ,
       anon_sym_STAR_EQ,
@@ -55829,7 +55839,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-    ACTIONS(1204), 14,
+    ACTIONS(303), 14,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_if,
@@ -55844,7 +55854,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-    ACTIONS(1209), 15,
+    ACTIONS(272), 15,
       anon_sym_STAR,
       anon_sym_GT_GT,
       anon_sym_PIPE,
@@ -55863,14 +55873,14 @@ static const uint16_t ts_small_parse_table[] = {
   [38000] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(587), 1,
+    ACTIONS(1238), 1,
       anon_sym_COMMA,
-    ACTIONS(590), 1,
+    ACTIONS(1488), 1,
       anon_sym_COLON_EQ,
-    ACTIONS(592), 2,
+    ACTIONS(1245), 2,
       anon_sym_COLON,
       anon_sym_EQ,
-    ACTIONS(598), 13,
+    ACTIONS(1243), 13,
       anon_sym_PLUS_EQ,
       anon_sym_DASH_EQ,
       anon_sym_STAR_EQ,
@@ -55884,7 +55894,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-    ACTIONS(303), 14,
+    ACTIONS(1236), 14,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_if,
@@ -55899,7 +55909,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-    ACTIONS(272), 15,
+    ACTIONS(1241), 15,
       anon_sym_STAR,
       anon_sym_GT_GT,
       anon_sym_PIPE,
@@ -55932,16 +55942,16 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
     ACTIONS(1496), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(1017), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(1016), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    STATE(860), 2,
+    STATE(877), 2,
       sym_attribute,
       sym_subscript,
     ACTIONS(301), 3,
@@ -55964,7 +55974,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 15,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
       sym_call,
@@ -55983,47 +55993,47 @@ static const uint16_t ts_small_parse_table[] = {
   [38145] = 16,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(83), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(575), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(581), 1,
+    ACTIONS(610), 1,
       anon_sym_await,
     ACTIONS(1498), 1,
       anon_sym_not,
-    STATE(772), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(798), 1,
+    STATE(739), 1,
       sym_primary_expression,
-    ACTIONS(77), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 5,
+    ACTIONS(311), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(573), 6,
+    ACTIONS(583), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56044,47 +56054,47 @@ static const uint16_t ts_small_parse_table[] = {
   [38222] = 16,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(644), 1,
+    ACTIONS(581), 1,
       anon_sym_await,
     ACTIONS(1500), 1,
       anon_sym_not,
-    STATE(694), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(821), 1,
+    STATE(801), 1,
       sym_primary_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 5,
+    ACTIONS(79), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(583), 6,
+    ACTIONS(573), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56105,47 +56115,47 @@ static const uint16_t ts_small_parse_table[] = {
   [38299] = 16,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(622), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(628), 1,
+    ACTIONS(650), 1,
       anon_sym_await,
-    ACTIONS(630), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
     ACTIONS(1502), 1,
       anon_sym_not,
-    STATE(781), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(810), 1,
+    STATE(857), 1,
       sym_primary_expression,
-    ACTIONS(626), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 5,
+    ACTIONS(634), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(614), 6,
+    ACTIONS(636), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(949), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56166,47 +56176,47 @@ static const uint16_t ts_small_parse_table[] = {
   [38376] = 16,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
+    ACTIONS(616), 1,
       anon_sym_LPAREN,
-    ACTIONS(656), 1,
+    ACTIONS(622), 1,
       anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(624), 1,
       anon_sym_LBRACE,
-    ACTIONS(662), 1,
+    ACTIONS(628), 1,
       anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
     ACTIONS(1504), 1,
       anon_sym_not,
-    STATE(790), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(856), 1,
+    STATE(791), 1,
       sym_primary_expression,
-    ACTIONS(660), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 5,
+    ACTIONS(612), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(648), 6,
+    ACTIONS(614), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(985), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56233,24 +56243,24 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(610), 1,
+    ACTIONS(600), 1,
       anon_sym_await,
     ACTIONS(1506), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(764), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(744), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -56267,7 +56277,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56294,24 +56304,24 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
-    ACTIONS(600), 1,
+    ACTIONS(666), 1,
       anon_sym_await,
     ACTIONS(1508), 1,
       anon_sym_not,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(757), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(824), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -56328,7 +56338,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56349,45 +56359,45 @@ static const uint16_t ts_small_parse_table[] = {
   [38607] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(610), 1,
+    ACTIONS(646), 1,
+      anon_sym_LBRACE,
+    ACTIONS(650), 1,
       anon_sym_await,
-    STATE(694), 1,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    STATE(814), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(745), 1,
+    STATE(835), 1,
       sym_primary_expression,
-    ACTIONS(309), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 5,
+    ACTIONS(634), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(583), 6,
+    ACTIONS(636), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56408,19 +56418,19 @@ static const uint16_t ts_small_parse_table[] = {
   [38681] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1514), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    STATE(627), 2,
+    STATE(631), 2,
       sym_template_string,
       aux_sym_concatenated_template_string_repeat1,
-    ACTIONS(1512), 6,
+    ACTIONS(1241), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1510), 33,
+    ACTIONS(1236), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -56457,45 +56467,45 @@ static const uint16_t ts_small_parse_table[] = {
   [38735] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(662), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
+    ACTIONS(602), 1,
+      anon_sym_LPAREN,
+    ACTIONS(608), 1,
+      anon_sym_LBRACK,
+    ACTIONS(610), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(833), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(749), 1,
       sym_primary_expression,
-    ACTIONS(660), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 5,
+    ACTIONS(311), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(648), 6,
+    ACTIONS(583), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(985), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56513,52 +56523,54 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [38809] = 15,
+  [38809] = 17,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(662), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
+    ACTIONS(585), 1,
+      anon_sym_LPAREN,
+    ACTIONS(596), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1510), 1,
+      sym_identifier,
+    ACTIONS(1514), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(864), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(1016), 1,
       sym_primary_expression,
-    ACTIONS(660), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    STATE(1011), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 5,
+    ACTIONS(311), 4,
       sym_integer,
-      sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(648), 6,
+    ACTIONS(1512), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(985), 17,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
       sym_call,
       sym_list,
       sym_set,
@@ -56572,48 +56584,146 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [38883] = 15,
+  [38887] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
+    ACTIONS(315), 1,
+      sym__string_start,
+    STATE(675), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1518), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1516), 33,
+      anon_sym_DOT,
       anon_sym_LPAREN,
-    ACTIONS(622), 1,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
       anon_sym_LBRACK,
-    ACTIONS(624), 1,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [38941] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    STATE(676), 2,
+      sym_template_string,
+      aux_sym_concatenated_template_string_repeat1,
+    ACTIONS(1522), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1520), 33,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [38995] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(638), 1,
+      anon_sym_LPAREN,
+    ACTIONS(644), 1,
+      anon_sym_LBRACK,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(628), 1,
+    ACTIONS(650), 1,
       anon_sym_await,
-    ACTIONS(630), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    STATE(781), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(813), 1,
+    STATE(873), 1,
       sym_primary_expression,
-    ACTIONS(626), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 5,
+    ACTIONS(634), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(614), 6,
+    ACTIONS(636), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(949), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56631,48 +56741,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [38957] = 15,
+  [39069] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(656), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(662), 1,
+    ACTIONS(650), 1,
       anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    STATE(790), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(863), 1,
+    STATE(857), 1,
       sym_primary_expression,
-    ACTIONS(660), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 5,
+    ACTIONS(634), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(648), 6,
+    ACTIONS(636), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(985), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56690,54 +56800,52 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [39031] = 17,
+  [39143] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(1490), 1,
-      sym_identifier,
-    ACTIONS(1496), 1,
+    ACTIONS(646), 1,
+      anon_sym_LBRACE,
+    ACTIONS(650), 1,
       anon_sym_await,
-    STATE(694), 1,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    STATE(814), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(1017), 1,
+    STATE(872), 1,
       sym_primary_expression,
-    ACTIONS(309), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    STATE(860), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 4,
+    ACTIONS(634), 5,
       sym_integer,
+      sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(1492), 6,
+    ACTIONS(636), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 15,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
       sym_call,
       sym_list,
       sym_set,
@@ -56751,48 +56859,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [39109] = 15,
+  [39217] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(656), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(662), 1,
+    ACTIONS(650), 1,
       anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    STATE(790), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(868), 1,
+    STATE(866), 1,
       sym_primary_expression,
-    ACTIONS(660), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 5,
+    ACTIONS(634), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(648), 6,
+    ACTIONS(636), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(985), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56810,48 +56918,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [39183] = 15,
+  [39291] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_LBRACE,
-    ACTIONS(83), 1,
-      sym__string_start,
-    ACTIONS(85), 1,
-      sym__template_string_start,
-    ACTIONS(575), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(581), 1,
+    ACTIONS(646), 1,
+      anon_sym_LBRACE,
+    ACTIONS(650), 1,
       anon_sym_await,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(779), 1,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    STATE(814), 1,
       sym_string,
-    STATE(797), 1,
+    STATE(815), 1,
+      sym_template_string,
+    STATE(871), 1,
       sym_primary_expression,
-    ACTIONS(77), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 5,
+    ACTIONS(634), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(573), 6,
+    ACTIONS(636), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(950), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56869,48 +56977,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [39257] = 15,
+  [39365] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(656), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(662), 1,
+    ACTIONS(650), 1,
       anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    STATE(790), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(865), 1,
+    STATE(839), 1,
       sym_primary_expression,
-    ACTIONS(660), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 5,
+    ACTIONS(634), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(648), 6,
+    ACTIONS(636), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(985), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56928,48 +57036,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [39331] = 15,
+  [39439] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(622), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(628), 1,
+    ACTIONS(650), 1,
       anon_sym_await,
-    ACTIONS(630), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    STATE(781), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(814), 1,
+    STATE(840), 1,
       sym_primary_expression,
-    ACTIONS(626), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 5,
+    ACTIONS(634), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(614), 6,
+    ACTIONS(636), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(949), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -56987,48 +57095,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [39405] = 15,
+  [39513] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_LBRACE,
-    ACTIONS(83), 1,
-      sym__string_start,
-    ACTIONS(85), 1,
-      sym__template_string_start,
-    ACTIONS(575), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(581), 1,
+    ACTIONS(646), 1,
+      anon_sym_LBRACE,
+    ACTIONS(650), 1,
       anon_sym_await,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(779), 1,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    STATE(814), 1,
       sym_string,
-    STATE(798), 1,
+    STATE(815), 1,
+      sym_template_string,
+    STATE(874), 1,
       sym_primary_expression,
-    ACTIONS(77), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 5,
+    ACTIONS(634), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(573), 6,
+    ACTIONS(636), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(950), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57046,48 +57154,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [39479] = 15,
+  [39587] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(622), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(646), 1,
       anon_sym_LBRACE,
-    ACTIONS(628), 1,
+    ACTIONS(650), 1,
       anon_sym_await,
-    ACTIONS(630), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    STATE(781), 1,
+    STATE(814), 1,
       sym_string,
-    STATE(782), 1,
-      sym_template_string,
     STATE(815), 1,
+      sym_template_string,
+    STATE(863), 1,
       sym_primary_expression,
-    ACTIONS(626), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 5,
+    ACTIONS(634), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(614), 6,
+    ACTIONS(636), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(949), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57105,109 +57213,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [39553] = 17,
+  [39661] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(616), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(622), 1,
       anon_sym_LBRACK,
-    ACTIONS(1517), 1,
-      sym_identifier,
-    ACTIONS(1521), 1,
-      anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
-      sym_template_string,
-    STATE(1017), 1,
-      sym_primary_expression,
-    ACTIONS(309), 2,
-      sym_ellipsis,
-      sym_float,
-    STATE(1013), 2,
-      sym_attribute,
-      sym_subscript,
-    ACTIONS(301), 3,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_TILDE,
-    ACTIONS(311), 4,
-      sym_integer,
-      sym_true,
-      sym_false,
-      sym_none,
-    ACTIONS(1519), 6,
-      anon_sym_lazy,
-      anon_sym_print,
-      anon_sym_async,
-      anon_sym_match,
-      anon_sym_exec,
-      anon_sym_type,
-    STATE(720), 15,
-      sym_binary_operator,
-      sym_unary_operator,
-      sym_call,
-      sym_list,
-      sym_set,
-      sym_tuple,
-      sym_dictionary,
-      sym_list_comprehension,
-      sym_dictionary_comprehension,
-      sym_set_comprehension,
-      sym_generator_expression,
-      sym_parenthesized_expression,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-      sym_await,
-  [39631] = 15,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(624), 1,
       anon_sym_LBRACE,
-    ACTIONS(83), 1,
+    ACTIONS(628), 1,
+      anon_sym_await,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    ACTIONS(575), 1,
-      anon_sym_LPAREN,
-    ACTIONS(579), 1,
-      anon_sym_LBRACK,
-    ACTIONS(581), 1,
-      anon_sym_await,
+    STATE(771), 1,
+      sym_string,
     STATE(772), 1,
       sym_template_string,
-    STATE(779), 1,
-      sym_string,
-    STATE(801), 1,
+    STATE(789), 1,
       sym_primary_expression,
-    ACTIONS(77), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 5,
+    ACTIONS(612), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(573), 6,
+    ACTIONS(614), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(950), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57225,48 +57272,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [39705] = 15,
+  [39735] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
+    ACTIONS(616), 1,
       anon_sym_LPAREN,
-    ACTIONS(656), 1,
+    ACTIONS(622), 1,
       anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(624), 1,
       anon_sym_LBRACE,
-    ACTIONS(662), 1,
+    ACTIONS(628), 1,
       anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(630), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    STATE(790), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(845), 1,
+    STATE(790), 1,
       sym_primary_expression,
-    ACTIONS(660), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 5,
+    ACTIONS(612), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(648), 6,
+    ACTIONS(614), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(985), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57284,7 +57331,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [39779] = 15,
+  [39809] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(616), 1,
@@ -57299,11 +57346,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(632), 1,
       sym__template_string_start,
-    STATE(781), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(804), 1,
+    STATE(791), 1,
       sym_primary_expression,
     ACTIONS(626), 2,
       sym_ellipsis,
@@ -57325,7 +57372,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(949), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57343,48 +57390,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [39853] = 15,
+  [39883] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_LBRACE,
-    ACTIONS(83), 1,
-      sym__string_start,
-    ACTIONS(85), 1,
-      sym__template_string_start,
-    ACTIONS(575), 1,
+    ACTIONS(616), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(622), 1,
       anon_sym_LBRACK,
-    ACTIONS(581), 1,
+    ACTIONS(624), 1,
+      anon_sym_LBRACE,
+    ACTIONS(628), 1,
       anon_sym_await,
+    ACTIONS(630), 1,
+      sym__string_start,
+    ACTIONS(632), 1,
+      sym__template_string_start,
+    STATE(771), 1,
+      sym_string,
     STATE(772), 1,
       sym_template_string,
-    STATE(779), 1,
-      sym_string,
-    STATE(818), 1,
+    STATE(792), 1,
       sym_primary_expression,
-    ACTIONS(77), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 5,
+    ACTIONS(612), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(573), 6,
+    ACTIONS(614), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(950), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57402,48 +57449,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [39927] = 15,
+  [39957] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_LBRACE,
-    ACTIONS(83), 1,
-      sym__string_start,
-    ACTIONS(85), 1,
-      sym__template_string_start,
-    ACTIONS(575), 1,
+    ACTIONS(616), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(622), 1,
       anon_sym_LBRACK,
-    ACTIONS(581), 1,
+    ACTIONS(624), 1,
+      anon_sym_LBRACE,
+    ACTIONS(628), 1,
       anon_sym_await,
+    ACTIONS(630), 1,
+      sym__string_start,
+    ACTIONS(632), 1,
+      sym__template_string_start,
+    STATE(771), 1,
+      sym_string,
     STATE(772), 1,
       sym_template_string,
-    STATE(779), 1,
-      sym_string,
-    STATE(796), 1,
+    STATE(793), 1,
       sym_primary_expression,
-    ACTIONS(77), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 5,
+    ACTIONS(612), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(573), 6,
+    ACTIONS(614), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(950), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57461,48 +57508,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40001] = 15,
+  [40031] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(616), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(622), 1,
       anon_sym_LBRACK,
-    ACTIONS(610), 1,
+    ACTIONS(624), 1,
+      anon_sym_LBRACE,
+    ACTIONS(628), 1,
       anon_sym_await,
-    STATE(694), 1,
+    ACTIONS(630), 1,
+      sym__string_start,
+    ACTIONS(632), 1,
+      sym__template_string_start,
+    STATE(771), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(751), 1,
+    STATE(794), 1,
       sym_primary_expression,
-    ACTIONS(309), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 5,
+    ACTIONS(612), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(583), 6,
+    ACTIONS(614), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57520,48 +57567,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40075] = 15,
+  [40105] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_LBRACE,
-    ACTIONS(83), 1,
-      sym__string_start,
-    ACTIONS(85), 1,
-      sym__template_string_start,
-    ACTIONS(575), 1,
+    ACTIONS(616), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(622), 1,
       anon_sym_LBRACK,
-    ACTIONS(581), 1,
+    ACTIONS(624), 1,
+      anon_sym_LBRACE,
+    ACTIONS(628), 1,
       anon_sym_await,
+    ACTIONS(630), 1,
+      sym__string_start,
+    ACTIONS(632), 1,
+      sym__template_string_start,
+    STATE(771), 1,
+      sym_string,
     STATE(772), 1,
       sym_template_string,
-    STATE(779), 1,
-      sym_string,
-    STATE(803), 1,
+    STATE(795), 1,
       sym_primary_expression,
-    ACTIONS(77), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 5,
+    ACTIONS(612), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(573), 6,
+    ACTIONS(614), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(950), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57579,48 +57626,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40149] = 15,
+  [40179] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_LBRACE,
-    ACTIONS(83), 1,
-      sym__string_start,
-    ACTIONS(85), 1,
-      sym__template_string_start,
-    ACTIONS(575), 1,
+    ACTIONS(616), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(622), 1,
       anon_sym_LBRACK,
-    ACTIONS(581), 1,
+    ACTIONS(624), 1,
+      anon_sym_LBRACE,
+    ACTIONS(628), 1,
       anon_sym_await,
+    ACTIONS(630), 1,
+      sym__string_start,
+    ACTIONS(632), 1,
+      sym__template_string_start,
+    STATE(771), 1,
+      sym_string,
     STATE(772), 1,
       sym_template_string,
-    STATE(779), 1,
-      sym_string,
-    STATE(788), 1,
+    STATE(796), 1,
       sym_primary_expression,
-    ACTIONS(77), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 5,
+    ACTIONS(612), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(573), 6,
+    ACTIONS(614), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(950), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57638,48 +57685,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40223] = 15,
+  [40253] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
-      anon_sym_LBRACE,
-    ACTIONS(83), 1,
-      sym__string_start,
-    ACTIONS(85), 1,
-      sym__template_string_start,
-    ACTIONS(575), 1,
+    ACTIONS(616), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(622), 1,
       anon_sym_LBRACK,
-    ACTIONS(581), 1,
+    ACTIONS(624), 1,
+      anon_sym_LBRACE,
+    ACTIONS(628), 1,
       anon_sym_await,
+    ACTIONS(630), 1,
+      sym__string_start,
+    ACTIONS(632), 1,
+      sym__template_string_start,
+    STATE(771), 1,
+      sym_string,
     STATE(772), 1,
       sym_template_string,
-    STATE(779), 1,
-      sym_string,
-    STATE(800), 1,
+    STATE(797), 1,
       sym_primary_expression,
-    ACTIONS(77), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 5,
+    ACTIONS(612), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(573), 6,
+    ACTIONS(614), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(950), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57697,48 +57744,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40297] = 15,
+  [40327] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(616), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(622), 1,
       anon_sym_LBRACK,
-    ACTIONS(610), 1,
+    ACTIONS(624), 1,
+      anon_sym_LBRACE,
+    ACTIONS(628), 1,
       anon_sym_await,
-    STATE(694), 1,
+    ACTIONS(630), 1,
+      sym__string_start,
+    ACTIONS(632), 1,
+      sym__template_string_start,
+    STATE(771), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(752), 1,
+    STATE(798), 1,
       sym_primary_expression,
-    ACTIONS(309), 2,
+    ACTIONS(626), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(620), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 5,
+    ACTIONS(612), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(583), 6,
+    ACTIONS(614), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57756,7 +57803,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40371] = 15,
+  [40401] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -57771,11 +57818,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(610), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(764), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(751), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -57797,7 +57844,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57815,48 +57862,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40445] = 15,
+  [40475] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(628), 1,
-      anon_sym_await,
-    ACTIONS(630), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    STATE(781), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    ACTIONS(581), 1,
+      anon_sym_await,
+    STATE(783), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(816), 1,
+    STATE(805), 1,
       sym_primary_expression,
-    ACTIONS(626), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 5,
+    ACTIONS(79), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(614), 6,
+    ACTIONS(573), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(949), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57874,48 +57921,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40519] = 15,
+  [40549] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(628), 1,
-      anon_sym_await,
-    ACTIONS(630), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    STATE(781), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    ACTIONS(581), 1,
+      anon_sym_await,
+    STATE(783), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(817), 1,
+    STATE(788), 1,
       sym_primary_expression,
-    ACTIONS(626), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 5,
+    ACTIONS(79), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(614), 6,
+    ACTIONS(573), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(949), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57933,7 +57980,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40593] = 15,
+  [40623] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(53), 1,
@@ -57948,11 +57995,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(581), 1,
       anon_sym_await,
-    STATE(772), 1,
-      sym_template_string,
-    STATE(779), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(806), 1,
+    STATE(784), 1,
+      sym_template_string,
+    STATE(799), 1,
       sym_primary_expression,
     ACTIONS(77), 2,
       sym_ellipsis,
@@ -57974,7 +58021,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(950), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -57992,48 +58039,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40667] = 15,
+  [40697] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(610), 1,
+    ACTIONS(581), 1,
       anon_sym_await,
-    STATE(694), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(742), 1,
+    STATE(800), 1,
       sym_primary_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 5,
+    ACTIONS(79), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(583), 6,
+    ACTIONS(573), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58051,48 +58098,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40741] = 15,
+  [40771] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(610), 1,
+    ACTIONS(581), 1,
       anon_sym_await,
-    STATE(694), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(743), 1,
+    STATE(801), 1,
       sym_primary_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 5,
+    ACTIONS(79), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(583), 6,
+    ACTIONS(573), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58110,48 +58157,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40815] = 15,
+  [40845] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(610), 1,
+    ACTIONS(581), 1,
       anon_sym_await,
-    STATE(694), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(744), 1,
+    STATE(802), 1,
       sym_primary_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 5,
+    ACTIONS(79), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(583), 6,
+    ACTIONS(573), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58169,48 +58216,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40889] = 15,
+  [40919] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(628), 1,
-      anon_sym_await,
-    ACTIONS(630), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    STATE(781), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    ACTIONS(581), 1,
+      anon_sym_await,
+    STATE(783), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(830), 1,
+    STATE(803), 1,
       sym_primary_expression,
-    ACTIONS(626), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 5,
+    ACTIONS(79), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(614), 6,
+    ACTIONS(573), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(949), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58228,48 +58275,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [40963] = 15,
+  [40993] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(662), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    STATE(790), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    ACTIONS(581), 1,
+      anon_sym_await,
+    STATE(783), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(867), 1,
+    STATE(804), 1,
       sym_primary_expression,
-    ACTIONS(660), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 5,
+    ACTIONS(79), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(648), 6,
+    ACTIONS(573), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(985), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58287,48 +58334,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41037] = 15,
+  [41067] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(610), 1,
+    ACTIONS(581), 1,
       anon_sym_await,
-    STATE(694), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(746), 1,
+    STATE(806), 1,
       sym_primary_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 5,
+    ACTIONS(79), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(583), 6,
+    ACTIONS(573), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58346,48 +58393,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41111] = 15,
+  [41141] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(662), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    STATE(790), 1,
+    ACTIONS(575), 1,
+      anon_sym_LPAREN,
+    ACTIONS(579), 1,
+      anon_sym_LBRACK,
+    ACTIONS(581), 1,
+      anon_sym_await,
+    STATE(783), 1,
       sym_string,
-    STATE(791), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(866), 1,
+    STATE(807), 1,
       sym_primary_expression,
-    ACTIONS(660), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 5,
+    ACTIONS(79), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(648), 6,
+    ACTIONS(573), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(985), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58405,7 +58452,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41185] = 15,
+  [41215] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -58414,22 +58461,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(644), 1,
+    ACTIONS(610), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(819), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(759), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -58446,7 +58493,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58464,7 +58511,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41259] = 15,
+  [41289] = 17,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -58473,43 +58520,45 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(644), 1,
+    ACTIONS(1490), 1,
+      sym_identifier,
+    ACTIONS(1496), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(820), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(1016), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    STATE(877), 2,
+      sym_attribute,
+      sym_subscript,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 5,
+    ACTIONS(311), 4,
       sym_integer,
-      sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(583), 6,
+    ACTIONS(1492), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 15,
       sym_binary_operator,
       sym_unary_operator,
-      sym_attribute,
-      sym_subscript,
       sym_call,
       sym_list,
       sym_set,
@@ -58523,7 +58572,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41333] = 15,
+  [41367] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -58532,22 +58581,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(644), 1,
+    ACTIONS(600), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(821), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(742), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -58564,7 +58613,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58582,7 +58631,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41407] = 15,
+  [41441] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -58591,22 +58640,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(644), 1,
+    ACTIONS(600), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(823), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(743), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -58623,7 +58672,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58641,7 +58690,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41481] = 15,
+  [41515] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -58650,22 +58699,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(644), 1,
+    ACTIONS(600), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(824), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(744), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -58682,7 +58731,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58700,7 +58749,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41555] = 15,
+  [41589] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -58709,22 +58758,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(644), 1,
+    ACTIONS(600), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(825), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(748), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -58741,7 +58790,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58759,7 +58808,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41629] = 15,
+  [41663] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -58768,22 +58817,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(644), 1,
+    ACTIONS(600), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(826), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(755), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -58800,7 +58849,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58818,48 +58867,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41703] = 15,
+  [41737] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(83), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(575), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(581), 1,
+    ACTIONS(600), 1,
       anon_sym_await,
-    STATE(772), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(802), 1,
+    STATE(758), 1,
       sym_primary_expression,
-    ACTIONS(77), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 5,
+    ACTIONS(311), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(573), 6,
+    ACTIONS(583), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58877,7 +58926,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41777] = 15,
+  [41811] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -58886,22 +58935,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(602), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(608), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(610), 1,
+    ACTIONS(600), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(740), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(763), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(606), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -58918,7 +58967,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58936,7 +58985,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41851] = 15,
+  [41885] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -58945,22 +58994,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(644), 1,
+    ACTIONS(600), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(827), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(765), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -58977,7 +59026,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -58995,7 +59044,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41925] = 15,
+  [41959] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -59004,22 +59053,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(644), 1,
+    ACTIONS(600), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(828), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(740), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -59036,7 +59085,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59054,48 +59103,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [41999] = 15,
+  [42033] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(628), 1,
-      anon_sym_await,
-    ACTIONS(630), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    STATE(781), 1,
-      sym_string,
-    STATE(782), 1,
+    ACTIONS(585), 1,
+      anon_sym_LPAREN,
+    ACTIONS(596), 1,
+      anon_sym_LBRACK,
+    ACTIONS(600), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(809), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(741), 1,
       sym_primary_expression,
-    ACTIONS(626), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 5,
+    ACTIONS(311), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(614), 6,
+    ACTIONS(583), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(949), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59113,7 +59162,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [42073] = 15,
+  [42107] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -59122,22 +59171,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(585), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(596), 1,
       anon_sym_LBRACK,
-    ACTIONS(644), 1,
+    ACTIONS(600), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(829), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(746), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(301), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -59154,7 +59203,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59172,7 +59221,105 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [42147] = 15,
+  [42181] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1528), 1,
+      sym__string_start,
+    STATE(675), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1526), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1524), 33,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [42235] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1535), 1,
+      sym__template_string_start,
+    STATE(676), 2,
+      sym_template_string,
+      aux_sym_concatenated_template_string_repeat1,
+    ACTIONS(1533), 6,
+      anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1531), 33,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [42289] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -59181,22 +59328,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(600), 1,
+    ACTIONS(610), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(755), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(750), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -59213,7 +59360,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59231,7 +59378,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [42221] = 15,
+  [42363] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -59246,11 +59393,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(610), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(741), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(752), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -59272,7 +59419,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59290,48 +59437,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [42295] = 15,
+  [42437] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_LBRACE,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(638), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(644), 1,
       anon_sym_LBRACK,
-    ACTIONS(600), 1,
+    ACTIONS(646), 1,
+      anon_sym_LBRACE,
+    ACTIONS(650), 1,
       anon_sym_await,
-    STATE(694), 1,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    STATE(814), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(815), 1,
       sym_template_string,
-    STATE(756), 1,
+    STATE(843), 1,
       sym_primary_expression,
-    ACTIONS(309), 2,
+    ACTIONS(648), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(642), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 5,
+    ACTIONS(634), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(583), 6,
+    ACTIONS(636), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(960), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59349,7 +59496,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [42369] = 15,
+  [42511] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -59358,22 +59505,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(600), 1,
+    ACTIONS(610), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(757), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(739), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -59390,7 +59537,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59408,7 +59555,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [42443] = 15,
+  [42585] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -59417,22 +59564,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(600), 1,
+    ACTIONS(610), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(739), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(756), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -59449,7 +59596,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59467,7 +59614,66 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [42517] = 15,
+  [42659] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(602), 1,
+      anon_sym_LPAREN,
+    ACTIONS(608), 1,
+      anon_sym_LBRACK,
+    ACTIONS(610), 1,
+      anon_sym_await,
+    STATE(627), 1,
+      sym_template_string,
+    STATE(698), 1,
+      sym_string,
+    STATE(761), 1,
+      sym_primary_expression,
+    ACTIONS(309), 2,
+      sym_ellipsis,
+      sym_float,
+    ACTIONS(606), 3,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_TILDE,
+    ACTIONS(311), 5,
+      sym_integer,
+      sym_identifier,
+      sym_true,
+      sym_false,
+      sym_none,
+    ACTIONS(583), 6,
+      anon_sym_lazy,
+      anon_sym_print,
+      anon_sym_async,
+      anon_sym_match,
+      anon_sym_exec,
+      anon_sym_type,
+    STATE(734), 17,
+      sym_binary_operator,
+      sym_unary_operator,
+      sym_attribute,
+      sym_subscript,
+      sym_call,
+      sym_list,
+      sym_set,
+      sym_tuple,
+      sym_dictionary,
+      sym_list_comprehension,
+      sym_dictionary_comprehension,
+      sym_set_comprehension,
+      sym_generator_expression,
+      sym_parenthesized_expression,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+      sym_await,
+  [42733] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(616), 1,
@@ -59482,11 +59688,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(632), 1,
       sym__template_string_start,
-    STATE(781), 1,
+    STATE(771), 1,
       sym_string,
-    STATE(782), 1,
+    STATE(772), 1,
       sym_template_string,
-    STATE(811), 1,
+    STATE(812), 1,
       sym_primary_expression,
     ACTIONS(626), 2,
       sym_ellipsis,
@@ -59508,7 +59714,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(949), 17,
+    STATE(879), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59526,7 +59732,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [42591] = 15,
+  [42807] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -59535,22 +59741,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(600), 1,
+    ACTIONS(610), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(758), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(764), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -59567,7 +59773,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59585,48 +59791,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [42665] = 15,
+  [42881] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 1,
+    ACTIONS(53), 1,
       anon_sym_LBRACE,
-    ACTIONS(315), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    ACTIONS(317), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(575), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(579), 1,
       anon_sym_LBRACK,
-    ACTIONS(600), 1,
+    ACTIONS(581), 1,
       anon_sym_await,
-    STATE(694), 1,
+    STATE(783), 1,
       sym_string,
-    STATE(698), 1,
+    STATE(784), 1,
       sym_template_string,
-    STATE(759), 1,
+    STATE(809), 1,
       sym_primary_expression,
-    ACTIONS(309), 2,
+    ACTIONS(77), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(49), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(311), 5,
+    ACTIONS(79), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(583), 6,
+    ACTIONS(573), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(905), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59644,7 +59850,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [42739] = 15,
+  [42955] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -59653,22 +59859,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
-    ACTIONS(600), 1,
+    ACTIONS(666), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(760), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(822), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -59685,7 +59891,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59703,7 +59909,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [42813] = 15,
+  [43029] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -59712,22 +59918,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
-    ACTIONS(600), 1,
+    ACTIONS(666), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(761), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(823), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -59744,7 +59950,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59762,48 +59968,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [42887] = 15,
+  [43103] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(662), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
+    ACTIONS(658), 1,
+      anon_sym_LPAREN,
+    ACTIONS(664), 1,
+      anon_sym_LBRACK,
+    ACTIONS(666), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(862), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(824), 1,
       sym_primary_expression,
-    ACTIONS(660), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 5,
+    ACTIONS(311), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(648), 6,
+    ACTIONS(583), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(985), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59821,56 +60027,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [42961] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1527), 1,
-      sym__string_start,
-    STATE(685), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1525), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1523), 33,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [43015] = 15,
+  [43177] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -59879,22 +60036,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
-    ACTIONS(600), 1,
+    ACTIONS(666), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(762), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(825), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -59911,7 +60068,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59929,7 +60086,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [43089] = 15,
+  [43251] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -59938,22 +60095,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
-    ACTIONS(600), 1,
+    ACTIONS(666), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(763), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(826), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -59970,7 +60127,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -59988,7 +60145,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [43163] = 15,
+  [43325] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -59997,22 +60154,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(585), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(596), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
-    ACTIONS(600), 1,
+    ACTIONS(666), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(765), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(827), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(301), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -60029,7 +60186,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -60047,48 +60204,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [43237] = 15,
+  [43399] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(616), 1,
-      anon_sym_LPAREN,
-    ACTIONS(622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(624), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(628), 1,
-      anon_sym_await,
-    ACTIONS(630), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(632), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    STATE(781), 1,
-      sym_string,
-    STATE(782), 1,
+    ACTIONS(658), 1,
+      anon_sym_LPAREN,
+    ACTIONS(664), 1,
+      anon_sym_LBRACK,
+    ACTIONS(666), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(812), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(828), 1,
       sym_primary_expression,
-    ACTIONS(626), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 5,
+    ACTIONS(311), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(614), 6,
+    ACTIONS(583), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(949), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -60106,97 +60263,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [43311] = 5,
+  [43473] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(315), 1,
-      sym__string_start,
-    STATE(685), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1532), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1530), 33,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [43365] = 15,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(53), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(83), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(85), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(575), 1,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(579), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
-    ACTIONS(581), 1,
+    ACTIONS(666), 1,
       anon_sym_await,
-    STATE(772), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(779), 1,
+    STATE(698), 1,
       sym_string,
-    STATE(807), 1,
+    STATE(829), 1,
       sym_primary_expression,
-    ACTIONS(77), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(49), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(79), 5,
+    ACTIONS(311), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(573), 6,
+    ACTIONS(583), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(950), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -60214,7 +60322,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [43439] = 15,
+  [43547] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(293), 1,
@@ -60229,11 +60337,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(610), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(748), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(754), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
@@ -60255,7 +60363,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -60273,146 +60381,48 @@ static const uint16_t ts_small_parse_table[] = {
       sym_concatenated_string,
       sym_concatenated_template_string,
       sym_await,
-  [43513] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    STATE(627), 2,
-      sym_template_string,
-      aux_sym_concatenated_template_string_repeat1,
-    ACTIONS(1536), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1534), 33,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [43567] = 5,
+  [43621] = 15,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_LBRACE,
     ACTIONS(315), 1,
       sym__string_start,
-    STATE(690), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1209), 6,
-      anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1204), 33,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [43621] = 15,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(616), 1,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(658), 1,
       anon_sym_LPAREN,
-    ACTIONS(622), 1,
+    ACTIONS(664), 1,
       anon_sym_LBRACK,
-    ACTIONS(624), 1,
-      anon_sym_LBRACE,
-    ACTIONS(628), 1,
+    ACTIONS(666), 1,
       anon_sym_await,
-    ACTIONS(630), 1,
-      sym__string_start,
-    ACTIONS(632), 1,
-      sym__template_string_start,
-    STATE(781), 1,
-      sym_string,
-    STATE(782), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(810), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(830), 1,
       sym_primary_expression,
-    ACTIONS(626), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(620), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(612), 5,
+    ACTIONS(311), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(614), 6,
+    ACTIONS(583), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(949), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -60433,45 +60443,45 @@ static const uint16_t ts_small_parse_table[] = {
   [43695] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(662), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
+    ACTIONS(658), 1,
+      anon_sym_LPAREN,
+    ACTIONS(664), 1,
+      anon_sym_LBRACK,
+    ACTIONS(666), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(856), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(831), 1,
       sym_primary_expression,
-    ACTIONS(660), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 5,
+    ACTIONS(311), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(648), 6,
+    ACTIONS(583), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(985), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -60492,45 +60502,45 @@ static const uint16_t ts_small_parse_table[] = {
   [43769] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 1,
-      anon_sym_LPAREN,
-    ACTIONS(656), 1,
-      anon_sym_LBRACK,
-    ACTIONS(658), 1,
+    ACTIONS(293), 1,
       anon_sym_LBRACE,
-    ACTIONS(662), 1,
-      anon_sym_await,
-    ACTIONS(664), 1,
+    ACTIONS(315), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(317), 1,
       sym__template_string_start,
-    STATE(790), 1,
-      sym_string,
-    STATE(791), 1,
+    ACTIONS(658), 1,
+      anon_sym_LPAREN,
+    ACTIONS(664), 1,
+      anon_sym_LBRACK,
+    ACTIONS(666), 1,
+      anon_sym_await,
+    STATE(627), 1,
       sym_template_string,
-    STATE(844), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(833), 1,
       sym_primary_expression,
-    ACTIONS(660), 2,
+    ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(654), 3,
+    ACTIONS(662), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
-    ACTIONS(646), 5,
+    ACTIONS(311), 5,
       sym_integer,
       sym_identifier,
       sym_true,
       sym_false,
       sym_none,
-    ACTIONS(648), 6,
+    ACTIONS(583), 6,
       anon_sym_lazy,
       anon_sym_print,
       anon_sym_async,
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(985), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -60551,19 +60561,19 @@ static const uint16_t ts_small_parse_table[] = {
   [43843] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    STATE(693), 2,
-      sym_template_string,
-      aux_sym_concatenated_template_string_repeat1,
-    ACTIONS(1209), 6,
+    ACTIONS(315), 1,
+      sym__string_start,
+    STATE(630), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1241), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 33,
+    ACTIONS(1236), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -60606,22 +60616,22 @@ static const uint16_t ts_small_parse_table[] = {
       sym__string_start,
     ACTIONS(317), 1,
       sym__template_string_start,
-    ACTIONS(636), 1,
+    ACTIONS(602), 1,
       anon_sym_LPAREN,
-    ACTIONS(642), 1,
+    ACTIONS(608), 1,
       anon_sym_LBRACK,
-    ACTIONS(644), 1,
+    ACTIONS(610), 1,
       anon_sym_await,
-    STATE(694), 1,
-      sym_string,
-    STATE(698), 1,
+    STATE(627), 1,
       sym_template_string,
-    STATE(822), 1,
+    STATE(698), 1,
+      sym_string,
+    STATE(760), 1,
       sym_primary_expression,
     ACTIONS(309), 2,
       sym_ellipsis,
       sym_float,
-    ACTIONS(640), 3,
+    ACTIONS(606), 3,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_TILDE,
@@ -60638,7 +60648,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_match,
       anon_sym_exec,
       anon_sym_type,
-    STATE(720), 17,
+    STATE(734), 17,
       sym_binary_operator,
       sym_unary_operator,
       sym_attribute,
@@ -60667,7 +60677,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(1538), 34,
-      sym__template_string_start,
+      sym__string_start,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -60712,7 +60722,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(1542), 34,
-      sym__template_string_start,
+      sym__string_start,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -60757,7 +60767,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(1546), 34,
-      sym__string_start,
+      sym__template_string_start,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -60802,7 +60812,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(1550), 34,
-      sym__string_start,
+      sym__template_string_start,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -60836,139 +60846,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44163] = 20,
+  [44163] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
-      anon_sym_DOT,
-    ACTIONS(1556), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1566), 1,
-      anon_sym_PIPE,
-    ACTIONS(1570), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1572), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1574), 1,
-      anon_sym_EQ,
-    ACTIONS(1578), 1,
-      anon_sym_not,
-    ACTIONS(1580), 1,
-      anon_sym_AMP,
-    ACTIONS(1582), 1,
-      anon_sym_CARET,
-    ACTIONS(1586), 1,
-      anon_sym_is,
-    STATE(997), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1560), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1562), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1568), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(1584), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    STATE(708), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1576), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1564), 6,
-      anon_sym_in,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-    ACTIONS(1558), 9,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_and,
-      anon_sym_or,
-  [44244] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1554), 1,
-      anon_sym_DOT,
-    ACTIONS(1556), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1570), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1574), 1,
-      anon_sym_as,
-    ACTIONS(1594), 1,
-      anon_sym_PIPE,
-    ACTIONS(1598), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1602), 1,
-      anon_sym_not,
-    ACTIONS(1604), 1,
-      anon_sym_AMP,
-    ACTIONS(1606), 1,
-      anon_sym_CARET,
-    ACTIONS(1610), 1,
-      anon_sym_is,
-    STATE(998), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1588), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1590), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1596), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(1608), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    STATE(708), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1600), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1592), 6,
-      anon_sym_in,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-    ACTIONS(1558), 9,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_and,
-      anon_sym_or,
-  [44325] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(272), 6,
+    ACTIONS(1556), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 33,
+    ACTIONS(1554), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61002,17 +60890,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44372] = 3,
+  [44210] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1614), 6,
+    ACTIONS(1560), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1612), 33,
+    ACTIONS(1558), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61046,17 +60934,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44419] = 3,
+  [44257] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1618), 6,
+    ACTIONS(1564), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1616), 33,
+    ACTIONS(1562), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61090,25 +60978,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44466] = 3,
+  [44304] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1622), 6,
+    ACTIONS(1478), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1620), 33,
+    ACTIONS(1473), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_in,
@@ -61134,25 +61020,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44513] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [44351] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1626), 6,
+    ACTIONS(1311), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1624), 33,
+    ACTIONS(1306), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_in,
@@ -61178,17 +61064,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44560] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [44398] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1630), 6,
+    ACTIONS(1568), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1628), 33,
+    ACTIONS(1566), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61222,17 +61110,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44607] = 3,
+  [44445] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1634), 6,
+    ACTIONS(1572), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1632), 33,
+    ACTIONS(1570), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61266,17 +61154,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44654] = 3,
+  [44492] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1638), 6,
+    ACTIONS(1576), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1636), 33,
+    ACTIONS(1574), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61310,17 +61198,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44701] = 3,
+  [44539] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1642), 6,
+    ACTIONS(1580), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1640), 33,
+    ACTIONS(1578), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61354,17 +61242,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44748] = 3,
+  [44586] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1646), 6,
+    ACTIONS(1584), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1644), 33,
+    ACTIONS(1582), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61398,17 +61286,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44795] = 3,
+  [44633] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1650), 6,
+    ACTIONS(272), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1648), 33,
+    ACTIONS(303), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61442,17 +61330,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44842] = 3,
+  [44680] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1654), 6,
+    ACTIONS(1588), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1652), 33,
+    ACTIONS(1586), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61486,17 +61374,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44889] = 3,
+  [44727] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1658), 6,
+    ACTIONS(1592), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1656), 33,
+    ACTIONS(1590), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61530,17 +61418,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44936] = 3,
+  [44774] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1662), 6,
+    ACTIONS(1596), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1660), 33,
+    ACTIONS(1594), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61574,17 +61462,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [44983] = 3,
+  [44821] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1209), 6,
+    ACTIONS(1592), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 33,
+    ACTIONS(1590), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61618,17 +61506,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45030] = 3,
+  [44868] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1666), 6,
+    ACTIONS(1600), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1664), 33,
+    ACTIONS(1598), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61662,17 +61550,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45077] = 3,
+  [44915] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1670), 6,
+    ACTIONS(1604), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1668), 33,
+    ACTIONS(1602), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61706,17 +61594,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45124] = 3,
+  [44962] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1674), 6,
+    ACTIONS(1592), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1672), 33,
+    ACTIONS(1590), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61750,17 +61638,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45171] = 3,
+  [45009] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1678), 6,
+    ACTIONS(1608), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1676), 33,
+    ACTIONS(1606), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61794,17 +61682,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45218] = 3,
+  [45056] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1682), 6,
+    ACTIONS(1612), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1680), 33,
+    ACTIONS(1610), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61838,17 +61726,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45265] = 3,
+  [45103] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1686), 6,
+    ACTIONS(1616), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1684), 33,
+    ACTIONS(1614), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61882,17 +61770,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45312] = 3,
+  [45150] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1690), 6,
+    ACTIONS(1620), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1688), 33,
+    ACTIONS(1618), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61926,17 +61814,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45359] = 3,
+  [45197] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1690), 6,
+    ACTIONS(1624), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1688), 33,
+    ACTIONS(1622), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -61970,17 +61858,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45406] = 3,
+  [45244] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1694), 6,
+    ACTIONS(1628), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1692), 33,
+    ACTIONS(1626), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -62014,17 +61902,78 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45453] = 3,
+  [45291] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1698), 6,
+    ACTIONS(1630), 1,
+      anon_sym_DOT,
+    ACTIONS(1632), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1642), 1,
+      anon_sym_PIPE,
+    ACTIONS(1646), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1648), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1650), 1,
+      anon_sym_EQ,
+    ACTIONS(1654), 1,
+      anon_sym_not,
+    ACTIONS(1656), 1,
+      anon_sym_AMP,
+    ACTIONS(1658), 1,
+      anon_sym_CARET,
+    ACTIONS(1662), 1,
+      anon_sym_is,
+    STATE(999), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1636), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1638), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1644), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(1660), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    STATE(731), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1652), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1640), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1634), 9,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_and,
+      anon_sym_or,
+  [45372] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1666), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1696), 33,
+    ACTIONS(1664), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -62058,17 +62007,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45500] = 3,
+  [45419] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1690), 6,
+    ACTIONS(1670), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1688), 33,
+    ACTIONS(1668), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -62102,17 +62051,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45547] = 3,
+  [45466] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1702), 6,
+    ACTIONS(1674), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1700), 33,
+    ACTIONS(1672), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -62146,17 +62095,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45594] = 3,
+  [45513] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1702), 6,
+    ACTIONS(1678), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1700), 33,
+    ACTIONS(1676), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -62190,17 +62139,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45641] = 3,
+  [45560] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1706), 6,
+    ACTIONS(1682), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1704), 33,
+    ACTIONS(1680), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -62234,17 +62183,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45688] = 3,
+  [45607] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1702), 6,
+    ACTIONS(1241), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1700), 33,
+    ACTIONS(1236), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -62278,23 +62227,86 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
+  [45654] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1630), 1,
+      anon_sym_DOT,
+    ACTIONS(1632), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1646), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1650), 1,
+      anon_sym_as,
+    ACTIONS(1690), 1,
+      anon_sym_PIPE,
+    ACTIONS(1694), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1698), 1,
+      anon_sym_not,
+    ACTIONS(1700), 1,
+      anon_sym_AMP,
+    ACTIONS(1702), 1,
+      anon_sym_CARET,
+    ACTIONS(1706), 1,
+      anon_sym_is,
+    STATE(998), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1684), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1686), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1692), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(1704), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    STATE(731), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1696), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1688), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1634), 9,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_and,
+      anon_sym_or,
   [45735] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1338), 6,
+    ACTIONS(1576), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1333), 33,
+    ACTIONS(1574), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_in,
@@ -62320,25 +62332,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
   [45782] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1295), 6,
+    ACTIONS(1576), 6,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1290), 33,
+    ACTIONS(1574), 33,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_async,
       anon_sym_for,
       anon_sym_in,
@@ -62364,8 +62376,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
   [45829] = 3,
     ACTIONS(3), 1,
       sym_comment,
@@ -62410,98 +62420,44 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [45876] = 14,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1554), 1,
-      anon_sym_DOT,
-    ACTIONS(1556), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1570), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1572), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1580), 1,
-      anon_sym_AMP,
-    ACTIONS(1582), 1,
-      anon_sym_CARET,
-    ACTIONS(1560), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1562), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1568), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(708), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1576), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1714), 3,
-      anon_sym_EQ,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1712), 18,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [45944] = 15,
+  [45876] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1594), 1,
+    ACTIONS(1690), 1,
       anon_sym_PIPE,
-    ACTIONS(1598), 1,
+    ACTIONS(1694), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1604), 1,
+    ACTIONS(1700), 1,
       anon_sym_AMP,
-    ACTIONS(1606), 1,
+    ACTIONS(1702), 1,
       anon_sym_CARET,
-    ACTIONS(1588), 2,
+    ACTIONS(1684), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1590), 2,
+    ACTIONS(1686), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1596), 2,
+    ACTIONS(1692), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1600), 3,
+    ACTIONS(1696), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1718), 3,
+    ACTIONS(1714), 3,
       anon_sym_as,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1716), 17,
+    ACTIONS(1712), 17,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
@@ -62519,49 +62475,49 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46014] = 15,
+  [45946] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1594), 1,
+    ACTIONS(1642), 1,
       anon_sym_PIPE,
-    ACTIONS(1598), 1,
+    ACTIONS(1646), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1648), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1604), 1,
+    ACTIONS(1656), 1,
       anon_sym_AMP,
-    ACTIONS(1606), 1,
+    ACTIONS(1658), 1,
       anon_sym_CARET,
-    ACTIONS(1588), 2,
+    ACTIONS(1636), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1590), 2,
+    ACTIONS(1638), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1596), 2,
+    ACTIONS(1644), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1600), 3,
+    ACTIONS(1652), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1722), 3,
-      anon_sym_as,
+    ACTIONS(1718), 3,
+      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1720), 17,
+    ACTIONS(1716), 17,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
@@ -62574,137 +62530,88 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46084] = 14,
+  [46016] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1642), 1,
+      anon_sym_PIPE,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1598), 1,
+    ACTIONS(1648), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1604), 1,
+    ACTIONS(1656), 1,
       anon_sym_AMP,
-    ACTIONS(1606), 1,
+    ACTIONS(1658), 1,
       anon_sym_CARET,
-    ACTIONS(1588), 2,
+    ACTIONS(1636), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1590), 2,
+    ACTIONS(1638), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1596), 2,
+    ACTIONS(1644), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1600), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1714), 3,
-      anon_sym_as,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1712), 18,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [46152] = 10,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1554), 1,
-      anon_sym_DOT,
-    ACTIONS(1556), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1570), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1598), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1588), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1600), 3,
+    ACTIONS(1652), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1714), 3,
-      anon_sym_as,
+    ACTIONS(1722), 3,
+      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 24,
+    ACTIONS(1720), 17,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46212] = 8,
+  [46086] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1598), 1,
+    ACTIONS(1648), 1,
       anon_sym_STAR_STAR,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 5,
-      anon_sym_as,
+    ACTIONS(1726), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 27,
+    ACTIONS(1724), 27,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -62726,45 +62633,41 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46268] = 13,
+  [46142] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1598), 1,
+    ACTIONS(1648), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1606), 1,
-      anon_sym_CARET,
-    ACTIONS(1588), 2,
+    ACTIONS(1636), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1590), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1596), 2,
+    ACTIONS(1644), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1600), 3,
+    ACTIONS(1652), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1714), 3,
-      anon_sym_as,
+    ACTIONS(1726), 3,
+      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 19,
+    ACTIONS(1724), 22,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_RBRACK,
@@ -62773,97 +62676,99 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_or,
       anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46334] = 12,
+  [46204] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1642), 1,
+      anon_sym_PIPE,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1598), 1,
+    ACTIONS(1648), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1588), 2,
+    ACTIONS(1656), 1,
+      anon_sym_AMP,
+    ACTIONS(1658), 1,
+      anon_sym_CARET,
+    ACTIONS(1636), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1590), 2,
+    ACTIONS(1638), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1596), 2,
+    ACTIONS(1644), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1600), 3,
+    ACTIONS(1652), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
     ACTIONS(1714), 3,
-      anon_sym_as,
+      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 20,
+    ACTIONS(1712), 17,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
-      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_CARET,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46398] = 8,
+  [46274] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
-      anon_sym_DOT,
-    ACTIONS(1556), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1570), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1598), 1,
-      anon_sym_STAR_STAR,
-    STATE(708), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1726), 5,
-      anon_sym_as,
+    ACTIONS(1728), 1,
+      sym__template_string_start,
+    STATE(745), 2,
+      sym_template_string,
+      aux_sym_concatenated_template_string_repeat1,
+    ACTIONS(1533), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1724), 27,
+    ACTIONS(1531), 31,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -62879,33 +62784,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46454] = 8,
+  [46324] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1598), 1,
+    ACTIONS(1648), 1,
       anon_sym_STAR_STAR,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1730), 5,
-      anon_sym_as,
+    ACTIONS(1733), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1728), 27,
+    ACTIONS(1731), 27,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -62927,36 +62832,39 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46510] = 5,
+  [46380] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    STATE(753), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1532), 4,
+    ACTIONS(1630), 1,
+      anon_sym_DOT,
+    ACTIONS(1632), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1646), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1648), 1,
+      anon_sym_STAR_STAR,
+    STATE(731), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1737), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1530), 31,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
+    ACTIONS(1735), 27,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -62972,128 +62880,133 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46560] = 5,
+  [46436] = 14,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    STATE(754), 2,
-      sym_template_string,
-      aux_sym_concatenated_template_string_repeat1,
-    ACTIONS(1536), 4,
+    ACTIONS(1630), 1,
+      anon_sym_DOT,
+    ACTIONS(1632), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1646), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1648), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1656), 1,
+      anon_sym_AMP,
+    ACTIONS(1658), 1,
+      anon_sym_CARET,
+    ACTIONS(1636), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
+    ACTIONS(1638), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1644), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(731), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1652), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1726), 3,
+      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1534), 31,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
+    ACTIONS(1724), 18,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46610] = 8,
+  [46504] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1598), 1,
+    ACTIONS(1694), 1,
       anon_sym_STAR_STAR,
-    STATE(708), 2,
+    ACTIONS(1684), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1686), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1692), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 5,
+    ACTIONS(1696), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1726), 3,
       anon_sym_as,
-      anon_sym_STAR,
-      anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 27,
+    ACTIONS(1724), 20,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_async,
       anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46666] = 11,
+  [46568] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1598), 1,
+    ACTIONS(1694), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1588), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1596), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1600), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1714), 3,
+    ACTIONS(1726), 5,
       anon_sym_as,
+      anon_sym_STAR,
+      anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 22,
+    ACTIONS(1724), 27,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -63102,11 +63015,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
@@ -63116,36 +63034,39 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46728] = 5,
+  [46624] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1732), 1,
-      sym__string_start,
-    STATE(753), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1525), 4,
+    ACTIONS(1630), 1,
+      anon_sym_DOT,
+    ACTIONS(1632), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1646), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1694), 1,
+      anon_sym_STAR_STAR,
+    STATE(731), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1733), 5,
+      anon_sym_as,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1523), 31,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
+    ACTIONS(1731), 27,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -63161,42 +63082,48 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46778] = 5,
+  [46680] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1735), 1,
-      sym__template_string_start,
-    STATE(754), 2,
-      sym_template_string,
-      aux_sym_concatenated_template_string_repeat1,
-    ACTIONS(1512), 4,
+    ACTIONS(1630), 1,
+      anon_sym_DOT,
+    ACTIONS(1632), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1646), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1694), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1684), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
+    ACTIONS(1692), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(731), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1696), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1726), 3,
+      anon_sym_as,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1510), 31,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
+    ACTIONS(1724), 22,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
@@ -63206,33 +63133,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46828] = 8,
+  [46742] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1572), 1,
+    ACTIONS(1694), 1,
       anon_sym_STAR_STAR,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 5,
+    ACTIONS(1737), 5,
+      anon_sym_as,
       anon_sym_STAR,
-      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 27,
+    ACTIONS(1735), 27,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -63254,41 +63181,45 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46884] = 11,
+  [46798] = 13,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1572), 1,
+    ACTIONS(1694), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1560), 2,
+    ACTIONS(1702), 1,
+      anon_sym_CARET,
+    ACTIONS(1684), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1568), 2,
+    ACTIONS(1686), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1692), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1576), 3,
+    ACTIONS(1696), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1714), 3,
-      anon_sym_EQ,
+    ACTIONS(1726), 3,
+      anon_sym_as,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 22,
+    ACTIONS(1724), 19,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_RBRACK,
@@ -63297,110 +63228,152 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_or,
       anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [46946] = 15,
+  [46864] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1566), 1,
-      anon_sym_PIPE,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1572), 1,
+    ACTIONS(1648), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1580), 1,
-      anon_sym_AMP,
-    ACTIONS(1582), 1,
-      anon_sym_CARET,
-    ACTIONS(1560), 2,
+    ACTIONS(1636), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1562), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1568), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1576), 3,
+    ACTIONS(1652), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1740), 3,
+    ACTIONS(1726), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1738), 17,
+    ACTIONS(1724), 24,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_else,
       anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [47016] = 10,
+  [46924] = 14,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1572), 1,
+    ACTIONS(1694), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1560), 2,
+    ACTIONS(1700), 1,
+      anon_sym_AMP,
+    ACTIONS(1702), 1,
+      anon_sym_CARET,
+    ACTIONS(1684), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    STATE(708), 2,
+    ACTIONS(1686), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1692), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1576), 3,
+    ACTIONS(1696), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1714), 3,
-      anon_sym_EQ,
+    ACTIONS(1726), 3,
+      anon_sym_as,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 24,
+    ACTIONS(1724), 18,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [46992] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1739), 1,
+      sym__string_start,
+    STATE(757), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1526), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1524), 31,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
-      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
@@ -63410,27 +63383,27 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [47076] = 8,
+  [47042] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1572), 1,
+    ACTIONS(1648), 1,
       anon_sym_STAR_STAR,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 5,
+    ACTIONS(1726), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 27,
+    ACTIONS(1724), 27,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -63458,303 +63431,291 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [47132] = 13,
+  [47098] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1572), 1,
+    ACTIONS(1690), 1,
+      anon_sym_PIPE,
+    ACTIONS(1694), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1582), 1,
+    ACTIONS(1700), 1,
+      anon_sym_AMP,
+    ACTIONS(1702), 1,
       anon_sym_CARET,
-    ACTIONS(1560), 2,
+    ACTIONS(1684), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1562), 2,
+    ACTIONS(1686), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1568), 2,
+    ACTIONS(1692), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1576), 3,
+    ACTIONS(1696), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1714), 3,
-      anon_sym_EQ,
+    ACTIONS(1718), 3,
+      anon_sym_as,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 19,
+    ACTIONS(1716), 17,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
-      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_AMP,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [47198] = 12,
+  [47168] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1572), 1,
+    ACTIONS(1690), 1,
+      anon_sym_PIPE,
+    ACTIONS(1694), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1560), 2,
+    ACTIONS(1700), 1,
+      anon_sym_AMP,
+    ACTIONS(1702), 1,
+      anon_sym_CARET,
+    ACTIONS(1684), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1562), 2,
+    ACTIONS(1686), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1568), 2,
+    ACTIONS(1692), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1576), 3,
+    ACTIONS(1696), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1714), 3,
-      anon_sym_EQ,
+    ACTIONS(1722), 3,
+      anon_sym_as,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 20,
+    ACTIONS(1720), 17,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
-      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_CARET,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [47262] = 15,
+  [47238] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1566), 1,
-      anon_sym_PIPE,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1572), 1,
+    ACTIONS(1694), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1580), 1,
-      anon_sym_AMP,
-    ACTIONS(1582), 1,
-      anon_sym_CARET,
-    ACTIONS(1560), 2,
+    ACTIONS(1684), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1562), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1568), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1576), 3,
+    ACTIONS(1696), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1718), 3,
-      anon_sym_EQ,
+    ACTIONS(1726), 3,
+      anon_sym_as,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1716), 17,
+    ACTIONS(1724), 24,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [47332] = 15,
+  [47298] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
-      anon_sym_DOT,
-    ACTIONS(1556), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1566), 1,
-      anon_sym_PIPE,
-    ACTIONS(1570), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1572), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1580), 1,
-      anon_sym_AMP,
-    ACTIONS(1582), 1,
-      anon_sym_CARET,
-    ACTIONS(1560), 2,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    STATE(745), 2,
+      sym_template_string,
+      aux_sym_concatenated_template_string_repeat1,
+    ACTIONS(1522), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1562), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1568), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(708), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1576), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1722), 3,
-      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1720), 17,
+    ACTIONS(1520), 31,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
-      anon_sym_else,
       anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [47402] = 15,
+  [47348] = 13,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1594), 1,
-      anon_sym_PIPE,
-    ACTIONS(1598), 1,
+    ACTIONS(1648), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1604), 1,
-      anon_sym_AMP,
-    ACTIONS(1606), 1,
+    ACTIONS(1658), 1,
       anon_sym_CARET,
-    ACTIONS(1588), 2,
+    ACTIONS(1636), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1590), 2,
+    ACTIONS(1638), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1596), 2,
+    ACTIONS(1644), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1600), 3,
+    ACTIONS(1652), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1740), 3,
-      anon_sym_as,
+    ACTIONS(1726), 3,
+      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1738), 17,
+    ACTIONS(1724), 19,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
+      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_AMP,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [47472] = 8,
+  [47414] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1572), 1,
+    ACTIONS(1694), 1,
       anon_sym_STAR_STAR,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1730), 5,
+    ACTIONS(1726), 5,
+      anon_sym_as,
       anon_sym_STAR,
-      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1728), 27,
+    ACTIONS(1724), 27,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -63776,64 +63737,72 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [47528] = 8,
+  [47470] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1572), 1,
+    ACTIONS(1648), 1,
       anon_sym_STAR_STAR,
-    STATE(708), 2,
+    ACTIONS(1636), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1638), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1644), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1726), 5,
-      anon_sym_STAR,
+    ACTIONS(1652), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1726), 3,
       anon_sym_EQ,
-      anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1724), 27,
+    ACTIONS(1724), 20,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [47584] = 3,
+  [47534] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1338), 5,
+    ACTIONS(652), 1,
+      sym__string_start,
+    STATE(757), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1518), 4,
       anon_sym_STAR,
-      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1333), 32,
+    ACTIONS(1516), 31,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -63842,7 +63811,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
-      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -63866,31 +63834,89 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [47629] = 5,
+  [47584] = 19,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1742), 1,
-      sym__string_start,
-    STATE(768), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1525), 5,
+    ACTIONS(1630), 1,
+      anon_sym_DOT,
+    ACTIONS(1632), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1646), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1748), 1,
+      anon_sym_PIPE,
+    ACTIONS(1752), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1756), 1,
+      anon_sym_not,
+    ACTIONS(1758), 1,
+      anon_sym_AMP,
+    ACTIONS(1760), 1,
+      anon_sym_CARET,
+    ACTIONS(1764), 1,
+      anon_sym_is,
+    STATE(1010), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1742), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1744), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1750), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(1762), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    STATE(731), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1754), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1746), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1634), 8,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACE,
+      anon_sym_and,
+      anon_sym_or,
+  [47661] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1311), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1523), 29,
+    ACTIONS(1306), 32,
       anon_sym_DOT,
       anon_sym_LPAREN,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
@@ -63908,33 +63934,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [47678] = 5,
+  [47706] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1745), 1,
-      sym__template_string_start,
-    STATE(769), 2,
-      sym_template_string,
-      aux_sym_concatenated_template_string_repeat1,
-    ACTIONS(1512), 5,
+    ACTIONS(590), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(272), 6,
       anon_sym_STAR,
+      anon_sym_COLON,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1510), 29,
+    ACTIONS(303), 30,
       anon_sym_DOT,
       anon_sym_LPAREN,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
@@ -63952,26 +63977,81 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
+  [47753] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1650), 1,
+      anon_sym_EQ,
+    ACTIONS(1766), 1,
+      anon_sym_DOT,
+    ACTIONS(1768), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1776), 1,
+      anon_sym_PIPE,
+    ACTIONS(1780), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1782), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1786), 1,
+      anon_sym_not,
+    ACTIONS(1788), 1,
+      anon_sym_AMP,
+    ACTIONS(1790), 1,
+      anon_sym_CARET,
+    ACTIONS(1794), 1,
+      anon_sym_is,
+    STATE(1004), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1770), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1772), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1778), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(1792), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    STATE(910), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1784), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1774), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1634), 7,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_RBRACE,
+      anon_sym_and,
+      anon_sym_or,
       anon_sym_COLON2,
       sym_type_conversion,
-  [47727] = 5,
+  [47832] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(83), 1,
+    ACTIONS(630), 1,
       sym__string_start,
-    STATE(776), 2,
+    STATE(774), 2,
       sym_string,
       aux_sym_concatenated_string_repeat1,
-    ACTIONS(1532), 5,
+    ACTIONS(1241), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1530), 29,
-      sym__newline,
+    ACTIONS(1236), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -63981,6 +64061,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -63997,25 +64078,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [47776] = 5,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [47881] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(85), 1,
+    ACTIONS(632), 1,
       sym__template_string_start,
-    STATE(777), 2,
+    STATE(775), 2,
       sym_template_string,
       aux_sym_concatenated_template_string_repeat1,
-    ACTIONS(1536), 5,
+    ACTIONS(1241), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1534), 29,
-      sym__newline,
+    ACTIONS(1236), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -64025,6 +64105,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -64041,34 +64122,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [47825] = 5,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [47930] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(85), 1,
-      sym__template_string_start,
-    STATE(771), 2,
-      sym_template_string,
-      aux_sym_concatenated_template_string_repeat1,
-    ACTIONS(1209), 5,
+    ACTIONS(1488), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1241), 6,
       anon_sym_STAR,
+      anon_sym_COLON,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 29,
-      sym__newline,
+    ACTIONS(1236), 30,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -64085,92 +64167,75 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [47874] = 20,
+  [47977] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1574), 1,
+    ACTIONS(630), 1,
+      sym__string_start,
+    STATE(776), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1518), 5,
+      anon_sym_STAR,
       anon_sym_EQ,
-    ACTIONS(1748), 1,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1516), 29,
       anon_sym_DOT,
-    ACTIONS(1750), 1,
       anon_sym_LPAREN,
-    ACTIONS(1758), 1,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
       anon_sym_PIPE,
-    ACTIONS(1762), 1,
+      anon_sym_DASH,
+      anon_sym_PLUS,
       anon_sym_LBRACK,
-    ACTIONS(1764), 1,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
-    ACTIONS(1768), 1,
+      anon_sym_AT,
       anon_sym_not,
-    ACTIONS(1770), 1,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
-    ACTIONS(1772), 1,
       anon_sym_CARET,
-    ACTIONS(1776), 1,
-      anon_sym_is,
-    STATE(1008), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1752), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1754), 2,
-      anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1760), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(1774), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    STATE(895), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1766), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1756), 6,
-      anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1558), 7,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_SEMI,
-  [47953] = 4,
+      anon_sym_is,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [48026] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(590), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(272), 6,
+    ACTIONS(632), 1,
+      sym__template_string_start,
+    STATE(777), 2,
+      sym_template_string,
+      aux_sym_concatenated_template_string_repeat1,
+    ACTIONS(1522), 5,
       anon_sym_STAR,
-      anon_sym_COLON,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 30,
+    ACTIONS(1520), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
-      anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
@@ -64188,82 +64253,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [48000] = 19,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [48075] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
-      anon_sym_DOT,
-    ACTIONS(1556), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1570), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1784), 1,
-      anon_sym_PIPE,
-    ACTIONS(1788), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1792), 1,
-      anon_sym_not,
-    ACTIONS(1794), 1,
-      anon_sym_AMP,
     ACTIONS(1796), 1,
-      anon_sym_CARET,
-    ACTIONS(1800), 1,
-      anon_sym_is,
-    STATE(1014), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1778), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1780), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1786), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(1798), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    STATE(708), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1790), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1782), 6,
-      anon_sym_in,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-    ACTIONS(1558), 8,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACE,
-      anon_sym_and,
-      anon_sym_or,
-  [48077] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1802), 1,
       sym__string_start,
     STATE(776), 2,
       sym_string,
       aux_sym_concatenated_string_repeat1,
-    ACTIONS(1525), 5,
+    ACTIONS(1526), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1523), 29,
-      sym__newline,
+    ACTIONS(1524), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -64273,6 +64280,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -64289,25 +64297,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [48126] = 5,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [48124] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1805), 1,
+    ACTIONS(1799), 1,
       sym__template_string_start,
     STATE(777), 2,
       sym_template_string,
       aux_sym_concatenated_template_string_repeat1,
-    ACTIONS(1512), 5,
+    ACTIONS(1533), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1510), 29,
-      sym__newline,
+    ACTIONS(1531), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -64317,6 +64324,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -64333,34 +64341,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [48175] = 4,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [48173] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1488), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1209), 6,
+    ACTIONS(1802), 1,
+      sym__string_start,
+    STATE(778), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1526), 5,
       anon_sym_STAR,
-      anon_sym_COLON,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 30,
+    ACTIONS(1524), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
-      anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -64377,21 +64386,22 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
+      anon_sym_SEMI,
   [48222] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(83), 1,
-      sym__string_start,
-    STATE(770), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1209), 5,
+    ACTIONS(1805), 1,
+      sym__template_string_start,
+    STATE(779), 2,
+      sym_template_string,
+      aux_sym_concatenated_template_string_repeat1,
+    ACTIONS(1533), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 29,
+    ACTIONS(1531), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -64424,7 +64434,7 @@ static const uint16_t ts_small_parse_table[] = {
   [48271] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1574), 1,
+    ACTIONS(1650), 1,
       anon_sym_EQ,
     ACTIONS(1808), 1,
       anon_sym_DOT,
@@ -64444,7 +64454,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_CARET,
     ACTIONS(1836), 1,
       anon_sym_is,
-    STATE(1004), 1,
+    STATE(1007), 1,
       aux_sym_comparison_operator_repeat1,
     ACTIONS(1812), 2,
       anon_sym_STAR,
@@ -64458,7 +64468,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(1834), 2,
       anon_sym_LT,
       anon_sym_GT,
-    STATE(925), 2,
+    STATE(904), 2,
       sym_argument_list,
       sym_generator_expression,
     ACTIONS(1826), 3,
@@ -64472,30 +64482,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1558), 7,
+    ACTIONS(1634), 7,
+      sym__newline,
+      anon_sym_from,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_RBRACE,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_COLON2,
-      sym_type_conversion,
+      anon_sym_SEMI,
   [48350] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(630), 1,
+    ACTIONS(83), 1,
       sym__string_start,
-    STATE(784), 2,
+    STATE(778), 2,
       sym_string,
       aux_sym_concatenated_string_repeat1,
-    ACTIONS(1209), 5,
+    ACTIONS(1518), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 29,
+    ACTIONS(1516), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -64505,7 +64517,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -64522,24 +64533,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
+      anon_sym_SEMI,
   [48399] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(632), 1,
+    ACTIONS(85), 1,
       sym__template_string_start,
-    STATE(785), 2,
+    STATE(779), 2,
       sym_template_string,
       aux_sym_concatenated_template_string_repeat1,
-    ACTIONS(1209), 5,
+    ACTIONS(1522), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 29,
+    ACTIONS(1520), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -64549,7 +64561,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -64566,34 +64577,34 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [48448] = 3,
+      anon_sym_SEMI,
+  [48448] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1295), 5,
+    ACTIONS(83), 1,
+      sym__string_start,
+    STATE(781), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1241), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1290), 32,
+    ACTIONS(1236), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
-      anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -64610,22 +64621,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [48493] = 5,
+      anon_sym_SEMI,
+  [48497] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(630), 1,
-      sym__string_start,
-    STATE(768), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1532), 5,
+    ACTIONS(85), 1,
+      sym__template_string_start,
+    STATE(782), 2,
+      sym_template_string,
+      aux_sym_concatenated_template_string_repeat1,
+    ACTIONS(1241), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1530), 29,
+    ACTIONS(1236), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -64635,7 +64649,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -64652,33 +64665,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [48542] = 5,
+      anon_sym_SEMI,
+  [48546] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(632), 1,
-      sym__template_string_start,
-    STATE(769), 2,
-      sym_template_string,
-      aux_sym_concatenated_template_string_repeat1,
-    ACTIONS(1536), 5,
+    ACTIONS(1838), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1241), 5,
+      anon_sym_as,
       anon_sym_STAR,
-      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1534), 29,
+    ACTIONS(1236), 31,
       anon_sym_DOT,
       anon_sym_LPAREN,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
@@ -64696,20 +64709,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [48591] = 4,
+  [48593] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1838), 1,
+    ACTIONS(604), 1,
       anon_sym_COLON_EQ,
-    ACTIONS(1209), 5,
+    ACTIONS(272), 5,
       anon_sym_as,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 31,
+    ACTIONS(303), 31,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -64741,26 +64752,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [48638] = 4,
+  [48640] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(604), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(272), 5,
-      anon_sym_as,
+    ACTIONS(1478), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 31,
+    ACTIONS(1473), 32,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -64787,37 +64797,37 @@ static const uint16_t ts_small_parse_table[] = {
   [48685] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1748), 1,
+    ACTIONS(1808), 1,
       anon_sym_DOT,
-    ACTIONS(1750), 1,
+    ACTIONS(1810), 1,
       anon_sym_LPAREN,
-    ACTIONS(1758), 1,
+    ACTIONS(1818), 1,
       anon_sym_PIPE,
-    ACTIONS(1762), 1,
+    ACTIONS(1822), 1,
       anon_sym_LBRACK,
-    ACTIONS(1764), 1,
+    ACTIONS(1824), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1770), 1,
+    ACTIONS(1830), 1,
       anon_sym_AMP,
-    ACTIONS(1772), 1,
+    ACTIONS(1832), 1,
       anon_sym_CARET,
-    ACTIONS(1752), 2,
+    ACTIONS(1812), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1754), 2,
+    ACTIONS(1814), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1760), 2,
+    ACTIONS(1820), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(895), 2,
+    STATE(904), 2,
       sym_argument_list,
       sym_generator_expression,
     ACTIONS(1722), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1766), 3,
+    ACTIONS(1826), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
@@ -64837,97 +64847,90 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [48753] = 19,
+  [48753] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1840), 1,
+    ACTIONS(1766), 1,
       anon_sym_DOT,
-    ACTIONS(1842), 1,
+    ACTIONS(1768), 1,
       anon_sym_LPAREN,
-    ACTIONS(1850), 1,
-      anon_sym_PIPE,
-    ACTIONS(1854), 1,
+    ACTIONS(1780), 1,
       anon_sym_LBRACK,
-    ACTIONS(1856), 1,
+    ACTIONS(1782), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1860), 1,
-      anon_sym_not,
-    ACTIONS(1862), 1,
-      anon_sym_AMP,
-    ACTIONS(1864), 1,
-      anon_sym_CARET,
-    ACTIONS(1868), 1,
-      anon_sym_is,
-    STATE(1016), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1844), 2,
+    STATE(910), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1726), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
-    ACTIONS(1846), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1724), 25,
+      anon_sym_COMMA,
       anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1852), 2,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-    ACTIONS(1866), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    STATE(953), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1858), 3,
+      anon_sym_RBRACE,
       anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1848), 6,
-      anon_sym_in,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1558), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_and,
-      anon_sym_or,
-  [48829] = 5,
+      anon_sym_is,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [48807] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    STATE(749), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(1209), 4,
+    ACTIONS(1766), 1,
+      anon_sym_DOT,
+    ACTIONS(1768), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1780), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1782), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1770), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
+    ACTIONS(1778), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(910), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1726), 3,
+      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
+    ACTIONS(1784), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1724), 20,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
+      anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
@@ -64937,122 +64940,150 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [48877] = 5,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [48867] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    STATE(750), 2,
-      sym_template_string,
-      aux_sym_concatenated_template_string_repeat1,
-    ACTIONS(1209), 4,
+    ACTIONS(1766), 1,
+      anon_sym_DOT,
+    ACTIONS(1768), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1776), 1,
+      anon_sym_PIPE,
+    ACTIONS(1780), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1782), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1788), 1,
+      anon_sym_AMP,
+    ACTIONS(1790), 1,
+      anon_sym_CARET,
+    ACTIONS(1770), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
+    ACTIONS(1772), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1778), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(910), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1714), 3,
+      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
+    ACTIONS(1784), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1712), 15,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
       anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
+      anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [48925] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [48935] = 14,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1548), 4,
+    ACTIONS(1766), 1,
+      anon_sym_DOT,
+    ACTIONS(1768), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1780), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1782), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1788), 1,
+      anon_sym_AMP,
+    ACTIONS(1790), 1,
+      anon_sym_CARET,
+    ACTIONS(1770), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
+    ACTIONS(1772), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1778), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(910), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1726), 3,
+      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1546), 32,
-      sym__string_start,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
+    ACTIONS(1784), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1724), 16,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [48969] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [49001] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1544), 4,
+    ACTIONS(1766), 1,
+      anon_sym_DOT,
+    ACTIONS(1768), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1780), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1782), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1770), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
+    STATE(910), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1726), 3,
+      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1542), 32,
-      sym__template_string_start,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
+    ACTIONS(1784), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1724), 22,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
@@ -65062,32 +65093,37 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [49013] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [49059] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1552), 4,
+    ACTIONS(1766), 1,
+      anon_sym_DOT,
+    ACTIONS(1768), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1780), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1782), 1,
+      anon_sym_STAR_STAR,
+    STATE(910), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1726), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1550), 32,
-      sym__string_start,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
+    ACTIONS(1724), 25,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -65103,185 +65139,204 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [49057] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [49113] = 13,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1540), 4,
+    ACTIONS(1766), 1,
+      anon_sym_DOT,
+    ACTIONS(1768), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1780), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1782), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1790), 1,
+      anon_sym_CARET,
+    ACTIONS(1770), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
+    ACTIONS(1772), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1778), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(910), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1726), 3,
+      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1538), 32,
-      sym__template_string_start,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
+    ACTIONS(1784), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1724), 17,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [49101] = 8,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [49177] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1748), 1,
+    ACTIONS(1766), 1,
       anon_sym_DOT,
-    ACTIONS(1750), 1,
+    ACTIONS(1768), 1,
       anon_sym_LPAREN,
-    ACTIONS(1762), 1,
+    ACTIONS(1780), 1,
       anon_sym_LBRACK,
-    ACTIONS(1764), 1,
+    ACTIONS(1782), 1,
       anon_sym_STAR_STAR,
-    STATE(895), 2,
+    ACTIONS(1770), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1772), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1778), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(910), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 5,
-      anon_sym_STAR,
+    ACTIONS(1726), 3,
       anon_sym_EQ,
-      anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 25,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(1784), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1724), 18,
       anon_sym_COMMA,
-      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_in,
       anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_AT,
+      anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [49155] = 11,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [49239] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1748), 1,
+    ACTIONS(1766), 1,
       anon_sym_DOT,
-    ACTIONS(1750), 1,
+    ACTIONS(1768), 1,
       anon_sym_LPAREN,
-    ACTIONS(1762), 1,
+    ACTIONS(1776), 1,
+      anon_sym_PIPE,
+    ACTIONS(1780), 1,
       anon_sym_LBRACK,
-    ACTIONS(1764), 1,
+    ACTIONS(1782), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1752), 2,
+    ACTIONS(1788), 1,
+      anon_sym_AMP,
+    ACTIONS(1790), 1,
+      anon_sym_CARET,
+    ACTIONS(1770), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1760), 2,
+    ACTIONS(1772), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1778), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(895), 2,
+    STATE(910), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 3,
+    ACTIONS(1718), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1766), 3,
+    ACTIONS(1784), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 20,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(1716), 15,
       anon_sym_COMMA,
-      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_in,
-      anon_sym_PIPE,
+      anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [49215] = 15,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [49307] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1748), 1,
+    ACTIONS(1766), 1,
       anon_sym_DOT,
-    ACTIONS(1750), 1,
+    ACTIONS(1768), 1,
       anon_sym_LPAREN,
-    ACTIONS(1758), 1,
+    ACTIONS(1776), 1,
       anon_sym_PIPE,
-    ACTIONS(1762), 1,
+    ACTIONS(1780), 1,
       anon_sym_LBRACK,
-    ACTIONS(1764), 1,
+    ACTIONS(1782), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1770), 1,
+    ACTIONS(1788), 1,
       anon_sym_AMP,
-    ACTIONS(1772), 1,
+    ACTIONS(1790), 1,
       anon_sym_CARET,
-    ACTIONS(1752), 2,
+    ACTIONS(1770), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1754), 2,
+    ACTIONS(1772), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1760), 2,
+    ACTIONS(1778), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(895), 2,
+    STATE(910), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1740), 3,
+    ACTIONS(1722), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1766), 3,
+    ACTIONS(1784), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1738), 15,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(1720), 15,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_in,
+      anon_sym_RBRACE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
@@ -65291,19 +65346,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [49283] = 8,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [49375] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1748), 1,
+    ACTIONS(1808), 1,
       anon_sym_DOT,
-    ACTIONS(1750), 1,
+    ACTIONS(1810), 1,
       anon_sym_LPAREN,
-    ACTIONS(1762), 1,
+    ACTIONS(1822), 1,
       anon_sym_LBRACK,
-    ACTIONS(1764), 1,
+    ACTIONS(1824), 1,
       anon_sym_STAR_STAR,
-    STATE(895), 2,
+    STATE(904), 2,
       sym_argument_list,
       sym_generator_expression,
     ACTIONS(1726), 5,
@@ -65338,52 +65394,48 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [49337] = 15,
+  [49429] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1748), 1,
+    ACTIONS(1808), 1,
       anon_sym_DOT,
-    ACTIONS(1750), 1,
+    ACTIONS(1810), 1,
       anon_sym_LPAREN,
-    ACTIONS(1758), 1,
-      anon_sym_PIPE,
-    ACTIONS(1762), 1,
+    ACTIONS(1822), 1,
       anon_sym_LBRACK,
-    ACTIONS(1764), 1,
+    ACTIONS(1824), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1770), 1,
-      anon_sym_AMP,
-    ACTIONS(1772), 1,
-      anon_sym_CARET,
-    ACTIONS(1752), 2,
+    ACTIONS(1812), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1754), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1760), 2,
+    ACTIONS(1820), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(895), 2,
+    STATE(904), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1718), 3,
+    ACTIONS(1726), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1766), 3,
+    ACTIONS(1826), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1716), 15,
+    ACTIONS(1724), 20,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
+      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_in,
+      anon_sym_PIPE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
@@ -65391,48 +65443,49 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [49405] = 14,
+  [49489] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1748), 1,
+    ACTIONS(1808), 1,
       anon_sym_DOT,
-    ACTIONS(1750), 1,
+    ACTIONS(1810), 1,
       anon_sym_LPAREN,
-    ACTIONS(1762), 1,
+    ACTIONS(1818), 1,
+      anon_sym_PIPE,
+    ACTIONS(1822), 1,
       anon_sym_LBRACK,
-    ACTIONS(1764), 1,
+    ACTIONS(1824), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1770), 1,
+    ACTIONS(1830), 1,
       anon_sym_AMP,
-    ACTIONS(1772), 1,
+    ACTIONS(1832), 1,
       anon_sym_CARET,
-    ACTIONS(1752), 2,
+    ACTIONS(1812), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1754), 2,
+    ACTIONS(1814), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1760), 2,
+    ACTIONS(1820), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(895), 2,
+    STATE(904), 2,
       sym_argument_list,
       sym_generator_expression,
     ACTIONS(1714), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1766), 3,
+    ACTIONS(1826), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 16,
+    ACTIONS(1712), 15,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_in,
-      anon_sym_PIPE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
@@ -65443,47 +65496,51 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [49471] = 10,
+  [49557] = 14,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1748), 1,
+    ACTIONS(1808), 1,
       anon_sym_DOT,
-    ACTIONS(1750), 1,
+    ACTIONS(1810), 1,
       anon_sym_LPAREN,
-    ACTIONS(1762), 1,
+    ACTIONS(1822), 1,
       anon_sym_LBRACK,
-    ACTIONS(1764), 1,
+    ACTIONS(1824), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1752), 2,
+    ACTIONS(1830), 1,
+      anon_sym_AMP,
+    ACTIONS(1832), 1,
+      anon_sym_CARET,
+    ACTIONS(1812), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    STATE(895), 2,
+    ACTIONS(1814), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1820), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(904), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 3,
+    ACTIONS(1726), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1766), 3,
+    ACTIONS(1826), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 22,
+    ACTIONS(1724), 16,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
-      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_in,
       anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
@@ -65491,27 +65548,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [49529] = 8,
+  [49623] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1748), 1,
+    ACTIONS(1808), 1,
       anon_sym_DOT,
-    ACTIONS(1750), 1,
+    ACTIONS(1810), 1,
       anon_sym_LPAREN,
-    ACTIONS(1762), 1,
+    ACTIONS(1822), 1,
       anon_sym_LBRACK,
-    ACTIONS(1764), 1,
+    ACTIONS(1824), 1,
       anon_sym_STAR_STAR,
-    STATE(895), 2,
+    ACTIONS(1812), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    STATE(904), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 5,
-      anon_sym_STAR,
+    ACTIONS(1726), 3,
       anon_sym_EQ,
-      anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 25,
+    ACTIONS(1826), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1724), 22,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
@@ -65521,12 +65583,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
@@ -65537,7 +65596,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [49583] = 8,
+  [49681] = 8,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1808), 1,
@@ -65548,16 +65607,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(1824), 1,
       anon_sym_STAR_STAR,
-    STATE(925), 2,
+    STATE(904), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1730), 5,
+    ACTIONS(1726), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1728), 25,
+    ACTIONS(1724), 25,
+      sym__newline,
+      anon_sym_from,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
@@ -65565,7 +65626,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_RBRACE,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -65581,88 +65641,94 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [49637] = 8,
+      anon_sym_SEMI,
+  [49735] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1808), 1,
       anon_sym_DOT,
     ACTIONS(1810), 1,
       anon_sym_LPAREN,
+    ACTIONS(1818), 1,
+      anon_sym_PIPE,
     ACTIONS(1822), 1,
       anon_sym_LBRACK,
     ACTIONS(1824), 1,
       anon_sym_STAR_STAR,
-    STATE(925), 2,
+    ACTIONS(1830), 1,
+      anon_sym_AMP,
+    ACTIONS(1832), 1,
+      anon_sym_CARET,
+    ACTIONS(1812), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1814), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1820), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(904), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1726), 5,
-      anon_sym_STAR,
+    ACTIONS(1718), 3,
       anon_sym_EQ,
-      anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1724), 25,
+    ACTIONS(1826), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1716), 15,
+      sym__newline,
+      anon_sym_from,
       anon_sym_COMMA,
-      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_RBRACE,
-      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [49691] = 13,
+      anon_sym_SEMI,
+  [49803] = 13,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1748), 1,
+    ACTIONS(1808), 1,
       anon_sym_DOT,
-    ACTIONS(1750), 1,
+    ACTIONS(1810), 1,
       anon_sym_LPAREN,
-    ACTIONS(1762), 1,
+    ACTIONS(1822), 1,
       anon_sym_LBRACK,
-    ACTIONS(1764), 1,
+    ACTIONS(1824), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1772), 1,
+    ACTIONS(1832), 1,
       anon_sym_CARET,
-    ACTIONS(1752), 2,
+    ACTIONS(1812), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1754), 2,
+    ACTIONS(1814), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1760), 2,
+    ACTIONS(1820), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(895), 2,
+    STATE(904), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 3,
+    ACTIONS(1726), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1766), 3,
+    ACTIONS(1826), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 17,
+    ACTIONS(1724), 17,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
@@ -65680,38 +65746,38 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [49755] = 12,
+  [49867] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1748), 1,
+    ACTIONS(1808), 1,
       anon_sym_DOT,
-    ACTIONS(1750), 1,
+    ACTIONS(1810), 1,
       anon_sym_LPAREN,
-    ACTIONS(1762), 1,
+    ACTIONS(1822), 1,
       anon_sym_LBRACK,
-    ACTIONS(1764), 1,
+    ACTIONS(1824), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1752), 2,
+    ACTIONS(1812), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1754), 2,
+    ACTIONS(1814), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1760), 2,
+    ACTIONS(1820), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(895), 2,
+    STATE(904), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 3,
+    ACTIONS(1726), 3,
       anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1766), 3,
+    ACTIONS(1826), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 18,
+    ACTIONS(1724), 18,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
@@ -65730,26 +65796,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [49817] = 8,
+  [49929] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1788), 1,
+    ACTIONS(1752), 1,
       anon_sym_STAR_STAR,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1726), 4,
+    ACTIONS(1737), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1724), 26,
+    ACTIONS(1735), 26,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
@@ -65776,7 +65842,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [49871] = 11,
+  [49983] = 8,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1808), 1,
@@ -65787,33 +65853,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(1824), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1812), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1820), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(925), 2,
+    STATE(904), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 3,
+    ACTIONS(1733), 5,
+      anon_sym_STAR,
       anon_sym_EQ,
+      anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1826), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 20,
+    ACTIONS(1731), 25,
+      sym__newline,
+      anon_sym_from,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_in,
       anon_sym_PIPE,
-      anon_sym_RBRACE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
@@ -65823,139 +65887,145 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [49931] = 15,
+      anon_sym_SEMI,
+  [50037] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1808), 1,
-      anon_sym_DOT,
-    ACTIONS(1810), 1,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    ACTIONS(1840), 1,
+      sym_identifier,
+    ACTIONS(1842), 1,
       anon_sym_LPAREN,
-    ACTIONS(1818), 1,
-      anon_sym_PIPE,
-    ACTIONS(1822), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1824), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1830), 1,
-      anon_sym_AMP,
-    ACTIONS(1832), 1,
-      anon_sym_CARET,
-    ACTIONS(1812), 2,
+    ACTIONS(1844), 1,
       anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1814), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1820), 2,
+    ACTIONS(1846), 1,
+      anon_sym_if,
+    ACTIONS(1848), 1,
+      anon_sym_COLON,
+    ACTIONS(1852), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1854), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1856), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    STATE(1056), 1,
+      sym_string,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
+      sym_pattern_class_name,
+    ACTIONS(1850), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(925), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1740), 3,
-      anon_sym_EQ,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1826), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1738), 15,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [49999] = 14,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1198), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1310), 4,
+      sym__match_pattern,
+      sym_match_as_pattern,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(1114), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [50119] = 19,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1808), 1,
+    ACTIONS(1864), 1,
       anon_sym_DOT,
-    ACTIONS(1810), 1,
+    ACTIONS(1866), 1,
       anon_sym_LPAREN,
-    ACTIONS(1822), 1,
+    ACTIONS(1874), 1,
+      anon_sym_PIPE,
+    ACTIONS(1878), 1,
       anon_sym_LBRACK,
-    ACTIONS(1824), 1,
+    ACTIONS(1880), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1830), 1,
+    ACTIONS(1884), 1,
+      anon_sym_not,
+    ACTIONS(1886), 1,
       anon_sym_AMP,
-    ACTIONS(1832), 1,
+    ACTIONS(1888), 1,
       anon_sym_CARET,
-    ACTIONS(1812), 2,
+    ACTIONS(1892), 1,
+      anon_sym_is,
+    STATE(1017), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1868), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1814), 2,
+    ACTIONS(1870), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1820), 2,
+    ACTIONS(1876), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(925), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1714), 3,
-      anon_sym_EQ,
+    ACTIONS(1890), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1826), 3,
+    STATE(972), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1882), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 16,
-      anon_sym_COMMA,
-      anon_sym_if,
+    ACTIONS(1872), 6,
       anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [50065] = 10,
+    ACTIONS(1634), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_and,
+      anon_sym_or,
+  [50195] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1808), 1,
+    ACTIONS(1766), 1,
       anon_sym_DOT,
-    ACTIONS(1810), 1,
+    ACTIONS(1768), 1,
       anon_sym_LPAREN,
-    ACTIONS(1822), 1,
+    ACTIONS(1780), 1,
       anon_sym_LBRACK,
-    ACTIONS(1824), 1,
+    ACTIONS(1782), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1812), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    STATE(925), 2,
+    STATE(910), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 3,
+    ACTIONS(1733), 5,
+      anon_sym_STAR,
       anon_sym_EQ,
+      anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1826), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 22,
+    ACTIONS(1731), 25,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
@@ -65964,9 +66034,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_RBRACE,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
@@ -65978,35 +66051,94 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [50123] = 8,
+  [50249] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1808), 1,
-      anon_sym_DOT,
-    ACTIONS(1810), 1,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    ACTIONS(1840), 1,
+      sym_identifier,
+    ACTIONS(1842), 1,
       anon_sym_LPAREN,
-    ACTIONS(1822), 1,
+    ACTIONS(1844), 1,
+      anon_sym_STAR,
+    ACTIONS(1852), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1854), 1,
       anon_sym_LBRACK,
-    ACTIONS(1824), 1,
-      anon_sym_STAR_STAR,
-    STATE(925), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1714), 5,
+    ACTIONS(1856), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    STATE(1056), 1,
+      sym_string,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
+      sym_pattern_class_name,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1198), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    STATE(1423), 2,
+      sym__match_patterns,
+      sym_open_sequence_match_pattern,
+    STATE(1424), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    STATE(1571), 2,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1114), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [50331] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(652), 1,
+      sym__string_start,
+    STATE(766), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(1241), 4,
       anon_sym_STAR,
-      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 25,
+    ACTIONS(1236), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_RBRACE,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -66022,236 +66154,152 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [50177] = 13,
+  [50379] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1808), 1,
-      anon_sym_DOT,
-    ACTIONS(1810), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1822), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1824), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1832), 1,
-      anon_sym_CARET,
-    ACTIONS(1812), 2,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    STATE(762), 2,
+      sym_template_string,
+      aux_sym_concatenated_template_string_repeat1,
+    ACTIONS(1241), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1814), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1820), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(925), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1714), 3,
-      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1826), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 17,
+    ACTIONS(1236), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
-      anon_sym_RBRACE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [50241] = 12,
+  [50427] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1808), 1,
-      anon_sym_DOT,
-    ACTIONS(1810), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1822), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1824), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1812), 2,
+    ACTIONS(1540), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1814), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1820), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(925), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1714), 3,
-      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1826), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 18,
+    ACTIONS(1538), 32,
+      sym__string_start,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
       anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [50303] = 15,
+  [50471] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1808), 1,
-      anon_sym_DOT,
-    ACTIONS(1810), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1818), 1,
-      anon_sym_PIPE,
-    ACTIONS(1822), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1824), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1830), 1,
-      anon_sym_AMP,
-    ACTIONS(1832), 1,
-      anon_sym_CARET,
-    ACTIONS(1812), 2,
+    ACTIONS(1552), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1814), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1820), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(925), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1718), 3,
-      anon_sym_EQ,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1826), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1716), 15,
+    ACTIONS(1550), 32,
+      sym__template_string_start,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
       anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
       anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [50371] = 15,
+  [50515] = 8,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1808), 1,
       anon_sym_DOT,
     ACTIONS(1810), 1,
       anon_sym_LPAREN,
-    ACTIONS(1818), 1,
-      anon_sym_PIPE,
     ACTIONS(1822), 1,
       anon_sym_LBRACK,
     ACTIONS(1824), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1830), 1,
-      anon_sym_AMP,
-    ACTIONS(1832), 1,
-      anon_sym_CARET,
-    ACTIONS(1812), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1814), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1820), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(925), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1722), 3,
-      anon_sym_EQ,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1826), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1720), 15,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_RBRACE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [50439] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1748), 1,
-      anon_sym_DOT,
-    ACTIONS(1750), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1762), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1764), 1,
-      anon_sym_STAR_STAR,
-    STATE(895), 2,
+    STATE(904), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1730), 5,
+    ACTIONS(1737), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1728), 25,
+    ACTIONS(1735), 25,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
@@ -66277,32 +66325,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [50493] = 8,
+  [50569] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1766), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1768), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1780), 1,
       anon_sym_LBRACK,
-    ACTIONS(1788), 1,
+    ACTIONS(1782), 1,
       anon_sym_STAR_STAR,
-    STATE(708), 2,
+    STATE(910), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 4,
+    ACTIONS(1737), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 26,
+    ACTIONS(1735), 25,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -66323,34 +66369,164 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [50547] = 11,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [50623] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
-      anon_sym_DOT,
-    ACTIONS(1556), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1570), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1788), 1,
+    ACTIONS(1544), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1542), 32,
+      sym__string_start,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
-    ACTIONS(1714), 2,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [50667] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1548), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1778), 2,
+    ACTIONS(1546), 32,
+      sym__template_string_start,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [50711] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1630), 1,
+      anon_sym_DOT,
+    ACTIONS(1632), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1646), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1752), 1,
+      anon_sym_STAR_STAR,
+    STATE(731), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1726), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1724), 26,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_RBRACE,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [50765] = 11,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1630), 1,
+      anon_sym_DOT,
+    ACTIONS(1632), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1646), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1752), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1726), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1742), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1786), 2,
+    ACTIONS(1750), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1790), 3,
+    ACTIONS(1754), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 21,
+    ACTIONS(1724), 21,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
@@ -66372,43 +66548,43 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [50607] = 15,
+  [50825] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1784), 1,
+    ACTIONS(1748), 1,
       anon_sym_PIPE,
-    ACTIONS(1788), 1,
+    ACTIONS(1752), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1794), 1,
+    ACTIONS(1758), 1,
       anon_sym_AMP,
-    ACTIONS(1796), 1,
+    ACTIONS(1760), 1,
       anon_sym_CARET,
-    ACTIONS(1740), 2,
+    ACTIONS(1714), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1778), 2,
+    ACTIONS(1742), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1780), 2,
+    ACTIONS(1744), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1786), 2,
+    ACTIONS(1750), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1790), 3,
+    ACTIONS(1754), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1738), 16,
+    ACTIONS(1712), 16,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_COLON,
@@ -66425,41 +66601,41 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [50675] = 14,
+  [50893] = 14,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1788), 1,
+    ACTIONS(1752), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1794), 1,
+    ACTIONS(1758), 1,
       anon_sym_AMP,
-    ACTIONS(1796), 1,
+    ACTIONS(1760), 1,
       anon_sym_CARET,
-    ACTIONS(1714), 2,
+    ACTIONS(1726), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1778), 2,
+    ACTIONS(1742), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1780), 2,
+    ACTIONS(1744), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1786), 2,
+    ACTIONS(1750), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1790), 3,
+    ACTIONS(1754), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 17,
+    ACTIONS(1724), 17,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_COLON,
@@ -66477,31 +66653,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [50741] = 10,
+  [50959] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1788), 1,
+    ACTIONS(1752), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1714), 2,
+    ACTIONS(1726), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1778), 2,
+    ACTIONS(1742), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1790), 3,
+    ACTIONS(1754), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 23,
+    ACTIONS(1724), 23,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
@@ -66525,26 +66701,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [50799] = 8,
+  [51017] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1788), 1,
+    ACTIONS(1752), 1,
       anon_sym_STAR_STAR,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 4,
+    ACTIONS(1726), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 26,
+    ACTIONS(1724), 26,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
@@ -66571,39 +66747,39 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [50853] = 13,
+  [51071] = 13,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1788), 1,
+    ACTIONS(1752), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1796), 1,
+    ACTIONS(1760), 1,
       anon_sym_CARET,
-    ACTIONS(1714), 2,
+    ACTIONS(1726), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1778), 2,
+    ACTIONS(1742), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1780), 2,
+    ACTIONS(1744), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1786), 2,
+    ACTIONS(1750), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1790), 3,
+    ACTIONS(1754), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 18,
+    ACTIONS(1724), 18,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_COLON,
@@ -66622,37 +66798,37 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [50917] = 12,
+  [51135] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1788), 1,
+    ACTIONS(1752), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1714), 2,
+    ACTIONS(1726), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1778), 2,
+    ACTIONS(1742), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1780), 2,
+    ACTIONS(1744), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1786), 2,
+    ACTIONS(1750), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1790), 3,
+    ACTIONS(1754), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 19,
+    ACTIONS(1724), 19,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_COLON,
@@ -66672,39 +66848,39 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [50979] = 15,
+  [51197] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1784), 1,
+    ACTIONS(1748), 1,
       anon_sym_PIPE,
-    ACTIONS(1788), 1,
+    ACTIONS(1752), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1794), 1,
+    ACTIONS(1758), 1,
       anon_sym_AMP,
-    ACTIONS(1796), 1,
+    ACTIONS(1760), 1,
       anon_sym_CARET,
     ACTIONS(1718), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1778), 2,
+    ACTIONS(1742), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1780), 2,
+    ACTIONS(1744), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1786), 2,
+    ACTIONS(1750), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1790), 3,
+    ACTIONS(1754), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
@@ -66725,39 +66901,39 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [51047] = 15,
+  [51265] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1784), 1,
+    ACTIONS(1748), 1,
       anon_sym_PIPE,
-    ACTIONS(1788), 1,
+    ACTIONS(1752), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1794), 1,
+    ACTIONS(1758), 1,
       anon_sym_AMP,
-    ACTIONS(1796), 1,
+    ACTIONS(1760), 1,
       anon_sym_CARET,
     ACTIONS(1722), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1778), 2,
+    ACTIONS(1742), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1780), 2,
+    ACTIONS(1744), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1786), 2,
+    ACTIONS(1750), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1790), 3,
+    ACTIONS(1754), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
@@ -66778,26 +66954,86 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [51115] = 8,
+  [51333] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    ACTIONS(1840), 1,
+      sym_identifier,
+    ACTIONS(1842), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1844), 1,
+      anon_sym_STAR,
+    ACTIONS(1852), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1854), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1856), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    STATE(1056), 1,
+      sym_string,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
+      sym_pattern_class_name,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1198), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    STATE(1424), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    STATE(1482), 2,
+      sym__match_patterns,
+      sym_open_sequence_match_pattern,
+    STATE(1571), 2,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1114), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [51415] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1788), 1,
+    ACTIONS(1752), 1,
       anon_sym_STAR_STAR,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1730), 4,
+    ACTIONS(1733), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1728), 26,
+    ACTIONS(1731), 26,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
@@ -66824,35 +67060,96 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [51169] = 8,
+  [51469] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1808), 1,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    ACTIONS(1840), 1,
+      sym_identifier,
+    ACTIONS(1842), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1844), 1,
+      anon_sym_STAR,
+    ACTIONS(1852), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1854), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1856), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    ACTIONS(1894), 1,
+      anon_sym_if,
+    ACTIONS(1896), 1,
+      anon_sym_COLON,
+    STATE(1056), 1,
+      sym_string,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
+      sym_pattern_class_name,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1198), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1310), 4,
+      sym__match_pattern,
+      sym_match_as_pattern,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(1114), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [51551] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1864), 1,
       anon_sym_DOT,
-    ACTIONS(1810), 1,
+    ACTIONS(1866), 1,
       anon_sym_LPAREN,
-    ACTIONS(1822), 1,
+    ACTIONS(1878), 1,
       anon_sym_LBRACK,
-    ACTIONS(1824), 1,
+    ACTIONS(1880), 1,
       anon_sym_STAR_STAR,
-    STATE(925), 2,
+    STATE(972), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 5,
+    ACTIONS(1726), 4,
       anon_sym_STAR,
-      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 25,
+    ACTIONS(1724), 25,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_RBRACE,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -66868,27 +67165,27 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [51223] = 4,
+  [51604] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1268), 1,
+    ACTIONS(604), 1,
       anon_sym_COLON_EQ,
-    ACTIONS(1209), 5,
-      anon_sym_STAR,
+    ACTIONS(656), 1,
       anon_sym_EQ,
+    ACTIONS(272), 4,
+      anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 29,
-      sym__newline,
+    ACTIONS(303), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -66910,30 +67207,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [51268] = 4,
+  [51651] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1870), 1,
+    ACTIONS(1838), 1,
       anon_sym_COLON_EQ,
-    ACTIONS(1209), 5,
+    ACTIONS(1238), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(1241), 4,
       anon_sym_STAR,
-      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 29,
+    ACTIONS(1236), 27,
       anon_sym_DOT,
       anon_sym_LPAREN,
-      anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -66950,38 +67249,29 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [51313] = 8,
+  [51698] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1840), 1,
-      anon_sym_DOT,
-    ACTIONS(1842), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1854), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1856), 1,
-      anon_sym_STAR_STAR,
-    STATE(953), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1730), 4,
+    ACTIONS(1544), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1728), 25,
-      anon_sym_RPAREN,
+    ACTIONS(1542), 30,
+      sym__string_start,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -66997,99 +67287,160 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [51366] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [51741] = 13,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1544), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1542), 30,
-      sym__template_string_start,
+    ACTIONS(1864), 1,
       anon_sym_DOT,
+    ACTIONS(1866), 1,
       anon_sym_LPAREN,
-      anon_sym_COMMA,
+    ACTIONS(1878), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1880), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1888), 1,
+      anon_sym_CARET,
+    ACTIONS(1726), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1868), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1870), 2,
       anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
+      anon_sym_LT_LT,
+    ACTIONS(1876), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
+    STATE(972), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1882), 3,
       anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1724), 17,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [51409] = 4,
+  [51804] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(283), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(272), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(303), 29,
-      sym__newline,
+    ACTIONS(1864), 1,
       anon_sym_DOT,
-      anon_sym_from,
+    ACTIONS(1866), 1,
       anon_sym_LPAREN,
-      anon_sym_COMMA,
+    ACTIONS(1878), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1880), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1726), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1868), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1870), 2,
       anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
+      anon_sym_LT_LT,
+    ACTIONS(1876), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
+    STATE(972), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1882), 3,
       anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1724), 18,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [51454] = 4,
+  [51865] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(618), 1,
+    ACTIONS(1473), 3,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_LBRACK,
+    ACTIONS(1478), 13,
+      anon_sym_STAR,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+    ACTIONS(1480), 19,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [51910] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1898), 1,
       anon_sym_COLON_EQ,
-    ACTIONS(272), 5,
+    ACTIONS(1241), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 29,
+    ACTIONS(1236), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -67119,32 +67470,36 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [51499] = 4,
+  [51955] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1872), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1209), 5,
+    ACTIONS(1864), 1,
+      anon_sym_DOT,
+    ACTIONS(1866), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1878), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1880), 1,
+      anon_sym_STAR_STAR,
+    STATE(972), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1733), 4,
       anon_sym_STAR,
-      anon_sym_COLON,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 29,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
+    ACTIONS(1731), 25,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
@@ -67160,14 +67515,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [51544] = 4,
+  [52008] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1290), 3,
+    ACTIONS(1306), 3,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_LBRACK,
-    ACTIONS(1295), 13,
+    ACTIONS(1311), 13,
       anon_sym_STAR,
       anon_sym_GT_GT,
       anon_sym_PIPE,
@@ -67181,7 +67536,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
-    ACTIONS(1297), 19,
+    ACTIONS(1313), 19,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -67201,26 +67556,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [51589] = 8,
+  [52053] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1840), 1,
+    ACTIONS(1864), 1,
       anon_sym_DOT,
-    ACTIONS(1842), 1,
+    ACTIONS(1866), 1,
       anon_sym_LPAREN,
-    ACTIONS(1854), 1,
+    ACTIONS(1878), 1,
       anon_sym_LBRACK,
-    ACTIONS(1856), 1,
+    ACTIONS(1880), 1,
       anon_sym_STAR_STAR,
-    STATE(953), 2,
+    STATE(972), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1726), 4,
+    ACTIONS(1737), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1724), 25,
+    ACTIONS(1735), 25,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -67246,16 +67601,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [51642] = 3,
+  [52106] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1540), 5,
+    ACTIONS(1552), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1538), 30,
+    ACTIONS(1550), 30,
       sym__template_string_start,
       anon_sym_DOT,
       anon_sym_LPAREN,
@@ -67286,57 +67641,96 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [51685] = 22,
+  [52149] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
+    ACTIONS(1544), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1542), 30,
+      sym__newline,
       sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(1874), 1,
-      sym_identifier,
-    ACTIONS(1876), 1,
+      anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
-    ACTIONS(1878), 1,
-      anon_sym_STAR,
-    ACTIONS(1880), 1,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
       anon_sym_if,
-    ACTIONS(1882), 1,
-      anon_sym_COLON,
-    ACTIONS(1884), 1,
+      anon_sym_in,
+      anon_sym_PIPE,
       anon_sym_DASH,
-    ACTIONS(1886), 1,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_SEMI,
+  [52192] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    ACTIONS(1840), 1,
+      sym_identifier,
+    ACTIONS(1842), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1844), 1,
+      anon_sym_STAR,
+    ACTIONS(1852), 1,
       sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
+    ACTIONS(1854), 1,
       anon_sym_LBRACK,
-    ACTIONS(1890), 1,
+    ACTIONS(1856), 1,
       anon_sym_LBRACE,
-    ACTIONS(1892), 1,
+    ACTIONS(1858), 1,
       sym_integer,
-    ACTIONS(1894), 1,
+    ACTIONS(1860), 1,
       sym_float,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
+    ACTIONS(1900), 1,
+      anon_sym_RPAREN,
+    STATE(1056), 1,
       sym_string,
-    STATE(1650), 1,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
       sym_pattern_class_name,
-    STATE(1116), 2,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
       sym_concatenated_string,
       sym_concatenated_template_string,
-    STATE(1240), 2,
+    STATE(1198), 2,
       sym__match_or_pattern,
       sym_match_or_pattern,
-    ACTIONS(1896), 3,
+    ACTIONS(1862), 3,
       sym_true,
       sym_false,
       sym_none,
-    STATE(1307), 4,
+    STATE(1310), 4,
       sym__match_pattern,
       sym_match_as_pattern,
       sym__match_maybe_star_pattern,
       sym_match_star_pattern,
-    STATE(1117), 8,
+    STATE(1114), 8,
       sym__closed_pattern,
       sym_match_literal_pattern,
       sym_match_capture_pattern,
@@ -67345,181 +67739,182 @@ static const uint16_t ts_small_parse_table[] = {
       sym_match_sequence_pattern,
       sym_match_mapping_pattern,
       sym_match_class_pattern,
-  [51766] = 4,
+  [52271] = 21,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1204), 3,
-      anon_sym_DOT,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    ACTIONS(1840), 1,
+      sym_identifier,
+    ACTIONS(1842), 1,
       anon_sym_LPAREN,
-      anon_sym_LBRACK,
-    ACTIONS(1209), 13,
+    ACTIONS(1844), 1,
       anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-    ACTIONS(1272), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_in,
+    ACTIONS(1852), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1854), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1856), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    ACTIONS(1900), 1,
       anon_sym_RBRACK,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [51811] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1548), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1546), 30,
-      sym__newline,
-      sym__string_start,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
+    STATE(1056), 1,
+      sym_string,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
+      sym_pattern_class_name,
+    ACTIONS(1850), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_SEMI,
-  [51854] = 8,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1198), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1310), 4,
+      sym__match_pattern,
+      sym_match_as_pattern,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(1114), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [52350] = 22,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
     ACTIONS(1840), 1,
-      anon_sym_DOT,
+      sym_identifier,
     ACTIONS(1842), 1,
       anon_sym_LPAREN,
+    ACTIONS(1844), 1,
+      anon_sym_STAR,
+    ACTIONS(1852), 1,
+      sym_match_wildcard_pattern,
     ACTIONS(1854), 1,
       anon_sym_LBRACK,
     ACTIONS(1856), 1,
-      anon_sym_STAR_STAR,
-    STATE(953), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1714), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1712), 25,
+      anon_sym_LBRACE,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    ACTIONS(1902), 1,
       anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
+    STATE(1056), 1,
+      sym_string,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
+      sym_pattern_class_name,
+    ACTIONS(1850), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [51907] = 11,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1198), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    STATE(1603), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    STATE(1605), 2,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1114), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [52431] = 21,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
     ACTIONS(1840), 1,
-      anon_sym_DOT,
+      sym_identifier,
     ACTIONS(1842), 1,
       anon_sym_LPAREN,
+    ACTIONS(1844), 1,
+      anon_sym_STAR,
+    ACTIONS(1852), 1,
+      sym_match_wildcard_pattern,
     ACTIONS(1854), 1,
       anon_sym_LBRACK,
     ACTIONS(1856), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1714), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1844), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1852), 2,
+      anon_sym_LBRACE,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    ACTIONS(1902), 1,
+      anon_sym_RBRACK,
+    STATE(1056), 1,
+      sym_string,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
+      sym_pattern_class_name,
+    ACTIONS(1850), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(953), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1858), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 20,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [51966] = 3,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1198), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1438), 4,
+      sym__match_pattern,
+      sym_match_as_pattern,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(1114), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [52510] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1548), 5,
@@ -67529,46 +67924,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT,
       anon_sym_GT,
     ACTIONS(1546), 30,
-      sym__string_start,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [52009] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1544), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1542), 30,
       sym__newline,
       sym__template_string_start,
       anon_sym_DOT,
@@ -67599,17 +67954,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [52052] = 3,
+  [52553] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1552), 5,
+    ACTIONS(618), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(272), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1550), 30,
-      sym__string_start,
+    ACTIONS(303), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -67639,54 +67995,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [52095] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1838), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1206), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(1209), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1204), 27,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [52142] = 5,
+  [52598] = 5,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(604), 1,
       anon_sym_COLON_EQ,
-    ACTIONS(277), 3,
+    ACTIONS(587), 3,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_RBRACK,
@@ -67723,14 +68037,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [52189] = 4,
+  [52645] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1333), 3,
+    ACTIONS(303), 3,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_LBRACK,
-    ACTIONS(1338), 13,
+    ACTIONS(272), 13,
       anon_sym_STAR,
       anon_sym_GT_GT,
       anon_sym_PIPE,
@@ -67744,7 +68058,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
-    ACTIONS(1340), 19,
+    ACTIONS(307), 19,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -67764,18 +68078,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [52234] = 3,
+  [52690] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1552), 5,
+    ACTIONS(1276), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1241), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1550), 30,
+    ACTIONS(1236), 29,
       sym__newline,
-      sym__string_start,
       anon_sym_DOT,
       anon_sym_from,
       anon_sym_LPAREN,
@@ -67804,61 +68119,75 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [52277] = 3,
+  [52735] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1540), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1538), 30,
-      sym__newline,
-      sym__template_string_start,
+    ACTIONS(1864), 1,
       anon_sym_DOT,
-      anon_sym_from,
+    ACTIONS(1866), 1,
       anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
+    ACTIONS(1874), 1,
       anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
+    ACTIONS(1878), 1,
       anon_sym_LBRACK,
+    ACTIONS(1880), 1,
       anon_sym_STAR_STAR,
+    ACTIONS(1886), 1,
+      anon_sym_AMP,
+    ACTIONS(1888), 1,
+      anon_sym_CARET,
+    ACTIONS(1714), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1868), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1870), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1876), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(972), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1882), 3,
       anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1712), 15,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [52320] = 4,
+  [52802] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(638), 1,
+    ACTIONS(604), 1,
       anon_sym_COLON_EQ,
-    ACTIONS(272), 5,
+    ACTIONS(277), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(272), 4,
       anon_sym_STAR,
-      anon_sym_COLON,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 29,
+    ACTIONS(303), 27,
       anon_sym_DOT,
       anon_sym_LPAREN,
-      anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_async,
@@ -67868,7 +68197,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -67885,84 +68213,239 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [52365] = 4,
+  [52849] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(303), 3,
+    ACTIONS(1540), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1538), 30,
+      sym__newline,
+      sym__string_start,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
-      anon_sym_LBRACK,
-    ACTIONS(272), 13,
-      anon_sym_STAR,
+      anon_sym_COMMA,
       anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
       anon_sym_STAR_STAR,
       anon_sym_AT,
-      anon_sym_SLASH,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
-    ACTIONS(307), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [52410] = 15,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_SEMI,
+  [52892] = 21,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
     ACTIONS(1840), 1,
-      anon_sym_DOT,
+      sym_identifier,
     ACTIONS(1842), 1,
       anon_sym_LPAREN,
-    ACTIONS(1850), 1,
-      anon_sym_PIPE,
+    ACTIONS(1844), 1,
+      anon_sym_STAR,
+    ACTIONS(1852), 1,
+      sym_match_wildcard_pattern,
     ACTIONS(1854), 1,
       anon_sym_LBRACK,
     ACTIONS(1856), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1862), 1,
-      anon_sym_AMP,
-    ACTIONS(1864), 1,
-      anon_sym_CARET,
-    ACTIONS(1740), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1844), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1846), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1852), 2,
+      anon_sym_LBRACE,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    ACTIONS(1904), 1,
+      anon_sym_RPAREN,
+    STATE(1056), 1,
+      sym_string,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
+      sym_pattern_class_name,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1198), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1310), 4,
+      sym__match_pattern,
+      sym_match_as_pattern,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(1114), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [52971] = 21,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    ACTIONS(1840), 1,
+      sym_identifier,
+    ACTIONS(1842), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1844), 1,
+      anon_sym_STAR,
+    ACTIONS(1852), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1854), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1856), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    ACTIONS(1904), 1,
+      anon_sym_RBRACK,
+    STATE(1056), 1,
+      sym_string,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
+      sym_pattern_class_name,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1198), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1310), 4,
+      sym__match_pattern,
+      sym_match_as_pattern,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(1114), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [53050] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1548), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1546), 30,
+      sym__template_string_start,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [53093] = 15,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1864), 1,
+      anon_sym_DOT,
+    ACTIONS(1866), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1874), 1,
+      anon_sym_PIPE,
+    ACTIONS(1878), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1880), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1886), 1,
+      anon_sym_AMP,
+    ACTIONS(1888), 1,
+      anon_sym_CARET,
+    ACTIONS(1722), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1868), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(1870), 2,
+      anon_sym_GT_GT,
+      anon_sym_LT_LT,
+    ACTIONS(1876), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(953), 2,
+    STATE(972), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1858), 3,
+    ACTIONS(1882), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1738), 15,
+    ACTIONS(1720), 15,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -67978,22 +68461,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [52477] = 5,
+  [53160] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(604), 1,
+    ACTIONS(1906), 1,
       anon_sym_COLON_EQ,
-    ACTIONS(634), 1,
-      anon_sym_EQ,
-    ACTIONS(272), 4,
+    ACTIONS(1241), 5,
       anon_sym_STAR,
+      anon_sym_COLON,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 29,
+    ACTIONS(1236), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
-      anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
@@ -68004,6 +68485,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -68020,32 +68502,28 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [52524] = 5,
+  [53205] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1838), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1898), 1,
-      anon_sym_EQ,
-    ACTIONS(1209), 4,
+    ACTIONS(1540), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 29,
+    ACTIONS(1538), 30,
+      sym__string_start,
       anon_sym_DOT,
       anon_sym_LPAREN,
-      anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -68062,23 +68540,72 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [52571] = 5,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [53248] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(604), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(587), 3,
+    ACTIONS(1864), 1,
+      anon_sym_DOT,
+    ACTIONS(1866), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1878), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1880), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1726), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1868), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    STATE(972), 2,
+      sym_argument_list,
+      sym_generator_expression,
+    ACTIONS(1882), 3,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(1724), 22,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(272), 4,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [53305] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1838), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1908), 1,
+      anon_sym_EQ,
+    ACTIONS(1241), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 27,
+    ACTIONS(1236), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_async,
@@ -68104,14 +68631,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [52618] = 4,
+  [53352] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1204), 3,
+    ACTIONS(303), 3,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_LBRACK,
-    ACTIONS(1209), 13,
+    ACTIONS(272), 13,
       anon_sym_STAR,
       anon_sym_GT_GT,
       anon_sym_PIPE,
@@ -68125,7 +68652,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
-    ACTIONS(1211), 19,
+    ACTIONS(598), 19,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -68145,154 +68672,79 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [52663] = 22,
+  [53397] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(1874), 1,
-      sym_identifier,
-    ACTIONS(1876), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1878), 1,
+    ACTIONS(1552), 5,
       anon_sym_STAR,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1886), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1890), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    ACTIONS(1900), 1,
-      anon_sym_if,
-    ACTIONS(1902), 1,
-      anon_sym_COLON,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
-      sym_string,
-    STATE(1650), 1,
-      sym_pattern_class_name,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1240), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1307), 4,
-      sym__match_pattern,
-      sym_match_as_pattern,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    STATE(1117), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [52744] = 14,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1840), 1,
-      anon_sym_DOT,
-    ACTIONS(1842), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1854), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1856), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1862), 1,
-      anon_sym_AMP,
-    ACTIONS(1864), 1,
-      anon_sym_CARET,
-    ACTIONS(1714), 2,
+      anon_sym_EQ,
+      anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1844), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1846), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1852), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    STATE(953), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1858), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 16,
-      anon_sym_RPAREN,
+    ACTIONS(1550), 30,
+      sym__newline,
+      sym__template_string_start,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
+      anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [52809] = 10,
+      anon_sym_SEMI,
+  [53440] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1840), 1,
-      anon_sym_DOT,
-    ACTIONS(1842), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1854), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1856), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1714), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1844), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    STATE(953), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1858), 3,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 22,
+    ACTIONS(1838), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1273), 3,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
+      anon_sym_RBRACK,
+    ACTIONS(1241), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1236), 27,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
@@ -68302,26 +68754,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [52866] = 8,
+  [53487] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1840), 1,
+    ACTIONS(1864), 1,
       anon_sym_DOT,
-    ACTIONS(1842), 1,
+    ACTIONS(1866), 1,
       anon_sym_LPAREN,
-    ACTIONS(1854), 1,
+    ACTIONS(1878), 1,
       anon_sym_LBRACK,
-    ACTIONS(1856), 1,
+    ACTIONS(1880), 1,
       anon_sym_STAR_STAR,
-    STATE(953), 2,
+    STATE(972), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1714), 4,
+    ACTIONS(1726), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1712), 25,
+    ACTIONS(1724), 25,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -68347,39 +68799,41 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [52919] = 13,
+  [53540] = 14,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1840), 1,
+    ACTIONS(1864), 1,
       anon_sym_DOT,
-    ACTIONS(1842), 1,
+    ACTIONS(1866), 1,
       anon_sym_LPAREN,
-    ACTIONS(1854), 1,
+    ACTIONS(1878), 1,
       anon_sym_LBRACK,
-    ACTIONS(1856), 1,
+    ACTIONS(1880), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1864), 1,
+    ACTIONS(1886), 1,
+      anon_sym_AMP,
+    ACTIONS(1888), 1,
       anon_sym_CARET,
-    ACTIONS(1714), 2,
+    ACTIONS(1726), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1844), 2,
+    ACTIONS(1868), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1846), 2,
+    ACTIONS(1870), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1852), 2,
+    ACTIONS(1876), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(953), 2,
+    STATE(972), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1858), 3,
+    ACTIONS(1882), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 17,
+    ACTIONS(1724), 16,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -68390,47 +68844,44 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_AMP,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [52982] = 12,
+  [53605] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1840), 1,
+    ACTIONS(1864), 1,
       anon_sym_DOT,
-    ACTIONS(1842), 1,
+    ACTIONS(1866), 1,
       anon_sym_LPAREN,
-    ACTIONS(1854), 1,
+    ACTIONS(1878), 1,
       anon_sym_LBRACK,
-    ACTIONS(1856), 1,
+    ACTIONS(1880), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1714), 2,
+    ACTIONS(1726), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1844), 2,
+    ACTIONS(1868), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1846), 2,
-      anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1852), 2,
+    ACTIONS(1876), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(953), 2,
+    STATE(972), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1858), 3,
+    ACTIONS(1882), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1712), 18,
+    ACTIONS(1724), 20,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
+      anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_in,
@@ -68440,45 +68891,46 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_or,
       anon_sym_AMP,
       anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [53043] = 15,
+  [53664] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1840), 1,
+    ACTIONS(1864), 1,
       anon_sym_DOT,
-    ACTIONS(1842), 1,
+    ACTIONS(1866), 1,
       anon_sym_LPAREN,
-    ACTIONS(1850), 1,
+    ACTIONS(1874), 1,
       anon_sym_PIPE,
-    ACTIONS(1854), 1,
+    ACTIONS(1878), 1,
       anon_sym_LBRACK,
-    ACTIONS(1856), 1,
+    ACTIONS(1880), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1862), 1,
+    ACTIONS(1886), 1,
       anon_sym_AMP,
-    ACTIONS(1864), 1,
+    ACTIONS(1888), 1,
       anon_sym_CARET,
     ACTIONS(1718), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1844), 2,
+    ACTIONS(1868), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1846), 2,
+    ACTIONS(1870), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1852), 2,
+    ACTIONS(1876), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(953), 2,
+    STATE(972), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1858), 3,
+    ACTIONS(1882), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
@@ -68498,187 +68950,99 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [53110] = 15,
+  [53731] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1840), 1,
+    ACTIONS(1236), 3,
       anon_sym_DOT,
-    ACTIONS(1842), 1,
       anon_sym_LPAREN,
-    ACTIONS(1850), 1,
-      anon_sym_PIPE,
-    ACTIONS(1854), 1,
       anon_sym_LBRACK,
-    ACTIONS(1856), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1862), 1,
-      anon_sym_AMP,
-    ACTIONS(1864), 1,
-      anon_sym_CARET,
-    ACTIONS(1722), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1844), 2,
+    ACTIONS(1241), 13,
       anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(1846), 2,
       anon_sym_GT_GT,
-      anon_sym_LT_LT,
-    ACTIONS(1852), 2,
+      anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(953), 2,
-      sym_argument_list,
-      sym_generator_expression,
-    ACTIONS(1858), 3,
+      anon_sym_STAR_STAR,
       anon_sym_AT,
+      anon_sym_SLASH,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-    ACTIONS(1720), 15,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+    ACTIONS(1280), 19,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
       anon_sym_COLON,
       anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [53776] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(660), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(272), 5,
+      anon_sym_STAR,
+      anon_sym_COLON,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(303), 29,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_RBRACE,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
       anon_sym_not,
       anon_sym_and,
       anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [53177] = 22,
+  [53821] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(1874), 1,
-      sym_identifier,
-    ACTIONS(1876), 1,
+    ACTIONS(1236), 3,
+      anon_sym_DOT,
       anon_sym_LPAREN,
-    ACTIONS(1878), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1241), 13,
       anon_sym_STAR,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1886), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1890), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
-      sym_string,
-    STATE(1650), 1,
-      sym_pattern_class_name,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1240), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1407), 2,
-      sym__match_patterns,
-      sym_open_sequence_match_pattern,
-    STATE(1408), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    STATE(1595), 2,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1117), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [53258] = 22,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(1874), 1,
-      sym_identifier,
-    ACTIONS(1876), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1878), 1,
-      anon_sym_STAR,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1886), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1890), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
-      sym_string,
-    STATE(1650), 1,
-      sym_pattern_class_name,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1240), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1408), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    STATE(1495), 2,
-      sym__match_patterns,
-      sym_open_sequence_match_pattern,
-    STATE(1595), 2,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1117), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [53339] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(303), 3,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_LBRACK,
-    ACTIONS(272), 13,
-      anon_sym_STAR,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_STAR_STAR,
@@ -68689,7 +69053,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
-    ACTIONS(598), 19,
+    ACTIONS(1243), 19,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -68709,58 +69073,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [53384] = 5,
+  [53866] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1838), 1,
+    ACTIONS(283), 1,
       anon_sym_COLON_EQ,
-    ACTIONS(1265), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(1209), 4,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1204), 27,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-  [53431] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1706), 5,
+    ACTIONS(272), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1704), 29,
+    ACTIONS(303), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -68790,16 +69114,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [53473] = 3,
+  [53911] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1674), 5,
+    ACTIONS(1241), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1672), 29,
+    ACTIONS(1236), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -68829,16 +69153,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [53515] = 3,
+  [53953] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1678), 5,
+    ACTIONS(1588), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1676), 29,
+    ACTIONS(1586), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -68868,16 +69192,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [53557] = 3,
+  [53995] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1032), 5,
+    ACTIONS(1592), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1030), 29,
+    ACTIONS(1590), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -68907,55 +69231,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [53599] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1674), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1672), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_SEMI,
-  [53641] = 3,
+  [54037] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1614), 5,
+    ACTIONS(1592), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1612), 29,
+    ACTIONS(1590), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -68985,16 +69270,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [53683] = 3,
+  [54079] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1682), 5,
+    ACTIONS(1600), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1680), 29,
+    ACTIONS(1598), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -69024,16 +69309,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [53725] = 3,
+  [54121] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1686), 5,
+    ACTIONS(1710), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1684), 29,
+    ACTIONS(1708), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -69063,16 +69348,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [53767] = 3,
+  [54163] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1690), 5,
+    ACTIONS(1592), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1688), 29,
+    ACTIONS(1590), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -69102,16 +69387,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [53809] = 3,
+  [54205] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1690), 5,
+    ACTIONS(1576), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1688), 29,
+    ACTIONS(1574), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -69141,16 +69426,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [53851] = 3,
+  [54247] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1694), 5,
+    ACTIONS(1576), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1692), 29,
+    ACTIONS(1574), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -69180,16 +69465,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [53893] = 3,
+  [54289] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1698), 5,
+    ACTIONS(1604), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1696), 29,
+    ACTIONS(1602), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -69219,16 +69504,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [53935] = 3,
+  [54331] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1690), 5,
+    ACTIONS(1576), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1688), 29,
+    ACTIONS(1574), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -69258,17 +69543,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [53977] = 3,
+  [54373] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1702), 5,
+    ACTIONS(1560), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1700), 29,
+    ACTIONS(1558), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -69278,7 +69565,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -69295,19 +69581,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [54019] = 3,
+      anon_sym_SEMI,
+  [54415] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1702), 5,
+    ACTIONS(1478), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1700), 29,
+    ACTIONS(1473), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -69317,7 +69604,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -69334,57 +69620,75 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [54061] = 3,
+      anon_sym_SEMI,
+  [54457] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1706), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1704), 29,
-      anon_sym_DOT,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    ACTIONS(1842), 1,
       anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
+    ACTIONS(1852), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1854), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1856), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    ACTIONS(1910), 1,
+      sym_identifier,
+    ACTIONS(1912), 1,
+      anon_sym_RPAREN,
+    STATE(1056), 1,
+      sym_string,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1522), 1,
+      sym_match_positional_pattern,
+    STATE(1523), 1,
+      sym_match_keyword_pattern,
+    STATE(1662), 1,
+      sym_pattern_class_name,
+    ACTIONS(1850), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_RBRACE,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [54103] = 3,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1198), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    STATE(1604), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1114), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [54537] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1702), 5,
+    ACTIONS(272), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1700), 29,
+    ACTIONS(303), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -69414,17 +69718,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [54145] = 3,
+  [54579] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1622), 5,
+    ACTIONS(1572), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1620), 29,
+    ACTIONS(1570), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -69434,7 +69740,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -69451,19 +69756,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [54187] = 3,
+      anon_sym_SEMI,
+  [54621] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1626), 5,
+    ACTIONS(1311), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1624), 29,
+    ACTIONS(1306), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -69473,7 +69779,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -69490,31 +69795,29 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [54229] = 3,
+      anon_sym_SEMI,
+  [54663] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1338), 4,
+    ACTIONS(1576), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1333), 30,
+    ACTIONS(1574), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -69531,29 +69834,29 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [54271] = 3,
+      anon_sym_SEMI,
+  [54705] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1295), 4,
+    ACTIONS(1596), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1290), 30,
+    ACTIONS(1594), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -69570,17 +69873,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [54313] = 3,
+      anon_sym_SEMI,
+  [54747] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1630), 5,
+    ACTIONS(1576), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1628), 29,
+    ACTIONS(1574), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -69590,7 +69896,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -69607,18 +69912,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [54355] = 3,
+      anon_sym_SEMI,
+  [54789] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1618), 5,
+    ACTIONS(1604), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1616), 29,
+    ACTIONS(1602), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -69648,131 +69952,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [54397] = 22,
+  [54831] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(1874), 1,
-      sym_identifier,
-    ACTIONS(1876), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1878), 1,
-      anon_sym_STAR,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1886), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1890), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    ACTIONS(1904), 1,
-      anon_sym_RPAREN,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
-      sym_string,
-    STATE(1650), 1,
-      sym_pattern_class_name,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1240), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1601), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    STATE(1602), 2,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1117), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [54477] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(1874), 1,
-      sym_identifier,
-    ACTIONS(1876), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1878), 1,
-      anon_sym_STAR,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1886), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1890), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    ACTIONS(1904), 1,
-      anon_sym_RBRACK,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
-      sym_string,
-    STATE(1650), 1,
-      sym_pattern_class_name,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1240), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1489), 4,
-      sym__match_pattern,
-      sym_match_as_pattern,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    STATE(1117), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [54555] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1682), 5,
+    ACTIONS(1576), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1680), 29,
+    ACTIONS(1574), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -69802,16 +69991,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [54597] = 3,
+  [54873] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1634), 5,
+    ACTIONS(1612), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1632), 29,
+    ACTIONS(1610), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -69841,16 +70030,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [54639] = 3,
+  [54915] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1650), 5,
+    ACTIONS(1612), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1648), 29,
+    ACTIONS(1610), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -69880,17 +70069,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [54681] = 3,
+  [54957] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1638), 5,
+    ACTIONS(1616), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1636), 29,
+    ACTIONS(1614), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -69900,7 +70091,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -69917,19 +70107,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [54723] = 3,
+      anon_sym_SEMI,
+  [54999] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1642), 5,
+    ACTIONS(1674), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1640), 29,
+    ACTIONS(1672), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -69939,7 +70130,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -69956,18 +70146,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [54765] = 3,
+      anon_sym_SEMI,
+  [55041] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1686), 5,
+    ACTIONS(1241), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1684), 29,
+    ACTIONS(1236), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -69997,16 +70186,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [54807] = 3,
+  [55083] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1690), 5,
+    ACTIONS(1568), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1688), 29,
+    ACTIONS(1566), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -70036,23 +70225,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [54849] = 3,
+  [55125] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1690), 5,
+    ACTIONS(1308), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(1311), 4,
       anon_sym_STAR,
-      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1688), 29,
-      sym__newline,
+    ACTIONS(1306), 27,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
-      anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -70074,18 +70265,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [54891] = 3,
+  [55169] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1050), 5,
+    ACTIONS(1584), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1048), 29,
+    ACTIONS(1582), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -70095,7 +70287,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -70112,20 +70303,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [54933] = 4,
+      anon_sym_SEMI,
+  [55211] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1906), 1,
+    ACTIONS(1914), 1,
       anon_sym_COLON_EQ,
-    ACTIONS(1209), 5,
+    ACTIONS(1241), 5,
       anon_sym_STAR,
       anon_sym_COLON,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 28,
+    ACTIONS(1236), 28,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -70154,19 +70344,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [54977] = 3,
+  [55255] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1694), 5,
+    ACTIONS(1674), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1692), 29,
-      sym__newline,
+    ACTIONS(1672), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -70176,6 +70364,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -70192,22 +70381,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [55019] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [55297] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1698), 5,
+    ACTIONS(640), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(272), 5,
       anon_sym_STAR,
-      anon_sym_EQ,
+      anon_sym_COLON,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1696), 29,
-      sym__newline,
+    ACTIONS(303), 28,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_in,
@@ -70231,20 +70423,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [55061] = 3,
+  [55341] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1690), 5,
+    ACTIONS(1670), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1688), 29,
-      sym__newline,
+    ACTIONS(1668), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -70254,6 +70443,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -70270,20 +70460,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [55103] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [55383] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(272), 5,
+    ACTIONS(1564), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 29,
-      sym__newline,
+    ACTIONS(1562), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -70293,6 +70482,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -70309,22 +70499,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [55145] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [55425] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1646), 5,
+    ACTIONS(1478), 4,
       anon_sym_STAR,
-      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1644), 29,
+    ACTIONS(1473), 30,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -70347,25 +70540,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [55187] = 4,
+  [55467] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(652), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(272), 5,
+    ACTIONS(1588), 5,
       anon_sym_STAR,
-      anon_sym_COLON,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 28,
+    ACTIONS(1586), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
-      anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
       anon_sym_in,
@@ -70389,23 +70578,61 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [55231] = 4,
+      anon_sym_SEMI,
+  [55509] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1292), 3,
-      anon_sym_RPAREN,
+    ACTIONS(1592), 5,
+      anon_sym_STAR,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1590), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(1295), 4,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_SEMI,
+  [55551] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1311), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1290), 27,
+    ACTIONS(1306), 30,
       anon_sym_DOT,
       anon_sym_LPAREN,
+      anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
       anon_sym_async,
       anon_sym_for,
       anon_sym_in,
@@ -70413,6 +70640,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -70429,16 +70657,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [55275] = 3,
+  [55593] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1338), 5,
+    ACTIONS(1592), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1333), 29,
+    ACTIONS(1590), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -70468,19 +70696,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [55317] = 3,
+  [55635] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1295), 5,
+    ACTIONS(1560), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1290), 29,
-      sym__newline,
+    ACTIONS(1558), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -70490,6 +70716,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -70506,26 +70733,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [55359] = 4,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [55677] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1265), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(1209), 4,
+    ACTIONS(1600), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 27,
+    ACTIONS(1598), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
+      anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -70547,17 +70773,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [55403] = 3,
+      anon_sym_SEMI,
+  [55719] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(272), 5,
+    ACTIONS(1620), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 29,
+    ACTIONS(1618), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -70567,7 +70796,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -70584,18 +70812,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [55445] = 3,
+      anon_sym_SEMI,
+  [55761] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1646), 5,
+    ACTIONS(1710), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1644), 29,
+    ACTIONS(1708), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -70625,16 +70852,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [55487] = 3,
+  [55803] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1662), 5,
+    ACTIONS(1624), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1660), 29,
+    ACTIONS(1622), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -70664,16 +70891,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [55529] = 3,
+  [55845] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1622), 5,
+    ACTIONS(1628), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1620), 29,
+    ACTIONS(1626), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -70703,16 +70930,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [55571] = 3,
+  [55887] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1626), 5,
+    ACTIONS(1666), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1624), 29,
+    ACTIONS(1664), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -70742,16 +70969,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [55613] = 3,
+  [55929] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1614), 5,
+    ACTIONS(1678), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1612), 29,
+    ACTIONS(1676), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -70781,30 +71008,27 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [55655] = 4,
+  [55971] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1335), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-    ACTIONS(1338), 4,
+    ACTIONS(1572), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1333), 27,
+    ACTIONS(1570), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
+      anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -70821,16 +71045,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [55699] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [56013] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1618), 5,
+    ACTIONS(1584), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1616), 29,
+    ACTIONS(1582), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -70860,19 +71086,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [55741] = 3,
+  [56055] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1710), 5,
+    ACTIONS(1608), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1708), 29,
-      sym__newline,
+    ACTIONS(1606), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -70882,6 +71106,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -70898,17 +71123,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [55783] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [56097] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1638), 5,
+    ACTIONS(272), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1636), 29,
+    ACTIONS(303), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -70938,58 +71164,131 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [55825] = 3,
+  [56139] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1666), 5,
-      anon_sym_STAR,
-      anon_sym_EQ,
-      anon_sym_SLASH,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1664), 29,
-      sym__newline,
-      anon_sym_DOT,
-      anon_sym_from,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    ACTIONS(1840), 1,
+      sym_identifier,
+    ACTIONS(1842), 1,
       anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_GT_GT,
-      anon_sym_if,
-      anon_sym_in,
-      anon_sym_PIPE,
+    ACTIONS(1844), 1,
+      anon_sym_STAR,
+    ACTIONS(1852), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1854), 1,
+      anon_sym_LBRACK,
+    ACTIONS(1856), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    STATE(1056), 1,
+      sym_string,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
+      sym_pattern_class_name,
+    ACTIONS(1850), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1198), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1310), 4,
+      sym__match_pattern,
+      sym_match_as_pattern,
+      sym__match_maybe_star_pattern,
+      sym_match_star_pattern,
+    STATE(1114), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [56215] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(652), 1,
+      sym__string_start,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    ACTIONS(1842), 1,
+      anon_sym_LPAREN,
+    ACTIONS(1852), 1,
+      sym_match_wildcard_pattern,
+    ACTIONS(1854), 1,
       anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_not,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-      anon_sym_is,
-      anon_sym_SEMI,
-  [55867] = 3,
+    ACTIONS(1856), 1,
+      anon_sym_LBRACE,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    ACTIONS(1910), 1,
+      sym_identifier,
+    ACTIONS(1916), 1,
+      anon_sym_RPAREN,
+    STATE(1056), 1,
+      sym_string,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1521), 1,
+      sym_match_keyword_pattern,
+    STATE(1558), 1,
+      sym_match_positional_pattern,
+    STATE(1662), 1,
+      sym_pattern_class_name,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1198), 2,
+      sym__match_or_pattern,
+      sym_match_or_pattern,
+    STATE(1604), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+    STATE(1114), 8,
+      sym__closed_pattern,
+      sym_match_literal_pattern,
+      sym_match_capture_pattern,
+      sym_match_value_pattern,
+      sym_match_group_pattern,
+      sym_match_sequence_pattern,
+      sym_match_mapping_pattern,
+      sym_match_class_pattern,
+  [56295] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1678), 5,
+    ACTIONS(1071), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1676), 29,
-      sym__newline,
+    ACTIONS(1069), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -70999,6 +71298,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -71015,20 +71315,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [55909] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [56337] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1670), 5,
+    ACTIONS(1616), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1668), 29,
-      sym__newline,
+    ACTIONS(1614), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -71038,6 +71337,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -71054,56 +71354,58 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [55951] = 21,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [56379] = 22,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(1874), 1,
-      sym_identifier,
-    ACTIONS(1876), 1,
+    ACTIONS(1842), 1,
       anon_sym_LPAREN,
-    ACTIONS(1878), 1,
-      anon_sym_STAR,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1886), 1,
+    ACTIONS(1852), 1,
       sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
+    ACTIONS(1854), 1,
       anon_sym_LBRACK,
-    ACTIONS(1890), 1,
+    ACTIONS(1856), 1,
       anon_sym_LBRACE,
-    ACTIONS(1892), 1,
+    ACTIONS(1858), 1,
       sym_integer,
-    ACTIONS(1894), 1,
+    ACTIONS(1860), 1,
       sym_float,
-    ACTIONS(1908), 1,
-      anon_sym_RBRACK,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
+    ACTIONS(1910), 1,
+      sym_identifier,
+    ACTIONS(1918), 1,
+      anon_sym_RPAREN,
+    STATE(1056), 1,
       sym_string,
-    STATE(1650), 1,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1454), 1,
+      sym_match_keyword_pattern,
+    STATE(1558), 1,
+      sym_match_positional_pattern,
+    STATE(1662), 1,
       sym_pattern_class_name,
-    STATE(1116), 2,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
       sym_concatenated_string,
       sym_concatenated_template_string,
-    STATE(1240), 2,
+    STATE(1198), 2,
       sym__match_or_pattern,
       sym_match_or_pattern,
-    ACTIONS(1896), 3,
+    STATE(1604), 2,
+      sym__match_pattern,
+      sym_match_as_pattern,
+    ACTIONS(1862), 3,
       sym_true,
       sym_false,
       sym_none,
-    STATE(1307), 4,
-      sym__match_pattern,
-      sym_match_as_pattern,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    STATE(1117), 8,
+    STATE(1114), 8,
       sym__closed_pattern,
       sym_match_literal_pattern,
       sym_match_capture_pattern,
@@ -71112,16 +71414,16 @@ static const uint16_t ts_small_parse_table[] = {
       sym_match_sequence_pattern,
       sym_match_mapping_pattern,
       sym_match_class_pattern,
-  [56029] = 3,
+  [56459] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1630), 5,
+    ACTIONS(1592), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1628), 29,
+    ACTIONS(1590), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -71151,17 +71453,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [56071] = 3,
+  [56501] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1650), 5,
+    ACTIONS(1608), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1648), 29,
+    ACTIONS(1606), 29,
+      sym__newline,
       anon_sym_DOT,
+      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -71171,7 +71475,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
-      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -71188,132 +71491,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [56113] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(1874), 1,
-      sym_identifier,
-    ACTIONS(1876), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1878), 1,
-      anon_sym_STAR,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1886), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1890), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    ACTIONS(1908), 1,
-      anon_sym_RPAREN,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
-      sym_string,
-    STATE(1650), 1,
-      sym_pattern_class_name,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1240), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1307), 4,
-      sym__match_pattern,
-      sym_match_as_pattern,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    STATE(1117), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [56191] = 21,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(1874), 1,
-      sym_identifier,
-    ACTIONS(1876), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1878), 1,
-      anon_sym_STAR,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1886), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1890), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    ACTIONS(1910), 1,
-      anon_sym_RBRACK,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
-      sym_string,
-    STATE(1650), 1,
-      sym_pattern_class_name,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1240), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1307), 4,
-      sym__match_pattern,
-      sym_match_as_pattern,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    STATE(1117), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [56269] = 3,
+      anon_sym_SEMI,
+  [56543] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1642), 5,
+    ACTIONS(1670), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1640), 29,
+    ACTIONS(1668), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -71343,16 +71531,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [56311] = 3,
+  [56585] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1654), 5,
+    ACTIONS(1596), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1652), 29,
+    ACTIONS(1594), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -71382,16 +71570,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [56353] = 3,
+  [56627] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1658), 5,
+    ACTIONS(1620), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1656), 29,
+    ACTIONS(1618), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -71421,73 +71609,55 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [56395] = 21,
+  [56669] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(1874), 1,
-      sym_identifier,
-    ACTIONS(1876), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1878), 1,
+    ACTIONS(1556), 5,
       anon_sym_STAR,
-    ACTIONS(1884), 1,
+      anon_sym_EQ,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1554), 29,
+      sym__newline,
+      anon_sym_DOT,
+      anon_sym_from,
+      anon_sym_LPAREN,
+      anon_sym_COMMA,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_in,
+      anon_sym_PIPE,
       anon_sym_DASH,
-    ACTIONS(1886), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
+      anon_sym_PLUS,
       anon_sym_LBRACK,
-    ACTIONS(1890), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    ACTIONS(1910), 1,
-      anon_sym_RPAREN,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
-      sym_string,
-    STATE(1650), 1,
-      sym_pattern_class_name,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1240), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1307), 4,
-      sym__match_pattern,
-      sym_match_as_pattern,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    STATE(1117), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [56473] = 3,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+      anon_sym_SEMI,
+  [56711] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1662), 5,
+    ACTIONS(1624), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1660), 29,
+    ACTIONS(1622), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -71517,16 +71687,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [56515] = 3,
+  [56753] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1702), 5,
+    ACTIONS(1564), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1700), 29,
+    ACTIONS(1562), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -71556,16 +71726,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [56557] = 3,
+  [56795] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1702), 5,
+    ACTIONS(1580), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1700), 29,
+    ACTIONS(1578), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -71595,19 +71765,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [56599] = 3,
+  [56837] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1658), 5,
+    ACTIONS(1628), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1656), 29,
-      sym__newline,
+    ACTIONS(1626), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -71617,6 +71785,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -71633,17 +71802,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [56641] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [56879] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1710), 5,
+    ACTIONS(1666), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1708), 29,
+    ACTIONS(1664), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -71673,16 +71843,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [56683] = 3,
+  [56921] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1702), 5,
+    ACTIONS(1682), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1700), 29,
+    ACTIONS(1680), 29,
       sym__newline,
       anon_sym_DOT,
       anon_sym_from,
@@ -71712,16 +71882,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_GT,
       anon_sym_is,
       anon_sym_SEMI,
-  [56725] = 3,
+  [56963] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1666), 5,
+    ACTIONS(1678), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1664), 29,
+    ACTIONS(1676), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -71751,23 +71921,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [56767] = 3,
+  [57005] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1654), 5,
+    ACTIONS(1273), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(1241), 4,
       anon_sym_STAR,
-      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1652), 29,
-      sym__newline,
+    ACTIONS(1236), 27,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
-      anon_sym_COMMA,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -71789,17 +71961,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [56809] = 3,
+  [57049] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1670), 5,
+    ACTIONS(1556), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1668), 29,
+    ACTIONS(1554), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -71829,16 +72000,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [56851] = 3,
+  [57091] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1209), 5,
+    ACTIONS(1580), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 29,
+    ACTIONS(1578), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_COMMA,
@@ -71868,19 +72039,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_is,
       anon_sym_COLON2,
       sym_type_conversion,
-  [56893] = 3,
+  [57133] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1209), 5,
+    ACTIONS(1682), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 29,
-      sym__newline,
+    ACTIONS(1680), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -71890,6 +72059,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -71906,20 +72076,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [56935] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [57175] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1634), 5,
+    ACTIONS(1052), 5,
       anon_sym_STAR,
       anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1632), 29,
-      sym__newline,
+    ACTIONS(1050), 29,
       anon_sym_DOT,
-      anon_sym_from,
       anon_sym_LPAREN,
       anon_sym_COMMA,
       anon_sym_GT_GT,
@@ -71929,6 +72098,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -71945,24 +72115,27 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-      anon_sym_SEMI,
-  [56977] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [57217] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1670), 4,
+    ACTIONS(1475), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+    ACTIONS(1478), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1668), 29,
+    ACTIONS(1473), 27,
       anon_sym_DOT,
       anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -71984,28 +72157,27 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57018] = 3,
+  [57261] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1618), 4,
+    ACTIONS(1568), 5,
       anon_sym_STAR,
+      anon_sym_EQ,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1616), 29,
+    ACTIONS(1566), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
-      anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
       anon_sym_PLUS,
       anon_sym_LBRACK,
+      anon_sym_RBRACE,
       anon_sym_STAR_STAR,
       anon_sym_AT,
       anon_sym_not,
@@ -72022,15 +72194,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57059] = 3,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [57303] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1622), 4,
+    ACTIONS(1071), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1620), 29,
+    ACTIONS(1069), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72060,15 +72234,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57100] = 3,
+  [57344] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1626), 4,
+    ACTIONS(1666), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1624), 29,
+    ACTIONS(1664), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72098,15 +72272,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57141] = 3,
+  [57385] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1630), 4,
+    ACTIONS(1592), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1628), 29,
+    ACTIONS(1590), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72136,15 +72310,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57182] = 3,
+  [57426] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1634), 4,
+    ACTIONS(1678), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1632), 29,
+    ACTIONS(1676), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72174,15 +72348,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57223] = 3,
+  [57467] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1638), 4,
+    ACTIONS(1241), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1636), 29,
+    ACTIONS(1236), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72212,15 +72386,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57264] = 3,
+  [57508] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1050), 4,
+    ACTIONS(1556), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1048), 29,
+    ACTIONS(1554), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72250,15 +72424,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57305] = 3,
+  [57549] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1646), 4,
+    ACTIONS(1580), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1644), 29,
+    ACTIONS(1578), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72288,15 +72462,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57346] = 3,
+  [57590] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1650), 4,
+    ACTIONS(1682), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1648), 29,
+    ACTIONS(1680), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72326,15 +72500,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57387] = 3,
+  [57631] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1654), 4,
+    ACTIONS(1052), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1652), 29,
+    ACTIONS(1050), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72364,15 +72538,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57428] = 3,
+  [57672] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1658), 4,
+    ACTIONS(1596), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1656), 29,
+    ACTIONS(1594), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72402,15 +72576,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57469] = 3,
+  [57713] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1662), 4,
+    ACTIONS(1576), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1660), 29,
+    ACTIONS(1574), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72440,15 +72614,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57510] = 3,
+  [57754] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1710), 4,
+    ACTIONS(272), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1708), 29,
+    ACTIONS(303), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72478,15 +72652,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57551] = 3,
+  [57795] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1666), 4,
+    ACTIONS(1612), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1664), 29,
+    ACTIONS(1610), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72516,15 +72690,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57592] = 3,
+  [57836] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1674), 4,
+    ACTIONS(1620), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1672), 29,
+    ACTIONS(1618), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72554,15 +72728,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57633] = 3,
+  [57877] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1678), 4,
+    ACTIONS(1624), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1676), 29,
+    ACTIONS(1622), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72592,23 +72766,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57674] = 3,
+  [57918] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1032), 4,
+    ACTIONS(1488), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(1908), 1,
+      anon_sym_EQ,
+    ACTIONS(1241), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1030), 29,
+    ACTIONS(1236), 27,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -72630,15 +72806,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57715] = 3,
+  [57963] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1682), 4,
+    ACTIONS(1674), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1680), 29,
+    ACTIONS(1672), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72668,23 +72844,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57756] = 3,
+  [58004] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1686), 4,
+    ACTIONS(590), 1,
+      anon_sym_COLON_EQ,
+    ACTIONS(656), 1,
+      anon_sym_EQ,
+    ACTIONS(272), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1684), 29,
+    ACTIONS(303), 27,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
-      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -72706,15 +72884,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57797] = 3,
+  [58049] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1690), 4,
+    ACTIONS(1560), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1688), 29,
+    ACTIONS(1558), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72744,15 +72922,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57838] = 3,
+  [58090] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1690), 4,
+    ACTIONS(1670), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1688), 29,
+    ACTIONS(1668), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72782,15 +72960,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57879] = 3,
+  [58131] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1694), 4,
+    ACTIONS(1564), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1692), 29,
+    ACTIONS(1562), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72820,15 +72998,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57920] = 3,
+  [58172] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1698), 4,
+    ACTIONS(1568), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1696), 29,
+    ACTIONS(1566), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72858,15 +73036,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [57961] = 3,
+  [58213] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1690), 4,
+    ACTIONS(1572), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1688), 29,
+    ACTIONS(1570), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72896,15 +73074,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [58002] = 3,
+  [58254] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1702), 4,
+    ACTIONS(1584), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1700), 29,
+    ACTIONS(1582), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72934,15 +73112,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [58043] = 3,
+  [58295] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1702), 4,
+    ACTIONS(1608), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1700), 29,
+    ACTIONS(1606), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -72972,15 +73150,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [58084] = 3,
+  [58336] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1706), 4,
+    ACTIONS(1588), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1704), 29,
+    ACTIONS(1586), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -73010,15 +73188,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [58125] = 3,
+  [58377] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1702), 4,
+    ACTIONS(1592), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1700), 29,
+    ACTIONS(1590), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -73048,194 +73226,99 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [58166] = 20,
+  [58418] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(1874), 1,
-      sym_identifier,
-    ACTIONS(1876), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1878), 1,
+    ACTIONS(1592), 4,
       anon_sym_STAR,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1886), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1890), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
-      sym_string,
-    STATE(1650), 1,
-      sym_pattern_class_name,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1240), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1307), 4,
-      sym__match_pattern,
-      sym_match_as_pattern,
-      sym__match_maybe_star_pattern,
-      sym_match_star_pattern,
-    STATE(1117), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [58241] = 22,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(1876), 1,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1590), 29,
+      anon_sym_DOT,
       anon_sym_LPAREN,
-    ACTIONS(1884), 1,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
       anon_sym_DASH,
-    ACTIONS(1886), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
+      anon_sym_PLUS,
       anon_sym_LBRACK,
-    ACTIONS(1890), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    ACTIONS(1912), 1,
-      sym_identifier,
-    ACTIONS(1914), 1,
-      anon_sym_RPAREN,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
-      sym_string,
-    STATE(1424), 1,
-      sym_match_keyword_pattern,
-    STATE(1558), 1,
-      sym_match_positional_pattern,
-    STATE(1650), 1,
-      sym_pattern_class_name,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1240), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1611), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1117), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [58320] = 22,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [58459] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(1876), 1,
+    ACTIONS(1600), 4,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1598), 29,
+      anon_sym_DOT,
       anon_sym_LPAREN,
-    ACTIONS(1884), 1,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_GT_GT,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_in,
+      anon_sym_PIPE,
       anon_sym_DASH,
-    ACTIONS(1886), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
+      anon_sym_PLUS,
       anon_sym_LBRACK,
-    ACTIONS(1890), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    ACTIONS(1912), 1,
-      sym_identifier,
-    ACTIONS(1916), 1,
-      anon_sym_RPAREN,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
-      sym_string,
-    STATE(1421), 1,
-      sym_match_keyword_pattern,
-    STATE(1558), 1,
-      sym_match_positional_pattern,
-    STATE(1650), 1,
-      sym_pattern_class_name,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1240), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1611), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1117), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [58399] = 5,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_not,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+      anon_sym_is,
+  [58500] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1488), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(1898), 1,
-      anon_sym_EQ,
-    ACTIONS(1209), 4,
+    ACTIONS(1604), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 27,
+    ACTIONS(1602), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -73257,15 +73340,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [58444] = 3,
+  [58541] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1209), 4,
+    ACTIONS(1710), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1204), 29,
+    ACTIONS(1708), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -73295,25 +73378,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [58485] = 5,
+  [58582] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(590), 1,
-      anon_sym_COLON_EQ,
-    ACTIONS(634), 1,
-      anon_sym_EQ,
-    ACTIONS(272), 4,
+    ACTIONS(1576), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 27,
+    ACTIONS(1574), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_GT_GT,
       anon_sym_if,
+      anon_sym_COLON,
       anon_sym_in,
       anon_sym_PIPE,
       anon_sym_DASH,
@@ -73335,72 +73416,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [58530] = 22,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    ACTIONS(1876), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1886), 1,
-      sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
-      anon_sym_LBRACK,
-    ACTIONS(1890), 1,
-      anon_sym_LBRACE,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    ACTIONS(1912), 1,
-      sym_identifier,
-    ACTIONS(1918), 1,
-      anon_sym_RPAREN,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
-      sym_string,
-    STATE(1488), 1,
-      sym_match_positional_pattern,
-    STATE(1493), 1,
-      sym_match_keyword_pattern,
-    STATE(1650), 1,
-      sym_pattern_class_name,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1240), 2,
-      sym__match_or_pattern,
-      sym_match_or_pattern,
-    STATE(1611), 2,
-      sym__match_pattern,
-      sym_match_as_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-    STATE(1117), 8,
-      sym__closed_pattern,
-      sym_match_literal_pattern,
-      sym_match_capture_pattern,
-      sym_match_value_pattern,
-      sym_match_group_pattern,
-      sym_match_sequence_pattern,
-      sym_match_mapping_pattern,
-      sym_match_class_pattern,
-  [58609] = 3,
+  [58623] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(272), 4,
+    ACTIONS(1576), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(303), 29,
+    ACTIONS(1574), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -73430,15 +73454,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [58650] = 3,
+  [58664] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1614), 4,
+    ACTIONS(1616), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1612), 29,
+    ACTIONS(1614), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -73468,15 +73492,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [58691] = 3,
+  [58705] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1642), 4,
+    ACTIONS(1628), 4,
       anon_sym_STAR,
       anon_sym_SLASH,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1640), 29,
+    ACTIONS(1626), 29,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
@@ -73506,51 +73530,52 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
       anon_sym_is,
-  [58732] = 20,
+  [58746] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(1874), 1,
+    ACTIONS(1840), 1,
       sym_identifier,
-    ACTIONS(1876), 1,
+    ACTIONS(1842), 1,
       anon_sym_LPAREN,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1886), 1,
+    ACTIONS(1852), 1,
       sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
+    ACTIONS(1854), 1,
       anon_sym_LBRACK,
-    ACTIONS(1890), 1,
+    ACTIONS(1856), 1,
       anon_sym_LBRACE,
-    ACTIONS(1892), 1,
+    ACTIONS(1858), 1,
       sym_integer,
-    ACTIONS(1894), 1,
+    ACTIONS(1860), 1,
       sym_float,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
+    STATE(1056), 1,
       sym_string,
+    STATE(1067), 1,
+      sym_template_string,
     STATE(1558), 1,
       sym_match_positional_pattern,
-    STATE(1650), 1,
+    STATE(1662), 1,
       sym_pattern_class_name,
-    STATE(1116), 2,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
       sym_concatenated_string,
       sym_concatenated_template_string,
-    STATE(1240), 2,
+    STATE(1198), 2,
       sym__match_or_pattern,
       sym_match_or_pattern,
-    STATE(1611), 2,
+    STATE(1604), 2,
       sym__match_pattern,
       sym_match_as_pattern,
-    ACTIONS(1896), 3,
+    ACTIONS(1862), 3,
       sym_true,
       sym_false,
       sym_none,
-    STATE(1117), 8,
+    STATE(1114), 8,
       sym__closed_pattern,
       sym_match_literal_pattern,
       sym_match_capture_pattern,
@@ -73559,49 +73584,50 @@ static const uint16_t ts_small_parse_table[] = {
       sym_match_sequence_pattern,
       sym_match_mapping_pattern,
       sym_match_class_pattern,
-  [58805] = 19,
+  [58820] = 19,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(1874), 1,
+    ACTIONS(1840), 1,
       sym_identifier,
-    ACTIONS(1876), 1,
+    ACTIONS(1842), 1,
       anon_sym_LPAREN,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1886), 1,
+    ACTIONS(1852), 1,
       sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
+    ACTIONS(1854), 1,
       anon_sym_LBRACK,
-    ACTIONS(1890), 1,
+    ACTIONS(1856), 1,
       anon_sym_LBRACE,
-    ACTIONS(1892), 1,
+    ACTIONS(1858), 1,
       sym_integer,
-    ACTIONS(1894), 1,
+    ACTIONS(1860), 1,
       sym_float,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
+    STATE(1056), 1,
       sym_string,
-    STATE(1650), 1,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
       sym_pattern_class_name,
-    STATE(1116), 2,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
       sym_concatenated_string,
       sym_concatenated_template_string,
-    STATE(1240), 2,
+    STATE(1198), 2,
       sym__match_or_pattern,
       sym_match_or_pattern,
-    STATE(1534), 2,
+    STATE(1553), 2,
       sym__match_pattern,
       sym_match_as_pattern,
-    ACTIONS(1896), 3,
+    ACTIONS(1862), 3,
       sym_true,
       sym_false,
       sym_none,
-    STATE(1117), 8,
+    STATE(1114), 8,
       sym__closed_pattern,
       sym_match_literal_pattern,
       sym_match_capture_pattern,
@@ -73610,49 +73636,50 @@ static const uint16_t ts_small_parse_table[] = {
       sym_match_sequence_pattern,
       sym_match_mapping_pattern,
       sym_match_class_pattern,
-  [58875] = 19,
+  [58891] = 19,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(1874), 1,
+    ACTIONS(1840), 1,
       sym_identifier,
-    ACTIONS(1876), 1,
+    ACTIONS(1842), 1,
       anon_sym_LPAREN,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1886), 1,
+    ACTIONS(1852), 1,
       sym_match_wildcard_pattern,
-    ACTIONS(1888), 1,
+    ACTIONS(1854), 1,
       anon_sym_LBRACK,
-    ACTIONS(1890), 1,
+    ACTIONS(1856), 1,
       anon_sym_LBRACE,
-    ACTIONS(1892), 1,
+    ACTIONS(1858), 1,
       sym_integer,
-    ACTIONS(1894), 1,
+    ACTIONS(1860), 1,
       sym_float,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
+    STATE(1056), 1,
       sym_string,
-    STATE(1650), 1,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
       sym_pattern_class_name,
-    STATE(1116), 2,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
       sym_concatenated_string,
       sym_concatenated_template_string,
-    STATE(1240), 2,
+    STATE(1198), 2,
       sym__match_or_pattern,
       sym_match_or_pattern,
-    STATE(1549), 2,
+    STATE(1613), 2,
       sym__match_pattern,
       sym_match_as_pattern,
-    ACTIONS(1896), 3,
+    ACTIONS(1862), 3,
       sym_true,
       sym_false,
       sym_none,
-    STATE(1117), 8,
+    STATE(1114), 8,
       sym__closed_pattern,
       sym_match_literal_pattern,
       sym_match_capture_pattern,
@@ -73661,43 +73688,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_match_sequence_pattern,
       sym_match_mapping_pattern,
       sym_match_class_pattern,
-  [58945] = 17,
+  [58962] = 17,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(1874), 1,
+    ACTIONS(1840), 1,
       sym_identifier,
-    ACTIONS(1876), 1,
+    ACTIONS(1842), 1,
       anon_sym_LPAREN,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1888), 1,
+    ACTIONS(1854), 1,
       anon_sym_LBRACK,
-    ACTIONS(1890), 1,
+    ACTIONS(1856), 1,
       anon_sym_LBRACE,
-    ACTIONS(1892), 1,
+    ACTIONS(1858), 1,
       sym_integer,
-    ACTIONS(1894), 1,
+    ACTIONS(1860), 1,
       sym_float,
     ACTIONS(1920), 1,
       sym_match_wildcard_pattern,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
+    STATE(1056), 1,
       sym_string,
-    STATE(1650), 1,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
       sym_pattern_class_name,
-    STATE(1116), 2,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
       sym_concatenated_string,
       sym_concatenated_template_string,
-    ACTIONS(1896), 3,
+    ACTIONS(1862), 3,
       sym_true,
       sym_false,
       sym_none,
-    STATE(1136), 8,
+    STATE(1141), 8,
       sym__closed_pattern,
       sym_match_literal_pattern,
       sym_match_capture_pattern,
@@ -73706,43 +73734,44 @@ static const uint16_t ts_small_parse_table[] = {
       sym_match_sequence_pattern,
       sym_match_mapping_pattern,
       sym_match_class_pattern,
-  [59007] = 17,
+  [59025] = 17,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
+    ACTIONS(652), 1,
       sym__string_start,
-    ACTIONS(666), 1,
+    ACTIONS(654), 1,
       sym__template_string_start,
-    ACTIONS(1874), 1,
+    ACTIONS(1840), 1,
       sym_identifier,
-    ACTIONS(1876), 1,
+    ACTIONS(1842), 1,
       anon_sym_LPAREN,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1888), 1,
+    ACTIONS(1854), 1,
       anon_sym_LBRACK,
-    ACTIONS(1890), 1,
+    ACTIONS(1856), 1,
       anon_sym_LBRACE,
-    ACTIONS(1892), 1,
+    ACTIONS(1858), 1,
       sym_integer,
-    ACTIONS(1894), 1,
+    ACTIONS(1860), 1,
       sym_float,
     ACTIONS(1922), 1,
       sym_match_wildcard_pattern,
-    STATE(1043), 1,
-      sym_template_string,
-    STATE(1068), 1,
+    STATE(1056), 1,
       sym_string,
-    STATE(1650), 1,
+    STATE(1067), 1,
+      sym_template_string,
+    STATE(1662), 1,
       sym_pattern_class_name,
-    STATE(1116), 2,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
       sym_concatenated_string,
       sym_concatenated_template_string,
-    ACTIONS(1896), 3,
+    ACTIONS(1862), 3,
       sym_true,
       sym_false,
       sym_none,
-    STATE(1101), 8,
+    STATE(1105), 8,
       sym__closed_pattern,
       sym_match_literal_pattern,
       sym_match_capture_pattern,
@@ -73751,11 +73780,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_match_sequence_pattern,
       sym_match_mapping_pattern,
       sym_match_class_pattern,
-  [59069] = 8,
+  [59088] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1926), 1,
-      anon_sym_as,
+    ACTIONS(1929), 1,
+      anon_sym_EQ,
     ACTIONS(1931), 1,
       anon_sym_not,
     ACTIONS(1937), 1,
@@ -73765,7 +73794,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(1934), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1928), 6,
+    ACTIONS(1926), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
@@ -73776,65 +73805,65 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_and,
       anon_sym_or,
-  [59108] = 8,
+  [59127] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1578), 1,
+    ACTIONS(1929), 1,
+      anon_sym_as,
+    ACTIONS(1943), 1,
       anon_sym_not,
-    ACTIONS(1586), 1,
+    ACTIONS(1949), 1,
       anon_sym_is,
-    ACTIONS(1942), 1,
-      anon_sym_EQ,
-    STATE(999), 1,
+    STATE(997), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(1584), 2,
+    ACTIONS(1946), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1564), 6,
+    ACTIONS(1940), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1940), 9,
+    ACTIONS(1924), 9,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_and,
       anon_sym_or,
-  [59147] = 8,
+  [59166] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1602), 1,
+    ACTIONS(1698), 1,
       anon_sym_not,
-    ACTIONS(1610), 1,
+    ACTIONS(1706), 1,
       anon_sym_is,
-    ACTIONS(1942), 1,
+    ACTIONS(1954), 1,
       anon_sym_as,
-    STATE(996), 1,
+    STATE(997), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(1608), 2,
+    ACTIONS(1704), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1592), 6,
+    ACTIONS(1688), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1940), 9,
+    ACTIONS(1952), 9,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
@@ -73844,28 +73873,28 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACE,
       anon_sym_and,
       anon_sym_or,
-  [59186] = 8,
+  [59205] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1926), 1,
-      anon_sym_EQ,
-    ACTIONS(1947), 1,
+    ACTIONS(1654), 1,
       anon_sym_not,
-    ACTIONS(1953), 1,
+    ACTIONS(1662), 1,
       anon_sym_is,
-    STATE(999), 1,
+    ACTIONS(1954), 1,
+      anon_sym_EQ,
+    STATE(996), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(1950), 2,
+    ACTIONS(1660), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1944), 6,
+    ACTIONS(1640), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1924), 9,
+    ACTIONS(1952), 9,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
@@ -73875,14 +73904,52 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACE,
       anon_sym_and,
       anon_sym_or,
-  [59225] = 4,
+  [59244] = 16,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    ACTIONS(1956), 1,
+      sym_identifier,
     ACTIONS(1958), 1,
+      anon_sym_RBRACE,
+    ACTIONS(1960), 1,
+      anon_sym_STAR_STAR,
+    STATE(1347), 1,
+      sym_string,
+    STATE(1348), 1,
+      sym_template_string,
+    STATE(1582), 1,
+      sym_match_key_value_pattern,
+    STATE(1606), 1,
+      sym_match_double_star_pattern,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1647), 2,
+      sym_match_literal_pattern,
+      sym_match_value_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+  [59298] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1964), 1,
       anon_sym_COMMA,
-    STATE(1000), 1,
+    STATE(1001), 1,
       aux_sym__patterns_repeat1,
-    ACTIONS(1956), 18,
+    ACTIONS(1962), 18,
       anon_sym_RPAREN,
       anon_sym_COLON,
       anon_sym_in,
@@ -73901,39 +73968,115 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [59255] = 8,
+  [59328] = 16,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1926), 1,
-      anon_sym_EQ,
-    ACTIONS(1964), 1,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    ACTIONS(1956), 1,
+      sym_identifier,
+    ACTIONS(1960), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1967), 1,
+      anon_sym_RBRACE,
+    STATE(1347), 1,
+      sym_string,
+    STATE(1348), 1,
+      sym_template_string,
+    STATE(1444), 1,
+      sym_match_key_value_pattern,
+    STATE(1545), 1,
+      sym_match_double_star_pattern,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1647), 2,
+      sym_match_literal_pattern,
+      sym_match_value_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+  [59382] = 16,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    ACTIONS(1956), 1,
+      sym_identifier,
+    ACTIONS(1960), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(1969), 1,
+      anon_sym_RBRACE,
+    STATE(1347), 1,
+      sym_string,
+    STATE(1348), 1,
+      sym_template_string,
+    STATE(1578), 1,
+      sym_match_double_star_pattern,
+    STATE(1582), 1,
+      sym_match_key_value_pattern,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1647), 2,
+      sym_match_literal_pattern,
+      sym_match_value_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+  [59436] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1786), 1,
       anon_sym_not,
-    ACTIONS(1970), 1,
+    ACTIONS(1794), 1,
       anon_sym_is,
-    STATE(1001), 1,
+    ACTIONS(1954), 1,
+      anon_sym_EQ,
+    STATE(1013), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(1967), 2,
+    ACTIONS(1792), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1961), 6,
+    ACTIONS(1774), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1924), 7,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(1952), 7,
       anon_sym_COMMA,
       anon_sym_if,
+      anon_sym_RBRACE,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_SEMI,
-  [59292] = 2,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [59473] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1973), 19,
+    ACTIONS(1971), 19,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -73953,68 +74096,93 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [59317] = 8,
+  [59498] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1926), 1,
-      anon_sym_EQ,
-    ACTIONS(1978), 1,
+    ACTIONS(272), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(930), 3,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+    ACTIONS(303), 14,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_GT_GT,
+      anon_sym_PIPE,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+      anon_sym_LBRACK,
+      anon_sym_STAR_STAR,
+      anon_sym_AT,
+      anon_sym_PERCENT,
+      anon_sym_SLASH_SLASH,
+      anon_sym_AMP,
+      anon_sym_CARET,
+      anon_sym_LT_LT,
+  [59527] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1828), 1,
       anon_sym_not,
-    ACTIONS(1984), 1,
+    ACTIONS(1836), 1,
       anon_sym_is,
-    STATE(1003), 1,
+    ACTIONS(1954), 1,
+      anon_sym_EQ,
+    STATE(1008), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(1981), 2,
+    ACTIONS(1834), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1975), 6,
+    ACTIONS(1816), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1924), 7,
+    ACTIONS(1952), 7,
+      sym__newline,
+      anon_sym_from,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_RBRACE,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [59354] = 8,
+      anon_sym_SEMI,
+  [59564] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1828), 1,
+    ACTIONS(1929), 1,
+      anon_sym_EQ,
+    ACTIONS(1976), 1,
       anon_sym_not,
-    ACTIONS(1836), 1,
+    ACTIONS(1982), 1,
       anon_sym_is,
-    ACTIONS(1942), 1,
-      anon_sym_EQ,
-    STATE(1003), 1,
+    STATE(1008), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(1834), 2,
+    ACTIONS(1979), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1816), 6,
+    ACTIONS(1973), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1940), 7,
+    ACTIONS(1924), 7,
+      sym__newline,
+      anon_sym_from,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_RBRACE,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [59391] = 2,
+      anon_sym_SEMI,
+  [59601] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1272), 19,
+    ACTIONS(1985), 19,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
@@ -74034,228 +74202,45 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [59416] = 16,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    ACTIONS(1987), 1,
-      sym_identifier,
-    ACTIONS(1989), 1,
-      anon_sym_RBRACE,
-    ACTIONS(1991), 1,
-      anon_sym_STAR_STAR,
-    STATE(1369), 1,
-      sym_string,
-    STATE(1373), 1,
-      sym_template_string,
-    STATE(1557), 1,
-      sym_match_key_value_pattern,
-    STATE(1568), 1,
-      sym_match_double_star_pattern,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1652), 2,
-      sym_match_literal_pattern,
-      sym_match_value_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-  [59469] = 16,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    ACTIONS(1987), 1,
-      sym_identifier,
-    ACTIONS(1991), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1993), 1,
-      anon_sym_RBRACE,
-    STATE(1369), 1,
-      sym_string,
-    STATE(1373), 1,
-      sym_template_string,
-    STATE(1498), 1,
-      sym_match_key_value_pattern,
-    STATE(1553), 1,
-      sym_match_double_star_pattern,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1652), 2,
-      sym_match_literal_pattern,
-      sym_match_value_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-  [59522] = 8,
+  [59626] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1768), 1,
+    ACTIONS(1756), 1,
       anon_sym_not,
-    ACTIONS(1776), 1,
+    ACTIONS(1764), 1,
       anon_sym_is,
-    ACTIONS(1942), 1,
-      anon_sym_EQ,
-    STATE(1001), 1,
+    STATE(1012), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(1774), 2,
+    ACTIONS(1762), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1756), 6,
+    ACTIONS(1746), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1940), 7,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(1952), 8,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_and,
-      anon_sym_or,
-      anon_sym_SEMI,
-  [59559] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1995), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
       anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [59584] = 16,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    ACTIONS(1987), 1,
-      sym_identifier,
-    ACTIONS(1991), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(1997), 1,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_RBRACE,
-    STATE(1369), 1,
-      sym_string,
-    STATE(1373), 1,
-      sym_template_string,
-    STATE(1555), 1,
-      sym_match_double_star_pattern,
-    STATE(1557), 1,
-      sym_match_key_value_pattern,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1652), 2,
-      sym_match_literal_pattern,
-      sym_match_value_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-  [59637] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(272), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(928), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-    ACTIONS(303), 14,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_GT_GT,
-      anon_sym_PIPE,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-      anon_sym_LBRACK,
-      anon_sym_STAR_STAR,
-      anon_sym_AT,
-      anon_sym_PERCENT,
-      anon_sym_SLASH_SLASH,
-      anon_sym_AMP,
-      anon_sym_CARET,
-      anon_sym_LT_LT,
-  [59666] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1999), 19,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_RBRACK,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [59691] = 4,
+      anon_sym_and,
+      anon_sym_or,
+  [59661] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1209), 2,
+    ACTIONS(1241), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(2001), 3,
+    ACTIONS(1987), 3,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
-    ACTIONS(1204), 14,
+    ACTIONS(1236), 14,
       anon_sym_DOT,
       anon_sym_LPAREN,
       anon_sym_GT_GT,
@@ -74270,26 +74255,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP,
       anon_sym_CARET,
       anon_sym_LT_LT,
-  [59720] = 7,
+  [59690] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1792), 1,
+    ACTIONS(1992), 1,
       anon_sym_not,
-    ACTIONS(1800), 1,
+    ACTIONS(1998), 1,
       anon_sym_is,
-    STATE(1015), 1,
+    STATE(1012), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(1798), 2,
+    ACTIONS(1995), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(1782), 6,
+    ACTIONS(1989), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1940), 8,
+    ACTIONS(1924), 8,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_COLON,
@@ -74298,131 +74283,154 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACE,
       anon_sym_and,
       anon_sym_or,
-  [59755] = 7,
+  [59725] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2006), 1,
+    ACTIONS(1929), 1,
+      anon_sym_EQ,
+    ACTIONS(2004), 1,
       anon_sym_not,
-    ACTIONS(2012), 1,
+    ACTIONS(2010), 1,
       anon_sym_is,
-    STATE(1015), 1,
+    STATE(1013), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(2009), 2,
+    ACTIONS(2007), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(2003), 6,
+    ACTIONS(2001), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_GT,
-    ACTIONS(1924), 8,
+    ACTIONS(1924), 7,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
       anon_sym_RBRACE,
       anon_sym_and,
       anon_sym_or,
-  [59790] = 7,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [59762] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1860), 1,
-      anon_sym_not,
-    ACTIONS(1868), 1,
-      anon_sym_is,
-    STATE(1019), 1,
-      aux_sym_comparison_operator_repeat1,
-    ACTIONS(1866), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(1848), 6,
+    ACTIONS(1280), 19,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_COLON,
       anon_sym_in,
-      anon_sym_LT_EQ,
-      anon_sym_EQ_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_GT,
-    ACTIONS(1940), 7,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [59787] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2013), 19,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
       anon_sym_COLON,
-      anon_sym_and,
-      anon_sym_or,
-  [59824] = 13,
+      anon_sym_in,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [59812] = 13,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1554), 1,
+    ACTIONS(1630), 1,
       anon_sym_DOT,
-    ACTIONS(1556), 1,
+    ACTIONS(1632), 1,
       anon_sym_LPAREN,
-    ACTIONS(1566), 1,
+    ACTIONS(1642), 1,
       anon_sym_PIPE,
-    ACTIONS(1570), 1,
+    ACTIONS(1646), 1,
       anon_sym_LBRACK,
-    ACTIONS(1572), 1,
+    ACTIONS(1648), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(1580), 1,
+    ACTIONS(1656), 1,
       anon_sym_AMP,
-    ACTIONS(1582), 1,
+    ACTIONS(1658), 1,
       anon_sym_CARET,
-    ACTIONS(1560), 2,
+    ACTIONS(1636), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
-    ACTIONS(1562), 2,
+    ACTIONS(1638), 2,
       anon_sym_GT_GT,
       anon_sym_LT_LT,
-    ACTIONS(1568), 2,
+    ACTIONS(1644), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    STATE(708), 2,
+    STATE(731), 2,
       sym_argument_list,
       sym_generator_expression,
-    ACTIONS(1576), 3,
+    ACTIONS(1652), 3,
       anon_sym_AT,
       anon_sym_PERCENT,
       anon_sym_SLASH_SLASH,
-  [59870] = 4,
+  [59858] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2015), 1,
+    ACTIONS(1884), 1,
+      anon_sym_not,
+    ACTIONS(1892), 1,
+      anon_sym_is,
+    STATE(1018), 1,
+      aux_sym_comparison_operator_repeat1,
+    ACTIONS(1890), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(1872), 6,
+      anon_sym_in,
+      anon_sym_LT_EQ,
+      anon_sym_EQ_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_GT,
+    ACTIONS(1952), 7,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    STATE(1000), 1,
-      aux_sym__patterns_repeat1,
-    ACTIONS(2017), 16,
+      anon_sym_as,
+      anon_sym_if,
       anon_sym_COLON,
-      anon_sym_in,
-      anon_sym_EQ,
-      anon_sym_PLUS_EQ,
-      anon_sym_DASH_EQ,
-      anon_sym_STAR_EQ,
-      anon_sym_SLASH_EQ,
-      anon_sym_AT_EQ,
-      anon_sym_SLASH_SLASH_EQ,
-      anon_sym_PERCENT_EQ,
-      anon_sym_STAR_STAR_EQ,
-      anon_sym_GT_GT_EQ,
-      anon_sym_LT_LT_EQ,
-      anon_sym_AMP_EQ,
-      anon_sym_CARET_EQ,
-      anon_sym_PIPE_EQ,
-  [59898] = 7,
+      anon_sym_and,
+      anon_sym_or,
+  [59892] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2022), 1,
+    ACTIONS(2018), 1,
       anon_sym_not,
-    ACTIONS(2028), 1,
+    ACTIONS(2024), 1,
       anon_sym_is,
-    STATE(1019), 1,
+    STATE(1018), 1,
       aux_sym_comparison_operator_repeat1,
-    ACTIONS(2025), 2,
+    ACTIONS(2021), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(2019), 6,
+    ACTIONS(2015), 6,
       anon_sym_in,
       anon_sym_LT_EQ,
       anon_sym_EQ_EQ,
@@ -74437,18 +74445,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON,
       anon_sym_and,
       anon_sym_or,
-  [59932] = 6,
+  [59926] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2031), 1,
+    ACTIONS(2027), 1,
       anon_sym_COMMA,
-    ACTIONS(2033), 1,
+    STATE(1001), 1,
+      aux_sym__patterns_repeat1,
+    ACTIONS(2029), 16,
       anon_sym_COLON,
-    ACTIONS(2035), 1,
+      anon_sym_in,
       anon_sym_EQ,
-    STATE(1018), 1,
-      aux_sym__patterns_repeat1,
-    ACTIONS(2037), 13,
       anon_sym_PLUS_EQ,
       anon_sym_DASH_EQ,
       anon_sym_STAR_EQ,
@@ -74462,291 +74469,317 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [59963] = 12,
+  [59954] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2039), 1,
+    ACTIONS(2031), 1,
       sym_identifier,
-    ACTIONS(2041), 1,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2045), 1,
+    ACTIONS(2037), 1,
       anon_sym_COLON,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
-    STATE(1406), 1,
+    STATE(1517), 1,
       sym_parameter,
-    STATE(1689), 1,
+    STATE(1685), 1,
       sym__parameters,
-    STATE(1691), 1,
+    STATE(1715), 1,
       sym_lambda_parameters,
-    STATE(1606), 2,
+    STATE(1608), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60006] = 12,
+  [59997] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2039), 1,
+    ACTIONS(2031), 1,
       sym_identifier,
-    ACTIONS(2041), 1,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
-    ACTIONS(2051), 1,
+    ACTIONS(2043), 1,
       anon_sym_COLON,
-    STATE(1406), 1,
+    STATE(1517), 1,
       sym_parameter,
-    STATE(1689), 1,
+    STATE(1685), 1,
       sym__parameters,
-    STATE(1752), 1,
+    STATE(1718), 1,
       sym_lambda_parameters,
-    STATE(1606), 2,
+    STATE(1608), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60049] = 12,
+  [60040] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2039), 1,
+    ACTIONS(2045), 1,
+      anon_sym_COMMA,
+    ACTIONS(2047), 1,
+      anon_sym_COLON,
+    ACTIONS(2049), 1,
+      anon_sym_EQ,
+    STATE(1019), 1,
+      aux_sym__patterns_repeat1,
+    ACTIONS(2051), 13,
+      anon_sym_PLUS_EQ,
+      anon_sym_DASH_EQ,
+      anon_sym_STAR_EQ,
+      anon_sym_SLASH_EQ,
+      anon_sym_AT_EQ,
+      anon_sym_SLASH_SLASH_EQ,
+      anon_sym_PERCENT_EQ,
+      anon_sym_STAR_STAR_EQ,
+      anon_sym_GT_GT_EQ,
+      anon_sym_LT_LT_EQ,
+      anon_sym_AMP_EQ,
+      anon_sym_CARET_EQ,
+      anon_sym_PIPE_EQ,
+  [60071] = 13,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(1858), 1,
+      sym_integer,
+    ACTIONS(1860), 1,
+      sym_float,
+    ACTIONS(1956), 1,
       sym_identifier,
-    ACTIONS(2041), 1,
+    STATE(1347), 1,
+      sym_string,
+    STATE(1348), 1,
+      sym_template_string,
+    STATE(1582), 1,
+      sym_match_key_value_pattern,
+    ACTIONS(1850), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    STATE(1174), 2,
+      sym_concatenated_string,
+      sym_concatenated_template_string,
+    STATE(1647), 2,
+      sym_match_literal_pattern,
+      sym_match_value_pattern,
+    ACTIONS(1862), 3,
+      sym_true,
+      sym_false,
+      sym_none,
+  [60116] = 12,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2031), 1,
+      sym_identifier,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
     ACTIONS(2053), 1,
       anon_sym_COLON,
-    STATE(1406), 1,
+    STATE(1517), 1,
       sym_parameter,
-    STATE(1639), 1,
-      sym_lambda_parameters,
-    STATE(1689), 1,
+    STATE(1685), 1,
       sym__parameters,
-    STATE(1606), 2,
+    STATE(1701), 1,
+      sym_lambda_parameters,
+    STATE(1608), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60092] = 12,
+  [60159] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2039), 1,
+    ACTIONS(2031), 1,
       sym_identifier,
-    ACTIONS(2041), 1,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
     ACTIONS(2055), 1,
       anon_sym_COLON,
-    STATE(1406), 1,
+    STATE(1517), 1,
       sym_parameter,
-    STATE(1689), 1,
+    STATE(1685), 1,
       sym__parameters,
-    STATE(1729), 1,
+    STATE(1717), 1,
       sym_lambda_parameters,
-    STATE(1606), 2,
+    STATE(1608), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60135] = 12,
+  [60202] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2039), 1,
+    ACTIONS(2031), 1,
       sym_identifier,
-    ACTIONS(2041), 1,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
     ACTIONS(2057), 1,
       anon_sym_COLON,
-    STATE(1406), 1,
+    STATE(1517), 1,
       sym_parameter,
-    STATE(1667), 1,
-      sym_lambda_parameters,
-    STATE(1689), 1,
+    STATE(1685), 1,
       sym__parameters,
-    STATE(1606), 2,
+    STATE(1704), 1,
+      sym_lambda_parameters,
+    STATE(1608), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60178] = 12,
+  [60245] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2039), 1,
+    ACTIONS(2031), 1,
       sym_identifier,
-    ACTIONS(2041), 1,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
     ACTIONS(2059), 1,
       anon_sym_COLON,
-    STATE(1406), 1,
+    STATE(1517), 1,
       sym_parameter,
-    STATE(1689), 1,
-      sym__parameters,
-    STATE(1697), 1,
+    STATE(1659), 1,
       sym_lambda_parameters,
-    STATE(1606), 2,
+    STATE(1685), 1,
+      sym__parameters,
+    STATE(1608), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60221] = 12,
+  [60288] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2039), 1,
+    ACTIONS(2031), 1,
       sym_identifier,
-    ACTIONS(2041), 1,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
     ACTIONS(2061), 1,
       anon_sym_COLON,
-    STATE(1406), 1,
+    STATE(1517), 1,
       sym_parameter,
-    STATE(1689), 1,
-      sym__parameters,
-    STATE(1732), 1,
+    STATE(1683), 1,
       sym_lambda_parameters,
-    STATE(1606), 2,
+    STATE(1685), 1,
+      sym__parameters,
+    STATE(1608), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60264] = 11,
+  [60331] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2041), 1,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
     ACTIONS(2063), 1,
       sym_identifier,
     ACTIONS(2065), 1,
       anon_sym_RPAREN,
-    STATE(1445), 1,
+    STATE(1497), 1,
       sym_parameter,
-    STATE(1682), 1,
+    STATE(1656), 1,
       sym__parameters,
-    STATE(1507), 2,
+    STATE(1520), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60304] = 13,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(1884), 1,
-      anon_sym_DASH,
-    ACTIONS(1892), 1,
-      sym_integer,
-    ACTIONS(1894), 1,
-      sym_float,
-    ACTIONS(1987), 1,
-      sym_identifier,
-    STATE(1369), 1,
-      sym_string,
-    STATE(1373), 1,
-      sym_template_string,
-    STATE(1557), 1,
-      sym_match_key_value_pattern,
-    STATE(1116), 2,
-      sym_concatenated_string,
-      sym_concatenated_template_string,
-    STATE(1652), 2,
-      sym_match_literal_pattern,
-      sym_match_value_pattern,
-    ACTIONS(1896), 3,
-      sym_true,
-      sym_false,
-      sym_none,
-  [60348] = 4,
+  [60371] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2033), 1,
+    ACTIONS(2047), 1,
       anon_sym_COLON,
-    ACTIONS(2035), 1,
+    ACTIONS(2049), 1,
       anon_sym_EQ,
-    ACTIONS(2037), 13,
+    ACTIONS(2051), 13,
       anon_sym_PLUS_EQ,
       anon_sym_DASH_EQ,
       anon_sym_STAR_EQ,
@@ -74760,170 +74793,170 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_EQ,
       anon_sym_CARET_EQ,
       anon_sym_PIPE_EQ,
-  [60373] = 10,
+  [60396] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2041), 1,
+    ACTIONS(2031), 1,
+      sym_identifier,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
-    ACTIONS(2063), 1,
-      sym_identifier,
     ACTIONS(2067), 1,
-      anon_sym_RPAREN,
-    STATE(1437), 1,
+      anon_sym_COLON,
+    STATE(1516), 1,
       sym_parameter,
-    STATE(1507), 2,
+    STATE(1608), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60410] = 10,
+  [60433] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2039), 1,
+    ACTIONS(2031), 1,
       sym_identifier,
-    ACTIONS(2041), 1,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
-    ACTIONS(2067), 1,
+    ACTIONS(2069), 1,
       anon_sym_COLON,
-    STATE(1437), 1,
+    STATE(1516), 1,
       sym_parameter,
-    STATE(1606), 2,
+    STATE(1608), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60447] = 10,
+  [60470] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2041), 1,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
     ACTIONS(2063), 1,
       sym_identifier,
-    ACTIONS(2069), 1,
+    ACTIONS(2067), 1,
       anon_sym_RPAREN,
-    STATE(1437), 1,
+    STATE(1516), 1,
       sym_parameter,
-    STATE(1507), 2,
+    STATE(1520), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60484] = 10,
+  [60507] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2039), 1,
-      sym_identifier,
-    ACTIONS(2041), 1,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
+    ACTIONS(2063), 1,
+      sym_identifier,
     ACTIONS(2069), 1,
-      anon_sym_COLON,
-    STATE(1437), 1,
+      anon_sym_RPAREN,
+    STATE(1516), 1,
       sym_parameter,
-    STATE(1606), 2,
+    STATE(1520), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60521] = 9,
+  [60544] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2041), 1,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
     ACTIONS(2063), 1,
       sym_identifier,
-    STATE(1437), 1,
+    STATE(1516), 1,
       sym_parameter,
-    STATE(1507), 2,
+    STATE(1520), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60555] = 9,
+  [60578] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2039), 1,
+    ACTIONS(2031), 1,
       sym_identifier,
-    ACTIONS(2041), 1,
+    ACTIONS(2033), 1,
       anon_sym_LPAREN,
-    ACTIONS(2043), 1,
+    ACTIONS(2035), 1,
       anon_sym_STAR,
-    ACTIONS(2047), 1,
+    ACTIONS(2039), 1,
       anon_sym_STAR_STAR,
-    ACTIONS(2049), 1,
+    ACTIONS(2041), 1,
       anon_sym_SLASH,
-    STATE(1437), 1,
+    STATE(1516), 1,
       sym_parameter,
-    STATE(1606), 2,
+    STATE(1608), 2,
       sym_list_splat_pattern,
       sym_dictionary_splat_pattern,
-    STATE(1410), 6,
+    STATE(1518), 6,
       sym_tuple_pattern,
       sym_default_parameter,
       sym_typed_default_parameter,
       sym_typed_parameter,
       sym_positional_separator,
       sym_keyword_separator,
-  [60589] = 3,
+  [60612] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1574), 1,
+    ACTIONS(2073), 1,
       anon_sym_as,
-    ACTIONS(1558), 12,
+    ACTIONS(2071), 12,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
@@ -74936,12 +74969,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_EQ,
       anon_sym_and,
       anon_sym_or,
-  [60610] = 3,
+  [60633] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2073), 1,
+    ACTIONS(1650), 1,
       anon_sym_as,
-    ACTIONS(2071), 12,
+    ACTIONS(1634), 12,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
@@ -74954,7 +74987,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_EQ,
       anon_sym_and,
       anon_sym_or,
-  [60631] = 4,
+  [60654] = 4,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2077), 1,
@@ -74972,7 +75005,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [60653] = 9,
+  [60676] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
@@ -74981,343 +75014,282 @@ static const uint16_t ts_small_parse_table[] = {
       sym_comment,
     ACTIONS(2088), 1,
       sym__string_end,
-    STATE(1056), 1,
+    STATE(1044), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [60684] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2092), 1,
-      anon_sym_if,
-    ACTIONS(2094), 1,
-      anon_sym_COLON,
-    ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
-    ACTIONS(2100), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2102), 1,
-      anon_sym_and,
-    ACTIONS(2104), 1,
-      anon_sym_or,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1310), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1676), 1,
-      sym__comprehension_clauses,
-  [60721] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2106), 1,
-      anon_sym_DOT,
-    ACTIONS(2108), 1,
-      anon_sym_LPAREN,
-    STATE(1064), 1,
-      aux_sym_match_value_pattern_repeat1,
-    ACTIONS(2110), 8,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [60744] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(666), 1,
-      sym__template_string_start,
-    STATE(750), 2,
-      sym_template_string,
-      aux_sym_concatenated_template_string_repeat1,
-    ACTIONS(2112), 8,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [60765] = 9,
+  [60707] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2114), 1,
+    ACTIONS(2090), 1,
       sym__string_end,
-    STATE(1046), 1,
+    STATE(1044), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [60796] = 9,
-    ACTIONS(2086), 1,
-      sym_comment,
-    ACTIONS(2116), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(2122), 1,
-      anon_sym_BSLASH,
-    ACTIONS(2125), 1,
-      sym__string_end,
-    STATE(1045), 1,
-      aux_sym_string_repeat1,
-    STATE(1248), 1,
-      sym_string_content,
-    STATE(1252), 1,
-      sym_interpolation,
-    STATE(1149), 2,
-      sym__not_escape_sequence,
-      aux_sym_string_content_repeat1,
-    ACTIONS(2119), 3,
-      sym__string_content,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [60827] = 9,
+  [60738] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2127), 1,
+    ACTIONS(2092), 1,
       sym__string_end,
-    STATE(1045), 1,
+    STATE(1058), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [60858] = 12,
+  [60769] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2092), 1,
-      anon_sym_if,
     ACTIONS(2094), 1,
-      anon_sym_COLON,
-    ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
-    ACTIONS(2100), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2102), 1,
-      anon_sym_and,
-    ACTIONS(2104), 1,
-      anon_sym_or,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1310), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1728), 1,
-      sym__comprehension_clauses,
-  [60895] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
+      anon_sym_DOT,
     ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
-    ACTIONS(2129), 1,
+      anon_sym_LPAREN,
+    STATE(1039), 1,
+      aux_sym_match_value_pattern_repeat1,
+    ACTIONS(2098), 8,
       anon_sym_RPAREN,
-    ACTIONS(2131), 1,
       anon_sym_COMMA,
-    ACTIONS(2134), 1,
       anon_sym_as,
-    ACTIONS(2136), 1,
       anon_sym_if,
-    ACTIONS(2138), 1,
-      anon_sym_and,
-    ACTIONS(2140), 1,
-      anon_sym_or,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1310), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1711), 1,
-      sym__comprehension_clauses,
-  [60932] = 9,
-    ACTIONS(2080), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(2084), 1,
-      anon_sym_BSLASH,
+      anon_sym_COLON,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [60792] = 9,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2142), 1,
+    ACTIONS(2100), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(2106), 1,
+      anon_sym_BSLASH,
+    ACTIONS(2109), 1,
       sym__string_end,
-    STATE(1051), 1,
+    STATE(1044), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
-    ACTIONS(2082), 3,
+    ACTIONS(2103), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [60963] = 9,
+  [60823] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2144), 1,
+    ACTIONS(2111), 1,
       sym__string_end,
-    STATE(1052), 1,
+    STATE(1040), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [60994] = 9,
+  [60854] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2146), 1,
+    ACTIONS(2113), 1,
       sym__string_end,
-    STATE(1045), 1,
+    STATE(1047), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [61025] = 9,
+  [60885] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2148), 1,
+    ACTIONS(2115), 1,
       sym__string_end,
-    STATE(1045), 1,
+    STATE(1044), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [61056] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2075), 11,
-      anon_sym_import,
-      anon_sym_DOT,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [61073] = 9,
+  [60916] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2150), 1,
+    ACTIONS(2117), 1,
       sym__string_end,
-    STATE(1057), 1,
+    STATE(1050), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [61104] = 9,
+  [60947] = 12,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2119), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2121), 1,
+      anon_sym_COMMA,
+    ACTIONS(2124), 1,
+      anon_sym_as,
+    ACTIONS(2126), 1,
+      anon_sym_if,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2132), 1,
+      anon_sym_and,
+    ACTIONS(2134), 1,
+      anon_sym_or,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1285), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1723), 1,
+      sym__comprehension_clauses,
+  [60984] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2152), 1,
+    ACTIONS(2136), 1,
       sym__string_end,
-    STATE(1058), 1,
+    STATE(1044), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [61135] = 9,
+  [61015] = 12,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2140), 1,
+      anon_sym_if,
+    ACTIONS(2142), 1,
+      anon_sym_COLON,
+    ACTIONS(2144), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2146), 1,
+      anon_sym_and,
+    ACTIONS(2148), 1,
+      anon_sym_or,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1285), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1641), 1,
+      sym__comprehension_clauses,
+  [61052] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2094), 1,
+      anon_sym_DOT,
+    ACTIONS(2150), 1,
+      anon_sym_LPAREN,
+    STATE(1043), 1,
+      aux_sym_match_value_pattern_repeat1,
+    ACTIONS(2152), 8,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [61075] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
@@ -75326,272 +75298,311 @@ static const uint16_t ts_small_parse_table[] = {
       sym_comment,
     ACTIONS(2154), 1,
       sym__string_end,
-    STATE(1045), 1,
+    STATE(1060), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [61166] = 9,
+  [61106] = 12,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2140), 1,
+      anon_sym_if,
+    ACTIONS(2142), 1,
+      anon_sym_COLON,
+    ACTIONS(2144), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2146), 1,
+      anon_sym_and,
+    ACTIONS(2148), 1,
+      anon_sym_or,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1285), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1628), 1,
+      sym__comprehension_clauses,
+  [61143] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2075), 11,
+      anon_sym_import,
+      anon_sym_DOT,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [61160] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(652), 1,
+      sym__string_start,
+    STATE(766), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+    ACTIONS(2156), 8,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [61181] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2156), 1,
+    ACTIONS(2158), 1,
       sym__string_end,
-    STATE(1045), 1,
+    STATE(1044), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [61197] = 9,
+  [61212] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2158), 1,
+    ACTIONS(2160), 1,
       sym__string_end,
-    STATE(1045), 1,
+    STATE(1044), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [61228] = 9,
+  [61243] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2160), 1,
+    ACTIONS(2162), 1,
       sym__string_end,
-    STATE(1065), 1,
+    STATE(1044), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [61259] = 9,
+  [61274] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2162), 1,
+    ACTIONS(2164), 1,
       sym__string_end,
-    STATE(1062), 1,
+    STATE(1044), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [61290] = 9,
+  [61305] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2164), 1,
+    ACTIONS(2166), 1,
       sym__string_end,
     STATE(1066), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [61321] = 9,
+  [61336] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2166), 1,
+    ACTIONS(2168), 1,
       sym__string_end,
-    STATE(1045), 1,
+    STATE(1041), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [61352] = 12,
+  [61367] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2138), 1,
       anon_sym_COMMA,
-    ACTIONS(2092), 1,
+    ACTIONS(2140), 1,
       anon_sym_if,
-    ACTIONS(2094), 1,
+    ACTIONS(2142), 1,
       anon_sym_COLON,
-    ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
-    ACTIONS(2100), 1,
+    ACTIONS(2144), 1,
       anon_sym_RBRACE,
-    ACTIONS(2102), 1,
+    ACTIONS(2146), 1,
       anon_sym_and,
-    ACTIONS(2104), 1,
+    ACTIONS(2148), 1,
       anon_sym_or,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1310), 1,
+    STATE(1285), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1695), 1,
+    STATE(1728), 1,
       sym__comprehension_clauses,
-  [61389] = 5,
+  [61404] = 12,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2106), 1,
-      anon_sym_DOT,
-    ACTIONS(2168), 1,
-      anon_sym_LPAREN,
-    STATE(1039), 1,
-      aux_sym_match_value_pattern_repeat1,
-    ACTIONS(2170), 8,
-      anon_sym_RPAREN,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2138), 1,
       anon_sym_COMMA,
-      anon_sym_as,
+    ACTIONS(2140), 1,
       anon_sym_if,
+    ACTIONS(2142), 1,
       anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
+    ACTIONS(2144), 1,
       anon_sym_RBRACE,
-  [61412] = 9,
+    ACTIONS(2146), 1,
+      anon_sym_and,
+    ACTIONS(2148), 1,
+      anon_sym_or,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1285), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1627), 1,
+      sym__comprehension_clauses,
+  [61441] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2172), 1,
+    ACTIONS(2170), 1,
       sym__string_end,
-    STATE(1045), 1,
+    STATE(1057), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [61443] = 9,
+  [61472] = 9,
     ACTIONS(2080), 1,
       anon_sym_LBRACE2,
     ACTIONS(2084), 1,
       anon_sym_BSLASH,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2174), 1,
+    ACTIONS(2172), 1,
       sym__string_end,
-    STATE(1045), 1,
+    STATE(1044), 1,
       aux_sym_string_repeat1,
-    STATE(1248), 1,
+    STATE(1277), 1,
       sym_string_content,
-    STATE(1252), 1,
+    STATE(1280), 1,
       sym_interpolation,
-    STATE(1149), 2,
+    STATE(1170), 2,
       sym__not_escape_sequence,
       aux_sym_string_content_repeat1,
     ACTIONS(2082), 3,
       sym__string_content,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [61474] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2092), 1,
-      anon_sym_if,
-    ACTIONS(2094), 1,
-      anon_sym_COLON,
-    ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
-    ACTIONS(2100), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2102), 1,
-      anon_sym_and,
-    ACTIONS(2104), 1,
-      anon_sym_or,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1310), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1717), 1,
-      sym__comprehension_clauses,
-  [61511] = 4,
+  [61503] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
-      sym__string_start,
-    STATE(749), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-    ACTIONS(2112), 8,
+    ACTIONS(654), 1,
+      sym__template_string_start,
+    STATE(762), 2,
+      sym_template_string,
+      aux_sym_concatenated_template_string_repeat1,
+    ACTIONS(2156), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -75600,89 +75611,120 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [61532] = 4,
+  [61524] = 9,
+    ACTIONS(2080), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(2084), 1,
+      anon_sym_BSLASH,
+    ACTIONS(2086), 1,
+      sym_comment,
+    ACTIONS(2174), 1,
+      sym__string_end,
+    STATE(1059), 1,
+      aux_sym_string_repeat1,
+    STATE(1277), 1,
+      sym_string_content,
+    STATE(1280), 1,
+      sym_interpolation,
+    STATE(1170), 2,
+      sym__not_escape_sequence,
+      aux_sym_string_content_repeat1,
+    ACTIONS(2082), 3,
+      sym__string_content,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [61555] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2138), 1,
-      anon_sym_and,
-    ACTIONS(2178), 1,
-      anon_sym_as,
+    ACTIONS(2178), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
     ACTIONS(2176), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_or,
-  [61552] = 11,
+  [61573] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
+    ACTIONS(2126), 1,
+      anon_sym_if,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2136), 1,
-      anon_sym_if,
-    ACTIONS(2138), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
     ACTIONS(2180), 1,
       anon_sym_RPAREN,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1310), 1,
+    STATE(1285), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1628), 1,
+    STATE(1621), 1,
       sym__comprehension_clauses,
-  [61586] = 4,
+  [61607] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2126), 1,
+      anon_sym_if,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2176), 8,
+    ACTIONS(2182), 1,
       anon_sym_RPAREN,
+    ACTIONS(2184), 1,
       anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-  [61606] = 6,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1463), 1,
+      aux_sym_argument_list_repeat1,
+    STATE(1621), 1,
+      sym__comprehension_clauses,
+  [61641] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2136), 1,
+    ACTIONS(2126), 1,
       anon_sym_if,
-    ACTIONS(2138), 1,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2188), 1,
-      anon_sym_as,
-    ACTIONS(2186), 6,
+    ACTIONS(2186), 1,
       anon_sym_RPAREN,
+    ACTIONS(2188), 1,
       anon_sym_COMMA,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [61630] = 5,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1483), 1,
+      aux_sym_argument_list_repeat1,
+    STATE(1708), 1,
+      sym__comprehension_clauses,
+  [61675] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2138), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
-      anon_sym_or,
     ACTIONS(2192), 1,
       anon_sym_as,
-    ACTIONS(2190), 7,
+    ACTIONS(2190), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
@@ -75690,285 +75732,318 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [61652] = 11,
+      anon_sym_or,
+  [61695] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
+    ACTIONS(2132), 1,
+      anon_sym_and,
+    ACTIONS(2134), 1,
+      anon_sym_or,
+    ACTIONS(2196), 1,
+      anon_sym_as,
+    ACTIONS(2194), 7,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    ACTIONS(2096), 1,
+      anon_sym_if,
       anon_sym_async,
-    ACTIONS(2098), 1,
       anon_sym_for,
-    ACTIONS(2129), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2136), 1,
-      anon_sym_if,
-    ACTIONS(2138), 1,
-      anon_sym_and,
-    ACTIONS(2140), 1,
-      anon_sym_or,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1310), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1711), 1,
-      sym__comprehension_clauses,
-  [61686] = 11,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [61717] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2096), 1,
+    ACTIONS(2126), 1,
+      anon_sym_if,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2136), 1,
-      anon_sym_if,
-    ACTIONS(2138), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2194), 1,
+    ACTIONS(2198), 1,
       anon_sym_RPAREN,
-    ACTIONS(2196), 1,
+    ACTIONS(2200), 1,
       anon_sym_COMMA,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1476), 1,
+    STATE(1443), 1,
       aux_sym_argument_list_repeat1,
-    STATE(1673), 1,
+    STATE(1723), 1,
       sym__comprehension_clauses,
-  [61720] = 5,
+  [61751] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2186), 7,
+    ACTIONS(2192), 1,
+      anon_sym_as,
+    ACTIONS(2190), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_else,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_EQ,
-  [61742] = 6,
+  [61773] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2136), 1,
+    ACTIONS(2126), 1,
       anon_sym_if,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2132), 1,
+      anon_sym_and,
+    ACTIONS(2134), 1,
+      anon_sym_or,
     ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2144), 1,
+      anon_sym_RBRACK,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1285), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1692), 1,
+      sym__comprehension_clauses,
+  [61807] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2126), 1,
+      anon_sym_if,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2202), 1,
+    ACTIONS(2204), 1,
       anon_sym_as,
-    ACTIONS(2200), 6,
+    ACTIONS(2202), 6,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_async,
       anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [61766] = 3,
+  [61831] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2206), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(2204), 8,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2194), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_if,
       anon_sym_COLON,
-      anon_sym_PIPE,
+      anon_sym_else,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [61784] = 3,
+      anon_sym_EQ,
+  [61851] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2210), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(2208), 8,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2210), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
+      anon_sym_COLON,
+      anon_sym_else,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+  [61873] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
       anon_sym_if,
+    ACTIONS(2214), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
       anon_sym_COLON,
-      anon_sym_PIPE,
+      anon_sym_else,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [61802] = 11,
+      anon_sym_EQ,
+  [61895] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2216), 8,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
-    ACTIONS(2100), 1,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_RBRACK,
-    ACTIONS(2136), 1,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+  [61915] = 11,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2126), 1,
       anon_sym_if,
-    ACTIONS(2138), 1,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    STATE(1106), 1,
+    ACTIONS(2218), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2220), 1,
+      anon_sym_COMMA,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1310), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1754), 1,
+    STATE(1453), 1,
+      aux_sym_argument_list_repeat1,
+    STATE(1745), 1,
       sym__comprehension_clauses,
-  [61836] = 4,
+  [61949] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2212), 8,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2202), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_if,
       anon_sym_COLON,
       anon_sym_else,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_EQ,
-  [61856] = 6,
+  [61971] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2136), 1,
-      anon_sym_if,
-    ACTIONS(2138), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2216), 1,
+    ACTIONS(2222), 1,
       anon_sym_as,
-    ACTIONS(2214), 6,
+    ACTIONS(2216), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_if,
       anon_sym_async,
       anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [61880] = 5,
+  [61993] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2138), 1,
-      anon_sym_and,
-    ACTIONS(2140), 1,
-      anon_sym_or,
-    ACTIONS(2178), 1,
-      anon_sym_as,
-    ACTIONS(2176), 7,
+    ACTIONS(2226), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(2224), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [61902] = 11,
+  [62011] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
+    ACTIONS(2126), 1,
+      anon_sym_if,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2136), 1,
-      anon_sym_if,
-    ACTIONS(2138), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2218), 1,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2228), 1,
       anon_sym_RPAREN,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1310), 1,
+    STATE(1285), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1673), 1,
+    STATE(1708), 1,
       sym__comprehension_clauses,
-  [61936] = 5,
+  [62045] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2126), 1,
       anon_sym_if,
-    ACTIONS(2200), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_else,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-  [61958] = 11,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2136), 1,
-      anon_sym_if,
-    ACTIONS(2138), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2220), 1,
-      anon_sym_RPAREN,
-    STATE(1106), 1,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2144), 1,
+      anon_sym_RBRACK,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1310), 1,
+    STATE(1285), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1618), 1,
+    STATE(1623), 1,
       sym__comprehension_clauses,
-  [61992] = 11,
+  [62079] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2096), 1,
+    ACTIONS(2126), 1,
+      anon_sym_if,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2136), 1,
-      anon_sym_if,
-    ACTIONS(2138), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2222), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2224), 1,
+    ACTIONS(2138), 1,
       anon_sym_COMMA,
-    STATE(1106), 1,
+    ACTIONS(2230), 1,
+      anon_sym_RPAREN,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1441), 1,
-      aux_sym_argument_list_repeat1,
-    STATE(1628), 1,
+    STATE(1285), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1745), 1,
       sym__comprehension_clauses,
-  [62026] = 4,
+  [62113] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2190), 8,
+    ACTIONS(2190), 9,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
@@ -75977,209 +76052,234 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_EQ,
-  [62046] = 5,
+      anon_sym_or,
+  [62131] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2126), 1,
+      anon_sym_if,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2214), 7,
+    ACTIONS(2232), 1,
+      anon_sym_as,
+    ACTIONS(2210), 6,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_else,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_EQ,
-  [62068] = 11,
+  [62155] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
+    ACTIONS(2126), 1,
+      anon_sym_if,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2100), 1,
+    ACTIONS(2132), 1,
+      anon_sym_and,
+    ACTIONS(2134), 1,
+      anon_sym_or,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2144), 1,
       anon_sym_RBRACK,
-    ACTIONS(2136), 1,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1285), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1726), 1,
+      sym__comprehension_clauses,
+  [62189] = 11,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2126), 1,
       anon_sym_if,
-    ACTIONS(2138), 1,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    STATE(1106), 1,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2144), 1,
+      anon_sym_RBRACK,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1310), 1,
+    STATE(1285), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1713), 1,
+    STATE(1622), 1,
       sym__comprehension_clauses,
-  [62102] = 5,
+  [62223] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2138), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2226), 1,
-      anon_sym_as,
-    ACTIONS(2212), 7,
+    ACTIONS(2190), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_else,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62124] = 11,
+      anon_sym_EQ,
+  [62243] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
+    ACTIONS(2126), 1,
+      anon_sym_if,
+    ACTIONS(2132), 1,
+      anon_sym_and,
+    ACTIONS(2134), 1,
+      anon_sym_or,
+    ACTIONS(2234), 1,
+      anon_sym_as,
+    ACTIONS(2214), 6,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    ACTIONS(2096), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
       anon_sym_for,
-    ACTIONS(2100), 1,
       anon_sym_RBRACK,
-    ACTIONS(2136), 1,
-      anon_sym_if,
-    ACTIONS(2138), 1,
-      anon_sym_and,
-    ACTIONS(2140), 1,
-      anon_sym_or,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1310), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1675), 1,
-      sym__comprehension_clauses,
-  [62158] = 11,
+      anon_sym_RBRACE,
+  [62267] = 11,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2096), 1,
+    ACTIONS(2119), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2126), 1,
+      anon_sym_if,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2136), 1,
-      anon_sym_if,
-    ACTIONS(2138), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2228), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2230), 1,
+    ACTIONS(2138), 1,
       anon_sym_COMMA,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1459), 1,
-      aux_sym_argument_list_repeat1,
-    STATE(1711), 1,
+    STATE(1285), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1723), 1,
       sym__comprehension_clauses,
-  [62192] = 11,
+  [62301] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
-    ACTIONS(2136), 1,
+    ACTIONS(2236), 1,
+      anon_sym_COMMA,
+    ACTIONS(2238), 1,
       anon_sym_if,
-    ACTIONS(2138), 1,
+    ACTIONS(2242), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2244), 1,
       anon_sym_or,
-    ACTIONS(2232), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2234), 1,
-      anon_sym_COMMA,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1526), 1,
-      aux_sym_argument_list_repeat1,
-    STATE(1618), 1,
-      sym__comprehension_clauses,
-  [62226] = 11,
+    STATE(1274), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2240), 4,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [62326] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
+    ACTIONS(2132), 1,
+      anon_sym_and,
+    ACTIONS(2134), 1,
+      anon_sym_or,
+    ACTIONS(2246), 7,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    ACTIONS(2096), 1,
+      anon_sym_if,
       anon_sym_async,
-    ACTIONS(2098), 1,
       anon_sym_for,
-    ACTIONS(2100), 1,
       anon_sym_RBRACK,
-    ACTIONS(2136), 1,
-      anon_sym_if,
-    ACTIONS(2138), 1,
-      anon_sym_and,
-    ACTIONS(2140), 1,
-      anon_sym_or,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1310), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1722), 1,
-      sym__comprehension_clauses,
-  [62260] = 3,
+      anon_sym_RBRACE,
+  [62345] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2176), 9,
+    ACTIONS(2250), 1,
+      anon_sym_PIPE,
+    STATE(1099), 1,
+      aux_sym_match_or_pattern_repeat1,
+    ACTIONS(2248), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_if,
       anon_sym_COLON,
-      anon_sym_else,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_or,
-  [62278] = 4,
+  [62364] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2138), 1,
-      anon_sym_and,
-    ACTIONS(2140), 1,
-      anon_sym_or,
-    ACTIONS(2236), 7,
-      anon_sym_RPAREN,
+    ACTIONS(2236), 1,
       anon_sym_COMMA,
+    ACTIONS(2238), 1,
       anon_sym_if,
+    ACTIONS(2242), 1,
+      anon_sym_and,
+    ACTIONS(2244), 1,
+      anon_sym_or,
+    STATE(1274), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2253), 4,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [62389] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2128), 1,
       anon_sym_async,
+    ACTIONS(2130), 1,
       anon_sym_for,
+    ACTIONS(2257), 1,
+      anon_sym_if,
+    ACTIONS(2255), 3,
+      anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62297] = 5,
+    STATE(1109), 3,
+      sym_for_in_clause,
+      sym_if_clause,
+      aux_sym__comprehension_clauses_repeat1,
+  [62412] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2136), 1,
-      anon_sym_if,
-    ACTIONS(2138), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2238), 6,
+    ACTIONS(2246), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_if,
       anon_sym_async,
       anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62318] = 4,
+  [62431] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2138), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2236), 7,
+    ACTIONS(2246), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
@@ -76187,46 +76287,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62337] = 6,
+  [62450] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2242), 1,
+    ACTIONS(2261), 1,
       anon_sym_if,
-    ACTIONS(2245), 1,
+    ACTIONS(2264), 1,
       anon_sym_async,
-    ACTIONS(2248), 1,
+    ACTIONS(2267), 1,
       anon_sym_for,
-    ACTIONS(2240), 3,
+    ACTIONS(2259), 3,
       anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-    STATE(1100), 3,
+    STATE(1104), 3,
       sym_for_in_clause,
       sym_if_clause,
       aux_sym__comprehension_clauses_repeat1,
-  [62360] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2253), 1,
-      anon_sym_PIPE,
-    STATE(1105), 1,
-      aux_sym_match_or_pattern_repeat1,
-    ACTIONS(2251), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [62379] = 4,
+  [62473] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2257), 1,
+    ACTIONS(2272), 1,
       anon_sym_PIPE,
-    STATE(1102), 1,
+    STATE(1107), 1,
       aux_sym_match_or_pattern_repeat1,
-    ACTIONS(2255), 7,
+    ACTIONS(2270), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76234,47 +76319,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62398] = 7,
+  [62492] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2260), 1,
-      anon_sym_COMMA,
-    ACTIONS(2262), 1,
+    ACTIONS(2126), 1,
       anon_sym_if,
-    ACTIONS(2266), 1,
-      anon_sym_and,
-    ACTIONS(2268), 1,
-      anon_sym_or,
-    STATE(1274), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2264), 4,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [62423] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2138), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2236), 7,
+    ACTIONS(2274), 6,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_if,
       anon_sym_async,
       anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62442] = 4,
+  [62513] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2253), 1,
+    ACTIONS(2272), 1,
       anon_sym_PIPE,
-    STATE(1102), 1,
+    STATE(1099), 1,
       aux_sym_match_or_pattern_repeat1,
-    ACTIONS(2270), 7,
+    ACTIONS(2276), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76282,78 +76350,81 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62461] = 6,
+  [62532] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
-    ACTIONS(2274), 1,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2272), 3,
+    ACTIONS(2274), 6,
       anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-    STATE(1108), 3,
-      sym_for_in_clause,
-      sym_if_clause,
-      aux_sym__comprehension_clauses_repeat1,
-  [62484] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2260), 1,
       anon_sym_COMMA,
-    ACTIONS(2262), 1,
-      anon_sym_if,
-    ACTIONS(2266), 1,
-      anon_sym_and,
-    ACTIONS(2268), 1,
-      anon_sym_or,
-    STATE(1274), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2276), 4,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
       anon_sym_RBRACE,
       anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [62509] = 6,
+  [62553] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2274), 1,
+    ACTIONS(2257), 1,
       anon_sym_if,
     ACTIONS(2278), 3,
       anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-    STATE(1100), 3,
+    STATE(1104), 3,
       sym_for_in_clause,
       sym_if_clause,
       aux_sym__comprehension_clauses_repeat1,
-  [62532] = 5,
+  [62576] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2216), 6,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
       anon_sym_if,
-    ACTIONS(2238), 6,
+      anon_sym_EQ,
+      anon_sym_SEMI,
+  [62594] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2284), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_if,
       anon_sym_COLON,
+      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
+  [62608] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2071), 8,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_RBRACE,
       anon_sym_EQ,
-  [62553] = 2,
+      anon_sym_and,
+      anon_sym_or,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [62622] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2280), 8,
+    ACTIONS(2286), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76362,50 +76433,94 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62567] = 2,
+  [62636] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2282), 8,
+    ACTIONS(2290), 1,
+      anon_sym_PIPE,
+    ACTIONS(2288), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_if,
       anon_sym_COLON,
-      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62581] = 4,
+  [62652] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2238), 1,
+      anon_sym_if,
+    ACTIONS(2242), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2244), 1,
       anon_sym_or,
-    ACTIONS(2176), 6,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(2210), 5,
       anon_sym_COMMA,
-      anon_sym_if,
+      anon_sym_RBRACE,
       anon_sym_EQ,
-      anon_sym_SEMI,
-  [62599] = 4,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [62672] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2290), 1,
-      anon_sym_COMMA,
-    STATE(1113), 1,
-      aux_sym_for_in_clause_repeat1,
-    ACTIONS(2288), 6,
+    ACTIONS(2292), 8,
       anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62617] = 2,
+  [62686] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2293), 8,
+    ACTIONS(2280), 1,
+      anon_sym_and,
+    ACTIONS(2282), 1,
+      anon_sym_or,
+    ACTIONS(2294), 1,
+      anon_sym_if,
+    ACTIONS(2202), 5,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_SEMI,
+  [62706] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2146), 1,
+      anon_sym_and,
+    ACTIONS(2148), 1,
+      anon_sym_or,
+    ACTIONS(2194), 6,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACE,
+  [62724] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2140), 1,
+      anon_sym_if,
+    ACTIONS(2146), 1,
+      anon_sym_and,
+    ACTIONS(2148), 1,
+      anon_sym_or,
+    ACTIONS(2214), 5,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACE,
+  [62744] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2296), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76414,84 +76529,112 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62631] = 4,
+  [62758] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2146), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2148), 1,
       anon_sym_or,
-    ACTIONS(2190), 6,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(2216), 6,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_EQ,
-      anon_sym_SEMI,
-  [62649] = 2,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACE,
+  [62776] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2112), 8,
-      anon_sym_RPAREN,
+    ACTIONS(2146), 1,
+      anon_sym_and,
+    ACTIONS(2190), 7,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_if,
       anon_sym_COLON,
-      anon_sym_PIPE,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACE,
+      anon_sym_or,
+  [62792] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2146), 1,
+      anon_sym_and,
+    ACTIONS(2148), 1,
+      anon_sym_or,
+    ACTIONS(2190), 6,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACE,
+  [62810] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2300), 1,
+      anon_sym_COMMA,
+    STATE(1124), 1,
+      aux_sym_for_in_clause_repeat1,
+    ACTIONS(2298), 6,
+      anon_sym_RPAREN,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62663] = 3,
+  [62828] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2297), 1,
-      anon_sym_PIPE,
-    ACTIONS(2295), 7,
+    ACTIONS(2303), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_if,
       anon_sym_COLON,
+      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62679] = 5,
+  [62842] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(69), 1,
+      anon_sym_AT,
+    ACTIONS(2305), 1,
+      anon_sym_async,
+    ACTIONS(2307), 1,
+      anon_sym_def,
+    ACTIONS(2309), 1,
+      anon_sym_class,
+    STATE(516), 2,
+      sym_function_definition,
+      sym_class_definition,
+    STATE(1248), 2,
+      sym_decorator,
+      aux_sym_decorated_definition_repeat1,
+  [62866] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
-      anon_sym_if,
-    ACTIONS(2200), 5,
+    ACTIONS(2190), 6,
       sym__newline,
       anon_sym_from,
       anon_sym_COMMA,
+      anon_sym_if,
       anon_sym_EQ,
       anon_sym_SEMI,
-  [62699] = 6,
-    ACTIONS(2086), 1,
-      sym_comment,
-    ACTIONS(2301), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(2306), 1,
-      anon_sym_BSLASH,
-    ACTIONS(2309), 1,
-      sym__string_end,
-    STATE(1119), 2,
-      sym__not_escape_sequence,
-      aux_sym_string_content_repeat1,
-    ACTIONS(2303), 3,
-      sym__string_content,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [62721] = 5,
+  [62884] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2262), 1,
+    ACTIONS(2238), 1,
       anon_sym_if,
-    ACTIONS(2266), 1,
+    ACTIONS(2242), 1,
       anon_sym_and,
-    ACTIONS(2268), 1,
+    ACTIONS(2244), 1,
       anon_sym_or,
     ACTIONS(2311), 5,
       anon_sym_COMMA,
@@ -76499,53 +76642,80 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_EQ,
       anon_sym_COLON2,
       sym_type_conversion,
-  [62741] = 5,
+  [62904] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2313), 1,
+      sym_identifier,
+    ACTIONS(2315), 1,
+      anon_sym_STAR,
+    ACTIONS(2317), 1,
+      anon_sym_RBRACK,
+    ACTIONS(2319), 1,
+      anon_sym_STAR_STAR,
+    STATE(1563), 4,
+      sym_typevar_parameter,
+      sym_typevartuple_parameter,
+      sym_paramspec_parameter,
+      sym__type_parameter,
+  [62926] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2238), 1,
+      anon_sym_if,
+    ACTIONS(2242), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2244), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
-      anon_sym_if,
-    ACTIONS(2186), 5,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(2321), 5,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
-      anon_sym_SEMI,
-  [62761] = 4,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [62946] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2315), 1,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2321), 5,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    STATE(1113), 1,
-      aux_sym_for_in_clause_repeat1,
-    ACTIONS(2313), 6,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [62966] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2323), 8,
       anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_COLON,
+      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62779] = 4,
+  [62980] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
-      anon_sym_and,
-    ACTIONS(2286), 1,
-      anon_sym_or,
-    ACTIONS(2212), 6,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(2325), 8,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_if,
-      anon_sym_EQ,
-      anon_sym_SEMI,
-  [62797] = 2,
+      anon_sym_COLON,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [62994] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2317), 8,
+    ACTIONS(2327), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76554,49 +76724,103 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62811] = 5,
+  [63008] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2140), 1,
+      anon_sym_if,
+    ACTIONS(2146), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2148), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2319), 5,
-      anon_sym_RPAREN,
+    ACTIONS(2210), 5,
       anon_sym_COMMA,
       anon_sym_COLON,
-      anon_sym_RBRACK,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_RBRACE,
-  [62831] = 2,
+  [63028] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1558), 8,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
+    ACTIONS(2238), 1,
       anon_sym_if,
+    ACTIONS(2242), 1,
+      anon_sym_and,
+    ACTIONS(2244), 1,
+      anon_sym_or,
+    ACTIONS(2202), 5,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
       anon_sym_EQ,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [63048] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2280), 1,
       anon_sym_and,
+    ACTIONS(2282), 1,
       anon_sym_or,
+    ACTIONS(2294), 1,
+      anon_sym_if,
+    ACTIONS(2329), 1,
+      anon_sym_from,
+    ACTIONS(2331), 1,
+      anon_sym_COMMA,
+    STATE(1314), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2333), 2,
+      sym__newline,
       anon_sym_SEMI,
-  [62845] = 2,
+  [63074] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2321), 8,
-      anon_sym_RPAREN,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2335), 1,
       anon_sym_COMMA,
-      anon_sym_as,
+    STATE(1275), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2253), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [63098] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2140), 1,
       anon_sym_if,
+    ACTIONS(2146), 1,
+      anon_sym_and,
+    ACTIONS(2148), 1,
+      anon_sym_or,
+    ACTIONS(2202), 5,
+      anon_sym_COMMA,
       anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_RBRACE,
-  [62859] = 2,
+  [63118] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2323), 8,
+    ACTIONS(2280), 1,
+      anon_sym_and,
+    ACTIONS(2190), 7,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_SEMI,
+  [63134] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2248), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76605,7 +76829,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62873] = 2,
+  [63148] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2071), 8,
@@ -76617,10 +76841,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_and,
       anon_sym_or,
       anon_sym_SEMI,
-  [62887] = 2,
+  [63162] = 6,
+    ACTIONS(2086), 1,
+      sym_comment,
+    ACTIONS(2337), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(2342), 1,
+      anon_sym_BSLASH,
+    ACTIONS(2345), 1,
+      sym__string_end,
+    STATE(1143), 2,
+      sym__not_escape_sequence,
+      aux_sym_string_content_repeat1,
+    ACTIONS(2339), 3,
+      sym__string_content,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [63184] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2325), 8,
+    ACTIONS(2347), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76629,22 +76869,51 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62901] = 2,
+  [63198] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1558), 8,
+    ACTIONS(1634), 8,
+      sym__newline,
+      anon_sym_from,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_and,
       anon_sym_or,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [62915] = 2,
+      anon_sym_SEMI,
+  [63212] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2327), 8,
+    ACTIONS(2280), 1,
+      anon_sym_and,
+    ACTIONS(2282), 1,
+      anon_sym_or,
+    ACTIONS(2294), 1,
+      anon_sym_if,
+    ACTIONS(2210), 5,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_EQ,
+      anon_sym_SEMI,
+  [63232] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2351), 1,
+      anon_sym_COMMA,
+    STATE(1124), 1,
+      aux_sym_for_in_clause_repeat1,
+    ACTIONS(2349), 6,
+      anon_sym_RPAREN,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [63250] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2353), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76653,10 +76922,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62929] = 2,
+  [63264] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2329), 8,
+    ACTIONS(2355), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76665,10 +76934,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62943] = 2,
+  [63278] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2331), 8,
+    ACTIONS(2357), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76677,24 +76946,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62957] = 4,
+  [63292] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2335), 1,
+    ACTIONS(2361), 1,
       anon_sym_COMMA,
-    STATE(1173), 1,
+    STATE(1124), 1,
       aux_sym_for_in_clause_repeat1,
-    ACTIONS(2333), 6,
+    ACTIONS(2359), 6,
       anon_sym_RPAREN,
       anon_sym_if,
       anon_sym_async,
       anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62975] = 2,
+  [63310] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2255), 8,
+    ACTIONS(2363), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76703,28 +76972,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [62989] = 8,
+  [63324] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2294), 1,
       anon_sym_if,
-    ACTIONS(2337), 1,
+    ACTIONS(2214), 5,
+      sym__newline,
       anon_sym_from,
-    ACTIONS(2339), 1,
       anon_sym_COMMA,
-    STATE(1288), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2341), 2,
-      sym__newline,
+      anon_sym_EQ,
       anon_sym_SEMI,
-  [63015] = 2,
+  [63344] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2343), 8,
+    ACTIONS(2365), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76733,25 +76999,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [63029] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2284), 1,
-      anon_sym_and,
-    ACTIONS(2286), 1,
-      anon_sym_or,
-    ACTIONS(2299), 1,
-      anon_sym_if,
-    ACTIONS(2238), 5,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_SEMI,
-  [63049] = 2,
+  [63358] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2345), 8,
+    ACTIONS(2367), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76760,10 +77011,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [63063] = 2,
+  [63372] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2347), 8,
+    ACTIONS(2369), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76772,10 +77023,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [63077] = 2,
+  [63386] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2349), 8,
+    ACTIONS(2371), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76784,37 +77035,53 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [63091] = 2,
+  [63400] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2351), 8,
-      anon_sym_RPAREN,
+    ACTIONS(2242), 1,
+      anon_sym_and,
+    ACTIONS(2244), 1,
+      anon_sym_or,
+    ACTIONS(2194), 6,
       anon_sym_COMMA,
-      anon_sym_as,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [63105] = 5,
+      anon_sym_EQ,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [63418] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2311), 5,
+    ACTIONS(2373), 6,
       anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [63125] = 2,
+  [63436] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2071), 8,
+    ACTIONS(2238), 1,
+      anon_sym_if,
+    ACTIONS(2242), 1,
+      anon_sym_and,
+    ACTIONS(2244), 1,
+      anon_sym_or,
+    ACTIONS(2214), 5,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [63456] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1634), 8,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_RBRACE,
@@ -76823,40 +77090,40 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_or,
       anon_sym_COLON2,
       sym_type_conversion,
-  [63139] = 7,
+  [63470] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(69), 1,
-      anon_sym_AT,
-    ACTIONS(2353), 1,
-      anon_sym_async,
-    ACTIONS(2355), 1,
-      anon_sym_def,
-    ACTIONS(2357), 1,
-      anon_sym_class,
-    STATE(534), 2,
-      sym_function_definition,
-      sym_class_definition,
-    STATE(1257), 2,
-      sym_decorator,
-      aux_sym_decorated_definition_repeat1,
-  [63163] = 3,
+    ACTIONS(2313), 1,
+      sym_identifier,
+    ACTIONS(2315), 1,
+      anon_sym_STAR,
+    ACTIONS(2319), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(2375), 1,
+      anon_sym_RBRACK,
+    STATE(1563), 4,
+      sym_typevar_parameter,
+      sym_typevartuple_parameter,
+      sym_paramspec_parameter,
+      sym__type_parameter,
+  [63492] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2242), 1,
       anon_sym_and,
-    ACTIONS(2176), 7,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(2244), 1,
+      anon_sym_or,
+    ACTIONS(2216), 6,
       anon_sym_COMMA,
       anon_sym_if,
+      anon_sym_RBRACE,
       anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_SEMI,
-  [63179] = 2,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [63510] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2359), 8,
+    ACTIONS(2377), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76865,26 +77132,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [63193] = 6,
-    ACTIONS(2086), 1,
+  [63524] = 3,
+    ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2361), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(2365), 1,
-      anon_sym_BSLASH,
-    ACTIONS(2367), 1,
-      sym__string_end,
-    STATE(1119), 2,
-      sym__not_escape_sequence,
-      aux_sym_string_content_repeat1,
-    ACTIONS(2363), 3,
-      sym__string_content,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [63215] = 2,
+    ACTIONS(2242), 1,
+      anon_sym_and,
+    ACTIONS(2190), 7,
+      anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_or,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [63540] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2369), 8,
+    ACTIONS(2379), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76893,10 +77157,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [63229] = 2,
+  [63554] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2371), 8,
+    ACTIONS(2381), 8,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
@@ -76905,1996 +77169,1740 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [63243] = 4,
+  [63568] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2266), 1,
+    ACTIONS(2238), 1,
+      anon_sym_if,
+    ACTIONS(2242), 1,
       anon_sym_and,
-    ACTIONS(2268), 1,
+    ACTIONS(2244), 1,
       anon_sym_or,
-    ACTIONS(2212), 6,
+    ACTIONS(2274), 5,
       anon_sym_COMMA,
-      anon_sym_if,
       anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_COLON2,
       sym_type_conversion,
-  [63261] = 4,
+  [63588] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2102), 1,
+    ACTIONS(2242), 1,
       anon_sym_and,
-    ACTIONS(2104), 1,
+    ACTIONS(2244), 1,
       anon_sym_or,
-    ACTIONS(2212), 6,
+    ACTIONS(2190), 6,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
       anon_sym_RBRACE,
-  [63279] = 5,
+      anon_sym_EQ,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [63606] = 6,
+    ACTIONS(2086), 1,
+      sym_comment,
+    ACTIONS(2383), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(2387), 1,
+      anon_sym_BSLASH,
+    ACTIONS(2389), 1,
+      sym__string_end,
+    STATE(1143), 2,
+      sym__not_escape_sequence,
+      aux_sym_string_content_repeat1,
+    ACTIONS(2385), 3,
+      sym__string_content,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [63628] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2092), 1,
-      anon_sym_if,
-    ACTIONS(2102), 1,
-      anon_sym_and,
-    ACTIONS(2104), 1,
-      anon_sym_or,
-    ACTIONS(2200), 5,
-      anon_sym_COMMA,
-      anon_sym_COLON,
+    ACTIONS(69), 1,
+      anon_sym_AT,
+    ACTIONS(2391), 1,
       anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACE,
-  [63299] = 4,
+    ACTIONS(2393), 1,
+      anon_sym_def,
+    ACTIONS(2395), 1,
+      anon_sym_class,
+    STATE(608), 2,
+      sym_function_definition,
+      sym_class_definition,
+    STATE(1248), 2,
+      sym_decorator,
+      aux_sym_decorated_definition_repeat1,
+  [63652] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2102), 1,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2104), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2190), 6,
+    ACTIONS(2194), 6,
+      sym__newline,
+      anon_sym_from,
       anon_sym_COMMA,
       anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACE,
-  [63317] = 3,
+      anon_sym_EQ,
+      anon_sym_SEMI,
+  [63670] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2102), 1,
-      anon_sym_and,
-    ACTIONS(2176), 7,
+    ACTIONS(2399), 1,
       anon_sym_COMMA,
+    STATE(1147), 1,
+      aux_sym_for_in_clause_repeat1,
+    ACTIONS(2397), 6,
+      anon_sym_RPAREN,
       anon_sym_if,
-      anon_sym_COLON,
       anon_sym_async,
       anon_sym_for,
+      anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_or,
-  [63333] = 4,
+  [63688] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2102), 1,
-      anon_sym_and,
-    ACTIONS(2104), 1,
-      anon_sym_or,
-    ACTIONS(2176), 6,
+    ACTIONS(2156), 8,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_if,
       anon_sym_COLON,
-      anon_sym_async,
-      anon_sym_for,
+      anon_sym_PIPE,
+      anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [63351] = 2,
+  [63702] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2373), 8,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2311), 5,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
       anon_sym_COLON,
-      anon_sym_PIPE,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [63365] = 5,
+  [63722] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2262), 1,
-      anon_sym_if,
-    ACTIONS(2266), 1,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2268), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2238), 5,
+    ACTIONS(2294), 1,
+      anon_sym_if,
+    ACTIONS(2274), 5,
+      sym__newline,
+      anon_sym_from,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
       anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [63385] = 6,
+      anon_sym_SEMI,
+  [63742] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2106), 1,
+    ACTIONS(2094), 1,
       anon_sym_DOT,
-    ACTIONS(2108), 1,
+    ACTIONS(2150), 1,
       anon_sym_LPAREN,
-    ACTIONS(2375), 1,
+    ACTIONS(2401), 1,
       anon_sym_EQ,
-    STATE(1064), 1,
+    STATE(1043), 1,
       aux_sym_match_value_pattern_repeat1,
-    ACTIONS(2110), 4,
+    ACTIONS(2152), 4,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_PIPE,
-  [63407] = 5,
+  [63764] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
-      anon_sym_and,
-    ACTIONS(2286), 1,
-      anon_sym_or,
-    ACTIONS(2299), 1,
-      anon_sym_if,
-    ACTIONS(2214), 5,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(2405), 1,
       anon_sym_COMMA,
-      anon_sym_EQ,
-      anon_sym_SEMI,
-  [63427] = 5,
+    STATE(1151), 1,
+      aux_sym_for_in_clause_repeat1,
+    ACTIONS(2403), 6,
+      anon_sym_RPAREN,
+      anon_sym_if,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [63782] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2262), 1,
-      anon_sym_if,
-    ACTIONS(2266), 1,
-      anon_sym_and,
-    ACTIONS(2268), 1,
-      anon_sym_or,
-    ACTIONS(2200), 5,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2138), 1,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [63447] = 5,
+    ACTIONS(2144), 1,
+      anon_sym_RBRACK,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1311), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1623), 1,
+      sym__comprehension_clauses,
+  [63807] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2092), 1,
-      anon_sym_if,
-    ACTIONS(2102), 1,
-      anon_sym_and,
-    ACTIONS(2104), 1,
-      anon_sym_or,
-    ACTIONS(2214), 5,
+    ACTIONS(2298), 7,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_COLON,
+      anon_sym_if,
       anon_sym_async,
       anon_sym_for,
+      anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [63467] = 4,
+  [63820] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2266), 1,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2268), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2190), 6,
-      anon_sym_COMMA,
+    ACTIONS(2294), 1,
       anon_sym_if,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [63485] = 3,
+    ACTIONS(2407), 1,
+      anon_sym_COMMA,
+    STATE(1349), 1,
+      aux_sym_assert_statement_repeat1,
+    ACTIONS(2409), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [63843] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2266), 1,
-      anon_sym_and,
-    ACTIONS(2176), 7,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_or,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [63501] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2092), 1,
-      anon_sym_if,
-    ACTIONS(2102), 1,
-      anon_sym_and,
-    ACTIONS(2104), 1,
-      anon_sym_or,
-    ACTIONS(2186), 5,
-      anon_sym_COMMA,
-      anon_sym_COLON,
+    ACTIONS(2128), 1,
       anon_sym_async,
+    ACTIONS(2130), 1,
       anon_sym_for,
-      anon_sym_RBRACE,
-  [63521] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2266), 1,
-      anon_sym_and,
-    ACTIONS(2268), 1,
-      anon_sym_or,
-    ACTIONS(2176), 6,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [63539] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2262), 1,
-      anon_sym_if,
-    ACTIONS(2266), 1,
-      anon_sym_and,
-    ACTIONS(2268), 1,
-      anon_sym_or,
-    ACTIONS(2214), 5,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [63559] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2262), 1,
-      anon_sym_if,
-    ACTIONS(2266), 1,
-      anon_sym_and,
-    ACTIONS(2268), 1,
-      anon_sym_or,
-    ACTIONS(2319), 5,
+    ACTIONS(2138), 1,
       anon_sym_COMMA,
+    ACTIONS(2144), 1,
       anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [63579] = 5,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1311), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1641), 1,
+      sym__comprehension_clauses,
+  [63868] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2262), 1,
-      anon_sym_if,
-    ACTIONS(2266), 1,
-      anon_sym_and,
-    ACTIONS(2268), 1,
-      anon_sym_or,
-    ACTIONS(2186), 5,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2411), 1,
       anon_sym_COMMA,
+    ACTIONS(2413), 1,
       anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [63599] = 4,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1496), 1,
+      aux_sym_dictionary_repeat1,
+    STATE(1661), 1,
+      sym__comprehension_clauses,
+  [63893] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2138), 1,
-      anon_sym_and,
-    ACTIONS(2140), 1,
-      anon_sym_or,
-    ACTIONS(2377), 6,
+    ACTIONS(2415), 7,
       anon_sym_RPAREN,
+      anon_sym_COMMA,
       anon_sym_if,
       anon_sym_async,
       anon_sym_for,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [63617] = 7,
+  [63906] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(69), 1,
-      anon_sym_AT,
-    ACTIONS(2379), 1,
-      anon_sym_async,
-    ACTIONS(2381), 1,
-      anon_sym_def,
-    ACTIONS(2383), 1,
-      anon_sym_class,
-    STATE(605), 2,
-      sym_function_definition,
-      sym_class_definition,
-    STATE(1257), 2,
-      sym_decorator,
-      aux_sym_decorated_definition_repeat1,
-  [63641] = 4,
+    ACTIONS(2417), 1,
+      anon_sym_except,
+    ACTIONS(2419), 1,
+      anon_sym_finally,
+    STATE(595), 1,
+      sym_finally_clause,
+    STATE(270), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    STATE(274), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+  [63927] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2387), 1,
-      anon_sym_COMMA,
-    STATE(1113), 1,
-      aux_sym_for_in_clause_repeat1,
-    ACTIONS(2385), 6,
+    ACTIONS(2421), 1,
+      anon_sym_and,
+    ACTIONS(2423), 1,
+      anon_sym_or,
+    ACTIONS(2194), 5,
       anon_sym_RPAREN,
-      anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [63659] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2391), 1,
       anon_sym_COMMA,
-    STATE(1122), 1,
-      aux_sym_for_in_clause_repeat1,
-    ACTIONS(2389), 6,
-      anon_sym_RPAREN,
+      anon_sym_as,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [63677] = 7,
+      anon_sym_COLON,
+  [63944] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2421), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2423), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2425), 1,
       anon_sym_if,
-    ACTIONS(2393), 1,
-      anon_sym_COMMA,
-    STATE(1243), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2276), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [63701] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2395), 8,
+    ACTIONS(2214), 4,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
-      anon_sym_if,
       anon_sym_COLON,
-      anon_sym_PIPE,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [63715] = 8,
+  [63963] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2397), 1,
+    ACTIONS(2421), 1,
+      anon_sym_and,
+    ACTIONS(2423), 1,
+      anon_sym_or,
+    ACTIONS(2216), 5,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    ACTIONS(2399), 1,
       anon_sym_as,
-    ACTIONS(2401), 1,
       anon_sym_if,
-    ACTIONS(2403), 1,
       anon_sym_COLON,
-    ACTIONS(2405), 1,
-      anon_sym_and,
-    ACTIONS(2407), 1,
-      anon_sym_or,
-    STATE(1364), 1,
-      aux_sym_exception_list_repeat1,
-  [63740] = 2,
+  [63980] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2409), 7,
+    ACTIONS(2421), 1,
+      anon_sym_and,
+    ACTIONS(2190), 6,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [63753] = 5,
+      anon_sym_COLON,
+      anon_sym_or,
+  [63995] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2421), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2423), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2411), 4,
+    ACTIONS(2190), 5,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [63772] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2413), 1,
-      sym_identifier,
-    ACTIONS(2415), 1,
-      anon_sym_LPAREN,
-    ACTIONS(2417), 1,
-      anon_sym_STAR,
-    STATE(1290), 1,
-      sym_dotted_name,
-    STATE(1327), 1,
-      sym_aliased_import,
-    STATE(1559), 1,
-      sym__import_list,
-    STATE(1561), 1,
-      sym_wildcard_import,
-  [63797] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2284), 1,
-      anon_sym_and,
-    ACTIONS(2286), 1,
-      anon_sym_or,
-    ACTIONS(2299), 1,
+      anon_sym_as,
       anon_sym_if,
-    ACTIONS(2339), 1,
-      anon_sym_COMMA,
-    STATE(1288), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2419), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [63820] = 5,
+      anon_sym_COLON,
+  [64012] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2401), 1,
-      anon_sym_if,
-    ACTIONS(2405), 1,
+    ACTIONS(2421), 1,
       anon_sym_and,
-    ACTIONS(2407), 1,
+    ACTIONS(2423), 1,
       anon_sym_or,
-    ACTIONS(2200), 4,
+    ACTIONS(2425), 1,
+      anon_sym_if,
+    ACTIONS(2210), 4,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_COLON,
-  [63839] = 6,
+  [64031] = 5,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2421), 1,
-      anon_sym_except,
+      anon_sym_and,
     ACTIONS(2423), 1,
-      anon_sym_finally,
-    STATE(540), 1,
-      sym_finally_clause,
-    STATE(266), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    STATE(283), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-  [63860] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
+      anon_sym_or,
     ACTIONS(2425), 1,
+      anon_sym_if,
+    ACTIONS(2202), 4,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    ACTIONS(2427), 1,
-      anon_sym_RBRACE,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1450), 1,
-      aux_sym_dictionary_repeat1,
-    STATE(1724), 1,
-      sym__comprehension_clauses,
-  [63885] = 8,
+      anon_sym_as,
+      anon_sym_COLON,
+  [64050] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2413), 1,
+    ACTIONS(2313), 1,
       sym_identifier,
-    ACTIONS(2417), 1,
+    ACTIONS(2315), 1,
       anon_sym_STAR,
-    ACTIONS(2429), 1,
-      anon_sym_LPAREN,
-    STATE(1290), 1,
-      sym_dotted_name,
-    STATE(1327), 1,
-      sym_aliased_import,
-    STATE(1579), 1,
-      sym__import_list,
-    STATE(1580), 1,
-      sym_wildcard_import,
-  [63910] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
-    ACTIONS(2228), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2230), 1,
-      anon_sym_COMMA,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1456), 1,
-      aux_sym_argument_list_repeat1,
-    STATE(1711), 1,
-      sym__comprehension_clauses,
-  [63935] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
-    ACTIONS(2431), 1,
-      anon_sym_RPAREN,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1308), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1618), 1,
-      sym__comprehension_clauses,
-  [63960] = 5,
+    ACTIONS(2319), 1,
+      anon_sym_STAR_STAR,
+    STATE(1492), 4,
+      sym_typevar_parameter,
+      sym_typevartuple_parameter,
+      sym_paramspec_parameter,
+      sym__type_parameter,
+  [64069] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2401), 1,
-      anon_sym_if,
-    ACTIONS(2405), 1,
+    ACTIONS(2421), 1,
       anon_sym_and,
-    ACTIONS(2407), 1,
+    ACTIONS(2423), 1,
       anon_sym_or,
-    ACTIONS(2214), 4,
-      anon_sym_RPAREN,
+    ACTIONS(2425), 1,
+      anon_sym_if,
+    ACTIONS(2427), 1,
       anon_sym_COMMA,
+    ACTIONS(2429), 1,
       anon_sym_as,
+    ACTIONS(2431), 1,
       anon_sym_COLON,
-  [63979] = 4,
+    STATE(1361), 1,
+      aux_sym_exception_list_repeat1,
+  [64094] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2405), 1,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2407), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2190), 5,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_as,
+    ACTIONS(2294), 1,
       anon_sym_if,
-      anon_sym_COLON,
-  [63996] = 3,
+    ACTIONS(2311), 4,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_SEMI,
+  [64113] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2405), 1,
-      anon_sym_and,
-    ACTIONS(2176), 6,
+    ACTIONS(2253), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_or,
-  [64011] = 7,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [64126] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2294), 1,
       anon_sym_if,
-    ACTIONS(2339), 1,
+    ACTIONS(2331), 1,
       anon_sym_COMMA,
-    STATE(1288), 1,
+    STATE(1314), 1,
       aux_sym_expression_list_repeat1,
-    ACTIONS(2433), 2,
+    ACTIONS(2253), 2,
       sym__newline,
       anon_sym_SEMI,
-  [64034] = 6,
+  [64149] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2401), 1,
-      anon_sym_if,
-    ACTIONS(2405), 1,
-      anon_sym_and,
-    ACTIONS(2407), 1,
-      anon_sym_or,
-    ACTIONS(2437), 1,
+    ACTIONS(2435), 1,
       anon_sym_as,
-    ACTIONS(2435), 3,
+    ACTIONS(2433), 6,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_COLON,
-  [64055] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2397), 1,
-      anon_sym_COMMA,
-    ACTIONS(2401), 1,
       anon_sym_if,
-    ACTIONS(2405), 1,
-      anon_sym_and,
-    ACTIONS(2407), 1,
-      anon_sym_or,
-    ACTIONS(2439), 1,
-      anon_sym_as,
-    ACTIONS(2441), 1,
       anon_sym_COLON,
-    STATE(1364), 1,
-      aux_sym_exception_list_repeat1,
-  [64080] = 8,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [64164] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2443), 1,
+    ACTIONS(2437), 1,
       anon_sym_COMMA,
-    ACTIONS(2445), 1,
+    ACTIONS(2439), 1,
       anon_sym_RBRACE,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1466), 1,
+    STATE(1430), 1,
       aux_sym_dictionary_repeat1,
-    STATE(1680), 1,
+    STATE(1649), 1,
       sym__comprehension_clauses,
-  [64105] = 6,
+  [64189] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2447), 1,
+    ACTIONS(2126), 1,
+      anon_sym_if,
+    ACTIONS(2132), 1,
+      anon_sym_and,
+    ACTIONS(2134), 1,
+      anon_sym_or,
+    ACTIONS(2311), 4,
+      anon_sym_COMMA,
+      anon_sym_async,
+      anon_sym_for,
+      anon_sym_RBRACE,
+  [64208] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2441), 1,
       anon_sym_except,
-    ACTIONS(2449), 1,
+    ACTIONS(2443), 1,
       anon_sym_finally,
-    STATE(564), 1,
+    STATE(519), 1,
       sym_finally_clause,
-    STATE(281), 2,
+    STATE(284), 2,
       sym_except_clause,
       aux_sym_try_statement_repeat1,
-    STATE(282), 2,
+    STATE(285), 2,
       sym_except_group_clause,
       aux_sym_try_statement_repeat2,
-  [64126] = 8,
+  [64229] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2194), 1,
+    ACTIONS(2218), 1,
       anon_sym_RPAREN,
-    ACTIONS(2196), 1,
+    ACTIONS(2220), 1,
       anon_sym_COMMA,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1472), 1,
+    STATE(1437), 1,
       aux_sym_argument_list_repeat1,
-    STATE(1673), 1,
+    STATE(1745), 1,
       sym__comprehension_clauses,
-  [64151] = 5,
+  [64254] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2401), 1,
+    ACTIONS(2441), 1,
+      anon_sym_except,
+    ACTIONS(2443), 1,
+      anon_sym_finally,
+    STATE(532), 1,
+      sym_finally_clause,
+    STATE(276), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+    STATE(277), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+  [64275] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2280), 1,
+      anon_sym_and,
+    ACTIONS(2282), 1,
+      anon_sym_or,
+    ACTIONS(2294), 1,
       anon_sym_if,
-    ACTIONS(2405), 1,
+    ACTIONS(2445), 1,
+      anon_sym_COMMA,
+    STATE(1367), 1,
+      aux_sym_print_statement_repeat1,
+    ACTIONS(2447), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [64298] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2407), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2186), 4,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2449), 4,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_COLON,
-  [64170] = 2,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [64317] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1558), 7,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2451), 4,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
       anon_sym_COLON,
+      anon_sym_EQ,
+  [64336] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2280), 1,
       anon_sym_and,
+    ACTIONS(2282), 1,
       anon_sym_or,
-  [64183] = 5,
+    ACTIONS(2294), 1,
+      anon_sym_if,
+    ACTIONS(2321), 4,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
+      anon_sym_SEMI,
+  [64355] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2294), 1,
       anon_sym_if,
-    ACTIONS(2451), 4,
-      anon_sym_RPAREN,
+    ACTIONS(2407), 1,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [64202] = 5,
+    STATE(1401), 1,
+      aux_sym_assert_statement_repeat1,
+    ACTIONS(2453), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [64378] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2453), 1,
-      sym_identifier,
     ACTIONS(2455), 1,
-      anon_sym_STAR,
+      sym_identifier,
     ACTIONS(2457), 1,
-      anon_sym_STAR_STAR,
-    STATE(1577), 4,
-      sym_typevar_parameter,
-      sym_typevartuple_parameter,
-      sym_paramspec_parameter,
-      sym__type_parameter,
-  [64221] = 4,
+      anon_sym_DOT,
+    ACTIONS(2459), 1,
+      anon_sym___future__,
+    STATE(1384), 1,
+      aux_sym_import_prefix_repeat1,
+    STATE(1417), 1,
+      sym_import_prefix,
+    STATE(1666), 2,
+      sym_relative_import,
+      sym_dotted_name,
+  [64401] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2405), 1,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2407), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2176), 5,
-      anon_sym_RPAREN,
+    ACTIONS(2294), 1,
+      anon_sym_if,
+    ACTIONS(2331), 1,
       anon_sym_COMMA,
-      anon_sym_as,
+    STATE(1314), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2461), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [64424] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2280), 1,
+      anon_sym_and,
+    ACTIONS(2282), 1,
+      anon_sym_or,
+    ACTIONS(2294), 1,
       anon_sym_if,
-      anon_sym_COLON,
-  [64238] = 8,
+    ACTIONS(2331), 1,
+      anon_sym_COMMA,
+    STATE(1314), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2463), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [64447] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
+    ACTIONS(2280), 1,
+      anon_sym_and,
+    ACTIONS(2282), 1,
+      anon_sym_or,
+    ACTIONS(2294), 1,
+      anon_sym_if,
+    ACTIONS(2331), 1,
       anon_sym_COMMA,
-    ACTIONS(2096), 1,
+    STATE(1314), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2465), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [64470] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2100), 1,
+    ACTIONS(2186), 1,
       anon_sym_RPAREN,
-    STATE(1106), 1,
+    ACTIONS(2188), 1,
+      anon_sym_COMMA,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1308), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1618), 1,
+    STATE(1426), 1,
+      aux_sym_argument_list_repeat1,
+    STATE(1708), 1,
       sym__comprehension_clauses,
-  [64263] = 8,
+  [64495] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
-    ACTIONS(2100), 1,
+    ACTIONS(2238), 1,
+      anon_sym_if,
+    ACTIONS(2242), 1,
+      anon_sym_and,
+    ACTIONS(2244), 1,
+      anon_sym_or,
+    ACTIONS(2449), 4,
       anon_sym_RBRACE,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1308), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1728), 1,
-      sym__comprehension_clauses,
-  [64288] = 8,
+      anon_sym_EQ,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [64514] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
+    ACTIONS(2421), 1,
+      anon_sym_and,
+    ACTIONS(2423), 1,
+      anon_sym_or,
+    ACTIONS(2425), 1,
+      anon_sym_if,
+    ACTIONS(2427), 1,
       anon_sym_COMMA,
-    ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
-    ACTIONS(2100), 1,
-      anon_sym_RBRACK,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1308), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1754), 1,
-      sym__comprehension_clauses,
-  [64313] = 2,
+    ACTIONS(2467), 1,
+      anon_sym_as,
+    ACTIONS(2469), 1,
+      anon_sym_COLON,
+    STATE(1361), 1,
+      aux_sym_exception_list_repeat1,
+  [64539] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2459), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
+    ACTIONS(2471), 1,
+      sym_identifier,
+    ACTIONS(2473), 1,
+      anon_sym_LPAREN,
+    ACTIONS(2475), 1,
+      anon_sym_STAR,
+    STATE(1297), 1,
+      sym_dotted_name,
+    STATE(1357), 1,
+      sym_aliased_import,
+    STATE(1548), 1,
+      sym_wildcard_import,
+    STATE(1597), 1,
+      sym__import_list,
+  [64564] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2128), 1,
       anon_sym_async,
+    ACTIONS(2130), 1,
       anon_sym_for,
-      anon_sym_RBRACK,
+    ACTIONS(2477), 1,
+      anon_sym_COMMA,
+    ACTIONS(2479), 1,
       anon_sym_RBRACE,
-  [64326] = 8,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1431), 1,
+      aux_sym_dictionary_repeat1,
+    STATE(1730), 1,
+      sym__comprehension_clauses,
+  [64589] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2100), 1,
-      anon_sym_RBRACE,
-    STATE(1106), 1,
+    ACTIONS(2198), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2200), 1,
+      anon_sym_COMMA,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1308), 1,
-      aux_sym__collection_elements_repeat1,
-    STATE(1695), 1,
+    STATE(1407), 1,
+      aux_sym_argument_list_repeat1,
+    STATE(1723), 1,
       sym__comprehension_clauses,
-  [64351] = 8,
+  [64614] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2461), 1,
+    ACTIONS(2481), 1,
       anon_sym_COMMA,
-    ACTIONS(2463), 1,
+    ACTIONS(2483), 1,
       anon_sym_RBRACE,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1449), 1,
+    STATE(1452), 1,
       aux_sym_dictionary_repeat1,
-    STATE(1665), 1,
+    STATE(1632), 1,
       sym__comprehension_clauses,
-  [64376] = 8,
+  [64639] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2397), 1,
-      anon_sym_COMMA,
-    ACTIONS(2401), 1,
-      anon_sym_if,
-    ACTIONS(2405), 1,
-      anon_sym_and,
-    ACTIONS(2407), 1,
-      anon_sym_or,
-    ACTIONS(2465), 1,
-      anon_sym_as,
-    ACTIONS(2467), 1,
-      anon_sym_COLON,
-    STATE(1364), 1,
-      aux_sym_exception_list_repeat1,
-  [64401] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2397), 1,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2182), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2184), 1,
       anon_sym_COMMA,
-    ACTIONS(2401), 1,
-      anon_sym_if,
-    ACTIONS(2405), 1,
-      anon_sym_and,
-    ACTIONS(2407), 1,
-      anon_sym_or,
-    ACTIONS(2469), 1,
-      anon_sym_as,
-    ACTIONS(2471), 1,
-      anon_sym_COLON,
-    STATE(1364), 1,
-      aux_sym_exception_list_repeat1,
-  [64426] = 7,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1459), 1,
+      aux_sym_argument_list_repeat1,
+    STATE(1621), 1,
+      sym__comprehension_clauses,
+  [64664] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2339), 1,
-      anon_sym_COMMA,
-    STATE(1288), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2276), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [64449] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2096), 1,
-      anon_sym_async,
-    ACTIONS(2098), 1,
-      anon_sym_for,
-    ACTIONS(2232), 1,
+    ACTIONS(2485), 4,
       anon_sym_RPAREN,
-    ACTIONS(2234), 1,
       anon_sym_COMMA,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1521), 1,
-      aux_sym_argument_list_repeat1,
-    STATE(1618), 1,
-      sym__comprehension_clauses,
-  [64474] = 8,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [64683] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2222), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2224), 1,
+    ACTIONS(2138), 1,
       anon_sym_COMMA,
-    STATE(1106), 1,
+    ACTIONS(2144), 1,
+      anon_sym_RPAREN,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1412), 1,
-      aux_sym_argument_list_repeat1,
-    STATE(1628), 1,
+    STATE(1311), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1745), 1,
       sym__comprehension_clauses,
-  [64499] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2473), 1,
-      sym_identifier,
-    ACTIONS(2475), 1,
-      anon_sym_DOT,
-    ACTIONS(2477), 1,
-      anon_sym___future__,
-    STATE(1343), 1,
-      aux_sym_import_prefix_repeat1,
-    STATE(1462), 1,
-      sym_import_prefix,
-    STATE(1712), 2,
-      sym_relative_import,
-      sym_dotted_name,
-  [64522] = 4,
+  [64708] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2405), 1,
+    ACTIONS(2421), 1,
       anon_sym_and,
-    ACTIONS(2407), 1,
+    ACTIONS(2423), 1,
       anon_sym_or,
-    ACTIONS(2212), 5,
+    ACTIONS(2425), 1,
+      anon_sym_if,
+    ACTIONS(2489), 1,
+      anon_sym_as,
+    ACTIONS(2487), 3,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
       anon_sym_COLON,
-  [64539] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2421), 1,
-      anon_sym_except,
-    ACTIONS(2423), 1,
-      anon_sym_finally,
-    STATE(556), 1,
-      sym_finally_clause,
-    STATE(267), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    STATE(275), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-  [64560] = 6,
+  [64729] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2447), 1,
-      anon_sym_except,
-    ACTIONS(2449), 1,
-      anon_sym_finally,
-    STATE(533), 1,
-      sym_finally_clause,
-    STATE(272), 2,
-      sym_except_group_clause,
-      aux_sym_try_statement_repeat2,
-    STATE(278), 2,
-      sym_except_clause,
-      aux_sym_try_statement_repeat1,
-  [64581] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2100), 1,
-      anon_sym_RPAREN,
-    STATE(1106), 1,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2144), 1,
+      anon_sym_RBRACK,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1308), 1,
+    STATE(1311), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1628), 1,
+    STATE(1692), 1,
       sym__comprehension_clauses,
-  [64606] = 8,
+  [64754] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2100), 1,
-      anon_sym_RBRACK,
-    STATE(1106), 1,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2144), 1,
+      anon_sym_RBRACE,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1308), 1,
+    STATE(1311), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1722), 1,
+    STATE(1628), 1,
       sym__comprehension_clauses,
-  [64631] = 5,
+  [64779] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2421), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2423), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2425), 1,
       anon_sym_if,
-    ACTIONS(2311), 4,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(2427), 1,
       anon_sym_COMMA,
-      anon_sym_SEMI,
-  [64650] = 5,
+    ACTIONS(2491), 1,
+      anon_sym_as,
+    ACTIONS(2493), 1,
+      anon_sym_COLON,
+    STATE(1361), 1,
+      aux_sym_exception_list_repeat1,
+  [64804] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2421), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2423), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2425), 1,
       anon_sym_if,
-    ACTIONS(2319), 4,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(2427), 1,
       anon_sym_COMMA,
-      anon_sym_SEMI,
-  [64669] = 5,
+    ACTIONS(2495), 1,
+      anon_sym_as,
+    ACTIONS(2497), 1,
+      anon_sym_COLON,
+    STATE(1361), 1,
+      aux_sym_exception_list_repeat1,
+  [64829] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2262), 1,
+    ACTIONS(1634), 7,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_if,
-    ACTIONS(2266), 1,
+      anon_sym_COLON,
       anon_sym_and,
-    ACTIONS(2268), 1,
       anon_sym_or,
-    ACTIONS(2451), 4,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [64688] = 2,
+  [64842] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2288), 7,
+    ACTIONS(2471), 1,
+      sym_identifier,
+    ACTIONS(2475), 1,
+      anon_sym_STAR,
+    ACTIONS(2499), 1,
+      anon_sym_LPAREN,
+    STATE(1297), 1,
+      sym_dotted_name,
+    STATE(1357), 1,
+      sym_aliased_import,
+    STATE(1554), 1,
+      sym__import_list,
+    STATE(1564), 1,
+      sym_wildcard_import,
+  [64867] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2071), 7,
       anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_as,
       anon_sym_if,
-      anon_sym_async,
-      anon_sym_for,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [64701] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2284), 1,
+      anon_sym_COLON,
       anon_sym_and,
-    ACTIONS(2286), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
-      anon_sym_if,
-    ACTIONS(2479), 1,
-      anon_sym_COMMA,
-    STATE(1380), 1,
-      aux_sym_print_statement_repeat1,
-    ACTIONS(2481), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [64724] = 5,
+  [64880] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2136), 1,
-      anon_sym_if,
-    ACTIONS(2138), 1,
-      anon_sym_and,
-    ACTIONS(2140), 1,
-      anon_sym_or,
-    ACTIONS(2483), 4,
-      anon_sym_COMMA,
+    ACTIONS(2128), 1,
       anon_sym_async,
+    ACTIONS(2130), 1,
       anon_sym_for,
-      anon_sym_RBRACE,
-  [64743] = 7,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2501), 1,
+      anon_sym_RPAREN,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1311), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1745), 1,
+      sym__comprehension_clauses,
+  [64905] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2417), 1,
+      anon_sym_except,
+    ACTIONS(2419), 1,
+      anon_sym_finally,
+    STATE(531), 1,
+      sym_finally_clause,
+    STATE(265), 2,
+      sym_except_group_clause,
+      aux_sym_try_statement_repeat2,
+    STATE(271), 2,
+      sym_except_clause,
+      aux_sym_try_statement_repeat1,
+  [64926] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2294), 1,
       anon_sym_if,
-    ACTIONS(2485), 1,
+    ACTIONS(2331), 1,
       anon_sym_COMMA,
-    STATE(1401), 1,
-      aux_sym_assert_statement_repeat1,
-    ACTIONS(2487), 2,
+    STATE(1314), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2503), 2,
       sym__newline,
       anon_sym_SEMI,
-  [64766] = 8,
+  [64949] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2100), 1,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2144), 1,
       anon_sym_RPAREN,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1308), 1,
+    STATE(1311), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1711), 1,
+    STATE(1723), 1,
       sym__comprehension_clauses,
-  [64791] = 8,
+  [64974] = 8,
     ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
+      sym_comment,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2100), 1,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2144), 1,
       anon_sym_RBRACK,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1308), 1,
+    STATE(1311), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1713), 1,
+    STATE(1726), 1,
       sym__comprehension_clauses,
-  [64816] = 8,
+  [64999] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2100), 1,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2144), 1,
       anon_sym_RBRACE,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1308), 1,
+    STATE(1311), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1717), 1,
+    STATE(1728), 1,
       sym__comprehension_clauses,
-  [64841] = 8,
+  [65024] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2100), 1,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2144), 1,
       anon_sym_RPAREN,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1308), 1,
+    STATE(1311), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1673), 1,
+    STATE(1621), 1,
       sym__comprehension_clauses,
-  [64866] = 8,
+  [65049] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2100), 1,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2144), 1,
       anon_sym_RBRACK,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1308), 1,
+    STATE(1311), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1675), 1,
+    STATE(1622), 1,
       sym__comprehension_clauses,
-  [64891] = 5,
+  [65074] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2489), 4,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_EQ,
-  [64910] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2096), 1,
+    ACTIONS(2128), 1,
       anon_sym_async,
-    ACTIONS(2098), 1,
+    ACTIONS(2130), 1,
       anon_sym_for,
-    ACTIONS(2100), 1,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    ACTIONS(2144), 1,
       anon_sym_RBRACE,
-    STATE(1106), 1,
+    STATE(1101), 1,
       sym_for_in_clause,
-    STATE(1308), 1,
+    STATE(1311), 1,
       aux_sym__collection_elements_repeat1,
-    STATE(1676), 1,
+    STATE(1627), 1,
       sym__comprehension_clauses,
-  [64935] = 2,
+  [65099] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2071), 7,
-      anon_sym_RPAREN,
+    ACTIONS(2128), 1,
+      anon_sym_async,
+    ACTIONS(2130), 1,
+      anon_sym_for,
+    ACTIONS(2138), 1,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_and,
-      anon_sym_or,
-  [64948] = 5,
+    ACTIONS(2144), 1,
+      anon_sym_RPAREN,
+    STATE(1101), 1,
+      sym_for_in_clause,
+    STATE(1311), 1,
+      aux_sym__collection_elements_repeat1,
+    STATE(1708), 1,
+      sym__comprehension_clauses,
+  [65124] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2453), 1,
+    ACTIONS(2313), 1,
       sym_identifier,
-    ACTIONS(2455), 1,
+    ACTIONS(2315), 1,
       anon_sym_STAR,
-    ACTIONS(2457), 1,
+    ACTIONS(2319), 1,
       anon_sym_STAR_STAR,
-    STATE(1409), 4,
+    STATE(1563), 4,
       sym_typevar_parameter,
       sym_typevartuple_parameter,
       sym_paramspec_parameter,
       sym__type_parameter,
-  [64967] = 7,
+  [65143] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
-      anon_sym_and,
-    ACTIONS(2286), 1,
-      anon_sym_or,
-    ACTIONS(2299), 1,
-      anon_sym_if,
-    ACTIONS(2339), 1,
+    ACTIONS(2505), 7,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    STATE(1288), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2491), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [64990] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2096), 1,
+      anon_sym_if,
       anon_sym_async,
-    ACTIONS(2098), 1,
       anon_sym_for,
-    ACTIONS(2493), 1,
-      anon_sym_COMMA,
-    ACTIONS(2495), 1,
-      anon_sym_RBRACE,
-    STATE(1106), 1,
-      sym_for_in_clause,
-    STATE(1479), 1,
-      aux_sym_dictionary_repeat1,
-    STATE(1714), 1,
-      sym__comprehension_clauses,
-  [65015] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2276), 7,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [65028] = 5,
+  [65156] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2136), 1,
+    ACTIONS(2126), 1,
       anon_sym_if,
-    ACTIONS(2138), 1,
+    ACTIONS(2132), 1,
       anon_sym_and,
-    ACTIONS(2140), 1,
+    ACTIONS(2134), 1,
       anon_sym_or,
-    ACTIONS(2319), 4,
+    ACTIONS(2507), 4,
       anon_sym_COMMA,
       anon_sym_async,
       anon_sym_for,
       anon_sym_RBRACE,
-  [65047] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2284), 1,
-      anon_sym_and,
-    ACTIONS(2286), 1,
-      anon_sym_or,
-    ACTIONS(2299), 1,
-      anon_sym_if,
-    ACTIONS(2339), 1,
-      anon_sym_COMMA,
-    STATE(1288), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2497), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [65070] = 3,
-    ACTIONS(3), 1,
+  [65175] = 3,
+    ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2501), 1,
-      anon_sym_as,
-    ACTIONS(2499), 6,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [65085] = 7,
-    ACTIONS(3), 1,
+    ACTIONS(2509), 2,
+      anon_sym_LBRACE2,
+      anon_sym_BSLASH,
+    ACTIONS(2511), 4,
+      sym__string_content,
+      sym__string_end,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [65189] = 3,
+    ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2284), 1,
-      anon_sym_and,
-    ACTIONS(2286), 1,
-      anon_sym_or,
-    ACTIONS(2299), 1,
-      anon_sym_if,
-    ACTIONS(2485), 1,
-      anon_sym_COMMA,
-    STATE(1390), 1,
-      aux_sym_assert_statement_repeat1,
-    ACTIONS(2503), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [65108] = 4,
+    ACTIONS(2513), 2,
+      anon_sym_LBRACE2,
+      anon_sym_BSLASH,
+    ACTIONS(2515), 4,
+      sym__string_content,
+      sym__string_end,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [65203] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2505), 1,
+    ACTIONS(2517), 1,
       anon_sym_DOT,
-    STATE(1242), 1,
+    STATE(1267), 1,
       aux_sym_match_value_pattern_repeat1,
-    ACTIONS(2075), 4,
+    ACTIONS(2519), 4,
       sym__newline,
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_SEMI,
-  [65124] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2510), 1,
-      anon_sym_COMMA,
-    STATE(1249), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2508), 4,
-      anon_sym_RPAREN,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [65140] = 6,
+  [65219] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2514), 1,
+    ACTIONS(2523), 1,
       anon_sym_COLON,
-    ACTIONS(2512), 2,
+    ACTIONS(2521), 2,
       anon_sym_COMMA,
       anon_sym_RBRACK,
-  [65160] = 4,
+  [65239] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2516), 1,
-      anon_sym_DOT,
-    STATE(1262), 1,
-      aux_sym_match_value_pattern_repeat1,
-    ACTIONS(2518), 4,
-      sym__newline,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_SEMI,
-  [65176] = 6,
+    ACTIONS(2527), 1,
+      anon_sym_AT,
+    STATE(1248), 2,
+      sym_decorator,
+      aux_sym_decorated_definition_repeat1,
+    ACTIONS(2525), 3,
+      anon_sym_async,
+      anon_sym_def,
+      anon_sym_class,
+  [65255] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2522), 1,
+    ACTIONS(2532), 1,
       anon_sym_COLON,
-    ACTIONS(2520), 2,
+    ACTIONS(2530), 2,
       anon_sym_COMMA,
       anon_sym_RBRACK,
-  [65196] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2284), 1,
-      anon_sym_and,
-    ACTIONS(2286), 1,
-      anon_sym_or,
-    ACTIONS(2299), 1,
-      anon_sym_if,
-    ACTIONS(2524), 3,
-      sym__newline,
-      anon_sym_COMMA,
-      anon_sym_SEMI,
-  [65214] = 3,
+  [65275] = 3,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2526), 2,
+    ACTIONS(2534), 2,
       anon_sym_LBRACE2,
       anon_sym_BSLASH,
-    ACTIONS(2528), 4,
+    ACTIONS(2536), 4,
       sym__string_content,
       sym__string_end,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [65228] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2532), 1,
-      anon_sym_COMMA,
-    STATE(1249), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2530), 4,
-      anon_sym_RPAREN,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [65244] = 7,
+  [65289] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2393), 1,
+    ACTIONS(2538), 1,
+      anon_sym_DOT,
+    STATE(1251), 1,
+      aux_sym_match_value_pattern_repeat1,
+    ACTIONS(2075), 4,
+      sym__newline,
       anon_sym_COMMA,
-    ACTIONS(2535), 1,
-      anon_sym_COLON,
-    STATE(1243), 1,
-      aux_sym_expression_list_repeat1,
-  [65266] = 4,
+      anon_sym_as,
+      anon_sym_SEMI,
+  [65305] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2106), 1,
+    ACTIONS(2094), 1,
       anon_sym_DOT,
-    STATE(1256), 1,
+    STATE(1039), 1,
       aux_sym_match_value_pattern_repeat1,
-    ACTIONS(2518), 4,
+    ACTIONS(2541), 4,
       anon_sym_import,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
-  [65282] = 3,
-    ACTIONS(2086), 1,
-      sym_comment,
-    ACTIONS(2537), 2,
-      anon_sym_LBRACE2,
-      anon_sym_BSLASH,
-    ACTIONS(2539), 4,
-      sym__string_content,
-      sym__string_end,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [65296] = 7,
+  [65321] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2393), 1,
+    ACTIONS(2335), 1,
       anon_sym_COMMA,
-    ACTIONS(2541), 1,
+    ACTIONS(2543), 1,
       anon_sym_COLON,
-    STATE(1243), 1,
+    STATE(1275), 1,
       aux_sym_expression_list_repeat1,
-  [65318] = 6,
+  [65343] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2545), 1,
-      anon_sym_COLON,
-    ACTIONS(2547), 1,
-      anon_sym_EQ,
-    STATE(1389), 1,
-      sym__type_bound,
-    STATE(1570), 1,
-      sym__type_param_default,
-    ACTIONS(2543), 2,
+    ACTIONS(2152), 6,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_if,
+      anon_sym_COLON,
       anon_sym_RBRACK,
-  [65338] = 5,
+      anon_sym_RBRACE,
+  [65355] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2549), 3,
-      sym__newline,
+    ACTIONS(2545), 3,
       anon_sym_COMMA,
-      anon_sym_SEMI,
-  [65356] = 4,
+      anon_sym_RBRACK,
+      anon_sym_EQ,
+  [65373] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2106), 1,
+    ACTIONS(2094), 1,
       anon_sym_DOT,
-    STATE(1039), 1,
+    STATE(1252), 1,
       aux_sym_match_value_pattern_repeat1,
-    ACTIONS(2551), 4,
+    ACTIONS(2519), 4,
       anon_sym_import,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_as,
-  [65372] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2555), 1,
-      anon_sym_AT,
-    STATE(1257), 2,
-      sym_decorator,
-      aux_sym_decorated_definition_repeat1,
-    ACTIONS(2553), 3,
-      anon_sym_async,
-      anon_sym_def,
-      anon_sym_class,
-  [65388] = 7,
+  [65389] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2232), 1,
+    ACTIONS(2547), 3,
       anon_sym_RPAREN,
-    ACTIONS(2234), 1,
       anon_sym_COMMA,
-    STATE(1526), 1,
-      aux_sym_argument_list_repeat1,
-  [65410] = 3,
-    ACTIONS(2086), 1,
-      sym_comment,
-    ACTIONS(2558), 2,
-      anon_sym_LBRACE2,
-      anon_sym_BSLASH,
-    ACTIONS(2560), 4,
-      sym__string_content,
-      sym__string_end,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [65424] = 3,
+      anon_sym_COLON,
+  [65407] = 3,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2562), 2,
+    ACTIONS(2549), 2,
       anon_sym_LBRACE2,
       anon_sym_BSLASH,
-    ACTIONS(2564), 4,
+    ACTIONS(2551), 4,
       sym__string_content,
       sym__string_end,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [65438] = 5,
+  [65421] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2566), 3,
-      anon_sym_RPAREN,
+    ACTIONS(2335), 1,
       anon_sym_COMMA,
+    ACTIONS(2553), 1,
       anon_sym_COLON,
-  [65456] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2516), 1,
-      anon_sym_DOT,
-    STATE(1242), 1,
-      aux_sym_match_value_pattern_repeat1,
-    ACTIONS(2551), 4,
-      sym__newline,
-      anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_SEMI,
-  [65472] = 2,
+    STATE(1275), 1,
+      aux_sym_expression_list_repeat1,
+  [65443] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2110), 6,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2555), 3,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_if,
       anon_sym_COLON,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [65484] = 6,
+  [65461] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2570), 1,
-      anon_sym_COLON,
-    ACTIONS(2568), 2,
+    ACTIONS(2335), 1,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [65504] = 7,
+    ACTIONS(2557), 1,
+      anon_sym_COLON,
+    STATE(1275), 1,
+      aux_sym_expression_list_repeat1,
+  [65483] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2393), 1,
+    ACTIONS(2335), 1,
       anon_sym_COMMA,
-    ACTIONS(2572), 1,
+    ACTIONS(2559), 1,
       anon_sym_COLON,
-    STATE(1243), 1,
+    STATE(1275), 1,
       aux_sym_expression_list_repeat1,
-  [65526] = 5,
+  [65505] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2401), 1,
-      anon_sym_if,
-    ACTIONS(2405), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2407), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2574), 3,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2218), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2220), 1,
       anon_sym_COMMA,
-      anon_sym_as,
-      anon_sym_COLON,
-  [65544] = 5,
+    STATE(1453), 1,
+      aux_sym_argument_list_repeat1,
+  [65527] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2576), 3,
-      anon_sym_RPAREN,
+    ACTIONS(2563), 1,
+      anon_sym_COLON,
+    ACTIONS(2561), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [65547] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2567), 1,
       anon_sym_COMMA,
+    STATE(1265), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2565), 4,
+      anon_sym_RPAREN,
       anon_sym_COLON,
-  [65562] = 5,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [65563] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2294), 1,
       anon_sym_if,
-    ACTIONS(2578), 3,
+    ACTIONS(2570), 3,
+      sym__newline,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_EQ,
-  [65580] = 6,
+      anon_sym_SEMI,
+  [65581] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2475), 1,
+    ACTIONS(2517), 1,
       anon_sym_DOT,
-    ACTIONS(2580), 1,
-      sym_identifier,
-    STATE(1343), 1,
-      aux_sym_import_prefix_repeat1,
-    STATE(1462), 1,
-      sym_import_prefix,
-    STATE(1620), 2,
-      sym_relative_import,
-      sym_dotted_name,
-  [65600] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2582), 1,
+    STATE(1251), 1,
+      aux_sym_match_value_pattern_repeat1,
+    ACTIONS(2541), 4,
+      sym__newline,
       anon_sym_COMMA,
-    STATE(1270), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2530), 4,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [65616] = 5,
+      anon_sym_as,
+      anon_sym_SEMI,
+  [65597] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2294), 1,
       anon_sym_if,
-    ACTIONS(2489), 3,
+    ACTIONS(2572), 3,
       sym__newline,
-      anon_sym_EQ,
+      anon_sym_COMMA,
       anon_sym_SEMI,
-  [65634] = 4,
+  [65615] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2585), 1,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2335), 1,
       anon_sym_COMMA,
-    STATE(1270), 1,
+    ACTIONS(2574), 1,
+      anon_sym_COLON,
+    STATE(1275), 1,
       aux_sym_expression_list_repeat1,
-    ACTIONS(2508), 4,
-      anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [65650] = 4,
+  [65637] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2280), 1,
+      anon_sym_and,
+    ACTIONS(2282), 1,
+      anon_sym_or,
+    ACTIONS(2294), 1,
+      anon_sym_if,
+    ACTIONS(2576), 3,
+      sym__newline,
+      anon_sym_COMMA,
+      anon_sym_SEMI,
+  [65655] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2587), 1,
+    ACTIONS(2580), 1,
       anon_sym_COMMA,
-    STATE(1249), 1,
+    STATE(1265), 1,
       aux_sym_expression_list_repeat1,
-    ACTIONS(2508), 4,
+    ACTIONS(2578), 4,
       anon_sym_RPAREN,
       anon_sym_COLON,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [65666] = 4,
+  [65671] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2589), 1,
+    ACTIONS(2421), 1,
+      anon_sym_and,
+    ACTIONS(2423), 1,
+      anon_sym_or,
+    ACTIONS(2425), 1,
+      anon_sym_if,
+    ACTIONS(2582), 3,
       anon_sym_COMMA,
-    STATE(1270), 1,
+      anon_sym_as,
+      anon_sym_COLON,
+  [65689] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2584), 1,
+      anon_sym_COMMA,
+    STATE(1281), 1,
       aux_sym_expression_list_repeat1,
-    ACTIONS(2508), 4,
+    ACTIONS(2578), 4,
       anon_sym_RBRACE,
       anon_sym_EQ,
       anon_sym_COLON2,
       sym_type_conversion,
-  [65682] = 3,
-    ACTIONS(2086), 1,
-      sym_comment,
-    ACTIONS(2591), 2,
-      anon_sym_LBRACE2,
-      anon_sym_BSLASH,
-    ACTIONS(2593), 4,
-      sym__string_content,
-      sym__string_end,
-      sym__escape_interpolation,
-      sym_escape_sequence,
-  [65696] = 7,
+  [65705] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2393), 1,
+    ACTIONS(2586), 1,
       anon_sym_COMMA,
-    ACTIONS(2595), 1,
-      anon_sym_COLON,
-    STATE(1243), 1,
+    STATE(1281), 1,
       aux_sym_expression_list_repeat1,
-  [65718] = 7,
+    ACTIONS(2578), 4,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [65721] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2393), 1,
+    ACTIONS(2588), 1,
       anon_sym_COMMA,
-    ACTIONS(2597), 1,
-      anon_sym_COLON,
-    STATE(1243), 1,
+    STATE(1265), 1,
       aux_sym_expression_list_repeat1,
-  [65740] = 5,
+    ACTIONS(2578), 4,
+      anon_sym_RPAREN,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [65737] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2294), 1,
       anon_sym_if,
-    ACTIONS(2599), 3,
+    ACTIONS(2451), 3,
       sym__newline,
-      anon_sym_COMMA,
+      anon_sym_EQ,
       anon_sym_SEMI,
-  [65758] = 7,
+  [65755] = 3,
+    ACTIONS(2086), 1,
+      sym_comment,
+    ACTIONS(2590), 2,
+      anon_sym_LBRACE2,
+      anon_sym_BSLASH,
+    ACTIONS(2592), 4,
+      sym__string_content,
+      sym__string_end,
+      sym__escape_interpolation,
+      sym_escape_sequence,
+  [65769] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2393), 1,
+    ACTIONS(2594), 6,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    ACTIONS(2601), 1,
+      anon_sym_if,
       anon_sym_COLON,
-    STATE(1243), 1,
-      aux_sym_expression_list_repeat1,
-  [65780] = 4,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [65781] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2605), 1,
+    ACTIONS(2598), 1,
       anon_sym_COMMA,
-    STATE(1280), 1,
+    STATE(1279), 1,
       aux_sym_open_sequence_match_pattern_repeat1,
-    ACTIONS(2603), 4,
+    ACTIONS(2596), 4,
       anon_sym_RPAREN,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_RBRACK,
-  [65796] = 3,
+  [65797] = 3,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2608), 2,
+    ACTIONS(2601), 2,
       anon_sym_LBRACE2,
       anon_sym_BSLASH,
-    ACTIONS(2610), 4,
+    ACTIONS(2603), 4,
       sym__string_content,
       sym__string_end,
       sym__escape_interpolation,
       sym_escape_sequence,
-  [65810] = 2,
+  [65811] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2612), 6,
-      anon_sym_RPAREN,
+    ACTIONS(2605), 1,
       anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
+    STATE(1281), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2565), 4,
       anon_sym_RBRACE,
-  [65822] = 5,
+      anon_sym_EQ,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [65827] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2614), 2,
+    ACTIONS(2610), 1,
+      anon_sym_COLON,
+    ACTIONS(2612), 1,
+      anon_sym_EQ,
+    STATE(1341), 1,
+      sym__type_bound,
+    STATE(1546), 1,
+      sym__type_param_default,
+    ACTIONS(2608), 2,
       anon_sym_COMMA,
       anon_sym_RBRACK,
-  [65839] = 5,
+  [65847] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2457), 1,
+      anon_sym_DOT,
+    ACTIONS(2614), 1,
+      sym_identifier,
+    STATE(1384), 1,
+      aux_sym_import_prefix_repeat1,
+    STATE(1417), 1,
+      sym_import_prefix,
+    STATE(1631), 2,
+      sym_relative_import,
+      sym_dotted_name,
+  [65867] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2616), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [65856] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2618), 1,
-      anon_sym_LPAREN,
-    ACTIONS(2620), 1,
-      anon_sym_COLON,
-    ACTIONS(2622), 1,
-      anon_sym_LBRACK,
-    STATE(1520), 1,
-      sym_type_parameters,
-    STATE(1701), 1,
-      sym_argument_list,
-  [65875] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2624), 1,
+    ACTIONS(2335), 1,
       anon_sym_COMMA,
-    STATE(1299), 1,
+    ACTIONS(2616), 1,
+      anon_sym_COLON,
+    STATE(1275), 1,
       aux_sym_expression_list_repeat1,
-    ACTIONS(2508), 3,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_SEMI,
-  [65890] = 6,
-    ACTIONS(2086), 1,
-      sym_comment,
-    ACTIONS(2626), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2628), 1,
-      anon_sym_LBRACE2,
-    ACTIONS(2630), 1,
-      aux_sym_format_specifier_token1,
-    STATE(1315), 1,
-      aux_sym_format_specifier_repeat1,
-    STATE(1499), 1,
-      sym_interpolation,
-  [65909] = 4,
+  [65889] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2632), 1,
+    ACTIONS(2620), 1,
       anon_sym_COMMA,
-    STATE(1299), 1,
-      aux_sym_expression_list_repeat1,
-    ACTIONS(2508), 3,
-      sym__newline,
-      anon_sym_from,
-      anon_sym_SEMI,
-  [65924] = 6,
+    STATE(1302), 1,
+      aux_sym__collection_elements_repeat1,
+    ACTIONS(2618), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [65904] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2634), 1,
+    ACTIONS(2622), 1,
       anon_sym_RBRACE,
-    ACTIONS(2636), 1,
+    ACTIONS(2624), 1,
       anon_sym_EQ,
-    ACTIONS(2638), 1,
+    ACTIONS(2626), 1,
       anon_sym_COLON2,
-    ACTIONS(2640), 1,
+    ACTIONS(2628), 1,
       sym_type_conversion,
-    STATE(1677), 1,
+    STATE(1691), 1,
       sym_format_specifier,
-  [65943] = 5,
+  [65923] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2642), 1,
-      anon_sym_COMMA,
-    ACTIONS(2644), 1,
-      anon_sym_as,
-    STATE(1336), 1,
-      aux_sym__import_list_repeat1,
-    ACTIONS(2646), 2,
+    ACTIONS(2280), 1,
+      anon_sym_and,
+    ACTIONS(2282), 1,
+      anon_sym_or,
+    ACTIONS(2294), 1,
+      anon_sym_if,
+    ACTIONS(2449), 2,
       sym__newline,
       anon_sym_SEMI,
-  [65960] = 2,
-    ACTIONS(3), 1,
+  [65940] = 6,
+    ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2311), 5,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
+    ACTIONS(2630), 1,
       anon_sym_RBRACE,
-  [65971] = 5,
+    ACTIONS(2632), 1,
+      anon_sym_LBRACE2,
+    ACTIONS(2634), 1,
+      aux_sym_format_specifier_token1,
+    STATE(1305), 1,
+      aux_sym_format_specifier_repeat1,
+    STATE(1421), 1,
+      sym_interpolation,
+  [65959] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2483), 2,
+    ACTIONS(2636), 2,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
-  [65988] = 2,
+      anon_sym_RBRACK,
+  [65976] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(2075), 5,
@@ -78903,3531 +78911,3602 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
       anon_sym_as,
       anon_sym_SEMI,
-  [65999] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    STATE(1309), 1,
-      aux_sym__collection_elements_repeat1,
-    ACTIONS(2100), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [66014] = 5,
+  [65987] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2294), 1,
       anon_sym_if,
-    ACTIONS(2648), 2,
+    ACTIONS(2638), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [66004] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2471), 1,
+      sym_identifier,
+    STATE(1324), 1,
+      sym_dotted_name,
+    STATE(1429), 1,
+      sym_aliased_import,
+    ACTIONS(2640), 2,
       sym__newline,
       anon_sym_SEMI,
-  [66031] = 6,
+  [66021] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2638), 1,
+    ACTIONS(2626), 1,
       anon_sym_COLON2,
-    ACTIONS(2650), 1,
+    ACTIONS(2642), 1,
       anon_sym_RBRACE,
-    ACTIONS(2652), 1,
+    ACTIONS(2644), 1,
       anon_sym_EQ,
-    ACTIONS(2654), 1,
+    ACTIONS(2646), 1,
       sym_type_conversion,
-    STATE(1651), 1,
+    STATE(1680), 1,
       sym_format_specifier,
-  [66050] = 5,
+  [66040] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2471), 1,
+      sym_identifier,
+    ACTIONS(2648), 1,
+      anon_sym_LPAREN,
+    STATE(1297), 1,
+      sym_dotted_name,
+    STATE(1357), 1,
+      sym_aliased_import,
+    STATE(1550), 1,
+      sym__import_list,
+  [66059] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2650), 1,
+      anon_sym_LPAREN,
+    ACTIONS(2652), 1,
+      anon_sym_COLON,
+    ACTIONS(2654), 1,
+      anon_sym_LBRACK,
+    STATE(1529), 1,
+      sym_type_parameters,
+    STATE(1746), 1,
+      sym_argument_list,
+  [66078] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2280), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2282), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2294), 1,
       anon_sym_if,
     ACTIONS(2656), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [66067] = 5,
+      sym__newline,
+      anon_sym_SEMI,
+  [66095] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2658), 2,
-      anon_sym_RPAREN,
+    ACTIONS(2658), 1,
       anon_sym_COMMA,
-  [66084] = 4,
+    ACTIONS(2660), 1,
+      anon_sym_as,
+    STATE(1389), 1,
+      aux_sym__import_list_repeat1,
+    ACTIONS(2662), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [66112] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2660), 1,
+    ACTIONS(2664), 1,
       anon_sym_COMMA,
-    STATE(1299), 1,
+    STATE(1298), 1,
       aux_sym_expression_list_repeat1,
-    ACTIONS(2530), 3,
+    ACTIONS(2565), 3,
       sym__newline,
       anon_sym_from,
       anon_sym_SEMI,
-  [66099] = 5,
+  [66127] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2413), 1,
+    ACTIONS(2471), 1,
       sym_identifier,
-    STATE(1329), 1,
+    STATE(1324), 1,
       sym_dotted_name,
-    STATE(1428), 1,
+    STATE(1429), 1,
       sym_aliased_import,
-    ACTIONS(2663), 2,
+    ACTIONS(2667), 2,
       sym__newline,
       anon_sym_SEMI,
-  [66116] = 2,
+  [66144] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2311), 5,
+    ACTIONS(2280), 1,
+      anon_sym_and,
+    ACTIONS(2282), 1,
+      anon_sym_or,
+    ACTIONS(2294), 1,
+      anon_sym_if,
+    ACTIONS(2669), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [66161] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2321), 5,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
       anon_sym_RBRACE,
-      anon_sym_EQ,
-      anon_sym_COLON2,
-      sym_type_conversion,
-  [66127] = 5,
+  [66172] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2413), 1,
-      sym_identifier,
-    STATE(1329), 1,
-      sym_dotted_name,
-    STATE(1428), 1,
-      sym_aliased_import,
-    ACTIONS(2665), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [66144] = 5,
+    ACTIONS(2673), 1,
+      anon_sym_COMMA,
+    STATE(1302), 1,
+      aux_sym__collection_elements_repeat1,
+    ACTIONS(2671), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [66187] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2667), 2,
+    ACTIONS(2507), 2,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [66161] = 5,
+      anon_sym_RBRACE,
+  [66204] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2413), 1,
-      sym_identifier,
-    STATE(1329), 1,
-      sym_dotted_name,
-    STATE(1428), 1,
-      sym_aliased_import,
-    ACTIONS(2663), 2,
+    ACTIONS(2280), 1,
+      anon_sym_and,
+    ACTIONS(2282), 1,
+      anon_sym_or,
+    ACTIONS(2294), 1,
+      anon_sym_if,
+    ACTIONS(2676), 2,
       sym__newline,
       anon_sym_SEMI,
-  [66178] = 6,
+  [66221] = 6,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2669), 1,
+    ACTIONS(2678), 1,
       anon_sym_RBRACE,
-    ACTIONS(2671), 1,
+    ACTIONS(2680), 1,
       anon_sym_LBRACE2,
-    ACTIONS(2674), 1,
+    ACTIONS(2683), 1,
       aux_sym_format_specifier_token1,
     STATE(1305), 1,
       aux_sym_format_specifier_repeat1,
-    STATE(1499), 1,
+    STATE(1421), 1,
       sym_interpolation,
-  [66197] = 6,
+  [66240] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2413), 1,
-      sym_identifier,
-    ACTIONS(2677), 1,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2686), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [66257] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2688), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [66274] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2690), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [66291] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2650), 1,
       anon_sym_LPAREN,
-    STATE(1290), 1,
-      sym_dotted_name,
-    STATE(1327), 1,
-      sym_aliased_import,
-    STATE(1565), 1,
-      sym__import_list,
-  [66216] = 2,
+    ACTIONS(2654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(2692), 1,
+      anon_sym_COLON,
+    STATE(1481), 1,
+      sym_type_parameters,
+    STATE(1630), 1,
+      sym_argument_list,
+  [66310] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2603), 5,
+    ACTIONS(2596), 5,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_if,
       anon_sym_COLON,
       anon_sym_RBRACK,
-  [66227] = 4,
+  [66321] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2681), 1,
+    ACTIONS(2694), 1,
       anon_sym_COMMA,
-    STATE(1311), 1,
+    STATE(1302), 1,
       aux_sym__collection_elements_repeat1,
-    ACTIONS(2679), 3,
+    ACTIONS(2618), 3,
       anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [66242] = 4,
+  [66336] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2683), 1,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2696), 2,
       anon_sym_COMMA,
-    STATE(1311), 1,
-      aux_sym__collection_elements_repeat1,
-    ACTIONS(2679), 3,
-      anon_sym_RPAREN,
       anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [66257] = 4,
+  [66353] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2685), 1,
+    ACTIONS(2698), 1,
       anon_sym_COMMA,
-    STATE(1311), 1,
+    STATE(1302), 1,
       aux_sym__collection_elements_repeat1,
-    ACTIONS(2679), 3,
+    ACTIONS(2618), 3,
       anon_sym_RPAREN,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
-  [66272] = 4,
+  [66368] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2689), 1,
+    ACTIONS(2700), 1,
       anon_sym_COMMA,
-    STATE(1311), 1,
-      aux_sym__collection_elements_repeat1,
-    ACTIONS(2687), 3,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [66287] = 2,
+    STATE(1298), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2578), 3,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_SEMI,
+  [66383] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2692), 5,
-      anon_sym_RPAREN,
+    ACTIONS(2321), 5,
       anon_sym_COMMA,
-      anon_sym_if,
-      anon_sym_COLON,
-      anon_sym_RBRACK,
-  [66298] = 5,
+      anon_sym_RBRACE,
+      anon_sym_EQ,
+      anon_sym_COLON2,
+      sym_type_conversion,
+  [66394] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2694), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [66315] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2618), 1,
-      anon_sym_LPAREN,
-    ACTIONS(2622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(2696), 1,
-      anon_sym_COLON,
-    STATE(1491), 1,
-      sym_type_parameters,
-    STATE(1626), 1,
-      sym_argument_list,
-  [66334] = 6,
+    ACTIONS(2702), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [66411] = 6,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2628), 1,
+    ACTIONS(2632), 1,
       anon_sym_LBRACE2,
-    ACTIONS(2698), 1,
+    ACTIONS(2704), 1,
       anon_sym_RBRACE,
-    ACTIONS(2700), 1,
+    ACTIONS(2706), 1,
       aux_sym_format_specifier_token1,
-    STATE(1305), 1,
+    STATE(1288), 1,
       aux_sym_format_specifier_repeat1,
-    STATE(1499), 1,
+    STATE(1421), 1,
       sym_interpolation,
-  [66353] = 5,
+  [66430] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    STATE(1313), 1,
+      aux_sym__collection_elements_repeat1,
+    ACTIONS(2144), 3,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [66445] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2451), 2,
+    ACTIONS(2708), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [66462] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2471), 1,
+      sym_identifier,
+    STATE(1324), 1,
+      sym_dotted_name,
+    STATE(1429), 1,
+      sym_aliased_import,
+    ACTIONS(2667), 2,
       sym__newline,
       anon_sym_SEMI,
-  [66370] = 5,
+  [66479] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2702), 2,
+    ACTIONS(2710), 1,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [66387] = 5,
+    STATE(1298), 1,
+      aux_sym_expression_list_repeat1,
+    ACTIONS(2578), 3,
+      sym__newline,
+      anon_sym_from,
+      anon_sym_SEMI,
+  [66494] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2704), 2,
+    ACTIONS(2712), 2,
       anon_sym_COMMA,
       anon_sym_RBRACK,
-  [66404] = 5,
+  [66511] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
-      anon_sym_and,
-    ACTIONS(2286), 1,
-      anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2714), 5,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
       anon_sym_if,
-    ACTIONS(2706), 2,
+      anon_sym_COLON,
+      anon_sym_RBRACK,
+  [66522] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2660), 1,
+      anon_sym_as,
+    ACTIONS(2716), 3,
       sym__newline,
+      anon_sym_COMMA,
       anon_sym_SEMI,
-  [66421] = 5,
+  [66534] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2708), 2,
+    ACTIONS(2718), 1,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [66438] = 5,
+    STATE(1325), 1,
+      aux_sym_global_statement_repeat1,
+    ACTIONS(2721), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [66548] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2710), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [66455] = 5,
+    ACTIONS(2723), 1,
+      anon_sym_SEMI,
+    ACTIONS(2725), 1,
+      sym__newline,
+    STATE(129), 1,
+      sym__semicolon,
+    STATE(1329), 1,
+      aux_sym__simple_statements_repeat1,
+  [66564] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2712), 1,
+    ACTIONS(2727), 1,
       anon_sym_SEMI,
-    ACTIONS(2715), 1,
+    ACTIONS(2729), 1,
       sym__newline,
-    STATE(133), 1,
+    STATE(128), 1,
       sym__semicolon,
-    STATE(1322), 1,
+    STATE(1328), 1,
       aux_sym__simple_statements_repeat1,
-  [66471] = 4,
+  [66580] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2717), 1,
-      anon_sym_COMMA,
-    STATE(1404), 1,
-      aux_sym_print_statement_repeat1,
-    ACTIONS(2719), 2,
+    ACTIONS(563), 1,
+      sym__newline,
+    ACTIONS(2731), 1,
+      anon_sym_SEMI,
+    STATE(127), 1,
+      sym__semicolon,
+    STATE(1344), 1,
+      aux_sym__simple_statements_repeat1,
+  [66596] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(565), 1,
       sym__newline,
+    ACTIONS(2733), 1,
       anon_sym_SEMI,
-  [66485] = 4,
+    STATE(132), 1,
+      sym__semicolon,
+    STATE(1344), 1,
+      aux_sym__simple_statements_repeat1,
+  [66612] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2614), 1,
+      sym_identifier,
+    ACTIONS(2640), 1,
+      anon_sym_RPAREN,
+    STATE(1494), 1,
+      sym_dotted_name,
+    STATE(1615), 1,
+      sym_aliased_import,
+  [66628] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2721), 1,
+    ACTIONS(2735), 1,
       anon_sym_case,
-    STATE(593), 1,
+    STATE(523), 1,
       sym_cases,
-    STATE(461), 2,
+    STATE(456), 2,
       sym_case_block,
       aux_sym_cases_repeat1,
-  [66499] = 5,
+  [66642] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2735), 1,
+      anon_sym_case,
+    STATE(524), 1,
+      sym_cases,
+    STATE(456), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
+  [66656] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(2737), 1,
+      anon_sym_LPAREN,
+    STATE(1585), 1,
+      sym_parameters,
+    STATE(1586), 1,
+      sym_type_parameters,
+  [66672] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2723), 1,
-      anon_sym_COLON,
-  [66515] = 5,
+    ACTIONS(2739), 1,
+      anon_sym_else,
+  [66688] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2741), 1,
+      anon_sym_COMMA,
+    STATE(1363), 1,
+      aux_sym_print_statement_repeat1,
+    ACTIONS(2743), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [66702] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2284), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2286), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2299), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2725), 1,
-      sym__newline,
-  [66531] = 4,
+    ACTIONS(2745), 1,
+      anon_sym_COLON,
+  [66718] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2642), 1,
+    ACTIONS(2626), 1,
+      anon_sym_COLON2,
+    ACTIONS(2747), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2749), 1,
+      sym_type_conversion,
+    STATE(1725), 1,
+      sym_format_specifier,
+  [66734] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2612), 1,
+      anon_sym_EQ,
+    STATE(1555), 1,
+      sym__type_param_default,
+    ACTIONS(2751), 2,
       anon_sym_COMMA,
-    STATE(1335), 1,
-      aux_sym__import_list_repeat1,
-    ACTIONS(2646), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [66545] = 5,
+      anon_sym_RBRACK,
+  [66748] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(567), 1,
+    ACTIONS(2612), 1,
+      anon_sym_EQ,
+    STATE(1556), 1,
+      sym__type_param_default,
+    ACTIONS(2753), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [66762] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(2737), 1,
+      anon_sym_LPAREN,
+    STATE(1591), 1,
+      sym_parameters,
+    STATE(1593), 1,
+      sym_type_parameters,
+  [66778] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2612), 1,
+      anon_sym_EQ,
+    STATE(1559), 1,
+      sym__type_param_default,
+    ACTIONS(2755), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [66792] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2757), 1,
+      anon_sym_COMMA,
+    STATE(1396), 1,
+      aux_sym_global_statement_repeat1,
+    ACTIONS(2759), 2,
       sym__newline,
-    ACTIONS(2727), 1,
       anon_sym_SEMI,
-    STATE(128), 1,
-      sym__semicolon,
-    STATE(1322), 1,
-      aux_sym__simple_statements_repeat1,
-  [66561] = 3,
+  [66806] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2644), 1,
-      anon_sym_as,
-    ACTIONS(2729), 3,
-      sym__newline,
+    ACTIONS(2757), 1,
       anon_sym_COMMA,
+    STATE(1399), 1,
+      aux_sym_global_statement_repeat1,
+    ACTIONS(2761), 2,
+      sym__newline,
       anon_sym_SEMI,
-  [66573] = 5,
+  [66820] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2638), 1,
-      anon_sym_COLON2,
-    ACTIONS(2731), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2733), 1,
-      sym_type_conversion,
-    STATE(1646), 1,
-      sym_format_specifier,
-  [66589] = 5,
+    ACTIONS(2763), 1,
+      anon_sym_SEMI,
+    ACTIONS(2766), 1,
+      sym__newline,
+    STATE(133), 1,
+      sym__semicolon,
+    STATE(1344), 1,
+      aux_sym__simple_statements_repeat1,
+  [66836] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2735), 1,
+    ACTIONS(2451), 4,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
       anon_sym_COLON,
-  [66605] = 4,
+      anon_sym_EQ,
+  [66846] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2737), 1,
-      anon_sym_COMMA,
-    STATE(1332), 1,
-      aux_sym_global_statement_repeat1,
-    ACTIONS(2740), 2,
+    ACTIONS(2321), 4,
       sym__newline,
+      anon_sym_from,
+      anon_sym_COMMA,
       anon_sym_SEMI,
-  [66619] = 3,
+  [66856] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2744), 1,
-      anon_sym_EQ,
-    ACTIONS(2742), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
+    ACTIONS(315), 1,
+      sym__string_start,
+    ACTIONS(2156), 1,
       anon_sym_COLON,
-  [66631] = 4,
+    STATE(630), 2,
+      sym_string,
+      aux_sym_concatenated_string_repeat1,
+  [66870] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2746), 1,
-      anon_sym_case,
-    STATE(545), 1,
-      sym_cases,
-    STATE(440), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
-  [66645] = 4,
+    ACTIONS(317), 1,
+      sym__template_string_start,
+    ACTIONS(2156), 1,
+      anon_sym_COLON,
+    STATE(631), 2,
+      sym_template_string,
+      aux_sym_concatenated_template_string_repeat1,
+  [66884] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2748), 1,
+    ACTIONS(2407), 1,
       anon_sym_COMMA,
-    STATE(1339), 1,
-      aux_sym__import_list_repeat1,
-    ACTIONS(2750), 2,
+    STATE(1386), 1,
+      aux_sym_assert_statement_repeat1,
+    ACTIONS(2768), 2,
       sym__newline,
       anon_sym_SEMI,
-  [66659] = 4,
+  [66898] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2752), 1,
-      anon_sym_COMMA,
-    STATE(1339), 1,
-      aux_sym__import_list_repeat1,
-    ACTIONS(2750), 2,
+    ACTIONS(2280), 1,
+      anon_sym_and,
+    ACTIONS(2282), 1,
+      anon_sym_or,
+    ACTIONS(2294), 1,
+      anon_sym_if,
+    ACTIONS(2770), 1,
       sym__newline,
-      anon_sym_SEMI,
-  [66673] = 5,
+  [66914] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2580), 1,
+    ACTIONS(2614), 1,
       sym_identifier,
-    ACTIONS(2663), 1,
+    ACTIONS(2667), 1,
       anon_sym_RPAREN,
-    STATE(1438), 1,
+    STATE(1494), 1,
       sym_dotted_name,
-    STATE(1600), 1,
+    STATE(1615), 1,
       sym_aliased_import,
-  [66689] = 5,
+  [66930] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2580), 1,
+    ACTIONS(2614), 1,
       sym_identifier,
-    ACTIONS(2663), 1,
+    ACTIONS(2667), 1,
       anon_sym_RPAREN,
-    STATE(1438), 1,
+    STATE(1494), 1,
       sym_dotted_name,
-    STATE(1600), 1,
+    STATE(1615), 1,
       sym_aliased_import,
-  [66705] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2754), 1,
-      anon_sym_COMMA,
-    STATE(1339), 1,
-      aux_sym__import_list_repeat1,
-    ACTIONS(2757), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [66719] = 4,
+  [66946] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2746), 1,
-      anon_sym_case,
-    STATE(546), 1,
-      sym_cases,
-    STATE(440), 2,
-      sym_case_block,
-      aux_sym_cases_repeat1,
-  [66733] = 5,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2772), 1,
+      anon_sym_else,
+  [66962] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2580), 1,
+    ACTIONS(2471), 1,
       sym_identifier,
-    STATE(1362), 1,
+    STATE(1297), 1,
       sym_dotted_name,
-    STATE(1467), 1,
+    STATE(1357), 1,
       sym_aliased_import,
-    STATE(1670), 1,
+    STATE(1572), 1,
       sym__import_list,
-  [66749] = 5,
+  [66978] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2580), 1,
-      sym_identifier,
-    STATE(1362), 1,
-      sym_dotted_name,
-    STATE(1467), 1,
-      sym_aliased_import,
-    STATE(1671), 1,
-      sym__import_list,
-  [66765] = 4,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2774), 1,
+      anon_sym_COLON,
+  [66994] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2761), 1,
-      anon_sym_DOT,
-    STATE(1352), 1,
-      aux_sym_import_prefix_repeat1,
-    ACTIONS(2759), 2,
-      anon_sym_import,
-      sym_identifier,
-  [66779] = 2,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2776), 1,
+      anon_sym_COLON,
+  [67010] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2763), 4,
-      anon_sym_RPAREN,
+    ACTIONS(2658), 1,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [66789] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2765), 1,
-      anon_sym_SEMI,
-    ACTIONS(2767), 1,
+    STATE(1388), 1,
+      aux_sym__import_list_repeat1,
+    ACTIONS(2662), 2,
       sym__newline,
-    STATE(129), 1,
-      sym__semicolon,
-    STATE(1351), 1,
-      aux_sym__simple_statements_repeat1,
-  [66805] = 5,
+      anon_sym_SEMI,
+  [67024] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2769), 1,
-      anon_sym_SEMI,
-    ACTIONS(2771), 1,
-      sym__newline,
-    STATE(127), 1,
-      sym__semicolon,
-    STATE(1399), 1,
-      aux_sym__simple_statements_repeat1,
-  [66821] = 5,
+    ACTIONS(2780), 1,
+      anon_sym_COMMA,
+    STATE(1404), 1,
+      aux_sym__patterns_repeat1,
+    ACTIONS(2778), 2,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+  [67038] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2773), 1,
-      anon_sym_else,
-  [66837] = 4,
+    ACTIONS(2782), 1,
+      anon_sym_COLON,
+  [67054] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2626), 1,
+      anon_sym_COLON2,
+    ACTIONS(2784), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2786), 1,
+      sym_type_conversion,
+    STATE(1675), 1,
+      sym_format_specifier,
+  [67070] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2775), 1,
+    ACTIONS(2427), 1,
       anon_sym_COMMA,
-    STATE(1348), 1,
+    STATE(1393), 1,
       aux_sym_exception_list_repeat1,
-    ACTIONS(2778), 2,
+    ACTIONS(2788), 2,
       anon_sym_as,
       anon_sym_COLON,
-  [66851] = 2,
+  [67084] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2780), 4,
-      anon_sym_RPAREN,
+    ACTIONS(2790), 1,
+      anon_sym_SEMI,
+    ACTIONS(2792), 1,
+      sym__newline,
+    STATE(130), 1,
+      sym__semicolon,
+    STATE(1365), 1,
+      aux_sym__simple_statements_repeat1,
+  [67100] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2794), 1,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [66861] = 5,
+    STATE(1385), 1,
+      aux_sym_print_statement_repeat1,
+    ACTIONS(2796), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [67114] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2782), 1,
-      anon_sym_COLON,
-  [66877] = 5,
+    ACTIONS(2614), 1,
+      sym_identifier,
+    STATE(1390), 1,
+      sym_dotted_name,
+    STATE(1491), 1,
+      sym_aliased_import,
+    STATE(1697), 1,
+      sym__import_list,
+  [67130] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(565), 1,
+    ACTIONS(567), 1,
       sym__newline,
-    ACTIONS(2784), 1,
+    ACTIONS(2798), 1,
       anon_sym_SEMI,
     STATE(131), 1,
       sym__semicolon,
-    STATE(1322), 1,
+    STATE(1344), 1,
       aux_sym__simple_statements_repeat1,
-  [66893] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2788), 1,
-      anon_sym_DOT,
-    STATE(1352), 1,
-      aux_sym_import_prefix_repeat1,
-    ACTIONS(2786), 2,
-      anon_sym_import,
-      sym_identifier,
-  [66907] = 5,
+  [67146] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2791), 1,
+    ACTIONS(2800), 1,
       anon_sym_else,
-  [66923] = 2,
+  [67162] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2411), 4,
-      anon_sym_RPAREN,
+    ACTIONS(2802), 1,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-  [66933] = 4,
+    STATE(1385), 1,
+      aux_sym_print_statement_repeat1,
+    ACTIONS(2804), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [67176] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2795), 1,
-      anon_sym_COMMA,
-    STATE(1360), 1,
-      aux_sym__patterns_repeat1,
-    ACTIONS(2793), 2,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-  [66947] = 5,
+    ACTIONS(2806), 4,
+      anon_sym_async,
+      anon_sym_def,
+      anon_sym_class,
+      anon_sym_AT,
+  [67186] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2638), 1,
-      anon_sym_COLON2,
-    ACTIONS(2797), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2799), 1,
-      sym_type_conversion,
-    STATE(1741), 1,
-      sym_format_specifier,
-  [66963] = 5,
+    ACTIONS(2614), 1,
+      sym_identifier,
+    STATE(1390), 1,
+      sym_dotted_name,
+    STATE(1491), 1,
+      sym_aliased_import,
+    STATE(1732), 1,
+      sym__import_list,
+  [67202] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2413), 1,
+    ACTIONS(2614), 1,
       sym_identifier,
-    STATE(1290), 1,
+    STATE(1390), 1,
       sym_dotted_name,
-    STATE(1327), 1,
+    STATE(1491), 1,
       sym_aliased_import,
-    STATE(1552), 1,
+    STATE(1733), 1,
       sym__import_list,
-  [66979] = 2,
+  [67218] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2489), 4,
-      anon_sym_RPAREN,
+    ACTIONS(2808), 1,
       anon_sym_COMMA,
-      anon_sym_COLON,
-      anon_sym_EQ,
-  [66989] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
+    STATE(1279), 1,
+      aux_sym_open_sequence_match_pattern_repeat1,
+    ACTIONS(1896), 2,
       anon_sym_if,
-    ACTIONS(2801), 1,
       anon_sym_COLON,
-  [67005] = 4,
+  [67232] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2805), 1,
-      anon_sym_COMMA,
-    STATE(1000), 1,
-      aux_sym__patterns_repeat1,
-    ACTIONS(2803), 2,
-      anon_sym_RPAREN,
-      anon_sym_RBRACK,
-  [67019] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2807), 1,
+    ACTIONS(2810), 1,
       anon_sym_else,
-  [67035] = 5,
+  [67248] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2646), 1,
+    ACTIONS(2812), 4,
       anon_sym_RPAREN,
-    ACTIONS(2809), 1,
       anon_sym_COMMA,
-    ACTIONS(2811), 1,
-      anon_sym_as,
-    STATE(1415), 1,
-      aux_sym__import_list_repeat1,
-  [67051] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2813), 1,
-      anon_sym_COLON,
-  [67067] = 4,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [67258] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2397), 1,
+    ACTIONS(2814), 4,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    STATE(1348), 1,
-      aux_sym_exception_list_repeat1,
-    ACTIONS(2815), 2,
-      anon_sym_as,
-      anon_sym_COLON,
-  [67081] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2817), 1,
-      anon_sym_else,
-  [67097] = 4,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [67268] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2819), 1,
+    ACTIONS(2485), 4,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    STATE(1394), 1,
-      aux_sym_global_statement_repeat1,
-    ACTIONS(2821), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [67111] = 5,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+  [67278] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2823), 1,
+    ACTIONS(2816), 1,
       anon_sym_else,
-  [67127] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2825), 1,
-      anon_sym_COMMA,
-    STATE(1368), 1,
-      aux_sym_print_statement_repeat1,
-    ACTIONS(2828), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [67141] = 4,
+  [67294] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(315), 1,
-      sym__string_start,
-    ACTIONS(2112), 1,
-      anon_sym_COLON,
-    STATE(690), 2,
-      sym_string,
-      aux_sym_concatenated_string_repeat1,
-  [67155] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2830), 1,
+    ACTIONS(2818), 1,
       anon_sym_COLON,
-  [67171] = 5,
+  [67310] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2832), 1,
-      anon_sym_COLON,
-  [67187] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2834), 1,
-      anon_sym_COMMA,
-    STATE(1372), 1,
-      aux_sym_assert_statement_repeat1,
-    ACTIONS(2549), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [67201] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(317), 1,
-      sym__template_string_start,
-    ACTIONS(2112), 1,
+    ACTIONS(2820), 1,
       anon_sym_COLON,
-    STATE(693), 2,
-      sym_template_string,
-      aux_sym_concatenated_template_string_repeat1,
-  [67215] = 4,
+  [67326] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2547), 1,
-      anon_sym_EQ,
-    STATE(1562), 1,
-      sym__type_param_default,
-    ACTIONS(2837), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [67229] = 4,
+    ACTIONS(2822), 1,
+      anon_sym_case,
+    STATE(602), 1,
+      sym_cases,
+    STATE(457), 2,
+      sym_case_block,
+      aux_sym_cases_repeat1,
+  [67340] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2721), 1,
+    ACTIONS(2822), 1,
       anon_sym_case,
-    STATE(558), 1,
+    STATE(603), 1,
       sym_cases,
-    STATE(461), 2,
+    STATE(457), 2,
       sym_case_block,
       aux_sym_cases_repeat1,
-  [67243] = 5,
+  [67354] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2839), 1,
+    ACTIONS(2824), 1,
       anon_sym_COLON,
-  [67259] = 5,
+  [67370] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2841), 1,
+    ACTIONS(2826), 1,
       anon_sym_COLON,
-  [67275] = 5,
+  [67386] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2843), 1,
+    ACTIONS(2828), 1,
       anon_sym_COLON,
-  [67291] = 4,
+  [67402] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2547), 1,
-      anon_sym_EQ,
-    STATE(1563), 1,
-      sym__type_param_default,
-    ACTIONS(2845), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [67305] = 4,
+    ACTIONS(2832), 1,
+      anon_sym_DOT,
+    STATE(1392), 1,
+      aux_sym_import_prefix_repeat1,
+    ACTIONS(2830), 2,
+      anon_sym_import,
+      sym_identifier,
+  [67416] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2847), 1,
+    ACTIONS(2834), 1,
       anon_sym_COMMA,
-    STATE(1368), 1,
+    STATE(1385), 1,
       aux_sym_print_statement_repeat1,
-    ACTIONS(2849), 2,
+    ACTIONS(2837), 2,
       sym__newline,
       anon_sym_SEMI,
-  [67319] = 5,
+  [67430] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2580), 1,
-      sym_identifier,
-    STATE(1362), 1,
-      sym_dotted_name,
-    STATE(1467), 1,
-      sym_aliased_import,
-    STATE(1625), 1,
-      sym__import_list,
-  [67335] = 4,
+    ACTIONS(2839), 1,
+      anon_sym_COMMA,
+    STATE(1386), 1,
+      aux_sym_assert_statement_repeat1,
+    ACTIONS(2572), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [67444] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2851), 1,
+    ACTIONS(2844), 1,
+      anon_sym_EQ,
+    ACTIONS(2842), 3,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    STATE(1280), 1,
-      aux_sym_open_sequence_match_pattern_repeat1,
-    ACTIONS(1902), 2,
-      anon_sym_if,
       anon_sym_COLON,
-  [67349] = 4,
+  [67456] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2855), 1,
-      anon_sym_COLON,
-    ACTIONS(2857), 1,
-      anon_sym_EQ,
-    ACTIONS(2853), 2,
+    ACTIONS(2846), 1,
+      anon_sym_COMMA,
+    STATE(1406), 1,
+      aux_sym__import_list_repeat1,
+    ACTIONS(2848), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [67470] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2850), 1,
+      anon_sym_COMMA,
+    STATE(1406), 1,
+      aux_sym__import_list_repeat1,
+    ACTIONS(2848), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [67484] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2662), 1,
       anon_sym_RPAREN,
+    ACTIONS(2852), 1,
       anon_sym_COMMA,
-  [67363] = 5,
+    ACTIONS(2854), 1,
+      anon_sym_as,
+    STATE(1425), 1,
+      aux_sym__import_list_repeat1,
+  [67500] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2580), 1,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2856), 1,
+      anon_sym_COLON,
+  [67516] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2860), 1,
+      anon_sym_DOT,
+    STATE(1392), 1,
+      aux_sym_import_prefix_repeat1,
+    ACTIONS(2858), 2,
+      anon_sym_import,
       sym_identifier,
-    ACTIONS(2665), 1,
-      anon_sym_RPAREN,
-    STATE(1438), 1,
-      sym_dotted_name,
-    STATE(1600), 1,
-      sym_aliased_import,
-  [67379] = 5,
+  [67530] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2413), 1,
+    ACTIONS(2863), 1,
+      anon_sym_COMMA,
+    STATE(1393), 1,
+      aux_sym_exception_list_repeat1,
+    ACTIONS(2866), 2,
+      anon_sym_as,
+      anon_sym_COLON,
+  [67544] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2868), 1,
+      anon_sym_else,
+  [67560] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2471), 1,
       sym_identifier,
-    STATE(1290), 1,
+    STATE(1297), 1,
       sym_dotted_name,
-    STATE(1327), 1,
+    STATE(1357), 1,
       sym_aliased_import,
-    STATE(1596), 1,
+    STATE(1568), 1,
       sym__import_list,
-  [67395] = 5,
+  [67576] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
+    ACTIONS(2757), 1,
+      anon_sym_COMMA,
+    STATE(1325), 1,
+      aux_sym_global_statement_repeat1,
+    ACTIONS(2870), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [67590] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2206), 1,
       anon_sym_and,
-    ACTIONS(2184), 1,
+    ACTIONS(2208), 1,
       anon_sym_or,
-    ACTIONS(2198), 1,
+    ACTIONS(2212), 1,
       anon_sym_if,
-    ACTIONS(2859), 1,
+    ACTIONS(2872), 1,
       anon_sym_COLON,
-  [67411] = 5,
+  [67606] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2861), 1,
-      anon_sym_else,
-  [67427] = 4,
+    ACTIONS(2876), 1,
+      anon_sym_COMMA,
+    STATE(1398), 1,
+      aux_sym_with_clause_repeat1,
+    ACTIONS(2874), 2,
+      anon_sym_RPAREN,
+      anon_sym_COLON,
+  [67620] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2819), 1,
+    ACTIONS(2757), 1,
       anon_sym_COMMA,
-    STATE(1332), 1,
+    STATE(1325), 1,
       aux_sym_global_statement_repeat1,
-    ACTIONS(2863), 2,
+    ACTIONS(2879), 2,
       sym__newline,
       anon_sym_SEMI,
-  [67441] = 4,
+  [67634] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2547), 1,
+    ACTIONS(2883), 1,
+      anon_sym_COLON,
+    ACTIONS(2885), 1,
       anon_sym_EQ,
-    STATE(1575), 1,
-      sym__type_param_default,
-    ACTIONS(2865), 2,
+    ACTIONS(2881), 2,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [67455] = 4,
+  [67648] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2485), 1,
+    ACTIONS(2407), 1,
       anon_sym_COMMA,
-    STATE(1372), 1,
+    STATE(1386), 1,
       aux_sym_assert_statement_repeat1,
-    ACTIONS(2867), 2,
+    ACTIONS(2887), 2,
       sym__newline,
       anon_sym_SEMI,
-  [67469] = 2,
+  [67662] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2869), 4,
-      anon_sym_async,
-      anon_sym_def,
-      anon_sym_class,
-      anon_sym_AT,
-  [67479] = 4,
+    ACTIONS(2654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(2737), 1,
+      anon_sym_LPAREN,
+    STATE(1573), 1,
+      sym_parameters,
+    STATE(1607), 1,
+      sym_type_parameters,
+  [67678] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(2737), 1,
+      anon_sym_LPAREN,
+    STATE(1574), 1,
+      sym_parameters,
+    STATE(1609), 1,
+      sym_type_parameters,
+  [67694] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2819), 1,
+    ACTIONS(2891), 1,
       anon_sym_COMMA,
-    STATE(1388), 1,
-      aux_sym_global_statement_repeat1,
-    ACTIONS(2871), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [67493] = 2,
+    STATE(1001), 1,
+      aux_sym__patterns_repeat1,
+    ACTIONS(2889), 2,
+      anon_sym_RPAREN,
+      anon_sym_RBRACK,
+  [67708] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2311), 4,
-      sym__newline,
-      anon_sym_from,
+    ACTIONS(2206), 1,
+      anon_sym_and,
+    ACTIONS(2208), 1,
+      anon_sym_or,
+    ACTIONS(2212), 1,
+      anon_sym_if,
+    ACTIONS(2893), 1,
+      anon_sym_COLON,
+  [67724] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2895), 1,
       anon_sym_COMMA,
+    STATE(1406), 1,
+      aux_sym__import_list_repeat1,
+    ACTIONS(2898), 2,
+      sym__newline,
       anon_sym_SEMI,
-  [67503] = 4,
+  [67738] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2819), 1,
+    ACTIONS(2900), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2902), 1,
       anon_sym_COMMA,
-    STATE(1332), 1,
-      aux_sym_global_statement_repeat1,
-    ACTIONS(2873), 2,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [67751] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2614), 1,
+      sym_identifier,
+    STATE(1494), 1,
+      sym_dotted_name,
+    STATE(1615), 1,
+      sym_aliased_import,
+  [67764] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1542), 3,
       sym__newline,
+      anon_sym_in,
       anon_sym_SEMI,
-  [67517] = 5,
+  [67773] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2182), 1,
-      anon_sym_and,
-    ACTIONS(2184), 1,
-      anon_sym_or,
-    ACTIONS(2198), 1,
-      anon_sym_if,
-    ACTIONS(2875), 1,
-      anon_sym_COLON,
-  [67533] = 5,
+    ACTIONS(2626), 1,
+      anon_sym_COLON2,
+    ACTIONS(2747), 1,
+      anon_sym_RBRACE,
+    STATE(1725), 1,
+      sym_format_specifier,
+  [67786] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(2877), 1,
-      anon_sym_LPAREN,
-    STATE(1574), 1,
-      sym_type_parameters,
-    STATE(1612), 1,
-      sym_parameters,
-  [67549] = 5,
+    ACTIONS(2045), 1,
+      anon_sym_COMMA,
+    ACTIONS(2904), 1,
+      anon_sym_in,
+    STATE(1019), 1,
+      aux_sym__patterns_repeat1,
+  [67799] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(2877), 1,
-      anon_sym_LPAREN,
-    STATE(1538), 1,
-      sym_parameters,
-    STATE(1597), 1,
-      sym_type_parameters,
-  [67565] = 5,
+    ACTIONS(2906), 1,
+      sym_identifier,
+    ACTIONS(2908), 1,
+      sym_match_wildcard_pattern,
+    STATE(1323), 1,
+      sym_match_capture_pattern,
+  [67812] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(2877), 1,
-      anon_sym_LPAREN,
-    STATE(1541), 1,
-      sym_parameters,
-    STATE(1599), 1,
-      sym_type_parameters,
-  [67581] = 5,
+    ACTIONS(1918), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2910), 1,
+      sym_identifier,
+    STATE(1569), 1,
+      sym_match_keyword_pattern,
+  [67825] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(561), 1,
-      sym__newline,
-    ACTIONS(2879), 1,
-      anon_sym_SEMI,
-    STATE(132), 1,
-      sym__semicolon,
-    STATE(1322), 1,
-      aux_sym__simple_statements_repeat1,
-  [67597] = 4,
+    ACTIONS(2912), 1,
+      anon_sym_COMMA,
+    ACTIONS(2914), 1,
+      anon_sym_RBRACK,
+    STATE(1507), 1,
+      aux_sym_index_expression_list_repeat1,
+  [67838] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2883), 1,
+    ACTIONS(2045), 1,
       anon_sym_COMMA,
-    STATE(1400), 1,
-      aux_sym_with_clause_repeat1,
-    ACTIONS(2881), 2,
-      anon_sym_RPAREN,
-      anon_sym_COLON,
-  [67611] = 4,
+    ACTIONS(2916), 1,
+      anon_sym_in,
+    STATE(1019), 1,
+      aux_sym__patterns_repeat1,
+  [67851] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2485), 1,
+    ACTIONS(2138), 1,
       anon_sym_COMMA,
-    STATE(1372), 1,
-      aux_sym_assert_statement_repeat1,
-    ACTIONS(2886), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [67625] = 5,
+    ACTIONS(2228), 1,
+      anon_sym_RPAREN,
+    STATE(1531), 1,
+      aux_sym__collection_elements_repeat1,
+  [67864] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2888), 1,
-      anon_sym_SEMI,
-    ACTIONS(2890), 1,
-      sym__newline,
-    STATE(130), 1,
-      sym__semicolon,
-    STATE(1328), 1,
-      aux_sym__simple_statements_repeat1,
-  [67641] = 5,
+    ACTIONS(2455), 1,
+      sym_identifier,
+    ACTIONS(2918), 1,
+      anon_sym_import,
+    STATE(1677), 1,
+      sym_dotted_name,
+  [67877] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(2877), 1,
-      anon_sym_LPAREN,
-    STATE(1548), 1,
-      sym_parameters,
-    STATE(1572), 1,
-      sym_type_parameters,
-  [67657] = 4,
+    ACTIONS(2920), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2922), 1,
+      anon_sym_COMMA,
+    STATE(1418), 1,
+      aux_sym_match_class_pattern_repeat2,
+  [67890] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2892), 1,
-      anon_sym_COMMA,
-    STATE(1368), 1,
-      aux_sym_print_statement_repeat1,
-    ACTIONS(2894), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [67671] = 4,
+    ACTIONS(2626), 1,
+      anon_sym_COLON2,
+    ACTIONS(2925), 1,
+      anon_sym_RBRACE,
+    STATE(1758), 1,
+      sym_format_specifier,
+  [67903] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2031), 1,
+    ACTIONS(2848), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2927), 1,
       anon_sym_COMMA,
-    ACTIONS(2896), 1,
-      anon_sym_in,
-    STATE(1018), 1,
-      aux_sym__patterns_repeat1,
-  [67684] = 4,
+    STATE(1499), 1,
+      aux_sym__import_list_repeat1,
+  [67916] = 3,
+    ACTIONS(2086), 1,
+      sym_comment,
+    ACTIONS(2929), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2931), 2,
+      anon_sym_LBRACE2,
+      aux_sym_format_specifier_token1,
+  [67927] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2898), 1,
-      anon_sym_COMMA,
-    ACTIONS(2900), 1,
-      anon_sym_COLON,
-    STATE(1481), 1,
-      aux_sym__parameters_repeat1,
-  [67697] = 4,
+    ACTIONS(2626), 1,
+      anon_sym_COLON2,
+    ACTIONS(2784), 1,
+      anon_sym_RBRACE,
+    STATE(1675), 1,
+      sym_format_specifier,
+  [67940] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2902), 1,
+    ACTIONS(2933), 1,
       anon_sym_if,
-    ACTIONS(2904), 1,
+    ACTIONS(2935), 1,
       anon_sym_COLON,
-    STATE(1661), 1,
+    STATE(1744), 1,
       sym_guard,
-  [67710] = 3,
+  [67953] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2906), 1,
+    ACTIONS(2937), 1,
       anon_sym_COMMA,
-    ACTIONS(2908), 2,
+    ACTIONS(2939), 2,
       anon_sym_if,
       anon_sym_COLON,
-  [67721] = 4,
+  [67964] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2910), 1,
+    ACTIONS(2848), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2941), 1,
       anon_sym_COMMA,
-    ACTIONS(2912), 1,
-      anon_sym_RBRACK,
-    STATE(1418), 1,
-      aux_sym_type_parameters_repeat1,
-  [67734] = 2,
+    STATE(1499), 1,
+      aux_sym__import_list_repeat1,
+  [67977] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2853), 3,
+    ACTIONS(2943), 1,
       anon_sym_RPAREN,
+    ACTIONS(2945), 1,
       anon_sym_COMMA,
-      anon_sym_COLON,
-  [67743] = 3,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [67990] = 3,
+    ACTIONS(2086), 1,
+      sym_comment,
+    ACTIONS(2513), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2515), 2,
+      anon_sym_LBRACE2,
+      aux_sym_format_specifier_token1,
+  [68001] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2914), 1,
-      anon_sym_in,
-    ACTIONS(2916), 2,
+    ACTIONS(2119), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2138), 1,
+      anon_sym_COMMA,
+    STATE(1531), 1,
+      aux_sym__collection_elements_repeat1,
+  [68014] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2716), 3,
       sym__newline,
+      anon_sym_COMMA,
       anon_sym_SEMI,
-  [67754] = 4,
+  [68023] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2918), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2920), 1,
+    ACTIONS(2947), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
-      aux_sym_argument_list_repeat1,
-  [67767] = 4,
+    ACTIONS(2949), 1,
+      anon_sym_RBRACE,
+    STATE(1532), 1,
+      aux_sym_dictionary_repeat1,
+  [68036] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2922), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2924), 1,
+    ACTIONS(2951), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
-      aux_sym_argument_list_repeat1,
-  [67780] = 4,
+    ACTIONS(2953), 1,
+      anon_sym_RBRACE,
+    STATE(1532), 1,
+      aux_sym_dictionary_repeat1,
+  [68049] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2750), 1,
+    ACTIONS(2955), 1,
       anon_sym_RPAREN,
-    ACTIONS(2926), 1,
+    ACTIONS(2957), 1,
       anon_sym_COMMA,
-    STATE(1440), 1,
-      aux_sym__import_list_repeat1,
-  [67793] = 4,
+    STATE(1432), 1,
+      aux_sym__parameters_repeat1,
+  [68062] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2750), 1,
+    ACTIONS(2198), 1,
       anon_sym_RPAREN,
-    ACTIONS(2928), 1,
+    ACTIONS(2200), 1,
       anon_sym_COMMA,
-    STATE(1440), 1,
-      aux_sym__import_list_repeat1,
-  [67806] = 4,
+    STATE(1441), 1,
+      aux_sym_argument_list_repeat1,
+  [68075] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2622), 1,
-      anon_sym_LBRACK,
-    ACTIONS(2930), 1,
-      anon_sym_EQ,
-    STATE(1738), 1,
-      sym_type_parameters,
-  [67819] = 2,
+    ACTIONS(2960), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2962), 1,
+      anon_sym_COMMA,
+    STATE(1442), 1,
+      aux_sym_argument_list_repeat1,
+  [68088] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2932), 3,
+    ACTIONS(2964), 3,
       anon_sym_LPAREN,
       anon_sym_COLON,
       anon_sym_EQ,
-  [67828] = 4,
+  [68097] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2910), 1,
+    ACTIONS(2912), 1,
       anon_sym_COMMA,
-    ACTIONS(2934), 1,
+    ACTIONS(2966), 1,
       anon_sym_RBRACK,
-    STATE(1511), 1,
-      aux_sym_type_parameters_repeat1,
-  [67841] = 4,
+    STATE(1507), 1,
+      aux_sym_index_expression_list_repeat1,
+  [68110] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2936), 1,
-      sym_identifier,
-    ACTIONS(2938), 1,
+    ACTIONS(2968), 1,
       anon_sym_RPAREN,
-    STATE(1592), 1,
-      sym_match_keyword_pattern,
-  [67854] = 4,
+    ACTIONS(2970), 1,
+      anon_sym_COMMA,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [68123] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2938), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2940), 1,
+    ACTIONS(2972), 1,
       anon_sym_COMMA,
-    STATE(1444), 1,
-      aux_sym_match_class_pattern_repeat2,
-  [67867] = 4,
+    ACTIONS(2974), 1,
+      anon_sym_RBRACK,
+    STATE(1503), 1,
+      aux_sym_open_sequence_match_pattern_repeat1,
+  [68136] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2938), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2940), 1,
+    ACTIONS(2976), 3,
+      sym__newline,
       anon_sym_COMMA,
-    STATE(1429), 1,
-      aux_sym_match_class_pattern_repeat2,
-  [67880] = 2,
+      anon_sym_SEMI,
+  [68145] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1340), 3,
+    ACTIONS(2842), 3,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
-  [67889] = 4,
+  [68154] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1997), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2942), 1,
+    ACTIONS(2978), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2980), 1,
       anon_sym_COMMA,
-    STATE(1477), 1,
-      aux_sym_match_mapping_pattern_repeat1,
-  [67902] = 4,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [68167] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1916), 1,
+    ACTIONS(2982), 1,
       anon_sym_RPAREN,
-    ACTIONS(2944), 1,
+    ACTIONS(2984), 1,
       anon_sym_COMMA,
-    STATE(1420), 1,
-      aux_sym_match_class_pattern_repeat2,
-  [67915] = 2,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [68180] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2740), 3,
-      sym__newline,
+    ACTIONS(2986), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2988), 1,
       anon_sym_COMMA,
-      anon_sym_SEMI,
-  [67924] = 4,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [68193] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2936), 1,
-      sym_identifier,
-    ACTIONS(2946), 1,
-      anon_sym_RPAREN,
-    STATE(1592), 1,
-      sym_match_keyword_pattern,
-  [67937] = 4,
+    ACTIONS(2990), 1,
+      anon_sym_COMMA,
+    ACTIONS(2992), 1,
+      anon_sym_RBRACE,
+    STATE(1508), 1,
+      aux_sym_match_mapping_pattern_repeat1,
+  [68206] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2948), 1,
+    ACTIONS(2994), 1,
       anon_sym_RPAREN,
-    ACTIONS(2950), 1,
+    ACTIONS(2996), 1,
       anon_sym_COMMA,
-    STATE(1427), 1,
-      aux_sym_match_class_pattern_repeat1,
-  [67950] = 2,
-    ACTIONS(3), 1,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [68219] = 3,
+    ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2729), 3,
-      sym__newline,
-      anon_sym_COMMA,
-      anon_sym_SEMI,
-  [67959] = 4,
+    ACTIONS(2509), 1,
+      anon_sym_RBRACE,
+    ACTIONS(2511), 2,
+      anon_sym_LBRACE2,
+      aux_sym_format_specifier_token1,
+  [68230] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2946), 1,
+    ACTIONS(2998), 1,
       anon_sym_RPAREN,
-    ACTIONS(2953), 1,
+    ACTIONS(3000), 1,
       anon_sym_COMMA,
-    STATE(1444), 1,
-      aux_sym_match_class_pattern_repeat2,
-  [67972] = 4,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [68243] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2955), 1,
+    ACTIONS(3002), 1,
       anon_sym_RPAREN,
-    ACTIONS(2957), 1,
+    ACTIONS(3004), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
+    STATE(1510), 1,
       aux_sym_argument_list_repeat1,
-  [67985] = 3,
-    ACTIONS(2086), 1,
-      sym_comment,
-    ACTIONS(2608), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2610), 2,
-      anon_sym_LBRACE2,
-      aux_sym_format_specifier_token1,
-  [67996] = 4,
+  [68256] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
+    ACTIONS(2138), 1,
       anon_sym_COMMA,
-    ACTIONS(2220), 1,
+    ACTIONS(2180), 1,
       anon_sym_RPAREN,
-    STATE(1471), 1,
+    STATE(1531), 1,
       aux_sym__collection_elements_repeat1,
-  [68009] = 4,
+  [68269] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2936), 1,
+    ACTIONS(2910), 1,
       sym_identifier,
-    ACTIONS(2960), 1,
+    ACTIONS(3006), 1,
       anon_sym_RPAREN,
-    STATE(1592), 1,
+    STATE(1569), 1,
       sym_match_keyword_pattern,
-  [68022] = 4,
+  [68282] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2962), 1,
+    ACTIONS(3006), 1,
       anon_sym_RPAREN,
-    ACTIONS(2964), 1,
+    ACTIONS(3008), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
-      aux_sym_argument_list_repeat1,
-  [68035] = 4,
+    STATE(1418), 1,
+      aux_sym_match_class_pattern_repeat2,
+  [68295] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2638), 1,
-      anon_sym_COLON2,
-    ACTIONS(2731), 1,
+    ACTIONS(3010), 1,
+      anon_sym_COMMA,
+    ACTIONS(3012), 1,
       anon_sym_RBRACE,
-    STATE(1646), 1,
-      sym_format_specifier,
-  [68048] = 3,
+    STATE(1532), 1,
+      aux_sym_dictionary_repeat1,
+  [68308] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2966), 1,
-      anon_sym_EQ,
-    ACTIONS(2968), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [68059] = 2,
+    ACTIONS(3014), 1,
+      anon_sym_RPAREN,
+    ACTIONS(3016), 1,
+      anon_sym_COMMA,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [68321] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2970), 3,
+    ACTIONS(3006), 1,
       anon_sym_RPAREN,
+    ACTIONS(3008), 1,
       anon_sym_COMMA,
-      anon_sym_COLON,
-  [68068] = 3,
+    STATE(1477), 1,
+      aux_sym_match_class_pattern_repeat2,
+  [68334] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2811), 1,
-      anon_sym_as,
-    ACTIONS(2729), 2,
+    ACTIONS(2218), 1,
       anon_sym_RPAREN,
+    ACTIONS(2220), 1,
       anon_sym_COMMA,
-  [68079] = 4,
+    STATE(1437), 1,
+      aux_sym_argument_list_repeat1,
+  [68347] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1916), 1,
+    ACTIONS(3018), 1,
       anon_sym_RPAREN,
-    ACTIONS(2936), 1,
-      sym_identifier,
-    STATE(1592), 1,
-      sym_match_keyword_pattern,
-  [68092] = 4,
+    ACTIONS(3020), 1,
+      anon_sym_COMMA,
+    STATE(1462), 1,
+      aux_sym_argument_list_repeat1,
+  [68360] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2757), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2972), 1,
+    ACTIONS(2912), 1,
       anon_sym_COMMA,
-    STATE(1440), 1,
-      aux_sym__import_list_repeat1,
-  [68105] = 4,
+    ACTIONS(3022), 1,
+      anon_sym_RBRACK,
+    STATE(1507), 1,
+      aux_sym_index_expression_list_repeat1,
+  [68373] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2471), 1,
+      sym_identifier,
+    STATE(1324), 1,
+      sym_dotted_name,
+    STATE(1429), 1,
+      sym_aliased_import,
+  [68386] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2975), 1,
+    ACTIONS(3024), 1,
       anon_sym_RPAREN,
-    ACTIONS(2977), 1,
+    ACTIONS(3026), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
+    STATE(1510), 1,
       aux_sym_argument_list_repeat1,
-  [68118] = 2,
+  [68399] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2979), 3,
-      sym__newline,
+    ACTIONS(3028), 1,
+      anon_sym_RPAREN,
+    ACTIONS(3030), 1,
       anon_sym_COMMA,
-      anon_sym_SEMI,
-  [68127] = 4,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [68412] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2981), 1,
-      anon_sym_COMMA,
-    ACTIONS(2984), 1,
-      anon_sym_RBRACK,
-    STATE(1443), 1,
-      aux_sym_index_expression_list_repeat1,
-  [68140] = 4,
+    ACTIONS(3032), 3,
+      anon_sym_LPAREN,
+      anon_sym_COLON,
+      anon_sym_EQ,
+  [68421] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2986), 1,
+    ACTIONS(3034), 1,
       anon_sym_RPAREN,
-    ACTIONS(2988), 1,
+    ACTIONS(3036), 1,
       anon_sym_COMMA,
-    STATE(1444), 1,
-      aux_sym_match_class_pattern_repeat2,
-  [68153] = 4,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [68434] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2900), 1,
+    ACTIONS(3038), 1,
       anon_sym_RPAREN,
-    ACTIONS(2991), 1,
+    ACTIONS(3040), 1,
       anon_sym_COMMA,
-    STATE(1483), 1,
-      aux_sym__parameters_repeat1,
-  [68166] = 3,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [68447] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2337), 1,
-      anon_sym_from,
-    ACTIONS(2341), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [68177] = 4,
+    ACTIONS(3042), 3,
+      anon_sym_LPAREN,
+      anon_sym_COLON,
+      anon_sym_EQ,
+  [68456] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
+    ACTIONS(3044), 1,
       anon_sym_COMMA,
-    ACTIONS(2129), 1,
-      anon_sym_RPAREN,
-    STATE(1471), 1,
-      aux_sym__collection_elements_repeat1,
-  [68190] = 4,
+    ACTIONS(3047), 1,
+      anon_sym_RBRACK,
+    STATE(1465), 1,
+      aux_sym_type_parameters_repeat1,
+  [68469] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2993), 1,
-      anon_sym_COMMA,
-    ACTIONS(2996), 1,
+    ACTIONS(2626), 1,
+      anon_sym_COLON2,
+    ACTIONS(3049), 1,
       anon_sym_RBRACE,
-    STATE(1448), 1,
-      aux_sym_dictionary_repeat1,
-  [68203] = 4,
+    STATE(1695), 1,
+      sym_format_specifier,
+  [68482] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2998), 1,
+    ACTIONS(2069), 1,
+      anon_sym_COLON,
+    ACTIONS(3051), 1,
       anon_sym_COMMA,
-    ACTIONS(3000), 1,
-      anon_sym_RBRACE,
-    STATE(1448), 1,
-      aux_sym_dictionary_repeat1,
-  [68216] = 4,
+    STATE(1530), 1,
+      aux_sym__parameters_repeat1,
+  [68495] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3002), 1,
+    ACTIONS(3053), 1,
       anon_sym_COMMA,
-    ACTIONS(3004), 1,
-      anon_sym_RBRACE,
-    STATE(1448), 1,
-      aux_sym_dictionary_repeat1,
-  [68229] = 4,
+    ACTIONS(3055), 1,
+      anon_sym_RBRACK,
+    STATE(1465), 1,
+      aux_sym_type_parameters_repeat1,
+  [68508] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2106), 1,
-      anon_sym_DOT,
-    ACTIONS(2170), 1,
-      anon_sym_COLON,
-    STATE(1039), 1,
-      aux_sym_match_value_pattern_repeat1,
-  [68242] = 4,
+    ACTIONS(2045), 1,
+      anon_sym_COMMA,
+    ACTIONS(3057), 1,
+      anon_sym_in,
+    STATE(1019), 1,
+      aux_sym__patterns_repeat1,
+  [68521] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2228), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2230), 1,
-      anon_sym_COMMA,
-    STATE(1457), 1,
-      aux_sym_argument_list_repeat1,
-  [68255] = 4,
+    ACTIONS(1538), 3,
+      sym__newline,
+      anon_sym_in,
+      anon_sym_SEMI,
+  [68530] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3006), 1,
+    ACTIONS(2182), 1,
       anon_sym_RPAREN,
-    ACTIONS(3008), 1,
+    ACTIONS(2184), 1,
       anon_sym_COMMA,
-    STATE(1458), 1,
+    STATE(1460), 1,
       aux_sym_argument_list_repeat1,
-  [68268] = 4,
+  [68543] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3010), 1,
+    ACTIONS(2045), 1,
       anon_sym_COMMA,
-    ACTIONS(3012), 1,
-      anon_sym_RBRACK,
-    STATE(1460), 1,
-      aux_sym_index_expression_list_repeat1,
-  [68281] = 4,
+    ACTIONS(3059), 1,
+      anon_sym_in,
+    STATE(1019), 1,
+      aux_sym__patterns_repeat1,
+  [68556] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
+    ACTIONS(3061), 1,
       anon_sym_COMMA,
-    ACTIONS(3014), 1,
+    ACTIONS(3063), 1,
+      anon_sym_COLON,
+    STATE(1509), 1,
+      aux_sym_with_clause_repeat1,
+  [68569] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2910), 1,
+      sym_identifier,
+    ACTIONS(3065), 1,
       anon_sym_RPAREN,
-    STATE(1309), 1,
-      aux_sym__collection_elements_repeat1,
-  [68294] = 4,
+    STATE(1569), 1,
+      sym_match_keyword_pattern,
+  [68582] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3016), 1,
+    ACTIONS(3067), 1,
+      anon_sym_in,
+    ACTIONS(3069), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [68593] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2069), 1,
       anon_sym_RPAREN,
-    ACTIONS(3018), 1,
+    ACTIONS(3071), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
-      aux_sym_argument_list_repeat1,
-  [68307] = 4,
+    STATE(1432), 1,
+      aux_sym__parameters_repeat1,
+  [68606] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3020), 1,
+    ACTIONS(3065), 1,
       anon_sym_RPAREN,
-    ACTIONS(3022), 1,
+    ACTIONS(3073), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
-      aux_sym_argument_list_repeat1,
-  [68320] = 4,
+    STATE(1418), 1,
+      aux_sym_match_class_pattern_repeat2,
+  [68619] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3024), 1,
+    ACTIONS(2910), 1,
+      sym_identifier,
+    ACTIONS(3075), 1,
+      anon_sym_RPAREN,
+    STATE(1569), 1,
+      sym_match_keyword_pattern,
+  [68632] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1480), 3,
       anon_sym_RPAREN,
-    ACTIONS(3026), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
-      aux_sym_argument_list_repeat1,
-  [68333] = 4,
+      anon_sym_COLON,
+  [68641] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3028), 1,
+    ACTIONS(3077), 1,
       anon_sym_RPAREN,
-    ACTIONS(3030), 1,
+    ACTIONS(3079), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
+    STATE(1510), 1,
       aux_sym_argument_list_repeat1,
-  [68346] = 4,
+  [68654] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3032), 1,
-      anon_sym_COMMA,
-    ACTIONS(3034), 1,
-      anon_sym_RBRACK,
-    STATE(1443), 1,
-      aux_sym_index_expression_list_repeat1,
-  [68359] = 4,
+    ACTIONS(2650), 1,
+      anon_sym_LPAREN,
+    ACTIONS(3081), 1,
+      anon_sym_COLON,
+    STATE(1638), 1,
+      sym_argument_list,
+  [68667] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2180), 1,
+    ACTIONS(2933), 1,
+      anon_sym_if,
+    ACTIONS(3083), 1,
+      anon_sym_COLON,
+    STATE(1651), 1,
+      sym_guard,
+  [68680] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3085), 1,
       anon_sym_RPAREN,
-    STATE(1471), 1,
-      aux_sym__collection_elements_repeat1,
-  [68372] = 4,
+    ACTIONS(3087), 1,
+      anon_sym_COMMA,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [68693] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2473), 1,
+    ACTIONS(1916), 1,
+      anon_sym_RPAREN,
+    ACTIONS(2910), 1,
       sym_identifier,
-    ACTIONS(3036), 1,
-      anon_sym_import,
-    STATE(1709), 1,
-      sym_dotted_name,
-  [68385] = 3,
-    ACTIONS(2086), 1,
-      sym_comment,
-    ACTIONS(2558), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2560), 2,
-      anon_sym_LBRACE2,
-      aux_sym_format_specifier_token1,
-  [68396] = 4,
+    STATE(1569), 1,
+      sym_match_keyword_pattern,
+  [68706] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2090), 1,
-      anon_sym_COMMA,
-    ACTIONS(2218), 1,
+    ACTIONS(3089), 1,
       anon_sym_RPAREN,
-    STATE(1471), 1,
-      aux_sym__collection_elements_repeat1,
-  [68409] = 4,
+    ACTIONS(3091), 1,
+      anon_sym_COMMA,
+    STATE(1505), 1,
+      aux_sym_with_clause_repeat1,
+  [68719] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2580), 1,
-      sym_identifier,
-    STATE(1438), 1,
-      sym_dotted_name,
-    STATE(1600), 1,
-      sym_aliased_import,
-  [68422] = 4,
+    ACTIONS(2451), 3,
+      sym__newline,
+      anon_sym_EQ,
+      anon_sym_SEMI,
+  [68728] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3038), 1,
+    ACTIONS(3093), 3,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    ACTIONS(3040), 1,
+      anon_sym_COLON,
+  [68737] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3095), 1,
+      anon_sym_EQ,
+    ACTIONS(3097), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [68748] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2654), 1,
+      anon_sym_LBRACK,
+    ACTIONS(3099), 1,
+      anon_sym_EQ,
+    STATE(1722), 1,
+      sym_type_parameters,
+  [68761] = 3,
+    ACTIONS(2086), 1,
+      sym_comment,
+    ACTIONS(2534), 1,
       anon_sym_RBRACE,
-    STATE(1448), 1,
-      aux_sym_dictionary_repeat1,
-  [68435] = 4,
+    ACTIONS(2536), 2,
+      anon_sym_LBRACE2,
+      aux_sym_format_specifier_token1,
+  [68772] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2646), 1,
+    ACTIONS(2662), 1,
       anon_sym_RPAREN,
-    ACTIONS(2809), 1,
+    ACTIONS(2852), 1,
       anon_sym_COMMA,
-    STATE(1414), 1,
+    STATE(1420), 1,
       aux_sym__import_list_repeat1,
-  [68448] = 4,
+  [68785] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2232), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2234), 1,
+    ACTIONS(3101), 1,
       anon_sym_COMMA,
-    STATE(1521), 1,
-      aux_sym_argument_list_repeat1,
-  [68461] = 4,
+    ACTIONS(3103), 1,
+      anon_sym_RBRACK,
+    STATE(1468), 1,
+      aux_sym_type_parameters_repeat1,
+  [68798] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3042), 1,
+    ACTIONS(1916), 1,
       anon_sym_RPAREN,
-    ACTIONS(3044), 1,
+    ACTIONS(3105), 1,
       anon_sym_COMMA,
-    STATE(1475), 1,
-      aux_sym_argument_list_repeat1,
-  [68474] = 4,
+    STATE(1418), 1,
+      aux_sym_match_class_pattern_repeat2,
+  [68811] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3010), 1,
+    ACTIONS(2854), 1,
+      anon_sym_as,
+    ACTIONS(2716), 2,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    ACTIONS(3046), 1,
-      anon_sym_RBRACK,
-    STATE(1460), 1,
-      aux_sym_index_expression_list_repeat1,
-  [68487] = 4,
+  [68822] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2679), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3048), 1,
+    ACTIONS(3107), 1,
       anon_sym_COMMA,
-    STATE(1311), 1,
-      aux_sym__collection_elements_repeat1,
-  [68500] = 4,
+    ACTIONS(3110), 1,
+      anon_sym_RBRACE,
+    STATE(1495), 1,
+      aux_sym_match_mapping_pattern_repeat1,
+  [68835] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3050), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3052), 1,
+    ACTIONS(3112), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
-      aux_sym_argument_list_repeat1,
-  [68513] = 4,
+    ACTIONS(3114), 1,
+      anon_sym_RBRACE,
+    STATE(1532), 1,
+      aux_sym_dictionary_repeat1,
+  [68848] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3054), 1,
+    ACTIONS(3116), 1,
       anon_sym_RPAREN,
-    ACTIONS(3056), 1,
+    ACTIONS(3118), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
-      aux_sym_argument_list_repeat1,
-  [68526] = 4,
+    STATE(1476), 1,
+      aux_sym__parameters_repeat1,
+  [68861] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3058), 1,
+    ACTIONS(2885), 1,
+      anon_sym_EQ,
+    ACTIONS(2881), 2,
       anon_sym_COMMA,
-    ACTIONS(3060), 1,
       anon_sym_COLON,
-    STATE(1400), 1,
-      aux_sym_with_clause_repeat1,
-  [68539] = 4,
+  [68872] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3062), 1,
+    ACTIONS(2898), 1,
       anon_sym_RPAREN,
-    ACTIONS(3064), 1,
+    ACTIONS(3120), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
-      aux_sym_argument_list_repeat1,
-  [68552] = 4,
+    STATE(1499), 1,
+      aux_sym__import_list_repeat1,
+  [68885] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3066), 1,
+    ACTIONS(2218), 1,
       anon_sym_RPAREN,
-    ACTIONS(3068), 1,
+    ACTIONS(2220), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
+    STATE(1445), 1,
       aux_sym_argument_list_repeat1,
-  [68565] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3070), 1,
-      anon_sym_COMMA,
-    ACTIONS(3073), 1,
-      anon_sym_RBRACE,
-    STATE(1477), 1,
-      aux_sym_match_mapping_pattern_repeat1,
-  [68578] = 4,
+  [68898] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3058), 1,
+    ACTIONS(2138), 1,
       anon_sym_COMMA,
-    ACTIONS(3075), 1,
-      anon_sym_COLON,
-    STATE(1474), 1,
-      aux_sym_with_clause_repeat1,
-  [68591] = 4,
+    ACTIONS(3123), 1,
+      anon_sym_RPAREN,
+    STATE(1313), 1,
+      aux_sym__collection_elements_repeat1,
+  [68911] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3077), 1,
+    ACTIONS(1904), 1,
+      anon_sym_RPAREN,
+    ACTIONS(3125), 1,
       anon_sym_COMMA,
-    ACTIONS(3079), 1,
-      anon_sym_RBRACE,
-    STATE(1448), 1,
-      aux_sym_dictionary_repeat1,
-  [68604] = 4,
+    STATE(1279), 1,
+      aux_sym_open_sequence_match_pattern_repeat1,
+  [68924] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1910), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3081), 1,
+    ACTIONS(1904), 1,
+      anon_sym_RBRACK,
+    ACTIONS(3127), 1,
       anon_sym_COMMA,
-    STATE(1280), 1,
+    STATE(1279), 1,
       aux_sym_open_sequence_match_pattern_repeat1,
-  [68617] = 4,
+  [68937] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2067), 1,
+    ACTIONS(2094), 1,
+      anon_sym_DOT,
+    ACTIONS(2098), 1,
       anon_sym_COLON,
-    ACTIONS(3083), 1,
-      anon_sym_COMMA,
-    STATE(1487), 1,
-      aux_sym__parameters_repeat1,
-  [68630] = 4,
+    STATE(1039), 1,
+      aux_sym_match_value_pattern_repeat1,
+  [68950] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2194), 1,
+    ACTIONS(1018), 1,
       anon_sym_RPAREN,
-    ACTIONS(2196), 1,
+    ACTIONS(3129), 1,
       anon_sym_COMMA,
-    STATE(1473), 1,
-      aux_sym_argument_list_repeat1,
-  [68643] = 4,
+    STATE(1398), 1,
+      aux_sym_with_clause_repeat1,
+  [68963] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2067), 1,
+    ACTIONS(3131), 1,
       anon_sym_RPAREN,
-    ACTIONS(3085), 1,
+    ACTIONS(3133), 1,
       anon_sym_COMMA,
-    STATE(1519), 1,
-      aux_sym__parameters_repeat1,
-  [68656] = 4,
+    STATE(1448), 1,
+      aux_sym_argument_list_repeat1,
+  [68976] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3087), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3089), 1,
+    ACTIONS(3135), 1,
       anon_sym_COMMA,
-    STATE(1513), 1,
-      aux_sym_with_clause_repeat1,
-  [68669] = 2,
+    ACTIONS(3137), 1,
+      anon_sym_RBRACK,
+    STATE(1527), 1,
+      aux_sym_index_expression_list_repeat1,
+  [68989] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1546), 3,
-      sym__newline,
-      anon_sym_in,
-      anon_sym_SEMI,
-  [68678] = 4,
+    ACTIONS(1969), 1,
+      anon_sym_RBRACE,
+    ACTIONS(3139), 1,
+      anon_sym_COMMA,
+    STATE(1495), 1,
+      aux_sym_match_mapping_pattern_repeat1,
+  [69002] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2222), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2224), 1,
+    ACTIONS(3061), 1,
       anon_sym_COMMA,
-    STATE(1413), 1,
-      aux_sym_argument_list_repeat1,
-  [68691] = 4,
+    ACTIONS(3141), 1,
+      anon_sym_COLON,
+    STATE(1398), 1,
+      aux_sym_with_clause_repeat1,
+  [69015] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2970), 1,
-      anon_sym_COLON,
-    ACTIONS(3091), 1,
+    ACTIONS(3143), 1,
+      anon_sym_RPAREN,
+    ACTIONS(3145), 1,
       anon_sym_COMMA,
-    STATE(1487), 1,
-      aux_sym__parameters_repeat1,
-  [68704] = 4,
+    STATE(1510), 1,
+      aux_sym_argument_list_repeat1,
+  [69028] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3094), 1,
+    ACTIONS(2874), 3,
       anon_sym_RPAREN,
-    ACTIONS(3096), 1,
       anon_sym_COMMA,
-    STATE(1500), 1,
-      aux_sym_match_class_pattern_repeat1,
-  [68717] = 4,
+      anon_sym_COLON,
+  [69037] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3098), 1,
+    ACTIONS(2912), 1,
       anon_sym_COMMA,
-    ACTIONS(3100), 1,
+    ACTIONS(3148), 1,
       anon_sym_RBRACK,
-    STATE(1528), 1,
-      aux_sym_open_sequence_match_pattern_repeat1,
-  [68730] = 4,
+    STATE(1507), 1,
+      aux_sym_index_expression_list_repeat1,
+  [69050] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3102), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3104), 1,
+    ACTIONS(2721), 3,
+      sym__newline,
       anon_sym_COMMA,
-    STATE(1434), 1,
-      aux_sym_argument_list_repeat1,
-  [68743] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2618), 1,
-      anon_sym_LPAREN,
-    ACTIONS(3106), 1,
-      anon_sym_COLON,
-    STATE(1634), 1,
-      sym_argument_list,
-  [68756] = 4,
+      anon_sym_SEMI,
+  [69059] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2638), 1,
-      anon_sym_COLON2,
-    ACTIONS(3108), 1,
-      anon_sym_RBRACE,
-    STATE(1621), 1,
-      sym_format_specifier,
-  [68769] = 4,
+    ACTIONS(2329), 1,
+      anon_sym_from,
+    ACTIONS(2333), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [69070] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3094), 1,
+    ACTIONS(3150), 3,
       anon_sym_RPAREN,
-    ACTIONS(3110), 1,
       anon_sym_COMMA,
-    STATE(1506), 1,
-      aux_sym_match_class_pattern_repeat2,
-  [68782] = 2,
+      anon_sym_COLON,
+  [69079] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2742), 3,
+    ACTIONS(2955), 3,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_COLON,
-  [68791] = 4,
+  [69088] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2902), 1,
-      anon_sym_if,
-    ACTIONS(3112), 1,
+    ACTIONS(3116), 1,
       anon_sym_COLON,
-    STATE(1647), 1,
-      sym_guard,
-  [68804] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2232), 1,
-      anon_sym_RPAREN,
-    ACTIONS(2234), 1,
+    ACTIONS(3152), 1,
       anon_sym_COMMA,
-    STATE(1523), 1,
-      aux_sym_argument_list_repeat1,
-  [68817] = 4,
+    STATE(1467), 1,
+      aux_sym__parameters_repeat1,
+  [69101] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3114), 1,
+    ACTIONS(2881), 3,
       anon_sym_RPAREN,
-    ACTIONS(3116), 1,
       anon_sym_COMMA,
-    STATE(1525), 1,
-      aux_sym_argument_list_repeat1,
-  [68830] = 4,
+      anon_sym_COLON,
+  [69110] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3118), 1,
+    ACTIONS(2138), 1,
       anon_sym_COMMA,
-    ACTIONS(3120), 1,
-      anon_sym_RBRACE,
-    STATE(1423), 1,
-      aux_sym_match_mapping_pattern_repeat1,
-  [68843] = 3,
-    ACTIONS(2086), 1,
-      sym_comment,
-    ACTIONS(3122), 1,
-      anon_sym_RBRACE,
-    ACTIONS(3124), 2,
-      anon_sym_LBRACE2,
-      aux_sym_format_specifier_token1,
-  [68854] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1914), 1,
+    ACTIONS(2230), 1,
       anon_sym_RPAREN,
-    ACTIONS(3126), 1,
-      anon_sym_COMMA,
-    STATE(1427), 1,
-      aux_sym_match_class_pattern_repeat1,
-  [68867] = 4,
+    STATE(1531), 1,
+      aux_sym__collection_elements_repeat1,
+  [69123] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3010), 1,
+    ACTIONS(3154), 1,
+      anon_sym_COLON,
+    ACTIONS(2881), 2,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-    ACTIONS(3128), 1,
-      anon_sym_RBRACK,
-    STATE(1460), 1,
-      aux_sym_index_expression_list_repeat1,
-  [68880] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2638), 1,
-      anon_sym_COLON2,
-    ACTIONS(2797), 1,
-      anon_sym_RBRACE,
-    STATE(1741), 1,
-      sym_format_specifier,
-  [68893] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2413), 1,
-      sym_identifier,
-    STATE(1329), 1,
-      sym_dotted_name,
-    STATE(1428), 1,
-      sym_aliased_import,
-  [68906] = 4,
+  [69134] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2031), 1,
+    ACTIONS(1918), 1,
+      anon_sym_RPAREN,
+    ACTIONS(3156), 1,
       anon_sym_COMMA,
-    ACTIONS(3130), 1,
-      anon_sym_in,
-    STATE(1018), 1,
-      aux_sym__patterns_repeat1,
-  [68919] = 4,
+    STATE(1451), 1,
+      aux_sym_match_class_pattern_repeat2,
+  [69147] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1914), 1,
+    ACTIONS(3158), 1,
       anon_sym_RPAREN,
-    ACTIONS(2936), 1,
-      sym_identifier,
-    STATE(1592), 1,
-      sym_match_keyword_pattern,
-  [68932] = 4,
+    ACTIONS(3160), 1,
+      anon_sym_COMMA,
+    STATE(1536), 1,
+      aux_sym_match_class_pattern_repeat1,
+  [69160] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1914), 1,
+    ACTIONS(3158), 1,
       anon_sym_RPAREN,
-    ACTIONS(3132), 1,
+    ACTIONS(3162), 1,
       anon_sym_COMMA,
-    STATE(1444), 1,
+    STATE(1493), 1,
       aux_sym_match_class_pattern_repeat2,
-  [68945] = 3,
+  [69173] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3134), 1,
-      anon_sym_COLON,
-    ACTIONS(2853), 2,
+    ACTIONS(2186), 1,
       anon_sym_RPAREN,
+    ACTIONS(2188), 1,
       anon_sym_COMMA,
-  [68956] = 3,
-    ACTIONS(2086), 1,
-      sym_comment,
-    ACTIONS(2562), 1,
-      anon_sym_RBRACE,
-    ACTIONS(2564), 2,
-      anon_sym_LBRACE2,
-      aux_sym_format_specifier_token1,
-  [68967] = 2,
+    STATE(1447), 1,
+      aux_sym_argument_list_repeat1,
+  [69186] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1550), 3,
-      sym__newline,
-      anon_sym_in,
-      anon_sym_SEMI,
-  [68976] = 2,
+    ACTIONS(3164), 1,
+      anon_sym_RPAREN,
+    ACTIONS(3166), 1,
+      anon_sym_COMMA,
+    STATE(1480), 1,
+      aux_sym_argument_list_repeat1,
+  [69199] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3136), 3,
+    ACTIONS(3168), 3,
       anon_sym_LPAREN,
       anon_sym_COLON,
       anon_sym_EQ,
-  [68985] = 4,
+  [69208] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3138), 1,
+    ACTIONS(3170), 1,
       anon_sym_COMMA,
-    ACTIONS(3141), 1,
+    ACTIONS(3173), 1,
       anon_sym_RBRACK,
-    STATE(1511), 1,
-      aux_sym_type_parameters_repeat1,
-  [68998] = 2,
+    STATE(1527), 1,
+      aux_sym_index_expression_list_repeat1,
+  [69221] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3143), 3,
+    ACTIONS(3175), 1,
       anon_sym_RPAREN,
+    ACTIONS(3177), 1,
       anon_sym_COMMA,
+    STATE(1528), 1,
+      aux_sym_match_class_pattern_repeat1,
+  [69234] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2650), 1,
+      anon_sym_LPAREN,
+    ACTIONS(3180), 1,
+      anon_sym_COLON,
+    STATE(1617), 1,
+      sym_argument_list,
+  [69247] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2955), 1,
       anon_sym_COLON,
-  [69007] = 4,
+    ACTIONS(3182), 1,
+      anon_sym_COMMA,
+    STATE(1530), 1,
+      aux_sym__parameters_repeat1,
+  [69260] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1018), 1,
+    ACTIONS(2618), 1,
       anon_sym_RPAREN,
-    ACTIONS(3145), 1,
+    ACTIONS(3185), 1,
       anon_sym_COMMA,
-    STATE(1400), 1,
-      aux_sym_with_clause_repeat1,
-  [69020] = 4,
+    STATE(1302), 1,
+      aux_sym__collection_elements_repeat1,
+  [69273] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3147), 1,
-      sym_identifier,
-    ACTIONS(3149), 1,
-      sym_match_wildcard_pattern,
-    STATE(1312), 1,
-      sym_match_capture_pattern,
-  [69033] = 4,
+    ACTIONS(3187), 1,
+      anon_sym_COMMA,
+    ACTIONS(3190), 1,
+      anon_sym_RBRACE,
+    STATE(1532), 1,
+      aux_sym_dictionary_repeat1,
+  [69286] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2031), 1,
+    ACTIONS(2045), 1,
       anon_sym_COMMA,
-    ACTIONS(3151), 1,
+    ACTIONS(3192), 1,
       anon_sym_in,
-    STATE(1018), 1,
+    STATE(1019), 1,
       aux_sym__patterns_repeat1,
-  [69046] = 3,
+  [69299] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2857), 1,
-      anon_sym_EQ,
-    ACTIONS(2853), 2,
+    ACTIONS(2045), 1,
       anon_sym_COMMA,
-      anon_sym_COLON,
-  [69057] = 3,
+    ACTIONS(3194), 1,
+      anon_sym_in,
+    STATE(1019), 1,
+      aux_sym__patterns_repeat1,
+  [69312] = 3,
     ACTIONS(2086), 1,
       sym_comment,
-    ACTIONS(2591), 1,
+    ACTIONS(2549), 1,
       anon_sym_RBRACE,
-    ACTIONS(2593), 2,
+    ACTIONS(2551), 2,
       anon_sym_LBRACE2,
       aux_sym_format_specifier_token1,
-  [69068] = 4,
+  [69323] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3010), 1,
+    ACTIONS(1916), 1,
+      anon_sym_RPAREN,
+    ACTIONS(3196), 1,
+      anon_sym_COMMA,
+    STATE(1528), 1,
+      aux_sym_match_class_pattern_repeat1,
+  [69336] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2636), 2,
       anon_sym_COMMA,
-    ACTIONS(3153), 1,
       anon_sym_RBRACK,
-    STATE(1460), 1,
-      aux_sym_index_expression_list_repeat1,
-  [69081] = 4,
+  [69344] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2970), 1,
+    ACTIONS(2976), 2,
       anon_sym_RPAREN,
-    ACTIONS(3155), 1,
       anon_sym_COMMA,
-    STATE(1519), 1,
-      aux_sym__parameters_repeat1,
-  [69094] = 4,
+  [69352] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2618), 1,
-      anon_sym_LPAREN,
-    ACTIONS(3158), 1,
-      anon_sym_COLON,
-    STATE(1663), 1,
-      sym_argument_list,
-  [69107] = 4,
+    ACTIONS(2253), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [69360] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3160), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3162), 1,
-      anon_sym_COMMA,
-    STATE(1430), 1,
-      aux_sym_argument_list_repeat1,
-  [69120] = 2,
+    ACTIONS(3198), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [69368] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2881), 3,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-  [69129] = 4,
+    ACTIONS(3200), 1,
+      sym_identifier,
+    STATE(1594), 1,
+      sym_match_capture_pattern,
+  [69378] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3164), 1,
+    ACTIONS(2690), 2,
       anon_sym_RPAREN,
-    ACTIONS(3166), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
-      aux_sym_argument_list_repeat1,
-  [69142] = 2,
+  [69386] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3168), 3,
+    ACTIONS(3202), 2,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_COLON,
-  [69151] = 4,
+  [69394] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3170), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3172), 1,
-      anon_sym_COMMA,
-    STATE(1430), 1,
-      aux_sym_argument_list_repeat1,
-  [69164] = 4,
+    ACTIONS(2094), 1,
+      anon_sym_DOT,
+    STATE(1504), 1,
+      aux_sym_match_value_pattern_repeat1,
+  [69404] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3174), 1,
-      anon_sym_RPAREN,
-    ACTIONS(3176), 1,
+    ACTIONS(2992), 1,
+      anon_sym_RBRACE,
+    ACTIONS(3204), 1,
       anon_sym_COMMA,
-    STATE(1430), 1,
-      aux_sym_argument_list_repeat1,
-  [69177] = 4,
+  [69414] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2638), 1,
-      anon_sym_COLON2,
-    ACTIONS(3178), 1,
-      anon_sym_RBRACE,
-    STATE(1656), 1,
-      sym_format_specifier,
-  [69190] = 4,
+    ACTIONS(3206), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [69422] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1910), 1,
-      anon_sym_RBRACK,
-    ACTIONS(3180), 1,
-      anon_sym_COMMA,
-    STATE(1280), 1,
-      aux_sym_open_sequence_match_pattern_repeat1,
-  [69203] = 2,
+    ACTIONS(3208), 1,
+      sym_integer,
+    ACTIONS(3210), 1,
+      sym_float,
+  [69432] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2489), 3,
+    ACTIONS(3212), 2,
       sym__newline,
-      anon_sym_EQ,
       anon_sym_SEMI,
-  [69212] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2031), 1,
-      anon_sym_COMMA,
-    ACTIONS(3182), 1,
-      anon_sym_in,
-    STATE(1018), 1,
-      aux_sym__patterns_repeat1,
-  [69225] = 4,
+  [69440] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2031), 1,
-      anon_sym_COMMA,
-    ACTIONS(3184), 1,
-      anon_sym_in,
-    STATE(1018), 1,
-      aux_sym__patterns_repeat1,
-  [69238] = 4,
+    ACTIONS(2465), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [69448] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2031), 1,
-      anon_sym_COMMA,
-    ACTIONS(3186), 1,
-      anon_sym_in,
-    STATE(1018), 1,
-      aux_sym__patterns_repeat1,
-  [69251] = 2,
+    ACTIONS(3214), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [69456] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1088), 2,
+    ACTIONS(1028), 2,
       anon_sym_except,
       anon_sym_finally,
-  [69259] = 2,
+  [69464] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3188), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [69267] = 2,
+    ACTIONS(3216), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [69472] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3190), 2,
+    ACTIONS(3218), 2,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [69275] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3192), 2,
-      anon_sym_COLON,
-      anon_sym_DASH_GT,
-  [69283] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3194), 1,
-      sym_identifier,
-    STATE(1609), 1,
-      sym_match_capture_pattern,
-  [69293] = 3,
+  [69480] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3196), 1,
-      anon_sym_COLON,
-    ACTIONS(3198), 1,
-      anon_sym_DASH_GT,
-  [69303] = 2,
+    ACTIONS(3220), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [69488] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2710), 2,
-      anon_sym_RPAREN,
+    ACTIONS(3222), 2,
       anon_sym_COMMA,
-  [69311] = 2,
+      anon_sym_RBRACK,
+  [69496] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3200), 2,
-      anon_sym_RPAREN,
+    ACTIONS(3224), 2,
       anon_sym_COMMA,
-  [69319] = 3,
+      anon_sym_RBRACK,
+  [69504] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3202), 1,
-      anon_sym_COLON,
-    ACTIONS(3204), 1,
-      anon_sym_DASH_GT,
-  [69329] = 2,
+    ACTIONS(2331), 1,
+      anon_sym_COMMA,
+    STATE(1321), 1,
+      aux_sym_expression_list_repeat1,
+  [69514] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2979), 2,
+    ACTIONS(3175), 2,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-  [69337] = 3,
+  [69522] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2106), 1,
-      anon_sym_DOT,
-    STATE(1451), 1,
-      aux_sym_match_value_pattern_repeat1,
-  [69347] = 3,
+    ACTIONS(3226), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [69530] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3206), 1,
-      anon_sym_COLON,
-    ACTIONS(3208), 1,
-      anon_sym_DASH_GT,
-  [69357] = 2,
+    ACTIONS(3228), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [69538] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2433), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [69365] = 3,
+    ACTIONS(1048), 2,
+      anon_sym_except,
+      anon_sym_finally,
+  [69546] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3210), 1,
-      anon_sym_COLON,
-    ACTIONS(3212), 1,
-      anon_sym_DASH_GT,
-  [69375] = 3,
+    ACTIONS(2335), 1,
+      anon_sym_COMMA,
+    STATE(1271), 1,
+      aux_sym_expression_list_repeat1,
+  [69556] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2465), 1,
-      anon_sym_as,
-    ACTIONS(2467), 1,
-      anon_sym_COLON,
-  [69385] = 3,
+    ACTIONS(3230), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [69564] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3214), 1,
-      anon_sym_COLON,
-    ACTIONS(3216), 1,
-      anon_sym_DASH_GT,
-  [69395] = 2,
+    ACTIONS(3232), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [69572] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3218), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-  [69403] = 2,
+    ACTIONS(3234), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [69580] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3220), 2,
-      anon_sym_COLON,
-      anon_sym_DASH_GT,
-  [69411] = 3,
+    ACTIONS(3236), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [69588] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2469), 1,
-      anon_sym_as,
-    ACTIONS(2471), 1,
-      anon_sym_COLON,
-  [69421] = 2,
+    ACTIONS(2910), 1,
+      sym_identifier,
+    STATE(1569), 1,
+      sym_match_keyword_pattern,
+  [69598] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3222), 2,
+    ACTIONS(3238), 2,
       sym__newline,
       anon_sym_SEMI,
-  [69429] = 3,
+  [69606] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3120), 1,
-      anon_sym_RBRACE,
-    ACTIONS(3224), 1,
+    ACTIONS(2920), 2,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-  [69439] = 2,
+  [69614] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2497), 2,
+    ACTIONS(2503), 2,
       sym__newline,
       anon_sym_SEMI,
-  [69447] = 3,
+  [69622] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1989), 1,
-      anon_sym_RBRACE,
-    ACTIONS(3226), 1,
+    ACTIONS(3240), 1,
       anon_sym_COMMA,
-  [69457] = 3,
+    STATE(1371), 1,
+      aux_sym_open_sequence_match_pattern_repeat1,
+  [69632] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3228), 1,
-      sym_integer,
-    ACTIONS(3230), 1,
-      sym_float,
-  [69467] = 2,
+    ACTIONS(3242), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [69640] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3073), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-  [69475] = 2,
+    ACTIONS(3244), 1,
+      anon_sym_COLON,
+    ACTIONS(3246), 1,
+      anon_sym_DASH_GT,
+  [69650] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2948), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [69483] = 2,
+    ACTIONS(3248), 1,
+      anon_sym_COLON,
+    ACTIONS(3250), 1,
+      anon_sym_DASH_GT,
+  [69660] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3232), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [69491] = 3,
+    ACTIONS(3252), 1,
+      anon_sym_COLON,
+    ACTIONS(3254), 1,
+      anon_sym_DASH_GT,
+  [69670] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3234), 1,
+    ACTIONS(3256), 1,
       anon_sym_COLON,
-    ACTIONS(3236), 1,
+    ACTIONS(3258), 1,
       anon_sym_DASH_GT,
-  [69501] = 2,
+  [69680] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3238), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [69509] = 2,
+    ACTIONS(3260), 1,
+      sym_integer,
+    ACTIONS(3262), 1,
+      sym_float,
+  [69690] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3240), 2,
+    ACTIONS(1958), 1,
+      anon_sym_RBRACE,
+    ACTIONS(3264), 1,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [69517] = 2,
+  [69700] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3242), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [69525] = 3,
+    ACTIONS(3266), 2,
+      sym__newline,
+      anon_sym_SEMI,
+  [69708] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2439), 1,
+    ACTIONS(2495), 1,
       anon_sym_as,
-    ACTIONS(2441), 1,
+    ACTIONS(2497), 1,
       anon_sym_COLON,
-  [69535] = 2,
+  [69718] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3244), 2,
+    ACTIONS(3268), 2,
       sym__newline,
       anon_sym_SEMI,
-  [69543] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2702), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [69551] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3246), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-  [69559] = 3,
+  [69726] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3248), 1,
+    ACTIONS(3110), 2,
       anon_sym_COMMA,
-    ACTIONS(3250), 1,
       anon_sym_RBRACE,
-  [69569] = 2,
+  [69734] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2276), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [69577] = 2,
+    ACTIONS(3270), 2,
+      anon_sym_COLON,
+      anon_sym_DASH_GT,
+  [69742] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3252), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [69585] = 2,
+    ACTIONS(2467), 1,
+      anon_sym_as,
+    ACTIONS(2469), 1,
+      anon_sym_COLON,
+  [69752] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3254), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [69593] = 3,
+    ACTIONS(3272), 1,
+      anon_sym_COLON,
+    ACTIONS(3274), 1,
+      anon_sym_DASH_GT,
+  [69762] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2877), 1,
+    ACTIONS(2737), 1,
       anon_sym_LPAREN,
-    STATE(1576), 1,
+    STATE(1588), 1,
       sym_parameters,
-  [69603] = 3,
+  [69772] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2393), 1,
+    ACTIONS(2236), 1,
       anon_sym_COMMA,
     STATE(1273), 1,
       aux_sym_expression_list_repeat1,
-  [69613] = 3,
+  [69782] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2877), 1,
-      anon_sym_LPAREN,
-    STATE(1560), 1,
-      sym_parameters,
-  [69623] = 2,
+    ACTIONS(3276), 1,
+      anon_sym_COLON,
+    ACTIONS(3278), 1,
+      anon_sym_DASH_GT,
+  [69792] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3256), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [69631] = 3,
+    ACTIONS(1044), 2,
+      anon_sym_except,
+      anon_sym_finally,
+  [69800] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3258), 1,
+    ACTIONS(3280), 1,
       anon_sym_COLON,
-    ACTIONS(3260), 1,
+    ACTIONS(3282), 1,
       anon_sym_DASH_GT,
-  [69641] = 2,
+  [69810] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3262), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [69649] = 2,
+    ACTIONS(3284), 1,
+      anon_sym_COLON,
+    ACTIONS(3286), 1,
+      anon_sym_DASH_GT,
+  [69820] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2715), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [69657] = 2,
+    ACTIONS(3288), 1,
+      sym_integer,
+    ACTIONS(3290), 1,
+      sym_float,
+  [69830] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3264), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [69665] = 2,
+    ACTIONS(2737), 1,
+      anon_sym_LPAREN,
+    STATE(1590), 1,
+      sym_parameters,
+  [69840] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3266), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [69673] = 2,
+    ACTIONS(3292), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+  [69848] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3268), 2,
+    ACTIONS(3294), 2,
       sym__newline,
       anon_sym_SEMI,
-  [69681] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1054), 2,
-      anon_sym_except,
-      anon_sym_finally,
-  [69689] = 2,
+  [69856] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1022), 2,
-      anon_sym_except,
-      anon_sym_finally,
-  [69697] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3270), 2,
+    ACTIONS(3296), 2,
       sym__newline,
       anon_sym_SEMI,
-  [69705] = 2,
+  [69864] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3272), 2,
+    ACTIONS(3298), 2,
       sym__newline,
       anon_sym_SEMI,
-  [69713] = 2,
+  [69872] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3274), 2,
+    ACTIONS(2463), 2,
       sym__newline,
       anon_sym_SEMI,
-  [69721] = 3,
+  [69880] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3276), 1,
-      sym_integer,
-    ACTIONS(3278), 1,
-      sym_float,
-  [69731] = 3,
+    ACTIONS(3300), 2,
+      anon_sym_COLON,
+      anon_sym_DASH_GT,
+  [69888] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2260), 1,
-      anon_sym_COMMA,
-    STATE(1272), 1,
-      aux_sym_expression_list_repeat1,
-  [69741] = 2,
+    ACTIONS(2429), 1,
+      anon_sym_as,
+    ACTIONS(2431), 1,
+      anon_sym_COLON,
+  [69898] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3280), 2,
+    ACTIONS(3302), 2,
       sym__newline,
       anon_sym_SEMI,
-  [69749] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2339), 1,
-      anon_sym_COMMA,
-    STATE(1286), 1,
-      aux_sym_expression_list_repeat1,
-  [69759] = 2,
+  [69906] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2491), 2,
+    ACTIONS(3304), 2,
       sym__newline,
       anon_sym_SEMI,
-  [69767] = 2,
+  [69914] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2986), 2,
-      anon_sym_RPAREN,
+    ACTIONS(2937), 1,
       anon_sym_COMMA,
-  [69775] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2936), 1,
-      sym_identifier,
-    STATE(1592), 1,
-      sym_match_keyword_pattern,
-  [69785] = 3,
+    ACTIONS(3306), 1,
+      anon_sym_RPAREN,
+  [69924] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2399), 1,
-      anon_sym_as,
-    ACTIONS(2403), 1,
-      anon_sym_COLON,
-  [69795] = 3,
+    ACTIONS(3308), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [69932] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3282), 1,
+    ACTIONS(3310), 1,
       anon_sym_COMMA,
-    STATE(1382), 1,
+    STATE(1502), 1,
       aux_sym_open_sequence_match_pattern_repeat1,
-  [69805] = 2,
+  [69942] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3284), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [69813] = 3,
+    ACTIONS(3312), 1,
+      anon_sym_COMMA,
+    ACTIONS(3314), 1,
+      anon_sym_RBRACE,
+  [69952] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2877), 1,
+    ACTIONS(2737), 1,
       anon_sym_LPAREN,
-    STATE(1544), 1,
+    STATE(1575), 1,
       sym_parameters,
-  [69823] = 2,
+  [69962] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1026), 2,
-      anon_sym_except,
-      anon_sym_finally,
-  [69831] = 3,
+    ACTIONS(2881), 2,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+  [69970] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2877), 1,
+    ACTIONS(2737), 1,
       anon_sym_LPAREN,
-    STATE(1546), 1,
+    STATE(1576), 1,
       sym_parameters,
-  [69841] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2729), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [69849] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2906), 1,
-      anon_sym_COMMA,
-    ACTIONS(3286), 1,
-      anon_sym_RPAREN,
-  [69859] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3288), 1,
-      anon_sym_COMMA,
-    STATE(1480), 1,
-      aux_sym_open_sequence_match_pattern_repeat1,
-  [69869] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3290), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [69877] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3292), 1,
-      sym_integer,
-    ACTIONS(3294), 1,
-      sym_float,
-  [69887] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3296), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [69895] = 2,
+  [69980] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2853), 2,
-      anon_sym_COMMA,
-      anon_sym_COLON,
-  [69903] = 2,
+    ACTIONS(1067), 2,
+      anon_sym_except,
+      anon_sym_finally,
+  [69988] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1079), 2,
+    ACTIONS(1032), 2,
       anon_sym_except,
       anon_sym_finally,
-  [69911] = 2,
+  [69996] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3298), 2,
-      sym__newline,
-      anon_sym_SEMI,
-  [69919] = 2,
+    ACTIONS(3316), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+  [70004] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3300), 2,
+    ACTIONS(3318), 2,
       anon_sym_COMMA,
       anon_sym_RBRACE,
-  [69927] = 2,
+  [70012] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3302), 2,
+    ACTIONS(2766), 2,
       sym__newline,
       anon_sym_SEMI,
-  [69935] = 2,
+  [70020] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3304), 2,
+    ACTIONS(2716), 2,
       anon_sym_RPAREN,
       anon_sym_COMMA,
-  [69943] = 3,
+  [70028] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3306), 1,
+    ACTIONS(2491), 1,
+      anon_sym_as,
+    ACTIONS(2493), 1,
       anon_sym_COLON,
-    ACTIONS(3308), 1,
-      anon_sym_DASH_GT,
-  [69953] = 2,
+  [70038] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3310), 1,
+    ACTIONS(3320), 1,
       anon_sym_COLON,
-  [69960] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3012), 1,
-      anon_sym_RBRACK,
-  [69967] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3312), 1,
-      anon_sym_RPAREN,
-  [69974] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3314), 1,
-      sym_identifier,
-  [69981] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3316), 1,
-      sym_identifier,
-  [69988] = 2,
+  [70045] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3318), 1,
+    ACTIONS(3322), 1,
       anon_sym_RPAREN,
-  [69995] = 2,
+  [70052] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3320), 1,
+    ACTIONS(3059), 1,
       anon_sym_in,
-  [70002] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3322), 1,
-      anon_sym_import,
-  [70009] = 2,
+  [70059] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3324), 1,
-      anon_sym_RBRACE,
-  [70016] = 2,
+      anon_sym_in,
+  [70066] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3326), 1,
-      anon_sym_COLON,
-  [70023] = 2,
+      anon_sym_RPAREN,
+  [70073] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3328), 1,
-      anon_sym_for,
-  [70030] = 2,
+      anon_sym_RBRACK,
+  [70080] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3330), 1,
-      anon_sym_RBRACE,
-  [70037] = 2,
+      anon_sym_RBRACK,
+  [70087] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3332), 1,
-      anon_sym_RPAREN,
-  [70044] = 2,
+      anon_sym_COLON,
+  [70094] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3334), 1,
-      anon_sym_COLON,
-  [70051] = 2,
+      sym_identifier,
+  [70101] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3336), 1,
-      anon_sym_RBRACE,
-  [70058] = 2,
+      anon_sym_COLON,
+  [70108] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3338), 1,
-      anon_sym_RPAREN,
-  [70065] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2535), 1,
-      anon_sym_COLON,
-  [70072] = 2,
+      anon_sym_RBRACE,
+  [70115] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3340), 1,
-      anon_sym_COLON,
-  [70079] = 2,
+      anon_sym_RBRACE,
+  [70122] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3342), 1,
-      sym_identifier,
-  [70086] = 2,
+      anon_sym_COLON,
+  [70129] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3344), 1,
       anon_sym_COLON,
-  [70093] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2375), 1,
-      anon_sym_EQ,
-  [70100] = 2,
+  [70136] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3346), 1,
-      anon_sym_COLON,
-  [70107] = 2,
+      anon_sym_import,
+  [70143] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3348), 1,
-      anon_sym_COLON,
-  [70114] = 2,
+      anon_sym_RBRACE,
+  [70150] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2541), 1,
+    ACTIONS(2559), 1,
       anon_sym_COLON,
-  [70121] = 2,
+  [70157] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3350), 1,
-      anon_sym_COLON,
-  [70128] = 2,
+      sym_identifier,
+  [70164] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3352), 1,
-      anon_sym_import,
-  [70135] = 2,
+      anon_sym_COLON,
+  [70171] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3354), 1,
       anon_sym_COLON,
-  [70142] = 2,
+  [70178] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3356), 1,
       anon_sym_RPAREN,
-  [70149] = 2,
+  [70185] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3358), 1,
-      sym_identifier,
-  [70156] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3360), 1,
       anon_sym_COLON,
-  [70163] = 2,
+  [70192] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3362), 1,
+    ACTIONS(3360), 1,
       anon_sym_COLON,
-  [70170] = 2,
+  [70199] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3364), 1,
+    ACTIONS(2616), 1,
       anon_sym_COLON,
-  [70177] = 2,
+  [70206] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2572), 1,
-      anon_sym_COLON,
-  [70184] = 2,
+    ACTIONS(3362), 1,
+      anon_sym_RBRACE,
+  [70213] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3108), 1,
-      anon_sym_RBRACE,
-  [70191] = 2,
+    ACTIONS(3364), 1,
+      anon_sym_RPAREN,
+  [70220] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3366), 1,
-      anon_sym_COLON,
-  [70198] = 2,
+      anon_sym_RPAREN,
+  [70227] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3368), 1,
-      anon_sym_COLON,
-  [70205] = 2,
+      sym_identifier,
+  [70234] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2914), 1,
+      anon_sym_RBRACK,
+  [70241] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3370), 1,
       anon_sym_COLON,
-  [70212] = 2,
+  [70248] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3372), 1,
-      anon_sym_LPAREN,
-  [70219] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2731), 1,
-      anon_sym_RBRACE,
-  [70226] = 2,
+      anon_sym_COLON,
+  [70255] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3374), 1,
       anon_sym_COLON,
-  [70233] = 2,
+  [70262] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3376), 1,
-      sym_identifier,
-  [70240] = 2,
+      anon_sym_RBRACE,
+  [70269] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3378), 1,
-      anon_sym_RPAREN,
-  [70247] = 2,
+      sym_identifier,
+  [70276] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3380), 1,
-      anon_sym_RPAREN,
-  [70254] = 2,
+      anon_sym_COLON,
+  [70283] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3382), 1,
-      anon_sym_RBRACE,
-  [70261] = 2,
+      anon_sym_COLON,
+  [70290] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3384), 1,
-      anon_sym_RBRACK,
-  [70268] = 2,
+      anon_sym_COLON,
+  [70297] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3386), 1,
-      anon_sym_RBRACK,
-  [70275] = 2,
+      anon_sym_import,
+  [70304] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3388), 1,
-      sym_identifier,
-  [70282] = 2,
+    ACTIONS(2916), 1,
+      anon_sym_in,
+  [70311] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3128), 1,
-      anon_sym_RBRACK,
-  [70289] = 2,
+    ACTIONS(3388), 1,
+      anon_sym_RPAREN,
+  [70318] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3390), 1,
       anon_sym_COLON,
-  [70296] = 2,
+  [70325] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3392), 1,
       sym_identifier,
-  [70303] = 2,
+  [70332] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3394), 1,
       anon_sym_COLON,
-  [70310] = 2,
+  [70339] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3396), 1,
-      anon_sym_RBRACE,
-  [70317] = 2,
+      sym_identifier,
+  [70346] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3398), 1,
       anon_sym_RBRACE,
-  [70324] = 2,
+  [70353] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3400), 1,
-      anon_sym_RBRACE,
-  [70331] = 2,
+      anon_sym_LPAREN,
+  [70360] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3402), 1,
+    ACTIONS(2543), 1,
       anon_sym_COLON,
-  [70338] = 2,
+  [70367] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3402), 1,
+      anon_sym_RBRACE,
+  [70374] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1100), 1,
+      anon_sym_def,
+  [70381] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3404), 1,
-      sym_identifier,
-  [70345] = 2,
+      anon_sym_import,
+  [70388] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3406), 1,
+    ACTIONS(3022), 1,
       anon_sym_RBRACK,
-  [70352] = 2,
+  [70395] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3408), 1,
+    ACTIONS(3406), 1,
       anon_sym_RPAREN,
-  [70359] = 2,
+  [70402] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3410), 1,
-      anon_sym_RPAREN,
-  [70366] = 2,
+    ACTIONS(3408), 1,
+      sym_identifier,
+  [70409] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3412), 1,
+    ACTIONS(3410), 1,
       anon_sym_in,
-  [70373] = 2,
+  [70416] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3414), 1,
+    ACTIONS(3412), 1,
       anon_sym_RPAREN,
-  [70380] = 2,
+  [70423] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3130), 1,
-      anon_sym_in,
-  [70387] = 2,
+    ACTIONS(3414), 1,
+      sym_identifier,
+  [70430] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3416), 1,
-      anon_sym_RBRACK,
-  [70394] = 2,
+      anon_sym_COLON,
+  [70437] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3418), 1,
-      anon_sym_RBRACE,
-  [70401] = 2,
+    ACTIONS(2574), 1,
+      anon_sym_COLON,
+  [70444] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(2797), 1,
+    ACTIONS(2925), 1,
       anon_sym_RBRACE,
-  [70408] = 2,
+  [70451] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3186), 1,
-      anon_sym_in,
-  [70415] = 2,
+    ACTIONS(3148), 1,
+      anon_sym_RBRACK,
+  [70458] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3418), 1,
+      anon_sym_import,
+  [70465] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3420), 1,
       sym_identifier,
-  [70422] = 2,
+  [70472] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3422), 1,
+      anon_sym_COLON,
+  [70479] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2784), 1,
       anon_sym_RBRACE,
-  [70429] = 2,
+  [70486] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3424), 1,
-      sym_identifier,
-  [70436] = 2,
+      anon_sym_COLON,
+  [70493] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3314), 1,
+      anon_sym_RBRACE,
+  [70500] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3426), 1,
-      anon_sym_RPAREN,
-  [70443] = 2,
+      anon_sym_COLON,
+  [70507] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3428), 1,
-      anon_sym_COLON,
-  [70450] = 2,
+      sym_identifier,
+  [70514] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3430), 1,
-      anon_sym_RPAREN,
-  [70457] = 2,
+      anon_sym_COLON,
+  [70521] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3432), 1,
-      anon_sym_RBRACE,
-  [70464] = 2,
+      anon_sym_RBRACK,
+  [70528] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3434), 1,
-      anon_sym_RPAREN,
-  [70471] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2601), 1,
-      anon_sym_COLON,
-  [70478] = 2,
+      anon_sym_RBRACK,
+  [70535] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3436), 1,
       anon_sym_RBRACE,
-  [70485] = 2,
+  [70542] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3438), 1,
-      anon_sym_COLON,
-  [70492] = 2,
+      anon_sym_RPAREN,
+  [70549] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3440), 1,
-      anon_sym_RBRACK,
-  [70499] = 2,
+      anon_sym_RBRACE,
+  [70556] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3442), 1,
-      anon_sym_COLON,
-  [70506] = 2,
+    ACTIONS(2747), 1,
+      anon_sym_RBRACE,
+  [70563] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3444), 1,
+    ACTIONS(3442), 1,
       anon_sym_RBRACK,
-  [70513] = 2,
+  [70570] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3446), 1,
+    ACTIONS(3444), 1,
       anon_sym_COLON,
-  [70520] = 2,
+  [70577] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3046), 1,
-      anon_sym_RBRACK,
-  [70527] = 2,
+    ACTIONS(3446), 1,
+      anon_sym_COLON,
+  [70584] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3448), 1,
       anon_sym_RBRACE,
-  [70534] = 2,
+  [70591] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(2401), 1,
+      anon_sym_EQ,
+  [70598] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3450), 1,
-      sym_identifier,
-  [70541] = 2,
+      anon_sym_RPAREN,
+  [70605] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3452), 1,
-      anon_sym_COLON,
-  [70548] = 2,
+      anon_sym_for,
+  [70612] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1969), 1,
+      anon_sym_RBRACE,
+  [70619] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3454), 1,
-      anon_sym_in,
-  [70555] = 2,
+      anon_sym_RBRACE,
+  [70626] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3456), 1,
-      sym_identifier,
-  [70562] = 2,
+      anon_sym_COLON,
+  [70633] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3458), 1,
-      anon_sym_RBRACE,
-  [70569] = 2,
+      anon_sym_in,
+  [70640] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3460), 1,
-      anon_sym_COLON,
-  [70576] = 2,
+      anon_sym_RPAREN,
+  [70647] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3462), 1,
-      anon_sym_in,
-  [70583] = 2,
+      anon_sym_COLON,
+  [70654] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3464), 1,
       sym_identifier,
-  [70590] = 2,
+  [70661] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3466), 1,
-      anon_sym_COLON,
-  [70597] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(3468), 1,
       sym_identifier,
-  [70604] = 2,
+  [70668] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3470), 1,
+    ACTIONS(3468), 1,
       anon_sym_COLON,
-  [70611] = 2,
+  [70675] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3250), 1,
-      anon_sym_RBRACE,
-  [70618] = 2,
+    ACTIONS(3470), 1,
+      anon_sym_RPAREN,
+  [70682] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3472), 1,
-      ts_builtin_sym_end,
-  [70625] = 2,
+      anon_sym_COLON,
+  [70689] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3474), 1,
-      anon_sym_import,
-  [70632] = 2,
+      anon_sym_RBRACK,
+  [70696] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3476), 1,
-      anon_sym_in,
-  [70639] = 2,
+      anon_sym_COLON,
+  [70703] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3478), 1,
-      anon_sym_RPAREN,
-  [70646] = 2,
+      anon_sym_RBRACE,
+  [70710] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3480), 1,
-      anon_sym_import,
-  [70653] = 2,
+      anon_sym_RBRACE,
+  [70717] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3482), 1,
-      anon_sym_RBRACK,
-  [70660] = 2,
+      anon_sym_RBRACE,
+  [70724] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3484), 1,
-      anon_sym_RBRACE,
-  [70667] = 2,
+      anon_sym_COLON,
+  [70731] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3486), 1,
-      anon_sym_COLON,
-  [70674] = 2,
+      anon_sym_RBRACE,
+  [70738] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3488), 1,
       anon_sym_COLON,
-  [70681] = 2,
+  [70745] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3490), 1,
-      anon_sym_RBRACE,
-  [70688] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(2896), 1,
-      anon_sym_in,
-  [70695] = 2,
+      anon_sym_COLON,
+  [70752] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3492), 1,
-      anon_sym_COLON,
-  [70702] = 2,
+      sym_identifier,
+  [70759] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3494), 1,
-      anon_sym_COLON,
-  [70709] = 2,
+      anon_sym_in,
+  [70766] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3496), 1,
-      anon_sym_RPAREN,
-  [70716] = 2,
+      anon_sym_in,
+  [70773] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3498), 1,
-      anon_sym_RBRACK,
-  [70723] = 2,
+      anon_sym_EQ,
+  [70780] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3500), 1,
-      sym_identifier,
-  [70730] = 2,
+      anon_sym_RPAREN,
+  [70787] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3502), 1,
+      anon_sym_COLON,
+  [70794] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3049), 1,
       anon_sym_RBRACE,
-  [70737] = 2,
+  [70801] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3504), 1,
-      anon_sym_COLON,
-  [70744] = 2,
+      anon_sym_RBRACK,
+  [70808] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3506), 1,
-      anon_sym_COLON,
-  [70751] = 2,
+      sym_identifier,
+  [70815] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3508), 1,
       anon_sym_RBRACE,
-  [70758] = 2,
+  [70822] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3510), 1,
-      anon_sym_RBRACE,
-  [70765] = 2,
+      sym_identifier,
+  [70829] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3512), 1,
-      anon_sym_COLON,
-  [70772] = 2,
+      anon_sym_RBRACE,
+  [70836] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3514), 1,
+    ACTIONS(3057), 1,
       anon_sym_in,
-  [70779] = 2,
+  [70843] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1997), 1,
-      anon_sym_RBRACE,
-  [70786] = 2,
+    ACTIONS(3514), 1,
+      anon_sym_RPAREN,
+  [70850] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3516), 1,
-      anon_sym_COLON,
-  [70793] = 2,
+      anon_sym_RPAREN,
+  [70857] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3518), 1,
       anon_sym_RBRACE,
-  [70800] = 2,
+  [70864] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3520), 1,
-      sym_identifier,
-  [70807] = 2,
+    ACTIONS(966), 1,
+      anon_sym_STAR,
+  [70871] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3153), 1,
+    ACTIONS(3520), 1,
       anon_sym_RBRACK,
-  [70814] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(990), 1,
-      anon_sym_STAR,
-  [70821] = 2,
+  [70878] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3522), 1,
-      anon_sym_RPAREN,
-  [70828] = 2,
+      ts_builtin_sym_end,
+  [70885] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(3524), 1,
-      anon_sym_EQ,
-  [70835] = 2,
+      sym_identifier,
+  [70892] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(968), 1,
+    ACTIONS(3526), 1,
+      anon_sym_in,
+  [70899] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(996), 1,
       anon_sym_STAR,
-  [70842] = 2,
+  [70906] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1100), 1,
-      anon_sym_def,
-  [70849] = 2,
+    ACTIONS(3528), 1,
+      sym_identifier,
+  [70913] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3178), 1,
-      anon_sym_RBRACE,
-  [70856] = 2,
+    ACTIONS(3530), 1,
+      sym_identifier,
+  [70920] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3526), 1,
+    ACTIONS(3532), 1,
       anon_sym_RPAREN,
-  [70863] = 2,
+  [70927] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3528), 1,
-      sym_identifier,
-  [70870] = 2,
+    ACTIONS(3534), 1,
+      anon_sym_COLON,
+  [70934] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3530), 1,
-      sym_identifier,
-  [70877] = 2,
+    ACTIONS(3536), 1,
+      anon_sym_RPAREN,
+  [70941] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3532), 1,
+    ACTIONS(3538), 1,
+      anon_sym_COLON,
+  [70948] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3540), 1,
+      anon_sym_RBRACK,
+  [70955] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3542), 1,
+      anon_sym_COLON,
+  [70962] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(3544), 1,
       sym_identifier,
-  [70884] = 2,
+  [70969] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3534), 1,
+    ACTIONS(3546), 1,
       sym_identifier,
-  [70891] = 2,
+  [70976] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3536), 1,
+    ACTIONS(3548), 1,
       anon_sym_COLON,
-  [70898] = 2,
+  [70983] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3182), 1,
+    ACTIONS(3192), 1,
       anon_sym_in,
-  [70905] = 2,
+  [70990] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1122), 1,
       anon_sym_def,
-  [70912] = 2,
+  [70997] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3151), 1,
+    ACTIONS(2904), 1,
       anon_sym_in,
-  [70919] = 2,
+  [71004] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3184), 1,
+    ACTIONS(3194), 1,
       anon_sym_in,
-  [70926] = 2,
+  [71011] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3538), 1,
-      anon_sym_COLON,
-  [70933] = 2,
+    ACTIONS(2966), 1,
+      anon_sym_RBRACK,
+  [71018] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3540), 1,
+    ACTIONS(3550), 1,
       anon_sym_COLON,
-  [70940] = 2,
+  [71025] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(3542), 1,
-      anon_sym_RBRACK,
+    ACTIONS(3552), 1,
+      anon_sym_RBRACE,
 };
 
 static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(157)] = 0,
   [SMALL_STATE(158)] = 127,
-  [SMALL_STATE(159)] = 254,
-  [SMALL_STATE(160)] = 379,
-  [SMALL_STATE(161)] = 504,
-  [SMALL_STATE(162)] = 615,
+  [SMALL_STATE(159)] = 252,
+  [SMALL_STATE(160)] = 363,
+  [SMALL_STATE(161)] = 474,
+  [SMALL_STATE(162)] = 601,
   [SMALL_STATE(163)] = 726,
-  [SMALL_STATE(164)] = 851,
+  [SMALL_STATE(164)] = 853,
   [SMALL_STATE(165)] = 978,
   [SMALL_STATE(166)] = 1100,
   [SMALL_STATE(167)] = 1222,
@@ -82440,67 +82519,67 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(174)] = 2026,
   [SMALL_STATE(175)] = 2135,
   [SMALL_STATE(176)] = 2244,
-  [SMALL_STATE(177)] = 2353,
-  [SMALL_STATE(178)] = 2462,
-  [SMALL_STATE(179)] = 2577,
-  [SMALL_STATE(180)] = 2690,
-  [SMALL_STATE(181)] = 2799,
-  [SMALL_STATE(182)] = 2914,
-  [SMALL_STATE(183)] = 3027,
+  [SMALL_STATE(177)] = 2361,
+  [SMALL_STATE(178)] = 2474,
+  [SMALL_STATE(179)] = 2587,
+  [SMALL_STATE(180)] = 2698,
+  [SMALL_STATE(181)] = 2813,
+  [SMALL_STATE(182)] = 2926,
+  [SMALL_STATE(183)] = 3035,
   [SMALL_STATE(184)] = 3144,
-  [SMALL_STATE(185)] = 3255,
-  [SMALL_STATE(186)] = 3364,
-  [SMALL_STATE(187)] = 3479,
-  [SMALL_STATE(188)] = 3588,
-  [SMALL_STATE(189)] = 3703,
-  [SMALL_STATE(190)] = 3814,
+  [SMALL_STATE(185)] = 3253,
+  [SMALL_STATE(186)] = 3362,
+  [SMALL_STATE(187)] = 3477,
+  [SMALL_STATE(188)] = 3586,
+  [SMALL_STATE(189)] = 3701,
+  [SMALL_STATE(190)] = 3812,
   [SMALL_STATE(191)] = 3927,
   [SMALL_STATE(192)] = 4037,
-  [SMALL_STATE(193)] = 4151,
-  [SMALL_STATE(194)] = 4261,
-  [SMALL_STATE(195)] = 4371,
-  [SMALL_STATE(196)] = 4481,
-  [SMALL_STATE(197)] = 4591,
-  [SMALL_STATE(198)] = 4701,
-  [SMALL_STATE(199)] = 4811,
-  [SMALL_STATE(200)] = 4921,
-  [SMALL_STATE(201)] = 5031,
-  [SMALL_STATE(202)] = 5141,
-  [SMALL_STATE(203)] = 5247,
-  [SMALL_STATE(204)] = 5357,
-  [SMALL_STATE(205)] = 5467,
-  [SMALL_STATE(206)] = 5577,
-  [SMALL_STATE(207)] = 5687,
-  [SMALL_STATE(208)] = 5797,
+  [SMALL_STATE(193)] = 4147,
+  [SMALL_STATE(194)] = 4257,
+  [SMALL_STATE(195)] = 4367,
+  [SMALL_STATE(196)] = 4477,
+  [SMALL_STATE(197)] = 4587,
+  [SMALL_STATE(198)] = 4693,
+  [SMALL_STATE(199)] = 4807,
+  [SMALL_STATE(200)] = 4919,
+  [SMALL_STATE(201)] = 5029,
+  [SMALL_STATE(202)] = 5143,
+  [SMALL_STATE(203)] = 5249,
+  [SMALL_STATE(204)] = 5359,
+  [SMALL_STATE(205)] = 5469,
+  [SMALL_STATE(206)] = 5579,
+  [SMALL_STATE(207)] = 5685,
+  [SMALL_STATE(208)] = 5799,
   [SMALL_STATE(209)] = 5909,
-  [SMALL_STATE(210)] = 6023,
-  [SMALL_STATE(211)] = 6135,
+  [SMALL_STATE(210)] = 6019,
+  [SMALL_STATE(211)] = 6133,
   [SMALL_STATE(212)] = 6245,
-  [SMALL_STATE(213)] = 6357,
-  [SMALL_STATE(214)] = 6471,
-  [SMALL_STATE(215)] = 6577,
-  [SMALL_STATE(216)] = 6691,
-  [SMALL_STATE(217)] = 6801,
-  [SMALL_STATE(218)] = 6911,
-  [SMALL_STATE(219)] = 7021,
-  [SMALL_STATE(220)] = 7131,
-  [SMALL_STATE(221)] = 7241,
-  [SMALL_STATE(222)] = 7351,
-  [SMALL_STATE(223)] = 7465,
-  [SMALL_STATE(224)] = 7577,
-  [SMALL_STATE(225)] = 7683,
-  [SMALL_STATE(226)] = 7793,
-  [SMALL_STATE(227)] = 7903,
-  [SMALL_STATE(228)] = 8013,
-  [SMALL_STATE(229)] = 8119,
-  [SMALL_STATE(230)] = 8229,
-  [SMALL_STATE(231)] = 8339,
-  [SMALL_STATE(232)] = 8453,
-  [SMALL_STATE(233)] = 8565,
-  [SMALL_STATE(234)] = 8675,
-  [SMALL_STATE(235)] = 8789,
-  [SMALL_STATE(236)] = 8901,
-  [SMALL_STATE(237)] = 9015,
+  [SMALL_STATE(213)] = 6359,
+  [SMALL_STATE(214)] = 6465,
+  [SMALL_STATE(215)] = 6575,
+  [SMALL_STATE(216)] = 6685,
+  [SMALL_STATE(217)] = 6795,
+  [SMALL_STATE(218)] = 6905,
+  [SMALL_STATE(219)] = 7015,
+  [SMALL_STATE(220)] = 7125,
+  [SMALL_STATE(221)] = 7235,
+  [SMALL_STATE(222)] = 7349,
+  [SMALL_STATE(223)] = 7461,
+  [SMALL_STATE(224)] = 7571,
+  [SMALL_STATE(225)] = 7681,
+  [SMALL_STATE(226)] = 7791,
+  [SMALL_STATE(227)] = 7901,
+  [SMALL_STATE(228)] = 8011,
+  [SMALL_STATE(229)] = 8121,
+  [SMALL_STATE(230)] = 8231,
+  [SMALL_STATE(231)] = 8345,
+  [SMALL_STATE(232)] = 8457,
+  [SMALL_STATE(233)] = 8567,
+  [SMALL_STATE(234)] = 8681,
+  [SMALL_STATE(235)] = 8793,
+  [SMALL_STATE(236)] = 8905,
+  [SMALL_STATE(237)] = 9019,
   [SMALL_STATE(238)] = 9129,
   [SMALL_STATE(239)] = 9236,
   [SMALL_STATE(240)] = 9343,
@@ -82508,14 +82587,14 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(242)] = 9557,
   [SMALL_STATE(243)] = 9664,
   [SMALL_STATE(244)] = 9771,
-  [SMALL_STATE(245)] = 9866,
-  [SMALL_STATE(246)] = 9973,
+  [SMALL_STATE(245)] = 9878,
+  [SMALL_STATE(246)] = 9985,
   [SMALL_STATE(247)] = 10080,
   [SMALL_STATE(248)] = 10186,
   [SMALL_STATE(249)] = 10292,
-  [SMALL_STATE(250)] = 10398,
+  [SMALL_STATE(250)] = 10396,
   [SMALL_STATE(251)] = 10502,
-  [SMALL_STATE(252)] = 10608,
+  [SMALL_STATE(252)] = 10606,
   [SMALL_STATE(253)] = 10712,
   [SMALL_STATE(254)] = 10818,
   [SMALL_STATE(255)] = 10921,
@@ -82529,76 +82608,76 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(263)] = 11745,
   [SMALL_STATE(264)] = 11848,
   [SMALL_STATE(265)] = 11951,
-  [SMALL_STATE(266)] = 12051,
+  [SMALL_STATE(266)] = 12025,
   [SMALL_STATE(267)] = 12125,
-  [SMALL_STATE(268)] = 12199,
-  [SMALL_STATE(269)] = 12301,
-  [SMALL_STATE(270)] = 12403,
+  [SMALL_STATE(268)] = 12227,
+  [SMALL_STATE(269)] = 12329,
+  [SMALL_STATE(270)] = 12431,
   [SMALL_STATE(271)] = 12505,
-  [SMALL_STATE(272)] = 12607,
+  [SMALL_STATE(272)] = 12579,
   [SMALL_STATE(273)] = 12681,
-  [SMALL_STATE(274)] = 12783,
-  [SMALL_STATE(275)] = 12885,
-  [SMALL_STATE(276)] = 12959,
-  [SMALL_STATE(277)] = 13059,
-  [SMALL_STATE(278)] = 13161,
-  [SMALL_STATE(279)] = 13235,
-  [SMALL_STATE(280)] = 13335,
-  [SMALL_STATE(281)] = 13437,
+  [SMALL_STATE(274)] = 12781,
+  [SMALL_STATE(275)] = 12855,
+  [SMALL_STATE(276)] = 12957,
+  [SMALL_STATE(277)] = 13031,
+  [SMALL_STATE(278)] = 13105,
+  [SMALL_STATE(279)] = 13207,
+  [SMALL_STATE(280)] = 13307,
+  [SMALL_STATE(281)] = 13409,
   [SMALL_STATE(282)] = 13511,
-  [SMALL_STATE(283)] = 13585,
-  [SMALL_STATE(284)] = 13659,
-  [SMALL_STATE(285)] = 13761,
+  [SMALL_STATE(283)] = 13613,
+  [SMALL_STATE(284)] = 13715,
+  [SMALL_STATE(285)] = 13789,
   [SMALL_STATE(286)] = 13863,
   [SMALL_STATE(287)] = 13965,
   [SMALL_STATE(288)] = 14067,
   [SMALL_STATE(289)] = 14169,
-  [SMALL_STATE(290)] = 14268,
-  [SMALL_STATE(291)] = 14367,
+  [SMALL_STATE(290)] = 14266,
+  [SMALL_STATE(291)] = 14365,
   [SMALL_STATE(292)] = 14464,
-  [SMALL_STATE(293)] = 14563,
-  [SMALL_STATE(294)] = 14660,
-  [SMALL_STATE(295)] = 14759,
-  [SMALL_STATE(296)] = 14858,
-  [SMALL_STATE(297)] = 14955,
-  [SMALL_STATE(298)] = 15052,
-  [SMALL_STATE(299)] = 15149,
-  [SMALL_STATE(300)] = 15246,
+  [SMALL_STATE(293)] = 14561,
+  [SMALL_STATE(294)] = 14658,
+  [SMALL_STATE(295)] = 14755,
+  [SMALL_STATE(296)] = 14852,
+  [SMALL_STATE(297)] = 14951,
+  [SMALL_STATE(298)] = 15048,
+  [SMALL_STATE(299)] = 15147,
+  [SMALL_STATE(300)] = 15244,
   [SMALL_STATE(301)] = 15343,
   [SMALL_STATE(302)] = 15440,
   [SMALL_STATE(303)] = 15537,
-  [SMALL_STATE(304)] = 15634,
-  [SMALL_STATE(305)] = 15733,
+  [SMALL_STATE(304)] = 15636,
+  [SMALL_STATE(305)] = 15735,
   [SMALL_STATE(306)] = 15832,
   [SMALL_STATE(307)] = 15931,
   [SMALL_STATE(308)] = 16028,
   [SMALL_STATE(309)] = 16125,
   [SMALL_STATE(310)] = 16224,
   [SMALL_STATE(311)] = 16321,
-  [SMALL_STATE(312)] = 16381,
-  [SMALL_STATE(313)] = 16441,
-  [SMALL_STATE(314)] = 16501,
-  [SMALL_STATE(315)] = 16565,
-  [SMALL_STATE(316)] = 16629,
-  [SMALL_STATE(317)] = 16689,
-  [SMALL_STATE(318)] = 16749,
-  [SMALL_STATE(319)] = 16809,
-  [SMALL_STATE(320)] = 16879,
-  [SMALL_STATE(321)] = 16949,
-  [SMALL_STATE(322)] = 17019,
-  [SMALL_STATE(323)] = 17089,
-  [SMALL_STATE(324)] = 17185,
-  [SMALL_STATE(325)] = 17249,
-  [SMALL_STATE(326)] = 17309,
-  [SMALL_STATE(327)] = 17369,
-  [SMALL_STATE(328)] = 17439,
-  [SMALL_STATE(329)] = 17499,
-  [SMALL_STATE(330)] = 17569,
-  [SMALL_STATE(331)] = 17629,
-  [SMALL_STATE(332)] = 17693,
-  [SMALL_STATE(333)] = 17763,
-  [SMALL_STATE(334)] = 17823,
-  [SMALL_STATE(335)] = 17883,
+  [SMALL_STATE(312)] = 16417,
+  [SMALL_STATE(313)] = 16487,
+  [SMALL_STATE(314)] = 16547,
+  [SMALL_STATE(315)] = 16607,
+  [SMALL_STATE(316)] = 16667,
+  [SMALL_STATE(317)] = 16737,
+  [SMALL_STATE(318)] = 16797,
+  [SMALL_STATE(319)] = 16857,
+  [SMALL_STATE(320)] = 16917,
+  [SMALL_STATE(321)] = 16977,
+  [SMALL_STATE(322)] = 17047,
+  [SMALL_STATE(323)] = 17143,
+  [SMALL_STATE(324)] = 17213,
+  [SMALL_STATE(325)] = 17277,
+  [SMALL_STATE(326)] = 17337,
+  [SMALL_STATE(327)] = 17397,
+  [SMALL_STATE(328)] = 17457,
+  [SMALL_STATE(329)] = 17527,
+  [SMALL_STATE(330)] = 17597,
+  [SMALL_STATE(331)] = 17661,
+  [SMALL_STATE(332)] = 17725,
+  [SMALL_STATE(333)] = 17795,
+  [SMALL_STATE(334)] = 17855,
+  [SMALL_STATE(335)] = 17919,
   [SMALL_STATE(336)] = 17979,
   [SMALL_STATE(337)] = 18075,
   [SMALL_STATE(338)] = 18145,
@@ -82607,45 +82686,45 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(341)] = 18424,
   [SMALL_STATE(342)] = 18517,
   [SMALL_STATE(343)] = 18610,
-  [SMALL_STATE(344)] = 18705,
-  [SMALL_STATE(345)] = 18798,
-  [SMALL_STATE(346)] = 18891,
-  [SMALL_STATE(347)] = 18984,
-  [SMALL_STATE(348)] = 19057,
-  [SMALL_STATE(349)] = 19150,
-  [SMALL_STATE(350)] = 19243,
-  [SMALL_STATE(351)] = 19308,
-  [SMALL_STATE(352)] = 19401,
-  [SMALL_STATE(353)] = 19494,
-  [SMALL_STATE(354)] = 19587,
-  [SMALL_STATE(355)] = 19680,
-  [SMALL_STATE(356)] = 19773,
-  [SMALL_STATE(357)] = 19866,
-  [SMALL_STATE(358)] = 19959,
-  [SMALL_STATE(359)] = 20052,
-  [SMALL_STATE(360)] = 20145,
-  [SMALL_STATE(361)] = 20238,
-  [SMALL_STATE(362)] = 20331,
-  [SMALL_STATE(363)] = 20424,
-  [SMALL_STATE(364)] = 20517,
-  [SMALL_STATE(365)] = 20610,
-  [SMALL_STATE(366)] = 20703,
-  [SMALL_STATE(367)] = 20796,
-  [SMALL_STATE(368)] = 20889,
-  [SMALL_STATE(369)] = 20982,
-  [SMALL_STATE(370)] = 21075,
-  [SMALL_STATE(371)] = 21168,
-  [SMALL_STATE(372)] = 21261,
-  [SMALL_STATE(373)] = 21354,
-  [SMALL_STATE(374)] = 21447,
-  [SMALL_STATE(375)] = 21540,
-  [SMALL_STATE(376)] = 21633,
-  [SMALL_STATE(377)] = 21726,
-  [SMALL_STATE(378)] = 21819,
-  [SMALL_STATE(379)] = 21912,
-  [SMALL_STATE(380)] = 22005,
-  [SMALL_STATE(381)] = 22098,
-  [SMALL_STATE(382)] = 22191,
+  [SMALL_STATE(344)] = 18703,
+  [SMALL_STATE(345)] = 18796,
+  [SMALL_STATE(346)] = 18889,
+  [SMALL_STATE(347)] = 18982,
+  [SMALL_STATE(348)] = 19075,
+  [SMALL_STATE(349)] = 19168,
+  [SMALL_STATE(350)] = 19261,
+  [SMALL_STATE(351)] = 19354,
+  [SMALL_STATE(352)] = 19447,
+  [SMALL_STATE(353)] = 19540,
+  [SMALL_STATE(354)] = 19633,
+  [SMALL_STATE(355)] = 19726,
+  [SMALL_STATE(356)] = 19819,
+  [SMALL_STATE(357)] = 19912,
+  [SMALL_STATE(358)] = 20005,
+  [SMALL_STATE(359)] = 20098,
+  [SMALL_STATE(360)] = 20191,
+  [SMALL_STATE(361)] = 20284,
+  [SMALL_STATE(362)] = 20379,
+  [SMALL_STATE(363)] = 20472,
+  [SMALL_STATE(364)] = 20565,
+  [SMALL_STATE(365)] = 20658,
+  [SMALL_STATE(366)] = 20751,
+  [SMALL_STATE(367)] = 20844,
+  [SMALL_STATE(368)] = 20937,
+  [SMALL_STATE(369)] = 21030,
+  [SMALL_STATE(370)] = 21123,
+  [SMALL_STATE(371)] = 21216,
+  [SMALL_STATE(372)] = 21309,
+  [SMALL_STATE(373)] = 21402,
+  [SMALL_STATE(374)] = 21495,
+  [SMALL_STATE(375)] = 21588,
+  [SMALL_STATE(376)] = 21681,
+  [SMALL_STATE(377)] = 21774,
+  [SMALL_STATE(378)] = 21867,
+  [SMALL_STATE(379)] = 21960,
+  [SMALL_STATE(380)] = 22053,
+  [SMALL_STATE(381)] = 22126,
+  [SMALL_STATE(382)] = 22219,
   [SMALL_STATE(383)] = 22284,
   [SMALL_STATE(384)] = 22377,
   [SMALL_STATE(385)] = 22470,
@@ -82656,17 +82735,17 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(390)] = 22935,
   [SMALL_STATE(391)] = 23028,
   [SMALL_STATE(392)] = 23121,
-  [SMALL_STATE(393)] = 23186,
-  [SMALL_STATE(394)] = 23279,
-  [SMALL_STATE(395)] = 23372,
-  [SMALL_STATE(396)] = 23465,
+  [SMALL_STATE(393)] = 23214,
+  [SMALL_STATE(394)] = 23307,
+  [SMALL_STATE(395)] = 23400,
+  [SMALL_STATE(396)] = 23493,
   [SMALL_STATE(397)] = 23558,
   [SMALL_STATE(398)] = 23651,
   [SMALL_STATE(399)] = 23744,
   [SMALL_STATE(400)] = 23837,
   [SMALL_STATE(401)] = 23930,
-  [SMALL_STATE(402)] = 24025,
-  [SMALL_STATE(403)] = 24118,
+  [SMALL_STATE(402)] = 24023,
+  [SMALL_STATE(403)] = 24116,
   [SMALL_STATE(404)] = 24211,
   [SMALL_STATE(405)] = 24304,
   [SMALL_STATE(406)] = 24397,
@@ -82704,142 +82783,142 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(438)] = 27353,
   [SMALL_STATE(439)] = 27446,
   [SMALL_STATE(440)] = 27504,
-  [SMALL_STATE(441)] = 27566,
-  [SMALL_STATE(442)] = 27624,
-  [SMALL_STATE(443)] = 27682,
-  [SMALL_STATE(444)] = 27740,
-  [SMALL_STATE(445)] = 27802,
+  [SMALL_STATE(441)] = 27562,
+  [SMALL_STATE(442)] = 27620,
+  [SMALL_STATE(443)] = 27678,
+  [SMALL_STATE(444)] = 27736,
+  [SMALL_STATE(445)] = 27806,
   [SMALL_STATE(446)] = 27864,
   [SMALL_STATE(447)] = 27922,
   [SMALL_STATE(448)] = 27980,
   [SMALL_STATE(449)] = 28038,
   [SMALL_STATE(450)] = 28096,
   [SMALL_STATE(451)] = 28154,
-  [SMALL_STATE(452)] = 28212,
-  [SMALL_STATE(453)] = 28282,
-  [SMALL_STATE(454)] = 28352,
-  [SMALL_STATE(455)] = 28410,
-  [SMALL_STATE(456)] = 28468,
-  [SMALL_STATE(457)] = 28526,
-  [SMALL_STATE(458)] = 28584,
+  [SMALL_STATE(452)] = 28216,
+  [SMALL_STATE(453)] = 28274,
+  [SMALL_STATE(454)] = 28332,
+  [SMALL_STATE(455)] = 28390,
+  [SMALL_STATE(456)] = 28448,
+  [SMALL_STATE(457)] = 28510,
+  [SMALL_STATE(458)] = 28572,
   [SMALL_STATE(459)] = 28642,
   [SMALL_STATE(460)] = 28700,
   [SMALL_STATE(461)] = 28758,
-  [SMALL_STATE(462)] = 28820,
+  [SMALL_STATE(462)] = 28816,
   [SMALL_STATE(463)] = 28878,
   [SMALL_STATE(464)] = 28936,
   [SMALL_STATE(465)] = 28994,
-  [SMALL_STATE(466)] = 29089,
-  [SMALL_STATE(467)] = 29182,
-  [SMALL_STATE(468)] = 29239,
-  [SMALL_STATE(469)] = 29300,
-  [SMALL_STATE(470)] = 29367,
-  [SMALL_STATE(471)] = 29430,
-  [SMALL_STATE(472)] = 29523,
-  [SMALL_STATE(473)] = 29580,
-  [SMALL_STATE(474)] = 29637,
-  [SMALL_STATE(475)] = 29698,
-  [SMALL_STATE(476)] = 29759,
-  [SMALL_STATE(477)] = 29820,
-  [SMALL_STATE(478)] = 29881,
-  [SMALL_STATE(479)] = 29942,
-  [SMALL_STATE(480)] = 29999,
-  [SMALL_STATE(481)] = 30060,
-  [SMALL_STATE(482)] = 30121,
-  [SMALL_STATE(483)] = 30182,
-  [SMALL_STATE(484)] = 30243,
-  [SMALL_STATE(485)] = 30304,
-  [SMALL_STATE(486)] = 30365,
-  [SMALL_STATE(487)] = 30426,
-  [SMALL_STATE(488)] = 30483,
-  [SMALL_STATE(489)] = 30544,
+  [SMALL_STATE(466)] = 29055,
+  [SMALL_STATE(467)] = 29116,
+  [SMALL_STATE(468)] = 29173,
+  [SMALL_STATE(469)] = 29234,
+  [SMALL_STATE(470)] = 29295,
+  [SMALL_STATE(471)] = 29352,
+  [SMALL_STATE(472)] = 29413,
+  [SMALL_STATE(473)] = 29474,
+  [SMALL_STATE(474)] = 29535,
+  [SMALL_STATE(475)] = 29596,
+  [SMALL_STATE(476)] = 29691,
+  [SMALL_STATE(477)] = 29784,
+  [SMALL_STATE(478)] = 29841,
+  [SMALL_STATE(479)] = 29934,
+  [SMALL_STATE(480)] = 29995,
+  [SMALL_STATE(481)] = 30052,
+  [SMALL_STATE(482)] = 30109,
+  [SMALL_STATE(483)] = 30172,
+  [SMALL_STATE(484)] = 30239,
+  [SMALL_STATE(485)] = 30300,
+  [SMALL_STATE(486)] = 30361,
+  [SMALL_STATE(487)] = 30418,
+  [SMALL_STATE(488)] = 30479,
+  [SMALL_STATE(489)] = 30540,
   [SMALL_STATE(490)] = 30601,
   [SMALL_STATE(491)] = 30662,
   [SMALL_STATE(492)] = 30723,
   [SMALL_STATE(493)] = 30779,
   [SMALL_STATE(494)] = 30835,
-  [SMALL_STATE(495)] = 30899,
-  [SMALL_STATE(496)] = 30991,
-  [SMALL_STATE(497)] = 31047,
-  [SMALL_STATE(498)] = 31103,
-  [SMALL_STATE(499)] = 31159,
-  [SMALL_STATE(500)] = 31223,
-  [SMALL_STATE(501)] = 31279,
-  [SMALL_STATE(502)] = 31371,
-  [SMALL_STATE(503)] = 31427,
-  [SMALL_STATE(504)] = 31483,
-  [SMALL_STATE(505)] = 31539,
-  [SMALL_STATE(506)] = 31595,
-  [SMALL_STATE(507)] = 31687,
+  [SMALL_STATE(495)] = 30927,
+  [SMALL_STATE(496)] = 30983,
+  [SMALL_STATE(497)] = 31039,
+  [SMALL_STATE(498)] = 31095,
+  [SMALL_STATE(499)] = 31151,
+  [SMALL_STATE(500)] = 31243,
+  [SMALL_STATE(501)] = 31335,
+  [SMALL_STATE(502)] = 31391,
+  [SMALL_STATE(503)] = 31447,
+  [SMALL_STATE(504)] = 31503,
+  [SMALL_STATE(505)] = 31559,
+  [SMALL_STATE(506)] = 31623,
+  [SMALL_STATE(507)] = 31679,
   [SMALL_STATE(508)] = 31743,
-  [SMALL_STATE(509)] = 31799,
+  [SMALL_STATE(509)] = 31835,
   [SMALL_STATE(510)] = 31891,
-  [SMALL_STATE(511)] = 31983,
-  [SMALL_STATE(512)] = 32039,
+  [SMALL_STATE(511)] = 31947,
+  [SMALL_STATE(512)] = 32003,
   [SMALL_STATE(513)] = 32095,
   [SMALL_STATE(514)] = 32187,
   [SMALL_STATE(515)] = 32242,
-  [SMALL_STATE(516)] = 32303,
-  [SMALL_STATE(517)] = 32358,
-  [SMALL_STATE(518)] = 32413,
-  [SMALL_STATE(519)] = 32468,
-  [SMALL_STATE(520)] = 32523,
+  [SMALL_STATE(516)] = 32297,
+  [SMALL_STATE(517)] = 32352,
+  [SMALL_STATE(518)] = 32407,
+  [SMALL_STATE(519)] = 32462,
+  [SMALL_STATE(520)] = 32517,
   [SMALL_STATE(521)] = 32578,
-  [SMALL_STATE(522)] = 32633,
-  [SMALL_STATE(523)] = 32688,
-  [SMALL_STATE(524)] = 32743,
-  [SMALL_STATE(525)] = 32804,
-  [SMALL_STATE(526)] = 32859,
-  [SMALL_STATE(527)] = 32914,
-  [SMALL_STATE(528)] = 33003,
-  [SMALL_STATE(529)] = 33058,
-  [SMALL_STATE(530)] = 33113,
-  [SMALL_STATE(531)] = 33168,
-  [SMALL_STATE(532)] = 33223,
-  [SMALL_STATE(533)] = 33278,
-  [SMALL_STATE(534)] = 33333,
-  [SMALL_STATE(535)] = 33388,
-  [SMALL_STATE(536)] = 33443,
-  [SMALL_STATE(537)] = 33498,
-  [SMALL_STATE(538)] = 33553,
-  [SMALL_STATE(539)] = 33608,
-  [SMALL_STATE(540)] = 33663,
-  [SMALL_STATE(541)] = 33718,
-  [SMALL_STATE(542)] = 33773,
-  [SMALL_STATE(543)] = 33828,
-  [SMALL_STATE(544)] = 33883,
-  [SMALL_STATE(545)] = 33938,
-  [SMALL_STATE(546)] = 33993,
-  [SMALL_STATE(547)] = 34048,
-  [SMALL_STATE(548)] = 34103,
-  [SMALL_STATE(549)] = 34158,
-  [SMALL_STATE(550)] = 34213,
-  [SMALL_STATE(551)] = 34268,
-  [SMALL_STATE(552)] = 34323,
-  [SMALL_STATE(553)] = 34378,
-  [SMALL_STATE(554)] = 34433,
-  [SMALL_STATE(555)] = 34488,
-  [SMALL_STATE(556)] = 34543,
-  [SMALL_STATE(557)] = 34598,
-  [SMALL_STATE(558)] = 34653,
-  [SMALL_STATE(559)] = 34708,
-  [SMALL_STATE(560)] = 34763,
-  [SMALL_STATE(561)] = 34818,
-  [SMALL_STATE(562)] = 34873,
-  [SMALL_STATE(563)] = 34928,
-  [SMALL_STATE(564)] = 34983,
-  [SMALL_STATE(565)] = 35038,
-  [SMALL_STATE(566)] = 35093,
-  [SMALL_STATE(567)] = 35148,
-  [SMALL_STATE(568)] = 35203,
-  [SMALL_STATE(569)] = 35258,
-  [SMALL_STATE(570)] = 35313,
-  [SMALL_STATE(571)] = 35368,
-  [SMALL_STATE(572)] = 35423,
-  [SMALL_STATE(573)] = 35478,
-  [SMALL_STATE(574)] = 35533,
-  [SMALL_STATE(575)] = 35588,
-  [SMALL_STATE(576)] = 35643,
+  [SMALL_STATE(522)] = 32667,
+  [SMALL_STATE(523)] = 32722,
+  [SMALL_STATE(524)] = 32777,
+  [SMALL_STATE(525)] = 32832,
+  [SMALL_STATE(526)] = 32887,
+  [SMALL_STATE(527)] = 32942,
+  [SMALL_STATE(528)] = 32997,
+  [SMALL_STATE(529)] = 33052,
+  [SMALL_STATE(530)] = 33107,
+  [SMALL_STATE(531)] = 33162,
+  [SMALL_STATE(532)] = 33217,
+  [SMALL_STATE(533)] = 33272,
+  [SMALL_STATE(534)] = 33327,
+  [SMALL_STATE(535)] = 33382,
+  [SMALL_STATE(536)] = 33437,
+  [SMALL_STATE(537)] = 33492,
+  [SMALL_STATE(538)] = 33547,
+  [SMALL_STATE(539)] = 33602,
+  [SMALL_STATE(540)] = 33657,
+  [SMALL_STATE(541)] = 33712,
+  [SMALL_STATE(542)] = 33767,
+  [SMALL_STATE(543)] = 33822,
+  [SMALL_STATE(544)] = 33877,
+  [SMALL_STATE(545)] = 33932,
+  [SMALL_STATE(546)] = 33987,
+  [SMALL_STATE(547)] = 34042,
+  [SMALL_STATE(548)] = 34097,
+  [SMALL_STATE(549)] = 34152,
+  [SMALL_STATE(550)] = 34207,
+  [SMALL_STATE(551)] = 34262,
+  [SMALL_STATE(552)] = 34317,
+  [SMALL_STATE(553)] = 34372,
+  [SMALL_STATE(554)] = 34427,
+  [SMALL_STATE(555)] = 34482,
+  [SMALL_STATE(556)] = 34537,
+  [SMALL_STATE(557)] = 34592,
+  [SMALL_STATE(558)] = 34647,
+  [SMALL_STATE(559)] = 34702,
+  [SMALL_STATE(560)] = 34757,
+  [SMALL_STATE(561)] = 34812,
+  [SMALL_STATE(562)] = 34867,
+  [SMALL_STATE(563)] = 34922,
+  [SMALL_STATE(564)] = 34977,
+  [SMALL_STATE(565)] = 35032,
+  [SMALL_STATE(566)] = 35087,
+  [SMALL_STATE(567)] = 35142,
+  [SMALL_STATE(568)] = 35197,
+  [SMALL_STATE(569)] = 35252,
+  [SMALL_STATE(570)] = 35307,
+  [SMALL_STATE(571)] = 35362,
+  [SMALL_STATE(572)] = 35417,
+  [SMALL_STATE(573)] = 35472,
+  [SMALL_STATE(574)] = 35527,
+  [SMALL_STATE(575)] = 35582,
+  [SMALL_STATE(576)] = 35637,
   [SMALL_STATE(577)] = 35698,
   [SMALL_STATE(578)] = 35753,
   [SMALL_STATE(579)] = 35808,
@@ -82853,32 +82932,32 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(587)] = 36248,
   [SMALL_STATE(588)] = 36303,
   [SMALL_STATE(589)] = 36358,
-  [SMALL_STATE(590)] = 36447,
-  [SMALL_STATE(591)] = 36502,
-  [SMALL_STATE(592)] = 36557,
-  [SMALL_STATE(593)] = 36612,
-  [SMALL_STATE(594)] = 36667,
-  [SMALL_STATE(595)] = 36722,
-  [SMALL_STATE(596)] = 36777,
-  [SMALL_STATE(597)] = 36832,
-  [SMALL_STATE(598)] = 36887,
-  [SMALL_STATE(599)] = 36942,
-  [SMALL_STATE(600)] = 36997,
-  [SMALL_STATE(601)] = 37052,
-  [SMALL_STATE(602)] = 37107,
-  [SMALL_STATE(603)] = 37162,
-  [SMALL_STATE(604)] = 37217,
-  [SMALL_STATE(605)] = 37272,
-  [SMALL_STATE(606)] = 37327,
-  [SMALL_STATE(607)] = 37382,
-  [SMALL_STATE(608)] = 37437,
-  [SMALL_STATE(609)] = 37492,
-  [SMALL_STATE(610)] = 37547,
-  [SMALL_STATE(611)] = 37602,
-  [SMALL_STATE(612)] = 37657,
-  [SMALL_STATE(613)] = 37712,
-  [SMALL_STATE(614)] = 37767,
-  [SMALL_STATE(615)] = 37828,
+  [SMALL_STATE(590)] = 36413,
+  [SMALL_STATE(591)] = 36468,
+  [SMALL_STATE(592)] = 36523,
+  [SMALL_STATE(593)] = 36578,
+  [SMALL_STATE(594)] = 36633,
+  [SMALL_STATE(595)] = 36694,
+  [SMALL_STATE(596)] = 36749,
+  [SMALL_STATE(597)] = 36804,
+  [SMALL_STATE(598)] = 36859,
+  [SMALL_STATE(599)] = 36914,
+  [SMALL_STATE(600)] = 36969,
+  [SMALL_STATE(601)] = 37024,
+  [SMALL_STATE(602)] = 37079,
+  [SMALL_STATE(603)] = 37134,
+  [SMALL_STATE(604)] = 37189,
+  [SMALL_STATE(605)] = 37244,
+  [SMALL_STATE(606)] = 37299,
+  [SMALL_STATE(607)] = 37354,
+  [SMALL_STATE(608)] = 37409,
+  [SMALL_STATE(609)] = 37464,
+  [SMALL_STATE(610)] = 37519,
+  [SMALL_STATE(611)] = 37574,
+  [SMALL_STATE(612)] = 37629,
+  [SMALL_STATE(613)] = 37684,
+  [SMALL_STATE(614)] = 37739,
+  [SMALL_STATE(615)] = 37794,
   [SMALL_STATE(616)] = 37883,
   [SMALL_STATE(617)] = 37938,
   [SMALL_STATE(618)] = 38000,
@@ -82893,71 +82972,71 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(627)] = 38681,
   [SMALL_STATE(628)] = 38735,
   [SMALL_STATE(629)] = 38809,
-  [SMALL_STATE(630)] = 38883,
-  [SMALL_STATE(631)] = 38957,
-  [SMALL_STATE(632)] = 39031,
-  [SMALL_STATE(633)] = 39109,
-  [SMALL_STATE(634)] = 39183,
-  [SMALL_STATE(635)] = 39257,
-  [SMALL_STATE(636)] = 39331,
-  [SMALL_STATE(637)] = 39405,
-  [SMALL_STATE(638)] = 39479,
-  [SMALL_STATE(639)] = 39553,
-  [SMALL_STATE(640)] = 39631,
-  [SMALL_STATE(641)] = 39705,
-  [SMALL_STATE(642)] = 39779,
-  [SMALL_STATE(643)] = 39853,
-  [SMALL_STATE(644)] = 39927,
-  [SMALL_STATE(645)] = 40001,
-  [SMALL_STATE(646)] = 40075,
-  [SMALL_STATE(647)] = 40149,
-  [SMALL_STATE(648)] = 40223,
-  [SMALL_STATE(649)] = 40297,
-  [SMALL_STATE(650)] = 40371,
-  [SMALL_STATE(651)] = 40445,
-  [SMALL_STATE(652)] = 40519,
-  [SMALL_STATE(653)] = 40593,
-  [SMALL_STATE(654)] = 40667,
-  [SMALL_STATE(655)] = 40741,
-  [SMALL_STATE(656)] = 40815,
-  [SMALL_STATE(657)] = 40889,
-  [SMALL_STATE(658)] = 40963,
-  [SMALL_STATE(659)] = 41037,
-  [SMALL_STATE(660)] = 41111,
-  [SMALL_STATE(661)] = 41185,
-  [SMALL_STATE(662)] = 41259,
-  [SMALL_STATE(663)] = 41333,
-  [SMALL_STATE(664)] = 41407,
-  [SMALL_STATE(665)] = 41481,
-  [SMALL_STATE(666)] = 41555,
-  [SMALL_STATE(667)] = 41629,
-  [SMALL_STATE(668)] = 41703,
-  [SMALL_STATE(669)] = 41777,
-  [SMALL_STATE(670)] = 41851,
-  [SMALL_STATE(671)] = 41925,
-  [SMALL_STATE(672)] = 41999,
-  [SMALL_STATE(673)] = 42073,
-  [SMALL_STATE(674)] = 42147,
-  [SMALL_STATE(675)] = 42221,
-  [SMALL_STATE(676)] = 42295,
-  [SMALL_STATE(677)] = 42369,
-  [SMALL_STATE(678)] = 42443,
-  [SMALL_STATE(679)] = 42517,
-  [SMALL_STATE(680)] = 42591,
-  [SMALL_STATE(681)] = 42665,
-  [SMALL_STATE(682)] = 42739,
-  [SMALL_STATE(683)] = 42813,
-  [SMALL_STATE(684)] = 42887,
-  [SMALL_STATE(685)] = 42961,
-  [SMALL_STATE(686)] = 43015,
-  [SMALL_STATE(687)] = 43089,
-  [SMALL_STATE(688)] = 43163,
-  [SMALL_STATE(689)] = 43237,
-  [SMALL_STATE(690)] = 43311,
-  [SMALL_STATE(691)] = 43365,
-  [SMALL_STATE(692)] = 43439,
-  [SMALL_STATE(693)] = 43513,
-  [SMALL_STATE(694)] = 43567,
+  [SMALL_STATE(630)] = 38887,
+  [SMALL_STATE(631)] = 38941,
+  [SMALL_STATE(632)] = 38995,
+  [SMALL_STATE(633)] = 39069,
+  [SMALL_STATE(634)] = 39143,
+  [SMALL_STATE(635)] = 39217,
+  [SMALL_STATE(636)] = 39291,
+  [SMALL_STATE(637)] = 39365,
+  [SMALL_STATE(638)] = 39439,
+  [SMALL_STATE(639)] = 39513,
+  [SMALL_STATE(640)] = 39587,
+  [SMALL_STATE(641)] = 39661,
+  [SMALL_STATE(642)] = 39735,
+  [SMALL_STATE(643)] = 39809,
+  [SMALL_STATE(644)] = 39883,
+  [SMALL_STATE(645)] = 39957,
+  [SMALL_STATE(646)] = 40031,
+  [SMALL_STATE(647)] = 40105,
+  [SMALL_STATE(648)] = 40179,
+  [SMALL_STATE(649)] = 40253,
+  [SMALL_STATE(650)] = 40327,
+  [SMALL_STATE(651)] = 40401,
+  [SMALL_STATE(652)] = 40475,
+  [SMALL_STATE(653)] = 40549,
+  [SMALL_STATE(654)] = 40623,
+  [SMALL_STATE(655)] = 40697,
+  [SMALL_STATE(656)] = 40771,
+  [SMALL_STATE(657)] = 40845,
+  [SMALL_STATE(658)] = 40919,
+  [SMALL_STATE(659)] = 40993,
+  [SMALL_STATE(660)] = 41067,
+  [SMALL_STATE(661)] = 41141,
+  [SMALL_STATE(662)] = 41215,
+  [SMALL_STATE(663)] = 41289,
+  [SMALL_STATE(664)] = 41367,
+  [SMALL_STATE(665)] = 41441,
+  [SMALL_STATE(666)] = 41515,
+  [SMALL_STATE(667)] = 41589,
+  [SMALL_STATE(668)] = 41663,
+  [SMALL_STATE(669)] = 41737,
+  [SMALL_STATE(670)] = 41811,
+  [SMALL_STATE(671)] = 41885,
+  [SMALL_STATE(672)] = 41959,
+  [SMALL_STATE(673)] = 42033,
+  [SMALL_STATE(674)] = 42107,
+  [SMALL_STATE(675)] = 42181,
+  [SMALL_STATE(676)] = 42235,
+  [SMALL_STATE(677)] = 42289,
+  [SMALL_STATE(678)] = 42363,
+  [SMALL_STATE(679)] = 42437,
+  [SMALL_STATE(680)] = 42511,
+  [SMALL_STATE(681)] = 42585,
+  [SMALL_STATE(682)] = 42659,
+  [SMALL_STATE(683)] = 42733,
+  [SMALL_STATE(684)] = 42807,
+  [SMALL_STATE(685)] = 42881,
+  [SMALL_STATE(686)] = 42955,
+  [SMALL_STATE(687)] = 43029,
+  [SMALL_STATE(688)] = 43103,
+  [SMALL_STATE(689)] = 43177,
+  [SMALL_STATE(690)] = 43251,
+  [SMALL_STATE(691)] = 43325,
+  [SMALL_STATE(692)] = 43399,
+  [SMALL_STATE(693)] = 43473,
+  [SMALL_STATE(694)] = 43547,
   [SMALL_STATE(695)] = 43621,
   [SMALL_STATE(696)] = 43695,
   [SMALL_STATE(697)] = 43769,
@@ -82968,1056 +83047,1060 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(702)] = 44067,
   [SMALL_STATE(703)] = 44115,
   [SMALL_STATE(704)] = 44163,
-  [SMALL_STATE(705)] = 44244,
-  [SMALL_STATE(706)] = 44325,
-  [SMALL_STATE(707)] = 44372,
-  [SMALL_STATE(708)] = 44419,
-  [SMALL_STATE(709)] = 44466,
-  [SMALL_STATE(710)] = 44513,
-  [SMALL_STATE(711)] = 44560,
-  [SMALL_STATE(712)] = 44607,
-  [SMALL_STATE(713)] = 44654,
-  [SMALL_STATE(714)] = 44701,
-  [SMALL_STATE(715)] = 44748,
-  [SMALL_STATE(716)] = 44795,
-  [SMALL_STATE(717)] = 44842,
-  [SMALL_STATE(718)] = 44889,
-  [SMALL_STATE(719)] = 44936,
-  [SMALL_STATE(720)] = 44983,
-  [SMALL_STATE(721)] = 45030,
-  [SMALL_STATE(722)] = 45077,
-  [SMALL_STATE(723)] = 45124,
-  [SMALL_STATE(724)] = 45171,
-  [SMALL_STATE(725)] = 45218,
-  [SMALL_STATE(726)] = 45265,
-  [SMALL_STATE(727)] = 45312,
-  [SMALL_STATE(728)] = 45359,
-  [SMALL_STATE(729)] = 45406,
-  [SMALL_STATE(730)] = 45453,
-  [SMALL_STATE(731)] = 45500,
-  [SMALL_STATE(732)] = 45547,
-  [SMALL_STATE(733)] = 45594,
-  [SMALL_STATE(734)] = 45641,
-  [SMALL_STATE(735)] = 45688,
+  [SMALL_STATE(705)] = 44210,
+  [SMALL_STATE(706)] = 44257,
+  [SMALL_STATE(707)] = 44304,
+  [SMALL_STATE(708)] = 44351,
+  [SMALL_STATE(709)] = 44398,
+  [SMALL_STATE(710)] = 44445,
+  [SMALL_STATE(711)] = 44492,
+  [SMALL_STATE(712)] = 44539,
+  [SMALL_STATE(713)] = 44586,
+  [SMALL_STATE(714)] = 44633,
+  [SMALL_STATE(715)] = 44680,
+  [SMALL_STATE(716)] = 44727,
+  [SMALL_STATE(717)] = 44774,
+  [SMALL_STATE(718)] = 44821,
+  [SMALL_STATE(719)] = 44868,
+  [SMALL_STATE(720)] = 44915,
+  [SMALL_STATE(721)] = 44962,
+  [SMALL_STATE(722)] = 45009,
+  [SMALL_STATE(723)] = 45056,
+  [SMALL_STATE(724)] = 45103,
+  [SMALL_STATE(725)] = 45150,
+  [SMALL_STATE(726)] = 45197,
+  [SMALL_STATE(727)] = 45244,
+  [SMALL_STATE(728)] = 45291,
+  [SMALL_STATE(729)] = 45372,
+  [SMALL_STATE(730)] = 45419,
+  [SMALL_STATE(731)] = 45466,
+  [SMALL_STATE(732)] = 45513,
+  [SMALL_STATE(733)] = 45560,
+  [SMALL_STATE(734)] = 45607,
+  [SMALL_STATE(735)] = 45654,
   [SMALL_STATE(736)] = 45735,
   [SMALL_STATE(737)] = 45782,
   [SMALL_STATE(738)] = 45829,
   [SMALL_STATE(739)] = 45876,
-  [SMALL_STATE(740)] = 45944,
-  [SMALL_STATE(741)] = 46014,
-  [SMALL_STATE(742)] = 46084,
-  [SMALL_STATE(743)] = 46152,
-  [SMALL_STATE(744)] = 46212,
-  [SMALL_STATE(745)] = 46268,
-  [SMALL_STATE(746)] = 46334,
-  [SMALL_STATE(747)] = 46398,
-  [SMALL_STATE(748)] = 46454,
-  [SMALL_STATE(749)] = 46510,
-  [SMALL_STATE(750)] = 46560,
-  [SMALL_STATE(751)] = 46610,
-  [SMALL_STATE(752)] = 46666,
-  [SMALL_STATE(753)] = 46728,
-  [SMALL_STATE(754)] = 46778,
-  [SMALL_STATE(755)] = 46828,
-  [SMALL_STATE(756)] = 46884,
-  [SMALL_STATE(757)] = 46946,
-  [SMALL_STATE(758)] = 47016,
-  [SMALL_STATE(759)] = 47076,
-  [SMALL_STATE(760)] = 47132,
-  [SMALL_STATE(761)] = 47198,
-  [SMALL_STATE(762)] = 47262,
-  [SMALL_STATE(763)] = 47332,
-  [SMALL_STATE(764)] = 47402,
-  [SMALL_STATE(765)] = 47472,
-  [SMALL_STATE(766)] = 47528,
+  [SMALL_STATE(740)] = 45946,
+  [SMALL_STATE(741)] = 46016,
+  [SMALL_STATE(742)] = 46086,
+  [SMALL_STATE(743)] = 46142,
+  [SMALL_STATE(744)] = 46204,
+  [SMALL_STATE(745)] = 46274,
+  [SMALL_STATE(746)] = 46324,
+  [SMALL_STATE(747)] = 46380,
+  [SMALL_STATE(748)] = 46436,
+  [SMALL_STATE(749)] = 46504,
+  [SMALL_STATE(750)] = 46568,
+  [SMALL_STATE(751)] = 46624,
+  [SMALL_STATE(752)] = 46680,
+  [SMALL_STATE(753)] = 46742,
+  [SMALL_STATE(754)] = 46798,
+  [SMALL_STATE(755)] = 46864,
+  [SMALL_STATE(756)] = 46924,
+  [SMALL_STATE(757)] = 46992,
+  [SMALL_STATE(758)] = 47042,
+  [SMALL_STATE(759)] = 47098,
+  [SMALL_STATE(760)] = 47168,
+  [SMALL_STATE(761)] = 47238,
+  [SMALL_STATE(762)] = 47298,
+  [SMALL_STATE(763)] = 47348,
+  [SMALL_STATE(764)] = 47414,
+  [SMALL_STATE(765)] = 47470,
+  [SMALL_STATE(766)] = 47534,
   [SMALL_STATE(767)] = 47584,
-  [SMALL_STATE(768)] = 47629,
-  [SMALL_STATE(769)] = 47678,
-  [SMALL_STATE(770)] = 47727,
-  [SMALL_STATE(771)] = 47776,
-  [SMALL_STATE(772)] = 47825,
-  [SMALL_STATE(773)] = 47874,
-  [SMALL_STATE(774)] = 47953,
-  [SMALL_STATE(775)] = 48000,
-  [SMALL_STATE(776)] = 48077,
-  [SMALL_STATE(777)] = 48126,
-  [SMALL_STATE(778)] = 48175,
+  [SMALL_STATE(768)] = 47661,
+  [SMALL_STATE(769)] = 47706,
+  [SMALL_STATE(770)] = 47753,
+  [SMALL_STATE(771)] = 47832,
+  [SMALL_STATE(772)] = 47881,
+  [SMALL_STATE(773)] = 47930,
+  [SMALL_STATE(774)] = 47977,
+  [SMALL_STATE(775)] = 48026,
+  [SMALL_STATE(776)] = 48075,
+  [SMALL_STATE(777)] = 48124,
+  [SMALL_STATE(778)] = 48173,
   [SMALL_STATE(779)] = 48222,
   [SMALL_STATE(780)] = 48271,
   [SMALL_STATE(781)] = 48350,
   [SMALL_STATE(782)] = 48399,
   [SMALL_STATE(783)] = 48448,
-  [SMALL_STATE(784)] = 48493,
-  [SMALL_STATE(785)] = 48542,
-  [SMALL_STATE(786)] = 48591,
-  [SMALL_STATE(787)] = 48638,
+  [SMALL_STATE(784)] = 48497,
+  [SMALL_STATE(785)] = 48546,
+  [SMALL_STATE(786)] = 48593,
+  [SMALL_STATE(787)] = 48640,
   [SMALL_STATE(788)] = 48685,
   [SMALL_STATE(789)] = 48753,
-  [SMALL_STATE(790)] = 48829,
-  [SMALL_STATE(791)] = 48877,
-  [SMALL_STATE(792)] = 48925,
-  [SMALL_STATE(793)] = 48969,
-  [SMALL_STATE(794)] = 49013,
-  [SMALL_STATE(795)] = 49057,
-  [SMALL_STATE(796)] = 49101,
-  [SMALL_STATE(797)] = 49155,
-  [SMALL_STATE(798)] = 49215,
-  [SMALL_STATE(799)] = 49283,
-  [SMALL_STATE(800)] = 49337,
-  [SMALL_STATE(801)] = 49405,
-  [SMALL_STATE(802)] = 49471,
-  [SMALL_STATE(803)] = 49529,
-  [SMALL_STATE(804)] = 49583,
-  [SMALL_STATE(805)] = 49637,
-  [SMALL_STATE(806)] = 49691,
-  [SMALL_STATE(807)] = 49755,
-  [SMALL_STATE(808)] = 49817,
-  [SMALL_STATE(809)] = 49871,
-  [SMALL_STATE(810)] = 49931,
-  [SMALL_STATE(811)] = 49999,
-  [SMALL_STATE(812)] = 50065,
-  [SMALL_STATE(813)] = 50123,
-  [SMALL_STATE(814)] = 50177,
-  [SMALL_STATE(815)] = 50241,
-  [SMALL_STATE(816)] = 50303,
-  [SMALL_STATE(817)] = 50371,
-  [SMALL_STATE(818)] = 50439,
-  [SMALL_STATE(819)] = 50493,
-  [SMALL_STATE(820)] = 50547,
-  [SMALL_STATE(821)] = 50607,
-  [SMALL_STATE(822)] = 50675,
-  [SMALL_STATE(823)] = 50741,
-  [SMALL_STATE(824)] = 50799,
-  [SMALL_STATE(825)] = 50853,
-  [SMALL_STATE(826)] = 50917,
-  [SMALL_STATE(827)] = 50979,
-  [SMALL_STATE(828)] = 51047,
-  [SMALL_STATE(829)] = 51115,
-  [SMALL_STATE(830)] = 51169,
-  [SMALL_STATE(831)] = 51223,
-  [SMALL_STATE(832)] = 51268,
-  [SMALL_STATE(833)] = 51313,
-  [SMALL_STATE(834)] = 51366,
-  [SMALL_STATE(835)] = 51409,
-  [SMALL_STATE(836)] = 51454,
-  [SMALL_STATE(837)] = 51499,
-  [SMALL_STATE(838)] = 51544,
-  [SMALL_STATE(839)] = 51589,
-  [SMALL_STATE(840)] = 51642,
-  [SMALL_STATE(841)] = 51685,
-  [SMALL_STATE(842)] = 51766,
-  [SMALL_STATE(843)] = 51811,
-  [SMALL_STATE(844)] = 51854,
-  [SMALL_STATE(845)] = 51907,
-  [SMALL_STATE(846)] = 51966,
-  [SMALL_STATE(847)] = 52009,
-  [SMALL_STATE(848)] = 52052,
-  [SMALL_STATE(849)] = 52095,
-  [SMALL_STATE(850)] = 52142,
-  [SMALL_STATE(851)] = 52189,
-  [SMALL_STATE(852)] = 52234,
-  [SMALL_STATE(853)] = 52277,
-  [SMALL_STATE(854)] = 52320,
-  [SMALL_STATE(855)] = 52365,
-  [SMALL_STATE(856)] = 52410,
-  [SMALL_STATE(857)] = 52477,
-  [SMALL_STATE(858)] = 52524,
-  [SMALL_STATE(859)] = 52571,
-  [SMALL_STATE(860)] = 52618,
-  [SMALL_STATE(861)] = 52663,
-  [SMALL_STATE(862)] = 52744,
-  [SMALL_STATE(863)] = 52809,
-  [SMALL_STATE(864)] = 52866,
-  [SMALL_STATE(865)] = 52919,
-  [SMALL_STATE(866)] = 52982,
-  [SMALL_STATE(867)] = 53043,
-  [SMALL_STATE(868)] = 53110,
-  [SMALL_STATE(869)] = 53177,
-  [SMALL_STATE(870)] = 53258,
-  [SMALL_STATE(871)] = 53339,
-  [SMALL_STATE(872)] = 53384,
-  [SMALL_STATE(873)] = 53431,
-  [SMALL_STATE(874)] = 53473,
-  [SMALL_STATE(875)] = 53515,
-  [SMALL_STATE(876)] = 53557,
-  [SMALL_STATE(877)] = 53599,
-  [SMALL_STATE(878)] = 53641,
-  [SMALL_STATE(879)] = 53683,
-  [SMALL_STATE(880)] = 53725,
-  [SMALL_STATE(881)] = 53767,
-  [SMALL_STATE(882)] = 53809,
-  [SMALL_STATE(883)] = 53851,
-  [SMALL_STATE(884)] = 53893,
-  [SMALL_STATE(885)] = 53935,
-  [SMALL_STATE(886)] = 53977,
-  [SMALL_STATE(887)] = 54019,
-  [SMALL_STATE(888)] = 54061,
-  [SMALL_STATE(889)] = 54103,
-  [SMALL_STATE(890)] = 54145,
-  [SMALL_STATE(891)] = 54187,
-  [SMALL_STATE(892)] = 54229,
-  [SMALL_STATE(893)] = 54271,
-  [SMALL_STATE(894)] = 54313,
-  [SMALL_STATE(895)] = 54355,
-  [SMALL_STATE(896)] = 54397,
-  [SMALL_STATE(897)] = 54477,
-  [SMALL_STATE(898)] = 54555,
-  [SMALL_STATE(899)] = 54597,
-  [SMALL_STATE(900)] = 54639,
-  [SMALL_STATE(901)] = 54681,
-  [SMALL_STATE(902)] = 54723,
-  [SMALL_STATE(903)] = 54765,
-  [SMALL_STATE(904)] = 54807,
-  [SMALL_STATE(905)] = 54849,
-  [SMALL_STATE(906)] = 54891,
-  [SMALL_STATE(907)] = 54933,
-  [SMALL_STATE(908)] = 54977,
-  [SMALL_STATE(909)] = 55019,
-  [SMALL_STATE(910)] = 55061,
-  [SMALL_STATE(911)] = 55103,
-  [SMALL_STATE(912)] = 55145,
-  [SMALL_STATE(913)] = 55187,
-  [SMALL_STATE(914)] = 55231,
-  [SMALL_STATE(915)] = 55275,
-  [SMALL_STATE(916)] = 55317,
-  [SMALL_STATE(917)] = 55359,
-  [SMALL_STATE(918)] = 55403,
-  [SMALL_STATE(919)] = 55445,
-  [SMALL_STATE(920)] = 55487,
-  [SMALL_STATE(921)] = 55529,
-  [SMALL_STATE(922)] = 55571,
-  [SMALL_STATE(923)] = 55613,
-  [SMALL_STATE(924)] = 55655,
-  [SMALL_STATE(925)] = 55699,
-  [SMALL_STATE(926)] = 55741,
-  [SMALL_STATE(927)] = 55783,
-  [SMALL_STATE(928)] = 55825,
-  [SMALL_STATE(929)] = 55867,
-  [SMALL_STATE(930)] = 55909,
-  [SMALL_STATE(931)] = 55951,
-  [SMALL_STATE(932)] = 56029,
-  [SMALL_STATE(933)] = 56071,
-  [SMALL_STATE(934)] = 56113,
-  [SMALL_STATE(935)] = 56191,
-  [SMALL_STATE(936)] = 56269,
-  [SMALL_STATE(937)] = 56311,
-  [SMALL_STATE(938)] = 56353,
-  [SMALL_STATE(939)] = 56395,
-  [SMALL_STATE(940)] = 56473,
-  [SMALL_STATE(941)] = 56515,
-  [SMALL_STATE(942)] = 56557,
-  [SMALL_STATE(943)] = 56599,
-  [SMALL_STATE(944)] = 56641,
-  [SMALL_STATE(945)] = 56683,
-  [SMALL_STATE(946)] = 56725,
-  [SMALL_STATE(947)] = 56767,
-  [SMALL_STATE(948)] = 56809,
-  [SMALL_STATE(949)] = 56851,
-  [SMALL_STATE(950)] = 56893,
-  [SMALL_STATE(951)] = 56935,
-  [SMALL_STATE(952)] = 56977,
-  [SMALL_STATE(953)] = 57018,
-  [SMALL_STATE(954)] = 57059,
-  [SMALL_STATE(955)] = 57100,
-  [SMALL_STATE(956)] = 57141,
-  [SMALL_STATE(957)] = 57182,
-  [SMALL_STATE(958)] = 57223,
-  [SMALL_STATE(959)] = 57264,
-  [SMALL_STATE(960)] = 57305,
-  [SMALL_STATE(961)] = 57346,
-  [SMALL_STATE(962)] = 57387,
-  [SMALL_STATE(963)] = 57428,
-  [SMALL_STATE(964)] = 57469,
-  [SMALL_STATE(965)] = 57510,
-  [SMALL_STATE(966)] = 57551,
-  [SMALL_STATE(967)] = 57592,
-  [SMALL_STATE(968)] = 57633,
-  [SMALL_STATE(969)] = 57674,
-  [SMALL_STATE(970)] = 57715,
-  [SMALL_STATE(971)] = 57756,
-  [SMALL_STATE(972)] = 57797,
-  [SMALL_STATE(973)] = 57838,
-  [SMALL_STATE(974)] = 57879,
-  [SMALL_STATE(975)] = 57920,
-  [SMALL_STATE(976)] = 57961,
-  [SMALL_STATE(977)] = 58002,
-  [SMALL_STATE(978)] = 58043,
-  [SMALL_STATE(979)] = 58084,
-  [SMALL_STATE(980)] = 58125,
-  [SMALL_STATE(981)] = 58166,
-  [SMALL_STATE(982)] = 58241,
-  [SMALL_STATE(983)] = 58320,
-  [SMALL_STATE(984)] = 58399,
-  [SMALL_STATE(985)] = 58444,
-  [SMALL_STATE(986)] = 58485,
-  [SMALL_STATE(987)] = 58530,
-  [SMALL_STATE(988)] = 58609,
-  [SMALL_STATE(989)] = 58650,
-  [SMALL_STATE(990)] = 58691,
-  [SMALL_STATE(991)] = 58732,
-  [SMALL_STATE(992)] = 58805,
-  [SMALL_STATE(993)] = 58875,
-  [SMALL_STATE(994)] = 58945,
-  [SMALL_STATE(995)] = 59007,
-  [SMALL_STATE(996)] = 59069,
-  [SMALL_STATE(997)] = 59108,
-  [SMALL_STATE(998)] = 59147,
-  [SMALL_STATE(999)] = 59186,
-  [SMALL_STATE(1000)] = 59225,
-  [SMALL_STATE(1001)] = 59255,
-  [SMALL_STATE(1002)] = 59292,
-  [SMALL_STATE(1003)] = 59317,
-  [SMALL_STATE(1004)] = 59354,
-  [SMALL_STATE(1005)] = 59391,
-  [SMALL_STATE(1006)] = 59416,
-  [SMALL_STATE(1007)] = 59469,
-  [SMALL_STATE(1008)] = 59522,
-  [SMALL_STATE(1009)] = 59559,
-  [SMALL_STATE(1010)] = 59584,
-  [SMALL_STATE(1011)] = 59637,
-  [SMALL_STATE(1012)] = 59666,
-  [SMALL_STATE(1013)] = 59691,
-  [SMALL_STATE(1014)] = 59720,
-  [SMALL_STATE(1015)] = 59755,
-  [SMALL_STATE(1016)] = 59790,
-  [SMALL_STATE(1017)] = 59824,
-  [SMALL_STATE(1018)] = 59870,
-  [SMALL_STATE(1019)] = 59898,
-  [SMALL_STATE(1020)] = 59932,
-  [SMALL_STATE(1021)] = 59963,
-  [SMALL_STATE(1022)] = 60006,
-  [SMALL_STATE(1023)] = 60049,
-  [SMALL_STATE(1024)] = 60092,
-  [SMALL_STATE(1025)] = 60135,
-  [SMALL_STATE(1026)] = 60178,
-  [SMALL_STATE(1027)] = 60221,
-  [SMALL_STATE(1028)] = 60264,
-  [SMALL_STATE(1029)] = 60304,
-  [SMALL_STATE(1030)] = 60348,
-  [SMALL_STATE(1031)] = 60373,
-  [SMALL_STATE(1032)] = 60410,
-  [SMALL_STATE(1033)] = 60447,
-  [SMALL_STATE(1034)] = 60484,
-  [SMALL_STATE(1035)] = 60521,
-  [SMALL_STATE(1036)] = 60555,
-  [SMALL_STATE(1037)] = 60589,
-  [SMALL_STATE(1038)] = 60610,
-  [SMALL_STATE(1039)] = 60631,
-  [SMALL_STATE(1040)] = 60653,
-  [SMALL_STATE(1041)] = 60684,
-  [SMALL_STATE(1042)] = 60721,
-  [SMALL_STATE(1043)] = 60744,
-  [SMALL_STATE(1044)] = 60765,
-  [SMALL_STATE(1045)] = 60796,
-  [SMALL_STATE(1046)] = 60827,
-  [SMALL_STATE(1047)] = 60858,
-  [SMALL_STATE(1048)] = 60895,
-  [SMALL_STATE(1049)] = 60932,
-  [SMALL_STATE(1050)] = 60963,
-  [SMALL_STATE(1051)] = 60994,
-  [SMALL_STATE(1052)] = 61025,
-  [SMALL_STATE(1053)] = 61056,
-  [SMALL_STATE(1054)] = 61073,
-  [SMALL_STATE(1055)] = 61104,
-  [SMALL_STATE(1056)] = 61135,
-  [SMALL_STATE(1057)] = 61166,
-  [SMALL_STATE(1058)] = 61197,
-  [SMALL_STATE(1059)] = 61228,
-  [SMALL_STATE(1060)] = 61259,
-  [SMALL_STATE(1061)] = 61290,
-  [SMALL_STATE(1062)] = 61321,
-  [SMALL_STATE(1063)] = 61352,
-  [SMALL_STATE(1064)] = 61389,
-  [SMALL_STATE(1065)] = 61412,
-  [SMALL_STATE(1066)] = 61443,
-  [SMALL_STATE(1067)] = 61474,
-  [SMALL_STATE(1068)] = 61511,
-  [SMALL_STATE(1069)] = 61532,
-  [SMALL_STATE(1070)] = 61552,
-  [SMALL_STATE(1071)] = 61586,
-  [SMALL_STATE(1072)] = 61606,
-  [SMALL_STATE(1073)] = 61630,
-  [SMALL_STATE(1074)] = 61652,
-  [SMALL_STATE(1075)] = 61686,
-  [SMALL_STATE(1076)] = 61720,
-  [SMALL_STATE(1077)] = 61742,
-  [SMALL_STATE(1078)] = 61766,
-  [SMALL_STATE(1079)] = 61784,
-  [SMALL_STATE(1080)] = 61802,
-  [SMALL_STATE(1081)] = 61836,
-  [SMALL_STATE(1082)] = 61856,
-  [SMALL_STATE(1083)] = 61880,
-  [SMALL_STATE(1084)] = 61902,
-  [SMALL_STATE(1085)] = 61936,
-  [SMALL_STATE(1086)] = 61958,
-  [SMALL_STATE(1087)] = 61992,
-  [SMALL_STATE(1088)] = 62026,
-  [SMALL_STATE(1089)] = 62046,
-  [SMALL_STATE(1090)] = 62068,
-  [SMALL_STATE(1091)] = 62102,
-  [SMALL_STATE(1092)] = 62124,
-  [SMALL_STATE(1093)] = 62158,
-  [SMALL_STATE(1094)] = 62192,
-  [SMALL_STATE(1095)] = 62226,
-  [SMALL_STATE(1096)] = 62260,
-  [SMALL_STATE(1097)] = 62278,
-  [SMALL_STATE(1098)] = 62297,
-  [SMALL_STATE(1099)] = 62318,
-  [SMALL_STATE(1100)] = 62337,
-  [SMALL_STATE(1101)] = 62360,
-  [SMALL_STATE(1102)] = 62379,
-  [SMALL_STATE(1103)] = 62398,
-  [SMALL_STATE(1104)] = 62423,
-  [SMALL_STATE(1105)] = 62442,
-  [SMALL_STATE(1106)] = 62461,
-  [SMALL_STATE(1107)] = 62484,
-  [SMALL_STATE(1108)] = 62509,
-  [SMALL_STATE(1109)] = 62532,
-  [SMALL_STATE(1110)] = 62553,
-  [SMALL_STATE(1111)] = 62567,
-  [SMALL_STATE(1112)] = 62581,
-  [SMALL_STATE(1113)] = 62599,
-  [SMALL_STATE(1114)] = 62617,
-  [SMALL_STATE(1115)] = 62631,
-  [SMALL_STATE(1116)] = 62649,
-  [SMALL_STATE(1117)] = 62663,
-  [SMALL_STATE(1118)] = 62679,
-  [SMALL_STATE(1119)] = 62699,
-  [SMALL_STATE(1120)] = 62721,
-  [SMALL_STATE(1121)] = 62741,
-  [SMALL_STATE(1122)] = 62761,
-  [SMALL_STATE(1123)] = 62779,
-  [SMALL_STATE(1124)] = 62797,
-  [SMALL_STATE(1125)] = 62811,
-  [SMALL_STATE(1126)] = 62831,
-  [SMALL_STATE(1127)] = 62845,
-  [SMALL_STATE(1128)] = 62859,
-  [SMALL_STATE(1129)] = 62873,
-  [SMALL_STATE(1130)] = 62887,
-  [SMALL_STATE(1131)] = 62901,
-  [SMALL_STATE(1132)] = 62915,
-  [SMALL_STATE(1133)] = 62929,
-  [SMALL_STATE(1134)] = 62943,
-  [SMALL_STATE(1135)] = 62957,
-  [SMALL_STATE(1136)] = 62975,
-  [SMALL_STATE(1137)] = 62989,
-  [SMALL_STATE(1138)] = 63015,
-  [SMALL_STATE(1139)] = 63029,
-  [SMALL_STATE(1140)] = 63049,
-  [SMALL_STATE(1141)] = 63063,
-  [SMALL_STATE(1142)] = 63077,
-  [SMALL_STATE(1143)] = 63091,
-  [SMALL_STATE(1144)] = 63105,
-  [SMALL_STATE(1145)] = 63125,
-  [SMALL_STATE(1146)] = 63139,
-  [SMALL_STATE(1147)] = 63163,
-  [SMALL_STATE(1148)] = 63179,
-  [SMALL_STATE(1149)] = 63193,
-  [SMALL_STATE(1150)] = 63215,
-  [SMALL_STATE(1151)] = 63229,
-  [SMALL_STATE(1152)] = 63243,
-  [SMALL_STATE(1153)] = 63261,
-  [SMALL_STATE(1154)] = 63279,
-  [SMALL_STATE(1155)] = 63299,
-  [SMALL_STATE(1156)] = 63317,
-  [SMALL_STATE(1157)] = 63333,
-  [SMALL_STATE(1158)] = 63351,
-  [SMALL_STATE(1159)] = 63365,
-  [SMALL_STATE(1160)] = 63385,
-  [SMALL_STATE(1161)] = 63407,
-  [SMALL_STATE(1162)] = 63427,
-  [SMALL_STATE(1163)] = 63447,
-  [SMALL_STATE(1164)] = 63467,
-  [SMALL_STATE(1165)] = 63485,
-  [SMALL_STATE(1166)] = 63501,
-  [SMALL_STATE(1167)] = 63521,
-  [SMALL_STATE(1168)] = 63539,
-  [SMALL_STATE(1169)] = 63559,
-  [SMALL_STATE(1170)] = 63579,
-  [SMALL_STATE(1171)] = 63599,
-  [SMALL_STATE(1172)] = 63617,
-  [SMALL_STATE(1173)] = 63641,
-  [SMALL_STATE(1174)] = 63659,
-  [SMALL_STATE(1175)] = 63677,
-  [SMALL_STATE(1176)] = 63701,
-  [SMALL_STATE(1177)] = 63715,
-  [SMALL_STATE(1178)] = 63740,
-  [SMALL_STATE(1179)] = 63753,
-  [SMALL_STATE(1180)] = 63772,
-  [SMALL_STATE(1181)] = 63797,
-  [SMALL_STATE(1182)] = 63820,
-  [SMALL_STATE(1183)] = 63839,
-  [SMALL_STATE(1184)] = 63860,
-  [SMALL_STATE(1185)] = 63885,
-  [SMALL_STATE(1186)] = 63910,
-  [SMALL_STATE(1187)] = 63935,
-  [SMALL_STATE(1188)] = 63960,
-  [SMALL_STATE(1189)] = 63979,
-  [SMALL_STATE(1190)] = 63996,
-  [SMALL_STATE(1191)] = 64011,
-  [SMALL_STATE(1192)] = 64034,
-  [SMALL_STATE(1193)] = 64055,
-  [SMALL_STATE(1194)] = 64080,
-  [SMALL_STATE(1195)] = 64105,
-  [SMALL_STATE(1196)] = 64126,
-  [SMALL_STATE(1197)] = 64151,
-  [SMALL_STATE(1198)] = 64170,
-  [SMALL_STATE(1199)] = 64183,
-  [SMALL_STATE(1200)] = 64202,
-  [SMALL_STATE(1201)] = 64221,
-  [SMALL_STATE(1202)] = 64238,
-  [SMALL_STATE(1203)] = 64263,
-  [SMALL_STATE(1204)] = 64288,
-  [SMALL_STATE(1205)] = 64313,
-  [SMALL_STATE(1206)] = 64326,
-  [SMALL_STATE(1207)] = 64351,
-  [SMALL_STATE(1208)] = 64376,
-  [SMALL_STATE(1209)] = 64401,
-  [SMALL_STATE(1210)] = 64426,
-  [SMALL_STATE(1211)] = 64449,
-  [SMALL_STATE(1212)] = 64474,
-  [SMALL_STATE(1213)] = 64499,
-  [SMALL_STATE(1214)] = 64522,
-  [SMALL_STATE(1215)] = 64539,
-  [SMALL_STATE(1216)] = 64560,
-  [SMALL_STATE(1217)] = 64581,
-  [SMALL_STATE(1218)] = 64606,
-  [SMALL_STATE(1219)] = 64631,
-  [SMALL_STATE(1220)] = 64650,
-  [SMALL_STATE(1221)] = 64669,
-  [SMALL_STATE(1222)] = 64688,
-  [SMALL_STATE(1223)] = 64701,
-  [SMALL_STATE(1224)] = 64724,
-  [SMALL_STATE(1225)] = 64743,
-  [SMALL_STATE(1226)] = 64766,
-  [SMALL_STATE(1227)] = 64791,
-  [SMALL_STATE(1228)] = 64816,
-  [SMALL_STATE(1229)] = 64841,
-  [SMALL_STATE(1230)] = 64866,
-  [SMALL_STATE(1231)] = 64891,
-  [SMALL_STATE(1232)] = 64910,
-  [SMALL_STATE(1233)] = 64935,
-  [SMALL_STATE(1234)] = 64948,
-  [SMALL_STATE(1235)] = 64967,
-  [SMALL_STATE(1236)] = 64990,
-  [SMALL_STATE(1237)] = 65015,
-  [SMALL_STATE(1238)] = 65028,
-  [SMALL_STATE(1239)] = 65047,
-  [SMALL_STATE(1240)] = 65070,
-  [SMALL_STATE(1241)] = 65085,
-  [SMALL_STATE(1242)] = 65108,
-  [SMALL_STATE(1243)] = 65124,
-  [SMALL_STATE(1244)] = 65140,
-  [SMALL_STATE(1245)] = 65160,
-  [SMALL_STATE(1246)] = 65176,
-  [SMALL_STATE(1247)] = 65196,
-  [SMALL_STATE(1248)] = 65214,
-  [SMALL_STATE(1249)] = 65228,
-  [SMALL_STATE(1250)] = 65244,
-  [SMALL_STATE(1251)] = 65266,
-  [SMALL_STATE(1252)] = 65282,
-  [SMALL_STATE(1253)] = 65296,
-  [SMALL_STATE(1254)] = 65318,
-  [SMALL_STATE(1255)] = 65338,
-  [SMALL_STATE(1256)] = 65356,
-  [SMALL_STATE(1257)] = 65372,
-  [SMALL_STATE(1258)] = 65388,
-  [SMALL_STATE(1259)] = 65410,
-  [SMALL_STATE(1260)] = 65424,
-  [SMALL_STATE(1261)] = 65438,
-  [SMALL_STATE(1262)] = 65456,
-  [SMALL_STATE(1263)] = 65472,
-  [SMALL_STATE(1264)] = 65484,
-  [SMALL_STATE(1265)] = 65504,
-  [SMALL_STATE(1266)] = 65526,
-  [SMALL_STATE(1267)] = 65544,
-  [SMALL_STATE(1268)] = 65562,
-  [SMALL_STATE(1269)] = 65580,
-  [SMALL_STATE(1270)] = 65600,
-  [SMALL_STATE(1271)] = 65616,
-  [SMALL_STATE(1272)] = 65634,
-  [SMALL_STATE(1273)] = 65650,
-  [SMALL_STATE(1274)] = 65666,
-  [SMALL_STATE(1275)] = 65682,
-  [SMALL_STATE(1276)] = 65696,
-  [SMALL_STATE(1277)] = 65718,
-  [SMALL_STATE(1278)] = 65740,
-  [SMALL_STATE(1279)] = 65758,
-  [SMALL_STATE(1280)] = 65780,
-  [SMALL_STATE(1281)] = 65796,
-  [SMALL_STATE(1282)] = 65810,
-  [SMALL_STATE(1283)] = 65822,
-  [SMALL_STATE(1284)] = 65839,
-  [SMALL_STATE(1285)] = 65856,
-  [SMALL_STATE(1286)] = 65875,
-  [SMALL_STATE(1287)] = 65890,
-  [SMALL_STATE(1288)] = 65909,
-  [SMALL_STATE(1289)] = 65924,
-  [SMALL_STATE(1290)] = 65943,
-  [SMALL_STATE(1291)] = 65960,
-  [SMALL_STATE(1292)] = 65971,
-  [SMALL_STATE(1293)] = 65988,
-  [SMALL_STATE(1294)] = 65999,
-  [SMALL_STATE(1295)] = 66014,
-  [SMALL_STATE(1296)] = 66031,
-  [SMALL_STATE(1297)] = 66050,
-  [SMALL_STATE(1298)] = 66067,
-  [SMALL_STATE(1299)] = 66084,
-  [SMALL_STATE(1300)] = 66099,
-  [SMALL_STATE(1301)] = 66116,
-  [SMALL_STATE(1302)] = 66127,
-  [SMALL_STATE(1303)] = 66144,
-  [SMALL_STATE(1304)] = 66161,
-  [SMALL_STATE(1305)] = 66178,
-  [SMALL_STATE(1306)] = 66197,
-  [SMALL_STATE(1307)] = 66216,
-  [SMALL_STATE(1308)] = 66227,
-  [SMALL_STATE(1309)] = 66242,
-  [SMALL_STATE(1310)] = 66257,
-  [SMALL_STATE(1311)] = 66272,
-  [SMALL_STATE(1312)] = 66287,
-  [SMALL_STATE(1313)] = 66298,
-  [SMALL_STATE(1314)] = 66315,
-  [SMALL_STATE(1315)] = 66334,
-  [SMALL_STATE(1316)] = 66353,
-  [SMALL_STATE(1317)] = 66370,
-  [SMALL_STATE(1318)] = 66387,
-  [SMALL_STATE(1319)] = 66404,
-  [SMALL_STATE(1320)] = 66421,
-  [SMALL_STATE(1321)] = 66438,
-  [SMALL_STATE(1322)] = 66455,
-  [SMALL_STATE(1323)] = 66471,
-  [SMALL_STATE(1324)] = 66485,
-  [SMALL_STATE(1325)] = 66499,
-  [SMALL_STATE(1326)] = 66515,
-  [SMALL_STATE(1327)] = 66531,
-  [SMALL_STATE(1328)] = 66545,
-  [SMALL_STATE(1329)] = 66561,
-  [SMALL_STATE(1330)] = 66573,
-  [SMALL_STATE(1331)] = 66589,
-  [SMALL_STATE(1332)] = 66605,
-  [SMALL_STATE(1333)] = 66619,
-  [SMALL_STATE(1334)] = 66631,
-  [SMALL_STATE(1335)] = 66645,
-  [SMALL_STATE(1336)] = 66659,
-  [SMALL_STATE(1337)] = 66673,
-  [SMALL_STATE(1338)] = 66689,
-  [SMALL_STATE(1339)] = 66705,
-  [SMALL_STATE(1340)] = 66719,
-  [SMALL_STATE(1341)] = 66733,
-  [SMALL_STATE(1342)] = 66749,
-  [SMALL_STATE(1343)] = 66765,
-  [SMALL_STATE(1344)] = 66779,
-  [SMALL_STATE(1345)] = 66789,
-  [SMALL_STATE(1346)] = 66805,
-  [SMALL_STATE(1347)] = 66821,
-  [SMALL_STATE(1348)] = 66837,
-  [SMALL_STATE(1349)] = 66851,
-  [SMALL_STATE(1350)] = 66861,
-  [SMALL_STATE(1351)] = 66877,
-  [SMALL_STATE(1352)] = 66893,
-  [SMALL_STATE(1353)] = 66907,
-  [SMALL_STATE(1354)] = 66923,
-  [SMALL_STATE(1355)] = 66933,
-  [SMALL_STATE(1356)] = 66947,
-  [SMALL_STATE(1357)] = 66963,
-  [SMALL_STATE(1358)] = 66979,
-  [SMALL_STATE(1359)] = 66989,
-  [SMALL_STATE(1360)] = 67005,
-  [SMALL_STATE(1361)] = 67019,
-  [SMALL_STATE(1362)] = 67035,
-  [SMALL_STATE(1363)] = 67051,
-  [SMALL_STATE(1364)] = 67067,
-  [SMALL_STATE(1365)] = 67081,
-  [SMALL_STATE(1366)] = 67097,
-  [SMALL_STATE(1367)] = 67111,
-  [SMALL_STATE(1368)] = 67127,
-  [SMALL_STATE(1369)] = 67141,
-  [SMALL_STATE(1370)] = 67155,
-  [SMALL_STATE(1371)] = 67171,
-  [SMALL_STATE(1372)] = 67187,
-  [SMALL_STATE(1373)] = 67201,
-  [SMALL_STATE(1374)] = 67215,
-  [SMALL_STATE(1375)] = 67229,
-  [SMALL_STATE(1376)] = 67243,
-  [SMALL_STATE(1377)] = 67259,
-  [SMALL_STATE(1378)] = 67275,
-  [SMALL_STATE(1379)] = 67291,
-  [SMALL_STATE(1380)] = 67305,
-  [SMALL_STATE(1381)] = 67319,
-  [SMALL_STATE(1382)] = 67335,
-  [SMALL_STATE(1383)] = 67349,
-  [SMALL_STATE(1384)] = 67363,
-  [SMALL_STATE(1385)] = 67379,
-  [SMALL_STATE(1386)] = 67395,
-  [SMALL_STATE(1387)] = 67411,
-  [SMALL_STATE(1388)] = 67427,
-  [SMALL_STATE(1389)] = 67441,
-  [SMALL_STATE(1390)] = 67455,
-  [SMALL_STATE(1391)] = 67469,
-  [SMALL_STATE(1392)] = 67479,
-  [SMALL_STATE(1393)] = 67493,
-  [SMALL_STATE(1394)] = 67503,
-  [SMALL_STATE(1395)] = 67517,
-  [SMALL_STATE(1396)] = 67533,
-  [SMALL_STATE(1397)] = 67549,
-  [SMALL_STATE(1398)] = 67565,
-  [SMALL_STATE(1399)] = 67581,
-  [SMALL_STATE(1400)] = 67597,
-  [SMALL_STATE(1401)] = 67611,
-  [SMALL_STATE(1402)] = 67625,
-  [SMALL_STATE(1403)] = 67641,
-  [SMALL_STATE(1404)] = 67657,
-  [SMALL_STATE(1405)] = 67671,
-  [SMALL_STATE(1406)] = 67684,
-  [SMALL_STATE(1407)] = 67697,
-  [SMALL_STATE(1408)] = 67710,
-  [SMALL_STATE(1409)] = 67721,
-  [SMALL_STATE(1410)] = 67734,
-  [SMALL_STATE(1411)] = 67743,
-  [SMALL_STATE(1412)] = 67754,
-  [SMALL_STATE(1413)] = 67767,
-  [SMALL_STATE(1414)] = 67780,
-  [SMALL_STATE(1415)] = 67793,
-  [SMALL_STATE(1416)] = 67806,
-  [SMALL_STATE(1417)] = 67819,
-  [SMALL_STATE(1418)] = 67828,
-  [SMALL_STATE(1419)] = 67841,
-  [SMALL_STATE(1420)] = 67854,
-  [SMALL_STATE(1421)] = 67867,
-  [SMALL_STATE(1422)] = 67880,
-  [SMALL_STATE(1423)] = 67889,
-  [SMALL_STATE(1424)] = 67902,
-  [SMALL_STATE(1425)] = 67915,
-  [SMALL_STATE(1426)] = 67924,
-  [SMALL_STATE(1427)] = 67937,
-  [SMALL_STATE(1428)] = 67950,
-  [SMALL_STATE(1429)] = 67959,
-  [SMALL_STATE(1430)] = 67972,
-  [SMALL_STATE(1431)] = 67985,
-  [SMALL_STATE(1432)] = 67996,
-  [SMALL_STATE(1433)] = 68009,
-  [SMALL_STATE(1434)] = 68022,
-  [SMALL_STATE(1435)] = 68035,
-  [SMALL_STATE(1436)] = 68048,
-  [SMALL_STATE(1437)] = 68059,
-  [SMALL_STATE(1438)] = 68068,
-  [SMALL_STATE(1439)] = 68079,
-  [SMALL_STATE(1440)] = 68092,
-  [SMALL_STATE(1441)] = 68105,
-  [SMALL_STATE(1442)] = 68118,
-  [SMALL_STATE(1443)] = 68127,
-  [SMALL_STATE(1444)] = 68140,
-  [SMALL_STATE(1445)] = 68153,
-  [SMALL_STATE(1446)] = 68166,
-  [SMALL_STATE(1447)] = 68177,
-  [SMALL_STATE(1448)] = 68190,
-  [SMALL_STATE(1449)] = 68203,
-  [SMALL_STATE(1450)] = 68216,
-  [SMALL_STATE(1451)] = 68229,
-  [SMALL_STATE(1452)] = 68242,
-  [SMALL_STATE(1453)] = 68255,
-  [SMALL_STATE(1454)] = 68268,
-  [SMALL_STATE(1455)] = 68281,
-  [SMALL_STATE(1456)] = 68294,
-  [SMALL_STATE(1457)] = 68307,
-  [SMALL_STATE(1458)] = 68320,
-  [SMALL_STATE(1459)] = 68333,
-  [SMALL_STATE(1460)] = 68346,
-  [SMALL_STATE(1461)] = 68359,
-  [SMALL_STATE(1462)] = 68372,
-  [SMALL_STATE(1463)] = 68385,
-  [SMALL_STATE(1464)] = 68396,
-  [SMALL_STATE(1465)] = 68409,
-  [SMALL_STATE(1466)] = 68422,
-  [SMALL_STATE(1467)] = 68435,
-  [SMALL_STATE(1468)] = 68448,
-  [SMALL_STATE(1469)] = 68461,
-  [SMALL_STATE(1470)] = 68474,
-  [SMALL_STATE(1471)] = 68487,
-  [SMALL_STATE(1472)] = 68500,
-  [SMALL_STATE(1473)] = 68513,
-  [SMALL_STATE(1474)] = 68526,
-  [SMALL_STATE(1475)] = 68539,
-  [SMALL_STATE(1476)] = 68552,
-  [SMALL_STATE(1477)] = 68565,
-  [SMALL_STATE(1478)] = 68578,
-  [SMALL_STATE(1479)] = 68591,
-  [SMALL_STATE(1480)] = 68604,
-  [SMALL_STATE(1481)] = 68617,
-  [SMALL_STATE(1482)] = 68630,
-  [SMALL_STATE(1483)] = 68643,
-  [SMALL_STATE(1484)] = 68656,
-  [SMALL_STATE(1485)] = 68669,
-  [SMALL_STATE(1486)] = 68678,
-  [SMALL_STATE(1487)] = 68691,
-  [SMALL_STATE(1488)] = 68704,
-  [SMALL_STATE(1489)] = 68717,
-  [SMALL_STATE(1490)] = 68730,
-  [SMALL_STATE(1491)] = 68743,
-  [SMALL_STATE(1492)] = 68756,
-  [SMALL_STATE(1493)] = 68769,
-  [SMALL_STATE(1494)] = 68782,
-  [SMALL_STATE(1495)] = 68791,
-  [SMALL_STATE(1496)] = 68804,
-  [SMALL_STATE(1497)] = 68817,
-  [SMALL_STATE(1498)] = 68830,
-  [SMALL_STATE(1499)] = 68843,
-  [SMALL_STATE(1500)] = 68854,
-  [SMALL_STATE(1501)] = 68867,
-  [SMALL_STATE(1502)] = 68880,
-  [SMALL_STATE(1503)] = 68893,
-  [SMALL_STATE(1504)] = 68906,
-  [SMALL_STATE(1505)] = 68919,
-  [SMALL_STATE(1506)] = 68932,
-  [SMALL_STATE(1507)] = 68945,
-  [SMALL_STATE(1508)] = 68956,
-  [SMALL_STATE(1509)] = 68967,
-  [SMALL_STATE(1510)] = 68976,
-  [SMALL_STATE(1511)] = 68985,
-  [SMALL_STATE(1512)] = 68998,
-  [SMALL_STATE(1513)] = 69007,
-  [SMALL_STATE(1514)] = 69020,
-  [SMALL_STATE(1515)] = 69033,
-  [SMALL_STATE(1516)] = 69046,
-  [SMALL_STATE(1517)] = 69057,
-  [SMALL_STATE(1518)] = 69068,
-  [SMALL_STATE(1519)] = 69081,
-  [SMALL_STATE(1520)] = 69094,
-  [SMALL_STATE(1521)] = 69107,
-  [SMALL_STATE(1522)] = 69120,
-  [SMALL_STATE(1523)] = 69129,
-  [SMALL_STATE(1524)] = 69142,
-  [SMALL_STATE(1525)] = 69151,
-  [SMALL_STATE(1526)] = 69164,
-  [SMALL_STATE(1527)] = 69177,
-  [SMALL_STATE(1528)] = 69190,
-  [SMALL_STATE(1529)] = 69203,
-  [SMALL_STATE(1530)] = 69212,
-  [SMALL_STATE(1531)] = 69225,
-  [SMALL_STATE(1532)] = 69238,
-  [SMALL_STATE(1533)] = 69251,
-  [SMALL_STATE(1534)] = 69259,
-  [SMALL_STATE(1535)] = 69267,
-  [SMALL_STATE(1536)] = 69275,
-  [SMALL_STATE(1537)] = 69283,
-  [SMALL_STATE(1538)] = 69293,
-  [SMALL_STATE(1539)] = 69303,
-  [SMALL_STATE(1540)] = 69311,
-  [SMALL_STATE(1541)] = 69319,
-  [SMALL_STATE(1542)] = 69329,
-  [SMALL_STATE(1543)] = 69337,
-  [SMALL_STATE(1544)] = 69347,
-  [SMALL_STATE(1545)] = 69357,
-  [SMALL_STATE(1546)] = 69365,
-  [SMALL_STATE(1547)] = 69375,
-  [SMALL_STATE(1548)] = 69385,
-  [SMALL_STATE(1549)] = 69395,
-  [SMALL_STATE(1550)] = 69403,
-  [SMALL_STATE(1551)] = 69411,
-  [SMALL_STATE(1552)] = 69421,
-  [SMALL_STATE(1553)] = 69429,
-  [SMALL_STATE(1554)] = 69439,
-  [SMALL_STATE(1555)] = 69447,
-  [SMALL_STATE(1556)] = 69457,
-  [SMALL_STATE(1557)] = 69467,
-  [SMALL_STATE(1558)] = 69475,
-  [SMALL_STATE(1559)] = 69483,
-  [SMALL_STATE(1560)] = 69491,
-  [SMALL_STATE(1561)] = 69501,
-  [SMALL_STATE(1562)] = 69509,
-  [SMALL_STATE(1563)] = 69517,
-  [SMALL_STATE(1564)] = 69525,
-  [SMALL_STATE(1565)] = 69535,
-  [SMALL_STATE(1566)] = 69543,
-  [SMALL_STATE(1567)] = 69551,
-  [SMALL_STATE(1568)] = 69559,
-  [SMALL_STATE(1569)] = 69569,
-  [SMALL_STATE(1570)] = 69577,
-  [SMALL_STATE(1571)] = 69585,
-  [SMALL_STATE(1572)] = 69593,
-  [SMALL_STATE(1573)] = 69603,
-  [SMALL_STATE(1574)] = 69613,
-  [SMALL_STATE(1575)] = 69623,
-  [SMALL_STATE(1576)] = 69631,
-  [SMALL_STATE(1577)] = 69641,
-  [SMALL_STATE(1578)] = 69649,
-  [SMALL_STATE(1579)] = 69657,
-  [SMALL_STATE(1580)] = 69665,
-  [SMALL_STATE(1581)] = 69673,
-  [SMALL_STATE(1582)] = 69681,
-  [SMALL_STATE(1583)] = 69689,
-  [SMALL_STATE(1584)] = 69697,
-  [SMALL_STATE(1585)] = 69705,
-  [SMALL_STATE(1586)] = 69713,
-  [SMALL_STATE(1587)] = 69721,
-  [SMALL_STATE(1588)] = 69731,
-  [SMALL_STATE(1589)] = 69741,
-  [SMALL_STATE(1590)] = 69749,
-  [SMALL_STATE(1591)] = 69759,
-  [SMALL_STATE(1592)] = 69767,
-  [SMALL_STATE(1593)] = 69775,
-  [SMALL_STATE(1594)] = 69785,
-  [SMALL_STATE(1595)] = 69795,
-  [SMALL_STATE(1596)] = 69805,
-  [SMALL_STATE(1597)] = 69813,
-  [SMALL_STATE(1598)] = 69823,
-  [SMALL_STATE(1599)] = 69831,
-  [SMALL_STATE(1600)] = 69841,
-  [SMALL_STATE(1601)] = 69849,
-  [SMALL_STATE(1602)] = 69859,
-  [SMALL_STATE(1603)] = 69869,
-  [SMALL_STATE(1604)] = 69877,
-  [SMALL_STATE(1605)] = 69887,
-  [SMALL_STATE(1606)] = 69895,
-  [SMALL_STATE(1607)] = 69903,
-  [SMALL_STATE(1608)] = 69911,
-  [SMALL_STATE(1609)] = 69919,
-  [SMALL_STATE(1610)] = 69927,
-  [SMALL_STATE(1611)] = 69935,
-  [SMALL_STATE(1612)] = 69943,
-  [SMALL_STATE(1613)] = 69953,
-  [SMALL_STATE(1614)] = 69960,
-  [SMALL_STATE(1615)] = 69967,
-  [SMALL_STATE(1616)] = 69974,
-  [SMALL_STATE(1617)] = 69981,
-  [SMALL_STATE(1618)] = 69988,
-  [SMALL_STATE(1619)] = 69995,
-  [SMALL_STATE(1620)] = 70002,
-  [SMALL_STATE(1621)] = 70009,
-  [SMALL_STATE(1622)] = 70016,
-  [SMALL_STATE(1623)] = 70023,
-  [SMALL_STATE(1624)] = 70030,
-  [SMALL_STATE(1625)] = 70037,
-  [SMALL_STATE(1626)] = 70044,
-  [SMALL_STATE(1627)] = 70051,
-  [SMALL_STATE(1628)] = 70058,
-  [SMALL_STATE(1629)] = 70065,
-  [SMALL_STATE(1630)] = 70072,
-  [SMALL_STATE(1631)] = 70079,
-  [SMALL_STATE(1632)] = 70086,
-  [SMALL_STATE(1633)] = 70093,
-  [SMALL_STATE(1634)] = 70100,
-  [SMALL_STATE(1635)] = 70107,
-  [SMALL_STATE(1636)] = 70114,
-  [SMALL_STATE(1637)] = 70121,
-  [SMALL_STATE(1638)] = 70128,
-  [SMALL_STATE(1639)] = 70135,
-  [SMALL_STATE(1640)] = 70142,
-  [SMALL_STATE(1641)] = 70149,
-  [SMALL_STATE(1642)] = 70156,
-  [SMALL_STATE(1643)] = 70163,
-  [SMALL_STATE(1644)] = 70170,
-  [SMALL_STATE(1645)] = 70177,
-  [SMALL_STATE(1646)] = 70184,
-  [SMALL_STATE(1647)] = 70191,
-  [SMALL_STATE(1648)] = 70198,
-  [SMALL_STATE(1649)] = 70205,
-  [SMALL_STATE(1650)] = 70212,
-  [SMALL_STATE(1651)] = 70219,
-  [SMALL_STATE(1652)] = 70226,
-  [SMALL_STATE(1653)] = 70233,
-  [SMALL_STATE(1654)] = 70240,
-  [SMALL_STATE(1655)] = 70247,
-  [SMALL_STATE(1656)] = 70254,
-  [SMALL_STATE(1657)] = 70261,
-  [SMALL_STATE(1658)] = 70268,
-  [SMALL_STATE(1659)] = 70275,
-  [SMALL_STATE(1660)] = 70282,
-  [SMALL_STATE(1661)] = 70289,
-  [SMALL_STATE(1662)] = 70296,
-  [SMALL_STATE(1663)] = 70303,
-  [SMALL_STATE(1664)] = 70310,
-  [SMALL_STATE(1665)] = 70317,
-  [SMALL_STATE(1666)] = 70324,
-  [SMALL_STATE(1667)] = 70331,
-  [SMALL_STATE(1668)] = 70338,
-  [SMALL_STATE(1669)] = 70345,
-  [SMALL_STATE(1670)] = 70352,
-  [SMALL_STATE(1671)] = 70359,
-  [SMALL_STATE(1672)] = 70366,
-  [SMALL_STATE(1673)] = 70373,
-  [SMALL_STATE(1674)] = 70380,
-  [SMALL_STATE(1675)] = 70387,
-  [SMALL_STATE(1676)] = 70394,
-  [SMALL_STATE(1677)] = 70401,
-  [SMALL_STATE(1678)] = 70408,
-  [SMALL_STATE(1679)] = 70415,
-  [SMALL_STATE(1680)] = 70422,
-  [SMALL_STATE(1681)] = 70429,
-  [SMALL_STATE(1682)] = 70436,
-  [SMALL_STATE(1683)] = 70443,
-  [SMALL_STATE(1684)] = 70450,
-  [SMALL_STATE(1685)] = 70457,
-  [SMALL_STATE(1686)] = 70464,
-  [SMALL_STATE(1687)] = 70471,
-  [SMALL_STATE(1688)] = 70478,
-  [SMALL_STATE(1689)] = 70485,
-  [SMALL_STATE(1690)] = 70492,
-  [SMALL_STATE(1691)] = 70499,
-  [SMALL_STATE(1692)] = 70506,
-  [SMALL_STATE(1693)] = 70513,
-  [SMALL_STATE(1694)] = 70520,
-  [SMALL_STATE(1695)] = 70527,
-  [SMALL_STATE(1696)] = 70534,
-  [SMALL_STATE(1697)] = 70541,
-  [SMALL_STATE(1698)] = 70548,
-  [SMALL_STATE(1699)] = 70555,
-  [SMALL_STATE(1700)] = 70562,
-  [SMALL_STATE(1701)] = 70569,
-  [SMALL_STATE(1702)] = 70576,
-  [SMALL_STATE(1703)] = 70583,
-  [SMALL_STATE(1704)] = 70590,
-  [SMALL_STATE(1705)] = 70597,
-  [SMALL_STATE(1706)] = 70604,
-  [SMALL_STATE(1707)] = 70611,
-  [SMALL_STATE(1708)] = 70618,
-  [SMALL_STATE(1709)] = 70625,
-  [SMALL_STATE(1710)] = 70632,
-  [SMALL_STATE(1711)] = 70639,
-  [SMALL_STATE(1712)] = 70646,
-  [SMALL_STATE(1713)] = 70653,
-  [SMALL_STATE(1714)] = 70660,
-  [SMALL_STATE(1715)] = 70667,
-  [SMALL_STATE(1716)] = 70674,
-  [SMALL_STATE(1717)] = 70681,
-  [SMALL_STATE(1718)] = 70688,
-  [SMALL_STATE(1719)] = 70695,
-  [SMALL_STATE(1720)] = 70702,
-  [SMALL_STATE(1721)] = 70709,
-  [SMALL_STATE(1722)] = 70716,
-  [SMALL_STATE(1723)] = 70723,
-  [SMALL_STATE(1724)] = 70730,
-  [SMALL_STATE(1725)] = 70737,
-  [SMALL_STATE(1726)] = 70744,
-  [SMALL_STATE(1727)] = 70751,
-  [SMALL_STATE(1728)] = 70758,
-  [SMALL_STATE(1729)] = 70765,
-  [SMALL_STATE(1730)] = 70772,
-  [SMALL_STATE(1731)] = 70779,
-  [SMALL_STATE(1732)] = 70786,
-  [SMALL_STATE(1733)] = 70793,
-  [SMALL_STATE(1734)] = 70800,
-  [SMALL_STATE(1735)] = 70807,
-  [SMALL_STATE(1736)] = 70814,
-  [SMALL_STATE(1737)] = 70821,
-  [SMALL_STATE(1738)] = 70828,
-  [SMALL_STATE(1739)] = 70835,
-  [SMALL_STATE(1740)] = 70842,
-  [SMALL_STATE(1741)] = 70849,
-  [SMALL_STATE(1742)] = 70856,
-  [SMALL_STATE(1743)] = 70863,
-  [SMALL_STATE(1744)] = 70870,
-  [SMALL_STATE(1745)] = 70877,
-  [SMALL_STATE(1746)] = 70884,
-  [SMALL_STATE(1747)] = 70891,
-  [SMALL_STATE(1748)] = 70898,
-  [SMALL_STATE(1749)] = 70905,
-  [SMALL_STATE(1750)] = 70912,
-  [SMALL_STATE(1751)] = 70919,
-  [SMALL_STATE(1752)] = 70926,
-  [SMALL_STATE(1753)] = 70933,
-  [SMALL_STATE(1754)] = 70940,
+  [SMALL_STATE(790)] = 48807,
+  [SMALL_STATE(791)] = 48867,
+  [SMALL_STATE(792)] = 48935,
+  [SMALL_STATE(793)] = 49001,
+  [SMALL_STATE(794)] = 49059,
+  [SMALL_STATE(795)] = 49113,
+  [SMALL_STATE(796)] = 49177,
+  [SMALL_STATE(797)] = 49239,
+  [SMALL_STATE(798)] = 49307,
+  [SMALL_STATE(799)] = 49375,
+  [SMALL_STATE(800)] = 49429,
+  [SMALL_STATE(801)] = 49489,
+  [SMALL_STATE(802)] = 49557,
+  [SMALL_STATE(803)] = 49623,
+  [SMALL_STATE(804)] = 49681,
+  [SMALL_STATE(805)] = 49735,
+  [SMALL_STATE(806)] = 49803,
+  [SMALL_STATE(807)] = 49867,
+  [SMALL_STATE(808)] = 49929,
+  [SMALL_STATE(809)] = 49983,
+  [SMALL_STATE(810)] = 50037,
+  [SMALL_STATE(811)] = 50119,
+  [SMALL_STATE(812)] = 50195,
+  [SMALL_STATE(813)] = 50249,
+  [SMALL_STATE(814)] = 50331,
+  [SMALL_STATE(815)] = 50379,
+  [SMALL_STATE(816)] = 50427,
+  [SMALL_STATE(817)] = 50471,
+  [SMALL_STATE(818)] = 50515,
+  [SMALL_STATE(819)] = 50569,
+  [SMALL_STATE(820)] = 50623,
+  [SMALL_STATE(821)] = 50667,
+  [SMALL_STATE(822)] = 50711,
+  [SMALL_STATE(823)] = 50765,
+  [SMALL_STATE(824)] = 50825,
+  [SMALL_STATE(825)] = 50893,
+  [SMALL_STATE(826)] = 50959,
+  [SMALL_STATE(827)] = 51017,
+  [SMALL_STATE(828)] = 51071,
+  [SMALL_STATE(829)] = 51135,
+  [SMALL_STATE(830)] = 51197,
+  [SMALL_STATE(831)] = 51265,
+  [SMALL_STATE(832)] = 51333,
+  [SMALL_STATE(833)] = 51415,
+  [SMALL_STATE(834)] = 51469,
+  [SMALL_STATE(835)] = 51551,
+  [SMALL_STATE(836)] = 51604,
+  [SMALL_STATE(837)] = 51651,
+  [SMALL_STATE(838)] = 51698,
+  [SMALL_STATE(839)] = 51741,
+  [SMALL_STATE(840)] = 51804,
+  [SMALL_STATE(841)] = 51865,
+  [SMALL_STATE(842)] = 51910,
+  [SMALL_STATE(843)] = 51955,
+  [SMALL_STATE(844)] = 52008,
+  [SMALL_STATE(845)] = 52053,
+  [SMALL_STATE(846)] = 52106,
+  [SMALL_STATE(847)] = 52149,
+  [SMALL_STATE(848)] = 52192,
+  [SMALL_STATE(849)] = 52271,
+  [SMALL_STATE(850)] = 52350,
+  [SMALL_STATE(851)] = 52431,
+  [SMALL_STATE(852)] = 52510,
+  [SMALL_STATE(853)] = 52553,
+  [SMALL_STATE(854)] = 52598,
+  [SMALL_STATE(855)] = 52645,
+  [SMALL_STATE(856)] = 52690,
+  [SMALL_STATE(857)] = 52735,
+  [SMALL_STATE(858)] = 52802,
+  [SMALL_STATE(859)] = 52849,
+  [SMALL_STATE(860)] = 52892,
+  [SMALL_STATE(861)] = 52971,
+  [SMALL_STATE(862)] = 53050,
+  [SMALL_STATE(863)] = 53093,
+  [SMALL_STATE(864)] = 53160,
+  [SMALL_STATE(865)] = 53205,
+  [SMALL_STATE(866)] = 53248,
+  [SMALL_STATE(867)] = 53305,
+  [SMALL_STATE(868)] = 53352,
+  [SMALL_STATE(869)] = 53397,
+  [SMALL_STATE(870)] = 53440,
+  [SMALL_STATE(871)] = 53487,
+  [SMALL_STATE(872)] = 53540,
+  [SMALL_STATE(873)] = 53605,
+  [SMALL_STATE(874)] = 53664,
+  [SMALL_STATE(875)] = 53731,
+  [SMALL_STATE(876)] = 53776,
+  [SMALL_STATE(877)] = 53821,
+  [SMALL_STATE(878)] = 53866,
+  [SMALL_STATE(879)] = 53911,
+  [SMALL_STATE(880)] = 53953,
+  [SMALL_STATE(881)] = 53995,
+  [SMALL_STATE(882)] = 54037,
+  [SMALL_STATE(883)] = 54079,
+  [SMALL_STATE(884)] = 54121,
+  [SMALL_STATE(885)] = 54163,
+  [SMALL_STATE(886)] = 54205,
+  [SMALL_STATE(887)] = 54247,
+  [SMALL_STATE(888)] = 54289,
+  [SMALL_STATE(889)] = 54331,
+  [SMALL_STATE(890)] = 54373,
+  [SMALL_STATE(891)] = 54415,
+  [SMALL_STATE(892)] = 54457,
+  [SMALL_STATE(893)] = 54537,
+  [SMALL_STATE(894)] = 54579,
+  [SMALL_STATE(895)] = 54621,
+  [SMALL_STATE(896)] = 54663,
+  [SMALL_STATE(897)] = 54705,
+  [SMALL_STATE(898)] = 54747,
+  [SMALL_STATE(899)] = 54789,
+  [SMALL_STATE(900)] = 54831,
+  [SMALL_STATE(901)] = 54873,
+  [SMALL_STATE(902)] = 54915,
+  [SMALL_STATE(903)] = 54957,
+  [SMALL_STATE(904)] = 54999,
+  [SMALL_STATE(905)] = 55041,
+  [SMALL_STATE(906)] = 55083,
+  [SMALL_STATE(907)] = 55125,
+  [SMALL_STATE(908)] = 55169,
+  [SMALL_STATE(909)] = 55211,
+  [SMALL_STATE(910)] = 55255,
+  [SMALL_STATE(911)] = 55297,
+  [SMALL_STATE(912)] = 55341,
+  [SMALL_STATE(913)] = 55383,
+  [SMALL_STATE(914)] = 55425,
+  [SMALL_STATE(915)] = 55467,
+  [SMALL_STATE(916)] = 55509,
+  [SMALL_STATE(917)] = 55551,
+  [SMALL_STATE(918)] = 55593,
+  [SMALL_STATE(919)] = 55635,
+  [SMALL_STATE(920)] = 55677,
+  [SMALL_STATE(921)] = 55719,
+  [SMALL_STATE(922)] = 55761,
+  [SMALL_STATE(923)] = 55803,
+  [SMALL_STATE(924)] = 55845,
+  [SMALL_STATE(925)] = 55887,
+  [SMALL_STATE(926)] = 55929,
+  [SMALL_STATE(927)] = 55971,
+  [SMALL_STATE(928)] = 56013,
+  [SMALL_STATE(929)] = 56055,
+  [SMALL_STATE(930)] = 56097,
+  [SMALL_STATE(931)] = 56139,
+  [SMALL_STATE(932)] = 56215,
+  [SMALL_STATE(933)] = 56295,
+  [SMALL_STATE(934)] = 56337,
+  [SMALL_STATE(935)] = 56379,
+  [SMALL_STATE(936)] = 56459,
+  [SMALL_STATE(937)] = 56501,
+  [SMALL_STATE(938)] = 56543,
+  [SMALL_STATE(939)] = 56585,
+  [SMALL_STATE(940)] = 56627,
+  [SMALL_STATE(941)] = 56669,
+  [SMALL_STATE(942)] = 56711,
+  [SMALL_STATE(943)] = 56753,
+  [SMALL_STATE(944)] = 56795,
+  [SMALL_STATE(945)] = 56837,
+  [SMALL_STATE(946)] = 56879,
+  [SMALL_STATE(947)] = 56921,
+  [SMALL_STATE(948)] = 56963,
+  [SMALL_STATE(949)] = 57005,
+  [SMALL_STATE(950)] = 57049,
+  [SMALL_STATE(951)] = 57091,
+  [SMALL_STATE(952)] = 57133,
+  [SMALL_STATE(953)] = 57175,
+  [SMALL_STATE(954)] = 57217,
+  [SMALL_STATE(955)] = 57261,
+  [SMALL_STATE(956)] = 57303,
+  [SMALL_STATE(957)] = 57344,
+  [SMALL_STATE(958)] = 57385,
+  [SMALL_STATE(959)] = 57426,
+  [SMALL_STATE(960)] = 57467,
+  [SMALL_STATE(961)] = 57508,
+  [SMALL_STATE(962)] = 57549,
+  [SMALL_STATE(963)] = 57590,
+  [SMALL_STATE(964)] = 57631,
+  [SMALL_STATE(965)] = 57672,
+  [SMALL_STATE(966)] = 57713,
+  [SMALL_STATE(967)] = 57754,
+  [SMALL_STATE(968)] = 57795,
+  [SMALL_STATE(969)] = 57836,
+  [SMALL_STATE(970)] = 57877,
+  [SMALL_STATE(971)] = 57918,
+  [SMALL_STATE(972)] = 57963,
+  [SMALL_STATE(973)] = 58004,
+  [SMALL_STATE(974)] = 58049,
+  [SMALL_STATE(975)] = 58090,
+  [SMALL_STATE(976)] = 58131,
+  [SMALL_STATE(977)] = 58172,
+  [SMALL_STATE(978)] = 58213,
+  [SMALL_STATE(979)] = 58254,
+  [SMALL_STATE(980)] = 58295,
+  [SMALL_STATE(981)] = 58336,
+  [SMALL_STATE(982)] = 58377,
+  [SMALL_STATE(983)] = 58418,
+  [SMALL_STATE(984)] = 58459,
+  [SMALL_STATE(985)] = 58500,
+  [SMALL_STATE(986)] = 58541,
+  [SMALL_STATE(987)] = 58582,
+  [SMALL_STATE(988)] = 58623,
+  [SMALL_STATE(989)] = 58664,
+  [SMALL_STATE(990)] = 58705,
+  [SMALL_STATE(991)] = 58746,
+  [SMALL_STATE(992)] = 58820,
+  [SMALL_STATE(993)] = 58891,
+  [SMALL_STATE(994)] = 58962,
+  [SMALL_STATE(995)] = 59025,
+  [SMALL_STATE(996)] = 59088,
+  [SMALL_STATE(997)] = 59127,
+  [SMALL_STATE(998)] = 59166,
+  [SMALL_STATE(999)] = 59205,
+  [SMALL_STATE(1000)] = 59244,
+  [SMALL_STATE(1001)] = 59298,
+  [SMALL_STATE(1002)] = 59328,
+  [SMALL_STATE(1003)] = 59382,
+  [SMALL_STATE(1004)] = 59436,
+  [SMALL_STATE(1005)] = 59473,
+  [SMALL_STATE(1006)] = 59498,
+  [SMALL_STATE(1007)] = 59527,
+  [SMALL_STATE(1008)] = 59564,
+  [SMALL_STATE(1009)] = 59601,
+  [SMALL_STATE(1010)] = 59626,
+  [SMALL_STATE(1011)] = 59661,
+  [SMALL_STATE(1012)] = 59690,
+  [SMALL_STATE(1013)] = 59725,
+  [SMALL_STATE(1014)] = 59762,
+  [SMALL_STATE(1015)] = 59787,
+  [SMALL_STATE(1016)] = 59812,
+  [SMALL_STATE(1017)] = 59858,
+  [SMALL_STATE(1018)] = 59892,
+  [SMALL_STATE(1019)] = 59926,
+  [SMALL_STATE(1020)] = 59954,
+  [SMALL_STATE(1021)] = 59997,
+  [SMALL_STATE(1022)] = 60040,
+  [SMALL_STATE(1023)] = 60071,
+  [SMALL_STATE(1024)] = 60116,
+  [SMALL_STATE(1025)] = 60159,
+  [SMALL_STATE(1026)] = 60202,
+  [SMALL_STATE(1027)] = 60245,
+  [SMALL_STATE(1028)] = 60288,
+  [SMALL_STATE(1029)] = 60331,
+  [SMALL_STATE(1030)] = 60371,
+  [SMALL_STATE(1031)] = 60396,
+  [SMALL_STATE(1032)] = 60433,
+  [SMALL_STATE(1033)] = 60470,
+  [SMALL_STATE(1034)] = 60507,
+  [SMALL_STATE(1035)] = 60544,
+  [SMALL_STATE(1036)] = 60578,
+  [SMALL_STATE(1037)] = 60612,
+  [SMALL_STATE(1038)] = 60633,
+  [SMALL_STATE(1039)] = 60654,
+  [SMALL_STATE(1040)] = 60676,
+  [SMALL_STATE(1041)] = 60707,
+  [SMALL_STATE(1042)] = 60738,
+  [SMALL_STATE(1043)] = 60769,
+  [SMALL_STATE(1044)] = 60792,
+  [SMALL_STATE(1045)] = 60823,
+  [SMALL_STATE(1046)] = 60854,
+  [SMALL_STATE(1047)] = 60885,
+  [SMALL_STATE(1048)] = 60916,
+  [SMALL_STATE(1049)] = 60947,
+  [SMALL_STATE(1050)] = 60984,
+  [SMALL_STATE(1051)] = 61015,
+  [SMALL_STATE(1052)] = 61052,
+  [SMALL_STATE(1053)] = 61075,
+  [SMALL_STATE(1054)] = 61106,
+  [SMALL_STATE(1055)] = 61143,
+  [SMALL_STATE(1056)] = 61160,
+  [SMALL_STATE(1057)] = 61181,
+  [SMALL_STATE(1058)] = 61212,
+  [SMALL_STATE(1059)] = 61243,
+  [SMALL_STATE(1060)] = 61274,
+  [SMALL_STATE(1061)] = 61305,
+  [SMALL_STATE(1062)] = 61336,
+  [SMALL_STATE(1063)] = 61367,
+  [SMALL_STATE(1064)] = 61404,
+  [SMALL_STATE(1065)] = 61441,
+  [SMALL_STATE(1066)] = 61472,
+  [SMALL_STATE(1067)] = 61503,
+  [SMALL_STATE(1068)] = 61524,
+  [SMALL_STATE(1069)] = 61555,
+  [SMALL_STATE(1070)] = 61573,
+  [SMALL_STATE(1071)] = 61607,
+  [SMALL_STATE(1072)] = 61641,
+  [SMALL_STATE(1073)] = 61675,
+  [SMALL_STATE(1074)] = 61695,
+  [SMALL_STATE(1075)] = 61717,
+  [SMALL_STATE(1076)] = 61751,
+  [SMALL_STATE(1077)] = 61773,
+  [SMALL_STATE(1078)] = 61807,
+  [SMALL_STATE(1079)] = 61831,
+  [SMALL_STATE(1080)] = 61851,
+  [SMALL_STATE(1081)] = 61873,
+  [SMALL_STATE(1082)] = 61895,
+  [SMALL_STATE(1083)] = 61915,
+  [SMALL_STATE(1084)] = 61949,
+  [SMALL_STATE(1085)] = 61971,
+  [SMALL_STATE(1086)] = 61993,
+  [SMALL_STATE(1087)] = 62011,
+  [SMALL_STATE(1088)] = 62045,
+  [SMALL_STATE(1089)] = 62079,
+  [SMALL_STATE(1090)] = 62113,
+  [SMALL_STATE(1091)] = 62131,
+  [SMALL_STATE(1092)] = 62155,
+  [SMALL_STATE(1093)] = 62189,
+  [SMALL_STATE(1094)] = 62223,
+  [SMALL_STATE(1095)] = 62243,
+  [SMALL_STATE(1096)] = 62267,
+  [SMALL_STATE(1097)] = 62301,
+  [SMALL_STATE(1098)] = 62326,
+  [SMALL_STATE(1099)] = 62345,
+  [SMALL_STATE(1100)] = 62364,
+  [SMALL_STATE(1101)] = 62389,
+  [SMALL_STATE(1102)] = 62412,
+  [SMALL_STATE(1103)] = 62431,
+  [SMALL_STATE(1104)] = 62450,
+  [SMALL_STATE(1105)] = 62473,
+  [SMALL_STATE(1106)] = 62492,
+  [SMALL_STATE(1107)] = 62513,
+  [SMALL_STATE(1108)] = 62532,
+  [SMALL_STATE(1109)] = 62553,
+  [SMALL_STATE(1110)] = 62576,
+  [SMALL_STATE(1111)] = 62594,
+  [SMALL_STATE(1112)] = 62608,
+  [SMALL_STATE(1113)] = 62622,
+  [SMALL_STATE(1114)] = 62636,
+  [SMALL_STATE(1115)] = 62652,
+  [SMALL_STATE(1116)] = 62672,
+  [SMALL_STATE(1117)] = 62686,
+  [SMALL_STATE(1118)] = 62706,
+  [SMALL_STATE(1119)] = 62724,
+  [SMALL_STATE(1120)] = 62744,
+  [SMALL_STATE(1121)] = 62758,
+  [SMALL_STATE(1122)] = 62776,
+  [SMALL_STATE(1123)] = 62792,
+  [SMALL_STATE(1124)] = 62810,
+  [SMALL_STATE(1125)] = 62828,
+  [SMALL_STATE(1126)] = 62842,
+  [SMALL_STATE(1127)] = 62866,
+  [SMALL_STATE(1128)] = 62884,
+  [SMALL_STATE(1129)] = 62904,
+  [SMALL_STATE(1130)] = 62926,
+  [SMALL_STATE(1131)] = 62946,
+  [SMALL_STATE(1132)] = 62966,
+  [SMALL_STATE(1133)] = 62980,
+  [SMALL_STATE(1134)] = 62994,
+  [SMALL_STATE(1135)] = 63008,
+  [SMALL_STATE(1136)] = 63028,
+  [SMALL_STATE(1137)] = 63048,
+  [SMALL_STATE(1138)] = 63074,
+  [SMALL_STATE(1139)] = 63098,
+  [SMALL_STATE(1140)] = 63118,
+  [SMALL_STATE(1141)] = 63134,
+  [SMALL_STATE(1142)] = 63148,
+  [SMALL_STATE(1143)] = 63162,
+  [SMALL_STATE(1144)] = 63184,
+  [SMALL_STATE(1145)] = 63198,
+  [SMALL_STATE(1146)] = 63212,
+  [SMALL_STATE(1147)] = 63232,
+  [SMALL_STATE(1148)] = 63250,
+  [SMALL_STATE(1149)] = 63264,
+  [SMALL_STATE(1150)] = 63278,
+  [SMALL_STATE(1151)] = 63292,
+  [SMALL_STATE(1152)] = 63310,
+  [SMALL_STATE(1153)] = 63324,
+  [SMALL_STATE(1154)] = 63344,
+  [SMALL_STATE(1155)] = 63358,
+  [SMALL_STATE(1156)] = 63372,
+  [SMALL_STATE(1157)] = 63386,
+  [SMALL_STATE(1158)] = 63400,
+  [SMALL_STATE(1159)] = 63418,
+  [SMALL_STATE(1160)] = 63436,
+  [SMALL_STATE(1161)] = 63456,
+  [SMALL_STATE(1162)] = 63470,
+  [SMALL_STATE(1163)] = 63492,
+  [SMALL_STATE(1164)] = 63510,
+  [SMALL_STATE(1165)] = 63524,
+  [SMALL_STATE(1166)] = 63540,
+  [SMALL_STATE(1167)] = 63554,
+  [SMALL_STATE(1168)] = 63568,
+  [SMALL_STATE(1169)] = 63588,
+  [SMALL_STATE(1170)] = 63606,
+  [SMALL_STATE(1171)] = 63628,
+  [SMALL_STATE(1172)] = 63652,
+  [SMALL_STATE(1173)] = 63670,
+  [SMALL_STATE(1174)] = 63688,
+  [SMALL_STATE(1175)] = 63702,
+  [SMALL_STATE(1176)] = 63722,
+  [SMALL_STATE(1177)] = 63742,
+  [SMALL_STATE(1178)] = 63764,
+  [SMALL_STATE(1179)] = 63782,
+  [SMALL_STATE(1180)] = 63807,
+  [SMALL_STATE(1181)] = 63820,
+  [SMALL_STATE(1182)] = 63843,
+  [SMALL_STATE(1183)] = 63868,
+  [SMALL_STATE(1184)] = 63893,
+  [SMALL_STATE(1185)] = 63906,
+  [SMALL_STATE(1186)] = 63927,
+  [SMALL_STATE(1187)] = 63944,
+  [SMALL_STATE(1188)] = 63963,
+  [SMALL_STATE(1189)] = 63980,
+  [SMALL_STATE(1190)] = 63995,
+  [SMALL_STATE(1191)] = 64012,
+  [SMALL_STATE(1192)] = 64031,
+  [SMALL_STATE(1193)] = 64050,
+  [SMALL_STATE(1194)] = 64069,
+  [SMALL_STATE(1195)] = 64094,
+  [SMALL_STATE(1196)] = 64113,
+  [SMALL_STATE(1197)] = 64126,
+  [SMALL_STATE(1198)] = 64149,
+  [SMALL_STATE(1199)] = 64164,
+  [SMALL_STATE(1200)] = 64189,
+  [SMALL_STATE(1201)] = 64208,
+  [SMALL_STATE(1202)] = 64229,
+  [SMALL_STATE(1203)] = 64254,
+  [SMALL_STATE(1204)] = 64275,
+  [SMALL_STATE(1205)] = 64298,
+  [SMALL_STATE(1206)] = 64317,
+  [SMALL_STATE(1207)] = 64336,
+  [SMALL_STATE(1208)] = 64355,
+  [SMALL_STATE(1209)] = 64378,
+  [SMALL_STATE(1210)] = 64401,
+  [SMALL_STATE(1211)] = 64424,
+  [SMALL_STATE(1212)] = 64447,
+  [SMALL_STATE(1213)] = 64470,
+  [SMALL_STATE(1214)] = 64495,
+  [SMALL_STATE(1215)] = 64514,
+  [SMALL_STATE(1216)] = 64539,
+  [SMALL_STATE(1217)] = 64564,
+  [SMALL_STATE(1218)] = 64589,
+  [SMALL_STATE(1219)] = 64614,
+  [SMALL_STATE(1220)] = 64639,
+  [SMALL_STATE(1221)] = 64664,
+  [SMALL_STATE(1222)] = 64683,
+  [SMALL_STATE(1223)] = 64708,
+  [SMALL_STATE(1224)] = 64729,
+  [SMALL_STATE(1225)] = 64754,
+  [SMALL_STATE(1226)] = 64779,
+  [SMALL_STATE(1227)] = 64804,
+  [SMALL_STATE(1228)] = 64829,
+  [SMALL_STATE(1229)] = 64842,
+  [SMALL_STATE(1230)] = 64867,
+  [SMALL_STATE(1231)] = 64880,
+  [SMALL_STATE(1232)] = 64905,
+  [SMALL_STATE(1233)] = 64926,
+  [SMALL_STATE(1234)] = 64949,
+  [SMALL_STATE(1235)] = 64974,
+  [SMALL_STATE(1236)] = 64999,
+  [SMALL_STATE(1237)] = 65024,
+  [SMALL_STATE(1238)] = 65049,
+  [SMALL_STATE(1239)] = 65074,
+  [SMALL_STATE(1240)] = 65099,
+  [SMALL_STATE(1241)] = 65124,
+  [SMALL_STATE(1242)] = 65143,
+  [SMALL_STATE(1243)] = 65156,
+  [SMALL_STATE(1244)] = 65175,
+  [SMALL_STATE(1245)] = 65189,
+  [SMALL_STATE(1246)] = 65203,
+  [SMALL_STATE(1247)] = 65219,
+  [SMALL_STATE(1248)] = 65239,
+  [SMALL_STATE(1249)] = 65255,
+  [SMALL_STATE(1250)] = 65275,
+  [SMALL_STATE(1251)] = 65289,
+  [SMALL_STATE(1252)] = 65305,
+  [SMALL_STATE(1253)] = 65321,
+  [SMALL_STATE(1254)] = 65343,
+  [SMALL_STATE(1255)] = 65355,
+  [SMALL_STATE(1256)] = 65373,
+  [SMALL_STATE(1257)] = 65389,
+  [SMALL_STATE(1258)] = 65407,
+  [SMALL_STATE(1259)] = 65421,
+  [SMALL_STATE(1260)] = 65443,
+  [SMALL_STATE(1261)] = 65461,
+  [SMALL_STATE(1262)] = 65483,
+  [SMALL_STATE(1263)] = 65505,
+  [SMALL_STATE(1264)] = 65527,
+  [SMALL_STATE(1265)] = 65547,
+  [SMALL_STATE(1266)] = 65563,
+  [SMALL_STATE(1267)] = 65581,
+  [SMALL_STATE(1268)] = 65597,
+  [SMALL_STATE(1269)] = 65615,
+  [SMALL_STATE(1270)] = 65637,
+  [SMALL_STATE(1271)] = 65655,
+  [SMALL_STATE(1272)] = 65671,
+  [SMALL_STATE(1273)] = 65689,
+  [SMALL_STATE(1274)] = 65705,
+  [SMALL_STATE(1275)] = 65721,
+  [SMALL_STATE(1276)] = 65737,
+  [SMALL_STATE(1277)] = 65755,
+  [SMALL_STATE(1278)] = 65769,
+  [SMALL_STATE(1279)] = 65781,
+  [SMALL_STATE(1280)] = 65797,
+  [SMALL_STATE(1281)] = 65811,
+  [SMALL_STATE(1282)] = 65827,
+  [SMALL_STATE(1283)] = 65847,
+  [SMALL_STATE(1284)] = 65867,
+  [SMALL_STATE(1285)] = 65889,
+  [SMALL_STATE(1286)] = 65904,
+  [SMALL_STATE(1287)] = 65923,
+  [SMALL_STATE(1288)] = 65940,
+  [SMALL_STATE(1289)] = 65959,
+  [SMALL_STATE(1290)] = 65976,
+  [SMALL_STATE(1291)] = 65987,
+  [SMALL_STATE(1292)] = 66004,
+  [SMALL_STATE(1293)] = 66021,
+  [SMALL_STATE(1294)] = 66040,
+  [SMALL_STATE(1295)] = 66059,
+  [SMALL_STATE(1296)] = 66078,
+  [SMALL_STATE(1297)] = 66095,
+  [SMALL_STATE(1298)] = 66112,
+  [SMALL_STATE(1299)] = 66127,
+  [SMALL_STATE(1300)] = 66144,
+  [SMALL_STATE(1301)] = 66161,
+  [SMALL_STATE(1302)] = 66172,
+  [SMALL_STATE(1303)] = 66187,
+  [SMALL_STATE(1304)] = 66204,
+  [SMALL_STATE(1305)] = 66221,
+  [SMALL_STATE(1306)] = 66240,
+  [SMALL_STATE(1307)] = 66257,
+  [SMALL_STATE(1308)] = 66274,
+  [SMALL_STATE(1309)] = 66291,
+  [SMALL_STATE(1310)] = 66310,
+  [SMALL_STATE(1311)] = 66321,
+  [SMALL_STATE(1312)] = 66336,
+  [SMALL_STATE(1313)] = 66353,
+  [SMALL_STATE(1314)] = 66368,
+  [SMALL_STATE(1315)] = 66383,
+  [SMALL_STATE(1316)] = 66394,
+  [SMALL_STATE(1317)] = 66411,
+  [SMALL_STATE(1318)] = 66430,
+  [SMALL_STATE(1319)] = 66445,
+  [SMALL_STATE(1320)] = 66462,
+  [SMALL_STATE(1321)] = 66479,
+  [SMALL_STATE(1322)] = 66494,
+  [SMALL_STATE(1323)] = 66511,
+  [SMALL_STATE(1324)] = 66522,
+  [SMALL_STATE(1325)] = 66534,
+  [SMALL_STATE(1326)] = 66548,
+  [SMALL_STATE(1327)] = 66564,
+  [SMALL_STATE(1328)] = 66580,
+  [SMALL_STATE(1329)] = 66596,
+  [SMALL_STATE(1330)] = 66612,
+  [SMALL_STATE(1331)] = 66628,
+  [SMALL_STATE(1332)] = 66642,
+  [SMALL_STATE(1333)] = 66656,
+  [SMALL_STATE(1334)] = 66672,
+  [SMALL_STATE(1335)] = 66688,
+  [SMALL_STATE(1336)] = 66702,
+  [SMALL_STATE(1337)] = 66718,
+  [SMALL_STATE(1338)] = 66734,
+  [SMALL_STATE(1339)] = 66748,
+  [SMALL_STATE(1340)] = 66762,
+  [SMALL_STATE(1341)] = 66778,
+  [SMALL_STATE(1342)] = 66792,
+  [SMALL_STATE(1343)] = 66806,
+  [SMALL_STATE(1344)] = 66820,
+  [SMALL_STATE(1345)] = 66836,
+  [SMALL_STATE(1346)] = 66846,
+  [SMALL_STATE(1347)] = 66856,
+  [SMALL_STATE(1348)] = 66870,
+  [SMALL_STATE(1349)] = 66884,
+  [SMALL_STATE(1350)] = 66898,
+  [SMALL_STATE(1351)] = 66914,
+  [SMALL_STATE(1352)] = 66930,
+  [SMALL_STATE(1353)] = 66946,
+  [SMALL_STATE(1354)] = 66962,
+  [SMALL_STATE(1355)] = 66978,
+  [SMALL_STATE(1356)] = 66994,
+  [SMALL_STATE(1357)] = 67010,
+  [SMALL_STATE(1358)] = 67024,
+  [SMALL_STATE(1359)] = 67038,
+  [SMALL_STATE(1360)] = 67054,
+  [SMALL_STATE(1361)] = 67070,
+  [SMALL_STATE(1362)] = 67084,
+  [SMALL_STATE(1363)] = 67100,
+  [SMALL_STATE(1364)] = 67114,
+  [SMALL_STATE(1365)] = 67130,
+  [SMALL_STATE(1366)] = 67146,
+  [SMALL_STATE(1367)] = 67162,
+  [SMALL_STATE(1368)] = 67176,
+  [SMALL_STATE(1369)] = 67186,
+  [SMALL_STATE(1370)] = 67202,
+  [SMALL_STATE(1371)] = 67218,
+  [SMALL_STATE(1372)] = 67232,
+  [SMALL_STATE(1373)] = 67248,
+  [SMALL_STATE(1374)] = 67258,
+  [SMALL_STATE(1375)] = 67268,
+  [SMALL_STATE(1376)] = 67278,
+  [SMALL_STATE(1377)] = 67294,
+  [SMALL_STATE(1378)] = 67310,
+  [SMALL_STATE(1379)] = 67326,
+  [SMALL_STATE(1380)] = 67340,
+  [SMALL_STATE(1381)] = 67354,
+  [SMALL_STATE(1382)] = 67370,
+  [SMALL_STATE(1383)] = 67386,
+  [SMALL_STATE(1384)] = 67402,
+  [SMALL_STATE(1385)] = 67416,
+  [SMALL_STATE(1386)] = 67430,
+  [SMALL_STATE(1387)] = 67444,
+  [SMALL_STATE(1388)] = 67456,
+  [SMALL_STATE(1389)] = 67470,
+  [SMALL_STATE(1390)] = 67484,
+  [SMALL_STATE(1391)] = 67500,
+  [SMALL_STATE(1392)] = 67516,
+  [SMALL_STATE(1393)] = 67530,
+  [SMALL_STATE(1394)] = 67544,
+  [SMALL_STATE(1395)] = 67560,
+  [SMALL_STATE(1396)] = 67576,
+  [SMALL_STATE(1397)] = 67590,
+  [SMALL_STATE(1398)] = 67606,
+  [SMALL_STATE(1399)] = 67620,
+  [SMALL_STATE(1400)] = 67634,
+  [SMALL_STATE(1401)] = 67648,
+  [SMALL_STATE(1402)] = 67662,
+  [SMALL_STATE(1403)] = 67678,
+  [SMALL_STATE(1404)] = 67694,
+  [SMALL_STATE(1405)] = 67708,
+  [SMALL_STATE(1406)] = 67724,
+  [SMALL_STATE(1407)] = 67738,
+  [SMALL_STATE(1408)] = 67751,
+  [SMALL_STATE(1409)] = 67764,
+  [SMALL_STATE(1410)] = 67773,
+  [SMALL_STATE(1411)] = 67786,
+  [SMALL_STATE(1412)] = 67799,
+  [SMALL_STATE(1413)] = 67812,
+  [SMALL_STATE(1414)] = 67825,
+  [SMALL_STATE(1415)] = 67838,
+  [SMALL_STATE(1416)] = 67851,
+  [SMALL_STATE(1417)] = 67864,
+  [SMALL_STATE(1418)] = 67877,
+  [SMALL_STATE(1419)] = 67890,
+  [SMALL_STATE(1420)] = 67903,
+  [SMALL_STATE(1421)] = 67916,
+  [SMALL_STATE(1422)] = 67927,
+  [SMALL_STATE(1423)] = 67940,
+  [SMALL_STATE(1424)] = 67953,
+  [SMALL_STATE(1425)] = 67964,
+  [SMALL_STATE(1426)] = 67977,
+  [SMALL_STATE(1427)] = 67990,
+  [SMALL_STATE(1428)] = 68001,
+  [SMALL_STATE(1429)] = 68014,
+  [SMALL_STATE(1430)] = 68023,
+  [SMALL_STATE(1431)] = 68036,
+  [SMALL_STATE(1432)] = 68049,
+  [SMALL_STATE(1433)] = 68062,
+  [SMALL_STATE(1434)] = 68075,
+  [SMALL_STATE(1435)] = 68088,
+  [SMALL_STATE(1436)] = 68097,
+  [SMALL_STATE(1437)] = 68110,
+  [SMALL_STATE(1438)] = 68123,
+  [SMALL_STATE(1439)] = 68136,
+  [SMALL_STATE(1440)] = 68145,
+  [SMALL_STATE(1441)] = 68154,
+  [SMALL_STATE(1442)] = 68167,
+  [SMALL_STATE(1443)] = 68180,
+  [SMALL_STATE(1444)] = 68193,
+  [SMALL_STATE(1445)] = 68206,
+  [SMALL_STATE(1446)] = 68219,
+  [SMALL_STATE(1447)] = 68230,
+  [SMALL_STATE(1448)] = 68243,
+  [SMALL_STATE(1449)] = 68256,
+  [SMALL_STATE(1450)] = 68269,
+  [SMALL_STATE(1451)] = 68282,
+  [SMALL_STATE(1452)] = 68295,
+  [SMALL_STATE(1453)] = 68308,
+  [SMALL_STATE(1454)] = 68321,
+  [SMALL_STATE(1455)] = 68334,
+  [SMALL_STATE(1456)] = 68347,
+  [SMALL_STATE(1457)] = 68360,
+  [SMALL_STATE(1458)] = 68373,
+  [SMALL_STATE(1459)] = 68386,
+  [SMALL_STATE(1460)] = 68399,
+  [SMALL_STATE(1461)] = 68412,
+  [SMALL_STATE(1462)] = 68421,
+  [SMALL_STATE(1463)] = 68434,
+  [SMALL_STATE(1464)] = 68447,
+  [SMALL_STATE(1465)] = 68456,
+  [SMALL_STATE(1466)] = 68469,
+  [SMALL_STATE(1467)] = 68482,
+  [SMALL_STATE(1468)] = 68495,
+  [SMALL_STATE(1469)] = 68508,
+  [SMALL_STATE(1470)] = 68521,
+  [SMALL_STATE(1471)] = 68530,
+  [SMALL_STATE(1472)] = 68543,
+  [SMALL_STATE(1473)] = 68556,
+  [SMALL_STATE(1474)] = 68569,
+  [SMALL_STATE(1475)] = 68582,
+  [SMALL_STATE(1476)] = 68593,
+  [SMALL_STATE(1477)] = 68606,
+  [SMALL_STATE(1478)] = 68619,
+  [SMALL_STATE(1479)] = 68632,
+  [SMALL_STATE(1480)] = 68641,
+  [SMALL_STATE(1481)] = 68654,
+  [SMALL_STATE(1482)] = 68667,
+  [SMALL_STATE(1483)] = 68680,
+  [SMALL_STATE(1484)] = 68693,
+  [SMALL_STATE(1485)] = 68706,
+  [SMALL_STATE(1486)] = 68719,
+  [SMALL_STATE(1487)] = 68728,
+  [SMALL_STATE(1488)] = 68737,
+  [SMALL_STATE(1489)] = 68748,
+  [SMALL_STATE(1490)] = 68761,
+  [SMALL_STATE(1491)] = 68772,
+  [SMALL_STATE(1492)] = 68785,
+  [SMALL_STATE(1493)] = 68798,
+  [SMALL_STATE(1494)] = 68811,
+  [SMALL_STATE(1495)] = 68822,
+  [SMALL_STATE(1496)] = 68835,
+  [SMALL_STATE(1497)] = 68848,
+  [SMALL_STATE(1498)] = 68861,
+  [SMALL_STATE(1499)] = 68872,
+  [SMALL_STATE(1500)] = 68885,
+  [SMALL_STATE(1501)] = 68898,
+  [SMALL_STATE(1502)] = 68911,
+  [SMALL_STATE(1503)] = 68924,
+  [SMALL_STATE(1504)] = 68937,
+  [SMALL_STATE(1505)] = 68950,
+  [SMALL_STATE(1506)] = 68963,
+  [SMALL_STATE(1507)] = 68976,
+  [SMALL_STATE(1508)] = 68989,
+  [SMALL_STATE(1509)] = 69002,
+  [SMALL_STATE(1510)] = 69015,
+  [SMALL_STATE(1511)] = 69028,
+  [SMALL_STATE(1512)] = 69037,
+  [SMALL_STATE(1513)] = 69050,
+  [SMALL_STATE(1514)] = 69059,
+  [SMALL_STATE(1515)] = 69070,
+  [SMALL_STATE(1516)] = 69079,
+  [SMALL_STATE(1517)] = 69088,
+  [SMALL_STATE(1518)] = 69101,
+  [SMALL_STATE(1519)] = 69110,
+  [SMALL_STATE(1520)] = 69123,
+  [SMALL_STATE(1521)] = 69134,
+  [SMALL_STATE(1522)] = 69147,
+  [SMALL_STATE(1523)] = 69160,
+  [SMALL_STATE(1524)] = 69173,
+  [SMALL_STATE(1525)] = 69186,
+  [SMALL_STATE(1526)] = 69199,
+  [SMALL_STATE(1527)] = 69208,
+  [SMALL_STATE(1528)] = 69221,
+  [SMALL_STATE(1529)] = 69234,
+  [SMALL_STATE(1530)] = 69247,
+  [SMALL_STATE(1531)] = 69260,
+  [SMALL_STATE(1532)] = 69273,
+  [SMALL_STATE(1533)] = 69286,
+  [SMALL_STATE(1534)] = 69299,
+  [SMALL_STATE(1535)] = 69312,
+  [SMALL_STATE(1536)] = 69323,
+  [SMALL_STATE(1537)] = 69336,
+  [SMALL_STATE(1538)] = 69344,
+  [SMALL_STATE(1539)] = 69352,
+  [SMALL_STATE(1540)] = 69360,
+  [SMALL_STATE(1541)] = 69368,
+  [SMALL_STATE(1542)] = 69378,
+  [SMALL_STATE(1543)] = 69386,
+  [SMALL_STATE(1544)] = 69394,
+  [SMALL_STATE(1545)] = 69404,
+  [SMALL_STATE(1546)] = 69414,
+  [SMALL_STATE(1547)] = 69422,
+  [SMALL_STATE(1548)] = 69432,
+  [SMALL_STATE(1549)] = 69440,
+  [SMALL_STATE(1550)] = 69448,
+  [SMALL_STATE(1551)] = 69456,
+  [SMALL_STATE(1552)] = 69464,
+  [SMALL_STATE(1553)] = 69472,
+  [SMALL_STATE(1554)] = 69480,
+  [SMALL_STATE(1555)] = 69488,
+  [SMALL_STATE(1556)] = 69496,
+  [SMALL_STATE(1557)] = 69504,
+  [SMALL_STATE(1558)] = 69514,
+  [SMALL_STATE(1559)] = 69522,
+  [SMALL_STATE(1560)] = 69530,
+  [SMALL_STATE(1561)] = 69538,
+  [SMALL_STATE(1562)] = 69546,
+  [SMALL_STATE(1563)] = 69556,
+  [SMALL_STATE(1564)] = 69564,
+  [SMALL_STATE(1565)] = 69572,
+  [SMALL_STATE(1566)] = 69580,
+  [SMALL_STATE(1567)] = 69588,
+  [SMALL_STATE(1568)] = 69598,
+  [SMALL_STATE(1569)] = 69606,
+  [SMALL_STATE(1570)] = 69614,
+  [SMALL_STATE(1571)] = 69622,
+  [SMALL_STATE(1572)] = 69632,
+  [SMALL_STATE(1573)] = 69640,
+  [SMALL_STATE(1574)] = 69650,
+  [SMALL_STATE(1575)] = 69660,
+  [SMALL_STATE(1576)] = 69670,
+  [SMALL_STATE(1577)] = 69680,
+  [SMALL_STATE(1578)] = 69690,
+  [SMALL_STATE(1579)] = 69700,
+  [SMALL_STATE(1580)] = 69708,
+  [SMALL_STATE(1581)] = 69718,
+  [SMALL_STATE(1582)] = 69726,
+  [SMALL_STATE(1583)] = 69734,
+  [SMALL_STATE(1584)] = 69742,
+  [SMALL_STATE(1585)] = 69752,
+  [SMALL_STATE(1586)] = 69762,
+  [SMALL_STATE(1587)] = 69772,
+  [SMALL_STATE(1588)] = 69782,
+  [SMALL_STATE(1589)] = 69792,
+  [SMALL_STATE(1590)] = 69800,
+  [SMALL_STATE(1591)] = 69810,
+  [SMALL_STATE(1592)] = 69820,
+  [SMALL_STATE(1593)] = 69830,
+  [SMALL_STATE(1594)] = 69840,
+  [SMALL_STATE(1595)] = 69848,
+  [SMALL_STATE(1596)] = 69856,
+  [SMALL_STATE(1597)] = 69864,
+  [SMALL_STATE(1598)] = 69872,
+  [SMALL_STATE(1599)] = 69880,
+  [SMALL_STATE(1600)] = 69888,
+  [SMALL_STATE(1601)] = 69898,
+  [SMALL_STATE(1602)] = 69906,
+  [SMALL_STATE(1603)] = 69914,
+  [SMALL_STATE(1604)] = 69924,
+  [SMALL_STATE(1605)] = 69932,
+  [SMALL_STATE(1606)] = 69942,
+  [SMALL_STATE(1607)] = 69952,
+  [SMALL_STATE(1608)] = 69962,
+  [SMALL_STATE(1609)] = 69970,
+  [SMALL_STATE(1610)] = 69980,
+  [SMALL_STATE(1611)] = 69988,
+  [SMALL_STATE(1612)] = 69996,
+  [SMALL_STATE(1613)] = 70004,
+  [SMALL_STATE(1614)] = 70012,
+  [SMALL_STATE(1615)] = 70020,
+  [SMALL_STATE(1616)] = 70028,
+  [SMALL_STATE(1617)] = 70038,
+  [SMALL_STATE(1618)] = 70045,
+  [SMALL_STATE(1619)] = 70052,
+  [SMALL_STATE(1620)] = 70059,
+  [SMALL_STATE(1621)] = 70066,
+  [SMALL_STATE(1622)] = 70073,
+  [SMALL_STATE(1623)] = 70080,
+  [SMALL_STATE(1624)] = 70087,
+  [SMALL_STATE(1625)] = 70094,
+  [SMALL_STATE(1626)] = 70101,
+  [SMALL_STATE(1627)] = 70108,
+  [SMALL_STATE(1628)] = 70115,
+  [SMALL_STATE(1629)] = 70122,
+  [SMALL_STATE(1630)] = 70129,
+  [SMALL_STATE(1631)] = 70136,
+  [SMALL_STATE(1632)] = 70143,
+  [SMALL_STATE(1633)] = 70150,
+  [SMALL_STATE(1634)] = 70157,
+  [SMALL_STATE(1635)] = 70164,
+  [SMALL_STATE(1636)] = 70171,
+  [SMALL_STATE(1637)] = 70178,
+  [SMALL_STATE(1638)] = 70185,
+  [SMALL_STATE(1639)] = 70192,
+  [SMALL_STATE(1640)] = 70199,
+  [SMALL_STATE(1641)] = 70206,
+  [SMALL_STATE(1642)] = 70213,
+  [SMALL_STATE(1643)] = 70220,
+  [SMALL_STATE(1644)] = 70227,
+  [SMALL_STATE(1645)] = 70234,
+  [SMALL_STATE(1646)] = 70241,
+  [SMALL_STATE(1647)] = 70248,
+  [SMALL_STATE(1648)] = 70255,
+  [SMALL_STATE(1649)] = 70262,
+  [SMALL_STATE(1650)] = 70269,
+  [SMALL_STATE(1651)] = 70276,
+  [SMALL_STATE(1652)] = 70283,
+  [SMALL_STATE(1653)] = 70290,
+  [SMALL_STATE(1654)] = 70297,
+  [SMALL_STATE(1655)] = 70304,
+  [SMALL_STATE(1656)] = 70311,
+  [SMALL_STATE(1657)] = 70318,
+  [SMALL_STATE(1658)] = 70325,
+  [SMALL_STATE(1659)] = 70332,
+  [SMALL_STATE(1660)] = 70339,
+  [SMALL_STATE(1661)] = 70346,
+  [SMALL_STATE(1662)] = 70353,
+  [SMALL_STATE(1663)] = 70360,
+  [SMALL_STATE(1664)] = 70367,
+  [SMALL_STATE(1665)] = 70374,
+  [SMALL_STATE(1666)] = 70381,
+  [SMALL_STATE(1667)] = 70388,
+  [SMALL_STATE(1668)] = 70395,
+  [SMALL_STATE(1669)] = 70402,
+  [SMALL_STATE(1670)] = 70409,
+  [SMALL_STATE(1671)] = 70416,
+  [SMALL_STATE(1672)] = 70423,
+  [SMALL_STATE(1673)] = 70430,
+  [SMALL_STATE(1674)] = 70437,
+  [SMALL_STATE(1675)] = 70444,
+  [SMALL_STATE(1676)] = 70451,
+  [SMALL_STATE(1677)] = 70458,
+  [SMALL_STATE(1678)] = 70465,
+  [SMALL_STATE(1679)] = 70472,
+  [SMALL_STATE(1680)] = 70479,
+  [SMALL_STATE(1681)] = 70486,
+  [SMALL_STATE(1682)] = 70493,
+  [SMALL_STATE(1683)] = 70500,
+  [SMALL_STATE(1684)] = 70507,
+  [SMALL_STATE(1685)] = 70514,
+  [SMALL_STATE(1686)] = 70521,
+  [SMALL_STATE(1687)] = 70528,
+  [SMALL_STATE(1688)] = 70535,
+  [SMALL_STATE(1689)] = 70542,
+  [SMALL_STATE(1690)] = 70549,
+  [SMALL_STATE(1691)] = 70556,
+  [SMALL_STATE(1692)] = 70563,
+  [SMALL_STATE(1693)] = 70570,
+  [SMALL_STATE(1694)] = 70577,
+  [SMALL_STATE(1695)] = 70584,
+  [SMALL_STATE(1696)] = 70591,
+  [SMALL_STATE(1697)] = 70598,
+  [SMALL_STATE(1698)] = 70605,
+  [SMALL_STATE(1699)] = 70612,
+  [SMALL_STATE(1700)] = 70619,
+  [SMALL_STATE(1701)] = 70626,
+  [SMALL_STATE(1702)] = 70633,
+  [SMALL_STATE(1703)] = 70640,
+  [SMALL_STATE(1704)] = 70647,
+  [SMALL_STATE(1705)] = 70654,
+  [SMALL_STATE(1706)] = 70661,
+  [SMALL_STATE(1707)] = 70668,
+  [SMALL_STATE(1708)] = 70675,
+  [SMALL_STATE(1709)] = 70682,
+  [SMALL_STATE(1710)] = 70689,
+  [SMALL_STATE(1711)] = 70696,
+  [SMALL_STATE(1712)] = 70703,
+  [SMALL_STATE(1713)] = 70710,
+  [SMALL_STATE(1714)] = 70717,
+  [SMALL_STATE(1715)] = 70724,
+  [SMALL_STATE(1716)] = 70731,
+  [SMALL_STATE(1717)] = 70738,
+  [SMALL_STATE(1718)] = 70745,
+  [SMALL_STATE(1719)] = 70752,
+  [SMALL_STATE(1720)] = 70759,
+  [SMALL_STATE(1721)] = 70766,
+  [SMALL_STATE(1722)] = 70773,
+  [SMALL_STATE(1723)] = 70780,
+  [SMALL_STATE(1724)] = 70787,
+  [SMALL_STATE(1725)] = 70794,
+  [SMALL_STATE(1726)] = 70801,
+  [SMALL_STATE(1727)] = 70808,
+  [SMALL_STATE(1728)] = 70815,
+  [SMALL_STATE(1729)] = 70822,
+  [SMALL_STATE(1730)] = 70829,
+  [SMALL_STATE(1731)] = 70836,
+  [SMALL_STATE(1732)] = 70843,
+  [SMALL_STATE(1733)] = 70850,
+  [SMALL_STATE(1734)] = 70857,
+  [SMALL_STATE(1735)] = 70864,
+  [SMALL_STATE(1736)] = 70871,
+  [SMALL_STATE(1737)] = 70878,
+  [SMALL_STATE(1738)] = 70885,
+  [SMALL_STATE(1739)] = 70892,
+  [SMALL_STATE(1740)] = 70899,
+  [SMALL_STATE(1741)] = 70906,
+  [SMALL_STATE(1742)] = 70913,
+  [SMALL_STATE(1743)] = 70920,
+  [SMALL_STATE(1744)] = 70927,
+  [SMALL_STATE(1745)] = 70934,
+  [SMALL_STATE(1746)] = 70941,
+  [SMALL_STATE(1747)] = 70948,
+  [SMALL_STATE(1748)] = 70955,
+  [SMALL_STATE(1749)] = 70962,
+  [SMALL_STATE(1750)] = 70969,
+  [SMALL_STATE(1751)] = 70976,
+  [SMALL_STATE(1752)] = 70983,
+  [SMALL_STATE(1753)] = 70990,
+  [SMALL_STATE(1754)] = 70997,
+  [SMALL_STATE(1755)] = 71004,
+  [SMALL_STATE(1756)] = 71011,
+  [SMALL_STATE(1757)] = 71018,
+  [SMALL_STATE(1758)] = 71025,
 };
 
 static const TSParseActionEntry ts_parse_actions[] = {
@@ -84025,1704 +84108,1709 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [1] = {.entry = {.count = 1, .reusable = false}}, RECOVER(),
   [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT_EXTRA(),
   [5] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 0, 0, 0),
-  [7] = {.entry = {.count = 1, .reusable = false}}, SHIFT(499),
-  [9] = {.entry = {.count = 1, .reusable = false}}, SHIFT(453),
-  [11] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1357),
-  [13] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1213),
-  [15] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
-  [17] = {.entry = {.count = 1, .reusable = false}}, SHIFT(343),
-  [19] = {.entry = {.count = 1, .reusable = false}}, SHIFT(78),
-  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(340),
-  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(233),
-  [25] = {.entry = {.count = 1, .reusable = false}}, SHIFT(247),
-  [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(182),
-  [29] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1581),
-  [31] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1589),
-  [33] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1603),
-  [35] = {.entry = {.count = 1, .reusable = false}}, SHIFT(345),
-  [37] = {.entry = {.count = 1, .reusable = false}}, SHIFT(347),
-  [39] = {.entry = {.count = 1, .reusable = false}}, SHIFT(501),
-  [41] = {.entry = {.count = 1, .reusable = false}}, SHIFT(427),
-  [43] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1683),
-  [45] = {.entry = {.count = 1, .reusable = false}}, SHIFT(295),
+  [7] = {.entry = {.count = 1, .reusable = false}}, SHIFT(505),
+  [9] = {.entry = {.count = 1, .reusable = false}}, SHIFT(444),
+  [11] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1395),
+  [13] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1209),
+  [15] = {.entry = {.count = 1, .reusable = true}}, SHIFT(163),
+  [17] = {.entry = {.count = 1, .reusable = false}}, SHIFT(361),
+  [19] = {.entry = {.count = 1, .reusable = false}}, SHIFT(77),
+  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(360),
+  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(192),
+  [25] = {.entry = {.count = 1, .reusable = false}}, SHIFT(248),
+  [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(178),
+  [29] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1602),
+  [31] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1540),
+  [33] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1579),
+  [35] = {.entry = {.count = 1, .reusable = false}}, SHIFT(378),
+  [37] = {.entry = {.count = 1, .reusable = false}}, SHIFT(380),
+  [39] = {.entry = {.count = 1, .reusable = false}}, SHIFT(508),
+  [41] = {.entry = {.count = 1, .reusable = false}}, SHIFT(359),
+  [43] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1624),
+  [45] = {.entry = {.count = 1, .reusable = false}}, SHIFT(300),
   [47] = {.entry = {.count = 1, .reusable = false}}, SHIFT(66),
-  [49] = {.entry = {.count = 1, .reusable = true}}, SHIFT(643),
-  [51] = {.entry = {.count = 1, .reusable = true}}, SHIFT(160),
-  [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
-  [55] = {.entry = {.count = 1, .reusable = true}}, SHIFT(349),
-  [57] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1699),
-  [59] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1743),
-  [61] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1653),
-  [63] = {.entry = {.count = 1, .reusable = false}}, SHIFT(452),
-  [65] = {.entry = {.count = 1, .reusable = false}}, SHIFT(469),
-  [67] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1659),
-  [69] = {.entry = {.count = 1, .reusable = true}}, SHIFT(386),
-  [71] = {.entry = {.count = 1, .reusable = false}}, SHIFT(396),
-  [73] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1027),
-  [75] = {.entry = {.count = 1, .reusable = false}}, SHIFT(179),
-  [77] = {.entry = {.count = 1, .reusable = true}}, SHIFT(950),
-  [79] = {.entry = {.count = 1, .reusable = false}}, SHIFT(950),
+  [49] = {.entry = {.count = 1, .reusable = true}}, SHIFT(685),
+  [51] = {.entry = {.count = 1, .reusable = true}}, SHIFT(158),
+  [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(166),
+  [55] = {.entry = {.count = 1, .reusable = true}}, SHIFT(384),
+  [57] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1625),
+  [59] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1634),
+  [61] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1650),
+  [63] = {.entry = {.count = 1, .reusable = false}}, SHIFT(458),
+  [65] = {.entry = {.count = 1, .reusable = false}}, SHIFT(483),
+  [67] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1729),
+  [69] = {.entry = {.count = 1, .reusable = true}}, SHIFT(353),
+  [71] = {.entry = {.count = 1, .reusable = false}}, SHIFT(355),
+  [73] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1028),
+  [75] = {.entry = {.count = 1, .reusable = false}}, SHIFT(181),
+  [77] = {.entry = {.count = 1, .reusable = true}}, SHIFT(905),
+  [79] = {.entry = {.count = 1, .reusable = false}}, SHIFT(905),
   [81] = {.entry = {.count = 1, .reusable = false}}, SHIFT(134),
-  [83] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1044),
-  [85] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1040),
-  [87] = {.entry = {.count = 1, .reusable = false}}, SHIFT(424),
+  [83] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1068),
+  [85] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1053),
+  [87] = {.entry = {.count = 1, .reusable = false}}, SHIFT(426),
   [89] = {.entry = {.count = 1, .reusable = false}}, SHIFT(437),
   [91] = {.entry = {.count = 1, .reusable = false}}, SHIFT(513),
-  [93] = {.entry = {.count = 1, .reusable = false}}, SHIFT(425),
-  [95] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1720),
-  [97] = {.entry = {.count = 1, .reusable = false}}, SHIFT(305),
+  [93] = {.entry = {.count = 1, .reusable = false}}, SHIFT(427),
+  [95] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1724),
+  [97] = {.entry = {.count = 1, .reusable = false}}, SHIFT(304),
   [99] = {.entry = {.count = 1, .reusable = false}}, SHIFT(67),
-  [101] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1745),
-  [103] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1723),
-  [105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(325),
-  [107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1583),
-  [109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(311),
-  [111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1533),
-  [113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(334),
-  [115] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(499),
-  [118] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(453),
-  [121] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1357),
-  [124] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1213),
-  [127] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(157),
-  [130] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(343),
-  [133] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(78),
-  [136] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(340),
-  [139] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(233),
-  [142] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(247),
-  [145] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(182),
-  [148] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1581),
-  [151] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1589),
-  [154] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1603),
-  [157] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(424),
-  [160] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(437),
-  [163] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(513),
-  [166] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(425),
-  [169] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1720),
-  [172] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(305),
-  [175] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(67),
-  [178] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(643),
-  [181] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(160),
-  [184] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(165),
-  [187] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(349),
-  [190] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1745),
-  [193] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1743),
-  [196] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1653),
-  [199] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(452),
-  [202] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(469),
-  [205] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1723),
-  [208] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(386),
-  [211] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(396),
-  [214] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1027),
-  [217] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(179),
-  [220] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(950),
-  [223] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(950),
-  [226] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(134),
-  [229] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0),
-  [231] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1044),
-  [234] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1040),
-  [237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(333),
-  [239] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 1, 0, 0),
-  [241] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(345),
-  [244] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(347),
-  [247] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(501),
-  [250] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(427),
-  [253] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1683),
-  [256] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(295),
+  [101] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1749),
+  [103] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1727),
+  [105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(317),
+  [107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1589),
+  [109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(333),
+  [111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1610),
+  [113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(335),
+  [115] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 1, 0, 0),
+  [117] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(505),
+  [120] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(444),
+  [123] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1395),
+  [126] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1209),
+  [129] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(163),
+  [132] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(361),
+  [135] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(77),
+  [138] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(360),
+  [141] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(192),
+  [144] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(248),
+  [147] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(178),
+  [150] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1602),
+  [153] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1540),
+  [156] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1579),
+  [159] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(426),
+  [162] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(437),
+  [165] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(513),
+  [168] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(427),
+  [171] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1724),
+  [174] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(304),
+  [177] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(67),
+  [180] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(685),
+  [183] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(158),
+  [186] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(166),
+  [189] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(384),
+  [192] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1749),
+  [195] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1634),
+  [198] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1650),
+  [201] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(458),
+  [204] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(483),
+  [207] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1727),
+  [210] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(353),
+  [213] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(355),
+  [216] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1028),
+  [219] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(181),
+  [222] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(905),
+  [225] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(905),
+  [228] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(134),
+  [231] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0),
+  [233] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1068),
+  [236] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1053),
+  [239] = {.entry = {.count = 1, .reusable = true}}, SHIFT(325),
+  [241] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(378),
+  [244] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(380),
+  [247] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(508),
+  [250] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(359),
+  [253] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1624),
+  [256] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(300),
   [259] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(66),
-  [262] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1699),
-  [265] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1659),
-  [268] = {.entry = {.count = 1, .reusable = false}}, SHIFT(778),
-  [270] = {.entry = {.count = 1, .reusable = false}}, SHIFT(774),
+  [262] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1625),
+  [265] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_module_repeat1, 2, 0, 0), SHIFT_REPEAT(1729),
+  [268] = {.entry = {.count = 1, .reusable = false}}, SHIFT(773),
+  [270] = {.entry = {.count = 1, .reusable = false}}, SHIFT(769),
   [272] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_primary_expression, 1, 0, 1),
-  [274] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_primary_expression, 1, 0, 1), SHIFT(236),
+  [274] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_primary_expression, 1, 0, 1), SHIFT(207),
   [277] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_pattern, 1, 0, 1), REDUCE(sym_primary_expression, 1, 0, 1),
-  [280] = {.entry = {.count = 2, .reusable = false}}, REDUCE(sym_primary_expression, 1, 0, 1), SHIFT(397),
-  [283] = {.entry = {.count = 1, .reusable = true}}, SHIFT(346),
+  [280] = {.entry = {.count = 2, .reusable = false}}, REDUCE(sym_primary_expression, 1, 0, 1), SHIFT(432),
+  [283] = {.entry = {.count = 1, .reusable = true}}, SHIFT(375),
   [285] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern, 1, 0, 1),
-  [287] = {.entry = {.count = 2, .reusable = false}}, REDUCE(sym_primary_expression, 1, 0, 1), SHIFT(688),
-  [290] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_primary_expression, 1, 0, 1), SHIFT(208),
-  [293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(166),
-  [295] = {.entry = {.count = 2, .reusable = false}}, REDUCE(sym_primary_expression, 1, 0, 1), SHIFT(349),
-  [298] = {.entry = {.count = 2, .reusable = false}}, REDUCE(sym_primary_expression, 1, 0, 1), SHIFT(372),
-  [301] = {.entry = {.count = 1, .reusable = true}}, SHIFT(688),
+  [287] = {.entry = {.count = 2, .reusable = false}}, REDUCE(sym_primary_expression, 1, 0, 1), SHIFT(674),
+  [290] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_primary_expression, 1, 0, 1), SHIFT(235),
+  [293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
+  [295] = {.entry = {.count = 2, .reusable = false}}, REDUCE(sym_primary_expression, 1, 0, 1), SHIFT(384),
+  [298] = {.entry = {.count = 2, .reusable = false}}, REDUCE(sym_primary_expression, 1, 0, 1), SHIFT(395),
+  [301] = {.entry = {.count = 1, .reusable = true}}, SHIFT(674),
   [303] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_primary_expression, 1, 0, 1),
-  [305] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1021),
+  [305] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1020),
   [307] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern, 1, 0, 1),
-  [309] = {.entry = {.count = 1, .reusable = true}}, SHIFT(720),
-  [311] = {.entry = {.count = 1, .reusable = false}}, SHIFT(720),
+  [309] = {.entry = {.count = 1, .reusable = true}}, SHIFT(734),
+  [311] = {.entry = {.count = 1, .reusable = false}}, SHIFT(734),
   [313] = {.entry = {.count = 1, .reusable = false}}, SHIFT(136),
-  [315] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1059),
-  [317] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1061),
-  [319] = {.entry = {.count = 1, .reusable = false}}, SHIFT(494),
-  [321] = {.entry = {.count = 1, .reusable = true}}, SHIFT(616),
-  [323] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
-  [325] = {.entry = {.count = 1, .reusable = true}}, SHIFT(493),
-  [327] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
-  [329] = {.entry = {.count = 1, .reusable = true}}, SHIFT(320),
-  [331] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
-  [333] = {.entry = {.count = 1, .reusable = true}}, SHIFT(477),
-  [335] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
-  [337] = {.entry = {.count = 1, .reusable = true}}, SHIFT(544),
-  [339] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
-  [341] = {.entry = {.count = 1, .reusable = true}}, SHIFT(514),
-  [343] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
-  [345] = {.entry = {.count = 1, .reusable = true}}, SHIFT(483),
-  [347] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
-  [349] = {.entry = {.count = 1, .reusable = true}}, SHIFT(551),
-  [351] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
-  [353] = {.entry = {.count = 1, .reusable = true}}, SHIFT(594),
-  [355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
-  [357] = {.entry = {.count = 1, .reusable = true}}, SHIFT(531),
-  [359] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
-  [361] = {.entry = {.count = 1, .reusable = false}}, SHIFT(831),
-  [363] = {.entry = {.count = 1, .reusable = false}}, SHIFT(835),
-  [365] = {.entry = {.count = 1, .reusable = false}}, SHIFT(387),
-  [367] = {.entry = {.count = 1, .reusable = false}}, SHIFT(140),
-  [369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(561),
-  [371] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
-  [373] = {.entry = {.count = 1, .reusable = true}}, SHIFT(562),
-  [375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
-  [377] = {.entry = {.count = 1, .reusable = true}}, SHIFT(441),
-  [379] = {.entry = {.count = 1, .reusable = true}}, SHIFT(21),
-  [381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(568),
-  [383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
-  [385] = {.entry = {.count = 1, .reusable = true}}, SHIFT(482),
-  [387] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
-  [389] = {.entry = {.count = 1, .reusable = true}}, SHIFT(448),
-  [391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
-  [393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(570),
-  [395] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
-  [397] = {.entry = {.count = 1, .reusable = true}}, SHIFT(574),
-  [399] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
-  [401] = {.entry = {.count = 1, .reusable = true}}, SHIFT(511),
-  [403] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
-  [405] = {.entry = {.count = 1, .reusable = true}}, SHIFT(576),
-  [407] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
-  [409] = {.entry = {.count = 1, .reusable = true}}, SHIFT(613),
-  [411] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
-  [413] = {.entry = {.count = 1, .reusable = true}}, SHIFT(497),
-  [415] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
-  [417] = {.entry = {.count = 1, .reusable = true}}, SHIFT(485),
-  [419] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
-  [421] = {.entry = {.count = 1, .reusable = true}}, SHIFT(332),
-  [423] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
-  [425] = {.entry = {.count = 1, .reusable = true}}, SHIFT(580),
-  [427] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
-  [429] = {.entry = {.count = 1, .reusable = true}}, SHIFT(611),
-  [431] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
-  [433] = {.entry = {.count = 1, .reusable = true}}, SHIFT(467),
-  [435] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
-  [437] = {.entry = {.count = 1, .reusable = true}}, SHIFT(456),
-  [439] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
-  [441] = {.entry = {.count = 1, .reusable = true}}, SHIFT(475),
-  [443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
-  [445] = {.entry = {.count = 1, .reusable = true}}, SHIFT(500),
-  [447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
-  [449] = {.entry = {.count = 1, .reusable = true}}, SHIFT(519),
-  [451] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
-  [453] = {.entry = {.count = 1, .reusable = true}}, SHIFT(536),
-  [455] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
-  [457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(487),
-  [459] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
-  [461] = {.entry = {.count = 1, .reusable = true}}, SHIFT(539),
-  [463] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
-  [465] = {.entry = {.count = 1, .reusable = true}}, SHIFT(457),
-  [467] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
-  [469] = {.entry = {.count = 1, .reusable = true}}, SHIFT(590),
-  [471] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
-  [473] = {.entry = {.count = 1, .reusable = true}}, SHIFT(458),
-  [475] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
-  [477] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1216),
-  [479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
-  [481] = {.entry = {.count = 1, .reusable = true}}, SHIFT(498),
-  [483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
-  [485] = {.entry = {.count = 1, .reusable = true}}, SHIFT(505),
-  [487] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
-  [489] = {.entry = {.count = 1, .reusable = true}}, SHIFT(526),
-  [491] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
-  [493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(596),
-  [495] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
-  [497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(607),
-  [499] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
-  [501] = {.entry = {.count = 1, .reusable = true}}, SHIFT(474),
-  [503] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
-  [505] = {.entry = {.count = 1, .reusable = true}}, SHIFT(599),
-  [507] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
-  [509] = {.entry = {.count = 1, .reusable = true}}, SHIFT(449),
-  [511] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
-  [513] = {.entry = {.count = 1, .reusable = true}}, SHIFT(462),
-  [515] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
-  [517] = {.entry = {.count = 1, .reusable = true}}, SHIFT(518),
-  [519] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
-  [521] = {.entry = {.count = 1, .reusable = true}}, SHIFT(532),
-  [523] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
-  [525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(443),
-  [527] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
-  [529] = {.entry = {.count = 1, .reusable = true}}, SHIFT(463),
-  [531] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
-  [533] = {.entry = {.count = 1, .reusable = true}}, SHIFT(555),
-  [535] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
-  [537] = {.entry = {.count = 1, .reusable = true}}, SHIFT(543),
-  [539] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
-  [541] = {.entry = {.count = 1, .reusable = true}}, SHIFT(608),
-  [543] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
-  [545] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1183),
-  [547] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
-  [549] = {.entry = {.count = 1, .reusable = true}}, SHIFT(446),
-  [551] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
-  [553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(548),
-  [555] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
-  [557] = {.entry = {.count = 1, .reusable = true}}, SHIFT(585),
-  [559] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
-  [561] = {.entry = {.count = 1, .reusable = true}}, SHIFT(312),
-  [563] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1607),
-  [565] = {.entry = {.count = 1, .reusable = true}}, SHIFT(316),
-  [567] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1598),
-  [569] = {.entry = {.count = 1, .reusable = true}}, SHIFT(330),
-  [571] = {.entry = {.count = 1, .reusable = true}}, SHIFT(326),
-  [573] = {.entry = {.count = 1, .reusable = false}}, SHIFT(911),
-  [575] = {.entry = {.count = 1, .reusable = true}}, SHIFT(209),
-  [577] = {.entry = {.count = 1, .reusable = false}}, SHIFT(643),
-  [579] = {.entry = {.count = 1, .reusable = true}}, SHIFT(210),
-  [581] = {.entry = {.count = 1, .reusable = false}}, SHIFT(150),
-  [583] = {.entry = {.count = 1, .reusable = false}}, SHIFT(706),
-  [585] = {.entry = {.count = 1, .reusable = true}}, SHIFT(236),
+  [315] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1065),
+  [317] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1042),
+  [319] = {.entry = {.count = 1, .reusable = false}}, SHIFT(507),
+  [321] = {.entry = {.count = 1, .reusable = true}}, SHIFT(522),
+  [323] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
+  [325] = {.entry = {.count = 1, .reusable = true}}, SHIFT(461),
+  [327] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
+  [329] = {.entry = {.count = 1, .reusable = true}}, SHIFT(575),
+  [331] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
+  [333] = {.entry = {.count = 1, .reusable = true}}, SHIFT(463),
+  [335] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
+  [337] = {.entry = {.count = 1, .reusable = true}}, SHIFT(580),
+  [339] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
+  [341] = {.entry = {.count = 1, .reusable = true}}, SHIFT(479),
+  [343] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
+  [345] = {.entry = {.count = 1, .reusable = true}}, SHIFT(459),
+  [347] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
+  [349] = {.entry = {.count = 1, .reusable = true}}, SHIFT(328),
+  [351] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
+  [353] = {.entry = {.count = 1, .reusable = true}}, SHIFT(474),
+  [355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
+  [357] = {.entry = {.count = 1, .reusable = false}}, SHIFT(856),
+  [359] = {.entry = {.count = 1, .reusable = false}}, SHIFT(878),
+  [361] = {.entry = {.count = 1, .reusable = false}}, SHIFT(391),
+  [363] = {.entry = {.count = 1, .reusable = false}}, SHIFT(139),
+  [365] = {.entry = {.count = 1, .reusable = true}}, SHIFT(514),
+  [367] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
+  [369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(582),
+  [371] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
+  [373] = {.entry = {.count = 1, .reusable = true}}, SHIFT(527),
+  [375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
+  [377] = {.entry = {.count = 1, .reusable = true}}, SHIFT(586),
+  [379] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
+  [381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(535),
+  [383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
+  [385] = {.entry = {.count = 1, .reusable = true}}, SHIFT(588),
+  [387] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
+  [389] = {.entry = {.count = 1, .reusable = true}}, SHIFT(537),
+  [391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
+  [393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(538),
+  [395] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
+  [397] = {.entry = {.count = 1, .reusable = true}}, SHIFT(312),
+  [399] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
+  [401] = {.entry = {.count = 1, .reusable = true}}, SHIFT(542),
+  [403] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
+  [405] = {.entry = {.count = 1, .reusable = true}}, SHIFT(490),
+  [407] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
+  [409] = {.entry = {.count = 1, .reusable = true}}, SHIFT(440),
+  [411] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
+  [413] = {.entry = {.count = 1, .reusable = true}}, SHIFT(544),
+  [415] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
+  [417] = {.entry = {.count = 1, .reusable = true}}, SHIFT(503),
+  [419] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
+  [421] = {.entry = {.count = 1, .reusable = true}}, SHIFT(548),
+  [423] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
+  [425] = {.entry = {.count = 1, .reusable = true}}, SHIFT(489),
+  [427] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
+  [429] = {.entry = {.count = 1, .reusable = true}}, SHIFT(550),
+  [431] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
+  [433] = {.entry = {.count = 1, .reusable = true}}, SHIFT(511),
+  [435] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
+  [437] = {.entry = {.count = 1, .reusable = true}}, SHIFT(487),
+  [439] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
+  [441] = {.entry = {.count = 1, .reusable = true}}, SHIFT(592),
+  [443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
+  [445] = {.entry = {.count = 1, .reusable = true}}, SHIFT(554),
+  [447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
+  [449] = {.entry = {.count = 1, .reusable = true}}, SHIFT(468),
+  [451] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
+  [453] = {.entry = {.count = 1, .reusable = true}}, SHIFT(442),
+  [455] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
+  [457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(454),
+  [459] = {.entry = {.count = 1, .reusable = true}}, SHIFT(21),
+  [461] = {.entry = {.count = 1, .reusable = true}}, SHIFT(493),
+  [463] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
+  [465] = {.entry = {.count = 1, .reusable = true}}, SHIFT(558),
+  [467] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
+  [469] = {.entry = {.count = 1, .reusable = true}}, SHIFT(600),
+  [471] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
+  [473] = {.entry = {.count = 1, .reusable = true}}, SHIFT(501),
+  [475] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
+  [477] = {.entry = {.count = 1, .reusable = true}}, SHIFT(470),
+  [479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
+  [481] = {.entry = {.count = 1, .reusable = true}}, SHIFT(598),
+  [483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
+  [485] = {.entry = {.count = 1, .reusable = true}}, SHIFT(609),
+  [487] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
+  [489] = {.entry = {.count = 1, .reusable = true}}, SHIFT(562),
+  [491] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
+  [493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(443),
+  [495] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
+  [497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(467),
+  [499] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
+  [501] = {.entry = {.count = 1, .reusable = true}}, SHIFT(497),
+  [503] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
+  [505] = {.entry = {.count = 1, .reusable = true}}, SHIFT(567),
+  [507] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
+  [509] = {.entry = {.count = 1, .reusable = true}}, SHIFT(605),
+  [511] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
+  [513] = {.entry = {.count = 1, .reusable = true}}, SHIFT(518),
+  [515] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
+  [517] = {.entry = {.count = 1, .reusable = true}}, SHIFT(570),
+  [519] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
+  [521] = {.entry = {.count = 1, .reusable = true}}, SHIFT(452),
+  [523] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
+  [525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(447),
+  [527] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
+  [529] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1185),
+  [531] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
+  [533] = {.entry = {.count = 1, .reusable = true}}, SHIFT(498),
+  [535] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
+  [537] = {.entry = {.count = 1, .reusable = true}}, SHIFT(448),
+  [539] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
+  [541] = {.entry = {.count = 1, .reusable = true}}, SHIFT(611),
+  [543] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
+  [545] = {.entry = {.count = 1, .reusable = true}}, SHIFT(565),
+  [547] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
+  [549] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1201),
+  [551] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
+  [553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(614),
+  [555] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
+  [557] = {.entry = {.count = 1, .reusable = true}}, SHIFT(572),
+  [559] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
+  [561] = {.entry = {.count = 1, .reusable = true}}, SHIFT(320),
+  [563] = {.entry = {.count = 1, .reusable = true}}, SHIFT(313),
+  [565] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1551),
+  [567] = {.entry = {.count = 1, .reusable = true}}, SHIFT(326),
+  [569] = {.entry = {.count = 1, .reusable = true}}, SHIFT(318),
+  [571] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1561),
+  [573] = {.entry = {.count = 1, .reusable = false}}, SHIFT(930),
+  [575] = {.entry = {.count = 1, .reusable = true}}, SHIFT(198),
+  [577] = {.entry = {.count = 1, .reusable = false}}, SHIFT(685),
+  [579] = {.entry = {.count = 1, .reusable = true}}, SHIFT(199),
+  [581] = {.entry = {.count = 1, .reusable = false}}, SHIFT(148),
+  [583] = {.entry = {.count = 1, .reusable = false}}, SHIFT(714),
+  [585] = {.entry = {.count = 1, .reusable = true}}, SHIFT(207),
   [587] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_primary_expression, 1, 0, 1), REDUCE(sym_list_splat_pattern, 2, 0, 8),
-  [590] = {.entry = {.count = 1, .reusable = true}}, SHIFT(367),
+  [590] = {.entry = {.count = 1, .reusable = true}}, SHIFT(390),
   [592] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_splat_pattern, 2, 0, 8),
-  [594] = {.entry = {.count = 1, .reusable = false}}, SHIFT(688),
-  [596] = {.entry = {.count = 1, .reusable = true}}, SHIFT(208),
+  [594] = {.entry = {.count = 1, .reusable = false}}, SHIFT(674),
+  [596] = {.entry = {.count = 1, .reusable = true}}, SHIFT(235),
   [598] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_splat_pattern, 2, 0, 8),
   [600] = {.entry = {.count = 1, .reusable = false}}, SHIFT(137),
-  [602] = {.entry = {.count = 1, .reusable = true}}, SHIFT(222),
-  [604] = {.entry = {.count = 1, .reusable = true}}, SHIFT(406),
-  [606] = {.entry = {.count = 1, .reusable = true}}, SHIFT(692),
-  [608] = {.entry = {.count = 1, .reusable = true}}, SHIFT(232),
-  [610] = {.entry = {.count = 1, .reusable = false}}, SHIFT(142),
-  [612] = {.entry = {.count = 1, .reusable = false}}, SHIFT(949),
-  [614] = {.entry = {.count = 1, .reusable = false}}, SHIFT(918),
-  [616] = {.entry = {.count = 1, .reusable = true}}, SHIFT(237),
-  [618] = {.entry = {.count = 1, .reusable = false}}, SHIFT(370),
-  [620] = {.entry = {.count = 1, .reusable = true}}, SHIFT(642),
-  [622] = {.entry = {.count = 1, .reusable = true}}, SHIFT(223),
-  [624] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
-  [626] = {.entry = {.count = 1, .reusable = true}}, SHIFT(949),
-  [628] = {.entry = {.count = 1, .reusable = false}}, SHIFT(147),
-  [630] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1060),
-  [632] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1055),
-  [634] = {.entry = {.count = 1, .reusable = false}}, SHIFT(362),
-  [636] = {.entry = {.count = 1, .reusable = true}}, SHIFT(231),
-  [638] = {.entry = {.count = 1, .reusable = true}}, SHIFT(408),
-  [640] = {.entry = {.count = 1, .reusable = true}}, SHIFT(673),
-  [642] = {.entry = {.count = 1, .reusable = true}}, SHIFT(212),
-  [644] = {.entry = {.count = 1, .reusable = false}}, SHIFT(151),
-  [646] = {.entry = {.count = 1, .reusable = false}}, SHIFT(985),
-  [648] = {.entry = {.count = 1, .reusable = false}}, SHIFT(988),
-  [650] = {.entry = {.count = 1, .reusable = true}}, SHIFT(234),
-  [652] = {.entry = {.count = 1, .reusable = true}}, SHIFT(351),
-  [654] = {.entry = {.count = 1, .reusable = true}}, SHIFT(628),
-  [656] = {.entry = {.count = 1, .reusable = true}}, SHIFT(235),
-  [658] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
-  [660] = {.entry = {.count = 1, .reusable = true}}, SHIFT(985),
-  [662] = {.entry = {.count = 1, .reusable = false}}, SHIFT(152),
-  [664] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1049),
-  [666] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1050),
-  [668] = {.entry = {.count = 1, .reusable = false}}, SHIFT(872),
-  [670] = {.entry = {.count = 1, .reusable = false}}, SHIFT(850),
-  [672] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
-  [674] = {.entry = {.count = 1, .reusable = true}}, SHIFT(524),
-  [676] = {.entry = {.count = 1, .reusable = true}}, SHIFT(401),
-  [678] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
-  [680] = {.entry = {.count = 1, .reusable = false}}, SHIFT(391),
-  [682] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1023),
+  [602] = {.entry = {.count = 1, .reusable = true}}, SHIFT(221),
+  [604] = {.entry = {.count = 1, .reusable = true}}, SHIFT(368),
+  [606] = {.entry = {.count = 1, .reusable = true}}, SHIFT(651),
+  [608] = {.entry = {.count = 1, .reusable = true}}, SHIFT(231),
+  [610] = {.entry = {.count = 1, .reusable = false}}, SHIFT(143),
+  [612] = {.entry = {.count = 1, .reusable = false}}, SHIFT(879),
+  [614] = {.entry = {.count = 1, .reusable = false}}, SHIFT(893),
+  [616] = {.entry = {.count = 1, .reusable = true}}, SHIFT(210),
+  [618] = {.entry = {.count = 1, .reusable = false}}, SHIFT(430),
+  [620] = {.entry = {.count = 1, .reusable = true}}, SHIFT(683),
+  [622] = {.entry = {.count = 1, .reusable = true}}, SHIFT(222),
+  [624] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
+  [626] = {.entry = {.count = 1, .reusable = true}}, SHIFT(879),
+  [628] = {.entry = {.count = 1, .reusable = false}}, SHIFT(146),
+  [630] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1048),
+  [632] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1046),
+  [634] = {.entry = {.count = 1, .reusable = false}}, SHIFT(960),
+  [636] = {.entry = {.count = 1, .reusable = false}}, SHIFT(967),
+  [638] = {.entry = {.count = 1, .reusable = true}}, SHIFT(233),
+  [640] = {.entry = {.count = 1, .reusable = true}}, SHIFT(338),
+  [642] = {.entry = {.count = 1, .reusable = true}}, SHIFT(679),
+  [644] = {.entry = {.count = 1, .reusable = true}}, SHIFT(234),
+  [646] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
+  [648] = {.entry = {.count = 1, .reusable = true}}, SHIFT(960),
+  [650] = {.entry = {.count = 1, .reusable = false}}, SHIFT(152),
+  [652] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1061),
+  [654] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1062),
+  [656] = {.entry = {.count = 1, .reusable = false}}, SHIFT(386),
+  [658] = {.entry = {.count = 1, .reusable = true}}, SHIFT(230),
+  [660] = {.entry = {.count = 1, .reusable = true}}, SHIFT(411),
+  [662] = {.entry = {.count = 1, .reusable = true}}, SHIFT(697),
+  [664] = {.entry = {.count = 1, .reusable = true}}, SHIFT(211),
+  [666] = {.entry = {.count = 1, .reusable = false}}, SHIFT(153),
+  [668] = {.entry = {.count = 1, .reusable = false}}, SHIFT(870),
+  [670] = {.entry = {.count = 1, .reusable = false}}, SHIFT(858),
+  [672] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
+  [674] = {.entry = {.count = 1, .reusable = true}}, SHIFT(954),
+  [676] = {.entry = {.count = 1, .reusable = true}}, SHIFT(403),
+  [678] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
+  [680] = {.entry = {.count = 1, .reusable = false}}, SHIFT(350),
+  [682] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1025),
   [684] = {.entry = {.count = 1, .reusable = false}}, SHIFT(170),
   [686] = {.entry = {.count = 1, .reusable = false}}, SHIFT(149),
-  [688] = {.entry = {.count = 1, .reusable = true}}, SHIFT(851),
-  [690] = {.entry = {.count = 1, .reusable = true}}, SHIFT(914),
-  [692] = {.entry = {.count = 1, .reusable = true}}, SHIFT(515),
-  [694] = {.entry = {.count = 1, .reusable = false}}, SHIFT(842),
-  [696] = {.entry = {.count = 1, .reusable = false}}, SHIFT(855),
-  [698] = {.entry = {.count = 1, .reusable = true}}, SHIFT(158),
-  [700] = {.entry = {.count = 1, .reusable = false}}, SHIFT(632),
-  [702] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_list, 2, 0, 7),
-  [704] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern_list, 2, 0, 7),
-  [706] = {.entry = {.count = 1, .reusable = true}}, SHIFT(163),
-  [708] = {.entry = {.count = 1, .reusable = false}}, SHIFT(141),
-  [710] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_list, 3, 0, 16),
-  [712] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern_list, 3, 0, 16),
-  [714] = {.entry = {.count = 1, .reusable = true}}, SHIFT(838),
-  [716] = {.entry = {.count = 1, .reusable = true}}, SHIFT(924),
-  [718] = {.entry = {.count = 1, .reusable = false}}, SHIFT(837),
-  [720] = {.entry = {.count = 1, .reusable = false}}, SHIFT(854),
-  [722] = {.entry = {.count = 1, .reusable = true}}, SHIFT(192),
-  [724] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1700),
-  [726] = {.entry = {.count = 1, .reusable = false}}, SHIFT(395),
-  [728] = {.entry = {.count = 1, .reusable = true}}, SHIFT(923),
-  [730] = {.entry = {.count = 1, .reusable = true}}, SHIFT(390),
-  [732] = {.entry = {.count = 1, .reusable = false}}, SHIFT(416),
-  [734] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1026),
-  [736] = {.entry = {.count = 1, .reusable = false}}, SHIFT(145),
-  [738] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1733),
-  [740] = {.entry = {.count = 1, .reusable = true}}, SHIFT(707),
-  [742] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1664),
-  [744] = {.entry = {.count = 1, .reusable = true}}, SHIFT(878),
-  [746] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1685),
-  [748] = {.entry = {.count = 1, .reusable = true}}, SHIFT(989),
-  [750] = {.entry = {.count = 1, .reusable = false}}, SHIFT(832),
-  [752] = {.entry = {.count = 1, .reusable = false}}, SHIFT(836),
-  [754] = {.entry = {.count = 1, .reusable = false}}, SHIFT(354),
-  [756] = {.entry = {.count = 1, .reusable = false}}, SHIFT(397),
+  [688] = {.entry = {.count = 1, .reusable = true}}, SHIFT(520),
+  [690] = {.entry = {.count = 1, .reusable = false}}, SHIFT(875),
+  [692] = {.entry = {.count = 1, .reusable = false}}, SHIFT(855),
+  [694] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
+  [696] = {.entry = {.count = 1, .reusable = false}}, SHIFT(663),
+  [698] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_list, 2, 0, 7),
+  [700] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern_list, 2, 0, 7),
+  [702] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
+  [704] = {.entry = {.count = 1, .reusable = false}}, SHIFT(140),
+  [706] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_list, 3, 0, 16),
+  [708] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern_list, 3, 0, 16),
+  [710] = {.entry = {.count = 1, .reusable = true}}, SHIFT(841),
+  [712] = {.entry = {.count = 1, .reusable = true}}, SHIFT(907),
+  [714] = {.entry = {.count = 1, .reusable = true}}, SHIFT(576),
+  [716] = {.entry = {.count = 1, .reusable = true}}, SHIFT(844),
+  [718] = {.entry = {.count = 1, .reusable = false}}, SHIFT(864),
+  [720] = {.entry = {.count = 1, .reusable = false}}, SHIFT(876),
+  [722] = {.entry = {.count = 1, .reusable = true}}, SHIFT(236),
+  [724] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1664),
+  [726] = {.entry = {.count = 1, .reusable = false}}, SHIFT(352),
+  [728] = {.entry = {.count = 1, .reusable = true}}, SHIFT(723),
+  [730] = {.entry = {.count = 1, .reusable = true}}, SHIFT(349),
+  [732] = {.entry = {.count = 1, .reusable = false}}, SHIFT(419),
+  [734] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1024),
+  [736] = {.entry = {.count = 1, .reusable = false}}, SHIFT(150),
+  [738] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1713),
+  [740] = {.entry = {.count = 1, .reusable = true}}, SHIFT(902),
+  [742] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1712),
+  [744] = {.entry = {.count = 1, .reusable = true}}, SHIFT(968),
+  [746] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1690),
+  [748] = {.entry = {.count = 1, .reusable = true}}, SHIFT(901),
+  [750] = {.entry = {.count = 1, .reusable = false}}, SHIFT(842),
+  [752] = {.entry = {.count = 1, .reusable = false}}, SHIFT(853),
+  [754] = {.entry = {.count = 1, .reusable = false}}, SHIFT(405),
+  [756] = {.entry = {.count = 1, .reusable = false}}, SHIFT(432),
   [758] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_yield, 1, 0, 0),
-  [760] = {.entry = {.count = 1, .reusable = false}}, SHIFT(399),
-  [762] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1024),
-  [764] = {.entry = {.count = 1, .reusable = false}}, SHIFT(139),
-  [766] = {.entry = {.count = 1, .reusable = false}}, SHIFT(421),
-  [768] = {.entry = {.count = 1, .reusable = false}}, SHIFT(372),
+  [760] = {.entry = {.count = 1, .reusable = false}}, SHIFT(401),
+  [762] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1021),
+  [764] = {.entry = {.count = 1, .reusable = false}}, SHIFT(141),
+  [766] = {.entry = {.count = 1, .reusable = false}}, SHIFT(373),
+  [768] = {.entry = {.count = 1, .reusable = false}}, SHIFT(395),
   [770] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_list, 3, 0, 16),
   [772] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_list, 2, 0, 7),
-  [774] = {.entry = {.count = 1, .reusable = false}}, SHIFT(374),
-  [776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(388),
-  [778] = {.entry = {.count = 1, .reusable = true}}, SHIFT(213),
+  [774] = {.entry = {.count = 1, .reusable = false}}, SHIFT(397),
+  [776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(399),
+  [778] = {.entry = {.count = 1, .reusable = true}}, SHIFT(212),
   [780] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 3, 0, 52),
-  [782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(397),
-  [784] = {.entry = {.count = 1, .reusable = false}}, SHIFT(858),
-  [786] = {.entry = {.count = 1, .reusable = false}}, SHIFT(857),
-  [788] = {.entry = {.count = 1, .reusable = true}}, SHIFT(215),
-  [790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(919),
-  [792] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1640),
-  [794] = {.entry = {.count = 1, .reusable = false}}, SHIFT(144),
-  [796] = {.entry = {.count = 1, .reusable = false}}, SHIFT(366),
-  [798] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 2, 0, 26),
-  [800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(715),
-  [802] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1615),
-  [804] = {.entry = {.count = 1, .reusable = false}}, SHIFT(407),
-  [806] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 1, 0, 0),
-  [808] = {.entry = {.count = 1, .reusable = false}}, SHIFT(786),
-  [810] = {.entry = {.count = 1, .reusable = false}}, SHIFT(787),
-  [812] = {.entry = {.count = 1, .reusable = true}}, SHIFT(767),
-  [814] = {.entry = {.count = 1, .reusable = true}}, SHIFT(395),
-  [816] = {.entry = {.count = 1, .reusable = false}}, SHIFT(138),
-  [818] = {.entry = {.count = 1, .reusable = false}}, SHIFT(169),
-  [820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(960),
-  [822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1737),
-  [824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(912),
-  [826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1684),
-  [828] = {.entry = {.count = 1, .reusable = false}}, SHIFT(984),
-  [830] = {.entry = {.count = 1, .reusable = false}}, SHIFT(986),
-  [832] = {.entry = {.count = 1, .reusable = false}}, SHIFT(153),
-  [834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(887),
-  [836] = {.entry = {.count = 1, .reusable = true}}, SHIFT(892),
-  [838] = {.entry = {.count = 1, .reusable = true}}, SHIFT(903),
-  [840] = {.entry = {.count = 1, .reusable = true}}, SHIFT(908),
-  [842] = {.entry = {.count = 1, .reusable = true}}, SHIFT(726),
-  [844] = {.entry = {.count = 1, .reusable = true}}, SHIFT(729),
-  [846] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression_list, 2, 0, 7),
-  [848] = {.entry = {.count = 1, .reusable = false}}, SHIFT(409),
-  [850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(371),
-  [852] = {.entry = {.count = 1, .reusable = true}}, SHIFT(732),
-  [854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(733),
-  [856] = {.entry = {.count = 1, .reusable = true}}, SHIFT(734),
-  [858] = {.entry = {.count = 1, .reusable = true}}, SHIFT(735),
-  [860] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 7, 0, 145),
-  [862] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 7, 0, 145),
-  [864] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1022),
-  [866] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression_list, 3, 0, 16),
-  [868] = {.entry = {.count = 1, .reusable = true}}, SHIFT(941),
-  [870] = {.entry = {.count = 1, .reusable = true}}, SHIFT(942),
-  [872] = {.entry = {.count = 1, .reusable = true}}, SHIFT(873),
-  [874] = {.entry = {.count = 1, .reusable = true}}, SHIFT(945),
-  [876] = {.entry = {.count = 1, .reusable = true}}, SHIFT(783),
-  [878] = {.entry = {.count = 1, .reusable = true}}, SHIFT(915),
-  [880] = {.entry = {.count = 1, .reusable = true}}, SHIFT(916),
-  [882] = {.entry = {.count = 1, .reusable = true}}, SHIFT(893),
-  [884] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 6, 0, 126),
-  [886] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 6, 0, 126),
-  [888] = {.entry = {.count = 1, .reusable = true}}, SHIFT(736),
-  [890] = {.entry = {.count = 1, .reusable = true}}, SHIFT(971),
-  [892] = {.entry = {.count = 1, .reusable = true}}, SHIFT(974),
-  [894] = {.entry = {.count = 1, .reusable = true}}, SHIFT(977),
-  [896] = {.entry = {.count = 1, .reusable = true}}, SHIFT(978),
-  [898] = {.entry = {.count = 1, .reusable = true}}, SHIFT(979),
-  [900] = {.entry = {.count = 1, .reusable = true}}, SHIFT(980),
-  [902] = {.entry = {.count = 1, .reusable = true}}, SHIFT(737),
-  [904] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 6, 0, 127),
-  [906] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 6, 0, 127),
-  [908] = {.entry = {.count = 1, .reusable = true}}, SHIFT(880),
-  [910] = {.entry = {.count = 1, .reusable = true}}, SHIFT(883),
-  [912] = {.entry = {.count = 1, .reusable = true}}, SHIFT(886),
-  [914] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 5, 0, 101),
-  [916] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 5, 0, 101),
-  [918] = {.entry = {.count = 1, .reusable = true}}, SHIFT(888),
-  [920] = {.entry = {.count = 1, .reusable = true}}, SHIFT(889),
-  [922] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_return_statement, 1, 0, 0),
-  [924] = {.entry = {.count = 1, .reusable = true}}, SHIFT(276),
+  [782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(432),
+  [784] = {.entry = {.count = 1, .reusable = false}}, SHIFT(785),
+  [786] = {.entry = {.count = 1, .reusable = false}}, SHIFT(786),
+  [788] = {.entry = {.count = 1, .reusable = true}}, SHIFT(201),
+  [790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(787),
+  [792] = {.entry = {.count = 1, .reusable = true}}, SHIFT(352),
+  [794] = {.entry = {.count = 1, .reusable = false}}, SHIFT(138),
+  [796] = {.entry = {.count = 1, .reusable = false}}, SHIFT(971),
+  [798] = {.entry = {.count = 1, .reusable = false}}, SHIFT(973),
+  [800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(724),
+  [802] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1618),
+  [804] = {.entry = {.count = 1, .reusable = false}}, SHIFT(151),
+  [806] = {.entry = {.count = 1, .reusable = false}}, SHIFT(348),
+  [808] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 1, 0, 0),
+  [810] = {.entry = {.count = 1, .reusable = false}}, SHIFT(169),
+  [812] = {.entry = {.count = 1, .reusable = false}}, SHIFT(867),
+  [814] = {.entry = {.count = 1, .reusable = false}}, SHIFT(836),
+  [816] = {.entry = {.count = 1, .reusable = false}}, SHIFT(145),
+  [818] = {.entry = {.count = 1, .reusable = false}}, SHIFT(363),
+  [820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(989),
+  [822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1743),
+  [824] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 2, 0, 26),
+  [826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(934),
+  [828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1643),
+  [830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(903),
+  [832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1637),
+  [834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(719),
+  [836] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_return_statement, 1, 0, 0),
+  [838] = {.entry = {.count = 1, .reusable = true}}, SHIFT(736),
+  [840] = {.entry = {.count = 1, .reusable = true}}, SHIFT(737),
+  [842] = {.entry = {.count = 1, .reusable = true}}, SHIFT(720),
+  [844] = {.entry = {.count = 1, .reusable = true}}, SHIFT(711),
+  [846] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 7, 0, 145),
+  [848] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 7, 0, 145),
+  [850] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1027),
+  [852] = {.entry = {.count = 1, .reusable = true}}, SHIFT(891),
+  [854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(895),
+  [856] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression_list, 3, 0, 16),
+  [858] = {.entry = {.count = 1, .reusable = false}}, SHIFT(370),
+  [860] = {.entry = {.count = 1, .reusable = true}}, SHIFT(394),
+  [862] = {.entry = {.count = 1, .reusable = true}}, SHIFT(707),
+  [864] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 6, 0, 126),
+  [866] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 6, 0, 126),
+  [868] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression_list, 2, 0, 7),
+  [870] = {.entry = {.count = 1, .reusable = true}}, SHIFT(896),
+  [872] = {.entry = {.count = 1, .reusable = true}}, SHIFT(898),
+  [874] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 6, 0, 127),
+  [876] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 6, 0, 127),
+  [878] = {.entry = {.count = 1, .reusable = true}}, SHIFT(899),
+  [880] = {.entry = {.count = 1, .reusable = true}}, SHIFT(900),
+  [882] = {.entry = {.count = 1, .reusable = true}}, SHIFT(917),
+  [884] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 5, 0, 101),
+  [886] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_in_clause, 5, 0, 101),
+  [888] = {.entry = {.count = 1, .reusable = true}}, SHIFT(981),
+  [890] = {.entry = {.count = 1, .reusable = true}}, SHIFT(984),
+  [892] = {.entry = {.count = 1, .reusable = true}}, SHIFT(988),
+  [894] = {.entry = {.count = 1, .reusable = true}}, SHIFT(966),
+  [896] = {.entry = {.count = 1, .reusable = true}}, SHIFT(985),
+  [898] = {.entry = {.count = 1, .reusable = true}}, SHIFT(987),
+  [900] = {.entry = {.count = 1, .reusable = true}}, SHIFT(715),
+  [902] = {.entry = {.count = 1, .reusable = true}}, SHIFT(708),
+  [904] = {.entry = {.count = 1, .reusable = true}}, SHIFT(880),
+  [906] = {.entry = {.count = 1, .reusable = true}}, SHIFT(883),
+  [908] = {.entry = {.count = 1, .reusable = true}}, SHIFT(886),
+  [910] = {.entry = {.count = 1, .reusable = true}}, SHIFT(887),
+  [912] = {.entry = {.count = 1, .reusable = true}}, SHIFT(888),
+  [914] = {.entry = {.count = 1, .reusable = true}}, SHIFT(889),
+  [916] = {.entry = {.count = 1, .reusable = true}}, SHIFT(914),
+  [918] = {.entry = {.count = 1, .reusable = true}}, SHIFT(920),
+  [920] = {.entry = {.count = 1, .reusable = true}}, SHIFT(768),
+  [922] = {.entry = {.count = 1, .reusable = true}}, SHIFT(915),
+  [924] = {.entry = {.count = 1, .reusable = true}}, SHIFT(279),
   [926] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_index_expression_list, 2, 0, 7),
-  [928] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_splat_pattern, 2, 0, 34),
-  [930] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_index_expression_list, 3, 0, 16),
-  [932] = {.entry = {.count = 1, .reusable = true}}, SHIFT(940),
-  [934] = {.entry = {.count = 1, .reusable = true}}, SHIFT(879),
-  [936] = {.entry = {.count = 1, .reusable = true}}, SHIFT(964),
-  [938] = {.entry = {.count = 1, .reusable = true}}, SHIFT(898),
-  [940] = {.entry = {.count = 1, .reusable = true}}, SHIFT(920),
-  [942] = {.entry = {.count = 1, .reusable = true}}, SHIFT(970),
-  [944] = {.entry = {.count = 1, .reusable = true}}, SHIFT(719),
-  [946] = {.entry = {.count = 1, .reusable = true}}, SHIFT(725),
-  [948] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 4, 0, 57),
-  [950] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 4, 0, 57),
+  [928] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_index_expression_list, 3, 0, 16),
+  [930] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_splat_pattern, 2, 0, 34),
+  [932] = {.entry = {.count = 1, .reusable = true}}, SHIFT(990),
+  [934] = {.entry = {.count = 1, .reusable = true}}, SHIFT(727),
+  [936] = {.entry = {.count = 1, .reusable = true}}, SHIFT(974),
+  [938] = {.entry = {.count = 1, .reusable = true}}, SHIFT(705),
+  [940] = {.entry = {.count = 1, .reusable = true}}, SHIFT(890),
+  [942] = {.entry = {.count = 1, .reusable = true}}, SHIFT(945),
+  [944] = {.entry = {.count = 1, .reusable = true}}, SHIFT(919),
+  [946] = {.entry = {.count = 1, .reusable = true}}, SHIFT(924),
+  [948] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 5, 0, 84),
+  [950] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 5, 0, 84),
   [952] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1635),
-  [954] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1736),
-  [956] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1632),
-  [958] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 5, 0, 84),
-  [960] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 5, 0, 84),
-  [962] = {.entry = {.count = 1, .reusable = true}}, SHIFT(409),
-  [964] = {.entry = {.count = 1, .reusable = false}}, SHIFT(907),
-  [966] = {.entry = {.count = 1, .reusable = false}}, SHIFT(913),
-  [968] = {.entry = {.count = 1, .reusable = true}}, SHIFT(323),
-  [970] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
-  [972] = {.entry = {.count = 1, .reusable = false}}, SHIFT(389),
-  [974] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1025),
-  [976] = {.entry = {.count = 1, .reusable = false}}, SHIFT(146),
-  [978] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1637),
-  [980] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1739),
-  [982] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1693),
-  [984] = {.entry = {.count = 1, .reusable = false}}, SHIFT(304),
-  [986] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 1, 0, 0),
-  [988] = {.entry = {.count = 1, .reusable = true}}, SHIFT(298),
-  [990] = {.entry = {.count = 1, .reusable = true}}, SHIFT(335),
-  [992] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
-  [994] = {.entry = {.count = 1, .reusable = false}}, SHIFT(292),
-  [996] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 2, 0, 70),
-  [998] = {.entry = {.count = 1, .reusable = true}}, SHIFT(297),
-  [1000] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1726),
-  [1002] = {.entry = {.count = 1, .reusable = true}}, SHIFT(183),
-  [1004] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 4, 0, 30),
-  [1006] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 4, 0, 29),
+  [954] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1735),
+  [956] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1681),
+  [958] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 2, 0, 70),
+  [960] = {.entry = {.count = 1, .reusable = true}}, SHIFT(297),
+  [962] = {.entry = {.count = 1, .reusable = false}}, SHIFT(909),
+  [964] = {.entry = {.count = 1, .reusable = false}}, SHIFT(911),
+  [966] = {.entry = {.count = 1, .reusable = true}}, SHIFT(322),
+  [968] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
+  [970] = {.entry = {.count = 1, .reusable = false}}, SHIFT(400),
+  [972] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1026),
+  [974] = {.entry = {.count = 1, .reusable = false}}, SHIFT(144),
+  [976] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 4, 0, 57),
+  [978] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 4, 0, 57),
+  [980] = {.entry = {.count = 1, .reusable = false}}, SHIFT(290),
+  [982] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1639),
+  [984] = {.entry = {.count = 1, .reusable = false}}, SHIFT(296),
+  [986] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1636),
+  [988] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1740),
+  [990] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 1, 0, 0),
+  [992] = {.entry = {.count = 1, .reusable = true}}, SHIFT(307),
+  [994] = {.entry = {.count = 1, .reusable = true}}, SHIFT(370),
+  [996] = {.entry = {.count = 1, .reusable = true}}, SHIFT(336),
+  [998] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
+  [1000] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3, 0, 10),
+  [1002] = {.entry = {.count = 1, .reusable = true}}, SHIFT(176),
+  [1004] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 4, 0, 29),
+  [1006] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, 0, 69),
   [1008] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, 0, 70),
-  [1010] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 2, 0, 0),
+  [1010] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1711),
   [1012] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3, 0, 0),
-  [1014] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3, 0, 10),
-  [1016] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 4, 0, 98),
-  [1018] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1704),
-  [1020] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, 0, 69),
-  [1022] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 1, 0, 0),
-  [1024] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 1, 0, 0),
-  [1026] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__simple_statements, 3, 0, 0),
-  [1028] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__simple_statements, 3, 0, 0),
-  [1030] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subscript, 4, 0, 71),
-  [1032] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subscript, 4, 0, 71),
-  [1034] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_try_statement_repeat1, 2, 0, 0),
-  [1036] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat1, 2, 0, 0),
-  [1038] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat1, 2, 0, 0), SHIFT_REPEAT(292),
-  [1041] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_try_statement_repeat2, 2, 0, 0),
-  [1043] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat2, 2, 0, 0),
-  [1045] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat2, 2, 0, 0), SHIFT_REPEAT(1739),
-  [1048] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute, 3, 0, 41),
-  [1050] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_attribute, 3, 0, 41),
-  [1052] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__simple_statements, 2, 0, 0),
-  [1054] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__simple_statements, 2, 0, 0),
-  [1056] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 6, 0, 105),
-  [1058] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 6, 0, 105),
-  [1060] = {.entry = {.count = 1, .reusable = false}}, SHIFT(394),
-  [1062] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 4, 0, 55),
-  [1064] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 4, 0, 55),
-  [1066] = {.entry = {.count = 1, .reusable = false}}, SHIFT(431),
-  [1068] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 5, 0, 79),
-  [1070] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 5, 0, 79),
-  [1072] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 5, 0, 80),
-  [1074] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 5, 0, 80),
-  [1076] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat1, 2, 0, 0), SHIFT_REPEAT(304),
-  [1079] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__simple_statements, 4, 0, 0),
-  [1081] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__simple_statements, 4, 0, 0),
-  [1083] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat2, 2, 0, 0), SHIFT_REPEAT(1736),
-  [1086] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 2, 0, 0),
-  [1088] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 2, 0, 0),
-  [1090] = {.entry = {.count = 1, .reusable = false}}, SHIFT(617),
-  [1092] = {.entry = {.count = 1, .reusable = false}}, SHIFT(618),
+  [1014] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 4, 0, 98),
+  [1016] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 2, 0, 0),
+  [1018] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1679),
+  [1020] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 4, 0, 30),
+  [1022] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 4, 0, 55),
+  [1024] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 4, 0, 55),
+  [1026] = {.entry = {.count = 1, .reusable = false}}, SHIFT(422),
+  [1028] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__simple_statements, 3, 0, 0),
+  [1030] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__simple_statements, 3, 0, 0),
+  [1032] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__simple_statements, 2, 0, 0),
+  [1034] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__simple_statements, 2, 0, 0),
+  [1036] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 5, 0, 80),
+  [1038] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 5, 0, 80),
+  [1040] = {.entry = {.count = 1, .reusable = false}}, SHIFT(431),
+  [1042] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 1, 0, 0),
+  [1044] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 1, 0, 0),
+  [1046] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__simple_statements, 4, 0, 0),
+  [1048] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__simple_statements, 4, 0, 0),
+  [1050] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subscript, 4, 0, 71),
+  [1052] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subscript, 4, 0, 71),
+  [1054] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 6, 0, 105),
+  [1056] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 6, 0, 105),
+  [1058] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat1, 2, 0, 0),
+  [1060] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_try_statement_repeat1, 2, 0, 0),
+  [1062] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat1, 2, 0, 0), SHIFT_REPEAT(296),
+  [1065] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 2, 0, 0),
+  [1067] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 2, 0, 0),
+  [1069] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute, 3, 0, 41),
+  [1071] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_attribute, 3, 0, 41),
+  [1073] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 5, 0, 79),
+  [1075] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 5, 0, 79),
+  [1077] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat1, 2, 0, 0), SHIFT_REPEAT(290),
+  [1080] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat2, 2, 0, 0),
+  [1082] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_try_statement_repeat2, 2, 0, 0),
+  [1084] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat2, 2, 0, 0), SHIFT_REPEAT(1740),
+  [1087] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_try_statement_repeat2, 2, 0, 0), SHIFT_REPEAT(1735),
+  [1090] = {.entry = {.count = 1, .reusable = false}}, SHIFT(618),
+  [1092] = {.entry = {.count = 1, .reusable = false}}, SHIFT(617),
   [1094] = {.entry = {.count = 1, .reusable = false}}, SHIFT(135),
-  [1096] = {.entry = {.count = 1, .reusable = true}}, SHIFT(509),
-  [1098] = {.entry = {.count = 1, .reusable = true}}, SHIFT(290),
-  [1100] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1705),
-  [1102] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 2, 0, 103),
-  [1104] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_if_statement_repeat1, 2, 0, 103),
-  [1106] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 2, 0, 103), SHIFT_REPEAT(431),
-  [1109] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 2, 0, 103), SHIFT_REPEAT(394),
-  [1112] = {.entry = {.count = 1, .reusable = false}}, SHIFT(849),
-  [1114] = {.entry = {.count = 1, .reusable = false}}, SHIFT(859),
-  [1116] = {.entry = {.count = 1, .reusable = false}}, SHIFT(148),
-  [1118] = {.entry = {.count = 1, .reusable = true}}, SHIFT(506),
+  [1096] = {.entry = {.count = 1, .reusable = true}}, SHIFT(512),
+  [1098] = {.entry = {.count = 1, .reusable = true}}, SHIFT(291),
+  [1100] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1738),
+  [1102] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_if_statement_repeat1, 2, 0, 103),
+  [1104] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 2, 0, 103),
+  [1106] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 2, 0, 103), SHIFT_REPEAT(422),
+  [1109] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 2, 0, 103), SHIFT_REPEAT(431),
+  [1112] = {.entry = {.count = 1, .reusable = false}}, SHIFT(837),
+  [1114] = {.entry = {.count = 1, .reusable = false}}, SHIFT(854),
+  [1116] = {.entry = {.count = 1, .reusable = false}}, SHIFT(147),
+  [1118] = {.entry = {.count = 1, .reusable = true}}, SHIFT(494),
   [1120] = {.entry = {.count = 1, .reusable = true}}, SHIFT(306),
-  [1122] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1746),
-  [1124] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 8, 0, 169),
-  [1126] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 8, 0, 169),
-  [1128] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_cases, 1, 0, 0),
-  [1130] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_cases, 1, 0, 0),
-  [1132] = {.entry = {.count = 1, .reusable = false}}, SHIFT(870),
-  [1134] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 4, 0, 134),
+  [1122] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1750),
+  [1124] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 8, 0, 169),
+  [1126] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 8, 0, 169),
+  [1128] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 3, 0, 57),
+  [1130] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 3, 0, 57),
+  [1132] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 4, 0, 84),
+  [1134] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 4, 0, 84),
   [1136] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 4, 0, 134),
-  [1138] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 6, 0, 161),
-  [1140] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 6, 0, 161),
-  [1142] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 6, 0, 162),
-  [1144] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 6, 0, 162),
-  [1146] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_cases_repeat1, 2, 0, 0),
-  [1148] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_cases_repeat1, 2, 0, 0),
-  [1150] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_cases_repeat1, 2, 0, 0), SHIFT_REPEAT(870),
-  [1153] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_cases_repeat1, 2, 0, 0), SHIFT_REPEAT(869),
-  [1156] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 7, 0, 167),
-  [1158] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 7, 0, 167),
-  [1160] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 4, 0, 84),
-  [1162] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 4, 0, 84),
-  [1164] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 3, 0, 57),
-  [1166] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 3, 0, 57),
-  [1168] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 7, 0, 168),
-  [1170] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 7, 0, 168),
-  [1172] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1054),
-  [1174] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1385),
-  [1176] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1269),
-  [1178] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 5, 0, 152),
-  [1180] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 5, 0, 152),
-  [1182] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 5, 0, 151),
-  [1184] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 5, 0, 151),
-  [1186] = {.entry = {.count = 1, .reusable = false}}, SHIFT(869),
-  [1188] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1422),
-  [1190] = {.entry = {.count = 1, .reusable = true}}, SHIFT(632),
-  [1192] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 2, 0, 26),
-  [1194] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elif_clause, 4, 0, 55),
-  [1196] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_elif_clause, 4, 0, 55),
-  [1198] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 8, 0, 147),
-  [1200] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 8, 0, 147),
-  [1202] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1416),
-  [1204] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_primary_expression, 1, 0, 0),
-  [1206] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_primary_expression, 1, 0, 0), REDUCE(sym_list_splat_pattern, 2, 0, 9),
-  [1209] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_primary_expression, 1, 0, 0),
-  [1211] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_splat_pattern, 2, 0, 9),
-  [1213] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_splat_pattern, 2, 0, 9),
-  [1215] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 3, 0, 52),
-  [1217] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elif_clause, 5, 0, 80),
-  [1219] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_elif_clause, 5, 0, 80),
-  [1221] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_if_statement_repeat1, 1, 0, 77),
-  [1223] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 1, 0, 77),
-  [1225] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 6, 0, 108),
-  [1227] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 6, 0, 108),
-  [1229] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 4, 0, 56),
-  [1231] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 4, 0, 56),
-  [1233] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 6, 0, 84),
-  [1235] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 6, 0, 84),
-  [1237] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 5, 0, 83),
-  [1239] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 5, 0, 83),
-  [1241] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 5, 0, 57),
-  [1243] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 5, 0, 57),
-  [1245] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 7, 0, 129),
-  [1247] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 7, 0, 129),
-  [1249] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 7, 0, 133),
-  [1251] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 7, 0, 133),
-  [1253] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_else_clause, 3, 0, 57),
-  [1255] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_else_clause, 3, 0, 57),
-  [1257] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 5, 0, 154),
-  [1259] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 5, 0, 154),
-  [1261] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 5, 0, 155),
-  [1263] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 5, 0, 155),
-  [1265] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_pattern, 1, 0, 0), REDUCE(sym_primary_expression, 1, 0, 0),
-  [1268] = {.entry = {.count = 1, .reusable = true}}, SHIFT(369),
-  [1270] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern, 1, 0, 0),
-  [1272] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern, 1, 0, 0),
-  [1274] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 4, 0, 138),
-  [1276] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 4, 0, 138),
-  [1278] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_else_clause, 4, 0, 84),
-  [1280] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_else_clause, 4, 0, 84),
-  [1282] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 6, 0, 163),
-  [1284] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 6, 0, 163),
+  [1138] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 4, 0, 134),
+  [1140] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 5, 0, 151),
+  [1142] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 5, 0, 151),
+  [1144] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1354),
+  [1146] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1283),
+  [1148] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 5, 0, 152),
+  [1150] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 5, 0, 152),
+  [1152] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 6, 0, 161),
+  [1154] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 6, 0, 161),
+  [1156] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 6, 0, 162),
+  [1158] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 6, 0, 162),
+  [1160] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_group_clause, 7, 0, 167),
+  [1162] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_group_clause, 7, 0, 167),
+  [1164] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_except_clause, 7, 0, 168),
+  [1166] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_except_clause, 7, 0, 168),
+  [1168] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_cases_repeat1, 2, 0, 0),
+  [1170] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_cases_repeat1, 2, 0, 0),
+  [1172] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_cases_repeat1, 2, 0, 0), SHIFT_REPEAT(813),
+  [1175] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_cases, 1, 0, 0),
+  [1177] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_cases, 1, 0, 0),
+  [1179] = {.entry = {.count = 1, .reusable = false}}, SHIFT(832),
+  [1181] = {.entry = {.count = 1, .reusable = false}}, SHIFT(813),
+  [1183] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1045),
+  [1185] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_cases_repeat1, 2, 0, 0), SHIFT_REPEAT(832),
+  [1188] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 5, 0, 57),
+  [1190] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 5, 0, 57),
+  [1192] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 7, 0, 133),
+  [1194] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 7, 0, 133),
+  [1196] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elif_clause, 4, 0, 55),
+  [1198] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_elif_clause, 4, 0, 55),
+  [1200] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 4, 0, 56),
+  [1202] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 4, 0, 56),
+  [1204] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 8, 0, 147),
+  [1206] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 8, 0, 147),
+  [1208] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 5, 0, 83),
+  [1210] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 5, 0, 83),
+  [1212] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 6, 0, 84),
+  [1214] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 6, 0, 84),
+  [1216] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1479),
+  [1218] = {.entry = {.count = 1, .reusable = true}}, SHIFT(663),
+  [1220] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 2, 0, 26),
+  [1222] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elif_clause, 5, 0, 80),
+  [1224] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_elif_clause, 5, 0, 80),
+  [1226] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 3, 0, 52),
+  [1228] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 6, 0, 108),
+  [1230] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 6, 0, 108),
+  [1232] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_if_statement_repeat1, 1, 0, 77),
+  [1234] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_if_statement_repeat1, 1, 0, 77),
+  [1236] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_primary_expression, 1, 0, 0),
+  [1238] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_primary_expression, 1, 0, 0), REDUCE(sym_list_splat_pattern, 2, 0, 9),
+  [1241] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_primary_expression, 1, 0, 0),
+  [1243] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_splat_pattern, 2, 0, 9),
+  [1245] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_splat_pattern, 2, 0, 9),
+  [1247] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1489),
+  [1249] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 7, 0, 129),
+  [1251] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 7, 0, 129),
+  [1253] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 6, 0, 163),
+  [1255] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 6, 0, 163),
+  [1257] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 4, 0, 138),
+  [1259] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 4, 0, 138),
+  [1261] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 5, 0, 154),
+  [1263] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 5, 0, 154),
+  [1265] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_block, 5, 0, 155),
+  [1267] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_block, 5, 0, 155),
+  [1269] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_else_clause, 3, 0, 57),
+  [1271] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_else_clause, 3, 0, 57),
+  [1273] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_pattern, 1, 0, 0), REDUCE(sym_primary_expression, 1, 0, 0),
+  [1276] = {.entry = {.count = 1, .reusable = true}}, SHIFT(371),
+  [1278] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_pattern, 1, 0, 0),
+  [1280] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern, 1, 0, 0),
+  [1282] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_else_clause, 4, 0, 84),
+  [1284] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_else_clause, 4, 0, 84),
   [1286] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 4, 0, 65),
   [1288] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 4, 0, 65),
-  [1290] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list, 2, 0, 0),
-  [1292] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_list_pattern, 2, 0, 0), REDUCE(sym_list, 2, 0, 0),
-  [1295] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list, 2, 0, 0),
-  [1297] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_pattern, 2, 0, 0),
-  [1299] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_pattern, 2, 0, 0),
-  [1301] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 9, 0, 158),
-  [1303] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 9, 0, 158),
-  [1305] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 9, 0, 159),
-  [1307] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 9, 0, 159),
-  [1309] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 9, 0, 160),
-  [1311] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 9, 0, 160),
-  [1313] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, 0, 93),
-  [1315] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 5, 0, 93),
-  [1317] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 6, 0, 102),
-  [1319] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 6, 0, 102),
-  [1321] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 6, 0, 104),
-  [1323] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 6, 0, 104),
-  [1325] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 9, 0, 165),
-  [1327] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 9, 0, 165),
-  [1329] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 10, 0, 166),
-  [1331] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 10, 0, 166),
-  [1333] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 2, 0, 0),
-  [1335] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_tuple_pattern, 2, 0, 0), REDUCE(sym_tuple, 2, 0, 0),
-  [1338] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple, 2, 0, 0),
-  [1340] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_pattern, 2, 0, 0),
-  [1342] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple_pattern, 2, 0, 0),
-  [1344] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 6, 0, 106),
-  [1346] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 6, 0, 106),
-  [1348] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 6, 0, 107),
-  [1350] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 6, 0, 107),
-  [1352] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 8, 0, 146),
-  [1354] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 8, 0, 146),
-  [1356] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 5, 0, 78),
-  [1358] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 5, 0, 78),
-  [1360] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 6, 0, 109),
-  [1362] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 6, 0, 109),
-  [1364] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 5, 0, 81),
-  [1366] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 5, 0, 81),
-  [1368] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_finally_clause, 3, 0, 57),
-  [1370] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_finally_clause, 3, 0, 57),
-  [1372] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_decorated_definition, 2, 0, 19),
-  [1374] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorated_definition, 2, 0, 19),
-  [1376] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 6, 0, 57),
-  [1378] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 6, 0, 57),
-  [1380] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, 0, 148),
-  [1382] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, 0, 148),
-  [1384] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 5, 0, 82),
-  [1386] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 5, 0, 82),
-  [1388] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, 0, 94),
-  [1390] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 5, 0, 94),
-  [1392] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 6, 0, 117),
-  [1394] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 6, 0, 117),
-  [1396] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, 0, 149),
-  [1398] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, 0, 149),
-  [1400] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 6, 0, 118),
-  [1402] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 6, 0, 118),
-  [1404] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 4, 0, 58),
-  [1406] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 4, 0, 58),
-  [1408] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_match_statement, 4, 0, 60),
-  [1410] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_statement, 4, 0, 60),
-  [1412] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_match_statement, 4, 0, 61),
-  [1414] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_statement, 4, 0, 61),
-  [1416] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, 0, 119),
-  [1418] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 6, 0, 119),
-  [1420] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, 0, 120),
-  [1422] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 6, 0, 120),
-  [1424] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, 0, 121),
-  [1426] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 6, 0, 121),
-  [1428] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 8, 0, 150),
-  [1430] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 8, 0, 150),
-  [1432] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 5, 0, 85),
-  [1434] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 5, 0, 85),
-  [1436] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 5, 0, 92),
-  [1438] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, 0, 92),
-  [1440] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 7, 0, 128),
-  [1442] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 7, 0, 128),
-  [1444] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, 0, 130),
-  [1446] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, 0, 130),
-  [1448] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, 0, 131),
-  [1450] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, 0, 131),
-  [1452] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 7, 0, 132),
-  [1454] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 7, 0, 132),
-  [1456] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_finally_clause, 4, 0, 84),
-  [1458] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_finally_clause, 4, 0, 84),
-  [1460] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 7, 0, 84),
-  [1462] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 7, 0, 84),
-  [1464] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, 0, 141),
-  [1466] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, 0, 141),
-  [1468] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, 0, 142),
-  [1470] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, 0, 142),
-  [1472] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 7, 0, 143),
-  [1474] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 7, 0, 143),
-  [1476] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, 0, 156),
-  [1478] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, 0, 156),
-  [1480] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, 0, 157),
-  [1482] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, 0, 157),
-  [1484] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 5, 0, 90),
-  [1486] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 5, 0, 90),
-  [1488] = {.entry = {.count = 1, .reusable = true}}, SHIFT(355),
-  [1490] = {.entry = {.count = 1, .reusable = false}}, SHIFT(860),
-  [1492] = {.entry = {.count = 1, .reusable = false}}, SHIFT(871),
+  [1290] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 9, 0, 165),
+  [1292] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 9, 0, 165),
+  [1294] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_decorated_definition, 2, 0, 19),
+  [1296] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorated_definition, 2, 0, 19),
+  [1298] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 5, 0, 78),
+  [1300] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 5, 0, 78),
+  [1302] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 5, 0, 81),
+  [1304] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 5, 0, 81),
+  [1306] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list, 2, 0, 0),
+  [1308] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_list_pattern, 2, 0, 0), REDUCE(sym_list, 2, 0, 0),
+  [1311] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list, 2, 0, 0),
+  [1313] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_pattern, 2, 0, 0),
+  [1315] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_pattern, 2, 0, 0),
+  [1317] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 4, 0, 58),
+  [1319] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 4, 0, 58),
+  [1321] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_match_statement, 4, 0, 60),
+  [1323] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_statement, 4, 0, 60),
+  [1325] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_match_statement, 4, 0, 61),
+  [1327] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_statement, 4, 0, 61),
+  [1329] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 5, 0, 82),
+  [1331] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 5, 0, 82),
+  [1333] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 5, 0, 85),
+  [1335] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 5, 0, 85),
+  [1337] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 5, 0, 90),
+  [1339] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 5, 0, 90),
+  [1341] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 5, 0, 92),
+  [1343] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, 0, 92),
+  [1345] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 5, 0, 93),
+  [1347] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, 0, 93),
+  [1349] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 5, 0, 94),
+  [1351] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, 0, 94),
+  [1353] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 6, 0, 102),
+  [1355] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 6, 0, 102),
+  [1357] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 6, 0, 104),
+  [1359] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 6, 0, 104),
+  [1361] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_statement, 6, 0, 106),
+  [1363] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_statement, 6, 0, 106),
+  [1365] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 6, 0, 107),
+  [1367] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 6, 0, 107),
+  [1369] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while_statement, 6, 0, 109),
+  [1371] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while_statement, 6, 0, 109),
+  [1373] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_finally_clause, 3, 0, 57),
+  [1375] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_finally_clause, 3, 0, 57),
+  [1377] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 6, 0, 57),
+  [1379] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 6, 0, 57),
+  [1381] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 6, 0, 117),
+  [1383] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 6, 0, 117),
+  [1385] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 6, 0, 118),
+  [1387] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 6, 0, 118),
+  [1389] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 6, 0, 119),
+  [1391] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, 0, 119),
+  [1393] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 6, 0, 120),
+  [1395] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, 0, 120),
+  [1397] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 6, 0, 121),
+  [1399] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, 0, 121),
+  [1401] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if_statement, 7, 0, 128),
+  [1403] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_statement, 7, 0, 128),
+  [1405] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, 0, 130),
+  [1407] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, 0, 130),
+  [1409] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, 0, 131),
+  [1411] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, 0, 131),
+  [1413] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 7, 0, 132),
+  [1415] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 7, 0, 132),
+  [1417] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_finally_clause, 4, 0, 84),
+  [1419] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_finally_clause, 4, 0, 84),
+  [1421] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_try_statement, 7, 0, 84),
+  [1423] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_try_statement, 7, 0, 84),
+  [1425] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, 0, 141),
+  [1427] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, 0, 141),
+  [1429] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 7, 0, 142),
+  [1431] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 7, 0, 142),
+  [1433] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_definition, 7, 0, 143),
+  [1435] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 7, 0, 143),
+  [1437] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 8, 0, 146),
+  [1439] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 8, 0, 146),
+  [1441] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, 0, 148),
+  [1443] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, 0, 148),
+  [1445] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, 0, 149),
+  [1447] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, 0, 149),
+  [1449] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 8, 0, 150),
+  [1451] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 8, 0, 150),
+  [1453] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, 0, 156),
+  [1455] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, 0, 156),
+  [1457] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 8, 0, 157),
+  [1459] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 8, 0, 157),
+  [1461] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_statement, 9, 0, 158),
+  [1463] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_statement, 9, 0, 158),
+  [1465] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 10, 0, 166),
+  [1467] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 10, 0, 166),
+  [1469] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 9, 0, 160),
+  [1471] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 9, 0, 160),
+  [1473] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 2, 0, 0),
+  [1475] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_tuple_pattern, 2, 0, 0), REDUCE(sym_tuple, 2, 0, 0),
+  [1478] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple, 2, 0, 0),
+  [1480] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_pattern, 2, 0, 0),
+  [1482] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple_pattern, 2, 0, 0),
+  [1484] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 9, 0, 159),
+  [1486] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 9, 0, 159),
+  [1488] = {.entry = {.count = 1, .reusable = true}}, SHIFT(406),
+  [1490] = {.entry = {.count = 1, .reusable = false}}, SHIFT(877),
+  [1492] = {.entry = {.count = 1, .reusable = false}}, SHIFT(868),
   [1494] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keyword_separator, 1, 0, 0),
-  [1496] = {.entry = {.count = 1, .reusable = false}}, SHIFT(143),
-  [1498] = {.entry = {.count = 1, .reusable = false}}, SHIFT(647),
-  [1500] = {.entry = {.count = 1, .reusable = false}}, SHIFT(671),
-  [1502] = {.entry = {.count = 1, .reusable = false}}, SHIFT(652),
-  [1504] = {.entry = {.count = 1, .reusable = false}}, SHIFT(633),
-  [1506] = {.entry = {.count = 1, .reusable = false}}, SHIFT(675),
-  [1508] = {.entry = {.count = 1, .reusable = false}}, SHIFT(687),
-  [1510] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_concatenated_template_string_repeat1, 2, 0, 0),
-  [1512] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_concatenated_template_string_repeat1, 2, 0, 0),
-  [1514] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_template_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1061),
-  [1517] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1013),
-  [1519] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1011),
-  [1521] = {.entry = {.count = 1, .reusable = false}}, SHIFT(244),
-  [1523] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2, 0, 0),
-  [1525] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_concatenated_string_repeat1, 2, 0, 0),
-  [1527] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1059),
-  [1530] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_concatenated_string, 2, 0, 0),
-  [1532] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_concatenated_string, 2, 0, 0),
-  [1534] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_concatenated_template_string, 2, 0, 0),
-  [1536] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_concatenated_template_string, 2, 0, 0),
-  [1538] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_template_string, 3, 0, 20),
-  [1540] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_template_string, 3, 0, 20),
-  [1542] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_template_string, 2, 0, 2),
-  [1544] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_template_string, 2, 0, 2),
-  [1546] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 2, 0, 2),
-  [1548] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string, 2, 0, 2),
-  [1550] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 3, 0, 20),
-  [1552] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string, 3, 0, 20),
-  [1554] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1681),
-  [1556] = {.entry = {.count = 1, .reusable = true}}, SHIFT(181),
-  [1558] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression, 1, 0, 0),
-  [1560] = {.entry = {.count = 1, .reusable = false}}, SHIFT(674),
-  [1562] = {.entry = {.count = 1, .reusable = true}}, SHIFT(676),
-  [1564] = {.entry = {.count = 1, .reusable = true}}, SHIFT(677),
-  [1566] = {.entry = {.count = 1, .reusable = true}}, SHIFT(678),
-  [1568] = {.entry = {.count = 1, .reusable = true}}, SHIFT(680),
-  [1570] = {.entry = {.count = 1, .reusable = true}}, SHIFT(241),
-  [1572] = {.entry = {.count = 1, .reusable = true}}, SHIFT(681),
-  [1574] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression, 1, 0, 0),
-  [1576] = {.entry = {.count = 1, .reusable = true}}, SHIFT(674),
-  [1578] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1710),
-  [1580] = {.entry = {.count = 1, .reusable = true}}, SHIFT(682),
-  [1582] = {.entry = {.count = 1, .reusable = true}}, SHIFT(683),
-  [1584] = {.entry = {.count = 1, .reusable = false}}, SHIFT(677),
-  [1586] = {.entry = {.count = 1, .reusable = true}}, SHIFT(625),
-  [1588] = {.entry = {.count = 1, .reusable = false}}, SHIFT(645),
-  [1590] = {.entry = {.count = 1, .reusable = true}}, SHIFT(649),
-  [1592] = {.entry = {.count = 1, .reusable = true}}, SHIFT(650),
-  [1594] = {.entry = {.count = 1, .reusable = true}}, SHIFT(654),
-  [1596] = {.entry = {.count = 1, .reusable = true}}, SHIFT(655),
-  [1598] = {.entry = {.count = 1, .reusable = true}}, SHIFT(656),
-  [1600] = {.entry = {.count = 1, .reusable = true}}, SHIFT(645),
-  [1602] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1702),
-  [1604] = {.entry = {.count = 1, .reusable = true}}, SHIFT(626),
-  [1606] = {.entry = {.count = 1, .reusable = true}}, SHIFT(659),
-  [1608] = {.entry = {.count = 1, .reusable = false}}, SHIFT(650),
-  [1610] = {.entry = {.count = 1, .reusable = true}}, SHIFT(624),
-  [1612] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 2, 0, 0),
-  [1614] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 2, 0, 0),
-  [1616] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 2, 0, 17),
-  [1618] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 2, 0, 17),
-  [1620] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_expression, 3, 0, 28),
-  [1622] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_parenthesized_expression, 3, 0, 28),
-  [1624] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 3, 0, 27),
-  [1626] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple, 3, 0, 27),
-  [1628] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list, 3, 0, 27),
-  [1630] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list, 3, 0, 27),
-  [1632] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 3, 0, 0),
-  [1634] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 3, 0, 0),
-  [1636] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 3, 0, 32),
-  [1638] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 3, 0, 32),
-  [1640] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set, 3, 0, 27),
-  [1642] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set, 3, 0, 27),
-  [1644] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 2, 0, 0),
-  [1646] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 2, 0, 0),
-  [1648] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generator_expression, 4, 0, 51),
-  [1650] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_generator_expression, 4, 0, 51),
-  [1652] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_comprehension, 4, 0, 51),
-  [1654] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_comprehension, 4, 0, 51),
-  [1656] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set_comprehension, 4, 0, 51),
-  [1658] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set_comprehension, 4, 0, 51),
-  [1660] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 4, 0, 32),
-  [1662] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 4, 0, 32),
-  [1664] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 4, 0, 62),
-  [1666] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 4, 0, 62),
-  [1668] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 3, 0, 0),
-  [1670] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 3, 0, 0),
-  [1672] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 3, 0, 32),
-  [1674] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 3, 0, 32),
-  [1676] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 3, 0, 68),
-  [1678] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 3, 0, 68),
-  [1680] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 5, 0, 62),
-  [1682] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 5, 0, 62),
-  [1684] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, 0, 32),
-  [1686] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, 0, 32),
-  [1688] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, 0, 62),
-  [1690] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, 0, 62),
-  [1692] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, 0, 68),
-  [1694] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, 0, 68),
-  [1696] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, 0, 96),
-  [1698] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, 0, 96),
-  [1700] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 5, 0, 62),
-  [1702] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 5, 0, 62),
-  [1704] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 5, 0, 96),
-  [1706] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 5, 0, 96),
-  [1708] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_comprehension, 4, 0, 51),
-  [1710] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary_comprehension, 4, 0, 51),
-  [1712] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_binary_operator, 3, 0, 40),
-  [1714] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_binary_operator, 3, 0, 40),
+  [1496] = {.entry = {.count = 1, .reusable = false}}, SHIFT(142),
+  [1498] = {.entry = {.count = 1, .reusable = false}}, SHIFT(699),
+  [1500] = {.entry = {.count = 1, .reusable = false}}, SHIFT(653),
+  [1502] = {.entry = {.count = 1, .reusable = false}}, SHIFT(640),
+  [1504] = {.entry = {.count = 1, .reusable = false}}, SHIFT(650),
+  [1506] = {.entry = {.count = 1, .reusable = false}}, SHIFT(673),
+  [1508] = {.entry = {.count = 1, .reusable = false}}, SHIFT(696),
+  [1510] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1011),
+  [1512] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1006),
+  [1514] = {.entry = {.count = 1, .reusable = false}}, SHIFT(246),
+  [1516] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_concatenated_string, 2, 0, 0),
+  [1518] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_concatenated_string, 2, 0, 0),
+  [1520] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_concatenated_template_string, 2, 0, 0),
+  [1522] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_concatenated_template_string, 2, 0, 0),
+  [1524] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2, 0, 0),
+  [1526] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_concatenated_string_repeat1, 2, 0, 0),
+  [1528] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1065),
+  [1531] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_concatenated_template_string_repeat1, 2, 0, 0),
+  [1533] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_concatenated_template_string_repeat1, 2, 0, 0),
+  [1535] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_template_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1042),
+  [1538] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 2, 0, 2),
+  [1540] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string, 2, 0, 2),
+  [1542] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 3, 0, 20),
+  [1544] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string, 3, 0, 20),
+  [1546] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_template_string, 3, 0, 20),
+  [1548] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_template_string, 3, 0, 20),
+  [1550] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_template_string, 2, 0, 2),
+  [1552] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_template_string, 2, 0, 2),
+  [1554] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 3, 0, 0),
+  [1556] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 3, 0, 0),
+  [1558] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 5, 0, 62),
+  [1560] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 5, 0, 62),
+  [1562] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 3, 0, 27),
+  [1564] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple, 3, 0, 27),
+  [1566] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list, 3, 0, 27),
+  [1568] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list, 3, 0, 27),
+  [1570] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 3, 0, 0),
+  [1572] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 3, 0, 0),
+  [1574] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 5, 0, 62),
+  [1576] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 5, 0, 62),
+  [1578] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 3, 0, 32),
+  [1580] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 3, 0, 32),
+  [1582] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 3, 0, 32),
+  [1584] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 3, 0, 32),
+  [1586] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, 0, 32),
+  [1588] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, 0, 32),
+  [1590] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, 0, 62),
+  [1592] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, 0, 62),
+  [1594] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generator_expression, 4, 0, 51),
+  [1596] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_generator_expression, 4, 0, 51),
+  [1598] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, 0, 68),
+  [1600] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, 0, 68),
+  [1602] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 5, 0, 96),
+  [1604] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 5, 0, 96),
+  [1606] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set, 3, 0, 27),
+  [1608] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set, 3, 0, 27),
+  [1610] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 2, 0, 0),
+  [1612] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 2, 0, 0),
+  [1614] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 2, 0, 0),
+  [1616] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 2, 0, 0),
+  [1618] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_comprehension, 4, 0, 51),
+  [1620] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_comprehension, 4, 0, 51),
+  [1622] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set_comprehension, 4, 0, 51),
+  [1624] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set_comprehension, 4, 0, 51),
+  [1626] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 4, 0, 32),
+  [1628] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 4, 0, 32),
+  [1630] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1658),
+  [1632] = {.entry = {.count = 1, .reusable = true}}, SHIFT(180),
+  [1634] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression, 1, 0, 0),
+  [1636] = {.entry = {.count = 1, .reusable = false}}, SHIFT(664),
+  [1638] = {.entry = {.count = 1, .reusable = true}}, SHIFT(665),
+  [1640] = {.entry = {.count = 1, .reusable = true}}, SHIFT(666),
+  [1642] = {.entry = {.count = 1, .reusable = true}}, SHIFT(667),
+  [1644] = {.entry = {.count = 1, .reusable = true}}, SHIFT(668),
+  [1646] = {.entry = {.count = 1, .reusable = true}}, SHIFT(241),
+  [1648] = {.entry = {.count = 1, .reusable = true}}, SHIFT(669),
+  [1650] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression, 1, 0, 0),
+  [1652] = {.entry = {.count = 1, .reusable = true}}, SHIFT(664),
+  [1654] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1721),
+  [1656] = {.entry = {.count = 1, .reusable = true}}, SHIFT(670),
+  [1658] = {.entry = {.count = 1, .reusable = true}}, SHIFT(671),
+  [1660] = {.entry = {.count = 1, .reusable = false}}, SHIFT(666),
+  [1662] = {.entry = {.count = 1, .reusable = true}}, SHIFT(624),
+  [1664] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_comprehension, 4, 0, 51),
+  [1666] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary_comprehension, 4, 0, 51),
+  [1668] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_expression, 3, 0, 28),
+  [1670] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_parenthesized_expression, 3, 0, 28),
+  [1672] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 2, 0, 17),
+  [1674] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 2, 0, 17),
+  [1676] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary, 4, 0, 62),
+  [1678] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_dictionary, 4, 0, 62),
+  [1680] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 3, 0, 68),
+  [1682] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 3, 0, 68),
+  [1684] = {.entry = {.count = 1, .reusable = false}}, SHIFT(677),
+  [1686] = {.entry = {.count = 1, .reusable = true}}, SHIFT(678),
+  [1688] = {.entry = {.count = 1, .reusable = true}}, SHIFT(680),
+  [1690] = {.entry = {.count = 1, .reusable = true}}, SHIFT(681),
+  [1692] = {.entry = {.count = 1, .reusable = true}}, SHIFT(682),
+  [1694] = {.entry = {.count = 1, .reusable = true}}, SHIFT(684),
+  [1696] = {.entry = {.count = 1, .reusable = true}}, SHIFT(677),
+  [1698] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1670),
+  [1700] = {.entry = {.count = 1, .reusable = true}}, SHIFT(694),
+  [1702] = {.entry = {.count = 1, .reusable = true}}, SHIFT(628),
+  [1704] = {.entry = {.count = 1, .reusable = false}}, SHIFT(680),
+  [1706] = {.entry = {.count = 1, .reusable = true}}, SHIFT(620),
+  [1708] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 4, 0, 96),
+  [1710] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 4, 0, 96),
+  [1712] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 42),
+  [1714] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 42),
   [1716] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 3, 0, 72),
   [1718] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 3, 0, 72),
   [1720] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 3, 0, 73),
   [1722] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 3, 0, 73),
-  [1724] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_await, 2, 0, 0),
-  [1726] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_await, 2, 0, 0),
-  [1728] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unary_operator, 2, 0, 13),
-  [1730] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unary_operator, 2, 0, 13),
-  [1732] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1049),
-  [1735] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_template_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1050),
-  [1738] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 42),
-  [1740] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 42),
-  [1742] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1060),
-  [1745] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_template_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1055),
-  [1748] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1631),
-  [1750] = {.entry = {.count = 1, .reusable = true}}, SHIFT(178),
-  [1752] = {.entry = {.count = 1, .reusable = false}}, SHIFT(644),
-  [1754] = {.entry = {.count = 1, .reusable = true}}, SHIFT(634),
-  [1756] = {.entry = {.count = 1, .reusable = true}}, SHIFT(637),
-  [1758] = {.entry = {.count = 1, .reusable = true}}, SHIFT(640),
-  [1760] = {.entry = {.count = 1, .reusable = true}}, SHIFT(668),
-  [1762] = {.entry = {.count = 1, .reusable = true}}, SHIFT(242),
-  [1764] = {.entry = {.count = 1, .reusable = true}}, SHIFT(646),
-  [1766] = {.entry = {.count = 1, .reusable = true}}, SHIFT(644),
-  [1768] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1619),
-  [1770] = {.entry = {.count = 1, .reusable = true}}, SHIFT(653),
-  [1772] = {.entry = {.count = 1, .reusable = true}}, SHIFT(691),
-  [1774] = {.entry = {.count = 1, .reusable = false}}, SHIFT(637),
-  [1776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(620),
-  [1778] = {.entry = {.count = 1, .reusable = false}}, SHIFT(661),
-  [1780] = {.entry = {.count = 1, .reusable = true}}, SHIFT(662),
-  [1782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(663),
-  [1784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(699),
-  [1786] = {.entry = {.count = 1, .reusable = true}}, SHIFT(664),
-  [1788] = {.entry = {.count = 1, .reusable = true}}, SHIFT(665),
-  [1790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(661),
-  [1792] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1698),
-  [1794] = {.entry = {.count = 1, .reusable = true}}, SHIFT(666),
-  [1796] = {.entry = {.count = 1, .reusable = true}}, SHIFT(667),
-  [1798] = {.entry = {.count = 1, .reusable = false}}, SHIFT(663),
-  [1800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(621),
-  [1802] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1044),
-  [1805] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_template_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1040),
-  [1808] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1668),
-  [1810] = {.entry = {.count = 1, .reusable = true}}, SHIFT(188),
-  [1812] = {.entry = {.count = 1, .reusable = false}}, SHIFT(657),
-  [1814] = {.entry = {.count = 1, .reusable = true}}, SHIFT(672),
-  [1816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(695),
-  [1818] = {.entry = {.count = 1, .reusable = true}}, SHIFT(679),
-  [1820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(689),
-  [1822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(239),
-  [1824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(630),
-  [1826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(657),
-  [1828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1730),
-  [1830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(636),
-  [1832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(638),
-  [1834] = {.entry = {.count = 1, .reusable = false}}, SHIFT(695),
-  [1836] = {.entry = {.count = 1, .reusable = true}}, SHIFT(622),
-  [1838] = {.entry = {.count = 1, .reusable = true}}, SHIFT(426),
-  [1840] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1703),
-  [1842] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
-  [1844] = {.entry = {.count = 1, .reusable = false}}, SHIFT(697),
-  [1846] = {.entry = {.count = 1, .reusable = true}}, SHIFT(641),
-  [1848] = {.entry = {.count = 1, .reusable = true}}, SHIFT(696),
-  [1850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(684),
-  [1852] = {.entry = {.count = 1, .reusable = true}}, SHIFT(631),
-  [1854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(238),
-  [1856] = {.entry = {.count = 1, .reusable = true}}, SHIFT(629),
-  [1858] = {.entry = {.count = 1, .reusable = true}}, SHIFT(697),
-  [1860] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1672),
-  [1862] = {.entry = {.count = 1, .reusable = true}}, SHIFT(635),
-  [1864] = {.entry = {.count = 1, .reusable = true}}, SHIFT(660),
-  [1866] = {.entry = {.count = 1, .reusable = false}}, SHIFT(696),
-  [1868] = {.entry = {.count = 1, .reusable = true}}, SHIFT(623),
-  [1870] = {.entry = {.count = 1, .reusable = false}}, SHIFT(438),
-  [1872] = {.entry = {.count = 1, .reusable = true}}, SHIFT(411),
-  [1874] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1042),
-  [1876] = {.entry = {.count = 1, .reusable = true}}, SHIFT(896),
-  [1878] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1514),
-  [1880] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_open_sequence_match_pattern, 3, 0, 0),
-  [1882] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_open_sequence_match_pattern, 3, 0, 0),
-  [1884] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1587),
-  [1886] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1117),
-  [1888] = {.entry = {.count = 1, .reusable = true}}, SHIFT(897),
-  [1890] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1007),
-  [1892] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1078),
-  [1894] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1078),
-  [1896] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1116),
-  [1898] = {.entry = {.count = 1, .reusable = false}}, SHIFT(363),
-  [1900] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_open_sequence_match_pattern, 2, 0, 0),
-  [1902] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_open_sequence_match_pattern, 2, 0, 0),
-  [1904] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1142),
-  [1906] = {.entry = {.count = 1, .reusable = true}}, SHIFT(375),
-  [1908] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1130),
-  [1910] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1143),
-  [1912] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1160),
-  [1914] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1138),
-  [1916] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1141),
-  [1918] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1158),
-  [1920] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1136),
-  [1922] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1101),
+  [1724] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_binary_operator, 3, 0, 40),
+  [1726] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_binary_operator, 3, 0, 40),
+  [1728] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_template_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1062),
+  [1731] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unary_operator, 2, 0, 13),
+  [1733] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unary_operator, 2, 0, 13),
+  [1735] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_await, 2, 0, 0),
+  [1737] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_await, 2, 0, 0),
+  [1739] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1061),
+  [1742] = {.entry = {.count = 1, .reusable = false}}, SHIFT(686),
+  [1744] = {.entry = {.count = 1, .reusable = true}}, SHIFT(687),
+  [1746] = {.entry = {.count = 1, .reusable = true}}, SHIFT(688),
+  [1748] = {.entry = {.count = 1, .reusable = true}}, SHIFT(689),
+  [1750] = {.entry = {.count = 1, .reusable = true}}, SHIFT(690),
+  [1752] = {.entry = {.count = 1, .reusable = true}}, SHIFT(691),
+  [1754] = {.entry = {.count = 1, .reusable = true}}, SHIFT(686),
+  [1756] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1702),
+  [1758] = {.entry = {.count = 1, .reusable = true}}, SHIFT(692),
+  [1760] = {.entry = {.count = 1, .reusable = true}}, SHIFT(693),
+  [1762] = {.entry = {.count = 1, .reusable = false}}, SHIFT(688),
+  [1764] = {.entry = {.count = 1, .reusable = true}}, SHIFT(625),
+  [1766] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1705),
+  [1768] = {.entry = {.count = 1, .reusable = true}}, SHIFT(188),
+  [1770] = {.entry = {.count = 1, .reusable = false}}, SHIFT(641),
+  [1772] = {.entry = {.count = 1, .reusable = true}}, SHIFT(642),
+  [1774] = {.entry = {.count = 1, .reusable = true}}, SHIFT(643),
+  [1776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(644),
+  [1778] = {.entry = {.count = 1, .reusable = true}}, SHIFT(645),
+  [1780] = {.entry = {.count = 1, .reusable = true}}, SHIFT(238),
+  [1782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(646),
+  [1784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(641),
+  [1786] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1720),
+  [1788] = {.entry = {.count = 1, .reusable = true}}, SHIFT(647),
+  [1790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(648),
+  [1792] = {.entry = {.count = 1, .reusable = false}}, SHIFT(643),
+  [1794] = {.entry = {.count = 1, .reusable = true}}, SHIFT(623),
+  [1796] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1048),
+  [1799] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_template_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1046),
+  [1802] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1068),
+  [1805] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_concatenated_template_string_repeat1, 2, 0, 0), SHIFT_REPEAT(1053),
+  [1808] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1644),
+  [1810] = {.entry = {.count = 1, .reusable = true}}, SHIFT(190),
+  [1812] = {.entry = {.count = 1, .reusable = false}}, SHIFT(654),
+  [1814] = {.entry = {.count = 1, .reusable = true}}, SHIFT(655),
+  [1816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(656),
+  [1818] = {.entry = {.count = 1, .reusable = true}}, SHIFT(657),
+  [1820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(658),
+  [1822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(245),
+  [1824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(659),
+  [1826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(654),
+  [1828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1739),
+  [1830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(660),
+  [1832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(661),
+  [1834] = {.entry = {.count = 1, .reusable = false}}, SHIFT(656),
+  [1836] = {.entry = {.count = 1, .reusable = true}}, SHIFT(621),
+  [1838] = {.entry = {.count = 1, .reusable = true}}, SHIFT(374),
+  [1840] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1052),
+  [1842] = {.entry = {.count = 1, .reusable = true}}, SHIFT(850),
+  [1844] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1412),
+  [1846] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_open_sequence_match_pattern, 3, 0, 0),
+  [1848] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_open_sequence_match_pattern, 3, 0, 0),
+  [1850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1577),
+  [1852] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1114),
+  [1854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(851),
+  [1856] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1002),
+  [1858] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1069),
+  [1860] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1069),
+  [1862] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1174),
+  [1864] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1719),
+  [1866] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
+  [1868] = {.entry = {.count = 1, .reusable = false}}, SHIFT(626),
+  [1870] = {.entry = {.count = 1, .reusable = true}}, SHIFT(632),
+  [1872] = {.entry = {.count = 1, .reusable = true}}, SHIFT(633),
+  [1874] = {.entry = {.count = 1, .reusable = true}}, SHIFT(634),
+  [1876] = {.entry = {.count = 1, .reusable = true}}, SHIFT(635),
+  [1878] = {.entry = {.count = 1, .reusable = true}}, SHIFT(244),
+  [1880] = {.entry = {.count = 1, .reusable = true}}, SHIFT(636),
+  [1882] = {.entry = {.count = 1, .reusable = true}}, SHIFT(626),
+  [1884] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1620),
+  [1886] = {.entry = {.count = 1, .reusable = true}}, SHIFT(637),
+  [1888] = {.entry = {.count = 1, .reusable = true}}, SHIFT(638),
+  [1890] = {.entry = {.count = 1, .reusable = false}}, SHIFT(633),
+  [1892] = {.entry = {.count = 1, .reusable = true}}, SHIFT(622),
+  [1894] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_open_sequence_match_pattern, 2, 0, 0),
+  [1896] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_open_sequence_match_pattern, 2, 0, 0),
+  [1898] = {.entry = {.count = 1, .reusable = false}}, SHIFT(344),
+  [1900] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1164),
+  [1902] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1133),
+  [1904] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1120),
+  [1906] = {.entry = {.count = 1, .reusable = true}}, SHIFT(414),
+  [1908] = {.entry = {.count = 1, .reusable = false}}, SHIFT(387),
+  [1910] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1177),
+  [1912] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1166),
+  [1914] = {.entry = {.count = 1, .reusable = true}}, SHIFT(434),
+  [1916] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1152),
+  [1918] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1149),
+  [1920] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1141),
+  [1922] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1105),
   [1924] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43),
-  [1926] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43),
-  [1928] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(650),
-  [1931] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(1702),
-  [1934] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(650),
+  [1926] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(666),
+  [1929] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43),
+  [1931] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(1721),
+  [1934] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(666),
   [1937] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(624),
-  [1940] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comparison_operator, 2, 0, 18),
-  [1942] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_comparison_operator, 2, 0, 18),
-  [1944] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(677),
-  [1947] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(1710),
-  [1950] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(677),
-  [1953] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(625),
-  [1956] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__patterns_repeat1, 2, 0, 37),
-  [1958] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__patterns_repeat1, 2, 0, 37), SHIFT_REPEAT(589),
-  [1961] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(637),
-  [1964] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(1619),
-  [1967] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(637),
-  [1970] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(620),
-  [1973] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__patterns_repeat1, 2, 0, 32),
-  [1975] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(695),
-  [1978] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(1730),
-  [1981] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(695),
-  [1984] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(622),
-  [1987] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1543),
-  [1989] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1132),
-  [1991] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1537),
-  [1993] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1176),
-  [1995] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_pattern, 3, 0, 27),
-  [1997] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1134),
-  [1999] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_pattern, 3, 0, 27),
-  [2001] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_splat_pattern, 2, 0, 35),
-  [2003] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(663),
-  [2006] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(1698),
-  [2009] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(663),
-  [2012] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(621),
-  [2015] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
-  [2017] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_list, 2, 0, 16),
-  [2019] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(696),
-  [2022] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(1672),
-  [2025] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(696),
-  [2028] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(623),
-  [2031] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
-  [2033] = {.entry = {.count = 1, .reusable = true}}, SHIFT(269),
-  [2035] = {.entry = {.count = 1, .reusable = true}}, SHIFT(154),
-  [2037] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155),
-  [2039] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1516),
-  [2041] = {.entry = {.count = 1, .reusable = true}}, SHIFT(465),
-  [2043] = {.entry = {.count = 1, .reusable = false}}, SHIFT(619),
-  [2045] = {.entry = {.count = 1, .reusable = true}}, SHIFT(353),
-  [2047] = {.entry = {.count = 1, .reusable = true}}, SHIFT(639),
-  [2049] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1512),
-  [2051] = {.entry = {.count = 1, .reusable = true}}, SHIFT(293),
-  [2053] = {.entry = {.count = 1, .reusable = true}}, SHIFT(419),
-  [2055] = {.entry = {.count = 1, .reusable = true}}, SHIFT(380),
-  [2057] = {.entry = {.count = 1, .reusable = true}}, SHIFT(373),
-  [2059] = {.entry = {.count = 1, .reusable = true}}, SHIFT(410),
-  [2061] = {.entry = {.count = 1, .reusable = true}}, SHIFT(365),
-  [2063] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1383),
-  [2065] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1550),
-  [2067] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parameters, 2, 0, 0),
-  [2069] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parameters, 3, 0, 0),
+  [1940] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(680),
+  [1943] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(1670),
+  [1946] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(680),
+  [1949] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(620),
+  [1952] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comparison_operator, 2, 0, 18),
+  [1954] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_comparison_operator, 2, 0, 18),
+  [1956] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1544),
+  [1958] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1167),
+  [1960] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1541),
+  [1962] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__patterns_repeat1, 2, 0, 37),
+  [1964] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__patterns_repeat1, 2, 0, 37), SHIFT_REPEAT(615),
+  [1967] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1116),
+  [1969] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1150),
+  [1971] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_pattern, 3, 0, 27),
+  [1973] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(656),
+  [1976] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(1739),
+  [1979] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(656),
+  [1982] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(621),
+  [1985] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__patterns_repeat1, 2, 0, 32),
+  [1987] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_splat_pattern, 2, 0, 35),
+  [1989] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(688),
+  [1992] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(1702),
+  [1995] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(688),
+  [1998] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(625),
+  [2001] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(643),
+  [2004] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(1720),
+  [2007] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(643),
+  [2010] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(623),
+  [2013] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_pattern, 3, 0, 27),
+  [2015] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(633),
+  [2018] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(1620),
+  [2021] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(633),
+  [2024] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_comparison_operator_repeat1, 2, 0, 43), SHIFT_REPEAT(622),
+  [2027] = {.entry = {.count = 1, .reusable = true}}, SHIFT(160),
+  [2029] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_list, 2, 0, 16),
+  [2031] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1498),
+  [2033] = {.entry = {.count = 1, .reusable = true}}, SHIFT(475),
+  [2035] = {.entry = {.count = 1, .reusable = false}}, SHIFT(619),
+  [2037] = {.entry = {.count = 1, .reusable = true}}, SHIFT(404),
+  [2039] = {.entry = {.count = 1, .reusable = true}}, SHIFT(629),
+  [2041] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1487),
+  [2043] = {.entry = {.count = 1, .reusable = true}}, SHIFT(343),
+  [2045] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
+  [2047] = {.entry = {.count = 1, .reusable = true}}, SHIFT(280),
+  [2049] = {.entry = {.count = 1, .reusable = true}}, SHIFT(154),
+  [2051] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155),
+  [2053] = {.entry = {.count = 1, .reusable = true}}, SHIFT(413),
+  [2055] = {.entry = {.count = 1, .reusable = true}}, SHIFT(372),
+  [2057] = {.entry = {.count = 1, .reusable = true}}, SHIFT(433),
+  [2059] = {.entry = {.count = 1, .reusable = true}}, SHIFT(308),
+  [2061] = {.entry = {.count = 1, .reusable = true}}, SHIFT(362),
+  [2063] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1400),
+  [2065] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1599),
+  [2067] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parameters, 3, 0, 0),
+  [2069] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parameters, 2, 0, 0),
   [2071] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_not_operator, 2, 0, 10),
   [2073] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_not_operator, 2, 0, 10),
   [2075] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_value_pattern_repeat1, 2, 0, 0),
-  [2077] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_value_pattern_repeat1, 2, 0, 0), SHIFT_REPEAT(1734),
-  [2080] = {.entry = {.count = 1, .reusable = false}}, SHIFT(184),
-  [2082] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1149),
-  [2084] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1149),
+  [2077] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_value_pattern_repeat1, 2, 0, 0), SHIFT_REPEAT(1684),
+  [2080] = {.entry = {.count = 1, .reusable = false}}, SHIFT(179),
+  [2082] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1170),
+  [2084] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1170),
   [2086] = {.entry = {.count = 1, .reusable = false}}, SHIFT_EXTRA(),
-  [2088] = {.entry = {.count = 1, .reusable = true}}, SHIFT(847),
-  [2090] = {.entry = {.count = 1, .reusable = true}}, SHIFT(180),
-  [2092] = {.entry = {.count = 1, .reusable = true}}, SHIFT(422),
-  [2094] = {.entry = {.count = 1, .reusable = true}}, SHIFT(398),
-  [2096] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1623),
-  [2098] = {.entry = {.count = 1, .reusable = true}}, SHIFT(510),
-  [2100] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 1, 0, 7),
-  [2102] = {.entry = {.count = 1, .reusable = true}}, SHIFT(412),
-  [2104] = {.entry = {.count = 1, .reusable = true}}, SHIFT(413),
-  [2106] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1734),
-  [2108] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_class_name, 1, 0, 0),
-  [2110] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_capture_pattern, 1, 0, 0),
-  [2112] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 1, 0, 0),
-  [2114] = {.entry = {.count = 1, .reusable = true}}, SHIFT(843),
-  [2116] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 2, 0, 21), SHIFT_REPEAT(184),
-  [2119] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 2, 0, 21), SHIFT_REPEAT(1149),
-  [2122] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 2, 0, 21), SHIFT_REPEAT(1149),
-  [2125] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 2, 0, 21),
-  [2127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(852),
-  [2129] = {.entry = {.count = 1, .reusable = true}}, SHIFT(954),
-  [2131] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_with_item, 1, -1, 12), SHIFT(180),
-  [2134] = {.entry = {.count = 1, .reusable = false}}, SHIFT(527),
-  [2136] = {.entry = {.count = 1, .reusable = true}}, SHIFT(403),
-  [2138] = {.entry = {.count = 1, .reusable = true}}, SHIFT(338),
-  [2140] = {.entry = {.count = 1, .reusable = true}}, SHIFT(428),
-  [2142] = {.entry = {.count = 1, .reusable = true}}, SHIFT(792),
-  [2144] = {.entry = {.count = 1, .reusable = true}}, SHIFT(793),
-  [2146] = {.entry = {.count = 1, .reusable = true}}, SHIFT(794),
-  [2148] = {.entry = {.count = 1, .reusable = true}}, SHIFT(795),
-  [2150] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1485),
-  [2152] = {.entry = {.count = 1, .reusable = true}}, SHIFT(834),
-  [2154] = {.entry = {.count = 1, .reusable = true}}, SHIFT(853),
-  [2156] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1509),
-  [2158] = {.entry = {.count = 1, .reusable = true}}, SHIFT(840),
+  [2088] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1409),
+  [2090] = {.entry = {.count = 1, .reusable = true}}, SHIFT(821),
+  [2092] = {.entry = {.count = 1, .reusable = true}}, SHIFT(703),
+  [2094] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1684),
+  [2096] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_class_name, 2, 0, 0),
+  [2098] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_value_pattern, 2, 0, 0),
+  [2100] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 2, 0, 21), SHIFT_REPEAT(179),
+  [2103] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 2, 0, 21), SHIFT_REPEAT(1170),
+  [2106] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 2, 0, 21), SHIFT_REPEAT(1170),
+  [2109] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 2, 0, 21),
+  [2111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1470),
+  [2113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(846),
+  [2115] = {.entry = {.count = 1, .reusable = true}}, SHIFT(862),
+  [2117] = {.entry = {.count = 1, .reusable = true}}, SHIFT(865),
+  [2119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(975),
+  [2121] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_with_item, 1, -1, 12), SHIFT(187),
+  [2124] = {.entry = {.count = 1, .reusable = false}}, SHIFT(521),
+  [2126] = {.entry = {.count = 1, .reusable = true}}, SHIFT(407),
+  [2128] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1698),
+  [2130] = {.entry = {.count = 1, .reusable = true}}, SHIFT(499),
+  [2132] = {.entry = {.count = 1, .reusable = true}}, SHIFT(376),
+  [2134] = {.entry = {.count = 1, .reusable = true}}, SHIFT(377),
+  [2136] = {.entry = {.count = 1, .reusable = true}}, SHIFT(838),
+  [2138] = {.entry = {.count = 1, .reusable = true}}, SHIFT(187),
+  [2140] = {.entry = {.count = 1, .reusable = true}}, SHIFT(424),
+  [2142] = {.entry = {.count = 1, .reusable = true}}, SHIFT(365),
+  [2144] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 1, 0, 7),
+  [2146] = {.entry = {.count = 1, .reusable = true}}, SHIFT(415),
+  [2148] = {.entry = {.count = 1, .reusable = true}}, SHIFT(416),
+  [2150] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_class_name, 1, 0, 0),
+  [2152] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_capture_pattern, 1, 0, 0),
+  [2154] = {.entry = {.count = 1, .reusable = true}}, SHIFT(869),
+  [2156] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 1, 0, 0),
+  [2158] = {.entry = {.count = 1, .reusable = true}}, SHIFT(701),
   [2160] = {.entry = {.count = 1, .reusable = true}}, SHIFT(702),
-  [2162] = {.entry = {.count = 1, .reusable = true}}, SHIFT(846),
-  [2164] = {.entry = {.count = 1, .reusable = true}}, SHIFT(701),
-  [2166] = {.entry = {.count = 1, .reusable = true}}, SHIFT(848),
-  [2168] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pattern_class_name, 2, 0, 0),
-  [2170] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_value_pattern, 2, 0, 0),
-  [2172] = {.entry = {.count = 1, .reusable = true}}, SHIFT(703),
-  [2174] = {.entry = {.count = 1, .reusable = true}}, SHIFT(700),
-  [2176] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_boolean_operator, 3, 0, 40),
-  [2178] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_boolean_operator, 3, 0, 40),
-  [2180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(921),
-  [2182] = {.entry = {.count = 1, .reusable = true}}, SHIFT(358),
-  [2184] = {.entry = {.count = 1, .reusable = true}}, SHIFT(359),
-  [2186] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditional_expression, 5, 0, 0),
-  [2188] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditional_expression, 5, 0, 0),
-  [2190] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_expression, 3, 0, 36),
-  [2192] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_named_expression, 3, 0, 36),
-  [2194] = {.entry = {.count = 1, .reusable = true}}, SHIFT(874),
-  [2196] = {.entry = {.count = 1, .reusable = true}}, SHIFT(225),
-  [2198] = {.entry = {.count = 1, .reusable = true}}, SHIFT(418),
-  [2200] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda, 3, 0, 33),
-  [2202] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_lambda, 3, 0, 33),
-  [2204] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 1, 0, 86),
-  [2206] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1556),
-  [2208] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 2, 0, 110),
-  [2210] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1604),
-  [2212] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_expression, 3, 0, 23),
-  [2214] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda, 4, 0, 67),
-  [2216] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_lambda, 4, 0, 67),
-  [2218] = {.entry = {.count = 1, .reusable = true}}, SHIFT(890),
-  [2220] = {.entry = {.count = 1, .reusable = true}}, SHIFT(709),
-  [2222] = {.entry = {.count = 1, .reusable = true}}, SHIFT(877),
-  [2224] = {.entry = {.count = 1, .reusable = true}}, SHIFT(193),
-  [2226] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_named_expression, 3, 0, 23),
-  [2228] = {.entry = {.count = 1, .reusable = true}}, SHIFT(967),
-  [2230] = {.entry = {.count = 1, .reusable = true}}, SHIFT(216),
-  [2232] = {.entry = {.count = 1, .reusable = true}}, SHIFT(723),
-  [2234] = {.entry = {.count = 1, .reusable = true}}, SHIFT(195),
-  [2236] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__expression_within_for_in_clause, 1, 0, 0),
-  [2238] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_splat, 2, 0, 0),
-  [2240] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2, 0, 0),
-  [2242] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2, 0, 0), SHIFT_REPEAT(356),
-  [2245] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2, 0, 0), SHIFT_REPEAT(1623),
-  [2248] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2, 0, 0), SHIFT_REPEAT(510),
-  [2251] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_or_pattern, 3, 0, 0),
-  [2253] = {.entry = {.count = 1, .reusable = true}}, SHIFT(994),
-  [2255] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_or_pattern_repeat1, 2, 0, 0),
-  [2257] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_or_pattern_repeat1, 2, 0, 0), SHIFT_REPEAT(994),
-  [2260] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
-  [2262] = {.entry = {.count = 1, .reusable = true}}, SHIFT(423),
-  [2264] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__f_expression, 1, 0, 0),
-  [2266] = {.entry = {.count = 1, .reusable = true}}, SHIFT(382),
-  [2268] = {.entry = {.count = 1, .reusable = true}}, SHIFT(383),
-  [2270] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_or_pattern, 4, 0, 0),
-  [2272] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__comprehension_clauses, 1, 0, 0),
-  [2274] = {.entry = {.count = 1, .reusable = true}}, SHIFT(356),
-  [2276] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_yield, 2, 0, 0),
+  [2162] = {.entry = {.count = 1, .reusable = true}}, SHIFT(847),
+  [2164] = {.entry = {.count = 1, .reusable = true}}, SHIFT(852),
+  [2166] = {.entry = {.count = 1, .reusable = true}}, SHIFT(816),
+  [2168] = {.entry = {.count = 1, .reusable = true}}, SHIFT(817),
+  [2170] = {.entry = {.count = 1, .reusable = true}}, SHIFT(700),
+  [2172] = {.entry = {.count = 1, .reusable = true}}, SHIFT(820),
+  [2174] = {.entry = {.count = 1, .reusable = true}}, SHIFT(859),
+  [2176] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 1, 0, 86),
+  [2178] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1547),
+  [2180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(912),
+  [2182] = {.entry = {.count = 1, .reusable = true}}, SHIFT(951),
+  [2184] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
+  [2186] = {.entry = {.count = 1, .reusable = true}}, SHIFT(944),
+  [2188] = {.entry = {.count = 1, .reusable = true}}, SHIFT(237),
+  [2190] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_boolean_operator, 3, 0, 40),
+  [2192] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_boolean_operator, 3, 0, 40),
+  [2194] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_expression, 3, 0, 23),
+  [2196] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_named_expression, 3, 0, 23),
+  [2198] = {.entry = {.count = 1, .reusable = true}}, SHIFT(962),
+  [2200] = {.entry = {.count = 1, .reusable = true}}, SHIFT(214),
+  [2202] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditional_expression, 5, 0, 0),
+  [2204] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditional_expression, 5, 0, 0),
+  [2206] = {.entry = {.count = 1, .reusable = true}}, SHIFT(409),
+  [2208] = {.entry = {.count = 1, .reusable = true}}, SHIFT(410),
+  [2210] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda, 4, 0, 67),
+  [2212] = {.entry = {.count = 1, .reusable = true}}, SHIFT(421),
+  [2214] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda, 3, 0, 33),
+  [2216] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_expression, 3, 0, 36),
+  [2218] = {.entry = {.count = 1, .reusable = true}}, SHIFT(712),
+  [2220] = {.entry = {.count = 1, .reusable = true}}, SHIFT(220),
+  [2222] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_named_expression, 3, 0, 36),
+  [2224] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 2, 0, 110),
+  [2226] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1592),
+  [2228] = {.entry = {.count = 1, .reusable = true}}, SHIFT(938),
+  [2230] = {.entry = {.count = 1, .reusable = true}}, SHIFT(730),
+  [2232] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_lambda, 4, 0, 67),
+  [2234] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_lambda, 3, 0, 33),
+  [2236] = {.entry = {.count = 1, .reusable = true}}, SHIFT(184),
+  [2238] = {.entry = {.count = 1, .reusable = true}}, SHIFT(425),
+  [2240] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__f_expression, 1, 0, 0),
+  [2242] = {.entry = {.count = 1, .reusable = true}}, SHIFT(345),
+  [2244] = {.entry = {.count = 1, .reusable = true}}, SHIFT(438),
+  [2246] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__expression_within_for_in_clause, 1, 0, 0),
+  [2248] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_or_pattern_repeat1, 2, 0, 0),
+  [2250] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_or_pattern_repeat1, 2, 0, 0), SHIFT_REPEAT(994),
+  [2253] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_yield, 2, 0, 0),
+  [2255] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__comprehension_clauses, 1, 0, 0),
+  [2257] = {.entry = {.count = 1, .reusable = true}}, SHIFT(428),
+  [2259] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2, 0, 0),
+  [2261] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2, 0, 0), SHIFT_REPEAT(428),
+  [2264] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2, 0, 0), SHIFT_REPEAT(1698),
+  [2267] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__comprehension_clauses_repeat1, 2, 0, 0), SHIFT_REPEAT(499),
+  [2270] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_or_pattern, 3, 0, 0),
+  [2272] = {.entry = {.count = 1, .reusable = true}}, SHIFT(994),
+  [2274] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_splat, 2, 0, 0),
+  [2276] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_or_pattern, 4, 0, 0),
   [2278] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__comprehension_clauses, 2, 0, 0),
-  [2280] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 3, 0, 0),
-  [2282] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 9, 0, 140),
-  [2284] = {.entry = {.count = 1, .reusable = true}}, SHIFT(433),
-  [2286] = {.entry = {.count = 1, .reusable = true}}, SHIFT(339),
-  [2288] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_for_in_clause_repeat1, 2, 0, 0),
-  [2290] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_for_in_clause_repeat1, 2, 0, 0), SHIFT_REPEAT(307),
-  [2293] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 4, 0, 140),
-  [2295] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_or_pattern, 1, 0, 0),
-  [2297] = {.entry = {.count = 1, .reusable = true}}, SHIFT(995),
-  [2299] = {.entry = {.count = 1, .reusable = true}}, SHIFT(432),
-  [2301] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_content_repeat1, 2, 0, 0),
-  [2303] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_string_content_repeat1, 2, 0, 0), SHIFT_REPEAT(1119),
-  [2306] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_content_repeat1, 2, 0, 0), SHIFT_REPEAT(1119),
-  [2309] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_content_repeat1, 2, 0, 0),
-  [2311] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, 0, 32),
-  [2313] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 6, 0, 145),
-  [2315] = {.entry = {.count = 1, .reusable = true}}, SHIFT(202),
-  [2317] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 3, 0, 0),
-  [2319] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_splat, 2, 0, 14),
-  [2321] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 4, 0, 153),
-  [2323] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 3, 0, 136),
-  [2325] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 5, 0, 0),
-  [2327] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 5, 0, 0),
-  [2329] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_group_pattern, 3, 0, 135),
-  [2331] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 4, 0, 0),
-  [2333] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 4, 0, 101),
-  [2335] = {.entry = {.count = 1, .reusable = true}}, SHIFT(228),
-  [2337] = {.entry = {.count = 1, .reusable = true}}, SHIFT(364),
-  [2339] = {.entry = {.count = 1, .reusable = true}}, SHIFT(197),
-  [2341] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 2, 0, 0),
-  [2343] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 5, 0, 140),
-  [2345] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 6, 0, 0),
-  [2347] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 6, 0, 140),
-  [2349] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 2, 0, 0),
-  [2351] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 4, 0, 0),
-  [2353] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1749),
-  [2355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1745),
-  [2357] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1723),
-  [2359] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 7, 0, 0),
-  [2361] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_content, 1, 0, 0),
-  [2363] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1119),
-  [2365] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1119),
-  [2367] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string_content, 1, 0, 0),
-  [2369] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 7, 0, 140),
-  [2371] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 8, 0, 140),
-  [2373] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 3, 0, 140),
-  [2375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(992),
-  [2377] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_clause, 2, 0, 0),
-  [2379] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1740),
-  [2381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1699),
-  [2383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1659),
-  [2385] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 5, 0, 127),
-  [2387] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
-  [2389] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 5, 0, 126),
-  [2391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(214),
-  [2393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(173),
-  [2395] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 2, 0, 0),
-  [2397] = {.entry = {.count = 1, .reusable = true}}, SHIFT(417),
-  [2399] = {.entry = {.count = 1, .reusable = true}}, SHIFT(405),
-  [2401] = {.entry = {.count = 1, .reusable = true}}, SHIFT(420),
-  [2403] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
-  [2405] = {.entry = {.count = 1, .reusable = true}}, SHIFT(376),
-  [2407] = {.entry = {.count = 1, .reusable = true}}, SHIFT(377),
-  [2409] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda_within_for_in_clause, 3, 0, 33),
-  [2411] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__collection_elements_repeat1, 2, 0, 32),
-  [2413] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1245),
-  [2415] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1381),
-  [2417] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1571),
-  [2419] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__right_hand_side, 1, 0, 0),
-  [2421] = {.entry = {.count = 1, .reusable = true}}, SHIFT(277),
-  [2423] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1632),
-  [2425] = {.entry = {.count = 1, .reusable = true}}, SHIFT(259),
-  [2427] = {.entry = {.count = 1, .reusable = true}}, SHIFT(958),
-  [2429] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1342),
-  [2431] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1344),
-  [2433] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_statement, 1, 0, 0),
-  [2435] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_item, 1, -1, 12),
-  [2437] = {.entry = {.count = 1, .reusable = true}}, SHIFT(527),
-  [2439] = {.entry = {.count = 1, .reusable = true}}, SHIFT(348),
-  [2441] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
-  [2443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(257),
-  [2445] = {.entry = {.count = 1, .reusable = true}}, SHIFT(901),
-  [2447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(270),
-  [2449] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1693),
-  [2451] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_yield, 3, 0, 0),
-  [2453] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1254),
-  [2455] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1744),
-  [2457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1679),
-  [2459] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda_within_for_in_clause, 4, 0, 67),
-  [2461] = {.entry = {.count = 1, .reusable = true}}, SHIFT(261),
-  [2463] = {.entry = {.count = 1, .reusable = true}}, SHIFT(927),
-  [2465] = {.entry = {.count = 1, .reusable = true}}, SHIFT(435),
-  [2467] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
-  [2469] = {.entry = {.count = 1, .reusable = true}}, SHIFT(436),
-  [2471] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
-  [2473] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1251),
-  [2475] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1343),
-  [2477] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1638),
-  [2479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(301),
-  [2481] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 2, 0, 10),
-  [2483] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pair, 3, 0, 63),
-  [2485] = {.entry = {.count = 1, .reusable = true}}, SHIFT(352),
-  [2487] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exec_statement, 4, 0, 15),
-  [2489] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 1, 0, 0),
-  [2491] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_return_statement, 2, 0, 0),
-  [2493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(263),
-  [2495] = {.entry = {.count = 1, .reusable = true}}, SHIFT(713),
-  [2497] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_delete_statement, 2, 0, 11),
-  [2499] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_pattern, 1, 0, 0),
-  [2501] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1662),
-  [2503] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assert_statement, 2, 0, 0),
-  [2505] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_value_pattern_repeat1, 2, 0, 0), SHIFT_REPEAT(1641),
-  [2508] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_list, 2, 0, 16),
-  [2510] = {.entry = {.count = 1, .reusable = true}}, SHIFT(172),
-  [2512] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, 0, 98),
-  [2514] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
-  [2516] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1641),
-  [2518] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dotted_name, 1, 0, 0),
-  [2520] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__index_expression, 1, 0, 0),
-  [2522] = {.entry = {.count = 1, .reusable = true}}, SHIFT(279),
-  [2524] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_chevron, 2, 0, 0),
-  [2526] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 1, 0, 3),
-  [2528] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 1, 0, 3),
-  [2530] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, 0, 37),
-  [2532] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, 0, 37), SHIFT_REPEAT(256),
-  [2535] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
-  [2537] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 1, 0, 4),
-  [2539] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 1, 0, 4),
-  [2541] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
-  [2543] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 1, 0, 6),
-  [2545] = {.entry = {.count = 1, .reusable = true}}, SHIFT(344),
-  [2547] = {.entry = {.count = 1, .reusable = true}}, SHIFT(294),
-  [2549] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_assert_statement_repeat1, 2, 0, 0),
-  [2551] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dotted_name, 2, 0, 0),
-  [2553] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_decorated_definition_repeat1, 2, 0, 0),
-  [2555] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decorated_definition_repeat1, 2, 0, 0), SHIFT_REPEAT(386),
-  [2558] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 4, 0, 44),
-  [2560] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 4, 0, 44),
-  [2562] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 5, 0, 44),
-  [2564] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 5, 0, 44),
-  [2566] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_default_parameter, 3, 0, 36),
-  [2568] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 2, 0, 69),
-  [2570] = {.entry = {.count = 1, .reusable = true}}, SHIFT(310),
-  [2572] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
-  [2574] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_exception_list_repeat1, 2, 0, 32),
-  [2576] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typed_default_parameter, 5, 0, 122),
-  [2578] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__type_bound, 2, 0, 112),
-  [2580] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1251),
-  [2582] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, 0, 37), SHIFT_REPEAT(254),
-  [2585] = {.entry = {.count = 1, .reusable = true}}, SHIFT(185),
-  [2587] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
-  [2589] = {.entry = {.count = 1, .reusable = true}}, SHIFT(187),
-  [2591] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 6, 0, 44),
-  [2593] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 6, 0, 44),
-  [2595] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1340),
-  [2597] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1324),
-  [2599] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_print_statement_repeat1, 2, 0, 10),
-  [2601] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112),
-  [2603] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_open_sequence_match_pattern_repeat1, 2, 0, 0),
-  [2605] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_open_sequence_match_pattern_repeat1, 2, 0, 0), SHIFT_REPEAT(981),
-  [2608] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 3, 0, 44),
-  [2610] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 3, 0, 44),
-  [2612] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_as_pattern, 3, 0, 139),
-  [2614] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 4, 0, 123),
-  [2616] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias_statement, 4, 0, 64),
-  [2618] = {.entry = {.count = 1, .reusable = true}}, SHIFT(190),
-  [2620] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
-  [2622] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1234),
-  [2624] = {.entry = {.count = 1, .reusable = true}}, SHIFT(211),
-  [2626] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_specifier, 1, 0, 0),
-  [2628] = {.entry = {.count = 1, .reusable = true}}, SHIFT(189),
-  [2630] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1315),
-  [2632] = {.entry = {.count = 1, .reusable = true}}, SHIFT(203),
-  [2634] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1431),
-  [2636] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1356),
-  [2638] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1287),
-  [2640] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1502),
-  [2642] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1302),
-  [2644] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1617),
-  [2646] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 1, 0, 6),
-  [2648] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias_statement, 5, 0, 91),
-  [2650] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1281),
-  [2652] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1330),
-  [2654] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1435),
-  [2656] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keyword_argument, 3, 0, 23),
-  [2658] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keyword_argument, 3, 0, 36),
-  [2660] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, 0, 37), SHIFT_REPEAT(255),
-  [2663] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 3, 0, 24),
-  [2665] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 2, 0, 6),
-  [2667] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, 0, 97),
-  [2669] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_format_specifier_repeat1, 2, 0, 0),
-  [2671] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_specifier_repeat1, 2, 0, 0), SHIFT_REPEAT(189),
-  [2674] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_specifier_repeat1, 2, 0, 0), SHIFT_REPEAT(1305),
-  [2677] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1341),
-  [2679] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 2, 0, 16),
-  [2681] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
-  [2683] = {.entry = {.count = 1, .reusable = true}}, SHIFT(177),
-  [2685] = {.entry = {.count = 1, .reusable = true}}, SHIFT(176),
-  [2687] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__collection_elements_repeat1, 2, 0, 37),
-  [2689] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__collection_elements_repeat1, 2, 0, 37), SHIFT_REPEAT(250),
-  [2692] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_star_pattern, 2, 0, 11),
-  [2694] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 4, 0, 54),
-  [2696] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
-  [2698] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_specifier, 2, 0, 0),
-  [2700] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1305),
-  [2702] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__type_param_default, 2, 0, 113),
-  [2704] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 5, 0, 144),
-  [2706] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 3, 0, 31),
-  [2708] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 4, 0, 124),
-  [2710] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, 0, 32),
-  [2712] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__simple_statements_repeat1, 2, 0, 0), SHIFT_REPEAT(133),
-  [2715] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__simple_statements_repeat1, 2, 0, 0),
-  [2717] = {.entry = {.count = 1, .reusable = true}}, SHIFT(300),
-  [2719] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 2, 0, 0),
-  [2721] = {.entry = {.count = 1, .reusable = true}}, SHIFT(869),
-  [2723] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_guard, 2, 0, 137),
-  [2725] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1391),
+  [2280] = {.entry = {.count = 1, .reusable = true}}, SHIFT(402),
+  [2282] = {.entry = {.count = 1, .reusable = true}}, SHIFT(408),
+  [2284] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 3, 0, 0),
+  [2286] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 3, 0, 0),
+  [2288] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_or_pattern, 1, 0, 0),
+  [2290] = {.entry = {.count = 1, .reusable = true}}, SHIFT(995),
+  [2292] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 2, 0, 0),
+  [2294] = {.entry = {.count = 1, .reusable = true}}, SHIFT(393),
+  [2296] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 4, 0, 0),
+  [2298] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_for_in_clause_repeat1, 2, 0, 0),
+  [2300] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_for_in_clause_repeat1, 2, 0, 0), SHIFT_REPEAT(293),
+  [2303] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 3, 0, 136),
+  [2305] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1753),
+  [2307] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1749),
+  [2309] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1727),
+  [2311] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dictionary_splat, 2, 0, 14),
+  [2313] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1282),
+  [2315] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1678),
+  [2317] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1461),
+  [2319] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1741),
+  [2321] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, 0, 32),
+  [2323] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_group_pattern, 3, 0, 135),
+  [2325] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 2, 0, 0),
+  [2327] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_literal_pattern, 4, 0, 153),
+  [2329] = {.entry = {.count = 1, .reusable = true}}, SHIFT(357),
+  [2331] = {.entry = {.count = 1, .reusable = true}}, SHIFT(203),
+  [2333] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 2, 0, 0),
+  [2335] = {.entry = {.count = 1, .reusable = true}}, SHIFT(172),
+  [2337] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_content_repeat1, 2, 0, 0),
+  [2339] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_string_content_repeat1, 2, 0, 0), SHIFT_REPEAT(1143),
+  [2342] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_content_repeat1, 2, 0, 0), SHIFT_REPEAT(1143),
+  [2345] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_content_repeat1, 2, 0, 0),
+  [2347] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 4, 0, 140),
+  [2349] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 6, 0, 145),
+  [2351] = {.entry = {.count = 1, .reusable = true}}, SHIFT(197),
+  [2353] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 6, 0, 0),
+  [2355] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 6, 0, 140),
+  [2357] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 4, 0, 0),
+  [2359] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 5, 0, 127),
+  [2361] = {.entry = {.count = 1, .reusable = true}}, SHIFT(206),
+  [2363] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 5, 0, 140),
+  [2365] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 7, 0, 0),
+  [2367] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 7, 0, 140),
+  [2369] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 8, 0, 140),
+  [2371] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 9, 0, 140),
+  [2373] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if_clause, 2, 0, 0),
+  [2375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1526),
+  [2377] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_sequence_pattern, 5, 0, 0),
+  [2379] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_class_pattern, 3, 0, 140),
+  [2381] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_mapping_pattern, 5, 0, 0),
+  [2383] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_content, 1, 0, 0),
+  [2385] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1143),
+  [2387] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1143),
+  [2389] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string_content, 1, 0, 0),
+  [2391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1665),
+  [2393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1625),
+  [2395] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1729),
+  [2397] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 5, 0, 126),
+  [2399] = {.entry = {.count = 1, .reusable = true}}, SHIFT(202),
+  [2401] = {.entry = {.count = 1, .reusable = true}}, SHIFT(992),
+  [2403] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_in_clause, 4, 0, 101),
+  [2405] = {.entry = {.count = 1, .reusable = true}}, SHIFT(213),
+  [2407] = {.entry = {.count = 1, .reusable = true}}, SHIFT(356),
+  [2409] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exec_statement, 4, 0, 15),
+  [2411] = {.entry = {.count = 1, .reusable = true}}, SHIFT(263),
+  [2413] = {.entry = {.count = 1, .reusable = true}}, SHIFT(908),
+  [2415] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda_within_for_in_clause, 4, 0, 67),
+  [2417] = {.entry = {.count = 1, .reusable = true}}, SHIFT(269),
+  [2419] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1681),
+  [2421] = {.entry = {.count = 1, .reusable = true}}, SHIFT(339),
+  [2423] = {.entry = {.count = 1, .reusable = true}}, SHIFT(340),
+  [2425] = {.entry = {.count = 1, .reusable = true}}, SHIFT(423),
+  [2427] = {.entry = {.count = 1, .reusable = true}}, SHIFT(392),
+  [2429] = {.entry = {.count = 1, .reusable = true}}, SHIFT(389),
+  [2431] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
+  [2433] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_pattern, 1, 0, 0),
+  [2435] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1672),
+  [2437] = {.entry = {.count = 1, .reusable = true}}, SHIFT(257),
+  [2439] = {.entry = {.count = 1, .reusable = true}}, SHIFT(713),
+  [2441] = {.entry = {.count = 1, .reusable = true}}, SHIFT(281),
+  [2443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1636),
+  [2445] = {.entry = {.count = 1, .reusable = true}}, SHIFT(289),
+  [2447] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 2, 0, 10),
+  [2449] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_yield, 3, 0, 0),
+  [2451] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 1, 0, 0),
+  [2453] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assert_statement, 2, 0, 0),
+  [2455] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1256),
+  [2457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1384),
+  [2459] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1654),
+  [2461] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__right_hand_side, 1, 0, 0),
+  [2463] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_return_statement, 2, 0, 0),
+  [2465] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_delete_statement, 2, 0, 11),
+  [2467] = {.entry = {.count = 1, .reusable = true}}, SHIFT(351),
+  [2469] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
+  [2471] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1246),
+  [2473] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1364),
+  [2475] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1552),
+  [2477] = {.entry = {.count = 1, .reusable = true}}, SHIFT(254),
+  [2479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(979),
+  [2481] = {.entry = {.count = 1, .reusable = true}}, SHIFT(261),
+  [2483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(928),
+  [2485] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__collection_elements_repeat1, 2, 0, 32),
+  [2487] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_item, 1, -1, 12),
+  [2489] = {.entry = {.count = 1, .reusable = true}}, SHIFT(521),
+  [2491] = {.entry = {.count = 1, .reusable = true}}, SHIFT(435),
+  [2493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100),
+  [2495] = {.entry = {.count = 1, .reusable = true}}, SHIFT(436),
+  [2497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(110),
+  [2499] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1370),
+  [2501] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1373),
+  [2503] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_statement, 1, 0, 0),
+  [2505] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda_within_for_in_clause, 3, 0, 33),
+  [2507] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pair, 3, 0, 63),
+  [2509] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 6, 0, 44),
+  [2511] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 6, 0, 44),
+  [2513] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 5, 0, 44),
+  [2515] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 5, 0, 44),
+  [2517] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1660),
+  [2519] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dotted_name, 1, 0, 0),
+  [2521] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__index_expression, 1, 0, 0),
+  [2523] = {.entry = {.count = 1, .reusable = true}}, SHIFT(266),
+  [2525] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_decorated_definition_repeat1, 2, 0, 0),
+  [2527] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decorated_definition_repeat1, 2, 0, 0), SHIFT_REPEAT(353),
+  [2530] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 2, 0, 69),
+  [2532] = {.entry = {.count = 1, .reusable = true}}, SHIFT(295),
+  [2534] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 3, 0, 44),
+  [2536] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 3, 0, 44),
+  [2538] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_value_pattern_repeat1, 2, 0, 0), SHIFT_REPEAT(1660),
+  [2541] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_dotted_name, 2, 0, 0),
+  [2543] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
+  [2545] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__type_bound, 2, 0, 112),
+  [2547] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typed_default_parameter, 5, 0, 122),
+  [2549] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interpolation, 4, 0, 44),
+  [2551] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpolation, 4, 0, 44),
+  [2553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1332),
+  [2555] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_default_parameter, 3, 0, 36),
+  [2557] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1380),
+  [2559] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
+  [2561] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, 0, 98),
+  [2563] = {.entry = {.count = 1, .reusable = true}}, SHIFT(305),
+  [2565] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, 0, 37),
+  [2567] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, 0, 37), SHIFT_REPEAT(255),
+  [2570] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_print_statement_repeat1, 2, 0, 10),
+  [2572] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_assert_statement_repeat1, 2, 0, 0),
+  [2574] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
+  [2576] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_chevron, 2, 0, 0),
+  [2578] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_list, 2, 0, 16),
+  [2580] = {.entry = {.count = 1, .reusable = true}}, SHIFT(173),
+  [2582] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_exception_list_repeat1, 2, 0, 32),
+  [2584] = {.entry = {.count = 1, .reusable = true}}, SHIFT(185),
+  [2586] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
+  [2588] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
+  [2590] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 1, 0, 3),
+  [2592] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 1, 0, 3),
+  [2594] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_as_pattern, 3, 0, 139),
+  [2596] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_open_sequence_match_pattern_repeat1, 2, 0, 0),
+  [2598] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_open_sequence_match_pattern_repeat1, 2, 0, 0), SHIFT_REPEAT(931),
+  [2601] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 1, 0, 4),
+  [2603] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 1, 0, 4),
+  [2605] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, 0, 37), SHIFT_REPEAT(256),
+  [2608] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 1, 0, 6),
+  [2610] = {.entry = {.count = 1, .reusable = true}}, SHIFT(358),
+  [2612] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
+  [2614] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1256),
+  [2616] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
+  [2618] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__collection_elements, 2, 0, 16),
+  [2620] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
+  [2622] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1490),
+  [2624] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1337),
+  [2626] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1317),
+  [2628] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1410),
+  [2630] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_specifier, 2, 0, 0),
+  [2632] = {.entry = {.count = 1, .reusable = true}}, SHIFT(189),
+  [2634] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1305),
+  [2636] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__type_param_default, 2, 0, 113),
+  [2638] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 4, 0, 54),
+  [2640] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 2, 0, 6),
+  [2642] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1250),
+  [2644] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1360),
+  [2646] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1422),
+  [2648] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1369),
+  [2650] = {.entry = {.count = 1, .reusable = true}}, SHIFT(177),
+  [2652] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
+  [2654] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1193),
+  [2656] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias_statement, 4, 0, 64),
+  [2658] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1292),
+  [2660] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1669),
+  [2662] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 1, 0, 6),
+  [2664] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_list_repeat1, 2, 0, 37), SHIFT_REPEAT(264),
+  [2667] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 3, 0, 24),
+  [2669] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias_statement, 5, 0, 91),
+  [2671] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__collection_elements_repeat1, 2, 0, 37),
+  [2673] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__collection_elements_repeat1, 2, 0, 37), SHIFT_REPEAT(251),
+  [2676] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_raise_statement, 3, 0, 31),
+  [2678] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_format_specifier_repeat1, 2, 0, 0),
+  [2680] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_specifier_repeat1, 2, 0, 0), SHIFT_REPEAT(189),
+  [2683] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_specifier_repeat1, 2, 0, 0), SHIFT_REPEAT(1305),
+  [2686] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keyword_argument, 3, 0, 23),
+  [2688] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keyword_argument, 3, 0, 36),
+  [2690] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, 0, 32),
+  [2692] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
+  [2694] = {.entry = {.count = 1, .reusable = true}}, SHIFT(182),
+  [2696] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 4, 0, 123),
+  [2698] = {.entry = {.count = 1, .reusable = true}}, SHIFT(183),
+  [2700] = {.entry = {.count = 1, .reusable = true}}, SHIFT(223),
+  [2702] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 4, 0, 124),
+  [2704] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_specifier, 1, 0, 0),
+  [2706] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1288),
+  [2708] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 5, 0, 144),
+  [2710] = {.entry = {.count = 1, .reusable = true}}, SHIFT(200),
+  [2712] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_slice, 3, 0, 97),
+  [2714] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_star_pattern, 2, 0, 11),
+  [2716] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, 0, 25),
+  [2718] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_global_statement_repeat1, 2, 0, 0), SHIFT_REPEAT(1706),
+  [2721] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_global_statement_repeat1, 2, 0, 0),
+  [2723] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
+  [2725] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1611),
   [2727] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
-  [2729] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, 0, 25),
-  [2731] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1259),
-  [2733] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1492),
-  [2735] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
-  [2737] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_global_statement_repeat1, 2, 0, 0), SHIFT_REPEAT(1696),
-  [2740] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_global_statement_repeat1, 2, 0, 0),
-  [2742] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typed_parameter, 3, 0, 66),
-  [2744] = {.entry = {.count = 1, .reusable = true}}, SHIFT(361),
-  [2746] = {.entry = {.count = 1, .reusable = true}}, SHIFT(870),
-  [2748] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1300),
-  [2750] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 2, 0, 24),
-  [2752] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1304),
-  [2754] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, 0, 45), SHIFT_REPEAT(1503),
-  [2757] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, 0, 45),
-  [2759] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_import_prefix, 1, 0, 0),
-  [2761] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1352),
-  [2763] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_list_splat, 3, 0, 0),
-  [2765] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
-  [2767] = {.entry = {.count = 1, .reusable = true}}, SHIFT(318),
-  [2769] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
-  [2771] = {.entry = {.count = 1, .reusable = true}}, SHIFT(328),
-  [2773] = {.entry = {.count = 1, .reusable = true}}, SHIFT(342),
-  [2775] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_exception_list_repeat1, 2, 0, 37), SHIFT_REPEAT(417),
-  [2778] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_exception_list_repeat1, 2, 0, 37),
-  [2780] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_list_splat, 3, 0, 50),
-  [2782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
-  [2784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131),
-  [2786] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_import_prefix_repeat1, 2, 0, 0),
-  [2788] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_import_prefix_repeat1, 2, 0, 0), SHIFT_REPEAT(1352),
-  [2791] = {.entry = {.count = 1, .reusable = true}}, SHIFT(368),
-  [2793] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 1, 0, 7),
-  [2795] = {.entry = {.count = 1, .reusable = true}}, SHIFT(466),
-  [2797] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1463),
-  [2799] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1527),
-  [2801] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
-  [2803] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 2, 0, 16),
-  [2805] = {.entry = {.count = 1, .reusable = true}}, SHIFT(471),
-  [2807] = {.entry = {.count = 1, .reusable = true}}, SHIFT(379),
-  [2809] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1384),
-  [2811] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1616),
-  [2813] = {.entry = {.count = 1, .reusable = true}}, SHIFT(118),
-  [2815] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exception_list, 2, 0, 16),
-  [2817] = {.entry = {.count = 1, .reusable = true}}, SHIFT(357),
-  [2819] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1696),
-  [2821] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_nonlocal_statement, 2, 0, 0),
-  [2823] = {.entry = {.count = 1, .reusable = true}}, SHIFT(385),
-  [2825] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_print_statement_repeat1, 2, 0, 53), SHIFT_REPEAT(393),
-  [2828] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_print_statement_repeat1, 2, 0, 53),
-  [2830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
-  [2832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
-  [2834] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_assert_statement_repeat1, 2, 0, 0), SHIFT_REPEAT(352),
-  [2837] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevartuple_parameter, 2, 0, 25),
-  [2839] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
-  [2841] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
-  [2843] = {.entry = {.count = 1, .reusable = true}}, SHIFT(119),
-  [2845] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_paramspec_parameter, 2, 0, 25),
-  [2847] = {.entry = {.count = 1, .reusable = true}}, SHIFT(291),
-  [2849] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3, 0, 30),
-  [2851] = {.entry = {.count = 1, .reusable = true}}, SHIFT(841),
-  [2853] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameter, 1, 0, 0),
-  [2855] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
-  [2857] = {.entry = {.count = 1, .reusable = true}}, SHIFT(434),
-  [2859] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
-  [2861] = {.entry = {.count = 1, .reusable = true}}, SHIFT(415),
-  [2863] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_global_statement, 3, 0, 0),
-  [2865] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 2, 0, 87),
-  [2867] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assert_statement, 3, 0, 0),
-  [2869] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorator, 3, 0, 0),
-  [2871] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_global_statement, 2, 0, 0),
-  [2873] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_nonlocal_statement, 3, 0, 0),
-  [2875] = {.entry = {.count = 1, .reusable = true}}, SHIFT(402),
-  [2877] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1028),
-  [2879] = {.entry = {.count = 1, .reusable = true}}, SHIFT(132),
-  [2881] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_with_clause_repeat1, 2, 0, 0),
-  [2883] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_with_clause_repeat1, 2, 0, 0), SHIFT_REPEAT(336),
-  [2886] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exec_statement, 5, 0, 15),
-  [2888] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130),
-  [2890] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1582),
-  [2892] = {.entry = {.count = 1, .reusable = true}}, SHIFT(296),
-  [2894] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3, 0, 29),
-  [2896] = {.entry = {.count = 1, .reusable = true}}, SHIFT(248),
-  [2898] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1032),
-  [2900] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parameters, 1, 0, 0),
-  [2902] = {.entry = {.count = 1, .reusable = true}}, SHIFT(429),
-  [2904] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
-  [2906] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_maybe_star_pattern, 1, 0, 0),
-  [2908] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_patterns, 1, 0, 0),
-  [2910] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1200),
-  [2912] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1417),
-  [2914] = {.entry = {.count = 1, .reusable = true}}, SHIFT(400),
-  [2916] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exec_statement, 2, 0, 15),
-  [2918] = {.entry = {.count = 1, .reusable = true}}, SHIFT(904),
-  [2920] = {.entry = {.count = 1, .reusable = true}}, SHIFT(204),
-  [2922] = {.entry = {.count = 1, .reusable = true}}, SHIFT(905),
-  [2924] = {.entry = {.count = 1, .reusable = true}}, SHIFT(205),
-  [2926] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1337),
-  [2928] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1338),
-  [2930] = {.entry = {.count = 1, .reusable = true}}, SHIFT(404),
-  [2932] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_parameters, 3, 0, 89),
-  [2934] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1510),
-  [2936] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1633),
-  [2938] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1150),
-  [2940] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1426),
-  [2942] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1006),
-  [2944] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1419),
-  [2946] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1151),
-  [2948] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat1, 2, 0, 0),
-  [2950] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat1, 2, 0, 0), SHIFT_REPEAT(991),
-  [2953] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1433),
-  [2955] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, 0, 37),
-  [2957] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, 0, 37), SHIFT_REPEAT(246),
-  [2960] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1111),
-  [2962] = {.entry = {.count = 1, .reusable = true}}, SHIFT(909),
-  [2964] = {.entry = {.count = 1, .reusable = true}}, SHIFT(206),
-  [2966] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156),
-  [2968] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 3, 0, 38),
-  [2970] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__parameters_repeat1, 2, 0, 0),
-  [2972] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, 0, 45), SHIFT_REPEAT(1465),
-  [2975] = {.entry = {.count = 1, .reusable = true}}, SHIFT(910),
-  [2977] = {.entry = {.count = 1, .reusable = true}}, SHIFT(207),
-  [2979] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aliased_import, 3, 0, 46),
-  [2981] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_index_expression_list_repeat1, 2, 0, 37), SHIFT_REPEAT(252),
-  [2984] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_index_expression_list_repeat1, 2, 0, 37),
-  [2986] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat2, 2, 0, 0),
-  [2988] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat2, 2, 0, 0), SHIFT_REPEAT(1593),
-  [2991] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1031),
-  [2993] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_dictionary_repeat1, 2, 0, 37), SHIFT_REPEAT(265),
-  [2996] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_dictionary_repeat1, 2, 0, 37),
-  [2998] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
-  [3000] = {.entry = {.count = 1, .reusable = true}}, SHIFT(928),
-  [3002] = {.entry = {.count = 1, .reusable = true}}, SHIFT(262),
-  [3004] = {.entry = {.count = 1, .reusable = true}}, SHIFT(966),
-  [3006] = {.entry = {.count = 1, .reusable = true}}, SHIFT(968),
-  [3008] = {.entry = {.count = 1, .reusable = true}}, SHIFT(217),
-  [3010] = {.entry = {.count = 1, .reusable = true}}, SHIFT(243),
-  [3012] = {.entry = {.count = 1, .reusable = true}}, SHIFT(969),
-  [3014] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1349),
-  [3016] = {.entry = {.count = 1, .reusable = true}}, SHIFT(972),
-  [3018] = {.entry = {.count = 1, .reusable = true}}, SHIFT(218),
-  [3020] = {.entry = {.count = 1, .reusable = true}}, SHIFT(973),
-  [3022] = {.entry = {.count = 1, .reusable = true}}, SHIFT(219),
-  [3024] = {.entry = {.count = 1, .reusable = true}}, SHIFT(975),
-  [3026] = {.entry = {.count = 1, .reusable = true}}, SHIFT(220),
-  [3028] = {.entry = {.count = 1, .reusable = true}}, SHIFT(976),
-  [3030] = {.entry = {.count = 1, .reusable = true}}, SHIFT(221),
-  [3032] = {.entry = {.count = 1, .reusable = true}}, SHIFT(245),
-  [3034] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_index_expression_list, 2, 0, 16),
-  [3036] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_relative_import, 1, 0, 0),
-  [3038] = {.entry = {.count = 1, .reusable = true}}, SHIFT(258),
-  [3040] = {.entry = {.count = 1, .reusable = true}}, SHIFT(946),
-  [3042] = {.entry = {.count = 1, .reusable = true}}, SHIFT(875),
-  [3044] = {.entry = {.count = 1, .reusable = true}}, SHIFT(226),
-  [3046] = {.entry = {.count = 1, .reusable = true}}, SHIFT(876),
-  [3048] = {.entry = {.count = 1, .reusable = true}}, SHIFT(240),
-  [3050] = {.entry = {.count = 1, .reusable = true}}, SHIFT(881),
-  [3052] = {.entry = {.count = 1, .reusable = true}}, SHIFT(227),
-  [3054] = {.entry = {.count = 1, .reusable = true}}, SHIFT(882),
-  [3056] = {.entry = {.count = 1, .reusable = true}}, SHIFT(191),
-  [3058] = {.entry = {.count = 1, .reusable = true}}, SHIFT(336),
-  [3060] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 2, 0, 0),
-  [3062] = {.entry = {.count = 1, .reusable = true}}, SHIFT(884),
-  [3064] = {.entry = {.count = 1, .reusable = true}}, SHIFT(229),
-  [3066] = {.entry = {.count = 1, .reusable = true}}, SHIFT(885),
-  [3068] = {.entry = {.count = 1, .reusable = true}}, SHIFT(230),
-  [3070] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_mapping_pattern_repeat1, 2, 0, 0), SHIFT_REPEAT(1029),
-  [3073] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_mapping_pattern_repeat1, 2, 0, 0),
-  [3075] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 1, 0, 0),
-  [3077] = {.entry = {.count = 1, .reusable = true}}, SHIFT(264),
-  [3079] = {.entry = {.count = 1, .reusable = true}}, SHIFT(721),
-  [3081] = {.entry = {.count = 1, .reusable = true}}, SHIFT(934),
-  [3083] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1034),
-  [3085] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1033),
-  [3087] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1706),
-  [3089] = {.entry = {.count = 1, .reusable = true}}, SHIFT(309),
-  [3091] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__parameters_repeat1, 2, 0, 0), SHIFT_REPEAT(1036),
-  [3094] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1114),
-  [3096] = {.entry = {.count = 1, .reusable = true}}, SHIFT(982),
-  [3098] = {.entry = {.count = 1, .reusable = true}}, SHIFT(935),
-  [3100] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1110),
-  [3102] = {.entry = {.count = 1, .reusable = true}}, SHIFT(929),
-  [3104] = {.entry = {.count = 1, .reusable = true}}, SHIFT(194),
-  [3106] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
-  [3108] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1260),
-  [3110] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1505),
-  [3112] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
-  [3114] = {.entry = {.count = 1, .reusable = true}}, SHIFT(724),
-  [3116] = {.entry = {.count = 1, .reusable = true}}, SHIFT(196),
-  [3118] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1010),
-  [3120] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1124),
-  [3122] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_format_specifier_repeat1, 1, 0, 74),
-  [3124] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_format_specifier_repeat1, 1, 0, 74),
-  [3126] = {.entry = {.count = 1, .reusable = true}}, SHIFT(983),
-  [3128] = {.entry = {.count = 1, .reusable = true}}, SHIFT(313),
-  [3130] = {.entry = {.count = 1, .reusable = true}}, SHIFT(299),
-  [3132] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1439),
-  [3134] = {.entry = {.count = 1, .reusable = true}}, SHIFT(273),
-  [3136] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_parameters, 4, 0, 115),
-  [3138] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_type_parameters_repeat1, 2, 0, 116), SHIFT_REPEAT(1200),
-  [3141] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_parameters_repeat1, 2, 0, 116),
-  [3143] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_positional_separator, 1, 0, 0),
-  [3145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(289),
-  [3147] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1263),
-  [3149] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1312),
-  [3151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(249),
-  [3153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(503),
-  [3155] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__parameters_repeat1, 2, 0, 0), SHIFT_REPEAT(1035),
-  [3158] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99),
-  [3160] = {.entry = {.count = 1, .reusable = true}}, SHIFT(727),
-  [3162] = {.entry = {.count = 1, .reusable = true}}, SHIFT(198),
-  [3164] = {.entry = {.count = 1, .reusable = true}}, SHIFT(728),
-  [3166] = {.entry = {.count = 1, .reusable = true}}, SHIFT(199),
-  [3168] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_item, 3, -1, 59),
-  [3170] = {.entry = {.count = 1, .reusable = true}}, SHIFT(730),
-  [3172] = {.entry = {.count = 1, .reusable = true}}, SHIFT(200),
-  [3174] = {.entry = {.count = 1, .reusable = true}}, SHIFT(731),
-  [3176] = {.entry = {.count = 1, .reusable = true}}, SHIFT(201),
-  [3178] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1508),
-  [3180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(931),
-  [3182] = {.entry = {.count = 1, .reusable = true}}, SHIFT(253),
-  [3184] = {.entry = {.count = 1, .reusable = true}}, SHIFT(251),
-  [3186] = {.entry = {.count = 1, .reusable = true}}, SHIFT(302),
-  [3188] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_keyword_pattern, 3, 0, 164),
-  [3190] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_index_expression_list_repeat1, 2, 0, 32),
-  [3192] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 3, 0, 0),
-  [3194] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1263),
-  [3196] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
-  [3198] = {.entry = {.count = 1, .reusable = true}}, SHIFT(285),
-  [3200] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, 0, 68),
-  [3202] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
-  [3204] = {.entry = {.count = 1, .reusable = true}}, SHIFT(286),
-  [3206] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
-  [3208] = {.entry = {.count = 1, .reusable = true}}, SHIFT(287),
-  [3210] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
-  [3212] = {.entry = {.count = 1, .reusable = true}}, SHIFT(288),
-  [3214] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
-  [3216] = {.entry = {.count = 1, .reusable = true}}, SHIFT(284),
-  [3218] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_key_value_pattern, 3, 0, 63),
-  [3220] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 2, 0, 0),
-  [3222] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_statement, 2, 0, 5),
-  [3224] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1731),
-  [3226] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1707),
-  [3228] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1128),
-  [3230] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1128),
-  [3232] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 5, 0, 75),
-  [3234] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
-  [3236] = {.entry = {.count = 1, .reusable = true}}, SHIFT(271),
-  [3238] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 5, 0, 76),
-  [3240] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevartuple_parameter, 3, 0, 111),
-  [3242] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_paramspec_parameter, 3, 0, 111),
-  [3244] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_future_import_statement, 4, 0, 47),
-  [3246] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_dictionary_repeat1, 2, 0, 32),
-  [3248] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1627),
-  [3250] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1140),
-  [3252] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 2, 0, 88),
-  [3254] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_wildcard_import, 1, 0, 0),
-  [3256] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 3, 0, 114),
-  [3258] = {.entry = {.count = 1, .reusable = true}}, SHIFT(121),
-  [3260] = {.entry = {.count = 1, .reusable = true}}, SHIFT(274),
-  [3262] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_parameters_repeat1, 2, 0, 89),
-  [3264] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 4, 0, 48),
-  [3266] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 4, 0, 49),
-  [3268] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pass_statement, 1, 0, 0),
-  [3270] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_future_import_statement, 6, 0, 99),
-  [3272] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 6, 0, 100),
-  [3274] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 3, 0, 39),
-  [3276] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1079),
-  [3278] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1079),
-  [3280] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_break_statement, 1, 0, 0),
-  [3282] = {.entry = {.count = 1, .reusable = true}}, SHIFT(861),
-  [3284] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_statement, 3, 0, 22),
-  [3286] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1133),
-  [3288] = {.entry = {.count = 1, .reusable = true}}, SHIFT(939),
-  [3290] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_continue_statement, 1, 0, 0),
-  [3292] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1127),
-  [3294] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1127),
-  [3296] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 7, 0, 125),
-  [3298] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_augmented_assignment, 3, 0, 40),
-  [3300] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_double_star_pattern, 2, 0, 11),
+  [2729] = {.entry = {.count = 1, .reusable = true}}, SHIFT(314),
+  [2731] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
+  [2733] = {.entry = {.count = 1, .reusable = true}}, SHIFT(132),
+  [2735] = {.entry = {.count = 1, .reusable = true}}, SHIFT(832),
+  [2737] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1029),
+  [2739] = {.entry = {.count = 1, .reusable = true}}, SHIFT(388),
+  [2741] = {.entry = {.count = 1, .reusable = true}}, SHIFT(301),
+  [2743] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 2, 0, 0),
+  [2745] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
+  [2747] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1535),
+  [2749] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1466),
+  [2751] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevartuple_parameter, 2, 0, 25),
+  [2753] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_paramspec_parameter, 2, 0, 25),
+  [2755] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 2, 0, 87),
+  [2757] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1706),
+  [2759] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_global_statement, 2, 0, 0),
+  [2761] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_nonlocal_statement, 2, 0, 0),
+  [2763] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__simple_statements_repeat1, 2, 0, 0), SHIFT_REPEAT(133),
+  [2766] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__simple_statements_repeat1, 2, 0, 0),
+  [2768] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exec_statement, 5, 0, 15),
+  [2770] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1368),
+  [2772] = {.entry = {.count = 1, .reusable = true}}, SHIFT(385),
+  [2774] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
+  [2776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
+  [2778] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 1, 0, 7),
+  [2780] = {.entry = {.count = 1, .reusable = true}}, SHIFT(476),
+  [2782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99),
+  [2784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1258),
+  [2786] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1419),
+  [2788] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exception_list, 2, 0, 16),
+  [2790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130),
+  [2792] = {.entry = {.count = 1, .reusable = true}}, SHIFT(315),
+  [2794] = {.entry = {.count = 1, .reusable = true}}, SHIFT(294),
+  [2796] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3, 0, 29),
+  [2798] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131),
+  [2800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(429),
+  [2802] = {.entry = {.count = 1, .reusable = true}}, SHIFT(310),
+  [2804] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_print_statement, 3, 0, 30),
+  [2806] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorator, 3, 0, 0),
+  [2808] = {.entry = {.count = 1, .reusable = true}}, SHIFT(810),
+  [2810] = {.entry = {.count = 1, .reusable = true}}, SHIFT(342),
+  [2812] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_list_splat, 3, 0, 0),
+  [2814] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_list_splat, 3, 0, 50),
+  [2816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(347),
+  [2818] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
+  [2820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
+  [2822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(813),
+  [2824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
+  [2826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(118),
+  [2828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(121),
+  [2830] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_import_prefix, 1, 0, 0),
+  [2832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1392),
+  [2834] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_print_statement_repeat1, 2, 0, 53), SHIFT_REPEAT(420),
+  [2837] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_print_statement_repeat1, 2, 0, 53),
+  [2839] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_assert_statement_repeat1, 2, 0, 0), SHIFT_REPEAT(356),
+  [2842] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typed_parameter, 3, 0, 66),
+  [2844] = {.entry = {.count = 1, .reusable = true}}, SHIFT(364),
+  [2846] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1299),
+  [2848] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__import_list, 2, 0, 24),
+  [2850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1320),
+  [2852] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1330),
+  [2854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1742),
+  [2856] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
+  [2858] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_import_prefix_repeat1, 2, 0, 0),
+  [2860] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_import_prefix_repeat1, 2, 0, 0), SHIFT_REPEAT(1392),
+  [2863] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_exception_list_repeat1, 2, 0, 37), SHIFT_REPEAT(392),
+  [2866] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_exception_list_repeat1, 2, 0, 37),
+  [2868] = {.entry = {.count = 1, .reusable = true}}, SHIFT(418),
+  [2870] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_global_statement, 3, 0, 0),
+  [2872] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_guard, 2, 0, 137),
+  [2874] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_with_clause_repeat1, 2, 0, 0),
+  [2876] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_with_clause_repeat1, 2, 0, 0), SHIFT_REPEAT(311),
+  [2879] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_nonlocal_statement, 3, 0, 0),
+  [2881] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameter, 1, 0, 0),
+  [2883] = {.entry = {.count = 1, .reusable = true}}, SHIFT(282),
+  [2885] = {.entry = {.count = 1, .reusable = true}}, SHIFT(381),
+  [2887] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assert_statement, 3, 0, 0),
+  [2889] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__patterns, 2, 0, 16),
+  [2891] = {.entry = {.count = 1, .reusable = true}}, SHIFT(478),
+  [2893] = {.entry = {.count = 1, .reusable = true}}, SHIFT(354),
+  [2895] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, 0, 45), SHIFT_REPEAT(1458),
+  [2898] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, 0, 45),
+  [2900] = {.entry = {.count = 1, .reusable = true}}, SHIFT(982),
+  [2902] = {.entry = {.count = 1, .reusable = true}}, SHIFT(216),
+  [2904] = {.entry = {.count = 1, .reusable = true}}, SHIFT(250),
+  [2906] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1254),
+  [2908] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1323),
+  [2910] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1696),
+  [2912] = {.entry = {.count = 1, .reusable = true}}, SHIFT(239),
+  [2914] = {.entry = {.count = 1, .reusable = true}}, SHIFT(502),
+  [2916] = {.entry = {.count = 1, .reusable = true}}, SHIFT(247),
+  [2918] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_relative_import, 1, 0, 0),
+  [2920] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat2, 2, 0, 0),
+  [2922] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat2, 2, 0, 0), SHIFT_REPEAT(1567),
+  [2925] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1245),
+  [2927] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1351),
+  [2929] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_format_specifier_repeat1, 1, 0, 74),
+  [2931] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_format_specifier_repeat1, 1, 0, 74),
+  [2933] = {.entry = {.count = 1, .reusable = true}}, SHIFT(398),
+  [2935] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
+  [2937] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_maybe_star_pattern, 1, 0, 0),
+  [2939] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__match_patterns, 1, 0, 0),
+  [2941] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1352),
+  [2943] = {.entry = {.count = 1, .reusable = true}}, SHIFT(916),
+  [2945] = {.entry = {.count = 1, .reusable = true}}, SHIFT(204),
+  [2947] = {.entry = {.count = 1, .reusable = true}}, SHIFT(259),
+  [2949] = {.entry = {.count = 1, .reusable = true}}, SHIFT(732),
+  [2951] = {.entry = {.count = 1, .reusable = true}}, SHIFT(258),
+  [2953] = {.entry = {.count = 1, .reusable = true}}, SHIFT(959),
+  [2955] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__parameters_repeat1, 2, 0, 0),
+  [2957] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__parameters_repeat1, 2, 0, 0), SHIFT_REPEAT(1035),
+  [2960] = {.entry = {.count = 1, .reusable = true}}, SHIFT(963),
+  [2962] = {.entry = {.count = 1, .reusable = true}}, SHIFT(215),
+  [2964] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_parameters, 3, 0, 89),
+  [2966] = {.entry = {.count = 1, .reusable = true}}, SHIFT(964),
+  [2968] = {.entry = {.count = 1, .reusable = true}}, SHIFT(716),
+  [2970] = {.entry = {.count = 1, .reusable = true}}, SHIFT(193),
+  [2972] = {.entry = {.count = 1, .reusable = true}}, SHIFT(861),
+  [2974] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1111),
+  [2976] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aliased_import, 3, 0, 46),
+  [2978] = {.entry = {.count = 1, .reusable = true}}, SHIFT(983),
+  [2980] = {.entry = {.count = 1, .reusable = true}}, SHIFT(217),
+  [2982] = {.entry = {.count = 1, .reusable = true}}, SHIFT(986),
+  [2984] = {.entry = {.count = 1, .reusable = true}}, SHIFT(218),
+  [2986] = {.entry = {.count = 1, .reusable = true}}, SHIFT(958),
+  [2988] = {.entry = {.count = 1, .reusable = true}}, SHIFT(219),
+  [2990] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1003),
+  [2992] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1113),
+  [2994] = {.entry = {.count = 1, .reusable = true}}, SHIFT(718),
+  [2996] = {.entry = {.count = 1, .reusable = true}}, SHIFT(194),
+  [2998] = {.entry = {.count = 1, .reusable = true}}, SHIFT(918),
+  [3000] = {.entry = {.count = 1, .reusable = true}}, SHIFT(205),
+  [3002] = {.entry = {.count = 1, .reusable = true}}, SHIFT(738),
+  [3004] = {.entry = {.count = 1, .reusable = true}}, SHIFT(195),
+  [3006] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1155),
+  [3008] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1474),
+  [3010] = {.entry = {.count = 1, .reusable = true}}, SHIFT(262),
+  [3012] = {.entry = {.count = 1, .reusable = true}}, SHIFT(948),
+  [3014] = {.entry = {.count = 1, .reusable = true}}, SHIFT(721),
+  [3016] = {.entry = {.count = 1, .reusable = true}}, SHIFT(196),
+  [3018] = {.entry = {.count = 1, .reusable = true}}, SHIFT(952),
+  [3020] = {.entry = {.count = 1, .reusable = true}}, SHIFT(225),
+  [3022] = {.entry = {.count = 1, .reusable = true}}, SHIFT(953),
+  [3024] = {.entry = {.count = 1, .reusable = true}}, SHIFT(881),
+  [3026] = {.entry = {.count = 1, .reusable = true}}, SHIFT(226),
+  [3028] = {.entry = {.count = 1, .reusable = true}}, SHIFT(882),
+  [3030] = {.entry = {.count = 1, .reusable = true}}, SHIFT(227),
+  [3032] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_parameters, 4, 0, 89),
+  [3034] = {.entry = {.count = 1, .reusable = true}}, SHIFT(884),
+  [3036] = {.entry = {.count = 1, .reusable = true}}, SHIFT(228),
+  [3038] = {.entry = {.count = 1, .reusable = true}}, SHIFT(885),
+  [3040] = {.entry = {.count = 1, .reusable = true}}, SHIFT(229),
+  [3042] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_parameters, 4, 0, 115),
+  [3044] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_type_parameters_repeat1, 2, 0, 116), SHIFT_REPEAT(1241),
+  [3047] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_parameters_repeat1, 2, 0, 116),
+  [3049] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1427),
+  [3051] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1031),
+  [3053] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1162),
+  [3055] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1464),
+  [3057] = {.entry = {.count = 1, .reusable = true}}, SHIFT(292),
+  [3059] = {.entry = {.count = 1, .reusable = true}}, SHIFT(299),
+  [3061] = {.entry = {.count = 1, .reusable = true}}, SHIFT(311),
+  [3063] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 1, 0, 0),
+  [3065] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1156),
+  [3067] = {.entry = {.count = 1, .reusable = true}}, SHIFT(366),
+  [3069] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_exec_statement, 2, 0, 15),
+  [3071] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1033),
+  [3073] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1478),
+  [3075] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1157),
+  [3077] = {.entry = {.count = 1, .reusable = true}}, SHIFT(922),
+  [3079] = {.entry = {.count = 1, .reusable = true}}, SHIFT(208),
+  [3081] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
+  [3083] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102),
+  [3085] = {.entry = {.count = 1, .reusable = true}}, SHIFT(936),
+  [3087] = {.entry = {.count = 1, .reusable = true}}, SHIFT(209),
+  [3089] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1694),
+  [3091] = {.entry = {.count = 1, .reusable = true}}, SHIFT(309),
+  [3093] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_positional_separator, 1, 0, 0),
+  [3095] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156),
+  [3097] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 3, 0, 38),
+  [3099] = {.entry = {.count = 1, .reusable = true}}, SHIFT(367),
+  [3101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1129),
+  [3103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1435),
+  [3105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1413),
+  [3107] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_mapping_pattern_repeat1, 2, 0, 0), SHIFT_REPEAT(1023),
+  [3110] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_mapping_pattern_repeat1, 2, 0, 0),
+  [3112] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
+  [3114] = {.entry = {.count = 1, .reusable = true}}, SHIFT(926),
+  [3116] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parameters, 1, 0, 0),
+  [3118] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1034),
+  [3120] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__import_list_repeat1, 2, 0, 45), SHIFT_REPEAT(1408),
+  [3123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1374),
+  [3125] = {.entry = {.count = 1, .reusable = true}}, SHIFT(848),
+  [3127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(849),
+  [3129] = {.entry = {.count = 1, .reusable = true}}, SHIFT(298),
+  [3131] = {.entry = {.count = 1, .reusable = true}}, SHIFT(733),
+  [3133] = {.entry = {.count = 1, .reusable = true}}, SHIFT(191),
+  [3135] = {.entry = {.count = 1, .reusable = true}}, SHIFT(240),
+  [3137] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_index_expression_list, 2, 0, 16),
+  [3139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1000),
+  [3141] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 2, 0, 0),
+  [3143] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, 0, 37),
+  [3145] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, 0, 37), SHIFT_REPEAT(243),
+  [3148] = {.entry = {.count = 1, .reusable = true}}, SHIFT(319),
+  [3150] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_item, 3, -1, 59),
+  [3152] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1032),
+  [3154] = {.entry = {.count = 1, .reusable = true}}, SHIFT(267),
+  [3156] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1450),
+  [3158] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1144),
+  [3160] = {.entry = {.count = 1, .reusable = true}}, SHIFT(932),
+  [3162] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1484),
+  [3164] = {.entry = {.count = 1, .reusable = true}}, SHIFT(947),
+  [3166] = {.entry = {.count = 1, .reusable = true}}, SHIFT(232),
+  [3168] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_parameters, 5, 0, 115),
+  [3170] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_index_expression_list_repeat1, 2, 0, 37), SHIFT_REPEAT(249),
+  [3173] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_index_expression_list_repeat1, 2, 0, 37),
+  [3175] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat1, 2, 0, 0),
+  [3177] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_match_class_pattern_repeat1, 2, 0, 0), SHIFT_REPEAT(991),
+  [3180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
+  [3182] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__parameters_repeat1, 2, 0, 0), SHIFT_REPEAT(1036),
+  [3185] = {.entry = {.count = 1, .reusable = true}}, SHIFT(242),
+  [3187] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_dictionary_repeat1, 2, 0, 37), SHIFT_REPEAT(273),
+  [3190] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_dictionary_repeat1, 2, 0, 37),
+  [3192] = {.entry = {.count = 1, .reusable = true}}, SHIFT(252),
+  [3194] = {.entry = {.count = 1, .reusable = true}}, SHIFT(253),
+  [3196] = {.entry = {.count = 1, .reusable = true}}, SHIFT(935),
+  [3198] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_break_statement, 1, 0, 0),
+  [3200] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1254),
+  [3202] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_argument_list_repeat1, 2, 0, 68),
+  [3204] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1699),
+  [3206] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 2, 0, 88),
+  [3208] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1125),
+  [3210] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1125),
+  [3212] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 5, 0, 76),
+  [3214] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_future_import_statement, 4, 0, 47),
+  [3216] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_wildcard_import, 1, 0, 0),
+  [3218] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_keyword_pattern, 3, 0, 164),
+  [3220] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 4, 0, 48),
+  [3222] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevartuple_parameter, 3, 0, 111),
+  [3224] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_paramspec_parameter, 3, 0, 111),
+  [3226] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typevar_parameter, 3, 0, 114),
+  [3228] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_index_expression_list_repeat1, 2, 0, 32),
+  [3230] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_parameters_repeat1, 2, 0, 89),
+  [3232] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 4, 0, 49),
+  [3234] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_future_import_statement, 6, 0, 99),
+  [3236] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 6, 0, 100),
+  [3238] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_statement, 2, 0, 5),
+  [3240] = {.entry = {.count = 1, .reusable = true}}, SHIFT(834),
+  [3242] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_statement, 3, 0, 22),
+  [3244] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
+  [3246] = {.entry = {.count = 1, .reusable = true}}, SHIFT(286),
+  [3248] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
+  [3250] = {.entry = {.count = 1, .reusable = true}}, SHIFT(287),
+  [3252] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
+  [3254] = {.entry = {.count = 1, .reusable = true}}, SHIFT(288),
+  [3256] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
+  [3258] = {.entry = {.count = 1, .reusable = true}}, SHIFT(272),
+  [3260] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1086),
+  [3262] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1086),
+  [3264] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1682),
+  [3266] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_continue_statement, 1, 0, 0),
+  [3268] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 7, 0, 125),
+  [3270] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 3, 0, 0),
+  [3272] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
+  [3274] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
+  [3276] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
+  [3278] = {.entry = {.count = 1, .reusable = true}}, SHIFT(283),
+  [3280] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
+  [3282] = {.entry = {.count = 1, .reusable = true}}, SHIFT(275),
+  [3284] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
+  [3286] = {.entry = {.count = 1, .reusable = true}}, SHIFT(278),
+  [3288] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1134),
+  [3290] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1134),
+  [3292] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_double_star_pattern, 2, 0, 11),
+  [3294] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 3, 0, 39),
+  [3296] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_augmented_assignment, 3, 0, 40),
+  [3298] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_from_statement, 5, 0, 75),
+  [3300] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 2, 0, 0),
   [3302] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 5, 0, 95),
-  [3304] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_positional_pattern, 1, 0, 0),
-  [3306] = {.entry = {.count = 1, .reusable = true}}, SHIFT(109),
-  [3308] = {.entry = {.count = 1, .reusable = true}}, SHIFT(280),
-  [3310] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
-  [3312] = {.entry = {.count = 1, .reusable = true}}, SHIFT(722),
-  [3314] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1542),
-  [3316] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1442),
-  [3318] = {.entry = {.count = 1, .reusable = true}}, SHIFT(716),
-  [3320] = {.entry = {.count = 1, .reusable = true}}, SHIFT(648),
-  [3322] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1180),
-  [3324] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1275),
-  [3326] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
-  [3328] = {.entry = {.count = 1, .reusable = true}}, SHIFT(495),
-  [3330] = {.entry = {.count = 1, .reusable = true}}, SHIFT(714),
-  [3332] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1605),
-  [3334] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
-  [3336] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1148),
-  [3338] = {.entry = {.count = 1, .reusable = true}}, SHIFT(900),
-  [3340] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100),
-  [3342] = {.entry = {.count = 1, .reusable = true}}, SHIFT(492),
+  [3304] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pass_statement, 1, 0, 0),
+  [3306] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1132),
+  [3308] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_positional_pattern, 1, 0, 0),
+  [3310] = {.entry = {.count = 1, .reusable = true}}, SHIFT(860),
+  [3312] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1716),
+  [3314] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1148),
+  [3316] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_dictionary_repeat1, 2, 0, 32),
+  [3318] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_match_key_value_pattern, 3, 0, 63),
+  [3320] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
+  [3322] = {.entry = {.count = 1, .reusable = true}}, SHIFT(704),
+  [3324] = {.entry = {.count = 1, .reusable = true}}, SHIFT(639),
+  [3326] = {.entry = {.count = 1, .reusable = true}}, SHIFT(939),
+  [3328] = {.entry = {.count = 1, .reusable = true}}, SHIFT(940),
+  [3330] = {.entry = {.count = 1, .reusable = true}}, SHIFT(921),
+  [3332] = {.entry = {.count = 1, .reusable = true}}, SHIFT(119),
+  [3334] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1340),
+  [3336] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
+  [3338] = {.entry = {.count = 1, .reusable = true}}, SHIFT(942),
+  [3340] = {.entry = {.count = 1, .reusable = true}}, SHIFT(726),
+  [3342] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
   [3344] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
-  [3346] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
-  [3348] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
-  [3350] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
-  [3352] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1306),
-  [3354] = {.entry = {.count = 1, .reusable = true}}, SHIFT(430),
-  [3356] = {.entry = {.count = 1, .reusable = true}}, SHIFT(930),
-  [3358] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1293),
-  [3360] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
-  [3362] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
-  [3364] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
-  [3366] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
-  [3368] = {.entry = {.count = 1, .reusable = true}}, SHIFT(110),
-  [3370] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
-  [3372] = {.entry = {.count = 1, .reusable = true}}, SHIFT(987),
-  [3374] = {.entry = {.count = 1, .reusable = true}}, SHIFT(993),
-  [3376] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1366),
-  [3378] = {.entry = {.count = 1, .reusable = true}}, SHIFT(955),
-  [3380] = {.entry = {.count = 1, .reusable = true}}, SHIFT(891),
-  [3382] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1517),
-  [3384] = {.entry = {.count = 1, .reusable = true}}, SHIFT(711),
-  [3386] = {.entry = {.count = 1, .reusable = true}}, SHIFT(894),
-  [3388] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1285),
-  [3390] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
-  [3392] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1282),
-  [3394] = {.entry = {.count = 1, .reusable = true}}, SHIFT(125),
-  [3396] = {.entry = {.count = 1, .reusable = true}}, SHIFT(899),
-  [3398] = {.entry = {.count = 1, .reusable = true}}, SHIFT(926),
-  [3400] = {.entry = {.count = 1, .reusable = true}}, SHIFT(902),
-  [3402] = {.entry = {.count = 1, .reusable = true}}, SHIFT(378),
-  [3404] = {.entry = {.count = 1, .reusable = true}}, SHIFT(906),
-  [3406] = {.entry = {.count = 1, .reusable = true}}, SHIFT(956),
-  [3408] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1584),
-  [3410] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1585),
-  [3412] = {.entry = {.count = 1, .reusable = true}}, SHIFT(658),
-  [3414] = {.entry = {.count = 1, .reusable = true}}, SHIFT(933),
-  [3416] = {.entry = {.count = 1, .reusable = true}}, SHIFT(937),
-  [3418] = {.entry = {.count = 1, .reusable = true}}, SHIFT(938),
-  [3420] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1379),
-  [3422] = {.entry = {.count = 1, .reusable = true}}, SHIFT(944),
-  [3424] = {.entry = {.count = 1, .reusable = true}}, SHIFT(317),
-  [3426] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1536),
-  [3428] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
-  [3430] = {.entry = {.count = 1, .reusable = true}}, SHIFT(948),
-  [3432] = {.entry = {.count = 1, .reusable = true}}, SHIFT(957),
-  [3434] = {.entry = {.count = 1, .reusable = true}}, SHIFT(710),
-  [3436] = {.entry = {.count = 1, .reusable = true}}, SHIFT(990),
-  [3438] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda_parameters, 1, 0, 0),
-  [3440] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1009),
-  [3442] = {.entry = {.count = 1, .reusable = true}}, SHIFT(360),
-  [3444] = {.entry = {.count = 1, .reusable = true}}, SHIFT(932),
-  [3446] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
-  [3448] = {.entry = {.count = 1, .reusable = true}}, SHIFT(718),
-  [3450] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1425),
-  [3452] = {.entry = {.count = 1, .reusable = true}}, SHIFT(414),
-  [3454] = {.entry = {.count = 1, .reusable = true}}, SHIFT(670),
-  [3456] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1403),
-  [3458] = {.entry = {.count = 1, .reusable = true}}, SHIFT(951),
-  [3460] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102),
-  [3462] = {.entry = {.count = 1, .reusable = true}}, SHIFT(669),
-  [3464] = {.entry = {.count = 1, .reusable = true}}, SHIFT(959),
-  [3466] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 4, 0, 0),
-  [3468] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1396),
-  [3470] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 3, 0, 0),
-  [3472] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
-  [3474] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_relative_import, 2, 0, 25),
-  [3476] = {.entry = {.count = 1, .reusable = true}}, SHIFT(686),
-  [3478] = {.entry = {.count = 1, .reusable = true}}, SHIFT(961),
-  [3480] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1185),
-  [3482] = {.entry = {.count = 1, .reusable = true}}, SHIFT(962),
-  [3484] = {.entry = {.count = 1, .reusable = true}}, SHIFT(738),
-  [3486] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
-  [3488] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120),
-  [3490] = {.entry = {.count = 1, .reusable = true}}, SHIFT(963),
-  [3492] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
-  [3494] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
-  [3496] = {.entry = {.count = 1, .reusable = true}}, SHIFT(922),
-  [3498] = {.entry = {.count = 1, .reusable = true}}, SHIFT(947),
-  [3500] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1314),
-  [3502] = {.entry = {.count = 1, .reusable = true}}, SHIFT(965),
-  [3504] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1375),
-  [3506] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 5, 0, 0),
-  [3508] = {.entry = {.count = 1, .reusable = true}}, SHIFT(936),
-  [3510] = {.entry = {.count = 1, .reusable = true}}, SHIFT(943),
-  [3512] = {.entry = {.count = 1, .reusable = true}}, SHIFT(384),
-  [3514] = {.entry = {.count = 1, .reusable = true}}, SHIFT(651),
-  [3516] = {.entry = {.count = 1, .reusable = true}}, SHIFT(381),
-  [3518] = {.entry = {.count = 1, .reusable = true}}, SHIFT(712),
-  [3520] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1053),
-  [3522] = {.entry = {.count = 1, .reusable = true}}, SHIFT(952),
-  [3524] = {.entry = {.count = 1, .reusable = true}}, SHIFT(341),
-  [3526] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1012),
-  [3528] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1392),
-  [3530] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1374),
-  [3532] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1397),
-  [3534] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1398),
-  [3536] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
-  [3538] = {.entry = {.count = 1, .reusable = true}}, SHIFT(308),
-  [3540] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1334),
-  [3542] = {.entry = {.count = 1, .reusable = true}}, SHIFT(717),
+  [3346] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1216),
+  [3348] = {.entry = {.count = 1, .reusable = true}}, SHIFT(946),
+  [3350] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1342),
+  [3352] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
+  [3354] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
+  [3356] = {.entry = {.count = 1, .reusable = true}}, SHIFT(941),
+  [3358] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
+  [3360] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
+  [3362] = {.entry = {.count = 1, .reusable = true}}, SHIFT(923),
+  [3364] = {.entry = {.count = 1, .reusable = true}}, SHIFT(943),
+  [3366] = {.entry = {.count = 1, .reusable = true}}, SHIFT(950),
+  [3368] = {.entry = {.count = 1, .reusable = true}}, SHIFT(504),
+  [3370] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
+  [3372] = {.entry = {.count = 1, .reusable = true}}, SHIFT(993),
+  [3374] = {.entry = {.count = 1, .reusable = true}}, SHIFT(109),
+  [3376] = {.entry = {.count = 1, .reusable = true}}, SHIFT(729),
+  [3378] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1343),
+  [3380] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112),
+  [3382] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
+  [3384] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
+  [3386] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1294),
+  [3388] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1583),
+  [3390] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
+  [3392] = {.entry = {.count = 1, .reusable = true}}, SHIFT(327),
+  [3394] = {.entry = {.count = 1, .reusable = true}}, SHIFT(302),
+  [3396] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1290),
+  [3398] = {.entry = {.count = 1, .reusable = true}}, SHIFT(925),
+  [3400] = {.entry = {.count = 1, .reusable = true}}, SHIFT(892),
+  [3402] = {.entry = {.count = 1, .reusable = true}}, SHIFT(710),
+  [3404] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1229),
+  [3406] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1015),
+  [3408] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1439),
+  [3410] = {.entry = {.count = 1, .reusable = true}}, SHIFT(662),
+  [3412] = {.entry = {.count = 1, .reusable = true}}, SHIFT(913),
+  [3414] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1278),
+  [3416] = {.entry = {.count = 1, .reusable = true}}, SHIFT(125),
+  [3418] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_relative_import, 2, 0, 25),
+  [3420] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1338),
+  [3422] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 4, 0, 0),
+  [3424] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
+  [3426] = {.entry = {.count = 1, .reusable = true}}, SHIFT(383),
+  [3428] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1055),
+  [3430] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda_parameters, 1, 0, 0),
+  [3432] = {.entry = {.count = 1, .reusable = true}}, SHIFT(709),
+  [3434] = {.entry = {.count = 1, .reusable = true}}, SHIFT(955),
+  [3436] = {.entry = {.count = 1, .reusable = true}}, SHIFT(722),
+  [3438] = {.entry = {.count = 1, .reusable = true}}, SHIFT(706),
+  [3440] = {.entry = {.count = 1, .reusable = true}}, SHIFT(927),
+  [3442] = {.entry = {.count = 1, .reusable = true}}, SHIFT(725),
+  [3444] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
+  [3446] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 3, 0, 0),
+  [3448] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1446),
+  [3450] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1581),
+  [3452] = {.entry = {.count = 1, .reusable = true}}, SHIFT(500),
+  [3454] = {.entry = {.count = 1, .reusable = true}}, SHIFT(929),
+  [3456] = {.entry = {.count = 1, .reusable = true}}, SHIFT(417),
+  [3458] = {.entry = {.count = 1, .reusable = true}}, SHIFT(695),
+  [3460] = {.entry = {.count = 1, .reusable = true}}, SHIFT(976),
+  [3462] = {.entry = {.count = 1, .reusable = true}}, SHIFT(341),
+  [3464] = {.entry = {.count = 1, .reusable = true}}, SHIFT(933),
+  [3466] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1513),
+  [3468] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
+  [3470] = {.entry = {.count = 1, .reusable = true}}, SHIFT(897),
+  [3472] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
+  [3474] = {.entry = {.count = 1, .reusable = true}}, SHIFT(977),
+  [3476] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_clause, 5, 0, 0),
+  [3478] = {.entry = {.count = 1, .reusable = true}}, SHIFT(978),
+  [3480] = {.entry = {.count = 1, .reusable = true}}, SHIFT(894),
+  [3482] = {.entry = {.count = 1, .reusable = true}}, SHIFT(980),
+  [3484] = {.entry = {.count = 1, .reusable = true}}, SHIFT(412),
+  [3486] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1154),
+  [3488] = {.entry = {.count = 1, .reusable = true}}, SHIFT(379),
+  [3490] = {.entry = {.count = 1, .reusable = true}}, SHIFT(346),
+  [3492] = {.entry = {.count = 1, .reusable = true}}, SHIFT(956),
+  [3494] = {.entry = {.count = 1, .reusable = true}}, SHIFT(649),
+  [3496] = {.entry = {.count = 1, .reusable = true}}, SHIFT(672),
+  [3498] = {.entry = {.count = 1, .reusable = true}}, SHIFT(369),
+  [3500] = {.entry = {.count = 1, .reusable = true}}, SHIFT(965),
+  [3502] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
+  [3504] = {.entry = {.count = 1, .reusable = true}}, SHIFT(969),
+  [3506] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1309),
+  [3508] = {.entry = {.count = 1, .reusable = true}}, SHIFT(970),
+  [3510] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1295),
+  [3512] = {.entry = {.count = 1, .reusable = true}}, SHIFT(957),
+  [3514] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1565),
+  [3516] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1566),
+  [3518] = {.entry = {.count = 1, .reusable = true}}, SHIFT(937),
+  [3520] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1005),
+  [3522] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
+  [3524] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1333),
+  [3526] = {.entry = {.count = 1, .reusable = true}}, SHIFT(652),
+  [3528] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1339),
+  [3530] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1538),
+  [3532] = {.entry = {.count = 1, .reusable = true}}, SHIFT(961),
+  [3534] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120),
+  [3536] = {.entry = {.count = 1, .reusable = true}}, SHIFT(717),
+  [3538] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
+  [3540] = {.entry = {.count = 1, .reusable = true}}, SHIFT(906),
+  [3542] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1379),
+  [3544] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1402),
+  [3546] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1403),
+  [3548] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
+  [3550] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1331),
+  [3552] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1244),
 };
 
 enum ts_external_scanner_symbol_identifiers {
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index e36b11806aa3..7c16b1b80260 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,3 +1,47 @@
+## 7.2.9
+
+No user-facing changes.
+
+## 7.2.8
+
+### Minor Analysis Improvements
+
+* Updated the `py/xxe`, `py/xml-bomb`, and `py/nosql-injection` queries to respect the configured threat model when selecting untrusted data sources. The default behavior remains unchanged and uses remote flow sources. As a side effect, these queries now correctly include sources modeled using data extensions.
+* Added taint-flow modeling for `unicodedata.iter_graphemes`, introduced in Python 3.15.
+* Added data-flow modeling for `threading.serialize_iterator` and `threading.concurrent_tee`, introduced in Python 3.15.
+* Added modeling for the Base32, Base85, and Ascii85 encoding and decoding functions introduced in Python 3.15's `binascii` module, including taint flow through custom alphabets.
+* Added support for the `frozendict` and `sentinel` builtins introduced in Python 3.15, and data-flow modeling for `frozendict` construction.
+* The Python extractor now supports unary plus in `match` literal patterns, introduced in Python 3.15.
+* The Python extractor now supports Unicode 17 identifiers, introduced in Python 3.15.
+* Added modeling for the `extra_response_headers` constructor argument and instance attribute of `http.server.SimpleHTTPRequestHandler`, introduced in Python 3.15.
+* Added modeling for Python 3.15's `re.prefixmatch` and `re.Pattern.prefixmatch`, matching the existing support for their `match` counterparts.
+* Added taint-flow modeling for `bytearray` construction and Python 3.15's `bytearray.take_bytes` method.
+
+## 7.2.7
+
+No user-facing changes.
+
+## 7.2.6
+
+No user-facing changes.
+
+## 7.2.5
+
+### Bug Fixes
+
+* Fixed a bug where a Python file could be silently dropped from the analysis (with a spurious "A parse error occurred" diagnostic) when it contained a string literal, comment, or identifier with a character such as the U+FE0F emoji variation selector, a U+200D zero width joiner, or a combining accent.
+* Fixed the extraction of PEP 758 `except A, B:` clauses by the default (non-tree-sitter) Python parser. Previously the second exception type was extracted as a Python 2 style alias binding, so it was recorded as a `Store` rather than a use. This caused false positives from queries that reason about whether a name is used, such as `py/unused-import`. When extracting Python 2 (`--lang=2`), `except A, e:` continues to bind `e` as an alias, since that is what the syntax means in that version.
+
+## 7.2.4
+
+### Minor Analysis Improvements
+
+* Added taint flow through `list.extend` and `list.insert`, matching the existing taint flow through `list.append`.
+
+## 7.2.3
+
+No user-facing changes.
+
 ## 7.2.2
 
 No user-facing changes.
diff --git a/python/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md b/python/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md
new file mode 100644
index 000000000000..2e4c6e5ee2a3
--- /dev/null
+++ b/python/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The sensitive data heuristics treat names built on `trusted_schema`, such as SQLite's `set_trusted_schema` setting, as non-sensitive. This removes false positive results from queries that use the sensitive data library (for example `py/clear-text-logging-sensitive-data`).
diff --git a/python/ql/lib/change-notes/released/7.2.3.md b/python/ql/lib/change-notes/released/7.2.3.md
new file mode 100644
index 000000000000..ba04214fb88d
--- /dev/null
+++ b/python/ql/lib/change-notes/released/7.2.3.md
@@ -0,0 +1,3 @@
+## 7.2.3
+
+No user-facing changes.
diff --git a/python/ql/lib/change-notes/released/7.2.4.md b/python/ql/lib/change-notes/released/7.2.4.md
new file mode 100644
index 000000000000..564a01ee27cc
--- /dev/null
+++ b/python/ql/lib/change-notes/released/7.2.4.md
@@ -0,0 +1,5 @@
+## 7.2.4
+
+### Minor Analysis Improvements
+
+* Added taint flow through `list.extend` and `list.insert`, matching the existing taint flow through `list.append`.
diff --git a/python/ql/lib/change-notes/released/7.2.5.md b/python/ql/lib/change-notes/released/7.2.5.md
new file mode 100644
index 000000000000..c3e78fbb5fcc
--- /dev/null
+++ b/python/ql/lib/change-notes/released/7.2.5.md
@@ -0,0 +1,6 @@
+## 7.2.5
+
+### Bug Fixes
+
+* Fixed a bug where a Python file could be silently dropped from the analysis (with a spurious "A parse error occurred" diagnostic) when it contained a string literal, comment, or identifier with a character such as the U+FE0F emoji variation selector, a U+200D zero width joiner, or a combining accent.
+* Fixed the extraction of PEP 758 `except A, B:` clauses by the default (non-tree-sitter) Python parser. Previously the second exception type was extracted as a Python 2 style alias binding, so it was recorded as a `Store` rather than a use. This caused false positives from queries that reason about whether a name is used, such as `py/unused-import`. When extracting Python 2 (`--lang=2`), `except A, e:` continues to bind `e` as an alias, since that is what the syntax means in that version.
diff --git a/python/ql/lib/change-notes/released/7.2.6.md b/python/ql/lib/change-notes/released/7.2.6.md
new file mode 100644
index 000000000000..7cce6b846fb5
--- /dev/null
+++ b/python/ql/lib/change-notes/released/7.2.6.md
@@ -0,0 +1,3 @@
+## 7.2.6
+
+No user-facing changes.
diff --git a/python/ql/lib/change-notes/released/7.2.7.md b/python/ql/lib/change-notes/released/7.2.7.md
new file mode 100644
index 000000000000..4856c4d261a4
--- /dev/null
+++ b/python/ql/lib/change-notes/released/7.2.7.md
@@ -0,0 +1,3 @@
+## 7.2.7
+
+No user-facing changes.
diff --git a/python/ql/lib/change-notes/released/7.2.8.md b/python/ql/lib/change-notes/released/7.2.8.md
new file mode 100644
index 000000000000..917769cc39ad
--- /dev/null
+++ b/python/ql/lib/change-notes/released/7.2.8.md
@@ -0,0 +1,14 @@
+## 7.2.8
+
+### Minor Analysis Improvements
+
+* Updated the `py/xxe`, `py/xml-bomb`, and `py/nosql-injection` queries to respect the configured threat model when selecting untrusted data sources. The default behavior remains unchanged and uses remote flow sources. As a side effect, these queries now correctly include sources modeled using data extensions.
+* Added taint-flow modeling for `unicodedata.iter_graphemes`, introduced in Python 3.15.
+* Added data-flow modeling for `threading.serialize_iterator` and `threading.concurrent_tee`, introduced in Python 3.15.
+* Added modeling for the Base32, Base85, and Ascii85 encoding and decoding functions introduced in Python 3.15's `binascii` module, including taint flow through custom alphabets.
+* Added support for the `frozendict` and `sentinel` builtins introduced in Python 3.15, and data-flow modeling for `frozendict` construction.
+* The Python extractor now supports unary plus in `match` literal patterns, introduced in Python 3.15.
+* The Python extractor now supports Unicode 17 identifiers, introduced in Python 3.15.
+* Added modeling for the `extra_response_headers` constructor argument and instance attribute of `http.server.SimpleHTTPRequestHandler`, introduced in Python 3.15.
+* Added modeling for Python 3.15's `re.prefixmatch` and `re.Pattern.prefixmatch`, matching the existing support for their `match` counterparts.
+* Added taint-flow modeling for `bytearray` construction and Python 3.15's `bytearray.take_bytes` method.
diff --git a/python/ql/lib/change-notes/released/7.2.9.md b/python/ql/lib/change-notes/released/7.2.9.md
new file mode 100644
index 000000000000..e308d6bc641d
--- /dev/null
+++ b/python/ql/lib/change-notes/released/7.2.9.md
@@ -0,0 +1,3 @@
+## 7.2.9
+
+No user-facing changes.
diff --git a/python/ql/lib/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
index fa4a7164fb7b..0329e1931ec4 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 7.2.2
+lastReleaseVersion: 7.2.9
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index 51fbf227e0b9..e6e2c515b0b1 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 7.2.3-dev
+version: 7.2.10-dev
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
diff --git a/python/ql/lib/semmle/python/controlflow/internal/AstNodeImpl.qll b/python/ql/lib/semmle/python/controlflow/internal/AstNodeImpl.qll
index 78218f489215..802cf2cf79f0 100644
--- a/python/ql/lib/semmle/python/controlflow/internal/AstNodeImpl.qll
+++ b/python/ql/lib/semmle/python/controlflow/internal/AstNodeImpl.qll
@@ -231,6 +231,12 @@ module Ast implements AstSig<Py::Location> {
     override Callable getEnclosingCallable() { result.asScope() = this.asStmt().getScope() }
   }
 
+  class LabeledStmt extends Stmt {
+    LabeledStmt() { none() }
+
+    Stmt getStmt() { none() }
+  }
+
   /** An expression. */
   class Expr extends AstNodeImpl, TExpr {
     // For `TPyExpr` instances, delegate to the wrapped Python expression.
@@ -657,10 +663,10 @@ module Ast implements AstSig<Py::Location> {
   }
 
   /** A for-each loop (`for x in iterable:`). */
-  class ForeachStmt extends LoopStmtImpl {
+  class ForEachStmt extends LoopStmtImpl {
     private Py::For forStmt;
 
-    ForeachStmt() { this = TPyStmt(forStmt) }
+    ForEachStmt() { this = TPyStmt(forStmt) }
 
     /** Gets the loop variable. */
     Expr getVariable() { result.asExpr() = forStmt.getTarget() }
@@ -898,7 +904,7 @@ module Ast implements AstSig<Py::Location> {
   AstNode getLoopElse(LoopStmt loop) {
     result = loop.(WhileStmt).getElse()
     or
-    result = loop.(ForeachStmt).getElse()
+    result = loop.(ForEachStmt).getElse()
   }
 
   /** An exception handler (`except` or `except*`). */
@@ -993,9 +999,8 @@ module Ast implements AstSig<Py::Location> {
     }
   }
 
-  /** A wildcard case (`case _:`). */
   class DefaultCase extends Case {
-    DefaultCase() { this.isWildcard() }
+    DefaultCase() { none() }
   }
 
   /** A conditional expression (`x if cond else y`). */
@@ -1626,6 +1631,8 @@ private module Input implements InputSig1, InputSig2 {
     n = any(Ast::AssertStmt a).getTest()
   }
 
+  predicate postOrInOrder(Ast::AstNode n) { mayThrow(n) }
+
   private string assertThrowTag() { result = "[assert-throw]" }
 
   /**
@@ -1633,12 +1640,15 @@ private module Input implements InputSig1, InputSig2 {
    * its normal evaluation (not via an explicit `raise`/`assert`, which are
    * modeled separately).
    *
-   * The set mirrors what the legacy CFG used to flag implicitly: function
+   * `TypeError` is intentionally excluded along with exceptions thrown by dunder
+   * implementations to avoid cluttering the CFG; we expect user code to catch
+   * these only rarely.
+   *
+   * Otherwise, the set mirrors what the legacy CFG used to flag implicitly: function
    * calls (anything can raise), attribute access (`AttributeError`),
-   * subscript access (`IndexError`/`KeyError`/`TypeError`), arithmetic and
-   * comparison operators (`TypeError`/`ZeroDivisionError`), imports
+   * subscript access (`IndexError`/`KeyError`), division (`ZeroDivisionError`), imports
    * (`ImportError`/`ModuleNotFoundError`), and generator/coroutine
-   * suspension points (`await`/`yield`/`yield from`).
+   * suspension points (`await`/`yield`/`yield from` throwing `CancelledError` or `GeneratorExit`).
    *
    * Bare `Name` reads are intentionally excluded — modeling every name
    * read as `mayThrow` would explode CFG edge count for negligible
@@ -1652,11 +1662,7 @@ private module Input implements InputSig1, InputSig2 {
     or
     e instanceof Py::Subscript
     or
-    e instanceof Py::BinaryExpr
-    or
-    e instanceof Py::UnaryExpr
-    or
-    e instanceof Py::Compare
+    e.(Py::BinaryExpr).getOp() instanceof Py::Div
     or
     e instanceof Py::ImportExpr
     or
@@ -1753,6 +1759,11 @@ private module Input implements InputSig1, InputSig2 {
       n2.isAdditional(assertStmt, assertThrowTag())
     )
   }
+
+  predicate matchAll(Ast::Case c) {
+    // A wildcard case (`case _:`) will match all values.
+    c.isWildcard()
+  }
 }
 
 import Public
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/Builtins.qll b/python/ql/lib/semmle/python/dataflow/new/internal/Builtins.qll
index 764af5d9dc57..4d3477e85a6b 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/Builtins.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/Builtins.qll
@@ -42,7 +42,7 @@ module Builtins {
     or
     // Python 3 only
     result in [
-        "ascii", "breakpoint", "bytes", "exec",
+        "ascii", "breakpoint", "bytes", "exec", "frozendict", "sentinel",
         // Exceptions
         "BlockingIOError", "BrokenPipeError", "ChildProcessError", "ConnectionAbortedError",
         "ConnectionError", "ConnectionRefusedError", "ConnectionResetError", "FileExistsError",
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index 23b49882445e..4a1f08315caf 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -1711,21 +1711,12 @@ class FlowSummaryNode extends Node, TFlowSummaryNode {
   }
 
   override DataFlowCallable getEnclosingCallable() {
-    result.asLibraryCallable() = this.getSummarizedCallable()
+    result = this.getSummaryNode().getEnclosingCallable()
   }
 
   override string toString() { result = this.getSummaryNode().toString() }
 
-  // Hack to return "empty location"
-  deprecated override predicate hasLocationInfo(
-    string file, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    file = "" and
-    startline = 0 and
-    startcolumn = 0 and
-    endline = 0 and
-    endcolumn = 0
-  }
+  override Location getLocation() { result = this.getSummaryNode().getLocation() }
 }
 
 private class SummaryReturnNode extends FlowSummaryNode, ReturnNode {
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index 01b9f04c01c4..c8a90b1cc598 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -529,8 +529,7 @@ predicate simpleLocalFlowStepForTypetracking(Node nodeFrom, Node nodeTo) {
 }
 
 private predicate summaryLocalStep(Node nodeFrom, Node nodeTo, string model) {
-  FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-    nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)
+  FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, true, model)
 }
 
 predicate variableCaptureLocalFlowStep(Node nodeFrom, Node nodeTo) {
@@ -697,8 +696,7 @@ predicate jumpStep(Node nodeFrom, Node nodeTo) {
   or
   jumpStepNotSharedWithTypeTracker(nodeFrom, nodeTo)
   or
-  FlowSummaryImpl::Private::Steps::summaryJumpStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),
-    nodeTo.(FlowSummaryNode).getSummaryNode())
+  FlowSummaryImpl::Private::Steps::summaryJumpStep(nodeFrom, nodeTo)
 }
 
 /**
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll
index 22c2f75944a0..2f081870085d 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll
@@ -14,16 +14,23 @@ private import DataFlowImplSpecific::Public
 module Input implements InputSig<Location, DataFlowImplSpecific::PythonDataFlow> {
   private import codeql.util.Void
 
-  class SummarizedCallableBase = string;
+  class SummarizedCallableBase extends string {
+    bindingset[this]
+    SummarizedCallableBase() { exists(this) }
 
-  class SourceBase = Void;
-
-  class SinkBase = Void;
+    Location getLocation() { none() }
+  }
 
-  class FlowSummaryCallBase = Void;
+  class FlowSummaryCallBase extends Void {
+    Location getLocation() { none() }
+  }
 
   predicate callableFromSource(SummarizedCallableBase c) { none() }
 
+  DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
+    result.asLibraryCallable() = c
+  }
+
   ArgumentPosition callbackSelfParameterPosition() { result.isLambdaSelf() }
 
   ReturnKind getStandardReturnValueKind() { any() }
@@ -112,10 +119,22 @@ module Input implements InputSig<Location, DataFlowImplSpecific::PythonDataFlow>
 
 private import Make<Location, DataFlowImplSpecific::PythonDataFlow, Input> as Impl
 
-private module StepsInput implements Impl::Private::StepsInputSig {
-  Impl::Private::SummaryNode getSummaryNode(Node n) {
-    result = n.(FlowSummaryNode).getSummaryNode()
+private module Input2 implements Impl::Private::InputSig2 {
+  private import codeql.util.Void
+
+  class SourceSinkReportingElement extends Void {
+    Location getLocation() { none() }
+
+    DataFlowCallable getEnclosingCallable() { none() }
+
+    SourceSinkReportingElement getASuccessor(Impl::Private::SummaryComponent sc) { none() }
   }
+}
+
+private import Impl::Private::Make2<Input2> as Impl2
+
+private module StepsInput implements Impl2::StepsInputSig {
+  Impl2::SummaryNode getSummaryNode(Node n) { result = n.(FlowSummaryNode).getSummaryNode() }
 
   overlay[global]
   DataFlowCall getACall(Public::SummarizedCallable sc) {
@@ -125,18 +144,13 @@ private module StepsInput implements Impl::Private::StepsInputSig {
           sc.(LibraryCallable).getACallSimple().asCfgNode()
         ])
   }
-
-  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
-
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
-
-  Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
 
 module Private {
   import Impl::Private
+  import Impl2
 
-  module Steps = Impl::Private::Steps<StepsInput>;
+  module Steps = Impl2::Steps<StepsInput>;
 
   /**
    * Provides predicates for constructing summary components.
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
index 50a6be72d9b5..2db0a7c4c9ca 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll
@@ -80,8 +80,7 @@ private module Cached {
     ) and
     model = ""
     or
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-      nodeTo.(DataFlowPrivate::FlowSummaryNode).getSummaryNode(), false, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, false, model)
   }
 }
 
@@ -108,8 +107,8 @@ predicate subscriptStep(DataFlow::CfgNode nodeFrom, DataFlow::CfgNode nodeTo) {
 }
 
 /**
- * Holds if taint can flow from `nodeFrom` to `nodeTo` with a step related to string
- * manipulation.
+ * Holds if taint can flow from `nodeFrom` to `nodeTo` by manipulating string-like
+ * data, including text strings, byte strings, and byte arrays.
  *
  * Note that since we cannot easily distinguish when something is a string, this can
  * also make taint flow on `<non string>.replace(foo, bar)`.
@@ -125,6 +124,18 @@ predicate stringManipulation(DataFlow::CfgNode nodeFrom, DataFlow::CfgNode nodeT
     nodeFrom in [call.getArg(0), call.getArgByName("object")]
   )
   or
+  // Bytearray construction and byte extraction.
+  exists(DataFlow::CallCfgNode call | call = nodeTo |
+    call = API::builtin("bytearray").getACall() and
+    nodeFrom in [call.getArg(0), call.getArgByName("source")]
+    or
+    call.(DataFlow::MethodCallNode).calls(nodeFrom, "take_bytes")
+    or
+    // Unbound calls: bytearray.take_bytes(buffer).
+    call = API::builtin("bytearray").getMember("take_bytes").getACall() and
+    nodeFrom = call.getArg(0)
+  )
+  or
   // String methods. Note that this doesn't recognize `meth = "foo".upper; meth()`
   exists(CallNode call, string method_name, ControlFlowNode object |
     call = nodeTo.getNode() and
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
index 5b50dff313e7..c54278843d5e 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.model.yml
@@ -138,10 +138,23 @@ extensions:
       - ["tempfile", "Member[mkstemp]", "Argument[0,suffix:,1,prefix:,2,dir:]", "ReturnValue.TupleElement[0,1]", "taint"]
       # See https://docs.python.org/3/library/textwrap.html#textwrap.dedent
       - ["textwrap", "Member[dedent]", "Argument[0,text:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/threading.html#threading.serialize_iterator
+      - ["threading", "Member[serialize_iterator]", "Argument[0,iterable:].ListElement", "ReturnValue.ListElement", "value"]
+      - ["threading", "Member[serialize_iterator]", "Argument[0,iterable:].SetElement", "ReturnValue.ListElement", "value"]
+      - ["threading", "Member[serialize_iterator]", "Argument[0,iterable:].AnyTupleElement", "ReturnValue.ListElement", "value"]
+      - ["threading", "Member[serialize_iterator]", "Argument[0,iterable:]", "ReturnValue", "taint"]
+      # See https://docs.python.org/3/library/threading.html#threading.concurrent_tee
+      # All returned iterators have the same contents, so the outer tuple is modeled as an index-insensitive sequence.
+      - ["threading", "Member[concurrent_tee]", "Argument[0,iterable:].ListElement", "ReturnValue.ListElement.ListElement", "value"]
+      - ["threading", "Member[concurrent_tee]", "Argument[0,iterable:].SetElement", "ReturnValue.ListElement.ListElement", "value"]
+      - ["threading", "Member[concurrent_tee]", "Argument[0,iterable:].AnyTupleElement", "ReturnValue.ListElement.ListElement", "value"]
+      - ["threading", "Member[concurrent_tee]", "Argument[0,iterable:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/traceback.html#traceback.StackSummary.from_list
       - ["traceback.StackSummary", "Member[from_list]", "Argument[0,a_list:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/typing.html#typing.cast
       - ["typing", "Member[cast]", "Argument[1,val:]", "ReturnValue", "value"]
+      # See https://docs.python.org/3/library/unicodedata.html#unicodedata.iter_graphemes
+      - ["unicodedata", "Member[iter_graphemes]", "Argument[0]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.parse_qs
       - ["urllib", "Member[parse].Member[parse_qs]", "Argument[0,qs:]", "ReturnValue", "taint"]
       # See https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urlparse
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index df69a010fd8b..f6552d6ec253 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -1760,6 +1760,59 @@ module StdlibPrivate {
     }
   }
 
+  // ---------------------------------------------------------------------------
+  // binascii
+  // ---------------------------------------------------------------------------
+  /** A call to a supported encoding function in the `binascii` module. */
+  private class BinasciiEncodeCall extends Encoding::Range, DataFlow::CallCfgNode {
+    string codec;
+
+    BinasciiEncodeCall() {
+      codec in ["base32", "base85", "ascii85"] and
+      this = API::moduleImport("binascii").getMember("b2a_" + codec).getACall()
+    }
+
+    override DataFlow::Node getAnInput() {
+      result = this.getArg(0)
+      or
+      codec in ["base32", "base85"] and
+      result = this.getArgByName("alphabet")
+    }
+
+    override DataFlow::Node getOutput() { result = this }
+
+    override string getFormat() {
+      result in ["Base32", "Base85", "Ascii85"] and
+      result.toLowerCase() = codec
+    }
+  }
+
+  /** A call to a supported decoding function in the `binascii` module. */
+  private class BinasciiDecodeCall extends Decoding::Range, DataFlow::CallCfgNode {
+    string codec;
+
+    BinasciiDecodeCall() {
+      codec in ["base32", "base85", "ascii85"] and
+      this = API::moduleImport("binascii").getMember("a2b_" + codec).getACall()
+    }
+
+    override predicate mayExecuteInput() { none() }
+
+    override DataFlow::Node getAnInput() {
+      result = this.getArg(0)
+      or
+      codec in ["base32", "base85"] and
+      result = this.getArgByName("alphabet")
+    }
+
+    override DataFlow::Node getOutput() { result = this }
+
+    override string getFormat() {
+      result in ["Base32", "Base85", "Ascii85"] and
+      result.toLowerCase() = codec
+    }
+  }
+
   // ---------------------------------------------------------------------------
   // json
   // ---------------------------------------------------------------------------
@@ -2041,6 +2094,34 @@ module StdlibPrivate {
       override predicate valueAllowsNewline() { any() }
     }
 
+    /** Additional response headers supplied by construction or instance assignment. */
+    private class ExtraHeadersWrite extends Http::Server::ResponseHeaderBulkWrite::Range {
+      DataFlow::Node headers;
+
+      ExtraHeadersWrite() {
+        exists(API::Node cls |
+          cls =
+            API::moduleImport("http")
+                .getMember("server")
+                .getMember("SimpleHTTPRequestHandler")
+                .getASubclass*()
+        |
+          this = cls.getACall() and
+          headers = this.(DataFlow::CallCfgNode).getArgByName("extra_response_headers")
+          or
+          this.(DataFlow::AttrWrite)
+              .writes([cls.getAnInstance(), cls.getAMember().getSelfParameter()]
+                    .getAValueReachableFromSource(), "extra_response_headers", headers)
+        )
+      }
+
+      override DataFlow::Node getBulkArg() { result = headers }
+
+      override predicate nameAllowsNewline() { any() }
+
+      override predicate valueAllowsNewline() { any() }
+    }
+
     private class AdditionalTaintStep extends TaintTracking::AdditionalTaintStep {
       override predicate step(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
         nodeFrom = instance() and
@@ -3105,12 +3186,15 @@ module StdlibPrivate {
    */
   private class RegexExecutionMethod extends string {
     RegexExecutionMethod() {
-      this in ["match", "fullmatch", "search", "split", "findall", "finditer", "sub", "subn"]
+      this in [
+          "match", "prefixmatch", "fullmatch", "search", "split", "findall", "finditer", "sub",
+          "subn"
+        ]
     }
 
     /** Gets the index of the argument representing the string to be searched by a regex. */
     int getStringArgIndex() {
-      this in ["match", "fullmatch", "search", "split", "findall", "finditer"] and
+      this in ["match", "prefixmatch", "fullmatch", "search", "split", "findall", "finditer"] and
       result = 1
       or
       this in ["sub", "subn"] and
@@ -3244,7 +3328,7 @@ module StdlibPrivate {
           this = "compiled re.Match"
         )
       |
-        result = re.getMember(["match", "search", "fullmatch"]).getACall()
+        result = re.getMember(["match", "prefixmatch", "search", "fullmatch"]).getACall()
       )
     }
 
@@ -4222,6 +4306,21 @@ module StdlibPrivate {
     }
   }
 
+  /** A flow summary for `frozendict`. */
+  class FrozendictSummary extends SummarizedCallable::Range {
+    FrozendictSummary() { this = "builtins.frozendict" }
+
+    override DataFlow::CallCfgNode getACall() { result = API::builtin("frozendict").getACall() }
+
+    override DataFlow::ArgumentNode getACallback() {
+      result = API::builtin("frozendict").getAValueReachableFromSource()
+    }
+
+    override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+      any(DictSummary s).propagatesFlow(input, output, preservesValue)
+    }
+  }
+
   /** A flow summary for `list`. */
   class ListSummary extends SummarizedCallable::Range {
     ListSummary() { this = "builtins.list" }
@@ -4871,11 +4970,60 @@ module StdlibPrivate {
       input = "Argument[0]" and
       output = "Argument[self].ListElement" and
       preservesValue = true
-      or
-      // transfer taint from new element to this (TODO: remove in future when taint-handling is more in line with other languages)
-      input = "Argument[0]" and
-      output = "Argument[self]" and
-      preservesValue = false
+    }
+  }
+
+  /**
+   * A flow summary for `list.extend`.
+   *
+   * See https://docs.python.org/3.10/library/stdtypes.html#typesseq-mutable
+   */
+  class ListExtend extends SummarizedCallable::Range {
+    ListExtend() { this = "list.extend" }
+
+    override DataFlow::CallCfgNode getACall() {
+      result.(DataFlow::MethodCallNode).calls(_, "extend")
+    }
+
+    override DataFlow::ArgumentNode getACallback() {
+      result.(DataFlow::AttrRead).getAttributeName() = "extend"
+    }
+
+    override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+      // elements of the newly added iterable are added to this
+      (
+        input = "Argument[0].ListElement"
+        or
+        input = "Argument[0].SetElement"
+        or
+        input = "Argument[0].AnyTupleElement"
+      ) and
+      output = "Argument[self].ListElement" and
+      preservesValue = true
+    }
+  }
+
+  /**
+   * A flow summary for `list.insert`.
+   *
+   * See https://docs.python.org/3.10/library/stdtypes.html#typesseq-mutable
+   */
+  class ListInsert extends SummarizedCallable::Range {
+    ListInsert() { this = "list.insert" }
+
+    override DataFlow::CallCfgNode getACall() {
+      result.(DataFlow::MethodCallNode).calls(_, "insert")
+    }
+
+    override DataFlow::ArgumentNode getACallback() {
+      result.(DataFlow::AttrRead).getAttributeName() = "insert"
+    }
+
+    override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+      // newly added element added to this
+      input = "Argument[1]" and
+      output = "Argument[self].ListElement" and
+      preservesValue = true
     }
   }
 
@@ -4898,11 +5046,6 @@ module StdlibPrivate {
       input = "Argument[0]" and
       output = "Argument[self].SetElement" and
       preservesValue = true
-      or
-      // transfer taint from new element to this (TODO: remove in future when taint-handling is more in line with other languages)
-      input = "Argument[0]" and
-      output = "Argument[self]" and
-      preservesValue = false
     }
   }
 
diff --git a/python/ql/lib/semmle/python/regexp/internal/ParseRegExp.qll b/python/ql/lib/semmle/python/regexp/internal/ParseRegExp.qll
index d91c4bbd78c0..0b47432cb16e 100644
--- a/python/ql/lib/semmle/python/regexp/internal/ParseRegExp.qll
+++ b/python/ql/lib/semmle/python/regexp/internal/ParseRegExp.qll
@@ -44,7 +44,7 @@ private module FindRegexMode {
     or
     name = "search" and result = 2
     or
-    name = "match" and result = 2
+    name in ["match", "prefixmatch"] and result = 2
     or
     name = "split" and result = 3
     or
diff --git a/python/ql/lib/semmle/python/security/dataflow/CodeInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/CodeInjectionCustomizations.qll
index 5a7e5882e449..87e95d8a5542 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CodeInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CodeInjectionCustomizations.qll
@@ -37,10 +37,9 @@ module CodeInjection {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A code execution, considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/CommandInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/CommandInjectionCustomizations.qll
index facb422e7285..755a02b0efc2 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CommandInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CommandInjectionCustomizations.qll
@@ -37,10 +37,9 @@ module CommandInjection {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A command execution, considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/CookieInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/CookieInjectionCustomizations.qll
index cee2b7b98e73..ba5499d10ee2 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CookieInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CookieInjectionCustomizations.qll
@@ -35,10 +35,9 @@ module CookieInjection {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A write to a cookie, considered as a sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/HttpHeaderInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/HttpHeaderInjectionCustomizations.qll
index 92cd46a3408a..cd651e0b1a88 100644
--- a/python/ql/lib/semmle/python/security/dataflow/HttpHeaderInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/HttpHeaderInjectionCustomizations.qll
@@ -36,10 +36,9 @@ module HttpHeaderInjection {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A HTTP header write, considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/LdapInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/LdapInjectionCustomizations.qll
index e67d02dc67e9..d69fe08308e1 100644
--- a/python/ql/lib/semmle/python/security/dataflow/LdapInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/LdapInjectionCustomizations.qll
@@ -46,10 +46,9 @@ module LdapInjection {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A logging operation, considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/LogInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/LogInjectionCustomizations.qll
index 98c767df2894..26a7b4723dfd 100644
--- a/python/ql/lib/semmle/python/security/dataflow/LogInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/LogInjectionCustomizations.qll
@@ -37,10 +37,9 @@ module LogInjection {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A logging operation, considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/NoSqlInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/NoSqlInjectionCustomizations.qll
index d708081a7f51..abe2d5690b86 100644
--- a/python/ql/lib/semmle/python/security/dataflow/NoSqlInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/NoSqlInjectionCustomizations.qll
@@ -6,7 +6,6 @@
 
 import python
 import semmle.python.dataflow.new.DataFlow
-import semmle.python.dataflow.new.RemoteFlowSources
 import semmle.python.Concepts
 
 /**
@@ -63,8 +62,14 @@ module NoSqlInjection {
     abstract DataFlow::Node getOutput();
   }
 
-  /** A remote flow source considered a source of user controlled strings. */
-  class RemoteFlowSourceAsStringSource extends RemoteFlowSource, StringSource { }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsStringSource = ActiveThreatModelSourceAsStringSource;
+
+  /** An active threat-model source considered a source of user controlled strings. */
+  private class ActiveThreatModelSourceAsStringSource extends StringSource instanceof ActiveThreatModelSource
+  { }
 
   /** A NoSQL query that is vulnerable to user controlled strings. */
   class NoSqlExecutionAsStringSink extends StringSink {
diff --git a/python/ql/lib/semmle/python/security/dataflow/PamAuthorizationCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/PamAuthorizationCustomizations.qll
index eb858be8f95d..0e9dfe390694 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PamAuthorizationCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PamAuthorizationCustomizations.qll
@@ -44,10 +44,9 @@ module PamAuthorizationCustomizations {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A vulnerable `pam_authenticate` call considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/PathInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/PathInjectionCustomizations.qll
index 7121faa19ffb..ab43cbd861b6 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PathInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PathInjectionCustomizations.qll
@@ -47,10 +47,9 @@ module PathInjection {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A file system access, considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSCustomizations.qll
index 1e9148517bf2..18c50aca6ce9 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSCustomizations.qll
@@ -56,10 +56,9 @@ module PolynomialReDoS {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A regex execution, considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
index 0ef2234a5772..ced98aa4d5aa 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
@@ -37,10 +37,9 @@ module ReflectedXss {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A data flow sink for "reflected cross-site scripting" vulnerabilities.
diff --git a/python/ql/lib/semmle/python/security/dataflow/RegexInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/RegexInjectionCustomizations.qll
index 559b1f66e7e6..32c9430a8656 100644
--- a/python/ql/lib/semmle/python/security/dataflow/RegexInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/RegexInjectionCustomizations.qll
@@ -44,10 +44,9 @@ module RegexInjection {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A regex escaping, considered as a sanitizer.
diff --git a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll
index e3f18170f630..506f7fb6ecd3 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll
@@ -50,10 +50,9 @@ module ServerSideRequestForgery {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /** The URL of an HTTP request, considered as a sink. */
   class HttpRequestUrlAsSink extends Sink {
@@ -164,7 +163,7 @@ module ServerSideRequestForgery {
         ["isalnum", "isalpha", "isdecimal", "isdigit", "isidentifier", "isnumeric", "isspace"])
       or
       branch = true and
-      call = API::moduleImport("re").getMember(["match", "fullmatch"]).getACall() and
+      call = API::moduleImport("re").getMember(["match", "prefixmatch", "fullmatch"]).getACall() and
       strNode = [call.getArg(1), call.getArgByName("string")]
       or
       branch = true and
@@ -172,7 +171,7 @@ module ServerSideRequestForgery {
         API::moduleImport("re")
             .getMember("compile")
             .getReturn()
-            .getMember(["match", "fullmatch"])
+            .getMember(["match", "prefixmatch", "fullmatch"])
             .getACall() and
       strNode = [call.getArg(0), call.getArgByName("string")]
     )
diff --git a/python/ql/lib/semmle/python/security/dataflow/SqlInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/SqlInjectionCustomizations.qll
index ee6f17b03d2c..071cbf512ffe 100644
--- a/python/ql/lib/semmle/python/security/dataflow/SqlInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/SqlInjectionCustomizations.qll
@@ -36,10 +36,9 @@ module SqlInjection {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A SQL statement of a SQL construction, considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/TemplateInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/TemplateInjectionCustomizations.qll
index e61d55253090..3449eeaf3856 100644
--- a/python/ql/lib/semmle/python/security/dataflow/TemplateInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/TemplateInjectionCustomizations.qll
@@ -31,10 +31,9 @@ module TemplateInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A SQL statement of a SQL construction, considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationCustomizations.qll
index 17450bb82d96..74586e768768 100644
--- a/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationCustomizations.qll
@@ -37,10 +37,9 @@ module UnsafeDeserialization {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * An insecure decoding, considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/UrlRedirectCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/UrlRedirectCustomizations.qll
index 75a638fc3a42..471af9756d23 100644
--- a/python/ql/lib/semmle/python/security/dataflow/UrlRedirectCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/UrlRedirectCustomizations.qll
@@ -82,10 +82,9 @@ module UrlRedirect {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A HTTP redirect response, considered as a flow sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/XmlBombCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/XmlBombCustomizations.qll
index 317bee333871..5fb3aee77e3d 100644
--- a/python/ql/lib/semmle/python/security/dataflow/XmlBombCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/XmlBombCustomizations.qll
@@ -7,7 +7,6 @@
 private import python
 private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.Concepts
-private import semmle.python.dataflow.new.RemoteFlowSources
 
 /**
  * Provides default sources, sinks and sanitizers for detecting "XML bomb"
@@ -29,8 +28,14 @@ module XmlBomb {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for XML bomb vulnerabilities. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A call to an XML parser that is vulnerable to XML bombs.
diff --git a/python/ql/lib/semmle/python/security/dataflow/XpathInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/XpathInjectionCustomizations.qll
index 10b47f174390..992ed49dca98 100644
--- a/python/ql/lib/semmle/python/security/dataflow/XpathInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/XpathInjectionCustomizations.qll
@@ -34,10 +34,9 @@ module XpathInjection {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A construction of an XPath expression, considered as a sink.
diff --git a/python/ql/lib/semmle/python/security/dataflow/XxeCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/XxeCustomizations.qll
index c98e8153be90..786b6160e3b9 100644
--- a/python/ql/lib/semmle/python/security/dataflow/XxeCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/XxeCustomizations.qll
@@ -7,7 +7,6 @@
 private import python
 private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.Concepts
-private import semmle.python.dataflow.new.RemoteFlowSources
 
 /**
  * Provides default sources, sinks and sanitizers for detecting "XML External Entity (XXE)"
@@ -29,8 +28,14 @@ module Xxe {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for XXE vulnerabilities. */
-  class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
+  /**
+   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
+   */
+  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
+
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A call to an XML parser that is vulnerable to XXE.
diff --git a/python/ql/lib/utils/test/InlineExpectationsTestQuery.ql b/python/ql/lib/utils/test/InlineExpectationsTestQuery.ql
index 9ce5fdf326ca..fa37afa388c0 100644
--- a/python/ql/lib/utils/test/InlineExpectationsTestQuery.ql
+++ b/python/ql/lib/utils/test/InlineExpectationsTestQuery.ql
@@ -6,16 +6,4 @@ private import python
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>
diff --git a/python/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll b/python/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
index ea8faaeeae31..bc8c66cba5f3 100644
--- a/python/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/python/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
@@ -9,4 +9,14 @@ module Impl implements InlineExpectationsTestSig {
   class ExpectationComment = PY::Comment;
 
   class Location = PY::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(PY::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }
diff --git a/python/ql/src/CHANGELOG.md b/python/ql/src/CHANGELOG.md
index 154686ec4aa9..16202311b6b2 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,3 +1,33 @@
+## 1.9.0
+
+### Query Metadata Changes
+
+* The `external/cwe/cwe-730` tag has been removed from `py/redos`, `py/polynomial-redos` and `py/regex-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
+
+## 1.8.13
+
+No user-facing changes.
+
+## 1.8.12
+
+No user-facing changes.
+
+## 1.8.11
+
+No user-facing changes.
+
+## 1.8.10
+
+No user-facing changes.
+
+## 1.8.9
+
+No user-facing changes.
+
+## 1.8.8
+
+No user-facing changes.
+
 ## 1.8.7
 
 No user-facing changes.
diff --git a/python/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.inc.qhelp b/python/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.inc.qhelp
index 6fc36156c110..47e4c871dbe0 100644
--- a/python/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.inc.qhelp
+++ b/python/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.inc.qhelp
@@ -27,7 +27,7 @@ a shared library or module.
 <references> 
 
 
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Duplicate_code">Duplicate code</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Duplicate_code">Duplicate code</a>.</li>
 <li>M. Fowler, <em>Refactoring</em>. Addison-Wesley, 1999.</li>
 
 
diff --git a/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll b/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll
index 9c12845a0cad..7baec4738b08 100644
--- a/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll
+++ b/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll
@@ -6,7 +6,7 @@
 private import python
 import semmle.python.dataflow.new.DataFlow
 private import semmle.python.dataflow.new.TaintTracking
-private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.Concepts
 private import semmle.python.ApiGraphs
 private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate
 private import semmle.python.dataflow.new.internal.TaintTrackingPrivate as TaintTrackingPrivate
@@ -168,7 +168,7 @@ class ExternalApiDataNode extends DataFlow::Node {
 }
 
 private module UntrustedDataToExternalApiConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 
@@ -177,7 +177,7 @@ private module UntrustedDataToExternalApiConfig implements DataFlow::ConfigSig {
   }
 }
 
-/** Global taint-tracking from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
+/** Global taint-tracking from active threat-model sources to `ExternalApiDataNode`s. */
 module UntrustedDataToExternalApiFlow = TaintTracking::Global<UntrustedDataToExternalApiConfig>;
 
 /** A node representing untrusted data being passed to an external API. */
diff --git a/python/ql/src/Security/CWE-078/CommandInjection.qhelp b/python/ql/src/Security/CWE-078/CommandInjection.qhelp
index 62539a60ceb3..f5e8061788b9 100644
--- a/python/ql/src/Security/CWE-078/CommandInjection.qhelp
+++ b/python/ql/src/Security/CWE-078/CommandInjection.qhelp
@@ -34,7 +34,7 @@ The second is safe as it selects the command from a predefined allowlist.</p>
 
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 
 </references>
diff --git a/python/ql/src/Security/CWE-078/UnsafeShellCommandConstruction.qhelp b/python/ql/src/Security/CWE-078/UnsafeShellCommandConstruction.qhelp
index 007e691c2433..6efecf63c4ad 100644
--- a/python/ql/src/Security/CWE-078/UnsafeShellCommandConstruction.qhelp
+++ b/python/ql/src/Security/CWE-078/UnsafeShellCommandConstruction.qhelp
@@ -66,7 +66,7 @@
 
 	<li>
 		OWASP:
-		<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+		<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 	</li>
 
 </references>
diff --git a/python/ql/src/Security/CWE-730/PolynomialReDoS.ql b/python/ql/src/Security/CWE-730/PolynomialReDoS.ql
index f6dbe62c3a55..ebafbc2349c3 100644
--- a/python/ql/src/Security/CWE-730/PolynomialReDoS.ql
+++ b/python/ql/src/Security/CWE-730/PolynomialReDoS.ql
@@ -9,7 +9,6 @@
  * @id py/polynomial-redos
  * @tags security
  *       external/cwe/cwe-1333
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/python/ql/src/Security/CWE-730/ReDoS.ql b/python/ql/src/Security/CWE-730/ReDoS.ql
index e694aee6f3eb..0e839e86de3a 100644
--- a/python/ql/src/Security/CWE-730/ReDoS.ql
+++ b/python/ql/src/Security/CWE-730/ReDoS.ql
@@ -10,7 +10,6 @@
  * @id py/redos
  * @tags security
  *       external/cwe/cwe-1333
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/python/ql/src/Security/CWE-730/RegexInjection.ql b/python/ql/src/Security/CWE-730/RegexInjection.ql
index fe1dc1dfe660..41d907ea8c62 100644
--- a/python/ql/src/Security/CWE-730/RegexInjection.ql
+++ b/python/ql/src/Security/CWE-730/RegexInjection.ql
@@ -9,7 +9,6 @@
  * @precision high
  * @id py/regex-injection
  * @tags security
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/python/ql/src/change-notes/released/1.8.10.md b/python/ql/src/change-notes/released/1.8.10.md
new file mode 100644
index 000000000000..7a74b9d2cc34
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.8.10.md
@@ -0,0 +1,3 @@
+## 1.8.10
+
+No user-facing changes.
diff --git a/python/ql/src/change-notes/released/1.8.11.md b/python/ql/src/change-notes/released/1.8.11.md
new file mode 100644
index 000000000000..cbd98fc1758f
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.8.11.md
@@ -0,0 +1,3 @@
+## 1.8.11
+
+No user-facing changes.
diff --git a/python/ql/src/change-notes/released/1.8.12.md b/python/ql/src/change-notes/released/1.8.12.md
new file mode 100644
index 000000000000..e16969563da6
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.8.12.md
@@ -0,0 +1,3 @@
+## 1.8.12
+
+No user-facing changes.
diff --git a/python/ql/src/change-notes/released/1.8.13.md b/python/ql/src/change-notes/released/1.8.13.md
new file mode 100644
index 000000000000..f6ba4db672bd
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.8.13.md
@@ -0,0 +1,3 @@
+## 1.8.13
+
+No user-facing changes.
diff --git a/python/ql/src/change-notes/released/1.8.8.md b/python/ql/src/change-notes/released/1.8.8.md
new file mode 100644
index 000000000000..fcbf14e0fd9b
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.8.8.md
@@ -0,0 +1,3 @@
+## 1.8.8
+
+No user-facing changes.
diff --git a/python/ql/src/change-notes/released/1.8.9.md b/python/ql/src/change-notes/released/1.8.9.md
new file mode 100644
index 000000000000..2d48c5ca3da0
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.8.9.md
@@ -0,0 +1,3 @@
+## 1.8.9
+
+No user-facing changes.
diff --git a/python/ql/src/change-notes/released/1.9.0.md b/python/ql/src/change-notes/released/1.9.0.md
new file mode 100644
index 000000000000..b3c4753363eb
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.9.0.md
@@ -0,0 +1,5 @@
+## 1.9.0
+
+### Query Metadata Changes
+
+* The `external/cwe/cwe-730` tag has been removed from `py/redos`, `py/polynomial-redos` and `py/regex-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
diff --git a/python/ql/src/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
index 353f6d821ebe..df17dc3a3662 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.8.7
+lastReleaseVersion: 1.9.0
diff --git a/python/ql/src/experimental/Security/CWE-091/XsltInjectionCustomizations.qll b/python/ql/src/experimental/Security/CWE-091/XsltInjectionCustomizations.qll
index 6e6abea97f95..ab3ae8e703a3 100644
--- a/python/ql/src/experimental/Security/CWE-091/XsltInjectionCustomizations.qll
+++ b/python/ql/src/experimental/Security/CWE-091/XsltInjectionCustomizations.qll
@@ -37,10 +37,9 @@ module XsltInjection {
    */
   deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * An XSLT construction, considered as a flow sink.
diff --git a/python/ql/src/experimental/Security/CWE-176/UnicodeBypassValidationQuery.qll b/python/ql/src/experimental/Security/CWE-176/UnicodeBypassValidationQuery.qll
index c0337117cf01..e4604c008051 100644
--- a/python/ql/src/experimental/Security/CWE-176/UnicodeBypassValidationQuery.qll
+++ b/python/ql/src/experimental/Security/CWE-176/UnicodeBypassValidationQuery.qll
@@ -9,7 +9,6 @@ import semmle.python.Concepts
 import semmle.python.dataflow.new.internal.DataFlowPublic
 import semmle.python.dataflow.new.TaintTracking
 import semmle.python.dataflow.new.internal.TaintTrackingPrivate
-import semmle.python.dataflow.new.RemoteFlowSources
 import UnicodeBypassValidationCustomizations::UnicodeBypassValidation
 
 abstract private class ValidationState extends string {
@@ -37,7 +36,7 @@ private module UnicodeBypassValidationConfig implements DataFlow::StateConfigSig
   class FlowState = ValidationState;
 
   predicate isSource(DataFlow::Node source, FlowState state) {
-    source instanceof RemoteFlowSource and state instanceof PreValidation
+    source instanceof ActiveThreatModelSource and state instanceof PreValidation
   }
 
   predicate isAdditionalFlowStep(
diff --git a/python/ql/src/experimental/Security/CWE-346/CorsBypass.ql b/python/ql/src/experimental/Security/CWE-346/CorsBypass.ql
index 01e661cb0bbf..ce0b02908c56 100644
--- a/python/ql/src/experimental/Security/CWE-346/CorsBypass.ql
+++ b/python/ql/src/experimental/Security/CWE-346/CorsBypass.ql
@@ -10,6 +10,7 @@
 
 import python
 import semmle.python.ApiGraphs
+import semmle.python.Concepts
 import semmle.python.dataflow.new.TaintTracking
 import semmle.python.Flow
 import semmle.python.dataflow.new.RemoteFlowSources
@@ -62,7 +63,7 @@ class CherryPyRequest extends RemoteFlowSource::Range {
 }
 
 module CorsBypassConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node node) { node instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node node) { node instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node node) {
     exists(StringStartswithCall s |
diff --git a/python/ql/src/experimental/Security/CWE-770/UnicodeDoS.ql b/python/ql/src/experimental/Security/CWE-770/UnicodeDoS.ql
index 61cdd34920de..80d35bc48d24 100644
--- a/python/ql/src/experimental/Security/CWE-770/UnicodeDoS.ql
+++ b/python/ql/src/experimental/Security/CWE-770/UnicodeDoS.ql
@@ -15,7 +15,6 @@ import semmle.python.ApiGraphs
 import semmle.python.Concepts
 import semmle.python.dataflow.new.TaintTracking
 import semmle.python.dataflow.new.internal.DataFlowPublic
-import semmle.python.dataflow.new.RemoteFlowSources
 
 // The Unicode compatibility normalization calls from unicodedata, unidecode, pyunormalize
 // and textnorm modules. The use of argIdx is to constraint the argument being normalized.
@@ -86,7 +85,7 @@ predicate underAValue(DataFlow::GuardNode g, ControlFlowNode node, boolean branc
 }
 
 private module UnicodeDoSConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isBarrier(DataFlow::Node sanitizer) {
     // underAValue is a check to ensure that the length of the user-provided value is limited to a certain amount
diff --git a/python/ql/src/experimental/Security/UnsafeUnpackQuery.qll b/python/ql/src/experimental/Security/UnsafeUnpackQuery.qll
index 64da6b8d799a..69367c2f43a5 100644
--- a/python/ql/src/experimental/Security/UnsafeUnpackQuery.qll
+++ b/python/ql/src/experimental/Security/UnsafeUnpackQuery.qll
@@ -8,7 +8,6 @@ import semmle.python.dataflow.new.internal.DataFlowPublic
 import semmle.python.ApiGraphs
 import semmle.python.dataflow.new.TaintTracking
 import semmle.python.frameworks.Stdlib
-import semmle.python.dataflow.new.RemoteFlowSources
 
 /**
  * Handle those three cases of Tarfile opens:
@@ -41,8 +40,8 @@ class AllTarfileOpens extends API::CallNode {
 
 module UnsafeUnpackConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    // A source coming from a remote location
-    source instanceof RemoteFlowSource
+    // A source enabled by the active threat model
+    source instanceof ActiveThreatModelSource
     or
     // A source coming from a CLI argparse module
     // see argparse: https://docs.python.org/3/library/argparse.html
diff --git a/python/ql/src/experimental/semmle/python/security/DecompressionBomb.qll b/python/ql/src/experimental/semmle/python/security/DecompressionBomb.qll
index f05e5826420f..a00548e00161 100644
--- a/python/ql/src/experimental/semmle/python/security/DecompressionBomb.qll
+++ b/python/ql/src/experimental/semmle/python/security/DecompressionBomb.qll
@@ -1,8 +1,8 @@
 import python
 import semmle.python.dataflow.new.TaintTracking
 import semmle.python.ApiGraphs
-import semmle.python.dataflow.new.RemoteFlowSources
 import semmle.python.dataflow.new.internal.DataFlowPublic
+import semmle.python.Concepts
 import FileAndFormRemoteFlowSource::FileAndFormRemoteFlowSource
 import codeql.util.Unit
 
@@ -426,7 +426,7 @@ predicate isAdditionalTaintStepTextIOWrapper(DataFlow::Node nodeFrom, DataFlow::
 
 module BombsConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof RemoteFlowSource
+    source instanceof ActiveThreatModelSource
     or
     source instanceof FastApi
   }
diff --git a/python/ql/src/experimental/semmle/python/security/LdapInsecureAuth.qll b/python/ql/src/experimental/semmle/python/security/LdapInsecureAuth.qll
index 630543e6f798..f81279a4ec3a 100644
--- a/python/ql/src/experimental/semmle/python/security/LdapInsecureAuth.qll
+++ b/python/ql/src/experimental/semmle/python/security/LdapInsecureAuth.qll
@@ -5,7 +5,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
-import semmle.python.dataflow.new.RemoteFlowSources
+import semmle.python.Concepts
 import experimental.semmle.python.Concepts
 
 string getFullHostRegex() { result = "(?i)ldap://.+" }
@@ -90,7 +90,7 @@ class LdapStringVar extends BinaryExpr {
  */
 private module LdapInsecureAuthConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof RemoteFlowSource or
+    source instanceof ActiveThreatModelSource or
     source.asExpr() instanceof LdapFullHost or
     source.asExpr() instanceof LdapBothStrings or
     source.asExpr() instanceof LdapBothVar or
diff --git a/python/ql/src/experimental/semmle/python/security/RemoteCommandExecution.qll b/python/ql/src/experimental/semmle/python/security/RemoteCommandExecution.qll
index 6f4ea88a7472..01642c1e8a13 100644
--- a/python/ql/src/experimental/semmle/python/security/RemoteCommandExecution.qll
+++ b/python/ql/src/experimental/semmle/python/security/RemoteCommandExecution.qll
@@ -1,13 +1,13 @@
 import python
 import semmle.python.dataflow.new.TaintTracking
-import semmle.python.dataflow.new.RemoteFlowSources
 import semmle.python.ApiGraphs
 import semmle.python.dataflow.new.internal.DataFlowPublic
+import semmle.python.Concepts
 import codeql.util.Unit
 import experimental.semmle.python.Concepts
 
 module RemoteCommandExecutionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink = any(RemoteCommandExecution rce).getCommand() }
 
diff --git a/python/ql/src/experimental/semmle/python/security/TimingAttack.qll b/python/ql/src/experimental/semmle/python/security/TimingAttack.qll
index 6d8cc98f21ce..4d4495df83cb 100644
--- a/python/ql/src/experimental/semmle/python/security/TimingAttack.qll
+++ b/python/ql/src/experimental/semmle/python/security/TimingAttack.qll
@@ -2,7 +2,7 @@ private import python
 private import semmle.python.dataflow.new.TaintTracking
 private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.ApiGraphs
-private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.Concepts
 private import semmle.python.frameworks.Flask
 private import semmle.python.frameworks.Django
 
@@ -268,7 +268,7 @@ private string sensitiveheaders() {
  * A config that tracks data flow from remote user input to Variable that hold sensitive info
  */
 module UserInputSecretConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink.asExpr() instanceof CredentialExpr }
 }
@@ -279,7 +279,7 @@ module UserInputSecretFlow = TaintTracking::Global<UserInputSecretConfig>;
  * A config that tracks data flow from remote user input to Equality test
  */
 module UserInputInComparisonConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(Compare cmp, Expr left, Expr right, Cmpop cmpop |
diff --git a/python/ql/src/experimental/semmle/python/security/dataflow/EmailXss.qll b/python/ql/src/experimental/semmle/python/security/dataflow/EmailXss.qll
index 8f392a43a8a3..53f8f86d90af 100644
--- a/python/ql/src/experimental/semmle/python/security/dataflow/EmailXss.qll
+++ b/python/ql/src/experimental/semmle/python/security/dataflow/EmailXss.qll
@@ -5,14 +5,13 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
-import semmle.python.dataflow.new.RemoteFlowSources
 import semmle.python.dataflow.new.BarrierGuards
 import experimental.semmle.python.Concepts
 import semmle.python.Concepts
 import semmle.python.ApiGraphs
 
 private module EmailXssConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink = any(EmailSender email).getHtmlBody() }
 
diff --git a/python/ql/src/experimental/semmle/python/security/dataflow/PromptInjectionCustomizations.qll b/python/ql/src/experimental/semmle/python/security/dataflow/PromptInjectionCustomizations.qll
index b214ec87d4fc..95e611cad7d6 100644
--- a/python/ql/src/experimental/semmle/python/security/dataflow/PromptInjectionCustomizations.qll
+++ b/python/ql/src/experimental/semmle/python/security/dataflow/PromptInjectionCustomizations.qll
@@ -34,10 +34,9 @@ module PromptInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+  /** An active threat-model source, considered as a flow source. */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+  }
 
   /**
    * A prompt to an AI model, considered as a flow sink.
diff --git a/python/ql/src/experimental/semmle/python/security/injection/CsvInjection.qll b/python/ql/src/experimental/semmle/python/security/injection/CsvInjection.qll
index 859f6d1e5e80..e70e6b8bb60b 100644
--- a/python/ql/src/experimental/semmle/python/security/injection/CsvInjection.qll
+++ b/python/ql/src/experimental/semmle/python/security/injection/CsvInjection.qll
@@ -1,15 +1,15 @@
 import python
 import experimental.semmle.python.Concepts
+import semmle.python.Concepts
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import semmle.python.dataflow.new.BarrierGuards
-import semmle.python.dataflow.new.RemoteFlowSources
 
 /**
  * A taint-tracking configuration for tracking untrusted user input used in file read.
  */
 private module CsvInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink = any(CsvWriter cw).getAnInput() }
 
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index 7d54edbaa03f..bf57dfd657c0 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.8.8-dev
+version: 1.9.1-dev
 groups:
   - python
   - queries
diff --git a/python/ql/test/2/extractor-tests/relaxed_except/options b/python/ql/test/2/extractor-tests/relaxed_except/options
new file mode 100644
index 000000000000..b61a8c65a925
--- /dev/null
+++ b/python/ql/test/2/extractor-tests/relaxed_except/options
@@ -0,0 +1 @@
+semmle-extractor-options: --lang=2
diff --git a/python/ql/test/2/extractor-tests/relaxed_except/relaxed_except.expected b/python/ql/test/2/extractor-tests/relaxed_except/relaxed_except.expected
new file mode 100644
index 000000000000..06aeec986903
--- /dev/null
+++ b/python/ql/test/2/extractor-tests/relaxed_except/relaxed_except.expected
@@ -0,0 +1,3 @@
+| 6 | ValueError | err (definition) |
+| 12 | ValueError | other (definition) |
+| 18 | ValueError, TypeError | none |
diff --git a/python/ql/test/2/extractor-tests/relaxed_except/relaxed_except.ql b/python/ql/test/2/extractor-tests/relaxed_except/relaxed_except.ql
new file mode 100644
index 000000000000..55369e89f836
--- /dev/null
+++ b/python/ql/test/2/extractor-tests/relaxed_except/relaxed_except.ql
@@ -0,0 +1,26 @@
+/**
+ * The types of each `except` clause, and the name it binds. In Python 2 the
+ * comma form binds a name and has a single type; reading it as a PEP 758 tuple
+ * instead would give two types and no name.
+ */
+
+import python
+
+from ExceptStmt handler, string types, string name
+where
+  types =
+    concat(Expr type |
+      type = handler.getType()
+    |
+      type.toString(), ", " order by type.getLocation().getStartColumn()
+    ) and
+  (
+    exists(Name bound | bound = handler.getName() |
+      bound.isDefinition() and name = bound.getId() + " (definition)"
+      or
+      not bound.isDefinition() and name = bound.getId() + " (use)"
+    )
+    or
+    not exists(handler.getName()) and name = "none"
+  )
+select handler.getLocation().getStartLine(), types, name
diff --git a/python/ql/test/2/extractor-tests/relaxed_except/test.py b/python/ql/test/2/extractor-tests/relaxed_except/test.py
new file mode 100644
index 000000000000..f1fbade32f99
--- /dev/null
+++ b/python/ql/test/2/extractor-tests/relaxed_except/test.py
@@ -0,0 +1,19 @@
+# When extracting Python 2, `except A, e:` binds `e`. It is not a PEP 758
+# unparenthesized tuple of exception types, which is what the same syntax means
+# from Python 3.14 on.
+try:
+    unlikely()
+except ValueError, err:
+    print err
+
+# `as` means the same thing in every version.
+try:
+    unlikely()
+except ValueError as other:
+    print other
+
+# A parenthesized tuple is several types, and binds nothing.
+try:
+    unlikely()
+except (ValueError, TypeError):
+    pass
diff --git a/python/ql/test/2/query-tests/Imports/unused/UnusedImport.expected b/python/ql/test/2/query-tests/Imports/unused/UnusedImport.expected
new file mode 100644
index 000000000000..9480aa15d1b0
--- /dev/null
+++ b/python/ql/test/2/query-tests/Imports/unused/UnusedImport.expected
@@ -0,0 +1 @@
+| relaxed_except.py:2:1:2:43 | Import | Import of 'Beta' is not used. |
diff --git a/python/ql/test/2/query-tests/Imports/unused/UnusedImport.qlref b/python/ql/test/2/query-tests/Imports/unused/UnusedImport.qlref
new file mode 100644
index 000000000000..e6bb7ab44cb0
--- /dev/null
+++ b/python/ql/test/2/query-tests/Imports/unused/UnusedImport.qlref
@@ -0,0 +1 @@
+Imports/UnusedImport.ql
diff --git a/python/ql/test/2/query-tests/Imports/unused/relaxed_except.py b/python/ql/test/2/query-tests/Imports/unused/relaxed_except.py
new file mode 100644
index 000000000000..f5b1cb036261
--- /dev/null
+++ b/python/ql/test/2/query-tests/Imports/unused/relaxed_except.py
@@ -0,0 +1,9 @@
+# In Python 2, Beta is an alias binding; in Python 3, it is an exception type.
+from relaxed_except_defs import Alpha, Beta
+
+
+def unparenthesized():
+    try:
+        pass
+    except Alpha, Beta:
+        raise
diff --git a/python/ql/test/2/query-tests/Imports/unused/relaxed_except_defs.py b/python/ql/test/2/query-tests/Imports/unused/relaxed_except_defs.py
new file mode 100644
index 000000000000..12a167adf2c9
--- /dev/null
+++ b/python/ql/test/2/query-tests/Imports/unused/relaxed_except_defs.py
@@ -0,0 +1,6 @@
+class Alpha(Exception):
+    pass
+
+
+class Beta(Exception):
+    pass
diff --git a/python/ql/test/3/extractor-tests/match-unary-plus/test.expected b/python/ql/test/3/extractor-tests/match-unary-plus/test.expected
new file mode 100644
index 000000000000..ed0362097fa6
--- /dev/null
+++ b/python/ql/test/3/extractor-tests/match-unary-plus/test.expected
@@ -0,0 +1,15 @@
+| test.py:2:10:2:11 | UnaryExpr | UAdd |
+| test.py:4:10:4:13 | UnaryExpr | UAdd |
+| test.py:6:10:6:12 | UnaryExpr | UAdd |
+| test.py:8:10:8:11 | UnaryExpr | UAdd |
+| test.py:10:10:10:11 | UnaryExpr | UAdd |
+| test.py:12:10:12:14 | UnaryExpr | UAdd |
+| test.py:12:18:12:22 | UnaryExpr | UAdd |
+| test.py:12:26:12:30 | UnaryExpr | UAdd |
+| test.py:14:11:14:12 | UnaryExpr | UAdd |
+| test.py:14:15:14:18 | UnaryExpr | USub |
+| test.py:16:11:16:12 | UnaryExpr | UAdd |
+| test.py:16:18:16:21 | UnaryExpr | UAdd |
+| test.py:16:27:16:29 | UnaryExpr | UAdd |
+| test.py:18:10:18:11 | UnaryExpr | USub |
+| test.py:20:10:20:11 | UnaryExpr | USub |
diff --git a/python/ql/test/3/extractor-tests/match-unary-plus/test.py b/python/ql/test/3/extractor-tests/match-unary-plus/test.py
new file mode 100644
index 000000000000..55267d6fff45
--- /dev/null
+++ b/python/ql/test/3/extractor-tests/match-unary-plus/test.py
@@ -0,0 +1,21 @@
+match value:
+    case +1:
+        pass
+    case +1.5:
+        pass
+    case +2j:
+        pass
+    case +1+2j:
+        pass
+    case +1-2j:
+        pass
+    case +0x10 | +0o10 | +0b10:
+        pass
+    case [+0, -0.0]:
+        pass
+    case {+1: x, +1.5: y, +2j: z}:
+        pass
+    case -1+2j:
+        pass
+    case -1-2j:
+        pass
diff --git a/python/ql/test/3/extractor-tests/match-unary-plus/test.ql b/python/ql/test/3/extractor-tests/match-unary-plus/test.ql
new file mode 100644
index 000000000000..9501d354eb13
--- /dev/null
+++ b/python/ql/test/3/extractor-tests/match-unary-plus/test.ql
@@ -0,0 +1,5 @@
+import python
+
+from UnaryExpr expr
+where expr.getLocation().getFile().getShortName() = "test.py"
+select expr, expr.getOp().toString()
diff --git a/python/ql/test/3/extractor-tests/unicode17-identifiers/test.expected b/python/ql/test/3/extractor-tests/unicode17-identifiers/test.expected
new file mode 100644
index 000000000000..066f9a49511b
--- /dev/null
+++ b/python/ql/test/3/extractor-tests/unicode17-identifiers/test.expected
@@ -0,0 +1,13 @@
+| test.py:2:1:2:3 | \u088f | \u088f |
+| test.py:3:1:3:4 | \ufffd | \ufffd |
+| test.py:4:1:4:4 | \ufffd | \ufffd |
+| test.py:5:1:5:4 | \ufffd | \ufffd |
+| test.py:8:1:8:4 | a\u1acf | a\u1acf |
+| test.py:9:1:9:5 | a\ufffd | a\ufffd |
+| test.py:11:1:11:6 | result | result |
+| test.py:11:10:11:12 | \u088f | \u088f |
+| test.py:11:16:11:19 | \ufffd | \ufffd |
+| test.py:11:23:11:26 | \ufffd | \ufffd |
+| test.py:11:30:11:33 | \ufffd | \ufffd |
+| test.py:11:37:11:40 | a\u1acf | a\u1acf |
+| test.py:11:44:11:48 | a\ufffd | a\ufffd |
diff --git a/python/ql/test/3/extractor-tests/unicode17-identifiers/test.py b/python/ql/test/3/extractor-tests/unicode17-identifiers/test.py
new file mode 100644
index 000000000000..ef91ffd3eca9
--- /dev/null
+++ b/python/ql/test/3/extractor-tests/unicode17-identifiers/test.py
@@ -0,0 +1,11 @@
+# Unicode 17 identifier starts: Arabic, Tai Yo, CJK Extension J, and Tolong Siki.
+࢏ = 1
+𞛀 = 2
+𲎰 = 3
+𑶰 = 4
+
+# Unicode 17 identifier continuations: a combining mark and a decimal digit.
+a᫏ = 5
+a𑷠 = 6
+
+result = ࢏ + 𞛀 + 𲎰 + 𑶰 + a᫏ + a𑷠
diff --git a/python/ql/test/3/extractor-tests/unicode17-identifiers/test.ql b/python/ql/test/3/extractor-tests/unicode17-identifiers/test.ql
new file mode 100644
index 000000000000..37fbb5055c29
--- /dev/null
+++ b/python/ql/test/3/extractor-tests/unicode17-identifiers/test.ql
@@ -0,0 +1,5 @@
+import python
+
+from Name name
+where name.getLocation().getFile().getShortName() = "test.py"
+select name, name.getId()
diff --git a/python/ql/test/3/query-tests/Imports/unused/UnusedImport.expected b/python/ql/test/3/query-tests/Imports/unused/UnusedImport.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/ql/test/3/query-tests/Imports/unused/UnusedImport.qlref b/python/ql/test/3/query-tests/Imports/unused/UnusedImport.qlref
new file mode 100644
index 000000000000..e6bb7ab44cb0
--- /dev/null
+++ b/python/ql/test/3/query-tests/Imports/unused/UnusedImport.qlref
@@ -0,0 +1 @@
+Imports/UnusedImport.ql
diff --git a/python/ql/test/3/query-tests/Imports/unused/relaxed_except.py b/python/ql/test/3/query-tests/Imports/unused/relaxed_except.py
new file mode 100644
index 000000000000..f5b1cb036261
--- /dev/null
+++ b/python/ql/test/3/query-tests/Imports/unused/relaxed_except.py
@@ -0,0 +1,9 @@
+# In Python 2, Beta is an alias binding; in Python 3, it is an exception type.
+from relaxed_except_defs import Alpha, Beta
+
+
+def unparenthesized():
+    try:
+        pass
+    except Alpha, Beta:
+        raise
diff --git a/python/ql/test/3/query-tests/Imports/unused/relaxed_except_defs.py b/python/ql/test/3/query-tests/Imports/unused/relaxed_except_defs.py
new file mode 100644
index 000000000000..12a167adf2c9
--- /dev/null
+++ b/python/ql/test/3/query-tests/Imports/unused/relaxed_except_defs.py
@@ -0,0 +1,6 @@
+class Alpha(Exception):
+    pass
+
+
+class Beta(Exception):
+    pass
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected b/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected
index 6de2b27bfa76..646416650866 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected
@@ -1,16 +1,42 @@
+#select
+| TarSlipImprov.py:22:35:22:40 | ControlFlowNode for result | TarSlipImprov.py:15:7:15:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:22:35:22:40 | ControlFlowNode for result | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:15:7:15:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:22:35:22:40 | ControlFlowNode for result | ControlFlowNode for result |
+| TarSlipImprov.py:39:49:39:68 | ControlFlowNode for members_filter1() | TarSlipImprov.py:38:7:38:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:39:49:39:68 | ControlFlowNode for members_filter1() | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:38:7:38:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:39:49:39:68 | ControlFlowNode for members_filter1() | ControlFlowNode for members_filter1() |
+| TarSlipImprov.py:47:21:47:25 | ControlFlowNode for entry | TarSlipImprov.py:43:6:43:38 | ControlFlowNode for Attribute() | TarSlipImprov.py:47:21:47:25 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:43:6:43:38 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:47:21:47:25 | ControlFlowNode for entry | ControlFlowNode for entry |
+| TarSlipImprov.py:58:21:58:25 | ControlFlowNode for entry | TarSlipImprov.py:54:6:54:38 | ControlFlowNode for Attribute() | TarSlipImprov.py:58:21:58:25 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:54:6:54:38 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:58:21:58:25 | ControlFlowNode for entry | ControlFlowNode for entry |
+| TarSlipImprov.py:91:5:91:7 | ControlFlowNode for tar | TarSlipImprov.py:88:6:88:43 | ControlFlowNode for Attribute() | TarSlipImprov.py:91:5:91:7 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:88:6:88:43 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:91:5:91:7 | ControlFlowNode for tar | ControlFlowNode for tar |
+| TarSlipImprov.py:115:9:115:11 | ControlFlowNode for tar | TarSlipImprov.py:111:7:111:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:115:9:115:11 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:111:7:111:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:115:9:115:11 | ControlFlowNode for tar | ControlFlowNode for tar |
+| TarSlipImprov.py:125:36:125:40 | ControlFlowNode for entry | TarSlipImprov.py:123:6:123:29 | ControlFlowNode for Attribute() | TarSlipImprov.py:125:36:125:40 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:123:6:123:29 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:125:36:125:40 | ControlFlowNode for entry | ControlFlowNode for entry |
+| TarSlipImprov.py:130:5:130:7 | ControlFlowNode for tar | TarSlipImprov.py:129:6:129:26 | ControlFlowNode for Attribute() | TarSlipImprov.py:130:5:130:7 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:129:6:129:26 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:130:5:130:7 | ControlFlowNode for tar | ControlFlowNode for tar |
+| TarSlipImprov.py:134:1:134:3 | ControlFlowNode for tar | TarSlipImprov.py:133:7:133:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:134:1:134:3 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:133:7:133:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:134:1:134:3 | ControlFlowNode for tar | ControlFlowNode for tar |
+| TarSlipImprov.py:143:36:143:40 | ControlFlowNode for entry | TarSlipImprov.py:141:6:141:29 | ControlFlowNode for Attribute() | TarSlipImprov.py:143:36:143:40 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:141:6:141:29 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:143:36:143:40 | ControlFlowNode for entry | ControlFlowNode for entry |
+| TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | TarSlipImprov.py:151:22:151:49 | ControlFlowNode for Attribute() | TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:151:22:151:49 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | ControlFlowNode for tarc |
+| TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | TarSlipImprov.py:159:26:159:51 | ControlFlowNode for Attribute() | TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:159:26:159:51 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | ControlFlowNode for tarc |
+| TarSlipImprov.py:178:36:178:40 | ControlFlowNode for entry | TarSlipImprov.py:176:6:176:31 | ControlFlowNode for Attribute() | TarSlipImprov.py:178:36:178:40 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:176:6:176:31 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:178:36:178:40 | ControlFlowNode for entry | ControlFlowNode for entry |
+| TarSlipImprov.py:184:21:184:25 | ControlFlowNode for entry | TarSlipImprov.py:182:6:182:31 | ControlFlowNode for Attribute() | TarSlipImprov.py:184:21:184:25 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:182:6:182:31 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:184:21:184:25 | ControlFlowNode for entry | ControlFlowNode for entry |
+| TarSlipImprov.py:189:1:189:3 | ControlFlowNode for tar | TarSlipImprov.py:188:7:188:27 | ControlFlowNode for Attribute() | TarSlipImprov.py:189:1:189:3 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:188:7:188:27 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:189:1:189:3 | ControlFlowNode for tar | ControlFlowNode for tar |
+| TarSlipImprov.py:194:49:194:51 | ControlFlowNode for tar | TarSlipImprov.py:193:6:193:31 | ControlFlowNode for Attribute() | TarSlipImprov.py:194:49:194:51 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:193:6:193:31 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:194:49:194:51 | ControlFlowNode for tar | ControlFlowNode for tar |
+| TarSlipImprov.py:211:5:211:7 | ControlFlowNode for tar | TarSlipImprov.py:210:6:210:43 | ControlFlowNode for Attribute() | TarSlipImprov.py:211:5:211:7 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:210:6:210:43 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:211:5:211:7 | ControlFlowNode for tar | ControlFlowNode for tar |
+| TarSlipImprov.py:236:44:236:50 | ControlFlowNode for members | TarSlipImprov.py:231:6:231:38 | ControlFlowNode for Attribute() | TarSlipImprov.py:236:44:236:50 | ControlFlowNode for members | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:231:6:231:38 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:236:44:236:50 | ControlFlowNode for members | ControlFlowNode for members |
+| TarSlipImprov.py:254:1:254:31 | ControlFlowNode for Attribute() | TarSlipImprov.py:254:1:254:31 | ControlFlowNode for Attribute() | TarSlipImprov.py:254:1:254:31 | ControlFlowNode for Attribute() | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:254:1:254:31 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:254:1:254:31 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() |
+| TarSlipImprov.py:261:25:261:29 | ControlFlowNode for entry | TarSlipImprov.py:258:6:258:26 | ControlFlowNode for Attribute() | TarSlipImprov.py:261:25:261:29 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:258:6:258:26 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:261:25:261:29 | ControlFlowNode for entry | ControlFlowNode for entry |
+| TarSlipImprov.py:268:21:268:25 | ControlFlowNode for entry | TarSlipImprov.py:264:6:264:38 | ControlFlowNode for Attribute() | TarSlipImprov.py:268:21:268:25 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:264:6:264:38 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:268:21:268:25 | ControlFlowNode for entry | ControlFlowNode for entry |
+| TarSlipImprov.py:274:25:274:29 | ControlFlowNode for entry | TarSlipImprov.py:271:6:271:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:274:25:274:29 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:271:6:271:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:274:25:274:29 | ControlFlowNode for entry | ControlFlowNode for entry |
+| TarSlipImprov.py:280:21:280:25 | ControlFlowNode for entry | TarSlipImprov.py:276:6:276:38 | ControlFlowNode for Attribute() | TarSlipImprov.py:280:21:280:25 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:276:6:276:38 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:280:21:280:25 | ControlFlowNode for entry | ControlFlowNode for entry |
+| TarSlipImprov.py:284:5:284:7 | ControlFlowNode for tar | TarSlipImprov.py:283:6:283:51 | ControlFlowNode for Attribute() | TarSlipImprov.py:284:5:284:7 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:283:6:283:51 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:284:5:284:7 | ControlFlowNode for tar | ControlFlowNode for tar |
+| TarSlipImprov.py:288:49:288:51 | ControlFlowNode for tar | TarSlipImprov.py:287:7:287:28 | ControlFlowNode for Attribute() | TarSlipImprov.py:288:49:288:51 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:287:7:287:28 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:288:49:288:51 | ControlFlowNode for tar | ControlFlowNode for tar |
+| TarSlipImprov.py:293:1:293:3 | ControlFlowNode for tar | TarSlipImprov.py:292:7:292:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:293:1:293:3 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:292:7:292:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:293:1:293:3 | ControlFlowNode for tar | ControlFlowNode for tar |
+| TarSlipImprov.py:301:49:301:51 | ControlFlowNode for tar | TarSlipImprov.py:300:6:300:51 | ControlFlowNode for Attribute() | TarSlipImprov.py:301:49:301:51 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:300:6:300:51 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:301:49:301:51 | ControlFlowNode for tar | ControlFlowNode for tar |
+| TarSlipImprov.py:310:49:310:54 | ControlFlowNode for result | TarSlipImprov.py:304:7:304:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:310:49:310:54 | ControlFlowNode for result | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:304:7:304:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:310:49:310:54 | ControlFlowNode for result | ControlFlowNode for result |
+| TarSlipImprov.py:316:1:316:46 | ControlFlowNode for Attribute() | TarSlipImprov.py:316:1:316:46 | ControlFlowNode for Attribute() | TarSlipImprov.py:316:1:316:46 | ControlFlowNode for Attribute() | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:316:1:316:46 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:316:1:316:46 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() |
 edges
 | TarSlipImprov.py:15:1:15:3 | ControlFlowNode for tar | TarSlipImprov.py:17:5:17:10 | ControlFlowNode for member | provenance |  |
 | TarSlipImprov.py:15:7:15:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:15:1:15:3 | ControlFlowNode for tar | provenance |  |
 | TarSlipImprov.py:17:5:17:10 | ControlFlowNode for member | TarSlipImprov.py:20:19:20:24 | ControlFlowNode for member | provenance |  |
-| TarSlipImprov.py:20:5:20:10 | [post] ControlFlowNode for result | TarSlipImprov.py:22:35:22:40 | ControlFlowNode for result | provenance |  |
 | TarSlipImprov.py:20:5:20:10 | [post] ControlFlowNode for result [List element] | TarSlipImprov.py:22:35:22:40 | ControlFlowNode for result | provenance |  |
-| TarSlipImprov.py:20:19:20:24 | ControlFlowNode for member | TarSlipImprov.py:20:5:20:10 | [post] ControlFlowNode for result | provenance | list.append |
 | TarSlipImprov.py:20:19:20:24 | ControlFlowNode for member | TarSlipImprov.py:20:5:20:10 | [post] ControlFlowNode for result [List element] | provenance | list.append |
 | TarSlipImprov.py:26:21:26:27 | ControlFlowNode for tarfile | TarSlipImprov.py:28:9:28:14 | ControlFlowNode for member | provenance |  |
 | TarSlipImprov.py:28:9:28:14 | ControlFlowNode for member | TarSlipImprov.py:35:23:35:28 | ControlFlowNode for member | provenance |  |
-| TarSlipImprov.py:35:9:35:14 | [post] ControlFlowNode for result | TarSlipImprov.py:36:12:36:17 | ControlFlowNode for result | provenance |  |
 | TarSlipImprov.py:35:9:35:14 | [post] ControlFlowNode for result [List element] | TarSlipImprov.py:36:12:36:17 | ControlFlowNode for result [List element] | provenance |  |
-| TarSlipImprov.py:35:23:35:28 | ControlFlowNode for member | TarSlipImprov.py:35:9:35:14 | [post] ControlFlowNode for result | provenance | list.append |
 | TarSlipImprov.py:35:23:35:28 | ControlFlowNode for member | TarSlipImprov.py:35:9:35:14 | [post] ControlFlowNode for result [List element] | provenance | list.append |
 | TarSlipImprov.py:38:1:38:3 | ControlFlowNode for tar | TarSlipImprov.py:39:65:39:67 | ControlFlowNode for tar | provenance |  |
 | TarSlipImprov.py:38:7:38:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:38:1:38:3 | ControlFlowNode for tar | provenance |  |
@@ -66,9 +92,7 @@ edges
 | TarSlipImprov.py:231:6:231:38 | ControlFlowNode for Attribute() | TarSlipImprov.py:231:43:231:52 | ControlFlowNode for corpus_tar | provenance |  |
 | TarSlipImprov.py:231:43:231:52 | ControlFlowNode for corpus_tar | TarSlipImprov.py:233:9:233:9 | ControlFlowNode for f | provenance |  |
 | TarSlipImprov.py:233:9:233:9 | ControlFlowNode for f | TarSlipImprov.py:235:28:235:28 | ControlFlowNode for f | provenance |  |
-| TarSlipImprov.py:235:13:235:19 | [post] ControlFlowNode for members | TarSlipImprov.py:236:44:236:50 | ControlFlowNode for members | provenance |  |
 | TarSlipImprov.py:235:13:235:19 | [post] ControlFlowNode for members [List element] | TarSlipImprov.py:236:44:236:50 | ControlFlowNode for members | provenance |  |
-| TarSlipImprov.py:235:28:235:28 | ControlFlowNode for f | TarSlipImprov.py:235:13:235:19 | [post] ControlFlowNode for members | provenance | list.append |
 | TarSlipImprov.py:235:28:235:28 | ControlFlowNode for f | TarSlipImprov.py:235:13:235:19 | [post] ControlFlowNode for members [List element] | provenance | list.append |
 | TarSlipImprov.py:258:6:258:26 | ControlFlowNode for Attribute() | TarSlipImprov.py:258:31:258:33 | ControlFlowNode for tar | provenance |  |
 | TarSlipImprov.py:258:31:258:33 | ControlFlowNode for tar | TarSlipImprov.py:259:9:259:13 | ControlFlowNode for entry | provenance |  |
@@ -93,24 +117,19 @@ edges
 | TarSlipImprov.py:304:1:304:3 | ControlFlowNode for tar | TarSlipImprov.py:306:5:306:10 | ControlFlowNode for member | provenance |  |
 | TarSlipImprov.py:304:7:304:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:304:1:304:3 | ControlFlowNode for tar | provenance |  |
 | TarSlipImprov.py:306:5:306:10 | ControlFlowNode for member | TarSlipImprov.py:309:19:309:24 | ControlFlowNode for member | provenance |  |
-| TarSlipImprov.py:309:5:309:10 | [post] ControlFlowNode for result | TarSlipImprov.py:310:49:310:54 | ControlFlowNode for result | provenance |  |
 | TarSlipImprov.py:309:5:309:10 | [post] ControlFlowNode for result [List element] | TarSlipImprov.py:310:49:310:54 | ControlFlowNode for result | provenance |  |
-| TarSlipImprov.py:309:19:309:24 | ControlFlowNode for member | TarSlipImprov.py:309:5:309:10 | [post] ControlFlowNode for result | provenance | list.append |
 | TarSlipImprov.py:309:19:309:24 | ControlFlowNode for member | TarSlipImprov.py:309:5:309:10 | [post] ControlFlowNode for result [List element] | provenance | list.append |
 nodes
 | TarSlipImprov.py:15:1:15:3 | ControlFlowNode for tar | semmle.label | ControlFlowNode for tar |
 | TarSlipImprov.py:15:7:15:39 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | TarSlipImprov.py:17:5:17:10 | ControlFlowNode for member | semmle.label | ControlFlowNode for member |
-| TarSlipImprov.py:20:5:20:10 | [post] ControlFlowNode for result | semmle.label | [post] ControlFlowNode for result |
 | TarSlipImprov.py:20:5:20:10 | [post] ControlFlowNode for result [List element] | semmle.label | [post] ControlFlowNode for result [List element] |
 | TarSlipImprov.py:20:19:20:24 | ControlFlowNode for member | semmle.label | ControlFlowNode for member |
 | TarSlipImprov.py:22:35:22:40 | ControlFlowNode for result | semmle.label | ControlFlowNode for result |
 | TarSlipImprov.py:26:21:26:27 | ControlFlowNode for tarfile | semmle.label | ControlFlowNode for tarfile |
 | TarSlipImprov.py:28:9:28:14 | ControlFlowNode for member | semmle.label | ControlFlowNode for member |
-| TarSlipImprov.py:35:9:35:14 | [post] ControlFlowNode for result | semmle.label | [post] ControlFlowNode for result |
 | TarSlipImprov.py:35:9:35:14 | [post] ControlFlowNode for result [List element] | semmle.label | [post] ControlFlowNode for result [List element] |
 | TarSlipImprov.py:35:23:35:28 | ControlFlowNode for member | semmle.label | ControlFlowNode for member |
-| TarSlipImprov.py:36:12:36:17 | ControlFlowNode for result | semmle.label | ControlFlowNode for result |
 | TarSlipImprov.py:36:12:36:17 | ControlFlowNode for result [List element] | semmle.label | ControlFlowNode for result [List element] |
 | TarSlipImprov.py:38:1:38:3 | ControlFlowNode for tar | semmle.label | ControlFlowNode for tar |
 | TarSlipImprov.py:38:7:38:39 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
@@ -179,7 +198,6 @@ nodes
 | TarSlipImprov.py:231:6:231:38 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | TarSlipImprov.py:231:43:231:52 | ControlFlowNode for corpus_tar | semmle.label | ControlFlowNode for corpus_tar |
 | TarSlipImprov.py:233:9:233:9 | ControlFlowNode for f | semmle.label | ControlFlowNode for f |
-| TarSlipImprov.py:235:13:235:19 | [post] ControlFlowNode for members | semmle.label | [post] ControlFlowNode for members |
 | TarSlipImprov.py:235:13:235:19 | [post] ControlFlowNode for members [List element] | semmle.label | [post] ControlFlowNode for members [List element] |
 | TarSlipImprov.py:235:28:235:28 | ControlFlowNode for f | semmle.label | ControlFlowNode for f |
 | TarSlipImprov.py:236:44:236:50 | ControlFlowNode for members | semmle.label | ControlFlowNode for members |
@@ -215,41 +233,9 @@ nodes
 | TarSlipImprov.py:304:1:304:3 | ControlFlowNode for tar | semmle.label | ControlFlowNode for tar |
 | TarSlipImprov.py:304:7:304:39 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 | TarSlipImprov.py:306:5:306:10 | ControlFlowNode for member | semmle.label | ControlFlowNode for member |
-| TarSlipImprov.py:309:5:309:10 | [post] ControlFlowNode for result | semmle.label | [post] ControlFlowNode for result |
 | TarSlipImprov.py:309:5:309:10 | [post] ControlFlowNode for result [List element] | semmle.label | [post] ControlFlowNode for result [List element] |
 | TarSlipImprov.py:309:19:309:24 | ControlFlowNode for member | semmle.label | ControlFlowNode for member |
 | TarSlipImprov.py:310:49:310:54 | ControlFlowNode for result | semmle.label | ControlFlowNode for result |
 | TarSlipImprov.py:316:1:316:46 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
 subpaths
-| TarSlipImprov.py:39:65:39:67 | ControlFlowNode for tar | TarSlipImprov.py:26:21:26:27 | ControlFlowNode for tarfile | TarSlipImprov.py:36:12:36:17 | ControlFlowNode for result | TarSlipImprov.py:39:49:39:68 | ControlFlowNode for members_filter1() |
 | TarSlipImprov.py:39:65:39:67 | ControlFlowNode for tar | TarSlipImprov.py:26:21:26:27 | ControlFlowNode for tarfile | TarSlipImprov.py:36:12:36:17 | ControlFlowNode for result [List element] | TarSlipImprov.py:39:49:39:68 | ControlFlowNode for members_filter1() |
-#select
-| TarSlipImprov.py:22:35:22:40 | ControlFlowNode for result | TarSlipImprov.py:15:7:15:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:22:35:22:40 | ControlFlowNode for result | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:15:7:15:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:22:35:22:40 | ControlFlowNode for result | ControlFlowNode for result |
-| TarSlipImprov.py:39:49:39:68 | ControlFlowNode for members_filter1() | TarSlipImprov.py:38:7:38:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:39:49:39:68 | ControlFlowNode for members_filter1() | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:38:7:38:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:39:49:39:68 | ControlFlowNode for members_filter1() | ControlFlowNode for members_filter1() |
-| TarSlipImprov.py:47:21:47:25 | ControlFlowNode for entry | TarSlipImprov.py:43:6:43:38 | ControlFlowNode for Attribute() | TarSlipImprov.py:47:21:47:25 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:43:6:43:38 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:47:21:47:25 | ControlFlowNode for entry | ControlFlowNode for entry |
-| TarSlipImprov.py:58:21:58:25 | ControlFlowNode for entry | TarSlipImprov.py:54:6:54:38 | ControlFlowNode for Attribute() | TarSlipImprov.py:58:21:58:25 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:54:6:54:38 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:58:21:58:25 | ControlFlowNode for entry | ControlFlowNode for entry |
-| TarSlipImprov.py:91:5:91:7 | ControlFlowNode for tar | TarSlipImprov.py:88:6:88:43 | ControlFlowNode for Attribute() | TarSlipImprov.py:91:5:91:7 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:88:6:88:43 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:91:5:91:7 | ControlFlowNode for tar | ControlFlowNode for tar |
-| TarSlipImprov.py:115:9:115:11 | ControlFlowNode for tar | TarSlipImprov.py:111:7:111:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:115:9:115:11 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:111:7:111:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:115:9:115:11 | ControlFlowNode for tar | ControlFlowNode for tar |
-| TarSlipImprov.py:125:36:125:40 | ControlFlowNode for entry | TarSlipImprov.py:123:6:123:29 | ControlFlowNode for Attribute() | TarSlipImprov.py:125:36:125:40 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:123:6:123:29 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:125:36:125:40 | ControlFlowNode for entry | ControlFlowNode for entry |
-| TarSlipImprov.py:130:5:130:7 | ControlFlowNode for tar | TarSlipImprov.py:129:6:129:26 | ControlFlowNode for Attribute() | TarSlipImprov.py:130:5:130:7 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:129:6:129:26 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:130:5:130:7 | ControlFlowNode for tar | ControlFlowNode for tar |
-| TarSlipImprov.py:134:1:134:3 | ControlFlowNode for tar | TarSlipImprov.py:133:7:133:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:134:1:134:3 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:133:7:133:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:134:1:134:3 | ControlFlowNode for tar | ControlFlowNode for tar |
-| TarSlipImprov.py:143:36:143:40 | ControlFlowNode for entry | TarSlipImprov.py:141:6:141:29 | ControlFlowNode for Attribute() | TarSlipImprov.py:143:36:143:40 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:141:6:141:29 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:143:36:143:40 | ControlFlowNode for entry | ControlFlowNode for entry |
-| TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | TarSlipImprov.py:151:22:151:49 | ControlFlowNode for Attribute() | TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:151:22:151:49 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | ControlFlowNode for tarc |
-| TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | TarSlipImprov.py:159:26:159:51 | ControlFlowNode for Attribute() | TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:159:26:159:51 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | ControlFlowNode for tarc |
-| TarSlipImprov.py:178:36:178:40 | ControlFlowNode for entry | TarSlipImprov.py:176:6:176:31 | ControlFlowNode for Attribute() | TarSlipImprov.py:178:36:178:40 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:176:6:176:31 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:178:36:178:40 | ControlFlowNode for entry | ControlFlowNode for entry |
-| TarSlipImprov.py:184:21:184:25 | ControlFlowNode for entry | TarSlipImprov.py:182:6:182:31 | ControlFlowNode for Attribute() | TarSlipImprov.py:184:21:184:25 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:182:6:182:31 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:184:21:184:25 | ControlFlowNode for entry | ControlFlowNode for entry |
-| TarSlipImprov.py:189:1:189:3 | ControlFlowNode for tar | TarSlipImprov.py:188:7:188:27 | ControlFlowNode for Attribute() | TarSlipImprov.py:189:1:189:3 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:188:7:188:27 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:189:1:189:3 | ControlFlowNode for tar | ControlFlowNode for tar |
-| TarSlipImprov.py:194:49:194:51 | ControlFlowNode for tar | TarSlipImprov.py:193:6:193:31 | ControlFlowNode for Attribute() | TarSlipImprov.py:194:49:194:51 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:193:6:193:31 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:194:49:194:51 | ControlFlowNode for tar | ControlFlowNode for tar |
-| TarSlipImprov.py:211:5:211:7 | ControlFlowNode for tar | TarSlipImprov.py:210:6:210:43 | ControlFlowNode for Attribute() | TarSlipImprov.py:211:5:211:7 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:210:6:210:43 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:211:5:211:7 | ControlFlowNode for tar | ControlFlowNode for tar |
-| TarSlipImprov.py:236:44:236:50 | ControlFlowNode for members | TarSlipImprov.py:231:6:231:38 | ControlFlowNode for Attribute() | TarSlipImprov.py:236:44:236:50 | ControlFlowNode for members | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:231:6:231:38 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:236:44:236:50 | ControlFlowNode for members | ControlFlowNode for members |
-| TarSlipImprov.py:254:1:254:31 | ControlFlowNode for Attribute() | TarSlipImprov.py:254:1:254:31 | ControlFlowNode for Attribute() | TarSlipImprov.py:254:1:254:31 | ControlFlowNode for Attribute() | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:254:1:254:31 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:254:1:254:31 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() |
-| TarSlipImprov.py:261:25:261:29 | ControlFlowNode for entry | TarSlipImprov.py:258:6:258:26 | ControlFlowNode for Attribute() | TarSlipImprov.py:261:25:261:29 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:258:6:258:26 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:261:25:261:29 | ControlFlowNode for entry | ControlFlowNode for entry |
-| TarSlipImprov.py:268:21:268:25 | ControlFlowNode for entry | TarSlipImprov.py:264:6:264:38 | ControlFlowNode for Attribute() | TarSlipImprov.py:268:21:268:25 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:264:6:264:38 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:268:21:268:25 | ControlFlowNode for entry | ControlFlowNode for entry |
-| TarSlipImprov.py:274:25:274:29 | ControlFlowNode for entry | TarSlipImprov.py:271:6:271:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:274:25:274:29 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:271:6:271:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:274:25:274:29 | ControlFlowNode for entry | ControlFlowNode for entry |
-| TarSlipImprov.py:280:21:280:25 | ControlFlowNode for entry | TarSlipImprov.py:276:6:276:38 | ControlFlowNode for Attribute() | TarSlipImprov.py:280:21:280:25 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:276:6:276:38 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:280:21:280:25 | ControlFlowNode for entry | ControlFlowNode for entry |
-| TarSlipImprov.py:284:5:284:7 | ControlFlowNode for tar | TarSlipImprov.py:283:6:283:51 | ControlFlowNode for Attribute() | TarSlipImprov.py:284:5:284:7 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:283:6:283:51 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:284:5:284:7 | ControlFlowNode for tar | ControlFlowNode for tar |
-| TarSlipImprov.py:288:49:288:51 | ControlFlowNode for tar | TarSlipImprov.py:287:7:287:28 | ControlFlowNode for Attribute() | TarSlipImprov.py:288:49:288:51 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:287:7:287:28 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:288:49:288:51 | ControlFlowNode for tar | ControlFlowNode for tar |
-| TarSlipImprov.py:293:1:293:3 | ControlFlowNode for tar | TarSlipImprov.py:292:7:292:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:293:1:293:3 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:292:7:292:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:293:1:293:3 | ControlFlowNode for tar | ControlFlowNode for tar |
-| TarSlipImprov.py:301:49:301:51 | ControlFlowNode for tar | TarSlipImprov.py:300:6:300:51 | ControlFlowNode for Attribute() | TarSlipImprov.py:301:49:301:51 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:300:6:300:51 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:301:49:301:51 | ControlFlowNode for tar | ControlFlowNode for tar |
-| TarSlipImprov.py:310:49:310:54 | ControlFlowNode for result | TarSlipImprov.py:304:7:304:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:310:49:310:54 | ControlFlowNode for result | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:304:7:304:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:310:49:310:54 | ControlFlowNode for result | ControlFlowNode for result |
-| TarSlipImprov.py:316:1:316:46 | ControlFlowNode for Attribute() | TarSlipImprov.py:316:1:316:46 | ControlFlowNode for Attribute() | TarSlipImprov.py:316:1:316:46 | ControlFlowNode for Attribute() | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:316:1:316:46 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:316:1:316:46 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() |
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
index ccc2daba50bf..17cc83ec5329 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.expected
@@ -92,9 +92,7 @@ edges
 | UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | UnsafeUnpack.py:161:25:161:46 | ControlFlowNode for Attribute() | provenance | MaD:1 |
 | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | UnsafeUnpack.py:166:37:166:42 | ControlFlowNode for member | provenance |  |
 | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | provenance |  |
-| UnsafeUnpack.py:166:23:166:28 | [post] ControlFlowNode for result | UnsafeUnpack.py:167:67:167:72 | ControlFlowNode for result | provenance |  |
 | UnsafeUnpack.py:166:23:166:28 | [post] ControlFlowNode for result [List element] | UnsafeUnpack.py:167:67:167:72 | ControlFlowNode for result | provenance |  |
-| UnsafeUnpack.py:166:37:166:42 | ControlFlowNode for member | UnsafeUnpack.py:166:23:166:28 | [post] ControlFlowNode for result | provenance | list.append |
 | UnsafeUnpack.py:166:37:166:42 | ControlFlowNode for member | UnsafeUnpack.py:166:23:166:28 | [post] ControlFlowNode for result [List element] | provenance | list.append |
 | UnsafeUnpack.py:171:1:171:8 | ControlFlowNode for response | UnsafeUnpack.py:174:15:174:22 | ControlFlowNode for response | provenance |  |
 | UnsafeUnpack.py:171:12:171:50 | ControlFlowNode for Attribute() | UnsafeUnpack.py:171:1:171:8 | ControlFlowNode for response | provenance |  |
@@ -190,7 +188,6 @@ nodes
 | UnsafeUnpack.py:161:38:161:45 | ControlFlowNode for savepath | semmle.label | ControlFlowNode for savepath |
 | UnsafeUnpack.py:163:23:163:28 | ControlFlowNode for member | semmle.label | ControlFlowNode for member |
 | UnsafeUnpack.py:163:33:163:35 | ControlFlowNode for tar | semmle.label | ControlFlowNode for tar |
-| UnsafeUnpack.py:166:23:166:28 | [post] ControlFlowNode for result | semmle.label | [post] ControlFlowNode for result |
 | UnsafeUnpack.py:166:23:166:28 | [post] ControlFlowNode for result [List element] | semmle.label | [post] ControlFlowNode for result [List element] |
 | UnsafeUnpack.py:166:37:166:42 | ControlFlowNode for member | semmle.label | ControlFlowNode for member |
 | UnsafeUnpack.py:167:67:167:72 | ControlFlowNode for result | semmle.label | ControlFlowNode for result |
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltInjection.expected b/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltInjection.expected
index 28c85388a97f..053cd7a574bc 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltInjection.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltInjection.expected
@@ -71,7 +71,9 @@ edges
 | xsltInjection.py:46:38:46:48 | ControlFlowNode for xsltStrings [List element] | xsltInjection.py:46:17:46:49 | ControlFlowNode for Attribute() | provenance |  |
 | xsltInjection.py:46:38:46:48 | ControlFlowNode for xsltStrings [List element] | xsltInjection.py:46:17:46:49 | ControlFlowNode for Attribute() | provenance | Config |
 | xsltInjection.py:46:38:46:48 | ControlFlowNode for xsltStrings [List element] | xsltInjection.py:46:17:46:49 | ControlFlowNode for Attribute() | provenance | Decoding-XML |
-| xsltInjection.py:46:38:46:48 | ControlFlowNode for xsltStrings [List element] | xsltInjection.py:46:17:46:49 | ControlFlowNode for Attribute() | provenance | MaD:58660 |
+| xsltInjection.py:46:38:46:48 | ControlFlowNode for xsltStrings [List element] | xsltInjection.py:46:17:46:49 | ControlFlowNode for Attribute() | provenance | MaD:1 |
+models
+| 1 | Summary: lxml; Member[etree].Member[fromstringlist]; Argument[0,strings:].ListElement; ReturnValue; taint |
 nodes
 | xslt.py:3:26:3:32 | ControlFlowNode for ImportMember | semmle.label | ControlFlowNode for ImportMember |
 | xslt.py:3:26:3:32 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltInjection.qlref b/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltInjection.qlref
index 5bde608133c6..92d16b1b04dc 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltInjection.qlref
+++ b/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltInjection.qlref
@@ -1,2 +1,4 @@
 query: experimental/Security/CWE-091/XsltInjection.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test.py b/python/ql/test/library-tests/ApiGraphs/py3/test.py
index 4c48e1f1daee..64e7c2a0a9c7 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test.py
@@ -119,3 +119,12 @@ def python2_style():
     # In Python 3, `__builtin__` has no special meaning.
     from __builtin__ import open # $ use=moduleImport("__builtin__").getMember("open")
     open("hello.txt") # $ use=moduleImport("__builtin__").getMember("open").getReturn()
+
+def python315_builtins():
+    frozendict(key="value") # $ use=moduleImport("builtins").getMember("frozendict").getReturn()
+    sentinel("MISSING") # $ use=moduleImport("builtins").getMember("sentinel").getReturn()
+
+    freeze = frozendict # $ use=moduleImport("builtins").getMember("frozendict")
+    make_sentinel = sentinel # $ use=moduleImport("builtins").getMember("sentinel")
+    freeze(key="value") # $ use=moduleImport("builtins").getMember("frozendict").getReturn()
+    make_sentinel("UNSET") # $ use=moduleImport("builtins").getMember("sentinel").getReturn()
diff --git a/python/ql/test/library-tests/ControlFlow/shared-cfg-exceptions/ExceptionReachabilityTest.expected b/python/ql/test/library-tests/ControlFlow/shared-cfg-exceptions/ExceptionReachabilityTest.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/ql/test/library-tests/ControlFlow/shared-cfg-exceptions/ExceptionReachabilityTest.ql b/python/ql/test/library-tests/ControlFlow/shared-cfg-exceptions/ExceptionReachabilityTest.ql
new file mode 100644
index 000000000000..c98e73336676
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/shared-cfg-exceptions/ExceptionReachabilityTest.ql
@@ -0,0 +1,29 @@
+/**
+ * Inline-expectations test for exception-handler reachability in the shared CFG.
+ */
+
+import python
+import semmle.python.controlflow.internal.AstNodeImpl as CfgImpl
+import semmle.python.controlflow.internal.Cfg as Cfg
+import utils.test.InlineExpectationsTest
+
+module ExceptionReachabilityTest implements TestSig {
+  string getARelevantTag() { result = "exception-handler" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(
+      Expr source, ExceptStmt handler, Cfg::ControlFlowNode sourceCfg,
+      Cfg::ControlFlowNode handlerEntry
+    |
+      sourceCfg.getNode() = source and
+      handlerEntry = sourceCfg.getAnExceptionalSuccessor() and
+      CfgImpl::astNodeToPyNode(handlerEntry.getAstNode()) = handler and
+      location = source.getLocation() and
+      element = source.toString() and
+      tag = "exception-handler" and
+      value = handler.getType().toString()
+    )
+  }
+}
+
+import MakeTest<ExceptionReachabilityTest>
diff --git a/python/ql/test/library-tests/ControlFlow/shared-cfg-exceptions/test.py b/python/ql/test/library-tests/ControlFlow/shared-cfg-exceptions/test.py
new file mode 100644
index 000000000000..0e55eba97407
--- /dev/null
+++ b/python/ql/test/library-tests/ControlFlow/shared-cfg-exceptions/test.py
@@ -0,0 +1,12 @@
+def generator():
+    try:
+        yield  # $ exception-handler=GeneratorExit
+    except GeneratorExit:
+        return
+
+
+def load_module():
+    try:
+        import unavailable_module  # $ exception-handler=ImportError
+    except ImportError:
+        return None
diff --git a/python/ql/test/library-tests/dataflow/coverage/test_builtins.py b/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
index 7ef7866ec175..bff447335449 100644
--- a/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
+++ b/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
@@ -181,6 +181,16 @@ def test_list_append():
     l.append(SOURCE)
     SINK(l[1]) # $ flow="SOURCE, l:-1 -> l[1]"
 
+def test_list_extend():
+    l = [NONSOURCE]
+    l.extend([SOURCE])
+    SINK(l[1]) # $ flow="SOURCE, l:-1 -> l[1]"
+
+def test_list_insert():
+    l = [NONSOURCE]
+    l.insert(0, SOURCE)
+    SINK(l[0]) # $ flow="SOURCE, l:-1 -> l[0]"
+
 ### Set
 
 def test_set_pop():
diff --git a/python/ql/test/library-tests/dataflow/frozendict/NormalDataflowTest.expected b/python/ql/test/library-tests/dataflow/frozendict/NormalDataflowTest.expected
new file mode 100644
index 000000000000..2fad7bb9a843
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/frozendict/NormalDataflowTest.expected
@@ -0,0 +1,2 @@
+missingAnnotationOnSink
+testFailures
diff --git a/python/ql/test/library-tests/dataflow/frozendict/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/frozendict/NormalDataflowTest.ql
new file mode 100644
index 000000000000..1e0627bfcca1
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/frozendict/NormalDataflowTest.ql
@@ -0,0 +1,2 @@
+import python
+import utils.test.dataflow.NormalDataflowTest
diff --git a/python/ql/test/library-tests/dataflow/frozendict/options b/python/ql/test/library-tests/dataflow/frozendict/options
new file mode 100644
index 000000000000..89369a90996b
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/frozendict/options
@@ -0,0 +1 @@
+semmle-extractor-options: --lang=3 --max-import-depth=1
diff --git a/python/ql/test/library-tests/dataflow/frozendict/test.py b/python/ql/test/library-tests/dataflow/frozendict/test.py
new file mode 100644
index 000000000000..05346736e240
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/frozendict/test.py
@@ -0,0 +1,96 @@
+def from_keywords():
+    frozen = frozendict(tainted=SOURCE, clean=NONSOURCE)
+    SINK(frozen["tainted"]) # $ flow="SOURCE, l:-1 -> frozen['tainted']"
+    SINK_F(frozen["clean"])
+
+
+def from_mapping():
+    frozen = frozendict({"tainted": SOURCE, "clean": NONSOURCE}, extra=NONSOURCE)
+    SINK(frozen["tainted"]) # $ flow="SOURCE, l:-1 -> frozen['tainted']"
+    SINK_F(frozen["clean"])
+    SINK_F(frozen["extra"])
+
+
+def from_pairs():
+    frozen = frozendict([("key", SOURCE)])
+    SINK(frozen["key"]) # $ flow="SOURCE, l:-1 -> frozen['key']"
+
+
+def from_frozendict():
+    original = frozendict(tainted=SOURCE, clean=NONSOURCE)
+    frozen = frozendict(original)
+    SINK(frozen["tainted"]) # $ flow="SOURCE, l:-2 -> frozen['tainted']"
+    SINK_F(frozen["clean"])
+
+
+def from_unpacked_keywords():
+    frozen = frozendict(**{"tainted": SOURCE, "clean": NONSOURCE})
+    SINK(frozen["tainted"]) # $ MISSING: flow="SOURCE, l:-1 -> frozen['tainted']"
+    SINK_F(frozen["clean"])
+
+    # Keyword unpacking has the same limitation for dict.
+    mutable = dict(**{"tainted": SOURCE, "clean": NONSOURCE})
+    SINK(mutable["tainted"]) # $ MISSING: flow="SOURCE, l:-1 -> mutable['tainted']"
+    SINK_F(mutable["clean"])
+
+
+def nested_contents():
+    frozen = frozendict(nested={"key": SOURCE})
+    SINK(frozen["nested"]["key"]) # $ flow="SOURCE, l:-1 -> frozen['nested']['key']"
+
+
+def qualified_constructor():
+    import builtins
+    frozen = builtins.frozendict(key=SOURCE)
+    SINK(frozen["key"]) # $ flow="SOURCE, l:-1 -> frozen['key']"
+
+
+def imported_constructor():
+    from builtins import frozendict as freeze
+    frozen = freeze(key=SOURCE)
+    SINK(frozen["key"]) # $ flow="SOURCE, l:-1 -> frozen['key']"
+
+
+def aliased_constructor():
+    freeze = frozendict
+    frozen = freeze(key=SOURCE)
+    SINK(frozen["key"]) # $ flow="SOURCE, l:-1 -> frozen['key']"
+
+
+def constructor_callback():
+    frozen = next(map(frozendict, [{"key": SOURCE}]))
+    SINK(frozen["key"]) # $ flow="SOURCE, l:-1 -> frozen['key']"
+
+
+def mapping_methods():
+    frozen = frozendict(tainted=SOURCE, clean=NONSOURCE)
+    SINK(frozen.get("tainted")) # $ flow="SOURCE, l:-1 -> frozen.get(..)"
+    SINK_F(frozen.get("clean"))
+    SINK_F(frozen.get("missing"))
+
+    copied = frozen.copy()
+    SINK(copied["tainted"]) # $ flow="SOURCE, l:-6 -> copied['tainted']"
+    SINK_F(copied["clean"])
+
+    values = list(frozen.values())
+    SINK(values[0]) # $ flow="SOURCE, l:-10 -> values[0]"
+
+    items = list(frozen.items())
+    SINK(items[0][1]) # $ flow="SOURCE, l:-13 -> items[0][1]"
+    SINK_F(items[0][0])
+
+
+def copied_contents():
+    original = {"key": SOURCE}
+    frozen = frozendict(original)
+    original["key"] = NONSOURCE
+    SINK(frozen["key"]) # $ flow="SOURCE, l:-3 -> frozen['key']"
+    SINK_F(original["key"])
+
+
+def shadowed_constructor():
+    def frozendict(**kwargs):
+        return {"key": NONSOURCE}
+
+    frozen = frozendict(key=SOURCE)
+    SINK_F(frozen["key"])
diff --git a/python/ql/test/library-tests/dataflow/regression/dataflow.expected b/python/ql/test/library-tests/dataflow/regression/dataflow.expected
index c8ffed514463..ea2d5a93bdfe 100644
--- a/python/ql/test/library-tests/dataflow/regression/dataflow.expected
+++ b/python/ql/test/library-tests/dataflow/regression/dataflow.expected
@@ -15,6 +15,7 @@
 | test.py:128:13:128:18 | ControlFlowNode for SOURCE | test.py:132:14:132:14 | ControlFlowNode for t |
 | test.py:159:10:159:15 | ControlFlowNode for SOURCE | test.py:160:14:160:14 | ControlFlowNode for t |
 | test.py:163:9:163:14 | ControlFlowNode for SOURCE | test.py:165:12:165:12 | ControlFlowNode for s |
+| test.py:168:10:168:15 | ControlFlowNode for SOURCE | test.py:172:10:172:13 | ControlFlowNode for Subscript |
 | test.py:178:9:178:14 | ControlFlowNode for SOURCE | test.py:180:14:180:14 | ControlFlowNode for t |
 | test.py:178:9:178:14 | ControlFlowNode for SOURCE | test.py:182:16:182:16 | ControlFlowNode for t |
 | test.py:178:9:178:14 | ControlFlowNode for SOURCE | test.py:184:16:184:16 | ControlFlowNode for t |
diff --git a/python/ql/test/library-tests/dataflow/regression/test.py b/python/ql/test/library-tests/dataflow/regression/test.py
index 869993a5b643..de08437c3f2f 100644
--- a/python/ql/test/library-tests/dataflow/regression/test.py
+++ b/python/ql/test/library-tests/dataflow/regression/test.py
@@ -169,7 +169,7 @@ def test_update_extend(x, y):
     d = {"key" : SOURCE}
     x.extend(l)
     y.update(d)
-    SINK(x[0])  # Flow not found
+    SINK(x[0])
     SINK(y["key"])  # Flow not found
     l2 = list(l)
     d2 = dict(d)
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep-py3/test_bytearray.py b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep-py3/test_bytearray.py
new file mode 100644
index 000000000000..29718b85df06
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep-py3/test_bytearray.py
@@ -0,0 +1,88 @@
+# Add taintlib to PATH so it can be imported during runtime without any hassle
+import sys; import os; sys.path.append(os.path.dirname(os.path.dirname((__file__))))
+from taintlib import TAINTED_BYTES, TAINTED_STRING, ensure_tainted, ensure_not_tainted, taint
+
+
+def constructors():
+    import builtins
+    from builtins import bytearray as make_buffer
+
+    ensure_tainted(
+        bytearray(TAINTED_BYTES), # $ tainted
+        bytearray(source=TAINTED_BYTES), # $ tainted
+        bytearray(TAINTED_STRING, "utf-8"), # $ tainted
+        bytearray(source=TAINTED_STRING, encoding="utf-8"), # $ tainted
+        builtins.bytearray(TAINTED_BYTES), # $ tainted
+        make_buffer(TAINTED_BYTES), # $ tainted
+    )
+    ensure_not_tainted(bytearray(b"safe"))
+
+
+def shadowed_constructor():
+    def bytearray(source):
+        return b"safe"
+
+    ensure_not_tainted(bytearray(TAINTED_BYTES))
+
+
+def take_bytes():
+    ensure_tainted(
+        bytearray(TAINTED_BYTES).take_bytes(), # $ tainted
+        bytearray(TAINTED_BYTES).take_bytes(None), # $ tainted
+        bytearray(source=TAINTED_STRING, encoding="utf-8").take_bytes().decode(), # $ tainted
+        bytearray.take_bytes(bytearray(TAINTED_BYTES)), # $ tainted
+    )
+
+    buffer = bytearray(TAINTED_BYTES)
+    take = buffer.take_bytes
+    ensure_tainted(take()) # $ tainted
+
+    ensure_not_tainted(bytearray(b"safe").take_bytes())
+    ensure_not_tainted(bytearray().take_bytes())
+
+
+def take_partial_bytes():
+    buffer = bytearray(TAINTED_BYTES)
+    ensure_tainted(buffer.take_bytes(1)) # $ tainted
+    ensure_tainted(buffer) # $ tainted
+    ensure_tainted(buffer.take_bytes(-1)) # $ tainted
+    ensure_tainted(buffer) # $ tainted
+
+    size = 1
+    taint(size)
+    ensure_not_tainted(bytearray(b"safe").take_bytes(size))
+
+
+def empty_results():
+    buffer = bytearray(TAINTED_BYTES)
+    # Whole-buffer taint does not distinguish empty slices.
+    ensure_not_tainted(buffer[:0]) # $ SPURIOUS: tainted
+    ensure_not_tainted(buffer.take_bytes(0)) # $ SPURIOUS: tainted
+
+
+def consumed_buffer():
+    buffer = bytearray(b"abc")
+    taint(buffer)
+    result = buffer.take_bytes()
+    ensure_tainted(result) # $ tainted
+
+    # Whole-buffer taint is not removed when the buffer is emptied.
+    ensure_not_tainted(buffer) # $ SPURIOUS: tainted
+    ensure_not_tainted(buffer.take_bytes()) # $ SPURIOUS: tainted
+
+
+def cleared_buffer():
+    buffer = bytearray(b"abc")
+    taint(buffer)
+    buffer.clear()
+    ensure_not_tainted(buffer) # $ SPURIOUS: tainted
+
+
+constructors()
+shadowed_constructor()
+cleared_buffer()
+if sys.version_info >= (3, 15):
+    take_bytes()
+    take_partial_bytes()
+    empty_results()
+    consumed_buffer()
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep-py3/test_frozendict.py b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep-py3/test_frozendict.py
new file mode 100644
index 000000000000..64d1a63a695f
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep-py3/test_frozendict.py
@@ -0,0 +1,14 @@
+# Add taintlib to PATH so it can be imported during runtime without any hassle
+import sys; import os; sys.path.append(os.path.dirname(os.path.dirname((__file__))))
+from taintlib import TAINTED_DICT, TAINTED_STRING, ensure_tainted
+
+
+def test_frozendict():
+    ensure_tainted(frozendict(TAINTED_DICT)) # $ tainted
+    ensure_tainted(frozendict(TAINTED_DICT)["name"]) # $ tainted
+    ensure_tainted(frozendict(name=TAINTED_STRING)["name"]) # $ tainted
+    ensure_tainted(frozendict([("name", TAINTED_STRING)])["name"]) # $ tainted
+
+
+if sys.version_info >= (3, 15):
+    test_frozendict()
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/test_collections.py b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/test_collections.py
index fa6087f3ebcd..f738e14af8d4 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/test_collections.py
+++ b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/test_collections.py
@@ -232,6 +232,37 @@ def list_extend():
     ensure_not_tainted(my_list)
 
     my_list.extend(tainted_list)
+    ensure_tainted(my_list) # $ tainted
+
+
+def list_extend_iteration():
+    my_list = ["safe"]
+    tainted_list = [TAINTED_STRING]
+
+    ensure_not_tainted(my_list)
+
+    my_list.extend(tainted_list)
+    for x in my_list:
+        ensure_tainted(x) # $ tainted
+
+
+def list_insert():
+    tainted_string = TAINTED_STRING
+    my_list = ["safe"]
+
+    ensure_not_tainted(my_list)
+
+    my_list.insert(0, tainted_string)
+    ensure_tainted(my_list) # $ tainted
+
+
+def list_iadd():
+    my_list = ["safe"]
+    tainted_list = [TAINTED_STRING]
+
+    ensure_not_tainted(my_list)
+
+    my_list += tainted_list
     ensure_tainted(my_list) # $ MISSING: tainted
 
 
@@ -308,6 +339,9 @@ def set_add():
 list_index_aug_assign()
 list_append()
 list_extend()
+list_extend_iteration()
+list_insert()
+list_iadd()
 
 dict_update_dict()
 dict_update_kv_list()
diff --git a/python/ql/test/library-tests/dataflow/threading-iterators/InlineTaintTest.expected b/python/ql/test/library-tests/dataflow/threading-iterators/InlineTaintTest.expected
new file mode 100644
index 000000000000..020c338fd192
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/threading-iterators/InlineTaintTest.expected
@@ -0,0 +1,3 @@
+argumentToEnsureNotTaintedNotMarkedAsSpurious
+untaintedArgumentToEnsureTaintedNotMarkedAsMissing
+testFailures
diff --git a/python/ql/test/library-tests/dataflow/threading-iterators/InlineTaintTest.ql b/python/ql/test/library-tests/dataflow/threading-iterators/InlineTaintTest.ql
new file mode 100644
index 000000000000..8524da5fe7db
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/threading-iterators/InlineTaintTest.ql
@@ -0,0 +1,2 @@
+import experimental.meta.InlineTaintTest
+import MakeInlineTaintTest<TestTaintTrackingConfig>
diff --git a/python/ql/test/library-tests/dataflow/threading-iterators/NormalDataflowTest.expected b/python/ql/test/library-tests/dataflow/threading-iterators/NormalDataflowTest.expected
new file mode 100644
index 000000000000..2fad7bb9a843
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/threading-iterators/NormalDataflowTest.expected
@@ -0,0 +1,2 @@
+missingAnnotationOnSink
+testFailures
diff --git a/python/ql/test/library-tests/dataflow/threading-iterators/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/threading-iterators/NormalDataflowTest.ql
new file mode 100644
index 000000000000..1e0627bfcca1
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/threading-iterators/NormalDataflowTest.ql
@@ -0,0 +1,2 @@
+import python
+import utils.test.dataflow.NormalDataflowTest
diff --git a/python/ql/test/library-tests/dataflow/threading-iterators/options b/python/ql/test/library-tests/dataflow/threading-iterators/options
new file mode 100644
index 000000000000..89369a90996b
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/threading-iterators/options
@@ -0,0 +1 @@
+semmle-extractor-options: --lang=3 --max-import-depth=1
diff --git a/python/ql/test/library-tests/dataflow/threading-iterators/test.py b/python/ql/test/library-tests/dataflow/threading-iterators/test.py
new file mode 100644
index 000000000000..ac6009052eff
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/threading-iterators/test.py
@@ -0,0 +1,110 @@
+import threading
+from threading import concurrent_tee, serialize_iterator
+
+
+def serialized_list():
+    iterator = threading.serialize_iterator([SOURCE])
+    SINK(next(iterator)) # $ flow="SOURCE, l:-1 -> next(..)"
+    SINK_F(iterator)
+
+
+def serialized_tuple():
+    iterator = serialize_iterator(iterable=(SOURCE,))
+    SINK(next(iterator)) # $ flow="SOURCE, l:-1 -> next(..)"
+
+
+def serialized_set():
+    wrap = serialize_iterator
+    iterator = wrap({SOURCE})
+    SINK(next(iterator)) # $ flow="SOURCE, l:-1 -> next(..)"
+
+
+def serialized_generator():
+    iterator = serialize_iterator(value for value in [SOURCE])
+    for value in iterator:
+        SINK(value) # $ flow="SOURCE, l:-2 -> value"
+
+
+def serialized_contents():
+    iterator = serialize_iterator([{"tainted": SOURCE, "clean": NONSOURCE}])
+    value = next(iterator)
+    SINK(value["tainted"]) # $ flow="SOURCE, l:-2 -> value['tainted']"
+    SINK_F(value["clean"])
+
+
+def serialized_callback():
+    iterator = next(map(serialize_iterator, [[SOURCE]]))
+    SINK(next(iterator)) # $ flow="SOURCE, l:-1 -> next(..)"
+
+
+def tee_list():
+    first, second = threading.concurrent_tee([SOURCE])
+    SINK(next(first)) # $ flow="SOURCE, l:-1 -> next(..)"
+    SINK(next(second)) # $ flow="SOURCE, l:-2 -> next(..)"
+    SINK_F(first)
+
+
+def tee_tuple():
+    copies = concurrent_tee(iterable=(SOURCE,), n=3)
+    SINK(next(copies[0])) # $ flow="SOURCE, l:-1 -> next(..)"
+    SINK(next(copies[2])) # $ flow="SOURCE, l:-2 -> next(..)"
+
+
+def tee_set():
+    split = concurrent_tee
+    first, second = split({SOURCE}, 2)
+    SINK(next(first)) # $ flow="SOURCE, l:-1 -> next(..)"
+    SINK(next(second)) # $ flow="SOURCE, l:-2 -> next(..)"
+
+
+def tee_many():
+    copies = concurrent_tee([SOURCE], n=10)
+    SINK(next(copies[9])) # $ flow="SOURCE, l:-1 -> next(..)"
+    SINK(next(copies[-1])) # $ flow="SOURCE, l:-2 -> next(..)"
+
+
+def tee_generator():
+    copies = concurrent_tee(value for value in [SOURCE])
+    for iterator in copies:
+        SINK(next(iterator)) # $ flow="SOURCE, l:-2 -> next(..)"
+
+
+def tee_contents():
+    first, second = concurrent_tee([{"tainted": SOURCE, "clean": NONSOURCE}])
+    value = next(second)
+    SINK(value["tainted"]) # $ flow="SOURCE, l:-2 -> value['tainted']"
+    SINK_F(value["clean"])
+
+
+def tee_callback():
+    copies = next(map(concurrent_tee, [[SOURCE]]))
+    SINK(next(copies[0])) # $ flow="SOURCE, l:-1 -> next(..)"
+
+
+# The decorator form is already handled without a dedicated model.
+@threading.synchronized_iterator
+def decorated_generator(value):
+    yield {"tainted": value, "clean": NONSOURCE}
+
+
+def synchronized_generator():
+    value = next(decorated_generator(SOURCE))
+    SINK(value["tainted"]) # $ flow="SOURCE, l:-1 -> value['tainted']"
+    SINK_F(value["clean"])
+
+
+def clean_inputs():
+    SINK_F(next(serialize_iterator([NONSOURCE])))
+    SINK_F(next(concurrent_tee([NONSOURCE])[0]))
+    SINK_F(next(concurrent_tee([NONSOURCE], n=SOURCE)[0]))
+
+
+def shadowed_functions():
+    def serialize_iterator(iterable):
+        return iter([NONSOURCE])
+
+    def concurrent_tee(iterable, n=2):
+        return iter([NONSOURCE]), iter([NONSOURCE])
+
+    SINK_F(next(serialize_iterator([SOURCE])))
+    SINK_F(next(concurrent_tee([SOURCE])[0]))
diff --git a/python/ql/test/library-tests/dataflow/threading-iterators/test_taint.py b/python/ql/test/library-tests/dataflow/threading-iterators/test_taint.py
new file mode 100644
index 000000000000..dabb3294a54a
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/threading-iterators/test_taint.py
@@ -0,0 +1,32 @@
+import threading
+
+
+def serialized_taint():
+    iterator = threading.serialize_iterator(TAINTED_LIST)
+    ensure_tainted(iterator) # $ tainted
+    ensure_tainted(next(iterator)) # $ tainted
+
+
+def tee_taint():
+    first, second = threading.concurrent_tee(TAINTED_LIST)
+    ensure_tainted(first) # $ tainted
+    ensure_tainted(second) # $ tainted
+    ensure_tainted(next(first)) # $ tainted
+    ensure_tainted(next(second)) # $ tainted
+
+
+def nested_contents():
+    iterator = threading.serialize_iterator([{"tainted": TAINTED_STRING, "clean": "safe"}])
+    value = next(iterator)
+    ensure_tainted(value["tainted"]) # $ tainted
+    ensure_not_tainted(value["clean"])
+
+    first, second = threading.concurrent_tee([{"tainted": TAINTED_STRING, "clean": "safe"}])
+    value = next(second)
+    ensure_tainted(value["tainted"]) # $ tainted
+    ensure_not_tainted(value["clean"])
+
+
+def count_is_not_data():
+    copies = threading.concurrent_tee(["clean"], n=taint(2))
+    ensure_not_tainted(next(copies[0]))
diff --git a/python/ql/test/library-tests/dataflow/variable-capture/dataflow-capture-consistency.expected b/python/ql/test/library-tests/dataflow/variable-capture/dataflow-capture-consistency.expected
index 35f4edcf1fb9..e331f0ddde45 100644
--- a/python/ql/test/library-tests/dataflow/variable-capture/dataflow-capture-consistency.expected
+++ b/python/ql/test/library-tests/dataflow/variable-capture/dataflow-capture-consistency.expected
@@ -15,3 +15,4 @@ closureAliasMustBeInSameScope
 variableAccessAstNesting
 uniqueCallableLocation
 consistencyOverview
+ambiguousReadNode
diff --git a/python/ql/test/library-tests/frameworks/stdlib/test_binascii.py b/python/ql/test/library-tests/frameworks/stdlib/test_binascii.py
new file mode 100644
index 000000000000..d26f784691bd
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/stdlib/test_binascii.py
@@ -0,0 +1,72 @@
+import binascii
+from binascii import b2a_base32 as encode32, a2b_base85 as decode85
+
+data = TAINTED_BYTES
+
+encoded32 = binascii.b2a_base32(data, padded=False) # $ encodeInput=data encodeOutput=binascii.b2a_base32(..) encodeFormat=Base32
+decoded32 = binascii.a2b_base32(encoded32, padded=False, canonical=True) # $ decodeInput=encoded32 decodeOutput=binascii.a2b_base32(..) decodeFormat=Base32
+
+encoded85 = binascii.b2a_base85(data, pad=True) # $ encodeInput=data encodeOutput=binascii.b2a_base85(..) encodeFormat=Base85
+decoded85 = binascii.a2b_base85(encoded85, canonical=True) # $ decodeInput=encoded85 decodeOutput=binascii.a2b_base85(..) decodeFormat=Base85
+
+encoded_ascii85 = binascii.b2a_ascii85(data, foldspaces=True, adobe=True) # $ encodeInput=data encodeOutput=binascii.b2a_ascii85(..) encodeFormat=Ascii85
+decoded_ascii85 = binascii.a2b_ascii85(encoded_ascii85, foldspaces=True, adobe=True) # $ decodeInput=encoded_ascii85 decodeOutput=binascii.a2b_ascii85(..) decodeFormat=Ascii85
+
+ensure_tainted(
+    encoded32, # $ tainted
+    decoded32, # $ tainted
+    encoded85, # $ tainted
+    decoded85, # $ tainted
+    encoded_ascii85, # $ tainted
+    decoded_ascii85, # $ tainted
+)
+
+aliased_encoded = encode32(data) # $ encodeInput=data encodeOutput=encode32(..) encodeFormat=Base32
+aliased_decoded = decode85(encoded85) # $ decodeInput=encoded85 decodeOutput=decode85(..) decodeFormat=Base85
+ensure_tainted(
+    aliased_encoded, # $ tainted
+    aliased_decoded, # $ tainted
+)
+
+
+def custom_alphabets():
+    alphabet32 = binascii.BASE32HEX_ALPHABET
+    alphabet85 = binascii.Z85_ALPHABET
+    taint(alphabet32, alphabet85)
+
+    clean = b"abcd"
+    clean32 = b"00000000"
+    clean85 = b"00000"
+    encoded32 = binascii.b2a_base32(clean, alphabet=alphabet32) # $ encodeInput=clean encodeInput=alphabet32 encodeOutput=binascii.b2a_base32(..) encodeFormat=Base32
+    decoded32 = binascii.a2b_base32(clean32, alphabet=alphabet32) # $ decodeInput=clean32 decodeInput=alphabet32 decodeOutput=binascii.a2b_base32(..) decodeFormat=Base32
+    encoded85 = binascii.b2a_base85(clean, alphabet=alphabet85) # $ encodeInput=clean encodeInput=alphabet85 encodeOutput=binascii.b2a_base85(..) encodeFormat=Base85
+    decoded85 = binascii.a2b_base85(clean85, alphabet=alphabet85) # $ decodeInput=clean85 decodeInput=alphabet85 decodeOutput=binascii.a2b_base85(..) decodeFormat=Base85
+    ensure_tainted(
+        encoded32, # $ tainted
+        decoded32, # $ tainted
+        encoded85, # $ tainted
+        decoded85, # $ tainted
+    )
+
+
+def clean_inputs():
+    clean = b"abcd"
+    empty = b""
+    wrapcol = 80
+    ignorechars = b" \n"
+    taint(wrapcol, ignorechars)
+
+    encoded32 = binascii.b2a_base32(clean, wrapcol=wrapcol) # $ encodeInput=clean encodeOutput=binascii.b2a_base32(..) encodeFormat=Base32
+    encoded85 = binascii.b2a_base85(clean, wrapcol=wrapcol) # $ encodeInput=clean encodeOutput=binascii.b2a_base85(..) encodeFormat=Base85
+    encoded_ascii85 = binascii.b2a_ascii85(clean, wrapcol=wrapcol) # $ encodeInput=clean encodeOutput=binascii.b2a_ascii85(..) encodeFormat=Ascii85
+    decoded32 = binascii.a2b_base32(empty, ignorechars=ignorechars) # $ decodeInput=empty decodeOutput=binascii.a2b_base32(..) decodeFormat=Base32
+    decoded85 = binascii.a2b_base85(empty, ignorechars=ignorechars) # $ decodeInput=empty decodeOutput=binascii.a2b_base85(..) decodeFormat=Base85
+    decoded_ascii85 = binascii.a2b_ascii85(empty, ignorechars=ignorechars) # $ decodeInput=empty decodeOutput=binascii.a2b_ascii85(..) decodeFormat=Ascii85
+    ensure_not_tainted(
+        encoded32,
+        encoded85,
+        encoded_ascii85,
+        decoded32,
+        decoded85,
+        decoded_ascii85,
+    )
diff --git a/python/ql/test/library-tests/frameworks/stdlib/test_extra_response_headers.py b/python/ql/test/library-tests/frameworks/stdlib/test_extra_response_headers.py
new file mode 100644
index 000000000000..a83067470264
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/stdlib/test_extra_response_headers.py
@@ -0,0 +1,73 @@
+from http.server import BaseHTTPRequestHandler, SimpleHTTPRequestHandler
+import http.server
+
+
+def constructors(request, address, server, headers):
+    SimpleHTTPRequestHandler(request, address, server, extra_response_headers=headers) # $ headerWriteBulk=headers headerWriteBulkUnsanitized=name,value
+    http.server.SimpleHTTPRequestHandler(request, address, server, extra_response_headers=headers) # $ headerWriteBulk=headers headerWriteBulkUnsanitized=name,value
+    handler = SimpleHTTPRequestHandler
+    handler(request, address, server, extra_response_headers=headers) # $ headerWriteBulk=headers headerWriteBulkUnsanitized=name,value
+
+    SimpleHTTPRequestHandler(request, address, server, extra_response_headers=[("X-Example", "value")]) # $ headerWriteBulk=List headerWriteBulkUnsanitized=name,value headerWriteNameUnsanitized="X-Example" headerWriteValueUnsanitized="value"
+    SimpleHTTPRequestHandler(request, address, server)
+
+
+class CustomHandler(SimpleHTTPRequestHandler):
+    def change_headers(self, headers):
+        self.extra_response_headers = headers # $ headerWriteBulk=headers headerWriteBulkUnsanitized=name,value
+        alias = self
+        alias.extra_response_headers = [("X-Alias", "value")] # $ headerWriteBulk=List headerWriteBulkUnsanitized=name,value headerWriteNameUnsanitized="X-Alias" headerWriteValueUnsanitized="value"
+        ensure_tainted(alias.headers) # $ tainted
+        ensure_not_tainted(alias.extra_response_headers)
+
+    def delegate(self, headers):
+        write_simple_headers(self, headers)
+
+
+class DerivedHandler(CustomHandler):
+    def change_again(self, headers):
+        self.extra_response_headers = headers # $ headerWriteBulk=headers headerWriteBulkUnsanitized=name,value
+
+
+def constructed_instance(request, address, server, headers):
+    handler = SimpleHTTPRequestHandler(request, address, server)
+    handler.extra_response_headers = headers # $ headerWriteBulk=headers headerWriteBulkUnsanitized=name,value
+    write_simple_headers(handler, headers)
+
+
+def write_simple_headers(handler, headers):
+    alias = handler
+    alias.extra_response_headers = headers # $ headerWriteBulk=headers headerWriteBulkUnsanitized=name,value
+
+
+def annotated_instance(handler: SimpleHTTPRequestHandler, headers):
+    handler.extra_response_headers = headers # $ headerWriteBulk=headers headerWriteBulkUnsanitized=name,value
+
+
+class InheritedInitHandler(SimpleHTTPRequestHandler):
+    pass
+
+
+def inherited_constructor(request, address, server, headers):
+    InheritedInitHandler(request, address, server, extra_response_headers=headers) # $ headerWriteBulk=headers headerWriteBulkUnsanitized=name,value
+
+
+class BaseOnlyHandler(BaseHTTPRequestHandler):
+    def change_headers(self, headers):
+        # BaseHTTPRequestHandler does not consume this attribute.
+        self.extra_response_headers = headers
+        write_base_headers(self, headers)
+
+
+def write_base_headers(handler, headers):
+    alias = handler
+    alias.extra_response_headers = headers
+
+
+class Unrelated:
+    def __init__(self, *, extra_response_headers):
+        self.extra_response_headers = extra_response_headers
+
+
+def unrelated(headers):
+    Unrelated(extra_response_headers=headers)
diff --git a/python/ql/test/library-tests/frameworks/stdlib/test_re_prefixmatch.py b/python/ql/test/library-tests/frameworks/stdlib/test_re_prefixmatch.py
new file mode 100644
index 000000000000..7a80fae545bf
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/stdlib/test_re_prefixmatch.py
@@ -0,0 +1,46 @@
+import re
+from re import prefixmatch as prefix_match
+
+ts = TAINTED_STRING
+pat = r"(?P<key>.*)"
+compiled_pat = re.compile(pat)
+
+ensure_tainted(
+    re.prefixmatch(pat, ts), # $ tainted
+    re.prefixmatch(pattern=pat, string=ts), # $ tainted
+    prefix_match(pat, ts), # $ tainted
+    compiled_pat.prefixmatch(ts), # $ tainted
+    compiled_pat.prefixmatch(string=ts, pos=0, endpos=10), # $ tainted
+
+    re.prefixmatch(pat, ts).string, # $ tainted
+    re.prefixmatch(ts, "safe").re.pattern, # $ tainted
+    compiled_pat.prefixmatch(ts).string, # $ tainted
+    re.compile(ts).prefixmatch("safe").re.pattern, # $ tainted
+)
+
+direct_match = re.prefixmatch(pat, ts)
+compiled_match = compiled_pat.prefixmatch(ts)
+ensure_tainted(
+    direct_match.group(), # $ tainted
+    direct_match.groups()[0], # $ tainted
+    direct_match.groupdict()["key"], # $ tainted
+    direct_match[0], # $ tainted
+    direct_match["key"], # $ tainted
+    direct_match.expand(r"\1"), # $ tainted
+
+    compiled_match.group(), # $ tainted
+    compiled_match.groups()[0], # $ tainted
+    compiled_match.groupdict()["key"], # $ tainted
+    compiled_match[0], # $ tainted
+    compiled_match["key"], # $ tainted
+    compiled_match.expand(r"\1"), # $ tainted
+)
+
+ensure_not_tainted(
+    re.prefixmatch(pat, "safe").string,
+    re.prefixmatch(pat, ts).re.pattern,
+    re.prefixmatch(ts, "safe").group(),
+    compiled_pat.prefixmatch("safe").string,
+    compiled_pat.prefixmatch(ts).re.pattern,
+    re.compile(ts).prefixmatch("safe").group(),
+)
diff --git a/python/ql/test/library-tests/frameworks/stdlib/test_unicodedata.py b/python/ql/test/library-tests/frameworks/stdlib/test_unicodedata.py
new file mode 100644
index 000000000000..73f91d214f9c
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/stdlib/test_unicodedata.py
@@ -0,0 +1,54 @@
+import unicodedata
+from unicodedata import iter_graphemes as graphemes
+
+
+def string_iteration():
+    for character in TAINTED_STRING:
+        ensure_tainted(character) # $ tainted
+
+
+def grapheme_iteration():
+    iterator = unicodedata.iter_graphemes(TAINTED_STRING)
+    ensure_tainted(iterator) # $ tainted
+    for grapheme in iterator:
+        ensure_tainted(grapheme) # $ tainted
+        ensure_tainted(str(grapheme)) # $ tainted
+        ensure_not_tainted(grapheme.start, grapheme.end)
+
+
+def next_grapheme():
+    grapheme = next(unicodedata.iter_graphemes(TAINTED_STRING))
+    ensure_tainted(str(grapheme)) # $ tainted
+
+
+def bounded_iteration():
+    for grapheme in unicodedata.iter_graphemes(TAINTED_STRING, 1, 10):
+        ensure_tainted(str(grapheme)) # $ tainted
+
+
+def aliases():
+    ensure_tainted(str(next(graphemes(TAINTED_STRING)))) # $ tainted
+    split = unicodedata.iter_graphemes
+    ensure_tainted(str(next(split(TAINTED_STRING)))) # $ tainted
+
+
+def callback():
+    iterator = next(map(unicodedata.iter_graphemes, [TAINTED_STRING]))
+    ensure_tainted(str(next(iterator))) # $ tainted
+
+
+def clean_inputs():
+    start, end = 0, 10
+    taint(start, end)
+    iterator = unicodedata.iter_graphemes("a\u0301bc", start, end)
+    ensure_not_tainted(iterator)
+    for grapheme in iterator:
+        ensure_not_tainted(str(grapheme))
+    ensure_not_tainted(str(next(graphemes("clean"))))
+
+
+def shadowed_function():
+    def iter_graphemes(unistr):
+        return iter(["clean"])
+
+    ensure_not_tainted(str(next(iter_graphemes(TAINTED_STRING))))
diff --git a/python/ql/test/library-tests/regex/Mode.expected b/python/ql/test/library-tests/regex/Mode.expected
index 5640d028757c..406f41547d5c 100644
--- a/python/ql/test/library-tests/regex/Mode.expected
+++ b/python/ql/test/library-tests/regex/Mode.expected
@@ -26,3 +26,8 @@
 | 63 | VERBOSE |
 | 65 | ASCII |
 | 77 | MULTILINE |
+| 91 | IGNORECASE |
+| 92 | DOTALL |
+| 92 | MULTILINE |
+| 93 | VERBOSE |
+| 94 | IGNORECASE |
diff --git a/python/ql/test/library-tests/regex/Regex.expected b/python/ql/test/library-tests/regex/Regex.expected
index 00c80d5cc1cb..7e14ee12ead0 100644
--- a/python/ql/test/library-tests/regex/Regex.expected
+++ b/python/ql/test/library-tests/regex/Regex.expected
@@ -108,6 +108,8 @@
 | (?aimsx:a+) | qualified | 8 | 10 |
 | (?aimsx:a+) | sequence | 0 | 11 |
 | (?aimsx:a+) | sequence | 7 | 10 |
+| (?i) | empty group | 0 | 4 |
+| (?i) | sequence | 0 | 4 |
 | (?m)^(?!$) | $ | 8 | 9 |
 | (?m)^(?!$) | ^ | 4 | 5 |
 | (?m)^(?!$) | empty group | 0 | 4 |
diff --git a/python/ql/test/library-tests/regex/test.py b/python/ql/test/library-tests/regex/test.py
index 8565e347781d..afb68aa2078a 100644
--- a/python/ql/test/library-tests/regex/test.py
+++ b/python/ql/test/library-tests/regex/test.py
@@ -85,4 +85,10 @@
 
 # Anchors
 re.compile(r'\Afoo\Z')
-re.compile(r'\bfoo\B')
\ No newline at end of file
+re.compile(r'\bfoo\B')
+
+# Python 3.15 prefixmatch flags
+re.prefixmatch("", "", re.IGNORECASE)
+re.prefixmatch("", "", flags=re.DOTALL | re.MULTILINE)
+re.prefixmatch(pattern="", string="", flags=re.VERBOSE)
+re.prefixmatch("(?i)", "")
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Imports/unused/UnusedImport.expected b/python/ql/test/query-tests/Imports/unused/UnusedImport.expected
index 2f27961d92e3..46f9c1a55e56 100644
--- a/python/ql/test/query-tests/Imports/unused/UnusedImport.expected
+++ b/python/ql/test/query-tests/Imports/unused/UnusedImport.expected
@@ -6,3 +6,4 @@
 | imports_test.py:27:1:27:25 | Import | Import of 'func2' is not used. |
 | imports_test.py:34:1:34:14 | Import | Import of 'module2' is not used. |
 | imports_test.py:116:1:116:41 | Import | Import of 'not_a_fixture' is not used. |
+| relaxed_except.py:3:1:3:55 | Import | Import of 'NeverUsed' is not used. |
diff --git a/python/ql/test/query-tests/Imports/unused/relaxed_except.py b/python/ql/test/query-tests/Imports/unused/relaxed_except.py
new file mode 100644
index 000000000000..a2a9861aefbe
--- /dev/null
+++ b/python/ql/test/query-tests/Imports/unused/relaxed_except.py
@@ -0,0 +1,16 @@
+# PEP 758 allows unparenthesized exception types when there is no `as` clause.
+# Every import below except `NeverUsed` is used, leaving one expected result.
+from relaxed_except_defs import Delta, Gamma, NeverUsed
+
+
+# The `except Alpha, Beta:` case is covered separately in the Python 2 and
+# Python 3 test directories because its semantics differ between versions.
+#
+# The version-specific files deliberately contain no `except A, B, C:` clause.
+# Three or more unparenthesized types fail the default parser, which sends the
+# whole file to the tree-sitter parser and would mask the behavior under test.
+def parenthesized():
+    try:
+        pass
+    except (Gamma, Delta):
+        raise
diff --git a/python/ql/test/query-tests/Imports/unused/relaxed_except_defs.py b/python/ql/test/query-tests/Imports/unused/relaxed_except_defs.py
new file mode 100644
index 000000000000..3c6313b3abf9
--- /dev/null
+++ b/python/ql/test/query-tests/Imports/unused/relaxed_except_defs.py
@@ -0,0 +1,18 @@
+class Gamma(Exception):
+    pass
+
+
+class Delta(Exception):
+    pass
+
+
+class Epsilon(Exception):
+    pass
+
+
+class NeverUsed(Exception):
+    pass
+
+
+class Zeta(Exception):
+    pass
diff --git a/python/ql/test/query-tests/Imports/unused/relaxed_except_long.py b/python/ql/test/query-tests/Imports/unused/relaxed_except_long.py
new file mode 100644
index 000000000000..cadecb48cd3c
--- /dev/null
+++ b/python/ql/test/query-tests/Imports/unused/relaxed_except_long.py
@@ -0,0 +1,17 @@
+# Three or more unparenthesized exception types. These fail the default parser
+# and are extracted by the tree-sitter parser instead; all names are still uses.
+from relaxed_except_defs import Delta, Epsilon, Gamma, Zeta
+
+
+def three():
+    try:
+        pass
+    except Gamma, Delta, Epsilon:
+        raise
+
+
+def four():
+    try:
+        pass
+    except Gamma, Delta, Epsilon, Zeta:
+        raise
diff --git a/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests1/HeaderInjection.expected b/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests1/HeaderInjection.expected
index 4043b9332435..621921af3f7c 100644
--- a/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests1/HeaderInjection.expected
+++ b/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests1/HeaderInjection.expected
@@ -1,4 +1,7 @@
 #select
+| extra_response_headers.py:9:52:9:56 | ControlFlowNode for value | extra_response_headers.py:5:16:5:19 | ControlFlowNode for self | extra_response_headers.py:9:52:9:56 | ControlFlowNode for value | This HTTP header is constructed from a $@. | extra_response_headers.py:5:16:5:19 | ControlFlowNode for self | user-provided value |
+| extra_response_headers.py:11:42:11:45 | ControlFlowNode for name | extra_response_headers.py:5:16:5:19 | ControlFlowNode for self | extra_response_headers.py:11:42:11:45 | ControlFlowNode for name | This HTTP header is constructed from a $@. | extra_response_headers.py:5:16:5:19 | ControlFlowNode for self | user-provided value |
+| extra_response_headers.py:27:49:27:53 | ControlFlowNode for value | extra_response_headers.py:21:16:21:19 | ControlFlowNode for self | extra_response_headers.py:27:49:27:53 | ControlFlowNode for value | This HTTP header is constructed from a $@. | extra_response_headers.py:21:16:21:19 | ControlFlowNode for self | user-provided value |
 | flask_tests.py:13:17:13:26 | ControlFlowNode for rfs_header | flask_tests.py:1:29:1:35 | ControlFlowNode for ImportMember | flask_tests.py:13:17:13:26 | ControlFlowNode for rfs_header | This HTTP header is constructed from a $@. | flask_tests.py:1:29:1:35 | ControlFlowNode for ImportMember | user-provided value |
 | flask_tests.py:20:36:20:61 | ControlFlowNode for Subscript | flask_tests.py:1:29:1:35 | ControlFlowNode for ImportMember | flask_tests.py:20:36:20:61 | ControlFlowNode for Subscript | This HTTP header is constructed from a $@. | flask_tests.py:1:29:1:35 | ControlFlowNode for ImportMember | user-provided value |
 | flask_tests.py:33:11:33:20 | ControlFlowNode for rfs_header | flask_tests.py:1:29:1:35 | ControlFlowNode for ImportMember | flask_tests.py:33:11:33:20 | ControlFlowNode for rfs_header | This HTTP header is constructed from a $@. | flask_tests.py:1:29:1:35 | ControlFlowNode for ImportMember | user-provided value |
@@ -7,6 +10,12 @@
 | wsgiref_tests.py:8:17:8:22 | ControlFlowNode for h_name | wsgiref_tests.py:4:14:4:20 | ControlFlowNode for environ | wsgiref_tests.py:8:17:8:22 | ControlFlowNode for h_name | This HTTP header is constructed from a $@. | wsgiref_tests.py:4:14:4:20 | ControlFlowNode for environ | user-provided value |
 | wsgiref_tests.py:8:42:8:46 | ControlFlowNode for h_val | wsgiref_tests.py:4:14:4:20 | ControlFlowNode for environ | wsgiref_tests.py:8:42:8:46 | ControlFlowNode for h_val | This HTTP header is constructed from a $@. | wsgiref_tests.py:4:14:4:20 | ControlFlowNode for environ | user-provided value |
 edges
+| extra_response_headers.py:5:16:5:19 | ControlFlowNode for self | extra_response_headers.py:6:9:6:12 | ControlFlowNode for name | provenance | AdditionalTaintStep |
+| extra_response_headers.py:5:16:5:19 | ControlFlowNode for self | extra_response_headers.py:7:9:7:13 | ControlFlowNode for value | provenance | AdditionalTaintStep |
+| extra_response_headers.py:6:9:6:12 | ControlFlowNode for name | extra_response_headers.py:11:42:11:45 | ControlFlowNode for name | provenance |  |
+| extra_response_headers.py:7:9:7:13 | ControlFlowNode for value | extra_response_headers.py:9:52:9:56 | ControlFlowNode for value | provenance |  |
+| extra_response_headers.py:21:16:21:19 | ControlFlowNode for self | extra_response_headers.py:23:9:23:13 | ControlFlowNode for value | provenance | AdditionalTaintStep |
+| extra_response_headers.py:23:9:23:13 | ControlFlowNode for value | extra_response_headers.py:27:49:27:53 | ControlFlowNode for value | provenance |  |
 | flask_tests.py:1:29:1:35 | ControlFlowNode for ImportMember | flask_tests.py:1:29:1:35 | ControlFlowNode for request | provenance |  |
 | flask_tests.py:1:29:1:35 | ControlFlowNode for request | flask_tests.py:9:18:9:24 | ControlFlowNode for request | provenance |  |
 | flask_tests.py:1:29:1:35 | ControlFlowNode for request | flask_tests.py:19:18:19:24 | ControlFlowNode for request | provenance |  |
@@ -37,6 +46,14 @@ models
 | 1 | Summary: urllib; Member[parse].Member[parse_qs]; Argument[0,qs:]; ReturnValue; taint |
 | 2 | Summary: urllib; Member[parse].Member[urlparse]; Argument[0,urlstring:]; ReturnValue; taint |
 nodes
+| extra_response_headers.py:5:16:5:19 | ControlFlowNode for self | semmle.label | ControlFlowNode for self |
+| extra_response_headers.py:6:9:6:12 | ControlFlowNode for name | semmle.label | ControlFlowNode for name |
+| extra_response_headers.py:7:9:7:13 | ControlFlowNode for value | semmle.label | ControlFlowNode for value |
+| extra_response_headers.py:9:52:9:56 | ControlFlowNode for value | semmle.label | ControlFlowNode for value |
+| extra_response_headers.py:11:42:11:45 | ControlFlowNode for name | semmle.label | ControlFlowNode for name |
+| extra_response_headers.py:21:16:21:19 | ControlFlowNode for self | semmle.label | ControlFlowNode for self |
+| extra_response_headers.py:23:9:23:13 | ControlFlowNode for value | semmle.label | ControlFlowNode for value |
+| extra_response_headers.py:27:49:27:53 | ControlFlowNode for value | semmle.label | ControlFlowNode for value |
 | flask_tests.py:1:29:1:35 | ControlFlowNode for ImportMember | semmle.label | ControlFlowNode for ImportMember |
 | flask_tests.py:1:29:1:35 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
 | flask_tests.py:9:5:9:14 | ControlFlowNode for rfs_header | semmle.label | ControlFlowNode for rfs_header |
diff --git a/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests1/extra_response_headers.py b/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests1/extra_response_headers.py
new file mode 100644
index 000000000000..da2c651b6e81
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests1/extra_response_headers.py
@@ -0,0 +1,30 @@
+from http.server import BaseHTTPRequestHandler, SimpleHTTPRequestHandler
+
+
+class ExtraHeadersHandler(SimpleHTTPRequestHandler):
+    def do_GET(self):
+        name = self.headers["X-Header-Name"]
+        value = self.headers["X-Header-Value"]
+
+        self.extra_response_headers = [("X-Value", value)] # BAD
+        alias = self
+        alias.extra_response_headers = [(name, "value")] # BAD
+
+        clean_name = name.replace("\r", "").replace("\n", "")
+        clean_value = value.replace("\r", "").replace("\n", "")
+        self.extra_response_headers = [(clean_name, clean_value)] # GOOD
+        self.extra_response_headers = [("X-Static", "value")] # GOOD
+        super().do_GET()
+
+
+class DispatchHandler(BaseHTTPRequestHandler):
+    def do_GET(self):
+        name = self.headers["X-Header-Name"]
+        value = self.headers["X-Header-Value"]
+
+        SimpleHTTPRequestHandler(
+            self.request, self.client_address, self.server,
+            extra_response_headers=[("X-Value", value)], # BAD
+        )
+        # BaseHTTPRequestHandler does not consume this attribute.
+        self.extra_response_headers = [(name, value)] # GOOD
diff --git a/python/ql/test/query-tests/Security/CWE-730-PolynomialReDoS/PolynomialBackTracking.expected b/python/ql/test/query-tests/Security/CWE-730-PolynomialReDoS/PolynomialBackTracking.expected
index ba97e881e467..9798fb27eb22 100644
--- a/python/ql/test/query-tests/Security/CWE-730-PolynomialReDoS/PolynomialBackTracking.expected
+++ b/python/ql/test/query-tests/Security/CWE-730-PolynomialReDoS/PolynomialBackTracking.expected
@@ -3,3 +3,6 @@
 | test.py:11:22:11:33 | StringLiteral | test.py:11:29:11:31 | \\s+ | Strings with many repetitions of ' ' can start matching anywhere after the start of the preceeding \\s+$ |
 | test.py:18:14:18:25 | StringLiteral | test.py:18:21:18:23 | \\s+ | Strings with many repetitions of ' ' can start matching anywhere after the start of the preceeding \\s+$ |
 | test.py:20:23:20:274 | StringLiteral | test.py:20:271:20:272 | .* | Strings starting with 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC' and with many repetitions of 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC' can start matching anywhere after the start of the preceeding (AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)C.*Y |
+| test.py:27:20:27:35 | StringLiteral | test.py:27:31:27:33 | \\d+ | Strings starting with '0.9' and with many repetitions of '99' can start matching anywhere after the start of the preceeding \\d+ |
+| test.py:28:28:28:43 | StringLiteral | test.py:28:39:28:41 | \\d+ | Strings starting with '0.9' and with many repetitions of '99' can start matching anywhere after the start of the preceeding \\d+ |
+| test.py:30:26:30:41 | StringLiteral | test.py:30:37:30:39 | \\d+ | Strings starting with '0.9' and with many repetitions of '99' can start matching anywhere after the start of the preceeding \\d+ |
diff --git a/python/ql/test/query-tests/Security/CWE-730-PolynomialReDoS/PolynomialReDoS.expected b/python/ql/test/query-tests/Security/CWE-730-PolynomialReDoS/PolynomialReDoS.expected
index 22fcfd05fa19..4f9ed6be52b1 100644
--- a/python/ql/test/query-tests/Security/CWE-730-PolynomialReDoS/PolynomialReDoS.expected
+++ b/python/ql/test/query-tests/Security/CWE-730-PolynomialReDoS/PolynomialReDoS.expected
@@ -4,9 +4,14 @@
 | test.py:12:17:12:20 | ControlFlowNode for text | test.py:2:26:2:32 | ControlFlowNode for ImportMember | test.py:12:17:12:20 | ControlFlowNode for text | This $@ that depends on a $@ may run slow on strings with many repetitions of ' '. | test.py:11:29:11:31 | \\s+ | regular expression | test.py:2:26:2:32 | ControlFlowNode for ImportMember | user-provided value |
 | test.py:16:24:16:30 | ControlFlowNode for my_text | test.py:2:26:2:32 | ControlFlowNode for ImportMember | test.py:16:24:16:30 | ControlFlowNode for my_text | This $@ that depends on a $@ may run slow on strings with many repetitions of ' '. | test.py:18:21:18:23 | \\s+ | regular expression | test.py:2:26:2:32 | ControlFlowNode for ImportMember | user-provided value |
 | test.py:21:18:21:21 | ControlFlowNode for text | test.py:2:26:2:32 | ControlFlowNode for ImportMember | test.py:21:18:21:21 | ControlFlowNode for text | This $@ that depends on a $@ may run slow on strings starting with 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC' and with many repetitions of 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC'. | test.py:20:271:20:272 | .* | regular expression | test.py:2:26:2:32 | ControlFlowNode for ImportMember | user-provided value |
+| test.py:27:38:27:41 | ControlFlowNode for text | test.py:2:26:2:32 | ControlFlowNode for ImportMember | test.py:27:38:27:41 | ControlFlowNode for text | This $@ that depends on a $@ may run slow on strings starting with '0.9' and with many repetitions of '99'. | test.py:27:31:27:33 | \\d+ | regular expression | test.py:2:26:2:32 | ControlFlowNode for ImportMember | user-provided value |
+| test.py:28:53:28:56 | ControlFlowNode for text | test.py:2:26:2:32 | ControlFlowNode for ImportMember | test.py:28:53:28:56 | ControlFlowNode for text | This $@ that depends on a $@ may run slow on strings starting with '0.9' and with many repetitions of '99'. | test.py:28:39:28:41 | \\d+ | regular expression | test.py:2:26:2:32 | ControlFlowNode for ImportMember | user-provided value |
+| test.py:31:25:31:28 | ControlFlowNode for text | test.py:2:26:2:32 | ControlFlowNode for ImportMember | test.py:31:25:31:28 | ControlFlowNode for text | This $@ that depends on a $@ may run slow on strings starting with '0.9' and with many repetitions of '99'. | test.py:30:37:30:39 | \\d+ | regular expression | test.py:2:26:2:32 | ControlFlowNode for ImportMember | user-provided value |
+| test.py:32:32:32:35 | ControlFlowNode for text | test.py:2:26:2:32 | ControlFlowNode for ImportMember | test.py:32:32:32:35 | ControlFlowNode for text | This $@ that depends on a $@ may run slow on strings starting with '0.9' and with many repetitions of '99'. | test.py:30:37:30:39 | \\d+ | regular expression | test.py:2:26:2:32 | ControlFlowNode for ImportMember | user-provided value |
 edges
 | test.py:2:26:2:32 | ControlFlowNode for ImportMember | test.py:2:26:2:32 | ControlFlowNode for request | provenance |  |
 | test.py:2:26:2:32 | ControlFlowNode for request | test.py:7:12:7:18 | ControlFlowNode for request | provenance |  |
+| test.py:2:26:2:32 | ControlFlowNode for request | test.py:26:12:26:18 | ControlFlowNode for request | provenance |  |
 | test.py:7:5:7:8 | ControlFlowNode for text | test.py:8:30:8:33 | ControlFlowNode for text | provenance |  |
 | test.py:7:5:7:8 | ControlFlowNode for text | test.py:9:32:9:35 | ControlFlowNode for text | provenance |  |
 | test.py:7:5:7:8 | ControlFlowNode for text | test.py:12:17:12:20 | ControlFlowNode for text | provenance |  |
@@ -17,6 +22,13 @@ edges
 | test.py:7:12:7:35 | ControlFlowNode for Attribute() | test.py:7:5:7:8 | ControlFlowNode for text | provenance |  |
 | test.py:14:33:14:39 | ControlFlowNode for my_text | test.py:16:24:16:30 | ControlFlowNode for my_text | provenance |  |
 | test.py:18:28:18:31 | ControlFlowNode for text | test.py:14:33:14:39 | ControlFlowNode for my_text | provenance |  |
+| test.py:26:5:26:8 | ControlFlowNode for text | test.py:27:38:27:41 | ControlFlowNode for text | provenance |  |
+| test.py:26:5:26:8 | ControlFlowNode for text | test.py:28:53:28:56 | ControlFlowNode for text | provenance |  |
+| test.py:26:5:26:8 | ControlFlowNode for text | test.py:31:25:31:28 | ControlFlowNode for text | provenance |  |
+| test.py:26:5:26:8 | ControlFlowNode for text | test.py:32:32:32:35 | ControlFlowNode for text | provenance |  |
+| test.py:26:12:26:18 | ControlFlowNode for request | test.py:26:12:26:23 | ControlFlowNode for Attribute | provenance | AdditionalTaintStep |
+| test.py:26:12:26:23 | ControlFlowNode for Attribute | test.py:26:12:26:35 | ControlFlowNode for Attribute() | provenance | dict.get |
+| test.py:26:12:26:35 | ControlFlowNode for Attribute() | test.py:26:5:26:8 | ControlFlowNode for text | provenance |  |
 nodes
 | test.py:2:26:2:32 | ControlFlowNode for ImportMember | semmle.label | ControlFlowNode for ImportMember |
 | test.py:2:26:2:32 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
@@ -31,4 +43,12 @@ nodes
 | test.py:16:24:16:30 | ControlFlowNode for my_text | semmle.label | ControlFlowNode for my_text |
 | test.py:18:28:18:31 | ControlFlowNode for text | semmle.label | ControlFlowNode for text |
 | test.py:21:18:21:21 | ControlFlowNode for text | semmle.label | ControlFlowNode for text |
+| test.py:26:5:26:8 | ControlFlowNode for text | semmle.label | ControlFlowNode for text |
+| test.py:26:12:26:18 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| test.py:26:12:26:23 | ControlFlowNode for Attribute | semmle.label | ControlFlowNode for Attribute |
+| test.py:26:12:26:35 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
+| test.py:27:38:27:41 | ControlFlowNode for text | semmle.label | ControlFlowNode for text |
+| test.py:28:53:28:56 | ControlFlowNode for text | semmle.label | ControlFlowNode for text |
+| test.py:31:25:31:28 | ControlFlowNode for text | semmle.label | ControlFlowNode for text |
+| test.py:32:32:32:35 | ControlFlowNode for text | semmle.label | ControlFlowNode for text |
 subpaths
diff --git a/python/ql/test/query-tests/Security/CWE-730-PolynomialReDoS/test.py b/python/ql/test/query-tests/Security/CWE-730-PolynomialReDoS/test.py
index 60584229b917..5ed2f22c3657 100644
--- a/python/ql/test/query-tests/Security/CWE-730-PolynomialReDoS/test.py
+++ b/python/ql/test/query-tests/Security/CWE-730-PolynomialReDoS/test.py
@@ -20,3 +20,13 @@ def indirect(input_reg_str, my_text):
     reg2 = re.compile(r"(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)C.*Y")
     reg2.sub("", text) # $ Alert # NOT OK
 
+
+@app.route("/prefixmatch-poly-redos")
+def prefixmatch():
+    text = request.args.get("text")
+    re.prefixmatch(r"^0\.\d+E?\d+$", text) # $ Alert
+    re.prefixmatch(pattern=r"^0\.\d+E?\d+$", string=text) # $ Alert
+
+    pattern = re.compile(r"^0\.\d+E?\d+$")
+    pattern.prefixmatch(text) # $ Alert
+    pattern.prefixmatch(string=text) # $ Alert
diff --git a/python/ql/test/query-tests/Security/CWE-730-RegexInjection/RegexInjection.expected b/python/ql/test/query-tests/Security/CWE-730-RegexInjection/RegexInjection.expected
index 16d29401f785..c825e2ec9deb 100644
--- a/python/ql/test/query-tests/Security/CWE-730-RegexInjection/RegexInjection.expected
+++ b/python/ql/test/query-tests/Security/CWE-730-RegexInjection/RegexInjection.expected
@@ -1,3 +1,12 @@
+#select
+| re_bad.py:14:15:14:28 | ControlFlowNode for unsafe_pattern | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | re_bad.py:14:15:14:28 | ControlFlowNode for unsafe_pattern | This regular expression depends on a $@ and is executed by $@. | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value | re_bad.py:14:5:14:33 | ControlFlowNode for Attribute() | re.search |
+| re_bad.py:25:35:25:48 | ControlFlowNode for unsafe_pattern | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | re_bad.py:25:35:25:48 | ControlFlowNode for unsafe_pattern | This regular expression depends on a $@ and is executed by $@. | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value | re_bad.py:26:5:26:31 | ControlFlowNode for Attribute() | re.search |
+| re_bad.py:37:16:37:29 | ControlFlowNode for unsafe_pattern | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | re_bad.py:37:16:37:29 | ControlFlowNode for unsafe_pattern | This regular expression depends on a $@ and is executed by $@. | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value | re_bad.py:37:5:37:41 | ControlFlowNode for Attribute() | re.search |
+| re_prefixmatch.py:8:20:8:26 | ControlFlowNode for pattern | re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | re_prefixmatch.py:8:20:8:26 | ControlFlowNode for pattern | This regular expression depends on a $@ and is executed by $@. | re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value | re_prefixmatch.py:8:5:8:35 | ControlFlowNode for Attribute() | re.prefixmatch |
+| re_prefixmatch.py:13:28:13:34 | ControlFlowNode for pattern | re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | re_prefixmatch.py:13:28:13:34 | ControlFlowNode for pattern | This regular expression depends on a $@ and is executed by $@. | re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value | re_prefixmatch.py:13:5:13:50 | ControlFlowNode for Attribute() | re.prefixmatch |
+| re_prefixmatch.py:18:18:18:24 | ControlFlowNode for pattern | re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | re_prefixmatch.py:18:18:18:24 | ControlFlowNode for pattern | This regular expression depends on a $@ and is executed by $@. | re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value | re_prefixmatch.py:18:5:18:33 | ControlFlowNode for prefix_match() | re.prefixmatch |
+| re_prefixmatch.py:23:35:23:41 | ControlFlowNode for pattern | re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | re_prefixmatch.py:23:35:23:41 | ControlFlowNode for pattern | This regular expression depends on a $@ and is executed by $@. | re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value | re_prefixmatch.py:24:5:24:40 | ControlFlowNode for Attribute() | re.prefixmatch |
+| re_prefixmatch.py:29:43:29:49 | ControlFlowNode for pattern | re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | re_prefixmatch.py:29:43:29:49 | ControlFlowNode for pattern | This regular expression depends on a $@ and is executed by $@. | re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value | re_prefixmatch.py:30:5:30:64 | ControlFlowNode for Attribute() | re.prefixmatch |
 edges
 | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | re_bad.py:1:19:1:25 | ControlFlowNode for request | provenance |  |
 | re_bad.py:1:19:1:25 | ControlFlowNode for request | re_bad.py:13:22:13:28 | ControlFlowNode for request | provenance |  |
@@ -9,6 +18,22 @@ edges
 | re_bad.py:24:22:24:28 | ControlFlowNode for request | re_bad.py:24:5:24:18 | ControlFlowNode for unsafe_pattern | provenance | AdditionalTaintStep |
 | re_bad.py:36:5:36:18 | ControlFlowNode for unsafe_pattern | re_bad.py:37:16:37:29 | ControlFlowNode for unsafe_pattern | provenance |  |
 | re_bad.py:36:22:36:28 | ControlFlowNode for request | re_bad.py:36:5:36:18 | ControlFlowNode for unsafe_pattern | provenance | AdditionalTaintStep |
+| re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | provenance |  |
+| re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | re_prefixmatch.py:7:15:7:21 | ControlFlowNode for request | provenance |  |
+| re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | re_prefixmatch.py:12:15:12:21 | ControlFlowNode for request | provenance |  |
+| re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | re_prefixmatch.py:17:15:17:21 | ControlFlowNode for request | provenance |  |
+| re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | re_prefixmatch.py:22:15:22:21 | ControlFlowNode for request | provenance |  |
+| re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | re_prefixmatch.py:28:15:28:21 | ControlFlowNode for request | provenance |  |
+| re_prefixmatch.py:7:5:7:11 | ControlFlowNode for pattern | re_prefixmatch.py:8:20:8:26 | ControlFlowNode for pattern | provenance |  |
+| re_prefixmatch.py:7:15:7:21 | ControlFlowNode for request | re_prefixmatch.py:7:5:7:11 | ControlFlowNode for pattern | provenance | AdditionalTaintStep |
+| re_prefixmatch.py:12:5:12:11 | ControlFlowNode for pattern | re_prefixmatch.py:13:28:13:34 | ControlFlowNode for pattern | provenance |  |
+| re_prefixmatch.py:12:15:12:21 | ControlFlowNode for request | re_prefixmatch.py:12:5:12:11 | ControlFlowNode for pattern | provenance | AdditionalTaintStep |
+| re_prefixmatch.py:17:5:17:11 | ControlFlowNode for pattern | re_prefixmatch.py:18:18:18:24 | ControlFlowNode for pattern | provenance |  |
+| re_prefixmatch.py:17:15:17:21 | ControlFlowNode for request | re_prefixmatch.py:17:5:17:11 | ControlFlowNode for pattern | provenance | AdditionalTaintStep |
+| re_prefixmatch.py:22:5:22:11 | ControlFlowNode for pattern | re_prefixmatch.py:23:35:23:41 | ControlFlowNode for pattern | provenance |  |
+| re_prefixmatch.py:22:15:22:21 | ControlFlowNode for request | re_prefixmatch.py:22:5:22:11 | ControlFlowNode for pattern | provenance | AdditionalTaintStep |
+| re_prefixmatch.py:28:5:28:11 | ControlFlowNode for pattern | re_prefixmatch.py:29:43:29:49 | ControlFlowNode for pattern | provenance |  |
+| re_prefixmatch.py:28:15:28:21 | ControlFlowNode for request | re_prefixmatch.py:28:5:28:11 | ControlFlowNode for pattern | provenance | AdditionalTaintStep |
 nodes
 | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | semmle.label | ControlFlowNode for ImportMember |
 | re_bad.py:1:19:1:25 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
@@ -21,8 +46,21 @@ nodes
 | re_bad.py:36:5:36:18 | ControlFlowNode for unsafe_pattern | semmle.label | ControlFlowNode for unsafe_pattern |
 | re_bad.py:36:22:36:28 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
 | re_bad.py:37:16:37:29 | ControlFlowNode for unsafe_pattern | semmle.label | ControlFlowNode for unsafe_pattern |
+| re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | semmle.label | ControlFlowNode for ImportMember |
+| re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| re_prefixmatch.py:7:5:7:11 | ControlFlowNode for pattern | semmle.label | ControlFlowNode for pattern |
+| re_prefixmatch.py:7:15:7:21 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| re_prefixmatch.py:8:20:8:26 | ControlFlowNode for pattern | semmle.label | ControlFlowNode for pattern |
+| re_prefixmatch.py:12:5:12:11 | ControlFlowNode for pattern | semmle.label | ControlFlowNode for pattern |
+| re_prefixmatch.py:12:15:12:21 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| re_prefixmatch.py:13:28:13:34 | ControlFlowNode for pattern | semmle.label | ControlFlowNode for pattern |
+| re_prefixmatch.py:17:5:17:11 | ControlFlowNode for pattern | semmle.label | ControlFlowNode for pattern |
+| re_prefixmatch.py:17:15:17:21 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| re_prefixmatch.py:18:18:18:24 | ControlFlowNode for pattern | semmle.label | ControlFlowNode for pattern |
+| re_prefixmatch.py:22:5:22:11 | ControlFlowNode for pattern | semmle.label | ControlFlowNode for pattern |
+| re_prefixmatch.py:22:15:22:21 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| re_prefixmatch.py:23:35:23:41 | ControlFlowNode for pattern | semmle.label | ControlFlowNode for pattern |
+| re_prefixmatch.py:28:5:28:11 | ControlFlowNode for pattern | semmle.label | ControlFlowNode for pattern |
+| re_prefixmatch.py:28:15:28:21 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| re_prefixmatch.py:29:43:29:49 | ControlFlowNode for pattern | semmle.label | ControlFlowNode for pattern |
 subpaths
-#select
-| re_bad.py:14:15:14:28 | ControlFlowNode for unsafe_pattern | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | re_bad.py:14:15:14:28 | ControlFlowNode for unsafe_pattern | This regular expression depends on a $@ and is executed by $@. | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value | re_bad.py:14:5:14:33 | ControlFlowNode for Attribute() | re.search |
-| re_bad.py:25:35:25:48 | ControlFlowNode for unsafe_pattern | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | re_bad.py:25:35:25:48 | ControlFlowNode for unsafe_pattern | This regular expression depends on a $@ and is executed by $@. | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value | re_bad.py:26:5:26:31 | ControlFlowNode for Attribute() | re.search |
-| re_bad.py:37:16:37:29 | ControlFlowNode for unsafe_pattern | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | re_bad.py:37:16:37:29 | ControlFlowNode for unsafe_pattern | This regular expression depends on a $@ and is executed by $@. | re_bad.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value | re_bad.py:37:5:37:41 | ControlFlowNode for Attribute() | re.search |
diff --git a/python/ql/test/query-tests/Security/CWE-730-RegexInjection/re_prefixmatch.py b/python/ql/test/query-tests/Security/CWE-730-RegexInjection/re_prefixmatch.py
new file mode 100644
index 000000000000..0badba8b1675
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-730-RegexInjection/re_prefixmatch.py
@@ -0,0 +1,30 @@
+from flask import request # $ Source
+import re
+from re import prefixmatch as prefix_match
+
+
+def direct():
+    pattern = request.args["pattern"]
+    re.prefixmatch(pattern, "safe") # $ Alert
+
+
+def direct_keywords():
+    pattern = request.args["pattern"]
+    re.prefixmatch(pattern=pattern, string="safe") # $ Alert
+
+
+def imported_alias():
+    pattern = request.args["pattern"]
+    prefix_match(pattern, "safe") # $ Alert
+
+
+def compiled():
+    pattern = request.args["pattern"]
+    compiled_pattern = re.compile(pattern) # $ Alert
+    compiled_pattern.prefixmatch("safe")
+
+
+def compiled_keywords():
+    pattern = request.args["pattern"]
+    compiled_pattern = re.compile(pattern=pattern) # $ Alert
+    compiled_pattern.prefixmatch(string="safe", pos=0, endpos=4)
diff --git a/python/ql/test/query-tests/Security/CWE-918-ServerSideRequestForgery/FullServerSideRequestForgery.expected b/python/ql/test/query-tests/Security/CWE-918-ServerSideRequestForgery/FullServerSideRequestForgery.expected
index 7434eca6978b..1fc30af2a40e 100644
--- a/python/ql/test/query-tests/Security/CWE-918-ServerSideRequestForgery/FullServerSideRequestForgery.expected
+++ b/python/ql/test/query-tests/Security/CWE-918-ServerSideRequestForgery/FullServerSideRequestForgery.expected
@@ -39,6 +39,8 @@
 | test_path_validation.py:122:9:122:58 | ControlFlowNode for SecretClient() | test_path_validation.py:5:19:5:25 | ControlFlowNode for ImportMember | test_path_validation.py:122:32:122:34 | ControlFlowNode for url | The full URL of this request depends on a $@. | test_path_validation.py:5:19:5:25 | ControlFlowNode for ImportMember | user-provided value |
 | test_path_validation.py:125:9:125:58 | ControlFlowNode for SecretClient() | test_path_validation.py:5:19:5:25 | ControlFlowNode for ImportMember | test_path_validation.py:125:32:125:34 | ControlFlowNode for url | The full URL of this request depends on a $@. | test_path_validation.py:5:19:5:25 | ControlFlowNode for ImportMember | user-provided value |
 | test_path_validation.py:132:9:132:58 | ControlFlowNode for SecretClient() | test_path_validation.py:5:19:5:25 | ControlFlowNode for ImportMember | test_path_validation.py:132:32:132:34 | ControlFlowNode for url | The full URL of this request depends on a $@. | test_path_validation.py:5:19:5:25 | ControlFlowNode for ImportMember | user-provided value |
+| test_re_prefixmatch.py:19:9:19:25 | ControlFlowNode for Attribute() | test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | test_re_prefixmatch.py:19:22:19:24 | ControlFlowNode for url | The full URL of this request depends on a $@. | test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value |
+| test_re_prefixmatch.py:28:9:28:25 | ControlFlowNode for Attribute() | test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | test_re_prefixmatch.py:28:22:28:24 | ControlFlowNode for url | The full URL of this request depends on a $@. | test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value |
 | test_requests.py:9:5:9:28 | ControlFlowNode for Attribute() | test_requests.py:1:19:1:25 | ControlFlowNode for ImportMember | test_requests.py:9:18:9:27 | ControlFlowNode for user_input | The full URL of this request depends on a $@. | test_requests.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value |
 | test_requests.py:17:5:17:27 | ControlFlowNode for Attribute() | test_requests.py:1:19:1:25 | ControlFlowNode for ImportMember | test_requests.py:17:17:17:26 | ControlFlowNode for user_input | The full URL of this request depends on a $@. | test_requests.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value |
 | test_requests.py:22:5:22:44 | ControlFlowNode for Attribute() | test_requests.py:1:19:1:25 | ControlFlowNode for ImportMember | test_requests.py:22:34:22:43 | ControlFlowNode for user_input | The full URL of this request depends on a $@. | test_requests.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value |
@@ -138,6 +140,13 @@ edges
 | test_path_validation.py:61:5:61:7 | ControlFlowNode for url | test_path_validation.py:122:32:122:34 | ControlFlowNode for url | provenance | Sink:MaD:2 |
 | test_path_validation.py:61:5:61:7 | ControlFlowNode for url | test_path_validation.py:125:32:125:34 | ControlFlowNode for url | provenance | Sink:MaD:2 |
 | test_path_validation.py:61:5:61:7 | ControlFlowNode for url | test_path_validation.py:132:32:132:34 | ControlFlowNode for url | provenance | Sink:MaD:2 |
+| test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | provenance |  |
+| test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | test_re_prefixmatch.py:15:11:15:17 | ControlFlowNode for request | provenance |  |
+| test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | test_re_prefixmatch.py:23:11:23:17 | ControlFlowNode for request | provenance |  |
+| test_re_prefixmatch.py:15:5:15:7 | ControlFlowNode for url | test_re_prefixmatch.py:19:22:19:24 | ControlFlowNode for url | provenance |  |
+| test_re_prefixmatch.py:15:11:15:17 | ControlFlowNode for request | test_re_prefixmatch.py:15:5:15:7 | ControlFlowNode for url | provenance | AdditionalTaintStep |
+| test_re_prefixmatch.py:23:5:23:7 | ControlFlowNode for url | test_re_prefixmatch.py:28:22:28:24 | ControlFlowNode for url | provenance |  |
+| test_re_prefixmatch.py:23:11:23:17 | ControlFlowNode for request | test_re_prefixmatch.py:23:5:23:7 | ControlFlowNode for url | provenance | AdditionalTaintStep |
 | test_requests.py:1:19:1:25 | ControlFlowNode for ImportMember | test_requests.py:1:19:1:25 | ControlFlowNode for request | provenance |  |
 | test_requests.py:1:19:1:25 | ControlFlowNode for request | test_requests.py:7:18:7:24 | ControlFlowNode for request | provenance |  |
 | test_requests.py:1:19:1:25 | ControlFlowNode for request | test_requests.py:14:18:14:24 | ControlFlowNode for request | provenance |  |
@@ -249,6 +258,14 @@ nodes
 | test_path_validation.py:122:32:122:34 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
 | test_path_validation.py:125:32:125:34 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
 | test_path_validation.py:132:32:132:34 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
+| test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | semmle.label | ControlFlowNode for ImportMember |
+| test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| test_re_prefixmatch.py:15:5:15:7 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
+| test_re_prefixmatch.py:15:11:15:17 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| test_re_prefixmatch.py:19:22:19:24 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
+| test_re_prefixmatch.py:23:5:23:7 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
+| test_re_prefixmatch.py:23:11:23:17 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| test_re_prefixmatch.py:28:22:28:24 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
 | test_requests.py:1:19:1:25 | ControlFlowNode for ImportMember | semmle.label | ControlFlowNode for ImportMember |
 | test_requests.py:1:19:1:25 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
 | test_requests.py:7:5:7:14 | ControlFlowNode for user_input | semmle.label | ControlFlowNode for user_input |
diff --git a/python/ql/test/query-tests/Security/CWE-918-ServerSideRequestForgery/PartialServerSideRequestForgery.expected b/python/ql/test/query-tests/Security/CWE-918-ServerSideRequestForgery/PartialServerSideRequestForgery.expected
index a8d907793129..eb1d75c0e48d 100644
--- a/python/ql/test/query-tests/Security/CWE-918-ServerSideRequestForgery/PartialServerSideRequestForgery.expected
+++ b/python/ql/test/query-tests/Security/CWE-918-ServerSideRequestForgery/PartialServerSideRequestForgery.expected
@@ -39,6 +39,8 @@
 | test_path_validation.py:120:9:120:58 | ControlFlowNode for SecretClient() | test_path_validation.py:5:19:5:25 | ControlFlowNode for ImportMember | test_path_validation.py:120:32:120:34 | ControlFlowNode for url | Part of the URL of this request depends on a $@. | test_path_validation.py:5:19:5:25 | ControlFlowNode for ImportMember | user-provided value |
 | test_path_validation.py:127:9:127:58 | ControlFlowNode for SecretClient() | test_path_validation.py:5:19:5:25 | ControlFlowNode for ImportMember | test_path_validation.py:127:32:127:34 | ControlFlowNode for url | Part of the URL of this request depends on a $@. | test_path_validation.py:5:19:5:25 | ControlFlowNode for ImportMember | user-provided value |
 | test_path_validation.py:130:9:130:58 | ControlFlowNode for SecretClient() | test_path_validation.py:5:19:5:25 | ControlFlowNode for ImportMember | test_path_validation.py:130:32:130:34 | ControlFlowNode for url | Part of the URL of this request depends on a $@. | test_path_validation.py:5:19:5:25 | ControlFlowNode for ImportMember | user-provided value |
+| test_re_prefixmatch.py:11:9:11:51 | ControlFlowNode for Attribute() | test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | test_re_prefixmatch.py:11:22:11:50 | ControlFlowNode for Fstring | Part of the URL of this request depends on a $@. | test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value |
+| test_re_prefixmatch.py:37:9:37:51 | ControlFlowNode for Attribute() | test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | test_re_prefixmatch.py:37:22:37:50 | ControlFlowNode for Fstring | Part of the URL of this request depends on a $@. | test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | user-provided value |
 edges
 | full_partial_test.py:1:19:1:25 | ControlFlowNode for ImportMember | full_partial_test.py:1:19:1:25 | ControlFlowNode for request | provenance |  |
 | full_partial_test.py:1:19:1:25 | ControlFlowNode for request | full_partial_test.py:7:18:7:24 | ControlFlowNode for request | provenance |  |
@@ -226,6 +228,19 @@ edges
 | test_path_validation.py:61:5:61:7 | ControlFlowNode for url | test_path_validation.py:127:32:127:34 | ControlFlowNode for url | provenance | Sink:MaD:2 |
 | test_path_validation.py:61:5:61:7 | ControlFlowNode for url | test_path_validation.py:130:32:130:34 | ControlFlowNode for url | provenance | Sink:MaD:2 |
 | test_path_validation.py:61:5:61:7 | ControlFlowNode for url | test_path_validation.py:132:32:132:34 | ControlFlowNode for url | provenance | Sink:MaD:2 |
+| test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | provenance |  |
+| test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | test_re_prefixmatch.py:7:12:7:18 | ControlFlowNode for request | provenance |  |
+| test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | test_re_prefixmatch.py:15:11:15:17 | ControlFlowNode for request | provenance |  |
+| test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | test_re_prefixmatch.py:23:11:23:17 | ControlFlowNode for request | provenance |  |
+| test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | test_re_prefixmatch.py:32:12:32:18 | ControlFlowNode for request | provenance |  |
+| test_re_prefixmatch.py:7:5:7:8 | ControlFlowNode for path | test_re_prefixmatch.py:11:22:11:50 | ControlFlowNode for Fstring | provenance |  |
+| test_re_prefixmatch.py:7:12:7:18 | ControlFlowNode for request | test_re_prefixmatch.py:7:5:7:8 | ControlFlowNode for path | provenance | AdditionalTaintStep |
+| test_re_prefixmatch.py:15:5:15:7 | ControlFlowNode for url | test_re_prefixmatch.py:19:22:19:24 | ControlFlowNode for url | provenance |  |
+| test_re_prefixmatch.py:15:11:15:17 | ControlFlowNode for request | test_re_prefixmatch.py:15:5:15:7 | ControlFlowNode for url | provenance | AdditionalTaintStep |
+| test_re_prefixmatch.py:23:5:23:7 | ControlFlowNode for url | test_re_prefixmatch.py:28:22:28:24 | ControlFlowNode for url | provenance |  |
+| test_re_prefixmatch.py:23:11:23:17 | ControlFlowNode for request | test_re_prefixmatch.py:23:5:23:7 | ControlFlowNode for url | provenance | AdditionalTaintStep |
+| test_re_prefixmatch.py:32:5:32:8 | ControlFlowNode for path | test_re_prefixmatch.py:37:22:37:50 | ControlFlowNode for Fstring | provenance |  |
+| test_re_prefixmatch.py:32:12:32:18 | ControlFlowNode for request | test_re_prefixmatch.py:32:5:32:8 | ControlFlowNode for path | provenance | AdditionalTaintStep |
 | test_requests.py:1:19:1:25 | ControlFlowNode for ImportMember | test_requests.py:1:19:1:25 | ControlFlowNode for request | provenance |  |
 | test_requests.py:1:19:1:25 | ControlFlowNode for request | test_requests.py:7:18:7:24 | ControlFlowNode for request | provenance |  |
 | test_requests.py:1:19:1:25 | ControlFlowNode for request | test_requests.py:14:18:14:24 | ControlFlowNode for request | provenance |  |
@@ -418,6 +433,20 @@ nodes
 | test_path_validation.py:127:32:127:34 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
 | test_path_validation.py:130:32:130:34 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
 | test_path_validation.py:132:32:132:34 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
+| test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for ImportMember | semmle.label | ControlFlowNode for ImportMember |
+| test_re_prefixmatch.py:1:19:1:25 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| test_re_prefixmatch.py:7:5:7:8 | ControlFlowNode for path | semmle.label | ControlFlowNode for path |
+| test_re_prefixmatch.py:7:12:7:18 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| test_re_prefixmatch.py:11:22:11:50 | ControlFlowNode for Fstring | semmle.label | ControlFlowNode for Fstring |
+| test_re_prefixmatch.py:15:5:15:7 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
+| test_re_prefixmatch.py:15:11:15:17 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| test_re_prefixmatch.py:19:22:19:24 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
+| test_re_prefixmatch.py:23:5:23:7 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
+| test_re_prefixmatch.py:23:11:23:17 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| test_re_prefixmatch.py:28:22:28:24 | ControlFlowNode for url | semmle.label | ControlFlowNode for url |
+| test_re_prefixmatch.py:32:5:32:8 | ControlFlowNode for path | semmle.label | ControlFlowNode for path |
+| test_re_prefixmatch.py:32:12:32:18 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| test_re_prefixmatch.py:37:22:37:50 | ControlFlowNode for Fstring | semmle.label | ControlFlowNode for Fstring |
 | test_requests.py:1:19:1:25 | ControlFlowNode for ImportMember | semmle.label | ControlFlowNode for ImportMember |
 | test_requests.py:1:19:1:25 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
 | test_requests.py:7:5:7:14 | ControlFlowNode for user_input | semmle.label | ControlFlowNode for user_input |
diff --git a/python/ql/test/query-tests/Security/CWE-918-ServerSideRequestForgery/test_re_prefixmatch.py b/python/ql/test/query-tests/Security/CWE-918-ServerSideRequestForgery/test_re_prefixmatch.py
new file mode 100644
index 000000000000..6853413c3345
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-918-ServerSideRequestForgery/test_re_prefixmatch.py
@@ -0,0 +1,37 @@
+from flask import request # $ Source
+import re
+import requests
+
+
+def direct():
+    path = request.args["path"]
+    if re.prefixmatch(r"[a-zA-Z0-9]+\Z", path):
+        requests.get(f"https://example.com/{path}")
+    else:
+        requests.get(f"https://example.com/{path}") # $ Alert[py/partial-ssrf]
+
+
+def direct_keywords():
+    url = request.args["url"]
+    if re.prefixmatch(pattern=r"https://example\.com/[a-zA-Z0-9]+\Z", string=url):
+        requests.get(url)
+    else:
+        requests.get(url) # $ Alert[py/full-ssrf]
+
+
+def compiled():
+    url = request.args["url"]
+    pattern = re.compile(r"https://example\.com/[a-zA-Z0-9]+\Z")
+    if pattern.prefixmatch(url):
+        requests.get(url)
+    else:
+        requests.get(url) # $ Alert[py/full-ssrf]
+
+
+def compiled_keywords():
+    path = request.args["path"]
+    pattern = re.compile(r"[a-zA-Z0-9]+\Z")
+    if pattern.prefixmatch(string=path):
+        requests.get(f"https://example.com/{path}")
+    else:
+        requests.get(f"https://example.com/{path}") # $ Alert[py/partial-ssrf]
diff --git a/ql/Cargo.lock b/ql/Cargo.lock
index d6ea9ea343ef..fd46dc52cc76 100644
--- a/ql/Cargo.lock
+++ b/ql/Cargo.lock
@@ -28,9 +28,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -43,15 +43,15 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
 dependencies = [
  "utf8parse",
 ]
@@ -109,10 +109,11 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.37"
+version = "1.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf"
+checksum = "54413ede23c2daf518f35156dfde027feb2374004d63bd497f983c8db9c0e313"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -126,9 +127,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.44"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
 dependencies = [
  "iana-time-zone",
  "js-sys",
@@ -140,9 +141,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.20"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+checksum = "aa8876b300ab35ba921adea3dfd70157a46249b33f95c9084ae5709785478946"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -150,9 +151,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.20"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+checksum = "ec0797fb7aeb1406c84efac526901f7ec3ead2124f946b494e72879d4b54704d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -162,21 +163,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.18"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+checksum = "f9c751b79415d4e559e3d1fcf128e09e720eb673a06d26cf6f392d37d75b66e0"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 3.0.6",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486"
 
 [[package]]
 name = "codeql-extractor"
@@ -338,6 +339,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef25905e51abafe4dcea6c15fec58c57b601cdbd0ee53d22ea1d3016c587d39b"
+
 [[package]]
 name = "flate2"
 version = "1.1.0"
@@ -450,9 +457,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.162"
+version = "0.2.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
+checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
 
 [[package]]
 name = "log"
@@ -532,9 +539,9 @@ checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
 dependencies = [
  "unicode-ident",
 ]
@@ -570,9 +577,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.12.3"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -582,9 +589,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.14"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -593,9 +600,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "ryu"
@@ -605,34 +612,46 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "serde"
-version = "1.0.214"
+version = "1.0.229"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
+checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.214"
+version = "1.0.229"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
+checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 3.0.6",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.132"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
+checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
 dependencies = [
+ "indexmap",
  "itoa",
  "memchr",
- "ryu",
  "serde",
+ "serde_core",
+ "zmij",
 ]
 
 [[package]]
@@ -659,9 +678,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.3.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
 [[package]]
 name = "smallvec"
@@ -692,6 +711,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "thread_local"
 version = "1.1.8"
@@ -721,7 +751,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -765,13 +795,14 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter"
-version = "0.24.4"
+version = "0.26.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67baf55e7e1b6806063b1e51041069c90afff16afcbbccd278d899f9d84bca4"
+checksum = "17ebdd3a5a7e28a1890b876fdbd0c3c0fe0a6336cffaa104f11b9f720c9daa29"
 dependencies = [
  "cc",
  "regex",
  "regex-syntax",
+ "serde_json",
  "streaming-iterator",
  "tree-sitter-language",
 ]
@@ -802,9 +833,9 @@ checksum = "e8ddffe35a0e5eeeadf13ff7350af564c6e73993a24db62caee1822b185c2600"
 
 [[package]]
 name = "tree-sitter-python"
-version = "0.23.6"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d065aaa27f3aaceaf60c1f0e0ac09e1cb9eb8ed28e7bcdaa52129cffc7f4b04"
+checksum = "6bf85fd39652e740bf60f46f4cda9492c3a9ad75880575bf14960f775cb74a1c"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -812,8 +843,8 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-ql"
-version = "0.23.0"
-source = "git+https://github.com/tree-sitter/tree-sitter-ql.git?rev=c73c31c89cb0019ef56fe8bc1723e7c36e0be607#c73c31c89cb0019ef56fe8bc1723e7c36e0be607"
+version = "0.23.1"
+source = "git+https://github.com/tree-sitter/tree-sitter-ql.git?rev=d9d6c853caf0f882e6371e4d4da5817c48c8a8d8#d9d6c853caf0f882e6371e4d4da5817c48c8a8d8"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -884,7 +915,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.87",
  "wasm-bindgen-shared",
 ]
 
@@ -906,7 +937,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.87",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -1026,7 +1057,7 @@ version = "0.1.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 3.0.6",
 ]
 
 [[package]]
@@ -1038,6 +1069,12 @@ dependencies = [
  "serde_yaml",
 ]
 
+[[package]]
+name = "zmij"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
+
 [[package]]
 name = "zstd"
 version = "0.13.3"
diff --git a/ql/buramu/src/main.rs b/ql/buramu/src/main.rs
index f91ba8352efc..91e6cc298605 100644
--- a/ql/buramu/src/main.rs
+++ b/ql/buramu/src/main.rs
@@ -24,7 +24,7 @@ fn test_get_filename_and_lineno() {
 
 fn get_files_with_deprecations() -> FileDeprecations {
     let output = Command::new("git")
-        .args(&[
+        .args([
             "grep",
             "-n",
             "-E",
@@ -38,10 +38,7 @@ fn get_files_with_deprecations() -> FileDeprecations {
     let mut file_deprecations: FileDeprecations = HashMap::new();
     for line in output.stdout.lines() {
         let (file, lineno) = get_filename_and_lineno(&line.unwrap());
-        file_deprecations
-            .entry(file)
-            .or_insert_with(Vec::new)
-            .push(lineno);
+        file_deprecations.entry(file).or_default().push(lineno);
     }
     file_deprecations
 }
diff --git a/ql/buramu/tree-sitter-blame/bindings/rust/build.rs b/ql/buramu/tree-sitter-blame/bindings/rust/build.rs
index 4cc26f5e0f86..067936913bdd 100644
--- a/ql/buramu/tree-sitter-blame/bindings/rust/build.rs
+++ b/ql/buramu/tree-sitter-blame/bindings/rust/build.rs
@@ -2,7 +2,7 @@ fn main() {
     let src_dir = std::path::Path::new("src");
 
     let mut c_config = cc::Build::new();
-    c_config.include(&src_dir);
+    c_config.include(src_dir);
     c_config
         .flag_if_supported("-Wno-unused-parameter")
         .flag_if_supported("-Wno-unused-but-set-variable")
@@ -11,7 +11,7 @@ fn main() {
     c_config.flag("-utf-8");
 
     let parser_path = src_dir.join("parser.c");
-    c_config.file(&parser_path);
+    c_config.file(parser_path.as_path());
 
     // If your language uses an external scanner written in C,
     // then include this block of code:
diff --git a/ql/extractor/Cargo.toml b/ql/extractor/Cargo.toml
index 637a4bf5f3b6..aa81f1904171 100644
--- a/ql/extractor/Cargo.toml
+++ b/ql/extractor/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tree-sitter = ">= 0.23.0"
-tree-sitter-ql = { git = "https://github.com/tree-sitter/tree-sitter-ql.git", rev = "c73c31c89cb0019ef56fe8bc1723e7c36e0be607"}
+tree-sitter = ">= 0.26.0"
+tree-sitter-ql = { git = "https://github.com/tree-sitter/tree-sitter-ql.git", rev = "d9d6c853caf0f882e6371e4d4da5817c48c8a8d8"}
 tree-sitter-ql-dbscheme = { git = "https://github.com/tree-sitter/tree-sitter-ql-dbscheme.git", rev = "1980b4b6998a1138d326f863e6168f0f2c0c544d"}
 tree-sitter-blame = {path = "../buramu/tree-sitter-blame"}
 tree-sitter-json = {git = "https://github.com/tree-sitter/tree-sitter-json.git", rev = "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571"}
diff --git a/ql/ql/src/codeql_ql/ast/Ast.qll b/ql/ql/src/codeql_ql/ast/Ast.qll
index 18e306495566..7cdfd6163d2a 100644
--- a/ql/ql/src/codeql_ql/ast/Ast.qll
+++ b/ql/ql/src/codeql_ql/ast/Ast.qll
@@ -833,7 +833,11 @@ class Module extends TModule, ModuleDeclaration {
 
   Module() { this = TModule(mod) }
 
-  override Location getLocation() { result = mod.asLeft().getName().getLocation() }
+  override Location getLocation() {
+    result = mod.asLeft().getName().getLocation()
+    or
+    not exists(mod.asLeft().getName()) and result = mod.asLeft().getLocation()
+  }
 
   override string getAPrimaryQlClass() { result = "Module" }
 
@@ -2526,13 +2530,25 @@ private class AnnotationArg extends TAnnotationArg, AstNode {
 
   AnnotationArg() { this = TAnnotationArg(arg) }
 
+  private predicate isOptional() {
+    arg.getLocation().getEndLine() != arg.getChild().getLocation().getEndLine()
+    or
+    arg.getLocation().getEndColumn() != arg.getChild().getLocation().getEndColumn()
+  }
+
   /** Gets the name of this argument. */
   string getValue() {
-    result =
-      [
-        arg.getChild().(QL::SimpleId).getValue(), arg.getChild().(QL::Result).getValue(),
-        arg.getChild().(QL::This).getValue()
-      ]
+    exists(string value |
+      value =
+        [
+          arg.getChild().(QL::SimpleId).getValue(), arg.getChild().(QL::Result).getValue(),
+          arg.getChild().(QL::This).getValue()
+        ]
+    |
+      result = value and not this.isOptional()
+      or
+      result = value + "?" and this.isOptional()
+    )
   }
 
   override string toString() { result = this.getValue() }
diff --git a/ql/ql/src/codeql_ql/ast/internal/Module.qll b/ql/ql/src/codeql_ql/ast/internal/Module.qll
index 3b3035c77624..6918b468a848 100644
--- a/ql/ql/src/codeql_ql/ast/internal/Module.qll
+++ b/ql/ql/src/codeql_ql/ast/internal/Module.qll
@@ -170,13 +170,13 @@ private predicate resolveImportQualifier(Import imp, ContainerOrModule m) {
 
 cached
 private module Cached {
-  private AstNode parent(AstNode n) {
-    result = n.getParent() and
-    not n instanceof Module
+  private Module getEnclosingModule0(AstNode n) {
+    result = n.getParent()
+    or
+    not n.getParent() instanceof Module and
+    result = getEnclosingModule0(n.getParent())
   }
 
-  private Module getEnclosingModule0(AstNode n) { result = parent*(n.getParent()) }
-
   cached
   ContainerOrModule getEnclosingModule(AstNode n) {
     result = TModule(getEnclosingModule0(n))
@@ -375,7 +375,8 @@ module ModConsistency {
 
   query predicate noName(AstNode mod) {
     mod instanceof Module and
-    not exists(mod.(Module).getName())
+    not exists(mod.(Module).getName()) and
+    not mod.getParent() instanceof TopLevel
     or
     mod instanceof ModuleExpr and
     not exists(mod.(ModuleExpr).getName())
diff --git a/ql/ql/src/codeql_ql/ast/internal/Predicate.qll b/ql/ql/src/codeql_ql/ast/internal/Predicate.qll
index b45eb2166f19..e46e36b16dac 100644
--- a/ql/ql/src/codeql_ql/ast/internal/Predicate.qll
+++ b/ql/ql/src/codeql_ql/ast/internal/Predicate.qll
@@ -169,9 +169,20 @@ private module Cached {
     )
   }
 
+  pragma[noinline]
+  private predicate builtin(BuiltinClassless pred, string name, int arity) {
+    name = pred.getName() and
+    arity = count(int i | exists(pred.getParameterType(i)))
+  }
+
+  pragma[noinline]
+  private predicate call(PredicateCall call, string name, int arity) {
+    name = call.getPredicateName() and
+    arity = call.getNumberOfArguments()
+  }
+
   private predicate resolveBuiltinPredicateCall(PredicateCall call, BuiltinClassless pred) {
-    call.getNumberOfArguments() = pred.getArity() and
-    call.getPredicateName() = pred.getName()
+    exists(string name, int arity | builtin(pred, name, arity) and call(call, name, arity))
   }
 
   cached
diff --git a/ql/ql/src/codeql_ql/ast/internal/TreeSitter.qll b/ql/ql/src/codeql_ql/ast/internal/TreeSitter.qll
index 51424106719d..3edb8d427b8a 100644
--- a/ql/ql/src/codeql_ql/ast/internal/TreeSitter.qll
+++ b/ql/ql/src/codeql_ql/ast/internal/TreeSitter.qll
@@ -807,7 +807,7 @@ module QL {
     final F::SignatureExpr getAnImplements() { result = this.getImplements(_) }
 
     /** Gets the node corresponding to the field `name`. */
-    final F::ModuleName getName() { ql_module_def(this, result) }
+    final F::ModuleName getName() { ql_module_name(this, result) }
 
     /** Gets the node corresponding to the field `parameter`. */
     final F::ModuleParam getParameter(int i) { ql_module_parameter(this, i, result) }
@@ -824,7 +824,7 @@ module QL {
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
       ql_module_implements(this, _, result) or
-      ql_module_def(this, result) or
+      ql_module_name(this, result) or
       ql_module_parameter(this, _, result) or
       ql_module_child(this, _, result)
     }
diff --git a/ql/ql/src/codeql_ql/ast/internal/Variable.qll b/ql/ql/src/codeql_ql/ast/internal/Variable.qll
index aa62c3964048..d76d3d700c9a 100644
--- a/ql/ql/src/codeql_ql/ast/internal/Variable.qll
+++ b/ql/ql/src/codeql_ql/ast/internal/Variable.qll
@@ -51,13 +51,13 @@ class VariableScope extends TScope, AstNode {
   }
 }
 
-private AstNode parent(AstNode child) {
-  result = child.getParent() and
-  not child instanceof VariableScope
-}
-
 pragma[nomagic]
-VariableScope scopeOf(AstNode n) { result = parent*(n.getParent()) }
+VariableScope scopeOf(AstNode n) {
+  result = n.getParent()
+  or
+  not n.getParent() instanceof VariableScope and
+  result = scopeOf(n.getParent())
+}
 
 private string getName(Identifier i) {
   exists(QL::Variable v |
diff --git a/ql/ql/src/ql.dbscheme b/ql/ql/src/ql.dbscheme
index c50cdd7429a4..b246d6ce970b 100644
--- a/ql/ql/src/ql.dbscheme
+++ b/ql/ql/src/ql.dbscheme
@@ -555,6 +555,11 @@ ql_module_implements(
   unique int implements: @ql_signature_expr ref
 );
 
+ql_module_name(
+  unique int ql_module: @ql_module ref,
+  unique int name: @ql_module_name ref
+);
+
 #keyset[ql_module, index]
 ql_module_parameter(
   int ql_module: @ql_module ref,
@@ -572,8 +577,7 @@ ql_module_child(
 );
 
 ql_module_def(
-  unique int id: @ql_module,
-  int name: @ql_module_name ref
+  unique int id: @ql_module
 );
 
 ql_module_alias_body_def(
diff --git a/ql/ql/src/ql.dbscheme.stats b/ql/ql/src/ql.dbscheme.stats
index 9d7f44eaa4b1..82714bfe1d07 100644
--- a/ql/ql/src/ql.dbscheme.stats
+++ b/ql/ql/src/ql.dbscheme.stats
@@ -1,22487 +1,4 @@
 <dbstats>
-  <typesizes><e>
-            <k>@blame_blame_entry</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@blame_blame_info</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@blame_file_entry</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@blame_reserved_word</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@blame_token_date</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@blame_token_filename</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@blame_token_number</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@dbscheme_annotation</k>
-            <v>30564</v>
-        </e>
-        <e>
-            <k>@dbscheme_args_annotation</k>
-            <v>30555</v>
-        </e>
-        <e>
-            <k>@dbscheme_branch</k>
-            <v>151025</v>
-        </e>
-        <e>
-            <k>@dbscheme_case_decl</k>
-            <v>5423</v>
-        </e>
-        <e>
-            <k>@dbscheme_col_type</k>
-            <v>341399</v>
-        </e>
-        <e>
-            <k>@dbscheme_column</k>
-            <v>341399</v>
-        </e>
-        <e>
-            <k>@dbscheme_dbscheme</k>
-            <v>686</v>
-        </e>
-        <e>
-            <k>@dbscheme_entry</k>
-            <v>230044</v>
-        </e>
-        <e>
-            <k>@dbscheme_repr_type</k>
-            <v>341399</v>
-        </e>
-        <e>
-            <k>@dbscheme_reserved_word</k>
-            <v>1756569</v>
-        </e>
-        <e>
-            <k>@dbscheme_table</k>
-            <v>146537</v>
-        </e>
-        <e>
-            <k>@dbscheme_table_name</k>
-            <v>146537</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_annot_name</k>
-            <v>30564</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_block_comment</k>
-            <v>22060</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_boolean</k>
-            <v>2146</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_date</k>
-            <v>1170</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_dbtype</k>
-            <v>750840</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_float</k>
-            <v>2962</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_int</k>
-            <v>350777</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_integer</k>
-            <v>158986</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_line_comment</k>
-            <v>62355</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_qldoc</k>
-            <v>10956</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_ref</k>
-            <v>281648</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_simple_id</k>
-            <v>543204</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_string</k>
-            <v>67865</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_unique</k>
-            <v>102289</v>
-        </e>
-        <e>
-            <k>@dbscheme_token_varchar</k>
-            <v>7961</v>
-        </e>
-        <e>
-            <k>@dbscheme_union_decl</k>
-            <v>67798</v>
-        </e>
-        <e>
-            <k>@diagnostic_debug</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@diagnostic_error</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@diagnostic_info</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@diagnostic_warning</k>
-            <v>5</v>
-        </e>
-        <e>
-            <k>@file</k>
-            <v>12283</v>
-        </e>
-        <e>
-            <k>@folder</k>
-            <v>4402</v>
-        </e>
-        <e>
-            <k>@json_array</k>
-            <v>2026</v>
-        </e>
-        <e>
-            <k>@json_document</k>
-            <v>324</v>
-        </e>
-        <e>
-            <k>@json_object</k>
-            <v>5034</v>
-        </e>
-        <e>
-            <k>@json_pair</k>
-            <v>12461</v>
-        </e>
-        <e>
-            <k>@json_reserved_word</k>
-            <v>82515</v>
-        </e>
-        <e>
-            <k>@json_string__</k>
-            <v>22176</v>
-        </e>
-        <e>
-            <k>@json_token_comment</k>
-            <v>19</v>
-        </e>
-        <e>
-            <k>@json_token_false</k>
-            <v>607</v>
-        </e>
-        <e>
-            <k>@json_token_null</k>
-            <v>248</v>
-        </e>
-        <e>
-            <k>@json_token_number</k>
-            <v>71</v>
-        </e>
-        <e>
-            <k>@json_token_string_content</k>
-            <v>22171</v>
-        </e>
-        <e>
-            <k>@json_token_true</k>
-            <v>978</v>
-        </e>
-    <e>
-            <k>@location_default</k>
-            <v>9617371</v>
-        </e>
-        <e>
-            <k>@ql_add_expr</k>
-            <v>13786</v>
-        </e>
-        <e>
-            <k>@ql_aggregate</k>
-            <v>9053</v>
-        </e>
-        <e>
-            <k>@ql_annot_arg</k>
-            <v>4043</v>
-        </e>
-        <e>
-            <k>@ql_annotation</k>
-            <v>65278</v>
-        </e>
-        <e>
-            <k>@ql_arityless_predicate_expr</k>
-            <v>58107</v>
-        </e>
-        <e>
-            <k>@ql_as_expr</k>
-            <v>20508</v>
-        </e>
-        <e>
-            <k>@ql_as_exprs</k>
-            <v>8493</v>
-        </e>
-        <e>
-            <k>@ql_body</k>
-            <v>65826</v>
-        </e>
-        <e>
-            <k>@ql_bool</k>
-            <v>4274</v>
-        </e>
-        <e>
-            <k>@ql_call_body</k>
-            <v>57368</v>
-        </e>
-        <e>
-            <k>@ql_call_or_unqual_agg_expr</k>
-            <v>57368</v>
-        </e>
-        <e>
-            <k>@ql_charpred</k>
-            <v>12088</v>
-        </e>
-        <e>
-            <k>@ql_class_member</k>
-            <v>79133</v>
-        </e>
-        <e>
-            <k>@ql_classless_predicate</k>
-            <v>23253</v>
-        </e>
-        <e>
-            <k>@ql_comp_term</k>
-            <v>140334</v>
-        </e>
-        <e>
-            <k>@ql_conjunction</k>
-            <v>76308</v>
-        </e>
-        <e>
-            <k>@ql_dataclass</k>
-            <v>22563</v>
-        </e>
-        <e>
-            <k>@ql_datatype</k>
-            <v>548</v>
-        </e>
-        <e>
-            <k>@ql_datatype_branch</k>
-            <v>2719</v>
-        </e>
-        <e>
-            <k>@ql_datatype_branches</k>
-            <v>548</v>
-        </e>
-        <e>
-            <k>@ql_disjunction</k>
-            <v>44890</v>
-        </e>
-        <e>
-            <k>@ql_expr_aggregate_body</k>
-            <v>1216</v>
-        </e>
-        <e>
-            <k>@ql_expr_annotation</k>
-            <v>601</v>
-        </e>
-        <e>
-            <k>@ql_field</k>
-            <v>3721</v>
-        </e>
-        <e>
-            <k>@ql_full_aggregate_body</k>
-            <v>6356</v>
-        </e>
-        <e>
-            <k>@ql_higher_order_term</k>
-            <v>77</v>
-        </e>
-        <e>
-            <k>@ql_if_term</k>
-            <v>2953</v>
-        </e>
-        <e>
-            <k>@ql_implication</k>
-            <v>101</v>
-        </e>
-        <e>
-            <k>@ql_import_directive</k>
-            <v>25764</v>
-        </e>
-        <e>
-            <k>@ql_import_module_expr</k>
-            <v>25764</v>
-        </e>
-        <e>
-            <k>@ql_in_expr</k>
-            <v>1037</v>
-        </e>
-        <e>
-            <k>@ql_instance_of</k>
-            <v>15913</v>
-        </e>
-        <e>
-            <k>@ql_literal</k>
-            <v>109390</v>
-        </e>
-        <e>
-            <k>@ql_member_predicate</k>
-            <v>43952</v>
-        </e>
-        <e>
-            <k>@ql_module</k>
-            <v>4567</v>
-        </e>
-        <e>
-            <k>@ql_module_alias_body</k>
-            <v>917</v>
-        </e>
-        <e>
-            <k>@ql_module_expr</k>
-            <v>76399</v>
-        </e>
-        <e>
-            <k>@ql_module_instantiation</k>
-            <v>1740</v>
-        </e>
-        <e>
-            <k>@ql_module_member</k>
-            <v>118178</v>
-        </e>
-        <e>
-            <k>@ql_module_name</k>
-            <v>7606</v>
-        </e>
-        <e>
-            <k>@ql_module_param</k>
-            <v>266</v>
-        </e>
-        <e>
-            <k>@ql_mul_expr</k>
-            <v>585</v>
-        </e>
-        <e>
-            <k>@ql_negation</k>
-            <v>11727</v>
-        </e>
-        <e>
-            <k>@ql_order_by</k>
-            <v>1067</v>
-        </e>
-        <e>
-            <k>@ql_order_bys</k>
-            <v>661</v>
-        </e>
-        <e>
-            <k>@ql_par_expr</k>
-            <v>5799</v>
-        </e>
-        <e>
-            <k>@ql_predicate_alias_body</k>
-            <v>372</v>
-        </e>
-        <e>
-            <k>@ql_predicate_expr</k>
-            <v>739</v>
-        </e>
-        <e>
-            <k>@ql_prefix_cast</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@ql_ql</k>
-            <v>11167</v>
-        </e>
-        <e>
-            <k>@ql_qualified_expr</k>
-            <v>165157</v>
-        </e>
-        <e>
-            <k>@ql_qualified_rhs</k>
-            <v>165157</v>
-        </e>
-        <e>
-            <k>@ql_quantified</k>
-            <v>24227</v>
-        </e>
-        <e>
-            <k>@ql_range</k>
-            <v>365</v>
-        </e>
-        <e>
-            <k>@ql_reserved_word</k>
-            <v>1875319</v>
-        </e>
-        <e>
-            <k>@ql_select</k>
-            <v>5989</v>
-        </e>
-        <e>
-            <k>@ql_set_literal</k>
-            <v>4014</v>
-        </e>
-        <e>
-            <k>@ql_signature_expr</k>
-            <v>3709</v>
-        </e>
-        <e>
-            <k>@ql_special_call</k>
-            <v>4424</v>
-        </e>
-        <e>
-            <k>@ql_super_ref</k>
-            <v>2901</v>
-        </e>
-        <e>
-            <k>@ql_token_addop</k>
-            <v>13786</v>
-        </e>
-        <e>
-            <k>@ql_token_agg_id</k>
-            <v>9053</v>
-        </e>
-        <e>
-            <k>@ql_token_annot_name</k>
-            <v>66480</v>
-        </e>
-        <e>
-            <k>@ql_token_block_comment</k>
-            <v>992</v>
-        </e>
-        <e>
-            <k>@ql_token_class_name</k>
-            <v>204253</v>
-        </e>
-        <e>
-            <k>@ql_token_closure</k>
-            <v>2234</v>
-        </e>
-        <e>
-            <k>@ql_token_compop</k>
-            <v>140334</v>
-        </e>
-        <e>
-            <k>@ql_token_dbtype</k>
-            <v>3766</v>
-        </e>
-        <e>
-            <k>@ql_token_direction</k>
-            <v>205</v>
-        </e>
-        <e>
-            <k>@ql_token_empty</k>
-            <v>2344</v>
-        </e>
-        <e>
-            <k>@ql_token_false</k>
-            <v>1973</v>
-        </e>
-        <e>
-            <k>@ql_token_float</k>
-            <v>305</v>
-        </e>
-        <e>
-            <k>@ql_token_integer</k>
-            <v>21612</v>
-        </e>
-        <e>
-            <k>@ql_token_line_comment</k>
-            <v>20888</v>
-        </e>
-        <e>
-            <k>@ql_token_literal_id</k>
-            <v>58184</v>
-        </e>
-        <e>
-            <k>@ql_token_mulop</k>
-            <v>585</v>
-        </e>
-        <e>
-            <k>@ql_token_predicate</k>
-            <v>26200</v>
-        </e>
-        <e>
-            <k>@ql_token_predicate_name</k>
-            <v>221079</v>
-        </e>
-        <e>
-            <k>@ql_token_primitive_type</k>
-            <v>47956</v>
-        </e>
-        <e>
-            <k>@ql_token_qldoc</k>
-            <v>55406</v>
-        </e>
-        <e>
-            <k>@ql_token_quantifier</k>
-            <v>24227</v>
-        </e>
-        <e>
-            <k>@ql_token_result</k>
-            <v>52493</v>
-        </e>
-        <e>
-            <k>@ql_token_simple_id</k>
-            <v>512064</v>
-        </e>
-        <e>
-            <k>@ql_token_special_id</k>
-            <v>4424</v>
-        </e>
-        <e>
-            <k>@ql_token_string</k>
-            <v>83938</v>
-        </e>
-        <e>
-            <k>@ql_token_super</k>
-            <v>2901</v>
-        </e>
-        <e>
-            <k>@ql_token_this</k>
-            <v>50826</v>
-        </e>
-        <e>
-            <k>@ql_token_true</k>
-            <v>2301</v>
-        </e>
-        <e>
-            <k>@ql_token_underscore</k>
-            <v>17184</v>
-        </e>
-        <e>
-            <k>@ql_token_unop</k>
-            <v>1158</v>
-        </e>
-        <e>
-            <k>@ql_type_alias_body</k>
-            <v>817</v>
-        </e>
-        <e>
-            <k>@ql_type_expr</k>
-            <v>218057</v>
-        </e>
-        <e>
-            <k>@ql_type_union_body</k>
-            <v>253</v>
-        </e>
-        <e>
-            <k>@ql_unary_expr</k>
-            <v>1158</v>
-        </e>
-        <e>
-            <k>@ql_unqual_agg_body</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@ql_var_decl</k>
-            <v>114137</v>
-        </e>
-        <e>
-            <k>@ql_var_name</k>
-            <v>380908</v>
-        </e>
-        <e>
-            <k>@ql_variable</k>
-            <v>369462</v>
-        </e>
-        <e>
-            <k>@yaml_alias_node</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@yaml_error</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@yaml_mapping_node</k>
-            <v>186</v>
-        </e>
-        <e>
-            <k>@yaml_scalar_node</k>
-            <v>1481</v>
-        </e>
-        <e>
-            <k>@yaml_sequence_node</k>
-            <v>59</v>
-        </e>
-        </typesizes>
-  <stats><relation>
-            <name>blame_ast_node_location</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>loc</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>loc</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>loc</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>blame_ast_node_parent</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>parent</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>parent_index</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>node</src>
-                    <trg>parent_index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>parent_index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent_index</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent_index</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>blame_blame_entry_def</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>date__</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>date__</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>date__</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>blame_blame_entry_line</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>blame_blame_entry</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>line</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>blame_blame_entry</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>blame_blame_entry</src>
-                    <trg>line</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>blame_blame_entry</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>line</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>line</src>
-                    <trg>blame_blame_entry</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>line</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>blame_blame_info_def</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>today</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>today</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>today</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>blame_blame_info_file_entry</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>blame_blame_info</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>file_entry</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>blame_blame_info</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>blame_blame_info</src>
-                    <trg>file_entry</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>blame_blame_info</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>file_entry</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file_entry</src>
-                    <trg>blame_blame_info</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file_entry</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>blame_file_entry_blame_entry</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>blame_file_entry</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>blame_entry</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>blame_file_entry</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>blame_file_entry</src>
-                    <trg>blame_entry</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>blame_file_entry</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>blame_entry</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>blame_entry</src>
-                    <trg>blame_file_entry</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>blame_entry</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>blame_file_entry_def</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>file_name</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>file_name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file_name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>blame_tokeninfo</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>kind</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>containerparent</name>
-            <cardinality>16683</cardinality>
-            <columnsizes>
-                <e>
-                    <k>parent</k>
-                    <v>4402</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>16683</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>parent</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2157</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>978</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>375</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>348</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>15</b>
-                                    <v>339</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>255</b>
-                                    <v>205</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16683</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_annotation_args_annotation</name>
-            <cardinality>30555</cardinality>
-            <columnsizes>
-                <e>
-                    <k>dbscheme_annotation</k>
-                    <v>30555</v>
-                </e>
-                <e>
-                    <k>args_annotation</k>
-                    <v>30555</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>dbscheme_annotation</src>
-                    <trg>args_annotation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>30555</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>args_annotation</src>
-                    <trg>dbscheme_annotation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>30555</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_annotation_def</name>
-            <cardinality>30564</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>30564</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>dbscheme_annotation_simple_annotation</name>
-            <cardinality>9</cardinality>
-            <columnsizes>
-                <e>
-                    <k>dbscheme_annotation</k>
-                    <v>9</v>
-                </e>
-                <e>
-                    <k>simple_annotation</k>
-                    <v>9</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>dbscheme_annotation</src>
-                    <trg>simple_annotation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>simple_annotation</src>
-                    <trg>dbscheme_annotation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_args_annotation_child</name>
-            <cardinality>49845</cardinality>
-            <columnsizes>
-                <e>
-                    <k>dbscheme_args_annotation</k>
-                    <v>30555</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>3</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>49845</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>dbscheme_args_annotation</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12292</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>17236</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1027</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>dbscheme_args_annotation</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12292</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>17236</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1027</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>dbscheme_args_annotation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1027</a>
-                                    <b>1028</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>18263</a>
-                                    <b>18264</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>30555</a>
-                                    <b>30556</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1027</a>
-                                    <b>1028</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>18263</a>
-                                    <b>18264</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>30555</a>
-                                    <b>30556</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>dbscheme_args_annotation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>49845</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>49845</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_args_annotation_def</name>
-            <cardinality>30555</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>30555</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>30555</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>30555</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>30555</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_ast_node_location</name>
-            <cardinality>5985718</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>5985718</v>
-                </e>
-                <e>
-                    <k>loc</k>
-                    <v>4903745</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>loc</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5985718</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>loc</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3821772</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1081973</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_ast_node_parent</name>
-            <cardinality>5900617</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>5900617</v>
-                </e>
-                <e>
-                    <k>parent</k>
-                    <v>1833365</v>
-                </e>
-                <e>
-                    <k>parent_index</k>
-                    <v>501</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5900617</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>node</src>
-                    <trg>parent_index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5900617</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1081973</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>151168</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>13080</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>341594</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>149771</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>502</b>
-                                    <v>95779</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>parent_index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1081973</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>151168</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>13080</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>341594</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>149771</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>502</b>
-                                    <v>95779</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent_index</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>140</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>147</a>
-                                    <b>386</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>387</a>
-                                    <b>491</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>491</a>
-                                    <b>492</b>
-                                    <v>49</v>
-                                </b>
-                                <b>
-                                    <a>499</a>
-                                    <b>712</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>717</a>
-                                    <b>841</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>842</a>
-                                    <b>1054</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>1055</a>
-                                    <b>1190</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>1192</a>
-                                    <b>1357</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>1362</a>
-                                    <b>1575</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>1582</a>
-                                    <b>2577</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>2626</a>
-                                    <b>5260</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>5283</a>
-                                    <b>1833366</b>
-                                    <v>27</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent_index</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>140</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>147</a>
-                                    <b>386</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>387</a>
-                                    <b>491</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>491</a>
-                                    <b>492</b>
-                                    <v>49</v>
-                                </b>
-                                <b>
-                                    <a>499</a>
-                                    <b>712</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>717</a>
-                                    <b>841</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>842</a>
-                                    <b>1054</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>1055</a>
-                                    <b>1190</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>1192</a>
-                                    <b>1357</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>1362</a>
-                                    <b>1575</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>1582</a>
-                                    <b>2577</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>2626</a>
-                                    <b>5260</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>5283</a>
-                                    <b>1833366</b>
-                                    <v>27</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_branch_child</name>
-            <cardinality>302050</cardinality>
-            <columnsizes>
-                <e>
-                    <k>dbscheme_branch</k>
-                    <v>151025</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>302050</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>dbscheme_branch</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>151025</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>dbscheme_branch</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>151025</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>dbscheme_branch</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>151025</a>
-                                    <b>151026</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>151025</a>
-                                    <b>151026</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>dbscheme_branch</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>302050</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>302050</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_branch_def</name>
-            <cardinality>151025</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>151025</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>dbscheme_branch_qldoc</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>dbscheme_branch</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>qldoc</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>dbscheme_branch</src>
-                    <trg>qldoc</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>qldoc</src>
-                    <trg>dbscheme_branch</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_case_decl_child</name>
-            <cardinality>151025</cardinality>
-            <columnsizes>
-                <e>
-                    <k>dbscheme_case_decl</k>
-                    <v>5423</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>218</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>151025</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>dbscheme_case_decl</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>841</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>605</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>691</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>456</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>218</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>11</b>
-                                    <v>408</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>18</b>
-                                    <v>438</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>29</b>
-                                    <v>467</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>38</b>
-                                    <v>436</v>
-                                </b>
-                                <b>
-                                    <a>38</a>
-                                    <b>117</b>
-                                    <v>407</v>
-                                </b>
-                                <b>
-                                    <a>118</a>
-                                    <b>219</b>
-                                    <v>455</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>dbscheme_case_decl</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>841</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>605</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>691</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>456</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>218</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>11</b>
-                                    <v>408</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>18</b>
-                                    <v>438</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>29</b>
-                                    <v>467</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>38</b>
-                                    <v>436</v>
-                                </b>
-                                <b>
-                                    <a>38</a>
-                                    <b>117</b>
-                                    <v>407</v>
-                                </b>
-                                <b>
-                                    <a>118</a>
-                                    <b>219</b>
-                                    <v>455</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>dbscheme_case_decl</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>156</a>
-                                    <b>157</b>
-                                    <v>20</v>
-                                </b>
-                                <b>
-                                    <a>159</a>
-                                    <b>160</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>219</a>
-                                    <b>220</b>
-                                    <v>27</v>
-                                </b>
-                                <b>
-                                    <a>227</a>
-                                    <b>294</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>311</a>
-                                    <b>312</b>
-                                    <v>32</v>
-                                </b>
-                                <b>
-                                    <a>330</a>
-                                    <b>494</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>521</a>
-                                    <b>544</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>544</a>
-                                    <b>548</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>581</a>
-                                    <b>584</b>
-                                    <v>15</v>
-                                </b>
-                                <b>
-                                    <a>598</a>
-                                    <b>601</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>643</a>
-                                    <b>795</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>802</a>
-                                    <b>1764</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>1764</a>
-                                    <b>2830</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>3285</a>
-                                    <b>5424</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>156</a>
-                                    <b>157</b>
-                                    <v>20</v>
-                                </b>
-                                <b>
-                                    <a>159</a>
-                                    <b>160</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>219</a>
-                                    <b>220</b>
-                                    <v>27</v>
-                                </b>
-                                <b>
-                                    <a>227</a>
-                                    <b>294</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>311</a>
-                                    <b>312</b>
-                                    <v>32</v>
-                                </b>
-                                <b>
-                                    <a>330</a>
-                                    <b>494</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>521</a>
-                                    <b>544</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>544</a>
-                                    <b>548</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>581</a>
-                                    <b>584</b>
-                                    <v>15</v>
-                                </b>
-                                <b>
-                                    <a>598</a>
-                                    <b>601</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>643</a>
-                                    <b>795</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>802</a>
-                                    <b>1764</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>1764</a>
-                                    <b>2830</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>3285</a>
-                                    <b>5424</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>dbscheme_case_decl</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>151025</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>151025</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_case_decl_def</name>
-            <cardinality>5423</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>5423</v>
-                </e>
-                <e>
-                    <k>base</k>
-                    <v>5423</v>
-                </e>
-                <e>
-                    <k>discriminator</k>
-                    <v>5423</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>base</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5423</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>discriminator</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5423</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>base</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5423</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>base</src>
-                    <trg>discriminator</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5423</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>discriminator</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5423</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>discriminator</src>
-                    <trg>base</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5423</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_col_type_def</name>
-            <cardinality>341399</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>341399</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>341399</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_column_def</name>
-            <cardinality>341399</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>341399</v>
-                </e>
-                <e>
-                    <k>col_name</k>
-                    <v>341399</v>
-                </e>
-                <e>
-                    <k>col_type</k>
-                    <v>341399</v>
-                </e>
-                <e>
-                    <k>repr_type</k>
-                    <v>341399</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>col_name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>col_type</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>repr_type</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>col_name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>col_name</src>
-                    <trg>col_type</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>col_name</src>
-                    <trg>repr_type</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>col_type</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>col_type</src>
-                    <trg>col_name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>col_type</src>
-                    <trg>repr_type</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>repr_type</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>repr_type</src>
-                    <trg>col_name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>repr_type</src>
-                    <trg>col_type</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_column_is_ref</name>
-            <cardinality>281648</cardinality>
-            <columnsizes>
-                <e>
-                    <k>dbscheme_column</k>
-                    <v>281648</v>
-                </e>
-                <e>
-                    <k>is_ref</k>
-                    <v>281648</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>dbscheme_column</src>
-                    <trg>is_ref</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>281648</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>is_ref</src>
-                    <trg>dbscheme_column</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>281648</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_column_is_unique</name>
-            <cardinality>102289</cardinality>
-            <columnsizes>
-                <e>
-                    <k>dbscheme_column</k>
-                    <v>102289</v>
-                </e>
-                <e>
-                    <k>is_unique</k>
-                    <v>102289</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>dbscheme_column</src>
-                    <trg>is_unique</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>102289</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>is_unique</src>
-                    <trg>dbscheme_column</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>102289</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_column_qldoc</name>
-            <cardinality>670</cardinality>
-            <columnsizes>
-                <e>
-                    <k>dbscheme_column</k>
-                    <v>670</v>
-                </e>
-                <e>
-                    <k>qldoc</k>
-                    <v>670</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>dbscheme_column</src>
-                    <trg>qldoc</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>670</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>qldoc</src>
-                    <trg>dbscheme_column</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>670</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_dbscheme_child</name>
-            <cardinality>230044</cardinality>
-            <columnsizes>
-                <e>
-                    <k>dbscheme_dbscheme</k>
-                    <v>685</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>501</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>230044</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>dbscheme_dbscheme</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>147</b>
-                                    <v>56</v>
-                                </b>
-                                <b>
-                                    <a>148</a>
-                                    <b>205</b>
-                                    <v>55</v>
-                                </b>
-                                <b>
-                                    <a>205</a>
-                                    <b>275</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>275</a>
-                                    <b>287</b>
-                                    <v>52</v>
-                                </b>
-                                <b>
-                                    <a>287</a>
-                                    <b>306</b>
-                                    <v>62</v>
-                                </b>
-                                <b>
-                                    <a>307</a>
-                                    <b>312</b>
-                                    <v>52</v>
-                                </b>
-                                <b>
-                                    <a>313</a>
-                                    <b>320</b>
-                                    <v>56</v>
-                                </b>
-                                <b>
-                                    <a>320</a>
-                                    <b>418</b>
-                                    <v>55</v>
-                                </b>
-                                <b>
-                                    <a>418</a>
-                                    <b>460</b>
-                                    <v>58</v>
-                                </b>
-                                <b>
-                                    <a>460</a>
-                                    <b>464</b>
-                                    <v>46</v>
-                                </b>
-                                <b>
-                                    <a>465</a>
-                                    <b>469</b>
-                                    <v>59</v>
-                                </b>
-                                <b>
-                                    <a>470</a>
-                                    <b>478</b>
-                                    <v>57</v>
-                                </b>
-                                <b>
-                                    <a>478</a>
-                                    <b>502</b>
-                                    <v>23</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>dbscheme_dbscheme</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>147</b>
-                                    <v>56</v>
-                                </b>
-                                <b>
-                                    <a>148</a>
-                                    <b>205</b>
-                                    <v>55</v>
-                                </b>
-                                <b>
-                                    <a>205</a>
-                                    <b>275</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>275</a>
-                                    <b>287</b>
-                                    <v>52</v>
-                                </b>
-                                <b>
-                                    <a>287</a>
-                                    <b>306</b>
-                                    <v>62</v>
-                                </b>
-                                <b>
-                                    <a>307</a>
-                                    <b>312</b>
-                                    <v>52</v>
-                                </b>
-                                <b>
-                                    <a>313</a>
-                                    <b>320</b>
-                                    <v>56</v>
-                                </b>
-                                <b>
-                                    <a>320</a>
-                                    <b>418</b>
-                                    <v>55</v>
-                                </b>
-                                <b>
-                                    <a>418</a>
-                                    <b>460</b>
-                                    <v>58</v>
-                                </b>
-                                <b>
-                                    <a>460</a>
-                                    <b>464</b>
-                                    <v>46</v>
-                                </b>
-                                <b>
-                                    <a>465</a>
-                                    <b>469</b>
-                                    <v>59</v>
-                                </b>
-                                <b>
-                                    <a>470</a>
-                                    <b>478</b>
-                                    <v>57</v>
-                                </b>
-                                <b>
-                                    <a>478</a>
-                                    <b>502</b>
-                                    <v>23</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>dbscheme_dbscheme</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>140</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>147</a>
-                                    <b>230</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>231</a>
-                                    <b>272</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>272</a>
-                                    <b>273</b>
-                                    <v>70</v>
-                                </b>
-                                <b>
-                                    <a>279</a>
-                                    <b>469</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>470</a>
-                                    <b>561</b>
-                                    <v>37</v>
-                                </b>
-                                <b>
-                                    <a>562</a>
-                                    <b>563</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>563</a>
-                                    <b>601</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>601</a>
-                                    <b>664</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>664</a>
-                                    <b>682</b>
-                                    <v>27</v>
-                                </b>
-                                <b>
-                                    <a>682</a>
-                                    <b>683</b>
-                                    <v>76</v>
-                                </b>
-                                <b>
-                                    <a>683</a>
-                                    <b>686</b>
-                                    <v>25</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>140</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>147</a>
-                                    <b>230</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>231</a>
-                                    <b>272</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>272</a>
-                                    <b>273</b>
-                                    <v>70</v>
-                                </b>
-                                <b>
-                                    <a>279</a>
-                                    <b>469</b>
-                                    <v>38</v>
-                                </b>
-                                <b>
-                                    <a>470</a>
-                                    <b>561</b>
-                                    <v>37</v>
-                                </b>
-                                <b>
-                                    <a>562</a>
-                                    <b>563</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>563</a>
-                                    <b>601</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>601</a>
-                                    <b>664</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>664</a>
-                                    <b>682</b>
-                                    <v>27</v>
-                                </b>
-                                <b>
-                                    <a>682</a>
-                                    <b>683</b>
-                                    <v>76</v>
-                                </b>
-                                <b>
-                                    <a>683</a>
-                                    <b>686</b>
-                                    <v>25</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>dbscheme_dbscheme</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>230044</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>230044</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_dbscheme_def</name>
-            <cardinality>686</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>686</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>dbscheme_entry_def</name>
-            <cardinality>230044</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>230044</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>230044</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>230044</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>230044</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_repr_type_child</name>
-            <cardinality>349360</cardinality>
-            <columnsizes>
-                <e>
-                    <k>dbscheme_repr_type</k>
-                    <v>341399</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>349360</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>dbscheme_repr_type</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>333438</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>7961</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>dbscheme_repr_type</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>333438</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>7961</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>dbscheme_repr_type</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>7961</a>
-                                    <b>7962</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>341399</a>
-                                    <b>341400</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>7961</a>
-                                    <b>7962</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>341399</a>
-                                    <b>341400</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>dbscheme_repr_type</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>349360</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>349360</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_repr_type_def</name>
-            <cardinality>341399</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>341399</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>dbscheme_table_child</name>
-            <cardinality>371963</cardinality>
-            <columnsizes>
-                <e>
-                    <k>dbscheme_table</k>
-                    <v>146537</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>10</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>371963</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>dbscheme_table</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>32738</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>55828</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>24047</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>21522</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>11405</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>997</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>dbscheme_table</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>32738</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>55828</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>24047</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>21522</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>11405</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>997</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>dbscheme_table</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>25</a>
-                                    <b>26</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>181</a>
-                                    <b>182</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>337</a>
-                                    <b>338</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>997</a>
-                                    <b>998</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5790</a>
-                                    <b>5791</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>12402</a>
-                                    <b>12403</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>33924</a>
-                                    <b>33925</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>57971</a>
-                                    <b>57972</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>113799</a>
-                                    <b>113800</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>146537</a>
-                                    <b>146538</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>25</a>
-                                    <b>26</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>181</a>
-                                    <b>182</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>337</a>
-                                    <b>338</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>997</a>
-                                    <b>998</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5790</a>
-                                    <b>5791</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>12402</a>
-                                    <b>12403</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>33924</a>
-                                    <b>33925</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>57971</a>
-                                    <b>57972</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>113799</a>
-                                    <b>113800</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>146537</a>
-                                    <b>146538</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>dbscheme_table</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>371963</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>371963</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_table_def</name>
-            <cardinality>146537</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>146537</v>
-                </e>
-                <e>
-                    <k>table_name</k>
-                    <v>146537</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>table_name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>146537</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>table_name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>146537</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_table_name_def</name>
-            <cardinality>146537</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>146537</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>146537</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>146537</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>146537</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_tokeninfo</name>
-            <cardinality>4152352</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>4152352</v>
-                </e>
-                <e>
-                    <k>kind</k>
-                    <v>16</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>7232</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4152352</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4152352</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1170</a>
-                                    <b>1171</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2146</a>
-                                    <b>2147</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2962</a>
-                                    <b>2963</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7961</a>
-                                    <b>7962</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10956</a>
-                                    <b>10957</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>22060</a>
-                                    <b>22061</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>30564</a>
-                                    <b>30565</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>62355</a>
-                                    <b>62356</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>67865</a>
-                                    <b>67866</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>102289</a>
-                                    <b>102290</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>158986</a>
-                                    <b>158987</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>281648</a>
-                                    <b>281649</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>350777</a>
-                                    <b>350778</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>543204</a>
-                                    <b>543205</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>750840</a>
-                                    <b>750841</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1756569</a>
-                                    <b>1756570</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>100</a>
-                                    <b>101</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>207</a>
-                                    <b>208</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>303</a>
-                                    <b>304</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>616</a>
-                                    <b>617</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2655</a>
-                                    <b>2656</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3328</a>
-                                    <b>3329</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>619</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>13</b>
-                                    <v>575</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>29</b>
-                                    <v>422</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>38</b>
-                                    <v>546</v>
-                                </b>
-                                <b>
-                                    <a>38</a>
-                                    <b>56</b>
-                                    <v>638</v>
-                                </b>
-                                <b>
-                                    <a>56</a>
-                                    <b>77</b>
-                                    <v>597</v>
-                                </b>
-                                <b>
-                                    <a>77</a>
-                                    <b>116</b>
-                                    <v>541</v>
-                                </b>
-                                <b>
-                                    <a>116</a>
-                                    <b>149</b>
-                                    <v>543</v>
-                                </b>
-                                <b>
-                                    <a>149</a>
-                                    <b>156</b>
-                                    <v>481</v>
-                                </b>
-                                <b>
-                                    <a>156</a>
-                                    <b>199</b>
-                                    <v>544</v>
-                                </b>
-                                <b>
-                                    <a>202</a>
-                                    <b>312</b>
-                                    <v>540</v>
-                                </b>
-                                <b>
-                                    <a>312</a>
-                                    <b>416</b>
-                                    <v>543</v>
-                                </b>
-                                <b>
-                                    <a>416</a>
-                                    <b>1685</b>
-                                    <v>543</v>
-                                </b>
-                                <b>
-                                    <a>1697</a>
-                                    <b>354482</b>
-                                    <v>100</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7232</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_union_decl_child</name>
-            <cardinality>276677</cardinality>
-            <columnsizes>
-                <e>
-                    <k>dbscheme_union_decl</k>
-                    <v>67798</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>105</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>276677</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>dbscheme_union_decl</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2870</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>33104</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>10107</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>6309</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>4592</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>5609</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>69</b>
-                                    <v>5085</v>
-                                </b>
-                                <b>
-                                    <a>85</a>
-                                    <b>106</b>
-                                    <v>122</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>dbscheme_union_decl</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2870</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>33104</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>10107</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>6309</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>4592</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>5609</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>69</b>
-                                    <v>5085</v>
-                                </b>
-                                <b>
-                                    <a>85</a>
-                                    <b>106</b>
-                                    <v>122</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>dbscheme_union_decl</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>11</a>
-                                    <b>44</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>45</a>
-                                    <b>46</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>59</a>
-                                    <b>103</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>122</a>
-                                    <b>123</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>123</a>
-                                    <b>124</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>126</a>
-                                    <b>166</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>173</a>
-                                    <b>319</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>327</a>
-                                    <b>328</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>328</a>
-                                    <b>544</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>647</a>
-                                    <b>671</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>699</a>
-                                    <b>1414</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>1501</a>
-                                    <b>5208</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>6334</a>
-                                    <b>67799</b>
-                                    <v>8</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>11</a>
-                                    <b>44</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>45</a>
-                                    <b>46</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>59</a>
-                                    <b>103</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>122</a>
-                                    <b>123</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>123</a>
-                                    <b>124</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>126</a>
-                                    <b>166</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>173</a>
-                                    <b>319</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>327</a>
-                                    <b>328</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>328</a>
-                                    <b>544</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>647</a>
-                                    <b>671</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>699</a>
-                                    <b>1414</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>1501</a>
-                                    <b>5208</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>6334</a>
-                                    <b>67799</b>
-                                    <v>8</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>dbscheme_union_decl</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>276677</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>276677</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>dbscheme_union_decl_def</name>
-            <cardinality>67798</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>67798</v>
-                </e>
-                <e>
-                    <k>base</k>
-                    <v>67798</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>base</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>67798</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>base</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>67798</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>diagnostics</name>
-            <cardinality>5</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>5</v>
-                </e>
-                <e>
-                    <k>severity</k>
-                    <v>1</v>
-                </e>
-                <e>
-                    <k>error_tag</k>
-                    <v>1</v>
-                </e>
-                <e>
-                    <k>error_message</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>full_error_message</k>
-                    <v>5</v>
-                </e>
-                <e>
-                    <k>location</k>
-                    <v>5</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>error_tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>error_tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>error_tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>full_error_message</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>full_error_message</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>full_error_message</src>
-                    <trg>error_tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>full_error_message</src>
-                    <trg>error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>full_error_message</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>error_tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>files</name>
-            <cardinality>12283</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>12283</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>12283</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12283</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12283</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>folders</name>
-            <cardinality>4402</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>4402</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>4402</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4402</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4402</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>json_array_child</name>
-            <cardinality>5897</cardinality>
-            <columnsizes>
-                <e>
-                    <k>json_array</k>
-                    <v>1962</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>611</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>5897</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>json_array</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>935</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>623</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>179</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>149</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>612</b>
-                                    <v>76</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>json_array</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>935</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>623</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>179</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>149</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>612</b>
-                                    <v>76</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>json_array</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>364</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>58</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>61</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>48</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>61</b>
-                                    <v>46</v>
-                                </b>
-                                <b>
-                                    <a>69</a>
-                                    <b>1963</b>
-                                    <v>8</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>364</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>58</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>61</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>48</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>61</b>
-                                    <v>46</v>
-                                </b>
-                                <b>
-                                    <a>69</a>
-                                    <b>1963</b>
-                                    <v>8</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>json_array</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5897</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5897</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>json_array_def</name>
-            <cardinality>2026</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>2026</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>json_ast_node_location</name>
-            <cardinality>148630</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>148630</v>
-                </e>
-                <e>
-                    <k>loc</k>
-                    <v>148504</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>loc</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>148630</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>loc</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>148378</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>126</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>json_ast_node_parent</name>
-            <cardinality>148287</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>148287</v>
-                </e>
-                <e>
-                    <k>parent</k>
-                    <v>42018</v>
-                </e>
-                <e>
-                    <k>parent_index</k>
-                    <v>1223</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>148287</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>node</src>
-                    <trg>parent_index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>148287</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>608</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>36317</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>3406</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>1224</b>
-                                    <v>1687</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>parent_index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>608</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>36317</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>3406</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>1224</b>
-                                    <v>1687</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent_index</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>728</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>52</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>116</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>68</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>12</b>
-                                    <v>96</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>213</b>
-                                    <v>92</v>
-                                </b>
-                                <b>
-                                    <a>226</a>
-                                    <b>42019</b>
-                                    <v>17</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent_index</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>728</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>52</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>116</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>68</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>12</b>
-                                    <v>96</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>213</b>
-                                    <v>92</v>
-                                </b>
-                                <b>
-                                    <a>226</a>
-                                    <b>42019</b>
-                                    <v>17</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-    <relation>
-            <name>json_document_child</name>
-            <cardinality>321</cardinality>
-            <columnsizes>
-                <e>
-                    <k>json_document</k>
-                    <v>321</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>1</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>321</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>json_document</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>321</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>json_document</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>321</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>json_document</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>321</a>
-                                    <b>322</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>321</a>
-                                    <b>322</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>json_document</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>321</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>321</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>json_document_def</name>
-            <cardinality>324</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>324</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>json_object_child</name>
-            <cardinality>12461</cardinality>
-            <columnsizes>
-                <e>
-                    <k>json_object</k>
-                    <v>4817</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>159</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>12461</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>json_object</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>754</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2780</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>781</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>11</b>
-                                    <v>445</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>160</b>
-                                    <v>57</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>json_object</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>754</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2780</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>781</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>11</b>
-                                    <v>445</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>160</b>
-                                    <v>57</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>json_object</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>65</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>20</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>14</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>4818</b>
-                                    <v>12</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>65</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>20</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>14</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>4818</b>
-                                    <v>12</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>json_object</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12461</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12461</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>json_object_def</name>
-            <cardinality>5034</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>5034</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>json_pair_def</name>
-            <cardinality>12461</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>12461</v>
-                </e>
-                <e>
-                    <k>key__</k>
-                    <v>12461</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>12461</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>key__</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12461</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12461</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>key__</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12461</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>key__</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12461</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12461</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>key__</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12461</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>json_string_child</name>
-            <cardinality>22171</cardinality>
-            <columnsizes>
-                <e>
-                    <k>json_string__</k>
-                    <v>22171</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>22171</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>json_string__</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22171</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>json_string__</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22171</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>json_string_def</name>
-            <cardinality>22176</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>22176</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>json_tokeninfo</name>
-            <cardinality>106609</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>106609</v>
-                </e>
-                <e>
-                    <k>kind</k>
-                    <v>7</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>4324</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>106609</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>106609</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>71</a>
-                                    <b>72</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>248</a>
-                                    <b>249</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>607</a>
-                                    <b>608</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>978</a>
-                                    <b>979</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>22171</a>
-                                    <b>22172</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>82515</a>
-                                    <b>82516</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>30</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4277</a>
-                                    <b>4278</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3160</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>406</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>365</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>62</b>
-                                    <v>326</v>
-                                </b>
-                                <b>
-                                    <a>71</a>
-                                    <b>44353</b>
-                                    <v>67</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4316</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>8</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>locations_default</name>
-            <cardinality>9617371</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>9617371</v>
-                </e>
-                <e>
-                    <k>file</k>
-                    <v>12283</v>
-                </e>
-                <e>
-                    <k>beginLine</k>
-                    <v>11293</v>
-                </e>
-                <e>
-                    <k>beginColumn</k>
-                    <v>1385</v>
-                </e>
-                <e>
-                    <k>endLine</k>
-                    <v>11293</v>
-                </e>
-                <e>
-                    <k>endColumn</k>
-                    <v>1389</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9617371</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>beginLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9617371</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>beginColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9617371</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>endLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9617371</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>endColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9617371</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>21</b>
-                                    <v>930</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>32</b>
-                                    <v>950</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>40</b>
-                                    <v>1024</v>
-                                </b>
-                                <b>
-                                    <a>40</a>
-                                    <b>54</b>
-                                    <v>930</v>
-                                </b>
-                                <b>
-                                    <a>54</a>
-                                    <b>72</b>
-                                    <v>952</v>
-                                </b>
-                                <b>
-                                    <a>72</a>
-                                    <b>89</b>
-                                    <v>965</v>
-                                </b>
-                                <b>
-                                    <a>89</a>
-                                    <b>119</b>
-                                    <v>929</v>
-                                </b>
-                                <b>
-                                    <a>119</a>
-                                    <b>164</b>
-                                    <v>934</v>
-                                </b>
-                                <b>
-                                    <a>164</a>
-                                    <b>243</b>
-                                    <v>923</v>
-                                </b>
-                                <b>
-                                    <a>243</a>
-                                    <b>392</b>
-                                    <v>923</v>
-                                </b>
-                                <b>
-                                    <a>392</a>
-                                    <b>748</b>
-                                    <v>923</v>
-                                </b>
-                                <b>
-                                    <a>748</a>
-                                    <b>2678</b>
-                                    <v>922</v>
-                                </b>
-                                <b>
-                                    <a>2683</a>
-                                    <b>9950</b>
-                                    <v>923</v>
-                                </b>
-                                <b>
-                                    <a>9962</a>
-                                    <b>54160</b>
-                                    <v>55</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>beginLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>434</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>775</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1146</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>995</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>691</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>988</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>11</b>
-                                    <v>919</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>15</b>
-                                    <v>992</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>22</b>
-                                    <v>1018</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>34</b>
-                                    <v>975</v>
-                                </b>
-                                <b>
-                                    <a>34</a>
-                                    <b>61</b>
-                                    <v>935</v>
-                                </b>
-                                <b>
-                                    <a>61</a>
-                                    <b>143</b>
-                                    <v>922</v>
-                                </b>
-                                <b>
-                                    <a>143</a>
-                                    <b>975</b>
-                                    <v>923</v>
-                                </b>
-                                <b>
-                                    <a>977</a>
-                                    <b>11284</b>
-                                    <v>570</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>beginColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>11</b>
-                                    <v>1028</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>17</b>
-                                    <v>920</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>21</b>
-                                    <v>913</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>26</b>
-                                    <v>1027</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>32</b>
-                                    <v>987</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>39</b>
-                                    <v>994</v>
-                                </b>
-                                <b>
-                                    <a>39</a>
-                                    <b>47</b>
-                                    <v>1014</v>
-                                </b>
-                                <b>
-                                    <a>47</a>
-                                    <b>57</b>
-                                    <v>1003</v>
-                                </b>
-                                <b>
-                                    <a>57</a>
-                                    <b>66</b>
-                                    <v>957</v>
-                                </b>
-                                <b>
-                                    <a>66</a>
-                                    <b>77</b>
-                                    <v>1001</v>
-                                </b>
-                                <b>
-                                    <a>77</a>
-                                    <b>87</b>
-                                    <v>934</v>
-                                </b>
-                                <b>
-                                    <a>87</a>
-                                    <b>99</b>
-                                    <v>1024</v>
-                                </b>
-                                <b>
-                                    <a>99</a>
-                                    <b>512</b>
-                                    <v>481</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>endLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>434</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>774</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1147</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>995</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>690</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>989</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>11</b>
-                                    <v>919</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>15</b>
-                                    <v>992</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>22</b>
-                                    <v>1018</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>34</b>
-                                    <v>975</v>
-                                </b>
-                                <b>
-                                    <a>34</a>
-                                    <b>61</b>
-                                    <v>935</v>
-                                </b>
-                                <b>
-                                    <a>61</a>
-                                    <b>143</b>
-                                    <v>922</v>
-                                </b>
-                                <b>
-                                    <a>143</a>
-                                    <b>975</b>
-                                    <v>923</v>
-                                </b>
-                                <b>
-                                    <a>977</a>
-                                    <b>11284</b>
-                                    <v>570</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>endColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>14</b>
-                                    <v>1008</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>21</b>
-                                    <v>1081</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>25</b>
-                                    <v>958</v>
-                                </b>
-                                <b>
-                                    <a>25</a>
-                                    <b>30</b>
-                                    <v>950</v>
-                                </b>
-                                <b>
-                                    <a>30</a>
-                                    <b>37</b>
-                                    <v>999</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>44</b>
-                                    <v>1031</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>52</b>
-                                    <v>923</v>
-                                </b>
-                                <b>
-                                    <a>52</a>
-                                    <b>62</b>
-                                    <v>946</v>
-                                </b>
-                                <b>
-                                    <a>62</a>
-                                    <b>73</b>
-                                    <v>1042</v>
-                                </b>
-                                <b>
-                                    <a>73</a>
-                                    <b>83</b>
-                                    <v>1006</v>
-                                </b>
-                                <b>
-                                    <a>83</a>
-                                    <b>93</b>
-                                    <v>934</v>
-                                </b>
-                                <b>
-                                    <a>93</a>
-                                    <b>104</b>
-                                    <v>945</v>
-                                </b>
-                                <b>
-                                    <a>104</a>
-                                    <b>523</b>
-                                    <v>460</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginLine</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1130</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1128</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>11</b>
-                                    <v>801</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>16</b>
-                                    <v>994</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>22</b>
-                                    <v>854</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>30</b>
-                                    <v>890</v>
-                                </b>
-                                <b>
-                                    <a>30</a>
-                                    <b>41</b>
-                                    <v>877</v>
-                                </b>
-                                <b>
-                                    <a>41</a>
-                                    <b>56</b>
-                                    <v>860</v>
-                                </b>
-                                <b>
-                                    <a>56</a>
-                                    <b>92</b>
-                                    <v>854</v>
-                                </b>
-                                <b>
-                                    <a>92</a>
-                                    <b>1472</b>
-                                    <v>847</v>
-                                </b>
-                                <b>
-                                    <a>1499</a>
-                                    <b>2520</b>
-                                    <v>847</v>
-                                </b>
-                                <b>
-                                    <a>2527</a>
-                                    <b>5340</b>
-                                    <v>847</v>
-                                </b>
-                                <b>
-                                    <a>5348</a>
-                                    <b>46386</b>
-                                    <v>364</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginLine</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2258</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>654</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1191</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1015</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>658</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>532</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>712</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>10</b>
-                                    <v>1014</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>109</b>
-                                    <v>852</v>
-                                </b>
-                                <b>
-                                    <a>109</a>
-                                    <b>400</b>
-                                    <v>847</v>
-                                </b>
-                                <b>
-                                    <a>400</a>
-                                    <b>626</b>
-                                    <v>849</v>
-                                </b>
-                                <b>
-                                    <a>626</a>
-                                    <b>12065</b>
-                                    <v>711</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginLine</src>
-                    <trg>beginColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1130</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1454</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>977</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>11</b>
-                                    <v>746</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>15</b>
-                                    <v>1029</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>20</b>
-                                    <v>966</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>27</b>
-                                    <v>942</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>37</b>
-                                    <v>854</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>57</b>
-                                    <v>853</v>
-                                </b>
-                                <b>
-                                    <a>57</a>
-                                    <b>84</b>
-                                    <v>882</v>
-                                </b>
-                                <b>
-                                    <a>84</a>
-                                    <b>101</b>
-                                    <v>895</v>
-                                </b>
-                                <b>
-                                    <a>101</a>
-                                    <b>397</b>
-                                    <v>565</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginLine</src>
-                    <trg>endLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4809</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1797</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>961</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>940</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>10</b>
-                                    <v>986</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>16</b>
-                                    <v>862</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>45</b>
-                                    <v>848</v>
-                                </b>
-                                <b>
-                                    <a>45</a>
-                                    <b>5676</b>
-                                    <v>90</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginLine</src>
-                    <trg>endColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1130</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1128</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>710</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>10</b>
-                                    <v>808</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>14</b>
-                                    <v>1024</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>19</b>
-                                    <v>1007</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>26</b>
-                                    <v>963</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>34</b>
-                                    <v>848</v>
-                                </b>
-                                <b>
-                                    <a>34</a>
-                                    <b>49</b>
-                                    <v>857</v>
-                                </b>
-                                <b>
-                                    <a>49</a>
-                                    <b>77</b>
-                                    <v>860</v>
-                                </b>
-                                <b>
-                                    <a>77</a>
-                                    <b>97</b>
-                                    <v>895</v>
-                                </b>
-                                <b>
-                                    <a>97</a>
-                                    <b>118</b>
-                                    <v>857</v>
-                                </b>
-                                <b>
-                                    <a>118</a>
-                                    <b>400</b>
-                                    <v>206</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginColumn</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>4</b>
-                                    <v>102</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>121</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>65</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>122</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>11</b>
-                                    <v>110</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>73</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>114</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>18</b>
-                                    <v>106</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>21</b>
-                                    <v>115</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>32</b>
-                                    <v>118</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>61</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>61</a>
-                                    <b>255</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>261</a>
-                                    <b>113805</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>114086</a>
-                                    <b>1069778</b>
-                                    <v>27</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginColumn</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>118</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>119</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>75</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>119</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>11</b>
-                                    <v>105</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>73</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>111</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>19</b>
-                                    <v>122</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>22</b>
-                                    <v>111</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>33</b>
-                                    <v>108</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>66</b>
-                                    <v>107</v>
-                                </b>
-                                <b>
-                                    <a>68</a>
-                                    <b>683</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>732</a>
-                                    <b>12283</b>
-                                    <v>100</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginColumn</src>
-                    <trg>beginLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>223</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>307</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>135</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>140</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>78</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>101</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>120</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>32</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>2144</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>2186</a>
-                                    <b>11292</b>
-                                    <v>73</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginColumn</src>
-                    <trg>endLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>223</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>307</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>135</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>140</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>78</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>100</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>121</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>32</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>2158</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>2226</a>
-                                    <b>11292</b>
-                                    <v>73</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginColumn</src>
-                    <trg>endColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>689</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>323</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>118</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>117</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>88</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>88</a>
-                                    <b>266</b>
-                                    <v>34</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endLine</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1129</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1128</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>762</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>17</b>
-                                    <v>961</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>23</b>
-                                    <v>922</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>31</b>
-                                    <v>919</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>43</b>
-                                    <v>899</v>
-                                </b>
-                                <b>
-                                    <a>43</a>
-                                    <b>58</b>
-                                    <v>879</v>
-                                </b>
-                                <b>
-                                    <a>58</a>
-                                    <b>100</b>
-                                    <v>855</v>
-                                </b>
-                                <b>
-                                    <a>100</a>
-                                    <b>1721</b>
-                                    <v>847</v>
-                                </b>
-                                <b>
-                                    <a>1722</a>
-                                    <b>2799</b>
-                                    <v>847</v>
-                                </b>
-                                <b>
-                                    <a>2805</a>
-                                    <b>6136</b>
-                                    <v>847</v>
-                                </b>
-                                <b>
-                                    <a>6136</a>
-                                    <b>46393</b>
-                                    <v>297</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endLine</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2258</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>654</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1191</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1017</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>652</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>522</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>735</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>10</b>
-                                    <v>1005</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>109</b>
-                                    <v>850</v>
-                                </b>
-                                <b>
-                                    <a>109</a>
-                                    <b>400</b>
-                                    <v>850</v>
-                                </b>
-                                <b>
-                                    <a>400</a>
-                                    <b>626</b>
-                                    <v>849</v>
-                                </b>
-                                <b>
-                                    <a>626</a>
-                                    <b>6687</b>
-                                    <v>710</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endLine</src>
-                    <trg>beginLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1130</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3437</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1709</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1095</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>700</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>918</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>14</b>
-                                    <v>918</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>25</b>
-                                    <v>868</v>
-                                </b>
-                                <b>
-                                    <a>25</a>
-                                    <b>60</b>
-                                    <v>518</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endLine</src>
-                    <trg>beginColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1129</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1454</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>926</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>11</b>
-                                    <v>708</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>15</b>
-                                    <v>1045</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>20</b>
-                                    <v>968</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>27</b>
-                                    <v>954</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>37</b>
-                                    <v>880</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>57</b>
-                                    <v>867</v>
-                                </b>
-                                <b>
-                                    <a>57</a>
-                                    <b>84</b>
-                                    <v>872</v>
-                                </b>
-                                <b>
-                                    <a>84</a>
-                                    <b>100</b>
-                                    <v>847</v>
-                                </b>
-                                <b>
-                                    <a>100</a>
-                                    <b>397</b>
-                                    <v>642</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endLine</src>
-                    <trg>endColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1129</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1128</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>718</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>10</b>
-                                    <v>801</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>13</b>
-                                    <v>814</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>17</b>
-                                    <v>919</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>23</b>
-                                    <v>965</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>31</b>
-                                    <v>959</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>44</b>
-                                    <v>879</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>70</b>
-                                    <v>851</v>
-                                </b>
-                                <b>
-                                    <a>70</a>
-                                    <b>93</b>
-                                    <v>878</v>
-                                </b>
-                                <b>
-                                    <a>93</a>
-                                    <b>109</b>
-                                    <v>849</v>
-                                </b>
-                                <b>
-                                    <a>109</a>
-                                    <b>400</b>
-                                    <v>402</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endColumn</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>4</b>
-                                    <v>95</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>120</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>64</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>120</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>11</b>
-                                    <v>105</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>76</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>113</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>18</b>
-                                    <v>109</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>21</b>
-                                    <v>111</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>31</b>
-                                    <v>106</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>55</b>
-                                    <v>106</v>
-                                </b>
-                                <b>
-                                    <a>55</a>
-                                    <b>191</b>
-                                    <v>105</v>
-                                </b>
-                                <b>
-                                    <a>192</a>
-                                    <b>56899</b>
-                                    <v>105</v>
-                                </b>
-                                <b>
-                                    <a>58047</a>
-                                    <b>407640</b>
-                                    <v>54</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endColumn</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>110</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>15</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>119</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>74</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>116</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>11</b>
-                                    <v>104</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>73</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>114</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>19</b>
-                                    <v>126</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>23</b>
-                                    <v>115</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>34</b>
-                                    <v>114</v>
-                                </b>
-                                <b>
-                                    <a>34</a>
-                                    <b>72</b>
-                                    <v>105</v>
-                                </b>
-                                <b>
-                                    <a>72</a>
-                                    <b>1551</b>
-                                    <v>105</v>
-                                </b>
-                                <b>
-                                    <a>1727</a>
-                                    <b>11266</b>
-                                    <v>99</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endColumn</src>
-                    <trg>beginLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>219</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>306</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>134</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>142</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>74</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>103</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>120</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>33</b>
-                                    <v>108</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>2296</b>
-                                    <v>105</v>
-                                </b>
-                                <b>
-                                    <a>2325</a>
-                                    <b>10163</b>
-                                    <v>78</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endColumn</src>
-                    <trg>beginColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>676</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>276</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>112</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>36</b>
-                                    <v>105</v>
-                                </b>
-                                <b>
-                                    <a>36</a>
-                                    <b>105</b>
-                                    <v>96</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endColumn</src>
-                    <trg>endLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>219</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>306</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>134</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>142</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>74</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>103</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>121</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>33</b>
-                                    <v>107</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>2249</b>
-                                    <v>105</v>
-                                </b>
-                                <b>
-                                    <a>2292</a>
-                                    <b>10163</b>
-                                    <v>78</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_add_expr_def</name>
-            <cardinality>13786</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>13786</v>
-                </e>
-                <e>
-                    <k>left</k>
-                    <v>13786</v>
-                </e>
-                <e>
-                    <k>right</k>
-                    <v>13786</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>13786</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13786</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13786</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13786</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13786</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13786</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13786</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13786</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13786</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13786</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13786</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13786</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13786</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_aggregate_child</name>
-            <cardinality>16852</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_aggregate</k>
-                    <v>9053</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>3</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>16852</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_aggregate</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1481</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>7345</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>227</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_aggregate</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1481</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>7345</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>227</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_aggregate</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>227</a>
-                                    <b>228</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7572</a>
-                                    <b>7573</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9053</a>
-                                    <b>9054</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>227</a>
-                                    <b>228</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7572</a>
-                                    <b>7573</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9053</a>
-                                    <b>9054</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_aggregate</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16852</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16852</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_aggregate_def</name>
-            <cardinality>9053</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>9053</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_annot_arg_def</name>
-            <cardinality>4043</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>4043</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>4043</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4043</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4043</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_annotation_args</name>
-            <cardinality>4365</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_annotation</k>
-                    <v>3721</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>9</v>
-                </e>
-                <e>
-                    <k>args</k>
-                    <v>4365</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_annotation</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3448</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>10</b>
-                                    <v>273</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_annotation</src>
-                    <trg>args</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3448</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>10</b>
-                                    <v>273</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_annotation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>34</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>273</a>
-                                    <b>274</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3721</a>
-                                    <b>3722</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>args</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>34</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>273</a>
-                                    <b>274</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3721</a>
-                                    <b>3722</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>args</src>
-                    <trg>ql_annotation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4365</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>args</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4365</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_annotation_def</name>
-            <cardinality>65278</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>65278</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>65278</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>65278</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>65278</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_arityless_predicate_expr_def</name>
-            <cardinality>58107</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>58107</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>58107</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>58107</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>58107</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_arityless_predicate_expr_qualifier</name>
-            <cardinality>10163</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_arityless_predicate_expr</k>
-                    <v>10163</v>
-                </e>
-                <e>
-                    <k>qualifier</k>
-                    <v>10163</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_arityless_predicate_expr</src>
-                    <trg>qualifier</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>10163</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>qualifier</src>
-                    <trg>ql_arityless_predicate_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>10163</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_as_expr_child</name>
-            <cardinality>20772</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_as_expr</k>
-                    <v>20508</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>20772</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_as_expr</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>20244</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>264</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_as_expr</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>20244</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>264</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_as_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>264</a>
-                                    <b>265</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20508</a>
-                                    <b>20509</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>264</a>
-                                    <b>265</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20508</a>
-                                    <b>20509</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_as_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>20772</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>20772</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_as_expr_def</name>
-            <cardinality>20508</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>20508</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_as_exprs_child</name>
-            <cardinality>20508</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_as_exprs</k>
-                    <v>8493</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>35</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>20508</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_as_exprs</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2998</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3100</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>714</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>739</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>714</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>36</b>
-                                    <v>228</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_as_exprs</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2998</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3100</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>714</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>739</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>714</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>36</b>
-                                    <v>228</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_as_exprs</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>17</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>23</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>67</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>145</a>
-                                    <b>770</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>942</a>
-                                    <b>2396</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>5495</a>
-                                    <b>8494</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>17</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>23</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>67</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>145</a>
-                                    <b>770</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>942</a>
-                                    <b>2396</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>5495</a>
-                                    <b>8494</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_as_exprs</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>20508</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>20508</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_as_exprs_def</name>
-            <cardinality>8493</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>8493</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_ast_node_location</name>
-            <cardinality>6230328</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>6230328</v>
-                </e>
-                <e>
-                    <k>loc</k>
-                    <v>4563391</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>loc</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6230328</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>loc</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3246688</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>979956</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>336747</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_ast_node_parent</name>
-            <cardinality>6197281</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>6197281</v>
-                </e>
-                <e>
-                    <k>parent</k>
-                    <v>2947735</v>
-                </e>
-                <e>
-                    <k>parent_index</k>
-                    <v>2057</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6197281</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>node</src>
-                    <trg>parent_index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6197281</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1667033</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>276121</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>754976</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>11</b>
-                                    <v>228408</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>2058</b>
-                                    <v>21197</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>parent_index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1667033</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>276121</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>754976</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>11</b>
-                                    <v>228408</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>2058</b>
-                                    <v>21197</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent_index</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>739</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>317</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>388</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>126</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>15</b>
-                                    <v>162</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>47</b>
-                                    <v>158</v>
-                                </b>
-                                <b>
-                                    <a>48</a>
-                                    <b>11121</b>
-                                    <v>155</v>
-                                </b>
-                                <b>
-                                    <a>16033</a>
-                                    <b>2947736</b>
-                                    <v>12</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent_index</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>739</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>317</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>388</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>126</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>15</b>
-                                    <v>162</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>47</b>
-                                    <v>158</v>
-                                </b>
-                                <b>
-                                    <a>48</a>
-                                    <b>11121</b>
-                                    <v>155</v>
-                                </b>
-                                <b>
-                                    <a>16033</a>
-                                    <b>2947736</b>
-                                    <v>12</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_body_def</name>
-            <cardinality>65826</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>65826</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>65826</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>65826</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>65826</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_bool_def</name>
-            <cardinality>4274</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>4274</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>4274</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4274</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4274</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_call_body_child</name>
-            <cardinality>99620</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_call_body</k>
-                    <v>49469</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>15</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>99620</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_call_body</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23173</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>13151</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>7473</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>4432</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>16</b>
-                                    <v>1240</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_call_body</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23173</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>13151</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>7473</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>4432</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>16</b>
-                                    <v>1240</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_call_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>46</a>
-                                    <b>47</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>103</a>
-                                    <b>104</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>237</a>
-                                    <b>238</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>342</a>
-                                    <b>343</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>559</a>
-                                    <b>560</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1240</a>
-                                    <b>1241</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2478</a>
-                                    <b>2479</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5672</a>
-                                    <b>5673</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>13145</a>
-                                    <b>13146</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>26296</a>
-                                    <b>26297</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>49469</a>
-                                    <b>49470</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>46</a>
-                                    <b>47</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>103</a>
-                                    <b>104</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>237</a>
-                                    <b>238</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>342</a>
-                                    <b>343</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>559</a>
-                                    <b>560</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1240</a>
-                                    <b>1241</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2478</a>
-                                    <b>2479</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5672</a>
-                                    <b>5673</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>13145</a>
-                                    <b>13146</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>26296</a>
-                                    <b>26297</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>49469</a>
-                                    <b>49470</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_call_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>99620</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>99620</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_call_body_def</name>
-            <cardinality>57368</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>57368</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_call_or_unqual_agg_expr_child</name>
-            <cardinality>115036</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_call_or_unqual_agg_expr</k>
-                    <v>57368</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>3</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>115036</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_call_or_unqual_agg_expr</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>57068</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>300</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_call_or_unqual_agg_expr</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>57068</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>300</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_call_or_unqual_agg_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>300</a>
-                                    <b>301</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>57368</a>
-                                    <b>57369</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>300</a>
-                                    <b>301</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>57368</a>
-                                    <b>57369</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_call_or_unqual_agg_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>115036</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>115036</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_call_or_unqual_agg_expr_def</name>
-            <cardinality>57368</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>57368</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_charpred_def</name>
-            <cardinality>12088</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>12088</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>12088</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>12088</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12088</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12088</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12088</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12088</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12088</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12088</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_class_member_child</name>
-            <cardinality>112375</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_class_member</k>
-                    <v>79133</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>5</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>112375</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_class_member</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>49462</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>26160</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>3511</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_class_member</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>49462</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>26160</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>3511</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_class_member</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>52</a>
-                                    <b>53</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3511</a>
-                                    <b>3512</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>29671</a>
-                                    <b>29672</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>79133</a>
-                                    <b>79134</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>52</a>
-                                    <b>53</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3511</a>
-                                    <b>3512</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>29671</a>
-                                    <b>29672</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>79133</a>
-                                    <b>79134</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_class_member</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>112375</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>112375</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_class_member_def</name>
-            <cardinality>79133</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>79133</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_classless_predicate_child</name>
-            <cardinality>63161</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_classless_predicate</k>
-                    <v>23253</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>16</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>63161</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_classless_predicate</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2872</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>9678</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>5651</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2828</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>1868</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>17</b>
-                                    <v>356</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_classless_predicate</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2872</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>9678</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>5651</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2828</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>1868</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>17</b>
-                                    <v>356</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_classless_predicate</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>23</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>38</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>63</a>
-                                    <b>64</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>103</a>
-                                    <b>104</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>177</a>
-                                    <b>178</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>356</a>
-                                    <b>357</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>773</a>
-                                    <b>774</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2224</a>
-                                    <b>2225</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5052</a>
-                                    <b>5053</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10703</a>
-                                    <b>10704</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20381</a>
-                                    <b>20382</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>23253</a>
-                                    <b>23254</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>23</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>38</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>63</a>
-                                    <b>64</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>103</a>
-                                    <b>104</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>177</a>
-                                    <b>178</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>356</a>
-                                    <b>357</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>773</a>
-                                    <b>774</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2224</a>
-                                    <b>2225</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5052</a>
-                                    <b>5053</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10703</a>
-                                    <b>10704</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20381</a>
-                                    <b>20382</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>23253</a>
-                                    <b>23254</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_classless_predicate</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>63161</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>63161</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_classless_predicate_def</name>
-            <cardinality>23253</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>23253</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>23253</v>
-                </e>
-                <e>
-                    <k>return_type</k>
-                    <v>23253</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23253</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>return_type</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23253</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23253</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>return_type</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23253</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>return_type</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23253</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>return_type</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23253</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_comp_term_def</name>
-            <cardinality>140334</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>140334</v>
-                </e>
-                <e>
-                    <k>left</k>
-                    <v>140334</v>
-                </e>
-                <e>
-                    <k>right</k>
-                    <v>140334</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>140334</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140334</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140334</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140334</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140334</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140334</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140334</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140334</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140334</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140334</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140334</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140334</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140334</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_conjunction_def</name>
-            <cardinality>76308</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>76308</v>
-                </e>
-                <e>
-                    <k>left</k>
-                    <v>76308</v>
-                </e>
-                <e>
-                    <k>right</k>
-                    <v>76308</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>76308</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>76308</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>76308</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>76308</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>76308</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>76308</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_dataclass_child</name>
-            <cardinality>80203</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_dataclass</k>
-                    <v>20603</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>160</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>80203</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_dataclass</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8138</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3631</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2206</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1665</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1187</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>1851</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>22</b>
-                                    <v>1562</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>161</b>
-                                    <v>363</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_dataclass</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8138</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3631</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2206</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1665</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1187</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>1851</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>22</b>
-                                    <v>1562</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>161</b>
-                                    <v>363</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_dataclass</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>20</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>13</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>20</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>27</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>28</a>
-                                    <b>36</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>38</a>
-                                    <b>98</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>102</a>
-                                    <b>193</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>203</a>
-                                    <b>541</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>596</a>
-                                    <b>3777</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>4963</a>
-                                    <b>20604</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>20</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>13</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>20</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>27</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>28</a>
-                                    <b>36</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>38</a>
-                                    <b>98</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>102</a>
-                                    <b>193</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>203</a>
-                                    <b>541</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>596</a>
-                                    <b>3777</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>4963</a>
-                                    <b>20604</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_dataclass</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>80203</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>80203</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_dataclass_def</name>
-            <cardinality>22563</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>22563</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>22563</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22563</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22563</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_dataclass_extends</name>
-            <cardinality>57708</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_dataclass</k>
-                    <v>21309</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>16</v>
-                </e>
-                <e>
-                    <k>extends</k>
-                    <v>57708</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_dataclass</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>14280</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>6614</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>17</b>
-                                    <v>415</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_dataclass</src>
-                    <trg>extends</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>14280</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>6614</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>17</b>
-                                    <v>415</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_dataclass</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>76</a>
-                                    <b>77</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>415</a>
-                                    <b>416</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>7029</a>
-                                    <b>7030</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>21309</a>
-                                    <b>21310</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>extends</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>76</a>
-                                    <b>77</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>415</a>
-                                    <b>416</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>7029</a>
-                                    <b>7030</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>21309</a>
-                                    <b>21310</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>extends</src>
-                    <trg>ql_dataclass</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>57708</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>extends</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>57708</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_dataclass_instanceof</name>
-            <cardinality>1896</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_dataclass</k>
-                    <v>942</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>4</v>
-                </e>
-                <e>
-                    <k>instanceof</k>
-                    <v>1896</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_dataclass</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>936</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>6</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_dataclass</src>
-                    <trg>instanceof</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>936</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>6</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_dataclass</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>942</a>
-                                    <b>943</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>instanceof</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>942</a>
-                                    <b>943</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>instanceof</src>
-                    <trg>ql_dataclass</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>instanceof</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_datatype_branch_child</name>
-            <cardinality>4787</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_datatype_branch</k>
-                    <v>1984</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>10</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>4787</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_datatype_branch</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>517</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>600</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>563</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>180</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>11</b>
-                                    <v>124</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_datatype_branch</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>517</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>600</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>563</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>180</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>11</b>
-                                    <v>124</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_datatype_branch</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>28</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>124</a>
-                                    <b>125</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>304</a>
-                                    <b>305</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>867</a>
-                                    <b>868</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1467</a>
-                                    <b>1468</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1984</a>
-                                    <b>1985</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>28</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>124</a>
-                                    <b>125</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>304</a>
-                                    <b>305</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>867</a>
-                                    <b>868</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1467</a>
-                                    <b>1468</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1984</a>
-                                    <b>1985</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_datatype_branch</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4787</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4787</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_datatype_branch_def</name>
-            <cardinality>2719</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>2719</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>2719</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2719</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2719</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_datatype_branches_child</name>
-            <cardinality>2719</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_datatype_branches</k>
-                    <v>548</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>246</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>2719</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_datatype_branches</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>132</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>182</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>81</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>49</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>43</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>15</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>247</b>
-                                    <v>19</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_datatype_branches</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>132</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>182</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>81</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>49</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>43</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>15</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>247</b>
-                                    <v>19</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_datatype_branches</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>51</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>111</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>32</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>11</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>20</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>549</b>
-                                    <v>14</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>51</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>111</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>32</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>11</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>20</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>549</b>
-                                    <v>14</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_datatype_branches</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2719</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2719</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_datatype_branches_def</name>
-            <cardinality>548</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>548</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_datatype_def</name>
-            <cardinality>548</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>548</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>548</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>548</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>548</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>548</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>548</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>548</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>548</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>548</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_disjunction_def</name>
-            <cardinality>44890</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>44890</v>
-                </e>
-                <e>
-                    <k>left</k>
-                    <v>44890</v>
-                </e>
-                <e>
-                    <k>right</k>
-                    <v>44890</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>44890</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>44890</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>44890</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>44890</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>44890</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>44890</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_expr_aggregate_body_def</name>
-            <cardinality>1216</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1216</v>
-                </e>
-                <e>
-                    <k>as_exprs</k>
-                    <v>1216</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>as_exprs</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1216</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>as_exprs</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1216</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_expr_aggregate_body_order_bys</name>
-            <cardinality>11</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_expr_aggregate_body</k>
-                    <v>11</v>
-                </e>
-                <e>
-                    <k>order_bys</k>
-                    <v>11</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_expr_aggregate_body</src>
-                    <trg>order_bys</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>order_bys</src>
-                    <trg>ql_expr_aggregate_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_expr_annotation_def</name>
-            <cardinality>601</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>601</v>
-                </e>
-                <e>
-                    <k>annot_arg</k>
-                    <v>601</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>601</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>601</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>annot_arg</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>601</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>601</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>601</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>annot_arg</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>601</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>annot_arg</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>601</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>annot_arg</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>601</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>601</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>annot_arg</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>601</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>601</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>601</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>annot_arg</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>601</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>601</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_field_def</name>
-            <cardinality>3721</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>3721</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>3721</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3721</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3721</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_full_aggregate_body_as_exprs</name>
-            <cardinality>1288</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_full_aggregate_body</k>
-                    <v>1288</v>
-                </e>
-                <e>
-                    <k>as_exprs</k>
-                    <v>1288</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_full_aggregate_body</src>
-                    <trg>as_exprs</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1288</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>as_exprs</src>
-                    <trg>ql_full_aggregate_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1288</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_full_aggregate_body_child</name>
-            <cardinality>7058</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_full_aggregate_body</k>
-                    <v>6301</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>9</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>7058</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_full_aggregate_body</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5788</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>5</b>
-                                    <v>480</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>10</b>
-                                    <v>33</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_full_aggregate_body</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5788</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>5</b>
-                                    <v>480</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>10</b>
-                                    <v>33</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_full_aggregate_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>34</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>51</a>
-                                    <b>52</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>111</a>
-                                    <b>112</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>513</a>
-                                    <b>514</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6301</a>
-                                    <b>6302</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>34</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>51</a>
-                                    <b>52</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>111</a>
-                                    <b>112</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>513</a>
-                                    <b>514</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6301</a>
-                                    <b>6302</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_full_aggregate_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7058</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7058</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_full_aggregate_body_def</name>
-            <cardinality>6356</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>6356</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_full_aggregate_body_guard</name>
-            <cardinality>3549</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_full_aggregate_body</k>
-                    <v>3549</v>
-                </e>
-                <e>
-                    <k>guard</k>
-                    <v>3549</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_full_aggregate_body</src>
-                    <trg>guard</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3549</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>guard</src>
-                    <trg>ql_full_aggregate_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3549</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_full_aggregate_body_order_bys</name>
-            <cardinality>429</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_full_aggregate_body</k>
-                    <v>429</v>
-                </e>
-                <e>
-                    <k>order_bys</k>
-                    <v>429</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_full_aggregate_body</src>
-                    <trg>order_bys</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>429</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>order_bys</src>
-                    <trg>ql_full_aggregate_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>429</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_higher_order_term_child</name>
-            <cardinality>343</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_higher_order_term</k>
-                    <v>77</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>8</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>343</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_higher_order_term</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>24</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>51</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_higher_order_term</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>24</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>51</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_higher_order_term</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>53</a>
-                                    <b>54</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>77</a>
-                                    <b>78</b>
-                                    <v>3</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>53</a>
-                                    <b>54</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>77</a>
-                                    <b>78</b>
-                                    <v>3</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_higher_order_term</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>343</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>343</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_higher_order_term_def</name>
-            <cardinality>77</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>77</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>77</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>77</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>77</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_if_term_def</name>
-            <cardinality>2953</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>2953</v>
-                </e>
-                <e>
-                    <k>cond</k>
-                    <v>2953</v>
-                </e>
-                <e>
-                    <k>first</k>
-                    <v>2953</v>
-                </e>
-                <e>
-                    <k>second</k>
-                    <v>2953</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>cond</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2953</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>first</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2953</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>second</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2953</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>cond</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2953</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>cond</src>
-                    <trg>first</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2953</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>cond</src>
-                    <trg>second</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2953</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>first</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2953</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>first</src>
-                    <trg>cond</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2953</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>first</src>
-                    <trg>second</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2953</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>second</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2953</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>second</src>
-                    <trg>cond</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2953</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>second</src>
-                    <trg>first</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2953</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_implication_def</name>
-            <cardinality>101</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>101</v>
-                </e>
-                <e>
-                    <k>left</k>
-                    <v>101</v>
-                </e>
-                <e>
-                    <k>right</k>
-                    <v>101</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>101</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>101</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>101</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>101</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>101</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>101</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_import_directive_child</name>
-            <cardinality>27063</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_import_directive</k>
-                    <v>25764</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>27063</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_import_directive</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>24465</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1299</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_import_directive</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>24465</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1299</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_import_directive</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1299</a>
-                                    <b>1300</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>25764</a>
-                                    <b>25765</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1299</a>
-                                    <b>1300</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>25764</a>
-                                    <b>25765</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_import_directive</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>27063</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>27063</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_import_directive_def</name>
-            <cardinality>25764</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>25764</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_import_module_expr_def</name>
-            <cardinality>25764</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>25764</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>25764</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>25764</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>25764</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_import_module_expr_qual_name</name>
-            <cardinality>44946</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_import_module_expr</k>
-                    <v>13345</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>8</v>
-                </e>
-                <e>
-                    <k>qual_name</k>
-                    <v>44946</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_import_module_expr</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>972</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2220</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>3431</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>4933</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1355</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>434</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_import_module_expr</src>
-                    <trg>qual_name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>972</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2220</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>3431</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>4933</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1355</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>434</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_import_module_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>25</a>
-                                    <b>26</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>105</a>
-                                    <b>106</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>434</a>
-                                    <b>435</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1789</a>
-                                    <b>1790</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6722</a>
-                                    <b>6723</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10153</a>
-                                    <b>10154</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>12373</a>
-                                    <b>12374</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>13345</a>
-                                    <b>13346</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>qual_name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>25</a>
-                                    <b>26</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>105</a>
-                                    <b>106</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>434</a>
-                                    <b>435</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1789</a>
-                                    <b>1790</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6722</a>
-                                    <b>6723</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10153</a>
-                                    <b>10154</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>12373</a>
-                                    <b>12374</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>13345</a>
-                                    <b>13346</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>qual_name</src>
-                    <trg>ql_import_module_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>44946</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>qual_name</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>44946</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_in_expr_def</name>
-            <cardinality>1037</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1037</v>
-                </e>
-                <e>
-                    <k>left</k>
-                    <v>1037</v>
-                </e>
-                <e>
-                    <k>right</k>
-                    <v>1037</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1037</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1037</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1037</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1037</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1037</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1037</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_instance_of_child</name>
-            <cardinality>31826</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_instance_of</k>
-                    <v>15913</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>31826</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_instance_of</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>15913</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_instance_of</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>15913</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_instance_of</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>15913</a>
-                                    <b>15914</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>15913</a>
-                                    <b>15914</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_instance_of</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>31826</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>31826</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_instance_of_def</name>
-            <cardinality>15913</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>15913</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_literal_def</name>
-            <cardinality>109390</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>109390</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>109390</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>109390</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>109390</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_member_predicate_child</name>
-            <cardinality>63378</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_member_predicate</k>
-                    <v>43952</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>12</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>63378</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_member_predicate</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>32505</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>6417</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>3219</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>13</b>
-                                    <v>1811</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_member_predicate</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>32505</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>6417</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>3219</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>13</b>
-                                    <v>1811</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_member_predicate</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>39</a>
-                                    <b>40</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>420</a>
-                                    <b>421</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>654</a>
-                                    <b>655</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1811</a>
-                                    <b>1812</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5030</a>
-                                    <b>5031</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>11447</a>
-                                    <b>11448</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>43952</a>
-                                    <b>43953</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>39</a>
-                                    <b>40</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>420</a>
-                                    <b>421</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>654</a>
-                                    <b>655</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1811</a>
-                                    <b>1812</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5030</a>
-                                    <b>5031</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>11447</a>
-                                    <b>11448</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>43952</a>
-                                    <b>43953</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_member_predicate</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>63378</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>63378</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_member_predicate_def</name>
-            <cardinality>43952</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>43952</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>43952</v>
-                </e>
-                <e>
-                    <k>return_type</k>
-                    <v>43952</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>43952</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>return_type</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>43952</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>43952</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>return_type</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>43952</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>return_type</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>43952</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>return_type</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>43952</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_module_alias_body_def</name>
-            <cardinality>917</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>917</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>917</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>917</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>917</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_module_child</name>
-            <cardinality>33181</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_module</k>
-                    <v>4556</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>1314</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>33181</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_module</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1138</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1239</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>385</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>392</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>383</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>407</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>23</b>
-                                    <v>351</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>1315</b>
-                                    <v>261</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_module</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1138</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1239</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>385</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>392</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>383</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>407</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>23</b>
-                                    <v>351</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>1315</b>
-                                    <v>261</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_module</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>718</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>180</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>114</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>102</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>17</b>
-                                    <v>106</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>4557</b>
-                                    <v>94</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>718</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>180</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>114</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>102</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>17</b>
-                                    <v>106</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>4557</b>
-                                    <v>94</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_module</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>33181</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>33181</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_module_def</name>
-            <cardinality>4567</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>4567</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>4567</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4567</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4567</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_module_expr_def</name>
-            <cardinality>76399</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>76399</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>76399</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>76399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>76399</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_module_expr_name</name>
-            <cardinality>4773</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_module_expr</k>
-                    <v>4773</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>4773</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_module_expr</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4773</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>ql_module_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4773</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_module_implements</name>
-            <cardinality>1251</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_module</k>
-                    <v>1251</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>1</v>
-                </e>
-                <e>
-                    <k>implements</k>
-                    <v>1251</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_module</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1251</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_module</src>
-                    <trg>implements</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1251</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_module</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1251</a>
-                                    <b>1252</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>implements</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1251</a>
-                                    <b>1252</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>implements</src>
-                    <trg>ql_module</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1251</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>implements</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1251</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_module_instantiation_child</name>
-            <cardinality>2192</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_module_instantiation</k>
-                    <v>1740</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>8</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>2192</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_module_instantiation</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1473</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>172</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>9</b>
-                                    <v>95</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_module_instantiation</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1473</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>172</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>9</b>
-                                    <v>95</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_module_instantiation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>56</a>
-                                    <b>57</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>95</a>
-                                    <b>96</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>267</a>
-                                    <b>268</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1740</a>
-                                    <b>1741</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>56</a>
-                                    <b>57</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>95</a>
-                                    <b>96</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>267</a>
-                                    <b>268</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1740</a>
-                                    <b>1741</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_module_instantiation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2192</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2192</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_module_instantiation_def</name>
-            <cardinality>1740</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1740</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>1740</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1740</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1740</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_module_member_child</name>
-            <cardinality>150156</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_module_member</k>
-                    <v>118178</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>6</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>150156</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_module_member</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>88793</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>26917</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>2468</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_module_member</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>88793</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>26917</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>2468</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_module_member</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>113</a>
-                                    <b>114</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2468</a>
-                                    <b>2469</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>29385</a>
-                                    <b>29386</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>118178</a>
-                                    <b>118179</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>113</a>
-                                    <b>114</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2468</a>
-                                    <b>2469</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>29385</a>
-                                    <b>29386</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>118178</a>
-                                    <b>118179</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_module_member</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>150156</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>150156</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_module_member_def</name>
-            <cardinality>118178</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>118178</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_module_name_def</name>
-            <cardinality>7606</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>7606</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>7606</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7606</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7606</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_module_param_def</name>
-            <cardinality>266</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>266</v>
-                </e>
-                <e>
-                    <k>parameter</k>
-                    <v>266</v>
-                </e>
-                <e>
-                    <k>signature</k>
-                    <v>266</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>parameter</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>266</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>signature</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>266</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parameter</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>266</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parameter</src>
-                    <trg>signature</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>266</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>signature</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>266</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>signature</src>
-                    <trg>parameter</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>266</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_module_parameter</name>
-            <cardinality>266</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_module</k>
-                    <v>185</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>8</v>
-                </e>
-                <e>
-                    <k>parameter</k>
-                    <v>266</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_module</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>138</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>30</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>15</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_module</src>
-                    <trg>parameter</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>138</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>30</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>15</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_module</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>47</a>
-                                    <b>48</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>185</a>
-                                    <b>186</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>parameter</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>47</a>
-                                    <b>48</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>185</a>
-                                    <b>186</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parameter</src>
-                    <trg>ql_module</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>266</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parameter</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>266</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_mul_expr_def</name>
-            <cardinality>585</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>585</v>
-                </e>
-                <e>
-                    <k>left</k>
-                    <v>585</v>
-                </e>
-                <e>
-                    <k>right</k>
-                    <v>585</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>585</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>585</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>585</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>585</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>585</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>585</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>585</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>585</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>585</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>585</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>585</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>585</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>585</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_negation_def</name>
-            <cardinality>11727</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>11727</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>11727</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11727</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11727</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_order_by_child</name>
-            <cardinality>1272</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_order_by</k>
-                    <v>1067</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>1272</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_order_by</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>862</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>205</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_order_by</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>862</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>205</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_order_by</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>205</a>
-                                    <b>206</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1067</a>
-                                    <b>1068</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>205</a>
-                                    <b>206</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1067</a>
-                                    <b>1068</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_order_by</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1272</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1272</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_order_by_def</name>
-            <cardinality>1067</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1067</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_order_bys_child</name>
-            <cardinality>1067</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_order_bys</k>
-                    <v>661</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>8</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>1067</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_order_bys</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>477</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>101</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>9</b>
-                                    <v>42</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_order_bys</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>477</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>101</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>9</b>
-                                    <v>42</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_order_bys</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>22</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>42</a>
-                                    <b>43</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>63</a>
-                                    <b>64</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>83</a>
-                                    <b>84</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>184</a>
-                                    <b>185</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>661</a>
-                                    <b>662</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>22</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>42</a>
-                                    <b>43</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>63</a>
-                                    <b>64</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>83</a>
-                                    <b>84</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>184</a>
-                                    <b>185</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>661</a>
-                                    <b>662</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_order_bys</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1067</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1067</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_order_bys_def</name>
-            <cardinality>661</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>661</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_par_expr_def</name>
-            <cardinality>5799</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>5799</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>5799</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5799</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5799</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_predicate_alias_body_def</name>
-            <cardinality>372</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>372</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>372</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>372</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>372</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_predicate_expr_child</name>
-            <cardinality>1478</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_predicate_expr</k>
-                    <v>739</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>1478</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_predicate_expr</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>739</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_predicate_expr</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>739</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_predicate_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>739</a>
-                                    <b>740</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>739</a>
-                                    <b>740</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_predicate_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1478</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1478</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_predicate_expr_def</name>
-            <cardinality>739</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>739</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_prefix_cast_child</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_prefix_cast</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_prefix_cast</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_prefix_cast</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_prefix_cast</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_prefix_cast</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_prefix_cast_def</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_ql_child</name>
-            <cardinality>85914</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_ql</k>
-                    <v>11162</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>340</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>85914</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_ql</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>96</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2238</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2551</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1524</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1041</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>730</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>829</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>14</b>
-                                    <v>913</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>31</b>
-                                    <v>844</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>341</b>
-                                    <v>396</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_ql</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>96</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2238</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2551</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1524</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1041</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>730</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>829</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>14</b>
-                                    <v>913</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>31</b>
-                                    <v>844</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>341</b>
-                                    <v>396</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_ql</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>28</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>10</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>13</b>
-                                    <v>28</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>22</b>
-                                    <v>30</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>29</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>46</b>
-                                    <v>27</v>
-                                </b>
-                                <b>
-                                    <a>48</a>
-                                    <b>83</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>84</a>
-                                    <b>176</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>179</a>
-                                    <b>553</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>584</a>
-                                    <b>11163</b>
-                                    <v>25</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>28</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>10</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>13</b>
-                                    <v>28</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>22</b>
-                                    <v>30</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>29</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>46</b>
-                                    <v>27</v>
-                                </b>
-                                <b>
-                                    <a>48</a>
-                                    <b>83</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>84</a>
-                                    <b>176</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>179</a>
-                                    <b>553</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>584</a>
-                                    <b>11163</b>
-                                    <v>25</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_ql</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>85914</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>85914</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_ql_def</name>
-            <cardinality>11167</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>11167</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_qualified_expr_child</name>
-            <cardinality>330314</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_qualified_expr</k>
-                    <v>165157</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>330314</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_qualified_expr</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>165157</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_qualified_expr</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>165157</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_qualified_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>165157</a>
-                                    <b>165158</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>165157</a>
-                                    <b>165158</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_qualified_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>330314</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>330314</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_qualified_expr_def</name>
-            <cardinality>165157</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>165157</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_qualified_rhs_child</name>
-            <cardinality>68095</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_qualified_rhs</k>
-                    <v>52354</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>11</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>68095</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_qualified_rhs</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>41965</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>7314</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>12</b>
-                                    <v>3075</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_qualified_rhs</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>41965</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>7314</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>12</b>
-                                    <v>3075</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_qualified_rhs</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>25</a>
-                                    <b>26</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>66</a>
-                                    <b>67</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>802</a>
-                                    <b>803</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1336</a>
-                                    <b>1337</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3075</a>
-                                    <b>3076</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10389</a>
-                                    <b>10390</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>52354</a>
-                                    <b>52355</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>25</a>
-                                    <b>26</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>66</a>
-                                    <b>67</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>802</a>
-                                    <b>803</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1336</a>
-                                    <b>1337</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3075</a>
-                                    <b>3076</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10389</a>
-                                    <b>10390</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>52354</a>
-                                    <b>52355</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_qualified_rhs</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>68095</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>68095</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_qualified_rhs_def</name>
-            <cardinality>165157</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>165157</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_qualified_rhs_name</name>
-            <cardinality>153874</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_qualified_rhs</k>
-                    <v>153874</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>153874</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_qualified_rhs</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>153874</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>ql_qualified_rhs</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>153874</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_quantified_child</name>
-            <cardinality>52811</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_quantified</k>
-                    <v>24227</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>22</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>52811</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_quantified</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4452</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>14178</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>3526</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>1823</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>23</b>
-                                    <v>248</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_quantified</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4452</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>14178</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>3526</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>1823</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>23</b>
-                                    <v>248</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_quantified</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>9</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>45</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>102</a>
-                                    <b>249</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>706</a>
-                                    <b>2072</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>5597</a>
-                                    <b>19776</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>24227</a>
-                                    <b>24228</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>9</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>45</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>102</a>
-                                    <b>249</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>706</a>
-                                    <b>2072</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>5597</a>
-                                    <b>19776</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>24227</a>
-                                    <b>24228</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_quantified</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>52811</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>52811</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_quantified_def</name>
-            <cardinality>24227</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>24227</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_quantified_expr</name>
-            <cardinality>4452</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_quantified</k>
-                    <v>4452</v>
-                </e>
-                <e>
-                    <k>expr</k>
-                    <v>4452</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_quantified</src>
-                    <trg>expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4452</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>expr</src>
-                    <trg>ql_quantified</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4452</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_quantified_formula</name>
-            <cardinality>7476</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_quantified</k>
-                    <v>7476</v>
-                </e>
-                <e>
-                    <k>formula</k>
-                    <v>7476</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_quantified</src>
-                    <trg>formula</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7476</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>formula</src>
-                    <trg>ql_quantified</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7476</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_quantified_range</name>
-            <cardinality>19737</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_quantified</k>
-                    <v>19737</v>
-                </e>
-                <e>
-                    <k>range</k>
-                    <v>19737</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_quantified</src>
-                    <trg>range</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>19737</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>range</src>
-                    <trg>ql_quantified</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>19737</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_range_def</name>
-            <cardinality>365</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>365</v>
-                </e>
-                <e>
-                    <k>lower</k>
-                    <v>365</v>
-                </e>
-                <e>
-                    <k>upper</k>
-                    <v>365</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>lower</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>365</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>upper</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>365</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>lower</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>365</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>lower</src>
-                    <trg>upper</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>365</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>upper</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>365</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>upper</src>
-                    <trg>lower</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>365</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_select_child</name>
-            <cardinality>23801</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_select</k>
-                    <v>5989</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>20</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>23801</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_select</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>149</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>854</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1341</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1821</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1028</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>465</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>21</b>
-                                    <v>331</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_select</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>149</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>854</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1341</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1821</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1028</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>465</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>21</b>
-                                    <v>331</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_select</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>28</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>30</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>45</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>71</a>
-                                    <b>72</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>160</a>
-                                    <b>161</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>331</a>
-                                    <b>332</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>796</a>
-                                    <b>797</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1824</a>
-                                    <b>1825</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3645</a>
-                                    <b>3646</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4986</a>
-                                    <b>4987</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5840</a>
-                                    <b>5841</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5989</a>
-                                    <b>5990</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>28</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>30</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>45</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>71</a>
-                                    <b>72</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>160</a>
-                                    <b>161</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>331</a>
-                                    <b>332</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>796</a>
-                                    <b>797</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1824</a>
-                                    <b>1825</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3645</a>
-                                    <b>3646</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4986</a>
-                                    <b>4987</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5840</a>
-                                    <b>5841</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5989</a>
-                                    <b>5990</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_select</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23801</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23801</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_select_def</name>
-            <cardinality>5989</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>5989</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_set_literal_child</name>
-            <cardinality>20149</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_set_literal</k>
-                    <v>4014</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>1028</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>20149</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_set_literal</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2354</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>506</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>351</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>291</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>13</b>
-                                    <v>315</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>1029</b>
-                                    <v>188</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_set_literal</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2354</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>506</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>351</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>291</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>13</b>
-                                    <v>315</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>1029</b>
-                                    <v>188</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_set_literal</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>528</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>194</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>63</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>9</b>
-                                    <v>90</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>19</b>
-                                    <v>83</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>4015</b>
-                                    <v>70</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>528</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>194</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>63</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>9</b>
-                                    <v>90</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>19</b>
-                                    <v>83</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>4015</b>
-                                    <v>70</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_set_literal</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>20149</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>20149</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_set_literal_def</name>
-            <cardinality>4014</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>4014</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_signature_expr_def</name>
-            <cardinality>3709</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>3709</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_signature_expr_mod_expr</name>
-            <cardinality>180</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_signature_expr</k>
-                    <v>180</v>
-                </e>
-                <e>
-                    <k>mod_expr</k>
-                    <v>180</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_signature_expr</src>
-                    <trg>mod_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>180</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>mod_expr</src>
-                    <trg>ql_signature_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>180</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_signature_expr_predicate</name>
-            <cardinality>232</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_signature_expr</k>
-                    <v>232</v>
-                </e>
-                <e>
-                    <k>predicate</k>
-                    <v>232</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_signature_expr</src>
-                    <trg>predicate</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>232</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>predicate</src>
-                    <trg>ql_signature_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>232</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_signature_expr_type_expr</name>
-            <cardinality>3297</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_signature_expr</k>
-                    <v>3297</v>
-                </e>
-                <e>
-                    <k>type_expr</k>
-                    <v>3297</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_signature_expr</src>
-                    <trg>type_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3297</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>type_expr</src>
-                    <trg>ql_signature_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3297</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_special_call_def</name>
-            <cardinality>4424</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>4424</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>4424</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4424</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4424</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_super_ref_child</name>
-            <cardinality>3530</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_super_ref</k>
-                    <v>2901</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>3530</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_super_ref</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2272</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>629</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_super_ref</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2272</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>629</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_super_ref</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>629</a>
-                                    <b>630</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2901</a>
-                                    <b>2902</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>629</a>
-                                    <b>630</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2901</a>
-                                    <b>2902</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_super_ref</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3530</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3530</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_super_ref_def</name>
-            <cardinality>2901</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>2901</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_tokeninfo</name>
-            <cardinality>3524470</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>3524470</v>
-                </e>
-                <e>
-                    <k>kind</k>
-                    <v>31</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>159352</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3524470</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3524470</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>205</a>
-                                    <b>306</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>585</a>
-                                    <b>993</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1158</a>
-                                    <b>1974</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2234</a>
-                                    <b>2302</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2344</a>
-                                    <b>2902</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3766</a>
-                                    <b>4425</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>9053</a>
-                                    <b>13787</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>17184</a>
-                                    <b>20889</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>21612</a>
-                                    <b>24228</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>26200</a>
-                                    <b>47957</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>50826</a>
-                                    <b>52494</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>55406</a>
-                                    <b>58185</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>66480</a>
-                                    <b>83939</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>140334</a>
-                                    <b>204254</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>221079</a>
-                                    <b>512065</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1875319</a>
-                                    <b>1875320</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>18</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>65</a>
-                                    <b>141</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>635</a>
-                                    <b>858</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2472</a>
-                                    <b>12791</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>15738</a>
-                                    <b>15845</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>18782</a>
-                                    <b>21406</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>42941</a>
-                                    <b>44802</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>96196</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>23735</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11475</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>13411</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>41</b>
-                                    <v>12004</v>
-                                </b>
-                                <b>
-                                    <a>41</a>
-                                    <b>348424</b>
-                                    <v>2531</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>142727</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>16072</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>553</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_type_alias_body_def</name>
-            <cardinality>817</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>817</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>817</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>817</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>817</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_type_expr_child</name>
-            <cardinality>51722</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_type_expr</k>
-                    <v>51722</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>51722</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_type_expr</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>51722</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_type_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>51722</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_type_expr_def</name>
-            <cardinality>218057</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>218057</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_type_expr_name</name>
-            <cardinality>166335</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_type_expr</k>
-                    <v>166335</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>166335</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_type_expr</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>166335</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>ql_type_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>166335</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_type_expr_qualifier</name>
-            <cardinality>34602</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_type_expr</k>
-                    <v>34602</v>
-                </e>
-                <e>
-                    <k>qualifier</k>
-                    <v>34602</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_type_expr</src>
-                    <trg>qualifier</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>34602</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>qualifier</src>
-                    <trg>ql_type_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>34602</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_type_union_body_child</name>
-            <cardinality>1174</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_type_union_body</k>
-                    <v>253</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>153</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>1174</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_type_union_body</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>121</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>45</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>32</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>154</b>
-                                    <v>19</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_type_union_body</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>121</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>45</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>32</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>154</b>
-                                    <v>19</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_type_union_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>98</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>18</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>254</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>98</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>18</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>254</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_type_union_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1174</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1174</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_type_union_body_def</name>
-            <cardinality>253</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>253</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_unary_expr_child</name>
-            <cardinality>2316</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_unary_expr</k>
-                    <v>1158</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>2316</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_unary_expr</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1158</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_unary_expr</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1158</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_unary_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1158</a>
-                                    <b>1159</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1158</a>
-                                    <b>1159</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_unary_expr</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2316</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2316</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_unary_expr_def</name>
-            <cardinality>1158</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1158</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_unqual_agg_body_as_exprs</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_unqual_agg_body</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>as_exprs</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_unqual_agg_body</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_unqual_agg_body</src>
-                    <trg>as_exprs</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_unqual_agg_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>as_exprs</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>as_exprs</src>
-                    <trg>ql_unqual_agg_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>as_exprs</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_unqual_agg_body_child</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_unqual_agg_body</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_unqual_agg_body</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_unqual_agg_body</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_unqual_agg_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_unqual_agg_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_unqual_agg_body_def</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_unqual_agg_body_guard</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_unqual_agg_body</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>guard</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_unqual_agg_body</src>
-                    <trg>guard</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>guard</src>
-                    <trg>ql_unqual_agg_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_var_decl_child</name>
-            <cardinality>228274</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ql_var_decl</k>
-                    <v>114137</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>228274</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ql_var_decl</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>114137</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ql_var_decl</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>114137</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ql_var_decl</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>114137</a>
-                                    <b>114138</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>114137</a>
-                                    <b>114138</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ql_var_decl</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>228274</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>228274</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_var_decl_def</name>
-            <cardinality>114137</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>114137</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ql_var_name_def</name>
-            <cardinality>380908</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>380908</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>380908</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>380908</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>380908</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ql_variable_def</name>
-            <cardinality>369462</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>369462</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>369462</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>369462</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>369462</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>sourceLocationPrefix</name>
-            <cardinality>1</cardinality>
-            <columnsizes>
-                <e>
-                    <k>prefix</k>
-                    <v>1</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>yaml</name>
-            <cardinality>1726</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1726</v>
-                </e>
-                <e>
-                    <k>kind</k>
-                    <v>3</v>
-                </e>
-                <e>
-                    <k>parent</k>
-                    <v>350</v>
-                </e>
-                <e>
-                    <k>idx</k>
-                    <v>21</v>
-                </e>
-                <e>
-                    <k>tag</k>
-                    <v>5</v>
-                </e>
-                <e>
-                    <k>tostring</k>
-                    <v>263</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1726</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1726</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1726</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1726</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>tostring</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1726</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>59</a>
-                                    <b>60</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>186</a>
-                                    <b>187</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1481</a>
-                                    <b>1482</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>56</a>
-                                    <b>57</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>186</a>
-                                    <b>187</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>245</a>
-                                    <b>246</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>22</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>tostring</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>33</a>
-                                    <b>34</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>68</a>
-                                    <b>69</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>162</a>
-                                    <b>163</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>118</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>71</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>30</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>30</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>21</b>
-                                    <v>25</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>262</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>49</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>118</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>71</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>30</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>30</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>21</b>
-                                    <v>25</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>245</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>15</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>49</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>tostring</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>118</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>71</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>35</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>29</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>12</b>
-                                    <v>27</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>17</b>
-                                    <v>29</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>19</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>25</a>
-                                    <b>26</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>55</a>
-                                    <b>56</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>71</a>
-                                    <b>72</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>101</a>
-                                    <b>102</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>127</a>
-                                    <b>128</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>153</a>
-                                    <b>154</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>161</a>
-                                    <b>162</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>164</a>
-                                    <b>165</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>186</a>
-                                    <b>187</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>232</a>
-                                    <b>233</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>7</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>25</a>
-                                    <b>26</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>55</a>
-                                    <b>56</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>71</a>
-                                    <b>72</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>101</a>
-                                    <b>102</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>127</a>
-                                    <b>128</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>153</a>
-                                    <b>154</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>161</a>
-                                    <b>162</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>164</a>
-                                    <b>165</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>186</a>
-                                    <b>187</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>232</a>
-                                    <b>233</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>tostring</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>28</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>30</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>38</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>59</a>
-                                    <b>60</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>80</a>
-                                    <b>81</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>81</a>
-                                    <b>82</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tag</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>59</a>
-                                    <b>60</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>137</a>
-                                    <b>138</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>186</a>
-                                    <b>187</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1342</a>
-                                    <b>1343</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tag</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tag</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>56</a>
-                                    <b>57</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>105</a>
-                                    <b>106</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>186</a>
-                                    <b>187</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>245</a>
-                                    <b>246</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tag</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tag</src>
-                    <trg>tostring</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>34</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>68</a>
-                                    <b>69</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>159</a>
-                                    <b>160</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tostring</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>141</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>28</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>17</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>145</b>
-                                    <v>17</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tostring</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>263</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tostring</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>142</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>27</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>19</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>106</b>
-                                    <v>14</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tostring</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>179</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>35</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>24</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>20</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>10</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tostring</src>
-                    <trg>tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>263</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>yaml_aliases</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>alias</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>target</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>alias</src>
-                    <trg>target</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>target</src>
-                    <trg>alias</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>yaml_anchors</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>anchor</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>anchor</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>anchor</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>yaml_errors</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>message</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>message</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>yaml_locations</name>
-            <cardinality>1726</cardinality>
-            <columnsizes>
-                <e>
-                    <k>locatable</k>
-                    <v>1726</v>
-                </e>
-                <e>
-                    <k>location</k>
-                    <v>1726</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>locatable</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1726</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>locatable</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1726</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>yaml_scalars</name>
-            <cardinality>1481</cardinality>
-            <columnsizes>
-                <e>
-                    <k>scalar</k>
-                    <v>1481</v>
-                </e>
-                <e>
-                    <k>style</k>
-                    <v>3</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>195</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>scalar</src>
-                    <trg>style</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1481</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>scalar</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1481</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>style</src>
-                    <trg>scalar</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>41</a>
-                                    <b>42</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1435</a>
-                                    <b>1436</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>style</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>192</a>
-                                    <b>193</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>scalar</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>101</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>10</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>15</b>
-                                    <v>15</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>106</b>
-                                    <v>15</v>
-                                </b>
-                                <b>
-                                    <a>136</a>
-                                    <b>145</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>style</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>194</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>databaseMetadata</name>
-            <cardinality>1</cardinality>
-            <columnsizes>
-                <e>
-                    <k>metadataKey</k>
-                    <v>1</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>1</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>metadataKey</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>metadataKey</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>overlayChangedFiles</name>
-            <cardinality>50</cardinality>
-            <columnsizes>
-                <e>
-                    <k>path</k>
-                    <v>50</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        </stats>
+  <typesizes />
+  <stats />
 </dbstats>
diff --git a/ql/ql/src/queries/overlay/InlineOverlayCaller.ql b/ql/ql/src/queries/overlay/InlineOverlayCaller.ql
index 0853dfde830e..b0d9abb19e88 100644
--- a/ql/ql/src/queries/overlay/InlineOverlayCaller.ql
+++ b/ql/ql/src/queries/overlay/InlineOverlayCaller.ql
@@ -11,18 +11,20 @@
 
 import ql
 
-predicate mayBeLocal(AstNode n) {
+private predicate isDirectlyLocal(AstNode n) {
   n.getAnAnnotation() instanceof OverlayLocal
   or
   n.getAnAnnotation() instanceof OverlayLocalQ
+}
+
+predicate mayBeLocal(AstNode n) {
+  isDirectlyLocal(n)
   or
-  // The tree-sitter-ql grammar doesn't handle annotations on file-level
-  // module declarations correctly. To work around that, we consider any
-  // node in a file that contains an overlay[local] or overlay[local?]
-  // annotation to be potentially local.
+  // File-level module annotations belong to an anonymous `Module` sibling of
+  // the file's declarations, so consider every node in that file potentially local.
   exists(AstNode m |
     n.getLocation().getFile() = m.getLocation().getFile() and
-    mayBeLocal(m)
+    isDirectlyLocal(m)
   )
 }
 
diff --git a/ql/ql/src/queries/style/ConsistentAlertMessage.ql b/ql/ql/src/queries/style/ConsistentAlertMessage.ql
index c2d0c9be1805..beb1d7b5f4da 100644
--- a/ql/ql/src/queries/style/ConsistentAlertMessage.ql
+++ b/ql/ql/src/queries/style/ConsistentAlertMessage.ql
@@ -10,6 +10,12 @@
 
 import ql
 
+private predicate isInMessage(AstNode node, Select sel) {
+  node = sel.getExpr(any(int i | i % 2 = 1))
+  or
+  exists(AstNode parent | isInMessage(parent, sel) and node.getParent() = parent)
+}
+
 /**
  * Gets a string representation of the entire message in `sel`.
  * Ignores everything that is not a string constant.
@@ -18,7 +24,7 @@ string getMessage(Select sel) {
   result =
     strictconcat(String e, Location l |
       // is child of an expression in the select (in an odd-indexed position, that's where the message is)
-      e.getParent*() = sel.getExpr(any(int i | i % 2 = 1)) and l = e.getFullLocation()
+      isInMessage(e, sel) and l = e.getFullLocation()
     |
       e.getValue(), " | " order by l.getStartLine(), l.getStartColumn()
     ).trim()
@@ -36,7 +42,7 @@ string getSelectFingerPrint(Select sel) {
       doc.getQueryId() // query ID (without lang)
         + "-" + doc.getQueryKind() // @kind
         + "-" +
-        strictcount(String e | e.getParent*() = sel.getExpr(any(int i | i % 2 = 1))) // the number of string constants in the select
+        strictcount(String e | isInMessage(e, sel)) // the number of string constants in the select
         + "-" + count(sel.getExpr(_)) // and the total number of expressions in the select
   )
 }
diff --git a/ql/ql/src/queries/style/NonDocBlock.ql b/ql/ql/src/queries/style/NonDocBlock.ql
index 61efce0b9027..1031afa40205 100644
--- a/ql/ql/src/queries/style/NonDocBlock.ql
+++ b/ql/ql/src/queries/style/NonDocBlock.ql
@@ -69,11 +69,19 @@ BlockComment getCommentAtStart(File file, int startLine) {
   result.getLocation().getStartLine() = startLine
 }
 
+pragma[noinline]
+private BlockComment getCommentFor(AstNode node) {
+  exists(Location loc |
+    canHaveQLDoc(node) and
+    loc = pragma[only_bind_out](node.getLocation()) and
+    result = getCommentAtEnd(loc.getFile(), loc.getStartLine() - 1)
+  )
+}
+
 from AstNode node, BlockComment comment, string nodeDescrip
 where
   (
-    canHaveQLDoc(node) and
-    comment = getCommentAtEnd(node.getLocation().getFile(), node.getLocation().getStartLine() - 1) and
+    comment = getCommentFor(node) and
     nodeDescrip = "the below code"
     or
     node instanceof TopLevel and
diff --git a/ql/ql/src/utils/test/InlineExpectationsTestQuery.ql b/ql/ql/src/utils/test/InlineExpectationsTestQuery.ql
index 979839480e1d..b5c70edad177 100644
--- a/ql/ql/src/utils/test/InlineExpectationsTestQuery.ql
+++ b/ql/ql/src/utils/test/InlineExpectationsTestQuery.ql
@@ -6,16 +6,4 @@ private import ql
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>
diff --git a/ql/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll b/ql/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll
index 647ddd5a87db..88a30d0d4c7a 100644
--- a/ql/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/ql/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll
@@ -25,4 +25,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = QL::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(QL::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }
diff --git a/ql/ql/test/queries/overlay/InlineOverlayCaller/OverlayAnnotations.expected b/ql/ql/test/queries/overlay/InlineOverlayCaller/OverlayAnnotations.expected
new file mode 100644
index 000000000000..138b0f999121
--- /dev/null
+++ b/ql/ql/test/queries/overlay/InlineOverlayCaller/OverlayAnnotations.expected
@@ -0,0 +1,3 @@
+| Test.qll:1:1:1:15 | overlay[local?] | overlay[local?] |
+| Test.qll:9:1:9:15 | overlay[caller] | overlay[caller] |
+| Test.qll:16:1:16:16 | overlay[caller?] | overlay[caller?] |
diff --git a/ql/ql/test/queries/overlay/InlineOverlayCaller/OverlayAnnotations.ql b/ql/ql/test/queries/overlay/InlineOverlayCaller/OverlayAnnotations.ql
new file mode 100644
index 000000000000..6154afc96ae6
--- /dev/null
+++ b/ql/ql/test/queries/overlay/InlineOverlayCaller/OverlayAnnotations.ql
@@ -0,0 +1,9 @@
+import ql
+
+from Annotation a
+where
+  a instanceof OverlayCaller or
+  a instanceof OverlayCallerQ or
+  a instanceof OverlayLocal or
+  a instanceof OverlayLocalQ
+select a, a.toString()
diff --git a/ql/ql/test/queries/style/DeadCode/DeadCode.expected b/ql/ql/test/queries/style/DeadCode/DeadCode.expected
index 017cf546a92a..472be0a3eaa6 100644
--- a/ql/ql/test/queries/style/DeadCode/DeadCode.expected
+++ b/ql/ql/test/queries/style/DeadCode/DeadCode.expected
@@ -1,5 +1,5 @@
-| Foo.qll:4:21:4:25 | ClasslessPredicate dead1 | This code is never used, and it's not publicly exported. |
-| Foo.qll:8:13:8:17 | ClasslessPredicate dead2 | This code is never used, and it's not publicly exported. |
-| Foo.qll:46:16:46:21 | Module Input2 | This code is never used, and it's not publicly exported. |
-| Foo.qll:56:16:56:17 | Module M2 | This code is never used, and it's not publicly exported. |
-| Foo.qll:68:15:68:20 | Class CImpl2 | This code is never used, and it's not publicly exported. |
+| Foo.qll:8:21:8:25 | ClasslessPredicate dead1 | This code is never used, and it's not publicly exported. |
+| Foo.qll:12:13:12:17 | ClasslessPredicate dead2 | This code is never used, and it's not publicly exported. |
+| Foo.qll:50:16:50:21 | Module Input2 | This code is never used, and it's not publicly exported. |
+| Foo.qll:62:16:62:17 | Module M2 | This code is never used, and it's not publicly exported. |
+| Foo.qll:102:15:102:20 | Class CImpl2 | This code is never used, and it's not publicly exported. |
diff --git a/ql/ql/test/queries/style/DeadCode/Foo.qll b/ql/ql/test/queries/style/DeadCode/Foo.qll
index 32fab335b780..4fd72f0a2bdf 100644
--- a/ql/ql/test/queries/style/DeadCode/Foo.qll
+++ b/ql/ql/test/queries/style/DeadCode/Foo.qll
@@ -1,3 +1,7 @@
+overlay[local]
+module;
+
+private import Parameterized as External
 import ql
 
 private module Mixed {
@@ -43,7 +47,9 @@ private module Input1 implements InputSig {
   predicate foo() { any() }
 }
 
-private module Input2 implements InputSig { // $ Alert
+private module Input2 // $ Alert
+  implements InputSig
+{
   predicate foo() { any() }
 }
 
@@ -57,6 +63,34 @@ private module M2 = ParameterizedModule<Input2>; // $ Alert
 
 import ParameterizedModule<Input3>
 
+signature module DefaultInputSig {
+  default predicate callback() { none() }
+}
+
+module UsesDefaultInput<DefaultInputSig Input> {
+  predicate useCallback() { Input::callback() }
+}
+
+private module DefaultInput implements DefaultInputSig {
+  predicate callback() { any() }
+}
+
+module UsedDefaultInput = UsesDefaultInput<DefaultInput>;
+
+predicate usesDefaultInput() { UsedDefaultInput::useCallback() }
+
+module Empty { }
+
+private module OuterInstance = External::Outer<Empty>;
+
+private module NestedInput implements OuterInstance::InputSig {
+  predicate callback() { any() }
+}
+
+private module NestedUse = OuterInstance::Make<NestedInput>;
+
+predicate usesNestedDefaultInput() { NestedUse::useCallback() }
+
 private module MImpl { }
 
 module MPublic = MImpl;
diff --git a/ql/ql/test/queries/style/DeadCode/Parameterized.qll b/ql/ql/test/queries/style/DeadCode/Parameterized.qll
new file mode 100644
index 000000000000..f061d17c6f2b
--- /dev/null
+++ b/ql/ql/test/queries/style/DeadCode/Parameterized.qll
@@ -0,0 +1,11 @@
+signature module EmptySig { }
+
+module Outer<EmptySig E> {
+  signature module InputSig {
+    default predicate callback() { none() }
+  }
+
+  module Make<InputSig Input> {
+    predicate useCallback() { Input::callback() }
+  }
+}
diff --git a/ruby/extractor/Cargo.toml b/ruby/extractor/Cargo.toml
index b6e1ae901198..afdfd9440a14 100644
--- a/ruby/extractor/Cargo.toml
+++ b/ruby/extractor/Cargo.toml
@@ -10,13 +10,13 @@ edition = "2024"
 tree-sitter = ">= 0.23.0"
 tree-sitter-embedded-template = "0.25.0"
 tree-sitter-ruby = "0.23.1"
-clap = { version = "4.5", features = ["derive"] }
+clap = { version = "4.6", features = ["derive"] }
 tracing = "0.1"
-tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
-rayon = "1.11.0"
-regex = "1.11.3"
+tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
+rayon = "1.12.0"
+regex = "1.13.1"
 encoding = "0.2"
-lazy_static = "1.5.0"
-serde_json = "1.0.145"
+lazy_static = "1.5.1"
+serde_json = "1.0.154"
 
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
diff --git a/ruby/extractor/src/extractor.rs b/ruby/extractor/src/extractor.rs
index 3749609e7885..91852a5b0057 100644
--- a/ruby/extractor/src/extractor.rs
+++ b/ruby/extractor/src/extractor.rs
@@ -114,9 +114,8 @@ pub fn run(options: Options) -> std::io::Result<()> {
             let src_archive_file = file_paths::path_for(&src_archive_dir, &path, "", path_transformer.as_ref());
             let mut source = std::fs::read(&path)?;
             let mut needs_conversion = false;
-            let code_ranges;
             let mut trap_writer = trap::Writer::new();
-            if path.extension().is_some_and(|x| x == "erb") {
+            let code_ranges = if path.extension().is_some_and(|x| x == "erb") {
                 tracing::info!("scanning: {}", path.display());
                 extractor::extract(
                     &erb,
@@ -142,7 +141,7 @@ pub fn run(options: Options) -> std::io::Result<()> {
                         source[i] = b'\n';
                     }
                 }
-                code_ranges = ranges;
+                ranges
             } else {
                 if let Some(encoding_name) = scan_coding_comment(&source) {
                     // If the input is already UTF-8 then there is no need to recode the source
@@ -204,8 +203,8 @@ pub fn run(options: Options) -> std::io::Result<()> {
                         }
                     }
                 }
-                code_ranges = vec![];
-            }
+                vec![]
+            };
             extractor::extract(
                 &language,
                 "ruby",
@@ -372,7 +371,7 @@ fn get_overlay_changed_files() -> Option<HashSet<PathBuf>> {
     )
 }
 
-fn scan_coding_comment(content: &[u8]) -> std::option::Option<Cow<str>> {
+fn scan_coding_comment(content: &[u8]) -> std::option::Option<Cow<'_, str>> {
     let mut index = 0;
     // skip UTF-8 BOM marker if there is one
     if content.len() >= 3 && content[0] == 0xef && content[1] == 0xbb && content[2] == 0xbf {
diff --git a/ruby/ql/consistency-queries/CfgConsistency.ql b/ruby/ql/consistency-queries/CfgConsistency.ql
index 5af4f22fc26a..d67d67a8d3fd 100644
--- a/ruby/ql/consistency-queries/CfgConsistency.ql
+++ b/ruby/ql/consistency-queries/CfgConsistency.ql
@@ -1,31 +1,2 @@
-import codeql.ruby.controlflow.internal.ControlFlowGraphImpl::Consistency as Consistency
-import Consistency
-import codeql.ruby.AST
 import codeql.ruby.CFG
-import codeql.ruby.controlflow.internal.Completion
-import codeql.ruby.controlflow.internal.ControlFlowGraphImpl as CfgImpl
-
-/**
- * All `Expr` nodes are `PostOrderTree`s
- */
-query predicate nonPostOrderExpr(Expr e, string cls) {
-  cls = e.getPrimaryQlClasses() and
-  not exists(e.getDesugared()) and
-  not e instanceof BodyStmt and
-  exists(AstNode last, Completion c |
-    CfgImpl::last(e, last, c) and
-    last != e and
-    c instanceof NormalCompletion
-  )
-}
-
-query predicate scopeNoFirst(CfgScope scope) {
-  Consistency::scopeNoFirst(scope) and
-  not scope = any(StmtSequence seq | not exists(seq.getAStmt())) and
-  not scope =
-    any(Callable c |
-      not exists(c.getAParameter()) and
-      not c.getBody().hasEnsure() and
-      not exists(c.getBody().getARescue())
-    )
-}
+import ControlFlow::Consistency
diff --git a/ruby/ql/consistency-queries/DataFlowConsistency.ql b/ruby/ql/consistency-queries/DataFlowConsistency.ql
index 4e0588d5d4a1..de63a4309b5b 100644
--- a/ruby/ql/consistency-queries/DataFlowConsistency.ql
+++ b/ruby/ql/consistency-queries/DataFlowConsistency.ql
@@ -22,17 +22,6 @@ private module Input implements InputSig<Location, RubyDataFlow> {
     not isNonConstantExpr(n.asExpr())
   }
 
-  predicate multipleArgumentCallExclude(ArgumentNode arg, DataFlowCall call) {
-    // An argument such as `x` in `if not x then ...` has two successors (and hence
-    // two calls); one for each Boolean outcome of `x`.
-    exists(CfgNodes::ExprCfgNode n |
-      arg.argumentOf(call, _) and
-      n = call.asCall() and
-      arg.asExpr().getASuccessor(any(ConditionalSuccessor c)).getASuccessor*() = n and
-      n.getASplit() instanceof Split::ConditionalCompletionSplit
-    )
-  }
-
   predicate uniqueTypeExclude(Node n) {
     n =
       any(DataFlow::CallNode call |
diff --git a/ruby/ql/consistency-queries/SsaConsistency.ql b/ruby/ql/consistency-queries/SsaConsistency.ql
index 235eac263442..a0f1cb23cfef 100644
--- a/ruby/ql/consistency-queries/SsaConsistency.ql
+++ b/ruby/ql/consistency-queries/SsaConsistency.ql
@@ -1,3 +1,4 @@
 import codeql.ruby.dataflow.SSA
 import codeql.ruby.dataflow.internal.SsaImpl
 import Consistency
+import DataFlowIntegration::DfConsistency
diff --git a/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index d79eaed159e4..8d8dbd9cdad6 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,3 +1,49 @@
+## 7.1.1
+
+No user-facing changes.
+
+## 7.1.0
+
+### New Features
+
+* Added modeling for `Grape::API`'s `request` sub-accessors (`body.read`, `body.string`, `params`, `GET`, `POST`, `cookies`, `env`, `query_string`, and `path_info`) as remote flow sources.
+
+## 7.0.2
+
+No user-facing changes.
+
+## 7.0.1
+
+No user-facing changes.
+
+## 7.0.0
+
+### Breaking Changes
+
+* The Ruby control flow graph implementation has been completely replaced. This
+  affects a number of queries slightly. The CFG now includes additional nodes
+  to more accurately represent certain constructs. This also means that any
+  existing code that implicitly relies on very specific details about the CFG
+  may need to be updated. The CFG no longer uses splitting, which means that
+  AST nodes now have a unique CFG node representation. In particular,
+  `ControlFlowNode.getAstNode` has changed its meaning. The AST-to-CFG mapping
+  remains one-to-many, but now for a different reason. It used to be because of
+  splitting, but now it's because of additional "helper" CFG nodes. To get the
+  (now canonical) CFG node for a given AST node, use
+  `Stmt.getControlFlowNode()` instead.
+
+## 6.0.4
+
+### Minor Analysis Improvements
+
+* The algorithm for tracking regexes has been replaced. This can cause result changes in related queries, for example, `rb/polynomial-redos`.
+
+## 6.0.3
+
+### Minor Analysis Improvements
+
+* Removed library input to vendored gems from the set of taint sources. This should reduce false positives for `rb/polynomial-redos`, `rb/regex/badly-anchored-regexp`, `rb/unsafe-code-construction`, `rb/html-constructed-from-input`, and `rb/shell-command-constructed-from-input` whenever vendoring is used.
+
 ## 6.0.2
 
 No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md b/ruby/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md
new file mode 100644
index 000000000000..ade6e38949ff
--- /dev/null
+++ b/ruby/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The sensitive data heuristics treat names built on `trusted_schema`, such as SQLite's `set_trusted_schema` setting, as non-sensitive. This removes false positive results from queries that use the sensitive data library (for example `rb/clear-text-logging-sensitive-data`).
diff --git a/ruby/ql/lib/change-notes/released/6.0.3.md b/ruby/ql/lib/change-notes/released/6.0.3.md
new file mode 100644
index 000000000000..81e3925ea383
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/6.0.3.md
@@ -0,0 +1,5 @@
+## 6.0.3
+
+### Minor Analysis Improvements
+
+* Removed library input to vendored gems from the set of taint sources. This should reduce false positives for `rb/polynomial-redos`, `rb/regex/badly-anchored-regexp`, `rb/unsafe-code-construction`, `rb/html-constructed-from-input`, and `rb/shell-command-constructed-from-input` whenever vendoring is used.
diff --git a/ruby/ql/lib/change-notes/released/6.0.4.md b/ruby/ql/lib/change-notes/released/6.0.4.md
new file mode 100644
index 000000000000..abc6e2ae08f1
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/6.0.4.md
@@ -0,0 +1,5 @@
+## 6.0.4
+
+### Minor Analysis Improvements
+
+* The algorithm for tracking regexes has been replaced. This can cause result changes in related queries, for example, `rb/polynomial-redos`.
diff --git a/ruby/ql/lib/change-notes/released/7.0.0.md b/ruby/ql/lib/change-notes/released/7.0.0.md
new file mode 100644
index 000000000000..48882586df42
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/7.0.0.md
@@ -0,0 +1,15 @@
+## 7.0.0
+
+### Breaking Changes
+
+* The Ruby control flow graph implementation has been completely replaced. This
+  affects a number of queries slightly. The CFG now includes additional nodes
+  to more accurately represent certain constructs. This also means that any
+  existing code that implicitly relies on very specific details about the CFG
+  may need to be updated. The CFG no longer uses splitting, which means that
+  AST nodes now have a unique CFG node representation. In particular,
+  `ControlFlowNode.getAstNode` has changed its meaning. The AST-to-CFG mapping
+  remains one-to-many, but now for a different reason. It used to be because of
+  splitting, but now it's because of additional "helper" CFG nodes. To get the
+  (now canonical) CFG node for a given AST node, use
+  `Stmt.getControlFlowNode()` instead.
diff --git a/ruby/ql/lib/change-notes/released/7.0.1.md b/ruby/ql/lib/change-notes/released/7.0.1.md
new file mode 100644
index 000000000000..b5ef70820b26
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/7.0.1.md
@@ -0,0 +1,3 @@
+## 7.0.1
+
+No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/released/7.0.2.md b/ruby/ql/lib/change-notes/released/7.0.2.md
new file mode 100644
index 000000000000..a96d9147b86a
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/7.0.2.md
@@ -0,0 +1,3 @@
+## 7.0.2
+
+No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/released/7.1.0.md b/ruby/ql/lib/change-notes/released/7.1.0.md
new file mode 100644
index 000000000000..b46563bc0d8b
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/7.1.0.md
@@ -0,0 +1,5 @@
+## 7.1.0
+
+### New Features
+
+* Added modeling for `Grape::API`'s `request` sub-accessors (`body.read`, `body.string`, `params`, `GET`, `POST`, `cookies`, `env`, `query_string`, and `path_info`) as remote flow sources.
diff --git a/ruby/ql/lib/change-notes/released/7.1.1.md b/ruby/ql/lib/change-notes/released/7.1.1.md
new file mode 100644
index 000000000000..849fd4da3283
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/7.1.1.md
@@ -0,0 +1,3 @@
+## 7.1.1
+
+No user-facing changes.
diff --git a/ruby/ql/lib/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
index 70437ec53b89..8e970df6cae3 100644
--- a/ruby/ql/lib/codeql-pack.release.yml
+++ b/ruby/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 6.0.2
+lastReleaseVersion: 7.1.1
diff --git a/ruby/ql/lib/codeql/ruby/CFG.qll b/ruby/ql/lib/codeql/ruby/CFG.qll
index d3401821f199..5fe7da86df05 100644
--- a/ruby/ql/lib/codeql/ruby/CFG.qll
+++ b/ruby/ql/lib/codeql/ruby/CFG.qll
@@ -3,4 +3,3 @@
 import codeql.Locations
 import controlflow.ControlFlowGraph
 import controlflow.CfgNodes as CfgNodes
-import controlflow.BasicBlocks
diff --git a/ruby/ql/lib/codeql/ruby/ast/Call.qll b/ruby/ql/lib/codeql/ruby/ast/Call.qll
index 10b23b22d55c..1a3b9c757c61 100644
--- a/ruby/ql/lib/codeql/ruby/ast/Call.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/Call.qll
@@ -63,7 +63,7 @@ class Call extends Expr instanceof CallImpl {
       TCfgScope(result) = viableCallableLambda(c, _)
     )
     or
-    result = getTarget(TNormalCall(this.getAControlFlowNode()))
+    result = getTarget(TNormalCall(this.getControlFlowNode()))
   }
 
   override AstNode getAChild(string pred) {
diff --git a/ruby/ql/lib/codeql/ruby/ast/Statement.qll b/ruby/ql/lib/codeql/ruby/ast/Statement.qll
index dcd51dbb3272..4174f45d1282 100644
--- a/ruby/ql/lib/codeql/ruby/ast/Statement.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/Statement.qll
@@ -6,7 +6,6 @@ private import codeql.ruby.CFG
 private import internal.AST
 private import internal.TreeSitter
 private import internal.Variable
-private import codeql.ruby.controlflow.internal.ControlFlowGraphImpl as CfgImpl
 
 /**
  * A statement.
@@ -14,14 +13,18 @@ private import codeql.ruby.controlflow.internal.ControlFlowGraphImpl as CfgImpl
  * This is the root QL class for all statements.
  */
 class Stmt extends AstNode, TStmt {
-  /** Gets a control-flow node for this statement, if any. */
-  CfgNodes::AstCfgNode getAControlFlowNode() { result.getAstNode() = this }
+  /** Gets the control-flow node for this statement, if any. */
+  ControlFlowNode getControlFlowNode() { result.injects(this) }
 
-  /** Gets a control-flow entry node for this statement, if any */
-  AstNode getAControlFlowEntryNode() { result = CfgImpl::getAControlFlowEntryNode(this) }
+  /**
+   * DEPRECATED: Use `getControlFlowNode()` instead.
+   *
+   * Gets a control-flow node for this statement, if any.
+   */
+  deprecated CfgNodes::AstCfgNode getAControlFlowNode() { result.getAstNode() = this }
 
   /** Gets the control-flow scope of this statement, if any. */
-  CfgScope getCfgScope() { result = CfgImpl::getCfgScope(this) }
+  CfgScope getCfgScope() { result = getEnclosingCallable(this) }
 
   /** Gets the enclosing callable, if any. */
   Callable getEnclosingCallable() { result = this.getCfgScope() }
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Constant.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Constant.qll
index 6fdcdc894182..7c935391ace2 100644
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Constant.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Constant.qll
@@ -95,7 +95,7 @@ private module Propagation {
     or
     isIntExpr(e.(ConstantReadAccess).getValue(), i)
     or
-    forex(ExprCfgNode n | n = e.getAControlFlowNode() | isInt(n, i))
+    isInt(e.getControlFlowNode(), i)
   }
 
   predicate isFloat(ExprCfgNode e, float f) {
@@ -153,7 +153,7 @@ private module Propagation {
     or
     isFloatExpr(e.(ConstantReadAccess).getValue(), f)
     or
-    forex(ExprCfgNode n | n = e.getAControlFlowNode() | isFloat(n, f))
+    isFloat(e.getControlFlowNode(), f)
   }
 
   predicate isRational(ExprCfgNode e, int numerator, int denominator) {
@@ -175,7 +175,7 @@ private module Propagation {
     or
     isRationalExpr(e.(ConstantReadAccess).getValue(), numerator, denominator)
     or
-    forex(ExprCfgNode n | n = e.getAControlFlowNode() | isRational(n, numerator, denominator))
+    isRational(e.getControlFlowNode(), numerator, denominator)
   }
 
   predicate isComplex(ExprCfgNode e, float real, float imaginary) {
@@ -197,7 +197,7 @@ private module Propagation {
     or
     isComplexExpr(e.(ConstantReadAccess).getValue(), real, imaginary)
     or
-    forex(ExprCfgNode n | n = e.getAControlFlowNode() | isComplex(n, real, imaginary))
+    isComplex(e.getControlFlowNode(), real, imaginary)
   }
 
   overlay[local]
@@ -309,7 +309,7 @@ private module Propagation {
     or
     isStringExpr(e.(ConstantReadAccess).getValue(), s)
     or
-    forex(ExprCfgNode n | n = e.getAControlFlowNode() | isString(n, s))
+    isString(e.getControlFlowNode(), s)
   }
 
   predicate isSymbol(ExprCfgNode e, string s) {
@@ -334,7 +334,7 @@ private module Propagation {
     or
     isSymbolExpr(e.(ConstantReadAccess).getValue(), s)
     or
-    forex(ExprCfgNode n | n = e.getAControlFlowNode() | isSymbol(n, s))
+    isSymbol(e.getControlFlowNode(), s)
   }
 
   predicate isRegExp(ExprCfgNode e, string s, string flags) {
@@ -359,7 +359,7 @@ private module Propagation {
     or
     isRegExpExpr(e.(ConstantReadAccess).getValue(), s, flags)
     or
-    forex(ExprCfgNode n | n = e.getAControlFlowNode() | isRegExp(n, s, flags))
+    isRegExp(e.getControlFlowNode(), s, flags)
   }
 
   predicate isBoolean(ExprCfgNode e, boolean b) {
@@ -381,7 +381,7 @@ private module Propagation {
     or
     isBooleanExpr(e.(ConstantReadAccess).getValue(), b)
     or
-    forex(ExprCfgNode n | n = e.getAControlFlowNode() | isBoolean(n, b))
+    isBoolean(e.getControlFlowNode(), b)
   }
 
   predicate isNil(ExprCfgNode e) {
@@ -403,7 +403,7 @@ private module Propagation {
     or
     isNilExpr(e.(ConstantReadAccess).getValue())
     or
-    forex(ExprCfgNode n | n = e.getAControlFlowNode() | isNil(n))
+    isNil(e.getControlFlowNode())
   }
 }
 
@@ -566,7 +566,7 @@ private predicate isArrayExpr(Expr e, ArrayLiteralCfgNode arr) {
   // control flow paths.
   // Note(hmac): I don't think this is necessary, as `getSource` will not return
   // results if the source is a phi node.
-  forex(ExprCfgNode n | n = e.getAControlFlowNode() | isArrayConstant(n, arr))
+  isArrayConstant(e.getControlFlowNode(), arr)
   or
   // if `e` is an array, then `e.freeze` is also an array
   e.(MethodCall).getMethodName() = "freeze" and
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Synthesis.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Synthesis.qll
index f05deae59623..0b45d26ef12a 100644
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Synthesis.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Synthesis.qll
@@ -833,6 +833,10 @@ private module AssignOperationDesugar {
         )
       )
     }
+
+    final override predicate excludeFromControlFlowTree(AstNode n) {
+      n = any(ScopeResolutionAssignOperation sao).getLeftOperand()
+    }
   }
 
   /** An assignment operation where the left-hand side is a method call. */
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll b/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll
deleted file mode 100644
index e085dbd90a38..000000000000
--- a/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll
+++ /dev/null
@@ -1,314 +0,0 @@
-/** Provides classes representing basic blocks. */
-overlay[local]
-module;
-
-private import codeql.ruby.AST
-private import codeql.ruby.ast.internal.AST
-private import codeql.ruby.ast.internal.TreeSitter
-private import codeql.ruby.controlflow.ControlFlowGraph
-private import internal.ControlFlowGraphImpl as CfgImpl
-private import CfgNodes
-private import CfgImpl::BasicBlocks as BasicBlocksImpl
-private import codeql.controlflow.BasicBlock as BB
-
-/**
- * A basic block, that is, a maximal straight-line sequence of control flow nodes
- * without branches or joins.
- */
-final class BasicBlock extends BasicBlocksImpl::BasicBlock {
-  /** Gets an immediate successor of this basic block, if any. */
-  BasicBlock getASuccessor() { result = super.getASuccessor() }
-
-  /** Gets an immediate successor of this basic block of a given type, if any. */
-  BasicBlock getASuccessor(SuccessorType t) { result = super.getASuccessor(t) }
-
-  /** Gets an immediate predecessor of this basic block, if any. */
-  BasicBlock getAPredecessor() { result = super.getAPredecessor() }
-
-  /** Gets an immediate predecessor of this basic block of a given type, if any. */
-  BasicBlock getAPredecessor(SuccessorType t) { result = super.getAPredecessor(t) }
-
-  // The overrides below are to use `CfgNode` instead of `CfgImpl::Node`
-  CfgNode getNode(int pos) { result = super.getNode(pos) }
-
-  CfgNode getANode() { result = super.getANode() }
-
-  /** Gets the first control flow node in this basic block. */
-  CfgNode getFirstNode() { result = super.getFirstNode() }
-
-  /** Gets the last control flow node in this basic block. */
-  CfgNode getLastNode() { result = super.getLastNode() }
-
-  /**
-   * Holds if this basic block immediately dominates basic block `bb`.
-   *
-   * That is, this basic block is the unique basic block satisfying:
-   * 1. This basic block strictly dominates `bb`
-   * 2. There exists no other basic block that is strictly dominated by this
-   *    basic block and which strictly dominates `bb`.
-   *
-   * All basic blocks, except entry basic blocks, have a unique immediate
-   * dominator.
-   *
-   * Example:
-   *
-   * ```rb
-   * def m b
-   *   if b
-   *     return 0
-   *   end
-   *   return 1
-   * end
-   * ```
-   *
-   * The basic block starting on line 2 immediately dominates the
-   * basic block on line 5 (all paths from the entry point of `m`
-   * to `return 1` must go through the `if` block).
-   */
-  predicate immediatelyDominates(BasicBlock bb) { super.immediatelyDominates(bb) }
-
-  /**
-   * Holds if this basic block strictly dominates basic block `bb`.
-   *
-   * That is, all paths reaching basic block `bb` from some entry point
-   * basic block must go through this basic block (which must be different
-   * from `bb`).
-   *
-   * Example:
-   *
-   * ```rb
-   * def m b
-   *   if b
-   *     return 0
-   *   end
-   *   return 1
-   * end
-   * ```
-   *
-   * The basic block starting on line 2 strictly dominates the
-   * basic block on line 5 (all paths from the entry point of `m`
-   * to `return 1` must go through the `if` block).
-   */
-  predicate strictlyDominates(BasicBlock bb) { super.strictlyDominates(bb) }
-
-  /**
-   * Holds if this basic block dominates basic block `bb`.
-   *
-   * That is, all paths reaching basic block `bb` from some entry point
-   * basic block must go through this basic block.
-   *
-   * Example:
-   *
-   * ```rb
-   * def m b
-   *   if b
-   *     return 0
-   *   end
-   *   return 1
-   * end
-   * ```
-   *
-   * The basic block starting on line 2 dominates the basic
-   * basic block on line 5 (all paths from the entry point of `m`
-   * to `return 1` must go through the `if` block).
-   */
-  predicate dominates(BasicBlock bb) { super.dominates(bb) }
-
-  /**
-   * Holds if `df` is in the dominance frontier of this basic block.
-   * That is, this basic block dominates a predecessor of `df`, but
-   * does not dominate `df` itself.
-   *
-   * Example:
-   *
-   * ```rb
-   * def m x
-   *   if x < 0
-   *     x = -x
-   *     if x > 10
-   *       x = x - 1
-   *     end
-   *   end
-   *   puts x
-   * end
-   * ```
-   *
-   * The basic block on line 8 is in the dominance frontier
-   * of the basic block starting on line 3 because that block
-   * dominates the basic block on line 4, which is a predecessor of
-   * `puts x`. Also, the basic block starting on line 3 does not
-   * dominate the basic block on line 8.
-   */
-  predicate inDominanceFrontier(BasicBlock df) { super.inDominanceFrontier(df) }
-
-  /**
-   * Gets the basic block that immediately dominates this basic block, if any.
-   *
-   * That is, the result is the unique basic block satisfying:
-   * 1. The result strictly dominates this basic block.
-   * 2. There exists no other basic block that is strictly dominated by the
-   *    result and which strictly dominates this basic block.
-   *
-   * All basic blocks, except entry basic blocks, have a unique immediate
-   * dominator.
-   *
-   * Example:
-   *
-   * ```rb
-   * def m b
-   *   if b
-   *     return 0
-   *   end
-   *   return 1
-   * end
-   * ```
-   *
-   * The basic block starting on line 2 is an immediate dominator of
-   * the basic block on line 5 (all paths from the entry point of `m`
-   * to `return 1` must go through the `if` block, and the `if` block
-   * is an immediate predecessor of `return 1`).
-   */
-  BasicBlock getImmediateDominator() { result = super.getImmediateDominator() }
-
-  /**
-   * Holds if the edge with successor type `s` out of this basic block is a
-   * dominating edge for `dominated`.
-   *
-   * That is, all paths reaching `dominated` from the entry point basic
-   * block must go through the `s` edge out of this basic block.
-   *
-   * Edge dominance is similar to node dominance except it concerns edges
-   * instead of nodes: A basic block is dominated by a _basic block_ `bb` if it
-   * can only be reached through `bb` and dominated by an _edge_ `e` if it can
-   * only be reached through `e`.
-   *
-   * Note that where all basic blocks (except the entry basic block) are
-   * strictly dominated by at least one basic block, a basic block may not be
-   * dominated by any edge. If an edge dominates a basic block `bb`, then
-   * both endpoints of the edge dominates `bb`. The converse is not the case,
-   * as there may be multiple paths between the endpoints with none of them
-   * dominating.
-   */
-  predicate edgeDominates(BasicBlock dominated, SuccessorType s) {
-    super.edgeDominates(dominated, s)
-  }
-
-  /**
-   * Holds if this basic block strictly post-dominates basic block `bb`.
-   *
-   * That is, all paths reaching a normal exit point basic block from basic
-   * block `bb` must go through this basic block (which must be different
-   * from `bb`).
-   *
-   * Example:
-   *
-   * ```rb
-   * def m b
-   *   if b
-   *     puts "b"
-   *   end
-   *   puts "m"
-   * end
-   * ```
-   *
-   * The basic block on line 5 strictly post-dominates the basic block on
-   * line 3 (all paths to the exit point of `m` from `puts "b"` must go
-   * through `puts "m"`).
-   */
-  predicate strictlyPostDominates(BasicBlock bb) { super.strictlyPostDominates(bb) }
-
-  /**
-   * Holds if this basic block post-dominates basic block `bb`.
-   *
-   * That is, all paths reaching a normal exit point basic block from basic
-   * block `bb` must go through this basic block.
-   *
-   * Example:
-   *
-   * ```rb
-   * def m b
-   *   if b
-   *     puts "b"
-   *   end
-   *   puts "m"
-   * end
-   * ```
-   *
-   * The basic block on line 5 post-dominates the basic block on line 3
-   * (all paths to the exit point of `m` from `puts "b"` must go through
-   * `puts "m"`).
-   */
-  predicate postDominates(BasicBlock bb) { super.postDominates(bb) }
-}
-
-/**
- * An entry basic block, that is, a basic block whose first node is
- * an entry node.
- */
-final class EntryBasicBlock extends BasicBlock, BasicBlocksImpl::EntryBasicBlock { }
-
-/**
- * An annotated exit basic block, that is, a basic block that contains an
- * annotated exit node.
- */
-final class AnnotatedExitBasicBlock extends BasicBlock, BasicBlocksImpl::AnnotatedExitBasicBlock { }
-
-/**
- * An exit basic block, that is, a basic block whose last node is
- * an exit node.
- */
-final class ExitBasicBlock extends BasicBlock, BasicBlocksImpl::ExitBasicBlock { }
-
-/** A basic block with more than one predecessor. */
-final class JoinBlock extends BasicBlock, BasicBlocksImpl::JoinBasicBlock {
-  JoinBlockPredecessor getJoinBlockPredecessor(int i) { result = super.getJoinBlockPredecessor(i) }
-}
-
-/** A basic block that is an immediate predecessor of a join block. */
-final class JoinBlockPredecessor extends BasicBlock, BasicBlocksImpl::JoinPredecessorBasicBlock { }
-
-/**
- * A basic block that terminates in a condition, splitting the subsequent
- * control flow.
- */
-final class ConditionBlock extends BasicBlock, BasicBlocksImpl::ConditionBasicBlock {
-  /**
-   * DEPRECATED: Use `edgeDominates` instead.
-   *
-   * Holds if basic block `succ` is immediately controlled by this basic
-   * block with conditional value `s`. That is, `succ` is an immediate
-   * successor of this block, and `succ` can only be reached from
-   * the callable entry point by going via the `s` edge out of this basic block.
-   */
-  deprecated predicate immediatelyControls(BasicBlock succ, ConditionalSuccessor s) {
-    this.getASuccessor(s) = succ and
-    BasicBlocksImpl::dominatingEdge(this, succ)
-  }
-
-  /**
-   * DEPRECATED: Use `edgeDominates` instead.
-   *
-   * Holds if basic block `controlled` is controlled by this basic block with
-   * conditional value `s`. That is, `controlled` can only be reached from the
-   * callable entry point by going via the `s` edge out of this basic block.
-   */
-  deprecated predicate controls(BasicBlock controlled, ConditionalSuccessor s) {
-    super.edgeDominates(controlled, s)
-  }
-}
-
-private class BasicBlockAlias = BasicBlock;
-
-private class EntryBasicBlockAlias = EntryBasicBlock;
-
-module Cfg implements BB::CfgSig<Location> {
-  class ControlFlowNode = CfgNode;
-
-  class BasicBlock = BasicBlockAlias;
-
-  class EntryBasicBlock = EntryBasicBlockAlias;
-
-  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
-    BasicBlocksImpl::dominatingEdge(bb1, bb2)
-  }
-}
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/CfgNodes.qll b/ruby/ql/lib/codeql/ruby/controlflow/CfgNodes.qll
index 0da31370ff01..8439c1a22621 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/CfgNodes.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/CfgNodes.qll
@@ -3,30 +3,9 @@ overlay[local]
 module;
 
 private import codeql.ruby.AST
-private import codeql.ruby.controlflow.BasicBlocks
 private import codeql.ruby.dataflow.SSA
 private import codeql.ruby.ast.internal.Constant
 private import ControlFlowGraph
-private import internal.ControlFlowGraphImpl as CfgImpl
-
-/** An entry node for a given scope. */
-class EntryNode extends CfgNode, CfgImpl::EntryNode {
-  override string getAPrimaryQlClass() { result = "EntryNode" }
-
-  final override EntryBasicBlock getBasicBlock() { result = super.getBasicBlock() }
-}
-
-/** An exit node for a given scope, annotated with the type of exit. */
-class AnnotatedExitNode extends CfgNode, CfgImpl::AnnotatedExitNode {
-  override string getAPrimaryQlClass() { result = "AnnotatedExitNode" }
-
-  final override AnnotatedExitBasicBlock getBasicBlock() { result = super.getBasicBlock() }
-}
-
-/** An exit node for a given scope. */
-class ExitNode extends CfgNode, CfgImpl::ExitNode {
-  override string getAPrimaryQlClass() { result = "ExitNode" }
-}
 
 /**
  * A node for an AST node.
@@ -35,7 +14,11 @@ class ExitNode extends CfgNode, CfgImpl::ExitNode {
  * (dead) code or not important for control flow, and multiple when there are different
  * splits for the AST node.
  */
-class AstCfgNode extends CfgNode, CfgImpl::AstCfgNode {
+class AstCfgNode extends CfgNode {
+  AstCfgNode() { this.injects(_) }
+
+  AstNode getAstNode() { this.injects(result) }
+
   /** Gets the name of the primary QL class for this node. */
   overlay[global]
   override string getAPrimaryQlClass() { result = "AstCfgNode" }
@@ -67,10 +50,7 @@ class ReturningCfgNode extends AstCfgNode {
   ReturningCfgNode() { s = this.getAstNode() }
 
   /** Gets the node of the returned value, if any. */
-  ExprCfgNode getReturnedValueNode() {
-    result = this.getAPredecessor() and
-    result.getAstNode() = s.getValue()
-  }
+  ExprCfgNode getReturnedValueNode() { result.getAstNode() = s.getValue() }
 }
 
 /** A control-flow node that wraps a `StringComponent` AST expression. */
@@ -100,108 +80,31 @@ private AstNode desugar(AstNode n) {
   result = n
 }
 
-/**
- * A class for mapping parent-child AST nodes to parent-child CFG nodes.
- */
-abstract private class ChildMapping extends AstNode {
-  /**
-   * Holds if `child` is a (possibly nested) child of this expression
-   * for which we would like to find a matching CFG child.
-   */
-  abstract predicate relevantChild(AstNode child);
-
-  pragma[nomagic]
-  abstract predicate reachesBasicBlock(AstNode child, CfgNode cfn, BasicBlock bb);
-
-  /**
-   * Holds if there is a control-flow path from `cfn` to `cfnChild`, where `cfn`
-   * is a control-flow node for this expression, and `cfnChild` is a control-flow
-   * node for `child`.
-   *
-   * The path never escapes the syntactic scope of this expression.
-   */
-  cached
-  predicate hasCfgChild(AstNode child, CfgNode cfn, CfgNode cfnChild) {
-    this.reachesBasicBlock(child, cfn, cfnChild.getBasicBlock()) and
-    cfnChild.getAstNode() = desugar(child)
-  }
-}
-
-/**
- * A class for mapping parent-child AST nodes to parent-child CFG nodes.
- */
-abstract private class ExprChildMapping extends Expr, ChildMapping {
-  pragma[nomagic]
-  override predicate reachesBasicBlock(AstNode child, CfgNode cfn, BasicBlock bb) {
-    this.relevantChild(child) and
-    cfn = this.getAControlFlowNode() and
-    bb.getANode() = cfn
-    or
-    exists(BasicBlock mid |
-      this.reachesBasicBlock(child, cfn, mid) and
-      bb = mid.getAPredecessor() and
-      not mid.getANode().getAstNode() = child
-    )
-  }
-}
-
-/**
- * A class for mapping parent-child AST nodes to parent-child CFG nodes.
- */
-abstract private class NonExprChildMapping extends ChildMapping {
-  NonExprChildMapping() { not this instanceof Expr }
-
-  pragma[nomagic]
-  override predicate reachesBasicBlock(AstNode child, CfgNode cfn, BasicBlock bb) {
-    this.relevantChild(child) and
-    cfn.getAstNode() = this and
-    bb.getANode() = cfn
-    or
-    exists(BasicBlock mid |
-      this.reachesBasicBlock(child, cfn, mid) and
-      bb = mid.getASuccessor() and
-      not mid.getANode().getAstNode() = child
-    )
-  }
-}
-
 /** Provides classes for control-flow nodes that wrap AST expressions. */
 module ExprNodes {
-  private class LiteralChildMapping extends ExprChildMapping, Literal {
-    override predicate relevantChild(AstNode n) { none() }
-  }
-
   /** A control-flow node that wraps a `Literal` AST expression. */
   class LiteralCfgNode extends ExprCfgNode {
     override string getAPrimaryQlClass() { result = "LiteralCfgNode" }
 
-    override LiteralChildMapping e;
+    override Literal e;
 
     override Literal getExpr() { result = super.getExpr() }
   }
 
-  private class ControlExprChildMapping extends ExprChildMapping, ControlExpr {
-    override predicate relevantChild(AstNode n) { none() }
-  }
-
   /** A control-flow node that wraps a `ControlExpr` AST expression. */
   class ControlExprCfgNode extends ExprCfgNode {
     override string getAPrimaryQlClass() { result = "ControlExprCfgNode" }
 
-    override ControlExprChildMapping e;
+    override ControlExpr e;
 
     override ControlExpr getExpr() { result = super.getExpr() }
   }
 
-  private class LhsExprChildMapping extends ExprChildMapping, LhsExpr {
-    override predicate relevantChild(AstNode n) { none() }
-  }
-
   /** A control-flow node that wraps a `LhsExpr` AST expression. */
   class LhsExprCfgNode extends ExprCfgNode {
     override string getAPrimaryQlClass() { result = "LhsExprCfgNode" }
 
-    override LhsExprChildMapping e;
+    override LhsExpr e;
 
     override LhsExpr getExpr() { result = super.getExpr() }
 
@@ -209,34 +112,26 @@ module ExprNodes {
     Variable getVariable() { result = e.(VariableAccess).getVariable() }
   }
 
-  private class AssignExprChildMapping extends ExprChildMapping, AssignExpr {
-    override predicate relevantChild(AstNode n) { n = this.getAnOperand() }
-  }
-
   /** A control-flow node that wraps an `AssignExpr` AST expression. */
   class AssignExprCfgNode extends ExprCfgNode {
     override string getAPrimaryQlClass() { result = "AssignExprCfgNode" }
 
-    override AssignExprChildMapping e;
+    override AssignExpr e;
 
     final override AssignExpr getExpr() { result = super.getExpr() }
 
     /** Gets the LHS of this assignment. */
-    final LhsExprCfgNode getLhs() { e.hasCfgChild(e.getLeftOperand(), this, result) }
+    final LhsExprCfgNode getLhs() { result.injects(desugar(e.getLeftOperand())) }
 
     /** Gets the RHS of this assignment. */
-    final ExprCfgNode getRhs() { e.hasCfgChild(e.getRightOperand(), this, result) }
-  }
-
-  private class OperationExprChildMapping extends ExprChildMapping, Operation {
-    override predicate relevantChild(AstNode n) { n = this.getAnOperand() }
+    final ExprCfgNode getRhs() { result.injects(desugar(e.getRightOperand())) }
   }
 
   /** A control-flow node that wraps an `Operation` AST expression. */
   class OperationCfgNode extends ExprCfgNode {
     override string getAPrimaryQlClass() { result = "OperationCfgNode" }
 
-    override OperationExprChildMapping e;
+    override Operation e;
 
     override Operation getExpr() { result = super.getExpr() }
 
@@ -244,7 +139,7 @@ module ExprNodes {
     string getOperator() { result = this.getExpr().getOperator() }
 
     /** Gets an operand of this operation. */
-    final ExprCfgNode getAnOperand() { e.hasCfgChild(e.getAnOperand(), this, result) }
+    final ExprCfgNode getAnOperand() { result.injects(desugar(e.getAnOperand())) }
   }
 
   /** A control-flow node that wraps a `UnaryOperation` AST expression. */
@@ -258,7 +153,7 @@ module ExprNodes {
     override UnaryOperation getExpr() { result = super.getExpr() }
 
     /** Gets the operand of this unary operation. */
-    final ExprCfgNode getOperand() { e.hasCfgChild(uo.getOperand(), this, result) }
+    final ExprCfgNode getOperand() { result.injects(desugar(uo.getOperand())) }
   }
 
   /** A control-flow node that wraps a `BinaryOperation` AST expression. */
@@ -272,32 +167,22 @@ module ExprNodes {
     override BinaryOperation getExpr() { result = super.getExpr() }
 
     /** Gets the left operand of this binary operation. */
-    final ExprCfgNode getLeftOperand() { e.hasCfgChild(bo.getLeftOperand(), this, result) }
+    final ExprCfgNode getLeftOperand() { result.injects(desugar(bo.getLeftOperand())) }
 
     /** Gets the right operand of this binary operation. */
-    final ExprCfgNode getRightOperand() { e.hasCfgChild(bo.getRightOperand(), this, result) }
-  }
-
-  private class BlockArgumentChildMapping extends ExprChildMapping, BlockArgument {
-    override predicate relevantChild(AstNode n) { n = this.getValue() }
+    final ExprCfgNode getRightOperand() { result.injects(desugar(bo.getRightOperand())) }
   }
 
   /** A control-flow node that wraps a `BlockArgument` AST expression. */
   class BlockArgumentCfgNode extends ExprCfgNode {
     override string getAPrimaryQlClass() { result = "BlockArgumentCfgNode" }
 
-    override BlockArgumentChildMapping e;
+    override BlockArgument e;
 
     final override BlockArgument getExpr() { result = super.getExpr() }
 
     /** Gets the value of this block argument. */
-    final ExprCfgNode getValue() { e.hasCfgChild(e.getValue(), this, result) }
-  }
-
-  private class CallExprChildMapping extends ExprChildMapping, Call {
-    override predicate relevantChild(AstNode n) {
-      n = [this.getAnArgument(), this.(MethodCall).getReceiver(), this.(MethodCall).getBlock()]
-    }
+    final ExprCfgNode getValue() { result.injects(desugar(e.getValue())) }
   }
 
   /** A control-flow node that wraps a `Call` AST expression. */
@@ -305,12 +190,12 @@ module ExprNodes {
     overlay[global]
     override string getAPrimaryQlClass() { result = "CallCfgNode" }
 
-    override CallExprChildMapping e;
+    override Call e;
 
     override Call getExpr() { result = super.getExpr() }
 
     /** Gets the `n`th argument of this call. */
-    final ExprCfgNode getArgument(int n) { e.hasCfgChild(e.getArgument(n), this, result) }
+    final ExprCfgNode getArgument(int n) { result.injects(desugar(e.getArgument(n))) }
 
     /** Gets an argument of this call. */
     final ExprCfgNode getAnArgument() { result = this.getArgument(_) }
@@ -319,7 +204,7 @@ module ExprNodes {
     overlay[global]
     final ExprCfgNode getKeywordArgument(string keyword) {
       exists(PairCfgNode n |
-        e.hasCfgChild(e.getAnArgument(), this, n) and
+        n.injects(desugar(e.getAnArgument())) and
         n.getKey().getExpr().getConstantValue().isSymbol(keyword) and
         result = n.getValue()
       )
@@ -337,10 +222,10 @@ module ExprNodes {
     final int getNumberOfArguments() { result = e.getNumberOfArguments() }
 
     /** Gets the receiver of this call. */
-    final ExprCfgNode getReceiver() { e.hasCfgChild(e.(MethodCall).getReceiver(), this, result) }
+    final ExprCfgNode getReceiver() { result.injects(desugar(e.(MethodCall).getReceiver())) }
 
     /** Gets the block of this call. */
-    final ExprCfgNode getBlock() { e.hasCfgChild(e.(MethodCall).getBlock(), this, result) }
+    final ExprCfgNode getBlock() { result.injects(desugar(e.(MethodCall).getBlock())) }
   }
 
   /** A control-flow node that wraps a `MethodCall` AST expression. */
@@ -356,104 +241,54 @@ module ExprNodes {
     string getMethodName() { result = this.getExpr().getMethodName() }
   }
 
-  private class CaseExprChildMapping extends ExprChildMapping, CaseExpr {
-    override predicate relevantChild(AstNode e) { e = this.getValue() or e = this.getABranch() }
-  }
-
   /** A control-flow node that wraps a `CaseExpr` AST expression. */
   class CaseExprCfgNode extends ExprCfgNode {
     override string getAPrimaryQlClass() { result = "CaseExprCfgNode" }
 
-    override CaseExprChildMapping e;
+    override CaseExpr e;
 
     final override CaseExpr getExpr() { result = super.getExpr() }
 
     /** Gets the expression being compared, if any. */
-    final ExprCfgNode getValue() { e.hasCfgChild(e.getValue(), this, result) }
+    final ExprCfgNode getValue() { result.injects(desugar(e.getValue())) }
 
     /**
      * Gets the `n`th branch of this case expression, either a `when` clause, an `in` clause, or an `else` branch.
      */
-    final AstCfgNode getBranch(int n) { e.hasCfgChild(e.getBranch(n), this, result) }
-  }
-
-  private class InClauseChildMapping extends NonExprChildMapping, InClause {
-    override predicate relevantChild(AstNode e) {
-      e = this.getPattern() or
-      e = this.getCondition() or
-      e = this.getBody()
-    }
+    final AstCfgNode getBranch(int n) { result.injects(desugar(e.getBranch(n))) }
   }
 
   /** A control-flow node that wraps an `InClause` AST expression. */
   class InClauseCfgNode extends AstCfgNode {
-    private InClauseChildMapping e;
+    private InClause e;
 
     InClauseCfgNode() { e = this.getAstNode() }
 
     override string getAPrimaryQlClass() { result = "InClauseCfgNode" }
 
     /** Gets the pattern in this `in`-clause. */
-    final AstCfgNode getPattern() { e.hasCfgChild(e.getPattern(), this, result) }
+    final AstCfgNode getPattern() { result.injects(desugar(e.getPattern())) }
 
     /** Gets the pattern guard condition in this `in` clause, if any. */
-    final ExprCfgNode getCondition() { e.hasCfgChild(e.getCondition(), this, result) }
+    final ExprCfgNode getCondition() { result.injects(desugar(e.getCondition())) }
 
     /** Gets the body of this `in`-clause. */
-    final ExprCfgNode getBody() { e.hasCfgChild(e.getBody(), this, result) }
-  }
-
-  // `when` clauses need special treatment, since they are neither pre-order
-  // nor post-order
-  private class WhenClauseChildMapping extends WhenClause {
-    predicate patternReachesBasicBlock(int i, CfgNode cfnPattern, BasicBlock bb) {
-      exists(Expr pattern |
-        pattern = this.getPattern(i) and
-        cfnPattern.getAstNode() = pattern and
-        bb.getANode() = cfnPattern
-      )
-      or
-      exists(BasicBlock mid |
-        this.patternReachesBasicBlock(i, cfnPattern, mid) and
-        bb = mid.getASuccessor() and
-        not mid.getANode().getAstNode() = this
-      )
-    }
-
-    predicate bodyReachesBasicBlock(CfgNode cfnBody, BasicBlock bb) {
-      exists(Stmt body |
-        body = this.getBody() and
-        cfnBody.getAstNode() = body and
-        bb.getANode() = cfnBody
-      )
-      or
-      exists(BasicBlock mid |
-        this.bodyReachesBasicBlock(cfnBody, mid) and
-        bb = mid.getAPredecessor() and
-        not mid.getANode().getAstNode() = this
-      )
-    }
+    final ExprCfgNode getBody() { result.injects(desugar(e.getBody())) }
   }
 
   /** A control-flow node that wraps a `WhenClause` AST expression. */
   class WhenClauseCfgNode extends AstCfgNode {
-    private WhenClauseChildMapping e;
+    private WhenClause e;
 
     WhenClauseCfgNode() { e = this.getAstNode() }
 
     override string getAPrimaryQlClass() { result = "WhenClauseCfgNode" }
 
     /** Gets the body of this `when`-clause. */
-    final ExprCfgNode getBody() {
-      result.getAstNode() = desugar(e.getBody()) and
-      e.bodyReachesBasicBlock(result, this.getBasicBlock())
-    }
+    final ExprCfgNode getBody() { result.getAstNode() = desugar(e.getBody()) }
 
     /** Gets the `i`th pattern this `when`-clause. */
-    final ExprCfgNode getPattern(int i) {
-      result.getAstNode() = desugar(e.getPattern(i)) and
-      e.patternReachesBasicBlock(i, result, this.getBasicBlock())
-    }
+    final ExprCfgNode getPattern(int i) { result.getAstNode() = desugar(e.getPattern(i)) }
   }
 
   /** A control-flow node that wraps a `CasePattern`. */
@@ -465,41 +300,25 @@ module ExprNodes {
     override string getAPrimaryQlClass() { result = "CasePatternCfgNode" }
   }
 
-  private class ArrayPatternChildMapping extends NonExprChildMapping, ArrayPattern {
-    override predicate relevantChild(AstNode e) {
-      e = this.getPrefixElement(_) or
-      e = this.getSuffixElement(_) or
-      e = this.getRestVariableAccess()
-    }
-  }
-
   /** A control-flow node that wraps an `ArrayPattern` node. */
   class ArrayPatternCfgNode extends CasePatternCfgNode {
     override string getAPrimaryQlClass() { result = "ArrayPatternCfgNode" }
 
-    override ArrayPatternChildMapping e;
+    override ArrayPattern e;
 
     /** Gets the `n`th element of this list pattern's prefix. */
     final CasePatternCfgNode getPrefixElement(int n) {
-      e.hasCfgChild(e.getPrefixElement(n), this, result)
+      result.injects(desugar(e.getPrefixElement(n)))
     }
 
     /** Gets the `n`th element of this list pattern's suffix. */
     final CasePatternCfgNode getSuffixElement(int n) {
-      e.hasCfgChild(e.getSuffixElement(n), this, result)
+      result.injects(desugar(e.getSuffixElement(n)))
     }
 
     /** Gets the variable of the rest token, if any. */
     final VariableWriteAccessCfgNode getRestVariableAccess() {
-      e.hasCfgChild(e.getRestVariableAccess(), this, result)
-    }
-  }
-
-  private class FindPatternChildMapping extends NonExprChildMapping, FindPattern {
-    override predicate relevantChild(AstNode e) {
-      e = this.getElement(_) or
-      e = this.getPrefixVariableAccess() or
-      e = this.getSuffixVariableAccess()
+      result.injects(desugar(e.getRestVariableAccess()))
     }
   }
 
@@ -507,26 +326,19 @@ module ExprNodes {
   class FindPatternCfgNode extends CasePatternCfgNode {
     override string getAPrimaryQlClass() { result = "FindPatternCfgNode" }
 
-    override FindPatternChildMapping e;
+    override FindPattern e;
 
     /** Gets the `n`th element of this find pattern. */
-    final CasePatternCfgNode getElement(int n) { e.hasCfgChild(e.getElement(n), this, result) }
+    final CasePatternCfgNode getElement(int n) { result.injects(desugar(e.getElement(n))) }
 
     /** Gets the variable for the prefix of this find pattern, if any. */
     final VariableWriteAccessCfgNode getPrefixVariableAccess() {
-      e.hasCfgChild(e.getPrefixVariableAccess(), this, result)
+      result.injects(desugar(e.getPrefixVariableAccess()))
     }
 
     /** Gets the variable for the suffix of this find pattern, if any. */
     final VariableWriteAccessCfgNode getSuffixVariableAccess() {
-      e.hasCfgChild(e.getSuffixVariableAccess(), this, result)
-    }
-  }
-
-  private class HashPatternChildMapping extends NonExprChildMapping, HashPattern {
-    override predicate relevantChild(AstNode e) {
-      e = this.getValue(_) or
-      e = this.getRestVariableAccess()
+      result.injects(desugar(e.getSuffixVariableAccess()))
     }
   }
 
@@ -534,136 +346,111 @@ module ExprNodes {
   class HashPatternCfgNode extends CasePatternCfgNode {
     override string getAPrimaryQlClass() { result = "HashPatternCfgNode" }
 
-    override HashPatternChildMapping e;
+    override HashPattern e;
 
     /** Gets the value of the `n`th pair. */
-    final CasePatternCfgNode getValue(int n) { e.hasCfgChild(e.getValue(n), this, result) }
+    final CasePatternCfgNode getValue(int n) { result.injects(desugar(e.getValue(n))) }
 
     /** Gets the variable of the keyword rest token, if any. */
     final VariableWriteAccessCfgNode getRestVariableAccess() {
-      e.hasCfgChild(e.getRestVariableAccess(), this, result)
+      result.injects(desugar(e.getRestVariableAccess()))
     }
   }
 
-  private class AlternativePatternChildMapping extends NonExprChildMapping, AlternativePattern {
-    override predicate relevantChild(AstNode e) { e = this.getAnAlternative() }
-  }
-
   /** A control-flow node that wraps an `AlternativePattern` node. */
   class AlternativePatternCfgNode extends CasePatternCfgNode {
     override string getAPrimaryQlClass() { result = "AlternativePatternCfgNode" }
 
-    override AlternativePatternChildMapping e;
+    override AlternativePattern e;
 
     /** Gets the `n`th alternative. */
-    final CasePatternCfgNode getAlternative(int n) {
-      e.hasCfgChild(e.getAlternative(n), this, result)
-    }
-  }
-
-  private class AsPatternChildMapping extends NonExprChildMapping, AsPattern {
-    override predicate relevantChild(AstNode e) {
-      e = this.getPattern() or e = this.getVariableAccess()
-    }
+    final CasePatternCfgNode getAlternative(int n) { result.injects(desugar(e.getAlternative(n))) }
   }
 
   /** A control-flow node that wraps an `AsPattern` node. */
   class AsPatternCfgNode extends CasePatternCfgNode {
     override string getAPrimaryQlClass() { result = "AsPatternCfgNode" }
 
-    override AsPatternChildMapping e;
+    override AsPattern e;
 
     /** Gets the underlying pattern. */
-    final CasePatternCfgNode getPattern() { e.hasCfgChild(e.getPattern(), this, result) }
+    final CasePatternCfgNode getPattern() { result.injects(desugar(e.getPattern())) }
 
     /** Gets the variable access for this pattern. */
     final VariableWriteAccessCfgNode getVariableAccess() {
-      e.hasCfgChild(e.getVariableAccess(), this, result)
+      result.injects(desugar(e.getVariableAccess()))
     }
   }
 
-  private class ParenthesizedPatternChildMapping extends NonExprChildMapping, ParenthesizedPattern {
-    override predicate relevantChild(AstNode e) { e = this.getPattern() }
-  }
-
   /** A control-flow node that wraps a `ParenthesizedPattern` node. */
   class ParenthesizedPatternCfgNode extends CasePatternCfgNode {
     override string getAPrimaryQlClass() { result = "ParenthesizedPatternCfgNode" }
 
-    override ParenthesizedPatternChildMapping e;
+    override ParenthesizedPattern e;
 
     /** Gets the underlying pattern. */
-    final CasePatternCfgNode getPattern() { e.hasCfgChild(e.getPattern(), this, result) }
-  }
-
-  private class ConditionalExprChildMapping extends ExprChildMapping, ConditionalExpr {
-    override predicate relevantChild(AstNode n) { n = [this.getCondition(), this.getBranch(_)] }
+    final CasePatternCfgNode getPattern() { result.injects(desugar(e.getPattern())) }
   }
 
   /** A control-flow node that wraps a `ConditionalExpr` AST expression. */
   class ConditionalExprCfgNode extends ExprCfgNode {
     override string getAPrimaryQlClass() { result = "ConditionalExprCfgNode" }
 
-    override ConditionalExprChildMapping e;
+    override ConditionalExpr e;
 
     final override ConditionalExpr getExpr() { result = super.getExpr() }
 
     /** Gets the condition expression. */
-    final ExprCfgNode getCondition() { e.hasCfgChild(e.getCondition(), this, result) }
+    final ExprCfgNode getCondition() { result.injects(desugar(e.getCondition())) }
 
     /**
      * Gets the branch of this conditional expression that is taken when the condition
      * evaluates to cond, if any.
      */
-    final ExprCfgNode getBranch(boolean cond) { e.hasCfgChild(e.getBranch(cond), this, result) }
+    final ExprCfgNode getBranch(boolean cond) { result.injects(desugar(e.getBranch(cond))) }
   }
 
-  private class ConstantAccessChildMapping extends ExprChildMapping, ConstantAccess {
-    override predicate relevantChild(AstNode n) { n = this.getScopeExpr() }
-  }
-
-  /** A control-flow node that wraps a `ConditionalExpr` AST expression. */
+  /** A control-flow node that wraps a `ConstantAccess` AST expression. */
   class ConstantAccessCfgNode extends ExprCfgNode {
     override string getAPrimaryQlClass() { result = "ConstantAccessCfgNode" }
 
-    override ConstantAccessChildMapping e;
+    override ConstantAccess e;
 
     final override ConstantAccess getExpr() { result = super.getExpr() }
 
     /** Gets the scope expression. */
-    final ExprCfgNode getScopeExpr() { e.hasCfgChild(e.getScopeExpr(), this, result) }
-  }
-
-  private class StmtSequenceChildMapping extends ExprChildMapping, StmtSequence {
-    override predicate relevantChild(AstNode n) { n = this.getLastStmt() }
+    final ExprCfgNode getScopeExpr() { result.injects(desugar(e.getScopeExpr())) }
   }
 
   /** A control-flow node that wraps a `StmtSequence` AST expression. */
   class StmtSequenceCfgNode extends ExprCfgNode {
+    // TODO: This charpred represents a bug and should be removed when the
+    // resulting additional data flow does not break performance.
+    // The old CFG did not include `BeginExpr` nodes in the CFG, but the
+    // current CFG does. This charpred thus keeps a small subset of the old
+    // behavior in order to avoid regressions.
+    StmtSequenceCfgNode() { not super.getExpr() instanceof BeginExpr }
+
     override string getAPrimaryQlClass() { result = "StmtSequenceCfgNode" }
 
-    override StmtSequenceChildMapping e;
+    override StmtSequence e;
 
     final override StmtSequence getExpr() { result = super.getExpr() }
 
     /** Gets the last statement in this sequence, if any. */
-    final ExprCfgNode getLastStmt() { e.hasCfgChild(e.getLastStmt(), this, result) }
-  }
-
-  private class ForExprChildMapping extends ExprChildMapping, ForExpr {
-    override predicate relevantChild(AstNode n) { n = this.getValue() }
+    final ExprCfgNode getLastStmt() { result.injects(desugar(e.getLastStmt())) }
   }
 
   /** A control-flow node that wraps a `ForExpr` AST expression. */
   class ForExprCfgNode extends ExprCfgNode {
     override string getAPrimaryQlClass() { result = "ForExprCfgNode" }
 
-    override ForExprChildMapping e;
+    override ForExpr e;
 
     final override ForExpr getExpr() { result = super.getExpr() }
 
     /** Gets the value being iterated over. */
-    final ExprCfgNode getValue() { e.hasCfgChild(e.getValue(), this, result) }
+    final ExprCfgNode getValue() { result.injects(desugar(e.getValue())) }
   }
 
   /** A control-flow node that wraps a `ParenthesizedExpr` AST expression. */
@@ -673,27 +460,23 @@ module ExprNodes {
     ParenthesizedExprCfgNode() { this.getExpr() instanceof ParenthesizedExpr }
   }
 
-  private class PairChildMapping extends ExprChildMapping, Pair {
-    override predicate relevantChild(AstNode n) { n = [this.getKey(), this.getValue()] }
-  }
-
   /** A control-flow node that wraps a `Pair` AST expression. */
   class PairCfgNode extends ExprCfgNode {
     override string getAPrimaryQlClass() { result = "PairCfgNode" }
 
-    override PairChildMapping e;
+    override Pair e;
 
     final override Pair getExpr() { result = super.getExpr() }
 
     /**
      * Gets the key expression of this pair.
      */
-    final ExprCfgNode getKey() { e.hasCfgChild(e.getKey(), this, result) }
+    final ExprCfgNode getKey() { result.injects(desugar(e.getKey())) }
 
     /**
      * Gets the value expression of this pair.
      */
-    final ExprCfgNode getValue() { e.hasCfgChild(e.getValue(), this, result) }
+    final ExprCfgNode getValue() { result.injects(desugar(e.getValue())) }
   }
 
   /** A control-flow node that wraps a `VariableAccess` AST expression. */
@@ -728,41 +511,29 @@ module ExprNodes {
     final override LocalVariable getVariable() { result = super.getVariable() }
   }
 
-  private class InstanceVariableAccessMapping extends ExprChildMapping, InstanceVariableAccess {
-    override predicate relevantChild(AstNode n) { n = this.getReceiver() }
-  }
-
   /** A control-flow node that wraps an `InstanceVariableAccess` AST expression. */
   class InstanceVariableAccessCfgNode extends ExprCfgNode {
     override string getAPrimaryQlClass() { result = "InstanceVariableAccessCfgNode" }
 
-    override InstanceVariableAccessMapping e;
+    override InstanceVariableAccess e;
 
     override InstanceVariableAccess getExpr() { result = super.getExpr() }
 
     /**
      * Gets the synthetic receiver (`self`) of this instance variable access.
      */
-    final CfgNode getReceiver() { e.hasCfgChild(e.getReceiver(), this, result) }
-  }
-
-  private class SelfVariableAccessMapping extends ExprChildMapping, SelfVariableAccess {
-    override predicate relevantChild(AstNode n) { none() }
+    final CfgNode getReceiver() { result.injects(desugar(e.getReceiver())) }
   }
 
   /** A control-flow node that wraps a `SelfVariableAccess` AST expression. */
   class SelfVariableAccessCfgNode extends VariableAccessCfgNode {
     final override string getAPrimaryQlClass() { result = "SelfVariableAccessCfgNode" }
 
-    override SelfVariableAccessMapping e;
+    override SelfVariableAccess e;
 
     override SelfVariableAccess getExpr() { result = super.getExpr() }
   }
 
-  private class VariableWriteAccessChildMapping extends ExprChildMapping, VariableWriteAccess {
-    override predicate relevantChild(AstNode n) { this.isExplicitWrite(n) }
-  }
-
   /** A control-flow node that wraps a `VariableWriteAccess` AST expression. */
   class VariableWriteAccessCfgNode extends VariableAccessCfgNode {
     /**
@@ -784,20 +555,16 @@ module ExprNodes {
 
     override string getAPrimaryQlClass() { result = "VariableWriteAccessCfgNode" }
 
-    override VariableWriteAccessChildMapping e;
+    override VariableWriteAccess e;
 
     override VariableWriteAccess getExpr() { result = super.getExpr() }
   }
 
-  private class LocalVariableWriteAccessChildMapping extends VariableWriteAccessChildMapping,
-    LocalVariableWriteAccess
-  { }
-
   /** A control-flow node that wraps a `LocalVariableWriteAccess` AST expression. */
   class LocalVariableWriteAccessCfgNode extends VariableWriteAccessCfgNode {
     override string getAPrimaryQlClass() { result = "LocalVariableWriteAccessCfgNode" }
 
-    override LocalVariableWriteAccessChildMapping e;
+    override LocalVariableWriteAccess e;
 
     final override LocalVariableWriteAccess getExpr() { result = super.getExpr() }
 
@@ -870,20 +637,16 @@ module ExprNodes {
     }
   }
 
-  private class StringlikeLiteralChildMapping extends ExprChildMapping, StringlikeLiteral {
-    override predicate relevantChild(AstNode n) { n = this.getComponent(_) }
-  }
-
   /** A control-flow node that wraps a `StringlikeLiteral` AST expression. */
   class StringlikeLiteralCfgNode extends ExprCfgNode {
     override string getAPrimaryQlClass() { result = "StringlikeLiteralCfgNode" }
 
-    override StringlikeLiteralChildMapping e;
+    override StringlikeLiteral e;
 
     override StringlikeLiteral getExpr() { result = super.getExpr() }
 
     /** Gets the `n`th component of this `StringlikeLiteral` */
-    StringComponentCfgNode getComponent(int n) { e.hasCfgChild(e.getComponent(n), this, result) }
+    StringComponentCfgNode getComponent(int n) { result.injects(desugar(e.getComponent(n))) }
 
     /** Gets a component of this `StringlikeLiteral` */
     StringComponentCfgNode getAComponent() { result = this.getComponent(_) }
@@ -929,15 +692,11 @@ module ExprNodes {
     final override RelationalOperation getExpr() { result = super.getExpr() }
   }
 
-  private class SplatExprChildMapping extends OperationExprChildMapping, SplatExpr {
-    override predicate relevantChild(AstNode n) { n = this.getOperand() }
-  }
-
   /** A control-flow node that wraps a `SplatExpr` AST expression. */
   class SplatExprCfgNode extends UnaryOperationCfgNode {
     override string getAPrimaryQlClass() { result = "SplatExprCfgNode" }
 
-    override SplatExprChildMapping e;
+    override SplatExpr e;
 
     final override SplatExpr getExpr() { result = super.getExpr() }
   }
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/ControlFlowGraph.qll b/ruby/ql/lib/codeql/ruby/controlflow/ControlFlowGraph.qll
index 8a7abea30904..8f0ecd549991 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/ControlFlowGraph.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/ControlFlowGraph.qll
@@ -2,12 +2,23 @@
 overlay[local]
 module;
 
+private import ruby as R
+private import codeql.Locations
+private import codeql.controlflow.ControlFlowGraph
 import codeql.controlflow.SuccessorType
-private import codeql.ruby.AST
-private import codeql.ruby.controlflow.BasicBlocks
-private import internal.ControlFlowGraphImpl as CfgImpl
-private import internal.Splitting as Splitting
-private import internal.Completion
+private import codeql.ruby.ast.internal.Synthesis
+private import codeql.ruby.ast.internal.Scope
+
+private module Cfg0 = Make0<Location, Ast>;
+
+private module Cfg1 = Make1<Input>;
+
+private module Cfg2 = Make2<Input>;
+
+private import Cfg0
+private import Cfg1
+private import Cfg2
+import Public
 
 /**
  * An AST node with an associated control-flow graph.
@@ -17,12 +28,12 @@ private import internal.Completion
  * Note that module declarations are not themselves CFG scopes, as they are part of
  * the CFG of the enclosing top-level or callable.
  */
-class CfgScope extends Scope instanceof CfgImpl::CfgScopeImpl {
+class CfgScope extends R::Ast::Scope instanceof CfgScopeImpl {
   /** Gets the CFG scope that this scope is nested under, if any. */
   final CfgScope getOuterCfgScope() {
-    exists(AstNode parent |
+    exists(R::Ast::AstNode parent |
       parent = this.getParent() and
-      result = CfgImpl::getCfgScope(parent)
+      result = getEnclosingCallable(parent)
     )
   }
 }
@@ -35,14 +46,11 @@ class CfgScope extends Scope instanceof CfgImpl::CfgScopeImpl {
  *
  * Only nodes that can be reached from an entry point are included in the CFG.
  */
-class CfgNode extends CfgImpl::Node {
+class CfgNode extends ControlFlowNode {
   /** Gets the name of the primary QL class for this node. */
   overlay[global]
   string getAPrimaryQlClass() { none() }
 
-  /** Gets the file of this control flow node. */
-  final File getFile() { result = this.getLocation().getFile() }
-
   /** Gets a successor node of a given type, if any. */
   final CfgNode getASuccessor(SuccessorType t) { result = super.getASuccessor(t) }
 
@@ -54,14 +62,504 @@ class CfgNode extends CfgImpl::Node {
 
   /** Gets an immediate predecessor, if any. */
   final CfgNode getAPredecessor() { result = this.getAPredecessor(_) }
+}
+
+private Ast::AstNode desugar(R::Ast::AstNode n) { result = n or result = n.getDesugared() }
+
+class CfgScopeImpl = Ast::Callable;
+
+predicate getEnclosingCallable = Ast::getEnclosingCallable/1;
+
+/** Provides an implementation of the AST signature for Ruby. */
+private module Ast implements AstSig<Location> {
+  private import codeql.ruby.ast.internal.AST
+
+  private predicate additionalExclude(R::Ast::AstNode n) {
+    n instanceof R::Ast::DestructuredLhsExpr or
+    exists(n.getDesugared())
+  }
+
+  class AstNode extends R::Ast::AstNode {
+    AstNode() {
+      not any(Synthesis s).excludeFromControlFlowTree(this) and not additionalExclude(this)
+    }
+  }
+
+  private R::Ast::AstNode adjustedGetChild(R::Ast::AstNode parent, int index) {
+    exists(R::Ast::WhenClause when | parent = when |
+      when.getPattern(index) = result
+      or
+      when.getBody() = result and index = toGenerated(result).getParentIndex()
+    )
+    or
+    exists(R::Ast::MethodCall call | parent = call and not call instanceof R::Ast::BinaryOperation |
+      index = -1 and call.getReceiver() = result
+      or
+      call.getArgument(index) = result
+      or
+      index = call.getNumberOfArguments() and
+      call.getBlock() = result
+    )
+    or
+    exists(R::Ast::ClassDeclaration cls | parent = cls |
+      index = 0 and cls.getScopeExpr() = result
+      or
+      index = 1 and cls.getSuperclassExpr() = result
+      or
+      cls.getStmt(index - 2) = result
+    )
+    or
+    exists(R::Ast::ModuleDeclaration mod | parent = mod |
+      index = 0 and mod.getScopeExpr() = result
+      or
+      mod.getStmt(index - 1) = result
+    )
+    or
+    exists(R::Ast::SingletonClass cls | parent = cls |
+      index = 0 and cls.getValue() = result
+      or
+      cls.getStmt(index - 1) = result
+    )
+    or
+    exists(R::Ast::SingletonMethod method | parent = method |
+      index = 0 and method.getObject() = result
+    )
+    or
+    exists(R::Ast::Pair pair | parent = pair |
+      index = 0 and pair.getKey() = result
+      or
+      index = 1 and pair.getValue() = result
+    )
+    or
+    exists(R::Ast::ArrayPattern arraypattern | parent = arraypattern |
+      index = -1 and arraypattern.getClass() = result
+      or
+      arraypattern.getPrefixElement(index) = result
+      or
+      exists(int restix | restix = count(arraypattern.getPrefixElement(_)) |
+        restix = index and arraypattern.getRestVariableAccess() = result
+        or
+        arraypattern.getSuffixElement(index - restix - 1) = result
+      )
+    )
+    or
+    exists(R::Ast::FindPattern findpattern | parent = findpattern |
+      index = -2 and findpattern.getClass() = result
+      or
+      index = -1 and findpattern.getPrefixVariableAccess() = result
+      or
+      findpattern.getElement(index) = result
+      or
+      index = count(findpattern.getElement(_)) and
+      findpattern.getSuffixVariableAccess() = result
+    )
+    or
+    exists(R::Ast::HashPattern hashpattern | parent = hashpattern |
+      index = -1 and hashpattern.getClass() = result
+      or
+      exists(int i |
+        hashpattern.getKey(i) = result and
+        index = 2 * i
+        or
+        hashpattern.getValue(i) = result and
+        index = 2 * i + 1
+      )
+      or
+      index = 2 * count(hashpattern.getValue(_)) and hashpattern.getRestVariableAccess() = result
+    )
+  }
+
+  private R::Ast::AstNode baseGetChild(R::Ast::AstNode parent, int index) {
+    result = adjustedGetChild(parent, index)
+    or
+    not exists(adjustedGetChild(parent, _)) and
+    not parent instanceof R::Ast::Callable and
+    (
+      synthChild(parent, index, result)
+      or
+      result = parent.getAChild() and
+      not synthChild(parent, _, result) and
+      toGenerated(result).getParentIndex() = index
+    )
+  }
+
+  AstNode getChild(AstNode parent, int index) { result = desugar(baseGetChild(parent, index)) }
+
+  private R::Ast::Scope parentScope(R::Ast::Scope n) {
+    result = n.getOuterScope() and
+    not n instanceof Callable
+  }
+
+  cached
+  Callable getEnclosingCallable(AstNode node) { result = parentScope*(scopeOfInclSynth(node)) }
+
+  // TODO: Include EndBlock
+  class Callable extends AstNode {
+    Callable() { this instanceof R::Ast::Toplevel or this instanceof R::Ast::Callable }
+  }
+
+  additional AstNode toplevelBody(R::Ast::Toplevel t, int index) {
+    result = t.getBeginBlock(index) or
+    result = desugar(t.getStmt(index - count(t.getABeginBlock())))
+  }
+
+  AstNode callableGetBody(Callable c) {
+    result = toplevelBody(c, _) or
+    result = c.(R::Ast::Callable).getBody()
+  }
+
+  class Parameter extends AstNode instanceof R::Ast::Parameter {
+    AstNode getPattern() {
+      this.(R::Ast::NamedParameter).getDefiningAccess() = result
+      or
+      not exists(this.(R::Ast::NamedParameter).getDefiningAccess()) and
+      this = result
+    }
+
+    Expr getDefaultValue() {
+      result = desugar(this.(R::Ast::KeywordParameter).getDefaultValue()) or
+      result = desugar(this.(R::Ast::OptionalParameter).getDefaultValue())
+    }
+  }
+
+  Parameter callableGetParameter(Callable c, int index) {
+    c.(R::Ast::Callable).getParameter(index) = result
+  }
+
+  class Stmt extends AstNode instanceof R::Ast::Stmt { }
+
+  // Most ast nodes in Ruby are both statements and expressions with only a few
+  // that are only statements. Similarly, most nodes accept statement children,
+  // but a few only accept expression children. But since this really only
+  // matters for parsing, we can just treat expressions and statements as the
+  // same thing to avoid hard-to-find mistakes.
+  class Expr = Stmt;
+
+  class BlockStmt extends Stmt instanceof R::Ast::StmtSequence {
+    BlockStmt() { not this instanceof TryStmt }
+
+    Stmt getStmt(int n) { result = desugar(super.getStmt(n)) }
+
+    Stmt getLastStmt() { result = desugar(super.getLastStmt()) }
+  }
+
+  class ExprStmt extends Stmt {
+    ExprStmt() { none() }
+
+    Expr getExpr() { none() }
+  }
+
+  class IfStmt extends Stmt instanceof R::Ast::ConditionalExpr {
+    IfStmt() {
+      exists(Stmt branch |
+        branch = desugar(super.getBranch(_)) and not branch instanceof R::Ast::Expr
+      )
+    }
+
+    Expr getCondition() { result = desugar(super.getCondition()) }
+
+    Stmt getThen() { result = desugar(super.getBranch(true)) }
+
+    Stmt getElse() { result = desugar(super.getBranch(false)) }
+  }
+
+  class LoopStmt extends Stmt instanceof R::Ast::Loop {
+    Stmt getBody() { result = desugar(super.getBody()) }
+  }
+
+  class WhileStmt extends LoopStmt instanceof R::Ast::ConditionalLoop {
+    WhileStmt() { this instanceof R::Ast::WhileExpr or this instanceof R::Ast::WhileModifierExpr }
+
+    Expr getCondition() { result = desugar(super.getCondition()) }
+  }
+
+  class UntilStmt extends LoopStmt instanceof R::Ast::ConditionalLoop {
+    UntilStmt() { this instanceof R::Ast::UntilExpr or this instanceof R::Ast::UntilModifierExpr }
+
+    Expr getCondition() { result = desugar(super.getCondition()) }
+  }
+
+  class DoStmt extends LoopStmt {
+    DoStmt() { none() }
+
+    Expr getCondition() { none() }
+  }
+
+  class ForStmt extends LoopStmt {
+    ForStmt() { none() }
+
+    AstNode getInit(int index) { none() }
+
+    Expr getCondition() { none() }
+
+    AstNode getUpdate(int index) { none() }
+  }
+
+  // `ForExpr` would be a match for `ForEachStmt`, but it is desugared.
+  class ForEachStmt extends LoopStmt {
+    ForEachStmt() { none() }
+
+    Expr getVariable() { none() }
+
+    Expr getCollection() { none() }
+  }
+
+  class BreakStmt extends Stmt instanceof R::Ast::BreakStmt { }
+
+  class ContinueStmt extends Stmt instanceof R::Ast::NextStmt { }
+
+  class LabeledStmt extends Stmt {
+    LabeledStmt() { none() }
+
+    Stmt getStmt() { none() }
+  }
 
-  /** Gets the basic block that this control flow node belongs to. */
-  BasicBlock getBasicBlock() { result.getANode() = this }
+  class GotoStmt extends Stmt {
+    GotoStmt() { none() }
+  }
+
+  class ReturnStmt extends Stmt instanceof R::Ast::ReturnStmt {
+    Expr getExpr() { result = desugar(super.getValue()) }
+  }
+
+  // raise is just a method call
+  class Throw extends AstNode {
+    Throw() { none() }
+
+    Expr getExpr() { none() }
+  }
+
+  class TryStmt extends Stmt instanceof R::Ast::BodyStmt {
+    TryStmt() { exists(this.getRescue(_)) or exists(this.getElse()) or this.hasEnsure() }
+
+    AstNode getBody(int index) { result = desugar(super.getStmt(index)) }
+
+    CatchClause getCatch(int index) { result = super.getRescue(index) }
+
+    Stmt getFinally() { result = super.getEnsure() }
+  }
+
+  AstNode getTryElse(TryStmt try) { result = try.(R::Ast::BodyStmt).getElse() }
+
+  class CatchClause extends AstNode instanceof R::Ast::RescueClause {
+    AstNode getPattern() { result = desugar(super.getPattern()) }
+
+    AstNode getVariable() { result = super.getVariableExpr() }
+
+    Expr getCondition() { none() }
+
+    Stmt getBody() { result = super.getBody() }
+  }
+
+  class Switch extends AstNode instanceof R::Ast::CaseExpr {
+    Expr getExpr() { result = desugar(super.getValue()) }
+
+    Case getCase(int index) { result = super.getBranch(index) }
+
+    Stmt getStmt(int index) { none() }
+  }
+
+  class Case extends AstNode {
+    Case() { this = any(R::Ast::CaseExpr switch).getABranch() }
+
+    AstNode getPattern(int index) {
+      desugar(this.(R::Ast::WhenClause).getPattern(index)) = result
+      or
+      desugar(this.(R::Ast::InClause).getPattern()) = result and index = 0
+    }
+
+    Expr getGuard() { desugar(this.(R::Ast::InClause).getCondition()) = result }
+
+    AstNode getBody() {
+      desugar(this.(R::Ast::WhenClause).getBody()) = result or
+      desugar(this.(R::Ast::InClause).getBody()) = result or
+      desugar(this.(R::Ast::CaseElseBranch).getBody()) = result
+    }
+  }
+
+  class DefaultCase extends Case instanceof R::Ast::CaseElseBranch { }
+
+  predicate fallsThrough(Case c) { none() }
+
+  class ConditionalExpr extends Expr instanceof R::Ast::ConditionalExpr {
+    ConditionalExpr() { not this instanceof IfStmt }
+
+    Expr getCondition() { result = desugar(super.getCondition()) }
+
+    Expr getThen() { result = desugar(super.getBranch(true)) }
+
+    Expr getElse() { result = desugar(super.getBranch(false)) }
+  }
+
+  class BinaryExpr extends Expr {
+    BinaryExpr() { this instanceof R::Ast::BinaryOperation or this instanceof R::Ast::Assignment }
+
+    Expr getLeftOperand() {
+      result = desugar(this.(R::Ast::BinaryOperation).getLeftOperand()) or
+      result = desugar(this.(R::Ast::Assignment).getLeftOperand())
+    }
+
+    Expr getRightOperand() {
+      result = desugar(this.(R::Ast::BinaryOperation).getRightOperand()) or
+      result = desugar(this.(R::Ast::Assignment).getRightOperand())
+    }
+  }
+
+  class LogicalAndExpr extends BinaryExpr instanceof R::Ast::LogicalAndExpr { }
+
+  class LogicalOrExpr extends BinaryExpr instanceof R::Ast::LogicalOrExpr { }
+
+  class NullCoalescingExpr extends BinaryExpr {
+    NullCoalescingExpr() { none() }
+  }
+
+  class UnaryExpr extends Expr instanceof R::Ast::UnaryOperation {
+    Expr getOperand() { result = desugar(super.getOperand()) }
+  }
+
+  class LogicalNotExpr extends UnaryExpr instanceof R::Ast::NotExpr { }
+
+  class Assignment extends BinaryExpr instanceof R::Ast::Assignment { }
+
+  class AssignExpr extends Assignment instanceof R::Ast::AssignExpr { }
+
+  // Compound assignments are desugared.
+  class CompoundAssignment extends Assignment {
+    CompoundAssignment() { none() }
+  }
+
+  class AssignLogicalAndExpr extends CompoundAssignment { }
+
+  class AssignLogicalOrExpr extends CompoundAssignment { }
+
+  class AssignNullCoalescingExpr extends CompoundAssignment { }
+
+  class BooleanLiteral extends Expr instanceof R::Ast::BooleanLiteral {
+    boolean getValue() { result = super.getValue() }
+  }
+
+  class PatternMatchExpr extends Expr {
+    PatternMatchExpr() { none() }
+
+    Expr getExpr() { none() }
+
+    AstNode getPattern() { none() }
+  }
 }
 
-class Split = Splitting::Split;
+private predicate rescuable(R::Ast::AstNode n) {
+  exists(R::Ast::RescueModifierExpr rescueModifier | n = desugar(rescueModifier.getBody()))
+  or
+  exists(Ast::TryStmt try | n = try.getBody(_))
+  or
+  exists(R::Ast::AstNode parent | n = desugar(parent.getAChild()) and rescuable(parent))
+}
+
+/**
+ * Holds if `c` happens in an exception-aware context, that is, it may be
+ * `rescue`d or `ensure`d. In such cases, we assume that the target of `c`
+ * may raise an exception (in addition to evaluating normally).
+ */
+private predicate mayRaise(R::Ast::Call c) { rescuable(c) }
+
+private module Input implements InputSig1, InputSig2 {
+  private import codeql.util.Void
+  private import codeql.util.Unit
+  private import internal.NonReturning
 
-/** Provides different kinds of control flow graph splittings. */
-module Split {
-  class ConditionalCompletionSplit = Splitting::ConditionalCompletionSplit;
+  predicate cfgCachedStageRef() { CfgCachedStage::ref() }
+
+  class Label = Void;
+
+  predicate preOrderExpr(Ast::Expr e) {
+    e instanceof R::Ast::StmtSequence or
+    e instanceof R::Ast::RescueClause or
+    e instanceof R::Ast::ConditionalExpr or
+    e instanceof R::Ast::Loop or
+    e instanceof R::Ast::RescueModifierExpr
+  }
+
+  predicate postOrInOrder(Ast::AstNode n) {
+    n instanceof R::Ast::Call and
+    not n instanceof R::Ast::BinaryOperation and
+    not n instanceof R::Ast::UnaryOperation
+    or
+    n instanceof R::Ast::RedoStmt
+    or
+    n instanceof R::Ast::RetryStmt
+  }
+
+  class CallableContext = Unit;
+
+  Ast::AstNode callableGetBodyPart(Ast::Callable c, CallableContext ctx, int index) {
+    result = Ast::toplevelBody(c, index) and
+    exists(ctx)
+  }
+
+  predicate catchAll(Ast::CatchClause catch) {
+    not exists(catch.(R::Ast::RescueClause).getAnException())
+  }
+
+  predicate beginAbruptCompletion(
+    Ast::AstNode ast, PreControlFlowNode n, AbruptCompletion c, boolean always
+  ) {
+    ast.(NonReturningCall).getASuccessorType() = c.asSimpleAbruptCompletion() and
+    n.isIn(ast) and
+    always = true
+    or
+    mayRaise(ast) and
+    n.isIn(ast) and
+    c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+    always = false
+    or
+    ast instanceof R::Ast::RedoStmt and
+    n.isIn(ast) and
+    c.asSimpleAbruptCompletion() instanceof RedoSuccessor and
+    always = true
+    or
+    ast instanceof R::Ast::RetryStmt and
+    n.isIn(ast) and
+    c.asSimpleAbruptCompletion() instanceof RetrySuccessor and
+    always = true
+  }
+
+  predicate endAbruptCompletion(Ast::AstNode ast, PreControlFlowNode n, AbruptCompletion c) {
+    exists(R::Ast::Callable callable |
+      callable.getBody() = ast and
+      n.(NormalExitNodeImpl).getEnclosingCallable() = callable
+    |
+      c.asSimpleAbruptCompletion() instanceof BreakSuccessor or
+      c.asSimpleAbruptCompletion() instanceof ContinueSuccessor or
+      c.asSimpleAbruptCompletion() instanceof RedoSuccessor
+    )
+    or
+    exists(R::Ast::RescueModifierExpr rescueModifier |
+      ast = desugar(rescueModifier.getBody()) and
+      c.getSuccessorType() instanceof ExceptionSuccessor and
+      n.isBefore(desugar(rescueModifier.getHandler()))
+    )
+    or
+    ast = any(Ast::LoopStmt loop).getBody() and
+    c.asSimpleAbruptCompletion() instanceof RedoSuccessor and
+    n.isBefore(ast)
+    or
+    exists(Ast::TryStmt try |
+      ast = try.getCatch(_).getBody() and
+      c.asSimpleAbruptCompletion() instanceof RetrySuccessor and
+      n.isBefore(try.getBody(0))
+    )
+  }
+
+  predicate step(PreControlFlowNode n1, PreControlFlowNode n2) {
+    exists(R::Ast::RescueModifierExpr rescueModifier |
+      n1.isBefore(rescueModifier) and
+      n2.isBefore(desugar(rescueModifier.getBody()))
+      or
+      n1.isAfter(desugar(rescueModifier.getBody())) and
+      n2.isAfter(rescueModifier)
+      or
+      n1.isAfter(desugar(rescueModifier.getHandler())) and
+      n2.isAfter(rescueModifier)
+    )
+  }
 }
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/Completion.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/Completion.qll
deleted file mode 100644
index bcfe8f98d437..000000000000
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/Completion.qll
+++ /dev/null
@@ -1,565 +0,0 @@
-/**
- * Provides classes representing control flow completions.
- *
- * A completion represents how a statement or expression terminates.
- */
-overlay[local]
-module;
-
-private import codeql.ruby.AST
-private import codeql.ruby.ast.internal.AST
-private import codeql.ruby.ast.internal.Control
-private import codeql.ruby.controlflow.ControlFlowGraph
-private import ControlFlowGraphImpl as CfgImpl
-private import NonReturning
-
-private newtype TCompletion =
-  TSimpleCompletion() or
-  TBooleanCompletion(boolean b) { b in [false, true] } or
-  TMatchingCompletion(boolean isMatch) { isMatch in [false, true] } or
-  TReturnCompletion() or
-  TBreakCompletion() or
-  TNextCompletion() or
-  TRedoCompletion() or
-  TRetryCompletion() or
-  TRaiseCompletion() or // TODO: Add exception type?
-  TExitCompletion() or
-  TNestedCompletion(TCompletion inner, TCompletion outer, int nestLevel) {
-    inner = TBreakCompletion() and
-    outer instanceof NonNestedNormalCompletion and
-    nestLevel = 0
-    or
-    inner instanceof TBooleanCompletion and
-    outer instanceof TMatchingCompletion and
-    nestLevel = 0
-    or
-    inner instanceof NormalCompletion and
-    nestedEnsureCompletion(outer, nestLevel)
-  }
-
-pragma[noinline]
-private predicate nestedEnsureCompletion(TCompletion outer, int nestLevel) {
-  (
-    outer = TReturnCompletion()
-    or
-    outer = TBreakCompletion()
-    or
-    outer = TNextCompletion()
-    or
-    outer = TRedoCompletion()
-    or
-    outer = TRetryCompletion()
-    or
-    outer = TRaiseCompletion()
-    or
-    outer = TExitCompletion()
-  ) and
-  nestLevel = any(CfgImpl::Trees::BodyStmtTree t).getNestLevel()
-}
-
-pragma[noinline]
-private predicate completionIsValidForStmt(AstNode n, Completion c) {
-  n instanceof BreakStmt and
-  c = TBreakCompletion()
-  or
-  n instanceof NextStmt and
-  c = TNextCompletion()
-  or
-  n instanceof RedoStmt and
-  c = TRedoCompletion()
-  or
-  n instanceof ReturnStmt and
-  c = TReturnCompletion()
-}
-
-private AstNode getARescuableBodyChild() {
-  exists(CfgImpl::Trees::BodyStmtTree bst | result = bst.getBodyChild(_, true) |
-    exists(bst.getARescue())
-    or
-    exists(bst.getEnsure())
-  )
-  or
-  result = getARescuableBodyChild().getAChild()
-}
-
-/**
- * Holds if `c` happens in an exception-aware context, that is, it may be
- * `rescue`d or `ensure`d. In such cases, we assume that the target of `c`
- * may raise an exception (in addition to evaluating normally).
- */
-private predicate mayRaise(Call c) { c = getARescuableBodyChild() }
-
-/** A completion of a statement or an expression. */
-abstract class Completion extends TCompletion {
-  private predicate isValidForSpecific0(AstNode n) {
-    this = n.(NonReturningCall).getACompletion()
-    or
-    completionIsValidForStmt(n, this)
-    or
-    mustHaveBooleanCompletion(n) and
-    (
-      exists(boolean value | isBooleanConstant(n, value) | this = TBooleanCompletion(value))
-      or
-      not isBooleanConstant(n, _) and
-      this = TBooleanCompletion(_)
-    )
-    or
-    mustHaveMatchingCompletion(n) and
-    this = TMatchingCompletion(_)
-    or
-    n = any(RescueModifierExpr parent).getBody() and
-    this = [TSimpleCompletion().(TCompletion), TRaiseCompletion()]
-  }
-
-  private predicate isValidForSpecific(AstNode n) {
-    this.isValidForSpecific0(n)
-    or
-    exists(AstNode other | n = other.getDesugared() and this.isValidForSpecific(other))
-    or
-    mayRaise(n) and
-    (
-      this = TRaiseCompletion()
-      or
-      not any(Completion c).isValidForSpecific0(n) and
-      this = TSimpleCompletion()
-    )
-  }
-
-  /** Holds if this completion is valid for node `n`. */
-  predicate isValidFor(AstNode n) {
-    this.isValidForSpecific(n)
-    or
-    not any(Completion c).isValidForSpecific(n) and
-    this = TSimpleCompletion()
-  }
-
-  /**
-   * Holds if this completion will continue a loop when it is the completion
-   * of a loop body.
-   */
-  predicate continuesLoop() {
-    this instanceof NormalCompletion or
-    this instanceof NextCompletion
-  }
-
-  /**
-   * Gets the inner completion. This is either the inner completion,
-   * when the completion is nested, or the completion itself.
-   */
-  Completion getInnerCompletion() { result = this }
-
-  /**
-   * Gets the outer completion. This is either the outer completion,
-   * when the completion is nested, or the completion itself.
-   */
-  Completion getOuterCompletion() { result = this }
-
-  /** Gets a successor type that matches this completion. */
-  abstract SuccessorType getAMatchingSuccessorType();
-
-  /** Gets a textual representation of this completion. */
-  abstract string toString();
-}
-
-/** Holds if node `n` has the Boolean constant value `value`. */
-private predicate isBooleanConstant(AstNode n, boolean value) {
-  mustHaveBooleanCompletion(n) and
-  (
-    n.(BooleanLiteral).isTrue() and
-    value = true
-    or
-    n.(BooleanLiteral).isFalse() and
-    value = false
-  )
-}
-
-/**
- * Holds if a normal completion of `n` must be a Boolean completion.
- */
-private predicate mustHaveBooleanCompletion(AstNode n) {
-  inBooleanContext(n) and
-  not n instanceof NonReturningCall
-}
-
-/**
- * Holds if `n` is used in a Boolean context. That is, the value
- * that `n` evaluates to determines a true/false branch successor.
- */
-private predicate inBooleanContext(AstNode n) {
-  exists(ConditionalExpr i |
-    n = i.getCondition()
-    or
-    inBooleanContext(i) and
-    n = i.getBranch(_)
-  )
-  or
-  n = any(ConditionalLoop parent).getCondition()
-  or
-  n = any(InClause parent).getCondition()
-  or
-  exists(LogicalAndExpr parent |
-    n = parent.getLeftOperand()
-    or
-    inBooleanContext(parent) and
-    n = parent.getRightOperand()
-  )
-  or
-  exists(LogicalOrExpr parent |
-    n = parent.getLeftOperand()
-    or
-    inBooleanContext(parent) and
-    n = parent.getRightOperand()
-  )
-  or
-  n = any(NotExpr parent | inBooleanContext(parent)).getOperand()
-  or
-  n = any(StmtSequence parent | inBooleanContext(parent)).getLastStmt()
-  or
-  exists(CaseExpr c, WhenClause w |
-    not exists(c.getValue()) and
-    c.getABranch() = w
-  |
-    w.getPattern(_) = n
-    or
-    w = n
-  )
-}
-
-/**
- * Holds if a normal completion of `n` must be a matching completion.
- */
-private predicate mustHaveMatchingCompletion(AstNode n) {
-  inMatchingContext(n) and
-  not n instanceof NonReturningCall
-}
-
-/**
- * Holds if `n` is used in a matching context. That is, whether or
- * not the value of `n` matches, determines the successor.
- */
-private predicate inMatchingContext(AstNode n) {
-  n = any(RescueClause r).getException(_)
-  or
-  exists(CaseExpr c, WhenClause w |
-    exists(c.getValue()) and
-    c.getABranch() = w
-  |
-    w.getPattern(_) = n
-    or
-    w = n
-  )
-  or
-  n instanceof CasePattern
-  or
-  n = any(ReferencePattern p).getExpr()
-  or
-  n.(CfgImpl::Trees::DefaultValueParameterTree).hasDefaultValue()
-}
-
-/**
- * A completion that represents normal evaluation of a statement or an
- * expression.
- */
-abstract class NormalCompletion extends Completion { }
-
-abstract private class NonNestedNormalCompletion extends NormalCompletion { }
-
-/** A simple (normal) completion. */
-class SimpleCompletion extends NonNestedNormalCompletion, TSimpleCompletion {
-  override DirectSuccessor getAMatchingSuccessorType() { any() }
-
-  override string toString() { result = "simple" }
-}
-
-/**
- * A completion that represents evaluation of an expression, whose value determines
- * the successor. Either a Boolean completion (`BooleanCompletion`), or a matching
- * completion (`MatchingCompletion`).
- */
-abstract class ConditionalCompletion extends NormalCompletion {
-  boolean value;
-
-  bindingset[value]
-  ConditionalCompletion() { any() }
-
-  /** Gets the Boolean value of this conditional completion. */
-  final boolean getValue() { result = value }
-}
-
-/**
- * A completion that represents evaluation of an expression
- * with a Boolean value.
- */
-class BooleanCompletion extends ConditionalCompletion, NonNestedNormalCompletion, TBooleanCompletion
-{
-  BooleanCompletion() { this = TBooleanCompletion(value) }
-
-  /** Gets the dual Boolean completion. */
-  BooleanCompletion getDual() { result = TBooleanCompletion(value.booleanNot()) }
-
-  override BooleanSuccessor getAMatchingSuccessorType() { result.getValue() = value }
-
-  override string toString() { result = value.toString() }
-}
-
-/** A Boolean `true` completion. */
-class TrueCompletion extends BooleanCompletion {
-  TrueCompletion() { this.getValue() = true }
-}
-
-/** A Boolean `false` completion. */
-class FalseCompletion extends BooleanCompletion {
-  FalseCompletion() { this.getValue() = false }
-}
-
-/**
- * A completion that represents evaluation of a matching test, for example
- * a test in a `rescue` statement.
- */
-class MatchingCompletion extends ConditionalCompletion {
-  MatchingCompletion() {
-    this = TMatchingCompletion(value)
-    or
-    this = TNestedCompletion(_, TMatchingCompletion(value), _)
-  }
-
-  override ConditionalSuccessor getAMatchingSuccessorType() {
-    this = TMatchingCompletion(result.(MatchingSuccessor).getValue())
-  }
-
-  override string toString() { if value = true then result = "match" else result = "no-match" }
-}
-
-/**
- * A completion that represents evaluation of a statement or an
- * expression resulting in a return.
- */
-class ReturnCompletion extends Completion {
-  ReturnCompletion() {
-    this = TReturnCompletion() or
-    this = TNestedCompletion(_, TReturnCompletion(), _)
-  }
-
-  override ReturnSuccessor getAMatchingSuccessorType() { any() }
-
-  override string toString() {
-    // `NestedCompletion` defines `toString()` for the other case
-    this = TReturnCompletion() and result = "return"
-  }
-}
-
-/**
- * A completion that represents evaluation of a statement or an
- * expression resulting in a break from a loop.
- */
-class BreakCompletion extends Completion {
-  BreakCompletion() {
-    this = TBreakCompletion() or
-    this = TNestedCompletion(_, TBreakCompletion(), _)
-  }
-
-  override BreakSuccessor getAMatchingSuccessorType() { any() }
-
-  override string toString() {
-    // `NestedCompletion` defines `toString()` for the other case
-    this = TBreakCompletion() and result = "break"
-  }
-}
-
-/**
- * A completion that represents evaluation of a statement or an
- * expression resulting in a continuation of a loop.
- */
-class NextCompletion extends Completion {
-  NextCompletion() {
-    this = TNextCompletion() or
-    this = TNestedCompletion(_, TNextCompletion(), _)
-  }
-
-  override ContinueSuccessor getAMatchingSuccessorType() { any() }
-
-  override string toString() {
-    // `NestedCompletion` defines `toString()` for the other case
-    this = TNextCompletion() and result = "next"
-  }
-}
-
-/**
- * A completion that represents evaluation of a statement or an
- * expression resulting in a redo of a loop iteration.
- */
-class RedoCompletion extends Completion {
-  RedoCompletion() {
-    this = TRedoCompletion() or
-    this = TNestedCompletion(_, TRedoCompletion(), _)
-  }
-
-  override RedoSuccessor getAMatchingSuccessorType() { any() }
-
-  override string toString() {
-    // `NestedCompletion` defines `toString()` for the other case
-    this = TRedoCompletion() and result = "redo"
-  }
-}
-
-/**
- * A completion that represents evaluation of a statement or an
- * expression resulting in a retry.
- */
-class RetryCompletion extends Completion {
-  RetryCompletion() {
-    this = TRetryCompletion() or
-    this = TNestedCompletion(_, TRetryCompletion(), _)
-  }
-
-  override RetrySuccessor getAMatchingSuccessorType() { any() }
-
-  override string toString() {
-    // `NestedCompletion` defines `toString()` for the other case
-    this = TRetryCompletion() and result = "retry"
-  }
-}
-
-/**
- * A completion that represents evaluation of a statement or an
- * expression resulting in a thrown exception.
- */
-class RaiseCompletion extends Completion {
-  RaiseCompletion() {
-    this = TRaiseCompletion() or
-    this = TNestedCompletion(_, TRaiseCompletion(), _)
-  }
-
-  override ExceptionSuccessor getAMatchingSuccessorType() { any() }
-
-  override string toString() {
-    // `NestedCompletion` defines `toString()` for the other case
-    this = TRaiseCompletion() and result = "raise"
-  }
-}
-
-/**
- * A completion that represents evaluation of a statement or an
- * expression resulting in an abort/exit.
- */
-class ExitCompletion extends Completion {
-  ExitCompletion() {
-    this = TExitCompletion() or
-    this = TNestedCompletion(_, TExitCompletion(), _)
-  }
-
-  override ExitSuccessor getAMatchingSuccessorType() { any() }
-
-  override string toString() {
-    // `NestedCompletion` defines `toString()` for the other case
-    this = TExitCompletion() and result = "exit"
-  }
-}
-
-/**
- * A nested completion. For example, in
- *
- * ```rb
- * def m
- *   while x >= 0
- *     x -= 1
- *     if num > 100
- *       break
- *     end
- *   end
- *   puts "done"
- * end
- * ```
- *
- * the `while` loop can have a nested completion where the inner completion
- * is a `break` and the outer completion is a simple successor.
- */
-abstract class NestedCompletion extends Completion, TNestedCompletion {
-  Completion inner;
-  Completion outer;
-  int nestLevel;
-
-  NestedCompletion() { this = TNestedCompletion(inner, outer, nestLevel) }
-
-  /** Gets a completion that is compatible with the inner completion. */
-  Completion getAnInnerCompatibleCompletion() {
-    result.getOuterCompletion() = this.getInnerCompletion()
-  }
-
-  /** Gets the level of this nested completion. */
-  final int getNestLevel() { result = nestLevel }
-
-  override string toString() { result = outer + " [" + inner + "] (" + nestLevel + ")" }
-}
-
-class NestedBreakCompletion extends NormalCompletion, NestedCompletion {
-  NestedBreakCompletion() {
-    inner = TBreakCompletion() and
-    outer instanceof NonNestedNormalCompletion
-  }
-
-  override BreakCompletion getInnerCompletion() { result = inner }
-
-  override NonNestedNormalCompletion getOuterCompletion() { result = outer }
-
-  override Completion getAnInnerCompatibleCompletion() {
-    result = inner and
-    outer = TSimpleCompletion()
-    or
-    result = TNestedCompletion(outer, inner, _)
-  }
-
-  override SuccessorType getAMatchingSuccessorType() {
-    outer instanceof SimpleCompletion and
-    result instanceof BreakSuccessor
-    or
-    result = outer.(ConditionalCompletion).getAMatchingSuccessorType()
-  }
-}
-
-class NestedEnsureCompletion extends NestedCompletion {
-  NestedEnsureCompletion() {
-    inner instanceof NormalCompletion and
-    nestedEnsureCompletion(outer, nestLevel)
-  }
-
-  override NormalCompletion getInnerCompletion() { result = inner }
-
-  override Completion getOuterCompletion() { result = outer }
-
-  override SuccessorType getAMatchingSuccessorType() { none() }
-}
-
-/**
- * A completion used for conditions in pattern matching:
- *
- * ```rb
- * in x if x == 5 then puts "five"
- * in x unless x == 4 then puts "not four"
- * ```
- *
- * The outer (Matching) completion indicates whether there is a match, and
- * the inner (Boolean) completion indicates what the condition evaluated
- * to.
- *
- * For the condition `x == 5` above, `TNestedCompletion(true, true, 0)` and
- * `TNestedCompletion(false, false, 0)` are both valid completions, while
- * `TNestedCompletion(true, false, 0)` and `TNestedCompletion(false, true, 0)`
- * are valid completions for `x == 4`.
- */
-class NestedMatchingCompletion extends NestedCompletion, MatchingCompletion {
-  NestedMatchingCompletion() {
-    inner instanceof TBooleanCompletion and
-    outer instanceof TMatchingCompletion
-  }
-
-  override BooleanCompletion getInnerCompletion() { result = inner }
-
-  override MatchingCompletion getOuterCompletion() { result = outer }
-
-  override BooleanSuccessor getAMatchingSuccessorType() {
-    result.getValue() = this.getInnerCompletion().getValue()
-  }
-
-  override string toString() { result = NestedCompletion.super.toString() }
-}
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
deleted file mode 100644
index e66e8bad0037..000000000000
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
+++ /dev/null
@@ -1,1510 +0,0 @@
-/**
- * Provides an implementation for constructing control-flow graphs (CFGs) from
- * abstract syntax trees (ASTs), using the shared library from `codeql.controlflow.Cfg`.
- */
-overlay[local]
-module;
-
-private import codeql.controlflow.Cfg as CfgShared
-private import codeql.ruby.AST
-private import codeql.ruby.AST as Ast
-private import codeql.ruby.ast.internal.AST as AstInternal
-private import codeql.ruby.ast.internal.Scope
-private import codeql.ruby.ast.internal.Synthesis
-private import codeql.ruby.ast.Scope
-private import codeql.ruby.ast.internal.TreeSitter
-private import codeql.ruby.ast.internal.Variable
-private import codeql.ruby.controlflow.ControlFlowGraph
-private import Completion
-
-class AstNode extends Ast::AstNode {
-  AstNode() { not any(Synthesis s).excludeFromControlFlowTree(this) }
-}
-
-private module CfgInput implements CfgShared::InputSig<Location> {
-  private import ControlFlowGraphImpl as Impl
-  private import Completion as Comp
-  private import codeql.ruby.CFG as Cfg
-
-  class AstNode = Impl::AstNode;
-
-  class Completion = Comp::Completion;
-
-  predicate completionIsNormal(Completion c) { c instanceof Comp::NormalCompletion }
-
-  predicate completionIsSimple(Completion c) { c instanceof Comp::SimpleCompletion }
-
-  predicate completionIsValidFor(Completion c, AstNode e) { c.isValidFor(e) }
-
-  class CfgScope = Cfg::CfgScope;
-
-  CfgScope getCfgScope(AstNode n) { result = Impl::getCfgScope(n) }
-
-  predicate scopeFirst(CfgScope scope, AstNode first) { scope.(Impl::CfgScopeImpl).entry(first) }
-
-  predicate scopeLast(CfgScope scope, AstNode last, Completion c) {
-    scope.(Impl::CfgScopeImpl).exit(last, c)
-  }
-
-  private class SuccessorType = Cfg::SuccessorType;
-
-  SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
-
-  private predicate id(Ruby::AstNode node1, Ruby::AstNode node2) { node1 = node2 }
-
-  private predicate idOf(Ruby::AstNode node, int id) = equivalenceRelation(id/2)(node, id)
-
-  int idOfAstNode(AstNode node) { idOf(AstInternal::toGeneratedInclSynth(node), result) }
-
-  int idOfCfgScope(CfgScope node) { result = idOfAstNode(node) }
-}
-
-private module CfgSplittingInput implements CfgShared::SplittingInputSig<Location, CfgInput> {
-  private import Splitting as S
-
-  class SplitKindBase = S::TSplitKind;
-
-  class Split = S::Split;
-}
-
-private module ConditionalCompletionSplittingInput implements
-  CfgShared::ConditionalCompletionSplittingInputSig<Location, CfgInput, CfgSplittingInput>
-{
-  import Splitting::ConditionalCompletionSplitting::ConditionalCompletionSplittingInput
-}
-
-import CfgShared::MakeWithSplitting<Location, CfgInput, CfgSplittingInput, ConditionalCompletionSplittingInput>
-
-abstract class CfgScopeImpl extends AstNode {
-  abstract predicate entry(AstNode first);
-
-  abstract predicate exit(AstNode last, Completion c);
-}
-
-private class ToplevelScope extends CfgScopeImpl, Toplevel {
-  final override predicate entry(AstNode first) { first(this, first) }
-
-  final override predicate exit(AstNode last, Completion c) { last(this, last, c) }
-}
-
-private class EndBlockScope extends CfgScopeImpl, EndBlock {
-  final override predicate entry(AstNode first) {
-    first(this.(Trees::EndBlockTree).getBodyChild(0, _), first)
-  }
-
-  final override predicate exit(AstNode last, Completion c) {
-    last(this.(Trees::EndBlockTree).getLastBodyChild(), last, c)
-    or
-    last(this.(Trees::EndBlockTree).getBodyChild(_, _), last, c) and
-    not c instanceof NormalCompletion
-  }
-}
-
-private class CallableScope extends CfgScopeImpl, Callable {
-  final override predicate entry(AstNode first) {
-    first(this.(Trees::CallableTree).getBodyChild(0), first)
-  }
-
-  final override predicate exit(AstNode last, Completion c) {
-    this.getBody().(Trees::BodyStmtTree).last(last, c)
-    or
-    exists(int i |
-      not exists(this.getBody()) and
-      last(this.(Trees::CallableTree).getBodyChild(i), last, c) and
-      not exists(this.(Trees::CallableTree).getBodyChild(i + 1))
-    )
-    or
-    exists(AstNode child |
-      child = this.(Trees::CallableTree).getBodyChild(_) and
-      not child = this.getBody() and
-      last(child, last, c) and
-      not c instanceof NormalCompletion
-    )
-  }
-}
-
-/** Holds if `first` is first executed when entering `scope`. */
-pragma[nomagic]
-predicate succEntry(CfgScopeImpl scope, AstNode first) { scope.entry(first) }
-
-/** Holds if `last` with completion `c` can exit `scope`. */
-pragma[nomagic]
-predicate succExit(CfgScopeImpl scope, AstNode last, Completion c) { scope.exit(last, c) }
-
-/** Defines the CFG by dispatch on the various AST types. */
-module Trees {
-  private class AliasStmtTree extends StandardPreOrderTree instanceof AliasStmt {
-    final override ControlFlowTree getChildNode(int i) {
-      result = super.getNewName() and i = 0
-      or
-      result = super.getOldName() and i = 1
-    }
-  }
-
-  private class ArgumentListTree extends StandardPostOrderTree instanceof ArgumentList {
-    final override ControlFlowTree getChildNode(int i) { result = super.getElement(i) }
-  }
-
-  private class AssignExprTree extends StandardPostOrderTree instanceof AssignExpr {
-    AssignExprTree() {
-      exists(Expr left | left = super.getLeftOperand() |
-        left instanceof VariableAccess or
-        left instanceof ConstantAccess
-      )
-    }
-
-    final override ControlFlowTree getChildNode(int i) {
-      result = super.getLeftOperand() and i = 0
-      or
-      result = super.getRightOperand() and i = 1
-    }
-  }
-
-  private class BeginTree extends BodyStmtTree instanceof BeginExpr {
-    final override predicate propagatesAbnormal(AstNode child) { none() }
-  }
-
-  private class BlockArgumentTree extends StandardPostOrderTree instanceof BlockArgument {
-    final override ControlFlowTree getChildNode(int i) { result = super.getValue() and i = 0 }
-  }
-
-  abstract private class NonDefaultValueParameterTree extends ControlFlowTree instanceof NamedParameter
-  {
-    final override predicate first(AstNode first) {
-      super.getDefiningAccess().(ControlFlowTree).first(first)
-      or
-      not exists(super.getDefiningAccess()) and first = this
-    }
-
-    final override predicate last(AstNode last, Completion c) {
-      super.getDefiningAccess().(ControlFlowTree).last(last, c)
-      or
-      not exists(super.getDefiningAccess()) and
-      last = this and
-      c.isValidFor(this)
-    }
-
-    override predicate propagatesAbnormal(AstNode child) {
-      super.getDefiningAccess().(ControlFlowTree).propagatesAbnormal(child)
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
-  }
-
-  private class BlockParameterTree extends NonDefaultValueParameterTree instanceof BlockParameter {
-  }
-
-  class BodyStmtTree extends StmtSequenceTree instanceof BodyStmt {
-    /** Gets a rescue clause in this block. */
-    final RescueClause getARescue() { result = super.getRescue(_) }
-
-    /** Gets the `ensure` clause in this block, if any. */
-    final StmtSequence getEnsure() { result = super.getEnsure() }
-
-    override predicate first(AstNode first) {
-      first(this.getBodyChild(0, _), first)
-      or
-      not exists(this.getBodyChild(_, _)) and
-      first(super.getEnsure(), first)
-    }
-
-    override predicate last(AstNode last, Completion c) {
-      exists(boolean ensurable | last = this.getAnEnsurePredecessor(c, ensurable) |
-        not super.hasEnsure()
-        or
-        ensurable = false
-      )
-      or
-      // If the body completes normally, take the completion from the `ensure` block
-      this.lastEnsure(last, c, any(NormalCompletion nc), _)
-      or
-      // If the `ensure` block completes normally, it inherits any non-normal
-      // completion from the body
-      c =
-        any(NestedEnsureCompletion nec |
-          this.lastEnsure(last, nec.getAnInnerCompatibleCompletion(), nec.getOuterCompletion(),
-            nec.getNestLevel())
-        )
-      or
-      not exists(this.getBodyChild(_, _)) and
-      not exists(super.getRescue(_)) and
-      this.lastEnsure0(last, c)
-      or
-      last([super.getEnsure().(AstNode), this.getBodyChild(_, false)], last, c) and
-      not c instanceof NormalCompletion
-    }
-
-    override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      // Normal left-to-right evaluation in the body
-      exists(int i |
-        last(this.getBodyChild(i, _), pred, c) and
-        first(this.getBodyChild(i + 1, _), succ) and
-        c instanceof NormalCompletion
-      )
-      or
-      // Exceptional flow from body to first `rescue`
-      this.lastBody(pred, c, true) and
-      first(super.getRescue(0), succ) and
-      c instanceof RaiseCompletion
-      or
-      // Flow from one `rescue` clause to the next when there is no match
-      exists(RescueTree rescue, int i | rescue = super.getRescue(i) |
-        rescue.lastNoMatch(pred, c) and
-        first(super.getRescue(i + 1), succ)
-      )
-      or
-      // Flow from body to `else` block when no exception
-      this.lastBody(pred, c, _) and
-      first(super.getElse(), succ) and
-      c instanceof NormalCompletion
-      or
-      // Flow into `ensure` block
-      pred = this.getAnEnsurePredecessor(c, true) and
-      first(super.getEnsure(), succ)
-    }
-
-    /**
-     * Gets a last element from this block that may finish with completion `c`, such
-     * that control may be transferred to the `ensure` block (if it exists), but only
-     * if `ensurable = true`.
-     */
-    pragma[nomagic]
-    private AstNode getAnEnsurePredecessor(Completion c, boolean ensurable) {
-      this.lastBody(result, c, ensurable) and
-      (
-        // Any non-throw completion will always continue directly to the `ensure` block,
-        // unless there is an `else` block
-        not c instanceof RaiseCompletion and
-        not exists(super.getElse())
-        or
-        // Any completion will continue to the `ensure` block when there are no `rescue`
-        // blocks
-        not exists(super.getRescue(_))
-      )
-      or
-      // Last element from any matching `rescue` block continues to the `ensure` block
-      last(super.getRescue(_), result, c) and
-      ensurable = true
-      or
-      // If the last `rescue` block does not match, continue to the `ensure` block
-      exists(int lst, MatchingCompletion mc |
-        super.getRescue(lst).(RescueTree).lastNoMatch(result, mc) and
-        mc.getValue() = false and
-        not exists(super.getRescue(lst + 1)) and
-        c =
-          any(NestedEnsureCompletion nec |
-            nec.getOuterCompletion() instanceof RaiseCompletion and
-            nec.getInnerCompletion() = mc and
-            nec.getNestLevel() = 0
-          ) and
-        ensurable = true
-      )
-      or
-      // Last element of `else` block continues to the `ensure` block
-      last(super.getElse(), result, c) and
-      ensurable = true
-    }
-
-    pragma[nomagic]
-    private predicate lastEnsure0(AstNode last, Completion c) { last(super.getEnsure(), last, c) }
-
-    /**
-     * Gets a descendant that belongs to the `ensure` block of this block, if any.
-     * Nested `ensure` blocks are not included.
-     */
-    pragma[nomagic]
-    AstNode getAnEnsureDescendant() {
-      result = super.getEnsure()
-      or
-      exists(AstNode mid |
-        mid = this.getAnEnsureDescendant() and
-        result = mid.getAChild() and
-        getCfgScope(result) = getCfgScope(mid) and
-        not exists(BodyStmt nestedBlock |
-          result = nestedBlock.getEnsure() and
-          nestedBlock != this
-        )
-      )
-    }
-
-    /**
-     * Holds if `innerBlock` has an `ensure` block and is immediately nested inside the
-     * `ensure` block of this block.
-     */
-    private predicate nestedEnsure(BodyStmtTree innerBlock) {
-      exists(StmtSequence innerEnsure |
-        innerEnsure = this.getAnEnsureDescendant().getAChild() and
-        getCfgScope(innerEnsure) = getCfgScope(this) and
-        innerEnsure = innerBlock.getEnsure()
-      )
-    }
-
-    /**
-     * Gets the `ensure`-nesting level of this block. That is, the number of `ensure`
-     * blocks that this block is nested under.
-     */
-    int getNestLevel() { result = count(BodyStmtTree outer | outer.nestedEnsure+(this)) }
-
-    pragma[nomagic]
-    private predicate lastEnsure(
-      AstNode last, NormalCompletion ensure, Completion outer, int nestLevel
-    ) {
-      this.lastEnsure0(last, ensure) and
-      exists(
-        this.getAnEnsurePredecessor(any(Completion c0 | outer = c0.getOuterCompletion()), true)
-      ) and
-      nestLevel = this.getNestLevel()
-    }
-
-    /**
-     * Holds if `last` is a last element in the body of this block. `ensurable`
-     * indicates whether `last` may be a predecessor of an `ensure` block.
-     */
-    pragma[nomagic]
-    private predicate lastBody(AstNode last, Completion c, boolean ensurable) {
-      exists(boolean rescuable |
-        if c instanceof RaiseCompletion then ensurable = rescuable else ensurable = true
-      |
-        last(this.getBodyChild(_, rescuable), last, c) and
-        not c instanceof NormalCompletion
-        or
-        exists(int lst |
-          last(this.getBodyChild(lst, rescuable), last, c) and
-          not exists(this.getBodyChild(lst + 1, _))
-        )
-      )
-    }
-  }
-
-  private class BooleanLiteralTree extends LeafTree instanceof BooleanLiteral { }
-
-  class BraceBlockTree extends CallableTree instanceof BraceBlock {
-    final override AstNode getBodyChild(int i) {
-      result = super.getParameter(i)
-      or
-      result = super.getLocalVariable(i - super.getNumberOfParameters())
-      or
-      result = super.getBody() and
-      i = super.getNumberOfParameters() + count(super.getALocalVariable())
-    }
-  }
-
-  class CallableTree extends PostOrderTree instanceof Callable {
-    final override predicate propagatesAbnormal(AstNode child) { none() }
-
-    override predicate first(AstNode first) { first = this }
-
-    abstract AstNode getBodyChild(int i);
-
-    override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      exists(int i |
-        last(this.getBodyChild(i), pred, c) and
-        first(this.getBodyChild(i + 1), succ) and
-        c instanceof NormalCompletion
-      )
-    }
-  }
-
-  private class CallTree extends StandardPostOrderTree instanceof Call {
-    CallTree() {
-      // Logical operations are handled separately
-      not this instanceof UnaryLogicalOperation and
-      not this instanceof BinaryLogicalOperation and
-      // Calls with the `&.` operator are desugared
-      not this.(MethodCall).isSafeNavigation()
-    }
-
-    override ControlFlowTree getChildNode(int i) { result = super.getArgument(i) }
-  }
-
-  private class CaseTree extends PostOrderTree instanceof CaseExpr, AstInternal::TCaseExpr {
-    final override predicate propagatesAbnormal(AstNode child) {
-      child = super.getValue() or child = super.getABranch()
-    }
-
-    final override predicate first(AstNode first) {
-      first(super.getValue(), first)
-      or
-      not exists(super.getValue()) and first(super.getBranch(0), first)
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      last(super.getValue(), pred, c) and
-      first(super.getBranch(0), succ) and
-      c instanceof SimpleCompletion
-      or
-      exists(int i, WhenTree branch | branch = super.getBranch(i) |
-        pred = branch and
-        first(super.getBranch(i + 1), succ) and
-        c.isValidFor(branch) and
-        c.(ConditionalCompletion).getValue() = false
-      )
-      or
-      succ = this and
-      c instanceof NormalCompletion and
-      (
-        last(super.getValue(), pred, c) and not exists(super.getABranch())
-        or
-        last(super.getABranch().(WhenClause).getBody(), pred, c)
-        or
-        exists(int i, ControlFlowTree lastBranch |
-          lastBranch = super.getBranch(i) and
-          not exists(super.getBranch(i + 1)) and
-          last(lastBranch, pred, c)
-        )
-      )
-    }
-  }
-
-  private class CaseMatchTree extends PostOrderTree instanceof CaseExpr, AstInternal::TCaseMatch {
-    final override predicate propagatesAbnormal(AstNode child) {
-      child = super.getValue() or child = super.getABranch()
-    }
-
-    final override predicate first(AstNode first) { first(super.getValue(), first) }
-
-    final override predicate last(AstNode last, Completion c) {
-      super.last(last, c)
-      or
-      not exists(super.getElseBranch()) and
-      exists(MatchingCompletion lc, AstNode lastBranch |
-        lastBranch = max(int i | | super.getBranch(i) order by i) and
-        lc.getValue() = false and
-        last(lastBranch, last, lc) and
-        c instanceof RaiseCompletion and
-        not c instanceof NestedCompletion
-      )
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      last(super.getValue(), pred, c) and
-      first(super.getBranch(0), succ) and
-      c instanceof SimpleCompletion
-      or
-      exists(int i, AstNode branch | branch = super.getBranch(i) |
-        last(branch, pred, c) and
-        first(super.getBranch(i + 1), succ) and
-        c.(MatchingCompletion).getValue() = false
-      )
-      or
-      succ = this and
-      c instanceof NormalCompletion and
-      (
-        last(super.getABranch(), pred, c) and
-        not c.(MatchingCompletion).getValue() = false
-        or
-        last(super.getElseBranch(), pred, c)
-      )
-    }
-  }
-
-  private class CaseElseBranchTree extends ControlFlowTree instanceof CaseElseBranch {
-    final override predicate propagatesAbnormal(AstNode child) { child = super.getBody() }
-
-    final override predicate first(AstNode first) { first(super.getBody(), first) }
-
-    final override predicate last(AstNode last, Completion c) { last(super.getBody(), last, c) }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
-  }
-
-  private class PatternVariableAccessTree extends LocalVariableAccessTree instanceof LocalVariableWriteAccess,
-    CasePattern
-  {
-    final override predicate last(AstNode last, Completion c) {
-      super.last(last, c) and
-      c.(MatchingCompletion).getValue() = true
-    }
-  }
-
-  private class ArrayPatternTree extends ControlFlowTree instanceof ArrayPattern {
-    final override predicate propagatesAbnormal(AstNode child) {
-      child = super.getClass() or
-      child = super.getPrefixElement(_) or
-      child = super.getRestVariableAccess() or
-      child = super.getSuffixElement(_)
-    }
-
-    final override predicate first(AstNode first) {
-      first(super.getClass(), first)
-      or
-      not exists(super.getClass()) and first = this
-    }
-
-    final override predicate last(AstNode last, Completion c) {
-      c.(MatchingCompletion).getValue() = false and
-      (
-        last = this and
-        c.isValidFor(this)
-        or
-        exists(AstNode node |
-          node = super.getClass() or
-          node = super.getPrefixElement(_) or
-          node = super.getSuffixElement(_)
-        |
-          last(node, last, c)
-        )
-      )
-      or
-      c.(MatchingCompletion).getValue() = true and
-      last = this and
-      c.isValidFor(this) and
-      not exists(super.getPrefixElement(_)) and
-      not exists(super.getRestVariableAccess())
-      or
-      c.(MatchingCompletion).getValue() = true and
-      last(max(int i | | super.getPrefixElement(i) order by i), last, c) and
-      not exists(super.getRestVariableAccess())
-      or
-      last(super.getRestVariableAccess(), last, c) and
-      not exists(super.getSuffixElement(_))
-      or
-      c.(MatchingCompletion).getValue() = true and
-      last(max(int i | | super.getSuffixElement(i) order by i), last, c)
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      last(super.getClass(), pred, c) and
-      succ = this and
-      c.(MatchingCompletion).getValue() = true
-      or
-      exists(AstNode next |
-        pred = this and
-        c.(MatchingCompletion).getValue() = true and
-        first(next, succ)
-      |
-        next = super.getPrefixElement(0)
-        or
-        not exists(super.getPrefixElement(_)) and
-        next = super.getRestVariableAccess()
-      )
-      or
-      last(max(int i | | super.getPrefixElement(i) order by i), pred, c) and
-      first(super.getRestVariableAccess(), succ) and
-      c.(MatchingCompletion).getValue() = true
-      or
-      exists(int i |
-        last(super.getPrefixElement(i), pred, c) and
-        first(super.getPrefixElement(i + 1), succ) and
-        c.(MatchingCompletion).getValue() = true
-      )
-      or
-      last(super.getRestVariableAccess(), pred, c) and
-      first(super.getSuffixElement(0), succ) and
-      c instanceof SimpleCompletion
-      or
-      exists(int i |
-        last(super.getSuffixElement(i), pred, c) and
-        first(super.getSuffixElement(i + 1), succ) and
-        c.(MatchingCompletion).getValue() = true
-      )
-    }
-  }
-
-  private class FindPatternTree extends ControlFlowTree instanceof FindPattern {
-    final override predicate propagatesAbnormal(AstNode child) {
-      child = super.getClass() or
-      child = super.getPrefixVariableAccess() or
-      child = super.getElement(_) or
-      child = super.getSuffixVariableAccess()
-    }
-
-    final override predicate first(AstNode first) {
-      first(super.getClass(), first)
-      or
-      not exists(super.getClass()) and first = this
-    }
-
-    final override predicate last(AstNode last, Completion c) {
-      last(super.getSuffixVariableAccess(), last, c)
-      or
-      last(max(int i | | super.getElement(i) order by i), last, c) and
-      not exists(super.getSuffixVariableAccess())
-      or
-      c.(MatchingCompletion).getValue() = false and
-      (
-        last = this and
-        c.isValidFor(this)
-        or
-        exists(AstNode node | node = super.getClass() or node = super.getElement(_) |
-          last(node, last, c)
-        )
-      )
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      last(super.getClass(), pred, c) and
-      succ = this and
-      c.(MatchingCompletion).getValue() = true
-      or
-      exists(AstNode next |
-        pred = this and
-        c.(MatchingCompletion).getValue() = true and
-        first(next, succ)
-      |
-        next = super.getPrefixVariableAccess()
-        or
-        not exists(super.getPrefixVariableAccess()) and
-        next = super.getElement(0)
-      )
-      or
-      last(super.getPrefixVariableAccess(), pred, c) and
-      first(super.getElement(0), succ) and
-      c instanceof SimpleCompletion
-      or
-      c.(MatchingCompletion).getValue() = true and
-      exists(int i |
-        last(super.getElement(i), pred, c) and
-        first(super.getElement(i + 1), succ)
-      )
-      or
-      c.(MatchingCompletion).getValue() = true and
-      last(max(int i | | super.getElement(i) order by i), pred, c) and
-      first(super.getSuffixVariableAccess(), succ)
-    }
-  }
-
-  private class HashPatternTree extends ControlFlowTree instanceof HashPattern {
-    final override predicate propagatesAbnormal(AstNode child) {
-      child = super.getClass() or
-      child = super.getValue(_) or
-      child = super.getRestVariableAccess()
-    }
-
-    final override predicate first(AstNode first) {
-      first(super.getClass(), first)
-      or
-      not exists(super.getClass()) and first = this
-    }
-
-    final override predicate last(AstNode last, Completion c) {
-      c.(MatchingCompletion).getValue() = false and
-      (
-        last = this and
-        c.isValidFor(this)
-        or
-        exists(AstNode node |
-          node = super.getClass() or
-          node = super.getValue(_)
-        |
-          last(node, last, c)
-        )
-      )
-      or
-      c.(MatchingCompletion).getValue() = true and
-      last = this and
-      not exists(super.getValue(_)) and
-      not exists(super.getRestVariableAccess())
-      or
-      c.(MatchingCompletion).getValue() = true and
-      last(max(int i | | super.getValue(i) order by i), last, c) and
-      not exists(super.getRestVariableAccess())
-      or
-      last(super.getRestVariableAccess(), last, c)
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      last(super.getClass(), pred, c) and
-      succ = this and
-      c.(MatchingCompletion).getValue() = true
-      or
-      exists(AstNode next |
-        pred = this and
-        c.(MatchingCompletion).getValue() = true and
-        first(next, succ)
-      |
-        next = super.getValue(0)
-        or
-        not exists(super.getValue(_)) and
-        next = super.getRestVariableAccess()
-      )
-      or
-      last(max(int i | | super.getValue(i) order by i), pred, c) and
-      first(super.getRestVariableAccess(), succ) and
-      c.(MatchingCompletion).getValue() = true
-      or
-      exists(int i |
-        last(super.getValue(i), pred, c) and
-        first(super.getValue(i + 1), succ) and
-        c.(MatchingCompletion).getValue() = true
-      )
-    }
-  }
-
-  private class LineLiteralTree extends LeafTree instanceof LineLiteral { }
-
-  private class FileLiteralTree extends LeafTree instanceof FileLiteral { }
-
-  private class EncodingLiteralTree extends LeafTree instanceof EncodingLiteral { }
-
-  private class AlternativePatternTree extends PreOrderTree instanceof AlternativePattern {
-    final override predicate propagatesAbnormal(AstNode child) { child = super.getAnAlternative() }
-
-    final override predicate last(AstNode last, Completion c) {
-      last(super.getAnAlternative(), last, c) and
-      c.(MatchingCompletion).getValue() = true
-      or
-      last(max(int i | | super.getAlternative(i) order by i), last, c) and
-      c.(MatchingCompletion).getValue() = false
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      pred = this and
-      first(super.getAlternative(0), succ) and
-      c instanceof SimpleCompletion
-      or
-      exists(int i |
-        last(super.getAlternative(i), pred, c) and
-        first(super.getAlternative(i + 1), succ) and
-        c.(MatchingCompletion).getValue() = false
-      )
-    }
-  }
-
-  private class AsPatternTree extends PreOrderTree instanceof AsPattern {
-    final override predicate propagatesAbnormal(AstNode child) { child = super.getPattern() }
-
-    final override predicate last(AstNode last, Completion c) {
-      last(super.getPattern(), last, c) and
-      c.(MatchingCompletion).getValue() = false
-      or
-      last(super.getVariableAccess(), last, any(SimpleCompletion x)) and
-      c.(MatchingCompletion).getValue() = true and
-      not c instanceof NestedCompletion
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      pred = this and
-      first(super.getPattern(), succ) and
-      c instanceof SimpleCompletion
-      or
-      last(super.getPattern(), pred, c) and
-      first(super.getVariableAccess(), succ) and
-      c.(MatchingCompletion).getValue() = true
-    }
-  }
-
-  private class ParenthesizedPatternTree extends StandardPreOrderTree instanceof ParenthesizedPattern
-  {
-    override ControlFlowTree getChildNode(int i) { result = super.getPattern() and i = 0 }
-  }
-
-  private class ReferencePatternTree extends StandardPreOrderTree instanceof ReferencePattern {
-    override ControlFlowTree getChildNode(int i) { result = super.getExpr() and i = 0 }
-  }
-
-  private class InClauseTree extends PreOrderTree instanceof InClause {
-    final override predicate propagatesAbnormal(AstNode child) {
-      child = super.getPattern() or
-      child = super.getCondition()
-    }
-
-    private predicate lastCondition(AstNode last, BooleanCompletion c, boolean flag) {
-      last(super.getCondition(), last, c) and
-      (
-        flag = true and super.hasIfCondition()
-        or
-        flag = false and super.hasUnlessCondition()
-      )
-    }
-
-    final override predicate last(AstNode last, Completion c) {
-      last(super.getPattern(), last, c) and
-      c.(MatchingCompletion).getValue() = false
-      or
-      exists(BooleanCompletion bc, boolean flag, MatchingCompletion mc |
-        this.lastCondition(last, bc, flag) and
-        c =
-          any(NestedMatchingCompletion nmc |
-            nmc.getInnerCompletion() = bc and nmc.getOuterCompletion() = mc
-          )
-      |
-        mc.getValue() = false and
-        bc.getValue() = flag.booleanNot()
-        or
-        not exists(super.getBody()) and
-        mc.getValue() = true and
-        bc.getValue() = flag
-      )
-      or
-      last(super.getBody(), last, c)
-      or
-      not exists(super.getBody()) and
-      not exists(super.getCondition()) and
-      last(super.getPattern(), last, c)
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      pred = this and
-      first(super.getPattern(), succ) and
-      c instanceof SimpleCompletion
-      or
-      exists(Expr next |
-        last(super.getPattern(), pred, c) and
-        c.(MatchingCompletion).getValue() = true and
-        first(next, succ)
-      |
-        next = super.getCondition()
-        or
-        not exists(super.getCondition()) and next = super.getBody()
-      )
-      or
-      exists(boolean flag |
-        this.lastCondition(pred, c, flag) and
-        c.(BooleanCompletion).getValue() = flag and
-        first(super.getBody(), succ)
-      )
-    }
-  }
-
-  private class CharacterTree extends LeafTree instanceof CharacterLiteral { }
-
-  private class ClassDeclarationTree extends NamespaceTree instanceof ClassDeclaration {
-    /** Gets the `i`th child in the body of this block. */
-    final override AstNode getBodyChild(int i, boolean rescuable) {
-      result = super.getScopeExpr() and i = 0 and rescuable = false
-      or
-      result = super.getSuperclassExpr() and
-      i = count(super.getScopeExpr()) and
-      rescuable = true
-      or
-      result =
-        super
-            .getBodyChild(i - count(super.getScopeExpr()) - count(super.getSuperclassExpr()),
-              rescuable)
-    }
-  }
-
-  private class ClassVariableTree extends LeafTree instanceof ClassVariableAccess { }
-
-  private class ConditionalExprTree extends PostOrderTree instanceof ConditionalExpr {
-    final override predicate propagatesAbnormal(AstNode child) {
-      child = super.getCondition() or child = super.getBranch(_)
-    }
-
-    final override predicate first(AstNode first) { first(super.getCondition(), first) }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      exists(boolean b |
-        last(super.getCondition(), pred, c) and
-        b = c.(BooleanCompletion).getValue()
-      |
-        first(super.getBranch(b), succ)
-        or
-        not exists(super.getBranch(b)) and
-        succ = this
-      )
-      or
-      last(super.getBranch(_), pred, c) and
-      succ = this and
-      c instanceof NormalCompletion
-    }
-  }
-
-  private class ConditionalLoopTree extends PostOrderTree instanceof ConditionalLoop {
-    final override predicate propagatesAbnormal(AstNode child) { child = super.getCondition() }
-
-    final override predicate first(AstNode first) { first(super.getCondition(), first) }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      last(super.getCondition(), pred, c) and
-      super.entersLoopWhenConditionIs(c.(BooleanCompletion).getValue()) and
-      first(super.getBody(), succ)
-      or
-      last(super.getBody(), pred, c) and
-      first(super.getCondition(), succ) and
-      c.continuesLoop()
-      or
-      last(super.getBody(), pred, c) and
-      first(super.getBody(), succ) and
-      c instanceof RedoCompletion
-      or
-      succ = this and
-      (
-        last(super.getCondition(), pred, c) and
-        super.entersLoopWhenConditionIs(c.(BooleanCompletion).getValue().booleanNot())
-        or
-        last(super.getBody(), pred, c) and
-        not c.continuesLoop() and
-        not c instanceof BreakCompletion and
-        not c instanceof RedoCompletion
-        or
-        last(super.getBody(), pred, c.(NestedBreakCompletion).getAnInnerCompatibleCompletion())
-      )
-    }
-  }
-
-  private class ConstantAccessTree extends PostOrderTree instanceof ConstantAccess {
-    ConstantAccessTree() {
-      not this instanceof ClassDeclaration and
-      not this instanceof ModuleDeclaration and
-      // constant accesses with scope expression in compound assignments are desugared
-      not (
-        this = any(AssignOperation op).getLeftOperand() and
-        exists(super.getScopeExpr())
-      )
-    }
-
-    final override predicate propagatesAbnormal(AstNode child) { child = super.getScopeExpr() }
-
-    final override predicate first(AstNode first) {
-      first(super.getScopeExpr(), first)
-      or
-      not exists(super.getScopeExpr()) and
-      first = this
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      last(super.getScopeExpr(), pred, c) and
-      succ = this and
-      c instanceof NormalCompletion
-    }
-  }
-
-  /** A parameter that may have a default value. */
-  abstract class DefaultValueParameterTree extends ControlFlowTree {
-    abstract Expr getDefaultValueExpr();
-
-    abstract AstNode getAccessNode();
-
-    predicate hasDefaultValue() { exists(this.getDefaultValueExpr()) }
-
-    final override predicate propagatesAbnormal(AstNode child) {
-      child = this.getDefaultValueExpr() or child = this.getAccessNode()
-    }
-
-    final override predicate first(AstNode first) { first = this.getAccessNode() }
-
-    final override predicate last(AstNode last, Completion c) {
-      last(this.getDefaultValueExpr(), last, c) and
-      c instanceof NormalCompletion
-      or
-      last = this.getAccessNode() and
-      (
-        not this.hasDefaultValue() and
-        c instanceof SimpleCompletion
-        or
-        this.hasDefaultValue() and
-        c.(MatchingCompletion).getValue() = true and
-        c.isValidFor(this)
-      )
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      pred = this.getAccessNode() and
-      first(this.getDefaultValueExpr(), succ) and
-      c.(MatchingCompletion).getValue() = false
-    }
-  }
-
-  private class DestructuredParameterTree extends StandardPostOrderTree instanceof DestructuredParameter
-  {
-    final override ControlFlowTree getChildNode(int i) { result = super.getElement(i) }
-  }
-
-  private class DesugaredTree extends ControlFlowTree {
-    ControlFlowTree desugared;
-
-    DesugaredTree() { desugared = this.getDesugared() }
-
-    final override predicate propagatesAbnormal(AstNode child) {
-      desugared.propagatesAbnormal(child)
-    }
-
-    final override predicate first(AstNode first) { desugared.first(first) }
-
-    final override predicate last(AstNode last, Completion c) { desugared.last(last, c) }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
-  }
-
-  private class DoBlockTree extends CallableTree instanceof DoBlock {
-    /** Gets the `i`th child in the body of this block. */
-    final override AstNode getBodyChild(int i) {
-      result = super.getParameter(i)
-      or
-      result = super.getLocalVariable(i - super.getNumberOfParameters())
-      or
-      result = super.getBody() and
-      i = super.getNumberOfParameters() + count(super.getALocalVariable())
-    }
-  }
-
-  private class EmptyStatementTree extends LeafTree instanceof EmptyStmt { }
-
-  class EndBlockTree extends StmtSequenceTree instanceof EndBlock {
-    override predicate first(AstNode first) { first = this }
-
-    override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      // Normal left-to-right evaluation in the body
-      exists(int i |
-        last(super.getBodyChild(i, _), pred, c) and
-        first(super.getBodyChild(i + 1, _), succ) and
-        c instanceof NormalCompletion
-      )
-    }
-  }
-
-  private class ForwardedArgumentsTree extends LeafTree instanceof ForwardedArguments { }
-
-  private class ForwardParameterTree extends LeafTree instanceof ForwardParameter { }
-
-  private class GlobalVariableTree extends LeafTree instanceof GlobalVariableAccess { }
-
-  private class HashSplatNilParameterTree extends LeafTree instanceof HashSplatNilParameter { }
-
-  private class HashSplatParameterTree extends NonDefaultValueParameterTree instanceof HashSplatParameter
-  { }
-
-  private class HereDocTree extends StandardPostOrderTree instanceof HereDoc {
-    final override ControlFlowTree getChildNode(int i) { result = super.getComponent(i) }
-  }
-
-  private class InstanceVariableTree extends StandardPostOrderTree instanceof InstanceVariableAccess
-  {
-    final override ControlFlowTree getChildNode(int i) { result = super.getReceiver() and i = 0 }
-  }
-
-  private class KeywordParameterTree extends DefaultValueParameterTree instanceof KeywordParameter {
-    final override Expr getDefaultValueExpr() { result = super.getDefaultValue() }
-
-    final override AstNode getAccessNode() { result = super.getDefiningAccess() }
-  }
-
-  private class LambdaTree extends CallableTree instanceof Lambda {
-    /** Gets the `i`th child in the body of this block. */
-    final override AstNode getBodyChild(int i) {
-      result = super.getParameter(i)
-      or
-      result = super.getBody() and i = super.getNumberOfParameters()
-    }
-  }
-
-  private class LocalVariableAccessTree extends LeafTree instanceof LocalVariableAccess { }
-
-  private class LogicalAndTree extends PostOrderTree instanceof LogicalAndExpr {
-    final override predicate propagatesAbnormal(AstNode child) { child = super.getAnOperand() }
-
-    final override predicate first(AstNode first) { first(super.getLeftOperand(), first) }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      last(super.getLeftOperand(), pred, c) and
-      c instanceof TrueCompletion and
-      first(super.getRightOperand(), succ)
-      or
-      last(super.getLeftOperand(), pred, c) and
-      c instanceof FalseCompletion and
-      succ = this
-      or
-      last(super.getRightOperand(), pred, c) and
-      c instanceof NormalCompletion and
-      succ = this
-    }
-  }
-
-  private class LogicalNotTree extends PostOrderTree instanceof NotExpr {
-    final override predicate propagatesAbnormal(AstNode child) { child = super.getOperand() }
-
-    final override predicate first(AstNode first) { first(super.getOperand(), first) }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      succ = this and
-      last(super.getOperand(), pred, c) and
-      c instanceof NormalCompletion
-    }
-  }
-
-  private class LogicalOrTree extends PostOrderTree instanceof LogicalOrExpr {
-    final override predicate propagatesAbnormal(AstNode child) { child = super.getAnOperand() }
-
-    final override predicate first(AstNode first) { first(super.getLeftOperand(), first) }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      last(super.getLeftOperand(), pred, c) and
-      c instanceof FalseCompletion and
-      first(super.getRightOperand(), succ)
-      or
-      last(super.getLeftOperand(), pred, c) and
-      c instanceof TrueCompletion and
-      succ = this
-      or
-      last(super.getRightOperand(), pred, c) and
-      c instanceof NormalCompletion and
-      succ = this
-    }
-  }
-
-  private class MethodCallTree extends CallTree instanceof MethodCall {
-    final override ControlFlowTree getChildNode(int i) {
-      result = super.getReceiver() and i = 0
-      or
-      result = super.getArgument(i - 1)
-      or
-      result = super.getBlock() and i = 1 + super.getNumberOfArguments()
-    }
-  }
-
-  private class MethodNameTree extends LeafTree instanceof MethodName, AstInternal::TTokenMethodName
-  { }
-
-  private class MethodTree extends CallableTree instanceof Method {
-    /** Gets the `i`th child in the body of this block. */
-    final override AstNode getBodyChild(int i) {
-      result = super.getParameter(i)
-      or
-      result = super.getBody() and i = super.getNumberOfParameters()
-    }
-  }
-
-  private class ModuleDeclarationTree extends NamespaceTree instanceof ModuleDeclaration {
-    /** Gets the `i`th child in the body of this block. */
-    final override AstNode getBodyChild(int i, boolean rescuable) {
-      result = super.getScopeExpr() and i = 0 and rescuable = false
-      or
-      result = NamespaceTree.super.getBodyChild(i - count(super.getScopeExpr()), rescuable)
-    }
-  }
-
-  /**
-   * Namespaces (i.e. modules or classes) behave like other `BodyStmt`s except they are
-   * executed in pre-order rather than post-order. We do this in order to insert a write for
-   * `self` before any subsequent reads in the namespace body.
-   */
-  private class NamespaceTree extends BodyStmtTree instanceof Namespace {
-    final override predicate first(AstNode first) { first = this }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      BodyStmtTree.super.succ(pred, succ, c)
-      or
-      pred = this and
-      super.first(succ) and
-      c instanceof SimpleCompletion
-    }
-
-    final override predicate last(AstNode last, Completion c) {
-      super.last(last, c)
-      or
-      not exists(this.getAChild(_)) and
-      last = this and
-      c.isValidFor(this)
-    }
-  }
-
-  private class NilTree extends LeafTree instanceof NilLiteral { }
-
-  private class NumericLiteralTree extends LeafTree instanceof NumericLiteral { }
-
-  private class OptionalParameterTree extends DefaultValueParameterTree instanceof OptionalParameter
-  {
-    final override Expr getDefaultValueExpr() { result = super.getDefaultValue() }
-
-    final override AstNode getAccessNode() { result = super.getDefiningAccess() }
-  }
-
-  private class PairTree extends StandardPostOrderTree instanceof Pair {
-    final override ControlFlowTree getChildNode(int i) {
-      result = super.getKey() and i = 0
-      or
-      result = super.getValue() and i = 1
-    }
-  }
-
-  private class RangeLiteralTree extends StandardPostOrderTree instanceof RangeLiteral {
-    final override ControlFlowTree getChildNode(int i) {
-      result = super.getBegin() and i = 0
-      or
-      result = super.getEnd() and i = 1
-    }
-  }
-
-  private class RedoStmtTree extends LeafTree instanceof RedoStmt { }
-
-  private class RescueModifierTree extends PostOrderTree instanceof RescueModifierExpr {
-    final override predicate propagatesAbnormal(AstNode child) { child = super.getHandler() }
-
-    final override predicate first(AstNode first) { first(super.getBody(), first) }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      last(super.getBody(), pred, c) and
-      (
-        c instanceof RaiseCompletion and
-        first(super.getHandler(), succ)
-        or
-        not c instanceof RaiseCompletion and
-        succ = this
-      )
-      or
-      last(super.getHandler(), pred, c) and
-      c instanceof NormalCompletion and
-      succ = this
-    }
-  }
-
-  private class RescueTree extends PostOrderTree instanceof RescueClause {
-    final override predicate propagatesAbnormal(AstNode child) {
-      child = super.getAnException() or
-      child = super.getBody()
-    }
-
-    final override predicate first(AstNode first) {
-      first(super.getException(0), first)
-      or
-      not exists(super.getException(0)) and
-      (
-        first(super.getVariableExpr(), first)
-        or
-        not exists(super.getVariableExpr()) and
-        (
-          first(super.getBody(), first)
-          or
-          not exists(super.getBody()) and first = this
-        )
-      )
-    }
-
-    private Expr getLastException() {
-      exists(int i | result = super.getException(i) and not exists(super.getException(i + 1)))
-    }
-
-    predicate lastNoMatch(AstNode last, Completion c) {
-      last(this.getLastException(), last, c) and
-      c.(MatchingCompletion).getValue() = false
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      last(super.getAnException(), pred, c) and
-      c.(MatchingCompletion).getValue() = true and
-      (
-        first(super.getVariableExpr(), succ)
-        or
-        not exists(super.getVariableExpr()) and
-        (
-          first(super.getBody(), succ)
-          or
-          not exists(super.getBody()) and succ = this
-        )
-      )
-      or
-      exists(int i |
-        last(super.getException(i), pred, c) and
-        c.(MatchingCompletion).getValue() = false and
-        first(super.getException(i + 1), succ)
-      )
-      or
-      last(super.getVariableExpr(), pred, c) and
-      c instanceof NormalCompletion and
-      (
-        first(super.getBody(), succ)
-        or
-        not exists(super.getBody()) and succ = this
-      )
-      or
-      last(super.getBody(), pred, c) and
-      c instanceof NormalCompletion and
-      succ = this
-    }
-  }
-
-  private class RetryStmtTree extends LeafTree instanceof RetryStmt { }
-
-  private class ReturningStmtTree extends StandardPostOrderTree instanceof ReturningStmt {
-    final override ControlFlowTree getChildNode(int i) { result = super.getValue() and i = 0 }
-  }
-
-  private class SimpleParameterTree extends NonDefaultValueParameterTree instanceof SimpleParameter {
-  }
-
-  // Corner case: For duplicated '_' parameters, only the first occurrence has a defining
-  // access. For subsequent parameters we simply include the parameter itself in the CFG
-  private class SimpleParameterTreeDupUnderscore extends LeafTree instanceof SimpleParameter {
-    SimpleParameterTreeDupUnderscore() { not exists(this.getDefiningAccess()) }
-  }
-
-  private class SingletonClassTree extends BodyStmtTree instanceof SingletonClass {
-    final override predicate first(AstNode first) {
-      super.first(first)
-      or
-      not exists(this.getAChild(_)) and
-      first = this
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      BodyStmtTree.super.succ(pred, succ, c)
-      or
-      succ = this and
-      super.last(pred, c)
-    }
-
-    final override predicate last(AstNode last, Completion c) {
-      last = this and
-      c.isValidFor(this)
-    }
-
-    /** Gets the `i`th child in the body of this block. */
-    final override AstNode getBodyChild(int i, boolean rescuable) {
-      (
-        result = super.getValue() and i = 0 and rescuable = false
-        or
-        result = BodyStmtTree.super.getBodyChild(i - 1, rescuable)
-      )
-    }
-  }
-
-  private class SingletonMethodTree extends CallableTree instanceof SingletonMethod {
-    /** Gets the `i`th child in the body of this block. */
-    final override AstNode getBodyChild(int i) {
-      result = super.getParameter(i)
-      or
-      result = super.getBody() and i = super.getNumberOfParameters()
-    }
-
-    override predicate first(AstNode first) { first(super.getObject(), first) }
-
-    override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      CallableTree.super.succ(pred, succ, c)
-      or
-      last(super.getObject(), pred, c) and
-      succ = this and
-      c instanceof NormalCompletion
-    }
-  }
-
-  private class SplatParameterTree extends NonDefaultValueParameterTree instanceof SplatParameter {
-  }
-
-  class StmtSequenceTree extends PostOrderTree instanceof StmtSequence {
-    override predicate propagatesAbnormal(AstNode child) { child = super.getAStmt() }
-
-    override predicate first(AstNode first) {
-      // If this sequence contains any statements, go to the first one.
-      first(super.getStmt(0), first)
-      or
-      // Otherwise, treat this node as a leaf node.
-      not exists(super.getStmt(0)) and first = this
-    }
-
-    /** Gets the `i`th child in the body of this body statement. */
-    AstNode getBodyChild(int i, boolean rescuable) {
-      result = super.getStmt(i) and
-      rescuable = true
-    }
-
-    final AstNode getLastBodyChild() {
-      exists(int i |
-        result = this.getBodyChild(i, _) and
-        not exists(this.getBodyChild(i + 1, _))
-      )
-    }
-
-    override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      // Normal left-to-right evaluation in the body
-      exists(int i |
-        last(this.getBodyChild(i, _), pred, c) and
-        first(this.getBodyChild(i + 1, _), succ) and
-        c instanceof NormalCompletion
-      )
-      or
-      succ = this and
-      last(this.getLastBodyChild(), pred, c) and
-      c instanceof NormalCompletion
-    }
-  }
-
-  private class StringConcatenationTree extends StandardPostOrderTree instanceof StringConcatenation
-  {
-    final override ControlFlowTree getChildNode(int i) { result = super.getString(i) }
-  }
-
-  private class StringlikeLiteralTree extends StandardPostOrderTree instanceof StringlikeLiteral {
-    StringlikeLiteralTree() {
-      not this instanceof HereDoc and
-      not this instanceof AstInternal::TSimpleSymbolLiteralSynth
-    }
-
-    final override ControlFlowTree getChildNode(int i) { result = super.getComponent(i) }
-  }
-
-  private class StringComponentTree extends LeafTree instanceof StringComponent {
-    StringComponentTree() {
-      // Interpolations contain `StmtSequence`s, so they shouldn't be treated as leaf nodes.
-      not this instanceof StringInterpolationComponent and
-      // In the interests of brevity we treat regexes as string literals when constructing the CFG.
-      // Thus we must exclude regex interpolations here too.
-      not this instanceof RegExpInterpolationComponent
-    }
-  }
-
-  private class ToplevelTree extends BodyStmtTree instanceof Toplevel {
-    final override AstNode getBodyChild(int i, boolean rescuable) {
-      result = super.getBeginBlock(i) and rescuable = true
-      or
-      result = BodyStmtTree.super.getBodyChild(i - count(super.getABeginBlock()), rescuable)
-    }
-  }
-
-  private class UndefStmtTree extends StandardPreOrderTree instanceof UndefStmt {
-    final override ControlFlowTree getChildNode(int i) { result = super.getMethodName(i) }
-  }
-
-  private class WhenTree extends ControlFlowTree instanceof WhenClause {
-    final override predicate propagatesAbnormal(AstNode child) {
-      child = [super.getAPattern(), super.getBody()]
-    }
-
-    final Expr getLastPattern() {
-      exists(int i |
-        result = super.getPattern(i) and
-        not exists(super.getPattern(i + 1))
-      )
-    }
-
-    final override predicate first(AstNode first) { first(super.getPattern(0), first) }
-
-    final override predicate last(AstNode last, Completion c) {
-      last = this and
-      c.isValidFor(this) and
-      c.(ConditionalCompletion).getValue() = false
-      or
-      last(super.getBody(), last, c)
-    }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) {
-      pred = this and
-      c.isValidFor(this) and
-      c.(ConditionalCompletion).getValue() = true and
-      first(super.getBody(), succ)
-      or
-      exists(int i, Expr p, boolean b |
-        p = super.getPattern(i) and
-        last(p, pred, c) and
-        b = c.(ConditionalCompletion).getValue()
-      |
-        b = true and
-        succ = this
-        or
-        b = false and
-        first(super.getPattern(i + 1), succ)
-        or
-        not exists(super.getPattern(i + 1)) and
-        succ = this
-      )
-    }
-  }
-}
-
-private Scope parent(Scope n) {
-  result = n.getOuterScope() and
-  not n instanceof CfgScopeImpl
-}
-
-cached
-private CfgScope getCfgScopeImpl(AstNode n) { result = parent*(scopeOfInclSynth(n)) }
-
-/** Gets the CFG scope of node `n`. */
-pragma[inline]
-CfgScope getCfgScope(AstNode n) {
-  exists(AstNode n0 |
-    pragma[only_bind_into](n0) = n and
-    pragma[only_bind_into](result) = getCfgScopeImpl(n0)
-  )
-}
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/Guards.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/Guards.qll
index 387fb03dc9a8..e1f2e2397729 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/Guards.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/Guards.qll
@@ -6,9 +6,15 @@ private import codeql.ruby.CFG
 /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
 pragma[nomagic]
 predicate guardControlsBlock(CfgNodes::AstCfgNode guard, BasicBlock bb, boolean branch) {
-  exists(ConditionBlock conditionBlock, ConditionalSuccessor s |
+  exists(BasicBlock conditionBlock, ConditionalSuccessor s |
     guard = conditionBlock.getLastNode() and
     s.getValue() = branch and
     conditionBlock.edgeDominates(bb, s)
   )
+  or
+  exists(ConditionalSuccessor s, ControlFlowNode guardNode |
+    guardNode.isAfterValue(guard.getAstNode(), s) and
+    s.getValue() = branch and
+    guardNode.getBasicBlock().dominates(bb)
+  )
 }
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/NonReturning.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/NonReturning.qll
index 45b299a5d2b7..36061ea5f635 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/NonReturning.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/NonReturning.qll
@@ -3,22 +3,22 @@ overlay[local]
 module;
 
 private import codeql.ruby.AST
-private import Completion
+private import codeql.controlflow.SuccessorType
 
 /** A call that definitely does not return (conservative analysis). */
 abstract class NonReturningCall extends MethodCall {
-  /** Gets a valid completion for this non-returning call. */
-  abstract Completion getACompletion();
+  /** Gets a valid successor type for this non-returning call. */
+  abstract AbruptSuccessor getASuccessorType();
 }
 
 private class RaiseCall extends NonReturningCall {
   RaiseCall() { this.getMethodName() = "raise" }
 
-  override RaiseCompletion getACompletion() { not result instanceof NestedCompletion }
+  override ExceptionSuccessor getASuccessorType() { any() }
 }
 
 private class ExitCall extends NonReturningCall {
   ExitCall() { this.getMethodName() in ["abort", "exit"] }
 
-  override ExitCompletion getACompletion() { not result instanceof NestedCompletion }
+  override ExitSuccessor getASuccessorType() { any() }
 }
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
deleted file mode 100644
index 737f450b4f23..000000000000
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
+++ /dev/null
@@ -1,348 +0,0 @@
-/**
- * Provides classes and predicates relevant for splitting the control flow graph.
- */
-overlay[local]
-module;
-
-private import codeql.ruby.AST as Ast
-private import Completion as Comp
-private import Comp
-private import ControlFlowGraphImpl
-private import codeql.ruby.controlflow.ControlFlowGraph
-
-cached
-private module Cached {
-  cached
-  newtype TSplitKind =
-    TConditionalCompletionSplitKind() { forceCachingInSameStage() } or
-    TEnsureSplitKind(int nestLevel) { nestLevel = any(Trees::BodyStmtTree t).getNestLevel() }
-
-  cached
-  newtype TSplit =
-    TConditionalCompletionSplit(ConditionalCompletion c) or
-    TEnsureSplit(EnsureSplitting::EnsureSplitType type, int nestLevel) {
-      nestLevel = any(Trees::BodyStmtTree t).getNestLevel()
-    }
-}
-
-import Cached
-
-/** A split for a control flow node. */
-class Split extends TSplit {
-  /** Gets a textual representation of this split. */
-  string toString() { none() }
-}
-
-module ConditionalCompletionSplitting {
-  /**
-   * A split for conditional completions. For example, in
-   *
-   * ```rb
-   * def method x
-   *   if x < 2 and x > 0
-   *     puts "x is 1"
-   *   end
-   * end
-   * ```
-   *
-   * we record whether `x < 2` and `x > 0` evaluate to `true` or `false`, and
-   * restrict the edges out of `x < 2 and x > 0` accordingly.
-   */
-  class ConditionalCompletionSplit extends Split, TConditionalCompletionSplit {
-    ConditionalCompletion completion;
-
-    ConditionalCompletionSplit() { this = TConditionalCompletionSplit(completion) }
-
-    ConditionalCompletion getCompletion() { result = completion }
-
-    override string toString() { result = completion.toString() }
-  }
-
-  private class ConditionalCompletionSplitKind_ extends SplitKind, TConditionalCompletionSplitKind {
-    override int getListOrder() { result = 0 }
-
-    override predicate isEnabled(AstNode n) { this.appliesTo(n) }
-
-    override string toString() { result = "ConditionalCompletion" }
-  }
-
-  module ConditionalCompletionSplittingInput {
-    private import Completion as Comp
-
-    class ConditionalCompletion = Comp::ConditionalCompletion;
-
-    class ConditionalCompletionSplitKind extends ConditionalCompletionSplitKind_, TSplitKind { }
-
-    class ConditionalCompletionSplit = ConditionalCompletionSplitting::ConditionalCompletionSplit;
-
-    bindingset[parent, parentCompletion]
-    predicate condPropagateExpr(
-      AstNode parent, ConditionalCompletion parentCompletion, AstNode child,
-      ConditionalCompletion childCompletion
-    ) {
-      child = parent.(Ast::NotExpr).getOperand() and
-      childCompletion.(BooleanCompletion).getDual() = parentCompletion
-      or
-      childCompletion = parentCompletion and
-      (
-        child = parent.(Ast::LogicalAndExpr).getAnOperand()
-        or
-        child = parent.(Ast::LogicalOrExpr).getAnOperand()
-        or
-        child = parent.(Ast::StmtSequence).getLastStmt()
-        or
-        child = parent.(Ast::ConditionalExpr).getBranch(_)
-      )
-    }
-  }
-
-  int getNextListOrder() { result = 1 }
-
-  private class ConditionalCompletionSplitImpl extends SplitImplementations::ConditionalCompletionSplitting::ConditionalCompletionSplitImpl
-  {
-    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
-      super.hasEntry(pred, succ, c)
-      or
-      // a non-standard case is needed for `when` clauses
-      succ(pred, succ, c) and
-      succ instanceof Ast::WhenClause and
-      c = this.getCompletion()
-    }
-  }
-}
-
-class ConditionalCompletionSplit = ConditionalCompletionSplitting::ConditionalCompletionSplit;
-
-module EnsureSplitting {
-  /**
-   * The type of a split `ensure` node.
-   *
-   * The type represents one of the possible ways of entering an `ensure`
-   * block. For example, if a block ends with a `return` statement, then
-   * the `ensure` block must end with a `return` as well (provided that
-   * the `ensure` block executes normally).
-   */
-  class EnsureSplitType extends SuccessorType {
-    EnsureSplitType() { not this instanceof ConditionalSuccessor }
-
-    /** Holds if this split type matches entry into an `ensure` block with completion `c`. */
-    predicate isSplitForEntryCompletion(Completion c) {
-      if c instanceof NormalCompletion
-      then
-        // If the entry into the `ensure` block completes with any normal completion,
-        // it simply means normal execution after the `ensure` block
-        this instanceof DirectSuccessor
-      else this = c.getAMatchingSuccessorType()
-    }
-  }
-
-  /** A node that belongs to an `ensure` block. */
-  private class EnsureNode extends AstNode {
-    private Trees::BodyStmtTree block;
-
-    EnsureNode() { this = block.getAnEnsureDescendant() }
-
-    int getNestLevel() { result = block.getNestLevel() }
-
-    /** Holds if this node is the entry node in the `ensure` block it belongs to. */
-    predicate isEntryNode() { first(block.getEnsure(), this) }
-
-    Ast::BodyStmt getBlock() { result = block }
-
-    pragma[noinline]
-    predicate isEntered(AstNode pred, int nestLevel, Completion c) {
-      this.isEntryNode() and
-      nestLevel = this.getNestLevel() and
-      succ(pred, this, c) and
-      // the entry node may be reachable via a backwards loop edge; in this case
-      // the split has already been entered
-      not pred = block.getAnEnsureDescendant()
-    }
-  }
-
-  /**
-   * A split for nodes belonging to an `ensure` block, which determines how to
-   * continue execution after leaving the `ensure` block. For example, in
-   *
-   * ```rb
-   * begin
-   *   if x
-   *     raise "Exception"
-   *   end
-   * ensure
-   *   puts "Ensure"
-   * end
-   * ```
-   *
-   * all control flow nodes in the `ensure` block have two splits: one representing
-   * normal execution of the body (when `x` evaluates to `true`), and one representing
-   * exceptional execution of the body (when `x` evaluates to `false`).
-   */
-  class EnsureSplit extends Split, TEnsureSplit {
-    private EnsureSplitType type;
-    private int nestLevel;
-
-    EnsureSplit() { this = TEnsureSplit(type, nestLevel) }
-
-    /**
-     * Gets the type of this `ensure` split, that is, how to continue execution after the
-     * `ensure` block.
-     */
-    EnsureSplitType getType() { result = type }
-
-    /** Gets the nesting level. */
-    int getNestLevel() { result = nestLevel }
-
-    override string toString() {
-      if type instanceof DirectSuccessor
-      then result = ""
-      else
-        if nestLevel > 0
-        then result = "ensure(" + nestLevel + "): " + type.toString()
-        else result = "ensure: " + type.toString()
-    }
-  }
-
-  private int getListOrder(EnsureSplitKind kind) {
-    result = ConditionalCompletionSplitting::getNextListOrder() + kind.getNestLevel()
-  }
-
-  int getNextListOrder() {
-    result = max([getListOrder(_) + 1, ConditionalCompletionSplitting::getNextListOrder()])
-  }
-
-  private class EnsureSplitKind extends SplitKind, TEnsureSplitKind {
-    private int nestLevel;
-
-    EnsureSplitKind() { this = TEnsureSplitKind(nestLevel) }
-
-    /** Gets the nesting level. */
-    int getNestLevel() { result = nestLevel }
-
-    override int getListOrder() { result = getListOrder(this) }
-
-    override string toString() { result = "ensure (" + nestLevel + ")" }
-  }
-
-  private class EnsureSplitImpl extends SplitImpl instanceof EnsureSplit {
-    override EnsureSplitKind getKind() { result.getNestLevel() = super.getNestLevel() }
-
-    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
-      succ.(EnsureNode).isEntered(pred, super.getNestLevel(), c) and
-      super.getType().isSplitForEntryCompletion(c)
-    }
-
-    override predicate hasEntryScope(CfgScope scope, AstNode first) { none() }
-
-    /**
-     * Holds if this split applies to `pred`, where `pred` is a valid predecessor.
-     */
-    private predicate appliesToPredecessor(AstNode pred) {
-      this.appliesTo(pred) and
-      (succ(pred, _, _) or succExit(_, pred, _))
-    }
-
-    pragma[noinline]
-    private predicate exit0(AstNode pred, Trees::BodyStmtTree block, int nestLevel, Completion c) {
-      this.appliesToPredecessor(pred) and
-      nestLevel = block.getNestLevel() and
-      block.last(pred, c)
-    }
-
-    /**
-     * Holds if `pred` may exit this split with completion `c`. The Boolean
-     * `inherited` indicates whether `c` is an inherited completion from the
-     * body.
-     */
-    private predicate exit(AstNode pred, Completion c, boolean inherited) {
-      exists(Trees::BodyStmtTree block, EnsureSplitType type |
-        this.exit0(pred, block, super.getNestLevel(), c) and
-        type = super.getType()
-      |
-        if last(block.getEnsure(), pred, c)
-        then
-          // `ensure` block can itself exit with completion `c`: either `c` must
-          // match this split, `c` must be an abnormal completion, or this split
-          // does not require another completion to be recovered
-          inherited = false and
-          (
-            type = c.getAMatchingSuccessorType()
-            or
-            not c instanceof NormalCompletion
-            or
-            type instanceof DirectSuccessor
-          )
-        else (
-          // `ensure` block can exit with inherited completion `c`, which must
-          // match this split
-          inherited = true and
-          type = c.getAMatchingSuccessorType() and
-          not type instanceof DirectSuccessor
-        )
-      )
-      or
-      // If this split is normal, and an outer split can exit based on an inherited
-      // completion, we need to exit this split as well. For example, in
-      //
-      // ```rb
-      // def m(b1, b2)
-      //   if b1
-      //     return
-      //   end
-      // ensure
-      //   begin
-      //     if b2
-      //       raise "Exception"
-      //     end
-      //   ensure
-      //     puts "inner ensure"
-      //   end
-      // end
-      // ```
-      //
-      // if the outer split for `puts "inner ensure"` is `return` and the inner split
-      // is "normal" (corresponding to `b1 = true` and `b2 = false`), then the inner
-      // split must be able to exit with a `return` completion.
-      this.appliesToPredecessor(pred) and
-      exists(EnsureSplitImpl outer |
-        outer.(EnsureSplit).getNestLevel() = super.getNestLevel() - 1 and
-        outer.exit(pred, c, inherited) and
-        super.getType() instanceof DirectSuccessor and
-        inherited = true
-      )
-    }
-
-    override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
-      succ(pred, succ, c) and
-      (
-        this.exit(pred, c, _)
-        or
-        this.exit(pred, c.(NestedBreakCompletion).getAnInnerCompatibleCompletion(), _)
-      )
-    }
-
-    override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
-      succExit(scope, last, c) and
-      (
-        this.exit(last, c, _)
-        or
-        this.exit(last, c.(NestedBreakCompletion).getAnInnerCompatibleCompletion(), _)
-      )
-    }
-
-    override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) {
-      this.appliesToPredecessor(pred) and
-      succ(pred, succ, c) and
-      succ =
-        any(EnsureNode en |
-          if en.isEntryNode() and en.getBlock() != pred.(EnsureNode).getBlock()
-          then
-            // entering a nested `ensure` block
-            en.getNestLevel() > super.getNestLevel()
-          else
-            // staying in the same (possibly nested) `ensure` block as `pred`
-            en.getNestLevel() >= super.getNestLevel()
-        )
-    }
-  }
-}
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/FlowSummary.qll b/ruby/ql/lib/codeql/ruby/dataflow/FlowSummary.qll
index 3ec9a9d87dc5..2a24b9edad0b 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/FlowSummary.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/FlowSummary.qll
@@ -106,10 +106,10 @@ private module LibraryCallbackSummaries {
     LibraryLambdaMethod() { this = "<library method accepting a callback>" }
 
     final override MethodCall getACall() {
-      libraryCall(result.getAControlFlowNode()) and
+      libraryCall(result.getControlFlowNode()) and
       result.hasBlock()
       or
-      libraryCallHasLambdaArg(result.getAControlFlowNode(), _)
+      libraryCallHasLambdaArg(result.getControlFlowNode(), _)
     }
 
     override predicate propagatesFlow(
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/SSA.qll b/ruby/ql/lib/codeql/ruby/dataflow/SSA.qll
index 08ca08732b6b..d95740a8c867 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/SSA.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/SSA.qll
@@ -384,20 +384,7 @@ module Ssa {
       inp = SsaImpl::phiHasInputFromBlock(this, bb)
     }
 
-    private string getSplitString() {
-      result = this.getBasicBlock().getFirstNode().(CfgNodes::AstCfgNode).getSplitsString()
-    }
-
-    override string toString() {
-      exists(string prefix |
-        prefix = "[" + this.getSplitString() + "] "
-        or
-        not exists(this.getSplitString()) and
-        prefix = ""
-      |
-        result = prefix + "phi"
-      )
-    }
+    override string toString() { result = "phi" }
 
     /*
      * The location of a phi node is the same as the location of the first node
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll
index 3c647f41bbbe..184efdc31b3e 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll
@@ -183,7 +183,7 @@ class NormalCall extends DataFlowCall, TNormalCall {
 
   override CfgNodes::ExprNodes::CallCfgNode asCall() { result = c }
 
-  override DataFlowCallable getEnclosingCallable() { result = TCfgScope(c.getScope()) }
+  override DataFlowCallable getEnclosingCallable() { result = TCfgScope(c.getEnclosingCallable()) }
 
   override string toString() { result = c.toString() }
 
@@ -692,6 +692,9 @@ private CfgScope getTargetInstance(DataFlowCall call, string method) {
   )
 }
 
+pragma[nomagic]
+private File callGetFile(DataFlowCall call) { result = call.asCall().getLocation().getFile() }
+
 bindingset[call, result]
 pragma[inline_late]
 private CfgScope privateFilter(DataFlowCall call) {
@@ -700,7 +703,7 @@ private CfgScope privateFilter(DataFlowCall call) {
   // This may remove some plausible targets, but also removes a lot of
   // implausible targets
   (
-    isToplevelMethodInFile(result, call.asCall().getFile()) or
+    isToplevelMethodInFile(result, callGetFile(call)) or
     not isToplevelMethodInFile(result, _)
   )
 }
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
index 9f3042ebb5b7..10dab22ca193 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
@@ -95,7 +95,7 @@ CfgNodes::ExprCfgNode getPostUpdateReverseStep(CfgNodes::ExprCfgNode e) {
 pragma[nomagic]
 Ssa::Definition getParameterDef(NamedParameter p) {
   exists(BasicBlock bb, int i |
-    bb.getNode(i).getAstNode() = p.getDefiningAccess() and
+    bb.getNode(i).injects(p.getDefiningAccess()) and
     result.definesAt(_, bb, i)
   )
 }
@@ -159,7 +159,7 @@ module LocalFlow {
       exprTo = nodeTo.asExpr() and
       n.getReturningNode().getAstNode() instanceof BreakStmt and
       exprTo.getAstNode() instanceof Loop and
-      nodeTo.asExpr().getAPredecessor(any(BreakSuccessor s)) = n.getReturningNode()
+      n.getReturningNode().getASuccessor(any(BreakSuccessor s)).getAstNode() = exprTo.getAstNode()
     )
     or
     nodeFrom.asExpr() = nodeTo.(ReturningStatementNode).getReturningNode().getReturnedValueNode()
@@ -198,7 +198,7 @@ module LocalFlow {
     FlowSummaryNode nodeFrom, FlowSummaryNode nodeTo, FlowSummaryImpl::Public::SummarizedCallable c,
     string model
   ) {
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo.getSummaryNode(), true, model) and
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, true, model) and
     c = nodeFrom.getSummarizedCallable()
   }
 
@@ -285,7 +285,6 @@ predicate isNonConstantExpr(CfgNodes::ExprCfgNode n) {
 /** Provides logic related to captured variables. */
 module VariableCapture {
   private import codeql.dataflow.VariableCapture as Shared
-  private import codeql.ruby.controlflow.BasicBlocks as BasicBlocks
 
   private predicate closureFlowStep(CfgNodes::ExprCfgNode e1, CfgNodes::ExprCfgNode e2) {
     e1 = getALastEvalNode(e2)
@@ -296,13 +295,11 @@ module VariableCapture {
     )
   }
 
-  private module CaptureInput implements Shared::InputSig<Location, BasicBlocks::Cfg::BasicBlock> {
+  private module CaptureInput implements Shared::InputSig<Location, BasicBlock> {
     private import codeql.ruby.controlflow.ControlFlowGraph as Cfg
     private import TaintTrackingPrivate as TaintTrackingPrivate
 
-    Callable basicBlockGetEnclosingCallable(BasicBlocks::Cfg::BasicBlock bb) {
-      result = bb.getScope()
-    }
+    Callable basicBlockGetEnclosingCallable(BasicBlock bb) { result = bb.getScope() }
 
     class CapturedVariable extends LocalVariable {
       CapturedVariable() {
@@ -374,7 +371,7 @@ module VariableCapture {
 
   class ClosureExpr = CaptureInput::ClosureExpr;
 
-  module Flow = Shared::Flow<Location, BasicBlocks::Cfg, CaptureInput>;
+  module Flow = Shared::Flow<Location, Cfg, CaptureInput>;
 
   private Flow::ClosureNode asClosureNode(Node n) {
     result = n.(CaptureNode).getSynthesizedCaptureNode()
@@ -676,26 +673,28 @@ private module Cached {
     )
   }
 
+  private predicate fieldName(string name) {
+    name = any(InstanceVariable v).getName()
+    or
+    name = "@" + any(SetterMethodCall c).getTargetName()
+    or
+    // The following equation unfortunately leads to a non-monotonic recursion error:
+    //    name = any(AccessPathToken a).getAnArgument("Field")
+    // Therefore, we use the following instead to extract the field names from the
+    // external model data. This, unfortunately, does not included any field names used
+    // in models defined in QL code.
+    exists(string input, string output |
+      ModelOutput::relevantSummaryModel(_, _, input, output, _, _)
+    |
+      name = [input, output].regexpFind("(?<=(^|\\.)Field\\[)[^\\]]+(?=\\])", _, _).trim()
+    )
+  }
+
   cached
   newtype TContent =
     TKnownElementContent(ConstantValue cv) { trackKnownValue(cv) } or
     TUnknownElementContent() or
-    TFieldContent(string name) {
-      name = any(InstanceVariable v).getName()
-      or
-      name = "@" + any(SetterMethodCall c).getTargetName()
-      or
-      // The following equation unfortunately leads to a non-monotonic recursion error:
-      //    name = any(AccessPathToken a).getAnArgument("Field")
-      // Therefore, we use the following instead to extract the field names from the
-      // external model data. This, unfortunately, does not included any field names used
-      // in models defined in QL code.
-      exists(string input, string output |
-        ModelOutput::relevantSummaryModel(_, _, input, output, _, _)
-      |
-        name = [input, output].regexpFind("(?<=(^|\\.)Field\\[)[^\\]]+(?=\\])", _, _).trim()
-      )
-    } or
+    TFieldContent(string name) { fieldName(name) } or
     deprecated TSplatContent(int i, Boolean shifted) { i in [0 .. 10] } or
     deprecated THashSplatContent(ConstantValue::ConstantSymbolValue cv) or
     TCapturedVariableContent(VariableCapture::CapturedVariable v) or
@@ -716,12 +715,20 @@ private module Cached {
     )
   }
 
+  cached
+  int fieldNameBucket(string name) {
+    exists(int r | name = rank[r](string n | fieldName(n)) and result = r % 30)
+  }
+
   cached
   newtype TContentApprox =
     TUnknownElementContentApprox() or
     TKnownIntegerElementContentApprox() or
     TKnownElementContentApprox(string approx) { approx = approxKnownElementIndex(_) } or
-    TNonElementContentApprox(Content c) { not c instanceof Content::ElementContent } or
+    TFieldContentApprox(int bucket) { bucket = fieldNameBucket(_) } or
+    TNonElementContentApprox(Content c) {
+      not c instanceof Content::ElementContent and not c instanceof Content::FieldContent
+    } or
     TCapturedVariableContentApprox(VariableCapture::CapturedVariable v)
 
   cached
@@ -854,7 +861,7 @@ class ReturningStatementNode extends NodeImpl, TReturningNode {
   /** Gets the expression corresponding to this node. */
   CfgNodes::ReturningCfgNode getReturningNode() { result = n }
 
-  override CfgScope getCfgScopeImpl() { result = n.getScope() }
+  override CfgScope getCfgScopeImpl() { result = n.getEnclosingCallable() }
 
   override Location getLocationImpl() { result = n.getLocation() }
 
@@ -1286,10 +1293,10 @@ class FlowSummaryNode extends NodeImpl, TFlowSummaryNode {
   override CfgScope getCfgScopeImpl() { none() }
 
   override DataFlowCallable getEnclosingCallable() {
-    result.asLibraryCallable() = this.getSummarizedCallable()
+    result = this.getSummaryNode().getEnclosingCallable()
   }
 
-  override EmptyLocation getLocationImpl() { any() }
+  override Location getLocationImpl() { result = this.getSummaryNode().getLocation() }
 
   override string toStringImpl() { result = this.getSummaryNode().toString() }
 }
@@ -1354,7 +1361,7 @@ module ArgumentNodes {
       this.sourceArgumentOf(call.asCall(), pos)
     }
 
-    override CfgScope getCfgScopeImpl() { result = yield.getScope() }
+    override CfgScope getCfgScopeImpl() { result = yield.getEnclosingCallable() }
 
     override Location getLocationImpl() { result = yield.getLocation() }
   }
@@ -1384,7 +1391,7 @@ module ArgumentNodes {
       this.sourceArgumentOf(call.asCall(), pos)
     }
 
-    override CfgScope getCfgScopeImpl() { result = sup.getScope() }
+    override CfgScope getCfgScopeImpl() { result = sup.getEnclosingCallable() }
 
     override Location getLocationImpl() { result = sup.getLocation() }
   }
@@ -1607,7 +1614,7 @@ private module ReturnNodes {
   private predicate isValid(CfgNodes::ReturningCfgNode node) {
     exists(ReturningStmt stmt, Callable scope |
       stmt = node.getAstNode() and
-      scope = node.getScope()
+      scope = node.getEnclosingCallable()
     |
       stmt instanceof ReturnStmt and
       (scope instanceof Method or scope instanceof SingletonMethod or scope instanceof Lambda)
@@ -1627,8 +1634,8 @@ private module ReturnNodes {
   class ExplicitReturnNode extends SourceReturnNode, ReturningStatementNode {
     ExplicitReturnNode() {
       isValid(n) and
-      n.getASuccessor().(CfgNodes::AnnotatedExitNode).isNormal() and
-      n.getScope() instanceof Callable
+      n.getASuccessor() instanceof ControlFlow::NormalExitNode and
+      n.getEnclosingCallable() instanceof Callable
     }
 
     override ReturnKind getKindSource() {
@@ -1643,16 +1650,24 @@ private module ReturnNodes {
     }
   }
 
-  pragma[noinline]
-  private AstNode implicitReturn(Callable c, ExprNode n) {
-    exists(CfgNodes::ExprCfgNode en |
-      en = n.getExprNode() and
-      en.getASuccessor().(CfgNodes::AnnotatedExitNode).isNormal() and
-      n.(NodeImpl).getCfgScope() = c and
-      result = en.getExpr()
-    )
+  private AstNode desugar(AstNode n) {
+    result = n.getDesugared()
     or
-    result = implicitReturn(c, n).getParent()
+    not exists(n.getDesugared()) and
+    result = n
+  }
+
+  private Expr getLast(StmtSequence s) {
+    result = getLast(s.(BodyStmt).getElse())
+    or
+    result = getLast(s.(BodyStmt).getARescue().getBody())
+    or
+    not exists(s.(BodyStmt).getElse()) and
+    exists(Stmt last | last = s.getLastStmt() |
+      result = getLast(last)
+      or
+      result = last and not last instanceof StmtSequence
+    )
   }
 
   /**
@@ -1661,7 +1676,7 @@ private module ReturnNodes {
    * last thing that is evaluated in the body of the callable.
    */
   class ExprReturnNode extends SourceReturnNode, ExprNode {
-    ExprReturnNode() { exists(Callable c | implicitReturn(c, this) = c.getBody().getAStmt()) }
+    ExprReturnNode() { this.getExprNode().getExpr() = desugar(getLast(any(Callable c).getBody())) }
 
     override ReturnKind getKindSource() {
       exists(CfgScope scope | scope = this.(NodeImpl).getCfgScope() |
@@ -1760,8 +1775,7 @@ import OutNodes
 predicate jumpStep(Node pred, Node succ) {
   succ.asExpr().getExpr().(ConstantReadAccess).getValue() = pred.asExpr().getExpr()
   or
-  FlowSummaryImpl::Private::Steps::summaryJumpStep(pred.(FlowSummaryNode).getSummaryNode(),
-    succ.(FlowSummaryNode).getSummaryNode())
+  FlowSummaryImpl::Private::Steps::summaryJumpStep(pred, succ)
   or
   any(AdditionalJumpStep s).step(pred, succ)
   or
@@ -2268,6 +2282,10 @@ class ContentApprox extends TContentApprox {
       result = "approximated element " + approx
     )
     or
+    exists(int bucket |
+      this = TFieldContentApprox(bucket) and result = "field bucket " + bucket.toString()
+    )
+    or
     exists(Content c |
       this = TNonElementContentApprox(c) and
       result = c.toString()
@@ -2307,6 +2325,8 @@ ContentApprox getContentApprox(Content c) {
   result =
     TKnownElementContentApprox(approxKnownElementIndex(c.(Content::KnownElementContent).getIndex()))
   or
+  result = TFieldContentApprox(fieldNameBucket(c.(Content::FieldContent).getName()))
+  or
   result = TNonElementContentApprox(c)
 }
 
@@ -2391,9 +2411,7 @@ module TypeInference {
   private predicate hasTypeCheckedRead(
     Ssa::Definition def, CfgNodes::ExprCfgNode caseRead, CfgNodes::ExprCfgNode read, Module m
   ) {
-    exists(
-      CfgNodes::ExprCfgNode pattern, ConditionBlock cb, CfgNodes::ExprNodes::CaseExprCfgNode case
-    |
+    exists(CfgNodes::ExprCfgNode pattern, BasicBlock cb, CfgNodes::ExprNodes::CaseExprCfgNode case |
       m = resolveConstantReadAccess(pattern.getExpr()) and
       cb.getLastNode() = pattern and
       cb.edgeDominates(read.getBasicBlock(), any(MatchingSuccessor match | match.getValue() = true)) and
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll
index d94bba89bf5a..ede0e898bcb3 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll
@@ -12,16 +12,24 @@ private import DataFlowImplSpecific::Public
 module Input implements InputSig<Location, DataFlowImplSpecific::RubyDataFlow> {
   private import codeql.util.Void
 
-  class SummarizedCallableBase = string;
+  class SummarizedCallableBase extends string {
+    bindingset[this]
+    SummarizedCallableBase() { exists(this) }
 
-  class SourceBase = Void;
-
-  class SinkBase = Void;
+    bindingset[this]
+    Location getLocation() { result instanceof EmptyLocation }
+  }
 
-  class FlowSummaryCallBase = Void;
+  class FlowSummaryCallBase extends Void {
+    Location getLocation() { none() }
+  }
 
   predicate callableFromSource(SummarizedCallableBase c) { none() }
 
+  DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
+    result.asLibraryCallable() = c
+  }
+
   ArgumentPosition callbackSelfParameterPosition() { result.isLambdaSelf() }
 
   ReturnKind getStandardReturnValueKind() { result instanceof NormalReturnKind }
@@ -158,28 +166,35 @@ module Input implements InputSig<Location, DataFlowImplSpecific::RubyDataFlow> {
 
 private import Make<Location, DataFlowImplSpecific::RubyDataFlow, Input> as Impl
 
-private module StepsInput implements Impl::Private::StepsInputSig {
-  Impl::Private::SummaryNode getSummaryNode(Node n) {
-    result = n.(FlowSummaryNode).getSummaryNode()
+private module Input2 implements Impl::Private::InputSig2 {
+  private import codeql.util.Void
+
+  class SourceSinkReportingElement extends Void {
+    Location getLocation() { none() }
+
+    DataFlowCallable getEnclosingCallable() { none() }
+
+    SourceSinkReportingElement getASuccessor(Impl::Private::SummaryComponent sc) { none() }
   }
+}
+
+private import Impl::Private::Make2<Input2> as Impl2
+
+private module StepsInput implements Impl2::StepsInputSig {
+  Impl2::SummaryNode getSummaryNode(Node n) { result = n.(FlowSummaryNode).getSummaryNode() }
 
   DataFlowCall getACall(Public::SummarizedCallable sc) {
     result.asCall().getAstNode() = sc.(LibraryCallable).getACall()
     or
     result.asCall().getAstNode() = sc.(LibraryCallable).getACallSimple()
   }
-
-  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
-
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
-
-  Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
 
 module Private {
   import Impl::Private
+  import Impl2
 
-  module Steps = Impl::Private::Steps<StepsInput>;
+  module Steps = Impl2::Steps<StepsInput>;
 
   /**
    * Provides predicates for constructing summary components.
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
index 74394150ca32..9f5dfd9dcc25 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
@@ -4,13 +4,11 @@ module;
 private import codeql.ssa.Ssa as SsaImplCommon
 private import codeql.ruby.AST
 private import codeql.ruby.CFG as Cfg
-private import codeql.ruby.controlflow.BasicBlocks as BasicBlocks
-private import codeql.ruby.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraphImpl
 private import codeql.ruby.dataflow.SSA
 private import codeql.ruby.ast.Variable
 private import Cfg::CfgNodes::ExprNodes
 
-private class BasicBlock = BasicBlocks::Cfg::BasicBlock;
+private class BasicBlock = Cfg::BasicBlock;
 
 module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlock> {
   private import codeql.ruby.controlflow.ControlFlowGraph as Cfg
@@ -25,11 +23,11 @@ module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlock> {
     (
       exists(Scope scope | scope = v.(SelfVariable).getDeclaringScope() |
         // We consider the `self` variable to have a single write at the entry to a method block...
-        scope = bb.(BasicBlocks::EntryBasicBlock).getScope() and
+        scope = bb.(Cfg::EntryBasicBlock).getScope() and
         i = 0
         or
         // ...or a class or module block.
-        bb.getNode(i).getAstNode() = scope.(ModuleBase).getAControlFlowEntryNode() and
+        bb.getNode(i).isBefore(scope.(ModuleBase)) and
         not scope instanceof Toplevel // handled by case above
       )
       or
@@ -60,7 +58,7 @@ module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlock> {
   }
 }
 
-import SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput> as Impl
+import SsaImplCommon::Make<Location, Cfg::Cfg, SsaInput> as Impl
 
 class Definition = Impl::Definition;
 
@@ -98,12 +96,17 @@ private predicate writesCapturedVariable(Cfg::BasicBlock bb, LocalVariable v) {
   )
 }
 
+private predicate isAnnotatedExitBlock(BasicBlock bb) {
+  bb.getANode() instanceof Cfg::ControlFlow::AnnotatedExitNode
+}
+
 /**
  * Holds if a pseudo read of captured variable `v` should be inserted
  * at index `i` in exit block `bb`.
  */
-private predicate capturedExitRead(Cfg::AnnotatedExitBasicBlock bb, int i, LocalVariable v) {
+private predicate capturedExitRead(BasicBlock bb, int i, LocalVariable v) {
   writesCapturedVariable(bb.getAPredecessor*(), v) and
+  isAnnotatedExitBlock(bb) and
   i = bb.length()
 }
 
@@ -112,13 +115,11 @@ private predicate capturedExitRead(Cfg::AnnotatedExitBasicBlock bb, int i, Local
  * at index `i` in basic block `bb`. We do this to ensure that namespace
  * self-variables always get an SSA definition.
  */
-private predicate namespaceSelfExitRead(Cfg::AnnotatedExitBasicBlock bb, int i, SelfVariable v) {
-  exists(Namespace ns, AstNode last |
+private predicate namespaceSelfExitRead(BasicBlock bb, int i, SelfVariable v) {
+  exists(Namespace ns, Cfg::ControlFlowNode n |
     v.getDeclaringScope() = ns and
-    last = ControlFlowGraphImpl::getAControlFlowExitNode(ns) and
-    if last = ns
-    then bb.getNode(i).getAPredecessor().getAstNode() = last
-    else bb.getNode(i).getAstNode() = last
+    n.isAfter(ns) and
+    if n.isBefore(ns) then bb.getNode(i - 1) = n else bb.getNode(i) = n
   )
 }
 
@@ -129,7 +130,8 @@ private predicate namespaceSelfExitRead(Cfg::AnnotatedExitBasicBlock bb, int i,
 pragma[noinline]
 private predicate hasCapturedRead(Variable v, Cfg::CfgScope scope) {
   any(LocalVariableReadAccessCfgNode read |
-    read.getVariable() = v and scope = read.getScope().getOuterCfgScope*()
+    read.getVariable() = v and
+    scope = read.getEnclosingCallable().(Cfg::CfgScope).getOuterCfgScope*()
   ).getExpr().isCapturedAccess()
 }
 
@@ -177,7 +179,7 @@ private predicate capturedCallRead(CallCfgNode call, Cfg::BasicBlock bb, int i,
 private predicate variableReadActual(Cfg::BasicBlock bb, int i, LocalVariable v) {
   exists(VariableReadAccess read |
     read.getVariable() = v and
-    read = bb.getNode(i).getAstNode()
+    bb.getNode(i).injects(read)
   )
 }
 
@@ -188,7 +190,8 @@ private predicate variableReadActual(Cfg::BasicBlock bb, int i, LocalVariable v)
 pragma[noinline]
 private predicate hasCapturedWrite(Variable v, Cfg::CfgScope scope) {
   any(LocalVariableWriteAccessCfgNode write |
-    write.getVariable() = v and scope = write.getScope().getOuterCfgScope*()
+    write.getVariable() = v and
+    scope = write.getEnclosingCallable().(Cfg::CfgScope).getOuterCfgScope*()
   ).getExpr().isCapturedAccess()
 }
 
@@ -393,7 +396,7 @@ class NormalParameter extends Parameter {
 pragma[nomagic]
 Definition getParameterDef(NamedParameter p) {
   exists(Cfg::BasicBlock bb, int i |
-    bb.getNode(i).getAstNode() = p.getDefiningAccess() and
+    bb.getNode(i).injects(p.getDefiningAccess()) and
     result.definesAt(_, bb, i)
   )
 }
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll
index a41f7c924820..c1675cd43d4c 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll
@@ -109,8 +109,7 @@ private module Cached {
     ) and
     model = ""
     or
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-      nodeTo.(FlowSummaryNode).getSummaryNode(), false, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, false, model)
     or
     any(FlowSteps::AdditionalTaintStep s).step(nodeFrom, nodeTo) and model = "AdditionalTaintStep"
     or
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Gemfile.qll b/ruby/ql/lib/codeql/ruby/frameworks/Gemfile.qll
index 83ebc27100a8..14153f8b16aa 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/Gemfile.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/Gemfile.qll
@@ -3,6 +3,7 @@
  */
 
 private import codeql.ruby.AST
+private import codeql.util.SemVer
 
 /**
  * Provides classes and predicates for Gemfiles, including version constraint logic.
@@ -138,7 +139,7 @@ module Gemfile {
       exists(int thisMajor, int thisMinor, int otherMajor, int otherMinor |
         thisMajor = this.getVersion().getMajor() and
         thisMinor = this.getVersion().getMinor() and
-        exists(string maj, string mi | normalizeSemver(other, _, maj, mi, _) |
+        exists(string maj, string mi | exists(padSemVer(other, maj, mi, _)) |
           otherMajor = maj.toInt() and otherMinor = mi.toInt()
         )
       |
@@ -171,26 +172,26 @@ module Gemfile {
 
     Version() {
       this = any(Gem c).getAVersionConstraint().getVersionString() and
-      normalized = normalizeSemver(this)
+      normalized = padSemVer(this)
     }
 
     /**
      * Holds if this version is strictly before the version defined by `other`.
      */
     bindingset[other]
-    predicate before(string other) { normalized < normalizeSemver(other) }
+    predicate before(string other) { normalized < padSemVer(other) }
 
     /**
      * Holds if this versino is equal to the version defined by `other`.
      */
     bindingset[other]
-    predicate equal(string other) { normalized = normalizeSemver(other) }
+    predicate equal(string other) { normalized = padSemVer(other) }
 
     /**
      * Holds if this version is strictly after the version defined by `other`.
      */
     bindingset[other]
-    predicate after(string other) { normalized > normalizeSemver(other) }
+    predicate after(string other) { normalized > padSemVer(other) }
 
     /**
      * Holds if this version defines a patch number.
@@ -212,43 +213,4 @@ module Gemfile {
      */
     int getPatch() { result = getPatch(normalized).toInt() }
   }
-
-  /**
-   * Normalizes a SemVer string such that the lexicographical ordering
-   * of two normalized strings is consistent with the SemVer ordering.
-   *
-   * Pre-release information and build metadata is not supported.
-   */
-  bindingset[orig]
-  private predicate normalizeSemver(
-    string orig, string normalized, string major, string minor, string patch
-  ) {
-    major = getMajor(orig) and
-    (
-      minor = getMinor(orig)
-      or
-      not exists(getMinor(orig)) and minor = "0"
-    ) and
-    (
-      patch = getPatch(orig)
-      or
-      not exists(getPatch(orig)) and patch = "0"
-    ) and
-    normalized = leftPad(major) + "." + leftPad(minor) + "." + leftPad(patch)
-  }
-
-  bindingset[orig]
-  private string normalizeSemver(string orig) { normalizeSemver(orig, result, _, _, _) }
-
-  bindingset[s]
-  private string getMajor(string s) { result = s.regexpCapture("(\\d+).*", 1) }
-
-  bindingset[s]
-  private string getMinor(string s) { result = s.regexpCapture("(\\d+)\\.(\\d+).*", 2) }
-
-  bindingset[s]
-  private string getPatch(string s) { result = s.regexpCapture("(\\d+)\\.(\\d+)\\.(\\d+).*", 3) }
-
-  bindingset[str]
-  private string leftPad(string str) { result = ("000" + str).suffix(str.length()) }
 }
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Grape.qll b/ruby/ql/lib/codeql/ruby/frameworks/Grape.qll
index 9b7ae6185cdb..ec14fe0475a6 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/Grape.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/Grape.qll
@@ -206,6 +206,145 @@ module Grape {
     }
   }
 
+  /**
+   * Gets an API node for the `request` object accessible within a Grape API endpoint.
+   */
+  private API::Node grapeRequestInstance() { result = grapeApiInstance().getReturn("request") }
+
+  /**
+   * A call to `request.body.read` from within a Grape API endpoint, which reads
+   * the raw, unparsed request body and can contain user input.
+   */
+  class GrapeRequestBodyReadSource extends Http::Server::RequestInputAccess::Range {
+    GrapeRequestBodyReadSource() {
+      this.asExpr().getExpr() =
+        grapeRequestInstance().getReturn("body").getAMethodCall("read").asExpr().getExpr()
+    }
+
+    override string getSourceType() { result = "Grape::Request#body.read" }
+
+    override Http::Server::RequestInputKind getKind() { result = Http::Server::bodyInputKind() }
+  }
+
+  /**
+   * A call to `request.body.string` from within a Grape API endpoint, which reads
+   * the raw, unparsed request body and can contain user input.
+   */
+  class GrapeRequestBodyStringSource extends Http::Server::RequestInputAccess::Range {
+    GrapeRequestBodyStringSource() {
+      this.asExpr().getExpr() =
+        grapeRequestInstance().getReturn("body").getAMethodCall("string").asExpr().getExpr()
+    }
+
+    override string getSourceType() { result = "Grape::Request#body.string" }
+
+    override Http::Server::RequestInputKind getKind() { result = Http::Server::bodyInputKind() }
+  }
+
+  /**
+   * A call to `request.params` from within a Grape API endpoint.
+   */
+  class GrapeRequestParamsSource extends Http::Server::RequestInputAccess::Range {
+    GrapeRequestParamsSource() {
+      this.asExpr().getExpr() = grapeRequestInstance().getAMethodCall("params").asExpr().getExpr()
+    }
+
+    override string getSourceType() { result = "Grape::Request#params" }
+
+    override Http::Server::RequestInputKind getKind() {
+      result = Http::Server::parameterInputKind()
+    }
+  }
+
+  /**
+   * A call to `request.GET` from within a Grape API endpoint, which returns the
+   * parsed query-string parameters.
+   */
+  class GrapeRequestGetSource extends Http::Server::RequestInputAccess::Range {
+    GrapeRequestGetSource() {
+      this.asExpr().getExpr() = grapeRequestInstance().getAMethodCall("GET").asExpr().getExpr()
+    }
+
+    override string getSourceType() { result = "Grape::Request#GET" }
+
+    override Http::Server::RequestInputKind getKind() {
+      result = Http::Server::parameterInputKind()
+    }
+  }
+
+  /**
+   * A call to `request.POST` from within a Grape API endpoint, which returns the
+   * parsed form/body parameters.
+   */
+  class GrapeRequestPostSource extends Http::Server::RequestInputAccess::Range {
+    GrapeRequestPostSource() {
+      this.asExpr().getExpr() = grapeRequestInstance().getAMethodCall("POST").asExpr().getExpr()
+    }
+
+    override string getSourceType() { result = "Grape::Request#POST" }
+
+    override Http::Server::RequestInputKind getKind() { result = Http::Server::bodyInputKind() }
+  }
+
+  /**
+   * A call to `request.cookies` from within a Grape API endpoint.
+   */
+  class GrapeRequestCookiesSource extends Http::Server::RequestInputAccess::Range {
+    GrapeRequestCookiesSource() {
+      this.asExpr().getExpr() = grapeRequestInstance().getAMethodCall("cookies").asExpr().getExpr()
+    }
+
+    override string getSourceType() { result = "Grape::Request#cookies" }
+
+    override Http::Server::RequestInputKind getKind() { result = Http::Server::cookieInputKind() }
+  }
+
+  /**
+   * A call to `request.env` from within a Grape API endpoint, which returns the
+   * underlying Rack environment hash.
+   */
+  class GrapeRequestEnvSource extends Http::Server::RequestInputAccess::Range {
+    GrapeRequestEnvSource() {
+      this.asExpr().getExpr() = grapeRequestInstance().getAMethodCall("env").asExpr().getExpr()
+    }
+
+    override string getSourceType() { result = "Grape::Request#env" }
+
+    override Http::Server::RequestInputKind getKind() {
+      result = Http::Server::parameterInputKind()
+    }
+  }
+
+  /**
+   * A call to `request.query_string` from within a Grape API endpoint.
+   */
+  class GrapeRequestQueryStringSource extends Http::Server::RequestInputAccess::Range {
+    GrapeRequestQueryStringSource() {
+      this.asExpr().getExpr() =
+        grapeRequestInstance().getAMethodCall("query_string").asExpr().getExpr()
+    }
+
+    override string getSourceType() { result = "Grape::Request#query_string" }
+
+    override Http::Server::RequestInputKind getKind() {
+      result = Http::Server::parameterInputKind()
+    }
+  }
+
+  /**
+   * A call to `request.path_info` from within a Grape API endpoint.
+   */
+  class GrapeRequestPathInfoSource extends Http::Server::RequestInputAccess::Range {
+    GrapeRequestPathInfoSource() {
+      this.asExpr().getExpr() =
+        grapeRequestInstance().getAMethodCall("path_info").asExpr().getExpr()
+    }
+
+    override string getSourceType() { result = "Grape::Request#path_info" }
+
+    override Http::Server::RequestInputKind getKind() { result = Http::Server::urlInputKind() }
+  }
+
   /**
    * A call to `route_param` from within a Grape API endpoint.
    */
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Sinatra.qll b/ruby/ql/lib/codeql/ruby/frameworks/Sinatra.qll
index eabee2ea5133..3ffdb915c6f3 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/Sinatra.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/Sinatra.qll
@@ -289,7 +289,7 @@ module Sinatra {
   private predicate blockPostSelf(DataFlow::PostUpdateNode n, DataFlow::BlockNode b) {
     exists(SelfVariableAccessCfgNode self |
       n.getPreUpdateNode().asExpr() = self and
-      self.getScope() = b.asExpr().getAstNode()
+      self.getEnclosingCallable() = b.asExpr().getAstNode()
     )
   }
 
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/core/Gem.qll b/ruby/ql/lib/codeql/ruby/frameworks/core/Gem.qll
index f0e5725eef0d..5a7c65f3d88f 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/core/Gem.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/core/Gem.qll
@@ -90,6 +90,9 @@ module Gem {
       result = this.getAPublicModule().getStmt(_).(SingletonClass)
     }
 
+    /** Holds if this gem is vendored in this codebase. */
+    predicate isVendored() { File.super.getParentContainer+().getBaseName() = "vendor" }
+
     /** Gets a parameter from an exported method, which is an input to this gem. */
     DataFlow::ParameterNode getAnInputParameter() {
       exists(MethodBase method |
@@ -107,6 +110,7 @@ module Gem {
   DataFlow::ParameterNode getALibraryInput() {
     exists(GemSpec spec |
       exists(spec.getName()) and // we only consider `.gemspec` files that have a name
+      not spec.isVendored() and // if the gem is vendored its parameters are not external inputs
       result = spec.getAnInputParameter()
     )
   }
diff --git a/ruby/ql/lib/codeql/ruby/regexp/internal/RegExpTracking.qll b/ruby/ql/lib/codeql/ruby/regexp/internal/RegExpTracking.qll
index 5d70b7d164a2..3e4ca47ba300 100644
--- a/ruby/ql/lib/codeql/ruby/regexp/internal/RegExpTracking.qll
+++ b/ruby/ql/lib/codeql/ruby/regexp/internal/RegExpTracking.qll
@@ -55,175 +55,61 @@ DataFlow::Node stringSink() {
 /** Gets a node where regular expressions that flow to the node are used. */
 DataFlow::Node regSink() { result = any(RegexExecution exec).getRegex() }
 
-private signature module TypeTrackInputSig {
-  DataFlow::LocalSourceNode start(TypeTracker t, DataFlow::Node start);
+private module RegexConfig implements DataFlow::StateConfigSig {
+  private newtype TFlowState =
+    TStringState() or
+    TRegExpState()
 
-  predicate end(DataFlow::Node n);
+  class FlowState = TFlowState;
 
-  predicate additionalStep(DataFlow::Node nodeFrom, DataFlow::LocalSourceNode nodeTo);
-}
-
-/**
- * Provides a version of type tracking where we first prune for reachable nodes,
- * before doing the type tracking computation.
- */
-private module PrunedTypeTrack<TypeTrackInputSig Input> {
-  private predicate additionalStep(
-    DataFlow::LocalSourceNode nodeFrom, DataFlow::LocalSourceNode nodeTo
-  ) {
-    Input::additionalStep(nodeFrom.getALocalUse(), nodeTo)
-  }
-
-  /** Gets a node that is forwards reachable by type-tracking. */
-  pragma[nomagic]
-  private DataFlow::LocalSourceNode forward(TypeTracker t) {
-    result = Input::start(t, _)
+  predicate isSource(DataFlow::Node source, FlowState state) {
+    state = TStringState() and source = strStart()
     or
-    exists(TypeTracker t2 | result = forward(t2).track(t2, t))
-    or
-    exists(TypeTracker t2 | t2 = t.continue() | additionalStep(forward(t2), result))
+    state = TRegExpState() and source = regStart()
   }
 
-  bindingset[result, tbt]
-  pragma[inline_late]
-  pragma[noopt]
-  private DataFlow::LocalSourceNode forwardLateInline(TypeBackTracker tbt) {
-    exists(TypeTracker tt |
-      result = forward(tt) and
-      tt = tbt.getACompatibleTypeTracker()
-    )
+  predicate isSink(DataFlow::Node sink, FlowState state) {
+    state = TStringState() and sink = stringSink()
+    or
+    state = TRegExpState() and sink = regSink()
   }
 
-  /** Gets a node that is backwards reachable by type-tracking. */
-  pragma[nomagic]
-  private DataFlow::LocalSourceNode backwards(TypeBackTracker t) {
-    result = forwardLateInline(t) and
+  predicate isAdditionalFlowStep(
+    DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2
+  ) {
+    regFromString(node1, node2) and state1 = TStringState() and state2 = TRegExpState()
+    or
+    state1 = TStringState() and
+    state2 = TStringState() and
     (
-      t.start() and
-      Input::end(result.getALocalUse())
+      // include taint flow through `String` summaries
+      TaintTrackingPrivate::summaryThroughStepTaint(node1, node2, any(String::SummarizedCallable c))
       or
-      exists(TypeBackTracker t2 | result = backwards(t2).backtrack(t2, t))
+      // string concatenations, and
+      exists(CfgNodes::ExprNodes::OperationCfgNode op |
+        op = node2.asExpr() and
+        op.getAnOperand() = node1.asExpr() and
+        op.getExpr().(Ast::BinaryOperation).getOperator() = "+"
+      )
       or
-      exists(TypeBackTracker t2 | t2 = t.continue() | additionalStep(result, backwards(t2)))
-    )
-  }
-
-  bindingset[result, tt]
-  pragma[inline_late]
-  pragma[noopt]
-  private DataFlow::LocalSourceNode backwardsInlineLate(TypeTracker tt) {
-    exists(TypeBackTracker tbt |
-      result = backwards(tbt) and
-      tt = tbt.getACompatibleTypeTracker()
-    )
-  }
-
-  /** Holds if `n` is forwards and backwards reachable with type tracker `t`. */
-  pragma[nomagic]
-  private predicate reached(DataFlow::LocalSourceNode n, TypeTracker t) {
-    n = forward(t) and
-    n = backwardsInlineLate(t)
-  }
-
-  pragma[nomagic]
-  private TypeTracker stepReached(
-    TypeTracker t, DataFlow::LocalSourceNode nodeFrom, DataFlow::LocalSourceNode nodeTo
-  ) {
-    exists(StepSummary summary |
-      step(nodeFrom, nodeTo, summary) and
-      reached(nodeFrom, t) and
-      reached(nodeTo, result) and
-      result = append(t, summary)
+      // string interpolations
+      node1.asExpr() =
+        node2.asExpr().(CfgNodes::ExprNodes::StringlikeLiteralCfgNode).getAComponent()
     )
-    or
-    additionalStep(nodeFrom, nodeTo) and
-    reached(nodeFrom, pragma[only_bind_into](t)) and
-    reached(nodeTo, pragma[only_bind_into](t)) and
-    result = t.continue()
   }
 
-  /** Gets a node that has been tracked from the start node `start`. */
-  DataFlow::LocalSourceNode track(DataFlow::Node start, TypeTracker t) {
-    t.start() and
-    result = Input::start(t, start) and
-    reached(result, t)
-    or
-    exists(TypeTracker t2 | t = stepReached(t2, track(start, t2), result))
-  }
+  int accessPathLimit() { result = 1 }
 }
 
-/** Holds if `inputStr` is compiled to a regular expression that is returned at `call`. */
-pragma[nomagic]
-private predicate regFromString(DataFlow::LocalSourceNode inputStr, DataFlow::CallNode call) {
-  exists(DataFlow::Node mid |
-    inputStr.flowsTo(mid) and
-    call = API::getTopLevelMember("Regexp").getAMethodCall(["compile", "new"]) and
-    mid = call.getArgument(0)
-  )
-}
+private module RegexTracking = DataFlow::GlobalWithState<RegexConfig>;
 
-private module StringTypeTrackInput implements TypeTrackInputSig {
-  DataFlow::LocalSourceNode start(TypeTracker t, DataFlow::Node start) {
-    start = strStart() and t.start() and result = start
-  }
-
-  predicate end(DataFlow::Node n) {
-    n = stringSink() or
-    regFromString(n, _)
-  }
-
-  predicate additionalStep(DataFlow::Node nodeFrom, DataFlow::LocalSourceNode nodeTo) {
-    // include taint flow through `String` summaries
-    TaintTrackingPrivate::summaryThroughStepTaint(nodeFrom, nodeTo,
-      any(String::SummarizedCallable c))
-    or
-    // string concatenations, and
-    exists(CfgNodes::ExprNodes::OperationCfgNode op |
-      op = nodeTo.asExpr() and
-      op.getAnOperand() = nodeFrom.asExpr() and
-      op.getExpr().(Ast::BinaryOperation).getOperator() = "+"
-    )
-    or
-    // string interpolations
-    nodeFrom.asExpr() =
-      nodeTo.asExpr().(CfgNodes::ExprNodes::StringlikeLiteralCfgNode).getAComponent()
-  }
-}
-
-/**
- * Gets a node that has been tracked from the string constant `start` to some node.
- * This is used to figure out where `start` is evaluated as a regular expression against an input string,
- * or where `start` is compiled into a regular expression.
- */
-private predicate trackStrings = PrunedTypeTrack<StringTypeTrackInput>::track/2;
-
-/** Holds if `strConst` flows to a regex compilation (tracked by `t`), where the resulting regular expression is stored in `reg`. */
+/** Holds if `inputStr` is compiled to a regular expression that is returned at `call`. */
 pragma[nomagic]
-private predicate regFromStringStart(DataFlow::Node strConst, TypeTracker t, DataFlow::CallNode reg) {
-  regFromString(trackStrings(strConst, t), reg) and
-  exists(t.continue())
+private predicate regFromString(DataFlow::Node inputStr, DataFlow::CallNode call) {
+  call = API::getTopLevelMember("Regexp").getAMethodCall(["compile", "new"]) and
+  inputStr = call.getArgument(0)
 }
 
-private module RegTypeTrackInput implements TypeTrackInputSig {
-  DataFlow::LocalSourceNode start(TypeTracker t, DataFlow::Node start) {
-    start = regStart() and
-    t.start() and
-    result = start
-    or
-    regFromStringStart(start, t, result)
-  }
-
-  predicate end(DataFlow::Node n) { n = regSink() }
-
-  predicate additionalStep(DataFlow::Node nodeFrom, DataFlow::LocalSourceNode nodeTo) { none() }
-}
-
-/**
- * Gets a node that has been tracked from the regular expression `start` to some node.
- * This is used to figure out where `start` is executed against an input string.
- */
-private predicate trackRegs = PrunedTypeTrack<RegTypeTrackInput>::track/2;
-
 /** Gets a node that references a regular expression. */
 private DataFlow::LocalSourceNode trackRegexpType(TypeTracker t) {
   t.start() and
@@ -240,12 +126,4 @@ DataFlow::Node trackRegexpType() { trackRegexpType(TypeTracker::end()).flowsTo(r
 
 /** Gets a node holding a value for the regular expression that is evaluated at `re`. */
 cached
-DataFlow::Node regExpSource(DataFlow::Node re) {
-  exists(DataFlow::LocalSourceNode end | end = trackStrings(result, TypeTracker::end()) |
-    end.getALocalUse() = re and re = stringSink()
-  )
-  or
-  exists(DataFlow::LocalSourceNode end | end = trackRegs(result, TypeTracker::end()) |
-    end.getALocalUse() = re and re = regSink()
-  )
-}
+DataFlow::Node regExpSource(DataFlow::Node re) { RegexTracking::flow(result, re) }
diff --git a/ruby/ql/lib/codeql/ruby/security/ConditionalBypassCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/ConditionalBypassCustomizations.qll
index a64cd1039c17..cf752c3aaeb1 100644
--- a/ruby/ql/lib/codeql/ruby/security/ConditionalBypassCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ConditionalBypassCustomizations.qll
@@ -46,8 +46,8 @@ module ConditionalBypass {
     SensitiveAction action;
 
     SensitiveActionGuardConditional() {
-      exists(ConditionBlock cb, BasicBlock controlled |
-        cb.edgeDominates(controlled, _) and
+      exists(BasicBlock cb, BasicBlock controlled |
+        cb.edgeDominates(controlled, any(ConditionalSuccessor s)) and
         controlled.getANode() = action.asExpr() and
         cb.getLastNode() = this.asExpr()
       )
diff --git a/ruby/ql/lib/codeql/ruby/security/OpenSSL.qll b/ruby/ql/lib/codeql/ruby/security/OpenSSL.qll
index 40b3ac036cc1..ca9b09cb3223 100644
--- a/ruby/ql/lib/codeql/ruby/security/OpenSSL.qll
+++ b/ruby/ql/lib/codeql/ruby/security/OpenSSL.qll
@@ -35,37 +35,29 @@ private string rankedInsecureAlgorithm(int i) {
     )
 }
 
-private string insecureAlgorithmString(int i) {
-  i = 1 and result = rankedInsecureAlgorithm(i)
-  or
-  result = rankedInsecureAlgorithm(i) + "|" + insecureAlgorithmString(i - 1)
+private string insecureAlgorithmString() {
+  result = concat(int i | | rankedInsecureAlgorithm(i), "|" order by i desc)
 }
 
 /**
  * Gets the regular expression used for matching strings that look like they
  * contain an algorithm that is known to be insecure.
  */
-private string getInsecureAlgorithmRegex() {
-  result = algorithmRegex(insecureAlgorithmString(max(int i | exists(rankedInsecureAlgorithm(i)))))
-}
+private string getInsecureAlgorithmRegex() { result = algorithmRegex(insecureAlgorithmString()) }
 
 private string rankedSecureAlgorithm(int i) {
   result = rank[i](string s | isStrongEncryptionAlgorithm(s))
 }
 
-private string secureAlgorithmString(int i) {
-  i = 1 and result = rankedSecureAlgorithm(i)
-  or
-  result = rankedSecureAlgorithm(i) + "|" + secureAlgorithmString(i - 1)
+private string secureAlgorithmString() {
+  result = concat(int i | | rankedSecureAlgorithm(i), "|" order by i desc)
 }
 
 /**
  * Gets a regular expression for matching strings that look like they
  * contain an algorithm that is known to be secure.
  */
-string getSecureAlgorithmRegex() {
-  result = algorithmRegex(secureAlgorithmString(max(int i | exists(rankedSecureAlgorithm(i)))))
-}
+string getSecureAlgorithmRegex() { result = algorithmRegex(secureAlgorithmString()) }
 
 /**
  * Names of known ciphers supported by the Ruby `OpenSSL` library, and
diff --git a/ruby/ql/lib/ide-contextual-queries/printCfg.ql b/ruby/ql/lib/ide-contextual-queries/printCfg.ql
index 1c4cec61a3ef..c749f035f748 100644
--- a/ruby/ql/lib/ide-contextual-queries/printCfg.ql
+++ b/ruby/ql/lib/ide-contextual-queries/printCfg.ql
@@ -8,7 +8,6 @@
  */
 
 private import codeql.Locations
-private import codeql.ruby.controlflow.internal.ControlFlowGraphImpl
 private import codeql.ruby.controlflow.ControlFlowGraph
 
 external string selectedSourceFile();
@@ -23,7 +22,7 @@ external int selectedSourceColumn();
 
 private predicate selectedSourceColumnAlias = selectedSourceColumn/0;
 
-module ViewCfgQueryInput implements ViewCfgQueryInputSig<File> {
+module ViewCfgQueryInput implements ControlFlow::ViewCfgQueryInputSig<File> {
   predicate selectedSourceFile = selectedSourceFileAlias/0;
 
   predicate selectedSourceLine = selectedSourceLineAlias/0;
@@ -31,11 +30,11 @@ module ViewCfgQueryInput implements ViewCfgQueryInputSig<File> {
   predicate selectedSourceColumn = selectedSourceColumnAlias/0;
 
   predicate cfgScopeSpan(
-    CfgScope scope, File file, int startLine, int startColumn, int endLine, int endColumn
+    CfgScopeImpl scope, File file, int startLine, int startColumn, int endLine, int endColumn
   ) {
     file = scope.getFile() and
     scope.getLocation().hasLocationInfo(_, startLine, startColumn, endLine, endColumn)
   }
 }
 
-import ViewCfgQuery<File, ViewCfgQueryInput>
+import ControlFlow::ViewCfgQuery<File, ViewCfgQueryInput>
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index 29d38c9a1948..fe92d1089f2d 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 6.0.3-dev
+version: 7.1.2-dev
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/lib/utils/test/InlineExpectationsTestQuery.ql b/ruby/ql/lib/utils/test/InlineExpectationsTestQuery.ql
index 1cbc37a7fe85..08768162c173 100644
--- a/ruby/ql/lib/utils/test/InlineExpectationsTestQuery.ql
+++ b/ruby/ql/lib/utils/test/InlineExpectationsTestQuery.ql
@@ -6,16 +6,4 @@ private import ruby
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>
diff --git a/ruby/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll b/ruby/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
index bd84f530f9c3..d445c91d2e8f 100644
--- a/ruby/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/ruby/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
@@ -36,4 +36,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = R::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(R::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index 781cbbe6d9f7..061ac1e12f36 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,3 +1,33 @@
+## 1.7.0
+
+### Query Metadata Changes
+
+* The `external/cwe/cwe-730` tag has been removed from `rb/redos`, `rb/polynomial-redos` and `rb/regexp-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
+
+## 1.6.13
+
+No user-facing changes.
+
+## 1.6.12
+
+No user-facing changes.
+
+## 1.6.11
+
+No user-facing changes.
+
+## 1.6.10
+
+No user-facing changes.
+
+## 1.6.9
+
+No user-facing changes.
+
+## 1.6.8
+
+No user-facing changes.
+
 ## 1.6.7
 
 No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.6.10.md b/ruby/ql/src/change-notes/released/1.6.10.md
new file mode 100644
index 000000000000..0c6a14492ed0
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.6.10.md
@@ -0,0 +1,3 @@
+## 1.6.10
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.6.11.md b/ruby/ql/src/change-notes/released/1.6.11.md
new file mode 100644
index 000000000000..cd335cb7d261
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.6.11.md
@@ -0,0 +1,3 @@
+## 1.6.11
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.6.12.md b/ruby/ql/src/change-notes/released/1.6.12.md
new file mode 100644
index 000000000000..1e23a10579f9
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.6.12.md
@@ -0,0 +1,3 @@
+## 1.6.12
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.6.13.md b/ruby/ql/src/change-notes/released/1.6.13.md
new file mode 100644
index 000000000000..f15eb488f526
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.6.13.md
@@ -0,0 +1,3 @@
+## 1.6.13
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.6.8.md b/ruby/ql/src/change-notes/released/1.6.8.md
new file mode 100644
index 000000000000..0a5d9b06c55e
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.6.8.md
@@ -0,0 +1,3 @@
+## 1.6.8
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.6.9.md b/ruby/ql/src/change-notes/released/1.6.9.md
new file mode 100644
index 000000000000..65abde2f749b
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.6.9.md
@@ -0,0 +1,3 @@
+## 1.6.9
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.7.0.md b/ruby/ql/src/change-notes/released/1.7.0.md
new file mode 100644
index 000000000000..6dff47e5172a
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.7.0.md
@@ -0,0 +1,5 @@
+## 1.7.0
+
+### Query Metadata Changes
+
+* The `external/cwe/cwe-730` tag has been removed from `rb/redos`, `rb/polynomial-redos` and `rb/regexp-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
diff --git a/ruby/ql/src/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
index 0b49adeac7da..d1184cc67507 100644
--- a/ruby/ql/src/codeql-pack.release.yml
+++ b/ruby/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.6.7
+lastReleaseVersion: 1.7.0
diff --git a/ruby/ql/src/experimental/insecure-randomness/InsecureRandomness.qhelp b/ruby/ql/src/experimental/insecure-randomness/InsecureRandomness.qhelp
index 6c99c189a5d7..188ddccdab9c 100644
--- a/ruby/ql/src/experimental/insecure-randomness/InsecureRandomness.qhelp
+++ b/ruby/ql/src/experimental/insecure-randomness/InsecureRandomness.qhelp
@@ -48,7 +48,7 @@ cryptographically secure method.</p>
 </example>
 
 <references>
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Pseudorandom_number_generator">Pseudo-random number generator</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Pseudorandom_number_generator">Pseudo-random number generator</a>.</li>
 <li>Common Weakness Enumeration: <a href="https://cwe.mitre.org/data/definitions/338.html">CWE-338</a>.</li>
 <li>Ruby-doc: <a href="https://ruby-doc.org/core-3.1.2/Random.html">Random</a>.</li>
 </references>
diff --git a/ruby/ql/src/experimental/performance/UseDetect.ql b/ruby/ql/src/experimental/performance/UseDetect.ql
index 56ab99ae4056..61cf8ccd3f33 100644
--- a/ruby/ql/src/experimental/performance/UseDetect.ql
+++ b/ruby/ql/src/experimental/performance/UseDetect.ql
@@ -42,13 +42,11 @@ class EndCall extends MethodCall {
 }
 
 Expr getUniqueRead(Expr e) {
-  forex(CfgNode eNode | eNode.getAstNode() = e |
-    exists(Ssa::WriteDefinition def |
-      def.assigns(eNode) and
-      strictcount(def.getARead()) = 1 and
-      not def = any(Ssa::PhiNode phi).getAnInput() and
-      def.getARead().getAstNode() = result
-    )
+  exists(Ssa::WriteDefinition def |
+    def.assigns(e.getControlFlowNode()) and
+    strictcount(def.getARead()) = 1 and
+    not def = any(Ssa::PhiNode phi).getAnInput() and
+    def.getARead().getAstNode() = result
   )
 }
 
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index f73004c8530d..32e21fbacce8 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.6.8-dev
+version: 1.7.1-dev
 groups:
   - ruby
   - queries
diff --git a/ruby/ql/src/queries/analysis/Definitions.ql b/ruby/ql/src/queries/analysis/Definitions.ql
index a1a0d6b258b3..6adabe79fc58 100644
--- a/ruby/ql/src/queries/analysis/Definitions.ql
+++ b/ruby/ql/src/queries/analysis/Definitions.ql
@@ -43,7 +43,7 @@ newtype DefLoc =
     meth = call.getATarget()
     or
     // include implicit `initialize` calls
-    meth = getInitializeTarget(call.getAControlFlowNode())
+    meth = getInitializeTarget(call.getControlFlowNode())
   } or
   /** A local variable. */
   LocalVariableLoc(VariableReadAccess read, VariableWriteAccess write) {
diff --git a/ruby/ql/src/queries/performance/DatabaseQueryInLoop.ql b/ruby/ql/src/queries/performance/DatabaseQueryInLoop.ql
index c81cdd6b2f63..67e9ba4f9c77 100644
--- a/ruby/ql/src/queries/performance/DatabaseQueryInLoop.ql
+++ b/ruby/ql/src/queries/performance/DatabaseQueryInLoop.ql
@@ -36,7 +36,7 @@ class LoopingCall extends DataFlow::CallNode {
   }
 
   /** Holds if `c` is executed as part of the body of this loop. */
-  predicate executesCall(DataFlow::CallNode c) { c.asExpr().getScope() = loopScope }
+  predicate executesCall(DataFlow::CallNode c) { c.asExpr().getEnclosingCallable() = loopScope }
 }
 
 /** Holds if `ar` influences a guard that may control the execution of a loop. */
diff --git a/ruby/ql/src/queries/security/cwe-078/CommandInjection.qhelp b/ruby/ql/src/queries/security/cwe-078/CommandInjection.qhelp
index d01465d1dae5..19389bf6fe31 100644
--- a/ruby/ql/src/queries/security/cwe-078/CommandInjection.qhelp
+++ b/ruby/ql/src/queries/security/cwe-078/CommandInjection.qhelp
@@ -34,7 +34,7 @@ without examining it first.</p>
 
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 
 <!--  LocalWords:  CWE untrusted unsanitized Runtime
diff --git a/ruby/ql/src/queries/security/cwe-078/KernelOpen.inc.qhelp b/ruby/ql/src/queries/security/cwe-078/KernelOpen.inc.qhelp
index 2c220ba7aea1..10dbe15ebe64 100644
--- a/ruby/ql/src/queries/security/cwe-078/KernelOpen.inc.qhelp
+++ b/ruby/ql/src/queries/security/cwe-078/KernelOpen.inc.qhelp
@@ -39,7 +39,7 @@ user-supplied file path.
 
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 <a href="https://cheatsheetseries.owasp.org/cheatsheets/Ruby_on_Rails_Cheat_Sheet.html#command-injection">Ruby on Rails Cheat Sheet: Command Injection</a>.
 </li>
 
diff --git a/ruby/ql/src/queries/security/cwe-078/UnsafeShellCommandConstruction.qhelp b/ruby/ql/src/queries/security/cwe-078/UnsafeShellCommandConstruction.qhelp
index 8cedb57c277c..18c2380019b5 100644
--- a/ruby/ql/src/queries/security/cwe-078/UnsafeShellCommandConstruction.qhelp
+++ b/ruby/ql/src/queries/security/cwe-078/UnsafeShellCommandConstruction.qhelp
@@ -71,7 +71,7 @@
 
 	<li>
 		OWASP:
-		<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+		<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 	</li>
 
 </references>
diff --git a/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.qhelp b/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.qhelp
index 85bd15cabcd5..25a3ef52613d 100644
--- a/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.qhelp
+++ b/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.qhelp
@@ -49,7 +49,7 @@
         Ruby on Rails Cheatsheet</a>.
     </li>
     <li>
-      Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+      Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
     </li>
   </references>
 </qhelp>
diff --git a/ruby/ql/src/queries/security/cwe-079/StoredXSS.qhelp b/ruby/ql/src/queries/security/cwe-079/StoredXSS.qhelp
index 71b9f2aa3ef2..61777e3eaec2 100644
--- a/ruby/ql/src/queries/security/cwe-079/StoredXSS.qhelp
+++ b/ruby/ql/src/queries/security/cwe-079/StoredXSS.qhelp
@@ -65,7 +65,7 @@
         Ruby on Rails Cheatsheet</a>.
     </li>
     <li>
-      Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+      Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
     </li>
   </references>
 </qhelp>
diff --git a/ruby/ql/src/queries/security/cwe-079/UnsafeHtmlConstruction.qhelp b/ruby/ql/src/queries/security/cwe-079/UnsafeHtmlConstruction.qhelp
index 7a513a3ece02..dfee208f29af 100644
--- a/ruby/ql/src/queries/security/cwe-079/UnsafeHtmlConstruction.qhelp
+++ b/ruby/ql/src/queries/security/cwe-079/UnsafeHtmlConstruction.qhelp
@@ -67,7 +67,7 @@
 		Scripting</a>.
 	</li>
 	<li>
-		Wikipedia: <a href="http://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
+		Wikipedia: <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">Cross-site scripting</a>.
 	</li>
 </references>
 </qhelp>
diff --git a/ruby/ql/src/queries/security/cwe-1333/PolynomialReDoS.ql b/ruby/ql/src/queries/security/cwe-1333/PolynomialReDoS.ql
index 3e3afa31d367..7387221ffb3b 100644
--- a/ruby/ql/src/queries/security/cwe-1333/PolynomialReDoS.ql
+++ b/ruby/ql/src/queries/security/cwe-1333/PolynomialReDoS.ql
@@ -9,7 +9,6 @@
  * @id rb/polynomial-redos
  * @tags security
  *       external/cwe/cwe-1333
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/ruby/ql/src/queries/security/cwe-1333/ReDoS.ql b/ruby/ql/src/queries/security/cwe-1333/ReDoS.ql
index 355caeddca83..f3d26fe2a5d3 100644
--- a/ruby/ql/src/queries/security/cwe-1333/ReDoS.ql
+++ b/ruby/ql/src/queries/security/cwe-1333/ReDoS.ql
@@ -10,7 +10,6 @@
  * @id rb/redos
  * @tags security
  *       external/cwe/cwe-1333
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.ql b/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.ql
index e271fc054b13..a17b57b7047f 100644
--- a/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.ql
+++ b/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.ql
@@ -11,7 +11,6 @@
  * @id rb/regexp-injection
  * @tags security
  *       external/cwe/cwe-1333
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/ruby/ql/src/queries/variables/DeadStoreOfLocal.qhelp b/ruby/ql/src/queries/variables/DeadStoreOfLocal.qhelp
index b4e32eb1708f..08bc96ae1f83 100644
--- a/ruby/ql/src/queries/variables/DeadStoreOfLocal.qhelp
+++ b/ruby/ql/src/queries/variables/DeadStoreOfLocal.qhelp
@@ -41,7 +41,7 @@ succeeded or not, the value of <code>result</code> should be checked, perhaps li
 <references>
 
 
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Dead_store">Dead store</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Dead_store">Dead store</a>.</li>
 
 
 
diff --git a/ruby/ql/src/queries/variables/DeadStoreOfLocal.ql b/ruby/ql/src/queries/variables/DeadStoreOfLocal.ql
index 849fb8ecd5a7..428e83ca9061 100644
--- a/ruby/ql/src/queries/variables/DeadStoreOfLocal.ql
+++ b/ruby/ql/src/queries/variables/DeadStoreOfLocal.ql
@@ -19,7 +19,12 @@ import codeql.ruby.ApiGraphs
 
 pragma[nomagic]
 private predicate hasErbResultCall(CfgScope scope) {
-  scope = API::getTopLevelMember("ERB").getInstance().getAMethodCall("result").asExpr().getScope()
+  scope =
+    API::getTopLevelMember("ERB")
+        .getInstance()
+        .getAMethodCall("result")
+        .asExpr()
+        .getEnclosingCallable()
 }
 
 class RelevantLocalVariableWriteAccess extends LocalVariableWriteAccess {
@@ -39,6 +44,6 @@ class RelevantLocalVariableWriteAccess extends LocalVariableWriteAccess {
 from RelevantLocalVariableWriteAccess write, LocalVariable v
 where
   v = write.getVariable() and
-  exists(write.getAControlFlowNode()) and
+  exists(write.getControlFlowNode()) and
   not exists(Ssa::WriteDefinition def | def.getWriteAccess().getAstNode() = write)
 select write, "This assignment to $@ is useless, since its value is never read.", v, v.getName()
diff --git a/ruby/ql/src/queries/variables/UninitializedLocal.ql b/ruby/ql/src/queries/variables/UninitializedLocal.ql
index 2f5a4b875aa1..bb602d4a9686 100644
--- a/ruby/ql/src/queries/variables/UninitializedLocal.ql
+++ b/ruby/ql/src/queries/variables/UninitializedLocal.ql
@@ -49,7 +49,7 @@ private predicate isInBooleanContext(AstNode n) {
 
 private predicate isGuarded(LocalVariableReadAccess read) {
   exists(AstCfgNode guard, boolean branch |
-    Guards::guardControlsBlock(guard, read.getAControlFlowNode().getBasicBlock(), branch)
+    Guards::guardControlsBlock(guard, read.getControlFlowNode().getBasicBlock(), branch)
   |
     // guard is `var`
     guard.getAstNode() = read.getVariable().getAnAccess() and
diff --git a/ruby/ql/test/library-tests/ast/ValueText.expected b/ruby/ql/test/library-tests/ast/ValueText.expected
index 42eab5f74d9e..d662062f6470 100644
--- a/ruby/ql/test/library-tests/ast/ValueText.expected
+++ b/ruby/ql/test/library-tests/ast/ValueText.expected
@@ -1130,13 +1130,24 @@ exprCfgNodeValue
 | control/cases.rb:46:12:46:12 | 3 | 3 | int |
 | control/cases.rb:47:6:47:6 | 1 | 1 | int |
 | control/cases.rb:47:13:47:13 | 3 | 3 | int |
+| control/cases.rb:49:9:49:9 | 3 | 3 | int |
+| control/cases.rb:49:12:49:12 | 4 | 4 | int |
 | control/cases.rb:50:9:50:9 | 3 | 3 | int |
 | control/cases.rb:51:10:51:10 | 3 | 3 | int |
+| control/cases.rb:52:6:52:6 | :a | :a | symbol |
+| control/cases.rb:53:6:53:6 | :a | :a | symbol |
 | control/cases.rb:53:9:53:9 | 5 | 5 | int |
+| control/cases.rb:54:6:54:6 | :a | :a | symbol |
 | control/cases.rb:54:9:54:9 | 5 | 5 | int |
+| control/cases.rb:55:6:55:6 | :a | :a | symbol |
 | control/cases.rb:55:9:55:9 | 5 | 5 | int |
+| control/cases.rb:55:12:55:12 | :b | :b | symbol |
+| control/cases.rb:56:6:56:6 | :a | :a | symbol |
 | control/cases.rb:56:9:56:9 | 5 | 5 | int |
+| control/cases.rb:56:12:56:12 | :b | :b | symbol |
+| control/cases.rb:57:6:57:6 | :a | :a | symbol |
 | control/cases.rb:57:9:57:9 | 5 | 5 | int |
+| control/cases.rb:57:12:57:12 | :b | :b | symbol |
 | control/cases.rb:59:7:59:7 | 5 | 5 | int |
 | control/cases.rb:60:7:60:7 | 5 | 5 | int |
 | control/cases.rb:61:7:61:7 | 1 | 1 | int |
@@ -1158,11 +1169,20 @@ exprCfgNodeValue
 | control/cases.rb:68:14:68:14 | 4 | 4 | int |
 | control/cases.rb:69:10:69:10 | 3 | 3 | int |
 | control/cases.rb:70:11:70:11 | 3 | 3 | int |
+| control/cases.rb:71:7:71:7 | :a | :a | symbol |
+| control/cases.rb:72:7:72:7 | :a | :a | symbol |
 | control/cases.rb:72:10:72:10 | 5 | 5 | int |
+| control/cases.rb:73:7:73:7 | :a | :a | symbol |
 | control/cases.rb:73:10:73:10 | 5 | 5 | int |
+| control/cases.rb:74:7:74:7 | :a | :a | symbol |
 | control/cases.rb:74:10:74:10 | 5 | 5 | int |
+| control/cases.rb:74:13:74:13 | :b | :b | symbol |
+| control/cases.rb:75:7:75:7 | :a | :a | symbol |
 | control/cases.rb:75:10:75:10 | 5 | 5 | int |
+| control/cases.rb:75:13:75:13 | :b | :b | symbol |
+| control/cases.rb:76:7:76:7 | :a | :a | symbol |
 | control/cases.rb:76:10:76:10 | 5 | 5 | int |
+| control/cases.rb:76:13:76:13 | :b | :b | symbol |
 | control/cases.rb:84:7:84:8 | 42 | 42 | int |
 | control/cases.rb:87:6:87:6 | 5 | 5 | int |
 | control/cases.rb:88:7:88:9 | foo | 42 | int |
@@ -1199,8 +1219,14 @@ exprCfgNodeValue
 | control/cases.rb:130:11:130:11 | 1 | 1 | int |
 | control/cases.rb:130:14:130:14 | 2 | 2 | int |
 | control/cases.rb:131:18:131:18 | 1 | 1 | int |
+| control/cases.rb:139:7:139:7 | :x | :x | symbol |
+| control/cases.rb:140:16:140:16 | :x | :x | symbol |
 | control/cases.rb:140:18:140:18 | 1 | 1 | int |
+| control/cases.rb:141:16:141:16 | :x | :x | symbol |
 | control/cases.rb:141:18:141:18 | 1 | 1 | int |
+| control/cases.rb:141:21:141:21 | :a | :a | symbol |
+| control/cases.rb:142:11:142:11 | :y | :y | symbol |
+| control/cases.rb:144:11:144:11 | :a | :a | symbol |
 | control/cases.rb:144:14:144:14 | 1 | 1 | int |
 | control/cases.rb:148:7:148:9 | foo | 42 | int |
 | control/cases.rb:155:8:155:10 | foo | 42 | int |
@@ -1212,6 +1238,8 @@ exprCfgNodeValue
 | control/cases.rb:160:10:160:10 | 1 | 1 | int |
 | control/cases.rb:160:13:160:13 | 2 | 2 | int |
 | control/cases.rb:162:1:162:20 | nil | nil | nil |
+| control/cases.rb:162:10:162:10 | :x | :x | symbol |
+| control/cases.rb:162:16:162:16 | :y | :y | symbol |
 | control/cases.rb:162:19:162:19 | 1 | 1 | int |
 | control/cases.rb:165:3:165:5 | foo | 42 | int |
 | control/cases.rb:166:6:166:6 | 1 | 1 | int |
@@ -1740,6 +1768,7 @@ exprCfgNodeValue
 | modules/modules.rb:55:8:55:30 | "module Foo::Bar again" | module Foo::Bar again | string |
 | modules/modules.rb:56:17:56:17 | 4 | 4 | int |
 | modules/toplevel.rb:1:6:1:12 | "world" | world | string |
+| modules/toplevel.rb:3:12:3:16 | "!!!" | !!! | string |
 | modules/toplevel.rb:5:14:5:20 | "hello" | hello | string |
 | operations/operations.rb:3:5:3:5 | 0 | 0 | int |
 | operations/operations.rb:4:5:4:5 | 0 | 0 | int |
@@ -1885,8 +1914,6 @@ exprCfgNodeValue
 | params/params.rb:47:32:47:32 | 3 | 3 | int |
 | params/params.rb:49:37:49:39 | 100 | 100 | int |
 | params/params.rb:53:44:53:44 | 3 | 3 | int |
-| params/params.rb:58:46:58:46 | 0 | 0 | int |
-| params/params.rb:58:56:58:58 | 100 | 100 | int |
 | params/params.rb:63:14:63:19 | "Zeus" | Zeus | string |
 | params/params.rb:65:41:65:42 | 99 | 99 | int |
 | params/params.rb:70:42:70:45 | 1000 | 1000 | int |
diff --git a/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.expected b/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.expected
index dd9e84f487a7..b4470adb57db 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.expected
+++ b/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.expected
@@ -1,6546 +1,5386 @@
 dominates
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:1:1:11:3 | enter m1 |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:1:1:11:3 | exit m1 |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:2:3:6:5 | while ... |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:2:9:2:9 | x |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:3:5:5:7 | if ... |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:3:8:3:8 | x |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:4:7:4:11 | break |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:8:3:10:5 | if ... |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:8:6:8:13 | [ensure: exception] self |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:9:5:9:23 | [ensure: exception] self |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:9:5:9:23 | self |
-| break_ensure.rb:1:1:11:3 | exit m1 | break_ensure.rb:1:1:11:3 | exit m1 |
-| break_ensure.rb:1:1:56:4 | enter break_ensure.rb | break_ensure.rb:1:1:56:4 | enter break_ensure.rb |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:2:3:6:5 | while ... |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:8:3:10:5 | if ... |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:9:5:9:23 | self |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:1:1:11:3 | exit m1 |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:2:3:6:5 | while ... |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:2:9:2:9 | x |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:3:5:5:7 | if ... |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:3:8:3:8 | x |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:4:7:4:11 | break |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:8:3:10:5 | if ... |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:8:6:8:13 | [ensure: exception] self |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:9:5:9:23 | [ensure: exception] self |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:9:5:9:23 | self |
-| break_ensure.rb:3:5:5:7 | if ... | break_ensure.rb:3:5:5:7 | if ... |
-| break_ensure.rb:3:8:3:8 | x | break_ensure.rb:3:5:5:7 | if ... |
-| break_ensure.rb:3:8:3:8 | x | break_ensure.rb:3:8:3:8 | x |
-| break_ensure.rb:3:8:3:8 | x | break_ensure.rb:4:7:4:11 | break |
-| break_ensure.rb:4:7:4:11 | break | break_ensure.rb:4:7:4:11 | break |
-| break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... |
-| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:8:3:10:5 | if ... |
-| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... |
-| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:8:6:8:13 | [ensure: exception] self |
-| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:9:5:9:23 | [ensure: exception] self |
-| break_ensure.rb:9:5:9:23 | [ensure: exception] self | break_ensure.rb:9:5:9:23 | [ensure: exception] self |
-| break_ensure.rb:9:5:9:23 | self | break_ensure.rb:9:5:9:23 | self |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:13:1:25:3 | enter m2 |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:14:3:24:5 | while ... |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:14:9:14:9 | x |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:16:7:18:9 | if ... |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:16:10:16:10 | x |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:17:9:17:13 | break |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:20:7:22:9 | if ... |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:21:9:21:20 | self |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:14:3:24:5 | while ... |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:14:3:24:5 | while ... |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:14:9:14:9 | x |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:16:7:18:9 | if ... |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:16:10:16:10 | x |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:17:9:17:13 | break |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | if ... |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | self |
-| break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:16:7:18:9 | if ... |
-| break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:20:7:22:9 | if ... |
-| break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:21:9:21:20 | self |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:16:7:18:9 | if ... |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:16:10:16:10 | x |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:17:9:17:13 | break |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:7:22:9 | if ... |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:21:9:21:20 | self |
-| break_ensure.rb:17:9:17:13 | break | break_ensure.rb:17:9:17:13 | break |
-| break_ensure.rb:17:9:17:13 | break | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
-| break_ensure.rb:17:9:17:13 | break | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
-| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
-| break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:20:7:22:9 | if ... |
-| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
-| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
-| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
-| break_ensure.rb:21:9:21:20 | [ensure: break] self | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:21:9:21:20 | [ensure: exception] self | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
-| break_ensure.rb:21:9:21:20 | self | break_ensure.rb:21:9:21:20 | self |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:27:1:42:3 | enter m3 |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:27:1:42:3 | exit m3 |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:27:1:42:3 | exit m3 (normal) |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:29:5:31:7 | if ... |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:30:7:30:12 | return |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:5:39:7 | [ensure: return] while ... |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:5:39:7 | while ... |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:11:33:11 | [ensure: exception] y |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:11:33:11 | [ensure: return] y |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:11:33:11 | y |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:9:37:11 | if ... |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:12:35:12 | [ensure: exception] x |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:12:35:12 | [ensure: return] x |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:12:35:12 | x |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:36:11:36:15 | [ensure: exception] break |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:36:11:36:15 | [ensure: return] break |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:36:11:36:15 | break |
-| break_ensure.rb:27:1:42:3 | exit m3 | break_ensure.rb:27:1:42:3 | exit m3 |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:27:1:42:3 | exit m3 (normal) |
-| break_ensure.rb:29:5:31:7 | if ... | break_ensure.rb:29:5:31:7 | if ... |
-| break_ensure.rb:29:5:31:7 | if ... | break_ensure.rb:33:5:39:7 | while ... |
-| break_ensure.rb:29:5:31:7 | if ... | break_ensure.rb:33:11:33:11 | y |
-| break_ensure.rb:29:5:31:7 | if ... | break_ensure.rb:35:9:37:11 | if ... |
-| break_ensure.rb:29:5:31:7 | if ... | break_ensure.rb:35:12:35:12 | x |
-| break_ensure.rb:29:5:31:7 | if ... | break_ensure.rb:36:11:36:15 | break |
-| break_ensure.rb:30:7:30:12 | return | break_ensure.rb:30:7:30:12 | return |
-| break_ensure.rb:30:7:30:12 | return | break_ensure.rb:33:5:39:7 | [ensure: return] while ... |
-| break_ensure.rb:30:7:30:12 | return | break_ensure.rb:33:11:33:11 | [ensure: return] y |
-| break_ensure.rb:30:7:30:12 | return | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
-| break_ensure.rb:30:7:30:12 | return | break_ensure.rb:35:12:35:12 | [ensure: return] x |
-| break_ensure.rb:30:7:30:12 | return | break_ensure.rb:36:11:36:15 | [ensure: return] break |
-| break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... |
-| break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:33:5:39:7 | [ensure: return] while ... |
-| break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:33:5:39:7 | while ... |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:33:11:33:11 | [ensure: exception] y |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:35:12:35:12 | [ensure: exception] x |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:36:11:36:15 | [ensure: exception] break |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:33:5:39:7 | [ensure: return] while ... |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:33:11:33:11 | [ensure: return] y |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:35:12:35:12 | [ensure: return] x |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:36:11:36:15 | [ensure: return] break |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:33:5:39:7 | while ... |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:33:11:33:11 | y |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:9:37:11 | if ... |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:12:35:12 | x |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:36:11:36:15 | break |
-| break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... |
-| break_ensure.rb:35:9:37:11 | [ensure: return] if ... | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
-| break_ensure.rb:35:9:37:11 | if ... | break_ensure.rb:35:9:37:11 | if ... |
-| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... |
-| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:35:12:35:12 | [ensure: exception] x |
-| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:36:11:36:15 | [ensure: exception] break |
-| break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
-| break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:35:12:35:12 | [ensure: return] x |
-| break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:36:11:36:15 | [ensure: return] break |
-| break_ensure.rb:35:12:35:12 | x | break_ensure.rb:35:9:37:11 | if ... |
-| break_ensure.rb:35:12:35:12 | x | break_ensure.rb:35:12:35:12 | x |
-| break_ensure.rb:35:12:35:12 | x | break_ensure.rb:36:11:36:15 | break |
-| break_ensure.rb:36:11:36:15 | [ensure: exception] break | break_ensure.rb:36:11:36:15 | [ensure: exception] break |
-| break_ensure.rb:36:11:36:15 | [ensure: return] break | break_ensure.rb:36:11:36:15 | [ensure: return] break |
-| break_ensure.rb:36:11:36:15 | break | break_ensure.rb:36:11:36:15 | break |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:44:1:56:3 | enter m4 |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:45:3:55:5 | while ... |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:45:9:45:9 | x |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:47:7:49:9 | if ... |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:47:10:47:10 | x |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:52:15:52:16 | 10 |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:45:3:55:5 | while ... |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:45:3:55:5 | while ... |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:45:9:45:9 | x |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:47:7:49:9 | if ... |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:47:10:47:10 | x |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:52:15:52:16 | 10 |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
-| break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:47:7:49:9 | if ... |
-| break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:52:15:52:16 | 10 |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:47:7:49:9 | if ... |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:47:10:47:10 | x |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:52:15:52:16 | 10 |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
-| break_ensure.rb:48:9:48:16 | self | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
-| break_ensure.rb:51:7:53:9 | if ... | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
-| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
-| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
-| break_ensure.rb:52:15:52:16 | 10 | break_ensure.rb:52:15:52:16 | 10 |
-| break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:1:1:6:3 | enter if_in_case |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:2:3:5:5 | case ... |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:3:5:3:42 | [match] when ... |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:3:5:3:42 | [no-match] when ... |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:3:18:3:41 | if ... |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:3:21:3:22 | self |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:3:29:3:37 | self |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:4:5:4:24 | [match] when ... |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:4:5:4:24 | [no-match] when ... |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:4:10:4:10 | 2 |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:4:17:4:24 | self |
-| case.rb:1:1:99:4 | enter case.rb | case.rb:1:1:99:4 | enter case.rb |
-| case.rb:2:3:5:5 | case ... | case.rb:2:3:5:5 | case ... |
-| case.rb:3:5:3:42 | [match] when ... | case.rb:3:5:3:42 | [match] when ... |
-| case.rb:3:5:3:42 | [match] when ... | case.rb:3:18:3:41 | if ... |
-| case.rb:3:5:3:42 | [match] when ... | case.rb:3:21:3:22 | self |
-| case.rb:3:5:3:42 | [match] when ... | case.rb:3:29:3:37 | self |
-| case.rb:3:5:3:42 | [no-match] when ... | case.rb:3:5:3:42 | [no-match] when ... |
-| case.rb:3:5:3:42 | [no-match] when ... | case.rb:4:5:4:24 | [match] when ... |
-| case.rb:3:5:3:42 | [no-match] when ... | case.rb:4:5:4:24 | [no-match] when ... |
-| case.rb:3:5:3:42 | [no-match] when ... | case.rb:4:10:4:10 | 2 |
-| case.rb:3:5:3:42 | [no-match] when ... | case.rb:4:17:4:24 | self |
-| case.rb:3:18:3:41 | if ... | case.rb:3:18:3:41 | if ... |
-| case.rb:3:21:3:22 | self | case.rb:3:18:3:41 | if ... |
-| case.rb:3:21:3:22 | self | case.rb:3:21:3:22 | self |
-| case.rb:3:21:3:22 | self | case.rb:3:29:3:37 | self |
-| case.rb:3:29:3:37 | self | case.rb:3:29:3:37 | self |
-| case.rb:4:5:4:24 | [match] when ... | case.rb:4:5:4:24 | [match] when ... |
-| case.rb:4:5:4:24 | [match] when ... | case.rb:4:17:4:24 | self |
-| case.rb:4:5:4:24 | [no-match] when ... | case.rb:4:5:4:24 | [no-match] when ... |
-| case.rb:4:10:4:10 | 2 | case.rb:4:5:4:24 | [match] when ... |
-| case.rb:4:10:4:10 | 2 | case.rb:4:5:4:24 | [no-match] when ... |
-| case.rb:4:10:4:10 | 2 | case.rb:4:10:4:10 | 2 |
-| case.rb:4:10:4:10 | 2 | case.rb:4:17:4:24 | self |
-| case.rb:4:17:4:24 | self | case.rb:4:17:4:24 | self |
-| case.rb:8:1:18:3 | enter case_match | case.rb:8:1:18:3 | enter case_match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:9:3:17:5 | case ... |
-| case.rb:8:1:18:3 | enter case_match | case.rb:11:5:11:15 | in ... then ... |
-| case.rb:8:1:18:3 | enter case_match | case.rb:11:15:11:15 | 3 |
-| case.rb:8:1:18:3 | enter case_match | case.rb:12:5:13:7 | in ... then ... |
-| case.rb:8:1:18:3 | enter case_match | case.rb:13:7:13:7 | 4 |
-| case.rb:8:1:18:3 | enter case_match | case.rb:14:5:14:25 | in ... then ... |
-| case.rb:8:1:18:3 | enter case_match | case.rb:14:13:14:13 | x |
-| case.rb:8:1:18:3 | enter case_match | case.rb:14:25:14:25 | 6 |
-| case.rb:8:1:18:3 | enter case_match | case.rb:15:5:15:28 | in ... then ... |
-| case.rb:8:1:18:3 | enter case_match | case.rb:15:17:15:17 | x |
-| case.rb:8:1:18:3 | enter case_match | case.rb:15:28:15:28 | 7 |
-| case.rb:8:1:18:3 | enter case_match | case.rb:16:10:16:10 | 8 |
-| case.rb:9:3:17:5 | case ... | case.rb:9:3:17:5 | case ... |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:11:5:11:15 | in ... then ... |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:11:15:11:15 | 3 |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:12:5:13:7 | in ... then ... |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:13:7:13:7 | 4 |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:14:5:14:25 | in ... then ... |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:14:13:14:13 | x |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:14:25:14:25 | 6 |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:15:5:15:28 | in ... then ... |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:15:17:15:17 | x |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:15:28:15:28 | 7 |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:16:10:16:10 | 8 |
-| case.rb:11:15:11:15 | 3 | case.rb:11:15:11:15 | 3 |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:12:5:13:7 | in ... then ... |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:13:7:13:7 | 4 |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:14:5:14:25 | in ... then ... |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:14:13:14:13 | x |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:14:25:14:25 | 6 |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:15:5:15:28 | in ... then ... |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:15:17:15:17 | x |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:15:28:15:28 | 7 |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:16:10:16:10 | 8 |
-| case.rb:13:7:13:7 | 4 | case.rb:13:7:13:7 | 4 |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:14:5:14:25 | in ... then ... |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:14:13:14:13 | x |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:14:25:14:25 | 6 |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:15:5:15:28 | in ... then ... |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:15:17:15:17 | x |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:15:28:15:28 | 7 |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:16:10:16:10 | 8 |
-| case.rb:14:13:14:13 | x | case.rb:14:13:14:13 | x |
-| case.rb:14:13:14:13 | x | case.rb:14:25:14:25 | 6 |
-| case.rb:14:13:14:13 | x | case.rb:15:5:15:28 | in ... then ... |
-| case.rb:14:13:14:13 | x | case.rb:15:17:15:17 | x |
-| case.rb:14:13:14:13 | x | case.rb:15:28:15:28 | 7 |
-| case.rb:14:13:14:13 | x | case.rb:16:10:16:10 | 8 |
-| case.rb:14:25:14:25 | 6 | case.rb:14:25:14:25 | 6 |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:1:1:11:3 | Entry |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:1:1:11:3 | Exceptional Exit |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:1:1:11:3 | Exit |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:2:3:6:5 | After while ... |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:2:3:6:5 | [LoopHeader] while ... |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:2:3:10:5 | After ... |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:2:9:2:13 | After ... < ... [false] |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:2:9:2:13 | After ... < ... [true] |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:3:8:3:12 | After ... > ... [false] |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:3:8:3:12 | After ... > ... [true] |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:7:1:10:5 | ensure ... |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:8:3:10:5 | After if ... |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:8:6:8:18 | After call to nil? [false] |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:8:6:8:18 | After call to nil? [true] |
+| break_ensure.rb:1:1:11:3 | Exceptional Exit | break_ensure.rb:1:1:11:3 | Exceptional Exit |
+| break_ensure.rb:1:1:11:3 | Exit | break_ensure.rb:1:1:11:3 | Exit |
+| break_ensure.rb:1:1:56:4 | Entry | break_ensure.rb:1:1:56:4 | Entry |
+| break_ensure.rb:2:3:6:5 | After while ... | break_ensure.rb:2:3:6:5 | After while ... |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:1:1:11:3 | Exceptional Exit |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:1:1:11:3 | Exit |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:2:3:6:5 | After while ... |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:2:3:6:5 | [LoopHeader] while ... |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:2:3:10:5 | After ... |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:2:9:2:13 | After ... < ... [false] |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:2:9:2:13 | After ... < ... [true] |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:3:8:3:12 | After ... > ... [false] |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:3:8:3:12 | After ... > ... [true] |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:7:1:10:5 | ensure ... |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:8:3:10:5 | After if ... |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:8:6:8:18 | After call to nil? [false] |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:8:6:8:18 | After call to nil? [true] |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:2:3:10:5 | After ... |
+| break_ensure.rb:2:9:2:13 | After ... < ... [false] | break_ensure.rb:2:9:2:13 | After ... < ... [false] |
+| break_ensure.rb:2:9:2:13 | After ... < ... [true] | break_ensure.rb:2:9:2:13 | After ... < ... [true] |
+| break_ensure.rb:2:9:2:13 | After ... < ... [true] | break_ensure.rb:3:8:3:12 | After ... > ... [false] |
+| break_ensure.rb:2:9:2:13 | After ... < ... [true] | break_ensure.rb:3:8:3:12 | After ... > ... [true] |
+| break_ensure.rb:3:8:3:12 | After ... > ... [false] | break_ensure.rb:3:8:3:12 | After ... > ... [false] |
+| break_ensure.rb:3:8:3:12 | After ... > ... [true] | break_ensure.rb:3:8:3:12 | After ... > ... [true] |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:1:1:11:3 | Exceptional Exit |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:1:1:11:3 | Exit |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:2:3:10:5 | After ... |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:7:1:10:5 | ensure ... |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:8:3:10:5 | After if ... |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:8:6:8:18 | After call to nil? [false] |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:8:6:8:18 | After call to nil? [true] |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:1:1:11:3 | Exceptional Exit |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:1:1:11:3 | Exit |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:2:3:10:5 | After ... |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:8:3:10:5 | After if ... |
+| break_ensure.rb:8:6:8:18 | After call to nil? [false] | break_ensure.rb:8:6:8:18 | After call to nil? [false] |
+| break_ensure.rb:8:6:8:18 | After call to nil? [true] | break_ensure.rb:8:6:8:18 | After call to nil? [true] |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:13:1:25:3 | Entry |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:13:1:25:3 | Exceptional Exit |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:13:1:25:3 | Exit |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:14:3:24:5 | After while ... |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:14:3:24:5 | [LoopHeader] while ... |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:14:9:14:13 | After ... < ... [false] |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:14:9:14:13 | After ... < ... [true] |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:15:5:23:7 | After begin ...  |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:16:10:16:14 | After ... > ... [false] |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:16:10:16:14 | After ... > ... [true] |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:19:5:22:9 | ensure ... |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:20:7:22:9 | After if ... |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:20:10:20:15 | After call to nil? [false] |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:20:10:20:15 | After call to nil? [true] |
+| break_ensure.rb:13:1:25:3 | Exceptional Exit | break_ensure.rb:13:1:25:3 | Exceptional Exit |
+| break_ensure.rb:13:1:25:3 | Exit | break_ensure.rb:13:1:25:3 | Exit |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:14:3:24:5 | After while ... |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:13:1:25:3 | Exceptional Exit |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:13:1:25:3 | Exit |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:14:3:24:5 | After while ... |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:14:3:24:5 | [LoopHeader] while ... |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:14:9:14:13 | After ... < ... [false] |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:14:9:14:13 | After ... < ... [true] |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:15:5:23:7 | After begin ...  |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:16:10:16:14 | After ... > ... [false] |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:16:10:16:14 | After ... > ... [true] |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:19:5:22:9 | ensure ... |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:20:7:22:9 | After if ... |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:20:10:20:15 | After call to nil? [false] |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:20:10:20:15 | After call to nil? [true] |
+| break_ensure.rb:14:9:14:13 | After ... < ... [false] | break_ensure.rb:14:9:14:13 | After ... < ... [false] |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:13:1:25:3 | Exceptional Exit |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:14:9:14:13 | After ... < ... [true] |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:15:5:23:7 | After begin ...  |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:16:10:16:14 | After ... > ... [false] |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:16:10:16:14 | After ... > ... [true] |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:19:5:22:9 | ensure ... |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:20:7:22:9 | After if ... |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:20:10:20:15 | After call to nil? [false] |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:20:10:20:15 | After call to nil? [true] |
+| break_ensure.rb:15:5:23:7 | After begin ...  | break_ensure.rb:15:5:23:7 | After begin ...  |
+| break_ensure.rb:16:10:16:14 | After ... > ... [false] | break_ensure.rb:16:10:16:14 | After ... > ... [false] |
+| break_ensure.rb:16:10:16:14 | After ... > ... [true] | break_ensure.rb:16:10:16:14 | After ... > ... [true] |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:13:1:25:3 | Exceptional Exit |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:15:5:23:7 | After begin ...  |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:19:5:22:9 | ensure ... |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:20:7:22:9 | After if ... |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:20:10:20:15 | After call to nil? [false] |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:20:10:20:15 | After call to nil? [true] |
+| break_ensure.rb:20:7:22:9 | After if ... | break_ensure.rb:13:1:25:3 | Exceptional Exit |
+| break_ensure.rb:20:7:22:9 | After if ... | break_ensure.rb:15:5:23:7 | After begin ...  |
+| break_ensure.rb:20:7:22:9 | After if ... | break_ensure.rb:20:7:22:9 | After if ... |
+| break_ensure.rb:20:10:20:15 | After call to nil? [false] | break_ensure.rb:20:10:20:15 | After call to nil? [false] |
+| break_ensure.rb:20:10:20:15 | After call to nil? [true] | break_ensure.rb:20:10:20:15 | After call to nil? [true] |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:27:1:42:3 | Entry |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:27:1:42:3 | Exceptional Exit |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:27:1:42:3 | Exit |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:27:1:42:3 | Normal Exit |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:28:3:40:5 | After begin ...  |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:29:8:29:13 | After call to nil? [false] |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:29:8:29:13 | After call to nil? [true] |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:32:3:39:7 | ensure ... |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:33:5:39:7 | After while ... |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:33:5:39:7 | [LoopHeader] while ... |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:33:11:33:15 | After ... < ... [false] |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:33:11:33:15 | After ... < ... [true] |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:35:12:35:16 | After ... > ... [false] |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:35:12:35:16 | After ... > ... [true] |
+| break_ensure.rb:27:1:42:3 | Exceptional Exit | break_ensure.rb:27:1:42:3 | Exceptional Exit |
+| break_ensure.rb:27:1:42:3 | Exit | break_ensure.rb:27:1:42:3 | Exit |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:27:1:42:3 | Normal Exit |
+| break_ensure.rb:28:3:40:5 | After begin ...  | break_ensure.rb:28:3:40:5 | After begin ...  |
+| break_ensure.rb:29:8:29:13 | After call to nil? [false] | break_ensure.rb:29:8:29:13 | After call to nil? [false] |
+| break_ensure.rb:29:8:29:13 | After call to nil? [true] | break_ensure.rb:29:8:29:13 | After call to nil? [true] |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:27:1:42:3 | Exceptional Exit |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:27:1:42:3 | Exit |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:27:1:42:3 | Normal Exit |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:28:3:40:5 | After begin ...  |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:32:3:39:7 | ensure ... |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:33:5:39:7 | After while ... |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:33:5:39:7 | [LoopHeader] while ... |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:33:11:33:15 | After ... < ... [false] |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:33:11:33:15 | After ... < ... [true] |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:35:12:35:16 | After ... > ... [false] |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:35:12:35:16 | After ... > ... [true] |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:27:1:42:3 | Exceptional Exit |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:27:1:42:3 | Exit |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:27:1:42:3 | Normal Exit |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:28:3:40:5 | After begin ...  |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:33:5:39:7 | After while ... |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:27:1:42:3 | Exceptional Exit |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:27:1:42:3 | Exit |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:27:1:42:3 | Normal Exit |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:28:3:40:5 | After begin ...  |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:33:5:39:7 | After while ... |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:33:5:39:7 | [LoopHeader] while ... |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:33:11:33:15 | After ... < ... [false] |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:33:11:33:15 | After ... < ... [true] |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:35:12:35:16 | After ... > ... [false] |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:35:12:35:16 | After ... > ... [true] |
+| break_ensure.rb:33:11:33:15 | After ... < ... [false] | break_ensure.rb:33:11:33:15 | After ... < ... [false] |
+| break_ensure.rb:33:11:33:15 | After ... < ... [true] | break_ensure.rb:33:11:33:15 | After ... < ... [true] |
+| break_ensure.rb:33:11:33:15 | After ... < ... [true] | break_ensure.rb:35:12:35:16 | After ... > ... [false] |
+| break_ensure.rb:33:11:33:15 | After ... < ... [true] | break_ensure.rb:35:12:35:16 | After ... > ... [true] |
+| break_ensure.rb:35:12:35:16 | After ... > ... [false] | break_ensure.rb:35:12:35:16 | After ... > ... [false] |
+| break_ensure.rb:35:12:35:16 | After ... > ... [true] | break_ensure.rb:35:12:35:16 | After ... > ... [true] |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:44:1:56:3 | Entry |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:44:1:56:3 | Exceptional Exit |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:44:1:56:3 | Exit |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:45:3:55:5 | After while ... |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:45:3:55:5 | [LoopHeader] while ... |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:45:9:45:13 | After ... < ... [false] |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:45:9:45:13 | After ... < ... [true] |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:46:5:54:7 | After begin ...  |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:47:10:47:14 | After ... > ... [false] |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:47:10:47:14 | After ... > ... [true] |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:50:5:53:9 | ensure ... |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:51:10:51:14 | After ... > ... [false] |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:51:10:51:14 | After ... > ... [true] |
+| break_ensure.rb:44:1:56:3 | Exceptional Exit | break_ensure.rb:44:1:56:3 | Exceptional Exit |
+| break_ensure.rb:44:1:56:3 | Exit | break_ensure.rb:44:1:56:3 | Exit |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:45:3:55:5 | After while ... |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:44:1:56:3 | Exceptional Exit |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:44:1:56:3 | Exit |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:45:3:55:5 | After while ... |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:45:3:55:5 | [LoopHeader] while ... |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:45:9:45:13 | After ... < ... [false] |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:45:9:45:13 | After ... < ... [true] |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:46:5:54:7 | After begin ...  |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:47:10:47:14 | After ... > ... [false] |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:47:10:47:14 | After ... > ... [true] |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:50:5:53:9 | ensure ... |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:51:10:51:14 | After ... > ... [false] |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:51:10:51:14 | After ... > ... [true] |
+| break_ensure.rb:45:9:45:13 | After ... < ... [false] | break_ensure.rb:45:9:45:13 | After ... < ... [false] |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:44:1:56:3 | Exceptional Exit |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:45:9:45:13 | After ... < ... [true] |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:46:5:54:7 | After begin ...  |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:47:10:47:14 | After ... > ... [false] |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:47:10:47:14 | After ... > ... [true] |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:50:5:53:9 | ensure ... |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:51:10:51:14 | After ... > ... [false] |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:51:10:51:14 | After ... > ... [true] |
+| break_ensure.rb:46:5:54:7 | After begin ...  | break_ensure.rb:46:5:54:7 | After begin ...  |
+| break_ensure.rb:47:10:47:14 | After ... > ... [false] | break_ensure.rb:47:10:47:14 | After ... > ... [false] |
+| break_ensure.rb:47:10:47:14 | After ... > ... [true] | break_ensure.rb:47:10:47:14 | After ... > ... [true] |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:44:1:56:3 | Exceptional Exit |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:46:5:54:7 | After begin ...  |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:50:5:53:9 | ensure ... |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:51:10:51:14 | After ... > ... [false] |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:51:10:51:14 | After ... > ... [true] |
+| break_ensure.rb:51:10:51:14 | After ... > ... [false] | break_ensure.rb:44:1:56:3 | Exceptional Exit |
+| break_ensure.rb:51:10:51:14 | After ... > ... [false] | break_ensure.rb:46:5:54:7 | After begin ...  |
+| break_ensure.rb:51:10:51:14 | After ... > ... [false] | break_ensure.rb:51:10:51:14 | After ... > ... [false] |
+| break_ensure.rb:51:10:51:14 | After ... > ... [true] | break_ensure.rb:51:10:51:14 | After ... > ... [true] |
+| case.rb:1:1:6:3 | Entry | case.rb:1:1:6:3 | Entry |
+| case.rb:1:1:6:3 | Entry | case.rb:2:3:5:5 | After case ... |
+| case.rb:1:1:6:3 | Entry | case.rb:3:10:3:10 | After 1 [match] |
+| case.rb:1:1:6:3 | Entry | case.rb:3:10:3:10 | After 1 [no-match] |
+| case.rb:1:1:6:3 | Entry | case.rb:3:18:3:41 | After if ... |
+| case.rb:1:1:6:3 | Entry | case.rb:3:21:3:22 | After call to x2 [false] |
+| case.rb:1:1:6:3 | Entry | case.rb:3:21:3:22 | After call to x2 [true] |
+| case.rb:1:1:6:3 | Entry | case.rb:4:10:4:10 | After 2 [match] |
+| case.rb:1:1:6:3 | Entry | case.rb:4:10:4:10 | After 2 [no-match] |
+| case.rb:1:1:99:4 | Entry | case.rb:1:1:99:4 | Entry |
+| case.rb:2:3:5:5 | After case ... | case.rb:2:3:5:5 | After case ... |
+| case.rb:3:10:3:10 | After 1 [match] | case.rb:3:10:3:10 | After 1 [match] |
+| case.rb:3:10:3:10 | After 1 [match] | case.rb:3:18:3:41 | After if ... |
+| case.rb:3:10:3:10 | After 1 [match] | case.rb:3:21:3:22 | After call to x2 [false] |
+| case.rb:3:10:3:10 | After 1 [match] | case.rb:3:21:3:22 | After call to x2 [true] |
+| case.rb:3:10:3:10 | After 1 [no-match] | case.rb:3:10:3:10 | After 1 [no-match] |
+| case.rb:3:10:3:10 | After 1 [no-match] | case.rb:4:10:4:10 | After 2 [match] |
+| case.rb:3:10:3:10 | After 1 [no-match] | case.rb:4:10:4:10 | After 2 [no-match] |
+| case.rb:3:18:3:41 | After if ... | case.rb:3:18:3:41 | After if ... |
+| case.rb:3:21:3:22 | After call to x2 [false] | case.rb:3:21:3:22 | After call to x2 [false] |
+| case.rb:3:21:3:22 | After call to x2 [true] | case.rb:3:21:3:22 | After call to x2 [true] |
+| case.rb:4:10:4:10 | After 2 [match] | case.rb:4:10:4:10 | After 2 [match] |
+| case.rb:4:10:4:10 | After 2 [no-match] | case.rb:4:10:4:10 | After 2 [no-match] |
+| case.rb:8:1:18:3 | Entry | case.rb:8:1:18:3 | Entry |
+| case.rb:8:1:18:3 | Entry | case.rb:9:3:17:5 | After case ... |
+| case.rb:8:1:18:3 | Entry | case.rb:10:8:10:8 | After 0 [match] |
+| case.rb:8:1:18:3 | Entry | case.rb:10:8:10:8 | After 0 [no-match] |
+| case.rb:8:1:18:3 | Entry | case.rb:11:8:11:8 | After 1 [match] |
+| case.rb:8:1:18:3 | Entry | case.rb:11:8:11:8 | After 1 [no-match] |
+| case.rb:8:1:18:3 | Entry | case.rb:12:8:12:8 | After 2 [match] |
+| case.rb:8:1:18:3 | Entry | case.rb:12:8:12:8 | After 2 [no-match] |
+| case.rb:8:1:18:3 | Entry | case.rb:14:8:14:8 | After x [match] |
+| case.rb:8:1:18:3 | Entry | case.rb:14:8:14:8 | After x [no-match] |
+| case.rb:8:1:18:3 | Entry | case.rb:14:13:14:18 | After ... == ... [false] |
+| case.rb:8:1:18:3 | Entry | case.rb:14:13:14:18 | After ... == ... [true] |
+| case.rb:8:1:18:3 | Entry | case.rb:15:5:15:28 | in ... then ... |
+| case.rb:8:1:18:3 | Entry | case.rb:15:8:15:8 | After x [match] |
+| case.rb:8:1:18:3 | Entry | case.rb:15:8:15:8 | After x [no-match] |
+| case.rb:8:1:18:3 | Entry | case.rb:15:17:15:21 | After ... < ... [false] |
+| case.rb:8:1:18:3 | Entry | case.rb:15:17:15:21 | After ... < ... [true] |
+| case.rb:8:1:18:3 | Entry | case.rb:16:5:16:10 | else ... |
+| case.rb:9:3:17:5 | After case ... | case.rb:9:3:17:5 | After case ... |
+| case.rb:10:8:10:8 | After 0 [match] | case.rb:10:8:10:8 | After 0 [match] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:10:8:10:8 | After 0 [no-match] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:11:8:11:8 | After 1 [match] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:11:8:11:8 | After 1 [no-match] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:12:8:12:8 | After 2 [match] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:12:8:12:8 | After 2 [no-match] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:14:8:14:8 | After x [match] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:14:8:14:8 | After x [no-match] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:14:13:14:18 | After ... == ... [false] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:14:13:14:18 | After ... == ... [true] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:15:5:15:28 | in ... then ... |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:15:8:15:8 | After x [match] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:15:8:15:8 | After x [no-match] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:15:17:15:21 | After ... < ... [false] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:15:17:15:21 | After ... < ... [true] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:16:5:16:10 | else ... |
+| case.rb:11:8:11:8 | After 1 [match] | case.rb:11:8:11:8 | After 1 [match] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:11:8:11:8 | After 1 [no-match] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:12:8:12:8 | After 2 [match] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:12:8:12:8 | After 2 [no-match] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:14:8:14:8 | After x [match] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:14:8:14:8 | After x [no-match] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:14:13:14:18 | After ... == ... [false] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:14:13:14:18 | After ... == ... [true] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:15:5:15:28 | in ... then ... |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:15:8:15:8 | After x [match] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:15:8:15:8 | After x [no-match] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:15:17:15:21 | After ... < ... [false] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:15:17:15:21 | After ... < ... [true] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:16:5:16:10 | else ... |
+| case.rb:12:8:12:8 | After 2 [match] | case.rb:12:8:12:8 | After 2 [match] |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:12:8:12:8 | After 2 [no-match] |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:14:8:14:8 | After x [match] |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:14:8:14:8 | After x [no-match] |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:14:13:14:18 | After ... == ... [false] |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:14:13:14:18 | After ... == ... [true] |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:15:5:15:28 | in ... then ... |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:15:8:15:8 | After x [match] |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:15:8:15:8 | After x [no-match] |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:15:17:15:21 | After ... < ... [false] |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:15:17:15:21 | After ... < ... [true] |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:16:5:16:10 | else ... |
+| case.rb:14:8:14:8 | After x [match] | case.rb:14:8:14:8 | After x [match] |
+| case.rb:14:8:14:8 | After x [match] | case.rb:14:13:14:18 | After ... == ... [false] |
+| case.rb:14:8:14:8 | After x [match] | case.rb:14:13:14:18 | After ... == ... [true] |
+| case.rb:14:8:14:8 | After x [no-match] | case.rb:14:8:14:8 | After x [no-match] |
+| case.rb:14:13:14:18 | After ... == ... [false] | case.rb:14:13:14:18 | After ... == ... [false] |
+| case.rb:14:13:14:18 | After ... == ... [true] | case.rb:14:13:14:18 | After ... == ... [true] |
 | case.rb:15:5:15:28 | in ... then ... | case.rb:15:5:15:28 | in ... then ... |
-| case.rb:15:5:15:28 | in ... then ... | case.rb:15:17:15:17 | x |
-| case.rb:15:5:15:28 | in ... then ... | case.rb:15:28:15:28 | 7 |
-| case.rb:15:5:15:28 | in ... then ... | case.rb:16:10:16:10 | 8 |
-| case.rb:15:17:15:17 | x | case.rb:15:17:15:17 | x |
-| case.rb:15:17:15:17 | x | case.rb:15:28:15:28 | 7 |
-| case.rb:15:17:15:17 | x | case.rb:16:10:16:10 | 8 |
-| case.rb:15:28:15:28 | 7 | case.rb:15:28:15:28 | 7 |
-| case.rb:16:10:16:10 | 8 | case.rb:16:10:16:10 | 8 |
-| case.rb:20:1:24:3 | enter case_match_no_match | case.rb:20:1:24:3 | enter case_match_no_match |
-| case.rb:20:1:24:3 | enter case_match_no_match | case.rb:20:1:24:3 | exit case_match_no_match |
-| case.rb:20:1:24:3 | enter case_match_no_match | case.rb:20:1:24:3 | exit case_match_no_match (abnormal) |
-| case.rb:20:1:24:3 | enter case_match_no_match | case.rb:21:3:23:5 | case ... |
-| case.rb:20:1:24:3 | exit case_match_no_match | case.rb:20:1:24:3 | exit case_match_no_match |
-| case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | case.rb:20:1:24:3 | exit case_match_no_match (abnormal) |
-| case.rb:21:3:23:5 | case ... | case.rb:21:3:23:5 | case ... |
-| case.rb:26:1:30:3 | enter case_match_raise | case.rb:26:1:30:3 | enter case_match_raise |
-| case.rb:26:1:30:3 | enter case_match_raise | case.rb:26:1:30:3 | exit case_match_raise |
-| case.rb:26:1:30:3 | enter case_match_raise | case.rb:26:1:30:3 | exit case_match_raise (abnormal) |
-| case.rb:26:1:30:3 | enter case_match_raise | case.rb:27:3:29:5 | case ... |
-| case.rb:26:1:30:3 | exit case_match_raise | case.rb:26:1:30:3 | exit case_match_raise |
-| case.rb:26:1:30:3 | exit case_match_raise (abnormal) | case.rb:26:1:30:3 | exit case_match_raise (abnormal) |
-| case.rb:27:3:29:5 | case ... | case.rb:27:3:29:5 | case ... |
-| case.rb:28:7:28:28 | enter -> { ... } | case.rb:28:7:28:28 | enter -> { ... } |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:32:1:39:3 | enter case_match_array |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:32:1:39:3 | exit case_match_array |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:32:1:39:3 | exit case_match_array (abnormal) |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:33:3:38:5 | case ... |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:35:5:35:11 | in ... then ... |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:35:9:35:9 | x |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:36:5:36:13 | in ... then ... |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:36:9:36:9 | x |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:37:5:37:27 | in ... then ... |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:37:8:37:26 | [ ..., * ] |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:37:12:37:12 | a |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:37:15:37:15 | b |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:37:19:37:19 | c |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:37:25:37:25 | e |
-| case.rb:32:1:39:3 | exit case_match_array | case.rb:32:1:39:3 | exit case_match_array |
-| case.rb:32:1:39:3 | exit case_match_array (abnormal) | case.rb:32:1:39:3 | exit case_match_array (abnormal) |
-| case.rb:33:3:38:5 | case ... | case.rb:33:3:38:5 | case ... |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:32:1:39:3 | exit case_match_array (abnormal) |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:35:5:35:11 | in ... then ... |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:35:9:35:9 | x |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:36:5:36:13 | in ... then ... |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:36:9:36:9 | x |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:37:5:37:27 | in ... then ... |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:37:8:37:26 | [ ..., * ] |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:37:12:37:12 | a |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:37:15:37:15 | b |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:37:19:37:19 | c |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:37:25:37:25 | e |
-| case.rb:35:9:35:9 | x | case.rb:35:9:35:9 | x |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:32:1:39:3 | exit case_match_array (abnormal) |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:36:5:36:13 | in ... then ... |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:36:9:36:9 | x |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:37:5:37:27 | in ... then ... |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:37:8:37:26 | [ ..., * ] |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:37:12:37:12 | a |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:37:15:37:15 | b |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:37:19:37:19 | c |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:37:25:37:25 | e |
-| case.rb:36:9:36:9 | x | case.rb:36:9:36:9 | x |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:32:1:39:3 | exit case_match_array (abnormal) |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:5:37:27 | in ... then ... |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:8:37:26 | [ ..., * ] |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:12:37:12 | a |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:15:37:15 | b |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:19:37:19 | c |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:25:37:25 | e |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:8:37:26 | [ ..., * ] |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:12:37:12 | a |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:15:37:15 | b |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:19:37:19 | c |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:25:37:25 | e |
-| case.rb:37:12:37:12 | a | case.rb:37:12:37:12 | a |
-| case.rb:37:12:37:12 | a | case.rb:37:15:37:15 | b |
-| case.rb:37:12:37:12 | a | case.rb:37:19:37:19 | c |
-| case.rb:37:12:37:12 | a | case.rb:37:25:37:25 | e |
-| case.rb:37:15:37:15 | b | case.rb:37:15:37:15 | b |
-| case.rb:37:15:37:15 | b | case.rb:37:19:37:19 | c |
-| case.rb:37:15:37:15 | b | case.rb:37:25:37:25 | e |
-| case.rb:37:19:37:19 | c | case.rb:37:19:37:19 | c |
-| case.rb:37:19:37:19 | c | case.rb:37:25:37:25 | e |
-| case.rb:37:25:37:25 | e | case.rb:37:25:37:25 | e |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:41:1:45:3 | enter case_match_find |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:41:1:45:3 | exit case_match_find |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:41:1:45:3 | exit case_match_find (abnormal) |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:10:43:10 | x |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:16:43:16 | 2 |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:20:43:20 | y |
-| case.rb:41:1:45:3 | exit case_match_find | case.rb:41:1:45:3 | exit case_match_find |
-| case.rb:41:1:45:3 | exit case_match_find (abnormal) | case.rb:41:1:45:3 | exit case_match_find (abnormal) |
-| case.rb:43:10:43:10 | x | case.rb:43:10:43:10 | x |
-| case.rb:43:10:43:10 | x | case.rb:43:16:43:16 | 2 |
-| case.rb:43:10:43:10 | x | case.rb:43:20:43:20 | y |
-| case.rb:43:16:43:16 | 2 | case.rb:43:16:43:16 | 2 |
-| case.rb:43:16:43:16 | 2 | case.rb:43:20:43:20 | y |
-| case.rb:43:20:43:20 | y | case.rb:43:20:43:20 | y |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:47:1:53:3 | enter case_match_hash |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:47:1:53:3 | exit case_match_hash |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:47:1:53:3 | exit case_match_hash (abnormal) |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:48:3:52:5 | case ... |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:49:8:49:34 | { ..., ** } |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:49:20:49:20 | 1 |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:49:23:49:23 | a |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:49:29:49:32 | rest |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:50:5:50:25 | in ... then ... |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:50:8:50:24 | { ..., ** } |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:50:16:50:16 | 1 |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:51:5:51:17 | in ... then ... |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:51:8:51:16 | { ..., ** } |
-| case.rb:47:1:53:3 | exit case_match_hash | case.rb:47:1:53:3 | exit case_match_hash |
-| case.rb:47:1:53:3 | exit case_match_hash (abnormal) | case.rb:47:1:53:3 | exit case_match_hash (abnormal) |
-| case.rb:48:3:52:5 | case ... | case.rb:48:3:52:5 | case ... |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:8:49:34 | { ..., ** } |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:20:49:20 | 1 |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:23:49:23 | a |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:29:49:32 | rest |
-| case.rb:49:20:49:20 | 1 | case.rb:49:20:49:20 | 1 |
-| case.rb:49:20:49:20 | 1 | case.rb:49:23:49:23 | a |
-| case.rb:49:20:49:20 | 1 | case.rb:49:29:49:32 | rest |
-| case.rb:49:23:49:23 | a | case.rb:49:23:49:23 | a |
-| case.rb:49:23:49:23 | a | case.rb:49:29:49:32 | rest |
-| case.rb:49:29:49:32 | rest | case.rb:49:29:49:32 | rest |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:47:1:53:3 | exit case_match_hash (abnormal) |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:50:5:50:25 | in ... then ... |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:50:8:50:24 | { ..., ** } |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:50:16:50:16 | 1 |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:51:5:51:17 | in ... then ... |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:51:8:51:16 | { ..., ** } |
-| case.rb:50:8:50:24 | { ..., ** } | case.rb:50:8:50:24 | { ..., ** } |
-| case.rb:50:8:50:24 | { ..., ** } | case.rb:50:16:50:16 | 1 |
-| case.rb:50:16:50:16 | 1 | case.rb:50:16:50:16 | 1 |
-| case.rb:51:5:51:17 | in ... then ... | case.rb:47:1:53:3 | exit case_match_hash (abnormal) |
-| case.rb:51:5:51:17 | in ... then ... | case.rb:51:5:51:17 | in ... then ... |
-| case.rb:51:5:51:17 | in ... then ... | case.rb:51:8:51:16 | { ..., ** } |
-| case.rb:51:8:51:16 | { ..., ** } | case.rb:51:8:51:16 | { ..., ** } |
-| case.rb:55:1:61:3 | enter case_match_variable | case.rb:55:1:61:3 | enter case_match_variable |
-| case.rb:55:1:61:3 | enter case_match_variable | case.rb:56:3:60:5 | case ... |
-| case.rb:55:1:61:3 | enter case_match_variable | case.rb:58:5:58:10 | in ... then ... |
-| case.rb:56:3:60:5 | case ... | case.rb:56:3:60:5 | case ... |
-| case.rb:58:5:58:10 | in ... then ... | case.rb:58:5:58:10 | in ... then ... |
-| case.rb:63:1:67:3 | enter case_match_underscore | case.rb:63:1:67:3 | enter case_match_underscore |
-| case.rb:63:1:67:3 | enter case_match_underscore | case.rb:64:3:66:5 | case ... |
-| case.rb:63:1:67:3 | enter case_match_underscore | case.rb:65:12:65:12 | _ |
-| case.rb:64:3:66:5 | case ... | case.rb:64:3:66:5 | case ... |
-| case.rb:65:12:65:12 | _ | case.rb:65:12:65:12 | _ |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:69:1:93:3 | enter case_match_various |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:69:1:93:3 | exit case_match_various |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:72:3:92:5 | case ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:74:5:74:11 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:75:5:75:15 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:76:5:76:18 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:77:5:77:18 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:78:5:78:19 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:79:5:79:14 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:80:5:80:12 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:81:5:81:11 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:82:13:82:13 | x |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:82:20:82:20 | 1 |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:83:12:83:15 | ^... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:83:20:83:25 | string |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:88:14:88:15 | 10 |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:14:89:17 | self |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:21:89:24 | true |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:28:89:32 | false |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:91:13:91:14 | "" |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:69:1:93:3 | exit case_match_various | case.rb:69:1:93:3 | exit case_match_various |
-| case.rb:69:1:93:3 | exit case_match_various (abnormal) | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:72:3:92:5 | case ... | case.rb:72:3:92:5 | case ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:74:5:74:11 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:75:5:75:15 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:76:5:76:18 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:77:5:77:18 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:78:5:78:19 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:79:5:79:14 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:80:5:80:12 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:81:5:81:11 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:82:13:82:13 | x |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:82:20:82:20 | 1 |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:83:12:83:15 | ^... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:83:20:83:25 | string |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:75:5:75:15 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:76:5:76:18 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:77:5:77:18 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:78:5:78:19 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:79:5:79:14 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:80:5:80:12 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:81:5:81:11 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:82:13:82:13 | x |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:82:20:82:20 | 1 |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:83:12:83:15 | ^... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:83:20:83:25 | string |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:76:5:76:18 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:77:5:77:18 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:78:5:78:19 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:79:5:79:14 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:80:5:80:12 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:81:5:81:11 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:82:13:82:13 | x |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:82:20:82:20 | 1 |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:83:12:83:15 | ^... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:83:20:83:25 | string |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:77:5:77:18 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:78:5:78:19 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:79:5:79:14 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:80:5:80:12 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:81:5:81:11 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:82:13:82:13 | x |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:82:20:82:20 | 1 |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:83:12:83:15 | ^... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:83:20:83:25 | string |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:78:5:78:19 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:79:5:79:14 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:80:5:80:12 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:81:5:81:11 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:82:13:82:13 | x |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:82:20:82:20 | 1 |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:83:12:83:15 | ^... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:83:20:83:25 | string |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:79:5:79:14 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:80:5:80:12 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:81:5:81:11 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:82:13:82:13 | x |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:82:20:82:20 | 1 |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:83:12:83:15 | ^... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:83:20:83:25 | string |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:80:5:80:12 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:81:5:81:11 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:82:13:82:13 | x |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:82:20:82:20 | 1 |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:83:12:83:15 | ^... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:83:20:83:25 | string |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:81:5:81:11 | in ... then ... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:82:13:82:13 | x |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:82:20:82:20 | 1 |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:83:12:83:15 | ^... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:83:20:83:25 | string |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:82:13:82:13 | x |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:82:20:82:20 | 1 |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:83:12:83:15 | ^... |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:83:20:83:25 | string |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:82:13:82:13 | x | case.rb:82:13:82:13 | x |
-| case.rb:82:13:82:13 | x | case.rb:82:20:82:20 | 1 |
-| case.rb:82:20:82:20 | 1 | case.rb:82:20:82:20 | 1 |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:83:12:83:15 | ^... |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:83:20:83:25 | string |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:83:12:83:15 | ^... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:83:12:83:15 | ^... | case.rb:83:12:83:15 | ^... |
-| case.rb:83:12:83:15 | ^... | case.rb:83:20:83:25 | string |
-| case.rb:83:12:83:15 | ^... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:83:12:83:15 | ^... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:83:12:83:15 | ^... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:83:12:83:15 | ^... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:83:12:83:15 | ^... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:83:12:83:15 | ^... | case.rb:88:14:88:15 | 10 |
-| case.rb:83:12:83:15 | ^... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:83:12:83:15 | ^... | case.rb:89:14:89:17 | self |
-| case.rb:83:12:83:15 | ^... | case.rb:89:21:89:24 | true |
-| case.rb:83:12:83:15 | ^... | case.rb:89:28:89:32 | false |
-| case.rb:83:12:83:15 | ^... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:83:12:83:15 | ^... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:83:12:83:15 | ^... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:83:12:83:15 | ^... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:83:12:83:15 | ^... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:83:12:83:15 | ^... | case.rb:91:13:91:14 | "" |
-| case.rb:83:12:83:15 | ^... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:83:12:83:15 | ^... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:83:20:83:25 | string | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:83:20:83:25 | string | case.rb:83:20:83:25 | string |
-| case.rb:83:20:83:25 | string | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:83:20:83:25 | string | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:83:20:83:25 | string | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:83:20:83:25 | string | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:83:20:83:25 | string | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:83:20:83:25 | string | case.rb:88:14:88:15 | 10 |
-| case.rb:83:20:83:25 | string | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:83:20:83:25 | string | case.rb:89:14:89:17 | self |
-| case.rb:83:20:83:25 | string | case.rb:89:21:89:24 | true |
-| case.rb:83:20:83:25 | string | case.rb:89:28:89:32 | false |
-| case.rb:83:20:83:25 | string | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:83:20:83:25 | string | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:83:20:83:25 | string | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:83:20:83:25 | string | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:83:20:83:25 | string | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:83:20:83:25 | string | case.rb:91:13:91:14 | "" |
-| case.rb:83:20:83:25 | string | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:83:20:83:25 | string | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:85:8:85:23 | enter -> { ... } | case.rb:85:8:85:23 | enter -> { ... } |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:88:14:88:15 | 10 | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:88:14:88:15 | 10 | case.rb:88:14:88:15 | 10 |
-| case.rb:88:14:88:15 | 10 | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:88:14:88:15 | 10 | case.rb:89:14:89:17 | self |
-| case.rb:88:14:88:15 | 10 | case.rb:89:21:89:24 | true |
-| case.rb:88:14:88:15 | 10 | case.rb:89:28:89:32 | false |
-| case.rb:88:14:88:15 | 10 | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:88:14:88:15 | 10 | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:88:14:88:15 | 10 | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:88:14:88:15 | 10 | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:88:14:88:15 | 10 | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:88:14:88:15 | 10 | case.rb:91:13:91:14 | "" |
-| case.rb:88:14:88:15 | 10 | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:88:14:88:15 | 10 | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:14:89:17 | self |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:21:89:24 | true |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:28:89:32 | false |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:89:14:89:17 | self | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:89:14:89:17 | self | case.rb:89:14:89:17 | self |
-| case.rb:89:14:89:17 | self | case.rb:89:21:89:24 | true |
-| case.rb:89:14:89:17 | self | case.rb:89:28:89:32 | false |
-| case.rb:89:14:89:17 | self | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:89:14:89:17 | self | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:89:14:89:17 | self | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:89:14:89:17 | self | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:89:14:89:17 | self | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:89:14:89:17 | self | case.rb:91:13:91:14 | "" |
-| case.rb:89:14:89:17 | self | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:89:14:89:17 | self | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:89:21:89:24 | true | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:89:21:89:24 | true | case.rb:89:21:89:24 | true |
-| case.rb:89:21:89:24 | true | case.rb:89:28:89:32 | false |
-| case.rb:89:21:89:24 | true | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:89:21:89:24 | true | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:89:21:89:24 | true | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:89:21:89:24 | true | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:89:21:89:24 | true | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:89:21:89:24 | true | case.rb:91:13:91:14 | "" |
-| case.rb:89:21:89:24 | true | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:89:21:89:24 | true | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:89:28:89:32 | false | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:89:28:89:32 | false | case.rb:89:28:89:32 | false |
-| case.rb:89:28:89:32 | false | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:89:28:89:32 | false | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:89:28:89:32 | false | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:89:28:89:32 | false | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:89:28:89:32 | false | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:89:28:89:32 | false | case.rb:91:13:91:14 | "" |
-| case.rb:89:28:89:32 | false | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:89:28:89:32 | false | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:91:13:91:14 | "" |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:91:13:91:14 | "" |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:91:13:91:14 | "" |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:91:5:91:25 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:91:5:91:25 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:91:5:91:25 | in ... then ... | case.rb:91:13:91:14 | "" |
-| case.rb:91:5:91:25 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:91:5:91:25 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:91:13:91:14 | "" | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:91:13:91:14 | "" | case.rb:91:13:91:14 | "" |
-| case.rb:91:13:91:14 | "" | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:91:13:91:14 | "" | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:91:18:91:19 | [ ..., * ] | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:91:18:91:19 | [ ..., * ] | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:91:18:91:19 | [ ..., * ] | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:91:23:91:24 | { ..., ** } | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:91:23:91:24 | { ..., ** } | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:95:1:99:3 | enter case_match_guard_no_else |
-| case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:95:1:99:3 | exit case_match_guard_no_else |
-| case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) |
-| case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:97:13:97:13 | x |
-| case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:97:25:97:25 | 6 |
-| case.rb:95:1:99:3 | exit case_match_guard_no_else | case.rb:95:1:99:3 | exit case_match_guard_no_else |
-| case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) |
-| case.rb:97:13:97:13 | x | case.rb:95:1:99:3 | exit case_match_guard_no_else |
-| case.rb:97:13:97:13 | x | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) |
-| case.rb:97:13:97:13 | x | case.rb:97:13:97:13 | x |
-| case.rb:97:13:97:13 | x | case.rb:97:25:97:25 | 6 |
-| case.rb:97:25:97:25 | 6 | case.rb:97:25:97:25 | 6 |
-| cfg.html.erb:5:16:31:12 | enter cfg.html.erb | cfg.html.erb:5:16:31:12 | enter cfg.html.erb |
-| cfg.html.erb:5:16:31:12 | enter cfg.html.erb | cfg.html.erb:18:14:22:16 | if ... |
-| cfg.html.erb:5:16:31:12 | enter cfg.html.erb | cfg.html.erb:19:19:19:32 | self |
-| cfg.html.erb:5:16:31:12 | enter cfg.html.erb | cfg.html.erb:21:19:21:32 | self |
-| cfg.html.erb:18:14:22:16 | if ... | cfg.html.erb:18:14:22:16 | if ... |
-| cfg.html.erb:19:19:19:32 | self | cfg.html.erb:19:19:19:32 | self |
-| cfg.html.erb:21:19:21:32 | self | cfg.html.erb:21:19:21:32 | self |
-| cfg.html.erb:29:24:31:10 | enter do ... end | cfg.html.erb:29:24:31:10 | enter do ... end |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:42:15:42:24 | self |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:43:21:43:31 | self |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:44:8:44:18 | self |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:48:20:48:29 | self |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:49:8:49:8 | b |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:49:16:49:16 | b |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:49:27:49:37 | self |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:75:23:75:23 | x |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:75:43:75:43 | x |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:90:5:90:5 | x |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:113:1:113:9 | self |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:136:12:136:29 | self |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:172:21:172:29 | self |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:172:36:172:45 | self |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:174:1:174:9 | self |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:176:7:176:7 | x |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:176:17:176:17 | x |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:179:2:179:13 | self |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:179:30:179:30 | i |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:182:7:182:7 | x |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:183:3:183:3 | x |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:188:2:188:13 | self |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:188:30:188:30 | i |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:25:9:25:22 | enter { ... } | cfg.rb:25:9:25:22 | enter { ... } |
-| cfg.rb:29:10:29:24 | enter { ... } | cfg.rb:29:10:29:24 | enter { ... } |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:42:15:42:24 | self |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:43:21:43:31 | self |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:44:8:44:18 | self |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:48:20:48:29 | self |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:49:8:49:8 | b |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:49:16:49:16 | b |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:49:27:49:37 | self |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:75:23:75:23 | x |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:75:43:75:43 | x |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:90:5:90:5 | x |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:113:1:113:9 | self |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:136:12:136:29 | self |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:172:21:172:29 | self |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:172:36:172:45 | self |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:174:1:174:9 | self |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:176:7:176:7 | x |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:176:17:176:17 | x |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:179:2:179:13 | self |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:179:30:179:30 | i |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:182:7:182:7 | x |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:183:3:183:3 | x |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:188:2:188:13 | self |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:188:30:188:30 | i |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:42:3:42:24 | [match] when ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:42:3:42:24 | [match] when ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:42:15:42:24 | self | cfg.rb:42:15:42:24 | self |
-| cfg.rb:43:3:43:31 | [match] when ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:43:3:43:31 | [match] when ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:43:3:43:31 | [no-match] when ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:43:3:43:31 | [no-match] when ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:21:43:31 | self |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:44:8:44:18 | self |
-| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:43:11:43:11 | 3 | cfg.rb:44:8:44:18 | self |
-| cfg.rb:43:14:43:14 | 4 | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:43:14:43:14 | 4 | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:43:14:43:14 | 4 | cfg.rb:44:8:44:18 | self |
-| cfg.rb:43:21:43:31 | self | cfg.rb:43:21:43:31 | self |
-| cfg.rb:44:8:44:18 | self | cfg.rb:44:8:44:18 | self |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:48:3:48:29 | [match] when ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:48:3:48:29 | [match] when ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:48:20:48:29 | self | cfg.rb:48:20:48:29 | self |
-| cfg.rb:49:3:49:37 | [match] when ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:49:3:49:37 | [match] when ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:49:3:49:37 | [no-match] when ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:49:8:49:8 | b | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:49:8:49:8 | b | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:49:8:49:8 | b | cfg.rb:49:8:49:8 | b |
-| cfg.rb:49:8:49:8 | b | cfg.rb:49:16:49:16 | b |
-| cfg.rb:49:8:49:8 | b | cfg.rb:49:27:49:37 | self |
-| cfg.rb:49:16:49:16 | b | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:49:16:49:16 | b | cfg.rb:49:16:49:16 | b |
-| cfg.rb:49:27:49:37 | self | cfg.rb:49:27:49:37 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:60:27:60:31 | hello | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:60:37:60:39 | bye | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:63:3:66:5 | enter pattern | cfg.rb:63:3:66:5 | enter pattern |
-| cfg.rb:69:3:71:5 | enter print | cfg.rb:69:3:71:5 | enter print |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:75:15:75:15 | 0 | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:75:17:75:43 | elsif ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:75:23:75:23 | x | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:75:23:75:23 | x | cfg.rb:75:23:75:23 | x |
-| cfg.rb:75:23:75:23 | x | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:75:23:75:23 | x | cfg.rb:75:43:75:43 | x |
-| cfg.rb:75:35:75:36 | 10 | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:75:43:75:43 | x | cfg.rb:75:43:75:43 | x |
-| cfg.rb:90:1:93:3 | enter { ... } | cfg.rb:90:1:93:3 | enter { ... } |
-| cfg.rb:90:1:93:3 | enter { ... } | cfg.rb:90:1:93:3 | exit { ... } (normal) |
-| cfg.rb:90:1:93:3 | enter { ... } | cfg.rb:91:3:91:24 | if ... |
-| cfg.rb:90:1:93:3 | enter { ... } | cfg.rb:91:17:91:20 | next |
-| cfg.rb:90:1:93:3 | exit { ... } (normal) | cfg.rb:90:1:93:3 | exit { ... } (normal) |
-| cfg.rb:90:5:90:5 | [false] ! ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:90:5:90:5 | [true] ! ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:90:5:90:5 | [true] ! ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:90:5:90:5 | x | cfg.rb:90:5:90:5 | x |
-| cfg.rb:91:3:91:24 | if ... | cfg.rb:91:3:91:24 | if ... |
-| cfg.rb:91:17:91:20 | next | cfg.rb:91:17:91:20 | next |
-| cfg.rb:101:1:104:3 | enter parameters | cfg.rb:101:1:104:3 | enter parameters |
-| cfg.rb:101:1:104:3 | enter parameters | cfg.rb:101:24:101:25 | 42 |
-| cfg.rb:101:1:104:3 | enter parameters | cfg.rb:101:28:101:30 | key |
-| cfg.rb:101:24:101:25 | 42 | cfg.rb:101:24:101:25 | 42 |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:15:8:15:8 | After x [match] |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:15:8:15:8 | After x [no-match] |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:15:17:15:21 | After ... < ... [false] |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:15:17:15:21 | After ... < ... [true] |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:16:5:16:10 | else ... |
+| case.rb:15:8:15:8 | After x [match] | case.rb:15:8:15:8 | After x [match] |
+| case.rb:15:8:15:8 | After x [match] | case.rb:15:17:15:21 | After ... < ... [false] |
+| case.rb:15:8:15:8 | After x [match] | case.rb:15:17:15:21 | After ... < ... [true] |
+| case.rb:15:8:15:8 | After x [no-match] | case.rb:15:8:15:8 | After x [no-match] |
+| case.rb:15:17:15:21 | After ... < ... [false] | case.rb:15:17:15:21 | After ... < ... [false] |
+| case.rb:15:17:15:21 | After ... < ... [true] | case.rb:15:17:15:21 | After ... < ... [true] |
+| case.rb:16:5:16:10 | else ... | case.rb:16:5:16:10 | else ... |
+| case.rb:20:1:24:3 | Entry | case.rb:20:1:24:3 | Entry |
+| case.rb:20:1:24:3 | Entry | case.rb:21:3:23:5 | After case ... |
+| case.rb:20:1:24:3 | Entry | case.rb:22:8:22:8 | After 1 [match] |
+| case.rb:20:1:24:3 | Entry | case.rb:22:8:22:8 | After 1 [no-match] |
+| case.rb:21:3:23:5 | After case ... | case.rb:21:3:23:5 | After case ... |
+| case.rb:22:8:22:8 | After 1 [match] | case.rb:22:8:22:8 | After 1 [match] |
+| case.rb:22:8:22:8 | After 1 [no-match] | case.rb:22:8:22:8 | After 1 [no-match] |
+| case.rb:26:1:30:3 | Entry | case.rb:26:1:30:3 | Entry |
+| case.rb:26:1:30:3 | Entry | case.rb:27:3:29:5 | After case ... |
+| case.rb:26:1:30:3 | Entry | case.rb:28:7:28:28 | After -> { ... } [match] |
+| case.rb:26:1:30:3 | Entry | case.rb:28:7:28:28 | After -> { ... } [no-match] |
+| case.rb:27:3:29:5 | After case ... | case.rb:27:3:29:5 | After case ... |
+| case.rb:28:7:28:28 | After -> { ... } [match] | case.rb:28:7:28:28 | After -> { ... } [match] |
+| case.rb:28:7:28:28 | After -> { ... } [no-match] | case.rb:28:7:28:28 | After -> { ... } [no-match] |
+| case.rb:28:7:28:28 | Entry | case.rb:28:7:28:28 | Entry |
+| case.rb:32:1:39:3 | Entry | case.rb:32:1:39:3 | Entry |
+| case.rb:32:1:39:3 | Entry | case.rb:33:3:38:5 | After case ... |
+| case.rb:32:1:39:3 | Entry | case.rb:34:8:34:9 | After [ ..., * ] [match] |
+| case.rb:32:1:39:3 | Entry | case.rb:34:8:34:9 | After [ ..., * ] [no-match] |
+| case.rb:32:1:39:3 | Entry | case.rb:35:8:35:10 | After [ ..., * ] [match] |
+| case.rb:32:1:39:3 | Entry | case.rb:35:8:35:10 | After [ ..., * ] [no-match] |
+| case.rb:32:1:39:3 | Entry | case.rb:36:8:36:12 | After [ ..., * ] [match] |
+| case.rb:32:1:39:3 | Entry | case.rb:36:8:36:12 | After [ ..., * ] [no-match] |
+| case.rb:32:1:39:3 | Entry | case.rb:37:8:37:26 | After [ ..., * ] [match] |
+| case.rb:32:1:39:3 | Entry | case.rb:37:8:37:26 | After [ ..., * ] [no-match] |
+| case.rb:33:3:38:5 | After case ... | case.rb:33:3:38:5 | After case ... |
+| case.rb:34:8:34:9 | After [ ..., * ] [match] | case.rb:34:8:34:9 | After [ ..., * ] [match] |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:34:8:34:9 | After [ ..., * ] [no-match] |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:35:8:35:10 | After [ ..., * ] [match] |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:35:8:35:10 | After [ ..., * ] [no-match] |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:36:8:36:12 | After [ ..., * ] [match] |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:36:8:36:12 | After [ ..., * ] [no-match] |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [match] |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [no-match] |
+| case.rb:35:8:35:10 | After [ ..., * ] [match] | case.rb:35:8:35:10 | After [ ..., * ] [match] |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:35:8:35:10 | After [ ..., * ] [no-match] |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:36:8:36:12 | After [ ..., * ] [match] |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:36:8:36:12 | After [ ..., * ] [no-match] |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [match] |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [no-match] |
+| case.rb:36:8:36:12 | After [ ..., * ] [match] | case.rb:36:8:36:12 | After [ ..., * ] [match] |
+| case.rb:36:8:36:12 | After [ ..., * ] [no-match] | case.rb:36:8:36:12 | After [ ..., * ] [no-match] |
+| case.rb:36:8:36:12 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [match] |
+| case.rb:36:8:36:12 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [no-match] |
+| case.rb:37:8:37:26 | After [ ..., * ] [match] | case.rb:37:8:37:26 | After [ ..., * ] [match] |
+| case.rb:37:8:37:26 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [no-match] |
+| case.rb:41:1:45:3 | Entry | case.rb:41:1:45:3 | Entry |
+| case.rb:41:1:45:3 | Entry | case.rb:42:3:44:5 | After case ... |
+| case.rb:41:1:45:3 | Entry | case.rb:43:8:43:21 | After [ *,...,* ] [match] |
+| case.rb:41:1:45:3 | Entry | case.rb:43:8:43:21 | After [ *,...,* ] [no-match] |
+| case.rb:42:3:44:5 | After case ... | case.rb:42:3:44:5 | After case ... |
+| case.rb:43:8:43:21 | After [ *,...,* ] [match] | case.rb:43:8:43:21 | After [ *,...,* ] [match] |
+| case.rb:43:8:43:21 | After [ *,...,* ] [no-match] | case.rb:43:8:43:21 | After [ *,...,* ] [no-match] |
+| case.rb:47:1:53:3 | Entry | case.rb:47:1:53:3 | Entry |
+| case.rb:47:1:53:3 | Entry | case.rb:48:3:52:5 | After case ... |
+| case.rb:47:1:53:3 | Entry | case.rb:49:8:49:34 | After { ..., ** } [match] |
+| case.rb:47:1:53:3 | Entry | case.rb:49:8:49:34 | After { ..., ** } [no-match] |
+| case.rb:47:1:53:3 | Entry | case.rb:50:8:50:24 | After { ..., ** } [match] |
+| case.rb:47:1:53:3 | Entry | case.rb:50:8:50:24 | After { ..., ** } [no-match] |
+| case.rb:47:1:53:3 | Entry | case.rb:51:8:51:16 | After { ..., ** } [match] |
+| case.rb:47:1:53:3 | Entry | case.rb:51:8:51:16 | After { ..., ** } [no-match] |
+| case.rb:48:3:52:5 | After case ... | case.rb:48:3:52:5 | After case ... |
+| case.rb:49:8:49:34 | After { ..., ** } [match] | case.rb:49:8:49:34 | After { ..., ** } [match] |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:49:8:49:34 | After { ..., ** } [no-match] |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:50:8:50:24 | After { ..., ** } [match] |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:50:8:50:24 | After { ..., ** } [no-match] |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:51:8:51:16 | After { ..., ** } [match] |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:51:8:51:16 | After { ..., ** } [no-match] |
+| case.rb:50:8:50:24 | After { ..., ** } [match] | case.rb:50:8:50:24 | After { ..., ** } [match] |
+| case.rb:50:8:50:24 | After { ..., ** } [no-match] | case.rb:50:8:50:24 | After { ..., ** } [no-match] |
+| case.rb:50:8:50:24 | After { ..., ** } [no-match] | case.rb:51:8:51:16 | After { ..., ** } [match] |
+| case.rb:50:8:50:24 | After { ..., ** } [no-match] | case.rb:51:8:51:16 | After { ..., ** } [no-match] |
+| case.rb:51:8:51:16 | After { ..., ** } [match] | case.rb:51:8:51:16 | After { ..., ** } [match] |
+| case.rb:51:8:51:16 | After { ..., ** } [no-match] | case.rb:51:8:51:16 | After { ..., ** } [no-match] |
+| case.rb:55:1:61:3 | Entry | case.rb:55:1:61:3 | Entry |
+| case.rb:55:1:61:3 | Entry | case.rb:56:3:60:5 | After case ... |
+| case.rb:55:1:61:3 | Entry | case.rb:57:8:57:8 | After 5 [match] |
+| case.rb:55:1:61:3 | Entry | case.rb:57:8:57:8 | After 5 [no-match] |
+| case.rb:55:1:61:3 | Entry | case.rb:58:8:58:10 | After var [match] |
+| case.rb:55:1:61:3 | Entry | case.rb:58:8:58:10 | After var [no-match] |
+| case.rb:55:1:61:3 | Entry | case.rb:59:8:59:20 | After "unreachable" [match] |
+| case.rb:55:1:61:3 | Entry | case.rb:59:8:59:20 | After "unreachable" [no-match] |
+| case.rb:56:3:60:5 | After case ... | case.rb:56:3:60:5 | After case ... |
+| case.rb:57:8:57:8 | After 5 [match] | case.rb:57:8:57:8 | After 5 [match] |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:57:8:57:8 | After 5 [no-match] |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:58:8:58:10 | After var [match] |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:58:8:58:10 | After var [no-match] |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:59:8:59:20 | After "unreachable" [match] |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:59:8:59:20 | After "unreachable" [no-match] |
+| case.rb:58:8:58:10 | After var [match] | case.rb:58:8:58:10 | After var [match] |
+| case.rb:58:8:58:10 | After var [no-match] | case.rb:58:8:58:10 | After var [no-match] |
+| case.rb:58:8:58:10 | After var [no-match] | case.rb:59:8:59:20 | After "unreachable" [match] |
+| case.rb:58:8:58:10 | After var [no-match] | case.rb:59:8:59:20 | After "unreachable" [no-match] |
+| case.rb:59:8:59:20 | After "unreachable" [match] | case.rb:59:8:59:20 | After "unreachable" [match] |
+| case.rb:59:8:59:20 | After "unreachable" [no-match] | case.rb:59:8:59:20 | After "unreachable" [no-match] |
+| case.rb:63:1:67:3 | Entry | case.rb:63:1:67:3 | Entry |
+| case.rb:63:1:67:3 | Entry | case.rb:64:3:66:5 | After case ... |
+| case.rb:63:1:67:3 | Entry | case.rb:65:8:65:28 | After ... \| ... [match] |
+| case.rb:63:1:67:3 | Entry | case.rb:65:8:65:28 | After ... \| ... [no-match] |
+| case.rb:64:3:66:5 | After case ... | case.rb:64:3:66:5 | After case ... |
+| case.rb:65:8:65:28 | After ... \| ... [match] | case.rb:65:8:65:28 | After ... \| ... [match] |
+| case.rb:65:8:65:28 | After ... \| ... [no-match] | case.rb:65:8:65:28 | After ... \| ... [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:69:1:93:3 | Entry |
+| case.rb:69:1:93:3 | Entry | case.rb:72:3:92:5 | After case ... |
+| case.rb:69:1:93:3 | Entry | case.rb:73:8:73:8 | After 5 [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:73:8:73:8 | After 5 [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:74:8:74:11 | After ^... [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:74:8:74:11 | After ^... [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:75:8:75:15 | After "string" [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:75:8:75:15 | After "string" [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:76:8:76:18 | After call to [] [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:76:8:76:18 | After call to [] [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:77:8:77:18 | After call to [] [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:77:8:77:18 | After call to [] [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:79:8:79:14 | After _ .. _ [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:79:8:79:14 | After _ .. _ [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:80:8:80:12 | After _ .. _ [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:80:8:80:12 | After _ .. _ [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:81:8:81:11 | After _ .. _ [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:82:8:82:13 | After ... => ... [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:69:1:93:3 | Entry | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:72:3:92:5 | After case ... |
+| case.rb:73:8:73:8 | After 5 [match] | case.rb:73:8:73:8 | After 5 [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:73:8:73:8 | After 5 [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:74:8:74:11 | After ^... [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:74:8:74:11 | After ^... [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:75:8:75:15 | After "string" [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:75:8:75:15 | After "string" [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:76:8:76:18 | After call to [] [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:76:8:76:18 | After call to [] [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:77:8:77:18 | After call to [] [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:77:8:77:18 | After call to [] [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:79:8:79:14 | After _ .. _ [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:82:8:82:13 | After ... => ... [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:74:8:74:11 | After ^... [match] | case.rb:74:8:74:11 | After ^... [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:74:8:74:11 | After ^... [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:75:8:75:15 | After "string" [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:75:8:75:15 | After "string" [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:76:8:76:18 | After call to [] [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:76:8:76:18 | After call to [] [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:77:8:77:18 | After call to [] [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:77:8:77:18 | After call to [] [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:79:8:79:14 | After _ .. _ [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:82:8:82:13 | After ... => ... [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:75:8:75:15 | After "string" [match] | case.rb:75:8:75:15 | After "string" [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:75:8:75:15 | After "string" [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:76:8:76:18 | After call to [] [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:76:8:76:18 | After call to [] [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:77:8:77:18 | After call to [] [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:77:8:77:18 | After call to [] [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:79:8:79:14 | After _ .. _ [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:82:8:82:13 | After ... => ... [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:76:8:76:18 | After call to [] [match] | case.rb:76:8:76:18 | After call to [] [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:76:8:76:18 | After call to [] [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:77:8:77:18 | After call to [] [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:77:8:77:18 | After call to [] [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:79:8:79:14 | After _ .. _ [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:82:8:82:13 | After ... => ... [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:77:8:77:18 | After call to [] [match] | case.rb:77:8:77:18 | After call to [] [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:77:8:77:18 | After call to [] [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:79:8:79:14 | After _ .. _ [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:82:8:82:13 | After ... => ... [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:79:8:79:14 | After _ .. _ [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:82:8:82:13 | After ... => ... [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [match] | case.rb:79:8:79:14 | After _ .. _ [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [match] | case.rb:80:8:80:12 | After _ .. _ [match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [match] | case.rb:81:8:81:11 | After _ .. _ [match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:82:8:82:13 | After ... => ... [match] | case.rb:82:8:82:13 | After ... => ... [match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:83:8:83:26 | After ... \| ... [match] | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:84:8:84:17 | After Bar [match] | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:85:8:85:23 | After -> { ... } [match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:85:8:85:23 | Entry | case.rb:85:8:85:23 | Entry |
+| case.rb:86:8:86:11 | After :foo [match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:87:8:87:17 | After :"foo bar" [match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:88:8:88:15 | After ... \| ... [match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:89:8:89:69 | After ... \| ... [match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:90:8:90:13 | After ( ... ) [match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:90:8:90:13 | After ( ... ) [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:90:8:90:13 | After ( ... ) [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:90:8:90:13 | After ( ... ) [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:91:8:91:25 | After ( ... ) [match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:91:8:91:25 | After ( ... ) [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:95:1:99:3 | Entry | case.rb:95:1:99:3 | Entry |
+| case.rb:95:1:99:3 | Entry | case.rb:96:3:98:5 | After case ... |
+| case.rb:95:1:99:3 | Entry | case.rb:97:8:97:8 | After x [match] |
+| case.rb:95:1:99:3 | Entry | case.rb:97:8:97:8 | After x [no-match] |
+| case.rb:95:1:99:3 | Entry | case.rb:97:13:97:18 | After ... == ... [false] |
+| case.rb:95:1:99:3 | Entry | case.rb:97:13:97:18 | After ... == ... [true] |
+| case.rb:96:3:98:5 | After case ... | case.rb:96:3:98:5 | After case ... |
+| case.rb:97:8:97:8 | After x [match] | case.rb:97:8:97:8 | After x [match] |
+| case.rb:97:8:97:8 | After x [match] | case.rb:97:13:97:18 | After ... == ... [false] |
+| case.rb:97:8:97:8 | After x [match] | case.rb:97:13:97:18 | After ... == ... [true] |
+| case.rb:97:8:97:8 | After x [no-match] | case.rb:97:8:97:8 | After x [no-match] |
+| case.rb:97:13:97:18 | After ... == ... [false] | case.rb:97:13:97:18 | After ... == ... [false] |
+| case.rb:97:13:97:18 | After ... == ... [true] | case.rb:97:13:97:18 | After ... == ... [true] |
+| cfg.html.erb:5:16:31:12 | Entry | cfg.html.erb:5:16:31:12 | Entry |
+| cfg.html.erb:5:16:31:12 | Entry | cfg.html.erb:18:14:22:16 | After if ... |
+| cfg.html.erb:5:16:31:12 | Entry | cfg.html.erb:18:17:18:22 | After call to admin? [false] |
+| cfg.html.erb:5:16:31:12 | Entry | cfg.html.erb:18:17:18:22 | After call to admin? [true] |
+| cfg.html.erb:18:14:22:16 | After if ... | cfg.html.erb:18:14:22:16 | After if ... |
+| cfg.html.erb:18:17:18:22 | After call to admin? [false] | cfg.html.erb:18:17:18:22 | After call to admin? [false] |
+| cfg.html.erb:18:17:18:22 | After call to admin? [true] | cfg.html.erb:18:17:18:22 | After call to admin? [true] |
+| cfg.html.erb:29:24:31:10 | Entry | cfg.html.erb:29:24:31:10 | Entry |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:1:1:221:1 | Exceptional Exit |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:1:1:221:1 | Exit |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:1:1:221:1 | Exceptional Exit | cfg.rb:1:1:221:1 | Exceptional Exit |
+| cfg.rb:1:1:221:1 | Exit | cfg.rb:1:1:221:1 | Exit |
+| cfg.rb:25:9:25:22 | Entry | cfg.rb:25:9:25:22 | Entry |
+| cfg.rb:29:10:29:24 | Entry | cfg.rb:29:10:29:24 | Entry |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:1:1:221:1 | Exceptional Exit |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:1:1:221:1 | Exit |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:42:8:42:8 | After 1 [match] | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:43:3:43:31 | After when ... [match] | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:43:8:43:8 | After 2 [match] | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:43:11:43:11 | After 3 [match] | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:43:11:43:11 | After 3 [no-match] | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:43:11:43:11 | After 3 [no-match] | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:43:11:43:11 | After 3 [no-match] | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:43:14:43:14 | After 4 [match] | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:43:14:43:14 | After 4 [no-match] | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:1:1:221:1 | Exceptional Exit |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:1:1:221:1 | Exit |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:48:8:48:13 | After ... == ... [match] | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:49:3:49:37 | After when ... [match] | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:49:8:49:13 | After ... == ... [match] | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:49:8:49:13 | After ... == ... [no-match] | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:49:8:49:13 | After ... == ... [no-match] | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:49:8:49:13 | After ... == ... [no-match] | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:49:16:49:20 | After ... > ... [match] | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:49:16:49:20 | After ... > ... [no-match] | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:60:17:60:22 | After ... < ... [false] | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:60:17:60:22 | After ... < ... [true] | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:1:1:221:1 | Exceptional Exit |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:1:1:221:1 | Exit |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:63:3:66:5 | Entry | cfg.rb:63:3:66:5 | Entry |
+| cfg.rb:69:3:71:5 | Entry | cfg.rb:69:3:71:5 | Entry |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:1:1:221:1 | Exceptional Exit |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:1:1:221:1 | Exit |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:75:4:75:8 | After ... < ... [false] | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:75:4:75:8 | After ... < ... [false] | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:75:4:75:8 | After ... < ... [false] | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:75:4:75:8 | After ... < ... [false] | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:75:4:75:8 | After ... < ... [true] | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:75:17:75:43 | After elsif ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:75:23:75:28 | After ... > ... [false] | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:75:23:75:28 | After ... > ... [true] | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:90:1:93:3 | Entry | cfg.rb:90:1:93:3 | Entry |
+| cfg.rb:90:1:93:3 | Entry | cfg.rb:90:1:93:3 | Normal Exit |
+| cfg.rb:90:1:93:3 | Entry | cfg.rb:91:6:91:10 | After ... > ... [false] |
+| cfg.rb:90:1:93:3 | Entry | cfg.rb:91:6:91:10 | After ... > ... [true] |
+| cfg.rb:90:1:93:3 | Normal Exit | cfg.rb:90:1:93:3 | Normal Exit |
+| cfg.rb:90:5:90:5 | After defined? ... [false] | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:90:5:90:5 | After defined? ... [true] | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:91:6:91:10 | After ... > ... [false] | cfg.rb:91:6:91:10 | After ... > ... [false] |
+| cfg.rb:91:6:91:10 | After ... > ... [true] | cfg.rb:91:6:91:10 | After ... > ... [true] |
+| cfg.rb:101:1:104:3 | Entry | cfg.rb:101:1:104:3 | Entry |
+| cfg.rb:101:1:104:3 | Entry | cfg.rb:101:16:101:20 | After value [match] |
+| cfg.rb:101:1:104:3 | Entry | cfg.rb:101:16:101:20 | After value [no-match] |
+| cfg.rb:101:1:104:3 | Entry | cfg.rb:101:28:101:30 | key |
+| cfg.rb:101:16:101:20 | After value [match] | cfg.rb:101:16:101:20 | After value [match] |
+| cfg.rb:101:16:101:20 | After value [no-match] | cfg.rb:101:16:101:20 | After value [no-match] |
 | cfg.rb:101:28:101:30 | key | cfg.rb:101:28:101:30 | key |
-| cfg.rb:113:1:113:9 | self | cfg.rb:113:1:113:9 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:120:8:120:28 | enter -> { ... } | cfg.rb:120:8:120:28 | enter -> { ... } |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:136:12:136:29 | self | cfg.rb:136:12:136:29 | self |
-| cfg.rb:145:3:148:5 | enter print | cfg.rb:145:3:148:5 | enter print |
-| cfg.rb:152:1:154:3 | enter method | cfg.rb:152:1:154:3 | enter method |
-| cfg.rb:156:1:156:28 | enter two_parameters | cfg.rb:156:1:156:28 | enter two_parameters |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:172:21:172:29 | self | cfg.rb:172:21:172:29 | self |
-| cfg.rb:172:36:172:45 | self | cfg.rb:172:36:172:45 | self |
-| cfg.rb:174:1:174:9 | self | cfg.rb:174:1:174:9 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:176:7:176:7 | x |
-| cfg.rb:176:7:176:7 | x | cfg.rb:176:17:176:17 | x |
-| cfg.rb:176:7:176:7 | x | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:179:2:179:13 | self |
-| cfg.rb:176:7:176:7 | x | cfg.rb:179:30:179:30 | i |
-| cfg.rb:176:7:176:7 | x | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:182:7:182:7 | x |
-| cfg.rb:176:7:176:7 | x | cfg.rb:183:3:183:3 | x |
-| cfg.rb:176:7:176:7 | x | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:176:7:176:7 | x | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:188:2:188:13 | self |
-| cfg.rb:176:7:176:7 | x | cfg.rb:188:30:188:30 | i |
-| cfg.rb:176:7:176:7 | x | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:176:7:176:7 | x | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:176:7:176:7 | x | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:176:17:176:17 | x | cfg.rb:176:17:176:17 | x |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:179:2:179:13 | self | cfg.rb:179:2:179:13 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:179:2:179:13 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:179:30:179:30 | i |
-| cfg.rb:179:30:179:30 | i | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:182:7:182:7 | x |
-| cfg.rb:179:30:179:30 | i | cfg.rb:183:3:183:3 | x |
-| cfg.rb:179:30:179:30 | i | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:179:30:179:30 | i | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:188:2:188:13 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:188:30:188:30 | i |
-| cfg.rb:179:30:179:30 | i | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:179:30:179:30 | i | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:179:30:179:30 | i | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:182:7:182:7 | x |
-| cfg.rb:182:7:182:7 | x | cfg.rb:183:3:183:3 | x |
-| cfg.rb:182:7:182:7 | x | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:182:7:182:7 | x | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:188:2:188:13 | self |
-| cfg.rb:182:7:182:7 | x | cfg.rb:188:30:188:30 | i |
-| cfg.rb:182:7:182:7 | x | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:182:7:182:7 | x | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:182:7:182:7 | x | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:183:3:183:3 | x | cfg.rb:183:3:183:3 | x |
-| cfg.rb:183:3:183:3 | x | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:183:3:183:3 | x | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:184:3:184:25 | if ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:184:18:184:21 | redo | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:188:2:188:13 | self | cfg.rb:188:2:188:13 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:188:2:188:13 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:188:30:188:30 | i |
-| cfg.rb:188:30:188:30 | i | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:188:30:188:30 | i | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:188:30:188:30 | i | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:190:1:192:3 | enter run_block | cfg.rb:190:1:192:3 | enter run_block |
-| cfg.rb:194:11:194:23 | enter { ... } | cfg.rb:194:11:194:23 | enter { ... } |
-| cfg.rb:196:1:198:3 | enter forward_param | cfg.rb:196:1:198:3 | enter forward_param |
-| cfg.rb:200:9:200:32 | enter { ... } | cfg.rb:200:9:200:32 | enter { ... } |
-| cfg.rb:202:9:202:35 | enter do ... end | cfg.rb:202:9:202:35 | enter do ... end |
-| cfg.rb:205:1:205:3 | __synth__0__1 | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:205:1:205:3 | nil | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:205:15:205:23 | enter { ... } | cfg.rb:205:15:205:23 | enter { ... } |
-| cfg.rb:207:1:211:3 | enter filter_nil | cfg.rb:207:1:211:3 | enter filter_nil |
-| cfg.rb:208:15:210:5 | enter do ... end | cfg.rb:208:15:210:5 | enter do ... end |
-| cfg.rb:213:14:216:3 | enter do ... end | cfg.rb:213:14:216:3 | enter do ... end |
-| constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb |
-| constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... |
-| constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | constant_compound_assign.rb:5:22:5:24 | 123 |
-| constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... |
-| constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | constant_compound_assign.rb:14:18:14:20 | 123 |
-| constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | constant_compound_assign.rb:19:17:19:19 | ... \|\| ... |
-| constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | constant_compound_assign.rb:19:21:19:23 | 123 |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:14:18:14:20 | 123 |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:19:17:19:19 | ... \|\| ... |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:19:21:19:23 | 123 |
-| constant_compound_assign.rb:5:22:5:24 | 123 | constant_compound_assign.rb:5:22:5:24 | 123 |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:19:17:19:19 | ... \|\| ... |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:19:21:19:23 | 123 |
-| constant_compound_assign.rb:14:18:14:20 | 123 | constant_compound_assign.rb:14:18:14:20 | 123 |
-| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:19:17:19:19 | ... \|\| ... |
-| constant_compound_assign.rb:19:21:19:23 | 123 | constant_compound_assign.rb:19:21:19:23 | 123 |
-| desugar.rb:1:1:3:3 | enter m1 | desugar.rb:1:1:3:3 | enter m1 |
-| desugar.rb:1:1:38:17 | enter desugar.rb | desugar.rb:1:1:38:17 | enter desugar.rb |
-| desugar.rb:5:1:7:3 | enter m2 | desugar.rb:5:1:7:3 | enter m2 |
-| desugar.rb:9:1:11:3 | enter m3 | desugar.rb:9:1:11:3 | enter m3 |
-| desugar.rb:13:1:15:3 | enter m4 | desugar.rb:13:1:15:3 | enter m4 |
-| desugar.rb:17:1:19:3 | enter m5 | desugar.rb:17:1:19:3 | enter m5 |
-| desugar.rb:21:1:23:3 | enter m6 | desugar.rb:21:1:23:3 | enter m6 |
-| desugar.rb:25:1:27:3 | enter m7 | desugar.rb:25:1:27:3 | enter m7 |
-| exit.rb:1:1:6:3 | enter m1 | exit.rb:1:1:6:3 | enter m1 |
-| exit.rb:1:1:6:3 | enter m1 | exit.rb:1:1:6:3 | exit m1 |
-| exit.rb:1:1:6:3 | enter m1 | exit.rb:2:3:4:5 | if ... |
-| exit.rb:1:1:6:3 | enter m1 | exit.rb:3:5:3:10 | self |
-| exit.rb:1:1:6:3 | exit m1 | exit.rb:1:1:6:3 | exit m1 |
-| exit.rb:1:1:13:4 | enter exit.rb | exit.rb:1:1:13:4 | enter exit.rb |
-| exit.rb:2:3:4:5 | if ... | exit.rb:2:3:4:5 | if ... |
-| exit.rb:3:5:3:10 | self | exit.rb:3:5:3:10 | self |
-| exit.rb:8:1:13:3 | enter m2 | exit.rb:8:1:13:3 | enter m2 |
-| exit.rb:8:1:13:3 | enter m2 | exit.rb:8:1:13:3 | exit m2 |
-| exit.rb:8:1:13:3 | enter m2 | exit.rb:9:3:11:5 | if ... |
-| exit.rb:8:1:13:3 | enter m2 | exit.rb:10:5:10:18 | self |
-| exit.rb:8:1:13:3 | exit m2 | exit.rb:8:1:13:3 | exit m2 |
-| exit.rb:9:3:11:5 | if ... | exit.rb:9:3:11:5 | if ... |
-| exit.rb:10:5:10:18 | self | exit.rb:10:5:10:18 | self |
-| heredoc.rb:1:1:7:3 | enter double_heredoc | heredoc.rb:1:1:7:3 | enter double_heredoc |
-| heredoc.rb:1:1:7:4 | enter heredoc.rb | heredoc.rb:1:1:7:4 | enter heredoc.rb |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:1:1:9:3 | enter m1 |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:2:3:8:5 | if ... |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:3:5:3:30 | self |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:3:7:35 | elsif ... |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:9:4:9 | x |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:9:4:24 | [false] ... and ... |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:9:4:24 | [true] ... and ... |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:9:4:38 | [false] ... and ... |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:9:4:38 | [true] ... and ... |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:20:4:20 | x |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:30:4:38 | [true] ! ... |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:31:4:38 | [false] ( ... ) |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:31:4:38 | [true] ( ... ) |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:32:4:32 | x |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:5:5:5:17 | self |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:7:5:7:35 | self |
-| ifs.rb:1:1:58:4 | enter ifs.rb | ifs.rb:1:1:58:4 | enter ifs.rb |
-| ifs.rb:1:1:58:4 | enter ifs.rb | ifs.rb:36:1:38:3 | conditional_method_def |
-| ifs.rb:1:1:58:4 | enter ifs.rb | ifs.rb:36:1:38:17 | ... unless ... |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:2:3:8:5 | if ... |
-| ifs.rb:3:5:3:30 | self | ifs.rb:3:5:3:30 | self |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:3:7:35 | elsif ... |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:3:7:35 | elsif ... |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:9:4:9 | x |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:9:4:24 | [false] ... and ... |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:9:4:24 | [true] ... and ... |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:9:4:38 | [false] ... and ... |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:9:4:38 | [true] ... and ... |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:20:4:20 | x |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:30:4:38 | [true] ! ... |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:31:4:38 | [false] ( ... ) |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:31:4:38 | [true] ( ... ) |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:32:4:32 | x |
-| ifs.rb:4:9:4:9 | x | ifs.rb:5:5:5:17 | self |
-| ifs.rb:4:9:4:9 | x | ifs.rb:7:5:7:35 | self |
-| ifs.rb:4:9:4:24 | [false] ... and ... | ifs.rb:4:9:4:24 | [false] ... and ... |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:9:4:24 | [true] ... and ... |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:9:4:38 | [true] ... and ... |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:30:4:38 | [true] ! ... |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:31:4:38 | [false] ( ... ) |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:31:4:38 | [true] ( ... ) |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:32:4:32 | x |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:5:5:5:17 | self |
-| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:4:9:4:38 | [false] ... and ... |
-| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:7:5:7:35 | self |
-| ifs.rb:4:9:4:38 | [true] ... and ... | ifs.rb:4:9:4:38 | [true] ... and ... |
-| ifs.rb:4:9:4:38 | [true] ... and ... | ifs.rb:5:5:5:17 | self |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:9:4:24 | [true] ... and ... |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:9:4:38 | [true] ... and ... |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:20:4:20 | x |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:30:4:38 | [true] ! ... |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:31:4:38 | [false] ( ... ) |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:31:4:38 | [true] ( ... ) |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:32:4:32 | x |
-| ifs.rb:4:20:4:20 | x | ifs.rb:5:5:5:17 | self |
-| ifs.rb:4:30:4:38 | [false] ! ... | ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:4:30:4:38 | [true] ! ... | ifs.rb:4:9:4:38 | [true] ... and ... |
-| ifs.rb:4:30:4:38 | [true] ! ... | ifs.rb:4:30:4:38 | [true] ! ... |
-| ifs.rb:4:30:4:38 | [true] ! ... | ifs.rb:5:5:5:17 | self |
-| ifs.rb:4:31:4:38 | [false] ( ... ) | ifs.rb:4:9:4:38 | [true] ... and ... |
-| ifs.rb:4:31:4:38 | [false] ( ... ) | ifs.rb:4:30:4:38 | [true] ! ... |
-| ifs.rb:4:31:4:38 | [false] ( ... ) | ifs.rb:4:31:4:38 | [false] ( ... ) |
-| ifs.rb:4:31:4:38 | [false] ( ... ) | ifs.rb:5:5:5:17 | self |
-| ifs.rb:4:31:4:38 | [true] ( ... ) | ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:4:31:4:38 | [true] ( ... ) | ifs.rb:4:31:4:38 | [true] ( ... ) |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:9:4:38 | [true] ... and ... |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:30:4:38 | [true] ! ... |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:31:4:38 | [false] ( ... ) |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:31:4:38 | [true] ( ... ) |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:32:4:32 | x |
-| ifs.rb:4:32:4:32 | x | ifs.rb:5:5:5:17 | self |
-| ifs.rb:5:5:5:17 | self | ifs.rb:5:5:5:17 | self |
-| ifs.rb:7:5:7:35 | self | ifs.rb:7:5:7:35 | self |
-| ifs.rb:11:1:16:3 | enter m2 | ifs.rb:11:1:16:3 | enter m2 |
-| ifs.rb:11:1:16:3 | enter m2 | ifs.rb:11:1:16:3 | exit m2 (normal) |
-| ifs.rb:11:1:16:3 | enter m2 | ifs.rb:12:3:14:5 | if ... |
-| ifs.rb:11:1:16:3 | enter m2 | ifs.rb:13:12:13:12 | 0 |
-| ifs.rb:11:1:16:3 | exit m2 (normal) | ifs.rb:11:1:16:3 | exit m2 (normal) |
-| ifs.rb:12:3:14:5 | if ... | ifs.rb:12:3:14:5 | if ... |
-| ifs.rb:13:12:13:12 | 0 | ifs.rb:13:12:13:12 | 0 |
-| ifs.rb:18:1:26:3 | enter m3 | ifs.rb:18:1:26:3 | enter m3 |
-| ifs.rb:18:1:26:3 | enter m3 | ifs.rb:19:3:24:5 | if ... |
-| ifs.rb:18:1:26:3 | enter m3 | ifs.rb:20:5:20:5 | x |
-| ifs.rb:18:1:26:3 | enter m3 | ifs.rb:21:5:23:7 | if ... |
-| ifs.rb:18:1:26:3 | enter m3 | ifs.rb:22:7:22:7 | x |
-| ifs.rb:19:3:24:5 | if ... | ifs.rb:19:3:24:5 | if ... |
-| ifs.rb:20:5:20:5 | x | ifs.rb:20:5:20:5 | x |
-| ifs.rb:20:5:20:5 | x | ifs.rb:21:5:23:7 | if ... |
-| ifs.rb:20:5:20:5 | x | ifs.rb:22:7:22:7 | x |
-| ifs.rb:21:5:23:7 | if ... | ifs.rb:21:5:23:7 | if ... |
-| ifs.rb:22:7:22:7 | x | ifs.rb:22:7:22:7 | x |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:28:1:30:3 | enter m4 |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:29:10:29:23 | [false] ( ... ) |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:29:10:29:23 | [true] ( ... ) |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:29:10:29:51 | ... ? ... : ... |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:29:11:29:22 | [false] ... ? ... : ... |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:29:11:29:22 | [true] ... ? ... : ... |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:29:16:29:17 | b2 |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:29:21:29:22 | b3 |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:29:28:29:35 | b2 \|\| b3 |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:29:41:29:50 | !b2 \|\| !b3 |
-| ifs.rb:29:10:29:23 | [false] ( ... ) | ifs.rb:29:10:29:23 | [false] ( ... ) |
-| ifs.rb:29:10:29:23 | [false] ( ... ) | ifs.rb:29:41:29:50 | !b2 \|\| !b3 |
-| ifs.rb:29:10:29:23 | [true] ( ... ) | ifs.rb:29:10:29:23 | [true] ( ... ) |
-| ifs.rb:29:10:29:23 | [true] ( ... ) | ifs.rb:29:28:29:35 | b2 \|\| b3 |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:10:29:51 | ... ? ... : ... |
-| ifs.rb:29:11:29:22 | [false] ... ? ... : ... | ifs.rb:29:10:29:23 | [false] ( ... ) |
-| ifs.rb:29:11:29:22 | [false] ... ? ... : ... | ifs.rb:29:11:29:22 | [false] ... ? ... : ... |
-| ifs.rb:29:11:29:22 | [false] ... ? ... : ... | ifs.rb:29:41:29:50 | !b2 \|\| !b3 |
-| ifs.rb:29:11:29:22 | [true] ... ? ... : ... | ifs.rb:29:10:29:23 | [true] ( ... ) |
-| ifs.rb:29:11:29:22 | [true] ... ? ... : ... | ifs.rb:29:11:29:22 | [true] ... ? ... : ... |
-| ifs.rb:29:11:29:22 | [true] ... ? ... : ... | ifs.rb:29:28:29:35 | b2 \|\| b3 |
-| ifs.rb:29:16:29:17 | b2 | ifs.rb:29:16:29:17 | b2 |
-| ifs.rb:29:21:29:22 | b3 | ifs.rb:29:21:29:22 | b3 |
-| ifs.rb:29:28:29:35 | b2 \|\| b3 | ifs.rb:29:28:29:35 | b2 \|\| b3 |
-| ifs.rb:29:41:29:50 | !b2 \|\| !b3 | ifs.rb:29:41:29:50 | !b2 \|\| !b3 |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:32:1:34:3 | enter m5 |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:3:33:100 | if ... |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:6:33:49 | [false] ( ... ) |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:6:33:49 | [true] ( ... ) |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:7:33:48 | [false] if ... |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:7:33:48 | [true] if ... |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:13:33:19 | [false] then ... |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:13:33:19 | [true] then ... |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:18:33:19 | b2 |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:21:33:44 | [false] elsif ... |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:21:33:44 | [true] elsif ... |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:27:33:28 | b3 |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:30:33:36 | [false] then ... |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:30:33:36 | [true] then ... |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:35:33:36 | b4 |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:38:33:44 | [false] else ... |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:38:33:44 | [true] else ... |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:43:33:44 | b5 |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:3:33:100 | if ... |
-| ifs.rb:33:6:33:49 | [false] ( ... ) | ifs.rb:33:6:33:49 | [false] ( ... ) |
-| ifs.rb:33:6:33:49 | [false] ( ... ) | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 |
-| ifs.rb:33:6:33:49 | [true] ( ... ) | ifs.rb:33:6:33:49 | [true] ( ... ) |
-| ifs.rb:33:6:33:49 | [true] ( ... ) | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:6:33:49 | [false] ( ... ) |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:7:33:48 | [false] if ... |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:6:33:49 | [true] ( ... ) |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:7:33:48 | [true] if ... |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 |
-| ifs.rb:33:13:33:19 | [false] then ... | ifs.rb:33:13:33:19 | [false] then ... |
-| ifs.rb:33:13:33:19 | [true] then ... | ifs.rb:33:13:33:19 | [true] then ... |
-| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:13:33:19 | [false] then ... |
-| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:13:33:19 | [true] then ... |
-| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:18:33:19 | b2 |
-| ifs.rb:33:21:33:44 | [false] elsif ... | ifs.rb:33:21:33:44 | [false] elsif ... |
-| ifs.rb:33:21:33:44 | [true] elsif ... | ifs.rb:33:21:33:44 | [true] elsif ... |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:21:33:44 | [false] elsif ... |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:21:33:44 | [true] elsif ... |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:27:33:28 | b3 |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:30:33:36 | [false] then ... |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:30:33:36 | [true] then ... |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:35:33:36 | b4 |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:38:33:44 | [false] else ... |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:38:33:44 | [true] else ... |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:43:33:44 | b5 |
-| ifs.rb:33:30:33:36 | [false] then ... | ifs.rb:33:30:33:36 | [false] then ... |
-| ifs.rb:33:30:33:36 | [true] then ... | ifs.rb:33:30:33:36 | [true] then ... |
-| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:30:33:36 | [false] then ... |
-| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:30:33:36 | [true] then ... |
-| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:35:33:36 | b4 |
-| ifs.rb:33:38:33:44 | [false] else ... | ifs.rb:33:38:33:44 | [false] else ... |
-| ifs.rb:33:38:33:44 | [true] else ... | ifs.rb:33:38:33:44 | [true] else ... |
-| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:38:33:44 | [false] else ... |
-| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:38:33:44 | [true] else ... |
-| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:43:33:44 | b5 |
-| ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 |
-| ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 |
-| ifs.rb:36:1:38:3 | conditional_method_def | ifs.rb:36:1:38:3 | conditional_method_def |
-| ifs.rb:36:1:38:3 | enter conditional_method_def | ifs.rb:36:1:38:3 | enter conditional_method_def |
-| ifs.rb:36:1:38:17 | ... unless ... | ifs.rb:36:1:38:17 | ... unless ... |
-| ifs.rb:40:1:44:3 | enter constant_condition | ifs.rb:40:1:44:3 | enter constant_condition |
-| ifs.rb:40:1:44:3 | enter constant_condition | ifs.rb:41:3:43:5 | if ... |
-| ifs.rb:40:1:44:3 | enter constant_condition | ifs.rb:41:6:41:10 | [false] ! ... |
-| ifs.rb:41:3:43:5 | if ... | ifs.rb:41:3:43:5 | if ... |
-| ifs.rb:41:6:41:10 | [false] ! ... | ifs.rb:41:3:43:5 | if ... |
-| ifs.rb:41:6:41:10 | [false] ! ... | ifs.rb:41:6:41:10 | [false] ! ... |
-| ifs.rb:46:1:52:3 | enter empty_else | ifs.rb:46:1:52:3 | enter empty_else |
-| ifs.rb:46:1:52:3 | enter empty_else | ifs.rb:47:3:50:5 | if ... |
-| ifs.rb:46:1:52:3 | enter empty_else | ifs.rb:48:5:48:15 | self |
-| ifs.rb:46:1:52:3 | enter empty_else | ifs.rb:49:3:49:6 | else ... |
-| ifs.rb:47:3:50:5 | if ... | ifs.rb:47:3:50:5 | if ... |
-| ifs.rb:48:5:48:15 | self | ifs.rb:48:5:48:15 | self |
-| ifs.rb:49:3:49:6 | else ... | ifs.rb:49:3:49:6 | else ... |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:54:1:58:3 | enter disjunct |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:55:3:57:5 | if ... |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:55:6:55:15 | [false] ( ... ) |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:55:6:55:15 | [true] ( ... ) |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:55:7:55:14 | [false] ... \|\| ... |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:55:7:55:14 | [true] ... \|\| ... |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:55:13:55:14 | b2 |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:56:5:56:19 | self |
-| ifs.rb:55:3:57:5 | if ... | ifs.rb:55:3:57:5 | if ... |
-| ifs.rb:55:6:55:15 | [false] ( ... ) | ifs.rb:55:6:55:15 | [false] ( ... ) |
-| ifs.rb:55:6:55:15 | [true] ( ... ) | ifs.rb:55:6:55:15 | [true] ( ... ) |
-| ifs.rb:55:6:55:15 | [true] ( ... ) | ifs.rb:56:5:56:19 | self |
-| ifs.rb:55:7:55:14 | [false] ... \|\| ... | ifs.rb:55:6:55:15 | [false] ( ... ) |
-| ifs.rb:55:7:55:14 | [false] ... \|\| ... | ifs.rb:55:7:55:14 | [false] ... \|\| ... |
-| ifs.rb:55:7:55:14 | [true] ... \|\| ... | ifs.rb:55:6:55:15 | [true] ( ... ) |
-| ifs.rb:55:7:55:14 | [true] ... \|\| ... | ifs.rb:55:7:55:14 | [true] ... \|\| ... |
-| ifs.rb:55:7:55:14 | [true] ... \|\| ... | ifs.rb:56:5:56:19 | self |
-| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:6:55:15 | [false] ( ... ) |
-| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:7:55:14 | [false] ... \|\| ... |
-| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:13:55:14 | b2 |
-| ifs.rb:56:5:56:19 | self | ifs.rb:56:5:56:19 | self |
-| loops.rb:1:1:6:3 | enter m1 | loops.rb:1:1:6:3 | enter m1 |
-| loops.rb:1:1:6:3 | enter m1 | loops.rb:2:3:5:5 | while ... |
-| loops.rb:1:1:6:3 | enter m1 | loops.rb:2:9:2:9 | x |
-| loops.rb:1:1:6:3 | enter m1 | loops.rb:3:5:3:10 | self |
-| loops.rb:1:1:33:4 | enter loops.rb | loops.rb:1:1:33:4 | enter loops.rb |
-| loops.rb:2:3:5:5 | while ... | loops.rb:2:3:5:5 | while ... |
-| loops.rb:2:9:2:9 | x | loops.rb:2:3:5:5 | while ... |
-| loops.rb:2:9:2:9 | x | loops.rb:2:9:2:9 | x |
-| loops.rb:2:9:2:9 | x | loops.rb:3:5:3:10 | self |
-| loops.rb:3:5:3:10 | self | loops.rb:3:5:3:10 | self |
-| loops.rb:8:1:22:3 | enter m2 | loops.rb:8:1:22:3 | enter m2 |
-| loops.rb:8:1:22:3 | enter m2 | loops.rb:9:3:20:5 | while ... |
-| loops.rb:8:1:22:3 | enter m2 | loops.rb:9:9:9:9 | x |
-| loops.rb:8:1:22:3 | enter m2 | loops.rb:10:5:10:10 | self |
-| loops.rb:8:1:22:3 | enter m2 | loops.rb:13:7:13:11 | break |
-| loops.rb:8:1:22:3 | enter m2 | loops.rb:14:11:14:11 | x |
-| loops.rb:8:1:22:3 | enter m2 | loops.rb:15:7:15:10 | next |
-| loops.rb:8:1:22:3 | enter m2 | loops.rb:16:5:17:10 | elsif ... |
-| loops.rb:8:1:22:3 | enter m2 | loops.rb:16:11:16:11 | x |
-| loops.rb:8:1:22:3 | enter m2 | loops.rb:17:7:17:10 | redo |
-| loops.rb:9:3:20:5 | while ... | loops.rb:9:3:20:5 | while ... |
-| loops.rb:9:9:9:9 | x | loops.rb:9:3:20:5 | while ... |
-| loops.rb:9:9:9:9 | x | loops.rb:9:9:9:9 | x |
-| loops.rb:9:9:9:9 | x | loops.rb:10:5:10:10 | self |
-| loops.rb:9:9:9:9 | x | loops.rb:13:7:13:11 | break |
-| loops.rb:9:9:9:9 | x | loops.rb:14:11:14:11 | x |
-| loops.rb:9:9:9:9 | x | loops.rb:15:7:15:10 | next |
-| loops.rb:9:9:9:9 | x | loops.rb:16:5:17:10 | elsif ... |
-| loops.rb:9:9:9:9 | x | loops.rb:16:11:16:11 | x |
-| loops.rb:9:9:9:9 | x | loops.rb:17:7:17:10 | redo |
-| loops.rb:10:5:10:10 | self | loops.rb:10:5:10:10 | self |
-| loops.rb:10:5:10:10 | self | loops.rb:13:7:13:11 | break |
-| loops.rb:10:5:10:10 | self | loops.rb:14:11:14:11 | x |
-| loops.rb:10:5:10:10 | self | loops.rb:15:7:15:10 | next |
-| loops.rb:10:5:10:10 | self | loops.rb:16:5:17:10 | elsif ... |
-| loops.rb:10:5:10:10 | self | loops.rb:16:11:16:11 | x |
-| loops.rb:10:5:10:10 | self | loops.rb:17:7:17:10 | redo |
-| loops.rb:13:7:13:11 | break | loops.rb:13:7:13:11 | break |
-| loops.rb:14:11:14:11 | x | loops.rb:14:11:14:11 | x |
-| loops.rb:14:11:14:11 | x | loops.rb:15:7:15:10 | next |
-| loops.rb:14:11:14:11 | x | loops.rb:16:5:17:10 | elsif ... |
-| loops.rb:14:11:14:11 | x | loops.rb:16:11:16:11 | x |
-| loops.rb:14:11:14:11 | x | loops.rb:17:7:17:10 | redo |
-| loops.rb:15:7:15:10 | next | loops.rb:15:7:15:10 | next |
-| loops.rb:16:5:17:10 | elsif ... | loops.rb:16:5:17:10 | elsif ... |
-| loops.rb:16:11:16:11 | x | loops.rb:16:5:17:10 | elsif ... |
-| loops.rb:16:11:16:11 | x | loops.rb:16:11:16:11 | x |
-| loops.rb:16:11:16:11 | x | loops.rb:17:7:17:10 | redo |
-| loops.rb:17:7:17:10 | redo | loops.rb:17:7:17:10 | redo |
-| loops.rb:24:1:28:3 | enter m3 | loops.rb:24:1:28:3 | enter m3 |
-| loops.rb:25:16:27:5 | enter do ... end | loops.rb:25:16:27:5 | enter do ... end |
-| loops.rb:30:1:33:3 | enter m4 | loops.rb:30:1:33:3 | enter m4 |
-| loops.rb:30:1:33:3 | enter m4 | loops.rb:31:3:32:5 | while ... |
-| loops.rb:30:1:33:3 | enter m4 | loops.rb:31:9:31:9 | x |
-| loops.rb:30:1:33:3 | enter m4 | loops.rb:31:15:32:5 | do ... |
-| loops.rb:31:3:32:5 | while ... | loops.rb:31:3:32:5 | while ... |
-| loops.rb:31:9:31:9 | x | loops.rb:31:3:32:5 | while ... |
-| loops.rb:31:9:31:9 | x | loops.rb:31:9:31:9 | x |
-| loops.rb:31:9:31:9 | x | loops.rb:31:15:32:5 | do ... |
-| loops.rb:31:15:32:5 | do ... | loops.rb:31:15:32:5 | do ... |
-| raise.rb:1:1:182:4 | enter raise.rb | raise.rb:1:1:182:4 | enter raise.rb |
-| raise.rb:7:1:12:3 | enter m1 | raise.rb:7:1:12:3 | enter m1 |
-| raise.rb:7:1:12:3 | enter m1 | raise.rb:7:1:12:3 | exit m1 |
-| raise.rb:7:1:12:3 | enter m1 | raise.rb:8:3:10:5 | if ... |
-| raise.rb:7:1:12:3 | enter m1 | raise.rb:9:5:9:17 | self |
-| raise.rb:7:1:12:3 | exit m1 | raise.rb:7:1:12:3 | exit m1 |
-| raise.rb:8:3:10:5 | if ... | raise.rb:8:3:10:5 | if ... |
-| raise.rb:9:5:9:17 | self | raise.rb:9:5:9:17 | self |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:14:1:23:3 | enter m2 |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:14:1:23:3 | exit m2 |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:14:1:23:3 | exit m2 (abnormal) |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:16:5:18:7 | if ... |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:17:7:17:22 | self |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:20:5:20:18 | self |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:22:3:22:15 | self |
-| raise.rb:14:1:23:3 | exit m2 | raise.rb:14:1:23:3 | exit m2 |
-| raise.rb:14:1:23:3 | exit m2 (abnormal) | raise.rb:14:1:23:3 | exit m2 (abnormal) |
-| raise.rb:16:5:18:7 | if ... | raise.rb:16:5:18:7 | if ... |
-| raise.rb:17:7:17:22 | self | raise.rb:14:1:23:3 | exit m2 (abnormal) |
-| raise.rb:17:7:17:22 | self | raise.rb:17:7:17:22 | self |
-| raise.rb:17:7:17:22 | self | raise.rb:20:5:20:18 | self |
-| raise.rb:20:5:20:18 | self | raise.rb:20:5:20:18 | self |
-| raise.rb:22:3:22:15 | self | raise.rb:22:3:22:15 | self |
-| raise.rb:25:1:34:3 | enter m3 | raise.rb:25:1:34:3 | enter m3 |
-| raise.rb:25:1:34:3 | enter m3 | raise.rb:27:5:29:7 | if ... |
-| raise.rb:25:1:34:3 | enter m3 | raise.rb:28:7:28:22 | self |
-| raise.rb:25:1:34:3 | enter m3 | raise.rb:33:3:33:15 | self |
-| raise.rb:27:5:29:7 | if ... | raise.rb:27:5:29:7 | if ... |
-| raise.rb:28:7:28:22 | self | raise.rb:28:7:28:22 | self |
-| raise.rb:33:3:33:15 | self | raise.rb:33:3:33:15 | self |
-| raise.rb:36:1:45:3 | enter m4 | raise.rb:36:1:45:3 | enter m4 |
-| raise.rb:36:1:45:3 | enter m4 | raise.rb:38:5:40:7 | if ... |
-| raise.rb:36:1:45:3 | enter m4 | raise.rb:39:7:39:22 | self |
-| raise.rb:36:1:45:3 | enter m4 | raise.rb:44:3:44:15 | self |
-| raise.rb:38:5:40:7 | if ... | raise.rb:38:5:40:7 | if ... |
-| raise.rb:39:7:39:22 | self | raise.rb:39:7:39:22 | self |
-| raise.rb:44:3:44:15 | self | raise.rb:44:3:44:15 | self |
-| raise.rb:47:1:55:3 | enter m5 | raise.rb:47:1:55:3 | enter m5 |
-| raise.rb:47:1:55:3 | enter m5 | raise.rb:49:5:51:7 | if ... |
-| raise.rb:47:1:55:3 | enter m5 | raise.rb:50:7:50:22 | self |
-| raise.rb:47:1:55:3 | enter m5 | raise.rb:54:3:54:15 | self |
-| raise.rb:49:5:51:7 | if ... | raise.rb:49:5:51:7 | if ... |
-| raise.rb:50:7:50:22 | self | raise.rb:50:7:50:22 | self |
-| raise.rb:54:3:54:15 | self | raise.rb:54:3:54:15 | self |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:57:1:66:3 | enter m6 |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:57:1:66:3 | exit m6 |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:57:1:66:3 | exit m6 (abnormal) |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:59:5:61:7 | if ... |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:60:7:60:22 | self |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:62:22:62:31 | ExceptionB |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:62:36:62:36 | e |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:65:3:65:15 | self |
-| raise.rb:57:1:66:3 | exit m6 | raise.rb:57:1:66:3 | exit m6 |
-| raise.rb:57:1:66:3 | exit m6 (abnormal) | raise.rb:57:1:66:3 | exit m6 (abnormal) |
-| raise.rb:59:5:61:7 | if ... | raise.rb:59:5:61:7 | if ... |
-| raise.rb:60:7:60:22 | self | raise.rb:57:1:66:3 | exit m6 (abnormal) |
-| raise.rb:60:7:60:22 | self | raise.rb:60:7:60:22 | self |
-| raise.rb:60:7:60:22 | self | raise.rb:62:22:62:31 | ExceptionB |
-| raise.rb:60:7:60:22 | self | raise.rb:62:36:62:36 | e |
-| raise.rb:62:22:62:31 | ExceptionB | raise.rb:57:1:66:3 | exit m6 (abnormal) |
-| raise.rb:62:22:62:31 | ExceptionB | raise.rb:62:22:62:31 | ExceptionB |
-| raise.rb:62:36:62:36 | e | raise.rb:62:36:62:36 | e |
-| raise.rb:65:3:65:15 | self | raise.rb:65:3:65:15 | self |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:68:1:77:3 | enter m7 |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:68:1:77:3 | exit m7 |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:68:1:77:3 | exit m7 (normal) |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:70:5:70:17 | self |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:71:3:72:18 | elsif ... |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:71:9:71:9 | x |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:72:13:72:17 | x < 0 |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:76:3:76:15 | [ensure: exception] self |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:76:3:76:15 | self |
-| raise.rb:68:1:77:3 | exit m7 | raise.rb:68:1:77:3 | exit m7 |
-| raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:68:1:77:3 | exit m7 (normal) |
-| raise.rb:70:5:70:17 | self | raise.rb:70:5:70:17 | self |
-| raise.rb:71:3:72:18 | elsif ... | raise.rb:71:3:72:18 | elsif ... |
-| raise.rb:71:3:72:18 | elsif ... | raise.rb:76:3:76:15 | self |
-| raise.rb:71:9:71:9 | x | raise.rb:68:1:77:3 | exit m7 (normal) |
-| raise.rb:71:9:71:9 | x | raise.rb:71:3:72:18 | elsif ... |
-| raise.rb:71:9:71:9 | x | raise.rb:71:9:71:9 | x |
-| raise.rb:71:9:71:9 | x | raise.rb:72:13:72:17 | x < 0 |
-| raise.rb:71:9:71:9 | x | raise.rb:76:3:76:15 | self |
-| raise.rb:72:13:72:17 | x < 0 | raise.rb:72:13:72:17 | x < 0 |
-| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:76:3:76:15 | [ensure: exception] self |
-| raise.rb:76:3:76:15 | self | raise.rb:76:3:76:15 | self |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:79:1:92:3 | enter m8 |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:79:1:92:3 | exit m8 |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:79:1:92:3 | exit m8 (normal) |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:83:7:83:19 | self |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:84:5:85:20 | elsif ... |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:84:11:84:11 | x |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:85:15:85:19 | x < 0 |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:89:5:89:17 | [ensure: exception] self |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:89:5:89:17 | self |
-| raise.rb:79:1:92:3 | exit m8 | raise.rb:79:1:92:3 | exit m8 |
-| raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:79:1:92:3 | exit m8 (normal) |
-| raise.rb:83:7:83:19 | self | raise.rb:83:7:83:19 | self |
-| raise.rb:84:5:85:20 | elsif ... | raise.rb:84:5:85:20 | elsif ... |
-| raise.rb:84:5:85:20 | elsif ... | raise.rb:89:5:89:17 | self |
-| raise.rb:84:11:84:11 | x | raise.rb:79:1:92:3 | exit m8 (normal) |
-| raise.rb:84:11:84:11 | x | raise.rb:84:5:85:20 | elsif ... |
-| raise.rb:84:11:84:11 | x | raise.rb:84:11:84:11 | x |
-| raise.rb:84:11:84:11 | x | raise.rb:85:15:85:19 | x < 0 |
-| raise.rb:84:11:84:11 | x | raise.rb:89:5:89:17 | self |
-| raise.rb:85:15:85:19 | x < 0 | raise.rb:85:15:85:19 | x < 0 |
-| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:89:5:89:17 | [ensure: exception] self |
-| raise.rb:89:5:89:17 | self | raise.rb:89:5:89:17 | self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:94:1:119:3 | enter m9 |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:94:1:119:3 | exit m9 |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:94:1:119:3 | exit m9 (abnormal) |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:94:1:119:3 | exit m9 (normal) |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:97:8:97:8 | x |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:98:7:98:19 | self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:99:11:99:11 | x |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:104:5:104:23 | [ensure: exception] self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:104:5:104:23 | self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:106:7:108:9 | [ensure: exception] if ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:106:7:108:9 | [ensure: return] if ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:106:7:108:9 | if ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:106:10:106:11 | [ensure: exception] b1 |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:106:10:106:11 | [ensure: return] b1 |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:106:10:106:11 | b1 |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:107:9:107:26 | [ensure: exception] self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:107:9:107:26 | [ensure: return] self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:107:9:107:26 | self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:115:3:115:22 | [ensure: exception] self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:115:3:115:22 | self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:116:3:118:5 | [ensure: exception] if ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:116:3:118:5 | [ensure: return] if ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:116:3:118:5 | if ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:117:5:117:22 | [ensure: exception] self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:117:5:117:22 | [ensure: return] self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:117:5:117:22 | self |
-| raise.rb:94:1:119:3 | exit m9 | raise.rb:94:1:119:3 | exit m9 |
-| raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:94:1:119:3 | exit m9 (abnormal) |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:94:1:119:3 | exit m9 (normal) |
-| raise.rb:97:8:97:8 | x | raise.rb:94:1:119:3 | exit m9 (normal) |
-| raise.rb:97:8:97:8 | x | raise.rb:97:8:97:8 | x |
-| raise.rb:97:8:97:8 | x | raise.rb:98:7:98:19 | self |
-| raise.rb:97:8:97:8 | x | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:97:8:97:8 | x | raise.rb:99:11:99:11 | x |
-| raise.rb:97:8:97:8 | x | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:97:8:97:8 | x | raise.rb:104:5:104:23 | [ensure: exception] self |
-| raise.rb:97:8:97:8 | x | raise.rb:104:5:104:23 | self |
-| raise.rb:97:8:97:8 | x | raise.rb:106:7:108:9 | [ensure: exception] if ... |
-| raise.rb:97:8:97:8 | x | raise.rb:106:7:108:9 | [ensure: return] if ... |
-| raise.rb:97:8:97:8 | x | raise.rb:106:7:108:9 | if ... |
-| raise.rb:97:8:97:8 | x | raise.rb:106:10:106:11 | [ensure: exception] b1 |
-| raise.rb:97:8:97:8 | x | raise.rb:106:10:106:11 | [ensure: return] b1 |
-| raise.rb:97:8:97:8 | x | raise.rb:106:10:106:11 | b1 |
-| raise.rb:97:8:97:8 | x | raise.rb:107:9:107:26 | [ensure: exception] self |
-| raise.rb:97:8:97:8 | x | raise.rb:107:9:107:26 | [ensure: return] self |
-| raise.rb:97:8:97:8 | x | raise.rb:107:9:107:26 | self |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:97:8:97:8 | x | raise.rb:115:3:115:22 | self |
-| raise.rb:97:8:97:8 | x | raise.rb:116:3:118:5 | [ensure: return] if ... |
-| raise.rb:97:8:97:8 | x | raise.rb:116:3:118:5 | if ... |
-| raise.rb:97:8:97:8 | x | raise.rb:117:5:117:22 | [ensure: return] self |
-| raise.rb:97:8:97:8 | x | raise.rb:117:5:117:22 | self |
-| raise.rb:98:7:98:19 | self | raise.rb:98:7:98:19 | self |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:104:5:104:23 | self |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:106:7:108:9 | if ... |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:106:10:106:11 | b1 |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:107:9:107:26 | self |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:115:3:115:22 | self |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:116:3:118:5 | if ... |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:117:5:117:22 | self |
-| raise.rb:99:11:99:11 | x | raise.rb:94:1:119:3 | exit m9 (normal) |
-| raise.rb:99:11:99:11 | x | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:99:11:99:11 | x | raise.rb:99:11:99:11 | x |
-| raise.rb:99:11:99:11 | x | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:99:11:99:11 | x | raise.rb:104:5:104:23 | self |
-| raise.rb:99:11:99:11 | x | raise.rb:106:7:108:9 | [ensure: return] if ... |
-| raise.rb:99:11:99:11 | x | raise.rb:106:7:108:9 | if ... |
-| raise.rb:99:11:99:11 | x | raise.rb:106:10:106:11 | [ensure: return] b1 |
-| raise.rb:99:11:99:11 | x | raise.rb:106:10:106:11 | b1 |
-| raise.rb:99:11:99:11 | x | raise.rb:107:9:107:26 | [ensure: return] self |
-| raise.rb:99:11:99:11 | x | raise.rb:107:9:107:26 | self |
-| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
-| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
-| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
-| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:99:11:99:11 | x | raise.rb:115:3:115:22 | self |
-| raise.rb:99:11:99:11 | x | raise.rb:116:3:118:5 | [ensure: return] if ... |
-| raise.rb:99:11:99:11 | x | raise.rb:116:3:118:5 | if ... |
-| raise.rb:99:11:99:11 | x | raise.rb:117:5:117:22 | [ensure: return] self |
-| raise.rb:99:11:99:11 | x | raise.rb:117:5:117:22 | self |
-| raise.rb:100:15:100:19 | x < 0 | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:100:15:100:19 | x < 0 | raise.rb:106:7:108:9 | [ensure: return] if ... |
-| raise.rb:100:15:100:19 | x < 0 | raise.rb:106:10:106:11 | [ensure: return] b1 |
-| raise.rb:100:15:100:19 | x < 0 | raise.rb:107:9:107:26 | [ensure: return] self |
-| raise.rb:100:15:100:19 | x < 0 | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
-| raise.rb:100:15:100:19 | x < 0 | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
-| raise.rb:100:15:100:19 | x < 0 | raise.rb:116:3:118:5 | [ensure: return] if ... |
-| raise.rb:100:15:100:19 | x < 0 | raise.rb:117:5:117:22 | [ensure: return] self |
-| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:104:5:104:23 | [ensure: exception] self |
-| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:106:7:108:9 | [ensure: exception] if ... |
-| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:106:10:106:11 | [ensure: exception] b1 |
-| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:107:9:107:26 | [ensure: exception] self |
-| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
-| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
-| raise.rb:104:5:104:23 | self | raise.rb:104:5:104:23 | self |
-| raise.rb:104:5:104:23 | self | raise.rb:106:7:108:9 | if ... |
-| raise.rb:104:5:104:23 | self | raise.rb:106:10:106:11 | b1 |
-| raise.rb:104:5:104:23 | self | raise.rb:107:9:107:26 | self |
-| raise.rb:104:5:104:23 | self | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
-| raise.rb:104:5:104:23 | self | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:104:5:104:23 | self | raise.rb:115:3:115:22 | self |
-| raise.rb:104:5:104:23 | self | raise.rb:116:3:118:5 | if ... |
-| raise.rb:104:5:104:23 | self | raise.rb:117:5:117:22 | self |
-| raise.rb:106:7:108:9 | [ensure: exception] if ... | raise.rb:106:7:108:9 | [ensure: exception] if ... |
-| raise.rb:106:7:108:9 | [ensure: exception] if ... | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
-| raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:106:7:108:9 | [ensure: return] if ... |
-| raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
-| raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:116:3:118:5 | [ensure: return] if ... |
-| raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:117:5:117:22 | [ensure: return] self |
-| raise.rb:106:7:108:9 | if ... | raise.rb:106:7:108:9 | if ... |
-| raise.rb:106:7:108:9 | if ... | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:106:7:108:9 | if ... | raise.rb:115:3:115:22 | self |
-| raise.rb:106:7:108:9 | if ... | raise.rb:116:3:118:5 | if ... |
-| raise.rb:106:7:108:9 | if ... | raise.rb:117:5:117:22 | self |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:106:7:108:9 | [ensure: exception] if ... |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:106:10:106:11 | [ensure: exception] b1 |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:107:9:107:26 | [ensure: exception] self |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:106:7:108:9 | [ensure: return] if ... |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:106:10:106:11 | [ensure: return] b1 |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:107:9:107:26 | [ensure: return] self |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:116:3:118:5 | [ensure: return] if ... |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:117:5:117:22 | [ensure: return] self |
-| raise.rb:106:10:106:11 | b1 | raise.rb:106:7:108:9 | if ... |
-| raise.rb:106:10:106:11 | b1 | raise.rb:106:10:106:11 | b1 |
-| raise.rb:106:10:106:11 | b1 | raise.rb:107:9:107:26 | self |
-| raise.rb:106:10:106:11 | b1 | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
-| raise.rb:106:10:106:11 | b1 | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:106:10:106:11 | b1 | raise.rb:115:3:115:22 | self |
-| raise.rb:106:10:106:11 | b1 | raise.rb:116:3:118:5 | if ... |
-| raise.rb:106:10:106:11 | b1 | raise.rb:117:5:117:22 | self |
-| raise.rb:107:9:107:26 | [ensure: exception] self | raise.rb:107:9:107:26 | [ensure: exception] self |
-| raise.rb:107:9:107:26 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
-| raise.rb:107:9:107:26 | [ensure: return] self | raise.rb:107:9:107:26 | [ensure: return] self |
-| raise.rb:107:9:107:26 | [ensure: return] self | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
-| raise.rb:107:9:107:26 | self | raise.rb:107:9:107:26 | self |
-| raise.rb:107:9:107:26 | self | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
-| raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: exception] ensure ... | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:116:3:118:5 | [ensure: return] if ... |
-| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:117:5:117:22 | [ensure: return] self |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:113:14:113:19 | After ... > ... [false] | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:113:14:113:19 | After ... > ... [true] | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:120:8:120:28 | Entry | cfg.rb:120:8:120:28 | Entry |
+| cfg.rb:136:1:136:3 | After ... / ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:136:12:136:29 | Before call to puts | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:145:3:148:5 | Entry | cfg.rb:145:3:148:5 | Entry |
+| cfg.rb:152:1:154:3 | Entry | cfg.rb:152:1:154:3 | Entry |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:172:8:172:14 | After ... == ... [false] | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:172:8:172:14 | After ... == ... [true] | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:174:18:174:23 | After ... == ... [false] | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:174:18:174:23 | After ... == ... [true] | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:176:7:176:12 | After ... > ... [false] | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:179:30:179:36 | After ... == ... [false] | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:182:7:182:12 | After ... < ... [true] | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [true] | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:182:7:182:12 | After ... < ... [true] | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [true] | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:182:14:186:3 | do ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:182:14:186:3 | do ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:182:14:186:3 | do ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:184:6:184:11 | After ... == ... [false] | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:184:6:184:11 | After ... == ... [true] | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:188:30:188:35 | After ... != ... [true] | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:190:1:192:3 | Entry | cfg.rb:190:1:192:3 | Entry |
+| cfg.rb:194:11:194:23 | Entry | cfg.rb:194:11:194:23 | Entry |
+| cfg.rb:196:1:198:3 | Entry | cfg.rb:196:1:198:3 | Entry |
+| cfg.rb:200:9:200:32 | Entry | cfg.rb:200:9:200:32 | Entry |
+| cfg.rb:202:9:202:35 | Entry | cfg.rb:202:9:202:35 | Entry |
+| cfg.rb:205:4:205:5 | After call to == [false] | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:205:4:205:5 | After call to == [true] | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:205:15:205:23 | Entry | cfg.rb:205:15:205:23 | Entry |
+| cfg.rb:207:1:211:3 | Entry | cfg.rb:207:1:211:3 | Entry |
+| cfg.rb:208:15:210:5 | Entry | cfg.rb:208:15:210:5 | Entry |
+| cfg.rb:213:14:216:3 | Entry | cfg.rb:213:14:216:3 | Entry |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:1:1:22:4 | Entry |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [false] |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [true] |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [false] |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [true] |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [false] |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [true] |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... |
+| constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [false] | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [false] |
+| constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [true] | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [true] |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [false] |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [true] |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [false] |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [true] |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... |
+| constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [false] | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [false] |
+| constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [true] | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [true] |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [false] |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [true] |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... |
+| constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [false] | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [false] |
+| constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [true] | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [true] |
+| constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... | constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... |
+| desugar.rb:1:1:3:3 | Entry | desugar.rb:1:1:3:3 | Entry |
+| desugar.rb:1:1:38:17 | Entry | desugar.rb:1:1:38:17 | Entry |
+| desugar.rb:5:1:7:3 | Entry | desugar.rb:5:1:7:3 | Entry |
+| desugar.rb:9:1:11:3 | Entry | desugar.rb:9:1:11:3 | Entry |
+| desugar.rb:13:1:15:3 | Entry | desugar.rb:13:1:15:3 | Entry |
+| desugar.rb:17:1:19:3 | Entry | desugar.rb:17:1:19:3 | Entry |
+| desugar.rb:21:1:23:3 | Entry | desugar.rb:21:1:23:3 | Entry |
+| desugar.rb:25:1:27:3 | Entry | desugar.rb:25:1:27:3 | Entry |
+| exit.rb:1:1:6:3 | Entry | exit.rb:1:1:6:3 | Entry |
+| exit.rb:1:1:6:3 | Entry | exit.rb:1:1:6:3 | Exit |
+| exit.rb:1:1:6:3 | Entry | exit.rb:2:6:2:10 | After ... > ... [false] |
+| exit.rb:1:1:6:3 | Entry | exit.rb:2:6:2:10 | After ... > ... [true] |
+| exit.rb:1:1:6:3 | Exit | exit.rb:1:1:6:3 | Exit |
+| exit.rb:1:1:13:4 | Entry | exit.rb:1:1:13:4 | Entry |
+| exit.rb:2:6:2:10 | After ... > ... [false] | exit.rb:2:6:2:10 | After ... > ... [false] |
+| exit.rb:2:6:2:10 | After ... > ... [true] | exit.rb:2:6:2:10 | After ... > ... [true] |
+| exit.rb:8:1:13:3 | Entry | exit.rb:8:1:13:3 | Entry |
+| exit.rb:8:1:13:3 | Entry | exit.rb:8:1:13:3 | Exit |
+| exit.rb:8:1:13:3 | Entry | exit.rb:9:6:9:10 | After ... > ... [false] |
+| exit.rb:8:1:13:3 | Entry | exit.rb:9:6:9:10 | After ... > ... [true] |
+| exit.rb:8:1:13:3 | Exit | exit.rb:8:1:13:3 | Exit |
+| exit.rb:9:6:9:10 | After ... > ... [false] | exit.rb:9:6:9:10 | After ... > ... [false] |
+| exit.rb:9:6:9:10 | After ... > ... [true] | exit.rb:9:6:9:10 | After ... > ... [true] |
+| heredoc.rb:1:1:7:3 | Entry | heredoc.rb:1:1:7:3 | Entry |
+| heredoc.rb:1:1:7:4 | Entry | heredoc.rb:1:1:7:4 | Entry |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:1:1:9:3 | Entry |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:2:3:8:5 | After if ... |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:2:6:2:10 | After ... > ... [false] |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:2:6:2:10 | After ... > ... [true] |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:3:7:35 | After elsif ... |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:9:4:14 | After ... <= ... [false] |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:9:4:14 | After ... <= ... [true] |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:9:4:24 | After ... and ... [false] |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:9:4:38 | After ... and ... [false] |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:20:4:24 | After ... > ... [false] |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:20:4:24 | After ... > ... [true] |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:32:4:37 | After ... == ... [false] |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:32:4:37 | After ... == ... [true] |
+| ifs.rb:1:1:58:4 | Entry | ifs.rb:1:1:58:4 | Entry |
+| ifs.rb:1:1:58:4 | Entry | ifs.rb:36:1:38:17 | After ... unless ... |
+| ifs.rb:1:1:58:4 | Entry | ifs.rb:38:12:38:17 | After ... == ... [false] |
+| ifs.rb:1:1:58:4 | Entry | ifs.rb:38:12:38:17 | After ... == ... [true] |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:2:3:8:5 | After if ... |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:2:6:2:10 | After ... > ... [false] |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:3:7:35 | After elsif ... |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:9:4:14 | After ... <= ... [false] |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:9:4:14 | After ... <= ... [true] |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:9:4:24 | After ... and ... [false] |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:9:4:38 | After ... and ... [false] |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:20:4:24 | After ... > ... [false] |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:20:4:24 | After ... > ... [true] |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:32:4:37 | After ... == ... [false] |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:32:4:37 | After ... == ... [true] |
+| ifs.rb:2:6:2:10 | After ... > ... [true] | ifs.rb:2:6:2:10 | After ... > ... [true] |
+| ifs.rb:4:3:7:35 | After elsif ... | ifs.rb:4:3:7:35 | After elsif ... |
+| ifs.rb:4:9:4:14 | After ... <= ... [false] | ifs.rb:4:9:4:14 | After ... <= ... [false] |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:4:9:4:14 | After ... <= ... [true] |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:4:20:4:24 | After ... > ... [false] |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:4:20:4:24 | After ... > ... [true] |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:4:32:4:37 | After ... == ... [false] |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:4:32:4:37 | After ... == ... [true] |
+| ifs.rb:4:9:4:24 | After ... and ... [false] | ifs.rb:4:9:4:24 | After ... and ... [false] |
+| ifs.rb:4:9:4:38 | After ... and ... [false] | ifs.rb:4:9:4:38 | After ... and ... [false] |
+| ifs.rb:4:20:4:24 | After ... > ... [false] | ifs.rb:4:20:4:24 | After ... > ... [false] |
+| ifs.rb:4:20:4:24 | After ... > ... [true] | ifs.rb:4:20:4:24 | After ... > ... [true] |
+| ifs.rb:4:20:4:24 | After ... > ... [true] | ifs.rb:4:32:4:37 | After ... == ... [false] |
+| ifs.rb:4:20:4:24 | After ... > ... [true] | ifs.rb:4:32:4:37 | After ... == ... [true] |
+| ifs.rb:4:32:4:37 | After ... == ... [false] | ifs.rb:4:32:4:37 | After ... == ... [false] |
+| ifs.rb:4:32:4:37 | After ... == ... [true] | ifs.rb:4:32:4:37 | After ... == ... [true] |
+| ifs.rb:11:1:16:3 | Entry | ifs.rb:11:1:16:3 | Entry |
+| ifs.rb:11:1:16:3 | Entry | ifs.rb:11:1:16:3 | Normal Exit |
+| ifs.rb:11:1:16:3 | Entry | ifs.rb:12:6:12:6 | After b [false] |
+| ifs.rb:11:1:16:3 | Entry | ifs.rb:12:6:12:6 | After b [true] |
+| ifs.rb:11:1:16:3 | Normal Exit | ifs.rb:11:1:16:3 | Normal Exit |
+| ifs.rb:12:6:12:6 | After b [false] | ifs.rb:12:6:12:6 | After b [false] |
+| ifs.rb:12:6:12:6 | After b [true] | ifs.rb:12:6:12:6 | After b [true] |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:18:1:26:3 | Entry |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:19:3:24:5 | After if ... |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:19:6:19:10 | After ... < ... [false] |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:19:6:19:10 | After ... < ... [true] |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:21:5:23:7 | After if ... |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:21:8:21:13 | After ... > ... [false] |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:21:8:21:13 | After ... > ... [true] |
+| ifs.rb:19:3:24:5 | After if ... | ifs.rb:19:3:24:5 | After if ... |
+| ifs.rb:19:6:19:10 | After ... < ... [false] | ifs.rb:19:6:19:10 | After ... < ... [false] |
+| ifs.rb:19:6:19:10 | After ... < ... [true] | ifs.rb:19:6:19:10 | After ... < ... [true] |
+| ifs.rb:19:6:19:10 | After ... < ... [true] | ifs.rb:21:5:23:7 | After if ... |
+| ifs.rb:19:6:19:10 | After ... < ... [true] | ifs.rb:21:8:21:13 | After ... > ... [false] |
+| ifs.rb:19:6:19:10 | After ... < ... [true] | ifs.rb:21:8:21:13 | After ... > ... [true] |
+| ifs.rb:21:5:23:7 | After if ... | ifs.rb:21:5:23:7 | After if ... |
+| ifs.rb:21:8:21:13 | After ... > ... [false] | ifs.rb:21:8:21:13 | After ... > ... [false] |
+| ifs.rb:21:8:21:13 | After ... > ... [true] | ifs.rb:21:8:21:13 | After ... > ... [true] |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:28:1:30:3 | Entry |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:10:29:51 | After ... ? ... : ... |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:11:29:12 | After b1 [false] |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:11:29:12 | After b1 [true] |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:11:29:22 | After ... ? ... : ... [false] |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:11:29:22 | After ... ? ... : ... [true] |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:16:29:17 | After b2 [false] |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:16:29:17 | After b2 [true] |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:21:29:22 | After b3 [false] |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:21:29:22 | After b3 [true] |
+| ifs.rb:29:10:29:51 | After ... ? ... : ... | ifs.rb:29:10:29:51 | After ... ? ... : ... |
+| ifs.rb:29:11:29:12 | After b1 [false] | ifs.rb:29:11:29:12 | After b1 [false] |
+| ifs.rb:29:11:29:12 | After b1 [false] | ifs.rb:29:21:29:22 | After b3 [false] |
+| ifs.rb:29:11:29:12 | After b1 [false] | ifs.rb:29:21:29:22 | After b3 [true] |
+| ifs.rb:29:11:29:12 | After b1 [true] | ifs.rb:29:11:29:12 | After b1 [true] |
+| ifs.rb:29:11:29:12 | After b1 [true] | ifs.rb:29:16:29:17 | After b2 [false] |
+| ifs.rb:29:11:29:12 | After b1 [true] | ifs.rb:29:16:29:17 | After b2 [true] |
+| ifs.rb:29:11:29:22 | After ... ? ... : ... [false] | ifs.rb:29:11:29:22 | After ... ? ... : ... [false] |
+| ifs.rb:29:11:29:22 | After ... ? ... : ... [true] | ifs.rb:29:11:29:22 | After ... ? ... : ... [true] |
+| ifs.rb:29:16:29:17 | After b2 [false] | ifs.rb:29:16:29:17 | After b2 [false] |
+| ifs.rb:29:16:29:17 | After b2 [true] | ifs.rb:29:16:29:17 | After b2 [true] |
+| ifs.rb:29:21:29:22 | After b3 [false] | ifs.rb:29:21:29:22 | After b3 [false] |
+| ifs.rb:29:21:29:22 | After b3 [true] | ifs.rb:29:21:29:22 | After b3 [true] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:32:1:34:3 | Entry |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:3:33:100 | After if ... |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:7:33:48 | After if ... [false] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:7:33:48 | After if ... [true] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:10:33:11 | After b1 [false] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:10:33:11 | After b1 [true] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:18:33:19 | After b2 [false] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:18:33:19 | After b2 [true] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:21:33:44 | After elsif ... [false] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:21:33:44 | After elsif ... [true] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:27:33:28 | After b3 [false] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:27:33:28 | After b3 [true] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:35:33:36 | After b4 [false] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:35:33:36 | After b4 [true] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:43:33:44 | After b5 [false] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:43:33:44 | After b5 [true] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:3:33:100 | After if ... |
+| ifs.rb:33:7:33:48 | After if ... [false] | ifs.rb:33:7:33:48 | After if ... [false] |
+| ifs.rb:33:7:33:48 | After if ... [true] | ifs.rb:33:7:33:48 | After if ... [true] |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:10:33:11 | After b1 [false] |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:21:33:44 | After elsif ... [false] |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:21:33:44 | After elsif ... [true] |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:27:33:28 | After b3 [false] |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:27:33:28 | After b3 [true] |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:35:33:36 | After b4 [false] |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:35:33:36 | After b4 [true] |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:43:33:44 | After b5 [false] |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:43:33:44 | After b5 [true] |
+| ifs.rb:33:10:33:11 | After b1 [true] | ifs.rb:33:10:33:11 | After b1 [true] |
+| ifs.rb:33:10:33:11 | After b1 [true] | ifs.rb:33:18:33:19 | After b2 [false] |
+| ifs.rb:33:10:33:11 | After b1 [true] | ifs.rb:33:18:33:19 | After b2 [true] |
+| ifs.rb:33:18:33:19 | After b2 [false] | ifs.rb:33:18:33:19 | After b2 [false] |
+| ifs.rb:33:18:33:19 | After b2 [true] | ifs.rb:33:18:33:19 | After b2 [true] |
+| ifs.rb:33:21:33:44 | After elsif ... [false] | ifs.rb:33:21:33:44 | After elsif ... [false] |
+| ifs.rb:33:21:33:44 | After elsif ... [true] | ifs.rb:33:21:33:44 | After elsif ... [true] |
+| ifs.rb:33:27:33:28 | After b3 [false] | ifs.rb:33:27:33:28 | After b3 [false] |
+| ifs.rb:33:27:33:28 | After b3 [false] | ifs.rb:33:43:33:44 | After b5 [false] |
+| ifs.rb:33:27:33:28 | After b3 [false] | ifs.rb:33:43:33:44 | After b5 [true] |
+| ifs.rb:33:27:33:28 | After b3 [true] | ifs.rb:33:27:33:28 | After b3 [true] |
+| ifs.rb:33:27:33:28 | After b3 [true] | ifs.rb:33:35:33:36 | After b4 [false] |
+| ifs.rb:33:27:33:28 | After b3 [true] | ifs.rb:33:35:33:36 | After b4 [true] |
+| ifs.rb:33:35:33:36 | After b4 [false] | ifs.rb:33:35:33:36 | After b4 [false] |
+| ifs.rb:33:35:33:36 | After b4 [true] | ifs.rb:33:35:33:36 | After b4 [true] |
+| ifs.rb:33:43:33:44 | After b5 [false] | ifs.rb:33:43:33:44 | After b5 [false] |
+| ifs.rb:33:43:33:44 | After b5 [true] | ifs.rb:33:43:33:44 | After b5 [true] |
+| ifs.rb:36:1:38:3 | Entry | ifs.rb:36:1:38:3 | Entry |
+| ifs.rb:36:1:38:17 | After ... unless ... | ifs.rb:36:1:38:17 | After ... unless ... |
+| ifs.rb:38:12:38:17 | After ... == ... [false] | ifs.rb:38:12:38:17 | After ... == ... [false] |
+| ifs.rb:38:12:38:17 | After ... == ... [true] | ifs.rb:38:12:38:17 | After ... == ... [true] |
+| ifs.rb:40:1:44:3 | Entry | ifs.rb:40:1:44:3 | Entry |
+| ifs.rb:46:1:52:3 | Entry | ifs.rb:46:1:52:3 | Entry |
+| ifs.rb:46:1:52:3 | Entry | ifs.rb:47:3:50:5 | After if ... |
+| ifs.rb:46:1:52:3 | Entry | ifs.rb:47:6:47:6 | After b [false] |
+| ifs.rb:46:1:52:3 | Entry | ifs.rb:47:6:47:6 | After b [true] |
+| ifs.rb:47:3:50:5 | After if ... | ifs.rb:47:3:50:5 | After if ... |
+| ifs.rb:47:6:47:6 | After b [false] | ifs.rb:47:6:47:6 | After b [false] |
+| ifs.rb:47:6:47:6 | After b [true] | ifs.rb:47:6:47:6 | After b [true] |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:54:1:58:3 | Entry |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:55:3:57:5 | After if ... |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:55:7:55:8 | After b1 [false] |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:55:7:55:8 | After b1 [true] |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:55:7:55:14 | After ... \|\| ... [true] |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:55:13:55:14 | After b2 [false] |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:55:13:55:14 | After b2 [true] |
+| ifs.rb:55:3:57:5 | After if ... | ifs.rb:55:3:57:5 | After if ... |
+| ifs.rb:55:7:55:8 | After b1 [false] | ifs.rb:55:7:55:8 | After b1 [false] |
+| ifs.rb:55:7:55:8 | After b1 [false] | ifs.rb:55:13:55:14 | After b2 [false] |
+| ifs.rb:55:7:55:8 | After b1 [false] | ifs.rb:55:13:55:14 | After b2 [true] |
+| ifs.rb:55:7:55:8 | After b1 [true] | ifs.rb:55:7:55:8 | After b1 [true] |
+| ifs.rb:55:7:55:14 | After ... \|\| ... [true] | ifs.rb:55:7:55:14 | After ... \|\| ... [true] |
+| ifs.rb:55:13:55:14 | After b2 [false] | ifs.rb:55:13:55:14 | After b2 [false] |
+| ifs.rb:55:13:55:14 | After b2 [true] | ifs.rb:55:13:55:14 | After b2 [true] |
+| loops.rb:1:1:6:3 | Entry | loops.rb:1:1:6:3 | Entry |
+| loops.rb:1:1:6:3 | Entry | loops.rb:2:3:5:5 | [LoopHeader] while ... |
+| loops.rb:1:1:6:3 | Entry | loops.rb:2:9:2:14 | After ... >= ... [false] |
+| loops.rb:1:1:6:3 | Entry | loops.rb:2:9:2:14 | After ... >= ... [true] |
+| loops.rb:1:1:33:4 | Entry | loops.rb:1:1:33:4 | Entry |
+| loops.rb:2:3:5:5 | [LoopHeader] while ... | loops.rb:2:3:5:5 | [LoopHeader] while ... |
+| loops.rb:2:3:5:5 | [LoopHeader] while ... | loops.rb:2:9:2:14 | After ... >= ... [false] |
+| loops.rb:2:3:5:5 | [LoopHeader] while ... | loops.rb:2:9:2:14 | After ... >= ... [true] |
+| loops.rb:2:9:2:14 | After ... >= ... [false] | loops.rb:2:9:2:14 | After ... >= ... [false] |
+| loops.rb:2:9:2:14 | After ... >= ... [true] | loops.rb:2:9:2:14 | After ... >= ... [true] |
+| loops.rb:8:1:22:3 | Entry | loops.rb:8:1:22:3 | Entry |
+| loops.rb:8:1:22:3 | Entry | loops.rb:9:3:20:5 | After while ... |
+| loops.rb:8:1:22:3 | Entry | loops.rb:9:3:20:5 | [LoopHeader] while ... |
+| loops.rb:8:1:22:3 | Entry | loops.rb:9:9:9:14 | After ... >= ... [false] |
+| loops.rb:8:1:22:3 | Entry | loops.rb:9:9:9:14 | After ... >= ... [true] |
+| loops.rb:8:1:22:3 | Entry | loops.rb:9:15:20:5 | do ... |
+| loops.rb:8:1:22:3 | Entry | loops.rb:12:8:12:14 | After ... > ... [false] |
+| loops.rb:8:1:22:3 | Entry | loops.rb:12:8:12:14 | After ... > ... [true] |
+| loops.rb:8:1:22:3 | Entry | loops.rb:14:11:14:16 | After ... > ... [false] |
+| loops.rb:8:1:22:3 | Entry | loops.rb:14:11:14:16 | After ... > ... [true] |
+| loops.rb:8:1:22:3 | Entry | loops.rb:16:11:16:16 | After ... > ... [false] |
+| loops.rb:8:1:22:3 | Entry | loops.rb:16:11:16:16 | After ... > ... [true] |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:9:3:20:5 | After while ... |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:9:3:20:5 | After while ... |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:9:3:20:5 | [LoopHeader] while ... |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:9:9:9:14 | After ... >= ... [false] |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:9:9:9:14 | After ... >= ... [true] |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:9:15:20:5 | do ... |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:12:8:12:14 | After ... > ... [false] |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:12:8:12:14 | After ... > ... [true] |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:14:11:14:16 | After ... > ... [false] |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:14:11:14:16 | After ... > ... [true] |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:16:11:16:16 | After ... > ... [false] |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:16:11:16:16 | After ... > ... [true] |
+| loops.rb:9:9:9:14 | After ... >= ... [false] | loops.rb:9:9:9:14 | After ... >= ... [false] |
+| loops.rb:9:9:9:14 | After ... >= ... [true] | loops.rb:9:9:9:14 | After ... >= ... [true] |
+| loops.rb:9:9:9:14 | After ... >= ... [true] | loops.rb:9:15:20:5 | do ... |
+| loops.rb:9:9:9:14 | After ... >= ... [true] | loops.rb:12:8:12:14 | After ... > ... [false] |
+| loops.rb:9:9:9:14 | After ... >= ... [true] | loops.rb:12:8:12:14 | After ... > ... [true] |
+| loops.rb:9:9:9:14 | After ... >= ... [true] | loops.rb:14:11:14:16 | After ... > ... [false] |
+| loops.rb:9:9:9:14 | After ... >= ... [true] | loops.rb:14:11:14:16 | After ... > ... [true] |
+| loops.rb:9:9:9:14 | After ... >= ... [true] | loops.rb:16:11:16:16 | After ... > ... [false] |
+| loops.rb:9:9:9:14 | After ... >= ... [true] | loops.rb:16:11:16:16 | After ... > ... [true] |
+| loops.rb:9:15:20:5 | do ... | loops.rb:9:15:20:5 | do ... |
+| loops.rb:9:15:20:5 | do ... | loops.rb:12:8:12:14 | After ... > ... [false] |
+| loops.rb:9:15:20:5 | do ... | loops.rb:12:8:12:14 | After ... > ... [true] |
+| loops.rb:9:15:20:5 | do ... | loops.rb:14:11:14:16 | After ... > ... [false] |
+| loops.rb:9:15:20:5 | do ... | loops.rb:14:11:14:16 | After ... > ... [true] |
+| loops.rb:9:15:20:5 | do ... | loops.rb:16:11:16:16 | After ... > ... [false] |
+| loops.rb:9:15:20:5 | do ... | loops.rb:16:11:16:16 | After ... > ... [true] |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:12:8:12:14 | After ... > ... [false] |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:14:11:14:16 | After ... > ... [false] |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:14:11:14:16 | After ... > ... [true] |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:16:11:16:16 | After ... > ... [false] |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:16:11:16:16 | After ... > ... [true] |
+| loops.rb:12:8:12:14 | After ... > ... [true] | loops.rb:12:8:12:14 | After ... > ... [true] |
+| loops.rb:14:11:14:16 | After ... > ... [false] | loops.rb:14:11:14:16 | After ... > ... [false] |
+| loops.rb:14:11:14:16 | After ... > ... [false] | loops.rb:16:11:16:16 | After ... > ... [false] |
+| loops.rb:14:11:14:16 | After ... > ... [false] | loops.rb:16:11:16:16 | After ... > ... [true] |
+| loops.rb:14:11:14:16 | After ... > ... [true] | loops.rb:14:11:14:16 | After ... > ... [true] |
+| loops.rb:16:11:16:16 | After ... > ... [false] | loops.rb:16:11:16:16 | After ... > ... [false] |
+| loops.rb:16:11:16:16 | After ... > ... [true] | loops.rb:16:11:16:16 | After ... > ... [true] |
+| loops.rb:24:1:28:3 | Entry | loops.rb:24:1:28:3 | Entry |
+| loops.rb:25:16:27:5 | Entry | loops.rb:25:16:27:5 | Entry |
+| loops.rb:30:1:33:3 | Entry | loops.rb:30:1:33:3 | Entry |
+| loops.rb:30:1:33:3 | Entry | loops.rb:31:3:32:5 | [LoopHeader] while ... |
+| loops.rb:30:1:33:3 | Entry | loops.rb:31:9:31:13 | After ... < ... [false] |
+| loops.rb:30:1:33:3 | Entry | loops.rb:31:9:31:13 | After ... < ... [true] |
+| loops.rb:31:3:32:5 | [LoopHeader] while ... | loops.rb:31:3:32:5 | [LoopHeader] while ... |
+| loops.rb:31:3:32:5 | [LoopHeader] while ... | loops.rb:31:9:31:13 | After ... < ... [false] |
+| loops.rb:31:3:32:5 | [LoopHeader] while ... | loops.rb:31:9:31:13 | After ... < ... [true] |
+| loops.rb:31:9:31:13 | After ... < ... [false] | loops.rb:31:9:31:13 | After ... < ... [false] |
+| loops.rb:31:9:31:13 | After ... < ... [true] | loops.rb:31:9:31:13 | After ... < ... [true] |
+| raise.rb:1:1:182:4 | Entry | raise.rb:1:1:182:4 | Entry |
+| raise.rb:7:1:12:3 | Entry | raise.rb:7:1:12:3 | Entry |
+| raise.rb:7:1:12:3 | Entry | raise.rb:7:1:12:3 | Exit |
+| raise.rb:7:1:12:3 | Entry | raise.rb:8:6:8:10 | After ... > ... [false] |
+| raise.rb:7:1:12:3 | Entry | raise.rb:8:6:8:10 | After ... > ... [true] |
+| raise.rb:7:1:12:3 | Exit | raise.rb:7:1:12:3 | Exit |
+| raise.rb:8:6:8:10 | After ... > ... [false] | raise.rb:8:6:8:10 | After ... > ... [false] |
+| raise.rb:8:6:8:10 | After ... > ... [true] | raise.rb:8:6:8:10 | After ... > ... [true] |
+| raise.rb:14:1:23:3 | Entry | raise.rb:14:1:23:3 | Entry |
+| raise.rb:14:1:23:3 | Entry | raise.rb:14:1:23:3 | Exit |
+| raise.rb:14:1:23:3 | Entry | raise.rb:15:3:21:5 | After begin ...  |
+| raise.rb:14:1:23:3 | Entry | raise.rb:16:8:16:8 | After b [false] |
+| raise.rb:14:1:23:3 | Entry | raise.rb:16:8:16:8 | After b [true] |
+| raise.rb:14:1:23:3 | Entry | raise.rb:19:10:19:19 | After ExceptionA [match] |
+| raise.rb:14:1:23:3 | Entry | raise.rb:19:10:19:19 | After ExceptionA [no-match] |
+| raise.rb:14:1:23:3 | Exit | raise.rb:14:1:23:3 | Exit |
+| raise.rb:15:3:21:5 | After begin ...  | raise.rb:15:3:21:5 | After begin ...  |
+| raise.rb:16:8:16:8 | After b [false] | raise.rb:16:8:16:8 | After b [false] |
+| raise.rb:16:8:16:8 | After b [true] | raise.rb:16:8:16:8 | After b [true] |
+| raise.rb:16:8:16:8 | After b [true] | raise.rb:19:10:19:19 | After ExceptionA [match] |
+| raise.rb:16:8:16:8 | After b [true] | raise.rb:19:10:19:19 | After ExceptionA [no-match] |
+| raise.rb:19:10:19:19 | After ExceptionA [match] | raise.rb:19:10:19:19 | After ExceptionA [match] |
+| raise.rb:19:10:19:19 | After ExceptionA [no-match] | raise.rb:19:10:19:19 | After ExceptionA [no-match] |
+| raise.rb:25:1:34:3 | Entry | raise.rb:25:1:34:3 | Entry |
+| raise.rb:25:1:34:3 | Entry | raise.rb:26:3:32:5 | After begin ...  |
+| raise.rb:25:1:34:3 | Entry | raise.rb:27:8:27:8 | After b [false] |
+| raise.rb:25:1:34:3 | Entry | raise.rb:27:8:27:8 | After b [true] |
+| raise.rb:26:3:32:5 | After begin ...  | raise.rb:26:3:32:5 | After begin ...  |
+| raise.rb:27:8:27:8 | After b [false] | raise.rb:27:8:27:8 | After b [false] |
+| raise.rb:27:8:27:8 | After b [true] | raise.rb:27:8:27:8 | After b [true] |
+| raise.rb:36:1:45:3 | Entry | raise.rb:36:1:45:3 | Entry |
+| raise.rb:36:1:45:3 | Entry | raise.rb:37:3:43:5 | After begin ...  |
+| raise.rb:36:1:45:3 | Entry | raise.rb:38:8:38:8 | After b [false] |
+| raise.rb:36:1:45:3 | Entry | raise.rb:38:8:38:8 | After b [true] |
+| raise.rb:37:3:43:5 | After begin ...  | raise.rb:37:3:43:5 | After begin ...  |
+| raise.rb:38:8:38:8 | After b [false] | raise.rb:38:8:38:8 | After b [false] |
+| raise.rb:38:8:38:8 | After b [true] | raise.rb:38:8:38:8 | After b [true] |
+| raise.rb:47:1:55:3 | Entry | raise.rb:47:1:55:3 | Entry |
+| raise.rb:47:1:55:3 | Entry | raise.rb:48:3:53:5 | After begin ...  |
+| raise.rb:47:1:55:3 | Entry | raise.rb:49:8:49:8 | After b [false] |
+| raise.rb:47:1:55:3 | Entry | raise.rb:49:8:49:8 | After b [true] |
+| raise.rb:48:3:53:5 | After begin ...  | raise.rb:48:3:53:5 | After begin ...  |
+| raise.rb:49:8:49:8 | After b [false] | raise.rb:49:8:49:8 | After b [false] |
+| raise.rb:49:8:49:8 | After b [true] | raise.rb:49:8:49:8 | After b [true] |
+| raise.rb:57:1:66:3 | Entry | raise.rb:57:1:66:3 | Entry |
+| raise.rb:57:1:66:3 | Entry | raise.rb:57:1:66:3 | Exit |
+| raise.rb:57:1:66:3 | Entry | raise.rb:58:3:64:5 | After begin ...  |
+| raise.rb:57:1:66:3 | Entry | raise.rb:59:8:59:8 | After b [false] |
+| raise.rb:57:1:66:3 | Entry | raise.rb:59:8:59:8 | After b [true] |
+| raise.rb:57:1:66:3 | Entry | raise.rb:62:10:62:31 | After ..., ... [match] |
+| raise.rb:57:1:66:3 | Entry | raise.rb:62:10:62:31 | After ..., ... [no-match] |
+| raise.rb:57:1:66:3 | Exit | raise.rb:57:1:66:3 | Exit |
+| raise.rb:58:3:64:5 | After begin ...  | raise.rb:58:3:64:5 | After begin ...  |
+| raise.rb:59:8:59:8 | After b [false] | raise.rb:59:8:59:8 | After b [false] |
+| raise.rb:59:8:59:8 | After b [true] | raise.rb:59:8:59:8 | After b [true] |
+| raise.rb:59:8:59:8 | After b [true] | raise.rb:62:10:62:31 | After ..., ... [match] |
+| raise.rb:59:8:59:8 | After b [true] | raise.rb:62:10:62:31 | After ..., ... [no-match] |
+| raise.rb:62:10:62:31 | After ..., ... [match] | raise.rb:62:10:62:31 | After ..., ... [match] |
+| raise.rb:62:10:62:31 | After ..., ... [no-match] | raise.rb:62:10:62:31 | After ..., ... [no-match] |
+| raise.rb:68:1:77:3 | Entry | raise.rb:68:1:77:3 | Entry |
+| raise.rb:68:1:77:3 | Entry | raise.rb:68:1:77:3 | Exceptional Exit |
+| raise.rb:68:1:77:3 | Entry | raise.rb:68:1:77:3 | Exit |
+| raise.rb:68:1:77:3 | Entry | raise.rb:68:1:77:3 | Normal Exit |
+| raise.rb:68:1:77:3 | Entry | raise.rb:69:3:76:15 | After ... |
+| raise.rb:68:1:77:3 | Entry | raise.rb:69:6:69:10 | After ... > ... [false] |
+| raise.rb:68:1:77:3 | Entry | raise.rb:69:6:69:10 | After ... > ... [true] |
+| raise.rb:68:1:77:3 | Entry | raise.rb:71:9:71:13 | After ... < ... [false] |
+| raise.rb:68:1:77:3 | Entry | raise.rb:71:9:71:13 | After ... < ... [true] |
+| raise.rb:68:1:77:3 | Entry | raise.rb:74:3:74:20 | After call to puts |
+| raise.rb:68:1:77:3 | Entry | raise.rb:75:1:76:15 | ensure ... |
+| raise.rb:68:1:77:3 | Exceptional Exit | raise.rb:68:1:77:3 | Exceptional Exit |
+| raise.rb:68:1:77:3 | Exit | raise.rb:68:1:77:3 | Exit |
+| raise.rb:68:1:77:3 | Normal Exit | raise.rb:68:1:77:3 | Normal Exit |
+| raise.rb:69:3:76:15 | After ... | raise.rb:69:3:76:15 | After ... |
+| raise.rb:69:6:69:10 | After ... > ... [false] | raise.rb:69:6:69:10 | After ... > ... [false] |
+| raise.rb:69:6:69:10 | After ... > ... [false] | raise.rb:71:9:71:13 | After ... < ... [false] |
+| raise.rb:69:6:69:10 | After ... > ... [false] | raise.rb:71:9:71:13 | After ... < ... [true] |
+| raise.rb:69:6:69:10 | After ... > ... [false] | raise.rb:74:3:74:20 | After call to puts |
+| raise.rb:69:6:69:10 | After ... > ... [true] | raise.rb:69:6:69:10 | After ... > ... [true] |
+| raise.rb:71:9:71:13 | After ... < ... [false] | raise.rb:71:9:71:13 | After ... < ... [false] |
+| raise.rb:71:9:71:13 | After ... < ... [false] | raise.rb:74:3:74:20 | After call to puts |
+| raise.rb:71:9:71:13 | After ... < ... [true] | raise.rb:71:9:71:13 | After ... < ... [true] |
+| raise.rb:74:3:74:20 | After call to puts | raise.rb:74:3:74:20 | After call to puts |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:68:1:77:3 | Exceptional Exit |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:68:1:77:3 | Exit |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:68:1:77:3 | Normal Exit |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:69:3:76:15 | After ... |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:75:1:76:15 | ensure ... |
+| raise.rb:79:1:92:3 | Entry | raise.rb:79:1:92:3 | Entry |
+| raise.rb:79:1:92:3 | Entry | raise.rb:79:1:92:3 | Exceptional Exit |
+| raise.rb:79:1:92:3 | Entry | raise.rb:79:1:92:3 | Exit |
+| raise.rb:79:1:92:3 | Entry | raise.rb:79:1:92:3 | Normal Exit |
+| raise.rb:79:1:92:3 | Entry | raise.rb:81:3:90:5 | After begin ...  |
+| raise.rb:79:1:92:3 | Entry | raise.rb:82:8:82:12 | After ... > ... [false] |
+| raise.rb:79:1:92:3 | Entry | raise.rb:82:8:82:12 | After ... > ... [true] |
+| raise.rb:79:1:92:3 | Entry | raise.rb:84:11:84:15 | After ... < ... [false] |
+| raise.rb:79:1:92:3 | Entry | raise.rb:84:11:84:15 | After ... < ... [true] |
+| raise.rb:79:1:92:3 | Entry | raise.rb:87:5:87:22 | After call to puts |
+| raise.rb:79:1:92:3 | Entry | raise.rb:88:3:89:17 | ensure ... |
+| raise.rb:79:1:92:3 | Exceptional Exit | raise.rb:79:1:92:3 | Exceptional Exit |
+| raise.rb:79:1:92:3 | Exit | raise.rb:79:1:92:3 | Exit |
+| raise.rb:79:1:92:3 | Normal Exit | raise.rb:79:1:92:3 | Normal Exit |
+| raise.rb:81:3:90:5 | After begin ...  | raise.rb:81:3:90:5 | After begin ...  |
+| raise.rb:82:8:82:12 | After ... > ... [false] | raise.rb:82:8:82:12 | After ... > ... [false] |
+| raise.rb:82:8:82:12 | After ... > ... [false] | raise.rb:84:11:84:15 | After ... < ... [false] |
+| raise.rb:82:8:82:12 | After ... > ... [false] | raise.rb:84:11:84:15 | After ... < ... [true] |
+| raise.rb:82:8:82:12 | After ... > ... [false] | raise.rb:87:5:87:22 | After call to puts |
+| raise.rb:82:8:82:12 | After ... > ... [true] | raise.rb:82:8:82:12 | After ... > ... [true] |
+| raise.rb:84:11:84:15 | After ... < ... [false] | raise.rb:84:11:84:15 | After ... < ... [false] |
+| raise.rb:84:11:84:15 | After ... < ... [false] | raise.rb:87:5:87:22 | After call to puts |
+| raise.rb:84:11:84:15 | After ... < ... [true] | raise.rb:84:11:84:15 | After ... < ... [true] |
+| raise.rb:87:5:87:22 | After call to puts | raise.rb:87:5:87:22 | After call to puts |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:79:1:92:3 | Exceptional Exit |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:79:1:92:3 | Exit |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:79:1:92:3 | Normal Exit |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:81:3:90:5 | After begin ...  |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:88:3:89:17 | ensure ... |
+| raise.rb:94:1:119:3 | Entry | raise.rb:94:1:119:3 | Entry |
+| raise.rb:94:1:119:3 | Entry | raise.rb:94:1:119:3 | Exceptional Exit |
+| raise.rb:94:1:119:3 | Entry | raise.rb:94:1:119:3 | Exit |
+| raise.rb:94:1:119:3 | Entry | raise.rb:94:1:119:3 | Normal Exit |
+| raise.rb:94:1:119:3 | Entry | raise.rb:95:3:95:17 | After call to puts |
+| raise.rb:94:1:119:3 | Entry | raise.rb:95:3:118:5 | After ... |
+| raise.rb:94:1:119:3 | Entry | raise.rb:96:3:112:5 | After begin ...  |
+| raise.rb:94:1:119:3 | Entry | raise.rb:97:8:97:12 | After ... > ... [false] |
+| raise.rb:94:1:119:3 | Entry | raise.rb:97:8:97:12 | After ... > ... [true] |
+| raise.rb:94:1:119:3 | Entry | raise.rb:99:11:99:15 | After ... < ... [false] |
+| raise.rb:94:1:119:3 | Entry | raise.rb:99:11:99:15 | After ... < ... [true] |
+| raise.rb:94:1:119:3 | Entry | raise.rb:102:5:102:22 | After call to puts |
+| raise.rb:94:1:119:3 | Entry | raise.rb:103:3:111:7 | ensure ... |
+| raise.rb:94:1:119:3 | Entry | raise.rb:104:5:104:23 | After call to puts |
+| raise.rb:94:1:119:3 | Entry | raise.rb:105:5:111:7 | After begin ...  |
+| raise.rb:94:1:119:3 | Entry | raise.rb:106:10:106:11 | After b1 [false] |
+| raise.rb:94:1:119:3 | Entry | raise.rb:106:10:106:11 | After b1 [true] |
+| raise.rb:94:1:119:3 | Entry | raise.rb:109:5:110:25 | ensure ... |
+| raise.rb:94:1:119:3 | Entry | raise.rb:110:7:110:25 | After call to puts |
+| raise.rb:94:1:119:3 | Entry | raise.rb:113:3:113:15 | After call to puts |
+| raise.rb:94:1:119:3 | Entry | raise.rb:114:1:118:5 | ensure ... |
+| raise.rb:94:1:119:3 | Entry | raise.rb:116:6:116:7 | After b2 [false] |
+| raise.rb:94:1:119:3 | Entry | raise.rb:116:6:116:7 | After b2 [true] |
+| raise.rb:94:1:119:3 | Exceptional Exit | raise.rb:94:1:119:3 | Exceptional Exit |
+| raise.rb:94:1:119:3 | Exit | raise.rb:94:1:119:3 | Exit |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:94:1:119:3 | Normal Exit |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:95:3:95:17 | After call to puts |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:96:3:112:5 | After begin ...  |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:97:8:97:12 | After ... > ... [false] |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:97:8:97:12 | After ... > ... [true] |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:99:11:99:15 | After ... < ... [false] |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:99:11:99:15 | After ... < ... [true] |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:102:5:102:22 | After call to puts |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:103:3:111:7 | ensure ... |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:104:5:104:23 | After call to puts |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:105:5:111:7 | After begin ...  |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:106:10:106:11 | After b1 [false] |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:106:10:106:11 | After b1 [true] |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:109:5:110:25 | ensure ... |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:110:7:110:25 | After call to puts |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:113:3:113:15 | After call to puts |
+| raise.rb:95:3:118:5 | After ... | raise.rb:95:3:118:5 | After ... |
+| raise.rb:96:3:112:5 | After begin ...  | raise.rb:96:3:112:5 | After begin ...  |
+| raise.rb:96:3:112:5 | After begin ...  | raise.rb:113:3:113:15 | After call to puts |
+| raise.rb:97:8:97:12 | After ... > ... [false] | raise.rb:97:8:97:12 | After ... > ... [false] |
+| raise.rb:97:8:97:12 | After ... > ... [false] | raise.rb:99:11:99:15 | After ... < ... [false] |
+| raise.rb:97:8:97:12 | After ... > ... [false] | raise.rb:99:11:99:15 | After ... < ... [true] |
+| raise.rb:97:8:97:12 | After ... > ... [false] | raise.rb:102:5:102:22 | After call to puts |
+| raise.rb:97:8:97:12 | After ... > ... [true] | raise.rb:97:8:97:12 | After ... > ... [true] |
+| raise.rb:99:11:99:15 | After ... < ... [false] | raise.rb:99:11:99:15 | After ... < ... [false] |
+| raise.rb:99:11:99:15 | After ... < ... [false] | raise.rb:102:5:102:22 | After call to puts |
+| raise.rb:99:11:99:15 | After ... < ... [true] | raise.rb:99:11:99:15 | After ... < ... [true] |
+| raise.rb:102:5:102:22 | After call to puts | raise.rb:102:5:102:22 | After call to puts |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:96:3:112:5 | After begin ...  |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:103:3:111:7 | ensure ... |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:104:5:104:23 | After call to puts |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:105:5:111:7 | After begin ...  |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:106:10:106:11 | After b1 [false] |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:106:10:106:11 | After b1 [true] |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:109:5:110:25 | ensure ... |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:110:7:110:25 | After call to puts |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:113:3:113:15 | After call to puts |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:96:3:112:5 | After begin ...  |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:104:5:104:23 | After call to puts |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:105:5:111:7 | After begin ...  |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:106:10:106:11 | After b1 [false] |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:106:10:106:11 | After b1 [true] |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:109:5:110:25 | ensure ... |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:110:7:110:25 | After call to puts |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:113:3:113:15 | After call to puts |
+| raise.rb:105:5:111:7 | After begin ...  | raise.rb:96:3:112:5 | After begin ...  |
+| raise.rb:105:5:111:7 | After begin ...  | raise.rb:105:5:111:7 | After begin ...  |
+| raise.rb:105:5:111:7 | After begin ...  | raise.rb:113:3:113:15 | After call to puts |
+| raise.rb:106:10:106:11 | After b1 [false] | raise.rb:106:10:106:11 | After b1 [false] |
+| raise.rb:106:10:106:11 | After b1 [true] | raise.rb:106:10:106:11 | After b1 [true] |
+| raise.rb:109:5:110:25 | ensure ... | raise.rb:96:3:112:5 | After begin ...  |
+| raise.rb:109:5:110:25 | ensure ... | raise.rb:105:5:111:7 | After begin ...  |
 | raise.rb:109:5:110:25 | ensure ... | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:109:5:110:25 | ensure ... | raise.rb:115:3:115:22 | self |
-| raise.rb:109:5:110:25 | ensure ... | raise.rb:116:3:118:5 | if ... |
-| raise.rb:109:5:110:25 | ensure ... | raise.rb:117:5:117:22 | self |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:115:3:115:22 | [ensure: exception] self |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:116:3:118:5 | [ensure: exception] if ... |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:117:5:117:22 | [ensure: exception] self |
-| raise.rb:115:3:115:22 | self | raise.rb:115:3:115:22 | self |
-| raise.rb:115:3:115:22 | self | raise.rb:116:3:118:5 | if ... |
-| raise.rb:115:3:115:22 | self | raise.rb:117:5:117:22 | self |
-| raise.rb:116:3:118:5 | [ensure: exception] if ... | raise.rb:116:3:118:5 | [ensure: exception] if ... |
-| raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:116:3:118:5 | [ensure: return] if ... |
-| raise.rb:116:3:118:5 | if ... | raise.rb:116:3:118:5 | if ... |
-| raise.rb:117:5:117:22 | [ensure: exception] self | raise.rb:117:5:117:22 | [ensure: exception] self |
-| raise.rb:117:5:117:22 | [ensure: return] self | raise.rb:117:5:117:22 | [ensure: return] self |
-| raise.rb:117:5:117:22 | self | raise.rb:117:5:117:22 | self |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:121:1:126:3 | enter m10 |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:121:1:126:3 | exit m10 |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:121:14:121:30 | self |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:125:3:125:51 | self |
-| raise.rb:121:1:126:3 | exit m10 | raise.rb:121:1:126:3 | exit m10 |
-| raise.rb:121:14:121:30 | self | raise.rb:121:14:121:30 | self |
-| raise.rb:125:3:125:51 | self | raise.rb:125:3:125:51 | self |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:128:1:140:3 | enter m11 |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:128:1:140:3 | exit m11 |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:130:5:132:7 | if ... |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:131:7:131:22 | self |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:133:3:133:19 | rescue ... |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:134:10:134:19 | ExceptionB |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:135:5:135:21 | self |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:137:5:137:17 | [ensure: exception] self |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:137:5:137:17 | self |
-| raise.rb:128:1:140:3 | exit m11 | raise.rb:128:1:140:3 | exit m11 |
-| raise.rb:130:5:132:7 | if ... | raise.rb:130:5:132:7 | if ... |
-| raise.rb:131:7:131:22 | self | raise.rb:131:7:131:22 | self |
-| raise.rb:131:7:131:22 | self | raise.rb:133:3:133:19 | rescue ... |
-| raise.rb:131:7:131:22 | self | raise.rb:134:10:134:19 | ExceptionB |
-| raise.rb:131:7:131:22 | self | raise.rb:135:5:135:21 | self |
-| raise.rb:131:7:131:22 | self | raise.rb:137:5:137:17 | [ensure: exception] self |
-| raise.rb:133:3:133:19 | rescue ... | raise.rb:133:3:133:19 | rescue ... |
-| raise.rb:134:10:134:19 | ExceptionB | raise.rb:134:10:134:19 | ExceptionB |
-| raise.rb:134:10:134:19 | ExceptionB | raise.rb:135:5:135:21 | self |
-| raise.rb:134:10:134:19 | ExceptionB | raise.rb:137:5:137:17 | [ensure: exception] self |
-| raise.rb:135:5:135:21 | self | raise.rb:135:5:135:21 | self |
-| raise.rb:137:5:137:17 | [ensure: exception] self | raise.rb:137:5:137:17 | [ensure: exception] self |
-| raise.rb:137:5:137:17 | self | raise.rb:137:5:137:17 | self |
-| raise.rb:142:1:148:3 | enter m12 | raise.rb:142:1:148:3 | enter m12 |
-| raise.rb:142:1:148:3 | enter m12 | raise.rb:142:1:148:3 | exit m12 (normal) |
-| raise.rb:142:1:148:3 | enter m12 | raise.rb:143:3:145:5 | if ... |
-| raise.rb:142:1:148:3 | enter m12 | raise.rb:144:5:144:12 | self |
-| raise.rb:142:1:148:3 | exit m12 (normal) | raise.rb:142:1:148:3 | exit m12 (normal) |
-| raise.rb:143:3:145:5 | if ... | raise.rb:143:3:145:5 | if ... |
-| raise.rb:144:5:144:12 | self | raise.rb:144:5:144:12 | self |
-| raise.rb:150:1:152:3 | enter m13 | raise.rb:150:1:152:3 | enter m13 |
-| raise.rb:154:1:156:3 | enter m14 | raise.rb:154:1:156:3 | enter m14 |
-| raise.rb:155:16:155:50 | enter { ... } | raise.rb:155:16:155:50 | enter { ... } |
-| raise.rb:155:16:155:50 | enter { ... } | raise.rb:155:16:155:50 | exit { ... } |
-| raise.rb:155:16:155:50 | enter { ... } | raise.rb:155:25:155:32 | self |
-| raise.rb:155:16:155:50 | enter { ... } | raise.rb:155:25:155:48 | ... if ... |
-| raise.rb:155:16:155:50 | exit { ... } | raise.rb:155:16:155:50 | exit { ... } |
-| raise.rb:155:25:155:32 | self | raise.rb:155:25:155:32 | self |
-| raise.rb:155:25:155:48 | ... if ... | raise.rb:155:25:155:48 | ... if ... |
-| raise.rb:158:1:164:3 | enter m15 | raise.rb:158:1:164:3 | enter m15 |
-| raise.rb:159:7:163:5 | enter do ... end | raise.rb:159:7:163:5 | enter do ... end |
-| raise.rb:160:9:162:7 | enter -> { ... } | raise.rb:160:9:162:7 | enter -> { ... } |
-| raise.rb:160:9:162:7 | enter -> { ... } | raise.rb:160:9:162:7 | exit -> { ... } |
-| raise.rb:160:9:162:7 | enter -> { ... } | raise.rb:161:7:161:14 | self |
-| raise.rb:160:9:162:7 | enter -> { ... } | raise.rb:161:7:161:23 | ... unless ... |
-| raise.rb:160:9:162:7 | exit -> { ... } | raise.rb:160:9:162:7 | exit -> { ... } |
-| raise.rb:161:7:161:14 | self | raise.rb:161:7:161:14 | self |
-| raise.rb:161:7:161:23 | ... unless ... | raise.rb:161:7:161:23 | ... unless ... |
-| raise.rb:167:3:169:5 | enter m | raise.rb:167:3:169:5 | enter m |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:172:1:182:3 | enter m16 |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:172:1:182:3 | exit m16 |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:172:1:182:3 | exit m16 (abnormal) |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:172:1:182:3 | exit m16 (normal) |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:174:8:174:23 | [false] ... \|\| ... |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:174:8:174:23 | [true] ... \|\| ... |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:174:14:174:15 | b2 |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:175:14:175:14 | 1 |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:177:14:177:14 | 2 |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:179:10:179:19 | ExceptionA |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:180:12:180:12 | 3 |
-| raise.rb:172:1:182:3 | exit m16 | raise.rb:172:1:182:3 | exit m16 |
-| raise.rb:172:1:182:3 | exit m16 (abnormal) | raise.rb:172:1:182:3 | exit m16 (abnormal) |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:172:1:182:3 | exit m16 (normal) |
-| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:174:8:174:23 | [false] ... \|\| ... |
-| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:177:14:177:14 | 2 |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:174:8:174:23 | [true] ... \|\| ... |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:175:14:175:14 | 1 |
-| raise.rb:174:14:174:15 | b2 | raise.rb:174:8:174:23 | [false] ... \|\| ... |
-| raise.rb:174:14:174:15 | b2 | raise.rb:174:14:174:15 | b2 |
-| raise.rb:174:14:174:15 | b2 | raise.rb:177:14:177:14 | 2 |
-| raise.rb:175:14:175:14 | 1 | raise.rb:175:14:175:14 | 1 |
-| raise.rb:177:14:177:14 | 2 | raise.rb:177:14:177:14 | 2 |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:172:1:182:3 | exit m16 (abnormal) |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:179:10:179:19 | ExceptionA |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:180:12:180:12 | 3 |
-| raise.rb:180:12:180:12 | 3 | raise.rb:180:12:180:12 | 3 |
+| raise.rb:109:5:110:25 | ensure ... | raise.rb:110:7:110:25 | After call to puts |
+| raise.rb:109:5:110:25 | ensure ... | raise.rb:113:3:113:15 | After call to puts |
+| raise.rb:110:7:110:25 | After call to puts | raise.rb:96:3:112:5 | After begin ...  |
+| raise.rb:110:7:110:25 | After call to puts | raise.rb:105:5:111:7 | After begin ...  |
+| raise.rb:110:7:110:25 | After call to puts | raise.rb:110:7:110:25 | After call to puts |
+| raise.rb:110:7:110:25 | After call to puts | raise.rb:113:3:113:15 | After call to puts |
+| raise.rb:113:3:113:15 | After call to puts | raise.rb:113:3:113:15 | After call to puts |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:94:1:119:3 | Exceptional Exit |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:94:1:119:3 | Exit |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:94:1:119:3 | Normal Exit |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:95:3:118:5 | After ... |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:114:1:118:5 | ensure ... |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:116:6:116:7 | After b2 [false] |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:116:6:116:7 | After b2 [true] |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:94:1:119:3 | Normal Exit |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:95:3:118:5 | After ... |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:116:6:116:7 | After b2 [false] |
+| raise.rb:116:6:116:7 | After b2 [true] | raise.rb:116:6:116:7 | After b2 [true] |
+| raise.rb:121:1:126:3 | Entry | raise.rb:121:1:126:3 | Entry |
+| raise.rb:121:1:126:3 | Entry | raise.rb:121:1:126:3 | Exit |
+| raise.rb:121:1:126:3 | Entry | raise.rb:121:9:121:9 | After p [match] |
+| raise.rb:121:1:126:3 | Entry | raise.rb:121:9:121:9 | After p [no-match] |
+| raise.rb:121:1:126:3 | Exit | raise.rb:121:1:126:3 | Exit |
+| raise.rb:121:9:121:9 | After p [match] | raise.rb:121:9:121:9 | After p [match] |
+| raise.rb:121:9:121:9 | After p [no-match] | raise.rb:121:9:121:9 | After p [no-match] |
+| raise.rb:128:1:140:3 | Entry | raise.rb:128:1:140:3 | Entry |
+| raise.rb:128:1:140:3 | Entry | raise.rb:128:1:140:3 | Exceptional Exit |
+| raise.rb:128:1:140:3 | Entry | raise.rb:128:1:140:3 | Exit |
+| raise.rb:128:1:140:3 | Entry | raise.rb:129:3:138:5 | After begin ...  |
+| raise.rb:128:1:140:3 | Entry | raise.rb:130:8:130:8 | After b [false] |
+| raise.rb:128:1:140:3 | Entry | raise.rb:130:8:130:8 | After b [true] |
+| raise.rb:128:1:140:3 | Entry | raise.rb:133:10:133:19 | After ExceptionA [match] |
+| raise.rb:128:1:140:3 | Entry | raise.rb:133:10:133:19 | After ExceptionA [no-match] |
+| raise.rb:128:1:140:3 | Entry | raise.rb:134:10:134:19 | After ExceptionB [match] |
+| raise.rb:128:1:140:3 | Entry | raise.rb:134:10:134:19 | After ExceptionB [no-match] |
+| raise.rb:128:1:140:3 | Entry | raise.rb:136:3:137:17 | ensure ... |
+| raise.rb:128:1:140:3 | Exceptional Exit | raise.rb:128:1:140:3 | Exceptional Exit |
+| raise.rb:128:1:140:3 | Exit | raise.rb:128:1:140:3 | Exit |
+| raise.rb:129:3:138:5 | After begin ...  | raise.rb:129:3:138:5 | After begin ...  |
+| raise.rb:130:8:130:8 | After b [false] | raise.rb:130:8:130:8 | After b [false] |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:130:8:130:8 | After b [true] |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:133:10:133:19 | After ExceptionA [match] |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:133:10:133:19 | After ExceptionA [no-match] |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:134:10:134:19 | After ExceptionB [match] |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:134:10:134:19 | After ExceptionB [no-match] |
+| raise.rb:133:10:133:19 | After ExceptionA [match] | raise.rb:133:10:133:19 | After ExceptionA [match] |
+| raise.rb:133:10:133:19 | After ExceptionA [no-match] | raise.rb:133:10:133:19 | After ExceptionA [no-match] |
+| raise.rb:133:10:133:19 | After ExceptionA [no-match] | raise.rb:134:10:134:19 | After ExceptionB [match] |
+| raise.rb:133:10:133:19 | After ExceptionA [no-match] | raise.rb:134:10:134:19 | After ExceptionB [no-match] |
+| raise.rb:134:10:134:19 | After ExceptionB [match] | raise.rb:134:10:134:19 | After ExceptionB [match] |
+| raise.rb:134:10:134:19 | After ExceptionB [no-match] | raise.rb:134:10:134:19 | After ExceptionB [no-match] |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:128:1:140:3 | Exceptional Exit |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:128:1:140:3 | Exit |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:129:3:138:5 | After begin ...  |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:136:3:137:17 | ensure ... |
+| raise.rb:142:1:148:3 | Entry | raise.rb:142:1:148:3 | Entry |
+| raise.rb:142:1:148:3 | Entry | raise.rb:143:6:143:6 | After b [false] |
+| raise.rb:142:1:148:3 | Entry | raise.rb:143:6:143:6 | After b [true] |
+| raise.rb:142:1:148:3 | Entry | raise.rb:146:1:147:10 | ensure ... |
+| raise.rb:143:6:143:6 | After b [false] | raise.rb:143:6:143:6 | After b [false] |
+| raise.rb:143:6:143:6 | After b [true] | raise.rb:143:6:143:6 | After b [true] |
+| raise.rb:146:1:147:10 | ensure ... | raise.rb:146:1:147:10 | ensure ... |
+| raise.rb:150:1:152:3 | Entry | raise.rb:150:1:152:3 | Entry |
+| raise.rb:154:1:156:3 | Entry | raise.rb:154:1:156:3 | Entry |
+| raise.rb:155:16:155:50 | Entry | raise.rb:155:16:155:50 | Entry |
+| raise.rb:155:16:155:50 | Entry | raise.rb:155:16:155:50 | Exit |
+| raise.rb:155:16:155:50 | Entry | raise.rb:155:37:155:48 | After call to nil? [false] |
+| raise.rb:155:16:155:50 | Entry | raise.rb:155:37:155:48 | After call to nil? [true] |
+| raise.rb:155:16:155:50 | Exit | raise.rb:155:16:155:50 | Exit |
+| raise.rb:155:37:155:48 | After call to nil? [false] | raise.rb:155:37:155:48 | After call to nil? [false] |
+| raise.rb:155:37:155:48 | After call to nil? [true] | raise.rb:155:37:155:48 | After call to nil? [true] |
+| raise.rb:158:1:164:3 | Entry | raise.rb:158:1:164:3 | Entry |
+| raise.rb:159:7:163:5 | Entry | raise.rb:159:7:163:5 | Entry |
+| raise.rb:160:9:162:7 | Entry | raise.rb:160:9:162:7 | Entry |
+| raise.rb:160:9:162:7 | Entry | raise.rb:160:9:162:7 | Exit |
+| raise.rb:160:9:162:7 | Entry | raise.rb:161:23:161:23 | After x [false] |
+| raise.rb:160:9:162:7 | Entry | raise.rb:161:23:161:23 | After x [true] |
+| raise.rb:160:9:162:7 | Exit | raise.rb:160:9:162:7 | Exit |
+| raise.rb:161:23:161:23 | After x [false] | raise.rb:161:23:161:23 | After x [false] |
+| raise.rb:161:23:161:23 | After x [true] | raise.rb:161:23:161:23 | After x [true] |
+| raise.rb:167:3:169:5 | Entry | raise.rb:167:3:169:5 | Entry |
+| raise.rb:172:1:182:3 | Entry | raise.rb:172:1:182:3 | Entry |
+| raise.rb:172:1:182:3 | Entry | raise.rb:172:1:182:3 | Exit |
+| raise.rb:172:1:182:3 | Entry | raise.rb:172:1:182:3 | Normal Exit |
+| raise.rb:172:1:182:3 | Entry | raise.rb:174:8:174:9 | After b1 [false] |
+| raise.rb:172:1:182:3 | Entry | raise.rb:174:8:174:9 | After b1 [true] |
+| raise.rb:172:1:182:3 | Entry | raise.rb:174:8:174:23 | After ... \|\| ... [true] |
+| raise.rb:172:1:182:3 | Entry | raise.rb:174:14:174:23 | After ... == ... [false] |
+| raise.rb:172:1:182:3 | Entry | raise.rb:174:14:174:23 | After ... == ... [true] |
+| raise.rb:172:1:182:3 | Entry | raise.rb:179:3:180:12 | rescue ... |
+| raise.rb:172:1:182:3 | Entry | raise.rb:179:10:179:19 | After ExceptionA [match] |
+| raise.rb:172:1:182:3 | Entry | raise.rb:179:10:179:19 | After ExceptionA [no-match] |
+| raise.rb:172:1:182:3 | Exit | raise.rb:172:1:182:3 | Exit |
+| raise.rb:172:1:182:3 | Normal Exit | raise.rb:172:1:182:3 | Normal Exit |
+| raise.rb:174:8:174:9 | After b1 [false] | raise.rb:174:8:174:9 | After b1 [false] |
+| raise.rb:174:8:174:9 | After b1 [false] | raise.rb:174:14:174:23 | After ... == ... [false] |
+| raise.rb:174:8:174:9 | After b1 [false] | raise.rb:174:14:174:23 | After ... == ... [true] |
+| raise.rb:174:8:174:9 | After b1 [false] | raise.rb:179:3:180:12 | rescue ... |
+| raise.rb:174:8:174:9 | After b1 [false] | raise.rb:179:10:179:19 | After ExceptionA [match] |
+| raise.rb:174:8:174:9 | After b1 [false] | raise.rb:179:10:179:19 | After ExceptionA [no-match] |
+| raise.rb:174:8:174:9 | After b1 [true] | raise.rb:174:8:174:9 | After b1 [true] |
+| raise.rb:174:8:174:23 | After ... \|\| ... [true] | raise.rb:174:8:174:23 | After ... \|\| ... [true] |
+| raise.rb:174:14:174:23 | After ... == ... [false] | raise.rb:174:14:174:23 | After ... == ... [false] |
+| raise.rb:174:14:174:23 | After ... == ... [true] | raise.rb:174:14:174:23 | After ... == ... [true] |
+| raise.rb:179:3:180:12 | rescue ... | raise.rb:179:3:180:12 | rescue ... |
+| raise.rb:179:3:180:12 | rescue ... | raise.rb:179:10:179:19 | After ExceptionA [match] |
+| raise.rb:179:3:180:12 | rescue ... | raise.rb:179:10:179:19 | After ExceptionA [no-match] |
+| raise.rb:179:10:179:19 | After ExceptionA [match] | raise.rb:179:10:179:19 | After ExceptionA [match] |
+| raise.rb:179:10:179:19 | After ExceptionA [no-match] | raise.rb:179:10:179:19 | After ExceptionA [no-match] |
 postDominance
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:1:1:11:3 | enter m1 |
-| break_ensure.rb:1:1:11:3 | exit m1 | break_ensure.rb:1:1:11:3 | exit m1 |
-| break_ensure.rb:1:1:56:4 | enter break_ensure.rb | break_ensure.rb:1:1:56:4 | enter break_ensure.rb |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:1:1:11:3 | enter m1 |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:2:3:6:5 | while ... |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:2:9:2:9 | x |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:3:5:5:7 | if ... |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:3:8:3:8 | x |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:4:7:4:11 | break |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:1:1:11:3 | enter m1 |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:2:9:2:9 | x |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:3:5:5:7 | if ... |
-| break_ensure.rb:3:5:5:7 | if ... | break_ensure.rb:3:5:5:7 | if ... |
-| break_ensure.rb:3:8:3:8 | x | break_ensure.rb:3:8:3:8 | x |
-| break_ensure.rb:4:7:4:11 | break | break_ensure.rb:4:7:4:11 | break |
-| break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... |
-| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:1:1:11:3 | enter m1 |
-| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:2:3:6:5 | while ... |
-| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:2:9:2:9 | x |
-| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:3:5:5:7 | if ... |
-| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:3:8:3:8 | x |
-| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:4:7:4:11 | break |
-| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:8:3:10:5 | if ... |
-| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:9:5:9:23 | self |
-| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:8:6:8:13 | [ensure: exception] self |
-| break_ensure.rb:9:5:9:23 | [ensure: exception] self | break_ensure.rb:9:5:9:23 | [ensure: exception] self |
-| break_ensure.rb:9:5:9:23 | self | break_ensure.rb:9:5:9:23 | self |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:13:1:25:3 | enter m2 |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:13:1:25:3 | enter m2 |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:14:3:24:5 | while ... |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:14:9:14:9 | x |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:16:7:18:9 | if ... |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:16:10:16:10 | x |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:17:9:17:13 | break |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:7:22:9 | if ... |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:21:9:21:20 | self |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:13:1:25:3 | enter m2 |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:14:9:14:9 | x |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:16:7:18:9 | if ... |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | if ... |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | self |
-| break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:16:7:18:9 | if ... |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:16:10:16:10 | x |
-| break_ensure.rb:17:9:17:13 | break | break_ensure.rb:17:9:17:13 | break |
-| break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:17:9:17:13 | break |
-| break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
-| break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
-| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
-| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
-| break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:16:7:18:9 | if ... |
-| break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:20:7:22:9 | if ... |
-| break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:21:9:21:20 | self |
-| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
-| break_ensure.rb:21:9:21:20 | [ensure: break] self | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:21:9:21:20 | [ensure: exception] self | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
-| break_ensure.rb:21:9:21:20 | self | break_ensure.rb:21:9:21:20 | self |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:27:1:42:3 | enter m3 |
-| break_ensure.rb:27:1:42:3 | exit m3 | break_ensure.rb:27:1:42:3 | exit m3 |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:27:1:42:3 | enter m3 |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:27:1:42:3 | exit m3 (normal) |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:29:5:31:7 | if ... |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:30:7:30:12 | return |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:33:5:39:7 | [ensure: return] while ... |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:33:5:39:7 | while ... |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:33:11:33:11 | [ensure: return] y |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:33:11:33:11 | y |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:35:9:37:11 | if ... |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:35:12:35:12 | [ensure: return] x |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:35:12:35:12 | x |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:36:11:36:15 | [ensure: return] break |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:36:11:36:15 | break |
-| break_ensure.rb:29:5:31:7 | if ... | break_ensure.rb:29:5:31:7 | if ... |
-| break_ensure.rb:30:7:30:12 | return | break_ensure.rb:30:7:30:12 | return |
-| break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... |
-| break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:30:7:30:12 | return |
-| break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:33:5:39:7 | [ensure: return] while ... |
-| break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:33:11:33:11 | [ensure: return] y |
-| break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
-| break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:35:12:35:12 | [ensure: return] x |
-| break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:36:11:36:15 | [ensure: return] break |
-| break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:29:5:31:7 | if ... |
-| break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:33:5:39:7 | while ... |
-| break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:33:11:33:11 | y |
-| break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:35:9:37:11 | if ... |
-| break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:35:12:35:12 | x |
-| break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:36:11:36:15 | break |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:33:11:33:11 | [ensure: exception] y |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:30:7:30:12 | return |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:33:11:33:11 | [ensure: return] y |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:29:5:31:7 | if ... |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:33:11:33:11 | y |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:9:37:11 | if ... |
-| break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... |
-| break_ensure.rb:35:9:37:11 | [ensure: return] if ... | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
-| break_ensure.rb:35:9:37:11 | if ... | break_ensure.rb:35:9:37:11 | if ... |
-| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:35:12:35:12 | [ensure: exception] x |
-| break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:35:12:35:12 | [ensure: return] x |
-| break_ensure.rb:35:12:35:12 | x | break_ensure.rb:35:12:35:12 | x |
-| break_ensure.rb:36:11:36:15 | [ensure: exception] break | break_ensure.rb:36:11:36:15 | [ensure: exception] break |
-| break_ensure.rb:36:11:36:15 | [ensure: return] break | break_ensure.rb:36:11:36:15 | [ensure: return] break |
-| break_ensure.rb:36:11:36:15 | break | break_ensure.rb:36:11:36:15 | break |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:44:1:56:3 | enter m4 |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:44:1:56:3 | enter m4 |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:45:3:55:5 | while ... |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:45:9:45:9 | x |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:47:7:49:9 | if ... |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:47:10:47:10 | x |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:52:15:52:16 | 10 |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:44:1:56:3 | enter m4 |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:45:9:45:9 | x |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:47:7:49:9 | if ... |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:47:10:47:10 | x |
-| break_ensure.rb:48:9:48:16 | self | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
-| break_ensure.rb:51:7:53:9 | if ... | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
-| break_ensure.rb:52:15:52:16 | 10 | break_ensure.rb:52:15:52:16 | 10 |
-| break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:1:1:6:3 | enter if_in_case |
-| case.rb:1:1:99:4 | enter case.rb | case.rb:1:1:99:4 | enter case.rb |
-| case.rb:2:3:5:5 | case ... | case.rb:1:1:6:3 | enter if_in_case |
-| case.rb:2:3:5:5 | case ... | case.rb:2:3:5:5 | case ... |
-| case.rb:2:3:5:5 | case ... | case.rb:3:5:3:42 | [match] when ... |
-| case.rb:2:3:5:5 | case ... | case.rb:3:5:3:42 | [no-match] when ... |
-| case.rb:2:3:5:5 | case ... | case.rb:3:18:3:41 | if ... |
-| case.rb:2:3:5:5 | case ... | case.rb:3:21:3:22 | self |
-| case.rb:2:3:5:5 | case ... | case.rb:3:29:3:37 | self |
-| case.rb:2:3:5:5 | case ... | case.rb:4:5:4:24 | [match] when ... |
-| case.rb:2:3:5:5 | case ... | case.rb:4:5:4:24 | [no-match] when ... |
-| case.rb:2:3:5:5 | case ... | case.rb:4:10:4:10 | 2 |
-| case.rb:2:3:5:5 | case ... | case.rb:4:17:4:24 | self |
-| case.rb:3:5:3:42 | [match] when ... | case.rb:3:5:3:42 | [match] when ... |
-| case.rb:3:5:3:42 | [no-match] when ... | case.rb:3:5:3:42 | [no-match] when ... |
-| case.rb:3:18:3:41 | if ... | case.rb:3:5:3:42 | [match] when ... |
-| case.rb:3:18:3:41 | if ... | case.rb:3:18:3:41 | if ... |
-| case.rb:3:18:3:41 | if ... | case.rb:3:21:3:22 | self |
-| case.rb:3:18:3:41 | if ... | case.rb:3:29:3:37 | self |
-| case.rb:3:21:3:22 | self | case.rb:3:5:3:42 | [match] when ... |
-| case.rb:3:21:3:22 | self | case.rb:3:21:3:22 | self |
-| case.rb:3:29:3:37 | self | case.rb:3:29:3:37 | self |
-| case.rb:4:5:4:24 | [match] when ... | case.rb:4:5:4:24 | [match] when ... |
-| case.rb:4:5:4:24 | [no-match] when ... | case.rb:4:5:4:24 | [no-match] when ... |
-| case.rb:4:10:4:10 | 2 | case.rb:3:5:3:42 | [no-match] when ... |
-| case.rb:4:10:4:10 | 2 | case.rb:4:10:4:10 | 2 |
-| case.rb:4:17:4:24 | self | case.rb:4:5:4:24 | [match] when ... |
-| case.rb:4:17:4:24 | self | case.rb:4:17:4:24 | self |
-| case.rb:8:1:18:3 | enter case_match | case.rb:8:1:18:3 | enter case_match |
-| case.rb:9:3:17:5 | case ... | case.rb:8:1:18:3 | enter case_match |
-| case.rb:9:3:17:5 | case ... | case.rb:9:3:17:5 | case ... |
-| case.rb:9:3:17:5 | case ... | case.rb:11:5:11:15 | in ... then ... |
-| case.rb:9:3:17:5 | case ... | case.rb:11:15:11:15 | 3 |
-| case.rb:9:3:17:5 | case ... | case.rb:12:5:13:7 | in ... then ... |
-| case.rb:9:3:17:5 | case ... | case.rb:13:7:13:7 | 4 |
-| case.rb:9:3:17:5 | case ... | case.rb:14:5:14:25 | in ... then ... |
-| case.rb:9:3:17:5 | case ... | case.rb:14:13:14:13 | x |
-| case.rb:9:3:17:5 | case ... | case.rb:14:25:14:25 | 6 |
-| case.rb:9:3:17:5 | case ... | case.rb:15:5:15:28 | in ... then ... |
-| case.rb:9:3:17:5 | case ... | case.rb:15:17:15:17 | x |
-| case.rb:9:3:17:5 | case ... | case.rb:15:28:15:28 | 7 |
-| case.rb:9:3:17:5 | case ... | case.rb:16:10:16:10 | 8 |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:11:5:11:15 | in ... then ... |
-| case.rb:11:15:11:15 | 3 | case.rb:11:15:11:15 | 3 |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:12:5:13:7 | in ... then ... |
-| case.rb:13:7:13:7 | 4 | case.rb:13:7:13:7 | 4 |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:14:5:14:25 | in ... then ... |
-| case.rb:14:13:14:13 | x | case.rb:14:5:14:25 | in ... then ... |
-| case.rb:14:13:14:13 | x | case.rb:14:13:14:13 | x |
-| case.rb:14:25:14:25 | 6 | case.rb:14:25:14:25 | 6 |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:1:1:11:3 | Entry |
+| break_ensure.rb:1:1:11:3 | Exceptional Exit | break_ensure.rb:1:1:11:3 | Exceptional Exit |
+| break_ensure.rb:1:1:11:3 | Exit | break_ensure.rb:1:1:11:3 | Exit |
+| break_ensure.rb:1:1:56:4 | Entry | break_ensure.rb:1:1:56:4 | Entry |
+| break_ensure.rb:2:3:6:5 | After while ... | break_ensure.rb:2:3:6:5 | After while ... |
+| break_ensure.rb:2:3:6:5 | After while ... | break_ensure.rb:2:9:2:13 | After ... < ... [false] |
+| break_ensure.rb:2:3:6:5 | After while ... | break_ensure.rb:3:8:3:12 | After ... > ... [true] |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:1:1:11:3 | Entry |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:2:3:6:5 | [LoopHeader] while ... |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:3:8:3:12 | After ... > ... [false] |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:1:1:11:3 | Entry |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:2:3:6:5 | After while ... |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:2:3:6:5 | [LoopHeader] while ... |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:2:3:10:5 | After ... |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:2:9:2:13 | After ... < ... [false] |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:2:9:2:13 | After ... < ... [true] |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:3:8:3:12 | After ... > ... [false] |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:3:8:3:12 | After ... > ... [true] |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:7:1:10:5 | ensure ... |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:8:3:10:5 | After if ... |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:8:6:8:18 | After call to nil? [false] |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:8:6:8:18 | After call to nil? [true] |
+| break_ensure.rb:2:9:2:13 | After ... < ... [false] | break_ensure.rb:2:9:2:13 | After ... < ... [false] |
+| break_ensure.rb:2:9:2:13 | After ... < ... [true] | break_ensure.rb:2:9:2:13 | After ... < ... [true] |
+| break_ensure.rb:3:8:3:12 | After ... > ... [false] | break_ensure.rb:3:8:3:12 | After ... > ... [false] |
+| break_ensure.rb:3:8:3:12 | After ... > ... [true] | break_ensure.rb:3:8:3:12 | After ... > ... [true] |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:1:1:11:3 | Entry |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:2:3:6:5 | After while ... |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:2:3:6:5 | [LoopHeader] while ... |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:2:9:2:13 | After ... < ... [false] |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:2:9:2:13 | After ... < ... [true] |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:3:8:3:12 | After ... > ... [false] |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:3:8:3:12 | After ... > ... [true] |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:7:1:10:5 | ensure ... |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:1:1:11:3 | Entry |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:2:3:6:5 | After while ... |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:2:3:6:5 | [LoopHeader] while ... |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:2:9:2:13 | After ... < ... [false] |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:2:9:2:13 | After ... < ... [true] |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:3:8:3:12 | After ... > ... [false] |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:3:8:3:12 | After ... > ... [true] |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:7:1:10:5 | ensure ... |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:8:3:10:5 | After if ... |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:8:6:8:18 | After call to nil? [false] |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:8:6:8:18 | After call to nil? [true] |
+| break_ensure.rb:8:6:8:18 | After call to nil? [false] | break_ensure.rb:8:6:8:18 | After call to nil? [false] |
+| break_ensure.rb:8:6:8:18 | After call to nil? [true] | break_ensure.rb:8:6:8:18 | After call to nil? [true] |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:13:1:25:3 | Entry |
+| break_ensure.rb:13:1:25:3 | Exceptional Exit | break_ensure.rb:13:1:25:3 | Exceptional Exit |
+| break_ensure.rb:13:1:25:3 | Exit | break_ensure.rb:13:1:25:3 | Exit |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:13:1:25:3 | Entry |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:14:3:24:5 | After while ... |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:14:3:24:5 | [LoopHeader] while ... |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:14:9:14:13 | After ... < ... [false] |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:14:9:14:13 | After ... < ... [true] |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:15:5:23:7 | After begin ...  |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:16:10:16:14 | After ... > ... [false] |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:16:10:16:14 | After ... > ... [true] |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:19:5:22:9 | ensure ... |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:20:7:22:9 | After if ... |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:20:10:20:15 | After call to nil? [false] |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:20:10:20:15 | After call to nil? [true] |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:13:1:25:3 | Entry |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:14:3:24:5 | [LoopHeader] while ... |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:15:5:23:7 | After begin ...  |
+| break_ensure.rb:14:9:14:13 | After ... < ... [false] | break_ensure.rb:14:9:14:13 | After ... < ... [false] |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:14:9:14:13 | After ... < ... [true] |
+| break_ensure.rb:15:5:23:7 | After begin ...  | break_ensure.rb:15:5:23:7 | After begin ...  |
+| break_ensure.rb:16:10:16:14 | After ... > ... [false] | break_ensure.rb:16:10:16:14 | After ... > ... [false] |
+| break_ensure.rb:16:10:16:14 | After ... > ... [true] | break_ensure.rb:16:10:16:14 | After ... > ... [true] |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:14:9:14:13 | After ... < ... [true] |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:16:10:16:14 | After ... > ... [false] |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:16:10:16:14 | After ... > ... [true] |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:19:5:22:9 | ensure ... |
+| break_ensure.rb:20:7:22:9 | After if ... | break_ensure.rb:14:9:14:13 | After ... < ... [true] |
+| break_ensure.rb:20:7:22:9 | After if ... | break_ensure.rb:16:10:16:14 | After ... > ... [false] |
+| break_ensure.rb:20:7:22:9 | After if ... | break_ensure.rb:16:10:16:14 | After ... > ... [true] |
+| break_ensure.rb:20:7:22:9 | After if ... | break_ensure.rb:19:5:22:9 | ensure ... |
+| break_ensure.rb:20:7:22:9 | After if ... | break_ensure.rb:20:7:22:9 | After if ... |
+| break_ensure.rb:20:7:22:9 | After if ... | break_ensure.rb:20:10:20:15 | After call to nil? [false] |
+| break_ensure.rb:20:7:22:9 | After if ... | break_ensure.rb:20:10:20:15 | After call to nil? [true] |
+| break_ensure.rb:20:10:20:15 | After call to nil? [false] | break_ensure.rb:20:10:20:15 | After call to nil? [false] |
+| break_ensure.rb:20:10:20:15 | After call to nil? [true] | break_ensure.rb:20:10:20:15 | After call to nil? [true] |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:27:1:42:3 | Entry |
+| break_ensure.rb:27:1:42:3 | Exceptional Exit | break_ensure.rb:27:1:42:3 | Exceptional Exit |
+| break_ensure.rb:27:1:42:3 | Exit | break_ensure.rb:27:1:42:3 | Exit |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:27:1:42:3 | Entry |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:27:1:42:3 | Normal Exit |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:28:3:40:5 | After begin ...  |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:29:8:29:13 | After call to nil? [false] |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:29:8:29:13 | After call to nil? [true] |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:32:3:39:7 | ensure ... |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:33:5:39:7 | After while ... |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:33:5:39:7 | [LoopHeader] while ... |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:33:11:33:15 | After ... < ... [false] |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:33:11:33:15 | After ... < ... [true] |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:35:12:35:16 | After ... > ... [false] |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:35:12:35:16 | After ... > ... [true] |
+| break_ensure.rb:28:3:40:5 | After begin ...  | break_ensure.rb:28:3:40:5 | After begin ...  |
+| break_ensure.rb:29:8:29:13 | After call to nil? [false] | break_ensure.rb:29:8:29:13 | After call to nil? [false] |
+| break_ensure.rb:29:8:29:13 | After call to nil? [true] | break_ensure.rb:29:8:29:13 | After call to nil? [true] |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:27:1:42:3 | Entry |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:29:8:29:13 | After call to nil? [false] |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:29:8:29:13 | After call to nil? [true] |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:32:3:39:7 | ensure ... |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:27:1:42:3 | Entry |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:29:8:29:13 | After call to nil? [false] |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:29:8:29:13 | After call to nil? [true] |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:32:3:39:7 | ensure ... |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:33:5:39:7 | After while ... |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:33:5:39:7 | [LoopHeader] while ... |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:33:11:33:15 | After ... < ... [false] |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:33:11:33:15 | After ... < ... [true] |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:35:12:35:16 | After ... > ... [false] |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:35:12:35:16 | After ... > ... [true] |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:27:1:42:3 | Entry |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:29:8:29:13 | After call to nil? [false] |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:29:8:29:13 | After call to nil? [true] |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:32:3:39:7 | ensure ... |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:33:5:39:7 | [LoopHeader] while ... |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:35:12:35:16 | After ... > ... [false] |
+| break_ensure.rb:33:11:33:15 | After ... < ... [false] | break_ensure.rb:33:11:33:15 | After ... < ... [false] |
+| break_ensure.rb:33:11:33:15 | After ... < ... [true] | break_ensure.rb:33:11:33:15 | After ... < ... [true] |
+| break_ensure.rb:35:12:35:16 | After ... > ... [false] | break_ensure.rb:35:12:35:16 | After ... > ... [false] |
+| break_ensure.rb:35:12:35:16 | After ... > ... [true] | break_ensure.rb:35:12:35:16 | After ... > ... [true] |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:44:1:56:3 | Entry |
+| break_ensure.rb:44:1:56:3 | Exceptional Exit | break_ensure.rb:44:1:56:3 | Exceptional Exit |
+| break_ensure.rb:44:1:56:3 | Exit | break_ensure.rb:44:1:56:3 | Exit |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:44:1:56:3 | Entry |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:45:3:55:5 | After while ... |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:45:3:55:5 | [LoopHeader] while ... |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:45:9:45:13 | After ... < ... [false] |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:45:9:45:13 | After ... < ... [true] |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:46:5:54:7 | After begin ...  |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:47:10:47:14 | After ... > ... [false] |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:47:10:47:14 | After ... > ... [true] |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:50:5:53:9 | ensure ... |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:51:10:51:14 | After ... > ... [false] |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:51:10:51:14 | After ... > ... [true] |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:44:1:56:3 | Entry |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:45:3:55:5 | [LoopHeader] while ... |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:46:5:54:7 | After begin ...  |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:51:10:51:14 | After ... > ... [false] |
+| break_ensure.rb:45:9:45:13 | After ... < ... [false] | break_ensure.rb:45:9:45:13 | After ... < ... [false] |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:45:9:45:13 | After ... < ... [true] |
+| break_ensure.rb:46:5:54:7 | After begin ...  | break_ensure.rb:46:5:54:7 | After begin ...  |
+| break_ensure.rb:46:5:54:7 | After begin ...  | break_ensure.rb:51:10:51:14 | After ... > ... [false] |
+| break_ensure.rb:47:10:47:14 | After ... > ... [false] | break_ensure.rb:47:10:47:14 | After ... > ... [false] |
+| break_ensure.rb:47:10:47:14 | After ... > ... [true] | break_ensure.rb:47:10:47:14 | After ... > ... [true] |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:45:9:45:13 | After ... < ... [true] |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:47:10:47:14 | After ... > ... [false] |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:47:10:47:14 | After ... > ... [true] |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:50:5:53:9 | ensure ... |
+| break_ensure.rb:51:10:51:14 | After ... > ... [false] | break_ensure.rb:51:10:51:14 | After ... > ... [false] |
+| break_ensure.rb:51:10:51:14 | After ... > ... [true] | break_ensure.rb:51:10:51:14 | After ... > ... [true] |
+| case.rb:1:1:6:3 | Entry | case.rb:1:1:6:3 | Entry |
+| case.rb:1:1:99:4 | Entry | case.rb:1:1:99:4 | Entry |
+| case.rb:2:3:5:5 | After case ... | case.rb:1:1:6:3 | Entry |
+| case.rb:2:3:5:5 | After case ... | case.rb:2:3:5:5 | After case ... |
+| case.rb:2:3:5:5 | After case ... | case.rb:3:10:3:10 | After 1 [match] |
+| case.rb:2:3:5:5 | After case ... | case.rb:3:10:3:10 | After 1 [no-match] |
+| case.rb:2:3:5:5 | After case ... | case.rb:3:18:3:41 | After if ... |
+| case.rb:2:3:5:5 | After case ... | case.rb:3:21:3:22 | After call to x2 [false] |
+| case.rb:2:3:5:5 | After case ... | case.rb:3:21:3:22 | After call to x2 [true] |
+| case.rb:2:3:5:5 | After case ... | case.rb:4:10:4:10 | After 2 [match] |
+| case.rb:2:3:5:5 | After case ... | case.rb:4:10:4:10 | After 2 [no-match] |
+| case.rb:3:10:3:10 | After 1 [match] | case.rb:3:10:3:10 | After 1 [match] |
+| case.rb:3:10:3:10 | After 1 [no-match] | case.rb:3:10:3:10 | After 1 [no-match] |
+| case.rb:3:18:3:41 | After if ... | case.rb:3:10:3:10 | After 1 [match] |
+| case.rb:3:18:3:41 | After if ... | case.rb:3:18:3:41 | After if ... |
+| case.rb:3:18:3:41 | After if ... | case.rb:3:21:3:22 | After call to x2 [false] |
+| case.rb:3:18:3:41 | After if ... | case.rb:3:21:3:22 | After call to x2 [true] |
+| case.rb:3:21:3:22 | After call to x2 [false] | case.rb:3:21:3:22 | After call to x2 [false] |
+| case.rb:3:21:3:22 | After call to x2 [true] | case.rb:3:21:3:22 | After call to x2 [true] |
+| case.rb:4:10:4:10 | After 2 [match] | case.rb:4:10:4:10 | After 2 [match] |
+| case.rb:4:10:4:10 | After 2 [no-match] | case.rb:4:10:4:10 | After 2 [no-match] |
+| case.rb:8:1:18:3 | Entry | case.rb:8:1:18:3 | Entry |
+| case.rb:9:3:17:5 | After case ... | case.rb:8:1:18:3 | Entry |
+| case.rb:9:3:17:5 | After case ... | case.rb:9:3:17:5 | After case ... |
+| case.rb:9:3:17:5 | After case ... | case.rb:10:8:10:8 | After 0 [match] |
+| case.rb:9:3:17:5 | After case ... | case.rb:10:8:10:8 | After 0 [no-match] |
+| case.rb:9:3:17:5 | After case ... | case.rb:11:8:11:8 | After 1 [match] |
+| case.rb:9:3:17:5 | After case ... | case.rb:11:8:11:8 | After 1 [no-match] |
+| case.rb:9:3:17:5 | After case ... | case.rb:12:8:12:8 | After 2 [match] |
+| case.rb:9:3:17:5 | After case ... | case.rb:12:8:12:8 | After 2 [no-match] |
+| case.rb:9:3:17:5 | After case ... | case.rb:14:8:14:8 | After x [match] |
+| case.rb:9:3:17:5 | After case ... | case.rb:14:8:14:8 | After x [no-match] |
+| case.rb:9:3:17:5 | After case ... | case.rb:14:13:14:18 | After ... == ... [false] |
+| case.rb:9:3:17:5 | After case ... | case.rb:14:13:14:18 | After ... == ... [true] |
+| case.rb:9:3:17:5 | After case ... | case.rb:15:5:15:28 | in ... then ... |
+| case.rb:9:3:17:5 | After case ... | case.rb:15:8:15:8 | After x [match] |
+| case.rb:9:3:17:5 | After case ... | case.rb:15:8:15:8 | After x [no-match] |
+| case.rb:9:3:17:5 | After case ... | case.rb:15:17:15:21 | After ... < ... [false] |
+| case.rb:9:3:17:5 | After case ... | case.rb:15:17:15:21 | After ... < ... [true] |
+| case.rb:9:3:17:5 | After case ... | case.rb:16:5:16:10 | else ... |
+| case.rb:10:8:10:8 | After 0 [match] | case.rb:10:8:10:8 | After 0 [match] |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:10:8:10:8 | After 0 [no-match] |
+| case.rb:11:8:11:8 | After 1 [match] | case.rb:11:8:11:8 | After 1 [match] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:11:8:11:8 | After 1 [no-match] |
+| case.rb:12:8:12:8 | After 2 [match] | case.rb:12:8:12:8 | After 2 [match] |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:12:8:12:8 | After 2 [no-match] |
+| case.rb:14:8:14:8 | After x [match] | case.rb:14:8:14:8 | After x [match] |
+| case.rb:14:8:14:8 | After x [no-match] | case.rb:14:8:14:8 | After x [no-match] |
+| case.rb:14:13:14:18 | After ... == ... [false] | case.rb:14:13:14:18 | After ... == ... [false] |
+| case.rb:14:13:14:18 | After ... == ... [true] | case.rb:14:13:14:18 | After ... == ... [true] |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:14:8:14:8 | After x [no-match] |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:14:13:14:18 | After ... == ... [false] |
 | case.rb:15:5:15:28 | in ... then ... | case.rb:15:5:15:28 | in ... then ... |
-| case.rb:15:17:15:17 | x | case.rb:15:5:15:28 | in ... then ... |
-| case.rb:15:17:15:17 | x | case.rb:15:17:15:17 | x |
-| case.rb:15:28:15:28 | 7 | case.rb:15:28:15:28 | 7 |
-| case.rb:16:10:16:10 | 8 | case.rb:16:10:16:10 | 8 |
-| case.rb:20:1:24:3 | enter case_match_no_match | case.rb:20:1:24:3 | enter case_match_no_match |
-| case.rb:20:1:24:3 | exit case_match_no_match | case.rb:20:1:24:3 | exit case_match_no_match |
-| case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | case.rb:20:1:24:3 | exit case_match_no_match (abnormal) |
-| case.rb:21:3:23:5 | case ... | case.rb:20:1:24:3 | enter case_match_no_match |
-| case.rb:21:3:23:5 | case ... | case.rb:21:3:23:5 | case ... |
-| case.rb:26:1:30:3 | enter case_match_raise | case.rb:26:1:30:3 | enter case_match_raise |
-| case.rb:26:1:30:3 | exit case_match_raise | case.rb:26:1:30:3 | exit case_match_raise |
-| case.rb:26:1:30:3 | exit case_match_raise (abnormal) | case.rb:26:1:30:3 | exit case_match_raise (abnormal) |
-| case.rb:27:3:29:5 | case ... | case.rb:26:1:30:3 | enter case_match_raise |
-| case.rb:27:3:29:5 | case ... | case.rb:27:3:29:5 | case ... |
-| case.rb:28:7:28:28 | enter -> { ... } | case.rb:28:7:28:28 | enter -> { ... } |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:32:1:39:3 | enter case_match_array |
-| case.rb:32:1:39:3 | exit case_match_array | case.rb:32:1:39:3 | exit case_match_array |
-| case.rb:32:1:39:3 | exit case_match_array (abnormal) | case.rb:32:1:39:3 | exit case_match_array (abnormal) |
-| case.rb:33:3:38:5 | case ... | case.rb:32:1:39:3 | enter case_match_array |
-| case.rb:33:3:38:5 | case ... | case.rb:33:3:38:5 | case ... |
-| case.rb:33:3:38:5 | case ... | case.rb:35:5:35:11 | in ... then ... |
-| case.rb:33:3:38:5 | case ... | case.rb:35:9:35:9 | x |
-| case.rb:33:3:38:5 | case ... | case.rb:36:5:36:13 | in ... then ... |
-| case.rb:33:3:38:5 | case ... | case.rb:36:9:36:9 | x |
-| case.rb:33:3:38:5 | case ... | case.rb:37:5:37:27 | in ... then ... |
-| case.rb:33:3:38:5 | case ... | case.rb:37:8:37:26 | [ ..., * ] |
-| case.rb:33:3:38:5 | case ... | case.rb:37:12:37:12 | a |
-| case.rb:33:3:38:5 | case ... | case.rb:37:15:37:15 | b |
-| case.rb:33:3:38:5 | case ... | case.rb:37:19:37:19 | c |
-| case.rb:33:3:38:5 | case ... | case.rb:37:25:37:25 | e |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:35:5:35:11 | in ... then ... |
-| case.rb:35:9:35:9 | x | case.rb:35:9:35:9 | x |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:36:5:36:13 | in ... then ... |
-| case.rb:36:9:36:9 | x | case.rb:36:9:36:9 | x |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:5:37:27 | in ... then ... |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:5:37:27 | in ... then ... |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:8:37:26 | [ ..., * ] |
-| case.rb:37:12:37:12 | a | case.rb:37:5:37:27 | in ... then ... |
-| case.rb:37:12:37:12 | a | case.rb:37:8:37:26 | [ ..., * ] |
-| case.rb:37:12:37:12 | a | case.rb:37:12:37:12 | a |
-| case.rb:37:15:37:15 | b | case.rb:37:5:37:27 | in ... then ... |
-| case.rb:37:15:37:15 | b | case.rb:37:8:37:26 | [ ..., * ] |
-| case.rb:37:15:37:15 | b | case.rb:37:12:37:12 | a |
-| case.rb:37:15:37:15 | b | case.rb:37:15:37:15 | b |
-| case.rb:37:19:37:19 | c | case.rb:37:5:37:27 | in ... then ... |
-| case.rb:37:19:37:19 | c | case.rb:37:8:37:26 | [ ..., * ] |
-| case.rb:37:19:37:19 | c | case.rb:37:12:37:12 | a |
-| case.rb:37:19:37:19 | c | case.rb:37:15:37:15 | b |
-| case.rb:37:19:37:19 | c | case.rb:37:19:37:19 | c |
-| case.rb:37:25:37:25 | e | case.rb:37:5:37:27 | in ... then ... |
-| case.rb:37:25:37:25 | e | case.rb:37:8:37:26 | [ ..., * ] |
-| case.rb:37:25:37:25 | e | case.rb:37:12:37:12 | a |
-| case.rb:37:25:37:25 | e | case.rb:37:15:37:15 | b |
-| case.rb:37:25:37:25 | e | case.rb:37:19:37:19 | c |
-| case.rb:37:25:37:25 | e | case.rb:37:25:37:25 | e |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:41:1:45:3 | enter case_match_find |
-| case.rb:41:1:45:3 | exit case_match_find | case.rb:41:1:45:3 | exit case_match_find |
-| case.rb:41:1:45:3 | exit case_match_find (abnormal) | case.rb:41:1:45:3 | exit case_match_find (abnormal) |
-| case.rb:43:10:43:10 | x | case.rb:41:1:45:3 | enter case_match_find |
-| case.rb:43:10:43:10 | x | case.rb:43:10:43:10 | x |
-| case.rb:43:16:43:16 | 2 | case.rb:41:1:45:3 | enter case_match_find |
-| case.rb:43:16:43:16 | 2 | case.rb:43:10:43:10 | x |
-| case.rb:43:16:43:16 | 2 | case.rb:43:16:43:16 | 2 |
-| case.rb:43:20:43:20 | y | case.rb:41:1:45:3 | enter case_match_find |
-| case.rb:43:20:43:20 | y | case.rb:43:10:43:10 | x |
-| case.rb:43:20:43:20 | y | case.rb:43:16:43:16 | 2 |
-| case.rb:43:20:43:20 | y | case.rb:43:20:43:20 | y |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:47:1:53:3 | enter case_match_hash |
-| case.rb:47:1:53:3 | exit case_match_hash | case.rb:47:1:53:3 | exit case_match_hash |
-| case.rb:47:1:53:3 | exit case_match_hash (abnormal) | case.rb:47:1:53:3 | exit case_match_hash (abnormal) |
-| case.rb:48:3:52:5 | case ... | case.rb:47:1:53:3 | enter case_match_hash |
-| case.rb:48:3:52:5 | case ... | case.rb:48:3:52:5 | case ... |
-| case.rb:48:3:52:5 | case ... | case.rb:49:8:49:34 | { ..., ** } |
-| case.rb:48:3:52:5 | case ... | case.rb:49:20:49:20 | 1 |
-| case.rb:48:3:52:5 | case ... | case.rb:49:23:49:23 | a |
-| case.rb:48:3:52:5 | case ... | case.rb:49:29:49:32 | rest |
-| case.rb:48:3:52:5 | case ... | case.rb:50:5:50:25 | in ... then ... |
-| case.rb:48:3:52:5 | case ... | case.rb:50:8:50:24 | { ..., ** } |
-| case.rb:48:3:52:5 | case ... | case.rb:50:16:50:16 | 1 |
-| case.rb:48:3:52:5 | case ... | case.rb:51:5:51:17 | in ... then ... |
-| case.rb:48:3:52:5 | case ... | case.rb:51:8:51:16 | { ..., ** } |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:8:49:34 | { ..., ** } |
-| case.rb:49:20:49:20 | 1 | case.rb:49:20:49:20 | 1 |
-| case.rb:49:23:49:23 | a | case.rb:49:23:49:23 | a |
-| case.rb:49:29:49:32 | rest | case.rb:49:23:49:23 | a |
-| case.rb:49:29:49:32 | rest | case.rb:49:29:49:32 | rest |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:50:5:50:25 | in ... then ... |
-| case.rb:50:8:50:24 | { ..., ** } | case.rb:50:8:50:24 | { ..., ** } |
-| case.rb:50:16:50:16 | 1 | case.rb:50:16:50:16 | 1 |
-| case.rb:51:5:51:17 | in ... then ... | case.rb:51:5:51:17 | in ... then ... |
-| case.rb:51:8:51:16 | { ..., ** } | case.rb:51:5:51:17 | in ... then ... |
-| case.rb:51:8:51:16 | { ..., ** } | case.rb:51:8:51:16 | { ..., ** } |
-| case.rb:55:1:61:3 | enter case_match_variable | case.rb:55:1:61:3 | enter case_match_variable |
-| case.rb:56:3:60:5 | case ... | case.rb:55:1:61:3 | enter case_match_variable |
-| case.rb:56:3:60:5 | case ... | case.rb:56:3:60:5 | case ... |
-| case.rb:56:3:60:5 | case ... | case.rb:58:5:58:10 | in ... then ... |
-| case.rb:58:5:58:10 | in ... then ... | case.rb:58:5:58:10 | in ... then ... |
-| case.rb:63:1:67:3 | enter case_match_underscore | case.rb:63:1:67:3 | enter case_match_underscore |
-| case.rb:64:3:66:5 | case ... | case.rb:63:1:67:3 | enter case_match_underscore |
-| case.rb:64:3:66:5 | case ... | case.rb:64:3:66:5 | case ... |
-| case.rb:64:3:66:5 | case ... | case.rb:65:12:65:12 | _ |
-| case.rb:65:12:65:12 | _ | case.rb:65:12:65:12 | _ |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:69:1:93:3 | enter case_match_various |
-| case.rb:69:1:93:3 | exit case_match_various | case.rb:69:1:93:3 | exit case_match_various |
-| case.rb:69:1:93:3 | exit case_match_various (abnormal) | case.rb:69:1:93:3 | exit case_match_various (abnormal) |
-| case.rb:72:3:92:5 | case ... | case.rb:69:1:93:3 | enter case_match_various |
-| case.rb:72:3:92:5 | case ... | case.rb:72:3:92:5 | case ... |
-| case.rb:72:3:92:5 | case ... | case.rb:74:5:74:11 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:75:5:75:15 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:76:5:76:18 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:77:5:77:18 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:78:5:78:19 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:79:5:79:14 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:80:5:80:12 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:81:5:81:11 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:82:13:82:13 | x |
-| case.rb:72:3:92:5 | case ... | case.rb:82:20:82:20 | 1 |
-| case.rb:72:3:92:5 | case ... | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:83:12:83:15 | ^... |
-| case.rb:72:3:92:5 | case ... | case.rb:83:20:83:25 | string |
-| case.rb:72:3:92:5 | case ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:88:14:88:15 | 10 |
-| case.rb:72:3:92:5 | case ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:89:14:89:17 | self |
-| case.rb:72:3:92:5 | case ... | case.rb:89:21:89:24 | true |
-| case.rb:72:3:92:5 | case ... | case.rb:89:28:89:32 | false |
-| case.rb:72:3:92:5 | case ... | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:72:3:92:5 | case ... | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:72:3:92:5 | case ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:72:3:92:5 | case ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:72:3:92:5 | case ... | case.rb:91:13:91:14 | "" |
-| case.rb:72:3:92:5 | case ... | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:72:3:92:5 | case ... | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:74:5:74:11 | in ... then ... |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:75:5:75:15 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:76:5:76:18 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:77:5:77:18 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:78:5:78:19 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:79:5:79:14 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:80:5:80:12 | in ... then ... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:81:5:81:11 | in ... then ... |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:82:13:82:13 | x | case.rb:82:13:82:13 | x |
-| case.rb:82:20:82:20 | 1 | case.rb:82:13:82:13 | x |
-| case.rb:82:20:82:20 | 1 | case.rb:82:20:82:20 | 1 |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:83:12:83:15 | ^... | case.rb:83:12:83:15 | ^... |
-| case.rb:83:20:83:25 | string | case.rb:83:20:83:25 | string |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:85:8:85:23 | enter -> { ... } | case.rb:85:8:85:23 | enter -> { ... } |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:88:14:88:15 | 10 | case.rb:88:14:88:15 | 10 |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:89:14:89:17 | self | case.rb:89:14:89:17 | self |
-| case.rb:89:21:89:24 | true | case.rb:89:21:89:24 | true |
-| case.rb:89:28:89:32 | false | case.rb:89:28:89:32 | false |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:91:5:91:25 | in ... then ... | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:91:13:91:14 | "" | case.rb:91:13:91:14 | "" |
-| case.rb:91:18:91:19 | [ ..., * ] | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:91:23:91:24 | { ..., ** } | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:95:1:99:3 | enter case_match_guard_no_else |
-| case.rb:95:1:99:3 | exit case_match_guard_no_else | case.rb:95:1:99:3 | exit case_match_guard_no_else |
-| case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) |
-| case.rb:97:13:97:13 | x | case.rb:95:1:99:3 | enter case_match_guard_no_else |
-| case.rb:97:13:97:13 | x | case.rb:97:13:97:13 | x |
-| case.rb:97:25:97:25 | 6 | case.rb:95:1:99:3 | enter case_match_guard_no_else |
-| case.rb:97:25:97:25 | 6 | case.rb:97:13:97:13 | x |
-| case.rb:97:25:97:25 | 6 | case.rb:97:25:97:25 | 6 |
-| cfg.html.erb:5:16:31:12 | enter cfg.html.erb | cfg.html.erb:5:16:31:12 | enter cfg.html.erb |
-| cfg.html.erb:18:14:22:16 | if ... | cfg.html.erb:5:16:31:12 | enter cfg.html.erb |
-| cfg.html.erb:18:14:22:16 | if ... | cfg.html.erb:18:14:22:16 | if ... |
-| cfg.html.erb:18:14:22:16 | if ... | cfg.html.erb:19:19:19:32 | self |
-| cfg.html.erb:18:14:22:16 | if ... | cfg.html.erb:21:19:21:32 | self |
-| cfg.html.erb:19:19:19:32 | self | cfg.html.erb:19:19:19:32 | self |
-| cfg.html.erb:21:19:21:32 | self | cfg.html.erb:21:19:21:32 | self |
-| cfg.html.erb:29:24:31:10 | enter do ... end | cfg.html.erb:29:24:31:10 | enter do ... end |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:25:9:25:22 | enter { ... } | cfg.rb:25:9:25:22 | enter { ... } |
-| cfg.rb:29:10:29:24 | enter { ... } | cfg.rb:29:10:29:24 | enter { ... } |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:42:3:42:24 | [match] when ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:42:15:42:24 | self | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:42:15:42:24 | self | cfg.rb:42:15:42:24 | self |
-| cfg.rb:43:3:43:31 | [match] when ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:43:3:43:31 | [no-match] when ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:43:14:43:14 | 4 | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:43:21:43:31 | self | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:43:21:43:31 | self | cfg.rb:43:21:43:31 | self |
-| cfg.rb:44:8:44:18 | self | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:44:8:44:18 | self | cfg.rb:44:8:44:18 | self |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:48:3:48:29 | [match] when ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:48:20:48:29 | self | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:48:20:48:29 | self | cfg.rb:48:20:48:29 | self |
-| cfg.rb:49:3:49:37 | [match] when ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:49:3:49:37 | [no-match] when ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:49:8:49:8 | b | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:49:8:49:8 | b | cfg.rb:49:8:49:8 | b |
-| cfg.rb:49:16:49:16 | b | cfg.rb:49:16:49:16 | b |
-| cfg.rb:49:27:49:37 | self | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:49:27:49:37 | self | cfg.rb:49:27:49:37 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:60:27:60:31 | hello | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:60:37:60:39 | bye | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:63:3:66:5 | enter pattern | cfg.rb:63:3:66:5 | enter pattern |
-| cfg.rb:69:3:71:5 | enter print | cfg.rb:69:3:71:5 | enter print |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:75:15:75:15 | 0 | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:75:17:75:43 | elsif ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:75:17:75:43 | elsif ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:75:17:75:43 | elsif ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:75:17:75:43 | elsif ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:75:23:75:23 | x | cfg.rb:75:23:75:23 | x |
-| cfg.rb:75:35:75:36 | 10 | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:75:43:75:43 | x | cfg.rb:75:43:75:43 | x |
-| cfg.rb:90:1:93:3 | enter { ... } | cfg.rb:90:1:93:3 | enter { ... } |
-| cfg.rb:90:1:93:3 | exit { ... } (normal) | cfg.rb:90:1:93:3 | enter { ... } |
-| cfg.rb:90:1:93:3 | exit { ... } (normal) | cfg.rb:90:1:93:3 | exit { ... } (normal) |
-| cfg.rb:90:1:93:3 | exit { ... } (normal) | cfg.rb:91:3:91:24 | if ... |
-| cfg.rb:90:1:93:3 | exit { ... } (normal) | cfg.rb:91:17:91:20 | next |
-| cfg.rb:90:5:90:5 | [false] ! ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:90:5:90:5 | [true] ! ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:90:5:90:5 | x | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:90:5:90:5 | x | cfg.rb:90:5:90:5 | x |
-| cfg.rb:91:3:91:24 | if ... | cfg.rb:91:3:91:24 | if ... |
-| cfg.rb:91:17:91:20 | next | cfg.rb:91:17:91:20 | next |
-| cfg.rb:101:1:104:3 | enter parameters | cfg.rb:101:1:104:3 | enter parameters |
-| cfg.rb:101:24:101:25 | 42 | cfg.rb:101:24:101:25 | 42 |
-| cfg.rb:101:28:101:30 | key | cfg.rb:101:1:104:3 | enter parameters |
-| cfg.rb:101:28:101:30 | key | cfg.rb:101:24:101:25 | 42 |
+| case.rb:15:8:15:8 | After x [match] | case.rb:15:8:15:8 | After x [match] |
+| case.rb:15:8:15:8 | After x [no-match] | case.rb:15:8:15:8 | After x [no-match] |
+| case.rb:15:17:15:21 | After ... < ... [false] | case.rb:15:17:15:21 | After ... < ... [false] |
+| case.rb:15:17:15:21 | After ... < ... [true] | case.rb:15:17:15:21 | After ... < ... [true] |
+| case.rb:16:5:16:10 | else ... | case.rb:15:8:15:8 | After x [no-match] |
+| case.rb:16:5:16:10 | else ... | case.rb:15:17:15:21 | After ... < ... [false] |
+| case.rb:16:5:16:10 | else ... | case.rb:16:5:16:10 | else ... |
+| case.rb:20:1:24:3 | Entry | case.rb:20:1:24:3 | Entry |
+| case.rb:21:3:23:5 | After case ... | case.rb:20:1:24:3 | Entry |
+| case.rb:21:3:23:5 | After case ... | case.rb:21:3:23:5 | After case ... |
+| case.rb:21:3:23:5 | After case ... | case.rb:22:8:22:8 | After 1 [match] |
+| case.rb:21:3:23:5 | After case ... | case.rb:22:8:22:8 | After 1 [no-match] |
+| case.rb:22:8:22:8 | After 1 [match] | case.rb:22:8:22:8 | After 1 [match] |
+| case.rb:22:8:22:8 | After 1 [no-match] | case.rb:22:8:22:8 | After 1 [no-match] |
+| case.rb:26:1:30:3 | Entry | case.rb:26:1:30:3 | Entry |
+| case.rb:27:3:29:5 | After case ... | case.rb:26:1:30:3 | Entry |
+| case.rb:27:3:29:5 | After case ... | case.rb:27:3:29:5 | After case ... |
+| case.rb:27:3:29:5 | After case ... | case.rb:28:7:28:28 | After -> { ... } [match] |
+| case.rb:27:3:29:5 | After case ... | case.rb:28:7:28:28 | After -> { ... } [no-match] |
+| case.rb:28:7:28:28 | After -> { ... } [match] | case.rb:28:7:28:28 | After -> { ... } [match] |
+| case.rb:28:7:28:28 | After -> { ... } [no-match] | case.rb:28:7:28:28 | After -> { ... } [no-match] |
+| case.rb:28:7:28:28 | Entry | case.rb:28:7:28:28 | Entry |
+| case.rb:32:1:39:3 | Entry | case.rb:32:1:39:3 | Entry |
+| case.rb:33:3:38:5 | After case ... | case.rb:32:1:39:3 | Entry |
+| case.rb:33:3:38:5 | After case ... | case.rb:33:3:38:5 | After case ... |
+| case.rb:33:3:38:5 | After case ... | case.rb:34:8:34:9 | After [ ..., * ] [match] |
+| case.rb:33:3:38:5 | After case ... | case.rb:34:8:34:9 | After [ ..., * ] [no-match] |
+| case.rb:33:3:38:5 | After case ... | case.rb:35:8:35:10 | After [ ..., * ] [match] |
+| case.rb:33:3:38:5 | After case ... | case.rb:35:8:35:10 | After [ ..., * ] [no-match] |
+| case.rb:33:3:38:5 | After case ... | case.rb:36:8:36:12 | After [ ..., * ] [match] |
+| case.rb:33:3:38:5 | After case ... | case.rb:36:8:36:12 | After [ ..., * ] [no-match] |
+| case.rb:33:3:38:5 | After case ... | case.rb:37:8:37:26 | After [ ..., * ] [match] |
+| case.rb:33:3:38:5 | After case ... | case.rb:37:8:37:26 | After [ ..., * ] [no-match] |
+| case.rb:34:8:34:9 | After [ ..., * ] [match] | case.rb:34:8:34:9 | After [ ..., * ] [match] |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:34:8:34:9 | After [ ..., * ] [no-match] |
+| case.rb:35:8:35:10 | After [ ..., * ] [match] | case.rb:35:8:35:10 | After [ ..., * ] [match] |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:35:8:35:10 | After [ ..., * ] [no-match] |
+| case.rb:36:8:36:12 | After [ ..., * ] [match] | case.rb:36:8:36:12 | After [ ..., * ] [match] |
+| case.rb:36:8:36:12 | After [ ..., * ] [no-match] | case.rb:36:8:36:12 | After [ ..., * ] [no-match] |
+| case.rb:37:8:37:26 | After [ ..., * ] [match] | case.rb:37:8:37:26 | After [ ..., * ] [match] |
+| case.rb:37:8:37:26 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [no-match] |
+| case.rb:41:1:45:3 | Entry | case.rb:41:1:45:3 | Entry |
+| case.rb:42:3:44:5 | After case ... | case.rb:41:1:45:3 | Entry |
+| case.rb:42:3:44:5 | After case ... | case.rb:42:3:44:5 | After case ... |
+| case.rb:42:3:44:5 | After case ... | case.rb:43:8:43:21 | After [ *,...,* ] [match] |
+| case.rb:42:3:44:5 | After case ... | case.rb:43:8:43:21 | After [ *,...,* ] [no-match] |
+| case.rb:43:8:43:21 | After [ *,...,* ] [match] | case.rb:43:8:43:21 | After [ *,...,* ] [match] |
+| case.rb:43:8:43:21 | After [ *,...,* ] [no-match] | case.rb:43:8:43:21 | After [ *,...,* ] [no-match] |
+| case.rb:47:1:53:3 | Entry | case.rb:47:1:53:3 | Entry |
+| case.rb:48:3:52:5 | After case ... | case.rb:47:1:53:3 | Entry |
+| case.rb:48:3:52:5 | After case ... | case.rb:48:3:52:5 | After case ... |
+| case.rb:48:3:52:5 | After case ... | case.rb:49:8:49:34 | After { ..., ** } [match] |
+| case.rb:48:3:52:5 | After case ... | case.rb:49:8:49:34 | After { ..., ** } [no-match] |
+| case.rb:48:3:52:5 | After case ... | case.rb:50:8:50:24 | After { ..., ** } [match] |
+| case.rb:48:3:52:5 | After case ... | case.rb:50:8:50:24 | After { ..., ** } [no-match] |
+| case.rb:48:3:52:5 | After case ... | case.rb:51:8:51:16 | After { ..., ** } [match] |
+| case.rb:48:3:52:5 | After case ... | case.rb:51:8:51:16 | After { ..., ** } [no-match] |
+| case.rb:49:8:49:34 | After { ..., ** } [match] | case.rb:49:8:49:34 | After { ..., ** } [match] |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:49:8:49:34 | After { ..., ** } [no-match] |
+| case.rb:50:8:50:24 | After { ..., ** } [match] | case.rb:50:8:50:24 | After { ..., ** } [match] |
+| case.rb:50:8:50:24 | After { ..., ** } [no-match] | case.rb:50:8:50:24 | After { ..., ** } [no-match] |
+| case.rb:51:8:51:16 | After { ..., ** } [match] | case.rb:51:8:51:16 | After { ..., ** } [match] |
+| case.rb:51:8:51:16 | After { ..., ** } [no-match] | case.rb:51:8:51:16 | After { ..., ** } [no-match] |
+| case.rb:55:1:61:3 | Entry | case.rb:55:1:61:3 | Entry |
+| case.rb:56:3:60:5 | After case ... | case.rb:55:1:61:3 | Entry |
+| case.rb:56:3:60:5 | After case ... | case.rb:56:3:60:5 | After case ... |
+| case.rb:56:3:60:5 | After case ... | case.rb:57:8:57:8 | After 5 [match] |
+| case.rb:56:3:60:5 | After case ... | case.rb:57:8:57:8 | After 5 [no-match] |
+| case.rb:56:3:60:5 | After case ... | case.rb:58:8:58:10 | After var [match] |
+| case.rb:56:3:60:5 | After case ... | case.rb:58:8:58:10 | After var [no-match] |
+| case.rb:56:3:60:5 | After case ... | case.rb:59:8:59:20 | After "unreachable" [match] |
+| case.rb:56:3:60:5 | After case ... | case.rb:59:8:59:20 | After "unreachable" [no-match] |
+| case.rb:57:8:57:8 | After 5 [match] | case.rb:57:8:57:8 | After 5 [match] |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:57:8:57:8 | After 5 [no-match] |
+| case.rb:58:8:58:10 | After var [match] | case.rb:58:8:58:10 | After var [match] |
+| case.rb:58:8:58:10 | After var [no-match] | case.rb:58:8:58:10 | After var [no-match] |
+| case.rb:59:8:59:20 | After "unreachable" [match] | case.rb:59:8:59:20 | After "unreachable" [match] |
+| case.rb:59:8:59:20 | After "unreachable" [no-match] | case.rb:59:8:59:20 | After "unreachable" [no-match] |
+| case.rb:63:1:67:3 | Entry | case.rb:63:1:67:3 | Entry |
+| case.rb:64:3:66:5 | After case ... | case.rb:63:1:67:3 | Entry |
+| case.rb:64:3:66:5 | After case ... | case.rb:64:3:66:5 | After case ... |
+| case.rb:64:3:66:5 | After case ... | case.rb:65:8:65:28 | After ... \| ... [match] |
+| case.rb:64:3:66:5 | After case ... | case.rb:65:8:65:28 | After ... \| ... [no-match] |
+| case.rb:65:8:65:28 | After ... \| ... [match] | case.rb:65:8:65:28 | After ... \| ... [match] |
+| case.rb:65:8:65:28 | After ... \| ... [no-match] | case.rb:65:8:65:28 | After ... \| ... [no-match] |
+| case.rb:69:1:93:3 | Entry | case.rb:69:1:93:3 | Entry |
+| case.rb:72:3:92:5 | After case ... | case.rb:69:1:93:3 | Entry |
+| case.rb:72:3:92:5 | After case ... | case.rb:72:3:92:5 | After case ... |
+| case.rb:72:3:92:5 | After case ... | case.rb:73:8:73:8 | After 5 [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:73:8:73:8 | After 5 [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:74:8:74:11 | After ^... [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:74:8:74:11 | After ^... [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:75:8:75:15 | After "string" [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:75:8:75:15 | After "string" [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:76:8:76:18 | After call to [] [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:76:8:76:18 | After call to [] [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:77:8:77:18 | After call to [] [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:77:8:77:18 | After call to [] [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:79:8:79:14 | After _ .. _ [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:79:8:79:14 | After _ .. _ [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:80:8:80:12 | After _ .. _ [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:80:8:80:12 | After _ .. _ [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:81:8:81:11 | After _ .. _ [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:82:8:82:13 | After ... => ... [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:72:3:92:5 | After case ... | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:73:8:73:8 | After 5 [match] | case.rb:73:8:73:8 | After 5 [match] |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:73:8:73:8 | After 5 [no-match] |
+| case.rb:74:8:74:11 | After ^... [match] | case.rb:74:8:74:11 | After ^... [match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:74:8:74:11 | After ^... [no-match] |
+| case.rb:75:8:75:15 | After "string" [match] | case.rb:75:8:75:15 | After "string" [match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:75:8:75:15 | After "string" [no-match] |
+| case.rb:76:8:76:18 | After call to [] [match] | case.rb:76:8:76:18 | After call to [] [match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:76:8:76:18 | After call to [] [no-match] |
+| case.rb:77:8:77:18 | After call to [] [match] | case.rb:77:8:77:18 | After call to [] [match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:77:8:77:18 | After call to [] [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [match] | case.rb:79:8:79:14 | After _ .. _ [match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [match] | case.rb:80:8:80:12 | After _ .. _ [match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [match] | case.rb:81:8:81:11 | After _ .. _ [match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:82:8:82:13 | After ... => ... [match] | case.rb:82:8:82:13 | After ... => ... [match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:83:8:83:26 | After ... \| ... [match] | case.rb:83:8:83:26 | After ... \| ... [match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:84:8:84:17 | After Bar [match] | case.rb:84:8:84:17 | After Bar [match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:85:8:85:23 | After -> { ... } [match] | case.rb:85:8:85:23 | After -> { ... } [match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:85:8:85:23 | Entry | case.rb:85:8:85:23 | Entry |
+| case.rb:86:8:86:11 | After :foo [match] | case.rb:86:8:86:11 | After :foo [match] |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:87:8:87:17 | After :"foo bar" [match] | case.rb:87:8:87:17 | After :"foo bar" [match] |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:88:8:88:15 | After ... \| ... [match] | case.rb:88:8:88:15 | After ... \| ... [match] |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:89:8:89:69 | After ... \| ... [match] | case.rb:89:8:89:69 | After ... \| ... [match] |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:90:8:90:13 | After ( ... ) [match] | case.rb:90:8:90:13 | After ( ... ) [match] |
+| case.rb:90:8:90:13 | After ( ... ) [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:91:8:91:25 | After ( ... ) [match] | case.rb:91:8:91:25 | After ( ... ) [match] |
+| case.rb:91:8:91:25 | After ( ... ) [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] |
+| case.rb:95:1:99:3 | Entry | case.rb:95:1:99:3 | Entry |
+| case.rb:96:3:98:5 | After case ... | case.rb:95:1:99:3 | Entry |
+| case.rb:96:3:98:5 | After case ... | case.rb:96:3:98:5 | After case ... |
+| case.rb:96:3:98:5 | After case ... | case.rb:97:8:97:8 | After x [match] |
+| case.rb:96:3:98:5 | After case ... | case.rb:97:8:97:8 | After x [no-match] |
+| case.rb:96:3:98:5 | After case ... | case.rb:97:13:97:18 | After ... == ... [false] |
+| case.rb:96:3:98:5 | After case ... | case.rb:97:13:97:18 | After ... == ... [true] |
+| case.rb:97:8:97:8 | After x [match] | case.rb:97:8:97:8 | After x [match] |
+| case.rb:97:8:97:8 | After x [no-match] | case.rb:97:8:97:8 | After x [no-match] |
+| case.rb:97:13:97:18 | After ... == ... [false] | case.rb:97:13:97:18 | After ... == ... [false] |
+| case.rb:97:13:97:18 | After ... == ... [true] | case.rb:97:13:97:18 | After ... == ... [true] |
+| cfg.html.erb:5:16:31:12 | Entry | cfg.html.erb:5:16:31:12 | Entry |
+| cfg.html.erb:18:14:22:16 | After if ... | cfg.html.erb:5:16:31:12 | Entry |
+| cfg.html.erb:18:14:22:16 | After if ... | cfg.html.erb:18:14:22:16 | After if ... |
+| cfg.html.erb:18:14:22:16 | After if ... | cfg.html.erb:18:17:18:22 | After call to admin? [false] |
+| cfg.html.erb:18:14:22:16 | After if ... | cfg.html.erb:18:17:18:22 | After call to admin? [true] |
+| cfg.html.erb:18:17:18:22 | After call to admin? [false] | cfg.html.erb:18:17:18:22 | After call to admin? [false] |
+| cfg.html.erb:18:17:18:22 | After call to admin? [true] | cfg.html.erb:18:17:18:22 | After call to admin? [true] |
+| cfg.html.erb:29:24:31:10 | Entry | cfg.html.erb:29:24:31:10 | Entry |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:1:1:221:1 | Exceptional Exit | cfg.rb:1:1:221:1 | Exceptional Exit |
+| cfg.rb:1:1:221:1 | Exit | cfg.rb:1:1:221:1 | Exit |
+| cfg.rb:25:9:25:22 | Entry | cfg.rb:25:9:25:22 | Entry |
+| cfg.rb:29:10:29:24 | Entry | cfg.rb:29:10:29:24 | Entry |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:42:8:42:8 | After 1 [match] | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:43:3:43:31 | After when ... [match] | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:43:3:43:31 | After when ... [match] | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:43:3:43:31 | After when ... [match] | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:43:3:43:31 | After when ... [match] | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:43:8:43:8 | After 2 [match] | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:43:11:43:11 | After 3 [match] | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:43:11:43:11 | After 3 [no-match] | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:43:14:43:14 | After 4 [match] | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:43:14:43:14 | After 4 [no-match] | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:48:8:48:13 | After ... == ... [match] | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:49:3:49:37 | After when ... [match] | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:49:3:49:37 | After when ... [match] | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:49:3:49:37 | After when ... [match] | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:49:8:49:13 | After ... == ... [match] | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:49:8:49:13 | After ... == ... [no-match] | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:49:16:49:20 | After ... > ... [match] | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:49:16:49:20 | After ... > ... [no-match] | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:60:17:60:22 | After ... < ... [false] | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:60:17:60:22 | After ... < ... [true] | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:63:3:66:5 | Entry | cfg.rb:63:3:66:5 | Entry |
+| cfg.rb:69:3:71:5 | Entry | cfg.rb:69:3:71:5 | Entry |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:75:4:75:8 | After ... < ... [false] | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:75:4:75:8 | After ... < ... [true] | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:75:17:75:43 | After elsif ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:75:17:75:43 | After elsif ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:75:17:75:43 | After elsif ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:75:17:75:43 | After elsif ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:75:23:75:28 | After ... > ... [false] | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:75:23:75:28 | After ... > ... [true] | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:90:1:93:3 | Entry | cfg.rb:90:1:93:3 | Entry |
+| cfg.rb:90:1:93:3 | Normal Exit | cfg.rb:90:1:93:3 | Entry |
+| cfg.rb:90:1:93:3 | Normal Exit | cfg.rb:90:1:93:3 | Normal Exit |
+| cfg.rb:90:1:93:3 | Normal Exit | cfg.rb:91:6:91:10 | After ... > ... [false] |
+| cfg.rb:90:1:93:3 | Normal Exit | cfg.rb:91:6:91:10 | After ... > ... [true] |
+| cfg.rb:90:5:90:5 | After defined? ... [false] | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:90:5:90:5 | After defined? ... [true] | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:91:6:91:10 | After ... > ... [false] | cfg.rb:91:6:91:10 | After ... > ... [false] |
+| cfg.rb:91:6:91:10 | After ... > ... [true] | cfg.rb:91:6:91:10 | After ... > ... [true] |
+| cfg.rb:101:1:104:3 | Entry | cfg.rb:101:1:104:3 | Entry |
+| cfg.rb:101:16:101:20 | After value [match] | cfg.rb:101:16:101:20 | After value [match] |
+| cfg.rb:101:16:101:20 | After value [no-match] | cfg.rb:101:16:101:20 | After value [no-match] |
+| cfg.rb:101:28:101:30 | key | cfg.rb:101:1:104:3 | Entry |
+| cfg.rb:101:28:101:30 | key | cfg.rb:101:16:101:20 | After value [match] |
+| cfg.rb:101:28:101:30 | key | cfg.rb:101:16:101:20 | After value [no-match] |
 | cfg.rb:101:28:101:30 | key | cfg.rb:101:28:101:30 | key |
-| cfg.rb:113:1:113:9 | self | cfg.rb:113:1:113:9 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:120:8:120:28 | enter -> { ... } | cfg.rb:120:8:120:28 | enter -> { ... } |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:136:12:136:29 | self | cfg.rb:136:12:136:29 | self |
-| cfg.rb:145:3:148:5 | enter print | cfg.rb:145:3:148:5 | enter print |
-| cfg.rb:152:1:154:3 | enter method | cfg.rb:152:1:154:3 | enter method |
-| cfg.rb:156:1:156:28 | enter two_parameters | cfg.rb:156:1:156:28 | enter two_parameters |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:172:21:172:29 | self | cfg.rb:172:21:172:29 | self |
-| cfg.rb:172:36:172:45 | self | cfg.rb:172:36:172:45 | self |
-| cfg.rb:174:1:174:9 | self | cfg.rb:174:1:174:9 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:176:7:176:7 | x | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:176:7:176:7 | x | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:176:7:176:7 | x | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:42:15:42:24 | self |
-| cfg.rb:176:7:176:7 | x | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:176:7:176:7 | x | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:176:7:176:7 | x | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:176:7:176:7 | x | cfg.rb:43:21:43:31 | self |
-| cfg.rb:176:7:176:7 | x | cfg.rb:44:8:44:18 | self |
-| cfg.rb:176:7:176:7 | x | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:48:20:48:29 | self |
-| cfg.rb:176:7:176:7 | x | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:49:8:49:8 | b |
-| cfg.rb:176:7:176:7 | x | cfg.rb:49:16:49:16 | b |
-| cfg.rb:176:7:176:7 | x | cfg.rb:49:27:49:37 | self |
-| cfg.rb:176:7:176:7 | x | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:176:7:176:7 | x | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:176:7:176:7 | x | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:176:7:176:7 | x | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:75:23:75:23 | x |
-| cfg.rb:176:7:176:7 | x | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:176:7:176:7 | x | cfg.rb:75:43:75:43 | x |
-| cfg.rb:176:7:176:7 | x | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:90:5:90:5 | x |
-| cfg.rb:176:7:176:7 | x | cfg.rb:113:1:113:9 | self |
-| cfg.rb:176:7:176:7 | x | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:136:12:136:29 | self |
-| cfg.rb:176:7:176:7 | x | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:172:21:172:29 | self |
-| cfg.rb:176:7:176:7 | x | cfg.rb:172:36:172:45 | self |
-| cfg.rb:176:7:176:7 | x | cfg.rb:174:1:174:9 | self |
-| cfg.rb:176:7:176:7 | x | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:176:7:176:7 | x | cfg.rb:176:7:176:7 | x |
-| cfg.rb:176:7:176:7 | x | cfg.rb:176:17:176:17 | x |
-| cfg.rb:176:17:176:17 | x | cfg.rb:176:17:176:17 | x |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:179:2:179:13 | self | cfg.rb:179:2:179:13 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:179:30:179:30 | i | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:179:30:179:30 | i | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:42:15:42:24 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:179:30:179:30 | i | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:179:30:179:30 | i | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:179:30:179:30 | i | cfg.rb:43:21:43:31 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:44:8:44:18 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:48:20:48:29 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:49:8:49:8 | b |
-| cfg.rb:179:30:179:30 | i | cfg.rb:49:16:49:16 | b |
-| cfg.rb:179:30:179:30 | i | cfg.rb:49:27:49:37 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:179:30:179:30 | i | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:179:30:179:30 | i | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:179:30:179:30 | i | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:75:23:75:23 | x |
-| cfg.rb:179:30:179:30 | i | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:179:30:179:30 | i | cfg.rb:75:43:75:43 | x |
-| cfg.rb:179:30:179:30 | i | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:90:5:90:5 | x |
-| cfg.rb:179:30:179:30 | i | cfg.rb:113:1:113:9 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:136:12:136:29 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:172:21:172:29 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:172:36:172:45 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:174:1:174:9 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:179:30:179:30 | i | cfg.rb:176:7:176:7 | x |
-| cfg.rb:179:30:179:30 | i | cfg.rb:176:17:176:17 | x |
-| cfg.rb:179:30:179:30 | i | cfg.rb:179:2:179:13 | self |
-| cfg.rb:179:30:179:30 | i | cfg.rb:179:30:179:30 | i |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:182:7:182:7 | x | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:182:7:182:7 | x | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:182:7:182:7 | x | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:42:15:42:24 | self |
-| cfg.rb:182:7:182:7 | x | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:182:7:182:7 | x | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:182:7:182:7 | x | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:182:7:182:7 | x | cfg.rb:43:21:43:31 | self |
-| cfg.rb:182:7:182:7 | x | cfg.rb:44:8:44:18 | self |
-| cfg.rb:182:7:182:7 | x | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:48:20:48:29 | self |
-| cfg.rb:182:7:182:7 | x | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:49:8:49:8 | b |
-| cfg.rb:182:7:182:7 | x | cfg.rb:49:16:49:16 | b |
-| cfg.rb:182:7:182:7 | x | cfg.rb:49:27:49:37 | self |
-| cfg.rb:182:7:182:7 | x | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:182:7:182:7 | x | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:182:7:182:7 | x | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:182:7:182:7 | x | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:75:23:75:23 | x |
-| cfg.rb:182:7:182:7 | x | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:182:7:182:7 | x | cfg.rb:75:43:75:43 | x |
-| cfg.rb:182:7:182:7 | x | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:90:5:90:5 | x |
-| cfg.rb:182:7:182:7 | x | cfg.rb:113:1:113:9 | self |
-| cfg.rb:182:7:182:7 | x | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:136:12:136:29 | self |
-| cfg.rb:182:7:182:7 | x | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:172:21:172:29 | self |
-| cfg.rb:182:7:182:7 | x | cfg.rb:172:36:172:45 | self |
-| cfg.rb:182:7:182:7 | x | cfg.rb:174:1:174:9 | self |
-| cfg.rb:182:7:182:7 | x | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:176:7:176:7 | x |
-| cfg.rb:182:7:182:7 | x | cfg.rb:176:17:176:17 | x |
-| cfg.rb:182:7:182:7 | x | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:179:2:179:13 | self |
-| cfg.rb:182:7:182:7 | x | cfg.rb:179:30:179:30 | i |
-| cfg.rb:182:7:182:7 | x | cfg.rb:182:7:182:7 | x |
-| cfg.rb:182:7:182:7 | x | cfg.rb:183:3:183:3 | x |
-| cfg.rb:182:7:182:7 | x | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:182:7:182:7 | x | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:183:3:183:3 | x | cfg.rb:183:3:183:3 | x |
-| cfg.rb:183:3:183:3 | x | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:184:3:184:25 | if ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:184:3:184:25 | if ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:184:3:184:25 | if ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:184:18:184:21 | redo | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:188:2:188:13 | self | cfg.rb:188:2:188:13 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:188:30:188:30 | i | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:188:30:188:30 | i | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:42:15:42:24 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:188:30:188:30 | i | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:188:30:188:30 | i | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:188:30:188:30 | i | cfg.rb:43:21:43:31 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:44:8:44:18 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:48:20:48:29 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:49:8:49:8 | b |
-| cfg.rb:188:30:188:30 | i | cfg.rb:49:16:49:16 | b |
-| cfg.rb:188:30:188:30 | i | cfg.rb:49:27:49:37 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:188:30:188:30 | i | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:188:30:188:30 | i | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:188:30:188:30 | i | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:75:23:75:23 | x |
-| cfg.rb:188:30:188:30 | i | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:188:30:188:30 | i | cfg.rb:75:43:75:43 | x |
-| cfg.rb:188:30:188:30 | i | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:90:5:90:5 | x |
-| cfg.rb:188:30:188:30 | i | cfg.rb:113:1:113:9 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:136:12:136:29 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:172:21:172:29 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:172:36:172:45 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:174:1:174:9 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:176:7:176:7 | x |
-| cfg.rb:188:30:188:30 | i | cfg.rb:176:17:176:17 | x |
-| cfg.rb:188:30:188:30 | i | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:179:2:179:13 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:179:30:179:30 | i |
-| cfg.rb:188:30:188:30 | i | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:182:7:182:7 | x |
-| cfg.rb:188:30:188:30 | i | cfg.rb:183:3:183:3 | x |
-| cfg.rb:188:30:188:30 | i | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:188:30:188:30 | i | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:188:30:188:30 | i | cfg.rb:188:2:188:13 | self |
-| cfg.rb:188:30:188:30 | i | cfg.rb:188:30:188:30 | i |
-| cfg.rb:190:1:192:3 | enter run_block | cfg.rb:190:1:192:3 | enter run_block |
-| cfg.rb:194:11:194:23 | enter { ... } | cfg.rb:194:11:194:23 | enter { ... } |
-| cfg.rb:196:1:198:3 | enter forward_param | cfg.rb:196:1:198:3 | enter forward_param |
-| cfg.rb:200:9:200:32 | enter { ... } | cfg.rb:200:9:200:32 | enter { ... } |
-| cfg.rb:202:9:202:35 | enter do ... end | cfg.rb:202:9:202:35 | enter do ... end |
-| cfg.rb:205:1:205:3 | __synth__0__1 | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:205:1:205:3 | nil | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:42:15:42:24 | self |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:43:21:43:31 | self |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:44:8:44:18 | self |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:48:20:48:29 | self |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:49:3:49:37 | [no-match] when ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:49:27:49:37 | self |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:60:27:60:31 | hello |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:60:37:60:39 | bye |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:75:15:75:15 | 0 |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:75:17:75:43 | elsif ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:75:35:75:36 | 10 |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:75:43:75:43 | x |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:90:5:90:5 | x |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:113:1:113:9 | self |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:136:12:136:29 | self |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:172:21:172:29 | self |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:172:36:172:45 | self |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:174:1:174:9 | self |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:176:17:176:17 | x |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:179:2:179:13 | self |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:184:3:184:25 | if ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:184:18:184:21 | redo |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:188:2:188:13 | self |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:205:1:205:3 | __synth__0__1 |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:205:1:205:3 | nil |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:205:4:205:5 | if ... |
-| cfg.rb:205:15:205:23 | enter { ... } | cfg.rb:205:15:205:23 | enter { ... } |
-| cfg.rb:207:1:211:3 | enter filter_nil | cfg.rb:207:1:211:3 | enter filter_nil |
-| cfg.rb:208:15:210:5 | enter do ... end | cfg.rb:208:15:210:5 | enter do ... end |
-| cfg.rb:213:14:216:3 | enter do ... end | cfg.rb:213:14:216:3 | enter do ... end |
-| constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:5:22:5:24 | 123 |
-| constant_compound_assign.rb:5:22:5:24 | 123 | constant_compound_assign.rb:5:22:5:24 | 123 |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:5:22:5:24 | 123 |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:14:18:14:20 | 123 |
-| constant_compound_assign.rb:14:18:14:20 | 123 | constant_compound_assign.rb:14:18:14:20 | 123 |
-| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb |
-| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... |
-| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:5:22:5:24 | 123 |
-| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... |
-| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:14:18:14:20 | 123 |
-| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:19:17:19:19 | ... \|\| ... |
-| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:19:21:19:23 | 123 |
-| constant_compound_assign.rb:19:21:19:23 | 123 | constant_compound_assign.rb:19:21:19:23 | 123 |
-| desugar.rb:1:1:3:3 | enter m1 | desugar.rb:1:1:3:3 | enter m1 |
-| desugar.rb:1:1:38:17 | enter desugar.rb | desugar.rb:1:1:38:17 | enter desugar.rb |
-| desugar.rb:5:1:7:3 | enter m2 | desugar.rb:5:1:7:3 | enter m2 |
-| desugar.rb:9:1:11:3 | enter m3 | desugar.rb:9:1:11:3 | enter m3 |
-| desugar.rb:13:1:15:3 | enter m4 | desugar.rb:13:1:15:3 | enter m4 |
-| desugar.rb:17:1:19:3 | enter m5 | desugar.rb:17:1:19:3 | enter m5 |
-| desugar.rb:21:1:23:3 | enter m6 | desugar.rb:21:1:23:3 | enter m6 |
-| desugar.rb:25:1:27:3 | enter m7 | desugar.rb:25:1:27:3 | enter m7 |
-| exit.rb:1:1:6:3 | enter m1 | exit.rb:1:1:6:3 | enter m1 |
-| exit.rb:1:1:6:3 | exit m1 | exit.rb:1:1:6:3 | exit m1 |
-| exit.rb:1:1:13:4 | enter exit.rb | exit.rb:1:1:13:4 | enter exit.rb |
-| exit.rb:2:3:4:5 | if ... | exit.rb:1:1:6:3 | enter m1 |
-| exit.rb:2:3:4:5 | if ... | exit.rb:2:3:4:5 | if ... |
-| exit.rb:3:5:3:10 | self | exit.rb:3:5:3:10 | self |
-| exit.rb:8:1:13:3 | enter m2 | exit.rb:8:1:13:3 | enter m2 |
-| exit.rb:8:1:13:3 | exit m2 | exit.rb:8:1:13:3 | exit m2 |
-| exit.rb:9:3:11:5 | if ... | exit.rb:8:1:13:3 | enter m2 |
-| exit.rb:9:3:11:5 | if ... | exit.rb:9:3:11:5 | if ... |
-| exit.rb:10:5:10:18 | self | exit.rb:10:5:10:18 | self |
-| heredoc.rb:1:1:7:3 | enter double_heredoc | heredoc.rb:1:1:7:3 | enter double_heredoc |
-| heredoc.rb:1:1:7:4 | enter heredoc.rb | heredoc.rb:1:1:7:4 | enter heredoc.rb |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:1:1:9:3 | enter m1 |
-| ifs.rb:1:1:58:4 | enter ifs.rb | ifs.rb:1:1:58:4 | enter ifs.rb |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:1:1:9:3 | enter m1 |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:2:3:8:5 | if ... |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:3:5:3:30 | self |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:4:3:7:35 | elsif ... |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:4:9:4:9 | x |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:4:9:4:24 | [false] ... and ... |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:4:9:4:24 | [true] ... and ... |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:4:9:4:38 | [false] ... and ... |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:4:9:4:38 | [true] ... and ... |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:4:20:4:20 | x |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:4:30:4:38 | [true] ! ... |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:4:31:4:38 | [false] ( ... ) |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:4:31:4:38 | [true] ( ... ) |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:4:32:4:32 | x |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:5:5:5:17 | self |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:7:5:7:35 | self |
-| ifs.rb:3:5:3:30 | self | ifs.rb:3:5:3:30 | self |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:3:7:35 | elsif ... |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:9:4:9 | x |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:9:4:24 | [false] ... and ... |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:9:4:24 | [true] ... and ... |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:9:4:38 | [false] ... and ... |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:9:4:38 | [true] ... and ... |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:20:4:20 | x |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:30:4:38 | [true] ! ... |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:31:4:38 | [false] ( ... ) |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:31:4:38 | [true] ( ... ) |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:32:4:32 | x |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:5:5:5:17 | self |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:7:5:7:35 | self |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:9:4:9 | x |
-| ifs.rb:4:9:4:24 | [false] ... and ... | ifs.rb:4:9:4:24 | [false] ... and ... |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:9:4:24 | [true] ... and ... |
-| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:4:9:4:24 | [false] ... and ... |
-| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:4:9:4:38 | [false] ... and ... |
-| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:4:31:4:38 | [true] ( ... ) |
-| ifs.rb:4:9:4:38 | [true] ... and ... | ifs.rb:4:9:4:38 | [true] ... and ... |
-| ifs.rb:4:9:4:38 | [true] ... and ... | ifs.rb:4:30:4:38 | [true] ! ... |
-| ifs.rb:4:9:4:38 | [true] ... and ... | ifs.rb:4:31:4:38 | [false] ( ... ) |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:20:4:20 | x |
-| ifs.rb:4:30:4:38 | [false] ! ... | ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:4:30:4:38 | [false] ! ... | ifs.rb:4:31:4:38 | [true] ( ... ) |
-| ifs.rb:4:30:4:38 | [true] ! ... | ifs.rb:4:30:4:38 | [true] ! ... |
-| ifs.rb:4:30:4:38 | [true] ! ... | ifs.rb:4:31:4:38 | [false] ( ... ) |
-| ifs.rb:4:31:4:38 | [false] ( ... ) | ifs.rb:4:31:4:38 | [false] ( ... ) |
-| ifs.rb:4:31:4:38 | [true] ( ... ) | ifs.rb:4:31:4:38 | [true] ( ... ) |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:9:4:24 | [true] ... and ... |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:32:4:32 | x |
-| ifs.rb:5:5:5:17 | self | ifs.rb:4:9:4:38 | [true] ... and ... |
-| ifs.rb:5:5:5:17 | self | ifs.rb:4:30:4:38 | [true] ! ... |
-| ifs.rb:5:5:5:17 | self | ifs.rb:4:31:4:38 | [false] ( ... ) |
-| ifs.rb:5:5:5:17 | self | ifs.rb:5:5:5:17 | self |
-| ifs.rb:7:5:7:35 | self | ifs.rb:4:9:4:24 | [false] ... and ... |
-| ifs.rb:7:5:7:35 | self | ifs.rb:4:9:4:38 | [false] ... and ... |
-| ifs.rb:7:5:7:35 | self | ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:7:5:7:35 | self | ifs.rb:4:31:4:38 | [true] ( ... ) |
-| ifs.rb:7:5:7:35 | self | ifs.rb:7:5:7:35 | self |
-| ifs.rb:11:1:16:3 | enter m2 | ifs.rb:11:1:16:3 | enter m2 |
-| ifs.rb:11:1:16:3 | exit m2 (normal) | ifs.rb:11:1:16:3 | enter m2 |
-| ifs.rb:11:1:16:3 | exit m2 (normal) | ifs.rb:11:1:16:3 | exit m2 (normal) |
-| ifs.rb:11:1:16:3 | exit m2 (normal) | ifs.rb:12:3:14:5 | if ... |
-| ifs.rb:11:1:16:3 | exit m2 (normal) | ifs.rb:13:12:13:12 | 0 |
-| ifs.rb:12:3:14:5 | if ... | ifs.rb:12:3:14:5 | if ... |
-| ifs.rb:13:12:13:12 | 0 | ifs.rb:13:12:13:12 | 0 |
-| ifs.rb:18:1:26:3 | enter m3 | ifs.rb:18:1:26:3 | enter m3 |
-| ifs.rb:19:3:24:5 | if ... | ifs.rb:18:1:26:3 | enter m3 |
-| ifs.rb:19:3:24:5 | if ... | ifs.rb:19:3:24:5 | if ... |
-| ifs.rb:19:3:24:5 | if ... | ifs.rb:20:5:20:5 | x |
-| ifs.rb:19:3:24:5 | if ... | ifs.rb:21:5:23:7 | if ... |
-| ifs.rb:19:3:24:5 | if ... | ifs.rb:22:7:22:7 | x |
-| ifs.rb:20:5:20:5 | x | ifs.rb:20:5:20:5 | x |
-| ifs.rb:21:5:23:7 | if ... | ifs.rb:20:5:20:5 | x |
-| ifs.rb:21:5:23:7 | if ... | ifs.rb:21:5:23:7 | if ... |
-| ifs.rb:21:5:23:7 | if ... | ifs.rb:22:7:22:7 | x |
-| ifs.rb:22:7:22:7 | x | ifs.rb:22:7:22:7 | x |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:28:1:30:3 | enter m4 |
-| ifs.rb:29:10:29:23 | [false] ( ... ) | ifs.rb:29:10:29:23 | [false] ( ... ) |
-| ifs.rb:29:10:29:23 | [false] ( ... ) | ifs.rb:29:11:29:22 | [false] ... ? ... : ... |
-| ifs.rb:29:10:29:23 | [true] ( ... ) | ifs.rb:29:10:29:23 | [true] ( ... ) |
-| ifs.rb:29:10:29:23 | [true] ( ... ) | ifs.rb:29:11:29:22 | [true] ... ? ... : ... |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:28:1:30:3 | enter m4 |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:10:29:23 | [false] ( ... ) |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:10:29:23 | [true] ( ... ) |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:10:29:51 | ... ? ... : ... |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:11:29:22 | [false] ... ? ... : ... |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:11:29:22 | [true] ... ? ... : ... |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:16:29:17 | b2 |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:21:29:22 | b3 |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:28:29:35 | b2 \|\| b3 |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:41:29:50 | !b2 \|\| !b3 |
-| ifs.rb:29:11:29:22 | [false] ... ? ... : ... | ifs.rb:29:11:29:22 | [false] ... ? ... : ... |
-| ifs.rb:29:11:29:22 | [true] ... ? ... : ... | ifs.rb:29:11:29:22 | [true] ... ? ... : ... |
-| ifs.rb:29:16:29:17 | b2 | ifs.rb:29:16:29:17 | b2 |
-| ifs.rb:29:21:29:22 | b3 | ifs.rb:29:21:29:22 | b3 |
-| ifs.rb:29:28:29:35 | b2 \|\| b3 | ifs.rb:29:10:29:23 | [true] ( ... ) |
-| ifs.rb:29:28:29:35 | b2 \|\| b3 | ifs.rb:29:11:29:22 | [true] ... ? ... : ... |
-| ifs.rb:29:28:29:35 | b2 \|\| b3 | ifs.rb:29:28:29:35 | b2 \|\| b3 |
-| ifs.rb:29:41:29:50 | !b2 \|\| !b3 | ifs.rb:29:10:29:23 | [false] ( ... ) |
-| ifs.rb:29:41:29:50 | !b2 \|\| !b3 | ifs.rb:29:11:29:22 | [false] ... ? ... : ... |
-| ifs.rb:29:41:29:50 | !b2 \|\| !b3 | ifs.rb:29:41:29:50 | !b2 \|\| !b3 |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:32:1:34:3 | enter m5 |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:32:1:34:3 | enter m5 |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:3:33:100 | if ... |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:6:33:49 | [false] ( ... ) |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:6:33:49 | [true] ( ... ) |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:7:33:48 | [false] if ... |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:7:33:48 | [true] if ... |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:13:33:19 | [false] then ... |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:13:33:19 | [true] then ... |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:18:33:19 | b2 |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:21:33:44 | [false] elsif ... |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:21:33:44 | [true] elsif ... |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:27:33:28 | b3 |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:30:33:36 | [false] then ... |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:30:33:36 | [true] then ... |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:35:33:36 | b4 |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:38:33:44 | [false] else ... |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:38:33:44 | [true] else ... |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:43:33:44 | b5 |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 |
-| ifs.rb:33:6:33:49 | [false] ( ... ) | ifs.rb:33:6:33:49 | [false] ( ... ) |
-| ifs.rb:33:6:33:49 | [false] ( ... ) | ifs.rb:33:7:33:48 | [false] if ... |
-| ifs.rb:33:6:33:49 | [false] ( ... ) | ifs.rb:33:13:33:19 | [false] then ... |
-| ifs.rb:33:6:33:49 | [false] ( ... ) | ifs.rb:33:21:33:44 | [false] elsif ... |
-| ifs.rb:33:6:33:49 | [false] ( ... ) | ifs.rb:33:30:33:36 | [false] then ... |
-| ifs.rb:33:6:33:49 | [false] ( ... ) | ifs.rb:33:38:33:44 | [false] else ... |
-| ifs.rb:33:6:33:49 | [true] ( ... ) | ifs.rb:33:6:33:49 | [true] ( ... ) |
-| ifs.rb:33:6:33:49 | [true] ( ... ) | ifs.rb:33:7:33:48 | [true] if ... |
-| ifs.rb:33:6:33:49 | [true] ( ... ) | ifs.rb:33:13:33:19 | [true] then ... |
-| ifs.rb:33:6:33:49 | [true] ( ... ) | ifs.rb:33:21:33:44 | [true] elsif ... |
-| ifs.rb:33:6:33:49 | [true] ( ... ) | ifs.rb:33:30:33:36 | [true] then ... |
-| ifs.rb:33:6:33:49 | [true] ( ... ) | ifs.rb:33:38:33:44 | [true] else ... |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:7:33:48 | [false] if ... |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:13:33:19 | [false] then ... |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:21:33:44 | [false] elsif ... |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:30:33:36 | [false] then ... |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:38:33:44 | [false] else ... |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:7:33:48 | [true] if ... |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:13:33:19 | [true] then ... |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:21:33:44 | [true] elsif ... |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:30:33:36 | [true] then ... |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:38:33:44 | [true] else ... |
-| ifs.rb:33:13:33:19 | [false] then ... | ifs.rb:33:13:33:19 | [false] then ... |
-| ifs.rb:33:13:33:19 | [true] then ... | ifs.rb:33:13:33:19 | [true] then ... |
-| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:18:33:19 | b2 |
-| ifs.rb:33:21:33:44 | [false] elsif ... | ifs.rb:33:21:33:44 | [false] elsif ... |
-| ifs.rb:33:21:33:44 | [false] elsif ... | ifs.rb:33:30:33:36 | [false] then ... |
-| ifs.rb:33:21:33:44 | [false] elsif ... | ifs.rb:33:38:33:44 | [false] else ... |
-| ifs.rb:33:21:33:44 | [true] elsif ... | ifs.rb:33:21:33:44 | [true] elsif ... |
-| ifs.rb:33:21:33:44 | [true] elsif ... | ifs.rb:33:30:33:36 | [true] then ... |
-| ifs.rb:33:21:33:44 | [true] elsif ... | ifs.rb:33:38:33:44 | [true] else ... |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:27:33:28 | b3 |
-| ifs.rb:33:30:33:36 | [false] then ... | ifs.rb:33:30:33:36 | [false] then ... |
-| ifs.rb:33:30:33:36 | [true] then ... | ifs.rb:33:30:33:36 | [true] then ... |
-| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:35:33:36 | b4 |
-| ifs.rb:33:38:33:44 | [false] else ... | ifs.rb:33:38:33:44 | [false] else ... |
-| ifs.rb:33:38:33:44 | [true] else ... | ifs.rb:33:38:33:44 | [true] else ... |
-| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:43:33:44 | b5 |
-| ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | ifs.rb:33:6:33:49 | [true] ( ... ) |
-| ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | ifs.rb:33:7:33:48 | [true] if ... |
-| ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | ifs.rb:33:13:33:19 | [true] then ... |
-| ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | ifs.rb:33:21:33:44 | [true] elsif ... |
-| ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | ifs.rb:33:30:33:36 | [true] then ... |
-| ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | ifs.rb:33:38:33:44 | [true] else ... |
-| ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 |
-| ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | ifs.rb:33:6:33:49 | [false] ( ... ) |
-| ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | ifs.rb:33:7:33:48 | [false] if ... |
-| ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | ifs.rb:33:13:33:19 | [false] then ... |
-| ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | ifs.rb:33:21:33:44 | [false] elsif ... |
-| ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | ifs.rb:33:30:33:36 | [false] then ... |
-| ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | ifs.rb:33:38:33:44 | [false] else ... |
-| ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 |
-| ifs.rb:36:1:38:3 | conditional_method_def | ifs.rb:36:1:38:3 | conditional_method_def |
-| ifs.rb:36:1:38:3 | enter conditional_method_def | ifs.rb:36:1:38:3 | enter conditional_method_def |
-| ifs.rb:36:1:38:17 | ... unless ... | ifs.rb:1:1:58:4 | enter ifs.rb |
-| ifs.rb:36:1:38:17 | ... unless ... | ifs.rb:36:1:38:3 | conditional_method_def |
-| ifs.rb:36:1:38:17 | ... unless ... | ifs.rb:36:1:38:17 | ... unless ... |
-| ifs.rb:40:1:44:3 | enter constant_condition | ifs.rb:40:1:44:3 | enter constant_condition |
-| ifs.rb:41:3:43:5 | if ... | ifs.rb:40:1:44:3 | enter constant_condition |
-| ifs.rb:41:3:43:5 | if ... | ifs.rb:41:3:43:5 | if ... |
-| ifs.rb:41:3:43:5 | if ... | ifs.rb:41:6:41:10 | [false] ! ... |
-| ifs.rb:41:6:41:10 | [false] ! ... | ifs.rb:40:1:44:3 | enter constant_condition |
-| ifs.rb:41:6:41:10 | [false] ! ... | ifs.rb:41:6:41:10 | [false] ! ... |
-| ifs.rb:46:1:52:3 | enter empty_else | ifs.rb:46:1:52:3 | enter empty_else |
-| ifs.rb:47:3:50:5 | if ... | ifs.rb:46:1:52:3 | enter empty_else |
-| ifs.rb:47:3:50:5 | if ... | ifs.rb:47:3:50:5 | if ... |
-| ifs.rb:47:3:50:5 | if ... | ifs.rb:48:5:48:15 | self |
-| ifs.rb:47:3:50:5 | if ... | ifs.rb:49:3:49:6 | else ... |
-| ifs.rb:48:5:48:15 | self | ifs.rb:48:5:48:15 | self |
-| ifs.rb:49:3:49:6 | else ... | ifs.rb:49:3:49:6 | else ... |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:54:1:58:3 | enter disjunct |
-| ifs.rb:55:3:57:5 | if ... | ifs.rb:54:1:58:3 | enter disjunct |
-| ifs.rb:55:3:57:5 | if ... | ifs.rb:55:3:57:5 | if ... |
-| ifs.rb:55:3:57:5 | if ... | ifs.rb:55:6:55:15 | [false] ( ... ) |
-| ifs.rb:55:3:57:5 | if ... | ifs.rb:55:6:55:15 | [true] ( ... ) |
-| ifs.rb:55:3:57:5 | if ... | ifs.rb:55:7:55:14 | [false] ... \|\| ... |
-| ifs.rb:55:3:57:5 | if ... | ifs.rb:55:7:55:14 | [true] ... \|\| ... |
-| ifs.rb:55:3:57:5 | if ... | ifs.rb:55:13:55:14 | b2 |
-| ifs.rb:55:3:57:5 | if ... | ifs.rb:56:5:56:19 | self |
-| ifs.rb:55:6:55:15 | [false] ( ... ) | ifs.rb:55:6:55:15 | [false] ( ... ) |
-| ifs.rb:55:6:55:15 | [false] ( ... ) | ifs.rb:55:7:55:14 | [false] ... \|\| ... |
-| ifs.rb:55:6:55:15 | [true] ( ... ) | ifs.rb:55:6:55:15 | [true] ( ... ) |
-| ifs.rb:55:6:55:15 | [true] ( ... ) | ifs.rb:55:7:55:14 | [true] ... \|\| ... |
-| ifs.rb:55:7:55:14 | [false] ... \|\| ... | ifs.rb:55:7:55:14 | [false] ... \|\| ... |
-| ifs.rb:55:7:55:14 | [true] ... \|\| ... | ifs.rb:55:7:55:14 | [true] ... \|\| ... |
-| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:13:55:14 | b2 |
-| ifs.rb:56:5:56:19 | self | ifs.rb:55:6:55:15 | [true] ( ... ) |
-| ifs.rb:56:5:56:19 | self | ifs.rb:55:7:55:14 | [true] ... \|\| ... |
-| ifs.rb:56:5:56:19 | self | ifs.rb:56:5:56:19 | self |
-| loops.rb:1:1:6:3 | enter m1 | loops.rb:1:1:6:3 | enter m1 |
-| loops.rb:1:1:33:4 | enter loops.rb | loops.rb:1:1:33:4 | enter loops.rb |
-| loops.rb:2:3:5:5 | while ... | loops.rb:1:1:6:3 | enter m1 |
-| loops.rb:2:3:5:5 | while ... | loops.rb:2:3:5:5 | while ... |
-| loops.rb:2:3:5:5 | while ... | loops.rb:2:9:2:9 | x |
-| loops.rb:2:3:5:5 | while ... | loops.rb:3:5:3:10 | self |
-| loops.rb:2:9:2:9 | x | loops.rb:1:1:6:3 | enter m1 |
-| loops.rb:2:9:2:9 | x | loops.rb:2:9:2:9 | x |
-| loops.rb:2:9:2:9 | x | loops.rb:3:5:3:10 | self |
-| loops.rb:3:5:3:10 | self | loops.rb:3:5:3:10 | self |
-| loops.rb:8:1:22:3 | enter m2 | loops.rb:8:1:22:3 | enter m2 |
-| loops.rb:9:3:20:5 | while ... | loops.rb:8:1:22:3 | enter m2 |
-| loops.rb:9:3:20:5 | while ... | loops.rb:9:3:20:5 | while ... |
-| loops.rb:9:3:20:5 | while ... | loops.rb:9:9:9:9 | x |
-| loops.rb:9:3:20:5 | while ... | loops.rb:10:5:10:10 | self |
-| loops.rb:9:3:20:5 | while ... | loops.rb:13:7:13:11 | break |
-| loops.rb:9:3:20:5 | while ... | loops.rb:14:11:14:11 | x |
-| loops.rb:9:3:20:5 | while ... | loops.rb:15:7:15:10 | next |
-| loops.rb:9:3:20:5 | while ... | loops.rb:16:5:17:10 | elsif ... |
-| loops.rb:9:3:20:5 | while ... | loops.rb:16:11:16:11 | x |
-| loops.rb:9:3:20:5 | while ... | loops.rb:17:7:17:10 | redo |
-| loops.rb:9:9:9:9 | x | loops.rb:8:1:22:3 | enter m2 |
-| loops.rb:9:9:9:9 | x | loops.rb:9:9:9:9 | x |
-| loops.rb:9:9:9:9 | x | loops.rb:15:7:15:10 | next |
-| loops.rb:9:9:9:9 | x | loops.rb:16:5:17:10 | elsif ... |
-| loops.rb:10:5:10:10 | self | loops.rb:10:5:10:10 | self |
-| loops.rb:10:5:10:10 | self | loops.rb:17:7:17:10 | redo |
-| loops.rb:13:7:13:11 | break | loops.rb:13:7:13:11 | break |
-| loops.rb:14:11:14:11 | x | loops.rb:14:11:14:11 | x |
-| loops.rb:15:7:15:10 | next | loops.rb:15:7:15:10 | next |
-| loops.rb:16:5:17:10 | elsif ... | loops.rb:16:5:17:10 | elsif ... |
-| loops.rb:16:11:16:11 | x | loops.rb:16:11:16:11 | x |
-| loops.rb:17:7:17:10 | redo | loops.rb:17:7:17:10 | redo |
-| loops.rb:24:1:28:3 | enter m3 | loops.rb:24:1:28:3 | enter m3 |
-| loops.rb:25:16:27:5 | enter do ... end | loops.rb:25:16:27:5 | enter do ... end |
-| loops.rb:30:1:33:3 | enter m4 | loops.rb:30:1:33:3 | enter m4 |
-| loops.rb:31:3:32:5 | while ... | loops.rb:30:1:33:3 | enter m4 |
-| loops.rb:31:3:32:5 | while ... | loops.rb:31:3:32:5 | while ... |
-| loops.rb:31:3:32:5 | while ... | loops.rb:31:9:31:9 | x |
-| loops.rb:31:3:32:5 | while ... | loops.rb:31:15:32:5 | do ... |
-| loops.rb:31:9:31:9 | x | loops.rb:30:1:33:3 | enter m4 |
-| loops.rb:31:9:31:9 | x | loops.rb:31:9:31:9 | x |
-| loops.rb:31:9:31:9 | x | loops.rb:31:15:32:5 | do ... |
-| loops.rb:31:15:32:5 | do ... | loops.rb:31:15:32:5 | do ... |
-| raise.rb:1:1:182:4 | enter raise.rb | raise.rb:1:1:182:4 | enter raise.rb |
-| raise.rb:7:1:12:3 | enter m1 | raise.rb:7:1:12:3 | enter m1 |
-| raise.rb:7:1:12:3 | exit m1 | raise.rb:7:1:12:3 | exit m1 |
-| raise.rb:8:3:10:5 | if ... | raise.rb:7:1:12:3 | enter m1 |
-| raise.rb:8:3:10:5 | if ... | raise.rb:8:3:10:5 | if ... |
-| raise.rb:9:5:9:17 | self | raise.rb:9:5:9:17 | self |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:14:1:23:3 | enter m2 |
-| raise.rb:14:1:23:3 | exit m2 | raise.rb:14:1:23:3 | exit m2 |
-| raise.rb:14:1:23:3 | exit m2 (abnormal) | raise.rb:14:1:23:3 | exit m2 (abnormal) |
-| raise.rb:16:5:18:7 | if ... | raise.rb:16:5:18:7 | if ... |
-| raise.rb:17:7:17:22 | self | raise.rb:17:7:17:22 | self |
-| raise.rb:20:5:20:18 | self | raise.rb:17:7:17:22 | self |
-| raise.rb:20:5:20:18 | self | raise.rb:20:5:20:18 | self |
-| raise.rb:22:3:22:15 | self | raise.rb:14:1:23:3 | enter m2 |
-| raise.rb:22:3:22:15 | self | raise.rb:16:5:18:7 | if ... |
-| raise.rb:22:3:22:15 | self | raise.rb:17:7:17:22 | self |
-| raise.rb:22:3:22:15 | self | raise.rb:20:5:20:18 | self |
-| raise.rb:22:3:22:15 | self | raise.rb:22:3:22:15 | self |
-| raise.rb:25:1:34:3 | enter m3 | raise.rb:25:1:34:3 | enter m3 |
-| raise.rb:27:5:29:7 | if ... | raise.rb:27:5:29:7 | if ... |
-| raise.rb:28:7:28:22 | self | raise.rb:28:7:28:22 | self |
-| raise.rb:33:3:33:15 | self | raise.rb:25:1:34:3 | enter m3 |
-| raise.rb:33:3:33:15 | self | raise.rb:27:5:29:7 | if ... |
-| raise.rb:33:3:33:15 | self | raise.rb:28:7:28:22 | self |
-| raise.rb:33:3:33:15 | self | raise.rb:33:3:33:15 | self |
-| raise.rb:36:1:45:3 | enter m4 | raise.rb:36:1:45:3 | enter m4 |
-| raise.rb:38:5:40:7 | if ... | raise.rb:38:5:40:7 | if ... |
-| raise.rb:39:7:39:22 | self | raise.rb:39:7:39:22 | self |
-| raise.rb:44:3:44:15 | self | raise.rb:36:1:45:3 | enter m4 |
-| raise.rb:44:3:44:15 | self | raise.rb:38:5:40:7 | if ... |
-| raise.rb:44:3:44:15 | self | raise.rb:39:7:39:22 | self |
-| raise.rb:44:3:44:15 | self | raise.rb:44:3:44:15 | self |
-| raise.rb:47:1:55:3 | enter m5 | raise.rb:47:1:55:3 | enter m5 |
-| raise.rb:49:5:51:7 | if ... | raise.rb:49:5:51:7 | if ... |
-| raise.rb:50:7:50:22 | self | raise.rb:50:7:50:22 | self |
-| raise.rb:54:3:54:15 | self | raise.rb:47:1:55:3 | enter m5 |
-| raise.rb:54:3:54:15 | self | raise.rb:49:5:51:7 | if ... |
-| raise.rb:54:3:54:15 | self | raise.rb:50:7:50:22 | self |
-| raise.rb:54:3:54:15 | self | raise.rb:54:3:54:15 | self |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:57:1:66:3 | enter m6 |
-| raise.rb:57:1:66:3 | exit m6 | raise.rb:57:1:66:3 | exit m6 |
-| raise.rb:57:1:66:3 | exit m6 (abnormal) | raise.rb:57:1:66:3 | exit m6 (abnormal) |
-| raise.rb:59:5:61:7 | if ... | raise.rb:59:5:61:7 | if ... |
-| raise.rb:60:7:60:22 | self | raise.rb:60:7:60:22 | self |
-| raise.rb:62:22:62:31 | ExceptionB | raise.rb:62:22:62:31 | ExceptionB |
-| raise.rb:62:36:62:36 | e | raise.rb:60:7:60:22 | self |
-| raise.rb:62:36:62:36 | e | raise.rb:62:22:62:31 | ExceptionB |
-| raise.rb:62:36:62:36 | e | raise.rb:62:36:62:36 | e |
-| raise.rb:65:3:65:15 | self | raise.rb:57:1:66:3 | enter m6 |
-| raise.rb:65:3:65:15 | self | raise.rb:59:5:61:7 | if ... |
-| raise.rb:65:3:65:15 | self | raise.rb:60:7:60:22 | self |
-| raise.rb:65:3:65:15 | self | raise.rb:62:22:62:31 | ExceptionB |
-| raise.rb:65:3:65:15 | self | raise.rb:62:36:62:36 | e |
-| raise.rb:65:3:65:15 | self | raise.rb:65:3:65:15 | self |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:68:1:77:3 | enter m7 |
-| raise.rb:68:1:77:3 | exit m7 | raise.rb:68:1:77:3 | exit m7 |
-| raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:68:1:77:3 | enter m7 |
-| raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:68:1:77:3 | exit m7 (normal) |
-| raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:71:3:72:18 | elsif ... |
-| raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:71:9:71:9 | x |
-| raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:72:13:72:17 | x < 0 |
-| raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:76:3:76:15 | self |
-| raise.rb:70:5:70:17 | self | raise.rb:70:5:70:17 | self |
-| raise.rb:71:3:72:18 | elsif ... | raise.rb:71:3:72:18 | elsif ... |
-| raise.rb:71:9:71:9 | x | raise.rb:68:1:77:3 | enter m7 |
-| raise.rb:71:9:71:9 | x | raise.rb:71:9:71:9 | x |
-| raise.rb:72:13:72:17 | x < 0 | raise.rb:72:13:72:17 | x < 0 |
-| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:76:3:76:15 | [ensure: exception] self |
-| raise.rb:76:3:76:15 | self | raise.rb:71:3:72:18 | elsif ... |
-| raise.rb:76:3:76:15 | self | raise.rb:76:3:76:15 | self |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:79:1:92:3 | enter m8 |
-| raise.rb:79:1:92:3 | exit m8 | raise.rb:79:1:92:3 | exit m8 |
-| raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:79:1:92:3 | enter m8 |
-| raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:79:1:92:3 | exit m8 (normal) |
-| raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:84:5:85:20 | elsif ... |
-| raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:84:11:84:11 | x |
-| raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:85:15:85:19 | x < 0 |
-| raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:89:5:89:17 | self |
-| raise.rb:83:7:83:19 | self | raise.rb:83:7:83:19 | self |
-| raise.rb:84:5:85:20 | elsif ... | raise.rb:84:5:85:20 | elsif ... |
-| raise.rb:84:11:84:11 | x | raise.rb:79:1:92:3 | enter m8 |
-| raise.rb:84:11:84:11 | x | raise.rb:84:11:84:11 | x |
-| raise.rb:85:15:85:19 | x < 0 | raise.rb:85:15:85:19 | x < 0 |
-| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:89:5:89:17 | [ensure: exception] self |
-| raise.rb:89:5:89:17 | self | raise.rb:84:5:85:20 | elsif ... |
-| raise.rb:89:5:89:17 | self | raise.rb:89:5:89:17 | self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:94:1:119:3 | enter m9 |
-| raise.rb:94:1:119:3 | exit m9 | raise.rb:94:1:119:3 | exit m9 |
-| raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:94:1:119:3 | exit m9 (abnormal) |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:94:1:119:3 | enter m9 |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:94:1:119:3 | exit m9 (normal) |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:97:8:97:8 | x |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:99:11:99:11 | x |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:104:5:104:23 | self |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:106:7:108:9 | [ensure: return] if ... |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:106:7:108:9 | if ... |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:106:10:106:11 | [ensure: return] b1 |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:106:10:106:11 | b1 |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:115:3:115:22 | self |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:116:3:118:5 | [ensure: return] if ... |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:116:3:118:5 | if ... |
-| raise.rb:97:8:97:8 | x | raise.rb:94:1:119:3 | enter m9 |
-| raise.rb:97:8:97:8 | x | raise.rb:97:8:97:8 | x |
-| raise.rb:98:7:98:19 | self | raise.rb:98:7:98:19 | self |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:99:11:99:11 | x | raise.rb:94:1:119:3 | enter m9 |
-| raise.rb:99:11:99:11 | x | raise.rb:97:8:97:8 | x |
-| raise.rb:99:11:99:11 | x | raise.rb:99:11:99:11 | x |
-| raise.rb:100:15:100:19 | x < 0 | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:104:5:104:23 | [ensure: exception] self |
-| raise.rb:104:5:104:23 | self | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:104:5:104:23 | self | raise.rb:104:5:104:23 | self |
-| raise.rb:106:7:108:9 | [ensure: exception] if ... | raise.rb:106:7:108:9 | [ensure: exception] if ... |
-| raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:106:7:108:9 | [ensure: return] if ... |
-| raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:106:10:106:11 | [ensure: return] b1 |
-| raise.rb:106:7:108:9 | if ... | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:106:7:108:9 | if ... | raise.rb:104:5:104:23 | self |
-| raise.rb:106:7:108:9 | if ... | raise.rb:106:7:108:9 | if ... |
-| raise.rb:106:7:108:9 | if ... | raise.rb:106:10:106:11 | b1 |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:106:10:106:11 | [ensure: exception] b1 |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:106:10:106:11 | [ensure: return] b1 |
-| raise.rb:106:10:106:11 | b1 | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:106:10:106:11 | b1 | raise.rb:104:5:104:23 | self |
-| raise.rb:106:10:106:11 | b1 | raise.rb:106:10:106:11 | b1 |
-| raise.rb:107:9:107:26 | [ensure: exception] self | raise.rb:107:9:107:26 | [ensure: exception] self |
-| raise.rb:107:9:107:26 | [ensure: return] self | raise.rb:107:9:107:26 | [ensure: return] self |
-| raise.rb:107:9:107:26 | self | raise.rb:107:9:107:26 | self |
-| raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: exception] ensure ... | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:106:7:108:9 | [ensure: return] if ... |
-| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:106:10:106:11 | [ensure: return] b1 |
-| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
-| raise.rb:109:5:110:25 | ensure ... | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:109:5:110:25 | ensure ... | raise.rb:104:5:104:23 | self |
-| raise.rb:109:5:110:25 | ensure ... | raise.rb:106:7:108:9 | if ... |
-| raise.rb:109:5:110:25 | ensure ... | raise.rb:106:10:106:11 | b1 |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:113:14:113:19 | After ... > ... [false] | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:113:14:113:19 | After ... > ... [true] | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:120:8:120:28 | Entry | cfg.rb:120:8:120:28 | Entry |
+| cfg.rb:136:1:136:3 | After ... / ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:136:12:136:29 | Before call to puts | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:145:3:148:5 | Entry | cfg.rb:145:3:148:5 | Entry |
+| cfg.rb:152:1:154:3 | Entry | cfg.rb:152:1:154:3 | Entry |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:172:8:172:14 | After ... == ... [false] | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:172:8:172:14 | After ... == ... [true] | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:174:18:174:23 | After ... == ... [false] | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:174:18:174:23 | After ... == ... [true] | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [false] | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [false] | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [true] | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:182:14:186:3 | do ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:182:14:186:3 | do ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:182:14:186:3 | do ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:184:6:184:11 | After ... == ... [false] | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:184:6:184:11 | After ... == ... [false] | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:184:6:184:11 | After ... == ... [false] | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:184:6:184:11 | After ... == ... [false] | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:184:6:184:11 | After ... == ... [true] | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:188:30:188:35 | After ... != ... [true] | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:190:1:192:3 | Entry | cfg.rb:190:1:192:3 | Entry |
+| cfg.rb:194:11:194:23 | Entry | cfg.rb:194:11:194:23 | Entry |
+| cfg.rb:196:1:198:3 | Entry | cfg.rb:196:1:198:3 | Entry |
+| cfg.rb:200:9:200:32 | Entry | cfg.rb:200:9:200:32 | Entry |
+| cfg.rb:202:9:202:35 | Entry | cfg.rb:202:9:202:35 | Entry |
+| cfg.rb:205:4:205:5 | After call to == [false] | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:205:4:205:5 | After call to == [true] | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:42:8:42:8 | After 1 [match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:43:3:43:31 | After when ... [match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:43:8:43:8 | After 2 [match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:43:11:43:11 | After 3 [match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:43:14:43:14 | After 4 [match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:43:14:43:14 | After 4 [no-match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:48:8:48:13 | After ... == ... [match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:49:3:49:37 | After when ... [match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:49:8:49:13 | After ... == ... [match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:49:16:49:20 | After ... > ... [match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:60:17:60:22 | After ... < ... [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:60:17:60:22 | After ... < ... [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:75:4:75:8 | After ... < ... [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:75:17:75:43 | After elsif ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:75:23:75:28 | After ... > ... [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:75:23:75:28 | After ... > ... [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:90:5:90:5 | After defined? ... [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:90:5:90:5 | After defined? ... [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:113:14:113:19 | After ... > ... [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:113:14:113:19 | After ... > ... [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:136:1:136:3 | After ... / ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:136:12:136:29 | Before call to puts |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:172:8:172:14 | After ... == ... [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:172:8:172:14 | After ... == ... [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:174:18:174:23 | After ... == ... [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:174:18:174:23 | After ... == ... [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:176:7:176:12 | After ... > ... [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:179:30:179:36 | After ... == ... [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:184:6:184:11 | After ... == ... [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:184:6:184:11 | After ... == ... [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:188:30:188:35 | After ... != ... [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:205:4:205:5 | After call to == [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:205:4:205:5 | After call to == [true] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:205:4:205:5 | After if ... |
+| cfg.rb:205:15:205:23 | Entry | cfg.rb:205:15:205:23 | Entry |
+| cfg.rb:207:1:211:3 | Entry | cfg.rb:207:1:211:3 | Entry |
+| cfg.rb:208:15:210:5 | Entry | cfg.rb:208:15:210:5 | Entry |
+| cfg.rb:213:14:216:3 | Entry | cfg.rb:213:14:216:3 | Entry |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:1:1:22:4 | Entry |
+| constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [false] | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [false] |
+| constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [true] | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [true] |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:1:1:22:4 | Entry |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [false] |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [true] |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... |
+| constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [false] | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [false] |
+| constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [true] | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [true] |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:1:1:22:4 | Entry |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [false] |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [true] |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [false] |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [true] |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... |
+| constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [false] | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [false] |
+| constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [true] | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [true] |
+| constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... | constant_compound_assign.rb:1:1:22:4 | Entry |
+| constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [false] |
+| constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [true] |
+| constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... | constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... |
+| constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [false] |
+| constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [true] |
+| constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... | constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... |
+| constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [false] |
+| constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [true] |
+| constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... | constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... |
+| desugar.rb:1:1:3:3 | Entry | desugar.rb:1:1:3:3 | Entry |
+| desugar.rb:1:1:38:17 | Entry | desugar.rb:1:1:38:17 | Entry |
+| desugar.rb:5:1:7:3 | Entry | desugar.rb:5:1:7:3 | Entry |
+| desugar.rb:9:1:11:3 | Entry | desugar.rb:9:1:11:3 | Entry |
+| desugar.rb:13:1:15:3 | Entry | desugar.rb:13:1:15:3 | Entry |
+| desugar.rb:17:1:19:3 | Entry | desugar.rb:17:1:19:3 | Entry |
+| desugar.rb:21:1:23:3 | Entry | desugar.rb:21:1:23:3 | Entry |
+| desugar.rb:25:1:27:3 | Entry | desugar.rb:25:1:27:3 | Entry |
+| exit.rb:1:1:6:3 | Entry | exit.rb:1:1:6:3 | Entry |
+| exit.rb:1:1:6:3 | Exit | exit.rb:1:1:6:3 | Exit |
+| exit.rb:1:1:13:4 | Entry | exit.rb:1:1:13:4 | Entry |
+| exit.rb:2:6:2:10 | After ... > ... [false] | exit.rb:1:1:6:3 | Entry |
+| exit.rb:2:6:2:10 | After ... > ... [false] | exit.rb:2:6:2:10 | After ... > ... [false] |
+| exit.rb:2:6:2:10 | After ... > ... [true] | exit.rb:2:6:2:10 | After ... > ... [true] |
+| exit.rb:8:1:13:3 | Entry | exit.rb:8:1:13:3 | Entry |
+| exit.rb:8:1:13:3 | Exit | exit.rb:8:1:13:3 | Exit |
+| exit.rb:9:6:9:10 | After ... > ... [false] | exit.rb:8:1:13:3 | Entry |
+| exit.rb:9:6:9:10 | After ... > ... [false] | exit.rb:9:6:9:10 | After ... > ... [false] |
+| exit.rb:9:6:9:10 | After ... > ... [true] | exit.rb:9:6:9:10 | After ... > ... [true] |
+| heredoc.rb:1:1:7:3 | Entry | heredoc.rb:1:1:7:3 | Entry |
+| heredoc.rb:1:1:7:4 | Entry | heredoc.rb:1:1:7:4 | Entry |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:1:1:9:3 | Entry |
+| ifs.rb:1:1:58:4 | Entry | ifs.rb:1:1:58:4 | Entry |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:1:1:9:3 | Entry |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:2:3:8:5 | After if ... |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:2:6:2:10 | After ... > ... [false] |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:2:6:2:10 | After ... > ... [true] |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:4:3:7:35 | After elsif ... |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:4:9:4:14 | After ... <= ... [false] |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:4:9:4:14 | After ... <= ... [true] |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:4:9:4:24 | After ... and ... [false] |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:4:9:4:38 | After ... and ... [false] |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:4:20:4:24 | After ... > ... [false] |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:4:20:4:24 | After ... > ... [true] |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:4:32:4:37 | After ... == ... [false] |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:4:32:4:37 | After ... == ... [true] |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:2:6:2:10 | After ... > ... [false] |
+| ifs.rb:2:6:2:10 | After ... > ... [true] | ifs.rb:2:6:2:10 | After ... > ... [true] |
+| ifs.rb:4:3:7:35 | After elsif ... | ifs.rb:2:6:2:10 | After ... > ... [false] |
+| ifs.rb:4:3:7:35 | After elsif ... | ifs.rb:4:3:7:35 | After elsif ... |
+| ifs.rb:4:3:7:35 | After elsif ... | ifs.rb:4:9:4:14 | After ... <= ... [false] |
+| ifs.rb:4:3:7:35 | After elsif ... | ifs.rb:4:9:4:14 | After ... <= ... [true] |
+| ifs.rb:4:3:7:35 | After elsif ... | ifs.rb:4:9:4:24 | After ... and ... [false] |
+| ifs.rb:4:3:7:35 | After elsif ... | ifs.rb:4:9:4:38 | After ... and ... [false] |
+| ifs.rb:4:3:7:35 | After elsif ... | ifs.rb:4:20:4:24 | After ... > ... [false] |
+| ifs.rb:4:3:7:35 | After elsif ... | ifs.rb:4:20:4:24 | After ... > ... [true] |
+| ifs.rb:4:3:7:35 | After elsif ... | ifs.rb:4:32:4:37 | After ... == ... [false] |
+| ifs.rb:4:3:7:35 | After elsif ... | ifs.rb:4:32:4:37 | After ... == ... [true] |
+| ifs.rb:4:9:4:14 | After ... <= ... [false] | ifs.rb:4:9:4:14 | After ... <= ... [false] |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:4:9:4:14 | After ... <= ... [true] |
+| ifs.rb:4:9:4:24 | After ... and ... [false] | ifs.rb:4:9:4:14 | After ... <= ... [false] |
+| ifs.rb:4:9:4:24 | After ... and ... [false] | ifs.rb:4:9:4:24 | After ... and ... [false] |
+| ifs.rb:4:9:4:24 | After ... and ... [false] | ifs.rb:4:20:4:24 | After ... > ... [false] |
+| ifs.rb:4:9:4:38 | After ... and ... [false] | ifs.rb:4:9:4:14 | After ... <= ... [false] |
+| ifs.rb:4:9:4:38 | After ... and ... [false] | ifs.rb:4:9:4:24 | After ... and ... [false] |
+| ifs.rb:4:9:4:38 | After ... and ... [false] | ifs.rb:4:9:4:38 | After ... and ... [false] |
+| ifs.rb:4:9:4:38 | After ... and ... [false] | ifs.rb:4:20:4:24 | After ... > ... [false] |
+| ifs.rb:4:9:4:38 | After ... and ... [false] | ifs.rb:4:32:4:37 | After ... == ... [true] |
+| ifs.rb:4:20:4:24 | After ... > ... [false] | ifs.rb:4:20:4:24 | After ... > ... [false] |
+| ifs.rb:4:20:4:24 | After ... > ... [true] | ifs.rb:4:20:4:24 | After ... > ... [true] |
+| ifs.rb:4:32:4:37 | After ... == ... [false] | ifs.rb:4:32:4:37 | After ... == ... [false] |
+| ifs.rb:4:32:4:37 | After ... == ... [true] | ifs.rb:4:32:4:37 | After ... == ... [true] |
+| ifs.rb:11:1:16:3 | Entry | ifs.rb:11:1:16:3 | Entry |
+| ifs.rb:11:1:16:3 | Normal Exit | ifs.rb:11:1:16:3 | Entry |
+| ifs.rb:11:1:16:3 | Normal Exit | ifs.rb:11:1:16:3 | Normal Exit |
+| ifs.rb:11:1:16:3 | Normal Exit | ifs.rb:12:6:12:6 | After b [false] |
+| ifs.rb:11:1:16:3 | Normal Exit | ifs.rb:12:6:12:6 | After b [true] |
+| ifs.rb:12:6:12:6 | After b [false] | ifs.rb:12:6:12:6 | After b [false] |
+| ifs.rb:12:6:12:6 | After b [true] | ifs.rb:12:6:12:6 | After b [true] |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:18:1:26:3 | Entry |
+| ifs.rb:19:3:24:5 | After if ... | ifs.rb:18:1:26:3 | Entry |
+| ifs.rb:19:3:24:5 | After if ... | ifs.rb:19:3:24:5 | After if ... |
+| ifs.rb:19:3:24:5 | After if ... | ifs.rb:19:6:19:10 | After ... < ... [false] |
+| ifs.rb:19:3:24:5 | After if ... | ifs.rb:19:6:19:10 | After ... < ... [true] |
+| ifs.rb:19:3:24:5 | After if ... | ifs.rb:21:5:23:7 | After if ... |
+| ifs.rb:19:3:24:5 | After if ... | ifs.rb:21:8:21:13 | After ... > ... [false] |
+| ifs.rb:19:3:24:5 | After if ... | ifs.rb:21:8:21:13 | After ... > ... [true] |
+| ifs.rb:19:6:19:10 | After ... < ... [false] | ifs.rb:19:6:19:10 | After ... < ... [false] |
+| ifs.rb:19:6:19:10 | After ... < ... [true] | ifs.rb:19:6:19:10 | After ... < ... [true] |
+| ifs.rb:21:5:23:7 | After if ... | ifs.rb:19:6:19:10 | After ... < ... [true] |
+| ifs.rb:21:5:23:7 | After if ... | ifs.rb:21:5:23:7 | After if ... |
+| ifs.rb:21:5:23:7 | After if ... | ifs.rb:21:8:21:13 | After ... > ... [false] |
+| ifs.rb:21:5:23:7 | After if ... | ifs.rb:21:8:21:13 | After ... > ... [true] |
+| ifs.rb:21:8:21:13 | After ... > ... [false] | ifs.rb:21:8:21:13 | After ... > ... [false] |
+| ifs.rb:21:8:21:13 | After ... > ... [true] | ifs.rb:21:8:21:13 | After ... > ... [true] |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:28:1:30:3 | Entry |
+| ifs.rb:29:10:29:51 | After ... ? ... : ... | ifs.rb:28:1:30:3 | Entry |
+| ifs.rb:29:10:29:51 | After ... ? ... : ... | ifs.rb:29:10:29:51 | After ... ? ... : ... |
+| ifs.rb:29:10:29:51 | After ... ? ... : ... | ifs.rb:29:11:29:12 | After b1 [false] |
+| ifs.rb:29:10:29:51 | After ... ? ... : ... | ifs.rb:29:11:29:12 | After b1 [true] |
+| ifs.rb:29:10:29:51 | After ... ? ... : ... | ifs.rb:29:11:29:22 | After ... ? ... : ... [false] |
+| ifs.rb:29:10:29:51 | After ... ? ... : ... | ifs.rb:29:11:29:22 | After ... ? ... : ... [true] |
+| ifs.rb:29:10:29:51 | After ... ? ... : ... | ifs.rb:29:16:29:17 | After b2 [false] |
+| ifs.rb:29:10:29:51 | After ... ? ... : ... | ifs.rb:29:16:29:17 | After b2 [true] |
+| ifs.rb:29:10:29:51 | After ... ? ... : ... | ifs.rb:29:21:29:22 | After b3 [false] |
+| ifs.rb:29:10:29:51 | After ... ? ... : ... | ifs.rb:29:21:29:22 | After b3 [true] |
+| ifs.rb:29:11:29:12 | After b1 [false] | ifs.rb:29:11:29:12 | After b1 [false] |
+| ifs.rb:29:11:29:12 | After b1 [true] | ifs.rb:29:11:29:12 | After b1 [true] |
+| ifs.rb:29:11:29:22 | After ... ? ... : ... [false] | ifs.rb:29:11:29:22 | After ... ? ... : ... [false] |
+| ifs.rb:29:11:29:22 | After ... ? ... : ... [false] | ifs.rb:29:16:29:17 | After b2 [false] |
+| ifs.rb:29:11:29:22 | After ... ? ... : ... [false] | ifs.rb:29:21:29:22 | After b3 [false] |
+| ifs.rb:29:11:29:22 | After ... ? ... : ... [true] | ifs.rb:29:11:29:22 | After ... ? ... : ... [true] |
+| ifs.rb:29:11:29:22 | After ... ? ... : ... [true] | ifs.rb:29:16:29:17 | After b2 [true] |
+| ifs.rb:29:11:29:22 | After ... ? ... : ... [true] | ifs.rb:29:21:29:22 | After b3 [true] |
+| ifs.rb:29:16:29:17 | After b2 [false] | ifs.rb:29:16:29:17 | After b2 [false] |
+| ifs.rb:29:16:29:17 | After b2 [true] | ifs.rb:29:16:29:17 | After b2 [true] |
+| ifs.rb:29:21:29:22 | After b3 [false] | ifs.rb:29:21:29:22 | After b3 [false] |
+| ifs.rb:29:21:29:22 | After b3 [true] | ifs.rb:29:21:29:22 | After b3 [true] |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:32:1:34:3 | Entry |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:32:1:34:3 | Entry |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:3:33:100 | After if ... |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:7:33:48 | After if ... [false] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:7:33:48 | After if ... [true] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:10:33:11 | After b1 [false] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:10:33:11 | After b1 [true] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:18:33:19 | After b2 [false] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:18:33:19 | After b2 [true] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:21:33:44 | After elsif ... [false] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:21:33:44 | After elsif ... [true] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:27:33:28 | After b3 [false] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:27:33:28 | After b3 [true] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:35:33:36 | After b4 [false] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:35:33:36 | After b4 [true] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:43:33:44 | After b5 [false] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:43:33:44 | After b5 [true] |
+| ifs.rb:33:7:33:48 | After if ... [false] | ifs.rb:33:7:33:48 | After if ... [false] |
+| ifs.rb:33:7:33:48 | After if ... [false] | ifs.rb:33:18:33:19 | After b2 [false] |
+| ifs.rb:33:7:33:48 | After if ... [false] | ifs.rb:33:21:33:44 | After elsif ... [false] |
+| ifs.rb:33:7:33:48 | After if ... [false] | ifs.rb:33:35:33:36 | After b4 [false] |
+| ifs.rb:33:7:33:48 | After if ... [false] | ifs.rb:33:43:33:44 | After b5 [false] |
+| ifs.rb:33:7:33:48 | After if ... [true] | ifs.rb:33:7:33:48 | After if ... [true] |
+| ifs.rb:33:7:33:48 | After if ... [true] | ifs.rb:33:18:33:19 | After b2 [true] |
+| ifs.rb:33:7:33:48 | After if ... [true] | ifs.rb:33:21:33:44 | After elsif ... [true] |
+| ifs.rb:33:7:33:48 | After if ... [true] | ifs.rb:33:35:33:36 | After b4 [true] |
+| ifs.rb:33:7:33:48 | After if ... [true] | ifs.rb:33:43:33:44 | After b5 [true] |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:10:33:11 | After b1 [false] |
+| ifs.rb:33:10:33:11 | After b1 [true] | ifs.rb:33:10:33:11 | After b1 [true] |
+| ifs.rb:33:18:33:19 | After b2 [false] | ifs.rb:33:18:33:19 | After b2 [false] |
+| ifs.rb:33:18:33:19 | After b2 [true] | ifs.rb:33:18:33:19 | After b2 [true] |
+| ifs.rb:33:21:33:44 | After elsif ... [false] | ifs.rb:33:21:33:44 | After elsif ... [false] |
+| ifs.rb:33:21:33:44 | After elsif ... [false] | ifs.rb:33:35:33:36 | After b4 [false] |
+| ifs.rb:33:21:33:44 | After elsif ... [false] | ifs.rb:33:43:33:44 | After b5 [false] |
+| ifs.rb:33:21:33:44 | After elsif ... [true] | ifs.rb:33:21:33:44 | After elsif ... [true] |
+| ifs.rb:33:21:33:44 | After elsif ... [true] | ifs.rb:33:35:33:36 | After b4 [true] |
+| ifs.rb:33:21:33:44 | After elsif ... [true] | ifs.rb:33:43:33:44 | After b5 [true] |
+| ifs.rb:33:27:33:28 | After b3 [false] | ifs.rb:33:27:33:28 | After b3 [false] |
+| ifs.rb:33:27:33:28 | After b3 [true] | ifs.rb:33:27:33:28 | After b3 [true] |
+| ifs.rb:33:35:33:36 | After b4 [false] | ifs.rb:33:35:33:36 | After b4 [false] |
+| ifs.rb:33:35:33:36 | After b4 [true] | ifs.rb:33:35:33:36 | After b4 [true] |
+| ifs.rb:33:43:33:44 | After b5 [false] | ifs.rb:33:43:33:44 | After b5 [false] |
+| ifs.rb:33:43:33:44 | After b5 [true] | ifs.rb:33:43:33:44 | After b5 [true] |
+| ifs.rb:36:1:38:3 | Entry | ifs.rb:36:1:38:3 | Entry |
+| ifs.rb:36:1:38:17 | After ... unless ... | ifs.rb:1:1:58:4 | Entry |
+| ifs.rb:36:1:38:17 | After ... unless ... | ifs.rb:36:1:38:17 | After ... unless ... |
+| ifs.rb:36:1:38:17 | After ... unless ... | ifs.rb:38:12:38:17 | After ... == ... [false] |
+| ifs.rb:36:1:38:17 | After ... unless ... | ifs.rb:38:12:38:17 | After ... == ... [true] |
+| ifs.rb:38:12:38:17 | After ... == ... [false] | ifs.rb:38:12:38:17 | After ... == ... [false] |
+| ifs.rb:38:12:38:17 | After ... == ... [true] | ifs.rb:38:12:38:17 | After ... == ... [true] |
+| ifs.rb:40:1:44:3 | Entry | ifs.rb:40:1:44:3 | Entry |
+| ifs.rb:46:1:52:3 | Entry | ifs.rb:46:1:52:3 | Entry |
+| ifs.rb:47:3:50:5 | After if ... | ifs.rb:46:1:52:3 | Entry |
+| ifs.rb:47:3:50:5 | After if ... | ifs.rb:47:3:50:5 | After if ... |
+| ifs.rb:47:3:50:5 | After if ... | ifs.rb:47:6:47:6 | After b [false] |
+| ifs.rb:47:3:50:5 | After if ... | ifs.rb:47:6:47:6 | After b [true] |
+| ifs.rb:47:6:47:6 | After b [false] | ifs.rb:47:6:47:6 | After b [false] |
+| ifs.rb:47:6:47:6 | After b [true] | ifs.rb:47:6:47:6 | After b [true] |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:54:1:58:3 | Entry |
+| ifs.rb:55:3:57:5 | After if ... | ifs.rb:54:1:58:3 | Entry |
+| ifs.rb:55:3:57:5 | After if ... | ifs.rb:55:3:57:5 | After if ... |
+| ifs.rb:55:3:57:5 | After if ... | ifs.rb:55:7:55:8 | After b1 [false] |
+| ifs.rb:55:3:57:5 | After if ... | ifs.rb:55:7:55:8 | After b1 [true] |
+| ifs.rb:55:3:57:5 | After if ... | ifs.rb:55:7:55:14 | After ... \|\| ... [true] |
+| ifs.rb:55:3:57:5 | After if ... | ifs.rb:55:13:55:14 | After b2 [false] |
+| ifs.rb:55:3:57:5 | After if ... | ifs.rb:55:13:55:14 | After b2 [true] |
+| ifs.rb:55:7:55:8 | After b1 [false] | ifs.rb:55:7:55:8 | After b1 [false] |
+| ifs.rb:55:7:55:8 | After b1 [true] | ifs.rb:55:7:55:8 | After b1 [true] |
+| ifs.rb:55:7:55:14 | After ... \|\| ... [true] | ifs.rb:55:7:55:8 | After b1 [true] |
+| ifs.rb:55:7:55:14 | After ... \|\| ... [true] | ifs.rb:55:7:55:14 | After ... \|\| ... [true] |
+| ifs.rb:55:7:55:14 | After ... \|\| ... [true] | ifs.rb:55:13:55:14 | After b2 [true] |
+| ifs.rb:55:13:55:14 | After b2 [false] | ifs.rb:55:13:55:14 | After b2 [false] |
+| ifs.rb:55:13:55:14 | After b2 [true] | ifs.rb:55:13:55:14 | After b2 [true] |
+| loops.rb:1:1:6:3 | Entry | loops.rb:1:1:6:3 | Entry |
+| loops.rb:1:1:33:4 | Entry | loops.rb:1:1:33:4 | Entry |
+| loops.rb:2:3:5:5 | [LoopHeader] while ... | loops.rb:1:1:6:3 | Entry |
+| loops.rb:2:3:5:5 | [LoopHeader] while ... | loops.rb:2:3:5:5 | [LoopHeader] while ... |
+| loops.rb:2:3:5:5 | [LoopHeader] while ... | loops.rb:2:9:2:14 | After ... >= ... [true] |
+| loops.rb:2:9:2:14 | After ... >= ... [false] | loops.rb:1:1:6:3 | Entry |
+| loops.rb:2:9:2:14 | After ... >= ... [false] | loops.rb:2:3:5:5 | [LoopHeader] while ... |
+| loops.rb:2:9:2:14 | After ... >= ... [false] | loops.rb:2:9:2:14 | After ... >= ... [false] |
+| loops.rb:2:9:2:14 | After ... >= ... [false] | loops.rb:2:9:2:14 | After ... >= ... [true] |
+| loops.rb:2:9:2:14 | After ... >= ... [true] | loops.rb:2:9:2:14 | After ... >= ... [true] |
+| loops.rb:8:1:22:3 | Entry | loops.rb:8:1:22:3 | Entry |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:8:1:22:3 | Entry |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:9:3:20:5 | After while ... |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:9:3:20:5 | [LoopHeader] while ... |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:9:9:9:14 | After ... >= ... [false] |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:9:9:9:14 | After ... >= ... [true] |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:9:15:20:5 | do ... |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:12:8:12:14 | After ... > ... [false] |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:12:8:12:14 | After ... > ... [true] |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:14:11:14:16 | After ... > ... [false] |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:14:11:14:16 | After ... > ... [true] |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:16:11:16:16 | After ... > ... [false] |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:16:11:16:16 | After ... > ... [true] |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:8:1:22:3 | Entry |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:9:3:20:5 | [LoopHeader] while ... |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:14:11:14:16 | After ... > ... [true] |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:16:11:16:16 | After ... > ... [false] |
+| loops.rb:9:9:9:14 | After ... >= ... [false] | loops.rb:9:9:9:14 | After ... >= ... [false] |
+| loops.rb:9:9:9:14 | After ... >= ... [true] | loops.rb:9:9:9:14 | After ... >= ... [true] |
+| loops.rb:9:15:20:5 | do ... | loops.rb:9:9:9:14 | After ... >= ... [true] |
+| loops.rb:9:15:20:5 | do ... | loops.rb:9:15:20:5 | do ... |
+| loops.rb:9:15:20:5 | do ... | loops.rb:16:11:16:16 | After ... > ... [true] |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:12:8:12:14 | After ... > ... [false] |
+| loops.rb:12:8:12:14 | After ... > ... [true] | loops.rb:12:8:12:14 | After ... > ... [true] |
+| loops.rb:14:11:14:16 | After ... > ... [false] | loops.rb:14:11:14:16 | After ... > ... [false] |
+| loops.rb:14:11:14:16 | After ... > ... [true] | loops.rb:14:11:14:16 | After ... > ... [true] |
+| loops.rb:16:11:16:16 | After ... > ... [false] | loops.rb:16:11:16:16 | After ... > ... [false] |
+| loops.rb:16:11:16:16 | After ... > ... [true] | loops.rb:16:11:16:16 | After ... > ... [true] |
+| loops.rb:24:1:28:3 | Entry | loops.rb:24:1:28:3 | Entry |
+| loops.rb:25:16:27:5 | Entry | loops.rb:25:16:27:5 | Entry |
+| loops.rb:30:1:33:3 | Entry | loops.rb:30:1:33:3 | Entry |
+| loops.rb:31:3:32:5 | [LoopHeader] while ... | loops.rb:30:1:33:3 | Entry |
+| loops.rb:31:3:32:5 | [LoopHeader] while ... | loops.rb:31:3:32:5 | [LoopHeader] while ... |
+| loops.rb:31:3:32:5 | [LoopHeader] while ... | loops.rb:31:9:31:13 | After ... < ... [true] |
+| loops.rb:31:9:31:13 | After ... < ... [false] | loops.rb:30:1:33:3 | Entry |
+| loops.rb:31:9:31:13 | After ... < ... [false] | loops.rb:31:3:32:5 | [LoopHeader] while ... |
+| loops.rb:31:9:31:13 | After ... < ... [false] | loops.rb:31:9:31:13 | After ... < ... [false] |
+| loops.rb:31:9:31:13 | After ... < ... [false] | loops.rb:31:9:31:13 | After ... < ... [true] |
+| loops.rb:31:9:31:13 | After ... < ... [true] | loops.rb:31:9:31:13 | After ... < ... [true] |
+| raise.rb:1:1:182:4 | Entry | raise.rb:1:1:182:4 | Entry |
+| raise.rb:7:1:12:3 | Entry | raise.rb:7:1:12:3 | Entry |
+| raise.rb:7:1:12:3 | Exit | raise.rb:7:1:12:3 | Exit |
+| raise.rb:8:6:8:10 | After ... > ... [false] | raise.rb:7:1:12:3 | Entry |
+| raise.rb:8:6:8:10 | After ... > ... [false] | raise.rb:8:6:8:10 | After ... > ... [false] |
+| raise.rb:8:6:8:10 | After ... > ... [true] | raise.rb:8:6:8:10 | After ... > ... [true] |
+| raise.rb:14:1:23:3 | Entry | raise.rb:14:1:23:3 | Entry |
+| raise.rb:14:1:23:3 | Exit | raise.rb:14:1:23:3 | Exit |
+| raise.rb:15:3:21:5 | After begin ...  | raise.rb:14:1:23:3 | Entry |
+| raise.rb:15:3:21:5 | After begin ...  | raise.rb:15:3:21:5 | After begin ...  |
+| raise.rb:15:3:21:5 | After begin ...  | raise.rb:16:8:16:8 | After b [false] |
+| raise.rb:15:3:21:5 | After begin ...  | raise.rb:16:8:16:8 | After b [true] |
+| raise.rb:15:3:21:5 | After begin ...  | raise.rb:19:10:19:19 | After ExceptionA [match] |
+| raise.rb:16:8:16:8 | After b [false] | raise.rb:16:8:16:8 | After b [false] |
+| raise.rb:16:8:16:8 | After b [true] | raise.rb:16:8:16:8 | After b [true] |
+| raise.rb:19:10:19:19 | After ExceptionA [match] | raise.rb:16:8:16:8 | After b [true] |
+| raise.rb:19:10:19:19 | After ExceptionA [match] | raise.rb:19:10:19:19 | After ExceptionA [match] |
+| raise.rb:19:10:19:19 | After ExceptionA [no-match] | raise.rb:19:10:19:19 | After ExceptionA [no-match] |
+| raise.rb:25:1:34:3 | Entry | raise.rb:25:1:34:3 | Entry |
+| raise.rb:26:3:32:5 | After begin ...  | raise.rb:25:1:34:3 | Entry |
+| raise.rb:26:3:32:5 | After begin ...  | raise.rb:26:3:32:5 | After begin ...  |
+| raise.rb:26:3:32:5 | After begin ...  | raise.rb:27:8:27:8 | After b [false] |
+| raise.rb:26:3:32:5 | After begin ...  | raise.rb:27:8:27:8 | After b [true] |
+| raise.rb:27:8:27:8 | After b [false] | raise.rb:27:8:27:8 | After b [false] |
+| raise.rb:27:8:27:8 | After b [true] | raise.rb:27:8:27:8 | After b [true] |
+| raise.rb:36:1:45:3 | Entry | raise.rb:36:1:45:3 | Entry |
+| raise.rb:37:3:43:5 | After begin ...  | raise.rb:36:1:45:3 | Entry |
+| raise.rb:37:3:43:5 | After begin ...  | raise.rb:37:3:43:5 | After begin ...  |
+| raise.rb:37:3:43:5 | After begin ...  | raise.rb:38:8:38:8 | After b [false] |
+| raise.rb:37:3:43:5 | After begin ...  | raise.rb:38:8:38:8 | After b [true] |
+| raise.rb:38:8:38:8 | After b [false] | raise.rb:38:8:38:8 | After b [false] |
+| raise.rb:38:8:38:8 | After b [true] | raise.rb:38:8:38:8 | After b [true] |
+| raise.rb:47:1:55:3 | Entry | raise.rb:47:1:55:3 | Entry |
+| raise.rb:48:3:53:5 | After begin ...  | raise.rb:47:1:55:3 | Entry |
+| raise.rb:48:3:53:5 | After begin ...  | raise.rb:48:3:53:5 | After begin ...  |
+| raise.rb:48:3:53:5 | After begin ...  | raise.rb:49:8:49:8 | After b [false] |
+| raise.rb:48:3:53:5 | After begin ...  | raise.rb:49:8:49:8 | After b [true] |
+| raise.rb:49:8:49:8 | After b [false] | raise.rb:49:8:49:8 | After b [false] |
+| raise.rb:49:8:49:8 | After b [true] | raise.rb:49:8:49:8 | After b [true] |
+| raise.rb:57:1:66:3 | Entry | raise.rb:57:1:66:3 | Entry |
+| raise.rb:57:1:66:3 | Exit | raise.rb:57:1:66:3 | Exit |
+| raise.rb:58:3:64:5 | After begin ...  | raise.rb:57:1:66:3 | Entry |
+| raise.rb:58:3:64:5 | After begin ...  | raise.rb:58:3:64:5 | After begin ...  |
+| raise.rb:58:3:64:5 | After begin ...  | raise.rb:59:8:59:8 | After b [false] |
+| raise.rb:58:3:64:5 | After begin ...  | raise.rb:59:8:59:8 | After b [true] |
+| raise.rb:58:3:64:5 | After begin ...  | raise.rb:62:10:62:31 | After ..., ... [match] |
+| raise.rb:59:8:59:8 | After b [false] | raise.rb:59:8:59:8 | After b [false] |
+| raise.rb:59:8:59:8 | After b [true] | raise.rb:59:8:59:8 | After b [true] |
+| raise.rb:62:10:62:31 | After ..., ... [match] | raise.rb:59:8:59:8 | After b [true] |
+| raise.rb:62:10:62:31 | After ..., ... [match] | raise.rb:62:10:62:31 | After ..., ... [match] |
+| raise.rb:62:10:62:31 | After ..., ... [no-match] | raise.rb:62:10:62:31 | After ..., ... [no-match] |
+| raise.rb:68:1:77:3 | Entry | raise.rb:68:1:77:3 | Entry |
+| raise.rb:68:1:77:3 | Exceptional Exit | raise.rb:68:1:77:3 | Exceptional Exit |
+| raise.rb:68:1:77:3 | Exit | raise.rb:68:1:77:3 | Exit |
+| raise.rb:68:1:77:3 | Normal Exit | raise.rb:68:1:77:3 | Entry |
+| raise.rb:68:1:77:3 | Normal Exit | raise.rb:68:1:77:3 | Normal Exit |
+| raise.rb:68:1:77:3 | Normal Exit | raise.rb:69:3:76:15 | After ... |
+| raise.rb:68:1:77:3 | Normal Exit | raise.rb:69:6:69:10 | After ... > ... [false] |
+| raise.rb:68:1:77:3 | Normal Exit | raise.rb:69:6:69:10 | After ... > ... [true] |
+| raise.rb:68:1:77:3 | Normal Exit | raise.rb:71:9:71:13 | After ... < ... [false] |
+| raise.rb:68:1:77:3 | Normal Exit | raise.rb:71:9:71:13 | After ... < ... [true] |
+| raise.rb:68:1:77:3 | Normal Exit | raise.rb:74:3:74:20 | After call to puts |
+| raise.rb:68:1:77:3 | Normal Exit | raise.rb:75:1:76:15 | ensure ... |
+| raise.rb:69:3:76:15 | After ... | raise.rb:69:3:76:15 | After ... |
+| raise.rb:69:6:69:10 | After ... > ... [false] | raise.rb:69:6:69:10 | After ... > ... [false] |
+| raise.rb:69:6:69:10 | After ... > ... [true] | raise.rb:69:6:69:10 | After ... > ... [true] |
+| raise.rb:71:9:71:13 | After ... < ... [false] | raise.rb:71:9:71:13 | After ... < ... [false] |
+| raise.rb:71:9:71:13 | After ... < ... [true] | raise.rb:71:9:71:13 | After ... < ... [true] |
+| raise.rb:74:3:74:20 | After call to puts | raise.rb:74:3:74:20 | After call to puts |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:68:1:77:3 | Entry |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:69:6:69:10 | After ... > ... [false] |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:69:6:69:10 | After ... > ... [true] |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:71:9:71:13 | After ... < ... [false] |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:71:9:71:13 | After ... < ... [true] |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:74:3:74:20 | After call to puts |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:75:1:76:15 | ensure ... |
+| raise.rb:79:1:92:3 | Entry | raise.rb:79:1:92:3 | Entry |
+| raise.rb:79:1:92:3 | Exceptional Exit | raise.rb:79:1:92:3 | Exceptional Exit |
+| raise.rb:79:1:92:3 | Exit | raise.rb:79:1:92:3 | Exit |
+| raise.rb:79:1:92:3 | Normal Exit | raise.rb:79:1:92:3 | Entry |
+| raise.rb:79:1:92:3 | Normal Exit | raise.rb:79:1:92:3 | Normal Exit |
+| raise.rb:79:1:92:3 | Normal Exit | raise.rb:81:3:90:5 | After begin ...  |
+| raise.rb:79:1:92:3 | Normal Exit | raise.rb:82:8:82:12 | After ... > ... [false] |
+| raise.rb:79:1:92:3 | Normal Exit | raise.rb:82:8:82:12 | After ... > ... [true] |
+| raise.rb:79:1:92:3 | Normal Exit | raise.rb:84:11:84:15 | After ... < ... [false] |
+| raise.rb:79:1:92:3 | Normal Exit | raise.rb:84:11:84:15 | After ... < ... [true] |
+| raise.rb:79:1:92:3 | Normal Exit | raise.rb:87:5:87:22 | After call to puts |
+| raise.rb:79:1:92:3 | Normal Exit | raise.rb:88:3:89:17 | ensure ... |
+| raise.rb:81:3:90:5 | After begin ...  | raise.rb:81:3:90:5 | After begin ...  |
+| raise.rb:82:8:82:12 | After ... > ... [false] | raise.rb:82:8:82:12 | After ... > ... [false] |
+| raise.rb:82:8:82:12 | After ... > ... [true] | raise.rb:82:8:82:12 | After ... > ... [true] |
+| raise.rb:84:11:84:15 | After ... < ... [false] | raise.rb:84:11:84:15 | After ... < ... [false] |
+| raise.rb:84:11:84:15 | After ... < ... [true] | raise.rb:84:11:84:15 | After ... < ... [true] |
+| raise.rb:87:5:87:22 | After call to puts | raise.rb:87:5:87:22 | After call to puts |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:79:1:92:3 | Entry |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:82:8:82:12 | After ... > ... [false] |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:82:8:82:12 | After ... > ... [true] |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:84:11:84:15 | After ... < ... [false] |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:84:11:84:15 | After ... < ... [true] |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:87:5:87:22 | After call to puts |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:88:3:89:17 | ensure ... |
+| raise.rb:94:1:119:3 | Entry | raise.rb:94:1:119:3 | Entry |
+| raise.rb:94:1:119:3 | Exceptional Exit | raise.rb:94:1:119:3 | Exceptional Exit |
+| raise.rb:94:1:119:3 | Exit | raise.rb:94:1:119:3 | Exit |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:94:1:119:3 | Entry |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:94:1:119:3 | Normal Exit |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:95:3:95:17 | After call to puts |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:95:3:118:5 | After ... |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:96:3:112:5 | After begin ...  |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:97:8:97:12 | After ... > ... [false] |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:97:8:97:12 | After ... > ... [true] |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:99:11:99:15 | After ... < ... [false] |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:99:11:99:15 | After ... < ... [true] |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:102:5:102:22 | After call to puts |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:103:3:111:7 | ensure ... |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:104:5:104:23 | After call to puts |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:105:5:111:7 | After begin ...  |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:106:10:106:11 | After b1 [false] |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:106:10:106:11 | After b1 [true] |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:109:5:110:25 | ensure ... |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:110:7:110:25 | After call to puts |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:113:3:113:15 | After call to puts |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:114:1:118:5 | ensure ... |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:116:6:116:7 | After b2 [false] |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:95:3:95:17 | After call to puts |
+| raise.rb:95:3:118:5 | After ... | raise.rb:95:3:118:5 | After ... |
+| raise.rb:96:3:112:5 | After begin ...  | raise.rb:96:3:112:5 | After begin ...  |
+| raise.rb:97:8:97:12 | After ... > ... [false] | raise.rb:97:8:97:12 | After ... > ... [false] |
+| raise.rb:97:8:97:12 | After ... > ... [true] | raise.rb:97:8:97:12 | After ... > ... [true] |
+| raise.rb:99:11:99:15 | After ... < ... [false] | raise.rb:99:11:99:15 | After ... < ... [false] |
+| raise.rb:99:11:99:15 | After ... < ... [true] | raise.rb:99:11:99:15 | After ... < ... [true] |
+| raise.rb:102:5:102:22 | After call to puts | raise.rb:102:5:102:22 | After call to puts |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:95:3:95:17 | After call to puts |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:97:8:97:12 | After ... > ... [false] |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:97:8:97:12 | After ... > ... [true] |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:99:11:99:15 | After ... < ... [false] |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:99:11:99:15 | After ... < ... [true] |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:102:5:102:22 | After call to puts |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:103:3:111:7 | ensure ... |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:104:5:104:23 | After call to puts |
+| raise.rb:105:5:111:7 | After begin ...  | raise.rb:105:5:111:7 | After begin ...  |
+| raise.rb:106:10:106:11 | After b1 [false] | raise.rb:106:10:106:11 | After b1 [false] |
+| raise.rb:106:10:106:11 | After b1 [true] | raise.rb:106:10:106:11 | After b1 [true] |
+| raise.rb:109:5:110:25 | ensure ... | raise.rb:104:5:104:23 | After call to puts |
+| raise.rb:109:5:110:25 | ensure ... | raise.rb:106:10:106:11 | After b1 [false] |
+| raise.rb:109:5:110:25 | ensure ... | raise.rb:106:10:106:11 | After b1 [true] |
 | raise.rb:109:5:110:25 | ensure ... | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:115:3:115:22 | [ensure: exception] self |
-| raise.rb:115:3:115:22 | self | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:115:3:115:22 | self | raise.rb:104:5:104:23 | self |
-| raise.rb:115:3:115:22 | self | raise.rb:106:7:108:9 | if ... |
-| raise.rb:115:3:115:22 | self | raise.rb:106:10:106:11 | b1 |
-| raise.rb:115:3:115:22 | self | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:115:3:115:22 | self | raise.rb:115:3:115:22 | self |
-| raise.rb:116:3:118:5 | [ensure: exception] if ... | raise.rb:116:3:118:5 | [ensure: exception] if ... |
-| raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:106:7:108:9 | [ensure: return] if ... |
-| raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:106:10:106:11 | [ensure: return] b1 |
-| raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
-| raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:116:3:118:5 | [ensure: return] if ... |
-| raise.rb:116:3:118:5 | if ... | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:116:3:118:5 | if ... | raise.rb:104:5:104:23 | self |
-| raise.rb:116:3:118:5 | if ... | raise.rb:106:7:108:9 | if ... |
-| raise.rb:116:3:118:5 | if ... | raise.rb:106:10:106:11 | b1 |
-| raise.rb:116:3:118:5 | if ... | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:116:3:118:5 | if ... | raise.rb:115:3:115:22 | self |
-| raise.rb:116:3:118:5 | if ... | raise.rb:116:3:118:5 | if ... |
-| raise.rb:117:5:117:22 | [ensure: exception] self | raise.rb:117:5:117:22 | [ensure: exception] self |
-| raise.rb:117:5:117:22 | [ensure: return] self | raise.rb:117:5:117:22 | [ensure: return] self |
-| raise.rb:117:5:117:22 | self | raise.rb:117:5:117:22 | self |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:121:1:126:3 | enter m10 |
-| raise.rb:121:1:126:3 | exit m10 | raise.rb:121:1:126:3 | exit m10 |
-| raise.rb:121:14:121:30 | self | raise.rb:121:14:121:30 | self |
-| raise.rb:125:3:125:51 | self | raise.rb:121:1:126:3 | enter m10 |
-| raise.rb:125:3:125:51 | self | raise.rb:125:3:125:51 | self |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:128:1:140:3 | enter m11 |
-| raise.rb:128:1:140:3 | exit m11 | raise.rb:128:1:140:3 | exit m11 |
-| raise.rb:130:5:132:7 | if ... | raise.rb:130:5:132:7 | if ... |
-| raise.rb:131:7:131:22 | self | raise.rb:131:7:131:22 | self |
-| raise.rb:133:3:133:19 | rescue ... | raise.rb:133:3:133:19 | rescue ... |
-| raise.rb:134:10:134:19 | ExceptionB | raise.rb:134:10:134:19 | ExceptionB |
-| raise.rb:135:5:135:21 | self | raise.rb:134:10:134:19 | ExceptionB |
-| raise.rb:135:5:135:21 | self | raise.rb:135:5:135:21 | self |
-| raise.rb:137:5:137:17 | [ensure: exception] self | raise.rb:137:5:137:17 | [ensure: exception] self |
-| raise.rb:137:5:137:17 | self | raise.rb:128:1:140:3 | enter m11 |
-| raise.rb:137:5:137:17 | self | raise.rb:130:5:132:7 | if ... |
-| raise.rb:137:5:137:17 | self | raise.rb:131:7:131:22 | self |
-| raise.rb:137:5:137:17 | self | raise.rb:133:3:133:19 | rescue ... |
-| raise.rb:137:5:137:17 | self | raise.rb:134:10:134:19 | ExceptionB |
-| raise.rb:137:5:137:17 | self | raise.rb:135:5:135:21 | self |
-| raise.rb:137:5:137:17 | self | raise.rb:137:5:137:17 | self |
-| raise.rb:142:1:148:3 | enter m12 | raise.rb:142:1:148:3 | enter m12 |
-| raise.rb:142:1:148:3 | exit m12 (normal) | raise.rb:142:1:148:3 | enter m12 |
-| raise.rb:142:1:148:3 | exit m12 (normal) | raise.rb:142:1:148:3 | exit m12 (normal) |
-| raise.rb:142:1:148:3 | exit m12 (normal) | raise.rb:143:3:145:5 | if ... |
-| raise.rb:142:1:148:3 | exit m12 (normal) | raise.rb:144:5:144:12 | self |
-| raise.rb:143:3:145:5 | if ... | raise.rb:143:3:145:5 | if ... |
-| raise.rb:144:5:144:12 | self | raise.rb:144:5:144:12 | self |
-| raise.rb:150:1:152:3 | enter m13 | raise.rb:150:1:152:3 | enter m13 |
-| raise.rb:154:1:156:3 | enter m14 | raise.rb:154:1:156:3 | enter m14 |
-| raise.rb:155:16:155:50 | enter { ... } | raise.rb:155:16:155:50 | enter { ... } |
-| raise.rb:155:16:155:50 | exit { ... } | raise.rb:155:16:155:50 | exit { ... } |
-| raise.rb:155:25:155:32 | self | raise.rb:155:25:155:32 | self |
-| raise.rb:155:25:155:48 | ... if ... | raise.rb:155:16:155:50 | enter { ... } |
-| raise.rb:155:25:155:48 | ... if ... | raise.rb:155:25:155:48 | ... if ... |
-| raise.rb:158:1:164:3 | enter m15 | raise.rb:158:1:164:3 | enter m15 |
-| raise.rb:159:7:163:5 | enter do ... end | raise.rb:159:7:163:5 | enter do ... end |
-| raise.rb:160:9:162:7 | enter -> { ... } | raise.rb:160:9:162:7 | enter -> { ... } |
-| raise.rb:160:9:162:7 | exit -> { ... } | raise.rb:160:9:162:7 | exit -> { ... } |
-| raise.rb:161:7:161:14 | self | raise.rb:161:7:161:14 | self |
-| raise.rb:161:7:161:23 | ... unless ... | raise.rb:160:9:162:7 | enter -> { ... } |
-| raise.rb:161:7:161:23 | ... unless ... | raise.rb:161:7:161:23 | ... unless ... |
-| raise.rb:167:3:169:5 | enter m | raise.rb:167:3:169:5 | enter m |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:172:1:182:3 | enter m16 |
-| raise.rb:172:1:182:3 | exit m16 | raise.rb:172:1:182:3 | exit m16 |
-| raise.rb:172:1:182:3 | exit m16 (abnormal) | raise.rb:172:1:182:3 | exit m16 (abnormal) |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:172:1:182:3 | enter m16 |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:172:1:182:3 | exit m16 (normal) |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:174:8:174:23 | [false] ... \|\| ... |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:174:8:174:23 | [true] ... \|\| ... |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:174:14:174:15 | b2 |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:175:14:175:14 | 1 |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:177:14:177:14 | 2 |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:179:10:179:19 | ExceptionA |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:180:12:180:12 | 3 |
-| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:174:8:174:23 | [false] ... \|\| ... |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:174:8:174:23 | [true] ... \|\| ... |
-| raise.rb:174:14:174:15 | b2 | raise.rb:174:14:174:15 | b2 |
-| raise.rb:175:14:175:14 | 1 | raise.rb:175:14:175:14 | 1 |
-| raise.rb:177:14:177:14 | 2 | raise.rb:177:14:177:14 | 2 |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:179:10:179:19 | ExceptionA |
-| raise.rb:180:12:180:12 | 3 | raise.rb:179:10:179:19 | ExceptionA |
-| raise.rb:180:12:180:12 | 3 | raise.rb:180:12:180:12 | 3 |
+| raise.rb:110:7:110:25 | After call to puts | raise.rb:110:7:110:25 | After call to puts |
+| raise.rb:113:3:113:15 | After call to puts | raise.rb:113:3:113:15 | After call to puts |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:94:1:119:3 | Entry |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:95:3:95:17 | After call to puts |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:96:3:112:5 | After begin ...  |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:97:8:97:12 | After ... > ... [false] |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:97:8:97:12 | After ... > ... [true] |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:99:11:99:15 | After ... < ... [false] |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:99:11:99:15 | After ... < ... [true] |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:102:5:102:22 | After call to puts |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:103:3:111:7 | ensure ... |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:104:5:104:23 | After call to puts |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:105:5:111:7 | After begin ...  |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:106:10:106:11 | After b1 [false] |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:106:10:106:11 | After b1 [true] |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:109:5:110:25 | ensure ... |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:110:7:110:25 | After call to puts |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:113:3:113:15 | After call to puts |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:114:1:118:5 | ensure ... |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:94:1:119:3 | Entry |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:95:3:95:17 | After call to puts |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:96:3:112:5 | After begin ...  |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:97:8:97:12 | After ... > ... [false] |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:97:8:97:12 | After ... > ... [true] |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:99:11:99:15 | After ... < ... [false] |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:99:11:99:15 | After ... < ... [true] |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:102:5:102:22 | After call to puts |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:103:3:111:7 | ensure ... |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:104:5:104:23 | After call to puts |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:105:5:111:7 | After begin ...  |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:106:10:106:11 | After b1 [false] |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:106:10:106:11 | After b1 [true] |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:109:5:110:25 | ensure ... |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:110:7:110:25 | After call to puts |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:113:3:113:15 | After call to puts |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:114:1:118:5 | ensure ... |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:116:6:116:7 | After b2 [false] |
+| raise.rb:116:6:116:7 | After b2 [true] | raise.rb:116:6:116:7 | After b2 [true] |
+| raise.rb:121:1:126:3 | Entry | raise.rb:121:1:126:3 | Entry |
+| raise.rb:121:1:126:3 | Exit | raise.rb:121:1:126:3 | Exit |
+| raise.rb:121:9:121:9 | After p [match] | raise.rb:121:1:126:3 | Entry |
+| raise.rb:121:9:121:9 | After p [match] | raise.rb:121:9:121:9 | After p [match] |
+| raise.rb:121:9:121:9 | After p [no-match] | raise.rb:121:9:121:9 | After p [no-match] |
+| raise.rb:128:1:140:3 | Entry | raise.rb:128:1:140:3 | Entry |
+| raise.rb:128:1:140:3 | Exceptional Exit | raise.rb:128:1:140:3 | Exceptional Exit |
+| raise.rb:128:1:140:3 | Exit | raise.rb:128:1:140:3 | Exit |
+| raise.rb:129:3:138:5 | After begin ...  | raise.rb:128:1:140:3 | Entry |
+| raise.rb:129:3:138:5 | After begin ...  | raise.rb:129:3:138:5 | After begin ...  |
+| raise.rb:129:3:138:5 | After begin ...  | raise.rb:130:8:130:8 | After b [false] |
+| raise.rb:129:3:138:5 | After begin ...  | raise.rb:130:8:130:8 | After b [true] |
+| raise.rb:129:3:138:5 | After begin ...  | raise.rb:133:10:133:19 | After ExceptionA [match] |
+| raise.rb:129:3:138:5 | After begin ...  | raise.rb:133:10:133:19 | After ExceptionA [no-match] |
+| raise.rb:129:3:138:5 | After begin ...  | raise.rb:134:10:134:19 | After ExceptionB [match] |
+| raise.rb:129:3:138:5 | After begin ...  | raise.rb:134:10:134:19 | After ExceptionB [no-match] |
+| raise.rb:129:3:138:5 | After begin ...  | raise.rb:136:3:137:17 | ensure ... |
+| raise.rb:130:8:130:8 | After b [false] | raise.rb:130:8:130:8 | After b [false] |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:130:8:130:8 | After b [true] |
+| raise.rb:133:10:133:19 | After ExceptionA [match] | raise.rb:133:10:133:19 | After ExceptionA [match] |
+| raise.rb:133:10:133:19 | After ExceptionA [no-match] | raise.rb:133:10:133:19 | After ExceptionA [no-match] |
+| raise.rb:134:10:134:19 | After ExceptionB [match] | raise.rb:134:10:134:19 | After ExceptionB [match] |
+| raise.rb:134:10:134:19 | After ExceptionB [no-match] | raise.rb:134:10:134:19 | After ExceptionB [no-match] |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:128:1:140:3 | Entry |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:130:8:130:8 | After b [false] |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:130:8:130:8 | After b [true] |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:133:10:133:19 | After ExceptionA [match] |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:133:10:133:19 | After ExceptionA [no-match] |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:134:10:134:19 | After ExceptionB [match] |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:134:10:134:19 | After ExceptionB [no-match] |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:136:3:137:17 | ensure ... |
+| raise.rb:142:1:148:3 | Entry | raise.rb:142:1:148:3 | Entry |
+| raise.rb:143:6:143:6 | After b [false] | raise.rb:143:6:143:6 | After b [false] |
+| raise.rb:143:6:143:6 | After b [true] | raise.rb:143:6:143:6 | After b [true] |
+| raise.rb:146:1:147:10 | ensure ... | raise.rb:142:1:148:3 | Entry |
+| raise.rb:146:1:147:10 | ensure ... | raise.rb:143:6:143:6 | After b [false] |
+| raise.rb:146:1:147:10 | ensure ... | raise.rb:143:6:143:6 | After b [true] |
+| raise.rb:146:1:147:10 | ensure ... | raise.rb:146:1:147:10 | ensure ... |
+| raise.rb:150:1:152:3 | Entry | raise.rb:150:1:152:3 | Entry |
+| raise.rb:154:1:156:3 | Entry | raise.rb:154:1:156:3 | Entry |
+| raise.rb:155:16:155:50 | Entry | raise.rb:155:16:155:50 | Entry |
+| raise.rb:155:16:155:50 | Exit | raise.rb:155:16:155:50 | Exit |
+| raise.rb:155:37:155:48 | After call to nil? [false] | raise.rb:155:16:155:50 | Entry |
+| raise.rb:155:37:155:48 | After call to nil? [false] | raise.rb:155:37:155:48 | After call to nil? [false] |
+| raise.rb:155:37:155:48 | After call to nil? [true] | raise.rb:155:37:155:48 | After call to nil? [true] |
+| raise.rb:158:1:164:3 | Entry | raise.rb:158:1:164:3 | Entry |
+| raise.rb:159:7:163:5 | Entry | raise.rb:159:7:163:5 | Entry |
+| raise.rb:160:9:162:7 | Entry | raise.rb:160:9:162:7 | Entry |
+| raise.rb:160:9:162:7 | Exit | raise.rb:160:9:162:7 | Exit |
+| raise.rb:161:23:161:23 | After x [false] | raise.rb:161:23:161:23 | After x [false] |
+| raise.rb:161:23:161:23 | After x [true] | raise.rb:160:9:162:7 | Entry |
+| raise.rb:161:23:161:23 | After x [true] | raise.rb:161:23:161:23 | After x [true] |
+| raise.rb:167:3:169:5 | Entry | raise.rb:167:3:169:5 | Entry |
+| raise.rb:172:1:182:3 | Entry | raise.rb:172:1:182:3 | Entry |
+| raise.rb:172:1:182:3 | Exit | raise.rb:172:1:182:3 | Exit |
+| raise.rb:172:1:182:3 | Normal Exit | raise.rb:172:1:182:3 | Entry |
+| raise.rb:172:1:182:3 | Normal Exit | raise.rb:172:1:182:3 | Normal Exit |
+| raise.rb:172:1:182:3 | Normal Exit | raise.rb:174:8:174:9 | After b1 [false] |
+| raise.rb:172:1:182:3 | Normal Exit | raise.rb:174:8:174:9 | After b1 [true] |
+| raise.rb:172:1:182:3 | Normal Exit | raise.rb:174:8:174:23 | After ... \|\| ... [true] |
+| raise.rb:172:1:182:3 | Normal Exit | raise.rb:174:14:174:23 | After ... == ... [false] |
+| raise.rb:172:1:182:3 | Normal Exit | raise.rb:174:14:174:23 | After ... == ... [true] |
+| raise.rb:172:1:182:3 | Normal Exit | raise.rb:179:3:180:12 | rescue ... |
+| raise.rb:172:1:182:3 | Normal Exit | raise.rb:179:10:179:19 | After ExceptionA [match] |
+| raise.rb:174:8:174:9 | After b1 [false] | raise.rb:174:8:174:9 | After b1 [false] |
+| raise.rb:174:8:174:9 | After b1 [true] | raise.rb:174:8:174:9 | After b1 [true] |
+| raise.rb:174:8:174:23 | After ... \|\| ... [true] | raise.rb:174:8:174:9 | After b1 [true] |
+| raise.rb:174:8:174:23 | After ... \|\| ... [true] | raise.rb:174:8:174:23 | After ... \|\| ... [true] |
+| raise.rb:174:8:174:23 | After ... \|\| ... [true] | raise.rb:174:14:174:23 | After ... == ... [true] |
+| raise.rb:174:14:174:23 | After ... == ... [false] | raise.rb:174:14:174:23 | After ... == ... [false] |
+| raise.rb:174:14:174:23 | After ... == ... [true] | raise.rb:174:14:174:23 | After ... == ... [true] |
+| raise.rb:179:3:180:12 | rescue ... | raise.rb:179:3:180:12 | rescue ... |
+| raise.rb:179:10:179:19 | After ExceptionA [match] | raise.rb:179:3:180:12 | rescue ... |
+| raise.rb:179:10:179:19 | After ExceptionA [match] | raise.rb:179:10:179:19 | After ExceptionA [match] |
+| raise.rb:179:10:179:19 | After ExceptionA [no-match] | raise.rb:179:10:179:19 | After ExceptionA [no-match] |
 immediateDominator
-| break_ensure.rb:1:1:11:3 | exit m1 | break_ensure.rb:2:9:2:9 | x |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:2:9:2:9 | x |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:1:1:11:3 | enter m1 |
-| break_ensure.rb:3:5:5:7 | if ... | break_ensure.rb:3:8:3:8 | x |
-| break_ensure.rb:3:8:3:8 | x | break_ensure.rb:2:9:2:9 | x |
-| break_ensure.rb:4:7:4:11 | break | break_ensure.rb:3:8:3:8 | x |
-| break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | break_ensure.rb:8:6:8:13 | [ensure: exception] self |
-| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:2:3:6:5 | while ... |
-| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:2:9:2:9 | x |
-| break_ensure.rb:9:5:9:23 | [ensure: exception] self | break_ensure.rb:8:6:8:13 | [ensure: exception] self |
-| break_ensure.rb:9:5:9:23 | self | break_ensure.rb:2:3:6:5 | while ... |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:14:9:14:9 | x |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:13:1:25:3 | enter m2 |
-| break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:16:10:16:10 | x |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:14:9:14:9 | x |
-| break_ensure.rb:17:9:17:13 | break | break_ensure.rb:16:10:16:10 | x |
-| break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:17:9:17:13 | break |
-| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
-| break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:16:7:18:9 | if ... |
-| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:16:10:16:10 | x |
-| break_ensure.rb:21:9:21:20 | [ensure: break] self | break_ensure.rb:17:9:17:13 | break |
-| break_ensure.rb:21:9:21:20 | [ensure: exception] self | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
-| break_ensure.rb:21:9:21:20 | self | break_ensure.rb:16:7:18:9 | if ... |
-| break_ensure.rb:27:1:42:3 | exit m3 | break_ensure.rb:27:1:42:3 | enter m3 |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:27:1:42:3 | enter m3 |
-| break_ensure.rb:29:5:31:7 | if ... | break_ensure.rb:27:1:42:3 | enter m3 |
-| break_ensure.rb:30:7:30:12 | return | break_ensure.rb:27:1:42:3 | enter m3 |
-| break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break_ensure.rb:33:11:33:11 | [ensure: exception] y |
-| break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:33:11:33:11 | [ensure: return] y |
-| break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:33:11:33:11 | y |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:27:1:42:3 | enter m3 |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:30:7:30:12 | return |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:29:5:31:7 | if ... |
-| break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | break_ensure.rb:35:12:35:12 | [ensure: exception] x |
-| break_ensure.rb:35:9:37:11 | [ensure: return] if ... | break_ensure.rb:35:12:35:12 | [ensure: return] x |
-| break_ensure.rb:35:9:37:11 | if ... | break_ensure.rb:35:12:35:12 | x |
-| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:33:11:33:11 | [ensure: exception] y |
-| break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:33:11:33:11 | [ensure: return] y |
-| break_ensure.rb:35:12:35:12 | x | break_ensure.rb:33:11:33:11 | y |
-| break_ensure.rb:36:11:36:15 | [ensure: exception] break | break_ensure.rb:35:12:35:12 | [ensure: exception] x |
-| break_ensure.rb:36:11:36:15 | [ensure: return] break | break_ensure.rb:35:12:35:12 | [ensure: return] x |
-| break_ensure.rb:36:11:36:15 | break | break_ensure.rb:35:12:35:12 | x |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:45:9:45:9 | x |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:44:1:56:3 | enter m4 |
-| break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:47:10:47:10 | x |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:45:9:45:9 | x |
-| break_ensure.rb:48:9:48:16 | self | break_ensure.rb:47:10:47:10 | x |
-| break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
-| break_ensure.rb:51:7:53:9 | if ... | break_ensure.rb:47:7:49:9 | if ... |
-| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:47:10:47:10 | x |
-| break_ensure.rb:52:15:52:16 | 10 | break_ensure.rb:47:7:49:9 | if ... |
-| break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
-| case.rb:2:3:5:5 | case ... | case.rb:1:1:6:3 | enter if_in_case |
-| case.rb:3:5:3:42 | [match] when ... | case.rb:1:1:6:3 | enter if_in_case |
-| case.rb:3:5:3:42 | [no-match] when ... | case.rb:1:1:6:3 | enter if_in_case |
-| case.rb:3:18:3:41 | if ... | case.rb:3:21:3:22 | self |
-| case.rb:3:21:3:22 | self | case.rb:3:5:3:42 | [match] when ... |
-| case.rb:3:29:3:37 | self | case.rb:3:21:3:22 | self |
-| case.rb:4:5:4:24 | [match] when ... | case.rb:4:10:4:10 | 2 |
-| case.rb:4:5:4:24 | [no-match] when ... | case.rb:4:10:4:10 | 2 |
-| case.rb:4:10:4:10 | 2 | case.rb:3:5:3:42 | [no-match] when ... |
-| case.rb:4:17:4:24 | self | case.rb:4:5:4:24 | [match] when ... |
-| case.rb:9:3:17:5 | case ... | case.rb:8:1:18:3 | enter case_match |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:8:1:18:3 | enter case_match |
-| case.rb:11:15:11:15 | 3 | case.rb:11:5:11:15 | in ... then ... |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:11:5:11:15 | in ... then ... |
-| case.rb:13:7:13:7 | 4 | case.rb:12:5:13:7 | in ... then ... |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:12:5:13:7 | in ... then ... |
-| case.rb:14:13:14:13 | x | case.rb:14:5:14:25 | in ... then ... |
-| case.rb:14:25:14:25 | 6 | case.rb:14:13:14:13 | x |
-| case.rb:15:5:15:28 | in ... then ... | case.rb:14:13:14:13 | x |
-| case.rb:15:17:15:17 | x | case.rb:15:5:15:28 | in ... then ... |
-| case.rb:15:28:15:28 | 7 | case.rb:15:17:15:17 | x |
-| case.rb:16:10:16:10 | 8 | case.rb:15:17:15:17 | x |
-| case.rb:20:1:24:3 | exit case_match_no_match | case.rb:20:1:24:3 | enter case_match_no_match |
-| case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | case.rb:20:1:24:3 | enter case_match_no_match |
-| case.rb:21:3:23:5 | case ... | case.rb:20:1:24:3 | enter case_match_no_match |
-| case.rb:26:1:30:3 | exit case_match_raise | case.rb:26:1:30:3 | enter case_match_raise |
-| case.rb:26:1:30:3 | exit case_match_raise (abnormal) | case.rb:26:1:30:3 | enter case_match_raise |
-| case.rb:27:3:29:5 | case ... | case.rb:26:1:30:3 | enter case_match_raise |
-| case.rb:32:1:39:3 | exit case_match_array | case.rb:32:1:39:3 | enter case_match_array |
-| case.rb:32:1:39:3 | exit case_match_array (abnormal) | case.rb:37:5:37:27 | in ... then ... |
-| case.rb:33:3:38:5 | case ... | case.rb:32:1:39:3 | enter case_match_array |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:32:1:39:3 | enter case_match_array |
-| case.rb:35:9:35:9 | x | case.rb:35:5:35:11 | in ... then ... |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:35:5:35:11 | in ... then ... |
-| case.rb:36:9:36:9 | x | case.rb:36:5:36:13 | in ... then ... |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:36:5:36:13 | in ... then ... |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:5:37:27 | in ... then ... |
-| case.rb:37:12:37:12 | a | case.rb:37:8:37:26 | [ ..., * ] |
-| case.rb:37:15:37:15 | b | case.rb:37:12:37:12 | a |
-| case.rb:37:19:37:19 | c | case.rb:37:15:37:15 | b |
-| case.rb:37:25:37:25 | e | case.rb:37:19:37:19 | c |
-| case.rb:41:1:45:3 | exit case_match_find | case.rb:41:1:45:3 | enter case_match_find |
-| case.rb:41:1:45:3 | exit case_match_find (abnormal) | case.rb:41:1:45:3 | enter case_match_find |
-| case.rb:43:10:43:10 | x | case.rb:41:1:45:3 | enter case_match_find |
-| case.rb:43:16:43:16 | 2 | case.rb:43:10:43:10 | x |
-| case.rb:43:20:43:20 | y | case.rb:43:16:43:16 | 2 |
-| case.rb:47:1:53:3 | exit case_match_hash | case.rb:47:1:53:3 | enter case_match_hash |
-| case.rb:47:1:53:3 | exit case_match_hash (abnormal) | case.rb:51:5:51:17 | in ... then ... |
-| case.rb:48:3:52:5 | case ... | case.rb:47:1:53:3 | enter case_match_hash |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:47:1:53:3 | enter case_match_hash |
-| case.rb:49:20:49:20 | 1 | case.rb:49:8:49:34 | { ..., ** } |
-| case.rb:49:23:49:23 | a | case.rb:49:20:49:20 | 1 |
-| case.rb:49:29:49:32 | rest | case.rb:49:23:49:23 | a |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:47:1:53:3 | enter case_match_hash |
-| case.rb:50:8:50:24 | { ..., ** } | case.rb:50:5:50:25 | in ... then ... |
-| case.rb:50:16:50:16 | 1 | case.rb:50:8:50:24 | { ..., ** } |
-| case.rb:51:5:51:17 | in ... then ... | case.rb:50:5:50:25 | in ... then ... |
-| case.rb:51:8:51:16 | { ..., ** } | case.rb:51:5:51:17 | in ... then ... |
-| case.rb:56:3:60:5 | case ... | case.rb:55:1:61:3 | enter case_match_variable |
-| case.rb:58:5:58:10 | in ... then ... | case.rb:55:1:61:3 | enter case_match_variable |
-| case.rb:64:3:66:5 | case ... | case.rb:63:1:67:3 | enter case_match_underscore |
-| case.rb:65:12:65:12 | _ | case.rb:63:1:67:3 | enter case_match_underscore |
-| case.rb:69:1:93:3 | exit case_match_various | case.rb:69:1:93:3 | enter case_match_various |
-| case.rb:69:1:93:3 | exit case_match_various (abnormal) | case.rb:91:23:91:24 | { ..., ** } |
-| case.rb:72:3:92:5 | case ... | case.rb:69:1:93:3 | enter case_match_various |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:69:1:93:3 | enter case_match_various |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:74:5:74:11 | in ... then ... |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:75:5:75:15 | in ... then ... |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:76:5:76:18 | in ... then ... |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:77:5:77:18 | in ... then ... |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:78:5:78:19 | in ... then ... |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:79:5:79:14 | in ... then ... |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:80:5:80:12 | in ... then ... |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:81:5:81:11 | in ... then ... |
-| case.rb:82:13:82:13 | x | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:82:20:82:20 | 1 | case.rb:82:13:82:13 | x |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:82:5:82:20 | in ... then ... |
-| case.rb:83:12:83:15 | ^... | case.rb:83:5:83:26 | in ... then ... |
-| case.rb:83:20:83:25 | string | case.rb:83:12:83:15 | ^... |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:83:20:83:25 | string |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:84:5:84:17 | in ... then ... |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:85:5:85:23 | in ... then ... |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:86:5:86:11 | in ... then ... |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:87:5:87:17 | in ... then ... |
-| case.rb:88:14:88:15 | 10 | case.rb:88:5:88:15 | in ... then ... |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:88:14:88:15 | 10 |
-| case.rb:89:14:89:17 | self | case.rb:89:5:89:69 | in ... then ... |
-| case.rb:89:21:89:24 | true | case.rb:89:14:89:17 | self |
-| case.rb:89:28:89:32 | false | case.rb:89:21:89:24 | true |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:89:28:89:32 | false |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:89:36:89:43 | __LINE__ |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:89:47:89:54 | __FILE__ |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ |
-| case.rb:91:5:91:25 | in ... then ... | case.rb:90:5:90:13 | in ... then ... |
-| case.rb:91:13:91:14 | "" | case.rb:91:5:91:25 | in ... then ... |
-| case.rb:91:18:91:19 | [ ..., * ] | case.rb:91:13:91:14 | "" |
-| case.rb:91:23:91:24 | { ..., ** } | case.rb:91:18:91:19 | [ ..., * ] |
-| case.rb:95:1:99:3 | exit case_match_guard_no_else | case.rb:97:13:97:13 | x |
-| case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | case.rb:97:13:97:13 | x |
-| case.rb:97:13:97:13 | x | case.rb:95:1:99:3 | enter case_match_guard_no_else |
-| case.rb:97:25:97:25 | 6 | case.rb:97:13:97:13 | x |
-| cfg.html.erb:18:14:22:16 | if ... | cfg.html.erb:5:16:31:12 | enter cfg.html.erb |
-| cfg.html.erb:19:19:19:32 | self | cfg.html.erb:5:16:31:12 | enter cfg.html.erb |
-| cfg.html.erb:21:19:21:32 | self | cfg.html.erb:5:16:31:12 | enter cfg.html.erb |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:1:1:221:1 | enter cfg.rb |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:32:9:32:9 | 1 |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:42:3:42:24 | [match] when ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:35:1:37:3 | if ... |
-| cfg.rb:42:15:42:24 | self | cfg.rb:42:3:42:24 | [match] when ... |
-| cfg.rb:43:3:43:31 | [match] when ... | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:43:3:43:31 | [no-match] when ... | cfg.rb:43:14:43:14 | 4 |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:42:3:42:24 | [no-match] when ... |
-| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:8:43:8 | 2 |
-| cfg.rb:43:14:43:14 | 4 | cfg.rb:43:11:43:11 | 3 |
-| cfg.rb:43:21:43:31 | self | cfg.rb:43:3:43:31 | [match] when ... |
-| cfg.rb:44:8:44:18 | self | cfg.rb:43:3:43:31 | [no-match] when ... |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:48:3:48:29 | [match] when ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:41:1:45:3 | case ... |
-| cfg.rb:48:20:48:29 | self | cfg.rb:48:3:48:29 | [match] when ... |
-| cfg.rb:49:3:49:37 | [match] when ... | cfg.rb:49:8:49:8 | b |
-| cfg.rb:49:3:49:37 | [no-match] when ... | cfg.rb:49:16:49:16 | b |
-| cfg.rb:49:8:49:8 | b | cfg.rb:48:3:48:29 | [no-match] when ... |
-| cfg.rb:49:16:49:16 | b | cfg.rb:49:8:49:8 | b |
-| cfg.rb:49:27:49:37 | self | cfg.rb:49:3:49:37 | [match] when ... |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:60:27:60:31 | hello | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:60:37:60:39 | bye | cfg.rb:47:1:50:3 | case ... |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:75:15:75:15 | 0 | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:75:17:75:43 | elsif ... | cfg.rb:75:23:75:23 | x |
-| cfg.rb:75:23:75:23 | x | cfg.rb:60:17:60:40 | ... ? ... : ... |
-| cfg.rb:75:35:75:36 | 10 | cfg.rb:75:23:75:23 | x |
-| cfg.rb:75:43:75:43 | x | cfg.rb:75:23:75:23 | x |
-| cfg.rb:90:1:93:3 | exit { ... } (normal) | cfg.rb:90:1:93:3 | enter { ... } |
-| cfg.rb:90:5:90:5 | [false] ! ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:90:5:90:5 | [true] ! ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:75:1:75:47 | if ... |
-| cfg.rb:90:5:90:5 | x | cfg.rb:90:5:90:5 | [true] ! ... |
-| cfg.rb:91:3:91:24 | if ... | cfg.rb:90:1:93:3 | enter { ... } |
-| cfg.rb:91:17:91:20 | next | cfg.rb:90:1:93:3 | enter { ... } |
-| cfg.rb:101:24:101:25 | 42 | cfg.rb:101:1:104:3 | enter parameters |
-| cfg.rb:101:28:101:30 | key | cfg.rb:101:1:104:3 | enter parameters |
-| cfg.rb:113:1:113:9 | self | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:90:5:90:5 | if ... |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:136:12:136:29 | self | cfg.rb:113:1:113:19 | ... if ... |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:172:21:172:29 | self | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:172:36:172:45 | self | cfg.rb:136:1:136:29 | ... rescue ... |
-| cfg.rb:174:1:174:9 | self | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:172:1:172:49 | unless ... |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:176:7:176:7 | x |
-| cfg.rb:176:7:176:7 | x | cfg.rb:174:1:174:23 | ... unless ... |
-| cfg.rb:176:17:176:17 | x | cfg.rb:176:7:176:7 | x |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:179:30:179:30 | i |
-| cfg.rb:179:2:179:13 | self | cfg.rb:179:30:179:30 | i |
-| cfg.rb:179:30:179:30 | i | cfg.rb:176:1:176:41 | until ... |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:182:7:182:7 | x |
-| cfg.rb:182:7:182:7 | x | cfg.rb:179:1:179:36 | ... until ... |
-| cfg.rb:183:3:183:3 | x | cfg.rb:182:7:182:7 | x |
-| cfg.rb:184:3:184:25 | if ... | cfg.rb:183:3:183:3 | x |
-| cfg.rb:184:18:184:21 | redo | cfg.rb:183:3:183:3 | x |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:188:30:188:30 | i |
-| cfg.rb:188:2:188:13 | self | cfg.rb:188:30:188:30 | i |
-| cfg.rb:188:30:188:30 | i | cfg.rb:182:1:186:3 | while ... |
-| cfg.rb:205:1:205:3 | __synth__0__1 | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:205:1:205:3 | nil | cfg.rb:188:1:188:35 | ... while ... |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:188:1:188:35 | ... while ... |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb |
-| constant_compound_assign.rb:5:22:5:24 | 123 | constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... |
-| constant_compound_assign.rb:14:18:14:20 | 123 | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... |
-| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... |
-| constant_compound_assign.rb:19:21:19:23 | 123 | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... |
-| exit.rb:1:1:6:3 | exit m1 | exit.rb:1:1:6:3 | enter m1 |
-| exit.rb:2:3:4:5 | if ... | exit.rb:1:1:6:3 | enter m1 |
-| exit.rb:3:5:3:10 | self | exit.rb:1:1:6:3 | enter m1 |
-| exit.rb:8:1:13:3 | exit m2 | exit.rb:8:1:13:3 | enter m2 |
-| exit.rb:9:3:11:5 | if ... | exit.rb:8:1:13:3 | enter m2 |
-| exit.rb:10:5:10:18 | self | exit.rb:8:1:13:3 | enter m2 |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:1:1:9:3 | enter m1 |
-| ifs.rb:3:5:3:30 | self | ifs.rb:1:1:9:3 | enter m1 |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:9:4:9 | x |
-| ifs.rb:4:9:4:9 | x | ifs.rb:1:1:9:3 | enter m1 |
-| ifs.rb:4:9:4:24 | [false] ... and ... | ifs.rb:4:9:4:9 | x |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:20:4:20 | x |
-| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:4:9:4:9 | x |
-| ifs.rb:4:9:4:38 | [true] ... and ... | ifs.rb:4:30:4:38 | [true] ! ... |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:9:4:9 | x |
-| ifs.rb:4:30:4:38 | [false] ! ... | ifs.rb:4:31:4:38 | [true] ( ... ) |
-| ifs.rb:4:30:4:38 | [true] ! ... | ifs.rb:4:31:4:38 | [false] ( ... ) |
-| ifs.rb:4:31:4:38 | [false] ( ... ) | ifs.rb:4:32:4:32 | x |
-| ifs.rb:4:31:4:38 | [true] ( ... ) | ifs.rb:4:32:4:32 | x |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:9:4:24 | [true] ... and ... |
-| ifs.rb:5:5:5:17 | self | ifs.rb:4:9:4:38 | [true] ... and ... |
-| ifs.rb:7:5:7:35 | self | ifs.rb:4:9:4:38 | [false] ... and ... |
-| ifs.rb:11:1:16:3 | exit m2 (normal) | ifs.rb:11:1:16:3 | enter m2 |
-| ifs.rb:12:3:14:5 | if ... | ifs.rb:11:1:16:3 | enter m2 |
-| ifs.rb:13:12:13:12 | 0 | ifs.rb:11:1:16:3 | enter m2 |
-| ifs.rb:19:3:24:5 | if ... | ifs.rb:18:1:26:3 | enter m3 |
-| ifs.rb:20:5:20:5 | x | ifs.rb:18:1:26:3 | enter m3 |
-| ifs.rb:21:5:23:7 | if ... | ifs.rb:20:5:20:5 | x |
-| ifs.rb:22:7:22:7 | x | ifs.rb:20:5:20:5 | x |
-| ifs.rb:29:10:29:23 | [false] ( ... ) | ifs.rb:29:11:29:22 | [false] ... ? ... : ... |
-| ifs.rb:29:10:29:23 | [true] ( ... ) | ifs.rb:29:11:29:22 | [true] ... ? ... : ... |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:28:1:30:3 | enter m4 |
-| ifs.rb:29:11:29:22 | [false] ... ? ... : ... | ifs.rb:28:1:30:3 | enter m4 |
-| ifs.rb:29:11:29:22 | [true] ... ? ... : ... | ifs.rb:28:1:30:3 | enter m4 |
-| ifs.rb:29:16:29:17 | b2 | ifs.rb:28:1:30:3 | enter m4 |
-| ifs.rb:29:21:29:22 | b3 | ifs.rb:28:1:30:3 | enter m4 |
-| ifs.rb:29:28:29:35 | b2 \|\| b3 | ifs.rb:29:10:29:23 | [true] ( ... ) |
-| ifs.rb:29:41:29:50 | !b2 \|\| !b3 | ifs.rb:29:10:29:23 | [false] ( ... ) |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:32:1:34:3 | enter m5 |
-| ifs.rb:33:6:33:49 | [false] ( ... ) | ifs.rb:33:7:33:48 | [false] if ... |
-| ifs.rb:33:6:33:49 | [true] ( ... ) | ifs.rb:33:7:33:48 | [true] if ... |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:32:1:34:3 | enter m5 |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:32:1:34:3 | enter m5 |
-| ifs.rb:33:13:33:19 | [false] then ... | ifs.rb:33:18:33:19 | b2 |
-| ifs.rb:33:13:33:19 | [true] then ... | ifs.rb:33:18:33:19 | b2 |
-| ifs.rb:33:18:33:19 | b2 | ifs.rb:32:1:34:3 | enter m5 |
-| ifs.rb:33:21:33:44 | [false] elsif ... | ifs.rb:33:27:33:28 | b3 |
-| ifs.rb:33:21:33:44 | [true] elsif ... | ifs.rb:33:27:33:28 | b3 |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:32:1:34:3 | enter m5 |
-| ifs.rb:33:30:33:36 | [false] then ... | ifs.rb:33:35:33:36 | b4 |
-| ifs.rb:33:30:33:36 | [true] then ... | ifs.rb:33:35:33:36 | b4 |
-| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:27:33:28 | b3 |
-| ifs.rb:33:38:33:44 | [false] else ... | ifs.rb:33:43:33:44 | b5 |
-| ifs.rb:33:38:33:44 | [true] else ... | ifs.rb:33:43:33:44 | b5 |
-| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:27:33:28 | b3 |
-| ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | ifs.rb:33:6:33:49 | [true] ( ... ) |
-| ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | ifs.rb:33:6:33:49 | [false] ( ... ) |
-| ifs.rb:36:1:38:3 | conditional_method_def | ifs.rb:1:1:58:4 | enter ifs.rb |
-| ifs.rb:36:1:38:17 | ... unless ... | ifs.rb:1:1:58:4 | enter ifs.rb |
-| ifs.rb:41:3:43:5 | if ... | ifs.rb:41:6:41:10 | [false] ! ... |
-| ifs.rb:41:6:41:10 | [false] ! ... | ifs.rb:40:1:44:3 | enter constant_condition |
-| ifs.rb:47:3:50:5 | if ... | ifs.rb:46:1:52:3 | enter empty_else |
-| ifs.rb:48:5:48:15 | self | ifs.rb:46:1:52:3 | enter empty_else |
-| ifs.rb:49:3:49:6 | else ... | ifs.rb:46:1:52:3 | enter empty_else |
-| ifs.rb:55:3:57:5 | if ... | ifs.rb:54:1:58:3 | enter disjunct |
-| ifs.rb:55:6:55:15 | [false] ( ... ) | ifs.rb:55:7:55:14 | [false] ... \|\| ... |
-| ifs.rb:55:6:55:15 | [true] ( ... ) | ifs.rb:55:7:55:14 | [true] ... \|\| ... |
-| ifs.rb:55:7:55:14 | [false] ... \|\| ... | ifs.rb:55:13:55:14 | b2 |
-| ifs.rb:55:7:55:14 | [true] ... \|\| ... | ifs.rb:54:1:58:3 | enter disjunct |
-| ifs.rb:55:13:55:14 | b2 | ifs.rb:54:1:58:3 | enter disjunct |
-| ifs.rb:56:5:56:19 | self | ifs.rb:55:6:55:15 | [true] ( ... ) |
-| loops.rb:2:3:5:5 | while ... | loops.rb:2:9:2:9 | x |
-| loops.rb:2:9:2:9 | x | loops.rb:1:1:6:3 | enter m1 |
-| loops.rb:3:5:3:10 | self | loops.rb:2:9:2:9 | x |
-| loops.rb:9:3:20:5 | while ... | loops.rb:9:9:9:9 | x |
-| loops.rb:9:9:9:9 | x | loops.rb:8:1:22:3 | enter m2 |
-| loops.rb:10:5:10:10 | self | loops.rb:9:9:9:9 | x |
-| loops.rb:13:7:13:11 | break | loops.rb:10:5:10:10 | self |
-| loops.rb:14:11:14:11 | x | loops.rb:10:5:10:10 | self |
-| loops.rb:15:7:15:10 | next | loops.rb:14:11:14:11 | x |
-| loops.rb:16:5:17:10 | elsif ... | loops.rb:16:11:16:11 | x |
-| loops.rb:16:11:16:11 | x | loops.rb:14:11:14:11 | x |
-| loops.rb:17:7:17:10 | redo | loops.rb:16:11:16:11 | x |
-| loops.rb:31:3:32:5 | while ... | loops.rb:31:9:31:9 | x |
-| loops.rb:31:9:31:9 | x | loops.rb:30:1:33:3 | enter m4 |
-| loops.rb:31:15:32:5 | do ... | loops.rb:31:9:31:9 | x |
-| raise.rb:7:1:12:3 | exit m1 | raise.rb:7:1:12:3 | enter m1 |
-| raise.rb:8:3:10:5 | if ... | raise.rb:7:1:12:3 | enter m1 |
-| raise.rb:9:5:9:17 | self | raise.rb:7:1:12:3 | enter m1 |
-| raise.rb:14:1:23:3 | exit m2 | raise.rb:14:1:23:3 | enter m2 |
-| raise.rb:14:1:23:3 | exit m2 (abnormal) | raise.rb:17:7:17:22 | self |
-| raise.rb:16:5:18:7 | if ... | raise.rb:14:1:23:3 | enter m2 |
-| raise.rb:17:7:17:22 | self | raise.rb:14:1:23:3 | enter m2 |
-| raise.rb:20:5:20:18 | self | raise.rb:17:7:17:22 | self |
-| raise.rb:22:3:22:15 | self | raise.rb:14:1:23:3 | enter m2 |
-| raise.rb:27:5:29:7 | if ... | raise.rb:25:1:34:3 | enter m3 |
-| raise.rb:28:7:28:22 | self | raise.rb:25:1:34:3 | enter m3 |
-| raise.rb:33:3:33:15 | self | raise.rb:25:1:34:3 | enter m3 |
-| raise.rb:38:5:40:7 | if ... | raise.rb:36:1:45:3 | enter m4 |
-| raise.rb:39:7:39:22 | self | raise.rb:36:1:45:3 | enter m4 |
-| raise.rb:44:3:44:15 | self | raise.rb:36:1:45:3 | enter m4 |
-| raise.rb:49:5:51:7 | if ... | raise.rb:47:1:55:3 | enter m5 |
-| raise.rb:50:7:50:22 | self | raise.rb:47:1:55:3 | enter m5 |
-| raise.rb:54:3:54:15 | self | raise.rb:47:1:55:3 | enter m5 |
-| raise.rb:57:1:66:3 | exit m6 | raise.rb:57:1:66:3 | enter m6 |
-| raise.rb:57:1:66:3 | exit m6 (abnormal) | raise.rb:62:22:62:31 | ExceptionB |
-| raise.rb:59:5:61:7 | if ... | raise.rb:57:1:66:3 | enter m6 |
-| raise.rb:60:7:60:22 | self | raise.rb:57:1:66:3 | enter m6 |
-| raise.rb:62:22:62:31 | ExceptionB | raise.rb:60:7:60:22 | self |
-| raise.rb:62:36:62:36 | e | raise.rb:60:7:60:22 | self |
-| raise.rb:65:3:65:15 | self | raise.rb:57:1:66:3 | enter m6 |
-| raise.rb:68:1:77:3 | exit m7 | raise.rb:68:1:77:3 | enter m7 |
-| raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:71:9:71:9 | x |
-| raise.rb:70:5:70:17 | self | raise.rb:68:1:77:3 | enter m7 |
-| raise.rb:71:3:72:18 | elsif ... | raise.rb:71:9:71:9 | x |
-| raise.rb:71:9:71:9 | x | raise.rb:68:1:77:3 | enter m7 |
-| raise.rb:72:13:72:17 | x < 0 | raise.rb:71:9:71:9 | x |
-| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:68:1:77:3 | enter m7 |
-| raise.rb:76:3:76:15 | self | raise.rb:71:3:72:18 | elsif ... |
-| raise.rb:79:1:92:3 | exit m8 | raise.rb:79:1:92:3 | enter m8 |
-| raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:84:11:84:11 | x |
-| raise.rb:83:7:83:19 | self | raise.rb:79:1:92:3 | enter m8 |
-| raise.rb:84:5:85:20 | elsif ... | raise.rb:84:11:84:11 | x |
-| raise.rb:84:11:84:11 | x | raise.rb:79:1:92:3 | enter m8 |
-| raise.rb:85:15:85:19 | x < 0 | raise.rb:84:11:84:11 | x |
-| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:79:1:92:3 | enter m8 |
-| raise.rb:89:5:89:17 | self | raise.rb:84:5:85:20 | elsif ... |
-| raise.rb:94:1:119:3 | exit m9 | raise.rb:94:1:119:3 | enter m9 |
-| raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:94:1:119:3 | enter m9 |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:99:11:99:11 | x |
-| raise.rb:97:8:97:8 | x | raise.rb:94:1:119:3 | enter m9 |
-| raise.rb:98:7:98:19 | self | raise.rb:97:8:97:8 | x |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:99:11:99:11 | x |
-| raise.rb:99:11:99:11 | x | raise.rb:97:8:97:8 | x |
-| raise.rb:100:15:100:19 | x < 0 | raise.rb:99:11:99:11 | x |
-| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:97:8:97:8 | x |
-| raise.rb:104:5:104:23 | self | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:106:7:108:9 | [ensure: exception] if ... | raise.rb:106:10:106:11 | [ensure: exception] b1 |
-| raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:106:10:106:11 | [ensure: return] b1 |
-| raise.rb:106:7:108:9 | if ... | raise.rb:106:10:106:11 | b1 |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:104:5:104:23 | [ensure: exception] self |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:106:10:106:11 | b1 | raise.rb:104:5:104:23 | self |
-| raise.rb:107:9:107:26 | [ensure: exception] self | raise.rb:106:10:106:11 | [ensure: exception] b1 |
-| raise.rb:107:9:107:26 | [ensure: return] self | raise.rb:106:10:106:11 | [ensure: return] b1 |
-| raise.rb:107:9:107:26 | self | raise.rb:106:10:106:11 | b1 |
-| raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | raise.rb:107:9:107:26 | self |
-| raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... | raise.rb:107:9:107:26 | [ensure: exception] self |
-| raise.rb:109:5:110:25 | [ensure: exception] ensure ... | raise.rb:106:7:108:9 | [ensure: exception] if ... |
-| raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | raise.rb:107:9:107:26 | [ensure: return] self |
-| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:106:7:108:9 | [ensure: return] if ... |
-| raise.rb:109:5:110:25 | ensure ... | raise.rb:106:7:108:9 | if ... |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:94:1:119:3 | enter m9 |
-| raise.rb:115:3:115:22 | self | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:116:3:118:5 | [ensure: exception] if ... | raise.rb:115:3:115:22 | [ensure: exception] self |
-| raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
-| raise.rb:116:3:118:5 | if ... | raise.rb:115:3:115:22 | self |
-| raise.rb:117:5:117:22 | [ensure: exception] self | raise.rb:115:3:115:22 | [ensure: exception] self |
-| raise.rb:117:5:117:22 | [ensure: return] self | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
-| raise.rb:117:5:117:22 | self | raise.rb:115:3:115:22 | self |
-| raise.rb:121:1:126:3 | exit m10 | raise.rb:121:1:126:3 | enter m10 |
-| raise.rb:121:14:121:30 | self | raise.rb:121:1:126:3 | enter m10 |
-| raise.rb:125:3:125:51 | self | raise.rb:121:1:126:3 | enter m10 |
-| raise.rb:128:1:140:3 | exit m11 | raise.rb:128:1:140:3 | enter m11 |
-| raise.rb:130:5:132:7 | if ... | raise.rb:128:1:140:3 | enter m11 |
-| raise.rb:131:7:131:22 | self | raise.rb:128:1:140:3 | enter m11 |
-| raise.rb:133:3:133:19 | rescue ... | raise.rb:131:7:131:22 | self |
-| raise.rb:134:10:134:19 | ExceptionB | raise.rb:131:7:131:22 | self |
-| raise.rb:135:5:135:21 | self | raise.rb:134:10:134:19 | ExceptionB |
-| raise.rb:137:5:137:17 | [ensure: exception] self | raise.rb:134:10:134:19 | ExceptionB |
-| raise.rb:137:5:137:17 | self | raise.rb:128:1:140:3 | enter m11 |
-| raise.rb:142:1:148:3 | exit m12 (normal) | raise.rb:142:1:148:3 | enter m12 |
-| raise.rb:143:3:145:5 | if ... | raise.rb:142:1:148:3 | enter m12 |
-| raise.rb:144:5:144:12 | self | raise.rb:142:1:148:3 | enter m12 |
-| raise.rb:155:16:155:50 | exit { ... } | raise.rb:155:16:155:50 | enter { ... } |
-| raise.rb:155:25:155:32 | self | raise.rb:155:16:155:50 | enter { ... } |
-| raise.rb:155:25:155:48 | ... if ... | raise.rb:155:16:155:50 | enter { ... } |
-| raise.rb:160:9:162:7 | exit -> { ... } | raise.rb:160:9:162:7 | enter -> { ... } |
-| raise.rb:161:7:161:14 | self | raise.rb:160:9:162:7 | enter -> { ... } |
-| raise.rb:161:7:161:23 | ... unless ... | raise.rb:160:9:162:7 | enter -> { ... } |
-| raise.rb:172:1:182:3 | exit m16 | raise.rb:172:1:182:3 | enter m16 |
-| raise.rb:172:1:182:3 | exit m16 (abnormal) | raise.rb:179:10:179:19 | ExceptionA |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:172:1:182:3 | enter m16 |
-| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:174:14:174:15 | b2 |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:172:1:182:3 | enter m16 |
-| raise.rb:174:14:174:15 | b2 | raise.rb:172:1:182:3 | enter m16 |
-| raise.rb:175:14:175:14 | 1 | raise.rb:174:8:174:23 | [true] ... \|\| ... |
-| raise.rb:177:14:177:14 | 2 | raise.rb:174:8:174:23 | [false] ... \|\| ... |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:172:1:182:3 | enter m16 |
-| raise.rb:180:12:180:12 | 3 | raise.rb:179:10:179:19 | ExceptionA |
+| break_ensure.rb:1:1:11:3 | Exceptional Exit | break_ensure.rb:8:3:10:5 | After if ... |
+| break_ensure.rb:1:1:11:3 | Exit | break_ensure.rb:8:3:10:5 | After if ... |
+| break_ensure.rb:2:3:6:5 | After while ... | break_ensure.rb:2:3:6:5 | [LoopHeader] while ... |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:1:1:11:3 | Entry |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:8:3:10:5 | After if ... |
+| break_ensure.rb:2:9:2:13 | After ... < ... [false] | break_ensure.rb:2:3:6:5 | [LoopHeader] while ... |
+| break_ensure.rb:2:9:2:13 | After ... < ... [true] | break_ensure.rb:2:3:6:5 | [LoopHeader] while ... |
+| break_ensure.rb:3:8:3:12 | After ... > ... [false] | break_ensure.rb:2:9:2:13 | After ... < ... [true] |
+| break_ensure.rb:3:8:3:12 | After ... > ... [true] | break_ensure.rb:2:9:2:13 | After ... < ... [true] |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:2:3:6:5 | [LoopHeader] while ... |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:7:1:10:5 | ensure ... |
+| break_ensure.rb:8:6:8:18 | After call to nil? [false] | break_ensure.rb:7:1:10:5 | ensure ... |
+| break_ensure.rb:8:6:8:18 | After call to nil? [true] | break_ensure.rb:7:1:10:5 | ensure ... |
+| break_ensure.rb:13:1:25:3 | Exceptional Exit | break_ensure.rb:20:7:22:9 | After if ... |
+| break_ensure.rb:13:1:25:3 | Exit | break_ensure.rb:14:3:24:5 | [LoopHeader] while ... |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:14:3:24:5 | [LoopHeader] while ... |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:13:1:25:3 | Entry |
+| break_ensure.rb:14:9:14:13 | After ... < ... [false] | break_ensure.rb:14:3:24:5 | [LoopHeader] while ... |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:14:3:24:5 | [LoopHeader] while ... |
+| break_ensure.rb:15:5:23:7 | After begin ...  | break_ensure.rb:20:7:22:9 | After if ... |
+| break_ensure.rb:16:10:16:14 | After ... > ... [false] | break_ensure.rb:14:9:14:13 | After ... < ... [true] |
+| break_ensure.rb:16:10:16:14 | After ... > ... [true] | break_ensure.rb:14:9:14:13 | After ... < ... [true] |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:14:9:14:13 | After ... < ... [true] |
+| break_ensure.rb:20:7:22:9 | After if ... | break_ensure.rb:19:5:22:9 | ensure ... |
+| break_ensure.rb:20:10:20:15 | After call to nil? [false] | break_ensure.rb:19:5:22:9 | ensure ... |
+| break_ensure.rb:20:10:20:15 | After call to nil? [true] | break_ensure.rb:19:5:22:9 | ensure ... |
+| break_ensure.rb:27:1:42:3 | Exceptional Exit | break_ensure.rb:33:5:39:7 | After while ... |
+| break_ensure.rb:27:1:42:3 | Exit | break_ensure.rb:33:5:39:7 | After while ... |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:33:5:39:7 | After while ... |
+| break_ensure.rb:28:3:40:5 | After begin ...  | break_ensure.rb:33:5:39:7 | After while ... |
+| break_ensure.rb:29:8:29:13 | After call to nil? [false] | break_ensure.rb:27:1:42:3 | Entry |
+| break_ensure.rb:29:8:29:13 | After call to nil? [true] | break_ensure.rb:27:1:42:3 | Entry |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:27:1:42:3 | Entry |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:33:5:39:7 | [LoopHeader] while ... |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:32:3:39:7 | ensure ... |
+| break_ensure.rb:33:11:33:15 | After ... < ... [false] | break_ensure.rb:33:5:39:7 | [LoopHeader] while ... |
+| break_ensure.rb:33:11:33:15 | After ... < ... [true] | break_ensure.rb:33:5:39:7 | [LoopHeader] while ... |
+| break_ensure.rb:35:12:35:16 | After ... > ... [false] | break_ensure.rb:33:11:33:15 | After ... < ... [true] |
+| break_ensure.rb:35:12:35:16 | After ... > ... [true] | break_ensure.rb:33:11:33:15 | After ... < ... [true] |
+| break_ensure.rb:44:1:56:3 | Exceptional Exit | break_ensure.rb:51:10:51:14 | After ... > ... [false] |
+| break_ensure.rb:44:1:56:3 | Exit | break_ensure.rb:45:3:55:5 | [LoopHeader] while ... |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:45:3:55:5 | [LoopHeader] while ... |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:44:1:56:3 | Entry |
+| break_ensure.rb:45:9:45:13 | After ... < ... [false] | break_ensure.rb:45:3:55:5 | [LoopHeader] while ... |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:45:3:55:5 | [LoopHeader] while ... |
+| break_ensure.rb:46:5:54:7 | After begin ...  | break_ensure.rb:51:10:51:14 | After ... > ... [false] |
+| break_ensure.rb:47:10:47:14 | After ... > ... [false] | break_ensure.rb:45:9:45:13 | After ... < ... [true] |
+| break_ensure.rb:47:10:47:14 | After ... > ... [true] | break_ensure.rb:45:9:45:13 | After ... < ... [true] |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:45:9:45:13 | After ... < ... [true] |
+| break_ensure.rb:51:10:51:14 | After ... > ... [false] | break_ensure.rb:50:5:53:9 | ensure ... |
+| break_ensure.rb:51:10:51:14 | After ... > ... [true] | break_ensure.rb:50:5:53:9 | ensure ... |
+| case.rb:2:3:5:5 | After case ... | case.rb:1:1:6:3 | Entry |
+| case.rb:3:10:3:10 | After 1 [match] | case.rb:1:1:6:3 | Entry |
+| case.rb:3:10:3:10 | After 1 [no-match] | case.rb:1:1:6:3 | Entry |
+| case.rb:3:18:3:41 | After if ... | case.rb:3:10:3:10 | After 1 [match] |
+| case.rb:3:21:3:22 | After call to x2 [false] | case.rb:3:10:3:10 | After 1 [match] |
+| case.rb:3:21:3:22 | After call to x2 [true] | case.rb:3:10:3:10 | After 1 [match] |
+| case.rb:4:10:4:10 | After 2 [match] | case.rb:3:10:3:10 | After 1 [no-match] |
+| case.rb:4:10:4:10 | After 2 [no-match] | case.rb:3:10:3:10 | After 1 [no-match] |
+| case.rb:9:3:17:5 | After case ... | case.rb:8:1:18:3 | Entry |
+| case.rb:10:8:10:8 | After 0 [match] | case.rb:8:1:18:3 | Entry |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:8:1:18:3 | Entry |
+| case.rb:11:8:11:8 | After 1 [match] | case.rb:10:8:10:8 | After 0 [no-match] |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:10:8:10:8 | After 0 [no-match] |
+| case.rb:12:8:12:8 | After 2 [match] | case.rb:11:8:11:8 | After 1 [no-match] |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:11:8:11:8 | After 1 [no-match] |
+| case.rb:14:8:14:8 | After x [match] | case.rb:12:8:12:8 | After 2 [no-match] |
+| case.rb:14:8:14:8 | After x [no-match] | case.rb:12:8:12:8 | After 2 [no-match] |
+| case.rb:14:13:14:18 | After ... == ... [false] | case.rb:14:8:14:8 | After x [match] |
+| case.rb:14:13:14:18 | After ... == ... [true] | case.rb:14:8:14:8 | After x [match] |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:12:8:12:8 | After 2 [no-match] |
+| case.rb:15:8:15:8 | After x [match] | case.rb:15:5:15:28 | in ... then ... |
+| case.rb:15:8:15:8 | After x [no-match] | case.rb:15:5:15:28 | in ... then ... |
+| case.rb:15:17:15:21 | After ... < ... [false] | case.rb:15:8:15:8 | After x [match] |
+| case.rb:15:17:15:21 | After ... < ... [true] | case.rb:15:8:15:8 | After x [match] |
+| case.rb:16:5:16:10 | else ... | case.rb:15:5:15:28 | in ... then ... |
+| case.rb:21:3:23:5 | After case ... | case.rb:20:1:24:3 | Entry |
+| case.rb:22:8:22:8 | After 1 [match] | case.rb:20:1:24:3 | Entry |
+| case.rb:22:8:22:8 | After 1 [no-match] | case.rb:20:1:24:3 | Entry |
+| case.rb:27:3:29:5 | After case ... | case.rb:26:1:30:3 | Entry |
+| case.rb:28:7:28:28 | After -> { ... } [match] | case.rb:26:1:30:3 | Entry |
+| case.rb:28:7:28:28 | After -> { ... } [no-match] | case.rb:26:1:30:3 | Entry |
+| case.rb:33:3:38:5 | After case ... | case.rb:32:1:39:3 | Entry |
+| case.rb:34:8:34:9 | After [ ..., * ] [match] | case.rb:32:1:39:3 | Entry |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:32:1:39:3 | Entry |
+| case.rb:35:8:35:10 | After [ ..., * ] [match] | case.rb:34:8:34:9 | After [ ..., * ] [no-match] |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:34:8:34:9 | After [ ..., * ] [no-match] |
+| case.rb:36:8:36:12 | After [ ..., * ] [match] | case.rb:35:8:35:10 | After [ ..., * ] [no-match] |
+| case.rb:36:8:36:12 | After [ ..., * ] [no-match] | case.rb:35:8:35:10 | After [ ..., * ] [no-match] |
+| case.rb:37:8:37:26 | After [ ..., * ] [match] | case.rb:36:8:36:12 | After [ ..., * ] [no-match] |
+| case.rb:37:8:37:26 | After [ ..., * ] [no-match] | case.rb:36:8:36:12 | After [ ..., * ] [no-match] |
+| case.rb:42:3:44:5 | After case ... | case.rb:41:1:45:3 | Entry |
+| case.rb:43:8:43:21 | After [ *,...,* ] [match] | case.rb:41:1:45:3 | Entry |
+| case.rb:43:8:43:21 | After [ *,...,* ] [no-match] | case.rb:41:1:45:3 | Entry |
+| case.rb:48:3:52:5 | After case ... | case.rb:47:1:53:3 | Entry |
+| case.rb:49:8:49:34 | After { ..., ** } [match] | case.rb:47:1:53:3 | Entry |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:47:1:53:3 | Entry |
+| case.rb:50:8:50:24 | After { ..., ** } [match] | case.rb:49:8:49:34 | After { ..., ** } [no-match] |
+| case.rb:50:8:50:24 | After { ..., ** } [no-match] | case.rb:49:8:49:34 | After { ..., ** } [no-match] |
+| case.rb:51:8:51:16 | After { ..., ** } [match] | case.rb:50:8:50:24 | After { ..., ** } [no-match] |
+| case.rb:51:8:51:16 | After { ..., ** } [no-match] | case.rb:50:8:50:24 | After { ..., ** } [no-match] |
+| case.rb:56:3:60:5 | After case ... | case.rb:55:1:61:3 | Entry |
+| case.rb:57:8:57:8 | After 5 [match] | case.rb:55:1:61:3 | Entry |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:55:1:61:3 | Entry |
+| case.rb:58:8:58:10 | After var [match] | case.rb:57:8:57:8 | After 5 [no-match] |
+| case.rb:58:8:58:10 | After var [no-match] | case.rb:57:8:57:8 | After 5 [no-match] |
+| case.rb:59:8:59:20 | After "unreachable" [match] | case.rb:58:8:58:10 | After var [no-match] |
+| case.rb:59:8:59:20 | After "unreachable" [no-match] | case.rb:58:8:58:10 | After var [no-match] |
+| case.rb:64:3:66:5 | After case ... | case.rb:63:1:67:3 | Entry |
+| case.rb:65:8:65:28 | After ... \| ... [match] | case.rb:63:1:67:3 | Entry |
+| case.rb:65:8:65:28 | After ... \| ... [no-match] | case.rb:63:1:67:3 | Entry |
+| case.rb:72:3:92:5 | After case ... | case.rb:69:1:93:3 | Entry |
+| case.rb:73:8:73:8 | After 5 [match] | case.rb:69:1:93:3 | Entry |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:69:1:93:3 | Entry |
+| case.rb:74:8:74:11 | After ^... [match] | case.rb:73:8:73:8 | After 5 [no-match] |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:73:8:73:8 | After 5 [no-match] |
+| case.rb:75:8:75:15 | After "string" [match] | case.rb:74:8:74:11 | After ^... [no-match] |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:74:8:74:11 | After ^... [no-match] |
+| case.rb:76:8:76:18 | After call to [] [match] | case.rb:75:8:75:15 | After "string" [no-match] |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:75:8:75:15 | After "string" [no-match] |
+| case.rb:77:8:77:18 | After call to [] [match] | case.rb:76:8:76:18 | After call to [] [no-match] |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:76:8:76:18 | After call to [] [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] | case.rb:77:8:77:18 | After call to [] [no-match] |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:77:8:77:18 | After call to [] [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [match] | case.rb:79:8:79:14 | After _ .. _ [no-match] |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [match] | case.rb:80:8:80:12 | After _ .. _ [no-match] |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] |
+| case.rb:82:8:82:13 | After ... => ... [match] | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] |
+| case.rb:83:8:83:26 | After ... \| ... [match] | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] |
+| case.rb:84:8:84:17 | After Bar [match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] |
+| case.rb:85:8:85:23 | After -> { ... } [match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:84:8:84:17 | After Bar [no-match] |
+| case.rb:86:8:86:11 | After :foo [match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] |
+| case.rb:87:8:87:17 | After :"foo bar" [match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:86:8:86:11 | After :foo [no-match] |
+| case.rb:88:8:88:15 | After ... \| ... [match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] |
+| case.rb:89:8:89:69 | After ... \| ... [match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] |
+| case.rb:90:8:90:13 | After ( ... ) [match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:90:8:90:13 | After ( ... ) [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] |
+| case.rb:91:8:91:25 | After ( ... ) [match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:91:8:91:25 | After ( ... ) [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] |
+| case.rb:96:3:98:5 | After case ... | case.rb:95:1:99:3 | Entry |
+| case.rb:97:8:97:8 | After x [match] | case.rb:95:1:99:3 | Entry |
+| case.rb:97:8:97:8 | After x [no-match] | case.rb:95:1:99:3 | Entry |
+| case.rb:97:13:97:18 | After ... == ... [false] | case.rb:97:8:97:8 | After x [match] |
+| case.rb:97:13:97:18 | After ... == ... [true] | case.rb:97:8:97:8 | After x [match] |
+| cfg.html.erb:18:14:22:16 | After if ... | cfg.html.erb:5:16:31:12 | Entry |
+| cfg.html.erb:18:17:18:22 | After call to admin? [false] | cfg.html.erb:5:16:31:12 | Entry |
+| cfg.html.erb:18:17:18:22 | After call to admin? [true] | cfg.html.erb:5:16:31:12 | Entry |
+| cfg.rb:1:1:221:1 | Exceptional Exit | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:1:1:221:1 | Exit | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:42:8:42:8 | After 1 [match] | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:1:1:221:1 | Entry |
+| cfg.rb:43:3:43:31 | After when ... [match] | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:43:8:43:8 | After 2 [match] | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:42:8:42:8 | After 1 [no-match] |
+| cfg.rb:43:11:43:11 | After 3 [match] | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:43:11:43:11 | After 3 [no-match] | cfg.rb:43:8:43:8 | After 2 [no-match] |
+| cfg.rb:43:14:43:14 | After 4 [match] | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:43:14:43:14 | After 4 [no-match] | cfg.rb:43:11:43:11 | After 3 [no-match] |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:48:8:48:13 | After ... == ... [match] | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:41:1:45:3 | After case ... |
+| cfg.rb:49:3:49:37 | After when ... [match] | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:49:8:49:13 | After ... == ... [match] | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:49:8:49:13 | After ... == ... [no-match] | cfg.rb:48:8:48:13 | After ... == ... [no-match] |
+| cfg.rb:49:16:49:20 | After ... > ... [match] | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:49:16:49:20 | After ... > ... [no-match] | cfg.rb:49:8:49:13 | After ... == ... [no-match] |
+| cfg.rb:60:17:60:22 | After ... < ... [false] | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:60:17:60:22 | After ... < ... [true] | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:47:1:50:3 | After case ... |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:75:4:75:8 | After ... < ... [false] | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:75:4:75:8 | After ... < ... [true] | cfg.rb:60:17:60:40 | After ... ? ... : ... |
+| cfg.rb:75:17:75:43 | After elsif ... | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:75:23:75:28 | After ... > ... [false] | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:75:23:75:28 | After ... > ... [true] | cfg.rb:75:4:75:8 | After ... < ... [false] |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:75:1:75:47 | After if ... |
+| cfg.rb:90:1:93:3 | Normal Exit | cfg.rb:90:1:93:3 | Entry |
+| cfg.rb:90:5:90:5 | After defined? ... [false] | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:90:5:90:5 | After defined? ... [true] | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:77:1:86:3 | After begin ...  |
+| cfg.rb:91:6:91:10 | After ... > ... [false] | cfg.rb:90:1:93:3 | Entry |
+| cfg.rb:91:6:91:10 | After ... > ... [true] | cfg.rb:90:1:93:3 | Entry |
+| cfg.rb:101:16:101:20 | After value [match] | cfg.rb:101:1:104:3 | Entry |
+| cfg.rb:101:16:101:20 | After value [no-match] | cfg.rb:101:1:104:3 | Entry |
+| cfg.rb:101:28:101:30 | key | cfg.rb:101:1:104:3 | Entry |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:113:14:113:19 | After ... > ... [false] | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:113:14:113:19 | After ... > ... [true] | cfg.rb:90:5:90:5 | After if ... |
+| cfg.rb:136:1:136:3 | After ... / ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:136:12:136:29 | Before call to puts | cfg.rb:113:1:113:19 | After ... if ... |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:172:8:172:14 | After ... == ... [false] | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:172:8:172:14 | After ... == ... [true] | cfg.rb:136:1:136:29 | After ... rescue ... |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:174:18:174:23 | After ... == ... [false] | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:174:18:174:23 | After ... == ... [true] | cfg.rb:172:1:172:49 | After unless ... |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:174:1:174:23 | After ... unless ... |
+| cfg.rb:176:7:176:12 | After ... > ... [false] | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:176:1:176:41 | [LoopHeader] until ... |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:176:7:176:12 | After ... > ... [true] |
+| cfg.rb:179:30:179:36 | After ... == ... [false] | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:179:30:179:36 | After ... == ... [true] |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:182:7:182:12 | After ... < ... [true] | cfg.rb:182:1:186:3 | [LoopHeader] while ... |
+| cfg.rb:182:14:186:3 | do ... | cfg.rb:182:7:182:12 | After ... < ... [true] |
+| cfg.rb:184:6:184:11 | After ... == ... [false] | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:184:6:184:11 | After ... == ... [true] | cfg.rb:182:14:186:3 | do ... |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:182:7:182:12 | After ... < ... [false] |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:188:30:188:35 | After ... != ... [true] | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |
+| cfg.rb:205:4:205:5 | After call to == [false] | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:205:4:205:5 | After call to == [true] | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:188:30:188:35 | After ... != ... [false] |
+| constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [false] | constant_compound_assign.rb:1:1:22:4 | Entry |
+| constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [true] | constant_compound_assign.rb:1:1:22:4 | Entry |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:1:1:22:4 | Entry |
+| constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [false] | constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... |
+| constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [true] | constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... |
+| constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [false] | constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... |
+| constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [true] | constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... |
+| constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... | constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... |
+| exit.rb:1:1:6:3 | Exit | exit.rb:1:1:6:3 | Entry |
+| exit.rb:2:6:2:10 | After ... > ... [false] | exit.rb:1:1:6:3 | Entry |
+| exit.rb:2:6:2:10 | After ... > ... [true] | exit.rb:1:1:6:3 | Entry |
+| exit.rb:8:1:13:3 | Exit | exit.rb:8:1:13:3 | Entry |
+| exit.rb:9:6:9:10 | After ... > ... [false] | exit.rb:8:1:13:3 | Entry |
+| exit.rb:9:6:9:10 | After ... > ... [true] | exit.rb:8:1:13:3 | Entry |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:1:1:9:3 | Entry |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:1:1:9:3 | Entry |
+| ifs.rb:2:6:2:10 | After ... > ... [true] | ifs.rb:1:1:9:3 | Entry |
+| ifs.rb:4:3:7:35 | After elsif ... | ifs.rb:2:6:2:10 | After ... > ... [false] |
+| ifs.rb:4:9:4:14 | After ... <= ... [false] | ifs.rb:2:6:2:10 | After ... > ... [false] |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:2:6:2:10 | After ... > ... [false] |
+| ifs.rb:4:9:4:24 | After ... and ... [false] | ifs.rb:2:6:2:10 | After ... > ... [false] |
+| ifs.rb:4:9:4:38 | After ... and ... [false] | ifs.rb:2:6:2:10 | After ... > ... [false] |
+| ifs.rb:4:20:4:24 | After ... > ... [false] | ifs.rb:4:9:4:14 | After ... <= ... [true] |
+| ifs.rb:4:20:4:24 | After ... > ... [true] | ifs.rb:4:9:4:14 | After ... <= ... [true] |
+| ifs.rb:4:32:4:37 | After ... == ... [false] | ifs.rb:4:20:4:24 | After ... > ... [true] |
+| ifs.rb:4:32:4:37 | After ... == ... [true] | ifs.rb:4:20:4:24 | After ... > ... [true] |
+| ifs.rb:11:1:16:3 | Normal Exit | ifs.rb:11:1:16:3 | Entry |
+| ifs.rb:12:6:12:6 | After b [false] | ifs.rb:11:1:16:3 | Entry |
+| ifs.rb:12:6:12:6 | After b [true] | ifs.rb:11:1:16:3 | Entry |
+| ifs.rb:19:3:24:5 | After if ... | ifs.rb:18:1:26:3 | Entry |
+| ifs.rb:19:6:19:10 | After ... < ... [false] | ifs.rb:18:1:26:3 | Entry |
+| ifs.rb:19:6:19:10 | After ... < ... [true] | ifs.rb:18:1:26:3 | Entry |
+| ifs.rb:21:5:23:7 | After if ... | ifs.rb:19:6:19:10 | After ... < ... [true] |
+| ifs.rb:21:8:21:13 | After ... > ... [false] | ifs.rb:19:6:19:10 | After ... < ... [true] |
+| ifs.rb:21:8:21:13 | After ... > ... [true] | ifs.rb:19:6:19:10 | After ... < ... [true] |
+| ifs.rb:29:10:29:51 | After ... ? ... : ... | ifs.rb:28:1:30:3 | Entry |
+| ifs.rb:29:11:29:12 | After b1 [false] | ifs.rb:28:1:30:3 | Entry |
+| ifs.rb:29:11:29:12 | After b1 [true] | ifs.rb:28:1:30:3 | Entry |
+| ifs.rb:29:11:29:22 | After ... ? ... : ... [false] | ifs.rb:28:1:30:3 | Entry |
+| ifs.rb:29:11:29:22 | After ... ? ... : ... [true] | ifs.rb:28:1:30:3 | Entry |
+| ifs.rb:29:16:29:17 | After b2 [false] | ifs.rb:29:11:29:12 | After b1 [true] |
+| ifs.rb:29:16:29:17 | After b2 [true] | ifs.rb:29:11:29:12 | After b1 [true] |
+| ifs.rb:29:21:29:22 | After b3 [false] | ifs.rb:29:11:29:12 | After b1 [false] |
+| ifs.rb:29:21:29:22 | After b3 [true] | ifs.rb:29:11:29:12 | After b1 [false] |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:32:1:34:3 | Entry |
+| ifs.rb:33:7:33:48 | After if ... [false] | ifs.rb:32:1:34:3 | Entry |
+| ifs.rb:33:7:33:48 | After if ... [true] | ifs.rb:32:1:34:3 | Entry |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:32:1:34:3 | Entry |
+| ifs.rb:33:10:33:11 | After b1 [true] | ifs.rb:32:1:34:3 | Entry |
+| ifs.rb:33:18:33:19 | After b2 [false] | ifs.rb:33:10:33:11 | After b1 [true] |
+| ifs.rb:33:18:33:19 | After b2 [true] | ifs.rb:33:10:33:11 | After b1 [true] |
+| ifs.rb:33:21:33:44 | After elsif ... [false] | ifs.rb:33:10:33:11 | After b1 [false] |
+| ifs.rb:33:21:33:44 | After elsif ... [true] | ifs.rb:33:10:33:11 | After b1 [false] |
+| ifs.rb:33:27:33:28 | After b3 [false] | ifs.rb:33:10:33:11 | After b1 [false] |
+| ifs.rb:33:27:33:28 | After b3 [true] | ifs.rb:33:10:33:11 | After b1 [false] |
+| ifs.rb:33:35:33:36 | After b4 [false] | ifs.rb:33:27:33:28 | After b3 [true] |
+| ifs.rb:33:35:33:36 | After b4 [true] | ifs.rb:33:27:33:28 | After b3 [true] |
+| ifs.rb:33:43:33:44 | After b5 [false] | ifs.rb:33:27:33:28 | After b3 [false] |
+| ifs.rb:33:43:33:44 | After b5 [true] | ifs.rb:33:27:33:28 | After b3 [false] |
+| ifs.rb:36:1:38:17 | After ... unless ... | ifs.rb:1:1:58:4 | Entry |
+| ifs.rb:38:12:38:17 | After ... == ... [false] | ifs.rb:1:1:58:4 | Entry |
+| ifs.rb:38:12:38:17 | After ... == ... [true] | ifs.rb:1:1:58:4 | Entry |
+| ifs.rb:47:3:50:5 | After if ... | ifs.rb:46:1:52:3 | Entry |
+| ifs.rb:47:6:47:6 | After b [false] | ifs.rb:46:1:52:3 | Entry |
+| ifs.rb:47:6:47:6 | After b [true] | ifs.rb:46:1:52:3 | Entry |
+| ifs.rb:55:3:57:5 | After if ... | ifs.rb:54:1:58:3 | Entry |
+| ifs.rb:55:7:55:8 | After b1 [false] | ifs.rb:54:1:58:3 | Entry |
+| ifs.rb:55:7:55:8 | After b1 [true] | ifs.rb:54:1:58:3 | Entry |
+| ifs.rb:55:7:55:14 | After ... \|\| ... [true] | ifs.rb:54:1:58:3 | Entry |
+| ifs.rb:55:13:55:14 | After b2 [false] | ifs.rb:55:7:55:8 | After b1 [false] |
+| ifs.rb:55:13:55:14 | After b2 [true] | ifs.rb:55:7:55:8 | After b1 [false] |
+| loops.rb:2:3:5:5 | [LoopHeader] while ... | loops.rb:1:1:6:3 | Entry |
+| loops.rb:2:9:2:14 | After ... >= ... [false] | loops.rb:2:3:5:5 | [LoopHeader] while ... |
+| loops.rb:2:9:2:14 | After ... >= ... [true] | loops.rb:2:3:5:5 | [LoopHeader] while ... |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:9:3:20:5 | [LoopHeader] while ... |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:8:1:22:3 | Entry |
+| loops.rb:9:9:9:14 | After ... >= ... [false] | loops.rb:9:3:20:5 | [LoopHeader] while ... |
+| loops.rb:9:9:9:14 | After ... >= ... [true] | loops.rb:9:3:20:5 | [LoopHeader] while ... |
+| loops.rb:9:15:20:5 | do ... | loops.rb:9:9:9:14 | After ... >= ... [true] |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:9:15:20:5 | do ... |
+| loops.rb:12:8:12:14 | After ... > ... [true] | loops.rb:9:15:20:5 | do ... |
+| loops.rb:14:11:14:16 | After ... > ... [false] | loops.rb:12:8:12:14 | After ... > ... [false] |
+| loops.rb:14:11:14:16 | After ... > ... [true] | loops.rb:12:8:12:14 | After ... > ... [false] |
+| loops.rb:16:11:16:16 | After ... > ... [false] | loops.rb:14:11:14:16 | After ... > ... [false] |
+| loops.rb:16:11:16:16 | After ... > ... [true] | loops.rb:14:11:14:16 | After ... > ... [false] |
+| loops.rb:31:3:32:5 | [LoopHeader] while ... | loops.rb:30:1:33:3 | Entry |
+| loops.rb:31:9:31:13 | After ... < ... [false] | loops.rb:31:3:32:5 | [LoopHeader] while ... |
+| loops.rb:31:9:31:13 | After ... < ... [true] | loops.rb:31:3:32:5 | [LoopHeader] while ... |
+| raise.rb:7:1:12:3 | Exit | raise.rb:7:1:12:3 | Entry |
+| raise.rb:8:6:8:10 | After ... > ... [false] | raise.rb:7:1:12:3 | Entry |
+| raise.rb:8:6:8:10 | After ... > ... [true] | raise.rb:7:1:12:3 | Entry |
+| raise.rb:14:1:23:3 | Exit | raise.rb:14:1:23:3 | Entry |
+| raise.rb:15:3:21:5 | After begin ...  | raise.rb:14:1:23:3 | Entry |
+| raise.rb:16:8:16:8 | After b [false] | raise.rb:14:1:23:3 | Entry |
+| raise.rb:16:8:16:8 | After b [true] | raise.rb:14:1:23:3 | Entry |
+| raise.rb:19:10:19:19 | After ExceptionA [match] | raise.rb:16:8:16:8 | After b [true] |
+| raise.rb:19:10:19:19 | After ExceptionA [no-match] | raise.rb:16:8:16:8 | After b [true] |
+| raise.rb:26:3:32:5 | After begin ...  | raise.rb:25:1:34:3 | Entry |
+| raise.rb:27:8:27:8 | After b [false] | raise.rb:25:1:34:3 | Entry |
+| raise.rb:27:8:27:8 | After b [true] | raise.rb:25:1:34:3 | Entry |
+| raise.rb:37:3:43:5 | After begin ...  | raise.rb:36:1:45:3 | Entry |
+| raise.rb:38:8:38:8 | After b [false] | raise.rb:36:1:45:3 | Entry |
+| raise.rb:38:8:38:8 | After b [true] | raise.rb:36:1:45:3 | Entry |
+| raise.rb:48:3:53:5 | After begin ...  | raise.rb:47:1:55:3 | Entry |
+| raise.rb:49:8:49:8 | After b [false] | raise.rb:47:1:55:3 | Entry |
+| raise.rb:49:8:49:8 | After b [true] | raise.rb:47:1:55:3 | Entry |
+| raise.rb:57:1:66:3 | Exit | raise.rb:57:1:66:3 | Entry |
+| raise.rb:58:3:64:5 | After begin ...  | raise.rb:57:1:66:3 | Entry |
+| raise.rb:59:8:59:8 | After b [false] | raise.rb:57:1:66:3 | Entry |
+| raise.rb:59:8:59:8 | After b [true] | raise.rb:57:1:66:3 | Entry |
+| raise.rb:62:10:62:31 | After ..., ... [match] | raise.rb:59:8:59:8 | After b [true] |
+| raise.rb:62:10:62:31 | After ..., ... [no-match] | raise.rb:59:8:59:8 | After b [true] |
+| raise.rb:68:1:77:3 | Exceptional Exit | raise.rb:75:1:76:15 | ensure ... |
+| raise.rb:68:1:77:3 | Exit | raise.rb:75:1:76:15 | ensure ... |
+| raise.rb:68:1:77:3 | Normal Exit | raise.rb:75:1:76:15 | ensure ... |
+| raise.rb:69:3:76:15 | After ... | raise.rb:75:1:76:15 | ensure ... |
+| raise.rb:69:6:69:10 | After ... > ... [false] | raise.rb:68:1:77:3 | Entry |
+| raise.rb:69:6:69:10 | After ... > ... [true] | raise.rb:68:1:77:3 | Entry |
+| raise.rb:71:9:71:13 | After ... < ... [false] | raise.rb:69:6:69:10 | After ... > ... [false] |
+| raise.rb:71:9:71:13 | After ... < ... [true] | raise.rb:69:6:69:10 | After ... > ... [false] |
+| raise.rb:74:3:74:20 | After call to puts | raise.rb:71:9:71:13 | After ... < ... [false] |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:68:1:77:3 | Entry |
+| raise.rb:79:1:92:3 | Exceptional Exit | raise.rb:88:3:89:17 | ensure ... |
+| raise.rb:79:1:92:3 | Exit | raise.rb:88:3:89:17 | ensure ... |
+| raise.rb:79:1:92:3 | Normal Exit | raise.rb:88:3:89:17 | ensure ... |
+| raise.rb:81:3:90:5 | After begin ...  | raise.rb:88:3:89:17 | ensure ... |
+| raise.rb:82:8:82:12 | After ... > ... [false] | raise.rb:79:1:92:3 | Entry |
+| raise.rb:82:8:82:12 | After ... > ... [true] | raise.rb:79:1:92:3 | Entry |
+| raise.rb:84:11:84:15 | After ... < ... [false] | raise.rb:82:8:82:12 | After ... > ... [false] |
+| raise.rb:84:11:84:15 | After ... < ... [true] | raise.rb:82:8:82:12 | After ... > ... [false] |
+| raise.rb:87:5:87:22 | After call to puts | raise.rb:84:11:84:15 | After ... < ... [false] |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:79:1:92:3 | Entry |
+| raise.rb:94:1:119:3 | Exceptional Exit | raise.rb:114:1:118:5 | ensure ... |
+| raise.rb:94:1:119:3 | Exit | raise.rb:114:1:118:5 | ensure ... |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:116:6:116:7 | After b2 [false] |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:94:1:119:3 | Entry |
+| raise.rb:95:3:118:5 | After ... | raise.rb:116:6:116:7 | After b2 [false] |
+| raise.rb:96:3:112:5 | After begin ...  | raise.rb:105:5:111:7 | After begin ...  |
+| raise.rb:97:8:97:12 | After ... > ... [false] | raise.rb:95:3:95:17 | After call to puts |
+| raise.rb:97:8:97:12 | After ... > ... [true] | raise.rb:95:3:95:17 | After call to puts |
+| raise.rb:99:11:99:15 | After ... < ... [false] | raise.rb:97:8:97:12 | After ... > ... [false] |
+| raise.rb:99:11:99:15 | After ... < ... [true] | raise.rb:97:8:97:12 | After ... > ... [false] |
+| raise.rb:102:5:102:22 | After call to puts | raise.rb:99:11:99:15 | After ... < ... [false] |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:95:3:95:17 | After call to puts |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:103:3:111:7 | ensure ... |
+| raise.rb:105:5:111:7 | After begin ...  | raise.rb:110:7:110:25 | After call to puts |
+| raise.rb:106:10:106:11 | After b1 [false] | raise.rb:104:5:104:23 | After call to puts |
+| raise.rb:106:10:106:11 | After b1 [true] | raise.rb:104:5:104:23 | After call to puts |
+| raise.rb:109:5:110:25 | ensure ... | raise.rb:104:5:104:23 | After call to puts |
+| raise.rb:110:7:110:25 | After call to puts | raise.rb:109:5:110:25 | ensure ... |
+| raise.rb:113:3:113:15 | After call to puts | raise.rb:96:3:112:5 | After begin ...  |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:94:1:119:3 | Entry |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:114:1:118:5 | ensure ... |
+| raise.rb:116:6:116:7 | After b2 [true] | raise.rb:114:1:118:5 | ensure ... |
+| raise.rb:121:1:126:3 | Exit | raise.rb:121:1:126:3 | Entry |
+| raise.rb:121:9:121:9 | After p [match] | raise.rb:121:1:126:3 | Entry |
+| raise.rb:121:9:121:9 | After p [no-match] | raise.rb:121:1:126:3 | Entry |
+| raise.rb:128:1:140:3 | Exceptional Exit | raise.rb:136:3:137:17 | ensure ... |
+| raise.rb:128:1:140:3 | Exit | raise.rb:136:3:137:17 | ensure ... |
+| raise.rb:129:3:138:5 | After begin ...  | raise.rb:136:3:137:17 | ensure ... |
+| raise.rb:130:8:130:8 | After b [false] | raise.rb:128:1:140:3 | Entry |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:128:1:140:3 | Entry |
+| raise.rb:133:10:133:19 | After ExceptionA [match] | raise.rb:130:8:130:8 | After b [true] |
+| raise.rb:133:10:133:19 | After ExceptionA [no-match] | raise.rb:130:8:130:8 | After b [true] |
+| raise.rb:134:10:134:19 | After ExceptionB [match] | raise.rb:133:10:133:19 | After ExceptionA [no-match] |
+| raise.rb:134:10:134:19 | After ExceptionB [no-match] | raise.rb:133:10:133:19 | After ExceptionA [no-match] |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:128:1:140:3 | Entry |
+| raise.rb:143:6:143:6 | After b [false] | raise.rb:142:1:148:3 | Entry |
+| raise.rb:143:6:143:6 | After b [true] | raise.rb:142:1:148:3 | Entry |
+| raise.rb:146:1:147:10 | ensure ... | raise.rb:142:1:148:3 | Entry |
+| raise.rb:155:16:155:50 | Exit | raise.rb:155:16:155:50 | Entry |
+| raise.rb:155:37:155:48 | After call to nil? [false] | raise.rb:155:16:155:50 | Entry |
+| raise.rb:155:37:155:48 | After call to nil? [true] | raise.rb:155:16:155:50 | Entry |
+| raise.rb:160:9:162:7 | Exit | raise.rb:160:9:162:7 | Entry |
+| raise.rb:161:23:161:23 | After x [false] | raise.rb:160:9:162:7 | Entry |
+| raise.rb:161:23:161:23 | After x [true] | raise.rb:160:9:162:7 | Entry |
+| raise.rb:172:1:182:3 | Exit | raise.rb:172:1:182:3 | Entry |
+| raise.rb:172:1:182:3 | Normal Exit | raise.rb:172:1:182:3 | Entry |
+| raise.rb:174:8:174:9 | After b1 [false] | raise.rb:172:1:182:3 | Entry |
+| raise.rb:174:8:174:9 | After b1 [true] | raise.rb:172:1:182:3 | Entry |
+| raise.rb:174:8:174:23 | After ... \|\| ... [true] | raise.rb:172:1:182:3 | Entry |
+| raise.rb:174:14:174:23 | After ... == ... [false] | raise.rb:174:8:174:9 | After b1 [false] |
+| raise.rb:174:14:174:23 | After ... == ... [true] | raise.rb:174:8:174:9 | After b1 [false] |
+| raise.rb:179:3:180:12 | rescue ... | raise.rb:174:8:174:9 | After b1 [false] |
+| raise.rb:179:10:179:19 | After ExceptionA [match] | raise.rb:179:3:180:12 | rescue ... |
+| raise.rb:179:10:179:19 | After ExceptionA [no-match] | raise.rb:179:3:180:12 | rescue ... |
 controls
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:9:5:9:23 | self | true |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:3:5:5:7 | if ... | true |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:3:8:3:8 | x | true |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:4:7:4:11 | break | true |
-| break_ensure.rb:3:8:3:8 | x | break_ensure.rb:3:5:5:7 | if ... | false |
-| break_ensure.rb:3:8:3:8 | x | break_ensure.rb:4:7:4:11 | break | true |
-| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:9:5:9:23 | [ensure: exception] self | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:16:7:18:9 | if ... | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:16:10:16:10 | x | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:17:9:17:13 | break | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | if ... | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:10:20:10 | [ensure: exception] y | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | [ensure: break] self | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | [ensure: exception] self | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | self | true |
-| break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:21:9:21:20 | self | true |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:16:7:18:9 | if ... | false |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:17:9:17:13 | break | true |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | true |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:7:22:9 | if ... | false |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:21:9:21:20 | [ensure: break] self | true |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:21:9:21:20 | self | false |
-| break_ensure.rb:17:9:17:13 | break | break_ensure.rb:21:9:21:20 | [ensure: break] self | true |
-| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:21:9:21:20 | [ensure: exception] self | true |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:29:5:31:7 | if ... | false |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:30:7:30:12 | return | true |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | true |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:5:39:7 | while ... | false |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:11:33:11 | [ensure: return] y | true |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:11:33:11 | y | false |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | true |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:9:37:11 | if ... | false |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:12:35:12 | [ensure: return] x | true |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:12:35:12 | x | false |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:36:11:36:15 | [ensure: return] break | true |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:36:11:36:15 | break | false |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | true |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:35:12:35:12 | [ensure: exception] x | true |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:36:11:36:15 | [ensure: exception] break | true |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | true |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:35:12:35:12 | [ensure: return] x | true |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:36:11:36:15 | [ensure: return] break | true |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:9:37:11 | if ... | true |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:12:35:12 | x | true |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:36:11:36:15 | break | true |
-| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | false |
-| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:36:11:36:15 | [ensure: exception] break | true |
-| break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | false |
-| break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:36:11:36:15 | [ensure: return] break | true |
-| break_ensure.rb:35:12:35:12 | x | break_ensure.rb:35:9:37:11 | if ... | false |
-| break_ensure.rb:35:12:35:12 | x | break_ensure.rb:36:11:36:15 | break | true |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:47:7:49:9 | if ... | true |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:47:10:47:10 | x | true |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:48:9:48:16 | self | true |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | true |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | if ... | true |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:10:51:10 | [ensure: exception] x | true |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:52:15:52:16 | 10 | true |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | true |
-| break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:51:7:53:9 | if ... | false |
-| break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:52:15:52:16 | 10 | true |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:47:7:49:9 | if ... | false |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:48:9:48:16 | self | true |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:51:7:53:9 | if ... | false |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:52:15:52:16 | 10 | false |
-| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | false |
-| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | true |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:3:5:3:42 | [match] when ... | match |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:3:5:3:42 | [no-match] when ... | no-match |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:3:18:3:41 | if ... | match |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:3:21:3:22 | self | match |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:3:29:3:37 | self | match |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:4:5:4:24 | [match] when ... | no-match |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:4:5:4:24 | [no-match] when ... | no-match |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:4:10:4:10 | 2 | no-match |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:4:17:4:24 | self | no-match |
-| case.rb:3:5:3:42 | [match] when ... | case.rb:3:18:3:41 | if ... | match |
-| case.rb:3:5:3:42 | [match] when ... | case.rb:3:21:3:22 | self | match |
-| case.rb:3:5:3:42 | [match] when ... | case.rb:3:29:3:37 | self | match |
-| case.rb:3:5:3:42 | [no-match] when ... | case.rb:4:5:4:24 | [match] when ... | no-match |
-| case.rb:3:5:3:42 | [no-match] when ... | case.rb:4:5:4:24 | [no-match] when ... | no-match |
-| case.rb:3:5:3:42 | [no-match] when ... | case.rb:4:10:4:10 | 2 | no-match |
-| case.rb:3:5:3:42 | [no-match] when ... | case.rb:4:17:4:24 | self | no-match |
-| case.rb:3:21:3:22 | self | case.rb:3:29:3:37 | self | true |
-| case.rb:4:5:4:24 | [match] when ... | case.rb:4:17:4:24 | self | match |
-| case.rb:4:10:4:10 | 2 | case.rb:4:5:4:24 | [match] when ... | match |
-| case.rb:4:10:4:10 | 2 | case.rb:4:5:4:24 | [no-match] when ... | no-match |
-| case.rb:4:10:4:10 | 2 | case.rb:4:17:4:24 | self | match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:11:5:11:15 | in ... then ... | no-match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:11:15:11:15 | 3 | no-match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:12:5:13:7 | in ... then ... | no-match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:13:7:13:7 | 4 | no-match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:14:5:14:25 | in ... then ... | no-match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:14:13:14:13 | x | no-match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:14:25:14:25 | 6 | no-match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:15:5:15:28 | in ... then ... | no-match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:15:17:15:17 | x | no-match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:15:28:15:28 | 7 | no-match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:16:10:16:10 | 8 | no-match |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:11:15:11:15 | 3 | match |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:12:5:13:7 | in ... then ... | no-match |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:13:7:13:7 | 4 | no-match |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:14:5:14:25 | in ... then ... | no-match |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:14:13:14:13 | x | no-match |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:14:25:14:25 | 6 | no-match |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:15:5:15:28 | in ... then ... | no-match |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:15:17:15:17 | x | no-match |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:15:28:15:28 | 7 | no-match |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:16:10:16:10 | 8 | no-match |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:13:7:13:7 | 4 | match |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:14:5:14:25 | in ... then ... | no-match |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:14:13:14:13 | x | no-match |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:14:25:14:25 | 6 | no-match |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:15:5:15:28 | in ... then ... | no-match |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:15:17:15:17 | x | no-match |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:15:28:15:28 | 7 | no-match |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:16:10:16:10 | 8 | no-match |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:14:13:14:13 | x | match |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:14:25:14:25 | 6 | match |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:15:5:15:28 | in ... then ... | match |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:15:17:15:17 | x | match |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:15:28:15:28 | 7 | match |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:16:10:16:10 | 8 | match |
-| case.rb:14:13:14:13 | x | case.rb:14:25:14:25 | 6 | true |
-| case.rb:14:13:14:13 | x | case.rb:15:5:15:28 | in ... then ... | false |
-| case.rb:14:13:14:13 | x | case.rb:15:17:15:17 | x | false |
-| case.rb:14:13:14:13 | x | case.rb:15:28:15:28 | 7 | false |
-| case.rb:14:13:14:13 | x | case.rb:16:10:16:10 | 8 | false |
-| case.rb:15:5:15:28 | in ... then ... | case.rb:15:17:15:17 | x | match |
-| case.rb:15:5:15:28 | in ... then ... | case.rb:15:28:15:28 | 7 | match |
-| case.rb:15:5:15:28 | in ... then ... | case.rb:16:10:16:10 | 8 | match |
-| case.rb:15:17:15:17 | x | case.rb:15:28:15:28 | 7 | false |
-| case.rb:15:17:15:17 | x | case.rb:16:10:16:10 | 8 | true |
-| case.rb:20:1:24:3 | enter case_match_no_match | case.rb:21:3:23:5 | case ... | match |
-| case.rb:26:1:30:3 | enter case_match_raise | case.rb:27:3:29:5 | case ... | match |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:32:1:39:3 | exit case_match_array (abnormal) | no-match |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:35:5:35:11 | in ... then ... | no-match |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:35:9:35:9 | x | no-match |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:36:5:36:13 | in ... then ... | no-match |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:36:9:36:9 | x | no-match |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:37:5:37:27 | in ... then ... | no-match |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:37:8:37:26 | [ ..., * ] | no-match |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:37:12:37:12 | a | no-match |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:37:15:37:15 | b | no-match |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:37:19:37:19 | c | no-match |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:37:25:37:25 | e | no-match |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:32:1:39:3 | exit case_match_array (abnormal) | no-match |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:35:9:35:9 | x | false |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:35:9:35:9 | x | match |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:35:9:35:9 | x | true |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:36:5:36:13 | in ... then ... | no-match |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:36:9:36:9 | x | no-match |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:37:5:37:27 | in ... then ... | no-match |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:37:8:37:26 | [ ..., * ] | no-match |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:37:12:37:12 | a | no-match |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:37:15:37:15 | b | no-match |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:37:19:37:19 | c | no-match |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:37:25:37:25 | e | no-match |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:32:1:39:3 | exit case_match_array (abnormal) | no-match |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:36:9:36:9 | x | false |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:36:9:36:9 | x | match |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:36:9:36:9 | x | true |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:37:5:37:27 | in ... then ... | no-match |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:37:8:37:26 | [ ..., * ] | no-match |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:37:12:37:12 | a | no-match |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:37:15:37:15 | b | no-match |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:37:19:37:19 | c | no-match |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:37:25:37:25 | e | no-match |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:8:37:26 | [ ..., * ] | match |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:12:37:12 | a | match |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:15:37:15 | b | match |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:19:37:19 | c | match |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:25:37:25 | e | match |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:12:37:12 | a | false |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:12:37:12 | a | match |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:12:37:12 | a | true |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:15:37:15 | b | false |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:15:37:15 | b | match |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:15:37:15 | b | true |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:19:37:19 | c | false |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:19:37:19 | c | match |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:19:37:19 | c | true |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:25:37:25 | e | false |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:25:37:25 | e | match |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:25:37:25 | e | true |
-| case.rb:37:12:37:12 | a | case.rb:37:15:37:15 | b | match |
-| case.rb:37:12:37:12 | a | case.rb:37:19:37:19 | c | match |
-| case.rb:37:12:37:12 | a | case.rb:37:25:37:25 | e | match |
-| case.rb:37:15:37:15 | b | case.rb:37:19:37:19 | c | match |
-| case.rb:37:15:37:15 | b | case.rb:37:25:37:25 | e | match |
-| case.rb:37:19:37:19 | c | case.rb:37:25:37:25 | e | match |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:10:43:10 | x | false |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:10:43:10 | x | match |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:10:43:10 | x | true |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:16:43:16 | 2 | false |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:16:43:16 | 2 | match |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:16:43:16 | 2 | true |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:20:43:20 | y | false |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:20:43:20 | y | match |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:20:43:20 | y | true |
-| case.rb:43:10:43:10 | x | case.rb:43:16:43:16 | 2 | match |
-| case.rb:43:10:43:10 | x | case.rb:43:20:43:20 | y | match |
-| case.rb:43:16:43:16 | 2 | case.rb:43:20:43:20 | y | match |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:49:8:49:34 | { ..., ** } | match |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:49:20:49:20 | 1 | match |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:49:23:49:23 | a | match |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:49:29:49:32 | rest | match |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:20:49:20 | 1 | false |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:20:49:20 | 1 | match |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:20:49:20 | 1 | true |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:23:49:23 | a | false |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:23:49:23 | a | match |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:23:49:23 | a | true |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:29:49:32 | rest | false |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:29:49:32 | rest | match |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:29:49:32 | rest | true |
-| case.rb:49:20:49:20 | 1 | case.rb:49:23:49:23 | a | match |
-| case.rb:49:20:49:20 | 1 | case.rb:49:29:49:32 | rest | match |
-| case.rb:49:23:49:23 | a | case.rb:49:29:49:32 | rest | match |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:50:8:50:24 | { ..., ** } | match |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:50:16:50:16 | 1 | match |
-| case.rb:50:8:50:24 | { ..., ** } | case.rb:50:16:50:16 | 1 | false |
-| case.rb:50:8:50:24 | { ..., ** } | case.rb:50:16:50:16 | 1 | match |
-| case.rb:50:8:50:24 | { ..., ** } | case.rb:50:16:50:16 | 1 | true |
-| case.rb:51:5:51:17 | in ... then ... | case.rb:51:8:51:16 | { ..., ** } | match |
-| case.rb:55:1:61:3 | enter case_match_variable | case.rb:58:5:58:10 | in ... then ... | no-match |
-| case.rb:63:1:67:3 | enter case_match_underscore | case.rb:65:12:65:12 | _ | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:74:5:74:11 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:75:5:75:15 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:76:5:76:18 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:77:5:77:18 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:78:5:78:19 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:79:5:79:14 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:80:5:80:12 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:81:5:81:11 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:82:5:82:20 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:82:13:82:13 | x | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:82:20:82:20 | 1 | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:83:5:83:26 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:83:12:83:15 | ^... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:83:20:83:25 | string | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:14:89:17 | self | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:21:89:24 | true | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:28:89:32 | false | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:75:5:75:15 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:76:5:76:18 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:77:5:77:18 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:78:5:78:19 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:79:5:79:14 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:80:5:80:12 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:81:5:81:11 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:82:5:82:20 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:82:13:82:13 | x | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:82:20:82:20 | 1 | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:83:5:83:26 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:83:12:83:15 | ^... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:83:20:83:25 | string | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:76:5:76:18 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:77:5:77:18 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:78:5:78:19 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:79:5:79:14 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:80:5:80:12 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:81:5:81:11 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:82:5:82:20 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:82:13:82:13 | x | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:82:20:82:20 | 1 | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:83:5:83:26 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:83:12:83:15 | ^... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:83:20:83:25 | string | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:77:5:77:18 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:78:5:78:19 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:79:5:79:14 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:80:5:80:12 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:81:5:81:11 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:82:5:82:20 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:82:13:82:13 | x | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:82:20:82:20 | 1 | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:83:5:83:26 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:83:12:83:15 | ^... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:83:20:83:25 | string | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:78:5:78:19 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:79:5:79:14 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:80:5:80:12 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:81:5:81:11 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:82:5:82:20 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:82:13:82:13 | x | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:82:20:82:20 | 1 | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:83:5:83:26 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:83:12:83:15 | ^... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:83:20:83:25 | string | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:79:5:79:14 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:80:5:80:12 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:81:5:81:11 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:82:5:82:20 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:82:13:82:13 | x | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:82:20:82:20 | 1 | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:83:5:83:26 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:83:12:83:15 | ^... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:83:20:83:25 | string | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:80:5:80:12 | in ... then ... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:81:5:81:11 | in ... then ... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:82:5:82:20 | in ... then ... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:82:13:82:13 | x | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:82:20:82:20 | 1 | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:83:5:83:26 | in ... then ... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:83:12:83:15 | ^... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:83:20:83:25 | string | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:81:5:81:11 | in ... then ... | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:82:5:82:20 | in ... then ... | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:82:13:82:13 | x | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:82:20:82:20 | 1 | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:83:5:83:26 | in ... then ... | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:83:12:83:15 | ^... | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:83:20:83:25 | string | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:82:5:82:20 | in ... then ... | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:82:13:82:13 | x | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:82:20:82:20 | 1 | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:83:5:83:26 | in ... then ... | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:83:12:83:15 | ^... | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:83:20:83:25 | string | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:82:13:82:13 | x | match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:82:20:82:20 | 1 | match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:83:5:83:26 | in ... then ... | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:83:12:83:15 | ^... | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:83:20:83:25 | string | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:82:13:82:13 | x | case.rb:82:20:82:20 | 1 | match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:83:12:83:15 | ^... | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:83:20:83:25 | string | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:83:20:83:25 | string | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:83:20:83:25 | string | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:83:20:83:25 | string | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:83:20:83:25 | string | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:83:20:83:25 | string | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:83:20:83:25 | string | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:83:20:83:25 | string | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:83:20:83:25 | string | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:83:20:83:25 | string | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:83:20:83:25 | string | case.rb:89:14:89:17 | self | no-match |
-| case.rb:83:20:83:25 | string | case.rb:89:21:89:24 | true | no-match |
-| case.rb:83:20:83:25 | string | case.rb:89:28:89:32 | false | no-match |
-| case.rb:83:20:83:25 | string | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:83:20:83:25 | string | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:83:20:83:25 | string | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:83:20:83:25 | string | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:83:20:83:25 | string | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:83:20:83:25 | string | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:83:20:83:25 | string | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:83:20:83:25 | string | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:89:14:89:17 | self | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:89:21:89:24 | true | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:89:28:89:32 | false | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:21:89:24 | true | no-match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:28:89:32 | false | no-match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:89:14:89:17 | self | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:89:14:89:17 | self | case.rb:89:21:89:24 | true | no-match |
-| case.rb:89:14:89:17 | self | case.rb:89:28:89:32 | false | no-match |
-| case.rb:89:14:89:17 | self | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:89:14:89:17 | self | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:89:14:89:17 | self | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:89:14:89:17 | self | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:89:14:89:17 | self | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:89:14:89:17 | self | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:89:14:89:17 | self | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:89:14:89:17 | self | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:89:21:89:24 | true | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:89:21:89:24 | true | case.rb:89:28:89:32 | false | no-match |
-| case.rb:89:21:89:24 | true | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:89:21:89:24 | true | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:89:21:89:24 | true | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:89:21:89:24 | true | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:89:21:89:24 | true | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:89:21:89:24 | true | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:89:21:89:24 | true | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:89:21:89:24 | true | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:89:28:89:32 | false | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:89:28:89:32 | false | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:89:28:89:32 | false | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:89:28:89:32 | false | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:89:28:89:32 | false | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:89:28:89:32 | false | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:89:28:89:32 | false | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:89:28:89:32 | false | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:89:28:89:32 | false | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:91:5:91:25 | in ... then ... | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:91:5:91:25 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:91:5:91:25 | in ... then ... | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:91:5:91:25 | in ... then ... | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:91:13:91:14 | "" | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:91:13:91:14 | "" | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:91:13:91:14 | "" | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:91:18:91:19 | [ ..., * ] | case.rb:69:1:93:3 | exit case_match_various (abnormal) | no-match |
-| case.rb:91:18:91:19 | [ ..., * ] | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:95:1:99:3 | exit case_match_guard_no_else | match |
-| case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | match |
-| case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:97:13:97:13 | x | match |
-| case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:97:25:97:25 | 6 | match |
-| case.rb:97:13:97:13 | x | case.rb:97:25:97:25 | 6 | true |
-| cfg.html.erb:5:16:31:12 | enter cfg.html.erb | cfg.html.erb:19:19:19:32 | self | true |
-| cfg.html.erb:5:16:31:12 | enter cfg.html.erb | cfg.html.erb:21:19:21:32 | self | false |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:32:9:32:9 | 1 | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:35:1:37:3 | if ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:41:1:45:3 | case ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:42:3:42:24 | [match] when ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:42:3:42:24 | [no-match] when ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:42:15:42:24 | self | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:43:3:43:31 | [match] when ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:43:3:43:31 | [no-match] when ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:43:8:43:8 | 2 | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:43:11:43:11 | 3 | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:43:14:43:14 | 4 | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:43:21:43:31 | self | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:44:8:44:18 | self | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:47:1:50:3 | case ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:48:3:48:29 | [match] when ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:48:3:48:29 | [no-match] when ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:48:20:48:29 | self | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:49:3:49:37 | [match] when ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:49:3:49:37 | [no-match] when ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:49:8:49:8 | b | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:49:16:49:16 | b | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:49:27:49:37 | self | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:60:17:60:40 | ... ? ... : ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:60:27:60:31 | hello | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:60:37:60:39 | bye | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:75:1:75:47 | if ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:75:15:75:15 | 0 | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:75:17:75:43 | elsif ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:75:23:75:23 | x | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:75:35:75:36 | 10 | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:75:43:75:43 | x | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:90:5:90:5 | [false] ! ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:90:5:90:5 | [true] ! ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:90:5:90:5 | if ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:90:5:90:5 | x | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:113:1:113:9 | self | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:113:1:113:19 | ... if ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:136:1:136:29 | ... rescue ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:136:12:136:29 | self | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:172:1:172:49 | unless ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:172:21:172:29 | self | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:172:36:172:45 | self | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:174:1:174:9 | self | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:174:1:174:23 | ... unless ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:176:1:176:41 | until ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:176:7:176:7 | x | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:176:17:176:17 | x | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:179:1:179:36 | ... until ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:179:2:179:13 | self | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:179:30:179:30 | i | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:182:1:186:3 | while ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:182:7:182:7 | x | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:183:3:183:3 | x | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:184:3:184:25 | if ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:184:18:184:21 | redo | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:188:1:188:35 | ... while ... | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:188:2:188:13 | self | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:188:30:188:30 | i | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:205:1:205:3 | __synth__0__1 | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:205:1:205:3 | nil | true |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:205:4:205:5 | if ... | true |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:35:1:37:3 | if ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:41:1:45:3 | case ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:42:3:42:24 | [match] when ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:42:3:42:24 | [no-match] when ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:42:15:42:24 | self | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:43:3:43:31 | [match] when ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:43:3:43:31 | [no-match] when ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:43:8:43:8 | 2 | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:43:11:43:11 | 3 | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:43:14:43:14 | 4 | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:43:21:43:31 | self | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:44:8:44:18 | self | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:47:1:50:3 | case ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:48:3:48:29 | [match] when ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:48:3:48:29 | [no-match] when ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:48:20:48:29 | self | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:49:3:49:37 | [match] when ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:49:3:49:37 | [no-match] when ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:49:8:49:8 | b | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:49:16:49:16 | b | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:49:27:49:37 | self | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:60:17:60:40 | ... ? ... : ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:60:27:60:31 | hello | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:60:37:60:39 | bye | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:75:1:75:47 | if ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:75:15:75:15 | 0 | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:75:17:75:43 | elsif ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:75:23:75:23 | x | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:75:35:75:36 | 10 | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:75:43:75:43 | x | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:90:5:90:5 | [false] ! ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:90:5:90:5 | [true] ! ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:90:5:90:5 | if ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:90:5:90:5 | x | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:113:1:113:9 | self | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:113:1:113:19 | ... if ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:136:1:136:29 | ... rescue ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:136:12:136:29 | self | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:172:1:172:49 | unless ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:172:21:172:29 | self | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:172:36:172:45 | self | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:174:1:174:9 | self | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:174:1:174:23 | ... unless ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:176:1:176:41 | until ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:176:7:176:7 | x | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:176:17:176:17 | x | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:179:1:179:36 | ... until ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:179:2:179:13 | self | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:179:30:179:30 | i | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:182:1:186:3 | while ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:182:7:182:7 | x | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:183:3:183:3 | x | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:184:3:184:25 | if ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:184:18:184:21 | redo | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:188:1:188:35 | ... while ... | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:188:2:188:13 | self | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:188:30:188:30 | i | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:205:1:205:3 | __synth__0__1 | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:205:1:205:3 | nil | false |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:205:4:205:5 | if ... | false |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:42:3:42:24 | [match] when ... | match |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:42:3:42:24 | [no-match] when ... | no-match |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:42:15:42:24 | self | match |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:43:3:43:31 | [match] when ... | no-match |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:43:3:43:31 | [no-match] when ... | no-match |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:43:8:43:8 | 2 | no-match |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:43:11:43:11 | 3 | no-match |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:43:14:43:14 | 4 | no-match |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:43:21:43:31 | self | no-match |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:44:8:44:18 | self | no-match |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:48:3:48:29 | [match] when ... | match |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:48:3:48:29 | [no-match] when ... | no-match |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:48:20:48:29 | self | match |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:49:3:49:37 | [match] when ... | no-match |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:49:3:49:37 | [no-match] when ... | no-match |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:49:8:49:8 | b | no-match |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:49:16:49:16 | b | no-match |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:49:27:49:37 | self | no-match |
-| cfg.rb:42:3:42:24 | [match] when ... | cfg.rb:42:15:42:24 | self | match |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:3:43:31 | [match] when ... | no-match |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:3:43:31 | [no-match] when ... | no-match |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:8:43:8 | 2 | no-match |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:11:43:11 | 3 | no-match |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:14:43:14 | 4 | no-match |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:21:43:31 | self | no-match |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:44:8:44:18 | self | no-match |
-| cfg.rb:43:3:43:31 | [match] when ... | cfg.rb:43:21:43:31 | self | match |
-| cfg.rb:43:3:43:31 | [no-match] when ... | cfg.rb:44:8:44:18 | self | no-match |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:3:43:31 | [no-match] when ... | no-match |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:11:43:11 | 3 | no-match |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:14:43:14 | 4 | no-match |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:44:8:44:18 | self | no-match |
-| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:3:43:31 | [no-match] when ... | no-match |
-| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:14:43:14 | 4 | no-match |
-| cfg.rb:43:11:43:11 | 3 | cfg.rb:44:8:44:18 | self | no-match |
-| cfg.rb:43:14:43:14 | 4 | cfg.rb:43:3:43:31 | [no-match] when ... | no-match |
-| cfg.rb:43:14:43:14 | 4 | cfg.rb:44:8:44:18 | self | no-match |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:60:27:60:31 | hello | true |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:60:37:60:39 | bye | false |
-| cfg.rb:48:3:48:29 | [match] when ... | cfg.rb:48:20:48:29 | self | match |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:49:3:49:37 | [match] when ... | no-match |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:49:3:49:37 | [no-match] when ... | no-match |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:49:8:49:8 | b | no-match |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:49:16:49:16 | b | no-match |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:49:27:49:37 | self | no-match |
-| cfg.rb:49:3:49:37 | [match] when ... | cfg.rb:49:27:49:37 | self | match |
-| cfg.rb:49:8:49:8 | b | cfg.rb:49:3:49:37 | [no-match] when ... | no-match |
-| cfg.rb:49:8:49:8 | b | cfg.rb:49:16:49:16 | b | no-match |
-| cfg.rb:49:16:49:16 | b | cfg.rb:49:3:49:37 | [no-match] when ... | no-match |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:75:15:75:15 | 0 | true |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:75:17:75:43 | elsif ... | false |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:75:23:75:23 | x | false |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:75:35:75:36 | 10 | false |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:75:43:75:43 | x | false |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:90:5:90:5 | [false] ! ... | true |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:90:5:90:5 | [true] ! ... | false |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:90:5:90:5 | x | false |
-| cfg.rb:75:23:75:23 | x | cfg.rb:75:35:75:36 | 10 | true |
-| cfg.rb:75:23:75:23 | x | cfg.rb:75:43:75:43 | x | false |
-| cfg.rb:90:1:93:3 | enter { ... } | cfg.rb:91:3:91:24 | if ... | false |
-| cfg.rb:90:1:93:3 | enter { ... } | cfg.rb:91:17:91:20 | next | true |
-| cfg.rb:90:5:90:5 | [true] ! ... | cfg.rb:90:5:90:5 | x | true |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:113:1:113:9 | self | true |
-| cfg.rb:101:1:104:3 | enter parameters | cfg.rb:101:24:101:25 | 42 | false |
-| cfg.rb:101:1:104:3 | enter parameters | cfg.rb:101:24:101:25 | 42 | no-match |
-| cfg.rb:101:1:104:3 | enter parameters | cfg.rb:101:24:101:25 | 42 | true |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:172:21:172:29 | self | false |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:172:36:172:45 | self | true |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:174:1:174:9 | self | false |
-| cfg.rb:176:7:176:7 | x | cfg.rb:176:1:176:41 | until ... | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:176:17:176:17 | x | false |
-| cfg.rb:176:7:176:7 | x | cfg.rb:179:1:179:36 | ... until ... | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:179:2:179:13 | self | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:179:30:179:30 | i | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:182:1:186:3 | while ... | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:182:7:182:7 | x | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:183:3:183:3 | x | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:184:3:184:25 | if ... | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:184:18:184:21 | redo | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:188:1:188:35 | ... while ... | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:188:2:188:13 | self | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:188:30:188:30 | i | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:205:1:205:3 | __synth__0__1 | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:205:1:205:3 | nil | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:205:4:205:5 | if ... | true |
-| cfg.rb:179:30:179:30 | i | cfg.rb:179:1:179:36 | ... until ... | true |
-| cfg.rb:179:30:179:30 | i | cfg.rb:179:2:179:13 | self | false |
-| cfg.rb:179:30:179:30 | i | cfg.rb:182:1:186:3 | while ... | true |
-| cfg.rb:179:30:179:30 | i | cfg.rb:182:7:182:7 | x | true |
-| cfg.rb:179:30:179:30 | i | cfg.rb:183:3:183:3 | x | true |
-| cfg.rb:179:30:179:30 | i | cfg.rb:184:3:184:25 | if ... | true |
-| cfg.rb:179:30:179:30 | i | cfg.rb:184:18:184:21 | redo | true |
-| cfg.rb:179:30:179:30 | i | cfg.rb:188:1:188:35 | ... while ... | true |
-| cfg.rb:179:30:179:30 | i | cfg.rb:188:2:188:13 | self | true |
-| cfg.rb:179:30:179:30 | i | cfg.rb:188:30:188:30 | i | true |
-| cfg.rb:179:30:179:30 | i | cfg.rb:205:1:205:3 | __synth__0__1 | true |
-| cfg.rb:179:30:179:30 | i | cfg.rb:205:1:205:3 | nil | true |
-| cfg.rb:179:30:179:30 | i | cfg.rb:205:4:205:5 | if ... | true |
-| cfg.rb:182:7:182:7 | x | cfg.rb:182:1:186:3 | while ... | false |
-| cfg.rb:182:7:182:7 | x | cfg.rb:183:3:183:3 | x | true |
-| cfg.rb:182:7:182:7 | x | cfg.rb:184:3:184:25 | if ... | true |
-| cfg.rb:182:7:182:7 | x | cfg.rb:184:18:184:21 | redo | true |
-| cfg.rb:182:7:182:7 | x | cfg.rb:188:1:188:35 | ... while ... | false |
-| cfg.rb:182:7:182:7 | x | cfg.rb:188:2:188:13 | self | false |
-| cfg.rb:182:7:182:7 | x | cfg.rb:188:30:188:30 | i | false |
-| cfg.rb:182:7:182:7 | x | cfg.rb:205:1:205:3 | __synth__0__1 | false |
-| cfg.rb:182:7:182:7 | x | cfg.rb:205:1:205:3 | nil | false |
-| cfg.rb:182:7:182:7 | x | cfg.rb:205:4:205:5 | if ... | false |
-| cfg.rb:183:3:183:3 | x | cfg.rb:184:3:184:25 | if ... | false |
-| cfg.rb:183:3:183:3 | x | cfg.rb:184:18:184:21 | redo | true |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:205:1:205:3 | __synth__0__1 | false |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:205:1:205:3 | nil | true |
-| cfg.rb:188:30:188:30 | i | cfg.rb:188:1:188:35 | ... while ... | false |
-| cfg.rb:188:30:188:30 | i | cfg.rb:188:2:188:13 | self | true |
-| cfg.rb:188:30:188:30 | i | cfg.rb:205:1:205:3 | __synth__0__1 | false |
-| cfg.rb:188:30:188:30 | i | cfg.rb:205:1:205:3 | nil | false |
-| cfg.rb:188:30:188:30 | i | cfg.rb:205:4:205:5 | if ... | false |
-| constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | constant_compound_assign.rb:5:22:5:24 | 123 | false |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:14:18:14:20 | 123 | false |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:19:21:19:23 | 123 | false |
-| exit.rb:1:1:6:3 | enter m1 | exit.rb:2:3:4:5 | if ... | false |
-| exit.rb:1:1:6:3 | enter m1 | exit.rb:3:5:3:10 | self | true |
-| exit.rb:8:1:13:3 | enter m2 | exit.rb:9:3:11:5 | if ... | false |
-| exit.rb:8:1:13:3 | enter m2 | exit.rb:10:5:10:18 | self | true |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:3:5:3:30 | self | true |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:3:7:35 | elsif ... | false |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:9:4:9 | x | false |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:9:4:24 | [false] ... and ... | false |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:9:4:24 | [true] ... and ... | false |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:9:4:38 | [false] ... and ... | false |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:9:4:38 | [true] ... and ... | false |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:20:4:20 | x | false |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:30:4:38 | [false] ! ... | false |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:30:4:38 | [true] ! ... | false |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:31:4:38 | [false] ( ... ) | false |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:31:4:38 | [true] ( ... ) | false |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:32:4:32 | x | false |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:5:5:5:17 | self | false |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:7:5:7:35 | self | false |
-| ifs.rb:1:1:58:4 | enter ifs.rb | ifs.rb:36:1:38:3 | conditional_method_def | false |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:9:4:24 | [true] ... and ... | true |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:9:4:38 | [true] ... and ... | true |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:20:4:20 | x | true |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:30:4:38 | [false] ! ... | true |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:30:4:38 | [true] ! ... | true |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:31:4:38 | [false] ( ... ) | true |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:31:4:38 | [true] ( ... ) | true |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:32:4:32 | x | true |
-| ifs.rb:4:9:4:9 | x | ifs.rb:5:5:5:17 | self | true |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:9:4:38 | [true] ... and ... | true |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:30:4:38 | [false] ! ... | true |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:30:4:38 | [true] ! ... | true |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:31:4:38 | [false] ( ... ) | true |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:31:4:38 | [true] ( ... ) | true |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:32:4:32 | x | true |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:5:5:5:17 | self | true |
-| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:7:5:7:35 | self | false |
-| ifs.rb:4:9:4:38 | [true] ... and ... | ifs.rb:5:5:5:17 | self | true |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:9:4:24 | [true] ... and ... | true |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:9:4:38 | [true] ... and ... | true |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:30:4:38 | [false] ! ... | true |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:30:4:38 | [true] ! ... | true |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:31:4:38 | [false] ( ... ) | true |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:31:4:38 | [true] ( ... ) | true |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:32:4:32 | x | true |
-| ifs.rb:4:20:4:20 | x | ifs.rb:5:5:5:17 | self | true |
-| ifs.rb:4:30:4:38 | [true] ! ... | ifs.rb:4:9:4:38 | [true] ... and ... | true |
-| ifs.rb:4:30:4:38 | [true] ! ... | ifs.rb:5:5:5:17 | self | true |
-| ifs.rb:4:31:4:38 | [false] ( ... ) | ifs.rb:4:9:4:38 | [true] ... and ... | false |
-| ifs.rb:4:31:4:38 | [false] ( ... ) | ifs.rb:4:30:4:38 | [true] ! ... | false |
-| ifs.rb:4:31:4:38 | [false] ( ... ) | ifs.rb:5:5:5:17 | self | false |
-| ifs.rb:4:31:4:38 | [true] ( ... ) | ifs.rb:4:30:4:38 | [false] ! ... | true |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:9:4:38 | [true] ... and ... | false |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:30:4:38 | [false] ! ... | true |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:30:4:38 | [true] ! ... | false |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:31:4:38 | [false] ( ... ) | false |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:31:4:38 | [true] ( ... ) | true |
-| ifs.rb:4:32:4:32 | x | ifs.rb:5:5:5:17 | self | false |
-| ifs.rb:11:1:16:3 | enter m2 | ifs.rb:12:3:14:5 | if ... | false |
-| ifs.rb:11:1:16:3 | enter m2 | ifs.rb:13:12:13:12 | 0 | true |
-| ifs.rb:18:1:26:3 | enter m3 | ifs.rb:20:5:20:5 | x | true |
-| ifs.rb:18:1:26:3 | enter m3 | ifs.rb:21:5:23:7 | if ... | true |
-| ifs.rb:18:1:26:3 | enter m3 | ifs.rb:22:7:22:7 | x | true |
-| ifs.rb:20:5:20:5 | x | ifs.rb:22:7:22:7 | x | true |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:29:16:29:17 | b2 | true |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:29:21:29:22 | b3 | false |
-| ifs.rb:29:10:29:23 | [false] ( ... ) | ifs.rb:29:41:29:50 | !b2 \|\| !b3 | false |
-| ifs.rb:29:10:29:23 | [true] ( ... ) | ifs.rb:29:28:29:35 | b2 \|\| b3 | true |
-| ifs.rb:29:11:29:22 | [false] ... ? ... : ... | ifs.rb:29:10:29:23 | [false] ( ... ) | false |
-| ifs.rb:29:11:29:22 | [false] ... ? ... : ... | ifs.rb:29:41:29:50 | !b2 \|\| !b3 | false |
-| ifs.rb:29:11:29:22 | [true] ... ? ... : ... | ifs.rb:29:10:29:23 | [true] ( ... ) | true |
-| ifs.rb:29:11:29:22 | [true] ... ? ... : ... | ifs.rb:29:28:29:35 | b2 \|\| b3 | true |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:13:33:19 | [false] then ... | true |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:13:33:19 | [true] then ... | true |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:18:33:19 | b2 | true |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:21:33:44 | [false] elsif ... | false |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:21:33:44 | [true] elsif ... | false |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:27:33:28 | b3 | false |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:30:33:36 | [false] then ... | false |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:30:33:36 | [true] then ... | false |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:35:33:36 | b4 | false |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:38:33:44 | [false] else ... | false |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:38:33:44 | [true] else ... | false |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:43:33:44 | b5 | false |
-| ifs.rb:33:6:33:49 | [false] ( ... ) | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | false |
-| ifs.rb:33:6:33:49 | [true] ( ... ) | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | true |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:6:33:49 | [false] ( ... ) | false |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | false |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:6:33:49 | [true] ( ... ) | true |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | true |
-| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:13:33:19 | [false] then ... | false |
-| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:13:33:19 | [true] then ... | true |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:30:33:36 | [false] then ... | true |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:30:33:36 | [true] then ... | true |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:35:33:36 | b4 | true |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:38:33:44 | [false] else ... | false |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:38:33:44 | [true] else ... | false |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:43:33:44 | b5 | false |
-| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:30:33:36 | [false] then ... | false |
-| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:30:33:36 | [true] then ... | true |
-| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:38:33:44 | [false] else ... | false |
-| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:38:33:44 | [true] else ... | true |
-| ifs.rb:40:1:44:3 | enter constant_condition | ifs.rb:41:3:43:5 | if ... | true |
-| ifs.rb:40:1:44:3 | enter constant_condition | ifs.rb:41:6:41:10 | [false] ! ... | true |
-| ifs.rb:41:6:41:10 | [false] ! ... | ifs.rb:41:3:43:5 | if ... | false |
-| ifs.rb:46:1:52:3 | enter empty_else | ifs.rb:48:5:48:15 | self | true |
-| ifs.rb:46:1:52:3 | enter empty_else | ifs.rb:49:3:49:6 | else ... | false |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:55:6:55:15 | [false] ( ... ) | false |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:55:7:55:14 | [false] ... \|\| ... | false |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:55:13:55:14 | b2 | false |
-| ifs.rb:55:6:55:15 | [true] ( ... ) | ifs.rb:56:5:56:19 | self | true |
-| ifs.rb:55:7:55:14 | [false] ... \|\| ... | ifs.rb:55:6:55:15 | [false] ( ... ) | false |
-| ifs.rb:55:7:55:14 | [true] ... \|\| ... | ifs.rb:55:6:55:15 | [true] ( ... ) | true |
-| ifs.rb:55:7:55:14 | [true] ... \|\| ... | ifs.rb:56:5:56:19 | self | true |
-| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:6:55:15 | [false] ( ... ) | false |
-| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:7:55:14 | [false] ... \|\| ... | false |
-| loops.rb:2:9:2:9 | x | loops.rb:2:3:5:5 | while ... | false |
-| loops.rb:2:9:2:9 | x | loops.rb:3:5:3:10 | self | true |
-| loops.rb:9:9:9:9 | x | loops.rb:10:5:10:10 | self | true |
-| loops.rb:9:9:9:9 | x | loops.rb:13:7:13:11 | break | true |
-| loops.rb:9:9:9:9 | x | loops.rb:14:11:14:11 | x | true |
-| loops.rb:9:9:9:9 | x | loops.rb:15:7:15:10 | next | true |
-| loops.rb:9:9:9:9 | x | loops.rb:16:5:17:10 | elsif ... | true |
-| loops.rb:9:9:9:9 | x | loops.rb:16:11:16:11 | x | true |
-| loops.rb:9:9:9:9 | x | loops.rb:17:7:17:10 | redo | true |
-| loops.rb:10:5:10:10 | self | loops.rb:13:7:13:11 | break | true |
-| loops.rb:10:5:10:10 | self | loops.rb:14:11:14:11 | x | false |
-| loops.rb:10:5:10:10 | self | loops.rb:15:7:15:10 | next | false |
-| loops.rb:10:5:10:10 | self | loops.rb:16:5:17:10 | elsif ... | false |
-| loops.rb:10:5:10:10 | self | loops.rb:16:11:16:11 | x | false |
-| loops.rb:10:5:10:10 | self | loops.rb:17:7:17:10 | redo | false |
-| loops.rb:14:11:14:11 | x | loops.rb:15:7:15:10 | next | true |
-| loops.rb:14:11:14:11 | x | loops.rb:16:5:17:10 | elsif ... | false |
-| loops.rb:14:11:14:11 | x | loops.rb:16:11:16:11 | x | false |
-| loops.rb:14:11:14:11 | x | loops.rb:17:7:17:10 | redo | false |
-| loops.rb:16:11:16:11 | x | loops.rb:16:5:17:10 | elsif ... | false |
-| loops.rb:16:11:16:11 | x | loops.rb:17:7:17:10 | redo | true |
-| loops.rb:31:9:31:9 | x | loops.rb:31:3:32:5 | while ... | false |
-| loops.rb:31:9:31:9 | x | loops.rb:31:15:32:5 | do ... | true |
-| raise.rb:7:1:12:3 | enter m1 | raise.rb:8:3:10:5 | if ... | false |
-| raise.rb:7:1:12:3 | enter m1 | raise.rb:9:5:9:17 | self | true |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:14:1:23:3 | exit m2 (abnormal) | true |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:16:5:18:7 | if ... | false |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:17:7:17:22 | self | true |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:20:5:20:18 | self | true |
-| raise.rb:17:7:17:22 | self | raise.rb:20:5:20:18 | self | match |
-| raise.rb:25:1:34:3 | enter m3 | raise.rb:27:5:29:7 | if ... | false |
-| raise.rb:25:1:34:3 | enter m3 | raise.rb:28:7:28:22 | self | true |
-| raise.rb:36:1:45:3 | enter m4 | raise.rb:38:5:40:7 | if ... | false |
-| raise.rb:36:1:45:3 | enter m4 | raise.rb:39:7:39:22 | self | true |
-| raise.rb:47:1:55:3 | enter m5 | raise.rb:49:5:51:7 | if ... | false |
-| raise.rb:47:1:55:3 | enter m5 | raise.rb:50:7:50:22 | self | true |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:57:1:66:3 | exit m6 (abnormal) | true |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:59:5:61:7 | if ... | false |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:60:7:60:22 | self | true |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:62:22:62:31 | ExceptionB | true |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:62:36:62:36 | e | true |
-| raise.rb:60:7:60:22 | self | raise.rb:57:1:66:3 | exit m6 (abnormal) | no-match |
-| raise.rb:60:7:60:22 | self | raise.rb:62:22:62:31 | ExceptionB | no-match |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:68:1:77:3 | exit m7 (normal) | false |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:70:5:70:17 | self | true |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:71:3:72:18 | elsif ... | false |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:71:9:71:9 | x | false |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:72:13:72:17 | x < 0 | false |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:76:3:76:15 | self | false |
-| raise.rb:71:9:71:9 | x | raise.rb:71:3:72:18 | elsif ... | false |
-| raise.rb:71:9:71:9 | x | raise.rb:72:13:72:17 | x < 0 | true |
-| raise.rb:71:9:71:9 | x | raise.rb:76:3:76:15 | self | false |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:79:1:92:3 | exit m8 (normal) | false |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:83:7:83:19 | self | true |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:84:5:85:20 | elsif ... | false |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:84:11:84:11 | x | false |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:85:15:85:19 | x < 0 | false |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:89:5:89:17 | self | false |
-| raise.rb:84:11:84:11 | x | raise.rb:84:5:85:20 | elsif ... | false |
-| raise.rb:84:11:84:11 | x | raise.rb:85:15:85:19 | x < 0 | true |
-| raise.rb:84:11:84:11 | x | raise.rb:89:5:89:17 | self | false |
-| raise.rb:97:8:97:8 | x | raise.rb:94:1:119:3 | exit m9 (normal) | false |
-| raise.rb:97:8:97:8 | x | raise.rb:98:7:98:19 | self | true |
-| raise.rb:97:8:97:8 | x | raise.rb:99:5:100:20 | elsif ... | false |
-| raise.rb:97:8:97:8 | x | raise.rb:99:11:99:11 | x | false |
-| raise.rb:97:8:97:8 | x | raise.rb:100:15:100:19 | x < 0 | false |
-| raise.rb:97:8:97:8 | x | raise.rb:104:5:104:23 | self | false |
-| raise.rb:97:8:97:8 | x | raise.rb:106:7:108:9 | [ensure: return] if ... | false |
-| raise.rb:97:8:97:8 | x | raise.rb:106:7:108:9 | if ... | false |
-| raise.rb:97:8:97:8 | x | raise.rb:106:10:106:11 | [ensure: return] b1 | false |
-| raise.rb:97:8:97:8 | x | raise.rb:106:10:106:11 | b1 | false |
-| raise.rb:97:8:97:8 | x | raise.rb:107:9:107:26 | [ensure: return] self | false |
-| raise.rb:97:8:97:8 | x | raise.rb:107:9:107:26 | self | false |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | false |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | false |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: return] ensure ... | false |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | ensure ... | false |
-| raise.rb:97:8:97:8 | x | raise.rb:115:3:115:22 | self | false |
-| raise.rb:97:8:97:8 | x | raise.rb:116:3:118:5 | [ensure: return] if ... | false |
-| raise.rb:97:8:97:8 | x | raise.rb:116:3:118:5 | if ... | false |
-| raise.rb:97:8:97:8 | x | raise.rb:117:5:117:22 | [ensure: return] self | false |
-| raise.rb:97:8:97:8 | x | raise.rb:117:5:117:22 | self | false |
-| raise.rb:99:11:99:11 | x | raise.rb:99:5:100:20 | elsif ... | false |
-| raise.rb:99:11:99:11 | x | raise.rb:100:15:100:19 | x < 0 | true |
-| raise.rb:99:11:99:11 | x | raise.rb:104:5:104:23 | self | false |
-| raise.rb:99:11:99:11 | x | raise.rb:106:7:108:9 | [ensure: return] if ... | true |
-| raise.rb:99:11:99:11 | x | raise.rb:106:7:108:9 | if ... | false |
-| raise.rb:99:11:99:11 | x | raise.rb:106:10:106:11 | [ensure: return] b1 | true |
-| raise.rb:99:11:99:11 | x | raise.rb:106:10:106:11 | b1 | false |
-| raise.rb:99:11:99:11 | x | raise.rb:107:9:107:26 | [ensure: return] self | true |
-| raise.rb:99:11:99:11 | x | raise.rb:107:9:107:26 | self | false |
-| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | false |
-| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | true |
-| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure: return] ensure ... | true |
-| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | ensure ... | false |
-| raise.rb:99:11:99:11 | x | raise.rb:115:3:115:22 | self | false |
-| raise.rb:99:11:99:11 | x | raise.rb:116:3:118:5 | [ensure: return] if ... | true |
-| raise.rb:99:11:99:11 | x | raise.rb:116:3:118:5 | if ... | false |
-| raise.rb:99:11:99:11 | x | raise.rb:117:5:117:22 | [ensure: return] self | true |
-| raise.rb:99:11:99:11 | x | raise.rb:117:5:117:22 | self | false |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:106:7:108:9 | [ensure: exception] if ... | false |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:107:9:107:26 | [ensure: exception] self | true |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... | true |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:109:5:110:25 | [ensure: exception] ensure ... | false |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:106:7:108:9 | [ensure: return] if ... | false |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:107:9:107:26 | [ensure: return] self | true |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | true |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | false |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:116:3:118:5 | [ensure: return] if ... | false |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:117:5:117:22 | [ensure: return] self | false |
-| raise.rb:106:10:106:11 | b1 | raise.rb:106:7:108:9 | if ... | false |
-| raise.rb:106:10:106:11 | b1 | raise.rb:107:9:107:26 | self | true |
-| raise.rb:106:10:106:11 | b1 | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | true |
-| raise.rb:106:10:106:11 | b1 | raise.rb:109:5:110:25 | ensure ... | false |
-| raise.rb:106:10:106:11 | b1 | raise.rb:115:3:115:22 | self | false |
-| raise.rb:106:10:106:11 | b1 | raise.rb:116:3:118:5 | if ... | false |
-| raise.rb:106:10:106:11 | b1 | raise.rb:117:5:117:22 | self | false |
-| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:116:3:118:5 | [ensure: return] if ... | false |
-| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:117:5:117:22 | [ensure: return] self | true |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:116:3:118:5 | [ensure: exception] if ... | false |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:117:5:117:22 | [ensure: exception] self | true |
-| raise.rb:115:3:115:22 | self | raise.rb:116:3:118:5 | if ... | false |
-| raise.rb:115:3:115:22 | self | raise.rb:117:5:117:22 | self | true |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:121:14:121:30 | self | false |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:121:14:121:30 | self | no-match |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:121:14:121:30 | self | true |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:125:3:125:51 | self | match |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:130:5:132:7 | if ... | false |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:131:7:131:22 | self | true |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:133:3:133:19 | rescue ... | true |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:134:10:134:19 | ExceptionB | true |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:135:5:135:21 | self | true |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:137:5:137:17 | [ensure: exception] self | true |
-| raise.rb:131:7:131:22 | self | raise.rb:133:3:133:19 | rescue ... | match |
-| raise.rb:131:7:131:22 | self | raise.rb:134:10:134:19 | ExceptionB | no-match |
-| raise.rb:131:7:131:22 | self | raise.rb:135:5:135:21 | self | no-match |
-| raise.rb:131:7:131:22 | self | raise.rb:137:5:137:17 | [ensure: exception] self | no-match |
-| raise.rb:134:10:134:19 | ExceptionB | raise.rb:135:5:135:21 | self | match |
-| raise.rb:142:1:148:3 | enter m12 | raise.rb:143:3:145:5 | if ... | false |
-| raise.rb:142:1:148:3 | enter m12 | raise.rb:144:5:144:12 | self | true |
-| raise.rb:155:16:155:50 | enter { ... } | raise.rb:155:25:155:32 | self | true |
-| raise.rb:155:16:155:50 | enter { ... } | raise.rb:155:25:155:48 | ... if ... | false |
-| raise.rb:160:9:162:7 | enter -> { ... } | raise.rb:161:7:161:14 | self | false |
-| raise.rb:160:9:162:7 | enter -> { ... } | raise.rb:161:7:161:23 | ... unless ... | true |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:174:8:174:23 | [false] ... \|\| ... | false |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:174:14:174:15 | b2 | false |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:177:14:177:14 | 2 | false |
-| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:177:14:177:14 | 2 | false |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:175:14:175:14 | 1 | true |
-| raise.rb:174:14:174:15 | b2 | raise.rb:174:8:174:23 | [false] ... \|\| ... | false |
-| raise.rb:174:14:174:15 | b2 | raise.rb:177:14:177:14 | 2 | false |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:180:12:180:12 | 3 | match |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:2:9:2:13 | After ... < ... [false] | false |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:2:9:2:13 | After ... < ... [true] | true |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:3:8:3:12 | After ... > ... [false] | true |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:3:8:3:12 | After ... > ... [true] | true |
+| break_ensure.rb:2:9:2:13 | After ... < ... [true] | break_ensure.rb:3:8:3:12 | After ... > ... [false] | false |
+| break_ensure.rb:2:9:2:13 | After ... < ... [true] | break_ensure.rb:3:8:3:12 | After ... > ... [true] | true |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:8:6:8:18 | After call to nil? [false] | false |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:8:6:8:18 | After call to nil? [true] | true |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:13:1:25:3 | Exceptional Exit | true |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:14:9:14:13 | After ... < ... [false] | false |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:14:9:14:13 | After ... < ... [true] | true |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:15:5:23:7 | After begin ...  | true |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:16:10:16:14 | After ... > ... [false] | true |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:16:10:16:14 | After ... > ... [true] | true |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:19:5:22:9 | ensure ... | true |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:20:7:22:9 | After if ... | true |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:20:10:20:15 | After call to nil? [false] | true |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:20:10:20:15 | After call to nil? [true] | true |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:16:10:16:14 | After ... > ... [false] | false |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:16:10:16:14 | After ... > ... [true] | true |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:20:10:20:15 | After call to nil? [false] | false |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:20:10:20:15 | After call to nil? [true] | true |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:29:8:29:13 | After call to nil? [false] | false |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:29:8:29:13 | After call to nil? [true] | true |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:33:11:33:15 | After ... < ... [false] | false |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:33:11:33:15 | After ... < ... [true] | true |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:35:12:35:16 | After ... > ... [false] | true |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:35:12:35:16 | After ... > ... [true] | true |
+| break_ensure.rb:33:11:33:15 | After ... < ... [true] | break_ensure.rb:35:12:35:16 | After ... > ... [false] | false |
+| break_ensure.rb:33:11:33:15 | After ... < ... [true] | break_ensure.rb:35:12:35:16 | After ... > ... [true] | true |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:44:1:56:3 | Exceptional Exit | true |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:45:9:45:13 | After ... < ... [false] | false |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:45:9:45:13 | After ... < ... [true] | true |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:46:5:54:7 | After begin ...  | true |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:47:10:47:14 | After ... > ... [false] | true |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:47:10:47:14 | After ... > ... [true] | true |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:50:5:53:9 | ensure ... | true |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:51:10:51:14 | After ... > ... [false] | true |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:51:10:51:14 | After ... > ... [true] | true |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:47:10:47:14 | After ... > ... [false] | false |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:47:10:47:14 | After ... > ... [true] | true |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:44:1:56:3 | Exceptional Exit | false |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:46:5:54:7 | After begin ...  | false |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:51:10:51:14 | After ... > ... [false] | false |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:51:10:51:14 | After ... > ... [true] | true |
+| case.rb:1:1:6:3 | Entry | case.rb:3:10:3:10 | After 1 [match] | match |
+| case.rb:1:1:6:3 | Entry | case.rb:3:10:3:10 | After 1 [no-match] | no-match |
+| case.rb:1:1:6:3 | Entry | case.rb:3:18:3:41 | After if ... | match |
+| case.rb:1:1:6:3 | Entry | case.rb:3:21:3:22 | After call to x2 [false] | match |
+| case.rb:1:1:6:3 | Entry | case.rb:3:21:3:22 | After call to x2 [true] | match |
+| case.rb:1:1:6:3 | Entry | case.rb:4:10:4:10 | After 2 [match] | no-match |
+| case.rb:1:1:6:3 | Entry | case.rb:4:10:4:10 | After 2 [no-match] | no-match |
+| case.rb:3:10:3:10 | After 1 [match] | case.rb:3:21:3:22 | After call to x2 [false] | false |
+| case.rb:3:10:3:10 | After 1 [match] | case.rb:3:21:3:22 | After call to x2 [true] | true |
+| case.rb:3:10:3:10 | After 1 [no-match] | case.rb:4:10:4:10 | After 2 [match] | match |
+| case.rb:3:10:3:10 | After 1 [no-match] | case.rb:4:10:4:10 | After 2 [no-match] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:10:8:10:8 | After 0 [match] | match |
+| case.rb:8:1:18:3 | Entry | case.rb:10:8:10:8 | After 0 [no-match] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:11:8:11:8 | After 1 [match] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:11:8:11:8 | After 1 [no-match] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:12:8:12:8 | After 2 [match] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:12:8:12:8 | After 2 [no-match] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:14:8:14:8 | After x [match] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:14:8:14:8 | After x [no-match] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:14:13:14:18 | After ... == ... [false] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:14:13:14:18 | After ... == ... [true] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:15:5:15:28 | in ... then ... | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:15:8:15:8 | After x [match] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:15:8:15:8 | After x [no-match] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:15:17:15:21 | After ... < ... [false] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:15:17:15:21 | After ... < ... [true] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:16:5:16:10 | else ... | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:11:8:11:8 | After 1 [match] | match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:11:8:11:8 | After 1 [no-match] | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:12:8:12:8 | After 2 [match] | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:12:8:12:8 | After 2 [no-match] | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:14:8:14:8 | After x [match] | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:14:8:14:8 | After x [no-match] | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:14:13:14:18 | After ... == ... [false] | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:14:13:14:18 | After ... == ... [true] | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:15:5:15:28 | in ... then ... | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:15:8:15:8 | After x [match] | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:15:8:15:8 | After x [no-match] | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:15:17:15:21 | After ... < ... [false] | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:15:17:15:21 | After ... < ... [true] | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:16:5:16:10 | else ... | no-match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:12:8:12:8 | After 2 [match] | match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:12:8:12:8 | After 2 [no-match] | no-match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:14:8:14:8 | After x [match] | no-match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:14:8:14:8 | After x [no-match] | no-match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:14:13:14:18 | After ... == ... [false] | no-match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:14:13:14:18 | After ... == ... [true] | no-match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:15:5:15:28 | in ... then ... | no-match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:15:8:15:8 | After x [match] | no-match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:15:8:15:8 | After x [no-match] | no-match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:15:17:15:21 | After ... < ... [false] | no-match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:15:17:15:21 | After ... < ... [true] | no-match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:16:5:16:10 | else ... | no-match |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:14:8:14:8 | After x [match] | match |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:14:8:14:8 | After x [no-match] | no-match |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:14:13:14:18 | After ... == ... [false] | match |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:14:13:14:18 | After ... == ... [true] | match |
+| case.rb:14:8:14:8 | After x [match] | case.rb:14:13:14:18 | After ... == ... [false] | false |
+| case.rb:14:8:14:8 | After x [match] | case.rb:14:13:14:18 | After ... == ... [true] | true |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:15:8:15:8 | After x [match] | match |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:15:8:15:8 | After x [no-match] | no-match |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:15:17:15:21 | After ... < ... [false] | match |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:15:17:15:21 | After ... < ... [true] | match |
+| case.rb:15:8:15:8 | After x [match] | case.rb:15:17:15:21 | After ... < ... [false] | false |
+| case.rb:15:8:15:8 | After x [match] | case.rb:15:17:15:21 | After ... < ... [true] | true |
+| case.rb:20:1:24:3 | Entry | case.rb:22:8:22:8 | After 1 [match] | match |
+| case.rb:20:1:24:3 | Entry | case.rb:22:8:22:8 | After 1 [no-match] | no-match |
+| case.rb:26:1:30:3 | Entry | case.rb:28:7:28:28 | After -> { ... } [match] | match |
+| case.rb:26:1:30:3 | Entry | case.rb:28:7:28:28 | After -> { ... } [no-match] | no-match |
+| case.rb:32:1:39:3 | Entry | case.rb:34:8:34:9 | After [ ..., * ] [match] | match |
+| case.rb:32:1:39:3 | Entry | case.rb:34:8:34:9 | After [ ..., * ] [no-match] | no-match |
+| case.rb:32:1:39:3 | Entry | case.rb:35:8:35:10 | After [ ..., * ] [match] | no-match |
+| case.rb:32:1:39:3 | Entry | case.rb:35:8:35:10 | After [ ..., * ] [no-match] | no-match |
+| case.rb:32:1:39:3 | Entry | case.rb:36:8:36:12 | After [ ..., * ] [match] | no-match |
+| case.rb:32:1:39:3 | Entry | case.rb:36:8:36:12 | After [ ..., * ] [no-match] | no-match |
+| case.rb:32:1:39:3 | Entry | case.rb:37:8:37:26 | After [ ..., * ] [match] | no-match |
+| case.rb:32:1:39:3 | Entry | case.rb:37:8:37:26 | After [ ..., * ] [no-match] | no-match |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:35:8:35:10 | After [ ..., * ] [match] | match |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:35:8:35:10 | After [ ..., * ] [no-match] | no-match |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:36:8:36:12 | After [ ..., * ] [match] | no-match |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:36:8:36:12 | After [ ..., * ] [no-match] | no-match |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [match] | no-match |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [no-match] | no-match |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:36:8:36:12 | After [ ..., * ] [match] | match |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:36:8:36:12 | After [ ..., * ] [no-match] | no-match |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [match] | no-match |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [no-match] | no-match |
+| case.rb:36:8:36:12 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [match] | match |
+| case.rb:36:8:36:12 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [no-match] | no-match |
+| case.rb:41:1:45:3 | Entry | case.rb:43:8:43:21 | After [ *,...,* ] [match] | match |
+| case.rb:41:1:45:3 | Entry | case.rb:43:8:43:21 | After [ *,...,* ] [no-match] | no-match |
+| case.rb:47:1:53:3 | Entry | case.rb:49:8:49:34 | After { ..., ** } [match] | match |
+| case.rb:47:1:53:3 | Entry | case.rb:49:8:49:34 | After { ..., ** } [no-match] | no-match |
+| case.rb:47:1:53:3 | Entry | case.rb:50:8:50:24 | After { ..., ** } [match] | no-match |
+| case.rb:47:1:53:3 | Entry | case.rb:50:8:50:24 | After { ..., ** } [no-match] | no-match |
+| case.rb:47:1:53:3 | Entry | case.rb:51:8:51:16 | After { ..., ** } [match] | no-match |
+| case.rb:47:1:53:3 | Entry | case.rb:51:8:51:16 | After { ..., ** } [no-match] | no-match |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:50:8:50:24 | After { ..., ** } [match] | match |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:50:8:50:24 | After { ..., ** } [no-match] | no-match |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:51:8:51:16 | After { ..., ** } [match] | no-match |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:51:8:51:16 | After { ..., ** } [no-match] | no-match |
+| case.rb:50:8:50:24 | After { ..., ** } [no-match] | case.rb:51:8:51:16 | After { ..., ** } [match] | match |
+| case.rb:50:8:50:24 | After { ..., ** } [no-match] | case.rb:51:8:51:16 | After { ..., ** } [no-match] | no-match |
+| case.rb:55:1:61:3 | Entry | case.rb:57:8:57:8 | After 5 [match] | match |
+| case.rb:55:1:61:3 | Entry | case.rb:57:8:57:8 | After 5 [no-match] | no-match |
+| case.rb:55:1:61:3 | Entry | case.rb:58:8:58:10 | After var [match] | no-match |
+| case.rb:55:1:61:3 | Entry | case.rb:58:8:58:10 | After var [no-match] | no-match |
+| case.rb:55:1:61:3 | Entry | case.rb:59:8:59:20 | After "unreachable" [match] | no-match |
+| case.rb:55:1:61:3 | Entry | case.rb:59:8:59:20 | After "unreachable" [no-match] | no-match |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:58:8:58:10 | After var [match] | match |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:58:8:58:10 | After var [no-match] | no-match |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:59:8:59:20 | After "unreachable" [match] | no-match |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:59:8:59:20 | After "unreachable" [no-match] | no-match |
+| case.rb:58:8:58:10 | After var [no-match] | case.rb:59:8:59:20 | After "unreachable" [match] | match |
+| case.rb:58:8:58:10 | After var [no-match] | case.rb:59:8:59:20 | After "unreachable" [no-match] | no-match |
+| case.rb:63:1:67:3 | Entry | case.rb:65:8:65:28 | After ... \| ... [match] | match |
+| case.rb:63:1:67:3 | Entry | case.rb:65:8:65:28 | After ... \| ... [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:73:8:73:8 | After 5 [match] | match |
+| case.rb:69:1:93:3 | Entry | case.rb:73:8:73:8 | After 5 [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:74:8:74:11 | After ^... [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:74:8:74:11 | After ^... [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:75:8:75:15 | After "string" [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:75:8:75:15 | After "string" [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:76:8:76:18 | After call to [] [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:76:8:76:18 | After call to [] [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:77:8:77:18 | After call to [] [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:77:8:77:18 | After call to [] [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:79:8:79:14 | After _ .. _ [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:79:8:79:14 | After _ .. _ [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:80:8:80:12 | After _ .. _ [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:80:8:80:12 | After _ .. _ [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:81:8:81:11 | After _ .. _ [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:81:8:81:11 | After _ .. _ [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:82:8:82:13 | After ... => ... [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:82:8:82:13 | After ... => ... [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:83:8:83:26 | After ... \| ... [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:83:8:83:26 | After ... \| ... [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:84:8:84:17 | After Bar [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:85:8:85:23 | After -> { ... } [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:86:8:86:11 | After :foo [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:74:8:74:11 | After ^... [match] | match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:74:8:74:11 | After ^... [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:75:8:75:15 | After "string" [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:75:8:75:15 | After "string" [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:76:8:76:18 | After call to [] [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:76:8:76:18 | After call to [] [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:77:8:77:18 | After call to [] [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:77:8:77:18 | After call to [] [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:79:8:79:14 | After _ .. _ [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:82:8:82:13 | After ... => ... [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:84:8:84:17 | After Bar [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:86:8:86:11 | After :foo [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:75:8:75:15 | After "string" [match] | match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:75:8:75:15 | After "string" [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:76:8:76:18 | After call to [] [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:76:8:76:18 | After call to [] [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:77:8:77:18 | After call to [] [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:77:8:77:18 | After call to [] [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:79:8:79:14 | After _ .. _ [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:82:8:82:13 | After ... => ... [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:84:8:84:17 | After Bar [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:86:8:86:11 | After :foo [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:76:8:76:18 | After call to [] [match] | match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:76:8:76:18 | After call to [] [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:77:8:77:18 | After call to [] [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:77:8:77:18 | After call to [] [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:79:8:79:14 | After _ .. _ [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:82:8:82:13 | After ... => ... [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:84:8:84:17 | After Bar [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:86:8:86:11 | After :foo [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:77:8:77:18 | After call to [] [match] | match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:77:8:77:18 | After call to [] [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:79:8:79:14 | After _ .. _ [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:82:8:82:13 | After ... => ... [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:84:8:84:17 | After Bar [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:86:8:86:11 | After :foo [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] | match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:79:8:79:14 | After _ .. _ [match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:82:8:82:13 | After ... => ... [match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:84:8:84:17 | After Bar [match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:86:8:86:11 | After :foo [match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:79:8:79:14 | After _ .. _ [match] | match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:82:8:82:13 | After ... => ... [match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:84:8:84:17 | After Bar [match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:86:8:86:11 | After :foo [match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] | match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:84:8:84:17 | After Bar [match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:86:8:86:11 | After :foo [match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] | match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:84:8:84:17 | After Bar [match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:86:8:86:11 | After :foo [match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [match] | match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:84:8:84:17 | After Bar [match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:86:8:86:11 | After :foo [match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] | match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:84:8:84:17 | After Bar [match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:86:8:86:11 | After :foo [match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:84:8:84:17 | After Bar [match] | match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:86:8:86:11 | After :foo [match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] | match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:86:8:86:11 | After :foo [match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:86:8:86:11 | After :foo [match] | match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | no-match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | match |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | no-match |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | match |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | no-match |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | match |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | no-match |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | match |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | no-match |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:90:8:90:13 | After ( ... ) [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | match |
+| case.rb:90:8:90:13 | After ( ... ) [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:95:1:99:3 | Entry | case.rb:97:8:97:8 | After x [match] | match |
+| case.rb:95:1:99:3 | Entry | case.rb:97:8:97:8 | After x [no-match] | no-match |
+| case.rb:95:1:99:3 | Entry | case.rb:97:13:97:18 | After ... == ... [false] | match |
+| case.rb:95:1:99:3 | Entry | case.rb:97:13:97:18 | After ... == ... [true] | match |
+| case.rb:97:8:97:8 | After x [match] | case.rb:97:13:97:18 | After ... == ... [false] | false |
+| case.rb:97:8:97:8 | After x [match] | case.rb:97:13:97:18 | After ... == ... [true] | true |
+| cfg.html.erb:5:16:31:12 | Entry | cfg.html.erb:18:17:18:22 | After call to admin? [false] | false |
+| cfg.html.erb:5:16:31:12 | Entry | cfg.html.erb:18:17:18:22 | After call to admin? [true] | true |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:42:8:42:8 | After 1 [match] | match |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:42:8:42:8 | After 1 [no-match] | no-match |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:3:43:31 | After when ... [match] | no-match |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:8:43:8 | After 2 [match] | no-match |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:8:43:8 | After 2 [no-match] | no-match |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:11:43:11 | After 3 [match] | no-match |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:11:43:11 | After 3 [no-match] | no-match |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:14:43:14 | After 4 [match] | no-match |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:43:14:43:14 | After 4 [no-match] | no-match |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:48:8:48:13 | After ... == ... [match] | match |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] | no-match |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:49:3:49:37 | After when ... [match] | no-match |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:49:8:49:13 | After ... == ... [match] | no-match |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] | no-match |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:49:16:49:20 | After ... > ... [match] | no-match |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] | no-match |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:8:43:8 | After 2 [match] | match |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:8:43:8 | After 2 [no-match] | no-match |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:11:43:11 | After 3 [match] | no-match |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:11:43:11 | After 3 [no-match] | no-match |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:14:43:14 | After 4 [match] | no-match |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:14:43:14 | After 4 [no-match] | no-match |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:43:11:43:11 | After 3 [match] | match |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:43:11:43:11 | After 3 [no-match] | no-match |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:43:14:43:14 | After 4 [match] | no-match |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:43:14:43:14 | After 4 [no-match] | no-match |
+| cfg.rb:43:11:43:11 | After 3 [no-match] | cfg.rb:43:14:43:14 | After 4 [match] | match |
+| cfg.rb:43:11:43:11 | After 3 [no-match] | cfg.rb:43:14:43:14 | After 4 [no-match] | no-match |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:60:17:60:22 | After ... < ... [false] | false |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:60:17:60:22 | After ... < ... [true] | true |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:49:8:49:13 | After ... == ... [match] | match |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:49:8:49:13 | After ... == ... [no-match] | no-match |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:49:16:49:20 | After ... > ... [match] | no-match |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:49:16:49:20 | After ... > ... [no-match] | no-match |
+| cfg.rb:49:8:49:13 | After ... == ... [no-match] | cfg.rb:49:16:49:20 | After ... > ... [match] | match |
+| cfg.rb:49:8:49:13 | After ... == ... [no-match] | cfg.rb:49:16:49:20 | After ... > ... [no-match] | no-match |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:75:4:75:8 | After ... < ... [false] | false |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:75:4:75:8 | After ... < ... [true] | true |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:75:17:75:43 | After elsif ... | false |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:75:23:75:28 | After ... > ... [false] | false |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:75:23:75:28 | After ... > ... [true] | false |
+| cfg.rb:75:4:75:8 | After ... < ... [false] | cfg.rb:75:23:75:28 | After ... > ... [false] | false |
+| cfg.rb:75:4:75:8 | After ... < ... [false] | cfg.rb:75:23:75:28 | After ... > ... [true] | true |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:90:5:90:5 | After defined? ... [false] | false |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:90:5:90:5 | After defined? ... [true] | true |
+| cfg.rb:90:1:93:3 | Entry | cfg.rb:91:6:91:10 | After ... > ... [false] | false |
+| cfg.rb:90:1:93:3 | Entry | cfg.rb:91:6:91:10 | After ... > ... [true] | true |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:113:14:113:19 | After ... > ... [false] | false |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:113:14:113:19 | After ... > ... [true] | true |
+| cfg.rb:101:1:104:3 | Entry | cfg.rb:101:16:101:20 | After value [match] | match |
+| cfg.rb:101:1:104:3 | Entry | cfg.rb:101:16:101:20 | After value [no-match] | no-match |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:172:8:172:14 | After ... == ... [false] | false |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:172:8:172:14 | After ... == ... [true] | true |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:174:18:174:23 | After ... == ... [false] | false |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:174:18:174:23 | After ... == ... [true] | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:176:7:176:12 | After ... > ... [false] | false |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:176:7:176:12 | After ... > ... [true] | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:179:30:179:36 | After ... == ... [false] | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:179:30:179:36 | After ... == ... [true] | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:182:7:182:12 | After ... < ... [false] | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:182:7:182:12 | After ... < ... [true] | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:182:14:186:3 | do ... | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:184:6:184:11 | After ... == ... [false] | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:184:6:184:11 | After ... == ... [true] | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:188:30:188:35 | After ... != ... [false] | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:188:30:188:35 | After ... != ... [true] | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:205:4:205:5 | After call to == [false] | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:205:4:205:5 | After call to == [true] | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:205:4:205:5 | After if ... | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:179:30:179:36 | After ... == ... [false] | false |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:179:30:179:36 | After ... == ... [true] | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:182:7:182:12 | After ... < ... [false] | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:182:7:182:12 | After ... < ... [true] | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:182:14:186:3 | do ... | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:184:6:184:11 | After ... == ... [false] | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:184:6:184:11 | After ... == ... [true] | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:188:30:188:35 | After ... != ... [false] | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:188:30:188:35 | After ... != ... [true] | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:205:4:205:5 | After call to == [false] | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:205:4:205:5 | After call to == [true] | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:205:4:205:5 | After if ... | true |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:182:7:182:12 | After ... < ... [false] | false |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:182:7:182:12 | After ... < ... [true] | true |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:182:14:186:3 | do ... | true |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:184:6:184:11 | After ... == ... [false] | true |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:184:6:184:11 | After ... == ... [true] | true |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | false |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:188:30:188:35 | After ... != ... [false] | false |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:188:30:188:35 | After ... != ... [true] | false |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:205:4:205:5 | After call to == [false] | false |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:205:4:205:5 | After call to == [true] | false |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:205:4:205:5 | After if ... | false |
+| cfg.rb:182:14:186:3 | do ... | cfg.rb:184:6:184:11 | After ... == ... [false] | false |
+| cfg.rb:182:14:186:3 | do ... | cfg.rb:184:6:184:11 | After ... == ... [true] | true |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:188:30:188:35 | After ... != ... [false] | false |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:188:30:188:35 | After ... != ... [true] | true |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:205:4:205:5 | After call to == [false] | false |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:205:4:205:5 | After call to == [true] | false |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:205:4:205:5 | After if ... | false |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:205:4:205:5 | After call to == [false] | false |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:205:4:205:5 | After call to == [true] | true |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [false] | false |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [true] | true |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [false] | false |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [true] | true |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [false] | false |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [true] | true |
+| exit.rb:1:1:6:3 | Entry | exit.rb:2:6:2:10 | After ... > ... [false] | false |
+| exit.rb:1:1:6:3 | Entry | exit.rb:2:6:2:10 | After ... > ... [true] | true |
+| exit.rb:8:1:13:3 | Entry | exit.rb:9:6:9:10 | After ... > ... [false] | false |
+| exit.rb:8:1:13:3 | Entry | exit.rb:9:6:9:10 | After ... > ... [true] | true |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:2:6:2:10 | After ... > ... [false] | false |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:2:6:2:10 | After ... > ... [true] | true |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:3:7:35 | After elsif ... | false |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:9:4:14 | After ... <= ... [false] | false |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:9:4:14 | After ... <= ... [true] | false |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:9:4:24 | After ... and ... [false] | false |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:9:4:38 | After ... and ... [false] | false |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:20:4:24 | After ... > ... [false] | false |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:20:4:24 | After ... > ... [true] | false |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:32:4:37 | After ... == ... [false] | false |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:4:32:4:37 | After ... == ... [true] | false |
+| ifs.rb:1:1:58:4 | Entry | ifs.rb:38:12:38:17 | After ... == ... [false] | false |
+| ifs.rb:1:1:58:4 | Entry | ifs.rb:38:12:38:17 | After ... == ... [true] | true |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:9:4:14 | After ... <= ... [false] | false |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:9:4:14 | After ... <= ... [true] | true |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:20:4:24 | After ... > ... [false] | true |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:20:4:24 | After ... > ... [true] | true |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:32:4:37 | After ... == ... [false] | true |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:32:4:37 | After ... == ... [true] | true |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:4:20:4:24 | After ... > ... [false] | false |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:4:20:4:24 | After ... > ... [true] | true |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:4:32:4:37 | After ... == ... [false] | true |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:4:32:4:37 | After ... == ... [true] | true |
+| ifs.rb:4:20:4:24 | After ... > ... [true] | ifs.rb:4:32:4:37 | After ... == ... [false] | false |
+| ifs.rb:4:20:4:24 | After ... > ... [true] | ifs.rb:4:32:4:37 | After ... == ... [true] | true |
+| ifs.rb:11:1:16:3 | Entry | ifs.rb:12:6:12:6 | After b [false] | false |
+| ifs.rb:11:1:16:3 | Entry | ifs.rb:12:6:12:6 | After b [true] | true |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:19:6:19:10 | After ... < ... [false] | false |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:19:6:19:10 | After ... < ... [true] | true |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:21:5:23:7 | After if ... | true |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:21:8:21:13 | After ... > ... [false] | true |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:21:8:21:13 | After ... > ... [true] | true |
+| ifs.rb:19:6:19:10 | After ... < ... [true] | ifs.rb:21:8:21:13 | After ... > ... [false] | false |
+| ifs.rb:19:6:19:10 | After ... < ... [true] | ifs.rb:21:8:21:13 | After ... > ... [true] | true |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:11:29:12 | After b1 [false] | false |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:11:29:12 | After b1 [true] | true |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:16:29:17 | After b2 [false] | true |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:16:29:17 | After b2 [true] | true |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:21:29:22 | After b3 [false] | false |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:21:29:22 | After b3 [true] | false |
+| ifs.rb:29:11:29:12 | After b1 [false] | ifs.rb:29:21:29:22 | After b3 [false] | false |
+| ifs.rb:29:11:29:12 | After b1 [false] | ifs.rb:29:21:29:22 | After b3 [true] | true |
+| ifs.rb:29:11:29:12 | After b1 [true] | ifs.rb:29:16:29:17 | After b2 [false] | false |
+| ifs.rb:29:11:29:12 | After b1 [true] | ifs.rb:29:16:29:17 | After b2 [true] | true |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:10:33:11 | After b1 [false] | false |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:10:33:11 | After b1 [true] | true |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:18:33:19 | After b2 [false] | true |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:18:33:19 | After b2 [true] | true |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:21:33:44 | After elsif ... [false] | false |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:21:33:44 | After elsif ... [true] | false |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:27:33:28 | After b3 [false] | false |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:27:33:28 | After b3 [true] | false |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:35:33:36 | After b4 [false] | false |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:35:33:36 | After b4 [true] | false |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:43:33:44 | After b5 [false] | false |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:43:33:44 | After b5 [true] | false |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:27:33:28 | After b3 [false] | false |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:27:33:28 | After b3 [true] | true |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:35:33:36 | After b4 [false] | true |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:35:33:36 | After b4 [true] | true |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:43:33:44 | After b5 [false] | false |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:43:33:44 | After b5 [true] | false |
+| ifs.rb:33:10:33:11 | After b1 [true] | ifs.rb:33:18:33:19 | After b2 [false] | false |
+| ifs.rb:33:10:33:11 | After b1 [true] | ifs.rb:33:18:33:19 | After b2 [true] | true |
+| ifs.rb:33:27:33:28 | After b3 [false] | ifs.rb:33:43:33:44 | After b5 [false] | false |
+| ifs.rb:33:27:33:28 | After b3 [false] | ifs.rb:33:43:33:44 | After b5 [true] | true |
+| ifs.rb:33:27:33:28 | After b3 [true] | ifs.rb:33:35:33:36 | After b4 [false] | false |
+| ifs.rb:33:27:33:28 | After b3 [true] | ifs.rb:33:35:33:36 | After b4 [true] | true |
+| ifs.rb:46:1:52:3 | Entry | ifs.rb:47:6:47:6 | After b [false] | false |
+| ifs.rb:46:1:52:3 | Entry | ifs.rb:47:6:47:6 | After b [true] | true |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:55:7:55:8 | After b1 [false] | false |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:55:7:55:8 | After b1 [true] | true |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:55:13:55:14 | After b2 [false] | false |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:55:13:55:14 | After b2 [true] | false |
+| ifs.rb:55:7:55:8 | After b1 [false] | ifs.rb:55:13:55:14 | After b2 [false] | false |
+| ifs.rb:55:7:55:8 | After b1 [false] | ifs.rb:55:13:55:14 | After b2 [true] | true |
+| loops.rb:2:3:5:5 | [LoopHeader] while ... | loops.rb:2:9:2:14 | After ... >= ... [false] | false |
+| loops.rb:2:3:5:5 | [LoopHeader] while ... | loops.rb:2:9:2:14 | After ... >= ... [true] | true |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:9:9:9:14 | After ... >= ... [false] | false |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:9:9:9:14 | After ... >= ... [true] | true |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:9:15:20:5 | do ... | true |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:12:8:12:14 | After ... > ... [false] | true |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:12:8:12:14 | After ... > ... [true] | true |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:14:11:14:16 | After ... > ... [false] | true |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:14:11:14:16 | After ... > ... [true] | true |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:16:11:16:16 | After ... > ... [false] | true |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:16:11:16:16 | After ... > ... [true] | true |
+| loops.rb:9:15:20:5 | do ... | loops.rb:12:8:12:14 | After ... > ... [false] | false |
+| loops.rb:9:15:20:5 | do ... | loops.rb:12:8:12:14 | After ... > ... [true] | true |
+| loops.rb:9:15:20:5 | do ... | loops.rb:14:11:14:16 | After ... > ... [false] | false |
+| loops.rb:9:15:20:5 | do ... | loops.rb:14:11:14:16 | After ... > ... [true] | false |
+| loops.rb:9:15:20:5 | do ... | loops.rb:16:11:16:16 | After ... > ... [false] | false |
+| loops.rb:9:15:20:5 | do ... | loops.rb:16:11:16:16 | After ... > ... [true] | false |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:14:11:14:16 | After ... > ... [false] | false |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:14:11:14:16 | After ... > ... [true] | true |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:16:11:16:16 | After ... > ... [false] | false |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:16:11:16:16 | After ... > ... [true] | false |
+| loops.rb:14:11:14:16 | After ... > ... [false] | loops.rb:16:11:16:16 | After ... > ... [false] | false |
+| loops.rb:14:11:14:16 | After ... > ... [false] | loops.rb:16:11:16:16 | After ... > ... [true] | true |
+| loops.rb:31:3:32:5 | [LoopHeader] while ... | loops.rb:31:9:31:13 | After ... < ... [false] | false |
+| loops.rb:31:3:32:5 | [LoopHeader] while ... | loops.rb:31:9:31:13 | After ... < ... [true] | true |
+| raise.rb:7:1:12:3 | Entry | raise.rb:8:6:8:10 | After ... > ... [false] | false |
+| raise.rb:7:1:12:3 | Entry | raise.rb:8:6:8:10 | After ... > ... [true] | true |
+| raise.rb:14:1:23:3 | Entry | raise.rb:16:8:16:8 | After b [false] | false |
+| raise.rb:14:1:23:3 | Entry | raise.rb:16:8:16:8 | After b [true] | true |
+| raise.rb:14:1:23:3 | Entry | raise.rb:19:10:19:19 | After ExceptionA [match] | true |
+| raise.rb:14:1:23:3 | Entry | raise.rb:19:10:19:19 | After ExceptionA [no-match] | true |
+| raise.rb:16:8:16:8 | After b [true] | raise.rb:19:10:19:19 | After ExceptionA [match] | match |
+| raise.rb:16:8:16:8 | After b [true] | raise.rb:19:10:19:19 | After ExceptionA [no-match] | no-match |
+| raise.rb:25:1:34:3 | Entry | raise.rb:27:8:27:8 | After b [false] | false |
+| raise.rb:25:1:34:3 | Entry | raise.rb:27:8:27:8 | After b [true] | true |
+| raise.rb:36:1:45:3 | Entry | raise.rb:38:8:38:8 | After b [false] | false |
+| raise.rb:36:1:45:3 | Entry | raise.rb:38:8:38:8 | After b [true] | true |
+| raise.rb:47:1:55:3 | Entry | raise.rb:49:8:49:8 | After b [false] | false |
+| raise.rb:47:1:55:3 | Entry | raise.rb:49:8:49:8 | After b [true] | true |
+| raise.rb:57:1:66:3 | Entry | raise.rb:59:8:59:8 | After b [false] | false |
+| raise.rb:57:1:66:3 | Entry | raise.rb:59:8:59:8 | After b [true] | true |
+| raise.rb:57:1:66:3 | Entry | raise.rb:62:10:62:31 | After ..., ... [match] | true |
+| raise.rb:57:1:66:3 | Entry | raise.rb:62:10:62:31 | After ..., ... [no-match] | true |
+| raise.rb:59:8:59:8 | After b [true] | raise.rb:62:10:62:31 | After ..., ... [match] | match |
+| raise.rb:59:8:59:8 | After b [true] | raise.rb:62:10:62:31 | After ..., ... [no-match] | no-match |
+| raise.rb:68:1:77:3 | Entry | raise.rb:69:6:69:10 | After ... > ... [false] | false |
+| raise.rb:68:1:77:3 | Entry | raise.rb:69:6:69:10 | After ... > ... [true] | true |
+| raise.rb:68:1:77:3 | Entry | raise.rb:71:9:71:13 | After ... < ... [false] | false |
+| raise.rb:68:1:77:3 | Entry | raise.rb:71:9:71:13 | After ... < ... [true] | false |
+| raise.rb:68:1:77:3 | Entry | raise.rb:74:3:74:20 | After call to puts | false |
+| raise.rb:69:6:69:10 | After ... > ... [false] | raise.rb:71:9:71:13 | After ... < ... [false] | false |
+| raise.rb:69:6:69:10 | After ... > ... [false] | raise.rb:71:9:71:13 | After ... < ... [true] | true |
+| raise.rb:69:6:69:10 | After ... > ... [false] | raise.rb:74:3:74:20 | After call to puts | false |
+| raise.rb:79:1:92:3 | Entry | raise.rb:82:8:82:12 | After ... > ... [false] | false |
+| raise.rb:79:1:92:3 | Entry | raise.rb:82:8:82:12 | After ... > ... [true] | true |
+| raise.rb:79:1:92:3 | Entry | raise.rb:84:11:84:15 | After ... < ... [false] | false |
+| raise.rb:79:1:92:3 | Entry | raise.rb:84:11:84:15 | After ... < ... [true] | false |
+| raise.rb:79:1:92:3 | Entry | raise.rb:87:5:87:22 | After call to puts | false |
+| raise.rb:82:8:82:12 | After ... > ... [false] | raise.rb:84:11:84:15 | After ... < ... [false] | false |
+| raise.rb:82:8:82:12 | After ... > ... [false] | raise.rb:84:11:84:15 | After ... < ... [true] | true |
+| raise.rb:82:8:82:12 | After ... > ... [false] | raise.rb:87:5:87:22 | After call to puts | false |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:97:8:97:12 | After ... > ... [false] | false |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:97:8:97:12 | After ... > ... [true] | true |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:99:11:99:15 | After ... < ... [false] | false |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:99:11:99:15 | After ... < ... [true] | false |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:102:5:102:22 | After call to puts | false |
+| raise.rb:97:8:97:12 | After ... > ... [false] | raise.rb:99:11:99:15 | After ... < ... [false] | false |
+| raise.rb:97:8:97:12 | After ... > ... [false] | raise.rb:99:11:99:15 | After ... < ... [true] | true |
+| raise.rb:97:8:97:12 | After ... > ... [false] | raise.rb:102:5:102:22 | After call to puts | false |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:106:10:106:11 | After b1 [false] | false |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:106:10:106:11 | After b1 [true] | true |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:94:1:119:3 | Normal Exit | false |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:95:3:118:5 | After ... | false |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:116:6:116:7 | After b2 [false] | false |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:116:6:116:7 | After b2 [true] | true |
+| raise.rb:121:1:126:3 | Entry | raise.rb:121:9:121:9 | After p [match] | match |
+| raise.rb:121:1:126:3 | Entry | raise.rb:121:9:121:9 | After p [no-match] | no-match |
+| raise.rb:128:1:140:3 | Entry | raise.rb:130:8:130:8 | After b [false] | false |
+| raise.rb:128:1:140:3 | Entry | raise.rb:130:8:130:8 | After b [true] | true |
+| raise.rb:128:1:140:3 | Entry | raise.rb:133:10:133:19 | After ExceptionA [match] | true |
+| raise.rb:128:1:140:3 | Entry | raise.rb:133:10:133:19 | After ExceptionA [no-match] | true |
+| raise.rb:128:1:140:3 | Entry | raise.rb:134:10:134:19 | After ExceptionB [match] | true |
+| raise.rb:128:1:140:3 | Entry | raise.rb:134:10:134:19 | After ExceptionB [no-match] | true |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:133:10:133:19 | After ExceptionA [match] | match |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:133:10:133:19 | After ExceptionA [no-match] | no-match |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:134:10:134:19 | After ExceptionB [match] | no-match |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:134:10:134:19 | After ExceptionB [no-match] | no-match |
+| raise.rb:133:10:133:19 | After ExceptionA [no-match] | raise.rb:134:10:134:19 | After ExceptionB [match] | match |
+| raise.rb:133:10:133:19 | After ExceptionA [no-match] | raise.rb:134:10:134:19 | After ExceptionB [no-match] | no-match |
+| raise.rb:142:1:148:3 | Entry | raise.rb:143:6:143:6 | After b [false] | false |
+| raise.rb:142:1:148:3 | Entry | raise.rb:143:6:143:6 | After b [true] | true |
+| raise.rb:155:16:155:50 | Entry | raise.rb:155:37:155:48 | After call to nil? [false] | false |
+| raise.rb:155:16:155:50 | Entry | raise.rb:155:37:155:48 | After call to nil? [true] | true |
+| raise.rb:160:9:162:7 | Entry | raise.rb:161:23:161:23 | After x [false] | false |
+| raise.rb:160:9:162:7 | Entry | raise.rb:161:23:161:23 | After x [true] | true |
+| raise.rb:172:1:182:3 | Entry | raise.rb:174:8:174:9 | After b1 [false] | false |
+| raise.rb:172:1:182:3 | Entry | raise.rb:174:8:174:9 | After b1 [true] | true |
+| raise.rb:172:1:182:3 | Entry | raise.rb:174:14:174:23 | After ... == ... [false] | false |
+| raise.rb:172:1:182:3 | Entry | raise.rb:174:14:174:23 | After ... == ... [true] | false |
+| raise.rb:172:1:182:3 | Entry | raise.rb:179:3:180:12 | rescue ... | false |
+| raise.rb:172:1:182:3 | Entry | raise.rb:179:10:179:19 | After ExceptionA [match] | false |
+| raise.rb:172:1:182:3 | Entry | raise.rb:179:10:179:19 | After ExceptionA [no-match] | false |
+| raise.rb:174:8:174:9 | After b1 [false] | raise.rb:174:14:174:23 | After ... == ... [false] | false |
+| raise.rb:174:8:174:9 | After b1 [false] | raise.rb:174:14:174:23 | After ... == ... [true] | true |
+| raise.rb:179:3:180:12 | rescue ... | raise.rb:179:10:179:19 | After ExceptionA [match] | match |
+| raise.rb:179:3:180:12 | rescue ... | raise.rb:179:10:179:19 | After ExceptionA [no-match] | no-match |
 successor
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:8:3:10:5 | if ... | false |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:9:5:9:23 | self | true |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:2:3:6:5 | while ... | false |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:3:8:3:8 | x | true |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:8:6:8:13 | [ensure: exception] self | exception |
-| break_ensure.rb:3:8:3:8 | x | break_ensure.rb:2:3:6:5 | while ... | exception |
-| break_ensure.rb:3:8:3:8 | x | break_ensure.rb:3:5:5:7 | if ... | false |
-| break_ensure.rb:3:8:3:8 | x | break_ensure.rb:4:7:4:11 | break | true |
-| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | false |
-| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:9:5:9:23 | [ensure: exception] self | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:14:3:24:5 | while ... | false |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:16:10:16:10 | x | true |
-| break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:20:7:22:9 | if ... | false |
-| break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:21:9:21:20 | self | true |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:16:7:18:9 | if ... | false |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:17:9:17:13 | break | true |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:10:20:10 | [ensure: exception] y | exception |
-| break_ensure.rb:17:9:17:13 | break | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | false |
-| break_ensure.rb:17:9:17:13 | break | break_ensure.rb:21:9:21:20 | [ensure: break] self | true |
-| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | false |
-| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:21:9:21:20 | [ensure: exception] self | true |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:29:5:31:7 | if ... | false |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:30:7:30:12 | return | true |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:11:33:11 | [ensure: exception] y | exception |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | false |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:35:12:35:12 | [ensure: exception] x | true |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | false |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:35:12:35:12 | [ensure: return] x | true |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:33:5:39:7 | while ... | false |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:12:35:12 | x | true |
-| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | false |
-| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:36:11:36:15 | [ensure: exception] break | true |
-| break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | false |
-| break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:36:11:36:15 | [ensure: return] break | true |
-| break_ensure.rb:35:12:35:12 | x | break_ensure.rb:35:9:37:11 | if ... | false |
-| break_ensure.rb:35:12:35:12 | x | break_ensure.rb:36:11:36:15 | break | true |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:45:3:55:5 | while ... | false |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:47:10:47:10 | x | true |
-| break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:51:7:53:9 | if ... | false |
-| break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:52:15:52:16 | 10 | true |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:47:7:49:9 | if ... | false |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:48:9:48:16 | self | true |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:51:10:51:10 | [ensure: exception] x | exception |
-| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | false |
-| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | true |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:3:5:3:42 | [match] when ... | match |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:3:5:3:42 | [no-match] when ... | no-match |
-| case.rb:3:5:3:42 | [match] when ... | case.rb:3:21:3:22 | self | match |
-| case.rb:3:5:3:42 | [no-match] when ... | case.rb:4:10:4:10 | 2 | no-match |
-| case.rb:3:21:3:22 | self | case.rb:3:18:3:41 | if ... | false |
-| case.rb:3:21:3:22 | self | case.rb:3:29:3:37 | self | true |
-| case.rb:4:5:4:24 | [match] when ... | case.rb:4:17:4:24 | self | match |
-| case.rb:4:5:4:24 | [no-match] when ... | case.rb:2:3:5:5 | case ... | no-match |
-| case.rb:4:10:4:10 | 2 | case.rb:4:5:4:24 | [match] when ... | match |
-| case.rb:4:10:4:10 | 2 | case.rb:4:5:4:24 | [no-match] when ... | no-match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:9:3:17:5 | case ... | match |
-| case.rb:8:1:18:3 | enter case_match | case.rb:11:5:11:15 | in ... then ... | no-match |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:11:15:11:15 | 3 | match |
-| case.rb:11:5:11:15 | in ... then ... | case.rb:12:5:13:7 | in ... then ... | no-match |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:13:7:13:7 | 4 | match |
-| case.rb:12:5:13:7 | in ... then ... | case.rb:14:5:14:25 | in ... then ... | no-match |
-| case.rb:14:5:14:25 | in ... then ... | case.rb:14:13:14:13 | x | match |
-| case.rb:14:13:14:13 | x | case.rb:14:25:14:25 | 6 | true |
-| case.rb:14:13:14:13 | x | case.rb:15:5:15:28 | in ... then ... | false |
-| case.rb:15:5:15:28 | in ... then ... | case.rb:15:17:15:17 | x | match |
-| case.rb:15:17:15:17 | x | case.rb:15:28:15:28 | 7 | false |
-| case.rb:15:17:15:17 | x | case.rb:16:10:16:10 | 8 | true |
-| case.rb:20:1:24:3 | enter case_match_no_match | case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | exception |
-| case.rb:20:1:24:3 | enter case_match_no_match | case.rb:21:3:23:5 | case ... | match |
-| case.rb:26:1:30:3 | enter case_match_raise | case.rb:26:1:30:3 | exit case_match_raise (abnormal) | exception |
-| case.rb:26:1:30:3 | enter case_match_raise | case.rb:27:3:29:5 | case ... | match |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:33:3:38:5 | case ... | match |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:35:5:35:11 | in ... then ... | no-match |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:35:9:35:9 | x | false |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:35:9:35:9 | x | match |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:35:9:35:9 | x | true |
-| case.rb:35:5:35:11 | in ... then ... | case.rb:36:5:36:13 | in ... then ... | no-match |
-| case.rb:35:9:35:9 | x | case.rb:33:3:38:5 | case ... | match |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:36:9:36:9 | x | false |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:36:9:36:9 | x | match |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:36:9:36:9 | x | true |
-| case.rb:36:5:36:13 | in ... then ... | case.rb:37:5:37:27 | in ... then ... | no-match |
-| case.rb:36:9:36:9 | x | case.rb:33:3:38:5 | case ... | match |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:32:1:39:3 | exit case_match_array (abnormal) | exception |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:8:37:26 | [ ..., * ] | match |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:32:1:39:3 | exit case_match_array (abnormal) | exception |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:12:37:12 | a | false |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:12:37:12 | a | match |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:12:37:12 | a | true |
-| case.rb:37:12:37:12 | a | case.rb:37:15:37:15 | b | match |
-| case.rb:37:15:37:15 | b | case.rb:37:19:37:19 | c | match |
-| case.rb:37:19:37:19 | c | case.rb:37:25:37:25 | e | match |
-| case.rb:37:25:37:25 | e | case.rb:33:3:38:5 | case ... | match |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:41:1:45:3 | exit case_match_find (abnormal) | exception |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:10:43:10 | x | false |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:10:43:10 | x | match |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:43:10:43:10 | x | true |
-| case.rb:43:10:43:10 | x | case.rb:41:1:45:3 | exit case_match_find (abnormal) | exception |
-| case.rb:43:10:43:10 | x | case.rb:43:16:43:16 | 2 | match |
-| case.rb:43:16:43:16 | 2 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | exception |
-| case.rb:43:16:43:16 | 2 | case.rb:43:20:43:20 | y | match |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:49:8:49:34 | { ..., ** } | match |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:50:5:50:25 | in ... then ... | no-match |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:20:49:20 | 1 | false |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:20:49:20 | 1 | match |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:20:49:20 | 1 | true |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:50:5:50:25 | in ... then ... | no-match |
-| case.rb:49:20:49:20 | 1 | case.rb:49:23:49:23 | a | match |
-| case.rb:49:20:49:20 | 1 | case.rb:50:5:50:25 | in ... then ... | no-match |
-| case.rb:49:23:49:23 | a | case.rb:49:29:49:32 | rest | match |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:50:8:50:24 | { ..., ** } | match |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:51:5:51:17 | in ... then ... | no-match |
-| case.rb:50:8:50:24 | { ..., ** } | case.rb:50:16:50:16 | 1 | false |
-| case.rb:50:8:50:24 | { ..., ** } | case.rb:50:16:50:16 | 1 | match |
-| case.rb:50:8:50:24 | { ..., ** } | case.rb:50:16:50:16 | 1 | true |
-| case.rb:50:8:50:24 | { ..., ** } | case.rb:51:5:51:17 | in ... then ... | no-match |
-| case.rb:50:16:50:16 | 1 | case.rb:48:3:52:5 | case ... | match |
-| case.rb:50:16:50:16 | 1 | case.rb:51:5:51:17 | in ... then ... | no-match |
-| case.rb:51:5:51:17 | in ... then ... | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | exception |
-| case.rb:51:5:51:17 | in ... then ... | case.rb:51:8:51:16 | { ..., ** } | match |
-| case.rb:51:8:51:16 | { ..., ** } | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | exception |
-| case.rb:51:8:51:16 | { ..., ** } | case.rb:48:3:52:5 | case ... | false |
-| case.rb:51:8:51:16 | { ..., ** } | case.rb:48:3:52:5 | case ... | match |
-| case.rb:51:8:51:16 | { ..., ** } | case.rb:48:3:52:5 | case ... | true |
-| case.rb:55:1:61:3 | enter case_match_variable | case.rb:56:3:60:5 | case ... | match |
-| case.rb:55:1:61:3 | enter case_match_variable | case.rb:58:5:58:10 | in ... then ... | no-match |
-| case.rb:58:5:58:10 | in ... then ... | case.rb:56:3:60:5 | case ... | match |
-| case.rb:63:1:67:3 | enter case_match_underscore | case.rb:64:3:66:5 | case ... | match |
-| case.rb:63:1:67:3 | enter case_match_underscore | case.rb:65:12:65:12 | _ | no-match |
-| case.rb:65:12:65:12 | _ | case.rb:64:3:66:5 | case ... | match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:72:3:92:5 | case ... | match |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:74:5:74:11 | in ... then ... | no-match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:74:5:74:11 | in ... then ... | case.rb:75:5:75:15 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:76:5:76:18 | in ... then ... | no-match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:77:5:77:18 | in ... then ... | no-match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:78:5:78:19 | in ... then ... | no-match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:79:5:79:14 | in ... then ... | no-match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:80:5:80:12 | in ... then ... | no-match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:81:5:81:11 | in ... then ... | no-match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:82:5:82:20 | in ... then ... | no-match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:82:13:82:13 | x | match |
-| case.rb:82:5:82:20 | in ... then ... | case.rb:83:5:83:26 | in ... then ... | no-match |
-| case.rb:82:13:82:13 | x | case.rb:82:20:82:20 | 1 | match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:83:5:83:26 | in ... then ... | case.rb:83:12:83:15 | ^... | no-match |
-| case.rb:83:12:83:15 | ^... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:83:12:83:15 | ^... | case.rb:83:20:83:25 | string | no-match |
-| case.rb:83:20:83:25 | string | case.rb:72:3:92:5 | case ... | match |
-| case.rb:83:20:83:25 | string | case.rb:84:5:84:17 | in ... then ... | no-match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:85:5:85:23 | in ... then ... | no-match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:85:5:85:23 | in ... then ... | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:87:5:87:17 | in ... then ... | no-match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:88:5:88:15 | in ... then ... | no-match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:88:5:88:15 | in ... then ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:88:14:88:15 | 10 | case.rb:72:3:92:5 | case ... | match |
-| case.rb:88:14:88:15 | 10 | case.rb:89:5:89:69 | in ... then ... | no-match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:5:89:69 | in ... then ... | case.rb:89:14:89:17 | self | no-match |
-| case.rb:89:14:89:17 | self | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:14:89:17 | self | case.rb:89:21:89:24 | true | no-match |
-| case.rb:89:21:89:24 | true | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:21:89:24 | true | case.rb:89:28:89:32 | false | no-match |
-| case.rb:89:28:89:32 | false | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:28:89:32 | false | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:90:5:90:13 | in ... then ... | no-match |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:90:5:90:13 | in ... then ... | case.rb:91:5:91:25 | in ... then ... | no-match |
-| case.rb:91:5:91:25 | in ... then ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:91:5:91:25 | in ... then ... | case.rb:91:13:91:14 | "" | no-match |
-| case.rb:91:13:91:14 | "" | case.rb:72:3:92:5 | case ... | match |
-| case.rb:91:13:91:14 | "" | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:91:18:91:19 | [ ..., * ] | case.rb:72:3:92:5 | case ... | match |
-| case.rb:91:18:91:19 | [ ..., * ] | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:91:23:91:24 | { ..., ** } | case.rb:69:1:93:3 | exit case_match_various (abnormal) | exception |
-| case.rb:91:23:91:24 | { ..., ** } | case.rb:72:3:92:5 | case ... | false |
-| case.rb:91:23:91:24 | { ..., ** } | case.rb:72:3:92:5 | case ... | match |
-| case.rb:91:23:91:24 | { ..., ** } | case.rb:72:3:92:5 | case ... | true |
-| case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:97:13:97:13 | x | match |
-| case.rb:97:13:97:13 | x | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | exception |
-| case.rb:97:13:97:13 | x | case.rb:97:25:97:25 | 6 | true |
-| cfg.html.erb:5:16:31:12 | enter cfg.html.erb | cfg.html.erb:19:19:19:32 | self | true |
-| cfg.html.erb:5:16:31:12 | enter cfg.html.erb | cfg.html.erb:21:19:21:32 | self | false |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:32:9:32:9 | 1 | true |
-| cfg.rb:32:9:32:9 | 1 | cfg.rb:35:1:37:3 | if ... | false |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:42:3:42:24 | [match] when ... | match |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:42:3:42:24 | [no-match] when ... | no-match |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:48:3:48:29 | [match] when ... | match |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:48:3:48:29 | [no-match] when ... | no-match |
-| cfg.rb:42:3:42:24 | [match] when ... | cfg.rb:42:15:42:24 | self | match |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:8:43:8 | 2 | no-match |
-| cfg.rb:43:3:43:31 | [match] when ... | cfg.rb:43:21:43:31 | self | match |
-| cfg.rb:43:3:43:31 | [no-match] when ... | cfg.rb:44:8:44:18 | self | no-match |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:3:43:31 | [match] when ... | match |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:11:43:11 | 3 | no-match |
-| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:3:43:31 | [match] when ... | match |
-| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:14:43:14 | 4 | no-match |
-| cfg.rb:43:14:43:14 | 4 | cfg.rb:43:3:43:31 | [match] when ... | match |
-| cfg.rb:43:14:43:14 | 4 | cfg.rb:43:3:43:31 | [no-match] when ... | no-match |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:60:27:60:31 | hello | true |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:60:37:60:39 | bye | false |
-| cfg.rb:48:3:48:29 | [match] when ... | cfg.rb:48:20:48:29 | self | match |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:49:8:49:8 | b | no-match |
-| cfg.rb:49:3:49:37 | [match] when ... | cfg.rb:49:27:49:37 | self | match |
-| cfg.rb:49:3:49:37 | [no-match] when ... | cfg.rb:47:1:50:3 | case ... | no-match |
-| cfg.rb:49:8:49:8 | b | cfg.rb:49:3:49:37 | [match] when ... | match |
-| cfg.rb:49:8:49:8 | b | cfg.rb:49:16:49:16 | b | no-match |
-| cfg.rb:49:16:49:16 | b | cfg.rb:49:3:49:37 | [match] when ... | match |
-| cfg.rb:49:16:49:16 | b | cfg.rb:49:3:49:37 | [no-match] when ... | no-match |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:75:15:75:15 | 0 | true |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:75:23:75:23 | x | false |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:90:5:90:5 | [false] ! ... | true |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:90:5:90:5 | [true] ! ... | false |
-| cfg.rb:75:23:75:23 | x | cfg.rb:75:35:75:36 | 10 | true |
-| cfg.rb:75:23:75:23 | x | cfg.rb:75:43:75:43 | x | false |
-| cfg.rb:90:1:93:3 | enter { ... } | cfg.rb:91:3:91:24 | if ... | false |
-| cfg.rb:90:1:93:3 | enter { ... } | cfg.rb:91:17:91:20 | next | true |
-| cfg.rb:90:5:90:5 | [false] ! ... | cfg.rb:90:5:90:5 | if ... | false |
-| cfg.rb:90:5:90:5 | [true] ! ... | cfg.rb:90:5:90:5 | x | true |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:113:1:113:9 | self | true |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:113:1:113:19 | ... if ... | false |
-| cfg.rb:101:1:104:3 | enter parameters | cfg.rb:101:24:101:25 | 42 | false |
-| cfg.rb:101:1:104:3 | enter parameters | cfg.rb:101:24:101:25 | 42 | no-match |
-| cfg.rb:101:1:104:3 | enter parameters | cfg.rb:101:24:101:25 | 42 | true |
-| cfg.rb:101:1:104:3 | enter parameters | cfg.rb:101:28:101:30 | key | match |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:172:21:172:29 | self | false |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:172:36:172:45 | self | true |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:174:1:174:9 | self | false |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:174:1:174:23 | ... unless ... | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:176:1:176:41 | until ... | true |
-| cfg.rb:176:7:176:7 | x | cfg.rb:176:17:176:17 | x | false |
-| cfg.rb:179:30:179:30 | i | cfg.rb:179:1:179:36 | ... until ... | true |
-| cfg.rb:179:30:179:30 | i | cfg.rb:179:2:179:13 | self | false |
-| cfg.rb:182:7:182:7 | x | cfg.rb:182:1:186:3 | while ... | false |
-| cfg.rb:182:7:182:7 | x | cfg.rb:183:3:183:3 | x | true |
-| cfg.rb:183:3:183:3 | x | cfg.rb:184:3:184:25 | if ... | false |
-| cfg.rb:183:3:183:3 | x | cfg.rb:184:18:184:21 | redo | true |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:205:1:205:3 | __synth__0__1 | false |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:205:1:205:3 | nil | true |
-| cfg.rb:188:30:188:30 | i | cfg.rb:188:1:188:35 | ... while ... | false |
-| cfg.rb:188:30:188:30 | i | cfg.rb:188:2:188:13 | self | true |
-| constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | true |
-| constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | constant_compound_assign.rb:5:22:5:24 | 123 | false |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | true |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:14:18:14:20 | 123 | false |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | true |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:19:21:19:23 | 123 | false |
-| exit.rb:1:1:6:3 | enter m1 | exit.rb:2:3:4:5 | if ... | false |
-| exit.rb:1:1:6:3 | enter m1 | exit.rb:3:5:3:10 | self | true |
-| exit.rb:8:1:13:3 | enter m2 | exit.rb:9:3:11:5 | if ... | false |
-| exit.rb:8:1:13:3 | enter m2 | exit.rb:10:5:10:18 | self | true |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:3:5:3:30 | self | true |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:4:9:4:9 | x | false |
-| ifs.rb:1:1:58:4 | enter ifs.rb | ifs.rb:36:1:38:3 | conditional_method_def | false |
-| ifs.rb:1:1:58:4 | enter ifs.rb | ifs.rb:36:1:38:17 | ... unless ... | true |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:9:4:24 | [false] ... and ... | false |
-| ifs.rb:4:9:4:9 | x | ifs.rb:4:20:4:20 | x | true |
-| ifs.rb:4:9:4:24 | [false] ... and ... | ifs.rb:4:9:4:38 | [false] ... and ... | false |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:32:4:32 | x | true |
-| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:7:5:7:35 | self | false |
-| ifs.rb:4:9:4:38 | [true] ... and ... | ifs.rb:5:5:5:17 | self | true |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:9:4:24 | [false] ... and ... | false |
-| ifs.rb:4:20:4:20 | x | ifs.rb:4:9:4:24 | [true] ... and ... | true |
-| ifs.rb:4:30:4:38 | [false] ! ... | ifs.rb:4:9:4:38 | [false] ... and ... | false |
-| ifs.rb:4:30:4:38 | [true] ! ... | ifs.rb:4:9:4:38 | [true] ... and ... | true |
-| ifs.rb:4:31:4:38 | [false] ( ... ) | ifs.rb:4:30:4:38 | [true] ! ... | false |
-| ifs.rb:4:31:4:38 | [true] ( ... ) | ifs.rb:4:30:4:38 | [false] ! ... | true |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:31:4:38 | [false] ( ... ) | false |
-| ifs.rb:4:32:4:32 | x | ifs.rb:4:31:4:38 | [true] ( ... ) | true |
-| ifs.rb:11:1:16:3 | enter m2 | ifs.rb:12:3:14:5 | if ... | false |
-| ifs.rb:11:1:16:3 | enter m2 | ifs.rb:13:12:13:12 | 0 | true |
-| ifs.rb:18:1:26:3 | enter m3 | ifs.rb:19:3:24:5 | if ... | false |
-| ifs.rb:18:1:26:3 | enter m3 | ifs.rb:20:5:20:5 | x | true |
-| ifs.rb:20:5:20:5 | x | ifs.rb:21:5:23:7 | if ... | false |
-| ifs.rb:20:5:20:5 | x | ifs.rb:22:7:22:7 | x | true |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:29:16:29:17 | b2 | true |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:29:21:29:22 | b3 | false |
-| ifs.rb:29:10:29:23 | [false] ( ... ) | ifs.rb:29:41:29:50 | !b2 \|\| !b3 | false |
-| ifs.rb:29:10:29:23 | [true] ( ... ) | ifs.rb:29:28:29:35 | b2 \|\| b3 | true |
-| ifs.rb:29:11:29:22 | [false] ... ? ... : ... | ifs.rb:29:10:29:23 | [false] ( ... ) | false |
-| ifs.rb:29:11:29:22 | [true] ... ? ... : ... | ifs.rb:29:10:29:23 | [true] ( ... ) | true |
-| ifs.rb:29:16:29:17 | b2 | ifs.rb:29:11:29:22 | [false] ... ? ... : ... | false |
-| ifs.rb:29:16:29:17 | b2 | ifs.rb:29:11:29:22 | [true] ... ? ... : ... | true |
-| ifs.rb:29:21:29:22 | b3 | ifs.rb:29:11:29:22 | [false] ... ? ... : ... | false |
-| ifs.rb:29:21:29:22 | b3 | ifs.rb:29:11:29:22 | [true] ... ? ... : ... | true |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:18:33:19 | b2 | true |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:33:27:33:28 | b3 | false |
-| ifs.rb:33:6:33:49 | [false] ( ... ) | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | false |
-| ifs.rb:33:6:33:49 | [true] ( ... ) | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | true |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:6:33:49 | [false] ( ... ) | false |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:6:33:49 | [true] ( ... ) | true |
-| ifs.rb:33:13:33:19 | [false] then ... | ifs.rb:33:7:33:48 | [false] if ... | false |
-| ifs.rb:33:13:33:19 | [true] then ... | ifs.rb:33:7:33:48 | [true] if ... | true |
-| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:13:33:19 | [false] then ... | false |
-| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:13:33:19 | [true] then ... | true |
-| ifs.rb:33:21:33:44 | [false] elsif ... | ifs.rb:33:7:33:48 | [false] if ... | false |
-| ifs.rb:33:21:33:44 | [true] elsif ... | ifs.rb:33:7:33:48 | [true] if ... | true |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:35:33:36 | b4 | true |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:43:33:44 | b5 | false |
-| ifs.rb:33:30:33:36 | [false] then ... | ifs.rb:33:21:33:44 | [false] elsif ... | false |
-| ifs.rb:33:30:33:36 | [true] then ... | ifs.rb:33:21:33:44 | [true] elsif ... | true |
-| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:30:33:36 | [false] then ... | false |
-| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:30:33:36 | [true] then ... | true |
-| ifs.rb:33:38:33:44 | [false] else ... | ifs.rb:33:21:33:44 | [false] elsif ... | false |
-| ifs.rb:33:38:33:44 | [true] else ... | ifs.rb:33:21:33:44 | [true] elsif ... | true |
-| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:38:33:44 | [false] else ... | false |
-| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:38:33:44 | [true] else ... | true |
-| ifs.rb:40:1:44:3 | enter constant_condition | ifs.rb:41:6:41:10 | [false] ! ... | true |
-| ifs.rb:41:6:41:10 | [false] ! ... | ifs.rb:41:3:43:5 | if ... | false |
-| ifs.rb:46:1:52:3 | enter empty_else | ifs.rb:48:5:48:15 | self | true |
-| ifs.rb:46:1:52:3 | enter empty_else | ifs.rb:49:3:49:6 | else ... | false |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:55:7:55:14 | [true] ... \|\| ... | true |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:55:13:55:14 | b2 | false |
-| ifs.rb:55:6:55:15 | [false] ( ... ) | ifs.rb:55:3:57:5 | if ... | false |
-| ifs.rb:55:6:55:15 | [true] ( ... ) | ifs.rb:56:5:56:19 | self | true |
-| ifs.rb:55:7:55:14 | [false] ... \|\| ... | ifs.rb:55:6:55:15 | [false] ( ... ) | false |
-| ifs.rb:55:7:55:14 | [true] ... \|\| ... | ifs.rb:55:6:55:15 | [true] ( ... ) | true |
-| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:7:55:14 | [false] ... \|\| ... | false |
-| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:7:55:14 | [true] ... \|\| ... | true |
-| loops.rb:2:9:2:9 | x | loops.rb:2:3:5:5 | while ... | false |
-| loops.rb:2:9:2:9 | x | loops.rb:3:5:3:10 | self | true |
-| loops.rb:9:9:9:9 | x | loops.rb:9:3:20:5 | while ... | false |
-| loops.rb:9:9:9:9 | x | loops.rb:10:5:10:10 | self | true |
-| loops.rb:10:5:10:10 | self | loops.rb:13:7:13:11 | break | true |
-| loops.rb:10:5:10:10 | self | loops.rb:14:11:14:11 | x | false |
-| loops.rb:14:11:14:11 | x | loops.rb:15:7:15:10 | next | true |
-| loops.rb:14:11:14:11 | x | loops.rb:16:11:16:11 | x | false |
-| loops.rb:16:11:16:11 | x | loops.rb:16:5:17:10 | elsif ... | false |
-| loops.rb:16:11:16:11 | x | loops.rb:17:7:17:10 | redo | true |
-| loops.rb:31:9:31:9 | x | loops.rb:31:3:32:5 | while ... | false |
-| loops.rb:31:9:31:9 | x | loops.rb:31:15:32:5 | do ... | true |
-| raise.rb:7:1:12:3 | enter m1 | raise.rb:8:3:10:5 | if ... | false |
-| raise.rb:7:1:12:3 | enter m1 | raise.rb:9:5:9:17 | self | true |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:16:5:18:7 | if ... | false |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:17:7:17:22 | self | true |
-| raise.rb:17:7:17:22 | self | raise.rb:14:1:23:3 | exit m2 (abnormal) | exception |
-| raise.rb:17:7:17:22 | self | raise.rb:20:5:20:18 | self | match |
-| raise.rb:25:1:34:3 | enter m3 | raise.rb:27:5:29:7 | if ... | false |
-| raise.rb:25:1:34:3 | enter m3 | raise.rb:28:7:28:22 | self | true |
-| raise.rb:36:1:45:3 | enter m4 | raise.rb:38:5:40:7 | if ... | false |
-| raise.rb:36:1:45:3 | enter m4 | raise.rb:39:7:39:22 | self | true |
-| raise.rb:47:1:55:3 | enter m5 | raise.rb:49:5:51:7 | if ... | false |
-| raise.rb:47:1:55:3 | enter m5 | raise.rb:50:7:50:22 | self | true |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:59:5:61:7 | if ... | false |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:60:7:60:22 | self | true |
-| raise.rb:60:7:60:22 | self | raise.rb:62:22:62:31 | ExceptionB | no-match |
-| raise.rb:60:7:60:22 | self | raise.rb:62:36:62:36 | e | match |
-| raise.rb:62:22:62:31 | ExceptionB | raise.rb:57:1:66:3 | exit m6 (abnormal) | exception |
-| raise.rb:62:22:62:31 | ExceptionB | raise.rb:62:36:62:36 | e | match |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:70:5:70:17 | self | true |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:71:9:71:9 | x | false |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:76:3:76:15 | [ensure: exception] self | exception |
-| raise.rb:71:9:71:9 | x | raise.rb:71:3:72:18 | elsif ... | false |
-| raise.rb:71:9:71:9 | x | raise.rb:72:13:72:17 | x < 0 | true |
-| raise.rb:71:9:71:9 | x | raise.rb:76:3:76:15 | [ensure: exception] self | exception |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:83:7:83:19 | self | true |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:84:11:84:11 | x | false |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:89:5:89:17 | [ensure: exception] self | exception |
-| raise.rb:84:11:84:11 | x | raise.rb:84:5:85:20 | elsif ... | false |
-| raise.rb:84:11:84:11 | x | raise.rb:85:15:85:19 | x < 0 | true |
-| raise.rb:84:11:84:11 | x | raise.rb:89:5:89:17 | [ensure: exception] self | exception |
-| raise.rb:97:8:97:8 | x | raise.rb:98:7:98:19 | self | true |
-| raise.rb:97:8:97:8 | x | raise.rb:99:11:99:11 | x | false |
-| raise.rb:97:8:97:8 | x | raise.rb:104:5:104:23 | [ensure: exception] self | exception |
-| raise.rb:99:11:99:11 | x | raise.rb:99:5:100:20 | elsif ... | false |
-| raise.rb:99:11:99:11 | x | raise.rb:100:15:100:19 | x < 0 | true |
-| raise.rb:99:11:99:11 | x | raise.rb:104:5:104:23 | [ensure: exception] self | exception |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:106:7:108:9 | [ensure: exception] if ... | false |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:107:9:107:26 | [ensure: exception] self | true |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:106:7:108:9 | [ensure: return] if ... | false |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:107:9:107:26 | [ensure: return] self | true |
-| raise.rb:106:10:106:11 | b1 | raise.rb:106:7:108:9 | if ... | false |
-| raise.rb:106:10:106:11 | b1 | raise.rb:107:9:107:26 | self | true |
-| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:116:3:118:5 | [ensure: return] if ... | false |
-| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:117:5:117:22 | [ensure: return] self | true |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:116:3:118:5 | [ensure: exception] if ... | false |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:117:5:117:22 | [ensure: exception] self | true |
-| raise.rb:115:3:115:22 | self | raise.rb:116:3:118:5 | if ... | false |
-| raise.rb:115:3:115:22 | self | raise.rb:117:5:117:22 | self | true |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:121:14:121:30 | self | false |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:121:14:121:30 | self | no-match |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:121:14:121:30 | self | true |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:125:3:125:51 | self | match |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:130:5:132:7 | if ... | false |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:131:7:131:22 | self | true |
-| raise.rb:131:7:131:22 | self | raise.rb:133:3:133:19 | rescue ... | match |
-| raise.rb:131:7:131:22 | self | raise.rb:134:10:134:19 | ExceptionB | no-match |
-| raise.rb:134:10:134:19 | ExceptionB | raise.rb:135:5:135:21 | self | match |
-| raise.rb:134:10:134:19 | ExceptionB | raise.rb:137:5:137:17 | [ensure: exception] self | exception |
-| raise.rb:142:1:148:3 | enter m12 | raise.rb:143:3:145:5 | if ... | false |
-| raise.rb:142:1:148:3 | enter m12 | raise.rb:144:5:144:12 | self | true |
-| raise.rb:155:16:155:50 | enter { ... } | raise.rb:155:25:155:32 | self | true |
-| raise.rb:155:16:155:50 | enter { ... } | raise.rb:155:25:155:48 | ... if ... | false |
-| raise.rb:160:9:162:7 | enter -> { ... } | raise.rb:161:7:161:14 | self | false |
-| raise.rb:160:9:162:7 | enter -> { ... } | raise.rb:161:7:161:23 | ... unless ... | true |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:174:8:174:23 | [true] ... \|\| ... | true |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:174:14:174:15 | b2 | false |
-| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:177:14:177:14 | 2 | false |
-| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | exception |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:175:14:175:14 | 1 | true |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | exception |
-| raise.rb:174:14:174:15 | b2 | raise.rb:174:8:174:23 | [false] ... \|\| ... | false |
-| raise.rb:174:14:174:15 | b2 | raise.rb:174:8:174:23 | [true] ... \|\| ... | true |
-| raise.rb:174:14:174:15 | b2 | raise.rb:179:10:179:19 | ExceptionA | exception |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:172:1:182:3 | exit m16 (abnormal) | exception |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:180:12:180:12 | 3 | match |
-joinBlockPredecessor
-| break_ensure.rb:1:1:11:3 | exit m1 | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | 1 |
-| break_ensure.rb:1:1:11:3 | exit m1 | break_ensure.rb:8:3:10:5 | if ... | 0 |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:2:9:2:9 | x | 0 |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:3:8:3:8 | x | 1 |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:4:7:4:11 | break | 2 |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:1:1:11:3 | enter m1 | 0 |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:3:5:5:7 | if ... | 1 |
-| break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | break_ensure.rb:8:6:8:13 | [ensure: exception] self | 0 |
-| break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | break_ensure.rb:9:5:9:23 | [ensure: exception] self | 1 |
-| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:2:3:6:5 | while ... | 0 |
-| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:9:5:9:23 | self | 1 |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:14:9:14:9 | x | 0 |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | 1 |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | 2 |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:13:1:25:3 | enter m2 | 0 |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | if ... | 1 |
-| break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:17:9:17:13 | break | 0 |
-| break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:21:9:21:20 | [ensure: break] self | 1 |
-| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:20:10:20:10 | [ensure: exception] y | 0 |
-| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:21:9:21:20 | [ensure: exception] self | 1 |
-| break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:16:7:18:9 | if ... | 0 |
-| break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:21:9:21:20 | self | 1 |
-| break_ensure.rb:27:1:42:3 | exit m3 | break_ensure.rb:27:1:42:3 | exit m3 (normal) | 0 |
-| break_ensure.rb:27:1:42:3 | exit m3 | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | 1 |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | 1 |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:33:5:39:7 | while ... | 0 |
-| break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break_ensure.rb:33:11:33:11 | [ensure: exception] y | 0 |
-| break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break_ensure.rb:36:11:36:15 | [ensure: exception] break | 1 |
-| break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:33:11:33:11 | [ensure: return] y | 0 |
-| break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:36:11:36:15 | [ensure: return] break | 1 |
-| break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:33:11:33:11 | y | 0 |
-| break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:36:11:36:15 | break | 1 |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:27:1:42:3 | enter m3 | 0 |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | 1 |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:30:7:30:12 | return | 0 |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | 1 |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:29:5:31:7 | if ... | 0 |
-| break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:9:37:11 | if ... | 1 |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:45:9:45:9 | x | 0 |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | 1 |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:52:15:52:16 | 10 | 2 |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | 3 |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:44:1:56:3 | enter m4 | 0 |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | if ... | 1 |
-| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:47:10:47:10 | x | 0 |
-| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:48:9:48:16 | self | 1 |
-| case.rb:2:3:5:5 | case ... | case.rb:3:18:3:41 | if ... | 0 |
-| case.rb:2:3:5:5 | case ... | case.rb:4:5:4:24 | [no-match] when ... | 1 |
-| case.rb:2:3:5:5 | case ... | case.rb:4:17:4:24 | self | 2 |
-| case.rb:3:18:3:41 | if ... | case.rb:3:21:3:22 | self | 0 |
-| case.rb:3:18:3:41 | if ... | case.rb:3:29:3:37 | self | 1 |
-| case.rb:9:3:17:5 | case ... | case.rb:8:1:18:3 | enter case_match | 0 |
-| case.rb:9:3:17:5 | case ... | case.rb:11:15:11:15 | 3 | 1 |
-| case.rb:9:3:17:5 | case ... | case.rb:13:7:13:7 | 4 | 2 |
-| case.rb:9:3:17:5 | case ... | case.rb:14:25:14:25 | 6 | 3 |
-| case.rb:9:3:17:5 | case ... | case.rb:15:28:15:28 | 7 | 4 |
-| case.rb:9:3:17:5 | case ... | case.rb:16:10:16:10 | 8 | 5 |
-| case.rb:20:1:24:3 | exit case_match_no_match | case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | 0 |
-| case.rb:20:1:24:3 | exit case_match_no_match | case.rb:21:3:23:5 | case ... | 1 |
-| case.rb:26:1:30:3 | exit case_match_raise | case.rb:26:1:30:3 | exit case_match_raise (abnormal) | 0 |
-| case.rb:26:1:30:3 | exit case_match_raise | case.rb:27:3:29:5 | case ... | 1 |
-| case.rb:32:1:39:3 | exit case_match_array | case.rb:32:1:39:3 | exit case_match_array (abnormal) | 0 |
-| case.rb:32:1:39:3 | exit case_match_array | case.rb:33:3:38:5 | case ... | 1 |
-| case.rb:32:1:39:3 | exit case_match_array (abnormal) | case.rb:37:5:37:27 | in ... then ... | 0 |
-| case.rb:32:1:39:3 | exit case_match_array (abnormal) | case.rb:37:8:37:26 | [ ..., * ] | 1 |
-| case.rb:33:3:38:5 | case ... | case.rb:32:1:39:3 | enter case_match_array | 0 |
-| case.rb:33:3:38:5 | case ... | case.rb:35:9:35:9 | x | 1 |
-| case.rb:33:3:38:5 | case ... | case.rb:36:9:36:9 | x | 2 |
-| case.rb:33:3:38:5 | case ... | case.rb:37:25:37:25 | e | 3 |
-| case.rb:41:1:45:3 | exit case_match_find | case.rb:41:1:45:3 | exit case_match_find (abnormal) | 0 |
-| case.rb:41:1:45:3 | exit case_match_find | case.rb:43:20:43:20 | y | 1 |
-| case.rb:41:1:45:3 | exit case_match_find (abnormal) | case.rb:41:1:45:3 | enter case_match_find | 0 |
-| case.rb:41:1:45:3 | exit case_match_find (abnormal) | case.rb:43:10:43:10 | x | 1 |
-| case.rb:41:1:45:3 | exit case_match_find (abnormal) | case.rb:43:16:43:16 | 2 | 2 |
-| case.rb:47:1:53:3 | exit case_match_hash | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | 0 |
-| case.rb:47:1:53:3 | exit case_match_hash | case.rb:48:3:52:5 | case ... | 1 |
-| case.rb:47:1:53:3 | exit case_match_hash (abnormal) | case.rb:51:5:51:17 | in ... then ... | 0 |
-| case.rb:47:1:53:3 | exit case_match_hash (abnormal) | case.rb:51:8:51:16 | { ..., ** } | 1 |
-| case.rb:48:3:52:5 | case ... | case.rb:49:29:49:32 | rest | 0 |
-| case.rb:48:3:52:5 | case ... | case.rb:50:16:50:16 | 1 | 1 |
-| case.rb:48:3:52:5 | case ... | case.rb:51:8:51:16 | { ..., ** } | 2 |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:47:1:53:3 | enter case_match_hash | 0 |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:49:8:49:34 | { ..., ** } | 1 |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:49:20:49:20 | 1 | 2 |
-| case.rb:51:5:51:17 | in ... then ... | case.rb:50:5:50:25 | in ... then ... | 0 |
-| case.rb:51:5:51:17 | in ... then ... | case.rb:50:8:50:24 | { ..., ** } | 1 |
-| case.rb:51:5:51:17 | in ... then ... | case.rb:50:16:50:16 | 1 | 2 |
-| case.rb:56:3:60:5 | case ... | case.rb:55:1:61:3 | enter case_match_variable | 0 |
-| case.rb:56:3:60:5 | case ... | case.rb:58:5:58:10 | in ... then ... | 1 |
-| case.rb:64:3:66:5 | case ... | case.rb:63:1:67:3 | enter case_match_underscore | 0 |
-| case.rb:64:3:66:5 | case ... | case.rb:65:12:65:12 | _ | 1 |
-| case.rb:69:1:93:3 | exit case_match_various | case.rb:69:1:93:3 | exit case_match_various (abnormal) | 0 |
-| case.rb:69:1:93:3 | exit case_match_various | case.rb:72:3:92:5 | case ... | 1 |
-| case.rb:72:3:92:5 | case ... | case.rb:69:1:93:3 | enter case_match_various | 0 |
-| case.rb:72:3:92:5 | case ... | case.rb:74:5:74:11 | in ... then ... | 1 |
-| case.rb:72:3:92:5 | case ... | case.rb:75:5:75:15 | in ... then ... | 2 |
-| case.rb:72:3:92:5 | case ... | case.rb:76:5:76:18 | in ... then ... | 3 |
-| case.rb:72:3:92:5 | case ... | case.rb:77:5:77:18 | in ... then ... | 4 |
-| case.rb:72:3:92:5 | case ... | case.rb:78:5:78:19 | in ... then ... | 5 |
-| case.rb:72:3:92:5 | case ... | case.rb:79:5:79:14 | in ... then ... | 6 |
-| case.rb:72:3:92:5 | case ... | case.rb:80:5:80:12 | in ... then ... | 7 |
-| case.rb:72:3:92:5 | case ... | case.rb:81:5:81:11 | in ... then ... | 8 |
-| case.rb:72:3:92:5 | case ... | case.rb:82:20:82:20 | 1 | 9 |
-| case.rb:72:3:92:5 | case ... | case.rb:83:5:83:26 | in ... then ... | 10 |
-| case.rb:72:3:92:5 | case ... | case.rb:83:12:83:15 | ^... | 11 |
-| case.rb:72:3:92:5 | case ... | case.rb:83:20:83:25 | string | 12 |
-| case.rb:72:3:92:5 | case ... | case.rb:84:5:84:17 | in ... then ... | 13 |
-| case.rb:72:3:92:5 | case ... | case.rb:85:5:85:23 | in ... then ... | 14 |
-| case.rb:72:3:92:5 | case ... | case.rb:86:5:86:11 | in ... then ... | 15 |
-| case.rb:72:3:92:5 | case ... | case.rb:87:5:87:17 | in ... then ... | 16 |
-| case.rb:72:3:92:5 | case ... | case.rb:88:5:88:15 | in ... then ... | 17 |
-| case.rb:72:3:92:5 | case ... | case.rb:88:14:88:15 | 10 | 18 |
-| case.rb:72:3:92:5 | case ... | case.rb:89:5:89:69 | in ... then ... | 19 |
-| case.rb:72:3:92:5 | case ... | case.rb:89:14:89:17 | self | 20 |
-| case.rb:72:3:92:5 | case ... | case.rb:89:21:89:24 | true | 21 |
-| case.rb:72:3:92:5 | case ... | case.rb:89:28:89:32 | false | 22 |
-| case.rb:72:3:92:5 | case ... | case.rb:89:36:89:43 | __LINE__ | 23 |
-| case.rb:72:3:92:5 | case ... | case.rb:89:47:89:54 | __FILE__ | 24 |
-| case.rb:72:3:92:5 | case ... | case.rb:89:58:89:69 | __ENCODING__ | 25 |
-| case.rb:72:3:92:5 | case ... | case.rb:90:5:90:13 | in ... then ... | 26 |
-| case.rb:72:3:92:5 | case ... | case.rb:91:5:91:25 | in ... then ... | 27 |
-| case.rb:72:3:92:5 | case ... | case.rb:91:13:91:14 | "" | 28 |
-| case.rb:72:3:92:5 | case ... | case.rb:91:18:91:19 | [ ..., * ] | 29 |
-| case.rb:72:3:92:5 | case ... | case.rb:91:23:91:24 | { ..., ** } | 30 |
-| case.rb:95:1:99:3 | exit case_match_guard_no_else | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | 0 |
-| case.rb:95:1:99:3 | exit case_match_guard_no_else | case.rb:97:25:97:25 | 6 | 1 |
-| cfg.html.erb:18:14:22:16 | if ... | cfg.html.erb:19:19:19:32 | self | 0 |
-| cfg.html.erb:18:14:22:16 | if ... | cfg.html.erb:21:19:21:32 | self | 1 |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:42:15:42:24 | self | 0 |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:43:21:43:31 | self | 1 |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:44:8:44:18 | self | 2 |
-| cfg.rb:43:3:43:31 | [match] when ... | cfg.rb:43:8:43:8 | 2 | 0 |
-| cfg.rb:43:3:43:31 | [match] when ... | cfg.rb:43:11:43:11 | 3 | 1 |
-| cfg.rb:43:3:43:31 | [match] when ... | cfg.rb:43:14:43:14 | 4 | 2 |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:48:20:48:29 | self | 0 |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:49:3:49:37 | [no-match] when ... | 1 |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:49:27:49:37 | self | 2 |
-| cfg.rb:49:3:49:37 | [match] when ... | cfg.rb:49:8:49:8 | b | 0 |
-| cfg.rb:49:3:49:37 | [match] when ... | cfg.rb:49:16:49:16 | b | 1 |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:60:27:60:31 | hello | 0 |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:60:37:60:39 | bye | 1 |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:75:15:75:15 | 0 | 0 |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:75:17:75:43 | elsif ... | 1 |
-| cfg.rb:75:17:75:43 | elsif ... | cfg.rb:75:35:75:36 | 10 | 0 |
-| cfg.rb:75:17:75:43 | elsif ... | cfg.rb:75:43:75:43 | x | 1 |
-| cfg.rb:90:1:93:3 | exit { ... } (normal) | cfg.rb:91:3:91:24 | if ... | 0 |
-| cfg.rb:90:1:93:3 | exit { ... } (normal) | cfg.rb:91:17:91:20 | next | 1 |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:90:5:90:5 | [false] ! ... | 1 |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:90:5:90:5 | x | 0 |
-| cfg.rb:101:28:101:30 | key | cfg.rb:101:1:104:3 | enter parameters | 0 |
-| cfg.rb:101:28:101:30 | key | cfg.rb:101:24:101:25 | 42 | 1 |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:90:5:90:5 | if ... | 0 |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:113:1:113:9 | self | 1 |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:113:1:113:19 | ... if ... | 0 |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:136:12:136:29 | self | 1 |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:172:21:172:29 | self | 0 |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:172:36:172:45 | self | 1 |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:172:1:172:49 | unless ... | 0 |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:174:1:174:9 | self | 1 |
-| cfg.rb:176:7:176:7 | x | cfg.rb:174:1:174:23 | ... unless ... | 0 |
-| cfg.rb:176:7:176:7 | x | cfg.rb:176:17:176:17 | x | 1 |
-| cfg.rb:179:30:179:30 | i | cfg.rb:176:1:176:41 | until ... | 0 |
-| cfg.rb:179:30:179:30 | i | cfg.rb:179:2:179:13 | self | 1 |
-| cfg.rb:182:7:182:7 | x | cfg.rb:179:1:179:36 | ... until ... | 0 |
-| cfg.rb:182:7:182:7 | x | cfg.rb:184:3:184:25 | if ... | 1 |
-| cfg.rb:183:3:183:3 | x | cfg.rb:182:7:182:7 | x | 0 |
-| cfg.rb:183:3:183:3 | x | cfg.rb:184:18:184:21 | redo | 1 |
-| cfg.rb:188:30:188:30 | i | cfg.rb:182:1:186:3 | while ... | 0 |
-| cfg.rb:188:30:188:30 | i | cfg.rb:188:2:188:13 | self | 1 |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:205:1:205:3 | __synth__0__1 | 0 |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:205:1:205:3 | nil | 0 |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | 0 |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:5:22:5:24 | 123 | 1 |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | 0 |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:14:18:14:20 | 123 | 1 |
-| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | 0 |
-| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:19:21:19:23 | 123 | 1 |
-| exit.rb:1:1:6:3 | exit m1 | exit.rb:2:3:4:5 | if ... | 0 |
-| exit.rb:1:1:6:3 | exit m1 | exit.rb:3:5:3:10 | self | 1 |
-| exit.rb:8:1:13:3 | exit m2 | exit.rb:9:3:11:5 | if ... | 0 |
-| exit.rb:8:1:13:3 | exit m2 | exit.rb:10:5:10:18 | self | 1 |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:3:5:3:30 | self | 0 |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:4:3:7:35 | elsif ... | 1 |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:5:5:5:17 | self | 0 |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:7:5:7:35 | self | 1 |
-| ifs.rb:4:9:4:24 | [false] ... and ... | ifs.rb:4:9:4:9 | x | 0 |
-| ifs.rb:4:9:4:24 | [false] ... and ... | ifs.rb:4:20:4:20 | x | 1 |
-| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:4:9:4:24 | [false] ... and ... | 0 |
-| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:4:30:4:38 | [false] ! ... | 1 |
-| ifs.rb:11:1:16:3 | exit m2 (normal) | ifs.rb:12:3:14:5 | if ... | 0 |
-| ifs.rb:11:1:16:3 | exit m2 (normal) | ifs.rb:13:12:13:12 | 0 | 1 |
-| ifs.rb:19:3:24:5 | if ... | ifs.rb:18:1:26:3 | enter m3 | 0 |
-| ifs.rb:19:3:24:5 | if ... | ifs.rb:21:5:23:7 | if ... | 1 |
-| ifs.rb:21:5:23:7 | if ... | ifs.rb:20:5:20:5 | x | 0 |
-| ifs.rb:21:5:23:7 | if ... | ifs.rb:22:7:22:7 | x | 1 |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:28:29:35 | b2 \|\| b3 | 0 |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:41:29:50 | !b2 \|\| !b3 | 1 |
-| ifs.rb:29:11:29:22 | [false] ... ? ... : ... | ifs.rb:29:16:29:17 | b2 | 0 |
-| ifs.rb:29:11:29:22 | [false] ... ? ... : ... | ifs.rb:29:21:29:22 | b3 | 1 |
-| ifs.rb:29:11:29:22 | [true] ... ? ... : ... | ifs.rb:29:16:29:17 | b2 | 0 |
-| ifs.rb:29:11:29:22 | [true] ... ? ... : ... | ifs.rb:29:21:29:22 | b3 | 1 |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | 0 |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | 1 |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:13:33:19 | [false] then ... | 0 |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:21:33:44 | [false] elsif ... | 1 |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:13:33:19 | [true] then ... | 0 |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:21:33:44 | [true] elsif ... | 1 |
-| ifs.rb:33:21:33:44 | [false] elsif ... | ifs.rb:33:30:33:36 | [false] then ... | 0 |
-| ifs.rb:33:21:33:44 | [false] elsif ... | ifs.rb:33:38:33:44 | [false] else ... | 1 |
-| ifs.rb:33:21:33:44 | [true] elsif ... | ifs.rb:33:30:33:36 | [true] then ... | 0 |
-| ifs.rb:33:21:33:44 | [true] elsif ... | ifs.rb:33:38:33:44 | [true] else ... | 1 |
-| ifs.rb:36:1:38:17 | ... unless ... | ifs.rb:1:1:58:4 | enter ifs.rb | 0 |
-| ifs.rb:36:1:38:17 | ... unless ... | ifs.rb:36:1:38:3 | conditional_method_def | 1 |
-| ifs.rb:47:3:50:5 | if ... | ifs.rb:48:5:48:15 | self | 0 |
-| ifs.rb:47:3:50:5 | if ... | ifs.rb:49:3:49:6 | else ... | 1 |
-| ifs.rb:55:3:57:5 | if ... | ifs.rb:55:6:55:15 | [false] ( ... ) | 0 |
-| ifs.rb:55:3:57:5 | if ... | ifs.rb:56:5:56:19 | self | 1 |
-| ifs.rb:55:7:55:14 | [true] ... \|\| ... | ifs.rb:54:1:58:3 | enter disjunct | 0 |
-| ifs.rb:55:7:55:14 | [true] ... \|\| ... | ifs.rb:55:13:55:14 | b2 | 1 |
-| loops.rb:2:9:2:9 | x | loops.rb:1:1:6:3 | enter m1 | 0 |
-| loops.rb:2:9:2:9 | x | loops.rb:3:5:3:10 | self | 1 |
-| loops.rb:9:3:20:5 | while ... | loops.rb:9:9:9:9 | x | 0 |
-| loops.rb:9:3:20:5 | while ... | loops.rb:13:7:13:11 | break | 1 |
-| loops.rb:9:9:9:9 | x | loops.rb:8:1:22:3 | enter m2 | 0 |
-| loops.rb:9:9:9:9 | x | loops.rb:15:7:15:10 | next | 1 |
-| loops.rb:9:9:9:9 | x | loops.rb:16:5:17:10 | elsif ... | 2 |
-| loops.rb:10:5:10:10 | self | loops.rb:9:9:9:9 | x | 0 |
-| loops.rb:10:5:10:10 | self | loops.rb:17:7:17:10 | redo | 1 |
-| loops.rb:31:9:31:9 | x | loops.rb:30:1:33:3 | enter m4 | 0 |
-| loops.rb:31:9:31:9 | x | loops.rb:31:15:32:5 | do ... | 1 |
-| raise.rb:7:1:12:3 | exit m1 | raise.rb:8:3:10:5 | if ... | 0 |
-| raise.rb:7:1:12:3 | exit m1 | raise.rb:9:5:9:17 | self | 1 |
-| raise.rb:14:1:23:3 | exit m2 | raise.rb:14:1:23:3 | exit m2 (abnormal) | 0 |
-| raise.rb:14:1:23:3 | exit m2 | raise.rb:22:3:22:15 | self | 1 |
-| raise.rb:22:3:22:15 | self | raise.rb:16:5:18:7 | if ... | 0 |
-| raise.rb:22:3:22:15 | self | raise.rb:20:5:20:18 | self | 1 |
-| raise.rb:33:3:33:15 | self | raise.rb:27:5:29:7 | if ... | 0 |
-| raise.rb:33:3:33:15 | self | raise.rb:28:7:28:22 | self | 1 |
-| raise.rb:44:3:44:15 | self | raise.rb:38:5:40:7 | if ... | 0 |
-| raise.rb:44:3:44:15 | self | raise.rb:39:7:39:22 | self | 1 |
-| raise.rb:54:3:54:15 | self | raise.rb:49:5:51:7 | if ... | 0 |
-| raise.rb:54:3:54:15 | self | raise.rb:50:7:50:22 | self | 1 |
-| raise.rb:57:1:66:3 | exit m6 | raise.rb:57:1:66:3 | exit m6 (abnormal) | 0 |
-| raise.rb:57:1:66:3 | exit m6 | raise.rb:65:3:65:15 | self | 1 |
-| raise.rb:62:36:62:36 | e | raise.rb:60:7:60:22 | self | 0 |
-| raise.rb:62:36:62:36 | e | raise.rb:62:22:62:31 | ExceptionB | 1 |
-| raise.rb:65:3:65:15 | self | raise.rb:59:5:61:7 | if ... | 0 |
-| raise.rb:65:3:65:15 | self | raise.rb:62:36:62:36 | e | 1 |
-| raise.rb:68:1:77:3 | exit m7 | raise.rb:68:1:77:3 | exit m7 (normal) | 0 |
-| raise.rb:68:1:77:3 | exit m7 | raise.rb:76:3:76:15 | [ensure: exception] self | 1 |
-| raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:72:13:72:17 | x < 0 | 0 |
-| raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:76:3:76:15 | self | 1 |
-| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:68:1:77:3 | enter m7 | 0 |
-| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:70:5:70:17 | self | 1 |
-| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:71:3:72:18 | elsif ... | 2 |
-| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:71:9:71:9 | x | 3 |
-| raise.rb:79:1:92:3 | exit m8 | raise.rb:79:1:92:3 | exit m8 (normal) | 0 |
-| raise.rb:79:1:92:3 | exit m8 | raise.rb:89:5:89:17 | [ensure: exception] self | 1 |
-| raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:85:15:85:19 | x < 0 | 0 |
-| raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:89:5:89:17 | self | 1 |
-| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:79:1:92:3 | enter m8 | 0 |
-| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:83:7:83:19 | self | 1 |
-| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:84:5:85:20 | elsif ... | 2 |
-| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:84:11:84:11 | x | 3 |
-| raise.rb:94:1:119:3 | exit m9 | raise.rb:94:1:119:3 | exit m9 (abnormal) | 1 |
-| raise.rb:94:1:119:3 | exit m9 | raise.rb:94:1:119:3 | exit m9 (normal) | 0 |
-| raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:116:3:118:5 | [ensure: exception] if ... | 0 |
-| raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:117:5:117:22 | [ensure: exception] self | 2 |
-| raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:117:5:117:22 | [ensure: return] self | 3 |
-| raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:117:5:117:22 | self | 1 |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:116:3:118:5 | [ensure: return] if ... | 1 |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:116:3:118:5 | if ... | 0 |
-| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:97:8:97:8 | x | 0 |
-| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:98:7:98:19 | self | 1 |
-| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:99:5:100:20 | elsif ... | 2 |
-| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:99:11:99:11 | x | 3 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:94:1:119:3 | enter m9 | 0 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:100:15:100:19 | x < 0 | 1 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:104:5:104:23 | [ensure: exception] self | 3 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:104:5:104:23 | self | 2 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:106:7:108:9 | [ensure: exception] if ... | 5 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:106:7:108:9 | [ensure: return] if ... | 6 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:106:7:108:9 | if ... | 4 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:107:9:107:26 | [ensure: exception] self | 8 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:107:9:107:26 | [ensure: return] self | 9 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:107:9:107:26 | self | 7 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | 11 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... | 13 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure: exception] ensure ... | 12 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | 14 |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:109:5:110:25 | ensure ... | 10 |
-| raise.rb:121:1:126:3 | exit m10 | raise.rb:121:14:121:30 | self | 0 |
-| raise.rb:121:1:126:3 | exit m10 | raise.rb:125:3:125:51 | self | 1 |
-| raise.rb:128:1:140:3 | exit m11 | raise.rb:137:5:137:17 | [ensure: exception] self | 1 |
-| raise.rb:128:1:140:3 | exit m11 | raise.rb:137:5:137:17 | self | 0 |
-| raise.rb:137:5:137:17 | self | raise.rb:130:5:132:7 | if ... | 0 |
-| raise.rb:137:5:137:17 | self | raise.rb:133:3:133:19 | rescue ... | 1 |
-| raise.rb:137:5:137:17 | self | raise.rb:135:5:135:21 | self | 2 |
-| raise.rb:142:1:148:3 | exit m12 (normal) | raise.rb:143:3:145:5 | if ... | 0 |
-| raise.rb:142:1:148:3 | exit m12 (normal) | raise.rb:144:5:144:12 | self | 1 |
-| raise.rb:155:16:155:50 | exit { ... } | raise.rb:155:25:155:32 | self | 1 |
-| raise.rb:155:16:155:50 | exit { ... } | raise.rb:155:25:155:48 | ... if ... | 0 |
-| raise.rb:160:9:162:7 | exit -> { ... } | raise.rb:161:7:161:14 | self | 1 |
-| raise.rb:160:9:162:7 | exit -> { ... } | raise.rb:161:7:161:23 | ... unless ... | 0 |
-| raise.rb:172:1:182:3 | exit m16 | raise.rb:172:1:182:3 | exit m16 (abnormal) | 1 |
-| raise.rb:172:1:182:3 | exit m16 | raise.rb:172:1:182:3 | exit m16 (normal) | 0 |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:175:14:175:14 | 1 | 0 |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:177:14:177:14 | 2 | 1 |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:180:12:180:12 | 3 | 2 |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:172:1:182:3 | enter m16 | 0 |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:174:14:174:15 | b2 | 1 |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:174:8:174:23 | [false] ... \|\| ... | 0 |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:174:8:174:23 | [true] ... \|\| ... | 1 |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:174:14:174:15 | b2 | 2 |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:2:9:2:13 | After ... < ... [false] | false |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:2:9:2:13 | After ... < ... [true] | true |
+| break_ensure.rb:2:9:2:13 | After ... < ... [true] | break_ensure.rb:3:8:3:12 | After ... > ... [false] | false |
+| break_ensure.rb:2:9:2:13 | After ... < ... [true] | break_ensure.rb:3:8:3:12 | After ... > ... [true] | true |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:8:6:8:18 | After call to nil? [false] | false |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:8:6:8:18 | After call to nil? [true] | true |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:14:9:14:13 | After ... < ... [false] | false |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:14:9:14:13 | After ... < ... [true] | true |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:16:10:16:14 | After ... > ... [false] | false |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:16:10:16:14 | After ... > ... [true] | true |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:20:10:20:15 | After call to nil? [false] | false |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:20:10:20:15 | After call to nil? [true] | true |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:29:8:29:13 | After call to nil? [false] | false |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:29:8:29:13 | After call to nil? [true] | true |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:33:11:33:15 | After ... < ... [false] | false |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:33:11:33:15 | After ... < ... [true] | true |
+| break_ensure.rb:33:11:33:15 | After ... < ... [true] | break_ensure.rb:35:12:35:16 | After ... > ... [false] | false |
+| break_ensure.rb:33:11:33:15 | After ... < ... [true] | break_ensure.rb:35:12:35:16 | After ... > ... [true] | true |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:45:9:45:13 | After ... < ... [false] | false |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:45:9:45:13 | After ... < ... [true] | true |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:47:10:47:14 | After ... > ... [false] | false |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:47:10:47:14 | After ... > ... [true] | true |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:51:10:51:14 | After ... > ... [false] | false |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:51:10:51:14 | After ... > ... [true] | true |
+| case.rb:1:1:6:3 | Entry | case.rb:3:10:3:10 | After 1 [match] | match |
+| case.rb:1:1:6:3 | Entry | case.rb:3:10:3:10 | After 1 [no-match] | no-match |
+| case.rb:3:10:3:10 | After 1 [match] | case.rb:3:21:3:22 | After call to x2 [false] | false |
+| case.rb:3:10:3:10 | After 1 [match] | case.rb:3:21:3:22 | After call to x2 [true] | true |
+| case.rb:3:10:3:10 | After 1 [no-match] | case.rb:4:10:4:10 | After 2 [match] | match |
+| case.rb:3:10:3:10 | After 1 [no-match] | case.rb:4:10:4:10 | After 2 [no-match] | no-match |
+| case.rb:8:1:18:3 | Entry | case.rb:10:8:10:8 | After 0 [match] | match |
+| case.rb:8:1:18:3 | Entry | case.rb:10:8:10:8 | After 0 [no-match] | no-match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:11:8:11:8 | After 1 [match] | match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:11:8:11:8 | After 1 [no-match] | no-match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:12:8:12:8 | After 2 [match] | match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:12:8:12:8 | After 2 [no-match] | no-match |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:14:8:14:8 | After x [match] | match |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:14:8:14:8 | After x [no-match] | no-match |
+| case.rb:14:8:14:8 | After x [match] | case.rb:14:13:14:18 | After ... == ... [false] | false |
+| case.rb:14:8:14:8 | After x [match] | case.rb:14:13:14:18 | After ... == ... [true] | true |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:15:8:15:8 | After x [match] | match |
+| case.rb:15:5:15:28 | in ... then ... | case.rb:15:8:15:8 | After x [no-match] | no-match |
+| case.rb:15:8:15:8 | After x [match] | case.rb:15:17:15:21 | After ... < ... [false] | false |
+| case.rb:15:8:15:8 | After x [match] | case.rb:15:17:15:21 | After ... < ... [true] | true |
+| case.rb:20:1:24:3 | Entry | case.rb:22:8:22:8 | After 1 [match] | match |
+| case.rb:20:1:24:3 | Entry | case.rb:22:8:22:8 | After 1 [no-match] | no-match |
+| case.rb:26:1:30:3 | Entry | case.rb:28:7:28:28 | After -> { ... } [match] | match |
+| case.rb:26:1:30:3 | Entry | case.rb:28:7:28:28 | After -> { ... } [no-match] | no-match |
+| case.rb:32:1:39:3 | Entry | case.rb:34:8:34:9 | After [ ..., * ] [match] | match |
+| case.rb:32:1:39:3 | Entry | case.rb:34:8:34:9 | After [ ..., * ] [no-match] | no-match |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:35:8:35:10 | After [ ..., * ] [match] | match |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:35:8:35:10 | After [ ..., * ] [no-match] | no-match |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:36:8:36:12 | After [ ..., * ] [match] | match |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:36:8:36:12 | After [ ..., * ] [no-match] | no-match |
+| case.rb:36:8:36:12 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [match] | match |
+| case.rb:36:8:36:12 | After [ ..., * ] [no-match] | case.rb:37:8:37:26 | After [ ..., * ] [no-match] | no-match |
+| case.rb:41:1:45:3 | Entry | case.rb:43:8:43:21 | After [ *,...,* ] [match] | match |
+| case.rb:41:1:45:3 | Entry | case.rb:43:8:43:21 | After [ *,...,* ] [no-match] | no-match |
+| case.rb:47:1:53:3 | Entry | case.rb:49:8:49:34 | After { ..., ** } [match] | match |
+| case.rb:47:1:53:3 | Entry | case.rb:49:8:49:34 | After { ..., ** } [no-match] | no-match |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:50:8:50:24 | After { ..., ** } [match] | match |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:50:8:50:24 | After { ..., ** } [no-match] | no-match |
+| case.rb:50:8:50:24 | After { ..., ** } [no-match] | case.rb:51:8:51:16 | After { ..., ** } [match] | match |
+| case.rb:50:8:50:24 | After { ..., ** } [no-match] | case.rb:51:8:51:16 | After { ..., ** } [no-match] | no-match |
+| case.rb:55:1:61:3 | Entry | case.rb:57:8:57:8 | After 5 [match] | match |
+| case.rb:55:1:61:3 | Entry | case.rb:57:8:57:8 | After 5 [no-match] | no-match |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:58:8:58:10 | After var [match] | match |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:58:8:58:10 | After var [no-match] | no-match |
+| case.rb:58:8:58:10 | After var [no-match] | case.rb:59:8:59:20 | After "unreachable" [match] | match |
+| case.rb:58:8:58:10 | After var [no-match] | case.rb:59:8:59:20 | After "unreachable" [no-match] | no-match |
+| case.rb:63:1:67:3 | Entry | case.rb:65:8:65:28 | After ... \| ... [match] | match |
+| case.rb:63:1:67:3 | Entry | case.rb:65:8:65:28 | After ... \| ... [no-match] | no-match |
+| case.rb:69:1:93:3 | Entry | case.rb:73:8:73:8 | After 5 [match] | match |
+| case.rb:69:1:93:3 | Entry | case.rb:73:8:73:8 | After 5 [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:74:8:74:11 | After ^... [match] | match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:74:8:74:11 | After ^... [no-match] | no-match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:75:8:75:15 | After "string" [match] | match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:75:8:75:15 | After "string" [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:76:8:76:18 | After call to [] [match] | match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:76:8:76:18 | After call to [] [no-match] | no-match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:77:8:77:18 | After call to [] [match] | match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:77:8:77:18 | After call to [] [no-match] | no-match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] | match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:79:8:79:14 | After _ .. _ [match] | match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:79:8:79:14 | After _ .. _ [no-match] | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:80:8:80:12 | After _ .. _ [match] | match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:80:8:80:12 | After _ .. _ [no-match] | no-match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:81:8:81:11 | After _ .. _ [match] | match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:81:8:81:11 | After _ .. _ [no-match] | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [match] | match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:82:8:82:13 | After ... => ... [no-match] | no-match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:83:8:83:26 | After ... \| ... [match] | match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:83:8:83:26 | After ... \| ... [no-match] | no-match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:84:8:84:17 | After Bar [match] | match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:85:8:85:23 | After -> { ... } [match] | match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:86:8:86:11 | After :foo [match] | match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:87:8:87:17 | After :"foo bar" [match] | match |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:88:8:88:15 | After ... \| ... [match] | match |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [match] | match |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [match] | match |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:90:8:90:13 | After ( ... ) [no-match] | case.rb:91:8:91:25 | After ( ... ) [match] | match |
+| case.rb:90:8:90:13 | After ( ... ) [no-match] | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:95:1:99:3 | Entry | case.rb:97:8:97:8 | After x [match] | match |
+| case.rb:95:1:99:3 | Entry | case.rb:97:8:97:8 | After x [no-match] | no-match |
+| case.rb:97:8:97:8 | After x [match] | case.rb:97:13:97:18 | After ... == ... [false] | false |
+| case.rb:97:8:97:8 | After x [match] | case.rb:97:13:97:18 | After ... == ... [true] | true |
+| cfg.html.erb:5:16:31:12 | Entry | cfg.html.erb:18:17:18:22 | After call to admin? [false] | false |
+| cfg.html.erb:5:16:31:12 | Entry | cfg.html.erb:18:17:18:22 | After call to admin? [true] | true |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:42:8:42:8 | After 1 [match] | match |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:42:8:42:8 | After 1 [no-match] | no-match |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:48:8:48:13 | After ... == ... [match] | match |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] | no-match |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:8:43:8 | After 2 [match] | match |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:43:8:43:8 | After 2 [no-match] | no-match |
+| cfg.rb:43:8:43:8 | After 2 [match] | cfg.rb:43:3:43:31 | After when ... [match] | match |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:43:11:43:11 | After 3 [match] | match |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:43:11:43:11 | After 3 [no-match] | no-match |
+| cfg.rb:43:11:43:11 | After 3 [match] | cfg.rb:43:3:43:31 | After when ... [match] | match |
+| cfg.rb:43:11:43:11 | After 3 [no-match] | cfg.rb:43:14:43:14 | After 4 [match] | match |
+| cfg.rb:43:11:43:11 | After 3 [no-match] | cfg.rb:43:14:43:14 | After 4 [no-match] | no-match |
+| cfg.rb:43:14:43:14 | After 4 [match] | cfg.rb:43:3:43:31 | After when ... [match] | match |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:60:17:60:22 | After ... < ... [false] | false |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:60:17:60:22 | After ... < ... [true] | true |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:49:8:49:13 | After ... == ... [match] | match |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:49:8:49:13 | After ... == ... [no-match] | no-match |
+| cfg.rb:49:8:49:13 | After ... == ... [match] | cfg.rb:49:3:49:37 | After when ... [match] | match |
+| cfg.rb:49:8:49:13 | After ... == ... [no-match] | cfg.rb:49:16:49:20 | After ... > ... [match] | match |
+| cfg.rb:49:8:49:13 | After ... == ... [no-match] | cfg.rb:49:16:49:20 | After ... > ... [no-match] | no-match |
+| cfg.rb:49:16:49:20 | After ... > ... [match] | cfg.rb:49:3:49:37 | After when ... [match] | match |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:75:4:75:8 | After ... < ... [false] | false |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:75:4:75:8 | After ... < ... [true] | true |
+| cfg.rb:75:4:75:8 | After ... < ... [false] | cfg.rb:75:23:75:28 | After ... > ... [false] | false |
+| cfg.rb:75:4:75:8 | After ... < ... [false] | cfg.rb:75:23:75:28 | After ... > ... [true] | true |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:90:5:90:5 | After defined? ... [false] | false |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:90:5:90:5 | After defined? ... [true] | true |
+| cfg.rb:90:1:93:3 | Entry | cfg.rb:91:6:91:10 | After ... > ... [false] | false |
+| cfg.rb:90:1:93:3 | Entry | cfg.rb:91:6:91:10 | After ... > ... [true] | true |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:113:14:113:19 | After ... > ... [false] | false |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:113:14:113:19 | After ... > ... [true] | true |
+| cfg.rb:101:1:104:3 | Entry | cfg.rb:101:16:101:20 | After value [match] | match |
+| cfg.rb:101:1:104:3 | Entry | cfg.rb:101:16:101:20 | After value [no-match] | no-match |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:172:8:172:14 | After ... == ... [false] | false |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:172:8:172:14 | After ... == ... [true] | true |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:174:18:174:23 | After ... == ... [false] | false |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:174:18:174:23 | After ... == ... [true] | true |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:176:7:176:12 | After ... > ... [false] | false |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:176:7:176:12 | After ... > ... [true] | true |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:179:30:179:36 | After ... == ... [false] | false |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:179:30:179:36 | After ... == ... [true] | true |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:182:7:182:12 | After ... < ... [false] | false |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:182:7:182:12 | After ... < ... [true] | true |
+| cfg.rb:182:14:186:3 | do ... | cfg.rb:184:6:184:11 | After ... == ... [false] | false |
+| cfg.rb:182:14:186:3 | do ... | cfg.rb:184:6:184:11 | After ... == ... [true] | true |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:188:30:188:35 | After ... != ... [false] | false |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:188:30:188:35 | After ... != ... [true] | true |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:205:4:205:5 | After call to == [false] | false |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:205:4:205:5 | After call to == [true] | true |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [false] | false |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [true] | true |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [false] | false |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [true] | true |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [false] | false |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [true] | true |
+| exit.rb:1:1:6:3 | Entry | exit.rb:2:6:2:10 | After ... > ... [false] | false |
+| exit.rb:1:1:6:3 | Entry | exit.rb:2:6:2:10 | After ... > ... [true] | true |
+| exit.rb:8:1:13:3 | Entry | exit.rb:9:6:9:10 | After ... > ... [false] | false |
+| exit.rb:8:1:13:3 | Entry | exit.rb:9:6:9:10 | After ... > ... [true] | true |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:2:6:2:10 | After ... > ... [false] | false |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:2:6:2:10 | After ... > ... [true] | true |
+| ifs.rb:1:1:58:4 | Entry | ifs.rb:38:12:38:17 | After ... == ... [false] | false |
+| ifs.rb:1:1:58:4 | Entry | ifs.rb:38:12:38:17 | After ... == ... [true] | true |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:9:4:14 | After ... <= ... [false] | false |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:9:4:14 | After ... <= ... [true] | true |
+| ifs.rb:4:9:4:14 | After ... <= ... [false] | ifs.rb:4:9:4:24 | After ... and ... [false] | false |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:4:20:4:24 | After ... > ... [false] | false |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:4:20:4:24 | After ... > ... [true] | true |
+| ifs.rb:4:9:4:24 | After ... and ... [false] | ifs.rb:4:9:4:38 | After ... and ... [false] | false |
+| ifs.rb:4:20:4:24 | After ... > ... [false] | ifs.rb:4:9:4:24 | After ... and ... [false] | false |
+| ifs.rb:4:20:4:24 | After ... > ... [true] | ifs.rb:4:32:4:37 | After ... == ... [false] | false |
+| ifs.rb:4:20:4:24 | After ... > ... [true] | ifs.rb:4:32:4:37 | After ... == ... [true] | true |
+| ifs.rb:4:32:4:37 | After ... == ... [true] | ifs.rb:4:9:4:38 | After ... and ... [false] | false |
+| ifs.rb:11:1:16:3 | Entry | ifs.rb:12:6:12:6 | After b [false] | false |
+| ifs.rb:11:1:16:3 | Entry | ifs.rb:12:6:12:6 | After b [true] | true |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:19:6:19:10 | After ... < ... [false] | false |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:19:6:19:10 | After ... < ... [true] | true |
+| ifs.rb:19:6:19:10 | After ... < ... [true] | ifs.rb:21:8:21:13 | After ... > ... [false] | false |
+| ifs.rb:19:6:19:10 | After ... < ... [true] | ifs.rb:21:8:21:13 | After ... > ... [true] | true |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:11:29:12 | After b1 [false] | false |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:29:11:29:12 | After b1 [true] | true |
+| ifs.rb:29:11:29:12 | After b1 [false] | ifs.rb:29:21:29:22 | After b3 [false] | false |
+| ifs.rb:29:11:29:12 | After b1 [false] | ifs.rb:29:21:29:22 | After b3 [true] | true |
+| ifs.rb:29:11:29:12 | After b1 [true] | ifs.rb:29:16:29:17 | After b2 [false] | false |
+| ifs.rb:29:11:29:12 | After b1 [true] | ifs.rb:29:16:29:17 | After b2 [true] | true |
+| ifs.rb:29:16:29:17 | After b2 [false] | ifs.rb:29:11:29:22 | After ... ? ... : ... [false] | false |
+| ifs.rb:29:16:29:17 | After b2 [true] | ifs.rb:29:11:29:22 | After ... ? ... : ... [true] | true |
+| ifs.rb:29:21:29:22 | After b3 [false] | ifs.rb:29:11:29:22 | After ... ? ... : ... [false] | false |
+| ifs.rb:29:21:29:22 | After b3 [true] | ifs.rb:29:11:29:22 | After ... ? ... : ... [true] | true |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:10:33:11 | After b1 [false] | false |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:33:10:33:11 | After b1 [true] | true |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:27:33:28 | After b3 [false] | false |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:27:33:28 | After b3 [true] | true |
+| ifs.rb:33:10:33:11 | After b1 [true] | ifs.rb:33:18:33:19 | After b2 [false] | false |
+| ifs.rb:33:10:33:11 | After b1 [true] | ifs.rb:33:18:33:19 | After b2 [true] | true |
+| ifs.rb:33:18:33:19 | After b2 [false] | ifs.rb:33:7:33:48 | After if ... [false] | false |
+| ifs.rb:33:18:33:19 | After b2 [true] | ifs.rb:33:7:33:48 | After if ... [true] | true |
+| ifs.rb:33:21:33:44 | After elsif ... [false] | ifs.rb:33:7:33:48 | After if ... [false] | false |
+| ifs.rb:33:21:33:44 | After elsif ... [true] | ifs.rb:33:7:33:48 | After if ... [true] | true |
+| ifs.rb:33:27:33:28 | After b3 [false] | ifs.rb:33:43:33:44 | After b5 [false] | false |
+| ifs.rb:33:27:33:28 | After b3 [false] | ifs.rb:33:43:33:44 | After b5 [true] | true |
+| ifs.rb:33:27:33:28 | After b3 [true] | ifs.rb:33:35:33:36 | After b4 [false] | false |
+| ifs.rb:33:27:33:28 | After b3 [true] | ifs.rb:33:35:33:36 | After b4 [true] | true |
+| ifs.rb:33:35:33:36 | After b4 [false] | ifs.rb:33:21:33:44 | After elsif ... [false] | false |
+| ifs.rb:33:35:33:36 | After b4 [true] | ifs.rb:33:21:33:44 | After elsif ... [true] | true |
+| ifs.rb:33:43:33:44 | After b5 [false] | ifs.rb:33:21:33:44 | After elsif ... [false] | false |
+| ifs.rb:33:43:33:44 | After b5 [true] | ifs.rb:33:21:33:44 | After elsif ... [true] | true |
+| ifs.rb:46:1:52:3 | Entry | ifs.rb:47:6:47:6 | After b [false] | false |
+| ifs.rb:46:1:52:3 | Entry | ifs.rb:47:6:47:6 | After b [true] | true |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:55:7:55:8 | After b1 [false] | false |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:55:7:55:8 | After b1 [true] | true |
+| ifs.rb:55:7:55:8 | After b1 [false] | ifs.rb:55:13:55:14 | After b2 [false] | false |
+| ifs.rb:55:7:55:8 | After b1 [false] | ifs.rb:55:13:55:14 | After b2 [true] | true |
+| ifs.rb:55:7:55:8 | After b1 [true] | ifs.rb:55:7:55:14 | After ... \|\| ... [true] | true |
+| ifs.rb:55:13:55:14 | After b2 [true] | ifs.rb:55:7:55:14 | After ... \|\| ... [true] | true |
+| loops.rb:2:3:5:5 | [LoopHeader] while ... | loops.rb:2:9:2:14 | After ... >= ... [false] | false |
+| loops.rb:2:3:5:5 | [LoopHeader] while ... | loops.rb:2:9:2:14 | After ... >= ... [true] | true |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:9:9:9:14 | After ... >= ... [false] | false |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:9:9:9:14 | After ... >= ... [true] | true |
+| loops.rb:9:15:20:5 | do ... | loops.rb:12:8:12:14 | After ... > ... [false] | false |
+| loops.rb:9:15:20:5 | do ... | loops.rb:12:8:12:14 | After ... > ... [true] | true |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:14:11:14:16 | After ... > ... [false] | false |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:14:11:14:16 | After ... > ... [true] | true |
+| loops.rb:14:11:14:16 | After ... > ... [false] | loops.rb:16:11:16:16 | After ... > ... [false] | false |
+| loops.rb:14:11:14:16 | After ... > ... [false] | loops.rb:16:11:16:16 | After ... > ... [true] | true |
+| loops.rb:31:3:32:5 | [LoopHeader] while ... | loops.rb:31:9:31:13 | After ... < ... [false] | false |
+| loops.rb:31:3:32:5 | [LoopHeader] while ... | loops.rb:31:9:31:13 | After ... < ... [true] | true |
+| raise.rb:7:1:12:3 | Entry | raise.rb:8:6:8:10 | After ... > ... [false] | false |
+| raise.rb:7:1:12:3 | Entry | raise.rb:8:6:8:10 | After ... > ... [true] | true |
+| raise.rb:14:1:23:3 | Entry | raise.rb:16:8:16:8 | After b [false] | false |
+| raise.rb:14:1:23:3 | Entry | raise.rb:16:8:16:8 | After b [true] | true |
+| raise.rb:16:8:16:8 | After b [true] | raise.rb:19:10:19:19 | After ExceptionA [match] | match |
+| raise.rb:16:8:16:8 | After b [true] | raise.rb:19:10:19:19 | After ExceptionA [no-match] | no-match |
+| raise.rb:25:1:34:3 | Entry | raise.rb:27:8:27:8 | After b [false] | false |
+| raise.rb:25:1:34:3 | Entry | raise.rb:27:8:27:8 | After b [true] | true |
+| raise.rb:36:1:45:3 | Entry | raise.rb:38:8:38:8 | After b [false] | false |
+| raise.rb:36:1:45:3 | Entry | raise.rb:38:8:38:8 | After b [true] | true |
+| raise.rb:47:1:55:3 | Entry | raise.rb:49:8:49:8 | After b [false] | false |
+| raise.rb:47:1:55:3 | Entry | raise.rb:49:8:49:8 | After b [true] | true |
+| raise.rb:57:1:66:3 | Entry | raise.rb:59:8:59:8 | After b [false] | false |
+| raise.rb:57:1:66:3 | Entry | raise.rb:59:8:59:8 | After b [true] | true |
+| raise.rb:59:8:59:8 | After b [true] | raise.rb:62:10:62:31 | After ..., ... [match] | match |
+| raise.rb:59:8:59:8 | After b [true] | raise.rb:62:10:62:31 | After ..., ... [no-match] | no-match |
+| raise.rb:68:1:77:3 | Entry | raise.rb:69:6:69:10 | After ... > ... [false] | false |
+| raise.rb:68:1:77:3 | Entry | raise.rb:69:6:69:10 | After ... > ... [true] | true |
+| raise.rb:69:6:69:10 | After ... > ... [false] | raise.rb:71:9:71:13 | After ... < ... [false] | false |
+| raise.rb:69:6:69:10 | After ... > ... [false] | raise.rb:71:9:71:13 | After ... < ... [true] | true |
+| raise.rb:79:1:92:3 | Entry | raise.rb:82:8:82:12 | After ... > ... [false] | false |
+| raise.rb:79:1:92:3 | Entry | raise.rb:82:8:82:12 | After ... > ... [true] | true |
+| raise.rb:82:8:82:12 | After ... > ... [false] | raise.rb:84:11:84:15 | After ... < ... [false] | false |
+| raise.rb:82:8:82:12 | After ... > ... [false] | raise.rb:84:11:84:15 | After ... < ... [true] | true |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:97:8:97:12 | After ... > ... [false] | false |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:97:8:97:12 | After ... > ... [true] | true |
+| raise.rb:97:8:97:12 | After ... > ... [false] | raise.rb:99:11:99:15 | After ... < ... [false] | false |
+| raise.rb:97:8:97:12 | After ... > ... [false] | raise.rb:99:11:99:15 | After ... < ... [true] | true |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:106:10:106:11 | After b1 [false] | false |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:106:10:106:11 | After b1 [true] | true |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:116:6:116:7 | After b2 [false] | false |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:116:6:116:7 | After b2 [true] | true |
+| raise.rb:121:1:126:3 | Entry | raise.rb:121:9:121:9 | After p [match] | match |
+| raise.rb:121:1:126:3 | Entry | raise.rb:121:9:121:9 | After p [no-match] | no-match |
+| raise.rb:128:1:140:3 | Entry | raise.rb:130:8:130:8 | After b [false] | false |
+| raise.rb:128:1:140:3 | Entry | raise.rb:130:8:130:8 | After b [true] | true |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:133:10:133:19 | After ExceptionA [match] | match |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:133:10:133:19 | After ExceptionA [no-match] | no-match |
+| raise.rb:133:10:133:19 | After ExceptionA [no-match] | raise.rb:134:10:134:19 | After ExceptionB [match] | match |
+| raise.rb:133:10:133:19 | After ExceptionA [no-match] | raise.rb:134:10:134:19 | After ExceptionB [no-match] | no-match |
+| raise.rb:142:1:148:3 | Entry | raise.rb:143:6:143:6 | After b [false] | false |
+| raise.rb:142:1:148:3 | Entry | raise.rb:143:6:143:6 | After b [true] | true |
+| raise.rb:155:16:155:50 | Entry | raise.rb:155:37:155:48 | After call to nil? [false] | false |
+| raise.rb:155:16:155:50 | Entry | raise.rb:155:37:155:48 | After call to nil? [true] | true |
+| raise.rb:160:9:162:7 | Entry | raise.rb:161:23:161:23 | After x [false] | false |
+| raise.rb:160:9:162:7 | Entry | raise.rb:161:23:161:23 | After x [true] | true |
+| raise.rb:172:1:182:3 | Entry | raise.rb:174:8:174:9 | After b1 [false] | false |
+| raise.rb:172:1:182:3 | Entry | raise.rb:174:8:174:9 | After b1 [true] | true |
+| raise.rb:174:8:174:9 | After b1 [false] | raise.rb:174:14:174:23 | After ... == ... [false] | false |
+| raise.rb:174:8:174:9 | After b1 [false] | raise.rb:174:14:174:23 | After ... == ... [true] | true |
+| raise.rb:174:8:174:9 | After b1 [true] | raise.rb:174:8:174:23 | After ... \|\| ... [true] | true |
+| raise.rb:174:14:174:23 | After ... == ... [true] | raise.rb:174:8:174:23 | After ... \|\| ... [true] | true |
+| raise.rb:179:3:180:12 | rescue ... | raise.rb:179:10:179:19 | After ExceptionA [match] | match |
+| raise.rb:179:3:180:12 | rescue ... | raise.rb:179:10:179:19 | After ExceptionA [no-match] | no-match |
diff --git a/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.ql b/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.ql
index c99de9bc0a86..de648d227e72 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.ql
+++ b/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.ql
@@ -1,5 +1,4 @@
 import codeql.ruby.controlflow.ControlFlowGraph
-import codeql.ruby.controlflow.BasicBlocks
 
 query predicate dominates(BasicBlock bb1, BasicBlock bb2) { bb1.dominates(bb2) }
 
@@ -9,14 +8,10 @@ query predicate immediateDominator(BasicBlock bb1, BasicBlock bb2) {
   bb1.getImmediateDominator() = bb2
 }
 
-query predicate controls(ConditionBlock bb1, BasicBlock bb2, ConditionalSuccessor t) {
+query predicate controls(BasicBlock bb1, BasicBlock bb2, ConditionalSuccessor t) {
   bb1.edgeDominates(bb2, t)
 }
 
-query predicate successor(ConditionBlock bb1, BasicBlock bb2, SuccessorType t) {
+query predicate successor(BasicBlock bb1, BasicBlock bb2, ConditionalSuccessor t) {
   bb1.getASuccessor(t) = bb2
 }
-
-query predicate joinBlockPredecessor(JoinBlock bb1, BasicBlock bb2, int i) {
-  bb1.getJoinBlockPredecessor(i) = bb2
-}
diff --git a/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected b/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
index e7ce708b63bf..a4fb2ef860f6 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
+++ b/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -1,2392 +1,4018 @@
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:1:8:1:8 | x |  |
-| break_ensure.rb:1:1:11:3 | exit m1 (abnormal) | break_ensure.rb:1:1:11:3 | exit m1 |  |
-| break_ensure.rb:1:1:11:3 | exit m1 (normal) | break_ensure.rb:1:1:11:3 | exit m1 |  |
+| break_ensure.rb:1:1:11:3 | Entry | break_ensure.rb:1:8:1:8 | x |  |
+| break_ensure.rb:1:1:11:3 | Exceptional Exit | break_ensure.rb:1:1:11:3 | Exit |  |
+| break_ensure.rb:1:1:11:3 | Normal Exit | break_ensure.rb:1:1:11:3 | Exit |  |
 | break_ensure.rb:1:1:11:3 | m1 | break_ensure.rb:13:1:25:3 | m2 |  |
-| break_ensure.rb:1:1:56:4 | enter break_ensure.rb | break_ensure.rb:1:1:11:3 | m1 |  |
-| break_ensure.rb:1:1:56:4 | exit break_ensure.rb (normal) | break_ensure.rb:1:1:56:4 | exit break_ensure.rb |  |
-| break_ensure.rb:1:8:1:8 | x | break_ensure.rb:2:9:2:9 | x |  |
-| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:8:6:8:13 | self |  |
+| break_ensure.rb:1:1:56:4 | Entry | break_ensure.rb:1:1:11:3 | m1 |  |
+| break_ensure.rb:1:1:56:4 | Normal Exit | break_ensure.rb:1:1:56:4 | Exit |  |
+| break_ensure.rb:1:8:1:8 | x | break_ensure.rb:2:3:10:5 | ... |  |
+| break_ensure.rb:2:3:6:5 | After while ... | break_ensure.rb:7:1:10:5 | ensure ... |  |
+| break_ensure.rb:2:3:6:5 | [LoopHeader] while ... | break_ensure.rb:2:9:2:13 | Before ... < ... |  |
+| break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:2:3:6:5 | [LoopHeader] while ... |  |
+| break_ensure.rb:2:3:10:5 | ... | break_ensure.rb:2:3:6:5 | while ... |  |
+| break_ensure.rb:2:3:10:5 | After ... | break_ensure.rb:1:1:11:3 | Normal Exit |  |
 | break_ensure.rb:2:9:2:9 | x | break_ensure.rb:2:13:2:13 | 0 |  |
-| break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:2:3:6:5 | while ... | false |
-| break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:3:8:3:8 | x | true |
-| break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:8:6:8:13 | [ensure: exception] self | exception |
+| break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:2:9:2:13 | After ... < ... [false] | false |
+| break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:2:9:2:13 | After ... < ... [true] | true |
+| break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:7:1:10:5 | ensure ... | exception |
+| break_ensure.rb:2:9:2:13 | After ... < ... [false] | break_ensure.rb:2:3:6:5 | After while ... |  |
+| break_ensure.rb:2:9:2:13 | After ... < ... [true] | break_ensure.rb:2:14:6:5 | do ... |  |
+| break_ensure.rb:2:9:2:13 | Before ... < ... | break_ensure.rb:2:9:2:9 | x |  |
 | break_ensure.rb:2:13:2:13 | 0 | break_ensure.rb:2:9:2:13 | ... < ... |  |
-| break_ensure.rb:2:14:6:5 | do ... | break_ensure.rb:2:9:2:9 | x |  |
-| break_ensure.rb:3:5:5:7 | if ... | break_ensure.rb:2:14:6:5 | do ... |  |
+| break_ensure.rb:2:14:6:5 | After do ... | break_ensure.rb:2:3:6:5 | [LoopHeader] while ... |  |
+| break_ensure.rb:2:14:6:5 | do ... | break_ensure.rb:3:5:5:7 | if ... |  |
+| break_ensure.rb:3:5:5:7 | After if ... | break_ensure.rb:2:14:6:5 | After do ... |  |
+| break_ensure.rb:3:5:5:7 | if ... | break_ensure.rb:3:8:3:12 | Before ... > ... |  |
 | break_ensure.rb:3:8:3:8 | x | break_ensure.rb:3:12:3:12 | 0 |  |
-| break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:2:3:6:5 | while ... | exception |
-| break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:3:5:5:7 | if ... | false |
-| break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:4:7:4:11 | break | true |
+| break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:3:8:3:12 | After ... > ... [false] | false |
+| break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:3:8:3:12 | After ... > ... [true] | true |
+| break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:7:1:10:5 | ensure ... | exception |
+| break_ensure.rb:3:8:3:12 | After ... > ... [false] | break_ensure.rb:3:5:5:7 | After if ... |  |
+| break_ensure.rb:3:8:3:12 | After ... > ... [true] | break_ensure.rb:3:14:4:11 | then ... |  |
+| break_ensure.rb:3:8:3:12 | Before ... > ... | break_ensure.rb:3:8:3:8 | x |  |
 | break_ensure.rb:3:12:3:12 | 0 | break_ensure.rb:3:8:3:12 | ... > ... |  |
-| break_ensure.rb:4:7:4:11 | break | break_ensure.rb:2:3:6:5 | while ... | break |
-| break_ensure.rb:7:1:10:5 | [ensure: exception] ensure ... | break_ensure.rb:1:1:11:3 | exit m1 (abnormal) | exception |
-| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:1:1:11:3 | exit m1 (normal) |  |
-| break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | break_ensure.rb:7:1:10:5 | [ensure: exception] ensure ... |  |
-| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:7:1:10:5 | ensure ... |  |
-| break_ensure.rb:8:6:8:13 | [ensure: exception] call to elements | break_ensure.rb:8:6:8:18 | [ensure: exception] call to nil? |  |
-| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:8:6:8:13 | [ensure: exception] call to elements |  |
-| break_ensure.rb:8:6:8:13 | call to elements | break_ensure.rb:8:6:8:18 | call to nil? |  |
+| break_ensure.rb:3:14:4:11 | then ... | break_ensure.rb:4:7:4:11 | Before break |  |
+| break_ensure.rb:4:7:4:11 | Before break | break_ensure.rb:4:7:4:11 | break |  |
+| break_ensure.rb:4:7:4:11 | break | break_ensure.rb:2:3:6:5 | After while ... | break |
+| break_ensure.rb:7:1:10:5 | After ensure ... | break_ensure.rb:1:1:11:3 | Exceptional Exit | exception |
+| break_ensure.rb:7:1:10:5 | After ensure ... | break_ensure.rb:2:3:10:5 | After ... |  |
+| break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:8:3:10:5 | if ... |  |
+| break_ensure.rb:8:3:10:5 | After if ... | break_ensure.rb:7:1:10:5 | After ensure ... |  |
+| break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:8:6:8:18 | Before call to nil? |  |
+| break_ensure.rb:8:6:8:13 | After call to elements | break_ensure.rb:8:6:8:18 | call to nil? |  |
+| break_ensure.rb:8:6:8:13 | Before call to elements | break_ensure.rb:8:6:8:13 | self |  |
+| break_ensure.rb:8:6:8:13 | call to elements | break_ensure.rb:8:6:8:13 | After call to elements |  |
 | break_ensure.rb:8:6:8:13 | self | break_ensure.rb:8:6:8:13 | call to elements |  |
-| break_ensure.rb:8:6:8:18 | [ensure: exception] call to nil? | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | false |
-| break_ensure.rb:8:6:8:18 | [ensure: exception] call to nil? | break_ensure.rb:9:5:9:23 | [ensure: exception] self | true |
-| break_ensure.rb:8:6:8:18 | call to nil? | break_ensure.rb:8:3:10:5 | if ... | false |
-| break_ensure.rb:8:6:8:18 | call to nil? | break_ensure.rb:9:5:9:23 | self | true |
-| break_ensure.rb:8:20:9:23 | [ensure: exception] then ... | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... |  |
-| break_ensure.rb:8:20:9:23 | then ... | break_ensure.rb:8:3:10:5 | if ... |  |
-| break_ensure.rb:9:5:9:23 | [ensure: exception] call to puts | break_ensure.rb:8:20:9:23 | [ensure: exception] then ... |  |
-| break_ensure.rb:9:5:9:23 | [ensure: exception] self | break_ensure.rb:9:11:9:22 | [ensure: exception] elements nil |  |
-| break_ensure.rb:9:5:9:23 | call to puts | break_ensure.rb:8:20:9:23 | then ... |  |
-| break_ensure.rb:9:5:9:23 | self | break_ensure.rb:9:11:9:22 | elements nil |  |
-| break_ensure.rb:9:10:9:23 | "elements nil" | break_ensure.rb:9:5:9:23 | call to puts |  |
-| break_ensure.rb:9:10:9:23 | [ensure: exception] "elements nil" | break_ensure.rb:9:5:9:23 | [ensure: exception] call to puts |  |
-| break_ensure.rb:9:11:9:22 | [ensure: exception] elements nil | break_ensure.rb:9:10:9:23 | [ensure: exception] "elements nil" |  |
+| break_ensure.rb:8:6:8:18 | After call to nil? [false] | break_ensure.rb:8:3:10:5 | After if ... |  |
+| break_ensure.rb:8:6:8:18 | After call to nil? [true] | break_ensure.rb:8:20:9:23 | then ... |  |
+| break_ensure.rb:8:6:8:18 | Before call to nil? | break_ensure.rb:8:6:8:13 | Before call to elements |  |
+| break_ensure.rb:8:6:8:18 | call to nil? | break_ensure.rb:8:6:8:18 | After call to nil? [false] | false |
+| break_ensure.rb:8:6:8:18 | call to nil? | break_ensure.rb:8:6:8:18 | After call to nil? [true] | true |
+| break_ensure.rb:8:20:9:23 | After then ... | break_ensure.rb:8:3:10:5 | After if ... |  |
+| break_ensure.rb:8:20:9:23 | then ... | break_ensure.rb:9:5:9:23 | Before call to puts |  |
+| break_ensure.rb:9:5:9:23 | After call to puts | break_ensure.rb:8:20:9:23 | After then ... |  |
+| break_ensure.rb:9:5:9:23 | Before call to puts | break_ensure.rb:9:5:9:23 | self |  |
+| break_ensure.rb:9:5:9:23 | call to puts | break_ensure.rb:9:5:9:23 | After call to puts |  |
+| break_ensure.rb:9:5:9:23 | self | break_ensure.rb:9:10:9:23 | Before "elements nil" |  |
+| break_ensure.rb:9:10:9:23 | "elements nil" | break_ensure.rb:9:10:9:23 | After "elements nil" |  |
+| break_ensure.rb:9:10:9:23 | After "elements nil" | break_ensure.rb:9:5:9:23 | call to puts |  |
+| break_ensure.rb:9:10:9:23 | Before "elements nil" | break_ensure.rb:9:11:9:22 | elements nil |  |
 | break_ensure.rb:9:11:9:22 | elements nil | break_ensure.rb:9:10:9:23 | "elements nil" |  |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:13:8:13:8 | x |  |
-| break_ensure.rb:13:1:25:3 | exit m2 (normal) | break_ensure.rb:13:1:25:3 | exit m2 |  |
+| break_ensure.rb:13:1:25:3 | Entry | break_ensure.rb:13:8:13:8 | x |  |
+| break_ensure.rb:13:1:25:3 | Exceptional Exit | break_ensure.rb:13:1:25:3 | Exit |  |
+| break_ensure.rb:13:1:25:3 | Normal Exit | break_ensure.rb:13:1:25:3 | Exit |  |
 | break_ensure.rb:13:1:25:3 | m2 | break_ensure.rb:27:1:42:3 | m3 |  |
 | break_ensure.rb:13:8:13:8 | x | break_ensure.rb:13:11:13:11 | y |  |
-| break_ensure.rb:13:11:13:11 | y | break_ensure.rb:14:9:14:9 | x |  |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:13:1:25:3 | exit m2 (normal) |  |
+| break_ensure.rb:13:11:13:11 | y | break_ensure.rb:14:3:24:5 | ... |  |
+| break_ensure.rb:14:3:24:5 | ... | break_ensure.rb:14:3:24:5 | while ... |  |
+| break_ensure.rb:14:3:24:5 | After ... | break_ensure.rb:13:1:25:3 | Normal Exit |  |
+| break_ensure.rb:14:3:24:5 | After while ... | break_ensure.rb:14:3:24:5 | After ... |  |
+| break_ensure.rb:14:3:24:5 | [LoopHeader] while ... | break_ensure.rb:14:9:14:13 | Before ... < ... |  |
+| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:14:3:24:5 | [LoopHeader] while ... |  |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:14:13:14:13 | 0 |  |
-| break_ensure.rb:14:9:14:13 | ... < ... | break_ensure.rb:14:3:24:5 | while ... | false |
-| break_ensure.rb:14:9:14:13 | ... < ... | break_ensure.rb:16:10:16:10 | x | true |
+| break_ensure.rb:14:9:14:13 | ... < ... | break_ensure.rb:14:9:14:13 | After ... < ... [false] | false |
+| break_ensure.rb:14:9:14:13 | ... < ... | break_ensure.rb:14:9:14:13 | After ... < ... [true] | true |
+| break_ensure.rb:14:9:14:13 | After ... < ... [false] | break_ensure.rb:14:3:24:5 | After while ... |  |
+| break_ensure.rb:14:9:14:13 | After ... < ... [true] | break_ensure.rb:14:14:24:5 | do ... |  |
+| break_ensure.rb:14:9:14:13 | Before ... < ... | break_ensure.rb:14:9:14:9 | x |  |
 | break_ensure.rb:14:13:14:13 | 0 | break_ensure.rb:14:9:14:13 | ... < ... |  |
-| break_ensure.rb:14:14:24:5 | do ... | break_ensure.rb:14:9:14:9 | x |  |
-| break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:20:10:20:10 | y |  |
+| break_ensure.rb:14:14:24:5 | After do ... | break_ensure.rb:14:3:24:5 | [LoopHeader] while ... |  |
+| break_ensure.rb:14:14:24:5 | do ... | break_ensure.rb:15:5:23:7 | begin ...  |  |
+| break_ensure.rb:15:5:23:7 | After begin ...  | break_ensure.rb:14:14:24:5 | After do ... |  |
+| break_ensure.rb:15:5:23:7 | begin ...  | break_ensure.rb:16:7:18:9 | if ... |  |
+| break_ensure.rb:16:7:18:9 | After if ... | break_ensure.rb:19:5:22:9 | ensure ... |  |
+| break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:16:10:16:14 | Before ... > ... |  |
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:16:14:16:14 | 0 |  |
-| break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:16:7:18:9 | if ... | false |
-| break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:17:9:17:13 | break | true |
-| break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:20:10:20:10 | [ensure: exception] y | exception |
+| break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:16:10:16:14 | After ... > ... [false] | false |
+| break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:16:10:16:14 | After ... > ... [true] | true |
+| break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:19:5:22:9 | ensure ... | exception |
+| break_ensure.rb:16:10:16:14 | After ... > ... [false] | break_ensure.rb:16:7:18:9 | After if ... |  |
+| break_ensure.rb:16:10:16:14 | After ... > ... [true] | break_ensure.rb:16:16:17:13 | then ... |  |
+| break_ensure.rb:16:10:16:14 | Before ... > ... | break_ensure.rb:16:10:16:10 | x |  |
 | break_ensure.rb:16:14:16:14 | 0 | break_ensure.rb:16:10:16:14 | ... > ... |  |
-| break_ensure.rb:17:9:17:13 | break | break_ensure.rb:20:10:20:10 | [ensure: break] y | break |
-| break_ensure.rb:19:5:22:9 | [ensure: break] ensure ... | break_ensure.rb:14:3:24:5 | while ... | break |
-| break_ensure.rb:19:5:22:9 | [ensure: exception] ensure ... | break_ensure.rb:14:3:24:5 | while ... | exception |
-| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:14:14:24:5 | do ... |  |
-| break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:19:5:22:9 | [ensure: break] ensure ... |  |
-| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:19:5:22:9 | [ensure: exception] ensure ... |  |
-| break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:19:5:22:9 | ensure ... |  |
-| break_ensure.rb:20:10:20:10 | [ensure: break] y | break_ensure.rb:20:10:20:15 | [ensure: break] call to nil? |  |
-| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:20:10:20:15 | [ensure: exception] call to nil? |  |
+| break_ensure.rb:16:16:17:13 | then ... | break_ensure.rb:17:9:17:13 | Before break |  |
+| break_ensure.rb:17:9:17:13 | Before break | break_ensure.rb:17:9:17:13 | break |  |
+| break_ensure.rb:17:9:17:13 | break | break_ensure.rb:19:5:22:9 | ensure ... | break |
+| break_ensure.rb:19:5:22:9 | After ensure ... | break_ensure.rb:13:1:25:3 | Exceptional Exit | exception |
+| break_ensure.rb:19:5:22:9 | After ensure ... | break_ensure.rb:14:3:24:5 | After while ... | break |
+| break_ensure.rb:19:5:22:9 | After ensure ... | break_ensure.rb:15:5:23:7 | After begin ...  |  |
+| break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:20:7:22:9 | if ... |  |
+| break_ensure.rb:20:7:22:9 | After if ... | break_ensure.rb:19:5:22:9 | After ensure ... |  |
+| break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:20:10:20:15 | Before call to nil? |  |
 | break_ensure.rb:20:10:20:10 | y | break_ensure.rb:20:10:20:15 | call to nil? |  |
-| break_ensure.rb:20:10:20:15 | [ensure: break] call to nil? | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | false |
-| break_ensure.rb:20:10:20:15 | [ensure: break] call to nil? | break_ensure.rb:21:9:21:20 | [ensure: break] self | true |
-| break_ensure.rb:20:10:20:15 | [ensure: exception] call to nil? | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | false |
-| break_ensure.rb:20:10:20:15 | [ensure: exception] call to nil? | break_ensure.rb:21:9:21:20 | [ensure: exception] self | true |
-| break_ensure.rb:20:10:20:15 | call to nil? | break_ensure.rb:20:7:22:9 | if ... | false |
-| break_ensure.rb:20:10:20:15 | call to nil? | break_ensure.rb:21:9:21:20 | self | true |
-| break_ensure.rb:20:17:21:20 | [ensure: break] then ... | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |  |
-| break_ensure.rb:20:17:21:20 | [ensure: exception] then ... | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |  |
-| break_ensure.rb:20:17:21:20 | then ... | break_ensure.rb:20:7:22:9 | if ... |  |
-| break_ensure.rb:21:9:21:20 | [ensure: break] call to puts | break_ensure.rb:20:17:21:20 | [ensure: break] then ... |  |
-| break_ensure.rb:21:9:21:20 | [ensure: break] self | break_ensure.rb:21:15:21:19 | [ensure: break] y nil |  |
-| break_ensure.rb:21:9:21:20 | [ensure: exception] call to puts | break_ensure.rb:20:17:21:20 | [ensure: exception] then ... |  |
-| break_ensure.rb:21:9:21:20 | [ensure: exception] self | break_ensure.rb:21:15:21:19 | [ensure: exception] y nil |  |
-| break_ensure.rb:21:9:21:20 | call to puts | break_ensure.rb:20:17:21:20 | then ... |  |
-| break_ensure.rb:21:9:21:20 | self | break_ensure.rb:21:15:21:19 | y nil |  |
-| break_ensure.rb:21:14:21:20 | "y nil" | break_ensure.rb:21:9:21:20 | call to puts |  |
-| break_ensure.rb:21:14:21:20 | [ensure: break] "y nil" | break_ensure.rb:21:9:21:20 | [ensure: break] call to puts |  |
-| break_ensure.rb:21:14:21:20 | [ensure: exception] "y nil" | break_ensure.rb:21:9:21:20 | [ensure: exception] call to puts |  |
-| break_ensure.rb:21:15:21:19 | [ensure: break] y nil | break_ensure.rb:21:14:21:20 | [ensure: break] "y nil" |  |
-| break_ensure.rb:21:15:21:19 | [ensure: exception] y nil | break_ensure.rb:21:14:21:20 | [ensure: exception] "y nil" |  |
+| break_ensure.rb:20:10:20:15 | After call to nil? [false] | break_ensure.rb:20:7:22:9 | After if ... |  |
+| break_ensure.rb:20:10:20:15 | After call to nil? [true] | break_ensure.rb:20:17:21:20 | then ... |  |
+| break_ensure.rb:20:10:20:15 | Before call to nil? | break_ensure.rb:20:10:20:10 | y |  |
+| break_ensure.rb:20:10:20:15 | call to nil? | break_ensure.rb:20:10:20:15 | After call to nil? [false] | false |
+| break_ensure.rb:20:10:20:15 | call to nil? | break_ensure.rb:20:10:20:15 | After call to nil? [true] | true |
+| break_ensure.rb:20:17:21:20 | After then ... | break_ensure.rb:20:7:22:9 | After if ... |  |
+| break_ensure.rb:20:17:21:20 | then ... | break_ensure.rb:21:9:21:20 | Before call to puts |  |
+| break_ensure.rb:21:9:21:20 | After call to puts | break_ensure.rb:20:17:21:20 | After then ... |  |
+| break_ensure.rb:21:9:21:20 | Before call to puts | break_ensure.rb:21:9:21:20 | self |  |
+| break_ensure.rb:21:9:21:20 | call to puts | break_ensure.rb:21:9:21:20 | After call to puts |  |
+| break_ensure.rb:21:9:21:20 | self | break_ensure.rb:21:14:21:20 | Before "y nil" |  |
+| break_ensure.rb:21:14:21:20 | "y nil" | break_ensure.rb:21:14:21:20 | After "y nil" |  |
+| break_ensure.rb:21:14:21:20 | After "y nil" | break_ensure.rb:21:9:21:20 | call to puts |  |
+| break_ensure.rb:21:14:21:20 | Before "y nil" | break_ensure.rb:21:15:21:19 | y nil |  |
 | break_ensure.rb:21:15:21:19 | y nil | break_ensure.rb:21:14:21:20 | "y nil" |  |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:27:8:27:8 | x |  |
-| break_ensure.rb:27:1:42:3 | exit m3 (abnormal) | break_ensure.rb:27:1:42:3 | exit m3 |  |
-| break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:27:1:42:3 | exit m3 |  |
+| break_ensure.rb:27:1:42:3 | Entry | break_ensure.rb:27:8:27:8 | x |  |
+| break_ensure.rb:27:1:42:3 | Exceptional Exit | break_ensure.rb:27:1:42:3 | Exit |  |
+| break_ensure.rb:27:1:42:3 | Normal Exit | break_ensure.rb:27:1:42:3 | Exit |  |
 | break_ensure.rb:27:1:42:3 | m3 | break_ensure.rb:44:1:56:3 | m4 |  |
 | break_ensure.rb:27:8:27:8 | x | break_ensure.rb:27:10:27:10 | y |  |
-| break_ensure.rb:27:10:27:10 | y | break_ensure.rb:29:8:29:8 | x |  |
-| break_ensure.rb:29:5:31:7 | if ... | break_ensure.rb:33:11:33:11 | y |  |
+| break_ensure.rb:27:10:27:10 | y | break_ensure.rb:28:3:41:13 | ... |  |
+| break_ensure.rb:28:3:40:5 | After begin ...  | break_ensure.rb:41:3:41:13 | Before call to puts |  |
+| break_ensure.rb:28:3:40:5 | begin ...  | break_ensure.rb:29:5:31:7 | if ... |  |
+| break_ensure.rb:28:3:41:13 | ... | break_ensure.rb:28:3:40:5 | begin ...  |  |
+| break_ensure.rb:28:3:41:13 | After ... | break_ensure.rb:27:1:42:3 | Normal Exit |  |
+| break_ensure.rb:29:5:31:7 | After if ... | break_ensure.rb:32:3:39:7 | ensure ... |  |
+| break_ensure.rb:29:5:31:7 | if ... | break_ensure.rb:29:8:29:13 | Before call to nil? |  |
 | break_ensure.rb:29:8:29:8 | x | break_ensure.rb:29:8:29:13 | call to nil? |  |
-| break_ensure.rb:29:8:29:13 | call to nil? | break_ensure.rb:29:5:31:7 | if ... | false |
-| break_ensure.rb:29:8:29:13 | call to nil? | break_ensure.rb:30:7:30:12 | return | true |
-| break_ensure.rb:29:8:29:13 | call to nil? | break_ensure.rb:33:11:33:11 | [ensure: exception] y | exception |
-| break_ensure.rb:30:7:30:12 | return | break_ensure.rb:33:11:33:11 | [ensure: return] y | return |
-| break_ensure.rb:32:3:39:7 | [ensure: exception] ensure ... | break_ensure.rb:27:1:42:3 | exit m3 (abnormal) | exception |
-| break_ensure.rb:32:3:39:7 | [ensure: return] ensure ... | break_ensure.rb:27:1:42:3 | exit m3 (normal) | return |
-| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:41:3:41:13 | self |  |
-| break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break_ensure.rb:32:3:39:7 | [ensure: exception] ensure ... |  |
-| break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:32:3:39:7 | [ensure: return] ensure ... |  |
-| break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:32:3:39:7 | ensure ... |  |
-| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:33:15:33:15 | [ensure: exception] 0 |  |
-| break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:33:15:33:15 | [ensure: return] 0 |  |
+| break_ensure.rb:29:8:29:13 | After call to nil? [false] | break_ensure.rb:29:5:31:7 | After if ... |  |
+| break_ensure.rb:29:8:29:13 | After call to nil? [true] | break_ensure.rb:29:15:30:12 | then ... |  |
+| break_ensure.rb:29:8:29:13 | Before call to nil? | break_ensure.rb:29:8:29:8 | x |  |
+| break_ensure.rb:29:8:29:13 | call to nil? | break_ensure.rb:29:8:29:13 | After call to nil? [false] | false |
+| break_ensure.rb:29:8:29:13 | call to nil? | break_ensure.rb:29:8:29:13 | After call to nil? [true] | true |
+| break_ensure.rb:29:8:29:13 | call to nil? | break_ensure.rb:32:3:39:7 | ensure ... | exception |
+| break_ensure.rb:29:15:30:12 | then ... | break_ensure.rb:30:7:30:12 | Before return |  |
+| break_ensure.rb:30:7:30:12 | Before return | break_ensure.rb:30:7:30:12 | return |  |
+| break_ensure.rb:30:7:30:12 | return | break_ensure.rb:32:3:39:7 | ensure ... | return |
+| break_ensure.rb:32:3:39:7 | After ensure ... | break_ensure.rb:27:1:42:3 | Exceptional Exit | exception |
+| break_ensure.rb:32:3:39:7 | After ensure ... | break_ensure.rb:27:1:42:3 | Normal Exit | return |
+| break_ensure.rb:32:3:39:7 | After ensure ... | break_ensure.rb:28:3:40:5 | After begin ...  |  |
+| break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:33:5:39:7 | while ... |  |
+| break_ensure.rb:33:5:39:7 | After while ... | break_ensure.rb:32:3:39:7 | After ensure ... |  |
+| break_ensure.rb:33:5:39:7 | [LoopHeader] while ... | break_ensure.rb:33:11:33:15 | Before ... < ... |  |
+| break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:33:5:39:7 | [LoopHeader] while ... |  |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:33:15:33:15 | 0 |  |
-| break_ensure.rb:33:11:33:15 | ... < ... | break_ensure.rb:33:5:39:7 | while ... | false |
-| break_ensure.rb:33:11:33:15 | ... < ... | break_ensure.rb:35:12:35:12 | x | true |
-| break_ensure.rb:33:11:33:15 | [ensure: exception] ... < ... | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | false |
-| break_ensure.rb:33:11:33:15 | [ensure: exception] ... < ... | break_ensure.rb:35:12:35:12 | [ensure: exception] x | true |
-| break_ensure.rb:33:11:33:15 | [ensure: return] ... < ... | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | false |
-| break_ensure.rb:33:11:33:15 | [ensure: return] ... < ... | break_ensure.rb:35:12:35:12 | [ensure: return] x | true |
+| break_ensure.rb:33:11:33:15 | ... < ... | break_ensure.rb:33:11:33:15 | After ... < ... [false] | false |
+| break_ensure.rb:33:11:33:15 | ... < ... | break_ensure.rb:33:11:33:15 | After ... < ... [true] | true |
+| break_ensure.rb:33:11:33:15 | After ... < ... [false] | break_ensure.rb:33:5:39:7 | After while ... |  |
+| break_ensure.rb:33:11:33:15 | After ... < ... [true] | break_ensure.rb:33:16:39:7 | do ... |  |
+| break_ensure.rb:33:11:33:15 | Before ... < ... | break_ensure.rb:33:11:33:11 | y |  |
 | break_ensure.rb:33:15:33:15 | 0 | break_ensure.rb:33:11:33:15 | ... < ... |  |
-| break_ensure.rb:33:15:33:15 | [ensure: exception] 0 | break_ensure.rb:33:11:33:15 | [ensure: exception] ... < ... |  |
-| break_ensure.rb:33:15:33:15 | [ensure: return] 0 | break_ensure.rb:33:11:33:15 | [ensure: return] ... < ... |  |
-| break_ensure.rb:33:16:39:7 | [ensure: exception] do ... | break_ensure.rb:33:11:33:11 | [ensure: exception] y |  |
-| break_ensure.rb:33:16:39:7 | [ensure: return] do ... | break_ensure.rb:33:11:33:11 | [ensure: return] y |  |
-| break_ensure.rb:33:16:39:7 | do ... | break_ensure.rb:33:11:33:11 | y |  |
-| break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | break_ensure.rb:33:16:39:7 | [ensure: exception] do ... |  |
-| break_ensure.rb:35:9:37:11 | [ensure: return] if ... | break_ensure.rb:33:16:39:7 | [ensure: return] do ... |  |
-| break_ensure.rb:35:9:37:11 | if ... | break_ensure.rb:33:16:39:7 | do ... |  |
-| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:35:16:35:16 | [ensure: exception] 0 |  |
-| break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:35:16:35:16 | [ensure: return] 0 |  |
+| break_ensure.rb:33:16:39:7 | After do ... | break_ensure.rb:33:5:39:7 | [LoopHeader] while ... |  |
+| break_ensure.rb:33:16:39:7 | do ... | break_ensure.rb:34:7:38:9 | begin ...  |  |
+| break_ensure.rb:34:7:38:9 | After begin ...  | break_ensure.rb:33:16:39:7 | After do ... |  |
+| break_ensure.rb:34:7:38:9 | begin ...  | break_ensure.rb:35:9:37:11 | if ... |  |
+| break_ensure.rb:35:9:37:11 | After if ... | break_ensure.rb:34:7:38:9 | After begin ...  |  |
+| break_ensure.rb:35:9:37:11 | if ... | break_ensure.rb:35:12:35:16 | Before ... > ... |  |
 | break_ensure.rb:35:12:35:12 | x | break_ensure.rb:35:16:35:16 | 0 |  |
-| break_ensure.rb:35:12:35:16 | ... > ... | break_ensure.rb:35:9:37:11 | if ... | false |
-| break_ensure.rb:35:12:35:16 | ... > ... | break_ensure.rb:36:11:36:15 | break | true |
-| break_ensure.rb:35:12:35:16 | [ensure: exception] ... > ... | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | false |
-| break_ensure.rb:35:12:35:16 | [ensure: exception] ... > ... | break_ensure.rb:36:11:36:15 | [ensure: exception] break | true |
-| break_ensure.rb:35:12:35:16 | [ensure: return] ... > ... | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | false |
-| break_ensure.rb:35:12:35:16 | [ensure: return] ... > ... | break_ensure.rb:36:11:36:15 | [ensure: return] break | true |
+| break_ensure.rb:35:12:35:16 | ... > ... | break_ensure.rb:35:12:35:16 | After ... > ... [false] | false |
+| break_ensure.rb:35:12:35:16 | ... > ... | break_ensure.rb:35:12:35:16 | After ... > ... [true] | true |
+| break_ensure.rb:35:12:35:16 | After ... > ... [false] | break_ensure.rb:35:9:37:11 | After if ... |  |
+| break_ensure.rb:35:12:35:16 | After ... > ... [true] | break_ensure.rb:35:18:36:15 | then ... |  |
+| break_ensure.rb:35:12:35:16 | Before ... > ... | break_ensure.rb:35:12:35:12 | x |  |
 | break_ensure.rb:35:16:35:16 | 0 | break_ensure.rb:35:12:35:16 | ... > ... |  |
-| break_ensure.rb:35:16:35:16 | [ensure: exception] 0 | break_ensure.rb:35:12:35:16 | [ensure: exception] ... > ... |  |
-| break_ensure.rb:35:16:35:16 | [ensure: return] 0 | break_ensure.rb:35:12:35:16 | [ensure: return] ... > ... |  |
-| break_ensure.rb:36:11:36:15 | [ensure: exception] break | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break |
-| break_ensure.rb:36:11:36:15 | [ensure: return] break | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break |
-| break_ensure.rb:36:11:36:15 | break | break_ensure.rb:33:5:39:7 | while ... | break |
-| break_ensure.rb:41:3:41:13 | call to puts | break_ensure.rb:27:1:42:3 | exit m3 (normal) |  |
-| break_ensure.rb:41:3:41:13 | self | break_ensure.rb:41:9:41:12 | Done |  |
-| break_ensure.rb:41:8:41:13 | "Done" | break_ensure.rb:41:3:41:13 | call to puts |  |
+| break_ensure.rb:35:18:36:15 | then ... | break_ensure.rb:36:11:36:15 | Before break |  |
+| break_ensure.rb:36:11:36:15 | Before break | break_ensure.rb:36:11:36:15 | break |  |
+| break_ensure.rb:36:11:36:15 | break | break_ensure.rb:33:5:39:7 | After while ... | break |
+| break_ensure.rb:41:3:41:13 | After call to puts | break_ensure.rb:28:3:41:13 | After ... |  |
+| break_ensure.rb:41:3:41:13 | Before call to puts | break_ensure.rb:41:3:41:13 | self |  |
+| break_ensure.rb:41:3:41:13 | call to puts | break_ensure.rb:41:3:41:13 | After call to puts |  |
+| break_ensure.rb:41:3:41:13 | self | break_ensure.rb:41:8:41:13 | Before "Done" |  |
+| break_ensure.rb:41:8:41:13 | "Done" | break_ensure.rb:41:8:41:13 | After "Done" |  |
+| break_ensure.rb:41:8:41:13 | After "Done" | break_ensure.rb:41:3:41:13 | call to puts |  |
+| break_ensure.rb:41:8:41:13 | Before "Done" | break_ensure.rb:41:9:41:12 | Done |  |
 | break_ensure.rb:41:9:41:12 | Done | break_ensure.rb:41:8:41:13 | "Done" |  |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:44:8:44:8 | x |  |
-| break_ensure.rb:44:1:56:3 | exit m4 (normal) | break_ensure.rb:44:1:56:3 | exit m4 |  |
-| break_ensure.rb:44:1:56:3 | m4 | break_ensure.rb:1:1:56:4 | exit break_ensure.rb (normal) |  |
-| break_ensure.rb:44:8:44:8 | x | break_ensure.rb:45:9:45:9 | x |  |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:44:1:56:3 | exit m4 (normal) |  |
+| break_ensure.rb:44:1:56:3 | Entry | break_ensure.rb:44:8:44:8 | x |  |
+| break_ensure.rb:44:1:56:3 | Exceptional Exit | break_ensure.rb:44:1:56:3 | Exit |  |
+| break_ensure.rb:44:1:56:3 | Normal Exit | break_ensure.rb:44:1:56:3 | Exit |  |
+| break_ensure.rb:44:1:56:3 | m4 | break_ensure.rb:1:1:56:4 | Normal Exit |  |
+| break_ensure.rb:44:8:44:8 | x | break_ensure.rb:45:3:55:5 | ... |  |
+| break_ensure.rb:45:3:55:5 | ... | break_ensure.rb:45:3:55:5 | while ... |  |
+| break_ensure.rb:45:3:55:5 | After ... | break_ensure.rb:44:1:56:3 | Normal Exit |  |
+| break_ensure.rb:45:3:55:5 | After while ... | break_ensure.rb:45:3:55:5 | After ... |  |
+| break_ensure.rb:45:3:55:5 | [LoopHeader] while ... | break_ensure.rb:45:9:45:13 | Before ... < ... |  |
+| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:45:3:55:5 | [LoopHeader] while ... |  |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:45:13:45:13 | 0 |  |
-| break_ensure.rb:45:9:45:13 | ... < ... | break_ensure.rb:45:3:55:5 | while ... | false |
-| break_ensure.rb:45:9:45:13 | ... < ... | break_ensure.rb:47:10:47:10 | x | true |
+| break_ensure.rb:45:9:45:13 | ... < ... | break_ensure.rb:45:9:45:13 | After ... < ... [false] | false |
+| break_ensure.rb:45:9:45:13 | ... < ... | break_ensure.rb:45:9:45:13 | After ... < ... [true] | true |
+| break_ensure.rb:45:9:45:13 | After ... < ... [false] | break_ensure.rb:45:3:55:5 | After while ... |  |
+| break_ensure.rb:45:9:45:13 | After ... < ... [true] | break_ensure.rb:45:14:55:5 | do ... |  |
+| break_ensure.rb:45:9:45:13 | Before ... < ... | break_ensure.rb:45:9:45:9 | x |  |
 | break_ensure.rb:45:13:45:13 | 0 | break_ensure.rb:45:9:45:13 | ... < ... |  |
-| break_ensure.rb:45:14:55:5 | do ... | break_ensure.rb:45:9:45:9 | x |  |
-| break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:51:10:51:10 | x |  |
+| break_ensure.rb:45:14:55:5 | After do ... | break_ensure.rb:45:3:55:5 | [LoopHeader] while ... |  |
+| break_ensure.rb:45:14:55:5 | do ... | break_ensure.rb:46:5:54:7 | begin ...  |  |
+| break_ensure.rb:46:5:54:7 | After begin ...  | break_ensure.rb:45:14:55:5 | After do ... |  |
+| break_ensure.rb:46:5:54:7 | begin ...  | break_ensure.rb:47:7:49:9 | if ... |  |
+| break_ensure.rb:47:7:49:9 | After if ... | break_ensure.rb:50:5:53:9 | ensure ... |  |
+| break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:47:10:47:14 | Before ... > ... |  |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:47:14:47:14 | 1 |  |
-| break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:47:7:49:9 | if ... | false |
-| break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:48:9:48:16 | self | true |
-| break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:51:10:51:10 | [ensure: exception] x | exception |
+| break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:47:10:47:14 | After ... > ... [false] | false |
+| break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:47:10:47:14 | After ... > ... [true] | true |
+| break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:50:5:53:9 | ensure ... | exception |
+| break_ensure.rb:47:10:47:14 | After ... > ... [false] | break_ensure.rb:47:7:49:9 | After if ... |  |
+| break_ensure.rb:47:10:47:14 | After ... > ... [true] | break_ensure.rb:47:16:48:16 | then ... |  |
+| break_ensure.rb:47:10:47:14 | Before ... > ... | break_ensure.rb:47:10:47:10 | x |  |
 | break_ensure.rb:47:14:47:14 | 1 | break_ensure.rb:47:10:47:14 | ... > ... |  |
-| break_ensure.rb:48:9:48:16 | call to raise | break_ensure.rb:51:10:51:10 | [ensure: exception] x | exception |
+| break_ensure.rb:47:16:48:16 | then ... | break_ensure.rb:48:9:48:16 | Before call to raise |  |
+| break_ensure.rb:48:9:48:16 | Before call to raise | break_ensure.rb:48:9:48:16 | self |  |
+| break_ensure.rb:48:9:48:16 | call to raise | break_ensure.rb:50:5:53:9 | ensure ... | exception |
 | break_ensure.rb:48:9:48:16 | self | break_ensure.rb:48:15:48:16 | "" |  |
 | break_ensure.rb:48:15:48:16 | "" | break_ensure.rb:48:9:48:16 | call to raise |  |
-| break_ensure.rb:50:5:53:9 | [ensure: exception] ensure ... | break_ensure.rb:45:3:55:5 | while ... | exception |
-| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:45:14:55:5 | do ... |  |
-| break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | break_ensure.rb:50:5:53:9 | [ensure: exception] ensure ... |  |
-| break_ensure.rb:51:7:53:9 | if ... | break_ensure.rb:50:5:53:9 | ensure ... |  |
-| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:51:14:51:14 | [ensure: exception] 0 |  |
+| break_ensure.rb:50:5:53:9 | After ensure ... | break_ensure.rb:44:1:56:3 | Exceptional Exit | exception |
+| break_ensure.rb:50:5:53:9 | After ensure ... | break_ensure.rb:46:5:54:7 | After begin ...  |  |
+| break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:51:7:53:9 | if ... |  |
+| break_ensure.rb:51:7:53:9 | After if ... | break_ensure.rb:50:5:53:9 | After ensure ... |  |
+| break_ensure.rb:51:7:53:9 | if ... | break_ensure.rb:51:10:51:14 | Before ... > ... |  |
 | break_ensure.rb:51:10:51:10 | x | break_ensure.rb:51:14:51:14 | 0 |  |
-| break_ensure.rb:51:10:51:14 | ... > ... | break_ensure.rb:51:7:53:9 | if ... | false |
-| break_ensure.rb:51:10:51:14 | ... > ... | break_ensure.rb:52:15:52:16 | 10 | true |
-| break_ensure.rb:51:10:51:14 | [ensure: exception] ... > ... | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | false |
-| break_ensure.rb:51:10:51:14 | [ensure: exception] ... > ... | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | true |
+| break_ensure.rb:51:10:51:14 | ... > ... | break_ensure.rb:51:10:51:14 | After ... > ... [false] | false |
+| break_ensure.rb:51:10:51:14 | ... > ... | break_ensure.rb:51:10:51:14 | After ... > ... [true] | true |
+| break_ensure.rb:51:10:51:14 | After ... > ... [false] | break_ensure.rb:51:7:53:9 | After if ... |  |
+| break_ensure.rb:51:10:51:14 | After ... > ... [true] | break_ensure.rb:51:16:52:17 | then ... |  |
+| break_ensure.rb:51:10:51:14 | Before ... > ... | break_ensure.rb:51:10:51:10 | x |  |
 | break_ensure.rb:51:14:51:14 | 0 | break_ensure.rb:51:10:51:14 | ... > ... |  |
-| break_ensure.rb:51:14:51:14 | [ensure: exception] 0 | break_ensure.rb:51:10:51:14 | [ensure: exception] ... > ... |  |
-| break_ensure.rb:52:9:52:16 | [ensure: exception] break | break_ensure.rb:45:3:55:5 | while ... | break |
-| break_ensure.rb:52:9:52:16 | break | break_ensure.rb:45:3:55:5 | while ... | break |
+| break_ensure.rb:51:16:52:17 | then ... | break_ensure.rb:52:9:52:16 | Before break |  |
+| break_ensure.rb:52:9:52:16 | Before break | break_ensure.rb:52:15:52:16 | 10 |  |
+| break_ensure.rb:52:9:52:16 | break | break_ensure.rb:45:3:55:5 | After while ... | break |
 | break_ensure.rb:52:15:52:16 | 10 | break_ensure.rb:52:9:52:16 | break |  |
-| break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | break_ensure.rb:52:9:52:16 | [ensure: exception] break |  |
-| case.rb:1:1:6:3 | enter if_in_case | case.rb:2:8:2:9 | self |  |
-| case.rb:1:1:6:3 | exit if_in_case (normal) | case.rb:1:1:6:3 | exit if_in_case |  |
+| case.rb:1:1:6:3 | Entry | case.rb:2:3:5:5 | ... |  |
+| case.rb:1:1:6:3 | Normal Exit | case.rb:1:1:6:3 | Exit |  |
 | case.rb:1:1:6:3 | if_in_case | case.rb:8:1:18:3 | case_match |  |
-| case.rb:1:1:99:4 | enter case.rb | case.rb:1:1:6:3 | if_in_case |  |
-| case.rb:1:1:99:4 | exit case.rb (normal) | case.rb:1:1:99:4 | exit case.rb |  |
-| case.rb:2:3:5:5 | case ... | case.rb:1:1:6:3 | exit if_in_case (normal) |  |
-| case.rb:2:8:2:9 | call to x1 | case.rb:3:10:3:10 | 1 |  |
+| case.rb:1:1:99:4 | Entry | case.rb:1:1:6:3 | if_in_case |  |
+| case.rb:1:1:99:4 | Normal Exit | case.rb:1:1:99:4 | Exit |  |
+| case.rb:2:3:5:5 | ... | case.rb:2:3:5:5 | case ... |  |
+| case.rb:2:3:5:5 | After ... | case.rb:1:1:6:3 | Normal Exit |  |
+| case.rb:2:3:5:5 | After case ... | case.rb:2:3:5:5 | After ... |  |
+| case.rb:2:3:5:5 | case ... | case.rb:2:8:2:9 | Before call to x1 |  |
+| case.rb:2:8:2:9 | After call to x1 | case.rb:3:5:3:42 | when ... |  |
+| case.rb:2:8:2:9 | Before call to x1 | case.rb:2:8:2:9 | self |  |
+| case.rb:2:8:2:9 | call to x1 | case.rb:2:8:2:9 | After call to x1 |  |
 | case.rb:2:8:2:9 | self | case.rb:2:8:2:9 | call to x1 |  |
-| case.rb:3:5:3:42 | [match] when ... | case.rb:3:21:3:22 | self | match |
-| case.rb:3:5:3:42 | [no-match] when ... | case.rb:4:10:4:10 | 2 | no-match |
-| case.rb:3:10:3:10 | 1 | case.rb:3:5:3:42 | [match] when ... | match |
-| case.rb:3:10:3:10 | 1 | case.rb:3:5:3:42 | [no-match] when ... | no-match |
-| case.rb:3:12:3:42 | then ... | case.rb:2:3:5:5 | case ... |  |
-| case.rb:3:17:3:42 | ( ... ) | case.rb:3:12:3:42 | then ... |  |
-| case.rb:3:18:3:41 | if ... | case.rb:3:17:3:42 | ( ... ) |  |
-| case.rb:3:21:3:22 | call to x2 | case.rb:3:18:3:41 | if ... | false |
-| case.rb:3:21:3:22 | call to x2 | case.rb:3:29:3:37 | self | true |
+| case.rb:3:5:3:42 | After when ... [match] | case.rb:3:12:3:42 | then ... |  |
+| case.rb:3:5:3:42 | After when ... [no-match] | case.rb:4:5:4:24 | when ... |  |
+| case.rb:3:5:3:42 | when ... | case.rb:3:10:3:10 | 1 |  |
+| case.rb:3:10:3:10 | 1 | case.rb:3:10:3:10 | After 1 [match] | match |
+| case.rb:3:10:3:10 | 1 | case.rb:3:10:3:10 | After 1 [no-match] | no-match |
+| case.rb:3:10:3:10 | After 1 [match] | case.rb:3:5:3:42 | After when ... [match] | match |
+| case.rb:3:10:3:10 | After 1 [no-match] | case.rb:3:5:3:42 | After when ... [no-match] | no-match |
+| case.rb:3:12:3:42 | After then ... | case.rb:2:3:5:5 | After case ... |  |
+| case.rb:3:12:3:42 | then ... | case.rb:3:17:3:42 | ( ... ) |  |
+| case.rb:3:17:3:42 | ( ... ) | case.rb:3:18:3:41 | if ... |  |
+| case.rb:3:17:3:42 | After ( ... ) | case.rb:3:12:3:42 | After then ... |  |
+| case.rb:3:18:3:41 | After if ... | case.rb:3:17:3:42 | After ( ... ) |  |
+| case.rb:3:18:3:41 | if ... | case.rb:3:21:3:22 | Before call to x2 |  |
+| case.rb:3:21:3:22 | After call to x2 [false] | case.rb:3:18:3:41 | After if ... |  |
+| case.rb:3:21:3:22 | After call to x2 [true] | case.rb:3:24:3:37 | then ... |  |
+| case.rb:3:21:3:22 | Before call to x2 | case.rb:3:21:3:22 | self |  |
+| case.rb:3:21:3:22 | call to x2 | case.rb:3:21:3:22 | After call to x2 [false] | false |
+| case.rb:3:21:3:22 | call to x2 | case.rb:3:21:3:22 | After call to x2 [true] | true |
 | case.rb:3:21:3:22 | self | case.rb:3:21:3:22 | call to x2 |  |
-| case.rb:3:24:3:37 | then ... | case.rb:3:18:3:41 | if ... |  |
-| case.rb:3:29:3:37 | call to puts | case.rb:3:24:3:37 | then ... |  |
-| case.rb:3:29:3:37 | self | case.rb:3:35:3:36 | x2 |  |
-| case.rb:3:34:3:37 | "x2" | case.rb:3:29:3:37 | call to puts |  |
+| case.rb:3:24:3:37 | After then ... | case.rb:3:18:3:41 | After if ... |  |
+| case.rb:3:24:3:37 | then ... | case.rb:3:29:3:37 | Before call to puts |  |
+| case.rb:3:29:3:37 | After call to puts | case.rb:3:24:3:37 | After then ... |  |
+| case.rb:3:29:3:37 | Before call to puts | case.rb:3:29:3:37 | self |  |
+| case.rb:3:29:3:37 | call to puts | case.rb:3:29:3:37 | After call to puts |  |
+| case.rb:3:29:3:37 | self | case.rb:3:34:3:37 | Before "x2" |  |
+| case.rb:3:34:3:37 | "x2" | case.rb:3:34:3:37 | After "x2" |  |
+| case.rb:3:34:3:37 | After "x2" | case.rb:3:29:3:37 | call to puts |  |
+| case.rb:3:34:3:37 | Before "x2" | case.rb:3:35:3:36 | x2 |  |
 | case.rb:3:35:3:36 | x2 | case.rb:3:34:3:37 | "x2" |  |
-| case.rb:4:5:4:24 | [match] when ... | case.rb:4:17:4:24 | self | match |
-| case.rb:4:5:4:24 | [no-match] when ... | case.rb:2:3:5:5 | case ... | no-match |
-| case.rb:4:10:4:10 | 2 | case.rb:4:5:4:24 | [match] when ... | match |
-| case.rb:4:10:4:10 | 2 | case.rb:4:5:4:24 | [no-match] when ... | no-match |
-| case.rb:4:12:4:24 | then ... | case.rb:2:3:5:5 | case ... |  |
-| case.rb:4:17:4:24 | call to puts | case.rb:4:12:4:24 | then ... |  |
-| case.rb:4:17:4:24 | self | case.rb:4:23:4:23 | 2 |  |
-| case.rb:4:22:4:24 | "2" | case.rb:4:17:4:24 | call to puts |  |
+| case.rb:4:5:4:24 | After when ... [match] | case.rb:4:12:4:24 | then ... |  |
+| case.rb:4:5:4:24 | After when ... [no-match] | case.rb:2:3:5:5 | After case ... |  |
+| case.rb:4:5:4:24 | when ... | case.rb:4:10:4:10 | 2 |  |
+| case.rb:4:10:4:10 | 2 | case.rb:4:10:4:10 | After 2 [match] | match |
+| case.rb:4:10:4:10 | 2 | case.rb:4:10:4:10 | After 2 [no-match] | no-match |
+| case.rb:4:10:4:10 | After 2 [match] | case.rb:4:5:4:24 | After when ... [match] | match |
+| case.rb:4:10:4:10 | After 2 [no-match] | case.rb:4:5:4:24 | After when ... [no-match] | no-match |
+| case.rb:4:12:4:24 | After then ... | case.rb:2:3:5:5 | After case ... |  |
+| case.rb:4:12:4:24 | then ... | case.rb:4:17:4:24 | Before call to puts |  |
+| case.rb:4:17:4:24 | After call to puts | case.rb:4:12:4:24 | After then ... |  |
+| case.rb:4:17:4:24 | Before call to puts | case.rb:4:17:4:24 | self |  |
+| case.rb:4:17:4:24 | call to puts | case.rb:4:17:4:24 | After call to puts |  |
+| case.rb:4:17:4:24 | self | case.rb:4:22:4:24 | Before "2" |  |
+| case.rb:4:22:4:24 | "2" | case.rb:4:22:4:24 | After "2" |  |
+| case.rb:4:22:4:24 | After "2" | case.rb:4:17:4:24 | call to puts |  |
+| case.rb:4:22:4:24 | Before "2" | case.rb:4:23:4:23 | 2 |  |
 | case.rb:4:23:4:23 | 2 | case.rb:4:22:4:24 | "2" |  |
+| case.rb:8:1:18:3 | Entry | case.rb:8:16:8:20 | value |  |
+| case.rb:8:1:18:3 | Normal Exit | case.rb:8:1:18:3 | Exit |  |
 | case.rb:8:1:18:3 | case_match | case.rb:20:1:24:3 | case_match_no_match |  |
-| case.rb:8:1:18:3 | enter case_match | case.rb:8:16:8:20 | value |  |
-| case.rb:8:1:18:3 | exit case_match (normal) | case.rb:8:1:18:3 | exit case_match |  |
-| case.rb:8:16:8:20 | value | case.rb:9:8:9:12 | value |  |
-| case.rb:9:3:17:5 | case ... | case.rb:8:1:18:3 | exit case_match (normal) |  |
+| case.rb:8:16:8:20 | value | case.rb:9:3:17:5 | ... |  |
+| case.rb:9:3:17:5 | ... | case.rb:9:3:17:5 | case ... |  |
+| case.rb:9:3:17:5 | After ... | case.rb:8:1:18:3 | Normal Exit |  |
+| case.rb:9:3:17:5 | After case ... | case.rb:9:3:17:5 | After ... |  |
+| case.rb:9:3:17:5 | case ... | case.rb:9:8:9:12 | value |  |
 | case.rb:9:8:9:12 | value | case.rb:10:5:10:9 | in ... then ... |  |
+| case.rb:10:5:10:9 | After in ... then ... [match] | case.rb:9:3:17:5 | After case ... |  |
+| case.rb:10:5:10:9 | After in ... then ... [no-match] | case.rb:11:5:11:15 | in ... then ... |  |
 | case.rb:10:5:10:9 | in ... then ... | case.rb:10:8:10:8 | 0 |  |
-| case.rb:10:8:10:8 | 0 | case.rb:9:3:17:5 | case ... | match |
-| case.rb:10:8:10:8 | 0 | case.rb:11:5:11:15 | in ... then ... | no-match |
+| case.rb:10:8:10:8 | 0 | case.rb:10:8:10:8 | After 0 [match] | match |
+| case.rb:10:8:10:8 | 0 | case.rb:10:8:10:8 | After 0 [no-match] | no-match |
+| case.rb:10:8:10:8 | After 0 [match] | case.rb:10:5:10:9 | After in ... then ... [match] | match |
+| case.rb:10:8:10:8 | After 0 [no-match] | case.rb:10:5:10:9 | After in ... then ... [no-match] | no-match |
+| case.rb:11:5:11:15 | After in ... then ... [match] | case.rb:11:10:11:15 | then ... |  |
+| case.rb:11:5:11:15 | After in ... then ... [no-match] | case.rb:12:5:13:7 | in ... then ... |  |
 | case.rb:11:5:11:15 | in ... then ... | case.rb:11:8:11:8 | 1 |  |
-| case.rb:11:8:11:8 | 1 | case.rb:11:15:11:15 | 3 | match |
-| case.rb:11:8:11:8 | 1 | case.rb:12:5:13:7 | in ... then ... | no-match |
-| case.rb:11:10:11:15 | then ... | case.rb:9:3:17:5 | case ... |  |
-| case.rb:11:15:11:15 | 3 | case.rb:11:10:11:15 | then ... |  |
+| case.rb:11:8:11:8 | 1 | case.rb:11:8:11:8 | After 1 [match] | match |
+| case.rb:11:8:11:8 | 1 | case.rb:11:8:11:8 | After 1 [no-match] | no-match |
+| case.rb:11:8:11:8 | After 1 [match] | case.rb:11:5:11:15 | After in ... then ... [match] | match |
+| case.rb:11:8:11:8 | After 1 [no-match] | case.rb:11:5:11:15 | After in ... then ... [no-match] | no-match |
+| case.rb:11:10:11:15 | After then ... | case.rb:9:3:17:5 | After case ... |  |
+| case.rb:11:10:11:15 | then ... | case.rb:11:15:11:15 | 3 |  |
+| case.rb:11:15:11:15 | 3 | case.rb:11:10:11:15 | After then ... |  |
+| case.rb:12:5:13:7 | After in ... then ... [match] | case.rb:12:9:13:7 | then ... |  |
+| case.rb:12:5:13:7 | After in ... then ... [no-match] | case.rb:14:5:14:25 | in ... then ... |  |
 | case.rb:12:5:13:7 | in ... then ... | case.rb:12:8:12:8 | 2 |  |
-| case.rb:12:8:12:8 | 2 | case.rb:13:7:13:7 | 4 | match |
-| case.rb:12:8:12:8 | 2 | case.rb:14:5:14:25 | in ... then ... | no-match |
-| case.rb:12:9:13:7 | then ... | case.rb:9:3:17:5 | case ... |  |
-| case.rb:13:7:13:7 | 4 | case.rb:12:9:13:7 | then ... |  |
+| case.rb:12:8:12:8 | 2 | case.rb:12:8:12:8 | After 2 [match] | match |
+| case.rb:12:8:12:8 | 2 | case.rb:12:8:12:8 | After 2 [no-match] | no-match |
+| case.rb:12:8:12:8 | After 2 [match] | case.rb:12:5:13:7 | After in ... then ... [match] | match |
+| case.rb:12:8:12:8 | After 2 [no-match] | case.rb:12:5:13:7 | After in ... then ... [no-match] | no-match |
+| case.rb:12:9:13:7 | After then ... | case.rb:9:3:17:5 | After case ... |  |
+| case.rb:12:9:13:7 | then ... | case.rb:13:7:13:7 | 4 |  |
+| case.rb:13:7:13:7 | 4 | case.rb:12:9:13:7 | After then ... |  |
+| case.rb:14:5:14:25 | After in ... then ... [match] | case.rb:14:13:14:18 | Before ... == ... |  |
+| case.rb:14:5:14:25 | After in ... then ... [no-match] | case.rb:15:5:15:28 | in ... then ... |  |
 | case.rb:14:5:14:25 | in ... then ... | case.rb:14:8:14:8 | x |  |
-| case.rb:14:8:14:8 | x | case.rb:14:13:14:13 | x | match |
+| case.rb:14:8:14:8 | After x [match] | case.rb:14:5:14:25 | After in ... then ... [match] | match |
+| case.rb:14:8:14:8 | After x [no-match] | case.rb:14:5:14:25 | After in ... then ... [no-match] | no-match |
+| case.rb:14:8:14:8 | x | case.rb:14:8:14:8 | After x [match] | match |
+| case.rb:14:8:14:8 | x | case.rb:14:8:14:8 | After x [no-match] | no-match |
 | case.rb:14:13:14:13 | x | case.rb:14:18:14:18 | 5 |  |
-| case.rb:14:13:14:18 | ... == ... | case.rb:14:25:14:25 | 6 | true |
-| case.rb:14:13:14:18 | ... == ... | case.rb:15:5:15:28 | in ... then ... | false |
+| case.rb:14:13:14:18 | ... == ... | case.rb:14:13:14:18 | After ... == ... [false] | false |
+| case.rb:14:13:14:18 | ... == ... | case.rb:14:13:14:18 | After ... == ... [true] | true |
+| case.rb:14:13:14:18 | After ... == ... [false] | case.rb:15:5:15:28 | in ... then ... |  |
+| case.rb:14:13:14:18 | After ... == ... [true] | case.rb:14:20:14:25 | then ... |  |
+| case.rb:14:13:14:18 | Before ... == ... | case.rb:14:13:14:13 | x |  |
 | case.rb:14:18:14:18 | 5 | case.rb:14:13:14:18 | ... == ... |  |
-| case.rb:14:20:14:25 | then ... | case.rb:9:3:17:5 | case ... |  |
-| case.rb:14:25:14:25 | 6 | case.rb:14:20:14:25 | then ... |  |
+| case.rb:14:20:14:25 | After then ... | case.rb:9:3:17:5 | After case ... |  |
+| case.rb:14:20:14:25 | then ... | case.rb:14:25:14:25 | 6 |  |
+| case.rb:14:25:14:25 | 6 | case.rb:14:20:14:25 | After then ... |  |
+| case.rb:15:5:15:28 | After in ... then ... [match] | case.rb:15:17:15:21 | Before ... < ... |  |
+| case.rb:15:5:15:28 | After in ... then ... [no-match] | case.rb:16:5:16:10 | else ... |  |
 | case.rb:15:5:15:28 | in ... then ... | case.rb:15:8:15:8 | x |  |
-| case.rb:15:8:15:8 | x | case.rb:15:17:15:17 | x | match |
+| case.rb:15:8:15:8 | After x [match] | case.rb:15:5:15:28 | After in ... then ... [match] | match |
+| case.rb:15:8:15:8 | After x [no-match] | case.rb:15:5:15:28 | After in ... then ... [no-match] | no-match |
+| case.rb:15:8:15:8 | x | case.rb:15:8:15:8 | After x [match] | match |
+| case.rb:15:8:15:8 | x | case.rb:15:8:15:8 | After x [no-match] | no-match |
 | case.rb:15:17:15:17 | x | case.rb:15:21:15:21 | 0 |  |
-| case.rb:15:17:15:21 | ... < ... | case.rb:15:28:15:28 | 7 | false |
-| case.rb:15:17:15:21 | ... < ... | case.rb:16:10:16:10 | 8 | true |
+| case.rb:15:17:15:21 | ... < ... | case.rb:15:17:15:21 | After ... < ... [false] | false |
+| case.rb:15:17:15:21 | ... < ... | case.rb:15:17:15:21 | After ... < ... [true] | true |
+| case.rb:15:17:15:21 | After ... < ... [false] | case.rb:16:5:16:10 | else ... |  |
+| case.rb:15:17:15:21 | After ... < ... [true] | case.rb:15:23:15:28 | then ... |  |
+| case.rb:15:17:15:21 | Before ... < ... | case.rb:15:17:15:17 | x |  |
 | case.rb:15:21:15:21 | 0 | case.rb:15:17:15:21 | ... < ... |  |
-| case.rb:15:23:15:28 | then ... | case.rb:9:3:17:5 | case ... |  |
-| case.rb:15:28:15:28 | 7 | case.rb:15:23:15:28 | then ... |  |
-| case.rb:16:5:16:10 | else ... | case.rb:9:3:17:5 | case ... |  |
-| case.rb:16:10:16:10 | 8 | case.rb:16:5:16:10 | else ... |  |
+| case.rb:15:23:15:28 | After then ... | case.rb:9:3:17:5 | After case ... |  |
+| case.rb:15:23:15:28 | then ... | case.rb:15:28:15:28 | 7 |  |
+| case.rb:15:28:15:28 | 7 | case.rb:15:23:15:28 | After then ... |  |
+| case.rb:16:5:16:10 | After else ... | case.rb:9:3:17:5 | After case ... |  |
+| case.rb:16:5:16:10 | After else ... [match] | case.rb:16:5:16:10 | else ... |  |
+| case.rb:16:5:16:10 | else ... | case.rb:16:5:16:10 | After else ... [match] | match |
+| case.rb:16:5:16:10 | else ... | case.rb:16:10:16:10 | 8 |  |
+| case.rb:16:10:16:10 | 8 | case.rb:16:5:16:10 | After else ... |  |
+| case.rb:20:1:24:3 | Entry | case.rb:20:25:20:29 | value |  |
+| case.rb:20:1:24:3 | Normal Exit | case.rb:20:1:24:3 | Exit |  |
 | case.rb:20:1:24:3 | case_match_no_match | case.rb:26:1:30:3 | case_match_raise |  |
-| case.rb:20:1:24:3 | enter case_match_no_match | case.rb:20:25:20:29 | value |  |
-| case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | case.rb:20:1:24:3 | exit case_match_no_match |  |
-| case.rb:20:1:24:3 | exit case_match_no_match (normal) | case.rb:20:1:24:3 | exit case_match_no_match |  |
-| case.rb:20:25:20:29 | value | case.rb:21:8:21:12 | value |  |
-| case.rb:21:3:23:5 | case ... | case.rb:20:1:24:3 | exit case_match_no_match (normal) |  |
+| case.rb:20:25:20:29 | value | case.rb:21:3:23:5 | ... |  |
+| case.rb:21:3:23:5 | ... | case.rb:21:3:23:5 | case ... |  |
+| case.rb:21:3:23:5 | After ... | case.rb:20:1:24:3 | Normal Exit |  |
+| case.rb:21:3:23:5 | After case ... | case.rb:21:3:23:5 | After ... |  |
+| case.rb:21:3:23:5 | case ... | case.rb:21:8:21:12 | value |  |
 | case.rb:21:8:21:12 | value | case.rb:22:5:22:8 | in ... then ... |  |
+| case.rb:22:5:22:8 | After in ... then ... [match] | case.rb:21:3:23:5 | After case ... |  |
+| case.rb:22:5:22:8 | After in ... then ... [no-match] | case.rb:21:3:23:5 | After case ... |  |
 | case.rb:22:5:22:8 | in ... then ... | case.rb:22:8:22:8 | 1 |  |
-| case.rb:22:8:22:8 | 1 | case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | exception |
-| case.rb:22:8:22:8 | 1 | case.rb:21:3:23:5 | case ... | match |
+| case.rb:22:8:22:8 | 1 | case.rb:22:8:22:8 | After 1 [match] | match |
+| case.rb:22:8:22:8 | 1 | case.rb:22:8:22:8 | After 1 [no-match] | no-match |
+| case.rb:22:8:22:8 | After 1 [match] | case.rb:22:5:22:8 | After in ... then ... [match] | match |
+| case.rb:22:8:22:8 | After 1 [no-match] | case.rb:22:5:22:8 | After in ... then ... [no-match] | no-match |
+| case.rb:26:1:30:3 | Entry | case.rb:26:22:26:26 | value |  |
+| case.rb:26:1:30:3 | Normal Exit | case.rb:26:1:30:3 | Exit |  |
 | case.rb:26:1:30:3 | case_match_raise | case.rb:32:1:39:3 | case_match_array |  |
-| case.rb:26:1:30:3 | enter case_match_raise | case.rb:26:22:26:26 | value |  |
-| case.rb:26:1:30:3 | exit case_match_raise (abnormal) | case.rb:26:1:30:3 | exit case_match_raise |  |
-| case.rb:26:1:30:3 | exit case_match_raise (normal) | case.rb:26:1:30:3 | exit case_match_raise |  |
-| case.rb:26:22:26:26 | value | case.rb:27:8:27:12 | value |  |
-| case.rb:27:3:29:5 | case ... | case.rb:26:1:30:3 | exit case_match_raise (normal) |  |
+| case.rb:26:22:26:26 | value | case.rb:27:3:29:5 | ... |  |
+| case.rb:27:3:29:5 | ... | case.rb:27:3:29:5 | case ... |  |
+| case.rb:27:3:29:5 | After ... | case.rb:26:1:30:3 | Normal Exit |  |
+| case.rb:27:3:29:5 | After case ... | case.rb:27:3:29:5 | After ... |  |
+| case.rb:27:3:29:5 | case ... | case.rb:27:8:27:12 | value |  |
 | case.rb:27:8:27:12 | value | case.rb:28:4:28:28 | in ... then ... |  |
+| case.rb:28:4:28:28 | After in ... then ... [match] | case.rb:27:3:29:5 | After case ... |  |
+| case.rb:28:4:28:28 | After in ... then ... [no-match] | case.rb:27:3:29:5 | After case ... |  |
 | case.rb:28:4:28:28 | in ... then ... | case.rb:28:7:28:28 | -> { ... } |  |
-| case.rb:28:7:28:28 | -> { ... } | case.rb:26:1:30:3 | exit case_match_raise (abnormal) | exception |
-| case.rb:28:7:28:28 | -> { ... } | case.rb:27:3:29:5 | case ... | match |
-| case.rb:28:7:28:28 | enter -> { ... } | case.rb:28:10:28:10 | x |  |
-| case.rb:28:7:28:28 | exit -> { ... } (abnormal) | case.rb:28:7:28:28 | exit -> { ... } |  |
-| case.rb:28:10:28:10 | x | case.rb:28:14:28:25 | self |  |
-| case.rb:28:14:28:25 | call to raise | case.rb:28:7:28:28 | exit -> { ... } (abnormal) | exception |
-| case.rb:28:14:28:25 | self | case.rb:28:21:28:24 | oops |  |
-| case.rb:28:20:28:25 | "oops" | case.rb:28:14:28:25 | call to raise |  |
+| case.rb:28:7:28:28 | -> { ... } | case.rb:28:7:28:28 | After -> { ... } [match] | match |
+| case.rb:28:7:28:28 | -> { ... } | case.rb:28:7:28:28 | After -> { ... } [no-match] | no-match |
+| case.rb:28:7:28:28 | After -> { ... } [match] | case.rb:28:4:28:28 | After in ... then ... [match] | match |
+| case.rb:28:7:28:28 | After -> { ... } [no-match] | case.rb:28:4:28:28 | After in ... then ... [no-match] | no-match |
+| case.rb:28:7:28:28 | Entry | case.rb:28:10:28:10 | x |  |
+| case.rb:28:7:28:28 | Exceptional Exit | case.rb:28:7:28:28 | Exit |  |
+| case.rb:28:10:28:10 | x | case.rb:28:14:28:25 | ... |  |
+| case.rb:28:14:28:25 | ... | case.rb:28:14:28:25 | Before call to raise |  |
+| case.rb:28:14:28:25 | Before call to raise | case.rb:28:14:28:25 | self |  |
+| case.rb:28:14:28:25 | call to raise | case.rb:28:7:28:28 | Exceptional Exit | exception |
+| case.rb:28:14:28:25 | self | case.rb:28:20:28:25 | Before "oops" |  |
+| case.rb:28:20:28:25 | "oops" | case.rb:28:20:28:25 | After "oops" |  |
+| case.rb:28:20:28:25 | After "oops" | case.rb:28:14:28:25 | call to raise |  |
+| case.rb:28:20:28:25 | Before "oops" | case.rb:28:21:28:24 | oops |  |
 | case.rb:28:21:28:24 | oops | case.rb:28:20:28:25 | "oops" |  |
+| case.rb:32:1:39:3 | Entry | case.rb:32:22:32:26 | value |  |
+| case.rb:32:1:39:3 | Normal Exit | case.rb:32:1:39:3 | Exit |  |
 | case.rb:32:1:39:3 | case_match_array | case.rb:41:1:45:3 | case_match_find |  |
-| case.rb:32:1:39:3 | enter case_match_array | case.rb:32:22:32:26 | value |  |
-| case.rb:32:1:39:3 | exit case_match_array (abnormal) | case.rb:32:1:39:3 | exit case_match_array |  |
-| case.rb:32:1:39:3 | exit case_match_array (normal) | case.rb:32:1:39:3 | exit case_match_array |  |
-| case.rb:32:22:32:26 | value | case.rb:33:8:33:12 | value |  |
-| case.rb:33:3:38:5 | case ... | case.rb:32:1:39:3 | exit case_match_array (normal) |  |
+| case.rb:32:22:32:26 | value | case.rb:33:3:38:5 | ... |  |
+| case.rb:33:3:38:5 | ... | case.rb:33:3:38:5 | case ... |  |
+| case.rb:33:3:38:5 | After ... | case.rb:32:1:39:3 | Normal Exit |  |
+| case.rb:33:3:38:5 | After case ... | case.rb:33:3:38:5 | After ... |  |
+| case.rb:33:3:38:5 | case ... | case.rb:33:8:33:12 | value |  |
 | case.rb:33:8:33:12 | value | case.rb:34:5:34:10 | in ... then ... |  |
+| case.rb:34:5:34:10 | After in ... then ... [match] | case.rb:33:3:38:5 | After case ... |  |
+| case.rb:34:5:34:10 | After in ... then ... [no-match] | case.rb:35:5:35:11 | in ... then ... |  |
 | case.rb:34:5:34:10 | in ... then ... | case.rb:34:8:34:9 | [ ..., * ] |  |
-| case.rb:34:8:34:9 | [ ..., * ] | case.rb:33:3:38:5 | case ... | match |
-| case.rb:34:8:34:9 | [ ..., * ] | case.rb:35:5:35:11 | in ... then ... | no-match |
+| case.rb:34:8:34:9 | After [ ..., * ] [match] | case.rb:34:5:34:10 | After in ... then ... [match] | match |
+| case.rb:34:8:34:9 | After [ ..., * ] [no-match] | case.rb:34:5:34:10 | After in ... then ... [no-match] | no-match |
+| case.rb:34:8:34:9 | [ ..., * ] | case.rb:34:8:34:9 | After [ ..., * ] [match] | match |
+| case.rb:34:8:34:9 | [ ..., * ] | case.rb:34:8:34:9 | After [ ..., * ] [no-match] | no-match |
+| case.rb:35:5:35:11 | After in ... then ... [match] | case.rb:33:3:38:5 | After case ... |  |
+| case.rb:35:5:35:11 | After in ... then ... [no-match] | case.rb:36:5:36:13 | in ... then ... |  |
 | case.rb:35:5:35:11 | in ... then ... | case.rb:35:8:35:10 | [ ..., * ] |  |
-| case.rb:35:8:35:10 | [ ..., * ] | case.rb:35:9:35:9 | x | false, match, true |
-| case.rb:35:8:35:10 | [ ..., * ] | case.rb:36:5:36:13 | in ... then ... | no-match |
-| case.rb:35:9:35:9 | x | case.rb:33:3:38:5 | case ... | match |
+| case.rb:35:8:35:10 | After [ ..., * ] [match] | case.rb:35:5:35:11 | After in ... then ... [match] | match |
+| case.rb:35:8:35:10 | After [ ..., * ] [no-match] | case.rb:35:5:35:11 | After in ... then ... [no-match] | no-match |
+| case.rb:35:8:35:10 | [ ..., * ] | case.rb:35:9:35:9 | x |  |
+| case.rb:35:9:35:9 | x | case.rb:35:8:35:10 | After [ ..., * ] [match] | match |
+| case.rb:35:9:35:9 | x | case.rb:35:8:35:10 | After [ ..., * ] [no-match] | no-match |
+| case.rb:36:5:36:13 | After in ... then ... [match] | case.rb:33:3:38:5 | After case ... |  |
+| case.rb:36:5:36:13 | After in ... then ... [no-match] | case.rb:37:5:37:27 | in ... then ... |  |
 | case.rb:36:5:36:13 | in ... then ... | case.rb:36:8:36:12 | [ ..., * ] |  |
-| case.rb:36:8:36:12 | [ ..., * ] | case.rb:36:9:36:9 | x | false, match, true |
-| case.rb:36:8:36:12 | [ ..., * ] | case.rb:37:5:37:27 | in ... then ... | no-match |
-| case.rb:36:9:36:9 | x | case.rb:33:3:38:5 | case ... | match |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:37:8:37:10 | Bar |  |
-| case.rb:37:8:37:10 | Bar | case.rb:32:1:39:3 | exit case_match_array (abnormal) | exception |
-| case.rb:37:8:37:10 | Bar | case.rb:37:8:37:26 | [ ..., * ] | match |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:32:1:39:3 | exit case_match_array (abnormal) | exception |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:12:37:12 | a | false, match, true |
-| case.rb:37:12:37:12 | a | case.rb:37:15:37:15 | b | match |
-| case.rb:37:15:37:15 | b | case.rb:37:19:37:19 | c | match |
+| case.rb:36:8:36:12 | After [ ..., * ] [match] | case.rb:36:5:36:13 | After in ... then ... [match] | match |
+| case.rb:36:8:36:12 | After [ ..., * ] [no-match] | case.rb:36:5:36:13 | After in ... then ... [no-match] | no-match |
+| case.rb:36:8:36:12 | [ ..., * ] | case.rb:36:9:36:9 | x |  |
+| case.rb:36:9:36:9 | x | case.rb:36:8:36:12 | After [ ..., * ] [match] | match |
+| case.rb:36:9:36:9 | x | case.rb:36:8:36:12 | After [ ..., * ] [no-match] | no-match |
+| case.rb:37:5:37:27 | After in ... then ... [match] | case.rb:33:3:38:5 | After case ... |  |
+| case.rb:37:5:37:27 | After in ... then ... [no-match] | case.rb:33:3:38:5 | After case ... |  |
+| case.rb:37:5:37:27 | in ... then ... | case.rb:37:8:37:26 | [ ..., * ] |  |
+| case.rb:37:8:37:10 | Bar | case.rb:37:12:37:12 | a |  |
+| case.rb:37:8:37:26 | After [ ..., * ] [match] | case.rb:37:5:37:27 | After in ... then ... [match] | match |
+| case.rb:37:8:37:26 | After [ ..., * ] [no-match] | case.rb:37:5:37:27 | After in ... then ... [no-match] | no-match |
+| case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:8:37:10 | Bar |  |
+| case.rb:37:12:37:12 | a | case.rb:37:15:37:15 | b |  |
+| case.rb:37:15:37:15 | b | case.rb:37:19:37:19 | c |  |
 | case.rb:37:19:37:19 | c | case.rb:37:22:37:22 | d |  |
-| case.rb:37:22:37:22 | d | case.rb:37:25:37:25 | e | match |
-| case.rb:37:25:37:25 | e | case.rb:33:3:38:5 | case ... | match |
+| case.rb:37:22:37:22 | d | case.rb:37:25:37:25 | e |  |
+| case.rb:37:25:37:25 | e | case.rb:37:8:37:26 | After [ ..., * ] [match] | match |
+| case.rb:37:25:37:25 | e | case.rb:37:8:37:26 | After [ ..., * ] [no-match] | no-match |
+| case.rb:41:1:45:3 | Entry | case.rb:41:21:41:25 | value |  |
+| case.rb:41:1:45:3 | Normal Exit | case.rb:41:1:45:3 | Exit |  |
 | case.rb:41:1:45:3 | case_match_find | case.rb:47:1:53:3 | case_match_hash |  |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:41:21:41:25 | value |  |
-| case.rb:41:1:45:3 | exit case_match_find (abnormal) | case.rb:41:1:45:3 | exit case_match_find |  |
-| case.rb:41:1:45:3 | exit case_match_find (normal) | case.rb:41:1:45:3 | exit case_match_find |  |
-| case.rb:41:21:41:25 | value | case.rb:42:8:42:12 | value |  |
-| case.rb:42:3:44:5 | case ... | case.rb:41:1:45:3 | exit case_match_find (normal) |  |
+| case.rb:41:21:41:25 | value | case.rb:42:3:44:5 | ... |  |
+| case.rb:42:3:44:5 | ... | case.rb:42:3:44:5 | case ... |  |
+| case.rb:42:3:44:5 | After ... | case.rb:41:1:45:3 | Normal Exit |  |
+| case.rb:42:3:44:5 | After case ... | case.rb:42:3:44:5 | After ... |  |
+| case.rb:42:3:44:5 | case ... | case.rb:42:8:42:12 | value |  |
 | case.rb:42:8:42:12 | value | case.rb:43:5:43:22 | in ... then ... |  |
+| case.rb:43:5:43:22 | After in ... then ... [match] | case.rb:42:3:44:5 | After case ... |  |
+| case.rb:43:5:43:22 | After in ... then ... [no-match] | case.rb:42:3:44:5 | After case ... |  |
 | case.rb:43:5:43:22 | in ... then ... | case.rb:43:8:43:21 | [ *,...,* ] |  |
-| case.rb:43:8:43:21 | [ *,...,* ] | case.rb:41:1:45:3 | exit case_match_find (abnormal) | exception |
-| case.rb:43:8:43:21 | [ *,...,* ] | case.rb:43:10:43:10 | x | false, match, true |
+| case.rb:43:8:43:21 | After [ *,...,* ] [match] | case.rb:43:5:43:22 | After in ... then ... [match] | match |
+| case.rb:43:8:43:21 | After [ *,...,* ] [no-match] | case.rb:43:5:43:22 | After in ... then ... [no-match] | no-match |
+| case.rb:43:8:43:21 | [ *,...,* ] | case.rb:43:10:43:10 | x |  |
 | case.rb:43:10:43:10 | x | case.rb:43:13:43:13 | 1 |  |
-| case.rb:43:13:43:13 | 1 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | exception |
-| case.rb:43:13:43:13 | 1 | case.rb:43:16:43:16 | 2 | match |
-| case.rb:43:16:43:16 | 2 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | exception |
-| case.rb:43:16:43:16 | 2 | case.rb:43:20:43:20 | y | match |
-| case.rb:43:20:43:20 | y | case.rb:42:3:44:5 | case ... |  |
+| case.rb:43:13:43:13 | 1 | case.rb:43:16:43:16 | 2 |  |
+| case.rb:43:16:43:16 | 2 | case.rb:43:20:43:20 | y |  |
+| case.rb:43:20:43:20 | y | case.rb:43:8:43:21 | After [ *,...,* ] [match] | match |
+| case.rb:43:20:43:20 | y | case.rb:43:8:43:21 | After [ *,...,* ] [no-match] | no-match |
+| case.rb:47:1:53:3 | Entry | case.rb:47:21:47:25 | value |  |
+| case.rb:47:1:53:3 | Normal Exit | case.rb:47:1:53:3 | Exit |  |
 | case.rb:47:1:53:3 | case_match_hash | case.rb:55:1:61:3 | case_match_variable |  |
-| case.rb:47:1:53:3 | enter case_match_hash | case.rb:47:21:47:25 | value |  |
-| case.rb:47:1:53:3 | exit case_match_hash (abnormal) | case.rb:47:1:53:3 | exit case_match_hash |  |
-| case.rb:47:1:53:3 | exit case_match_hash (normal) | case.rb:47:1:53:3 | exit case_match_hash |  |
-| case.rb:47:21:47:25 | value | case.rb:48:8:48:12 | value |  |
-| case.rb:48:3:52:5 | case ... | case.rb:47:1:53:3 | exit case_match_hash (normal) |  |
+| case.rb:47:21:47:25 | value | case.rb:48:3:52:5 | ... |  |
+| case.rb:48:3:52:5 | ... | case.rb:48:3:52:5 | case ... |  |
+| case.rb:48:3:52:5 | After ... | case.rb:47:1:53:3 | Normal Exit |  |
+| case.rb:48:3:52:5 | After case ... | case.rb:48:3:52:5 | After ... |  |
+| case.rb:48:3:52:5 | case ... | case.rb:48:8:48:12 | value |  |
 | case.rb:48:8:48:12 | value | case.rb:49:5:49:35 | in ... then ... |  |
-| case.rb:49:5:49:35 | in ... then ... | case.rb:49:8:49:10 | Foo |  |
+| case.rb:49:5:49:35 | After in ... then ... [match] | case.rb:48:3:52:5 | After case ... |  |
+| case.rb:49:5:49:35 | After in ... then ... [no-match] | case.rb:50:5:50:25 | in ... then ... |  |
+| case.rb:49:5:49:35 | in ... then ... | case.rb:49:8:49:34 | { ..., ** } |  |
 | case.rb:49:8:49:10 | Foo | case.rb:49:8:49:15 | Bar |  |
-| case.rb:49:8:49:15 | Bar | case.rb:49:8:49:34 | { ..., ** } | match |
-| case.rb:49:8:49:15 | Bar | case.rb:50:5:50:25 | in ... then ... | no-match |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:20:49:20 | 1 | false, match, true |
-| case.rb:49:8:49:34 | { ..., ** } | case.rb:50:5:50:25 | in ... then ... | no-match |
-| case.rb:49:20:49:20 | 1 | case.rb:49:23:49:23 | a | match |
-| case.rb:49:20:49:20 | 1 | case.rb:50:5:50:25 | in ... then ... | no-match |
-| case.rb:49:23:49:23 | a | case.rb:49:29:49:32 | rest | match |
-| case.rb:49:29:49:32 | rest | case.rb:48:3:52:5 | case ... |  |
-| case.rb:50:5:50:25 | in ... then ... | case.rb:50:8:50:10 | Bar |  |
-| case.rb:50:8:50:10 | Bar | case.rb:50:8:50:24 | { ..., ** } | match |
-| case.rb:50:8:50:10 | Bar | case.rb:51:5:51:17 | in ... then ... | no-match |
-| case.rb:50:8:50:24 | { ..., ** } | case.rb:50:16:50:16 | 1 | false, match, true |
-| case.rb:50:8:50:24 | { ..., ** } | case.rb:51:5:51:17 | in ... then ... | no-match |
-| case.rb:50:16:50:16 | 1 | case.rb:48:3:52:5 | case ... | match |
-| case.rb:50:16:50:16 | 1 | case.rb:51:5:51:17 | in ... then ... | no-match |
-| case.rb:51:5:51:17 | in ... then ... | case.rb:51:8:51:10 | Bar |  |
-| case.rb:51:8:51:10 | Bar | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | exception |
-| case.rb:51:8:51:10 | Bar | case.rb:51:8:51:16 | { ..., ** } | match |
-| case.rb:51:8:51:16 | { ..., ** } | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | exception |
-| case.rb:51:8:51:16 | { ..., ** } | case.rb:48:3:52:5 | case ... | false, match, true |
+| case.rb:49:8:49:15 | After Bar | case.rb:49:18:49:18 | Before :x |  |
+| case.rb:49:8:49:15 | Bar | case.rb:49:8:49:15 | After Bar |  |
+| case.rb:49:8:49:15 | Before Bar | case.rb:49:8:49:10 | Foo |  |
+| case.rb:49:8:49:34 | After { ..., ** } [match] | case.rb:49:5:49:35 | After in ... then ... [match] | match |
+| case.rb:49:8:49:34 | After { ..., ** } [no-match] | case.rb:49:5:49:35 | After in ... then ... [no-match] | no-match |
+| case.rb:49:8:49:34 | { ..., ** } | case.rb:49:8:49:15 | Before Bar |  |
+| case.rb:49:18:49:18 | :x | case.rb:49:18:49:18 | After :x |  |
+| case.rb:49:18:49:18 | After :x | case.rb:49:20:49:20 | 1 |  |
+| case.rb:49:18:49:18 | Before :x | case.rb:49:18:49:18 | x |  |
+| case.rb:49:18:49:18 | x | case.rb:49:18:49:18 | :x |  |
+| case.rb:49:20:49:20 | 1 | case.rb:49:23:49:23 | Before :a |  |
+| case.rb:49:23:49:23 | :a | case.rb:49:23:49:23 | After :a |  |
+| case.rb:49:23:49:23 | After :a | case.rb:49:23:49:23 | a |  |
+| case.rb:49:23:49:23 | Before :a | case.rb:49:23:49:23 | a |  |
+| case.rb:49:23:49:23 | a | case.rb:49:23:49:23 | :a |  |
+| case.rb:49:23:49:23 | a | case.rb:49:29:49:32 | rest |  |
+| case.rb:49:29:49:32 | rest | case.rb:49:8:49:34 | After { ..., ** } [match] | match |
+| case.rb:49:29:49:32 | rest | case.rb:49:8:49:34 | After { ..., ** } [no-match] | no-match |
+| case.rb:50:5:50:25 | After in ... then ... [match] | case.rb:48:3:52:5 | After case ... |  |
+| case.rb:50:5:50:25 | After in ... then ... [no-match] | case.rb:51:5:51:17 | in ... then ... |  |
+| case.rb:50:5:50:25 | in ... then ... | case.rb:50:8:50:24 | { ..., ** } |  |
+| case.rb:50:8:50:10 | Bar | case.rb:50:13:50:13 | Before :a |  |
+| case.rb:50:8:50:24 | After { ..., ** } [match] | case.rb:50:5:50:25 | After in ... then ... [match] | match |
+| case.rb:50:8:50:24 | After { ..., ** } [no-match] | case.rb:50:5:50:25 | After in ... then ... [no-match] | no-match |
+| case.rb:50:8:50:24 | { ..., ** } | case.rb:50:8:50:10 | Bar |  |
+| case.rb:50:13:50:13 | :a | case.rb:50:13:50:13 | After :a |  |
+| case.rb:50:13:50:13 | After :a | case.rb:50:16:50:16 | 1 |  |
+| case.rb:50:13:50:13 | Before :a | case.rb:50:13:50:13 | a |  |
+| case.rb:50:13:50:13 | a | case.rb:50:13:50:13 | :a |  |
+| case.rb:50:16:50:16 | 1 | case.rb:50:8:50:24 | After { ..., ** } [match] | match |
+| case.rb:50:16:50:16 | 1 | case.rb:50:8:50:24 | After { ..., ** } [no-match] | no-match |
+| case.rb:51:5:51:17 | After in ... then ... [match] | case.rb:48:3:52:5 | After case ... |  |
+| case.rb:51:5:51:17 | After in ... then ... [no-match] | case.rb:48:3:52:5 | After case ... |  |
+| case.rb:51:5:51:17 | in ... then ... | case.rb:51:8:51:16 | { ..., ** } |  |
+| case.rb:51:8:51:10 | Bar | case.rb:51:8:51:16 | After { ..., ** } [match] | match |
+| case.rb:51:8:51:10 | Bar | case.rb:51:8:51:16 | After { ..., ** } [no-match] | no-match |
+| case.rb:51:8:51:16 | After { ..., ** } [match] | case.rb:51:5:51:17 | After in ... then ... [match] | match |
+| case.rb:51:8:51:16 | After { ..., ** } [no-match] | case.rb:51:5:51:17 | After in ... then ... [no-match] | no-match |
+| case.rb:51:8:51:16 | { ..., ** } | case.rb:51:8:51:10 | Bar |  |
+| case.rb:55:1:61:3 | Entry | case.rb:55:25:55:29 | value |  |
+| case.rb:55:1:61:3 | Normal Exit | case.rb:55:1:61:3 | Exit |  |
 | case.rb:55:1:61:3 | case_match_variable | case.rb:63:1:67:3 | case_match_underscore |  |
-| case.rb:55:1:61:3 | enter case_match_variable | case.rb:55:25:55:29 | value |  |
-| case.rb:55:1:61:3 | exit case_match_variable (normal) | case.rb:55:1:61:3 | exit case_match_variable |  |
-| case.rb:55:25:55:29 | value | case.rb:56:8:56:12 | value |  |
-| case.rb:56:3:60:5 | case ... | case.rb:55:1:61:3 | exit case_match_variable (normal) |  |
+| case.rb:55:25:55:29 | value | case.rb:56:3:60:5 | ... |  |
+| case.rb:56:3:60:5 | ... | case.rb:56:3:60:5 | case ... |  |
+| case.rb:56:3:60:5 | After ... | case.rb:55:1:61:3 | Normal Exit |  |
+| case.rb:56:3:60:5 | After case ... | case.rb:56:3:60:5 | After ... |  |
+| case.rb:56:3:60:5 | case ... | case.rb:56:8:56:12 | value |  |
 | case.rb:56:8:56:12 | value | case.rb:57:5:57:8 | in ... then ... |  |
+| case.rb:57:5:57:8 | After in ... then ... [match] | case.rb:56:3:60:5 | After case ... |  |
+| case.rb:57:5:57:8 | After in ... then ... [no-match] | case.rb:58:5:58:10 | in ... then ... |  |
 | case.rb:57:5:57:8 | in ... then ... | case.rb:57:8:57:8 | 5 |  |
-| case.rb:57:8:57:8 | 5 | case.rb:56:3:60:5 | case ... | match |
-| case.rb:57:8:57:8 | 5 | case.rb:58:5:58:10 | in ... then ... | no-match |
+| case.rb:57:8:57:8 | 5 | case.rb:57:8:57:8 | After 5 [match] | match |
+| case.rb:57:8:57:8 | 5 | case.rb:57:8:57:8 | After 5 [no-match] | no-match |
+| case.rb:57:8:57:8 | After 5 [match] | case.rb:57:5:57:8 | After in ... then ... [match] | match |
+| case.rb:57:8:57:8 | After 5 [no-match] | case.rb:57:5:57:8 | After in ... then ... [no-match] | no-match |
+| case.rb:58:5:58:10 | After in ... then ... [match] | case.rb:56:3:60:5 | After case ... |  |
+| case.rb:58:5:58:10 | After in ... then ... [no-match] | case.rb:59:5:59:20 | in ... then ... |  |
 | case.rb:58:5:58:10 | in ... then ... | case.rb:58:8:58:10 | var |  |
-| case.rb:58:8:58:10 | var | case.rb:56:3:60:5 | case ... | match |
+| case.rb:58:8:58:10 | After var [match] | case.rb:58:5:58:10 | After in ... then ... [match] | match |
+| case.rb:58:8:58:10 | After var [no-match] | case.rb:58:5:58:10 | After in ... then ... [no-match] | no-match |
+| case.rb:58:8:58:10 | var | case.rb:58:8:58:10 | After var [match] | match |
+| case.rb:58:8:58:10 | var | case.rb:58:8:58:10 | After var [no-match] | no-match |
+| case.rb:59:5:59:20 | After in ... then ... [match] | case.rb:56:3:60:5 | After case ... |  |
+| case.rb:59:5:59:20 | After in ... then ... [no-match] | case.rb:56:3:60:5 | After case ... |  |
+| case.rb:59:5:59:20 | in ... then ... | case.rb:59:8:59:20 | Before "unreachable" |  |
+| case.rb:59:8:59:20 | "unreachable" | case.rb:59:8:59:20 | After "unreachable" [match] | match |
+| case.rb:59:8:59:20 | "unreachable" | case.rb:59:8:59:20 | After "unreachable" [no-match] | no-match |
+| case.rb:59:8:59:20 | After "unreachable" [match] | case.rb:59:5:59:20 | After in ... then ... [match] | match |
+| case.rb:59:8:59:20 | After "unreachable" [no-match] | case.rb:59:5:59:20 | After in ... then ... [no-match] | no-match |
+| case.rb:59:8:59:20 | Before "unreachable" | case.rb:59:9:59:19 | unreachable |  |
+| case.rb:59:9:59:19 | unreachable | case.rb:59:8:59:20 | "unreachable" |  |
+| case.rb:63:1:67:3 | Entry | case.rb:63:27:63:31 | value |  |
+| case.rb:63:1:67:3 | Normal Exit | case.rb:63:1:67:3 | Exit |  |
 | case.rb:63:1:67:3 | case_match_underscore | case.rb:69:1:93:3 | case_match_various |  |
-| case.rb:63:1:67:3 | enter case_match_underscore | case.rb:63:27:63:31 | value |  |
-| case.rb:63:1:67:3 | exit case_match_underscore (normal) | case.rb:63:1:67:3 | exit case_match_underscore |  |
-| case.rb:63:27:63:31 | value | case.rb:64:8:64:12 | value |  |
-| case.rb:64:3:66:5 | case ... | case.rb:63:1:67:3 | exit case_match_underscore (normal) |  |
+| case.rb:63:27:63:31 | value | case.rb:64:3:66:5 | ... |  |
+| case.rb:64:3:66:5 | ... | case.rb:64:3:66:5 | case ... |  |
+| case.rb:64:3:66:5 | After ... | case.rb:63:1:67:3 | Normal Exit |  |
+| case.rb:64:3:66:5 | After case ... | case.rb:64:3:66:5 | After ... |  |
+| case.rb:64:3:66:5 | case ... | case.rb:64:8:64:12 | value |  |
 | case.rb:64:8:64:12 | value | case.rb:65:5:65:28 | in ... then ... |  |
+| case.rb:65:5:65:28 | After in ... then ... [match] | case.rb:64:3:66:5 | After case ... |  |
+| case.rb:65:5:65:28 | After in ... then ... [no-match] | case.rb:64:3:66:5 | After case ... |  |
 | case.rb:65:5:65:28 | in ... then ... | case.rb:65:8:65:28 | ... \| ... |  |
-| case.rb:65:8:65:8 | 5 | case.rb:64:3:66:5 | case ... | match |
-| case.rb:65:8:65:8 | 5 | case.rb:65:12:65:12 | _ | no-match |
+| case.rb:65:8:65:8 | 5 | case.rb:65:12:65:12 | _ |  |
 | case.rb:65:8:65:28 | ... \| ... | case.rb:65:8:65:8 | 5 |  |
-| case.rb:65:12:65:12 | _ | case.rb:64:3:66:5 | case ... | match |
+| case.rb:65:8:65:28 | After ... \| ... [match] | case.rb:65:5:65:28 | After in ... then ... [match] | match |
+| case.rb:65:8:65:28 | After ... \| ... [no-match] | case.rb:65:5:65:28 | After in ... then ... [no-match] | no-match |
+| case.rb:65:12:65:12 | _ | case.rb:65:16:65:28 | Before "unreachable" |  |
+| case.rb:65:16:65:28 | "unreachable" | case.rb:65:16:65:28 | After "unreachable" |  |
+| case.rb:65:16:65:28 | After "unreachable" | case.rb:65:8:65:28 | After ... \| ... [match] | match |
+| case.rb:65:16:65:28 | After "unreachable" | case.rb:65:8:65:28 | After ... \| ... [no-match] | no-match |
+| case.rb:65:16:65:28 | Before "unreachable" | case.rb:65:17:65:27 | unreachable |  |
+| case.rb:65:17:65:27 | unreachable | case.rb:65:16:65:28 | "unreachable" |  |
+| case.rb:69:1:93:3 | Entry | case.rb:69:24:69:28 | value |  |
+| case.rb:69:1:93:3 | Normal Exit | case.rb:69:1:93:3 | Exit |  |
 | case.rb:69:1:93:3 | case_match_various | case.rb:95:1:99:3 | case_match_guard_no_else |  |
-| case.rb:69:1:93:3 | enter case_match_various | case.rb:69:24:69:28 | value |  |
-| case.rb:69:1:93:3 | exit case_match_various (abnormal) | case.rb:69:1:93:3 | exit case_match_various |  |
-| case.rb:69:1:93:3 | exit case_match_various (normal) | case.rb:69:1:93:3 | exit case_match_various |  |
-| case.rb:69:24:69:28 | value | case.rb:70:3:70:5 | foo |  |
+| case.rb:69:24:69:28 | value | case.rb:70:3:92:5 | ... |  |
 | case.rb:70:3:70:5 | foo | case.rb:70:9:70:10 | 42 |  |
-| case.rb:70:3:70:10 | ... = ... | case.rb:72:8:72:12 | value |  |
+| case.rb:70:3:70:10 | ... = ... | case.rb:70:3:70:10 | After ... = ... |  |
+| case.rb:70:3:70:10 | After ... = ... | case.rb:72:3:92:5 | case ... |  |
+| case.rb:70:3:70:10 | Before ... = ... | case.rb:70:3:70:5 | foo |  |
+| case.rb:70:3:92:5 | ... | case.rb:70:3:70:10 | Before ... = ... |  |
+| case.rb:70:3:92:5 | After ... | case.rb:69:1:93:3 | Normal Exit |  |
 | case.rb:70:9:70:10 | 42 | case.rb:70:3:70:10 | ... = ... |  |
-| case.rb:72:3:92:5 | case ... | case.rb:69:1:93:3 | exit case_match_various (normal) |  |
+| case.rb:72:3:92:5 | After case ... | case.rb:70:3:92:5 | After ... |  |
+| case.rb:72:3:92:5 | case ... | case.rb:72:8:72:12 | value |  |
 | case.rb:72:8:72:12 | value | case.rb:73:5:73:8 | in ... then ... |  |
+| case.rb:73:5:73:8 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:73:5:73:8 | After in ... then ... [no-match] | case.rb:74:5:74:11 | in ... then ... |  |
 | case.rb:73:5:73:8 | in ... then ... | case.rb:73:8:73:8 | 5 |  |
-| case.rb:73:8:73:8 | 5 | case.rb:72:3:92:5 | case ... | match |
-| case.rb:73:8:73:8 | 5 | case.rb:74:5:74:11 | in ... then ... | no-match |
+| case.rb:73:8:73:8 | 5 | case.rb:73:8:73:8 | After 5 [match] | match |
+| case.rb:73:8:73:8 | 5 | case.rb:73:8:73:8 | After 5 [no-match] | no-match |
+| case.rb:73:8:73:8 | After 5 [match] | case.rb:73:5:73:8 | After in ... then ... [match] | match |
+| case.rb:73:8:73:8 | After 5 [no-match] | case.rb:73:5:73:8 | After in ... then ... [no-match] | no-match |
+| case.rb:74:5:74:11 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:74:5:74:11 | After in ... then ... [no-match] | case.rb:75:5:75:15 | in ... then ... |  |
 | case.rb:74:5:74:11 | in ... then ... | case.rb:74:8:74:11 | ^... |  |
+| case.rb:74:8:74:11 | After ^... [match] | case.rb:74:5:74:11 | After in ... then ... [match] | match |
+| case.rb:74:8:74:11 | After ^... [no-match] | case.rb:74:5:74:11 | After in ... then ... [no-match] | no-match |
 | case.rb:74:8:74:11 | ^... | case.rb:74:9:74:11 | foo |  |
-| case.rb:74:9:74:11 | foo | case.rb:72:3:92:5 | case ... | match |
-| case.rb:74:9:74:11 | foo | case.rb:75:5:75:15 | in ... then ... | no-match |
-| case.rb:75:5:75:15 | in ... then ... | case.rb:75:9:75:14 | string |  |
-| case.rb:75:8:75:15 | "string" | case.rb:72:3:92:5 | case ... | match |
-| case.rb:75:8:75:15 | "string" | case.rb:76:5:76:18 | in ... then ... | no-match |
+| case.rb:74:9:74:11 | foo | case.rb:74:8:74:11 | After ^... [match] | match |
+| case.rb:74:9:74:11 | foo | case.rb:74:8:74:11 | After ^... [no-match] | no-match |
+| case.rb:75:5:75:15 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:75:5:75:15 | After in ... then ... [no-match] | case.rb:76:5:76:18 | in ... then ... |  |
+| case.rb:75:5:75:15 | in ... then ... | case.rb:75:8:75:15 | Before "string" |  |
+| case.rb:75:8:75:15 | "string" | case.rb:75:8:75:15 | After "string" [match] | match |
+| case.rb:75:8:75:15 | "string" | case.rb:75:8:75:15 | After "string" [no-match] | no-match |
+| case.rb:75:8:75:15 | After "string" [match] | case.rb:75:5:75:15 | After in ... then ... [match] | match |
+| case.rb:75:8:75:15 | After "string" [no-match] | case.rb:75:5:75:15 | After in ... then ... [no-match] | no-match |
+| case.rb:75:8:75:15 | Before "string" | case.rb:75:9:75:14 | string |  |
 | case.rb:75:9:75:14 | string | case.rb:75:8:75:15 | "string" |  |
-| case.rb:76:5:76:18 | in ... then ... | case.rb:76:8:76:18 | Array |  |
-| case.rb:76:8:76:18 | Array | case.rb:76:11:76:13 | foo |  |
-| case.rb:76:8:76:18 | call to [] | case.rb:72:3:92:5 | case ... | match |
-| case.rb:76:8:76:18 | call to [] | case.rb:77:5:77:18 | in ... then ... | no-match |
-| case.rb:76:11:76:13 | "foo" | case.rb:76:15:76:17 | bar |  |
+| case.rb:76:5:76:18 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:76:5:76:18 | After in ... then ... [no-match] | case.rb:77:5:77:18 | in ... then ... |  |
+| case.rb:76:5:76:18 | in ... then ... | case.rb:76:8:76:18 | Before call to [] |  |
+| case.rb:76:8:76:18 | After call to [] [match] | case.rb:76:5:76:18 | After in ... then ... [match] | match |
+| case.rb:76:8:76:18 | After call to [] [no-match] | case.rb:76:5:76:18 | After in ... then ... [no-match] | no-match |
+| case.rb:76:8:76:18 | Array | case.rb:76:11:76:13 | Before "foo" |  |
+| case.rb:76:8:76:18 | Before call to [] | case.rb:76:8:76:18 | Array |  |
+| case.rb:76:8:76:18 | call to [] | case.rb:76:8:76:18 | After call to [] [match] | match |
+| case.rb:76:8:76:18 | call to [] | case.rb:76:8:76:18 | After call to [] [no-match] | no-match |
+| case.rb:76:11:76:13 | "foo" | case.rb:76:11:76:13 | After "foo" |  |
+| case.rb:76:11:76:13 | After "foo" | case.rb:76:15:76:17 | Before "bar" |  |
+| case.rb:76:11:76:13 | Before "foo" | case.rb:76:11:76:13 | foo |  |
 | case.rb:76:11:76:13 | foo | case.rb:76:11:76:13 | "foo" |  |
-| case.rb:76:15:76:17 | "bar" | case.rb:76:8:76:18 | call to [] |  |
+| case.rb:76:15:76:17 | "bar" | case.rb:76:15:76:17 | After "bar" |  |
+| case.rb:76:15:76:17 | After "bar" | case.rb:76:8:76:18 | call to [] |  |
+| case.rb:76:15:76:17 | Before "bar" | case.rb:76:15:76:17 | bar |  |
 | case.rb:76:15:76:17 | bar | case.rb:76:15:76:17 | "bar" |  |
-| case.rb:77:5:77:18 | in ... then ... | case.rb:77:8:77:18 | Array |  |
-| case.rb:77:8:77:18 | Array | case.rb:77:11:77:13 | foo |  |
-| case.rb:77:8:77:18 | call to [] | case.rb:72:3:92:5 | case ... | match |
-| case.rb:77:8:77:18 | call to [] | case.rb:78:5:78:19 | in ... then ... | no-match |
-| case.rb:77:11:77:13 | :"foo" | case.rb:77:15:77:17 | bar |  |
+| case.rb:77:5:77:18 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:77:5:77:18 | After in ... then ... [no-match] | case.rb:78:5:78:19 | in ... then ... |  |
+| case.rb:77:5:77:18 | in ... then ... | case.rb:77:8:77:18 | Before call to [] |  |
+| case.rb:77:8:77:18 | After call to [] [match] | case.rb:77:5:77:18 | After in ... then ... [match] | match |
+| case.rb:77:8:77:18 | After call to [] [no-match] | case.rb:77:5:77:18 | After in ... then ... [no-match] | no-match |
+| case.rb:77:8:77:18 | Array | case.rb:77:11:77:13 | Before :"foo" |  |
+| case.rb:77:8:77:18 | Before call to [] | case.rb:77:8:77:18 | Array |  |
+| case.rb:77:8:77:18 | call to [] | case.rb:77:8:77:18 | After call to [] [match] | match |
+| case.rb:77:8:77:18 | call to [] | case.rb:77:8:77:18 | After call to [] [no-match] | no-match |
+| case.rb:77:11:77:13 | :"foo" | case.rb:77:11:77:13 | After :"foo" |  |
+| case.rb:77:11:77:13 | After :"foo" | case.rb:77:15:77:17 | Before :"bar" |  |
+| case.rb:77:11:77:13 | Before :"foo" | case.rb:77:11:77:13 | foo |  |
 | case.rb:77:11:77:13 | foo | case.rb:77:11:77:13 | :"foo" |  |
-| case.rb:77:15:77:17 | :"bar" | case.rb:77:8:77:18 | call to [] |  |
+| case.rb:77:15:77:17 | :"bar" | case.rb:77:15:77:17 | After :"bar" |  |
+| case.rb:77:15:77:17 | After :"bar" | case.rb:77:8:77:18 | call to [] |  |
+| case.rb:77:15:77:17 | Before :"bar" | case.rb:77:15:77:17 | bar |  |
 | case.rb:77:15:77:17 | bar | case.rb:77:15:77:17 | :"bar" |  |
-| case.rb:78:5:78:19 | in ... then ... | case.rb:78:9:78:18 | .*abc[0-9] |  |
-| case.rb:78:8:78:19 | /.*abc[0-9]/ | case.rb:72:3:92:5 | case ... | match |
-| case.rb:78:8:78:19 | /.*abc[0-9]/ | case.rb:79:5:79:14 | in ... then ... | no-match |
+| case.rb:78:5:78:19 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:78:5:78:19 | After in ... then ... [no-match] | case.rb:79:5:79:14 | in ... then ... |  |
+| case.rb:78:5:78:19 | in ... then ... | case.rb:78:8:78:19 | Before /.*abc[0-9]/ |  |
+| case.rb:78:8:78:19 | /.*abc[0-9]/ | case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] | match |
+| case.rb:78:8:78:19 | /.*abc[0-9]/ | case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | no-match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [match] | case.rb:78:5:78:19 | After in ... then ... [match] | match |
+| case.rb:78:8:78:19 | After /.*abc[0-9]/ [no-match] | case.rb:78:5:78:19 | After in ... then ... [no-match] | no-match |
+| case.rb:78:8:78:19 | Before /.*abc[0-9]/ | case.rb:78:9:78:18 | .*abc[0-9] |  |
 | case.rb:78:9:78:18 | .*abc[0-9] | case.rb:78:8:78:19 | /.*abc[0-9]/ |  |
-| case.rb:79:5:79:14 | in ... then ... | case.rb:79:8:79:8 | 5 |  |
+| case.rb:79:5:79:14 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:79:5:79:14 | After in ... then ... [no-match] | case.rb:80:5:80:12 | in ... then ... |  |
+| case.rb:79:5:79:14 | in ... then ... | case.rb:79:8:79:14 | Before _ .. _ |  |
 | case.rb:79:8:79:8 | 5 | case.rb:79:13:79:14 | 10 |  |
-| case.rb:79:8:79:14 | _ .. _ | case.rb:72:3:92:5 | case ... | match |
-| case.rb:79:8:79:14 | _ .. _ | case.rb:80:5:80:12 | in ... then ... | no-match |
+| case.rb:79:8:79:14 | After _ .. _ [match] | case.rb:79:5:79:14 | After in ... then ... [match] | match |
+| case.rb:79:8:79:14 | After _ .. _ [no-match] | case.rb:79:5:79:14 | After in ... then ... [no-match] | no-match |
+| case.rb:79:8:79:14 | Before _ .. _ | case.rb:79:8:79:8 | 5 |  |
+| case.rb:79:8:79:14 | _ .. _ | case.rb:79:8:79:14 | After _ .. _ [match] | match |
+| case.rb:79:8:79:14 | _ .. _ | case.rb:79:8:79:14 | After _ .. _ [no-match] | no-match |
 | case.rb:79:13:79:14 | 10 | case.rb:79:8:79:14 | _ .. _ |  |
-| case.rb:80:5:80:12 | in ... then ... | case.rb:80:11:80:12 | 10 |  |
-| case.rb:80:8:80:12 | _ .. _ | case.rb:72:3:92:5 | case ... | match |
-| case.rb:80:8:80:12 | _ .. _ | case.rb:81:5:81:11 | in ... then ... | no-match |
+| case.rb:80:5:80:12 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:80:5:80:12 | After in ... then ... [no-match] | case.rb:81:5:81:11 | in ... then ... |  |
+| case.rb:80:5:80:12 | in ... then ... | case.rb:80:8:80:12 | Before _ .. _ |  |
+| case.rb:80:8:80:12 | After _ .. _ [match] | case.rb:80:5:80:12 | After in ... then ... [match] | match |
+| case.rb:80:8:80:12 | After _ .. _ [no-match] | case.rb:80:5:80:12 | After in ... then ... [no-match] | no-match |
+| case.rb:80:8:80:12 | Before _ .. _ | case.rb:80:11:80:12 | 10 |  |
+| case.rb:80:8:80:12 | _ .. _ | case.rb:80:8:80:12 | After _ .. _ [match] | match |
+| case.rb:80:8:80:12 | _ .. _ | case.rb:80:8:80:12 | After _ .. _ [no-match] | no-match |
 | case.rb:80:11:80:12 | 10 | case.rb:80:8:80:12 | _ .. _ |  |
-| case.rb:81:5:81:11 | in ... then ... | case.rb:81:8:81:8 | 5 |  |
+| case.rb:81:5:81:11 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:81:5:81:11 | After in ... then ... [no-match] | case.rb:82:5:82:20 | in ... then ... |  |
+| case.rb:81:5:81:11 | in ... then ... | case.rb:81:8:81:11 | Before _ .. _ |  |
 | case.rb:81:8:81:8 | 5 | case.rb:81:8:81:11 | _ .. _ |  |
-| case.rb:81:8:81:11 | _ .. _ | case.rb:72:3:92:5 | case ... | match |
-| case.rb:81:8:81:11 | _ .. _ | case.rb:82:5:82:20 | in ... then ... | no-match |
+| case.rb:81:8:81:11 | After _ .. _ [match] | case.rb:81:5:81:11 | After in ... then ... [match] | match |
+| case.rb:81:8:81:11 | After _ .. _ [no-match] | case.rb:81:5:81:11 | After in ... then ... [no-match] | no-match |
+| case.rb:81:8:81:11 | Before _ .. _ | case.rb:81:8:81:8 | 5 |  |
+| case.rb:81:8:81:11 | _ .. _ | case.rb:81:8:81:11 | After _ .. _ [match] | match |
+| case.rb:81:8:81:11 | _ .. _ | case.rb:81:8:81:11 | After _ .. _ [no-match] | no-match |
+| case.rb:82:5:82:20 | After in ... then ... [match] | case.rb:82:15:82:20 | then ... |  |
+| case.rb:82:5:82:20 | After in ... then ... [no-match] | case.rb:83:5:83:26 | in ... then ... |  |
 | case.rb:82:5:82:20 | in ... then ... | case.rb:82:8:82:13 | ... => ... |  |
-| case.rb:82:8:82:8 | 5 | case.rb:82:13:82:13 | x | match |
-| case.rb:82:8:82:8 | 5 | case.rb:83:5:83:26 | in ... then ... | no-match |
+| case.rb:82:8:82:8 | 5 | case.rb:82:13:82:13 | x |  |
 | case.rb:82:8:82:13 | ... => ... | case.rb:82:8:82:8 | 5 |  |
-| case.rb:82:13:82:13 | x | case.rb:82:20:82:20 | 1 | match |
-| case.rb:82:15:82:20 | then ... | case.rb:72:3:92:5 | case ... |  |
-| case.rb:82:20:82:20 | 1 | case.rb:82:15:82:20 | then ... |  |
+| case.rb:82:8:82:13 | After ... => ... [match] | case.rb:82:5:82:20 | After in ... then ... [match] | match |
+| case.rb:82:8:82:13 | After ... => ... [no-match] | case.rb:82:5:82:20 | After in ... then ... [no-match] | no-match |
+| case.rb:82:13:82:13 | x | case.rb:82:8:82:13 | After ... => ... [match] | match |
+| case.rb:82:13:82:13 | x | case.rb:82:8:82:13 | After ... => ... [no-match] | no-match |
+| case.rb:82:15:82:20 | After then ... | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:82:15:82:20 | then ... | case.rb:82:20:82:20 | 1 |  |
+| case.rb:82:20:82:20 | 1 | case.rb:82:15:82:20 | After then ... |  |
+| case.rb:83:5:83:26 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:83:5:83:26 | After in ... then ... [no-match] | case.rb:84:5:84:17 | in ... then ... |  |
 | case.rb:83:5:83:26 | in ... then ... | case.rb:83:8:83:26 | ... \| ... |  |
-| case.rb:83:8:83:8 | 5 | case.rb:72:3:92:5 | case ... | match |
-| case.rb:83:8:83:8 | 5 | case.rb:83:12:83:15 | ^... | no-match |
+| case.rb:83:8:83:8 | 5 | case.rb:83:12:83:15 | ^... |  |
 | case.rb:83:8:83:26 | ... \| ... | case.rb:83:8:83:8 | 5 |  |
+| case.rb:83:8:83:26 | After ... \| ... [match] | case.rb:83:5:83:26 | After in ... then ... [match] | match |
+| case.rb:83:8:83:26 | After ... \| ... [no-match] | case.rb:83:5:83:26 | After in ... then ... [no-match] | no-match |
+| case.rb:83:12:83:15 | After ^... | case.rb:83:19:83:26 | Before "string" |  |
 | case.rb:83:12:83:15 | ^... | case.rb:83:13:83:15 | foo |  |
-| case.rb:83:13:83:15 | foo | case.rb:72:3:92:5 | case ... | match |
-| case.rb:83:13:83:15 | foo | case.rb:83:20:83:25 | string | no-match |
-| case.rb:83:19:83:26 | "string" | case.rb:72:3:92:5 | case ... | match |
-| case.rb:83:19:83:26 | "string" | case.rb:84:5:84:17 | in ... then ... | no-match |
+| case.rb:83:13:83:15 | foo | case.rb:83:12:83:15 | After ^... |  |
+| case.rb:83:19:83:26 | "string" | case.rb:83:19:83:26 | After "string" |  |
+| case.rb:83:19:83:26 | After "string" | case.rb:83:8:83:26 | After ... \| ... [match] | match |
+| case.rb:83:19:83:26 | After "string" | case.rb:83:8:83:26 | After ... \| ... [no-match] | no-match |
+| case.rb:83:19:83:26 | Before "string" | case.rb:83:20:83:25 | string |  |
 | case.rb:83:20:83:25 | string | case.rb:83:19:83:26 | "string" |  |
-| case.rb:84:5:84:17 | in ... then ... | case.rb:84:8:84:12 | Foo |  |
+| case.rb:84:5:84:17 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:84:5:84:17 | After in ... then ... [no-match] | case.rb:85:5:85:23 | in ... then ... |  |
+| case.rb:84:5:84:17 | in ... then ... | case.rb:84:8:84:17 | Before Bar |  |
 | case.rb:84:8:84:12 | Foo | case.rb:84:8:84:17 | Bar |  |
-| case.rb:84:8:84:17 | Bar | case.rb:72:3:92:5 | case ... | match |
-| case.rb:84:8:84:17 | Bar | case.rb:85:5:85:23 | in ... then ... | no-match |
+| case.rb:84:8:84:17 | After Bar [match] | case.rb:84:5:84:17 | After in ... then ... [match] | match |
+| case.rb:84:8:84:17 | After Bar [no-match] | case.rb:84:5:84:17 | After in ... then ... [no-match] | no-match |
+| case.rb:84:8:84:17 | Bar | case.rb:84:8:84:17 | After Bar [match] | match |
+| case.rb:84:8:84:17 | Bar | case.rb:84:8:84:17 | After Bar [no-match] | no-match |
+| case.rb:84:8:84:17 | Before Bar | case.rb:84:8:84:12 | Foo |  |
+| case.rb:85:5:85:23 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:85:5:85:23 | After in ... then ... [no-match] | case.rb:86:5:86:11 | in ... then ... |  |
 | case.rb:85:5:85:23 | in ... then ... | case.rb:85:8:85:23 | -> { ... } |  |
-| case.rb:85:8:85:23 | -> { ... } | case.rb:72:3:92:5 | case ... | match |
-| case.rb:85:8:85:23 | -> { ... } | case.rb:86:5:86:11 | in ... then ... | no-match |
-| case.rb:85:8:85:23 | enter -> { ... } | case.rb:85:11:85:11 | x |  |
-| case.rb:85:8:85:23 | exit -> { ... } (normal) | case.rb:85:8:85:23 | exit -> { ... } |  |
-| case.rb:85:11:85:11 | x | case.rb:85:15:85:15 | x |  |
+| case.rb:85:8:85:23 | -> { ... } | case.rb:85:8:85:23 | After -> { ... } [match] | match |
+| case.rb:85:8:85:23 | -> { ... } | case.rb:85:8:85:23 | After -> { ... } [no-match] | no-match |
+| case.rb:85:8:85:23 | After -> { ... } [match] | case.rb:85:5:85:23 | After in ... then ... [match] | match |
+| case.rb:85:8:85:23 | After -> { ... } [no-match] | case.rb:85:5:85:23 | After in ... then ... [no-match] | no-match |
+| case.rb:85:8:85:23 | Entry | case.rb:85:11:85:11 | x |  |
+| case.rb:85:8:85:23 | Normal Exit | case.rb:85:8:85:23 | Exit |  |
+| case.rb:85:11:85:11 | x | case.rb:85:15:85:21 | ... |  |
 | case.rb:85:15:85:15 | x | case.rb:85:20:85:21 | 10 |  |
-| case.rb:85:15:85:21 | ... == ... | case.rb:85:8:85:23 | exit -> { ... } (normal) |  |
+| case.rb:85:15:85:21 | ... | case.rb:85:15:85:21 | Before ... == ... |  |
+| case.rb:85:15:85:21 | ... == ... | case.rb:85:15:85:21 | After ... == ... |  |
+| case.rb:85:15:85:21 | After ... | case.rb:85:8:85:23 | Normal Exit |  |
+| case.rb:85:15:85:21 | After ... == ... | case.rb:85:15:85:21 | After ... |  |
+| case.rb:85:15:85:21 | Before ... == ... | case.rb:85:15:85:15 | x |  |
 | case.rb:85:20:85:21 | 10 | case.rb:85:15:85:21 | ... == ... |  |
-| case.rb:86:5:86:11 | in ... then ... | case.rb:86:8:86:11 | foo |  |
-| case.rb:86:8:86:11 | :foo | case.rb:72:3:92:5 | case ... | match |
-| case.rb:86:8:86:11 | :foo | case.rb:87:5:87:17 | in ... then ... | no-match |
+| case.rb:86:5:86:11 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:86:5:86:11 | After in ... then ... [no-match] | case.rb:87:5:87:17 | in ... then ... |  |
+| case.rb:86:5:86:11 | in ... then ... | case.rb:86:8:86:11 | Before :foo |  |
+| case.rb:86:8:86:11 | :foo | case.rb:86:8:86:11 | After :foo [match] | match |
+| case.rb:86:8:86:11 | :foo | case.rb:86:8:86:11 | After :foo [no-match] | no-match |
+| case.rb:86:8:86:11 | After :foo [match] | case.rb:86:5:86:11 | After in ... then ... [match] | match |
+| case.rb:86:8:86:11 | After :foo [no-match] | case.rb:86:5:86:11 | After in ... then ... [no-match] | no-match |
+| case.rb:86:8:86:11 | Before :foo | case.rb:86:8:86:11 | foo |  |
 | case.rb:86:8:86:11 | foo | case.rb:86:8:86:11 | :foo |  |
-| case.rb:87:5:87:17 | in ... then ... | case.rb:87:10:87:16 | foo bar |  |
-| case.rb:87:8:87:17 | :"foo bar" | case.rb:72:3:92:5 | case ... | match |
-| case.rb:87:8:87:17 | :"foo bar" | case.rb:88:5:88:15 | in ... then ... | no-match |
+| case.rb:87:5:87:17 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:87:5:87:17 | After in ... then ... [no-match] | case.rb:88:5:88:15 | in ... then ... |  |
+| case.rb:87:5:87:17 | in ... then ... | case.rb:87:8:87:17 | Before :"foo bar" |  |
+| case.rb:87:8:87:17 | :"foo bar" | case.rb:87:8:87:17 | After :"foo bar" [match] | match |
+| case.rb:87:8:87:17 | :"foo bar" | case.rb:87:8:87:17 | After :"foo bar" [no-match] | no-match |
+| case.rb:87:8:87:17 | After :"foo bar" [match] | case.rb:87:5:87:17 | After in ... then ... [match] | match |
+| case.rb:87:8:87:17 | After :"foo bar" [no-match] | case.rb:87:5:87:17 | After in ... then ... [no-match] | no-match |
+| case.rb:87:8:87:17 | Before :"foo bar" | case.rb:87:10:87:16 | foo bar |  |
 | case.rb:87:10:87:16 | foo bar | case.rb:87:8:87:17 | :"foo bar" |  |
+| case.rb:88:5:88:15 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:88:5:88:15 | After in ... then ... [no-match] | case.rb:89:5:89:69 | in ... then ... |  |
 | case.rb:88:5:88:15 | in ... then ... | case.rb:88:8:88:15 | ... \| ... |  |
-| case.rb:88:8:88:9 | - ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:88:8:88:9 | - ... | case.rb:88:14:88:15 | 10 | no-match |
-| case.rb:88:8:88:15 | ... \| ... | case.rb:88:9:88:9 | 5 |  |
+| case.rb:88:8:88:9 | - ... | case.rb:88:8:88:9 | After - ... |  |
+| case.rb:88:8:88:9 | After - ... | case.rb:88:13:88:15 | Before + ... |  |
+| case.rb:88:8:88:9 | Before - ... | case.rb:88:9:88:9 | 5 |  |
+| case.rb:88:8:88:15 | ... \| ... | case.rb:88:8:88:9 | Before - ... |  |
+| case.rb:88:8:88:15 | After ... \| ... [match] | case.rb:88:5:88:15 | After in ... then ... [match] | match |
+| case.rb:88:8:88:15 | After ... \| ... [no-match] | case.rb:88:5:88:15 | After in ... then ... [no-match] | no-match |
 | case.rb:88:9:88:9 | 5 | case.rb:88:8:88:9 | - ... |  |
-| case.rb:88:13:88:15 | + ... | case.rb:72:3:92:5 | case ... | match |
-| case.rb:88:13:88:15 | + ... | case.rb:89:5:89:69 | in ... then ... | no-match |
+| case.rb:88:13:88:15 | + ... | case.rb:88:13:88:15 | After + ... |  |
+| case.rb:88:13:88:15 | After + ... | case.rb:88:8:88:15 | After ... \| ... [match] | match |
+| case.rb:88:13:88:15 | After + ... | case.rb:88:8:88:15 | After ... \| ... [no-match] | no-match |
+| case.rb:88:13:88:15 | Before + ... | case.rb:88:14:88:15 | 10 |  |
 | case.rb:88:14:88:15 | 10 | case.rb:88:13:88:15 | + ... |  |
+| case.rb:89:5:89:69 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:89:5:89:69 | After in ... then ... [no-match] | case.rb:90:5:90:13 | in ... then ... |  |
 | case.rb:89:5:89:69 | in ... then ... | case.rb:89:8:89:69 | ... \| ... |  |
-| case.rb:89:8:89:10 | nil | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:8:89:10 | nil | case.rb:89:14:89:17 | self | no-match |
+| case.rb:89:8:89:10 | nil | case.rb:89:14:89:17 | self |  |
 | case.rb:89:8:89:69 | ... \| ... | case.rb:89:8:89:10 | nil |  |
-| case.rb:89:14:89:17 | self | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:14:89:17 | self | case.rb:89:21:89:24 | true | no-match |
-| case.rb:89:21:89:24 | true | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:21:89:24 | true | case.rb:89:28:89:32 | false | no-match |
-| case.rb:89:28:89:32 | false | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:28:89:32 | false | case.rb:89:36:89:43 | __LINE__ | no-match |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:36:89:43 | __LINE__ | case.rb:89:47:89:54 | __FILE__ | no-match |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:47:89:54 | __FILE__ | case.rb:89:58:89:69 | __ENCODING__ | no-match |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:72:3:92:5 | case ... | match |
-| case.rb:89:58:89:69 | __ENCODING__ | case.rb:90:5:90:13 | in ... then ... | no-match |
+| case.rb:89:8:89:69 | After ... \| ... [match] | case.rb:89:5:89:69 | After in ... then ... [match] | match |
+| case.rb:89:8:89:69 | After ... \| ... [no-match] | case.rb:89:5:89:69 | After in ... then ... [no-match] | no-match |
+| case.rb:89:14:89:17 | self | case.rb:89:21:89:24 | true |  |
+| case.rb:89:21:89:24 | true | case.rb:89:28:89:32 | false |  |
+| case.rb:89:28:89:32 | false | case.rb:89:36:89:43 | __LINE__ |  |
+| case.rb:89:36:89:43 | __LINE__ | case.rb:89:47:89:54 | __FILE__ |  |
+| case.rb:89:47:89:54 | __FILE__ | case.rb:89:58:89:69 | __ENCODING__ |  |
+| case.rb:89:58:89:69 | __ENCODING__ | case.rb:89:8:89:69 | After ... \| ... [match] | match |
+| case.rb:89:58:89:69 | __ENCODING__ | case.rb:89:8:89:69 | After ... \| ... [no-match] | no-match |
+| case.rb:90:5:90:13 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:90:5:90:13 | After in ... then ... [no-match] | case.rb:91:5:91:25 | in ... then ... |  |
 | case.rb:90:5:90:13 | in ... then ... | case.rb:90:8:90:13 | ( ... ) |  |
-| case.rb:90:8:90:13 | ( ... ) | case.rb:90:9:90:9 | 1 |  |
+| case.rb:90:8:90:13 | ( ... ) | case.rb:90:9:90:12 | Before _ .. _ |  |
+| case.rb:90:8:90:13 | After ( ... ) [match] | case.rb:90:5:90:13 | After in ... then ... [match] | match |
+| case.rb:90:8:90:13 | After ( ... ) [no-match] | case.rb:90:5:90:13 | After in ... then ... [no-match] | no-match |
 | case.rb:90:9:90:9 | 1 | case.rb:90:9:90:12 | _ .. _ |  |
-| case.rb:90:9:90:12 | _ .. _ | case.rb:72:3:92:5 | case ... | match |
-| case.rb:90:9:90:12 | _ .. _ | case.rb:91:5:91:25 | in ... then ... | no-match |
+| case.rb:90:9:90:12 | After _ .. _ | case.rb:90:8:90:13 | After ( ... ) [match] | match |
+| case.rb:90:9:90:12 | After _ .. _ | case.rb:90:8:90:13 | After ( ... ) [no-match] | no-match |
+| case.rb:90:9:90:12 | Before _ .. _ | case.rb:90:9:90:9 | 1 |  |
+| case.rb:90:9:90:12 | _ .. _ | case.rb:90:9:90:12 | After _ .. _ |  |
+| case.rb:91:5:91:25 | After in ... then ... [match] | case.rb:72:3:92:5 | After case ... |  |
+| case.rb:91:5:91:25 | After in ... then ... [no-match] | case.rb:72:3:92:5 | After case ... |  |
 | case.rb:91:5:91:25 | in ... then ... | case.rb:91:8:91:25 | ( ... ) |  |
 | case.rb:91:8:91:25 | ( ... ) | case.rb:91:9:91:24 | ... \| ... |  |
-| case.rb:91:9:91:9 | 0 | case.rb:72:3:92:5 | case ... | match |
-| case.rb:91:9:91:9 | 0 | case.rb:91:13:91:14 | "" | no-match |
+| case.rb:91:8:91:25 | After ( ... ) [match] | case.rb:91:5:91:25 | After in ... then ... [match] | match |
+| case.rb:91:8:91:25 | After ( ... ) [no-match] | case.rb:91:5:91:25 | After in ... then ... [no-match] | no-match |
+| case.rb:91:9:91:9 | 0 | case.rb:91:13:91:14 | "" |  |
 | case.rb:91:9:91:24 | ... \| ... | case.rb:91:9:91:9 | 0 |  |
-| case.rb:91:13:91:14 | "" | case.rb:72:3:92:5 | case ... | match |
-| case.rb:91:13:91:14 | "" | case.rb:91:18:91:19 | [ ..., * ] | no-match |
-| case.rb:91:18:91:19 | [ ..., * ] | case.rb:72:3:92:5 | case ... | match |
-| case.rb:91:18:91:19 | [ ..., * ] | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:91:23:91:24 | { ..., ** } | case.rb:69:1:93:3 | exit case_match_various (abnormal) | exception |
-| case.rb:91:23:91:24 | { ..., ** } | case.rb:72:3:92:5 | case ... | false, match, true |
-| case.rb:95:1:99:3 | case_match_guard_no_else | case.rb:1:1:99:4 | exit case.rb (normal) |  |
-| case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:95:30:95:34 | value |  |
-| case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | case.rb:95:1:99:3 | exit case_match_guard_no_else |  |
-| case.rb:95:1:99:3 | exit case_match_guard_no_else (normal) | case.rb:95:1:99:3 | exit case_match_guard_no_else |  |
-| case.rb:95:30:95:34 | value | case.rb:96:8:96:12 | value |  |
-| case.rb:96:3:98:5 | case ... | case.rb:95:1:99:3 | exit case_match_guard_no_else (normal) |  |
+| case.rb:91:9:91:24 | After ... \| ... | case.rb:91:8:91:25 | After ( ... ) [match] | match |
+| case.rb:91:9:91:24 | After ... \| ... | case.rb:91:8:91:25 | After ( ... ) [no-match] | no-match |
+| case.rb:91:13:91:14 | "" | case.rb:91:18:91:19 | [ ..., * ] |  |
+| case.rb:91:18:91:19 | [ ..., * ] | case.rb:91:23:91:24 | { ..., ** } |  |
+| case.rb:91:23:91:24 | { ..., ** } | case.rb:91:9:91:24 | After ... \| ... |  |
+| case.rb:95:1:99:3 | Entry | case.rb:95:30:95:34 | value |  |
+| case.rb:95:1:99:3 | Normal Exit | case.rb:95:1:99:3 | Exit |  |
+| case.rb:95:1:99:3 | case_match_guard_no_else | case.rb:1:1:99:4 | Normal Exit |  |
+| case.rb:95:30:95:34 | value | case.rb:96:3:98:5 | ... |  |
+| case.rb:96:3:98:5 | ... | case.rb:96:3:98:5 | case ... |  |
+| case.rb:96:3:98:5 | After ... | case.rb:95:1:99:3 | Normal Exit |  |
+| case.rb:96:3:98:5 | After case ... | case.rb:96:3:98:5 | After ... |  |
+| case.rb:96:3:98:5 | case ... | case.rb:96:8:96:12 | value |  |
 | case.rb:96:8:96:12 | value | case.rb:97:5:97:25 | in ... then ... |  |
+| case.rb:97:5:97:25 | After in ... then ... [match] | case.rb:97:13:97:18 | Before ... == ... |  |
+| case.rb:97:5:97:25 | After in ... then ... [no-match] | case.rb:96:3:98:5 | After case ... |  |
 | case.rb:97:5:97:25 | in ... then ... | case.rb:97:8:97:8 | x |  |
-| case.rb:97:8:97:8 | x | case.rb:97:13:97:13 | x | match |
+| case.rb:97:8:97:8 | After x [match] | case.rb:97:5:97:25 | After in ... then ... [match] | match |
+| case.rb:97:8:97:8 | After x [no-match] | case.rb:97:5:97:25 | After in ... then ... [no-match] | no-match |
+| case.rb:97:8:97:8 | x | case.rb:97:8:97:8 | After x [match] | match |
+| case.rb:97:8:97:8 | x | case.rb:97:8:97:8 | After x [no-match] | no-match |
 | case.rb:97:13:97:13 | x | case.rb:97:18:97:18 | 5 |  |
-| case.rb:97:13:97:18 | ... == ... | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | exception |
-| case.rb:97:13:97:18 | ... == ... | case.rb:97:25:97:25 | 6 | true |
+| case.rb:97:13:97:18 | ... == ... | case.rb:97:13:97:18 | After ... == ... [false] | false |
+| case.rb:97:13:97:18 | ... == ... | case.rb:97:13:97:18 | After ... == ... [true] | true |
+| case.rb:97:13:97:18 | After ... == ... [false] | case.rb:96:3:98:5 | After case ... |  |
+| case.rb:97:13:97:18 | After ... == ... [true] | case.rb:97:20:97:25 | then ... |  |
+| case.rb:97:13:97:18 | Before ... == ... | case.rb:97:13:97:13 | x |  |
 | case.rb:97:18:97:18 | 5 | case.rb:97:13:97:18 | ... == ... |  |
-| case.rb:97:20:97:25 | then ... | case.rb:96:3:98:5 | case ... |  |
-| case.rb:97:25:97:25 | 6 | case.rb:97:20:97:25 | then ... |  |
-| cfg.html.erb:5:16:5:21 | @title | cfg.html.erb:6:9:6:58 | self |  |
+| case.rb:97:20:97:25 | After then ... | case.rb:96:3:98:5 | After case ... |  |
+| case.rb:97:20:97:25 | then ... | case.rb:97:25:97:25 | 6 |  |
+| case.rb:97:25:97:25 | 6 | case.rb:97:20:97:25 | After then ... |  |
+| cfg.html.erb:5:16:5:21 | @title | cfg.html.erb:5:16:5:21 | After @title |  |
+| cfg.html.erb:5:16:5:21 | After @title | cfg.html.erb:6:9:6:58 | Before call to stylesheet_link_tag |  |
+| cfg.html.erb:5:16:5:21 | Before @title | cfg.html.erb:5:16:5:21 | self |  |
 | cfg.html.erb:5:16:5:21 | self | cfg.html.erb:5:16:5:21 | @title |  |
-| cfg.html.erb:5:16:31:12 | enter cfg.html.erb | cfg.html.erb:5:16:5:21 | self |  |
-| cfg.html.erb:5:16:31:12 | exit cfg.html.erb (normal) | cfg.html.erb:5:16:31:12 | exit cfg.html.erb |  |
-| cfg.html.erb:6:9:6:58 | call to stylesheet_link_tag | cfg.html.erb:12:11:12:33 | self |  |
-| cfg.html.erb:6:9:6:58 | self | cfg.html.erb:6:30:6:40 | application |  |
-| cfg.html.erb:6:29:6:41 | "application" | cfg.html.erb:6:44:6:49 | media |  |
+| cfg.html.erb:5:16:31:12 | Entry | cfg.html.erb:5:16:5:21 | Before @title |  |
+| cfg.html.erb:5:16:31:12 | Normal Exit | cfg.html.erb:5:16:31:12 | Exit |  |
+| cfg.html.erb:6:9:6:58 | After call to stylesheet_link_tag | cfg.html.erb:12:11:12:33 | Before call to link_to |  |
+| cfg.html.erb:6:9:6:58 | Before call to stylesheet_link_tag | cfg.html.erb:6:9:6:58 | self |  |
+| cfg.html.erb:6:9:6:58 | call to stylesheet_link_tag | cfg.html.erb:6:9:6:58 | After call to stylesheet_link_tag |  |
+| cfg.html.erb:6:9:6:58 | self | cfg.html.erb:6:29:6:41 | Before "application" |  |
+| cfg.html.erb:6:29:6:41 | "application" | cfg.html.erb:6:29:6:41 | After "application" |  |
+| cfg.html.erb:6:29:6:41 | After "application" | cfg.html.erb:6:44:6:58 | Before Pair |  |
+| cfg.html.erb:6:29:6:41 | Before "application" | cfg.html.erb:6:30:6:40 | application |  |
 | cfg.html.erb:6:30:6:40 | application | cfg.html.erb:6:29:6:41 | "application" |  |
-| cfg.html.erb:6:44:6:49 | :media | cfg.html.erb:6:55:6:57 | all |  |
+| cfg.html.erb:6:44:6:49 | :media | cfg.html.erb:6:44:6:49 | After :media |  |
+| cfg.html.erb:6:44:6:49 | After :media | cfg.html.erb:6:54:6:58 | Before "all" |  |
+| cfg.html.erb:6:44:6:49 | Before :media | cfg.html.erb:6:44:6:49 | media |  |
 | cfg.html.erb:6:44:6:49 | media | cfg.html.erb:6:44:6:49 | :media |  |
-| cfg.html.erb:6:44:6:58 | Pair | cfg.html.erb:6:9:6:58 | call to stylesheet_link_tag |  |
-| cfg.html.erb:6:54:6:58 | "all" | cfg.html.erb:6:44:6:58 | Pair |  |
+| cfg.html.erb:6:44:6:58 | After Pair | cfg.html.erb:6:9:6:58 | call to stylesheet_link_tag |  |
+| cfg.html.erb:6:44:6:58 | Before Pair | cfg.html.erb:6:44:6:49 | Before :media |  |
+| cfg.html.erb:6:44:6:58 | Pair | cfg.html.erb:6:44:6:58 | After Pair |  |
+| cfg.html.erb:6:54:6:58 | "all" | cfg.html.erb:6:54:6:58 | After "all" |  |
+| cfg.html.erb:6:54:6:58 | After "all" | cfg.html.erb:6:44:6:58 | Pair |  |
+| cfg.html.erb:6:54:6:58 | Before "all" | cfg.html.erb:6:55:6:57 | all |  |
 | cfg.html.erb:6:55:6:57 | all | cfg.html.erb:6:54:6:58 | "all" |  |
-| cfg.html.erb:12:11:12:33 | call to link_to | cfg.html.erb:15:19:15:32 | self |  |
-| cfg.html.erb:12:11:12:33 | self | cfg.html.erb:12:20:12:20 | A |  |
-| cfg.html.erb:12:19:12:21 | "A" | cfg.html.erb:12:24:12:24 | self |  |
+| cfg.html.erb:12:11:12:33 | After call to link_to | cfg.html.erb:15:19:15:32 | Before call to link_to |  |
+| cfg.html.erb:12:11:12:33 | Before call to link_to | cfg.html.erb:12:11:12:33 | self |  |
+| cfg.html.erb:12:11:12:33 | call to link_to | cfg.html.erb:12:11:12:33 | After call to link_to |  |
+| cfg.html.erb:12:11:12:33 | self | cfg.html.erb:12:19:12:21 | Before "A" |  |
+| cfg.html.erb:12:19:12:21 | "A" | cfg.html.erb:12:19:12:21 | After "A" |  |
+| cfg.html.erb:12:19:12:21 | After "A" | cfg.html.erb:12:24:12:24 | Before call to a |  |
+| cfg.html.erb:12:19:12:21 | Before "A" | cfg.html.erb:12:20:12:20 | A |  |
 | cfg.html.erb:12:20:12:20 | A | cfg.html.erb:12:19:12:21 | "A" |  |
-| cfg.html.erb:12:24:12:24 | call to a | cfg.html.erb:12:27:12:28 | id |  |
+| cfg.html.erb:12:24:12:24 | After call to a | cfg.html.erb:12:27:12:33 | Before Pair |  |
+| cfg.html.erb:12:24:12:24 | Before call to a | cfg.html.erb:12:24:12:24 | self |  |
+| cfg.html.erb:12:24:12:24 | call to a | cfg.html.erb:12:24:12:24 | After call to a |  |
 | cfg.html.erb:12:24:12:24 | self | cfg.html.erb:12:24:12:24 | call to a |  |
-| cfg.html.erb:12:27:12:28 | :id | cfg.html.erb:12:32:12:32 | a |  |
+| cfg.html.erb:12:27:12:28 | :id | cfg.html.erb:12:27:12:28 | After :id |  |
+| cfg.html.erb:12:27:12:28 | After :id | cfg.html.erb:12:31:12:33 | Before "a" |  |
+| cfg.html.erb:12:27:12:28 | Before :id | cfg.html.erb:12:27:12:28 | id |  |
 | cfg.html.erb:12:27:12:28 | id | cfg.html.erb:12:27:12:28 | :id |  |
-| cfg.html.erb:12:27:12:33 | Pair | cfg.html.erb:12:11:12:33 | call to link_to |  |
-| cfg.html.erb:12:31:12:33 | "a" | cfg.html.erb:12:27:12:33 | Pair |  |
+| cfg.html.erb:12:27:12:33 | After Pair | cfg.html.erb:12:11:12:33 | call to link_to |  |
+| cfg.html.erb:12:27:12:33 | Before Pair | cfg.html.erb:12:27:12:28 | Before :id |  |
+| cfg.html.erb:12:27:12:33 | Pair | cfg.html.erb:12:27:12:33 | After Pair |  |
+| cfg.html.erb:12:31:12:33 | "a" | cfg.html.erb:12:31:12:33 | After "a" |  |
+| cfg.html.erb:12:31:12:33 | After "a" | cfg.html.erb:12:27:12:33 | Pair |  |
+| cfg.html.erb:12:31:12:33 | Before "a" | cfg.html.erb:12:32:12:32 | a |  |
 | cfg.html.erb:12:32:12:32 | a | cfg.html.erb:12:31:12:33 | "a" |  |
-| cfg.html.erb:15:19:15:32 | call to link_to | cfg.html.erb:16:19:16:32 | self |  |
-| cfg.html.erb:15:19:15:32 | self | cfg.html.erb:15:28:15:28 | B |  |
-| cfg.html.erb:15:27:15:29 | "B" | cfg.html.erb:15:32:15:32 | self |  |
+| cfg.html.erb:15:19:15:32 | After call to link_to | cfg.html.erb:16:19:16:32 | Before call to link_to |  |
+| cfg.html.erb:15:19:15:32 | Before call to link_to | cfg.html.erb:15:19:15:32 | self |  |
+| cfg.html.erb:15:19:15:32 | call to link_to | cfg.html.erb:15:19:15:32 | After call to link_to |  |
+| cfg.html.erb:15:19:15:32 | self | cfg.html.erb:15:27:15:29 | Before "B" |  |
+| cfg.html.erb:15:27:15:29 | "B" | cfg.html.erb:15:27:15:29 | After "B" |  |
+| cfg.html.erb:15:27:15:29 | After "B" | cfg.html.erb:15:32:15:32 | Before call to a |  |
+| cfg.html.erb:15:27:15:29 | Before "B" | cfg.html.erb:15:28:15:28 | B |  |
 | cfg.html.erb:15:28:15:28 | B | cfg.html.erb:15:27:15:29 | "B" |  |
-| cfg.html.erb:15:32:15:32 | call to a | cfg.html.erb:15:19:15:32 | call to link_to |  |
+| cfg.html.erb:15:32:15:32 | After call to a | cfg.html.erb:15:19:15:32 | call to link_to |  |
+| cfg.html.erb:15:32:15:32 | Before call to a | cfg.html.erb:15:32:15:32 | self |  |
+| cfg.html.erb:15:32:15:32 | call to a | cfg.html.erb:15:32:15:32 | After call to a |  |
 | cfg.html.erb:15:32:15:32 | self | cfg.html.erb:15:32:15:32 | call to a |  |
-| cfg.html.erb:16:19:16:32 | call to link_to | cfg.html.erb:18:17:18:22 | self |  |
-| cfg.html.erb:16:19:16:32 | self | cfg.html.erb:16:28:16:28 | C |  |
-| cfg.html.erb:16:27:16:29 | "C" | cfg.html.erb:16:32:16:32 | self |  |
+| cfg.html.erb:16:19:16:32 | After call to link_to | cfg.html.erb:18:14:22:16 | if ... |  |
+| cfg.html.erb:16:19:16:32 | Before call to link_to | cfg.html.erb:16:19:16:32 | self |  |
+| cfg.html.erb:16:19:16:32 | call to link_to | cfg.html.erb:16:19:16:32 | After call to link_to |  |
+| cfg.html.erb:16:19:16:32 | self | cfg.html.erb:16:27:16:29 | Before "C" |  |
+| cfg.html.erb:16:27:16:29 | "C" | cfg.html.erb:16:27:16:29 | After "C" |  |
+| cfg.html.erb:16:27:16:29 | After "C" | cfg.html.erb:16:32:16:32 | Before call to b |  |
+| cfg.html.erb:16:27:16:29 | Before "C" | cfg.html.erb:16:28:16:28 | C |  |
 | cfg.html.erb:16:28:16:28 | C | cfg.html.erb:16:27:16:29 | "C" |  |
-| cfg.html.erb:16:32:16:32 | call to b | cfg.html.erb:16:19:16:32 | call to link_to |  |
+| cfg.html.erb:16:32:16:32 | After call to b | cfg.html.erb:16:19:16:32 | call to link_to |  |
+| cfg.html.erb:16:32:16:32 | Before call to b | cfg.html.erb:16:32:16:32 | self |  |
+| cfg.html.erb:16:32:16:32 | call to b | cfg.html.erb:16:32:16:32 | After call to b |  |
 | cfg.html.erb:16:32:16:32 | self | cfg.html.erb:16:32:16:32 | call to b |  |
-| cfg.html.erb:18:14:22:16 | if ... | cfg.html.erb:29:8:29:17 | self |  |
-| cfg.html.erb:18:17:18:22 | call to admin? | cfg.html.erb:19:19:19:32 | self | true |
-| cfg.html.erb:18:17:18:22 | call to admin? | cfg.html.erb:21:19:21:32 | self | false |
+| cfg.html.erb:18:14:22:16 | After if ... | cfg.html.erb:29:8:31:10 | Before call to each |  |
+| cfg.html.erb:18:14:22:16 | if ... | cfg.html.erb:18:17:18:22 | Before call to admin? |  |
+| cfg.html.erb:18:17:18:22 | After call to admin? [false] | cfg.html.erb:20:14:21:34 | else ... |  |
+| cfg.html.erb:18:17:18:22 | After call to admin? [true] | cfg.html.erb:18:24:19:34 | then ... |  |
+| cfg.html.erb:18:17:18:22 | Before call to admin? | cfg.html.erb:18:17:18:22 | self |  |
+| cfg.html.erb:18:17:18:22 | call to admin? | cfg.html.erb:18:17:18:22 | After call to admin? [false] | false |
+| cfg.html.erb:18:17:18:22 | call to admin? | cfg.html.erb:18:17:18:22 | After call to admin? [true] | true |
 | cfg.html.erb:18:17:18:22 | self | cfg.html.erb:18:17:18:22 | call to admin? |  |
-| cfg.html.erb:18:24:19:34 | then ... | cfg.html.erb:18:14:22:16 | if ... |  |
-| cfg.html.erb:19:19:19:32 | call to link_to | cfg.html.erb:18:24:19:34 | then ... |  |
-| cfg.html.erb:19:19:19:32 | self | cfg.html.erb:19:28:19:28 | D |  |
-| cfg.html.erb:19:27:19:29 | "D" | cfg.html.erb:19:32:19:32 | self |  |
+| cfg.html.erb:18:24:19:34 | After then ... | cfg.html.erb:18:14:22:16 | After if ... |  |
+| cfg.html.erb:18:24:19:34 | then ... | cfg.html.erb:19:19:19:32 | Before call to link_to |  |
+| cfg.html.erb:19:19:19:32 | After call to link_to | cfg.html.erb:18:24:19:34 | After then ... |  |
+| cfg.html.erb:19:19:19:32 | Before call to link_to | cfg.html.erb:19:19:19:32 | self |  |
+| cfg.html.erb:19:19:19:32 | call to link_to | cfg.html.erb:19:19:19:32 | After call to link_to |  |
+| cfg.html.erb:19:19:19:32 | self | cfg.html.erb:19:27:19:29 | Before "D" |  |
+| cfg.html.erb:19:27:19:29 | "D" | cfg.html.erb:19:27:19:29 | After "D" |  |
+| cfg.html.erb:19:27:19:29 | After "D" | cfg.html.erb:19:32:19:32 | Before call to d |  |
+| cfg.html.erb:19:27:19:29 | Before "D" | cfg.html.erb:19:28:19:28 | D |  |
 | cfg.html.erb:19:28:19:28 | D | cfg.html.erb:19:27:19:29 | "D" |  |
-| cfg.html.erb:19:32:19:32 | call to d | cfg.html.erb:19:19:19:32 | call to link_to |  |
+| cfg.html.erb:19:32:19:32 | After call to d | cfg.html.erb:19:19:19:32 | call to link_to |  |
+| cfg.html.erb:19:32:19:32 | Before call to d | cfg.html.erb:19:32:19:32 | self |  |
+| cfg.html.erb:19:32:19:32 | call to d | cfg.html.erb:19:32:19:32 | After call to d |  |
 | cfg.html.erb:19:32:19:32 | self | cfg.html.erb:19:32:19:32 | call to d |  |
-| cfg.html.erb:20:14:21:34 | else ... | cfg.html.erb:18:14:22:16 | if ... |  |
-| cfg.html.erb:21:19:21:32 | call to link_to | cfg.html.erb:20:14:21:34 | else ... |  |
-| cfg.html.erb:21:19:21:32 | self | cfg.html.erb:21:28:21:28 | E |  |
-| cfg.html.erb:21:27:21:29 | "E" | cfg.html.erb:21:32:21:32 | self |  |
+| cfg.html.erb:20:14:21:34 | After else ... | cfg.html.erb:18:14:22:16 | After if ... |  |
+| cfg.html.erb:20:14:21:34 | else ... | cfg.html.erb:21:19:21:32 | Before call to link_to |  |
+| cfg.html.erb:21:19:21:32 | After call to link_to | cfg.html.erb:20:14:21:34 | After else ... |  |
+| cfg.html.erb:21:19:21:32 | Before call to link_to | cfg.html.erb:21:19:21:32 | self |  |
+| cfg.html.erb:21:19:21:32 | call to link_to | cfg.html.erb:21:19:21:32 | After call to link_to |  |
+| cfg.html.erb:21:19:21:32 | self | cfg.html.erb:21:27:21:29 | Before "E" |  |
+| cfg.html.erb:21:27:21:29 | "E" | cfg.html.erb:21:27:21:29 | After "E" |  |
+| cfg.html.erb:21:27:21:29 | After "E" | cfg.html.erb:21:32:21:32 | Before call to e |  |
+| cfg.html.erb:21:27:21:29 | Before "E" | cfg.html.erb:21:28:21:28 | E |  |
 | cfg.html.erb:21:28:21:28 | E | cfg.html.erb:21:27:21:29 | "E" |  |
-| cfg.html.erb:21:32:21:32 | call to e | cfg.html.erb:21:19:21:32 | call to link_to |  |
+| cfg.html.erb:21:32:21:32 | After call to e | cfg.html.erb:21:19:21:32 | call to link_to |  |
+| cfg.html.erb:21:32:21:32 | Before call to e | cfg.html.erb:21:32:21:32 | self |  |
+| cfg.html.erb:21:32:21:32 | call to e | cfg.html.erb:21:32:21:32 | After call to e |  |
 | cfg.html.erb:21:32:21:32 | self | cfg.html.erb:21:32:21:32 | call to e |  |
-| cfg.html.erb:29:8:29:17 | call to collection | cfg.html.erb:29:24:31:10 | do ... end |  |
+| cfg.html.erb:29:8:29:17 | After call to collection | cfg.html.erb:29:24:31:10 | do ... end |  |
+| cfg.html.erb:29:8:29:17 | Before call to collection | cfg.html.erb:29:8:29:17 | self |  |
+| cfg.html.erb:29:8:29:17 | call to collection | cfg.html.erb:29:8:29:17 | After call to collection |  |
 | cfg.html.erb:29:8:29:17 | self | cfg.html.erb:29:8:29:17 | call to collection |  |
-| cfg.html.erb:29:8:31:10 | call to each | cfg.html.erb:5:16:31:12 | exit cfg.html.erb (normal) |  |
+| cfg.html.erb:29:8:31:10 | After call to each | cfg.html.erb:5:16:31:12 | Normal Exit |  |
+| cfg.html.erb:29:8:31:10 | Before call to each | cfg.html.erb:29:8:29:17 | Before call to collection |  |
+| cfg.html.erb:29:8:31:10 | call to each | cfg.html.erb:29:8:31:10 | After call to each |  |
+| cfg.html.erb:29:24:31:10 | Entry | cfg.html.erb:29:28:29:30 | key |  |
+| cfg.html.erb:29:24:31:10 | Normal Exit | cfg.html.erb:29:24:31:10 | Exit |  |
 | cfg.html.erb:29:24:31:10 | do ... end | cfg.html.erb:29:8:31:10 | call to each |  |
-| cfg.html.erb:29:24:31:10 | enter do ... end | cfg.html.erb:29:28:29:30 | key |  |
-| cfg.html.erb:29:24:31:10 | exit do ... end (normal) | cfg.html.erb:29:24:31:10 | exit do ... end |  |
 | cfg.html.erb:29:28:29:30 | key | cfg.html.erb:29:33:29:37 | value |  |
-| cfg.html.erb:29:33:29:37 | value | cfg.html.erb:30:23:30:25 | key |  |
+| cfg.html.erb:29:33:29:37 | value | cfg.html.erb:30:23:30:41 | ... |  |
 | cfg.html.erb:30:23:30:25 | key | cfg.html.erb:30:35:30:39 | value |  |
-| cfg.html.erb:30:35:30:39 | value | cfg.html.erb:29:24:31:10 | exit do ... end (normal) |  |
-| cfg.rb:1:1:1:12 | bar | cfg.rb:3:1:3:13 | alias ... |  |
-| cfg.rb:1:1:221:1 | enter cfg.rb | cfg.rb:16:3:16:14 | self |  |
-| cfg.rb:1:1:221:1 | exit cfg.rb (normal) | cfg.rb:1:1:221:1 | exit cfg.rb |  |
-| cfg.rb:3:1:3:13 | alias ... | cfg.rb:3:7:3:9 | foo |  |
+| cfg.html.erb:30:23:30:41 | ... | cfg.html.erb:30:23:30:25 | key |  |
+| cfg.html.erb:30:23:30:41 | After ... | cfg.html.erb:29:24:31:10 | Normal Exit |  |
+| cfg.html.erb:30:35:30:39 | value | cfg.html.erb:30:23:30:41 | After ... |  |
+| cfg.rb:1:1:1:12 | bar | cfg.rb:3:1:3:13 | Before alias ... |  |
+| cfg.rb:1:1:221:1 | Entry | cfg.rb:15:1:17:1 | BEGIN { ... } |  |
+| cfg.rb:1:1:221:1 | Exceptional Exit | cfg.rb:1:1:221:1 | Exit |  |
+| cfg.rb:1:1:221:1 | Normal Exit | cfg.rb:1:1:221:1 | Exit |  |
+| cfg.rb:3:1:3:13 | After alias ... | cfg.rb:5:1:5:6 | Before ... = ... |  |
+| cfg.rb:3:1:3:13 | Before alias ... | cfg.rb:3:7:3:9 | foo |  |
+| cfg.rb:3:1:3:13 | alias ... | cfg.rb:3:1:3:13 | After alias ... |  |
 | cfg.rb:3:7:3:9 | foo | cfg.rb:3:11:3:13 | bar |  |
-| cfg.rb:3:11:3:13 | bar | cfg.rb:5:1:5:1 | b |  |
+| cfg.rb:3:11:3:13 | bar | cfg.rb:3:1:3:13 | alias ... |  |
 | cfg.rb:5:1:5:1 | b | cfg.rb:5:5:5:6 | 42 |  |
-| cfg.rb:5:1:5:6 | ... = ... | cfg.rb:7:1:7:21 | Array |  |
+| cfg.rb:5:1:5:6 | ... = ... | cfg.rb:5:1:5:6 | After ... = ... |  |
+| cfg.rb:5:1:5:6 | After ... = ... | cfg.rb:7:1:7:21 | Before call to [] |  |
+| cfg.rb:5:1:5:6 | Before ... = ... | cfg.rb:5:1:5:1 | b |  |
 | cfg.rb:5:5:5:6 | 42 | cfg.rb:5:1:5:6 | ... = ... |  |
-| cfg.rb:7:1:7:21 | Array | cfg.rb:7:4:7:6 | one |  |
-| cfg.rb:7:1:7:21 | call to [] | cfg.rb:9:1:9:21 | Array |  |
-| cfg.rb:7:4:7:6 | one | cfg.rb:7:10:7:10 | b |  |
-| cfg.rb:7:4:7:12 | :"one#{...}" | cfg.rb:7:14:7:20 | another |  |
-| cfg.rb:7:7:7:12 | #{...} | cfg.rb:7:4:7:12 | :"one#{...}" |  |
-| cfg.rb:7:10:7:10 | b | cfg.rb:7:7:7:12 | #{...} |  |
-| cfg.rb:7:14:7:20 | :"another" | cfg.rb:7:1:7:21 | call to [] |  |
+| cfg.rb:7:1:7:21 | After call to [] | cfg.rb:9:1:9:21 | Before call to [] |  |
+| cfg.rb:7:1:7:21 | Array | cfg.rb:7:4:7:12 | Before :"one#{...}" |  |
+| cfg.rb:7:1:7:21 | Before call to [] | cfg.rb:7:1:7:21 | Array |  |
+| cfg.rb:7:1:7:21 | call to [] | cfg.rb:7:1:7:21 | After call to [] |  |
+| cfg.rb:7:4:7:6 | one | cfg.rb:7:7:7:12 | #{...} |  |
+| cfg.rb:7:4:7:12 | :"one#{...}" | cfg.rb:7:4:7:12 | After :"one#{...}" |  |
+| cfg.rb:7:4:7:12 | After :"one#{...}" | cfg.rb:7:14:7:20 | Before :"another" |  |
+| cfg.rb:7:4:7:12 | Before :"one#{...}" | cfg.rb:7:4:7:6 | one |  |
+| cfg.rb:7:7:7:12 | #{...} | cfg.rb:7:10:7:10 | b |  |
+| cfg.rb:7:7:7:12 | After #{...} | cfg.rb:7:4:7:12 | :"one#{...}" |  |
+| cfg.rb:7:10:7:10 | b | cfg.rb:7:7:7:12 | After #{...} |  |
+| cfg.rb:7:14:7:20 | :"another" | cfg.rb:7:14:7:20 | After :"another" |  |
+| cfg.rb:7:14:7:20 | After :"another" | cfg.rb:7:1:7:21 | call to [] |  |
+| cfg.rb:7:14:7:20 | Before :"another" | cfg.rb:7:14:7:20 | another |  |
 | cfg.rb:7:14:7:20 | another | cfg.rb:7:14:7:20 | :"another" |  |
-| cfg.rb:9:1:9:21 | Array | cfg.rb:9:4:9:6 | one |  |
-| cfg.rb:9:1:9:21 | call to [] | cfg.rb:12:3:12:8 | self |  |
-| cfg.rb:9:4:9:6 | one | cfg.rb:9:10:9:10 | b |  |
-| cfg.rb:9:4:9:12 | "one#{...}" | cfg.rb:9:14:9:20 | another |  |
-| cfg.rb:9:7:9:12 | #{...} | cfg.rb:9:4:9:12 | "one#{...}" |  |
-| cfg.rb:9:10:9:10 | b | cfg.rb:9:7:9:12 | #{...} |  |
-| cfg.rb:9:14:9:20 | "another" | cfg.rb:9:1:9:21 | call to [] |  |
+| cfg.rb:9:1:9:21 | After call to [] | cfg.rb:11:1:13:3 | begin ...  |  |
+| cfg.rb:9:1:9:21 | Array | cfg.rb:9:4:9:12 | Before "one#{...}" |  |
+| cfg.rb:9:1:9:21 | Before call to [] | cfg.rb:9:1:9:21 | Array |  |
+| cfg.rb:9:1:9:21 | call to [] | cfg.rb:9:1:9:21 | After call to [] |  |
+| cfg.rb:9:4:9:6 | one | cfg.rb:9:7:9:12 | #{...} |  |
+| cfg.rb:9:4:9:12 | "one#{...}" | cfg.rb:9:4:9:12 | After "one#{...}" |  |
+| cfg.rb:9:4:9:12 | After "one#{...}" | cfg.rb:9:14:9:20 | Before "another" |  |
+| cfg.rb:9:4:9:12 | Before "one#{...}" | cfg.rb:9:4:9:6 | one |  |
+| cfg.rb:9:7:9:12 | #{...} | cfg.rb:9:10:9:10 | b |  |
+| cfg.rb:9:7:9:12 | After #{...} | cfg.rb:9:4:9:12 | "one#{...}" |  |
+| cfg.rb:9:10:9:10 | b | cfg.rb:9:7:9:12 | After #{...} |  |
+| cfg.rb:9:14:9:20 | "another" | cfg.rb:9:14:9:20 | After "another" |  |
+| cfg.rb:9:14:9:20 | After "another" | cfg.rb:9:1:9:21 | call to [] |  |
+| cfg.rb:9:14:9:20 | Before "another" | cfg.rb:9:14:9:20 | another |  |
 | cfg.rb:9:14:9:20 | another | cfg.rb:9:14:9:20 | "another" |  |
-| cfg.rb:12:3:12:8 | call to puts | cfg.rb:19:1:21:1 | END { ... } |  |
+| cfg.rb:11:1:13:3 | After begin ...  | cfg.rb:19:1:21:1 | END { ... } |  |
+| cfg.rb:11:1:13:3 | begin ...  | cfg.rb:12:3:12:8 | Before call to puts |  |
+| cfg.rb:12:3:12:8 | After call to puts | cfg.rb:11:1:13:3 | After begin ...  |  |
+| cfg.rb:12:3:12:8 | Before call to puts | cfg.rb:12:3:12:8 | self |  |
+| cfg.rb:12:3:12:8 | call to puts | cfg.rb:12:3:12:8 | After call to puts |  |
 | cfg.rb:12:3:12:8 | self | cfg.rb:12:8:12:8 | 4 |  |
 | cfg.rb:12:8:12:8 | 4 | cfg.rb:12:3:12:8 | call to puts |  |
-| cfg.rb:15:1:17:1 | BEGIN { ... } | cfg.rb:1:1:1:12 | bar |  |
-| cfg.rb:16:3:16:14 | call to puts | cfg.rb:15:1:17:1 | BEGIN { ... } |  |
-| cfg.rb:16:3:16:14 | self | cfg.rb:16:9:16:13 | hello |  |
-| cfg.rb:16:8:16:14 | "hello" | cfg.rb:16:3:16:14 | call to puts |  |
+| cfg.rb:15:1:17:1 | After BEGIN { ... } | cfg.rb:1:1:1:12 | bar |  |
+| cfg.rb:15:1:17:1 | BEGIN { ... } | cfg.rb:16:3:16:14 | Before call to puts |  |
+| cfg.rb:16:3:16:14 | After call to puts | cfg.rb:15:1:17:1 | After BEGIN { ... } |  |
+| cfg.rb:16:3:16:14 | Before call to puts | cfg.rb:16:3:16:14 | self |  |
+| cfg.rb:16:3:16:14 | call to puts | cfg.rb:16:3:16:14 | After call to puts |  |
+| cfg.rb:16:3:16:14 | self | cfg.rb:16:8:16:14 | Before "hello" |  |
+| cfg.rb:16:8:16:14 | "hello" | cfg.rb:16:8:16:14 | After "hello" |  |
+| cfg.rb:16:8:16:14 | After "hello" | cfg.rb:16:3:16:14 | call to puts |  |
+| cfg.rb:16:8:16:14 | Before "hello" | cfg.rb:16:9:16:13 | hello |  |
 | cfg.rb:16:9:16:13 | hello | cfg.rb:16:8:16:14 | "hello" |  |
-| cfg.rb:19:1:21:1 | END { ... } | cfg.rb:23:1:23:2 | 41 |  |
+| cfg.rb:19:1:21:1 | After END { ... } | cfg.rb:23:1:23:6 | Before ... + ... |  |
+| cfg.rb:19:1:21:1 | END { ... } | cfg.rb:20:3:20:14 | Before call to puts |  |
+| cfg.rb:20:3:20:14 | After call to puts | cfg.rb:19:1:21:1 | After END { ... } |  |
+| cfg.rb:20:3:20:14 | Before call to puts | cfg.rb:20:3:20:14 | self |  |
+| cfg.rb:20:3:20:14 | call to puts | cfg.rb:20:3:20:14 | After call to puts |  |
+| cfg.rb:20:3:20:14 | self | cfg.rb:20:8:20:14 | Before "world" |  |
+| cfg.rb:20:8:20:14 | "world" | cfg.rb:20:8:20:14 | After "world" |  |
+| cfg.rb:20:8:20:14 | After "world" | cfg.rb:20:3:20:14 | call to puts |  |
+| cfg.rb:20:8:20:14 | Before "world" | cfg.rb:20:9:20:13 | world |  |
+| cfg.rb:20:9:20:13 | world | cfg.rb:20:8:20:14 | "world" |  |
 | cfg.rb:23:1:23:2 | 41 | cfg.rb:23:6:23:6 | 1 |  |
-| cfg.rb:23:1:23:6 | ... + ... | cfg.rb:25:1:25:1 | 2 |  |
+| cfg.rb:23:1:23:6 | ... + ... | cfg.rb:23:1:23:6 | After ... + ... |  |
+| cfg.rb:23:1:23:6 | After ... + ... | cfg.rb:25:1:25:22 | Before call to times |  |
+| cfg.rb:23:1:23:6 | Before ... + ... | cfg.rb:23:1:23:2 | 41 |  |
 | cfg.rb:23:6:23:6 | 1 | cfg.rb:23:1:23:6 | ... + ... |  |
 | cfg.rb:25:1:25:1 | 2 | cfg.rb:25:9:25:22 | { ... } |  |
-| cfg.rb:25:1:25:22 | call to times | cfg.rb:27:1:27:11 | self |  |
-| cfg.rb:25:9:25:22 | enter { ... } | cfg.rb:25:12:25:12 | x |  |
-| cfg.rb:25:9:25:22 | exit { ... } (normal) | cfg.rb:25:9:25:22 | exit { ... } |  |
+| cfg.rb:25:1:25:22 | After call to times | cfg.rb:27:1:27:11 | Before call to puts |  |
+| cfg.rb:25:1:25:22 | Before call to times | cfg.rb:25:1:25:1 | 2 |  |
+| cfg.rb:25:1:25:22 | call to times | cfg.rb:25:1:25:22 | After call to times |  |
+| cfg.rb:25:9:25:22 | Entry | cfg.rb:25:12:25:12 | x |  |
+| cfg.rb:25:9:25:22 | Normal Exit | cfg.rb:25:9:25:22 | Exit |  |
 | cfg.rb:25:9:25:22 | { ... } | cfg.rb:25:1:25:22 | call to times |  |
-| cfg.rb:25:12:25:12 | x | cfg.rb:25:15:25:20 | self |  |
-| cfg.rb:25:15:25:20 | call to puts | cfg.rb:25:9:25:22 | exit { ... } (normal) |  |
+| cfg.rb:25:12:25:12 | x | cfg.rb:25:15:25:20 | ... |  |
+| cfg.rb:25:15:25:20 | ... | cfg.rb:25:15:25:20 | Before call to puts |  |
+| cfg.rb:25:15:25:20 | After ... | cfg.rb:25:9:25:22 | Normal Exit |  |
+| cfg.rb:25:15:25:20 | After call to puts | cfg.rb:25:15:25:20 | After ... |  |
+| cfg.rb:25:15:25:20 | Before call to puts | cfg.rb:25:15:25:20 | self |  |
+| cfg.rb:25:15:25:20 | call to puts | cfg.rb:25:15:25:20 | After call to puts |  |
 | cfg.rb:25:15:25:20 | self | cfg.rb:25:20:25:20 | x |  |
 | cfg.rb:25:20:25:20 | x | cfg.rb:25:15:25:20 | call to puts |  |
-| cfg.rb:27:1:27:11 | call to puts | cfg.rb:29:1:29:4 | Proc |  |
-| cfg.rb:27:1:27:11 | self | cfg.rb:27:7:27:11 | puts |  |
-| cfg.rb:27:6:27:11 | &... | cfg.rb:27:1:27:11 | call to puts |  |
-| cfg.rb:27:7:27:11 | :puts | cfg.rb:27:6:27:11 | &... |  |
+| cfg.rb:27:1:27:11 | After call to puts | cfg.rb:29:1:29:24 | Before call to new |  |
+| cfg.rb:27:1:27:11 | Before call to puts | cfg.rb:27:1:27:11 | self |  |
+| cfg.rb:27:1:27:11 | call to puts | cfg.rb:27:1:27:11 | After call to puts |  |
+| cfg.rb:27:1:27:11 | self | cfg.rb:27:6:27:11 | Before &... |  |
+| cfg.rb:27:6:27:11 | &... | cfg.rb:27:6:27:11 | After &... |  |
+| cfg.rb:27:6:27:11 | After &... | cfg.rb:27:1:27:11 | call to puts |  |
+| cfg.rb:27:6:27:11 | Before &... | cfg.rb:27:7:27:11 | Before :puts |  |
+| cfg.rb:27:7:27:11 | :puts | cfg.rb:27:7:27:11 | After :puts |  |
+| cfg.rb:27:7:27:11 | After :puts | cfg.rb:27:6:27:11 | &... |  |
+| cfg.rb:27:7:27:11 | Before :puts | cfg.rb:27:7:27:11 | puts |  |
 | cfg.rb:27:7:27:11 | puts | cfg.rb:27:7:27:11 | :puts |  |
 | cfg.rb:29:1:29:4 | Proc | cfg.rb:29:10:29:24 | { ... } |  |
-| cfg.rb:29:1:29:24 | call to new | cfg.rb:31:7:31:10 | true |  |
-| cfg.rb:29:10:29:24 | enter { ... } | cfg.rb:29:14:29:14 | x |  |
-| cfg.rb:29:10:29:24 | exit { ... } (normal) | cfg.rb:29:10:29:24 | exit { ... } |  |
+| cfg.rb:29:1:29:24 | After call to new | cfg.rb:31:1:33:3 | while ... |  |
+| cfg.rb:29:1:29:24 | Before call to new | cfg.rb:29:1:29:4 | Proc |  |
+| cfg.rb:29:1:29:24 | call to new | cfg.rb:29:1:29:24 | After call to new |  |
+| cfg.rb:29:10:29:24 | Entry | cfg.rb:29:14:29:14 | x |  |
+| cfg.rb:29:10:29:24 | Normal Exit | cfg.rb:29:10:29:24 | Exit |  |
 | cfg.rb:29:10:29:24 | { ... } | cfg.rb:29:1:29:24 | call to new |  |
-| cfg.rb:29:14:29:14 | x | cfg.rb:29:17:29:17 | x |  |
+| cfg.rb:29:14:29:14 | x | cfg.rb:29:17:29:22 | ... |  |
 | cfg.rb:29:17:29:17 | x | cfg.rb:29:17:29:22 | call to call |  |
-| cfg.rb:29:17:29:22 | call to call | cfg.rb:29:10:29:24 | exit { ... } (normal) |  |
-| cfg.rb:31:1:33:3 | while ... | cfg.rb:35:4:35:8 | false |  |
-| cfg.rb:31:7:31:10 | true | cfg.rb:32:9:32:9 | 1 | true |
-| cfg.rb:32:3:32:9 | break | cfg.rb:31:1:33:3 | while ... | break |
+| cfg.rb:29:17:29:22 | ... | cfg.rb:29:17:29:22 | Before call to call |  |
+| cfg.rb:29:17:29:22 | After ... | cfg.rb:29:10:29:24 | Normal Exit |  |
+| cfg.rb:29:17:29:22 | After call to call | cfg.rb:29:17:29:22 | After ... |  |
+| cfg.rb:29:17:29:22 | Before call to call | cfg.rb:29:17:29:17 | x |  |
+| cfg.rb:29:17:29:22 | call to call | cfg.rb:29:17:29:22 | After call to call |  |
+| cfg.rb:31:1:33:3 | After while ... | cfg.rb:35:1:37:3 | if ... |  |
+| cfg.rb:31:1:33:3 | [LoopHeader] while ... | cfg.rb:31:7:31:10 | true |  |
+| cfg.rb:31:1:33:3 | while ... | cfg.rb:31:1:33:3 | [LoopHeader] while ... |  |
+| cfg.rb:31:7:31:10 | After true [true] | cfg.rb:31:11:33:3 | do ... |  |
+| cfg.rb:31:7:31:10 | true | cfg.rb:31:7:31:10 | After true [true] | true |
+| cfg.rb:31:11:33:3 | do ... | cfg.rb:32:3:32:9 | Before break |  |
+| cfg.rb:32:3:32:9 | Before break | cfg.rb:32:9:32:9 | 1 |  |
+| cfg.rb:32:3:32:9 | break | cfg.rb:31:1:33:3 | After while ... | break |
 | cfg.rb:32:9:32:9 | 1 | cfg.rb:32:3:32:9 | break |  |
-| cfg.rb:35:1:37:3 | if ... | cfg.rb:39:1:39:4 | self |  |
-| cfg.rb:35:4:35:8 | false | cfg.rb:35:1:37:3 | if ... | false |
+| cfg.rb:35:1:37:3 | After if ... | cfg.rb:39:1:39:12 | Before call to puts |  |
+| cfg.rb:35:1:37:3 | if ... | cfg.rb:35:4:35:8 | false |  |
+| cfg.rb:35:4:35:8 | After false [false] | cfg.rb:35:1:37:3 | After if ... |  |
+| cfg.rb:35:4:35:8 | false | cfg.rb:35:4:35:8 | After false [false] | false |
 | cfg.rb:39:1:39:4 | self | cfg.rb:39:11:39:12 | 42 |  |
-| cfg.rb:39:1:39:12 | call to puts | cfg.rb:41:6:41:7 | 10 |  |
+| cfg.rb:39:1:39:12 | After call to puts | cfg.rb:41:1:45:3 | case ... |  |
+| cfg.rb:39:1:39:12 | Before call to puts | cfg.rb:39:1:39:4 | self |  |
+| cfg.rb:39:1:39:12 | call to puts | cfg.rb:39:1:39:12 | After call to puts |  |
 | cfg.rb:39:11:39:12 | 42 | cfg.rb:39:1:39:12 | call to puts |  |
-| cfg.rb:41:1:45:3 | case ... | cfg.rb:47:1:50:3 | true |  |
-| cfg.rb:41:6:41:7 | 10 | cfg.rb:42:8:42:8 | 1 |  |
-| cfg.rb:42:3:42:24 | [match] when ... | cfg.rb:42:15:42:24 | self | match |
-| cfg.rb:42:3:42:24 | [no-match] when ... | cfg.rb:43:8:43:8 | 2 | no-match |
-| cfg.rb:42:8:42:8 | 1 | cfg.rb:42:3:42:24 | [match] when ... | match |
-| cfg.rb:42:8:42:8 | 1 | cfg.rb:42:3:42:24 | [no-match] when ... | no-match |
-| cfg.rb:42:10:42:24 | then ... | cfg.rb:41:1:45:3 | case ... |  |
-| cfg.rb:42:15:42:24 | call to puts | cfg.rb:42:10:42:24 | then ... |  |
-| cfg.rb:42:15:42:24 | self | cfg.rb:42:21:42:23 | one |  |
-| cfg.rb:42:20:42:24 | "one" | cfg.rb:42:15:42:24 | call to puts |  |
+| cfg.rb:41:1:45:3 | After case ... | cfg.rb:47:1:50:3 | case ... |  |
+| cfg.rb:41:1:45:3 | case ... | cfg.rb:41:6:41:7 | 10 |  |
+| cfg.rb:41:6:41:7 | 10 | cfg.rb:42:3:42:24 | when ... |  |
+| cfg.rb:42:3:42:24 | After when ... [match] | cfg.rb:42:10:42:24 | then ... |  |
+| cfg.rb:42:3:42:24 | After when ... [no-match] | cfg.rb:43:3:43:31 | when ... |  |
+| cfg.rb:42:3:42:24 | when ... | cfg.rb:42:8:42:8 | 1 |  |
+| cfg.rb:42:8:42:8 | 1 | cfg.rb:42:8:42:8 | After 1 [match] | match |
+| cfg.rb:42:8:42:8 | 1 | cfg.rb:42:8:42:8 | After 1 [no-match] | no-match |
+| cfg.rb:42:8:42:8 | After 1 [match] | cfg.rb:42:3:42:24 | After when ... [match] | match |
+| cfg.rb:42:8:42:8 | After 1 [no-match] | cfg.rb:42:3:42:24 | After when ... [no-match] | no-match |
+| cfg.rb:42:10:42:24 | After then ... | cfg.rb:41:1:45:3 | After case ... |  |
+| cfg.rb:42:10:42:24 | then ... | cfg.rb:42:15:42:24 | Before call to puts |  |
+| cfg.rb:42:15:42:24 | After call to puts | cfg.rb:42:10:42:24 | After then ... |  |
+| cfg.rb:42:15:42:24 | Before call to puts | cfg.rb:42:15:42:24 | self |  |
+| cfg.rb:42:15:42:24 | call to puts | cfg.rb:42:15:42:24 | After call to puts |  |
+| cfg.rb:42:15:42:24 | self | cfg.rb:42:20:42:24 | Before "one" |  |
+| cfg.rb:42:20:42:24 | "one" | cfg.rb:42:20:42:24 | After "one" |  |
+| cfg.rb:42:20:42:24 | After "one" | cfg.rb:42:15:42:24 | call to puts |  |
+| cfg.rb:42:20:42:24 | Before "one" | cfg.rb:42:21:42:23 | one |  |
 | cfg.rb:42:21:42:23 | one | cfg.rb:42:20:42:24 | "one" |  |
-| cfg.rb:43:3:43:31 | [match] when ... | cfg.rb:43:21:43:31 | self | match |
-| cfg.rb:43:3:43:31 | [no-match] when ... | cfg.rb:44:8:44:18 | self | no-match |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:3:43:31 | [match] when ... | match |
-| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:11:43:11 | 3 | no-match |
-| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:3:43:31 | [match] when ... | match |
-| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:14:43:14 | 4 | no-match |
-| cfg.rb:43:14:43:14 | 4 | cfg.rb:43:3:43:31 | [match] when ... | match |
-| cfg.rb:43:14:43:14 | 4 | cfg.rb:43:3:43:31 | [no-match] when ... | no-match |
-| cfg.rb:43:16:43:31 | then ... | cfg.rb:41:1:45:3 | case ... |  |
-| cfg.rb:43:21:43:31 | call to puts | cfg.rb:43:16:43:31 | then ... |  |
-| cfg.rb:43:21:43:31 | self | cfg.rb:43:27:43:30 | some |  |
-| cfg.rb:43:26:43:31 | "some" | cfg.rb:43:21:43:31 | call to puts |  |
+| cfg.rb:43:3:43:31 | After when ... [match] | cfg.rb:43:16:43:31 | then ... |  |
+| cfg.rb:43:3:43:31 | After when ... [no-match] | cfg.rb:44:3:44:18 | else ... |  |
+| cfg.rb:43:3:43:31 | when ... | cfg.rb:43:8:43:8 | 2 |  |
+| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:8:43:8 | After 2 [match] | match |
+| cfg.rb:43:8:43:8 | 2 | cfg.rb:43:8:43:8 | After 2 [no-match] | no-match |
+| cfg.rb:43:8:43:8 | After 2 [match] | cfg.rb:43:3:43:31 | After when ... [match] | match |
+| cfg.rb:43:8:43:8 | After 2 [no-match] | cfg.rb:43:11:43:11 | 3 |  |
+| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:11:43:11 | After 3 [match] | match |
+| cfg.rb:43:11:43:11 | 3 | cfg.rb:43:11:43:11 | After 3 [no-match] | no-match |
+| cfg.rb:43:11:43:11 | After 3 [match] | cfg.rb:43:3:43:31 | After when ... [match] | match |
+| cfg.rb:43:11:43:11 | After 3 [no-match] | cfg.rb:43:14:43:14 | 4 |  |
+| cfg.rb:43:14:43:14 | 4 | cfg.rb:43:14:43:14 | After 4 [match] | match |
+| cfg.rb:43:14:43:14 | 4 | cfg.rb:43:14:43:14 | After 4 [no-match] | no-match |
+| cfg.rb:43:14:43:14 | After 4 [match] | cfg.rb:43:3:43:31 | After when ... [match] | match |
+| cfg.rb:43:14:43:14 | After 4 [no-match] | cfg.rb:43:3:43:31 | After when ... [no-match] | no-match |
+| cfg.rb:43:16:43:31 | After then ... | cfg.rb:41:1:45:3 | After case ... |  |
+| cfg.rb:43:16:43:31 | then ... | cfg.rb:43:21:43:31 | Before call to puts |  |
+| cfg.rb:43:21:43:31 | After call to puts | cfg.rb:43:16:43:31 | After then ... |  |
+| cfg.rb:43:21:43:31 | Before call to puts | cfg.rb:43:21:43:31 | self |  |
+| cfg.rb:43:21:43:31 | call to puts | cfg.rb:43:21:43:31 | After call to puts |  |
+| cfg.rb:43:21:43:31 | self | cfg.rb:43:26:43:31 | Before "some" |  |
+| cfg.rb:43:26:43:31 | "some" | cfg.rb:43:26:43:31 | After "some" |  |
+| cfg.rb:43:26:43:31 | After "some" | cfg.rb:43:21:43:31 | call to puts |  |
+| cfg.rb:43:26:43:31 | Before "some" | cfg.rb:43:27:43:30 | some |  |
 | cfg.rb:43:27:43:30 | some | cfg.rb:43:26:43:31 | "some" |  |
-| cfg.rb:44:3:44:18 | else ... | cfg.rb:41:1:45:3 | case ... |  |
-| cfg.rb:44:8:44:18 | call to puts | cfg.rb:44:3:44:18 | else ... |  |
-| cfg.rb:44:8:44:18 | self | cfg.rb:44:14:44:17 | many |  |
-| cfg.rb:44:13:44:18 | "many" | cfg.rb:44:8:44:18 | call to puts |  |
+| cfg.rb:44:3:44:18 | After else ... | cfg.rb:41:1:45:3 | After case ... |  |
+| cfg.rb:44:3:44:18 | After else ... [match] | cfg.rb:44:3:44:18 | else ... |  |
+| cfg.rb:44:3:44:18 | else ... | cfg.rb:44:3:44:18 | After else ... [match] | match |
+| cfg.rb:44:3:44:18 | else ... | cfg.rb:44:8:44:18 | Before call to puts |  |
+| cfg.rb:44:8:44:18 | After call to puts | cfg.rb:44:3:44:18 | After else ... |  |
+| cfg.rb:44:8:44:18 | Before call to puts | cfg.rb:44:8:44:18 | self |  |
+| cfg.rb:44:8:44:18 | call to puts | cfg.rb:44:8:44:18 | After call to puts |  |
+| cfg.rb:44:8:44:18 | self | cfg.rb:44:13:44:18 | Before "many" |  |
+| cfg.rb:44:13:44:18 | "many" | cfg.rb:44:13:44:18 | After "many" |  |
+| cfg.rb:44:13:44:18 | After "many" | cfg.rb:44:8:44:18 | call to puts |  |
+| cfg.rb:44:13:44:18 | Before "many" | cfg.rb:44:14:44:17 | many |  |
 | cfg.rb:44:14:44:17 | many | cfg.rb:44:13:44:18 | "many" |  |
-| cfg.rb:47:1:50:3 | case ... | cfg.rb:52:1:52:7 | chained |  |
-| cfg.rb:47:1:50:3 | true | cfg.rb:48:8:48:8 | b |  |
-| cfg.rb:48:3:48:29 | [match] when ... | cfg.rb:48:20:48:29 | self | match |
-| cfg.rb:48:3:48:29 | [no-match] when ... | cfg.rb:49:8:49:8 | b | no-match |
+| cfg.rb:47:1:50:3 | After case ... | cfg.rb:52:1:52:35 | Before ... = ... |  |
+| cfg.rb:47:1:50:3 | case ... | cfg.rb:47:1:50:3 | true |  |
+| cfg.rb:47:1:50:3 | true | cfg.rb:48:3:48:29 | when ... |  |
+| cfg.rb:48:3:48:29 | After when ... [match] | cfg.rb:48:15:48:29 | then ... |  |
+| cfg.rb:48:3:48:29 | After when ... [no-match] | cfg.rb:49:3:49:37 | when ... |  |
+| cfg.rb:48:3:48:29 | when ... | cfg.rb:48:8:48:13 | Before ... == ... |  |
 | cfg.rb:48:8:48:8 | b | cfg.rb:48:13:48:13 | 1 |  |
-| cfg.rb:48:8:48:13 | ... == ... | cfg.rb:48:3:48:29 | [match] when ... | match |
-| cfg.rb:48:8:48:13 | ... == ... | cfg.rb:48:3:48:29 | [no-match] when ... | no-match |
+| cfg.rb:48:8:48:13 | ... == ... | cfg.rb:48:8:48:13 | After ... == ... [match] | match |
+| cfg.rb:48:8:48:13 | ... == ... | cfg.rb:48:8:48:13 | After ... == ... [no-match] | no-match |
+| cfg.rb:48:8:48:13 | After ... == ... [match] | cfg.rb:48:3:48:29 | After when ... [match] | match |
+| cfg.rb:48:8:48:13 | After ... == ... [no-match] | cfg.rb:48:3:48:29 | After when ... [no-match] | no-match |
+| cfg.rb:48:8:48:13 | Before ... == ... | cfg.rb:48:8:48:8 | b |  |
 | cfg.rb:48:13:48:13 | 1 | cfg.rb:48:8:48:13 | ... == ... |  |
-| cfg.rb:48:15:48:29 | then ... | cfg.rb:47:1:50:3 | case ... |  |
-| cfg.rb:48:20:48:29 | call to puts | cfg.rb:48:15:48:29 | then ... |  |
-| cfg.rb:48:20:48:29 | self | cfg.rb:48:26:48:28 | one |  |
-| cfg.rb:48:25:48:29 | "one" | cfg.rb:48:20:48:29 | call to puts |  |
+| cfg.rb:48:15:48:29 | After then ... | cfg.rb:47:1:50:3 | After case ... |  |
+| cfg.rb:48:15:48:29 | then ... | cfg.rb:48:20:48:29 | Before call to puts |  |
+| cfg.rb:48:20:48:29 | After call to puts | cfg.rb:48:15:48:29 | After then ... |  |
+| cfg.rb:48:20:48:29 | Before call to puts | cfg.rb:48:20:48:29 | self |  |
+| cfg.rb:48:20:48:29 | call to puts | cfg.rb:48:20:48:29 | After call to puts |  |
+| cfg.rb:48:20:48:29 | self | cfg.rb:48:25:48:29 | Before "one" |  |
+| cfg.rb:48:25:48:29 | "one" | cfg.rb:48:25:48:29 | After "one" |  |
+| cfg.rb:48:25:48:29 | After "one" | cfg.rb:48:20:48:29 | call to puts |  |
+| cfg.rb:48:25:48:29 | Before "one" | cfg.rb:48:26:48:28 | one |  |
 | cfg.rb:48:26:48:28 | one | cfg.rb:48:25:48:29 | "one" |  |
-| cfg.rb:49:3:49:37 | [match] when ... | cfg.rb:49:27:49:37 | self | match |
-| cfg.rb:49:3:49:37 | [no-match] when ... | cfg.rb:47:1:50:3 | case ... | no-match |
+| cfg.rb:49:3:49:37 | After when ... [match] | cfg.rb:49:22:49:37 | then ... |  |
+| cfg.rb:49:3:49:37 | After when ... [no-match] | cfg.rb:47:1:50:3 | After case ... |  |
+| cfg.rb:49:3:49:37 | when ... | cfg.rb:49:8:49:13 | Before ... == ... |  |
 | cfg.rb:49:8:49:8 | b | cfg.rb:49:13:49:13 | 0 |  |
-| cfg.rb:49:8:49:13 | ... == ... | cfg.rb:49:3:49:37 | [match] when ... | match |
-| cfg.rb:49:8:49:13 | ... == ... | cfg.rb:49:16:49:16 | b | no-match |
+| cfg.rb:49:8:49:13 | ... == ... | cfg.rb:49:8:49:13 | After ... == ... [match] | match |
+| cfg.rb:49:8:49:13 | ... == ... | cfg.rb:49:8:49:13 | After ... == ... [no-match] | no-match |
+| cfg.rb:49:8:49:13 | After ... == ... [match] | cfg.rb:49:3:49:37 | After when ... [match] | match |
+| cfg.rb:49:8:49:13 | After ... == ... [no-match] | cfg.rb:49:16:49:20 | Before ... > ... |  |
+| cfg.rb:49:8:49:13 | Before ... == ... | cfg.rb:49:8:49:8 | b |  |
 | cfg.rb:49:13:49:13 | 0 | cfg.rb:49:8:49:13 | ... == ... |  |
 | cfg.rb:49:16:49:16 | b | cfg.rb:49:20:49:20 | 1 |  |
-| cfg.rb:49:16:49:20 | ... > ... | cfg.rb:49:3:49:37 | [match] when ... | match |
-| cfg.rb:49:16:49:20 | ... > ... | cfg.rb:49:3:49:37 | [no-match] when ... | no-match |
+| cfg.rb:49:16:49:20 | ... > ... | cfg.rb:49:16:49:20 | After ... > ... [match] | match |
+| cfg.rb:49:16:49:20 | ... > ... | cfg.rb:49:16:49:20 | After ... > ... [no-match] | no-match |
+| cfg.rb:49:16:49:20 | After ... > ... [match] | cfg.rb:49:3:49:37 | After when ... [match] | match |
+| cfg.rb:49:16:49:20 | After ... > ... [no-match] | cfg.rb:49:3:49:37 | After when ... [no-match] | no-match |
+| cfg.rb:49:16:49:20 | Before ... > ... | cfg.rb:49:16:49:16 | b |  |
 | cfg.rb:49:20:49:20 | 1 | cfg.rb:49:16:49:20 | ... > ... |  |
-| cfg.rb:49:22:49:37 | then ... | cfg.rb:47:1:50:3 | case ... |  |
-| cfg.rb:49:27:49:37 | call to puts | cfg.rb:49:22:49:37 | then ... |  |
-| cfg.rb:49:27:49:37 | self | cfg.rb:49:33:49:36 | some |  |
-| cfg.rb:49:32:49:37 | "some" | cfg.rb:49:27:49:37 | call to puts |  |
+| cfg.rb:49:22:49:37 | After then ... | cfg.rb:47:1:50:3 | After case ... |  |
+| cfg.rb:49:22:49:37 | then ... | cfg.rb:49:27:49:37 | Before call to puts |  |
+| cfg.rb:49:27:49:37 | After call to puts | cfg.rb:49:22:49:37 | After then ... |  |
+| cfg.rb:49:27:49:37 | Before call to puts | cfg.rb:49:27:49:37 | self |  |
+| cfg.rb:49:27:49:37 | call to puts | cfg.rb:49:27:49:37 | After call to puts |  |
+| cfg.rb:49:27:49:37 | self | cfg.rb:49:32:49:37 | Before "some" |  |
+| cfg.rb:49:32:49:37 | "some" | cfg.rb:49:32:49:37 | After "some" |  |
+| cfg.rb:49:32:49:37 | After "some" | cfg.rb:49:27:49:37 | call to puts |  |
+| cfg.rb:49:32:49:37 | Before "some" | cfg.rb:49:33:49:36 | some |  |
 | cfg.rb:49:33:49:36 | some | cfg.rb:49:32:49:37 | "some" |  |
-| cfg.rb:52:1:52:7 | chained | cfg.rb:52:12:52:12 | a |  |
-| cfg.rb:52:1:52:35 | ... = ... | cfg.rb:54:1:54:9 | character |  |
-| cfg.rb:52:11:52:13 | "a" | cfg.rb:52:18:52:24 | chained |  |
-| cfg.rb:52:11:52:35 | "..." "..." | cfg.rb:52:1:52:35 | ... = ... |  |
+| cfg.rb:52:1:52:7 | chained | cfg.rb:52:11:52:35 | Before "..." "..." |  |
+| cfg.rb:52:1:52:35 | ... = ... | cfg.rb:52:1:52:35 | After ... = ... |  |
+| cfg.rb:52:1:52:35 | After ... = ... | cfg.rb:54:1:54:17 | Before ... = ... |  |
+| cfg.rb:52:1:52:35 | Before ... = ... | cfg.rb:52:1:52:7 | chained |  |
+| cfg.rb:52:11:52:13 | "a" | cfg.rb:52:11:52:13 | After "a" |  |
+| cfg.rb:52:11:52:13 | After "a" | cfg.rb:52:15:52:26 | Before "#{...}" |  |
+| cfg.rb:52:11:52:13 | Before "a" | cfg.rb:52:12:52:12 | a |  |
+| cfg.rb:52:11:52:35 | "..." "..." | cfg.rb:52:11:52:35 | After "..." "..." |  |
+| cfg.rb:52:11:52:35 | After "..." "..." | cfg.rb:52:1:52:35 | ... = ... |  |
+| cfg.rb:52:11:52:35 | Before "..." "..." | cfg.rb:52:11:52:13 | Before "a" |  |
 | cfg.rb:52:12:52:12 | a | cfg.rb:52:11:52:13 | "a" |  |
-| cfg.rb:52:15:52:26 | "#{...}" | cfg.rb:52:29:52:34 | string |  |
-| cfg.rb:52:16:52:25 | #{...} | cfg.rb:52:15:52:26 | "#{...}" |  |
-| cfg.rb:52:18:52:24 | chained | cfg.rb:52:16:52:25 | #{...} |  |
-| cfg.rb:52:28:52:35 | "string" | cfg.rb:52:11:52:35 | "..." "..." |  |
+| cfg.rb:52:15:52:26 | "#{...}" | cfg.rb:52:15:52:26 | After "#{...}" |  |
+| cfg.rb:52:15:52:26 | After "#{...}" | cfg.rb:52:28:52:35 | Before "string" |  |
+| cfg.rb:52:15:52:26 | Before "#{...}" | cfg.rb:52:16:52:25 | #{...} |  |
+| cfg.rb:52:16:52:25 | #{...} | cfg.rb:52:18:52:24 | chained |  |
+| cfg.rb:52:16:52:25 | After #{...} | cfg.rb:52:15:52:26 | "#{...}" |  |
+| cfg.rb:52:18:52:24 | chained | cfg.rb:52:16:52:25 | After #{...} |  |
+| cfg.rb:52:28:52:35 | "string" | cfg.rb:52:28:52:35 | After "string" |  |
+| cfg.rb:52:28:52:35 | After "string" | cfg.rb:52:11:52:35 | "..." "..." |  |
+| cfg.rb:52:28:52:35 | Before "string" | cfg.rb:52:29:52:34 | string |  |
 | cfg.rb:52:29:52:34 | string | cfg.rb:52:28:52:35 | "string" |  |
 | cfg.rb:54:1:54:9 | character | cfg.rb:54:13:54:17 | ?\\x40 |  |
-| cfg.rb:54:1:54:17 | ... = ... | cfg.rb:58:1:72:3 | Silly |  |
+| cfg.rb:54:1:54:17 | ... = ... | cfg.rb:54:1:54:17 | After ... = ... |  |
+| cfg.rb:54:1:54:17 | After ... = ... | cfg.rb:58:1:72:3 | Silly |  |
+| cfg.rb:54:1:54:17 | Before ... = ... | cfg.rb:54:1:54:9 | character |  |
 | cfg.rb:54:13:54:17 | ?\\x40 | cfg.rb:54:1:54:17 | ... = ... |  |
+| cfg.rb:58:1:72:3 | After Silly | cfg.rb:74:1:74:6 | Before ... = ... |  |
 | cfg.rb:58:1:72:3 | Silly | cfg.rb:58:15:58:20 | Object |  |
-| cfg.rb:58:15:58:20 | Object | cfg.rb:59:3:59:9 | complex |  |
-| cfg.rb:59:3:59:9 | complex | cfg.rb:59:13:59:14 | 10 |  |
-| cfg.rb:59:3:59:17 | ... = ... | cfg.rb:60:3:60:13 | conditional |  |
+| cfg.rb:58:15:58:20 | Object | cfg.rb:59:3:59:17 | Before ... = ... |  |
+| cfg.rb:59:3:59:9 | complex | cfg.rb:59:13:59:17 | Before ... - ... |  |
+| cfg.rb:59:3:59:17 | ... = ... | cfg.rb:59:3:59:17 | After ... = ... |  |
+| cfg.rb:59:3:59:17 | After ... = ... | cfg.rb:60:3:60:40 | Before ... = ... |  |
+| cfg.rb:59:3:59:17 | Before ... = ... | cfg.rb:59:3:59:9 | complex |  |
 | cfg.rb:59:13:59:14 | 10 | cfg.rb:59:16:59:17 | 2i |  |
-| cfg.rb:59:13:59:17 | ... - ... | cfg.rb:59:3:59:17 | ... = ... |  |
+| cfg.rb:59:13:59:17 | ... - ... | cfg.rb:59:13:59:17 | After ... - ... |  |
+| cfg.rb:59:13:59:17 | After ... - ... | cfg.rb:59:3:59:17 | ... = ... |  |
+| cfg.rb:59:13:59:17 | Before ... - ... | cfg.rb:59:13:59:14 | 10 |  |
 | cfg.rb:59:16:59:17 | 2i | cfg.rb:59:13:59:17 | ... - ... |  |
-| cfg.rb:60:3:60:13 | conditional | cfg.rb:60:17:60:17 | self |  |
-| cfg.rb:60:3:60:40 | ... = ... | cfg.rb:61:3:61:3 | C |  |
-| cfg.rb:60:17:60:17 | call to b | cfg.rb:60:21:60:22 | 10 |  |
+| cfg.rb:60:3:60:13 | conditional | cfg.rb:60:17:60:40 | ... ? ... : ... |  |
+| cfg.rb:60:3:60:40 | ... = ... | cfg.rb:60:3:60:40 | After ... = ... |  |
+| cfg.rb:60:3:60:40 | After ... = ... | cfg.rb:61:3:61:16 | Before ... = ... |  |
+| cfg.rb:60:3:60:40 | Before ... = ... | cfg.rb:60:3:60:13 | conditional |  |
+| cfg.rb:60:17:60:17 | After call to b | cfg.rb:60:21:60:22 | 10 |  |
+| cfg.rb:60:17:60:17 | Before call to b | cfg.rb:60:17:60:17 | self |  |
+| cfg.rb:60:17:60:17 | call to b | cfg.rb:60:17:60:17 | After call to b |  |
 | cfg.rb:60:17:60:17 | self | cfg.rb:60:17:60:17 | call to b |  |
-| cfg.rb:60:17:60:22 | ... < ... | cfg.rb:60:27:60:31 | hello | true |
-| cfg.rb:60:17:60:22 | ... < ... | cfg.rb:60:37:60:39 | bye | false |
-| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:60:3:60:40 | ... = ... |  |
+| cfg.rb:60:17:60:22 | ... < ... | cfg.rb:60:17:60:22 | After ... < ... [false] | false |
+| cfg.rb:60:17:60:22 | ... < ... | cfg.rb:60:17:60:22 | After ... < ... [true] | true |
+| cfg.rb:60:17:60:22 | After ... < ... [false] | cfg.rb:60:36:60:40 | Before "bye" |  |
+| cfg.rb:60:17:60:22 | After ... < ... [true] | cfg.rb:60:26:60:32 | Before "hello" |  |
+| cfg.rb:60:17:60:22 | Before ... < ... | cfg.rb:60:17:60:17 | Before call to b |  |
+| cfg.rb:60:17:60:40 | ... ? ... : ... | cfg.rb:60:17:60:22 | Before ... < ... |  |
+| cfg.rb:60:17:60:40 | After ... ? ... : ... | cfg.rb:60:3:60:40 | ... = ... |  |
 | cfg.rb:60:21:60:22 | 10 | cfg.rb:60:17:60:22 | ... < ... |  |
-| cfg.rb:60:26:60:32 | "hello" | cfg.rb:60:17:60:40 | ... ? ... : ... |  |
+| cfg.rb:60:26:60:32 | "hello" | cfg.rb:60:26:60:32 | After "hello" |  |
+| cfg.rb:60:26:60:32 | After "hello" | cfg.rb:60:17:60:40 | After ... ? ... : ... |  |
+| cfg.rb:60:26:60:32 | Before "hello" | cfg.rb:60:27:60:31 | hello |  |
 | cfg.rb:60:27:60:31 | hello | cfg.rb:60:26:60:32 | "hello" |  |
-| cfg.rb:60:36:60:40 | "bye" | cfg.rb:60:17:60:40 | ... ? ... : ... |  |
+| cfg.rb:60:36:60:40 | "bye" | cfg.rb:60:36:60:40 | After "bye" |  |
+| cfg.rb:60:36:60:40 | After "bye" | cfg.rb:60:17:60:40 | After ... ? ... : ... |  |
+| cfg.rb:60:36:60:40 | Before "bye" | cfg.rb:60:37:60:39 | bye |  |
 | cfg.rb:60:37:60:39 | bye | cfg.rb:60:36:60:40 | "bye" |  |
-| cfg.rb:61:3:61:3 | C | cfg.rb:61:8:61:15 | constant |  |
-| cfg.rb:61:3:61:16 | ... = ... | cfg.rb:62:17:62:27 | __synth__2 |  |
-| cfg.rb:61:7:61:16 | "constant" | cfg.rb:61:3:61:16 | ... = ... |  |
+| cfg.rb:61:3:61:3 | C | cfg.rb:61:7:61:16 | Before "constant" |  |
+| cfg.rb:61:3:61:16 | ... = ... | cfg.rb:61:3:61:16 | After ... = ... |  |
+| cfg.rb:61:3:61:16 | After ... = ... | cfg.rb:62:3:62:27 | ... |  |
+| cfg.rb:61:3:61:16 | Before ... = ... | cfg.rb:61:3:61:3 | C |  |
+| cfg.rb:61:7:61:16 | "constant" | cfg.rb:61:7:61:16 | After "constant" |  |
+| cfg.rb:61:7:61:16 | After "constant" | cfg.rb:61:3:61:16 | ... = ... |  |
+| cfg.rb:61:7:61:16 | Before "constant" | cfg.rb:61:8:61:15 | constant |  |
 | cfg.rb:61:8:61:15 | constant | cfg.rb:61:7:61:16 | "constant" |  |
-| cfg.rb:62:3:62:27 | ... | cfg.rb:63:3:66:5 | pattern |  |
+| cfg.rb:62:3:62:27 | ... | cfg.rb:62:17:62:27 | Before ... = ... |  |
+| cfg.rb:62:3:62:27 | After ... | cfg.rb:63:3:66:5 | pattern |  |
 | cfg.rb:62:4:62:4 | 0 | cfg.rb:62:4:62:4 | call to [] |  |
-| cfg.rb:62:4:62:4 | ... = ... | cfg.rb:62:7:62:12 | __synth__2__1 |  |
+| cfg.rb:62:4:62:4 | ... = ... | cfg.rb:62:4:62:4 | After ... = ... |  |
+| cfg.rb:62:4:62:4 | After ... = ... | cfg.rb:62:7:62:12 | ... |  |
+| cfg.rb:62:4:62:4 | After call to [] | cfg.rb:62:4:62:4 | ... = ... |  |
+| cfg.rb:62:4:62:4 | Before ... = ... | cfg.rb:62:4:62:4 | x |  |
+| cfg.rb:62:4:62:4 | Before call to [] | cfg.rb:62:4:62:4 | __synth__2 |  |
 | cfg.rb:62:4:62:4 | __synth__2 | cfg.rb:62:4:62:4 | 0 |  |
-| cfg.rb:62:4:62:4 | call to [] | cfg.rb:62:4:62:4 | ... = ... |  |
-| cfg.rb:62:4:62:4 | x | cfg.rb:62:4:62:4 | __synth__2 |  |
+| cfg.rb:62:4:62:4 | call to [] | cfg.rb:62:4:62:4 | After call to [] |  |
+| cfg.rb:62:4:62:4 | x | cfg.rb:62:4:62:4 | Before call to [] |  |
 | cfg.rb:62:7:62:12 | 1 | cfg.rb:62:7:62:12 | call to [] |  |
-| cfg.rb:62:7:62:12 | * ... | cfg.rb:62:7:62:12 | ... = ... |  |
-| cfg.rb:62:7:62:12 | ... | cfg.rb:62:3:62:27 | ... |  |
-| cfg.rb:62:7:62:12 | ... = ... | cfg.rb:62:8:62:8 | y |  |
+| cfg.rb:62:7:62:12 | * ... | cfg.rb:62:7:62:12 | After * ... |  |
+| cfg.rb:62:7:62:12 | ... | cfg.rb:62:7:62:12 | Before ... = ... |  |
+| cfg.rb:62:7:62:12 | ... = ... | cfg.rb:62:7:62:12 | After ... = ... |  |
+| cfg.rb:62:7:62:12 | After * ... | cfg.rb:62:7:62:12 | ... = ... |  |
+| cfg.rb:62:7:62:12 | After ... | cfg.rb:62:3:62:27 | After ... |  |
+| cfg.rb:62:7:62:12 | After ... = ... | cfg.rb:62:8:62:8 | Before ... = ... |  |
+| cfg.rb:62:7:62:12 | After call to [] | cfg.rb:62:7:62:12 | * ... |  |
+| cfg.rb:62:7:62:12 | Before * ... | cfg.rb:62:7:62:12 | Before call to [] |  |
+| cfg.rb:62:7:62:12 | Before ... = ... | cfg.rb:62:7:62:12 | __synth__2__1 |  |
+| cfg.rb:62:7:62:12 | Before call to [] | cfg.rb:62:7:62:12 | __synth__2 |  |
 | cfg.rb:62:7:62:12 | __synth__2 | cfg.rb:62:7:62:12 | 1 |  |
-| cfg.rb:62:7:62:12 | __synth__2__1 | cfg.rb:62:7:62:12 | __synth__2 |  |
-| cfg.rb:62:7:62:12 | call to [] | cfg.rb:62:7:62:12 | * ... |  |
+| cfg.rb:62:7:62:12 | __synth__2__1 | cfg.rb:62:7:62:12 | Before * ... |  |
+| cfg.rb:62:7:62:12 | call to [] | cfg.rb:62:7:62:12 | After call to [] |  |
 | cfg.rb:62:8:62:8 | 0 | cfg.rb:62:8:62:8 | call to [] |  |
-| cfg.rb:62:8:62:8 | ... = ... | cfg.rb:62:11:62:11 | z |  |
+| cfg.rb:62:8:62:8 | ... = ... | cfg.rb:62:8:62:8 | After ... = ... |  |
+| cfg.rb:62:8:62:8 | After ... = ... | cfg.rb:62:11:62:11 | Before ... = ... |  |
+| cfg.rb:62:8:62:8 | After call to [] | cfg.rb:62:8:62:8 | ... = ... |  |
+| cfg.rb:62:8:62:8 | Before ... = ... | cfg.rb:62:8:62:8 | y |  |
+| cfg.rb:62:8:62:8 | Before call to [] | cfg.rb:62:8:62:8 | __synth__2__1 |  |
 | cfg.rb:62:8:62:8 | __synth__2__1 | cfg.rb:62:8:62:8 | 0 |  |
-| cfg.rb:62:8:62:8 | call to [] | cfg.rb:62:8:62:8 | ... = ... |  |
-| cfg.rb:62:8:62:8 | y | cfg.rb:62:8:62:8 | __synth__2__1 |  |
+| cfg.rb:62:8:62:8 | call to [] | cfg.rb:62:8:62:8 | After call to [] |  |
+| cfg.rb:62:8:62:8 | y | cfg.rb:62:8:62:8 | Before call to [] |  |
 | cfg.rb:62:11:62:11 | 1 | cfg.rb:62:11:62:11 | call to [] |  |
-| cfg.rb:62:11:62:11 | ... = ... | cfg.rb:62:7:62:12 | ... |  |
+| cfg.rb:62:11:62:11 | ... = ... | cfg.rb:62:11:62:11 | After ... = ... |  |
+| cfg.rb:62:11:62:11 | After ... = ... | cfg.rb:62:7:62:12 | After ... |  |
+| cfg.rb:62:11:62:11 | After call to [] | cfg.rb:62:11:62:11 | ... = ... |  |
+| cfg.rb:62:11:62:11 | Before ... = ... | cfg.rb:62:11:62:11 | z |  |
+| cfg.rb:62:11:62:11 | Before call to [] | cfg.rb:62:11:62:11 | __synth__2__1 |  |
 | cfg.rb:62:11:62:11 | __synth__2__1 | cfg.rb:62:11:62:11 | 1 |  |
-| cfg.rb:62:11:62:11 | call to [] | cfg.rb:62:11:62:11 | ... = ... |  |
-| cfg.rb:62:11:62:11 | z | cfg.rb:62:11:62:11 | __synth__2__1 |  |
-| cfg.rb:62:17:62:27 | * ... | cfg.rb:62:17:62:27 | ... = ... |  |
-| cfg.rb:62:17:62:27 | ... = ... | cfg.rb:62:4:62:4 | x |  |
+| cfg.rb:62:11:62:11 | call to [] | cfg.rb:62:11:62:11 | After call to [] |  |
+| cfg.rb:62:11:62:11 | z | cfg.rb:62:11:62:11 | Before call to [] |  |
+| cfg.rb:62:17:62:27 | * ... | cfg.rb:62:17:62:27 | After * ... |  |
+| cfg.rb:62:17:62:27 | ... = ... | cfg.rb:62:17:62:27 | After ... = ... |  |
+| cfg.rb:62:17:62:27 | After * ... | cfg.rb:62:17:62:27 | ... = ... |  |
+| cfg.rb:62:17:62:27 | After ... = ... | cfg.rb:62:4:62:4 | Before ... = ... |  |
+| cfg.rb:62:17:62:27 | After call to [] | cfg.rb:62:17:62:27 | * ... |  |
 | cfg.rb:62:17:62:27 | Array | cfg.rb:62:18:62:18 | 1 |  |
-| cfg.rb:62:17:62:27 | __synth__2 | cfg.rb:62:17:62:27 | Array |  |
-| cfg.rb:62:17:62:27 | call to [] | cfg.rb:62:17:62:27 | * ... |  |
-| cfg.rb:62:18:62:18 | 1 | cfg.rb:62:21:62:26 | Array |  |
+| cfg.rb:62:17:62:27 | Before * ... | cfg.rb:62:17:62:27 | Before call to [] |  |
+| cfg.rb:62:17:62:27 | Before ... = ... | cfg.rb:62:17:62:27 | __synth__2 |  |
+| cfg.rb:62:17:62:27 | Before call to [] | cfg.rb:62:17:62:27 | Array |  |
+| cfg.rb:62:17:62:27 | __synth__2 | cfg.rb:62:17:62:27 | Before * ... |  |
+| cfg.rb:62:17:62:27 | call to [] | cfg.rb:62:17:62:27 | After call to [] |  |
+| cfg.rb:62:18:62:18 | 1 | cfg.rb:62:21:62:26 | Before call to [] |  |
+| cfg.rb:62:21:62:26 | After call to [] | cfg.rb:62:17:62:27 | call to [] |  |
 | cfg.rb:62:21:62:26 | Array | cfg.rb:62:22:62:22 | 2 |  |
-| cfg.rb:62:21:62:26 | call to [] | cfg.rb:62:17:62:27 | call to [] |  |
+| cfg.rb:62:21:62:26 | Before call to [] | cfg.rb:62:21:62:26 | Array |  |
+| cfg.rb:62:21:62:26 | call to [] | cfg.rb:62:21:62:26 | After call to [] |  |
 | cfg.rb:62:22:62:22 | 2 | cfg.rb:62:25:62:25 | 3 |  |
 | cfg.rb:62:25:62:25 | 3 | cfg.rb:62:21:62:26 | call to [] |  |
-| cfg.rb:63:3:66:5 | enter pattern | cfg.rb:63:17:63:17 | a |  |
-| cfg.rb:63:3:66:5 | exit pattern (normal) | cfg.rb:63:3:66:5 | exit pattern |  |
-| cfg.rb:63:3:66:5 | pattern | cfg.rb:67:3:67:7 | items |  |
-| cfg.rb:63:16:63:20 | (..., ...) | cfg.rb:64:5:64:10 | self |  |
+| cfg.rb:63:3:66:5 | Entry | cfg.rb:63:16:63:20 | (..., ...) |  |
+| cfg.rb:63:3:66:5 | Normal Exit | cfg.rb:63:3:66:5 | Exit |  |
+| cfg.rb:63:3:66:5 | pattern | cfg.rb:67:3:67:19 | Before ... = ... |  |
+| cfg.rb:63:16:63:20 | (..., ...) | cfg.rb:63:17:63:17 | a |  |
+| cfg.rb:63:16:63:20 | After (..., ...) | cfg.rb:64:5:65:10 | ... |  |
 | cfg.rb:63:17:63:17 | a | cfg.rb:63:19:63:19 | b |  |
-| cfg.rb:63:19:63:19 | b | cfg.rb:63:16:63:20 | (..., ...) |  |
-| cfg.rb:64:5:64:10 | call to puts | cfg.rb:65:5:65:10 | self |  |
+| cfg.rb:63:19:63:19 | b | cfg.rb:63:16:63:20 | After (..., ...) |  |
+| cfg.rb:64:5:64:10 | After call to puts | cfg.rb:65:5:65:10 | Before call to puts |  |
+| cfg.rb:64:5:64:10 | Before call to puts | cfg.rb:64:5:64:10 | self |  |
+| cfg.rb:64:5:64:10 | call to puts | cfg.rb:64:5:64:10 | After call to puts |  |
 | cfg.rb:64:5:64:10 | self | cfg.rb:64:10:64:10 | a |  |
+| cfg.rb:64:5:65:10 | ... | cfg.rb:64:5:64:10 | Before call to puts |  |
+| cfg.rb:64:5:65:10 | After ... | cfg.rb:63:3:66:5 | Normal Exit |  |
 | cfg.rb:64:10:64:10 | a | cfg.rb:64:5:64:10 | call to puts |  |
-| cfg.rb:65:5:65:10 | call to puts | cfg.rb:63:3:66:5 | exit pattern (normal) |  |
+| cfg.rb:65:5:65:10 | After call to puts | cfg.rb:64:5:65:10 | After ... |  |
+| cfg.rb:65:5:65:10 | Before call to puts | cfg.rb:65:5:65:10 | self |  |
+| cfg.rb:65:5:65:10 | call to puts | cfg.rb:65:5:65:10 | After call to puts |  |
 | cfg.rb:65:5:65:10 | self | cfg.rb:65:10:65:10 | b |  |
 | cfg.rb:65:10:65:10 | b | cfg.rb:65:5:65:10 | call to puts |  |
-| cfg.rb:67:3:67:7 | items | cfg.rb:67:11:67:19 | Array |  |
-| cfg.rb:67:3:67:19 | ... = ... | cfg.rb:68:3:68:15 | self |  |
+| cfg.rb:67:3:67:7 | items | cfg.rb:67:11:67:19 | Before call to [] |  |
+| cfg.rb:67:3:67:19 | ... = ... | cfg.rb:67:3:67:19 | After ... = ... |  |
+| cfg.rb:67:3:67:19 | After ... = ... | cfg.rb:68:3:68:15 | Before call to puts |  |
+| cfg.rb:67:3:67:19 | Before ... = ... | cfg.rb:67:3:67:7 | items |  |
+| cfg.rb:67:11:67:19 | After call to [] | cfg.rb:67:3:67:19 | ... = ... |  |
 | cfg.rb:67:11:67:19 | Array | cfg.rb:67:12:67:12 | 1 |  |
-| cfg.rb:67:11:67:19 | call to [] | cfg.rb:67:3:67:19 | ... = ... |  |
+| cfg.rb:67:11:67:19 | Before call to [] | cfg.rb:67:11:67:19 | Array |  |
+| cfg.rb:67:11:67:19 | call to [] | cfg.rb:67:11:67:19 | After call to [] |  |
 | cfg.rb:67:12:67:12 | 1 | cfg.rb:67:15:67:15 | 2 |  |
 | cfg.rb:67:15:67:15 | 2 | cfg.rb:67:18:67:18 | 3 |  |
 | cfg.rb:67:18:67:18 | 3 | cfg.rb:67:11:67:19 | call to [] |  |
-| cfg.rb:68:3:68:15 | call to puts | cfg.rb:69:3:71:5 | print |  |
-| cfg.rb:68:3:68:15 | self | cfg.rb:68:8:68:12 | items |  |
+| cfg.rb:68:3:68:15 | After call to puts | cfg.rb:69:3:71:5 | print |  |
+| cfg.rb:68:3:68:15 | Before call to puts | cfg.rb:68:3:68:15 | self |  |
+| cfg.rb:68:3:68:15 | call to puts | cfg.rb:68:3:68:15 | After call to puts |  |
+| cfg.rb:68:3:68:15 | self | cfg.rb:68:8:68:15 | Before ...[...] |  |
 | cfg.rb:68:8:68:12 | items | cfg.rb:68:14:68:14 | 2 |  |
-| cfg.rb:68:8:68:15 | ...[...] | cfg.rb:68:3:68:15 | call to puts |  |
+| cfg.rb:68:8:68:15 | ...[...] | cfg.rb:68:8:68:15 | After ...[...] |  |
+| cfg.rb:68:8:68:15 | After ...[...] | cfg.rb:68:3:68:15 | call to puts |  |
+| cfg.rb:68:8:68:15 | Before ...[...] | cfg.rb:68:8:68:12 | items |  |
 | cfg.rb:68:14:68:14 | 2 | cfg.rb:68:8:68:15 | ...[...] |  |
-| cfg.rb:69:3:71:5 | enter print | cfg.rb:70:5:70:16 | self |  |
-| cfg.rb:69:3:71:5 | exit print (normal) | cfg.rb:69:3:71:5 | exit print |  |
-| cfg.rb:69:3:71:5 | print | cfg.rb:74:1:74:1 | x |  |
-| cfg.rb:70:5:70:16 | call to puts | cfg.rb:69:3:71:5 | exit print (normal) |  |
-| cfg.rb:70:5:70:16 | self | cfg.rb:70:11:70:15 | silly |  |
-| cfg.rb:70:10:70:16 | "silly" | cfg.rb:70:5:70:16 | call to puts |  |
+| cfg.rb:69:3:71:5 | Entry | cfg.rb:70:5:70:16 | ... |  |
+| cfg.rb:69:3:71:5 | Normal Exit | cfg.rb:69:3:71:5 | Exit |  |
+| cfg.rb:69:3:71:5 | print | cfg.rb:58:1:72:3 | After Silly |  |
+| cfg.rb:70:5:70:16 | ... | cfg.rb:70:5:70:16 | Before call to puts |  |
+| cfg.rb:70:5:70:16 | After ... | cfg.rb:69:3:71:5 | Normal Exit |  |
+| cfg.rb:70:5:70:16 | After call to puts | cfg.rb:70:5:70:16 | After ... |  |
+| cfg.rb:70:5:70:16 | Before call to puts | cfg.rb:70:5:70:16 | self |  |
+| cfg.rb:70:5:70:16 | call to puts | cfg.rb:70:5:70:16 | After call to puts |  |
+| cfg.rb:70:5:70:16 | self | cfg.rb:70:10:70:16 | Before "silly" |  |
+| cfg.rb:70:10:70:16 | "silly" | cfg.rb:70:10:70:16 | After "silly" |  |
+| cfg.rb:70:10:70:16 | After "silly" | cfg.rb:70:5:70:16 | call to puts |  |
+| cfg.rb:70:10:70:16 | Before "silly" | cfg.rb:70:11:70:15 | silly |  |
 | cfg.rb:70:11:70:15 | silly | cfg.rb:70:10:70:16 | "silly" |  |
 | cfg.rb:74:1:74:1 | x | cfg.rb:74:5:74:6 | 42 |  |
-| cfg.rb:74:1:74:6 | ... = ... | cfg.rb:75:4:75:4 | x |  |
+| cfg.rb:74:1:74:6 | ... = ... | cfg.rb:74:1:74:6 | After ... = ... |  |
+| cfg.rb:74:1:74:6 | After ... = ... | cfg.rb:75:1:75:47 | if ... |  |
+| cfg.rb:74:1:74:6 | Before ... = ... | cfg.rb:74:1:74:1 | x |  |
 | cfg.rb:74:5:74:6 | 42 | cfg.rb:74:1:74:6 | ... = ... |  |
-| cfg.rb:75:1:75:47 | if ... | cfg.rb:78:3:78:3 | ; |  |
+| cfg.rb:75:1:75:47 | After if ... | cfg.rb:77:1:86:3 | begin ...  |  |
+| cfg.rb:75:1:75:47 | if ... | cfg.rb:75:4:75:8 | Before ... < ... |  |
 | cfg.rb:75:4:75:4 | x | cfg.rb:75:8:75:8 | 0 |  |
-| cfg.rb:75:4:75:8 | ... < ... | cfg.rb:75:15:75:15 | 0 | true |
-| cfg.rb:75:4:75:8 | ... < ... | cfg.rb:75:23:75:23 | x | false |
+| cfg.rb:75:4:75:8 | ... < ... | cfg.rb:75:4:75:8 | After ... < ... [false] | false |
+| cfg.rb:75:4:75:8 | ... < ... | cfg.rb:75:4:75:8 | After ... < ... [true] | true |
+| cfg.rb:75:4:75:8 | After ... < ... [false] | cfg.rb:75:17:75:43 | elsif ... |  |
+| cfg.rb:75:4:75:8 | After ... < ... [true] | cfg.rb:75:10:75:15 | then ... |  |
+| cfg.rb:75:4:75:8 | Before ... < ... | cfg.rb:75:4:75:4 | x |  |
 | cfg.rb:75:8:75:8 | 0 | cfg.rb:75:4:75:8 | ... < ... |  |
-| cfg.rb:75:10:75:15 | then ... | cfg.rb:75:1:75:47 | if ... |  |
-| cfg.rb:75:15:75:15 | 0 | cfg.rb:75:10:75:15 | then ... |  |
-| cfg.rb:75:17:75:43 | elsif ... | cfg.rb:75:1:75:47 | if ... |  |
+| cfg.rb:75:10:75:15 | After then ... | cfg.rb:75:1:75:47 | After if ... |  |
+| cfg.rb:75:10:75:15 | then ... | cfg.rb:75:15:75:15 | 0 |  |
+| cfg.rb:75:15:75:15 | 0 | cfg.rb:75:10:75:15 | After then ... |  |
+| cfg.rb:75:17:75:43 | After elsif ... | cfg.rb:75:1:75:47 | After if ... |  |
+| cfg.rb:75:17:75:43 | elsif ... | cfg.rb:75:23:75:28 | Before ... > ... |  |
 | cfg.rb:75:23:75:23 | x | cfg.rb:75:27:75:28 | 10 |  |
-| cfg.rb:75:23:75:28 | ... > ... | cfg.rb:75:35:75:36 | 10 | true |
-| cfg.rb:75:23:75:28 | ... > ... | cfg.rb:75:43:75:43 | x | false |
+| cfg.rb:75:23:75:28 | ... > ... | cfg.rb:75:23:75:28 | After ... > ... [false] | false |
+| cfg.rb:75:23:75:28 | ... > ... | cfg.rb:75:23:75:28 | After ... > ... [true] | true |
+| cfg.rb:75:23:75:28 | After ... > ... [false] | cfg.rb:75:38:75:43 | else ... |  |
+| cfg.rb:75:23:75:28 | After ... > ... [true] | cfg.rb:75:30:75:36 | then ... |  |
+| cfg.rb:75:23:75:28 | Before ... > ... | cfg.rb:75:23:75:23 | x |  |
 | cfg.rb:75:27:75:28 | 10 | cfg.rb:75:23:75:28 | ... > ... |  |
-| cfg.rb:75:30:75:36 | then ... | cfg.rb:75:17:75:43 | elsif ... |  |
-| cfg.rb:75:35:75:36 | 10 | cfg.rb:75:30:75:36 | then ... |  |
-| cfg.rb:75:38:75:43 | else ... | cfg.rb:75:17:75:43 | elsif ... |  |
-| cfg.rb:75:43:75:43 | x | cfg.rb:75:38:75:43 | else ... |  |
-| cfg.rb:78:3:78:3 | ; | cfg.rb:83:3:83:11 | self |  |
-| cfg.rb:82:1:83:11 | else ... | cfg.rb:85:3:85:12 | self |  |
-| cfg.rb:83:3:83:11 | call to puts | cfg.rb:82:1:83:11 | else ... |  |
-| cfg.rb:83:3:83:11 | self | cfg.rb:83:9:83:10 | ok |  |
-| cfg.rb:83:8:83:11 | "ok" | cfg.rb:83:3:83:11 | call to puts |  |
+| cfg.rb:75:30:75:36 | After then ... | cfg.rb:75:17:75:43 | After elsif ... |  |
+| cfg.rb:75:30:75:36 | then ... | cfg.rb:75:35:75:36 | 10 |  |
+| cfg.rb:75:35:75:36 | 10 | cfg.rb:75:30:75:36 | After then ... |  |
+| cfg.rb:75:38:75:43 | After else ... | cfg.rb:75:17:75:43 | After elsif ... |  |
+| cfg.rb:75:38:75:43 | else ... | cfg.rb:75:43:75:43 | x |  |
+| cfg.rb:75:43:75:43 | x | cfg.rb:75:38:75:43 | After else ... |  |
+| cfg.rb:77:1:86:3 | After begin ...  | cfg.rb:88:1:88:23 | Before ... = ... |  |
+| cfg.rb:77:1:86:3 | begin ...  | cfg.rb:78:3:78:3 | ; |  |
+| cfg.rb:78:3:78:3 | ; | cfg.rb:82:1:83:11 | else ... |  |
+| cfg.rb:82:1:83:11 | After else ... | cfg.rb:84:1:85:12 | ensure ... |  |
+| cfg.rb:82:1:83:11 | else ... | cfg.rb:83:3:83:11 | Before call to puts |  |
+| cfg.rb:83:3:83:11 | After call to puts | cfg.rb:82:1:83:11 | After else ... |  |
+| cfg.rb:83:3:83:11 | Before call to puts | cfg.rb:83:3:83:11 | self |  |
+| cfg.rb:83:3:83:11 | call to puts | cfg.rb:83:3:83:11 | After call to puts |  |
+| cfg.rb:83:3:83:11 | self | cfg.rb:83:8:83:11 | Before "ok" |  |
+| cfg.rb:83:8:83:11 | "ok" | cfg.rb:83:8:83:11 | After "ok" |  |
+| cfg.rb:83:8:83:11 | After "ok" | cfg.rb:83:3:83:11 | call to puts |  |
+| cfg.rb:83:8:83:11 | Before "ok" | cfg.rb:83:9:83:10 | ok |  |
 | cfg.rb:83:9:83:10 | ok | cfg.rb:83:8:83:11 | "ok" |  |
-| cfg.rb:84:1:85:12 | ensure ... | cfg.rb:88:1:88:6 | escape |  |
-| cfg.rb:85:3:85:12 | call to puts | cfg.rb:84:1:85:12 | ensure ... |  |
-| cfg.rb:85:3:85:12 | self | cfg.rb:85:9:85:11 | end |  |
-| cfg.rb:85:8:85:12 | "end" | cfg.rb:85:3:85:12 | call to puts |  |
+| cfg.rb:84:1:85:12 | After ensure ... | cfg.rb:1:1:221:1 | Exceptional Exit | exception |
+| cfg.rb:84:1:85:12 | After ensure ... | cfg.rb:77:1:86:3 | After begin ...  |  |
+| cfg.rb:84:1:85:12 | ensure ... | cfg.rb:85:3:85:12 | Before call to puts |  |
+| cfg.rb:85:3:85:12 | After call to puts | cfg.rb:84:1:85:12 | After ensure ... |  |
+| cfg.rb:85:3:85:12 | Before call to puts | cfg.rb:85:3:85:12 | self |  |
+| cfg.rb:85:3:85:12 | call to puts | cfg.rb:85:3:85:12 | After call to puts |  |
+| cfg.rb:85:3:85:12 | self | cfg.rb:85:8:85:12 | Before "end" |  |
+| cfg.rb:85:8:85:12 | "end" | cfg.rb:85:8:85:12 | After "end" |  |
+| cfg.rb:85:8:85:12 | After "end" | cfg.rb:85:3:85:12 | call to puts |  |
+| cfg.rb:85:8:85:12 | Before "end" | cfg.rb:85:9:85:11 | end |  |
 | cfg.rb:85:9:85:11 | end | cfg.rb:85:8:85:12 | "end" |  |
-| cfg.rb:88:1:88:6 | escape | cfg.rb:88:11:88:16 | \\u1234 |  |
-| cfg.rb:88:1:88:23 | ... = ... | cfg.rb:90:5:90:5 | x |  |
-| cfg.rb:88:10:88:23 | "\\u1234#{...}\\n" | cfg.rb:88:1:88:23 | ... = ... |  |
-| cfg.rb:88:11:88:16 | \\u1234 | cfg.rb:88:19:88:19 | x |  |
-| cfg.rb:88:17:88:20 | #{...} | cfg.rb:88:21:88:22 | \\n |  |
-| cfg.rb:88:19:88:19 | x | cfg.rb:88:17:88:20 | #{...} |  |
+| cfg.rb:88:1:88:6 | escape | cfg.rb:88:10:88:23 | Before "\\u1234#{...}\\n" |  |
+| cfg.rb:88:1:88:23 | ... = ... | cfg.rb:88:1:88:23 | After ... = ... |  |
+| cfg.rb:88:1:88:23 | After ... = ... | cfg.rb:90:1:93:3 | ... |  |
+| cfg.rb:88:1:88:23 | Before ... = ... | cfg.rb:88:1:88:6 | escape |  |
+| cfg.rb:88:10:88:23 | "\\u1234#{...}\\n" | cfg.rb:88:10:88:23 | After "\\u1234#{...}\\n" |  |
+| cfg.rb:88:10:88:23 | After "\\u1234#{...}\\n" | cfg.rb:88:1:88:23 | ... = ... |  |
+| cfg.rb:88:10:88:23 | Before "\\u1234#{...}\\n" | cfg.rb:88:11:88:16 | \\u1234 |  |
+| cfg.rb:88:11:88:16 | \\u1234 | cfg.rb:88:17:88:20 | #{...} |  |
+| cfg.rb:88:17:88:20 | #{...} | cfg.rb:88:19:88:19 | x |  |
+| cfg.rb:88:17:88:20 | After #{...} | cfg.rb:88:21:88:22 | \\n |  |
+| cfg.rb:88:19:88:19 | x | cfg.rb:88:17:88:20 | After #{...} |  |
 | cfg.rb:88:21:88:22 | \\n | cfg.rb:88:10:88:23 | "\\u1234#{...}\\n" |  |
-| cfg.rb:90:1:93:3 | ... | cfg.rb:95:1:95:7 | $global |  |
-| cfg.rb:90:1:93:3 | ... = ... | cfg.rb:91:6:91:6 | x |  |
+| cfg.rb:90:1:93:3 | ... | cfg.rb:90:1:93:3 | Before ... = ... |  |
+| cfg.rb:90:1:93:3 | ... | cfg.rb:90:5:90:5 | if ... |  |
+| cfg.rb:90:1:93:3 | ... = ... | cfg.rb:90:1:93:3 | After ... = ... |  |
+| cfg.rb:90:1:93:3 | After ... | cfg.rb:90:1:93:3 | Normal Exit |  |
+| cfg.rb:90:1:93:3 | After ... | cfg.rb:95:1:95:12 | Before ... = ... |  |
+| cfg.rb:90:1:93:3 | After ... = ... | cfg.rb:91:3:91:24 | if ... |  |
+| cfg.rb:90:1:93:3 | After call to each | cfg.rb:90:1:93:3 | After ... |  |
+| cfg.rb:90:1:93:3 | Before ... = ... | cfg.rb:90:5:90:5 | x |  |
+| cfg.rb:90:1:93:3 | Before call to each | cfg.rb:90:10:90:26 | Before call to [] |  |
+| cfg.rb:90:1:93:3 | Entry | cfg.rb:90:1:93:3 | __synth__0__1 |  |
+| cfg.rb:90:1:93:3 | Normal Exit | cfg.rb:90:1:93:3 | Exit |  |
+| cfg.rb:90:1:93:3 | __synth__0__1 | cfg.rb:90:1:93:3 | ... |  |
 | cfg.rb:90:1:93:3 | __synth__0__1 | cfg.rb:90:1:93:3 | ... = ... |  |
-| cfg.rb:90:1:93:3 | __synth__0__1 | cfg.rb:90:5:90:5 | x |  |
-| cfg.rb:90:1:93:3 | call to each | cfg.rb:90:1:93:3 | ... |  |
-| cfg.rb:90:1:93:3 | enter { ... } | cfg.rb:90:1:93:3 | __synth__0__1 |  |
-| cfg.rb:90:1:93:3 | exit { ... } (normal) | cfg.rb:90:1:93:3 | exit { ... } |  |
+| cfg.rb:90:1:93:3 | call to each | cfg.rb:90:1:93:3 | After call to each |  |
 | cfg.rb:90:1:93:3 | { ... } | cfg.rb:90:1:93:3 | call to each |  |
-| cfg.rb:90:5:90:5 | ... = ... | cfg.rb:90:5:90:5 | if ... |  |
-| cfg.rb:90:5:90:5 | [false] ! ... | cfg.rb:90:5:90:5 | if ... | false |
-| cfg.rb:90:5:90:5 | [true] ! ... | cfg.rb:90:5:90:5 | x | true |
-| cfg.rb:90:5:90:5 | defined? ... | cfg.rb:90:5:90:5 | [false] ! ... | true |
-| cfg.rb:90:5:90:5 | defined? ... | cfg.rb:90:5:90:5 | [true] ! ... | false |
-| cfg.rb:90:5:90:5 | if ... | cfg.rb:90:10:90:26 | Array |  |
+| cfg.rb:90:5:90:5 | ! ... | cfg.rb:90:5:90:5 | Before defined? ... |  |
+| cfg.rb:90:5:90:5 | ... = ... | cfg.rb:90:5:90:5 | After ... = ... |  |
+| cfg.rb:90:5:90:5 | After ! ... [false] | cfg.rb:90:5:90:5 | After if ... |  |
+| cfg.rb:90:5:90:5 | After ! ... [true] | cfg.rb:90:5:90:5 | Before ... = ... |  |
+| cfg.rb:90:5:90:5 | After ... = ... | cfg.rb:90:5:90:5 | After if ... |  |
+| cfg.rb:90:5:90:5 | After defined? ... [false] | cfg.rb:90:5:90:5 | After ! ... [true] | true |
+| cfg.rb:90:5:90:5 | After defined? ... [true] | cfg.rb:90:5:90:5 | After ! ... [false] | false |
+| cfg.rb:90:5:90:5 | After if ... | cfg.rb:90:1:93:3 | Before call to each |  |
+| cfg.rb:90:5:90:5 | Before ... = ... | cfg.rb:90:5:90:5 | x |  |
+| cfg.rb:90:5:90:5 | Before defined? ... | cfg.rb:90:5:90:5 | x |  |
+| cfg.rb:90:5:90:5 | defined? ... | cfg.rb:90:5:90:5 | After defined? ... [false] | false |
+| cfg.rb:90:5:90:5 | defined? ... | cfg.rb:90:5:90:5 | After defined? ... [true] | true |
+| cfg.rb:90:5:90:5 | if ... | cfg.rb:90:5:90:5 | ! ... |  |
 | cfg.rb:90:5:90:5 | nil | cfg.rb:90:5:90:5 | ... = ... |  |
 | cfg.rb:90:5:90:5 | x | cfg.rb:90:1:93:3 | __synth__0__1 |  |
 | cfg.rb:90:5:90:5 | x | cfg.rb:90:5:90:5 | defined? ... |  |
 | cfg.rb:90:5:90:5 | x | cfg.rb:90:5:90:5 | nil |  |
+| cfg.rb:90:10:90:26 | After call to [] | cfg.rb:90:1:93:3 | { ... } |  |
 | cfg.rb:90:10:90:26 | Array | cfg.rb:90:11:90:13 | 1.4 |  |
-| cfg.rb:90:10:90:26 | call to [] | cfg.rb:90:1:93:3 | { ... } |  |
+| cfg.rb:90:10:90:26 | Before call to [] | cfg.rb:90:10:90:26 | Array |  |
+| cfg.rb:90:10:90:26 | call to [] | cfg.rb:90:10:90:26 | After call to [] |  |
 | cfg.rb:90:11:90:13 | 1.4 | cfg.rb:90:16:90:18 | 2.5 |  |
 | cfg.rb:90:16:90:18 | 2.5 | cfg.rb:90:21:90:25 | 3.4e5 |  |
 | cfg.rb:90:21:90:25 | 3.4e5 | cfg.rb:90:10:90:26 | call to [] |  |
-| cfg.rb:91:3:91:24 | if ... | cfg.rb:92:3:92:8 | self |  |
+| cfg.rb:91:3:91:24 | After if ... | cfg.rb:92:3:92:8 | Before call to puts |  |
+| cfg.rb:91:3:91:24 | if ... | cfg.rb:91:6:91:10 | Before ... > ... |  |
 | cfg.rb:91:6:91:6 | x | cfg.rb:91:10:91:10 | 3 |  |
-| cfg.rb:91:6:91:10 | ... > ... | cfg.rb:91:3:91:24 | if ... | false |
-| cfg.rb:91:6:91:10 | ... > ... | cfg.rb:91:17:91:20 | next | true |
+| cfg.rb:91:6:91:10 | ... > ... | cfg.rb:91:6:91:10 | After ... > ... [false] | false |
+| cfg.rb:91:6:91:10 | ... > ... | cfg.rb:91:6:91:10 | After ... > ... [true] | true |
+| cfg.rb:91:6:91:10 | After ... > ... [false] | cfg.rb:91:3:91:24 | After if ... |  |
+| cfg.rb:91:6:91:10 | After ... > ... [true] | cfg.rb:91:12:91:20 | then ... |  |
+| cfg.rb:91:6:91:10 | Before ... > ... | cfg.rb:91:6:91:6 | x |  |
 | cfg.rb:91:10:91:10 | 3 | cfg.rb:91:6:91:10 | ... > ... |  |
-| cfg.rb:91:17:91:20 | next | cfg.rb:90:1:93:3 | exit { ... } (normal) | continue |
-| cfg.rb:92:3:92:8 | call to puts | cfg.rb:90:1:93:3 | exit { ... } (normal) |  |
+| cfg.rb:91:12:91:20 | then ... | cfg.rb:91:17:91:20 | Before next |  |
+| cfg.rb:91:17:91:20 | Before next | cfg.rb:91:17:91:20 | next |  |
+| cfg.rb:91:17:91:20 | next | cfg.rb:90:1:93:3 | Normal Exit | continue |
+| cfg.rb:92:3:92:8 | After call to puts | cfg.rb:90:1:93:3 | After ... |  |
+| cfg.rb:92:3:92:8 | Before call to puts | cfg.rb:92:3:92:8 | self |  |
+| cfg.rb:92:3:92:8 | call to puts | cfg.rb:92:3:92:8 | After call to puts |  |
 | cfg.rb:92:3:92:8 | self | cfg.rb:92:8:92:8 | x |  |
 | cfg.rb:92:8:92:8 | x | cfg.rb:92:3:92:8 | call to puts |  |
 | cfg.rb:95:1:95:7 | $global | cfg.rb:95:11:95:12 | 42 |  |
-| cfg.rb:95:1:95:12 | ... = ... | cfg.rb:97:1:97:4 | map1 |  |
+| cfg.rb:95:1:95:12 | ... = ... | cfg.rb:95:1:95:12 | After ... = ... |  |
+| cfg.rb:95:1:95:12 | After ... = ... | cfg.rb:97:1:97:39 | Before ... = ... |  |
+| cfg.rb:95:1:95:12 | Before ... = ... | cfg.rb:95:1:95:7 | $global |  |
 | cfg.rb:95:11:95:12 | 42 | cfg.rb:95:1:95:12 | ... = ... |  |
-| cfg.rb:97:1:97:4 | map1 | cfg.rb:97:8:97:39 | Hash |  |
-| cfg.rb:97:1:97:39 | ... = ... | cfg.rb:98:1:98:4 | map2 |  |
-| cfg.rb:97:8:97:39 | Hash | cfg.rb:97:11:97:11 | a |  |
-| cfg.rb:97:8:97:39 | call to [] | cfg.rb:97:1:97:39 | ... = ... |  |
-| cfg.rb:97:10:97:12 | "a" | cfg.rb:97:18:97:18 | b |  |
-| cfg.rb:97:10:97:19 | Pair | cfg.rb:97:23:97:23 | c |  |
+| cfg.rb:97:1:97:4 | map1 | cfg.rb:97:8:97:39 | Before call to [] |  |
+| cfg.rb:97:1:97:39 | ... = ... | cfg.rb:97:1:97:39 | After ... = ... |  |
+| cfg.rb:97:1:97:39 | After ... = ... | cfg.rb:98:1:98:36 | Before ... = ... |  |
+| cfg.rb:97:1:97:39 | Before ... = ... | cfg.rb:97:1:97:4 | map1 |  |
+| cfg.rb:97:8:97:39 | After call to [] | cfg.rb:97:1:97:39 | ... = ... |  |
+| cfg.rb:97:8:97:39 | Before call to [] | cfg.rb:97:8:97:39 | Hash |  |
+| cfg.rb:97:8:97:39 | Hash | cfg.rb:97:10:97:19 | Before Pair |  |
+| cfg.rb:97:8:97:39 | call to [] | cfg.rb:97:8:97:39 | After call to [] |  |
+| cfg.rb:97:10:97:12 | "a" | cfg.rb:97:10:97:12 | After "a" |  |
+| cfg.rb:97:10:97:12 | After "a" | cfg.rb:97:17:97:19 | Before "b" |  |
+| cfg.rb:97:10:97:12 | Before "a" | cfg.rb:97:11:97:11 | a |  |
+| cfg.rb:97:10:97:19 | After Pair | cfg.rb:97:22:97:29 | Before Pair |  |
+| cfg.rb:97:10:97:19 | Before Pair | cfg.rb:97:10:97:12 | Before "a" |  |
+| cfg.rb:97:10:97:19 | Pair | cfg.rb:97:10:97:19 | After Pair |  |
 | cfg.rb:97:11:97:11 | a | cfg.rb:97:10:97:12 | "a" |  |
-| cfg.rb:97:17:97:19 | "b" | cfg.rb:97:10:97:19 | Pair |  |
+| cfg.rb:97:17:97:19 | "b" | cfg.rb:97:17:97:19 | After "b" |  |
+| cfg.rb:97:17:97:19 | After "b" | cfg.rb:97:10:97:19 | Pair |  |
+| cfg.rb:97:17:97:19 | Before "b" | cfg.rb:97:18:97:18 | b |  |
 | cfg.rb:97:18:97:18 | b | cfg.rb:97:17:97:19 | "b" |  |
-| cfg.rb:97:22:97:24 | "c" | cfg.rb:97:28:97:28 | d |  |
-| cfg.rb:97:22:97:29 | Pair | cfg.rb:97:32:97:32 | e |  |
+| cfg.rb:97:22:97:24 | "c" | cfg.rb:97:22:97:24 | After "c" |  |
+| cfg.rb:97:22:97:24 | After "c" | cfg.rb:97:27:97:29 | Before "d" |  |
+| cfg.rb:97:22:97:24 | Before "c" | cfg.rb:97:23:97:23 | c |  |
+| cfg.rb:97:22:97:29 | After Pair | cfg.rb:97:32:97:37 | Before Pair |  |
+| cfg.rb:97:22:97:29 | Before Pair | cfg.rb:97:22:97:24 | Before "c" |  |
+| cfg.rb:97:22:97:29 | Pair | cfg.rb:97:22:97:29 | After Pair |  |
 | cfg.rb:97:23:97:23 | c | cfg.rb:97:22:97:24 | "c" |  |
-| cfg.rb:97:27:97:29 | "d" | cfg.rb:97:22:97:29 | Pair |  |
+| cfg.rb:97:27:97:29 | "d" | cfg.rb:97:27:97:29 | After "d" |  |
+| cfg.rb:97:27:97:29 | After "d" | cfg.rb:97:22:97:29 | Pair |  |
+| cfg.rb:97:27:97:29 | Before "d" | cfg.rb:97:28:97:28 | d |  |
 | cfg.rb:97:28:97:28 | d | cfg.rb:97:27:97:29 | "d" |  |
-| cfg.rb:97:32:97:32 | :e | cfg.rb:97:36:97:36 | f |  |
+| cfg.rb:97:32:97:32 | :e | cfg.rb:97:32:97:32 | After :e |  |
+| cfg.rb:97:32:97:32 | After :e | cfg.rb:97:35:97:37 | Before "f" |  |
+| cfg.rb:97:32:97:32 | Before :e | cfg.rb:97:32:97:32 | e |  |
 | cfg.rb:97:32:97:32 | e | cfg.rb:97:32:97:32 | :e |  |
-| cfg.rb:97:32:97:37 | Pair | cfg.rb:97:8:97:39 | call to [] |  |
-| cfg.rb:97:35:97:37 | "f" | cfg.rb:97:32:97:37 | Pair |  |
+| cfg.rb:97:32:97:37 | After Pair | cfg.rb:97:8:97:39 | call to [] |  |
+| cfg.rb:97:32:97:37 | Before Pair | cfg.rb:97:32:97:32 | Before :e |  |
+| cfg.rb:97:32:97:37 | Pair | cfg.rb:97:32:97:37 | After Pair |  |
+| cfg.rb:97:35:97:37 | "f" | cfg.rb:97:35:97:37 | After "f" |  |
+| cfg.rb:97:35:97:37 | After "f" | cfg.rb:97:32:97:37 | Pair |  |
+| cfg.rb:97:35:97:37 | Before "f" | cfg.rb:97:36:97:36 | f |  |
 | cfg.rb:97:36:97:36 | f | cfg.rb:97:35:97:37 | "f" |  |
-| cfg.rb:98:1:98:4 | map2 | cfg.rb:98:8:98:36 | Hash |  |
-| cfg.rb:98:1:98:36 | ... = ... | cfg.rb:101:1:104:3 | parameters |  |
-| cfg.rb:98:8:98:36 | Hash | cfg.rb:98:12:98:15 | map1 |  |
-| cfg.rb:98:8:98:36 | call to [] | cfg.rb:98:1:98:36 | ... = ... |  |
-| cfg.rb:98:10:98:15 | ** ... | cfg.rb:98:19:98:19 | x |  |
+| cfg.rb:98:1:98:4 | map2 | cfg.rb:98:8:98:36 | Before call to [] |  |
+| cfg.rb:98:1:98:36 | ... = ... | cfg.rb:98:1:98:36 | After ... = ... |  |
+| cfg.rb:98:1:98:36 | After ... = ... | cfg.rb:101:1:104:3 | parameters |  |
+| cfg.rb:98:1:98:36 | Before ... = ... | cfg.rb:98:1:98:4 | map2 |  |
+| cfg.rb:98:8:98:36 | After call to [] | cfg.rb:98:1:98:36 | ... = ... |  |
+| cfg.rb:98:8:98:36 | Before call to [] | cfg.rb:98:8:98:36 | Hash |  |
+| cfg.rb:98:8:98:36 | Hash | cfg.rb:98:10:98:15 | Before ** ... |  |
+| cfg.rb:98:8:98:36 | call to [] | cfg.rb:98:8:98:36 | After call to [] |  |
+| cfg.rb:98:10:98:15 | ** ... | cfg.rb:98:10:98:15 | After ** ... |  |
+| cfg.rb:98:10:98:15 | After ** ... | cfg.rb:98:18:98:27 | Before Pair |  |
+| cfg.rb:98:10:98:15 | Before ** ... | cfg.rb:98:12:98:15 | map1 |  |
 | cfg.rb:98:12:98:15 | map1 | cfg.rb:98:10:98:15 | ** ... |  |
-| cfg.rb:98:18:98:20 | "x" | cfg.rb:98:26:98:26 | y |  |
-| cfg.rb:98:18:98:27 | Pair | cfg.rb:98:32:98:35 | map1 |  |
+| cfg.rb:98:18:98:20 | "x" | cfg.rb:98:18:98:20 | After "x" |  |
+| cfg.rb:98:18:98:20 | After "x" | cfg.rb:98:25:98:27 | Before "y" |  |
+| cfg.rb:98:18:98:20 | Before "x" | cfg.rb:98:19:98:19 | x |  |
+| cfg.rb:98:18:98:27 | After Pair | cfg.rb:98:30:98:35 | Before ** ... |  |
+| cfg.rb:98:18:98:27 | Before Pair | cfg.rb:98:18:98:20 | Before "x" |  |
+| cfg.rb:98:18:98:27 | Pair | cfg.rb:98:18:98:27 | After Pair |  |
 | cfg.rb:98:19:98:19 | x | cfg.rb:98:18:98:20 | "x" |  |
-| cfg.rb:98:25:98:27 | "y" | cfg.rb:98:18:98:27 | Pair |  |
+| cfg.rb:98:25:98:27 | "y" | cfg.rb:98:25:98:27 | After "y" |  |
+| cfg.rb:98:25:98:27 | After "y" | cfg.rb:98:18:98:27 | Pair |  |
+| cfg.rb:98:25:98:27 | Before "y" | cfg.rb:98:26:98:26 | y |  |
 | cfg.rb:98:26:98:26 | y | cfg.rb:98:25:98:27 | "y" |  |
-| cfg.rb:98:30:98:35 | ** ... | cfg.rb:98:8:98:36 | call to [] |  |
+| cfg.rb:98:30:98:35 | ** ... | cfg.rb:98:30:98:35 | After ** ... |  |
+| cfg.rb:98:30:98:35 | After ** ... | cfg.rb:98:8:98:36 | call to [] |  |
+| cfg.rb:98:30:98:35 | Before ** ... | cfg.rb:98:32:98:35 | map1 |  |
 | cfg.rb:98:32:98:35 | map1 | cfg.rb:98:30:98:35 | ** ... |  |
-| cfg.rb:101:1:104:3 | enter parameters | cfg.rb:101:16:101:20 | value |  |
-| cfg.rb:101:1:104:3 | exit parameters (normal) | cfg.rb:101:1:104:3 | exit parameters |  |
-| cfg.rb:101:1:104:3 | parameters | cfg.rb:106:1:106:4 | type |  |
-| cfg.rb:101:16:101:20 | value | cfg.rb:101:24:101:25 | 42 | false, no-match, true |
-| cfg.rb:101:16:101:20 | value | cfg.rb:101:28:101:30 | key | match |
+| cfg.rb:101:1:104:3 | Entry | cfg.rb:101:16:101:20 | value |  |
+| cfg.rb:101:1:104:3 | Normal Exit | cfg.rb:101:1:104:3 | Exit |  |
+| cfg.rb:101:1:104:3 | parameters | cfg.rb:106:1:106:17 | Before ... = ... |  |
+| cfg.rb:101:16:101:20 | After value [match] | cfg.rb:101:28:101:30 | key |  |
+| cfg.rb:101:16:101:20 | After value [no-match] | cfg.rb:101:24:101:25 | 42 |  |
+| cfg.rb:101:16:101:20 | value | cfg.rb:101:16:101:20 | After value [match] | match |
+| cfg.rb:101:16:101:20 | value | cfg.rb:101:16:101:20 | After value [no-match] | no-match |
 | cfg.rb:101:24:101:25 | 42 | cfg.rb:101:28:101:30 | key |  |
 | cfg.rb:101:28:101:30 | key | cfg.rb:101:36:101:41 | kwargs |  |
-| cfg.rb:101:36:101:41 | kwargs | cfg.rb:102:3:102:12 | self |  |
-| cfg.rb:102:3:102:12 | call to puts | cfg.rb:103:10:103:15 | kwargs |  |
+| cfg.rb:101:36:101:41 | kwargs | cfg.rb:102:3:103:20 | ... |  |
+| cfg.rb:102:3:102:12 | After call to puts | cfg.rb:103:3:103:20 | Before return |  |
+| cfg.rb:102:3:102:12 | Before call to puts | cfg.rb:102:3:102:12 | self |  |
+| cfg.rb:102:3:102:12 | call to puts | cfg.rb:102:3:102:12 | After call to puts |  |
 | cfg.rb:102:3:102:12 | self | cfg.rb:102:8:102:12 | value |  |
+| cfg.rb:102:3:103:20 | ... | cfg.rb:102:3:102:12 | Before call to puts |  |
 | cfg.rb:102:8:102:12 | value | cfg.rb:102:3:102:12 | call to puts |  |
-| cfg.rb:103:3:103:20 | return | cfg.rb:101:1:104:3 | exit parameters (normal) | return |
+| cfg.rb:103:3:103:20 | Before return | cfg.rb:103:10:103:20 | Before ...[...] |  |
+| cfg.rb:103:3:103:20 | return | cfg.rb:101:1:104:3 | Normal Exit | return |
 | cfg.rb:103:10:103:15 | kwargs | cfg.rb:103:17:103:19 | key |  |
-| cfg.rb:103:10:103:20 | ...[...] | cfg.rb:103:3:103:20 | return |  |
+| cfg.rb:103:10:103:20 | ...[...] | cfg.rb:103:10:103:20 | After ...[...] |  |
+| cfg.rb:103:10:103:20 | After ...[...] | cfg.rb:103:3:103:20 | return |  |
+| cfg.rb:103:10:103:20 | Before ...[...] | cfg.rb:103:10:103:15 | kwargs |  |
 | cfg.rb:103:17:103:19 | key | cfg.rb:103:10:103:20 | ...[...] |  |
-| cfg.rb:106:1:106:4 | type | cfg.rb:106:10:106:16 | healthy |  |
-| cfg.rb:106:1:106:17 | ... = ... | cfg.rb:107:1:107:5 | table |  |
-| cfg.rb:106:9:106:17 | "healthy" | cfg.rb:106:1:106:17 | ... = ... |  |
+| cfg.rb:106:1:106:4 | type | cfg.rb:106:9:106:17 | Before "healthy" |  |
+| cfg.rb:106:1:106:17 | ... = ... | cfg.rb:106:1:106:17 | After ... = ... |  |
+| cfg.rb:106:1:106:17 | After ... = ... | cfg.rb:107:1:107:14 | Before ... = ... |  |
+| cfg.rb:106:1:106:17 | Before ... = ... | cfg.rb:106:1:106:4 | type |  |
+| cfg.rb:106:9:106:17 | "healthy" | cfg.rb:106:9:106:17 | After "healthy" |  |
+| cfg.rb:106:9:106:17 | After "healthy" | cfg.rb:106:1:106:17 | ... = ... |  |
+| cfg.rb:106:9:106:17 | Before "healthy" | cfg.rb:106:10:106:16 | healthy |  |
 | cfg.rb:106:10:106:16 | healthy | cfg.rb:106:9:106:17 | "healthy" |  |
-| cfg.rb:107:1:107:5 | table | cfg.rb:107:10:107:13 | food |  |
-| cfg.rb:107:1:107:14 | ... = ... | cfg.rb:108:1:108:12 | self |  |
-| cfg.rb:107:9:107:14 | "food" | cfg.rb:107:1:107:14 | ... = ... |  |
+| cfg.rb:107:1:107:5 | table | cfg.rb:107:9:107:14 | Before "food" |  |
+| cfg.rb:107:1:107:14 | ... = ... | cfg.rb:107:1:107:14 | After ... = ... |  |
+| cfg.rb:107:1:107:14 | After ... = ... | cfg.rb:108:1:108:12 | Before call to puts |  |
+| cfg.rb:107:1:107:14 | Before ... = ... | cfg.rb:107:1:107:5 | table |  |
+| cfg.rb:107:9:107:14 | "food" | cfg.rb:107:9:107:14 | After "food" |  |
+| cfg.rb:107:9:107:14 | After "food" | cfg.rb:107:1:107:14 | ... = ... |  |
+| cfg.rb:107:9:107:14 | Before "food" | cfg.rb:107:10:107:13 | food |  |
 | cfg.rb:107:10:107:13 | food | cfg.rb:107:9:107:14 | "food" |  |
-| cfg.rb:108:1:108:12 | call to puts | cfg.rb:113:14:113:14 | b |  |
-| cfg.rb:108:1:108:12 | self | cfg.rb:108:13:109:14 | \nSELECT * FROM  |  |
-| cfg.rb:108:6:108:12 | ( ... ) | cfg.rb:108:1:108:12 | call to puts |  |
-| cfg.rb:108:7:108:11 | <<SQL | cfg.rb:108:6:108:12 | ( ... ) |  |
-| cfg.rb:108:13:109:14 | \nSELECT * FROM  | cfg.rb:109:17:109:21 | table |  |
-| cfg.rb:109:15:109:22 | #{...} | cfg.rb:109:23:109:23 |   |  |
-| cfg.rb:109:17:109:21 | table | cfg.rb:109:15:109:22 | #{...} |  |
+| cfg.rb:108:1:108:12 | After call to puts | cfg.rb:113:1:113:19 | ... if ... |  |
+| cfg.rb:108:1:108:12 | Before call to puts | cfg.rb:108:1:108:12 | self |  |
+| cfg.rb:108:1:108:12 | call to puts | cfg.rb:108:1:108:12 | After call to puts |  |
+| cfg.rb:108:1:108:12 | self | cfg.rb:108:6:108:12 | ( ... ) |  |
+| cfg.rb:108:6:108:12 | ( ... ) | cfg.rb:108:7:108:11 | Before <<SQL |  |
+| cfg.rb:108:6:108:12 | After ( ... ) | cfg.rb:108:1:108:12 | call to puts |  |
+| cfg.rb:108:7:108:11 | <<SQL | cfg.rb:108:7:108:11 | After <<SQL |  |
+| cfg.rb:108:7:108:11 | After <<SQL | cfg.rb:108:6:108:12 | After ( ... ) |  |
+| cfg.rb:108:7:108:11 | Before <<SQL | cfg.rb:108:13:109:14 | \nSELECT * FROM  |  |
+| cfg.rb:108:13:109:14 | \nSELECT * FROM  | cfg.rb:109:15:109:22 | #{...} |  |
+| cfg.rb:109:15:109:22 | #{...} | cfg.rb:109:17:109:21 | table |  |
+| cfg.rb:109:15:109:22 | After #{...} | cfg.rb:109:23:109:23 |   |  |
+| cfg.rb:109:17:109:21 | table | cfg.rb:109:15:109:22 | After #{...} |  |
 | cfg.rb:109:23:109:23 |   | cfg.rb:109:24:109:25 | \\n |  |
 | cfg.rb:109:24:109:25 | \\n | cfg.rb:109:26:110:6 | \nWHERE  |  |
-| cfg.rb:109:26:110:6 | \nWHERE  | cfg.rb:110:9:110:12 | type |  |
-| cfg.rb:110:7:110:13 | #{...} | cfg.rb:110:14:110:21 |  = true  |  |
-| cfg.rb:110:9:110:12 | type | cfg.rb:110:7:110:13 | #{...} |  |
+| cfg.rb:109:26:110:6 | \nWHERE  | cfg.rb:110:7:110:13 | #{...} |  |
+| cfg.rb:110:7:110:13 | #{...} | cfg.rb:110:9:110:12 | type |  |
+| cfg.rb:110:7:110:13 | After #{...} | cfg.rb:110:14:110:21 |  = true  |  |
+| cfg.rb:110:9:110:12 | type | cfg.rb:110:7:110:13 | After #{...} |  |
 | cfg.rb:110:14:110:21 |  = true  | cfg.rb:110:22:110:23 | \\n |  |
 | cfg.rb:110:22:110:23 | \\n | cfg.rb:110:24:110:24 | \n |  |
 | cfg.rb:110:24:110:24 | \n | cfg.rb:108:7:108:11 | <<SQL |  |
-| cfg.rb:113:1:113:9 | call to puts | cfg.rb:113:1:113:19 | ... if ... |  |
-| cfg.rb:113:1:113:9 | self | cfg.rb:113:7:113:8 | hi |  |
-| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:115:1:118:3 | C |  |
-| cfg.rb:113:6:113:9 | "hi" | cfg.rb:113:1:113:9 | call to puts |  |
+| cfg.rb:113:1:113:9 | After call to puts | cfg.rb:113:1:113:19 | After ... if ... |  |
+| cfg.rb:113:1:113:9 | Before call to puts | cfg.rb:113:1:113:9 | self |  |
+| cfg.rb:113:1:113:9 | call to puts | cfg.rb:113:1:113:9 | After call to puts |  |
+| cfg.rb:113:1:113:9 | self | cfg.rb:113:6:113:9 | Before "hi" |  |
+| cfg.rb:113:1:113:19 | ... if ... | cfg.rb:113:14:113:19 | Before ... > ... |  |
+| cfg.rb:113:1:113:19 | After ... if ... | cfg.rb:115:1:118:3 | C |  |
+| cfg.rb:113:6:113:9 | "hi" | cfg.rb:113:6:113:9 | After "hi" |  |
+| cfg.rb:113:6:113:9 | After "hi" | cfg.rb:113:1:113:9 | call to puts |  |
+| cfg.rb:113:6:113:9 | Before "hi" | cfg.rb:113:7:113:8 | hi |  |
 | cfg.rb:113:7:113:8 | hi | cfg.rb:113:6:113:9 | "hi" |  |
 | cfg.rb:113:14:113:14 | b | cfg.rb:113:18:113:19 | 10 |  |
-| cfg.rb:113:14:113:19 | ... > ... | cfg.rb:113:1:113:9 | self | true |
-| cfg.rb:113:14:113:19 | ... > ... | cfg.rb:113:1:113:19 | ... if ... | false |
+| cfg.rb:113:14:113:19 | ... > ... | cfg.rb:113:14:113:19 | After ... > ... [false] | false |
+| cfg.rb:113:14:113:19 | ... > ... | cfg.rb:113:14:113:19 | After ... > ... [true] | true |
+| cfg.rb:113:14:113:19 | After ... > ... [false] | cfg.rb:113:1:113:19 | After ... if ... |  |
+| cfg.rb:113:14:113:19 | After ... > ... [true] | cfg.rb:113:1:113:9 | Before call to puts |  |
+| cfg.rb:113:14:113:19 | Before ... > ... | cfg.rb:113:14:113:14 | b |  |
 | cfg.rb:113:18:113:19 | 10 | cfg.rb:113:14:113:19 | ... > ... |  |
-| cfg.rb:115:1:118:3 | C | cfg.rb:116:3:116:8 | self |  |
-| cfg.rb:116:3:116:8 | @field | cfg.rb:116:12:116:13 | 42 |  |
+| cfg.rb:115:1:118:3 | After C | cfg.rb:120:1:120:28 | Before ... = ... |  |
+| cfg.rb:115:1:118:3 | C | cfg.rb:116:3:116:13 | Before ... = ... |  |
+| cfg.rb:116:3:116:8 | @field | cfg.rb:116:3:116:8 | After @field |  |
+| cfg.rb:116:3:116:8 | After @field | cfg.rb:116:12:116:13 | 42 |  |
+| cfg.rb:116:3:116:8 | Before @field | cfg.rb:116:3:116:8 | self |  |
 | cfg.rb:116:3:116:8 | self | cfg.rb:116:3:116:8 | @field |  |
-| cfg.rb:116:3:116:13 | ... = ... | cfg.rb:117:3:117:16 | @@static_field |  |
+| cfg.rb:116:3:116:13 | ... = ... | cfg.rb:116:3:116:13 | After ... = ... |  |
+| cfg.rb:116:3:116:13 | After ... = ... | cfg.rb:117:3:117:21 | Before ... = ... |  |
+| cfg.rb:116:3:116:13 | Before ... = ... | cfg.rb:116:3:116:8 | Before @field |  |
 | cfg.rb:116:12:116:13 | 42 | cfg.rb:116:3:116:13 | ... = ... |  |
 | cfg.rb:117:3:117:16 | @@static_field | cfg.rb:117:20:117:21 | 10 |  |
-| cfg.rb:117:3:117:21 | ... = ... | cfg.rb:120:1:120:4 | swap |  |
+| cfg.rb:117:3:117:21 | ... = ... | cfg.rb:117:3:117:21 | After ... = ... |  |
+| cfg.rb:117:3:117:21 | After ... = ... | cfg.rb:115:1:118:3 | After C |  |
+| cfg.rb:117:3:117:21 | Before ... = ... | cfg.rb:117:3:117:16 | @@static_field |  |
 | cfg.rb:117:20:117:21 | 10 | cfg.rb:117:3:117:21 | ... = ... |  |
 | cfg.rb:120:1:120:4 | swap | cfg.rb:120:8:120:28 | -> { ... } |  |
-| cfg.rb:120:1:120:28 | ... = ... | cfg.rb:122:1:131:3 | M |  |
+| cfg.rb:120:1:120:28 | ... = ... | cfg.rb:120:1:120:28 | After ... = ... |  |
+| cfg.rb:120:1:120:28 | After ... = ... | cfg.rb:122:1:131:3 | M |  |
+| cfg.rb:120:1:120:28 | Before ... = ... | cfg.rb:120:1:120:4 | swap |  |
 | cfg.rb:120:8:120:28 | -> { ... } | cfg.rb:120:1:120:28 | ... = ... |  |
-| cfg.rb:120:8:120:28 | enter -> { ... } | cfg.rb:120:12:120:12 | x |  |
-| cfg.rb:120:8:120:28 | exit -> { ... } (normal) | cfg.rb:120:8:120:28 | exit -> { ... } |  |
-| cfg.rb:120:11:120:16 | (..., ...) | cfg.rb:120:21:120:26 | Array |  |
+| cfg.rb:120:8:120:28 | Entry | cfg.rb:120:11:120:16 | (..., ...) |  |
+| cfg.rb:120:8:120:28 | Normal Exit | cfg.rb:120:8:120:28 | Exit |  |
+| cfg.rb:120:11:120:16 | (..., ...) | cfg.rb:120:12:120:12 | x |  |
+| cfg.rb:120:11:120:16 | After (..., ...) | cfg.rb:120:21:120:26 | ... |  |
 | cfg.rb:120:12:120:12 | x | cfg.rb:120:15:120:15 | y |  |
-| cfg.rb:120:15:120:15 | y | cfg.rb:120:11:120:16 | (..., ...) |  |
+| cfg.rb:120:15:120:15 | y | cfg.rb:120:11:120:16 | After (..., ...) |  |
+| cfg.rb:120:21:120:26 | ... | cfg.rb:120:21:120:26 | Before call to [] |  |
+| cfg.rb:120:21:120:26 | After ... | cfg.rb:120:8:120:28 | Normal Exit |  |
+| cfg.rb:120:21:120:26 | After call to [] | cfg.rb:120:21:120:26 | After ... |  |
 | cfg.rb:120:21:120:26 | Array | cfg.rb:120:22:120:22 | y |  |
-| cfg.rb:120:21:120:26 | call to [] | cfg.rb:120:8:120:28 | exit -> { ... } (normal) |  |
+| cfg.rb:120:21:120:26 | Before call to [] | cfg.rb:120:21:120:26 | Array |  |
+| cfg.rb:120:21:120:26 | call to [] | cfg.rb:120:21:120:26 | After call to [] |  |
 | cfg.rb:120:22:120:22 | y | cfg.rb:120:25:120:25 | x |  |
 | cfg.rb:120:25:120:25 | x | cfg.rb:120:21:120:26 | call to [] |  |
-| cfg.rb:122:1:131:3 | M | cfg.rb:123:2:123:8 | nothing |  |
+| cfg.rb:122:1:131:3 | After M | cfg.rb:133:1:133:21 | EmptyClass |  |
+| cfg.rb:122:1:131:3 | M | cfg.rb:123:2:123:14 | Before ... = ... |  |
 | cfg.rb:123:2:123:8 | nothing | cfg.rb:123:12:123:14 | nil |  |
-| cfg.rb:123:2:123:14 | ... = ... | cfg.rb:124:2:124:5 | some |  |
+| cfg.rb:123:2:123:14 | ... = ... | cfg.rb:123:2:123:14 | After ... = ... |  |
+| cfg.rb:123:2:123:14 | After ... = ... | cfg.rb:124:2:124:9 | Before ... = ... |  |
+| cfg.rb:123:2:123:14 | Before ... = ... | cfg.rb:123:2:123:8 | nothing |  |
 | cfg.rb:123:12:123:14 | nil | cfg.rb:123:2:123:14 | ... = ... |  |
 | cfg.rb:124:2:124:5 | some | cfg.rb:124:9:124:9 | 2 |  |
-| cfg.rb:124:2:124:9 | ... = ... | cfg.rb:125:2:125:5 | some |  |
+| cfg.rb:124:2:124:9 | ... = ... | cfg.rb:124:2:124:9 | After ... = ... |  |
+| cfg.rb:124:2:124:9 | After ... = ... | cfg.rb:125:2:125:11 | Before ... = ... |  |
+| cfg.rb:124:2:124:9 | Before ... = ... | cfg.rb:124:2:124:5 | some |  |
 | cfg.rb:124:9:124:9 | 2 | cfg.rb:124:2:124:9 | ... = ... |  |
-| cfg.rb:125:2:125:5 | some | cfg.rb:125:2:125:5 | some |  |
+| cfg.rb:125:2:125:5 | some | cfg.rb:125:7:125:8 | Before ... + ... |  |
 | cfg.rb:125:2:125:5 | some | cfg.rb:125:10:125:11 | 10 |  |
-| cfg.rb:125:2:125:11 | ... = ... | cfg.rb:126:2:126:5 | last |  |
-| cfg.rb:125:7:125:8 | ... + ... | cfg.rb:125:2:125:11 | ... = ... |  |
+| cfg.rb:125:2:125:11 | ... = ... | cfg.rb:125:2:125:11 | After ... = ... |  |
+| cfg.rb:125:2:125:11 | After ... = ... | cfg.rb:126:2:126:17 | Before ... = ... |  |
+| cfg.rb:125:2:125:11 | Before ... = ... | cfg.rb:125:2:125:5 | some |  |
+| cfg.rb:125:7:125:8 | ... + ... | cfg.rb:125:7:125:8 | After ... + ... |  |
+| cfg.rb:125:7:125:8 | After ... + ... | cfg.rb:125:2:125:11 | ... = ... |  |
+| cfg.rb:125:7:125:8 | Before ... + ... | cfg.rb:125:2:125:5 | some |  |
 | cfg.rb:125:10:125:11 | 10 | cfg.rb:125:7:125:8 | ... + ... |  |
-| cfg.rb:126:2:126:5 | last | cfg.rb:126:10:126:10 | 2 |  |
-| cfg.rb:126:2:126:17 | ... = ... | cfg.rb:127:2:127:6 | range |  |
-| cfg.rb:126:9:126:17 | ( ... ) | cfg.rb:126:2:126:17 | ... = ... |  |
+| cfg.rb:126:2:126:5 | last | cfg.rb:126:9:126:17 | ( ... ) |  |
+| cfg.rb:126:2:126:17 | ... = ... | cfg.rb:126:2:126:17 | After ... = ... |  |
+| cfg.rb:126:2:126:17 | After ... = ... | cfg.rb:127:2:127:13 | Before ... = ... |  |
+| cfg.rb:126:2:126:17 | Before ... = ... | cfg.rb:126:2:126:5 | last |  |
+| cfg.rb:126:9:126:17 | ( ... ) | cfg.rb:126:10:126:10 | 2 |  |
+| cfg.rb:126:9:126:17 | After ( ... ) | cfg.rb:126:2:126:17 | ... = ... |  |
 | cfg.rb:126:10:126:10 | 2 | cfg.rb:126:13:126:13 | 4 |  |
 | cfg.rb:126:13:126:13 | 4 | cfg.rb:126:16:126:16 | 7 |  |
-| cfg.rb:126:16:126:16 | 7 | cfg.rb:126:9:126:17 | ( ... ) |  |
-| cfg.rb:127:2:127:6 | range | cfg.rb:127:10:127:10 | 0 |  |
-| cfg.rb:127:2:127:13 | ... = ... | cfg.rb:128:2:128:5 | half |  |
+| cfg.rb:126:16:126:16 | 7 | cfg.rb:126:9:126:17 | After ( ... ) |  |
+| cfg.rb:127:2:127:6 | range | cfg.rb:127:10:127:13 | Before _ .. _ |  |
+| cfg.rb:127:2:127:13 | ... = ... | cfg.rb:127:2:127:13 | After ... = ... |  |
+| cfg.rb:127:2:127:13 | After ... = ... | cfg.rb:128:2:128:19 | Before ... = ... |  |
+| cfg.rb:127:2:127:13 | Before ... = ... | cfg.rb:127:2:127:6 | range |  |
 | cfg.rb:127:10:127:10 | 0 | cfg.rb:127:13:127:13 | 9 |  |
-| cfg.rb:127:10:127:13 | _ .. _ | cfg.rb:127:2:127:13 | ... = ... |  |
+| cfg.rb:127:10:127:13 | After _ .. _ | cfg.rb:127:2:127:13 | ... = ... |  |
+| cfg.rb:127:10:127:13 | Before _ .. _ | cfg.rb:127:10:127:10 | 0 |  |
+| cfg.rb:127:10:127:13 | _ .. _ | cfg.rb:127:10:127:13 | After _ .. _ |  |
 | cfg.rb:127:13:127:13 | 9 | cfg.rb:127:10:127:13 | _ .. _ |  |
-| cfg.rb:128:2:128:5 | half | cfg.rb:128:9:128:9 | 1 |  |
-| cfg.rb:128:2:128:19 | ... = ... | cfg.rb:129:2:129:6 | regex |  |
+| cfg.rb:128:2:128:5 | half | cfg.rb:128:9:128:19 | Before ... + ... |  |
+| cfg.rb:128:2:128:19 | ... = ... | cfg.rb:128:2:128:19 | After ... = ... |  |
+| cfg.rb:128:2:128:19 | After ... = ... | cfg.rb:129:2:129:29 | Before ... = ... |  |
+| cfg.rb:128:2:128:19 | Before ... = ... | cfg.rb:128:2:128:5 | half |  |
 | cfg.rb:128:9:128:9 | 1 | cfg.rb:128:11:128:12 | 3r |  |
-| cfg.rb:128:9:128:12 | ... / ... | cfg.rb:128:16:128:16 | 1 |  |
-| cfg.rb:128:9:128:19 | ... + ... | cfg.rb:128:2:128:19 | ... = ... |  |
+| cfg.rb:128:9:128:12 | ... / ... | cfg.rb:128:9:128:12 | After ... / ... |  |
+| cfg.rb:128:9:128:12 | After ... / ... | cfg.rb:128:16:128:19 | Before ... / ... |  |
+| cfg.rb:128:9:128:12 | Before ... / ... | cfg.rb:128:9:128:9 | 1 |  |
+| cfg.rb:128:9:128:19 | ... + ... | cfg.rb:128:9:128:19 | After ... + ... |  |
+| cfg.rb:128:9:128:19 | After ... + ... | cfg.rb:128:2:128:19 | ... = ... |  |
+| cfg.rb:128:9:128:19 | Before ... + ... | cfg.rb:128:9:128:12 | Before ... / ... |  |
 | cfg.rb:128:11:128:12 | 3r | cfg.rb:128:9:128:12 | ... / ... |  |
 | cfg.rb:128:16:128:16 | 1 | cfg.rb:128:18:128:19 | 6r |  |
-| cfg.rb:128:16:128:19 | ... / ... | cfg.rb:128:9:128:19 | ... + ... |  |
+| cfg.rb:128:16:128:19 | ... / ... | cfg.rb:128:16:128:19 | After ... / ... |  |
+| cfg.rb:128:16:128:19 | After ... / ... | cfg.rb:128:9:128:19 | ... + ... |  |
+| cfg.rb:128:16:128:19 | Before ... / ... | cfg.rb:128:16:128:16 | 1 |  |
 | cfg.rb:128:18:128:19 | 6r | cfg.rb:128:16:128:19 | ... / ... |  |
-| cfg.rb:129:2:129:6 | regex | cfg.rb:129:11:129:15 | hello |  |
-| cfg.rb:129:2:129:29 | ... = ... | cfg.rb:130:2:130:9 | Constant |  |
-| cfg.rb:129:10:129:29 | /hello\\s+[#{...}]/ | cfg.rb:129:2:129:29 | ... = ... |  |
+| cfg.rb:129:2:129:6 | regex | cfg.rb:129:10:129:29 | Before /hello\\s+[#{...}]/ |  |
+| cfg.rb:129:2:129:29 | ... = ... | cfg.rb:129:2:129:29 | After ... = ... |  |
+| cfg.rb:129:2:129:29 | After ... = ... | cfg.rb:130:2:130:13 | Before ... = ... |  |
+| cfg.rb:129:2:129:29 | Before ... = ... | cfg.rb:129:2:129:6 | regex |  |
+| cfg.rb:129:10:129:29 | /hello\\s+[#{...}]/ | cfg.rb:129:10:129:29 | After /hello\\s+[#{...}]/ |  |
+| cfg.rb:129:10:129:29 | After /hello\\s+[#{...}]/ | cfg.rb:129:2:129:29 | ... = ... |  |
+| cfg.rb:129:10:129:29 | Before /hello\\s+[#{...}]/ | cfg.rb:129:11:129:15 | hello |  |
 | cfg.rb:129:11:129:15 | hello | cfg.rb:129:16:129:17 | \\s |  |
 | cfg.rb:129:16:129:17 | \\s | cfg.rb:129:18:129:19 | +[ |  |
-| cfg.rb:129:18:129:19 | +[ | cfg.rb:129:22:129:26 | range |  |
-| cfg.rb:129:20:129:27 | #{...} | cfg.rb:129:28:129:28 | ] |  |
-| cfg.rb:129:22:129:26 | range | cfg.rb:129:20:129:27 | #{...} |  |
+| cfg.rb:129:18:129:19 | +[ | cfg.rb:129:20:129:27 | #{...} |  |
+| cfg.rb:129:20:129:27 | #{...} | cfg.rb:129:22:129:26 | range |  |
+| cfg.rb:129:20:129:27 | After #{...} | cfg.rb:129:28:129:28 | ] |  |
+| cfg.rb:129:22:129:26 | range | cfg.rb:129:20:129:27 | After #{...} |  |
 | cfg.rb:129:28:129:28 | ] | cfg.rb:129:10:129:29 | /hello\\s+[#{...}]/ |  |
 | cfg.rb:130:2:130:9 | Constant | cfg.rb:130:13:130:13 | 5 |  |
-| cfg.rb:130:2:130:13 | ... = ... | cfg.rb:133:1:133:21 | EmptyClass |  |
+| cfg.rb:130:2:130:13 | ... = ... | cfg.rb:130:2:130:13 | After ... = ... |  |
+| cfg.rb:130:2:130:13 | After ... = ... | cfg.rb:122:1:131:3 | After M |  |
+| cfg.rb:130:2:130:13 | Before ... = ... | cfg.rb:130:2:130:9 | Constant |  |
 | cfg.rb:130:13:130:13 | 5 | cfg.rb:130:2:130:13 | ... = ... |  |
 | cfg.rb:133:1:133:21 | EmptyClass | cfg.rb:134:1:134:23 | EmptyModule |  |
-| cfg.rb:134:1:134:23 | EmptyModule | cfg.rb:136:1:136:1 | 1 |  |
+| cfg.rb:134:1:134:23 | EmptyModule | cfg.rb:136:1:136:29 | ... rescue ... |  |
 | cfg.rb:136:1:136:1 | 1 | cfg.rb:136:3:136:3 | 0 |  |
-| cfg.rb:136:1:136:3 | ... / ... | cfg.rb:136:1:136:29 | ... rescue ... |  |
-| cfg.rb:136:1:136:3 | ... / ... | cfg.rb:136:12:136:29 | self | exception |
-| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:138:17:138:23 | __synth__2 |  |
+| cfg.rb:136:1:136:3 | ... / ... | cfg.rb:136:1:136:3 | After ... / ... |  |
+| cfg.rb:136:1:136:3 | ... / ... | cfg.rb:136:12:136:29 | Before call to puts | exception |
+| cfg.rb:136:1:136:3 | After ... / ... | cfg.rb:136:1:136:29 | After ... rescue ... |  |
+| cfg.rb:136:1:136:3 | Before ... / ... | cfg.rb:136:1:136:1 | 1 |  |
+| cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:136:1:136:3 | Before ... / ... |  |
+| cfg.rb:136:1:136:29 | After ... rescue ... | cfg.rb:138:1:138:23 | ... |  |
 | cfg.rb:136:3:136:3 | 0 | cfg.rb:136:1:136:3 | ... / ... |  |
-| cfg.rb:136:12:136:29 | call to puts | cfg.rb:136:1:136:29 | ... rescue ... |  |
-| cfg.rb:136:12:136:29 | self | cfg.rb:136:18:136:28 | div by zero |  |
-| cfg.rb:136:17:136:29 | "div by zero" | cfg.rb:136:12:136:29 | call to puts |  |
+| cfg.rb:136:12:136:29 | After call to puts | cfg.rb:136:1:136:29 | After ... rescue ... |  |
+| cfg.rb:136:12:136:29 | Before call to puts | cfg.rb:136:12:136:29 | self |  |
+| cfg.rb:136:12:136:29 | call to puts | cfg.rb:136:12:136:29 | After call to puts |  |
+| cfg.rb:136:12:136:29 | self | cfg.rb:136:17:136:29 | Before "div by zero" |  |
+| cfg.rb:136:17:136:29 | "div by zero" | cfg.rb:136:17:136:29 | After "div by zero" |  |
+| cfg.rb:136:17:136:29 | After "div by zero" | cfg.rb:136:12:136:29 | call to puts |  |
+| cfg.rb:136:17:136:29 | Before "div by zero" | cfg.rb:136:18:136:28 | div by zero |  |
 | cfg.rb:136:18:136:28 | div by zero | cfg.rb:136:17:136:29 | "div by zero" |  |
-| cfg.rb:138:1:138:23 | ... | cfg.rb:140:1:140:1 | M |  |
+| cfg.rb:138:1:138:23 | ... | cfg.rb:138:17:138:23 | Before ... = ... |  |
+| cfg.rb:138:1:138:23 | After ... | cfg.rb:140:1:140:11 | Before Constant |  |
 | cfg.rb:138:3:138:6 | 0 | cfg.rb:138:3:138:6 | -2 |  |
 | cfg.rb:138:3:138:6 | -2 | cfg.rb:138:3:138:6 | _ .. _ |  |
-| cfg.rb:138:3:138:6 | ... = ... | cfg.rb:138:9:138:12 | last |  |
-| cfg.rb:138:3:138:6 | _ .. _ | cfg.rb:138:3:138:6 | call to [] |  |
-| cfg.rb:138:3:138:6 | __synth__2 | cfg.rb:138:3:138:6 | 0 |  |
-| cfg.rb:138:3:138:6 | call to [] | cfg.rb:138:3:138:6 | ... = ... |  |
-| cfg.rb:138:3:138:6 | init | cfg.rb:138:3:138:6 | __synth__2 |  |
+| cfg.rb:138:3:138:6 | ... = ... | cfg.rb:138:3:138:6 | After ... = ... |  |
+| cfg.rb:138:3:138:6 | After ... = ... | cfg.rb:138:9:138:12 | Before ... = ... |  |
+| cfg.rb:138:3:138:6 | After _ .. _ | cfg.rb:138:3:138:6 | call to [] |  |
+| cfg.rb:138:3:138:6 | After call to [] | cfg.rb:138:3:138:6 | ... = ... |  |
+| cfg.rb:138:3:138:6 | Before ... = ... | cfg.rb:138:3:138:6 | init |  |
+| cfg.rb:138:3:138:6 | Before _ .. _ | cfg.rb:138:3:138:6 | 0 |  |
+| cfg.rb:138:3:138:6 | Before call to [] | cfg.rb:138:3:138:6 | __synth__2 |  |
+| cfg.rb:138:3:138:6 | _ .. _ | cfg.rb:138:3:138:6 | After _ .. _ |  |
+| cfg.rb:138:3:138:6 | __synth__2 | cfg.rb:138:3:138:6 | Before _ .. _ |  |
+| cfg.rb:138:3:138:6 | call to [] | cfg.rb:138:3:138:6 | After call to [] |  |
+| cfg.rb:138:3:138:6 | init | cfg.rb:138:3:138:6 | Before call to [] |  |
 | cfg.rb:138:9:138:12 | -1 | cfg.rb:138:9:138:12 | call to [] |  |
-| cfg.rb:138:9:138:12 | ... = ... | cfg.rb:138:1:138:23 | ... |  |
+| cfg.rb:138:9:138:12 | ... = ... | cfg.rb:138:9:138:12 | After ... = ... |  |
+| cfg.rb:138:9:138:12 | After ... = ... | cfg.rb:138:1:138:23 | After ... |  |
+| cfg.rb:138:9:138:12 | After call to [] | cfg.rb:138:9:138:12 | ... = ... |  |
+| cfg.rb:138:9:138:12 | Before ... = ... | cfg.rb:138:9:138:12 | last |  |
+| cfg.rb:138:9:138:12 | Before call to [] | cfg.rb:138:9:138:12 | __synth__2 |  |
 | cfg.rb:138:9:138:12 | __synth__2 | cfg.rb:138:9:138:12 | -1 |  |
-| cfg.rb:138:9:138:12 | call to [] | cfg.rb:138:9:138:12 | ... = ... |  |
-| cfg.rb:138:9:138:12 | last | cfg.rb:138:9:138:12 | __synth__2 |  |
+| cfg.rb:138:9:138:12 | call to [] | cfg.rb:138:9:138:12 | After call to [] |  |
+| cfg.rb:138:9:138:12 | last | cfg.rb:138:9:138:12 | Before call to [] |  |
 | cfg.rb:138:17:138:17 | 1 | cfg.rb:138:20:138:20 | 2 |  |
-| cfg.rb:138:17:138:23 | * ... | cfg.rb:138:17:138:23 | ... = ... |  |
-| cfg.rb:138:17:138:23 | ... = ... | cfg.rb:138:3:138:6 | init |  |
-| cfg.rb:138:17:138:23 | ..., ... | cfg.rb:138:17:138:23 | * ... |  |
-| cfg.rb:138:17:138:23 | __synth__2 | cfg.rb:138:17:138:17 | 1 |  |
+| cfg.rb:138:17:138:23 | * ... | cfg.rb:138:17:138:23 | After * ... |  |
+| cfg.rb:138:17:138:23 | ... = ... | cfg.rb:138:17:138:23 | After ... = ... |  |
+| cfg.rb:138:17:138:23 | ..., ... | cfg.rb:138:17:138:23 | After ..., ... |  |
+| cfg.rb:138:17:138:23 | After * ... | cfg.rb:138:17:138:23 | ... = ... |  |
+| cfg.rb:138:17:138:23 | After ... = ... | cfg.rb:138:3:138:6 | Before ... = ... |  |
+| cfg.rb:138:17:138:23 | After ..., ... | cfg.rb:138:17:138:23 | * ... |  |
+| cfg.rb:138:17:138:23 | Before * ... | cfg.rb:138:17:138:23 | Before ..., ... |  |
+| cfg.rb:138:17:138:23 | Before ... = ... | cfg.rb:138:17:138:23 | __synth__2 |  |
+| cfg.rb:138:17:138:23 | Before ..., ... | cfg.rb:138:17:138:17 | 1 |  |
+| cfg.rb:138:17:138:23 | __synth__2 | cfg.rb:138:17:138:23 | Before * ... |  |
 | cfg.rb:138:20:138:20 | 2 | cfg.rb:138:23:138:23 | 3 |  |
 | cfg.rb:138:23:138:23 | 3 | cfg.rb:138:17:138:23 | ..., ... |  |
 | cfg.rb:140:1:140:1 | M | cfg.rb:140:1:140:11 | Constant |  |
-| cfg.rb:140:1:140:11 | Constant | cfg.rb:141:1:141:1 | M |  |
+| cfg.rb:140:1:140:11 | After Constant | cfg.rb:141:1:141:18 | Before Constant |  |
+| cfg.rb:140:1:140:11 | Before Constant | cfg.rb:140:1:140:1 | M |  |
+| cfg.rb:140:1:140:11 | Constant | cfg.rb:140:1:140:11 | After Constant |  |
 | cfg.rb:141:1:141:1 | M | cfg.rb:141:1:141:8 | call to itself |  |
-| cfg.rb:141:1:141:8 | call to itself | cfg.rb:141:1:141:18 | Constant |  |
-| cfg.rb:141:1:141:18 | Constant | cfg.rb:143:10:143:14 | Silly |  |
-| cfg.rb:143:1:149:3 | class << ... | cfg.rb:151:1:151:5 | silly |  |
+| cfg.rb:141:1:141:8 | After call to itself | cfg.rb:141:1:141:18 | Constant |  |
+| cfg.rb:141:1:141:8 | Before call to itself | cfg.rb:141:1:141:1 | M |  |
+| cfg.rb:141:1:141:8 | call to itself | cfg.rb:141:1:141:8 | After call to itself |  |
+| cfg.rb:141:1:141:18 | After Constant | cfg.rb:143:1:149:3 | class << ... |  |
+| cfg.rb:141:1:141:18 | Before Constant | cfg.rb:141:1:141:8 | Before call to itself |  |
+| cfg.rb:141:1:141:18 | Constant | cfg.rb:141:1:141:18 | After Constant |  |
+| cfg.rb:143:1:149:3 | After class << ... | cfg.rb:151:1:151:17 | Before ... = ... |  |
+| cfg.rb:143:1:149:3 | class << ... | cfg.rb:143:10:143:21 | Before call to itself |  |
 | cfg.rb:143:10:143:14 | Silly | cfg.rb:143:10:143:21 | call to itself |  |
-| cfg.rb:143:10:143:21 | call to itself | cfg.rb:144:3:144:19 | setter= |  |
+| cfg.rb:143:10:143:21 | After call to itself | cfg.rb:144:3:144:19 | setter= |  |
+| cfg.rb:143:10:143:21 | Before call to itself | cfg.rb:143:10:143:14 | Silly |  |
+| cfg.rb:143:10:143:21 | call to itself | cfg.rb:143:10:143:21 | After call to itself |  |
 | cfg.rb:144:3:144:19 | setter= | cfg.rb:145:3:148:5 | print |  |
-| cfg.rb:145:3:148:5 | enter print | cfg.rb:146:5:146:20 | self |  |
-| cfg.rb:145:3:148:5 | exit print (normal) | cfg.rb:145:3:148:5 | exit print |  |
-| cfg.rb:145:3:148:5 | print | cfg.rb:143:1:149:3 | class << ... |  |
-| cfg.rb:146:5:146:20 | call to puts | cfg.rb:147:5:147:22 | self |  |
-| cfg.rb:146:5:146:20 | self | cfg.rb:146:11:146:19 | singleton |  |
-| cfg.rb:146:10:146:20 | "singleton" | cfg.rb:146:5:146:20 | call to puts |  |
+| cfg.rb:145:3:148:5 | Entry | cfg.rb:146:5:147:22 | ... |  |
+| cfg.rb:145:3:148:5 | Normal Exit | cfg.rb:145:3:148:5 | Exit |  |
+| cfg.rb:145:3:148:5 | print | cfg.rb:143:1:149:3 | After class << ... |  |
+| cfg.rb:146:5:146:20 | After call to puts | cfg.rb:147:5:147:22 | Before call to puts |  |
+| cfg.rb:146:5:146:20 | Before call to puts | cfg.rb:146:5:146:20 | self |  |
+| cfg.rb:146:5:146:20 | call to puts | cfg.rb:146:5:146:20 | After call to puts |  |
+| cfg.rb:146:5:146:20 | self | cfg.rb:146:10:146:20 | Before "singleton" |  |
+| cfg.rb:146:5:147:22 | ... | cfg.rb:146:5:146:20 | Before call to puts |  |
+| cfg.rb:146:5:147:22 | After ... | cfg.rb:145:3:148:5 | Normal Exit |  |
+| cfg.rb:146:10:146:20 | "singleton" | cfg.rb:146:10:146:20 | After "singleton" |  |
+| cfg.rb:146:10:146:20 | After "singleton" | cfg.rb:146:5:146:20 | call to puts |  |
+| cfg.rb:146:10:146:20 | Before "singleton" | cfg.rb:146:11:146:19 | singleton |  |
 | cfg.rb:146:11:146:19 | singleton | cfg.rb:146:10:146:20 | "singleton" |  |
-| cfg.rb:147:5:147:22 | call to puts | cfg.rb:145:3:148:5 | exit print (normal) |  |
-| cfg.rb:147:5:147:22 | self | cfg.rb:147:10:147:14 | super call to print |  |
-| cfg.rb:147:10:147:14 | super call to print | cfg.rb:147:10:147:22 | call to print |  |
-| cfg.rb:147:10:147:22 | call to print | cfg.rb:147:5:147:22 | call to puts |  |
-| cfg.rb:151:1:151:5 | silly | cfg.rb:151:9:151:13 | Silly |  |
-| cfg.rb:151:1:151:17 | ... = ... | cfg.rb:152:5:152:9 | silly |  |
+| cfg.rb:147:5:147:22 | After call to puts | cfg.rb:146:5:147:22 | After ... |  |
+| cfg.rb:147:5:147:22 | Before call to puts | cfg.rb:147:5:147:22 | self |  |
+| cfg.rb:147:5:147:22 | call to puts | cfg.rb:147:5:147:22 | After call to puts |  |
+| cfg.rb:147:5:147:22 | self | cfg.rb:147:10:147:22 | Before call to print |  |
+| cfg.rb:147:10:147:14 | After super call to print | cfg.rb:147:10:147:22 | call to print |  |
+| cfg.rb:147:10:147:14 | Before super call to print | cfg.rb:147:10:147:14 | super call to print |  |
+| cfg.rb:147:10:147:14 | super call to print | cfg.rb:147:10:147:14 | After super call to print |  |
+| cfg.rb:147:10:147:22 | After call to print | cfg.rb:147:5:147:22 | call to puts |  |
+| cfg.rb:147:10:147:22 | Before call to print | cfg.rb:147:10:147:14 | Before super call to print |  |
+| cfg.rb:147:10:147:22 | call to print | cfg.rb:147:10:147:22 | After call to print |  |
+| cfg.rb:151:1:151:5 | silly | cfg.rb:151:9:151:17 | Before call to new |  |
+| cfg.rb:151:1:151:17 | ... = ... | cfg.rb:151:1:151:17 | After ... = ... |  |
+| cfg.rb:151:1:151:17 | After ... = ... | cfg.rb:152:1:154:3 | Before method |  |
+| cfg.rb:151:1:151:17 | Before ... = ... | cfg.rb:151:1:151:5 | silly |  |
 | cfg.rb:151:9:151:13 | Silly | cfg.rb:151:9:151:17 | call to new |  |
-| cfg.rb:151:9:151:17 | call to new | cfg.rb:151:1:151:17 | ... = ... |  |
-| cfg.rb:152:1:154:3 | enter method | cfg.rb:152:19:152:19 | x |  |
-| cfg.rb:152:1:154:3 | exit method (normal) | cfg.rb:152:1:154:3 | exit method |  |
-| cfg.rb:152:1:154:3 | method | cfg.rb:156:1:156:28 | two_parameters |  |
+| cfg.rb:151:9:151:17 | After call to new | cfg.rb:151:1:151:17 | ... = ... |  |
+| cfg.rb:151:9:151:17 | Before call to new | cfg.rb:151:9:151:13 | Silly |  |
+| cfg.rb:151:9:151:17 | call to new | cfg.rb:151:9:151:17 | After call to new |  |
+| cfg.rb:152:1:154:3 | After method | cfg.rb:156:1:156:28 | two_parameters |  |
+| cfg.rb:152:1:154:3 | Before method | cfg.rb:152:5:152:9 | silly |  |
+| cfg.rb:152:1:154:3 | Entry | cfg.rb:152:19:152:19 | x |  |
+| cfg.rb:152:1:154:3 | Normal Exit | cfg.rb:152:1:154:3 | Exit |  |
+| cfg.rb:152:1:154:3 | method | cfg.rb:152:1:154:3 | After method |  |
 | cfg.rb:152:5:152:9 | silly | cfg.rb:152:1:154:3 | method |  |
-| cfg.rb:152:19:152:19 | x | cfg.rb:153:3:153:8 | self |  |
-| cfg.rb:153:3:153:8 | call to puts | cfg.rb:152:1:154:3 | exit method (normal) |  |
+| cfg.rb:152:19:152:19 | x | cfg.rb:153:3:153:8 | ... |  |
+| cfg.rb:153:3:153:8 | ... | cfg.rb:153:3:153:8 | Before call to puts |  |
+| cfg.rb:153:3:153:8 | After ... | cfg.rb:152:1:154:3 | Normal Exit |  |
+| cfg.rb:153:3:153:8 | After call to puts | cfg.rb:153:3:153:8 | After ... |  |
+| cfg.rb:153:3:153:8 | Before call to puts | cfg.rb:153:3:153:8 | self |  |
+| cfg.rb:153:3:153:8 | call to puts | cfg.rb:153:3:153:8 | After call to puts |  |
 | cfg.rb:153:3:153:8 | self | cfg.rb:153:8:153:8 | x |  |
 | cfg.rb:153:8:153:8 | x | cfg.rb:153:3:153:8 | call to puts |  |
-| cfg.rb:156:1:156:28 | enter two_parameters | cfg.rb:156:21:156:21 | a |  |
-| cfg.rb:156:1:156:28 | exit two_parameters (normal) | cfg.rb:156:1:156:28 | exit two_parameters |  |
-| cfg.rb:156:1:156:28 | two_parameters | cfg.rb:158:1:158:22 | self |  |
-| cfg.rb:156:21:156:21 | a | cfg.rb:156:23:156:23 | b |  |
-| cfg.rb:156:23:156:23 | b | cfg.rb:156:1:156:28 | exit two_parameters (normal) |  |
-| cfg.rb:158:1:158:22 | call to two_parameters | cfg.rb:160:1:160:10 | scriptfile |  |
-| cfg.rb:158:1:158:22 | self | cfg.rb:158:17:158:21 | Array |  |
-| cfg.rb:158:16:158:21 | * ... | cfg.rb:158:1:158:22 | call to two_parameters |  |
+| cfg.rb:156:1:156:28 | two_parameters | cfg.rb:158:1:158:22 | Before call to two_parameters |  |
+| cfg.rb:158:1:158:22 | After call to two_parameters | cfg.rb:160:1:160:32 | Before ... = ... |  |
+| cfg.rb:158:1:158:22 | Before call to two_parameters | cfg.rb:158:1:158:22 | self |  |
+| cfg.rb:158:1:158:22 | call to two_parameters | cfg.rb:158:1:158:22 | After call to two_parameters |  |
+| cfg.rb:158:1:158:22 | self | cfg.rb:158:16:158:21 | Before * ... |  |
+| cfg.rb:158:16:158:21 | * ... | cfg.rb:158:16:158:21 | After * ... |  |
+| cfg.rb:158:16:158:21 | After * ... | cfg.rb:158:1:158:22 | call to two_parameters |  |
+| cfg.rb:158:16:158:21 | Before * ... | cfg.rb:158:17:158:21 | Before call to [] |  |
+| cfg.rb:158:17:158:21 | After call to [] | cfg.rb:158:16:158:21 | * ... |  |
 | cfg.rb:158:17:158:21 | Array | cfg.rb:158:18:158:18 | 1 |  |
-| cfg.rb:158:17:158:21 | call to [] | cfg.rb:158:16:158:21 | * ... |  |
+| cfg.rb:158:17:158:21 | Before call to [] | cfg.rb:158:17:158:21 | Array |  |
+| cfg.rb:158:17:158:21 | call to [] | cfg.rb:158:17:158:21 | After call to [] |  |
 | cfg.rb:158:18:158:18 | 1 | cfg.rb:158:20:158:20 | 2 |  |
 | cfg.rb:158:20:158:20 | 2 | cfg.rb:158:17:158:21 | call to [] |  |
-| cfg.rb:160:1:160:10 | scriptfile | cfg.rb:160:15:160:19 | cat " |  |
-| cfg.rb:160:1:160:32 | ... = ... | cfg.rb:162:1:162:6 | symbol |  |
-| cfg.rb:160:14:160:32 | `cat "#{...}"` | cfg.rb:160:1:160:32 | ... = ... |  |
-| cfg.rb:160:15:160:19 | cat " | cfg.rb:160:22:160:29 | self |  |
-| cfg.rb:160:20:160:30 | #{...} | cfg.rb:160:31:160:31 | " |  |
-| cfg.rb:160:22:160:29 | call to __FILE__ | cfg.rb:160:20:160:30 | #{...} |  |
+| cfg.rb:160:1:160:10 | scriptfile | cfg.rb:160:14:160:32 | Before `cat "#{...}"` |  |
+| cfg.rb:160:1:160:32 | ... = ... | cfg.rb:160:1:160:32 | After ... = ... |  |
+| cfg.rb:160:1:160:32 | After ... = ... | cfg.rb:162:1:162:15 | Before ... = ... |  |
+| cfg.rb:160:1:160:32 | Before ... = ... | cfg.rb:160:1:160:10 | scriptfile |  |
+| cfg.rb:160:14:160:32 | After `cat "#{...}"` | cfg.rb:160:1:160:32 | ... = ... |  |
+| cfg.rb:160:14:160:32 | Before `cat "#{...}"` | cfg.rb:160:15:160:19 | cat " |  |
+| cfg.rb:160:14:160:32 | `cat "#{...}"` | cfg.rb:160:14:160:32 | After `cat "#{...}"` |  |
+| cfg.rb:160:15:160:19 | cat " | cfg.rb:160:20:160:30 | #{...} |  |
+| cfg.rb:160:20:160:30 | #{...} | cfg.rb:160:22:160:29 | Before call to __FILE__ |  |
+| cfg.rb:160:20:160:30 | After #{...} | cfg.rb:160:31:160:31 | " |  |
+| cfg.rb:160:22:160:29 | After call to __FILE__ | cfg.rb:160:20:160:30 | After #{...} |  |
+| cfg.rb:160:22:160:29 | Before call to __FILE__ | cfg.rb:160:22:160:29 | self |  |
+| cfg.rb:160:22:160:29 | call to __FILE__ | cfg.rb:160:22:160:29 | After call to __FILE__ |  |
 | cfg.rb:160:22:160:29 | self | cfg.rb:160:22:160:29 | call to __FILE__ |  |
 | cfg.rb:160:31:160:31 | " | cfg.rb:160:14:160:32 | `cat "#{...}"` |  |
-| cfg.rb:162:1:162:6 | symbol | cfg.rb:162:10:162:15 | hello |  |
-| cfg.rb:162:1:162:15 | ... = ... | cfg.rb:164:1:164:16 | delimited_symbol |  |
-| cfg.rb:162:10:162:15 | :hello | cfg.rb:162:1:162:15 | ... = ... |  |
+| cfg.rb:162:1:162:6 | symbol | cfg.rb:162:10:162:15 | Before :hello |  |
+| cfg.rb:162:1:162:15 | ... = ... | cfg.rb:162:1:162:15 | After ... = ... |  |
+| cfg.rb:162:1:162:15 | After ... = ... | cfg.rb:164:1:164:42 | Before ... = ... |  |
+| cfg.rb:162:1:162:15 | Before ... = ... | cfg.rb:162:1:162:6 | symbol |  |
+| cfg.rb:162:10:162:15 | :hello | cfg.rb:162:10:162:15 | After :hello |  |
+| cfg.rb:162:10:162:15 | After :hello | cfg.rb:162:1:162:15 | ... = ... |  |
+| cfg.rb:162:10:162:15 | Before :hello | cfg.rb:162:10:162:15 | hello |  |
 | cfg.rb:162:10:162:15 | hello | cfg.rb:162:10:162:15 | :hello |  |
-| cfg.rb:164:1:164:16 | delimited_symbol | cfg.rb:164:22:164:29 | goodbye- |  |
-| cfg.rb:164:1:164:42 | ... = ... | cfg.rb:166:1:166:1 | x |  |
-| cfg.rb:164:20:164:42 | :"goodbye-#{...}" | cfg.rb:164:1:164:42 | ... = ... |  |
-| cfg.rb:164:22:164:29 | goodbye- | cfg.rb:164:33:164:34 | 12 |  |
-| cfg.rb:164:30:164:41 | #{...} | cfg.rb:164:20:164:42 | :"goodbye-#{...}" |  |
+| cfg.rb:164:1:164:16 | delimited_symbol | cfg.rb:164:20:164:42 | Before :"goodbye-#{...}" |  |
+| cfg.rb:164:1:164:42 | ... = ... | cfg.rb:164:1:164:42 | After ... = ... |  |
+| cfg.rb:164:1:164:42 | After ... = ... | cfg.rb:166:1:166:8 | Before ... = ... |  |
+| cfg.rb:164:1:164:42 | Before ... = ... | cfg.rb:164:1:164:16 | delimited_symbol |  |
+| cfg.rb:164:20:164:42 | :"goodbye-#{...}" | cfg.rb:164:20:164:42 | After :"goodbye-#{...}" |  |
+| cfg.rb:164:20:164:42 | After :"goodbye-#{...}" | cfg.rb:164:1:164:42 | ... = ... |  |
+| cfg.rb:164:20:164:42 | Before :"goodbye-#{...}" | cfg.rb:164:22:164:29 | goodbye- |  |
+| cfg.rb:164:22:164:29 | goodbye- | cfg.rb:164:30:164:41 | #{...} |  |
+| cfg.rb:164:30:164:41 | #{...} | cfg.rb:164:33:164:39 | Before ... + ... |  |
+| cfg.rb:164:30:164:41 | After #{...} | cfg.rb:164:20:164:42 | :"goodbye-#{...}" |  |
 | cfg.rb:164:33:164:34 | 12 | cfg.rb:164:38:164:39 | 13 |  |
-| cfg.rb:164:33:164:39 | ... + ... | cfg.rb:164:30:164:41 | #{...} |  |
+| cfg.rb:164:33:164:39 | ... + ... | cfg.rb:164:33:164:39 | After ... + ... |  |
+| cfg.rb:164:33:164:39 | After ... + ... | cfg.rb:164:30:164:41 | After #{...} |  |
+| cfg.rb:164:33:164:39 | Before ... + ... | cfg.rb:164:33:164:34 | 12 |  |
 | cfg.rb:164:38:164:39 | 13 | cfg.rb:164:33:164:39 | ... + ... |  |
 | cfg.rb:166:1:166:1 | x | cfg.rb:166:5:166:8 | true |  |
-| cfg.rb:166:1:166:8 | ... = ... | cfg.rb:167:1:167:1 | x |  |
+| cfg.rb:166:1:166:8 | ... = ... | cfg.rb:166:1:166:8 | After ... = ... |  |
+| cfg.rb:166:1:166:8 | After ... = ... | cfg.rb:167:1:167:10 | Before ... = ... |  |
+| cfg.rb:166:1:166:8 | Before ... = ... | cfg.rb:166:1:166:1 | x |  |
 | cfg.rb:166:5:166:8 | true | cfg.rb:166:1:166:8 | ... = ... |  |
-| cfg.rb:167:1:167:1 | x | cfg.rb:167:7:167:10 | true |  |
-| cfg.rb:167:1:167:10 | ... = ... | cfg.rb:168:1:168:1 | x |  |
-| cfg.rb:167:5:167:10 | ! ... | cfg.rb:167:1:167:10 | ... = ... |  |
-| cfg.rb:167:7:167:10 | true | cfg.rb:167:5:167:10 | ! ... |  |
-| cfg.rb:168:1:168:1 | x | cfg.rb:168:7:168:8 | 42 |  |
-| cfg.rb:168:1:168:8 | ... = ... | cfg.rb:170:1:170:20 | undef ... |  |
-| cfg.rb:168:5:168:8 | - ... | cfg.rb:168:1:168:8 | ... = ... |  |
+| cfg.rb:167:1:167:1 | x | cfg.rb:167:5:167:10 | ! ... |  |
+| cfg.rb:167:1:167:10 | ... = ... | cfg.rb:167:1:167:10 | After ... = ... |  |
+| cfg.rb:167:1:167:10 | After ... = ... | cfg.rb:168:1:168:8 | Before ... = ... |  |
+| cfg.rb:167:1:167:10 | Before ... = ... | cfg.rb:167:1:167:1 | x |  |
+| cfg.rb:167:5:167:10 | ! ... | cfg.rb:167:7:167:10 | true |  |
+| cfg.rb:167:5:167:10 | After ! ... | cfg.rb:167:1:167:10 | ... = ... |  |
+| cfg.rb:167:7:167:10 | true | cfg.rb:167:5:167:10 | After ! ... |  |
+| cfg.rb:168:1:168:1 | x | cfg.rb:168:5:168:8 | Before - ... |  |
+| cfg.rb:168:1:168:8 | ... = ... | cfg.rb:168:1:168:8 | After ... = ... |  |
+| cfg.rb:168:1:168:8 | After ... = ... | cfg.rb:170:1:170:20 | Before undef ... |  |
+| cfg.rb:168:1:168:8 | Before ... = ... | cfg.rb:168:1:168:1 | x |  |
+| cfg.rb:168:5:168:8 | - ... | cfg.rb:168:5:168:8 | After - ... |  |
+| cfg.rb:168:5:168:8 | After - ... | cfg.rb:168:1:168:8 | ... = ... |  |
+| cfg.rb:168:5:168:8 | Before - ... | cfg.rb:168:7:168:8 | 42 |  |
 | cfg.rb:168:7:168:8 | 42 | cfg.rb:168:5:168:8 | - ... |  |
-| cfg.rb:170:1:170:20 | undef ... | cfg.rb:170:7:170:20 | two_parameters |  |
-| cfg.rb:170:7:170:20 | two_parameters | cfg.rb:172:8:172:8 | x |  |
-| cfg.rb:172:1:172:49 | unless ... | cfg.rb:174:18:174:18 | x |  |
+| cfg.rb:170:1:170:20 | After undef ... | cfg.rb:172:1:172:49 | unless ... |  |
+| cfg.rb:170:1:170:20 | Before undef ... | cfg.rb:170:7:170:20 | two_parameters |  |
+| cfg.rb:170:1:170:20 | undef ... | cfg.rb:170:1:170:20 | After undef ... |  |
+| cfg.rb:170:7:170:20 | two_parameters | cfg.rb:170:1:170:20 | undef ... |  |
+| cfg.rb:172:1:172:49 | After unless ... | cfg.rb:174:1:174:23 | ... unless ... |  |
+| cfg.rb:172:1:172:49 | unless ... | cfg.rb:172:8:172:14 | Before ... == ... |  |
 | cfg.rb:172:8:172:8 | x | cfg.rb:172:13:172:14 | 10 |  |
-| cfg.rb:172:8:172:14 | ... == ... | cfg.rb:172:21:172:29 | self | false |
-| cfg.rb:172:8:172:14 | ... == ... | cfg.rb:172:36:172:45 | self | true |
+| cfg.rb:172:8:172:14 | ... == ... | cfg.rb:172:8:172:14 | After ... == ... [false] | false |
+| cfg.rb:172:8:172:14 | ... == ... | cfg.rb:172:8:172:14 | After ... == ... [true] | true |
+| cfg.rb:172:8:172:14 | After ... == ... [false] | cfg.rb:172:16:172:29 | then ... |  |
+| cfg.rb:172:8:172:14 | After ... == ... [true] | cfg.rb:172:31:172:45 | else ... |  |
+| cfg.rb:172:8:172:14 | Before ... == ... | cfg.rb:172:8:172:8 | x |  |
 | cfg.rb:172:13:172:14 | 10 | cfg.rb:172:8:172:14 | ... == ... |  |
-| cfg.rb:172:16:172:29 | then ... | cfg.rb:172:1:172:49 | unless ... |  |
-| cfg.rb:172:21:172:29 | call to puts | cfg.rb:172:16:172:29 | then ... |  |
-| cfg.rb:172:21:172:29 | self | cfg.rb:172:27:172:28 | hi |  |
-| cfg.rb:172:26:172:29 | "hi" | cfg.rb:172:21:172:29 | call to puts |  |
+| cfg.rb:172:16:172:29 | After then ... | cfg.rb:172:1:172:49 | After unless ... |  |
+| cfg.rb:172:16:172:29 | then ... | cfg.rb:172:21:172:29 | Before call to puts |  |
+| cfg.rb:172:21:172:29 | After call to puts | cfg.rb:172:16:172:29 | After then ... |  |
+| cfg.rb:172:21:172:29 | Before call to puts | cfg.rb:172:21:172:29 | self |  |
+| cfg.rb:172:21:172:29 | call to puts | cfg.rb:172:21:172:29 | After call to puts |  |
+| cfg.rb:172:21:172:29 | self | cfg.rb:172:26:172:29 | Before "hi" |  |
+| cfg.rb:172:26:172:29 | "hi" | cfg.rb:172:26:172:29 | After "hi" |  |
+| cfg.rb:172:26:172:29 | After "hi" | cfg.rb:172:21:172:29 | call to puts |  |
+| cfg.rb:172:26:172:29 | Before "hi" | cfg.rb:172:27:172:28 | hi |  |
 | cfg.rb:172:27:172:28 | hi | cfg.rb:172:26:172:29 | "hi" |  |
-| cfg.rb:172:31:172:45 | else ... | cfg.rb:172:1:172:49 | unless ... |  |
-| cfg.rb:172:36:172:45 | call to puts | cfg.rb:172:31:172:45 | else ... |  |
-| cfg.rb:172:36:172:45 | self | cfg.rb:172:42:172:44 | bye |  |
-| cfg.rb:172:41:172:45 | "bye" | cfg.rb:172:36:172:45 | call to puts |  |
+| cfg.rb:172:31:172:45 | After else ... | cfg.rb:172:1:172:49 | After unless ... |  |
+| cfg.rb:172:31:172:45 | else ... | cfg.rb:172:36:172:45 | Before call to puts |  |
+| cfg.rb:172:36:172:45 | After call to puts | cfg.rb:172:31:172:45 | After else ... |  |
+| cfg.rb:172:36:172:45 | Before call to puts | cfg.rb:172:36:172:45 | self |  |
+| cfg.rb:172:36:172:45 | call to puts | cfg.rb:172:36:172:45 | After call to puts |  |
+| cfg.rb:172:36:172:45 | self | cfg.rb:172:41:172:45 | Before "bye" |  |
+| cfg.rb:172:41:172:45 | "bye" | cfg.rb:172:41:172:45 | After "bye" |  |
+| cfg.rb:172:41:172:45 | After "bye" | cfg.rb:172:36:172:45 | call to puts |  |
+| cfg.rb:172:41:172:45 | Before "bye" | cfg.rb:172:42:172:44 | bye |  |
 | cfg.rb:172:42:172:44 | bye | cfg.rb:172:41:172:45 | "bye" |  |
-| cfg.rb:174:1:174:9 | call to puts | cfg.rb:174:1:174:23 | ... unless ... |  |
-| cfg.rb:174:1:174:9 | self | cfg.rb:174:7:174:8 | hi |  |
-| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:176:7:176:7 | x |  |
-| cfg.rb:174:6:174:9 | "hi" | cfg.rb:174:1:174:9 | call to puts |  |
+| cfg.rb:174:1:174:9 | After call to puts | cfg.rb:174:1:174:23 | After ... unless ... |  |
+| cfg.rb:174:1:174:9 | Before call to puts | cfg.rb:174:1:174:9 | self |  |
+| cfg.rb:174:1:174:9 | call to puts | cfg.rb:174:1:174:9 | After call to puts |  |
+| cfg.rb:174:1:174:9 | self | cfg.rb:174:6:174:9 | Before "hi" |  |
+| cfg.rb:174:1:174:23 | ... unless ... | cfg.rb:174:18:174:23 | Before ... == ... |  |
+| cfg.rb:174:1:174:23 | After ... unless ... | cfg.rb:176:1:176:41 | until ... |  |
+| cfg.rb:174:6:174:9 | "hi" | cfg.rb:174:6:174:9 | After "hi" |  |
+| cfg.rb:174:6:174:9 | After "hi" | cfg.rb:174:1:174:9 | call to puts |  |
+| cfg.rb:174:6:174:9 | Before "hi" | cfg.rb:174:7:174:8 | hi |  |
 | cfg.rb:174:7:174:8 | hi | cfg.rb:174:6:174:9 | "hi" |  |
 | cfg.rb:174:18:174:18 | x | cfg.rb:174:23:174:23 | 0 |  |
-| cfg.rb:174:18:174:23 | ... == ... | cfg.rb:174:1:174:9 | self | false |
-| cfg.rb:174:18:174:23 | ... == ... | cfg.rb:174:1:174:23 | ... unless ... | true |
+| cfg.rb:174:18:174:23 | ... == ... | cfg.rb:174:18:174:23 | After ... == ... [false] | false |
+| cfg.rb:174:18:174:23 | ... == ... | cfg.rb:174:18:174:23 | After ... == ... [true] | true |
+| cfg.rb:174:18:174:23 | After ... == ... [false] | cfg.rb:174:1:174:9 | Before call to puts |  |
+| cfg.rb:174:18:174:23 | After ... == ... [true] | cfg.rb:174:1:174:23 | After ... unless ... |  |
+| cfg.rb:174:18:174:23 | Before ... == ... | cfg.rb:174:18:174:18 | x |  |
 | cfg.rb:174:23:174:23 | 0 | cfg.rb:174:18:174:23 | ... == ... |  |
-| cfg.rb:176:1:176:41 | until ... | cfg.rb:178:1:178:1 | i |  |
+| cfg.rb:176:1:176:41 | After until ... | cfg.rb:178:1:178:5 | Before ... = ... |  |
+| cfg.rb:176:1:176:41 | [LoopHeader] until ... | cfg.rb:176:7:176:12 | Before ... > ... |  |
+| cfg.rb:176:1:176:41 | until ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |  |
 | cfg.rb:176:7:176:7 | x | cfg.rb:176:11:176:12 | 10 |  |
-| cfg.rb:176:7:176:12 | ... > ... | cfg.rb:176:1:176:41 | until ... | true |
-| cfg.rb:176:7:176:12 | ... > ... | cfg.rb:176:17:176:17 | x | false |
+| cfg.rb:176:7:176:12 | ... > ... | cfg.rb:176:7:176:12 | After ... > ... [false] | false |
+| cfg.rb:176:7:176:12 | ... > ... | cfg.rb:176:7:176:12 | After ... > ... [true] | true |
+| cfg.rb:176:7:176:12 | After ... > ... [false] | cfg.rb:176:14:176:41 | do ... |  |
+| cfg.rb:176:7:176:12 | After ... > ... [true] | cfg.rb:176:1:176:41 | After until ... |  |
+| cfg.rb:176:7:176:12 | Before ... > ... | cfg.rb:176:7:176:7 | x |  |
 | cfg.rb:176:11:176:12 | 10 | cfg.rb:176:7:176:12 | ... > ... |  |
-| cfg.rb:176:14:176:41 | do ... | cfg.rb:176:7:176:7 | x |  |
-| cfg.rb:176:17:176:17 | x | cfg.rb:176:17:176:17 | x |  |
+| cfg.rb:176:14:176:41 | After do ... | cfg.rb:176:1:176:41 | [LoopHeader] until ... |  |
+| cfg.rb:176:14:176:41 | do ... | cfg.rb:176:17:176:23 | Before ... = ... |  |
+| cfg.rb:176:17:176:17 | x | cfg.rb:176:19:176:20 | Before ... + ... |  |
 | cfg.rb:176:17:176:17 | x | cfg.rb:176:22:176:23 | 10 |  |
-| cfg.rb:176:17:176:23 | ... = ... | cfg.rb:176:26:176:37 | self |  |
-| cfg.rb:176:19:176:20 | ... + ... | cfg.rb:176:17:176:23 | ... = ... |  |
+| cfg.rb:176:17:176:23 | ... = ... | cfg.rb:176:17:176:23 | After ... = ... |  |
+| cfg.rb:176:17:176:23 | After ... = ... | cfg.rb:176:26:176:37 | Before call to puts |  |
+| cfg.rb:176:17:176:23 | Before ... = ... | cfg.rb:176:17:176:17 | x |  |
+| cfg.rb:176:19:176:20 | ... + ... | cfg.rb:176:19:176:20 | After ... + ... |  |
+| cfg.rb:176:19:176:20 | After ... + ... | cfg.rb:176:17:176:23 | ... = ... |  |
+| cfg.rb:176:19:176:20 | Before ... + ... | cfg.rb:176:17:176:17 | x |  |
 | cfg.rb:176:22:176:23 | 10 | cfg.rb:176:19:176:20 | ... + ... |  |
-| cfg.rb:176:26:176:37 | call to puts | cfg.rb:176:14:176:41 | do ... |  |
-| cfg.rb:176:26:176:37 | self | cfg.rb:176:32:176:36 | hello |  |
-| cfg.rb:176:31:176:37 | "hello" | cfg.rb:176:26:176:37 | call to puts |  |
+| cfg.rb:176:26:176:37 | After call to puts | cfg.rb:176:14:176:41 | After do ... |  |
+| cfg.rb:176:26:176:37 | Before call to puts | cfg.rb:176:26:176:37 | self |  |
+| cfg.rb:176:26:176:37 | call to puts | cfg.rb:176:26:176:37 | After call to puts |  |
+| cfg.rb:176:26:176:37 | self | cfg.rb:176:31:176:37 | Before "hello" |  |
+| cfg.rb:176:31:176:37 | "hello" | cfg.rb:176:31:176:37 | After "hello" |  |
+| cfg.rb:176:31:176:37 | After "hello" | cfg.rb:176:26:176:37 | call to puts |  |
+| cfg.rb:176:31:176:37 | Before "hello" | cfg.rb:176:32:176:36 | hello |  |
 | cfg.rb:176:32:176:36 | hello | cfg.rb:176:31:176:37 | "hello" |  |
 | cfg.rb:178:1:178:1 | i | cfg.rb:178:5:178:5 | 0 |  |
-| cfg.rb:178:1:178:5 | ... = ... | cfg.rb:179:30:179:30 | i |  |
+| cfg.rb:178:1:178:5 | ... = ... | cfg.rb:178:1:178:5 | After ... = ... |  |
+| cfg.rb:178:1:178:5 | After ... = ... | cfg.rb:179:1:179:36 | ... until ... |  |
+| cfg.rb:178:1:178:5 | Before ... = ... | cfg.rb:178:1:178:1 | i |  |
 | cfg.rb:178:5:178:5 | 0 | cfg.rb:178:1:178:5 | ... = ... |  |
-| cfg.rb:179:1:179:22 | ( ... ) | cfg.rb:179:30:179:30 | i |  |
-| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:181:1:181:1 | x |  |
-| cfg.rb:179:2:179:13 | call to puts | cfg.rb:179:16:179:16 | i |  |
-| cfg.rb:179:2:179:13 | self | cfg.rb:179:8:179:12 | hello |  |
-| cfg.rb:179:7:179:13 | "hello" | cfg.rb:179:2:179:13 | call to puts |  |
+| cfg.rb:179:1:179:22 | ( ... ) | cfg.rb:179:2:179:13 | Before call to puts |  |
+| cfg.rb:179:1:179:22 | After ( ... ) | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |  |
+| cfg.rb:179:1:179:36 | ... until ... | cfg.rb:179:1:179:36 | [LoopHeader] ... until ... |  |
+| cfg.rb:179:1:179:36 | After ... until ... | cfg.rb:181:1:181:5 | Before ... = ... |  |
+| cfg.rb:179:1:179:36 | [LoopHeader] ... until ... | cfg.rb:179:30:179:36 | Before ... == ... |  |
+| cfg.rb:179:2:179:13 | After call to puts | cfg.rb:179:16:179:21 | Before ... = ... |  |
+| cfg.rb:179:2:179:13 | Before call to puts | cfg.rb:179:2:179:13 | self |  |
+| cfg.rb:179:2:179:13 | call to puts | cfg.rb:179:2:179:13 | After call to puts |  |
+| cfg.rb:179:2:179:13 | self | cfg.rb:179:7:179:13 | Before "hello" |  |
+| cfg.rb:179:7:179:13 | "hello" | cfg.rb:179:7:179:13 | After "hello" |  |
+| cfg.rb:179:7:179:13 | After "hello" | cfg.rb:179:2:179:13 | call to puts |  |
+| cfg.rb:179:7:179:13 | Before "hello" | cfg.rb:179:8:179:12 | hello |  |
 | cfg.rb:179:8:179:12 | hello | cfg.rb:179:7:179:13 | "hello" |  |
-| cfg.rb:179:16:179:16 | i | cfg.rb:179:16:179:16 | i |  |
+| cfg.rb:179:16:179:16 | i | cfg.rb:179:18:179:19 | Before ... + ... |  |
 | cfg.rb:179:16:179:16 | i | cfg.rb:179:21:179:21 | 1 |  |
-| cfg.rb:179:16:179:21 | ... = ... | cfg.rb:179:1:179:22 | ( ... ) |  |
-| cfg.rb:179:18:179:19 | ... + ... | cfg.rb:179:16:179:21 | ... = ... |  |
+| cfg.rb:179:16:179:21 | ... = ... | cfg.rb:179:16:179:21 | After ... = ... |  |
+| cfg.rb:179:16:179:21 | After ... = ... | cfg.rb:179:1:179:22 | After ( ... ) |  |
+| cfg.rb:179:16:179:21 | Before ... = ... | cfg.rb:179:16:179:16 | i |  |
+| cfg.rb:179:18:179:19 | ... + ... | cfg.rb:179:18:179:19 | After ... + ... |  |
+| cfg.rb:179:18:179:19 | After ... + ... | cfg.rb:179:16:179:21 | ... = ... |  |
+| cfg.rb:179:18:179:19 | Before ... + ... | cfg.rb:179:16:179:16 | i |  |
 | cfg.rb:179:21:179:21 | 1 | cfg.rb:179:18:179:19 | ... + ... |  |
 | cfg.rb:179:30:179:30 | i | cfg.rb:179:35:179:36 | 10 |  |
-| cfg.rb:179:30:179:36 | ... == ... | cfg.rb:179:1:179:36 | ... until ... | true |
-| cfg.rb:179:30:179:36 | ... == ... | cfg.rb:179:2:179:13 | self | false |
+| cfg.rb:179:30:179:36 | ... == ... | cfg.rb:179:30:179:36 | After ... == ... [false] | false |
+| cfg.rb:179:30:179:36 | ... == ... | cfg.rb:179:30:179:36 | After ... == ... [true] | true |
+| cfg.rb:179:30:179:36 | After ... == ... [false] | cfg.rb:179:1:179:22 | ( ... ) |  |
+| cfg.rb:179:30:179:36 | After ... == ... [true] | cfg.rb:179:1:179:36 | After ... until ... |  |
+| cfg.rb:179:30:179:36 | Before ... == ... | cfg.rb:179:30:179:30 | i |  |
 | cfg.rb:179:35:179:36 | 10 | cfg.rb:179:30:179:36 | ... == ... |  |
 | cfg.rb:181:1:181:1 | x | cfg.rb:181:5:181:5 | 0 |  |
-| cfg.rb:181:1:181:5 | ... = ... | cfg.rb:182:7:182:7 | x |  |
+| cfg.rb:181:1:181:5 | ... = ... | cfg.rb:181:1:181:5 | After ... = ... |  |
+| cfg.rb:181:1:181:5 | After ... = ... | cfg.rb:182:1:186:3 | while ... |  |
+| cfg.rb:181:1:181:5 | Before ... = ... | cfg.rb:181:1:181:1 | x |  |
 | cfg.rb:181:5:181:5 | 0 | cfg.rb:181:1:181:5 | ... = ... |  |
-| cfg.rb:182:1:186:3 | while ... | cfg.rb:188:30:188:30 | i |  |
+| cfg.rb:182:1:186:3 | After while ... | cfg.rb:188:1:188:35 | ... while ... |  |
+| cfg.rb:182:1:186:3 | [LoopHeader] while ... | cfg.rb:182:7:182:12 | Before ... < ... |  |
+| cfg.rb:182:1:186:3 | while ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |  |
 | cfg.rb:182:7:182:7 | x | cfg.rb:182:11:182:12 | 10 |  |
-| cfg.rb:182:7:182:12 | ... < ... | cfg.rb:182:1:186:3 | while ... | false |
-| cfg.rb:182:7:182:12 | ... < ... | cfg.rb:183:3:183:3 | x | true |
+| cfg.rb:182:7:182:12 | ... < ... | cfg.rb:182:7:182:12 | After ... < ... [false] | false |
+| cfg.rb:182:7:182:12 | ... < ... | cfg.rb:182:7:182:12 | After ... < ... [true] | true |
+| cfg.rb:182:7:182:12 | After ... < ... [false] | cfg.rb:182:1:186:3 | After while ... |  |
+| cfg.rb:182:7:182:12 | After ... < ... [true] | cfg.rb:182:14:186:3 | do ... |  |
+| cfg.rb:182:7:182:12 | Before ... < ... | cfg.rb:182:7:182:7 | x |  |
 | cfg.rb:182:11:182:12 | 10 | cfg.rb:182:7:182:12 | ... < ... |  |
-| cfg.rb:182:14:186:3 | do ... | cfg.rb:182:7:182:7 | x |  |
-| cfg.rb:183:3:183:3 | x | cfg.rb:183:3:183:3 | x |  |
+| cfg.rb:182:14:186:3 | After do ... | cfg.rb:182:1:186:3 | [LoopHeader] while ... |  |
+| cfg.rb:182:14:186:3 | do ... | cfg.rb:183:3:183:8 | Before ... = ... |  |
+| cfg.rb:183:3:183:3 | x | cfg.rb:183:5:183:6 | Before ... + ... |  |
 | cfg.rb:183:3:183:3 | x | cfg.rb:183:8:183:8 | 1 |  |
-| cfg.rb:183:3:183:8 | ... = ... | cfg.rb:184:6:184:6 | x |  |
-| cfg.rb:183:5:183:6 | ... + ... | cfg.rb:183:3:183:8 | ... = ... |  |
+| cfg.rb:183:3:183:8 | ... = ... | cfg.rb:183:3:183:8 | After ... = ... |  |
+| cfg.rb:183:3:183:8 | After ... = ... | cfg.rb:184:3:184:25 | if ... |  |
+| cfg.rb:183:3:183:8 | Before ... = ... | cfg.rb:183:3:183:3 | x |  |
+| cfg.rb:183:5:183:6 | ... + ... | cfg.rb:183:5:183:6 | After ... + ... |  |
+| cfg.rb:183:5:183:6 | After ... + ... | cfg.rb:183:3:183:8 | ... = ... |  |
+| cfg.rb:183:5:183:6 | Before ... + ... | cfg.rb:183:3:183:3 | x |  |
 | cfg.rb:183:8:183:8 | 1 | cfg.rb:183:5:183:6 | ... + ... |  |
-| cfg.rb:184:3:184:25 | if ... | cfg.rb:185:3:185:8 | self |  |
+| cfg.rb:184:3:184:25 | After if ... | cfg.rb:185:3:185:8 | Before call to puts |  |
+| cfg.rb:184:3:184:25 | if ... | cfg.rb:184:6:184:11 | Before ... == ... |  |
 | cfg.rb:184:6:184:6 | x | cfg.rb:184:11:184:11 | 5 |  |
-| cfg.rb:184:6:184:11 | ... == ... | cfg.rb:184:3:184:25 | if ... | false |
-| cfg.rb:184:6:184:11 | ... == ... | cfg.rb:184:18:184:21 | redo | true |
+| cfg.rb:184:6:184:11 | ... == ... | cfg.rb:184:6:184:11 | After ... == ... [false] | false |
+| cfg.rb:184:6:184:11 | ... == ... | cfg.rb:184:6:184:11 | After ... == ... [true] | true |
+| cfg.rb:184:6:184:11 | After ... == ... [false] | cfg.rb:184:3:184:25 | After if ... |  |
+| cfg.rb:184:6:184:11 | After ... == ... [true] | cfg.rb:184:13:184:21 | then ... |  |
+| cfg.rb:184:6:184:11 | Before ... == ... | cfg.rb:184:6:184:6 | x |  |
 | cfg.rb:184:11:184:11 | 5 | cfg.rb:184:6:184:11 | ... == ... |  |
-| cfg.rb:184:18:184:21 | redo | cfg.rb:183:3:183:3 | x | redo |
-| cfg.rb:185:3:185:8 | call to puts | cfg.rb:182:14:186:3 | do ... |  |
+| cfg.rb:184:13:184:21 | then ... | cfg.rb:184:18:184:21 | Before redo |  |
+| cfg.rb:184:18:184:21 | Before redo | cfg.rb:184:18:184:21 | redo |  |
+| cfg.rb:184:18:184:21 | redo | cfg.rb:182:14:186:3 | do ... | redo |
+| cfg.rb:185:3:185:8 | After call to puts | cfg.rb:182:14:186:3 | After do ... |  |
+| cfg.rb:185:3:185:8 | Before call to puts | cfg.rb:185:3:185:8 | self |  |
+| cfg.rb:185:3:185:8 | call to puts | cfg.rb:185:3:185:8 | After call to puts |  |
 | cfg.rb:185:3:185:8 | self | cfg.rb:185:8:185:8 | x |  |
 | cfg.rb:185:8:185:8 | x | cfg.rb:185:3:185:8 | call to puts |  |
-| cfg.rb:188:1:188:22 | ( ... ) | cfg.rb:188:30:188:30 | i |  |
-| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:190:1:192:3 | run_block |  |
-| cfg.rb:188:2:188:13 | call to puts | cfg.rb:188:16:188:16 | i |  |
-| cfg.rb:188:2:188:13 | self | cfg.rb:188:8:188:12 | hello |  |
-| cfg.rb:188:7:188:13 | "hello" | cfg.rb:188:2:188:13 | call to puts |  |
+| cfg.rb:188:1:188:22 | ( ... ) | cfg.rb:188:2:188:13 | Before call to puts |  |
+| cfg.rb:188:1:188:22 | After ( ... ) | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |  |
+| cfg.rb:188:1:188:35 | ... while ... | cfg.rb:188:1:188:35 | [LoopHeader] ... while ... |  |
+| cfg.rb:188:1:188:35 | After ... while ... | cfg.rb:190:1:192:3 | run_block |  |
+| cfg.rb:188:1:188:35 | [LoopHeader] ... while ... | cfg.rb:188:30:188:35 | Before ... != ... |  |
+| cfg.rb:188:2:188:13 | After call to puts | cfg.rb:188:16:188:21 | Before ... = ... |  |
+| cfg.rb:188:2:188:13 | Before call to puts | cfg.rb:188:2:188:13 | self |  |
+| cfg.rb:188:2:188:13 | call to puts | cfg.rb:188:2:188:13 | After call to puts |  |
+| cfg.rb:188:2:188:13 | self | cfg.rb:188:7:188:13 | Before "hello" |  |
+| cfg.rb:188:7:188:13 | "hello" | cfg.rb:188:7:188:13 | After "hello" |  |
+| cfg.rb:188:7:188:13 | After "hello" | cfg.rb:188:2:188:13 | call to puts |  |
+| cfg.rb:188:7:188:13 | Before "hello" | cfg.rb:188:8:188:12 | hello |  |
 | cfg.rb:188:8:188:12 | hello | cfg.rb:188:7:188:13 | "hello" |  |
-| cfg.rb:188:16:188:16 | i | cfg.rb:188:16:188:16 | i |  |
+| cfg.rb:188:16:188:16 | i | cfg.rb:188:18:188:19 | Before ... - ... |  |
 | cfg.rb:188:16:188:16 | i | cfg.rb:188:21:188:21 | 1 |  |
-| cfg.rb:188:16:188:21 | ... = ... | cfg.rb:188:1:188:22 | ( ... ) |  |
-| cfg.rb:188:18:188:19 | ... - ... | cfg.rb:188:16:188:21 | ... = ... |  |
+| cfg.rb:188:16:188:21 | ... = ... | cfg.rb:188:16:188:21 | After ... = ... |  |
+| cfg.rb:188:16:188:21 | After ... = ... | cfg.rb:188:1:188:22 | After ( ... ) |  |
+| cfg.rb:188:16:188:21 | Before ... = ... | cfg.rb:188:16:188:16 | i |  |
+| cfg.rb:188:18:188:19 | ... - ... | cfg.rb:188:18:188:19 | After ... - ... |  |
+| cfg.rb:188:18:188:19 | After ... - ... | cfg.rb:188:16:188:21 | ... = ... |  |
+| cfg.rb:188:18:188:19 | Before ... - ... | cfg.rb:188:16:188:16 | i |  |
 | cfg.rb:188:21:188:21 | 1 | cfg.rb:188:18:188:19 | ... - ... |  |
 | cfg.rb:188:30:188:30 | i | cfg.rb:188:35:188:35 | 0 |  |
-| cfg.rb:188:30:188:35 | ... != ... | cfg.rb:188:1:188:35 | ... while ... | false |
-| cfg.rb:188:30:188:35 | ... != ... | cfg.rb:188:2:188:13 | self | true |
+| cfg.rb:188:30:188:35 | ... != ... | cfg.rb:188:30:188:35 | After ... != ... [false] | false |
+| cfg.rb:188:30:188:35 | ... != ... | cfg.rb:188:30:188:35 | After ... != ... [true] | true |
+| cfg.rb:188:30:188:35 | After ... != ... [false] | cfg.rb:188:1:188:35 | After ... while ... |  |
+| cfg.rb:188:30:188:35 | After ... != ... [true] | cfg.rb:188:1:188:22 | ( ... ) |  |
+| cfg.rb:188:30:188:35 | Before ... != ... | cfg.rb:188:30:188:30 | i |  |
 | cfg.rb:188:35:188:35 | 0 | cfg.rb:188:30:188:35 | ... != ... |  |
-| cfg.rb:190:1:192:3 | enter run_block | cfg.rb:191:9:191:10 | 42 |  |
-| cfg.rb:190:1:192:3 | exit run_block (normal) | cfg.rb:190:1:192:3 | exit run_block |  |
-| cfg.rb:190:1:192:3 | run_block | cfg.rb:194:1:194:23 | self |  |
-| cfg.rb:191:3:191:10 | yield ... | cfg.rb:190:1:192:3 | exit run_block (normal) |  |
+| cfg.rb:190:1:192:3 | Entry | cfg.rb:191:3:191:10 | ... |  |
+| cfg.rb:190:1:192:3 | Normal Exit | cfg.rb:190:1:192:3 | Exit |  |
+| cfg.rb:190:1:192:3 | run_block | cfg.rb:194:1:194:23 | Before call to run_block |  |
+| cfg.rb:191:3:191:10 | ... | cfg.rb:191:3:191:10 | Before yield ... |  |
+| cfg.rb:191:3:191:10 | After ... | cfg.rb:190:1:192:3 | Normal Exit |  |
+| cfg.rb:191:3:191:10 | After yield ... | cfg.rb:191:3:191:10 | After ... |  |
+| cfg.rb:191:3:191:10 | Before yield ... | cfg.rb:191:9:191:10 | 42 |  |
+| cfg.rb:191:3:191:10 | yield ... | cfg.rb:191:3:191:10 | After yield ... |  |
 | cfg.rb:191:9:191:10 | 42 | cfg.rb:191:3:191:10 | yield ... |  |
-| cfg.rb:194:1:194:23 | call to run_block | cfg.rb:196:1:198:3 | forward_param |  |
+| cfg.rb:194:1:194:23 | After call to run_block | cfg.rb:196:1:198:3 | forward_param |  |
+| cfg.rb:194:1:194:23 | Before call to run_block | cfg.rb:194:1:194:23 | self |  |
+| cfg.rb:194:1:194:23 | call to run_block | cfg.rb:194:1:194:23 | After call to run_block |  |
 | cfg.rb:194:1:194:23 | self | cfg.rb:194:11:194:23 | { ... } |  |
-| cfg.rb:194:11:194:23 | enter { ... } | cfg.rb:194:14:194:14 | x |  |
-| cfg.rb:194:11:194:23 | exit { ... } (normal) | cfg.rb:194:11:194:23 | exit { ... } |  |
+| cfg.rb:194:11:194:23 | Entry | cfg.rb:194:14:194:14 | x |  |
+| cfg.rb:194:11:194:23 | Normal Exit | cfg.rb:194:11:194:23 | Exit |  |
 | cfg.rb:194:11:194:23 | { ... } | cfg.rb:194:1:194:23 | call to run_block |  |
-| cfg.rb:194:14:194:14 | x | cfg.rb:194:16:194:21 | self |  |
-| cfg.rb:194:16:194:21 | call to puts | cfg.rb:194:11:194:23 | exit { ... } (normal) |  |
+| cfg.rb:194:14:194:14 | x | cfg.rb:194:16:194:21 | ... |  |
+| cfg.rb:194:16:194:21 | ... | cfg.rb:194:16:194:21 | Before call to puts |  |
+| cfg.rb:194:16:194:21 | After ... | cfg.rb:194:11:194:23 | Normal Exit |  |
+| cfg.rb:194:16:194:21 | After call to puts | cfg.rb:194:16:194:21 | After ... |  |
+| cfg.rb:194:16:194:21 | Before call to puts | cfg.rb:194:16:194:21 | self |  |
+| cfg.rb:194:16:194:21 | call to puts | cfg.rb:194:16:194:21 | After call to puts |  |
 | cfg.rb:194:16:194:21 | self | cfg.rb:194:21:194:21 | x |  |
 | cfg.rb:194:21:194:21 | x | cfg.rb:194:16:194:21 | call to puts |  |
-| cfg.rb:196:1:198:3 | enter forward_param | cfg.rb:196:19:196:19 | a |  |
-| cfg.rb:196:1:198:3 | exit forward_param (normal) | cfg.rb:196:1:198:3 | exit forward_param |  |
-| cfg.rb:196:1:198:3 | forward_param | cfg.rb:200:1:200:1 | 1 |  |
+| cfg.rb:196:1:198:3 | Entry | cfg.rb:196:19:196:19 | a |  |
+| cfg.rb:196:1:198:3 | Normal Exit | cfg.rb:196:1:198:3 | Exit |  |
+| cfg.rb:196:1:198:3 | forward_param | cfg.rb:200:1:200:32 | Before call to times |  |
 | cfg.rb:196:19:196:19 | a | cfg.rb:196:22:196:22 | b |  |
 | cfg.rb:196:22:196:22 | b | cfg.rb:196:25:196:27 | ... |  |
-| cfg.rb:196:25:196:27 | ... | cfg.rb:197:3:197:13 | self |  |
-| cfg.rb:197:3:197:13 | call to bar | cfg.rb:196:1:198:3 | exit forward_param (normal) |  |
+| cfg.rb:196:25:196:27 | ... | cfg.rb:197:3:197:13 | ... |  |
+| cfg.rb:197:3:197:13 | ... | cfg.rb:197:3:197:13 | Before call to bar |  |
+| cfg.rb:197:3:197:13 | After ... | cfg.rb:196:1:198:3 | Normal Exit |  |
+| cfg.rb:197:3:197:13 | After call to bar | cfg.rb:197:3:197:13 | After ... |  |
+| cfg.rb:197:3:197:13 | Before call to bar | cfg.rb:197:3:197:13 | self |  |
+| cfg.rb:197:3:197:13 | call to bar | cfg.rb:197:3:197:13 | After call to bar |  |
 | cfg.rb:197:3:197:13 | self | cfg.rb:197:7:197:7 | b |  |
 | cfg.rb:197:7:197:7 | b | cfg.rb:197:10:197:12 | ... |  |
 | cfg.rb:197:10:197:12 | ... | cfg.rb:197:3:197:13 | call to bar |  |
 | cfg.rb:200:1:200:1 | 1 | cfg.rb:200:9:200:32 | { ... } |  |
-| cfg.rb:200:1:200:32 | call to times | cfg.rb:202:1:202:1 | 2 |  |
-| cfg.rb:200:9:200:32 | enter { ... } | cfg.rb:200:12:200:12 | a |  |
-| cfg.rb:200:9:200:32 | exit { ... } (normal) | cfg.rb:200:9:200:32 | exit { ... } |  |
+| cfg.rb:200:1:200:32 | After call to times | cfg.rb:202:1:202:35 | Before call to times |  |
+| cfg.rb:200:1:200:32 | Before call to times | cfg.rb:200:1:200:1 | 1 |  |
+| cfg.rb:200:1:200:32 | call to times | cfg.rb:200:1:200:32 | After call to times |  |
+| cfg.rb:200:9:200:32 | Entry | cfg.rb:200:12:200:12 | a |  |
+| cfg.rb:200:9:200:32 | Normal Exit | cfg.rb:200:9:200:32 | Exit |  |
 | cfg.rb:200:9:200:32 | { ... } | cfg.rb:200:1:200:32 | call to times |  |
-| cfg.rb:200:12:200:12 | a | cfg.rb:200:15:200:15 | b |  |
-| cfg.rb:200:15:200:15 | b | cfg.rb:200:18:200:23 | Kernel |  |
+| cfg.rb:200:12:200:12 | a | cfg.rb:200:18:200:30 | ... |  |
 | cfg.rb:200:18:200:23 | Kernel | cfg.rb:200:30:200:30 | a |  |
-| cfg.rb:200:18:200:30 | call to puts | cfg.rb:200:9:200:32 | exit { ... } (normal) |  |
+| cfg.rb:200:18:200:30 | ... | cfg.rb:200:18:200:30 | Before call to puts |  |
+| cfg.rb:200:18:200:30 | After ... | cfg.rb:200:9:200:32 | Normal Exit |  |
+| cfg.rb:200:18:200:30 | After call to puts | cfg.rb:200:18:200:30 | After ... |  |
+| cfg.rb:200:18:200:30 | Before call to puts | cfg.rb:200:18:200:23 | Kernel |  |
+| cfg.rb:200:18:200:30 | call to puts | cfg.rb:200:18:200:30 | After call to puts |  |
 | cfg.rb:200:30:200:30 | a | cfg.rb:200:18:200:30 | call to puts |  |
 | cfg.rb:202:1:202:1 | 2 | cfg.rb:202:9:202:35 | do ... end |  |
-| cfg.rb:202:1:202:35 | call to times | cfg.rb:205:1:205:3 | __synth__0__1 |  |
+| cfg.rb:202:1:202:35 | After call to times | cfg.rb:205:1:205:23 | ... |  |
+| cfg.rb:202:1:202:35 | Before call to times | cfg.rb:202:1:202:1 | 2 |  |
+| cfg.rb:202:1:202:35 | call to times | cfg.rb:202:1:202:35 | After call to times |  |
+| cfg.rb:202:9:202:35 | Entry | cfg.rb:202:13:202:13 | c |  |
+| cfg.rb:202:9:202:35 | Normal Exit | cfg.rb:202:9:202:35 | Exit |  |
 | cfg.rb:202:9:202:35 | do ... end | cfg.rb:202:1:202:35 | call to times |  |
-| cfg.rb:202:9:202:35 | enter do ... end | cfg.rb:202:13:202:13 | c |  |
-| cfg.rb:202:9:202:35 | exit do ... end (normal) | cfg.rb:202:9:202:35 | exit do ... end |  |
-| cfg.rb:202:13:202:13 | c | cfg.rb:202:16:202:16 | d |  |
-| cfg.rb:202:16:202:16 | d | cfg.rb:202:19:202:24 | Kernel |  |
+| cfg.rb:202:13:202:13 | c | cfg.rb:202:19:202:31 | ... |  |
 | cfg.rb:202:19:202:24 | Kernel | cfg.rb:202:31:202:31 | c |  |
-| cfg.rb:202:19:202:31 | call to puts | cfg.rb:202:9:202:35 | exit do ... end (normal) |  |
+| cfg.rb:202:19:202:31 | ... | cfg.rb:202:19:202:31 | Before call to puts |  |
+| cfg.rb:202:19:202:31 | After ... | cfg.rb:202:9:202:35 | Normal Exit |  |
+| cfg.rb:202:19:202:31 | After call to puts | cfg.rb:202:19:202:31 | After ... |  |
+| cfg.rb:202:19:202:31 | Before call to puts | cfg.rb:202:19:202:24 | Kernel |  |
+| cfg.rb:202:19:202:31 | call to puts | cfg.rb:202:19:202:31 | After call to puts |  |
 | cfg.rb:202:31:202:31 | c | cfg.rb:202:19:202:31 | call to puts |  |
-| cfg.rb:205:1:205:3 | ... = ... | cfg.rb:205:4:205:5 | nil |  |
-| cfg.rb:205:1:205:3 | __synth__0__1 | cfg.rb:205:1:205:3 | self |  |
+| cfg.rb:205:1:205:3 | ... = ... | cfg.rb:205:1:205:3 | After ... = ... |  |
+| cfg.rb:205:1:205:3 | After ... = ... | cfg.rb:205:4:205:5 | if ... |  |
+| cfg.rb:205:1:205:3 | After call to foo | cfg.rb:205:1:205:3 | ... = ... |  |
+| cfg.rb:205:1:205:3 | Before ... = ... | cfg.rb:205:1:205:3 | __synth__0__1 |  |
+| cfg.rb:205:1:205:3 | Before call to foo | cfg.rb:205:1:205:3 | self |  |
+| cfg.rb:205:1:205:3 | __synth__0__1 | cfg.rb:205:1:205:3 | Before call to foo |  |
 | cfg.rb:205:1:205:3 | __synth__0__1 | cfg.rb:205:4:205:5 | call to == |  |
 | cfg.rb:205:1:205:3 | __synth__0__1 | cfg.rb:205:10:205:10 | 1 |  |
-| cfg.rb:205:1:205:3 | call to foo | cfg.rb:205:1:205:3 | ... = ... |  |
-| cfg.rb:205:1:205:3 | nil | cfg.rb:205:4:205:5 | if ... |  |
+| cfg.rb:205:1:205:3 | call to foo | cfg.rb:205:1:205:3 | After call to foo |  |
+| cfg.rb:205:1:205:3 | nil | cfg.rb:205:4:205:5 | After if ... |  |
 | cfg.rb:205:1:205:3 | self | cfg.rb:205:1:205:3 | call to foo |  |
-| cfg.rb:205:1:205:23 | ... | cfg.rb:207:1:211:3 | filter_nil |  |
-| cfg.rb:205:1:205:23 | call to bar | cfg.rb:205:4:205:5 | if ... |  |
-| cfg.rb:205:4:205:5 | call to == | cfg.rb:205:1:205:3 | __synth__0__1 | false |
-| cfg.rb:205:4:205:5 | call to == | cfg.rb:205:1:205:3 | nil | true |
-| cfg.rb:205:4:205:5 | if ... | cfg.rb:205:1:205:23 | ... |  |
+| cfg.rb:205:1:205:23 | ... | cfg.rb:205:1:205:3 | Before ... = ... |  |
+| cfg.rb:205:1:205:23 | After ... | cfg.rb:207:1:211:3 | filter_nil |  |
+| cfg.rb:205:1:205:23 | After call to bar | cfg.rb:205:4:205:5 | After if ... |  |
+| cfg.rb:205:1:205:23 | Before call to bar | cfg.rb:205:1:205:3 | __synth__0__1 |  |
+| cfg.rb:205:1:205:23 | call to bar | cfg.rb:205:1:205:23 | After call to bar |  |
+| cfg.rb:205:4:205:5 | After call to == [false] | cfg.rb:205:1:205:23 | Before call to bar |  |
+| cfg.rb:205:4:205:5 | After call to == [true] | cfg.rb:205:1:205:3 | nil |  |
+| cfg.rb:205:4:205:5 | After if ... | cfg.rb:205:1:205:23 | After ... |  |
+| cfg.rb:205:4:205:5 | Before call to == | cfg.rb:205:4:205:5 | nil |  |
+| cfg.rb:205:4:205:5 | call to == | cfg.rb:205:4:205:5 | After call to == [false] | false |
+| cfg.rb:205:4:205:5 | call to == | cfg.rb:205:4:205:5 | After call to == [true] | true |
+| cfg.rb:205:4:205:5 | if ... | cfg.rb:205:4:205:5 | Before call to == |  |
 | cfg.rb:205:4:205:5 | nil | cfg.rb:205:1:205:3 | __synth__0__1 |  |
 | cfg.rb:205:10:205:10 | 1 | cfg.rb:205:12:205:12 | 2 |  |
 | cfg.rb:205:12:205:12 | 2 | cfg.rb:205:15:205:23 | { ... } |  |
-| cfg.rb:205:15:205:23 | enter { ... } | cfg.rb:205:18:205:18 | x |  |
-| cfg.rb:205:15:205:23 | exit { ... } (normal) | cfg.rb:205:15:205:23 | exit { ... } |  |
+| cfg.rb:205:15:205:23 | Entry | cfg.rb:205:18:205:18 | x |  |
+| cfg.rb:205:15:205:23 | Normal Exit | cfg.rb:205:15:205:23 | Exit |  |
 | cfg.rb:205:15:205:23 | { ... } | cfg.rb:205:1:205:23 | call to bar |  |
-| cfg.rb:205:18:205:18 | x | cfg.rb:205:21:205:21 | x |  |
-| cfg.rb:205:21:205:21 | x | cfg.rb:205:15:205:23 | exit { ... } (normal) |  |
-| cfg.rb:207:1:211:3 | enter filter_nil | cfg.rb:207:16:207:19 | list |  |
-| cfg.rb:207:1:211:3 | exit filter_nil (normal) | cfg.rb:207:1:211:3 | exit filter_nil |  |
-| cfg.rb:207:1:211:3 | filter_nil | cfg.rb:213:1:216:3 | self |  |
-| cfg.rb:207:16:207:19 | list | cfg.rb:208:3:208:6 | list |  |
+| cfg.rb:205:18:205:18 | x | cfg.rb:205:21:205:21 | ... |  |
+| cfg.rb:205:21:205:21 | ... | cfg.rb:205:21:205:21 | x |  |
+| cfg.rb:205:21:205:21 | After ... | cfg.rb:205:15:205:23 | Normal Exit |  |
+| cfg.rb:205:21:205:21 | x | cfg.rb:205:21:205:21 | After ... |  |
+| cfg.rb:207:1:211:3 | Entry | cfg.rb:207:16:207:19 | list |  |
+| cfg.rb:207:1:211:3 | Normal Exit | cfg.rb:207:1:211:3 | Exit |  |
+| cfg.rb:207:1:211:3 | filter_nil | cfg.rb:213:1:216:3 | Before call to do_something |  |
+| cfg.rb:207:16:207:19 | list | cfg.rb:208:3:210:5 | ... |  |
 | cfg.rb:208:3:208:6 | list | cfg.rb:208:15:210:5 | do ... end |  |
-| cfg.rb:208:3:210:5 | call to reject | cfg.rb:207:1:211:3 | exit filter_nil (normal) |  |
+| cfg.rb:208:3:210:5 | ... | cfg.rb:208:3:210:5 | Before call to reject |  |
+| cfg.rb:208:3:210:5 | After ... | cfg.rb:207:1:211:3 | Normal Exit |  |
+| cfg.rb:208:3:210:5 | After call to reject | cfg.rb:208:3:210:5 | After ... |  |
+| cfg.rb:208:3:210:5 | Before call to reject | cfg.rb:208:3:208:6 | list |  |
+| cfg.rb:208:3:210:5 | call to reject | cfg.rb:208:3:210:5 | After call to reject |  |
+| cfg.rb:208:15:210:5 | Entry | cfg.rb:208:19:208:22 | elem |  |
+| cfg.rb:208:15:210:5 | Normal Exit | cfg.rb:208:15:210:5 | Exit |  |
 | cfg.rb:208:15:210:5 | do ... end | cfg.rb:208:3:210:5 | call to reject |  |
-| cfg.rb:208:15:210:5 | enter do ... end | cfg.rb:208:19:208:22 | elem |  |
-| cfg.rb:208:15:210:5 | exit do ... end (normal) | cfg.rb:208:15:210:5 | exit do ... end |  |
 | cfg.rb:208:19:208:22 | elem | cfg.rb:208:25:208:25 | __synth__0 |  |
 | cfg.rb:208:25:208:25 | __synth__0 | cfg.rb:208:28:208:29 | __synth__0 |  |
-| cfg.rb:208:28:208:29 | __synth__0 | cfg.rb:209:5:209:8 | elem |  |
+| cfg.rb:208:28:208:29 | __synth__0 | cfg.rb:209:5:209:13 | ... |  |
 | cfg.rb:209:5:209:8 | elem | cfg.rb:209:5:209:13 | call to nil? |  |
-| cfg.rb:209:5:209:13 | call to nil? | cfg.rb:208:15:210:5 | exit do ... end (normal) |  |
-| cfg.rb:213:1:216:3 | call to do_something | cfg.rb:1:1:221:1 | exit cfg.rb (normal) |  |
+| cfg.rb:209:5:209:13 | ... | cfg.rb:209:5:209:13 | Before call to nil? |  |
+| cfg.rb:209:5:209:13 | After ... | cfg.rb:208:15:210:5 | Normal Exit |  |
+| cfg.rb:209:5:209:13 | After call to nil? | cfg.rb:209:5:209:13 | After ... |  |
+| cfg.rb:209:5:209:13 | Before call to nil? | cfg.rb:209:5:209:8 | elem |  |
+| cfg.rb:209:5:209:13 | call to nil? | cfg.rb:209:5:209:13 | After call to nil? |  |
+| cfg.rb:213:1:216:3 | After call to do_something | cfg.rb:1:1:221:1 | Normal Exit |  |
+| cfg.rb:213:1:216:3 | Before call to do_something | cfg.rb:213:1:216:3 | self |  |
+| cfg.rb:213:1:216:3 | call to do_something | cfg.rb:213:1:216:3 | After call to do_something |  |
 | cfg.rb:213:1:216:3 | self | cfg.rb:213:14:216:3 | do ... end |  |
+| cfg.rb:213:14:216:3 | Entry | cfg.rb:214:3:215:16 | ... |  |
+| cfg.rb:213:14:216:3 | Normal Exit | cfg.rb:213:14:216:3 | Exit |  |
 | cfg.rb:213:14:216:3 | do ... end | cfg.rb:213:1:216:3 | call to do_something |  |
-| cfg.rb:213:14:216:3 | enter do ... end | cfg.rb:214:3:214:6 | self |  |
-| cfg.rb:213:14:216:3 | exit do ... end (normal) | cfg.rb:213:14:216:3 | exit do ... end |  |
 | cfg.rb:214:3:214:6 | self | cfg.rb:214:3:214:16 | call to something |  |
-| cfg.rb:214:3:214:16 | call to something | cfg.rb:215:3:215:16 | self |  |
-| cfg.rb:215:3:215:16 | call to something_else | cfg.rb:213:14:216:3 | exit do ... end (normal) |  |
+| cfg.rb:214:3:214:16 | After call to something | cfg.rb:215:3:215:16 | Before call to something_else |  |
+| cfg.rb:214:3:214:16 | Before call to something | cfg.rb:214:3:214:6 | self |  |
+| cfg.rb:214:3:214:16 | call to something | cfg.rb:214:3:214:16 | After call to something |  |
+| cfg.rb:214:3:215:16 | ... | cfg.rb:214:3:214:16 | Before call to something |  |
+| cfg.rb:214:3:215:16 | After ... | cfg.rb:213:14:216:3 | Normal Exit |  |
+| cfg.rb:215:3:215:16 | After call to something_else | cfg.rb:214:3:215:16 | After ... |  |
+| cfg.rb:215:3:215:16 | Before call to something_else | cfg.rb:215:3:215:16 | self |  |
+| cfg.rb:215:3:215:16 | call to something_else | cfg.rb:215:3:215:16 | After call to something_else |  |
 | cfg.rb:215:3:215:16 | self | cfg.rb:215:3:215:16 | call to something_else |  |
+| constant_compound_assign.rb:1:1:9:3 | After Foo | constant_compound_assign.rb:11:1:12:3 | top_before |  |
 | constant_compound_assign.rb:1:1:9:3 | Foo | constant_compound_assign.rb:2:5:3:7 | foo_before |  |
-| constant_compound_assign.rb:1:1:22:4 | enter constant_compound_assign.rb | constant_compound_assign.rb:1:1:9:3 | Foo |  |
-| constant_compound_assign.rb:1:1:22:4 | exit constant_compound_assign.rb (normal) | constant_compound_assign.rb:1:1:22:4 | exit constant_compound_assign.rb |  |
-| constant_compound_assign.rb:2:5:3:7 | foo_before | constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT |  |
-| constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT | constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT |  |
-| constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | true |
-| constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT | constant_compound_assign.rb:5:22:5:24 | 123 | false |
-| constant_compound_assign.rb:5:5:5:24 | ... = ... | constant_compound_assign.rb:7:5:8:7 | foo_after |  |
-| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:5:5:5:24 | ... = ... |  |
-| constant_compound_assign.rb:5:22:5:24 | 123 | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... |  |
-| constant_compound_assign.rb:7:5:8:7 | foo_after | constant_compound_assign.rb:11:1:12:3 | top_before |  |
-| constant_compound_assign.rb:11:1:12:3 | top_before | constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT |  |
-| constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT | constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT |  |
-| constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | true |
-| constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT | constant_compound_assign.rb:14:18:14:20 | 123 | false |
-| constant_compound_assign.rb:14:1:14:20 | ... = ... | constant_compound_assign.rb:16:1:17:3 | top_after |  |
-| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:14:1:14:20 | ... = ... |  |
-| constant_compound_assign.rb:14:18:14:20 | 123 | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... |  |
-| constant_compound_assign.rb:16:1:17:3 | top_after | constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 |  |
-| constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 | constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 |  |
-| constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 | constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | true |
-| constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 | constant_compound_assign.rb:19:21:19:23 | 123 | false |
-| constant_compound_assign.rb:19:1:19:23 | ... = ... | constant_compound_assign.rb:21:1:22:3 | top_after2 |  |
-| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:19:1:19:23 | ... = ... |  |
-| constant_compound_assign.rb:19:21:19:23 | 123 | constant_compound_assign.rb:19:17:19:19 | ... \|\| ... |  |
-| constant_compound_assign.rb:21:1:22:3 | top_after2 | constant_compound_assign.rb:1:1:22:4 | exit constant_compound_assign.rb (normal) |  |
-| desugar.rb:1:1:3:3 | enter m1 | desugar.rb:1:8:1:8 | x |  |
-| desugar.rb:1:1:3:3 | exit m1 (normal) | desugar.rb:1:1:3:3 | exit m1 |  |
+| constant_compound_assign.rb:1:1:22:4 | Entry | constant_compound_assign.rb:1:1:9:3 | Foo |  |
+| constant_compound_assign.rb:1:1:22:4 | Normal Exit | constant_compound_assign.rb:1:1:22:4 | Exit |  |
+| constant_compound_assign.rb:2:5:3:7 | foo_before | constant_compound_assign.rb:5:5:5:24 | Before ... = ... |  |
+| constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [false] | constant_compound_assign.rb:5:22:5:24 | 123 |  |
+| constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [true] | constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... |  |
+| constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [false] | false |
+| constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT | constant_compound_assign.rb:5:5:5:16 | After FOO_CONSTANT [true] | true |
+| constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT | constant_compound_assign.rb:5:18:5:20 | ... \|\| ... |  |
+| constant_compound_assign.rb:5:5:5:24 | ... = ... | constant_compound_assign.rb:5:5:5:24 | After ... = ... |  |
+| constant_compound_assign.rb:5:5:5:24 | After ... = ... | constant_compound_assign.rb:7:5:8:7 | foo_after |  |
+| constant_compound_assign.rb:5:5:5:24 | Before ... = ... | constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT |  |
+| constant_compound_assign.rb:5:18:5:20 | ... \|\| ... | constant_compound_assign.rb:5:5:5:16 | FOO_CONSTANT |  |
+| constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... | constant_compound_assign.rb:5:5:5:24 | ... = ... |  |
+| constant_compound_assign.rb:5:22:5:24 | 123 | constant_compound_assign.rb:5:18:5:20 | After ... \|\| ... |  |
+| constant_compound_assign.rb:7:5:8:7 | foo_after | constant_compound_assign.rb:1:1:9:3 | After Foo |  |
+| constant_compound_assign.rb:11:1:12:3 | top_before | constant_compound_assign.rb:14:1:14:20 | Before ... = ... |  |
+| constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [false] | constant_compound_assign.rb:14:18:14:20 | 123 |  |
+| constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [true] | constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... |  |
+| constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [false] | false |
+| constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT | constant_compound_assign.rb:14:1:14:12 | After TOP_CONSTANT [true] | true |
+| constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT | constant_compound_assign.rb:14:14:14:16 | ... \|\| ... |  |
+| constant_compound_assign.rb:14:1:14:20 | ... = ... | constant_compound_assign.rb:14:1:14:20 | After ... = ... |  |
+| constant_compound_assign.rb:14:1:14:20 | After ... = ... | constant_compound_assign.rb:16:1:17:3 | top_after |  |
+| constant_compound_assign.rb:14:1:14:20 | Before ... = ... | constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT |  |
+| constant_compound_assign.rb:14:14:14:16 | ... \|\| ... | constant_compound_assign.rb:14:1:14:12 | TOP_CONSTANT |  |
+| constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... | constant_compound_assign.rb:14:1:14:20 | ... = ... |  |
+| constant_compound_assign.rb:14:18:14:20 | 123 | constant_compound_assign.rb:14:14:14:16 | After ... \|\| ... |  |
+| constant_compound_assign.rb:16:1:17:3 | top_after | constant_compound_assign.rb:19:1:19:23 | Before ... = ... |  |
+| constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [false] | constant_compound_assign.rb:19:21:19:23 | 123 |  |
+| constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [true] | constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... |  |
+| constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [false] | false |
+| constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 | constant_compound_assign.rb:19:1:19:15 | After TOP_CONSTANT2 [true] | true |
+| constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 | constant_compound_assign.rb:19:17:19:19 | ... \|\| ... |  |
+| constant_compound_assign.rb:19:1:19:23 | ... = ... | constant_compound_assign.rb:19:1:19:23 | After ... = ... |  |
+| constant_compound_assign.rb:19:1:19:23 | After ... = ... | constant_compound_assign.rb:21:1:22:3 | top_after2 |  |
+| constant_compound_assign.rb:19:1:19:23 | Before ... = ... | constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 |  |
+| constant_compound_assign.rb:19:17:19:19 | ... \|\| ... | constant_compound_assign.rb:19:1:19:15 | TOP_CONSTANT2 |  |
+| constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... | constant_compound_assign.rb:19:1:19:23 | ... = ... |  |
+| constant_compound_assign.rb:19:21:19:23 | 123 | constant_compound_assign.rb:19:17:19:19 | After ... \|\| ... |  |
+| constant_compound_assign.rb:21:1:22:3 | top_after2 | constant_compound_assign.rb:1:1:22:4 | Normal Exit |  |
+| desugar.rb:1:1:3:3 | Entry | desugar.rb:1:8:1:8 | x |  |
+| desugar.rb:1:1:3:3 | Normal Exit | desugar.rb:1:1:3:3 | Exit |  |
 | desugar.rb:1:1:3:3 | m1 | desugar.rb:5:1:7:3 | m2 |  |
-| desugar.rb:1:1:38:17 | enter desugar.rb | desugar.rb:1:1:3:3 | m1 |  |
-| desugar.rb:1:1:38:17 | exit desugar.rb (normal) | desugar.rb:1:1:38:17 | exit desugar.rb |  |
-| desugar.rb:1:8:1:8 | x | desugar.rb:2:3:2:3 | x |  |
-| desugar.rb:2:3:2:3 | x | desugar.rb:2:3:2:3 | x |  |
+| desugar.rb:1:1:38:17 | Entry | desugar.rb:1:1:3:3 | m1 |  |
+| desugar.rb:1:1:38:17 | Normal Exit | desugar.rb:1:1:38:17 | Exit |  |
+| desugar.rb:1:8:1:8 | x | desugar.rb:2:3:2:8 | ... |  |
+| desugar.rb:2:3:2:3 | x | desugar.rb:2:5:2:6 | Before ... + ... |  |
 | desugar.rb:2:3:2:3 | x | desugar.rb:2:8:2:8 | 1 |  |
-| desugar.rb:2:3:2:8 | ... = ... | desugar.rb:1:1:3:3 | exit m1 (normal) |  |
-| desugar.rb:2:5:2:6 | ... + ... | desugar.rb:2:3:2:8 | ... = ... |  |
+| desugar.rb:2:3:2:8 | ... | desugar.rb:2:3:2:8 | Before ... = ... |  |
+| desugar.rb:2:3:2:8 | ... = ... | desugar.rb:2:3:2:8 | After ... = ... |  |
+| desugar.rb:2:3:2:8 | After ... | desugar.rb:1:1:3:3 | Normal Exit |  |
+| desugar.rb:2:3:2:8 | After ... = ... | desugar.rb:2:3:2:8 | After ... |  |
+| desugar.rb:2:3:2:8 | Before ... = ... | desugar.rb:2:3:2:3 | x |  |
+| desugar.rb:2:5:2:6 | ... + ... | desugar.rb:2:5:2:6 | After ... + ... |  |
+| desugar.rb:2:5:2:6 | After ... + ... | desugar.rb:2:3:2:8 | ... = ... |  |
+| desugar.rb:2:5:2:6 | Before ... + ... | desugar.rb:2:3:2:3 | x |  |
 | desugar.rb:2:8:2:8 | 1 | desugar.rb:2:5:2:6 | ... + ... |  |
-| desugar.rb:5:1:7:3 | enter m2 | desugar.rb:5:8:5:8 | x |  |
-| desugar.rb:5:1:7:3 | exit m2 (normal) | desugar.rb:5:1:7:3 | exit m2 |  |
+| desugar.rb:5:1:7:3 | Entry | desugar.rb:5:8:5:8 | x |  |
+| desugar.rb:5:1:7:3 | Normal Exit | desugar.rb:5:1:7:3 | Exit |  |
 | desugar.rb:5:1:7:3 | m2 | desugar.rb:9:1:11:3 | m3 |  |
-| desugar.rb:5:8:5:8 | x | desugar.rb:6:3:6:3 | x |  |
+| desugar.rb:5:8:5:8 | x | desugar.rb:6:3:6:17 | ... |  |
 | desugar.rb:6:3:6:3 | x | desugar.rb:6:3:6:7 | call to foo |  |
-| desugar.rb:6:3:6:7 | call to foo | desugar.rb:6:17:6:17 | __synth__0 |  |
-| desugar.rb:6:3:6:13 | __synth__0 | desugar.rb:6:3:6:17 | ... |  |
-| desugar.rb:6:3:6:13 | call to count= | desugar.rb:6:3:6:13 | __synth__0 |  |
-| desugar.rb:6:3:6:17 | ... | desugar.rb:5:1:7:3 | exit m2 (normal) |  |
+| desugar.rb:6:3:6:7 | After call to foo | desugar.rb:6:17:6:17 | Before ... = ... |  |
+| desugar.rb:6:3:6:7 | Before call to foo | desugar.rb:6:3:6:3 | x |  |
+| desugar.rb:6:3:6:7 | call to foo | desugar.rb:6:3:6:7 | After call to foo |  |
+| desugar.rb:6:3:6:13 | After call to count= | desugar.rb:6:3:6:13 | __synth__0 |  |
+| desugar.rb:6:3:6:13 | Before call to count= | desugar.rb:6:3:6:7 | Before call to foo |  |
+| desugar.rb:6:3:6:13 | __synth__0 | desugar.rb:6:3:6:17 | After ... |  |
+| desugar.rb:6:3:6:13 | call to count= | desugar.rb:6:3:6:13 | After call to count= |  |
+| desugar.rb:6:3:6:17 | ... | desugar.rb:6:3:6:13 | Before call to count= |  |
+| desugar.rb:6:3:6:17 | ... | desugar.rb:6:3:6:17 | ... |  |
+| desugar.rb:6:3:6:17 | After ... | desugar.rb:5:1:7:3 | Normal Exit |  |
+| desugar.rb:6:3:6:17 | After ... | desugar.rb:6:3:6:17 | After ... |  |
 | desugar.rb:6:17:6:17 | 1 | desugar.rb:6:17:6:17 | ... = ... |  |
-| desugar.rb:6:17:6:17 | ... = ... | desugar.rb:6:3:6:13 | call to count= |  |
+| desugar.rb:6:17:6:17 | ... = ... | desugar.rb:6:17:6:17 | After ... = ... |  |
+| desugar.rb:6:17:6:17 | After ... = ... | desugar.rb:6:3:6:13 | call to count= |  |
+| desugar.rb:6:17:6:17 | Before ... = ... | desugar.rb:6:17:6:17 | __synth__0 |  |
 | desugar.rb:6:17:6:17 | __synth__0 | desugar.rb:6:17:6:17 | 1 |  |
-| desugar.rb:9:1:11:3 | enter m3 | desugar.rb:9:8:9:8 | x |  |
-| desugar.rb:9:1:11:3 | exit m3 (normal) | desugar.rb:9:1:11:3 | exit m3 |  |
+| desugar.rb:9:1:11:3 | Entry | desugar.rb:9:8:9:8 | x |  |
+| desugar.rb:9:1:11:3 | Normal Exit | desugar.rb:9:1:11:3 | Exit |  |
 | desugar.rb:9:1:11:3 | m3 | desugar.rb:13:1:15:3 | m4 |  |
-| desugar.rb:9:8:9:8 | x | desugar.rb:10:3:10:3 | x |  |
+| desugar.rb:9:8:9:8 | x | desugar.rb:10:3:10:14 | ... |  |
 | desugar.rb:10:3:10:3 | x | desugar.rb:10:3:10:7 | call to foo |  |
-| desugar.rb:10:3:10:7 | call to foo | desugar.rb:10:9:10:9 | 0 |  |
-| desugar.rb:10:3:10:10 | __synth__0 | desugar.rb:10:3:10:14 | ... |  |
-| desugar.rb:10:3:10:10 | call to []= | desugar.rb:10:3:10:10 | __synth__0 |  |
-| desugar.rb:10:3:10:14 | ... | desugar.rb:9:1:11:3 | exit m3 (normal) |  |
-| desugar.rb:10:9:10:9 | 0 | desugar.rb:10:14:10:14 | __synth__0 |  |
+| desugar.rb:10:3:10:7 | After call to foo | desugar.rb:10:9:10:9 | 0 |  |
+| desugar.rb:10:3:10:7 | Before call to foo | desugar.rb:10:3:10:3 | x |  |
+| desugar.rb:10:3:10:7 | call to foo | desugar.rb:10:3:10:7 | After call to foo |  |
+| desugar.rb:10:3:10:10 | After call to []= | desugar.rb:10:3:10:10 | __synth__0 |  |
+| desugar.rb:10:3:10:10 | Before call to []= | desugar.rb:10:3:10:7 | Before call to foo |  |
+| desugar.rb:10:3:10:10 | __synth__0 | desugar.rb:10:3:10:14 | After ... |  |
+| desugar.rb:10:3:10:10 | call to []= | desugar.rb:10:3:10:10 | After call to []= |  |
+| desugar.rb:10:3:10:14 | ... | desugar.rb:10:3:10:10 | Before call to []= |  |
+| desugar.rb:10:3:10:14 | ... | desugar.rb:10:3:10:14 | ... |  |
+| desugar.rb:10:3:10:14 | After ... | desugar.rb:9:1:11:3 | Normal Exit |  |
+| desugar.rb:10:3:10:14 | After ... | desugar.rb:10:3:10:14 | After ... |  |
+| desugar.rb:10:9:10:9 | 0 | desugar.rb:10:14:10:14 | Before ... = ... |  |
 | desugar.rb:10:14:10:14 | 1 | desugar.rb:10:14:10:14 | ... = ... |  |
-| desugar.rb:10:14:10:14 | ... = ... | desugar.rb:10:3:10:10 | call to []= |  |
+| desugar.rb:10:14:10:14 | ... = ... | desugar.rb:10:14:10:14 | After ... = ... |  |
+| desugar.rb:10:14:10:14 | After ... = ... | desugar.rb:10:3:10:10 | call to []= |  |
+| desugar.rb:10:14:10:14 | Before ... = ... | desugar.rb:10:14:10:14 | __synth__0 |  |
 | desugar.rb:10:14:10:14 | __synth__0 | desugar.rb:10:14:10:14 | 1 |  |
-| desugar.rb:13:1:15:3 | enter m4 | desugar.rb:13:8:13:8 | x |  |
-| desugar.rb:13:1:15:3 | exit m4 (normal) | desugar.rb:13:1:15:3 | exit m4 |  |
+| desugar.rb:13:1:15:3 | Entry | desugar.rb:13:8:13:8 | x |  |
+| desugar.rb:13:1:15:3 | Normal Exit | desugar.rb:13:1:15:3 | Exit |  |
 | desugar.rb:13:1:15:3 | m4 | desugar.rb:17:1:19:3 | m5 |  |
-| desugar.rb:13:8:13:8 | x | desugar.rb:14:3:14:7 | __synth__0 |  |
+| desugar.rb:13:8:13:8 | x | desugar.rb:14:3:14:18 | ... |  |
 | desugar.rb:14:3:14:3 | x | desugar.rb:14:3:14:7 | call to foo |  |
-| desugar.rb:14:3:14:7 | ... = ... | desugar.rb:14:15:14:16 | __synth__1 |  |
-| desugar.rb:14:3:14:7 | __synth__0 | desugar.rb:14:3:14:3 | x |  |
+| desugar.rb:14:3:14:7 | ... = ... | desugar.rb:14:3:14:7 | After ... = ... |  |
+| desugar.rb:14:3:14:7 | After ... = ... | desugar.rb:14:15:14:16 | Before ... = ... |  |
+| desugar.rb:14:3:14:7 | After call to foo | desugar.rb:14:3:14:7 | ... = ... |  |
+| desugar.rb:14:3:14:7 | Before ... = ... | desugar.rb:14:3:14:7 | __synth__0 |  |
+| desugar.rb:14:3:14:7 | Before call to foo | desugar.rb:14:3:14:3 | x |  |
+| desugar.rb:14:3:14:7 | __synth__0 | desugar.rb:14:3:14:7 | Before call to foo |  |
 | desugar.rb:14:3:14:7 | __synth__0 | desugar.rb:14:3:14:13 | __synth__1 |  |
 | desugar.rb:14:3:14:7 | __synth__0 | desugar.rb:14:3:14:13 | call to count |  |
-| desugar.rb:14:3:14:7 | call to foo | desugar.rb:14:3:14:7 | ... = ... |  |
+| desugar.rb:14:3:14:7 | call to foo | desugar.rb:14:3:14:7 | After call to foo |  |
+| desugar.rb:14:3:14:13 | After call to count | desugar.rb:14:18:14:18 | 1 |  |
+| desugar.rb:14:3:14:13 | After call to count= | desugar.rb:14:15:14:16 | __synth__1 |  |
+| desugar.rb:14:3:14:13 | Before call to count | desugar.rb:14:3:14:7 | __synth__0 |  |
+| desugar.rb:14:3:14:13 | Before call to count= | desugar.rb:14:3:14:7 | __synth__0 |  |
 | desugar.rb:14:3:14:13 | __synth__1 | desugar.rb:14:3:14:13 | call to count= |  |
-| desugar.rb:14:3:14:13 | call to count | desugar.rb:14:18:14:18 | 1 |  |
-| desugar.rb:14:3:14:13 | call to count= | desugar.rb:14:15:14:16 | __synth__1 |  |
-| desugar.rb:14:3:14:18 | ... | desugar.rb:13:1:15:3 | exit m4 (normal) |  |
-| desugar.rb:14:15:14:16 | ... + ... | desugar.rb:14:15:14:16 | ... = ... |  |
-| desugar.rb:14:15:14:16 | ... = ... | desugar.rb:14:3:14:7 | __synth__0 |  |
-| desugar.rb:14:15:14:16 | __synth__1 | desugar.rb:14:3:14:7 | __synth__0 |  |
-| desugar.rb:14:15:14:16 | __synth__1 | desugar.rb:14:3:14:18 | ... |  |
+| desugar.rb:14:3:14:13 | call to count | desugar.rb:14:3:14:13 | After call to count |  |
+| desugar.rb:14:3:14:13 | call to count= | desugar.rb:14:3:14:13 | After call to count= |  |
+| desugar.rb:14:3:14:18 | ... | desugar.rb:14:3:14:7 | Before ... = ... |  |
+| desugar.rb:14:3:14:18 | ... | desugar.rb:14:3:14:18 | ... |  |
+| desugar.rb:14:3:14:18 | After ... | desugar.rb:13:1:15:3 | Normal Exit |  |
+| desugar.rb:14:3:14:18 | After ... | desugar.rb:14:3:14:18 | After ... |  |
+| desugar.rb:14:15:14:16 | ... + ... | desugar.rb:14:15:14:16 | After ... + ... |  |
+| desugar.rb:14:15:14:16 | ... = ... | desugar.rb:14:15:14:16 | After ... = ... |  |
+| desugar.rb:14:15:14:16 | After ... + ... | desugar.rb:14:15:14:16 | ... = ... |  |
+| desugar.rb:14:15:14:16 | After ... = ... | desugar.rb:14:3:14:13 | Before call to count= |  |
+| desugar.rb:14:15:14:16 | Before ... + ... | desugar.rb:14:3:14:13 | Before call to count |  |
+| desugar.rb:14:15:14:16 | Before ... = ... | desugar.rb:14:15:14:16 | __synth__1 |  |
+| desugar.rb:14:15:14:16 | __synth__1 | desugar.rb:14:3:14:18 | After ... |  |
+| desugar.rb:14:15:14:16 | __synth__1 | desugar.rb:14:15:14:16 | Before ... + ... |  |
 | desugar.rb:14:18:14:18 | 1 | desugar.rb:14:15:14:16 | ... + ... |  |
-| desugar.rb:17:1:19:3 | enter m5 | desugar.rb:17:8:17:8 | x |  |
-| desugar.rb:17:1:19:3 | exit m5 (normal) | desugar.rb:17:1:19:3 | exit m5 |  |
+| desugar.rb:17:1:19:3 | Entry | desugar.rb:17:8:17:8 | x |  |
+| desugar.rb:17:1:19:3 | Normal Exit | desugar.rb:17:1:19:3 | Exit |  |
 | desugar.rb:17:1:19:3 | m5 | desugar.rb:21:1:23:3 | m6 |  |
 | desugar.rb:17:8:17:8 | x | desugar.rb:17:11:17:11 | y |  |
-| desugar.rb:17:11:17:11 | y | desugar.rb:18:3:18:7 | __synth__0 |  |
+| desugar.rb:17:11:17:11 | y | desugar.rb:18:3:18:33 | ... |  |
 | desugar.rb:18:3:18:3 | x | desugar.rb:18:3:18:7 | call to foo |  |
-| desugar.rb:18:3:18:7 | ... = ... | desugar.rb:18:9:18:9 | __synth__1 |  |
-| desugar.rb:18:3:18:7 | __synth__0 | desugar.rb:18:3:18:3 | x |  |
+| desugar.rb:18:3:18:7 | ... = ... | desugar.rb:18:3:18:7 | After ... = ... |  |
+| desugar.rb:18:3:18:7 | After ... = ... | desugar.rb:18:9:18:9 | Before ... = ... |  |
+| desugar.rb:18:3:18:7 | After call to foo | desugar.rb:18:3:18:7 | ... = ... |  |
+| desugar.rb:18:3:18:7 | Before ... = ... | desugar.rb:18:3:18:7 | __synth__0 |  |
+| desugar.rb:18:3:18:7 | Before call to foo | desugar.rb:18:3:18:3 | x |  |
+| desugar.rb:18:3:18:7 | __synth__0 | desugar.rb:18:3:18:7 | Before call to foo |  |
 | desugar.rb:18:3:18:7 | __synth__0 | desugar.rb:18:9:18:9 | __synth__1 |  |
 | desugar.rb:18:3:18:7 | __synth__0 | desugar.rb:18:9:18:9 | __synth__1 |  |
-| desugar.rb:18:3:18:7 | call to foo | desugar.rb:18:3:18:7 | ... = ... |  |
+| desugar.rb:18:3:18:7 | call to foo | desugar.rb:18:3:18:7 | After call to foo |  |
+| desugar.rb:18:3:18:28 | After call to [] | desugar.rb:18:33:18:33 | 1 |  |
+| desugar.rb:18:3:18:28 | After call to []= | desugar.rb:18:30:18:31 | __synth__4 |  |
+| desugar.rb:18:3:18:28 | Before call to [] | desugar.rb:18:3:18:7 | __synth__0 |  |
+| desugar.rb:18:3:18:28 | Before call to []= | desugar.rb:18:3:18:7 | __synth__0 |  |
 | desugar.rb:18:3:18:28 | __synth__4 | desugar.rb:18:3:18:28 | call to []= |  |
-| desugar.rb:18:3:18:28 | call to [] | desugar.rb:18:33:18:33 | 1 |  |
-| desugar.rb:18:3:18:28 | call to []= | desugar.rb:18:30:18:31 | __synth__4 |  |
-| desugar.rb:18:3:18:33 | ... | desugar.rb:17:1:19:3 | exit m5 (normal) |  |
+| desugar.rb:18:3:18:28 | call to [] | desugar.rb:18:3:18:28 | After call to [] |  |
+| desugar.rb:18:3:18:28 | call to []= | desugar.rb:18:3:18:28 | After call to []= |  |
+| desugar.rb:18:3:18:33 | ... | desugar.rb:18:3:18:7 | Before ... = ... |  |
+| desugar.rb:18:3:18:33 | ... | desugar.rb:18:3:18:33 | ... |  |
+| desugar.rb:18:3:18:33 | After ... | desugar.rb:17:1:19:3 | Normal Exit |  |
+| desugar.rb:18:3:18:33 | After ... | desugar.rb:18:3:18:33 | After ... |  |
 | desugar.rb:18:9:18:9 | 0 | desugar.rb:18:9:18:9 | ... = ... |  |
-| desugar.rb:18:9:18:9 | ... = ... | desugar.rb:18:12:18:16 | __synth__2 |  |
+| desugar.rb:18:9:18:9 | ... = ... | desugar.rb:18:9:18:9 | After ... = ... |  |
+| desugar.rb:18:9:18:9 | After ... = ... | desugar.rb:18:12:18:16 | Before ... = ... |  |
+| desugar.rb:18:9:18:9 | Before ... = ... | desugar.rb:18:9:18:9 | __synth__1 |  |
 | desugar.rb:18:9:18:9 | __synth__1 | desugar.rb:18:9:18:9 | 0 |  |
 | desugar.rb:18:9:18:9 | __synth__1 | desugar.rb:18:12:18:16 | __synth__2 |  |
 | desugar.rb:18:9:18:9 | __synth__1 | desugar.rb:18:12:18:16 | __synth__2 |  |
 | desugar.rb:18:12:18:12 | y | desugar.rb:18:12:18:16 | call to bar |  |
-| desugar.rb:18:12:18:16 | ... = ... | desugar.rb:18:19:18:27 | __synth__3 |  |
-| desugar.rb:18:12:18:16 | __synth__2 | desugar.rb:18:12:18:12 | y |  |
+| desugar.rb:18:12:18:16 | ... = ... | desugar.rb:18:12:18:16 | After ... = ... |  |
+| desugar.rb:18:12:18:16 | After ... = ... | desugar.rb:18:19:18:27 | Before ... = ... |  |
+| desugar.rb:18:12:18:16 | After call to bar | desugar.rb:18:12:18:16 | ... = ... |  |
+| desugar.rb:18:12:18:16 | Before ... = ... | desugar.rb:18:12:18:16 | __synth__2 |  |
+| desugar.rb:18:12:18:16 | Before call to bar | desugar.rb:18:12:18:12 | y |  |
+| desugar.rb:18:12:18:16 | __synth__2 | desugar.rb:18:12:18:16 | Before call to bar |  |
 | desugar.rb:18:12:18:16 | __synth__2 | desugar.rb:18:19:18:27 | __synth__3 |  |
 | desugar.rb:18:12:18:16 | __synth__2 | desugar.rb:18:19:18:27 | __synth__3 |  |
-| desugar.rb:18:12:18:16 | call to bar | desugar.rb:18:12:18:16 | ... = ... |  |
+| desugar.rb:18:12:18:16 | call to bar | desugar.rb:18:12:18:16 | After call to bar |  |
 | desugar.rb:18:19:18:19 | x | desugar.rb:18:19:18:23 | call to baz |  |
-| desugar.rb:18:19:18:23 | call to baz | desugar.rb:18:27:18:27 | 3 |  |
-| desugar.rb:18:19:18:27 | ... + ... | desugar.rb:18:19:18:27 | ... = ... |  |
-| desugar.rb:18:19:18:27 | ... = ... | desugar.rb:18:30:18:31 | __synth__4 |  |
+| desugar.rb:18:19:18:23 | After call to baz | desugar.rb:18:27:18:27 | 3 |  |
+| desugar.rb:18:19:18:23 | Before call to baz | desugar.rb:18:19:18:19 | x |  |
+| desugar.rb:18:19:18:23 | call to baz | desugar.rb:18:19:18:23 | After call to baz |  |
+| desugar.rb:18:19:18:27 | ... + ... | desugar.rb:18:19:18:27 | After ... + ... |  |
+| desugar.rb:18:19:18:27 | ... = ... | desugar.rb:18:19:18:27 | After ... = ... |  |
+| desugar.rb:18:19:18:27 | After ... + ... | desugar.rb:18:19:18:27 | ... = ... |  |
+| desugar.rb:18:19:18:27 | After ... = ... | desugar.rb:18:30:18:31 | Before ... = ... |  |
+| desugar.rb:18:19:18:27 | Before ... + ... | desugar.rb:18:19:18:23 | Before call to baz |  |
+| desugar.rb:18:19:18:27 | Before ... = ... | desugar.rb:18:19:18:27 | __synth__3 |  |
 | desugar.rb:18:19:18:27 | __synth__3 | desugar.rb:18:3:18:28 | __synth__4 |  |
 | desugar.rb:18:19:18:27 | __synth__3 | desugar.rb:18:3:18:28 | call to [] |  |
-| desugar.rb:18:19:18:27 | __synth__3 | desugar.rb:18:19:18:19 | x |  |
+| desugar.rb:18:19:18:27 | __synth__3 | desugar.rb:18:19:18:27 | Before ... + ... |  |
 | desugar.rb:18:27:18:27 | 3 | desugar.rb:18:19:18:27 | ... + ... |  |
-| desugar.rb:18:30:18:31 | ... + ... | desugar.rb:18:30:18:31 | ... = ... |  |
-| desugar.rb:18:30:18:31 | ... = ... | desugar.rb:18:3:18:7 | __synth__0 |  |
-| desugar.rb:18:30:18:31 | __synth__4 | desugar.rb:18:3:18:7 | __synth__0 |  |
-| desugar.rb:18:30:18:31 | __synth__4 | desugar.rb:18:3:18:33 | ... |  |
+| desugar.rb:18:30:18:31 | ... + ... | desugar.rb:18:30:18:31 | After ... + ... |  |
+| desugar.rb:18:30:18:31 | ... = ... | desugar.rb:18:30:18:31 | After ... = ... |  |
+| desugar.rb:18:30:18:31 | After ... + ... | desugar.rb:18:30:18:31 | ... = ... |  |
+| desugar.rb:18:30:18:31 | After ... = ... | desugar.rb:18:3:18:28 | Before call to []= |  |
+| desugar.rb:18:30:18:31 | Before ... + ... | desugar.rb:18:3:18:28 | Before call to [] |  |
+| desugar.rb:18:30:18:31 | Before ... = ... | desugar.rb:18:30:18:31 | __synth__4 |  |
+| desugar.rb:18:30:18:31 | __synth__4 | desugar.rb:18:3:18:33 | After ... |  |
+| desugar.rb:18:30:18:31 | __synth__4 | desugar.rb:18:30:18:31 | Before ... + ... |  |
 | desugar.rb:18:33:18:33 | 1 | desugar.rb:18:30:18:31 | ... + ... |  |
-| desugar.rb:21:1:23:3 | enter m6 | desugar.rb:22:10:22:10 | __synth__2 |  |
-| desugar.rb:21:1:23:3 | exit m6 (normal) | desugar.rb:21:1:23:3 | exit m6 |  |
+| desugar.rb:21:1:23:3 | Entry | desugar.rb:22:3:22:29 | ... |  |
+| desugar.rb:21:1:23:3 | Normal Exit | desugar.rb:21:1:23:3 | Exit |  |
 | desugar.rb:21:1:23:3 | m6 | desugar.rb:25:1:27:3 | m7 |  |
 | desugar.rb:22:3:22:3 | 0 | desugar.rb:22:3:22:3 | call to [] |  |
-| desugar.rb:22:3:22:3 | ... = ... | desugar.rb:22:7:22:7 | y |  |
+| desugar.rb:22:3:22:3 | ... = ... | desugar.rb:22:3:22:3 | After ... = ... |  |
+| desugar.rb:22:3:22:3 | After ... = ... | desugar.rb:22:7:22:7 | Before ... = ... |  |
+| desugar.rb:22:3:22:3 | After call to [] | desugar.rb:22:3:22:3 | ... = ... |  |
+| desugar.rb:22:3:22:3 | Before ... = ... | desugar.rb:22:3:22:3 | x |  |
+| desugar.rb:22:3:22:3 | Before call to [] | desugar.rb:22:3:22:3 | __synth__3 |  |
 | desugar.rb:22:3:22:3 | __synth__3 | desugar.rb:22:3:22:3 | 0 |  |
-| desugar.rb:22:3:22:3 | call to [] | desugar.rb:22:3:22:3 | ... = ... |  |
-| desugar.rb:22:3:22:3 | x | desugar.rb:22:3:22:3 | __synth__3 |  |
-| desugar.rb:22:3:22:29 | ... | desugar.rb:21:1:23:3 | exit m6 (normal) |  |
+| desugar.rb:22:3:22:3 | call to [] | desugar.rb:22:3:22:3 | After call to [] |  |
+| desugar.rb:22:3:22:3 | x | desugar.rb:22:3:22:3 | Before call to [] |  |
+| desugar.rb:22:3:22:29 | ... | desugar.rb:22:3:22:29 | ... |  |
+| desugar.rb:22:3:22:29 | ... | desugar.rb:22:10:22:10 | Before ... = ... |  |
+| desugar.rb:22:3:22:29 | After ... | desugar.rb:21:1:23:3 | Normal Exit |  |
+| desugar.rb:22:3:22:29 | After ... | desugar.rb:22:3:22:29 | After ... |  |
 | desugar.rb:22:7:22:7 | 1 | desugar.rb:22:7:22:7 | -2 |  |
 | desugar.rb:22:7:22:7 | -2 | desugar.rb:22:7:22:7 | _ .. _ |  |
-| desugar.rb:22:7:22:7 | ... = ... | desugar.rb:22:10:22:14 | __synth__2 |  |
-| desugar.rb:22:7:22:7 | _ .. _ | desugar.rb:22:7:22:7 | call to [] |  |
-| desugar.rb:22:7:22:7 | __synth__3 | desugar.rb:22:7:22:7 | 1 |  |
-| desugar.rb:22:7:22:7 | call to [] | desugar.rb:22:7:22:7 | ... = ... |  |
-| desugar.rb:22:7:22:7 | y | desugar.rb:22:7:22:7 | __synth__3 |  |
-| desugar.rb:22:10:22:10 | ... = ... | desugar.rb:22:18:22:29 | __synth__3 |  |
-| desugar.rb:22:10:22:10 | __synth__2 | desugar.rb:22:10:22:10 | self |  |
-| desugar.rb:22:10:22:10 | call to z | desugar.rb:22:10:22:10 | ... = ... |  |
+| desugar.rb:22:7:22:7 | ... = ... | desugar.rb:22:7:22:7 | After ... = ... |  |
+| desugar.rb:22:7:22:7 | After ... = ... | desugar.rb:22:10:22:14 | ... |  |
+| desugar.rb:22:7:22:7 | After _ .. _ | desugar.rb:22:7:22:7 | call to [] |  |
+| desugar.rb:22:7:22:7 | After call to [] | desugar.rb:22:7:22:7 | ... = ... |  |
+| desugar.rb:22:7:22:7 | Before ... = ... | desugar.rb:22:7:22:7 | y |  |
+| desugar.rb:22:7:22:7 | Before _ .. _ | desugar.rb:22:7:22:7 | 1 |  |
+| desugar.rb:22:7:22:7 | Before call to [] | desugar.rb:22:7:22:7 | __synth__3 |  |
+| desugar.rb:22:7:22:7 | _ .. _ | desugar.rb:22:7:22:7 | After _ .. _ |  |
+| desugar.rb:22:7:22:7 | __synth__3 | desugar.rb:22:7:22:7 | Before _ .. _ |  |
+| desugar.rb:22:7:22:7 | call to [] | desugar.rb:22:7:22:7 | After call to [] |  |
+| desugar.rb:22:7:22:7 | y | desugar.rb:22:7:22:7 | Before call to [] |  |
+| desugar.rb:22:10:22:10 | ... = ... | desugar.rb:22:10:22:10 | After ... = ... |  |
+| desugar.rb:22:10:22:10 | After ... = ... | desugar.rb:22:18:22:29 | Before ... = ... |  |
+| desugar.rb:22:10:22:10 | After call to z | desugar.rb:22:10:22:10 | ... = ... |  |
+| desugar.rb:22:10:22:10 | Before ... = ... | desugar.rb:22:10:22:10 | __synth__2 |  |
+| desugar.rb:22:10:22:10 | Before call to z | desugar.rb:22:10:22:10 | self |  |
+| desugar.rb:22:10:22:10 | __synth__2 | desugar.rb:22:10:22:10 | Before call to z |  |
+| desugar.rb:22:10:22:10 | call to z | desugar.rb:22:10:22:10 | After call to z |  |
 | desugar.rb:22:10:22:10 | self | desugar.rb:22:10:22:10 | call to z |  |
 | desugar.rb:22:10:22:14 | -1 | desugar.rb:22:10:22:14 | call to [] |  |
-| desugar.rb:22:10:22:14 | ... | desugar.rb:22:3:22:29 | ... |  |
-| desugar.rb:22:10:22:14 | ... = ... | desugar.rb:22:10:22:14 | call to bar= |  |
-| desugar.rb:22:10:22:14 | __synth__0__1 | desugar.rb:22:10:22:14 | ... |  |
-| desugar.rb:22:10:22:14 | __synth__0__1 | desugar.rb:22:10:22:14 | __synth__3 |  |
-| desugar.rb:22:10:22:14 | __synth__2 | desugar.rb:22:10:22:14 | __synth__0__1 |  |
+| desugar.rb:22:10:22:14 | ... | desugar.rb:22:10:22:14 | Before call to bar= |  |
+| desugar.rb:22:10:22:14 | ... = ... | desugar.rb:22:10:22:14 | After ... = ... |  |
+| desugar.rb:22:10:22:14 | After ... | desugar.rb:22:3:22:29 | After ... |  |
+| desugar.rb:22:10:22:14 | After ... = ... | desugar.rb:22:10:22:14 | call to bar= |  |
+| desugar.rb:22:10:22:14 | After call to [] | desugar.rb:22:10:22:14 | ... = ... |  |
+| desugar.rb:22:10:22:14 | After call to bar= | desugar.rb:22:10:22:14 | __synth__0__1 |  |
+| desugar.rb:22:10:22:14 | Before ... = ... | desugar.rb:22:10:22:14 | __synth__0__1 |  |
+| desugar.rb:22:10:22:14 | Before call to [] | desugar.rb:22:10:22:14 | __synth__3 |  |
+| desugar.rb:22:10:22:14 | Before call to bar= | desugar.rb:22:10:22:14 | __synth__2 |  |
+| desugar.rb:22:10:22:14 | __synth__0__1 | desugar.rb:22:10:22:14 | After ... |  |
+| desugar.rb:22:10:22:14 | __synth__0__1 | desugar.rb:22:10:22:14 | Before call to [] |  |
+| desugar.rb:22:10:22:14 | __synth__2 | desugar.rb:22:10:22:14 | Before ... = ... |  |
 | desugar.rb:22:10:22:14 | __synth__3 | desugar.rb:22:10:22:14 | -1 |  |
-| desugar.rb:22:10:22:14 | call to [] | desugar.rb:22:10:22:14 | ... = ... |  |
-| desugar.rb:22:10:22:14 | call to bar= | desugar.rb:22:10:22:14 | __synth__0__1 |  |
-| desugar.rb:22:18:22:29 | * ... | desugar.rb:22:18:22:29 | ... = ... |  |
-| desugar.rb:22:18:22:29 | ... = ... | desugar.rb:22:3:22:3 | x |  |
+| desugar.rb:22:10:22:14 | call to [] | desugar.rb:22:10:22:14 | After call to [] |  |
+| desugar.rb:22:10:22:14 | call to bar= | desugar.rb:22:10:22:14 | After call to bar= |  |
+| desugar.rb:22:18:22:29 | * ... | desugar.rb:22:18:22:29 | After * ... |  |
+| desugar.rb:22:18:22:29 | ... = ... | desugar.rb:22:18:22:29 | After ... = ... |  |
+| desugar.rb:22:18:22:29 | After * ... | desugar.rb:22:18:22:29 | ... = ... |  |
+| desugar.rb:22:18:22:29 | After ... = ... | desugar.rb:22:3:22:3 | Before ... = ... |  |
+| desugar.rb:22:18:22:29 | After call to [] | desugar.rb:22:18:22:29 | * ... |  |
 | desugar.rb:22:18:22:29 | Array | desugar.rb:22:19:22:19 | 1 |  |
-| desugar.rb:22:18:22:29 | __synth__3 | desugar.rb:22:18:22:29 | Array |  |
-| desugar.rb:22:18:22:29 | call to [] | desugar.rb:22:18:22:29 | * ... |  |
+| desugar.rb:22:18:22:29 | Before * ... | desugar.rb:22:18:22:29 | Before call to [] |  |
+| desugar.rb:22:18:22:29 | Before ... = ... | desugar.rb:22:18:22:29 | __synth__3 |  |
+| desugar.rb:22:18:22:29 | Before call to [] | desugar.rb:22:18:22:29 | Array |  |
+| desugar.rb:22:18:22:29 | __synth__3 | desugar.rb:22:18:22:29 | Before * ... |  |
+| desugar.rb:22:18:22:29 | call to [] | desugar.rb:22:18:22:29 | After call to [] |  |
 | desugar.rb:22:19:22:19 | 1 | desugar.rb:22:22:22:22 | 2 |  |
 | desugar.rb:22:22:22:22 | 2 | desugar.rb:22:25:22:25 | 3 |  |
 | desugar.rb:22:25:22:25 | 3 | desugar.rb:22:28:22:28 | 4 |  |
 | desugar.rb:22:28:22:28 | 4 | desugar.rb:22:18:22:29 | call to [] |  |
-| desugar.rb:25:1:27:3 | enter m7 | desugar.rb:26:15:26:25 | __synth__2 |  |
-| desugar.rb:25:1:27:3 | exit m7 (normal) | desugar.rb:25:1:27:3 | exit m7 |  |
+| desugar.rb:25:1:27:3 | Entry | desugar.rb:26:3:26:25 | ... |  |
+| desugar.rb:25:1:27:3 | Normal Exit | desugar.rb:25:1:27:3 | Exit |  |
 | desugar.rb:25:1:27:3 | m7 | desugar.rb:29:1:35:3 | X |  |
 | desugar.rb:26:3:26:3 | 0 | desugar.rb:26:3:26:3 | call to [] |  |
-| desugar.rb:26:3:26:3 | ... = ... | desugar.rb:26:6:26:11 | __synth__2__1 |  |
+| desugar.rb:26:3:26:3 | ... = ... | desugar.rb:26:3:26:3 | After ... = ... |  |
+| desugar.rb:26:3:26:3 | After ... = ... | desugar.rb:26:6:26:11 | ... |  |
+| desugar.rb:26:3:26:3 | After call to [] | desugar.rb:26:3:26:3 | ... = ... |  |
+| desugar.rb:26:3:26:3 | Before ... = ... | desugar.rb:26:3:26:3 | x |  |
+| desugar.rb:26:3:26:3 | Before call to [] | desugar.rb:26:3:26:3 | __synth__2 |  |
 | desugar.rb:26:3:26:3 | __synth__2 | desugar.rb:26:3:26:3 | 0 |  |
-| desugar.rb:26:3:26:3 | call to [] | desugar.rb:26:3:26:3 | ... = ... |  |
-| desugar.rb:26:3:26:3 | x | desugar.rb:26:3:26:3 | __synth__2 |  |
-| desugar.rb:26:3:26:25 | ... | desugar.rb:25:1:27:3 | exit m7 (normal) |  |
+| desugar.rb:26:3:26:3 | call to [] | desugar.rb:26:3:26:3 | After call to [] |  |
+| desugar.rb:26:3:26:3 | x | desugar.rb:26:3:26:3 | Before call to [] |  |
+| desugar.rb:26:3:26:25 | ... | desugar.rb:26:3:26:25 | ... |  |
+| desugar.rb:26:3:26:25 | ... | desugar.rb:26:15:26:25 | Before ... = ... |  |
+| desugar.rb:26:3:26:25 | After ... | desugar.rb:25:1:27:3 | Normal Exit |  |
+| desugar.rb:26:3:26:25 | After ... | desugar.rb:26:3:26:25 | After ... |  |
 | desugar.rb:26:6:26:11 | 1 | desugar.rb:26:6:26:11 | call to [] |  |
-| desugar.rb:26:6:26:11 | * ... | desugar.rb:26:6:26:11 | ... = ... |  |
-| desugar.rb:26:6:26:11 | ... | desugar.rb:26:3:26:25 | ... |  |
-| desugar.rb:26:6:26:11 | ... = ... | desugar.rb:26:7:26:7 | y |  |
+| desugar.rb:26:6:26:11 | * ... | desugar.rb:26:6:26:11 | After * ... |  |
+| desugar.rb:26:6:26:11 | ... | desugar.rb:26:6:26:11 | Before ... = ... |  |
+| desugar.rb:26:6:26:11 | ... = ... | desugar.rb:26:6:26:11 | After ... = ... |  |
+| desugar.rb:26:6:26:11 | After * ... | desugar.rb:26:6:26:11 | ... = ... |  |
+| desugar.rb:26:6:26:11 | After ... | desugar.rb:26:3:26:25 | After ... |  |
+| desugar.rb:26:6:26:11 | After ... = ... | desugar.rb:26:7:26:7 | Before ... = ... |  |
+| desugar.rb:26:6:26:11 | After call to [] | desugar.rb:26:6:26:11 | * ... |  |
+| desugar.rb:26:6:26:11 | Before * ... | desugar.rb:26:6:26:11 | Before call to [] |  |
+| desugar.rb:26:6:26:11 | Before ... = ... | desugar.rb:26:6:26:11 | __synth__2__1 |  |
+| desugar.rb:26:6:26:11 | Before call to [] | desugar.rb:26:6:26:11 | __synth__2 |  |
 | desugar.rb:26:6:26:11 | __synth__2 | desugar.rb:26:6:26:11 | 1 |  |
-| desugar.rb:26:6:26:11 | __synth__2__1 | desugar.rb:26:6:26:11 | __synth__2 |  |
-| desugar.rb:26:6:26:11 | call to [] | desugar.rb:26:6:26:11 | * ... |  |
+| desugar.rb:26:6:26:11 | __synth__2__1 | desugar.rb:26:6:26:11 | Before * ... |  |
+| desugar.rb:26:6:26:11 | call to [] | desugar.rb:26:6:26:11 | After call to [] |  |
 | desugar.rb:26:7:26:7 | 0 | desugar.rb:26:7:26:7 | call to [] |  |
-| desugar.rb:26:7:26:7 | ... = ... | desugar.rb:26:10:26:10 | z |  |
+| desugar.rb:26:7:26:7 | ... = ... | desugar.rb:26:7:26:7 | After ... = ... |  |
+| desugar.rb:26:7:26:7 | After ... = ... | desugar.rb:26:10:26:10 | Before ... = ... |  |
+| desugar.rb:26:7:26:7 | After call to [] | desugar.rb:26:7:26:7 | ... = ... |  |
+| desugar.rb:26:7:26:7 | Before ... = ... | desugar.rb:26:7:26:7 | y |  |
+| desugar.rb:26:7:26:7 | Before call to [] | desugar.rb:26:7:26:7 | __synth__2__1 |  |
 | desugar.rb:26:7:26:7 | __synth__2__1 | desugar.rb:26:7:26:7 | 0 |  |
-| desugar.rb:26:7:26:7 | call to [] | desugar.rb:26:7:26:7 | ... = ... |  |
-| desugar.rb:26:7:26:7 | y | desugar.rb:26:7:26:7 | __synth__2__1 |  |
+| desugar.rb:26:7:26:7 | call to [] | desugar.rb:26:7:26:7 | After call to [] |  |
+| desugar.rb:26:7:26:7 | y | desugar.rb:26:7:26:7 | Before call to [] |  |
 | desugar.rb:26:10:26:10 | 1 | desugar.rb:26:10:26:10 | call to [] |  |
-| desugar.rb:26:10:26:10 | ... = ... | desugar.rb:26:6:26:11 | ... |  |
+| desugar.rb:26:10:26:10 | ... = ... | desugar.rb:26:10:26:10 | After ... = ... |  |
+| desugar.rb:26:10:26:10 | After ... = ... | desugar.rb:26:6:26:11 | After ... |  |
+| desugar.rb:26:10:26:10 | After call to [] | desugar.rb:26:10:26:10 | ... = ... |  |
+| desugar.rb:26:10:26:10 | Before ... = ... | desugar.rb:26:10:26:10 | z |  |
+| desugar.rb:26:10:26:10 | Before call to [] | desugar.rb:26:10:26:10 | __synth__2__1 |  |
 | desugar.rb:26:10:26:10 | __synth__2__1 | desugar.rb:26:10:26:10 | 1 |  |
-| desugar.rb:26:10:26:10 | call to [] | desugar.rb:26:10:26:10 | ... = ... |  |
-| desugar.rb:26:10:26:10 | z | desugar.rb:26:10:26:10 | __synth__2__1 |  |
-| desugar.rb:26:15:26:25 | * ... | desugar.rb:26:15:26:25 | ... = ... |  |
-| desugar.rb:26:15:26:25 | ... = ... | desugar.rb:26:3:26:3 | x |  |
+| desugar.rb:26:10:26:10 | call to [] | desugar.rb:26:10:26:10 | After call to [] |  |
+| desugar.rb:26:10:26:10 | z | desugar.rb:26:10:26:10 | Before call to [] |  |
+| desugar.rb:26:15:26:25 | * ... | desugar.rb:26:15:26:25 | After * ... |  |
+| desugar.rb:26:15:26:25 | ... = ... | desugar.rb:26:15:26:25 | After ... = ... |  |
+| desugar.rb:26:15:26:25 | After * ... | desugar.rb:26:15:26:25 | ... = ... |  |
+| desugar.rb:26:15:26:25 | After ... = ... | desugar.rb:26:3:26:3 | Before ... = ... |  |
+| desugar.rb:26:15:26:25 | After call to [] | desugar.rb:26:15:26:25 | * ... |  |
 | desugar.rb:26:15:26:25 | Array | desugar.rb:26:16:26:16 | 1 |  |
-| desugar.rb:26:15:26:25 | __synth__2 | desugar.rb:26:15:26:25 | Array |  |
-| desugar.rb:26:15:26:25 | call to [] | desugar.rb:26:15:26:25 | * ... |  |
-| desugar.rb:26:16:26:16 | 1 | desugar.rb:26:19:26:24 | Array |  |
+| desugar.rb:26:15:26:25 | Before * ... | desugar.rb:26:15:26:25 | Before call to [] |  |
+| desugar.rb:26:15:26:25 | Before ... = ... | desugar.rb:26:15:26:25 | __synth__2 |  |
+| desugar.rb:26:15:26:25 | Before call to [] | desugar.rb:26:15:26:25 | Array |  |
+| desugar.rb:26:15:26:25 | __synth__2 | desugar.rb:26:15:26:25 | Before * ... |  |
+| desugar.rb:26:15:26:25 | call to [] | desugar.rb:26:15:26:25 | After call to [] |  |
+| desugar.rb:26:16:26:16 | 1 | desugar.rb:26:19:26:24 | Before call to [] |  |
+| desugar.rb:26:19:26:24 | After call to [] | desugar.rb:26:15:26:25 | call to [] |  |
 | desugar.rb:26:19:26:24 | Array | desugar.rb:26:20:26:20 | 2 |  |
-| desugar.rb:26:19:26:24 | call to [] | desugar.rb:26:15:26:25 | call to [] |  |
+| desugar.rb:26:19:26:24 | Before call to [] | desugar.rb:26:19:26:24 | Array |  |
+| desugar.rb:26:19:26:24 | call to [] | desugar.rb:26:19:26:24 | After call to [] |  |
 | desugar.rb:26:20:26:20 | 2 | desugar.rb:26:23:26:23 | 3 |  |
 | desugar.rb:26:23:26:23 | 3 | desugar.rb:26:19:26:24 | call to [] |  |
-| desugar.rb:29:1:35:3 | X | desugar.rb:30:3:30:4 | self |  |
-| desugar.rb:30:3:30:4 | @x | desugar.rb:30:8:30:8 | 1 |  |
+| desugar.rb:29:1:35:3 | After X | desugar.rb:37:1:37:15 | Before ... = ... |  |
+| desugar.rb:29:1:35:3 | X | desugar.rb:30:3:30:8 | Before ... = ... |  |
+| desugar.rb:30:3:30:4 | @x | desugar.rb:30:3:30:4 | After @x |  |
+| desugar.rb:30:3:30:4 | After @x | desugar.rb:30:8:30:8 | 1 |  |
+| desugar.rb:30:3:30:4 | Before @x | desugar.rb:30:3:30:4 | self |  |
 | desugar.rb:30:3:30:4 | self | desugar.rb:30:3:30:4 | @x |  |
-| desugar.rb:30:3:30:8 | ... = ... | desugar.rb:31:3:31:4 | self |  |
+| desugar.rb:30:3:30:8 | ... = ... | desugar.rb:30:3:30:8 | After ... = ... |  |
+| desugar.rb:30:3:30:8 | After ... = ... | desugar.rb:31:3:31:9 | Before ... = ... |  |
+| desugar.rb:30:3:30:8 | Before ... = ... | desugar.rb:30:3:30:4 | Before @x |  |
 | desugar.rb:30:8:30:8 | 1 | desugar.rb:30:3:30:8 | ... = ... |  |
-| desugar.rb:31:3:31:4 | @x | desugar.rb:31:3:31:4 | self |  |
-| desugar.rb:31:3:31:4 | @x | desugar.rb:31:9:31:9 | 2 |  |
+| desugar.rb:31:3:31:4 | @x | desugar.rb:31:3:31:4 | After @x |  |
+| desugar.rb:31:3:31:4 | @x | desugar.rb:31:3:31:4 | After @x |  |
+| desugar.rb:31:3:31:4 | After @x | desugar.rb:31:6:31:7 | Before ... + ... |  |
+| desugar.rb:31:3:31:4 | After @x | desugar.rb:31:9:31:9 | 2 |  |
+| desugar.rb:31:3:31:4 | Before @x | desugar.rb:31:3:31:4 | self |  |
+| desugar.rb:31:3:31:4 | Before @x | desugar.rb:31:3:31:4 | self |  |
 | desugar.rb:31:3:31:4 | self | desugar.rb:31:3:31:4 | @x |  |
 | desugar.rb:31:3:31:4 | self | desugar.rb:31:3:31:4 | @x |  |
-| desugar.rb:31:3:31:9 | ... = ... | desugar.rb:33:3:33:5 | @@y |  |
-| desugar.rb:31:6:31:7 | ... + ... | desugar.rb:31:3:31:9 | ... = ... |  |
+| desugar.rb:31:3:31:9 | ... = ... | desugar.rb:31:3:31:9 | After ... = ... |  |
+| desugar.rb:31:3:31:9 | After ... = ... | desugar.rb:33:3:33:9 | Before ... = ... |  |
+| desugar.rb:31:3:31:9 | Before ... = ... | desugar.rb:31:3:31:4 | Before @x |  |
+| desugar.rb:31:6:31:7 | ... + ... | desugar.rb:31:6:31:7 | After ... + ... |  |
+| desugar.rb:31:6:31:7 | After ... + ... | desugar.rb:31:3:31:9 | ... = ... |  |
+| desugar.rb:31:6:31:7 | Before ... + ... | desugar.rb:31:3:31:4 | Before @x |  |
 | desugar.rb:31:9:31:9 | 2 | desugar.rb:31:6:31:7 | ... + ... |  |
 | desugar.rb:33:3:33:5 | @@y | desugar.rb:33:9:33:9 | 3 |  |
-| desugar.rb:33:3:33:9 | ... = ... | desugar.rb:34:3:34:5 | @@y |  |
+| desugar.rb:33:3:33:9 | ... = ... | desugar.rb:33:3:33:9 | After ... = ... |  |
+| desugar.rb:33:3:33:9 | After ... = ... | desugar.rb:34:3:34:10 | Before ... = ... |  |
+| desugar.rb:33:3:33:9 | Before ... = ... | desugar.rb:33:3:33:5 | @@y |  |
 | desugar.rb:33:9:33:9 | 3 | desugar.rb:33:3:33:9 | ... = ... |  |
-| desugar.rb:34:3:34:5 | @@y | desugar.rb:34:3:34:5 | @@y |  |
+| desugar.rb:34:3:34:5 | @@y | desugar.rb:34:7:34:8 | Before ... / ... |  |
 | desugar.rb:34:3:34:5 | @@y | desugar.rb:34:10:34:10 | 4 |  |
-| desugar.rb:34:3:34:10 | ... = ... | desugar.rb:37:1:37:11 | $global_var |  |
-| desugar.rb:34:7:34:8 | ... / ... | desugar.rb:34:3:34:10 | ... = ... |  |
+| desugar.rb:34:3:34:10 | ... = ... | desugar.rb:34:3:34:10 | After ... = ... |  |
+| desugar.rb:34:3:34:10 | After ... = ... | desugar.rb:29:1:35:3 | After X |  |
+| desugar.rb:34:3:34:10 | Before ... = ... | desugar.rb:34:3:34:5 | @@y |  |
+| desugar.rb:34:7:34:8 | ... / ... | desugar.rb:34:7:34:8 | After ... / ... |  |
+| desugar.rb:34:7:34:8 | After ... / ... | desugar.rb:34:3:34:10 | ... = ... |  |
+| desugar.rb:34:7:34:8 | Before ... / ... | desugar.rb:34:3:34:5 | @@y |  |
 | desugar.rb:34:10:34:10 | 4 | desugar.rb:34:7:34:8 | ... / ... |  |
 | desugar.rb:37:1:37:11 | $global_var | desugar.rb:37:15:37:15 | 5 |  |
-| desugar.rb:37:1:37:15 | ... = ... | desugar.rb:38:1:38:11 | $global_var |  |
+| desugar.rb:37:1:37:15 | ... = ... | desugar.rb:37:1:37:15 | After ... = ... |  |
+| desugar.rb:37:1:37:15 | After ... = ... | desugar.rb:38:1:38:16 | Before ... = ... |  |
+| desugar.rb:37:1:37:15 | Before ... = ... | desugar.rb:37:1:37:11 | $global_var |  |
 | desugar.rb:37:15:37:15 | 5 | desugar.rb:37:1:37:15 | ... = ... |  |
-| desugar.rb:38:1:38:11 | $global_var | desugar.rb:38:1:38:11 | $global_var |  |
+| desugar.rb:38:1:38:11 | $global_var | desugar.rb:38:13:38:14 | Before ... * ... |  |
 | desugar.rb:38:1:38:11 | $global_var | desugar.rb:38:16:38:16 | 6 |  |
-| desugar.rb:38:1:38:16 | ... = ... | desugar.rb:1:1:38:17 | exit desugar.rb (normal) |  |
-| desugar.rb:38:13:38:14 | ... * ... | desugar.rb:38:1:38:16 | ... = ... |  |
+| desugar.rb:38:1:38:16 | ... = ... | desugar.rb:38:1:38:16 | After ... = ... |  |
+| desugar.rb:38:1:38:16 | After ... = ... | desugar.rb:1:1:38:17 | Normal Exit |  |
+| desugar.rb:38:1:38:16 | Before ... = ... | desugar.rb:38:1:38:11 | $global_var |  |
+| desugar.rb:38:13:38:14 | ... * ... | desugar.rb:38:13:38:14 | After ... * ... |  |
+| desugar.rb:38:13:38:14 | After ... * ... | desugar.rb:38:1:38:16 | ... = ... |  |
+| desugar.rb:38:13:38:14 | Before ... * ... | desugar.rb:38:1:38:11 | $global_var |  |
 | desugar.rb:38:16:38:16 | 6 | desugar.rb:38:13:38:14 | ... * ... |  |
-| exit.rb:1:1:6:3 | enter m1 | exit.rb:1:8:1:8 | x |  |
-| exit.rb:1:1:6:3 | exit m1 (abnormal) | exit.rb:1:1:6:3 | exit m1 |  |
-| exit.rb:1:1:6:3 | exit m1 (normal) | exit.rb:1:1:6:3 | exit m1 |  |
+| exit.rb:1:1:6:3 | Entry | exit.rb:1:8:1:8 | x |  |
+| exit.rb:1:1:6:3 | Exceptional Exit | exit.rb:1:1:6:3 | Exit |  |
+| exit.rb:1:1:6:3 | Normal Exit | exit.rb:1:1:6:3 | Exit |  |
 | exit.rb:1:1:6:3 | m1 | exit.rb:8:1:13:3 | m2 |  |
-| exit.rb:1:1:13:4 | enter exit.rb | exit.rb:1:1:6:3 | m1 |  |
-| exit.rb:1:1:13:4 | exit exit.rb (normal) | exit.rb:1:1:13:4 | exit exit.rb |  |
-| exit.rb:1:8:1:8 | x | exit.rb:2:6:2:6 | x |  |
-| exit.rb:2:3:4:5 | if ... | exit.rb:5:3:5:15 | self |  |
+| exit.rb:1:1:13:4 | Entry | exit.rb:1:1:6:3 | m1 |  |
+| exit.rb:1:1:13:4 | Normal Exit | exit.rb:1:1:13:4 | Exit |  |
+| exit.rb:1:8:1:8 | x | exit.rb:2:3:5:15 | ... |  |
+| exit.rb:2:3:4:5 | After if ... | exit.rb:5:3:5:15 | Before call to puts |  |
+| exit.rb:2:3:4:5 | if ... | exit.rb:2:6:2:10 | Before ... > ... |  |
+| exit.rb:2:3:5:15 | ... | exit.rb:2:3:4:5 | if ... |  |
+| exit.rb:2:3:5:15 | After ... | exit.rb:1:1:6:3 | Normal Exit |  |
 | exit.rb:2:6:2:6 | x | exit.rb:2:10:2:10 | 2 |  |
-| exit.rb:2:6:2:10 | ... > ... | exit.rb:2:3:4:5 | if ... | false |
-| exit.rb:2:6:2:10 | ... > ... | exit.rb:3:5:3:10 | self | true |
+| exit.rb:2:6:2:10 | ... > ... | exit.rb:2:6:2:10 | After ... > ... [false] | false |
+| exit.rb:2:6:2:10 | ... > ... | exit.rb:2:6:2:10 | After ... > ... [true] | true |
+| exit.rb:2:6:2:10 | After ... > ... [false] | exit.rb:2:3:4:5 | After if ... |  |
+| exit.rb:2:6:2:10 | After ... > ... [true] | exit.rb:2:11:3:10 | then ... |  |
+| exit.rb:2:6:2:10 | Before ... > ... | exit.rb:2:6:2:6 | x |  |
 | exit.rb:2:10:2:10 | 2 | exit.rb:2:6:2:10 | ... > ... |  |
-| exit.rb:3:5:3:10 | call to exit | exit.rb:1:1:6:3 | exit m1 (abnormal) | exit |
+| exit.rb:2:11:3:10 | then ... | exit.rb:3:5:3:10 | Before call to exit |  |
+| exit.rb:3:5:3:10 | Before call to exit | exit.rb:3:5:3:10 | self |  |
+| exit.rb:3:5:3:10 | call to exit | exit.rb:1:1:6:3 | Exceptional Exit | exit |
 | exit.rb:3:5:3:10 | self | exit.rb:3:10:3:10 | 1 |  |
 | exit.rb:3:10:3:10 | 1 | exit.rb:3:5:3:10 | call to exit |  |
-| exit.rb:5:3:5:15 | call to puts | exit.rb:1:1:6:3 | exit m1 (normal) |  |
-| exit.rb:5:3:5:15 | self | exit.rb:5:9:5:14 | x <= 2 |  |
-| exit.rb:5:8:5:15 | "x <= 2" | exit.rb:5:3:5:15 | call to puts |  |
+| exit.rb:5:3:5:15 | After call to puts | exit.rb:2:3:5:15 | After ... |  |
+| exit.rb:5:3:5:15 | Before call to puts | exit.rb:5:3:5:15 | self |  |
+| exit.rb:5:3:5:15 | call to puts | exit.rb:5:3:5:15 | After call to puts |  |
+| exit.rb:5:3:5:15 | self | exit.rb:5:8:5:15 | Before "x <= 2" |  |
+| exit.rb:5:8:5:15 | "x <= 2" | exit.rb:5:8:5:15 | After "x <= 2" |  |
+| exit.rb:5:8:5:15 | After "x <= 2" | exit.rb:5:3:5:15 | call to puts |  |
+| exit.rb:5:8:5:15 | Before "x <= 2" | exit.rb:5:9:5:14 | x <= 2 |  |
 | exit.rb:5:9:5:14 | x <= 2 | exit.rb:5:8:5:15 | "x <= 2" |  |
-| exit.rb:8:1:13:3 | enter m2 | exit.rb:8:8:8:8 | x |  |
-| exit.rb:8:1:13:3 | exit m2 (abnormal) | exit.rb:8:1:13:3 | exit m2 |  |
-| exit.rb:8:1:13:3 | exit m2 (normal) | exit.rb:8:1:13:3 | exit m2 |  |
-| exit.rb:8:1:13:3 | m2 | exit.rb:1:1:13:4 | exit exit.rb (normal) |  |
-| exit.rb:8:8:8:8 | x | exit.rb:9:6:9:6 | x |  |
-| exit.rb:9:3:11:5 | if ... | exit.rb:12:3:12:15 | self |  |
+| exit.rb:8:1:13:3 | Entry | exit.rb:8:8:8:8 | x |  |
+| exit.rb:8:1:13:3 | Exceptional Exit | exit.rb:8:1:13:3 | Exit |  |
+| exit.rb:8:1:13:3 | Normal Exit | exit.rb:8:1:13:3 | Exit |  |
+| exit.rb:8:1:13:3 | m2 | exit.rb:1:1:13:4 | Normal Exit |  |
+| exit.rb:8:8:8:8 | x | exit.rb:9:3:12:15 | ... |  |
+| exit.rb:9:3:11:5 | After if ... | exit.rb:12:3:12:15 | Before call to puts |  |
+| exit.rb:9:3:11:5 | if ... | exit.rb:9:6:9:10 | Before ... > ... |  |
+| exit.rb:9:3:12:15 | ... | exit.rb:9:3:11:5 | if ... |  |
+| exit.rb:9:3:12:15 | After ... | exit.rb:8:1:13:3 | Normal Exit |  |
 | exit.rb:9:6:9:6 | x | exit.rb:9:10:9:10 | 2 |  |
-| exit.rb:9:6:9:10 | ... > ... | exit.rb:9:3:11:5 | if ... | false |
-| exit.rb:9:6:9:10 | ... > ... | exit.rb:10:5:10:18 | self | true |
+| exit.rb:9:6:9:10 | ... > ... | exit.rb:9:6:9:10 | After ... > ... [false] | false |
+| exit.rb:9:6:9:10 | ... > ... | exit.rb:9:6:9:10 | After ... > ... [true] | true |
+| exit.rb:9:6:9:10 | After ... > ... [false] | exit.rb:9:3:11:5 | After if ... |  |
+| exit.rb:9:6:9:10 | After ... > ... [true] | exit.rb:9:11:10:18 | then ... |  |
+| exit.rb:9:6:9:10 | Before ... > ... | exit.rb:9:6:9:6 | x |  |
 | exit.rb:9:10:9:10 | 2 | exit.rb:9:6:9:10 | ... > ... |  |
-| exit.rb:10:5:10:18 | call to abort | exit.rb:8:1:13:3 | exit m2 (abnormal) | exit |
-| exit.rb:10:5:10:18 | self | exit.rb:10:12:10:17 | abort! |  |
-| exit.rb:10:11:10:18 | "abort!" | exit.rb:10:5:10:18 | call to abort |  |
+| exit.rb:9:11:10:18 | then ... | exit.rb:10:5:10:18 | Before call to abort |  |
+| exit.rb:10:5:10:18 | Before call to abort | exit.rb:10:5:10:18 | self |  |
+| exit.rb:10:5:10:18 | call to abort | exit.rb:8:1:13:3 | Exceptional Exit | exit |
+| exit.rb:10:5:10:18 | self | exit.rb:10:11:10:18 | Before "abort!" |  |
+| exit.rb:10:11:10:18 | "abort!" | exit.rb:10:11:10:18 | After "abort!" |  |
+| exit.rb:10:11:10:18 | After "abort!" | exit.rb:10:5:10:18 | call to abort |  |
+| exit.rb:10:11:10:18 | Before "abort!" | exit.rb:10:12:10:17 | abort! |  |
 | exit.rb:10:12:10:17 | abort! | exit.rb:10:11:10:18 | "abort!" |  |
-| exit.rb:12:3:12:15 | call to puts | exit.rb:8:1:13:3 | exit m2 (normal) |  |
-| exit.rb:12:3:12:15 | self | exit.rb:12:9:12:14 | x <= 2 |  |
-| exit.rb:12:8:12:15 | "x <= 2" | exit.rb:12:3:12:15 | call to puts |  |
+| exit.rb:12:3:12:15 | After call to puts | exit.rb:9:3:12:15 | After ... |  |
+| exit.rb:12:3:12:15 | Before call to puts | exit.rb:12:3:12:15 | self |  |
+| exit.rb:12:3:12:15 | call to puts | exit.rb:12:3:12:15 | After call to puts |  |
+| exit.rb:12:3:12:15 | self | exit.rb:12:8:12:15 | Before "x <= 2" |  |
+| exit.rb:12:8:12:15 | "x <= 2" | exit.rb:12:8:12:15 | After "x <= 2" |  |
+| exit.rb:12:8:12:15 | After "x <= 2" | exit.rb:12:3:12:15 | call to puts |  |
+| exit.rb:12:8:12:15 | Before "x <= 2" | exit.rb:12:9:12:14 | x <= 2 |  |
 | exit.rb:12:9:12:14 | x <= 2 | exit.rb:12:8:12:15 | "x <= 2" |  |
-| heredoc.rb:1:1:7:3 | double_heredoc | heredoc.rb:1:1:7:4 | exit heredoc.rb (normal) |  |
-| heredoc.rb:1:1:7:3 | enter double_heredoc | heredoc.rb:2:3:2:16 | self |  |
-| heredoc.rb:1:1:7:3 | exit double_heredoc (normal) | heredoc.rb:1:1:7:3 | exit double_heredoc |  |
-| heredoc.rb:1:1:7:4 | enter heredoc.rb | heredoc.rb:1:1:7:3 | double_heredoc |  |
-| heredoc.rb:1:1:7:4 | exit heredoc.rb (normal) | heredoc.rb:1:1:7:4 | exit heredoc.rb |  |
-| heredoc.rb:2:3:2:16 | call to puts | heredoc.rb:1:1:7:3 | exit double_heredoc (normal) |  |
-| heredoc.rb:2:3:2:16 | self | heredoc.rb:2:17:3:10 | \n    hello\n |  |
-| heredoc.rb:2:8:2:10 | <<A | heredoc.rb:4:2:5:9 | \n   world\n |  |
-| heredoc.rb:2:13:2:15 | <<A | heredoc.rb:2:3:2:16 | call to puts |  |
+| heredoc.rb:1:1:7:3 | Entry | heredoc.rb:2:3:6:1 | ... |  |
+| heredoc.rb:1:1:7:3 | Normal Exit | heredoc.rb:1:1:7:3 | Exit |  |
+| heredoc.rb:1:1:7:3 | double_heredoc | heredoc.rb:1:1:7:4 | Normal Exit |  |
+| heredoc.rb:1:1:7:4 | Entry | heredoc.rb:1:1:7:3 | double_heredoc |  |
+| heredoc.rb:1:1:7:4 | Normal Exit | heredoc.rb:1:1:7:4 | Exit |  |
+| heredoc.rb:2:3:2:16 | After call to puts | heredoc.rb:2:3:6:1 | After ... |  |
+| heredoc.rb:2:3:2:16 | Before call to puts | heredoc.rb:2:3:2:16 | self |  |
+| heredoc.rb:2:3:2:16 | call to puts | heredoc.rb:2:3:2:16 | After call to puts |  |
+| heredoc.rb:2:3:2:16 | self | heredoc.rb:2:8:2:10 | Before <<A |  |
+| heredoc.rb:2:3:6:1 | ... | heredoc.rb:2:3:2:16 | Before call to puts |  |
+| heredoc.rb:2:3:6:1 | After ... | heredoc.rb:1:1:7:3 | Normal Exit |  |
+| heredoc.rb:2:8:2:10 | <<A | heredoc.rb:2:8:2:10 | After <<A |  |
+| heredoc.rb:2:8:2:10 | After <<A | heredoc.rb:2:13:2:15 | Before <<A |  |
+| heredoc.rb:2:8:2:10 | Before <<A | heredoc.rb:2:17:3:10 | \n    hello\n |  |
+| heredoc.rb:2:13:2:15 | <<A | heredoc.rb:2:13:2:15 | After <<A |  |
+| heredoc.rb:2:13:2:15 | After <<A | heredoc.rb:2:3:2:16 | call to puts |  |
+| heredoc.rb:2:13:2:15 | Before <<A | heredoc.rb:4:2:5:9 | \n   world\n |  |
 | heredoc.rb:2:17:3:10 | \n    hello\n | heredoc.rb:2:8:2:10 | <<A |  |
 | heredoc.rb:4:2:5:9 | \n   world\n | heredoc.rb:2:13:2:15 | <<A |  |
-| ifs.rb:1:1:9:3 | enter m1 | ifs.rb:1:8:1:8 | x |  |
-| ifs.rb:1:1:9:3 | exit m1 (normal) | ifs.rb:1:1:9:3 | exit m1 |  |
+| ifs.rb:1:1:9:3 | Entry | ifs.rb:1:8:1:8 | x |  |
+| ifs.rb:1:1:9:3 | Normal Exit | ifs.rb:1:1:9:3 | Exit |  |
 | ifs.rb:1:1:9:3 | m1 | ifs.rb:11:1:16:3 | m2 |  |
-| ifs.rb:1:1:58:4 | enter ifs.rb | ifs.rb:1:1:9:3 | m1 |  |
-| ifs.rb:1:1:58:4 | exit ifs.rb (normal) | ifs.rb:1:1:58:4 | exit ifs.rb |  |
-| ifs.rb:1:8:1:8 | x | ifs.rb:2:6:2:6 | x |  |
-| ifs.rb:2:3:8:5 | if ... | ifs.rb:1:1:9:3 | exit m1 (normal) |  |
+| ifs.rb:1:1:58:4 | Entry | ifs.rb:1:1:9:3 | m1 |  |
+| ifs.rb:1:1:58:4 | Normal Exit | ifs.rb:1:1:58:4 | Exit |  |
+| ifs.rb:1:8:1:8 | x | ifs.rb:2:3:8:5 | ... |  |
+| ifs.rb:2:3:8:5 | ... | ifs.rb:2:3:8:5 | if ... |  |
+| ifs.rb:2:3:8:5 | After ... | ifs.rb:1:1:9:3 | Normal Exit |  |
+| ifs.rb:2:3:8:5 | After if ... | ifs.rb:2:3:8:5 | After ... |  |
+| ifs.rb:2:3:8:5 | if ... | ifs.rb:2:6:2:10 | Before ... > ... |  |
 | ifs.rb:2:6:2:6 | x | ifs.rb:2:10:2:10 | 2 |  |
-| ifs.rb:2:6:2:10 | ... > ... | ifs.rb:3:5:3:30 | self | true |
-| ifs.rb:2:6:2:10 | ... > ... | ifs.rb:4:9:4:9 | x | false |
+| ifs.rb:2:6:2:10 | ... > ... | ifs.rb:2:6:2:10 | After ... > ... [false] | false |
+| ifs.rb:2:6:2:10 | ... > ... | ifs.rb:2:6:2:10 | After ... > ... [true] | true |
+| ifs.rb:2:6:2:10 | After ... > ... [false] | ifs.rb:4:3:7:35 | elsif ... |  |
+| ifs.rb:2:6:2:10 | After ... > ... [true] | ifs.rb:2:11:3:30 | then ... |  |
+| ifs.rb:2:6:2:10 | Before ... > ... | ifs.rb:2:6:2:6 | x |  |
 | ifs.rb:2:10:2:10 | 2 | ifs.rb:2:6:2:10 | ... > ... |  |
-| ifs.rb:2:11:3:30 | then ... | ifs.rb:2:3:8:5 | if ... |  |
-| ifs.rb:3:5:3:30 | call to puts | ifs.rb:2:11:3:30 | then ... |  |
-| ifs.rb:3:5:3:30 | self | ifs.rb:3:11:3:29 | x is greater than 2 |  |
-| ifs.rb:3:10:3:30 | "x is greater than 2" | ifs.rb:3:5:3:30 | call to puts |  |
+| ifs.rb:2:11:3:30 | After then ... | ifs.rb:2:3:8:5 | After if ... |  |
+| ifs.rb:2:11:3:30 | then ... | ifs.rb:3:5:3:30 | Before call to puts |  |
+| ifs.rb:3:5:3:30 | After call to puts | ifs.rb:2:11:3:30 | After then ... |  |
+| ifs.rb:3:5:3:30 | Before call to puts | ifs.rb:3:5:3:30 | self |  |
+| ifs.rb:3:5:3:30 | call to puts | ifs.rb:3:5:3:30 | After call to puts |  |
+| ifs.rb:3:5:3:30 | self | ifs.rb:3:10:3:30 | Before "x is greater than 2" |  |
+| ifs.rb:3:10:3:30 | "x is greater than 2" | ifs.rb:3:10:3:30 | After "x is greater than 2" |  |
+| ifs.rb:3:10:3:30 | After "x is greater than 2" | ifs.rb:3:5:3:30 | call to puts |  |
+| ifs.rb:3:10:3:30 | Before "x is greater than 2" | ifs.rb:3:11:3:29 | x is greater than 2 |  |
 | ifs.rb:3:11:3:29 | x is greater than 2 | ifs.rb:3:10:3:30 | "x is greater than 2" |  |
-| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:2:3:8:5 | if ... |  |
+| ifs.rb:4:3:7:35 | After elsif ... | ifs.rb:2:3:8:5 | After if ... |  |
+| ifs.rb:4:3:7:35 | elsif ... | ifs.rb:4:9:4:38 | ... and ... |  |
 | ifs.rb:4:9:4:9 | x | ifs.rb:4:14:4:14 | 2 |  |
-| ifs.rb:4:9:4:14 | ... <= ... | ifs.rb:4:9:4:24 | [false] ... and ... | false |
-| ifs.rb:4:9:4:14 | ... <= ... | ifs.rb:4:20:4:20 | x | true |
-| ifs.rb:4:9:4:24 | [false] ... and ... | ifs.rb:4:9:4:38 | [false] ... and ... | false |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:32:4:32 | x | true |
-| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:7:5:7:35 | self | false |
-| ifs.rb:4:9:4:38 | [true] ... and ... | ifs.rb:5:5:5:17 | self | true |
+| ifs.rb:4:9:4:14 | ... <= ... | ifs.rb:4:9:4:14 | After ... <= ... [false] | false |
+| ifs.rb:4:9:4:14 | ... <= ... | ifs.rb:4:9:4:14 | After ... <= ... [true] | true |
+| ifs.rb:4:9:4:14 | After ... <= ... [false] | ifs.rb:4:9:4:24 | After ... and ... [false] | false |
+| ifs.rb:4:9:4:14 | After ... <= ... [true] | ifs.rb:4:20:4:24 | Before ... > ... |  |
+| ifs.rb:4:9:4:14 | Before ... <= ... | ifs.rb:4:9:4:9 | x |  |
+| ifs.rb:4:9:4:24 | ... and ... | ifs.rb:4:9:4:14 | Before ... <= ... |  |
+| ifs.rb:4:9:4:24 | After ... and ... [false] | ifs.rb:4:9:4:38 | After ... and ... [false] | false |
+| ifs.rb:4:9:4:24 | After ... and ... [true] | ifs.rb:4:30:4:38 | ! ... |  |
+| ifs.rb:4:9:4:38 | ... and ... | ifs.rb:4:9:4:24 | ... and ... |  |
+| ifs.rb:4:9:4:38 | After ... and ... [false] | ifs.rb:6:3:7:35 | else ... |  |
+| ifs.rb:4:9:4:38 | After ... and ... [true] | ifs.rb:4:39:5:17 | then ... |  |
 | ifs.rb:4:14:4:14 | 2 | ifs.rb:4:9:4:14 | ... <= ... |  |
 | ifs.rb:4:20:4:20 | x | ifs.rb:4:24:4:24 | 0 |  |
-| ifs.rb:4:20:4:24 | ... > ... | ifs.rb:4:9:4:24 | [false] ... and ... | false |
-| ifs.rb:4:20:4:24 | ... > ... | ifs.rb:4:9:4:24 | [true] ... and ... | true |
+| ifs.rb:4:20:4:24 | ... > ... | ifs.rb:4:20:4:24 | After ... > ... [false] | false |
+| ifs.rb:4:20:4:24 | ... > ... | ifs.rb:4:20:4:24 | After ... > ... [true] | true |
+| ifs.rb:4:20:4:24 | After ... > ... [false] | ifs.rb:4:9:4:24 | After ... and ... [false] | false |
+| ifs.rb:4:20:4:24 | After ... > ... [true] | ifs.rb:4:9:4:24 | After ... and ... [true] | true |
+| ifs.rb:4:20:4:24 | Before ... > ... | ifs.rb:4:20:4:20 | x |  |
 | ifs.rb:4:24:4:24 | 0 | ifs.rb:4:20:4:24 | ... > ... |  |
-| ifs.rb:4:30:4:38 | [false] ! ... | ifs.rb:4:9:4:38 | [false] ... and ... | false |
-| ifs.rb:4:30:4:38 | [true] ! ... | ifs.rb:4:9:4:38 | [true] ... and ... | true |
-| ifs.rb:4:31:4:38 | [false] ( ... ) | ifs.rb:4:30:4:38 | [true] ! ... | false |
-| ifs.rb:4:31:4:38 | [true] ( ... ) | ifs.rb:4:30:4:38 | [false] ! ... | true |
+| ifs.rb:4:30:4:38 | ! ... | ifs.rb:4:31:4:38 | ( ... ) |  |
+| ifs.rb:4:30:4:38 | After ! ... [false] | ifs.rb:4:9:4:38 | After ... and ... [false] | false |
+| ifs.rb:4:30:4:38 | After ! ... [true] | ifs.rb:4:9:4:38 | After ... and ... [true] | true |
+| ifs.rb:4:31:4:38 | ( ... ) | ifs.rb:4:32:4:37 | Before ... == ... |  |
+| ifs.rb:4:31:4:38 | After ( ... ) [false] | ifs.rb:4:30:4:38 | After ! ... [true] | true |
+| ifs.rb:4:31:4:38 | After ( ... ) [true] | ifs.rb:4:30:4:38 | After ! ... [false] | false |
 | ifs.rb:4:32:4:32 | x | ifs.rb:4:37:4:37 | 5 |  |
-| ifs.rb:4:32:4:37 | ... == ... | ifs.rb:4:31:4:38 | [false] ( ... ) | false |
-| ifs.rb:4:32:4:37 | ... == ... | ifs.rb:4:31:4:38 | [true] ( ... ) | true |
+| ifs.rb:4:32:4:37 | ... == ... | ifs.rb:4:32:4:37 | After ... == ... [false] | false |
+| ifs.rb:4:32:4:37 | ... == ... | ifs.rb:4:32:4:37 | After ... == ... [true] | true |
+| ifs.rb:4:32:4:37 | After ... == ... [false] | ifs.rb:4:31:4:38 | After ( ... ) [false] | false |
+| ifs.rb:4:32:4:37 | After ... == ... [true] | ifs.rb:4:31:4:38 | After ( ... ) [true] | true |
+| ifs.rb:4:32:4:37 | Before ... == ... | ifs.rb:4:32:4:32 | x |  |
 | ifs.rb:4:37:4:37 | 5 | ifs.rb:4:32:4:37 | ... == ... |  |
-| ifs.rb:4:39:5:17 | then ... | ifs.rb:4:3:7:35 | elsif ... |  |
-| ifs.rb:5:5:5:17 | call to puts | ifs.rb:4:39:5:17 | then ... |  |
-| ifs.rb:5:5:5:17 | self | ifs.rb:5:11:5:16 | x is 1 |  |
-| ifs.rb:5:10:5:17 | "x is 1" | ifs.rb:5:5:5:17 | call to puts |  |
+| ifs.rb:4:39:5:17 | After then ... | ifs.rb:4:3:7:35 | After elsif ... |  |
+| ifs.rb:4:39:5:17 | then ... | ifs.rb:5:5:5:17 | Before call to puts |  |
+| ifs.rb:5:5:5:17 | After call to puts | ifs.rb:4:39:5:17 | After then ... |  |
+| ifs.rb:5:5:5:17 | Before call to puts | ifs.rb:5:5:5:17 | self |  |
+| ifs.rb:5:5:5:17 | call to puts | ifs.rb:5:5:5:17 | After call to puts |  |
+| ifs.rb:5:5:5:17 | self | ifs.rb:5:10:5:17 | Before "x is 1" |  |
+| ifs.rb:5:10:5:17 | "x is 1" | ifs.rb:5:10:5:17 | After "x is 1" |  |
+| ifs.rb:5:10:5:17 | After "x is 1" | ifs.rb:5:5:5:17 | call to puts |  |
+| ifs.rb:5:10:5:17 | Before "x is 1" | ifs.rb:5:11:5:16 | x is 1 |  |
 | ifs.rb:5:11:5:16 | x is 1 | ifs.rb:5:10:5:17 | "x is 1" |  |
-| ifs.rb:6:3:7:35 | else ... | ifs.rb:4:3:7:35 | elsif ... |  |
-| ifs.rb:7:5:7:35 | call to puts | ifs.rb:6:3:7:35 | else ... |  |
-| ifs.rb:7:5:7:35 | self | ifs.rb:7:11:7:34 | I can't guess the number |  |
-| ifs.rb:7:10:7:35 | "I can't guess the number" | ifs.rb:7:5:7:35 | call to puts |  |
+| ifs.rb:6:3:7:35 | After else ... | ifs.rb:4:3:7:35 | After elsif ... |  |
+| ifs.rb:6:3:7:35 | else ... | ifs.rb:7:5:7:35 | Before call to puts |  |
+| ifs.rb:7:5:7:35 | After call to puts | ifs.rb:6:3:7:35 | After else ... |  |
+| ifs.rb:7:5:7:35 | Before call to puts | ifs.rb:7:5:7:35 | self |  |
+| ifs.rb:7:5:7:35 | call to puts | ifs.rb:7:5:7:35 | After call to puts |  |
+| ifs.rb:7:5:7:35 | self | ifs.rb:7:10:7:35 | Before "I can't guess the number" |  |
+| ifs.rb:7:10:7:35 | "I can't guess the number" | ifs.rb:7:10:7:35 | After "I can't guess the number" |  |
+| ifs.rb:7:10:7:35 | After "I can't guess the number" | ifs.rb:7:5:7:35 | call to puts |  |
+| ifs.rb:7:10:7:35 | Before "I can't guess the number" | ifs.rb:7:11:7:34 | I can't guess the number |  |
 | ifs.rb:7:11:7:34 | I can't guess the number | ifs.rb:7:10:7:35 | "I can't guess the number" |  |
-| ifs.rb:11:1:16:3 | enter m2 | ifs.rb:11:8:11:8 | b |  |
-| ifs.rb:11:1:16:3 | exit m2 (normal) | ifs.rb:11:1:16:3 | exit m2 |  |
+| ifs.rb:11:1:16:3 | Entry | ifs.rb:11:8:11:8 | b |  |
+| ifs.rb:11:1:16:3 | Normal Exit | ifs.rb:11:1:16:3 | Exit |  |
 | ifs.rb:11:1:16:3 | m2 | ifs.rb:18:1:26:3 | m3 |  |
-| ifs.rb:11:8:11:8 | b | ifs.rb:12:6:12:6 | b |  |
-| ifs.rb:12:3:14:5 | if ... | ifs.rb:15:10:15:10 | 1 |  |
-| ifs.rb:12:6:12:6 | b | ifs.rb:12:3:14:5 | if ... | false |
-| ifs.rb:12:6:12:6 | b | ifs.rb:13:12:13:12 | 0 | true |
-| ifs.rb:13:5:13:12 | return | ifs.rb:11:1:16:3 | exit m2 (normal) | return |
+| ifs.rb:11:8:11:8 | b | ifs.rb:12:3:15:10 | ... |  |
+| ifs.rb:12:3:14:5 | After if ... | ifs.rb:15:3:15:10 | Before return |  |
+| ifs.rb:12:3:14:5 | if ... | ifs.rb:12:6:12:6 | b |  |
+| ifs.rb:12:3:15:10 | ... | ifs.rb:12:3:14:5 | if ... |  |
+| ifs.rb:12:6:12:6 | After b [false] | ifs.rb:12:3:14:5 | After if ... |  |
+| ifs.rb:12:6:12:6 | After b [true] | ifs.rb:12:7:13:12 | then ... |  |
+| ifs.rb:12:6:12:6 | b | ifs.rb:12:6:12:6 | After b [false] | false |
+| ifs.rb:12:6:12:6 | b | ifs.rb:12:6:12:6 | After b [true] | true |
+| ifs.rb:12:7:13:12 | then ... | ifs.rb:13:5:13:12 | Before return |  |
+| ifs.rb:13:5:13:12 | Before return | ifs.rb:13:12:13:12 | 0 |  |
+| ifs.rb:13:5:13:12 | return | ifs.rb:11:1:16:3 | Normal Exit | return |
 | ifs.rb:13:12:13:12 | 0 | ifs.rb:13:5:13:12 | return |  |
-| ifs.rb:15:3:15:10 | return | ifs.rb:11:1:16:3 | exit m2 (normal) | return |
+| ifs.rb:15:3:15:10 | Before return | ifs.rb:15:10:15:10 | 1 |  |
+| ifs.rb:15:3:15:10 | return | ifs.rb:11:1:16:3 | Normal Exit | return |
 | ifs.rb:15:10:15:10 | 1 | ifs.rb:15:3:15:10 | return |  |
-| ifs.rb:18:1:26:3 | enter m3 | ifs.rb:18:8:18:8 | x |  |
-| ifs.rb:18:1:26:3 | exit m3 (normal) | ifs.rb:18:1:26:3 | exit m3 |  |
+| ifs.rb:18:1:26:3 | Entry | ifs.rb:18:8:18:8 | x |  |
+| ifs.rb:18:1:26:3 | Normal Exit | ifs.rb:18:1:26:3 | Exit |  |
 | ifs.rb:18:1:26:3 | m3 | ifs.rb:28:1:30:3 | m4 |  |
-| ifs.rb:18:8:18:8 | x | ifs.rb:19:6:19:6 | x |  |
-| ifs.rb:19:3:24:5 | if ... | ifs.rb:25:3:25:8 | self |  |
+| ifs.rb:18:8:18:8 | x | ifs.rb:19:3:25:8 | ... |  |
+| ifs.rb:19:3:24:5 | After if ... | ifs.rb:25:3:25:8 | Before call to puts |  |
+| ifs.rb:19:3:24:5 | if ... | ifs.rb:19:6:19:10 | Before ... < ... |  |
+| ifs.rb:19:3:25:8 | ... | ifs.rb:19:3:24:5 | if ... |  |
+| ifs.rb:19:3:25:8 | After ... | ifs.rb:18:1:26:3 | Normal Exit |  |
 | ifs.rb:19:6:19:6 | x | ifs.rb:19:10:19:10 | 0 |  |
-| ifs.rb:19:6:19:10 | ... < ... | ifs.rb:19:3:24:5 | if ... | false |
-| ifs.rb:19:6:19:10 | ... < ... | ifs.rb:20:5:20:5 | x | true |
+| ifs.rb:19:6:19:10 | ... < ... | ifs.rb:19:6:19:10 | After ... < ... [false] | false |
+| ifs.rb:19:6:19:10 | ... < ... | ifs.rb:19:6:19:10 | After ... < ... [true] | true |
+| ifs.rb:19:6:19:10 | After ... < ... [false] | ifs.rb:19:3:24:5 | After if ... |  |
+| ifs.rb:19:6:19:10 | After ... < ... [true] | ifs.rb:19:11:23:7 | then ... |  |
+| ifs.rb:19:6:19:10 | Before ... < ... | ifs.rb:19:6:19:6 | x |  |
 | ifs.rb:19:10:19:10 | 0 | ifs.rb:19:6:19:10 | ... < ... |  |
-| ifs.rb:19:11:23:7 | then ... | ifs.rb:19:3:24:5 | if ... |  |
-| ifs.rb:20:5:20:5 | x | ifs.rb:20:10:20:10 | x |  |
-| ifs.rb:20:5:20:10 | ... = ... | ifs.rb:21:8:21:8 | x |  |
-| ifs.rb:20:9:20:10 | - ... | ifs.rb:20:5:20:10 | ... = ... |  |
+| ifs.rb:19:11:23:7 | After then ... | ifs.rb:19:3:24:5 | After if ... |  |
+| ifs.rb:19:11:23:7 | then ... | ifs.rb:20:5:20:10 | Before ... = ... |  |
+| ifs.rb:20:5:20:5 | x | ifs.rb:20:9:20:10 | Before - ... |  |
+| ifs.rb:20:5:20:10 | ... = ... | ifs.rb:20:5:20:10 | After ... = ... |  |
+| ifs.rb:20:5:20:10 | After ... = ... | ifs.rb:21:5:23:7 | if ... |  |
+| ifs.rb:20:5:20:10 | Before ... = ... | ifs.rb:20:5:20:5 | x |  |
+| ifs.rb:20:9:20:10 | - ... | ifs.rb:20:9:20:10 | After - ... |  |
+| ifs.rb:20:9:20:10 | After - ... | ifs.rb:20:5:20:10 | ... = ... |  |
+| ifs.rb:20:9:20:10 | Before - ... | ifs.rb:20:10:20:10 | x |  |
 | ifs.rb:20:10:20:10 | x | ifs.rb:20:9:20:10 | - ... |  |
-| ifs.rb:21:5:23:7 | if ... | ifs.rb:19:11:23:7 | then ... |  |
+| ifs.rb:21:5:23:7 | After if ... | ifs.rb:19:11:23:7 | After then ... |  |
+| ifs.rb:21:5:23:7 | if ... | ifs.rb:21:8:21:13 | Before ... > ... |  |
 | ifs.rb:21:8:21:8 | x | ifs.rb:21:12:21:13 | 10 |  |
-| ifs.rb:21:8:21:13 | ... > ... | ifs.rb:21:5:23:7 | if ... | false |
-| ifs.rb:21:8:21:13 | ... > ... | ifs.rb:22:7:22:7 | x | true |
+| ifs.rb:21:8:21:13 | ... > ... | ifs.rb:21:8:21:13 | After ... > ... [false] | false |
+| ifs.rb:21:8:21:13 | ... > ... | ifs.rb:21:8:21:13 | After ... > ... [true] | true |
+| ifs.rb:21:8:21:13 | After ... > ... [false] | ifs.rb:21:5:23:7 | After if ... |  |
+| ifs.rb:21:8:21:13 | After ... > ... [true] | ifs.rb:21:14:22:15 | then ... |  |
+| ifs.rb:21:8:21:13 | Before ... > ... | ifs.rb:21:8:21:8 | x |  |
 | ifs.rb:21:12:21:13 | 10 | ifs.rb:21:8:21:13 | ... > ... |  |
-| ifs.rb:21:14:22:15 | then ... | ifs.rb:21:5:23:7 | if ... |  |
-| ifs.rb:22:7:22:7 | x | ifs.rb:22:11:22:11 | x |  |
-| ifs.rb:22:7:22:15 | ... = ... | ifs.rb:21:14:22:15 | then ... |  |
+| ifs.rb:21:14:22:15 | After then ... | ifs.rb:21:5:23:7 | After if ... |  |
+| ifs.rb:21:14:22:15 | then ... | ifs.rb:22:7:22:15 | Before ... = ... |  |
+| ifs.rb:22:7:22:7 | x | ifs.rb:22:11:22:15 | Before ... - ... |  |
+| ifs.rb:22:7:22:15 | ... = ... | ifs.rb:22:7:22:15 | After ... = ... |  |
+| ifs.rb:22:7:22:15 | After ... = ... | ifs.rb:21:14:22:15 | After then ... |  |
+| ifs.rb:22:7:22:15 | Before ... = ... | ifs.rb:22:7:22:7 | x |  |
 | ifs.rb:22:11:22:11 | x | ifs.rb:22:15:22:15 | 1 |  |
-| ifs.rb:22:11:22:15 | ... - ... | ifs.rb:22:7:22:15 | ... = ... |  |
+| ifs.rb:22:11:22:15 | ... - ... | ifs.rb:22:11:22:15 | After ... - ... |  |
+| ifs.rb:22:11:22:15 | After ... - ... | ifs.rb:22:7:22:15 | ... = ... |  |
+| ifs.rb:22:11:22:15 | Before ... - ... | ifs.rb:22:11:22:11 | x |  |
 | ifs.rb:22:15:22:15 | 1 | ifs.rb:22:11:22:15 | ... - ... |  |
-| ifs.rb:25:3:25:8 | call to puts | ifs.rb:18:1:26:3 | exit m3 (normal) |  |
+| ifs.rb:25:3:25:8 | After call to puts | ifs.rb:19:3:25:8 | After ... |  |
+| ifs.rb:25:3:25:8 | Before call to puts | ifs.rb:25:3:25:8 | self |  |
+| ifs.rb:25:3:25:8 | call to puts | ifs.rb:25:3:25:8 | After call to puts |  |
 | ifs.rb:25:3:25:8 | self | ifs.rb:25:8:25:8 | x |  |
 | ifs.rb:25:8:25:8 | x | ifs.rb:25:3:25:8 | call to puts |  |
-| ifs.rb:28:1:30:3 | enter m4 | ifs.rb:28:9:28:10 | b1 |  |
-| ifs.rb:28:1:30:3 | exit m4 (normal) | ifs.rb:28:1:30:3 | exit m4 |  |
+| ifs.rb:28:1:30:3 | Entry | ifs.rb:28:9:28:10 | b1 |  |
+| ifs.rb:28:1:30:3 | Normal Exit | ifs.rb:28:1:30:3 | Exit |  |
 | ifs.rb:28:1:30:3 | m4 | ifs.rb:32:1:34:3 | m5 |  |
 | ifs.rb:28:9:28:10 | b1 | ifs.rb:28:13:28:14 | b2 |  |
 | ifs.rb:28:13:28:14 | b2 | ifs.rb:28:17:28:18 | b3 |  |
-| ifs.rb:28:17:28:18 | b3 | ifs.rb:29:11:29:12 | b1 |  |
-| ifs.rb:29:3:29:51 | return | ifs.rb:28:1:30:3 | exit m4 (normal) | return |
-| ifs.rb:29:10:29:23 | [false] ( ... ) | ifs.rb:29:41:29:50 | !b2 \|\| !b3 | false |
-| ifs.rb:29:10:29:23 | [true] ( ... ) | ifs.rb:29:28:29:35 | b2 \|\| b3 | true |
-| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:3:29:51 | return |  |
-| ifs.rb:29:11:29:12 | b1 | ifs.rb:29:16:29:17 | b2 | true |
-| ifs.rb:29:11:29:12 | b1 | ifs.rb:29:21:29:22 | b3 | false |
-| ifs.rb:29:11:29:22 | [false] ... ? ... : ... | ifs.rb:29:10:29:23 | [false] ( ... ) | false |
-| ifs.rb:29:11:29:22 | [true] ... ? ... : ... | ifs.rb:29:10:29:23 | [true] ( ... ) | true |
-| ifs.rb:29:16:29:17 | b2 | ifs.rb:29:11:29:22 | [false] ... ? ... : ... | false |
-| ifs.rb:29:16:29:17 | b2 | ifs.rb:29:11:29:22 | [true] ... ? ... : ... | true |
-| ifs.rb:29:21:29:22 | b3 | ifs.rb:29:11:29:22 | [false] ... ? ... : ... | false |
-| ifs.rb:29:21:29:22 | b3 | ifs.rb:29:11:29:22 | [true] ... ? ... : ... | true |
-| ifs.rb:29:27:29:36 | "b2 \|\| b3" | ifs.rb:29:10:29:51 | ... ? ... : ... |  |
+| ifs.rb:28:17:28:18 | b3 | ifs.rb:29:3:29:51 | ... |  |
+| ifs.rb:29:3:29:51 | ... | ifs.rb:29:3:29:51 | Before return |  |
+| ifs.rb:29:3:29:51 | Before return | ifs.rb:29:10:29:51 | ... ? ... : ... |  |
+| ifs.rb:29:3:29:51 | return | ifs.rb:28:1:30:3 | Normal Exit | return |
+| ifs.rb:29:10:29:23 | ( ... ) | ifs.rb:29:11:29:22 | ... ? ... : ... |  |
+| ifs.rb:29:10:29:23 | After ( ... ) [false] | ifs.rb:29:40:29:51 | Before "!b2 \|\| !b3" |  |
+| ifs.rb:29:10:29:23 | After ( ... ) [true] | ifs.rb:29:27:29:36 | Before "b2 \|\| b3" |  |
+| ifs.rb:29:10:29:51 | ... ? ... : ... | ifs.rb:29:10:29:23 | ( ... ) |  |
+| ifs.rb:29:10:29:51 | After ... ? ... : ... | ifs.rb:29:3:29:51 | return |  |
+| ifs.rb:29:11:29:12 | After b1 [false] | ifs.rb:29:21:29:22 | b3 |  |
+| ifs.rb:29:11:29:12 | After b1 [true] | ifs.rb:29:16:29:17 | b2 |  |
+| ifs.rb:29:11:29:12 | b1 | ifs.rb:29:11:29:12 | After b1 [false] | false |
+| ifs.rb:29:11:29:12 | b1 | ifs.rb:29:11:29:12 | After b1 [true] | true |
+| ifs.rb:29:11:29:22 | ... ? ... : ... | ifs.rb:29:11:29:12 | b1 |  |
+| ifs.rb:29:11:29:22 | After ... ? ... : ... [false] | ifs.rb:29:10:29:23 | After ( ... ) [false] | false |
+| ifs.rb:29:11:29:22 | After ... ? ... : ... [true] | ifs.rb:29:10:29:23 | After ( ... ) [true] | true |
+| ifs.rb:29:16:29:17 | After b2 [false] | ifs.rb:29:11:29:22 | After ... ? ... : ... [false] | false |
+| ifs.rb:29:16:29:17 | After b2 [true] | ifs.rb:29:11:29:22 | After ... ? ... : ... [true] | true |
+| ifs.rb:29:16:29:17 | b2 | ifs.rb:29:16:29:17 | After b2 [false] | false |
+| ifs.rb:29:16:29:17 | b2 | ifs.rb:29:16:29:17 | After b2 [true] | true |
+| ifs.rb:29:21:29:22 | After b3 [false] | ifs.rb:29:11:29:22 | After ... ? ... : ... [false] | false |
+| ifs.rb:29:21:29:22 | After b3 [true] | ifs.rb:29:11:29:22 | After ... ? ... : ... [true] | true |
+| ifs.rb:29:21:29:22 | b3 | ifs.rb:29:21:29:22 | After b3 [false] | false |
+| ifs.rb:29:21:29:22 | b3 | ifs.rb:29:21:29:22 | After b3 [true] | true |
+| ifs.rb:29:27:29:36 | "b2 \|\| b3" | ifs.rb:29:27:29:36 | After "b2 \|\| b3" |  |
+| ifs.rb:29:27:29:36 | After "b2 \|\| b3" | ifs.rb:29:10:29:51 | After ... ? ... : ... |  |
+| ifs.rb:29:27:29:36 | Before "b2 \|\| b3" | ifs.rb:29:28:29:35 | b2 \|\| b3 |  |
 | ifs.rb:29:28:29:35 | b2 \|\| b3 | ifs.rb:29:27:29:36 | "b2 \|\| b3" |  |
-| ifs.rb:29:40:29:51 | "!b2 \|\| !b3" | ifs.rb:29:10:29:51 | ... ? ... : ... |  |
+| ifs.rb:29:40:29:51 | "!b2 \|\| !b3" | ifs.rb:29:40:29:51 | After "!b2 \|\| !b3" |  |
+| ifs.rb:29:40:29:51 | After "!b2 \|\| !b3" | ifs.rb:29:10:29:51 | After ... ? ... : ... |  |
+| ifs.rb:29:40:29:51 | Before "!b2 \|\| !b3" | ifs.rb:29:41:29:50 | !b2 \|\| !b3 |  |
 | ifs.rb:29:41:29:50 | !b2 \|\| !b3 | ifs.rb:29:40:29:51 | "!b2 \|\| !b3" |  |
-| ifs.rb:32:1:34:3 | enter m5 | ifs.rb:32:9:32:10 | b1 |  |
-| ifs.rb:32:1:34:3 | exit m5 (normal) | ifs.rb:32:1:34:3 | exit m5 |  |
-| ifs.rb:32:1:34:3 | m5 | ifs.rb:38:12:38:12 | 1 |  |
+| ifs.rb:32:1:34:3 | Entry | ifs.rb:32:9:32:10 | b1 |  |
+| ifs.rb:32:1:34:3 | Normal Exit | ifs.rb:32:1:34:3 | Exit |  |
+| ifs.rb:32:1:34:3 | m5 | ifs.rb:36:1:38:17 | ... unless ... |  |
 | ifs.rb:32:9:32:10 | b1 | ifs.rb:32:13:32:14 | b2 |  |
 | ifs.rb:32:13:32:14 | b2 | ifs.rb:32:17:32:18 | b3 |  |
 | ifs.rb:32:17:32:18 | b3 | ifs.rb:32:21:32:22 | b4 |  |
 | ifs.rb:32:21:32:22 | b4 | ifs.rb:32:25:32:26 | b5 |  |
-| ifs.rb:32:25:32:26 | b5 | ifs.rb:33:10:33:11 | b1 |  |
-| ifs.rb:33:3:33:100 | if ... | ifs.rb:32:1:34:3 | exit m5 (normal) |  |
-| ifs.rb:33:6:33:49 | [false] ( ... ) | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | false |
-| ifs.rb:33:6:33:49 | [true] ( ... ) | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | true |
-| ifs.rb:33:7:33:48 | [false] if ... | ifs.rb:33:6:33:49 | [false] ( ... ) | false |
-| ifs.rb:33:7:33:48 | [true] if ... | ifs.rb:33:6:33:49 | [true] ( ... ) | true |
-| ifs.rb:33:10:33:11 | b1 | ifs.rb:33:18:33:19 | b2 | true |
-| ifs.rb:33:10:33:11 | b1 | ifs.rb:33:27:33:28 | b3 | false |
-| ifs.rb:33:13:33:19 | [false] then ... | ifs.rb:33:7:33:48 | [false] if ... | false |
-| ifs.rb:33:13:33:19 | [true] then ... | ifs.rb:33:7:33:48 | [true] if ... | true |
-| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:13:33:19 | [false] then ... | false |
-| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:13:33:19 | [true] then ... | true |
-| ifs.rb:33:21:33:44 | [false] elsif ... | ifs.rb:33:7:33:48 | [false] if ... | false |
-| ifs.rb:33:21:33:44 | [true] elsif ... | ifs.rb:33:7:33:48 | [true] if ... | true |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:35:33:36 | b4 | true |
-| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:43:33:44 | b5 | false |
-| ifs.rb:33:30:33:36 | [false] then ... | ifs.rb:33:21:33:44 | [false] elsif ... | false |
-| ifs.rb:33:30:33:36 | [true] then ... | ifs.rb:33:21:33:44 | [true] elsif ... | true |
-| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:30:33:36 | [false] then ... | false |
-| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:30:33:36 | [true] then ... | true |
-| ifs.rb:33:38:33:44 | [false] else ... | ifs.rb:33:21:33:44 | [false] elsif ... | false |
-| ifs.rb:33:38:33:44 | [true] else ... | ifs.rb:33:21:33:44 | [true] elsif ... | true |
-| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:38:33:44 | [false] else ... | false |
-| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:38:33:44 | [true] else ... | true |
-| ifs.rb:33:51:33:71 | then ... | ifs.rb:33:3:33:100 | if ... |  |
-| ifs.rb:33:56:33:71 | "b2 \|\| b4 \|\| b5" | ifs.rb:33:51:33:71 | then ... |  |
+| ifs.rb:32:25:32:26 | b5 | ifs.rb:33:3:33:100 | ... |  |
+| ifs.rb:33:3:33:100 | ... | ifs.rb:33:3:33:100 | if ... |  |
+| ifs.rb:33:3:33:100 | After ... | ifs.rb:32:1:34:3 | Normal Exit |  |
+| ifs.rb:33:3:33:100 | After if ... | ifs.rb:33:3:33:100 | After ... |  |
+| ifs.rb:33:3:33:100 | if ... | ifs.rb:33:6:33:49 | ( ... ) |  |
+| ifs.rb:33:6:33:49 | ( ... ) | ifs.rb:33:7:33:48 | if ... |  |
+| ifs.rb:33:6:33:49 | After ( ... ) [false] | ifs.rb:33:73:33:96 | else ... |  |
+| ifs.rb:33:6:33:49 | After ( ... ) [true] | ifs.rb:33:51:33:71 | then ... |  |
+| ifs.rb:33:7:33:48 | After if ... [false] | ifs.rb:33:6:33:49 | After ( ... ) [false] | false |
+| ifs.rb:33:7:33:48 | After if ... [true] | ifs.rb:33:6:33:49 | After ( ... ) [true] | true |
+| ifs.rb:33:7:33:48 | if ... | ifs.rb:33:10:33:11 | b1 |  |
+| ifs.rb:33:10:33:11 | After b1 [false] | ifs.rb:33:21:33:44 | elsif ... |  |
+| ifs.rb:33:10:33:11 | After b1 [true] | ifs.rb:33:13:33:19 | then ... |  |
+| ifs.rb:33:10:33:11 | b1 | ifs.rb:33:10:33:11 | After b1 [false] | false |
+| ifs.rb:33:10:33:11 | b1 | ifs.rb:33:10:33:11 | After b1 [true] | true |
+| ifs.rb:33:13:33:19 | After then ... [false] | ifs.rb:33:7:33:48 | After if ... [false] | false |
+| ifs.rb:33:13:33:19 | After then ... [true] | ifs.rb:33:7:33:48 | After if ... [true] | true |
+| ifs.rb:33:13:33:19 | then ... | ifs.rb:33:18:33:19 | b2 |  |
+| ifs.rb:33:18:33:19 | After b2 [false] | ifs.rb:33:13:33:19 | After then ... [false] | false |
+| ifs.rb:33:18:33:19 | After b2 [true] | ifs.rb:33:13:33:19 | After then ... [true] | true |
+| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:18:33:19 | After b2 [false] | false |
+| ifs.rb:33:18:33:19 | b2 | ifs.rb:33:18:33:19 | After b2 [true] | true |
+| ifs.rb:33:21:33:44 | After elsif ... [false] | ifs.rb:33:7:33:48 | After if ... [false] | false |
+| ifs.rb:33:21:33:44 | After elsif ... [true] | ifs.rb:33:7:33:48 | After if ... [true] | true |
+| ifs.rb:33:21:33:44 | elsif ... | ifs.rb:33:27:33:28 | b3 |  |
+| ifs.rb:33:27:33:28 | After b3 [false] | ifs.rb:33:38:33:44 | else ... |  |
+| ifs.rb:33:27:33:28 | After b3 [true] | ifs.rb:33:30:33:36 | then ... |  |
+| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:27:33:28 | After b3 [false] | false |
+| ifs.rb:33:27:33:28 | b3 | ifs.rb:33:27:33:28 | After b3 [true] | true |
+| ifs.rb:33:30:33:36 | After then ... [false] | ifs.rb:33:21:33:44 | After elsif ... [false] | false |
+| ifs.rb:33:30:33:36 | After then ... [true] | ifs.rb:33:21:33:44 | After elsif ... [true] | true |
+| ifs.rb:33:30:33:36 | then ... | ifs.rb:33:35:33:36 | b4 |  |
+| ifs.rb:33:35:33:36 | After b4 [false] | ifs.rb:33:30:33:36 | After then ... [false] | false |
+| ifs.rb:33:35:33:36 | After b4 [true] | ifs.rb:33:30:33:36 | After then ... [true] | true |
+| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:35:33:36 | After b4 [false] | false |
+| ifs.rb:33:35:33:36 | b4 | ifs.rb:33:35:33:36 | After b4 [true] | true |
+| ifs.rb:33:38:33:44 | After else ... [false] | ifs.rb:33:21:33:44 | After elsif ... [false] | false |
+| ifs.rb:33:38:33:44 | After else ... [true] | ifs.rb:33:21:33:44 | After elsif ... [true] | true |
+| ifs.rb:33:38:33:44 | else ... | ifs.rb:33:43:33:44 | b5 |  |
+| ifs.rb:33:43:33:44 | After b5 [false] | ifs.rb:33:38:33:44 | After else ... [false] | false |
+| ifs.rb:33:43:33:44 | After b5 [true] | ifs.rb:33:38:33:44 | After else ... [true] | true |
+| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:43:33:44 | After b5 [false] | false |
+| ifs.rb:33:43:33:44 | b5 | ifs.rb:33:43:33:44 | After b5 [true] | true |
+| ifs.rb:33:51:33:71 | After then ... | ifs.rb:33:3:33:100 | After if ... |  |
+| ifs.rb:33:51:33:71 | then ... | ifs.rb:33:56:33:71 | Before "b2 \|\| b4 \|\| b5" |  |
+| ifs.rb:33:56:33:71 | "b2 \|\| b4 \|\| b5" | ifs.rb:33:56:33:71 | After "b2 \|\| b4 \|\| b5" |  |
+| ifs.rb:33:56:33:71 | After "b2 \|\| b4 \|\| b5" | ifs.rb:33:51:33:71 | After then ... |  |
+| ifs.rb:33:56:33:71 | Before "b2 \|\| b4 \|\| b5" | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 |  |
 | ifs.rb:33:57:33:70 | b2 \|\| b4 \|\| b5 | ifs.rb:33:56:33:71 | "b2 \|\| b4 \|\| b5" |  |
-| ifs.rb:33:73:33:96 | else ... | ifs.rb:33:3:33:100 | if ... |  |
-| ifs.rb:33:78:33:96 | "!b2 \|\| !b4 \|\| !b5" | ifs.rb:33:73:33:96 | else ... |  |
+| ifs.rb:33:73:33:96 | After else ... | ifs.rb:33:3:33:100 | After if ... |  |
+| ifs.rb:33:73:33:96 | else ... | ifs.rb:33:78:33:96 | Before "!b2 \|\| !b4 \|\| !b5" |  |
+| ifs.rb:33:78:33:96 | "!b2 \|\| !b4 \|\| !b5" | ifs.rb:33:78:33:96 | After "!b2 \|\| !b4 \|\| !b5" |  |
+| ifs.rb:33:78:33:96 | After "!b2 \|\| !b4 \|\| !b5" | ifs.rb:33:73:33:96 | After else ... |  |
+| ifs.rb:33:78:33:96 | Before "!b2 \|\| !b4 \|\| !b5" | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 |  |
 | ifs.rb:33:79:33:95 | !b2 \|\| !b4 \|\| !b5 | ifs.rb:33:78:33:96 | "!b2 \|\| !b4 \|\| !b5" |  |
-| ifs.rb:36:1:38:3 | conditional_method_def | ifs.rb:36:1:38:17 | ... unless ... |  |
-| ifs.rb:36:1:38:3 | enter conditional_method_def | ifs.rb:37:3:37:12 | self |  |
-| ifs.rb:36:1:38:3 | exit conditional_method_def (normal) | ifs.rb:36:1:38:3 | exit conditional_method_def |  |
-| ifs.rb:36:1:38:17 | ... unless ... | ifs.rb:40:1:44:3 | constant_condition |  |
-| ifs.rb:37:3:37:12 | call to puts | ifs.rb:36:1:38:3 | exit conditional_method_def (normal) |  |
-| ifs.rb:37:3:37:12 | self | ifs.rb:37:9:37:11 | bla |  |
-| ifs.rb:37:8:37:12 | "bla" | ifs.rb:37:3:37:12 | call to puts |  |
+| ifs.rb:36:1:38:3 | Entry | ifs.rb:37:3:37:12 | ... |  |
+| ifs.rb:36:1:38:3 | Normal Exit | ifs.rb:36:1:38:3 | Exit |  |
+| ifs.rb:36:1:38:3 | conditional_method_def | ifs.rb:36:1:38:17 | After ... unless ... |  |
+| ifs.rb:36:1:38:17 | ... unless ... | ifs.rb:38:12:38:17 | Before ... == ... |  |
+| ifs.rb:36:1:38:17 | After ... unless ... | ifs.rb:40:1:44:3 | constant_condition |  |
+| ifs.rb:37:3:37:12 | ... | ifs.rb:37:3:37:12 | Before call to puts |  |
+| ifs.rb:37:3:37:12 | After ... | ifs.rb:36:1:38:3 | Normal Exit |  |
+| ifs.rb:37:3:37:12 | After call to puts | ifs.rb:37:3:37:12 | After ... |  |
+| ifs.rb:37:3:37:12 | Before call to puts | ifs.rb:37:3:37:12 | self |  |
+| ifs.rb:37:3:37:12 | call to puts | ifs.rb:37:3:37:12 | After call to puts |  |
+| ifs.rb:37:3:37:12 | self | ifs.rb:37:8:37:12 | Before "bla" |  |
+| ifs.rb:37:8:37:12 | "bla" | ifs.rb:37:8:37:12 | After "bla" |  |
+| ifs.rb:37:8:37:12 | After "bla" | ifs.rb:37:3:37:12 | call to puts |  |
+| ifs.rb:37:8:37:12 | Before "bla" | ifs.rb:37:9:37:11 | bla |  |
 | ifs.rb:37:9:37:11 | bla | ifs.rb:37:8:37:12 | "bla" |  |
 | ifs.rb:38:12:38:12 | 1 | ifs.rb:38:17:38:17 | 2 |  |
-| ifs.rb:38:12:38:17 | ... == ... | ifs.rb:36:1:38:3 | conditional_method_def | false |
-| ifs.rb:38:12:38:17 | ... == ... | ifs.rb:36:1:38:17 | ... unless ... | true |
+| ifs.rb:38:12:38:17 | ... == ... | ifs.rb:38:12:38:17 | After ... == ... [false] | false |
+| ifs.rb:38:12:38:17 | ... == ... | ifs.rb:38:12:38:17 | After ... == ... [true] | true |
+| ifs.rb:38:12:38:17 | After ... == ... [false] | ifs.rb:36:1:38:3 | conditional_method_def |  |
+| ifs.rb:38:12:38:17 | After ... == ... [true] | ifs.rb:36:1:38:17 | After ... unless ... |  |
+| ifs.rb:38:12:38:17 | Before ... == ... | ifs.rb:38:12:38:12 | 1 |  |
 | ifs.rb:38:17:38:17 | 2 | ifs.rb:38:12:38:17 | ... == ... |  |
+| ifs.rb:40:1:44:3 | Entry | ifs.rb:41:3:43:5 | ... |  |
+| ifs.rb:40:1:44:3 | Normal Exit | ifs.rb:40:1:44:3 | Exit |  |
 | ifs.rb:40:1:44:3 | constant_condition | ifs.rb:46:1:52:3 | empty_else |  |
-| ifs.rb:40:1:44:3 | enter constant_condition | ifs.rb:41:7:41:10 | true |  |
-| ifs.rb:40:1:44:3 | exit constant_condition (normal) | ifs.rb:40:1:44:3 | exit constant_condition |  |
-| ifs.rb:41:3:43:5 | if ... | ifs.rb:40:1:44:3 | exit constant_condition (normal) |  |
-| ifs.rb:41:6:41:10 | [false] ! ... | ifs.rb:41:3:43:5 | if ... | false |
-| ifs.rb:41:7:41:10 | true | ifs.rb:41:6:41:10 | [false] ! ... | true |
+| ifs.rb:41:3:43:5 | ... | ifs.rb:41:3:43:5 | if ... |  |
+| ifs.rb:41:3:43:5 | After ... | ifs.rb:40:1:44:3 | Normal Exit |  |
+| ifs.rb:41:3:43:5 | After if ... | ifs.rb:41:3:43:5 | After ... |  |
+| ifs.rb:41:3:43:5 | if ... | ifs.rb:41:6:41:10 | ! ... |  |
+| ifs.rb:41:6:41:10 | ! ... | ifs.rb:41:7:41:10 | true |  |
+| ifs.rb:41:6:41:10 | After ! ... [false] | ifs.rb:41:3:43:5 | After if ... |  |
+| ifs.rb:41:7:41:10 | After true [true] | ifs.rb:41:6:41:10 | After ! ... [false] | false |
+| ifs.rb:41:7:41:10 | true | ifs.rb:41:7:41:10 | After true [true] | true |
+| ifs.rb:46:1:52:3 | Entry | ifs.rb:46:16:46:16 | b |  |
+| ifs.rb:46:1:52:3 | Normal Exit | ifs.rb:46:1:52:3 | Exit |  |
 | ifs.rb:46:1:52:3 | empty_else | ifs.rb:54:1:58:3 | disjunct |  |
-| ifs.rb:46:1:52:3 | enter empty_else | ifs.rb:46:16:46:16 | b |  |
-| ifs.rb:46:1:52:3 | exit empty_else (normal) | ifs.rb:46:1:52:3 | exit empty_else |  |
-| ifs.rb:46:16:46:16 | b | ifs.rb:47:6:47:6 | b |  |
-| ifs.rb:47:3:50:5 | if ... | ifs.rb:51:3:51:13 | self |  |
-| ifs.rb:47:6:47:6 | b | ifs.rb:48:5:48:15 | self | true |
-| ifs.rb:47:6:47:6 | b | ifs.rb:49:3:49:6 | else ... | false |
-| ifs.rb:47:8:48:15 | then ... | ifs.rb:47:3:50:5 | if ... |  |
-| ifs.rb:48:5:48:15 | call to puts | ifs.rb:47:8:48:15 | then ... |  |
-| ifs.rb:48:5:48:15 | self | ifs.rb:48:11:48:14 | true |  |
-| ifs.rb:48:10:48:15 | "true" | ifs.rb:48:5:48:15 | call to puts |  |
+| ifs.rb:46:16:46:16 | b | ifs.rb:47:3:51:13 | ... |  |
+| ifs.rb:47:3:50:5 | After if ... | ifs.rb:51:3:51:13 | Before call to puts |  |
+| ifs.rb:47:3:50:5 | if ... | ifs.rb:47:6:47:6 | b |  |
+| ifs.rb:47:3:51:13 | ... | ifs.rb:47:3:50:5 | if ... |  |
+| ifs.rb:47:3:51:13 | After ... | ifs.rb:46:1:52:3 | Normal Exit |  |
+| ifs.rb:47:6:47:6 | After b [false] | ifs.rb:49:3:49:6 | else ... |  |
+| ifs.rb:47:6:47:6 | After b [true] | ifs.rb:47:8:48:15 | then ... |  |
+| ifs.rb:47:6:47:6 | b | ifs.rb:47:6:47:6 | After b [false] | false |
+| ifs.rb:47:6:47:6 | b | ifs.rb:47:6:47:6 | After b [true] | true |
+| ifs.rb:47:8:48:15 | After then ... | ifs.rb:47:3:50:5 | After if ... |  |
+| ifs.rb:47:8:48:15 | then ... | ifs.rb:48:5:48:15 | Before call to puts |  |
+| ifs.rb:48:5:48:15 | After call to puts | ifs.rb:47:8:48:15 | After then ... |  |
+| ifs.rb:48:5:48:15 | Before call to puts | ifs.rb:48:5:48:15 | self |  |
+| ifs.rb:48:5:48:15 | call to puts | ifs.rb:48:5:48:15 | After call to puts |  |
+| ifs.rb:48:5:48:15 | self | ifs.rb:48:10:48:15 | Before "true" |  |
+| ifs.rb:48:10:48:15 | "true" | ifs.rb:48:10:48:15 | After "true" |  |
+| ifs.rb:48:10:48:15 | After "true" | ifs.rb:48:5:48:15 | call to puts |  |
+| ifs.rb:48:10:48:15 | Before "true" | ifs.rb:48:11:48:14 | true |  |
 | ifs.rb:48:11:48:14 | true | ifs.rb:48:10:48:15 | "true" |  |
-| ifs.rb:49:3:49:6 | else ... | ifs.rb:47:3:50:5 | if ... |  |
-| ifs.rb:51:3:51:13 | call to puts | ifs.rb:46:1:52:3 | exit empty_else (normal) |  |
-| ifs.rb:51:3:51:13 | self | ifs.rb:51:9:51:12 | done |  |
-| ifs.rb:51:8:51:13 | "done" | ifs.rb:51:3:51:13 | call to puts |  |
+| ifs.rb:49:3:49:6 | else ... | ifs.rb:47:3:50:5 | After if ... |  |
+| ifs.rb:51:3:51:13 | After call to puts | ifs.rb:47:3:51:13 | After ... |  |
+| ifs.rb:51:3:51:13 | Before call to puts | ifs.rb:51:3:51:13 | self |  |
+| ifs.rb:51:3:51:13 | call to puts | ifs.rb:51:3:51:13 | After call to puts |  |
+| ifs.rb:51:3:51:13 | self | ifs.rb:51:8:51:13 | Before "done" |  |
+| ifs.rb:51:8:51:13 | "done" | ifs.rb:51:8:51:13 | After "done" |  |
+| ifs.rb:51:8:51:13 | After "done" | ifs.rb:51:3:51:13 | call to puts |  |
+| ifs.rb:51:8:51:13 | Before "done" | ifs.rb:51:9:51:12 | done |  |
 | ifs.rb:51:9:51:12 | done | ifs.rb:51:8:51:13 | "done" |  |
-| ifs.rb:54:1:58:3 | disjunct | ifs.rb:1:1:58:4 | exit ifs.rb (normal) |  |
-| ifs.rb:54:1:58:3 | enter disjunct | ifs.rb:54:15:54:16 | b1 |  |
-| ifs.rb:54:1:58:3 | exit disjunct (normal) | ifs.rb:54:1:58:3 | exit disjunct |  |
+| ifs.rb:54:1:58:3 | Entry | ifs.rb:54:15:54:16 | b1 |  |
+| ifs.rb:54:1:58:3 | Normal Exit | ifs.rb:54:1:58:3 | Exit |  |
+| ifs.rb:54:1:58:3 | disjunct | ifs.rb:1:1:58:4 | Normal Exit |  |
 | ifs.rb:54:15:54:16 | b1 | ifs.rb:54:19:54:20 | b2 |  |
-| ifs.rb:54:19:54:20 | b2 | ifs.rb:55:7:55:8 | b1 |  |
-| ifs.rb:55:3:57:5 | if ... | ifs.rb:54:1:58:3 | exit disjunct (normal) |  |
-| ifs.rb:55:6:55:15 | [false] ( ... ) | ifs.rb:55:3:57:5 | if ... | false |
-| ifs.rb:55:6:55:15 | [true] ( ... ) | ifs.rb:56:5:56:19 | self | true |
-| ifs.rb:55:7:55:8 | b1 | ifs.rb:55:7:55:14 | [true] ... \|\| ... | true |
-| ifs.rb:55:7:55:8 | b1 | ifs.rb:55:13:55:14 | b2 | false |
-| ifs.rb:55:7:55:14 | [false] ... \|\| ... | ifs.rb:55:6:55:15 | [false] ( ... ) | false |
-| ifs.rb:55:7:55:14 | [true] ... \|\| ... | ifs.rb:55:6:55:15 | [true] ( ... ) | true |
-| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:7:55:14 | [false] ... \|\| ... | false |
-| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:7:55:14 | [true] ... \|\| ... | true |
-| ifs.rb:55:17:56:19 | then ... | ifs.rb:55:3:57:5 | if ... |  |
-| ifs.rb:56:5:56:19 | call to puts | ifs.rb:55:17:56:19 | then ... |  |
-| ifs.rb:56:5:56:19 | self | ifs.rb:56:11:56:18 | b1 or b2 |  |
-| ifs.rb:56:10:56:19 | "b1 or b2" | ifs.rb:56:5:56:19 | call to puts |  |
+| ifs.rb:54:19:54:20 | b2 | ifs.rb:55:3:57:5 | ... |  |
+| ifs.rb:55:3:57:5 | ... | ifs.rb:55:3:57:5 | if ... |  |
+| ifs.rb:55:3:57:5 | After ... | ifs.rb:54:1:58:3 | Normal Exit |  |
+| ifs.rb:55:3:57:5 | After if ... | ifs.rb:55:3:57:5 | After ... |  |
+| ifs.rb:55:3:57:5 | if ... | ifs.rb:55:6:55:15 | ( ... ) |  |
+| ifs.rb:55:6:55:15 | ( ... ) | ifs.rb:55:7:55:14 | ... \|\| ... |  |
+| ifs.rb:55:6:55:15 | After ( ... ) [false] | ifs.rb:55:3:57:5 | After if ... |  |
+| ifs.rb:55:6:55:15 | After ( ... ) [true] | ifs.rb:55:17:56:19 | then ... |  |
+| ifs.rb:55:7:55:8 | After b1 [false] | ifs.rb:55:13:55:14 | b2 |  |
+| ifs.rb:55:7:55:8 | After b1 [true] | ifs.rb:55:7:55:14 | After ... \|\| ... [true] | true |
+| ifs.rb:55:7:55:8 | b1 | ifs.rb:55:7:55:8 | After b1 [false] | false |
+| ifs.rb:55:7:55:8 | b1 | ifs.rb:55:7:55:8 | After b1 [true] | true |
+| ifs.rb:55:7:55:14 | ... \|\| ... | ifs.rb:55:7:55:8 | b1 |  |
+| ifs.rb:55:7:55:14 | After ... \|\| ... [false] | ifs.rb:55:6:55:15 | After ( ... ) [false] | false |
+| ifs.rb:55:7:55:14 | After ... \|\| ... [true] | ifs.rb:55:6:55:15 | After ( ... ) [true] | true |
+| ifs.rb:55:13:55:14 | After b2 [false] | ifs.rb:55:7:55:14 | After ... \|\| ... [false] | false |
+| ifs.rb:55:13:55:14 | After b2 [true] | ifs.rb:55:7:55:14 | After ... \|\| ... [true] | true |
+| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:13:55:14 | After b2 [false] | false |
+| ifs.rb:55:13:55:14 | b2 | ifs.rb:55:13:55:14 | After b2 [true] | true |
+| ifs.rb:55:17:56:19 | After then ... | ifs.rb:55:3:57:5 | After if ... |  |
+| ifs.rb:55:17:56:19 | then ... | ifs.rb:56:5:56:19 | Before call to puts |  |
+| ifs.rb:56:5:56:19 | After call to puts | ifs.rb:55:17:56:19 | After then ... |  |
+| ifs.rb:56:5:56:19 | Before call to puts | ifs.rb:56:5:56:19 | self |  |
+| ifs.rb:56:5:56:19 | call to puts | ifs.rb:56:5:56:19 | After call to puts |  |
+| ifs.rb:56:5:56:19 | self | ifs.rb:56:10:56:19 | Before "b1 or b2" |  |
+| ifs.rb:56:10:56:19 | "b1 or b2" | ifs.rb:56:10:56:19 | After "b1 or b2" |  |
+| ifs.rb:56:10:56:19 | After "b1 or b2" | ifs.rb:56:5:56:19 | call to puts |  |
+| ifs.rb:56:10:56:19 | Before "b1 or b2" | ifs.rb:56:11:56:18 | b1 or b2 |  |
 | ifs.rb:56:11:56:18 | b1 or b2 | ifs.rb:56:10:56:19 | "b1 or b2" |  |
-| loops.rb:1:1:6:3 | enter m1 | loops.rb:1:8:1:8 | x |  |
-| loops.rb:1:1:6:3 | exit m1 (normal) | loops.rb:1:1:6:3 | exit m1 |  |
+| loops.rb:1:1:6:3 | Entry | loops.rb:1:8:1:8 | x |  |
+| loops.rb:1:1:6:3 | Normal Exit | loops.rb:1:1:6:3 | Exit |  |
 | loops.rb:1:1:6:3 | m1 | loops.rb:8:1:22:3 | m2 |  |
-| loops.rb:1:1:33:4 | enter loops.rb | loops.rb:1:1:6:3 | m1 |  |
-| loops.rb:1:1:33:4 | exit loops.rb (normal) | loops.rb:1:1:33:4 | exit loops.rb |  |
-| loops.rb:1:8:1:8 | x | loops.rb:2:9:2:9 | x |  |
-| loops.rb:2:3:5:5 | while ... | loops.rb:1:1:6:3 | exit m1 (normal) |  |
+| loops.rb:1:1:33:4 | Entry | loops.rb:1:1:6:3 | m1 |  |
+| loops.rb:1:1:33:4 | Normal Exit | loops.rb:1:1:33:4 | Exit |  |
+| loops.rb:1:8:1:8 | x | loops.rb:2:3:5:5 | ... |  |
+| loops.rb:2:3:5:5 | ... | loops.rb:2:3:5:5 | while ... |  |
+| loops.rb:2:3:5:5 | After ... | loops.rb:1:1:6:3 | Normal Exit |  |
+| loops.rb:2:3:5:5 | After while ... | loops.rb:2:3:5:5 | After ... |  |
+| loops.rb:2:3:5:5 | [LoopHeader] while ... | loops.rb:2:9:2:14 | Before ... >= ... |  |
+| loops.rb:2:3:5:5 | while ... | loops.rb:2:3:5:5 | [LoopHeader] while ... |  |
 | loops.rb:2:9:2:9 | x | loops.rb:2:14:2:14 | 0 |  |
-| loops.rb:2:9:2:14 | ... >= ... | loops.rb:2:3:5:5 | while ... | false |
-| loops.rb:2:9:2:14 | ... >= ... | loops.rb:3:5:3:10 | self | true |
+| loops.rb:2:9:2:14 | ... >= ... | loops.rb:2:9:2:14 | After ... >= ... [false] | false |
+| loops.rb:2:9:2:14 | ... >= ... | loops.rb:2:9:2:14 | After ... >= ... [true] | true |
+| loops.rb:2:9:2:14 | After ... >= ... [false] | loops.rb:2:3:5:5 | After while ... |  |
+| loops.rb:2:9:2:14 | After ... >= ... [true] | loops.rb:2:15:5:5 | do ... |  |
+| loops.rb:2:9:2:14 | Before ... >= ... | loops.rb:2:9:2:9 | x |  |
 | loops.rb:2:14:2:14 | 0 | loops.rb:2:9:2:14 | ... >= ... |  |
-| loops.rb:2:15:5:5 | do ... | loops.rb:2:9:2:9 | x |  |
-| loops.rb:3:5:3:10 | call to puts | loops.rb:4:5:4:5 | x |  |
+| loops.rb:2:15:5:5 | After do ... | loops.rb:2:3:5:5 | [LoopHeader] while ... |  |
+| loops.rb:2:15:5:5 | do ... | loops.rb:3:5:3:10 | Before call to puts |  |
+| loops.rb:3:5:3:10 | After call to puts | loops.rb:4:5:4:10 | Before ... = ... |  |
+| loops.rb:3:5:3:10 | Before call to puts | loops.rb:3:5:3:10 | self |  |
+| loops.rb:3:5:3:10 | call to puts | loops.rb:3:5:3:10 | After call to puts |  |
 | loops.rb:3:5:3:10 | self | loops.rb:3:10:3:10 | x |  |
 | loops.rb:3:10:3:10 | x | loops.rb:3:5:3:10 | call to puts |  |
-| loops.rb:4:5:4:5 | x | loops.rb:4:5:4:5 | x |  |
+| loops.rb:4:5:4:5 | x | loops.rb:4:7:4:8 | Before ... - ... |  |
 | loops.rb:4:5:4:5 | x | loops.rb:4:10:4:10 | 1 |  |
-| loops.rb:4:5:4:10 | ... = ... | loops.rb:2:15:5:5 | do ... |  |
-| loops.rb:4:7:4:8 | ... - ... | loops.rb:4:5:4:10 | ... = ... |  |
+| loops.rb:4:5:4:10 | ... = ... | loops.rb:4:5:4:10 | After ... = ... |  |
+| loops.rb:4:5:4:10 | After ... = ... | loops.rb:2:15:5:5 | After do ... |  |
+| loops.rb:4:5:4:10 | Before ... = ... | loops.rb:4:5:4:5 | x |  |
+| loops.rb:4:7:4:8 | ... - ... | loops.rb:4:7:4:8 | After ... - ... |  |
+| loops.rb:4:7:4:8 | After ... - ... | loops.rb:4:5:4:10 | ... = ... |  |
+| loops.rb:4:7:4:8 | Before ... - ... | loops.rb:4:5:4:5 | x |  |
 | loops.rb:4:10:4:10 | 1 | loops.rb:4:7:4:8 | ... - ... |  |
-| loops.rb:8:1:22:3 | enter m2 | loops.rb:8:8:8:8 | x |  |
-| loops.rb:8:1:22:3 | exit m2 (normal) | loops.rb:8:1:22:3 | exit m2 |  |
+| loops.rb:8:1:22:3 | Entry | loops.rb:8:8:8:8 | x |  |
+| loops.rb:8:1:22:3 | Normal Exit | loops.rb:8:1:22:3 | Exit |  |
 | loops.rb:8:1:22:3 | m2 | loops.rb:24:1:28:3 | m3 |  |
-| loops.rb:8:8:8:8 | x | loops.rb:9:9:9:9 | x |  |
-| loops.rb:9:3:20:5 | while ... | loops.rb:21:3:21:13 | self |  |
+| loops.rb:8:8:8:8 | x | loops.rb:9:3:21:13 | ... |  |
+| loops.rb:9:3:20:5 | After while ... | loops.rb:21:3:21:13 | Before call to puts |  |
+| loops.rb:9:3:20:5 | [LoopHeader] while ... | loops.rb:9:9:9:14 | Before ... >= ... |  |
+| loops.rb:9:3:20:5 | while ... | loops.rb:9:3:20:5 | [LoopHeader] while ... |  |
+| loops.rb:9:3:21:13 | ... | loops.rb:9:3:20:5 | while ... |  |
+| loops.rb:9:3:21:13 | After ... | loops.rb:8:1:22:3 | Normal Exit |  |
 | loops.rb:9:9:9:9 | x | loops.rb:9:14:9:14 | 0 |  |
-| loops.rb:9:9:9:14 | ... >= ... | loops.rb:9:3:20:5 | while ... | false |
-| loops.rb:9:9:9:14 | ... >= ... | loops.rb:10:5:10:10 | self | true |
+| loops.rb:9:9:9:14 | ... >= ... | loops.rb:9:9:9:14 | After ... >= ... [false] | false |
+| loops.rb:9:9:9:14 | ... >= ... | loops.rb:9:9:9:14 | After ... >= ... [true] | true |
+| loops.rb:9:9:9:14 | After ... >= ... [false] | loops.rb:9:3:20:5 | After while ... |  |
+| loops.rb:9:9:9:14 | After ... >= ... [true] | loops.rb:9:15:20:5 | do ... |  |
+| loops.rb:9:9:9:14 | Before ... >= ... | loops.rb:9:9:9:9 | x |  |
 | loops.rb:9:14:9:14 | 0 | loops.rb:9:9:9:14 | ... >= ... |  |
-| loops.rb:9:15:20:5 | do ... | loops.rb:9:9:9:9 | x |  |
-| loops.rb:10:5:10:10 | call to puts | loops.rb:11:5:11:5 | x |  |
+| loops.rb:9:15:20:5 | After do ... | loops.rb:9:3:20:5 | [LoopHeader] while ... |  |
+| loops.rb:9:15:20:5 | do ... | loops.rb:10:5:10:10 | Before call to puts |  |
+| loops.rb:10:5:10:10 | After call to puts | loops.rb:11:5:11:10 | Before ... = ... |  |
+| loops.rb:10:5:10:10 | Before call to puts | loops.rb:10:5:10:10 | self |  |
+| loops.rb:10:5:10:10 | call to puts | loops.rb:10:5:10:10 | After call to puts |  |
 | loops.rb:10:5:10:10 | self | loops.rb:10:10:10:10 | x |  |
 | loops.rb:10:10:10:10 | x | loops.rb:10:5:10:10 | call to puts |  |
-| loops.rb:11:5:11:5 | x | loops.rb:11:5:11:5 | x |  |
+| loops.rb:11:5:11:5 | x | loops.rb:11:7:11:8 | Before ... - ... |  |
 | loops.rb:11:5:11:5 | x | loops.rb:11:10:11:10 | 1 |  |
-| loops.rb:11:5:11:10 | ... = ... | loops.rb:12:8:12:8 | x |  |
-| loops.rb:11:7:11:8 | ... - ... | loops.rb:11:5:11:10 | ... = ... |  |
+| loops.rb:11:5:11:10 | ... = ... | loops.rb:11:5:11:10 | After ... = ... |  |
+| loops.rb:11:5:11:10 | After ... = ... | loops.rb:12:5:18:7 | if ... |  |
+| loops.rb:11:5:11:10 | Before ... = ... | loops.rb:11:5:11:5 | x |  |
+| loops.rb:11:7:11:8 | ... - ... | loops.rb:11:7:11:8 | After ... - ... |  |
+| loops.rb:11:7:11:8 | After ... - ... | loops.rb:11:5:11:10 | ... = ... |  |
+| loops.rb:11:7:11:8 | Before ... - ... | loops.rb:11:5:11:5 | x |  |
 | loops.rb:11:10:11:10 | 1 | loops.rb:11:7:11:8 | ... - ... |  |
-| loops.rb:12:5:18:7 | if ... | loops.rb:19:5:19:15 | self |  |
+| loops.rb:12:5:18:7 | After if ... | loops.rb:19:5:19:15 | Before call to puts |  |
+| loops.rb:12:5:18:7 | if ... | loops.rb:12:8:12:14 | Before ... > ... |  |
 | loops.rb:12:8:12:8 | x | loops.rb:12:12:12:14 | 100 |  |
-| loops.rb:12:8:12:14 | ... > ... | loops.rb:13:7:13:11 | break | true |
-| loops.rb:12:8:12:14 | ... > ... | loops.rb:14:11:14:11 | x | false |
+| loops.rb:12:8:12:14 | ... > ... | loops.rb:12:8:12:14 | After ... > ... [false] | false |
+| loops.rb:12:8:12:14 | ... > ... | loops.rb:12:8:12:14 | After ... > ... [true] | true |
+| loops.rb:12:8:12:14 | After ... > ... [false] | loops.rb:14:5:17:10 | elsif ... |  |
+| loops.rb:12:8:12:14 | After ... > ... [true] | loops.rb:12:15:13:11 | then ... |  |
+| loops.rb:12:8:12:14 | Before ... > ... | loops.rb:12:8:12:8 | x |  |
 | loops.rb:12:12:12:14 | 100 | loops.rb:12:8:12:14 | ... > ... |  |
-| loops.rb:13:7:13:11 | break | loops.rb:9:3:20:5 | while ... | break |
-| loops.rb:14:5:17:10 | elsif ... | loops.rb:12:5:18:7 | if ... |  |
+| loops.rb:12:15:13:11 | then ... | loops.rb:13:7:13:11 | Before break |  |
+| loops.rb:13:7:13:11 | Before break | loops.rb:13:7:13:11 | break |  |
+| loops.rb:13:7:13:11 | break | loops.rb:9:3:20:5 | After while ... | break |
+| loops.rb:14:5:17:10 | After elsif ... | loops.rb:12:5:18:7 | After if ... |  |
+| loops.rb:14:5:17:10 | elsif ... | loops.rb:14:11:14:16 | Before ... > ... |  |
 | loops.rb:14:11:14:11 | x | loops.rb:14:15:14:16 | 50 |  |
-| loops.rb:14:11:14:16 | ... > ... | loops.rb:15:7:15:10 | next | true |
-| loops.rb:14:11:14:16 | ... > ... | loops.rb:16:11:16:11 | x | false |
+| loops.rb:14:11:14:16 | ... > ... | loops.rb:14:11:14:16 | After ... > ... [false] | false |
+| loops.rb:14:11:14:16 | ... > ... | loops.rb:14:11:14:16 | After ... > ... [true] | true |
+| loops.rb:14:11:14:16 | After ... > ... [false] | loops.rb:16:5:17:10 | elsif ... |  |
+| loops.rb:14:11:14:16 | After ... > ... [true] | loops.rb:14:17:15:10 | then ... |  |
+| loops.rb:14:11:14:16 | Before ... > ... | loops.rb:14:11:14:11 | x |  |
 | loops.rb:14:15:14:16 | 50 | loops.rb:14:11:14:16 | ... > ... |  |
-| loops.rb:15:7:15:10 | next | loops.rb:9:9:9:9 | x | continue |
-| loops.rb:16:5:17:10 | elsif ... | loops.rb:14:5:17:10 | elsif ... |  |
+| loops.rb:14:17:15:10 | then ... | loops.rb:15:7:15:10 | Before next |  |
+| loops.rb:15:7:15:10 | Before next | loops.rb:15:7:15:10 | next |  |
+| loops.rb:15:7:15:10 | next | loops.rb:9:3:20:5 | [LoopHeader] while ... | continue |
+| loops.rb:16:5:17:10 | After elsif ... | loops.rb:14:5:17:10 | After elsif ... |  |
+| loops.rb:16:5:17:10 | elsif ... | loops.rb:16:11:16:16 | Before ... > ... |  |
 | loops.rb:16:11:16:11 | x | loops.rb:16:15:16:16 | 10 |  |
-| loops.rb:16:11:16:16 | ... > ... | loops.rb:16:5:17:10 | elsif ... | false |
-| loops.rb:16:11:16:16 | ... > ... | loops.rb:17:7:17:10 | redo | true |
+| loops.rb:16:11:16:16 | ... > ... | loops.rb:16:11:16:16 | After ... > ... [false] | false |
+| loops.rb:16:11:16:16 | ... > ... | loops.rb:16:11:16:16 | After ... > ... [true] | true |
+| loops.rb:16:11:16:16 | After ... > ... [false] | loops.rb:16:5:17:10 | After elsif ... |  |
+| loops.rb:16:11:16:16 | After ... > ... [true] | loops.rb:16:17:17:10 | then ... |  |
+| loops.rb:16:11:16:16 | Before ... > ... | loops.rb:16:11:16:11 | x |  |
 | loops.rb:16:15:16:16 | 10 | loops.rb:16:11:16:16 | ... > ... |  |
-| loops.rb:17:7:17:10 | redo | loops.rb:10:5:10:10 | self | redo |
-| loops.rb:19:5:19:15 | call to puts | loops.rb:9:15:20:5 | do ... |  |
-| loops.rb:19:5:19:15 | self | loops.rb:19:11:19:14 | Iter |  |
-| loops.rb:19:10:19:15 | "Iter" | loops.rb:19:5:19:15 | call to puts |  |
+| loops.rb:16:17:17:10 | then ... | loops.rb:17:7:17:10 | Before redo |  |
+| loops.rb:17:7:17:10 | Before redo | loops.rb:17:7:17:10 | redo |  |
+| loops.rb:17:7:17:10 | redo | loops.rb:9:15:20:5 | do ... | redo |
+| loops.rb:19:5:19:15 | After call to puts | loops.rb:9:15:20:5 | After do ... |  |
+| loops.rb:19:5:19:15 | Before call to puts | loops.rb:19:5:19:15 | self |  |
+| loops.rb:19:5:19:15 | call to puts | loops.rb:19:5:19:15 | After call to puts |  |
+| loops.rb:19:5:19:15 | self | loops.rb:19:10:19:15 | Before "Iter" |  |
+| loops.rb:19:10:19:15 | "Iter" | loops.rb:19:10:19:15 | After "Iter" |  |
+| loops.rb:19:10:19:15 | After "Iter" | loops.rb:19:5:19:15 | call to puts |  |
+| loops.rb:19:10:19:15 | Before "Iter" | loops.rb:19:11:19:14 | Iter |  |
 | loops.rb:19:11:19:14 | Iter | loops.rb:19:10:19:15 | "Iter" |  |
-| loops.rb:21:3:21:13 | call to puts | loops.rb:8:1:22:3 | exit m2 (normal) |  |
-| loops.rb:21:3:21:13 | self | loops.rb:21:9:21:12 | Done |  |
-| loops.rb:21:8:21:13 | "Done" | loops.rb:21:3:21:13 | call to puts |  |
+| loops.rb:21:3:21:13 | After call to puts | loops.rb:9:3:21:13 | After ... |  |
+| loops.rb:21:3:21:13 | Before call to puts | loops.rb:21:3:21:13 | self |  |
+| loops.rb:21:3:21:13 | call to puts | loops.rb:21:3:21:13 | After call to puts |  |
+| loops.rb:21:3:21:13 | self | loops.rb:21:8:21:13 | Before "Done" |  |
+| loops.rb:21:8:21:13 | "Done" | loops.rb:21:8:21:13 | After "Done" |  |
+| loops.rb:21:8:21:13 | After "Done" | loops.rb:21:3:21:13 | call to puts |  |
+| loops.rb:21:8:21:13 | Before "Done" | loops.rb:21:9:21:12 | Done |  |
 | loops.rb:21:9:21:12 | Done | loops.rb:21:8:21:13 | "Done" |  |
-| loops.rb:24:1:28:3 | enter m3 | loops.rb:25:3:25:9 | Array |  |
-| loops.rb:24:1:28:3 | exit m3 (normal) | loops.rb:24:1:28:3 | exit m3 |  |
+| loops.rb:24:1:28:3 | Entry | loops.rb:25:3:27:5 | ... |  |
+| loops.rb:24:1:28:3 | Normal Exit | loops.rb:24:1:28:3 | Exit |  |
 | loops.rb:24:1:28:3 | m3 | loops.rb:30:1:33:3 | m4 |  |
+| loops.rb:25:3:25:9 | After call to [] | loops.rb:25:16:27:5 | do ... end |  |
 | loops.rb:25:3:25:9 | Array | loops.rb:25:4:25:4 | 1 |  |
-| loops.rb:25:3:25:9 | call to [] | loops.rb:25:16:27:5 | do ... end |  |
-| loops.rb:25:3:27:5 | call to each | loops.rb:24:1:28:3 | exit m3 (normal) |  |
+| loops.rb:25:3:25:9 | Before call to [] | loops.rb:25:3:25:9 | Array |  |
+| loops.rb:25:3:25:9 | call to [] | loops.rb:25:3:25:9 | After call to [] |  |
+| loops.rb:25:3:27:5 | ... | loops.rb:25:3:27:5 | Before call to each |  |
+| loops.rb:25:3:27:5 | After ... | loops.rb:24:1:28:3 | Normal Exit |  |
+| loops.rb:25:3:27:5 | After call to each | loops.rb:25:3:27:5 | After ... |  |
+| loops.rb:25:3:27:5 | Before call to each | loops.rb:25:3:25:9 | Before call to [] |  |
+| loops.rb:25:3:27:5 | call to each | loops.rb:25:3:27:5 | After call to each |  |
 | loops.rb:25:4:25:4 | 1 | loops.rb:25:6:25:6 | 2 |  |
 | loops.rb:25:6:25:6 | 2 | loops.rb:25:8:25:8 | 3 |  |
 | loops.rb:25:8:25:8 | 3 | loops.rb:25:3:25:9 | call to [] |  |
+| loops.rb:25:16:27:5 | Entry | loops.rb:25:20:25:20 | x |  |
+| loops.rb:25:16:27:5 | Normal Exit | loops.rb:25:16:27:5 | Exit |  |
 | loops.rb:25:16:27:5 | do ... end | loops.rb:25:3:27:5 | call to each |  |
-| loops.rb:25:16:27:5 | enter do ... end | loops.rb:25:20:25:20 | x |  |
-| loops.rb:25:16:27:5 | exit do ... end (normal) | loops.rb:25:16:27:5 | exit do ... end |  |
-| loops.rb:25:20:25:20 | x | loops.rb:26:5:26:10 | self |  |
-| loops.rb:26:5:26:10 | call to puts | loops.rb:25:16:27:5 | exit do ... end (normal) |  |
+| loops.rb:25:20:25:20 | x | loops.rb:26:5:26:10 | ... |  |
+| loops.rb:26:5:26:10 | ... | loops.rb:26:5:26:10 | Before call to puts |  |
+| loops.rb:26:5:26:10 | After ... | loops.rb:25:16:27:5 | Normal Exit |  |
+| loops.rb:26:5:26:10 | After call to puts | loops.rb:26:5:26:10 | After ... |  |
+| loops.rb:26:5:26:10 | Before call to puts | loops.rb:26:5:26:10 | self |  |
+| loops.rb:26:5:26:10 | call to puts | loops.rb:26:5:26:10 | After call to puts |  |
 | loops.rb:26:5:26:10 | self | loops.rb:26:10:26:10 | x |  |
 | loops.rb:26:10:26:10 | x | loops.rb:26:5:26:10 | call to puts |  |
-| loops.rb:30:1:33:3 | enter m4 | loops.rb:30:8:30:8 | x |  |
-| loops.rb:30:1:33:3 | exit m4 (normal) | loops.rb:30:1:33:3 | exit m4 |  |
-| loops.rb:30:1:33:3 | m4 | loops.rb:1:1:33:4 | exit loops.rb (normal) |  |
+| loops.rb:30:1:33:3 | Entry | loops.rb:30:8:30:8 | x |  |
+| loops.rb:30:1:33:3 | Normal Exit | loops.rb:30:1:33:3 | Exit |  |
+| loops.rb:30:1:33:3 | m4 | loops.rb:1:1:33:4 | Normal Exit |  |
 | loops.rb:30:8:30:8 | x | loops.rb:30:11:30:11 | y |  |
-| loops.rb:30:11:30:11 | y | loops.rb:31:9:31:9 | x |  |
-| loops.rb:31:3:32:5 | while ... | loops.rb:30:1:33:3 | exit m4 (normal) |  |
+| loops.rb:30:11:30:11 | y | loops.rb:31:3:32:5 | ... |  |
+| loops.rb:31:3:32:5 | ... | loops.rb:31:3:32:5 | while ... |  |
+| loops.rb:31:3:32:5 | After ... | loops.rb:30:1:33:3 | Normal Exit |  |
+| loops.rb:31:3:32:5 | After while ... | loops.rb:31:3:32:5 | After ... |  |
+| loops.rb:31:3:32:5 | [LoopHeader] while ... | loops.rb:31:9:31:13 | Before ... < ... |  |
+| loops.rb:31:3:32:5 | while ... | loops.rb:31:3:32:5 | [LoopHeader] while ... |  |
 | loops.rb:31:9:31:9 | x | loops.rb:31:13:31:13 | y |  |
-| loops.rb:31:9:31:13 | ... < ... | loops.rb:31:3:32:5 | while ... | false |
-| loops.rb:31:9:31:13 | ... < ... | loops.rb:31:15:32:5 | do ... | true |
+| loops.rb:31:9:31:13 | ... < ... | loops.rb:31:9:31:13 | After ... < ... [false] | false |
+| loops.rb:31:9:31:13 | ... < ... | loops.rb:31:9:31:13 | After ... < ... [true] | true |
+| loops.rb:31:9:31:13 | After ... < ... [false] | loops.rb:31:3:32:5 | After while ... |  |
+| loops.rb:31:9:31:13 | After ... < ... [true] | loops.rb:31:15:32:5 | do ... |  |
+| loops.rb:31:9:31:13 | Before ... < ... | loops.rb:31:9:31:9 | x |  |
 | loops.rb:31:13:31:13 | y | loops.rb:31:9:31:13 | ... < ... |  |
-| loops.rb:31:15:32:5 | do ... | loops.rb:31:9:31:9 | x |  |
+| loops.rb:31:15:32:5 | do ... | loops.rb:31:3:32:5 | [LoopHeader] while ... |  |
+| raise.rb:1:1:2:3 | After ExceptionA | raise.rb:4:1:5:3 | ExceptionB |  |
 | raise.rb:1:1:2:3 | ExceptionA | raise.rb:1:20:1:28 | Exception |  |
-| raise.rb:1:1:182:4 | enter raise.rb | raise.rb:1:1:2:3 | ExceptionA |  |
-| raise.rb:1:1:182:4 | exit raise.rb (normal) | raise.rb:1:1:182:4 | exit raise.rb |  |
-| raise.rb:1:20:1:28 | Exception | raise.rb:4:1:5:3 | ExceptionB |  |
+| raise.rb:1:1:182:4 | Entry | raise.rb:1:1:2:3 | ExceptionA |  |
+| raise.rb:1:1:182:4 | Normal Exit | raise.rb:1:1:182:4 | Exit |  |
+| raise.rb:1:20:1:28 | Exception | raise.rb:1:1:2:3 | After ExceptionA |  |
+| raise.rb:4:1:5:3 | After ExceptionB | raise.rb:7:1:12:3 | m1 |  |
 | raise.rb:4:1:5:3 | ExceptionB | raise.rb:4:20:4:28 | Exception |  |
-| raise.rb:4:20:4:28 | Exception | raise.rb:7:1:12:3 | m1 |  |
-| raise.rb:7:1:12:3 | enter m1 | raise.rb:7:8:7:8 | x |  |
-| raise.rb:7:1:12:3 | exit m1 (abnormal) | raise.rb:7:1:12:3 | exit m1 |  |
-| raise.rb:7:1:12:3 | exit m1 (normal) | raise.rb:7:1:12:3 | exit m1 |  |
+| raise.rb:4:20:4:28 | Exception | raise.rb:4:1:5:3 | After ExceptionB |  |
+| raise.rb:7:1:12:3 | Entry | raise.rb:7:8:7:8 | x |  |
+| raise.rb:7:1:12:3 | Exceptional Exit | raise.rb:7:1:12:3 | Exit |  |
+| raise.rb:7:1:12:3 | Normal Exit | raise.rb:7:1:12:3 | Exit |  |
 | raise.rb:7:1:12:3 | m1 | raise.rb:14:1:23:3 | m2 |  |
-| raise.rb:7:8:7:8 | x | raise.rb:8:6:8:6 | x |  |
-| raise.rb:8:3:10:5 | if ... | raise.rb:11:3:11:15 | self |  |
+| raise.rb:7:8:7:8 | x | raise.rb:8:3:11:15 | ... |  |
+| raise.rb:8:3:10:5 | After if ... | raise.rb:11:3:11:15 | Before call to puts |  |
+| raise.rb:8:3:10:5 | if ... | raise.rb:8:6:8:10 | Before ... > ... |  |
+| raise.rb:8:3:11:15 | ... | raise.rb:8:3:10:5 | if ... |  |
+| raise.rb:8:3:11:15 | After ... | raise.rb:7:1:12:3 | Normal Exit |  |
 | raise.rb:8:6:8:6 | x | raise.rb:8:10:8:10 | 2 |  |
-| raise.rb:8:6:8:10 | ... > ... | raise.rb:8:3:10:5 | if ... | false |
-| raise.rb:8:6:8:10 | ... > ... | raise.rb:9:5:9:17 | self | true |
+| raise.rb:8:6:8:10 | ... > ... | raise.rb:8:6:8:10 | After ... > ... [false] | false |
+| raise.rb:8:6:8:10 | ... > ... | raise.rb:8:6:8:10 | After ... > ... [true] | true |
+| raise.rb:8:6:8:10 | After ... > ... [false] | raise.rb:8:3:10:5 | After if ... |  |
+| raise.rb:8:6:8:10 | After ... > ... [true] | raise.rb:8:11:9:17 | then ... |  |
+| raise.rb:8:6:8:10 | Before ... > ... | raise.rb:8:6:8:6 | x |  |
 | raise.rb:8:10:8:10 | 2 | raise.rb:8:6:8:10 | ... > ... |  |
-| raise.rb:9:5:9:17 | call to raise | raise.rb:7:1:12:3 | exit m1 (abnormal) | exception |
-| raise.rb:9:5:9:17 | self | raise.rb:9:12:9:16 | x > 2 |  |
-| raise.rb:9:11:9:17 | "x > 2" | raise.rb:9:5:9:17 | call to raise |  |
+| raise.rb:8:11:9:17 | then ... | raise.rb:9:5:9:17 | Before call to raise |  |
+| raise.rb:9:5:9:17 | Before call to raise | raise.rb:9:5:9:17 | self |  |
+| raise.rb:9:5:9:17 | call to raise | raise.rb:7:1:12:3 | Exceptional Exit | exception |
+| raise.rb:9:5:9:17 | self | raise.rb:9:11:9:17 | Before "x > 2" |  |
+| raise.rb:9:11:9:17 | "x > 2" | raise.rb:9:11:9:17 | After "x > 2" |  |
+| raise.rb:9:11:9:17 | After "x > 2" | raise.rb:9:5:9:17 | call to raise |  |
+| raise.rb:9:11:9:17 | Before "x > 2" | raise.rb:9:12:9:16 | x > 2 |  |
 | raise.rb:9:12:9:16 | x > 2 | raise.rb:9:11:9:17 | "x > 2" |  |
-| raise.rb:11:3:11:15 | call to puts | raise.rb:7:1:12:3 | exit m1 (normal) |  |
-| raise.rb:11:3:11:15 | self | raise.rb:11:9:11:14 | x <= 2 |  |
-| raise.rb:11:8:11:15 | "x <= 2" | raise.rb:11:3:11:15 | call to puts |  |
+| raise.rb:11:3:11:15 | After call to puts | raise.rb:8:3:11:15 | After ... |  |
+| raise.rb:11:3:11:15 | Before call to puts | raise.rb:11:3:11:15 | self |  |
+| raise.rb:11:3:11:15 | call to puts | raise.rb:11:3:11:15 | After call to puts |  |
+| raise.rb:11:3:11:15 | self | raise.rb:11:8:11:15 | Before "x <= 2" |  |
+| raise.rb:11:8:11:15 | "x <= 2" | raise.rb:11:8:11:15 | After "x <= 2" |  |
+| raise.rb:11:8:11:15 | After "x <= 2" | raise.rb:11:3:11:15 | call to puts |  |
+| raise.rb:11:8:11:15 | Before "x <= 2" | raise.rb:11:9:11:14 | x <= 2 |  |
 | raise.rb:11:9:11:14 | x <= 2 | raise.rb:11:8:11:15 | "x <= 2" |  |
-| raise.rb:14:1:23:3 | enter m2 | raise.rb:14:8:14:8 | b |  |
-| raise.rb:14:1:23:3 | exit m2 (abnormal) | raise.rb:14:1:23:3 | exit m2 |  |
-| raise.rb:14:1:23:3 | exit m2 (normal) | raise.rb:14:1:23:3 | exit m2 |  |
+| raise.rb:14:1:23:3 | Entry | raise.rb:14:8:14:8 | b |  |
+| raise.rb:14:1:23:3 | Exceptional Exit | raise.rb:14:1:23:3 | Exit |  |
+| raise.rb:14:1:23:3 | Normal Exit | raise.rb:14:1:23:3 | Exit |  |
 | raise.rb:14:1:23:3 | m2 | raise.rb:25:1:34:3 | m3 |  |
-| raise.rb:14:8:14:8 | b | raise.rb:16:8:16:8 | b |  |
-| raise.rb:16:5:18:7 | if ... | raise.rb:22:3:22:15 | self |  |
-| raise.rb:16:8:16:8 | b | raise.rb:16:5:18:7 | if ... | false |
-| raise.rb:16:8:16:8 | b | raise.rb:17:7:17:22 | self | true |
-| raise.rb:17:7:17:22 | call to raise | raise.rb:19:10:19:19 | ExceptionA | exception |
+| raise.rb:14:8:14:8 | b | raise.rb:15:3:22:15 | ... |  |
+| raise.rb:15:3:21:5 | After begin ...  | raise.rb:22:3:22:15 | Before call to puts |  |
+| raise.rb:15:3:21:5 | begin ...  | raise.rb:16:5:18:7 | if ... |  |
+| raise.rb:15:3:22:15 | ... | raise.rb:15:3:21:5 | begin ...  |  |
+| raise.rb:15:3:22:15 | After ... | raise.rb:14:1:23:3 | Normal Exit |  |
+| raise.rb:16:5:18:7 | After if ... | raise.rb:15:3:21:5 | After begin ...  |  |
+| raise.rb:16:5:18:7 | if ... | raise.rb:16:8:16:8 | b |  |
+| raise.rb:16:8:16:8 | After b [false] | raise.rb:16:5:18:7 | After if ... |  |
+| raise.rb:16:8:16:8 | After b [true] | raise.rb:16:9:17:22 | then ... |  |
+| raise.rb:16:8:16:8 | b | raise.rb:16:8:16:8 | After b [false] | false |
+| raise.rb:16:8:16:8 | b | raise.rb:16:8:16:8 | After b [true] | true |
+| raise.rb:16:9:17:22 | then ... | raise.rb:17:7:17:22 | Before call to raise |  |
+| raise.rb:17:7:17:22 | Before call to raise | raise.rb:17:7:17:22 | self |  |
+| raise.rb:17:7:17:22 | call to raise | raise.rb:19:3:20:18 | rescue ... | exception |
 | raise.rb:17:7:17:22 | self | raise.rb:17:13:17:22 | ExceptionA |  |
 | raise.rb:17:13:17:22 | ExceptionA | raise.rb:17:7:17:22 | call to raise |  |
-| raise.rb:19:3:20:18 | rescue ... | raise.rb:22:3:22:15 | self |  |
-| raise.rb:19:10:19:19 | ExceptionA | raise.rb:14:1:23:3 | exit m2 (abnormal) | exception |
-| raise.rb:19:10:19:19 | ExceptionA | raise.rb:20:5:20:18 | self | match |
-| raise.rb:19:20:20:18 | then ... | raise.rb:19:3:20:18 | rescue ... |  |
-| raise.rb:20:5:20:18 | call to puts | raise.rb:19:20:20:18 | then ... |  |
-| raise.rb:20:5:20:18 | self | raise.rb:20:11:20:17 | Rescued |  |
-| raise.rb:20:10:20:18 | "Rescued" | raise.rb:20:5:20:18 | call to puts |  |
+| raise.rb:19:3:20:18 | After rescue ... [no-match] | raise.rb:14:1:23:3 | Exceptional Exit | exception |
+| raise.rb:19:3:20:18 | rescue ... | raise.rb:19:10:19:19 | ExceptionA |  |
+| raise.rb:19:10:19:19 | After ExceptionA [match] | raise.rb:19:20:20:18 | then ... |  |
+| raise.rb:19:10:19:19 | After ExceptionA [no-match] | raise.rb:19:3:20:18 | After rescue ... [no-match] | no-match |
+| raise.rb:19:10:19:19 | ExceptionA | raise.rb:19:10:19:19 | After ExceptionA [match] | match |
+| raise.rb:19:10:19:19 | ExceptionA | raise.rb:19:10:19:19 | After ExceptionA [no-match] | no-match |
+| raise.rb:19:20:20:18 | After then ... | raise.rb:15:3:21:5 | After begin ...  |  |
+| raise.rb:19:20:20:18 | then ... | raise.rb:20:5:20:18 | Before call to puts |  |
+| raise.rb:20:5:20:18 | After call to puts | raise.rb:19:20:20:18 | After then ... |  |
+| raise.rb:20:5:20:18 | Before call to puts | raise.rb:20:5:20:18 | self |  |
+| raise.rb:20:5:20:18 | call to puts | raise.rb:20:5:20:18 | After call to puts |  |
+| raise.rb:20:5:20:18 | self | raise.rb:20:10:20:18 | Before "Rescued" |  |
+| raise.rb:20:10:20:18 | "Rescued" | raise.rb:20:10:20:18 | After "Rescued" |  |
+| raise.rb:20:10:20:18 | After "Rescued" | raise.rb:20:5:20:18 | call to puts |  |
+| raise.rb:20:10:20:18 | Before "Rescued" | raise.rb:20:11:20:17 | Rescued |  |
 | raise.rb:20:11:20:17 | Rescued | raise.rb:20:10:20:18 | "Rescued" |  |
-| raise.rb:22:3:22:15 | call to puts | raise.rb:14:1:23:3 | exit m2 (normal) |  |
-| raise.rb:22:3:22:15 | self | raise.rb:22:9:22:14 | End m2 |  |
-| raise.rb:22:8:22:15 | "End m2" | raise.rb:22:3:22:15 | call to puts |  |
+| raise.rb:22:3:22:15 | After call to puts | raise.rb:15:3:22:15 | After ... |  |
+| raise.rb:22:3:22:15 | Before call to puts | raise.rb:22:3:22:15 | self |  |
+| raise.rb:22:3:22:15 | call to puts | raise.rb:22:3:22:15 | After call to puts |  |
+| raise.rb:22:3:22:15 | self | raise.rb:22:8:22:15 | Before "End m2" |  |
+| raise.rb:22:8:22:15 | "End m2" | raise.rb:22:8:22:15 | After "End m2" |  |
+| raise.rb:22:8:22:15 | After "End m2" | raise.rb:22:3:22:15 | call to puts |  |
+| raise.rb:22:8:22:15 | Before "End m2" | raise.rb:22:9:22:14 | End m2 |  |
 | raise.rb:22:9:22:14 | End m2 | raise.rb:22:8:22:15 | "End m2" |  |
-| raise.rb:25:1:34:3 | enter m3 | raise.rb:25:8:25:8 | b |  |
-| raise.rb:25:1:34:3 | exit m3 (normal) | raise.rb:25:1:34:3 | exit m3 |  |
+| raise.rb:25:1:34:3 | Entry | raise.rb:25:8:25:8 | b |  |
+| raise.rb:25:1:34:3 | Normal Exit | raise.rb:25:1:34:3 | Exit |  |
 | raise.rb:25:1:34:3 | m3 | raise.rb:36:1:45:3 | m4 |  |
-| raise.rb:25:8:25:8 | b | raise.rb:27:8:27:8 | b |  |
-| raise.rb:27:5:29:7 | if ... | raise.rb:33:3:33:15 | self |  |
-| raise.rb:27:8:27:8 | b | raise.rb:27:5:29:7 | if ... | false |
-| raise.rb:27:8:27:8 | b | raise.rb:28:7:28:22 | self | true |
-| raise.rb:28:7:28:22 | call to raise | raise.rb:31:5:31:18 | self | exception |
+| raise.rb:25:8:25:8 | b | raise.rb:26:3:33:15 | ... |  |
+| raise.rb:26:3:32:5 | After begin ...  | raise.rb:33:3:33:15 | Before call to puts |  |
+| raise.rb:26:3:32:5 | begin ...  | raise.rb:27:5:29:7 | if ... |  |
+| raise.rb:26:3:33:15 | ... | raise.rb:26:3:32:5 | begin ...  |  |
+| raise.rb:26:3:33:15 | After ... | raise.rb:25:1:34:3 | Normal Exit |  |
+| raise.rb:27:5:29:7 | After if ... | raise.rb:26:3:32:5 | After begin ...  |  |
+| raise.rb:27:5:29:7 | if ... | raise.rb:27:8:27:8 | b |  |
+| raise.rb:27:8:27:8 | After b [false] | raise.rb:27:5:29:7 | After if ... |  |
+| raise.rb:27:8:27:8 | After b [true] | raise.rb:27:9:28:22 | then ... |  |
+| raise.rb:27:8:27:8 | b | raise.rb:27:8:27:8 | After b [false] | false |
+| raise.rb:27:8:27:8 | b | raise.rb:27:8:27:8 | After b [true] | true |
+| raise.rb:27:9:28:22 | then ... | raise.rb:28:7:28:22 | Before call to raise |  |
+| raise.rb:28:7:28:22 | Before call to raise | raise.rb:28:7:28:22 | self |  |
+| raise.rb:28:7:28:22 | call to raise | raise.rb:30:3:31:18 | rescue ... | exception |
 | raise.rb:28:7:28:22 | self | raise.rb:28:13:28:22 | ExceptionA |  |
 | raise.rb:28:13:28:22 | ExceptionA | raise.rb:28:7:28:22 | call to raise |  |
-| raise.rb:30:3:31:18 | rescue ... | raise.rb:33:3:33:15 | self |  |
-| raise.rb:30:9:31:18 | then ... | raise.rb:30:3:31:18 | rescue ... |  |
-| raise.rb:31:5:31:18 | call to puts | raise.rb:30:9:31:18 | then ... |  |
-| raise.rb:31:5:31:18 | self | raise.rb:31:11:31:17 | Rescued |  |
-| raise.rb:31:10:31:18 | "Rescued" | raise.rb:31:5:31:18 | call to puts |  |
+| raise.rb:30:3:31:18 | rescue ... | raise.rb:30:9:31:18 | then ... |  |
+| raise.rb:30:9:31:18 | After then ... | raise.rb:26:3:32:5 | After begin ...  |  |
+| raise.rb:30:9:31:18 | then ... | raise.rb:31:5:31:18 | Before call to puts |  |
+| raise.rb:31:5:31:18 | After call to puts | raise.rb:30:9:31:18 | After then ... |  |
+| raise.rb:31:5:31:18 | Before call to puts | raise.rb:31:5:31:18 | self |  |
+| raise.rb:31:5:31:18 | call to puts | raise.rb:31:5:31:18 | After call to puts |  |
+| raise.rb:31:5:31:18 | self | raise.rb:31:10:31:18 | Before "Rescued" |  |
+| raise.rb:31:10:31:18 | "Rescued" | raise.rb:31:10:31:18 | After "Rescued" |  |
+| raise.rb:31:10:31:18 | After "Rescued" | raise.rb:31:5:31:18 | call to puts |  |
+| raise.rb:31:10:31:18 | Before "Rescued" | raise.rb:31:11:31:17 | Rescued |  |
 | raise.rb:31:11:31:17 | Rescued | raise.rb:31:10:31:18 | "Rescued" |  |
-| raise.rb:33:3:33:15 | call to puts | raise.rb:25:1:34:3 | exit m3 (normal) |  |
-| raise.rb:33:3:33:15 | self | raise.rb:33:9:33:14 | End m3 |  |
-| raise.rb:33:8:33:15 | "End m3" | raise.rb:33:3:33:15 | call to puts |  |
+| raise.rb:33:3:33:15 | After call to puts | raise.rb:26:3:33:15 | After ... |  |
+| raise.rb:33:3:33:15 | Before call to puts | raise.rb:33:3:33:15 | self |  |
+| raise.rb:33:3:33:15 | call to puts | raise.rb:33:3:33:15 | After call to puts |  |
+| raise.rb:33:3:33:15 | self | raise.rb:33:8:33:15 | Before "End m3" |  |
+| raise.rb:33:8:33:15 | "End m3" | raise.rb:33:8:33:15 | After "End m3" |  |
+| raise.rb:33:8:33:15 | After "End m3" | raise.rb:33:3:33:15 | call to puts |  |
+| raise.rb:33:8:33:15 | Before "End m3" | raise.rb:33:9:33:14 | End m3 |  |
 | raise.rb:33:9:33:14 | End m3 | raise.rb:33:8:33:15 | "End m3" |  |
-| raise.rb:36:1:45:3 | enter m4 | raise.rb:36:8:36:8 | b |  |
-| raise.rb:36:1:45:3 | exit m4 (normal) | raise.rb:36:1:45:3 | exit m4 |  |
+| raise.rb:36:1:45:3 | Entry | raise.rb:36:8:36:8 | b |  |
+| raise.rb:36:1:45:3 | Normal Exit | raise.rb:36:1:45:3 | Exit |  |
 | raise.rb:36:1:45:3 | m4 | raise.rb:47:1:55:3 | m5 |  |
-| raise.rb:36:8:36:8 | b | raise.rb:38:8:38:8 | b |  |
-| raise.rb:38:5:40:7 | if ... | raise.rb:44:3:44:15 | self |  |
-| raise.rb:38:8:38:8 | b | raise.rb:38:5:40:7 | if ... | false |
-| raise.rb:38:8:38:8 | b | raise.rb:39:7:39:22 | self | true |
-| raise.rb:39:7:39:22 | call to raise | raise.rb:41:13:41:13 | e | exception |
+| raise.rb:36:8:36:8 | b | raise.rb:37:3:44:15 | ... |  |
+| raise.rb:37:3:43:5 | After begin ...  | raise.rb:44:3:44:15 | Before call to puts |  |
+| raise.rb:37:3:43:5 | begin ...  | raise.rb:38:5:40:7 | if ... |  |
+| raise.rb:37:3:44:15 | ... | raise.rb:37:3:43:5 | begin ...  |  |
+| raise.rb:37:3:44:15 | After ... | raise.rb:36:1:45:3 | Normal Exit |  |
+| raise.rb:38:5:40:7 | After if ... | raise.rb:37:3:43:5 | After begin ...  |  |
+| raise.rb:38:5:40:7 | if ... | raise.rb:38:8:38:8 | b |  |
+| raise.rb:38:8:38:8 | After b [false] | raise.rb:38:5:40:7 | After if ... |  |
+| raise.rb:38:8:38:8 | After b [true] | raise.rb:38:9:39:22 | then ... |  |
+| raise.rb:38:8:38:8 | b | raise.rb:38:8:38:8 | After b [false] | false |
+| raise.rb:38:8:38:8 | b | raise.rb:38:8:38:8 | After b [true] | true |
+| raise.rb:38:9:39:22 | then ... | raise.rb:39:7:39:22 | Before call to raise |  |
+| raise.rb:39:7:39:22 | Before call to raise | raise.rb:39:7:39:22 | self |  |
+| raise.rb:39:7:39:22 | call to raise | raise.rb:41:3:42:22 | rescue ... | exception |
 | raise.rb:39:7:39:22 | self | raise.rb:39:13:39:22 | ExceptionA |  |
 | raise.rb:39:13:39:22 | ExceptionA | raise.rb:39:7:39:22 | call to raise |  |
-| raise.rb:41:3:42:22 | rescue ... | raise.rb:44:3:44:15 | self |  |
-| raise.rb:41:13:41:13 | e | raise.rb:42:5:42:22 | self |  |
-| raise.rb:41:14:42:22 | then ... | raise.rb:41:3:42:22 | rescue ... |  |
-| raise.rb:42:5:42:22 | call to puts | raise.rb:41:14:42:22 | then ... |  |
-| raise.rb:42:5:42:22 | self | raise.rb:42:11:42:21 | Rescued {e} |  |
-| raise.rb:42:10:42:22 | "Rescued {e}" | raise.rb:42:5:42:22 | call to puts |  |
+| raise.rb:41:3:42:22 | rescue ... | raise.rb:41:13:41:13 | e |  |
+| raise.rb:41:13:41:13 | e | raise.rb:41:14:42:22 | then ... |  |
+| raise.rb:41:14:42:22 | After then ... | raise.rb:37:3:43:5 | After begin ...  |  |
+| raise.rb:41:14:42:22 | then ... | raise.rb:42:5:42:22 | Before call to puts |  |
+| raise.rb:42:5:42:22 | After call to puts | raise.rb:41:14:42:22 | After then ... |  |
+| raise.rb:42:5:42:22 | Before call to puts | raise.rb:42:5:42:22 | self |  |
+| raise.rb:42:5:42:22 | call to puts | raise.rb:42:5:42:22 | After call to puts |  |
+| raise.rb:42:5:42:22 | self | raise.rb:42:10:42:22 | Before "Rescued {e}" |  |
+| raise.rb:42:10:42:22 | "Rescued {e}" | raise.rb:42:10:42:22 | After "Rescued {e}" |  |
+| raise.rb:42:10:42:22 | After "Rescued {e}" | raise.rb:42:5:42:22 | call to puts |  |
+| raise.rb:42:10:42:22 | Before "Rescued {e}" | raise.rb:42:11:42:21 | Rescued {e} |  |
 | raise.rb:42:11:42:21 | Rescued {e} | raise.rb:42:10:42:22 | "Rescued {e}" |  |
-| raise.rb:44:3:44:15 | call to puts | raise.rb:36:1:45:3 | exit m4 (normal) |  |
-| raise.rb:44:3:44:15 | self | raise.rb:44:9:44:14 | End m4 |  |
-| raise.rb:44:8:44:15 | "End m4" | raise.rb:44:3:44:15 | call to puts |  |
+| raise.rb:44:3:44:15 | After call to puts | raise.rb:37:3:44:15 | After ... |  |
+| raise.rb:44:3:44:15 | Before call to puts | raise.rb:44:3:44:15 | self |  |
+| raise.rb:44:3:44:15 | call to puts | raise.rb:44:3:44:15 | After call to puts |  |
+| raise.rb:44:3:44:15 | self | raise.rb:44:8:44:15 | Before "End m4" |  |
+| raise.rb:44:8:44:15 | "End m4" | raise.rb:44:8:44:15 | After "End m4" |  |
+| raise.rb:44:8:44:15 | After "End m4" | raise.rb:44:3:44:15 | call to puts |  |
+| raise.rb:44:8:44:15 | Before "End m4" | raise.rb:44:9:44:14 | End m4 |  |
 | raise.rb:44:9:44:14 | End m4 | raise.rb:44:8:44:15 | "End m4" |  |
-| raise.rb:47:1:55:3 | enter m5 | raise.rb:47:8:47:8 | b |  |
-| raise.rb:47:1:55:3 | exit m5 (normal) | raise.rb:47:1:55:3 | exit m5 |  |
+| raise.rb:47:1:55:3 | Entry | raise.rb:47:8:47:8 | b |  |
+| raise.rb:47:1:55:3 | Normal Exit | raise.rb:47:1:55:3 | Exit |  |
 | raise.rb:47:1:55:3 | m5 | raise.rb:57:1:66:3 | m6 |  |
-| raise.rb:47:8:47:8 | b | raise.rb:49:8:49:8 | b |  |
-| raise.rb:49:5:51:7 | if ... | raise.rb:54:3:54:15 | self |  |
-| raise.rb:49:8:49:8 | b | raise.rb:49:5:51:7 | if ... | false |
-| raise.rb:49:8:49:8 | b | raise.rb:50:7:50:22 | self | true |
-| raise.rb:50:7:50:22 | call to raise | raise.rb:52:13:52:13 | e | exception |
+| raise.rb:47:8:47:8 | b | raise.rb:48:3:54:15 | ... |  |
+| raise.rb:48:3:53:5 | After begin ...  | raise.rb:54:3:54:15 | Before call to puts |  |
+| raise.rb:48:3:53:5 | begin ...  | raise.rb:49:5:51:7 | if ... |  |
+| raise.rb:48:3:54:15 | ... | raise.rb:48:3:53:5 | begin ...  |  |
+| raise.rb:48:3:54:15 | After ... | raise.rb:47:1:55:3 | Normal Exit |  |
+| raise.rb:49:5:51:7 | After if ... | raise.rb:48:3:53:5 | After begin ...  |  |
+| raise.rb:49:5:51:7 | if ... | raise.rb:49:8:49:8 | b |  |
+| raise.rb:49:8:49:8 | After b [false] | raise.rb:49:5:51:7 | After if ... |  |
+| raise.rb:49:8:49:8 | After b [true] | raise.rb:49:9:50:22 | then ... |  |
+| raise.rb:49:8:49:8 | b | raise.rb:49:8:49:8 | After b [false] | false |
+| raise.rb:49:8:49:8 | b | raise.rb:49:8:49:8 | After b [true] | true |
+| raise.rb:49:9:50:22 | then ... | raise.rb:50:7:50:22 | Before call to raise |  |
+| raise.rb:50:7:50:22 | Before call to raise | raise.rb:50:7:50:22 | self |  |
+| raise.rb:50:7:50:22 | call to raise | raise.rb:52:3:52:13 | rescue ... | exception |
 | raise.rb:50:7:50:22 | self | raise.rb:50:13:50:22 | ExceptionA |  |
 | raise.rb:50:13:50:22 | ExceptionA | raise.rb:50:7:50:22 | call to raise |  |
-| raise.rb:52:3:52:13 | rescue ... | raise.rb:54:3:54:15 | self |  |
-| raise.rb:52:13:52:13 | e | raise.rb:52:3:52:13 | rescue ... |  |
-| raise.rb:54:3:54:15 | call to puts | raise.rb:47:1:55:3 | exit m5 (normal) |  |
-| raise.rb:54:3:54:15 | self | raise.rb:54:9:54:14 | End m5 |  |
-| raise.rb:54:8:54:15 | "End m5" | raise.rb:54:3:54:15 | call to puts |  |
+| raise.rb:52:3:52:13 | [CatchClauseEmptyBody] rescue ... | raise.rb:48:3:53:5 | After begin ...  |  |
+| raise.rb:52:3:52:13 | rescue ... | raise.rb:52:13:52:13 | e |  |
+| raise.rb:52:13:52:13 | e | raise.rb:52:3:52:13 | [CatchClauseEmptyBody] rescue ... |  |
+| raise.rb:54:3:54:15 | After call to puts | raise.rb:48:3:54:15 | After ... |  |
+| raise.rb:54:3:54:15 | Before call to puts | raise.rb:54:3:54:15 | self |  |
+| raise.rb:54:3:54:15 | call to puts | raise.rb:54:3:54:15 | After call to puts |  |
+| raise.rb:54:3:54:15 | self | raise.rb:54:8:54:15 | Before "End m5" |  |
+| raise.rb:54:8:54:15 | "End m5" | raise.rb:54:8:54:15 | After "End m5" |  |
+| raise.rb:54:8:54:15 | After "End m5" | raise.rb:54:3:54:15 | call to puts |  |
+| raise.rb:54:8:54:15 | Before "End m5" | raise.rb:54:9:54:14 | End m5 |  |
 | raise.rb:54:9:54:14 | End m5 | raise.rb:54:8:54:15 | "End m5" |  |
-| raise.rb:57:1:66:3 | enter m6 | raise.rb:57:8:57:8 | b |  |
-| raise.rb:57:1:66:3 | exit m6 (abnormal) | raise.rb:57:1:66:3 | exit m6 |  |
-| raise.rb:57:1:66:3 | exit m6 (normal) | raise.rb:57:1:66:3 | exit m6 |  |
+| raise.rb:57:1:66:3 | Entry | raise.rb:57:8:57:8 | b |  |
+| raise.rb:57:1:66:3 | Exceptional Exit | raise.rb:57:1:66:3 | Exit |  |
+| raise.rb:57:1:66:3 | Normal Exit | raise.rb:57:1:66:3 | Exit |  |
 | raise.rb:57:1:66:3 | m6 | raise.rb:68:1:77:3 | m7 |  |
-| raise.rb:57:8:57:8 | b | raise.rb:59:8:59:8 | b |  |
-| raise.rb:59:5:61:7 | if ... | raise.rb:65:3:65:15 | self |  |
-| raise.rb:59:8:59:8 | b | raise.rb:59:5:61:7 | if ... | false |
-| raise.rb:59:8:59:8 | b | raise.rb:60:7:60:22 | self | true |
-| raise.rb:60:7:60:22 | call to raise | raise.rb:62:10:62:19 | ExceptionA | exception |
+| raise.rb:57:8:57:8 | b | raise.rb:58:3:65:15 | ... |  |
+| raise.rb:58:3:64:5 | After begin ...  | raise.rb:65:3:65:15 | Before call to puts |  |
+| raise.rb:58:3:64:5 | begin ...  | raise.rb:59:5:61:7 | if ... |  |
+| raise.rb:58:3:65:15 | ... | raise.rb:58:3:64:5 | begin ...  |  |
+| raise.rb:58:3:65:15 | After ... | raise.rb:57:1:66:3 | Normal Exit |  |
+| raise.rb:59:5:61:7 | After if ... | raise.rb:58:3:64:5 | After begin ...  |  |
+| raise.rb:59:5:61:7 | if ... | raise.rb:59:8:59:8 | b |  |
+| raise.rb:59:8:59:8 | After b [false] | raise.rb:59:5:61:7 | After if ... |  |
+| raise.rb:59:8:59:8 | After b [true] | raise.rb:59:9:60:22 | then ... |  |
+| raise.rb:59:8:59:8 | b | raise.rb:59:8:59:8 | After b [false] | false |
+| raise.rb:59:8:59:8 | b | raise.rb:59:8:59:8 | After b [true] | true |
+| raise.rb:59:9:60:22 | then ... | raise.rb:60:7:60:22 | Before call to raise |  |
+| raise.rb:60:7:60:22 | Before call to raise | raise.rb:60:7:60:22 | self |  |
+| raise.rb:60:7:60:22 | call to raise | raise.rb:62:3:63:22 | rescue ... | exception |
 | raise.rb:60:7:60:22 | self | raise.rb:60:13:60:22 | ExceptionA |  |
 | raise.rb:60:13:60:22 | ExceptionA | raise.rb:60:7:60:22 | call to raise |  |
-| raise.rb:62:3:63:22 | rescue ... | raise.rb:65:3:65:15 | self |  |
-| raise.rb:62:10:62:19 | ExceptionA | raise.rb:62:22:62:31 | ExceptionB | no-match |
-| raise.rb:62:10:62:19 | ExceptionA | raise.rb:62:36:62:36 | e | match |
-| raise.rb:62:22:62:31 | ExceptionB | raise.rb:57:1:66:3 | exit m6 (abnormal) | exception |
-| raise.rb:62:22:62:31 | ExceptionB | raise.rb:62:36:62:36 | e | match |
-| raise.rb:62:36:62:36 | e | raise.rb:63:5:63:22 | self |  |
-| raise.rb:62:37:63:22 | then ... | raise.rb:62:3:63:22 | rescue ... |  |
-| raise.rb:63:5:63:22 | call to puts | raise.rb:62:37:63:22 | then ... |  |
-| raise.rb:63:5:63:22 | self | raise.rb:63:11:63:21 | Rescued {e} |  |
-| raise.rb:63:10:63:22 | "Rescued {e}" | raise.rb:63:5:63:22 | call to puts |  |
+| raise.rb:62:3:63:22 | After rescue ... [no-match] | raise.rb:57:1:66:3 | Exceptional Exit | exception |
+| raise.rb:62:3:63:22 | rescue ... | raise.rb:62:10:62:31 | Before ..., ... |  |
+| raise.rb:62:10:62:19 | ExceptionA | raise.rb:62:22:62:31 | ExceptionB |  |
+| raise.rb:62:10:62:31 | ..., ... | raise.rb:62:10:62:31 | After ..., ... [match] | match |
+| raise.rb:62:10:62:31 | ..., ... | raise.rb:62:10:62:31 | After ..., ... [no-match] | no-match |
+| raise.rb:62:10:62:31 | After ..., ... [match] | raise.rb:62:36:62:36 | e |  |
+| raise.rb:62:10:62:31 | After ..., ... [no-match] | raise.rb:62:3:63:22 | After rescue ... [no-match] | no-match |
+| raise.rb:62:10:62:31 | Before ..., ... | raise.rb:62:10:62:19 | ExceptionA |  |
+| raise.rb:62:22:62:31 | ExceptionB | raise.rb:62:10:62:31 | ..., ... |  |
+| raise.rb:62:36:62:36 | e | raise.rb:62:37:63:22 | then ... |  |
+| raise.rb:62:37:63:22 | After then ... | raise.rb:58:3:64:5 | After begin ...  |  |
+| raise.rb:62:37:63:22 | then ... | raise.rb:63:5:63:22 | Before call to puts |  |
+| raise.rb:63:5:63:22 | After call to puts | raise.rb:62:37:63:22 | After then ... |  |
+| raise.rb:63:5:63:22 | Before call to puts | raise.rb:63:5:63:22 | self |  |
+| raise.rb:63:5:63:22 | call to puts | raise.rb:63:5:63:22 | After call to puts |  |
+| raise.rb:63:5:63:22 | self | raise.rb:63:10:63:22 | Before "Rescued {e}" |  |
+| raise.rb:63:10:63:22 | "Rescued {e}" | raise.rb:63:10:63:22 | After "Rescued {e}" |  |
+| raise.rb:63:10:63:22 | After "Rescued {e}" | raise.rb:63:5:63:22 | call to puts |  |
+| raise.rb:63:10:63:22 | Before "Rescued {e}" | raise.rb:63:11:63:21 | Rescued {e} |  |
 | raise.rb:63:11:63:21 | Rescued {e} | raise.rb:63:10:63:22 | "Rescued {e}" |  |
-| raise.rb:65:3:65:15 | call to puts | raise.rb:57:1:66:3 | exit m6 (normal) |  |
-| raise.rb:65:3:65:15 | self | raise.rb:65:9:65:14 | End m6 |  |
-| raise.rb:65:8:65:15 | "End m6" | raise.rb:65:3:65:15 | call to puts |  |
+| raise.rb:65:3:65:15 | After call to puts | raise.rb:58:3:65:15 | After ... |  |
+| raise.rb:65:3:65:15 | Before call to puts | raise.rb:65:3:65:15 | self |  |
+| raise.rb:65:3:65:15 | call to puts | raise.rb:65:3:65:15 | After call to puts |  |
+| raise.rb:65:3:65:15 | self | raise.rb:65:8:65:15 | Before "End m6" |  |
+| raise.rb:65:8:65:15 | "End m6" | raise.rb:65:8:65:15 | After "End m6" |  |
+| raise.rb:65:8:65:15 | After "End m6" | raise.rb:65:3:65:15 | call to puts |  |
+| raise.rb:65:8:65:15 | Before "End m6" | raise.rb:65:9:65:14 | End m6 |  |
 | raise.rb:65:9:65:14 | End m6 | raise.rb:65:8:65:15 | "End m6" |  |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:68:8:68:8 | x |  |
-| raise.rb:68:1:77:3 | exit m7 (abnormal) | raise.rb:68:1:77:3 | exit m7 |  |
-| raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:68:1:77:3 | exit m7 |  |
+| raise.rb:68:1:77:3 | Entry | raise.rb:68:8:68:8 | x |  |
+| raise.rb:68:1:77:3 | Exceptional Exit | raise.rb:68:1:77:3 | Exit |  |
+| raise.rb:68:1:77:3 | Normal Exit | raise.rb:68:1:77:3 | Exit |  |
 | raise.rb:68:1:77:3 | m7 | raise.rb:79:1:92:3 | m8 |  |
-| raise.rb:68:8:68:8 | x | raise.rb:69:6:69:6 | x |  |
-| raise.rb:69:3:73:5 | if ... | raise.rb:74:3:74:20 | self |  |
+| raise.rb:68:8:68:8 | x | raise.rb:69:3:76:15 | ... |  |
+| raise.rb:69:3:73:5 | After if ... | raise.rb:74:3:74:20 | Before call to puts |  |
+| raise.rb:69:3:73:5 | if ... | raise.rb:69:6:69:10 | Before ... > ... |  |
+| raise.rb:69:3:76:15 | ... | raise.rb:69:3:73:5 | if ... |  |
+| raise.rb:69:3:76:15 | After ... | raise.rb:68:1:77:3 | Normal Exit |  |
 | raise.rb:69:6:69:6 | x | raise.rb:69:10:69:10 | 2 |  |
-| raise.rb:69:6:69:10 | ... > ... | raise.rb:70:5:70:17 | self | true |
-| raise.rb:69:6:69:10 | ... > ... | raise.rb:71:9:71:9 | x | false |
-| raise.rb:69:6:69:10 | ... > ... | raise.rb:76:3:76:15 | [ensure: exception] self | exception |
+| raise.rb:69:6:69:10 | ... > ... | raise.rb:69:6:69:10 | After ... > ... [false] | false |
+| raise.rb:69:6:69:10 | ... > ... | raise.rb:69:6:69:10 | After ... > ... [true] | true |
+| raise.rb:69:6:69:10 | ... > ... | raise.rb:75:1:76:15 | ensure ... | exception |
+| raise.rb:69:6:69:10 | After ... > ... [false] | raise.rb:71:3:72:18 | elsif ... |  |
+| raise.rb:69:6:69:10 | After ... > ... [true] | raise.rb:69:11:70:17 | then ... |  |
+| raise.rb:69:6:69:10 | Before ... > ... | raise.rb:69:6:69:6 | x |  |
 | raise.rb:69:10:69:10 | 2 | raise.rb:69:6:69:10 | ... > ... |  |
-| raise.rb:70:5:70:17 | call to raise | raise.rb:76:3:76:15 | [ensure: exception] self | exception |
-| raise.rb:70:5:70:17 | self | raise.rb:70:12:70:16 | x > 2 |  |
-| raise.rb:70:11:70:17 | "x > 2" | raise.rb:70:5:70:17 | call to raise |  |
+| raise.rb:69:11:70:17 | then ... | raise.rb:70:5:70:17 | Before call to raise |  |
+| raise.rb:70:5:70:17 | Before call to raise | raise.rb:70:5:70:17 | self |  |
+| raise.rb:70:5:70:17 | call to raise | raise.rb:75:1:76:15 | ensure ... | exception |
+| raise.rb:70:5:70:17 | self | raise.rb:70:11:70:17 | Before "x > 2" |  |
+| raise.rb:70:11:70:17 | "x > 2" | raise.rb:70:11:70:17 | After "x > 2" |  |
+| raise.rb:70:11:70:17 | After "x > 2" | raise.rb:70:5:70:17 | call to raise |  |
+| raise.rb:70:11:70:17 | Before "x > 2" | raise.rb:70:12:70:16 | x > 2 |  |
 | raise.rb:70:12:70:16 | x > 2 | raise.rb:70:11:70:17 | "x > 2" |  |
-| raise.rb:71:3:72:18 | elsif ... | raise.rb:69:3:73:5 | if ... |  |
+| raise.rb:71:3:72:18 | After elsif ... | raise.rb:69:3:73:5 | After if ... |  |
+| raise.rb:71:3:72:18 | elsif ... | raise.rb:71:9:71:13 | Before ... < ... |  |
 | raise.rb:71:9:71:9 | x | raise.rb:71:13:71:13 | 0 |  |
-| raise.rb:71:9:71:13 | ... < ... | raise.rb:71:3:72:18 | elsif ... | false |
-| raise.rb:71:9:71:13 | ... < ... | raise.rb:72:13:72:17 | x < 0 | true |
-| raise.rb:71:9:71:13 | ... < ... | raise.rb:76:3:76:15 | [ensure: exception] self | exception |
+| raise.rb:71:9:71:13 | ... < ... | raise.rb:71:9:71:13 | After ... < ... [false] | false |
+| raise.rb:71:9:71:13 | ... < ... | raise.rb:71:9:71:13 | After ... < ... [true] | true |
+| raise.rb:71:9:71:13 | ... < ... | raise.rb:75:1:76:15 | ensure ... | exception |
+| raise.rb:71:9:71:13 | After ... < ... [false] | raise.rb:71:3:72:18 | After elsif ... |  |
+| raise.rb:71:9:71:13 | After ... < ... [true] | raise.rb:71:14:72:18 | then ... |  |
+| raise.rb:71:9:71:13 | Before ... < ... | raise.rb:71:9:71:9 | x |  |
 | raise.rb:71:13:71:13 | 0 | raise.rb:71:9:71:13 | ... < ... |  |
-| raise.rb:72:5:72:18 | return | raise.rb:76:3:76:15 | [ensure: return] self | return |
-| raise.rb:72:12:72:18 | "x < 0" | raise.rb:72:5:72:18 | return |  |
+| raise.rb:71:14:72:18 | then ... | raise.rb:72:5:72:18 | Before return |  |
+| raise.rb:72:5:72:18 | Before return | raise.rb:72:12:72:18 | Before "x < 0" |  |
+| raise.rb:72:5:72:18 | return | raise.rb:75:1:76:15 | ensure ... | return |
+| raise.rb:72:12:72:18 | "x < 0" | raise.rb:72:12:72:18 | After "x < 0" |  |
+| raise.rb:72:12:72:18 | After "x < 0" | raise.rb:72:5:72:18 | return |  |
+| raise.rb:72:12:72:18 | Before "x < 0" | raise.rb:72:13:72:17 | x < 0 |  |
 | raise.rb:72:13:72:17 | x < 0 | raise.rb:72:12:72:18 | "x < 0" |  |
-| raise.rb:74:3:74:20 | call to puts | raise.rb:76:3:76:15 | [ensure: exception] self | exception |
-| raise.rb:74:3:74:20 | call to puts | raise.rb:76:3:76:15 | self |  |
-| raise.rb:74:3:74:20 | self | raise.rb:74:9:74:19 | 0 <= x <= 2 |  |
-| raise.rb:74:8:74:20 | "0 <= x <= 2" | raise.rb:74:3:74:20 | call to puts |  |
+| raise.rb:74:3:74:20 | After call to puts | raise.rb:75:1:76:15 | ensure ... |  |
+| raise.rb:74:3:74:20 | Before call to puts | raise.rb:74:3:74:20 | self |  |
+| raise.rb:74:3:74:20 | call to puts | raise.rb:74:3:74:20 | After call to puts |  |
+| raise.rb:74:3:74:20 | call to puts | raise.rb:75:1:76:15 | ensure ... | exception |
+| raise.rb:74:3:74:20 | self | raise.rb:74:8:74:20 | Before "0 <= x <= 2" |  |
+| raise.rb:74:8:74:20 | "0 <= x <= 2" | raise.rb:74:8:74:20 | After "0 <= x <= 2" |  |
+| raise.rb:74:8:74:20 | After "0 <= x <= 2" | raise.rb:74:3:74:20 | call to puts |  |
+| raise.rb:74:8:74:20 | Before "0 <= x <= 2" | raise.rb:74:9:74:19 | 0 <= x <= 2 |  |
 | raise.rb:74:9:74:19 | 0 <= x <= 2 | raise.rb:74:8:74:20 | "0 <= x <= 2" |  |
-| raise.rb:75:1:76:15 | [ensure: exception] ensure ... | raise.rb:68:1:77:3 | exit m7 (abnormal) | exception |
-| raise.rb:75:1:76:15 | [ensure: return] ensure ... | raise.rb:68:1:77:3 | exit m7 (normal) | return |
-| raise.rb:75:1:76:15 | ensure ... | raise.rb:68:1:77:3 | exit m7 (normal) |  |
-| raise.rb:76:3:76:15 | [ensure: exception] call to puts | raise.rb:75:1:76:15 | [ensure: exception] ensure ... |  |
-| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:76:9:76:14 | [ensure: exception] ensure |  |
-| raise.rb:76:3:76:15 | [ensure: return] call to puts | raise.rb:75:1:76:15 | [ensure: return] ensure ... |  |
-| raise.rb:76:3:76:15 | [ensure: return] self | raise.rb:76:9:76:14 | [ensure: return] ensure |  |
-| raise.rb:76:3:76:15 | call to puts | raise.rb:75:1:76:15 | ensure ... |  |
-| raise.rb:76:3:76:15 | self | raise.rb:76:9:76:14 | ensure |  |
-| raise.rb:76:8:76:15 | "ensure" | raise.rb:76:3:76:15 | call to puts |  |
-| raise.rb:76:8:76:15 | [ensure: exception] "ensure" | raise.rb:76:3:76:15 | [ensure: exception] call to puts |  |
-| raise.rb:76:8:76:15 | [ensure: return] "ensure" | raise.rb:76:3:76:15 | [ensure: return] call to puts |  |
-| raise.rb:76:9:76:14 | [ensure: exception] ensure | raise.rb:76:8:76:15 | [ensure: exception] "ensure" |  |
-| raise.rb:76:9:76:14 | [ensure: return] ensure | raise.rb:76:8:76:15 | [ensure: return] "ensure" |  |
+| raise.rb:75:1:76:15 | After ensure ... | raise.rb:68:1:77:3 | Exceptional Exit | exception |
+| raise.rb:75:1:76:15 | After ensure ... | raise.rb:68:1:77:3 | Normal Exit | return |
+| raise.rb:75:1:76:15 | After ensure ... | raise.rb:69:3:76:15 | After ... |  |
+| raise.rb:75:1:76:15 | ensure ... | raise.rb:76:3:76:15 | Before call to puts |  |
+| raise.rb:76:3:76:15 | After call to puts | raise.rb:75:1:76:15 | After ensure ... |  |
+| raise.rb:76:3:76:15 | Before call to puts | raise.rb:76:3:76:15 | self |  |
+| raise.rb:76:3:76:15 | call to puts | raise.rb:76:3:76:15 | After call to puts |  |
+| raise.rb:76:3:76:15 | self | raise.rb:76:8:76:15 | Before "ensure" |  |
+| raise.rb:76:8:76:15 | "ensure" | raise.rb:76:8:76:15 | After "ensure" |  |
+| raise.rb:76:8:76:15 | After "ensure" | raise.rb:76:3:76:15 | call to puts |  |
+| raise.rb:76:8:76:15 | Before "ensure" | raise.rb:76:9:76:14 | ensure |  |
 | raise.rb:76:9:76:14 | ensure | raise.rb:76:8:76:15 | "ensure" |  |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:79:8:79:8 | x |  |
-| raise.rb:79:1:92:3 | exit m8 (abnormal) | raise.rb:79:1:92:3 | exit m8 |  |
-| raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:79:1:92:3 | exit m8 |  |
+| raise.rb:79:1:92:3 | Entry | raise.rb:79:8:79:8 | x |  |
+| raise.rb:79:1:92:3 | Exceptional Exit | raise.rb:79:1:92:3 | Exit |  |
+| raise.rb:79:1:92:3 | Normal Exit | raise.rb:79:1:92:3 | Exit |  |
 | raise.rb:79:1:92:3 | m8 | raise.rb:94:1:119:3 | m9 |  |
-| raise.rb:79:8:79:8 | x | raise.rb:80:3:80:17 | self |  |
-| raise.rb:80:3:80:17 | call to puts | raise.rb:82:8:82:8 | x |  |
-| raise.rb:80:3:80:17 | self | raise.rb:80:9:80:16 | Begin m8 |  |
-| raise.rb:80:8:80:17 | "Begin m8" | raise.rb:80:3:80:17 | call to puts |  |
+| raise.rb:79:8:79:8 | x | raise.rb:80:3:91:15 | ... |  |
+| raise.rb:80:3:80:17 | After call to puts | raise.rb:81:3:90:5 | begin ...  |  |
+| raise.rb:80:3:80:17 | Before call to puts | raise.rb:80:3:80:17 | self |  |
+| raise.rb:80:3:80:17 | call to puts | raise.rb:80:3:80:17 | After call to puts |  |
+| raise.rb:80:3:80:17 | self | raise.rb:80:8:80:17 | Before "Begin m8" |  |
+| raise.rb:80:3:91:15 | ... | raise.rb:80:3:80:17 | Before call to puts |  |
+| raise.rb:80:3:91:15 | After ... | raise.rb:79:1:92:3 | Normal Exit |  |
+| raise.rb:80:8:80:17 | "Begin m8" | raise.rb:80:8:80:17 | After "Begin m8" |  |
+| raise.rb:80:8:80:17 | After "Begin m8" | raise.rb:80:3:80:17 | call to puts |  |
+| raise.rb:80:8:80:17 | Before "Begin m8" | raise.rb:80:9:80:16 | Begin m8 |  |
 | raise.rb:80:9:80:16 | Begin m8 | raise.rb:80:8:80:17 | "Begin m8" |  |
-| raise.rb:82:5:86:7 | if ... | raise.rb:87:5:87:22 | self |  |
+| raise.rb:81:3:90:5 | After begin ...  | raise.rb:91:3:91:15 | Before call to puts |  |
+| raise.rb:81:3:90:5 | begin ...  | raise.rb:82:5:86:7 | if ... |  |
+| raise.rb:82:5:86:7 | After if ... | raise.rb:87:5:87:22 | Before call to puts |  |
+| raise.rb:82:5:86:7 | if ... | raise.rb:82:8:82:12 | Before ... > ... |  |
 | raise.rb:82:8:82:8 | x | raise.rb:82:12:82:12 | 2 |  |
-| raise.rb:82:8:82:12 | ... > ... | raise.rb:83:7:83:19 | self | true |
-| raise.rb:82:8:82:12 | ... > ... | raise.rb:84:11:84:11 | x | false |
-| raise.rb:82:8:82:12 | ... > ... | raise.rb:89:5:89:17 | [ensure: exception] self | exception |
+| raise.rb:82:8:82:12 | ... > ... | raise.rb:82:8:82:12 | After ... > ... [false] | false |
+| raise.rb:82:8:82:12 | ... > ... | raise.rb:82:8:82:12 | After ... > ... [true] | true |
+| raise.rb:82:8:82:12 | ... > ... | raise.rb:88:3:89:17 | ensure ... | exception |
+| raise.rb:82:8:82:12 | After ... > ... [false] | raise.rb:84:5:85:20 | elsif ... |  |
+| raise.rb:82:8:82:12 | After ... > ... [true] | raise.rb:82:13:83:19 | then ... |  |
+| raise.rb:82:8:82:12 | Before ... > ... | raise.rb:82:8:82:8 | x |  |
 | raise.rb:82:12:82:12 | 2 | raise.rb:82:8:82:12 | ... > ... |  |
-| raise.rb:83:7:83:19 | call to raise | raise.rb:89:5:89:17 | [ensure: exception] self | exception |
-| raise.rb:83:7:83:19 | self | raise.rb:83:14:83:18 | x > 2 |  |
-| raise.rb:83:13:83:19 | "x > 2" | raise.rb:83:7:83:19 | call to raise |  |
+| raise.rb:82:13:83:19 | then ... | raise.rb:83:7:83:19 | Before call to raise |  |
+| raise.rb:83:7:83:19 | Before call to raise | raise.rb:83:7:83:19 | self |  |
+| raise.rb:83:7:83:19 | call to raise | raise.rb:88:3:89:17 | ensure ... | exception |
+| raise.rb:83:7:83:19 | self | raise.rb:83:13:83:19 | Before "x > 2" |  |
+| raise.rb:83:13:83:19 | "x > 2" | raise.rb:83:13:83:19 | After "x > 2" |  |
+| raise.rb:83:13:83:19 | After "x > 2" | raise.rb:83:7:83:19 | call to raise |  |
+| raise.rb:83:13:83:19 | Before "x > 2" | raise.rb:83:14:83:18 | x > 2 |  |
 | raise.rb:83:14:83:18 | x > 2 | raise.rb:83:13:83:19 | "x > 2" |  |
-| raise.rb:84:5:85:20 | elsif ... | raise.rb:82:5:86:7 | if ... |  |
+| raise.rb:84:5:85:20 | After elsif ... | raise.rb:82:5:86:7 | After if ... |  |
+| raise.rb:84:5:85:20 | elsif ... | raise.rb:84:11:84:15 | Before ... < ... |  |
 | raise.rb:84:11:84:11 | x | raise.rb:84:15:84:15 | 0 |  |
-| raise.rb:84:11:84:15 | ... < ... | raise.rb:84:5:85:20 | elsif ... | false |
-| raise.rb:84:11:84:15 | ... < ... | raise.rb:85:15:85:19 | x < 0 | true |
-| raise.rb:84:11:84:15 | ... < ... | raise.rb:89:5:89:17 | [ensure: exception] self | exception |
+| raise.rb:84:11:84:15 | ... < ... | raise.rb:84:11:84:15 | After ... < ... [false] | false |
+| raise.rb:84:11:84:15 | ... < ... | raise.rb:84:11:84:15 | After ... < ... [true] | true |
+| raise.rb:84:11:84:15 | ... < ... | raise.rb:88:3:89:17 | ensure ... | exception |
+| raise.rb:84:11:84:15 | After ... < ... [false] | raise.rb:84:5:85:20 | After elsif ... |  |
+| raise.rb:84:11:84:15 | After ... < ... [true] | raise.rb:84:16:85:20 | then ... |  |
+| raise.rb:84:11:84:15 | Before ... < ... | raise.rb:84:11:84:11 | x |  |
 | raise.rb:84:15:84:15 | 0 | raise.rb:84:11:84:15 | ... < ... |  |
-| raise.rb:85:7:85:20 | return | raise.rb:89:5:89:17 | [ensure: return] self | return |
-| raise.rb:85:14:85:20 | "x < 0" | raise.rb:85:7:85:20 | return |  |
+| raise.rb:84:16:85:20 | then ... | raise.rb:85:7:85:20 | Before return |  |
+| raise.rb:85:7:85:20 | Before return | raise.rb:85:14:85:20 | Before "x < 0" |  |
+| raise.rb:85:7:85:20 | return | raise.rb:88:3:89:17 | ensure ... | return |
+| raise.rb:85:14:85:20 | "x < 0" | raise.rb:85:14:85:20 | After "x < 0" |  |
+| raise.rb:85:14:85:20 | After "x < 0" | raise.rb:85:7:85:20 | return |  |
+| raise.rb:85:14:85:20 | Before "x < 0" | raise.rb:85:15:85:19 | x < 0 |  |
 | raise.rb:85:15:85:19 | x < 0 | raise.rb:85:14:85:20 | "x < 0" |  |
-| raise.rb:87:5:87:22 | call to puts | raise.rb:89:5:89:17 | [ensure: exception] self | exception |
-| raise.rb:87:5:87:22 | call to puts | raise.rb:89:5:89:17 | self |  |
-| raise.rb:87:5:87:22 | self | raise.rb:87:11:87:21 | 0 <= x <= 2 |  |
-| raise.rb:87:10:87:22 | "0 <= x <= 2" | raise.rb:87:5:87:22 | call to puts |  |
+| raise.rb:87:5:87:22 | After call to puts | raise.rb:88:3:89:17 | ensure ... |  |
+| raise.rb:87:5:87:22 | Before call to puts | raise.rb:87:5:87:22 | self |  |
+| raise.rb:87:5:87:22 | call to puts | raise.rb:87:5:87:22 | After call to puts |  |
+| raise.rb:87:5:87:22 | call to puts | raise.rb:88:3:89:17 | ensure ... | exception |
+| raise.rb:87:5:87:22 | self | raise.rb:87:10:87:22 | Before "0 <= x <= 2" |  |
+| raise.rb:87:10:87:22 | "0 <= x <= 2" | raise.rb:87:10:87:22 | After "0 <= x <= 2" |  |
+| raise.rb:87:10:87:22 | After "0 <= x <= 2" | raise.rb:87:5:87:22 | call to puts |  |
+| raise.rb:87:10:87:22 | Before "0 <= x <= 2" | raise.rb:87:11:87:21 | 0 <= x <= 2 |  |
 | raise.rb:87:11:87:21 | 0 <= x <= 2 | raise.rb:87:10:87:22 | "0 <= x <= 2" |  |
-| raise.rb:88:3:89:17 | [ensure: exception] ensure ... | raise.rb:79:1:92:3 | exit m8 (abnormal) | exception |
-| raise.rb:88:3:89:17 | [ensure: return] ensure ... | raise.rb:79:1:92:3 | exit m8 (normal) | return |
-| raise.rb:88:3:89:17 | ensure ... | raise.rb:91:3:91:15 | self |  |
-| raise.rb:89:5:89:17 | [ensure: exception] call to puts | raise.rb:88:3:89:17 | [ensure: exception] ensure ... |  |
-| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:89:11:89:16 | [ensure: exception] ensure |  |
-| raise.rb:89:5:89:17 | [ensure: return] call to puts | raise.rb:88:3:89:17 | [ensure: return] ensure ... |  |
-| raise.rb:89:5:89:17 | [ensure: return] self | raise.rb:89:11:89:16 | [ensure: return] ensure |  |
-| raise.rb:89:5:89:17 | call to puts | raise.rb:88:3:89:17 | ensure ... |  |
-| raise.rb:89:5:89:17 | self | raise.rb:89:11:89:16 | ensure |  |
-| raise.rb:89:10:89:17 | "ensure" | raise.rb:89:5:89:17 | call to puts |  |
-| raise.rb:89:10:89:17 | [ensure: exception] "ensure" | raise.rb:89:5:89:17 | [ensure: exception] call to puts |  |
-| raise.rb:89:10:89:17 | [ensure: return] "ensure" | raise.rb:89:5:89:17 | [ensure: return] call to puts |  |
-| raise.rb:89:11:89:16 | [ensure: exception] ensure | raise.rb:89:10:89:17 | [ensure: exception] "ensure" |  |
-| raise.rb:89:11:89:16 | [ensure: return] ensure | raise.rb:89:10:89:17 | [ensure: return] "ensure" |  |
+| raise.rb:88:3:89:17 | After ensure ... | raise.rb:79:1:92:3 | Exceptional Exit | exception |
+| raise.rb:88:3:89:17 | After ensure ... | raise.rb:79:1:92:3 | Normal Exit | return |
+| raise.rb:88:3:89:17 | After ensure ... | raise.rb:81:3:90:5 | After begin ...  |  |
+| raise.rb:88:3:89:17 | ensure ... | raise.rb:89:5:89:17 | Before call to puts |  |
+| raise.rb:89:5:89:17 | After call to puts | raise.rb:88:3:89:17 | After ensure ... |  |
+| raise.rb:89:5:89:17 | Before call to puts | raise.rb:89:5:89:17 | self |  |
+| raise.rb:89:5:89:17 | call to puts | raise.rb:89:5:89:17 | After call to puts |  |
+| raise.rb:89:5:89:17 | self | raise.rb:89:10:89:17 | Before "ensure" |  |
+| raise.rb:89:10:89:17 | "ensure" | raise.rb:89:10:89:17 | After "ensure" |  |
+| raise.rb:89:10:89:17 | After "ensure" | raise.rb:89:5:89:17 | call to puts |  |
+| raise.rb:89:10:89:17 | Before "ensure" | raise.rb:89:11:89:16 | ensure |  |
 | raise.rb:89:11:89:16 | ensure | raise.rb:89:10:89:17 | "ensure" |  |
-| raise.rb:91:3:91:15 | call to puts | raise.rb:79:1:92:3 | exit m8 (normal) |  |
-| raise.rb:91:3:91:15 | self | raise.rb:91:9:91:14 | End m8 |  |
-| raise.rb:91:8:91:15 | "End m8" | raise.rb:91:3:91:15 | call to puts |  |
+| raise.rb:91:3:91:15 | After call to puts | raise.rb:80:3:91:15 | After ... |  |
+| raise.rb:91:3:91:15 | Before call to puts | raise.rb:91:3:91:15 | self |  |
+| raise.rb:91:3:91:15 | call to puts | raise.rb:91:3:91:15 | After call to puts |  |
+| raise.rb:91:3:91:15 | self | raise.rb:91:8:91:15 | Before "End m8" |  |
+| raise.rb:91:8:91:15 | "End m8" | raise.rb:91:8:91:15 | After "End m8" |  |
+| raise.rb:91:8:91:15 | After "End m8" | raise.rb:91:3:91:15 | call to puts |  |
+| raise.rb:91:8:91:15 | Before "End m8" | raise.rb:91:9:91:14 | End m8 |  |
 | raise.rb:91:9:91:14 | End m8 | raise.rb:91:8:91:15 | "End m8" |  |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:94:8:94:8 | x |  |
-| raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:94:1:119:3 | exit m9 |  |
-| raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:94:1:119:3 | exit m9 |  |
+| raise.rb:94:1:119:3 | Entry | raise.rb:94:8:94:8 | x |  |
+| raise.rb:94:1:119:3 | Exceptional Exit | raise.rb:94:1:119:3 | Exit |  |
+| raise.rb:94:1:119:3 | Normal Exit | raise.rb:94:1:119:3 | Exit |  |
 | raise.rb:94:1:119:3 | m9 | raise.rb:121:1:126:3 | m10 |  |
 | raise.rb:94:8:94:8 | x | raise.rb:94:11:94:12 | b1 |  |
 | raise.rb:94:11:94:12 | b1 | raise.rb:94:15:94:16 | b2 |  |
-| raise.rb:94:15:94:16 | b2 | raise.rb:95:3:95:17 | self |  |
-| raise.rb:95:3:95:17 | call to puts | raise.rb:97:8:97:8 | x |  |
-| raise.rb:95:3:95:17 | call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:95:3:95:17 | self | raise.rb:95:9:95:16 | Begin m9 |  |
-| raise.rb:95:8:95:17 | "Begin m9" | raise.rb:95:3:95:17 | call to puts |  |
+| raise.rb:94:15:94:16 | b2 | raise.rb:95:3:118:5 | ... |  |
+| raise.rb:95:3:95:17 | After call to puts | raise.rb:96:3:112:5 | begin ...  |  |
+| raise.rb:95:3:95:17 | Before call to puts | raise.rb:95:3:95:17 | self |  |
+| raise.rb:95:3:95:17 | call to puts | raise.rb:95:3:95:17 | After call to puts |  |
+| raise.rb:95:3:95:17 | call to puts | raise.rb:114:1:118:5 | ensure ... | exception |
+| raise.rb:95:3:95:17 | self | raise.rb:95:8:95:17 | Before "Begin m9" |  |
+| raise.rb:95:3:118:5 | ... | raise.rb:95:3:95:17 | Before call to puts |  |
+| raise.rb:95:3:118:5 | After ... | raise.rb:94:1:119:3 | Normal Exit |  |
+| raise.rb:95:8:95:17 | "Begin m9" | raise.rb:95:8:95:17 | After "Begin m9" |  |
+| raise.rb:95:8:95:17 | After "Begin m9" | raise.rb:95:3:95:17 | call to puts |  |
+| raise.rb:95:8:95:17 | Before "Begin m9" | raise.rb:95:9:95:16 | Begin m9 |  |
 | raise.rb:95:9:95:16 | Begin m9 | raise.rb:95:8:95:17 | "Begin m9" |  |
-| raise.rb:97:5:101:7 | if ... | raise.rb:102:5:102:22 | self |  |
+| raise.rb:96:3:112:5 | After begin ...  | raise.rb:113:3:113:15 | Before call to puts |  |
+| raise.rb:96:3:112:5 | begin ...  | raise.rb:97:5:101:7 | if ... |  |
+| raise.rb:97:5:101:7 | After if ... | raise.rb:102:5:102:22 | Before call to puts |  |
+| raise.rb:97:5:101:7 | if ... | raise.rb:97:8:97:12 | Before ... > ... |  |
 | raise.rb:97:8:97:8 | x | raise.rb:97:12:97:12 | 2 |  |
-| raise.rb:97:8:97:12 | ... > ... | raise.rb:98:7:98:19 | self | true |
-| raise.rb:97:8:97:12 | ... > ... | raise.rb:99:11:99:11 | x | false |
-| raise.rb:97:8:97:12 | ... > ... | raise.rb:104:5:104:23 | [ensure: exception] self | exception |
+| raise.rb:97:8:97:12 | ... > ... | raise.rb:97:8:97:12 | After ... > ... [false] | false |
+| raise.rb:97:8:97:12 | ... > ... | raise.rb:97:8:97:12 | After ... > ... [true] | true |
+| raise.rb:97:8:97:12 | ... > ... | raise.rb:103:3:111:7 | ensure ... | exception |
+| raise.rb:97:8:97:12 | After ... > ... [false] | raise.rb:99:5:100:20 | elsif ... |  |
+| raise.rb:97:8:97:12 | After ... > ... [true] | raise.rb:97:13:98:19 | then ... |  |
+| raise.rb:97:8:97:12 | Before ... > ... | raise.rb:97:8:97:8 | x |  |
 | raise.rb:97:12:97:12 | 2 | raise.rb:97:8:97:12 | ... > ... |  |
-| raise.rb:98:7:98:19 | call to raise | raise.rb:104:5:104:23 | [ensure: exception] self | exception |
-| raise.rb:98:7:98:19 | self | raise.rb:98:14:98:18 | x > 2 |  |
-| raise.rb:98:13:98:19 | "x > 2" | raise.rb:98:7:98:19 | call to raise |  |
+| raise.rb:97:13:98:19 | then ... | raise.rb:98:7:98:19 | Before call to raise |  |
+| raise.rb:98:7:98:19 | Before call to raise | raise.rb:98:7:98:19 | self |  |
+| raise.rb:98:7:98:19 | call to raise | raise.rb:103:3:111:7 | ensure ... | exception |
+| raise.rb:98:7:98:19 | self | raise.rb:98:13:98:19 | Before "x > 2" |  |
+| raise.rb:98:13:98:19 | "x > 2" | raise.rb:98:13:98:19 | After "x > 2" |  |
+| raise.rb:98:13:98:19 | After "x > 2" | raise.rb:98:7:98:19 | call to raise |  |
+| raise.rb:98:13:98:19 | Before "x > 2" | raise.rb:98:14:98:18 | x > 2 |  |
 | raise.rb:98:14:98:18 | x > 2 | raise.rb:98:13:98:19 | "x > 2" |  |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:97:5:101:7 | if ... |  |
+| raise.rb:99:5:100:20 | After elsif ... | raise.rb:97:5:101:7 | After if ... |  |
+| raise.rb:99:5:100:20 | elsif ... | raise.rb:99:11:99:15 | Before ... < ... |  |
 | raise.rb:99:11:99:11 | x | raise.rb:99:15:99:15 | 0 |  |
-| raise.rb:99:11:99:15 | ... < ... | raise.rb:99:5:100:20 | elsif ... | false |
-| raise.rb:99:11:99:15 | ... < ... | raise.rb:100:15:100:19 | x < 0 | true |
-| raise.rb:99:11:99:15 | ... < ... | raise.rb:104:5:104:23 | [ensure: exception] self | exception |
+| raise.rb:99:11:99:15 | ... < ... | raise.rb:99:11:99:15 | After ... < ... [false] | false |
+| raise.rb:99:11:99:15 | ... < ... | raise.rb:99:11:99:15 | After ... < ... [true] | true |
+| raise.rb:99:11:99:15 | ... < ... | raise.rb:103:3:111:7 | ensure ... | exception |
+| raise.rb:99:11:99:15 | After ... < ... [false] | raise.rb:99:5:100:20 | After elsif ... |  |
+| raise.rb:99:11:99:15 | After ... < ... [true] | raise.rb:99:16:100:20 | then ... |  |
+| raise.rb:99:11:99:15 | Before ... < ... | raise.rb:99:11:99:11 | x |  |
 | raise.rb:99:15:99:15 | 0 | raise.rb:99:11:99:15 | ... < ... |  |
-| raise.rb:100:7:100:20 | return | raise.rb:104:5:104:23 | [ensure: return] self | return |
-| raise.rb:100:14:100:20 | "x < 0" | raise.rb:100:7:100:20 | return |  |
+| raise.rb:99:16:100:20 | then ... | raise.rb:100:7:100:20 | Before return |  |
+| raise.rb:100:7:100:20 | Before return | raise.rb:100:14:100:20 | Before "x < 0" |  |
+| raise.rb:100:7:100:20 | return | raise.rb:103:3:111:7 | ensure ... | return |
+| raise.rb:100:14:100:20 | "x < 0" | raise.rb:100:14:100:20 | After "x < 0" |  |
+| raise.rb:100:14:100:20 | After "x < 0" | raise.rb:100:7:100:20 | return |  |
+| raise.rb:100:14:100:20 | Before "x < 0" | raise.rb:100:15:100:19 | x < 0 |  |
 | raise.rb:100:15:100:19 | x < 0 | raise.rb:100:14:100:20 | "x < 0" |  |
-| raise.rb:102:5:102:22 | call to puts | raise.rb:104:5:104:23 | [ensure: exception] self | exception |
-| raise.rb:102:5:102:22 | call to puts | raise.rb:104:5:104:23 | self |  |
-| raise.rb:102:5:102:22 | self | raise.rb:102:11:102:21 | 0 <= x <= 2 |  |
-| raise.rb:102:10:102:22 | "0 <= x <= 2" | raise.rb:102:5:102:22 | call to puts |  |
+| raise.rb:102:5:102:22 | After call to puts | raise.rb:103:3:111:7 | ensure ... |  |
+| raise.rb:102:5:102:22 | Before call to puts | raise.rb:102:5:102:22 | self |  |
+| raise.rb:102:5:102:22 | call to puts | raise.rb:102:5:102:22 | After call to puts |  |
+| raise.rb:102:5:102:22 | call to puts | raise.rb:103:3:111:7 | ensure ... | exception |
+| raise.rb:102:5:102:22 | self | raise.rb:102:10:102:22 | Before "0 <= x <= 2" |  |
+| raise.rb:102:10:102:22 | "0 <= x <= 2" | raise.rb:102:10:102:22 | After "0 <= x <= 2" |  |
+| raise.rb:102:10:102:22 | After "0 <= x <= 2" | raise.rb:102:5:102:22 | call to puts |  |
+| raise.rb:102:10:102:22 | Before "0 <= x <= 2" | raise.rb:102:11:102:21 | 0 <= x <= 2 |  |
 | raise.rb:102:11:102:21 | 0 <= x <= 2 | raise.rb:102:10:102:22 | "0 <= x <= 2" |  |
-| raise.rb:103:3:111:7 | [ensure: exception] ensure ... | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:103:3:111:7 | [ensure: return] ensure ... | raise.rb:115:3:115:22 | [ensure: return] self | return |
-| raise.rb:103:3:111:7 | ensure ... | raise.rb:113:3:113:15 | self |  |
-| raise.rb:104:5:104:23 | [ensure: exception] call to puts | raise.rb:106:10:106:11 | [ensure: exception] b1 |  |
-| raise.rb:104:5:104:23 | [ensure: exception] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:104:11:104:22 | [ensure: exception] outer ensure |  |
-| raise.rb:104:5:104:23 | [ensure: return] call to puts | raise.rb:106:10:106:11 | [ensure: return] b1 |  |
-| raise.rb:104:5:104:23 | [ensure: return] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:104:5:104:23 | [ensure: return] self | raise.rb:104:11:104:22 | [ensure: return] outer ensure |  |
-| raise.rb:104:5:104:23 | call to puts | raise.rb:106:10:106:11 | b1 |  |
-| raise.rb:104:5:104:23 | call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:104:5:104:23 | self | raise.rb:104:11:104:22 | outer ensure |  |
-| raise.rb:104:10:104:23 | "outer ensure" | raise.rb:104:5:104:23 | call to puts |  |
-| raise.rb:104:10:104:23 | [ensure: exception] "outer ensure" | raise.rb:104:5:104:23 | [ensure: exception] call to puts |  |
-| raise.rb:104:10:104:23 | [ensure: return] "outer ensure" | raise.rb:104:5:104:23 | [ensure: return] call to puts |  |
-| raise.rb:104:11:104:22 | [ensure: exception] outer ensure | raise.rb:104:10:104:23 | [ensure: exception] "outer ensure" |  |
-| raise.rb:104:11:104:22 | [ensure: return] outer ensure | raise.rb:104:10:104:23 | [ensure: return] "outer ensure" |  |
+| raise.rb:103:3:111:7 | After ensure ... | raise.rb:96:3:112:5 | After begin ...  |  |
+| raise.rb:103:3:111:7 | After ensure ... | raise.rb:114:1:118:5 | ensure ... | exception, return |
+| raise.rb:103:3:111:7 | ensure ... | raise.rb:104:5:104:23 | Before call to puts |  |
+| raise.rb:104:5:104:23 | After call to puts | raise.rb:105:5:111:7 | begin ...  |  |
+| raise.rb:104:5:104:23 | Before call to puts | raise.rb:104:5:104:23 | self |  |
+| raise.rb:104:5:104:23 | call to puts | raise.rb:104:5:104:23 | After call to puts |  |
+| raise.rb:104:5:104:23 | call to puts | raise.rb:114:1:118:5 | ensure ... | exception |
+| raise.rb:104:5:104:23 | self | raise.rb:104:10:104:23 | Before "outer ensure" |  |
+| raise.rb:104:10:104:23 | "outer ensure" | raise.rb:104:10:104:23 | After "outer ensure" |  |
+| raise.rb:104:10:104:23 | After "outer ensure" | raise.rb:104:5:104:23 | call to puts |  |
+| raise.rb:104:10:104:23 | Before "outer ensure" | raise.rb:104:11:104:22 | outer ensure |  |
 | raise.rb:104:11:104:22 | outer ensure | raise.rb:104:10:104:23 | "outer ensure" |  |
-| raise.rb:106:7:108:9 | [ensure: exception] if ... | raise.rb:110:7:110:25 | [ensure: exception] self |  |
-| raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:110:7:110:25 | [ensure: return] self |  |
-| raise.rb:106:7:108:9 | if ... | raise.rb:110:7:110:25 | self |  |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:106:7:108:9 | [ensure: exception] if ... | false |
-| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:107:9:107:26 | [ensure: exception] self | true |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:106:7:108:9 | [ensure: return] if ... | false |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:107:9:107:26 | [ensure: return] self | true |
-| raise.rb:106:10:106:11 | b1 | raise.rb:106:7:108:9 | if ... | false |
-| raise.rb:106:10:106:11 | b1 | raise.rb:107:9:107:26 | self | true |
-| raise.rb:107:9:107:26 | [ensure: exception] call to raise | raise.rb:110:7:110:25 | [ensure: exception, ensure(1): exception] self | exception |
-| raise.rb:107:9:107:26 | [ensure: exception] self | raise.rb:107:16:107:25 | [ensure: exception] b1 is true |  |
-| raise.rb:107:9:107:26 | [ensure: return] call to raise | raise.rb:110:7:110:25 | [ensure: return, ensure(1): exception] self | exception |
-| raise.rb:107:9:107:26 | [ensure: return] self | raise.rb:107:16:107:25 | [ensure: return] b1 is true |  |
-| raise.rb:107:9:107:26 | call to raise | raise.rb:110:7:110:25 | [ensure(1): exception] self | exception |
-| raise.rb:107:9:107:26 | self | raise.rb:107:16:107:25 | b1 is true |  |
-| raise.rb:107:15:107:26 | "b1 is true" | raise.rb:107:9:107:26 | call to raise |  |
-| raise.rb:107:15:107:26 | [ensure: exception] "b1 is true" | raise.rb:107:9:107:26 | [ensure: exception] call to raise |  |
-| raise.rb:107:15:107:26 | [ensure: return] "b1 is true" | raise.rb:107:9:107:26 | [ensure: return] call to raise |  |
-| raise.rb:107:16:107:25 | [ensure: exception] b1 is true | raise.rb:107:15:107:26 | [ensure: exception] "b1 is true" |  |
-| raise.rb:107:16:107:25 | [ensure: return] b1 is true | raise.rb:107:15:107:26 | [ensure: return] "b1 is true" |  |
+| raise.rb:105:5:111:7 | After begin ...  | raise.rb:103:3:111:7 | After ensure ... |  |
+| raise.rb:105:5:111:7 | begin ...  | raise.rb:106:7:108:9 | if ... |  |
+| raise.rb:106:7:108:9 | After if ... | raise.rb:109:5:110:25 | ensure ... |  |
+| raise.rb:106:7:108:9 | if ... | raise.rb:106:10:106:11 | b1 |  |
+| raise.rb:106:10:106:11 | After b1 [false] | raise.rb:106:7:108:9 | After if ... |  |
+| raise.rb:106:10:106:11 | After b1 [true] | raise.rb:106:12:107:26 | then ... |  |
+| raise.rb:106:10:106:11 | b1 | raise.rb:106:10:106:11 | After b1 [false] | false |
+| raise.rb:106:10:106:11 | b1 | raise.rb:106:10:106:11 | After b1 [true] | true |
+| raise.rb:106:12:107:26 | then ... | raise.rb:107:9:107:26 | Before call to raise |  |
+| raise.rb:107:9:107:26 | Before call to raise | raise.rb:107:9:107:26 | self |  |
+| raise.rb:107:9:107:26 | call to raise | raise.rb:109:5:110:25 | ensure ... | exception |
+| raise.rb:107:9:107:26 | self | raise.rb:107:15:107:26 | Before "b1 is true" |  |
+| raise.rb:107:15:107:26 | "b1 is true" | raise.rb:107:15:107:26 | After "b1 is true" |  |
+| raise.rb:107:15:107:26 | After "b1 is true" | raise.rb:107:9:107:26 | call to raise |  |
+| raise.rb:107:15:107:26 | Before "b1 is true" | raise.rb:107:16:107:25 | b1 is true |  |
 | raise.rb:107:16:107:25 | b1 is true | raise.rb:107:15:107:26 | "b1 is true" |  |
-| raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:109:5:110:25 | [ensure: exception] ensure ... | raise.rb:103:3:111:7 | [ensure: exception] ensure ... |  |
-| raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:103:3:111:7 | [ensure: return] ensure ... |  |
-| raise.rb:109:5:110:25 | ensure ... | raise.rb:103:3:111:7 | ensure ... |  |
-| raise.rb:110:7:110:25 | [ensure(1): exception] call to puts | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |  |
-| raise.rb:110:7:110:25 | [ensure(1): exception] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:110:7:110:25 | [ensure(1): exception] self | raise.rb:110:13:110:24 | [ensure(1): exception] inner ensure |  |
-| raise.rb:110:7:110:25 | [ensure: exception, ensure(1): exception] call to puts | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |  |
-| raise.rb:110:7:110:25 | [ensure: exception, ensure(1): exception] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:110:7:110:25 | [ensure: exception, ensure(1): exception] self | raise.rb:110:13:110:24 | [ensure: exception, ensure(1): exception] inner ensure |  |
-| raise.rb:110:7:110:25 | [ensure: exception] call to puts | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |  |
-| raise.rb:110:7:110:25 | [ensure: exception] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:110:7:110:25 | [ensure: exception] self | raise.rb:110:13:110:24 | [ensure: exception] inner ensure |  |
-| raise.rb:110:7:110:25 | [ensure: return, ensure(1): exception] call to puts | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |  |
-| raise.rb:110:7:110:25 | [ensure: return, ensure(1): exception] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:110:7:110:25 | [ensure: return, ensure(1): exception] self | raise.rb:110:13:110:24 | [ensure: return, ensure(1): exception] inner ensure |  |
-| raise.rb:110:7:110:25 | [ensure: return] call to puts | raise.rb:109:5:110:25 | [ensure: return] ensure ... |  |
-| raise.rb:110:7:110:25 | [ensure: return] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:110:7:110:25 | [ensure: return] self | raise.rb:110:13:110:24 | [ensure: return] inner ensure |  |
-| raise.rb:110:7:110:25 | call to puts | raise.rb:109:5:110:25 | ensure ... |  |
-| raise.rb:110:7:110:25 | call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:110:7:110:25 | self | raise.rb:110:13:110:24 | inner ensure |  |
-| raise.rb:110:12:110:25 | "inner ensure" | raise.rb:110:7:110:25 | call to puts |  |
-| raise.rb:110:12:110:25 | [ensure(1): exception] "inner ensure" | raise.rb:110:7:110:25 | [ensure(1): exception] call to puts |  |
-| raise.rb:110:12:110:25 | [ensure: exception, ensure(1): exception] "inner ensure" | raise.rb:110:7:110:25 | [ensure: exception, ensure(1): exception] call to puts |  |
-| raise.rb:110:12:110:25 | [ensure: exception] "inner ensure" | raise.rb:110:7:110:25 | [ensure: exception] call to puts |  |
-| raise.rb:110:12:110:25 | [ensure: return, ensure(1): exception] "inner ensure" | raise.rb:110:7:110:25 | [ensure: return, ensure(1): exception] call to puts |  |
-| raise.rb:110:12:110:25 | [ensure: return] "inner ensure" | raise.rb:110:7:110:25 | [ensure: return] call to puts |  |
-| raise.rb:110:13:110:24 | [ensure(1): exception] inner ensure | raise.rb:110:12:110:25 | [ensure(1): exception] "inner ensure" |  |
-| raise.rb:110:13:110:24 | [ensure: exception, ensure(1): exception] inner ensure | raise.rb:110:12:110:25 | [ensure: exception, ensure(1): exception] "inner ensure" |  |
-| raise.rb:110:13:110:24 | [ensure: exception] inner ensure | raise.rb:110:12:110:25 | [ensure: exception] "inner ensure" |  |
-| raise.rb:110:13:110:24 | [ensure: return, ensure(1): exception] inner ensure | raise.rb:110:12:110:25 | [ensure: return, ensure(1): exception] "inner ensure" |  |
-| raise.rb:110:13:110:24 | [ensure: return] inner ensure | raise.rb:110:12:110:25 | [ensure: return] "inner ensure" |  |
+| raise.rb:109:5:110:25 | After ensure ... | raise.rb:105:5:111:7 | After begin ...  |  |
+| raise.rb:109:5:110:25 | After ensure ... | raise.rb:114:1:118:5 | ensure ... | exception |
+| raise.rb:109:5:110:25 | ensure ... | raise.rb:110:7:110:25 | Before call to puts |  |
+| raise.rb:110:7:110:25 | After call to puts | raise.rb:109:5:110:25 | After ensure ... |  |
+| raise.rb:110:7:110:25 | Before call to puts | raise.rb:110:7:110:25 | self |  |
+| raise.rb:110:7:110:25 | call to puts | raise.rb:110:7:110:25 | After call to puts |  |
+| raise.rb:110:7:110:25 | call to puts | raise.rb:114:1:118:5 | ensure ... | exception |
+| raise.rb:110:7:110:25 | self | raise.rb:110:12:110:25 | Before "inner ensure" |  |
+| raise.rb:110:12:110:25 | "inner ensure" | raise.rb:110:12:110:25 | After "inner ensure" |  |
+| raise.rb:110:12:110:25 | After "inner ensure" | raise.rb:110:7:110:25 | call to puts |  |
+| raise.rb:110:12:110:25 | Before "inner ensure" | raise.rb:110:13:110:24 | inner ensure |  |
 | raise.rb:110:13:110:24 | inner ensure | raise.rb:110:12:110:25 | "inner ensure" |  |
-| raise.rb:113:3:113:15 | call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
-| raise.rb:113:3:113:15 | call to puts | raise.rb:115:3:115:22 | self |  |
-| raise.rb:113:3:113:15 | self | raise.rb:113:9:113:14 | End m9 |  |
-| raise.rb:113:8:113:15 | "End m9" | raise.rb:113:3:113:15 | call to puts |  |
+| raise.rb:113:3:113:15 | After call to puts | raise.rb:114:1:118:5 | ensure ... |  |
+| raise.rb:113:3:113:15 | Before call to puts | raise.rb:113:3:113:15 | self |  |
+| raise.rb:113:3:113:15 | call to puts | raise.rb:113:3:113:15 | After call to puts |  |
+| raise.rb:113:3:113:15 | call to puts | raise.rb:114:1:118:5 | ensure ... | exception |
+| raise.rb:113:3:113:15 | self | raise.rb:113:8:113:15 | Before "End m9" |  |
+| raise.rb:113:8:113:15 | "End m9" | raise.rb:113:8:113:15 | After "End m9" |  |
+| raise.rb:113:8:113:15 | After "End m9" | raise.rb:113:3:113:15 | call to puts |  |
+| raise.rb:113:8:113:15 | Before "End m9" | raise.rb:113:9:113:14 | End m9 |  |
 | raise.rb:113:9:113:14 | End m9 | raise.rb:113:8:113:15 | "End m9" |  |
-| raise.rb:114:1:118:5 | [ensure: exception] ensure ... | raise.rb:94:1:119:3 | exit m9 (abnormal) | exception |
-| raise.rb:114:1:118:5 | [ensure: return] ensure ... | raise.rb:94:1:119:3 | exit m9 (normal) | return |
-| raise.rb:114:1:118:5 | ensure ... | raise.rb:94:1:119:3 | exit m9 (normal) |  |
-| raise.rb:115:3:115:22 | [ensure: exception] call to puts | raise.rb:116:6:116:7 | [ensure: exception] b2 |  |
-| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:115:9:115:21 | [ensure: exception] method ensure |  |
-| raise.rb:115:3:115:22 | [ensure: return] call to puts | raise.rb:116:6:116:7 | [ensure: return] b2 |  |
-| raise.rb:115:3:115:22 | [ensure: return] self | raise.rb:115:9:115:21 | [ensure: return] method ensure |  |
-| raise.rb:115:3:115:22 | call to puts | raise.rb:116:6:116:7 | b2 |  |
-| raise.rb:115:3:115:22 | self | raise.rb:115:9:115:21 | method ensure |  |
-| raise.rb:115:8:115:22 | "method ensure" | raise.rb:115:3:115:22 | call to puts |  |
-| raise.rb:115:8:115:22 | [ensure: exception] "method ensure" | raise.rb:115:3:115:22 | [ensure: exception] call to puts |  |
-| raise.rb:115:8:115:22 | [ensure: return] "method ensure" | raise.rb:115:3:115:22 | [ensure: return] call to puts |  |
-| raise.rb:115:9:115:21 | [ensure: exception] method ensure | raise.rb:115:8:115:22 | [ensure: exception] "method ensure" |  |
-| raise.rb:115:9:115:21 | [ensure: return] method ensure | raise.rb:115:8:115:22 | [ensure: return] "method ensure" |  |
+| raise.rb:114:1:118:5 | After ensure ... | raise.rb:94:1:119:3 | Exceptional Exit | exception |
+| raise.rb:114:1:118:5 | After ensure ... | raise.rb:94:1:119:3 | Normal Exit | return |
+| raise.rb:114:1:118:5 | After ensure ... | raise.rb:95:3:118:5 | After ... |  |
+| raise.rb:114:1:118:5 | ensure ... | raise.rb:115:3:115:22 | Before call to puts |  |
+| raise.rb:115:3:115:22 | After call to puts | raise.rb:116:3:118:5 | if ... |  |
+| raise.rb:115:3:115:22 | Before call to puts | raise.rb:115:3:115:22 | self |  |
+| raise.rb:115:3:115:22 | call to puts | raise.rb:115:3:115:22 | After call to puts |  |
+| raise.rb:115:3:115:22 | self | raise.rb:115:8:115:22 | Before "method ensure" |  |
+| raise.rb:115:8:115:22 | "method ensure" | raise.rb:115:8:115:22 | After "method ensure" |  |
+| raise.rb:115:8:115:22 | After "method ensure" | raise.rb:115:3:115:22 | call to puts |  |
+| raise.rb:115:8:115:22 | Before "method ensure" | raise.rb:115:9:115:21 | method ensure |  |
 | raise.rb:115:9:115:21 | method ensure | raise.rb:115:8:115:22 | "method ensure" |  |
-| raise.rb:116:3:118:5 | [ensure: exception] if ... | raise.rb:114:1:118:5 | [ensure: exception] ensure ... |  |
-| raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:114:1:118:5 | [ensure: return] ensure ... |  |
-| raise.rb:116:3:118:5 | if ... | raise.rb:114:1:118:5 | ensure ... |  |
-| raise.rb:116:6:116:7 | [ensure: exception] b2 | raise.rb:116:3:118:5 | [ensure: exception] if ... | false |
-| raise.rb:116:6:116:7 | [ensure: exception] b2 | raise.rb:117:5:117:22 | [ensure: exception] self | true |
-| raise.rb:116:6:116:7 | [ensure: return] b2 | raise.rb:116:3:118:5 | [ensure: return] if ... | false |
-| raise.rb:116:6:116:7 | [ensure: return] b2 | raise.rb:117:5:117:22 | [ensure: return] self | true |
-| raise.rb:116:6:116:7 | b2 | raise.rb:116:3:118:5 | if ... | false |
-| raise.rb:116:6:116:7 | b2 | raise.rb:117:5:117:22 | self | true |
-| raise.rb:117:5:117:22 | [ensure: exception] call to raise | raise.rb:94:1:119:3 | exit m9 (abnormal) | exception |
-| raise.rb:117:5:117:22 | [ensure: exception] self | raise.rb:117:12:117:21 | [ensure: exception] b2 is true |  |
-| raise.rb:117:5:117:22 | [ensure: return] call to raise | raise.rb:94:1:119:3 | exit m9 (abnormal) | exception |
-| raise.rb:117:5:117:22 | [ensure: return] self | raise.rb:117:12:117:21 | [ensure: return] b2 is true |  |
-| raise.rb:117:5:117:22 | call to raise | raise.rb:94:1:119:3 | exit m9 (abnormal) | exception |
-| raise.rb:117:5:117:22 | self | raise.rb:117:12:117:21 | b2 is true |  |
-| raise.rb:117:11:117:22 | "b2 is true" | raise.rb:117:5:117:22 | call to raise |  |
-| raise.rb:117:11:117:22 | [ensure: exception] "b2 is true" | raise.rb:117:5:117:22 | [ensure: exception] call to raise |  |
-| raise.rb:117:11:117:22 | [ensure: return] "b2 is true" | raise.rb:117:5:117:22 | [ensure: return] call to raise |  |
-| raise.rb:117:12:117:21 | [ensure: exception] b2 is true | raise.rb:117:11:117:22 | [ensure: exception] "b2 is true" |  |
-| raise.rb:117:12:117:21 | [ensure: return] b2 is true | raise.rb:117:11:117:22 | [ensure: return] "b2 is true" |  |
+| raise.rb:116:3:118:5 | After if ... | raise.rb:114:1:118:5 | After ensure ... |  |
+| raise.rb:116:3:118:5 | if ... | raise.rb:116:6:116:7 | b2 |  |
+| raise.rb:116:6:116:7 | After b2 [false] | raise.rb:116:3:118:5 | After if ... |  |
+| raise.rb:116:6:116:7 | After b2 [true] | raise.rb:116:8:117:22 | then ... |  |
+| raise.rb:116:6:116:7 | b2 | raise.rb:116:6:116:7 | After b2 [false] | false |
+| raise.rb:116:6:116:7 | b2 | raise.rb:116:6:116:7 | After b2 [true] | true |
+| raise.rb:116:8:117:22 | then ... | raise.rb:117:5:117:22 | Before call to raise |  |
+| raise.rb:117:5:117:22 | Before call to raise | raise.rb:117:5:117:22 | self |  |
+| raise.rb:117:5:117:22 | call to raise | raise.rb:94:1:119:3 | Exceptional Exit | exception |
+| raise.rb:117:5:117:22 | self | raise.rb:117:11:117:22 | Before "b2 is true" |  |
+| raise.rb:117:11:117:22 | "b2 is true" | raise.rb:117:11:117:22 | After "b2 is true" |  |
+| raise.rb:117:11:117:22 | After "b2 is true" | raise.rb:117:5:117:22 | call to raise |  |
+| raise.rb:117:11:117:22 | Before "b2 is true" | raise.rb:117:12:117:21 | b2 is true |  |
 | raise.rb:117:12:117:21 | b2 is true | raise.rb:117:11:117:22 | "b2 is true" |  |
-| raise.rb:121:1:126:3 | enter m10 | raise.rb:121:9:121:9 | p |  |
-| raise.rb:121:1:126:3 | exit m10 (abnormal) | raise.rb:121:1:126:3 | exit m10 |  |
-| raise.rb:121:1:126:3 | exit m10 (normal) | raise.rb:121:1:126:3 | exit m10 |  |
+| raise.rb:121:1:126:3 | Entry | raise.rb:121:9:121:9 | p |  |
+| raise.rb:121:1:126:3 | Exceptional Exit | raise.rb:121:1:126:3 | Exit |  |
+| raise.rb:121:1:126:3 | Normal Exit | raise.rb:121:1:126:3 | Exit |  |
 | raise.rb:121:1:126:3 | m10 | raise.rb:128:1:140:3 | m11 |  |
-| raise.rb:121:9:121:9 | p | raise.rb:121:14:121:30 | self | false, no-match, true |
-| raise.rb:121:9:121:9 | p | raise.rb:125:3:125:51 | self | match |
-| raise.rb:121:14:121:30 | call to raise | raise.rb:121:1:126:3 | exit m10 (abnormal) | exception |
-| raise.rb:121:14:121:30 | self | raise.rb:121:21:121:29 | Exception |  |
-| raise.rb:121:20:121:30 | "Exception" | raise.rb:121:14:121:30 | call to raise |  |
+| raise.rb:121:9:121:9 | After p [match] | raise.rb:122:1:125:51 | ... |  |
+| raise.rb:121:9:121:9 | After p [no-match] | raise.rb:121:13:121:31 | ( ... ) |  |
+| raise.rb:121:9:121:9 | p | raise.rb:121:9:121:9 | After p [match] | match |
+| raise.rb:121:9:121:9 | p | raise.rb:121:9:121:9 | After p [no-match] | no-match |
+| raise.rb:121:13:121:31 | ( ... ) | raise.rb:121:14:121:30 | Before call to raise |  |
+| raise.rb:121:14:121:30 | Before call to raise | raise.rb:121:14:121:30 | self |  |
+| raise.rb:121:14:121:30 | call to raise | raise.rb:121:1:126:3 | Exceptional Exit | exception |
+| raise.rb:121:14:121:30 | self | raise.rb:121:20:121:30 | Before "Exception" |  |
+| raise.rb:121:20:121:30 | "Exception" | raise.rb:121:20:121:30 | After "Exception" |  |
+| raise.rb:121:20:121:30 | After "Exception" | raise.rb:121:14:121:30 | call to raise |  |
+| raise.rb:121:20:121:30 | Before "Exception" | raise.rb:121:21:121:29 | Exception |  |
 | raise.rb:121:21:121:29 | Exception | raise.rb:121:20:121:30 | "Exception" |  |
-| raise.rb:124:1:125:51 | ensure ... | raise.rb:121:1:126:3 | exit m10 (normal) |  |
-| raise.rb:125:3:125:51 | call to puts | raise.rb:124:1:125:51 | ensure ... |  |
-| raise.rb:125:3:125:51 | self | raise.rb:125:9:125:50 | Will not get executed if p is not supplied |  |
-| raise.rb:125:8:125:51 | "Will not get executed if p is..." | raise.rb:125:3:125:51 | call to puts |  |
+| raise.rb:122:1:125:51 | ... | raise.rb:124:1:125:51 | ensure ... |  |
+| raise.rb:122:1:125:51 | After ... | raise.rb:121:1:126:3 | Normal Exit |  |
+| raise.rb:124:1:125:51 | After ensure ... | raise.rb:122:1:125:51 | After ... |  |
+| raise.rb:124:1:125:51 | ensure ... | raise.rb:125:3:125:51 | Before call to puts |  |
+| raise.rb:125:3:125:51 | After call to puts | raise.rb:124:1:125:51 | After ensure ... |  |
+| raise.rb:125:3:125:51 | Before call to puts | raise.rb:125:3:125:51 | self |  |
+| raise.rb:125:3:125:51 | call to puts | raise.rb:125:3:125:51 | After call to puts |  |
+| raise.rb:125:3:125:51 | self | raise.rb:125:8:125:51 | Before "Will not get executed if p is..." |  |
+| raise.rb:125:8:125:51 | "Will not get executed if p is..." | raise.rb:125:8:125:51 | After "Will not get executed if p is..." |  |
+| raise.rb:125:8:125:51 | After "Will not get executed if p is..." | raise.rb:125:3:125:51 | call to puts |  |
+| raise.rb:125:8:125:51 | Before "Will not get executed if p is..." | raise.rb:125:9:125:50 | Will not get executed if p is not supplied |  |
 | raise.rb:125:9:125:50 | Will not get executed if p is not supplied | raise.rb:125:8:125:51 | "Will not get executed if p is..." |  |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:128:9:128:9 | b |  |
-| raise.rb:128:1:140:3 | exit m11 (abnormal) | raise.rb:128:1:140:3 | exit m11 |  |
-| raise.rb:128:1:140:3 | exit m11 (normal) | raise.rb:128:1:140:3 | exit m11 |  |
+| raise.rb:128:1:140:3 | Entry | raise.rb:128:9:128:9 | b |  |
+| raise.rb:128:1:140:3 | Exceptional Exit | raise.rb:128:1:140:3 | Exit |  |
+| raise.rb:128:1:140:3 | Normal Exit | raise.rb:128:1:140:3 | Exit |  |
 | raise.rb:128:1:140:3 | m11 | raise.rb:142:1:148:3 | m12 |  |
-| raise.rb:128:9:128:9 | b | raise.rb:130:8:130:8 | b |  |
-| raise.rb:130:5:132:7 | if ... | raise.rb:137:5:137:17 | self |  |
-| raise.rb:130:8:130:8 | b | raise.rb:130:5:132:7 | if ... | false |
-| raise.rb:130:8:130:8 | b | raise.rb:131:7:131:22 | self | true |
-| raise.rb:131:7:131:22 | call to raise | raise.rb:133:10:133:19 | ExceptionA | exception |
+| raise.rb:128:9:128:9 | b | raise.rb:129:3:139:16 | ... |  |
+| raise.rb:129:3:138:5 | After begin ...  | raise.rb:139:3:139:16 | Before call to puts |  |
+| raise.rb:129:3:138:5 | begin ...  | raise.rb:130:5:132:7 | if ... |  |
+| raise.rb:129:3:139:16 | ... | raise.rb:129:3:138:5 | begin ...  |  |
+| raise.rb:129:3:139:16 | After ... | raise.rb:128:1:140:3 | Normal Exit |  |
+| raise.rb:130:5:132:7 | After if ... | raise.rb:136:3:137:17 | ensure ... |  |
+| raise.rb:130:5:132:7 | if ... | raise.rb:130:8:130:8 | b |  |
+| raise.rb:130:8:130:8 | After b [false] | raise.rb:130:5:132:7 | After if ... |  |
+| raise.rb:130:8:130:8 | After b [true] | raise.rb:130:9:131:22 | then ... |  |
+| raise.rb:130:8:130:8 | b | raise.rb:130:8:130:8 | After b [false] | false |
+| raise.rb:130:8:130:8 | b | raise.rb:130:8:130:8 | After b [true] | true |
+| raise.rb:130:9:131:22 | then ... | raise.rb:131:7:131:22 | Before call to raise |  |
+| raise.rb:131:7:131:22 | Before call to raise | raise.rb:131:7:131:22 | self |  |
+| raise.rb:131:7:131:22 | call to raise | raise.rb:133:3:133:19 | rescue ... | exception |
 | raise.rb:131:7:131:22 | self | raise.rb:131:13:131:22 | ExceptionA |  |
 | raise.rb:131:13:131:22 | ExceptionA | raise.rb:131:7:131:22 | call to raise |  |
-| raise.rb:133:3:133:19 | rescue ... | raise.rb:137:5:137:17 | self |  |
-| raise.rb:133:10:133:19 | ExceptionA | raise.rb:133:3:133:19 | rescue ... | match |
-| raise.rb:133:10:133:19 | ExceptionA | raise.rb:134:10:134:19 | ExceptionB | no-match |
-| raise.rb:134:3:135:21 | rescue ... | raise.rb:137:5:137:17 | self |  |
-| raise.rb:134:10:134:19 | ExceptionB | raise.rb:135:5:135:21 | self | match |
-| raise.rb:134:10:134:19 | ExceptionB | raise.rb:137:5:137:17 | [ensure: exception] self | exception |
-| raise.rb:134:20:135:21 | then ... | raise.rb:134:3:135:21 | rescue ... |  |
-| raise.rb:135:5:135:21 | call to puts | raise.rb:134:20:135:21 | then ... |  |
-| raise.rb:135:5:135:21 | self | raise.rb:135:11:135:20 | ExceptionB |  |
-| raise.rb:135:10:135:21 | "ExceptionB" | raise.rb:135:5:135:21 | call to puts |  |
+| raise.rb:133:3:133:19 | After rescue ... [no-match] | raise.rb:134:3:135:21 | rescue ... |  |
+| raise.rb:133:3:133:19 | [CatchClauseEmptyBody] rescue ... | raise.rb:136:3:137:17 | ensure ... |  |
+| raise.rb:133:3:133:19 | rescue ... | raise.rb:133:10:133:19 | ExceptionA |  |
+| raise.rb:133:10:133:19 | After ExceptionA [match] | raise.rb:133:3:133:19 | [CatchClauseEmptyBody] rescue ... |  |
+| raise.rb:133:10:133:19 | After ExceptionA [no-match] | raise.rb:133:3:133:19 | After rescue ... [no-match] | no-match |
+| raise.rb:133:10:133:19 | ExceptionA | raise.rb:133:10:133:19 | After ExceptionA [match] | match |
+| raise.rb:133:10:133:19 | ExceptionA | raise.rb:133:10:133:19 | After ExceptionA [no-match] | no-match |
+| raise.rb:134:3:135:21 | After rescue ... [no-match] | raise.rb:136:3:137:17 | ensure ... | exception |
+| raise.rb:134:3:135:21 | rescue ... | raise.rb:134:10:134:19 | ExceptionB |  |
+| raise.rb:134:10:134:19 | After ExceptionB [match] | raise.rb:134:20:135:21 | then ... |  |
+| raise.rb:134:10:134:19 | After ExceptionB [no-match] | raise.rb:134:3:135:21 | After rescue ... [no-match] | no-match |
+| raise.rb:134:10:134:19 | ExceptionB | raise.rb:134:10:134:19 | After ExceptionB [match] | match |
+| raise.rb:134:10:134:19 | ExceptionB | raise.rb:134:10:134:19 | After ExceptionB [no-match] | no-match |
+| raise.rb:134:20:135:21 | After then ... | raise.rb:136:3:137:17 | ensure ... |  |
+| raise.rb:134:20:135:21 | then ... | raise.rb:135:5:135:21 | Before call to puts |  |
+| raise.rb:135:5:135:21 | After call to puts | raise.rb:134:20:135:21 | After then ... |  |
+| raise.rb:135:5:135:21 | Before call to puts | raise.rb:135:5:135:21 | self |  |
+| raise.rb:135:5:135:21 | call to puts | raise.rb:135:5:135:21 | After call to puts |  |
+| raise.rb:135:5:135:21 | self | raise.rb:135:10:135:21 | Before "ExceptionB" |  |
+| raise.rb:135:10:135:21 | "ExceptionB" | raise.rb:135:10:135:21 | After "ExceptionB" |  |
+| raise.rb:135:10:135:21 | After "ExceptionB" | raise.rb:135:5:135:21 | call to puts |  |
+| raise.rb:135:10:135:21 | Before "ExceptionB" | raise.rb:135:11:135:20 | ExceptionB |  |
 | raise.rb:135:11:135:20 | ExceptionB | raise.rb:135:10:135:21 | "ExceptionB" |  |
-| raise.rb:136:3:137:17 | [ensure: exception] ensure ... | raise.rb:128:1:140:3 | exit m11 (abnormal) | exception |
-| raise.rb:136:3:137:17 | ensure ... | raise.rb:139:3:139:16 | self |  |
-| raise.rb:137:5:137:17 | [ensure: exception] call to puts | raise.rb:136:3:137:17 | [ensure: exception] ensure ... |  |
-| raise.rb:137:5:137:17 | [ensure: exception] self | raise.rb:137:11:137:16 | [ensure: exception] Ensure |  |
-| raise.rb:137:5:137:17 | call to puts | raise.rb:136:3:137:17 | ensure ... |  |
-| raise.rb:137:5:137:17 | self | raise.rb:137:11:137:16 | Ensure |  |
-| raise.rb:137:10:137:17 | "Ensure" | raise.rb:137:5:137:17 | call to puts |  |
-| raise.rb:137:10:137:17 | [ensure: exception] "Ensure" | raise.rb:137:5:137:17 | [ensure: exception] call to puts |  |
+| raise.rb:136:3:137:17 | After ensure ... | raise.rb:128:1:140:3 | Exceptional Exit | exception |
+| raise.rb:136:3:137:17 | After ensure ... | raise.rb:129:3:138:5 | After begin ...  |  |
+| raise.rb:136:3:137:17 | ensure ... | raise.rb:137:5:137:17 | Before call to puts |  |
+| raise.rb:137:5:137:17 | After call to puts | raise.rb:136:3:137:17 | After ensure ... |  |
+| raise.rb:137:5:137:17 | Before call to puts | raise.rb:137:5:137:17 | self |  |
+| raise.rb:137:5:137:17 | call to puts | raise.rb:137:5:137:17 | After call to puts |  |
+| raise.rb:137:5:137:17 | self | raise.rb:137:10:137:17 | Before "Ensure" |  |
+| raise.rb:137:10:137:17 | "Ensure" | raise.rb:137:10:137:17 | After "Ensure" |  |
+| raise.rb:137:10:137:17 | After "Ensure" | raise.rb:137:5:137:17 | call to puts |  |
+| raise.rb:137:10:137:17 | Before "Ensure" | raise.rb:137:11:137:16 | Ensure |  |
 | raise.rb:137:11:137:16 | Ensure | raise.rb:137:10:137:17 | "Ensure" |  |
-| raise.rb:137:11:137:16 | [ensure: exception] Ensure | raise.rb:137:10:137:17 | [ensure: exception] "Ensure" |  |
-| raise.rb:139:3:139:16 | call to puts | raise.rb:128:1:140:3 | exit m11 (normal) |  |
-| raise.rb:139:3:139:16 | self | raise.rb:139:9:139:15 | End m11 |  |
-| raise.rb:139:8:139:16 | "End m11" | raise.rb:139:3:139:16 | call to puts |  |
+| raise.rb:139:3:139:16 | After call to puts | raise.rb:129:3:139:16 | After ... |  |
+| raise.rb:139:3:139:16 | Before call to puts | raise.rb:139:3:139:16 | self |  |
+| raise.rb:139:3:139:16 | call to puts | raise.rb:139:3:139:16 | After call to puts |  |
+| raise.rb:139:3:139:16 | self | raise.rb:139:8:139:16 | Before "End m11" |  |
+| raise.rb:139:8:139:16 | "End m11" | raise.rb:139:8:139:16 | After "End m11" |  |
+| raise.rb:139:8:139:16 | After "End m11" | raise.rb:139:3:139:16 | call to puts |  |
+| raise.rb:139:8:139:16 | Before "End m11" | raise.rb:139:9:139:15 | End m11 |  |
 | raise.rb:139:9:139:15 | End m11 | raise.rb:139:8:139:16 | "End m11" |  |
-| raise.rb:142:1:148:3 | enter m12 | raise.rb:142:9:142:9 | b |  |
-| raise.rb:142:1:148:3 | exit m12 (normal) | raise.rb:142:1:148:3 | exit m12 |  |
+| raise.rb:142:1:148:3 | Entry | raise.rb:142:9:142:9 | b |  |
+| raise.rb:142:1:148:3 | Normal Exit | raise.rb:142:1:148:3 | Exit |  |
 | raise.rb:142:1:148:3 | m12 | raise.rb:150:1:152:3 | m13 |  |
-| raise.rb:142:9:142:9 | b | raise.rb:143:6:143:6 | b |  |
-| raise.rb:143:3:145:5 | if ... | raise.rb:147:10:147:10 | 3 |  |
-| raise.rb:143:6:143:6 | b | raise.rb:143:3:145:5 | if ... | false |
-| raise.rb:143:6:143:6 | b | raise.rb:144:5:144:12 | self | true |
-| raise.rb:144:5:144:12 | call to raise | raise.rb:147:10:147:10 | [ensure: exception] 3 | exception |
+| raise.rb:142:9:142:9 | b | raise.rb:143:3:147:10 | ... |  |
+| raise.rb:143:3:145:5 | After if ... | raise.rb:146:1:147:10 | ensure ... |  |
+| raise.rb:143:3:145:5 | if ... | raise.rb:143:6:143:6 | b |  |
+| raise.rb:143:3:147:10 | ... | raise.rb:143:3:145:5 | if ... |  |
+| raise.rb:143:6:143:6 | After b [false] | raise.rb:143:3:145:5 | After if ... |  |
+| raise.rb:143:6:143:6 | After b [true] | raise.rb:143:7:144:12 | then ... |  |
+| raise.rb:143:6:143:6 | b | raise.rb:143:6:143:6 | After b [false] | false |
+| raise.rb:143:6:143:6 | b | raise.rb:143:6:143:6 | After b [true] | true |
+| raise.rb:143:7:144:12 | then ... | raise.rb:144:5:144:12 | Before call to raise |  |
+| raise.rb:144:5:144:12 | Before call to raise | raise.rb:144:5:144:12 | self |  |
+| raise.rb:144:5:144:12 | call to raise | raise.rb:146:1:147:10 | ensure ... | exception |
 | raise.rb:144:5:144:12 | self | raise.rb:144:11:144:12 | "" |  |
 | raise.rb:144:11:144:12 | "" | raise.rb:144:5:144:12 | call to raise |  |
-| raise.rb:147:3:147:10 | [ensure: exception] return | raise.rb:142:1:148:3 | exit m12 (normal) | return |
-| raise.rb:147:3:147:10 | return | raise.rb:142:1:148:3 | exit m12 (normal) | return |
+| raise.rb:146:1:147:10 | ensure ... | raise.rb:147:3:147:10 | Before return |  |
+| raise.rb:147:3:147:10 | Before return | raise.rb:147:10:147:10 | 3 |  |
+| raise.rb:147:3:147:10 | return | raise.rb:142:1:148:3 | Normal Exit | return |
 | raise.rb:147:10:147:10 | 3 | raise.rb:147:3:147:10 | return |  |
-| raise.rb:147:10:147:10 | [ensure: exception] 3 | raise.rb:147:3:147:10 | [ensure: exception] return |  |
-| raise.rb:150:1:152:3 | enter m13 | raise.rb:151:1:151:6 | ensure ... |  |
-| raise.rb:150:1:152:3 | exit m13 (normal) | raise.rb:150:1:152:3 | exit m13 |  |
+| raise.rb:150:1:152:3 | Entry | raise.rb:151:1:151:6 | ... |  |
+| raise.rb:150:1:152:3 | Normal Exit | raise.rb:150:1:152:3 | Exit |  |
 | raise.rb:150:1:152:3 | m13 | raise.rb:154:1:156:3 | m14 |  |
-| raise.rb:151:1:151:6 | ensure ... | raise.rb:150:1:152:3 | exit m13 (normal) |  |
-| raise.rb:154:1:156:3 | enter m14 | raise.rb:154:9:154:15 | element |  |
-| raise.rb:154:1:156:3 | exit m14 (normal) | raise.rb:154:1:156:3 | exit m14 |  |
+| raise.rb:151:1:151:6 | ... | raise.rb:151:1:151:6 | ensure ... |  |
+| raise.rb:151:1:151:6 | After ... | raise.rb:150:1:152:3 | Normal Exit |  |
+| raise.rb:151:1:151:6 | ensure ... | raise.rb:151:1:151:6 | After ... |  |
+| raise.rb:154:1:156:3 | Entry | raise.rb:154:9:154:15 | element |  |
+| raise.rb:154:1:156:3 | Normal Exit | raise.rb:154:1:156:3 | Exit |  |
 | raise.rb:154:1:156:3 | m14 | raise.rb:158:1:164:3 | m15 |  |
-| raise.rb:154:9:154:15 | element | raise.rb:155:3:155:9 | element |  |
+| raise.rb:154:9:154:15 | element | raise.rb:155:3:155:50 | ... |  |
 | raise.rb:155:3:155:9 | element | raise.rb:155:16:155:50 | { ... } |  |
-| raise.rb:155:3:155:50 | call to each | raise.rb:154:1:156:3 | exit m14 (normal) |  |
-| raise.rb:155:16:155:50 | enter { ... } | raise.rb:155:19:155:22 | elem |  |
-| raise.rb:155:16:155:50 | exit { ... } (abnormal) | raise.rb:155:16:155:50 | exit { ... } |  |
-| raise.rb:155:16:155:50 | exit { ... } (normal) | raise.rb:155:16:155:50 | exit { ... } |  |
+| raise.rb:155:3:155:50 | ... | raise.rb:155:3:155:50 | Before call to each |  |
+| raise.rb:155:3:155:50 | After ... | raise.rb:154:1:156:3 | Normal Exit |  |
+| raise.rb:155:3:155:50 | After call to each | raise.rb:155:3:155:50 | After ... |  |
+| raise.rb:155:3:155:50 | Before call to each | raise.rb:155:3:155:9 | element |  |
+| raise.rb:155:3:155:50 | call to each | raise.rb:155:3:155:50 | After call to each |  |
+| raise.rb:155:16:155:50 | Entry | raise.rb:155:19:155:22 | elem |  |
+| raise.rb:155:16:155:50 | Exceptional Exit | raise.rb:155:16:155:50 | Exit |  |
+| raise.rb:155:16:155:50 | Normal Exit | raise.rb:155:16:155:50 | Exit |  |
 | raise.rb:155:16:155:50 | { ... } | raise.rb:155:3:155:50 | call to each |  |
-| raise.rb:155:19:155:22 | elem | raise.rb:155:37:155:43 | element |  |
-| raise.rb:155:25:155:32 | call to raise | raise.rb:155:16:155:50 | exit { ... } (abnormal) | exception |
+| raise.rb:155:19:155:22 | elem | raise.rb:155:25:155:48 | ... |  |
+| raise.rb:155:25:155:32 | Before call to raise | raise.rb:155:25:155:32 | self |  |
+| raise.rb:155:25:155:32 | call to raise | raise.rb:155:16:155:50 | Exceptional Exit | exception |
 | raise.rb:155:25:155:32 | self | raise.rb:155:31:155:32 | "" |  |
-| raise.rb:155:25:155:48 | ... if ... | raise.rb:155:16:155:50 | exit { ... } (normal) |  |
+| raise.rb:155:25:155:48 | ... | raise.rb:155:25:155:48 | ... if ... |  |
+| raise.rb:155:25:155:48 | ... if ... | raise.rb:155:37:155:48 | Before call to nil? |  |
+| raise.rb:155:25:155:48 | After ... | raise.rb:155:16:155:50 | Normal Exit |  |
+| raise.rb:155:25:155:48 | After ... if ... | raise.rb:155:25:155:48 | After ... |  |
 | raise.rb:155:31:155:32 | "" | raise.rb:155:25:155:32 | call to raise |  |
 | raise.rb:155:37:155:43 | element | raise.rb:155:37:155:48 | call to nil? |  |
-| raise.rb:155:37:155:48 | call to nil? | raise.rb:155:25:155:32 | self | true |
-| raise.rb:155:37:155:48 | call to nil? | raise.rb:155:25:155:48 | ... if ... | false |
-| raise.rb:158:1:164:3 | enter m15 | raise.rb:159:3:163:5 | self |  |
-| raise.rb:158:1:164:3 | exit m15 (normal) | raise.rb:158:1:164:3 | exit m15 |  |
+| raise.rb:155:37:155:48 | After call to nil? [false] | raise.rb:155:25:155:48 | After ... if ... |  |
+| raise.rb:155:37:155:48 | After call to nil? [true] | raise.rb:155:25:155:32 | Before call to raise |  |
+| raise.rb:155:37:155:48 | Before call to nil? | raise.rb:155:37:155:43 | element |  |
+| raise.rb:155:37:155:48 | call to nil? | raise.rb:155:37:155:48 | After call to nil? [false] | false |
+| raise.rb:155:37:155:48 | call to nil? | raise.rb:155:37:155:48 | After call to nil? [true] | true |
+| raise.rb:158:1:164:3 | Entry | raise.rb:159:3:163:5 | ... |  |
+| raise.rb:158:1:164:3 | Normal Exit | raise.rb:158:1:164:3 | Exit |  |
 | raise.rb:158:1:164:3 | m15 | raise.rb:166:1:170:3 | C |  |
-| raise.rb:159:3:163:5 | call to foo | raise.rb:158:1:164:3 | exit m15 (normal) |  |
+| raise.rb:159:3:163:5 | ... | raise.rb:159:3:163:5 | Before call to foo |  |
+| raise.rb:159:3:163:5 | After ... | raise.rb:158:1:164:3 | Normal Exit |  |
+| raise.rb:159:3:163:5 | After call to foo | raise.rb:159:3:163:5 | After ... |  |
+| raise.rb:159:3:163:5 | Before call to foo | raise.rb:159:3:163:5 | self |  |
+| raise.rb:159:3:163:5 | call to foo | raise.rb:159:3:163:5 | After call to foo |  |
 | raise.rb:159:3:163:5 | self | raise.rb:159:7:163:5 | do ... end |  |
+| raise.rb:159:7:163:5 | Entry | raise.rb:160:5:162:7 | ... |  |
+| raise.rb:159:7:163:5 | Normal Exit | raise.rb:159:7:163:5 | Exit |  |
 | raise.rb:159:7:163:5 | do ... end | raise.rb:159:3:163:5 | call to foo |  |
-| raise.rb:159:7:163:5 | enter do ... end | raise.rb:160:5:162:7 | self |  |
-| raise.rb:159:7:163:5 | exit do ... end (normal) | raise.rb:159:7:163:5 | exit do ... end |  |
-| raise.rb:160:5:162:7 | call to bar | raise.rb:159:7:163:5 | exit do ... end (normal) |  |
+| raise.rb:160:5:162:7 | ... | raise.rb:160:5:162:7 | Before call to bar |  |
+| raise.rb:160:5:162:7 | After ... | raise.rb:159:7:163:5 | Normal Exit |  |
+| raise.rb:160:5:162:7 | After call to bar | raise.rb:160:5:162:7 | After ... |  |
+| raise.rb:160:5:162:7 | Before call to bar | raise.rb:160:5:162:7 | self |  |
+| raise.rb:160:5:162:7 | call to bar | raise.rb:160:5:162:7 | After call to bar |  |
 | raise.rb:160:5:162:7 | self | raise.rb:160:9:162:7 | -> { ... } |  |
 | raise.rb:160:9:162:7 | -> { ... } | raise.rb:160:5:162:7 | call to bar |  |
-| raise.rb:160:9:162:7 | enter -> { ... } | raise.rb:160:12:160:12 | x |  |
-| raise.rb:160:9:162:7 | exit -> { ... } (abnormal) | raise.rb:160:9:162:7 | exit -> { ... } |  |
-| raise.rb:160:9:162:7 | exit -> { ... } (normal) | raise.rb:160:9:162:7 | exit -> { ... } |  |
-| raise.rb:160:12:160:12 | x | raise.rb:161:23:161:23 | x |  |
-| raise.rb:161:7:161:14 | call to raise | raise.rb:160:9:162:7 | exit -> { ... } (abnormal) | exception |
+| raise.rb:160:9:162:7 | Entry | raise.rb:160:12:160:12 | x |  |
+| raise.rb:160:9:162:7 | Exceptional Exit | raise.rb:160:9:162:7 | Exit |  |
+| raise.rb:160:9:162:7 | Normal Exit | raise.rb:160:9:162:7 | Exit |  |
+| raise.rb:160:12:160:12 | x | raise.rb:161:7:161:23 | ... |  |
+| raise.rb:161:7:161:14 | Before call to raise | raise.rb:161:7:161:14 | self |  |
+| raise.rb:161:7:161:14 | call to raise | raise.rb:160:9:162:7 | Exceptional Exit | exception |
 | raise.rb:161:7:161:14 | self | raise.rb:161:13:161:14 | "" |  |
-| raise.rb:161:7:161:23 | ... unless ... | raise.rb:160:9:162:7 | exit -> { ... } (normal) |  |
+| raise.rb:161:7:161:23 | ... | raise.rb:161:7:161:23 | ... unless ... |  |
+| raise.rb:161:7:161:23 | ... unless ... | raise.rb:161:23:161:23 | x |  |
+| raise.rb:161:7:161:23 | After ... | raise.rb:160:9:162:7 | Normal Exit |  |
+| raise.rb:161:7:161:23 | After ... unless ... | raise.rb:161:7:161:23 | After ... |  |
 | raise.rb:161:13:161:14 | "" | raise.rb:161:7:161:14 | call to raise |  |
-| raise.rb:161:23:161:23 | x | raise.rb:161:7:161:14 | self | false |
-| raise.rb:161:23:161:23 | x | raise.rb:161:7:161:23 | ... unless ... | true |
-| raise.rb:166:1:170:3 | C | raise.rb:167:7:167:10 | self |  |
-| raise.rb:167:3:169:5 | enter m | raise.rb:168:5:168:12 | self |  |
-| raise.rb:167:3:169:5 | exit m (abnormal) | raise.rb:167:3:169:5 | exit m |  |
-| raise.rb:167:3:169:5 | m | raise.rb:172:1:182:3 | m16 |  |
+| raise.rb:161:23:161:23 | After x [false] | raise.rb:161:7:161:14 | Before call to raise |  |
+| raise.rb:161:23:161:23 | After x [true] | raise.rb:161:7:161:23 | After ... unless ... |  |
+| raise.rb:161:23:161:23 | x | raise.rb:161:23:161:23 | After x [false] | false |
+| raise.rb:161:23:161:23 | x | raise.rb:161:23:161:23 | After x [true] | true |
+| raise.rb:166:1:170:3 | After C | raise.rb:172:1:182:3 | m16 |  |
+| raise.rb:166:1:170:3 | C | raise.rb:167:3:169:5 | Before m |  |
+| raise.rb:167:3:169:5 | After m | raise.rb:166:1:170:3 | After C |  |
+| raise.rb:167:3:169:5 | Before m | raise.rb:167:7:167:10 | self |  |
+| raise.rb:167:3:169:5 | Entry | raise.rb:168:5:168:12 | ... |  |
+| raise.rb:167:3:169:5 | Exceptional Exit | raise.rb:167:3:169:5 | Exit |  |
+| raise.rb:167:3:169:5 | m | raise.rb:167:3:169:5 | After m |  |
 | raise.rb:167:7:167:10 | self | raise.rb:167:3:169:5 | m |  |
-| raise.rb:168:5:168:12 | call to raise | raise.rb:167:3:169:5 | exit m (abnormal) | exception |
+| raise.rb:168:5:168:12 | ... | raise.rb:168:5:168:12 | Before call to raise |  |
+| raise.rb:168:5:168:12 | Before call to raise | raise.rb:168:5:168:12 | self |  |
+| raise.rb:168:5:168:12 | call to raise | raise.rb:167:3:169:5 | Exceptional Exit | exception |
 | raise.rb:168:5:168:12 | self | raise.rb:168:11:168:12 | "" |  |
 | raise.rb:168:11:168:12 | "" | raise.rb:168:5:168:12 | call to raise |  |
-| raise.rb:172:1:182:3 | enter m16 | raise.rb:172:9:172:10 | b1 |  |
-| raise.rb:172:1:182:3 | exit m16 (abnormal) | raise.rb:172:1:182:3 | exit m16 |  |
-| raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:172:1:182:3 | exit m16 |  |
-| raise.rb:172:1:182:3 | m16 | raise.rb:1:1:182:4 | exit raise.rb (normal) |  |
+| raise.rb:172:1:182:3 | Entry | raise.rb:172:9:172:10 | b1 |  |
+| raise.rb:172:1:182:3 | Exceptional Exit | raise.rb:172:1:182:3 | Exit |  |
+| raise.rb:172:1:182:3 | Normal Exit | raise.rb:172:1:182:3 | Exit |  |
+| raise.rb:172:1:182:3 | m16 | raise.rb:1:1:182:4 | Normal Exit |  |
 | raise.rb:172:9:172:10 | b1 | raise.rb:172:13:172:14 | b2 |  |
-| raise.rb:172:13:172:14 | b2 | raise.rb:174:8:174:9 | b1 |  |
-| raise.rb:174:8:174:9 | b1 | raise.rb:174:8:174:23 | [true] ... \|\| ... | true |
-| raise.rb:174:8:174:9 | b1 | raise.rb:174:14:174:15 | b2 | false |
-| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:177:14:177:14 | 2 | false |
-| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | exception |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:175:14:175:14 | 1 | true |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | exception |
+| raise.rb:172:13:172:14 | b2 | raise.rb:173:3:181:5 | ... |  |
+| raise.rb:173:3:181:5 | ... | raise.rb:173:3:181:5 | begin ...  |  |
+| raise.rb:173:3:181:5 | begin ...  | raise.rb:174:5:178:7 | if ... |  |
+| raise.rb:174:5:178:7 | if ... | raise.rb:174:8:174:23 | ... \|\| ... |  |
+| raise.rb:174:8:174:9 | After b1 [false] | raise.rb:174:14:174:23 | Before ... == ... |  |
+| raise.rb:174:8:174:9 | After b1 [true] | raise.rb:174:8:174:23 | After ... \|\| ... [true] | true |
+| raise.rb:174:8:174:9 | b1 | raise.rb:174:8:174:9 | After b1 [false] | false |
+| raise.rb:174:8:174:9 | b1 | raise.rb:174:8:174:9 | After b1 [true] | true |
+| raise.rb:174:8:174:23 | ... \|\| ... | raise.rb:174:8:174:9 | b1 |  |
+| raise.rb:174:8:174:23 | After ... \|\| ... [false] | raise.rb:176:5:177:14 | else ... |  |
+| raise.rb:174:8:174:23 | After ... \|\| ... [true] | raise.rb:174:24:175:14 | then ... |  |
 | raise.rb:174:14:174:15 | b2 | raise.rb:174:20:174:23 | true |  |
-| raise.rb:174:14:174:23 | ... == ... | raise.rb:174:8:174:23 | [false] ... \|\| ... | false |
-| raise.rb:174:14:174:23 | ... == ... | raise.rb:174:8:174:23 | [true] ... \|\| ... | true |
-| raise.rb:174:14:174:23 | ... == ... | raise.rb:179:10:179:19 | ExceptionA | exception |
+| raise.rb:174:14:174:23 | ... == ... | raise.rb:174:14:174:23 | After ... == ... [false] | false |
+| raise.rb:174:14:174:23 | ... == ... | raise.rb:174:14:174:23 | After ... == ... [true] | true |
+| raise.rb:174:14:174:23 | ... == ... | raise.rb:179:3:180:12 | rescue ... | exception |
+| raise.rb:174:14:174:23 | After ... == ... [false] | raise.rb:174:8:174:23 | After ... \|\| ... [false] | false |
+| raise.rb:174:14:174:23 | After ... == ... [true] | raise.rb:174:8:174:23 | After ... \|\| ... [true] | true |
+| raise.rb:174:14:174:23 | Before ... == ... | raise.rb:174:14:174:15 | b2 |  |
 | raise.rb:174:20:174:23 | true | raise.rb:174:14:174:23 | ... == ... |  |
-| raise.rb:175:7:175:14 | return | raise.rb:172:1:182:3 | exit m16 (normal) | return |
+| raise.rb:174:24:175:14 | then ... | raise.rb:175:7:175:14 | Before return |  |
+| raise.rb:175:7:175:14 | Before return | raise.rb:175:14:175:14 | 1 |  |
+| raise.rb:175:7:175:14 | return | raise.rb:172:1:182:3 | Normal Exit | return |
 | raise.rb:175:14:175:14 | 1 | raise.rb:175:7:175:14 | return |  |
-| raise.rb:177:7:177:14 | return | raise.rb:172:1:182:3 | exit m16 (normal) | return |
+| raise.rb:176:5:177:14 | else ... | raise.rb:177:7:177:14 | Before return |  |
+| raise.rb:177:7:177:14 | Before return | raise.rb:177:14:177:14 | 2 |  |
+| raise.rb:177:7:177:14 | return | raise.rb:172:1:182:3 | Normal Exit | return |
 | raise.rb:177:14:177:14 | 2 | raise.rb:177:7:177:14 | return |  |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:172:1:182:3 | exit m16 (abnormal) | exception |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:180:12:180:12 | 3 | match |
-| raise.rb:180:5:180:12 | return | raise.rb:172:1:182:3 | exit m16 (normal) | return |
+| raise.rb:179:3:180:12 | After rescue ... [no-match] | raise.rb:172:1:182:3 | Exceptional Exit | exception |
+| raise.rb:179:3:180:12 | rescue ... | raise.rb:179:10:179:19 | ExceptionA |  |
+| raise.rb:179:10:179:19 | After ExceptionA [match] | raise.rb:179:20:180:12 | then ... |  |
+| raise.rb:179:10:179:19 | After ExceptionA [no-match] | raise.rb:179:3:180:12 | After rescue ... [no-match] | no-match |
+| raise.rb:179:10:179:19 | ExceptionA | raise.rb:179:10:179:19 | After ExceptionA [match] | match |
+| raise.rb:179:10:179:19 | ExceptionA | raise.rb:179:10:179:19 | After ExceptionA [no-match] | no-match |
+| raise.rb:179:20:180:12 | then ... | raise.rb:180:5:180:12 | Before return |  |
+| raise.rb:180:5:180:12 | Before return | raise.rb:180:12:180:12 | 3 |  |
+| raise.rb:180:5:180:12 | return | raise.rb:172:1:182:3 | Normal Exit | return |
 | raise.rb:180:12:180:12 | 3 | raise.rb:180:5:180:12 | return |  |
diff --git a/ruby/ql/test/library-tests/controlflow/graph/Cfg.ql b/ruby/ql/test/library-tests/controlflow/graph/Cfg.ql
index 39d0627613e9..54fc30b8eec3 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/Cfg.ql
+++ b/ruby/ql/test/library-tests/controlflow/graph/Cfg.ql
@@ -1,2 +1,2 @@
 import codeql.ruby.CFG
-import codeql.ruby.controlflow.internal.ControlFlowGraphImpl::TestOutput<CfgNode>
+import ControlFlow::TestOutput<CfgNode>
diff --git a/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected b/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected
index 54cf1d085433..3d0f3d6db8a1 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected
+++ b/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected
@@ -1,10 +1,6 @@
 callsWithNoArguments
-| break_ensure.rb:8:6:8:13 | [ensure: exception] call to elements |
 | break_ensure.rb:8:6:8:13 | call to elements |
-| break_ensure.rb:8:6:8:18 | [ensure: exception] call to nil? |
 | break_ensure.rb:8:6:8:18 | call to nil? |
-| break_ensure.rb:20:10:20:15 | [ensure: break] call to nil? |
-| break_ensure.rb:20:10:20:15 | [ensure: exception] call to nil? |
 | break_ensure.rb:20:10:20:15 | call to nil? |
 | break_ensure.rb:29:8:29:13 | call to nil? |
 | case.rb:2:8:2:9 | call to x1 |
@@ -26,8 +22,7 @@ callsWithNoArguments
 | cfg.rb:62:7:62:12 | * ... |
 | cfg.rb:62:17:62:27 | * ... |
 | cfg.rb:90:1:93:3 | call to each |
-| cfg.rb:90:5:90:5 | [false] ! ... |
-| cfg.rb:90:5:90:5 | [true] ! ... |
+| cfg.rb:90:5:90:5 | ! ... |
 | cfg.rb:90:5:90:5 | defined? ... |
 | cfg.rb:98:10:98:15 | ** ... |
 | cfg.rb:98:30:98:35 | ** ... |
@@ -61,10 +56,9 @@ callsWithNoArguments
 | desugar.rb:22:18:22:29 | * ... |
 | desugar.rb:26:6:26:11 | * ... |
 | desugar.rb:26:15:26:25 | * ... |
-| ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:4:30:4:38 | [true] ! ... |
+| ifs.rb:4:30:4:38 | ! ... |
 | ifs.rb:20:9:20:10 | - ... |
-| ifs.rb:41:6:41:10 | [false] ! ... |
+| ifs.rb:41:6:41:10 | ! ... |
 | loops.rb:25:3:27:5 | call to each |
 | raise.rb:155:3:155:50 | call to each |
 | raise.rb:155:37:155:48 | call to nil? |
@@ -72,25 +66,17 @@ callsWithNoArguments
 positionalArguments
 | break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:2:13:2:13 | 0 |
 | break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:3:12:3:12 | 0 |
-| break_ensure.rb:9:5:9:23 | [ensure: exception] call to puts | break_ensure.rb:9:10:9:23 | [ensure: exception] "elements nil" |
 | break_ensure.rb:9:5:9:23 | call to puts | break_ensure.rb:9:10:9:23 | "elements nil" |
 | break_ensure.rb:14:9:14:13 | ... < ... | break_ensure.rb:14:13:14:13 | 0 |
 | break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:16:14:16:14 | 0 |
-| break_ensure.rb:21:9:21:20 | [ensure: break] call to puts | break_ensure.rb:21:14:21:20 | [ensure: break] "y nil" |
-| break_ensure.rb:21:9:21:20 | [ensure: exception] call to puts | break_ensure.rb:21:14:21:20 | [ensure: exception] "y nil" |
 | break_ensure.rb:21:9:21:20 | call to puts | break_ensure.rb:21:14:21:20 | "y nil" |
 | break_ensure.rb:33:11:33:15 | ... < ... | break_ensure.rb:33:15:33:15 | 0 |
-| break_ensure.rb:33:11:33:15 | [ensure: exception] ... < ... | break_ensure.rb:33:15:33:15 | [ensure: exception] 0 |
-| break_ensure.rb:33:11:33:15 | [ensure: return] ... < ... | break_ensure.rb:33:15:33:15 | [ensure: return] 0 |
 | break_ensure.rb:35:12:35:16 | ... > ... | break_ensure.rb:35:16:35:16 | 0 |
-| break_ensure.rb:35:12:35:16 | [ensure: exception] ... > ... | break_ensure.rb:35:16:35:16 | [ensure: exception] 0 |
-| break_ensure.rb:35:12:35:16 | [ensure: return] ... > ... | break_ensure.rb:35:16:35:16 | [ensure: return] 0 |
 | break_ensure.rb:41:3:41:13 | call to puts | break_ensure.rb:41:8:41:13 | "Done" |
 | break_ensure.rb:45:9:45:13 | ... < ... | break_ensure.rb:45:13:45:13 | 0 |
 | break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:47:14:47:14 | 1 |
 | break_ensure.rb:48:9:48:16 | call to raise | break_ensure.rb:48:15:48:16 | "" |
 | break_ensure.rb:51:10:51:14 | ... > ... | break_ensure.rb:51:14:51:14 | 0 |
-| break_ensure.rb:51:10:51:14 | [ensure: exception] ... > ... | break_ensure.rb:51:14:51:14 | [ensure: exception] 0 |
 | case.rb:3:29:3:37 | call to puts | case.rb:3:34:3:37 | "x2" |
 | case.rb:4:17:4:24 | call to puts | case.rb:4:22:4:24 | "2" |
 | case.rb:14:13:14:18 | ... == ... | case.rb:14:18:14:18 | 5 |
@@ -121,6 +107,7 @@ positionalArguments
 | cfg.rb:9:1:9:21 | call to [] | cfg.rb:9:14:9:20 | "another" |
 | cfg.rb:12:3:12:8 | call to puts | cfg.rb:12:8:12:8 | 4 |
 | cfg.rb:16:3:16:14 | call to puts | cfg.rb:16:8:16:14 | "hello" |
+| cfg.rb:20:3:20:14 | call to puts | cfg.rb:20:8:20:14 | "world" |
 | cfg.rb:23:1:23:6 | ... + ... | cfg.rb:23:6:23:6 | 1 |
 | cfg.rb:25:15:25:20 | call to puts | cfg.rb:25:20:25:20 | x |
 | cfg.rb:27:1:27:11 | call to puts | cfg.rb:27:6:27:11 | &... |
@@ -263,10 +250,8 @@ positionalArguments
 | ifs.rb:2:6:2:10 | ... > ... | ifs.rb:2:10:2:10 | 2 |
 | ifs.rb:3:5:3:30 | call to puts | ifs.rb:3:10:3:30 | "x is greater than 2" |
 | ifs.rb:4:9:4:14 | ... <= ... | ifs.rb:4:14:4:14 | 2 |
-| ifs.rb:4:9:4:24 | [false] ... and ... | ifs.rb:4:20:4:24 | ... > ... |
-| ifs.rb:4:9:4:24 | [true] ... and ... | ifs.rb:4:20:4:24 | ... > ... |
-| ifs.rb:4:9:4:38 | [false] ... and ... | ifs.rb:4:30:4:38 | [false] ! ... |
-| ifs.rb:4:9:4:38 | [true] ... and ... | ifs.rb:4:30:4:38 | [true] ! ... |
+| ifs.rb:4:9:4:24 | ... and ... | ifs.rb:4:20:4:24 | ... > ... |
+| ifs.rb:4:9:4:38 | ... and ... | ifs.rb:4:30:4:38 | ! ... |
 | ifs.rb:4:20:4:24 | ... > ... | ifs.rb:4:24:4:24 | 0 |
 | ifs.rb:4:32:4:37 | ... == ... | ifs.rb:4:37:4:37 | 5 |
 | ifs.rb:5:5:5:17 | call to puts | ifs.rb:5:10:5:17 | "x is 1" |
@@ -279,8 +264,7 @@ positionalArguments
 | ifs.rb:38:12:38:17 | ... == ... | ifs.rb:38:17:38:17 | 2 |
 | ifs.rb:48:5:48:15 | call to puts | ifs.rb:48:10:48:15 | "true" |
 | ifs.rb:51:3:51:13 | call to puts | ifs.rb:51:8:51:13 | "done" |
-| ifs.rb:55:7:55:14 | [false] ... \|\| ... | ifs.rb:55:13:55:14 | b2 |
-| ifs.rb:55:7:55:14 | [true] ... \|\| ... | ifs.rb:55:13:55:14 | b2 |
+| ifs.rb:55:7:55:14 | ... \|\| ... | ifs.rb:55:13:55:14 | b2 |
 | ifs.rb:56:5:56:19 | call to puts | ifs.rb:56:10:56:19 | "b1 or b2" |
 | loops.rb:2:9:2:14 | ... >= ... | loops.rb:2:14:2:14 | 0 |
 | loops.rb:3:5:3:10 | call to puts | loops.rb:3:10:3:10 | x |
@@ -319,16 +303,12 @@ positionalArguments
 | raise.rb:70:5:70:17 | call to raise | raise.rb:70:11:70:17 | "x > 2" |
 | raise.rb:71:9:71:13 | ... < ... | raise.rb:71:13:71:13 | 0 |
 | raise.rb:74:3:74:20 | call to puts | raise.rb:74:8:74:20 | "0 <= x <= 2" |
-| raise.rb:76:3:76:15 | [ensure: exception] call to puts | raise.rb:76:8:76:15 | [ensure: exception] "ensure" |
-| raise.rb:76:3:76:15 | [ensure: return] call to puts | raise.rb:76:8:76:15 | [ensure: return] "ensure" |
 | raise.rb:76:3:76:15 | call to puts | raise.rb:76:8:76:15 | "ensure" |
 | raise.rb:80:3:80:17 | call to puts | raise.rb:80:8:80:17 | "Begin m8" |
 | raise.rb:82:8:82:12 | ... > ... | raise.rb:82:12:82:12 | 2 |
 | raise.rb:83:7:83:19 | call to raise | raise.rb:83:13:83:19 | "x > 2" |
 | raise.rb:84:11:84:15 | ... < ... | raise.rb:84:15:84:15 | 0 |
 | raise.rb:87:5:87:22 | call to puts | raise.rb:87:10:87:22 | "0 <= x <= 2" |
-| raise.rb:89:5:89:17 | [ensure: exception] call to puts | raise.rb:89:10:89:17 | [ensure: exception] "ensure" |
-| raise.rb:89:5:89:17 | [ensure: return] call to puts | raise.rb:89:10:89:17 | [ensure: return] "ensure" |
 | raise.rb:89:5:89:17 | call to puts | raise.rb:89:10:89:17 | "ensure" |
 | raise.rb:91:3:91:15 | call to puts | raise.rb:91:8:91:15 | "End m8" |
 | raise.rb:95:3:95:17 | call to puts | raise.rb:95:8:95:17 | "Begin m9" |
@@ -336,30 +316,16 @@ positionalArguments
 | raise.rb:98:7:98:19 | call to raise | raise.rb:98:13:98:19 | "x > 2" |
 | raise.rb:99:11:99:15 | ... < ... | raise.rb:99:15:99:15 | 0 |
 | raise.rb:102:5:102:22 | call to puts | raise.rb:102:10:102:22 | "0 <= x <= 2" |
-| raise.rb:104:5:104:23 | [ensure: exception] call to puts | raise.rb:104:10:104:23 | [ensure: exception] "outer ensure" |
-| raise.rb:104:5:104:23 | [ensure: return] call to puts | raise.rb:104:10:104:23 | [ensure: return] "outer ensure" |
 | raise.rb:104:5:104:23 | call to puts | raise.rb:104:10:104:23 | "outer ensure" |
-| raise.rb:107:9:107:26 | [ensure: exception] call to raise | raise.rb:107:15:107:26 | [ensure: exception] "b1 is true" |
-| raise.rb:107:9:107:26 | [ensure: return] call to raise | raise.rb:107:15:107:26 | [ensure: return] "b1 is true" |
 | raise.rb:107:9:107:26 | call to raise | raise.rb:107:15:107:26 | "b1 is true" |
-| raise.rb:110:7:110:25 | [ensure(1): exception] call to puts | raise.rb:110:12:110:25 | [ensure(1): exception] "inner ensure" |
-| raise.rb:110:7:110:25 | [ensure: exception, ensure(1): exception] call to puts | raise.rb:110:12:110:25 | [ensure: exception, ensure(1): exception] "inner ensure" |
-| raise.rb:110:7:110:25 | [ensure: exception] call to puts | raise.rb:110:12:110:25 | [ensure: exception] "inner ensure" |
-| raise.rb:110:7:110:25 | [ensure: return, ensure(1): exception] call to puts | raise.rb:110:12:110:25 | [ensure: return, ensure(1): exception] "inner ensure" |
-| raise.rb:110:7:110:25 | [ensure: return] call to puts | raise.rb:110:12:110:25 | [ensure: return] "inner ensure" |
 | raise.rb:110:7:110:25 | call to puts | raise.rb:110:12:110:25 | "inner ensure" |
 | raise.rb:113:3:113:15 | call to puts | raise.rb:113:8:113:15 | "End m9" |
-| raise.rb:115:3:115:22 | [ensure: exception] call to puts | raise.rb:115:8:115:22 | [ensure: exception] "method ensure" |
-| raise.rb:115:3:115:22 | [ensure: return] call to puts | raise.rb:115:8:115:22 | [ensure: return] "method ensure" |
 | raise.rb:115:3:115:22 | call to puts | raise.rb:115:8:115:22 | "method ensure" |
-| raise.rb:117:5:117:22 | [ensure: exception] call to raise | raise.rb:117:11:117:22 | [ensure: exception] "b2 is true" |
-| raise.rb:117:5:117:22 | [ensure: return] call to raise | raise.rb:117:11:117:22 | [ensure: return] "b2 is true" |
 | raise.rb:117:5:117:22 | call to raise | raise.rb:117:11:117:22 | "b2 is true" |
 | raise.rb:121:14:121:30 | call to raise | raise.rb:121:20:121:30 | "Exception" |
 | raise.rb:125:3:125:51 | call to puts | raise.rb:125:8:125:51 | "Will not get executed if p is..." |
 | raise.rb:131:7:131:22 | call to raise | raise.rb:131:13:131:22 | ExceptionA |
 | raise.rb:135:5:135:21 | call to puts | raise.rb:135:10:135:21 | "ExceptionB" |
-| raise.rb:137:5:137:17 | [ensure: exception] call to puts | raise.rb:137:10:137:17 | [ensure: exception] "Ensure" |
 | raise.rb:137:5:137:17 | call to puts | raise.rb:137:10:137:17 | "Ensure" |
 | raise.rb:139:3:139:16 | call to puts | raise.rb:139:8:139:16 | "End m11" |
 | raise.rb:144:5:144:12 | call to raise | raise.rb:144:11:144:12 | "" |
@@ -367,8 +333,7 @@ positionalArguments
 | raise.rb:160:5:162:7 | call to bar | raise.rb:160:9:162:7 | -> { ... } |
 | raise.rb:161:7:161:14 | call to raise | raise.rb:161:13:161:14 | "" |
 | raise.rb:168:5:168:12 | call to raise | raise.rb:168:11:168:12 | "" |
-| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:174:14:174:23 | ... == ... |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:174:14:174:23 | ... == ... |
+| raise.rb:174:8:174:23 | ... \|\| ... | raise.rb:174:14:174:23 | ... == ... |
 | raise.rb:174:14:174:23 | ... == ... | raise.rb:174:20:174:23 | true |
 keywordArguments
 | cfg.html.erb:6:9:6:58 | call to stylesheet_link_tag | media | cfg.html.erb:6:54:6:58 | "all" |
diff --git a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.expected b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.expected
index 1a70b535dc81..ff46e1293822 100644
--- a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.expected
+++ b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.expected
@@ -23,12 +23,10 @@ newStyleBarrierGuards
 | barrier-guards.rb:191:20:191:31 | [input] SSA phi read(foo) |
 | barrier-guards.rb:192:5:192:7 | foo |
 | barrier-guards.rb:195:4:195:15 | [input] SSA phi read(foo) |
-| barrier-guards.rb:195:4:195:31 | [input] SSA phi read(foo) |
 | barrier-guards.rb:195:20:195:31 | [input] SSA phi read(foo) |
 | barrier-guards.rb:195:36:195:47 | [input] SSA phi read(foo) |
 | barrier-guards.rb:196:5:196:7 | foo |
 | barrier-guards.rb:199:4:199:15 | [input] SSA phi read(foo) |
-| barrier-guards.rb:199:4:199:31 | [input] SSA phi read(foo) |
 | barrier-guards.rb:199:20:199:31 | [input] SSA phi read(foo) |
 | barrier-guards.rb:203:36:203:47 | [input] SSA phi read(foo) |
 | barrier-guards.rb:208:5:208:7 | foo |
@@ -55,323 +53,255 @@ newStyleBarrierGuards
 | barrier_flow.rb:68:10:71:11 | [input] SSA phi read(x) |
 | barrier_flow.rb:72:5:75:11 | [input] SSA phi read(x) |
 controls
-| barrier-guards.rb:3:4:3:15 | ... == ... | barrier-guards.rb:4:5:4:7 | foo | true |
-| barrier-guards.rb:3:4:3:15 | ... == ... | barrier-guards.rb:6:5:6:7 | foo | false |
-| barrier-guards.rb:9:4:9:24 | call to include? | barrier-guards.rb:10:5:10:7 | foo | true |
-| barrier-guards.rb:9:4:9:24 | call to include? | barrier-guards.rb:12:5:12:7 | foo | false |
-| barrier-guards.rb:15:4:15:15 | ... != ... | barrier-guards.rb:16:5:16:7 | foo | true |
-| barrier-guards.rb:15:4:15:15 | ... != ... | barrier-guards.rb:18:5:18:7 | foo | false |
-| barrier-guards.rb:21:8:21:19 | ... == ... | barrier-guards.rb:22:5:22:7 | foo | false |
-| barrier-guards.rb:21:8:21:19 | ... == ... | barrier-guards.rb:24:5:24:7 | foo | true |
-| barrier-guards.rb:27:8:27:19 | ... != ... | barrier-guards.rb:28:5:28:7 | foo | false |
-| barrier-guards.rb:27:8:27:19 | ... != ... | barrier-guards.rb:30:5:30:7 | foo | true |
-| barrier-guards.rb:37:4:37:20 | call to include? | barrier-guards.rb:38:5:38:7 | foo | true |
-| barrier-guards.rb:37:4:37:20 | call to include? | barrier-guards.rb:40:5:40:7 | foo | false |
-| barrier-guards.rb:43:4:43:15 | ... == ... | barrier-guards.rb:44:5:46:5 | self | true |
-| barrier-guards.rb:49:4:49:15 | ... == ... | barrier-guards.rb:50:5:53:5 | self | true |
-| barrier-guards.rb:56:4:56:15 | ... == ... | barrier-guards.rb:57:5:57:13 | my_lambda | true |
-| barrier-guards.rb:70:4:70:21 | call to include? | barrier-guards.rb:71:5:71:7 | foo | true |
-| barrier-guards.rb:70:4:70:21 | call to include? | barrier-guards.rb:73:5:73:7 | foo | false |
-| barrier-guards.rb:76:4:76:21 | call to include? | barrier-guards.rb:77:5:77:7 | foo | true |
-| barrier-guards.rb:76:4:76:21 | call to include? | barrier-guards.rb:79:5:79:7 | foo | false |
-| barrier-guards.rb:82:4:82:25 | ... != ... | barrier-guards.rb:83:5:83:7 | foo | true |
-| barrier-guards.rb:82:4:82:25 | ... != ... | barrier-guards.rb:85:5:85:7 | foo | false |
-| barrier-guards.rb:88:4:88:25 | ... == ... | barrier-guards.rb:89:5:89:7 | foo | true |
-| barrier-guards.rb:88:4:88:25 | ... == ... | barrier-guards.rb:91:5:91:7 | foo | false |
-| barrier-guards.rb:96:4:96:12 | call to condition | barrier-guards.rb:97:5:97:8 | bars | true |
-| barrier-guards.rb:100:4:100:21 | call to include? | barrier-guards.rb:101:5:101:7 | foo | true |
-| barrier-guards.rb:100:4:100:21 | call to include? | barrier-guards.rb:103:5:103:7 | foo | false |
-| barrier-guards.rb:106:4:106:4 | call to x | barrier-guards.rb:106:4:106:9 | [false] ... or ... | false |
-| barrier-guards.rb:106:4:106:4 | call to x | barrier-guards.rb:106:9:106:9 | self | false |
-| barrier-guards.rb:106:4:106:4 | call to x | barrier-guards.rb:109:5:109:8 | bars | false |
-| barrier-guards.rb:106:4:106:9 | [false] ... or ... | barrier-guards.rb:109:5:109:8 | bars | false |
-| barrier-guards.rb:106:4:106:9 | [true] ... or ... | barrier-guards.rb:107:5:107:7 | foo | true |
-| barrier-guards.rb:106:9:106:9 | call to y | barrier-guards.rb:106:4:106:9 | [false] ... or ... | false |
-| barrier-guards.rb:106:9:106:9 | call to y | barrier-guards.rb:109:5:109:8 | bars | false |
-| barrier-guards.rb:112:4:112:4 | call to x | barrier-guards.rb:112:4:112:10 | [true] ... and ... | true |
-| barrier-guards.rb:112:4:112:4 | call to x | barrier-guards.rb:112:10:112:10 | self | true |
-| barrier-guards.rb:112:4:112:4 | call to x | barrier-guards.rb:113:5:113:7 | foo | true |
-| barrier-guards.rb:112:4:112:10 | [false] ... and ... | barrier-guards.rb:115:5:115:8 | bars | false |
-| barrier-guards.rb:112:4:112:10 | [true] ... and ... | barrier-guards.rb:113:5:113:7 | foo | true |
-| barrier-guards.rb:112:10:112:10 | call to y | barrier-guards.rb:112:4:112:10 | [true] ... and ... | true |
-| barrier-guards.rb:112:10:112:10 | call to y | barrier-guards.rb:113:5:113:7 | foo | true |
-| barrier-guards.rb:118:4:118:8 | [false] not ... | barrier-guards.rb:121:5:121:8 | bars | false |
-| barrier-guards.rb:118:4:118:8 | [true] not ... | barrier-guards.rb:119:5:119:7 | foo | true |
-| barrier-guards.rb:118:8:118:8 | call to x | barrier-guards.rb:118:4:118:8 | [false] not ... | true |
-| barrier-guards.rb:118:8:118:8 | call to x | barrier-guards.rb:118:4:118:8 | [true] not ... | false |
-| barrier-guards.rb:118:8:118:8 | call to x | barrier-guards.rb:119:5:119:7 | foo | false |
-| barrier-guards.rb:118:8:118:8 | call to x | barrier-guards.rb:121:5:121:8 | bars | true |
-| barrier-guards.rb:125:1:126:19 | [match] when ... | barrier-guards.rb:126:5:126:7 | foo | match |
-| barrier-guards.rb:125:1:126:19 | [no-match] when ... | barrier-guards.rb:128:5:128:7 | foo | no-match |
-| barrier-guards.rb:125:6:125:10 | "foo" | barrier-guards.rb:125:1:126:19 | [match] when ... | match |
-| barrier-guards.rb:125:6:125:10 | "foo" | barrier-guards.rb:125:1:126:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:125:6:125:10 | "foo" | barrier-guards.rb:126:5:126:7 | foo | match |
-| barrier-guards.rb:125:6:125:10 | "foo" | barrier-guards.rb:128:5:128:7 | foo | no-match |
-| barrier-guards.rb:132:1:133:19 | [match] when ... | barrier-guards.rb:133:5:133:7 | foo | match |
-| barrier-guards.rb:132:1:133:19 | [no-match] when ... | barrier-guards.rb:134:1:135:19 | [match] when ... | no-match |
-| barrier-guards.rb:132:1:133:19 | [no-match] when ... | barrier-guards.rb:134:1:135:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:132:1:133:19 | [no-match] when ... | barrier-guards.rb:134:7:134:9 | bar | no-match |
-| barrier-guards.rb:132:1:133:19 | [no-match] when ... | barrier-guards.rb:135:5:135:7 | foo | no-match |
-| barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:132:1:133:19 | [match] when ... | match |
-| barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:132:1:133:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:133:5:133:7 | foo | match |
-| barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:134:1:135:19 | [match] when ... | no-match |
-| barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:134:1:135:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:134:7:134:9 | bar | no-match |
-| barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:135:5:135:7 | foo | no-match |
-| barrier-guards.rb:134:1:135:19 | [match] when ... | barrier-guards.rb:135:5:135:7 | foo | match |
-| barrier-guards.rb:134:6:134:10 | "bar" | barrier-guards.rb:134:1:135:19 | [match] when ... | match |
-| barrier-guards.rb:134:6:134:10 | "bar" | barrier-guards.rb:134:1:135:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:134:6:134:10 | "bar" | barrier-guards.rb:135:5:135:7 | foo | match |
-| barrier-guards.rb:139:1:140:19 | [match] when ... | barrier-guards.rb:140:5:140:7 | foo | match |
-| barrier-guards.rb:139:1:140:19 | [no-match] when ... | barrier-guards.rb:141:1:142:19 | [match] when ... | no-match |
-| barrier-guards.rb:139:1:140:19 | [no-match] when ... | barrier-guards.rb:141:1:142:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:139:1:140:19 | [no-match] when ... | barrier-guards.rb:141:7:141:9 | baz | no-match |
-| barrier-guards.rb:139:1:140:19 | [no-match] when ... | barrier-guards.rb:141:14:141:17 | quux | no-match |
-| barrier-guards.rb:139:1:140:19 | [no-match] when ... | barrier-guards.rb:142:5:142:7 | foo | no-match |
-| barrier-guards.rb:139:1:140:19 | [no-match] when ... | barrier-guards.rb:144:5:144:7 | foo | no-match |
-| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:139:1:140:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:139:14:139:16 | bar | no-match |
-| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:141:1:142:19 | [match] when ... | no-match |
-| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:141:1:142:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:141:7:141:9 | baz | no-match |
-| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:141:14:141:17 | quux | no-match |
-| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:142:5:142:7 | foo | no-match |
-| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:144:5:144:7 | foo | no-match |
-| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:139:1:140:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:141:1:142:19 | [match] when ... | no-match |
-| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:141:1:142:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:141:7:141:9 | baz | no-match |
-| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:141:14:141:17 | quux | no-match |
-| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:142:5:142:7 | foo | no-match |
-| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:144:5:144:7 | foo | no-match |
-| barrier-guards.rb:141:1:142:19 | [match] when ... | barrier-guards.rb:142:5:142:7 | foo | match |
-| barrier-guards.rb:141:1:142:19 | [no-match] when ... | barrier-guards.rb:144:5:144:7 | foo | no-match |
-| barrier-guards.rb:141:6:141:10 | "baz" | barrier-guards.rb:141:1:142:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:141:6:141:10 | "baz" | barrier-guards.rb:141:14:141:17 | quux | no-match |
-| barrier-guards.rb:141:6:141:10 | "baz" | barrier-guards.rb:144:5:144:7 | foo | no-match |
-| barrier-guards.rb:141:13:141:18 | "quux" | barrier-guards.rb:141:1:142:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:141:13:141:18 | "quux" | barrier-guards.rb:144:5:144:7 | foo | no-match |
-| barrier-guards.rb:148:1:149:19 | [match] when ... | barrier-guards.rb:149:5:149:7 | foo | match |
-| barrier-guards.rb:148:6:148:20 | * ... | barrier-guards.rb:148:1:149:19 | [match] when ... | match |
-| barrier-guards.rb:148:6:148:20 | * ... | barrier-guards.rb:148:1:149:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:148:6:148:20 | * ... | barrier-guards.rb:149:5:149:7 | foo | match |
-| barrier-guards.rb:153:1:154:19 | [match] when ... | barrier-guards.rb:154:5:154:7 | foo | match |
-| barrier-guards.rb:153:6:153:17 | * ... | barrier-guards.rb:153:1:154:19 | [match] when ... | match |
-| barrier-guards.rb:153:6:153:17 | * ... | barrier-guards.rb:153:1:154:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:153:6:153:17 | * ... | barrier-guards.rb:154:5:154:7 | foo | match |
-| barrier-guards.rb:158:1:159:19 | [match] when ... | barrier-guards.rb:159:5:159:7 | foo | match |
-| barrier-guards.rb:158:6:158:9 | * ... | barrier-guards.rb:158:1:159:19 | [match] when ... | match |
-| barrier-guards.rb:158:6:158:9 | * ... | barrier-guards.rb:158:1:159:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:158:6:158:9 | * ... | barrier-guards.rb:159:5:159:7 | foo | match |
-| barrier-guards.rb:163:1:164:19 | [match] when ... | barrier-guards.rb:164:5:164:7 | foo | match |
-| barrier-guards.rb:163:6:163:10 | * ... | barrier-guards.rb:163:1:164:19 | [match] when ... | match |
-| barrier-guards.rb:163:6:163:10 | * ... | barrier-guards.rb:163:1:164:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:163:6:163:10 | * ... | barrier-guards.rb:164:5:164:7 | foo | match |
-| barrier-guards.rb:168:1:169:7 | [match] when ... | barrier-guards.rb:169:5:169:7 | foo | match |
-| barrier-guards.rb:168:6:168:16 | * ... | barrier-guards.rb:168:1:169:7 | [match] when ... | match |
-| barrier-guards.rb:168:6:168:16 | * ... | barrier-guards.rb:168:1:169:7 | [no-match] when ... | no-match |
-| barrier-guards.rb:168:6:168:16 | * ... | barrier-guards.rb:169:5:169:7 | foo | match |
-| barrier-guards.rb:173:1:174:7 | [match] when ... | barrier-guards.rb:174:5:174:7 | foo | match |
-| barrier-guards.rb:173:6:173:10 | "foo" | barrier-guards.rb:173:1:174:7 | [no-match] when ... | no-match |
-| barrier-guards.rb:173:6:173:10 | "foo" | barrier-guards.rb:173:13:173:13 | self | no-match |
-| barrier-guards.rb:173:13:173:13 | call to x | barrier-guards.rb:173:1:174:7 | [no-match] when ... | no-match |
-| barrier-guards.rb:180:1:181:7 | [match] when ... | barrier-guards.rb:181:5:181:7 | foo | match |
-| barrier-guards.rb:180:6:180:15 | * ... | barrier-guards.rb:180:1:181:7 | [match] when ... | match |
-| barrier-guards.rb:180:6:180:15 | * ... | barrier-guards.rb:180:1:181:7 | [no-match] when ... | no-match |
-| barrier-guards.rb:180:6:180:15 | * ... | barrier-guards.rb:181:5:181:7 | foo | match |
-| barrier-guards.rb:187:1:188:7 | [match] when ... | barrier-guards.rb:188:5:188:7 | foo | match |
-| barrier-guards.rb:187:6:187:15 | * ... | barrier-guards.rb:187:1:188:7 | [match] when ... | match |
-| barrier-guards.rb:187:6:187:15 | * ... | barrier-guards.rb:187:1:188:7 | [no-match] when ... | no-match |
-| barrier-guards.rb:187:6:187:15 | * ... | barrier-guards.rb:188:5:188:7 | foo | match |
-| barrier-guards.rb:191:4:191:15 | ... == ... | barrier-guards.rb:191:4:191:31 | [false] ... or ... | false |
-| barrier-guards.rb:191:4:191:15 | ... == ... | barrier-guards.rb:191:20:191:22 | foo | false |
-| barrier-guards.rb:191:4:191:31 | [true] ... or ... | barrier-guards.rb:192:5:192:7 | foo | true |
-| barrier-guards.rb:191:20:191:31 | ... == ... | barrier-guards.rb:191:4:191:31 | [false] ... or ... | false |
-| barrier-guards.rb:195:4:195:15 | ... == ... | barrier-guards.rb:195:4:195:31 | [false] ... or ... | false |
-| barrier-guards.rb:195:4:195:15 | ... == ... | barrier-guards.rb:195:4:195:47 | [false] ... or ... | false |
-| barrier-guards.rb:195:4:195:15 | ... == ... | barrier-guards.rb:195:20:195:22 | foo | false |
-| barrier-guards.rb:195:4:195:15 | ... == ... | barrier-guards.rb:195:36:195:38 | foo | false |
-| barrier-guards.rb:195:4:195:31 | [false] ... or ... | barrier-guards.rb:195:4:195:47 | [false] ... or ... | false |
-| barrier-guards.rb:195:4:195:31 | [false] ... or ... | barrier-guards.rb:195:36:195:38 | foo | false |
-| barrier-guards.rb:195:4:195:47 | [true] ... or ... | barrier-guards.rb:196:5:196:7 | foo | true |
-| barrier-guards.rb:195:20:195:31 | ... == ... | barrier-guards.rb:195:4:195:31 | [false] ... or ... | false |
-| barrier-guards.rb:195:20:195:31 | ... == ... | barrier-guards.rb:195:4:195:47 | [false] ... or ... | false |
-| barrier-guards.rb:195:20:195:31 | ... == ... | barrier-guards.rb:195:36:195:38 | foo | false |
-| barrier-guards.rb:195:36:195:47 | ... == ... | barrier-guards.rb:195:4:195:47 | [false] ... or ... | false |
-| barrier-guards.rb:199:4:199:15 | ... == ... | barrier-guards.rb:199:4:199:31 | [false] ... or ... | false |
-| barrier-guards.rb:199:4:199:15 | ... == ... | barrier-guards.rb:199:4:199:43 | [false] ... or ... | false |
-| barrier-guards.rb:199:4:199:15 | ... == ... | barrier-guards.rb:199:20:199:22 | foo | false |
-| barrier-guards.rb:199:4:199:15 | ... == ... | barrier-guards.rb:199:36:199:38 | foo | false |
-| barrier-guards.rb:199:4:199:31 | [false] ... or ... | barrier-guards.rb:199:4:199:43 | [false] ... or ... | false |
-| barrier-guards.rb:199:4:199:31 | [false] ... or ... | barrier-guards.rb:199:36:199:38 | foo | false |
-| barrier-guards.rb:199:4:199:43 | [true] ... or ... | barrier-guards.rb:200:5:200:7 | foo | true |
-| barrier-guards.rb:199:20:199:31 | ... == ... | barrier-guards.rb:199:4:199:31 | [false] ... or ... | false |
-| barrier-guards.rb:199:20:199:31 | ... == ... | barrier-guards.rb:199:4:199:43 | [false] ... or ... | false |
-| barrier-guards.rb:199:20:199:31 | ... == ... | barrier-guards.rb:199:36:199:38 | foo | false |
-| barrier-guards.rb:199:36:199:43 | ... == ... | barrier-guards.rb:199:4:199:43 | [false] ... or ... | false |
-| barrier-guards.rb:203:4:203:15 | ... == ... | barrier-guards.rb:203:4:203:31 | [false] ... or ... | false |
-| barrier-guards.rb:203:4:203:15 | ... == ... | barrier-guards.rb:203:4:203:47 | [false] ... or ... | false |
-| barrier-guards.rb:203:4:203:15 | ... == ... | barrier-guards.rb:203:20:203:22 | self | false |
-| barrier-guards.rb:203:4:203:15 | ... == ... | barrier-guards.rb:203:36:203:38 | foo | false |
-| barrier-guards.rb:203:4:203:31 | [false] ... or ... | barrier-guards.rb:203:4:203:47 | [false] ... or ... | false |
-| barrier-guards.rb:203:4:203:31 | [false] ... or ... | barrier-guards.rb:203:36:203:38 | foo | false |
-| barrier-guards.rb:203:4:203:47 | [true] ... or ... | barrier-guards.rb:204:5:204:7 | foo | true |
-| barrier-guards.rb:203:20:203:31 | ... == ... | barrier-guards.rb:203:4:203:31 | [false] ... or ... | false |
-| barrier-guards.rb:203:20:203:31 | ... == ... | barrier-guards.rb:203:4:203:47 | [false] ... or ... | false |
-| barrier-guards.rb:203:20:203:31 | ... == ... | barrier-guards.rb:203:36:203:38 | foo | false |
-| barrier-guards.rb:203:36:203:47 | ... == ... | barrier-guards.rb:203:4:203:47 | [false] ... or ... | false |
-| barrier-guards.rb:207:4:207:15 | ... == ... | barrier-guards.rb:207:4:207:21 | [true] ... and ... | true |
-| barrier-guards.rb:207:4:207:15 | ... == ... | barrier-guards.rb:207:21:207:21 | self | true |
-| barrier-guards.rb:207:4:207:15 | ... == ... | barrier-guards.rb:208:5:208:7 | foo | true |
-| barrier-guards.rb:207:4:207:21 | [true] ... and ... | barrier-guards.rb:208:5:208:7 | foo | true |
-| barrier-guards.rb:207:21:207:21 | call to x | barrier-guards.rb:207:4:207:21 | [true] ... and ... | true |
-| barrier-guards.rb:207:21:207:21 | call to x | barrier-guards.rb:208:5:208:7 | foo | true |
-| barrier-guards.rb:211:4:211:4 | call to x | barrier-guards.rb:211:4:211:21 | [true] ... and ... | true |
-| barrier-guards.rb:211:4:211:4 | call to x | barrier-guards.rb:211:10:211:12 | foo | true |
-| barrier-guards.rb:211:4:211:4 | call to x | barrier-guards.rb:212:5:212:7 | foo | true |
-| barrier-guards.rb:211:4:211:21 | [true] ... and ... | barrier-guards.rb:212:5:212:7 | foo | true |
-| barrier-guards.rb:211:10:211:21 | ... == ... | barrier-guards.rb:211:4:211:21 | [true] ... and ... | true |
-| barrier-guards.rb:211:10:211:21 | ... == ... | barrier-guards.rb:212:5:212:7 | foo | true |
-| barrier-guards.rb:215:4:215:4 | call to x | barrier-guards.rb:215:4:215:10 | [true] ... and ... | true |
-| barrier-guards.rb:215:4:215:4 | call to x | barrier-guards.rb:215:4:215:27 | [true] ... and ... | true |
-| barrier-guards.rb:215:4:215:4 | call to x | barrier-guards.rb:215:10:215:10 | self | true |
-| barrier-guards.rb:215:4:215:4 | call to x | barrier-guards.rb:215:16:215:18 | foo | true |
-| barrier-guards.rb:215:4:215:4 | call to x | barrier-guards.rb:216:5:216:7 | foo | true |
-| barrier-guards.rb:215:4:215:10 | [true] ... and ... | barrier-guards.rb:215:4:215:27 | [true] ... and ... | true |
-| barrier-guards.rb:215:4:215:10 | [true] ... and ... | barrier-guards.rb:215:16:215:18 | foo | true |
-| barrier-guards.rb:215:4:215:10 | [true] ... and ... | barrier-guards.rb:216:5:216:7 | foo | true |
-| barrier-guards.rb:215:4:215:27 | [true] ... and ... | barrier-guards.rb:216:5:216:7 | foo | true |
-| barrier-guards.rb:215:10:215:10 | call to y | barrier-guards.rb:215:4:215:10 | [true] ... and ... | true |
-| barrier-guards.rb:215:10:215:10 | call to y | barrier-guards.rb:215:4:215:27 | [true] ... and ... | true |
-| barrier-guards.rb:215:10:215:10 | call to y | barrier-guards.rb:215:16:215:18 | foo | true |
-| barrier-guards.rb:215:10:215:10 | call to y | barrier-guards.rb:216:5:216:7 | foo | true |
-| barrier-guards.rb:215:16:215:27 | ... == ... | barrier-guards.rb:215:4:215:27 | [true] ... and ... | true |
-| barrier-guards.rb:215:16:215:27 | ... == ... | barrier-guards.rb:216:5:216:7 | foo | true |
-| barrier-guards.rb:219:4:219:15 | ... == ... | barrier-guards.rb:219:4:219:32 | [true] ... and ... | true |
-| barrier-guards.rb:219:4:219:15 | ... == ... | barrier-guards.rb:219:21:219:23 | foo | true |
-| barrier-guards.rb:219:4:219:15 | ... == ... | barrier-guards.rb:220:5:220:7 | foo | true |
-| barrier-guards.rb:219:4:219:32 | [true] ... and ... | barrier-guards.rb:220:5:220:7 | foo | true |
-| barrier-guards.rb:219:21:219:32 | ... == ... | barrier-guards.rb:219:4:219:32 | [true] ... and ... | true |
-| barrier-guards.rb:219:21:219:32 | ... == ... | barrier-guards.rb:220:5:220:7 | foo | true |
-| barrier-guards.rb:223:4:223:4 | call to x | barrier-guards.rb:223:4:223:10 | [true] ... and ... | true |
-| barrier-guards.rb:223:4:223:4 | call to x | barrier-guards.rb:223:10:223:10 | self | true |
-| barrier-guards.rb:223:4:223:4 | call to x | barrier-guards.rb:224:5:224:7 | foo | true |
-| barrier-guards.rb:223:4:223:10 | [true] ... and ... | barrier-guards.rb:224:5:224:7 | foo | true |
-| barrier-guards.rb:223:10:223:10 | call to y | barrier-guards.rb:223:4:223:10 | [true] ... and ... | true |
-| barrier-guards.rb:223:10:223:10 | call to y | barrier-guards.rb:224:5:224:7 | foo | true |
-| barrier-guards.rb:227:4:227:15 | ... == ... | barrier-guards.rb:227:4:227:21 | [true] ... and ... | true |
-| barrier-guards.rb:227:4:227:15 | ... == ... | barrier-guards.rb:227:21:227:21 | self | true |
-| barrier-guards.rb:227:4:227:15 | ... == ... | barrier-guards.rb:228:5:228:7 | self | true |
-| barrier-guards.rb:227:4:227:21 | [true] ... and ... | barrier-guards.rb:228:5:228:7 | self | true |
-| barrier-guards.rb:227:21:227:21 | call to y | barrier-guards.rb:227:4:227:21 | [true] ... and ... | true |
-| barrier-guards.rb:227:21:227:21 | call to y | barrier-guards.rb:228:5:228:7 | self | true |
-| barrier-guards.rb:232:1:233:19 | [match] when ... | barrier-guards.rb:233:5:233:7 | foo | match |
-| barrier-guards.rb:232:6:232:17 | ... == ... | barrier-guards.rb:232:1:233:19 | [match] when ... | match |
-| barrier-guards.rb:232:6:232:17 | ... == ... | barrier-guards.rb:232:1:233:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:232:6:232:17 | ... == ... | barrier-guards.rb:233:5:233:7 | foo | match |
-| barrier-guards.rb:237:1:237:38 | [match] when ... | barrier-guards.rb:237:24:237:26 | foo | match |
-| barrier-guards.rb:237:1:237:38 | [no-match] when ... | barrier-guards.rb:238:1:238:26 | [match] when ... | no-match |
-| barrier-guards.rb:237:1:237:38 | [no-match] when ... | barrier-guards.rb:238:1:238:26 | [no-match] when ... | no-match |
-| barrier-guards.rb:237:1:237:38 | [no-match] when ... | barrier-guards.rb:238:6:238:8 | self | no-match |
-| barrier-guards.rb:237:1:237:38 | [no-match] when ... | barrier-guards.rb:238:24:238:26 | foo | no-match |
-| barrier-guards.rb:237:1:237:38 | [no-match] when ... | barrier-guards.rb:239:1:239:22 | [match] when ... | no-match |
-| barrier-guards.rb:237:1:237:38 | [no-match] when ... | barrier-guards.rb:239:1:239:22 | [no-match] when ... | no-match |
-| barrier-guards.rb:237:1:237:38 | [no-match] when ... | barrier-guards.rb:239:6:239:8 | foo | no-match |
-| barrier-guards.rb:237:1:237:38 | [no-match] when ... | barrier-guards.rb:239:20:239:22 | foo | no-match |
-| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:237:1:237:38 | [match] when ... | match |
-| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:237:1:237:38 | [no-match] when ... | no-match |
-| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:237:24:237:26 | foo | match |
-| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:238:1:238:26 | [match] when ... | no-match |
-| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:238:1:238:26 | [no-match] when ... | no-match |
-| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:238:6:238:8 | self | no-match |
-| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:238:24:238:26 | foo | no-match |
-| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:239:1:239:22 | [match] when ... | no-match |
-| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:239:1:239:22 | [no-match] when ... | no-match |
-| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:239:6:239:8 | foo | no-match |
-| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:239:20:239:22 | foo | no-match |
-| barrier-guards.rb:238:1:238:26 | [match] when ... | barrier-guards.rb:238:24:238:26 | foo | match |
-| barrier-guards.rb:238:1:238:26 | [no-match] when ... | barrier-guards.rb:239:1:239:22 | [match] when ... | no-match |
-| barrier-guards.rb:238:1:238:26 | [no-match] when ... | barrier-guards.rb:239:1:239:22 | [no-match] when ... | no-match |
-| barrier-guards.rb:238:1:238:26 | [no-match] when ... | barrier-guards.rb:239:6:239:8 | foo | no-match |
-| barrier-guards.rb:238:1:238:26 | [no-match] when ... | barrier-guards.rb:239:20:239:22 | foo | no-match |
-| barrier-guards.rb:238:6:238:17 | ... == ... | barrier-guards.rb:238:1:238:26 | [match] when ... | match |
-| barrier-guards.rb:238:6:238:17 | ... == ... | barrier-guards.rb:238:1:238:26 | [no-match] when ... | no-match |
-| barrier-guards.rb:238:6:238:17 | ... == ... | barrier-guards.rb:238:24:238:26 | foo | match |
-| barrier-guards.rb:238:6:238:17 | ... == ... | barrier-guards.rb:239:1:239:22 | [match] when ... | no-match |
-| barrier-guards.rb:238:6:238:17 | ... == ... | barrier-guards.rb:239:1:239:22 | [no-match] when ... | no-match |
-| barrier-guards.rb:238:6:238:17 | ... == ... | barrier-guards.rb:239:6:239:8 | foo | no-match |
-| barrier-guards.rb:238:6:238:17 | ... == ... | barrier-guards.rb:239:20:239:22 | foo | no-match |
-| barrier-guards.rb:239:1:239:22 | [match] when ... | barrier-guards.rb:239:20:239:22 | foo | match |
-| barrier-guards.rb:239:6:239:13 | ... == ... | barrier-guards.rb:239:1:239:22 | [match] when ... | match |
-| barrier-guards.rb:239:6:239:13 | ... == ... | barrier-guards.rb:239:1:239:22 | [no-match] when ... | no-match |
-| barrier-guards.rb:239:6:239:13 | ... == ... | barrier-guards.rb:239:20:239:22 | foo | match |
-| barrier-guards.rb:243:4:243:8 | "foo" | barrier-guards.rb:244:5:244:7 | foo | match |
-| barrier-guards.rb:243:4:243:8 | "foo" | barrier-guards.rb:245:1:246:7 | in ... then ... | no-match |
-| barrier-guards.rb:243:4:243:8 | "foo" | barrier-guards.rb:246:5:246:7 | foo | no-match |
-| barrier-guards.rb:245:4:245:4 | x | barrier-guards.rb:246:5:246:7 | foo | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:251:5:251:7 | foo | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:254:1:256:3 | if ... | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:255:5:255:7 | foo | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:259:1:261:3 | if ... | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:260:5:260:7 | foo | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:264:1:266:3 | if ... | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:265:5:265:7 | foo | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:268:1:270:3 | if ... | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:269:5:269:7 | foo | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:272:1:272:19 | ... && ... | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:272:17:272:19 | foo | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:273:1:273:19 | ... && ... | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:273:8:273:10 | foo | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:275:1:277:3 | if ... | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:276:5:276:7 | foo | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:281:1:283:3 | if ... | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:282:5:282:7 | foo | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:286:1:288:3 | if ... | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:287:5:287:7 | foo | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:290:1:295:3 | case ... | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:291:1:292:19 | [match] when ... | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:291:1:292:19 | [no-match] when ... | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:292:5:292:7 | foo | match |
-| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:294:5:294:7 | foo | match |
-| barrier-guards.rb:254:4:254:28 | ... == ... | barrier-guards.rb:255:5:255:7 | foo | true |
-| barrier-guards.rb:259:4:259:16 | ... == ... | barrier-guards.rb:260:5:260:7 | foo | true |
-| barrier-guards.rb:264:4:264:16 | ... == ... | barrier-guards.rb:265:5:265:7 | foo | true |
-| barrier-guards.rb:268:4:268:30 | ... == ... | barrier-guards.rb:269:5:269:7 | foo | true |
-| barrier-guards.rb:272:1:272:12 | ... == ... | barrier-guards.rb:272:17:272:19 | foo | true |
-| barrier-guards.rb:273:1:273:3 | foo | barrier-guards.rb:273:8:273:10 | foo | true |
-| barrier-guards.rb:275:4:275:19 | call to include? | barrier-guards.rb:276:5:276:7 | foo | true |
-| barrier-guards.rb:281:4:281:20 | call to include? | barrier-guards.rb:282:5:282:7 | foo | true |
-| barrier-guards.rb:286:4:286:20 | call to include? | barrier-guards.rb:287:5:287:7 | foo | true |
-| barrier-guards.rb:291:1:292:19 | [match] when ... | barrier-guards.rb:292:5:292:7 | foo | match |
-| barrier-guards.rb:291:1:292:19 | [no-match] when ... | barrier-guards.rb:294:5:294:7 | foo | no-match |
-| barrier-guards.rb:291:6:291:6 | g | barrier-guards.rb:291:1:292:19 | [match] when ... | match |
-| barrier-guards.rb:291:6:291:6 | g | barrier-guards.rb:291:1:292:19 | [no-match] when ... | no-match |
-| barrier-guards.rb:291:6:291:6 | g | barrier-guards.rb:292:5:292:7 | foo | match |
-| barrier-guards.rb:291:6:291:6 | g | barrier-guards.rb:294:5:294:7 | foo | no-match |
-| barrier_flow.rb:10:8:10:18 | ... != ... | barrier_flow.rb:11:9:11:14 | self | true |
-| barrier_flow.rb:18:8:18:18 | ... == ... | barrier_flow.rb:19:9:19:14 | self | true |
-| barrier_flow.rb:26:19:26:29 | ... == ... | barrier_flow.rb:26:5:26:10 | self | false |
-| barrier_flow.rb:32:19:32:29 | ... != ... | barrier_flow.rb:32:5:32:10 | self | false |
-| barrier_flow.rb:38:8:38:18 | ... != ... | barrier_flow.rb:39:9:39:9 | x | true |
-| barrier_flow.rb:48:23:48:33 | ... == ... | barrier_flow.rb:48:5:48:5 | x | false |
-| barrier_flow.rb:56:8:56:8 | b | barrier_flow.rb:57:9:57:14 | return | true |
-| barrier_flow.rb:56:8:56:8 | b | barrier_flow.rb:57:9:57:34 | ... unless ... | true |
-| barrier_flow.rb:56:8:56:8 | b | barrier_flow.rb:57:23:57:23 | x | true |
-| barrier_flow.rb:56:8:56:8 | b | barrier_flow.rb:59:9:59:14 | return | false |
-| barrier_flow.rb:56:8:56:8 | b | barrier_flow.rb:59:9:59:34 | ... unless ... | false |
-| barrier_flow.rb:56:8:56:8 | b | barrier_flow.rb:59:23:59:23 | x | false |
-| barrier_flow.rb:57:23:57:34 | ... == ... | barrier_flow.rb:57:9:57:14 | return | false |
-| barrier_flow.rb:57:23:57:34 | ... == ... | barrier_flow.rb:57:9:57:34 | ... unless ... | true |
-| barrier_flow.rb:59:23:59:34 | ... == ... | barrier_flow.rb:59:9:59:14 | return | false |
-| barrier_flow.rb:59:23:59:34 | ... == ... | barrier_flow.rb:59:9:59:34 | ... unless ... | true |
-| barrier_flow.rb:68:8:68:8 | b | barrier_flow.rb:69:9:71:11 | if ... | true |
-| barrier_flow.rb:68:8:68:8 | b | barrier_flow.rb:69:12:69:12 | x | true |
-| barrier_flow.rb:68:8:68:8 | b | barrier_flow.rb:70:13:70:18 | return | true |
-| barrier_flow.rb:68:8:68:8 | b | barrier_flow.rb:73:9:75:11 | if ... | false |
-| barrier_flow.rb:68:8:68:8 | b | barrier_flow.rb:73:12:73:12 | x | false |
-| barrier_flow.rb:68:8:68:8 | b | barrier_flow.rb:74:13:74:18 | return | false |
-| barrier_flow.rb:69:12:69:23 | ... != ... | barrier_flow.rb:69:9:71:11 | if ... | false |
-| barrier_flow.rb:69:12:69:23 | ... != ... | barrier_flow.rb:70:13:70:18 | return | true |
-| barrier_flow.rb:73:12:73:23 | ... != ... | barrier_flow.rb:73:9:75:11 | if ... | false |
-| barrier_flow.rb:73:12:73:23 | ... != ... | barrier_flow.rb:74:13:74:18 | return | true |
+| barrier-guards.rb:3:4:3:15 | ... == ... | barrier-guards.rb:3:4:3:15 | After ... == ... [false] | false |
+| barrier-guards.rb:3:4:3:15 | ... == ... | barrier-guards.rb:3:4:3:15 | After ... == ... [true] | true |
+| barrier-guards.rb:9:4:9:24 | call to include? | barrier-guards.rb:9:4:9:24 | After call to include? [false] | false |
+| barrier-guards.rb:9:4:9:24 | call to include? | barrier-guards.rb:9:4:9:24 | After call to include? [true] | true |
+| barrier-guards.rb:15:4:15:15 | ... != ... | barrier-guards.rb:15:4:15:15 | After ... != ... [false] | false |
+| barrier-guards.rb:15:4:15:15 | ... != ... | barrier-guards.rb:15:4:15:15 | After ... != ... [true] | true |
+| barrier-guards.rb:21:8:21:19 | ... == ... | barrier-guards.rb:21:8:21:19 | After ... == ... [false] | false |
+| barrier-guards.rb:21:8:21:19 | ... == ... | barrier-guards.rb:21:8:21:19 | After ... == ... [true] | true |
+| barrier-guards.rb:27:8:27:19 | ... != ... | barrier-guards.rb:27:8:27:19 | After ... != ... [false] | false |
+| barrier-guards.rb:27:8:27:19 | ... != ... | barrier-guards.rb:27:8:27:19 | After ... != ... [true] | true |
+| barrier-guards.rb:37:4:37:20 | call to include? | barrier-guards.rb:37:4:37:20 | After call to include? [false] | false |
+| barrier-guards.rb:37:4:37:20 | call to include? | barrier-guards.rb:37:4:37:20 | After call to include? [true] | true |
+| barrier-guards.rb:43:4:43:15 | ... == ... | barrier-guards.rb:43:4:43:15 | After ... == ... [false] | false |
+| barrier-guards.rb:43:4:43:15 | ... == ... | barrier-guards.rb:43:4:43:15 | After ... == ... [true] | true |
+| barrier-guards.rb:49:4:49:15 | ... == ... | barrier-guards.rb:49:4:49:15 | After ... == ... [false] | false |
+| barrier-guards.rb:49:4:49:15 | ... == ... | barrier-guards.rb:49:4:49:15 | After ... == ... [true] | true |
+| barrier-guards.rb:56:4:56:15 | ... == ... | barrier-guards.rb:56:4:56:15 | After ... == ... [false] | false |
+| barrier-guards.rb:56:4:56:15 | ... == ... | barrier-guards.rb:56:4:56:15 | After ... == ... [true] | true |
+| barrier-guards.rb:70:4:70:21 | call to include? | barrier-guards.rb:70:4:70:21 | After call to include? [false] | false |
+| barrier-guards.rb:70:4:70:21 | call to include? | barrier-guards.rb:70:4:70:21 | After call to include? [true] | true |
+| barrier-guards.rb:76:4:76:21 | call to include? | barrier-guards.rb:76:4:76:21 | After call to include? [false] | false |
+| barrier-guards.rb:76:4:76:21 | call to include? | barrier-guards.rb:76:4:76:21 | After call to include? [true] | true |
+| barrier-guards.rb:82:4:82:25 | ... != ... | barrier-guards.rb:82:4:82:25 | After ... != ... [false] | false |
+| barrier-guards.rb:82:4:82:25 | ... != ... | barrier-guards.rb:82:4:82:25 | After ... != ... [true] | true |
+| barrier-guards.rb:88:4:88:25 | ... == ... | barrier-guards.rb:88:4:88:25 | After ... == ... [false] | false |
+| barrier-guards.rb:88:4:88:25 | ... == ... | barrier-guards.rb:88:4:88:25 | After ... == ... [true] | true |
+| barrier-guards.rb:96:4:96:12 | call to condition | barrier-guards.rb:96:4:96:12 | After call to condition [false] | false |
+| barrier-guards.rb:96:4:96:12 | call to condition | barrier-guards.rb:96:4:96:12 | After call to condition [true] | true |
+| barrier-guards.rb:100:4:100:21 | call to include? | barrier-guards.rb:100:4:100:21 | After call to include? [false] | false |
+| barrier-guards.rb:100:4:100:21 | call to include? | barrier-guards.rb:100:4:100:21 | After call to include? [true] | true |
+| barrier-guards.rb:106:4:106:4 | call to x | barrier-guards.rb:106:4:106:4 | After call to x [false] | false |
+| barrier-guards.rb:106:4:106:4 | call to x | barrier-guards.rb:106:4:106:4 | After call to x [true] | true |
+| barrier-guards.rb:106:4:106:4 | call to x | barrier-guards.rb:106:9:106:9 | After call to y [false] | false |
+| barrier-guards.rb:106:4:106:4 | call to x | barrier-guards.rb:106:9:106:9 | After call to y [true] | false |
+| barrier-guards.rb:106:9:106:9 | call to y | barrier-guards.rb:106:9:106:9 | After call to y [false] | false |
+| barrier-guards.rb:106:9:106:9 | call to y | barrier-guards.rb:106:9:106:9 | After call to y [true] | true |
+| barrier-guards.rb:112:4:112:4 | call to x | barrier-guards.rb:112:4:112:4 | After call to x [false] | false |
+| barrier-guards.rb:112:4:112:4 | call to x | barrier-guards.rb:112:4:112:4 | After call to x [true] | true |
+| barrier-guards.rb:112:4:112:4 | call to x | barrier-guards.rb:112:10:112:10 | After call to y [false] | true |
+| barrier-guards.rb:112:4:112:4 | call to x | barrier-guards.rb:112:10:112:10 | After call to y [true] | true |
+| barrier-guards.rb:112:10:112:10 | call to y | barrier-guards.rb:112:10:112:10 | After call to y [false] | false |
+| barrier-guards.rb:112:10:112:10 | call to y | barrier-guards.rb:112:10:112:10 | After call to y [true] | true |
+| barrier-guards.rb:118:8:118:8 | call to x | barrier-guards.rb:118:8:118:8 | After call to x [false] | false |
+| barrier-guards.rb:118:8:118:8 | call to x | barrier-guards.rb:118:8:118:8 | After call to x [true] | true |
+| barrier-guards.rb:125:6:125:10 | "foo" | barrier-guards.rb:125:6:125:10 | After "foo" [match] | match |
+| barrier-guards.rb:125:6:125:10 | "foo" | barrier-guards.rb:125:6:125:10 | After "foo" [no-match] | no-match |
+| barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:132:6:132:10 | After "foo" [match] | match |
+| barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:132:6:132:10 | After "foo" [no-match] | no-match |
+| barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:134:6:134:10 | After "bar" [match] | no-match |
+| barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:134:6:134:10 | After "bar" [no-match] | no-match |
+| barrier-guards.rb:134:6:134:10 | "bar" | barrier-guards.rb:134:6:134:10 | After "bar" [match] | match |
+| barrier-guards.rb:134:6:134:10 | "bar" | barrier-guards.rb:134:6:134:10 | After "bar" [no-match] | no-match |
+| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:139:6:139:10 | After "foo" [match] | match |
+| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:139:6:139:10 | After "foo" [no-match] | no-match |
+| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:139:13:139:17 | After "bar" [match] | no-match |
+| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:139:13:139:17 | After "bar" [no-match] | no-match |
+| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:141:1:142:19 | After when ... [match] | no-match |
+| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:141:6:141:10 | After "baz" [match] | no-match |
+| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:141:6:141:10 | After "baz" [no-match] | no-match |
+| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:141:13:141:18 | After "quux" [match] | no-match |
+| barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:141:13:141:18 | After "quux" [no-match] | no-match |
+| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:139:13:139:17 | After "bar" [match] | match |
+| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:139:13:139:17 | After "bar" [no-match] | no-match |
+| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:141:1:142:19 | After when ... [match] | no-match |
+| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:141:6:141:10 | After "baz" [match] | no-match |
+| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:141:6:141:10 | After "baz" [no-match] | no-match |
+| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:141:13:141:18 | After "quux" [match] | no-match |
+| barrier-guards.rb:139:13:139:17 | "bar" | barrier-guards.rb:141:13:141:18 | After "quux" [no-match] | no-match |
+| barrier-guards.rb:141:6:141:10 | "baz" | barrier-guards.rb:141:6:141:10 | After "baz" [match] | match |
+| barrier-guards.rb:141:6:141:10 | "baz" | barrier-guards.rb:141:6:141:10 | After "baz" [no-match] | no-match |
+| barrier-guards.rb:141:6:141:10 | "baz" | barrier-guards.rb:141:13:141:18 | After "quux" [match] | no-match |
+| barrier-guards.rb:141:6:141:10 | "baz" | barrier-guards.rb:141:13:141:18 | After "quux" [no-match] | no-match |
+| barrier-guards.rb:141:13:141:18 | "quux" | barrier-guards.rb:141:13:141:18 | After "quux" [match] | match |
+| barrier-guards.rb:141:13:141:18 | "quux" | barrier-guards.rb:141:13:141:18 | After "quux" [no-match] | no-match |
+| barrier-guards.rb:148:6:148:20 | * ... | barrier-guards.rb:148:6:148:20 | After * ... [match] | match |
+| barrier-guards.rb:148:6:148:20 | * ... | barrier-guards.rb:148:6:148:20 | After * ... [no-match] | no-match |
+| barrier-guards.rb:153:6:153:17 | * ... | barrier-guards.rb:153:6:153:17 | After * ... [match] | match |
+| barrier-guards.rb:153:6:153:17 | * ... | barrier-guards.rb:153:6:153:17 | After * ... [no-match] | no-match |
+| barrier-guards.rb:158:6:158:9 | * ... | barrier-guards.rb:158:6:158:9 | After * ... [match] | match |
+| barrier-guards.rb:158:6:158:9 | * ... | barrier-guards.rb:158:6:158:9 | After * ... [no-match] | no-match |
+| barrier-guards.rb:163:6:163:10 | * ... | barrier-guards.rb:163:6:163:10 | After * ... [match] | match |
+| barrier-guards.rb:163:6:163:10 | * ... | barrier-guards.rb:163:6:163:10 | After * ... [no-match] | no-match |
+| barrier-guards.rb:168:6:168:16 | * ... | barrier-guards.rb:168:6:168:16 | After * ... [match] | match |
+| barrier-guards.rb:168:6:168:16 | * ... | barrier-guards.rb:168:6:168:16 | After * ... [no-match] | no-match |
+| barrier-guards.rb:173:6:173:10 | "foo" | barrier-guards.rb:173:6:173:10 | After "foo" [match] | match |
+| barrier-guards.rb:173:6:173:10 | "foo" | barrier-guards.rb:173:6:173:10 | After "foo" [no-match] | no-match |
+| barrier-guards.rb:173:6:173:10 | "foo" | barrier-guards.rb:173:13:173:13 | After call to x [match] | no-match |
+| barrier-guards.rb:173:6:173:10 | "foo" | barrier-guards.rb:173:13:173:13 | After call to x [no-match] | no-match |
+| barrier-guards.rb:173:13:173:13 | call to x | barrier-guards.rb:173:13:173:13 | After call to x [match] | match |
+| barrier-guards.rb:173:13:173:13 | call to x | barrier-guards.rb:173:13:173:13 | After call to x [no-match] | no-match |
+| barrier-guards.rb:180:6:180:15 | * ... | barrier-guards.rb:180:6:180:15 | After * ... [match] | match |
+| barrier-guards.rb:180:6:180:15 | * ... | barrier-guards.rb:180:6:180:15 | After * ... [no-match] | no-match |
+| barrier-guards.rb:187:6:187:15 | * ... | barrier-guards.rb:187:6:187:15 | After * ... [match] | match |
+| barrier-guards.rb:187:6:187:15 | * ... | barrier-guards.rb:187:6:187:15 | After * ... [no-match] | no-match |
+| barrier-guards.rb:191:4:191:15 | ... == ... | barrier-guards.rb:191:4:191:15 | After ... == ... [false] | false |
+| barrier-guards.rb:191:4:191:15 | ... == ... | barrier-guards.rb:191:4:191:15 | After ... == ... [true] | true |
+| barrier-guards.rb:191:4:191:15 | ... == ... | barrier-guards.rb:191:20:191:31 | After ... == ... [false] | false |
+| barrier-guards.rb:191:4:191:15 | ... == ... | barrier-guards.rb:191:20:191:31 | After ... == ... [true] | false |
+| barrier-guards.rb:191:20:191:31 | ... == ... | barrier-guards.rb:191:20:191:31 | After ... == ... [false] | false |
+| barrier-guards.rb:191:20:191:31 | ... == ... | barrier-guards.rb:191:20:191:31 | After ... == ... [true] | true |
+| barrier-guards.rb:195:4:195:15 | ... == ... | barrier-guards.rb:195:4:195:15 | After ... == ... [false] | false |
+| barrier-guards.rb:195:4:195:15 | ... == ... | barrier-guards.rb:195:4:195:15 | After ... == ... [true] | true |
+| barrier-guards.rb:195:4:195:15 | ... == ... | barrier-guards.rb:195:20:195:31 | After ... == ... [false] | false |
+| barrier-guards.rb:195:4:195:15 | ... == ... | barrier-guards.rb:195:20:195:31 | After ... == ... [true] | false |
+| barrier-guards.rb:195:4:195:15 | ... == ... | barrier-guards.rb:195:36:195:47 | After ... == ... [false] | false |
+| barrier-guards.rb:195:4:195:15 | ... == ... | barrier-guards.rb:195:36:195:47 | After ... == ... [true] | false |
+| barrier-guards.rb:195:20:195:31 | ... == ... | barrier-guards.rb:195:20:195:31 | After ... == ... [false] | false |
+| barrier-guards.rb:195:20:195:31 | ... == ... | barrier-guards.rb:195:20:195:31 | After ... == ... [true] | true |
+| barrier-guards.rb:195:20:195:31 | ... == ... | barrier-guards.rb:195:36:195:47 | After ... == ... [false] | false |
+| barrier-guards.rb:195:20:195:31 | ... == ... | barrier-guards.rb:195:36:195:47 | After ... == ... [true] | false |
+| barrier-guards.rb:195:36:195:47 | ... == ... | barrier-guards.rb:195:36:195:47 | After ... == ... [false] | false |
+| barrier-guards.rb:195:36:195:47 | ... == ... | barrier-guards.rb:195:36:195:47 | After ... == ... [true] | true |
+| barrier-guards.rb:199:4:199:15 | ... == ... | barrier-guards.rb:199:4:199:15 | After ... == ... [false] | false |
+| barrier-guards.rb:199:4:199:15 | ... == ... | barrier-guards.rb:199:4:199:15 | After ... == ... [true] | true |
+| barrier-guards.rb:199:4:199:15 | ... == ... | barrier-guards.rb:199:20:199:31 | After ... == ... [false] | false |
+| barrier-guards.rb:199:4:199:15 | ... == ... | barrier-guards.rb:199:20:199:31 | After ... == ... [true] | false |
+| barrier-guards.rb:199:4:199:15 | ... == ... | barrier-guards.rb:199:36:199:43 | After ... == ... [false] | false |
+| barrier-guards.rb:199:4:199:15 | ... == ... | barrier-guards.rb:199:36:199:43 | After ... == ... [true] | false |
+| barrier-guards.rb:199:20:199:31 | ... == ... | barrier-guards.rb:199:20:199:31 | After ... == ... [false] | false |
+| barrier-guards.rb:199:20:199:31 | ... == ... | barrier-guards.rb:199:20:199:31 | After ... == ... [true] | true |
+| barrier-guards.rb:199:20:199:31 | ... == ... | barrier-guards.rb:199:36:199:43 | After ... == ... [false] | false |
+| barrier-guards.rb:199:20:199:31 | ... == ... | barrier-guards.rb:199:36:199:43 | After ... == ... [true] | false |
+| barrier-guards.rb:199:36:199:43 | ... == ... | barrier-guards.rb:199:36:199:43 | After ... == ... [false] | false |
+| barrier-guards.rb:199:36:199:43 | ... == ... | barrier-guards.rb:199:36:199:43 | After ... == ... [true] | true |
+| barrier-guards.rb:203:4:203:15 | ... == ... | barrier-guards.rb:203:4:203:15 | After ... == ... [false] | false |
+| barrier-guards.rb:203:4:203:15 | ... == ... | barrier-guards.rb:203:4:203:15 | After ... == ... [true] | true |
+| barrier-guards.rb:203:4:203:15 | ... == ... | barrier-guards.rb:203:20:203:31 | After ... == ... [false] | false |
+| barrier-guards.rb:203:4:203:15 | ... == ... | barrier-guards.rb:203:20:203:31 | After ... == ... [true] | false |
+| barrier-guards.rb:203:4:203:15 | ... == ... | barrier-guards.rb:203:36:203:47 | After ... == ... [false] | false |
+| barrier-guards.rb:203:4:203:15 | ... == ... | barrier-guards.rb:203:36:203:47 | After ... == ... [true] | false |
+| barrier-guards.rb:203:20:203:31 | ... == ... | barrier-guards.rb:203:20:203:31 | After ... == ... [false] | false |
+| barrier-guards.rb:203:20:203:31 | ... == ... | barrier-guards.rb:203:20:203:31 | After ... == ... [true] | true |
+| barrier-guards.rb:203:20:203:31 | ... == ... | barrier-guards.rb:203:36:203:47 | After ... == ... [false] | false |
+| barrier-guards.rb:203:20:203:31 | ... == ... | barrier-guards.rb:203:36:203:47 | After ... == ... [true] | false |
+| barrier-guards.rb:203:36:203:47 | ... == ... | barrier-guards.rb:203:36:203:47 | After ... == ... [false] | false |
+| barrier-guards.rb:203:36:203:47 | ... == ... | barrier-guards.rb:203:36:203:47 | After ... == ... [true] | true |
+| barrier-guards.rb:207:4:207:15 | ... == ... | barrier-guards.rb:207:4:207:15 | After ... == ... [false] | false |
+| barrier-guards.rb:207:4:207:15 | ... == ... | barrier-guards.rb:207:4:207:15 | After ... == ... [true] | true |
+| barrier-guards.rb:207:4:207:15 | ... == ... | barrier-guards.rb:207:21:207:21 | After call to x [false] | true |
+| barrier-guards.rb:207:4:207:15 | ... == ... | barrier-guards.rb:207:21:207:21 | After call to x [true] | true |
+| barrier-guards.rb:207:21:207:21 | call to x | barrier-guards.rb:207:21:207:21 | After call to x [false] | false |
+| barrier-guards.rb:207:21:207:21 | call to x | barrier-guards.rb:207:21:207:21 | After call to x [true] | true |
+| barrier-guards.rb:211:4:211:4 | call to x | barrier-guards.rb:211:4:211:4 | After call to x [false] | false |
+| barrier-guards.rb:211:4:211:4 | call to x | barrier-guards.rb:211:4:211:4 | After call to x [true] | true |
+| barrier-guards.rb:211:4:211:4 | call to x | barrier-guards.rb:211:10:211:21 | After ... == ... [false] | true |
+| barrier-guards.rb:211:4:211:4 | call to x | barrier-guards.rb:211:10:211:21 | After ... == ... [true] | true |
+| barrier-guards.rb:211:10:211:21 | ... == ... | barrier-guards.rb:211:10:211:21 | After ... == ... [false] | false |
+| barrier-guards.rb:211:10:211:21 | ... == ... | barrier-guards.rb:211:10:211:21 | After ... == ... [true] | true |
+| barrier-guards.rb:215:4:215:4 | call to x | barrier-guards.rb:215:4:215:4 | After call to x [false] | false |
+| barrier-guards.rb:215:4:215:4 | call to x | barrier-guards.rb:215:4:215:4 | After call to x [true] | true |
+| barrier-guards.rb:215:4:215:4 | call to x | barrier-guards.rb:215:10:215:10 | After call to y [false] | true |
+| barrier-guards.rb:215:4:215:4 | call to x | barrier-guards.rb:215:10:215:10 | After call to y [true] | true |
+| barrier-guards.rb:215:4:215:4 | call to x | barrier-guards.rb:215:16:215:27 | After ... == ... [false] | true |
+| barrier-guards.rb:215:4:215:4 | call to x | barrier-guards.rb:215:16:215:27 | After ... == ... [true] | true |
+| barrier-guards.rb:215:10:215:10 | call to y | barrier-guards.rb:215:10:215:10 | After call to y [false] | false |
+| barrier-guards.rb:215:10:215:10 | call to y | barrier-guards.rb:215:10:215:10 | After call to y [true] | true |
+| barrier-guards.rb:215:10:215:10 | call to y | barrier-guards.rb:215:16:215:27 | After ... == ... [false] | true |
+| barrier-guards.rb:215:10:215:10 | call to y | barrier-guards.rb:215:16:215:27 | After ... == ... [true] | true |
+| barrier-guards.rb:215:16:215:27 | ... == ... | barrier-guards.rb:215:16:215:27 | After ... == ... [false] | false |
+| barrier-guards.rb:215:16:215:27 | ... == ... | barrier-guards.rb:215:16:215:27 | After ... == ... [true] | true |
+| barrier-guards.rb:219:4:219:15 | ... == ... | barrier-guards.rb:219:4:219:15 | After ... == ... [false] | false |
+| barrier-guards.rb:219:4:219:15 | ... == ... | barrier-guards.rb:219:4:219:15 | After ... == ... [true] | true |
+| barrier-guards.rb:219:4:219:15 | ... == ... | barrier-guards.rb:219:21:219:32 | After ... == ... [false] | true |
+| barrier-guards.rb:219:4:219:15 | ... == ... | barrier-guards.rb:219:21:219:32 | After ... == ... [true] | true |
+| barrier-guards.rb:219:21:219:32 | ... == ... | barrier-guards.rb:219:21:219:32 | After ... == ... [false] | false |
+| barrier-guards.rb:219:21:219:32 | ... == ... | barrier-guards.rb:219:21:219:32 | After ... == ... [true] | true |
+| barrier-guards.rb:223:4:223:4 | call to x | barrier-guards.rb:223:4:223:4 | After call to x [false] | false |
+| barrier-guards.rb:223:4:223:4 | call to x | barrier-guards.rb:223:4:223:4 | After call to x [true] | true |
+| barrier-guards.rb:223:4:223:4 | call to x | barrier-guards.rb:223:10:223:10 | After call to y [false] | true |
+| barrier-guards.rb:223:4:223:4 | call to x | barrier-guards.rb:223:10:223:10 | After call to y [true] | true |
+| barrier-guards.rb:223:10:223:10 | call to y | barrier-guards.rb:223:10:223:10 | After call to y [false] | false |
+| barrier-guards.rb:223:10:223:10 | call to y | barrier-guards.rb:223:10:223:10 | After call to y [true] | true |
+| barrier-guards.rb:227:4:227:15 | ... == ... | barrier-guards.rb:227:4:227:15 | After ... == ... [false] | false |
+| barrier-guards.rb:227:4:227:15 | ... == ... | barrier-guards.rb:227:4:227:15 | After ... == ... [true] | true |
+| barrier-guards.rb:227:4:227:15 | ... == ... | barrier-guards.rb:227:21:227:21 | After call to y [false] | true |
+| barrier-guards.rb:227:4:227:15 | ... == ... | barrier-guards.rb:227:21:227:21 | After call to y [true] | true |
+| barrier-guards.rb:227:21:227:21 | call to y | barrier-guards.rb:227:21:227:21 | After call to y [false] | false |
+| barrier-guards.rb:227:21:227:21 | call to y | barrier-guards.rb:227:21:227:21 | After call to y [true] | true |
+| barrier-guards.rb:232:6:232:17 | ... == ... | barrier-guards.rb:232:6:232:17 | After ... == ... [match] | match |
+| barrier-guards.rb:232:6:232:17 | ... == ... | barrier-guards.rb:232:6:232:17 | After ... == ... [no-match] | no-match |
+| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:237:6:237:17 | After ... == ... [match] | match |
+| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:237:6:237:17 | After ... == ... [no-match] | no-match |
+| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:238:6:238:17 | After ... == ... [match] | no-match |
+| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:238:6:238:17 | After ... == ... [no-match] | no-match |
+| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:239:6:239:13 | After ... == ... [match] | no-match |
+| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:239:6:239:13 | After ... == ... [no-match] | no-match |
+| barrier-guards.rb:238:6:238:17 | ... == ... | barrier-guards.rb:238:6:238:17 | After ... == ... [match] | match |
+| barrier-guards.rb:238:6:238:17 | ... == ... | barrier-guards.rb:238:6:238:17 | After ... == ... [no-match] | no-match |
+| barrier-guards.rb:238:6:238:17 | ... == ... | barrier-guards.rb:239:6:239:13 | After ... == ... [match] | no-match |
+| barrier-guards.rb:238:6:238:17 | ... == ... | barrier-guards.rb:239:6:239:13 | After ... == ... [no-match] | no-match |
+| barrier-guards.rb:239:6:239:13 | ... == ... | barrier-guards.rb:239:6:239:13 | After ... == ... [match] | match |
+| barrier-guards.rb:239:6:239:13 | ... == ... | barrier-guards.rb:239:6:239:13 | After ... == ... [no-match] | no-match |
+| barrier-guards.rb:243:4:243:8 | "foo" | barrier-guards.rb:243:4:243:8 | After "foo" [match] | match |
+| barrier-guards.rb:243:4:243:8 | "foo" | barrier-guards.rb:243:4:243:8 | After "foo" [no-match] | no-match |
+| barrier-guards.rb:243:4:243:8 | "foo" | barrier-guards.rb:245:4:245:4 | After x [match] | no-match |
+| barrier-guards.rb:243:4:243:8 | "foo" | barrier-guards.rb:245:4:245:4 | After x [no-match] | no-match |
+| barrier-guards.rb:245:4:245:4 | x | barrier-guards.rb:245:4:245:4 | After x [match] | match |
+| barrier-guards.rb:245:4:245:4 | x | barrier-guards.rb:245:4:245:4 | After x [no-match] | no-match |
+| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:250:4:250:8 | After "foo" [match] | match |
+| barrier-guards.rb:250:4:250:8 | "foo" | barrier-guards.rb:250:4:250:8 | After "foo" [no-match] | no-match |
+| barrier-guards.rb:254:4:254:28 | ... == ... | barrier-guards.rb:254:4:254:28 | After ... == ... [false] | false |
+| barrier-guards.rb:254:4:254:28 | ... == ... | barrier-guards.rb:254:4:254:28 | After ... == ... [true] | true |
+| barrier-guards.rb:259:4:259:16 | ... == ... | barrier-guards.rb:259:4:259:16 | After ... == ... [false] | false |
+| barrier-guards.rb:259:4:259:16 | ... == ... | barrier-guards.rb:259:4:259:16 | After ... == ... [true] | true |
+| barrier-guards.rb:264:4:264:16 | ... == ... | barrier-guards.rb:264:4:264:16 | After ... == ... [false] | false |
+| barrier-guards.rb:264:4:264:16 | ... == ... | barrier-guards.rb:264:4:264:16 | After ... == ... [true] | true |
+| barrier-guards.rb:268:4:268:30 | ... == ... | barrier-guards.rb:268:4:268:30 | After ... == ... [false] | false |
+| barrier-guards.rb:268:4:268:30 | ... == ... | barrier-guards.rb:268:4:268:30 | After ... == ... [true] | true |
+| barrier-guards.rb:272:1:272:12 | ... == ... | barrier-guards.rb:272:1:272:12 | After ... == ... [false] | false |
+| barrier-guards.rb:272:1:272:12 | ... == ... | barrier-guards.rb:272:1:272:12 | After ... == ... [true] | true |
+| barrier-guards.rb:273:1:273:3 | foo | barrier-guards.rb:273:1:273:3 | After foo [false] | false |
+| barrier-guards.rb:273:1:273:3 | foo | barrier-guards.rb:273:1:273:3 | After foo [true] | true |
+| barrier-guards.rb:275:4:275:19 | call to include? | barrier-guards.rb:275:4:275:19 | After call to include? [false] | false |
+| barrier-guards.rb:275:4:275:19 | call to include? | barrier-guards.rb:275:4:275:19 | After call to include? [true] | true |
+| barrier-guards.rb:281:4:281:20 | call to include? | barrier-guards.rb:281:4:281:20 | After call to include? [false] | false |
+| barrier-guards.rb:281:4:281:20 | call to include? | barrier-guards.rb:281:4:281:20 | After call to include? [true] | true |
+| barrier-guards.rb:286:4:286:20 | call to include? | barrier-guards.rb:286:4:286:20 | After call to include? [false] | false |
+| barrier-guards.rb:286:4:286:20 | call to include? | barrier-guards.rb:286:4:286:20 | After call to include? [true] | true |
+| barrier-guards.rb:291:6:291:6 | g | barrier-guards.rb:291:6:291:6 | After g [match] | match |
+| barrier-guards.rb:291:6:291:6 | g | barrier-guards.rb:291:6:291:6 | After g [no-match] | no-match |
+| barrier_flow.rb:10:8:10:18 | ... != ... | barrier_flow.rb:10:8:10:18 | After ... != ... [false] | false |
+| barrier_flow.rb:10:8:10:18 | ... != ... | barrier_flow.rb:10:8:10:18 | After ... != ... [true] | true |
+| barrier_flow.rb:18:8:18:18 | ... == ... | barrier_flow.rb:18:8:18:18 | After ... == ... [false] | false |
+| barrier_flow.rb:18:8:18:18 | ... == ... | barrier_flow.rb:18:8:18:18 | After ... == ... [true] | true |
+| barrier_flow.rb:26:19:26:29 | ... == ... | barrier_flow.rb:26:19:26:29 | After ... == ... [false] | false |
+| barrier_flow.rb:26:19:26:29 | ... == ... | barrier_flow.rb:26:19:26:29 | After ... == ... [true] | true |
+| barrier_flow.rb:32:19:32:29 | ... != ... | barrier_flow.rb:32:19:32:29 | After ... != ... [false] | false |
+| barrier_flow.rb:32:19:32:29 | ... != ... | barrier_flow.rb:32:19:32:29 | After ... != ... [true] | true |
+| barrier_flow.rb:38:8:38:18 | ... != ... | barrier_flow.rb:38:8:38:18 | After ... != ... [false] | false |
+| barrier_flow.rb:38:8:38:18 | ... != ... | barrier_flow.rb:38:8:38:18 | After ... != ... [true] | true |
+| barrier_flow.rb:48:23:48:33 | ... == ... | barrier_flow.rb:48:23:48:33 | After ... == ... [false] | false |
+| barrier_flow.rb:48:23:48:33 | ... == ... | barrier_flow.rb:48:23:48:33 | After ... == ... [true] | true |
+| barrier_flow.rb:56:8:56:8 | b | barrier_flow.rb:56:8:56:8 | After b [false] | false |
+| barrier_flow.rb:56:8:56:8 | b | barrier_flow.rb:56:8:56:8 | After b [true] | true |
+| barrier_flow.rb:56:8:56:8 | b | barrier_flow.rb:57:23:57:34 | After ... == ... [false] | true |
+| barrier_flow.rb:56:8:56:8 | b | barrier_flow.rb:57:23:57:34 | After ... == ... [true] | true |
+| barrier_flow.rb:56:8:56:8 | b | barrier_flow.rb:59:23:59:34 | After ... == ... [false] | false |
+| barrier_flow.rb:56:8:56:8 | b | barrier_flow.rb:59:23:59:34 | After ... == ... [true] | false |
+| barrier_flow.rb:57:23:57:34 | ... == ... | barrier_flow.rb:57:23:57:34 | After ... == ... [false] | false |
+| barrier_flow.rb:57:23:57:34 | ... == ... | barrier_flow.rb:57:23:57:34 | After ... == ... [true] | true |
+| barrier_flow.rb:59:23:59:34 | ... == ... | barrier_flow.rb:59:23:59:34 | After ... == ... [false] | false |
+| barrier_flow.rb:59:23:59:34 | ... == ... | barrier_flow.rb:59:23:59:34 | After ... == ... [true] | true |
+| barrier_flow.rb:68:8:68:8 | b | barrier_flow.rb:68:8:68:8 | After b [false] | false |
+| barrier_flow.rb:68:8:68:8 | b | barrier_flow.rb:68:8:68:8 | After b [true] | true |
+| barrier_flow.rb:68:8:68:8 | b | barrier_flow.rb:69:12:69:23 | After ... != ... [false] | true |
+| barrier_flow.rb:68:8:68:8 | b | barrier_flow.rb:69:12:69:23 | After ... != ... [true] | true |
+| barrier_flow.rb:68:8:68:8 | b | barrier_flow.rb:73:12:73:23 | After ... != ... [false] | false |
+| barrier_flow.rb:68:8:68:8 | b | barrier_flow.rb:73:12:73:23 | After ... != ... [true] | false |
+| barrier_flow.rb:69:12:69:23 | ... != ... | barrier_flow.rb:69:12:69:23 | After ... != ... [false] | false |
+| barrier_flow.rb:69:12:69:23 | ... != ... | barrier_flow.rb:69:12:69:23 | After ... != ... [true] | true |
+| barrier_flow.rb:73:12:73:23 | ... != ... | barrier_flow.rb:73:12:73:23 | After ... != ... [false] | false |
+| barrier_flow.rb:73:12:73:23 | ... != ... | barrier_flow.rb:73:12:73:23 | After ... != ... [true] | true |
diff --git a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql
index 86609a73909c..e4f35886dd70 100644
--- a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql
+++ b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql
@@ -3,7 +3,6 @@ import codeql.ruby.dataflow.internal.DataFlowPublic
 import codeql.ruby.dataflow.BarrierGuards
 import codeql.ruby.controlflow.CfgNodes
 import codeql.ruby.controlflow.ControlFlowGraph
-import codeql.ruby.controlflow.BasicBlocks
 import codeql.ruby.DataFlow
 import utils.test.InlineExpectationsTest
 
@@ -13,7 +12,7 @@ query predicate newStyleBarrierGuards(DataFlow::Node n) {
 }
 
 query predicate controls(CfgNode condition, BasicBlock bb, ConditionalSuccessor s) {
-  exists(ConditionBlock cb |
+  exists(BasicBlock cb |
     cb.edgeDominates(bb, s) and
     condition = cb.getLastNode()
   )
diff --git a/ruby/ql/test/library-tests/dataflow/implicit-return/implicit-return.expected b/ruby/ql/test/library-tests/dataflow/implicit-return/implicit-return.expected
index 979cc77777b7..631423bedd17 100644
--- a/ruby/ql/test/library-tests/dataflow/implicit-return/implicit-return.expected
+++ b/ruby/ql/test/library-tests/dataflow/implicit-return/implicit-return.expected
@@ -1,10 +1,30 @@
 models
 edges
 | implicit_return.rb:12:3:12:11 | call to source | implicit_return.rb:15:6:15:11 | call to m_body | provenance |  |
+| implicit_return.rb:19:3:19:11 | call to source | implicit_return.rb:24:6:24:18 | call to m_body_ensure | provenance |  |
+| implicit_return.rb:30:3:30:11 | call to source | implicit_return.rb:33:6:33:13 | call to m_rescue | provenance |  |
+| implicit_return.rb:39:3:39:11 | call to source | implicit_return.rb:44:6:44:20 | call to m_rescue_ensure | provenance |  |
+| implicit_return.rb:52:3:52:11 | call to source | implicit_return.rb:55:6:55:11 | call to m_else | provenance |  |
+| implicit_return.rb:63:3:63:11 | call to source | implicit_return.rb:68:6:68:18 | call to m_else_ensure | provenance |  |
 nodes
 | implicit_return.rb:12:3:12:11 | call to source | semmle.label | call to source |
 | implicit_return.rb:15:6:15:11 | call to m_body | semmle.label | call to m_body |
+| implicit_return.rb:19:3:19:11 | call to source | semmle.label | call to source |
+| implicit_return.rb:24:6:24:18 | call to m_body_ensure | semmle.label | call to m_body_ensure |
+| implicit_return.rb:30:3:30:11 | call to source | semmle.label | call to source |
+| implicit_return.rb:33:6:33:13 | call to m_rescue | semmle.label | call to m_rescue |
+| implicit_return.rb:39:3:39:11 | call to source | semmle.label | call to source |
+| implicit_return.rb:44:6:44:20 | call to m_rescue_ensure | semmle.label | call to m_rescue_ensure |
+| implicit_return.rb:52:3:52:11 | call to source | semmle.label | call to source |
+| implicit_return.rb:55:6:55:11 | call to m_else | semmle.label | call to m_else |
+| implicit_return.rb:63:3:63:11 | call to source | semmle.label | call to source |
+| implicit_return.rb:68:6:68:18 | call to m_else_ensure | semmle.label | call to m_else_ensure |
 subpaths
 testFailures
 #select
 | implicit_return.rb:15:6:15:11 | call to m_body | implicit_return.rb:12:3:12:11 | call to source | implicit_return.rb:15:6:15:11 | call to m_body | $@ | implicit_return.rb:12:3:12:11 | call to source | call to source |
+| implicit_return.rb:24:6:24:18 | call to m_body_ensure | implicit_return.rb:19:3:19:11 | call to source | implicit_return.rb:24:6:24:18 | call to m_body_ensure | $@ | implicit_return.rb:19:3:19:11 | call to source | call to source |
+| implicit_return.rb:33:6:33:13 | call to m_rescue | implicit_return.rb:30:3:30:11 | call to source | implicit_return.rb:33:6:33:13 | call to m_rescue | $@ | implicit_return.rb:30:3:30:11 | call to source | call to source |
+| implicit_return.rb:44:6:44:20 | call to m_rescue_ensure | implicit_return.rb:39:3:39:11 | call to source | implicit_return.rb:44:6:44:20 | call to m_rescue_ensure | $@ | implicit_return.rb:39:3:39:11 | call to source | call to source |
+| implicit_return.rb:55:6:55:11 | call to m_else | implicit_return.rb:52:3:52:11 | call to source | implicit_return.rb:55:6:55:11 | call to m_else | $@ | implicit_return.rb:52:3:52:11 | call to source | call to source |
+| implicit_return.rb:68:6:68:18 | call to m_else_ensure | implicit_return.rb:63:3:63:11 | call to source | implicit_return.rb:68:6:68:18 | call to m_else_ensure | $@ | implicit_return.rb:63:3:63:11 | call to source | call to source |
diff --git a/ruby/ql/test/library-tests/dataflow/implicit-return/implicit_return.rb b/ruby/ql/test/library-tests/dataflow/implicit-return/implicit_return.rb
index 2ea215902f02..3ff507723ff1 100644
--- a/ruby/ql/test/library-tests/dataflow/implicit-return/implicit_return.rb
+++ b/ruby/ql/test/library-tests/dataflow/implicit-return/implicit_return.rb
@@ -21,7 +21,7 @@ def m_body_ensure
   source(20)
 end
 
-sink(m_body_ensure) # $ MISSING: hasValueFlow=2
+sink(m_body_ensure) # $ hasValueFlow=2
 
 # Implicit return from a `rescue` clause.
 def m_rescue
@@ -30,7 +30,7 @@ def m_rescue
   source(3)
 end
 
-sink(m_rescue) # $ MISSING: hasValueFlow=3
+sink(m_rescue) # $ hasValueFlow=3
 
 # Implicit return from a `rescue` clause when an `ensure` clause is present.
 def m_rescue_ensure
@@ -41,7 +41,7 @@ def m_rescue_ensure
   source(40)
 end
 
-sink(m_rescue_ensure) # $ MISSING: hasValueFlow=4
+sink(m_rescue_ensure) # $ hasValueFlow=4
 
 # Implicit return from an `else` clause.
 def m_else
@@ -52,7 +52,7 @@ def m_else
   source(5)
 end
 
-sink(m_else) # $ MISSING: hasValueFlow=5
+sink(m_else) # $ hasValueFlow=5
 
 # Implicit return from an `else` clause when an `ensure` clause is present.
 def m_else_ensure
@@ -65,4 +65,4 @@ def m_else_ensure
   nil
 end
 
-sink(m_else_ensure) # $ MISSING: hasValueFlow=6
+sink(m_else_ensure) # $ hasValueFlow=6
diff --git a/ruby/ql/test/library-tests/dataflow/local/DataflowStep.expected b/ruby/ql/test/library-tests/dataflow/local/DataflowStep.expected
index 7122b4c0ae2f..edc95fe8a7df 100644
--- a/ruby/ql/test/library-tests/dataflow/local/DataflowStep.expected
+++ b/ruby/ql/test/library-tests/dataflow/local/DataflowStep.expected
@@ -207,800 +207,700 @@
 | UseUseExplosion.rb:20:13:20:17 | [post] self | UseUseExplosion.rb:20:3691:20:3696 | self |
 | UseUseExplosion.rb:20:13:20:17 | self | UseUseExplosion.rb:20:35:20:39 | self |
 | UseUseExplosion.rb:20:13:20:17 | self | UseUseExplosion.rb:20:3691:20:3696 | self |
-| UseUseExplosion.rb:20:13:20:23 | ... > ... | UseUseExplosion.rb:20:12:20:24 | [false] ( ... ) |
-| UseUseExplosion.rb:20:13:20:23 | ... > ... | UseUseExplosion.rb:20:12:20:24 | [true] ( ... ) |
+| UseUseExplosion.rb:20:13:20:23 | ... > ... | UseUseExplosion.rb:20:12:20:24 | ( ... ) |
 | UseUseExplosion.rb:20:26:20:3684 | then ... | UseUseExplosion.rb:20:9:20:3700 | if ... |
 | UseUseExplosion.rb:20:31:20:3684 | if ... | UseUseExplosion.rb:20:26:20:3684 | then ... |
 | UseUseExplosion.rb:20:35:20:39 | [post] self | UseUseExplosion.rb:20:56:20:60 | self |
 | UseUseExplosion.rb:20:35:20:39 | [post] self | UseUseExplosion.rb:20:3675:20:3680 | self |
 | UseUseExplosion.rb:20:35:20:39 | self | UseUseExplosion.rb:20:56:20:60 | self |
 | UseUseExplosion.rb:20:35:20:39 | self | UseUseExplosion.rb:20:3675:20:3680 | self |
-| UseUseExplosion.rb:20:35:20:44 | ... > ... | UseUseExplosion.rb:20:34:20:45 | [false] ( ... ) |
-| UseUseExplosion.rb:20:35:20:44 | ... > ... | UseUseExplosion.rb:20:34:20:45 | [true] ( ... ) |
+| UseUseExplosion.rb:20:35:20:44 | ... > ... | UseUseExplosion.rb:20:34:20:45 | ( ... ) |
 | UseUseExplosion.rb:20:47:20:3668 | then ... | UseUseExplosion.rb:20:31:20:3684 | if ... |
 | UseUseExplosion.rb:20:52:20:3668 | if ... | UseUseExplosion.rb:20:47:20:3668 | then ... |
 | UseUseExplosion.rb:20:56:20:60 | [post] self | UseUseExplosion.rb:20:77:20:81 | self |
 | UseUseExplosion.rb:20:56:20:60 | [post] self | UseUseExplosion.rb:20:3659:20:3664 | self |
 | UseUseExplosion.rb:20:56:20:60 | self | UseUseExplosion.rb:20:77:20:81 | self |
 | UseUseExplosion.rb:20:56:20:60 | self | UseUseExplosion.rb:20:3659:20:3664 | self |
-| UseUseExplosion.rb:20:56:20:65 | ... > ... | UseUseExplosion.rb:20:55:20:66 | [false] ( ... ) |
-| UseUseExplosion.rb:20:56:20:65 | ... > ... | UseUseExplosion.rb:20:55:20:66 | [true] ( ... ) |
+| UseUseExplosion.rb:20:56:20:65 | ... > ... | UseUseExplosion.rb:20:55:20:66 | ( ... ) |
 | UseUseExplosion.rb:20:68:20:3652 | then ... | UseUseExplosion.rb:20:52:20:3668 | if ... |
 | UseUseExplosion.rb:20:73:20:3652 | if ... | UseUseExplosion.rb:20:68:20:3652 | then ... |
 | UseUseExplosion.rb:20:77:20:81 | [post] self | UseUseExplosion.rb:20:98:20:102 | self |
 | UseUseExplosion.rb:20:77:20:81 | [post] self | UseUseExplosion.rb:20:3643:20:3648 | self |
 | UseUseExplosion.rb:20:77:20:81 | self | UseUseExplosion.rb:20:98:20:102 | self |
 | UseUseExplosion.rb:20:77:20:81 | self | UseUseExplosion.rb:20:3643:20:3648 | self |
-| UseUseExplosion.rb:20:77:20:86 | ... > ... | UseUseExplosion.rb:20:76:20:87 | [false] ( ... ) |
-| UseUseExplosion.rb:20:77:20:86 | ... > ... | UseUseExplosion.rb:20:76:20:87 | [true] ( ... ) |
+| UseUseExplosion.rb:20:77:20:86 | ... > ... | UseUseExplosion.rb:20:76:20:87 | ( ... ) |
 | UseUseExplosion.rb:20:89:20:3636 | then ... | UseUseExplosion.rb:20:73:20:3652 | if ... |
 | UseUseExplosion.rb:20:94:20:3636 | if ... | UseUseExplosion.rb:20:89:20:3636 | then ... |
 | UseUseExplosion.rb:20:98:20:102 | [post] self | UseUseExplosion.rb:20:119:20:123 | self |
 | UseUseExplosion.rb:20:98:20:102 | [post] self | UseUseExplosion.rb:20:3627:20:3632 | self |
 | UseUseExplosion.rb:20:98:20:102 | self | UseUseExplosion.rb:20:119:20:123 | self |
 | UseUseExplosion.rb:20:98:20:102 | self | UseUseExplosion.rb:20:3627:20:3632 | self |
-| UseUseExplosion.rb:20:98:20:107 | ... > ... | UseUseExplosion.rb:20:97:20:108 | [false] ( ... ) |
-| UseUseExplosion.rb:20:98:20:107 | ... > ... | UseUseExplosion.rb:20:97:20:108 | [true] ( ... ) |
+| UseUseExplosion.rb:20:98:20:107 | ... > ... | UseUseExplosion.rb:20:97:20:108 | ( ... ) |
 | UseUseExplosion.rb:20:110:20:3620 | then ... | UseUseExplosion.rb:20:94:20:3636 | if ... |
 | UseUseExplosion.rb:20:115:20:3620 | if ... | UseUseExplosion.rb:20:110:20:3620 | then ... |
 | UseUseExplosion.rb:20:119:20:123 | [post] self | UseUseExplosion.rb:20:140:20:144 | self |
 | UseUseExplosion.rb:20:119:20:123 | [post] self | UseUseExplosion.rb:20:3611:20:3616 | self |
 | UseUseExplosion.rb:20:119:20:123 | self | UseUseExplosion.rb:20:140:20:144 | self |
 | UseUseExplosion.rb:20:119:20:123 | self | UseUseExplosion.rb:20:3611:20:3616 | self |
-| UseUseExplosion.rb:20:119:20:128 | ... > ... | UseUseExplosion.rb:20:118:20:129 | [false] ( ... ) |
-| UseUseExplosion.rb:20:119:20:128 | ... > ... | UseUseExplosion.rb:20:118:20:129 | [true] ( ... ) |
+| UseUseExplosion.rb:20:119:20:128 | ... > ... | UseUseExplosion.rb:20:118:20:129 | ( ... ) |
 | UseUseExplosion.rb:20:131:20:3604 | then ... | UseUseExplosion.rb:20:115:20:3620 | if ... |
 | UseUseExplosion.rb:20:136:20:3604 | if ... | UseUseExplosion.rb:20:131:20:3604 | then ... |
 | UseUseExplosion.rb:20:140:20:144 | [post] self | UseUseExplosion.rb:20:161:20:165 | self |
 | UseUseExplosion.rb:20:140:20:144 | [post] self | UseUseExplosion.rb:20:3595:20:3600 | self |
 | UseUseExplosion.rb:20:140:20:144 | self | UseUseExplosion.rb:20:161:20:165 | self |
 | UseUseExplosion.rb:20:140:20:144 | self | UseUseExplosion.rb:20:3595:20:3600 | self |
-| UseUseExplosion.rb:20:140:20:149 | ... > ... | UseUseExplosion.rb:20:139:20:150 | [false] ( ... ) |
-| UseUseExplosion.rb:20:140:20:149 | ... > ... | UseUseExplosion.rb:20:139:20:150 | [true] ( ... ) |
+| UseUseExplosion.rb:20:140:20:149 | ... > ... | UseUseExplosion.rb:20:139:20:150 | ( ... ) |
 | UseUseExplosion.rb:20:152:20:3588 | then ... | UseUseExplosion.rb:20:136:20:3604 | if ... |
 | UseUseExplosion.rb:20:157:20:3588 | if ... | UseUseExplosion.rb:20:152:20:3588 | then ... |
 | UseUseExplosion.rb:20:161:20:165 | [post] self | UseUseExplosion.rb:20:182:20:186 | self |
 | UseUseExplosion.rb:20:161:20:165 | [post] self | UseUseExplosion.rb:20:3579:20:3584 | self |
 | UseUseExplosion.rb:20:161:20:165 | self | UseUseExplosion.rb:20:182:20:186 | self |
 | UseUseExplosion.rb:20:161:20:165 | self | UseUseExplosion.rb:20:3579:20:3584 | self |
-| UseUseExplosion.rb:20:161:20:170 | ... > ... | UseUseExplosion.rb:20:160:20:171 | [false] ( ... ) |
-| UseUseExplosion.rb:20:161:20:170 | ... > ... | UseUseExplosion.rb:20:160:20:171 | [true] ( ... ) |
+| UseUseExplosion.rb:20:161:20:170 | ... > ... | UseUseExplosion.rb:20:160:20:171 | ( ... ) |
 | UseUseExplosion.rb:20:173:20:3572 | then ... | UseUseExplosion.rb:20:157:20:3588 | if ... |
 | UseUseExplosion.rb:20:178:20:3572 | if ... | UseUseExplosion.rb:20:173:20:3572 | then ... |
 | UseUseExplosion.rb:20:182:20:186 | [post] self | UseUseExplosion.rb:20:203:20:207 | self |
 | UseUseExplosion.rb:20:182:20:186 | [post] self | UseUseExplosion.rb:20:3563:20:3568 | self |
 | UseUseExplosion.rb:20:182:20:186 | self | UseUseExplosion.rb:20:203:20:207 | self |
 | UseUseExplosion.rb:20:182:20:186 | self | UseUseExplosion.rb:20:3563:20:3568 | self |
-| UseUseExplosion.rb:20:182:20:191 | ... > ... | UseUseExplosion.rb:20:181:20:192 | [false] ( ... ) |
-| UseUseExplosion.rb:20:182:20:191 | ... > ... | UseUseExplosion.rb:20:181:20:192 | [true] ( ... ) |
+| UseUseExplosion.rb:20:182:20:191 | ... > ... | UseUseExplosion.rb:20:181:20:192 | ( ... ) |
 | UseUseExplosion.rb:20:194:20:3556 | then ... | UseUseExplosion.rb:20:178:20:3572 | if ... |
 | UseUseExplosion.rb:20:199:20:3556 | if ... | UseUseExplosion.rb:20:194:20:3556 | then ... |
 | UseUseExplosion.rb:20:203:20:207 | [post] self | UseUseExplosion.rb:20:224:20:228 | self |
 | UseUseExplosion.rb:20:203:20:207 | [post] self | UseUseExplosion.rb:20:3547:20:3552 | self |
 | UseUseExplosion.rb:20:203:20:207 | self | UseUseExplosion.rb:20:224:20:228 | self |
 | UseUseExplosion.rb:20:203:20:207 | self | UseUseExplosion.rb:20:3547:20:3552 | self |
-| UseUseExplosion.rb:20:203:20:212 | ... > ... | UseUseExplosion.rb:20:202:20:213 | [false] ( ... ) |
-| UseUseExplosion.rb:20:203:20:212 | ... > ... | UseUseExplosion.rb:20:202:20:213 | [true] ( ... ) |
+| UseUseExplosion.rb:20:203:20:212 | ... > ... | UseUseExplosion.rb:20:202:20:213 | ( ... ) |
 | UseUseExplosion.rb:20:215:20:3540 | then ... | UseUseExplosion.rb:20:199:20:3556 | if ... |
 | UseUseExplosion.rb:20:220:20:3540 | if ... | UseUseExplosion.rb:20:215:20:3540 | then ... |
 | UseUseExplosion.rb:20:224:20:228 | [post] self | UseUseExplosion.rb:20:245:20:249 | self |
 | UseUseExplosion.rb:20:224:20:228 | [post] self | UseUseExplosion.rb:20:3531:20:3536 | self |
 | UseUseExplosion.rb:20:224:20:228 | self | UseUseExplosion.rb:20:245:20:249 | self |
 | UseUseExplosion.rb:20:224:20:228 | self | UseUseExplosion.rb:20:3531:20:3536 | self |
-| UseUseExplosion.rb:20:224:20:233 | ... > ... | UseUseExplosion.rb:20:223:20:234 | [false] ( ... ) |
-| UseUseExplosion.rb:20:224:20:233 | ... > ... | UseUseExplosion.rb:20:223:20:234 | [true] ( ... ) |
+| UseUseExplosion.rb:20:224:20:233 | ... > ... | UseUseExplosion.rb:20:223:20:234 | ( ... ) |
 | UseUseExplosion.rb:20:236:20:3524 | then ... | UseUseExplosion.rb:20:220:20:3540 | if ... |
 | UseUseExplosion.rb:20:241:20:3524 | if ... | UseUseExplosion.rb:20:236:20:3524 | then ... |
 | UseUseExplosion.rb:20:245:20:249 | [post] self | UseUseExplosion.rb:20:266:20:270 | self |
 | UseUseExplosion.rb:20:245:20:249 | [post] self | UseUseExplosion.rb:20:3515:20:3520 | self |
 | UseUseExplosion.rb:20:245:20:249 | self | UseUseExplosion.rb:20:266:20:270 | self |
 | UseUseExplosion.rb:20:245:20:249 | self | UseUseExplosion.rb:20:3515:20:3520 | self |
-| UseUseExplosion.rb:20:245:20:254 | ... > ... | UseUseExplosion.rb:20:244:20:255 | [false] ( ... ) |
-| UseUseExplosion.rb:20:245:20:254 | ... > ... | UseUseExplosion.rb:20:244:20:255 | [true] ( ... ) |
+| UseUseExplosion.rb:20:245:20:254 | ... > ... | UseUseExplosion.rb:20:244:20:255 | ( ... ) |
 | UseUseExplosion.rb:20:257:20:3508 | then ... | UseUseExplosion.rb:20:241:20:3524 | if ... |
 | UseUseExplosion.rb:20:262:20:3508 | if ... | UseUseExplosion.rb:20:257:20:3508 | then ... |
 | UseUseExplosion.rb:20:266:20:270 | [post] self | UseUseExplosion.rb:20:287:20:291 | self |
 | UseUseExplosion.rb:20:266:20:270 | [post] self | UseUseExplosion.rb:20:3499:20:3504 | self |
 | UseUseExplosion.rb:20:266:20:270 | self | UseUseExplosion.rb:20:287:20:291 | self |
 | UseUseExplosion.rb:20:266:20:270 | self | UseUseExplosion.rb:20:3499:20:3504 | self |
-| UseUseExplosion.rb:20:266:20:275 | ... > ... | UseUseExplosion.rb:20:265:20:276 | [false] ( ... ) |
-| UseUseExplosion.rb:20:266:20:275 | ... > ... | UseUseExplosion.rb:20:265:20:276 | [true] ( ... ) |
+| UseUseExplosion.rb:20:266:20:275 | ... > ... | UseUseExplosion.rb:20:265:20:276 | ( ... ) |
 | UseUseExplosion.rb:20:278:20:3492 | then ... | UseUseExplosion.rb:20:262:20:3508 | if ... |
 | UseUseExplosion.rb:20:283:20:3492 | if ... | UseUseExplosion.rb:20:278:20:3492 | then ... |
 | UseUseExplosion.rb:20:287:20:291 | [post] self | UseUseExplosion.rb:20:308:20:312 | self |
 | UseUseExplosion.rb:20:287:20:291 | [post] self | UseUseExplosion.rb:20:3483:20:3488 | self |
 | UseUseExplosion.rb:20:287:20:291 | self | UseUseExplosion.rb:20:308:20:312 | self |
 | UseUseExplosion.rb:20:287:20:291 | self | UseUseExplosion.rb:20:3483:20:3488 | self |
-| UseUseExplosion.rb:20:287:20:296 | ... > ... | UseUseExplosion.rb:20:286:20:297 | [false] ( ... ) |
-| UseUseExplosion.rb:20:287:20:296 | ... > ... | UseUseExplosion.rb:20:286:20:297 | [true] ( ... ) |
+| UseUseExplosion.rb:20:287:20:296 | ... > ... | UseUseExplosion.rb:20:286:20:297 | ( ... ) |
 | UseUseExplosion.rb:20:299:20:3476 | then ... | UseUseExplosion.rb:20:283:20:3492 | if ... |
 | UseUseExplosion.rb:20:304:20:3476 | if ... | UseUseExplosion.rb:20:299:20:3476 | then ... |
 | UseUseExplosion.rb:20:308:20:312 | [post] self | UseUseExplosion.rb:20:329:20:333 | self |
 | UseUseExplosion.rb:20:308:20:312 | [post] self | UseUseExplosion.rb:20:3467:20:3472 | self |
 | UseUseExplosion.rb:20:308:20:312 | self | UseUseExplosion.rb:20:329:20:333 | self |
 | UseUseExplosion.rb:20:308:20:312 | self | UseUseExplosion.rb:20:3467:20:3472 | self |
-| UseUseExplosion.rb:20:308:20:317 | ... > ... | UseUseExplosion.rb:20:307:20:318 | [false] ( ... ) |
-| UseUseExplosion.rb:20:308:20:317 | ... > ... | UseUseExplosion.rb:20:307:20:318 | [true] ( ... ) |
+| UseUseExplosion.rb:20:308:20:317 | ... > ... | UseUseExplosion.rb:20:307:20:318 | ( ... ) |
 | UseUseExplosion.rb:20:320:20:3460 | then ... | UseUseExplosion.rb:20:304:20:3476 | if ... |
 | UseUseExplosion.rb:20:325:20:3460 | if ... | UseUseExplosion.rb:20:320:20:3460 | then ... |
 | UseUseExplosion.rb:20:329:20:333 | [post] self | UseUseExplosion.rb:20:350:20:354 | self |
 | UseUseExplosion.rb:20:329:20:333 | [post] self | UseUseExplosion.rb:20:3451:20:3456 | self |
 | UseUseExplosion.rb:20:329:20:333 | self | UseUseExplosion.rb:20:350:20:354 | self |
 | UseUseExplosion.rb:20:329:20:333 | self | UseUseExplosion.rb:20:3451:20:3456 | self |
-| UseUseExplosion.rb:20:329:20:338 | ... > ... | UseUseExplosion.rb:20:328:20:339 | [false] ( ... ) |
-| UseUseExplosion.rb:20:329:20:338 | ... > ... | UseUseExplosion.rb:20:328:20:339 | [true] ( ... ) |
+| UseUseExplosion.rb:20:329:20:338 | ... > ... | UseUseExplosion.rb:20:328:20:339 | ( ... ) |
 | UseUseExplosion.rb:20:341:20:3444 | then ... | UseUseExplosion.rb:20:325:20:3460 | if ... |
 | UseUseExplosion.rb:20:346:20:3444 | if ... | UseUseExplosion.rb:20:341:20:3444 | then ... |
 | UseUseExplosion.rb:20:350:20:354 | [post] self | UseUseExplosion.rb:20:371:20:375 | self |
 | UseUseExplosion.rb:20:350:20:354 | [post] self | UseUseExplosion.rb:20:3435:20:3440 | self |
 | UseUseExplosion.rb:20:350:20:354 | self | UseUseExplosion.rb:20:371:20:375 | self |
 | UseUseExplosion.rb:20:350:20:354 | self | UseUseExplosion.rb:20:3435:20:3440 | self |
-| UseUseExplosion.rb:20:350:20:359 | ... > ... | UseUseExplosion.rb:20:349:20:360 | [false] ( ... ) |
-| UseUseExplosion.rb:20:350:20:359 | ... > ... | UseUseExplosion.rb:20:349:20:360 | [true] ( ... ) |
+| UseUseExplosion.rb:20:350:20:359 | ... > ... | UseUseExplosion.rb:20:349:20:360 | ( ... ) |
 | UseUseExplosion.rb:20:362:20:3428 | then ... | UseUseExplosion.rb:20:346:20:3444 | if ... |
 | UseUseExplosion.rb:20:367:20:3428 | if ... | UseUseExplosion.rb:20:362:20:3428 | then ... |
 | UseUseExplosion.rb:20:371:20:375 | [post] self | UseUseExplosion.rb:20:392:20:396 | self |
 | UseUseExplosion.rb:20:371:20:375 | [post] self | UseUseExplosion.rb:20:3419:20:3424 | self |
 | UseUseExplosion.rb:20:371:20:375 | self | UseUseExplosion.rb:20:392:20:396 | self |
 | UseUseExplosion.rb:20:371:20:375 | self | UseUseExplosion.rb:20:3419:20:3424 | self |
-| UseUseExplosion.rb:20:371:20:380 | ... > ... | UseUseExplosion.rb:20:370:20:381 | [false] ( ... ) |
-| UseUseExplosion.rb:20:371:20:380 | ... > ... | UseUseExplosion.rb:20:370:20:381 | [true] ( ... ) |
+| UseUseExplosion.rb:20:371:20:380 | ... > ... | UseUseExplosion.rb:20:370:20:381 | ( ... ) |
 | UseUseExplosion.rb:20:383:20:3412 | then ... | UseUseExplosion.rb:20:367:20:3428 | if ... |
 | UseUseExplosion.rb:20:388:20:3412 | if ... | UseUseExplosion.rb:20:383:20:3412 | then ... |
 | UseUseExplosion.rb:20:392:20:396 | [post] self | UseUseExplosion.rb:20:413:20:417 | self |
 | UseUseExplosion.rb:20:392:20:396 | [post] self | UseUseExplosion.rb:20:3403:20:3408 | self |
 | UseUseExplosion.rb:20:392:20:396 | self | UseUseExplosion.rb:20:413:20:417 | self |
 | UseUseExplosion.rb:20:392:20:396 | self | UseUseExplosion.rb:20:3403:20:3408 | self |
-| UseUseExplosion.rb:20:392:20:401 | ... > ... | UseUseExplosion.rb:20:391:20:402 | [false] ( ... ) |
-| UseUseExplosion.rb:20:392:20:401 | ... > ... | UseUseExplosion.rb:20:391:20:402 | [true] ( ... ) |
+| UseUseExplosion.rb:20:392:20:401 | ... > ... | UseUseExplosion.rb:20:391:20:402 | ( ... ) |
 | UseUseExplosion.rb:20:404:20:3396 | then ... | UseUseExplosion.rb:20:388:20:3412 | if ... |
 | UseUseExplosion.rb:20:409:20:3396 | if ... | UseUseExplosion.rb:20:404:20:3396 | then ... |
 | UseUseExplosion.rb:20:413:20:417 | [post] self | UseUseExplosion.rb:20:434:20:438 | self |
 | UseUseExplosion.rb:20:413:20:417 | [post] self | UseUseExplosion.rb:20:3387:20:3392 | self |
 | UseUseExplosion.rb:20:413:20:417 | self | UseUseExplosion.rb:20:434:20:438 | self |
 | UseUseExplosion.rb:20:413:20:417 | self | UseUseExplosion.rb:20:3387:20:3392 | self |
-| UseUseExplosion.rb:20:413:20:422 | ... > ... | UseUseExplosion.rb:20:412:20:423 | [false] ( ... ) |
-| UseUseExplosion.rb:20:413:20:422 | ... > ... | UseUseExplosion.rb:20:412:20:423 | [true] ( ... ) |
+| UseUseExplosion.rb:20:413:20:422 | ... > ... | UseUseExplosion.rb:20:412:20:423 | ( ... ) |
 | UseUseExplosion.rb:20:425:20:3380 | then ... | UseUseExplosion.rb:20:409:20:3396 | if ... |
 | UseUseExplosion.rb:20:430:20:3380 | if ... | UseUseExplosion.rb:20:425:20:3380 | then ... |
 | UseUseExplosion.rb:20:434:20:438 | [post] self | UseUseExplosion.rb:20:455:20:459 | self |
 | UseUseExplosion.rb:20:434:20:438 | [post] self | UseUseExplosion.rb:20:3371:20:3376 | self |
 | UseUseExplosion.rb:20:434:20:438 | self | UseUseExplosion.rb:20:455:20:459 | self |
 | UseUseExplosion.rb:20:434:20:438 | self | UseUseExplosion.rb:20:3371:20:3376 | self |
-| UseUseExplosion.rb:20:434:20:443 | ... > ... | UseUseExplosion.rb:20:433:20:444 | [false] ( ... ) |
-| UseUseExplosion.rb:20:434:20:443 | ... > ... | UseUseExplosion.rb:20:433:20:444 | [true] ( ... ) |
+| UseUseExplosion.rb:20:434:20:443 | ... > ... | UseUseExplosion.rb:20:433:20:444 | ( ... ) |
 | UseUseExplosion.rb:20:446:20:3364 | then ... | UseUseExplosion.rb:20:430:20:3380 | if ... |
 | UseUseExplosion.rb:20:451:20:3364 | if ... | UseUseExplosion.rb:20:446:20:3364 | then ... |
 | UseUseExplosion.rb:20:455:20:459 | [post] self | UseUseExplosion.rb:20:476:20:480 | self |
 | UseUseExplosion.rb:20:455:20:459 | [post] self | UseUseExplosion.rb:20:3355:20:3360 | self |
 | UseUseExplosion.rb:20:455:20:459 | self | UseUseExplosion.rb:20:476:20:480 | self |
 | UseUseExplosion.rb:20:455:20:459 | self | UseUseExplosion.rb:20:3355:20:3360 | self |
-| UseUseExplosion.rb:20:455:20:464 | ... > ... | UseUseExplosion.rb:20:454:20:465 | [false] ( ... ) |
-| UseUseExplosion.rb:20:455:20:464 | ... > ... | UseUseExplosion.rb:20:454:20:465 | [true] ( ... ) |
+| UseUseExplosion.rb:20:455:20:464 | ... > ... | UseUseExplosion.rb:20:454:20:465 | ( ... ) |
 | UseUseExplosion.rb:20:467:20:3348 | then ... | UseUseExplosion.rb:20:451:20:3364 | if ... |
 | UseUseExplosion.rb:20:472:20:3348 | if ... | UseUseExplosion.rb:20:467:20:3348 | then ... |
 | UseUseExplosion.rb:20:476:20:480 | [post] self | UseUseExplosion.rb:20:497:20:501 | self |
 | UseUseExplosion.rb:20:476:20:480 | [post] self | UseUseExplosion.rb:20:3339:20:3344 | self |
 | UseUseExplosion.rb:20:476:20:480 | self | UseUseExplosion.rb:20:497:20:501 | self |
 | UseUseExplosion.rb:20:476:20:480 | self | UseUseExplosion.rb:20:3339:20:3344 | self |
-| UseUseExplosion.rb:20:476:20:485 | ... > ... | UseUseExplosion.rb:20:475:20:486 | [false] ( ... ) |
-| UseUseExplosion.rb:20:476:20:485 | ... > ... | UseUseExplosion.rb:20:475:20:486 | [true] ( ... ) |
+| UseUseExplosion.rb:20:476:20:485 | ... > ... | UseUseExplosion.rb:20:475:20:486 | ( ... ) |
 | UseUseExplosion.rb:20:488:20:3332 | then ... | UseUseExplosion.rb:20:472:20:3348 | if ... |
 | UseUseExplosion.rb:20:493:20:3332 | if ... | UseUseExplosion.rb:20:488:20:3332 | then ... |
 | UseUseExplosion.rb:20:497:20:501 | [post] self | UseUseExplosion.rb:20:518:20:522 | self |
 | UseUseExplosion.rb:20:497:20:501 | [post] self | UseUseExplosion.rb:20:3323:20:3328 | self |
 | UseUseExplosion.rb:20:497:20:501 | self | UseUseExplosion.rb:20:518:20:522 | self |
 | UseUseExplosion.rb:20:497:20:501 | self | UseUseExplosion.rb:20:3323:20:3328 | self |
-| UseUseExplosion.rb:20:497:20:506 | ... > ... | UseUseExplosion.rb:20:496:20:507 | [false] ( ... ) |
-| UseUseExplosion.rb:20:497:20:506 | ... > ... | UseUseExplosion.rb:20:496:20:507 | [true] ( ... ) |
+| UseUseExplosion.rb:20:497:20:506 | ... > ... | UseUseExplosion.rb:20:496:20:507 | ( ... ) |
 | UseUseExplosion.rb:20:509:20:3316 | then ... | UseUseExplosion.rb:20:493:20:3332 | if ... |
 | UseUseExplosion.rb:20:514:20:3316 | if ... | UseUseExplosion.rb:20:509:20:3316 | then ... |
 | UseUseExplosion.rb:20:518:20:522 | [post] self | UseUseExplosion.rb:20:539:20:543 | self |
 | UseUseExplosion.rb:20:518:20:522 | [post] self | UseUseExplosion.rb:20:3307:20:3312 | self |
 | UseUseExplosion.rb:20:518:20:522 | self | UseUseExplosion.rb:20:539:20:543 | self |
 | UseUseExplosion.rb:20:518:20:522 | self | UseUseExplosion.rb:20:3307:20:3312 | self |
-| UseUseExplosion.rb:20:518:20:527 | ... > ... | UseUseExplosion.rb:20:517:20:528 | [false] ( ... ) |
-| UseUseExplosion.rb:20:518:20:527 | ... > ... | UseUseExplosion.rb:20:517:20:528 | [true] ( ... ) |
+| UseUseExplosion.rb:20:518:20:527 | ... > ... | UseUseExplosion.rb:20:517:20:528 | ( ... ) |
 | UseUseExplosion.rb:20:530:20:3300 | then ... | UseUseExplosion.rb:20:514:20:3316 | if ... |
 | UseUseExplosion.rb:20:535:20:3300 | if ... | UseUseExplosion.rb:20:530:20:3300 | then ... |
 | UseUseExplosion.rb:20:539:20:543 | [post] self | UseUseExplosion.rb:20:560:20:564 | self |
 | UseUseExplosion.rb:20:539:20:543 | [post] self | UseUseExplosion.rb:20:3291:20:3296 | self |
 | UseUseExplosion.rb:20:539:20:543 | self | UseUseExplosion.rb:20:560:20:564 | self |
 | UseUseExplosion.rb:20:539:20:543 | self | UseUseExplosion.rb:20:3291:20:3296 | self |
-| UseUseExplosion.rb:20:539:20:548 | ... > ... | UseUseExplosion.rb:20:538:20:549 | [false] ( ... ) |
-| UseUseExplosion.rb:20:539:20:548 | ... > ... | UseUseExplosion.rb:20:538:20:549 | [true] ( ... ) |
+| UseUseExplosion.rb:20:539:20:548 | ... > ... | UseUseExplosion.rb:20:538:20:549 | ( ... ) |
 | UseUseExplosion.rb:20:551:20:3284 | then ... | UseUseExplosion.rb:20:535:20:3300 | if ... |
 | UseUseExplosion.rb:20:556:20:3284 | if ... | UseUseExplosion.rb:20:551:20:3284 | then ... |
 | UseUseExplosion.rb:20:560:20:564 | [post] self | UseUseExplosion.rb:20:581:20:585 | self |
 | UseUseExplosion.rb:20:560:20:564 | [post] self | UseUseExplosion.rb:20:3275:20:3280 | self |
 | UseUseExplosion.rb:20:560:20:564 | self | UseUseExplosion.rb:20:581:20:585 | self |
 | UseUseExplosion.rb:20:560:20:564 | self | UseUseExplosion.rb:20:3275:20:3280 | self |
-| UseUseExplosion.rb:20:560:20:569 | ... > ... | UseUseExplosion.rb:20:559:20:570 | [false] ( ... ) |
-| UseUseExplosion.rb:20:560:20:569 | ... > ... | UseUseExplosion.rb:20:559:20:570 | [true] ( ... ) |
+| UseUseExplosion.rb:20:560:20:569 | ... > ... | UseUseExplosion.rb:20:559:20:570 | ( ... ) |
 | UseUseExplosion.rb:20:572:20:3268 | then ... | UseUseExplosion.rb:20:556:20:3284 | if ... |
 | UseUseExplosion.rb:20:577:20:3268 | if ... | UseUseExplosion.rb:20:572:20:3268 | then ... |
 | UseUseExplosion.rb:20:581:20:585 | [post] self | UseUseExplosion.rb:20:602:20:606 | self |
 | UseUseExplosion.rb:20:581:20:585 | [post] self | UseUseExplosion.rb:20:3259:20:3264 | self |
 | UseUseExplosion.rb:20:581:20:585 | self | UseUseExplosion.rb:20:602:20:606 | self |
 | UseUseExplosion.rb:20:581:20:585 | self | UseUseExplosion.rb:20:3259:20:3264 | self |
-| UseUseExplosion.rb:20:581:20:590 | ... > ... | UseUseExplosion.rb:20:580:20:591 | [false] ( ... ) |
-| UseUseExplosion.rb:20:581:20:590 | ... > ... | UseUseExplosion.rb:20:580:20:591 | [true] ( ... ) |
+| UseUseExplosion.rb:20:581:20:590 | ... > ... | UseUseExplosion.rb:20:580:20:591 | ( ... ) |
 | UseUseExplosion.rb:20:593:20:3252 | then ... | UseUseExplosion.rb:20:577:20:3268 | if ... |
 | UseUseExplosion.rb:20:598:20:3252 | if ... | UseUseExplosion.rb:20:593:20:3252 | then ... |
 | UseUseExplosion.rb:20:602:20:606 | [post] self | UseUseExplosion.rb:20:623:20:627 | self |
 | UseUseExplosion.rb:20:602:20:606 | [post] self | UseUseExplosion.rb:20:3243:20:3248 | self |
 | UseUseExplosion.rb:20:602:20:606 | self | UseUseExplosion.rb:20:623:20:627 | self |
 | UseUseExplosion.rb:20:602:20:606 | self | UseUseExplosion.rb:20:3243:20:3248 | self |
-| UseUseExplosion.rb:20:602:20:611 | ... > ... | UseUseExplosion.rb:20:601:20:612 | [false] ( ... ) |
-| UseUseExplosion.rb:20:602:20:611 | ... > ... | UseUseExplosion.rb:20:601:20:612 | [true] ( ... ) |
+| UseUseExplosion.rb:20:602:20:611 | ... > ... | UseUseExplosion.rb:20:601:20:612 | ( ... ) |
 | UseUseExplosion.rb:20:614:20:3236 | then ... | UseUseExplosion.rb:20:598:20:3252 | if ... |
 | UseUseExplosion.rb:20:619:20:3236 | if ... | UseUseExplosion.rb:20:614:20:3236 | then ... |
 | UseUseExplosion.rb:20:623:20:627 | [post] self | UseUseExplosion.rb:20:644:20:648 | self |
 | UseUseExplosion.rb:20:623:20:627 | [post] self | UseUseExplosion.rb:20:3227:20:3232 | self |
 | UseUseExplosion.rb:20:623:20:627 | self | UseUseExplosion.rb:20:644:20:648 | self |
 | UseUseExplosion.rb:20:623:20:627 | self | UseUseExplosion.rb:20:3227:20:3232 | self |
-| UseUseExplosion.rb:20:623:20:632 | ... > ... | UseUseExplosion.rb:20:622:20:633 | [false] ( ... ) |
-| UseUseExplosion.rb:20:623:20:632 | ... > ... | UseUseExplosion.rb:20:622:20:633 | [true] ( ... ) |
+| UseUseExplosion.rb:20:623:20:632 | ... > ... | UseUseExplosion.rb:20:622:20:633 | ( ... ) |
 | UseUseExplosion.rb:20:635:20:3220 | then ... | UseUseExplosion.rb:20:619:20:3236 | if ... |
 | UseUseExplosion.rb:20:640:20:3220 | if ... | UseUseExplosion.rb:20:635:20:3220 | then ... |
 | UseUseExplosion.rb:20:644:20:648 | [post] self | UseUseExplosion.rb:20:665:20:669 | self |
 | UseUseExplosion.rb:20:644:20:648 | [post] self | UseUseExplosion.rb:20:3211:20:3216 | self |
 | UseUseExplosion.rb:20:644:20:648 | self | UseUseExplosion.rb:20:665:20:669 | self |
 | UseUseExplosion.rb:20:644:20:648 | self | UseUseExplosion.rb:20:3211:20:3216 | self |
-| UseUseExplosion.rb:20:644:20:653 | ... > ... | UseUseExplosion.rb:20:643:20:654 | [false] ( ... ) |
-| UseUseExplosion.rb:20:644:20:653 | ... > ... | UseUseExplosion.rb:20:643:20:654 | [true] ( ... ) |
+| UseUseExplosion.rb:20:644:20:653 | ... > ... | UseUseExplosion.rb:20:643:20:654 | ( ... ) |
 | UseUseExplosion.rb:20:656:20:3204 | then ... | UseUseExplosion.rb:20:640:20:3220 | if ... |
 | UseUseExplosion.rb:20:661:20:3204 | if ... | UseUseExplosion.rb:20:656:20:3204 | then ... |
 | UseUseExplosion.rb:20:665:20:669 | [post] self | UseUseExplosion.rb:20:686:20:690 | self |
 | UseUseExplosion.rb:20:665:20:669 | [post] self | UseUseExplosion.rb:20:3195:20:3200 | self |
 | UseUseExplosion.rb:20:665:20:669 | self | UseUseExplosion.rb:20:686:20:690 | self |
 | UseUseExplosion.rb:20:665:20:669 | self | UseUseExplosion.rb:20:3195:20:3200 | self |
-| UseUseExplosion.rb:20:665:20:674 | ... > ... | UseUseExplosion.rb:20:664:20:675 | [false] ( ... ) |
-| UseUseExplosion.rb:20:665:20:674 | ... > ... | UseUseExplosion.rb:20:664:20:675 | [true] ( ... ) |
+| UseUseExplosion.rb:20:665:20:674 | ... > ... | UseUseExplosion.rb:20:664:20:675 | ( ... ) |
 | UseUseExplosion.rb:20:677:20:3188 | then ... | UseUseExplosion.rb:20:661:20:3204 | if ... |
 | UseUseExplosion.rb:20:682:20:3188 | if ... | UseUseExplosion.rb:20:677:20:3188 | then ... |
 | UseUseExplosion.rb:20:686:20:690 | [post] self | UseUseExplosion.rb:20:707:20:711 | self |
 | UseUseExplosion.rb:20:686:20:690 | [post] self | UseUseExplosion.rb:20:3179:20:3184 | self |
 | UseUseExplosion.rb:20:686:20:690 | self | UseUseExplosion.rb:20:707:20:711 | self |
 | UseUseExplosion.rb:20:686:20:690 | self | UseUseExplosion.rb:20:3179:20:3184 | self |
-| UseUseExplosion.rb:20:686:20:695 | ... > ... | UseUseExplosion.rb:20:685:20:696 | [false] ( ... ) |
-| UseUseExplosion.rb:20:686:20:695 | ... > ... | UseUseExplosion.rb:20:685:20:696 | [true] ( ... ) |
+| UseUseExplosion.rb:20:686:20:695 | ... > ... | UseUseExplosion.rb:20:685:20:696 | ( ... ) |
 | UseUseExplosion.rb:20:698:20:3172 | then ... | UseUseExplosion.rb:20:682:20:3188 | if ... |
 | UseUseExplosion.rb:20:703:20:3172 | if ... | UseUseExplosion.rb:20:698:20:3172 | then ... |
 | UseUseExplosion.rb:20:707:20:711 | [post] self | UseUseExplosion.rb:20:728:20:732 | self |
 | UseUseExplosion.rb:20:707:20:711 | [post] self | UseUseExplosion.rb:20:3163:20:3168 | self |
 | UseUseExplosion.rb:20:707:20:711 | self | UseUseExplosion.rb:20:728:20:732 | self |
 | UseUseExplosion.rb:20:707:20:711 | self | UseUseExplosion.rb:20:3163:20:3168 | self |
-| UseUseExplosion.rb:20:707:20:716 | ... > ... | UseUseExplosion.rb:20:706:20:717 | [false] ( ... ) |
-| UseUseExplosion.rb:20:707:20:716 | ... > ... | UseUseExplosion.rb:20:706:20:717 | [true] ( ... ) |
+| UseUseExplosion.rb:20:707:20:716 | ... > ... | UseUseExplosion.rb:20:706:20:717 | ( ... ) |
 | UseUseExplosion.rb:20:719:20:3156 | then ... | UseUseExplosion.rb:20:703:20:3172 | if ... |
 | UseUseExplosion.rb:20:724:20:3156 | if ... | UseUseExplosion.rb:20:719:20:3156 | then ... |
 | UseUseExplosion.rb:20:728:20:732 | [post] self | UseUseExplosion.rb:20:749:20:753 | self |
 | UseUseExplosion.rb:20:728:20:732 | [post] self | UseUseExplosion.rb:20:3147:20:3152 | self |
 | UseUseExplosion.rb:20:728:20:732 | self | UseUseExplosion.rb:20:749:20:753 | self |
 | UseUseExplosion.rb:20:728:20:732 | self | UseUseExplosion.rb:20:3147:20:3152 | self |
-| UseUseExplosion.rb:20:728:20:737 | ... > ... | UseUseExplosion.rb:20:727:20:738 | [false] ( ... ) |
-| UseUseExplosion.rb:20:728:20:737 | ... > ... | UseUseExplosion.rb:20:727:20:738 | [true] ( ... ) |
+| UseUseExplosion.rb:20:728:20:737 | ... > ... | UseUseExplosion.rb:20:727:20:738 | ( ... ) |
 | UseUseExplosion.rb:20:740:20:3140 | then ... | UseUseExplosion.rb:20:724:20:3156 | if ... |
 | UseUseExplosion.rb:20:745:20:3140 | if ... | UseUseExplosion.rb:20:740:20:3140 | then ... |
 | UseUseExplosion.rb:20:749:20:753 | [post] self | UseUseExplosion.rb:20:770:20:774 | self |
 | UseUseExplosion.rb:20:749:20:753 | [post] self | UseUseExplosion.rb:20:3131:20:3136 | self |
 | UseUseExplosion.rb:20:749:20:753 | self | UseUseExplosion.rb:20:770:20:774 | self |
 | UseUseExplosion.rb:20:749:20:753 | self | UseUseExplosion.rb:20:3131:20:3136 | self |
-| UseUseExplosion.rb:20:749:20:758 | ... > ... | UseUseExplosion.rb:20:748:20:759 | [false] ( ... ) |
-| UseUseExplosion.rb:20:749:20:758 | ... > ... | UseUseExplosion.rb:20:748:20:759 | [true] ( ... ) |
+| UseUseExplosion.rb:20:749:20:758 | ... > ... | UseUseExplosion.rb:20:748:20:759 | ( ... ) |
 | UseUseExplosion.rb:20:761:20:3124 | then ... | UseUseExplosion.rb:20:745:20:3140 | if ... |
 | UseUseExplosion.rb:20:766:20:3124 | if ... | UseUseExplosion.rb:20:761:20:3124 | then ... |
 | UseUseExplosion.rb:20:770:20:774 | [post] self | UseUseExplosion.rb:20:791:20:795 | self |
 | UseUseExplosion.rb:20:770:20:774 | [post] self | UseUseExplosion.rb:20:3115:20:3120 | self |
 | UseUseExplosion.rb:20:770:20:774 | self | UseUseExplosion.rb:20:791:20:795 | self |
 | UseUseExplosion.rb:20:770:20:774 | self | UseUseExplosion.rb:20:3115:20:3120 | self |
-| UseUseExplosion.rb:20:770:20:779 | ... > ... | UseUseExplosion.rb:20:769:20:780 | [false] ( ... ) |
-| UseUseExplosion.rb:20:770:20:779 | ... > ... | UseUseExplosion.rb:20:769:20:780 | [true] ( ... ) |
+| UseUseExplosion.rb:20:770:20:779 | ... > ... | UseUseExplosion.rb:20:769:20:780 | ( ... ) |
 | UseUseExplosion.rb:20:782:20:3108 | then ... | UseUseExplosion.rb:20:766:20:3124 | if ... |
 | UseUseExplosion.rb:20:787:20:3108 | if ... | UseUseExplosion.rb:20:782:20:3108 | then ... |
 | UseUseExplosion.rb:20:791:20:795 | [post] self | UseUseExplosion.rb:20:812:20:816 | self |
 | UseUseExplosion.rb:20:791:20:795 | [post] self | UseUseExplosion.rb:20:3099:20:3104 | self |
 | UseUseExplosion.rb:20:791:20:795 | self | UseUseExplosion.rb:20:812:20:816 | self |
 | UseUseExplosion.rb:20:791:20:795 | self | UseUseExplosion.rb:20:3099:20:3104 | self |
-| UseUseExplosion.rb:20:791:20:800 | ... > ... | UseUseExplosion.rb:20:790:20:801 | [false] ( ... ) |
-| UseUseExplosion.rb:20:791:20:800 | ... > ... | UseUseExplosion.rb:20:790:20:801 | [true] ( ... ) |
+| UseUseExplosion.rb:20:791:20:800 | ... > ... | UseUseExplosion.rb:20:790:20:801 | ( ... ) |
 | UseUseExplosion.rb:20:803:20:3092 | then ... | UseUseExplosion.rb:20:787:20:3108 | if ... |
 | UseUseExplosion.rb:20:808:20:3092 | if ... | UseUseExplosion.rb:20:803:20:3092 | then ... |
 | UseUseExplosion.rb:20:812:20:816 | [post] self | UseUseExplosion.rb:20:833:20:837 | self |
 | UseUseExplosion.rb:20:812:20:816 | [post] self | UseUseExplosion.rb:20:3083:20:3088 | self |
 | UseUseExplosion.rb:20:812:20:816 | self | UseUseExplosion.rb:20:833:20:837 | self |
 | UseUseExplosion.rb:20:812:20:816 | self | UseUseExplosion.rb:20:3083:20:3088 | self |
-| UseUseExplosion.rb:20:812:20:821 | ... > ... | UseUseExplosion.rb:20:811:20:822 | [false] ( ... ) |
-| UseUseExplosion.rb:20:812:20:821 | ... > ... | UseUseExplosion.rb:20:811:20:822 | [true] ( ... ) |
+| UseUseExplosion.rb:20:812:20:821 | ... > ... | UseUseExplosion.rb:20:811:20:822 | ( ... ) |
 | UseUseExplosion.rb:20:824:20:3076 | then ... | UseUseExplosion.rb:20:808:20:3092 | if ... |
 | UseUseExplosion.rb:20:829:20:3076 | if ... | UseUseExplosion.rb:20:824:20:3076 | then ... |
 | UseUseExplosion.rb:20:833:20:837 | [post] self | UseUseExplosion.rb:20:854:20:858 | self |
 | UseUseExplosion.rb:20:833:20:837 | [post] self | UseUseExplosion.rb:20:3067:20:3072 | self |
 | UseUseExplosion.rb:20:833:20:837 | self | UseUseExplosion.rb:20:854:20:858 | self |
 | UseUseExplosion.rb:20:833:20:837 | self | UseUseExplosion.rb:20:3067:20:3072 | self |
-| UseUseExplosion.rb:20:833:20:842 | ... > ... | UseUseExplosion.rb:20:832:20:843 | [false] ( ... ) |
-| UseUseExplosion.rb:20:833:20:842 | ... > ... | UseUseExplosion.rb:20:832:20:843 | [true] ( ... ) |
+| UseUseExplosion.rb:20:833:20:842 | ... > ... | UseUseExplosion.rb:20:832:20:843 | ( ... ) |
 | UseUseExplosion.rb:20:845:20:3060 | then ... | UseUseExplosion.rb:20:829:20:3076 | if ... |
 | UseUseExplosion.rb:20:850:20:3060 | if ... | UseUseExplosion.rb:20:845:20:3060 | then ... |
 | UseUseExplosion.rb:20:854:20:858 | [post] self | UseUseExplosion.rb:20:875:20:879 | self |
 | UseUseExplosion.rb:20:854:20:858 | [post] self | UseUseExplosion.rb:20:3051:20:3056 | self |
 | UseUseExplosion.rb:20:854:20:858 | self | UseUseExplosion.rb:20:875:20:879 | self |
 | UseUseExplosion.rb:20:854:20:858 | self | UseUseExplosion.rb:20:3051:20:3056 | self |
-| UseUseExplosion.rb:20:854:20:863 | ... > ... | UseUseExplosion.rb:20:853:20:864 | [false] ( ... ) |
-| UseUseExplosion.rb:20:854:20:863 | ... > ... | UseUseExplosion.rb:20:853:20:864 | [true] ( ... ) |
+| UseUseExplosion.rb:20:854:20:863 | ... > ... | UseUseExplosion.rb:20:853:20:864 | ( ... ) |
 | UseUseExplosion.rb:20:866:20:3044 | then ... | UseUseExplosion.rb:20:850:20:3060 | if ... |
 | UseUseExplosion.rb:20:871:20:3044 | if ... | UseUseExplosion.rb:20:866:20:3044 | then ... |
 | UseUseExplosion.rb:20:875:20:879 | [post] self | UseUseExplosion.rb:20:896:20:900 | self |
 | UseUseExplosion.rb:20:875:20:879 | [post] self | UseUseExplosion.rb:20:3035:20:3040 | self |
 | UseUseExplosion.rb:20:875:20:879 | self | UseUseExplosion.rb:20:896:20:900 | self |
 | UseUseExplosion.rb:20:875:20:879 | self | UseUseExplosion.rb:20:3035:20:3040 | self |
-| UseUseExplosion.rb:20:875:20:884 | ... > ... | UseUseExplosion.rb:20:874:20:885 | [false] ( ... ) |
-| UseUseExplosion.rb:20:875:20:884 | ... > ... | UseUseExplosion.rb:20:874:20:885 | [true] ( ... ) |
+| UseUseExplosion.rb:20:875:20:884 | ... > ... | UseUseExplosion.rb:20:874:20:885 | ( ... ) |
 | UseUseExplosion.rb:20:887:20:3028 | then ... | UseUseExplosion.rb:20:871:20:3044 | if ... |
 | UseUseExplosion.rb:20:892:20:3028 | if ... | UseUseExplosion.rb:20:887:20:3028 | then ... |
 | UseUseExplosion.rb:20:896:20:900 | [post] self | UseUseExplosion.rb:20:917:20:921 | self |
 | UseUseExplosion.rb:20:896:20:900 | [post] self | UseUseExplosion.rb:20:3019:20:3024 | self |
 | UseUseExplosion.rb:20:896:20:900 | self | UseUseExplosion.rb:20:917:20:921 | self |
 | UseUseExplosion.rb:20:896:20:900 | self | UseUseExplosion.rb:20:3019:20:3024 | self |
-| UseUseExplosion.rb:20:896:20:905 | ... > ... | UseUseExplosion.rb:20:895:20:906 | [false] ( ... ) |
-| UseUseExplosion.rb:20:896:20:905 | ... > ... | UseUseExplosion.rb:20:895:20:906 | [true] ( ... ) |
+| UseUseExplosion.rb:20:896:20:905 | ... > ... | UseUseExplosion.rb:20:895:20:906 | ( ... ) |
 | UseUseExplosion.rb:20:908:20:3012 | then ... | UseUseExplosion.rb:20:892:20:3028 | if ... |
 | UseUseExplosion.rb:20:913:20:3012 | if ... | UseUseExplosion.rb:20:908:20:3012 | then ... |
 | UseUseExplosion.rb:20:917:20:921 | [post] self | UseUseExplosion.rb:20:938:20:942 | self |
 | UseUseExplosion.rb:20:917:20:921 | [post] self | UseUseExplosion.rb:20:3003:20:3008 | self |
 | UseUseExplosion.rb:20:917:20:921 | self | UseUseExplosion.rb:20:938:20:942 | self |
 | UseUseExplosion.rb:20:917:20:921 | self | UseUseExplosion.rb:20:3003:20:3008 | self |
-| UseUseExplosion.rb:20:917:20:926 | ... > ... | UseUseExplosion.rb:20:916:20:927 | [false] ( ... ) |
-| UseUseExplosion.rb:20:917:20:926 | ... > ... | UseUseExplosion.rb:20:916:20:927 | [true] ( ... ) |
+| UseUseExplosion.rb:20:917:20:926 | ... > ... | UseUseExplosion.rb:20:916:20:927 | ( ... ) |
 | UseUseExplosion.rb:20:929:20:2996 | then ... | UseUseExplosion.rb:20:913:20:3012 | if ... |
 | UseUseExplosion.rb:20:934:20:2996 | if ... | UseUseExplosion.rb:20:929:20:2996 | then ... |
 | UseUseExplosion.rb:20:938:20:942 | [post] self | UseUseExplosion.rb:20:959:20:963 | self |
 | UseUseExplosion.rb:20:938:20:942 | [post] self | UseUseExplosion.rb:20:2987:20:2992 | self |
 | UseUseExplosion.rb:20:938:20:942 | self | UseUseExplosion.rb:20:959:20:963 | self |
 | UseUseExplosion.rb:20:938:20:942 | self | UseUseExplosion.rb:20:2987:20:2992 | self |
-| UseUseExplosion.rb:20:938:20:947 | ... > ... | UseUseExplosion.rb:20:937:20:948 | [false] ( ... ) |
-| UseUseExplosion.rb:20:938:20:947 | ... > ... | UseUseExplosion.rb:20:937:20:948 | [true] ( ... ) |
+| UseUseExplosion.rb:20:938:20:947 | ... > ... | UseUseExplosion.rb:20:937:20:948 | ( ... ) |
 | UseUseExplosion.rb:20:950:20:2980 | then ... | UseUseExplosion.rb:20:934:20:2996 | if ... |
 | UseUseExplosion.rb:20:955:20:2980 | if ... | UseUseExplosion.rb:20:950:20:2980 | then ... |
 | UseUseExplosion.rb:20:959:20:963 | [post] self | UseUseExplosion.rb:20:980:20:984 | self |
 | UseUseExplosion.rb:20:959:20:963 | [post] self | UseUseExplosion.rb:20:2971:20:2976 | self |
 | UseUseExplosion.rb:20:959:20:963 | self | UseUseExplosion.rb:20:980:20:984 | self |
 | UseUseExplosion.rb:20:959:20:963 | self | UseUseExplosion.rb:20:2971:20:2976 | self |
-| UseUseExplosion.rb:20:959:20:968 | ... > ... | UseUseExplosion.rb:20:958:20:969 | [false] ( ... ) |
-| UseUseExplosion.rb:20:959:20:968 | ... > ... | UseUseExplosion.rb:20:958:20:969 | [true] ( ... ) |
+| UseUseExplosion.rb:20:959:20:968 | ... > ... | UseUseExplosion.rb:20:958:20:969 | ( ... ) |
 | UseUseExplosion.rb:20:971:20:2964 | then ... | UseUseExplosion.rb:20:955:20:2980 | if ... |
 | UseUseExplosion.rb:20:976:20:2964 | if ... | UseUseExplosion.rb:20:971:20:2964 | then ... |
 | UseUseExplosion.rb:20:980:20:984 | [post] self | UseUseExplosion.rb:20:1001:20:1005 | self |
 | UseUseExplosion.rb:20:980:20:984 | [post] self | UseUseExplosion.rb:20:2955:20:2960 | self |
 | UseUseExplosion.rb:20:980:20:984 | self | UseUseExplosion.rb:20:1001:20:1005 | self |
 | UseUseExplosion.rb:20:980:20:984 | self | UseUseExplosion.rb:20:2955:20:2960 | self |
-| UseUseExplosion.rb:20:980:20:989 | ... > ... | UseUseExplosion.rb:20:979:20:990 | [false] ( ... ) |
-| UseUseExplosion.rb:20:980:20:989 | ... > ... | UseUseExplosion.rb:20:979:20:990 | [true] ( ... ) |
+| UseUseExplosion.rb:20:980:20:989 | ... > ... | UseUseExplosion.rb:20:979:20:990 | ( ... ) |
 | UseUseExplosion.rb:20:992:20:2948 | then ... | UseUseExplosion.rb:20:976:20:2964 | if ... |
 | UseUseExplosion.rb:20:997:20:2948 | if ... | UseUseExplosion.rb:20:992:20:2948 | then ... |
 | UseUseExplosion.rb:20:1001:20:1005 | [post] self | UseUseExplosion.rb:20:1022:20:1026 | self |
 | UseUseExplosion.rb:20:1001:20:1005 | [post] self | UseUseExplosion.rb:20:2939:20:2944 | self |
 | UseUseExplosion.rb:20:1001:20:1005 | self | UseUseExplosion.rb:20:1022:20:1026 | self |
 | UseUseExplosion.rb:20:1001:20:1005 | self | UseUseExplosion.rb:20:2939:20:2944 | self |
-| UseUseExplosion.rb:20:1001:20:1010 | ... > ... | UseUseExplosion.rb:20:1000:20:1011 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1001:20:1010 | ... > ... | UseUseExplosion.rb:20:1000:20:1011 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1001:20:1010 | ... > ... | UseUseExplosion.rb:20:1000:20:1011 | ( ... ) |
 | UseUseExplosion.rb:20:1013:20:2932 | then ... | UseUseExplosion.rb:20:997:20:2948 | if ... |
 | UseUseExplosion.rb:20:1018:20:2932 | if ... | UseUseExplosion.rb:20:1013:20:2932 | then ... |
 | UseUseExplosion.rb:20:1022:20:1026 | [post] self | UseUseExplosion.rb:20:1043:20:1047 | self |
 | UseUseExplosion.rb:20:1022:20:1026 | [post] self | UseUseExplosion.rb:20:2923:20:2928 | self |
 | UseUseExplosion.rb:20:1022:20:1026 | self | UseUseExplosion.rb:20:1043:20:1047 | self |
 | UseUseExplosion.rb:20:1022:20:1026 | self | UseUseExplosion.rb:20:2923:20:2928 | self |
-| UseUseExplosion.rb:20:1022:20:1031 | ... > ... | UseUseExplosion.rb:20:1021:20:1032 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1022:20:1031 | ... > ... | UseUseExplosion.rb:20:1021:20:1032 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1022:20:1031 | ... > ... | UseUseExplosion.rb:20:1021:20:1032 | ( ... ) |
 | UseUseExplosion.rb:20:1034:20:2916 | then ... | UseUseExplosion.rb:20:1018:20:2932 | if ... |
 | UseUseExplosion.rb:20:1039:20:2916 | if ... | UseUseExplosion.rb:20:1034:20:2916 | then ... |
 | UseUseExplosion.rb:20:1043:20:1047 | [post] self | UseUseExplosion.rb:20:1064:20:1068 | self |
 | UseUseExplosion.rb:20:1043:20:1047 | [post] self | UseUseExplosion.rb:20:2907:20:2912 | self |
 | UseUseExplosion.rb:20:1043:20:1047 | self | UseUseExplosion.rb:20:1064:20:1068 | self |
 | UseUseExplosion.rb:20:1043:20:1047 | self | UseUseExplosion.rb:20:2907:20:2912 | self |
-| UseUseExplosion.rb:20:1043:20:1052 | ... > ... | UseUseExplosion.rb:20:1042:20:1053 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1043:20:1052 | ... > ... | UseUseExplosion.rb:20:1042:20:1053 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1043:20:1052 | ... > ... | UseUseExplosion.rb:20:1042:20:1053 | ( ... ) |
 | UseUseExplosion.rb:20:1055:20:2900 | then ... | UseUseExplosion.rb:20:1039:20:2916 | if ... |
 | UseUseExplosion.rb:20:1060:20:2900 | if ... | UseUseExplosion.rb:20:1055:20:2900 | then ... |
 | UseUseExplosion.rb:20:1064:20:1068 | [post] self | UseUseExplosion.rb:20:1085:20:1089 | self |
 | UseUseExplosion.rb:20:1064:20:1068 | [post] self | UseUseExplosion.rb:20:2891:20:2896 | self |
 | UseUseExplosion.rb:20:1064:20:1068 | self | UseUseExplosion.rb:20:1085:20:1089 | self |
 | UseUseExplosion.rb:20:1064:20:1068 | self | UseUseExplosion.rb:20:2891:20:2896 | self |
-| UseUseExplosion.rb:20:1064:20:1073 | ... > ... | UseUseExplosion.rb:20:1063:20:1074 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1064:20:1073 | ... > ... | UseUseExplosion.rb:20:1063:20:1074 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1064:20:1073 | ... > ... | UseUseExplosion.rb:20:1063:20:1074 | ( ... ) |
 | UseUseExplosion.rb:20:1076:20:2884 | then ... | UseUseExplosion.rb:20:1060:20:2900 | if ... |
 | UseUseExplosion.rb:20:1081:20:2884 | if ... | UseUseExplosion.rb:20:1076:20:2884 | then ... |
 | UseUseExplosion.rb:20:1085:20:1089 | [post] self | UseUseExplosion.rb:20:1106:20:1110 | self |
 | UseUseExplosion.rb:20:1085:20:1089 | [post] self | UseUseExplosion.rb:20:2875:20:2880 | self |
 | UseUseExplosion.rb:20:1085:20:1089 | self | UseUseExplosion.rb:20:1106:20:1110 | self |
 | UseUseExplosion.rb:20:1085:20:1089 | self | UseUseExplosion.rb:20:2875:20:2880 | self |
-| UseUseExplosion.rb:20:1085:20:1094 | ... > ... | UseUseExplosion.rb:20:1084:20:1095 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1085:20:1094 | ... > ... | UseUseExplosion.rb:20:1084:20:1095 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1085:20:1094 | ... > ... | UseUseExplosion.rb:20:1084:20:1095 | ( ... ) |
 | UseUseExplosion.rb:20:1097:20:2868 | then ... | UseUseExplosion.rb:20:1081:20:2884 | if ... |
 | UseUseExplosion.rb:20:1102:20:2868 | if ... | UseUseExplosion.rb:20:1097:20:2868 | then ... |
 | UseUseExplosion.rb:20:1106:20:1110 | [post] self | UseUseExplosion.rb:20:1127:20:1131 | self |
 | UseUseExplosion.rb:20:1106:20:1110 | [post] self | UseUseExplosion.rb:20:2859:20:2864 | self |
 | UseUseExplosion.rb:20:1106:20:1110 | self | UseUseExplosion.rb:20:1127:20:1131 | self |
 | UseUseExplosion.rb:20:1106:20:1110 | self | UseUseExplosion.rb:20:2859:20:2864 | self |
-| UseUseExplosion.rb:20:1106:20:1115 | ... > ... | UseUseExplosion.rb:20:1105:20:1116 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1106:20:1115 | ... > ... | UseUseExplosion.rb:20:1105:20:1116 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1106:20:1115 | ... > ... | UseUseExplosion.rb:20:1105:20:1116 | ( ... ) |
 | UseUseExplosion.rb:20:1118:20:2852 | then ... | UseUseExplosion.rb:20:1102:20:2868 | if ... |
 | UseUseExplosion.rb:20:1123:20:2852 | if ... | UseUseExplosion.rb:20:1118:20:2852 | then ... |
 | UseUseExplosion.rb:20:1127:20:1131 | [post] self | UseUseExplosion.rb:20:1148:20:1152 | self |
 | UseUseExplosion.rb:20:1127:20:1131 | [post] self | UseUseExplosion.rb:20:2843:20:2848 | self |
 | UseUseExplosion.rb:20:1127:20:1131 | self | UseUseExplosion.rb:20:1148:20:1152 | self |
 | UseUseExplosion.rb:20:1127:20:1131 | self | UseUseExplosion.rb:20:2843:20:2848 | self |
-| UseUseExplosion.rb:20:1127:20:1136 | ... > ... | UseUseExplosion.rb:20:1126:20:1137 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1127:20:1136 | ... > ... | UseUseExplosion.rb:20:1126:20:1137 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1127:20:1136 | ... > ... | UseUseExplosion.rb:20:1126:20:1137 | ( ... ) |
 | UseUseExplosion.rb:20:1139:20:2836 | then ... | UseUseExplosion.rb:20:1123:20:2852 | if ... |
 | UseUseExplosion.rb:20:1144:20:2836 | if ... | UseUseExplosion.rb:20:1139:20:2836 | then ... |
 | UseUseExplosion.rb:20:1148:20:1152 | [post] self | UseUseExplosion.rb:20:1169:20:1173 | self |
 | UseUseExplosion.rb:20:1148:20:1152 | [post] self | UseUseExplosion.rb:20:2827:20:2832 | self |
 | UseUseExplosion.rb:20:1148:20:1152 | self | UseUseExplosion.rb:20:1169:20:1173 | self |
 | UseUseExplosion.rb:20:1148:20:1152 | self | UseUseExplosion.rb:20:2827:20:2832 | self |
-| UseUseExplosion.rb:20:1148:20:1157 | ... > ... | UseUseExplosion.rb:20:1147:20:1158 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1148:20:1157 | ... > ... | UseUseExplosion.rb:20:1147:20:1158 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1148:20:1157 | ... > ... | UseUseExplosion.rb:20:1147:20:1158 | ( ... ) |
 | UseUseExplosion.rb:20:1160:20:2820 | then ... | UseUseExplosion.rb:20:1144:20:2836 | if ... |
 | UseUseExplosion.rb:20:1165:20:2820 | if ... | UseUseExplosion.rb:20:1160:20:2820 | then ... |
 | UseUseExplosion.rb:20:1169:20:1173 | [post] self | UseUseExplosion.rb:20:1190:20:1194 | self |
 | UseUseExplosion.rb:20:1169:20:1173 | [post] self | UseUseExplosion.rb:20:2811:20:2816 | self |
 | UseUseExplosion.rb:20:1169:20:1173 | self | UseUseExplosion.rb:20:1190:20:1194 | self |
 | UseUseExplosion.rb:20:1169:20:1173 | self | UseUseExplosion.rb:20:2811:20:2816 | self |
-| UseUseExplosion.rb:20:1169:20:1178 | ... > ... | UseUseExplosion.rb:20:1168:20:1179 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1169:20:1178 | ... > ... | UseUseExplosion.rb:20:1168:20:1179 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1169:20:1178 | ... > ... | UseUseExplosion.rb:20:1168:20:1179 | ( ... ) |
 | UseUseExplosion.rb:20:1181:20:2804 | then ... | UseUseExplosion.rb:20:1165:20:2820 | if ... |
 | UseUseExplosion.rb:20:1186:20:2804 | if ... | UseUseExplosion.rb:20:1181:20:2804 | then ... |
 | UseUseExplosion.rb:20:1190:20:1194 | [post] self | UseUseExplosion.rb:20:1211:20:1215 | self |
 | UseUseExplosion.rb:20:1190:20:1194 | [post] self | UseUseExplosion.rb:20:2795:20:2800 | self |
 | UseUseExplosion.rb:20:1190:20:1194 | self | UseUseExplosion.rb:20:1211:20:1215 | self |
 | UseUseExplosion.rb:20:1190:20:1194 | self | UseUseExplosion.rb:20:2795:20:2800 | self |
-| UseUseExplosion.rb:20:1190:20:1199 | ... > ... | UseUseExplosion.rb:20:1189:20:1200 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1190:20:1199 | ... > ... | UseUseExplosion.rb:20:1189:20:1200 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1190:20:1199 | ... > ... | UseUseExplosion.rb:20:1189:20:1200 | ( ... ) |
 | UseUseExplosion.rb:20:1202:20:2788 | then ... | UseUseExplosion.rb:20:1186:20:2804 | if ... |
 | UseUseExplosion.rb:20:1207:20:2788 | if ... | UseUseExplosion.rb:20:1202:20:2788 | then ... |
 | UseUseExplosion.rb:20:1211:20:1215 | [post] self | UseUseExplosion.rb:20:1232:20:1236 | self |
 | UseUseExplosion.rb:20:1211:20:1215 | [post] self | UseUseExplosion.rb:20:2779:20:2784 | self |
 | UseUseExplosion.rb:20:1211:20:1215 | self | UseUseExplosion.rb:20:1232:20:1236 | self |
 | UseUseExplosion.rb:20:1211:20:1215 | self | UseUseExplosion.rb:20:2779:20:2784 | self |
-| UseUseExplosion.rb:20:1211:20:1220 | ... > ... | UseUseExplosion.rb:20:1210:20:1221 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1211:20:1220 | ... > ... | UseUseExplosion.rb:20:1210:20:1221 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1211:20:1220 | ... > ... | UseUseExplosion.rb:20:1210:20:1221 | ( ... ) |
 | UseUseExplosion.rb:20:1223:20:2772 | then ... | UseUseExplosion.rb:20:1207:20:2788 | if ... |
 | UseUseExplosion.rb:20:1228:20:2772 | if ... | UseUseExplosion.rb:20:1223:20:2772 | then ... |
 | UseUseExplosion.rb:20:1232:20:1236 | [post] self | UseUseExplosion.rb:20:1253:20:1257 | self |
 | UseUseExplosion.rb:20:1232:20:1236 | [post] self | UseUseExplosion.rb:20:2763:20:2768 | self |
 | UseUseExplosion.rb:20:1232:20:1236 | self | UseUseExplosion.rb:20:1253:20:1257 | self |
 | UseUseExplosion.rb:20:1232:20:1236 | self | UseUseExplosion.rb:20:2763:20:2768 | self |
-| UseUseExplosion.rb:20:1232:20:1241 | ... > ... | UseUseExplosion.rb:20:1231:20:1242 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1232:20:1241 | ... > ... | UseUseExplosion.rb:20:1231:20:1242 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1232:20:1241 | ... > ... | UseUseExplosion.rb:20:1231:20:1242 | ( ... ) |
 | UseUseExplosion.rb:20:1244:20:2756 | then ... | UseUseExplosion.rb:20:1228:20:2772 | if ... |
 | UseUseExplosion.rb:20:1249:20:2756 | if ... | UseUseExplosion.rb:20:1244:20:2756 | then ... |
 | UseUseExplosion.rb:20:1253:20:1257 | [post] self | UseUseExplosion.rb:20:1274:20:1278 | self |
 | UseUseExplosion.rb:20:1253:20:1257 | [post] self | UseUseExplosion.rb:20:2747:20:2752 | self |
 | UseUseExplosion.rb:20:1253:20:1257 | self | UseUseExplosion.rb:20:1274:20:1278 | self |
 | UseUseExplosion.rb:20:1253:20:1257 | self | UseUseExplosion.rb:20:2747:20:2752 | self |
-| UseUseExplosion.rb:20:1253:20:1262 | ... > ... | UseUseExplosion.rb:20:1252:20:1263 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1253:20:1262 | ... > ... | UseUseExplosion.rb:20:1252:20:1263 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1253:20:1262 | ... > ... | UseUseExplosion.rb:20:1252:20:1263 | ( ... ) |
 | UseUseExplosion.rb:20:1265:20:2740 | then ... | UseUseExplosion.rb:20:1249:20:2756 | if ... |
 | UseUseExplosion.rb:20:1270:20:2740 | if ... | UseUseExplosion.rb:20:1265:20:2740 | then ... |
 | UseUseExplosion.rb:20:1274:20:1278 | [post] self | UseUseExplosion.rb:20:1295:20:1299 | self |
 | UseUseExplosion.rb:20:1274:20:1278 | [post] self | UseUseExplosion.rb:20:2731:20:2736 | self |
 | UseUseExplosion.rb:20:1274:20:1278 | self | UseUseExplosion.rb:20:1295:20:1299 | self |
 | UseUseExplosion.rb:20:1274:20:1278 | self | UseUseExplosion.rb:20:2731:20:2736 | self |
-| UseUseExplosion.rb:20:1274:20:1283 | ... > ... | UseUseExplosion.rb:20:1273:20:1284 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1274:20:1283 | ... > ... | UseUseExplosion.rb:20:1273:20:1284 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1274:20:1283 | ... > ... | UseUseExplosion.rb:20:1273:20:1284 | ( ... ) |
 | UseUseExplosion.rb:20:1286:20:2724 | then ... | UseUseExplosion.rb:20:1270:20:2740 | if ... |
 | UseUseExplosion.rb:20:1291:20:2724 | if ... | UseUseExplosion.rb:20:1286:20:2724 | then ... |
 | UseUseExplosion.rb:20:1295:20:1299 | [post] self | UseUseExplosion.rb:20:1316:20:1320 | self |
 | UseUseExplosion.rb:20:1295:20:1299 | [post] self | UseUseExplosion.rb:20:2715:20:2720 | self |
 | UseUseExplosion.rb:20:1295:20:1299 | self | UseUseExplosion.rb:20:1316:20:1320 | self |
 | UseUseExplosion.rb:20:1295:20:1299 | self | UseUseExplosion.rb:20:2715:20:2720 | self |
-| UseUseExplosion.rb:20:1295:20:1304 | ... > ... | UseUseExplosion.rb:20:1294:20:1305 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1295:20:1304 | ... > ... | UseUseExplosion.rb:20:1294:20:1305 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1295:20:1304 | ... > ... | UseUseExplosion.rb:20:1294:20:1305 | ( ... ) |
 | UseUseExplosion.rb:20:1307:20:2708 | then ... | UseUseExplosion.rb:20:1291:20:2724 | if ... |
 | UseUseExplosion.rb:20:1312:20:2708 | if ... | UseUseExplosion.rb:20:1307:20:2708 | then ... |
 | UseUseExplosion.rb:20:1316:20:1320 | [post] self | UseUseExplosion.rb:20:1337:20:1341 | self |
 | UseUseExplosion.rb:20:1316:20:1320 | [post] self | UseUseExplosion.rb:20:2699:20:2704 | self |
 | UseUseExplosion.rb:20:1316:20:1320 | self | UseUseExplosion.rb:20:1337:20:1341 | self |
 | UseUseExplosion.rb:20:1316:20:1320 | self | UseUseExplosion.rb:20:2699:20:2704 | self |
-| UseUseExplosion.rb:20:1316:20:1325 | ... > ... | UseUseExplosion.rb:20:1315:20:1326 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1316:20:1325 | ... > ... | UseUseExplosion.rb:20:1315:20:1326 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1316:20:1325 | ... > ... | UseUseExplosion.rb:20:1315:20:1326 | ( ... ) |
 | UseUseExplosion.rb:20:1328:20:2692 | then ... | UseUseExplosion.rb:20:1312:20:2708 | if ... |
 | UseUseExplosion.rb:20:1333:20:2692 | if ... | UseUseExplosion.rb:20:1328:20:2692 | then ... |
 | UseUseExplosion.rb:20:1337:20:1341 | [post] self | UseUseExplosion.rb:20:1358:20:1362 | self |
 | UseUseExplosion.rb:20:1337:20:1341 | [post] self | UseUseExplosion.rb:20:2683:20:2688 | self |
 | UseUseExplosion.rb:20:1337:20:1341 | self | UseUseExplosion.rb:20:1358:20:1362 | self |
 | UseUseExplosion.rb:20:1337:20:1341 | self | UseUseExplosion.rb:20:2683:20:2688 | self |
-| UseUseExplosion.rb:20:1337:20:1346 | ... > ... | UseUseExplosion.rb:20:1336:20:1347 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1337:20:1346 | ... > ... | UseUseExplosion.rb:20:1336:20:1347 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1337:20:1346 | ... > ... | UseUseExplosion.rb:20:1336:20:1347 | ( ... ) |
 | UseUseExplosion.rb:20:1349:20:2676 | then ... | UseUseExplosion.rb:20:1333:20:2692 | if ... |
 | UseUseExplosion.rb:20:1354:20:2676 | if ... | UseUseExplosion.rb:20:1349:20:2676 | then ... |
 | UseUseExplosion.rb:20:1358:20:1362 | [post] self | UseUseExplosion.rb:20:1379:20:1383 | self |
 | UseUseExplosion.rb:20:1358:20:1362 | [post] self | UseUseExplosion.rb:20:2667:20:2672 | self |
 | UseUseExplosion.rb:20:1358:20:1362 | self | UseUseExplosion.rb:20:1379:20:1383 | self |
 | UseUseExplosion.rb:20:1358:20:1362 | self | UseUseExplosion.rb:20:2667:20:2672 | self |
-| UseUseExplosion.rb:20:1358:20:1367 | ... > ... | UseUseExplosion.rb:20:1357:20:1368 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1358:20:1367 | ... > ... | UseUseExplosion.rb:20:1357:20:1368 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1358:20:1367 | ... > ... | UseUseExplosion.rb:20:1357:20:1368 | ( ... ) |
 | UseUseExplosion.rb:20:1370:20:2660 | then ... | UseUseExplosion.rb:20:1354:20:2676 | if ... |
 | UseUseExplosion.rb:20:1375:20:2660 | if ... | UseUseExplosion.rb:20:1370:20:2660 | then ... |
 | UseUseExplosion.rb:20:1379:20:1383 | [post] self | UseUseExplosion.rb:20:1400:20:1404 | self |
 | UseUseExplosion.rb:20:1379:20:1383 | [post] self | UseUseExplosion.rb:20:2651:20:2656 | self |
 | UseUseExplosion.rb:20:1379:20:1383 | self | UseUseExplosion.rb:20:1400:20:1404 | self |
 | UseUseExplosion.rb:20:1379:20:1383 | self | UseUseExplosion.rb:20:2651:20:2656 | self |
-| UseUseExplosion.rb:20:1379:20:1388 | ... > ... | UseUseExplosion.rb:20:1378:20:1389 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1379:20:1388 | ... > ... | UseUseExplosion.rb:20:1378:20:1389 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1379:20:1388 | ... > ... | UseUseExplosion.rb:20:1378:20:1389 | ( ... ) |
 | UseUseExplosion.rb:20:1391:20:2644 | then ... | UseUseExplosion.rb:20:1375:20:2660 | if ... |
 | UseUseExplosion.rb:20:1396:20:2644 | if ... | UseUseExplosion.rb:20:1391:20:2644 | then ... |
 | UseUseExplosion.rb:20:1400:20:1404 | [post] self | UseUseExplosion.rb:20:1421:20:1425 | self |
 | UseUseExplosion.rb:20:1400:20:1404 | [post] self | UseUseExplosion.rb:20:2635:20:2640 | self |
 | UseUseExplosion.rb:20:1400:20:1404 | self | UseUseExplosion.rb:20:1421:20:1425 | self |
 | UseUseExplosion.rb:20:1400:20:1404 | self | UseUseExplosion.rb:20:2635:20:2640 | self |
-| UseUseExplosion.rb:20:1400:20:1409 | ... > ... | UseUseExplosion.rb:20:1399:20:1410 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1400:20:1409 | ... > ... | UseUseExplosion.rb:20:1399:20:1410 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1400:20:1409 | ... > ... | UseUseExplosion.rb:20:1399:20:1410 | ( ... ) |
 | UseUseExplosion.rb:20:1412:20:2628 | then ... | UseUseExplosion.rb:20:1396:20:2644 | if ... |
 | UseUseExplosion.rb:20:1417:20:2628 | if ... | UseUseExplosion.rb:20:1412:20:2628 | then ... |
 | UseUseExplosion.rb:20:1421:20:1425 | [post] self | UseUseExplosion.rb:20:1442:20:1446 | self |
 | UseUseExplosion.rb:20:1421:20:1425 | [post] self | UseUseExplosion.rb:20:2619:20:2624 | self |
 | UseUseExplosion.rb:20:1421:20:1425 | self | UseUseExplosion.rb:20:1442:20:1446 | self |
 | UseUseExplosion.rb:20:1421:20:1425 | self | UseUseExplosion.rb:20:2619:20:2624 | self |
-| UseUseExplosion.rb:20:1421:20:1430 | ... > ... | UseUseExplosion.rb:20:1420:20:1431 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1421:20:1430 | ... > ... | UseUseExplosion.rb:20:1420:20:1431 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1421:20:1430 | ... > ... | UseUseExplosion.rb:20:1420:20:1431 | ( ... ) |
 | UseUseExplosion.rb:20:1433:20:2612 | then ... | UseUseExplosion.rb:20:1417:20:2628 | if ... |
 | UseUseExplosion.rb:20:1438:20:2612 | if ... | UseUseExplosion.rb:20:1433:20:2612 | then ... |
 | UseUseExplosion.rb:20:1442:20:1446 | [post] self | UseUseExplosion.rb:20:1463:20:1467 | self |
 | UseUseExplosion.rb:20:1442:20:1446 | [post] self | UseUseExplosion.rb:20:2603:20:2608 | self |
 | UseUseExplosion.rb:20:1442:20:1446 | self | UseUseExplosion.rb:20:1463:20:1467 | self |
 | UseUseExplosion.rb:20:1442:20:1446 | self | UseUseExplosion.rb:20:2603:20:2608 | self |
-| UseUseExplosion.rb:20:1442:20:1451 | ... > ... | UseUseExplosion.rb:20:1441:20:1452 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1442:20:1451 | ... > ... | UseUseExplosion.rb:20:1441:20:1452 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1442:20:1451 | ... > ... | UseUseExplosion.rb:20:1441:20:1452 | ( ... ) |
 | UseUseExplosion.rb:20:1454:20:2596 | then ... | UseUseExplosion.rb:20:1438:20:2612 | if ... |
 | UseUseExplosion.rb:20:1459:20:2596 | if ... | UseUseExplosion.rb:20:1454:20:2596 | then ... |
 | UseUseExplosion.rb:20:1463:20:1467 | [post] self | UseUseExplosion.rb:20:1484:20:1488 | self |
 | UseUseExplosion.rb:20:1463:20:1467 | [post] self | UseUseExplosion.rb:20:2587:20:2592 | self |
 | UseUseExplosion.rb:20:1463:20:1467 | self | UseUseExplosion.rb:20:1484:20:1488 | self |
 | UseUseExplosion.rb:20:1463:20:1467 | self | UseUseExplosion.rb:20:2587:20:2592 | self |
-| UseUseExplosion.rb:20:1463:20:1472 | ... > ... | UseUseExplosion.rb:20:1462:20:1473 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1463:20:1472 | ... > ... | UseUseExplosion.rb:20:1462:20:1473 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1463:20:1472 | ... > ... | UseUseExplosion.rb:20:1462:20:1473 | ( ... ) |
 | UseUseExplosion.rb:20:1475:20:2580 | then ... | UseUseExplosion.rb:20:1459:20:2596 | if ... |
 | UseUseExplosion.rb:20:1480:20:2580 | if ... | UseUseExplosion.rb:20:1475:20:2580 | then ... |
 | UseUseExplosion.rb:20:1484:20:1488 | [post] self | UseUseExplosion.rb:20:1505:20:1509 | self |
 | UseUseExplosion.rb:20:1484:20:1488 | [post] self | UseUseExplosion.rb:20:2571:20:2576 | self |
 | UseUseExplosion.rb:20:1484:20:1488 | self | UseUseExplosion.rb:20:1505:20:1509 | self |
 | UseUseExplosion.rb:20:1484:20:1488 | self | UseUseExplosion.rb:20:2571:20:2576 | self |
-| UseUseExplosion.rb:20:1484:20:1493 | ... > ... | UseUseExplosion.rb:20:1483:20:1494 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1484:20:1493 | ... > ... | UseUseExplosion.rb:20:1483:20:1494 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1484:20:1493 | ... > ... | UseUseExplosion.rb:20:1483:20:1494 | ( ... ) |
 | UseUseExplosion.rb:20:1496:20:2564 | then ... | UseUseExplosion.rb:20:1480:20:2580 | if ... |
 | UseUseExplosion.rb:20:1501:20:2564 | if ... | UseUseExplosion.rb:20:1496:20:2564 | then ... |
 | UseUseExplosion.rb:20:1505:20:1509 | [post] self | UseUseExplosion.rb:20:1526:20:1530 | self |
 | UseUseExplosion.rb:20:1505:20:1509 | [post] self | UseUseExplosion.rb:20:2555:20:2560 | self |
 | UseUseExplosion.rb:20:1505:20:1509 | self | UseUseExplosion.rb:20:1526:20:1530 | self |
 | UseUseExplosion.rb:20:1505:20:1509 | self | UseUseExplosion.rb:20:2555:20:2560 | self |
-| UseUseExplosion.rb:20:1505:20:1514 | ... > ... | UseUseExplosion.rb:20:1504:20:1515 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1505:20:1514 | ... > ... | UseUseExplosion.rb:20:1504:20:1515 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1505:20:1514 | ... > ... | UseUseExplosion.rb:20:1504:20:1515 | ( ... ) |
 | UseUseExplosion.rb:20:1517:20:2548 | then ... | UseUseExplosion.rb:20:1501:20:2564 | if ... |
 | UseUseExplosion.rb:20:1522:20:2548 | if ... | UseUseExplosion.rb:20:1517:20:2548 | then ... |
 | UseUseExplosion.rb:20:1526:20:1530 | [post] self | UseUseExplosion.rb:20:1547:20:1551 | self |
 | UseUseExplosion.rb:20:1526:20:1530 | [post] self | UseUseExplosion.rb:20:2539:20:2544 | self |
 | UseUseExplosion.rb:20:1526:20:1530 | self | UseUseExplosion.rb:20:1547:20:1551 | self |
 | UseUseExplosion.rb:20:1526:20:1530 | self | UseUseExplosion.rb:20:2539:20:2544 | self |
-| UseUseExplosion.rb:20:1526:20:1535 | ... > ... | UseUseExplosion.rb:20:1525:20:1536 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1526:20:1535 | ... > ... | UseUseExplosion.rb:20:1525:20:1536 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1526:20:1535 | ... > ... | UseUseExplosion.rb:20:1525:20:1536 | ( ... ) |
 | UseUseExplosion.rb:20:1538:20:2532 | then ... | UseUseExplosion.rb:20:1522:20:2548 | if ... |
 | UseUseExplosion.rb:20:1543:20:2532 | if ... | UseUseExplosion.rb:20:1538:20:2532 | then ... |
 | UseUseExplosion.rb:20:1547:20:1551 | [post] self | UseUseExplosion.rb:20:1568:20:1572 | self |
 | UseUseExplosion.rb:20:1547:20:1551 | [post] self | UseUseExplosion.rb:20:2523:20:2528 | self |
 | UseUseExplosion.rb:20:1547:20:1551 | self | UseUseExplosion.rb:20:1568:20:1572 | self |
 | UseUseExplosion.rb:20:1547:20:1551 | self | UseUseExplosion.rb:20:2523:20:2528 | self |
-| UseUseExplosion.rb:20:1547:20:1556 | ... > ... | UseUseExplosion.rb:20:1546:20:1557 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1547:20:1556 | ... > ... | UseUseExplosion.rb:20:1546:20:1557 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1547:20:1556 | ... > ... | UseUseExplosion.rb:20:1546:20:1557 | ( ... ) |
 | UseUseExplosion.rb:20:1559:20:2516 | then ... | UseUseExplosion.rb:20:1543:20:2532 | if ... |
 | UseUseExplosion.rb:20:1564:20:2516 | if ... | UseUseExplosion.rb:20:1559:20:2516 | then ... |
 | UseUseExplosion.rb:20:1568:20:1572 | [post] self | UseUseExplosion.rb:20:1589:20:1593 | self |
 | UseUseExplosion.rb:20:1568:20:1572 | [post] self | UseUseExplosion.rb:20:2507:20:2512 | self |
 | UseUseExplosion.rb:20:1568:20:1572 | self | UseUseExplosion.rb:20:1589:20:1593 | self |
 | UseUseExplosion.rb:20:1568:20:1572 | self | UseUseExplosion.rb:20:2507:20:2512 | self |
-| UseUseExplosion.rb:20:1568:20:1577 | ... > ... | UseUseExplosion.rb:20:1567:20:1578 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1568:20:1577 | ... > ... | UseUseExplosion.rb:20:1567:20:1578 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1568:20:1577 | ... > ... | UseUseExplosion.rb:20:1567:20:1578 | ( ... ) |
 | UseUseExplosion.rb:20:1580:20:2500 | then ... | UseUseExplosion.rb:20:1564:20:2516 | if ... |
 | UseUseExplosion.rb:20:1585:20:2500 | if ... | UseUseExplosion.rb:20:1580:20:2500 | then ... |
 | UseUseExplosion.rb:20:1589:20:1593 | [post] self | UseUseExplosion.rb:20:1610:20:1614 | self |
 | UseUseExplosion.rb:20:1589:20:1593 | [post] self | UseUseExplosion.rb:20:2491:20:2496 | self |
 | UseUseExplosion.rb:20:1589:20:1593 | self | UseUseExplosion.rb:20:1610:20:1614 | self |
 | UseUseExplosion.rb:20:1589:20:1593 | self | UseUseExplosion.rb:20:2491:20:2496 | self |
-| UseUseExplosion.rb:20:1589:20:1598 | ... > ... | UseUseExplosion.rb:20:1588:20:1599 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1589:20:1598 | ... > ... | UseUseExplosion.rb:20:1588:20:1599 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1589:20:1598 | ... > ... | UseUseExplosion.rb:20:1588:20:1599 | ( ... ) |
 | UseUseExplosion.rb:20:1601:20:2484 | then ... | UseUseExplosion.rb:20:1585:20:2500 | if ... |
 | UseUseExplosion.rb:20:1606:20:2484 | if ... | UseUseExplosion.rb:20:1601:20:2484 | then ... |
 | UseUseExplosion.rb:20:1610:20:1614 | [post] self | UseUseExplosion.rb:20:1631:20:1635 | self |
 | UseUseExplosion.rb:20:1610:20:1614 | [post] self | UseUseExplosion.rb:20:2475:20:2480 | self |
 | UseUseExplosion.rb:20:1610:20:1614 | self | UseUseExplosion.rb:20:1631:20:1635 | self |
 | UseUseExplosion.rb:20:1610:20:1614 | self | UseUseExplosion.rb:20:2475:20:2480 | self |
-| UseUseExplosion.rb:20:1610:20:1619 | ... > ... | UseUseExplosion.rb:20:1609:20:1620 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1610:20:1619 | ... > ... | UseUseExplosion.rb:20:1609:20:1620 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1610:20:1619 | ... > ... | UseUseExplosion.rb:20:1609:20:1620 | ( ... ) |
 | UseUseExplosion.rb:20:1622:20:2468 | then ... | UseUseExplosion.rb:20:1606:20:2484 | if ... |
 | UseUseExplosion.rb:20:1627:20:2468 | if ... | UseUseExplosion.rb:20:1622:20:2468 | then ... |
 | UseUseExplosion.rb:20:1631:20:1635 | [post] self | UseUseExplosion.rb:20:1652:20:1656 | self |
 | UseUseExplosion.rb:20:1631:20:1635 | [post] self | UseUseExplosion.rb:20:2459:20:2464 | self |
 | UseUseExplosion.rb:20:1631:20:1635 | self | UseUseExplosion.rb:20:1652:20:1656 | self |
 | UseUseExplosion.rb:20:1631:20:1635 | self | UseUseExplosion.rb:20:2459:20:2464 | self |
-| UseUseExplosion.rb:20:1631:20:1640 | ... > ... | UseUseExplosion.rb:20:1630:20:1641 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1631:20:1640 | ... > ... | UseUseExplosion.rb:20:1630:20:1641 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1631:20:1640 | ... > ... | UseUseExplosion.rb:20:1630:20:1641 | ( ... ) |
 | UseUseExplosion.rb:20:1643:20:2452 | then ... | UseUseExplosion.rb:20:1627:20:2468 | if ... |
 | UseUseExplosion.rb:20:1648:20:2452 | if ... | UseUseExplosion.rb:20:1643:20:2452 | then ... |
 | UseUseExplosion.rb:20:1652:20:1656 | [post] self | UseUseExplosion.rb:20:1673:20:1677 | self |
 | UseUseExplosion.rb:20:1652:20:1656 | [post] self | UseUseExplosion.rb:20:2443:20:2448 | self |
 | UseUseExplosion.rb:20:1652:20:1656 | self | UseUseExplosion.rb:20:1673:20:1677 | self |
 | UseUseExplosion.rb:20:1652:20:1656 | self | UseUseExplosion.rb:20:2443:20:2448 | self |
-| UseUseExplosion.rb:20:1652:20:1661 | ... > ... | UseUseExplosion.rb:20:1651:20:1662 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1652:20:1661 | ... > ... | UseUseExplosion.rb:20:1651:20:1662 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1652:20:1661 | ... > ... | UseUseExplosion.rb:20:1651:20:1662 | ( ... ) |
 | UseUseExplosion.rb:20:1664:20:2436 | then ... | UseUseExplosion.rb:20:1648:20:2452 | if ... |
 | UseUseExplosion.rb:20:1669:20:2436 | if ... | UseUseExplosion.rb:20:1664:20:2436 | then ... |
 | UseUseExplosion.rb:20:1673:20:1677 | [post] self | UseUseExplosion.rb:20:1694:20:1698 | self |
 | UseUseExplosion.rb:20:1673:20:1677 | [post] self | UseUseExplosion.rb:20:2427:20:2432 | self |
 | UseUseExplosion.rb:20:1673:20:1677 | self | UseUseExplosion.rb:20:1694:20:1698 | self |
 | UseUseExplosion.rb:20:1673:20:1677 | self | UseUseExplosion.rb:20:2427:20:2432 | self |
-| UseUseExplosion.rb:20:1673:20:1682 | ... > ... | UseUseExplosion.rb:20:1672:20:1683 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1673:20:1682 | ... > ... | UseUseExplosion.rb:20:1672:20:1683 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1673:20:1682 | ... > ... | UseUseExplosion.rb:20:1672:20:1683 | ( ... ) |
 | UseUseExplosion.rb:20:1685:20:2420 | then ... | UseUseExplosion.rb:20:1669:20:2436 | if ... |
 | UseUseExplosion.rb:20:1690:20:2420 | if ... | UseUseExplosion.rb:20:1685:20:2420 | then ... |
 | UseUseExplosion.rb:20:1694:20:1698 | [post] self | UseUseExplosion.rb:20:1715:20:1719 | self |
 | UseUseExplosion.rb:20:1694:20:1698 | [post] self | UseUseExplosion.rb:20:2411:20:2416 | self |
 | UseUseExplosion.rb:20:1694:20:1698 | self | UseUseExplosion.rb:20:1715:20:1719 | self |
 | UseUseExplosion.rb:20:1694:20:1698 | self | UseUseExplosion.rb:20:2411:20:2416 | self |
-| UseUseExplosion.rb:20:1694:20:1703 | ... > ... | UseUseExplosion.rb:20:1693:20:1704 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1694:20:1703 | ... > ... | UseUseExplosion.rb:20:1693:20:1704 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1694:20:1703 | ... > ... | UseUseExplosion.rb:20:1693:20:1704 | ( ... ) |
 | UseUseExplosion.rb:20:1706:20:2404 | then ... | UseUseExplosion.rb:20:1690:20:2420 | if ... |
 | UseUseExplosion.rb:20:1711:20:2404 | if ... | UseUseExplosion.rb:20:1706:20:2404 | then ... |
 | UseUseExplosion.rb:20:1715:20:1719 | [post] self | UseUseExplosion.rb:20:1736:20:1740 | self |
 | UseUseExplosion.rb:20:1715:20:1719 | [post] self | UseUseExplosion.rb:20:2395:20:2400 | self |
 | UseUseExplosion.rb:20:1715:20:1719 | self | UseUseExplosion.rb:20:1736:20:1740 | self |
 | UseUseExplosion.rb:20:1715:20:1719 | self | UseUseExplosion.rb:20:2395:20:2400 | self |
-| UseUseExplosion.rb:20:1715:20:1724 | ... > ... | UseUseExplosion.rb:20:1714:20:1725 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1715:20:1724 | ... > ... | UseUseExplosion.rb:20:1714:20:1725 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1715:20:1724 | ... > ... | UseUseExplosion.rb:20:1714:20:1725 | ( ... ) |
 | UseUseExplosion.rb:20:1727:20:2388 | then ... | UseUseExplosion.rb:20:1711:20:2404 | if ... |
 | UseUseExplosion.rb:20:1732:20:2388 | if ... | UseUseExplosion.rb:20:1727:20:2388 | then ... |
 | UseUseExplosion.rb:20:1736:20:1740 | [post] self | UseUseExplosion.rb:20:1757:20:1761 | self |
 | UseUseExplosion.rb:20:1736:20:1740 | [post] self | UseUseExplosion.rb:20:2379:20:2384 | self |
 | UseUseExplosion.rb:20:1736:20:1740 | self | UseUseExplosion.rb:20:1757:20:1761 | self |
 | UseUseExplosion.rb:20:1736:20:1740 | self | UseUseExplosion.rb:20:2379:20:2384 | self |
-| UseUseExplosion.rb:20:1736:20:1745 | ... > ... | UseUseExplosion.rb:20:1735:20:1746 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1736:20:1745 | ... > ... | UseUseExplosion.rb:20:1735:20:1746 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1736:20:1745 | ... > ... | UseUseExplosion.rb:20:1735:20:1746 | ( ... ) |
 | UseUseExplosion.rb:20:1748:20:2372 | then ... | UseUseExplosion.rb:20:1732:20:2388 | if ... |
 | UseUseExplosion.rb:20:1753:20:2372 | if ... | UseUseExplosion.rb:20:1748:20:2372 | then ... |
 | UseUseExplosion.rb:20:1757:20:1761 | [post] self | UseUseExplosion.rb:20:1778:20:1782 | self |
 | UseUseExplosion.rb:20:1757:20:1761 | [post] self | UseUseExplosion.rb:20:2363:20:2368 | self |
 | UseUseExplosion.rb:20:1757:20:1761 | self | UseUseExplosion.rb:20:1778:20:1782 | self |
 | UseUseExplosion.rb:20:1757:20:1761 | self | UseUseExplosion.rb:20:2363:20:2368 | self |
-| UseUseExplosion.rb:20:1757:20:1766 | ... > ... | UseUseExplosion.rb:20:1756:20:1767 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1757:20:1766 | ... > ... | UseUseExplosion.rb:20:1756:20:1767 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1757:20:1766 | ... > ... | UseUseExplosion.rb:20:1756:20:1767 | ( ... ) |
 | UseUseExplosion.rb:20:1769:20:2356 | then ... | UseUseExplosion.rb:20:1753:20:2372 | if ... |
 | UseUseExplosion.rb:20:1774:20:2356 | if ... | UseUseExplosion.rb:20:1769:20:2356 | then ... |
 | UseUseExplosion.rb:20:1778:20:1782 | [post] self | UseUseExplosion.rb:20:1799:20:1803 | self |
 | UseUseExplosion.rb:20:1778:20:1782 | [post] self | UseUseExplosion.rb:20:2347:20:2352 | self |
 | UseUseExplosion.rb:20:1778:20:1782 | self | UseUseExplosion.rb:20:1799:20:1803 | self |
 | UseUseExplosion.rb:20:1778:20:1782 | self | UseUseExplosion.rb:20:2347:20:2352 | self |
-| UseUseExplosion.rb:20:1778:20:1787 | ... > ... | UseUseExplosion.rb:20:1777:20:1788 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1778:20:1787 | ... > ... | UseUseExplosion.rb:20:1777:20:1788 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1778:20:1787 | ... > ... | UseUseExplosion.rb:20:1777:20:1788 | ( ... ) |
 | UseUseExplosion.rb:20:1790:20:2340 | then ... | UseUseExplosion.rb:20:1774:20:2356 | if ... |
 | UseUseExplosion.rb:20:1795:20:2340 | if ... | UseUseExplosion.rb:20:1790:20:2340 | then ... |
 | UseUseExplosion.rb:20:1799:20:1803 | [post] self | UseUseExplosion.rb:20:1820:20:1824 | self |
 | UseUseExplosion.rb:20:1799:20:1803 | [post] self | UseUseExplosion.rb:20:2331:20:2336 | self |
 | UseUseExplosion.rb:20:1799:20:1803 | self | UseUseExplosion.rb:20:1820:20:1824 | self |
 | UseUseExplosion.rb:20:1799:20:1803 | self | UseUseExplosion.rb:20:2331:20:2336 | self |
-| UseUseExplosion.rb:20:1799:20:1808 | ... > ... | UseUseExplosion.rb:20:1798:20:1809 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1799:20:1808 | ... > ... | UseUseExplosion.rb:20:1798:20:1809 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1799:20:1808 | ... > ... | UseUseExplosion.rb:20:1798:20:1809 | ( ... ) |
 | UseUseExplosion.rb:20:1811:20:2324 | then ... | UseUseExplosion.rb:20:1795:20:2340 | if ... |
 | UseUseExplosion.rb:20:1816:20:2324 | if ... | UseUseExplosion.rb:20:1811:20:2324 | then ... |
 | UseUseExplosion.rb:20:1820:20:1824 | [post] self | UseUseExplosion.rb:20:1841:20:1845 | self |
 | UseUseExplosion.rb:20:1820:20:1824 | [post] self | UseUseExplosion.rb:20:2315:20:2320 | self |
 | UseUseExplosion.rb:20:1820:20:1824 | self | UseUseExplosion.rb:20:1841:20:1845 | self |
 | UseUseExplosion.rb:20:1820:20:1824 | self | UseUseExplosion.rb:20:2315:20:2320 | self |
-| UseUseExplosion.rb:20:1820:20:1829 | ... > ... | UseUseExplosion.rb:20:1819:20:1830 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1820:20:1829 | ... > ... | UseUseExplosion.rb:20:1819:20:1830 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1820:20:1829 | ... > ... | UseUseExplosion.rb:20:1819:20:1830 | ( ... ) |
 | UseUseExplosion.rb:20:1832:20:2308 | then ... | UseUseExplosion.rb:20:1816:20:2324 | if ... |
 | UseUseExplosion.rb:20:1837:20:2308 | if ... | UseUseExplosion.rb:20:1832:20:2308 | then ... |
 | UseUseExplosion.rb:20:1841:20:1845 | [post] self | UseUseExplosion.rb:20:1862:20:1866 | self |
 | UseUseExplosion.rb:20:1841:20:1845 | [post] self | UseUseExplosion.rb:20:2299:20:2304 | self |
 | UseUseExplosion.rb:20:1841:20:1845 | self | UseUseExplosion.rb:20:1862:20:1866 | self |
 | UseUseExplosion.rb:20:1841:20:1845 | self | UseUseExplosion.rb:20:2299:20:2304 | self |
-| UseUseExplosion.rb:20:1841:20:1850 | ... > ... | UseUseExplosion.rb:20:1840:20:1851 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1841:20:1850 | ... > ... | UseUseExplosion.rb:20:1840:20:1851 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1841:20:1850 | ... > ... | UseUseExplosion.rb:20:1840:20:1851 | ( ... ) |
 | UseUseExplosion.rb:20:1853:20:2292 | then ... | UseUseExplosion.rb:20:1837:20:2308 | if ... |
 | UseUseExplosion.rb:20:1858:20:2292 | if ... | UseUseExplosion.rb:20:1853:20:2292 | then ... |
 | UseUseExplosion.rb:20:1862:20:1866 | [post] self | UseUseExplosion.rb:20:1883:20:1887 | self |
 | UseUseExplosion.rb:20:1862:20:1866 | [post] self | UseUseExplosion.rb:20:2283:20:2288 | self |
 | UseUseExplosion.rb:20:1862:20:1866 | self | UseUseExplosion.rb:20:1883:20:1887 | self |
 | UseUseExplosion.rb:20:1862:20:1866 | self | UseUseExplosion.rb:20:2283:20:2288 | self |
-| UseUseExplosion.rb:20:1862:20:1871 | ... > ... | UseUseExplosion.rb:20:1861:20:1872 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1862:20:1871 | ... > ... | UseUseExplosion.rb:20:1861:20:1872 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1862:20:1871 | ... > ... | UseUseExplosion.rb:20:1861:20:1872 | ( ... ) |
 | UseUseExplosion.rb:20:1874:20:2276 | then ... | UseUseExplosion.rb:20:1858:20:2292 | if ... |
 | UseUseExplosion.rb:20:1879:20:2276 | if ... | UseUseExplosion.rb:20:1874:20:2276 | then ... |
 | UseUseExplosion.rb:20:1883:20:1887 | [post] self | UseUseExplosion.rb:20:1904:20:1908 | self |
 | UseUseExplosion.rb:20:1883:20:1887 | [post] self | UseUseExplosion.rb:20:2267:20:2272 | self |
 | UseUseExplosion.rb:20:1883:20:1887 | self | UseUseExplosion.rb:20:1904:20:1908 | self |
 | UseUseExplosion.rb:20:1883:20:1887 | self | UseUseExplosion.rb:20:2267:20:2272 | self |
-| UseUseExplosion.rb:20:1883:20:1892 | ... > ... | UseUseExplosion.rb:20:1882:20:1893 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1883:20:1892 | ... > ... | UseUseExplosion.rb:20:1882:20:1893 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1883:20:1892 | ... > ... | UseUseExplosion.rb:20:1882:20:1893 | ( ... ) |
 | UseUseExplosion.rb:20:1895:20:2260 | then ... | UseUseExplosion.rb:20:1879:20:2276 | if ... |
 | UseUseExplosion.rb:20:1900:20:2260 | if ... | UseUseExplosion.rb:20:1895:20:2260 | then ... |
 | UseUseExplosion.rb:20:1904:20:1908 | [post] self | UseUseExplosion.rb:20:1925:20:1929 | self |
 | UseUseExplosion.rb:20:1904:20:1908 | [post] self | UseUseExplosion.rb:20:2251:20:2256 | self |
 | UseUseExplosion.rb:20:1904:20:1908 | self | UseUseExplosion.rb:20:1925:20:1929 | self |
 | UseUseExplosion.rb:20:1904:20:1908 | self | UseUseExplosion.rb:20:2251:20:2256 | self |
-| UseUseExplosion.rb:20:1904:20:1913 | ... > ... | UseUseExplosion.rb:20:1903:20:1914 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1904:20:1913 | ... > ... | UseUseExplosion.rb:20:1903:20:1914 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1904:20:1913 | ... > ... | UseUseExplosion.rb:20:1903:20:1914 | ( ... ) |
 | UseUseExplosion.rb:20:1916:20:2244 | then ... | UseUseExplosion.rb:20:1900:20:2260 | if ... |
 | UseUseExplosion.rb:20:1921:20:2244 | if ... | UseUseExplosion.rb:20:1916:20:2244 | then ... |
 | UseUseExplosion.rb:20:1925:20:1929 | [post] self | UseUseExplosion.rb:20:1945:20:1949 | self |
 | UseUseExplosion.rb:20:1925:20:1929 | [post] self | UseUseExplosion.rb:20:2235:20:2240 | self |
 | UseUseExplosion.rb:20:1925:20:1929 | self | UseUseExplosion.rb:20:1945:20:1949 | self |
 | UseUseExplosion.rb:20:1925:20:1929 | self | UseUseExplosion.rb:20:2235:20:2240 | self |
-| UseUseExplosion.rb:20:1925:20:1933 | ... > ... | UseUseExplosion.rb:20:1924:20:1934 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1925:20:1933 | ... > ... | UseUseExplosion.rb:20:1924:20:1934 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1925:20:1933 | ... > ... | UseUseExplosion.rb:20:1924:20:1934 | ( ... ) |
 | UseUseExplosion.rb:20:1936:20:2228 | then ... | UseUseExplosion.rb:20:1921:20:2244 | if ... |
 | UseUseExplosion.rb:20:1941:20:2228 | if ... | UseUseExplosion.rb:20:1936:20:2228 | then ... |
 | UseUseExplosion.rb:20:1945:20:1949 | [post] self | UseUseExplosion.rb:20:1965:20:1969 | self |
 | UseUseExplosion.rb:20:1945:20:1949 | [post] self | UseUseExplosion.rb:20:2219:20:2224 | self |
 | UseUseExplosion.rb:20:1945:20:1949 | self | UseUseExplosion.rb:20:1965:20:1969 | self |
 | UseUseExplosion.rb:20:1945:20:1949 | self | UseUseExplosion.rb:20:2219:20:2224 | self |
-| UseUseExplosion.rb:20:1945:20:1953 | ... > ... | UseUseExplosion.rb:20:1944:20:1954 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1945:20:1953 | ... > ... | UseUseExplosion.rb:20:1944:20:1954 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1945:20:1953 | ... > ... | UseUseExplosion.rb:20:1944:20:1954 | ( ... ) |
 | UseUseExplosion.rb:20:1956:20:2212 | then ... | UseUseExplosion.rb:20:1941:20:2228 | if ... |
 | UseUseExplosion.rb:20:1961:20:2212 | if ... | UseUseExplosion.rb:20:1956:20:2212 | then ... |
 | UseUseExplosion.rb:20:1965:20:1969 | [post] self | UseUseExplosion.rb:20:1985:20:1989 | self |
 | UseUseExplosion.rb:20:1965:20:1969 | [post] self | UseUseExplosion.rb:20:2203:20:2208 | self |
 | UseUseExplosion.rb:20:1965:20:1969 | self | UseUseExplosion.rb:20:1985:20:1989 | self |
 | UseUseExplosion.rb:20:1965:20:1969 | self | UseUseExplosion.rb:20:2203:20:2208 | self |
-| UseUseExplosion.rb:20:1965:20:1973 | ... > ... | UseUseExplosion.rb:20:1964:20:1974 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1965:20:1973 | ... > ... | UseUseExplosion.rb:20:1964:20:1974 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1965:20:1973 | ... > ... | UseUseExplosion.rb:20:1964:20:1974 | ( ... ) |
 | UseUseExplosion.rb:20:1976:20:2196 | then ... | UseUseExplosion.rb:20:1961:20:2212 | if ... |
 | UseUseExplosion.rb:20:1981:20:2196 | if ... | UseUseExplosion.rb:20:1976:20:2196 | then ... |
 | UseUseExplosion.rb:20:1985:20:1989 | [post] self | UseUseExplosion.rb:20:2005:20:2009 | self |
 | UseUseExplosion.rb:20:1985:20:1989 | [post] self | UseUseExplosion.rb:20:2187:20:2192 | self |
 | UseUseExplosion.rb:20:1985:20:1989 | self | UseUseExplosion.rb:20:2005:20:2009 | self |
 | UseUseExplosion.rb:20:1985:20:1989 | self | UseUseExplosion.rb:20:2187:20:2192 | self |
-| UseUseExplosion.rb:20:1985:20:1993 | ... > ... | UseUseExplosion.rb:20:1984:20:1994 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1985:20:1993 | ... > ... | UseUseExplosion.rb:20:1984:20:1994 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1985:20:1993 | ... > ... | UseUseExplosion.rb:20:1984:20:1994 | ( ... ) |
 | UseUseExplosion.rb:20:1996:20:2180 | then ... | UseUseExplosion.rb:20:1981:20:2196 | if ... |
 | UseUseExplosion.rb:20:2001:20:2180 | if ... | UseUseExplosion.rb:20:1996:20:2180 | then ... |
 | UseUseExplosion.rb:20:2005:20:2009 | [post] self | UseUseExplosion.rb:20:2025:20:2029 | self |
 | UseUseExplosion.rb:20:2005:20:2009 | [post] self | UseUseExplosion.rb:20:2171:20:2176 | self |
 | UseUseExplosion.rb:20:2005:20:2009 | self | UseUseExplosion.rb:20:2025:20:2029 | self |
 | UseUseExplosion.rb:20:2005:20:2009 | self | UseUseExplosion.rb:20:2171:20:2176 | self |
-| UseUseExplosion.rb:20:2005:20:2013 | ... > ... | UseUseExplosion.rb:20:2004:20:2014 | [false] ( ... ) |
-| UseUseExplosion.rb:20:2005:20:2013 | ... > ... | UseUseExplosion.rb:20:2004:20:2014 | [true] ( ... ) |
+| UseUseExplosion.rb:20:2005:20:2013 | ... > ... | UseUseExplosion.rb:20:2004:20:2014 | ( ... ) |
 | UseUseExplosion.rb:20:2016:20:2164 | then ... | UseUseExplosion.rb:20:2001:20:2180 | if ... |
 | UseUseExplosion.rb:20:2021:20:2164 | if ... | UseUseExplosion.rb:20:2016:20:2164 | then ... |
 | UseUseExplosion.rb:20:2025:20:2029 | [post] self | UseUseExplosion.rb:20:2045:20:2049 | self |
 | UseUseExplosion.rb:20:2025:20:2029 | [post] self | UseUseExplosion.rb:20:2155:20:2160 | self |
 | UseUseExplosion.rb:20:2025:20:2029 | self | UseUseExplosion.rb:20:2045:20:2049 | self |
 | UseUseExplosion.rb:20:2025:20:2029 | self | UseUseExplosion.rb:20:2155:20:2160 | self |
-| UseUseExplosion.rb:20:2025:20:2033 | ... > ... | UseUseExplosion.rb:20:2024:20:2034 | [false] ( ... ) |
-| UseUseExplosion.rb:20:2025:20:2033 | ... > ... | UseUseExplosion.rb:20:2024:20:2034 | [true] ( ... ) |
+| UseUseExplosion.rb:20:2025:20:2033 | ... > ... | UseUseExplosion.rb:20:2024:20:2034 | ( ... ) |
 | UseUseExplosion.rb:20:2036:20:2148 | then ... | UseUseExplosion.rb:20:2021:20:2164 | if ... |
 | UseUseExplosion.rb:20:2041:20:2148 | if ... | UseUseExplosion.rb:20:2036:20:2148 | then ... |
 | UseUseExplosion.rb:20:2045:20:2049 | [post] self | UseUseExplosion.rb:20:2065:20:2069 | self |
 | UseUseExplosion.rb:20:2045:20:2049 | [post] self | UseUseExplosion.rb:20:2139:20:2144 | self |
 | UseUseExplosion.rb:20:2045:20:2049 | self | UseUseExplosion.rb:20:2065:20:2069 | self |
 | UseUseExplosion.rb:20:2045:20:2049 | self | UseUseExplosion.rb:20:2139:20:2144 | self |
-| UseUseExplosion.rb:20:2045:20:2053 | ... > ... | UseUseExplosion.rb:20:2044:20:2054 | [false] ( ... ) |
-| UseUseExplosion.rb:20:2045:20:2053 | ... > ... | UseUseExplosion.rb:20:2044:20:2054 | [true] ( ... ) |
+| UseUseExplosion.rb:20:2045:20:2053 | ... > ... | UseUseExplosion.rb:20:2044:20:2054 | ( ... ) |
 | UseUseExplosion.rb:20:2056:20:2132 | then ... | UseUseExplosion.rb:20:2041:20:2148 | if ... |
 | UseUseExplosion.rb:20:2061:20:2132 | if ... | UseUseExplosion.rb:20:2056:20:2132 | then ... |
 | UseUseExplosion.rb:20:2065:20:2069 | [post] self | UseUseExplosion.rb:20:2085:20:2089 | self |
 | UseUseExplosion.rb:20:2065:20:2069 | [post] self | UseUseExplosion.rb:20:2123:20:2128 | self |
 | UseUseExplosion.rb:20:2065:20:2069 | self | UseUseExplosion.rb:20:2085:20:2089 | self |
 | UseUseExplosion.rb:20:2065:20:2069 | self | UseUseExplosion.rb:20:2123:20:2128 | self |
-| UseUseExplosion.rb:20:2065:20:2073 | ... > ... | UseUseExplosion.rb:20:2064:20:2074 | [false] ( ... ) |
-| UseUseExplosion.rb:20:2065:20:2073 | ... > ... | UseUseExplosion.rb:20:2064:20:2074 | [true] ( ... ) |
+| UseUseExplosion.rb:20:2065:20:2073 | ... > ... | UseUseExplosion.rb:20:2064:20:2074 | ( ... ) |
 | UseUseExplosion.rb:20:2076:20:2116 | then ... | UseUseExplosion.rb:20:2061:20:2132 | if ... |
 | UseUseExplosion.rb:20:2081:20:2116 | if ... | UseUseExplosion.rb:20:2076:20:2116 | then ... |
 | UseUseExplosion.rb:20:2085:20:2089 | [post] self | UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(self) |
 | UseUseExplosion.rb:20:2085:20:2089 | [post] self | UseUseExplosion.rb:20:2107:20:2112 | self |
 | UseUseExplosion.rb:20:2085:20:2089 | self | UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(self) |
 | UseUseExplosion.rb:20:2085:20:2089 | self | UseUseExplosion.rb:20:2107:20:2112 | self |
-| UseUseExplosion.rb:20:2085:20:2093 | ... > ... | UseUseExplosion.rb:20:2084:20:2094 | [false] ( ... ) |
-| UseUseExplosion.rb:20:2085:20:2093 | ... > ... | UseUseExplosion.rb:20:2084:20:2094 | [true] ( ... ) |
+| UseUseExplosion.rb:20:2085:20:2093 | ... > ... | UseUseExplosion.rb:20:2084:20:2094 | ( ... ) |
 | UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(self) | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(x) | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2096:20:2099 | then ... | UseUseExplosion.rb:20:2081:20:2116 | if ... |
@@ -1504,802 +1404,703 @@
 | UseUseExplosion.rb:20:3691:20:3696 | call to use | UseUseExplosion.rb:20:3686:20:3696 | else ... |
 | UseUseExplosion.rb:20:3691:20:3696 | self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3695:20:3695 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
+| UseUseExplosion.rb:21:9:21:3700 | if ... | UseUseExplosion.rb:19:9:21:3700 | ... |
 | UseUseExplosion.rb:21:13:21:17 | [post] self | UseUseExplosion.rb:21:35:21:39 | self |
 | UseUseExplosion.rb:21:13:21:17 | [post] self | UseUseExplosion.rb:21:3691:21:3696 | self |
 | UseUseExplosion.rb:21:13:21:17 | self | UseUseExplosion.rb:21:35:21:39 | self |
 | UseUseExplosion.rb:21:13:21:17 | self | UseUseExplosion.rb:21:3691:21:3696 | self |
-| UseUseExplosion.rb:21:13:21:23 | ... > ... | UseUseExplosion.rb:21:12:21:24 | [false] ( ... ) |
-| UseUseExplosion.rb:21:13:21:23 | ... > ... | UseUseExplosion.rb:21:12:21:24 | [true] ( ... ) |
+| UseUseExplosion.rb:21:13:21:23 | ... > ... | UseUseExplosion.rb:21:12:21:24 | ( ... ) |
 | UseUseExplosion.rb:21:26:21:3684 | then ... | UseUseExplosion.rb:21:9:21:3700 | if ... |
 | UseUseExplosion.rb:21:31:21:3684 | if ... | UseUseExplosion.rb:21:26:21:3684 | then ... |
 | UseUseExplosion.rb:21:35:21:39 | [post] self | UseUseExplosion.rb:21:56:21:60 | self |
 | UseUseExplosion.rb:21:35:21:39 | [post] self | UseUseExplosion.rb:21:3675:21:3680 | self |
 | UseUseExplosion.rb:21:35:21:39 | self | UseUseExplosion.rb:21:56:21:60 | self |
 | UseUseExplosion.rb:21:35:21:39 | self | UseUseExplosion.rb:21:3675:21:3680 | self |
-| UseUseExplosion.rb:21:35:21:44 | ... > ... | UseUseExplosion.rb:21:34:21:45 | [false] ( ... ) |
-| UseUseExplosion.rb:21:35:21:44 | ... > ... | UseUseExplosion.rb:21:34:21:45 | [true] ( ... ) |
+| UseUseExplosion.rb:21:35:21:44 | ... > ... | UseUseExplosion.rb:21:34:21:45 | ( ... ) |
 | UseUseExplosion.rb:21:47:21:3668 | then ... | UseUseExplosion.rb:21:31:21:3684 | if ... |
 | UseUseExplosion.rb:21:52:21:3668 | if ... | UseUseExplosion.rb:21:47:21:3668 | then ... |
 | UseUseExplosion.rb:21:56:21:60 | [post] self | UseUseExplosion.rb:21:77:21:81 | self |
 | UseUseExplosion.rb:21:56:21:60 | [post] self | UseUseExplosion.rb:21:3659:21:3664 | self |
 | UseUseExplosion.rb:21:56:21:60 | self | UseUseExplosion.rb:21:77:21:81 | self |
 | UseUseExplosion.rb:21:56:21:60 | self | UseUseExplosion.rb:21:3659:21:3664 | self |
-| UseUseExplosion.rb:21:56:21:65 | ... > ... | UseUseExplosion.rb:21:55:21:66 | [false] ( ... ) |
-| UseUseExplosion.rb:21:56:21:65 | ... > ... | UseUseExplosion.rb:21:55:21:66 | [true] ( ... ) |
+| UseUseExplosion.rb:21:56:21:65 | ... > ... | UseUseExplosion.rb:21:55:21:66 | ( ... ) |
 | UseUseExplosion.rb:21:68:21:3652 | then ... | UseUseExplosion.rb:21:52:21:3668 | if ... |
 | UseUseExplosion.rb:21:73:21:3652 | if ... | UseUseExplosion.rb:21:68:21:3652 | then ... |
 | UseUseExplosion.rb:21:77:21:81 | [post] self | UseUseExplosion.rb:21:98:21:102 | self |
 | UseUseExplosion.rb:21:77:21:81 | [post] self | UseUseExplosion.rb:21:3643:21:3648 | self |
 | UseUseExplosion.rb:21:77:21:81 | self | UseUseExplosion.rb:21:98:21:102 | self |
 | UseUseExplosion.rb:21:77:21:81 | self | UseUseExplosion.rb:21:3643:21:3648 | self |
-| UseUseExplosion.rb:21:77:21:86 | ... > ... | UseUseExplosion.rb:21:76:21:87 | [false] ( ... ) |
-| UseUseExplosion.rb:21:77:21:86 | ... > ... | UseUseExplosion.rb:21:76:21:87 | [true] ( ... ) |
+| UseUseExplosion.rb:21:77:21:86 | ... > ... | UseUseExplosion.rb:21:76:21:87 | ( ... ) |
 | UseUseExplosion.rb:21:89:21:3636 | then ... | UseUseExplosion.rb:21:73:21:3652 | if ... |
 | UseUseExplosion.rb:21:94:21:3636 | if ... | UseUseExplosion.rb:21:89:21:3636 | then ... |
 | UseUseExplosion.rb:21:98:21:102 | [post] self | UseUseExplosion.rb:21:119:21:123 | self |
 | UseUseExplosion.rb:21:98:21:102 | [post] self | UseUseExplosion.rb:21:3627:21:3632 | self |
 | UseUseExplosion.rb:21:98:21:102 | self | UseUseExplosion.rb:21:119:21:123 | self |
 | UseUseExplosion.rb:21:98:21:102 | self | UseUseExplosion.rb:21:3627:21:3632 | self |
-| UseUseExplosion.rb:21:98:21:107 | ... > ... | UseUseExplosion.rb:21:97:21:108 | [false] ( ... ) |
-| UseUseExplosion.rb:21:98:21:107 | ... > ... | UseUseExplosion.rb:21:97:21:108 | [true] ( ... ) |
+| UseUseExplosion.rb:21:98:21:107 | ... > ... | UseUseExplosion.rb:21:97:21:108 | ( ... ) |
 | UseUseExplosion.rb:21:110:21:3620 | then ... | UseUseExplosion.rb:21:94:21:3636 | if ... |
 | UseUseExplosion.rb:21:115:21:3620 | if ... | UseUseExplosion.rb:21:110:21:3620 | then ... |
 | UseUseExplosion.rb:21:119:21:123 | [post] self | UseUseExplosion.rb:21:140:21:144 | self |
 | UseUseExplosion.rb:21:119:21:123 | [post] self | UseUseExplosion.rb:21:3611:21:3616 | self |
 | UseUseExplosion.rb:21:119:21:123 | self | UseUseExplosion.rb:21:140:21:144 | self |
 | UseUseExplosion.rb:21:119:21:123 | self | UseUseExplosion.rb:21:3611:21:3616 | self |
-| UseUseExplosion.rb:21:119:21:128 | ... > ... | UseUseExplosion.rb:21:118:21:129 | [false] ( ... ) |
-| UseUseExplosion.rb:21:119:21:128 | ... > ... | UseUseExplosion.rb:21:118:21:129 | [true] ( ... ) |
+| UseUseExplosion.rb:21:119:21:128 | ... > ... | UseUseExplosion.rb:21:118:21:129 | ( ... ) |
 | UseUseExplosion.rb:21:131:21:3604 | then ... | UseUseExplosion.rb:21:115:21:3620 | if ... |
 | UseUseExplosion.rb:21:136:21:3604 | if ... | UseUseExplosion.rb:21:131:21:3604 | then ... |
 | UseUseExplosion.rb:21:140:21:144 | [post] self | UseUseExplosion.rb:21:161:21:165 | self |
 | UseUseExplosion.rb:21:140:21:144 | [post] self | UseUseExplosion.rb:21:3595:21:3600 | self |
 | UseUseExplosion.rb:21:140:21:144 | self | UseUseExplosion.rb:21:161:21:165 | self |
 | UseUseExplosion.rb:21:140:21:144 | self | UseUseExplosion.rb:21:3595:21:3600 | self |
-| UseUseExplosion.rb:21:140:21:149 | ... > ... | UseUseExplosion.rb:21:139:21:150 | [false] ( ... ) |
-| UseUseExplosion.rb:21:140:21:149 | ... > ... | UseUseExplosion.rb:21:139:21:150 | [true] ( ... ) |
+| UseUseExplosion.rb:21:140:21:149 | ... > ... | UseUseExplosion.rb:21:139:21:150 | ( ... ) |
 | UseUseExplosion.rb:21:152:21:3588 | then ... | UseUseExplosion.rb:21:136:21:3604 | if ... |
 | UseUseExplosion.rb:21:157:21:3588 | if ... | UseUseExplosion.rb:21:152:21:3588 | then ... |
 | UseUseExplosion.rb:21:161:21:165 | [post] self | UseUseExplosion.rb:21:182:21:186 | self |
 | UseUseExplosion.rb:21:161:21:165 | [post] self | UseUseExplosion.rb:21:3579:21:3584 | self |
 | UseUseExplosion.rb:21:161:21:165 | self | UseUseExplosion.rb:21:182:21:186 | self |
 | UseUseExplosion.rb:21:161:21:165 | self | UseUseExplosion.rb:21:3579:21:3584 | self |
-| UseUseExplosion.rb:21:161:21:170 | ... > ... | UseUseExplosion.rb:21:160:21:171 | [false] ( ... ) |
-| UseUseExplosion.rb:21:161:21:170 | ... > ... | UseUseExplosion.rb:21:160:21:171 | [true] ( ... ) |
+| UseUseExplosion.rb:21:161:21:170 | ... > ... | UseUseExplosion.rb:21:160:21:171 | ( ... ) |
 | UseUseExplosion.rb:21:173:21:3572 | then ... | UseUseExplosion.rb:21:157:21:3588 | if ... |
 | UseUseExplosion.rb:21:178:21:3572 | if ... | UseUseExplosion.rb:21:173:21:3572 | then ... |
 | UseUseExplosion.rb:21:182:21:186 | [post] self | UseUseExplosion.rb:21:203:21:207 | self |
 | UseUseExplosion.rb:21:182:21:186 | [post] self | UseUseExplosion.rb:21:3563:21:3568 | self |
 | UseUseExplosion.rb:21:182:21:186 | self | UseUseExplosion.rb:21:203:21:207 | self |
 | UseUseExplosion.rb:21:182:21:186 | self | UseUseExplosion.rb:21:3563:21:3568 | self |
-| UseUseExplosion.rb:21:182:21:191 | ... > ... | UseUseExplosion.rb:21:181:21:192 | [false] ( ... ) |
-| UseUseExplosion.rb:21:182:21:191 | ... > ... | UseUseExplosion.rb:21:181:21:192 | [true] ( ... ) |
+| UseUseExplosion.rb:21:182:21:191 | ... > ... | UseUseExplosion.rb:21:181:21:192 | ( ... ) |
 | UseUseExplosion.rb:21:194:21:3556 | then ... | UseUseExplosion.rb:21:178:21:3572 | if ... |
 | UseUseExplosion.rb:21:199:21:3556 | if ... | UseUseExplosion.rb:21:194:21:3556 | then ... |
 | UseUseExplosion.rb:21:203:21:207 | [post] self | UseUseExplosion.rb:21:224:21:228 | self |
 | UseUseExplosion.rb:21:203:21:207 | [post] self | UseUseExplosion.rb:21:3547:21:3552 | self |
 | UseUseExplosion.rb:21:203:21:207 | self | UseUseExplosion.rb:21:224:21:228 | self |
 | UseUseExplosion.rb:21:203:21:207 | self | UseUseExplosion.rb:21:3547:21:3552 | self |
-| UseUseExplosion.rb:21:203:21:212 | ... > ... | UseUseExplosion.rb:21:202:21:213 | [false] ( ... ) |
-| UseUseExplosion.rb:21:203:21:212 | ... > ... | UseUseExplosion.rb:21:202:21:213 | [true] ( ... ) |
+| UseUseExplosion.rb:21:203:21:212 | ... > ... | UseUseExplosion.rb:21:202:21:213 | ( ... ) |
 | UseUseExplosion.rb:21:215:21:3540 | then ... | UseUseExplosion.rb:21:199:21:3556 | if ... |
 | UseUseExplosion.rb:21:220:21:3540 | if ... | UseUseExplosion.rb:21:215:21:3540 | then ... |
 | UseUseExplosion.rb:21:224:21:228 | [post] self | UseUseExplosion.rb:21:245:21:249 | self |
 | UseUseExplosion.rb:21:224:21:228 | [post] self | UseUseExplosion.rb:21:3531:21:3536 | self |
 | UseUseExplosion.rb:21:224:21:228 | self | UseUseExplosion.rb:21:245:21:249 | self |
 | UseUseExplosion.rb:21:224:21:228 | self | UseUseExplosion.rb:21:3531:21:3536 | self |
-| UseUseExplosion.rb:21:224:21:233 | ... > ... | UseUseExplosion.rb:21:223:21:234 | [false] ( ... ) |
-| UseUseExplosion.rb:21:224:21:233 | ... > ... | UseUseExplosion.rb:21:223:21:234 | [true] ( ... ) |
+| UseUseExplosion.rb:21:224:21:233 | ... > ... | UseUseExplosion.rb:21:223:21:234 | ( ... ) |
 | UseUseExplosion.rb:21:236:21:3524 | then ... | UseUseExplosion.rb:21:220:21:3540 | if ... |
 | UseUseExplosion.rb:21:241:21:3524 | if ... | UseUseExplosion.rb:21:236:21:3524 | then ... |
 | UseUseExplosion.rb:21:245:21:249 | [post] self | UseUseExplosion.rb:21:266:21:270 | self |
 | UseUseExplosion.rb:21:245:21:249 | [post] self | UseUseExplosion.rb:21:3515:21:3520 | self |
 | UseUseExplosion.rb:21:245:21:249 | self | UseUseExplosion.rb:21:266:21:270 | self |
 | UseUseExplosion.rb:21:245:21:249 | self | UseUseExplosion.rb:21:3515:21:3520 | self |
-| UseUseExplosion.rb:21:245:21:254 | ... > ... | UseUseExplosion.rb:21:244:21:255 | [false] ( ... ) |
-| UseUseExplosion.rb:21:245:21:254 | ... > ... | UseUseExplosion.rb:21:244:21:255 | [true] ( ... ) |
+| UseUseExplosion.rb:21:245:21:254 | ... > ... | UseUseExplosion.rb:21:244:21:255 | ( ... ) |
 | UseUseExplosion.rb:21:257:21:3508 | then ... | UseUseExplosion.rb:21:241:21:3524 | if ... |
 | UseUseExplosion.rb:21:262:21:3508 | if ... | UseUseExplosion.rb:21:257:21:3508 | then ... |
 | UseUseExplosion.rb:21:266:21:270 | [post] self | UseUseExplosion.rb:21:287:21:291 | self |
 | UseUseExplosion.rb:21:266:21:270 | [post] self | UseUseExplosion.rb:21:3499:21:3504 | self |
 | UseUseExplosion.rb:21:266:21:270 | self | UseUseExplosion.rb:21:287:21:291 | self |
 | UseUseExplosion.rb:21:266:21:270 | self | UseUseExplosion.rb:21:3499:21:3504 | self |
-| UseUseExplosion.rb:21:266:21:275 | ... > ... | UseUseExplosion.rb:21:265:21:276 | [false] ( ... ) |
-| UseUseExplosion.rb:21:266:21:275 | ... > ... | UseUseExplosion.rb:21:265:21:276 | [true] ( ... ) |
+| UseUseExplosion.rb:21:266:21:275 | ... > ... | UseUseExplosion.rb:21:265:21:276 | ( ... ) |
 | UseUseExplosion.rb:21:278:21:3492 | then ... | UseUseExplosion.rb:21:262:21:3508 | if ... |
 | UseUseExplosion.rb:21:283:21:3492 | if ... | UseUseExplosion.rb:21:278:21:3492 | then ... |
 | UseUseExplosion.rb:21:287:21:291 | [post] self | UseUseExplosion.rb:21:308:21:312 | self |
 | UseUseExplosion.rb:21:287:21:291 | [post] self | UseUseExplosion.rb:21:3483:21:3488 | self |
 | UseUseExplosion.rb:21:287:21:291 | self | UseUseExplosion.rb:21:308:21:312 | self |
 | UseUseExplosion.rb:21:287:21:291 | self | UseUseExplosion.rb:21:3483:21:3488 | self |
-| UseUseExplosion.rb:21:287:21:296 | ... > ... | UseUseExplosion.rb:21:286:21:297 | [false] ( ... ) |
-| UseUseExplosion.rb:21:287:21:296 | ... > ... | UseUseExplosion.rb:21:286:21:297 | [true] ( ... ) |
+| UseUseExplosion.rb:21:287:21:296 | ... > ... | UseUseExplosion.rb:21:286:21:297 | ( ... ) |
 | UseUseExplosion.rb:21:299:21:3476 | then ... | UseUseExplosion.rb:21:283:21:3492 | if ... |
 | UseUseExplosion.rb:21:304:21:3476 | if ... | UseUseExplosion.rb:21:299:21:3476 | then ... |
 | UseUseExplosion.rb:21:308:21:312 | [post] self | UseUseExplosion.rb:21:329:21:333 | self |
 | UseUseExplosion.rb:21:308:21:312 | [post] self | UseUseExplosion.rb:21:3467:21:3472 | self |
 | UseUseExplosion.rb:21:308:21:312 | self | UseUseExplosion.rb:21:329:21:333 | self |
 | UseUseExplosion.rb:21:308:21:312 | self | UseUseExplosion.rb:21:3467:21:3472 | self |
-| UseUseExplosion.rb:21:308:21:317 | ... > ... | UseUseExplosion.rb:21:307:21:318 | [false] ( ... ) |
-| UseUseExplosion.rb:21:308:21:317 | ... > ... | UseUseExplosion.rb:21:307:21:318 | [true] ( ... ) |
+| UseUseExplosion.rb:21:308:21:317 | ... > ... | UseUseExplosion.rb:21:307:21:318 | ( ... ) |
 | UseUseExplosion.rb:21:320:21:3460 | then ... | UseUseExplosion.rb:21:304:21:3476 | if ... |
 | UseUseExplosion.rb:21:325:21:3460 | if ... | UseUseExplosion.rb:21:320:21:3460 | then ... |
 | UseUseExplosion.rb:21:329:21:333 | [post] self | UseUseExplosion.rb:21:350:21:354 | self |
 | UseUseExplosion.rb:21:329:21:333 | [post] self | UseUseExplosion.rb:21:3451:21:3456 | self |
 | UseUseExplosion.rb:21:329:21:333 | self | UseUseExplosion.rb:21:350:21:354 | self |
 | UseUseExplosion.rb:21:329:21:333 | self | UseUseExplosion.rb:21:3451:21:3456 | self |
-| UseUseExplosion.rb:21:329:21:338 | ... > ... | UseUseExplosion.rb:21:328:21:339 | [false] ( ... ) |
-| UseUseExplosion.rb:21:329:21:338 | ... > ... | UseUseExplosion.rb:21:328:21:339 | [true] ( ... ) |
+| UseUseExplosion.rb:21:329:21:338 | ... > ... | UseUseExplosion.rb:21:328:21:339 | ( ... ) |
 | UseUseExplosion.rb:21:341:21:3444 | then ... | UseUseExplosion.rb:21:325:21:3460 | if ... |
 | UseUseExplosion.rb:21:346:21:3444 | if ... | UseUseExplosion.rb:21:341:21:3444 | then ... |
 | UseUseExplosion.rb:21:350:21:354 | [post] self | UseUseExplosion.rb:21:371:21:375 | self |
 | UseUseExplosion.rb:21:350:21:354 | [post] self | UseUseExplosion.rb:21:3435:21:3440 | self |
 | UseUseExplosion.rb:21:350:21:354 | self | UseUseExplosion.rb:21:371:21:375 | self |
 | UseUseExplosion.rb:21:350:21:354 | self | UseUseExplosion.rb:21:3435:21:3440 | self |
-| UseUseExplosion.rb:21:350:21:359 | ... > ... | UseUseExplosion.rb:21:349:21:360 | [false] ( ... ) |
-| UseUseExplosion.rb:21:350:21:359 | ... > ... | UseUseExplosion.rb:21:349:21:360 | [true] ( ... ) |
+| UseUseExplosion.rb:21:350:21:359 | ... > ... | UseUseExplosion.rb:21:349:21:360 | ( ... ) |
 | UseUseExplosion.rb:21:362:21:3428 | then ... | UseUseExplosion.rb:21:346:21:3444 | if ... |
 | UseUseExplosion.rb:21:367:21:3428 | if ... | UseUseExplosion.rb:21:362:21:3428 | then ... |
 | UseUseExplosion.rb:21:371:21:375 | [post] self | UseUseExplosion.rb:21:392:21:396 | self |
 | UseUseExplosion.rb:21:371:21:375 | [post] self | UseUseExplosion.rb:21:3419:21:3424 | self |
 | UseUseExplosion.rb:21:371:21:375 | self | UseUseExplosion.rb:21:392:21:396 | self |
 | UseUseExplosion.rb:21:371:21:375 | self | UseUseExplosion.rb:21:3419:21:3424 | self |
-| UseUseExplosion.rb:21:371:21:380 | ... > ... | UseUseExplosion.rb:21:370:21:381 | [false] ( ... ) |
-| UseUseExplosion.rb:21:371:21:380 | ... > ... | UseUseExplosion.rb:21:370:21:381 | [true] ( ... ) |
+| UseUseExplosion.rb:21:371:21:380 | ... > ... | UseUseExplosion.rb:21:370:21:381 | ( ... ) |
 | UseUseExplosion.rb:21:383:21:3412 | then ... | UseUseExplosion.rb:21:367:21:3428 | if ... |
 | UseUseExplosion.rb:21:388:21:3412 | if ... | UseUseExplosion.rb:21:383:21:3412 | then ... |
 | UseUseExplosion.rb:21:392:21:396 | [post] self | UseUseExplosion.rb:21:413:21:417 | self |
 | UseUseExplosion.rb:21:392:21:396 | [post] self | UseUseExplosion.rb:21:3403:21:3408 | self |
 | UseUseExplosion.rb:21:392:21:396 | self | UseUseExplosion.rb:21:413:21:417 | self |
 | UseUseExplosion.rb:21:392:21:396 | self | UseUseExplosion.rb:21:3403:21:3408 | self |
-| UseUseExplosion.rb:21:392:21:401 | ... > ... | UseUseExplosion.rb:21:391:21:402 | [false] ( ... ) |
-| UseUseExplosion.rb:21:392:21:401 | ... > ... | UseUseExplosion.rb:21:391:21:402 | [true] ( ... ) |
+| UseUseExplosion.rb:21:392:21:401 | ... > ... | UseUseExplosion.rb:21:391:21:402 | ( ... ) |
 | UseUseExplosion.rb:21:404:21:3396 | then ... | UseUseExplosion.rb:21:388:21:3412 | if ... |
 | UseUseExplosion.rb:21:409:21:3396 | if ... | UseUseExplosion.rb:21:404:21:3396 | then ... |
 | UseUseExplosion.rb:21:413:21:417 | [post] self | UseUseExplosion.rb:21:434:21:438 | self |
 | UseUseExplosion.rb:21:413:21:417 | [post] self | UseUseExplosion.rb:21:3387:21:3392 | self |
 | UseUseExplosion.rb:21:413:21:417 | self | UseUseExplosion.rb:21:434:21:438 | self |
 | UseUseExplosion.rb:21:413:21:417 | self | UseUseExplosion.rb:21:3387:21:3392 | self |
-| UseUseExplosion.rb:21:413:21:422 | ... > ... | UseUseExplosion.rb:21:412:21:423 | [false] ( ... ) |
-| UseUseExplosion.rb:21:413:21:422 | ... > ... | UseUseExplosion.rb:21:412:21:423 | [true] ( ... ) |
+| UseUseExplosion.rb:21:413:21:422 | ... > ... | UseUseExplosion.rb:21:412:21:423 | ( ... ) |
 | UseUseExplosion.rb:21:425:21:3380 | then ... | UseUseExplosion.rb:21:409:21:3396 | if ... |
 | UseUseExplosion.rb:21:430:21:3380 | if ... | UseUseExplosion.rb:21:425:21:3380 | then ... |
 | UseUseExplosion.rb:21:434:21:438 | [post] self | UseUseExplosion.rb:21:455:21:459 | self |
 | UseUseExplosion.rb:21:434:21:438 | [post] self | UseUseExplosion.rb:21:3371:21:3376 | self |
 | UseUseExplosion.rb:21:434:21:438 | self | UseUseExplosion.rb:21:455:21:459 | self |
 | UseUseExplosion.rb:21:434:21:438 | self | UseUseExplosion.rb:21:3371:21:3376 | self |
-| UseUseExplosion.rb:21:434:21:443 | ... > ... | UseUseExplosion.rb:21:433:21:444 | [false] ( ... ) |
-| UseUseExplosion.rb:21:434:21:443 | ... > ... | UseUseExplosion.rb:21:433:21:444 | [true] ( ... ) |
+| UseUseExplosion.rb:21:434:21:443 | ... > ... | UseUseExplosion.rb:21:433:21:444 | ( ... ) |
 | UseUseExplosion.rb:21:446:21:3364 | then ... | UseUseExplosion.rb:21:430:21:3380 | if ... |
 | UseUseExplosion.rb:21:451:21:3364 | if ... | UseUseExplosion.rb:21:446:21:3364 | then ... |
 | UseUseExplosion.rb:21:455:21:459 | [post] self | UseUseExplosion.rb:21:476:21:480 | self |
 | UseUseExplosion.rb:21:455:21:459 | [post] self | UseUseExplosion.rb:21:3355:21:3360 | self |
 | UseUseExplosion.rb:21:455:21:459 | self | UseUseExplosion.rb:21:476:21:480 | self |
 | UseUseExplosion.rb:21:455:21:459 | self | UseUseExplosion.rb:21:3355:21:3360 | self |
-| UseUseExplosion.rb:21:455:21:464 | ... > ... | UseUseExplosion.rb:21:454:21:465 | [false] ( ... ) |
-| UseUseExplosion.rb:21:455:21:464 | ... > ... | UseUseExplosion.rb:21:454:21:465 | [true] ( ... ) |
+| UseUseExplosion.rb:21:455:21:464 | ... > ... | UseUseExplosion.rb:21:454:21:465 | ( ... ) |
 | UseUseExplosion.rb:21:467:21:3348 | then ... | UseUseExplosion.rb:21:451:21:3364 | if ... |
 | UseUseExplosion.rb:21:472:21:3348 | if ... | UseUseExplosion.rb:21:467:21:3348 | then ... |
 | UseUseExplosion.rb:21:476:21:480 | [post] self | UseUseExplosion.rb:21:497:21:501 | self |
 | UseUseExplosion.rb:21:476:21:480 | [post] self | UseUseExplosion.rb:21:3339:21:3344 | self |
 | UseUseExplosion.rb:21:476:21:480 | self | UseUseExplosion.rb:21:497:21:501 | self |
 | UseUseExplosion.rb:21:476:21:480 | self | UseUseExplosion.rb:21:3339:21:3344 | self |
-| UseUseExplosion.rb:21:476:21:485 | ... > ... | UseUseExplosion.rb:21:475:21:486 | [false] ( ... ) |
-| UseUseExplosion.rb:21:476:21:485 | ... > ... | UseUseExplosion.rb:21:475:21:486 | [true] ( ... ) |
+| UseUseExplosion.rb:21:476:21:485 | ... > ... | UseUseExplosion.rb:21:475:21:486 | ( ... ) |
 | UseUseExplosion.rb:21:488:21:3332 | then ... | UseUseExplosion.rb:21:472:21:3348 | if ... |
 | UseUseExplosion.rb:21:493:21:3332 | if ... | UseUseExplosion.rb:21:488:21:3332 | then ... |
 | UseUseExplosion.rb:21:497:21:501 | [post] self | UseUseExplosion.rb:21:518:21:522 | self |
 | UseUseExplosion.rb:21:497:21:501 | [post] self | UseUseExplosion.rb:21:3323:21:3328 | self |
 | UseUseExplosion.rb:21:497:21:501 | self | UseUseExplosion.rb:21:518:21:522 | self |
 | UseUseExplosion.rb:21:497:21:501 | self | UseUseExplosion.rb:21:3323:21:3328 | self |
-| UseUseExplosion.rb:21:497:21:506 | ... > ... | UseUseExplosion.rb:21:496:21:507 | [false] ( ... ) |
-| UseUseExplosion.rb:21:497:21:506 | ... > ... | UseUseExplosion.rb:21:496:21:507 | [true] ( ... ) |
+| UseUseExplosion.rb:21:497:21:506 | ... > ... | UseUseExplosion.rb:21:496:21:507 | ( ... ) |
 | UseUseExplosion.rb:21:509:21:3316 | then ... | UseUseExplosion.rb:21:493:21:3332 | if ... |
 | UseUseExplosion.rb:21:514:21:3316 | if ... | UseUseExplosion.rb:21:509:21:3316 | then ... |
 | UseUseExplosion.rb:21:518:21:522 | [post] self | UseUseExplosion.rb:21:539:21:543 | self |
 | UseUseExplosion.rb:21:518:21:522 | [post] self | UseUseExplosion.rb:21:3307:21:3312 | self |
 | UseUseExplosion.rb:21:518:21:522 | self | UseUseExplosion.rb:21:539:21:543 | self |
 | UseUseExplosion.rb:21:518:21:522 | self | UseUseExplosion.rb:21:3307:21:3312 | self |
-| UseUseExplosion.rb:21:518:21:527 | ... > ... | UseUseExplosion.rb:21:517:21:528 | [false] ( ... ) |
-| UseUseExplosion.rb:21:518:21:527 | ... > ... | UseUseExplosion.rb:21:517:21:528 | [true] ( ... ) |
+| UseUseExplosion.rb:21:518:21:527 | ... > ... | UseUseExplosion.rb:21:517:21:528 | ( ... ) |
 | UseUseExplosion.rb:21:530:21:3300 | then ... | UseUseExplosion.rb:21:514:21:3316 | if ... |
 | UseUseExplosion.rb:21:535:21:3300 | if ... | UseUseExplosion.rb:21:530:21:3300 | then ... |
 | UseUseExplosion.rb:21:539:21:543 | [post] self | UseUseExplosion.rb:21:560:21:564 | self |
 | UseUseExplosion.rb:21:539:21:543 | [post] self | UseUseExplosion.rb:21:3291:21:3296 | self |
 | UseUseExplosion.rb:21:539:21:543 | self | UseUseExplosion.rb:21:560:21:564 | self |
 | UseUseExplosion.rb:21:539:21:543 | self | UseUseExplosion.rb:21:3291:21:3296 | self |
-| UseUseExplosion.rb:21:539:21:548 | ... > ... | UseUseExplosion.rb:21:538:21:549 | [false] ( ... ) |
-| UseUseExplosion.rb:21:539:21:548 | ... > ... | UseUseExplosion.rb:21:538:21:549 | [true] ( ... ) |
+| UseUseExplosion.rb:21:539:21:548 | ... > ... | UseUseExplosion.rb:21:538:21:549 | ( ... ) |
 | UseUseExplosion.rb:21:551:21:3284 | then ... | UseUseExplosion.rb:21:535:21:3300 | if ... |
 | UseUseExplosion.rb:21:556:21:3284 | if ... | UseUseExplosion.rb:21:551:21:3284 | then ... |
 | UseUseExplosion.rb:21:560:21:564 | [post] self | UseUseExplosion.rb:21:581:21:585 | self |
 | UseUseExplosion.rb:21:560:21:564 | [post] self | UseUseExplosion.rb:21:3275:21:3280 | self |
 | UseUseExplosion.rb:21:560:21:564 | self | UseUseExplosion.rb:21:581:21:585 | self |
 | UseUseExplosion.rb:21:560:21:564 | self | UseUseExplosion.rb:21:3275:21:3280 | self |
-| UseUseExplosion.rb:21:560:21:569 | ... > ... | UseUseExplosion.rb:21:559:21:570 | [false] ( ... ) |
-| UseUseExplosion.rb:21:560:21:569 | ... > ... | UseUseExplosion.rb:21:559:21:570 | [true] ( ... ) |
+| UseUseExplosion.rb:21:560:21:569 | ... > ... | UseUseExplosion.rb:21:559:21:570 | ( ... ) |
 | UseUseExplosion.rb:21:572:21:3268 | then ... | UseUseExplosion.rb:21:556:21:3284 | if ... |
 | UseUseExplosion.rb:21:577:21:3268 | if ... | UseUseExplosion.rb:21:572:21:3268 | then ... |
 | UseUseExplosion.rb:21:581:21:585 | [post] self | UseUseExplosion.rb:21:602:21:606 | self |
 | UseUseExplosion.rb:21:581:21:585 | [post] self | UseUseExplosion.rb:21:3259:21:3264 | self |
 | UseUseExplosion.rb:21:581:21:585 | self | UseUseExplosion.rb:21:602:21:606 | self |
 | UseUseExplosion.rb:21:581:21:585 | self | UseUseExplosion.rb:21:3259:21:3264 | self |
-| UseUseExplosion.rb:21:581:21:590 | ... > ... | UseUseExplosion.rb:21:580:21:591 | [false] ( ... ) |
-| UseUseExplosion.rb:21:581:21:590 | ... > ... | UseUseExplosion.rb:21:580:21:591 | [true] ( ... ) |
+| UseUseExplosion.rb:21:581:21:590 | ... > ... | UseUseExplosion.rb:21:580:21:591 | ( ... ) |
 | UseUseExplosion.rb:21:593:21:3252 | then ... | UseUseExplosion.rb:21:577:21:3268 | if ... |
 | UseUseExplosion.rb:21:598:21:3252 | if ... | UseUseExplosion.rb:21:593:21:3252 | then ... |
 | UseUseExplosion.rb:21:602:21:606 | [post] self | UseUseExplosion.rb:21:623:21:627 | self |
 | UseUseExplosion.rb:21:602:21:606 | [post] self | UseUseExplosion.rb:21:3243:21:3248 | self |
 | UseUseExplosion.rb:21:602:21:606 | self | UseUseExplosion.rb:21:623:21:627 | self |
 | UseUseExplosion.rb:21:602:21:606 | self | UseUseExplosion.rb:21:3243:21:3248 | self |
-| UseUseExplosion.rb:21:602:21:611 | ... > ... | UseUseExplosion.rb:21:601:21:612 | [false] ( ... ) |
-| UseUseExplosion.rb:21:602:21:611 | ... > ... | UseUseExplosion.rb:21:601:21:612 | [true] ( ... ) |
+| UseUseExplosion.rb:21:602:21:611 | ... > ... | UseUseExplosion.rb:21:601:21:612 | ( ... ) |
 | UseUseExplosion.rb:21:614:21:3236 | then ... | UseUseExplosion.rb:21:598:21:3252 | if ... |
 | UseUseExplosion.rb:21:619:21:3236 | if ... | UseUseExplosion.rb:21:614:21:3236 | then ... |
 | UseUseExplosion.rb:21:623:21:627 | [post] self | UseUseExplosion.rb:21:644:21:648 | self |
 | UseUseExplosion.rb:21:623:21:627 | [post] self | UseUseExplosion.rb:21:3227:21:3232 | self |
 | UseUseExplosion.rb:21:623:21:627 | self | UseUseExplosion.rb:21:644:21:648 | self |
 | UseUseExplosion.rb:21:623:21:627 | self | UseUseExplosion.rb:21:3227:21:3232 | self |
-| UseUseExplosion.rb:21:623:21:632 | ... > ... | UseUseExplosion.rb:21:622:21:633 | [false] ( ... ) |
-| UseUseExplosion.rb:21:623:21:632 | ... > ... | UseUseExplosion.rb:21:622:21:633 | [true] ( ... ) |
+| UseUseExplosion.rb:21:623:21:632 | ... > ... | UseUseExplosion.rb:21:622:21:633 | ( ... ) |
 | UseUseExplosion.rb:21:635:21:3220 | then ... | UseUseExplosion.rb:21:619:21:3236 | if ... |
 | UseUseExplosion.rb:21:640:21:3220 | if ... | UseUseExplosion.rb:21:635:21:3220 | then ... |
 | UseUseExplosion.rb:21:644:21:648 | [post] self | UseUseExplosion.rb:21:665:21:669 | self |
 | UseUseExplosion.rb:21:644:21:648 | [post] self | UseUseExplosion.rb:21:3211:21:3216 | self |
 | UseUseExplosion.rb:21:644:21:648 | self | UseUseExplosion.rb:21:665:21:669 | self |
 | UseUseExplosion.rb:21:644:21:648 | self | UseUseExplosion.rb:21:3211:21:3216 | self |
-| UseUseExplosion.rb:21:644:21:653 | ... > ... | UseUseExplosion.rb:21:643:21:654 | [false] ( ... ) |
-| UseUseExplosion.rb:21:644:21:653 | ... > ... | UseUseExplosion.rb:21:643:21:654 | [true] ( ... ) |
+| UseUseExplosion.rb:21:644:21:653 | ... > ... | UseUseExplosion.rb:21:643:21:654 | ( ... ) |
 | UseUseExplosion.rb:21:656:21:3204 | then ... | UseUseExplosion.rb:21:640:21:3220 | if ... |
 | UseUseExplosion.rb:21:661:21:3204 | if ... | UseUseExplosion.rb:21:656:21:3204 | then ... |
 | UseUseExplosion.rb:21:665:21:669 | [post] self | UseUseExplosion.rb:21:686:21:690 | self |
 | UseUseExplosion.rb:21:665:21:669 | [post] self | UseUseExplosion.rb:21:3195:21:3200 | self |
 | UseUseExplosion.rb:21:665:21:669 | self | UseUseExplosion.rb:21:686:21:690 | self |
 | UseUseExplosion.rb:21:665:21:669 | self | UseUseExplosion.rb:21:3195:21:3200 | self |
-| UseUseExplosion.rb:21:665:21:674 | ... > ... | UseUseExplosion.rb:21:664:21:675 | [false] ( ... ) |
-| UseUseExplosion.rb:21:665:21:674 | ... > ... | UseUseExplosion.rb:21:664:21:675 | [true] ( ... ) |
+| UseUseExplosion.rb:21:665:21:674 | ... > ... | UseUseExplosion.rb:21:664:21:675 | ( ... ) |
 | UseUseExplosion.rb:21:677:21:3188 | then ... | UseUseExplosion.rb:21:661:21:3204 | if ... |
 | UseUseExplosion.rb:21:682:21:3188 | if ... | UseUseExplosion.rb:21:677:21:3188 | then ... |
 | UseUseExplosion.rb:21:686:21:690 | [post] self | UseUseExplosion.rb:21:707:21:711 | self |
 | UseUseExplosion.rb:21:686:21:690 | [post] self | UseUseExplosion.rb:21:3179:21:3184 | self |
 | UseUseExplosion.rb:21:686:21:690 | self | UseUseExplosion.rb:21:707:21:711 | self |
 | UseUseExplosion.rb:21:686:21:690 | self | UseUseExplosion.rb:21:3179:21:3184 | self |
-| UseUseExplosion.rb:21:686:21:695 | ... > ... | UseUseExplosion.rb:21:685:21:696 | [false] ( ... ) |
-| UseUseExplosion.rb:21:686:21:695 | ... > ... | UseUseExplosion.rb:21:685:21:696 | [true] ( ... ) |
+| UseUseExplosion.rb:21:686:21:695 | ... > ... | UseUseExplosion.rb:21:685:21:696 | ( ... ) |
 | UseUseExplosion.rb:21:698:21:3172 | then ... | UseUseExplosion.rb:21:682:21:3188 | if ... |
 | UseUseExplosion.rb:21:703:21:3172 | if ... | UseUseExplosion.rb:21:698:21:3172 | then ... |
 | UseUseExplosion.rb:21:707:21:711 | [post] self | UseUseExplosion.rb:21:728:21:732 | self |
 | UseUseExplosion.rb:21:707:21:711 | [post] self | UseUseExplosion.rb:21:3163:21:3168 | self |
 | UseUseExplosion.rb:21:707:21:711 | self | UseUseExplosion.rb:21:728:21:732 | self |
 | UseUseExplosion.rb:21:707:21:711 | self | UseUseExplosion.rb:21:3163:21:3168 | self |
-| UseUseExplosion.rb:21:707:21:716 | ... > ... | UseUseExplosion.rb:21:706:21:717 | [false] ( ... ) |
-| UseUseExplosion.rb:21:707:21:716 | ... > ... | UseUseExplosion.rb:21:706:21:717 | [true] ( ... ) |
+| UseUseExplosion.rb:21:707:21:716 | ... > ... | UseUseExplosion.rb:21:706:21:717 | ( ... ) |
 | UseUseExplosion.rb:21:719:21:3156 | then ... | UseUseExplosion.rb:21:703:21:3172 | if ... |
 | UseUseExplosion.rb:21:724:21:3156 | if ... | UseUseExplosion.rb:21:719:21:3156 | then ... |
 | UseUseExplosion.rb:21:728:21:732 | [post] self | UseUseExplosion.rb:21:749:21:753 | self |
 | UseUseExplosion.rb:21:728:21:732 | [post] self | UseUseExplosion.rb:21:3147:21:3152 | self |
 | UseUseExplosion.rb:21:728:21:732 | self | UseUseExplosion.rb:21:749:21:753 | self |
 | UseUseExplosion.rb:21:728:21:732 | self | UseUseExplosion.rb:21:3147:21:3152 | self |
-| UseUseExplosion.rb:21:728:21:737 | ... > ... | UseUseExplosion.rb:21:727:21:738 | [false] ( ... ) |
-| UseUseExplosion.rb:21:728:21:737 | ... > ... | UseUseExplosion.rb:21:727:21:738 | [true] ( ... ) |
+| UseUseExplosion.rb:21:728:21:737 | ... > ... | UseUseExplosion.rb:21:727:21:738 | ( ... ) |
 | UseUseExplosion.rb:21:740:21:3140 | then ... | UseUseExplosion.rb:21:724:21:3156 | if ... |
 | UseUseExplosion.rb:21:745:21:3140 | if ... | UseUseExplosion.rb:21:740:21:3140 | then ... |
 | UseUseExplosion.rb:21:749:21:753 | [post] self | UseUseExplosion.rb:21:770:21:774 | self |
 | UseUseExplosion.rb:21:749:21:753 | [post] self | UseUseExplosion.rb:21:3131:21:3136 | self |
 | UseUseExplosion.rb:21:749:21:753 | self | UseUseExplosion.rb:21:770:21:774 | self |
 | UseUseExplosion.rb:21:749:21:753 | self | UseUseExplosion.rb:21:3131:21:3136 | self |
-| UseUseExplosion.rb:21:749:21:758 | ... > ... | UseUseExplosion.rb:21:748:21:759 | [false] ( ... ) |
-| UseUseExplosion.rb:21:749:21:758 | ... > ... | UseUseExplosion.rb:21:748:21:759 | [true] ( ... ) |
+| UseUseExplosion.rb:21:749:21:758 | ... > ... | UseUseExplosion.rb:21:748:21:759 | ( ... ) |
 | UseUseExplosion.rb:21:761:21:3124 | then ... | UseUseExplosion.rb:21:745:21:3140 | if ... |
 | UseUseExplosion.rb:21:766:21:3124 | if ... | UseUseExplosion.rb:21:761:21:3124 | then ... |
 | UseUseExplosion.rb:21:770:21:774 | [post] self | UseUseExplosion.rb:21:791:21:795 | self |
 | UseUseExplosion.rb:21:770:21:774 | [post] self | UseUseExplosion.rb:21:3115:21:3120 | self |
 | UseUseExplosion.rb:21:770:21:774 | self | UseUseExplosion.rb:21:791:21:795 | self |
 | UseUseExplosion.rb:21:770:21:774 | self | UseUseExplosion.rb:21:3115:21:3120 | self |
-| UseUseExplosion.rb:21:770:21:779 | ... > ... | UseUseExplosion.rb:21:769:21:780 | [false] ( ... ) |
-| UseUseExplosion.rb:21:770:21:779 | ... > ... | UseUseExplosion.rb:21:769:21:780 | [true] ( ... ) |
+| UseUseExplosion.rb:21:770:21:779 | ... > ... | UseUseExplosion.rb:21:769:21:780 | ( ... ) |
 | UseUseExplosion.rb:21:782:21:3108 | then ... | UseUseExplosion.rb:21:766:21:3124 | if ... |
 | UseUseExplosion.rb:21:787:21:3108 | if ... | UseUseExplosion.rb:21:782:21:3108 | then ... |
 | UseUseExplosion.rb:21:791:21:795 | [post] self | UseUseExplosion.rb:21:812:21:816 | self |
 | UseUseExplosion.rb:21:791:21:795 | [post] self | UseUseExplosion.rb:21:3099:21:3104 | self |
 | UseUseExplosion.rb:21:791:21:795 | self | UseUseExplosion.rb:21:812:21:816 | self |
 | UseUseExplosion.rb:21:791:21:795 | self | UseUseExplosion.rb:21:3099:21:3104 | self |
-| UseUseExplosion.rb:21:791:21:800 | ... > ... | UseUseExplosion.rb:21:790:21:801 | [false] ( ... ) |
-| UseUseExplosion.rb:21:791:21:800 | ... > ... | UseUseExplosion.rb:21:790:21:801 | [true] ( ... ) |
+| UseUseExplosion.rb:21:791:21:800 | ... > ... | UseUseExplosion.rb:21:790:21:801 | ( ... ) |
 | UseUseExplosion.rb:21:803:21:3092 | then ... | UseUseExplosion.rb:21:787:21:3108 | if ... |
 | UseUseExplosion.rb:21:808:21:3092 | if ... | UseUseExplosion.rb:21:803:21:3092 | then ... |
 | UseUseExplosion.rb:21:812:21:816 | [post] self | UseUseExplosion.rb:21:833:21:837 | self |
 | UseUseExplosion.rb:21:812:21:816 | [post] self | UseUseExplosion.rb:21:3083:21:3088 | self |
 | UseUseExplosion.rb:21:812:21:816 | self | UseUseExplosion.rb:21:833:21:837 | self |
 | UseUseExplosion.rb:21:812:21:816 | self | UseUseExplosion.rb:21:3083:21:3088 | self |
-| UseUseExplosion.rb:21:812:21:821 | ... > ... | UseUseExplosion.rb:21:811:21:822 | [false] ( ... ) |
-| UseUseExplosion.rb:21:812:21:821 | ... > ... | UseUseExplosion.rb:21:811:21:822 | [true] ( ... ) |
+| UseUseExplosion.rb:21:812:21:821 | ... > ... | UseUseExplosion.rb:21:811:21:822 | ( ... ) |
 | UseUseExplosion.rb:21:824:21:3076 | then ... | UseUseExplosion.rb:21:808:21:3092 | if ... |
 | UseUseExplosion.rb:21:829:21:3076 | if ... | UseUseExplosion.rb:21:824:21:3076 | then ... |
 | UseUseExplosion.rb:21:833:21:837 | [post] self | UseUseExplosion.rb:21:854:21:858 | self |
 | UseUseExplosion.rb:21:833:21:837 | [post] self | UseUseExplosion.rb:21:3067:21:3072 | self |
 | UseUseExplosion.rb:21:833:21:837 | self | UseUseExplosion.rb:21:854:21:858 | self |
 | UseUseExplosion.rb:21:833:21:837 | self | UseUseExplosion.rb:21:3067:21:3072 | self |
-| UseUseExplosion.rb:21:833:21:842 | ... > ... | UseUseExplosion.rb:21:832:21:843 | [false] ( ... ) |
-| UseUseExplosion.rb:21:833:21:842 | ... > ... | UseUseExplosion.rb:21:832:21:843 | [true] ( ... ) |
+| UseUseExplosion.rb:21:833:21:842 | ... > ... | UseUseExplosion.rb:21:832:21:843 | ( ... ) |
 | UseUseExplosion.rb:21:845:21:3060 | then ... | UseUseExplosion.rb:21:829:21:3076 | if ... |
 | UseUseExplosion.rb:21:850:21:3060 | if ... | UseUseExplosion.rb:21:845:21:3060 | then ... |
 | UseUseExplosion.rb:21:854:21:858 | [post] self | UseUseExplosion.rb:21:875:21:879 | self |
 | UseUseExplosion.rb:21:854:21:858 | [post] self | UseUseExplosion.rb:21:3051:21:3056 | self |
 | UseUseExplosion.rb:21:854:21:858 | self | UseUseExplosion.rb:21:875:21:879 | self |
 | UseUseExplosion.rb:21:854:21:858 | self | UseUseExplosion.rb:21:3051:21:3056 | self |
-| UseUseExplosion.rb:21:854:21:863 | ... > ... | UseUseExplosion.rb:21:853:21:864 | [false] ( ... ) |
-| UseUseExplosion.rb:21:854:21:863 | ... > ... | UseUseExplosion.rb:21:853:21:864 | [true] ( ... ) |
+| UseUseExplosion.rb:21:854:21:863 | ... > ... | UseUseExplosion.rb:21:853:21:864 | ( ... ) |
 | UseUseExplosion.rb:21:866:21:3044 | then ... | UseUseExplosion.rb:21:850:21:3060 | if ... |
 | UseUseExplosion.rb:21:871:21:3044 | if ... | UseUseExplosion.rb:21:866:21:3044 | then ... |
 | UseUseExplosion.rb:21:875:21:879 | [post] self | UseUseExplosion.rb:21:896:21:900 | self |
 | UseUseExplosion.rb:21:875:21:879 | [post] self | UseUseExplosion.rb:21:3035:21:3040 | self |
 | UseUseExplosion.rb:21:875:21:879 | self | UseUseExplosion.rb:21:896:21:900 | self |
 | UseUseExplosion.rb:21:875:21:879 | self | UseUseExplosion.rb:21:3035:21:3040 | self |
-| UseUseExplosion.rb:21:875:21:884 | ... > ... | UseUseExplosion.rb:21:874:21:885 | [false] ( ... ) |
-| UseUseExplosion.rb:21:875:21:884 | ... > ... | UseUseExplosion.rb:21:874:21:885 | [true] ( ... ) |
+| UseUseExplosion.rb:21:875:21:884 | ... > ... | UseUseExplosion.rb:21:874:21:885 | ( ... ) |
 | UseUseExplosion.rb:21:887:21:3028 | then ... | UseUseExplosion.rb:21:871:21:3044 | if ... |
 | UseUseExplosion.rb:21:892:21:3028 | if ... | UseUseExplosion.rb:21:887:21:3028 | then ... |
 | UseUseExplosion.rb:21:896:21:900 | [post] self | UseUseExplosion.rb:21:917:21:921 | self |
 | UseUseExplosion.rb:21:896:21:900 | [post] self | UseUseExplosion.rb:21:3019:21:3024 | self |
 | UseUseExplosion.rb:21:896:21:900 | self | UseUseExplosion.rb:21:917:21:921 | self |
 | UseUseExplosion.rb:21:896:21:900 | self | UseUseExplosion.rb:21:3019:21:3024 | self |
-| UseUseExplosion.rb:21:896:21:905 | ... > ... | UseUseExplosion.rb:21:895:21:906 | [false] ( ... ) |
-| UseUseExplosion.rb:21:896:21:905 | ... > ... | UseUseExplosion.rb:21:895:21:906 | [true] ( ... ) |
+| UseUseExplosion.rb:21:896:21:905 | ... > ... | UseUseExplosion.rb:21:895:21:906 | ( ... ) |
 | UseUseExplosion.rb:21:908:21:3012 | then ... | UseUseExplosion.rb:21:892:21:3028 | if ... |
 | UseUseExplosion.rb:21:913:21:3012 | if ... | UseUseExplosion.rb:21:908:21:3012 | then ... |
 | UseUseExplosion.rb:21:917:21:921 | [post] self | UseUseExplosion.rb:21:938:21:942 | self |
 | UseUseExplosion.rb:21:917:21:921 | [post] self | UseUseExplosion.rb:21:3003:21:3008 | self |
 | UseUseExplosion.rb:21:917:21:921 | self | UseUseExplosion.rb:21:938:21:942 | self |
 | UseUseExplosion.rb:21:917:21:921 | self | UseUseExplosion.rb:21:3003:21:3008 | self |
-| UseUseExplosion.rb:21:917:21:926 | ... > ... | UseUseExplosion.rb:21:916:21:927 | [false] ( ... ) |
-| UseUseExplosion.rb:21:917:21:926 | ... > ... | UseUseExplosion.rb:21:916:21:927 | [true] ( ... ) |
+| UseUseExplosion.rb:21:917:21:926 | ... > ... | UseUseExplosion.rb:21:916:21:927 | ( ... ) |
 | UseUseExplosion.rb:21:929:21:2996 | then ... | UseUseExplosion.rb:21:913:21:3012 | if ... |
 | UseUseExplosion.rb:21:934:21:2996 | if ... | UseUseExplosion.rb:21:929:21:2996 | then ... |
 | UseUseExplosion.rb:21:938:21:942 | [post] self | UseUseExplosion.rb:21:959:21:963 | self |
 | UseUseExplosion.rb:21:938:21:942 | [post] self | UseUseExplosion.rb:21:2987:21:2992 | self |
 | UseUseExplosion.rb:21:938:21:942 | self | UseUseExplosion.rb:21:959:21:963 | self |
 | UseUseExplosion.rb:21:938:21:942 | self | UseUseExplosion.rb:21:2987:21:2992 | self |
-| UseUseExplosion.rb:21:938:21:947 | ... > ... | UseUseExplosion.rb:21:937:21:948 | [false] ( ... ) |
-| UseUseExplosion.rb:21:938:21:947 | ... > ... | UseUseExplosion.rb:21:937:21:948 | [true] ( ... ) |
+| UseUseExplosion.rb:21:938:21:947 | ... > ... | UseUseExplosion.rb:21:937:21:948 | ( ... ) |
 | UseUseExplosion.rb:21:950:21:2980 | then ... | UseUseExplosion.rb:21:934:21:2996 | if ... |
 | UseUseExplosion.rb:21:955:21:2980 | if ... | UseUseExplosion.rb:21:950:21:2980 | then ... |
 | UseUseExplosion.rb:21:959:21:963 | [post] self | UseUseExplosion.rb:21:980:21:984 | self |
 | UseUseExplosion.rb:21:959:21:963 | [post] self | UseUseExplosion.rb:21:2971:21:2976 | self |
 | UseUseExplosion.rb:21:959:21:963 | self | UseUseExplosion.rb:21:980:21:984 | self |
 | UseUseExplosion.rb:21:959:21:963 | self | UseUseExplosion.rb:21:2971:21:2976 | self |
-| UseUseExplosion.rb:21:959:21:968 | ... > ... | UseUseExplosion.rb:21:958:21:969 | [false] ( ... ) |
-| UseUseExplosion.rb:21:959:21:968 | ... > ... | UseUseExplosion.rb:21:958:21:969 | [true] ( ... ) |
+| UseUseExplosion.rb:21:959:21:968 | ... > ... | UseUseExplosion.rb:21:958:21:969 | ( ... ) |
 | UseUseExplosion.rb:21:971:21:2964 | then ... | UseUseExplosion.rb:21:955:21:2980 | if ... |
 | UseUseExplosion.rb:21:976:21:2964 | if ... | UseUseExplosion.rb:21:971:21:2964 | then ... |
 | UseUseExplosion.rb:21:980:21:984 | [post] self | UseUseExplosion.rb:21:1001:21:1005 | self |
 | UseUseExplosion.rb:21:980:21:984 | [post] self | UseUseExplosion.rb:21:2955:21:2960 | self |
 | UseUseExplosion.rb:21:980:21:984 | self | UseUseExplosion.rb:21:1001:21:1005 | self |
 | UseUseExplosion.rb:21:980:21:984 | self | UseUseExplosion.rb:21:2955:21:2960 | self |
-| UseUseExplosion.rb:21:980:21:989 | ... > ... | UseUseExplosion.rb:21:979:21:990 | [false] ( ... ) |
-| UseUseExplosion.rb:21:980:21:989 | ... > ... | UseUseExplosion.rb:21:979:21:990 | [true] ( ... ) |
+| UseUseExplosion.rb:21:980:21:989 | ... > ... | UseUseExplosion.rb:21:979:21:990 | ( ... ) |
 | UseUseExplosion.rb:21:992:21:2948 | then ... | UseUseExplosion.rb:21:976:21:2964 | if ... |
 | UseUseExplosion.rb:21:997:21:2948 | if ... | UseUseExplosion.rb:21:992:21:2948 | then ... |
 | UseUseExplosion.rb:21:1001:21:1005 | [post] self | UseUseExplosion.rb:21:1022:21:1026 | self |
 | UseUseExplosion.rb:21:1001:21:1005 | [post] self | UseUseExplosion.rb:21:2939:21:2944 | self |
 | UseUseExplosion.rb:21:1001:21:1005 | self | UseUseExplosion.rb:21:1022:21:1026 | self |
 | UseUseExplosion.rb:21:1001:21:1005 | self | UseUseExplosion.rb:21:2939:21:2944 | self |
-| UseUseExplosion.rb:21:1001:21:1010 | ... > ... | UseUseExplosion.rb:21:1000:21:1011 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1001:21:1010 | ... > ... | UseUseExplosion.rb:21:1000:21:1011 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1001:21:1010 | ... > ... | UseUseExplosion.rb:21:1000:21:1011 | ( ... ) |
 | UseUseExplosion.rb:21:1013:21:2932 | then ... | UseUseExplosion.rb:21:997:21:2948 | if ... |
 | UseUseExplosion.rb:21:1018:21:2932 | if ... | UseUseExplosion.rb:21:1013:21:2932 | then ... |
 | UseUseExplosion.rb:21:1022:21:1026 | [post] self | UseUseExplosion.rb:21:1043:21:1047 | self |
 | UseUseExplosion.rb:21:1022:21:1026 | [post] self | UseUseExplosion.rb:21:2923:21:2928 | self |
 | UseUseExplosion.rb:21:1022:21:1026 | self | UseUseExplosion.rb:21:1043:21:1047 | self |
 | UseUseExplosion.rb:21:1022:21:1026 | self | UseUseExplosion.rb:21:2923:21:2928 | self |
-| UseUseExplosion.rb:21:1022:21:1031 | ... > ... | UseUseExplosion.rb:21:1021:21:1032 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1022:21:1031 | ... > ... | UseUseExplosion.rb:21:1021:21:1032 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1022:21:1031 | ... > ... | UseUseExplosion.rb:21:1021:21:1032 | ( ... ) |
 | UseUseExplosion.rb:21:1034:21:2916 | then ... | UseUseExplosion.rb:21:1018:21:2932 | if ... |
 | UseUseExplosion.rb:21:1039:21:2916 | if ... | UseUseExplosion.rb:21:1034:21:2916 | then ... |
 | UseUseExplosion.rb:21:1043:21:1047 | [post] self | UseUseExplosion.rb:21:1064:21:1068 | self |
 | UseUseExplosion.rb:21:1043:21:1047 | [post] self | UseUseExplosion.rb:21:2907:21:2912 | self |
 | UseUseExplosion.rb:21:1043:21:1047 | self | UseUseExplosion.rb:21:1064:21:1068 | self |
 | UseUseExplosion.rb:21:1043:21:1047 | self | UseUseExplosion.rb:21:2907:21:2912 | self |
-| UseUseExplosion.rb:21:1043:21:1052 | ... > ... | UseUseExplosion.rb:21:1042:21:1053 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1043:21:1052 | ... > ... | UseUseExplosion.rb:21:1042:21:1053 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1043:21:1052 | ... > ... | UseUseExplosion.rb:21:1042:21:1053 | ( ... ) |
 | UseUseExplosion.rb:21:1055:21:2900 | then ... | UseUseExplosion.rb:21:1039:21:2916 | if ... |
 | UseUseExplosion.rb:21:1060:21:2900 | if ... | UseUseExplosion.rb:21:1055:21:2900 | then ... |
 | UseUseExplosion.rb:21:1064:21:1068 | [post] self | UseUseExplosion.rb:21:1085:21:1089 | self |
 | UseUseExplosion.rb:21:1064:21:1068 | [post] self | UseUseExplosion.rb:21:2891:21:2896 | self |
 | UseUseExplosion.rb:21:1064:21:1068 | self | UseUseExplosion.rb:21:1085:21:1089 | self |
 | UseUseExplosion.rb:21:1064:21:1068 | self | UseUseExplosion.rb:21:2891:21:2896 | self |
-| UseUseExplosion.rb:21:1064:21:1073 | ... > ... | UseUseExplosion.rb:21:1063:21:1074 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1064:21:1073 | ... > ... | UseUseExplosion.rb:21:1063:21:1074 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1064:21:1073 | ... > ... | UseUseExplosion.rb:21:1063:21:1074 | ( ... ) |
 | UseUseExplosion.rb:21:1076:21:2884 | then ... | UseUseExplosion.rb:21:1060:21:2900 | if ... |
 | UseUseExplosion.rb:21:1081:21:2884 | if ... | UseUseExplosion.rb:21:1076:21:2884 | then ... |
 | UseUseExplosion.rb:21:1085:21:1089 | [post] self | UseUseExplosion.rb:21:1106:21:1110 | self |
 | UseUseExplosion.rb:21:1085:21:1089 | [post] self | UseUseExplosion.rb:21:2875:21:2880 | self |
 | UseUseExplosion.rb:21:1085:21:1089 | self | UseUseExplosion.rb:21:1106:21:1110 | self |
 | UseUseExplosion.rb:21:1085:21:1089 | self | UseUseExplosion.rb:21:2875:21:2880 | self |
-| UseUseExplosion.rb:21:1085:21:1094 | ... > ... | UseUseExplosion.rb:21:1084:21:1095 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1085:21:1094 | ... > ... | UseUseExplosion.rb:21:1084:21:1095 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1085:21:1094 | ... > ... | UseUseExplosion.rb:21:1084:21:1095 | ( ... ) |
 | UseUseExplosion.rb:21:1097:21:2868 | then ... | UseUseExplosion.rb:21:1081:21:2884 | if ... |
 | UseUseExplosion.rb:21:1102:21:2868 | if ... | UseUseExplosion.rb:21:1097:21:2868 | then ... |
 | UseUseExplosion.rb:21:1106:21:1110 | [post] self | UseUseExplosion.rb:21:1127:21:1131 | self |
 | UseUseExplosion.rb:21:1106:21:1110 | [post] self | UseUseExplosion.rb:21:2859:21:2864 | self |
 | UseUseExplosion.rb:21:1106:21:1110 | self | UseUseExplosion.rb:21:1127:21:1131 | self |
 | UseUseExplosion.rb:21:1106:21:1110 | self | UseUseExplosion.rb:21:2859:21:2864 | self |
-| UseUseExplosion.rb:21:1106:21:1115 | ... > ... | UseUseExplosion.rb:21:1105:21:1116 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1106:21:1115 | ... > ... | UseUseExplosion.rb:21:1105:21:1116 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1106:21:1115 | ... > ... | UseUseExplosion.rb:21:1105:21:1116 | ( ... ) |
 | UseUseExplosion.rb:21:1118:21:2852 | then ... | UseUseExplosion.rb:21:1102:21:2868 | if ... |
 | UseUseExplosion.rb:21:1123:21:2852 | if ... | UseUseExplosion.rb:21:1118:21:2852 | then ... |
 | UseUseExplosion.rb:21:1127:21:1131 | [post] self | UseUseExplosion.rb:21:1148:21:1152 | self |
 | UseUseExplosion.rb:21:1127:21:1131 | [post] self | UseUseExplosion.rb:21:2843:21:2848 | self |
 | UseUseExplosion.rb:21:1127:21:1131 | self | UseUseExplosion.rb:21:1148:21:1152 | self |
 | UseUseExplosion.rb:21:1127:21:1131 | self | UseUseExplosion.rb:21:2843:21:2848 | self |
-| UseUseExplosion.rb:21:1127:21:1136 | ... > ... | UseUseExplosion.rb:21:1126:21:1137 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1127:21:1136 | ... > ... | UseUseExplosion.rb:21:1126:21:1137 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1127:21:1136 | ... > ... | UseUseExplosion.rb:21:1126:21:1137 | ( ... ) |
 | UseUseExplosion.rb:21:1139:21:2836 | then ... | UseUseExplosion.rb:21:1123:21:2852 | if ... |
 | UseUseExplosion.rb:21:1144:21:2836 | if ... | UseUseExplosion.rb:21:1139:21:2836 | then ... |
 | UseUseExplosion.rb:21:1148:21:1152 | [post] self | UseUseExplosion.rb:21:1169:21:1173 | self |
 | UseUseExplosion.rb:21:1148:21:1152 | [post] self | UseUseExplosion.rb:21:2827:21:2832 | self |
 | UseUseExplosion.rb:21:1148:21:1152 | self | UseUseExplosion.rb:21:1169:21:1173 | self |
 | UseUseExplosion.rb:21:1148:21:1152 | self | UseUseExplosion.rb:21:2827:21:2832 | self |
-| UseUseExplosion.rb:21:1148:21:1157 | ... > ... | UseUseExplosion.rb:21:1147:21:1158 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1148:21:1157 | ... > ... | UseUseExplosion.rb:21:1147:21:1158 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1148:21:1157 | ... > ... | UseUseExplosion.rb:21:1147:21:1158 | ( ... ) |
 | UseUseExplosion.rb:21:1160:21:2820 | then ... | UseUseExplosion.rb:21:1144:21:2836 | if ... |
 | UseUseExplosion.rb:21:1165:21:2820 | if ... | UseUseExplosion.rb:21:1160:21:2820 | then ... |
 | UseUseExplosion.rb:21:1169:21:1173 | [post] self | UseUseExplosion.rb:21:1190:21:1194 | self |
 | UseUseExplosion.rb:21:1169:21:1173 | [post] self | UseUseExplosion.rb:21:2811:21:2816 | self |
 | UseUseExplosion.rb:21:1169:21:1173 | self | UseUseExplosion.rb:21:1190:21:1194 | self |
 | UseUseExplosion.rb:21:1169:21:1173 | self | UseUseExplosion.rb:21:2811:21:2816 | self |
-| UseUseExplosion.rb:21:1169:21:1178 | ... > ... | UseUseExplosion.rb:21:1168:21:1179 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1169:21:1178 | ... > ... | UseUseExplosion.rb:21:1168:21:1179 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1169:21:1178 | ... > ... | UseUseExplosion.rb:21:1168:21:1179 | ( ... ) |
 | UseUseExplosion.rb:21:1181:21:2804 | then ... | UseUseExplosion.rb:21:1165:21:2820 | if ... |
 | UseUseExplosion.rb:21:1186:21:2804 | if ... | UseUseExplosion.rb:21:1181:21:2804 | then ... |
 | UseUseExplosion.rb:21:1190:21:1194 | [post] self | UseUseExplosion.rb:21:1211:21:1215 | self |
 | UseUseExplosion.rb:21:1190:21:1194 | [post] self | UseUseExplosion.rb:21:2795:21:2800 | self |
 | UseUseExplosion.rb:21:1190:21:1194 | self | UseUseExplosion.rb:21:1211:21:1215 | self |
 | UseUseExplosion.rb:21:1190:21:1194 | self | UseUseExplosion.rb:21:2795:21:2800 | self |
-| UseUseExplosion.rb:21:1190:21:1199 | ... > ... | UseUseExplosion.rb:21:1189:21:1200 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1190:21:1199 | ... > ... | UseUseExplosion.rb:21:1189:21:1200 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1190:21:1199 | ... > ... | UseUseExplosion.rb:21:1189:21:1200 | ( ... ) |
 | UseUseExplosion.rb:21:1202:21:2788 | then ... | UseUseExplosion.rb:21:1186:21:2804 | if ... |
 | UseUseExplosion.rb:21:1207:21:2788 | if ... | UseUseExplosion.rb:21:1202:21:2788 | then ... |
 | UseUseExplosion.rb:21:1211:21:1215 | [post] self | UseUseExplosion.rb:21:1232:21:1236 | self |
 | UseUseExplosion.rb:21:1211:21:1215 | [post] self | UseUseExplosion.rb:21:2779:21:2784 | self |
 | UseUseExplosion.rb:21:1211:21:1215 | self | UseUseExplosion.rb:21:1232:21:1236 | self |
 | UseUseExplosion.rb:21:1211:21:1215 | self | UseUseExplosion.rb:21:2779:21:2784 | self |
-| UseUseExplosion.rb:21:1211:21:1220 | ... > ... | UseUseExplosion.rb:21:1210:21:1221 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1211:21:1220 | ... > ... | UseUseExplosion.rb:21:1210:21:1221 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1211:21:1220 | ... > ... | UseUseExplosion.rb:21:1210:21:1221 | ( ... ) |
 | UseUseExplosion.rb:21:1223:21:2772 | then ... | UseUseExplosion.rb:21:1207:21:2788 | if ... |
 | UseUseExplosion.rb:21:1228:21:2772 | if ... | UseUseExplosion.rb:21:1223:21:2772 | then ... |
 | UseUseExplosion.rb:21:1232:21:1236 | [post] self | UseUseExplosion.rb:21:1253:21:1257 | self |
 | UseUseExplosion.rb:21:1232:21:1236 | [post] self | UseUseExplosion.rb:21:2763:21:2768 | self |
 | UseUseExplosion.rb:21:1232:21:1236 | self | UseUseExplosion.rb:21:1253:21:1257 | self |
 | UseUseExplosion.rb:21:1232:21:1236 | self | UseUseExplosion.rb:21:2763:21:2768 | self |
-| UseUseExplosion.rb:21:1232:21:1241 | ... > ... | UseUseExplosion.rb:21:1231:21:1242 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1232:21:1241 | ... > ... | UseUseExplosion.rb:21:1231:21:1242 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1232:21:1241 | ... > ... | UseUseExplosion.rb:21:1231:21:1242 | ( ... ) |
 | UseUseExplosion.rb:21:1244:21:2756 | then ... | UseUseExplosion.rb:21:1228:21:2772 | if ... |
 | UseUseExplosion.rb:21:1249:21:2756 | if ... | UseUseExplosion.rb:21:1244:21:2756 | then ... |
 | UseUseExplosion.rb:21:1253:21:1257 | [post] self | UseUseExplosion.rb:21:1274:21:1278 | self |
 | UseUseExplosion.rb:21:1253:21:1257 | [post] self | UseUseExplosion.rb:21:2747:21:2752 | self |
 | UseUseExplosion.rb:21:1253:21:1257 | self | UseUseExplosion.rb:21:1274:21:1278 | self |
 | UseUseExplosion.rb:21:1253:21:1257 | self | UseUseExplosion.rb:21:2747:21:2752 | self |
-| UseUseExplosion.rb:21:1253:21:1262 | ... > ... | UseUseExplosion.rb:21:1252:21:1263 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1253:21:1262 | ... > ... | UseUseExplosion.rb:21:1252:21:1263 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1253:21:1262 | ... > ... | UseUseExplosion.rb:21:1252:21:1263 | ( ... ) |
 | UseUseExplosion.rb:21:1265:21:2740 | then ... | UseUseExplosion.rb:21:1249:21:2756 | if ... |
 | UseUseExplosion.rb:21:1270:21:2740 | if ... | UseUseExplosion.rb:21:1265:21:2740 | then ... |
 | UseUseExplosion.rb:21:1274:21:1278 | [post] self | UseUseExplosion.rb:21:1295:21:1299 | self |
 | UseUseExplosion.rb:21:1274:21:1278 | [post] self | UseUseExplosion.rb:21:2731:21:2736 | self |
 | UseUseExplosion.rb:21:1274:21:1278 | self | UseUseExplosion.rb:21:1295:21:1299 | self |
 | UseUseExplosion.rb:21:1274:21:1278 | self | UseUseExplosion.rb:21:2731:21:2736 | self |
-| UseUseExplosion.rb:21:1274:21:1283 | ... > ... | UseUseExplosion.rb:21:1273:21:1284 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1274:21:1283 | ... > ... | UseUseExplosion.rb:21:1273:21:1284 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1274:21:1283 | ... > ... | UseUseExplosion.rb:21:1273:21:1284 | ( ... ) |
 | UseUseExplosion.rb:21:1286:21:2724 | then ... | UseUseExplosion.rb:21:1270:21:2740 | if ... |
 | UseUseExplosion.rb:21:1291:21:2724 | if ... | UseUseExplosion.rb:21:1286:21:2724 | then ... |
 | UseUseExplosion.rb:21:1295:21:1299 | [post] self | UseUseExplosion.rb:21:1316:21:1320 | self |
 | UseUseExplosion.rb:21:1295:21:1299 | [post] self | UseUseExplosion.rb:21:2715:21:2720 | self |
 | UseUseExplosion.rb:21:1295:21:1299 | self | UseUseExplosion.rb:21:1316:21:1320 | self |
 | UseUseExplosion.rb:21:1295:21:1299 | self | UseUseExplosion.rb:21:2715:21:2720 | self |
-| UseUseExplosion.rb:21:1295:21:1304 | ... > ... | UseUseExplosion.rb:21:1294:21:1305 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1295:21:1304 | ... > ... | UseUseExplosion.rb:21:1294:21:1305 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1295:21:1304 | ... > ... | UseUseExplosion.rb:21:1294:21:1305 | ( ... ) |
 | UseUseExplosion.rb:21:1307:21:2708 | then ... | UseUseExplosion.rb:21:1291:21:2724 | if ... |
 | UseUseExplosion.rb:21:1312:21:2708 | if ... | UseUseExplosion.rb:21:1307:21:2708 | then ... |
 | UseUseExplosion.rb:21:1316:21:1320 | [post] self | UseUseExplosion.rb:21:1337:21:1341 | self |
 | UseUseExplosion.rb:21:1316:21:1320 | [post] self | UseUseExplosion.rb:21:2699:21:2704 | self |
 | UseUseExplosion.rb:21:1316:21:1320 | self | UseUseExplosion.rb:21:1337:21:1341 | self |
 | UseUseExplosion.rb:21:1316:21:1320 | self | UseUseExplosion.rb:21:2699:21:2704 | self |
-| UseUseExplosion.rb:21:1316:21:1325 | ... > ... | UseUseExplosion.rb:21:1315:21:1326 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1316:21:1325 | ... > ... | UseUseExplosion.rb:21:1315:21:1326 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1316:21:1325 | ... > ... | UseUseExplosion.rb:21:1315:21:1326 | ( ... ) |
 | UseUseExplosion.rb:21:1328:21:2692 | then ... | UseUseExplosion.rb:21:1312:21:2708 | if ... |
 | UseUseExplosion.rb:21:1333:21:2692 | if ... | UseUseExplosion.rb:21:1328:21:2692 | then ... |
 | UseUseExplosion.rb:21:1337:21:1341 | [post] self | UseUseExplosion.rb:21:1358:21:1362 | self |
 | UseUseExplosion.rb:21:1337:21:1341 | [post] self | UseUseExplosion.rb:21:2683:21:2688 | self |
 | UseUseExplosion.rb:21:1337:21:1341 | self | UseUseExplosion.rb:21:1358:21:1362 | self |
 | UseUseExplosion.rb:21:1337:21:1341 | self | UseUseExplosion.rb:21:2683:21:2688 | self |
-| UseUseExplosion.rb:21:1337:21:1346 | ... > ... | UseUseExplosion.rb:21:1336:21:1347 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1337:21:1346 | ... > ... | UseUseExplosion.rb:21:1336:21:1347 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1337:21:1346 | ... > ... | UseUseExplosion.rb:21:1336:21:1347 | ( ... ) |
 | UseUseExplosion.rb:21:1349:21:2676 | then ... | UseUseExplosion.rb:21:1333:21:2692 | if ... |
 | UseUseExplosion.rb:21:1354:21:2676 | if ... | UseUseExplosion.rb:21:1349:21:2676 | then ... |
 | UseUseExplosion.rb:21:1358:21:1362 | [post] self | UseUseExplosion.rb:21:1379:21:1383 | self |
 | UseUseExplosion.rb:21:1358:21:1362 | [post] self | UseUseExplosion.rb:21:2667:21:2672 | self |
 | UseUseExplosion.rb:21:1358:21:1362 | self | UseUseExplosion.rb:21:1379:21:1383 | self |
 | UseUseExplosion.rb:21:1358:21:1362 | self | UseUseExplosion.rb:21:2667:21:2672 | self |
-| UseUseExplosion.rb:21:1358:21:1367 | ... > ... | UseUseExplosion.rb:21:1357:21:1368 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1358:21:1367 | ... > ... | UseUseExplosion.rb:21:1357:21:1368 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1358:21:1367 | ... > ... | UseUseExplosion.rb:21:1357:21:1368 | ( ... ) |
 | UseUseExplosion.rb:21:1370:21:2660 | then ... | UseUseExplosion.rb:21:1354:21:2676 | if ... |
 | UseUseExplosion.rb:21:1375:21:2660 | if ... | UseUseExplosion.rb:21:1370:21:2660 | then ... |
 | UseUseExplosion.rb:21:1379:21:1383 | [post] self | UseUseExplosion.rb:21:1400:21:1404 | self |
 | UseUseExplosion.rb:21:1379:21:1383 | [post] self | UseUseExplosion.rb:21:2651:21:2656 | self |
 | UseUseExplosion.rb:21:1379:21:1383 | self | UseUseExplosion.rb:21:1400:21:1404 | self |
 | UseUseExplosion.rb:21:1379:21:1383 | self | UseUseExplosion.rb:21:2651:21:2656 | self |
-| UseUseExplosion.rb:21:1379:21:1388 | ... > ... | UseUseExplosion.rb:21:1378:21:1389 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1379:21:1388 | ... > ... | UseUseExplosion.rb:21:1378:21:1389 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1379:21:1388 | ... > ... | UseUseExplosion.rb:21:1378:21:1389 | ( ... ) |
 | UseUseExplosion.rb:21:1391:21:2644 | then ... | UseUseExplosion.rb:21:1375:21:2660 | if ... |
 | UseUseExplosion.rb:21:1396:21:2644 | if ... | UseUseExplosion.rb:21:1391:21:2644 | then ... |
 | UseUseExplosion.rb:21:1400:21:1404 | [post] self | UseUseExplosion.rb:21:1421:21:1425 | self |
 | UseUseExplosion.rb:21:1400:21:1404 | [post] self | UseUseExplosion.rb:21:2635:21:2640 | self |
 | UseUseExplosion.rb:21:1400:21:1404 | self | UseUseExplosion.rb:21:1421:21:1425 | self |
 | UseUseExplosion.rb:21:1400:21:1404 | self | UseUseExplosion.rb:21:2635:21:2640 | self |
-| UseUseExplosion.rb:21:1400:21:1409 | ... > ... | UseUseExplosion.rb:21:1399:21:1410 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1400:21:1409 | ... > ... | UseUseExplosion.rb:21:1399:21:1410 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1400:21:1409 | ... > ... | UseUseExplosion.rb:21:1399:21:1410 | ( ... ) |
 | UseUseExplosion.rb:21:1412:21:2628 | then ... | UseUseExplosion.rb:21:1396:21:2644 | if ... |
 | UseUseExplosion.rb:21:1417:21:2628 | if ... | UseUseExplosion.rb:21:1412:21:2628 | then ... |
 | UseUseExplosion.rb:21:1421:21:1425 | [post] self | UseUseExplosion.rb:21:1442:21:1446 | self |
 | UseUseExplosion.rb:21:1421:21:1425 | [post] self | UseUseExplosion.rb:21:2619:21:2624 | self |
 | UseUseExplosion.rb:21:1421:21:1425 | self | UseUseExplosion.rb:21:1442:21:1446 | self |
 | UseUseExplosion.rb:21:1421:21:1425 | self | UseUseExplosion.rb:21:2619:21:2624 | self |
-| UseUseExplosion.rb:21:1421:21:1430 | ... > ... | UseUseExplosion.rb:21:1420:21:1431 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1421:21:1430 | ... > ... | UseUseExplosion.rb:21:1420:21:1431 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1421:21:1430 | ... > ... | UseUseExplosion.rb:21:1420:21:1431 | ( ... ) |
 | UseUseExplosion.rb:21:1433:21:2612 | then ... | UseUseExplosion.rb:21:1417:21:2628 | if ... |
 | UseUseExplosion.rb:21:1438:21:2612 | if ... | UseUseExplosion.rb:21:1433:21:2612 | then ... |
 | UseUseExplosion.rb:21:1442:21:1446 | [post] self | UseUseExplosion.rb:21:1463:21:1467 | self |
 | UseUseExplosion.rb:21:1442:21:1446 | [post] self | UseUseExplosion.rb:21:2603:21:2608 | self |
 | UseUseExplosion.rb:21:1442:21:1446 | self | UseUseExplosion.rb:21:1463:21:1467 | self |
 | UseUseExplosion.rb:21:1442:21:1446 | self | UseUseExplosion.rb:21:2603:21:2608 | self |
-| UseUseExplosion.rb:21:1442:21:1451 | ... > ... | UseUseExplosion.rb:21:1441:21:1452 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1442:21:1451 | ... > ... | UseUseExplosion.rb:21:1441:21:1452 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1442:21:1451 | ... > ... | UseUseExplosion.rb:21:1441:21:1452 | ( ... ) |
 | UseUseExplosion.rb:21:1454:21:2596 | then ... | UseUseExplosion.rb:21:1438:21:2612 | if ... |
 | UseUseExplosion.rb:21:1459:21:2596 | if ... | UseUseExplosion.rb:21:1454:21:2596 | then ... |
 | UseUseExplosion.rb:21:1463:21:1467 | [post] self | UseUseExplosion.rb:21:1484:21:1488 | self |
 | UseUseExplosion.rb:21:1463:21:1467 | [post] self | UseUseExplosion.rb:21:2587:21:2592 | self |
 | UseUseExplosion.rb:21:1463:21:1467 | self | UseUseExplosion.rb:21:1484:21:1488 | self |
 | UseUseExplosion.rb:21:1463:21:1467 | self | UseUseExplosion.rb:21:2587:21:2592 | self |
-| UseUseExplosion.rb:21:1463:21:1472 | ... > ... | UseUseExplosion.rb:21:1462:21:1473 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1463:21:1472 | ... > ... | UseUseExplosion.rb:21:1462:21:1473 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1463:21:1472 | ... > ... | UseUseExplosion.rb:21:1462:21:1473 | ( ... ) |
 | UseUseExplosion.rb:21:1475:21:2580 | then ... | UseUseExplosion.rb:21:1459:21:2596 | if ... |
 | UseUseExplosion.rb:21:1480:21:2580 | if ... | UseUseExplosion.rb:21:1475:21:2580 | then ... |
 | UseUseExplosion.rb:21:1484:21:1488 | [post] self | UseUseExplosion.rb:21:1505:21:1509 | self |
 | UseUseExplosion.rb:21:1484:21:1488 | [post] self | UseUseExplosion.rb:21:2571:21:2576 | self |
 | UseUseExplosion.rb:21:1484:21:1488 | self | UseUseExplosion.rb:21:1505:21:1509 | self |
 | UseUseExplosion.rb:21:1484:21:1488 | self | UseUseExplosion.rb:21:2571:21:2576 | self |
-| UseUseExplosion.rb:21:1484:21:1493 | ... > ... | UseUseExplosion.rb:21:1483:21:1494 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1484:21:1493 | ... > ... | UseUseExplosion.rb:21:1483:21:1494 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1484:21:1493 | ... > ... | UseUseExplosion.rb:21:1483:21:1494 | ( ... ) |
 | UseUseExplosion.rb:21:1496:21:2564 | then ... | UseUseExplosion.rb:21:1480:21:2580 | if ... |
 | UseUseExplosion.rb:21:1501:21:2564 | if ... | UseUseExplosion.rb:21:1496:21:2564 | then ... |
 | UseUseExplosion.rb:21:1505:21:1509 | [post] self | UseUseExplosion.rb:21:1526:21:1530 | self |
 | UseUseExplosion.rb:21:1505:21:1509 | [post] self | UseUseExplosion.rb:21:2555:21:2560 | self |
 | UseUseExplosion.rb:21:1505:21:1509 | self | UseUseExplosion.rb:21:1526:21:1530 | self |
 | UseUseExplosion.rb:21:1505:21:1509 | self | UseUseExplosion.rb:21:2555:21:2560 | self |
-| UseUseExplosion.rb:21:1505:21:1514 | ... > ... | UseUseExplosion.rb:21:1504:21:1515 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1505:21:1514 | ... > ... | UseUseExplosion.rb:21:1504:21:1515 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1505:21:1514 | ... > ... | UseUseExplosion.rb:21:1504:21:1515 | ( ... ) |
 | UseUseExplosion.rb:21:1517:21:2548 | then ... | UseUseExplosion.rb:21:1501:21:2564 | if ... |
 | UseUseExplosion.rb:21:1522:21:2548 | if ... | UseUseExplosion.rb:21:1517:21:2548 | then ... |
 | UseUseExplosion.rb:21:1526:21:1530 | [post] self | UseUseExplosion.rb:21:1547:21:1551 | self |
 | UseUseExplosion.rb:21:1526:21:1530 | [post] self | UseUseExplosion.rb:21:2539:21:2544 | self |
 | UseUseExplosion.rb:21:1526:21:1530 | self | UseUseExplosion.rb:21:1547:21:1551 | self |
 | UseUseExplosion.rb:21:1526:21:1530 | self | UseUseExplosion.rb:21:2539:21:2544 | self |
-| UseUseExplosion.rb:21:1526:21:1535 | ... > ... | UseUseExplosion.rb:21:1525:21:1536 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1526:21:1535 | ... > ... | UseUseExplosion.rb:21:1525:21:1536 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1526:21:1535 | ... > ... | UseUseExplosion.rb:21:1525:21:1536 | ( ... ) |
 | UseUseExplosion.rb:21:1538:21:2532 | then ... | UseUseExplosion.rb:21:1522:21:2548 | if ... |
 | UseUseExplosion.rb:21:1543:21:2532 | if ... | UseUseExplosion.rb:21:1538:21:2532 | then ... |
 | UseUseExplosion.rb:21:1547:21:1551 | [post] self | UseUseExplosion.rb:21:1568:21:1572 | self |
 | UseUseExplosion.rb:21:1547:21:1551 | [post] self | UseUseExplosion.rb:21:2523:21:2528 | self |
 | UseUseExplosion.rb:21:1547:21:1551 | self | UseUseExplosion.rb:21:1568:21:1572 | self |
 | UseUseExplosion.rb:21:1547:21:1551 | self | UseUseExplosion.rb:21:2523:21:2528 | self |
-| UseUseExplosion.rb:21:1547:21:1556 | ... > ... | UseUseExplosion.rb:21:1546:21:1557 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1547:21:1556 | ... > ... | UseUseExplosion.rb:21:1546:21:1557 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1547:21:1556 | ... > ... | UseUseExplosion.rb:21:1546:21:1557 | ( ... ) |
 | UseUseExplosion.rb:21:1559:21:2516 | then ... | UseUseExplosion.rb:21:1543:21:2532 | if ... |
 | UseUseExplosion.rb:21:1564:21:2516 | if ... | UseUseExplosion.rb:21:1559:21:2516 | then ... |
 | UseUseExplosion.rb:21:1568:21:1572 | [post] self | UseUseExplosion.rb:21:1589:21:1593 | self |
 | UseUseExplosion.rb:21:1568:21:1572 | [post] self | UseUseExplosion.rb:21:2507:21:2512 | self |
 | UseUseExplosion.rb:21:1568:21:1572 | self | UseUseExplosion.rb:21:1589:21:1593 | self |
 | UseUseExplosion.rb:21:1568:21:1572 | self | UseUseExplosion.rb:21:2507:21:2512 | self |
-| UseUseExplosion.rb:21:1568:21:1577 | ... > ... | UseUseExplosion.rb:21:1567:21:1578 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1568:21:1577 | ... > ... | UseUseExplosion.rb:21:1567:21:1578 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1568:21:1577 | ... > ... | UseUseExplosion.rb:21:1567:21:1578 | ( ... ) |
 | UseUseExplosion.rb:21:1580:21:2500 | then ... | UseUseExplosion.rb:21:1564:21:2516 | if ... |
 | UseUseExplosion.rb:21:1585:21:2500 | if ... | UseUseExplosion.rb:21:1580:21:2500 | then ... |
 | UseUseExplosion.rb:21:1589:21:1593 | [post] self | UseUseExplosion.rb:21:1610:21:1614 | self |
 | UseUseExplosion.rb:21:1589:21:1593 | [post] self | UseUseExplosion.rb:21:2491:21:2496 | self |
 | UseUseExplosion.rb:21:1589:21:1593 | self | UseUseExplosion.rb:21:1610:21:1614 | self |
 | UseUseExplosion.rb:21:1589:21:1593 | self | UseUseExplosion.rb:21:2491:21:2496 | self |
-| UseUseExplosion.rb:21:1589:21:1598 | ... > ... | UseUseExplosion.rb:21:1588:21:1599 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1589:21:1598 | ... > ... | UseUseExplosion.rb:21:1588:21:1599 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1589:21:1598 | ... > ... | UseUseExplosion.rb:21:1588:21:1599 | ( ... ) |
 | UseUseExplosion.rb:21:1601:21:2484 | then ... | UseUseExplosion.rb:21:1585:21:2500 | if ... |
 | UseUseExplosion.rb:21:1606:21:2484 | if ... | UseUseExplosion.rb:21:1601:21:2484 | then ... |
 | UseUseExplosion.rb:21:1610:21:1614 | [post] self | UseUseExplosion.rb:21:1631:21:1635 | self |
 | UseUseExplosion.rb:21:1610:21:1614 | [post] self | UseUseExplosion.rb:21:2475:21:2480 | self |
 | UseUseExplosion.rb:21:1610:21:1614 | self | UseUseExplosion.rb:21:1631:21:1635 | self |
 | UseUseExplosion.rb:21:1610:21:1614 | self | UseUseExplosion.rb:21:2475:21:2480 | self |
-| UseUseExplosion.rb:21:1610:21:1619 | ... > ... | UseUseExplosion.rb:21:1609:21:1620 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1610:21:1619 | ... > ... | UseUseExplosion.rb:21:1609:21:1620 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1610:21:1619 | ... > ... | UseUseExplosion.rb:21:1609:21:1620 | ( ... ) |
 | UseUseExplosion.rb:21:1622:21:2468 | then ... | UseUseExplosion.rb:21:1606:21:2484 | if ... |
 | UseUseExplosion.rb:21:1627:21:2468 | if ... | UseUseExplosion.rb:21:1622:21:2468 | then ... |
 | UseUseExplosion.rb:21:1631:21:1635 | [post] self | UseUseExplosion.rb:21:1652:21:1656 | self |
 | UseUseExplosion.rb:21:1631:21:1635 | [post] self | UseUseExplosion.rb:21:2459:21:2464 | self |
 | UseUseExplosion.rb:21:1631:21:1635 | self | UseUseExplosion.rb:21:1652:21:1656 | self |
 | UseUseExplosion.rb:21:1631:21:1635 | self | UseUseExplosion.rb:21:2459:21:2464 | self |
-| UseUseExplosion.rb:21:1631:21:1640 | ... > ... | UseUseExplosion.rb:21:1630:21:1641 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1631:21:1640 | ... > ... | UseUseExplosion.rb:21:1630:21:1641 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1631:21:1640 | ... > ... | UseUseExplosion.rb:21:1630:21:1641 | ( ... ) |
 | UseUseExplosion.rb:21:1643:21:2452 | then ... | UseUseExplosion.rb:21:1627:21:2468 | if ... |
 | UseUseExplosion.rb:21:1648:21:2452 | if ... | UseUseExplosion.rb:21:1643:21:2452 | then ... |
 | UseUseExplosion.rb:21:1652:21:1656 | [post] self | UseUseExplosion.rb:21:1673:21:1677 | self |
 | UseUseExplosion.rb:21:1652:21:1656 | [post] self | UseUseExplosion.rb:21:2443:21:2448 | self |
 | UseUseExplosion.rb:21:1652:21:1656 | self | UseUseExplosion.rb:21:1673:21:1677 | self |
 | UseUseExplosion.rb:21:1652:21:1656 | self | UseUseExplosion.rb:21:2443:21:2448 | self |
-| UseUseExplosion.rb:21:1652:21:1661 | ... > ... | UseUseExplosion.rb:21:1651:21:1662 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1652:21:1661 | ... > ... | UseUseExplosion.rb:21:1651:21:1662 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1652:21:1661 | ... > ... | UseUseExplosion.rb:21:1651:21:1662 | ( ... ) |
 | UseUseExplosion.rb:21:1664:21:2436 | then ... | UseUseExplosion.rb:21:1648:21:2452 | if ... |
 | UseUseExplosion.rb:21:1669:21:2436 | if ... | UseUseExplosion.rb:21:1664:21:2436 | then ... |
 | UseUseExplosion.rb:21:1673:21:1677 | [post] self | UseUseExplosion.rb:21:1694:21:1698 | self |
 | UseUseExplosion.rb:21:1673:21:1677 | [post] self | UseUseExplosion.rb:21:2427:21:2432 | self |
 | UseUseExplosion.rb:21:1673:21:1677 | self | UseUseExplosion.rb:21:1694:21:1698 | self |
 | UseUseExplosion.rb:21:1673:21:1677 | self | UseUseExplosion.rb:21:2427:21:2432 | self |
-| UseUseExplosion.rb:21:1673:21:1682 | ... > ... | UseUseExplosion.rb:21:1672:21:1683 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1673:21:1682 | ... > ... | UseUseExplosion.rb:21:1672:21:1683 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1673:21:1682 | ... > ... | UseUseExplosion.rb:21:1672:21:1683 | ( ... ) |
 | UseUseExplosion.rb:21:1685:21:2420 | then ... | UseUseExplosion.rb:21:1669:21:2436 | if ... |
 | UseUseExplosion.rb:21:1690:21:2420 | if ... | UseUseExplosion.rb:21:1685:21:2420 | then ... |
 | UseUseExplosion.rb:21:1694:21:1698 | [post] self | UseUseExplosion.rb:21:1715:21:1719 | self |
 | UseUseExplosion.rb:21:1694:21:1698 | [post] self | UseUseExplosion.rb:21:2411:21:2416 | self |
 | UseUseExplosion.rb:21:1694:21:1698 | self | UseUseExplosion.rb:21:1715:21:1719 | self |
 | UseUseExplosion.rb:21:1694:21:1698 | self | UseUseExplosion.rb:21:2411:21:2416 | self |
-| UseUseExplosion.rb:21:1694:21:1703 | ... > ... | UseUseExplosion.rb:21:1693:21:1704 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1694:21:1703 | ... > ... | UseUseExplosion.rb:21:1693:21:1704 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1694:21:1703 | ... > ... | UseUseExplosion.rb:21:1693:21:1704 | ( ... ) |
 | UseUseExplosion.rb:21:1706:21:2404 | then ... | UseUseExplosion.rb:21:1690:21:2420 | if ... |
 | UseUseExplosion.rb:21:1711:21:2404 | if ... | UseUseExplosion.rb:21:1706:21:2404 | then ... |
 | UseUseExplosion.rb:21:1715:21:1719 | [post] self | UseUseExplosion.rb:21:1736:21:1740 | self |
 | UseUseExplosion.rb:21:1715:21:1719 | [post] self | UseUseExplosion.rb:21:2395:21:2400 | self |
 | UseUseExplosion.rb:21:1715:21:1719 | self | UseUseExplosion.rb:21:1736:21:1740 | self |
 | UseUseExplosion.rb:21:1715:21:1719 | self | UseUseExplosion.rb:21:2395:21:2400 | self |
-| UseUseExplosion.rb:21:1715:21:1724 | ... > ... | UseUseExplosion.rb:21:1714:21:1725 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1715:21:1724 | ... > ... | UseUseExplosion.rb:21:1714:21:1725 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1715:21:1724 | ... > ... | UseUseExplosion.rb:21:1714:21:1725 | ( ... ) |
 | UseUseExplosion.rb:21:1727:21:2388 | then ... | UseUseExplosion.rb:21:1711:21:2404 | if ... |
 | UseUseExplosion.rb:21:1732:21:2388 | if ... | UseUseExplosion.rb:21:1727:21:2388 | then ... |
 | UseUseExplosion.rb:21:1736:21:1740 | [post] self | UseUseExplosion.rb:21:1757:21:1761 | self |
 | UseUseExplosion.rb:21:1736:21:1740 | [post] self | UseUseExplosion.rb:21:2379:21:2384 | self |
 | UseUseExplosion.rb:21:1736:21:1740 | self | UseUseExplosion.rb:21:1757:21:1761 | self |
 | UseUseExplosion.rb:21:1736:21:1740 | self | UseUseExplosion.rb:21:2379:21:2384 | self |
-| UseUseExplosion.rb:21:1736:21:1745 | ... > ... | UseUseExplosion.rb:21:1735:21:1746 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1736:21:1745 | ... > ... | UseUseExplosion.rb:21:1735:21:1746 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1736:21:1745 | ... > ... | UseUseExplosion.rb:21:1735:21:1746 | ( ... ) |
 | UseUseExplosion.rb:21:1748:21:2372 | then ... | UseUseExplosion.rb:21:1732:21:2388 | if ... |
 | UseUseExplosion.rb:21:1753:21:2372 | if ... | UseUseExplosion.rb:21:1748:21:2372 | then ... |
 | UseUseExplosion.rb:21:1757:21:1761 | [post] self | UseUseExplosion.rb:21:1778:21:1782 | self |
 | UseUseExplosion.rb:21:1757:21:1761 | [post] self | UseUseExplosion.rb:21:2363:21:2368 | self |
 | UseUseExplosion.rb:21:1757:21:1761 | self | UseUseExplosion.rb:21:1778:21:1782 | self |
 | UseUseExplosion.rb:21:1757:21:1761 | self | UseUseExplosion.rb:21:2363:21:2368 | self |
-| UseUseExplosion.rb:21:1757:21:1766 | ... > ... | UseUseExplosion.rb:21:1756:21:1767 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1757:21:1766 | ... > ... | UseUseExplosion.rb:21:1756:21:1767 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1757:21:1766 | ... > ... | UseUseExplosion.rb:21:1756:21:1767 | ( ... ) |
 | UseUseExplosion.rb:21:1769:21:2356 | then ... | UseUseExplosion.rb:21:1753:21:2372 | if ... |
 | UseUseExplosion.rb:21:1774:21:2356 | if ... | UseUseExplosion.rb:21:1769:21:2356 | then ... |
 | UseUseExplosion.rb:21:1778:21:1782 | [post] self | UseUseExplosion.rb:21:1799:21:1803 | self |
 | UseUseExplosion.rb:21:1778:21:1782 | [post] self | UseUseExplosion.rb:21:2347:21:2352 | self |
 | UseUseExplosion.rb:21:1778:21:1782 | self | UseUseExplosion.rb:21:1799:21:1803 | self |
 | UseUseExplosion.rb:21:1778:21:1782 | self | UseUseExplosion.rb:21:2347:21:2352 | self |
-| UseUseExplosion.rb:21:1778:21:1787 | ... > ... | UseUseExplosion.rb:21:1777:21:1788 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1778:21:1787 | ... > ... | UseUseExplosion.rb:21:1777:21:1788 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1778:21:1787 | ... > ... | UseUseExplosion.rb:21:1777:21:1788 | ( ... ) |
 | UseUseExplosion.rb:21:1790:21:2340 | then ... | UseUseExplosion.rb:21:1774:21:2356 | if ... |
 | UseUseExplosion.rb:21:1795:21:2340 | if ... | UseUseExplosion.rb:21:1790:21:2340 | then ... |
 | UseUseExplosion.rb:21:1799:21:1803 | [post] self | UseUseExplosion.rb:21:1820:21:1824 | self |
 | UseUseExplosion.rb:21:1799:21:1803 | [post] self | UseUseExplosion.rb:21:2331:21:2336 | self |
 | UseUseExplosion.rb:21:1799:21:1803 | self | UseUseExplosion.rb:21:1820:21:1824 | self |
 | UseUseExplosion.rb:21:1799:21:1803 | self | UseUseExplosion.rb:21:2331:21:2336 | self |
-| UseUseExplosion.rb:21:1799:21:1808 | ... > ... | UseUseExplosion.rb:21:1798:21:1809 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1799:21:1808 | ... > ... | UseUseExplosion.rb:21:1798:21:1809 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1799:21:1808 | ... > ... | UseUseExplosion.rb:21:1798:21:1809 | ( ... ) |
 | UseUseExplosion.rb:21:1811:21:2324 | then ... | UseUseExplosion.rb:21:1795:21:2340 | if ... |
 | UseUseExplosion.rb:21:1816:21:2324 | if ... | UseUseExplosion.rb:21:1811:21:2324 | then ... |
 | UseUseExplosion.rb:21:1820:21:1824 | [post] self | UseUseExplosion.rb:21:1841:21:1845 | self |
 | UseUseExplosion.rb:21:1820:21:1824 | [post] self | UseUseExplosion.rb:21:2315:21:2320 | self |
 | UseUseExplosion.rb:21:1820:21:1824 | self | UseUseExplosion.rb:21:1841:21:1845 | self |
 | UseUseExplosion.rb:21:1820:21:1824 | self | UseUseExplosion.rb:21:2315:21:2320 | self |
-| UseUseExplosion.rb:21:1820:21:1829 | ... > ... | UseUseExplosion.rb:21:1819:21:1830 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1820:21:1829 | ... > ... | UseUseExplosion.rb:21:1819:21:1830 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1820:21:1829 | ... > ... | UseUseExplosion.rb:21:1819:21:1830 | ( ... ) |
 | UseUseExplosion.rb:21:1832:21:2308 | then ... | UseUseExplosion.rb:21:1816:21:2324 | if ... |
 | UseUseExplosion.rb:21:1837:21:2308 | if ... | UseUseExplosion.rb:21:1832:21:2308 | then ... |
 | UseUseExplosion.rb:21:1841:21:1845 | [post] self | UseUseExplosion.rb:21:1862:21:1866 | self |
 | UseUseExplosion.rb:21:1841:21:1845 | [post] self | UseUseExplosion.rb:21:2299:21:2304 | self |
 | UseUseExplosion.rb:21:1841:21:1845 | self | UseUseExplosion.rb:21:1862:21:1866 | self |
 | UseUseExplosion.rb:21:1841:21:1845 | self | UseUseExplosion.rb:21:2299:21:2304 | self |
-| UseUseExplosion.rb:21:1841:21:1850 | ... > ... | UseUseExplosion.rb:21:1840:21:1851 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1841:21:1850 | ... > ... | UseUseExplosion.rb:21:1840:21:1851 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1841:21:1850 | ... > ... | UseUseExplosion.rb:21:1840:21:1851 | ( ... ) |
 | UseUseExplosion.rb:21:1853:21:2292 | then ... | UseUseExplosion.rb:21:1837:21:2308 | if ... |
 | UseUseExplosion.rb:21:1858:21:2292 | if ... | UseUseExplosion.rb:21:1853:21:2292 | then ... |
 | UseUseExplosion.rb:21:1862:21:1866 | [post] self | UseUseExplosion.rb:21:1883:21:1887 | self |
 | UseUseExplosion.rb:21:1862:21:1866 | [post] self | UseUseExplosion.rb:21:2283:21:2288 | self |
 | UseUseExplosion.rb:21:1862:21:1866 | self | UseUseExplosion.rb:21:1883:21:1887 | self |
 | UseUseExplosion.rb:21:1862:21:1866 | self | UseUseExplosion.rb:21:2283:21:2288 | self |
-| UseUseExplosion.rb:21:1862:21:1871 | ... > ... | UseUseExplosion.rb:21:1861:21:1872 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1862:21:1871 | ... > ... | UseUseExplosion.rb:21:1861:21:1872 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1862:21:1871 | ... > ... | UseUseExplosion.rb:21:1861:21:1872 | ( ... ) |
 | UseUseExplosion.rb:21:1874:21:2276 | then ... | UseUseExplosion.rb:21:1858:21:2292 | if ... |
 | UseUseExplosion.rb:21:1879:21:2276 | if ... | UseUseExplosion.rb:21:1874:21:2276 | then ... |
 | UseUseExplosion.rb:21:1883:21:1887 | [post] self | UseUseExplosion.rb:21:1904:21:1908 | self |
 | UseUseExplosion.rb:21:1883:21:1887 | [post] self | UseUseExplosion.rb:21:2267:21:2272 | self |
 | UseUseExplosion.rb:21:1883:21:1887 | self | UseUseExplosion.rb:21:1904:21:1908 | self |
 | UseUseExplosion.rb:21:1883:21:1887 | self | UseUseExplosion.rb:21:2267:21:2272 | self |
-| UseUseExplosion.rb:21:1883:21:1892 | ... > ... | UseUseExplosion.rb:21:1882:21:1893 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1883:21:1892 | ... > ... | UseUseExplosion.rb:21:1882:21:1893 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1883:21:1892 | ... > ... | UseUseExplosion.rb:21:1882:21:1893 | ( ... ) |
 | UseUseExplosion.rb:21:1895:21:2260 | then ... | UseUseExplosion.rb:21:1879:21:2276 | if ... |
 | UseUseExplosion.rb:21:1900:21:2260 | if ... | UseUseExplosion.rb:21:1895:21:2260 | then ... |
 | UseUseExplosion.rb:21:1904:21:1908 | [post] self | UseUseExplosion.rb:21:1925:21:1929 | self |
 | UseUseExplosion.rb:21:1904:21:1908 | [post] self | UseUseExplosion.rb:21:2251:21:2256 | self |
 | UseUseExplosion.rb:21:1904:21:1908 | self | UseUseExplosion.rb:21:1925:21:1929 | self |
 | UseUseExplosion.rb:21:1904:21:1908 | self | UseUseExplosion.rb:21:2251:21:2256 | self |
-| UseUseExplosion.rb:21:1904:21:1913 | ... > ... | UseUseExplosion.rb:21:1903:21:1914 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1904:21:1913 | ... > ... | UseUseExplosion.rb:21:1903:21:1914 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1904:21:1913 | ... > ... | UseUseExplosion.rb:21:1903:21:1914 | ( ... ) |
 | UseUseExplosion.rb:21:1916:21:2244 | then ... | UseUseExplosion.rb:21:1900:21:2260 | if ... |
 | UseUseExplosion.rb:21:1921:21:2244 | if ... | UseUseExplosion.rb:21:1916:21:2244 | then ... |
 | UseUseExplosion.rb:21:1925:21:1929 | [post] self | UseUseExplosion.rb:21:1945:21:1949 | self |
 | UseUseExplosion.rb:21:1925:21:1929 | [post] self | UseUseExplosion.rb:21:2235:21:2240 | self |
 | UseUseExplosion.rb:21:1925:21:1929 | self | UseUseExplosion.rb:21:1945:21:1949 | self |
 | UseUseExplosion.rb:21:1925:21:1929 | self | UseUseExplosion.rb:21:2235:21:2240 | self |
-| UseUseExplosion.rb:21:1925:21:1933 | ... > ... | UseUseExplosion.rb:21:1924:21:1934 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1925:21:1933 | ... > ... | UseUseExplosion.rb:21:1924:21:1934 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1925:21:1933 | ... > ... | UseUseExplosion.rb:21:1924:21:1934 | ( ... ) |
 | UseUseExplosion.rb:21:1936:21:2228 | then ... | UseUseExplosion.rb:21:1921:21:2244 | if ... |
 | UseUseExplosion.rb:21:1941:21:2228 | if ... | UseUseExplosion.rb:21:1936:21:2228 | then ... |
 | UseUseExplosion.rb:21:1945:21:1949 | [post] self | UseUseExplosion.rb:21:1965:21:1969 | self |
 | UseUseExplosion.rb:21:1945:21:1949 | [post] self | UseUseExplosion.rb:21:2219:21:2224 | self |
 | UseUseExplosion.rb:21:1945:21:1949 | self | UseUseExplosion.rb:21:1965:21:1969 | self |
 | UseUseExplosion.rb:21:1945:21:1949 | self | UseUseExplosion.rb:21:2219:21:2224 | self |
-| UseUseExplosion.rb:21:1945:21:1953 | ... > ... | UseUseExplosion.rb:21:1944:21:1954 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1945:21:1953 | ... > ... | UseUseExplosion.rb:21:1944:21:1954 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1945:21:1953 | ... > ... | UseUseExplosion.rb:21:1944:21:1954 | ( ... ) |
 | UseUseExplosion.rb:21:1956:21:2212 | then ... | UseUseExplosion.rb:21:1941:21:2228 | if ... |
 | UseUseExplosion.rb:21:1961:21:2212 | if ... | UseUseExplosion.rb:21:1956:21:2212 | then ... |
 | UseUseExplosion.rb:21:1965:21:1969 | [post] self | UseUseExplosion.rb:21:1985:21:1989 | self |
 | UseUseExplosion.rb:21:1965:21:1969 | [post] self | UseUseExplosion.rb:21:2203:21:2208 | self |
 | UseUseExplosion.rb:21:1965:21:1969 | self | UseUseExplosion.rb:21:1985:21:1989 | self |
 | UseUseExplosion.rb:21:1965:21:1969 | self | UseUseExplosion.rb:21:2203:21:2208 | self |
-| UseUseExplosion.rb:21:1965:21:1973 | ... > ... | UseUseExplosion.rb:21:1964:21:1974 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1965:21:1973 | ... > ... | UseUseExplosion.rb:21:1964:21:1974 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1965:21:1973 | ... > ... | UseUseExplosion.rb:21:1964:21:1974 | ( ... ) |
 | UseUseExplosion.rb:21:1976:21:2196 | then ... | UseUseExplosion.rb:21:1961:21:2212 | if ... |
 | UseUseExplosion.rb:21:1981:21:2196 | if ... | UseUseExplosion.rb:21:1976:21:2196 | then ... |
 | UseUseExplosion.rb:21:1985:21:1989 | [post] self | UseUseExplosion.rb:21:2005:21:2009 | self |
 | UseUseExplosion.rb:21:1985:21:1989 | [post] self | UseUseExplosion.rb:21:2187:21:2192 | self |
 | UseUseExplosion.rb:21:1985:21:1989 | self | UseUseExplosion.rb:21:2005:21:2009 | self |
 | UseUseExplosion.rb:21:1985:21:1989 | self | UseUseExplosion.rb:21:2187:21:2192 | self |
-| UseUseExplosion.rb:21:1985:21:1993 | ... > ... | UseUseExplosion.rb:21:1984:21:1994 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1985:21:1993 | ... > ... | UseUseExplosion.rb:21:1984:21:1994 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1985:21:1993 | ... > ... | UseUseExplosion.rb:21:1984:21:1994 | ( ... ) |
 | UseUseExplosion.rb:21:1996:21:2180 | then ... | UseUseExplosion.rb:21:1981:21:2196 | if ... |
 | UseUseExplosion.rb:21:2001:21:2180 | if ... | UseUseExplosion.rb:21:1996:21:2180 | then ... |
 | UseUseExplosion.rb:21:2005:21:2009 | [post] self | UseUseExplosion.rb:21:2025:21:2029 | self |
 | UseUseExplosion.rb:21:2005:21:2009 | [post] self | UseUseExplosion.rb:21:2171:21:2176 | self |
 | UseUseExplosion.rb:21:2005:21:2009 | self | UseUseExplosion.rb:21:2025:21:2029 | self |
 | UseUseExplosion.rb:21:2005:21:2009 | self | UseUseExplosion.rb:21:2171:21:2176 | self |
-| UseUseExplosion.rb:21:2005:21:2013 | ... > ... | UseUseExplosion.rb:21:2004:21:2014 | [false] ( ... ) |
-| UseUseExplosion.rb:21:2005:21:2013 | ... > ... | UseUseExplosion.rb:21:2004:21:2014 | [true] ( ... ) |
+| UseUseExplosion.rb:21:2005:21:2013 | ... > ... | UseUseExplosion.rb:21:2004:21:2014 | ( ... ) |
 | UseUseExplosion.rb:21:2016:21:2164 | then ... | UseUseExplosion.rb:21:2001:21:2180 | if ... |
 | UseUseExplosion.rb:21:2021:21:2164 | if ... | UseUseExplosion.rb:21:2016:21:2164 | then ... |
 | UseUseExplosion.rb:21:2025:21:2029 | [post] self | UseUseExplosion.rb:21:2045:21:2049 | self |
 | UseUseExplosion.rb:21:2025:21:2029 | [post] self | UseUseExplosion.rb:21:2155:21:2160 | self |
 | UseUseExplosion.rb:21:2025:21:2029 | self | UseUseExplosion.rb:21:2045:21:2049 | self |
 | UseUseExplosion.rb:21:2025:21:2029 | self | UseUseExplosion.rb:21:2155:21:2160 | self |
-| UseUseExplosion.rb:21:2025:21:2033 | ... > ... | UseUseExplosion.rb:21:2024:21:2034 | [false] ( ... ) |
-| UseUseExplosion.rb:21:2025:21:2033 | ... > ... | UseUseExplosion.rb:21:2024:21:2034 | [true] ( ... ) |
+| UseUseExplosion.rb:21:2025:21:2033 | ... > ... | UseUseExplosion.rb:21:2024:21:2034 | ( ... ) |
 | UseUseExplosion.rb:21:2036:21:2148 | then ... | UseUseExplosion.rb:21:2021:21:2164 | if ... |
 | UseUseExplosion.rb:21:2041:21:2148 | if ... | UseUseExplosion.rb:21:2036:21:2148 | then ... |
 | UseUseExplosion.rb:21:2045:21:2049 | [post] self | UseUseExplosion.rb:21:2065:21:2069 | self |
 | UseUseExplosion.rb:21:2045:21:2049 | [post] self | UseUseExplosion.rb:21:2139:21:2144 | self |
 | UseUseExplosion.rb:21:2045:21:2049 | self | UseUseExplosion.rb:21:2065:21:2069 | self |
 | UseUseExplosion.rb:21:2045:21:2049 | self | UseUseExplosion.rb:21:2139:21:2144 | self |
-| UseUseExplosion.rb:21:2045:21:2053 | ... > ... | UseUseExplosion.rb:21:2044:21:2054 | [false] ( ... ) |
-| UseUseExplosion.rb:21:2045:21:2053 | ... > ... | UseUseExplosion.rb:21:2044:21:2054 | [true] ( ... ) |
+| UseUseExplosion.rb:21:2045:21:2053 | ... > ... | UseUseExplosion.rb:21:2044:21:2054 | ( ... ) |
 | UseUseExplosion.rb:21:2056:21:2132 | then ... | UseUseExplosion.rb:21:2041:21:2148 | if ... |
 | UseUseExplosion.rb:21:2061:21:2132 | if ... | UseUseExplosion.rb:21:2056:21:2132 | then ... |
 | UseUseExplosion.rb:21:2065:21:2069 | [post] self | UseUseExplosion.rb:21:2085:21:2089 | self |
 | UseUseExplosion.rb:21:2065:21:2069 | [post] self | UseUseExplosion.rb:21:2123:21:2128 | self |
 | UseUseExplosion.rb:21:2065:21:2069 | self | UseUseExplosion.rb:21:2085:21:2089 | self |
 | UseUseExplosion.rb:21:2065:21:2069 | self | UseUseExplosion.rb:21:2123:21:2128 | self |
-| UseUseExplosion.rb:21:2065:21:2073 | ... > ... | UseUseExplosion.rb:21:2064:21:2074 | [false] ( ... ) |
-| UseUseExplosion.rb:21:2065:21:2073 | ... > ... | UseUseExplosion.rb:21:2064:21:2074 | [true] ( ... ) |
+| UseUseExplosion.rb:21:2065:21:2073 | ... > ... | UseUseExplosion.rb:21:2064:21:2074 | ( ... ) |
 | UseUseExplosion.rb:21:2076:21:2116 | then ... | UseUseExplosion.rb:21:2061:21:2132 | if ... |
 | UseUseExplosion.rb:21:2081:21:2116 | if ... | UseUseExplosion.rb:21:2076:21:2116 | then ... |
 | UseUseExplosion.rb:21:2085:21:2089 | [post] self | UseUseExplosion.rb:21:2107:21:2112 | self |
 | UseUseExplosion.rb:21:2085:21:2089 | self | UseUseExplosion.rb:21:2107:21:2112 | self |
-| UseUseExplosion.rb:21:2085:21:2093 | ... > ... | UseUseExplosion.rb:21:2084:21:2094 | [false] ( ... ) |
-| UseUseExplosion.rb:21:2085:21:2093 | ... > ... | UseUseExplosion.rb:21:2084:21:2094 | [true] ( ... ) |
+| UseUseExplosion.rb:21:2085:21:2093 | ... > ... | UseUseExplosion.rb:21:2084:21:2094 | ( ... ) |
 | UseUseExplosion.rb:21:2096:21:2099 | then ... | UseUseExplosion.rb:21:2081:21:2116 | if ... |
 | UseUseExplosion.rb:21:2102:21:2112 | else ... | UseUseExplosion.rb:21:2081:21:2116 | if ... |
 | UseUseExplosion.rb:21:2107:21:2112 | call to use | UseUseExplosion.rb:21:2102:21:2112 | else ... |
@@ -2504,9 +2305,9 @@
 | UseUseExplosion.rb:24:5:25:7 | use | UseUseExplosion.rb:1:1:26:3 | C |
 | local_dataflow.rb:1:1:7:3 | self (foo) | local_dataflow.rb:3:8:3:10 | self |
 | local_dataflow.rb:1:1:7:3 | self in foo | local_dataflow.rb:1:1:7:3 | self (foo) |
-| local_dataflow.rb:1:1:150:3 | <uninitialized> x | local_dataflow.rb:10:9:10:9 | x |
-| local_dataflow.rb:1:1:150:3 | self (local_dataflow.rb) | local_dataflow.rb:49:1:53:3 | self |
-| local_dataflow.rb:1:1:150:3 | self in local_dataflow.rb | local_dataflow.rb:1:1:150:3 | self (local_dataflow.rb) |
+| local_dataflow.rb:1:1:174:4 | <uninitialized> x | local_dataflow.rb:10:9:10:9 | x |
+| local_dataflow.rb:1:1:174:4 | self (local_dataflow.rb) | local_dataflow.rb:49:1:53:3 | self |
+| local_dataflow.rb:1:1:174:4 | self in local_dataflow.rb | local_dataflow.rb:1:1:174:4 | self (local_dataflow.rb) |
 | local_dataflow.rb:1:9:1:9 | a | local_dataflow.rb:1:9:1:9 | a |
 | local_dataflow.rb:1:9:1:9 | a | local_dataflow.rb:2:7:2:7 | a |
 | local_dataflow.rb:2:3:2:3 | b | local_dataflow.rb:3:13:3:13 | b |
@@ -2525,6 +2326,7 @@
 | local_dataflow.rb:5:8:5:12 | ... = ... | local_dataflow.rb:5:7:5:13 | ( ... ) |
 | local_dataflow.rb:5:12:5:12 | a | local_dataflow.rb:5:8:5:12 | ... = ... |
 | local_dataflow.rb:5:12:5:12 | a | local_dataflow.rb:6:8:6:8 | a |
+| local_dataflow.rb:6:3:6:14 | ... = ... | local_dataflow.rb:2:3:6:14 | ... |
 | local_dataflow.rb:6:7:6:14 | ( ... ) | local_dataflow.rb:6:3:6:14 | ... = ... |
 | local_dataflow.rb:6:8:6:13 | ... = ... | local_dataflow.rb:6:7:6:14 | ( ... ) |
 | local_dataflow.rb:6:10:6:11 | ... + ... | local_dataflow.rb:6:8:6:13 | ... = ... |
@@ -2552,6 +2354,7 @@
 | local_dataflow.rb:10:14:10:18 | array | local_dataflow.rb:15:10:15:14 | array |
 | local_dataflow.rb:11:1:11:2 | [post] self | local_dataflow.rb:12:3:12:5 | self |
 | local_dataflow.rb:11:1:11:2 | self | local_dataflow.rb:12:3:12:5 | self |
+| local_dataflow.rb:12:3:12:5 | call to p | local_dataflow.rb:10:5:13:3 | ... |
 | local_dataflow.rb:15:1:17:3 | <captured exit> x | local_dataflow.rb:19:5:19:5 | x |
 | local_dataflow.rb:15:1:17:3 | __synth__0__1 | local_dataflow.rb:15:1:17:3 | ... = ... |
 | local_dataflow.rb:15:1:17:3 | __synth__0__1 | local_dataflow.rb:15:1:17:3 | __synth__0__1 |
@@ -2581,6 +2384,8 @@
 | local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:19:5:19:5 | [input] phi |
 | local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:19:5:19:5 | phi |
 | local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:20:6:20:6 | x |
+| local_dataflow.rb:20:3:20:25 | if ... | local_dataflow.rb:19:1:21:3 | ... |
+| local_dataflow.rb:20:12:20:21 | then ... | local_dataflow.rb:20:3:20:25 | if ... |
 | local_dataflow.rb:24:2:24:8 | break | local_dataflow.rb:23:1:25:3 | while ... |
 | local_dataflow.rb:24:8:24:8 | 5 | local_dataflow.rb:24:2:24:8 | break |
 | local_dataflow.rb:28:5:28:26 | M | local_dataflow.rb:28:1:28:26 | ... = ... |
@@ -2589,11 +2394,15 @@
 | local_dataflow.rb:30:14:30:20 | "class" | local_dataflow.rb:30:5:30:24 | C |
 | local_dataflow.rb:32:5:32:25 | bar | local_dataflow.rb:32:1:32:1 | x |
 | local_dataflow.rb:32:5:32:25 | bar | local_dataflow.rb:32:1:32:25 | ... = ... |
+| local_dataflow.rb:32:14:32:21 | "method" | local_dataflow.rb:32:14:32:21 | ... |
 | local_dataflow.rb:34:7:34:7 | x | local_dataflow.rb:34:7:34:7 | x |
 | local_dataflow.rb:34:7:34:7 | x | local_dataflow.rb:35:6:35:6 | x |
+| local_dataflow.rb:35:12:36:13 | then ... | local_dataflow.rb:35:3:37:5 | if ... |
 | local_dataflow.rb:36:13:36:13 | 7 | local_dataflow.rb:36:6:36:13 | return |
+| local_dataflow.rb:38:3:38:13 | "reachable" | local_dataflow.rb:35:3:38:13 | ... |
 | local_dataflow.rb:41:7:41:7 | x | local_dataflow.rb:41:7:41:7 | x |
 | local_dataflow.rb:41:7:41:7 | x | local_dataflow.rb:42:6:42:6 | x |
+| local_dataflow.rb:42:12:43:13 | then ... | local_dataflow.rb:42:3:44:5 | if ... |
 | local_dataflow.rb:43:13:43:13 | 7 | local_dataflow.rb:43:6:43:13 | return |
 | local_dataflow.rb:45:10:45:10 | 6 | local_dataflow.rb:45:3:45:10 | return |
 | local_dataflow.rb:49:1:53:3 | [post] self | local_dataflow.rb:55:1:55:14 | self |
@@ -2603,6 +2412,7 @@
 | local_dataflow.rb:50:18:50:18 | [post] x | local_dataflow.rb:51:20:51:20 | x |
 | local_dataflow.rb:50:18:50:18 | x | local_dataflow.rb:51:20:51:20 | x |
 | local_dataflow.rb:51:9:51:15 | "break" | local_dataflow.rb:51:3:51:15 | break |
+| local_dataflow.rb:52:3:52:10 | "normal" | local_dataflow.rb:50:3:52:10 | ... |
 | local_dataflow.rb:55:5:55:13 | synthetic splat argument | local_dataflow.rb:55:5:55:13 | call to [] |
 | local_dataflow.rb:60:1:90:3 | self (test_case) | local_dataflow.rb:78:12:78:20 | self |
 | local_dataflow.rb:60:1:90:3 | self in test_case | local_dataflow.rb:60:1:90:3 | self (test_case) |
@@ -2645,6 +2455,7 @@
 | local_dataflow.rb:78:12:78:20 | [post] self | local_dataflow.rb:82:7:82:13 | self |
 | local_dataflow.rb:78:12:78:20 | [post] self | local_dataflow.rb:85:22:85:28 | self |
 | local_dataflow.rb:78:12:78:20 | [post] self | local_dataflow.rb:86:28:86:34 | self |
+| local_dataflow.rb:78:12:78:20 | [post] self | local_dataflow.rb:87:5:87:48 | [input] SSA phi read(self) |
 | local_dataflow.rb:78:12:78:20 | [post] self | local_dataflow.rb:87:20:87:26 | self |
 | local_dataflow.rb:78:12:78:20 | call to source | local_dataflow.rb:79:13:79:13 | b |
 | local_dataflow.rb:78:12:78:20 | call to source | local_dataflow.rb:80:8:80:8 | a |
@@ -2653,6 +2464,7 @@
 | local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:82:7:82:13 | self |
 | local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:85:22:85:28 | self |
 | local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:86:28:86:34 | self |
+| local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:87:5:87:48 | [input] SSA phi read(self) |
 | local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:87:20:87:26 | self |
 | local_dataflow.rb:79:13:79:13 | b | local_dataflow.rb:79:25:79:25 | b |
 | local_dataflow.rb:79:15:79:45 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
@@ -2688,6 +2500,7 @@
 | local_dataflow.rb:86:28:86:34 | [post] self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:86:28:86:34 | call to sink | local_dataflow.rb:86:23:86:53 | then ... |
 | local_dataflow.rb:86:28:86:34 | self | local_dataflow.rb:89:3:89:9 | self |
+| local_dataflow.rb:87:5:87:48 | [input] SSA phi read(self) | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:87:10:87:10 | x | local_dataflow.rb:87:25:87:25 | x |
 | local_dataflow.rb:87:15:87:48 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
 | local_dataflow.rb:87:20:87:26 | [post] self | local_dataflow.rb:89:3:89:9 | self |
@@ -2695,6 +2508,7 @@
 | local_dataflow.rb:87:25:87:25 | [post] x | local_dataflow.rb:87:29:87:29 | x |
 | local_dataflow.rb:87:25:87:25 | x | local_dataflow.rb:87:29:87:29 | x |
 | local_dataflow.rb:87:29:87:29 | x | local_dataflow.rb:87:15:87:48 | then ... |
+| local_dataflow.rb:89:3:89:9 | call to sink | local_dataflow.rb:61:3:89:28 | ... |
 | local_dataflow.rb:92:1:109:3 | self (and_or) | local_dataflow.rb:93:7:93:15 | self |
 | local_dataflow.rb:92:1:109:3 | self in and_or | local_dataflow.rb:92:1:109:3 | self (and_or) |
 | local_dataflow.rb:93:3:93:3 | a | local_dataflow.rb:94:8:94:8 | a |
@@ -2784,6 +2598,7 @@
 | local_dataflow.rb:107:9:107:17 | [post] self | local_dataflow.rb:108:3:108:9 | self |
 | local_dataflow.rb:107:9:107:17 | call to source | local_dataflow.rb:107:5:107:7 | ... && ... |
 | local_dataflow.rb:107:9:107:17 | self | local_dataflow.rb:108:3:108:9 | self |
+| local_dataflow.rb:108:3:108:9 | call to sink | local_dataflow.rb:93:3:108:28 | ... |
 | local_dataflow.rb:111:1:114:3 | self (object_dup) | local_dataflow.rb:112:3:112:21 | self |
 | local_dataflow.rb:111:1:114:3 | self in object_dup | local_dataflow.rb:111:1:114:3 | self (object_dup) |
 | local_dataflow.rb:112:3:112:21 | [post] self | local_dataflow.rb:112:8:112:16 | self |
@@ -2792,6 +2607,7 @@
 | local_dataflow.rb:112:8:112:16 | call to source | local_dataflow.rb:112:8:112:20 | call to dup |
 | local_dataflow.rb:112:8:112:16 | self | local_dataflow.rb:113:3:113:25 | self |
 | local_dataflow.rb:113:3:113:25 | [post] self | local_dataflow.rb:113:8:113:16 | self |
+| local_dataflow.rb:113:3:113:25 | call to sink | local_dataflow.rb:112:3:113:44 | ... |
 | local_dataflow.rb:113:3:113:25 | self | local_dataflow.rb:113:8:113:16 | self |
 | local_dataflow.rb:113:8:113:16 | call to source | local_dataflow.rb:113:8:113:20 | call to dup |
 | local_dataflow.rb:113:8:113:20 | call to dup | local_dataflow.rb:113:8:113:24 | call to dup |
@@ -2808,25 +2624,31 @@
 | local_dataflow.rb:118:17:118:31 | <captured entry> self | local_dataflow.rb:118:23:118:29 | self |
 | local_dataflow.rb:118:20:118:20 | x | local_dataflow.rb:118:20:118:20 | x |
 | local_dataflow.rb:118:20:118:20 | x | local_dataflow.rb:118:28:118:28 | x |
+| local_dataflow.rb:118:23:118:29 | call to sink | local_dataflow.rb:118:23:118:29 | ... |
 | local_dataflow.rb:119:3:119:31 | [post] self | local_dataflow.rb:119:8:119:16 | self |
+| local_dataflow.rb:119:3:119:31 | call to sink | local_dataflow.rb:117:3:119:50 | ... |
 | local_dataflow.rb:119:3:119:31 | self | local_dataflow.rb:119:8:119:16 | self |
 | local_dataflow.rb:119:8:119:16 | call to source | local_dataflow.rb:119:8:119:23 | call to tap |
 | local_dataflow.rb:119:8:119:23 | call to tap | local_dataflow.rb:119:8:119:30 | call to tap |
 | local_dataflow.rb:122:1:124:3 | self (dup_tap) | local_dataflow.rb:123:3:123:50 | self |
 | local_dataflow.rb:122:1:124:3 | self in dup_tap | local_dataflow.rb:122:1:124:3 | self (dup_tap) |
 | local_dataflow.rb:123:3:123:50 | [post] self | local_dataflow.rb:123:8:123:16 | self |
+| local_dataflow.rb:123:3:123:50 | call to sink | local_dataflow.rb:123:3:123:70 | ... |
 | local_dataflow.rb:123:3:123:50 | self | local_dataflow.rb:123:8:123:16 | self |
 | local_dataflow.rb:123:8:123:16 | call to source | local_dataflow.rb:123:8:123:20 | call to dup |
 | local_dataflow.rb:123:8:123:20 | call to dup | local_dataflow.rb:123:8:123:45 | call to tap |
 | local_dataflow.rb:123:8:123:45 | call to tap | local_dataflow.rb:123:8:123:49 | call to dup |
 | local_dataflow.rb:123:26:123:45 | <captured entry> self | local_dataflow.rb:123:32:123:43 | self |
+| local_dataflow.rb:123:32:123:43 | call to puts | local_dataflow.rb:123:32:123:43 | ... |
 | local_dataflow.rb:126:1:128:3 | self (use) | local_dataflow.rb:127:3:127:8 | self |
 | local_dataflow.rb:126:1:128:3 | self in use | local_dataflow.rb:126:1:128:3 | self (use) |
+| local_dataflow.rb:127:3:127:8 | call to rand | local_dataflow.rb:127:3:127:8 | ... |
 | local_dataflow.rb:130:1:150:3 | self (use_use_madness) | local_dataflow.rb:132:6:132:11 | self |
 | local_dataflow.rb:130:1:150:3 | self in use_use_madness | local_dataflow.rb:130:1:150:3 | self (use_use_madness) |
 | local_dataflow.rb:131:3:131:3 | x | local_dataflow.rb:132:10:132:10 | x |
 | local_dataflow.rb:131:7:131:8 | "" | local_dataflow.rb:131:3:131:3 | x |
 | local_dataflow.rb:131:7:131:8 | "" | local_dataflow.rb:131:3:131:8 | ... = ... |
+| local_dataflow.rb:132:3:149:5 | if ... | local_dataflow.rb:131:3:149:5 | ... |
 | local_dataflow.rb:132:6:132:11 | [post] self | local_dataflow.rb:133:8:133:13 | self |
 | local_dataflow.rb:132:6:132:11 | self | local_dataflow.rb:133:8:133:13 | self |
 | local_dataflow.rb:132:10:132:10 | [post] x | local_dataflow.rb:133:12:133:12 | x |
@@ -2836,8 +2658,7 @@
 | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(x) | local_dataflow.rb:134:11:134:11 | x |
 | local_dataflow.rb:133:8:133:13 | [post] self | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:8:133:13 | [post] self | local_dataflow.rb:133:18:133:23 | self |
-| local_dataflow.rb:133:8:133:13 | call to use | local_dataflow.rb:133:8:133:23 | [false] ... \|\| ... |
-| local_dataflow.rb:133:8:133:13 | call to use | local_dataflow.rb:133:8:133:23 | [true] ... \|\| ... |
+| local_dataflow.rb:133:8:133:13 | call to use | local_dataflow.rb:133:8:133:23 | ... \|\| ... |
 | local_dataflow.rb:133:8:133:13 | self | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:8:133:13 | self | local_dataflow.rb:133:18:133:23 | self |
 | local_dataflow.rb:133:12:133:12 | [post] x | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(x) |
@@ -2848,8 +2669,7 @@
 | local_dataflow.rb:133:18:133:23 | [input] SSA phi read(x) | local_dataflow.rb:134:11:134:11 | x |
 | local_dataflow.rb:133:18:133:23 | [post] self | local_dataflow.rb:133:18:133:23 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:18:133:23 | [post] self | local_dataflow.rb:136:7:136:12 | self |
-| local_dataflow.rb:133:18:133:23 | call to use | local_dataflow.rb:133:8:133:23 | [false] ... \|\| ... |
-| local_dataflow.rb:133:18:133:23 | call to use | local_dataflow.rb:133:8:133:23 | [true] ... \|\| ... |
+| local_dataflow.rb:133:18:133:23 | call to use | local_dataflow.rb:133:8:133:23 | ... \|\| ... |
 | local_dataflow.rb:133:18:133:23 | self | local_dataflow.rb:133:18:133:23 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:18:133:23 | self | local_dataflow.rb:136:7:136:12 | self |
 | local_dataflow.rb:133:22:133:22 | [post] x | local_dataflow.rb:133:18:133:23 | [input] SSA phi read(x) |
@@ -2868,24 +2688,21 @@
 | local_dataflow.rb:136:11:136:11 | [post] x | local_dataflow.rb:137:14:137:14 | x |
 | local_dataflow.rb:136:11:136:11 | x | local_dataflow.rb:137:14:137:14 | x |
 | local_dataflow.rb:137:7:138:9 | if ... | local_dataflow.rb:135:5:138:9 | else ... |
-| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
-| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
+| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
+| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
 | local_dataflow.rb:137:10:137:15 | [post] self | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:10:137:15 | [post] self | local_dataflow.rb:137:21:137:26 | self |
 | local_dataflow.rb:137:10:137:15 | self | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:10:137:15 | self | local_dataflow.rb:137:21:137:26 | self |
 | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
-| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
-| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
 | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
 | local_dataflow.rb:137:14:137:14 | [post] x | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:14:137:14 | [post] x | local_dataflow.rb:137:25:137:25 | x |
 | local_dataflow.rb:137:14:137:14 | x | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:14:137:14 | x | local_dataflow.rb:137:25:137:25 | x |
-| local_dataflow.rb:137:20:137:26 | [false] ! ... | local_dataflow.rb:137:10:137:26 | [false] ... && ... |
-| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(self) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
-| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
-| local_dataflow.rb:137:20:137:26 | [true] ! ... | local_dataflow.rb:137:10:137:26 | [true] ... && ... |
+| local_dataflow.rb:137:20:137:26 | ! ... | local_dataflow.rb:137:10:137:26 | ... && ... |
+| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
+| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
 | local_dataflow.rb:137:21:137:26 | [post] self | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:21:137:26 | [post] self | local_dataflow.rb:137:20:137:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:21:137:26 | self | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
@@ -2894,11 +2711,9 @@
 | local_dataflow.rb:137:25:137:25 | [post] x | local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:25:137:25 | x | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:25:137:25 | x | local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) |
-| local_dataflow.rb:141:8:141:14 | [false] ! ... | local_dataflow.rb:141:8:141:37 | [false] ... \|\| ... |
-| local_dataflow.rb:141:8:141:14 | [false] ! ... | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... |
-| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) |
-| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(x) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) |
-| local_dataflow.rb:141:8:141:14 | [true] ! ... | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... |
+| local_dataflow.rb:141:8:141:14 | ! ... | local_dataflow.rb:141:8:141:37 | ... \|\| ... |
+| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
+| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(x) | local_dataflow.rb:147:9:147:9 | x |
 | local_dataflow.rb:141:9:141:14 | [post] self | local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:9:141:14 | [post] self | local_dataflow.rb:141:20:141:25 | self |
 | local_dataflow.rb:141:9:141:14 | self | local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) |
@@ -2907,28 +2722,24 @@
 | local_dataflow.rb:141:13:141:13 | [post] x | local_dataflow.rb:141:24:141:24 | x |
 | local_dataflow.rb:141:13:141:13 | x | local_dataflow.rb:141:8:141:14 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:13:141:13 | x | local_dataflow.rb:141:24:141:24 | x |
-| local_dataflow.rb:141:19:141:37 | [false] ( ... ) | local_dataflow.rb:141:8:141:37 | [false] ... \|\| ... |
-| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) |
-| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(x) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) |
-| local_dataflow.rb:141:19:141:37 | [post] [false] ( ... ) | local_dataflow.rb:141:20:141:36 | [post] [false] ... && ... |
-| local_dataflow.rb:141:19:141:37 | [post] [true] ( ... ) | local_dataflow.rb:141:20:141:36 | [post] [true] ... && ... |
-| local_dataflow.rb:141:19:141:37 | [true] ( ... ) | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... |
+| local_dataflow.rb:141:19:141:37 | ( ... ) | local_dataflow.rb:141:8:141:37 | ... \|\| ... |
+| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
+| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(x) | local_dataflow.rb:147:9:147:9 | x |
+| local_dataflow.rb:141:19:141:37 | [post] ( ... ) | local_dataflow.rb:141:20:141:36 | [post] ... && ... |
 | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) | local_dataflow.rb:143:11:143:16 | self |
 | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) | local_dataflow.rb:143:15:143:15 | x |
 | local_dataflow.rb:141:20:141:25 | [post] self | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:20:141:25 | [post] self | local_dataflow.rb:141:31:141:36 | self |
 | local_dataflow.rb:141:20:141:25 | self | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:20:141:25 | self | local_dataflow.rb:141:31:141:36 | self |
-| local_dataflow.rb:141:20:141:36 | [false] ... && ... | local_dataflow.rb:141:19:141:37 | [false] ( ... ) |
-| local_dataflow.rb:141:20:141:36 | [true] ... && ... | local_dataflow.rb:141:19:141:37 | [true] ( ... ) |
+| local_dataflow.rb:141:20:141:36 | ... && ... | local_dataflow.rb:141:19:141:37 | ( ... ) |
 | local_dataflow.rb:141:24:141:24 | [post] x | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:24:141:24 | [post] x | local_dataflow.rb:141:35:141:35 | x |
 | local_dataflow.rb:141:24:141:24 | x | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:24:141:24 | x | local_dataflow.rb:141:35:141:35 | x |
-| local_dataflow.rb:141:30:141:36 | [false] ! ... | local_dataflow.rb:141:20:141:36 | [false] ... && ... |
+| local_dataflow.rb:141:30:141:36 | ! ... | local_dataflow.rb:141:20:141:36 | ... && ... |
 | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(self) | local_dataflow.rb:143:11:143:16 | self |
 | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) | local_dataflow.rb:143:15:143:15 | x |
-| local_dataflow.rb:141:30:141:36 | [true] ! ... | local_dataflow.rb:141:20:141:36 | [true] ... && ... |
 | local_dataflow.rb:141:31:141:36 | [post] self | local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:31:141:36 | [post] self | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:31:141:36 | self | local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) |
@@ -2937,8 +2748,6 @@
 | local_dataflow.rb:141:35:141:35 | [post] x | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:35:141:35 | x | local_dataflow.rb:141:19:141:37 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:35:141:35 | x | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) |
-| local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
-| local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) | local_dataflow.rb:147:9:147:9 | x |
 | local_dataflow.rb:141:38:142:9 | then ... | local_dataflow.rb:141:5:145:7 | if ... |
 | local_dataflow.rb:142:7:142:9 | nil | local_dataflow.rb:141:38:142:9 | then ... |
 | local_dataflow.rb:143:5:144:16 | elsif ... | local_dataflow.rb:141:5:145:7 | if ... |
@@ -2946,8 +2755,7 @@
 | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(x) | local_dataflow.rb:144:15:144:15 | x |
 | local_dataflow.rb:143:11:143:16 | [post] self | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:11:143:16 | [post] self | local_dataflow.rb:143:21:143:26 | self |
-| local_dataflow.rb:143:11:143:16 | call to use | local_dataflow.rb:143:11:143:26 | [false] ... \|\| ... |
-| local_dataflow.rb:143:11:143:16 | call to use | local_dataflow.rb:143:11:143:26 | [true] ... \|\| ... |
+| local_dataflow.rb:143:11:143:16 | call to use | local_dataflow.rb:143:11:143:26 | ... \|\| ... |
 | local_dataflow.rb:143:11:143:16 | self | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:11:143:16 | self | local_dataflow.rb:143:21:143:26 | self |
 | local_dataflow.rb:143:11:143:26 | [input] SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
@@ -2960,8 +2768,7 @@
 | local_dataflow.rb:143:21:143:26 | [input] SSA phi read(x) | local_dataflow.rb:144:15:144:15 | x |
 | local_dataflow.rb:143:21:143:26 | [post] self | local_dataflow.rb:143:11:143:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:21:143:26 | [post] self | local_dataflow.rb:143:21:143:26 | [input] SSA phi read(self) |
-| local_dataflow.rb:143:21:143:26 | call to use | local_dataflow.rb:143:11:143:26 | [false] ... \|\| ... |
-| local_dataflow.rb:143:21:143:26 | call to use | local_dataflow.rb:143:11:143:26 | [true] ... \|\| ... |
+| local_dataflow.rb:143:21:143:26 | call to use | local_dataflow.rb:143:11:143:26 | ... \|\| ... |
 | local_dataflow.rb:143:21:143:26 | self | local_dataflow.rb:143:11:143:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:21:143:26 | self | local_dataflow.rb:143:21:143:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:25:143:25 | [post] x | local_dataflow.rb:143:11:143:26 | [input] SSA phi read(x) |
@@ -2979,3 +2786,49 @@
 | local_dataflow.rb:147:9:147:9 | [post] x | local_dataflow.rb:148:9:148:9 | x |
 | local_dataflow.rb:147:9:147:9 | x | local_dataflow.rb:148:9:148:9 | x |
 | local_dataflow.rb:148:5:148:10 | call to use | local_dataflow.rb:132:12:148:10 | then ... |
+| local_dataflow.rb:152:1:174:3 | self (begin_expr) | local_dataflow.rb:154:9:154:21 | self |
+| local_dataflow.rb:152:1:174:3 | self (begin_expr) | local_dataflow.rb:155:9:155:17 | self |
+| local_dataflow.rb:152:1:174:3 | self in begin_expr | local_dataflow.rb:152:1:174:3 | self (begin_expr) |
+| local_dataflow.rb:152:16:152:16 | r | local_dataflow.rb:152:16:152:16 | r |
+| local_dataflow.rb:152:16:152:16 | r | local_dataflow.rb:154:26:154:26 | r |
+| local_dataflow.rb:153:3:153:3 | x | local_dataflow.rb:161:8:161:8 | x |
+| local_dataflow.rb:153:7:160:9 | begin ...  | local_dataflow.rb:153:3:153:3 | x |
+| local_dataflow.rb:153:7:160:9 | begin ...  | local_dataflow.rb:153:3:160:9 | ... = ... |
+| local_dataflow.rb:154:9:154:21 | [post] self | local_dataflow.rb:157:9:157:17 | self |
+| local_dataflow.rb:154:9:154:21 | call to raise | local_dataflow.rb:154:9:154:26 | ... if ... |
+| local_dataflow.rb:154:9:154:21 | self | local_dataflow.rb:157:9:157:17 | self |
+| local_dataflow.rb:154:26:154:26 | r | local_dataflow.rb:164:26:164:26 | r |
+| local_dataflow.rb:155:9:155:17 | [post] self | local_dataflow.rb:157:9:157:17 | self |
+| local_dataflow.rb:155:9:155:17 | [post] self | local_dataflow.rb:159:9:159:17 | self |
+| local_dataflow.rb:155:9:155:17 | self | local_dataflow.rb:157:9:157:17 | self |
+| local_dataflow.rb:155:9:155:17 | self | local_dataflow.rb:159:9:159:17 | self |
+| local_dataflow.rb:157:9:157:17 | [post] self | local_dataflow.rb:159:9:159:17 | self |
+| local_dataflow.rb:157:9:157:17 | call to source | local_dataflow.rb:156:13:157:17 | then ... |
+| local_dataflow.rb:157:9:157:17 | self | local_dataflow.rb:159:9:159:17 | self |
+| local_dataflow.rb:159:9:159:17 | [post] self | local_dataflow.rb:161:3:161:9 | self |
+| local_dataflow.rb:159:9:159:17 | call to source | local_dataflow.rb:158:7:159:17 | ensure ... |
+| local_dataflow.rb:159:9:159:17 | self | local_dataflow.rb:161:3:161:9 | self |
+| local_dataflow.rb:161:3:161:9 | [post] self | local_dataflow.rb:164:9:164:21 | self |
+| local_dataflow.rb:161:3:161:9 | [post] self | local_dataflow.rb:165:9:165:17 | self |
+| local_dataflow.rb:161:3:161:9 | self | local_dataflow.rb:164:9:164:21 | self |
+| local_dataflow.rb:161:3:161:9 | self | local_dataflow.rb:165:9:165:17 | self |
+| local_dataflow.rb:163:3:163:3 | y | local_dataflow.rb:173:8:173:8 | y |
+| local_dataflow.rb:163:7:172:9 | begin ...  | local_dataflow.rb:163:3:163:3 | y |
+| local_dataflow.rb:163:7:172:9 | begin ...  | local_dataflow.rb:163:3:172:9 | ... = ... |
+| local_dataflow.rb:164:9:164:21 | [post] self | local_dataflow.rb:167:9:167:17 | self |
+| local_dataflow.rb:164:9:164:21 | call to raise | local_dataflow.rb:164:9:164:26 | ... if ... |
+| local_dataflow.rb:164:9:164:21 | self | local_dataflow.rb:167:9:167:17 | self |
+| local_dataflow.rb:165:9:165:17 | [post] self | local_dataflow.rb:167:9:167:17 | self |
+| local_dataflow.rb:165:9:165:17 | [post] self | local_dataflow.rb:169:9:169:17 | self |
+| local_dataflow.rb:165:9:165:17 | self | local_dataflow.rb:167:9:167:17 | self |
+| local_dataflow.rb:165:9:165:17 | self | local_dataflow.rb:169:9:169:17 | self |
+| local_dataflow.rb:167:9:167:17 | [post] self | local_dataflow.rb:171:9:171:17 | self |
+| local_dataflow.rb:167:9:167:17 | call to source | local_dataflow.rb:166:13:167:17 | then ... |
+| local_dataflow.rb:167:9:167:17 | self | local_dataflow.rb:171:9:171:17 | self |
+| local_dataflow.rb:169:9:169:17 | [post] self | local_dataflow.rb:171:9:171:17 | self |
+| local_dataflow.rb:169:9:169:17 | call to source | local_dataflow.rb:168:7:169:17 | else ... |
+| local_dataflow.rb:169:9:169:17 | self | local_dataflow.rb:171:9:171:17 | self |
+| local_dataflow.rb:171:9:171:17 | [post] self | local_dataflow.rb:173:3:173:9 | self |
+| local_dataflow.rb:171:9:171:17 | call to source | local_dataflow.rb:170:7:171:17 | ensure ... |
+| local_dataflow.rb:171:9:171:17 | self | local_dataflow.rb:173:3:173:9 | self |
+| local_dataflow.rb:173:3:173:9 | call to sink | local_dataflow.rb:153:3:173:52 | ... |
diff --git a/ruby/ql/test/library-tests/dataflow/local/Nodes.expected b/ruby/ql/test/library-tests/dataflow/local/Nodes.expected
index 2ce5b9c2f237..3f13439012e9 100644
--- a/ruby/ql/test/library-tests/dataflow/local/Nodes.expected
+++ b/ruby/ql/test/library-tests/dataflow/local/Nodes.expected
@@ -21,6 +21,7 @@ ret
 | local_dataflow.rb:123:32:123:43 | call to puts |
 | local_dataflow.rb:127:3:127:8 | call to rand |
 | local_dataflow.rb:132:3:149:5 | if ... |
+| local_dataflow.rb:173:3:173:9 | call to sink |
 arg
 | UseUseExplosion.rb:20:13:20:17 | @prop | UseUseExplosion.rb:20:13:20:23 | ... > ... | self |
 | UseUseExplosion.rb:20:13:20:23 | synthetic splat argument | UseUseExplosion.rb:20:13:20:23 | ... > ... | synthetic * |
@@ -1234,8 +1235,7 @@ arg
 | local_dataflow.rb:9:12:9:12 | 2 | local_dataflow.rb:9:9:9:15 | call to [] | position 1 |
 | local_dataflow.rb:9:14:9:14 | 3 | local_dataflow.rb:9:9:9:15 | call to [] | position 2 |
 | local_dataflow.rb:10:5:13:3 | { ... } | local_dataflow.rb:10:5:13:3 | call to each | block |
-| local_dataflow.rb:10:9:10:9 | defined? ... | local_dataflow.rb:10:9:10:9 | [false] ! ... | self |
-| local_dataflow.rb:10:9:10:9 | defined? ... | local_dataflow.rb:10:9:10:9 | [true] ! ... | self |
+| local_dataflow.rb:10:9:10:9 | defined? ... | local_dataflow.rb:10:9:10:9 | ! ... | self |
 | local_dataflow.rb:10:9:10:9 | x | local_dataflow.rb:10:9:10:9 | defined? ... | self |
 | local_dataflow.rb:10:14:10:18 | array | local_dataflow.rb:10:5:13:3 | call to each | self |
 | local_dataflow.rb:11:1:11:2 | self | local_dataflow.rb:11:1:11:2 | call to do | self |
@@ -1243,13 +1243,11 @@ arg
 | local_dataflow.rb:12:3:12:5 | synthetic splat argument | local_dataflow.rb:12:3:12:5 | call to p | synthetic * |
 | local_dataflow.rb:12:5:12:5 | x | local_dataflow.rb:12:3:12:5 | call to p | position 0 |
 | local_dataflow.rb:15:1:17:3 | { ... } | local_dataflow.rb:15:1:17:3 | call to each | block |
-| local_dataflow.rb:15:5:15:5 | defined? ... | local_dataflow.rb:15:5:15:5 | [false] ! ... | self |
-| local_dataflow.rb:15:5:15:5 | defined? ... | local_dataflow.rb:15:5:15:5 | [true] ! ... | self |
+| local_dataflow.rb:15:5:15:5 | defined? ... | local_dataflow.rb:15:5:15:5 | ! ... | self |
 | local_dataflow.rb:15:5:15:5 | x | local_dataflow.rb:15:5:15:5 | defined? ... | self |
 | local_dataflow.rb:15:10:15:14 | array | local_dataflow.rb:15:1:17:3 | call to each | self |
 | local_dataflow.rb:19:1:21:3 | { ... } | local_dataflow.rb:19:1:21:3 | call to each | block |
-| local_dataflow.rb:19:5:19:5 | defined? ... | local_dataflow.rb:19:5:19:5 | [false] ! ... | self |
-| local_dataflow.rb:19:5:19:5 | defined? ... | local_dataflow.rb:19:5:19:5 | [true] ! ... | self |
+| local_dataflow.rb:19:5:19:5 | defined? ... | local_dataflow.rb:19:5:19:5 | ! ... | self |
 | local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:19:5:19:5 | defined? ... | self |
 | local_dataflow.rb:19:10:19:14 | array | local_dataflow.rb:19:1:21:3 | call to each | self |
 | local_dataflow.rb:20:6:20:6 | x | local_dataflow.rb:20:6:20:10 | ... > ... | self |
@@ -1445,15 +1443,12 @@ arg
 | local_dataflow.rb:132:6:132:11 | self | local_dataflow.rb:132:6:132:11 | call to use | self |
 | local_dataflow.rb:132:6:132:11 | synthetic splat argument | local_dataflow.rb:132:6:132:11 | call to use | synthetic * |
 | local_dataflow.rb:132:10:132:10 | x | local_dataflow.rb:132:6:132:11 | call to use | position 0 |
-| local_dataflow.rb:133:8:133:13 | call to use | local_dataflow.rb:133:8:133:23 | [false] ... \|\| ... | self |
-| local_dataflow.rb:133:8:133:13 | call to use | local_dataflow.rb:133:8:133:23 | [true] ... \|\| ... | self |
+| local_dataflow.rb:133:8:133:13 | call to use | local_dataflow.rb:133:8:133:23 | ... \|\| ... | self |
 | local_dataflow.rb:133:8:133:13 | self | local_dataflow.rb:133:8:133:13 | call to use | self |
 | local_dataflow.rb:133:8:133:13 | synthetic splat argument | local_dataflow.rb:133:8:133:13 | call to use | synthetic * |
-| local_dataflow.rb:133:8:133:23 | synthetic splat argument | local_dataflow.rb:133:8:133:23 | [false] ... \|\| ... | synthetic * |
-| local_dataflow.rb:133:8:133:23 | synthetic splat argument | local_dataflow.rb:133:8:133:23 | [true] ... \|\| ... | synthetic * |
+| local_dataflow.rb:133:8:133:23 | synthetic splat argument | local_dataflow.rb:133:8:133:23 | ... \|\| ... | synthetic * |
 | local_dataflow.rb:133:12:133:12 | x | local_dataflow.rb:133:8:133:13 | call to use | position 0 |
-| local_dataflow.rb:133:18:133:23 | call to use | local_dataflow.rb:133:8:133:23 | [false] ... \|\| ... | position 0 |
-| local_dataflow.rb:133:18:133:23 | call to use | local_dataflow.rb:133:8:133:23 | [true] ... \|\| ... | position 0 |
+| local_dataflow.rb:133:18:133:23 | call to use | local_dataflow.rb:133:8:133:23 | ... \|\| ... | position 0 |
 | local_dataflow.rb:133:18:133:23 | self | local_dataflow.rb:133:18:133:23 | call to use | self |
 | local_dataflow.rb:133:18:133:23 | synthetic splat argument | local_dataflow.rb:133:18:133:23 | call to use | synthetic * |
 | local_dataflow.rb:133:22:133:22 | x | local_dataflow.rb:133:18:133:23 | call to use | position 0 |
@@ -1463,55 +1458,39 @@ arg
 | local_dataflow.rb:136:7:136:12 | self | local_dataflow.rb:136:7:136:12 | call to use | self |
 | local_dataflow.rb:136:7:136:12 | synthetic splat argument | local_dataflow.rb:136:7:136:12 | call to use | synthetic * |
 | local_dataflow.rb:136:11:136:11 | x | local_dataflow.rb:136:7:136:12 | call to use | position 0 |
-| local_dataflow.rb:137:10:137:15 | call to use | local_dataflow.rb:137:10:137:26 | [false] ... && ... | self |
-| local_dataflow.rb:137:10:137:15 | call to use | local_dataflow.rb:137:10:137:26 | [true] ... && ... | self |
+| local_dataflow.rb:137:10:137:15 | call to use | local_dataflow.rb:137:10:137:26 | ... && ... | self |
 | local_dataflow.rb:137:10:137:15 | self | local_dataflow.rb:137:10:137:15 | call to use | self |
 | local_dataflow.rb:137:10:137:15 | synthetic splat argument | local_dataflow.rb:137:10:137:15 | call to use | synthetic * |
-| local_dataflow.rb:137:10:137:26 | synthetic splat argument | local_dataflow.rb:137:10:137:26 | [false] ... && ... | synthetic * |
-| local_dataflow.rb:137:10:137:26 | synthetic splat argument | local_dataflow.rb:137:10:137:26 | [true] ... && ... | synthetic * |
+| local_dataflow.rb:137:10:137:26 | synthetic splat argument | local_dataflow.rb:137:10:137:26 | ... && ... | synthetic * |
 | local_dataflow.rb:137:14:137:14 | x | local_dataflow.rb:137:10:137:15 | call to use | position 0 |
-| local_dataflow.rb:137:20:137:26 | [false] ! ... | local_dataflow.rb:137:10:137:26 | [false] ... && ... | position 0 |
-| local_dataflow.rb:137:20:137:26 | [true] ! ... | local_dataflow.rb:137:10:137:26 | [true] ... && ... | position 0 |
-| local_dataflow.rb:137:21:137:26 | call to use | local_dataflow.rb:137:20:137:26 | [false] ! ... | self |
-| local_dataflow.rb:137:21:137:26 | call to use | local_dataflow.rb:137:20:137:26 | [true] ! ... | self |
+| local_dataflow.rb:137:20:137:26 | ! ... | local_dataflow.rb:137:10:137:26 | ... && ... | position 0 |
+| local_dataflow.rb:137:21:137:26 | call to use | local_dataflow.rb:137:20:137:26 | ! ... | self |
 | local_dataflow.rb:137:21:137:26 | self | local_dataflow.rb:137:21:137:26 | call to use | self |
 | local_dataflow.rb:137:21:137:26 | synthetic splat argument | local_dataflow.rb:137:21:137:26 | call to use | synthetic * |
 | local_dataflow.rb:137:25:137:25 | x | local_dataflow.rb:137:21:137:26 | call to use | position 0 |
-| local_dataflow.rb:141:8:141:14 | [false] ! ... | local_dataflow.rb:141:8:141:37 | [false] ... \|\| ... | self |
-| local_dataflow.rb:141:8:141:14 | [false] ! ... | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... | self |
-| local_dataflow.rb:141:8:141:14 | [true] ! ... | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... | self |
-| local_dataflow.rb:141:8:141:37 | synthetic splat argument | local_dataflow.rb:141:8:141:37 | [false] ... \|\| ... | synthetic * |
-| local_dataflow.rb:141:8:141:37 | synthetic splat argument | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... | synthetic * |
-| local_dataflow.rb:141:9:141:14 | call to use | local_dataflow.rb:141:8:141:14 | [false] ! ... | self |
-| local_dataflow.rb:141:9:141:14 | call to use | local_dataflow.rb:141:8:141:14 | [true] ! ... | self |
+| local_dataflow.rb:141:8:141:14 | ! ... | local_dataflow.rb:141:8:141:37 | ... \|\| ... | self |
+| local_dataflow.rb:141:8:141:37 | synthetic splat argument | local_dataflow.rb:141:8:141:37 | ... \|\| ... | synthetic * |
+| local_dataflow.rb:141:9:141:14 | call to use | local_dataflow.rb:141:8:141:14 | ! ... | self |
 | local_dataflow.rb:141:9:141:14 | self | local_dataflow.rb:141:9:141:14 | call to use | self |
 | local_dataflow.rb:141:9:141:14 | synthetic splat argument | local_dataflow.rb:141:9:141:14 | call to use | synthetic * |
 | local_dataflow.rb:141:13:141:13 | x | local_dataflow.rb:141:9:141:14 | call to use | position 0 |
-| local_dataflow.rb:141:19:141:37 | [false] ( ... ) | local_dataflow.rb:141:8:141:37 | [false] ... \|\| ... | position 0 |
-| local_dataflow.rb:141:19:141:37 | [true] ( ... ) | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... | position 0 |
-| local_dataflow.rb:141:20:141:25 | call to use | local_dataflow.rb:141:20:141:36 | [false] ... && ... | self |
-| local_dataflow.rb:141:20:141:25 | call to use | local_dataflow.rb:141:20:141:36 | [true] ... && ... | self |
+| local_dataflow.rb:141:19:141:37 | ( ... ) | local_dataflow.rb:141:8:141:37 | ... \|\| ... | position 0 |
+| local_dataflow.rb:141:20:141:25 | call to use | local_dataflow.rb:141:20:141:36 | ... && ... | self |
 | local_dataflow.rb:141:20:141:25 | self | local_dataflow.rb:141:20:141:25 | call to use | self |
 | local_dataflow.rb:141:20:141:25 | synthetic splat argument | local_dataflow.rb:141:20:141:25 | call to use | synthetic * |
-| local_dataflow.rb:141:20:141:36 | synthetic splat argument | local_dataflow.rb:141:20:141:36 | [false] ... && ... | synthetic * |
-| local_dataflow.rb:141:20:141:36 | synthetic splat argument | local_dataflow.rb:141:20:141:36 | [true] ... && ... | synthetic * |
+| local_dataflow.rb:141:20:141:36 | synthetic splat argument | local_dataflow.rb:141:20:141:36 | ... && ... | synthetic * |
 | local_dataflow.rb:141:24:141:24 | x | local_dataflow.rb:141:20:141:25 | call to use | position 0 |
-| local_dataflow.rb:141:30:141:36 | [false] ! ... | local_dataflow.rb:141:20:141:36 | [false] ... && ... | position 0 |
-| local_dataflow.rb:141:30:141:36 | [true] ! ... | local_dataflow.rb:141:20:141:36 | [true] ... && ... | position 0 |
-| local_dataflow.rb:141:31:141:36 | call to use | local_dataflow.rb:141:30:141:36 | [false] ! ... | self |
-| local_dataflow.rb:141:31:141:36 | call to use | local_dataflow.rb:141:30:141:36 | [true] ! ... | self |
+| local_dataflow.rb:141:30:141:36 | ! ... | local_dataflow.rb:141:20:141:36 | ... && ... | position 0 |
+| local_dataflow.rb:141:31:141:36 | call to use | local_dataflow.rb:141:30:141:36 | ! ... | self |
 | local_dataflow.rb:141:31:141:36 | self | local_dataflow.rb:141:31:141:36 | call to use | self |
 | local_dataflow.rb:141:31:141:36 | synthetic splat argument | local_dataflow.rb:141:31:141:36 | call to use | synthetic * |
 | local_dataflow.rb:141:35:141:35 | x | local_dataflow.rb:141:31:141:36 | call to use | position 0 |
-| local_dataflow.rb:143:11:143:16 | call to use | local_dataflow.rb:143:11:143:26 | [false] ... \|\| ... | self |
-| local_dataflow.rb:143:11:143:16 | call to use | local_dataflow.rb:143:11:143:26 | [true] ... \|\| ... | self |
+| local_dataflow.rb:143:11:143:16 | call to use | local_dataflow.rb:143:11:143:26 | ... \|\| ... | self |
 | local_dataflow.rb:143:11:143:16 | self | local_dataflow.rb:143:11:143:16 | call to use | self |
 | local_dataflow.rb:143:11:143:16 | synthetic splat argument | local_dataflow.rb:143:11:143:16 | call to use | synthetic * |
-| local_dataflow.rb:143:11:143:26 | synthetic splat argument | local_dataflow.rb:143:11:143:26 | [false] ... \|\| ... | synthetic * |
-| local_dataflow.rb:143:11:143:26 | synthetic splat argument | local_dataflow.rb:143:11:143:26 | [true] ... \|\| ... | synthetic * |
+| local_dataflow.rb:143:11:143:26 | synthetic splat argument | local_dataflow.rb:143:11:143:26 | ... \|\| ... | synthetic * |
 | local_dataflow.rb:143:15:143:15 | x | local_dataflow.rb:143:11:143:16 | call to use | position 0 |
-| local_dataflow.rb:143:21:143:26 | call to use | local_dataflow.rb:143:11:143:26 | [false] ... \|\| ... | position 0 |
-| local_dataflow.rb:143:21:143:26 | call to use | local_dataflow.rb:143:11:143:26 | [true] ... \|\| ... | position 0 |
+| local_dataflow.rb:143:21:143:26 | call to use | local_dataflow.rb:143:11:143:26 | ... \|\| ... | position 0 |
 | local_dataflow.rb:143:21:143:26 | self | local_dataflow.rb:143:21:143:26 | call to use | self |
 | local_dataflow.rb:143:21:143:26 | synthetic splat argument | local_dataflow.rb:143:21:143:26 | call to use | synthetic * |
 | local_dataflow.rb:143:25:143:25 | x | local_dataflow.rb:143:21:143:26 | call to use | position 0 |
@@ -1524,3 +1503,36 @@ arg
 | local_dataflow.rb:148:5:148:10 | self | local_dataflow.rb:148:5:148:10 | call to use | self |
 | local_dataflow.rb:148:5:148:10 | synthetic splat argument | local_dataflow.rb:148:5:148:10 | call to use | synthetic * |
 | local_dataflow.rb:148:9:148:9 | x | local_dataflow.rb:148:5:148:10 | call to use | position 0 |
+| local_dataflow.rb:154:9:154:21 | self | local_dataflow.rb:154:9:154:21 | call to raise | self |
+| local_dataflow.rb:154:9:154:21 | synthetic splat argument | local_dataflow.rb:154:9:154:21 | call to raise | synthetic * |
+| local_dataflow.rb:154:15:154:21 | "error" | local_dataflow.rb:154:9:154:21 | call to raise | position 0 |
+| local_dataflow.rb:155:9:155:17 | self | local_dataflow.rb:155:9:155:17 | call to source | self |
+| local_dataflow.rb:155:9:155:17 | synthetic splat argument | local_dataflow.rb:155:9:155:17 | call to source | synthetic * |
+| local_dataflow.rb:155:16:155:16 | 1 | local_dataflow.rb:155:9:155:17 | call to source | position 0 |
+| local_dataflow.rb:157:9:157:17 | self | local_dataflow.rb:157:9:157:17 | call to source | self |
+| local_dataflow.rb:157:9:157:17 | synthetic splat argument | local_dataflow.rb:157:9:157:17 | call to source | synthetic * |
+| local_dataflow.rb:157:16:157:16 | 2 | local_dataflow.rb:157:9:157:17 | call to source | position 0 |
+| local_dataflow.rb:159:9:159:17 | self | local_dataflow.rb:159:9:159:17 | call to source | self |
+| local_dataflow.rb:159:9:159:17 | synthetic splat argument | local_dataflow.rb:159:9:159:17 | call to source | synthetic * |
+| local_dataflow.rb:159:16:159:16 | 3 | local_dataflow.rb:159:9:159:17 | call to source | position 0 |
+| local_dataflow.rb:161:3:161:9 | self | local_dataflow.rb:161:3:161:9 | call to sink | self |
+| local_dataflow.rb:161:3:161:9 | synthetic splat argument | local_dataflow.rb:161:3:161:9 | call to sink | synthetic * |
+| local_dataflow.rb:161:8:161:8 | x | local_dataflow.rb:161:3:161:9 | call to sink | position 0 |
+| local_dataflow.rb:164:9:164:21 | self | local_dataflow.rb:164:9:164:21 | call to raise | self |
+| local_dataflow.rb:164:9:164:21 | synthetic splat argument | local_dataflow.rb:164:9:164:21 | call to raise | synthetic * |
+| local_dataflow.rb:164:15:164:21 | "error" | local_dataflow.rb:164:9:164:21 | call to raise | position 0 |
+| local_dataflow.rb:165:9:165:17 | self | local_dataflow.rb:165:9:165:17 | call to source | self |
+| local_dataflow.rb:165:9:165:17 | synthetic splat argument | local_dataflow.rb:165:9:165:17 | call to source | synthetic * |
+| local_dataflow.rb:165:16:165:16 | 4 | local_dataflow.rb:165:9:165:17 | call to source | position 0 |
+| local_dataflow.rb:167:9:167:17 | self | local_dataflow.rb:167:9:167:17 | call to source | self |
+| local_dataflow.rb:167:9:167:17 | synthetic splat argument | local_dataflow.rb:167:9:167:17 | call to source | synthetic * |
+| local_dataflow.rb:167:16:167:16 | 5 | local_dataflow.rb:167:9:167:17 | call to source | position 0 |
+| local_dataflow.rb:169:9:169:17 | self | local_dataflow.rb:169:9:169:17 | call to source | self |
+| local_dataflow.rb:169:9:169:17 | synthetic splat argument | local_dataflow.rb:169:9:169:17 | call to source | synthetic * |
+| local_dataflow.rb:169:16:169:16 | 6 | local_dataflow.rb:169:9:169:17 | call to source | position 0 |
+| local_dataflow.rb:171:9:171:17 | self | local_dataflow.rb:171:9:171:17 | call to source | self |
+| local_dataflow.rb:171:9:171:17 | synthetic splat argument | local_dataflow.rb:171:9:171:17 | call to source | synthetic * |
+| local_dataflow.rb:171:16:171:16 | 7 | local_dataflow.rb:171:9:171:17 | call to source | position 0 |
+| local_dataflow.rb:173:3:173:9 | self | local_dataflow.rb:173:3:173:9 | call to sink | self |
+| local_dataflow.rb:173:3:173:9 | synthetic splat argument | local_dataflow.rb:173:3:173:9 | call to sink | synthetic * |
+| local_dataflow.rb:173:8:173:8 | y | local_dataflow.rb:173:3:173:9 | call to sink | position 0 |
diff --git a/ruby/ql/test/library-tests/dataflow/local/TaintStep.expected b/ruby/ql/test/library-tests/dataflow/local/TaintStep.expected
index 353edd203f95..22c75e5eb970 100644
--- a/ruby/ql/test/library-tests/dataflow/local/TaintStep.expected
+++ b/ruby/ql/test/library-tests/dataflow/local/TaintStep.expected
@@ -208,8 +208,7 @@
 | UseUseExplosion.rb:20:13:20:17 | [post] self | UseUseExplosion.rb:20:3691:20:3696 | self |
 | UseUseExplosion.rb:20:13:20:17 | self | UseUseExplosion.rb:20:35:20:39 | self |
 | UseUseExplosion.rb:20:13:20:17 | self | UseUseExplosion.rb:20:3691:20:3696 | self |
-| UseUseExplosion.rb:20:13:20:23 | ... > ... | UseUseExplosion.rb:20:12:20:24 | [false] ( ... ) |
-| UseUseExplosion.rb:20:13:20:23 | ... > ... | UseUseExplosion.rb:20:12:20:24 | [true] ( ... ) |
+| UseUseExplosion.rb:20:13:20:23 | ... > ... | UseUseExplosion.rb:20:12:20:24 | ( ... ) |
 | UseUseExplosion.rb:20:21:20:23 | 100 | UseUseExplosion.rb:20:13:20:23 | ... > ... |
 | UseUseExplosion.rb:20:26:20:3684 | then ... | UseUseExplosion.rb:20:9:20:3700 | if ... |
 | UseUseExplosion.rb:20:31:20:3684 | if ... | UseUseExplosion.rb:20:26:20:3684 | then ... |
@@ -218,8 +217,7 @@
 | UseUseExplosion.rb:20:35:20:39 | [post] self | UseUseExplosion.rb:20:3675:20:3680 | self |
 | UseUseExplosion.rb:20:35:20:39 | self | UseUseExplosion.rb:20:56:20:60 | self |
 | UseUseExplosion.rb:20:35:20:39 | self | UseUseExplosion.rb:20:3675:20:3680 | self |
-| UseUseExplosion.rb:20:35:20:44 | ... > ... | UseUseExplosion.rb:20:34:20:45 | [false] ( ... ) |
-| UseUseExplosion.rb:20:35:20:44 | ... > ... | UseUseExplosion.rb:20:34:20:45 | [true] ( ... ) |
+| UseUseExplosion.rb:20:35:20:44 | ... > ... | UseUseExplosion.rb:20:34:20:45 | ( ... ) |
 | UseUseExplosion.rb:20:43:20:44 | 99 | UseUseExplosion.rb:20:35:20:44 | ... > ... |
 | UseUseExplosion.rb:20:47:20:3668 | then ... | UseUseExplosion.rb:20:31:20:3684 | if ... |
 | UseUseExplosion.rb:20:52:20:3668 | if ... | UseUseExplosion.rb:20:47:20:3668 | then ... |
@@ -228,8 +226,7 @@
 | UseUseExplosion.rb:20:56:20:60 | [post] self | UseUseExplosion.rb:20:3659:20:3664 | self |
 | UseUseExplosion.rb:20:56:20:60 | self | UseUseExplosion.rb:20:77:20:81 | self |
 | UseUseExplosion.rb:20:56:20:60 | self | UseUseExplosion.rb:20:3659:20:3664 | self |
-| UseUseExplosion.rb:20:56:20:65 | ... > ... | UseUseExplosion.rb:20:55:20:66 | [false] ( ... ) |
-| UseUseExplosion.rb:20:56:20:65 | ... > ... | UseUseExplosion.rb:20:55:20:66 | [true] ( ... ) |
+| UseUseExplosion.rb:20:56:20:65 | ... > ... | UseUseExplosion.rb:20:55:20:66 | ( ... ) |
 | UseUseExplosion.rb:20:64:20:65 | 98 | UseUseExplosion.rb:20:56:20:65 | ... > ... |
 | UseUseExplosion.rb:20:68:20:3652 | then ... | UseUseExplosion.rb:20:52:20:3668 | if ... |
 | UseUseExplosion.rb:20:73:20:3652 | if ... | UseUseExplosion.rb:20:68:20:3652 | then ... |
@@ -238,8 +235,7 @@
 | UseUseExplosion.rb:20:77:20:81 | [post] self | UseUseExplosion.rb:20:3643:20:3648 | self |
 | UseUseExplosion.rb:20:77:20:81 | self | UseUseExplosion.rb:20:98:20:102 | self |
 | UseUseExplosion.rb:20:77:20:81 | self | UseUseExplosion.rb:20:3643:20:3648 | self |
-| UseUseExplosion.rb:20:77:20:86 | ... > ... | UseUseExplosion.rb:20:76:20:87 | [false] ( ... ) |
-| UseUseExplosion.rb:20:77:20:86 | ... > ... | UseUseExplosion.rb:20:76:20:87 | [true] ( ... ) |
+| UseUseExplosion.rb:20:77:20:86 | ... > ... | UseUseExplosion.rb:20:76:20:87 | ( ... ) |
 | UseUseExplosion.rb:20:85:20:86 | 97 | UseUseExplosion.rb:20:77:20:86 | ... > ... |
 | UseUseExplosion.rb:20:89:20:3636 | then ... | UseUseExplosion.rb:20:73:20:3652 | if ... |
 | UseUseExplosion.rb:20:94:20:3636 | if ... | UseUseExplosion.rb:20:89:20:3636 | then ... |
@@ -248,8 +244,7 @@
 | UseUseExplosion.rb:20:98:20:102 | [post] self | UseUseExplosion.rb:20:3627:20:3632 | self |
 | UseUseExplosion.rb:20:98:20:102 | self | UseUseExplosion.rb:20:119:20:123 | self |
 | UseUseExplosion.rb:20:98:20:102 | self | UseUseExplosion.rb:20:3627:20:3632 | self |
-| UseUseExplosion.rb:20:98:20:107 | ... > ... | UseUseExplosion.rb:20:97:20:108 | [false] ( ... ) |
-| UseUseExplosion.rb:20:98:20:107 | ... > ... | UseUseExplosion.rb:20:97:20:108 | [true] ( ... ) |
+| UseUseExplosion.rb:20:98:20:107 | ... > ... | UseUseExplosion.rb:20:97:20:108 | ( ... ) |
 | UseUseExplosion.rb:20:106:20:107 | 96 | UseUseExplosion.rb:20:98:20:107 | ... > ... |
 | UseUseExplosion.rb:20:110:20:3620 | then ... | UseUseExplosion.rb:20:94:20:3636 | if ... |
 | UseUseExplosion.rb:20:115:20:3620 | if ... | UseUseExplosion.rb:20:110:20:3620 | then ... |
@@ -258,8 +253,7 @@
 | UseUseExplosion.rb:20:119:20:123 | [post] self | UseUseExplosion.rb:20:3611:20:3616 | self |
 | UseUseExplosion.rb:20:119:20:123 | self | UseUseExplosion.rb:20:140:20:144 | self |
 | UseUseExplosion.rb:20:119:20:123 | self | UseUseExplosion.rb:20:3611:20:3616 | self |
-| UseUseExplosion.rb:20:119:20:128 | ... > ... | UseUseExplosion.rb:20:118:20:129 | [false] ( ... ) |
-| UseUseExplosion.rb:20:119:20:128 | ... > ... | UseUseExplosion.rb:20:118:20:129 | [true] ( ... ) |
+| UseUseExplosion.rb:20:119:20:128 | ... > ... | UseUseExplosion.rb:20:118:20:129 | ( ... ) |
 | UseUseExplosion.rb:20:127:20:128 | 95 | UseUseExplosion.rb:20:119:20:128 | ... > ... |
 | UseUseExplosion.rb:20:131:20:3604 | then ... | UseUseExplosion.rb:20:115:20:3620 | if ... |
 | UseUseExplosion.rb:20:136:20:3604 | if ... | UseUseExplosion.rb:20:131:20:3604 | then ... |
@@ -268,8 +262,7 @@
 | UseUseExplosion.rb:20:140:20:144 | [post] self | UseUseExplosion.rb:20:3595:20:3600 | self |
 | UseUseExplosion.rb:20:140:20:144 | self | UseUseExplosion.rb:20:161:20:165 | self |
 | UseUseExplosion.rb:20:140:20:144 | self | UseUseExplosion.rb:20:3595:20:3600 | self |
-| UseUseExplosion.rb:20:140:20:149 | ... > ... | UseUseExplosion.rb:20:139:20:150 | [false] ( ... ) |
-| UseUseExplosion.rb:20:140:20:149 | ... > ... | UseUseExplosion.rb:20:139:20:150 | [true] ( ... ) |
+| UseUseExplosion.rb:20:140:20:149 | ... > ... | UseUseExplosion.rb:20:139:20:150 | ( ... ) |
 | UseUseExplosion.rb:20:148:20:149 | 94 | UseUseExplosion.rb:20:140:20:149 | ... > ... |
 | UseUseExplosion.rb:20:152:20:3588 | then ... | UseUseExplosion.rb:20:136:20:3604 | if ... |
 | UseUseExplosion.rb:20:157:20:3588 | if ... | UseUseExplosion.rb:20:152:20:3588 | then ... |
@@ -278,8 +271,7 @@
 | UseUseExplosion.rb:20:161:20:165 | [post] self | UseUseExplosion.rb:20:3579:20:3584 | self |
 | UseUseExplosion.rb:20:161:20:165 | self | UseUseExplosion.rb:20:182:20:186 | self |
 | UseUseExplosion.rb:20:161:20:165 | self | UseUseExplosion.rb:20:3579:20:3584 | self |
-| UseUseExplosion.rb:20:161:20:170 | ... > ... | UseUseExplosion.rb:20:160:20:171 | [false] ( ... ) |
-| UseUseExplosion.rb:20:161:20:170 | ... > ... | UseUseExplosion.rb:20:160:20:171 | [true] ( ... ) |
+| UseUseExplosion.rb:20:161:20:170 | ... > ... | UseUseExplosion.rb:20:160:20:171 | ( ... ) |
 | UseUseExplosion.rb:20:169:20:170 | 93 | UseUseExplosion.rb:20:161:20:170 | ... > ... |
 | UseUseExplosion.rb:20:173:20:3572 | then ... | UseUseExplosion.rb:20:157:20:3588 | if ... |
 | UseUseExplosion.rb:20:178:20:3572 | if ... | UseUseExplosion.rb:20:173:20:3572 | then ... |
@@ -288,8 +280,7 @@
 | UseUseExplosion.rb:20:182:20:186 | [post] self | UseUseExplosion.rb:20:3563:20:3568 | self |
 | UseUseExplosion.rb:20:182:20:186 | self | UseUseExplosion.rb:20:203:20:207 | self |
 | UseUseExplosion.rb:20:182:20:186 | self | UseUseExplosion.rb:20:3563:20:3568 | self |
-| UseUseExplosion.rb:20:182:20:191 | ... > ... | UseUseExplosion.rb:20:181:20:192 | [false] ( ... ) |
-| UseUseExplosion.rb:20:182:20:191 | ... > ... | UseUseExplosion.rb:20:181:20:192 | [true] ( ... ) |
+| UseUseExplosion.rb:20:182:20:191 | ... > ... | UseUseExplosion.rb:20:181:20:192 | ( ... ) |
 | UseUseExplosion.rb:20:190:20:191 | 92 | UseUseExplosion.rb:20:182:20:191 | ... > ... |
 | UseUseExplosion.rb:20:194:20:3556 | then ... | UseUseExplosion.rb:20:178:20:3572 | if ... |
 | UseUseExplosion.rb:20:199:20:3556 | if ... | UseUseExplosion.rb:20:194:20:3556 | then ... |
@@ -298,8 +289,7 @@
 | UseUseExplosion.rb:20:203:20:207 | [post] self | UseUseExplosion.rb:20:3547:20:3552 | self |
 | UseUseExplosion.rb:20:203:20:207 | self | UseUseExplosion.rb:20:224:20:228 | self |
 | UseUseExplosion.rb:20:203:20:207 | self | UseUseExplosion.rb:20:3547:20:3552 | self |
-| UseUseExplosion.rb:20:203:20:212 | ... > ... | UseUseExplosion.rb:20:202:20:213 | [false] ( ... ) |
-| UseUseExplosion.rb:20:203:20:212 | ... > ... | UseUseExplosion.rb:20:202:20:213 | [true] ( ... ) |
+| UseUseExplosion.rb:20:203:20:212 | ... > ... | UseUseExplosion.rb:20:202:20:213 | ( ... ) |
 | UseUseExplosion.rb:20:211:20:212 | 91 | UseUseExplosion.rb:20:203:20:212 | ... > ... |
 | UseUseExplosion.rb:20:215:20:3540 | then ... | UseUseExplosion.rb:20:199:20:3556 | if ... |
 | UseUseExplosion.rb:20:220:20:3540 | if ... | UseUseExplosion.rb:20:215:20:3540 | then ... |
@@ -308,8 +298,7 @@
 | UseUseExplosion.rb:20:224:20:228 | [post] self | UseUseExplosion.rb:20:3531:20:3536 | self |
 | UseUseExplosion.rb:20:224:20:228 | self | UseUseExplosion.rb:20:245:20:249 | self |
 | UseUseExplosion.rb:20:224:20:228 | self | UseUseExplosion.rb:20:3531:20:3536 | self |
-| UseUseExplosion.rb:20:224:20:233 | ... > ... | UseUseExplosion.rb:20:223:20:234 | [false] ( ... ) |
-| UseUseExplosion.rb:20:224:20:233 | ... > ... | UseUseExplosion.rb:20:223:20:234 | [true] ( ... ) |
+| UseUseExplosion.rb:20:224:20:233 | ... > ... | UseUseExplosion.rb:20:223:20:234 | ( ... ) |
 | UseUseExplosion.rb:20:232:20:233 | 90 | UseUseExplosion.rb:20:224:20:233 | ... > ... |
 | UseUseExplosion.rb:20:236:20:3524 | then ... | UseUseExplosion.rb:20:220:20:3540 | if ... |
 | UseUseExplosion.rb:20:241:20:3524 | if ... | UseUseExplosion.rb:20:236:20:3524 | then ... |
@@ -318,8 +307,7 @@
 | UseUseExplosion.rb:20:245:20:249 | [post] self | UseUseExplosion.rb:20:3515:20:3520 | self |
 | UseUseExplosion.rb:20:245:20:249 | self | UseUseExplosion.rb:20:266:20:270 | self |
 | UseUseExplosion.rb:20:245:20:249 | self | UseUseExplosion.rb:20:3515:20:3520 | self |
-| UseUseExplosion.rb:20:245:20:254 | ... > ... | UseUseExplosion.rb:20:244:20:255 | [false] ( ... ) |
-| UseUseExplosion.rb:20:245:20:254 | ... > ... | UseUseExplosion.rb:20:244:20:255 | [true] ( ... ) |
+| UseUseExplosion.rb:20:245:20:254 | ... > ... | UseUseExplosion.rb:20:244:20:255 | ( ... ) |
 | UseUseExplosion.rb:20:253:20:254 | 89 | UseUseExplosion.rb:20:245:20:254 | ... > ... |
 | UseUseExplosion.rb:20:257:20:3508 | then ... | UseUseExplosion.rb:20:241:20:3524 | if ... |
 | UseUseExplosion.rb:20:262:20:3508 | if ... | UseUseExplosion.rb:20:257:20:3508 | then ... |
@@ -328,8 +316,7 @@
 | UseUseExplosion.rb:20:266:20:270 | [post] self | UseUseExplosion.rb:20:3499:20:3504 | self |
 | UseUseExplosion.rb:20:266:20:270 | self | UseUseExplosion.rb:20:287:20:291 | self |
 | UseUseExplosion.rb:20:266:20:270 | self | UseUseExplosion.rb:20:3499:20:3504 | self |
-| UseUseExplosion.rb:20:266:20:275 | ... > ... | UseUseExplosion.rb:20:265:20:276 | [false] ( ... ) |
-| UseUseExplosion.rb:20:266:20:275 | ... > ... | UseUseExplosion.rb:20:265:20:276 | [true] ( ... ) |
+| UseUseExplosion.rb:20:266:20:275 | ... > ... | UseUseExplosion.rb:20:265:20:276 | ( ... ) |
 | UseUseExplosion.rb:20:274:20:275 | 88 | UseUseExplosion.rb:20:266:20:275 | ... > ... |
 | UseUseExplosion.rb:20:278:20:3492 | then ... | UseUseExplosion.rb:20:262:20:3508 | if ... |
 | UseUseExplosion.rb:20:283:20:3492 | if ... | UseUseExplosion.rb:20:278:20:3492 | then ... |
@@ -338,8 +325,7 @@
 | UseUseExplosion.rb:20:287:20:291 | [post] self | UseUseExplosion.rb:20:3483:20:3488 | self |
 | UseUseExplosion.rb:20:287:20:291 | self | UseUseExplosion.rb:20:308:20:312 | self |
 | UseUseExplosion.rb:20:287:20:291 | self | UseUseExplosion.rb:20:3483:20:3488 | self |
-| UseUseExplosion.rb:20:287:20:296 | ... > ... | UseUseExplosion.rb:20:286:20:297 | [false] ( ... ) |
-| UseUseExplosion.rb:20:287:20:296 | ... > ... | UseUseExplosion.rb:20:286:20:297 | [true] ( ... ) |
+| UseUseExplosion.rb:20:287:20:296 | ... > ... | UseUseExplosion.rb:20:286:20:297 | ( ... ) |
 | UseUseExplosion.rb:20:295:20:296 | 87 | UseUseExplosion.rb:20:287:20:296 | ... > ... |
 | UseUseExplosion.rb:20:299:20:3476 | then ... | UseUseExplosion.rb:20:283:20:3492 | if ... |
 | UseUseExplosion.rb:20:304:20:3476 | if ... | UseUseExplosion.rb:20:299:20:3476 | then ... |
@@ -348,8 +334,7 @@
 | UseUseExplosion.rb:20:308:20:312 | [post] self | UseUseExplosion.rb:20:3467:20:3472 | self |
 | UseUseExplosion.rb:20:308:20:312 | self | UseUseExplosion.rb:20:329:20:333 | self |
 | UseUseExplosion.rb:20:308:20:312 | self | UseUseExplosion.rb:20:3467:20:3472 | self |
-| UseUseExplosion.rb:20:308:20:317 | ... > ... | UseUseExplosion.rb:20:307:20:318 | [false] ( ... ) |
-| UseUseExplosion.rb:20:308:20:317 | ... > ... | UseUseExplosion.rb:20:307:20:318 | [true] ( ... ) |
+| UseUseExplosion.rb:20:308:20:317 | ... > ... | UseUseExplosion.rb:20:307:20:318 | ( ... ) |
 | UseUseExplosion.rb:20:316:20:317 | 86 | UseUseExplosion.rb:20:308:20:317 | ... > ... |
 | UseUseExplosion.rb:20:320:20:3460 | then ... | UseUseExplosion.rb:20:304:20:3476 | if ... |
 | UseUseExplosion.rb:20:325:20:3460 | if ... | UseUseExplosion.rb:20:320:20:3460 | then ... |
@@ -358,8 +343,7 @@
 | UseUseExplosion.rb:20:329:20:333 | [post] self | UseUseExplosion.rb:20:3451:20:3456 | self |
 | UseUseExplosion.rb:20:329:20:333 | self | UseUseExplosion.rb:20:350:20:354 | self |
 | UseUseExplosion.rb:20:329:20:333 | self | UseUseExplosion.rb:20:3451:20:3456 | self |
-| UseUseExplosion.rb:20:329:20:338 | ... > ... | UseUseExplosion.rb:20:328:20:339 | [false] ( ... ) |
-| UseUseExplosion.rb:20:329:20:338 | ... > ... | UseUseExplosion.rb:20:328:20:339 | [true] ( ... ) |
+| UseUseExplosion.rb:20:329:20:338 | ... > ... | UseUseExplosion.rb:20:328:20:339 | ( ... ) |
 | UseUseExplosion.rb:20:337:20:338 | 85 | UseUseExplosion.rb:20:329:20:338 | ... > ... |
 | UseUseExplosion.rb:20:341:20:3444 | then ... | UseUseExplosion.rb:20:325:20:3460 | if ... |
 | UseUseExplosion.rb:20:346:20:3444 | if ... | UseUseExplosion.rb:20:341:20:3444 | then ... |
@@ -368,8 +352,7 @@
 | UseUseExplosion.rb:20:350:20:354 | [post] self | UseUseExplosion.rb:20:3435:20:3440 | self |
 | UseUseExplosion.rb:20:350:20:354 | self | UseUseExplosion.rb:20:371:20:375 | self |
 | UseUseExplosion.rb:20:350:20:354 | self | UseUseExplosion.rb:20:3435:20:3440 | self |
-| UseUseExplosion.rb:20:350:20:359 | ... > ... | UseUseExplosion.rb:20:349:20:360 | [false] ( ... ) |
-| UseUseExplosion.rb:20:350:20:359 | ... > ... | UseUseExplosion.rb:20:349:20:360 | [true] ( ... ) |
+| UseUseExplosion.rb:20:350:20:359 | ... > ... | UseUseExplosion.rb:20:349:20:360 | ( ... ) |
 | UseUseExplosion.rb:20:358:20:359 | 84 | UseUseExplosion.rb:20:350:20:359 | ... > ... |
 | UseUseExplosion.rb:20:362:20:3428 | then ... | UseUseExplosion.rb:20:346:20:3444 | if ... |
 | UseUseExplosion.rb:20:367:20:3428 | if ... | UseUseExplosion.rb:20:362:20:3428 | then ... |
@@ -378,8 +361,7 @@
 | UseUseExplosion.rb:20:371:20:375 | [post] self | UseUseExplosion.rb:20:3419:20:3424 | self |
 | UseUseExplosion.rb:20:371:20:375 | self | UseUseExplosion.rb:20:392:20:396 | self |
 | UseUseExplosion.rb:20:371:20:375 | self | UseUseExplosion.rb:20:3419:20:3424 | self |
-| UseUseExplosion.rb:20:371:20:380 | ... > ... | UseUseExplosion.rb:20:370:20:381 | [false] ( ... ) |
-| UseUseExplosion.rb:20:371:20:380 | ... > ... | UseUseExplosion.rb:20:370:20:381 | [true] ( ... ) |
+| UseUseExplosion.rb:20:371:20:380 | ... > ... | UseUseExplosion.rb:20:370:20:381 | ( ... ) |
 | UseUseExplosion.rb:20:379:20:380 | 83 | UseUseExplosion.rb:20:371:20:380 | ... > ... |
 | UseUseExplosion.rb:20:383:20:3412 | then ... | UseUseExplosion.rb:20:367:20:3428 | if ... |
 | UseUseExplosion.rb:20:388:20:3412 | if ... | UseUseExplosion.rb:20:383:20:3412 | then ... |
@@ -388,8 +370,7 @@
 | UseUseExplosion.rb:20:392:20:396 | [post] self | UseUseExplosion.rb:20:3403:20:3408 | self |
 | UseUseExplosion.rb:20:392:20:396 | self | UseUseExplosion.rb:20:413:20:417 | self |
 | UseUseExplosion.rb:20:392:20:396 | self | UseUseExplosion.rb:20:3403:20:3408 | self |
-| UseUseExplosion.rb:20:392:20:401 | ... > ... | UseUseExplosion.rb:20:391:20:402 | [false] ( ... ) |
-| UseUseExplosion.rb:20:392:20:401 | ... > ... | UseUseExplosion.rb:20:391:20:402 | [true] ( ... ) |
+| UseUseExplosion.rb:20:392:20:401 | ... > ... | UseUseExplosion.rb:20:391:20:402 | ( ... ) |
 | UseUseExplosion.rb:20:400:20:401 | 82 | UseUseExplosion.rb:20:392:20:401 | ... > ... |
 | UseUseExplosion.rb:20:404:20:3396 | then ... | UseUseExplosion.rb:20:388:20:3412 | if ... |
 | UseUseExplosion.rb:20:409:20:3396 | if ... | UseUseExplosion.rb:20:404:20:3396 | then ... |
@@ -398,8 +379,7 @@
 | UseUseExplosion.rb:20:413:20:417 | [post] self | UseUseExplosion.rb:20:3387:20:3392 | self |
 | UseUseExplosion.rb:20:413:20:417 | self | UseUseExplosion.rb:20:434:20:438 | self |
 | UseUseExplosion.rb:20:413:20:417 | self | UseUseExplosion.rb:20:3387:20:3392 | self |
-| UseUseExplosion.rb:20:413:20:422 | ... > ... | UseUseExplosion.rb:20:412:20:423 | [false] ( ... ) |
-| UseUseExplosion.rb:20:413:20:422 | ... > ... | UseUseExplosion.rb:20:412:20:423 | [true] ( ... ) |
+| UseUseExplosion.rb:20:413:20:422 | ... > ... | UseUseExplosion.rb:20:412:20:423 | ( ... ) |
 | UseUseExplosion.rb:20:421:20:422 | 81 | UseUseExplosion.rb:20:413:20:422 | ... > ... |
 | UseUseExplosion.rb:20:425:20:3380 | then ... | UseUseExplosion.rb:20:409:20:3396 | if ... |
 | UseUseExplosion.rb:20:430:20:3380 | if ... | UseUseExplosion.rb:20:425:20:3380 | then ... |
@@ -408,8 +388,7 @@
 | UseUseExplosion.rb:20:434:20:438 | [post] self | UseUseExplosion.rb:20:3371:20:3376 | self |
 | UseUseExplosion.rb:20:434:20:438 | self | UseUseExplosion.rb:20:455:20:459 | self |
 | UseUseExplosion.rb:20:434:20:438 | self | UseUseExplosion.rb:20:3371:20:3376 | self |
-| UseUseExplosion.rb:20:434:20:443 | ... > ... | UseUseExplosion.rb:20:433:20:444 | [false] ( ... ) |
-| UseUseExplosion.rb:20:434:20:443 | ... > ... | UseUseExplosion.rb:20:433:20:444 | [true] ( ... ) |
+| UseUseExplosion.rb:20:434:20:443 | ... > ... | UseUseExplosion.rb:20:433:20:444 | ( ... ) |
 | UseUseExplosion.rb:20:442:20:443 | 80 | UseUseExplosion.rb:20:434:20:443 | ... > ... |
 | UseUseExplosion.rb:20:446:20:3364 | then ... | UseUseExplosion.rb:20:430:20:3380 | if ... |
 | UseUseExplosion.rb:20:451:20:3364 | if ... | UseUseExplosion.rb:20:446:20:3364 | then ... |
@@ -418,8 +397,7 @@
 | UseUseExplosion.rb:20:455:20:459 | [post] self | UseUseExplosion.rb:20:3355:20:3360 | self |
 | UseUseExplosion.rb:20:455:20:459 | self | UseUseExplosion.rb:20:476:20:480 | self |
 | UseUseExplosion.rb:20:455:20:459 | self | UseUseExplosion.rb:20:3355:20:3360 | self |
-| UseUseExplosion.rb:20:455:20:464 | ... > ... | UseUseExplosion.rb:20:454:20:465 | [false] ( ... ) |
-| UseUseExplosion.rb:20:455:20:464 | ... > ... | UseUseExplosion.rb:20:454:20:465 | [true] ( ... ) |
+| UseUseExplosion.rb:20:455:20:464 | ... > ... | UseUseExplosion.rb:20:454:20:465 | ( ... ) |
 | UseUseExplosion.rb:20:463:20:464 | 79 | UseUseExplosion.rb:20:455:20:464 | ... > ... |
 | UseUseExplosion.rb:20:467:20:3348 | then ... | UseUseExplosion.rb:20:451:20:3364 | if ... |
 | UseUseExplosion.rb:20:472:20:3348 | if ... | UseUseExplosion.rb:20:467:20:3348 | then ... |
@@ -428,8 +406,7 @@
 | UseUseExplosion.rb:20:476:20:480 | [post] self | UseUseExplosion.rb:20:3339:20:3344 | self |
 | UseUseExplosion.rb:20:476:20:480 | self | UseUseExplosion.rb:20:497:20:501 | self |
 | UseUseExplosion.rb:20:476:20:480 | self | UseUseExplosion.rb:20:3339:20:3344 | self |
-| UseUseExplosion.rb:20:476:20:485 | ... > ... | UseUseExplosion.rb:20:475:20:486 | [false] ( ... ) |
-| UseUseExplosion.rb:20:476:20:485 | ... > ... | UseUseExplosion.rb:20:475:20:486 | [true] ( ... ) |
+| UseUseExplosion.rb:20:476:20:485 | ... > ... | UseUseExplosion.rb:20:475:20:486 | ( ... ) |
 | UseUseExplosion.rb:20:484:20:485 | 78 | UseUseExplosion.rb:20:476:20:485 | ... > ... |
 | UseUseExplosion.rb:20:488:20:3332 | then ... | UseUseExplosion.rb:20:472:20:3348 | if ... |
 | UseUseExplosion.rb:20:493:20:3332 | if ... | UseUseExplosion.rb:20:488:20:3332 | then ... |
@@ -438,8 +415,7 @@
 | UseUseExplosion.rb:20:497:20:501 | [post] self | UseUseExplosion.rb:20:3323:20:3328 | self |
 | UseUseExplosion.rb:20:497:20:501 | self | UseUseExplosion.rb:20:518:20:522 | self |
 | UseUseExplosion.rb:20:497:20:501 | self | UseUseExplosion.rb:20:3323:20:3328 | self |
-| UseUseExplosion.rb:20:497:20:506 | ... > ... | UseUseExplosion.rb:20:496:20:507 | [false] ( ... ) |
-| UseUseExplosion.rb:20:497:20:506 | ... > ... | UseUseExplosion.rb:20:496:20:507 | [true] ( ... ) |
+| UseUseExplosion.rb:20:497:20:506 | ... > ... | UseUseExplosion.rb:20:496:20:507 | ( ... ) |
 | UseUseExplosion.rb:20:505:20:506 | 77 | UseUseExplosion.rb:20:497:20:506 | ... > ... |
 | UseUseExplosion.rb:20:509:20:3316 | then ... | UseUseExplosion.rb:20:493:20:3332 | if ... |
 | UseUseExplosion.rb:20:514:20:3316 | if ... | UseUseExplosion.rb:20:509:20:3316 | then ... |
@@ -448,8 +424,7 @@
 | UseUseExplosion.rb:20:518:20:522 | [post] self | UseUseExplosion.rb:20:3307:20:3312 | self |
 | UseUseExplosion.rb:20:518:20:522 | self | UseUseExplosion.rb:20:539:20:543 | self |
 | UseUseExplosion.rb:20:518:20:522 | self | UseUseExplosion.rb:20:3307:20:3312 | self |
-| UseUseExplosion.rb:20:518:20:527 | ... > ... | UseUseExplosion.rb:20:517:20:528 | [false] ( ... ) |
-| UseUseExplosion.rb:20:518:20:527 | ... > ... | UseUseExplosion.rb:20:517:20:528 | [true] ( ... ) |
+| UseUseExplosion.rb:20:518:20:527 | ... > ... | UseUseExplosion.rb:20:517:20:528 | ( ... ) |
 | UseUseExplosion.rb:20:526:20:527 | 76 | UseUseExplosion.rb:20:518:20:527 | ... > ... |
 | UseUseExplosion.rb:20:530:20:3300 | then ... | UseUseExplosion.rb:20:514:20:3316 | if ... |
 | UseUseExplosion.rb:20:535:20:3300 | if ... | UseUseExplosion.rb:20:530:20:3300 | then ... |
@@ -458,8 +433,7 @@
 | UseUseExplosion.rb:20:539:20:543 | [post] self | UseUseExplosion.rb:20:3291:20:3296 | self |
 | UseUseExplosion.rb:20:539:20:543 | self | UseUseExplosion.rb:20:560:20:564 | self |
 | UseUseExplosion.rb:20:539:20:543 | self | UseUseExplosion.rb:20:3291:20:3296 | self |
-| UseUseExplosion.rb:20:539:20:548 | ... > ... | UseUseExplosion.rb:20:538:20:549 | [false] ( ... ) |
-| UseUseExplosion.rb:20:539:20:548 | ... > ... | UseUseExplosion.rb:20:538:20:549 | [true] ( ... ) |
+| UseUseExplosion.rb:20:539:20:548 | ... > ... | UseUseExplosion.rb:20:538:20:549 | ( ... ) |
 | UseUseExplosion.rb:20:547:20:548 | 75 | UseUseExplosion.rb:20:539:20:548 | ... > ... |
 | UseUseExplosion.rb:20:551:20:3284 | then ... | UseUseExplosion.rb:20:535:20:3300 | if ... |
 | UseUseExplosion.rb:20:556:20:3284 | if ... | UseUseExplosion.rb:20:551:20:3284 | then ... |
@@ -468,8 +442,7 @@
 | UseUseExplosion.rb:20:560:20:564 | [post] self | UseUseExplosion.rb:20:3275:20:3280 | self |
 | UseUseExplosion.rb:20:560:20:564 | self | UseUseExplosion.rb:20:581:20:585 | self |
 | UseUseExplosion.rb:20:560:20:564 | self | UseUseExplosion.rb:20:3275:20:3280 | self |
-| UseUseExplosion.rb:20:560:20:569 | ... > ... | UseUseExplosion.rb:20:559:20:570 | [false] ( ... ) |
-| UseUseExplosion.rb:20:560:20:569 | ... > ... | UseUseExplosion.rb:20:559:20:570 | [true] ( ... ) |
+| UseUseExplosion.rb:20:560:20:569 | ... > ... | UseUseExplosion.rb:20:559:20:570 | ( ... ) |
 | UseUseExplosion.rb:20:568:20:569 | 74 | UseUseExplosion.rb:20:560:20:569 | ... > ... |
 | UseUseExplosion.rb:20:572:20:3268 | then ... | UseUseExplosion.rb:20:556:20:3284 | if ... |
 | UseUseExplosion.rb:20:577:20:3268 | if ... | UseUseExplosion.rb:20:572:20:3268 | then ... |
@@ -478,8 +451,7 @@
 | UseUseExplosion.rb:20:581:20:585 | [post] self | UseUseExplosion.rb:20:3259:20:3264 | self |
 | UseUseExplosion.rb:20:581:20:585 | self | UseUseExplosion.rb:20:602:20:606 | self |
 | UseUseExplosion.rb:20:581:20:585 | self | UseUseExplosion.rb:20:3259:20:3264 | self |
-| UseUseExplosion.rb:20:581:20:590 | ... > ... | UseUseExplosion.rb:20:580:20:591 | [false] ( ... ) |
-| UseUseExplosion.rb:20:581:20:590 | ... > ... | UseUseExplosion.rb:20:580:20:591 | [true] ( ... ) |
+| UseUseExplosion.rb:20:581:20:590 | ... > ... | UseUseExplosion.rb:20:580:20:591 | ( ... ) |
 | UseUseExplosion.rb:20:589:20:590 | 73 | UseUseExplosion.rb:20:581:20:590 | ... > ... |
 | UseUseExplosion.rb:20:593:20:3252 | then ... | UseUseExplosion.rb:20:577:20:3268 | if ... |
 | UseUseExplosion.rb:20:598:20:3252 | if ... | UseUseExplosion.rb:20:593:20:3252 | then ... |
@@ -488,8 +460,7 @@
 | UseUseExplosion.rb:20:602:20:606 | [post] self | UseUseExplosion.rb:20:3243:20:3248 | self |
 | UseUseExplosion.rb:20:602:20:606 | self | UseUseExplosion.rb:20:623:20:627 | self |
 | UseUseExplosion.rb:20:602:20:606 | self | UseUseExplosion.rb:20:3243:20:3248 | self |
-| UseUseExplosion.rb:20:602:20:611 | ... > ... | UseUseExplosion.rb:20:601:20:612 | [false] ( ... ) |
-| UseUseExplosion.rb:20:602:20:611 | ... > ... | UseUseExplosion.rb:20:601:20:612 | [true] ( ... ) |
+| UseUseExplosion.rb:20:602:20:611 | ... > ... | UseUseExplosion.rb:20:601:20:612 | ( ... ) |
 | UseUseExplosion.rb:20:610:20:611 | 72 | UseUseExplosion.rb:20:602:20:611 | ... > ... |
 | UseUseExplosion.rb:20:614:20:3236 | then ... | UseUseExplosion.rb:20:598:20:3252 | if ... |
 | UseUseExplosion.rb:20:619:20:3236 | if ... | UseUseExplosion.rb:20:614:20:3236 | then ... |
@@ -498,8 +469,7 @@
 | UseUseExplosion.rb:20:623:20:627 | [post] self | UseUseExplosion.rb:20:3227:20:3232 | self |
 | UseUseExplosion.rb:20:623:20:627 | self | UseUseExplosion.rb:20:644:20:648 | self |
 | UseUseExplosion.rb:20:623:20:627 | self | UseUseExplosion.rb:20:3227:20:3232 | self |
-| UseUseExplosion.rb:20:623:20:632 | ... > ... | UseUseExplosion.rb:20:622:20:633 | [false] ( ... ) |
-| UseUseExplosion.rb:20:623:20:632 | ... > ... | UseUseExplosion.rb:20:622:20:633 | [true] ( ... ) |
+| UseUseExplosion.rb:20:623:20:632 | ... > ... | UseUseExplosion.rb:20:622:20:633 | ( ... ) |
 | UseUseExplosion.rb:20:631:20:632 | 71 | UseUseExplosion.rb:20:623:20:632 | ... > ... |
 | UseUseExplosion.rb:20:635:20:3220 | then ... | UseUseExplosion.rb:20:619:20:3236 | if ... |
 | UseUseExplosion.rb:20:640:20:3220 | if ... | UseUseExplosion.rb:20:635:20:3220 | then ... |
@@ -508,8 +478,7 @@
 | UseUseExplosion.rb:20:644:20:648 | [post] self | UseUseExplosion.rb:20:3211:20:3216 | self |
 | UseUseExplosion.rb:20:644:20:648 | self | UseUseExplosion.rb:20:665:20:669 | self |
 | UseUseExplosion.rb:20:644:20:648 | self | UseUseExplosion.rb:20:3211:20:3216 | self |
-| UseUseExplosion.rb:20:644:20:653 | ... > ... | UseUseExplosion.rb:20:643:20:654 | [false] ( ... ) |
-| UseUseExplosion.rb:20:644:20:653 | ... > ... | UseUseExplosion.rb:20:643:20:654 | [true] ( ... ) |
+| UseUseExplosion.rb:20:644:20:653 | ... > ... | UseUseExplosion.rb:20:643:20:654 | ( ... ) |
 | UseUseExplosion.rb:20:652:20:653 | 70 | UseUseExplosion.rb:20:644:20:653 | ... > ... |
 | UseUseExplosion.rb:20:656:20:3204 | then ... | UseUseExplosion.rb:20:640:20:3220 | if ... |
 | UseUseExplosion.rb:20:661:20:3204 | if ... | UseUseExplosion.rb:20:656:20:3204 | then ... |
@@ -518,8 +487,7 @@
 | UseUseExplosion.rb:20:665:20:669 | [post] self | UseUseExplosion.rb:20:3195:20:3200 | self |
 | UseUseExplosion.rb:20:665:20:669 | self | UseUseExplosion.rb:20:686:20:690 | self |
 | UseUseExplosion.rb:20:665:20:669 | self | UseUseExplosion.rb:20:3195:20:3200 | self |
-| UseUseExplosion.rb:20:665:20:674 | ... > ... | UseUseExplosion.rb:20:664:20:675 | [false] ( ... ) |
-| UseUseExplosion.rb:20:665:20:674 | ... > ... | UseUseExplosion.rb:20:664:20:675 | [true] ( ... ) |
+| UseUseExplosion.rb:20:665:20:674 | ... > ... | UseUseExplosion.rb:20:664:20:675 | ( ... ) |
 | UseUseExplosion.rb:20:673:20:674 | 69 | UseUseExplosion.rb:20:665:20:674 | ... > ... |
 | UseUseExplosion.rb:20:677:20:3188 | then ... | UseUseExplosion.rb:20:661:20:3204 | if ... |
 | UseUseExplosion.rb:20:682:20:3188 | if ... | UseUseExplosion.rb:20:677:20:3188 | then ... |
@@ -528,8 +496,7 @@
 | UseUseExplosion.rb:20:686:20:690 | [post] self | UseUseExplosion.rb:20:3179:20:3184 | self |
 | UseUseExplosion.rb:20:686:20:690 | self | UseUseExplosion.rb:20:707:20:711 | self |
 | UseUseExplosion.rb:20:686:20:690 | self | UseUseExplosion.rb:20:3179:20:3184 | self |
-| UseUseExplosion.rb:20:686:20:695 | ... > ... | UseUseExplosion.rb:20:685:20:696 | [false] ( ... ) |
-| UseUseExplosion.rb:20:686:20:695 | ... > ... | UseUseExplosion.rb:20:685:20:696 | [true] ( ... ) |
+| UseUseExplosion.rb:20:686:20:695 | ... > ... | UseUseExplosion.rb:20:685:20:696 | ( ... ) |
 | UseUseExplosion.rb:20:694:20:695 | 68 | UseUseExplosion.rb:20:686:20:695 | ... > ... |
 | UseUseExplosion.rb:20:698:20:3172 | then ... | UseUseExplosion.rb:20:682:20:3188 | if ... |
 | UseUseExplosion.rb:20:703:20:3172 | if ... | UseUseExplosion.rb:20:698:20:3172 | then ... |
@@ -538,8 +505,7 @@
 | UseUseExplosion.rb:20:707:20:711 | [post] self | UseUseExplosion.rb:20:3163:20:3168 | self |
 | UseUseExplosion.rb:20:707:20:711 | self | UseUseExplosion.rb:20:728:20:732 | self |
 | UseUseExplosion.rb:20:707:20:711 | self | UseUseExplosion.rb:20:3163:20:3168 | self |
-| UseUseExplosion.rb:20:707:20:716 | ... > ... | UseUseExplosion.rb:20:706:20:717 | [false] ( ... ) |
-| UseUseExplosion.rb:20:707:20:716 | ... > ... | UseUseExplosion.rb:20:706:20:717 | [true] ( ... ) |
+| UseUseExplosion.rb:20:707:20:716 | ... > ... | UseUseExplosion.rb:20:706:20:717 | ( ... ) |
 | UseUseExplosion.rb:20:715:20:716 | 67 | UseUseExplosion.rb:20:707:20:716 | ... > ... |
 | UseUseExplosion.rb:20:719:20:3156 | then ... | UseUseExplosion.rb:20:703:20:3172 | if ... |
 | UseUseExplosion.rb:20:724:20:3156 | if ... | UseUseExplosion.rb:20:719:20:3156 | then ... |
@@ -548,8 +514,7 @@
 | UseUseExplosion.rb:20:728:20:732 | [post] self | UseUseExplosion.rb:20:3147:20:3152 | self |
 | UseUseExplosion.rb:20:728:20:732 | self | UseUseExplosion.rb:20:749:20:753 | self |
 | UseUseExplosion.rb:20:728:20:732 | self | UseUseExplosion.rb:20:3147:20:3152 | self |
-| UseUseExplosion.rb:20:728:20:737 | ... > ... | UseUseExplosion.rb:20:727:20:738 | [false] ( ... ) |
-| UseUseExplosion.rb:20:728:20:737 | ... > ... | UseUseExplosion.rb:20:727:20:738 | [true] ( ... ) |
+| UseUseExplosion.rb:20:728:20:737 | ... > ... | UseUseExplosion.rb:20:727:20:738 | ( ... ) |
 | UseUseExplosion.rb:20:736:20:737 | 66 | UseUseExplosion.rb:20:728:20:737 | ... > ... |
 | UseUseExplosion.rb:20:740:20:3140 | then ... | UseUseExplosion.rb:20:724:20:3156 | if ... |
 | UseUseExplosion.rb:20:745:20:3140 | if ... | UseUseExplosion.rb:20:740:20:3140 | then ... |
@@ -558,8 +523,7 @@
 | UseUseExplosion.rb:20:749:20:753 | [post] self | UseUseExplosion.rb:20:3131:20:3136 | self |
 | UseUseExplosion.rb:20:749:20:753 | self | UseUseExplosion.rb:20:770:20:774 | self |
 | UseUseExplosion.rb:20:749:20:753 | self | UseUseExplosion.rb:20:3131:20:3136 | self |
-| UseUseExplosion.rb:20:749:20:758 | ... > ... | UseUseExplosion.rb:20:748:20:759 | [false] ( ... ) |
-| UseUseExplosion.rb:20:749:20:758 | ... > ... | UseUseExplosion.rb:20:748:20:759 | [true] ( ... ) |
+| UseUseExplosion.rb:20:749:20:758 | ... > ... | UseUseExplosion.rb:20:748:20:759 | ( ... ) |
 | UseUseExplosion.rb:20:757:20:758 | 65 | UseUseExplosion.rb:20:749:20:758 | ... > ... |
 | UseUseExplosion.rb:20:761:20:3124 | then ... | UseUseExplosion.rb:20:745:20:3140 | if ... |
 | UseUseExplosion.rb:20:766:20:3124 | if ... | UseUseExplosion.rb:20:761:20:3124 | then ... |
@@ -568,8 +532,7 @@
 | UseUseExplosion.rb:20:770:20:774 | [post] self | UseUseExplosion.rb:20:3115:20:3120 | self |
 | UseUseExplosion.rb:20:770:20:774 | self | UseUseExplosion.rb:20:791:20:795 | self |
 | UseUseExplosion.rb:20:770:20:774 | self | UseUseExplosion.rb:20:3115:20:3120 | self |
-| UseUseExplosion.rb:20:770:20:779 | ... > ... | UseUseExplosion.rb:20:769:20:780 | [false] ( ... ) |
-| UseUseExplosion.rb:20:770:20:779 | ... > ... | UseUseExplosion.rb:20:769:20:780 | [true] ( ... ) |
+| UseUseExplosion.rb:20:770:20:779 | ... > ... | UseUseExplosion.rb:20:769:20:780 | ( ... ) |
 | UseUseExplosion.rb:20:778:20:779 | 64 | UseUseExplosion.rb:20:770:20:779 | ... > ... |
 | UseUseExplosion.rb:20:782:20:3108 | then ... | UseUseExplosion.rb:20:766:20:3124 | if ... |
 | UseUseExplosion.rb:20:787:20:3108 | if ... | UseUseExplosion.rb:20:782:20:3108 | then ... |
@@ -578,8 +541,7 @@
 | UseUseExplosion.rb:20:791:20:795 | [post] self | UseUseExplosion.rb:20:3099:20:3104 | self |
 | UseUseExplosion.rb:20:791:20:795 | self | UseUseExplosion.rb:20:812:20:816 | self |
 | UseUseExplosion.rb:20:791:20:795 | self | UseUseExplosion.rb:20:3099:20:3104 | self |
-| UseUseExplosion.rb:20:791:20:800 | ... > ... | UseUseExplosion.rb:20:790:20:801 | [false] ( ... ) |
-| UseUseExplosion.rb:20:791:20:800 | ... > ... | UseUseExplosion.rb:20:790:20:801 | [true] ( ... ) |
+| UseUseExplosion.rb:20:791:20:800 | ... > ... | UseUseExplosion.rb:20:790:20:801 | ( ... ) |
 | UseUseExplosion.rb:20:799:20:800 | 63 | UseUseExplosion.rb:20:791:20:800 | ... > ... |
 | UseUseExplosion.rb:20:803:20:3092 | then ... | UseUseExplosion.rb:20:787:20:3108 | if ... |
 | UseUseExplosion.rb:20:808:20:3092 | if ... | UseUseExplosion.rb:20:803:20:3092 | then ... |
@@ -588,8 +550,7 @@
 | UseUseExplosion.rb:20:812:20:816 | [post] self | UseUseExplosion.rb:20:3083:20:3088 | self |
 | UseUseExplosion.rb:20:812:20:816 | self | UseUseExplosion.rb:20:833:20:837 | self |
 | UseUseExplosion.rb:20:812:20:816 | self | UseUseExplosion.rb:20:3083:20:3088 | self |
-| UseUseExplosion.rb:20:812:20:821 | ... > ... | UseUseExplosion.rb:20:811:20:822 | [false] ( ... ) |
-| UseUseExplosion.rb:20:812:20:821 | ... > ... | UseUseExplosion.rb:20:811:20:822 | [true] ( ... ) |
+| UseUseExplosion.rb:20:812:20:821 | ... > ... | UseUseExplosion.rb:20:811:20:822 | ( ... ) |
 | UseUseExplosion.rb:20:820:20:821 | 62 | UseUseExplosion.rb:20:812:20:821 | ... > ... |
 | UseUseExplosion.rb:20:824:20:3076 | then ... | UseUseExplosion.rb:20:808:20:3092 | if ... |
 | UseUseExplosion.rb:20:829:20:3076 | if ... | UseUseExplosion.rb:20:824:20:3076 | then ... |
@@ -598,8 +559,7 @@
 | UseUseExplosion.rb:20:833:20:837 | [post] self | UseUseExplosion.rb:20:3067:20:3072 | self |
 | UseUseExplosion.rb:20:833:20:837 | self | UseUseExplosion.rb:20:854:20:858 | self |
 | UseUseExplosion.rb:20:833:20:837 | self | UseUseExplosion.rb:20:3067:20:3072 | self |
-| UseUseExplosion.rb:20:833:20:842 | ... > ... | UseUseExplosion.rb:20:832:20:843 | [false] ( ... ) |
-| UseUseExplosion.rb:20:833:20:842 | ... > ... | UseUseExplosion.rb:20:832:20:843 | [true] ( ... ) |
+| UseUseExplosion.rb:20:833:20:842 | ... > ... | UseUseExplosion.rb:20:832:20:843 | ( ... ) |
 | UseUseExplosion.rb:20:841:20:842 | 61 | UseUseExplosion.rb:20:833:20:842 | ... > ... |
 | UseUseExplosion.rb:20:845:20:3060 | then ... | UseUseExplosion.rb:20:829:20:3076 | if ... |
 | UseUseExplosion.rb:20:850:20:3060 | if ... | UseUseExplosion.rb:20:845:20:3060 | then ... |
@@ -608,8 +568,7 @@
 | UseUseExplosion.rb:20:854:20:858 | [post] self | UseUseExplosion.rb:20:3051:20:3056 | self |
 | UseUseExplosion.rb:20:854:20:858 | self | UseUseExplosion.rb:20:875:20:879 | self |
 | UseUseExplosion.rb:20:854:20:858 | self | UseUseExplosion.rb:20:3051:20:3056 | self |
-| UseUseExplosion.rb:20:854:20:863 | ... > ... | UseUseExplosion.rb:20:853:20:864 | [false] ( ... ) |
-| UseUseExplosion.rb:20:854:20:863 | ... > ... | UseUseExplosion.rb:20:853:20:864 | [true] ( ... ) |
+| UseUseExplosion.rb:20:854:20:863 | ... > ... | UseUseExplosion.rb:20:853:20:864 | ( ... ) |
 | UseUseExplosion.rb:20:862:20:863 | 60 | UseUseExplosion.rb:20:854:20:863 | ... > ... |
 | UseUseExplosion.rb:20:866:20:3044 | then ... | UseUseExplosion.rb:20:850:20:3060 | if ... |
 | UseUseExplosion.rb:20:871:20:3044 | if ... | UseUseExplosion.rb:20:866:20:3044 | then ... |
@@ -618,8 +577,7 @@
 | UseUseExplosion.rb:20:875:20:879 | [post] self | UseUseExplosion.rb:20:3035:20:3040 | self |
 | UseUseExplosion.rb:20:875:20:879 | self | UseUseExplosion.rb:20:896:20:900 | self |
 | UseUseExplosion.rb:20:875:20:879 | self | UseUseExplosion.rb:20:3035:20:3040 | self |
-| UseUseExplosion.rb:20:875:20:884 | ... > ... | UseUseExplosion.rb:20:874:20:885 | [false] ( ... ) |
-| UseUseExplosion.rb:20:875:20:884 | ... > ... | UseUseExplosion.rb:20:874:20:885 | [true] ( ... ) |
+| UseUseExplosion.rb:20:875:20:884 | ... > ... | UseUseExplosion.rb:20:874:20:885 | ( ... ) |
 | UseUseExplosion.rb:20:883:20:884 | 59 | UseUseExplosion.rb:20:875:20:884 | ... > ... |
 | UseUseExplosion.rb:20:887:20:3028 | then ... | UseUseExplosion.rb:20:871:20:3044 | if ... |
 | UseUseExplosion.rb:20:892:20:3028 | if ... | UseUseExplosion.rb:20:887:20:3028 | then ... |
@@ -628,8 +586,7 @@
 | UseUseExplosion.rb:20:896:20:900 | [post] self | UseUseExplosion.rb:20:3019:20:3024 | self |
 | UseUseExplosion.rb:20:896:20:900 | self | UseUseExplosion.rb:20:917:20:921 | self |
 | UseUseExplosion.rb:20:896:20:900 | self | UseUseExplosion.rb:20:3019:20:3024 | self |
-| UseUseExplosion.rb:20:896:20:905 | ... > ... | UseUseExplosion.rb:20:895:20:906 | [false] ( ... ) |
-| UseUseExplosion.rb:20:896:20:905 | ... > ... | UseUseExplosion.rb:20:895:20:906 | [true] ( ... ) |
+| UseUseExplosion.rb:20:896:20:905 | ... > ... | UseUseExplosion.rb:20:895:20:906 | ( ... ) |
 | UseUseExplosion.rb:20:904:20:905 | 58 | UseUseExplosion.rb:20:896:20:905 | ... > ... |
 | UseUseExplosion.rb:20:908:20:3012 | then ... | UseUseExplosion.rb:20:892:20:3028 | if ... |
 | UseUseExplosion.rb:20:913:20:3012 | if ... | UseUseExplosion.rb:20:908:20:3012 | then ... |
@@ -638,8 +595,7 @@
 | UseUseExplosion.rb:20:917:20:921 | [post] self | UseUseExplosion.rb:20:3003:20:3008 | self |
 | UseUseExplosion.rb:20:917:20:921 | self | UseUseExplosion.rb:20:938:20:942 | self |
 | UseUseExplosion.rb:20:917:20:921 | self | UseUseExplosion.rb:20:3003:20:3008 | self |
-| UseUseExplosion.rb:20:917:20:926 | ... > ... | UseUseExplosion.rb:20:916:20:927 | [false] ( ... ) |
-| UseUseExplosion.rb:20:917:20:926 | ... > ... | UseUseExplosion.rb:20:916:20:927 | [true] ( ... ) |
+| UseUseExplosion.rb:20:917:20:926 | ... > ... | UseUseExplosion.rb:20:916:20:927 | ( ... ) |
 | UseUseExplosion.rb:20:925:20:926 | 57 | UseUseExplosion.rb:20:917:20:926 | ... > ... |
 | UseUseExplosion.rb:20:929:20:2996 | then ... | UseUseExplosion.rb:20:913:20:3012 | if ... |
 | UseUseExplosion.rb:20:934:20:2996 | if ... | UseUseExplosion.rb:20:929:20:2996 | then ... |
@@ -648,8 +604,7 @@
 | UseUseExplosion.rb:20:938:20:942 | [post] self | UseUseExplosion.rb:20:2987:20:2992 | self |
 | UseUseExplosion.rb:20:938:20:942 | self | UseUseExplosion.rb:20:959:20:963 | self |
 | UseUseExplosion.rb:20:938:20:942 | self | UseUseExplosion.rb:20:2987:20:2992 | self |
-| UseUseExplosion.rb:20:938:20:947 | ... > ... | UseUseExplosion.rb:20:937:20:948 | [false] ( ... ) |
-| UseUseExplosion.rb:20:938:20:947 | ... > ... | UseUseExplosion.rb:20:937:20:948 | [true] ( ... ) |
+| UseUseExplosion.rb:20:938:20:947 | ... > ... | UseUseExplosion.rb:20:937:20:948 | ( ... ) |
 | UseUseExplosion.rb:20:946:20:947 | 56 | UseUseExplosion.rb:20:938:20:947 | ... > ... |
 | UseUseExplosion.rb:20:950:20:2980 | then ... | UseUseExplosion.rb:20:934:20:2996 | if ... |
 | UseUseExplosion.rb:20:955:20:2980 | if ... | UseUseExplosion.rb:20:950:20:2980 | then ... |
@@ -658,8 +613,7 @@
 | UseUseExplosion.rb:20:959:20:963 | [post] self | UseUseExplosion.rb:20:2971:20:2976 | self |
 | UseUseExplosion.rb:20:959:20:963 | self | UseUseExplosion.rb:20:980:20:984 | self |
 | UseUseExplosion.rb:20:959:20:963 | self | UseUseExplosion.rb:20:2971:20:2976 | self |
-| UseUseExplosion.rb:20:959:20:968 | ... > ... | UseUseExplosion.rb:20:958:20:969 | [false] ( ... ) |
-| UseUseExplosion.rb:20:959:20:968 | ... > ... | UseUseExplosion.rb:20:958:20:969 | [true] ( ... ) |
+| UseUseExplosion.rb:20:959:20:968 | ... > ... | UseUseExplosion.rb:20:958:20:969 | ( ... ) |
 | UseUseExplosion.rb:20:967:20:968 | 55 | UseUseExplosion.rb:20:959:20:968 | ... > ... |
 | UseUseExplosion.rb:20:971:20:2964 | then ... | UseUseExplosion.rb:20:955:20:2980 | if ... |
 | UseUseExplosion.rb:20:976:20:2964 | if ... | UseUseExplosion.rb:20:971:20:2964 | then ... |
@@ -668,8 +622,7 @@
 | UseUseExplosion.rb:20:980:20:984 | [post] self | UseUseExplosion.rb:20:2955:20:2960 | self |
 | UseUseExplosion.rb:20:980:20:984 | self | UseUseExplosion.rb:20:1001:20:1005 | self |
 | UseUseExplosion.rb:20:980:20:984 | self | UseUseExplosion.rb:20:2955:20:2960 | self |
-| UseUseExplosion.rb:20:980:20:989 | ... > ... | UseUseExplosion.rb:20:979:20:990 | [false] ( ... ) |
-| UseUseExplosion.rb:20:980:20:989 | ... > ... | UseUseExplosion.rb:20:979:20:990 | [true] ( ... ) |
+| UseUseExplosion.rb:20:980:20:989 | ... > ... | UseUseExplosion.rb:20:979:20:990 | ( ... ) |
 | UseUseExplosion.rb:20:988:20:989 | 54 | UseUseExplosion.rb:20:980:20:989 | ... > ... |
 | UseUseExplosion.rb:20:992:20:2948 | then ... | UseUseExplosion.rb:20:976:20:2964 | if ... |
 | UseUseExplosion.rb:20:997:20:2948 | if ... | UseUseExplosion.rb:20:992:20:2948 | then ... |
@@ -678,8 +631,7 @@
 | UseUseExplosion.rb:20:1001:20:1005 | [post] self | UseUseExplosion.rb:20:2939:20:2944 | self |
 | UseUseExplosion.rb:20:1001:20:1005 | self | UseUseExplosion.rb:20:1022:20:1026 | self |
 | UseUseExplosion.rb:20:1001:20:1005 | self | UseUseExplosion.rb:20:2939:20:2944 | self |
-| UseUseExplosion.rb:20:1001:20:1010 | ... > ... | UseUseExplosion.rb:20:1000:20:1011 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1001:20:1010 | ... > ... | UseUseExplosion.rb:20:1000:20:1011 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1001:20:1010 | ... > ... | UseUseExplosion.rb:20:1000:20:1011 | ( ... ) |
 | UseUseExplosion.rb:20:1009:20:1010 | 53 | UseUseExplosion.rb:20:1001:20:1010 | ... > ... |
 | UseUseExplosion.rb:20:1013:20:2932 | then ... | UseUseExplosion.rb:20:997:20:2948 | if ... |
 | UseUseExplosion.rb:20:1018:20:2932 | if ... | UseUseExplosion.rb:20:1013:20:2932 | then ... |
@@ -688,8 +640,7 @@
 | UseUseExplosion.rb:20:1022:20:1026 | [post] self | UseUseExplosion.rb:20:2923:20:2928 | self |
 | UseUseExplosion.rb:20:1022:20:1026 | self | UseUseExplosion.rb:20:1043:20:1047 | self |
 | UseUseExplosion.rb:20:1022:20:1026 | self | UseUseExplosion.rb:20:2923:20:2928 | self |
-| UseUseExplosion.rb:20:1022:20:1031 | ... > ... | UseUseExplosion.rb:20:1021:20:1032 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1022:20:1031 | ... > ... | UseUseExplosion.rb:20:1021:20:1032 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1022:20:1031 | ... > ... | UseUseExplosion.rb:20:1021:20:1032 | ( ... ) |
 | UseUseExplosion.rb:20:1030:20:1031 | 52 | UseUseExplosion.rb:20:1022:20:1031 | ... > ... |
 | UseUseExplosion.rb:20:1034:20:2916 | then ... | UseUseExplosion.rb:20:1018:20:2932 | if ... |
 | UseUseExplosion.rb:20:1039:20:2916 | if ... | UseUseExplosion.rb:20:1034:20:2916 | then ... |
@@ -698,8 +649,7 @@
 | UseUseExplosion.rb:20:1043:20:1047 | [post] self | UseUseExplosion.rb:20:2907:20:2912 | self |
 | UseUseExplosion.rb:20:1043:20:1047 | self | UseUseExplosion.rb:20:1064:20:1068 | self |
 | UseUseExplosion.rb:20:1043:20:1047 | self | UseUseExplosion.rb:20:2907:20:2912 | self |
-| UseUseExplosion.rb:20:1043:20:1052 | ... > ... | UseUseExplosion.rb:20:1042:20:1053 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1043:20:1052 | ... > ... | UseUseExplosion.rb:20:1042:20:1053 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1043:20:1052 | ... > ... | UseUseExplosion.rb:20:1042:20:1053 | ( ... ) |
 | UseUseExplosion.rb:20:1051:20:1052 | 51 | UseUseExplosion.rb:20:1043:20:1052 | ... > ... |
 | UseUseExplosion.rb:20:1055:20:2900 | then ... | UseUseExplosion.rb:20:1039:20:2916 | if ... |
 | UseUseExplosion.rb:20:1060:20:2900 | if ... | UseUseExplosion.rb:20:1055:20:2900 | then ... |
@@ -708,8 +658,7 @@
 | UseUseExplosion.rb:20:1064:20:1068 | [post] self | UseUseExplosion.rb:20:2891:20:2896 | self |
 | UseUseExplosion.rb:20:1064:20:1068 | self | UseUseExplosion.rb:20:1085:20:1089 | self |
 | UseUseExplosion.rb:20:1064:20:1068 | self | UseUseExplosion.rb:20:2891:20:2896 | self |
-| UseUseExplosion.rb:20:1064:20:1073 | ... > ... | UseUseExplosion.rb:20:1063:20:1074 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1064:20:1073 | ... > ... | UseUseExplosion.rb:20:1063:20:1074 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1064:20:1073 | ... > ... | UseUseExplosion.rb:20:1063:20:1074 | ( ... ) |
 | UseUseExplosion.rb:20:1072:20:1073 | 50 | UseUseExplosion.rb:20:1064:20:1073 | ... > ... |
 | UseUseExplosion.rb:20:1076:20:2884 | then ... | UseUseExplosion.rb:20:1060:20:2900 | if ... |
 | UseUseExplosion.rb:20:1081:20:2884 | if ... | UseUseExplosion.rb:20:1076:20:2884 | then ... |
@@ -718,8 +667,7 @@
 | UseUseExplosion.rb:20:1085:20:1089 | [post] self | UseUseExplosion.rb:20:2875:20:2880 | self |
 | UseUseExplosion.rb:20:1085:20:1089 | self | UseUseExplosion.rb:20:1106:20:1110 | self |
 | UseUseExplosion.rb:20:1085:20:1089 | self | UseUseExplosion.rb:20:2875:20:2880 | self |
-| UseUseExplosion.rb:20:1085:20:1094 | ... > ... | UseUseExplosion.rb:20:1084:20:1095 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1085:20:1094 | ... > ... | UseUseExplosion.rb:20:1084:20:1095 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1085:20:1094 | ... > ... | UseUseExplosion.rb:20:1084:20:1095 | ( ... ) |
 | UseUseExplosion.rb:20:1093:20:1094 | 49 | UseUseExplosion.rb:20:1085:20:1094 | ... > ... |
 | UseUseExplosion.rb:20:1097:20:2868 | then ... | UseUseExplosion.rb:20:1081:20:2884 | if ... |
 | UseUseExplosion.rb:20:1102:20:2868 | if ... | UseUseExplosion.rb:20:1097:20:2868 | then ... |
@@ -728,8 +676,7 @@
 | UseUseExplosion.rb:20:1106:20:1110 | [post] self | UseUseExplosion.rb:20:2859:20:2864 | self |
 | UseUseExplosion.rb:20:1106:20:1110 | self | UseUseExplosion.rb:20:1127:20:1131 | self |
 | UseUseExplosion.rb:20:1106:20:1110 | self | UseUseExplosion.rb:20:2859:20:2864 | self |
-| UseUseExplosion.rb:20:1106:20:1115 | ... > ... | UseUseExplosion.rb:20:1105:20:1116 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1106:20:1115 | ... > ... | UseUseExplosion.rb:20:1105:20:1116 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1106:20:1115 | ... > ... | UseUseExplosion.rb:20:1105:20:1116 | ( ... ) |
 | UseUseExplosion.rb:20:1114:20:1115 | 48 | UseUseExplosion.rb:20:1106:20:1115 | ... > ... |
 | UseUseExplosion.rb:20:1118:20:2852 | then ... | UseUseExplosion.rb:20:1102:20:2868 | if ... |
 | UseUseExplosion.rb:20:1123:20:2852 | if ... | UseUseExplosion.rb:20:1118:20:2852 | then ... |
@@ -738,8 +685,7 @@
 | UseUseExplosion.rb:20:1127:20:1131 | [post] self | UseUseExplosion.rb:20:2843:20:2848 | self |
 | UseUseExplosion.rb:20:1127:20:1131 | self | UseUseExplosion.rb:20:1148:20:1152 | self |
 | UseUseExplosion.rb:20:1127:20:1131 | self | UseUseExplosion.rb:20:2843:20:2848 | self |
-| UseUseExplosion.rb:20:1127:20:1136 | ... > ... | UseUseExplosion.rb:20:1126:20:1137 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1127:20:1136 | ... > ... | UseUseExplosion.rb:20:1126:20:1137 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1127:20:1136 | ... > ... | UseUseExplosion.rb:20:1126:20:1137 | ( ... ) |
 | UseUseExplosion.rb:20:1135:20:1136 | 47 | UseUseExplosion.rb:20:1127:20:1136 | ... > ... |
 | UseUseExplosion.rb:20:1139:20:2836 | then ... | UseUseExplosion.rb:20:1123:20:2852 | if ... |
 | UseUseExplosion.rb:20:1144:20:2836 | if ... | UseUseExplosion.rb:20:1139:20:2836 | then ... |
@@ -748,8 +694,7 @@
 | UseUseExplosion.rb:20:1148:20:1152 | [post] self | UseUseExplosion.rb:20:2827:20:2832 | self |
 | UseUseExplosion.rb:20:1148:20:1152 | self | UseUseExplosion.rb:20:1169:20:1173 | self |
 | UseUseExplosion.rb:20:1148:20:1152 | self | UseUseExplosion.rb:20:2827:20:2832 | self |
-| UseUseExplosion.rb:20:1148:20:1157 | ... > ... | UseUseExplosion.rb:20:1147:20:1158 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1148:20:1157 | ... > ... | UseUseExplosion.rb:20:1147:20:1158 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1148:20:1157 | ... > ... | UseUseExplosion.rb:20:1147:20:1158 | ( ... ) |
 | UseUseExplosion.rb:20:1156:20:1157 | 46 | UseUseExplosion.rb:20:1148:20:1157 | ... > ... |
 | UseUseExplosion.rb:20:1160:20:2820 | then ... | UseUseExplosion.rb:20:1144:20:2836 | if ... |
 | UseUseExplosion.rb:20:1165:20:2820 | if ... | UseUseExplosion.rb:20:1160:20:2820 | then ... |
@@ -758,8 +703,7 @@
 | UseUseExplosion.rb:20:1169:20:1173 | [post] self | UseUseExplosion.rb:20:2811:20:2816 | self |
 | UseUseExplosion.rb:20:1169:20:1173 | self | UseUseExplosion.rb:20:1190:20:1194 | self |
 | UseUseExplosion.rb:20:1169:20:1173 | self | UseUseExplosion.rb:20:2811:20:2816 | self |
-| UseUseExplosion.rb:20:1169:20:1178 | ... > ... | UseUseExplosion.rb:20:1168:20:1179 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1169:20:1178 | ... > ... | UseUseExplosion.rb:20:1168:20:1179 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1169:20:1178 | ... > ... | UseUseExplosion.rb:20:1168:20:1179 | ( ... ) |
 | UseUseExplosion.rb:20:1177:20:1178 | 45 | UseUseExplosion.rb:20:1169:20:1178 | ... > ... |
 | UseUseExplosion.rb:20:1181:20:2804 | then ... | UseUseExplosion.rb:20:1165:20:2820 | if ... |
 | UseUseExplosion.rb:20:1186:20:2804 | if ... | UseUseExplosion.rb:20:1181:20:2804 | then ... |
@@ -768,8 +712,7 @@
 | UseUseExplosion.rb:20:1190:20:1194 | [post] self | UseUseExplosion.rb:20:2795:20:2800 | self |
 | UseUseExplosion.rb:20:1190:20:1194 | self | UseUseExplosion.rb:20:1211:20:1215 | self |
 | UseUseExplosion.rb:20:1190:20:1194 | self | UseUseExplosion.rb:20:2795:20:2800 | self |
-| UseUseExplosion.rb:20:1190:20:1199 | ... > ... | UseUseExplosion.rb:20:1189:20:1200 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1190:20:1199 | ... > ... | UseUseExplosion.rb:20:1189:20:1200 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1190:20:1199 | ... > ... | UseUseExplosion.rb:20:1189:20:1200 | ( ... ) |
 | UseUseExplosion.rb:20:1198:20:1199 | 44 | UseUseExplosion.rb:20:1190:20:1199 | ... > ... |
 | UseUseExplosion.rb:20:1202:20:2788 | then ... | UseUseExplosion.rb:20:1186:20:2804 | if ... |
 | UseUseExplosion.rb:20:1207:20:2788 | if ... | UseUseExplosion.rb:20:1202:20:2788 | then ... |
@@ -778,8 +721,7 @@
 | UseUseExplosion.rb:20:1211:20:1215 | [post] self | UseUseExplosion.rb:20:2779:20:2784 | self |
 | UseUseExplosion.rb:20:1211:20:1215 | self | UseUseExplosion.rb:20:1232:20:1236 | self |
 | UseUseExplosion.rb:20:1211:20:1215 | self | UseUseExplosion.rb:20:2779:20:2784 | self |
-| UseUseExplosion.rb:20:1211:20:1220 | ... > ... | UseUseExplosion.rb:20:1210:20:1221 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1211:20:1220 | ... > ... | UseUseExplosion.rb:20:1210:20:1221 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1211:20:1220 | ... > ... | UseUseExplosion.rb:20:1210:20:1221 | ( ... ) |
 | UseUseExplosion.rb:20:1219:20:1220 | 43 | UseUseExplosion.rb:20:1211:20:1220 | ... > ... |
 | UseUseExplosion.rb:20:1223:20:2772 | then ... | UseUseExplosion.rb:20:1207:20:2788 | if ... |
 | UseUseExplosion.rb:20:1228:20:2772 | if ... | UseUseExplosion.rb:20:1223:20:2772 | then ... |
@@ -788,8 +730,7 @@
 | UseUseExplosion.rb:20:1232:20:1236 | [post] self | UseUseExplosion.rb:20:2763:20:2768 | self |
 | UseUseExplosion.rb:20:1232:20:1236 | self | UseUseExplosion.rb:20:1253:20:1257 | self |
 | UseUseExplosion.rb:20:1232:20:1236 | self | UseUseExplosion.rb:20:2763:20:2768 | self |
-| UseUseExplosion.rb:20:1232:20:1241 | ... > ... | UseUseExplosion.rb:20:1231:20:1242 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1232:20:1241 | ... > ... | UseUseExplosion.rb:20:1231:20:1242 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1232:20:1241 | ... > ... | UseUseExplosion.rb:20:1231:20:1242 | ( ... ) |
 | UseUseExplosion.rb:20:1240:20:1241 | 42 | UseUseExplosion.rb:20:1232:20:1241 | ... > ... |
 | UseUseExplosion.rb:20:1244:20:2756 | then ... | UseUseExplosion.rb:20:1228:20:2772 | if ... |
 | UseUseExplosion.rb:20:1249:20:2756 | if ... | UseUseExplosion.rb:20:1244:20:2756 | then ... |
@@ -798,8 +739,7 @@
 | UseUseExplosion.rb:20:1253:20:1257 | [post] self | UseUseExplosion.rb:20:2747:20:2752 | self |
 | UseUseExplosion.rb:20:1253:20:1257 | self | UseUseExplosion.rb:20:1274:20:1278 | self |
 | UseUseExplosion.rb:20:1253:20:1257 | self | UseUseExplosion.rb:20:2747:20:2752 | self |
-| UseUseExplosion.rb:20:1253:20:1262 | ... > ... | UseUseExplosion.rb:20:1252:20:1263 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1253:20:1262 | ... > ... | UseUseExplosion.rb:20:1252:20:1263 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1253:20:1262 | ... > ... | UseUseExplosion.rb:20:1252:20:1263 | ( ... ) |
 | UseUseExplosion.rb:20:1261:20:1262 | 41 | UseUseExplosion.rb:20:1253:20:1262 | ... > ... |
 | UseUseExplosion.rb:20:1265:20:2740 | then ... | UseUseExplosion.rb:20:1249:20:2756 | if ... |
 | UseUseExplosion.rb:20:1270:20:2740 | if ... | UseUseExplosion.rb:20:1265:20:2740 | then ... |
@@ -808,8 +748,7 @@
 | UseUseExplosion.rb:20:1274:20:1278 | [post] self | UseUseExplosion.rb:20:2731:20:2736 | self |
 | UseUseExplosion.rb:20:1274:20:1278 | self | UseUseExplosion.rb:20:1295:20:1299 | self |
 | UseUseExplosion.rb:20:1274:20:1278 | self | UseUseExplosion.rb:20:2731:20:2736 | self |
-| UseUseExplosion.rb:20:1274:20:1283 | ... > ... | UseUseExplosion.rb:20:1273:20:1284 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1274:20:1283 | ... > ... | UseUseExplosion.rb:20:1273:20:1284 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1274:20:1283 | ... > ... | UseUseExplosion.rb:20:1273:20:1284 | ( ... ) |
 | UseUseExplosion.rb:20:1282:20:1283 | 40 | UseUseExplosion.rb:20:1274:20:1283 | ... > ... |
 | UseUseExplosion.rb:20:1286:20:2724 | then ... | UseUseExplosion.rb:20:1270:20:2740 | if ... |
 | UseUseExplosion.rb:20:1291:20:2724 | if ... | UseUseExplosion.rb:20:1286:20:2724 | then ... |
@@ -818,8 +757,7 @@
 | UseUseExplosion.rb:20:1295:20:1299 | [post] self | UseUseExplosion.rb:20:2715:20:2720 | self |
 | UseUseExplosion.rb:20:1295:20:1299 | self | UseUseExplosion.rb:20:1316:20:1320 | self |
 | UseUseExplosion.rb:20:1295:20:1299 | self | UseUseExplosion.rb:20:2715:20:2720 | self |
-| UseUseExplosion.rb:20:1295:20:1304 | ... > ... | UseUseExplosion.rb:20:1294:20:1305 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1295:20:1304 | ... > ... | UseUseExplosion.rb:20:1294:20:1305 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1295:20:1304 | ... > ... | UseUseExplosion.rb:20:1294:20:1305 | ( ... ) |
 | UseUseExplosion.rb:20:1303:20:1304 | 39 | UseUseExplosion.rb:20:1295:20:1304 | ... > ... |
 | UseUseExplosion.rb:20:1307:20:2708 | then ... | UseUseExplosion.rb:20:1291:20:2724 | if ... |
 | UseUseExplosion.rb:20:1312:20:2708 | if ... | UseUseExplosion.rb:20:1307:20:2708 | then ... |
@@ -828,8 +766,7 @@
 | UseUseExplosion.rb:20:1316:20:1320 | [post] self | UseUseExplosion.rb:20:2699:20:2704 | self |
 | UseUseExplosion.rb:20:1316:20:1320 | self | UseUseExplosion.rb:20:1337:20:1341 | self |
 | UseUseExplosion.rb:20:1316:20:1320 | self | UseUseExplosion.rb:20:2699:20:2704 | self |
-| UseUseExplosion.rb:20:1316:20:1325 | ... > ... | UseUseExplosion.rb:20:1315:20:1326 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1316:20:1325 | ... > ... | UseUseExplosion.rb:20:1315:20:1326 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1316:20:1325 | ... > ... | UseUseExplosion.rb:20:1315:20:1326 | ( ... ) |
 | UseUseExplosion.rb:20:1324:20:1325 | 38 | UseUseExplosion.rb:20:1316:20:1325 | ... > ... |
 | UseUseExplosion.rb:20:1328:20:2692 | then ... | UseUseExplosion.rb:20:1312:20:2708 | if ... |
 | UseUseExplosion.rb:20:1333:20:2692 | if ... | UseUseExplosion.rb:20:1328:20:2692 | then ... |
@@ -838,8 +775,7 @@
 | UseUseExplosion.rb:20:1337:20:1341 | [post] self | UseUseExplosion.rb:20:2683:20:2688 | self |
 | UseUseExplosion.rb:20:1337:20:1341 | self | UseUseExplosion.rb:20:1358:20:1362 | self |
 | UseUseExplosion.rb:20:1337:20:1341 | self | UseUseExplosion.rb:20:2683:20:2688 | self |
-| UseUseExplosion.rb:20:1337:20:1346 | ... > ... | UseUseExplosion.rb:20:1336:20:1347 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1337:20:1346 | ... > ... | UseUseExplosion.rb:20:1336:20:1347 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1337:20:1346 | ... > ... | UseUseExplosion.rb:20:1336:20:1347 | ( ... ) |
 | UseUseExplosion.rb:20:1345:20:1346 | 37 | UseUseExplosion.rb:20:1337:20:1346 | ... > ... |
 | UseUseExplosion.rb:20:1349:20:2676 | then ... | UseUseExplosion.rb:20:1333:20:2692 | if ... |
 | UseUseExplosion.rb:20:1354:20:2676 | if ... | UseUseExplosion.rb:20:1349:20:2676 | then ... |
@@ -848,8 +784,7 @@
 | UseUseExplosion.rb:20:1358:20:1362 | [post] self | UseUseExplosion.rb:20:2667:20:2672 | self |
 | UseUseExplosion.rb:20:1358:20:1362 | self | UseUseExplosion.rb:20:1379:20:1383 | self |
 | UseUseExplosion.rb:20:1358:20:1362 | self | UseUseExplosion.rb:20:2667:20:2672 | self |
-| UseUseExplosion.rb:20:1358:20:1367 | ... > ... | UseUseExplosion.rb:20:1357:20:1368 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1358:20:1367 | ... > ... | UseUseExplosion.rb:20:1357:20:1368 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1358:20:1367 | ... > ... | UseUseExplosion.rb:20:1357:20:1368 | ( ... ) |
 | UseUseExplosion.rb:20:1366:20:1367 | 36 | UseUseExplosion.rb:20:1358:20:1367 | ... > ... |
 | UseUseExplosion.rb:20:1370:20:2660 | then ... | UseUseExplosion.rb:20:1354:20:2676 | if ... |
 | UseUseExplosion.rb:20:1375:20:2660 | if ... | UseUseExplosion.rb:20:1370:20:2660 | then ... |
@@ -858,8 +793,7 @@
 | UseUseExplosion.rb:20:1379:20:1383 | [post] self | UseUseExplosion.rb:20:2651:20:2656 | self |
 | UseUseExplosion.rb:20:1379:20:1383 | self | UseUseExplosion.rb:20:1400:20:1404 | self |
 | UseUseExplosion.rb:20:1379:20:1383 | self | UseUseExplosion.rb:20:2651:20:2656 | self |
-| UseUseExplosion.rb:20:1379:20:1388 | ... > ... | UseUseExplosion.rb:20:1378:20:1389 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1379:20:1388 | ... > ... | UseUseExplosion.rb:20:1378:20:1389 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1379:20:1388 | ... > ... | UseUseExplosion.rb:20:1378:20:1389 | ( ... ) |
 | UseUseExplosion.rb:20:1387:20:1388 | 35 | UseUseExplosion.rb:20:1379:20:1388 | ... > ... |
 | UseUseExplosion.rb:20:1391:20:2644 | then ... | UseUseExplosion.rb:20:1375:20:2660 | if ... |
 | UseUseExplosion.rb:20:1396:20:2644 | if ... | UseUseExplosion.rb:20:1391:20:2644 | then ... |
@@ -868,8 +802,7 @@
 | UseUseExplosion.rb:20:1400:20:1404 | [post] self | UseUseExplosion.rb:20:2635:20:2640 | self |
 | UseUseExplosion.rb:20:1400:20:1404 | self | UseUseExplosion.rb:20:1421:20:1425 | self |
 | UseUseExplosion.rb:20:1400:20:1404 | self | UseUseExplosion.rb:20:2635:20:2640 | self |
-| UseUseExplosion.rb:20:1400:20:1409 | ... > ... | UseUseExplosion.rb:20:1399:20:1410 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1400:20:1409 | ... > ... | UseUseExplosion.rb:20:1399:20:1410 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1400:20:1409 | ... > ... | UseUseExplosion.rb:20:1399:20:1410 | ( ... ) |
 | UseUseExplosion.rb:20:1408:20:1409 | 34 | UseUseExplosion.rb:20:1400:20:1409 | ... > ... |
 | UseUseExplosion.rb:20:1412:20:2628 | then ... | UseUseExplosion.rb:20:1396:20:2644 | if ... |
 | UseUseExplosion.rb:20:1417:20:2628 | if ... | UseUseExplosion.rb:20:1412:20:2628 | then ... |
@@ -878,8 +811,7 @@
 | UseUseExplosion.rb:20:1421:20:1425 | [post] self | UseUseExplosion.rb:20:2619:20:2624 | self |
 | UseUseExplosion.rb:20:1421:20:1425 | self | UseUseExplosion.rb:20:1442:20:1446 | self |
 | UseUseExplosion.rb:20:1421:20:1425 | self | UseUseExplosion.rb:20:2619:20:2624 | self |
-| UseUseExplosion.rb:20:1421:20:1430 | ... > ... | UseUseExplosion.rb:20:1420:20:1431 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1421:20:1430 | ... > ... | UseUseExplosion.rb:20:1420:20:1431 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1421:20:1430 | ... > ... | UseUseExplosion.rb:20:1420:20:1431 | ( ... ) |
 | UseUseExplosion.rb:20:1429:20:1430 | 33 | UseUseExplosion.rb:20:1421:20:1430 | ... > ... |
 | UseUseExplosion.rb:20:1433:20:2612 | then ... | UseUseExplosion.rb:20:1417:20:2628 | if ... |
 | UseUseExplosion.rb:20:1438:20:2612 | if ... | UseUseExplosion.rb:20:1433:20:2612 | then ... |
@@ -888,8 +820,7 @@
 | UseUseExplosion.rb:20:1442:20:1446 | [post] self | UseUseExplosion.rb:20:2603:20:2608 | self |
 | UseUseExplosion.rb:20:1442:20:1446 | self | UseUseExplosion.rb:20:1463:20:1467 | self |
 | UseUseExplosion.rb:20:1442:20:1446 | self | UseUseExplosion.rb:20:2603:20:2608 | self |
-| UseUseExplosion.rb:20:1442:20:1451 | ... > ... | UseUseExplosion.rb:20:1441:20:1452 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1442:20:1451 | ... > ... | UseUseExplosion.rb:20:1441:20:1452 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1442:20:1451 | ... > ... | UseUseExplosion.rb:20:1441:20:1452 | ( ... ) |
 | UseUseExplosion.rb:20:1450:20:1451 | 32 | UseUseExplosion.rb:20:1442:20:1451 | ... > ... |
 | UseUseExplosion.rb:20:1454:20:2596 | then ... | UseUseExplosion.rb:20:1438:20:2612 | if ... |
 | UseUseExplosion.rb:20:1459:20:2596 | if ... | UseUseExplosion.rb:20:1454:20:2596 | then ... |
@@ -898,8 +829,7 @@
 | UseUseExplosion.rb:20:1463:20:1467 | [post] self | UseUseExplosion.rb:20:2587:20:2592 | self |
 | UseUseExplosion.rb:20:1463:20:1467 | self | UseUseExplosion.rb:20:1484:20:1488 | self |
 | UseUseExplosion.rb:20:1463:20:1467 | self | UseUseExplosion.rb:20:2587:20:2592 | self |
-| UseUseExplosion.rb:20:1463:20:1472 | ... > ... | UseUseExplosion.rb:20:1462:20:1473 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1463:20:1472 | ... > ... | UseUseExplosion.rb:20:1462:20:1473 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1463:20:1472 | ... > ... | UseUseExplosion.rb:20:1462:20:1473 | ( ... ) |
 | UseUseExplosion.rb:20:1471:20:1472 | 31 | UseUseExplosion.rb:20:1463:20:1472 | ... > ... |
 | UseUseExplosion.rb:20:1475:20:2580 | then ... | UseUseExplosion.rb:20:1459:20:2596 | if ... |
 | UseUseExplosion.rb:20:1480:20:2580 | if ... | UseUseExplosion.rb:20:1475:20:2580 | then ... |
@@ -908,8 +838,7 @@
 | UseUseExplosion.rb:20:1484:20:1488 | [post] self | UseUseExplosion.rb:20:2571:20:2576 | self |
 | UseUseExplosion.rb:20:1484:20:1488 | self | UseUseExplosion.rb:20:1505:20:1509 | self |
 | UseUseExplosion.rb:20:1484:20:1488 | self | UseUseExplosion.rb:20:2571:20:2576 | self |
-| UseUseExplosion.rb:20:1484:20:1493 | ... > ... | UseUseExplosion.rb:20:1483:20:1494 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1484:20:1493 | ... > ... | UseUseExplosion.rb:20:1483:20:1494 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1484:20:1493 | ... > ... | UseUseExplosion.rb:20:1483:20:1494 | ( ... ) |
 | UseUseExplosion.rb:20:1492:20:1493 | 30 | UseUseExplosion.rb:20:1484:20:1493 | ... > ... |
 | UseUseExplosion.rb:20:1496:20:2564 | then ... | UseUseExplosion.rb:20:1480:20:2580 | if ... |
 | UseUseExplosion.rb:20:1501:20:2564 | if ... | UseUseExplosion.rb:20:1496:20:2564 | then ... |
@@ -918,8 +847,7 @@
 | UseUseExplosion.rb:20:1505:20:1509 | [post] self | UseUseExplosion.rb:20:2555:20:2560 | self |
 | UseUseExplosion.rb:20:1505:20:1509 | self | UseUseExplosion.rb:20:1526:20:1530 | self |
 | UseUseExplosion.rb:20:1505:20:1509 | self | UseUseExplosion.rb:20:2555:20:2560 | self |
-| UseUseExplosion.rb:20:1505:20:1514 | ... > ... | UseUseExplosion.rb:20:1504:20:1515 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1505:20:1514 | ... > ... | UseUseExplosion.rb:20:1504:20:1515 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1505:20:1514 | ... > ... | UseUseExplosion.rb:20:1504:20:1515 | ( ... ) |
 | UseUseExplosion.rb:20:1513:20:1514 | 29 | UseUseExplosion.rb:20:1505:20:1514 | ... > ... |
 | UseUseExplosion.rb:20:1517:20:2548 | then ... | UseUseExplosion.rb:20:1501:20:2564 | if ... |
 | UseUseExplosion.rb:20:1522:20:2548 | if ... | UseUseExplosion.rb:20:1517:20:2548 | then ... |
@@ -928,8 +856,7 @@
 | UseUseExplosion.rb:20:1526:20:1530 | [post] self | UseUseExplosion.rb:20:2539:20:2544 | self |
 | UseUseExplosion.rb:20:1526:20:1530 | self | UseUseExplosion.rb:20:1547:20:1551 | self |
 | UseUseExplosion.rb:20:1526:20:1530 | self | UseUseExplosion.rb:20:2539:20:2544 | self |
-| UseUseExplosion.rb:20:1526:20:1535 | ... > ... | UseUseExplosion.rb:20:1525:20:1536 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1526:20:1535 | ... > ... | UseUseExplosion.rb:20:1525:20:1536 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1526:20:1535 | ... > ... | UseUseExplosion.rb:20:1525:20:1536 | ( ... ) |
 | UseUseExplosion.rb:20:1534:20:1535 | 28 | UseUseExplosion.rb:20:1526:20:1535 | ... > ... |
 | UseUseExplosion.rb:20:1538:20:2532 | then ... | UseUseExplosion.rb:20:1522:20:2548 | if ... |
 | UseUseExplosion.rb:20:1543:20:2532 | if ... | UseUseExplosion.rb:20:1538:20:2532 | then ... |
@@ -938,8 +865,7 @@
 | UseUseExplosion.rb:20:1547:20:1551 | [post] self | UseUseExplosion.rb:20:2523:20:2528 | self |
 | UseUseExplosion.rb:20:1547:20:1551 | self | UseUseExplosion.rb:20:1568:20:1572 | self |
 | UseUseExplosion.rb:20:1547:20:1551 | self | UseUseExplosion.rb:20:2523:20:2528 | self |
-| UseUseExplosion.rb:20:1547:20:1556 | ... > ... | UseUseExplosion.rb:20:1546:20:1557 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1547:20:1556 | ... > ... | UseUseExplosion.rb:20:1546:20:1557 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1547:20:1556 | ... > ... | UseUseExplosion.rb:20:1546:20:1557 | ( ... ) |
 | UseUseExplosion.rb:20:1555:20:1556 | 27 | UseUseExplosion.rb:20:1547:20:1556 | ... > ... |
 | UseUseExplosion.rb:20:1559:20:2516 | then ... | UseUseExplosion.rb:20:1543:20:2532 | if ... |
 | UseUseExplosion.rb:20:1564:20:2516 | if ... | UseUseExplosion.rb:20:1559:20:2516 | then ... |
@@ -948,8 +874,7 @@
 | UseUseExplosion.rb:20:1568:20:1572 | [post] self | UseUseExplosion.rb:20:2507:20:2512 | self |
 | UseUseExplosion.rb:20:1568:20:1572 | self | UseUseExplosion.rb:20:1589:20:1593 | self |
 | UseUseExplosion.rb:20:1568:20:1572 | self | UseUseExplosion.rb:20:2507:20:2512 | self |
-| UseUseExplosion.rb:20:1568:20:1577 | ... > ... | UseUseExplosion.rb:20:1567:20:1578 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1568:20:1577 | ... > ... | UseUseExplosion.rb:20:1567:20:1578 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1568:20:1577 | ... > ... | UseUseExplosion.rb:20:1567:20:1578 | ( ... ) |
 | UseUseExplosion.rb:20:1576:20:1577 | 26 | UseUseExplosion.rb:20:1568:20:1577 | ... > ... |
 | UseUseExplosion.rb:20:1580:20:2500 | then ... | UseUseExplosion.rb:20:1564:20:2516 | if ... |
 | UseUseExplosion.rb:20:1585:20:2500 | if ... | UseUseExplosion.rb:20:1580:20:2500 | then ... |
@@ -958,8 +883,7 @@
 | UseUseExplosion.rb:20:1589:20:1593 | [post] self | UseUseExplosion.rb:20:2491:20:2496 | self |
 | UseUseExplosion.rb:20:1589:20:1593 | self | UseUseExplosion.rb:20:1610:20:1614 | self |
 | UseUseExplosion.rb:20:1589:20:1593 | self | UseUseExplosion.rb:20:2491:20:2496 | self |
-| UseUseExplosion.rb:20:1589:20:1598 | ... > ... | UseUseExplosion.rb:20:1588:20:1599 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1589:20:1598 | ... > ... | UseUseExplosion.rb:20:1588:20:1599 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1589:20:1598 | ... > ... | UseUseExplosion.rb:20:1588:20:1599 | ( ... ) |
 | UseUseExplosion.rb:20:1597:20:1598 | 25 | UseUseExplosion.rb:20:1589:20:1598 | ... > ... |
 | UseUseExplosion.rb:20:1601:20:2484 | then ... | UseUseExplosion.rb:20:1585:20:2500 | if ... |
 | UseUseExplosion.rb:20:1606:20:2484 | if ... | UseUseExplosion.rb:20:1601:20:2484 | then ... |
@@ -968,8 +892,7 @@
 | UseUseExplosion.rb:20:1610:20:1614 | [post] self | UseUseExplosion.rb:20:2475:20:2480 | self |
 | UseUseExplosion.rb:20:1610:20:1614 | self | UseUseExplosion.rb:20:1631:20:1635 | self |
 | UseUseExplosion.rb:20:1610:20:1614 | self | UseUseExplosion.rb:20:2475:20:2480 | self |
-| UseUseExplosion.rb:20:1610:20:1619 | ... > ... | UseUseExplosion.rb:20:1609:20:1620 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1610:20:1619 | ... > ... | UseUseExplosion.rb:20:1609:20:1620 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1610:20:1619 | ... > ... | UseUseExplosion.rb:20:1609:20:1620 | ( ... ) |
 | UseUseExplosion.rb:20:1618:20:1619 | 24 | UseUseExplosion.rb:20:1610:20:1619 | ... > ... |
 | UseUseExplosion.rb:20:1622:20:2468 | then ... | UseUseExplosion.rb:20:1606:20:2484 | if ... |
 | UseUseExplosion.rb:20:1627:20:2468 | if ... | UseUseExplosion.rb:20:1622:20:2468 | then ... |
@@ -978,8 +901,7 @@
 | UseUseExplosion.rb:20:1631:20:1635 | [post] self | UseUseExplosion.rb:20:2459:20:2464 | self |
 | UseUseExplosion.rb:20:1631:20:1635 | self | UseUseExplosion.rb:20:1652:20:1656 | self |
 | UseUseExplosion.rb:20:1631:20:1635 | self | UseUseExplosion.rb:20:2459:20:2464 | self |
-| UseUseExplosion.rb:20:1631:20:1640 | ... > ... | UseUseExplosion.rb:20:1630:20:1641 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1631:20:1640 | ... > ... | UseUseExplosion.rb:20:1630:20:1641 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1631:20:1640 | ... > ... | UseUseExplosion.rb:20:1630:20:1641 | ( ... ) |
 | UseUseExplosion.rb:20:1639:20:1640 | 23 | UseUseExplosion.rb:20:1631:20:1640 | ... > ... |
 | UseUseExplosion.rb:20:1643:20:2452 | then ... | UseUseExplosion.rb:20:1627:20:2468 | if ... |
 | UseUseExplosion.rb:20:1648:20:2452 | if ... | UseUseExplosion.rb:20:1643:20:2452 | then ... |
@@ -988,8 +910,7 @@
 | UseUseExplosion.rb:20:1652:20:1656 | [post] self | UseUseExplosion.rb:20:2443:20:2448 | self |
 | UseUseExplosion.rb:20:1652:20:1656 | self | UseUseExplosion.rb:20:1673:20:1677 | self |
 | UseUseExplosion.rb:20:1652:20:1656 | self | UseUseExplosion.rb:20:2443:20:2448 | self |
-| UseUseExplosion.rb:20:1652:20:1661 | ... > ... | UseUseExplosion.rb:20:1651:20:1662 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1652:20:1661 | ... > ... | UseUseExplosion.rb:20:1651:20:1662 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1652:20:1661 | ... > ... | UseUseExplosion.rb:20:1651:20:1662 | ( ... ) |
 | UseUseExplosion.rb:20:1660:20:1661 | 22 | UseUseExplosion.rb:20:1652:20:1661 | ... > ... |
 | UseUseExplosion.rb:20:1664:20:2436 | then ... | UseUseExplosion.rb:20:1648:20:2452 | if ... |
 | UseUseExplosion.rb:20:1669:20:2436 | if ... | UseUseExplosion.rb:20:1664:20:2436 | then ... |
@@ -998,8 +919,7 @@
 | UseUseExplosion.rb:20:1673:20:1677 | [post] self | UseUseExplosion.rb:20:2427:20:2432 | self |
 | UseUseExplosion.rb:20:1673:20:1677 | self | UseUseExplosion.rb:20:1694:20:1698 | self |
 | UseUseExplosion.rb:20:1673:20:1677 | self | UseUseExplosion.rb:20:2427:20:2432 | self |
-| UseUseExplosion.rb:20:1673:20:1682 | ... > ... | UseUseExplosion.rb:20:1672:20:1683 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1673:20:1682 | ... > ... | UseUseExplosion.rb:20:1672:20:1683 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1673:20:1682 | ... > ... | UseUseExplosion.rb:20:1672:20:1683 | ( ... ) |
 | UseUseExplosion.rb:20:1681:20:1682 | 21 | UseUseExplosion.rb:20:1673:20:1682 | ... > ... |
 | UseUseExplosion.rb:20:1685:20:2420 | then ... | UseUseExplosion.rb:20:1669:20:2436 | if ... |
 | UseUseExplosion.rb:20:1690:20:2420 | if ... | UseUseExplosion.rb:20:1685:20:2420 | then ... |
@@ -1008,8 +928,7 @@
 | UseUseExplosion.rb:20:1694:20:1698 | [post] self | UseUseExplosion.rb:20:2411:20:2416 | self |
 | UseUseExplosion.rb:20:1694:20:1698 | self | UseUseExplosion.rb:20:1715:20:1719 | self |
 | UseUseExplosion.rb:20:1694:20:1698 | self | UseUseExplosion.rb:20:2411:20:2416 | self |
-| UseUseExplosion.rb:20:1694:20:1703 | ... > ... | UseUseExplosion.rb:20:1693:20:1704 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1694:20:1703 | ... > ... | UseUseExplosion.rb:20:1693:20:1704 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1694:20:1703 | ... > ... | UseUseExplosion.rb:20:1693:20:1704 | ( ... ) |
 | UseUseExplosion.rb:20:1702:20:1703 | 20 | UseUseExplosion.rb:20:1694:20:1703 | ... > ... |
 | UseUseExplosion.rb:20:1706:20:2404 | then ... | UseUseExplosion.rb:20:1690:20:2420 | if ... |
 | UseUseExplosion.rb:20:1711:20:2404 | if ... | UseUseExplosion.rb:20:1706:20:2404 | then ... |
@@ -1018,8 +937,7 @@
 | UseUseExplosion.rb:20:1715:20:1719 | [post] self | UseUseExplosion.rb:20:2395:20:2400 | self |
 | UseUseExplosion.rb:20:1715:20:1719 | self | UseUseExplosion.rb:20:1736:20:1740 | self |
 | UseUseExplosion.rb:20:1715:20:1719 | self | UseUseExplosion.rb:20:2395:20:2400 | self |
-| UseUseExplosion.rb:20:1715:20:1724 | ... > ... | UseUseExplosion.rb:20:1714:20:1725 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1715:20:1724 | ... > ... | UseUseExplosion.rb:20:1714:20:1725 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1715:20:1724 | ... > ... | UseUseExplosion.rb:20:1714:20:1725 | ( ... ) |
 | UseUseExplosion.rb:20:1723:20:1724 | 19 | UseUseExplosion.rb:20:1715:20:1724 | ... > ... |
 | UseUseExplosion.rb:20:1727:20:2388 | then ... | UseUseExplosion.rb:20:1711:20:2404 | if ... |
 | UseUseExplosion.rb:20:1732:20:2388 | if ... | UseUseExplosion.rb:20:1727:20:2388 | then ... |
@@ -1028,8 +946,7 @@
 | UseUseExplosion.rb:20:1736:20:1740 | [post] self | UseUseExplosion.rb:20:2379:20:2384 | self |
 | UseUseExplosion.rb:20:1736:20:1740 | self | UseUseExplosion.rb:20:1757:20:1761 | self |
 | UseUseExplosion.rb:20:1736:20:1740 | self | UseUseExplosion.rb:20:2379:20:2384 | self |
-| UseUseExplosion.rb:20:1736:20:1745 | ... > ... | UseUseExplosion.rb:20:1735:20:1746 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1736:20:1745 | ... > ... | UseUseExplosion.rb:20:1735:20:1746 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1736:20:1745 | ... > ... | UseUseExplosion.rb:20:1735:20:1746 | ( ... ) |
 | UseUseExplosion.rb:20:1744:20:1745 | 18 | UseUseExplosion.rb:20:1736:20:1745 | ... > ... |
 | UseUseExplosion.rb:20:1748:20:2372 | then ... | UseUseExplosion.rb:20:1732:20:2388 | if ... |
 | UseUseExplosion.rb:20:1753:20:2372 | if ... | UseUseExplosion.rb:20:1748:20:2372 | then ... |
@@ -1038,8 +955,7 @@
 | UseUseExplosion.rb:20:1757:20:1761 | [post] self | UseUseExplosion.rb:20:2363:20:2368 | self |
 | UseUseExplosion.rb:20:1757:20:1761 | self | UseUseExplosion.rb:20:1778:20:1782 | self |
 | UseUseExplosion.rb:20:1757:20:1761 | self | UseUseExplosion.rb:20:2363:20:2368 | self |
-| UseUseExplosion.rb:20:1757:20:1766 | ... > ... | UseUseExplosion.rb:20:1756:20:1767 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1757:20:1766 | ... > ... | UseUseExplosion.rb:20:1756:20:1767 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1757:20:1766 | ... > ... | UseUseExplosion.rb:20:1756:20:1767 | ( ... ) |
 | UseUseExplosion.rb:20:1765:20:1766 | 17 | UseUseExplosion.rb:20:1757:20:1766 | ... > ... |
 | UseUseExplosion.rb:20:1769:20:2356 | then ... | UseUseExplosion.rb:20:1753:20:2372 | if ... |
 | UseUseExplosion.rb:20:1774:20:2356 | if ... | UseUseExplosion.rb:20:1769:20:2356 | then ... |
@@ -1048,8 +964,7 @@
 | UseUseExplosion.rb:20:1778:20:1782 | [post] self | UseUseExplosion.rb:20:2347:20:2352 | self |
 | UseUseExplosion.rb:20:1778:20:1782 | self | UseUseExplosion.rb:20:1799:20:1803 | self |
 | UseUseExplosion.rb:20:1778:20:1782 | self | UseUseExplosion.rb:20:2347:20:2352 | self |
-| UseUseExplosion.rb:20:1778:20:1787 | ... > ... | UseUseExplosion.rb:20:1777:20:1788 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1778:20:1787 | ... > ... | UseUseExplosion.rb:20:1777:20:1788 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1778:20:1787 | ... > ... | UseUseExplosion.rb:20:1777:20:1788 | ( ... ) |
 | UseUseExplosion.rb:20:1786:20:1787 | 16 | UseUseExplosion.rb:20:1778:20:1787 | ... > ... |
 | UseUseExplosion.rb:20:1790:20:2340 | then ... | UseUseExplosion.rb:20:1774:20:2356 | if ... |
 | UseUseExplosion.rb:20:1795:20:2340 | if ... | UseUseExplosion.rb:20:1790:20:2340 | then ... |
@@ -1058,8 +973,7 @@
 | UseUseExplosion.rb:20:1799:20:1803 | [post] self | UseUseExplosion.rb:20:2331:20:2336 | self |
 | UseUseExplosion.rb:20:1799:20:1803 | self | UseUseExplosion.rb:20:1820:20:1824 | self |
 | UseUseExplosion.rb:20:1799:20:1803 | self | UseUseExplosion.rb:20:2331:20:2336 | self |
-| UseUseExplosion.rb:20:1799:20:1808 | ... > ... | UseUseExplosion.rb:20:1798:20:1809 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1799:20:1808 | ... > ... | UseUseExplosion.rb:20:1798:20:1809 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1799:20:1808 | ... > ... | UseUseExplosion.rb:20:1798:20:1809 | ( ... ) |
 | UseUseExplosion.rb:20:1807:20:1808 | 15 | UseUseExplosion.rb:20:1799:20:1808 | ... > ... |
 | UseUseExplosion.rb:20:1811:20:2324 | then ... | UseUseExplosion.rb:20:1795:20:2340 | if ... |
 | UseUseExplosion.rb:20:1816:20:2324 | if ... | UseUseExplosion.rb:20:1811:20:2324 | then ... |
@@ -1068,8 +982,7 @@
 | UseUseExplosion.rb:20:1820:20:1824 | [post] self | UseUseExplosion.rb:20:2315:20:2320 | self |
 | UseUseExplosion.rb:20:1820:20:1824 | self | UseUseExplosion.rb:20:1841:20:1845 | self |
 | UseUseExplosion.rb:20:1820:20:1824 | self | UseUseExplosion.rb:20:2315:20:2320 | self |
-| UseUseExplosion.rb:20:1820:20:1829 | ... > ... | UseUseExplosion.rb:20:1819:20:1830 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1820:20:1829 | ... > ... | UseUseExplosion.rb:20:1819:20:1830 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1820:20:1829 | ... > ... | UseUseExplosion.rb:20:1819:20:1830 | ( ... ) |
 | UseUseExplosion.rb:20:1828:20:1829 | 14 | UseUseExplosion.rb:20:1820:20:1829 | ... > ... |
 | UseUseExplosion.rb:20:1832:20:2308 | then ... | UseUseExplosion.rb:20:1816:20:2324 | if ... |
 | UseUseExplosion.rb:20:1837:20:2308 | if ... | UseUseExplosion.rb:20:1832:20:2308 | then ... |
@@ -1078,8 +991,7 @@
 | UseUseExplosion.rb:20:1841:20:1845 | [post] self | UseUseExplosion.rb:20:2299:20:2304 | self |
 | UseUseExplosion.rb:20:1841:20:1845 | self | UseUseExplosion.rb:20:1862:20:1866 | self |
 | UseUseExplosion.rb:20:1841:20:1845 | self | UseUseExplosion.rb:20:2299:20:2304 | self |
-| UseUseExplosion.rb:20:1841:20:1850 | ... > ... | UseUseExplosion.rb:20:1840:20:1851 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1841:20:1850 | ... > ... | UseUseExplosion.rb:20:1840:20:1851 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1841:20:1850 | ... > ... | UseUseExplosion.rb:20:1840:20:1851 | ( ... ) |
 | UseUseExplosion.rb:20:1849:20:1850 | 13 | UseUseExplosion.rb:20:1841:20:1850 | ... > ... |
 | UseUseExplosion.rb:20:1853:20:2292 | then ... | UseUseExplosion.rb:20:1837:20:2308 | if ... |
 | UseUseExplosion.rb:20:1858:20:2292 | if ... | UseUseExplosion.rb:20:1853:20:2292 | then ... |
@@ -1088,8 +1000,7 @@
 | UseUseExplosion.rb:20:1862:20:1866 | [post] self | UseUseExplosion.rb:20:2283:20:2288 | self |
 | UseUseExplosion.rb:20:1862:20:1866 | self | UseUseExplosion.rb:20:1883:20:1887 | self |
 | UseUseExplosion.rb:20:1862:20:1866 | self | UseUseExplosion.rb:20:2283:20:2288 | self |
-| UseUseExplosion.rb:20:1862:20:1871 | ... > ... | UseUseExplosion.rb:20:1861:20:1872 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1862:20:1871 | ... > ... | UseUseExplosion.rb:20:1861:20:1872 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1862:20:1871 | ... > ... | UseUseExplosion.rb:20:1861:20:1872 | ( ... ) |
 | UseUseExplosion.rb:20:1870:20:1871 | 12 | UseUseExplosion.rb:20:1862:20:1871 | ... > ... |
 | UseUseExplosion.rb:20:1874:20:2276 | then ... | UseUseExplosion.rb:20:1858:20:2292 | if ... |
 | UseUseExplosion.rb:20:1879:20:2276 | if ... | UseUseExplosion.rb:20:1874:20:2276 | then ... |
@@ -1098,8 +1009,7 @@
 | UseUseExplosion.rb:20:1883:20:1887 | [post] self | UseUseExplosion.rb:20:2267:20:2272 | self |
 | UseUseExplosion.rb:20:1883:20:1887 | self | UseUseExplosion.rb:20:1904:20:1908 | self |
 | UseUseExplosion.rb:20:1883:20:1887 | self | UseUseExplosion.rb:20:2267:20:2272 | self |
-| UseUseExplosion.rb:20:1883:20:1892 | ... > ... | UseUseExplosion.rb:20:1882:20:1893 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1883:20:1892 | ... > ... | UseUseExplosion.rb:20:1882:20:1893 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1883:20:1892 | ... > ... | UseUseExplosion.rb:20:1882:20:1893 | ( ... ) |
 | UseUseExplosion.rb:20:1891:20:1892 | 11 | UseUseExplosion.rb:20:1883:20:1892 | ... > ... |
 | UseUseExplosion.rb:20:1895:20:2260 | then ... | UseUseExplosion.rb:20:1879:20:2276 | if ... |
 | UseUseExplosion.rb:20:1900:20:2260 | if ... | UseUseExplosion.rb:20:1895:20:2260 | then ... |
@@ -1108,8 +1018,7 @@
 | UseUseExplosion.rb:20:1904:20:1908 | [post] self | UseUseExplosion.rb:20:2251:20:2256 | self |
 | UseUseExplosion.rb:20:1904:20:1908 | self | UseUseExplosion.rb:20:1925:20:1929 | self |
 | UseUseExplosion.rb:20:1904:20:1908 | self | UseUseExplosion.rb:20:2251:20:2256 | self |
-| UseUseExplosion.rb:20:1904:20:1913 | ... > ... | UseUseExplosion.rb:20:1903:20:1914 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1904:20:1913 | ... > ... | UseUseExplosion.rb:20:1903:20:1914 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1904:20:1913 | ... > ... | UseUseExplosion.rb:20:1903:20:1914 | ( ... ) |
 | UseUseExplosion.rb:20:1912:20:1913 | 10 | UseUseExplosion.rb:20:1904:20:1913 | ... > ... |
 | UseUseExplosion.rb:20:1916:20:2244 | then ... | UseUseExplosion.rb:20:1900:20:2260 | if ... |
 | UseUseExplosion.rb:20:1921:20:2244 | if ... | UseUseExplosion.rb:20:1916:20:2244 | then ... |
@@ -1118,8 +1027,7 @@
 | UseUseExplosion.rb:20:1925:20:1929 | [post] self | UseUseExplosion.rb:20:2235:20:2240 | self |
 | UseUseExplosion.rb:20:1925:20:1929 | self | UseUseExplosion.rb:20:1945:20:1949 | self |
 | UseUseExplosion.rb:20:1925:20:1929 | self | UseUseExplosion.rb:20:2235:20:2240 | self |
-| UseUseExplosion.rb:20:1925:20:1933 | ... > ... | UseUseExplosion.rb:20:1924:20:1934 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1925:20:1933 | ... > ... | UseUseExplosion.rb:20:1924:20:1934 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1925:20:1933 | ... > ... | UseUseExplosion.rb:20:1924:20:1934 | ( ... ) |
 | UseUseExplosion.rb:20:1933:20:1933 | 9 | UseUseExplosion.rb:20:1925:20:1933 | ... > ... |
 | UseUseExplosion.rb:20:1936:20:2228 | then ... | UseUseExplosion.rb:20:1921:20:2244 | if ... |
 | UseUseExplosion.rb:20:1941:20:2228 | if ... | UseUseExplosion.rb:20:1936:20:2228 | then ... |
@@ -1128,8 +1036,7 @@
 | UseUseExplosion.rb:20:1945:20:1949 | [post] self | UseUseExplosion.rb:20:2219:20:2224 | self |
 | UseUseExplosion.rb:20:1945:20:1949 | self | UseUseExplosion.rb:20:1965:20:1969 | self |
 | UseUseExplosion.rb:20:1945:20:1949 | self | UseUseExplosion.rb:20:2219:20:2224 | self |
-| UseUseExplosion.rb:20:1945:20:1953 | ... > ... | UseUseExplosion.rb:20:1944:20:1954 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1945:20:1953 | ... > ... | UseUseExplosion.rb:20:1944:20:1954 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1945:20:1953 | ... > ... | UseUseExplosion.rb:20:1944:20:1954 | ( ... ) |
 | UseUseExplosion.rb:20:1953:20:1953 | 8 | UseUseExplosion.rb:20:1945:20:1953 | ... > ... |
 | UseUseExplosion.rb:20:1956:20:2212 | then ... | UseUseExplosion.rb:20:1941:20:2228 | if ... |
 | UseUseExplosion.rb:20:1961:20:2212 | if ... | UseUseExplosion.rb:20:1956:20:2212 | then ... |
@@ -1138,8 +1045,7 @@
 | UseUseExplosion.rb:20:1965:20:1969 | [post] self | UseUseExplosion.rb:20:2203:20:2208 | self |
 | UseUseExplosion.rb:20:1965:20:1969 | self | UseUseExplosion.rb:20:1985:20:1989 | self |
 | UseUseExplosion.rb:20:1965:20:1969 | self | UseUseExplosion.rb:20:2203:20:2208 | self |
-| UseUseExplosion.rb:20:1965:20:1973 | ... > ... | UseUseExplosion.rb:20:1964:20:1974 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1965:20:1973 | ... > ... | UseUseExplosion.rb:20:1964:20:1974 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1965:20:1973 | ... > ... | UseUseExplosion.rb:20:1964:20:1974 | ( ... ) |
 | UseUseExplosion.rb:20:1973:20:1973 | 7 | UseUseExplosion.rb:20:1965:20:1973 | ... > ... |
 | UseUseExplosion.rb:20:1976:20:2196 | then ... | UseUseExplosion.rb:20:1961:20:2212 | if ... |
 | UseUseExplosion.rb:20:1981:20:2196 | if ... | UseUseExplosion.rb:20:1976:20:2196 | then ... |
@@ -1148,8 +1054,7 @@
 | UseUseExplosion.rb:20:1985:20:1989 | [post] self | UseUseExplosion.rb:20:2187:20:2192 | self |
 | UseUseExplosion.rb:20:1985:20:1989 | self | UseUseExplosion.rb:20:2005:20:2009 | self |
 | UseUseExplosion.rb:20:1985:20:1989 | self | UseUseExplosion.rb:20:2187:20:2192 | self |
-| UseUseExplosion.rb:20:1985:20:1993 | ... > ... | UseUseExplosion.rb:20:1984:20:1994 | [false] ( ... ) |
-| UseUseExplosion.rb:20:1985:20:1993 | ... > ... | UseUseExplosion.rb:20:1984:20:1994 | [true] ( ... ) |
+| UseUseExplosion.rb:20:1985:20:1993 | ... > ... | UseUseExplosion.rb:20:1984:20:1994 | ( ... ) |
 | UseUseExplosion.rb:20:1993:20:1993 | 6 | UseUseExplosion.rb:20:1985:20:1993 | ... > ... |
 | UseUseExplosion.rb:20:1996:20:2180 | then ... | UseUseExplosion.rb:20:1981:20:2196 | if ... |
 | UseUseExplosion.rb:20:2001:20:2180 | if ... | UseUseExplosion.rb:20:1996:20:2180 | then ... |
@@ -1158,8 +1063,7 @@
 | UseUseExplosion.rb:20:2005:20:2009 | [post] self | UseUseExplosion.rb:20:2171:20:2176 | self |
 | UseUseExplosion.rb:20:2005:20:2009 | self | UseUseExplosion.rb:20:2025:20:2029 | self |
 | UseUseExplosion.rb:20:2005:20:2009 | self | UseUseExplosion.rb:20:2171:20:2176 | self |
-| UseUseExplosion.rb:20:2005:20:2013 | ... > ... | UseUseExplosion.rb:20:2004:20:2014 | [false] ( ... ) |
-| UseUseExplosion.rb:20:2005:20:2013 | ... > ... | UseUseExplosion.rb:20:2004:20:2014 | [true] ( ... ) |
+| UseUseExplosion.rb:20:2005:20:2013 | ... > ... | UseUseExplosion.rb:20:2004:20:2014 | ( ... ) |
 | UseUseExplosion.rb:20:2013:20:2013 | 5 | UseUseExplosion.rb:20:2005:20:2013 | ... > ... |
 | UseUseExplosion.rb:20:2016:20:2164 | then ... | UseUseExplosion.rb:20:2001:20:2180 | if ... |
 | UseUseExplosion.rb:20:2021:20:2164 | if ... | UseUseExplosion.rb:20:2016:20:2164 | then ... |
@@ -1168,8 +1072,7 @@
 | UseUseExplosion.rb:20:2025:20:2029 | [post] self | UseUseExplosion.rb:20:2155:20:2160 | self |
 | UseUseExplosion.rb:20:2025:20:2029 | self | UseUseExplosion.rb:20:2045:20:2049 | self |
 | UseUseExplosion.rb:20:2025:20:2029 | self | UseUseExplosion.rb:20:2155:20:2160 | self |
-| UseUseExplosion.rb:20:2025:20:2033 | ... > ... | UseUseExplosion.rb:20:2024:20:2034 | [false] ( ... ) |
-| UseUseExplosion.rb:20:2025:20:2033 | ... > ... | UseUseExplosion.rb:20:2024:20:2034 | [true] ( ... ) |
+| UseUseExplosion.rb:20:2025:20:2033 | ... > ... | UseUseExplosion.rb:20:2024:20:2034 | ( ... ) |
 | UseUseExplosion.rb:20:2033:20:2033 | 4 | UseUseExplosion.rb:20:2025:20:2033 | ... > ... |
 | UseUseExplosion.rb:20:2036:20:2148 | then ... | UseUseExplosion.rb:20:2021:20:2164 | if ... |
 | UseUseExplosion.rb:20:2041:20:2148 | if ... | UseUseExplosion.rb:20:2036:20:2148 | then ... |
@@ -1178,8 +1081,7 @@
 | UseUseExplosion.rb:20:2045:20:2049 | [post] self | UseUseExplosion.rb:20:2139:20:2144 | self |
 | UseUseExplosion.rb:20:2045:20:2049 | self | UseUseExplosion.rb:20:2065:20:2069 | self |
 | UseUseExplosion.rb:20:2045:20:2049 | self | UseUseExplosion.rb:20:2139:20:2144 | self |
-| UseUseExplosion.rb:20:2045:20:2053 | ... > ... | UseUseExplosion.rb:20:2044:20:2054 | [false] ( ... ) |
-| UseUseExplosion.rb:20:2045:20:2053 | ... > ... | UseUseExplosion.rb:20:2044:20:2054 | [true] ( ... ) |
+| UseUseExplosion.rb:20:2045:20:2053 | ... > ... | UseUseExplosion.rb:20:2044:20:2054 | ( ... ) |
 | UseUseExplosion.rb:20:2053:20:2053 | 3 | UseUseExplosion.rb:20:2045:20:2053 | ... > ... |
 | UseUseExplosion.rb:20:2056:20:2132 | then ... | UseUseExplosion.rb:20:2041:20:2148 | if ... |
 | UseUseExplosion.rb:20:2061:20:2132 | if ... | UseUseExplosion.rb:20:2056:20:2132 | then ... |
@@ -1188,8 +1090,7 @@
 | UseUseExplosion.rb:20:2065:20:2069 | [post] self | UseUseExplosion.rb:20:2123:20:2128 | self |
 | UseUseExplosion.rb:20:2065:20:2069 | self | UseUseExplosion.rb:20:2085:20:2089 | self |
 | UseUseExplosion.rb:20:2065:20:2069 | self | UseUseExplosion.rb:20:2123:20:2128 | self |
-| UseUseExplosion.rb:20:2065:20:2073 | ... > ... | UseUseExplosion.rb:20:2064:20:2074 | [false] ( ... ) |
-| UseUseExplosion.rb:20:2065:20:2073 | ... > ... | UseUseExplosion.rb:20:2064:20:2074 | [true] ( ... ) |
+| UseUseExplosion.rb:20:2065:20:2073 | ... > ... | UseUseExplosion.rb:20:2064:20:2074 | ( ... ) |
 | UseUseExplosion.rb:20:2073:20:2073 | 2 | UseUseExplosion.rb:20:2065:20:2073 | ... > ... |
 | UseUseExplosion.rb:20:2076:20:2116 | then ... | UseUseExplosion.rb:20:2061:20:2132 | if ... |
 | UseUseExplosion.rb:20:2081:20:2116 | if ... | UseUseExplosion.rb:20:2076:20:2116 | then ... |
@@ -1198,8 +1099,7 @@
 | UseUseExplosion.rb:20:2085:20:2089 | [post] self | UseUseExplosion.rb:20:2107:20:2112 | self |
 | UseUseExplosion.rb:20:2085:20:2089 | self | UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(self) |
 | UseUseExplosion.rb:20:2085:20:2089 | self | UseUseExplosion.rb:20:2107:20:2112 | self |
-| UseUseExplosion.rb:20:2085:20:2093 | ... > ... | UseUseExplosion.rb:20:2084:20:2094 | [false] ( ... ) |
-| UseUseExplosion.rb:20:2085:20:2093 | ... > ... | UseUseExplosion.rb:20:2084:20:2094 | [true] ( ... ) |
+| UseUseExplosion.rb:20:2085:20:2093 | ... > ... | UseUseExplosion.rb:20:2084:20:2094 | ( ... ) |
 | UseUseExplosion.rb:20:2093:20:2093 | 1 | UseUseExplosion.rb:20:2085:20:2093 | ... > ... |
 | UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(self) | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(x) | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
@@ -1704,13 +1604,13 @@
 | UseUseExplosion.rb:20:3691:20:3696 | call to use | UseUseExplosion.rb:20:3686:20:3696 | else ... |
 | UseUseExplosion.rb:20:3691:20:3696 | self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3695:20:3695 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
+| UseUseExplosion.rb:21:9:21:3700 | if ... | UseUseExplosion.rb:19:9:21:3700 | ... |
 | UseUseExplosion.rb:21:13:21:17 | @prop | UseUseExplosion.rb:21:13:21:23 | ... > ... |
 | UseUseExplosion.rb:21:13:21:17 | [post] self | UseUseExplosion.rb:21:35:21:39 | self |
 | UseUseExplosion.rb:21:13:21:17 | [post] self | UseUseExplosion.rb:21:3691:21:3696 | self |
 | UseUseExplosion.rb:21:13:21:17 | self | UseUseExplosion.rb:21:35:21:39 | self |
 | UseUseExplosion.rb:21:13:21:17 | self | UseUseExplosion.rb:21:3691:21:3696 | self |
-| UseUseExplosion.rb:21:13:21:23 | ... > ... | UseUseExplosion.rb:21:12:21:24 | [false] ( ... ) |
-| UseUseExplosion.rb:21:13:21:23 | ... > ... | UseUseExplosion.rb:21:12:21:24 | [true] ( ... ) |
+| UseUseExplosion.rb:21:13:21:23 | ... > ... | UseUseExplosion.rb:21:12:21:24 | ( ... ) |
 | UseUseExplosion.rb:21:21:21:23 | 100 | UseUseExplosion.rb:21:13:21:23 | ... > ... |
 | UseUseExplosion.rb:21:26:21:3684 | then ... | UseUseExplosion.rb:21:9:21:3700 | if ... |
 | UseUseExplosion.rb:21:31:21:3684 | if ... | UseUseExplosion.rb:21:26:21:3684 | then ... |
@@ -1719,8 +1619,7 @@
 | UseUseExplosion.rb:21:35:21:39 | [post] self | UseUseExplosion.rb:21:3675:21:3680 | self |
 | UseUseExplosion.rb:21:35:21:39 | self | UseUseExplosion.rb:21:56:21:60 | self |
 | UseUseExplosion.rb:21:35:21:39 | self | UseUseExplosion.rb:21:3675:21:3680 | self |
-| UseUseExplosion.rb:21:35:21:44 | ... > ... | UseUseExplosion.rb:21:34:21:45 | [false] ( ... ) |
-| UseUseExplosion.rb:21:35:21:44 | ... > ... | UseUseExplosion.rb:21:34:21:45 | [true] ( ... ) |
+| UseUseExplosion.rb:21:35:21:44 | ... > ... | UseUseExplosion.rb:21:34:21:45 | ( ... ) |
 | UseUseExplosion.rb:21:43:21:44 | 99 | UseUseExplosion.rb:21:35:21:44 | ... > ... |
 | UseUseExplosion.rb:21:47:21:3668 | then ... | UseUseExplosion.rb:21:31:21:3684 | if ... |
 | UseUseExplosion.rb:21:52:21:3668 | if ... | UseUseExplosion.rb:21:47:21:3668 | then ... |
@@ -1729,8 +1628,7 @@
 | UseUseExplosion.rb:21:56:21:60 | [post] self | UseUseExplosion.rb:21:3659:21:3664 | self |
 | UseUseExplosion.rb:21:56:21:60 | self | UseUseExplosion.rb:21:77:21:81 | self |
 | UseUseExplosion.rb:21:56:21:60 | self | UseUseExplosion.rb:21:3659:21:3664 | self |
-| UseUseExplosion.rb:21:56:21:65 | ... > ... | UseUseExplosion.rb:21:55:21:66 | [false] ( ... ) |
-| UseUseExplosion.rb:21:56:21:65 | ... > ... | UseUseExplosion.rb:21:55:21:66 | [true] ( ... ) |
+| UseUseExplosion.rb:21:56:21:65 | ... > ... | UseUseExplosion.rb:21:55:21:66 | ( ... ) |
 | UseUseExplosion.rb:21:64:21:65 | 98 | UseUseExplosion.rb:21:56:21:65 | ... > ... |
 | UseUseExplosion.rb:21:68:21:3652 | then ... | UseUseExplosion.rb:21:52:21:3668 | if ... |
 | UseUseExplosion.rb:21:73:21:3652 | if ... | UseUseExplosion.rb:21:68:21:3652 | then ... |
@@ -1739,8 +1637,7 @@
 | UseUseExplosion.rb:21:77:21:81 | [post] self | UseUseExplosion.rb:21:3643:21:3648 | self |
 | UseUseExplosion.rb:21:77:21:81 | self | UseUseExplosion.rb:21:98:21:102 | self |
 | UseUseExplosion.rb:21:77:21:81 | self | UseUseExplosion.rb:21:3643:21:3648 | self |
-| UseUseExplosion.rb:21:77:21:86 | ... > ... | UseUseExplosion.rb:21:76:21:87 | [false] ( ... ) |
-| UseUseExplosion.rb:21:77:21:86 | ... > ... | UseUseExplosion.rb:21:76:21:87 | [true] ( ... ) |
+| UseUseExplosion.rb:21:77:21:86 | ... > ... | UseUseExplosion.rb:21:76:21:87 | ( ... ) |
 | UseUseExplosion.rb:21:85:21:86 | 97 | UseUseExplosion.rb:21:77:21:86 | ... > ... |
 | UseUseExplosion.rb:21:89:21:3636 | then ... | UseUseExplosion.rb:21:73:21:3652 | if ... |
 | UseUseExplosion.rb:21:94:21:3636 | if ... | UseUseExplosion.rb:21:89:21:3636 | then ... |
@@ -1749,8 +1646,7 @@
 | UseUseExplosion.rb:21:98:21:102 | [post] self | UseUseExplosion.rb:21:3627:21:3632 | self |
 | UseUseExplosion.rb:21:98:21:102 | self | UseUseExplosion.rb:21:119:21:123 | self |
 | UseUseExplosion.rb:21:98:21:102 | self | UseUseExplosion.rb:21:3627:21:3632 | self |
-| UseUseExplosion.rb:21:98:21:107 | ... > ... | UseUseExplosion.rb:21:97:21:108 | [false] ( ... ) |
-| UseUseExplosion.rb:21:98:21:107 | ... > ... | UseUseExplosion.rb:21:97:21:108 | [true] ( ... ) |
+| UseUseExplosion.rb:21:98:21:107 | ... > ... | UseUseExplosion.rb:21:97:21:108 | ( ... ) |
 | UseUseExplosion.rb:21:106:21:107 | 96 | UseUseExplosion.rb:21:98:21:107 | ... > ... |
 | UseUseExplosion.rb:21:110:21:3620 | then ... | UseUseExplosion.rb:21:94:21:3636 | if ... |
 | UseUseExplosion.rb:21:115:21:3620 | if ... | UseUseExplosion.rb:21:110:21:3620 | then ... |
@@ -1759,8 +1655,7 @@
 | UseUseExplosion.rb:21:119:21:123 | [post] self | UseUseExplosion.rb:21:3611:21:3616 | self |
 | UseUseExplosion.rb:21:119:21:123 | self | UseUseExplosion.rb:21:140:21:144 | self |
 | UseUseExplosion.rb:21:119:21:123 | self | UseUseExplosion.rb:21:3611:21:3616 | self |
-| UseUseExplosion.rb:21:119:21:128 | ... > ... | UseUseExplosion.rb:21:118:21:129 | [false] ( ... ) |
-| UseUseExplosion.rb:21:119:21:128 | ... > ... | UseUseExplosion.rb:21:118:21:129 | [true] ( ... ) |
+| UseUseExplosion.rb:21:119:21:128 | ... > ... | UseUseExplosion.rb:21:118:21:129 | ( ... ) |
 | UseUseExplosion.rb:21:127:21:128 | 95 | UseUseExplosion.rb:21:119:21:128 | ... > ... |
 | UseUseExplosion.rb:21:131:21:3604 | then ... | UseUseExplosion.rb:21:115:21:3620 | if ... |
 | UseUseExplosion.rb:21:136:21:3604 | if ... | UseUseExplosion.rb:21:131:21:3604 | then ... |
@@ -1769,8 +1664,7 @@
 | UseUseExplosion.rb:21:140:21:144 | [post] self | UseUseExplosion.rb:21:3595:21:3600 | self |
 | UseUseExplosion.rb:21:140:21:144 | self | UseUseExplosion.rb:21:161:21:165 | self |
 | UseUseExplosion.rb:21:140:21:144 | self | UseUseExplosion.rb:21:3595:21:3600 | self |
-| UseUseExplosion.rb:21:140:21:149 | ... > ... | UseUseExplosion.rb:21:139:21:150 | [false] ( ... ) |
-| UseUseExplosion.rb:21:140:21:149 | ... > ... | UseUseExplosion.rb:21:139:21:150 | [true] ( ... ) |
+| UseUseExplosion.rb:21:140:21:149 | ... > ... | UseUseExplosion.rb:21:139:21:150 | ( ... ) |
 | UseUseExplosion.rb:21:148:21:149 | 94 | UseUseExplosion.rb:21:140:21:149 | ... > ... |
 | UseUseExplosion.rb:21:152:21:3588 | then ... | UseUseExplosion.rb:21:136:21:3604 | if ... |
 | UseUseExplosion.rb:21:157:21:3588 | if ... | UseUseExplosion.rb:21:152:21:3588 | then ... |
@@ -1779,8 +1673,7 @@
 | UseUseExplosion.rb:21:161:21:165 | [post] self | UseUseExplosion.rb:21:3579:21:3584 | self |
 | UseUseExplosion.rb:21:161:21:165 | self | UseUseExplosion.rb:21:182:21:186 | self |
 | UseUseExplosion.rb:21:161:21:165 | self | UseUseExplosion.rb:21:3579:21:3584 | self |
-| UseUseExplosion.rb:21:161:21:170 | ... > ... | UseUseExplosion.rb:21:160:21:171 | [false] ( ... ) |
-| UseUseExplosion.rb:21:161:21:170 | ... > ... | UseUseExplosion.rb:21:160:21:171 | [true] ( ... ) |
+| UseUseExplosion.rb:21:161:21:170 | ... > ... | UseUseExplosion.rb:21:160:21:171 | ( ... ) |
 | UseUseExplosion.rb:21:169:21:170 | 93 | UseUseExplosion.rb:21:161:21:170 | ... > ... |
 | UseUseExplosion.rb:21:173:21:3572 | then ... | UseUseExplosion.rb:21:157:21:3588 | if ... |
 | UseUseExplosion.rb:21:178:21:3572 | if ... | UseUseExplosion.rb:21:173:21:3572 | then ... |
@@ -1789,8 +1682,7 @@
 | UseUseExplosion.rb:21:182:21:186 | [post] self | UseUseExplosion.rb:21:3563:21:3568 | self |
 | UseUseExplosion.rb:21:182:21:186 | self | UseUseExplosion.rb:21:203:21:207 | self |
 | UseUseExplosion.rb:21:182:21:186 | self | UseUseExplosion.rb:21:3563:21:3568 | self |
-| UseUseExplosion.rb:21:182:21:191 | ... > ... | UseUseExplosion.rb:21:181:21:192 | [false] ( ... ) |
-| UseUseExplosion.rb:21:182:21:191 | ... > ... | UseUseExplosion.rb:21:181:21:192 | [true] ( ... ) |
+| UseUseExplosion.rb:21:182:21:191 | ... > ... | UseUseExplosion.rb:21:181:21:192 | ( ... ) |
 | UseUseExplosion.rb:21:190:21:191 | 92 | UseUseExplosion.rb:21:182:21:191 | ... > ... |
 | UseUseExplosion.rb:21:194:21:3556 | then ... | UseUseExplosion.rb:21:178:21:3572 | if ... |
 | UseUseExplosion.rb:21:199:21:3556 | if ... | UseUseExplosion.rb:21:194:21:3556 | then ... |
@@ -1799,8 +1691,7 @@
 | UseUseExplosion.rb:21:203:21:207 | [post] self | UseUseExplosion.rb:21:3547:21:3552 | self |
 | UseUseExplosion.rb:21:203:21:207 | self | UseUseExplosion.rb:21:224:21:228 | self |
 | UseUseExplosion.rb:21:203:21:207 | self | UseUseExplosion.rb:21:3547:21:3552 | self |
-| UseUseExplosion.rb:21:203:21:212 | ... > ... | UseUseExplosion.rb:21:202:21:213 | [false] ( ... ) |
-| UseUseExplosion.rb:21:203:21:212 | ... > ... | UseUseExplosion.rb:21:202:21:213 | [true] ( ... ) |
+| UseUseExplosion.rb:21:203:21:212 | ... > ... | UseUseExplosion.rb:21:202:21:213 | ( ... ) |
 | UseUseExplosion.rb:21:211:21:212 | 91 | UseUseExplosion.rb:21:203:21:212 | ... > ... |
 | UseUseExplosion.rb:21:215:21:3540 | then ... | UseUseExplosion.rb:21:199:21:3556 | if ... |
 | UseUseExplosion.rb:21:220:21:3540 | if ... | UseUseExplosion.rb:21:215:21:3540 | then ... |
@@ -1809,8 +1700,7 @@
 | UseUseExplosion.rb:21:224:21:228 | [post] self | UseUseExplosion.rb:21:3531:21:3536 | self |
 | UseUseExplosion.rb:21:224:21:228 | self | UseUseExplosion.rb:21:245:21:249 | self |
 | UseUseExplosion.rb:21:224:21:228 | self | UseUseExplosion.rb:21:3531:21:3536 | self |
-| UseUseExplosion.rb:21:224:21:233 | ... > ... | UseUseExplosion.rb:21:223:21:234 | [false] ( ... ) |
-| UseUseExplosion.rb:21:224:21:233 | ... > ... | UseUseExplosion.rb:21:223:21:234 | [true] ( ... ) |
+| UseUseExplosion.rb:21:224:21:233 | ... > ... | UseUseExplosion.rb:21:223:21:234 | ( ... ) |
 | UseUseExplosion.rb:21:232:21:233 | 90 | UseUseExplosion.rb:21:224:21:233 | ... > ... |
 | UseUseExplosion.rb:21:236:21:3524 | then ... | UseUseExplosion.rb:21:220:21:3540 | if ... |
 | UseUseExplosion.rb:21:241:21:3524 | if ... | UseUseExplosion.rb:21:236:21:3524 | then ... |
@@ -1819,8 +1709,7 @@
 | UseUseExplosion.rb:21:245:21:249 | [post] self | UseUseExplosion.rb:21:3515:21:3520 | self |
 | UseUseExplosion.rb:21:245:21:249 | self | UseUseExplosion.rb:21:266:21:270 | self |
 | UseUseExplosion.rb:21:245:21:249 | self | UseUseExplosion.rb:21:3515:21:3520 | self |
-| UseUseExplosion.rb:21:245:21:254 | ... > ... | UseUseExplosion.rb:21:244:21:255 | [false] ( ... ) |
-| UseUseExplosion.rb:21:245:21:254 | ... > ... | UseUseExplosion.rb:21:244:21:255 | [true] ( ... ) |
+| UseUseExplosion.rb:21:245:21:254 | ... > ... | UseUseExplosion.rb:21:244:21:255 | ( ... ) |
 | UseUseExplosion.rb:21:253:21:254 | 89 | UseUseExplosion.rb:21:245:21:254 | ... > ... |
 | UseUseExplosion.rb:21:257:21:3508 | then ... | UseUseExplosion.rb:21:241:21:3524 | if ... |
 | UseUseExplosion.rb:21:262:21:3508 | if ... | UseUseExplosion.rb:21:257:21:3508 | then ... |
@@ -1829,8 +1718,7 @@
 | UseUseExplosion.rb:21:266:21:270 | [post] self | UseUseExplosion.rb:21:3499:21:3504 | self |
 | UseUseExplosion.rb:21:266:21:270 | self | UseUseExplosion.rb:21:287:21:291 | self |
 | UseUseExplosion.rb:21:266:21:270 | self | UseUseExplosion.rb:21:3499:21:3504 | self |
-| UseUseExplosion.rb:21:266:21:275 | ... > ... | UseUseExplosion.rb:21:265:21:276 | [false] ( ... ) |
-| UseUseExplosion.rb:21:266:21:275 | ... > ... | UseUseExplosion.rb:21:265:21:276 | [true] ( ... ) |
+| UseUseExplosion.rb:21:266:21:275 | ... > ... | UseUseExplosion.rb:21:265:21:276 | ( ... ) |
 | UseUseExplosion.rb:21:274:21:275 | 88 | UseUseExplosion.rb:21:266:21:275 | ... > ... |
 | UseUseExplosion.rb:21:278:21:3492 | then ... | UseUseExplosion.rb:21:262:21:3508 | if ... |
 | UseUseExplosion.rb:21:283:21:3492 | if ... | UseUseExplosion.rb:21:278:21:3492 | then ... |
@@ -1839,8 +1727,7 @@
 | UseUseExplosion.rb:21:287:21:291 | [post] self | UseUseExplosion.rb:21:3483:21:3488 | self |
 | UseUseExplosion.rb:21:287:21:291 | self | UseUseExplosion.rb:21:308:21:312 | self |
 | UseUseExplosion.rb:21:287:21:291 | self | UseUseExplosion.rb:21:3483:21:3488 | self |
-| UseUseExplosion.rb:21:287:21:296 | ... > ... | UseUseExplosion.rb:21:286:21:297 | [false] ( ... ) |
-| UseUseExplosion.rb:21:287:21:296 | ... > ... | UseUseExplosion.rb:21:286:21:297 | [true] ( ... ) |
+| UseUseExplosion.rb:21:287:21:296 | ... > ... | UseUseExplosion.rb:21:286:21:297 | ( ... ) |
 | UseUseExplosion.rb:21:295:21:296 | 87 | UseUseExplosion.rb:21:287:21:296 | ... > ... |
 | UseUseExplosion.rb:21:299:21:3476 | then ... | UseUseExplosion.rb:21:283:21:3492 | if ... |
 | UseUseExplosion.rb:21:304:21:3476 | if ... | UseUseExplosion.rb:21:299:21:3476 | then ... |
@@ -1849,8 +1736,7 @@
 | UseUseExplosion.rb:21:308:21:312 | [post] self | UseUseExplosion.rb:21:3467:21:3472 | self |
 | UseUseExplosion.rb:21:308:21:312 | self | UseUseExplosion.rb:21:329:21:333 | self |
 | UseUseExplosion.rb:21:308:21:312 | self | UseUseExplosion.rb:21:3467:21:3472 | self |
-| UseUseExplosion.rb:21:308:21:317 | ... > ... | UseUseExplosion.rb:21:307:21:318 | [false] ( ... ) |
-| UseUseExplosion.rb:21:308:21:317 | ... > ... | UseUseExplosion.rb:21:307:21:318 | [true] ( ... ) |
+| UseUseExplosion.rb:21:308:21:317 | ... > ... | UseUseExplosion.rb:21:307:21:318 | ( ... ) |
 | UseUseExplosion.rb:21:316:21:317 | 86 | UseUseExplosion.rb:21:308:21:317 | ... > ... |
 | UseUseExplosion.rb:21:320:21:3460 | then ... | UseUseExplosion.rb:21:304:21:3476 | if ... |
 | UseUseExplosion.rb:21:325:21:3460 | if ... | UseUseExplosion.rb:21:320:21:3460 | then ... |
@@ -1859,8 +1745,7 @@
 | UseUseExplosion.rb:21:329:21:333 | [post] self | UseUseExplosion.rb:21:3451:21:3456 | self |
 | UseUseExplosion.rb:21:329:21:333 | self | UseUseExplosion.rb:21:350:21:354 | self |
 | UseUseExplosion.rb:21:329:21:333 | self | UseUseExplosion.rb:21:3451:21:3456 | self |
-| UseUseExplosion.rb:21:329:21:338 | ... > ... | UseUseExplosion.rb:21:328:21:339 | [false] ( ... ) |
-| UseUseExplosion.rb:21:329:21:338 | ... > ... | UseUseExplosion.rb:21:328:21:339 | [true] ( ... ) |
+| UseUseExplosion.rb:21:329:21:338 | ... > ... | UseUseExplosion.rb:21:328:21:339 | ( ... ) |
 | UseUseExplosion.rb:21:337:21:338 | 85 | UseUseExplosion.rb:21:329:21:338 | ... > ... |
 | UseUseExplosion.rb:21:341:21:3444 | then ... | UseUseExplosion.rb:21:325:21:3460 | if ... |
 | UseUseExplosion.rb:21:346:21:3444 | if ... | UseUseExplosion.rb:21:341:21:3444 | then ... |
@@ -1869,8 +1754,7 @@
 | UseUseExplosion.rb:21:350:21:354 | [post] self | UseUseExplosion.rb:21:3435:21:3440 | self |
 | UseUseExplosion.rb:21:350:21:354 | self | UseUseExplosion.rb:21:371:21:375 | self |
 | UseUseExplosion.rb:21:350:21:354 | self | UseUseExplosion.rb:21:3435:21:3440 | self |
-| UseUseExplosion.rb:21:350:21:359 | ... > ... | UseUseExplosion.rb:21:349:21:360 | [false] ( ... ) |
-| UseUseExplosion.rb:21:350:21:359 | ... > ... | UseUseExplosion.rb:21:349:21:360 | [true] ( ... ) |
+| UseUseExplosion.rb:21:350:21:359 | ... > ... | UseUseExplosion.rb:21:349:21:360 | ( ... ) |
 | UseUseExplosion.rb:21:358:21:359 | 84 | UseUseExplosion.rb:21:350:21:359 | ... > ... |
 | UseUseExplosion.rb:21:362:21:3428 | then ... | UseUseExplosion.rb:21:346:21:3444 | if ... |
 | UseUseExplosion.rb:21:367:21:3428 | if ... | UseUseExplosion.rb:21:362:21:3428 | then ... |
@@ -1879,8 +1763,7 @@
 | UseUseExplosion.rb:21:371:21:375 | [post] self | UseUseExplosion.rb:21:3419:21:3424 | self |
 | UseUseExplosion.rb:21:371:21:375 | self | UseUseExplosion.rb:21:392:21:396 | self |
 | UseUseExplosion.rb:21:371:21:375 | self | UseUseExplosion.rb:21:3419:21:3424 | self |
-| UseUseExplosion.rb:21:371:21:380 | ... > ... | UseUseExplosion.rb:21:370:21:381 | [false] ( ... ) |
-| UseUseExplosion.rb:21:371:21:380 | ... > ... | UseUseExplosion.rb:21:370:21:381 | [true] ( ... ) |
+| UseUseExplosion.rb:21:371:21:380 | ... > ... | UseUseExplosion.rb:21:370:21:381 | ( ... ) |
 | UseUseExplosion.rb:21:379:21:380 | 83 | UseUseExplosion.rb:21:371:21:380 | ... > ... |
 | UseUseExplosion.rb:21:383:21:3412 | then ... | UseUseExplosion.rb:21:367:21:3428 | if ... |
 | UseUseExplosion.rb:21:388:21:3412 | if ... | UseUseExplosion.rb:21:383:21:3412 | then ... |
@@ -1889,8 +1772,7 @@
 | UseUseExplosion.rb:21:392:21:396 | [post] self | UseUseExplosion.rb:21:3403:21:3408 | self |
 | UseUseExplosion.rb:21:392:21:396 | self | UseUseExplosion.rb:21:413:21:417 | self |
 | UseUseExplosion.rb:21:392:21:396 | self | UseUseExplosion.rb:21:3403:21:3408 | self |
-| UseUseExplosion.rb:21:392:21:401 | ... > ... | UseUseExplosion.rb:21:391:21:402 | [false] ( ... ) |
-| UseUseExplosion.rb:21:392:21:401 | ... > ... | UseUseExplosion.rb:21:391:21:402 | [true] ( ... ) |
+| UseUseExplosion.rb:21:392:21:401 | ... > ... | UseUseExplosion.rb:21:391:21:402 | ( ... ) |
 | UseUseExplosion.rb:21:400:21:401 | 82 | UseUseExplosion.rb:21:392:21:401 | ... > ... |
 | UseUseExplosion.rb:21:404:21:3396 | then ... | UseUseExplosion.rb:21:388:21:3412 | if ... |
 | UseUseExplosion.rb:21:409:21:3396 | if ... | UseUseExplosion.rb:21:404:21:3396 | then ... |
@@ -1899,8 +1781,7 @@
 | UseUseExplosion.rb:21:413:21:417 | [post] self | UseUseExplosion.rb:21:3387:21:3392 | self |
 | UseUseExplosion.rb:21:413:21:417 | self | UseUseExplosion.rb:21:434:21:438 | self |
 | UseUseExplosion.rb:21:413:21:417 | self | UseUseExplosion.rb:21:3387:21:3392 | self |
-| UseUseExplosion.rb:21:413:21:422 | ... > ... | UseUseExplosion.rb:21:412:21:423 | [false] ( ... ) |
-| UseUseExplosion.rb:21:413:21:422 | ... > ... | UseUseExplosion.rb:21:412:21:423 | [true] ( ... ) |
+| UseUseExplosion.rb:21:413:21:422 | ... > ... | UseUseExplosion.rb:21:412:21:423 | ( ... ) |
 | UseUseExplosion.rb:21:421:21:422 | 81 | UseUseExplosion.rb:21:413:21:422 | ... > ... |
 | UseUseExplosion.rb:21:425:21:3380 | then ... | UseUseExplosion.rb:21:409:21:3396 | if ... |
 | UseUseExplosion.rb:21:430:21:3380 | if ... | UseUseExplosion.rb:21:425:21:3380 | then ... |
@@ -1909,8 +1790,7 @@
 | UseUseExplosion.rb:21:434:21:438 | [post] self | UseUseExplosion.rb:21:3371:21:3376 | self |
 | UseUseExplosion.rb:21:434:21:438 | self | UseUseExplosion.rb:21:455:21:459 | self |
 | UseUseExplosion.rb:21:434:21:438 | self | UseUseExplosion.rb:21:3371:21:3376 | self |
-| UseUseExplosion.rb:21:434:21:443 | ... > ... | UseUseExplosion.rb:21:433:21:444 | [false] ( ... ) |
-| UseUseExplosion.rb:21:434:21:443 | ... > ... | UseUseExplosion.rb:21:433:21:444 | [true] ( ... ) |
+| UseUseExplosion.rb:21:434:21:443 | ... > ... | UseUseExplosion.rb:21:433:21:444 | ( ... ) |
 | UseUseExplosion.rb:21:442:21:443 | 80 | UseUseExplosion.rb:21:434:21:443 | ... > ... |
 | UseUseExplosion.rb:21:446:21:3364 | then ... | UseUseExplosion.rb:21:430:21:3380 | if ... |
 | UseUseExplosion.rb:21:451:21:3364 | if ... | UseUseExplosion.rb:21:446:21:3364 | then ... |
@@ -1919,8 +1799,7 @@
 | UseUseExplosion.rb:21:455:21:459 | [post] self | UseUseExplosion.rb:21:3355:21:3360 | self |
 | UseUseExplosion.rb:21:455:21:459 | self | UseUseExplosion.rb:21:476:21:480 | self |
 | UseUseExplosion.rb:21:455:21:459 | self | UseUseExplosion.rb:21:3355:21:3360 | self |
-| UseUseExplosion.rb:21:455:21:464 | ... > ... | UseUseExplosion.rb:21:454:21:465 | [false] ( ... ) |
-| UseUseExplosion.rb:21:455:21:464 | ... > ... | UseUseExplosion.rb:21:454:21:465 | [true] ( ... ) |
+| UseUseExplosion.rb:21:455:21:464 | ... > ... | UseUseExplosion.rb:21:454:21:465 | ( ... ) |
 | UseUseExplosion.rb:21:463:21:464 | 79 | UseUseExplosion.rb:21:455:21:464 | ... > ... |
 | UseUseExplosion.rb:21:467:21:3348 | then ... | UseUseExplosion.rb:21:451:21:3364 | if ... |
 | UseUseExplosion.rb:21:472:21:3348 | if ... | UseUseExplosion.rb:21:467:21:3348 | then ... |
@@ -1929,8 +1808,7 @@
 | UseUseExplosion.rb:21:476:21:480 | [post] self | UseUseExplosion.rb:21:3339:21:3344 | self |
 | UseUseExplosion.rb:21:476:21:480 | self | UseUseExplosion.rb:21:497:21:501 | self |
 | UseUseExplosion.rb:21:476:21:480 | self | UseUseExplosion.rb:21:3339:21:3344 | self |
-| UseUseExplosion.rb:21:476:21:485 | ... > ... | UseUseExplosion.rb:21:475:21:486 | [false] ( ... ) |
-| UseUseExplosion.rb:21:476:21:485 | ... > ... | UseUseExplosion.rb:21:475:21:486 | [true] ( ... ) |
+| UseUseExplosion.rb:21:476:21:485 | ... > ... | UseUseExplosion.rb:21:475:21:486 | ( ... ) |
 | UseUseExplosion.rb:21:484:21:485 | 78 | UseUseExplosion.rb:21:476:21:485 | ... > ... |
 | UseUseExplosion.rb:21:488:21:3332 | then ... | UseUseExplosion.rb:21:472:21:3348 | if ... |
 | UseUseExplosion.rb:21:493:21:3332 | if ... | UseUseExplosion.rb:21:488:21:3332 | then ... |
@@ -1939,8 +1817,7 @@
 | UseUseExplosion.rb:21:497:21:501 | [post] self | UseUseExplosion.rb:21:3323:21:3328 | self |
 | UseUseExplosion.rb:21:497:21:501 | self | UseUseExplosion.rb:21:518:21:522 | self |
 | UseUseExplosion.rb:21:497:21:501 | self | UseUseExplosion.rb:21:3323:21:3328 | self |
-| UseUseExplosion.rb:21:497:21:506 | ... > ... | UseUseExplosion.rb:21:496:21:507 | [false] ( ... ) |
-| UseUseExplosion.rb:21:497:21:506 | ... > ... | UseUseExplosion.rb:21:496:21:507 | [true] ( ... ) |
+| UseUseExplosion.rb:21:497:21:506 | ... > ... | UseUseExplosion.rb:21:496:21:507 | ( ... ) |
 | UseUseExplosion.rb:21:505:21:506 | 77 | UseUseExplosion.rb:21:497:21:506 | ... > ... |
 | UseUseExplosion.rb:21:509:21:3316 | then ... | UseUseExplosion.rb:21:493:21:3332 | if ... |
 | UseUseExplosion.rb:21:514:21:3316 | if ... | UseUseExplosion.rb:21:509:21:3316 | then ... |
@@ -1949,8 +1826,7 @@
 | UseUseExplosion.rb:21:518:21:522 | [post] self | UseUseExplosion.rb:21:3307:21:3312 | self |
 | UseUseExplosion.rb:21:518:21:522 | self | UseUseExplosion.rb:21:539:21:543 | self |
 | UseUseExplosion.rb:21:518:21:522 | self | UseUseExplosion.rb:21:3307:21:3312 | self |
-| UseUseExplosion.rb:21:518:21:527 | ... > ... | UseUseExplosion.rb:21:517:21:528 | [false] ( ... ) |
-| UseUseExplosion.rb:21:518:21:527 | ... > ... | UseUseExplosion.rb:21:517:21:528 | [true] ( ... ) |
+| UseUseExplosion.rb:21:518:21:527 | ... > ... | UseUseExplosion.rb:21:517:21:528 | ( ... ) |
 | UseUseExplosion.rb:21:526:21:527 | 76 | UseUseExplosion.rb:21:518:21:527 | ... > ... |
 | UseUseExplosion.rb:21:530:21:3300 | then ... | UseUseExplosion.rb:21:514:21:3316 | if ... |
 | UseUseExplosion.rb:21:535:21:3300 | if ... | UseUseExplosion.rb:21:530:21:3300 | then ... |
@@ -1959,8 +1835,7 @@
 | UseUseExplosion.rb:21:539:21:543 | [post] self | UseUseExplosion.rb:21:3291:21:3296 | self |
 | UseUseExplosion.rb:21:539:21:543 | self | UseUseExplosion.rb:21:560:21:564 | self |
 | UseUseExplosion.rb:21:539:21:543 | self | UseUseExplosion.rb:21:3291:21:3296 | self |
-| UseUseExplosion.rb:21:539:21:548 | ... > ... | UseUseExplosion.rb:21:538:21:549 | [false] ( ... ) |
-| UseUseExplosion.rb:21:539:21:548 | ... > ... | UseUseExplosion.rb:21:538:21:549 | [true] ( ... ) |
+| UseUseExplosion.rb:21:539:21:548 | ... > ... | UseUseExplosion.rb:21:538:21:549 | ( ... ) |
 | UseUseExplosion.rb:21:547:21:548 | 75 | UseUseExplosion.rb:21:539:21:548 | ... > ... |
 | UseUseExplosion.rb:21:551:21:3284 | then ... | UseUseExplosion.rb:21:535:21:3300 | if ... |
 | UseUseExplosion.rb:21:556:21:3284 | if ... | UseUseExplosion.rb:21:551:21:3284 | then ... |
@@ -1969,8 +1844,7 @@
 | UseUseExplosion.rb:21:560:21:564 | [post] self | UseUseExplosion.rb:21:3275:21:3280 | self |
 | UseUseExplosion.rb:21:560:21:564 | self | UseUseExplosion.rb:21:581:21:585 | self |
 | UseUseExplosion.rb:21:560:21:564 | self | UseUseExplosion.rb:21:3275:21:3280 | self |
-| UseUseExplosion.rb:21:560:21:569 | ... > ... | UseUseExplosion.rb:21:559:21:570 | [false] ( ... ) |
-| UseUseExplosion.rb:21:560:21:569 | ... > ... | UseUseExplosion.rb:21:559:21:570 | [true] ( ... ) |
+| UseUseExplosion.rb:21:560:21:569 | ... > ... | UseUseExplosion.rb:21:559:21:570 | ( ... ) |
 | UseUseExplosion.rb:21:568:21:569 | 74 | UseUseExplosion.rb:21:560:21:569 | ... > ... |
 | UseUseExplosion.rb:21:572:21:3268 | then ... | UseUseExplosion.rb:21:556:21:3284 | if ... |
 | UseUseExplosion.rb:21:577:21:3268 | if ... | UseUseExplosion.rb:21:572:21:3268 | then ... |
@@ -1979,8 +1853,7 @@
 | UseUseExplosion.rb:21:581:21:585 | [post] self | UseUseExplosion.rb:21:3259:21:3264 | self |
 | UseUseExplosion.rb:21:581:21:585 | self | UseUseExplosion.rb:21:602:21:606 | self |
 | UseUseExplosion.rb:21:581:21:585 | self | UseUseExplosion.rb:21:3259:21:3264 | self |
-| UseUseExplosion.rb:21:581:21:590 | ... > ... | UseUseExplosion.rb:21:580:21:591 | [false] ( ... ) |
-| UseUseExplosion.rb:21:581:21:590 | ... > ... | UseUseExplosion.rb:21:580:21:591 | [true] ( ... ) |
+| UseUseExplosion.rb:21:581:21:590 | ... > ... | UseUseExplosion.rb:21:580:21:591 | ( ... ) |
 | UseUseExplosion.rb:21:589:21:590 | 73 | UseUseExplosion.rb:21:581:21:590 | ... > ... |
 | UseUseExplosion.rb:21:593:21:3252 | then ... | UseUseExplosion.rb:21:577:21:3268 | if ... |
 | UseUseExplosion.rb:21:598:21:3252 | if ... | UseUseExplosion.rb:21:593:21:3252 | then ... |
@@ -1989,8 +1862,7 @@
 | UseUseExplosion.rb:21:602:21:606 | [post] self | UseUseExplosion.rb:21:3243:21:3248 | self |
 | UseUseExplosion.rb:21:602:21:606 | self | UseUseExplosion.rb:21:623:21:627 | self |
 | UseUseExplosion.rb:21:602:21:606 | self | UseUseExplosion.rb:21:3243:21:3248 | self |
-| UseUseExplosion.rb:21:602:21:611 | ... > ... | UseUseExplosion.rb:21:601:21:612 | [false] ( ... ) |
-| UseUseExplosion.rb:21:602:21:611 | ... > ... | UseUseExplosion.rb:21:601:21:612 | [true] ( ... ) |
+| UseUseExplosion.rb:21:602:21:611 | ... > ... | UseUseExplosion.rb:21:601:21:612 | ( ... ) |
 | UseUseExplosion.rb:21:610:21:611 | 72 | UseUseExplosion.rb:21:602:21:611 | ... > ... |
 | UseUseExplosion.rb:21:614:21:3236 | then ... | UseUseExplosion.rb:21:598:21:3252 | if ... |
 | UseUseExplosion.rb:21:619:21:3236 | if ... | UseUseExplosion.rb:21:614:21:3236 | then ... |
@@ -1999,8 +1871,7 @@
 | UseUseExplosion.rb:21:623:21:627 | [post] self | UseUseExplosion.rb:21:3227:21:3232 | self |
 | UseUseExplosion.rb:21:623:21:627 | self | UseUseExplosion.rb:21:644:21:648 | self |
 | UseUseExplosion.rb:21:623:21:627 | self | UseUseExplosion.rb:21:3227:21:3232 | self |
-| UseUseExplosion.rb:21:623:21:632 | ... > ... | UseUseExplosion.rb:21:622:21:633 | [false] ( ... ) |
-| UseUseExplosion.rb:21:623:21:632 | ... > ... | UseUseExplosion.rb:21:622:21:633 | [true] ( ... ) |
+| UseUseExplosion.rb:21:623:21:632 | ... > ... | UseUseExplosion.rb:21:622:21:633 | ( ... ) |
 | UseUseExplosion.rb:21:631:21:632 | 71 | UseUseExplosion.rb:21:623:21:632 | ... > ... |
 | UseUseExplosion.rb:21:635:21:3220 | then ... | UseUseExplosion.rb:21:619:21:3236 | if ... |
 | UseUseExplosion.rb:21:640:21:3220 | if ... | UseUseExplosion.rb:21:635:21:3220 | then ... |
@@ -2009,8 +1880,7 @@
 | UseUseExplosion.rb:21:644:21:648 | [post] self | UseUseExplosion.rb:21:3211:21:3216 | self |
 | UseUseExplosion.rb:21:644:21:648 | self | UseUseExplosion.rb:21:665:21:669 | self |
 | UseUseExplosion.rb:21:644:21:648 | self | UseUseExplosion.rb:21:3211:21:3216 | self |
-| UseUseExplosion.rb:21:644:21:653 | ... > ... | UseUseExplosion.rb:21:643:21:654 | [false] ( ... ) |
-| UseUseExplosion.rb:21:644:21:653 | ... > ... | UseUseExplosion.rb:21:643:21:654 | [true] ( ... ) |
+| UseUseExplosion.rb:21:644:21:653 | ... > ... | UseUseExplosion.rb:21:643:21:654 | ( ... ) |
 | UseUseExplosion.rb:21:652:21:653 | 70 | UseUseExplosion.rb:21:644:21:653 | ... > ... |
 | UseUseExplosion.rb:21:656:21:3204 | then ... | UseUseExplosion.rb:21:640:21:3220 | if ... |
 | UseUseExplosion.rb:21:661:21:3204 | if ... | UseUseExplosion.rb:21:656:21:3204 | then ... |
@@ -2019,8 +1889,7 @@
 | UseUseExplosion.rb:21:665:21:669 | [post] self | UseUseExplosion.rb:21:3195:21:3200 | self |
 | UseUseExplosion.rb:21:665:21:669 | self | UseUseExplosion.rb:21:686:21:690 | self |
 | UseUseExplosion.rb:21:665:21:669 | self | UseUseExplosion.rb:21:3195:21:3200 | self |
-| UseUseExplosion.rb:21:665:21:674 | ... > ... | UseUseExplosion.rb:21:664:21:675 | [false] ( ... ) |
-| UseUseExplosion.rb:21:665:21:674 | ... > ... | UseUseExplosion.rb:21:664:21:675 | [true] ( ... ) |
+| UseUseExplosion.rb:21:665:21:674 | ... > ... | UseUseExplosion.rb:21:664:21:675 | ( ... ) |
 | UseUseExplosion.rb:21:673:21:674 | 69 | UseUseExplosion.rb:21:665:21:674 | ... > ... |
 | UseUseExplosion.rb:21:677:21:3188 | then ... | UseUseExplosion.rb:21:661:21:3204 | if ... |
 | UseUseExplosion.rb:21:682:21:3188 | if ... | UseUseExplosion.rb:21:677:21:3188 | then ... |
@@ -2029,8 +1898,7 @@
 | UseUseExplosion.rb:21:686:21:690 | [post] self | UseUseExplosion.rb:21:3179:21:3184 | self |
 | UseUseExplosion.rb:21:686:21:690 | self | UseUseExplosion.rb:21:707:21:711 | self |
 | UseUseExplosion.rb:21:686:21:690 | self | UseUseExplosion.rb:21:3179:21:3184 | self |
-| UseUseExplosion.rb:21:686:21:695 | ... > ... | UseUseExplosion.rb:21:685:21:696 | [false] ( ... ) |
-| UseUseExplosion.rb:21:686:21:695 | ... > ... | UseUseExplosion.rb:21:685:21:696 | [true] ( ... ) |
+| UseUseExplosion.rb:21:686:21:695 | ... > ... | UseUseExplosion.rb:21:685:21:696 | ( ... ) |
 | UseUseExplosion.rb:21:694:21:695 | 68 | UseUseExplosion.rb:21:686:21:695 | ... > ... |
 | UseUseExplosion.rb:21:698:21:3172 | then ... | UseUseExplosion.rb:21:682:21:3188 | if ... |
 | UseUseExplosion.rb:21:703:21:3172 | if ... | UseUseExplosion.rb:21:698:21:3172 | then ... |
@@ -2039,8 +1907,7 @@
 | UseUseExplosion.rb:21:707:21:711 | [post] self | UseUseExplosion.rb:21:3163:21:3168 | self |
 | UseUseExplosion.rb:21:707:21:711 | self | UseUseExplosion.rb:21:728:21:732 | self |
 | UseUseExplosion.rb:21:707:21:711 | self | UseUseExplosion.rb:21:3163:21:3168 | self |
-| UseUseExplosion.rb:21:707:21:716 | ... > ... | UseUseExplosion.rb:21:706:21:717 | [false] ( ... ) |
-| UseUseExplosion.rb:21:707:21:716 | ... > ... | UseUseExplosion.rb:21:706:21:717 | [true] ( ... ) |
+| UseUseExplosion.rb:21:707:21:716 | ... > ... | UseUseExplosion.rb:21:706:21:717 | ( ... ) |
 | UseUseExplosion.rb:21:715:21:716 | 67 | UseUseExplosion.rb:21:707:21:716 | ... > ... |
 | UseUseExplosion.rb:21:719:21:3156 | then ... | UseUseExplosion.rb:21:703:21:3172 | if ... |
 | UseUseExplosion.rb:21:724:21:3156 | if ... | UseUseExplosion.rb:21:719:21:3156 | then ... |
@@ -2049,8 +1916,7 @@
 | UseUseExplosion.rb:21:728:21:732 | [post] self | UseUseExplosion.rb:21:3147:21:3152 | self |
 | UseUseExplosion.rb:21:728:21:732 | self | UseUseExplosion.rb:21:749:21:753 | self |
 | UseUseExplosion.rb:21:728:21:732 | self | UseUseExplosion.rb:21:3147:21:3152 | self |
-| UseUseExplosion.rb:21:728:21:737 | ... > ... | UseUseExplosion.rb:21:727:21:738 | [false] ( ... ) |
-| UseUseExplosion.rb:21:728:21:737 | ... > ... | UseUseExplosion.rb:21:727:21:738 | [true] ( ... ) |
+| UseUseExplosion.rb:21:728:21:737 | ... > ... | UseUseExplosion.rb:21:727:21:738 | ( ... ) |
 | UseUseExplosion.rb:21:736:21:737 | 66 | UseUseExplosion.rb:21:728:21:737 | ... > ... |
 | UseUseExplosion.rb:21:740:21:3140 | then ... | UseUseExplosion.rb:21:724:21:3156 | if ... |
 | UseUseExplosion.rb:21:745:21:3140 | if ... | UseUseExplosion.rb:21:740:21:3140 | then ... |
@@ -2059,8 +1925,7 @@
 | UseUseExplosion.rb:21:749:21:753 | [post] self | UseUseExplosion.rb:21:3131:21:3136 | self |
 | UseUseExplosion.rb:21:749:21:753 | self | UseUseExplosion.rb:21:770:21:774 | self |
 | UseUseExplosion.rb:21:749:21:753 | self | UseUseExplosion.rb:21:3131:21:3136 | self |
-| UseUseExplosion.rb:21:749:21:758 | ... > ... | UseUseExplosion.rb:21:748:21:759 | [false] ( ... ) |
-| UseUseExplosion.rb:21:749:21:758 | ... > ... | UseUseExplosion.rb:21:748:21:759 | [true] ( ... ) |
+| UseUseExplosion.rb:21:749:21:758 | ... > ... | UseUseExplosion.rb:21:748:21:759 | ( ... ) |
 | UseUseExplosion.rb:21:757:21:758 | 65 | UseUseExplosion.rb:21:749:21:758 | ... > ... |
 | UseUseExplosion.rb:21:761:21:3124 | then ... | UseUseExplosion.rb:21:745:21:3140 | if ... |
 | UseUseExplosion.rb:21:766:21:3124 | if ... | UseUseExplosion.rb:21:761:21:3124 | then ... |
@@ -2069,8 +1934,7 @@
 | UseUseExplosion.rb:21:770:21:774 | [post] self | UseUseExplosion.rb:21:3115:21:3120 | self |
 | UseUseExplosion.rb:21:770:21:774 | self | UseUseExplosion.rb:21:791:21:795 | self |
 | UseUseExplosion.rb:21:770:21:774 | self | UseUseExplosion.rb:21:3115:21:3120 | self |
-| UseUseExplosion.rb:21:770:21:779 | ... > ... | UseUseExplosion.rb:21:769:21:780 | [false] ( ... ) |
-| UseUseExplosion.rb:21:770:21:779 | ... > ... | UseUseExplosion.rb:21:769:21:780 | [true] ( ... ) |
+| UseUseExplosion.rb:21:770:21:779 | ... > ... | UseUseExplosion.rb:21:769:21:780 | ( ... ) |
 | UseUseExplosion.rb:21:778:21:779 | 64 | UseUseExplosion.rb:21:770:21:779 | ... > ... |
 | UseUseExplosion.rb:21:782:21:3108 | then ... | UseUseExplosion.rb:21:766:21:3124 | if ... |
 | UseUseExplosion.rb:21:787:21:3108 | if ... | UseUseExplosion.rb:21:782:21:3108 | then ... |
@@ -2079,8 +1943,7 @@
 | UseUseExplosion.rb:21:791:21:795 | [post] self | UseUseExplosion.rb:21:3099:21:3104 | self |
 | UseUseExplosion.rb:21:791:21:795 | self | UseUseExplosion.rb:21:812:21:816 | self |
 | UseUseExplosion.rb:21:791:21:795 | self | UseUseExplosion.rb:21:3099:21:3104 | self |
-| UseUseExplosion.rb:21:791:21:800 | ... > ... | UseUseExplosion.rb:21:790:21:801 | [false] ( ... ) |
-| UseUseExplosion.rb:21:791:21:800 | ... > ... | UseUseExplosion.rb:21:790:21:801 | [true] ( ... ) |
+| UseUseExplosion.rb:21:791:21:800 | ... > ... | UseUseExplosion.rb:21:790:21:801 | ( ... ) |
 | UseUseExplosion.rb:21:799:21:800 | 63 | UseUseExplosion.rb:21:791:21:800 | ... > ... |
 | UseUseExplosion.rb:21:803:21:3092 | then ... | UseUseExplosion.rb:21:787:21:3108 | if ... |
 | UseUseExplosion.rb:21:808:21:3092 | if ... | UseUseExplosion.rb:21:803:21:3092 | then ... |
@@ -2089,8 +1952,7 @@
 | UseUseExplosion.rb:21:812:21:816 | [post] self | UseUseExplosion.rb:21:3083:21:3088 | self |
 | UseUseExplosion.rb:21:812:21:816 | self | UseUseExplosion.rb:21:833:21:837 | self |
 | UseUseExplosion.rb:21:812:21:816 | self | UseUseExplosion.rb:21:3083:21:3088 | self |
-| UseUseExplosion.rb:21:812:21:821 | ... > ... | UseUseExplosion.rb:21:811:21:822 | [false] ( ... ) |
-| UseUseExplosion.rb:21:812:21:821 | ... > ... | UseUseExplosion.rb:21:811:21:822 | [true] ( ... ) |
+| UseUseExplosion.rb:21:812:21:821 | ... > ... | UseUseExplosion.rb:21:811:21:822 | ( ... ) |
 | UseUseExplosion.rb:21:820:21:821 | 62 | UseUseExplosion.rb:21:812:21:821 | ... > ... |
 | UseUseExplosion.rb:21:824:21:3076 | then ... | UseUseExplosion.rb:21:808:21:3092 | if ... |
 | UseUseExplosion.rb:21:829:21:3076 | if ... | UseUseExplosion.rb:21:824:21:3076 | then ... |
@@ -2099,8 +1961,7 @@
 | UseUseExplosion.rb:21:833:21:837 | [post] self | UseUseExplosion.rb:21:3067:21:3072 | self |
 | UseUseExplosion.rb:21:833:21:837 | self | UseUseExplosion.rb:21:854:21:858 | self |
 | UseUseExplosion.rb:21:833:21:837 | self | UseUseExplosion.rb:21:3067:21:3072 | self |
-| UseUseExplosion.rb:21:833:21:842 | ... > ... | UseUseExplosion.rb:21:832:21:843 | [false] ( ... ) |
-| UseUseExplosion.rb:21:833:21:842 | ... > ... | UseUseExplosion.rb:21:832:21:843 | [true] ( ... ) |
+| UseUseExplosion.rb:21:833:21:842 | ... > ... | UseUseExplosion.rb:21:832:21:843 | ( ... ) |
 | UseUseExplosion.rb:21:841:21:842 | 61 | UseUseExplosion.rb:21:833:21:842 | ... > ... |
 | UseUseExplosion.rb:21:845:21:3060 | then ... | UseUseExplosion.rb:21:829:21:3076 | if ... |
 | UseUseExplosion.rb:21:850:21:3060 | if ... | UseUseExplosion.rb:21:845:21:3060 | then ... |
@@ -2109,8 +1970,7 @@
 | UseUseExplosion.rb:21:854:21:858 | [post] self | UseUseExplosion.rb:21:3051:21:3056 | self |
 | UseUseExplosion.rb:21:854:21:858 | self | UseUseExplosion.rb:21:875:21:879 | self |
 | UseUseExplosion.rb:21:854:21:858 | self | UseUseExplosion.rb:21:3051:21:3056 | self |
-| UseUseExplosion.rb:21:854:21:863 | ... > ... | UseUseExplosion.rb:21:853:21:864 | [false] ( ... ) |
-| UseUseExplosion.rb:21:854:21:863 | ... > ... | UseUseExplosion.rb:21:853:21:864 | [true] ( ... ) |
+| UseUseExplosion.rb:21:854:21:863 | ... > ... | UseUseExplosion.rb:21:853:21:864 | ( ... ) |
 | UseUseExplosion.rb:21:862:21:863 | 60 | UseUseExplosion.rb:21:854:21:863 | ... > ... |
 | UseUseExplosion.rb:21:866:21:3044 | then ... | UseUseExplosion.rb:21:850:21:3060 | if ... |
 | UseUseExplosion.rb:21:871:21:3044 | if ... | UseUseExplosion.rb:21:866:21:3044 | then ... |
@@ -2119,8 +1979,7 @@
 | UseUseExplosion.rb:21:875:21:879 | [post] self | UseUseExplosion.rb:21:3035:21:3040 | self |
 | UseUseExplosion.rb:21:875:21:879 | self | UseUseExplosion.rb:21:896:21:900 | self |
 | UseUseExplosion.rb:21:875:21:879 | self | UseUseExplosion.rb:21:3035:21:3040 | self |
-| UseUseExplosion.rb:21:875:21:884 | ... > ... | UseUseExplosion.rb:21:874:21:885 | [false] ( ... ) |
-| UseUseExplosion.rb:21:875:21:884 | ... > ... | UseUseExplosion.rb:21:874:21:885 | [true] ( ... ) |
+| UseUseExplosion.rb:21:875:21:884 | ... > ... | UseUseExplosion.rb:21:874:21:885 | ( ... ) |
 | UseUseExplosion.rb:21:883:21:884 | 59 | UseUseExplosion.rb:21:875:21:884 | ... > ... |
 | UseUseExplosion.rb:21:887:21:3028 | then ... | UseUseExplosion.rb:21:871:21:3044 | if ... |
 | UseUseExplosion.rb:21:892:21:3028 | if ... | UseUseExplosion.rb:21:887:21:3028 | then ... |
@@ -2129,8 +1988,7 @@
 | UseUseExplosion.rb:21:896:21:900 | [post] self | UseUseExplosion.rb:21:3019:21:3024 | self |
 | UseUseExplosion.rb:21:896:21:900 | self | UseUseExplosion.rb:21:917:21:921 | self |
 | UseUseExplosion.rb:21:896:21:900 | self | UseUseExplosion.rb:21:3019:21:3024 | self |
-| UseUseExplosion.rb:21:896:21:905 | ... > ... | UseUseExplosion.rb:21:895:21:906 | [false] ( ... ) |
-| UseUseExplosion.rb:21:896:21:905 | ... > ... | UseUseExplosion.rb:21:895:21:906 | [true] ( ... ) |
+| UseUseExplosion.rb:21:896:21:905 | ... > ... | UseUseExplosion.rb:21:895:21:906 | ( ... ) |
 | UseUseExplosion.rb:21:904:21:905 | 58 | UseUseExplosion.rb:21:896:21:905 | ... > ... |
 | UseUseExplosion.rb:21:908:21:3012 | then ... | UseUseExplosion.rb:21:892:21:3028 | if ... |
 | UseUseExplosion.rb:21:913:21:3012 | if ... | UseUseExplosion.rb:21:908:21:3012 | then ... |
@@ -2139,8 +1997,7 @@
 | UseUseExplosion.rb:21:917:21:921 | [post] self | UseUseExplosion.rb:21:3003:21:3008 | self |
 | UseUseExplosion.rb:21:917:21:921 | self | UseUseExplosion.rb:21:938:21:942 | self |
 | UseUseExplosion.rb:21:917:21:921 | self | UseUseExplosion.rb:21:3003:21:3008 | self |
-| UseUseExplosion.rb:21:917:21:926 | ... > ... | UseUseExplosion.rb:21:916:21:927 | [false] ( ... ) |
-| UseUseExplosion.rb:21:917:21:926 | ... > ... | UseUseExplosion.rb:21:916:21:927 | [true] ( ... ) |
+| UseUseExplosion.rb:21:917:21:926 | ... > ... | UseUseExplosion.rb:21:916:21:927 | ( ... ) |
 | UseUseExplosion.rb:21:925:21:926 | 57 | UseUseExplosion.rb:21:917:21:926 | ... > ... |
 | UseUseExplosion.rb:21:929:21:2996 | then ... | UseUseExplosion.rb:21:913:21:3012 | if ... |
 | UseUseExplosion.rb:21:934:21:2996 | if ... | UseUseExplosion.rb:21:929:21:2996 | then ... |
@@ -2149,8 +2006,7 @@
 | UseUseExplosion.rb:21:938:21:942 | [post] self | UseUseExplosion.rb:21:2987:21:2992 | self |
 | UseUseExplosion.rb:21:938:21:942 | self | UseUseExplosion.rb:21:959:21:963 | self |
 | UseUseExplosion.rb:21:938:21:942 | self | UseUseExplosion.rb:21:2987:21:2992 | self |
-| UseUseExplosion.rb:21:938:21:947 | ... > ... | UseUseExplosion.rb:21:937:21:948 | [false] ( ... ) |
-| UseUseExplosion.rb:21:938:21:947 | ... > ... | UseUseExplosion.rb:21:937:21:948 | [true] ( ... ) |
+| UseUseExplosion.rb:21:938:21:947 | ... > ... | UseUseExplosion.rb:21:937:21:948 | ( ... ) |
 | UseUseExplosion.rb:21:946:21:947 | 56 | UseUseExplosion.rb:21:938:21:947 | ... > ... |
 | UseUseExplosion.rb:21:950:21:2980 | then ... | UseUseExplosion.rb:21:934:21:2996 | if ... |
 | UseUseExplosion.rb:21:955:21:2980 | if ... | UseUseExplosion.rb:21:950:21:2980 | then ... |
@@ -2159,8 +2015,7 @@
 | UseUseExplosion.rb:21:959:21:963 | [post] self | UseUseExplosion.rb:21:2971:21:2976 | self |
 | UseUseExplosion.rb:21:959:21:963 | self | UseUseExplosion.rb:21:980:21:984 | self |
 | UseUseExplosion.rb:21:959:21:963 | self | UseUseExplosion.rb:21:2971:21:2976 | self |
-| UseUseExplosion.rb:21:959:21:968 | ... > ... | UseUseExplosion.rb:21:958:21:969 | [false] ( ... ) |
-| UseUseExplosion.rb:21:959:21:968 | ... > ... | UseUseExplosion.rb:21:958:21:969 | [true] ( ... ) |
+| UseUseExplosion.rb:21:959:21:968 | ... > ... | UseUseExplosion.rb:21:958:21:969 | ( ... ) |
 | UseUseExplosion.rb:21:967:21:968 | 55 | UseUseExplosion.rb:21:959:21:968 | ... > ... |
 | UseUseExplosion.rb:21:971:21:2964 | then ... | UseUseExplosion.rb:21:955:21:2980 | if ... |
 | UseUseExplosion.rb:21:976:21:2964 | if ... | UseUseExplosion.rb:21:971:21:2964 | then ... |
@@ -2169,8 +2024,7 @@
 | UseUseExplosion.rb:21:980:21:984 | [post] self | UseUseExplosion.rb:21:2955:21:2960 | self |
 | UseUseExplosion.rb:21:980:21:984 | self | UseUseExplosion.rb:21:1001:21:1005 | self |
 | UseUseExplosion.rb:21:980:21:984 | self | UseUseExplosion.rb:21:2955:21:2960 | self |
-| UseUseExplosion.rb:21:980:21:989 | ... > ... | UseUseExplosion.rb:21:979:21:990 | [false] ( ... ) |
-| UseUseExplosion.rb:21:980:21:989 | ... > ... | UseUseExplosion.rb:21:979:21:990 | [true] ( ... ) |
+| UseUseExplosion.rb:21:980:21:989 | ... > ... | UseUseExplosion.rb:21:979:21:990 | ( ... ) |
 | UseUseExplosion.rb:21:988:21:989 | 54 | UseUseExplosion.rb:21:980:21:989 | ... > ... |
 | UseUseExplosion.rb:21:992:21:2948 | then ... | UseUseExplosion.rb:21:976:21:2964 | if ... |
 | UseUseExplosion.rb:21:997:21:2948 | if ... | UseUseExplosion.rb:21:992:21:2948 | then ... |
@@ -2179,8 +2033,7 @@
 | UseUseExplosion.rb:21:1001:21:1005 | [post] self | UseUseExplosion.rb:21:2939:21:2944 | self |
 | UseUseExplosion.rb:21:1001:21:1005 | self | UseUseExplosion.rb:21:1022:21:1026 | self |
 | UseUseExplosion.rb:21:1001:21:1005 | self | UseUseExplosion.rb:21:2939:21:2944 | self |
-| UseUseExplosion.rb:21:1001:21:1010 | ... > ... | UseUseExplosion.rb:21:1000:21:1011 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1001:21:1010 | ... > ... | UseUseExplosion.rb:21:1000:21:1011 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1001:21:1010 | ... > ... | UseUseExplosion.rb:21:1000:21:1011 | ( ... ) |
 | UseUseExplosion.rb:21:1009:21:1010 | 53 | UseUseExplosion.rb:21:1001:21:1010 | ... > ... |
 | UseUseExplosion.rb:21:1013:21:2932 | then ... | UseUseExplosion.rb:21:997:21:2948 | if ... |
 | UseUseExplosion.rb:21:1018:21:2932 | if ... | UseUseExplosion.rb:21:1013:21:2932 | then ... |
@@ -2189,8 +2042,7 @@
 | UseUseExplosion.rb:21:1022:21:1026 | [post] self | UseUseExplosion.rb:21:2923:21:2928 | self |
 | UseUseExplosion.rb:21:1022:21:1026 | self | UseUseExplosion.rb:21:1043:21:1047 | self |
 | UseUseExplosion.rb:21:1022:21:1026 | self | UseUseExplosion.rb:21:2923:21:2928 | self |
-| UseUseExplosion.rb:21:1022:21:1031 | ... > ... | UseUseExplosion.rb:21:1021:21:1032 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1022:21:1031 | ... > ... | UseUseExplosion.rb:21:1021:21:1032 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1022:21:1031 | ... > ... | UseUseExplosion.rb:21:1021:21:1032 | ( ... ) |
 | UseUseExplosion.rb:21:1030:21:1031 | 52 | UseUseExplosion.rb:21:1022:21:1031 | ... > ... |
 | UseUseExplosion.rb:21:1034:21:2916 | then ... | UseUseExplosion.rb:21:1018:21:2932 | if ... |
 | UseUseExplosion.rb:21:1039:21:2916 | if ... | UseUseExplosion.rb:21:1034:21:2916 | then ... |
@@ -2199,8 +2051,7 @@
 | UseUseExplosion.rb:21:1043:21:1047 | [post] self | UseUseExplosion.rb:21:2907:21:2912 | self |
 | UseUseExplosion.rb:21:1043:21:1047 | self | UseUseExplosion.rb:21:1064:21:1068 | self |
 | UseUseExplosion.rb:21:1043:21:1047 | self | UseUseExplosion.rb:21:2907:21:2912 | self |
-| UseUseExplosion.rb:21:1043:21:1052 | ... > ... | UseUseExplosion.rb:21:1042:21:1053 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1043:21:1052 | ... > ... | UseUseExplosion.rb:21:1042:21:1053 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1043:21:1052 | ... > ... | UseUseExplosion.rb:21:1042:21:1053 | ( ... ) |
 | UseUseExplosion.rb:21:1051:21:1052 | 51 | UseUseExplosion.rb:21:1043:21:1052 | ... > ... |
 | UseUseExplosion.rb:21:1055:21:2900 | then ... | UseUseExplosion.rb:21:1039:21:2916 | if ... |
 | UseUseExplosion.rb:21:1060:21:2900 | if ... | UseUseExplosion.rb:21:1055:21:2900 | then ... |
@@ -2209,8 +2060,7 @@
 | UseUseExplosion.rb:21:1064:21:1068 | [post] self | UseUseExplosion.rb:21:2891:21:2896 | self |
 | UseUseExplosion.rb:21:1064:21:1068 | self | UseUseExplosion.rb:21:1085:21:1089 | self |
 | UseUseExplosion.rb:21:1064:21:1068 | self | UseUseExplosion.rb:21:2891:21:2896 | self |
-| UseUseExplosion.rb:21:1064:21:1073 | ... > ... | UseUseExplosion.rb:21:1063:21:1074 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1064:21:1073 | ... > ... | UseUseExplosion.rb:21:1063:21:1074 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1064:21:1073 | ... > ... | UseUseExplosion.rb:21:1063:21:1074 | ( ... ) |
 | UseUseExplosion.rb:21:1072:21:1073 | 50 | UseUseExplosion.rb:21:1064:21:1073 | ... > ... |
 | UseUseExplosion.rb:21:1076:21:2884 | then ... | UseUseExplosion.rb:21:1060:21:2900 | if ... |
 | UseUseExplosion.rb:21:1081:21:2884 | if ... | UseUseExplosion.rb:21:1076:21:2884 | then ... |
@@ -2219,8 +2069,7 @@
 | UseUseExplosion.rb:21:1085:21:1089 | [post] self | UseUseExplosion.rb:21:2875:21:2880 | self |
 | UseUseExplosion.rb:21:1085:21:1089 | self | UseUseExplosion.rb:21:1106:21:1110 | self |
 | UseUseExplosion.rb:21:1085:21:1089 | self | UseUseExplosion.rb:21:2875:21:2880 | self |
-| UseUseExplosion.rb:21:1085:21:1094 | ... > ... | UseUseExplosion.rb:21:1084:21:1095 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1085:21:1094 | ... > ... | UseUseExplosion.rb:21:1084:21:1095 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1085:21:1094 | ... > ... | UseUseExplosion.rb:21:1084:21:1095 | ( ... ) |
 | UseUseExplosion.rb:21:1093:21:1094 | 49 | UseUseExplosion.rb:21:1085:21:1094 | ... > ... |
 | UseUseExplosion.rb:21:1097:21:2868 | then ... | UseUseExplosion.rb:21:1081:21:2884 | if ... |
 | UseUseExplosion.rb:21:1102:21:2868 | if ... | UseUseExplosion.rb:21:1097:21:2868 | then ... |
@@ -2229,8 +2078,7 @@
 | UseUseExplosion.rb:21:1106:21:1110 | [post] self | UseUseExplosion.rb:21:2859:21:2864 | self |
 | UseUseExplosion.rb:21:1106:21:1110 | self | UseUseExplosion.rb:21:1127:21:1131 | self |
 | UseUseExplosion.rb:21:1106:21:1110 | self | UseUseExplosion.rb:21:2859:21:2864 | self |
-| UseUseExplosion.rb:21:1106:21:1115 | ... > ... | UseUseExplosion.rb:21:1105:21:1116 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1106:21:1115 | ... > ... | UseUseExplosion.rb:21:1105:21:1116 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1106:21:1115 | ... > ... | UseUseExplosion.rb:21:1105:21:1116 | ( ... ) |
 | UseUseExplosion.rb:21:1114:21:1115 | 48 | UseUseExplosion.rb:21:1106:21:1115 | ... > ... |
 | UseUseExplosion.rb:21:1118:21:2852 | then ... | UseUseExplosion.rb:21:1102:21:2868 | if ... |
 | UseUseExplosion.rb:21:1123:21:2852 | if ... | UseUseExplosion.rb:21:1118:21:2852 | then ... |
@@ -2239,8 +2087,7 @@
 | UseUseExplosion.rb:21:1127:21:1131 | [post] self | UseUseExplosion.rb:21:2843:21:2848 | self |
 | UseUseExplosion.rb:21:1127:21:1131 | self | UseUseExplosion.rb:21:1148:21:1152 | self |
 | UseUseExplosion.rb:21:1127:21:1131 | self | UseUseExplosion.rb:21:2843:21:2848 | self |
-| UseUseExplosion.rb:21:1127:21:1136 | ... > ... | UseUseExplosion.rb:21:1126:21:1137 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1127:21:1136 | ... > ... | UseUseExplosion.rb:21:1126:21:1137 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1127:21:1136 | ... > ... | UseUseExplosion.rb:21:1126:21:1137 | ( ... ) |
 | UseUseExplosion.rb:21:1135:21:1136 | 47 | UseUseExplosion.rb:21:1127:21:1136 | ... > ... |
 | UseUseExplosion.rb:21:1139:21:2836 | then ... | UseUseExplosion.rb:21:1123:21:2852 | if ... |
 | UseUseExplosion.rb:21:1144:21:2836 | if ... | UseUseExplosion.rb:21:1139:21:2836 | then ... |
@@ -2249,8 +2096,7 @@
 | UseUseExplosion.rb:21:1148:21:1152 | [post] self | UseUseExplosion.rb:21:2827:21:2832 | self |
 | UseUseExplosion.rb:21:1148:21:1152 | self | UseUseExplosion.rb:21:1169:21:1173 | self |
 | UseUseExplosion.rb:21:1148:21:1152 | self | UseUseExplosion.rb:21:2827:21:2832 | self |
-| UseUseExplosion.rb:21:1148:21:1157 | ... > ... | UseUseExplosion.rb:21:1147:21:1158 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1148:21:1157 | ... > ... | UseUseExplosion.rb:21:1147:21:1158 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1148:21:1157 | ... > ... | UseUseExplosion.rb:21:1147:21:1158 | ( ... ) |
 | UseUseExplosion.rb:21:1156:21:1157 | 46 | UseUseExplosion.rb:21:1148:21:1157 | ... > ... |
 | UseUseExplosion.rb:21:1160:21:2820 | then ... | UseUseExplosion.rb:21:1144:21:2836 | if ... |
 | UseUseExplosion.rb:21:1165:21:2820 | if ... | UseUseExplosion.rb:21:1160:21:2820 | then ... |
@@ -2259,8 +2105,7 @@
 | UseUseExplosion.rb:21:1169:21:1173 | [post] self | UseUseExplosion.rb:21:2811:21:2816 | self |
 | UseUseExplosion.rb:21:1169:21:1173 | self | UseUseExplosion.rb:21:1190:21:1194 | self |
 | UseUseExplosion.rb:21:1169:21:1173 | self | UseUseExplosion.rb:21:2811:21:2816 | self |
-| UseUseExplosion.rb:21:1169:21:1178 | ... > ... | UseUseExplosion.rb:21:1168:21:1179 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1169:21:1178 | ... > ... | UseUseExplosion.rb:21:1168:21:1179 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1169:21:1178 | ... > ... | UseUseExplosion.rb:21:1168:21:1179 | ( ... ) |
 | UseUseExplosion.rb:21:1177:21:1178 | 45 | UseUseExplosion.rb:21:1169:21:1178 | ... > ... |
 | UseUseExplosion.rb:21:1181:21:2804 | then ... | UseUseExplosion.rb:21:1165:21:2820 | if ... |
 | UseUseExplosion.rb:21:1186:21:2804 | if ... | UseUseExplosion.rb:21:1181:21:2804 | then ... |
@@ -2269,8 +2114,7 @@
 | UseUseExplosion.rb:21:1190:21:1194 | [post] self | UseUseExplosion.rb:21:2795:21:2800 | self |
 | UseUseExplosion.rb:21:1190:21:1194 | self | UseUseExplosion.rb:21:1211:21:1215 | self |
 | UseUseExplosion.rb:21:1190:21:1194 | self | UseUseExplosion.rb:21:2795:21:2800 | self |
-| UseUseExplosion.rb:21:1190:21:1199 | ... > ... | UseUseExplosion.rb:21:1189:21:1200 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1190:21:1199 | ... > ... | UseUseExplosion.rb:21:1189:21:1200 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1190:21:1199 | ... > ... | UseUseExplosion.rb:21:1189:21:1200 | ( ... ) |
 | UseUseExplosion.rb:21:1198:21:1199 | 44 | UseUseExplosion.rb:21:1190:21:1199 | ... > ... |
 | UseUseExplosion.rb:21:1202:21:2788 | then ... | UseUseExplosion.rb:21:1186:21:2804 | if ... |
 | UseUseExplosion.rb:21:1207:21:2788 | if ... | UseUseExplosion.rb:21:1202:21:2788 | then ... |
@@ -2279,8 +2123,7 @@
 | UseUseExplosion.rb:21:1211:21:1215 | [post] self | UseUseExplosion.rb:21:2779:21:2784 | self |
 | UseUseExplosion.rb:21:1211:21:1215 | self | UseUseExplosion.rb:21:1232:21:1236 | self |
 | UseUseExplosion.rb:21:1211:21:1215 | self | UseUseExplosion.rb:21:2779:21:2784 | self |
-| UseUseExplosion.rb:21:1211:21:1220 | ... > ... | UseUseExplosion.rb:21:1210:21:1221 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1211:21:1220 | ... > ... | UseUseExplosion.rb:21:1210:21:1221 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1211:21:1220 | ... > ... | UseUseExplosion.rb:21:1210:21:1221 | ( ... ) |
 | UseUseExplosion.rb:21:1219:21:1220 | 43 | UseUseExplosion.rb:21:1211:21:1220 | ... > ... |
 | UseUseExplosion.rb:21:1223:21:2772 | then ... | UseUseExplosion.rb:21:1207:21:2788 | if ... |
 | UseUseExplosion.rb:21:1228:21:2772 | if ... | UseUseExplosion.rb:21:1223:21:2772 | then ... |
@@ -2289,8 +2132,7 @@
 | UseUseExplosion.rb:21:1232:21:1236 | [post] self | UseUseExplosion.rb:21:2763:21:2768 | self |
 | UseUseExplosion.rb:21:1232:21:1236 | self | UseUseExplosion.rb:21:1253:21:1257 | self |
 | UseUseExplosion.rb:21:1232:21:1236 | self | UseUseExplosion.rb:21:2763:21:2768 | self |
-| UseUseExplosion.rb:21:1232:21:1241 | ... > ... | UseUseExplosion.rb:21:1231:21:1242 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1232:21:1241 | ... > ... | UseUseExplosion.rb:21:1231:21:1242 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1232:21:1241 | ... > ... | UseUseExplosion.rb:21:1231:21:1242 | ( ... ) |
 | UseUseExplosion.rb:21:1240:21:1241 | 42 | UseUseExplosion.rb:21:1232:21:1241 | ... > ... |
 | UseUseExplosion.rb:21:1244:21:2756 | then ... | UseUseExplosion.rb:21:1228:21:2772 | if ... |
 | UseUseExplosion.rb:21:1249:21:2756 | if ... | UseUseExplosion.rb:21:1244:21:2756 | then ... |
@@ -2299,8 +2141,7 @@
 | UseUseExplosion.rb:21:1253:21:1257 | [post] self | UseUseExplosion.rb:21:2747:21:2752 | self |
 | UseUseExplosion.rb:21:1253:21:1257 | self | UseUseExplosion.rb:21:1274:21:1278 | self |
 | UseUseExplosion.rb:21:1253:21:1257 | self | UseUseExplosion.rb:21:2747:21:2752 | self |
-| UseUseExplosion.rb:21:1253:21:1262 | ... > ... | UseUseExplosion.rb:21:1252:21:1263 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1253:21:1262 | ... > ... | UseUseExplosion.rb:21:1252:21:1263 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1253:21:1262 | ... > ... | UseUseExplosion.rb:21:1252:21:1263 | ( ... ) |
 | UseUseExplosion.rb:21:1261:21:1262 | 41 | UseUseExplosion.rb:21:1253:21:1262 | ... > ... |
 | UseUseExplosion.rb:21:1265:21:2740 | then ... | UseUseExplosion.rb:21:1249:21:2756 | if ... |
 | UseUseExplosion.rb:21:1270:21:2740 | if ... | UseUseExplosion.rb:21:1265:21:2740 | then ... |
@@ -2309,8 +2150,7 @@
 | UseUseExplosion.rb:21:1274:21:1278 | [post] self | UseUseExplosion.rb:21:2731:21:2736 | self |
 | UseUseExplosion.rb:21:1274:21:1278 | self | UseUseExplosion.rb:21:1295:21:1299 | self |
 | UseUseExplosion.rb:21:1274:21:1278 | self | UseUseExplosion.rb:21:2731:21:2736 | self |
-| UseUseExplosion.rb:21:1274:21:1283 | ... > ... | UseUseExplosion.rb:21:1273:21:1284 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1274:21:1283 | ... > ... | UseUseExplosion.rb:21:1273:21:1284 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1274:21:1283 | ... > ... | UseUseExplosion.rb:21:1273:21:1284 | ( ... ) |
 | UseUseExplosion.rb:21:1282:21:1283 | 40 | UseUseExplosion.rb:21:1274:21:1283 | ... > ... |
 | UseUseExplosion.rb:21:1286:21:2724 | then ... | UseUseExplosion.rb:21:1270:21:2740 | if ... |
 | UseUseExplosion.rb:21:1291:21:2724 | if ... | UseUseExplosion.rb:21:1286:21:2724 | then ... |
@@ -2319,8 +2159,7 @@
 | UseUseExplosion.rb:21:1295:21:1299 | [post] self | UseUseExplosion.rb:21:2715:21:2720 | self |
 | UseUseExplosion.rb:21:1295:21:1299 | self | UseUseExplosion.rb:21:1316:21:1320 | self |
 | UseUseExplosion.rb:21:1295:21:1299 | self | UseUseExplosion.rb:21:2715:21:2720 | self |
-| UseUseExplosion.rb:21:1295:21:1304 | ... > ... | UseUseExplosion.rb:21:1294:21:1305 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1295:21:1304 | ... > ... | UseUseExplosion.rb:21:1294:21:1305 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1295:21:1304 | ... > ... | UseUseExplosion.rb:21:1294:21:1305 | ( ... ) |
 | UseUseExplosion.rb:21:1303:21:1304 | 39 | UseUseExplosion.rb:21:1295:21:1304 | ... > ... |
 | UseUseExplosion.rb:21:1307:21:2708 | then ... | UseUseExplosion.rb:21:1291:21:2724 | if ... |
 | UseUseExplosion.rb:21:1312:21:2708 | if ... | UseUseExplosion.rb:21:1307:21:2708 | then ... |
@@ -2329,8 +2168,7 @@
 | UseUseExplosion.rb:21:1316:21:1320 | [post] self | UseUseExplosion.rb:21:2699:21:2704 | self |
 | UseUseExplosion.rb:21:1316:21:1320 | self | UseUseExplosion.rb:21:1337:21:1341 | self |
 | UseUseExplosion.rb:21:1316:21:1320 | self | UseUseExplosion.rb:21:2699:21:2704 | self |
-| UseUseExplosion.rb:21:1316:21:1325 | ... > ... | UseUseExplosion.rb:21:1315:21:1326 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1316:21:1325 | ... > ... | UseUseExplosion.rb:21:1315:21:1326 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1316:21:1325 | ... > ... | UseUseExplosion.rb:21:1315:21:1326 | ( ... ) |
 | UseUseExplosion.rb:21:1324:21:1325 | 38 | UseUseExplosion.rb:21:1316:21:1325 | ... > ... |
 | UseUseExplosion.rb:21:1328:21:2692 | then ... | UseUseExplosion.rb:21:1312:21:2708 | if ... |
 | UseUseExplosion.rb:21:1333:21:2692 | if ... | UseUseExplosion.rb:21:1328:21:2692 | then ... |
@@ -2339,8 +2177,7 @@
 | UseUseExplosion.rb:21:1337:21:1341 | [post] self | UseUseExplosion.rb:21:2683:21:2688 | self |
 | UseUseExplosion.rb:21:1337:21:1341 | self | UseUseExplosion.rb:21:1358:21:1362 | self |
 | UseUseExplosion.rb:21:1337:21:1341 | self | UseUseExplosion.rb:21:2683:21:2688 | self |
-| UseUseExplosion.rb:21:1337:21:1346 | ... > ... | UseUseExplosion.rb:21:1336:21:1347 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1337:21:1346 | ... > ... | UseUseExplosion.rb:21:1336:21:1347 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1337:21:1346 | ... > ... | UseUseExplosion.rb:21:1336:21:1347 | ( ... ) |
 | UseUseExplosion.rb:21:1345:21:1346 | 37 | UseUseExplosion.rb:21:1337:21:1346 | ... > ... |
 | UseUseExplosion.rb:21:1349:21:2676 | then ... | UseUseExplosion.rb:21:1333:21:2692 | if ... |
 | UseUseExplosion.rb:21:1354:21:2676 | if ... | UseUseExplosion.rb:21:1349:21:2676 | then ... |
@@ -2349,8 +2186,7 @@
 | UseUseExplosion.rb:21:1358:21:1362 | [post] self | UseUseExplosion.rb:21:2667:21:2672 | self |
 | UseUseExplosion.rb:21:1358:21:1362 | self | UseUseExplosion.rb:21:1379:21:1383 | self |
 | UseUseExplosion.rb:21:1358:21:1362 | self | UseUseExplosion.rb:21:2667:21:2672 | self |
-| UseUseExplosion.rb:21:1358:21:1367 | ... > ... | UseUseExplosion.rb:21:1357:21:1368 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1358:21:1367 | ... > ... | UseUseExplosion.rb:21:1357:21:1368 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1358:21:1367 | ... > ... | UseUseExplosion.rb:21:1357:21:1368 | ( ... ) |
 | UseUseExplosion.rb:21:1366:21:1367 | 36 | UseUseExplosion.rb:21:1358:21:1367 | ... > ... |
 | UseUseExplosion.rb:21:1370:21:2660 | then ... | UseUseExplosion.rb:21:1354:21:2676 | if ... |
 | UseUseExplosion.rb:21:1375:21:2660 | if ... | UseUseExplosion.rb:21:1370:21:2660 | then ... |
@@ -2359,8 +2195,7 @@
 | UseUseExplosion.rb:21:1379:21:1383 | [post] self | UseUseExplosion.rb:21:2651:21:2656 | self |
 | UseUseExplosion.rb:21:1379:21:1383 | self | UseUseExplosion.rb:21:1400:21:1404 | self |
 | UseUseExplosion.rb:21:1379:21:1383 | self | UseUseExplosion.rb:21:2651:21:2656 | self |
-| UseUseExplosion.rb:21:1379:21:1388 | ... > ... | UseUseExplosion.rb:21:1378:21:1389 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1379:21:1388 | ... > ... | UseUseExplosion.rb:21:1378:21:1389 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1379:21:1388 | ... > ... | UseUseExplosion.rb:21:1378:21:1389 | ( ... ) |
 | UseUseExplosion.rb:21:1387:21:1388 | 35 | UseUseExplosion.rb:21:1379:21:1388 | ... > ... |
 | UseUseExplosion.rb:21:1391:21:2644 | then ... | UseUseExplosion.rb:21:1375:21:2660 | if ... |
 | UseUseExplosion.rb:21:1396:21:2644 | if ... | UseUseExplosion.rb:21:1391:21:2644 | then ... |
@@ -2369,8 +2204,7 @@
 | UseUseExplosion.rb:21:1400:21:1404 | [post] self | UseUseExplosion.rb:21:2635:21:2640 | self |
 | UseUseExplosion.rb:21:1400:21:1404 | self | UseUseExplosion.rb:21:1421:21:1425 | self |
 | UseUseExplosion.rb:21:1400:21:1404 | self | UseUseExplosion.rb:21:2635:21:2640 | self |
-| UseUseExplosion.rb:21:1400:21:1409 | ... > ... | UseUseExplosion.rb:21:1399:21:1410 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1400:21:1409 | ... > ... | UseUseExplosion.rb:21:1399:21:1410 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1400:21:1409 | ... > ... | UseUseExplosion.rb:21:1399:21:1410 | ( ... ) |
 | UseUseExplosion.rb:21:1408:21:1409 | 34 | UseUseExplosion.rb:21:1400:21:1409 | ... > ... |
 | UseUseExplosion.rb:21:1412:21:2628 | then ... | UseUseExplosion.rb:21:1396:21:2644 | if ... |
 | UseUseExplosion.rb:21:1417:21:2628 | if ... | UseUseExplosion.rb:21:1412:21:2628 | then ... |
@@ -2379,8 +2213,7 @@
 | UseUseExplosion.rb:21:1421:21:1425 | [post] self | UseUseExplosion.rb:21:2619:21:2624 | self |
 | UseUseExplosion.rb:21:1421:21:1425 | self | UseUseExplosion.rb:21:1442:21:1446 | self |
 | UseUseExplosion.rb:21:1421:21:1425 | self | UseUseExplosion.rb:21:2619:21:2624 | self |
-| UseUseExplosion.rb:21:1421:21:1430 | ... > ... | UseUseExplosion.rb:21:1420:21:1431 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1421:21:1430 | ... > ... | UseUseExplosion.rb:21:1420:21:1431 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1421:21:1430 | ... > ... | UseUseExplosion.rb:21:1420:21:1431 | ( ... ) |
 | UseUseExplosion.rb:21:1429:21:1430 | 33 | UseUseExplosion.rb:21:1421:21:1430 | ... > ... |
 | UseUseExplosion.rb:21:1433:21:2612 | then ... | UseUseExplosion.rb:21:1417:21:2628 | if ... |
 | UseUseExplosion.rb:21:1438:21:2612 | if ... | UseUseExplosion.rb:21:1433:21:2612 | then ... |
@@ -2389,8 +2222,7 @@
 | UseUseExplosion.rb:21:1442:21:1446 | [post] self | UseUseExplosion.rb:21:2603:21:2608 | self |
 | UseUseExplosion.rb:21:1442:21:1446 | self | UseUseExplosion.rb:21:1463:21:1467 | self |
 | UseUseExplosion.rb:21:1442:21:1446 | self | UseUseExplosion.rb:21:2603:21:2608 | self |
-| UseUseExplosion.rb:21:1442:21:1451 | ... > ... | UseUseExplosion.rb:21:1441:21:1452 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1442:21:1451 | ... > ... | UseUseExplosion.rb:21:1441:21:1452 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1442:21:1451 | ... > ... | UseUseExplosion.rb:21:1441:21:1452 | ( ... ) |
 | UseUseExplosion.rb:21:1450:21:1451 | 32 | UseUseExplosion.rb:21:1442:21:1451 | ... > ... |
 | UseUseExplosion.rb:21:1454:21:2596 | then ... | UseUseExplosion.rb:21:1438:21:2612 | if ... |
 | UseUseExplosion.rb:21:1459:21:2596 | if ... | UseUseExplosion.rb:21:1454:21:2596 | then ... |
@@ -2399,8 +2231,7 @@
 | UseUseExplosion.rb:21:1463:21:1467 | [post] self | UseUseExplosion.rb:21:2587:21:2592 | self |
 | UseUseExplosion.rb:21:1463:21:1467 | self | UseUseExplosion.rb:21:1484:21:1488 | self |
 | UseUseExplosion.rb:21:1463:21:1467 | self | UseUseExplosion.rb:21:2587:21:2592 | self |
-| UseUseExplosion.rb:21:1463:21:1472 | ... > ... | UseUseExplosion.rb:21:1462:21:1473 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1463:21:1472 | ... > ... | UseUseExplosion.rb:21:1462:21:1473 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1463:21:1472 | ... > ... | UseUseExplosion.rb:21:1462:21:1473 | ( ... ) |
 | UseUseExplosion.rb:21:1471:21:1472 | 31 | UseUseExplosion.rb:21:1463:21:1472 | ... > ... |
 | UseUseExplosion.rb:21:1475:21:2580 | then ... | UseUseExplosion.rb:21:1459:21:2596 | if ... |
 | UseUseExplosion.rb:21:1480:21:2580 | if ... | UseUseExplosion.rb:21:1475:21:2580 | then ... |
@@ -2409,8 +2240,7 @@
 | UseUseExplosion.rb:21:1484:21:1488 | [post] self | UseUseExplosion.rb:21:2571:21:2576 | self |
 | UseUseExplosion.rb:21:1484:21:1488 | self | UseUseExplosion.rb:21:1505:21:1509 | self |
 | UseUseExplosion.rb:21:1484:21:1488 | self | UseUseExplosion.rb:21:2571:21:2576 | self |
-| UseUseExplosion.rb:21:1484:21:1493 | ... > ... | UseUseExplosion.rb:21:1483:21:1494 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1484:21:1493 | ... > ... | UseUseExplosion.rb:21:1483:21:1494 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1484:21:1493 | ... > ... | UseUseExplosion.rb:21:1483:21:1494 | ( ... ) |
 | UseUseExplosion.rb:21:1492:21:1493 | 30 | UseUseExplosion.rb:21:1484:21:1493 | ... > ... |
 | UseUseExplosion.rb:21:1496:21:2564 | then ... | UseUseExplosion.rb:21:1480:21:2580 | if ... |
 | UseUseExplosion.rb:21:1501:21:2564 | if ... | UseUseExplosion.rb:21:1496:21:2564 | then ... |
@@ -2419,8 +2249,7 @@
 | UseUseExplosion.rb:21:1505:21:1509 | [post] self | UseUseExplosion.rb:21:2555:21:2560 | self |
 | UseUseExplosion.rb:21:1505:21:1509 | self | UseUseExplosion.rb:21:1526:21:1530 | self |
 | UseUseExplosion.rb:21:1505:21:1509 | self | UseUseExplosion.rb:21:2555:21:2560 | self |
-| UseUseExplosion.rb:21:1505:21:1514 | ... > ... | UseUseExplosion.rb:21:1504:21:1515 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1505:21:1514 | ... > ... | UseUseExplosion.rb:21:1504:21:1515 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1505:21:1514 | ... > ... | UseUseExplosion.rb:21:1504:21:1515 | ( ... ) |
 | UseUseExplosion.rb:21:1513:21:1514 | 29 | UseUseExplosion.rb:21:1505:21:1514 | ... > ... |
 | UseUseExplosion.rb:21:1517:21:2548 | then ... | UseUseExplosion.rb:21:1501:21:2564 | if ... |
 | UseUseExplosion.rb:21:1522:21:2548 | if ... | UseUseExplosion.rb:21:1517:21:2548 | then ... |
@@ -2429,8 +2258,7 @@
 | UseUseExplosion.rb:21:1526:21:1530 | [post] self | UseUseExplosion.rb:21:2539:21:2544 | self |
 | UseUseExplosion.rb:21:1526:21:1530 | self | UseUseExplosion.rb:21:1547:21:1551 | self |
 | UseUseExplosion.rb:21:1526:21:1530 | self | UseUseExplosion.rb:21:2539:21:2544 | self |
-| UseUseExplosion.rb:21:1526:21:1535 | ... > ... | UseUseExplosion.rb:21:1525:21:1536 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1526:21:1535 | ... > ... | UseUseExplosion.rb:21:1525:21:1536 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1526:21:1535 | ... > ... | UseUseExplosion.rb:21:1525:21:1536 | ( ... ) |
 | UseUseExplosion.rb:21:1534:21:1535 | 28 | UseUseExplosion.rb:21:1526:21:1535 | ... > ... |
 | UseUseExplosion.rb:21:1538:21:2532 | then ... | UseUseExplosion.rb:21:1522:21:2548 | if ... |
 | UseUseExplosion.rb:21:1543:21:2532 | if ... | UseUseExplosion.rb:21:1538:21:2532 | then ... |
@@ -2439,8 +2267,7 @@
 | UseUseExplosion.rb:21:1547:21:1551 | [post] self | UseUseExplosion.rb:21:2523:21:2528 | self |
 | UseUseExplosion.rb:21:1547:21:1551 | self | UseUseExplosion.rb:21:1568:21:1572 | self |
 | UseUseExplosion.rb:21:1547:21:1551 | self | UseUseExplosion.rb:21:2523:21:2528 | self |
-| UseUseExplosion.rb:21:1547:21:1556 | ... > ... | UseUseExplosion.rb:21:1546:21:1557 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1547:21:1556 | ... > ... | UseUseExplosion.rb:21:1546:21:1557 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1547:21:1556 | ... > ... | UseUseExplosion.rb:21:1546:21:1557 | ( ... ) |
 | UseUseExplosion.rb:21:1555:21:1556 | 27 | UseUseExplosion.rb:21:1547:21:1556 | ... > ... |
 | UseUseExplosion.rb:21:1559:21:2516 | then ... | UseUseExplosion.rb:21:1543:21:2532 | if ... |
 | UseUseExplosion.rb:21:1564:21:2516 | if ... | UseUseExplosion.rb:21:1559:21:2516 | then ... |
@@ -2449,8 +2276,7 @@
 | UseUseExplosion.rb:21:1568:21:1572 | [post] self | UseUseExplosion.rb:21:2507:21:2512 | self |
 | UseUseExplosion.rb:21:1568:21:1572 | self | UseUseExplosion.rb:21:1589:21:1593 | self |
 | UseUseExplosion.rb:21:1568:21:1572 | self | UseUseExplosion.rb:21:2507:21:2512 | self |
-| UseUseExplosion.rb:21:1568:21:1577 | ... > ... | UseUseExplosion.rb:21:1567:21:1578 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1568:21:1577 | ... > ... | UseUseExplosion.rb:21:1567:21:1578 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1568:21:1577 | ... > ... | UseUseExplosion.rb:21:1567:21:1578 | ( ... ) |
 | UseUseExplosion.rb:21:1576:21:1577 | 26 | UseUseExplosion.rb:21:1568:21:1577 | ... > ... |
 | UseUseExplosion.rb:21:1580:21:2500 | then ... | UseUseExplosion.rb:21:1564:21:2516 | if ... |
 | UseUseExplosion.rb:21:1585:21:2500 | if ... | UseUseExplosion.rb:21:1580:21:2500 | then ... |
@@ -2459,8 +2285,7 @@
 | UseUseExplosion.rb:21:1589:21:1593 | [post] self | UseUseExplosion.rb:21:2491:21:2496 | self |
 | UseUseExplosion.rb:21:1589:21:1593 | self | UseUseExplosion.rb:21:1610:21:1614 | self |
 | UseUseExplosion.rb:21:1589:21:1593 | self | UseUseExplosion.rb:21:2491:21:2496 | self |
-| UseUseExplosion.rb:21:1589:21:1598 | ... > ... | UseUseExplosion.rb:21:1588:21:1599 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1589:21:1598 | ... > ... | UseUseExplosion.rb:21:1588:21:1599 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1589:21:1598 | ... > ... | UseUseExplosion.rb:21:1588:21:1599 | ( ... ) |
 | UseUseExplosion.rb:21:1597:21:1598 | 25 | UseUseExplosion.rb:21:1589:21:1598 | ... > ... |
 | UseUseExplosion.rb:21:1601:21:2484 | then ... | UseUseExplosion.rb:21:1585:21:2500 | if ... |
 | UseUseExplosion.rb:21:1606:21:2484 | if ... | UseUseExplosion.rb:21:1601:21:2484 | then ... |
@@ -2469,8 +2294,7 @@
 | UseUseExplosion.rb:21:1610:21:1614 | [post] self | UseUseExplosion.rb:21:2475:21:2480 | self |
 | UseUseExplosion.rb:21:1610:21:1614 | self | UseUseExplosion.rb:21:1631:21:1635 | self |
 | UseUseExplosion.rb:21:1610:21:1614 | self | UseUseExplosion.rb:21:2475:21:2480 | self |
-| UseUseExplosion.rb:21:1610:21:1619 | ... > ... | UseUseExplosion.rb:21:1609:21:1620 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1610:21:1619 | ... > ... | UseUseExplosion.rb:21:1609:21:1620 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1610:21:1619 | ... > ... | UseUseExplosion.rb:21:1609:21:1620 | ( ... ) |
 | UseUseExplosion.rb:21:1618:21:1619 | 24 | UseUseExplosion.rb:21:1610:21:1619 | ... > ... |
 | UseUseExplosion.rb:21:1622:21:2468 | then ... | UseUseExplosion.rb:21:1606:21:2484 | if ... |
 | UseUseExplosion.rb:21:1627:21:2468 | if ... | UseUseExplosion.rb:21:1622:21:2468 | then ... |
@@ -2479,8 +2303,7 @@
 | UseUseExplosion.rb:21:1631:21:1635 | [post] self | UseUseExplosion.rb:21:2459:21:2464 | self |
 | UseUseExplosion.rb:21:1631:21:1635 | self | UseUseExplosion.rb:21:1652:21:1656 | self |
 | UseUseExplosion.rb:21:1631:21:1635 | self | UseUseExplosion.rb:21:2459:21:2464 | self |
-| UseUseExplosion.rb:21:1631:21:1640 | ... > ... | UseUseExplosion.rb:21:1630:21:1641 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1631:21:1640 | ... > ... | UseUseExplosion.rb:21:1630:21:1641 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1631:21:1640 | ... > ... | UseUseExplosion.rb:21:1630:21:1641 | ( ... ) |
 | UseUseExplosion.rb:21:1639:21:1640 | 23 | UseUseExplosion.rb:21:1631:21:1640 | ... > ... |
 | UseUseExplosion.rb:21:1643:21:2452 | then ... | UseUseExplosion.rb:21:1627:21:2468 | if ... |
 | UseUseExplosion.rb:21:1648:21:2452 | if ... | UseUseExplosion.rb:21:1643:21:2452 | then ... |
@@ -2489,8 +2312,7 @@
 | UseUseExplosion.rb:21:1652:21:1656 | [post] self | UseUseExplosion.rb:21:2443:21:2448 | self |
 | UseUseExplosion.rb:21:1652:21:1656 | self | UseUseExplosion.rb:21:1673:21:1677 | self |
 | UseUseExplosion.rb:21:1652:21:1656 | self | UseUseExplosion.rb:21:2443:21:2448 | self |
-| UseUseExplosion.rb:21:1652:21:1661 | ... > ... | UseUseExplosion.rb:21:1651:21:1662 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1652:21:1661 | ... > ... | UseUseExplosion.rb:21:1651:21:1662 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1652:21:1661 | ... > ... | UseUseExplosion.rb:21:1651:21:1662 | ( ... ) |
 | UseUseExplosion.rb:21:1660:21:1661 | 22 | UseUseExplosion.rb:21:1652:21:1661 | ... > ... |
 | UseUseExplosion.rb:21:1664:21:2436 | then ... | UseUseExplosion.rb:21:1648:21:2452 | if ... |
 | UseUseExplosion.rb:21:1669:21:2436 | if ... | UseUseExplosion.rb:21:1664:21:2436 | then ... |
@@ -2499,8 +2321,7 @@
 | UseUseExplosion.rb:21:1673:21:1677 | [post] self | UseUseExplosion.rb:21:2427:21:2432 | self |
 | UseUseExplosion.rb:21:1673:21:1677 | self | UseUseExplosion.rb:21:1694:21:1698 | self |
 | UseUseExplosion.rb:21:1673:21:1677 | self | UseUseExplosion.rb:21:2427:21:2432 | self |
-| UseUseExplosion.rb:21:1673:21:1682 | ... > ... | UseUseExplosion.rb:21:1672:21:1683 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1673:21:1682 | ... > ... | UseUseExplosion.rb:21:1672:21:1683 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1673:21:1682 | ... > ... | UseUseExplosion.rb:21:1672:21:1683 | ( ... ) |
 | UseUseExplosion.rb:21:1681:21:1682 | 21 | UseUseExplosion.rb:21:1673:21:1682 | ... > ... |
 | UseUseExplosion.rb:21:1685:21:2420 | then ... | UseUseExplosion.rb:21:1669:21:2436 | if ... |
 | UseUseExplosion.rb:21:1690:21:2420 | if ... | UseUseExplosion.rb:21:1685:21:2420 | then ... |
@@ -2509,8 +2330,7 @@
 | UseUseExplosion.rb:21:1694:21:1698 | [post] self | UseUseExplosion.rb:21:2411:21:2416 | self |
 | UseUseExplosion.rb:21:1694:21:1698 | self | UseUseExplosion.rb:21:1715:21:1719 | self |
 | UseUseExplosion.rb:21:1694:21:1698 | self | UseUseExplosion.rb:21:2411:21:2416 | self |
-| UseUseExplosion.rb:21:1694:21:1703 | ... > ... | UseUseExplosion.rb:21:1693:21:1704 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1694:21:1703 | ... > ... | UseUseExplosion.rb:21:1693:21:1704 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1694:21:1703 | ... > ... | UseUseExplosion.rb:21:1693:21:1704 | ( ... ) |
 | UseUseExplosion.rb:21:1702:21:1703 | 20 | UseUseExplosion.rb:21:1694:21:1703 | ... > ... |
 | UseUseExplosion.rb:21:1706:21:2404 | then ... | UseUseExplosion.rb:21:1690:21:2420 | if ... |
 | UseUseExplosion.rb:21:1711:21:2404 | if ... | UseUseExplosion.rb:21:1706:21:2404 | then ... |
@@ -2519,8 +2339,7 @@
 | UseUseExplosion.rb:21:1715:21:1719 | [post] self | UseUseExplosion.rb:21:2395:21:2400 | self |
 | UseUseExplosion.rb:21:1715:21:1719 | self | UseUseExplosion.rb:21:1736:21:1740 | self |
 | UseUseExplosion.rb:21:1715:21:1719 | self | UseUseExplosion.rb:21:2395:21:2400 | self |
-| UseUseExplosion.rb:21:1715:21:1724 | ... > ... | UseUseExplosion.rb:21:1714:21:1725 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1715:21:1724 | ... > ... | UseUseExplosion.rb:21:1714:21:1725 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1715:21:1724 | ... > ... | UseUseExplosion.rb:21:1714:21:1725 | ( ... ) |
 | UseUseExplosion.rb:21:1723:21:1724 | 19 | UseUseExplosion.rb:21:1715:21:1724 | ... > ... |
 | UseUseExplosion.rb:21:1727:21:2388 | then ... | UseUseExplosion.rb:21:1711:21:2404 | if ... |
 | UseUseExplosion.rb:21:1732:21:2388 | if ... | UseUseExplosion.rb:21:1727:21:2388 | then ... |
@@ -2529,8 +2348,7 @@
 | UseUseExplosion.rb:21:1736:21:1740 | [post] self | UseUseExplosion.rb:21:2379:21:2384 | self |
 | UseUseExplosion.rb:21:1736:21:1740 | self | UseUseExplosion.rb:21:1757:21:1761 | self |
 | UseUseExplosion.rb:21:1736:21:1740 | self | UseUseExplosion.rb:21:2379:21:2384 | self |
-| UseUseExplosion.rb:21:1736:21:1745 | ... > ... | UseUseExplosion.rb:21:1735:21:1746 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1736:21:1745 | ... > ... | UseUseExplosion.rb:21:1735:21:1746 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1736:21:1745 | ... > ... | UseUseExplosion.rb:21:1735:21:1746 | ( ... ) |
 | UseUseExplosion.rb:21:1744:21:1745 | 18 | UseUseExplosion.rb:21:1736:21:1745 | ... > ... |
 | UseUseExplosion.rb:21:1748:21:2372 | then ... | UseUseExplosion.rb:21:1732:21:2388 | if ... |
 | UseUseExplosion.rb:21:1753:21:2372 | if ... | UseUseExplosion.rb:21:1748:21:2372 | then ... |
@@ -2539,8 +2357,7 @@
 | UseUseExplosion.rb:21:1757:21:1761 | [post] self | UseUseExplosion.rb:21:2363:21:2368 | self |
 | UseUseExplosion.rb:21:1757:21:1761 | self | UseUseExplosion.rb:21:1778:21:1782 | self |
 | UseUseExplosion.rb:21:1757:21:1761 | self | UseUseExplosion.rb:21:2363:21:2368 | self |
-| UseUseExplosion.rb:21:1757:21:1766 | ... > ... | UseUseExplosion.rb:21:1756:21:1767 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1757:21:1766 | ... > ... | UseUseExplosion.rb:21:1756:21:1767 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1757:21:1766 | ... > ... | UseUseExplosion.rb:21:1756:21:1767 | ( ... ) |
 | UseUseExplosion.rb:21:1765:21:1766 | 17 | UseUseExplosion.rb:21:1757:21:1766 | ... > ... |
 | UseUseExplosion.rb:21:1769:21:2356 | then ... | UseUseExplosion.rb:21:1753:21:2372 | if ... |
 | UseUseExplosion.rb:21:1774:21:2356 | if ... | UseUseExplosion.rb:21:1769:21:2356 | then ... |
@@ -2549,8 +2366,7 @@
 | UseUseExplosion.rb:21:1778:21:1782 | [post] self | UseUseExplosion.rb:21:2347:21:2352 | self |
 | UseUseExplosion.rb:21:1778:21:1782 | self | UseUseExplosion.rb:21:1799:21:1803 | self |
 | UseUseExplosion.rb:21:1778:21:1782 | self | UseUseExplosion.rb:21:2347:21:2352 | self |
-| UseUseExplosion.rb:21:1778:21:1787 | ... > ... | UseUseExplosion.rb:21:1777:21:1788 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1778:21:1787 | ... > ... | UseUseExplosion.rb:21:1777:21:1788 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1778:21:1787 | ... > ... | UseUseExplosion.rb:21:1777:21:1788 | ( ... ) |
 | UseUseExplosion.rb:21:1786:21:1787 | 16 | UseUseExplosion.rb:21:1778:21:1787 | ... > ... |
 | UseUseExplosion.rb:21:1790:21:2340 | then ... | UseUseExplosion.rb:21:1774:21:2356 | if ... |
 | UseUseExplosion.rb:21:1795:21:2340 | if ... | UseUseExplosion.rb:21:1790:21:2340 | then ... |
@@ -2559,8 +2375,7 @@
 | UseUseExplosion.rb:21:1799:21:1803 | [post] self | UseUseExplosion.rb:21:2331:21:2336 | self |
 | UseUseExplosion.rb:21:1799:21:1803 | self | UseUseExplosion.rb:21:1820:21:1824 | self |
 | UseUseExplosion.rb:21:1799:21:1803 | self | UseUseExplosion.rb:21:2331:21:2336 | self |
-| UseUseExplosion.rb:21:1799:21:1808 | ... > ... | UseUseExplosion.rb:21:1798:21:1809 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1799:21:1808 | ... > ... | UseUseExplosion.rb:21:1798:21:1809 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1799:21:1808 | ... > ... | UseUseExplosion.rb:21:1798:21:1809 | ( ... ) |
 | UseUseExplosion.rb:21:1807:21:1808 | 15 | UseUseExplosion.rb:21:1799:21:1808 | ... > ... |
 | UseUseExplosion.rb:21:1811:21:2324 | then ... | UseUseExplosion.rb:21:1795:21:2340 | if ... |
 | UseUseExplosion.rb:21:1816:21:2324 | if ... | UseUseExplosion.rb:21:1811:21:2324 | then ... |
@@ -2569,8 +2384,7 @@
 | UseUseExplosion.rb:21:1820:21:1824 | [post] self | UseUseExplosion.rb:21:2315:21:2320 | self |
 | UseUseExplosion.rb:21:1820:21:1824 | self | UseUseExplosion.rb:21:1841:21:1845 | self |
 | UseUseExplosion.rb:21:1820:21:1824 | self | UseUseExplosion.rb:21:2315:21:2320 | self |
-| UseUseExplosion.rb:21:1820:21:1829 | ... > ... | UseUseExplosion.rb:21:1819:21:1830 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1820:21:1829 | ... > ... | UseUseExplosion.rb:21:1819:21:1830 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1820:21:1829 | ... > ... | UseUseExplosion.rb:21:1819:21:1830 | ( ... ) |
 | UseUseExplosion.rb:21:1828:21:1829 | 14 | UseUseExplosion.rb:21:1820:21:1829 | ... > ... |
 | UseUseExplosion.rb:21:1832:21:2308 | then ... | UseUseExplosion.rb:21:1816:21:2324 | if ... |
 | UseUseExplosion.rb:21:1837:21:2308 | if ... | UseUseExplosion.rb:21:1832:21:2308 | then ... |
@@ -2579,8 +2393,7 @@
 | UseUseExplosion.rb:21:1841:21:1845 | [post] self | UseUseExplosion.rb:21:2299:21:2304 | self |
 | UseUseExplosion.rb:21:1841:21:1845 | self | UseUseExplosion.rb:21:1862:21:1866 | self |
 | UseUseExplosion.rb:21:1841:21:1845 | self | UseUseExplosion.rb:21:2299:21:2304 | self |
-| UseUseExplosion.rb:21:1841:21:1850 | ... > ... | UseUseExplosion.rb:21:1840:21:1851 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1841:21:1850 | ... > ... | UseUseExplosion.rb:21:1840:21:1851 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1841:21:1850 | ... > ... | UseUseExplosion.rb:21:1840:21:1851 | ( ... ) |
 | UseUseExplosion.rb:21:1849:21:1850 | 13 | UseUseExplosion.rb:21:1841:21:1850 | ... > ... |
 | UseUseExplosion.rb:21:1853:21:2292 | then ... | UseUseExplosion.rb:21:1837:21:2308 | if ... |
 | UseUseExplosion.rb:21:1858:21:2292 | if ... | UseUseExplosion.rb:21:1853:21:2292 | then ... |
@@ -2589,8 +2402,7 @@
 | UseUseExplosion.rb:21:1862:21:1866 | [post] self | UseUseExplosion.rb:21:2283:21:2288 | self |
 | UseUseExplosion.rb:21:1862:21:1866 | self | UseUseExplosion.rb:21:1883:21:1887 | self |
 | UseUseExplosion.rb:21:1862:21:1866 | self | UseUseExplosion.rb:21:2283:21:2288 | self |
-| UseUseExplosion.rb:21:1862:21:1871 | ... > ... | UseUseExplosion.rb:21:1861:21:1872 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1862:21:1871 | ... > ... | UseUseExplosion.rb:21:1861:21:1872 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1862:21:1871 | ... > ... | UseUseExplosion.rb:21:1861:21:1872 | ( ... ) |
 | UseUseExplosion.rb:21:1870:21:1871 | 12 | UseUseExplosion.rb:21:1862:21:1871 | ... > ... |
 | UseUseExplosion.rb:21:1874:21:2276 | then ... | UseUseExplosion.rb:21:1858:21:2292 | if ... |
 | UseUseExplosion.rb:21:1879:21:2276 | if ... | UseUseExplosion.rb:21:1874:21:2276 | then ... |
@@ -2599,8 +2411,7 @@
 | UseUseExplosion.rb:21:1883:21:1887 | [post] self | UseUseExplosion.rb:21:2267:21:2272 | self |
 | UseUseExplosion.rb:21:1883:21:1887 | self | UseUseExplosion.rb:21:1904:21:1908 | self |
 | UseUseExplosion.rb:21:1883:21:1887 | self | UseUseExplosion.rb:21:2267:21:2272 | self |
-| UseUseExplosion.rb:21:1883:21:1892 | ... > ... | UseUseExplosion.rb:21:1882:21:1893 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1883:21:1892 | ... > ... | UseUseExplosion.rb:21:1882:21:1893 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1883:21:1892 | ... > ... | UseUseExplosion.rb:21:1882:21:1893 | ( ... ) |
 | UseUseExplosion.rb:21:1891:21:1892 | 11 | UseUseExplosion.rb:21:1883:21:1892 | ... > ... |
 | UseUseExplosion.rb:21:1895:21:2260 | then ... | UseUseExplosion.rb:21:1879:21:2276 | if ... |
 | UseUseExplosion.rb:21:1900:21:2260 | if ... | UseUseExplosion.rb:21:1895:21:2260 | then ... |
@@ -2609,8 +2420,7 @@
 | UseUseExplosion.rb:21:1904:21:1908 | [post] self | UseUseExplosion.rb:21:2251:21:2256 | self |
 | UseUseExplosion.rb:21:1904:21:1908 | self | UseUseExplosion.rb:21:1925:21:1929 | self |
 | UseUseExplosion.rb:21:1904:21:1908 | self | UseUseExplosion.rb:21:2251:21:2256 | self |
-| UseUseExplosion.rb:21:1904:21:1913 | ... > ... | UseUseExplosion.rb:21:1903:21:1914 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1904:21:1913 | ... > ... | UseUseExplosion.rb:21:1903:21:1914 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1904:21:1913 | ... > ... | UseUseExplosion.rb:21:1903:21:1914 | ( ... ) |
 | UseUseExplosion.rb:21:1912:21:1913 | 10 | UseUseExplosion.rb:21:1904:21:1913 | ... > ... |
 | UseUseExplosion.rb:21:1916:21:2244 | then ... | UseUseExplosion.rb:21:1900:21:2260 | if ... |
 | UseUseExplosion.rb:21:1921:21:2244 | if ... | UseUseExplosion.rb:21:1916:21:2244 | then ... |
@@ -2619,8 +2429,7 @@
 | UseUseExplosion.rb:21:1925:21:1929 | [post] self | UseUseExplosion.rb:21:2235:21:2240 | self |
 | UseUseExplosion.rb:21:1925:21:1929 | self | UseUseExplosion.rb:21:1945:21:1949 | self |
 | UseUseExplosion.rb:21:1925:21:1929 | self | UseUseExplosion.rb:21:2235:21:2240 | self |
-| UseUseExplosion.rb:21:1925:21:1933 | ... > ... | UseUseExplosion.rb:21:1924:21:1934 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1925:21:1933 | ... > ... | UseUseExplosion.rb:21:1924:21:1934 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1925:21:1933 | ... > ... | UseUseExplosion.rb:21:1924:21:1934 | ( ... ) |
 | UseUseExplosion.rb:21:1933:21:1933 | 9 | UseUseExplosion.rb:21:1925:21:1933 | ... > ... |
 | UseUseExplosion.rb:21:1936:21:2228 | then ... | UseUseExplosion.rb:21:1921:21:2244 | if ... |
 | UseUseExplosion.rb:21:1941:21:2228 | if ... | UseUseExplosion.rb:21:1936:21:2228 | then ... |
@@ -2629,8 +2438,7 @@
 | UseUseExplosion.rb:21:1945:21:1949 | [post] self | UseUseExplosion.rb:21:2219:21:2224 | self |
 | UseUseExplosion.rb:21:1945:21:1949 | self | UseUseExplosion.rb:21:1965:21:1969 | self |
 | UseUseExplosion.rb:21:1945:21:1949 | self | UseUseExplosion.rb:21:2219:21:2224 | self |
-| UseUseExplosion.rb:21:1945:21:1953 | ... > ... | UseUseExplosion.rb:21:1944:21:1954 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1945:21:1953 | ... > ... | UseUseExplosion.rb:21:1944:21:1954 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1945:21:1953 | ... > ... | UseUseExplosion.rb:21:1944:21:1954 | ( ... ) |
 | UseUseExplosion.rb:21:1953:21:1953 | 8 | UseUseExplosion.rb:21:1945:21:1953 | ... > ... |
 | UseUseExplosion.rb:21:1956:21:2212 | then ... | UseUseExplosion.rb:21:1941:21:2228 | if ... |
 | UseUseExplosion.rb:21:1961:21:2212 | if ... | UseUseExplosion.rb:21:1956:21:2212 | then ... |
@@ -2639,8 +2447,7 @@
 | UseUseExplosion.rb:21:1965:21:1969 | [post] self | UseUseExplosion.rb:21:2203:21:2208 | self |
 | UseUseExplosion.rb:21:1965:21:1969 | self | UseUseExplosion.rb:21:1985:21:1989 | self |
 | UseUseExplosion.rb:21:1965:21:1969 | self | UseUseExplosion.rb:21:2203:21:2208 | self |
-| UseUseExplosion.rb:21:1965:21:1973 | ... > ... | UseUseExplosion.rb:21:1964:21:1974 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1965:21:1973 | ... > ... | UseUseExplosion.rb:21:1964:21:1974 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1965:21:1973 | ... > ... | UseUseExplosion.rb:21:1964:21:1974 | ( ... ) |
 | UseUseExplosion.rb:21:1973:21:1973 | 7 | UseUseExplosion.rb:21:1965:21:1973 | ... > ... |
 | UseUseExplosion.rb:21:1976:21:2196 | then ... | UseUseExplosion.rb:21:1961:21:2212 | if ... |
 | UseUseExplosion.rb:21:1981:21:2196 | if ... | UseUseExplosion.rb:21:1976:21:2196 | then ... |
@@ -2649,8 +2456,7 @@
 | UseUseExplosion.rb:21:1985:21:1989 | [post] self | UseUseExplosion.rb:21:2187:21:2192 | self |
 | UseUseExplosion.rb:21:1985:21:1989 | self | UseUseExplosion.rb:21:2005:21:2009 | self |
 | UseUseExplosion.rb:21:1985:21:1989 | self | UseUseExplosion.rb:21:2187:21:2192 | self |
-| UseUseExplosion.rb:21:1985:21:1993 | ... > ... | UseUseExplosion.rb:21:1984:21:1994 | [false] ( ... ) |
-| UseUseExplosion.rb:21:1985:21:1993 | ... > ... | UseUseExplosion.rb:21:1984:21:1994 | [true] ( ... ) |
+| UseUseExplosion.rb:21:1985:21:1993 | ... > ... | UseUseExplosion.rb:21:1984:21:1994 | ( ... ) |
 | UseUseExplosion.rb:21:1993:21:1993 | 6 | UseUseExplosion.rb:21:1985:21:1993 | ... > ... |
 | UseUseExplosion.rb:21:1996:21:2180 | then ... | UseUseExplosion.rb:21:1981:21:2196 | if ... |
 | UseUseExplosion.rb:21:2001:21:2180 | if ... | UseUseExplosion.rb:21:1996:21:2180 | then ... |
@@ -2659,8 +2465,7 @@
 | UseUseExplosion.rb:21:2005:21:2009 | [post] self | UseUseExplosion.rb:21:2171:21:2176 | self |
 | UseUseExplosion.rb:21:2005:21:2009 | self | UseUseExplosion.rb:21:2025:21:2029 | self |
 | UseUseExplosion.rb:21:2005:21:2009 | self | UseUseExplosion.rb:21:2171:21:2176 | self |
-| UseUseExplosion.rb:21:2005:21:2013 | ... > ... | UseUseExplosion.rb:21:2004:21:2014 | [false] ( ... ) |
-| UseUseExplosion.rb:21:2005:21:2013 | ... > ... | UseUseExplosion.rb:21:2004:21:2014 | [true] ( ... ) |
+| UseUseExplosion.rb:21:2005:21:2013 | ... > ... | UseUseExplosion.rb:21:2004:21:2014 | ( ... ) |
 | UseUseExplosion.rb:21:2013:21:2013 | 5 | UseUseExplosion.rb:21:2005:21:2013 | ... > ... |
 | UseUseExplosion.rb:21:2016:21:2164 | then ... | UseUseExplosion.rb:21:2001:21:2180 | if ... |
 | UseUseExplosion.rb:21:2021:21:2164 | if ... | UseUseExplosion.rb:21:2016:21:2164 | then ... |
@@ -2669,8 +2474,7 @@
 | UseUseExplosion.rb:21:2025:21:2029 | [post] self | UseUseExplosion.rb:21:2155:21:2160 | self |
 | UseUseExplosion.rb:21:2025:21:2029 | self | UseUseExplosion.rb:21:2045:21:2049 | self |
 | UseUseExplosion.rb:21:2025:21:2029 | self | UseUseExplosion.rb:21:2155:21:2160 | self |
-| UseUseExplosion.rb:21:2025:21:2033 | ... > ... | UseUseExplosion.rb:21:2024:21:2034 | [false] ( ... ) |
-| UseUseExplosion.rb:21:2025:21:2033 | ... > ... | UseUseExplosion.rb:21:2024:21:2034 | [true] ( ... ) |
+| UseUseExplosion.rb:21:2025:21:2033 | ... > ... | UseUseExplosion.rb:21:2024:21:2034 | ( ... ) |
 | UseUseExplosion.rb:21:2033:21:2033 | 4 | UseUseExplosion.rb:21:2025:21:2033 | ... > ... |
 | UseUseExplosion.rb:21:2036:21:2148 | then ... | UseUseExplosion.rb:21:2021:21:2164 | if ... |
 | UseUseExplosion.rb:21:2041:21:2148 | if ... | UseUseExplosion.rb:21:2036:21:2148 | then ... |
@@ -2679,8 +2483,7 @@
 | UseUseExplosion.rb:21:2045:21:2049 | [post] self | UseUseExplosion.rb:21:2139:21:2144 | self |
 | UseUseExplosion.rb:21:2045:21:2049 | self | UseUseExplosion.rb:21:2065:21:2069 | self |
 | UseUseExplosion.rb:21:2045:21:2049 | self | UseUseExplosion.rb:21:2139:21:2144 | self |
-| UseUseExplosion.rb:21:2045:21:2053 | ... > ... | UseUseExplosion.rb:21:2044:21:2054 | [false] ( ... ) |
-| UseUseExplosion.rb:21:2045:21:2053 | ... > ... | UseUseExplosion.rb:21:2044:21:2054 | [true] ( ... ) |
+| UseUseExplosion.rb:21:2045:21:2053 | ... > ... | UseUseExplosion.rb:21:2044:21:2054 | ( ... ) |
 | UseUseExplosion.rb:21:2053:21:2053 | 3 | UseUseExplosion.rb:21:2045:21:2053 | ... > ... |
 | UseUseExplosion.rb:21:2056:21:2132 | then ... | UseUseExplosion.rb:21:2041:21:2148 | if ... |
 | UseUseExplosion.rb:21:2061:21:2132 | if ... | UseUseExplosion.rb:21:2056:21:2132 | then ... |
@@ -2689,16 +2492,14 @@
 | UseUseExplosion.rb:21:2065:21:2069 | [post] self | UseUseExplosion.rb:21:2123:21:2128 | self |
 | UseUseExplosion.rb:21:2065:21:2069 | self | UseUseExplosion.rb:21:2085:21:2089 | self |
 | UseUseExplosion.rb:21:2065:21:2069 | self | UseUseExplosion.rb:21:2123:21:2128 | self |
-| UseUseExplosion.rb:21:2065:21:2073 | ... > ... | UseUseExplosion.rb:21:2064:21:2074 | [false] ( ... ) |
-| UseUseExplosion.rb:21:2065:21:2073 | ... > ... | UseUseExplosion.rb:21:2064:21:2074 | [true] ( ... ) |
+| UseUseExplosion.rb:21:2065:21:2073 | ... > ... | UseUseExplosion.rb:21:2064:21:2074 | ( ... ) |
 | UseUseExplosion.rb:21:2073:21:2073 | 2 | UseUseExplosion.rb:21:2065:21:2073 | ... > ... |
 | UseUseExplosion.rb:21:2076:21:2116 | then ... | UseUseExplosion.rb:21:2061:21:2132 | if ... |
 | UseUseExplosion.rb:21:2081:21:2116 | if ... | UseUseExplosion.rb:21:2076:21:2116 | then ... |
 | UseUseExplosion.rb:21:2085:21:2089 | @prop | UseUseExplosion.rb:21:2085:21:2093 | ... > ... |
 | UseUseExplosion.rb:21:2085:21:2089 | [post] self | UseUseExplosion.rb:21:2107:21:2112 | self |
 | UseUseExplosion.rb:21:2085:21:2089 | self | UseUseExplosion.rb:21:2107:21:2112 | self |
-| UseUseExplosion.rb:21:2085:21:2093 | ... > ... | UseUseExplosion.rb:21:2084:21:2094 | [false] ( ... ) |
-| UseUseExplosion.rb:21:2085:21:2093 | ... > ... | UseUseExplosion.rb:21:2084:21:2094 | [true] ( ... ) |
+| UseUseExplosion.rb:21:2085:21:2093 | ... > ... | UseUseExplosion.rb:21:2084:21:2094 | ( ... ) |
 | UseUseExplosion.rb:21:2093:21:2093 | 1 | UseUseExplosion.rb:21:2085:21:2093 | ... > ... |
 | UseUseExplosion.rb:21:2096:21:2099 | then ... | UseUseExplosion.rb:21:2081:21:2116 | if ... |
 | UseUseExplosion.rb:21:2102:21:2112 | else ... | UseUseExplosion.rb:21:2081:21:2116 | if ... |
@@ -2951,9 +2752,9 @@
 | local_dataflow.rb:1:1:7:3 | self (foo) | local_dataflow.rb:3:8:3:10 | self |
 | local_dataflow.rb:1:1:7:3 | self in foo | local_dataflow.rb:1:1:7:3 | self (foo) |
 | local_dataflow.rb:1:1:7:3 | synthetic splat parameter | local_dataflow.rb:1:9:1:9 | a |
-| local_dataflow.rb:1:1:150:3 | <uninitialized> x | local_dataflow.rb:10:9:10:9 | x |
-| local_dataflow.rb:1:1:150:3 | self (local_dataflow.rb) | local_dataflow.rb:49:1:53:3 | self |
-| local_dataflow.rb:1:1:150:3 | self in local_dataflow.rb | local_dataflow.rb:1:1:150:3 | self (local_dataflow.rb) |
+| local_dataflow.rb:1:1:174:4 | <uninitialized> x | local_dataflow.rb:10:9:10:9 | x |
+| local_dataflow.rb:1:1:174:4 | self (local_dataflow.rb) | local_dataflow.rb:49:1:53:3 | self |
+| local_dataflow.rb:1:1:174:4 | self in local_dataflow.rb | local_dataflow.rb:1:1:174:4 | self (local_dataflow.rb) |
 | local_dataflow.rb:1:9:1:9 | a | local_dataflow.rb:1:9:1:9 | a |
 | local_dataflow.rb:1:9:1:9 | a | local_dataflow.rb:2:7:2:7 | a |
 | local_dataflow.rb:2:3:2:3 | b | local_dataflow.rb:3:13:3:13 | b |
@@ -2972,6 +2773,7 @@
 | local_dataflow.rb:5:8:5:12 | ... = ... | local_dataflow.rb:5:7:5:13 | ( ... ) |
 | local_dataflow.rb:5:12:5:12 | a | local_dataflow.rb:5:8:5:12 | ... = ... |
 | local_dataflow.rb:5:12:5:12 | a | local_dataflow.rb:6:8:6:8 | a |
+| local_dataflow.rb:6:3:6:14 | ... = ... | local_dataflow.rb:2:3:6:14 | ... |
 | local_dataflow.rb:6:7:6:14 | ( ... ) | local_dataflow.rb:6:3:6:14 | ... = ... |
 | local_dataflow.rb:6:8:6:8 | a | local_dataflow.rb:6:10:6:11 | ... + ... |
 | local_dataflow.rb:6:8:6:13 | ... = ... | local_dataflow.rb:6:7:6:14 | ( ... ) |
@@ -2994,8 +2796,7 @@
 | local_dataflow.rb:10:9:10:9 | ... = ... | local_dataflow.rb:10:9:10:9 | if ... |
 | local_dataflow.rb:10:9:10:9 | [input] phi | local_dataflow.rb:10:9:10:9 | phi |
 | local_dataflow.rb:10:9:10:9 | [post] x | local_dataflow.rb:10:9:10:9 | [input] phi |
-| local_dataflow.rb:10:9:10:9 | defined? ... | local_dataflow.rb:10:9:10:9 | [false] ! ... |
-| local_dataflow.rb:10:9:10:9 | defined? ... | local_dataflow.rb:10:9:10:9 | [true] ! ... |
+| local_dataflow.rb:10:9:10:9 | defined? ... | local_dataflow.rb:10:9:10:9 | ! ... |
 | local_dataflow.rb:10:9:10:9 | nil | local_dataflow.rb:10:9:10:9 | ... = ... |
 | local_dataflow.rb:10:9:10:9 | nil | local_dataflow.rb:10:9:10:9 | x |
 | local_dataflow.rb:10:9:10:9 | x | local_dataflow.rb:10:9:10:9 | [input] phi |
@@ -3006,6 +2807,7 @@
 | local_dataflow.rb:10:14:10:18 | array | local_dataflow.rb:15:10:15:14 | array |
 | local_dataflow.rb:11:1:11:2 | [post] self | local_dataflow.rb:12:3:12:5 | self |
 | local_dataflow.rb:11:1:11:2 | self | local_dataflow.rb:12:3:12:5 | self |
+| local_dataflow.rb:12:3:12:5 | call to p | local_dataflow.rb:10:5:13:3 | ... |
 | local_dataflow.rb:15:1:17:3 | <captured exit> x | local_dataflow.rb:19:5:19:5 | x |
 | local_dataflow.rb:15:1:17:3 | __synth__0__1 | local_dataflow.rb:15:1:17:3 | ... = ... |
 | local_dataflow.rb:15:1:17:3 | __synth__0__1 | local_dataflow.rb:15:1:17:3 | __synth__0__1 |
@@ -3016,8 +2818,7 @@
 | local_dataflow.rb:15:5:15:5 | ... = ... | local_dataflow.rb:15:5:15:5 | if ... |
 | local_dataflow.rb:15:5:15:5 | [input] phi | local_dataflow.rb:15:5:15:5 | phi |
 | local_dataflow.rb:15:5:15:5 | [post] x | local_dataflow.rb:15:5:15:5 | [input] phi |
-| local_dataflow.rb:15:5:15:5 | defined? ... | local_dataflow.rb:15:5:15:5 | [false] ! ... |
-| local_dataflow.rb:15:5:15:5 | defined? ... | local_dataflow.rb:15:5:15:5 | [true] ! ... |
+| local_dataflow.rb:15:5:15:5 | defined? ... | local_dataflow.rb:15:5:15:5 | ! ... |
 | local_dataflow.rb:15:5:15:5 | nil | local_dataflow.rb:15:5:15:5 | ... = ... |
 | local_dataflow.rb:15:5:15:5 | nil | local_dataflow.rb:15:5:15:5 | x |
 | local_dataflow.rb:15:5:15:5 | x | local_dataflow.rb:15:5:15:5 | [input] phi |
@@ -3035,16 +2836,17 @@
 | local_dataflow.rb:19:5:19:5 | ... = ... | local_dataflow.rb:19:5:19:5 | if ... |
 | local_dataflow.rb:19:5:19:5 | [input] phi | local_dataflow.rb:19:5:19:5 | phi |
 | local_dataflow.rb:19:5:19:5 | [post] x | local_dataflow.rb:19:5:19:5 | [input] phi |
-| local_dataflow.rb:19:5:19:5 | defined? ... | local_dataflow.rb:19:5:19:5 | [false] ! ... |
-| local_dataflow.rb:19:5:19:5 | defined? ... | local_dataflow.rb:19:5:19:5 | [true] ! ... |
+| local_dataflow.rb:19:5:19:5 | defined? ... | local_dataflow.rb:19:5:19:5 | ! ... |
 | local_dataflow.rb:19:5:19:5 | nil | local_dataflow.rb:19:5:19:5 | ... = ... |
 | local_dataflow.rb:19:5:19:5 | nil | local_dataflow.rb:19:5:19:5 | x |
 | local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:19:5:19:5 | [input] phi |
 | local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:19:5:19:5 | defined? ... |
 | local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:19:5:19:5 | phi |
 | local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:20:6:20:6 | x |
+| local_dataflow.rb:20:3:20:25 | if ... | local_dataflow.rb:19:1:21:3 | ... |
 | local_dataflow.rb:20:6:20:6 | x | local_dataflow.rb:20:6:20:10 | ... > ... |
 | local_dataflow.rb:20:10:20:10 | 1 | local_dataflow.rb:20:6:20:10 | ... > ... |
+| local_dataflow.rb:20:12:20:21 | then ... | local_dataflow.rb:20:3:20:25 | if ... |
 | local_dataflow.rb:24:2:24:8 | break | local_dataflow.rb:23:1:25:3 | while ... |
 | local_dataflow.rb:24:8:24:8 | 5 | local_dataflow.rb:24:2:24:8 | break |
 | local_dataflow.rb:28:5:28:26 | M | local_dataflow.rb:28:1:28:26 | ... = ... |
@@ -3053,17 +2855,21 @@
 | local_dataflow.rb:30:14:30:20 | "class" | local_dataflow.rb:30:5:30:24 | C |
 | local_dataflow.rb:32:5:32:25 | bar | local_dataflow.rb:32:1:32:1 | x |
 | local_dataflow.rb:32:5:32:25 | bar | local_dataflow.rb:32:1:32:25 | ... = ... |
+| local_dataflow.rb:32:14:32:21 | "method" | local_dataflow.rb:32:14:32:21 | ... |
 | local_dataflow.rb:34:1:39:3 | synthetic splat parameter | local_dataflow.rb:34:7:34:7 | x |
 | local_dataflow.rb:34:7:34:7 | x | local_dataflow.rb:34:7:34:7 | x |
 | local_dataflow.rb:34:7:34:7 | x | local_dataflow.rb:35:6:35:6 | x |
 | local_dataflow.rb:35:6:35:6 | x | local_dataflow.rb:35:6:35:11 | ... == ... |
 | local_dataflow.rb:35:11:35:11 | 4 | local_dataflow.rb:35:6:35:11 | ... == ... |
+| local_dataflow.rb:35:12:36:13 | then ... | local_dataflow.rb:35:3:37:5 | if ... |
 | local_dataflow.rb:36:13:36:13 | 7 | local_dataflow.rb:36:6:36:13 | return |
+| local_dataflow.rb:38:3:38:13 | "reachable" | local_dataflow.rb:35:3:38:13 | ... |
 | local_dataflow.rb:41:1:47:3 | synthetic splat parameter | local_dataflow.rb:41:7:41:7 | x |
 | local_dataflow.rb:41:7:41:7 | x | local_dataflow.rb:41:7:41:7 | x |
 | local_dataflow.rb:41:7:41:7 | x | local_dataflow.rb:42:6:42:6 | x |
 | local_dataflow.rb:42:6:42:6 | x | local_dataflow.rb:42:6:42:11 | ... == ... |
 | local_dataflow.rb:42:11:42:11 | 4 | local_dataflow.rb:42:6:42:11 | ... == ... |
+| local_dataflow.rb:42:12:43:13 | then ... | local_dataflow.rb:42:3:44:5 | if ... |
 | local_dataflow.rb:43:13:43:13 | 7 | local_dataflow.rb:43:6:43:13 | return |
 | local_dataflow.rb:45:10:45:10 | 6 | local_dataflow.rb:45:3:45:10 | return |
 | local_dataflow.rb:49:1:53:3 | [post] self | local_dataflow.rb:55:1:55:14 | self |
@@ -3077,6 +2883,7 @@
 | local_dataflow.rb:51:9:51:15 | "break" | local_dataflow.rb:51:3:51:15 | break |
 | local_dataflow.rb:51:20:51:20 | x | local_dataflow.rb:51:20:51:24 | ... < ... |
 | local_dataflow.rb:51:24:51:24 | 9 | local_dataflow.rb:51:20:51:24 | ... < ... |
+| local_dataflow.rb:52:3:52:10 | "normal" | local_dataflow.rb:50:3:52:10 | ... |
 | local_dataflow.rb:55:5:55:13 | Array | local_dataflow.rb:55:5:55:13 | call to [] |
 | local_dataflow.rb:55:5:55:13 | synthetic splat argument | local_dataflow.rb:55:5:55:13 | call to [] |
 | local_dataflow.rb:57:1:58:3 | synthetic splat parameter | local_dataflow.rb:57:9:57:9 | x |
@@ -3122,6 +2929,7 @@
 | local_dataflow.rb:78:12:78:20 | [post] self | local_dataflow.rb:82:7:82:13 | self |
 | local_dataflow.rb:78:12:78:20 | [post] self | local_dataflow.rb:85:22:85:28 | self |
 | local_dataflow.rb:78:12:78:20 | [post] self | local_dataflow.rb:86:28:86:34 | self |
+| local_dataflow.rb:78:12:78:20 | [post] self | local_dataflow.rb:87:5:87:48 | [input] SSA phi read(self) |
 | local_dataflow.rb:78:12:78:20 | [post] self | local_dataflow.rb:87:20:87:26 | self |
 | local_dataflow.rb:78:12:78:20 | call to source | local_dataflow.rb:79:13:79:13 | b |
 | local_dataflow.rb:78:12:78:20 | call to source | local_dataflow.rb:80:8:80:8 | a |
@@ -3136,6 +2944,7 @@
 | local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:82:7:82:13 | self |
 | local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:85:22:85:28 | self |
 | local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:86:28:86:34 | self |
+| local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:87:5:87:48 | [input] SSA phi read(self) |
 | local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:87:20:87:26 | self |
 | local_dataflow.rb:79:13:79:13 | b | local_dataflow.rb:79:25:79:25 | b |
 | local_dataflow.rb:79:15:79:45 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
@@ -3174,6 +2983,7 @@
 | local_dataflow.rb:86:28:86:34 | [post] self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:86:28:86:34 | call to sink | local_dataflow.rb:86:23:86:53 | then ... |
 | local_dataflow.rb:86:28:86:34 | self | local_dataflow.rb:89:3:89:9 | self |
+| local_dataflow.rb:87:5:87:48 | [input] SSA phi read(self) | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:87:10:87:10 | x | local_dataflow.rb:87:25:87:25 | x |
 | local_dataflow.rb:87:15:87:48 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
 | local_dataflow.rb:87:20:87:26 | [post] self | local_dataflow.rb:89:3:89:9 | self |
@@ -3181,6 +2991,7 @@
 | local_dataflow.rb:87:25:87:25 | [post] x | local_dataflow.rb:87:29:87:29 | x |
 | local_dataflow.rb:87:25:87:25 | x | local_dataflow.rb:87:29:87:29 | x |
 | local_dataflow.rb:87:29:87:29 | x | local_dataflow.rb:87:15:87:48 | then ... |
+| local_dataflow.rb:89:3:89:9 | call to sink | local_dataflow.rb:61:3:89:28 | ... |
 | local_dataflow.rb:92:1:109:3 | self (and_or) | local_dataflow.rb:93:7:93:15 | self |
 | local_dataflow.rb:92:1:109:3 | self in and_or | local_dataflow.rb:92:1:109:3 | self (and_or) |
 | local_dataflow.rb:93:3:93:3 | a | local_dataflow.rb:94:8:94:8 | a |
@@ -3270,6 +3081,7 @@
 | local_dataflow.rb:107:9:107:17 | [post] self | local_dataflow.rb:108:3:108:9 | self |
 | local_dataflow.rb:107:9:107:17 | call to source | local_dataflow.rb:107:5:107:7 | ... && ... |
 | local_dataflow.rb:107:9:107:17 | self | local_dataflow.rb:108:3:108:9 | self |
+| local_dataflow.rb:108:3:108:9 | call to sink | local_dataflow.rb:93:3:108:28 | ... |
 | local_dataflow.rb:111:1:114:3 | self (object_dup) | local_dataflow.rb:112:3:112:21 | self |
 | local_dataflow.rb:111:1:114:3 | self in object_dup | local_dataflow.rb:111:1:114:3 | self (object_dup) |
 | local_dataflow.rb:112:3:112:21 | [post] self | local_dataflow.rb:112:8:112:16 | self |
@@ -3278,6 +3090,7 @@
 | local_dataflow.rb:112:8:112:16 | call to source | local_dataflow.rb:112:8:112:20 | call to dup |
 | local_dataflow.rb:112:8:112:16 | self | local_dataflow.rb:113:3:113:25 | self |
 | local_dataflow.rb:113:3:113:25 | [post] self | local_dataflow.rb:113:8:113:16 | self |
+| local_dataflow.rb:113:3:113:25 | call to sink | local_dataflow.rb:112:3:113:44 | ... |
 | local_dataflow.rb:113:3:113:25 | self | local_dataflow.rb:113:8:113:16 | self |
 | local_dataflow.rb:113:8:113:16 | call to source | local_dataflow.rb:113:8:113:20 | call to dup |
 | local_dataflow.rb:113:8:113:20 | call to dup | local_dataflow.rb:113:8:113:24 | call to dup |
@@ -3295,27 +3108,33 @@
 | local_dataflow.rb:118:17:118:31 | synthetic splat parameter | local_dataflow.rb:118:20:118:20 | x |
 | local_dataflow.rb:118:20:118:20 | x | local_dataflow.rb:118:20:118:20 | x |
 | local_dataflow.rb:118:20:118:20 | x | local_dataflow.rb:118:28:118:28 | x |
+| local_dataflow.rb:118:23:118:29 | call to sink | local_dataflow.rb:118:23:118:29 | ... |
 | local_dataflow.rb:119:3:119:31 | [post] self | local_dataflow.rb:119:8:119:16 | self |
+| local_dataflow.rb:119:3:119:31 | call to sink | local_dataflow.rb:117:3:119:50 | ... |
 | local_dataflow.rb:119:3:119:31 | self | local_dataflow.rb:119:8:119:16 | self |
 | local_dataflow.rb:119:8:119:16 | call to source | local_dataflow.rb:119:8:119:23 | call to tap |
 | local_dataflow.rb:119:8:119:23 | call to tap | local_dataflow.rb:119:8:119:30 | call to tap |
 | local_dataflow.rb:122:1:124:3 | self (dup_tap) | local_dataflow.rb:123:3:123:50 | self |
 | local_dataflow.rb:122:1:124:3 | self in dup_tap | local_dataflow.rb:122:1:124:3 | self (dup_tap) |
 | local_dataflow.rb:123:3:123:50 | [post] self | local_dataflow.rb:123:8:123:16 | self |
+| local_dataflow.rb:123:3:123:50 | call to sink | local_dataflow.rb:123:3:123:70 | ... |
 | local_dataflow.rb:123:3:123:50 | self | local_dataflow.rb:123:8:123:16 | self |
 | local_dataflow.rb:123:8:123:16 | call to source | local_dataflow.rb:123:8:123:20 | call to dup |
 | local_dataflow.rb:123:8:123:20 | call to dup | local_dataflow.rb:123:8:123:45 | call to tap |
 | local_dataflow.rb:123:8:123:45 | call to tap | local_dataflow.rb:123:8:123:49 | call to dup |
 | local_dataflow.rb:123:26:123:45 | <captured entry> self | local_dataflow.rb:123:32:123:43 | self |
 | local_dataflow.rb:123:26:123:45 | synthetic splat parameter | local_dataflow.rb:123:29:123:29 | x |
+| local_dataflow.rb:123:32:123:43 | call to puts | local_dataflow.rb:123:32:123:43 | ... |
 | local_dataflow.rb:126:1:128:3 | self (use) | local_dataflow.rb:127:3:127:8 | self |
 | local_dataflow.rb:126:1:128:3 | self in use | local_dataflow.rb:126:1:128:3 | self (use) |
 | local_dataflow.rb:126:1:128:3 | synthetic splat parameter | local_dataflow.rb:126:9:126:9 | x |
+| local_dataflow.rb:127:3:127:8 | call to rand | local_dataflow.rb:127:3:127:8 | ... |
 | local_dataflow.rb:130:1:150:3 | self (use_use_madness) | local_dataflow.rb:132:6:132:11 | self |
 | local_dataflow.rb:130:1:150:3 | self in use_use_madness | local_dataflow.rb:130:1:150:3 | self (use_use_madness) |
 | local_dataflow.rb:131:3:131:3 | x | local_dataflow.rb:132:10:132:10 | x |
 | local_dataflow.rb:131:7:131:8 | "" | local_dataflow.rb:131:3:131:3 | x |
 | local_dataflow.rb:131:7:131:8 | "" | local_dataflow.rb:131:3:131:8 | ... = ... |
+| local_dataflow.rb:132:3:149:5 | if ... | local_dataflow.rb:131:3:149:5 | ... |
 | local_dataflow.rb:132:6:132:11 | [post] self | local_dataflow.rb:133:8:133:13 | self |
 | local_dataflow.rb:132:6:132:11 | self | local_dataflow.rb:133:8:133:13 | self |
 | local_dataflow.rb:132:10:132:10 | [post] x | local_dataflow.rb:133:12:133:12 | x |
@@ -3325,8 +3144,7 @@
 | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(x) | local_dataflow.rb:134:11:134:11 | x |
 | local_dataflow.rb:133:8:133:13 | [post] self | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:8:133:13 | [post] self | local_dataflow.rb:133:18:133:23 | self |
-| local_dataflow.rb:133:8:133:13 | call to use | local_dataflow.rb:133:8:133:23 | [false] ... \|\| ... |
-| local_dataflow.rb:133:8:133:13 | call to use | local_dataflow.rb:133:8:133:23 | [true] ... \|\| ... |
+| local_dataflow.rb:133:8:133:13 | call to use | local_dataflow.rb:133:8:133:23 | ... \|\| ... |
 | local_dataflow.rb:133:8:133:13 | self | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:8:133:13 | self | local_dataflow.rb:133:18:133:23 | self |
 | local_dataflow.rb:133:12:133:12 | [post] x | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(x) |
@@ -3337,8 +3155,7 @@
 | local_dataflow.rb:133:18:133:23 | [input] SSA phi read(x) | local_dataflow.rb:134:11:134:11 | x |
 | local_dataflow.rb:133:18:133:23 | [post] self | local_dataflow.rb:133:18:133:23 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:18:133:23 | [post] self | local_dataflow.rb:136:7:136:12 | self |
-| local_dataflow.rb:133:18:133:23 | call to use | local_dataflow.rb:133:8:133:23 | [false] ... \|\| ... |
-| local_dataflow.rb:133:18:133:23 | call to use | local_dataflow.rb:133:8:133:23 | [true] ... \|\| ... |
+| local_dataflow.rb:133:18:133:23 | call to use | local_dataflow.rb:133:8:133:23 | ... \|\| ... |
 | local_dataflow.rb:133:18:133:23 | self | local_dataflow.rb:133:18:133:23 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:18:133:23 | self | local_dataflow.rb:136:7:136:12 | self |
 | local_dataflow.rb:133:22:133:22 | [post] x | local_dataflow.rb:133:18:133:23 | [input] SSA phi read(x) |
@@ -3357,83 +3174,69 @@
 | local_dataflow.rb:136:11:136:11 | [post] x | local_dataflow.rb:137:14:137:14 | x |
 | local_dataflow.rb:136:11:136:11 | x | local_dataflow.rb:137:14:137:14 | x |
 | local_dataflow.rb:137:7:138:9 | if ... | local_dataflow.rb:135:5:138:9 | else ... |
-| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
-| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
+| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
+| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
 | local_dataflow.rb:137:10:137:15 | [post] self | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:10:137:15 | [post] self | local_dataflow.rb:137:21:137:26 | self |
 | local_dataflow.rb:137:10:137:15 | self | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:10:137:15 | self | local_dataflow.rb:137:21:137:26 | self |
 | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
-| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
-| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
 | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
 | local_dataflow.rb:137:14:137:14 | [post] x | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:14:137:14 | [post] x | local_dataflow.rb:137:25:137:25 | x |
 | local_dataflow.rb:137:14:137:14 | x | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:14:137:14 | x | local_dataflow.rb:137:25:137:25 | x |
-| local_dataflow.rb:137:20:137:26 | [false] ! ... | local_dataflow.rb:137:10:137:26 | [false] ... && ... |
-| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(self) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
-| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
-| local_dataflow.rb:137:20:137:26 | [true] ! ... | local_dataflow.rb:137:10:137:26 | [true] ... && ... |
+| local_dataflow.rb:137:20:137:26 | ! ... | local_dataflow.rb:137:10:137:26 | ... && ... |
+| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
+| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
 | local_dataflow.rb:137:21:137:26 | [post] self | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:21:137:26 | [post] self | local_dataflow.rb:137:20:137:26 | [input] SSA phi read(self) |
-| local_dataflow.rb:137:21:137:26 | call to use | local_dataflow.rb:137:20:137:26 | [false] ! ... |
-| local_dataflow.rb:137:21:137:26 | call to use | local_dataflow.rb:137:20:137:26 | [true] ! ... |
+| local_dataflow.rb:137:21:137:26 | call to use | local_dataflow.rb:137:20:137:26 | ! ... |
 | local_dataflow.rb:137:21:137:26 | self | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:21:137:26 | self | local_dataflow.rb:137:20:137:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:25:137:25 | [post] x | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:25:137:25 | [post] x | local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:25:137:25 | x | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:25:137:25 | x | local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) |
-| local_dataflow.rb:141:8:141:14 | [false] ! ... | local_dataflow.rb:141:8:141:37 | [false] ... \|\| ... |
-| local_dataflow.rb:141:8:141:14 | [false] ! ... | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... |
-| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) |
-| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(x) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) |
-| local_dataflow.rb:141:8:141:14 | [true] ! ... | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... |
+| local_dataflow.rb:141:8:141:14 | ! ... | local_dataflow.rb:141:8:141:37 | ... \|\| ... |
+| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
+| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(x) | local_dataflow.rb:147:9:147:9 | x |
 | local_dataflow.rb:141:9:141:14 | [post] self | local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:9:141:14 | [post] self | local_dataflow.rb:141:20:141:25 | self |
-| local_dataflow.rb:141:9:141:14 | call to use | local_dataflow.rb:141:8:141:14 | [false] ! ... |
-| local_dataflow.rb:141:9:141:14 | call to use | local_dataflow.rb:141:8:141:14 | [true] ! ... |
+| local_dataflow.rb:141:9:141:14 | call to use | local_dataflow.rb:141:8:141:14 | ! ... |
 | local_dataflow.rb:141:9:141:14 | self | local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:9:141:14 | self | local_dataflow.rb:141:20:141:25 | self |
 | local_dataflow.rb:141:13:141:13 | [post] x | local_dataflow.rb:141:8:141:14 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:13:141:13 | [post] x | local_dataflow.rb:141:24:141:24 | x |
 | local_dataflow.rb:141:13:141:13 | x | local_dataflow.rb:141:8:141:14 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:13:141:13 | x | local_dataflow.rb:141:24:141:24 | x |
-| local_dataflow.rb:141:19:141:37 | [false] ( ... ) | local_dataflow.rb:141:8:141:37 | [false] ... \|\| ... |
-| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) |
-| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(x) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) |
-| local_dataflow.rb:141:19:141:37 | [post] [false] ( ... ) | local_dataflow.rb:141:20:141:36 | [post] [false] ... && ... |
-| local_dataflow.rb:141:19:141:37 | [post] [true] ( ... ) | local_dataflow.rb:141:20:141:36 | [post] [true] ... && ... |
-| local_dataflow.rb:141:19:141:37 | [true] ( ... ) | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... |
+| local_dataflow.rb:141:19:141:37 | ( ... ) | local_dataflow.rb:141:8:141:37 | ... \|\| ... |
+| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
+| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(x) | local_dataflow.rb:147:9:147:9 | x |
+| local_dataflow.rb:141:19:141:37 | [post] ( ... ) | local_dataflow.rb:141:20:141:36 | [post] ... && ... |
 | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) | local_dataflow.rb:143:11:143:16 | self |
 | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) | local_dataflow.rb:143:15:143:15 | x |
 | local_dataflow.rb:141:20:141:25 | [post] self | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:20:141:25 | [post] self | local_dataflow.rb:141:31:141:36 | self |
 | local_dataflow.rb:141:20:141:25 | self | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:20:141:25 | self | local_dataflow.rb:141:31:141:36 | self |
-| local_dataflow.rb:141:20:141:36 | [false] ... && ... | local_dataflow.rb:141:19:141:37 | [false] ( ... ) |
-| local_dataflow.rb:141:20:141:36 | [true] ... && ... | local_dataflow.rb:141:19:141:37 | [true] ( ... ) |
+| local_dataflow.rb:141:20:141:36 | ... && ... | local_dataflow.rb:141:19:141:37 | ( ... ) |
 | local_dataflow.rb:141:24:141:24 | [post] x | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:24:141:24 | [post] x | local_dataflow.rb:141:35:141:35 | x |
 | local_dataflow.rb:141:24:141:24 | x | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:24:141:24 | x | local_dataflow.rb:141:35:141:35 | x |
-| local_dataflow.rb:141:30:141:36 | [false] ! ... | local_dataflow.rb:141:20:141:36 | [false] ... && ... |
+| local_dataflow.rb:141:30:141:36 | ! ... | local_dataflow.rb:141:20:141:36 | ... && ... |
 | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(self) | local_dataflow.rb:143:11:143:16 | self |
 | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) | local_dataflow.rb:143:15:143:15 | x |
-| local_dataflow.rb:141:30:141:36 | [true] ! ... | local_dataflow.rb:141:20:141:36 | [true] ... && ... |
 | local_dataflow.rb:141:31:141:36 | [post] self | local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:31:141:36 | [post] self | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(self) |
-| local_dataflow.rb:141:31:141:36 | call to use | local_dataflow.rb:141:30:141:36 | [false] ! ... |
-| local_dataflow.rb:141:31:141:36 | call to use | local_dataflow.rb:141:30:141:36 | [true] ! ... |
+| local_dataflow.rb:141:31:141:36 | call to use | local_dataflow.rb:141:30:141:36 | ! ... |
 | local_dataflow.rb:141:31:141:36 | self | local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:31:141:36 | self | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:35:141:35 | [post] x | local_dataflow.rb:141:19:141:37 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:35:141:35 | [post] x | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:35:141:35 | x | local_dataflow.rb:141:19:141:37 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:35:141:35 | x | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) |
-| local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
-| local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) | local_dataflow.rb:147:9:147:9 | x |
 | local_dataflow.rb:141:38:142:9 | then ... | local_dataflow.rb:141:5:145:7 | if ... |
 | local_dataflow.rb:142:7:142:9 | nil | local_dataflow.rb:141:38:142:9 | then ... |
 | local_dataflow.rb:143:5:144:16 | elsif ... | local_dataflow.rb:141:5:145:7 | if ... |
@@ -3441,8 +3244,7 @@
 | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(x) | local_dataflow.rb:144:15:144:15 | x |
 | local_dataflow.rb:143:11:143:16 | [post] self | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:11:143:16 | [post] self | local_dataflow.rb:143:21:143:26 | self |
-| local_dataflow.rb:143:11:143:16 | call to use | local_dataflow.rb:143:11:143:26 | [false] ... \|\| ... |
-| local_dataflow.rb:143:11:143:16 | call to use | local_dataflow.rb:143:11:143:26 | [true] ... \|\| ... |
+| local_dataflow.rb:143:11:143:16 | call to use | local_dataflow.rb:143:11:143:26 | ... \|\| ... |
 | local_dataflow.rb:143:11:143:16 | self | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:11:143:16 | self | local_dataflow.rb:143:21:143:26 | self |
 | local_dataflow.rb:143:11:143:26 | [input] SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
@@ -3455,8 +3257,7 @@
 | local_dataflow.rb:143:21:143:26 | [input] SSA phi read(x) | local_dataflow.rb:144:15:144:15 | x |
 | local_dataflow.rb:143:21:143:26 | [post] self | local_dataflow.rb:143:11:143:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:21:143:26 | [post] self | local_dataflow.rb:143:21:143:26 | [input] SSA phi read(self) |
-| local_dataflow.rb:143:21:143:26 | call to use | local_dataflow.rb:143:11:143:26 | [false] ... \|\| ... |
-| local_dataflow.rb:143:21:143:26 | call to use | local_dataflow.rb:143:11:143:26 | [true] ... \|\| ... |
+| local_dataflow.rb:143:21:143:26 | call to use | local_dataflow.rb:143:11:143:26 | ... \|\| ... |
 | local_dataflow.rb:143:21:143:26 | self | local_dataflow.rb:143:11:143:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:21:143:26 | self | local_dataflow.rb:143:21:143:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:25:143:25 | [post] x | local_dataflow.rb:143:11:143:26 | [input] SSA phi read(x) |
@@ -3474,3 +3275,50 @@
 | local_dataflow.rb:147:9:147:9 | [post] x | local_dataflow.rb:148:9:148:9 | x |
 | local_dataflow.rb:147:9:147:9 | x | local_dataflow.rb:148:9:148:9 | x |
 | local_dataflow.rb:148:5:148:10 | call to use | local_dataflow.rb:132:12:148:10 | then ... |
+| local_dataflow.rb:152:1:174:3 | self (begin_expr) | local_dataflow.rb:154:9:154:21 | self |
+| local_dataflow.rb:152:1:174:3 | self (begin_expr) | local_dataflow.rb:155:9:155:17 | self |
+| local_dataflow.rb:152:1:174:3 | self in begin_expr | local_dataflow.rb:152:1:174:3 | self (begin_expr) |
+| local_dataflow.rb:152:1:174:3 | synthetic splat parameter | local_dataflow.rb:152:16:152:16 | r |
+| local_dataflow.rb:152:16:152:16 | r | local_dataflow.rb:152:16:152:16 | r |
+| local_dataflow.rb:152:16:152:16 | r | local_dataflow.rb:154:26:154:26 | r |
+| local_dataflow.rb:153:3:153:3 | x | local_dataflow.rb:161:8:161:8 | x |
+| local_dataflow.rb:153:7:160:9 | begin ...  | local_dataflow.rb:153:3:153:3 | x |
+| local_dataflow.rb:153:7:160:9 | begin ...  | local_dataflow.rb:153:3:160:9 | ... = ... |
+| local_dataflow.rb:154:9:154:21 | [post] self | local_dataflow.rb:157:9:157:17 | self |
+| local_dataflow.rb:154:9:154:21 | call to raise | local_dataflow.rb:154:9:154:26 | ... if ... |
+| local_dataflow.rb:154:9:154:21 | self | local_dataflow.rb:157:9:157:17 | self |
+| local_dataflow.rb:154:26:154:26 | r | local_dataflow.rb:164:26:164:26 | r |
+| local_dataflow.rb:155:9:155:17 | [post] self | local_dataflow.rb:157:9:157:17 | self |
+| local_dataflow.rb:155:9:155:17 | [post] self | local_dataflow.rb:159:9:159:17 | self |
+| local_dataflow.rb:155:9:155:17 | self | local_dataflow.rb:157:9:157:17 | self |
+| local_dataflow.rb:155:9:155:17 | self | local_dataflow.rb:159:9:159:17 | self |
+| local_dataflow.rb:157:9:157:17 | [post] self | local_dataflow.rb:159:9:159:17 | self |
+| local_dataflow.rb:157:9:157:17 | call to source | local_dataflow.rb:156:13:157:17 | then ... |
+| local_dataflow.rb:157:9:157:17 | self | local_dataflow.rb:159:9:159:17 | self |
+| local_dataflow.rb:159:9:159:17 | [post] self | local_dataflow.rb:161:3:161:9 | self |
+| local_dataflow.rb:159:9:159:17 | call to source | local_dataflow.rb:158:7:159:17 | ensure ... |
+| local_dataflow.rb:159:9:159:17 | self | local_dataflow.rb:161:3:161:9 | self |
+| local_dataflow.rb:161:3:161:9 | [post] self | local_dataflow.rb:164:9:164:21 | self |
+| local_dataflow.rb:161:3:161:9 | [post] self | local_dataflow.rb:165:9:165:17 | self |
+| local_dataflow.rb:161:3:161:9 | self | local_dataflow.rb:164:9:164:21 | self |
+| local_dataflow.rb:161:3:161:9 | self | local_dataflow.rb:165:9:165:17 | self |
+| local_dataflow.rb:163:3:163:3 | y | local_dataflow.rb:173:8:173:8 | y |
+| local_dataflow.rb:163:7:172:9 | begin ...  | local_dataflow.rb:163:3:163:3 | y |
+| local_dataflow.rb:163:7:172:9 | begin ...  | local_dataflow.rb:163:3:172:9 | ... = ... |
+| local_dataflow.rb:164:9:164:21 | [post] self | local_dataflow.rb:167:9:167:17 | self |
+| local_dataflow.rb:164:9:164:21 | call to raise | local_dataflow.rb:164:9:164:26 | ... if ... |
+| local_dataflow.rb:164:9:164:21 | self | local_dataflow.rb:167:9:167:17 | self |
+| local_dataflow.rb:165:9:165:17 | [post] self | local_dataflow.rb:167:9:167:17 | self |
+| local_dataflow.rb:165:9:165:17 | [post] self | local_dataflow.rb:169:9:169:17 | self |
+| local_dataflow.rb:165:9:165:17 | self | local_dataflow.rb:167:9:167:17 | self |
+| local_dataflow.rb:165:9:165:17 | self | local_dataflow.rb:169:9:169:17 | self |
+| local_dataflow.rb:167:9:167:17 | [post] self | local_dataflow.rb:171:9:171:17 | self |
+| local_dataflow.rb:167:9:167:17 | call to source | local_dataflow.rb:166:13:167:17 | then ... |
+| local_dataflow.rb:167:9:167:17 | self | local_dataflow.rb:171:9:171:17 | self |
+| local_dataflow.rb:169:9:169:17 | [post] self | local_dataflow.rb:171:9:171:17 | self |
+| local_dataflow.rb:169:9:169:17 | call to source | local_dataflow.rb:168:7:169:17 | else ... |
+| local_dataflow.rb:169:9:169:17 | self | local_dataflow.rb:171:9:171:17 | self |
+| local_dataflow.rb:171:9:171:17 | [post] self | local_dataflow.rb:173:3:173:9 | self |
+| local_dataflow.rb:171:9:171:17 | call to source | local_dataflow.rb:170:7:171:17 | ensure ... |
+| local_dataflow.rb:171:9:171:17 | self | local_dataflow.rb:173:3:173:9 | self |
+| local_dataflow.rb:173:3:173:9 | call to sink | local_dataflow.rb:153:3:173:52 | ... |
diff --git a/ruby/ql/test/library-tests/dataflow/local/local_dataflow.rb b/ruby/ql/test/library-tests/dataflow/local/local_dataflow.rb
index 6adff401655b..c58c61122d69 100644
--- a/ruby/ql/test/library-tests/dataflow/local/local_dataflow.rb
+++ b/ruby/ql/test/library-tests/dataflow/local/local_dataflow.rb
@@ -147,4 +147,28 @@ def use_use_madness
     use(x)
     use(x)
   end
-end
\ No newline at end of file
+end
+
+def begin_expr r
+  x = begin
+        raise "error" if r
+        source(1)
+      rescue
+        source(2)
+      ensure
+        source(3)
+      end
+  sink(x) # $ MISSING: hasValueFlow=1 hasValueFlow=2
+
+  y = begin
+        raise "error" if r
+        source(4)
+      rescue
+        source(5)
+      else
+        source(6)
+      ensure
+        source(7)
+      end
+  sink(y) # $ MISSING: hasValueFlow=5 hasValueFlow=6
+end
diff --git a/ruby/ql/test/library-tests/dataflow/params/TypeTracker.expected b/ruby/ql/test/library-tests/dataflow/params/TypeTracker.expected
index 80e9e84a83a1..7eae6c7cfd1e 100644
--- a/ruby/ql/test/library-tests/dataflow/params/TypeTracker.expected
+++ b/ruby/ql/test/library-tests/dataflow/params/TypeTracker.expected
@@ -3668,6 +3668,7 @@ trackEnd
 | params_flow.rb:1:11:1:11 | x | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:1:11:1:11 | x | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:1:11:1:11 | x | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:1:11:1:11 | x | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:1:11:1:11 | x | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:1:11:1:11 | x | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:1:11:1:11 | x | params_flow.rb:5:10:5:10 | x |
@@ -3869,16 +3870,20 @@ trackEnd
 | params_flow.rb:5:10:5:10 | x | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:5:10:5:10 | x | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:5:10:5:10 | x | params_flow.rb:6:10:6:10 | x |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:6:5:6:10 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:6:5:6:10 | call to puts |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:10:5:10:11 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:10:5:11:84 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:11:5:11:11 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:14:1:14:30 | call to positional |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:17:5:17:11 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:17:5:18:82 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:18:5:18:11 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:21:1:21:35 | call to keyword |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:22:1:22:35 | call to keyword |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:23:1:23:41 | call to keyword |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:26:5:26:11 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:26:5:30:22 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:27:5:27:22 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:28:5:28:22 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:29:5:29:22 | call to sink |
@@ -3890,14 +3895,17 @@ trackEnd
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:44:1:44:28 | call to positional |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:47:1:47:17 | call to positional |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:50:5:50:11 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:50:5:52:21 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:51:5:51:21 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:52:5:52:21 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:55:1:55:29 | call to posargs |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:58:1:58:25 | call to posargs |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:61:1:61:14 | call to posargs |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:65:5:65:13 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:65:5:65:33 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:67:1:67:17 | call to splatstuff |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:70:5:70:10 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:70:5:75:75 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:71:5:71:10 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:72:5:72:13 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:73:5:73:13 | call to sink |
@@ -3906,6 +3914,7 @@ trackEnd
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:78:1:78:63 | call to splatmid |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:81:1:81:37 | call to splatmid |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:84:5:84:10 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:84:5:90:39 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:85:5:85:10 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:86:5:86:10 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:87:5:87:10 | call to sink |
@@ -3915,17 +3924,20 @@ trackEnd
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:94:1:94:48 | call to pos_many |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:96:1:96:88 | call to splatmid |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:99:5:99:10 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:99:5:102:57 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:100:5:100:18 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:101:5:101:18 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:102:5:102:10 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:105:1:105:49 | call to splatmidsmall |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:106:1:106:46 | call to splatmidsmall |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:109:5:109:10 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:109:5:111:30 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:110:5:110:13 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:111:5:111:10 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:114:1:114:67 | call to splat_followed_by_keyword_param |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:118:1:118:14 | call to positional |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:121:5:121:10 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:121:5:125:39 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:122:5:122:10 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:123:5:123:10 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:124:5:124:10 | call to sink |
@@ -3933,6 +3945,7 @@ trackEnd
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:128:1:128:61 | call to destruct |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:131:1:131:46 | call to pos_many |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:134:5:134:16 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:134:5:134:36 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:137:1:137:44 | call to splatall |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:144:1:144:20 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:146:1:146:20 | call to sink |
@@ -3951,20 +3964,24 @@ trackEnd
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:191:1:191:11 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:193:1:193:11 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:201:5:201:15 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:201:5:204:15 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:202:5:202:15 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:203:5:203:15 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:204:5:204:15 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:207:1:207:14 | call to foo |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:211:9:211:15 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:211:9:217:23 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:212:9:212:21 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:213:9:213:21 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:214:9:214:21 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:215:9:215:16 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:216:9:216:25 | call to sink |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:217:9:217:23 | yield ... |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:223:9:223:13 | ... |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:223:9:223:13 | super call to m |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:227:1:229:3 | call to m |
 | params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:228:5:228:11 | call to sink |
+| params_flow.rb:6:5:6:10 | call to puts | params_flow.rb:228:5:228:31 | ... |
 | params_flow.rb:6:5:6:10 | synthetic splat argument | params_flow.rb:6:5:6:10 | synthetic splat argument |
 | params_flow.rb:9:1:12:3 | &block | params_flow.rb:9:1:12:3 | &block |
 | params_flow.rb:9:1:12:3 | positional | params_flow.rb:9:1:12:3 | positional |
@@ -3992,6 +4009,7 @@ trackEnd
 | params_flow.rb:9:20:9:21 | p2 | params_flow.rb:11:10:11:11 | p2 |
 | params_flow.rb:10:5:10:11 | call to sink | params_flow.rb:10:5:10:11 | call to sink |
 | params_flow.rb:10:5:10:11 | synthetic splat argument | params_flow.rb:10:5:10:11 | synthetic splat argument |
+| params_flow.rb:11:5:11:11 | call to sink | params_flow.rb:10:5:11:84 | ... |
 | params_flow.rb:11:5:11:11 | call to sink | params_flow.rb:11:5:11:11 | call to sink |
 | params_flow.rb:11:5:11:11 | call to sink | params_flow.rb:14:1:14:30 | call to positional |
 | params_flow.rb:11:5:11:11 | call to sink | params_flow.rb:44:1:44:28 | call to positional |
@@ -4010,6 +4028,7 @@ trackEnd
 | params_flow.rb:14:12:14:19 | synthetic splat argument | params_flow.rb:14:12:14:19 | synthetic splat argument |
 | params_flow.rb:14:18:14:18 | 1 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:14:18:14:18 | 1 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:14:18:14:18 | 1 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:14:18:14:18 | 1 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:14:18:14:18 | 1 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:14:18:14:18 | 1 | params_flow.rb:5:10:5:10 | x |
@@ -4029,6 +4048,7 @@ trackEnd
 | params_flow.rb:14:22:14:29 | synthetic splat argument | params_flow.rb:14:22:14:29 | synthetic splat argument |
 | params_flow.rb:14:28:14:28 | 2 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:14:28:14:28 | 2 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:14:28:14:28 | 2 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:14:28:14:28 | 2 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:14:28:14:28 | 2 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:14:28:14:28 | 2 | params_flow.rb:5:10:5:10 | x |
@@ -4064,6 +4084,7 @@ trackEnd
 | params_flow.rb:16:18:16:19 | p2 | params_flow.rb:18:10:18:11 | p2 |
 | params_flow.rb:17:5:17:11 | call to sink | params_flow.rb:17:5:17:11 | call to sink |
 | params_flow.rb:17:5:17:11 | synthetic splat argument | params_flow.rb:17:5:17:11 | synthetic splat argument |
+| params_flow.rb:18:5:18:11 | call to sink | params_flow.rb:17:5:18:82 | ... |
 | params_flow.rb:18:5:18:11 | call to sink | params_flow.rb:18:5:18:11 | call to sink |
 | params_flow.rb:18:5:18:11 | call to sink | params_flow.rb:21:1:21:35 | call to keyword |
 | params_flow.rb:18:5:18:11 | call to sink | params_flow.rb:22:1:22:35 | call to keyword |
@@ -4084,6 +4105,7 @@ trackEnd
 | params_flow.rb:21:13:21:20 | synthetic splat argument | params_flow.rb:21:13:21:20 | synthetic splat argument |
 | params_flow.rb:21:19:21:19 | 3 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:21:19:21:19 | 3 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:21:19:21:19 | 3 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:21:19:21:19 | 3 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:21:19:21:19 | 3 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:21:19:21:19 | 3 | params_flow.rb:5:10:5:10 | x |
@@ -4105,6 +4127,7 @@ trackEnd
 | params_flow.rb:21:27:21:34 | synthetic splat argument | params_flow.rb:21:27:21:34 | synthetic splat argument |
 | params_flow.rb:21:33:21:33 | 4 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:21:33:21:33 | 4 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:21:33:21:33 | 4 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:21:33:21:33 | 4 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:21:33:21:33 | 4 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:21:33:21:33 | 4 | params_flow.rb:5:10:5:10 | x |
@@ -4128,6 +4151,7 @@ trackEnd
 | params_flow.rb:22:13:22:20 | synthetic splat argument | params_flow.rb:22:13:22:20 | synthetic splat argument |
 | params_flow.rb:22:19:22:19 | 5 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:22:19:22:19 | 5 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:22:19:22:19 | 5 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:22:19:22:19 | 5 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:22:19:22:19 | 5 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:22:19:22:19 | 5 | params_flow.rb:5:10:5:10 | x |
@@ -4149,6 +4173,7 @@ trackEnd
 | params_flow.rb:22:27:22:34 | synthetic splat argument | params_flow.rb:22:27:22:34 | synthetic splat argument |
 | params_flow.rb:22:33:22:33 | 6 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:22:33:22:33 | 6 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:22:33:22:33 | 6 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:22:33:22:33 | 6 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:22:33:22:33 | 6 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:22:33:22:33 | 6 | params_flow.rb:5:10:5:10 | x |
@@ -4172,6 +4197,7 @@ trackEnd
 | params_flow.rb:23:16:23:23 | synthetic splat argument | params_flow.rb:23:16:23:23 | synthetic splat argument |
 | params_flow.rb:23:22:23:22 | 7 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:23:22:23:22 | 7 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:23:22:23:22 | 7 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:23:22:23:22 | 7 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:23:22:23:22 | 7 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:23:22:23:22 | 7 | params_flow.rb:5:10:5:10 | x |
@@ -4193,6 +4219,7 @@ trackEnd
 | params_flow.rb:23:33:23:40 | synthetic splat argument | params_flow.rb:23:33:23:40 | synthetic splat argument |
 | params_flow.rb:23:39:23:39 | 8 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:23:39:23:39 | 8 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:23:39:23:39 | 8 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:23:39:23:39 | 8 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:23:39:23:39 | 8 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:23:39:23:39 | 8 | params_flow.rb:5:10:5:10 | x |
@@ -4258,6 +4285,7 @@ trackEnd
 | params_flow.rb:29:11:29:21 | ...[...] | params_flow.rb:29:11:29:21 | ...[...] |
 | params_flow.rb:29:11:29:21 | synthetic splat argument | params_flow.rb:29:11:29:21 | synthetic splat argument |
 | params_flow.rb:29:18:29:20 | :p3 | params_flow.rb:29:18:29:20 | :p3 |
+| params_flow.rb:30:5:30:22 | call to sink | params_flow.rb:26:5:30:22 | ... |
 | params_flow.rb:30:5:30:22 | call to sink | params_flow.rb:30:5:30:22 | call to sink |
 | params_flow.rb:30:5:30:22 | call to sink | params_flow.rb:33:1:33:58 | call to kwargs |
 | params_flow.rb:30:5:30:22 | call to sink | params_flow.rb:35:1:35:29 | call to kwargs |
@@ -4292,6 +4320,7 @@ trackEnd
 | params_flow.rb:33:12:33:19 | synthetic splat argument | params_flow.rb:33:12:33:19 | synthetic splat argument |
 | params_flow.rb:33:18:33:18 | 9 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:33:18:33:18 | 9 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:33:18:33:18 | 9 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:33:18:33:18 | 9 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:33:18:33:18 | 9 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:33:18:33:18 | 9 | params_flow.rb:5:10:5:10 | x |
@@ -4314,6 +4343,7 @@ trackEnd
 | params_flow.rb:33:26:33:34 | synthetic splat argument | params_flow.rb:33:26:33:34 | synthetic splat argument |
 | params_flow.rb:33:32:33:33 | 10 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:33:32:33:33 | 10 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:33:32:33:33 | 10 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:33:32:33:33 | 10 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:33:32:33:33 | 10 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:33:32:33:33 | 10 | params_flow.rb:5:10:5:10 | x |
@@ -4333,6 +4363,7 @@ trackEnd
 | params_flow.rb:33:41:33:49 | synthetic splat argument | params_flow.rb:33:41:33:49 | synthetic splat argument |
 | params_flow.rb:33:47:33:48 | 11 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:33:47:33:48 | 11 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:33:47:33:48 | 11 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:33:47:33:48 | 11 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:33:47:33:48 | 11 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:33:47:33:48 | 11 | params_flow.rb:5:10:5:10 | x |
@@ -4371,6 +4402,7 @@ trackEnd
 | params_flow.rb:34:14:34:22 | synthetic splat argument | params_flow.rb:34:14:34:22 | synthetic splat argument |
 | params_flow.rb:34:20:34:21 | 12 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:34:20:34:21 | 12 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:34:20:34:21 | 12 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:34:20:34:21 | 12 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:34:20:34:21 | 12 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:34:20:34:21 | 12 | params_flow.rb:5:10:5:10 | x |
@@ -4409,6 +4441,7 @@ trackEnd
 | params_flow.rb:35:12:35:20 | synthetic splat argument | params_flow.rb:35:12:35:20 | synthetic splat argument |
 | params_flow.rb:35:18:35:19 | 13 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:35:18:35:19 | 13 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:35:18:35:19 | 13 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:35:18:35:19 | 13 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:35:18:35:19 | 13 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:35:18:35:19 | 13 | params_flow.rb:5:10:5:10 | x |
@@ -4453,6 +4486,7 @@ trackEnd
 | params_flow.rb:37:16:37:24 | synthetic splat argument | params_flow.rb:37:16:37:24 | synthetic splat argument |
 | params_flow.rb:37:22:37:23 | 14 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:37:22:37:23 | 14 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:37:22:37:23 | 14 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:37:22:37:23 | 14 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:37:22:37:23 | 14 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:37:22:37:23 | 14 | params_flow.rb:5:10:5:10 | x |
@@ -4475,6 +4509,7 @@ trackEnd
 | params_flow.rb:37:34:37:42 | synthetic splat argument | params_flow.rb:37:34:37:42 | synthetic splat argument |
 | params_flow.rb:37:40:37:41 | 15 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:37:40:37:41 | 15 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:37:40:37:41 | 15 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:37:40:37:41 | 15 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:37:40:37:41 | 15 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:37:40:37:41 | 15 | params_flow.rb:5:10:5:10 | x |
@@ -4515,6 +4550,7 @@ trackEnd
 | params_flow.rb:40:16:40:24 | synthetic splat argument | params_flow.rb:40:16:40:24 | synthetic splat argument |
 | params_flow.rb:40:22:40:23 | 16 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:40:22:40:23 | 16 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:40:22:40:23 | 16 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:40:22:40:23 | 16 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:40:22:40:23 | 16 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:40:22:40:23 | 16 | params_flow.rb:5:10:5:10 | x |
@@ -4538,6 +4574,7 @@ trackEnd
 | params_flow.rb:41:13:41:21 | synthetic splat argument | params_flow.rb:41:13:41:21 | synthetic splat argument |
 | params_flow.rb:41:19:41:20 | 17 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:41:19:41:20 | 17 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:41:19:41:20 | 17 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:41:19:41:20 | 17 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:41:19:41:20 | 17 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:41:19:41:20 | 17 | params_flow.rb:5:10:5:10 | x |
@@ -4582,6 +4619,7 @@ trackEnd
 | params_flow.rb:43:9:43:17 | synthetic splat argument | params_flow.rb:43:9:43:17 | synthetic splat argument |
 | params_flow.rb:43:15:43:16 | 17 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:43:15:43:16 | 17 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:43:15:43:16 | 17 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:43:15:43:16 | 17 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:43:15:43:16 | 17 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:43:15:43:16 | 17 | params_flow.rb:5:10:5:10 | x |
@@ -4604,6 +4642,7 @@ trackEnd
 | params_flow.rb:44:12:44:20 | synthetic splat argument | params_flow.rb:44:12:44:20 | synthetic splat argument |
 | params_flow.rb:44:18:44:19 | 16 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:44:18:44:19 | 16 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:44:18:44:19 | 16 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:44:18:44:19 | 16 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:44:18:44:19 | 16 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:44:18:44:19 | 16 | params_flow.rb:5:10:5:10 | x |
@@ -4647,6 +4686,7 @@ trackEnd
 | params_flow.rb:46:9:46:17 | synthetic splat argument | params_flow.rb:46:9:46:17 | synthetic splat argument |
 | params_flow.rb:46:15:46:16 | 18 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:46:15:46:16 | 18 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:46:15:46:16 | 18 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:46:15:46:16 | 18 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:46:15:46:16 | 18 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:46:15:46:16 | 18 | params_flow.rb:5:10:5:10 | x |
@@ -4666,6 +4706,7 @@ trackEnd
 | params_flow.rb:46:20:46:28 | synthetic splat argument | params_flow.rb:46:20:46:28 | synthetic splat argument |
 | params_flow.rb:46:26:46:27 | 19 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:46:26:46:27 | 19 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:46:26:46:27 | 19 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:46:26:46:27 | 19 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:46:26:46:27 | 19 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:46:26:46:27 | 19 | params_flow.rb:5:10:5:10 | x |
@@ -4712,6 +4753,7 @@ trackEnd
 | params_flow.rb:51:11:51:20 | ...[...] | params_flow.rb:51:11:51:20 | ...[...] |
 | params_flow.rb:51:11:51:20 | synthetic splat argument | params_flow.rb:51:11:51:20 | synthetic splat argument |
 | params_flow.rb:51:19:51:19 | 0 | params_flow.rb:51:19:51:19 | 0 |
+| params_flow.rb:52:5:52:21 | call to sink | params_flow.rb:50:5:52:21 | ... |
 | params_flow.rb:52:5:52:21 | call to sink | params_flow.rb:52:5:52:21 | call to sink |
 | params_flow.rb:52:5:52:21 | call to sink | params_flow.rb:55:1:55:29 | call to posargs |
 | params_flow.rb:52:5:52:21 | call to sink | params_flow.rb:58:1:58:25 | call to posargs |
@@ -4737,6 +4779,7 @@ trackEnd
 | params_flow.rb:55:9:55:17 | synthetic splat argument | params_flow.rb:55:9:55:17 | synthetic splat argument |
 | params_flow.rb:55:15:55:16 | 20 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:55:15:55:16 | 20 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:55:15:55:16 | 20 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:55:15:55:16 | 20 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:55:15:55:16 | 20 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:55:15:55:16 | 20 | params_flow.rb:5:10:5:10 | x |
@@ -4755,6 +4798,7 @@ trackEnd
 | params_flow.rb:55:20:55:28 | synthetic splat argument | params_flow.rb:55:20:55:28 | synthetic splat argument |
 | params_flow.rb:55:26:55:27 | 21 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:55:26:55:27 | 21 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:55:26:55:27 | 21 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:55:26:55:27 | 21 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:55:26:55:27 | 21 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:55:26:55:27 | 21 | params_flow.rb:5:10:5:10 | x |
@@ -4793,6 +4837,7 @@ trackEnd
 | params_flow.rb:57:9:57:17 | synthetic splat argument | params_flow.rb:57:9:57:17 | synthetic splat argument |
 | params_flow.rb:57:15:57:16 | 22 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:57:15:57:16 | 22 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:57:15:57:16 | 22 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:57:15:57:16 | 22 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:57:15:57:16 | 22 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:57:15:57:16 | 22 | params_flow.rb:5:10:5:10 | x |
@@ -4813,6 +4858,7 @@ trackEnd
 | params_flow.rb:58:9:58:17 | synthetic splat argument | params_flow.rb:58:9:58:17 | synthetic splat argument |
 | params_flow.rb:58:15:58:16 | 23 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:58:15:58:16 | 23 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:58:15:58:16 | 23 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:58:15:58:16 | 23 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:58:15:58:16 | 23 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:58:15:58:16 | 23 | params_flow.rb:5:10:5:10 | x |
@@ -4860,6 +4906,7 @@ trackEnd
 | params_flow.rb:60:9:60:17 | synthetic splat argument | params_flow.rb:60:9:60:17 | synthetic splat argument |
 | params_flow.rb:60:15:60:16 | 24 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:60:15:60:16 | 24 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:60:15:60:16 | 24 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:60:15:60:16 | 24 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:60:15:60:16 | 24 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:60:15:60:16 | 24 | params_flow.rb:5:10:5:10 | x |
@@ -4878,6 +4925,7 @@ trackEnd
 | params_flow.rb:60:20:60:28 | synthetic splat argument | params_flow.rb:60:20:60:28 | synthetic splat argument |
 | params_flow.rb:60:26:60:27 | 25 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:60:26:60:27 | 25 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:60:26:60:27 | 25 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:60:26:60:27 | 25 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:60:26:60:27 | 25 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:60:26:60:27 | 25 | params_flow.rb:5:10:5:10 | x |
@@ -4901,6 +4949,7 @@ trackEnd
 | params_flow.rb:63:8:63:16 | synthetic splat argument | params_flow.rb:63:8:63:16 | synthetic splat argument |
 | params_flow.rb:63:14:63:15 | 26 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:63:14:63:15 | 26 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:63:14:63:15 | 26 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:63:14:63:15 | 26 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:63:14:63:15 | 26 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:63:14:63:15 | 26 | params_flow.rb:5:10:5:10 | x |
@@ -4924,6 +4973,7 @@ trackEnd
 | params_flow.rb:64:16:64:17 | *x | params_flow.rb:65:10:65:10 | x |
 | params_flow.rb:64:17:64:17 | x | params_flow.rb:64:17:64:17 | x |
 | params_flow.rb:65:5:65:13 | call to sink | params_flow.rb:65:5:65:13 | call to sink |
+| params_flow.rb:65:5:65:13 | call to sink | params_flow.rb:65:5:65:33 | ... |
 | params_flow.rb:65:5:65:13 | call to sink | params_flow.rb:67:1:67:17 | call to splatstuff |
 | params_flow.rb:65:5:65:13 | synthetic splat argument | params_flow.rb:65:5:65:13 | synthetic splat argument |
 | params_flow.rb:65:10:65:13 | ...[...] | params_flow.rb:5:10:5:10 | x |
@@ -5006,6 +5056,7 @@ trackEnd
 | params_flow.rb:73:12:73:12 | 1 | params_flow.rb:73:12:73:12 | 1 |
 | params_flow.rb:74:5:74:10 | call to sink | params_flow.rb:74:5:74:10 | call to sink |
 | params_flow.rb:74:5:74:10 | synthetic splat argument | params_flow.rb:74:5:74:10 | synthetic splat argument |
+| params_flow.rb:75:5:75:10 | call to sink | params_flow.rb:70:5:75:75 | ... |
 | params_flow.rb:75:5:75:10 | call to sink | params_flow.rb:75:5:75:10 | call to sink |
 | params_flow.rb:75:5:75:10 | call to sink | params_flow.rb:78:1:78:63 | call to splatmid |
 | params_flow.rb:75:5:75:10 | call to sink | params_flow.rb:81:1:81:37 | call to splatmid |
@@ -5024,6 +5075,7 @@ trackEnd
 | params_flow.rb:78:10:78:18 | synthetic splat argument | params_flow.rb:78:10:78:18 | synthetic splat argument |
 | params_flow.rb:78:16:78:17 | 27 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:78:16:78:17 | 27 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:78:16:78:17 | 27 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:78:16:78:17 | 27 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:78:16:78:17 | 27 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:78:16:78:17 | 27 | params_flow.rb:5:10:5:10 | x |
@@ -5043,6 +5095,7 @@ trackEnd
 | params_flow.rb:78:21:78:29 | synthetic splat argument | params_flow.rb:78:21:78:29 | synthetic splat argument |
 | params_flow.rb:78:27:78:28 | 28 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:78:27:78:28 | 28 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:78:27:78:28 | 28 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:78:27:78:28 | 28 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:78:27:78:28 | 28 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:78:27:78:28 | 28 | params_flow.rb:5:10:5:10 | x |
@@ -5056,6 +5109,7 @@ trackEnd
 | params_flow.rb:78:32:78:40 | synthetic splat argument | params_flow.rb:78:32:78:40 | synthetic splat argument |
 | params_flow.rb:78:38:78:39 | 29 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:78:38:78:39 | 29 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:78:38:78:39 | 29 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:78:38:78:39 | 29 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:78:38:78:39 | 29 | params_flow.rb:78:32:78:40 | call to taint |
 | params_flow.rb:78:38:78:39 | 29 | params_flow.rb:78:38:78:39 | 29 |
@@ -5063,6 +5117,7 @@ trackEnd
 | params_flow.rb:78:43:78:51 | synthetic splat argument | params_flow.rb:78:43:78:51 | synthetic splat argument |
 | params_flow.rb:78:49:78:50 | 30 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:78:49:78:50 | 30 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:78:49:78:50 | 30 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:78:49:78:50 | 30 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:78:49:78:50 | 30 | params_flow.rb:78:43:78:51 | call to taint |
 | params_flow.rb:78:49:78:50 | 30 | params_flow.rb:78:49:78:50 | 30 |
@@ -5070,6 +5125,7 @@ trackEnd
 | params_flow.rb:78:54:78:62 | synthetic splat argument | params_flow.rb:78:54:78:62 | synthetic splat argument |
 | params_flow.rb:78:60:78:61 | 31 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:78:60:78:61 | 31 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:78:60:78:61 | 31 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:78:60:78:61 | 31 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:78:60:78:61 | 31 | params_flow.rb:78:54:78:62 | call to taint |
 | params_flow.rb:78:60:78:61 | 31 | params_flow.rb:78:60:78:61 | 31 |
@@ -5106,6 +5162,7 @@ trackEnd
 | params_flow.rb:80:9:80:17 | synthetic splat argument | params_flow.rb:80:9:80:17 | synthetic splat argument |
 | params_flow.rb:80:15:80:16 | 33 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:80:15:80:16 | 33 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:80:15:80:16 | 33 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:80:15:80:16 | 33 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:80:15:80:16 | 33 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:80:15:80:16 | 33 | params_flow.rb:5:10:5:10 | x |
@@ -5119,6 +5176,7 @@ trackEnd
 | params_flow.rb:80:20:80:28 | synthetic splat argument | params_flow.rb:80:20:80:28 | synthetic splat argument |
 | params_flow.rb:80:26:80:27 | 34 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:80:26:80:27 | 34 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:80:26:80:27 | 34 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:80:26:80:27 | 34 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:80:26:80:27 | 34 | params_flow.rb:80:20:80:28 | call to taint |
 | params_flow.rb:80:26:80:27 | 34 | params_flow.rb:80:26:80:27 | 34 |
@@ -5126,6 +5184,7 @@ trackEnd
 | params_flow.rb:80:31:80:39 | synthetic splat argument | params_flow.rb:80:31:80:39 | synthetic splat argument |
 | params_flow.rb:80:37:80:38 | 35 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:80:37:80:38 | 35 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:80:37:80:38 | 35 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:80:37:80:38 | 35 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:80:37:80:38 | 35 | params_flow.rb:80:31:80:39 | call to taint |
 | params_flow.rb:80:37:80:38 | 35 | params_flow.rb:80:37:80:38 | 35 |
@@ -5133,6 +5192,7 @@ trackEnd
 | params_flow.rb:80:42:80:50 | synthetic splat argument | params_flow.rb:80:42:80:50 | synthetic splat argument |
 | params_flow.rb:80:48:80:49 | 36 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:80:48:80:49 | 36 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:80:48:80:49 | 36 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:80:48:80:49 | 36 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:80:48:80:49 | 36 | params_flow.rb:80:42:80:50 | call to taint |
 | params_flow.rb:80:48:80:49 | 36 | params_flow.rb:80:48:80:49 | 36 |
@@ -5149,6 +5209,7 @@ trackEnd
 | params_flow.rb:81:10:81:18 | synthetic splat argument | params_flow.rb:81:10:81:18 | synthetic splat argument |
 | params_flow.rb:81:16:81:17 | 32 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:81:16:81:17 | 32 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:81:16:81:17 | 32 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:81:16:81:17 | 32 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:81:16:81:17 | 32 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:81:16:81:17 | 32 | params_flow.rb:5:10:5:10 | x |
@@ -5163,6 +5224,7 @@ trackEnd
 | params_flow.rb:81:28:81:36 | synthetic splat argument | params_flow.rb:81:28:81:36 | synthetic splat argument |
 | params_flow.rb:81:34:81:35 | 37 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:81:34:81:35 | 37 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:81:34:81:35 | 37 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:81:34:81:35 | 37 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:81:34:81:35 | 37 | params_flow.rb:81:28:81:36 | call to taint |
 | params_flow.rb:81:34:81:35 | 37 | params_flow.rb:81:34:81:35 | 37 |
@@ -5242,6 +5304,7 @@ trackEnd
 | params_flow.rb:88:5:88:10 | synthetic splat argument | params_flow.rb:88:5:88:10 | synthetic splat argument |
 | params_flow.rb:89:5:89:10 | call to sink | params_flow.rb:89:5:89:10 | call to sink |
 | params_flow.rb:89:5:89:10 | synthetic splat argument | params_flow.rb:89:5:89:10 | synthetic splat argument |
+| params_flow.rb:90:5:90:10 | call to sink | params_flow.rb:84:5:90:39 | ... |
 | params_flow.rb:90:5:90:10 | call to sink | params_flow.rb:90:5:90:10 | call to sink |
 | params_flow.rb:90:5:90:10 | call to sink | params_flow.rb:94:1:94:48 | call to pos_many |
 | params_flow.rb:90:5:90:10 | call to sink | params_flow.rb:131:1:131:46 | call to pos_many |
@@ -5279,6 +5342,7 @@ trackEnd
 | params_flow.rb:93:9:93:17 | synthetic splat argument | params_flow.rb:93:9:93:17 | synthetic splat argument |
 | params_flow.rb:93:15:93:16 | 40 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:93:15:93:16 | 40 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:93:15:93:16 | 40 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:93:15:93:16 | 40 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:93:15:93:16 | 40 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:93:15:93:16 | 40 | params_flow.rb:5:10:5:10 | x |
@@ -5298,6 +5362,7 @@ trackEnd
 | params_flow.rb:93:20:93:28 | synthetic splat argument | params_flow.rb:93:20:93:28 | synthetic splat argument |
 | params_flow.rb:93:26:93:27 | 41 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:93:26:93:27 | 41 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:93:26:93:27 | 41 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:93:26:93:27 | 41 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:93:26:93:27 | 41 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:93:26:93:27 | 41 | params_flow.rb:5:10:5:10 | x |
@@ -5317,6 +5382,7 @@ trackEnd
 | params_flow.rb:93:31:93:39 | synthetic splat argument | params_flow.rb:93:31:93:39 | synthetic splat argument |
 | params_flow.rb:93:37:93:38 | 42 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:93:37:93:38 | 42 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:93:37:93:38 | 42 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:93:37:93:38 | 42 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:93:37:93:38 | 42 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:93:37:93:38 | 42 | params_flow.rb:5:10:5:10 | x |
@@ -5336,6 +5402,7 @@ trackEnd
 | params_flow.rb:93:42:93:50 | synthetic splat argument | params_flow.rb:93:42:93:50 | synthetic splat argument |
 | params_flow.rb:93:48:93:49 | 43 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:93:48:93:49 | 43 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:93:48:93:49 | 43 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:93:48:93:49 | 43 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:93:48:93:49 | 43 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:93:48:93:49 | 43 | params_flow.rb:5:10:5:10 | x |
@@ -5358,6 +5425,7 @@ trackEnd
 | params_flow.rb:94:10:94:18 | synthetic splat argument | params_flow.rb:94:10:94:18 | synthetic splat argument |
 | params_flow.rb:94:16:94:17 | 38 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:94:16:94:17 | 38 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:94:16:94:17 | 38 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:94:16:94:17 | 38 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:94:16:94:17 | 38 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:94:16:94:17 | 38 | params_flow.rb:5:10:5:10 | x |
@@ -5377,6 +5445,7 @@ trackEnd
 | params_flow.rb:94:21:94:29 | synthetic splat argument | params_flow.rb:94:21:94:29 | synthetic splat argument |
 | params_flow.rb:94:27:94:28 | 39 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:94:27:94:28 | 39 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:94:27:94:28 | 39 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:94:27:94:28 | 39 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:94:27:94:28 | 39 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:94:27:94:28 | 39 | params_flow.rb:5:10:5:10 | x |
@@ -5391,6 +5460,7 @@ trackEnd
 | params_flow.rb:94:39:94:47 | synthetic splat argument | params_flow.rb:94:39:94:47 | synthetic splat argument |
 | params_flow.rb:94:45:94:46 | 44 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:94:45:94:46 | 44 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:94:45:94:46 | 44 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:94:45:94:46 | 44 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:94:45:94:46 | 44 | params_flow.rb:94:39:94:47 | call to taint |
 | params_flow.rb:94:45:94:46 | 44 | params_flow.rb:94:45:94:46 | 44 |
@@ -5406,6 +5476,7 @@ trackEnd
 | params_flow.rb:96:10:96:18 | synthetic splat argument | params_flow.rb:96:10:96:18 | synthetic splat argument |
 | params_flow.rb:96:16:96:17 | 45 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:96:16:96:17 | 45 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:96:16:96:17 | 45 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:96:16:96:17 | 45 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:96:16:96:17 | 45 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:96:16:96:17 | 45 | params_flow.rb:5:10:5:10 | x |
@@ -5425,6 +5496,7 @@ trackEnd
 | params_flow.rb:96:21:96:29 | synthetic splat argument | params_flow.rb:96:21:96:29 | synthetic splat argument |
 | params_flow.rb:96:27:96:28 | 46 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:96:27:96:28 | 46 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:96:27:96:28 | 46 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:96:27:96:28 | 46 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:96:27:96:28 | 46 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:96:27:96:28 | 46 | params_flow.rb:5:10:5:10 | x |
@@ -5443,6 +5515,7 @@ trackEnd
 | params_flow.rb:96:34:96:42 | synthetic splat argument | params_flow.rb:96:34:96:42 | synthetic splat argument |
 | params_flow.rb:96:40:96:41 | 47 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:96:40:96:41 | 47 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:96:40:96:41 | 47 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:96:40:96:41 | 47 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:96:40:96:41 | 47 | params_flow.rb:96:34:96:42 | call to taint |
 | params_flow.rb:96:40:96:41 | 47 | params_flow.rb:96:40:96:41 | 47 |
@@ -5450,6 +5523,7 @@ trackEnd
 | params_flow.rb:96:45:96:53 | synthetic splat argument | params_flow.rb:96:45:96:53 | synthetic splat argument |
 | params_flow.rb:96:51:96:52 | 48 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:96:51:96:52 | 48 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:96:51:96:52 | 48 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:96:51:96:52 | 48 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:96:51:96:52 | 48 | params_flow.rb:96:45:96:53 | call to taint |
 | params_flow.rb:96:51:96:52 | 48 | params_flow.rb:96:51:96:52 | 48 |
@@ -5457,6 +5531,7 @@ trackEnd
 | params_flow.rb:96:56:96:64 | synthetic splat argument | params_flow.rb:96:56:96:64 | synthetic splat argument |
 | params_flow.rb:96:62:96:63 | 49 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:96:62:96:63 | 49 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:96:62:96:63 | 49 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:96:62:96:63 | 49 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:96:62:96:63 | 49 | params_flow.rb:96:56:96:64 | call to taint |
 | params_flow.rb:96:62:96:63 | 49 | params_flow.rb:96:62:96:63 | 49 |
@@ -5464,6 +5539,7 @@ trackEnd
 | params_flow.rb:96:68:96:76 | synthetic splat argument | params_flow.rb:96:68:96:76 | synthetic splat argument |
 | params_flow.rb:96:74:96:75 | 50 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:96:74:96:75 | 50 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:96:74:96:75 | 50 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:96:74:96:75 | 50 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:96:74:96:75 | 50 | params_flow.rb:96:68:96:76 | call to taint |
 | params_flow.rb:96:74:96:75 | 50 | params_flow.rb:96:74:96:75 | 50 |
@@ -5471,6 +5547,7 @@ trackEnd
 | params_flow.rb:96:79:96:87 | synthetic splat argument | params_flow.rb:96:79:96:87 | synthetic splat argument |
 | params_flow.rb:96:85:96:86 | 51 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:96:85:96:86 | 51 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:96:85:96:86 | 51 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:96:85:96:86 | 51 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:96:85:96:86 | 51 | params_flow.rb:96:79:96:87 | call to taint |
 | params_flow.rb:96:85:96:86 | 51 | params_flow.rb:96:85:96:86 | 51 |
@@ -5523,6 +5600,7 @@ trackEnd
 | params_flow.rb:101:10:101:18 | ...[...] | params_flow.rb:101:10:101:18 | ...[...] |
 | params_flow.rb:101:10:101:18 | synthetic splat argument | params_flow.rb:101:10:101:18 | synthetic splat argument |
 | params_flow.rb:101:17:101:17 | 1 | params_flow.rb:101:17:101:17 | 1 |
+| params_flow.rb:102:5:102:10 | call to sink | params_flow.rb:99:5:102:57 | ... |
 | params_flow.rb:102:5:102:10 | call to sink | params_flow.rb:102:5:102:10 | call to sink |
 | params_flow.rb:102:5:102:10 | call to sink | params_flow.rb:105:1:105:49 | call to splatmidsmall |
 | params_flow.rb:102:5:102:10 | call to sink | params_flow.rb:106:1:106:46 | call to splatmidsmall |
@@ -5539,6 +5617,7 @@ trackEnd
 | params_flow.rb:105:15:105:23 | synthetic splat argument | params_flow.rb:105:15:105:23 | synthetic splat argument |
 | params_flow.rb:105:21:105:22 | 52 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:105:21:105:22 | 52 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:105:21:105:22 | 52 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:105:21:105:22 | 52 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:105:21:105:22 | 52 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:105:21:105:22 | 52 | params_flow.rb:5:10:5:10 | x |
@@ -5557,6 +5636,7 @@ trackEnd
 | params_flow.rb:105:28:105:36 | synthetic splat argument | params_flow.rb:105:28:105:36 | synthetic splat argument |
 | params_flow.rb:105:34:105:35 | 53 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:105:34:105:35 | 53 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:105:34:105:35 | 53 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:105:34:105:35 | 53 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:105:34:105:35 | 53 | params_flow.rb:105:28:105:36 | call to taint |
 | params_flow.rb:105:34:105:35 | 53 | params_flow.rb:105:34:105:35 | 53 |
@@ -5564,6 +5644,7 @@ trackEnd
 | params_flow.rb:105:39:105:47 | synthetic splat argument | params_flow.rb:105:39:105:47 | synthetic splat argument |
 | params_flow.rb:105:45:105:46 | 54 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:105:45:105:46 | 54 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:105:45:105:46 | 54 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:105:45:105:46 | 54 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:105:45:105:46 | 54 | params_flow.rb:105:39:105:47 | call to taint |
 | params_flow.rb:105:45:105:46 | 54 | params_flow.rb:105:45:105:46 | 54 |
@@ -5580,6 +5661,7 @@ trackEnd
 | params_flow.rb:106:15:106:23 | synthetic splat argument | params_flow.rb:106:15:106:23 | synthetic splat argument |
 | params_flow.rb:106:21:106:22 | 55 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:106:21:106:22 | 55 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:106:21:106:22 | 55 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:106:21:106:22 | 55 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:106:21:106:22 | 55 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:106:21:106:22 | 55 | params_flow.rb:5:10:5:10 | x |
@@ -5593,6 +5675,7 @@ trackEnd
 | params_flow.rb:106:26:106:34 | synthetic splat argument | params_flow.rb:106:26:106:34 | synthetic splat argument |
 | params_flow.rb:106:32:106:33 | 56 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:106:32:106:33 | 56 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:106:32:106:33 | 56 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:106:32:106:33 | 56 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:106:32:106:33 | 56 | params_flow.rb:106:26:106:34 | call to taint |
 | params_flow.rb:106:32:106:33 | 56 | params_flow.rb:106:32:106:33 | 56 |
@@ -5600,6 +5683,7 @@ trackEnd
 | params_flow.rb:106:37:106:45 | synthetic splat argument | params_flow.rb:106:37:106:45 | synthetic splat argument |
 | params_flow.rb:106:43:106:44 | 57 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:106:43:106:44 | 57 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:106:43:106:44 | 57 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:106:43:106:44 | 57 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:106:43:106:44 | 57 | params_flow.rb:106:37:106:45 | call to taint |
 | params_flow.rb:106:43:106:44 | 57 | params_flow.rb:106:43:106:44 | 57 |
@@ -5643,6 +5727,7 @@ trackEnd
 | params_flow.rb:110:10:110:13 | ...[...] | params_flow.rb:110:10:110:13 | ...[...] |
 | params_flow.rb:110:10:110:13 | synthetic splat argument | params_flow.rb:110:10:110:13 | synthetic splat argument |
 | params_flow.rb:110:12:110:12 | 0 | params_flow.rb:110:12:110:12 | 0 |
+| params_flow.rb:111:5:111:10 | call to sink | params_flow.rb:109:5:111:30 | ... |
 | params_flow.rb:111:5:111:10 | call to sink | params_flow.rb:111:5:111:10 | call to sink |
 | params_flow.rb:111:5:111:10 | call to sink | params_flow.rb:114:1:114:67 | call to splat_followed_by_keyword_param |
 | params_flow.rb:111:5:111:10 | synthetic splat argument | params_flow.rb:111:5:111:10 | synthetic splat argument |
@@ -5660,6 +5745,7 @@ trackEnd
 | params_flow.rb:114:33:114:41 | synthetic splat argument | params_flow.rb:114:33:114:41 | synthetic splat argument |
 | params_flow.rb:114:39:114:40 | 58 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:114:39:114:40 | 58 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:114:39:114:40 | 58 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:114:39:114:40 | 58 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:114:39:114:40 | 58 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:114:39:114:40 | 58 | params_flow.rb:5:10:5:10 | x |
@@ -5677,6 +5763,7 @@ trackEnd
 | params_flow.rb:114:44:114:52 | synthetic splat argument | params_flow.rb:114:44:114:52 | synthetic splat argument |
 | params_flow.rb:114:50:114:51 | 59 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:114:50:114:51 | 59 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:114:50:114:51 | 59 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:114:50:114:51 | 59 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:114:50:114:51 | 59 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:114:50:114:51 | 59 | params_flow.rb:5:10:5:10 | x |
@@ -5696,6 +5783,7 @@ trackEnd
 | params_flow.rb:114:58:114:66 | synthetic splat argument | params_flow.rb:114:58:114:66 | synthetic splat argument |
 | params_flow.rb:114:64:114:65 | 60 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:114:64:114:65 | 60 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:114:64:114:65 | 60 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:114:64:114:65 | 60 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:114:64:114:65 | 60 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:114:64:114:65 | 60 | params_flow.rb:5:10:5:10 | x |
@@ -5747,6 +5835,7 @@ trackEnd
 | params_flow.rb:117:19:117:27 | synthetic splat argument | params_flow.rb:117:19:117:27 | synthetic splat argument |
 | params_flow.rb:117:25:117:26 | 61 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:117:25:117:26 | 61 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:117:25:117:26 | 61 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:117:25:117:26 | 61 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:117:25:117:26 | 61 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:117:25:117:26 | 61 | params_flow.rb:5:10:5:10 | x |
@@ -5816,6 +5905,7 @@ trackEnd
 | params_flow.rb:123:5:123:10 | synthetic splat argument | params_flow.rb:123:5:123:10 | synthetic splat argument |
 | params_flow.rb:124:5:124:10 | call to sink | params_flow.rb:124:5:124:10 | call to sink |
 | params_flow.rb:124:5:124:10 | synthetic splat argument | params_flow.rb:124:5:124:10 | synthetic splat argument |
+| params_flow.rb:125:5:125:10 | call to sink | params_flow.rb:121:5:125:39 | ... |
 | params_flow.rb:125:5:125:10 | call to sink | params_flow.rb:125:5:125:10 | call to sink |
 | params_flow.rb:125:5:125:10 | call to sink | params_flow.rb:128:1:128:61 | call to destruct |
 | params_flow.rb:125:5:125:10 | synthetic splat argument | params_flow.rb:125:5:125:10 | synthetic splat argument |
@@ -5829,6 +5919,7 @@ trackEnd
 | params_flow.rb:128:11:128:19 | synthetic splat argument | params_flow.rb:128:11:128:19 | synthetic splat argument |
 | params_flow.rb:128:17:128:18 | 62 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:128:17:128:18 | 62 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:128:17:128:18 | 62 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:128:17:128:18 | 62 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:128:17:128:18 | 62 | params_flow.rb:128:11:128:19 | call to taint |
 | params_flow.rb:128:17:128:18 | 62 | params_flow.rb:128:17:128:18 | 62 |
@@ -5836,6 +5927,7 @@ trackEnd
 | params_flow.rb:128:22:128:30 | synthetic splat argument | params_flow.rb:128:22:128:30 | synthetic splat argument |
 | params_flow.rb:128:28:128:29 | 63 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:128:28:128:29 | 63 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:128:28:128:29 | 63 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:128:28:128:29 | 63 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:128:28:128:29 | 63 | params_flow.rb:128:22:128:30 | call to taint |
 | params_flow.rb:128:28:128:29 | 63 | params_flow.rb:128:28:128:29 | 63 |
@@ -5847,6 +5939,7 @@ trackEnd
 | params_flow.rb:128:35:128:43 | synthetic splat argument | params_flow.rb:128:35:128:43 | synthetic splat argument |
 | params_flow.rb:128:41:128:42 | 64 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:128:41:128:42 | 64 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:128:41:128:42 | 64 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:128:41:128:42 | 64 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:128:41:128:42 | 64 | params_flow.rb:128:35:128:43 | call to taint |
 | params_flow.rb:128:41:128:42 | 64 | params_flow.rb:128:41:128:42 | 64 |
@@ -5859,6 +5952,7 @@ trackEnd
 | params_flow.rb:128:50:128:58 | synthetic splat argument | params_flow.rb:128:50:128:58 | synthetic splat argument |
 | params_flow.rb:128:56:128:57 | 65 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:128:56:128:57 | 65 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:128:56:128:57 | 65 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:128:56:128:57 | 65 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:128:56:128:57 | 65 | params_flow.rb:128:50:128:58 | call to taint |
 | params_flow.rb:128:56:128:57 | 65 | params_flow.rb:128:56:128:57 | 65 |
@@ -5895,6 +5989,7 @@ trackEnd
 | params_flow.rb:130:9:130:17 | synthetic splat argument | params_flow.rb:130:9:130:17 | synthetic splat argument |
 | params_flow.rb:130:15:130:16 | 66 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:130:15:130:16 | 66 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:130:15:130:16 | 66 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:130:15:130:16 | 66 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:130:15:130:16 | 66 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:130:15:130:16 | 66 | params_flow.rb:5:10:5:10 | x |
@@ -5914,6 +6009,7 @@ trackEnd
 | params_flow.rb:130:20:130:28 | synthetic splat argument | params_flow.rb:130:20:130:28 | synthetic splat argument |
 | params_flow.rb:130:26:130:27 | 67 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:130:26:130:27 | 67 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:130:26:130:27 | 67 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:130:26:130:27 | 67 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:130:26:130:27 | 67 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:130:26:130:27 | 67 | params_flow.rb:5:10:5:10 | x |
@@ -5930,6 +6026,7 @@ trackEnd
 | params_flow.rb:131:17:131:25 | synthetic splat argument | params_flow.rb:131:17:131:25 | synthetic splat argument |
 | params_flow.rb:131:23:131:24 | 68 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:131:23:131:24 | 68 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:131:23:131:24 | 68 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:131:23:131:24 | 68 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:131:23:131:24 | 68 | params_flow.rb:131:17:131:25 | call to taint |
 | params_flow.rb:131:23:131:24 | 68 | params_flow.rb:131:23:131:24 | 68 |
@@ -5950,6 +6047,7 @@ trackEnd
 | params_flow.rb:133:14:133:18 | *args | params_flow.rb:134:10:134:13 | args |
 | params_flow.rb:133:15:133:18 | args | params_flow.rb:133:15:133:18 | args |
 | params_flow.rb:134:5:134:16 | call to sink | params_flow.rb:134:5:134:16 | call to sink |
+| params_flow.rb:134:5:134:16 | call to sink | params_flow.rb:134:5:134:36 | ... |
 | params_flow.rb:134:5:134:16 | call to sink | params_flow.rb:137:1:137:44 | call to splatall |
 | params_flow.rb:134:5:134:16 | synthetic splat argument | params_flow.rb:134:5:134:16 | synthetic splat argument |
 | params_flow.rb:134:10:134:16 | ...[...] | params_flow.rb:5:10:5:10 | x |
@@ -5971,6 +6069,7 @@ trackEnd
 | params_flow.rb:137:12:137:20 | synthetic splat argument | params_flow.rb:137:12:137:20 | synthetic splat argument |
 | params_flow.rb:137:18:137:19 | 69 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:137:18:137:19 | 69 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:137:18:137:19 | 69 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:137:18:137:19 | 69 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:137:18:137:19 | 69 | params_flow.rb:137:12:137:20 | call to taint |
 | params_flow.rb:137:18:137:19 | 69 | params_flow.rb:137:18:137:19 | 69 |
@@ -5982,6 +6081,7 @@ trackEnd
 | params_flow.rb:137:23:137:31 | synthetic splat argument | params_flow.rb:137:23:137:31 | synthetic splat argument |
 | params_flow.rb:137:29:137:30 | 70 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:137:29:137:30 | 70 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:137:29:137:30 | 70 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:137:29:137:30 | 70 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:137:29:137:30 | 70 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:137:29:137:30 | 70 | params_flow.rb:5:10:5:10 | x |
@@ -5993,6 +6093,7 @@ trackEnd
 | params_flow.rb:137:34:137:42 | synthetic splat argument | params_flow.rb:137:34:137:42 | synthetic splat argument |
 | params_flow.rb:137:40:137:41 | 71 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:137:40:137:41 | 71 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:137:40:137:41 | 71 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:137:40:137:41 | 71 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:137:40:137:41 | 71 | params_flow.rb:137:34:137:42 | call to taint |
 | params_flow.rb:137:40:137:41 | 71 | params_flow.rb:137:40:137:41 | 71 |
@@ -6007,6 +6108,7 @@ trackEnd
 | params_flow.rb:140:5:140:15 | ...[...] | params_flow.rb:140:5:140:15 | ...[...] |
 | params_flow.rb:140:5:140:15 | [post] ...[...] | params_flow.rb:140:5:140:15 | [post] ...[...] |
 | params_flow.rb:140:5:140:15 | synthetic splat argument | params_flow.rb:140:5:140:15 | synthetic splat argument |
+| params_flow.rb:140:5:140:38 | call to insert | params_flow.rb:140:5:140:38 | ... |
 | params_flow.rb:140:5:140:38 | call to insert | params_flow.rb:140:5:140:38 | call to insert |
 | params_flow.rb:140:5:140:38 | call to insert | params_flow.rb:145:1:145:29 | call to hashSplatSideEffect |
 | params_flow.rb:140:5:140:38 | call to insert | params_flow.rb:150:1:150:42 | call to hashSplatSideEffect |
@@ -6045,6 +6147,7 @@ trackEnd
 | params_flow.rb:143:24:143:32 | synthetic splat argument | params_flow.rb:143:24:143:32 | synthetic splat argument |
 | params_flow.rb:143:30:143:31 | 72 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:143:30:143:31 | 72 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:143:30:143:31 | 72 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:143:30:143:31 | 72 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:143:30:143:31 | 72 | params_flow.rb:140:27:140:37 | ...[...] |
 | params_flow.rb:143:30:143:31 | 72 | params_flow.rb:143:24:143:32 | call to taint |
@@ -6109,6 +6212,7 @@ trackEnd
 | params_flow.rb:150:33:150:41 | synthetic splat argument | params_flow.rb:150:33:150:41 | synthetic splat argument |
 | params_flow.rb:150:39:150:40 | 73 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:150:39:150:40 | 73 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:150:39:150:40 | 73 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:150:39:150:40 | 73 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:150:39:150:40 | 73 | params_flow.rb:140:27:140:37 | ...[...] |
 | params_flow.rb:150:39:150:40 | 73 | params_flow.rb:150:33:150:41 | call to taint |
@@ -6134,6 +6238,7 @@ trackEnd
 | params_flow.rb:153:28:153:29 | p2 | params_flow.rb:153:28:153:29 | p2 |
 | params_flow.rb:153:28:153:29 | p2 | params_flow.rb:154:18:154:19 | p2 |
 | params_flow.rb:154:5:154:6 | [post] p1 | params_flow.rb:154:5:154:6 | [post] p1 |
+| params_flow.rb:154:5:154:20 | call to insert | params_flow.rb:154:5:154:20 | ... |
 | params_flow.rb:154:5:154:20 | call to insert | params_flow.rb:154:5:154:20 | call to insert |
 | params_flow.rb:154:5:154:20 | call to insert | params_flow.rb:159:1:159:27 | call to keywordSideEffect |
 | params_flow.rb:154:5:154:20 | call to insert | params_flow.rb:164:1:164:40 | call to keywordSideEffect |
@@ -6172,6 +6277,7 @@ trackEnd
 | params_flow.rb:157:24:157:32 | synthetic splat argument | params_flow.rb:157:24:157:32 | synthetic splat argument |
 | params_flow.rb:157:30:157:31 | 74 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:157:30:157:31 | 74 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:157:30:157:31 | 74 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:157:30:157:31 | 74 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:157:30:157:31 | 74 | params_flow.rb:153:28:153:29 | p2 |
 | params_flow.rb:157:30:157:31 | 74 | params_flow.rb:153:28:153:29 | p2 |
@@ -6235,6 +6341,7 @@ trackEnd
 | params_flow.rb:164:31:164:39 | synthetic splat argument | params_flow.rb:164:31:164:39 | synthetic splat argument |
 | params_flow.rb:164:37:164:38 | 75 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:164:37:164:38 | 75 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:164:37:164:38 | 75 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:164:37:164:38 | 75 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:164:37:164:38 | 75 | params_flow.rb:153:28:153:29 | p2 |
 | params_flow.rb:164:37:164:38 | 75 | params_flow.rb:153:28:153:29 | p2 |
@@ -6260,6 +6367,7 @@ trackEnd
 | params_flow.rb:168:5:168:14 | ...[...] | params_flow.rb:168:5:168:14 | ...[...] |
 | params_flow.rb:168:5:168:14 | [post] ...[...] | params_flow.rb:168:5:168:14 | [post] ...[...] |
 | params_flow.rb:168:5:168:14 | synthetic splat argument | params_flow.rb:168:5:168:14 | synthetic splat argument |
+| params_flow.rb:168:5:168:36 | call to insert | params_flow.rb:168:5:168:36 | ... |
 | params_flow.rb:168:5:168:36 | call to insert | params_flow.rb:168:5:168:36 | call to insert |
 | params_flow.rb:168:5:168:36 | call to insert | params_flow.rb:173:1:173:25 | call to splatSideEffect |
 | params_flow.rb:168:5:168:36 | call to insert | params_flow.rb:178:1:178:30 | call to splatSideEffect |
@@ -6296,6 +6404,7 @@ trackEnd
 | params_flow.rb:171:17:171:25 | synthetic splat argument | params_flow.rb:171:17:171:25 | synthetic splat argument |
 | params_flow.rb:171:23:171:24 | 76 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:171:23:171:24 | 76 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:171:23:171:24 | 76 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:171:23:171:24 | 76 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:171:23:171:24 | 76 | params_flow.rb:168:26:168:35 | ...[...] |
 | params_flow.rb:171:23:171:24 | 76 | params_flow.rb:171:17:171:25 | call to taint |
@@ -6356,6 +6465,7 @@ trackEnd
 | params_flow.rb:178:21:178:29 | synthetic splat argument | params_flow.rb:178:21:178:29 | synthetic splat argument |
 | params_flow.rb:178:27:178:28 | 77 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:178:27:178:28 | 77 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:178:27:178:28 | 77 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:178:27:178:28 | 77 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:178:27:178:28 | 77 | params_flow.rb:168:26:168:35 | ...[...] |
 | params_flow.rb:178:27:178:28 | 77 | params_flow.rb:178:21:178:29 | call to taint |
@@ -6381,6 +6491,7 @@ trackEnd
 | params_flow.rb:181:28:181:29 | p2 | params_flow.rb:181:28:181:29 | p2 |
 | params_flow.rb:181:28:181:29 | p2 | params_flow.rb:182:18:182:19 | p2 |
 | params_flow.rb:182:5:182:6 | [post] p1 | params_flow.rb:182:5:182:6 | [post] p1 |
+| params_flow.rb:182:5:182:20 | call to insert | params_flow.rb:182:5:182:20 | ... |
 | params_flow.rb:182:5:182:20 | call to insert | params_flow.rb:182:5:182:20 | call to insert |
 | params_flow.rb:182:5:182:20 | call to insert | params_flow.rb:187:1:187:25 | call to positionSideEffect |
 | params_flow.rb:182:5:182:20 | call to insert | params_flow.rb:192:1:192:33 | call to positionSideEffect |
@@ -6421,6 +6532,7 @@ trackEnd
 | params_flow.rb:185:14:185:22 | synthetic splat argument | params_flow.rb:185:14:185:22 | synthetic splat argument |
 | params_flow.rb:185:20:185:21 | 78 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:185:20:185:21 | 78 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:185:20:185:21 | 78 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:185:20:185:21 | 78 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:185:20:185:21 | 78 | params_flow.rb:181:28:181:29 | p2 |
 | params_flow.rb:185:20:185:21 | 78 | params_flow.rb:181:28:181:29 | p2 |
@@ -6480,6 +6592,7 @@ trackEnd
 | params_flow.rb:192:24:192:32 | synthetic splat argument | params_flow.rb:192:24:192:32 | synthetic splat argument |
 | params_flow.rb:192:30:192:31 | 79 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:192:30:192:31 | 79 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:192:30:192:31 | 79 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:192:30:192:31 | 79 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:192:30:192:31 | 79 | params_flow.rb:181:28:181:29 | p2 |
 | params_flow.rb:192:30:192:31 | 79 | params_flow.rb:181:28:181:29 | p2 |
@@ -6524,6 +6637,7 @@ trackEnd
 | params_flow.rb:196:10:196:18 | synthetic splat argument | params_flow.rb:196:10:196:18 | synthetic splat argument |
 | params_flow.rb:196:16:196:17 | 80 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:196:16:196:17 | 80 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:196:16:196:17 | 80 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:196:16:196:17 | 80 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:196:16:196:17 | 80 | params_flow.rb:196:10:196:18 | call to taint |
 | params_flow.rb:196:16:196:17 | 80 | params_flow.rb:196:16:196:17 | 80 |
@@ -6587,6 +6701,7 @@ trackEnd
 | params_flow.rb:203:11:203:14 | ...[...] | params_flow.rb:203:11:203:14 | ...[...] |
 | params_flow.rb:203:11:203:14 | synthetic splat argument | params_flow.rb:203:11:203:14 | synthetic splat argument |
 | params_flow.rb:203:13:203:13 | 0 | params_flow.rb:203:13:203:13 | 0 |
+| params_flow.rb:204:5:204:15 | call to sink | params_flow.rb:201:5:204:15 | ... |
 | params_flow.rb:204:5:204:15 | call to sink | params_flow.rb:204:5:204:15 | call to sink |
 | params_flow.rb:204:5:204:15 | call to sink | params_flow.rb:207:1:207:14 | call to foo |
 | params_flow.rb:204:5:204:15 | synthetic splat argument | params_flow.rb:204:5:204:15 | synthetic splat argument |
@@ -6681,7 +6796,9 @@ trackEnd
 | params_flow.rb:216:14:216:24 | synthetic splat argument | params_flow.rb:216:14:216:24 | synthetic splat argument |
 | params_flow.rb:216:21:216:23 | :k2 | params_flow.rb:216:21:216:23 | :k2 |
 | params_flow.rb:217:9:217:23 | synthetic splat argument | params_flow.rb:217:9:217:23 | synthetic splat argument |
+| params_flow.rb:217:9:217:23 | yield ... | params_flow.rb:211:9:217:23 | ... |
 | params_flow.rb:217:9:217:23 | yield ... | params_flow.rb:217:9:217:23 | yield ... |
+| params_flow.rb:217:9:217:23 | yield ... | params_flow.rb:223:9:223:13 | ... |
 | params_flow.rb:217:9:217:23 | yield ... | params_flow.rb:223:9:223:13 | super call to m |
 | params_flow.rb:217:9:217:23 | yield ... | params_flow.rb:227:1:229:3 | call to m |
 | params_flow.rb:217:9:217:23 | yield block argument | params_flow.rb:217:9:217:23 | yield block argument |
@@ -6695,6 +6812,7 @@ trackEnd
 | params_flow.rb:217:15:217:23 | synthetic splat argument | params_flow.rb:217:15:217:23 | synthetic splat argument |
 | params_flow.rb:217:21:217:22 | 86 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:217:21:217:22 | 86 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:217:21:217:22 | 86 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:217:21:217:22 | 86 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:217:21:217:22 | 86 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:217:21:217:22 | 86 | params_flow.rb:5:10:5:10 | x |
@@ -6760,6 +6878,7 @@ trackEnd
 | params_flow.rb:223:9:223:13 | ** ... | params_flow.rb:223:9:223:13 | ** ... |
 | params_flow.rb:223:9:223:13 | Pair | params_flow.rb:223:9:223:13 | Pair |
 | params_flow.rb:223:9:223:13 | k1 | params_flow.rb:223:9:223:13 | k1 |
+| params_flow.rb:223:9:223:13 | super call to m | params_flow.rb:223:9:223:13 | ... |
 | params_flow.rb:223:9:223:13 | super call to m | params_flow.rb:223:9:223:13 | super call to m |
 | params_flow.rb:223:9:223:13 | super call to m | params_flow.rb:227:1:229:3 | call to m |
 | params_flow.rb:223:9:223:13 | synthetic hash-splat argument | params_flow.rb:210:26:210:33 | **kwargs |
@@ -6793,6 +6912,7 @@ trackEnd
 | params_flow.rb:227:11:227:19 | synthetic splat argument | params_flow.rb:227:11:227:19 | synthetic splat argument |
 | params_flow.rb:227:17:227:18 | 81 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:227:17:227:18 | 81 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:227:17:227:18 | 81 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:227:17:227:18 | 81 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:227:17:227:18 | 81 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:227:17:227:18 | 81 | params_flow.rb:5:10:5:10 | x |
@@ -6813,6 +6933,7 @@ trackEnd
 | params_flow.rb:227:22:227:30 | synthetic splat argument | params_flow.rb:227:22:227:30 | synthetic splat argument |
 | params_flow.rb:227:28:227:29 | 82 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:227:28:227:29 | 82 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:227:28:227:29 | 82 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:227:28:227:29 | 82 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:227:28:227:29 | 82 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:227:28:227:29 | 82 | params_flow.rb:5:10:5:10 | x |
@@ -6833,6 +6954,7 @@ trackEnd
 | params_flow.rb:227:36:227:44 | synthetic splat argument | params_flow.rb:227:36:227:44 | synthetic splat argument |
 | params_flow.rb:227:42:227:43 | 83 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:227:42:227:43 | 83 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:227:42:227:43 | 83 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:227:42:227:43 | 83 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:227:42:227:43 | 83 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:227:42:227:43 | 83 | params_flow.rb:5:10:5:10 | x |
@@ -6855,6 +6977,7 @@ trackEnd
 | params_flow.rb:227:51:227:59 | synthetic splat argument | params_flow.rb:227:51:227:59 | synthetic splat argument |
 | params_flow.rb:227:57:227:58 | 84 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:227:57:227:58 | 84 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:227:57:227:58 | 84 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:227:57:227:58 | 84 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:227:57:227:58 | 84 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:227:57:227:58 | 84 | params_flow.rb:5:10:5:10 | x |
@@ -6877,6 +7000,7 @@ trackEnd
 | params_flow.rb:227:66:227:74 | synthetic splat argument | params_flow.rb:227:66:227:74 | synthetic splat argument |
 | params_flow.rb:227:72:227:73 | 85 | params_flow.rb:1:11:1:11 | x |
 | params_flow.rb:227:72:227:73 | 85 | params_flow.rb:1:11:1:11 | x |
+| params_flow.rb:227:72:227:73 | 85 | params_flow.rb:2:5:2:5 | ... |
 | params_flow.rb:227:72:227:73 | 85 | params_flow.rb:2:5:2:5 | x |
 | params_flow.rb:227:72:227:73 | 85 | params_flow.rb:5:10:5:10 | x |
 | params_flow.rb:227:72:227:73 | 85 | params_flow.rb:5:10:5:10 | x |
@@ -6902,10 +7026,13 @@ trackEnd
 | params_flow.rb:227:81:227:81 | x | params_flow.rb:227:81:227:81 | x |
 | params_flow.rb:227:81:227:81 | x | params_flow.rb:227:81:227:81 | x |
 | params_flow.rb:227:81:227:81 | x | params_flow.rb:228:10:228:10 | x |
+| params_flow.rb:228:5:228:11 | call to sink | params_flow.rb:211:9:217:23 | ... |
 | params_flow.rb:228:5:228:11 | call to sink | params_flow.rb:217:9:217:23 | yield ... |
+| params_flow.rb:228:5:228:11 | call to sink | params_flow.rb:223:9:223:13 | ... |
 | params_flow.rb:228:5:228:11 | call to sink | params_flow.rb:223:9:223:13 | super call to m |
 | params_flow.rb:228:5:228:11 | call to sink | params_flow.rb:227:1:229:3 | call to m |
 | params_flow.rb:228:5:228:11 | call to sink | params_flow.rb:228:5:228:11 | call to sink |
+| params_flow.rb:228:5:228:11 | call to sink | params_flow.rb:228:5:228:31 | ... |
 | params_flow.rb:228:5:228:11 | synthetic splat argument | params_flow.rb:228:5:228:11 | synthetic splat argument |
 forwardButNoBackwardFlow
 backwardButNoForwardFlow
diff --git a/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.expected b/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.expected
index 7b308c6816cd..bfecc4ec629d 100644
--- a/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.expected
+++ b/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.expected
@@ -360,9 +360,11 @@ trackEnd
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:2:16:2:18 | val |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:2:16:2:18 | val |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:2:16:2:18 | val |
+| type_tracker.rb:2:16:2:18 | val | type_tracker.rb:3:9:4:20 | ... |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:3:14:3:23 | call to field |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:4:9:4:20 | ... = ... |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:4:18:4:20 | val |
+| type_tracker.rb:2:16:2:18 | val | type_tracker.rb:8:9:8:14 | ... |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:8:9:8:14 | @field |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:14:5:14:13 | call to field= |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:15:10:15:18 | call to field |
@@ -377,6 +379,7 @@ trackEnd
 | type_tracker.rb:7:5:9:7 | self in field | type_tracker.rb:7:5:9:7 | self in field |
 | type_tracker.rb:7:5:9:7 | self in field | type_tracker.rb:8:9:8:14 | self |
 | type_tracker.rb:8:9:8:14 | @field | type_tracker.rb:3:14:3:23 | call to field |
+| type_tracker.rb:8:9:8:14 | @field | type_tracker.rb:8:9:8:14 | ... |
 | type_tracker.rb:8:9:8:14 | @field | type_tracker.rb:8:9:8:14 | @field |
 | type_tracker.rb:8:9:8:14 | @field | type_tracker.rb:15:10:15:18 | call to field |
 | type_tracker.rb:12:1:16:3 | &block | type_tracker.rb:12:1:16:3 | &block |
@@ -408,8 +411,10 @@ trackEnd
 | type_tracker.rb:14:5:14:13 | synthetic splat argument | type_tracker.rb:14:5:14:13 | synthetic splat argument |
 | type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:2:16:2:18 | val |
 | type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:2:16:2:18 | val |
+| type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:3:9:4:20 | ... |
 | type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:4:9:4:20 | ... = ... |
 | type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:4:18:4:20 | val |
+| type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:8:9:8:14 | ... |
 | type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:8:9:8:14 | @field |
 | type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:14:5:14:13 | __synth__0 |
 | type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:14:5:14:13 | call to field= |
@@ -419,6 +424,7 @@ trackEnd
 | type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:14:17:14:23 | __synth__0 |
 | type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:15:10:15:18 | call to field |
 | type_tracker.rb:14:17:14:23 | __synth__0 | type_tracker.rb:14:17:14:23 | __synth__0 |
+| type_tracker.rb:15:5:15:18 | call to puts | type_tracker.rb:13:5:15:18 | ... |
 | type_tracker.rb:15:5:15:18 | call to puts | type_tracker.rb:15:5:15:18 | call to puts |
 | type_tracker.rb:15:5:15:18 | synthetic splat argument | type_tracker.rb:15:5:15:18 | synthetic splat argument |
 | type_tracker.rb:15:10:15:18 | call to field | type_tracker.rb:15:10:15:18 | call to field |
@@ -439,6 +445,7 @@ trackEnd
 | type_tracker.rb:18:20:18:21 | p2 | type_tracker.rb:20:10:20:11 | p2 |
 | type_tracker.rb:19:5:19:11 | call to puts | type_tracker.rb:19:5:19:11 | call to puts |
 | type_tracker.rb:19:5:19:11 | synthetic splat argument | type_tracker.rb:19:5:19:11 | synthetic splat argument |
+| type_tracker.rb:20:5:20:11 | call to puts | type_tracker.rb:19:5:20:11 | ... |
 | type_tracker.rb:20:5:20:11 | call to puts | type_tracker.rb:20:5:20:11 | call to puts |
 | type_tracker.rb:20:5:20:11 | call to puts | type_tracker.rb:23:1:23:16 | call to positional |
 | type_tracker.rb:20:5:20:11 | synthetic splat argument | type_tracker.rb:20:5:20:11 | synthetic splat argument |
@@ -469,6 +476,7 @@ trackEnd
 | type_tracker.rb:25:18:25:19 | p2 | type_tracker.rb:27:10:27:11 | p2 |
 | type_tracker.rb:26:5:26:11 | call to puts | type_tracker.rb:26:5:26:11 | call to puts |
 | type_tracker.rb:26:5:26:11 | synthetic splat argument | type_tracker.rb:26:5:26:11 | synthetic splat argument |
+| type_tracker.rb:27:5:27:11 | call to puts | type_tracker.rb:26:5:27:11 | ... |
 | type_tracker.rb:27:5:27:11 | call to puts | type_tracker.rb:27:5:27:11 | call to puts |
 | type_tracker.rb:27:5:27:11 | call to puts | type_tracker.rb:30:1:30:21 | call to keyword |
 | type_tracker.rb:27:5:27:11 | call to puts | type_tracker.rb:31:1:31:21 | call to keyword |
@@ -523,6 +531,7 @@ trackEnd
 | type_tracker.rb:34:18:34:20 | obj | type_tracker.rb:34:18:34:20 | obj |
 | type_tracker.rb:34:18:34:20 | obj | type_tracker.rb:34:18:34:20 | obj |
 | type_tracker.rb:34:18:34:20 | obj | type_tracker.rb:34:18:34:20 | obj |
+| type_tracker.rb:34:18:34:20 | obj | type_tracker.rb:35:5:52:13 | ... |
 | type_tracker.rb:34:18:34:20 | obj | type_tracker.rb:35:12:35:14 | obj |
 | type_tracker.rb:34:18:34:20 | obj | type_tracker.rb:36:5:36:10 | ...[...] |
 | type_tracker.rb:34:18:34:20 | obj | type_tracker.rb:39:5:39:12 | __synth__0 |
@@ -679,16 +688,22 @@ trackEnd
 | type_tracker.rb:50:14:50:26 | synthetic splat argument | type_tracker.rb:50:14:50:26 | synthetic splat argument |
 | type_tracker.rb:50:14:50:26 | synthetic splat argument | type_tracker.rb:51:5:51:10 | array4 |
 | type_tracker.rb:50:14:50:26 | synthetic splat argument | type_tracker.rb:52:5:52:10 | array4 |
+| type_tracker.rb:50:15:50:15 | 1 | type_tracker.rb:35:5:52:13 | ... |
 | type_tracker.rb:50:15:50:15 | 1 | type_tracker.rb:50:15:50:15 | 1 |
 | type_tracker.rb:50:15:50:15 | 1 | type_tracker.rb:52:5:52:13 | ...[...] |
+| type_tracker.rb:50:17:50:17 | 2 | type_tracker.rb:35:5:52:13 | ... |
 | type_tracker.rb:50:17:50:17 | 2 | type_tracker.rb:50:17:50:17 | 2 |
 | type_tracker.rb:50:17:50:17 | 2 | type_tracker.rb:52:5:52:13 | ...[...] |
+| type_tracker.rb:50:19:50:19 | 3 | type_tracker.rb:35:5:52:13 | ... |
 | type_tracker.rb:50:19:50:19 | 3 | type_tracker.rb:50:19:50:19 | 3 |
 | type_tracker.rb:50:19:50:19 | 3 | type_tracker.rb:52:5:52:13 | ...[...] |
+| type_tracker.rb:50:21:50:21 | 4 | type_tracker.rb:35:5:52:13 | ... |
 | type_tracker.rb:50:21:50:21 | 4 | type_tracker.rb:50:21:50:21 | 4 |
 | type_tracker.rb:50:21:50:21 | 4 | type_tracker.rb:52:5:52:13 | ...[...] |
+| type_tracker.rb:50:23:50:23 | 5 | type_tracker.rb:35:5:52:13 | ... |
 | type_tracker.rb:50:23:50:23 | 5 | type_tracker.rb:50:23:50:23 | 5 |
 | type_tracker.rb:50:23:50:23 | 5 | type_tracker.rb:52:5:52:13 | ...[...] |
+| type_tracker.rb:50:25:50:25 | 6 | type_tracker.rb:35:5:52:13 | ... |
 | type_tracker.rb:50:25:50:25 | 6 | type_tracker.rb:50:25:50:25 | 6 |
 | type_tracker.rb:50:25:50:25 | 6 | type_tracker.rb:52:5:52:13 | ...[...] |
 | type_tracker.rb:51:5:51:10 | [post] array4 | type_tracker.rb:51:5:51:10 | [post] array4 |
@@ -696,6 +711,7 @@ trackEnd
 | type_tracker.rb:51:5:51:13 | call to []= | type_tracker.rb:51:5:51:13 | call to []= |
 | type_tracker.rb:51:5:51:13 | synthetic splat argument | type_tracker.rb:51:5:51:13 | synthetic splat argument |
 | type_tracker.rb:51:17:51:19 | __synth__0 | type_tracker.rb:51:17:51:19 | __synth__0 |
+| type_tracker.rb:52:5:52:13 | ...[...] | type_tracker.rb:35:5:52:13 | ... |
 | type_tracker.rb:52:5:52:13 | ...[...] | type_tracker.rb:52:5:52:13 | ...[...] |
 | type_tracker.rb:52:5:52:13 | synthetic splat argument | type_tracker.rb:52:5:52:13 | synthetic splat argument |
 forwardButNoBackwardFlow
diff --git a/ruby/ql/test/library-tests/frameworks/active_record/ActiveRecord.expected b/ruby/ql/test/library-tests/frameworks/active_record/ActiveRecord.expected
index 6b6fdbf22fac..1a78fc816ad9 100644
--- a/ruby/ql/test/library-tests/frameworks/active_record/ActiveRecord.expected
+++ b/ruby/ql/test/library-tests/frameworks/active_record/ActiveRecord.expected
@@ -7,8 +7,10 @@ activeRecordModelClasses
 | associations.rb:11:1:13:3 | Tag |
 | associations.rb:15:1:17:3 | Comment |
 activeRecordInstances
+| ActiveRecord.rb:9:5:9:68 | ... |
 | ActiveRecord.rb:9:5:9:68 | call to find |
 | ActiveRecord.rb:13:5:13:40 | call to find_by |
+| ActiveRecord.rb:13:5:13:46 | ... |
 | ActiveRecord.rb:13:5:13:46 | call to users |
 | ActiveRecord.rb:16:3:31:5 | self (exec) |
 | ActiveRecord.rb:16:3:31:5 | self in exec |
@@ -28,14 +30,19 @@ activeRecordInstances
 | ActiveRecord.rb:30:5:30:14 | self |
 | ActiveRecord.rb:52:5:52:51 | call to authenticate |
 | ActiveRecord.rb:53:5:53:30 | call to find_by_name |
+| ActiveRecord.rb:67:5:79:34 | ... |
 | ActiveRecord.rb:72:5:74:7 | if ... |
 | ActiveRecord.rb:72:43:73:40 | then ... |
 | ActiveRecord.rb:73:7:73:40 | call to find_by |
 | ActiveRecord.rb:77:5:77:33 | call to find_by |
 | ActiveRecord.rb:79:5:79:34 | call to find |
+| ActiveRecord.rb:89:5:89:24 | ... |
 | ActiveRecord.rb:89:5:89:24 | call to create |
+| ActiveRecord.rb:93:5:93:66 | ... |
 | ActiveRecord.rb:93:5:93:66 | call to create |
+| ActiveRecord.rb:97:5:97:68 | ... |
 | ActiveRecord.rb:97:5:97:68 | call to create |
+| ActiveRecord.rb:101:5:101:16 | ... |
 | ActiveRecord.rb:101:5:101:16 | call to create |
 | associations.rb:19:1:19:7 | author1 |
 | associations.rb:19:1:19:20 | ... = ... |
diff --git a/ruby/ql/test/library-tests/frameworks/grape/Flow.expected b/ruby/ql/test/library-tests/frameworks/grape/Flow.expected
index f04bd930ea97..23f8d78bb053 100644
--- a/ruby/ql/test/library-tests/frameworks/grape/Flow.expected
+++ b/ruby/ql/test/library-tests/frameworks/grape/Flow.expected
@@ -33,6 +33,8 @@ edges
 | app.rb:169:9:169:15 | session | app.rb:176:14:176:20 | session | provenance |  |
 | app.rb:169:19:169:25 | call to cookies | app.rb:169:19:169:38 | ...[...] | provenance |  |
 | app.rb:169:19:169:38 | ...[...] | app.rb:169:9:169:15 | session | provenance |  |
+| app.rb:170:9:170:17 | body_data | app.rb:177:14:177:22 | body_data | provenance |  |
+| app.rb:170:21:170:37 | call to read | app.rb:170:9:170:17 | body_data | provenance |  |
 | app.rb:183:9:183:14 | result | app.rb:184:14:184:19 | result | provenance |  |
 | app.rb:183:9:183:14 | result | app.rb:184:14:184:19 | result | provenance |  |
 | app.rb:183:18:183:43 | call to vulnerable_helper | app.rb:183:9:183:14 | result | provenance |  |
@@ -76,6 +78,24 @@ edges
 | app.rb:235:13:235:23 | case_result | app.rb:236:18:236:28 | case_result | provenance |  |
 | app.rb:235:27:235:37 | call to test_helper | app.rb:235:13:235:23 | case_result | provenance |  |
 | app.rb:235:27:235:37 | call to test_helper | app.rb:235:13:235:23 | case_result | provenance |  |
+| app.rb:247:5:247:13 | body_data | app.rb:248:10:248:18 | body_data | provenance |  |
+| app.rb:247:17:247:33 | call to read | app.rb:247:5:247:13 | body_data | provenance |  |
+| app.rb:252:5:252:13 | body_data | app.rb:253:10:253:18 | body_data | provenance |  |
+| app.rb:252:17:252:35 | call to string | app.rb:252:5:252:13 | body_data | provenance |  |
+| app.rb:257:5:257:15 | params_hash | app.rb:258:10:258:20 | params_hash | provenance |  |
+| app.rb:257:19:257:32 | call to params | app.rb:257:5:257:15 | params_hash | provenance |  |
+| app.rb:262:5:262:14 | get_params | app.rb:263:10:263:19 | get_params | provenance |  |
+| app.rb:262:18:262:28 | call to GET | app.rb:262:5:262:14 | get_params | provenance |  |
+| app.rb:267:5:267:15 | post_params | app.rb:268:10:268:20 | post_params | provenance |  |
+| app.rb:267:19:267:30 | call to POST | app.rb:267:5:267:15 | post_params | provenance |  |
+| app.rb:272:5:272:15 | cookie_data | app.rb:273:10:273:20 | cookie_data | provenance |  |
+| app.rb:272:19:272:33 | call to cookies | app.rb:272:5:272:15 | cookie_data | provenance |  |
+| app.rb:277:5:277:12 | env_data | app.rb:278:10:278:17 | env_data | provenance |  |
+| app.rb:277:16:277:26 | call to env | app.rb:277:5:277:12 | env_data | provenance |  |
+| app.rb:282:5:282:6 | qs | app.rb:283:10:283:11 | qs | provenance |  |
+| app.rb:282:10:282:29 | call to query_string | app.rb:282:5:282:6 | qs | provenance |  |
+| app.rb:287:5:287:8 | path | app.rb:288:10:288:13 | path | provenance |  |
+| app.rb:287:12:287:28 | call to path_info | app.rb:287:5:287:8 | path | provenance |  |
 nodes
 | app.rb:103:13:103:18 | call to params | semmle.label | call to params |
 | app.rb:103:13:103:70 | call to select | semmle.label | call to select |
@@ -107,10 +127,13 @@ nodes
 | app.rb:169:9:169:15 | session | semmle.label | session |
 | app.rb:169:19:169:25 | call to cookies | semmle.label | call to cookies |
 | app.rb:169:19:169:38 | ...[...] | semmle.label | ...[...] |
+| app.rb:170:9:170:17 | body_data | semmle.label | body_data |
+| app.rb:170:21:170:37 | call to read | semmle.label | call to read |
 | app.rb:173:14:173:20 | user_id | semmle.label | user_id |
 | app.rb:174:14:174:21 | route_id | semmle.label | route_id |
 | app.rb:175:14:175:17 | auth | semmle.label | auth |
 | app.rb:176:14:176:20 | session | semmle.label | session |
+| app.rb:177:14:177:22 | body_data | semmle.label | body_data |
 | app.rb:183:9:183:14 | result | semmle.label | result |
 | app.rb:183:9:183:14 | result | semmle.label | result |
 | app.rb:183:18:183:43 | call to vulnerable_helper | semmle.label | call to vulnerable_helper |
@@ -173,6 +196,33 @@ nodes
 | app.rb:235:27:235:37 | call to test_helper | semmle.label | call to test_helper |
 | app.rb:236:18:236:28 | case_result | semmle.label | case_result |
 | app.rb:236:18:236:28 | case_result | semmle.label | case_result |
+| app.rb:247:5:247:13 | body_data | semmle.label | body_data |
+| app.rb:247:17:247:33 | call to read | semmle.label | call to read |
+| app.rb:248:10:248:18 | body_data | semmle.label | body_data |
+| app.rb:252:5:252:13 | body_data | semmle.label | body_data |
+| app.rb:252:17:252:35 | call to string | semmle.label | call to string |
+| app.rb:253:10:253:18 | body_data | semmle.label | body_data |
+| app.rb:257:5:257:15 | params_hash | semmle.label | params_hash |
+| app.rb:257:19:257:32 | call to params | semmle.label | call to params |
+| app.rb:258:10:258:20 | params_hash | semmle.label | params_hash |
+| app.rb:262:5:262:14 | get_params | semmle.label | get_params |
+| app.rb:262:18:262:28 | call to GET | semmle.label | call to GET |
+| app.rb:263:10:263:19 | get_params | semmle.label | get_params |
+| app.rb:267:5:267:15 | post_params | semmle.label | post_params |
+| app.rb:267:19:267:30 | call to POST | semmle.label | call to POST |
+| app.rb:268:10:268:20 | post_params | semmle.label | post_params |
+| app.rb:272:5:272:15 | cookie_data | semmle.label | cookie_data |
+| app.rb:272:19:272:33 | call to cookies | semmle.label | call to cookies |
+| app.rb:273:10:273:20 | cookie_data | semmle.label | cookie_data |
+| app.rb:277:5:277:12 | env_data | semmle.label | env_data |
+| app.rb:277:16:277:26 | call to env | semmle.label | call to env |
+| app.rb:278:10:278:17 | env_data | semmle.label | env_data |
+| app.rb:282:5:282:6 | qs | semmle.label | qs |
+| app.rb:282:10:282:29 | call to query_string | semmle.label | call to query_string |
+| app.rb:283:10:283:11 | qs | semmle.label | qs |
+| app.rb:287:5:287:8 | path | semmle.label | path |
+| app.rb:287:12:287:28 | call to path_info | semmle.label | call to path_info |
+| app.rb:288:10:288:13 | path | semmle.label | path |
 subpaths
 testFailures
 #select
@@ -180,6 +230,7 @@ testFailures
 | app.rb:174:14:174:21 | route_id | app.rb:167:20:167:40 | call to route_param | app.rb:174:14:174:21 | route_id | $@ | app.rb:167:20:167:40 | call to route_param | call to route_param |
 | app.rb:175:14:175:17 | auth | app.rb:168:16:168:22 | call to headers | app.rb:175:14:175:17 | auth | $@ | app.rb:168:16:168:22 | call to headers | call to headers |
 | app.rb:176:14:176:20 | session | app.rb:169:19:169:25 | call to cookies | app.rb:176:14:176:20 | session | $@ | app.rb:169:19:169:25 | call to cookies | call to cookies |
+| app.rb:177:14:177:22 | body_data | app.rb:170:21:170:37 | call to read | app.rb:177:14:177:22 | body_data | $@ | app.rb:170:21:170:37 | call to read | call to read |
 | app.rb:184:14:184:19 | result | app.rb:107:13:107:32 | call to source | app.rb:184:14:184:19 | result | $@ | app.rb:107:13:107:32 | call to source | call to source |
 | app.rb:184:14:184:19 | result | app.rb:107:13:107:32 | call to source | app.rb:184:14:184:19 | result | $@ | app.rb:107:13:107:32 | call to source | call to source |
 | app.rb:191:14:191:22 | user_data | app.rb:103:13:103:18 | call to params | app.rb:191:14:191:22 | user_data | $@ | app.rb:103:13:103:18 | call to params | call to params |
@@ -199,3 +250,12 @@ testFailures
 | app.rb:231:14:231:26 | rescue_result | app.rb:140:17:140:37 | call to source | app.rb:231:14:231:26 | rescue_result | $@ | app.rb:140:17:140:37 | call to source | call to source |
 | app.rb:236:18:236:28 | case_result | app.rb:150:17:150:35 | call to source | app.rb:236:18:236:28 | case_result | $@ | app.rb:150:17:150:35 | call to source | call to source |
 | app.rb:236:18:236:28 | case_result | app.rb:150:17:150:35 | call to source | app.rb:236:18:236:28 | case_result | $@ | app.rb:150:17:150:35 | call to source | call to source |
+| app.rb:248:10:248:18 | body_data | app.rb:247:17:247:33 | call to read | app.rb:248:10:248:18 | body_data | $@ | app.rb:247:17:247:33 | call to read | call to read |
+| app.rb:253:10:253:18 | body_data | app.rb:252:17:252:35 | call to string | app.rb:253:10:253:18 | body_data | $@ | app.rb:252:17:252:35 | call to string | call to string |
+| app.rb:258:10:258:20 | params_hash | app.rb:257:19:257:32 | call to params | app.rb:258:10:258:20 | params_hash | $@ | app.rb:257:19:257:32 | call to params | call to params |
+| app.rb:263:10:263:19 | get_params | app.rb:262:18:262:28 | call to GET | app.rb:263:10:263:19 | get_params | $@ | app.rb:262:18:262:28 | call to GET | call to GET |
+| app.rb:268:10:268:20 | post_params | app.rb:267:19:267:30 | call to POST | app.rb:268:10:268:20 | post_params | $@ | app.rb:267:19:267:30 | call to POST | call to POST |
+| app.rb:273:10:273:20 | cookie_data | app.rb:272:19:272:33 | call to cookies | app.rb:273:10:273:20 | cookie_data | $@ | app.rb:272:19:272:33 | call to cookies | call to cookies |
+| app.rb:278:10:278:17 | env_data | app.rb:277:16:277:26 | call to env | app.rb:278:10:278:17 | env_data | $@ | app.rb:277:16:277:26 | call to env | call to env |
+| app.rb:283:10:283:11 | qs | app.rb:282:10:282:29 | call to query_string | app.rb:283:10:283:11 | qs | $@ | app.rb:282:10:282:29 | call to query_string | call to query_string |
+| app.rb:288:10:288:13 | path | app.rb:287:12:287:28 | call to path_info | app.rb:288:10:288:13 | path | $@ | app.rb:287:12:287:28 | call to path_info | call to path_info |
diff --git a/ruby/ql/test/library-tests/frameworks/grape/Grape.expected b/ruby/ql/test/library-tests/frameworks/grape/Grape.expected
index 7088eeb9018a..778eeb050849 100644
--- a/ruby/ql/test/library-tests/frameworks/grape/Grape.expected
+++ b/ruby/ql/test/library-tests/frameworks/grape/Grape.expected
@@ -2,6 +2,7 @@ grapeApiClasses
 | app.rb:1:1:90:3 | MyAPI |
 | app.rb:92:1:96:3 | AdminAPI |
 | app.rb:98:1:239:3 | UserAPI |
+| app.rb:243:1:290:3 | RequestAccessorsAPI |
 grapeEndpoints
 | app.rb:1:1:90:3 | MyAPI | app.rb:7:3:11:5 | call to get | GET | /hello/:name |
 | app.rb:1:1:90:3 | MyAPI | app.rb:17:3:20:5 | call to post | POST | /messages |
@@ -19,6 +20,15 @@ grapeEndpoints
 | app.rb:98:1:239:3 | UserAPI | app.rb:187:5:193:7 | call to post | POST | /users |
 | app.rb:98:1:239:3 | UserAPI | app.rb:204:5:207:7 | call to post | POST | /users |
 | app.rb:98:1:239:3 | UserAPI | app.rb:210:5:238:7 | call to get | GET | /nested_test/:token |
+| app.rb:243:1:290:3 | RequestAccessorsAPI | app.rb:246:3:249:5 | call to get | GET | /body_read_test |
+| app.rb:243:1:290:3 | RequestAccessorsAPI | app.rb:251:3:254:5 | call to get | GET | /body_string_test |
+| app.rb:243:1:290:3 | RequestAccessorsAPI | app.rb:256:3:259:5 | call to get | GET | /request_params_test |
+| app.rb:243:1:290:3 | RequestAccessorsAPI | app.rb:261:3:264:5 | call to get | GET | /request_get_test |
+| app.rb:243:1:290:3 | RequestAccessorsAPI | app.rb:266:3:269:5 | call to get | GET | /request_post_test |
+| app.rb:243:1:290:3 | RequestAccessorsAPI | app.rb:271:3:274:5 | call to get | GET | /request_cookies_test |
+| app.rb:243:1:290:3 | RequestAccessorsAPI | app.rb:276:3:279:5 | call to get | GET | /request_env_test |
+| app.rb:243:1:290:3 | RequestAccessorsAPI | app.rb:281:3:284:5 | call to get | GET | /request_query_string_test |
+| app.rb:243:1:290:3 | RequestAccessorsAPI | app.rb:286:3:289:5 | call to get | GET | /request_path_info_test |
 grapeParams
 | app.rb:8:12:8:17 | call to params |
 | app.rb:14:3:16:5 | call to params |
@@ -44,6 +54,15 @@ grapeHeaders
 grapeRequest
 | app.rb:25:12:25:18 | call to request |
 | app.rb:170:21:170:27 | call to request |
+| app.rb:247:17:247:23 | call to request |
+| app.rb:252:17:252:23 | call to request |
+| app.rb:257:19:257:25 | call to request |
+| app.rb:262:18:262:24 | call to request |
+| app.rb:267:19:267:25 | call to request |
+| app.rb:272:19:272:25 | call to request |
+| app.rb:277:16:277:22 | call to request |
+| app.rb:282:10:282:16 | call to request |
+| app.rb:287:12:287:18 | call to request |
 grapeRouteParam
 | app.rb:51:15:51:35 | call to route_param |
 | app.rb:52:15:52:36 | call to route_param |
@@ -56,3 +75,23 @@ grapeCookies
 | app.rb:80:16:80:22 | call to cookies |
 | app.rb:160:5:162:7 | call to cookies |
 | app.rb:169:19:169:25 | call to cookies |
+grapeRequestBodyRead
+| app.rb:25:12:25:28 | call to read | body |
+| app.rb:170:21:170:37 | call to read | body |
+| app.rb:247:17:247:33 | call to read | body |
+grapeRequestBodyString
+| app.rb:252:17:252:35 | call to string | body |
+grapeRequestParams
+| app.rb:257:19:257:32 | call to params | parameter |
+grapeRequestGet
+| app.rb:262:18:262:28 | call to GET | parameter |
+grapeRequestPost
+| app.rb:267:19:267:30 | call to POST | body |
+grapeRequestCookies
+| app.rb:272:19:272:33 | call to cookies | cookie |
+grapeRequestEnv
+| app.rb:277:16:277:26 | call to env | parameter |
+grapeRequestQueryString
+| app.rb:282:10:282:29 | call to query_string | parameter |
+grapeRequestPathInfo
+| app.rb:287:12:287:28 | call to path_info | url |
diff --git a/ruby/ql/test/library-tests/frameworks/grape/Grape.ql b/ruby/ql/test/library-tests/frameworks/grape/Grape.ql
index 63cd15a547e1..01d9b5095f53 100644
--- a/ruby/ql/test/library-tests/frameworks/grape/Grape.ql
+++ b/ruby/ql/test/library-tests/frameworks/grape/Grape.ql
@@ -22,3 +22,39 @@ query predicate grapeRequest(Grape::GrapeRequestSource request) { any() }
 query predicate grapeRouteParam(Grape::GrapeRouteParamSource routeParam) { any() }
 
 query predicate grapeCookies(Grape::GrapeCookiesSource cookies) { any() }
+
+query predicate grapeRequestBodyRead(Grape::GrapeRequestBodyReadSource src, string kind) {
+  kind = src.getKind()
+}
+
+query predicate grapeRequestBodyString(Grape::GrapeRequestBodyStringSource src, string kind) {
+  kind = src.getKind()
+}
+
+query predicate grapeRequestParams(Grape::GrapeRequestParamsSource src, string kind) {
+  kind = src.getKind()
+}
+
+query predicate grapeRequestGet(Grape::GrapeRequestGetSource src, string kind) {
+  kind = src.getKind()
+}
+
+query predicate grapeRequestPost(Grape::GrapeRequestPostSource src, string kind) {
+  kind = src.getKind()
+}
+
+query predicate grapeRequestCookies(Grape::GrapeRequestCookiesSource src, string kind) {
+  kind = src.getKind()
+}
+
+query predicate grapeRequestEnv(Grape::GrapeRequestEnvSource src, string kind) {
+  kind = src.getKind()
+}
+
+query predicate grapeRequestQueryString(Grape::GrapeRequestQueryStringSource src, string kind) {
+  kind = src.getKind()
+}
+
+query predicate grapeRequestPathInfo(Grape::GrapeRequestPathInfoSource src, string kind) {
+  kind = src.getKind()
+}
diff --git a/ruby/ql/test/library-tests/frameworks/grape/app.rb b/ruby/ql/test/library-tests/frameworks/grape/app.rb
index 1b1fd15d5d8c..4148e9256768 100644
--- a/ruby/ql/test/library-tests/frameworks/grape/app.rb
+++ b/ruby/ql/test/library-tests/frameworks/grape/app.rb
@@ -174,7 +174,7 @@ def test_helper
         sink route_id # $ hasTaintFlow
         sink auth # $ hasTaintFlow
         sink session # $ hasTaintFlow
-        # Note: request.body.read may not be detected by this flow test config
+        sink body_data # $ hasTaintFlow
     end
 
     get '/helper_test/:user_id' do
@@ -237,3 +237,54 @@ def test_helper
         end
     end
 end
+
+# Exercises `request` sub-accessors (body, params, GET, POST, cookies, env,
+# query_string, path_info) as remote flow sources.
+class RequestAccessorsAPI < Grape::API
+  format :json
+
+  get '/body_read_test' do
+    body_data = request.body.read
+    sink body_data # $ hasTaintFlow
+  end
+
+  get '/body_string_test' do
+    body_data = request.body.string
+    sink body_data # $ hasTaintFlow
+  end
+
+  get '/request_params_test' do
+    params_hash = request.params
+    sink params_hash # $ hasTaintFlow
+  end
+
+  get '/request_get_test' do
+    get_params = request.GET
+    sink get_params # $ hasTaintFlow
+  end
+
+  get '/request_post_test' do
+    post_params = request.POST
+    sink post_params # $ hasTaintFlow
+  end
+
+  get '/request_cookies_test' do
+    cookie_data = request.cookies
+    sink cookie_data # $ hasTaintFlow
+  end
+
+  get '/request_env_test' do
+    env_data = request.env
+    sink env_data # $ hasTaintFlow
+  end
+
+  get '/request_query_string_test' do
+    qs = request.query_string
+    sink qs # $ hasTaintFlow
+  end
+
+  get '/request_path_info_test' do
+    path = request.path_info
+    sink path # $ hasTaintFlow
+  end
+end
diff --git a/ruby/ql/test/library-tests/variables/ssa.expected b/ruby/ql/test/library-tests/variables/ssa.expected
index 69222157b05a..7fb3c27be81c 100644
--- a/ruby/ql/test/library-tests/variables/ssa.expected
+++ b/ruby/ql/test/library-tests/variables/ssa.expected
@@ -38,7 +38,7 @@ definition
 | nested_scopes.rb:22:9:24:11 | self (show_a2) | nested_scopes.rb:22:9:24:11 | self |
 | nested_scopes.rb:22:21:22:21 | a | nested_scopes.rb:22:21:22:21 | a |
 | nested_scopes.rb:27:7:29:9 | self (show) | nested_scopes.rb:27:7:29:9 | self |
-| nested_scopes.rb:30:16:30:19 | self (class << ...) | nested_scopes.rb:30:7:33:9 | self |
+| nested_scopes.rb:30:7:33:9 | self (class << ...) | nested_scopes.rb:30:7:33:9 | self |
 | nested_scopes.rb:31:11:31:11 | a | nested_scopes.rb:31:11:31:11 | a |
 | nested_scopes.rb:40:1:40:1 | d | nested_scopes.rb:40:1:40:1 | d |
 | parameters.rb:1:1:62:1 | self (parameters.rb) | parameters.rb:1:1:62:1 | self |
@@ -81,7 +81,7 @@ definition
 | parameters.rb:54:9:57:3 | <captured entry> x | parameters.rb:53:1:53:1 | x |
 | parameters.rb:54:14:54:14 | y | parameters.rb:54:14:54:14 | y |
 | parameters.rb:54:19:54:19 | x | parameters.rb:53:1:53:1 | x |
-| parameters.rb:55:4:55:9 | phi | parameters.rb:53:1:53:1 | x |
+| parameters.rb:55:4:56:9 | phi | parameters.rb:53:1:53:1 | x |
 | parameters.rb:59:1:61:3 | self (tuples_nested) | parameters.rb:59:1:61:3 | self |
 | parameters.rb:59:20:59:20 | a | parameters.rb:59:20:59:20 | a |
 | parameters.rb:59:23:59:23 | b | parameters.rb:59:23:59:23 | b |
@@ -99,11 +99,15 @@ definition
 | scopes.rb:13:11:13:11 | c | scopes.rb:13:11:13:11 | c |
 | scopes.rb:13:14:13:14 | d | scopes.rb:13:14:13:14 | d |
 | scopes.rb:13:19:13:32 | __synth__3 | scopes.rb:13:4:13:32 | __synth__3 |
+| scopes.rb:26:1:26:12 | self (A) | scopes.rb:26:1:26:12 | self |
 | scopes.rb:27:1:27:1 | x | scopes.rb:27:1:27:1 | x |
+| scopes.rb:28:1:30:3 | self (B) | scopes.rb:28:1:30:3 | self |
+| scopes.rb:34:1:36:3 | self (C) | scopes.rb:34:1:36:3 | self |
 | scopes.rb:41:1:49:3 | self (M) | scopes.rb:41:1:49:3 | self |
 | scopes.rb:42:2:42:4 | var | scopes.rb:42:2:42:4 | var |
 | scopes.rb:46:5:46:8 | var2 | scopes.rb:46:5:46:8 | var2 |
 | scopes.rb:51:1:64:3 | self (ExceptionVariable) | scopes.rb:51:1:64:3 | self |
+| scopes.rb:52:3:53:5 | self (MyException) | scopes.rb:52:3:53:5 | self |
 | scopes.rb:55:3:55:3 | x | scopes.rb:55:3:55:3 | x |
 | scopes.rb:60:25:60:25 | x | scopes.rb:55:3:55:3 | x |
 | scopes.rb:66:1:73:3 | self (ParameterShadowing) | scopes.rb:66:1:73:3 | self |
@@ -125,7 +129,7 @@ definition
 | ssa.rb:10:5:10:5 | i | ssa.rb:2:3:2:3 | i |
 | ssa.rb:18:1:23:3 | self (m1) | ssa.rb:18:1:23:3 | self |
 | ssa.rb:18:8:18:8 | x | ssa.rb:18:8:18:8 | x |
-| ssa.rb:19:9:19:9 | phi | ssa.rb:18:8:18:8 | x |
+| ssa.rb:19:3:22:5 | phi | ssa.rb:18:8:18:8 | x |
 | ssa.rb:21:5:21:5 | x | ssa.rb:18:8:18:8 | x |
 | ssa.rb:25:1:30:3 | <uninitialized> elem | ssa.rb:26:7:26:10 | elem |
 | ssa.rb:25:1:30:3 | self (m2) | ssa.rb:25:1:30:3 | self |
@@ -227,7 +231,7 @@ read
 | nested_scopes.rb:22:21:22:21 | a | nested_scopes.rb:22:21:22:21 | a | nested_scopes.rb:23:16:23:16 | a |
 | nested_scopes.rb:27:7:29:9 | self (show) | nested_scopes.rb:27:7:29:9 | self | nested_scopes.rb:28:11:28:16 | self |
 | nested_scopes.rb:27:7:29:9 | self (show) | nested_scopes.rb:27:7:29:9 | self | nested_scopes.rb:28:16:28:16 | self |
-| nested_scopes.rb:30:16:30:19 | self (class << ...) | nested_scopes.rb:30:7:33:9 | self | nested_scopes.rb:32:11:32:16 | self |
+| nested_scopes.rb:30:7:33:9 | self (class << ...) | nested_scopes.rb:30:7:33:9 | self | nested_scopes.rb:32:11:32:16 | self |
 | nested_scopes.rb:31:11:31:11 | a | nested_scopes.rb:31:11:31:11 | a | nested_scopes.rb:32:16:32:16 | a |
 | nested_scopes.rb:40:1:40:1 | d | nested_scopes.rb:40:1:40:1 | d | nested_scopes.rb:41:1:41:1 | d |
 | parameters.rb:1:9:5:3 | <captured entry> self | parameters.rb:1:1:62:1 | self | parameters.rb:3:4:3:9 | self |
@@ -268,7 +272,7 @@ read
 | parameters.rb:54:9:57:3 | <captured entry> self | parameters.rb:1:1:62:1 | self | parameters.rb:55:4:55:9 | self |
 | parameters.rb:54:9:57:3 | <captured entry> self | parameters.rb:1:1:62:1 | self | parameters.rb:56:4:56:9 | self |
 | parameters.rb:54:14:54:14 | y | parameters.rb:54:14:54:14 | y | parameters.rb:56:9:56:9 | y |
-| parameters.rb:55:4:55:9 | phi | parameters.rb:53:1:53:1 | x | parameters.rb:55:9:55:9 | x |
+| parameters.rb:55:4:56:9 | phi | parameters.rb:53:1:53:1 | x | parameters.rb:55:9:55:9 | x |
 | parameters.rb:59:1:61:3 | self (tuples_nested) | parameters.rb:59:1:61:3 | self | parameters.rb:60:3:60:23 | self |
 | parameters.rb:59:20:59:20 | a | parameters.rb:59:20:59:20 | a | parameters.rb:60:11:60:11 | a |
 | parameters.rb:59:23:59:23 | b | parameters.rb:59:23:59:23 | b | parameters.rb:60:16:60:16 | b |
@@ -339,9 +343,9 @@ read
 | ssa.rb:10:5:10:5 | i | ssa.rb:2:3:2:3 | i | ssa.rb:11:10:11:10 | i |
 | ssa.rb:10:5:10:5 | i | ssa.rb:2:3:2:3 | i | ssa.rb:12:10:12:10 | i |
 | ssa.rb:18:1:23:3 | self (m1) | ssa.rb:18:1:23:3 | self | ssa.rb:20:5:20:10 | self |
-| ssa.rb:19:9:19:9 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:19:9:19:9 | x |
-| ssa.rb:19:9:19:9 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:20:10:20:10 | x |
-| ssa.rb:19:9:19:9 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:21:5:21:5 | x |
+| ssa.rb:19:3:22:5 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:19:9:19:9 | x |
+| ssa.rb:19:3:22:5 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:20:10:20:10 | x |
+| ssa.rb:19:3:22:5 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:21:5:21:5 | x |
 | ssa.rb:25:1:30:3 | <uninitialized> elem | ssa.rb:26:7:26:10 | elem | ssa.rb:26:7:26:10 | elem |
 | ssa.rb:25:1:30:3 | self (m2) | ssa.rb:25:1:30:3 | self | ssa.rb:29:3:29:11 | self |
 | ssa.rb:25:8:25:15 | elements | ssa.rb:25:8:25:15 | elements | ssa.rb:26:15:26:22 | elements |
@@ -430,7 +434,7 @@ firstRead
 | nested_scopes.rb:22:9:24:11 | self (show_a2) | nested_scopes.rb:22:9:24:11 | self | nested_scopes.rb:23:11:23:16 | self |
 | nested_scopes.rb:22:21:22:21 | a | nested_scopes.rb:22:21:22:21 | a | nested_scopes.rb:23:16:23:16 | a |
 | nested_scopes.rb:27:7:29:9 | self (show) | nested_scopes.rb:27:7:29:9 | self | nested_scopes.rb:28:11:28:16 | self |
-| nested_scopes.rb:30:16:30:19 | self (class << ...) | nested_scopes.rb:30:7:33:9 | self | nested_scopes.rb:32:11:32:16 | self |
+| nested_scopes.rb:30:7:33:9 | self (class << ...) | nested_scopes.rb:30:7:33:9 | self | nested_scopes.rb:32:11:32:16 | self |
 | nested_scopes.rb:31:11:31:11 | a | nested_scopes.rb:31:11:31:11 | a | nested_scopes.rb:32:16:32:16 | a |
 | nested_scopes.rb:40:1:40:1 | d | nested_scopes.rb:40:1:40:1 | d | nested_scopes.rb:41:1:41:1 | d |
 | parameters.rb:1:9:5:3 | <captured entry> self | parameters.rb:1:1:62:1 | self | parameters.rb:3:4:3:9 | self |
@@ -467,7 +471,7 @@ firstRead
 | parameters.rb:49:15:49:15 | b | parameters.rb:49:15:49:15 | b | parameters.rb:50:16:50:16 | b |
 | parameters.rb:54:9:57:3 | <captured entry> self | parameters.rb:1:1:62:1 | self | parameters.rb:55:4:55:9 | self |
 | parameters.rb:54:14:54:14 | y | parameters.rb:54:14:54:14 | y | parameters.rb:56:9:56:9 | y |
-| parameters.rb:55:4:55:9 | phi | parameters.rb:53:1:53:1 | x | parameters.rb:55:9:55:9 | x |
+| parameters.rb:55:4:56:9 | phi | parameters.rb:53:1:53:1 | x | parameters.rb:55:9:55:9 | x |
 | parameters.rb:59:1:61:3 | self (tuples_nested) | parameters.rb:59:1:61:3 | self | parameters.rb:60:3:60:23 | self |
 | parameters.rb:59:20:59:20 | a | parameters.rb:59:20:59:20 | a | parameters.rb:60:11:60:11 | a |
 | parameters.rb:59:23:59:23 | b | parameters.rb:59:23:59:23 | b | parameters.rb:60:16:60:16 | b |
@@ -509,7 +513,7 @@ firstRead
 | ssa.rb:6:5:6:5 | i | ssa.rb:2:3:2:3 | i | ssa.rb:7:10:7:10 | i |
 | ssa.rb:10:5:10:5 | i | ssa.rb:2:3:2:3 | i | ssa.rb:11:10:11:10 | i |
 | ssa.rb:18:1:23:3 | self (m1) | ssa.rb:18:1:23:3 | self | ssa.rb:20:5:20:10 | self |
-| ssa.rb:19:9:19:9 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:19:9:19:9 | x |
+| ssa.rb:19:3:22:5 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:19:9:19:9 | x |
 | ssa.rb:25:1:30:3 | <uninitialized> elem | ssa.rb:26:7:26:10 | elem | ssa.rb:26:7:26:10 | elem |
 | ssa.rb:25:1:30:3 | self (m2) | ssa.rb:25:1:30:3 | self | ssa.rb:29:3:29:11 | self |
 | ssa.rb:25:8:25:15 | elements | ssa.rb:25:8:25:15 | elements | ssa.rb:26:15:26:22 | elements |
@@ -605,8 +609,8 @@ adjacentReads
 | ssa.rb:6:5:6:5 | i | ssa.rb:2:3:2:3 | i | ssa.rb:7:10:7:10 | i | ssa.rb:8:10:8:10 | i |
 | ssa.rb:10:5:10:5 | i | ssa.rb:2:3:2:3 | i | ssa.rb:11:10:11:10 | i | ssa.rb:12:10:12:10 | i |
 | ssa.rb:18:1:23:3 | self (m1) | ssa.rb:18:1:23:3 | self | ssa.rb:20:5:20:10 | self | ssa.rb:20:5:20:10 | self |
-| ssa.rb:19:9:19:9 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:19:9:19:9 | x | ssa.rb:20:10:20:10 | x |
-| ssa.rb:19:9:19:9 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:20:10:20:10 | x | ssa.rb:21:5:21:5 | x |
+| ssa.rb:19:3:22:5 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:19:9:19:9 | x | ssa.rb:20:10:20:10 | x |
+| ssa.rb:19:3:22:5 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:20:10:20:10 | x | ssa.rb:21:5:21:5 | x |
 | ssa.rb:38:1:42:3 | self (m4) | ssa.rb:38:1:42:3 | self | ssa.rb:39:3:39:9 | self | ssa.rb:39:8:39:9 | self |
 | ssa.rb:38:1:42:3 | self (m4) | ssa.rb:38:1:42:3 | self | ssa.rb:39:8:39:9 | self | ssa.rb:41:3:41:13 | self |
 | ssa.rb:66:11:70:5 | <captured entry> captured | ssa.rb:65:3:65:10 | captured | ssa.rb:68:10:68:17 | captured | ssa.rb:69:5:69:12 | captured |
@@ -624,12 +628,12 @@ phi
 | parameters.rb:37:3:37:18 | phi | parameters.rb:35:16:35:16 | b | parameters.rb:35:16:35:16 | b |
 | parameters.rb:42:3:42:18 | phi | parameters.rb:40:15:40:15 | e | parameters.rb:40:1:43:3 | <uninitialized> e |
 | parameters.rb:42:3:42:18 | phi | parameters.rb:40:15:40:15 | e | parameters.rb:40:15:40:15 | e |
-| parameters.rb:55:4:55:9 | phi | parameters.rb:53:1:53:1 | x | parameters.rb:54:9:57:3 | <captured entry> x |
-| parameters.rb:55:4:55:9 | phi | parameters.rb:53:1:53:1 | x | parameters.rb:54:19:54:19 | x |
+| parameters.rb:55:4:56:9 | phi | parameters.rb:53:1:53:1 | x | parameters.rb:54:9:57:3 | <captured entry> x |
+| parameters.rb:55:4:56:9 | phi | parameters.rb:53:1:53:1 | x | parameters.rb:54:19:54:19 | x |
 | ssa.rb:5:3:13:5 | phi | ssa.rb:2:3:2:3 | i | ssa.rb:6:5:6:5 | i |
 | ssa.rb:5:3:13:5 | phi | ssa.rb:2:3:2:3 | i | ssa.rb:10:5:10:5 | i |
-| ssa.rb:19:9:19:9 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:18:8:18:8 | x |
-| ssa.rb:19:9:19:9 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:21:5:21:5 | x |
+| ssa.rb:19:3:22:5 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:18:8:18:8 | x |
+| ssa.rb:19:3:22:5 | phi | ssa.rb:18:8:18:8 | x | ssa.rb:21:5:21:5 | x |
 | ssa.rb:26:7:26:10 | phi | ssa.rb:26:7:26:10 | elem | ssa.rb:25:1:30:3 | <uninitialized> elem |
 | ssa.rb:26:7:26:10 | phi | ssa.rb:26:7:26:10 | elem | ssa.rb:26:7:26:10 | elem |
 | ssa.rb:45:3:45:12 | phi | ssa.rb:45:3:45:3 | x | ssa.rb:44:1:47:3 | <uninitialized> x |
@@ -637,28 +641,28 @@ phi
 | ssa.rb:50:3:50:8 | phi | ssa.rb:49:14:49:14 | y | ssa.rb:49:1:51:3 | <uninitialized> y |
 | ssa.rb:50:3:50:8 | phi | ssa.rb:49:14:49:14 | y | ssa.rb:49:14:49:14 | y |
 phiReadNode
-| parameters.rb:26:3:26:11 | SSA phi read(name) | parameters.rb:25:15:25:18 | name |
+| parameters.rb:26:3:27:13 | SSA phi read(name) | parameters.rb:25:15:25:18 | name |
 | ssa.rb:5:3:13:5 | SSA phi read(self) | ssa.rb:1:1:16:3 | self |
-| ssa.rb:19:9:19:9 | SSA phi read(self) | ssa.rb:18:1:23:3 | self |
+| ssa.rb:19:3:22:5 | SSA phi read(self) | ssa.rb:18:1:23:3 | self |
 | ssa.rb:92:3:96:5 | SSA phi read(self) | ssa.rb:90:1:103:3 | self |
 | ssa.rb:92:3:96:5 | SSA phi read(x) | ssa.rb:91:3:91:3 | x |
 | ssa.rb:94:3:95:10 | SSA phi read(self) | ssa.rb:90:1:103:3 | self |
 | ssa.rb:94:3:95:10 | SSA phi read(x) | ssa.rb:91:3:91:3 | x |
 phiReadNodeFirstRead
-| parameters.rb:26:3:26:11 | SSA phi read(name) | parameters.rb:25:15:25:18 | name | parameters.rb:26:8:26:11 | name |
+| parameters.rb:26:3:27:13 | SSA phi read(name) | parameters.rb:25:15:25:18 | name | parameters.rb:26:8:26:11 | name |
 | ssa.rb:5:3:13:5 | SSA phi read(self) | ssa.rb:1:1:16:3 | self | ssa.rb:15:3:15:8 | self |
-| ssa.rb:19:9:19:9 | SSA phi read(self) | ssa.rb:18:1:23:3 | self | ssa.rb:20:5:20:10 | self |
+| ssa.rb:19:3:22:5 | SSA phi read(self) | ssa.rb:18:1:23:3 | self | ssa.rb:20:5:20:10 | self |
 | ssa.rb:92:3:96:5 | SSA phi read(self) | ssa.rb:90:1:103:3 | self | ssa.rb:99:5:99:10 | self |
 | ssa.rb:92:3:96:5 | SSA phi read(self) | ssa.rb:90:1:103:3 | self | ssa.rb:101:5:101:10 | self |
 | ssa.rb:92:3:96:5 | SSA phi read(x) | ssa.rb:91:3:91:3 | x | ssa.rb:99:10:99:10 | x |
 | ssa.rb:92:3:96:5 | SSA phi read(x) | ssa.rb:91:3:91:3 | x | ssa.rb:101:10:101:10 | x |
 phiReadInput
-| parameters.rb:26:3:26:11 | SSA phi read(name) | parameters.rb:25:15:25:18 | name |
-| parameters.rb:26:3:26:11 | SSA phi read(name) | parameters.rb:25:40:25:43 | SSA read(name) |
+| parameters.rb:26:3:27:13 | SSA phi read(name) | parameters.rb:25:15:25:18 | name |
+| parameters.rb:26:3:27:13 | SSA phi read(name) | parameters.rb:25:40:25:43 | SSA read(name) |
 | ssa.rb:5:3:13:5 | SSA phi read(self) | ssa.rb:8:5:8:14 | SSA read(self) |
 | ssa.rb:5:3:13:5 | SSA phi read(self) | ssa.rb:12:5:12:14 | SSA read(self) |
-| ssa.rb:19:9:19:9 | SSA phi read(self) | ssa.rb:18:1:23:3 | self (m1) |
-| ssa.rb:19:9:19:9 | SSA phi read(self) | ssa.rb:20:5:20:10 | SSA read(self) |
+| ssa.rb:19:3:22:5 | SSA phi read(self) | ssa.rb:18:1:23:3 | self (m1) |
+| ssa.rb:19:3:22:5 | SSA phi read(self) | ssa.rb:20:5:20:10 | SSA read(self) |
 | ssa.rb:92:3:96:5 | SSA phi read(self) | ssa.rb:93:5:93:10 | SSA read(self) |
 | ssa.rb:92:3:96:5 | SSA phi read(self) | ssa.rb:94:3:95:10 | SSA phi read(self) |
 | ssa.rb:92:3:96:5 | SSA phi read(x) | ssa.rb:93:10:93:10 | SSA read(x) |
diff --git a/ruby/ql/test/query-tests/security/cwe-089/ConnectedToInjection.rb b/ruby/ql/test/query-tests/security/cwe-089/ConnectedToInjection.rb
new file mode 100644
index 000000000000..4d57fc9bbe93
--- /dev/null
+++ b/ruby/ql/test/query-tests/security/cwe-089/ConnectedToInjection.rb
@@ -0,0 +1,37 @@
+class EventsController < ActionController::Base
+  # BAD: remote input captured by a block is interpolated into raw SQL
+  # executed inside an ActiveRecord `connected_to` role-switch block.
+  def date_range_report
+    lower_bound = params[:lower_bound] # $ Source
+    upper_bound = params[:upper_bound] # $ Source
+
+    ApplicationRecord.connected_to(role: :reading) do
+      ApplicationRecord.connection.execute(
+        "SELECT * FROM events WHERE start_time BETWEEN '#{lower_bound}' AND '#{upper_bound}'" # $ Alert
+      )
+    end
+  end
+
+  # BAD: same pattern with a single captured bound
+  def since_report
+    lower_bound = params[:lower_bound] # $ Source
+
+    ApplicationRecord.connected_to(role: :reading) do
+      ApplicationRecord.connection.execute("SELECT * FROM events WHERE created_at > '#{lower_bound}'") # $ Alert
+    end
+  end
+
+  # BAD: value read inside the block is assigned to an outer-scope variable,
+  # then interpolated into SQL executed after the block returns.
+  def deferred_report
+    lower_bound = params[:lower_bound] # $ Source
+    captured = nil
+
+    ApplicationRecord.connected_to(role: :reading) do
+      captured = lower_bound
+    end
+
+    sql = "SELECT * FROM events WHERE created_at > '#{captured}'"
+    ApplicationRecord.connection.execute(sql) # $ Alert
+  end
+end
diff --git a/ruby/ql/test/query-tests/security/cwe-089/SqlInjection.expected b/ruby/ql/test/query-tests/security/cwe-089/SqlInjection.expected
index c8926f635c47..590f3bfd104d 100644
--- a/ruby/ql/test/query-tests/security/cwe-089/SqlInjection.expected
+++ b/ruby/ql/test/query-tests/security/cwe-089/SqlInjection.expected
@@ -41,6 +41,10 @@
 | ActiveRecordInjection.rb:217:38:217:53 | "role = #{...}" | ActiveRecordInjection.rb:223:29:223:34 | call to params | ActiveRecordInjection.rb:217:38:217:53 | "role = #{...}" | This SQL query depends on a $@. | ActiveRecordInjection.rb:223:29:223:34 | call to params | user-provided value |
 | ArelInjection.rb:6:20:6:61 | "SELECT * FROM users WHERE nam..." | ArelInjection.rb:4:12:4:17 | call to params | ArelInjection.rb:6:20:6:61 | "SELECT * FROM users WHERE nam..." | This SQL query depends on a $@. | ArelInjection.rb:4:12:4:17 | call to params | user-provided value |
 | ArelInjection.rb:7:39:7:80 | "SELECT * FROM users WHERE nam..." | ArelInjection.rb:4:12:4:17 | call to params | ArelInjection.rb:7:39:7:80 | "SELECT * FROM users WHERE nam..." | This SQL query depends on a $@. | ArelInjection.rb:4:12:4:17 | call to params | user-provided value |
+| ConnectedToInjection.rb:10:9:10:93 | "SELECT * FROM events WHERE st..." | ConnectedToInjection.rb:5:19:5:24 | call to params | ConnectedToInjection.rb:10:9:10:93 | "SELECT * FROM events WHERE st..." | This SQL query depends on a $@. | ConnectedToInjection.rb:5:19:5:24 | call to params | user-provided value |
+| ConnectedToInjection.rb:10:9:10:93 | "SELECT * FROM events WHERE st..." | ConnectedToInjection.rb:6:19:6:24 | call to params | ConnectedToInjection.rb:10:9:10:93 | "SELECT * FROM events WHERE st..." | This SQL query depends on a $@. | ConnectedToInjection.rb:6:19:6:24 | call to params | user-provided value |
+| ConnectedToInjection.rb:20:44:20:101 | "SELECT * FROM events WHERE cr..." | ConnectedToInjection.rb:17:19:17:24 | call to params | ConnectedToInjection.rb:20:44:20:101 | "SELECT * FROM events WHERE cr..." | This SQL query depends on a $@. | ConnectedToInjection.rb:17:19:17:24 | call to params | user-provided value |
+| ConnectedToInjection.rb:35:42:35:44 | sql | ConnectedToInjection.rb:27:19:27:24 | call to params | ConnectedToInjection.rb:35:42:35:44 | sql | This SQL query depends on a $@. | ConnectedToInjection.rb:27:19:27:24 | call to params | user-provided value |
 | PgInjection.rb:14:15:14:18 | qry1 | PgInjection.rb:6:12:6:17 | call to params | PgInjection.rb:14:15:14:18 | qry1 | This SQL query depends on a $@. | PgInjection.rb:6:12:6:17 | call to params | user-provided value |
 | PgInjection.rb:15:21:15:24 | qry1 | PgInjection.rb:6:12:6:17 | call to params | PgInjection.rb:15:21:15:24 | qry1 | This SQL query depends on a $@. | PgInjection.rb:6:12:6:17 | call to params | user-provided value |
 | PgInjection.rb:20:22:20:25 | qry2 | PgInjection.rb:6:12:6:17 | call to params | PgInjection.rb:20:22:20:25 | qry2 | This SQL query depends on a $@. | PgInjection.rb:6:12:6:17 | call to params | user-provided value |
@@ -130,6 +134,24 @@ edges
 | ArelInjection.rb:4:5:4:8 | name | ArelInjection.rb:7:39:7:80 | "SELECT * FROM users WHERE nam..." | provenance | AdditionalTaintStep |
 | ArelInjection.rb:4:12:4:17 | call to params | ArelInjection.rb:4:12:4:29 | ...[...] | provenance |  |
 | ArelInjection.rb:4:12:4:29 | ...[...] | ArelInjection.rb:4:5:4:8 | name | provenance |  |
+| ConnectedToInjection.rb:5:19:5:24 | call to params | ConnectedToInjection.rb:5:19:5:38 | ...[...] | provenance |  |
+| ConnectedToInjection.rb:5:19:5:38 | ...[...] | ConnectedToInjection.rb:8:52:12:7 | do ... end : [lambda] [captured lower_bound] | provenance |  |
+| ConnectedToInjection.rb:6:19:6:24 | call to params | ConnectedToInjection.rb:6:19:6:38 | ...[...] | provenance |  |
+| ConnectedToInjection.rb:6:19:6:38 | ...[...] | ConnectedToInjection.rb:8:52:12:7 | do ... end : [lambda] [captured upper_bound] | provenance |  |
+| ConnectedToInjection.rb:8:52:12:7 | do ... end : [lambda] [captured lower_bound] | ConnectedToInjection.rb:10:59:10:69 | lower_bound | provenance | heuristic-callback |
+| ConnectedToInjection.rb:8:52:12:7 | do ... end : [lambda] [captured upper_bound] | ConnectedToInjection.rb:10:80:10:90 | upper_bound | provenance | heuristic-callback |
+| ConnectedToInjection.rb:10:59:10:69 | lower_bound | ConnectedToInjection.rb:10:9:10:93 | "SELECT * FROM events WHERE st..." | provenance | AdditionalTaintStep |
+| ConnectedToInjection.rb:10:80:10:90 | upper_bound | ConnectedToInjection.rb:10:9:10:93 | "SELECT * FROM events WHERE st..." | provenance | AdditionalTaintStep |
+| ConnectedToInjection.rb:17:19:17:24 | call to params | ConnectedToInjection.rb:17:19:17:38 | ...[...] | provenance |  |
+| ConnectedToInjection.rb:17:19:17:38 | ...[...] | ConnectedToInjection.rb:19:52:21:7 | do ... end : [lambda] [captured lower_bound] | provenance |  |
+| ConnectedToInjection.rb:19:52:21:7 | do ... end : [lambda] [captured lower_bound] | ConnectedToInjection.rb:20:88:20:98 | lower_bound | provenance | heuristic-callback |
+| ConnectedToInjection.rb:20:88:20:98 | lower_bound | ConnectedToInjection.rb:20:44:20:101 | "SELECT * FROM events WHERE cr..." | provenance | AdditionalTaintStep |
+| ConnectedToInjection.rb:27:19:27:24 | call to params | ConnectedToInjection.rb:27:19:27:38 | ...[...] | provenance |  |
+| ConnectedToInjection.rb:27:19:27:38 | ...[...] | ConnectedToInjection.rb:30:52:32:7 | do ... end : [lambda] [captured lower_bound] | provenance |  |
+| ConnectedToInjection.rb:30:52:32:7 | [post] do ... end : [lambda] [captured captured] | ConnectedToInjection.rb:34:5:34:7 | sql : String | provenance | AdditionalTaintStep |
+| ConnectedToInjection.rb:30:52:32:7 | do ... end : [lambda] [captured lower_bound] | ConnectedToInjection.rb:30:52:32:7 | [post] do ... end : [lambda] [captured captured] | provenance | heuristic-callback |
+| ConnectedToInjection.rb:30:52:32:7 | do ... end : [lambda] [captured lower_bound] | ConnectedToInjection.rb:31:18:31:28 | lower_bound | provenance | heuristic-callback |
+| ConnectedToInjection.rb:34:5:34:7 | sql : String | ConnectedToInjection.rb:35:42:35:44 | sql | provenance |  |
 | PgInjection.rb:6:5:6:8 | name | PgInjection.rb:13:5:13:8 | qry1 : String | provenance | AdditionalTaintStep |
 | PgInjection.rb:6:5:6:8 | name | PgInjection.rb:19:5:19:8 | qry2 : String | provenance | AdditionalTaintStep |
 | PgInjection.rb:6:5:6:8 | name | PgInjection.rb:31:5:31:8 | qry3 : String | provenance | AdditionalTaintStep |
@@ -258,6 +280,27 @@ nodes
 | ArelInjection.rb:4:12:4:29 | ...[...] | semmle.label | ...[...] |
 | ArelInjection.rb:6:20:6:61 | "SELECT * FROM users WHERE nam..." | semmle.label | "SELECT * FROM users WHERE nam..." |
 | ArelInjection.rb:7:39:7:80 | "SELECT * FROM users WHERE nam..." | semmle.label | "SELECT * FROM users WHERE nam..." |
+| ConnectedToInjection.rb:5:19:5:24 | call to params | semmle.label | call to params |
+| ConnectedToInjection.rb:5:19:5:38 | ...[...] | semmle.label | ...[...] |
+| ConnectedToInjection.rb:6:19:6:24 | call to params | semmle.label | call to params |
+| ConnectedToInjection.rb:6:19:6:38 | ...[...] | semmle.label | ...[...] |
+| ConnectedToInjection.rb:8:52:12:7 | do ... end : [lambda] [captured lower_bound] | semmle.label | do ... end : [lambda] [captured lower_bound] |
+| ConnectedToInjection.rb:8:52:12:7 | do ... end : [lambda] [captured upper_bound] | semmle.label | do ... end : [lambda] [captured upper_bound] |
+| ConnectedToInjection.rb:10:9:10:93 | "SELECT * FROM events WHERE st..." | semmle.label | "SELECT * FROM events WHERE st..." |
+| ConnectedToInjection.rb:10:59:10:69 | lower_bound | semmle.label | lower_bound |
+| ConnectedToInjection.rb:10:80:10:90 | upper_bound | semmle.label | upper_bound |
+| ConnectedToInjection.rb:17:19:17:24 | call to params | semmle.label | call to params |
+| ConnectedToInjection.rb:17:19:17:38 | ...[...] | semmle.label | ...[...] |
+| ConnectedToInjection.rb:19:52:21:7 | do ... end : [lambda] [captured lower_bound] | semmle.label | do ... end : [lambda] [captured lower_bound] |
+| ConnectedToInjection.rb:20:44:20:101 | "SELECT * FROM events WHERE cr..." | semmle.label | "SELECT * FROM events WHERE cr..." |
+| ConnectedToInjection.rb:20:88:20:98 | lower_bound | semmle.label | lower_bound |
+| ConnectedToInjection.rb:27:19:27:24 | call to params | semmle.label | call to params |
+| ConnectedToInjection.rb:27:19:27:38 | ...[...] | semmle.label | ...[...] |
+| ConnectedToInjection.rb:30:52:32:7 | [post] do ... end : [lambda] [captured captured] | semmle.label | [post] do ... end : [lambda] [captured captured] |
+| ConnectedToInjection.rb:30:52:32:7 | do ... end : [lambda] [captured lower_bound] | semmle.label | do ... end : [lambda] [captured lower_bound] |
+| ConnectedToInjection.rb:31:18:31:28 | lower_bound | semmle.label | lower_bound |
+| ConnectedToInjection.rb:34:5:34:7 | sql : String | semmle.label | sql : String |
+| ConnectedToInjection.rb:35:42:35:44 | sql | semmle.label | sql |
 | PgInjection.rb:6:5:6:8 | name | semmle.label | name |
 | PgInjection.rb:6:12:6:17 | call to params | semmle.label | call to params |
 | PgInjection.rb:6:12:6:24 | ...[...] | semmle.label | ...[...] |
@@ -272,3 +315,4 @@ nodes
 | PgInjection.rb:43:5:43:8 | qry3 : String | semmle.label | qry3 : String |
 | PgInjection.rb:44:29:44:32 | qry3 | semmle.label | qry3 |
 subpaths
+| ConnectedToInjection.rb:30:52:32:7 | do ... end : [lambda] [captured lower_bound] | ConnectedToInjection.rb:31:18:31:28 | lower_bound | ConnectedToInjection.rb:31:18:31:28 | lower_bound | ConnectedToInjection.rb:30:52:32:7 | [post] do ... end : [lambda] [captured captured] |
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 242a1af3ed51..80b98bd34610 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -5,6 +5,6 @@
 # reflected by `MODULE.bazel` in this repository).
 
 [toolchain]
-channel = "1.88"
+channel = "1.98"
 profile = "minimal"
 components = [ "clippy", "rustfmt" ]
diff --git a/rust/BUILD.bazel b/rust/BUILD.bazel
index 6536a4b6fd9e..d574cbc7c330 100644
--- a/rust/BUILD.bazel
+++ b/rust/BUILD.bazel
@@ -58,5 +58,4 @@ codeql_pack(
         ":tools",
         "//rust/downgrades",
     ],
-    experimental = True,
 )
diff --git a/rust/README.md b/rust/README.md
index 4fdbb0aedbdd..83d9a735df65 100644
--- a/rust/README.md
+++ b/rust/README.md
@@ -62,51 +62,4 @@ for code generation to succeed.
 
 ### Updating `rust-analyzer`
 
-Here's a rundown of the typical actions to perform to do a rust-analyzer (and other dependencies) update. A one-time setup consists in
-installing [`cargo-edit`](https://crates.io/crates/cargo-edit) with `cargo install cargo-edit`. On Ubuntu that also requires
-`sudo apt install libssl-dev pkg-config`.
-
-1. From the root of the `codeql` repo checkout, run a Cargo upgrade:
-   ```
-   cargo upgrade --incompatible --pinned
-   ```
-2. Look at a diff of the `Cargo.toml` files: if all `ra_ap_` prefixed dependencies have been updated to the same number, go on to the next step.
-   Otherwise, it means the latest `rust-analyzer` update has not been fully rolled out to all its crates in `crates.io`.
-   _All `ra_ap_` versions must agree!_
-   Downgrade by hand to the minimum one you see, and run a `cargo update` after that to fix the `Cargo.lock` file.
-3. Commit the changes, skipping `pre-commit` hooks if you have them enabled:
-   ```
-   git commit -am 'Cargo: upgrade dependencies' --no-verify
-   ```
-4. Regenerate vendored bazel files (these allow faster builds, particularly on CI where it has to start from scratch each time), commit the changes:
-   ```
-   misc/bazel/3rdparty/update_tree_sitter_extractors_deps.sh
-   git add .
-   git commit -am 'Bazel: regenerate vendored cargo dependencies' --no-verify
-   ```
-5. Run codegen
-   ```
-   bazel run //rust/codegen
-   ```
-   Take note whether `rust/schema/ast.py` was changed. That might need tweaks, new tests and/or downgrade/upgrade scripts down the line.
-6. Try compiling
-   ```
-   bazel run //rust:install
-   ```
-   * if it succeeds: good! You can move on to the next step.
-   * if it fails while compiling rust-analyzer dependencies, you need to update the rust toolchain. Sometimes the error will tell you
-     so explicitly, but it may happen that the error is more obscure. To update the rust toolchain:
-      * you will need to open a PR on the internal repo updating `RUST_VERSION` in `MODULE.bazel`. In general you can have this merged
-        independently of the changes in `codeql`.
-      * in `codeql`, update both `RUST_VERSION` in `MODULE.bazel` _and_ `rust-toolchain.toml` files. You may want to also update the
-        nightly toolchain in `rust/extractor/src/nightly-toolchain/rust-toolchain.toml` to a more recent date while you're at it.
-   * if it fails while compiling rust extractor code, you will need to adapt it to the new library version.
-      * for example updating annotations in `annotations.py`, adding / removing generated tests.
-
-   If you had to do any changes, commit them. If you updated the rust toolchain, running `rust/lint.py` might reformat or apply new
-   lints to the code.
-7. Check with CI if everything is in order.
-8. Run DCA with database caching disabled. Iterate on the code if needed.
-9. If in step 5 the schema was updated, add upgrade/downgrade scripts and a change note. This is best done last to reduce the chance of
-merge conflicts (none of the other testing depends on having upgrade and downgrade scripts in place). See
-[Upgrading a language database schema](docs/prepare-db-upgrade.md).
+See [Updating rust-analyzer](updating-rust-analyzer.md).
diff --git a/rust/ast-generator/BUILD.bazel b/rust/ast-generator/BUILD.bazel
index 24d429cbede9..8c43aa7483c0 100644
--- a/rust/ast-generator/BUILD.bazel
+++ b/rust/ast-generator/BUILD.bazel
@@ -8,11 +8,15 @@ load("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl", "aliases", "a
     "rust/extractor",
 )
 
-ra_ap_syntax_workspace, _, _ = str(ra_ap_syntax_label).partition("//")
+# `rust.ungram` is exported by the `ra_ap_syntax` crate, but only its default target is reachable
+# through the aggregated `@vendor_ts` repo (the per-crate package there is just an alias). The file
+# itself lives in the crate's own vendored repo, named `<vendor repo>__<crate package>`. Derive that
+# repo from the crate label so this stays version-independent.
+_vendor_repo, _, _crate_package = str(ra_ap_syntax_label).partition(":")[0].partition("//")
 
 alias(
     name = "rust.ungram",
-    actual = "%s//:rust.ungram" % ra_ap_syntax_workspace,
+    actual = "%s__%s//:rust.ungram" % (_vendor_repo, _crate_package),
     visibility = ["//rust/codegen:__pkg__"],
 )
 
diff --git a/rust/ast-generator/Cargo.toml b/rust/ast-generator/Cargo.toml
index fcba71b696c1..122ed47c4b54 100644
--- a/rust/ast-generator/Cargo.toml
+++ b/rust/ast-generator/Cargo.toml
@@ -7,11 +7,11 @@ license = "MIT"
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
 ungrammar = "1.16.1"
-proc-macro2 = "1.0.101"
-quote = "1.0.41"
-either = "1.15.0"
-stdx = {package = "ra_ap_stdx", version = "0.0.301"}
-itertools = "0.14.0"
+proc-macro2 = "1.0.107"
+quote = "1.0.47"
+either = "1.19.0"
+stdx = {package = "ra_ap_stdx", version = "0.0.358"}
+itertools = "0.15.0"
 mustache = "0.9.0"
-serde = { version = "1.0.228", features = ["derive"] }
-anyhow = "1.0.100"
+serde = { version = "1.0.229", features = ["derive"] }
+anyhow = "1.0.104"
diff --git a/rust/ast-generator/patches/rust-analyzer.patch b/rust/ast-generator/patches/rust-analyzer.patch
index e799e90f48a4..ffe12683b4aa 100644
--- a/rust/ast-generator/patches/rust-analyzer.patch
+++ b/rust/ast-generator/patches/rust-analyzer.patch
@@ -1,19 +1,19 @@
 diff --git a/xtask/src/codegen/grammar.rs b/xtask/src/codegen/grammar.rs
-index e7534582f2..49c96f1be3 100644
+index 0aad1e2..68f679f 100644
 --- a/xtask/src/codegen/grammar.rs
 +++ b/xtask/src/codegen/grammar.rs
-@@ -3,7 +3,9 @@
+@@ -3,6 +3,10 @@
  //! Specifically, it generates the `SyntaxKind` enum and a number of newtype
  //! wrappers around `SyntaxNode` which implement `syntax::AstNode`.
  
--#![allow(clippy::disallowed_types)]
 +#![allow(warnings)]
 +#![allow(clippy)]
 +#![cfg_attr(any(), rustfmt::skip)]
- 
++
  use std::{
      collections::{BTreeSet, HashSet},
-@@ -23,7 +25,7 @@ use crate::{
+     fmt::Write,
+@@ -21,7 +25,7 @@ use crate::{
      project_root,
  };
  
@@ -22,7 +22,7 @@ index e7534582f2..49c96f1be3 100644
  use self::ast_src::{AstEnumSrc, AstNodeSrc, AstSrc, Cardinality, Field, KindsSrc};
  
  pub(crate) fn generate(check: bool) {
-@@ -624,7 +626,7 @@ fn pluralize(s: &str) -> String {
+@@ -775,7 +779,7 @@ fn pluralize(s: &str) -> String {
  }
  
  impl Field {
@@ -31,26 +31,26 @@ index e7534582f2..49c96f1be3 100644
          matches!(self, Field::Node { cardinality: Cardinality::Many, .. })
      }
      fn token_kind(&self) -> Option<proc_macro2::TokenStream> {
-@@ -636,7 +638,7 @@ impl Field {
+@@ -787,7 +791,7 @@ impl Field {
              _ => None,
          }
      }
 -    fn method_name(&self) -> String {
 +    pub fn method_name(&self) -> String {
          match self {
-             Field::Token(name) => {
-                 let name = match name.as_str() {
-@@ -682,7 +684,7 @@ impl Field {
+             Field::Token { name, token, .. } => {
+                 if let Some(name) = name {
+@@ -836,7 +840,7 @@ impl Field {
              }
          }
      }
 -    fn ty(&self) -> proc_macro2::Ident {
 +    pub fn ty(&self) -> proc_macro2::Ident {
          match self {
-             Field::Token(_) => format_ident!("SyntaxToken"),
+             Field::Token { .. } => format_ident!("SyntaxToken"),
              Field::Node { ty, .. } => format_ident!("{}", ty),
-@@ -699,7 +701,7 @@ fn clean_token_name(name: &str) -> String {
-     }
+@@ -849,7 +853,7 @@ fn clean_token_name(name: &str) -> String {
+     if cleaned.is_empty() { name.to_owned() } else { cleaned.to_owned() }
  }
  
 -fn lower(grammar: &Grammar) -> AstSrc {
@@ -59,7 +59,7 @@ index e7534582f2..49c96f1be3 100644
          tokens:
              "Whitespace Comment String ByteString CString IntNumber FloatNumber Char Byte Ident"
 diff --git a/xtask/src/codegen/grammar/ast_src.rs b/xtask/src/codegen/grammar/ast_src.rs
-index 9269d15423..babe7ca1bf 100644
+index 1ae139f..d4d791e 100644
 --- a/xtask/src/codegen/grammar/ast_src.rs
 +++ b/xtask/src/codegen/grammar/ast_src.rs
 @@ -1,5 +1,8 @@
diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index bcdab28dd62f..f136fd57fc41 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -76,6 +76,8 @@ fn should_enum_be_skipped(name: &str) -> bool {
 fn should_node_be_skipped(name: &str) -> bool {
     name == "TypeAnchor" // we flatten TypeAnchor into PathSegment in the extractor
     || name == "MacroStmts" // we workaround a getter bug in the extractor
+    || name == "ParenExpr" // parenthesized expressions are extracted as their inner expression
+    || name == "ParenPat" // parenthesized patterns are extracted as their inner pattern
 }
 
 fn should_node_be_skipped_in_extractor(name: &str) -> bool {
@@ -133,6 +135,7 @@ fn get_additional_fields(node_name: &str) -> Vec<FieldInfo> {
             FieldInfo::body("body", "TokenTree"),
         ],
         "MacroCall" => vec![FieldInfo::body("token_tree", "TokenTree")],
+        "MacroExpr" | "RecordExpr" => vec![FieldInfo::list("attrs", "AnyAttr")],
         "FormatArgsExpr" => vec![FieldInfo::list("args", "FormatArgsArg")],
         "ArgList" => vec![FieldInfo::list("args", "Expr")],
         "Fn" => vec![FieldInfo::body("body", "BlockExpr")],
@@ -149,7 +152,7 @@ fn get_additional_fields(node_name: &str) -> Vec<FieldInfo> {
 
 fn get_trait_fields(trait_name: &str) -> Vec<FieldInfo> {
     match trait_name {
-        "HasAttrs" => vec![FieldInfo::list("attrs", "Attr")],
+        "HasAttrs" => vec![FieldInfo::list("attrs", "AnyAttr")],
         "HasName" => vec![FieldInfo::optional("name", "Name")],
         "HasVisibility" => vec![FieldInfo::optional("visibility", "Visibility")],
         "HasGenericParams" => vec![
@@ -309,13 +312,13 @@ fn write_schema(
 fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
     let mut result = Vec::new();
     for field in &node.fields {
-        if let Field::Token(name) = field {
-            if should_predicate_be_extracted(name) {
-                result.push(FieldInfo {
-                    name: format!("is_{name}"),
-                    ty: FieldType::Predicate,
-                });
-            }
+        if let Field::Token { token, .. } = field
+            && should_predicate_be_extracted(token)
+        {
+            result.push(FieldInfo {
+                name: format!("is_{token}"),
+                ty: FieldType::Predicate,
+            });
         }
     }
 
@@ -327,7 +330,7 @@ fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
             continue;
         }
         let ty = match field {
-            Field::Token(_) => continue,
+            Field::Token { .. } => continue,
             Field::Node {
                 ty, cardinality, ..
             } => match cardinality {
@@ -349,6 +352,7 @@ struct EnumVariantInfo {
     name: String,
     snake_case_name: String,
     variant_ast_name: String,
+    emission: String,
 }
 
 #[derive(Serialize)]
@@ -365,6 +369,8 @@ struct ExtractorNodeFieldInfo {
     name: String,
     method: String,
     snake_case_ty: String,
+    attributes: bool,
+    parenthesized_attrs: bool,
     string: bool,
     predicate: bool,
     optional: bool,
@@ -399,10 +405,16 @@ fn enum_to_extractor_info(node: &AstEnumSrc) -> ExtractorEnumInfo {
             .map(|v| {
                 let name = class_name(v);
                 let snake_case_name = to_lower_snake_case(v);
+                let emission = match v.as_str() {
+                    "ParenExpr" => "self.emit_parenthesized_expr(inner)".to_owned(),
+                    "ParenPat" => "self.emit_parenthesized_pat(inner)".to_owned(),
+                    _ => format!("self.emit_{snake_case_name}(inner).map(Into::into)"),
+                };
                 EnumVariantInfo {
                     name,
                     snake_case_name,
-                    variant_ast_name: v.clone(),
+                    variant_ast_name: v.to_string(),
+                    emission,
                 }
             })
             .collect(),
@@ -412,6 +424,7 @@ fn enum_to_extractor_info(node: &AstEnumSrc) -> ExtractorEnumInfo {
 
 fn field_info_to_extractor_info(name: &str, field: &FieldInfo) -> ExtractorNodeFieldInfo {
     let name = property_name(name, &field.name);
+    let attributes = name == "attrs";
     match &field.ty {
         FieldType::String => ExtractorNodeFieldInfo {
             name,
@@ -440,7 +453,12 @@ fn field_info_to_extractor_info(name: &str, field: &FieldInfo) -> ExtractorNodeF
         },
         FieldType::List(ty) => ExtractorNodeFieldInfo {
             name,
-            method: field.name.clone(),
+            attributes,
+            method: if ty == "AnyAttr" {
+                "attrs_with_doc".to_owned()
+            } else {
+                field.name.clone()
+            },
             snake_case_ty: to_lower_snake_case(ty),
             list: true,
             ..Default::default()
@@ -449,12 +467,19 @@ fn field_info_to_extractor_info(name: &str, field: &FieldInfo) -> ExtractorNodeF
 }
 fn node_to_extractor_info(node: &AstNodeSrc) -> ExtractorNodeInfo {
     let fields = get_fields(node);
-    let has_attrs = fields.iter().any(|f| f.name == "attrs");
+    let parenthesized_attrs = matches!(node.name.as_str(), "MacroExpr" | "RecordExpr");
     let name = class_name(&node.name);
-    let fields = fields
+    let fields: Vec<_> = fields
         .iter()
         .map(|f| field_info_to_extractor_info(&name, f))
+        .map(|mut f| {
+            f.parenthesized_attrs = parenthesized_attrs && f.name == "attrs";
+            f
+        })
         .collect();
+    let has_attrs = fields
+        .iter()
+        .any(|f| f.name == "attrs" && !f.parenthesized_attrs);
     ExtractorNodeInfo {
         name,
         snake_case_name: to_lower_snake_case(&node.name),
diff --git a/rust/ast-generator/templates/extractor.mustache b/rust/ast-generator/templates/extractor.mustache
index 03269c26ae3f..ec1f1b17da31 100644
--- a/rust/ast-generator/templates/extractor.mustache
+++ b/rust/ast-generator/templates/extractor.mustache
@@ -18,7 +18,7 @@ impl Translator<'_> {
         {{>pre_emission}}
         let label = match node {
             {{#variants}}
-            ast::{{ast_name}}::{{variant_ast_name}}(inner) => self.emit_{{snake_case_name}}(inner).map(Into::into),
+            ast::{{ast_name}}::{{variant_ast_name}}(inner) => {{{emission}}},
             {{/variants}}
         }?;
         {{>post_emission}}
@@ -33,6 +33,18 @@ impl Translator<'_> {
         if self.should_be_excluded(node) { return None; }
         {{/has_attrs}}
         {{#fields}}
+        {{#attributes}}
+        {{#parenthesized_attrs}}
+        let attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        {{/parenthesized_attrs}}
+        {{^parenthesized_attrs}}
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.{{method}}().filter_map(|x| self.emit_{{snake_case_ty}}(&x)));
+        {{/parenthesized_attrs}}
+        {{/attributes}}
+        {{/fields}}
+        {{#fields}}
+        {{^attributes}}
         let {{name}} =
             {{#predicate}}
             node.{{method}}().is_some()
@@ -50,11 +62,17 @@ impl Translator<'_> {
             if self.should_skip_bodies() { None } else { node.{{method}}().and_then(|x| self.emit_{{snake_case_ty}}(&x)) }
             {{/body}}
             ;
+        {{/attributes}}
         {{/fields}}
         let label = self.trap.emit(generated::{{name}} {
             id: TrapId::Star,
             {{#fields}}
+            {{#attributes}}
+            attrs,
+            {{/attributes}}
+            {{^attributes}}
             {{name}},
+            {{/attributes}}
             {{/fields}}
         });
         self.emit_location(label, node);
diff --git a/rust/codeql-extractor.yml b/rust/codeql-extractor.yml
index 6675dd3a2718..819793ec26cc 100644
--- a/rust/codeql-extractor.yml
+++ b/rust/codeql-extractor.yml
@@ -25,8 +25,8 @@ options:
         title: Controls compression for the TRAP files written by the extractor.
         description: >
           This option is only intended for use in debugging the extractor. Accepted
-          values are 'gzip' (to write gzip-compressed TRAP) 'zstd' (to write
-          Zstandard-compressed TRAP) and 'none' (the default, to write uncompressed
+          values are 'gzip' (to write gzip-compressed TRAP) 'zstd' (the default,
+          to write Zstandard-compressed TRAP) and 'none' (to write uncompressed
           TRAP).
         type: string
         pattern: "^(none|gzip|zstd)$"
@@ -36,7 +36,8 @@ options:
       This value is an optional path to use as `CARGO_TARGET_DIR` for the internal
       cargo commands the extractor uses. Pointing it to a persistent directory may
       reduce execution time of consecutive extractor runs. By default, a new scratch
-      directory is used for each run.
+      directory is used for each extraction, while qltests use the test's `target`
+      directory so artifacts can be reused across runs.
     type: string
   cargo_target:
     title: Target architecture
diff --git a/rust/downgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/old.dbscheme b/rust/downgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/old.dbscheme
new file mode 100644
index 000000000000..3af0bba56aa5
--- /dev/null
+++ b/rust/downgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/old.dbscheme
@@ -0,0 +1,3746 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @any_attr
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+@any_attr =
+  @attr
+| @doc_comment
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+doc_comments(
+  unique int id: @doc_comment
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/rust.dbscheme b/rust/downgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/rust.dbscheme
new file mode 100644
index 000000000000..852696f20117
--- /dev/null
+++ b/rust/downgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/rust.dbscheme
@@ -0,0 +1,3737 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/upgrade.properties b/rust/downgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/upgrade.properties
new file mode 100644
index 000000000000..75ff58f2048f
--- /dev/null
+++ b/rust/downgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/upgrade.properties
@@ -0,0 +1,4 @@
+description: Downgrade rust-analyzer to 0.0.347
+compatibility: full
+
+doc_comments.rel: delete
diff --git a/rust/downgrades/7980434ec600632010dc150cdd85c23a95b922fb/old.dbscheme b/rust/downgrades/7980434ec600632010dc150cdd85c23a95b922fb/old.dbscheme
new file mode 100644
index 000000000000..7980434ec600
--- /dev/null
+++ b/rust/downgrades/7980434ec600632010dc150cdd85c23a95b922fb/old.dbscheme
@@ -0,0 +1,3753 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @any_attr
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+@any_attr =
+  @attr
+| @doc_comment
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @cfg_pred_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @cfg_pred_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_exprs(
+  unique int id: @cfg_pred_expr
+);
+
+#keyset[id]
+cfg_pred_expr_cfg_predicates(
+  int id: @cfg_pred_expr ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_pats(
+  unique int id: @cfg_pred_pat
+);
+
+#keyset[id]
+cfg_pred_pat_cfg_predicates(
+  int id: @cfg_pred_pat ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+doc_comments(
+  unique int id: @doc_comment
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id, index]
+macro_expr_attrs(
+  int id: @macro_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id, index]
+struct_expr_attrs(
+  int id: @struct_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/7980434ec600632010dc150cdd85c23a95b922fb/rust.dbscheme b/rust/downgrades/7980434ec600632010dc150cdd85c23a95b922fb/rust.dbscheme
new file mode 100644
index 000000000000..9487e73d9da6
--- /dev/null
+++ b/rust/downgrades/7980434ec600632010dc150cdd85c23a95b922fb/rust.dbscheme
@@ -0,0 +1,3768 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @any_attr
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+@any_attr =
+  @attr
+| @doc_comment
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @cfg_pred_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @cfg_pred_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_exprs(
+  unique int id: @cfg_pred_expr
+);
+
+#keyset[id]
+cfg_pred_expr_cfg_predicates(
+  int id: @cfg_pred_expr ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_pats(
+  unique int id: @cfg_pred_pat
+);
+
+#keyset[id]
+cfg_pred_pat_cfg_predicates(
+  int id: @cfg_pred_pat ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+doc_comments(
+  unique int id: @doc_comment
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/7980434ec600632010dc150cdd85c23a95b922fb/upgrade.properties b/rust/downgrades/7980434ec600632010dc150cdd85c23a95b922fb/upgrade.properties
new file mode 100644
index 000000000000..7bdefd6c94d2
--- /dev/null
+++ b/rust/downgrades/7980434ec600632010dc150cdd85c23a95b922fb/upgrade.properties
@@ -0,0 +1,5 @@
+description: Downgrade to a schema with parenthesized expression and pattern nodes
+compatibility: partial
+
+macro_expr_attrs.rel: delete
+struct_expr_attrs.rel: delete
diff --git a/rust/downgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/downgrade.ql b/rust/downgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/downgrade.ql
new file mode 100644
index 000000000000..1bf22d853583
--- /dev/null
+++ b/rust/downgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/downgrade.ql
@@ -0,0 +1,70 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+// Genuinely-new node kinds with no representation in the old schema. Their own child relations are
+// dropped via `delete` in upgrade.properties; the references to them from `@ast_node`-typed columns
+// (`macro_call_macro_call_expansions`, `comments`) and their `locatable_locations` are scrubbed
+// below.
+private predicate deletedNode(Element id) {
+  deref_pats(id) or
+  not_nulls(id) or
+  include_bytes_exprs(id) or
+  pattern_type_reprs(id) or
+  impl_restrictions(id) or
+  mut_restrictions(id) or
+  visibility_inners(id)
+}
+
+// A deleted node, plus any comment attached to one: dropping the comment's `comments` row would
+// otherwise leave its `locatable_locations` row dangling.
+private predicate deletedElement(Element id) {
+  deletedNode(id)
+  or
+  exists(Element parent | comments(id, parent, _) and deletedNode(parent))
+}
+
+// A `@name` used as a format argument's name. The old schema represents these as dedicated text-less
+// `@format_args_arg_name` placeholders, so we repurpose these ids into that entity table and drop
+// them (and their text) from `names`/`name_texts`.
+private predicate formatArgName(Element name) { format_args_arg_names(_, name) }
+
+// The new schema inserts a `VisibilityInner` node between `Visibility` and its path; the old schema
+// stores the path directly on the `Visibility`, so we rejoin the two hops.
+query predicate new_visibility_paths(Element visibility, Element path) {
+  exists(Element inner |
+    visibility_visibility_inners(visibility, inner) and
+    visibility_inner_paths(inner, path)
+  )
+}
+
+query predicate new_format_args_arg_names(Element id) { formatArgName(id) }
+
+query predicate new_format_args_arg_arg_names(Element arg, Element name) {
+  format_args_arg_names(arg, name)
+}
+
+query predicate new_names(Element id) { names(id) and not formatArgName(id) }
+
+query predicate new_name_texts(Element id, string text) {
+  name_texts(id, text) and not formatArgName(id)
+}
+
+query predicate new_locatable_locations(Element id, Location location) {
+  locatable_locations(id, location) and not deletedElement(id)
+}
+
+// `macro_call_macro_call_expansions` and `comments` are the only two relations with a generic
+// `@ast_node`-typed value column, so a deleted node reachable through a macro expansion or as a
+// comment's parent would otherwise dangle here.
+query predicate new_macro_call_macro_call_expansions(Element macroCall, Element expansion) {
+  macro_call_macro_call_expansions(macroCall, expansion) and not deletedNode(expansion)
+}
+
+query predicate new_comments(Element id, Element parent, string text) {
+  comments(id, parent, text) and not deletedNode(parent)
+}
diff --git a/rust/downgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/old.dbscheme b/rust/downgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/old.dbscheme
new file mode 100644
index 000000000000..852696f20117
--- /dev/null
+++ b/rust/downgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/old.dbscheme
@@ -0,0 +1,3737 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/rust.dbscheme b/rust/downgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/rust.dbscheme
new file mode 100644
index 000000000000..ed6b1d3d5140
--- /dev/null
+++ b/rust/downgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/rust.dbscheme
@@ -0,0 +1,3627 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @format_args_arg_name
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_arg_names(
+  int id: @format_args_arg ref,
+  int arg_name: @format_args_arg_name ref
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+format_args_arg_names(
+  unique int id: @format_args_arg_name
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/upgrade.properties b/rust/downgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/upgrade.properties
new file mode 100644
index 000000000000..7221c00218a1
--- /dev/null
+++ b/rust/downgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/upgrade.properties
@@ -0,0 +1,35 @@
+description: Downgrade rust-analyzer to 0.0.328
+compatibility: partial
+
+visibility_paths.rel: run downgrade.ql new_visibility_paths
+visibility_visibility_inners.rel: delete
+visibility_inners.rel: delete
+visibility_inner_paths.rel: delete
+
+format_args_arg_names.rel: run downgrade.ql new_format_args_arg_names
+format_args_arg_arg_names.rel: run downgrade.ql new_format_args_arg_arg_names
+names.rel: run downgrade.ql new_names
+name_texts.rel: run downgrade.ql new_name_texts
+
+locatable_locations.rel: run downgrade.ql new_locatable_locations
+macro_call_macro_call_expansions.rel: run downgrade.ql new_macro_call_macro_call_expansions
+comments.rel: run downgrade.ql new_comments
+
+deref_pats.rel: delete
+deref_pat_pats.rel: delete
+not_nulls.rel: delete
+include_bytes_exprs.rel: delete
+pattern_type_reprs.rel: delete
+pattern_type_repr_pats.rel: delete
+pattern_type_repr_type_reprs.rel: delete
+impl_restrictions.rel: delete
+impl_restriction_visibility_inners.rel: delete
+mut_restrictions.rel: delete
+mut_restriction_is_mut.rel: delete
+mut_restriction_visibility_inners.rel: delete
+asm_clobber_abi_attrs.rel: delete
+asm_operand_named_attrs.rel: delete
+asm_options_list_attrs.rel: delete
+struct_field_mut_restrictions.rel: delete
+tuple_field_mut_restrictions.rel: delete
+trait_impl_restrictions.rel: delete
diff --git a/rust/downgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/downgrade.ql b/rust/downgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/downgrade.ql
new file mode 100644
index 000000000000..256bb6c937ee
--- /dev/null
+++ b/rust/downgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/downgrade.ql
@@ -0,0 +1,30 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+// `CfgPredExpr` and `CfgPredPat` are new node kinds with no representation in the old schema, so we
+// scrub their locations and references to them.
+private predicate deletedNode(Element id) { cfg_pred_exprs(id) or cfg_pred_pats(id) }
+
+// Comments attached to deleted nodes are also removed, along with their locations.
+private predicate deletedElement(Element id) {
+  deletedNode(id)
+  or
+  exists(Element parent | comments(id, parent, _) and deletedNode(parent))
+}
+
+query predicate new_locatable_locations(Element id, Location location) {
+  locatable_locations(id, location) and not deletedElement(id)
+}
+
+query predicate new_macro_call_macro_call_expansions(Element macroCall, Element expansion) {
+  macro_call_macro_call_expansions(macroCall, expansion) and not deletedNode(expansion)
+}
+
+query predicate new_comments(Element id, Element parent, string text) {
+  comments(id, parent, text) and not deletedNode(parent)
+}
diff --git a/rust/downgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/old.dbscheme b/rust/downgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/old.dbscheme
new file mode 100644
index 000000000000..9487e73d9da6
--- /dev/null
+++ b/rust/downgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/old.dbscheme
@@ -0,0 +1,3768 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @any_attr
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+@any_attr =
+  @attr
+| @doc_comment
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @cfg_pred_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @cfg_pred_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_exprs(
+  unique int id: @cfg_pred_expr
+);
+
+#keyset[id]
+cfg_pred_expr_cfg_predicates(
+  int id: @cfg_pred_expr ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_pats(
+  unique int id: @cfg_pred_pat
+);
+
+#keyset[id]
+cfg_pred_pat_cfg_predicates(
+  int id: @cfg_pred_pat ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+doc_comments(
+  unique int id: @doc_comment
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/rust.dbscheme b/rust/downgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/rust.dbscheme
new file mode 100644
index 000000000000..3af0bba56aa5
--- /dev/null
+++ b/rust/downgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/rust.dbscheme
@@ -0,0 +1,3746 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @any_attr
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+@any_attr =
+  @attr
+| @doc_comment
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+doc_comments(
+  unique int id: @doc_comment
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/upgrade.properties b/rust/downgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/upgrade.properties
new file mode 100644
index 000000000000..65f871f25f91
--- /dev/null
+++ b/rust/downgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/upgrade.properties
@@ -0,0 +1,10 @@
+description: Downgrade rust-analyzer to 0.0.352
+compatibility: partial
+
+cfg_pred_exprs.rel: delete
+cfg_pred_expr_cfg_predicates.rel: delete
+cfg_pred_pats.rel: delete
+cfg_pred_pat_cfg_predicates.rel: delete
+locatable_locations.rel: run downgrade.ql new_locatable_locations
+macro_call_macro_call_expansions.rel: run downgrade.ql new_macro_call_macro_call_expansions
+comments.rel: run downgrade.ql new_comments
diff --git a/rust/downgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/old.dbscheme b/rust/downgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/old.dbscheme
new file mode 100644
index 000000000000..ed6b1d3d5140
--- /dev/null
+++ b/rust/downgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/old.dbscheme
@@ -0,0 +1,3627 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @format_args_arg_name
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_arg_names(
+  int id: @format_args_arg ref,
+  int arg_name: @format_args_arg_name ref
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+format_args_arg_names(
+  unique int id: @format_args_arg_name
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/rust.dbscheme b/rust/downgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/rust.dbscheme
new file mode 100644
index 000000000000..e1bce498ef78
--- /dev/null
+++ b/rust/downgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/rust.dbscheme
@@ -0,0 +1,3560 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/upgrade.properties b/rust/downgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/upgrade.properties
new file mode 100644
index 000000000000..9cba151b6f06
--- /dev/null
+++ b/rust/downgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/upgrade.properties
@@ -0,0 +1,60 @@
+description: Downgrade from rust-analyzer 0.0.328 to 0.0.301
+compatibility: full
+
+block_expr_try_block_modifiers.rel: delete
+block_expr_is_try.rel: run upgrade.ql new_block_expr_is_try
+cfg_atoms.rel: delete
+cfg_attr_meta.rel: delete
+cfg_attr_meta_cfg_predicates.rel: delete
+cfg_attr_meta_metas.rel: delete
+cfg_composites.rel: delete
+cfg_composite_cfg_predicates.rel: delete
+cfg_meta.rel: delete
+cfg_meta_cfg_predicates.rel: delete
+comments.rel: run upgrade.ql new_comments
+const_args.rel: run upgrade.ql new_const_args
+const_arg_exprs.rel: run upgrade.ql new_const_arg_exprs
+format_args_arg_arg_names.rel: delete
+format_args_arg_names.rel: run upgrade.ql new_format_args_arg_names
+key_value_meta.rel: delete
+key_value_meta_exprs.rel: delete
+key_value_meta_paths.rel: delete
+locatable_locations.rel: run upgrade.ql new_locatable_locations
+meta.rel: run upgrade.ql new_meta
+meta_exprs.rel: run upgrade.ql new_meta_exprs
+meta_is_unsafe.rel: run upgrade.ql new_meta_is_unsafe
+meta_paths.rel: run upgrade.ql new_meta_paths
+meta_token_trees.rel: run upgrade.ql new_meta_token_trees
+names.rel: run upgrade.ql new_names
+path_meta.rel: delete
+path_meta_paths.rel: delete
+struct_field_default_vals.rel: delete
+struct_field_defaults.rel: run upgrade.ql new_struct_field_defaults
+token_tree_meta.rel: delete
+token_tree_meta_paths.rel: delete
+token_tree_meta_token_trees.rel: delete
+trait_assoc_item_lists.rel: run upgrade.ql new_trait_assoc_item_lists
+trait_attrs.rel: run upgrade.ql new_trait_attrs
+trait_generic_param_lists.rel: run upgrade.ql new_trait_generic_param_lists
+trait_is_auto.rel: run upgrade.ql new_trait_is_auto
+trait_is_unsafe.rel: run upgrade.ql new_trait_is_unsafe
+trait_names.rel: run upgrade.ql new_trait_names
+trait_type_bound_lists.rel: run upgrade.ql new_trait_type_bound_lists
+trait_visibilities.rel: run upgrade.ql new_trait_visibilities
+trait_where_clauses.rel: run upgrade.ql new_trait_where_clauses
+trait_aliases.rel: run upgrade.ql new_trait_aliases
+trait_alias_attrs.rel: run upgrade.ql new_trait_alias_attrs
+trait_alias_generic_param_lists.rel: run upgrade.ql new_trait_alias_generic_param_lists
+trait_alias_names.rel: run upgrade.ql new_trait_alias_names
+trait_alias_type_bound_lists.rel: run upgrade.ql new_trait_alias_type_bound_lists
+trait_alias_visibilities.rel: run upgrade.ql new_trait_alias_visibilities
+trait_alias_where_clauses.rel: run upgrade.ql new_trait_alias_where_clauses
+traits.rel: run upgrade.ql new_traits
+try_block_modifier_is_try.rel: delete
+try_block_modifiers.rel: delete
+try_block_modifier_type_reprs.rel: delete
+unsafe_meta.rel: delete
+unsafe_meta_is_unsafe.rel: delete
+unsafe_meta_meta.rel: delete
+variant_const_args.rel: delete
+variant_discriminants.rel: run upgrade.ql new_variant_discriminants
diff --git a/rust/downgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/upgrade.ql b/rust/downgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/upgrade.ql
new file mode 100644
index 000000000000..4fff5c8ddba3
--- /dev/null
+++ b/rust/downgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/upgrade.ql
@@ -0,0 +1,169 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+private predicate wrapperConstArg(Element id) {
+  struct_field_default_vals(_, id) or variant_const_args(_, id)
+}
+
+private predicate traitIsAlias(Element id) {
+  traits(id) and trait_type_bound_lists(id, _) and not trait_assoc_item_lists(id, _)
+}
+
+private predicate sourceMeta(Element id) {
+  path_meta(id) or
+  key_value_meta(id) or
+  token_tree_meta(id) or
+  unsafe_meta(id) or
+  cfg_meta(id) or
+  cfg_attr_meta(id)
+}
+
+private predicate unsafeInnerMeta(Element id) { unsafe_meta_meta(_, id) }
+
+private predicate metaPath(Element id, Element path) {
+  path_meta_paths(id, path) or key_value_meta_paths(id, path) or token_tree_meta_paths(id, path)
+}
+
+private predicate metaExpr(Element id, Element expr) { key_value_meta_exprs(id, expr) }
+
+private predicate metaTokenTree(Element id, Element tokenTree) {
+  token_tree_meta_token_trees(id, tokenTree)
+}
+
+private predicate deletedAstNode(Element id) {
+  wrapperConstArg(id) or
+  unsafeInnerMeta(id) or
+  cfg_atoms(id) or
+  cfg_composites(id) or
+  format_args_arg_names(id) or
+  try_block_modifiers(id)
+}
+
+private predicate deletedElement(Element id) {
+  deletedAstNode(id)
+  or
+  exists(Element parent, string text | comments(id, parent, text) and deletedAstNode(parent))
+}
+
+query predicate new_block_expr_is_try(Element id) {
+  exists(Element modifier |
+    block_expr_try_block_modifiers(id, modifier) and try_block_modifier_is_try(modifier)
+  )
+}
+
+query predicate new_names(Element id) { names(id) or format_args_arg_names(id) }
+
+query predicate new_format_args_arg_names(Element id, Element name) {
+  format_args_arg_arg_names(id, name)
+}
+
+query predicate new_const_args(Element id) { const_args(id) and not wrapperConstArg(id) }
+
+query predicate new_const_arg_exprs(Element id, Element expr) {
+  const_arg_exprs(id, expr) and not wrapperConstArg(id)
+}
+
+query predicate new_comments(Element id, Element parent, string text) {
+  comments(id, parent, text) and not deletedAstNode(parent)
+}
+
+query predicate new_struct_field_defaults(Element id, Element expr) {
+  exists(Element constArg |
+    struct_field_default_vals(id, constArg) and const_arg_exprs(constArg, expr)
+  )
+}
+
+query predicate new_variant_discriminants(Element id, Element expr) {
+  exists(Element constArg | variant_const_args(id, constArg) and const_arg_exprs(constArg, expr))
+}
+
+query predicate new_meta(Element id) { sourceMeta(id) and not unsafeInnerMeta(id) }
+
+query predicate new_meta_paths(Element id, Element path) {
+  metaPath(id, path) and not unsafeInnerMeta(id)
+  or
+  exists(Element inner | unsafe_meta_meta(id, inner) and metaPath(inner, path))
+}
+
+query predicate new_meta_exprs(Element id, Element expr) {
+  metaExpr(id, expr) and not unsafeInnerMeta(id)
+  or
+  exists(Element inner | unsafe_meta_meta(id, inner) and metaExpr(inner, expr))
+}
+
+query predicate new_meta_token_trees(Element id, Element tokenTree) {
+  metaTokenTree(id, tokenTree) and not unsafeInnerMeta(id)
+  or
+  exists(Element inner | unsafe_meta_meta(id, inner) and metaTokenTree(inner, tokenTree))
+}
+
+query predicate new_meta_is_unsafe(Element id) { unsafe_meta_is_unsafe(id) }
+
+query predicate new_traits(Element id) { traits(id) and not traitIsAlias(id) }
+
+query predicate new_trait_assoc_item_lists(Element id, Element assocItemList) {
+  trait_assoc_item_lists(id, assocItemList) and not traitIsAlias(id)
+}
+
+query predicate new_trait_attrs(Element id, int index, Element attr) {
+  trait_attrs(id, index, attr) and not traitIsAlias(id)
+}
+
+query predicate new_trait_generic_param_lists(Element id, Element genericParamList) {
+  trait_generic_param_lists(id, genericParamList) and not traitIsAlias(id)
+}
+
+query predicate new_trait_is_auto(Element id) { trait_is_auto(id) and not traitIsAlias(id) }
+
+query predicate new_trait_is_unsafe(Element id) { trait_is_unsafe(id) and not traitIsAlias(id) }
+
+query predicate new_trait_names(Element id, Element name) {
+  trait_names(id, name) and not traitIsAlias(id)
+}
+
+query predicate new_trait_type_bound_lists(Element id, Element typeBoundList) {
+  trait_type_bound_lists(id, typeBoundList) and not traitIsAlias(id)
+}
+
+query predicate new_trait_visibilities(Element id, Element visibility) {
+  trait_visibilities(id, visibility) and not traitIsAlias(id)
+}
+
+query predicate new_trait_where_clauses(Element id, Element whereClause) {
+  trait_where_clauses(id, whereClause) and not traitIsAlias(id)
+}
+
+query predicate new_trait_aliases(Element id) { traitIsAlias(id) }
+
+query predicate new_trait_alias_attrs(Element id, int index, Element attr) {
+  trait_attrs(id, index, attr) and traitIsAlias(id)
+}
+
+query predicate new_trait_alias_generic_param_lists(Element id, Element genericParamList) {
+  trait_generic_param_lists(id, genericParamList) and traitIsAlias(id)
+}
+
+query predicate new_trait_alias_names(Element id, Element name) {
+  trait_names(id, name) and traitIsAlias(id)
+}
+
+query predicate new_trait_alias_type_bound_lists(Element id, Element typeBoundList) {
+  trait_type_bound_lists(id, typeBoundList) and traitIsAlias(id)
+}
+
+query predicate new_trait_alias_visibilities(Element id, Element visibility) {
+  trait_visibilities(id, visibility) and traitIsAlias(id)
+}
+
+query predicate new_trait_alias_where_clauses(Element id, Element whereClause) {
+  trait_where_clauses(id, whereClause) and traitIsAlias(id)
+}
+
+query predicate new_locatable_locations(Element id, Location location) {
+  locatable_locations(id, location) and not deletedElement(id)
+}
diff --git a/rust/extractor/Cargo.toml b/rust/extractor/Cargo.toml
index 223d9dfc68c2..8c193112faef 100644
--- a/rust/extractor/Cargo.toml
+++ b/rust/extractor/Cargo.toml
@@ -6,39 +6,40 @@ license = "MIT"
 
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
-anyhow = "1.0.100"
-clap = { version = "4.5.48", features = ["derive"] }
+anyhow = "1.0.104"
+clap = { version = "4.6.7", features = ["derive"] }
 figment = { version = "0.10.19", features = ["env", "yaml"] }
 num-traits = "0.2.19"
-ra_ap_base_db = "0.0.301"
-ra_ap_hir = "0.0.301"
-ra_ap_hir_def = "0.0.301"
-ra_ap_ide_db = "0.0.301"
-ra_ap_hir_ty = "0.0.301"
-ra_ap_hir_expand = "0.0.301"
-ra_ap_load-cargo = "0.0.301"
-ra_ap_paths = "0.0.301"
-ra_ap_project_model = "0.0.301"
-ra_ap_syntax = "0.0.301"
-ra_ap_vfs = "0.0.301"
-ra_ap_parser = "0.0.301"
-ra_ap_span = "0.0.301"
-ra_ap_cfg = "0.0.301"
-ra_ap_intern = "0.0.301"
-serde = "1.0.228"
-serde_with = "3.14.1"
-triomphe = "0.1.14"
-argfile = "0.2.1"
+ra_ap_base_db = "0.0.358"
+ra_ap_hir = "0.0.358"
+ra_ap_hir_def = "0.0.358"
+ra_ap_ide_db = "0.0.358"
+ra_ap_hir_ty = "0.0.358"
+ra_ap_hir_expand = "0.0.358"
+ra_ap_load-cargo = "0.0.358"
+ra_ap_paths = "0.0.358"
+ra_ap_project_model = "0.0.358"
+ra_ap_syntax = "0.0.358"
+ra_ap_syntax-bridge = "0.0.358"
+ra_ap_toolchain = "0.0.358"
+ra_ap_vfs = "0.0.358"
+ra_ap_parser = "0.0.358"
+ra_ap_span = "0.0.358"
+ra_ap_cfg = "0.0.358"
+ra_ap_intern = "0.0.358"
+serde = "1.0.229"
+serde_with = "3.24.0"
+triomphe = "0.1.17"
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
 rust-extractor-macros = { path = "macros" }
-itertools = "0.14.0"
-glob = "0.3.3"
-chrono = { version = "0.4.42", features = ["serde"] }
-serde_json = "1.0.145"
+itertools = "0.15.0"
+glob = "0.3.4"
+chrono = { version = "0.4.45", features = ["serde"] }
+serde_json = "1.0.154"
 dunce = "1.0.5"
-toml = "0.9.7"
-tracing = "0.1.41"
+toml = "1.1.8"
+tracing = "0.1.44"
 tracing-flame = "0.2.0"
-tracing-subscriber = "0.3.20"
+tracing-subscriber = "0.3.23"
 chalk-ir = "0.104.0"
 mustache = "0.9.0"
diff --git a/rust/extractor/macros/Cargo.toml b/rust/extractor/macros/Cargo.toml
index e2e51876ee7d..1f8bd569fbfb 100644
--- a/rust/extractor/macros/Cargo.toml
+++ b/rust/extractor/macros/Cargo.toml
@@ -9,5 +9,5 @@ proc-macro = true
 
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
-quote = "1.0.41"
-syn = { version = "2.0.106", features = ["full"] }
+quote = "1.0.47"
+syn = { version = "3.0.9", features = ["full"] }
diff --git a/rust/extractor/macros/src/lib.rs b/rust/extractor/macros/src/lib.rs
index 5ba496d4661d..274c65275c58 100644
--- a/rust/extractor/macros/src/lib.rs
+++ b/rust/extractor/macros/src/lib.rs
@@ -20,9 +20,7 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
         .iter()
         .map(|f| {
             let ty_tip = get_type_tip(&f.ty);
-            if f.ident.as_ref().is_some_and(|i| i != "inputs")
-                && ty_tip.is_some_and(|i| i == "Vec")
-            {
+            if ty_tip.is_some_and(|i| i == "Vec") {
                 quote! {
                     #[serde(deserialize_with="deserialize::deserialize_newline_or_comma_separated_vec")]
                     #f
@@ -62,10 +60,6 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
                     #[serde(skip_serializing_if="u8::is_zero")]
                     #id: u8
                 }
-            } else if id == &format_ident!("inputs") {
-                quote! {
-                    #f
-                }
             } else if type_tip.is_some_and(|i| i == "Vec" || i == "FxHashMap" || i == "HashMap") {
                 quote! {
                     #[arg(long)]
@@ -84,14 +78,8 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
         .iter()
         .map(|f| {
             let id = f.ident.as_ref().unwrap();
-            if id == &format_ident!("inputs") {
-                quote! {
-                    .field("number of inputs", &self.#id.len())
-                }
-            } else {
-                quote! {
-                    .field(stringify!(#id), &self.#id)
-                }
+            quote! {
+                .field(stringify!(#id), &self.#id)
             }
         })
         .collect::<Vec<_>>();
diff --git a/rust/extractor/src/config.rs b/rust/extractor/src/config.rs
index 86d3ab6272c8..88f7ada715c6 100644
--- a/rust/extractor/src/config.rs
+++ b/rust/extractor/src/config.rs
@@ -14,7 +14,9 @@ use ra_ap_ide_db::FxHashMap;
 use ra_ap_intern::Symbol;
 use ra_ap_load_cargo::{LoadCargoConfig, ProcMacroServerChoice};
 use ra_ap_paths::{AbsPath, AbsPathBuf, Utf8PathBuf};
-use ra_ap_project_model::{CargoConfig, CargoFeatures, CfgOverrides, RustLibSource, Sysroot};
+use ra_ap_project_model::{
+    CargoConfig, CargoFeatures, CfgOverrides, RustLibSource, Sysroot, TargetDirectoryConfig,
+};
 use rust_extractor_macros::extractor_cli_config;
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
@@ -22,13 +24,15 @@ use std::fmt::Debug;
 use std::ops::Not;
 use std::path::{Path, PathBuf};
 
+use crate::toolchain::select_toolchain;
+
 #[derive(Debug, PartialEq, Eq, Default, Serialize, Deserialize, Clone, Copy, clap::ValueEnum)]
 #[serde(rename_all = "lowercase")]
 #[clap(rename_all = "lowercase")]
 pub enum Compression {
-    #[default] // TODO make gzip default
     None,
     Gzip,
+    #[default]
     Zstd,
 }
 
@@ -58,11 +62,12 @@ pub struct Config {
     pub logging_flamegraph: Option<PathBuf>,
     pub logging_verbosity: Option<String>,
     pub trap_compression: Compression,
-    pub inputs: Vec<PathBuf>,
+    pub file_list: Option<PathBuf>,
     pub qltest: bool,
     pub qltest_cargo_check: bool,
     pub qltest_dependencies: Vec<String>,
     pub qltest_use_nightly: bool,
+    pub qltest_edition: Option<String>,
     pub sysroot: Option<PathBuf>,
     pub sysroot_src: Option<PathBuf>,
     pub rustc_src: Option<PathBuf>,
@@ -74,10 +79,23 @@ pub struct Config {
 }
 
 impl Config {
+    /// Returns the directory where Cargo should place its build cache.
+    pub(crate) fn cargo_target_dir(&self) -> PathBuf {
+        self.cargo_target_dir.clone().unwrap_or_else(|| {
+            // When the `target` directory is not explicitly set, we default to
+            // the relative `target` directory (cargo's default) when running
+            // qltests. This directory is preserved, so subsequent builds
+            // benefit from the cache.
+            if self.qltest {
+                PathBuf::from("target")
+            } else {
+                self.scratch_dir.join("target")
+            }
+        })
+    }
+
     pub fn extract() -> anyhow::Result<Config> {
-        let args = argfile::expand_args(argfile::parse_fromfile, argfile::PREFIX)
-            .context("expanding parameter files")?;
-        let cli_args = CliConfig::parse_from(args);
+        let cli_args = CliConfig::parse();
         let mut figment = Figment::new()
             .merge(Env::raw().filter_map(|f| {
                 if f.eq("CODEQL_VERBOSITY") {
@@ -106,14 +124,34 @@ impl Config {
         figment.extract().context("loading configuration")
     }
 
+    pub(crate) fn get_extra_env(&self) -> FxHashMap<String, Option<String>> {
+        let mut extra_env = FxHashMap::default();
+        // RUSTUP_AUTO_INSTALL is set to 0 by rust-analyzer (https://github.com/rust-lang/rust-analyzer/issues/20719),
+        // but we do want to allow rustup to auto-install toolchains if needed, so we set it to 1 here.
+        extra_env.insert("RUSTUP_AUTO_INSTALL".to_owned(), Some("1".to_owned()));
+        if self.qltest_cargo_check {
+            // Match the `cargo check` invocation in `cargo_check` so Cargo reuses its
+            // cache (it does not when `RUSTFLAGS` differ). `--cap-lints=allow` keeps
+            // deny-by-default lints (e.g. `dangerous_implicit_autorefs` on recent
+            // toolchains) from failing extraction of otherwise valid test sources.
+            extra_env.insert(
+                "RUSTFLAGS".to_owned(),
+                Some("-Awarnings --cap-lints=allow".to_owned()),
+            );
+        }
+        extra_env.extend(self.cargo_extra_env.clone());
+        extra_env.insert("RUSTUP_TOOLCHAIN".to_owned(), Some(select_toolchain()));
+        extra_env
+    }
+
     fn sysroot(&self, dir: &AbsPath) -> Sysroot {
         let sysroot_input = self.sysroot.as_ref().map(|p| join_path_buf(dir, p));
         let sysroot_src_input = self.sysroot_src.as_ref().map(|p| join_path_buf(dir, p));
         match (sysroot_input, sysroot_src_input) {
-            (None, None) => Sysroot::discover(dir, &self.cargo_extra_env),
+            (None, None) => Sysroot::discover(dir, &self.get_extra_env()),
             (Some(sysroot), None) => Sysroot::discover_rust_lib_src_dir(sysroot),
             (None, Some(sysroot_src)) => {
-                Sysroot::discover_with_src_override(dir, &self.cargo_extra_env, sysroot_src)
+                Sysroot::discover_with_src_override(dir, &self.get_extra_env(), sysroot_src)
             }
             (Some(sysroot), Some(sysroot_src)) => Sysroot::new(Some(sysroot), Some(sysroot_src)),
         }
@@ -149,6 +187,16 @@ impl Config {
 
     pub fn to_cargo_config(&self, dir: &AbsPath) -> (CargoConfig, LoadCargoConfig) {
         let sysroot = self.sysroot(dir);
+        let mut extra_args = self.cargo_extra_args.clone();
+        // The fixed toolchain may be older than the project's declared minimum.
+        // If that's the case `cargo` will error. Passing the flag below ensures
+        // that the project's speified Rust version is ignored. With this
+        // failures will only occur if the project actually uses Rust features
+        // that rust-analyzer and/or the fixed toolchain is incompatible with
+        // (which is the best we can hope for).
+        if !extra_args.iter().any(|arg| arg == "--ignore-rust-version") {
+            extra_args.push("--ignore-rust-version".to_owned());
+        }
         (
             CargoConfig {
                 all_targets: self.cargo_all_targets,
@@ -164,19 +212,17 @@ impl Config {
                     .map(ToOwned::to_owned)
                     .map(RustLibSource::Path),
 
-                extra_env: self.cargo_extra_env.clone(),
-                extra_args: self.cargo_extra_args.clone(),
+                extra_env: self.get_extra_env(),
+                extra_args,
                 extra_includes: self
                     .extra_includes
                     .iter()
                     .map(|p| join_path_buf(dir, p))
                     .collect(),
-                target_dir: Utf8PathBuf::from_path_buf(
-                    self.cargo_target_dir
-                        .clone()
-                        .unwrap_or_else(|| self.scratch_dir.join("target")),
-                )
-                .ok(),
+                target_dir_config: Utf8PathBuf::from_path_buf(self.cargo_target_dir()).map_or(
+                    TargetDirectoryConfig::None,
+                    TargetDirectoryConfig::Directory,
+                ),
                 features: self.cargo_features(),
                 target: self.cargo_target.clone(),
                 cfg_overrides: to_cfg_overrides(&self.cargo_cfg_overrides),
@@ -192,6 +238,8 @@ impl Config {
                 load_out_dirs_from_check: true,
                 with_proc_macro_server: self.proc_macro_server_choice(dir),
                 prefill_caches: false,
+                num_worker_threads: 1,
+                proc_macro_processes: 1,
             },
         )
     }
diff --git a/rust/extractor/src/configuration.rs b/rust/extractor/src/configuration.rs
new file mode 100644
index 000000000000..cbf94ee068d3
--- /dev/null
+++ b/rust/extractor/src/configuration.rs
@@ -0,0 +1,307 @@
+use crate::util::cmp_option_by;
+use itertools::Itertools;
+use ra_ap_base_db::{SourceDatabase, SourceRootId, all_crates};
+use ra_ap_cfg::{CfgAtom, CfgOptions};
+use ra_ap_hir::Semantics;
+use ra_ap_ide_db::RootDatabase;
+use ra_ap_project_model::ProjectManifest;
+use ra_ap_vfs::{FileId, Vfs};
+use std::cmp::Ordering;
+use std::collections::{BTreeMap, HashMap, HashSet, btree_map::Entry};
+use std::path::{Path, PathBuf};
+
+/// Returns the enclosing directory of the manifest file.
+pub fn manifest_parent(manifest: &ProjectManifest) -> &Path {
+    manifest.manifest_path().parent().as_ref()
+}
+
+/// Reads the file's source-root ID in `db`.
+///
+/// A source root is rust-analyzer's group of files within which relative paths
+/// are resolved. It need not correspond to one crate: a package's library and
+/// build script can share a source root.
+fn source_root_id(db: &RootDatabase, file_id: FileId) -> SourceRootId {
+    db.file_source_root(file_id).source_root_id(db)
+}
+
+/// Maps source root IDs to cfg options shared by all their crates, using only
+/// metadata.
+///
+/// In order for a file to be included in a crate the crate's root file and the
+/// file must share the same source root. However, this condition is not
+/// sufficient. The construction here relies on this to identify the cases where
+/// this requirement _is_ sufficient to determine the cfg options of any crate
+/// that could contain the file. Either because only one crate can contain it or
+/// because all such crates share the same cfg options.
+///
+/// Roots whose crates disagree map to `None` and need per-file semantic lookup.
+fn root_configurations(db: &RootDatabase) -> HashMap<SourceRootId, Option<&CfgOptions>> {
+    let mut configurations = HashMap::new();
+    for &krate in all_crates(db).iter() {
+        let root = source_root_id(db, krate.data(db).root_file_id);
+        configurations
+            .entry(root)
+            .and_modify(|configuration: &mut Option<&CfgOptions>| {
+                // We're in the case where multiple crates share a source root,
+                // for example a library and its build script. If their cfg
+                // options differ, we mark the configuration as `None`.
+                if configuration.is_some_and(|cfg| cfg != krate.cfg_options(db)) {
+                    *configuration = None;
+                }
+            })
+            .or_insert_with(|| Some(krate.cfg_options(db)));
+    }
+    configurations
+}
+
+/// Returns an iterator over the dependency files in `vfs`.
+///
+/// These are files that correspond to libraries and that are not in `source_files`.
+pub fn dependency_files<'a>(
+    db: &'a RootDatabase,
+    vfs: &'a Vfs,
+    source_files: &'a HashSet<PathBuf>,
+) -> impl Iterator<Item = (FileId, &'a Path)> {
+    vfs.iter().filter_map(|(file_id, file)| {
+        let file = file.as_path().map(<_ as AsRef<Path>>::as_ref)?;
+        (file.extension().is_some_and(|ext| ext == "rs")
+            && !source_files.contains(file)
+            && db
+                .source_root(source_root_id(db, file_id))
+                .source_root(db)
+                .is_library)
+            .then_some((file_id, file))
+    })
+}
+
+/// Compare two `CfgOptions`. Feature count wins, sorted cfg options break ties.
+fn compare_cfg_options(left: &CfgOptions, right: &CfgOptions) -> Ordering {
+    let feature_count = |cfg_options: &CfgOptions| {
+        cfg_options
+            .into_iter()
+            .filter(|cfg| matches!(cfg, CfgAtom::KeyValue { key, .. } if key.as_str() == "feature"))
+            .count()
+    };
+    feature_count(left)
+        .cmp(&feature_count(right))
+        .then_with(|| left.into_iter().sorted().cmp(right.into_iter().sorted()))
+}
+
+#[derive(PartialEq, Eq)]
+struct DependencySource<'a> {
+    cfg_options: Option<CfgOptions>,
+    manifest: &'a ProjectManifest,
+}
+
+impl Ord for DependencySource<'_> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        // Compare by cfg options first, then by manifest parent directory
+        // (arbitrary but deterministic).
+        cmp_option_by(&self.cfg_options, &other.cfg_options, compare_cfg_options)
+            .then_with(|| manifest_parent(self.manifest).cmp(manifest_parent(other.manifest)))
+    }
+}
+
+impl PartialOrd for DependencySource<'_> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+/// Tracks extraction candidates for each dependency file. Keeps one preferred
+/// manifest per distinct set of cfg options, allowing lower-priority
+/// configurations to be tried if the preferred one disables a file.
+#[derive(Default)]
+pub struct DependencyFiles<'a> {
+    files: BTreeMap<PathBuf, Vec<DependencySource<'a>>>,
+}
+
+impl<'a> DependencyFiles<'a> {
+    /// Considers dependency files loaded from this manifest as extraction
+    /// candidates. The lexicographically largest manifest directory wins for
+    /// each configuration.
+    pub fn add_manifest(
+        &mut self,
+        manifest: &'a ProjectManifest,
+        semantics: &Semantics<'_, RootDatabase>,
+        vfs: &Vfs,
+        source_files: &HashSet<PathBuf>,
+    ) {
+        let db = semantics.db;
+        let root_configurations = root_configurations(db);
+        for (file_id, file) in dependency_files(db, vfs, source_files) {
+            let root = source_root_id(db, file_id);
+            let cfg_options = match root_configurations.get(&root) {
+                // There's a unique cfg configuration for this file.
+                Some(Some(configuration)) => Some((*configuration).clone()),
+                // There's no unique cfg configuration for this file. In this
+                // case we fall back to the expensive `file_to_module_def`
+                // approach which requires rust_analyzer to calculate semantic
+                // information.
+                Some(None) => semantics
+                    .file_to_module_def(file_id)
+                    .map(|module| module.krate(db).cfg(db).clone()),
+                None => None,
+            };
+            self.add_candidate(file, cfg_options, manifest);
+        }
+    }
+
+    /// Adds `cfg_options` and `manifest` as an extraction candidate for the
+    /// given file unless a higher-priority candidate with the same cfg options
+    /// already exists.
+    fn add_candidate(
+        &mut self,
+        file: &Path,
+        cfg_options: Option<CfgOptions>,
+        manifest: &'a ProjectManifest,
+    ) {
+        let candidate = DependencySource {
+            cfg_options,
+            manifest,
+        };
+        match self.files.entry(file.to_owned()) {
+            Entry::Occupied(mut entry) => {
+                let sources = entry.get_mut();
+                if let Some(source) = sources
+                    .iter_mut()
+                    .find(|source| source.cfg_options == candidate.cfg_options)
+                {
+                    if manifest_parent(manifest) > manifest_parent(source.manifest) {
+                        source.manifest = manifest;
+                    }
+                } else {
+                    sources.push(candidate);
+                }
+            }
+            Entry::Vacant(entry) => {
+                entry.insert(vec![candidate]);
+            }
+        }
+    }
+
+    /// Takes the highest-priority remaining context for each file, grouped by
+    /// manifest. Lower-priority configurations remain available if the selected
+    /// one disables the file.
+    pub fn by_manifests(&mut self) -> HashMap<&'a ProjectManifest, Vec<PathBuf>> {
+        self.files
+            .iter_mut()
+            .filter_map(|(file, sources)| {
+                sources.sort_unstable();
+                sources.pop().map(|source| (source.manifest, file.clone()))
+            })
+            .into_group_map()
+    }
+
+    /// Returns `true` if there are alternative configurations left for the
+    /// given file.
+    pub fn has_alternative(&self, file: &Path) -> bool {
+        self.files
+            .get(file)
+            .is_some_and(|sources| !sources.is_empty())
+    }
+
+    /// Marks a file as extracted, removing it from the map of files.
+    pub fn extracted(&mut self, file: &Path) {
+        self.files.remove(file);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use ra_ap_base_db::{
+        CrateGraphBuilder, CrateOrigin, CrateWorkspaceData, FileChange, FileSet, SourceRoot,
+    };
+    use ra_ap_intern::Symbol;
+    use ra_ap_span::Edition;
+    use ra_ap_vfs::VfsPath;
+    use triomphe::Arc;
+
+    fn cfg(features: &[&str]) -> CfgOptions {
+        let mut cfg = CfgOptions::default();
+        for feature in features {
+            cfg.insert_key_value(Symbol::intern("feature"), Symbol::intern(feature));
+        }
+        cfg
+    }
+
+    fn workspace(files: &[&str], crates: &[(&str, &[&str])]) -> (RootDatabase, Vfs) {
+        let root = crate::cwd().unwrap();
+        let mut vfs = Vfs::default();
+        let mut file_set = FileSet::default();
+        let mut change = FileChange::default();
+        for &name in files {
+            let path = VfsPath::from(root.join(name));
+            vfs.set_file_contents(path.clone(), Some(Vec::new()));
+            let (id, _) = vfs.file_id(&path).unwrap();
+            file_set.insert(id, path);
+        }
+        let mut graph = CrateGraphBuilder::default();
+        for &(name, features) in crates {
+            let (id, _) = vfs.file_id(&VfsPath::from(root.join(name))).unwrap();
+            graph.add_crate_root(
+                id,
+                Edition::Edition2024,
+                None,
+                None,
+                cfg(features),
+                None,
+                Default::default(),
+                CrateOrigin::Library {
+                    repo: None,
+                    name: Symbol::intern(name),
+                },
+                Vec::new(),
+                false,
+                Arc::new(root.clone()),
+                Arc::new(CrateWorkspaceData {
+                    target: Err("unused in these tests".into()),
+                    toolchain: None,
+                }),
+            );
+        }
+        change.set_roots(vec![SourceRoot::new_library(file_set)]);
+        change.set_crate_graph(graph);
+        let mut db = RootDatabase::default();
+        change.apply(&mut db);
+        (db, vfs)
+    }
+
+    #[test]
+    fn selects_configuration_without_reading_dependency_sources() {
+        for crates in [
+            vec![("lib.rs", &["a"][..])],
+            vec![("lib.rs", &["a"][..]), ("build.rs", &["a"][..])],
+        ] {
+            let (db, vfs) = workspace(&["lib.rs", "build.rs", "module.rs"], &crates);
+            let root = crate::cwd().unwrap();
+            let manifest = ProjectManifest::from_manifest_file(root.join("Cargo.toml")).unwrap();
+            let mut plan = DependencyFiles::default();
+            plan.add_manifest(&manifest, &Semantics::new(&db), &vfs, &HashSet::new());
+            assert_eq!(plan.files.len(), 3);
+            for sources in plan.files.values() {
+                assert_eq!(sources[0].cfg_options, Some(cfg(&["a"])));
+            }
+        }
+    }
+
+    #[test]
+    fn selects_highest_priority_in_either_order() {
+        let root = crate::cwd().unwrap();
+        let manifest = |path| ProjectManifest::from_manifest_file(root.join(path)).unwrap();
+        let candidates = [
+            (manifest("z/Cargo.toml"), cfg(&["z"])),
+            (manifest("a/Cargo.toml"), cfg(&["a", "b"])),
+            (manifest("b/Cargo.toml"), cfg(&["a", "b"])),
+        ];
+        for order in [[0, 1, 2], [2, 1, 0]] {
+            let mut plan = DependencyFiles::default();
+            for (manifest, cfg) in order.map(|index| &candidates[index]) {
+                plan.add_candidate(Path::new("lib.rs"), Some(cfg.clone()), manifest);
+            }
+            let expected = HashMap::from([(&candidates[2].0, vec![PathBuf::from("lib.rs")])]);
+            assert_eq!(plan.by_manifests(), expected);
+        }
+    }
+}
diff --git a/rust/extractor/src/crate_graph.rs b/rust/extractor/src/crate_graph.rs
index 87f8e4e17b41..7a1505347d68 100644
--- a/rust/extractor/src/crate_graph.rs
+++ b/rust/extractor/src/crate_graph.rs
@@ -1,7 +1,7 @@
 use crate::{generated, trap};
 
 use itertools::Itertools;
-use ra_ap_base_db::{Crate, RootQueryDb};
+use ra_ap_base_db::Crate;
 use ra_ap_cfg::CfgAtom;
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_vfs::{Vfs, VfsPath};
@@ -12,7 +12,7 @@ use std::{cmp::Ordering, collections::HashMap, path::PathBuf};
 use tracing::error;
 
 pub fn extract_crate_graph(trap_provider: &trap::TrapFileProvider, db: &RootDatabase, vfs: &Vfs) {
-    let crate_graph = db.all_crates();
+    let crate_graph = ra_ap_base_db::all_crates(db);
 
     // According to the documentation of `CrateGraph`:
     // Each crate is defined by the `FileId` of its root module, the set of enabled
diff --git a/rust/extractor/src/diagnostics.rs b/rust/extractor/src/diagnostics.rs
index 0db3358d558a..ab88192c5d3e 100644
--- a/rust/extractor/src/diagnostics.rs
+++ b/rust/extractor/src/diagnostics.rs
@@ -5,7 +5,7 @@ use chrono::{DateTime, Utc};
 use ra_ap_project_model::ProjectManifest;
 use serde::Serialize;
 use serde::ser::SerializeMap;
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::fmt::Display;
 use std::fs::File;
 use std::path::{Path, PathBuf};
@@ -220,13 +220,15 @@ struct ExtractionSummary {
 type ExtractionDiagnostics = Diagnostics<ExtractionSummary>;
 
 fn summary(start: Instant, steps: &[ExtractionStep]) -> ExtractionSummary {
-    let mut number_of_manifests = 0;
+    // The manifests loaded during extraction. We might load the same manifest
+    // multiple times, so we use a set to keep track of unique manifests.
+    let mut manifests = HashSet::new();
     let mut number_of_files = 0;
     let mut durations = HashMap::new();
     for step in steps {
         match &step.action {
             ExtractionStepKind::LoadManifest => {
-                number_of_manifests += 1;
+                manifests.extend(step.file.as_ref());
             }
             ExtractionStepKind::Parse => {
                 number_of_files += 1;
@@ -244,7 +246,7 @@ fn summary(start: Instant, steps: &[ExtractionStep]) -> ExtractionSummary {
     }
     info!("total duration: {total}");
     ExtractionSummary {
-        number_of_manifests,
+        number_of_manifests: manifests.len(),
         number_of_files,
         durations: DurationsSummary { durations, total },
     }
@@ -284,3 +286,22 @@ pub fn emit_extraction_diagnostics(
         .with_context(|| format!("writing to diagnostics file {}", target.display()))?;
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn counts_unique_manifests_but_includes_reload_duration() {
+        let steps: Vec<_> = ["a/Cargo.toml", "b/Cargo.toml", "a/Cargo.toml"]
+            .into_iter()
+            .map(|path| ExtractionStep {
+                action: ExtractionStepKind::LoadManifest,
+                file: Some(PathBuf::from(path)),
+                ms: 1,
+            })
+            .collect();
+        let summary = summary(Instant::now(), &steps);
+        assert_eq!(summary.number_of_manifests, 2);
+    }
+}
diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index 1cd4ba35b285..8edb95b72b86 100644
--- a/rust/extractor/src/generated/.generated.list
+++ b/rust/extractor/src/generated/.generated.list
@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs 2e8e3b4e42b172708bb3a6ec3a92a6577c576887019603ca3d0f045bbdbfdbac 2e8e3b4e42b172708bb3a6ec3a92a6577c576887019603ca3d0f045bbdbfdbac
+top.rs 5f0e554779a819f9163edf611cb7420ec588986f77edc97c65fa01de726c18e1 5f0e554779a819f9163edf611cb7420ec588986f77edc97c65fa01de726c18e1
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index b4a463bb4c75..77c33e218ab7 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -362,6 +362,42 @@ impl From<trap::Label<Addressable>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct AnyAttr {
+    _unused: ()
+}
+
+impl trap::TrapClass for AnyAttr {
+    fn class_name() -> &'static str { "AnyAttr" }
+}
+
+impl From<trap::Label<AnyAttr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<AnyAttr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AnyAttr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AnyAttr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<AnyAttr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AnyAttr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AnyAttr>> for trap::Label<Element> {
+    fn from(value: trap::Label<AnyAttr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AnyAttr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct ArgList {
     pub id: trap::TrapId<ArgList>,
@@ -688,7 +724,7 @@ impl From<trap::Label<AsmRegSpec>> for trap::Label<Element> {
 pub struct AssocItemList {
     pub id: trap::TrapId<AssocItemList>,
     pub assoc_items: Vec<trap::Label<AssocItem>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
 }
 
 impl trap::TrapEntry for AssocItemList {
@@ -739,49 +775,35 @@ impl From<trap::Label<AssocItemList>> for trap::Label<Element> {
 }
 
 #[derive(Debug)]
-pub struct Attr {
-    pub id: trap::TrapId<Attr>,
-    pub meta: Option<trap::Label<Meta>>,
-}
-
-impl trap::TrapEntry for Attr {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("attrs", vec![id.into()]);
-        if let Some(v) = self.meta {
-            out.add_tuple("attr_meta", vec![id.into(), v.into()]);
-        }
-    }
+pub struct Callable {
+    _unused: ()
 }
 
-impl trap::TrapClass for Attr {
-    fn class_name() -> &'static str { "Attr" }
+impl trap::TrapClass for Callable {
+    fn class_name() -> &'static str { "Callable" }
 }
 
-impl From<trap::Label<Attr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Attr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Attr is a subclass of AstNode
+impl From<trap::Label<Callable>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Callable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Callable is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Attr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Attr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Attr is a subclass of Locatable
+impl From<trap::Label<Callable>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Callable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Callable is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Attr>> for trap::Label<Element> {
-    fn from(value: trap::Label<Attr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Attr is a subclass of Element
+impl From<trap::Label<Callable>> for trap::Label<Element> {
+    fn from(value: trap::Label<Callable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Callable is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -789,35 +811,35 @@ impl From<trap::Label<Attr>> for trap::Label<Element> {
 }
 
 #[derive(Debug)]
-pub struct Callable {
+pub struct CfgPredicate {
     _unused: ()
 }
 
-impl trap::TrapClass for Callable {
-    fn class_name() -> &'static str { "Callable" }
+impl trap::TrapClass for CfgPredicate {
+    fn class_name() -> &'static str { "CfgPredicate" }
 }
 
-impl From<trap::Label<Callable>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Callable>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Callable is a subclass of AstNode
+impl From<trap::Label<CfgPredicate>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<CfgPredicate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgPredicate is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Callable>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Callable>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Callable is a subclass of Locatable
+impl From<trap::Label<CfgPredicate>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<CfgPredicate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgPredicate is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Callable>> for trap::Label<Element> {
-    fn from(value: trap::Label<Callable>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Callable is a subclass of Element
+impl From<trap::Label<CfgPredicate>> for trap::Label<Element> {
+    fn from(value: trap::Label<CfgPredicate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgPredicate is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -863,7 +885,7 @@ impl From<trap::Label<Expr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct ExternItemList {
     pub id: trap::TrapId<ExternItemList>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub extern_items: Vec<trap::Label<ExternItem>>,
 }
 
@@ -1226,10 +1248,60 @@ impl From<trap::Label<GenericParamList>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct ImplRestriction {
+    pub id: trap::TrapId<ImplRestriction>,
+    pub visibility_inner: Option<trap::Label<VisibilityInner>>,
+}
+
+impl trap::TrapEntry for ImplRestriction {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("impl_restrictions", vec![id.into()]);
+        if let Some(v) = self.visibility_inner {
+            out.add_tuple("impl_restriction_visibility_inners", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ImplRestriction {
+    fn class_name() -> &'static str { "ImplRestriction" }
+}
+
+impl From<trap::Label<ImplRestriction>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ImplRestriction>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplRestriction is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ImplRestriction>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ImplRestriction>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplRestriction is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ImplRestriction>> for trap::Label<Element> {
+    fn from(value: trap::Label<ImplRestriction>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplRestriction is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct ItemList {
     pub id: trap::TrapId<ItemList>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub items: Vec<trap::Label<Item>>,
 }
 
@@ -1433,7 +1505,7 @@ impl From<trap::Label<MacroItems>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct MatchArm {
     pub id: trap::TrapId<MatchArm>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub expr: Option<trap::Label<Expr>>,
     pub guard: Option<trap::Label<MatchGuard>>,
     pub pat: Option<trap::Label<Pat>>,
@@ -1496,7 +1568,7 @@ impl From<trap::Label<MatchArm>> for trap::Label<Element> {
 pub struct MatchArmList {
     pub id: trap::TrapId<MatchArmList>,
     pub arms: Vec<trap::Label<MatchArm>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
 }
 
 impl trap::TrapEntry for MatchArmList {
@@ -1598,33 +1670,7 @@ impl From<trap::Label<MatchGuard>> for trap::Label<Element> {
 
 #[derive(Debug)]
 pub struct Meta {
-    pub id: trap::TrapId<Meta>,
-    pub expr: Option<trap::Label<Expr>>,
-    pub is_unsafe: bool,
-    pub path: Option<trap::Label<Path>>,
-    pub token_tree: Option<trap::Label<TokenTree>>,
-}
-
-impl trap::TrapEntry for Meta {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("meta", vec![id.into()]);
-        if let Some(v) = self.expr {
-            out.add_tuple("meta_exprs", vec![id.into(), v.into()]);
-        }
-        if self.is_unsafe {
-            out.add_tuple("meta_is_unsafe", vec![id.into()]);
-        }
-        if let Some(v) = self.path {
-            out.add_tuple("meta_paths", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.token_tree {
-            out.add_tuple("meta_token_trees", vec![id.into(), v.into()]);
-        }
-    }
+    _unused: ()
 }
 
 impl trap::TrapClass for Meta {
@@ -1658,6 +1704,60 @@ impl From<trap::Label<Meta>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct MutRestriction {
+    pub id: trap::TrapId<MutRestriction>,
+    pub is_mut: bool,
+    pub visibility_inner: Option<trap::Label<VisibilityInner>>,
+}
+
+impl trap::TrapEntry for MutRestriction {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("mut_restrictions", vec![id.into()]);
+        if self.is_mut {
+            out.add_tuple("mut_restriction_is_mut", vec![id.into()]);
+        }
+        if let Some(v) = self.visibility_inner {
+            out.add_tuple("mut_restriction_visibility_inners", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MutRestriction {
+    fn class_name() -> &'static str { "MutRestriction" }
+}
+
+impl From<trap::Label<MutRestriction>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MutRestriction>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MutRestriction is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MutRestriction>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MutRestriction>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MutRestriction is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MutRestriction>> for trap::Label<Element> {
+    fn from(value: trap::Label<MutRestriction>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MutRestriction is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct Name {
     pub id: trap::TrapId<Name>,
@@ -2200,7 +2300,7 @@ impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct SourceFile {
     pub id: trap::TrapId<SourceFile>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub items: Vec<trap::Label<Item>>,
 }
 
@@ -2290,7 +2390,7 @@ impl From<trap::Label<Stmt>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct StmtList {
     pub id: trap::TrapId<StmtList>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub statements: Vec<trap::Label<Stmt>>,
     pub tail_expr: Option<trap::Label<Expr>>,
 }
@@ -2348,7 +2448,7 @@ impl From<trap::Label<StmtList>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct StructExprField {
     pub id: trap::TrapId<StructExprField>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub expr: Option<trap::Label<Expr>>,
     pub identifier: Option<trap::Label<NameRef>>,
 }
@@ -2406,7 +2506,7 @@ impl From<trap::Label<StructExprField>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct StructExprFieldList {
     pub id: trap::TrapId<StructExprFieldList>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub fields: Vec<trap::Label<StructExprField>>,
     pub spread: Option<trap::Label<Expr>>,
 }
@@ -2464,9 +2564,10 @@ impl From<trap::Label<StructExprFieldList>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct StructField {
     pub id: trap::TrapId<StructField>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub default: Option<trap::Label<Expr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
+    pub default_val: Option<trap::Label<ConstArg>>,
     pub is_unsafe: bool,
+    pub mut_restriction: Option<trap::Label<MutRestriction>>,
     pub name: Option<trap::Label<Name>>,
     pub type_repr: Option<trap::Label<TypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -2482,12 +2583,15 @@ impl trap::TrapEntry for StructField {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("struct_field_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.default {
-            out.add_tuple("struct_field_defaults", vec![id.into(), v.into()]);
+        if let Some(v) = self.default_val {
+            out.add_tuple("struct_field_default_vals", vec![id.into(), v.into()]);
         }
         if self.is_unsafe {
             out.add_tuple("struct_field_is_unsafe", vec![id.into()]);
         }
+        if let Some(v) = self.mut_restriction {
+            out.add_tuple("struct_field_mut_restrictions", vec![id.into(), v.into()]);
+        }
         if let Some(v) = self.name {
             out.add_tuple("struct_field_names", vec![id.into(), v.into()]);
         }
@@ -2534,7 +2638,7 @@ impl From<trap::Label<StructField>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct StructPatField {
     pub id: trap::TrapId<StructPatField>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub identifier: Option<trap::Label<NameRef>>,
     pub pat: Option<trap::Label<Pat>>,
 }
@@ -2725,10 +2829,65 @@ impl From<trap::Label<TokenTree>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct TryBlockModifier {
+    pub id: trap::TrapId<TryBlockModifier>,
+    pub is_try: bool,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
+}
+
+impl trap::TrapEntry for TryBlockModifier {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("try_block_modifiers", vec![id.into()]);
+        if self.is_try {
+            out.add_tuple("try_block_modifier_is_try", vec![id.into()]);
+        }
+        if let Some(v) = self.type_repr {
+            out.add_tuple("try_block_modifier_type_reprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TryBlockModifier {
+    fn class_name() -> &'static str { "TryBlockModifier" }
+}
+
+impl From<trap::Label<TryBlockModifier>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TryBlockModifier>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TryBlockModifier is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TryBlockModifier>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TryBlockModifier>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TryBlockModifier is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TryBlockModifier>> for trap::Label<Element> {
+    fn from(value: trap::Label<TryBlockModifier>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TryBlockModifier is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct TupleField {
     pub id: trap::TrapId<TupleField>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
+    pub mut_restriction: Option<trap::Label<MutRestriction>>,
     pub type_repr: Option<trap::Label<TypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
 }
@@ -2743,6 +2902,9 @@ impl trap::TrapEntry for TupleField {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("tuple_field_attrs", vec![id.into(), i.into(), v.into()]);
         }
+        if let Some(v) = self.mut_restriction {
+            out.add_tuple("tuple_field_mut_restrictions", vec![id.into(), v.into()]);
+        }
         if let Some(v) = self.type_repr {
             out.add_tuple("tuple_field_type_reprs", vec![id.into(), v.into()]);
         }
@@ -3190,7 +3352,7 @@ impl From<trap::Label<VariantList>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct Visibility {
     pub id: trap::TrapId<Visibility>,
-    pub path: Option<trap::Label<Path>>,
+    pub visibility_inner: Option<trap::Label<VisibilityInner>>,
 }
 
 impl trap::TrapEntry for Visibility {
@@ -3200,8 +3362,8 @@ impl trap::TrapEntry for Visibility {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("visibilities", vec![id.into()]);
-        if let Some(v) = self.path {
-            out.add_tuple("visibility_paths", vec![id.into(), v.into()]);
+        if let Some(v) = self.visibility_inner {
+            out.add_tuple("visibility_visibility_inners", vec![id.into(), v.into()]);
         }
     }
 }
@@ -3237,6 +3399,56 @@ impl From<trap::Label<Visibility>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct VisibilityInner {
+    pub id: trap::TrapId<VisibilityInner>,
+    pub path: Option<trap::Label<Path>>,
+}
+
+impl trap::TrapEntry for VisibilityInner {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("visibility_inners", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("visibility_inner_paths", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for VisibilityInner {
+    fn class_name() -> &'static str { "VisibilityInner" }
+}
+
+impl From<trap::Label<VisibilityInner>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<VisibilityInner>) -> Self {
+        // SAFETY: this is safe because in the dbscheme VisibilityInner is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<VisibilityInner>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<VisibilityInner>) -> Self {
+        // SAFETY: this is safe because in the dbscheme VisibilityInner is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<VisibilityInner>> for trap::Label<Element> {
+    fn from(value: trap::Label<VisibilityInner>) -> Self {
+        // SAFETY: this is safe because in the dbscheme VisibilityInner is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct WhereClause {
     pub id: trap::TrapId<WhereClause>,
@@ -3352,7 +3564,7 @@ impl From<trap::Label<WherePred>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct ArrayExprInternal {
     pub id: trap::TrapId<ArrayExprInternal>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub exprs: Vec<trap::Label<Expr>>,
     pub is_semicolon: bool,
 }
@@ -3482,6 +3694,7 @@ impl From<trap::Label<ArrayTypeRepr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct AsmClobberAbi {
     pub id: trap::TrapId<AsmClobberAbi>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
 }
 
 impl trap::TrapEntry for AsmClobberAbi {
@@ -3491,6 +3704,9 @@ impl trap::TrapEntry for AsmClobberAbi {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("asm_clobber_abis", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("asm_clobber_abi_attrs", vec![id.into(), i.into(), v.into()]);
+        }
     }
 }
 
@@ -3660,6 +3876,7 @@ impl From<trap::Label<AsmLabel>> for trap::Label<Element> {
 pub struct AsmOperandNamed {
     pub id: trap::TrapId<AsmOperandNamed>,
     pub asm_operand: Option<trap::Label<AsmOperand>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub name: Option<trap::Label<Name>>,
 }
 
@@ -3673,6 +3890,9 @@ impl trap::TrapEntry for AsmOperandNamed {
         if let Some(v) = self.asm_operand {
             out.add_tuple("asm_operand_named_asm_operands", vec![id.into(), v.into()]);
         }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("asm_operand_named_attrs", vec![id.into(), i.into(), v.into()]);
+        }
         if let Some(v) = self.name {
             out.add_tuple("asm_operand_named_names", vec![id.into(), v.into()]);
         }
@@ -3723,6 +3943,7 @@ impl From<trap::Label<AsmOperandNamed>> for trap::Label<Element> {
 pub struct AsmOptionsList {
     pub id: trap::TrapId<AsmOptionsList>,
     pub asm_options: Vec<trap::Label<AsmOption>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
 }
 
 impl trap::TrapEntry for AsmOptionsList {
@@ -3735,6 +3956,9 @@ impl trap::TrapEntry for AsmOptionsList {
         for (i, v) in self.asm_options.into_iter().enumerate() {
             out.add_tuple("asm_options_list_asm_options", vec![id.into(), i.into(), v.into()]);
         }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("asm_options_list_attrs", vec![id.into(), i.into(), v.into()]);
+        }
     }
 }
 
@@ -3992,19 +4216,78 @@ impl From<trap::Label<AssocTypeArg>> for trap::Label<Element> {
 }
 
 #[derive(Debug)]
-pub struct AwaitExpr {
-    pub id: trap::TrapId<AwaitExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub expr: Option<trap::Label<Expr>>,
+pub struct Attr {
+    pub id: trap::TrapId<Attr>,
+    pub meta: Option<trap::Label<Meta>>,
 }
 
-impl trap::TrapEntry for AwaitExpr {
+impl trap::TrapEntry for Attr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("await_exprs", vec![id.into()]);
+        out.add_tuple("attrs", vec![id.into()]);
+        if let Some(v) = self.meta {
+            out.add_tuple("attr_meta", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Attr {
+    fn class_name() -> &'static str { "Attr" }
+}
+
+impl From<trap::Label<Attr>> for trap::Label<AnyAttr> {
+    fn from(value: trap::Label<Attr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Attr is a subclass of AnyAttr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Attr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Attr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Attr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Attr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Attr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Attr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Attr>> for trap::Label<Element> {
+    fn from(value: trap::Label<Attr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Attr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct AwaitExpr {
+    pub id: trap::TrapId<AwaitExpr>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for AwaitExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("await_exprs", vec![id.into()]);
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("await_expr_attrs", vec![id.into(), i.into(), v.into()]);
         }
@@ -4057,7 +4340,7 @@ impl From<trap::Label<AwaitExpr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct BecomeExpr {
     pub id: trap::TrapId<BecomeExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub expr: Option<trap::Label<Expr>>,
 }
 
@@ -4120,7 +4403,7 @@ impl From<trap::Label<BecomeExpr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct BinaryExpr {
     pub id: trap::TrapId<BinaryExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub lhs: Option<trap::Label<Expr>>,
     pub operator_name: Option<String>,
     pub rhs: Option<trap::Label<Expr>>,
@@ -4250,7 +4533,7 @@ impl From<trap::Label<BoxPat>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct BreakExpr {
     pub id: trap::TrapId<BreakExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub expr: Option<trap::Label<Expr>>,
     pub lifetime: Option<trap::Label<Lifetime>>,
 }
@@ -4318,7 +4601,7 @@ impl From<trap::Label<BreakExpr>> for trap::Label<Element> {
 pub struct CallExpr {
     pub id: trap::TrapId<CallExpr>,
     pub arg_list: Option<trap::Label<ArgList>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub function: Option<trap::Label<Expr>>,
 }
 
@@ -4384,7 +4667,7 @@ impl From<trap::Label<CallExpr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct CastExpr {
     pub id: trap::TrapId<CastExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub expr: Option<trap::Label<Expr>>,
     pub type_repr: Option<trap::Label<TypeRepr>>,
 }
@@ -4448,11 +4731,365 @@ impl From<trap::Label<CastExpr>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct CfgAtom {
+    pub id: trap::TrapId<CfgAtom>,
+}
+
+impl trap::TrapEntry for CfgAtom {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("cfg_atoms", vec![id.into()]);
+    }
+}
+
+impl trap::TrapClass for CfgAtom {
+    fn class_name() -> &'static str { "CfgAtom" }
+}
+
+impl From<trap::Label<CfgAtom>> for trap::Label<CfgPredicate> {
+    fn from(value: trap::Label<CfgAtom>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgAtom is a subclass of CfgPredicate
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgAtom>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<CfgAtom>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgAtom is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgAtom>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<CfgAtom>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgAtom is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgAtom>> for trap::Label<Element> {
+    fn from(value: trap::Label<CfgAtom>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgAtom is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct CfgAttrMeta {
+    pub id: trap::TrapId<CfgAttrMeta>,
+    pub cfg_predicate: Option<trap::Label<CfgPredicate>>,
+    pub metas: Vec<trap::Label<Meta>>,
+}
+
+impl trap::TrapEntry for CfgAttrMeta {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("cfg_attr_meta", vec![id.into()]);
+        if let Some(v) = self.cfg_predicate {
+            out.add_tuple("cfg_attr_meta_cfg_predicates", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.metas.into_iter().enumerate() {
+            out.add_tuple("cfg_attr_meta_metas", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for CfgAttrMeta {
+    fn class_name() -> &'static str { "CfgAttrMeta" }
+}
+
+impl From<trap::Label<CfgAttrMeta>> for trap::Label<Meta> {
+    fn from(value: trap::Label<CfgAttrMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgAttrMeta is a subclass of Meta
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgAttrMeta>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<CfgAttrMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgAttrMeta is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgAttrMeta>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<CfgAttrMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgAttrMeta is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgAttrMeta>> for trap::Label<Element> {
+    fn from(value: trap::Label<CfgAttrMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgAttrMeta is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct CfgComposite {
+    pub id: trap::TrapId<CfgComposite>,
+    pub cfg_predicates: Vec<trap::Label<CfgPredicate>>,
+}
+
+impl trap::TrapEntry for CfgComposite {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("cfg_composites", vec![id.into()]);
+        for (i, v) in self.cfg_predicates.into_iter().enumerate() {
+            out.add_tuple("cfg_composite_cfg_predicates", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for CfgComposite {
+    fn class_name() -> &'static str { "CfgComposite" }
+}
+
+impl From<trap::Label<CfgComposite>> for trap::Label<CfgPredicate> {
+    fn from(value: trap::Label<CfgComposite>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgComposite is a subclass of CfgPredicate
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgComposite>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<CfgComposite>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgComposite is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgComposite>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<CfgComposite>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgComposite is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgComposite>> for trap::Label<Element> {
+    fn from(value: trap::Label<CfgComposite>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgComposite is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct CfgMeta {
+    pub id: trap::TrapId<CfgMeta>,
+    pub cfg_predicate: Option<trap::Label<CfgPredicate>>,
+}
+
+impl trap::TrapEntry for CfgMeta {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("cfg_meta", vec![id.into()]);
+        if let Some(v) = self.cfg_predicate {
+            out.add_tuple("cfg_meta_cfg_predicates", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for CfgMeta {
+    fn class_name() -> &'static str { "CfgMeta" }
+}
+
+impl From<trap::Label<CfgMeta>> for trap::Label<Meta> {
+    fn from(value: trap::Label<CfgMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgMeta is a subclass of Meta
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgMeta>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<CfgMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgMeta is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgMeta>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<CfgMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgMeta is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgMeta>> for trap::Label<Element> {
+    fn from(value: trap::Label<CfgMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgMeta is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct CfgPredExpr {
+    pub id: trap::TrapId<CfgPredExpr>,
+    pub cfg_predicate: Option<trap::Label<CfgPredicate>>,
+}
+
+impl trap::TrapEntry for CfgPredExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("cfg_pred_exprs", vec![id.into()]);
+        if let Some(v) = self.cfg_predicate {
+            out.add_tuple("cfg_pred_expr_cfg_predicates", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for CfgPredExpr {
+    fn class_name() -> &'static str { "CfgPredExpr" }
+}
+
+impl From<trap::Label<CfgPredExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<CfgPredExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgPredExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgPredExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<CfgPredExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgPredExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgPredExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<CfgPredExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgPredExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgPredExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<CfgPredExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgPredExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct CfgPredPat {
+    pub id: trap::TrapId<CfgPredPat>,
+    pub cfg_predicate: Option<trap::Label<CfgPredicate>>,
+}
+
+impl trap::TrapEntry for CfgPredPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("cfg_pred_pats", vec![id.into()]);
+        if let Some(v) = self.cfg_predicate {
+            out.add_tuple("cfg_pred_pat_cfg_predicates", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for CfgPredPat {
+    fn class_name() -> &'static str { "CfgPredPat" }
+}
+
+impl From<trap::Label<CfgPredPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<CfgPredPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgPredPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgPredPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<CfgPredPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgPredPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgPredPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<CfgPredPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgPredPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CfgPredPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<CfgPredPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CfgPredPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct ClosureExpr {
     pub id: trap::TrapId<ClosureExpr>,
     pub param_list: Option<trap::Label<ParamList>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub closure_body: Option<trap::Label<Expr>>,
     pub for_binder: Option<trap::Label<ForBinder>>,
     pub is_async: bool,
@@ -4734,7 +5371,7 @@ impl From<trap::Label<ConstBlockPat>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct ConstParam {
     pub id: trap::TrapId<ConstParam>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub default_val: Option<trap::Label<ConstArg>>,
     pub is_const: bool,
     pub name: Option<trap::Label<Name>>,
@@ -4766,40 +5403,162 @@ impl trap::TrapEntry for ConstParam {
     }
 }
 
-impl trap::TrapClass for ConstParam {
-    fn class_name() -> &'static str { "ConstParam" }
+impl trap::TrapClass for ConstParam {
+    fn class_name() -> &'static str { "ConstParam" }
+}
+
+impl From<trap::Label<ConstParam>> for trap::Label<GenericParam> {
+    fn from(value: trap::Label<ConstParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of GenericParam
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstParam>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ConstParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstParam>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ConstParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstParam>> for trap::Label<Element> {
+    fn from(value: trap::Label<ConstParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ContinueExpr {
+    pub id: trap::TrapId<ContinueExpr>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+}
+
+impl trap::TrapEntry for ContinueExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("continue_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("continue_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.lifetime {
+            out.add_tuple("continue_expr_lifetimes", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ContinueExpr {
+    fn class_name() -> &'static str { "ContinueExpr" }
+}
+
+impl From<trap::Label<ContinueExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<ContinueExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ContinueExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ContinueExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ContinueExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ContinueExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ContinueExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ContinueExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct DerefPat {
+    pub id: trap::TrapId<DerefPat>,
+    pub pat: Option<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for DerefPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("deref_pats", vec![id.into()]);
+        if let Some(v) = self.pat {
+            out.add_tuple("deref_pat_pats", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for DerefPat {
+    fn class_name() -> &'static str { "DerefPat" }
 }
 
-impl From<trap::Label<ConstParam>> for trap::Label<GenericParam> {
-    fn from(value: trap::Label<ConstParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of GenericParam
+impl From<trap::Label<DerefPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<DerefPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DerefPat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstParam>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ConstParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of AstNode
+impl From<trap::Label<DerefPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<DerefPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DerefPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstParam>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ConstParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of Locatable
+impl From<trap::Label<DerefPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<DerefPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DerefPat is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstParam>> for trap::Label<Element> {
-    fn from(value: trap::Label<ConstParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of Element
+impl From<trap::Label<DerefPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<DerefPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DerefPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4807,62 +5566,54 @@ impl From<trap::Label<ConstParam>> for trap::Label<Element> {
 }
 
 #[derive(Debug)]
-pub struct ContinueExpr {
-    pub id: trap::TrapId<ContinueExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub lifetime: Option<trap::Label<Lifetime>>,
+pub struct DocComment {
+    pub id: trap::TrapId<DocComment>,
 }
 
-impl trap::TrapEntry for ContinueExpr {
+impl trap::TrapEntry for DocComment {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("continue_exprs", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("continue_expr_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.lifetime {
-            out.add_tuple("continue_expr_lifetimes", vec![id.into(), v.into()]);
-        }
+        out.add_tuple("doc_comments", vec![id.into()]);
     }
 }
 
-impl trap::TrapClass for ContinueExpr {
-    fn class_name() -> &'static str { "ContinueExpr" }
+impl trap::TrapClass for DocComment {
+    fn class_name() -> &'static str { "DocComment" }
 }
 
-impl From<trap::Label<ContinueExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<ContinueExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Expr
+impl From<trap::Label<DocComment>> for trap::Label<AnyAttr> {
+    fn from(value: trap::Label<DocComment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DocComment is a subclass of AnyAttr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ContinueExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ContinueExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of AstNode
+impl From<trap::Label<DocComment>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<DocComment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DocComment is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ContinueExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ContinueExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Locatable
+impl From<trap::Label<DocComment>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<DocComment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DocComment is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ContinueExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<ContinueExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Element
+impl From<trap::Label<DocComment>> for trap::Label<Element> {
+    fn from(value: trap::Label<DocComment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DocComment is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4990,7 +5741,7 @@ impl From<trap::Label<ExprStmt>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct FieldExpr {
     pub id: trap::TrapId<FieldExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub container: Option<trap::Label<Expr>>,
     pub identifier: Option<trap::Label<NameRef>>,
 }
@@ -5200,7 +5951,7 @@ impl From<trap::Label<ForTypeRepr>> for trap::Label<Element> {
 pub struct FormatArgsExpr {
     pub id: trap::TrapId<FormatArgsExpr>,
     pub args: Vec<trap::Label<FormatArgsArg>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub template: Option<trap::Label<Expr>>,
 }
 
@@ -5266,7 +6017,7 @@ impl From<trap::Label<FormatArgsExpr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct IdentPat {
     pub id: trap::TrapId<IdentPat>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub is_mut: bool,
     pub is_ref: bool,
     pub name: Option<trap::Label<Name>>,
@@ -5341,7 +6092,7 @@ impl From<trap::Label<IdentPat>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct IfExpr {
     pub id: trap::TrapId<IfExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub condition: Option<trap::Label<Expr>>,
     pub else_: Option<trap::Label<Expr>>,
     pub then: Option<trap::Label<BlockExpr>>,
@@ -5468,10 +6219,65 @@ impl From<trap::Label<ImplTraitTypeRepr>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct IncludeBytesExpr {
+    pub id: trap::TrapId<IncludeBytesExpr>,
+}
+
+impl trap::TrapEntry for IncludeBytesExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("include_bytes_exprs", vec![id.into()]);
+    }
+}
+
+impl trap::TrapClass for IncludeBytesExpr {
+    fn class_name() -> &'static str { "IncludeBytesExpr" }
+}
+
+impl From<trap::Label<IncludeBytesExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<IncludeBytesExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IncludeBytesExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<IncludeBytesExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<IncludeBytesExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IncludeBytesExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<IncludeBytesExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<IncludeBytesExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IncludeBytesExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<IncludeBytesExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<IncludeBytesExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IncludeBytesExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct IndexExpr {
     pub id: trap::TrapId<IndexExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub base: Option<trap::Label<Expr>>,
     pub index: Option<trap::Label<Expr>>,
 }
@@ -5651,6 +6457,69 @@ impl From<trap::Label<Item>> for trap::Label<Addressable> {
     }
 }
 
+#[derive(Debug)]
+pub struct KeyValueMeta {
+    pub id: trap::TrapId<KeyValueMeta>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub path: Option<trap::Label<Path>>,
+}
+
+impl trap::TrapEntry for KeyValueMeta {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("key_value_meta", vec![id.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("key_value_meta_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.path {
+            out.add_tuple("key_value_meta_paths", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for KeyValueMeta {
+    fn class_name() -> &'static str { "KeyValueMeta" }
+}
+
+impl From<trap::Label<KeyValueMeta>> for trap::Label<Meta> {
+    fn from(value: trap::Label<KeyValueMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme KeyValueMeta is a subclass of Meta
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<KeyValueMeta>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<KeyValueMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme KeyValueMeta is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<KeyValueMeta>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<KeyValueMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme KeyValueMeta is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<KeyValueMeta>> for trap::Label<Element> {
+    fn from(value: trap::Label<KeyValueMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme KeyValueMeta is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct LabelableExpr {
     _unused: ()
@@ -5699,7 +6568,7 @@ impl From<trap::Label<LabelableExpr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct LetExpr {
     pub id: trap::TrapId<LetExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub scrutinee: Option<trap::Label<Expr>>,
     pub pat: Option<trap::Label<Pat>>,
 }
@@ -5766,7 +6635,7 @@ impl From<trap::Label<LetExpr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct LetStmt {
     pub id: trap::TrapId<LetStmt>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub initializer: Option<trap::Label<Expr>>,
     pub let_else: Option<trap::Label<LetElse>>,
     pub pat: Option<trap::Label<Pat>>,
@@ -5959,7 +6828,7 @@ impl From<trap::Label<LifetimeArg>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct LifetimeParam {
     pub id: trap::TrapId<LifetimeParam>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub lifetime: Option<trap::Label<Lifetime>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
 }
@@ -6026,7 +6895,7 @@ impl From<trap::Label<LifetimeParam>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct LiteralExpr {
     pub id: trap::TrapId<LiteralExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub text_value: Option<String>,
 }
 
@@ -6148,6 +7017,7 @@ impl From<trap::Label<LiteralPat>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct MacroExpr {
     pub id: trap::TrapId<MacroExpr>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub macro_call: Option<trap::Label<MacroCall>>,
 }
 
@@ -6158,6 +7028,9 @@ impl trap::TrapEntry for MacroExpr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("macro_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("macro_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
         if let Some(v) = self.macro_call {
             out.add_tuple("macro_expr_macro_calls", vec![id.into(), v.into()]);
         }
@@ -6325,7 +7198,7 @@ impl From<trap::Label<MacroTypeRepr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct MatchExpr {
     pub id: trap::TrapId<MatchExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub scrutinee: Option<trap::Label<Expr>>,
     pub match_arm_list: Option<trap::Label<MatchArmList>>,
 }
@@ -6393,7 +7266,7 @@ impl From<trap::Label<MatchExpr>> for trap::Label<Element> {
 pub struct MethodCallExpr {
     pub id: trap::TrapId<MethodCallExpr>,
     pub arg_list: Option<trap::Label<ArgList>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub generic_arg_list: Option<trap::Label<GenericArgList>>,
     pub identifier: Option<trap::Label<NameRef>>,
     pub receiver: Option<trap::Label<Expr>>,
@@ -6578,10 +7451,65 @@ impl From<trap::Label<NeverTypeRepr>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct NotNull {
+    pub id: trap::TrapId<NotNull>,
+}
+
+impl trap::TrapEntry for NotNull {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("not_nulls", vec![id.into()]);
+    }
+}
+
+impl trap::TrapClass for NotNull {
+    fn class_name() -> &'static str { "NotNull" }
+}
+
+impl From<trap::Label<NotNull>> for trap::Label<Pat> {
+    fn from(value: trap::Label<NotNull>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NotNull is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<NotNull>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<NotNull>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NotNull is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<NotNull>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<NotNull>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NotNull is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<NotNull>> for trap::Label<Element> {
+    fn from(value: trap::Label<NotNull>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NotNull is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct OffsetOfExpr {
     pub id: trap::TrapId<OffsetOfExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub fields: Vec<trap::Label<NameRef>>,
     pub type_repr: Option<trap::Label<TypeRepr>>,
 }
@@ -6707,7 +7635,7 @@ impl From<trap::Label<OrPat>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct Param {
     pub id: trap::TrapId<Param>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub type_repr: Option<trap::Label<TypeRepr>>,
     pub pat: Option<trap::Label<Pat>>,
 }
@@ -6735,158 +7663,36 @@ impl trap::TrapClass for Param {
     fn class_name() -> &'static str { "Param" }
 }
 
-impl From<trap::Label<Param>> for trap::Label<ParamBase> {
-    fn from(value: trap::Label<Param>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Param is a subclass of ParamBase
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Param>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Param>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Param is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Param>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Param>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Param is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Param>> for trap::Label<Element> {
-    fn from(value: trap::Label<Param>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Param is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct ParenExpr {
-    pub id: trap::TrapId<ParenExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub expr: Option<trap::Label<Expr>>,
-}
-
-impl trap::TrapEntry for ParenExpr {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("paren_exprs", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("paren_expr_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.expr {
-            out.add_tuple("paren_expr_exprs", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for ParenExpr {
-    fn class_name() -> &'static str { "ParenExpr" }
-}
-
-impl From<trap::Label<ParenExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<ParenExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<ParenExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ParenExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<ParenExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ParenExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<ParenExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<ParenExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct ParenPat {
-    pub id: trap::TrapId<ParenPat>,
-    pub pat: Option<trap::Label<Pat>>,
-}
-
-impl trap::TrapEntry for ParenPat {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("paren_pats", vec![id.into()]);
-        if let Some(v) = self.pat {
-            out.add_tuple("paren_pat_pats", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for ParenPat {
-    fn class_name() -> &'static str { "ParenPat" }
-}
-
-impl From<trap::Label<ParenPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<ParenPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of Pat
+impl From<trap::Label<Param>> for trap::Label<ParamBase> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of ParamBase
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ParenPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of AstNode
+impl From<trap::Label<Param>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ParenPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of Locatable
+impl From<trap::Label<Param>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<ParenPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of Element
+impl From<trap::Label<Param>> for trap::Label<Element> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6997,6 +7803,65 @@ impl From<trap::Label<PathExprBase>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct PathMeta {
+    pub id: trap::TrapId<PathMeta>,
+    pub path: Option<trap::Label<Path>>,
+}
+
+impl trap::TrapEntry for PathMeta {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("path_meta", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("path_meta_paths", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for PathMeta {
+    fn class_name() -> &'static str { "PathMeta" }
+}
+
+impl From<trap::Label<PathMeta>> for trap::Label<Meta> {
+    fn from(value: trap::Label<PathMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathMeta is a subclass of Meta
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathMeta>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PathMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathMeta is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathMeta>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathMeta is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathMeta>> for trap::Label<Element> {
+    fn from(value: trap::Label<PathMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathMeta is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct PathPat {
     pub id: trap::TrapId<PathPat>,
@@ -7124,10 +7989,73 @@ impl From<trap::Label<PathTypeRepr>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct PatternTypeRepr {
+    pub id: trap::TrapId<PatternTypeRepr>,
+    pub pat: Option<trap::Label<Pat>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
+}
+
+impl trap::TrapEntry for PatternTypeRepr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("pattern_type_reprs", vec![id.into()]);
+        if let Some(v) = self.pat {
+            out.add_tuple("pattern_type_repr_pats", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_repr {
+            out.add_tuple("pattern_type_repr_type_reprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for PatternTypeRepr {
+    fn class_name() -> &'static str { "PatternTypeRepr" }
+}
+
+impl From<trap::Label<PatternTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<PatternTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PatternTypeRepr is a subclass of TypeRepr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PatternTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PatternTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PatternTypeRepr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PatternTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PatternTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PatternTypeRepr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PatternTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<PatternTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PatternTypeRepr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct PrefixExpr {
     pub id: trap::TrapId<PrefixExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub expr: Option<trap::Label<Expr>>,
     pub operator_name: Option<String>,
 }
@@ -7261,7 +8189,7 @@ impl From<trap::Label<PtrTypeRepr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct RangeExpr {
     pub id: trap::TrapId<RangeExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub end: Option<trap::Label<Expr>>,
     pub operator_name: Option<String>,
     pub start: Option<trap::Label<Expr>>,
@@ -7399,7 +8327,7 @@ impl From<trap::Label<RangePat>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct RefExpr {
     pub id: trap::TrapId<RefExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub expr: Option<trap::Label<Expr>>,
     pub is_const: bool,
     pub is_mut: bool,
@@ -7604,7 +8532,7 @@ impl From<trap::Label<RefTypeRepr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct RestPat {
     pub id: trap::TrapId<RestPat>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
 }
 
 impl trap::TrapEntry for RestPat {
@@ -7663,7 +8591,7 @@ impl From<trap::Label<RestPat>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct ReturnExpr {
     pub id: trap::TrapId<ReturnExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub expr: Option<trap::Label<Expr>>,
 }
 
@@ -7726,7 +8654,7 @@ impl From<trap::Label<ReturnExpr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct SelfParam {
     pub id: trap::TrapId<SelfParam>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub type_repr: Option<trap::Label<TypeRepr>>,
     pub is_ref: bool,
     pub is_mut: bool,
@@ -7924,6 +8852,7 @@ impl From<trap::Label<SliceTypeRepr>> for trap::Label<Element> {
 pub struct StructExpr {
     pub id: trap::TrapId<StructExpr>,
     pub path: Option<trap::Label<Path>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub struct_expr_field_list: Option<trap::Label<StructExprFieldList>>,
 }
 
@@ -7937,6 +8866,9 @@ impl trap::TrapEntry for StructExpr {
         if let Some(v) = self.path {
             out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
         }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("struct_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
         if let Some(v) = self.struct_expr_field_list {
             out.add_tuple("struct_expr_struct_expr_field_lists", vec![id.into(), v.into()]);
         }
@@ -8123,10 +9055,73 @@ impl From<trap::Label<StructPat>> for trap::Label<PathAstNode> {
     }
 }
 
+#[derive(Debug)]
+pub struct TokenTreeMeta {
+    pub id: trap::TrapId<TokenTreeMeta>,
+    pub path: Option<trap::Label<Path>>,
+    pub token_tree: Option<trap::Label<TokenTree>>,
+}
+
+impl trap::TrapEntry for TokenTreeMeta {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("token_tree_meta", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("token_tree_meta_paths", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.token_tree {
+            out.add_tuple("token_tree_meta_token_trees", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TokenTreeMeta {
+    fn class_name() -> &'static str { "TokenTreeMeta" }
+}
+
+impl From<trap::Label<TokenTreeMeta>> for trap::Label<Meta> {
+    fn from(value: trap::Label<TokenTreeMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TokenTreeMeta is a subclass of Meta
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TokenTreeMeta>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TokenTreeMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TokenTreeMeta is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TokenTreeMeta>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TokenTreeMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TokenTreeMeta is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TokenTreeMeta>> for trap::Label<Element> {
+    fn from(value: trap::Label<TokenTreeMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TokenTreeMeta is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct TryExpr {
     pub id: trap::TrapId<TryExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub expr: Option<trap::Label<Expr>>,
 }
 
@@ -8189,7 +9184,7 @@ impl From<trap::Label<TryExpr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct TupleExpr {
     pub id: trap::TrapId<TupleExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub fields: Vec<trap::Label<Expr>>,
 }
 
@@ -8560,7 +9555,7 @@ impl From<trap::Label<TypeArg>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct TypeParam {
     pub id: trap::TrapId<TypeParam>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub default_type: Option<trap::Label<TypeRepr>>,
     pub name: Option<trap::Label<Name>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
@@ -8631,7 +9626,7 @@ impl From<trap::Label<TypeParam>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct UnderscoreExpr {
     pub id: trap::TrapId<UnderscoreExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
 }
 
 impl trap::TrapEntry for UnderscoreExpr {
@@ -8687,11 +9682,74 @@ impl From<trap::Label<UnderscoreExpr>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct UnsafeMeta {
+    pub id: trap::TrapId<UnsafeMeta>,
+    pub is_unsafe: bool,
+    pub meta: Option<trap::Label<Meta>>,
+}
+
+impl trap::TrapEntry for UnsafeMeta {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("unsafe_meta", vec![id.into()]);
+        if self.is_unsafe {
+            out.add_tuple("unsafe_meta_is_unsafe", vec![id.into()]);
+        }
+        if let Some(v) = self.meta {
+            out.add_tuple("unsafe_meta_meta", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for UnsafeMeta {
+    fn class_name() -> &'static str { "UnsafeMeta" }
+}
+
+impl From<trap::Label<UnsafeMeta>> for trap::Label<Meta> {
+    fn from(value: trap::Label<UnsafeMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UnsafeMeta is a subclass of Meta
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<UnsafeMeta>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<UnsafeMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UnsafeMeta is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<UnsafeMeta>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<UnsafeMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UnsafeMeta is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<UnsafeMeta>> for trap::Label<Element> {
+    fn from(value: trap::Label<UnsafeMeta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UnsafeMeta is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct Variant {
     pub id: trap::TrapId<Variant>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub discriminant: Option<trap::Label<Expr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
+    pub const_arg: Option<trap::Label<ConstArg>>,
     pub field_list: Option<trap::Label<FieldList>>,
     pub name: Option<trap::Label<Name>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -8707,8 +9765,8 @@ impl trap::TrapEntry for Variant {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("variant_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.discriminant {
-            out.add_tuple("variant_discriminants", vec![id.into(), v.into()]);
+        if let Some(v) = self.const_arg {
+            out.add_tuple("variant_const_args", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.field_list {
             out.add_tuple("variant_field_lists", vec![id.into(), v.into()]);
@@ -8820,7 +9878,7 @@ impl From<trap::Label<WildcardPat>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct YeetExpr {
     pub id: trap::TrapId<YeetExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub expr: Option<trap::Label<Expr>>,
 }
 
@@ -8883,7 +9941,7 @@ impl From<trap::Label<YeetExpr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct YieldExpr {
     pub id: trap::TrapId<YieldExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub expr: Option<trap::Label<Expr>>,
 }
 
@@ -8947,7 +10005,7 @@ impl From<trap::Label<YieldExpr>> for trap::Label<Element> {
 pub struct AsmExpr {
     pub id: trap::TrapId<AsmExpr>,
     pub asm_pieces: Vec<trap::Label<AsmPiece>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub template: Vec<trap::Label<Expr>>,
 }
 
@@ -9104,14 +10162,14 @@ impl From<trap::Label<AssocItem>> for trap::Label<Addressable> {
 pub struct BlockExpr {
     pub id: trap::TrapId<BlockExpr>,
     pub label: Option<trap::Label<Label>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub is_async: bool,
     pub is_const: bool,
     pub is_gen: bool,
     pub is_move: bool,
-    pub is_try: bool,
     pub is_unsafe: bool,
     pub stmt_list: Option<trap::Label<StmtList>>,
+    pub try_block_modifier: Option<trap::Label<TryBlockModifier>>,
 }
 
 impl trap::TrapEntry for BlockExpr {
@@ -9139,15 +10197,15 @@ impl trap::TrapEntry for BlockExpr {
         if self.is_move {
             out.add_tuple("block_expr_is_move", vec![id.into()]);
         }
-        if self.is_try {
-            out.add_tuple("block_expr_is_try", vec![id.into()]);
-        }
         if self.is_unsafe {
             out.add_tuple("block_expr_is_unsafe", vec![id.into()]);
         }
         if let Some(v) = self.stmt_list {
             out.add_tuple("block_expr_stmt_lists", vec![id.into(), v.into()]);
         }
+        if let Some(v) = self.try_block_modifier {
+            out.add_tuple("block_expr_try_block_modifiers", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -9204,7 +10262,7 @@ impl From<trap::Label<BlockExpr>> for trap::Label<Element> {
 pub struct ExternBlock {
     pub id: trap::TrapId<ExternBlock>,
     pub abi: Option<trap::Label<Abi>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub extern_item_list: Option<trap::Label<ExternItemList>>,
     pub is_unsafe: bool,
 }
@@ -9292,7 +10350,7 @@ impl From<trap::Label<ExternBlock>> for trap::Label<Addressable> {
 #[derive(Debug)]
 pub struct ExternCrate {
     pub id: trap::TrapId<ExternCrate>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub identifier: Option<trap::Label<NameRef>>,
     pub rename: Option<trap::Label<Rename>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -9445,7 +10503,7 @@ impl From<trap::Label<ExternItem>> for trap::Label<Addressable> {
 pub struct Impl {
     pub id: trap::TrapId<Impl>,
     pub assoc_item_list: Option<trap::Label<AssocItemList>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub is_const: bool,
     pub is_default: bool,
@@ -9612,7 +10670,7 @@ impl From<trap::Label<LoopingExpr>> for trap::Label<Element> {
 pub struct MacroDef {
     pub id: trap::TrapId<MacroDef>,
     pub args: Option<trap::Label<TokenTree>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub body: Option<trap::Label<TokenTree>>,
     pub name: Option<trap::Label<Name>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -9704,7 +10762,7 @@ impl From<trap::Label<MacroDef>> for trap::Label<Addressable> {
 #[derive(Debug)]
 pub struct MacroRules {
     pub id: trap::TrapId<MacroRules>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub name: Option<trap::Label<Name>>,
     pub token_tree: Option<trap::Label<TokenTree>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -9793,7 +10851,7 @@ impl From<trap::Label<MacroRules>> for trap::Label<Addressable> {
 #[derive(Debug)]
 pub struct Module {
     pub id: trap::TrapId<Module>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub item_list: Option<trap::Label<ItemList>>,
     pub name: Option<trap::Label<Name>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -9883,7 +10941,7 @@ impl From<trap::Label<Module>> for trap::Label<Addressable> {
 pub struct PathExpr {
     pub id: trap::TrapId<PathExpr>,
     pub path: Option<trap::Label<Path>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
 }
 
 impl trap::TrapEntry for PathExpr {
@@ -9964,8 +11022,9 @@ impl From<trap::Label<PathExpr>> for trap::Label<PathAstNode> {
 pub struct Trait {
     pub id: trap::TrapId<Trait>,
     pub assoc_item_list: Option<trap::Label<AssocItemList>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub impl_restriction: Option<trap::Label<ImplRestriction>>,
     pub is_auto: bool,
     pub is_unsafe: bool,
     pub name: Option<trap::Label<Name>>,
@@ -9990,6 +11049,9 @@ impl trap::TrapEntry for Trait {
         if let Some(v) = self.generic_param_list {
             out.add_tuple("trait_generic_param_lists", vec![id.into(), v.into()]);
         }
+        if let Some(v) = self.impl_restriction {
+            out.add_tuple("trait_impl_restrictions", vec![id.into(), v.into()]);
+        }
         if self.is_auto {
             out.add_tuple("trait_is_auto", vec![id.into()]);
         }
@@ -10069,103 +11131,6 @@ impl From<trap::Label<Trait>> for trap::Label<Addressable> {
     }
 }
 
-#[derive(Debug)]
-pub struct TraitAlias {
-    pub id: trap::TrapId<TraitAlias>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub generic_param_list: Option<trap::Label<GenericParamList>>,
-    pub name: Option<trap::Label<Name>>,
-    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
-    pub visibility: Option<trap::Label<Visibility>>,
-    pub where_clause: Option<trap::Label<WhereClause>>,
-}
-
-impl trap::TrapEntry for TraitAlias {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("trait_aliases", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("trait_alias_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.generic_param_list {
-            out.add_tuple("trait_alias_generic_param_lists", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.name {
-            out.add_tuple("trait_alias_names", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.type_bound_list {
-            out.add_tuple("trait_alias_type_bound_lists", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.visibility {
-            out.add_tuple("trait_alias_visibilities", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.where_clause {
-            out.add_tuple("trait_alias_where_clauses", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for TraitAlias {
-    fn class_name() -> &'static str { "TraitAlias" }
-}
-
-impl From<trap::Label<TraitAlias>> for trap::Label<Item> {
-    fn from(value: trap::Label<TraitAlias>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Item
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<TraitAlias>> for trap::Label<Stmt> {
-    fn from(value: trap::Label<TraitAlias>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Stmt
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<TraitAlias>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<TraitAlias>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<TraitAlias>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<TraitAlias>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<TraitAlias>> for trap::Label<Element> {
-    fn from(value: trap::Label<TraitAlias>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<TraitAlias>> for trap::Label<Addressable> {
-    fn from(value: trap::Label<TraitAlias>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Addressable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct TypeItem {
     _unused: ()
@@ -10245,7 +11210,7 @@ impl From<trap::Label<TypeItem>> for trap::Label<Addressable> {
 #[derive(Debug)]
 pub struct Use {
     pub id: trap::TrapId<Use>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub use_tree: Option<trap::Label<UseTree>>,
     pub visibility: Option<trap::Label<Visibility>>,
 }
@@ -10330,7 +11295,7 @@ impl From<trap::Label<Use>> for trap::Label<Addressable> {
 #[derive(Debug)]
 pub struct Const {
     pub id: trap::TrapId<Const>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub body: Option<trap::Label<Expr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub is_const: bool,
@@ -10455,7 +11420,7 @@ impl From<trap::Label<Const>> for trap::Label<Addressable> {
 #[derive(Debug)]
 pub struct Enum {
     pub id: trap::TrapId<Enum>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub name: Option<trap::Label<Name>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -10563,7 +11528,7 @@ pub struct ForExpr {
     pub id: trap::TrapId<ForExpr>,
     pub label: Option<trap::Label<Label>>,
     pub loop_body: Option<trap::Label<BlockExpr>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub iterable: Option<trap::Label<Expr>>,
     pub pat: Option<trap::Label<Pat>>,
 }
@@ -10655,7 +11620,7 @@ impl From<trap::Label<ForExpr>> for trap::Label<Element> {
 pub struct Function {
     pub id: trap::TrapId<Function>,
     pub param_list: Option<trap::Label<ParamList>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub abi: Option<trap::Label<Abi>>,
     pub function_body: Option<trap::Label<BlockExpr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
@@ -10819,7 +11784,7 @@ pub struct LoopExpr {
     pub id: trap::TrapId<LoopExpr>,
     pub label: Option<trap::Label<Label>>,
     pub loop_body: Option<trap::Label<BlockExpr>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
 }
 
 impl trap::TrapEntry for LoopExpr {
@@ -10902,7 +11867,7 @@ impl From<trap::Label<LoopExpr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct MacroCall {
     pub id: trap::TrapId<MacroCall>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub path: Option<trap::Label<Path>>,
     pub token_tree: Option<trap::Label<TokenTree>>,
 }
@@ -11012,7 +11977,7 @@ impl From<trap::Label<MacroCall>> for trap::Label<ExternItem> {
 #[derive(Debug)]
 pub struct Static {
     pub id: trap::TrapId<Static>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub body: Option<trap::Label<Expr>>,
     pub is_mut: bool,
     pub is_static: bool,
@@ -11126,7 +12091,7 @@ impl From<trap::Label<Static>> for trap::Label<Addressable> {
 #[derive(Debug)]
 pub struct Struct {
     pub id: trap::TrapId<Struct>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub name: Option<trap::Label<Name>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -11232,7 +12197,7 @@ impl From<trap::Label<Struct>> for trap::Label<Addressable> {
 #[derive(Debug)]
 pub struct TypeAlias {
     pub id: trap::TrapId<TypeAlias>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub is_default: bool,
     pub name: Option<trap::Label<Name>>,
@@ -11355,7 +12320,7 @@ impl From<trap::Label<TypeAlias>> for trap::Label<ExternItem> {
 #[derive(Debug)]
 pub struct Union {
     pub id: trap::TrapId<Union>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub name: Option<trap::Label<Name>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -11463,7 +12428,7 @@ pub struct WhileExpr {
     pub id: trap::TrapId<WhileExpr>,
     pub label: Option<trap::Label<Label>>,
     pub loop_body: Option<trap::Label<BlockExpr>>,
-    pub attrs: Vec<trap::Label<Attr>>,
+    pub attrs: Vec<trap::Label<AnyAttr>>,
     pub condition: Option<trap::Label<Expr>>,
 }
 
diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index e90badc63cd0..4ede43224d35 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -1,10 +1,11 @@
 use crate::diagnostics::{ExtractionStep, emit_extraction_diagnostics};
 use crate::rust_analyzer::{RustAnalyzerNoSemantics, path_to_file_id};
+use crate::toolchain::log_project_toolchain;
 use crate::translate::SourceKind;
 use crate::trap::TrapId;
 use anyhow::Context;
 use archive::Archiver;
-use ra_ap_base_db::SourceDatabase;
+use configuration::{DependencyFiles, dependency_files, manifest_parent};
 use ra_ap_hir::Semantics;
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_ide_db::line_index::{LineCol, LineIndex};
@@ -13,13 +14,11 @@ use ra_ap_paths::{AbsPathBuf, Utf8PathBuf};
 use ra_ap_project_model::{CargoConfig, ProjectManifest};
 use ra_ap_vfs::Vfs;
 use rust_analyzer::{ParseResult, RustAnalyzer};
-use std::collections::HashSet;
-use std::hash::RandomState;
+use std::collections::{BTreeMap, HashSet};
+use std::fs::File;
+use std::io::{self, BufRead, BufReader};
+use std::path::{Path, PathBuf};
 use std::time::Instant;
-use std::{
-    collections::HashMap,
-    path::{Path, PathBuf},
-};
 use std::{env, fs};
 use tracing::{error, info, warn};
 use tracing_subscriber::layer::SubscriberExt;
@@ -27,13 +26,16 @@ use tracing_subscriber::util::SubscriberInitExt;
 
 mod archive;
 mod config;
+mod configuration;
 mod crate_graph;
 mod diagnostics;
 pub mod generated;
 mod qltest;
 mod rust_analyzer;
+mod toolchain;
 mod translate;
 pub mod trap;
+mod util;
 
 struct Extractor<'a> {
     archiver: &'a Archiver,
@@ -64,12 +66,11 @@ impl<'a> Extractor<'a> {
 
         let before_extract = Instant::now();
         let line_index = LineIndex::new(text.as_ref());
-        let display_path = file.to_string_lossy();
         let mut trap = self.traps.create("source", file);
         let label = trap.emit_file(file);
         let mut translator = translate::Translator::new(
             trap,
-            display_path.as_ref(),
+            file,
             label,
             line_index,
             semantics_info.as_ref().ok(),
@@ -80,25 +81,25 @@ impl<'a> Extractor<'a> {
             translator.emit_parse_error(&ast, &err);
         }
         let no_location = (LineCol { line: 0, col: 0 }, LineCol { line: 0, col: 0 });
-        if let Err(RustAnalyzerNoSemantics { severity, reason }) = semantics_info {
-            if !reason.is_empty() {
-                let message = format!("semantic analyzer unavailable ({reason})");
-                let full_message = format!("{message}: macro expansion will be skipped.");
-                translator.emit_diagnostic(
-                    severity,
-                    "semantics".to_owned(),
-                    message,
-                    full_message,
-                    no_location,
-                );
-            }
+        if let Err(RustAnalyzerNoSemantics { severity, reason }) = semantics_info
+            && !reason.is_empty()
+        {
+            let message = format!("semantic analyzer unavailable ({reason})");
+            let full_message = format!("{message}: macro expansion will be skipped.");
+            translator.emit_diagnostic(
+                severity,
+                "semantics".to_owned(),
+                message,
+                full_message,
+                no_location,
+            );
         }
         translator.emit_source_file(&ast);
         translator.emit_truncated_diagnostics_message();
         translator.trap.commit().unwrap_or_else(|err| {
             error!(
                 "Failed to write trap file for: {}: {}",
-                display_path,
+                file.display(),
                 err.to_string()
             )
         });
@@ -106,11 +107,11 @@ impl<'a> Extractor<'a> {
             .push(ExtractionStep::extract(before_extract, source_kind, file));
     }
 
-    pub fn extract_with_semantics(
+    pub fn extract_with_semantics<'db>(
         &mut self,
         file: &Path,
-        semantics: &Semantics<'_, RootDatabase>,
-        vfs: &Vfs,
+        semantics: &'db Semantics<'db, RootDatabase>,
+        vfs: &'db Vfs,
         source_kind: SourceKind,
     ) {
         self.extract(&RustAnalyzer::new(vfs, semantics), file, source_kind);
@@ -199,6 +200,34 @@ impl<'a> Extractor<'a> {
         self.steps.push(ExtractionStep::find_manifests(before));
         ret
     }
+
+    fn group_files<'b>(
+        &mut self,
+        manifests: &'b [ProjectManifest],
+        files: &'b [PathBuf],
+    ) -> BTreeMap<&'b Path, (&'b ProjectManifest, Vec<&'b Path>)> {
+        let mut workspaces: BTreeMap<&Path, (&ProjectManifest, Vec<&Path>)> = manifests
+            .iter()
+            .map(|manifest| (manifest_parent(manifest), (manifest, Vec::new())))
+            .collect();
+
+        'outer: for file in files {
+            for ancestor in file.as_path().ancestors() {
+                if let Some((_, files)) = workspaces.get_mut(ancestor) {
+                    files.push(file);
+                    continue 'outer;
+                }
+            }
+            self.extract_without_semantics(
+                file,
+                SourceKind::Source,
+                RustAnalyzerNoSemantics::warning("no manifest found"),
+            );
+        }
+
+        workspaces.retain(|_, (_, files)| !files.is_empty());
+        workspaces
+    }
 }
 
 fn cwd() -> anyhow::Result<AbsPathBuf> {
@@ -211,12 +240,22 @@ fn cwd() -> anyhow::Result<AbsPathBuf> {
 }
 
 fn main() -> anyhow::Result<()> {
-    let mut cfg = config::Config::extract().context("failed to load configuration")?;
-    if cfg.qltest {
-        qltest::prepare(&mut cfg)?;
-    }
     let start = Instant::now();
-    let (flame_layer, _flush_guard) = if let Some(path) = &cfg.logging_flamegraph {
+    let config = config::Config::extract().context("failed to load configuration")?;
+    let inputs = if config.qltest {
+        qltest::prepare(&config)?
+    } else if let Some(path) = &config.file_list {
+        let file =
+            File::open(path).with_context(|| format!("opening file list {}", path.display()))?;
+        BufReader::new(file)
+            .lines()
+            .map(|line| line.map(PathBuf::from))
+            .collect::<io::Result<Vec<_>>>()
+            .with_context(|| format!("reading file list {}", path.display()))?
+    } else {
+        Vec::new()
+    };
+    let (flame_layer, _flush_guard) = if let Some(path) = &config.logging_flamegraph {
         tracing_flame::FlameLayer::with_file(path)
             .ok()
             .map(|(a, b)| (Some(a), Some(b)))
@@ -228,19 +267,19 @@ fn main() -> anyhow::Result<()> {
     tracing_subscriber::registry()
         .with(codeql_extractor::extractor::default_subscriber_with_level(
             "single_arch",
-            &cfg.logging_verbosity,
+            &config.logging_verbosity,
         ))
         .with(flame_layer)
         .init();
-    info!("{cfg:#?}\n");
+    info!("{config:#?}\n");
+    info!("number of inputs: {}", inputs.len());
 
-    let traps = trap::TrapFileProvider::new(&cfg).context("failed to set up trap files")?;
+    let traps = trap::TrapFileProvider::new(&config).context("failed to set up trap files")?;
     let archiver = archive::Archiver {
-        root: cfg.source_archive_dir.clone(),
+        root: config.source_archive_dir.clone(),
     };
     let mut extractor = Extractor::new(&archiver, &traps);
-    let files: Vec<PathBuf> = cfg
-        .inputs
+    let files = inputs
         .iter()
         .map(|file| {
             let file = std::path::absolute(file).unwrap_or(file.to_path_buf());
@@ -249,69 +288,53 @@ fn main() -> anyhow::Result<()> {
             // [1]: https://github.com/rust-lang/rust-analyzer/issues/18894#issuecomment-2580014730
             dunce::canonicalize(&file).unwrap_or(file)
         })
-        .collect();
+        .collect::<Vec<_>>();
     let manifests = extractor.find_manifests(&files)?;
-    let mut map: HashMap<&Path, (&ProjectManifest, Vec<&Path>)> = manifests
-        .iter()
-        .map(|x| (x.manifest_path().parent().as_ref(), (x, Vec::new())))
-        .collect();
-
-    'outer: for file in &files {
-        for ancestor in file.as_path().ancestors() {
-            if let Some((_, files)) = map.get_mut(ancestor) {
-                files.push(file);
-                continue 'outer;
-            }
-        }
-        extractor.extract_without_semantics(
-            file,
-            SourceKind::Source,
-            RustAnalyzerNoSemantics::warning("no manifest found"),
-        );
-    }
+    let workspaces = extractor.group_files(&manifests, &files);
     let cwd = cwd()?;
-    let (cargo_config, load_cargo_config) = cfg.to_cargo_config(&cwd);
-    let library_mode = if cfg.extract_dependencies_as_source {
+    log_project_toolchain();
+    let (cargo_config, load_cargo_config) = config.to_cargo_config(&cwd);
+    let library_mode = if config.extract_dependencies_as_source {
         SourceKind::Source
     } else {
         SourceKind::Library
     };
-    let source_mode = if cfg.force_library_mode {
+    let source_mode = if config.force_library_mode {
         library_mode
     } else {
         SourceKind::Source
     };
-    let mut processed_files: HashSet<PathBuf, RandomState> =
-        HashSet::from_iter(files.iter().cloned());
-    for (manifest, files) in map.values().filter(|(_, files)| !files.is_empty()) {
-        if let Some((ref db, ref vfs)) =
+    let source_files = HashSet::from_iter(files.iter().cloned());
+
+    let mut dependencies = DependencyFiles::default();
+
+    // When there more than one workspace, it's not a priori clear in which
+    // workspace a dependency file should be extracted.
+    let dependency_extraction_ambiguity = workspaces.len() == 1;
+
+    for (manifest, files) in workspaces.values() {
+        if let Some((db, vfs)) =
             extractor.load_manifest(manifest, &cargo_config, &load_cargo_config)
         {
             let before_crate_graph = Instant::now();
-            crate_graph::extract_crate_graph(extractor.traps, db, vfs);
+            crate_graph::extract_crate_graph(extractor.traps, &db, &vfs);
             extractor
                 .steps
                 .push(ExtractionStep::crate_graph(before_crate_graph));
-            let semantics = Semantics::new(db);
+            let semantics = Semantics::new(&db);
             for file in files {
-                match extractor.load_source(file, &semantics, vfs) {
-                    Ok(()) => extractor.extract_with_semantics(file, &semantics, vfs, source_mode),
+                match extractor.load_source(file, &semantics, &vfs) {
+                    Ok(()) => extractor.extract_with_semantics(file, &semantics, &vfs, source_mode),
                     Err(e) => extractor.extract_without_semantics(file, source_mode, e),
                 };
             }
-            for (file_id, file) in vfs.iter() {
-                if let Some(file) = file.as_path().map(<_ as AsRef<Path>>::as_ref) {
-                    if file.extension().is_some_and(|ext| ext == "rs")
-                        && processed_files.insert(file.to_owned())
-                        && db
-                            .source_root(db.file_source_root(file_id).source_root_id(db))
-                            .source_root(db)
-                            .is_library
-                    {
-                        extractor.extract_with_semantics(file, &semantics, vfs, library_mode);
-                        extractor.archiver.archive(file);
-                    }
+            // Fast path when there is no ambiguity in dependency extraction.
+            if dependency_extraction_ambiguity {
+                for (_, file) in dependency_files(&db, &vfs, &source_files) {
+                    extractor.extract_with_semantics(file, &semantics, &vfs, library_mode);
                 }
+            } else {
+                dependencies.add_manifest(manifest, &semantics, &vfs, &source_files);
             }
         } else {
             for file in files {
@@ -323,6 +346,49 @@ fn main() -> anyhow::Result<()> {
             }
         }
     }
+
+    // For each manifest, extract the dependency files for which it is
+    // preferred. Note that when `dependency_extraction_ambiguity` is true then
+    // `selected` below is empty.
+    loop {
+        let selected = dependencies.by_manifests();
+        if selected.is_empty() {
+            break;
+        }
+        for (manifest, files) in selected {
+            if let Some((db, vfs)) =
+                extractor.load_manifest(manifest, &cargo_config, &load_cargo_config)
+            {
+                let semantics = Semantics::new(&db);
+                for file in files {
+                    // A richer configuration can disable a file when using cfg
+                    // options like `#[cfg(not(feature = "foo"))]`. When this is
+                    // the case `file_to_module_def` will return `None` for the
+                    // file. When this is the case and there are alternatives we
+                    // do not extract the file yet. Instead the file will be
+                    // considered again in the next iteration of the loop.
+                    if !dependencies.has_alternative(&file)
+                        || path_to_file_id(&file, &vfs)
+                            .and_then(|id| semantics.file_to_module_def(id))
+                            .is_some()
+                    {
+                        extractor.extract_with_semantics(&file, &semantics, &vfs, library_mode);
+                        dependencies.extracted(&file);
+                    }
+                }
+            } else {
+                for file in files {
+                    extractor.extract_without_semantics(
+                        &file,
+                        library_mode,
+                        RustAnalyzerNoSemantics::warning("unable to reload manifest"),
+                    );
+                    dependencies.extracted(&file);
+                }
+            }
+        }
+    }
+
     let builtins_dir = env::var("CODEQL_EXTRACTOR_RUST_ROOT")
         .map(|path| Path::new(&path).join("tools").join("builtins"))?;
     let builtins = fs::read_dir(builtins_dir).context("failed to read builtins directory")?;
@@ -334,5 +400,5 @@ fn main() -> anyhow::Result<()> {
         }
     }
 
-    extractor.emit_extraction_diagnostics(start, &cfg)
+    extractor.emit_extraction_diagnostics(start, &config)
 }
diff --git a/rust/extractor/src/nightly-toolchain/rust-toolchain.toml b/rust/extractor/src/nightly-toolchain/rust-toolchain.toml
index 7ed21df91218..5d108159caf0 100644
--- a/rust/extractor/src/nightly-toolchain/rust-toolchain.toml
+++ b/rust/extractor/src/nightly-toolchain/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2025-06-01"
+channel = "nightly-2026-07-15"
 components = [ "rust-src" ]
diff --git a/rust/extractor/src/qltest.rs b/rust/extractor/src/qltest.rs
index bd9849cbb09f..e90fc5e91c10 100644
--- a/rust/extractor/src/qltest.rs
+++ b/rust/extractor/src/qltest.rs
@@ -4,11 +4,10 @@ use glob::glob;
 use itertools::Itertools;
 use std::ffi::OsStr;
 use std::fs;
-use std::path::Path;
-use std::process::Command;
+use std::path::{Path, PathBuf};
 use tracing::info;
 
-const EDITION: &str = "2021";
+const DEFAULT_EDITION: &str = "2021";
 
 fn dump_lib() -> anyhow::Result<()> {
     let path_iterator = glob("*.rs").context("globbing test sources")?;
@@ -54,19 +53,19 @@ impl TestCargoManifest<'_> {
         fs::write(&path, rendered).with_context(|| format!("writing {}", path.display()))
     }
 }
-fn dump_cargo_manifest(dependencies: &[String]) -> anyhow::Result<()> {
+fn dump_cargo_manifest(dependencies: &[String], edition: &str) -> anyhow::Result<()> {
     let uses_proc_macro =
         fs::exists("proc_macro.rs").context("checking existence of proc_macro.rs")?;
     let lib_manifest = TestCargoManifest::Lib {
         uses_proc_macro,
         uses_main: fs::exists("main.rs").context("checking existence of main.rs")?,
         dependencies,
-        edition: EDITION,
+        edition,
     };
     if uses_proc_macro {
         TestCargoManifest::Workspace {}.dump("")?;
         lib_manifest.dump(".lib")?;
-        TestCargoManifest::Macro { edition: EDITION }.dump(".proc_macro")
+        TestCargoManifest::Macro { edition }.dump(".proc_macro")
     } else {
         lib_manifest.dump("")
     }
@@ -81,34 +80,40 @@ fn dump_nightly_toolchain() -> anyhow::Result<()> {
     Ok(())
 }
 
-fn set_sources(config: &mut Config) -> anyhow::Result<()> {
+fn get_sources() -> anyhow::Result<Vec<PathBuf>> {
     let path_iterator = glob("**/*.rs").context("globbing test sources")?;
-    config.inputs = path_iterator
+    path_iterator
         .filter(|f| f.is_err() || !f.as_ref().unwrap().starts_with("target"))
         .collect::<Result<Vec<_>, _>>()
-        .context("fetching test sources")?;
-    Ok(())
+        .context("fetching test sources")
 }
 
-pub(crate) fn prepare(config: &mut Config) -> anyhow::Result<()> {
+fn cargo_check(config: &Config) -> anyhow::Result<()> {
+    let mut command = ra_ap_toolchain::command("cargo", ".", &config.get_extra_env());
+    command.env("CARGO_TARGET_DIR", config.cargo_target_dir());
+    let status = command
+        .arg("check")
+        .arg("-q")
+        .status()
+        .context("spawning cargo check")?;
+    if status.success() {
+        info!("cargo check successful");
+        Ok(())
+    } else {
+        anyhow::bail!("requested cargo check failed");
+    }
+}
+
+pub(crate) fn prepare(config: &Config) -> anyhow::Result<Vec<PathBuf>> {
     dump_lib()?;
-    set_sources(config)?;
-    dump_cargo_manifest(&config.qltest_dependencies)?;
+    let inputs = get_sources()?;
+    let edition = config.qltest_edition.as_deref().unwrap_or(DEFAULT_EDITION);
+    dump_cargo_manifest(&config.qltest_dependencies, edition)?;
     if config.qltest_use_nightly {
         dump_nightly_toolchain()?;
     }
     if config.qltest_cargo_check {
-        let status = Command::new("cargo")
-            .env("RUSTFLAGS", "-Awarnings")
-            .arg("check")
-            .arg("-q")
-            .status()
-            .context("spawning cargo check")?;
-        if status.success() {
-            info!("cargo check successful");
-        } else {
-            anyhow::bail!("requested cargo check failed");
-        }
-    };
-    Ok(())
+        cargo_check(config)?;
+    }
+    Ok(inputs)
 }
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
index 9d3769a24040..d3129af12796 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -1,6 +1,6 @@
 use crate::trap;
 use itertools::Itertools;
-use ra_ap_base_db::{EditionedFileId, FileText, RootQueryDb, SourceDatabase};
+use ra_ap_base_db::{EditionedFileId, FileText, SourceDatabase};
 use ra_ap_hir::Semantics;
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_load_cargo::{LoadCargoConfig, load_workspace_at};
@@ -99,7 +99,7 @@ impl<'a> RustAnalyzer<'a> {
     fn get_file_data(
         &self,
         path: &Path,
-    ) -> Result<(&Semantics<'_, RootDatabase>, EditionedFileId, FileText), RustAnalyzerNoSemantics>
+    ) -> Result<(&'a Semantics<'a, RootDatabase>, EditionedFileId, FileText), RustAnalyzerNoSemantics>
     {
         match self {
             RustAnalyzer::WithoutSemantics { severity, reason } => Err(RustAnalyzerNoSemantics {
@@ -115,21 +115,20 @@ impl<'a> RustAnalyzer<'a> {
                         "no text available for the file in the project",
                     )),
                 )?;
-                let editioned_file_id = semantics.attach_first_edition(file_id).ok_or(
+                let editioned_file_id = semantics.attach_first_edition_opt(file_id).ok_or(
                     RustAnalyzerNoSemantics::warning("failed to determine rust edition"),
                 )?;
-                Ok((semantics, editioned_file_id, input))
+                Ok((*semantics, editioned_file_id, input))
             }
         }
     }
 
-    pub fn parse(&self, path: &Path) -> ParseResult<'_> {
+    pub fn parse(&self, path: &Path) -> ParseResult<'a> {
         match self.get_file_data(path) {
             Ok((semantics, file_id, input)) => {
                 let source_file = semantics.parse(file_id);
-                let errors = semantics
-                    .db
-                    .parse_errors(file_id)
+                let errors = file_id
+                    .parse_errors(semantics.db)
                     .into_iter()
                     .flat_map(|x| x.to_vec())
                     .collect();
@@ -218,6 +217,12 @@ fn workspace_members_match(workspace_dir: &AbsPath, members: &[String], target:
     })
 }
 
+/// Finds an enclosing Cargo workspace that includes `manifest`. That is, its
+/// `members` patterns include the manifest's directory and its `exclude`
+/// patterns do not.
+///
+/// Returns `None` if the manifest itself defines a workspace, is not a Cargo
+/// manifest, cannot be loaded, or has no matching workspace.
 fn find_workspace(reader: &mut TomlReader, manifest: &ProjectManifest) -> Option<ProjectManifest> {
     let ProjectManifest::CargoToml(cargo) = manifest else {
         return None;
@@ -225,12 +230,13 @@ fn find_workspace(reader: &mut TomlReader, manifest: &ProjectManifest) -> Option
     let parsed_cargo = reader.read(cargo).ok()?;
     if parsed_cargo.workspace.is_some() {
         debug!("{cargo} is a workspace");
-        return Some(manifest.clone());
+        return None;
     }
     let Some(parent_dir) = cargo.parent().parent() else {
         warn!("no parent dir for {cargo}");
         return None;
     };
+    // Search upward from `parent_dir` for manifest files.
     let discovered = ProjectManifest::discover(parent_dir)
         .map_err(|e| {
             error!(
@@ -241,25 +247,22 @@ fn find_workspace(reader: &mut TomlReader, manifest: &ProjectManifest) -> Option
         })
         .ok()?;
     discovered
-        .iter()
-        .find_map(|it| match it {
-            ProjectManifest::CargoToml(other)
-                if cargo.starts_with(other.parent())
-                    && reader.read(other).is_ok_and(|it| {
-                        it.workspace.as_ref().is_some_and(|w| {
-                            workspace_members_match(other.parent(), &w.members, cargo.parent())
-                                && !workspace_members_match(
-                                    other.parent(),
-                                    &w.exclude,
-                                    cargo.parent(),
-                                )
-                        })
-                    }) =>
+        .into_iter()
+        .find(|it| {
+            if let ProjectManifest::CargoToml(other) = it
+                && cargo.starts_with(other.parent())
+                && reader.read(other).is_ok_and(|it| {
+                    it.workspace.as_ref().is_some_and(|w| {
+                        workspace_members_match(other.parent(), &w.members, cargo.parent())
+                            && !workspace_members_match(other.parent(), &w.exclude, cargo.parent())
+                    })
+                })
             {
                 debug!("found workspace {other} containing {cargo}");
-                Some(it.clone())
+                true
+            } else {
+                false
             }
-            _ => None,
         })
         .or_else(|| {
             debug!("no workspace found for {cargo}");
diff --git a/rust/extractor/src/toolchain.rs b/rust/extractor/src/toolchain.rs
new file mode 100644
index 000000000000..e9074977ea50
--- /dev/null
+++ b/rust/extractor/src/toolchain.rs
@@ -0,0 +1,163 @@
+//! Contains the logic for determining the Rust toolchain to be used by the
+//! extractor.
+//!
+//! Rust-analyzer only guarantees compatibility with the latest Rust toolchain
+//! per:
+//! <https://rust-analyzer.github.io/book/installation.html#rust-standard-library>
+//!
+//! The Rust compiler on the other hand has fairly strong backwards
+//! compatibility guarantees. Usually updating to a newer toolchain does not
+//! cause any compilation errors.
+//!
+//! We therefore use a fixed Rust toolchain that is known to work with our
+//! version of rust-analyzer. This gives us backwards compatibility issues
+//! stemming from the Rust compiler, instead of those stemming from
+//! rust-analyzer <-> Rust toolchain incompatibilities. The former set of
+//! problems is (per current experiments and future expectations) much smaller.
+
+use std::{io, process};
+
+use chrono::NaiveDate;
+use tracing::{info, warn};
+
+/// The toolchain target by the extractor. This should usually be latest Rust
+/// toolchain release that precedes our version of rust-analyzer.
+///
+/// When rust-analyzer is updated this version should be updated accordingly.
+const FIXED_RUST_TOOLCHAIN: &str = "1.99.0";
+
+/// The date of the oldest nightly toolchain known to work with our version of
+/// rust-analyzer.
+///
+/// When rust-analyzer is updated this version may need to be updated.
+const MINIMUM_NIGHTLY_DATE: NaiveDate = NaiveDate::from_ymd_opt(2026, 7, 15).unwrap();
+
+/// The command output of asking `rustup` which toolchain is used by the Rust
+/// project in the current working directory. This main looks at
+/// `rust-toolchain.toml` if present.
+///
+/// Examples of what the stdout might look like when the command is successful:
+/// - `nightly-aarch64-apple-darwin (overridden by '/path/to/project/rust-toolchain.toml')`
+/// - `nightly-2026-09-01-aarch64-apple-darwin (overridden by '/path/to/project/rust-toolchain.toml')`
+/// - `stable-aarch64-apple-darwin (default)`
+/// - `1.80.1-aarch64-apple-darwin (overridden by '/path/to/project/rust-toolchain.toml')`
+pub fn project_toolchain() -> io::Result<process::Output> {
+    process::Command::new("rustup")
+        .args(["show", "active-toolchain"])
+        .output()
+}
+
+/// Returns the fixed toolchain except when the project is using a nightly
+/// toolchain.
+///
+/// Recent nightly toolchains are preserved so that projects can use unstable
+/// features. Older dated nightlies are replaced with the oldest nightly known
+/// to be compatible with our rust-analyzer version.
+pub fn select_toolchain() -> String {
+    let project_toolchain = project_toolchain()
+        .ok()
+        .filter(|output| output.status.success())
+        .and_then(|output| String::from_utf8(output.stdout).ok())
+        .unwrap_or_default();
+    select_toolchain_from_project_toolchain(&project_toolchain)
+}
+
+fn select_toolchain_from_project_toolchain(project_toolchain: &str) -> String {
+    let nightly_toolchain = project_toolchain
+        .split_whitespace()
+        .next()
+        .filter(|toolchain| toolchain.starts_with("nightly"))
+        .map(str::to_owned)
+        .map(cap_nightly_toolchain);
+    nightly_toolchain.unwrap_or_else(|| FIXED_RUST_TOOLCHAIN.to_owned())
+}
+
+fn cap_nightly_toolchain(nightly_toolchain: String) -> String {
+    if let Some(project_date) = nightly_date(&nightly_toolchain)
+        && project_date < MINIMUM_NIGHTLY_DATE
+    {
+        format!("nightly-{MINIMUM_NIGHTLY_DATE}")
+    } else {
+        nightly_toolchain
+    }
+}
+
+/// Parse the date from a nightly toolchain string.
+fn nightly_date(toolchain: &str) -> Option<NaiveDate> {
+    let suffix = toolchain.strip_prefix("nightly-")?;
+    (suffix.len() >= 10).then(|| NaiveDate::parse_from_str(suffix.get(..10)?, "%Y-%m-%d").ok())?
+}
+
+pub fn log_project_toolchain() {
+    match project_toolchain() {
+        Ok(output) if output.status.success() => info!(
+            "project Rust toolchain: {}",
+            String::from_utf8_lossy(&output.stdout).trim()
+        ),
+        Ok(output) => warn!(
+            "unable to determine project Rust toolchain: {}",
+            String::from_utf8_lossy(&output.stderr).trim()
+        ),
+        Err(error) => warn!("unable to determine project Rust toolchain: {error}"),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{MINIMUM_NIGHTLY_DATE, select_toolchain_from_project_toolchain};
+
+    #[test]
+    fn preserves_rolling_nightly_toolchain() {
+        assert_eq!(
+            select_toolchain_from_project_toolchain("nightly-aarch64-apple-darwin"),
+            "nightly-aarch64-apple-darwin"
+        );
+    }
+
+    #[test]
+    fn replaces_old_dated_nightly_toolchain() {
+        assert_eq!(
+            select_toolchain_from_project_toolchain("nightly-2025-07-15-aarch64-apple-darwin"),
+            format!("nightly-{MINIMUM_NIGHTLY_DATE}")
+        );
+        assert_eq!(
+            select_toolchain_from_project_toolchain("nightly-2025-07-15"),
+            format!("nightly-{MINIMUM_NIGHTLY_DATE}")
+        );
+    }
+
+    #[test]
+    fn preserves_minimum_dated_nightly_toolchain() {
+        assert_eq!(
+            select_toolchain_from_project_toolchain("nightly-2026-07-15-aarch64-apple-darwin"),
+            "nightly-2026-07-15-aarch64-apple-darwin"
+        );
+    }
+
+    #[test]
+    fn preserves_newer_dated_nightly_toolchain() {
+        assert_eq!(
+            select_toolchain_from_project_toolchain("nightly-2026-09-01-aarch64-apple-darwin"),
+            "nightly-2026-09-01-aarch64-apple-darwin"
+        );
+    }
+
+    #[test]
+    fn preserves_unrecognized_nightly_toolchain() {
+        assert_eq!(
+            select_toolchain_from_project_toolchain("nightly-custom"),
+            "nightly-custom"
+        );
+        assert_eq!(
+            select_toolchain_from_project_toolchain("nightly-2026-99-99-aarch64-apple-darwin"),
+            "nightly-2026-99-99-aarch64-apple-darwin"
+        );
+    }
+
+    #[test]
+    fn minimum_nightly_matches_qltest_toolchain() {
+        // The minimum nightly toolchain should match the one we test against.
+        let toolchain_file = include_str!("nightly-toolchain/rust-toolchain.toml");
+        assert!(toolchain_file.contains(&format!("channel = \"nightly-{MINIMUM_NIGHTLY_DATE}\"")));
+    }
+}
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index 94d8545bb15f..2dd7c358a2f3 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -5,17 +5,23 @@ use crate::trap::{DiagnosticSeverity, TrapFile, TrapId};
 use crate::trap::{Label, TrapClass};
 use ra_ap_base_db::EditionedFileId;
 use ra_ap_hir::Semantics;
-use ra_ap_hir::db::ExpandDatabase;
-use ra_ap_hir_expand::{ExpandResult, ExpandTo, InFile};
+use ra_ap_hir_expand::builtin::{BuiltinDeriveExpander, find_builtin_derive};
+use ra_ap_hir_expand::span_map::ExpansionSpanMap;
+use ra_ap_hir_expand::{ExpandResult, ExpandTo, HirFileId, InFile, map_node_range_up_rooted};
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_ide_db::line_index::{LineCol, LineIndex};
-use ra_ap_parser::SyntaxKind;
+use ra_ap_parser::{SyntaxKind, TopEntryPoint};
 use ra_ap_span::TextSize;
 use ra_ap_syntax::ast::HasAttrs;
 use ra_ap_syntax::{
     AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxNode, SyntaxToken, TextRange,
     ast,
 };
+use ra_ap_syntax_bridge::{
+    DocCommentDesugarMode, syntax_node_to_token_tree, token_tree_to_syntax_node,
+};
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
 
 impl Emission<ast::Item> for Translator<'_> {
     fn pre_emit(&mut self, node: &ast::Item) -> Option<Label<generated::Item>> {
@@ -118,16 +124,21 @@ pub enum SourceKind {
     Library,
 }
 
-pub struct Translator<'a> {
+pub struct Translator<'db> {
     pub trap: TrapFile,
-    path: &'a str,
+    path: PathBuf,
     label: Label<generated::File>,
     line_index: LineIndex,
     file_id: Option<EditionedFileId>,
-    pub semantics: Option<&'a Semantics<'a, RootDatabase>>,
+    pub semantics: Option<&'db Semantics<'db, RootDatabase>>,
     source_kind: SourceKind,
     pub(crate) macro_context_depth: usize,
+    parenthesized_expr_attrs: HashMap<SyntaxNode, Vec<Label<generated::AnyAttr>>>,
     diagnostic_count: usize,
+    /// When emitting a reconstructed built-in derive expansion, holds the span map of the
+    /// synthesized syntax tree. Those nodes are not registered in the semantics cache, so
+    /// locations are resolved through this map instead of `Semantics::original_range`.
+    builtin_derive_span_map: Option<ExpansionSpanMap>,
 }
 
 const UNKNOWN_LOCATION: (LineCol, LineCol) =
@@ -135,25 +146,27 @@ const UNKNOWN_LOCATION: (LineCol, LineCol) =
 
 const DIAGNOSTIC_LIMIT_PER_FILE: usize = 100;
 
-impl<'a> Translator<'a> {
+impl<'db> Translator<'db> {
     pub fn new(
         trap: TrapFile,
-        path: &'a str,
+        path: &Path,
         label: Label<generated::File>,
         line_index: LineIndex,
-        semantic_info: Option<&FileSemanticInformation<'a>>,
+        semantic_info: Option<&FileSemanticInformation<'db>>,
         source_kind: SourceKind,
-    ) -> Translator<'a> {
+    ) -> Translator<'db> {
         Translator {
             trap,
-            path,
+            path: path.to_path_buf(),
             label,
             line_index,
             file_id: semantic_info.map(|i| i.file_id),
             semantics: semantic_info.map(|i| i.semantics),
             source_kind,
             macro_context_depth: 0,
+            parenthesized_expr_attrs: HashMap::new(),
             diagnostic_count: 0,
+            builtin_derive_span_map: None,
         }
     }
     fn location(&self, range: TextRange) -> Option<(LineCol, LineCol)> {
@@ -177,6 +190,15 @@ impl<'a> Translator<'a> {
     }
 
     pub fn text_range_for_node(&mut self, node: &impl ast::AstNode) -> Option<TextRange> {
+        if let Some(span_map) = self.builtin_derive_span_map.as_ref() {
+            // Nodes synthesized by a reconstructed built-in derive expansion are not in the
+            // semantics cache; resolve their original source range through the expansion span map.
+            let semantics = self.semantics.as_ref()?;
+            let file_id = self.file_id?;
+            let file_range =
+                map_node_range_up_rooted(semantics.db, span_map, node.syntax().text_range())?;
+            return (file_id == file_range.file_id).then_some(file_range.range);
+        }
         if let Some(semantics) = self.semantics.as_ref() {
             let file_range = semantics.original_range(node.syntax());
             let file_id = self.file_id?;
@@ -215,12 +237,12 @@ impl<'a> Translator<'a> {
     ) {
         let parent_range = parent.syntax().text_range();
         let token_range = token.text_range();
-        if let Some(clipped_range) = token_range.intersect(parent_range) {
-            if let Some(parent_range2) = self.text_range_for_node(parent) {
-                let token_range = clipped_range + parent_range2.start() - parent_range.start();
-                if let Some((start, end)) = self.location(token_range) {
-                    self.trap.emit_location(self.label, label, start, end)
-                }
+        if let Some(clipped_range) = token_range.intersect(parent_range)
+            && let Some(parent_range2) = self.text_range_for_node(parent)
+        {
+            let token_range = clipped_range + parent_range2.start() - parent_range.start();
+            if let Some((start, end)) = self.location(token_range) {
+                self.trap.emit_location(self.label, label, start, end)
             }
         }
     }
@@ -274,7 +296,7 @@ impl<'a> Translator<'a> {
         dispatch_to_tracing!(
             severity,
             "{}:{}:{}: {}",
-            self.path,
+            self.path.display(),
             start.line + 1,
             start.col + 1,
             &full_message,
@@ -332,15 +354,15 @@ impl<'a> Translator<'a> {
         children: SyntaxElementChildren,
     ) {
         for child in children {
-            if let NodeOrToken::Token(token) = child {
-                if token.kind() == SyntaxKind::COMMENT {
-                    let label = self.trap.emit(generated::Comment {
-                        id: TrapId::Star,
-                        parent: parent_label,
-                        text: token.text().to_owned(),
-                    });
-                    self.emit_location_token(label.into(), parent_node, &token);
-                }
+            if let NodeOrToken::Token(token) = child
+                && token.kind() == SyntaxKind::COMMENT
+            {
+                let label = self.trap.emit(generated::Comment {
+                    id: TrapId::Star,
+                    parent: parent_label,
+                    text: token.text().to_owned(),
+                });
+                self.emit_location_token(label.into(), parent_node, &token);
             }
         }
     }
@@ -353,7 +375,7 @@ impl<'a> Translator<'a> {
         if let Some(value) = semantics
             .hir_file_for(expanded)
             .macro_file()
-            .and_then(|macro_call_id| semantics.db.parse_macro_expansion_error(macro_call_id))
+            .and_then(|macro_call_id| macro_call_id.parse_macro_expansion_error(semantics.db))
         {
             if let Some(err) = &value.err {
                 let error = err.render_to_string(semantics.db);
@@ -362,9 +384,8 @@ impl<'a> Translator<'a> {
                     == hir_file_id.file_id().map(|f| f.file_id(semantics.db))
                 {
                     let location = err.span().range
-                        + semantics
-                            .db
-                            .ast_id_map(hir_file_id)
+                        + hir_file_id
+                            .ast_id_map(semantics.db)
                             .get_erased(err.span().anchor.ast_id)
                             .text_range()
                             .start();
@@ -411,6 +432,11 @@ impl<'a> Translator<'a> {
             // way as from version 0.0.274 rust-analyser only expands in the context of an expansion
             return;
         }
+        if self.builtin_derive_span_map.is_some() {
+            // inside a reconstructed built-in derive expansion the macro call is not registered in
+            // the semantics cache, so it cannot (and need not) be expanded further
+            return;
+        }
         if let Some(expanded) = self
             .semantics
             .as_ref()
@@ -465,13 +491,90 @@ impl<'a> Translator<'a> {
     pub(crate) fn should_be_excluded(&self, item: &impl ast::HasAttrs) -> bool {
         self.semantics.is_some_and(|sema| {
             item.attrs().any(|attr| {
-                attr.as_simple_call().is_some_and(|(name, tokens)| {
-                    name == "cfg" && sema.check_cfg_attr(&tokens) == Some(false)
-                })
+                let meta = match attr.meta() {
+                    Some(meta) => meta,
+                    None => return false,
+                };
+                let cfg_meta = match ast::CfgMeta::cast(meta.syntax().clone()) {
+                    Some(cfg_meta) => cfg_meta,
+                    None => return false,
+                };
+                let cfg_predicate = match cfg_meta.cfg_predicate() {
+                    Some(pred) => pred,
+                    None => return false,
+                };
+                let cfg_expr = ra_ap_cfg::CfgExpr::parse_from_ast(cfg_predicate);
+                // Resolve the crate the item belongs to so its `cfg` options can be checked.
+                // Items originating from a macro expansion live in a `MacroFile` rather than a
+                // real file, so we recover their crate from the macro call; otherwise cfg'd-out
+                // items from expansions (e.g. tokio's `cfg(feature = "rt")` /
+                // `cfg(not(feature = "rt"))` cousins) would all be extracted, bloating the DB with
+                // contradictory entries.
+                let cfg_options = match sema.hir_file_for(item.syntax()) {
+                    HirFileId::FileId(fid) => {
+                        match sema.file_to_module_defs(fid.file_id(sema.db)).next() {
+                            Some(module) => module.krate(sema.db).cfg(sema.db),
+                            None => return false,
+                        }
+                    }
+                    HirFileId::MacroFile(macro_call) => {
+                        macro_call.loc(sema.db).krate.cfg_options(sema.db)
+                    }
+                };
+                cfg_options.check(&cfg_expr) == Some(false)
             })
         })
     }
 
+    pub(crate) fn emit_parenthesized_expr(
+        &mut self,
+        node: &ast::ParenExpr,
+    ) -> Option<Label<generated::Expr>> {
+        if self.should_be_excluded(node) {
+            return None;
+        }
+
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(
+            node.attrs_with_doc()
+                .filter_map(|attr| self.emit_any_attr(&attr)),
+        );
+        let result = node.expr().and_then(|expr| {
+            let syntax = expr.syntax().clone();
+            self.parenthesized_expr_attrs
+                .entry(syntax.clone())
+                .or_default()
+                .extend(attrs);
+            let result = self.emit_expr(&expr);
+            self.parenthesized_expr_attrs.remove(&syntax);
+            result
+        });
+        if let Some(label) = result {
+            self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        }
+        result
+    }
+
+    pub(crate) fn emit_parenthesized_pat(
+        &mut self,
+        node: &ast::ParenPat,
+    ) -> Option<Label<generated::Pat>> {
+        let result = node.pat().and_then(|pat| self.emit_pat(&pat));
+        if let Some(label) = result {
+            self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        }
+        result
+    }
+
+    pub(crate) fn take_parenthesized_expr_attrs(
+        &mut self,
+        node: &SyntaxNode,
+    ) -> Vec<Label<generated::AnyAttr>> {
+        self.parenthesized_expr_attrs
+            .remove(node)
+            .unwrap_or_default()
+    }
+
     pub(crate) fn should_skip_bodies(&self) -> bool {
         self.source_kind == SourceKind::Library
     }
@@ -551,9 +654,9 @@ impl<'a> Translator<'a> {
             is_const: false,
             is_gen: false,
             is_move: false,
-            is_try: false,
             is_unsafe: false,
             stmt_list: Some(stmt_list),
+            try_block_modifier: None,
         });
         self.emit_location(label, node);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
@@ -563,7 +666,8 @@ impl<'a> Translator<'a> {
     fn is_attribute_macro_target(&self, node: &ast::Item) -> bool {
         // rust-analyzer considers as an `attr_macro_call` also a plain macro call, but we want to
         // process that differently (in `extract_macro_call_expanded`)
-        !matches!(node, ast::Item::MacroCall(_))
+        self.builtin_derive_span_map.is_none()
+            && !matches!(node, ast::Item::MacroCall(_))
             && self.semantics.is_some_and(|semantics| {
                 let file = semantics.hir_file_for(node.syntax());
                 let node = InFile::new(file, node);
@@ -684,6 +788,51 @@ impl<'a> Translator<'a> {
         }
     }
 
+    /// Reconstructs the expansion of a built-in derive macro (e.g. `Debug`, `PartialEq`).
+    ///
+    /// Since rust-analyzer 0.0.317 built-in derives are modeled as synthetic impls rather than
+    /// syntactic macro expansions, `Semantics::expand_derive_macro` no longer returns anything for
+    /// them. We re-run the still-public built-in derive expander over the ADT and emit the resulting
+    /// `impl` items ourselves. The synthesized nodes are not registered in the semantics
+    /// cache, so `builtin_derive_span_map` is set for the duration of the emission to route their
+    /// locations through the expansion span map.
+    fn emit_builtin_derive_expansion(
+        &mut self,
+        adt: &ast::Adt,
+        expander: BuiltinDeriveExpander,
+    ) -> Option<Label<generated::MacroItems>> {
+        let semantics = self.semantics?;
+        let db = semantics.db;
+        let file_id = semantics.hir_file_for(adt.syntax());
+        let span_map = file_id.span_map(db);
+        let call_site = span_map.span_for_range(adt.syntax().text_range());
+        let input = syntax_node_to_token_tree(
+            adt.syntax(),
+            span_map,
+            call_site,
+            DocCommentDesugarMode::ProcMacro,
+        );
+        let ExpandResult { value: output, err } = expander.expander()(db, call_site, &input);
+        let edition = self.file_id?.edition(db);
+        let (parsed, output_span_map) =
+            token_tree_to_syntax_node(&output, TopEntryPoint::MacroItems, &mut |_| edition);
+        let items = ast::MacroItems::cast(parsed.syntax_node())?;
+        if let Some(err) = err {
+            let rendered = err.render_to_string(db);
+            self.emit_diagnostic_for_node(
+                adt,
+                DiagnosticSeverity::Warning,
+                "item_expansion".to_owned(),
+                format!("built-in derive expansion failed ({})", rendered.kind),
+                rendered.message,
+            );
+        }
+        let previous = self.builtin_derive_span_map.replace(output_span_map);
+        let result = self.emit_macro_items(&items);
+        self.builtin_derive_span_map = previous;
+        result
+    }
+
     pub(crate) fn emit_derive_expansion(
         &mut self,
         node: &(impl Into<ast::Adt> + Clone),
@@ -693,12 +842,29 @@ impl<'a> Translator<'a> {
             return;
         };
         let node: ast::Adt = node.clone().into();
-        let expansions = node
-            .attrs()
-            .filter_map(|attr| semantics.expand_derive_macro(&attr))
-            .flatten()
-            .filter_map(|expanded| self.process_item_macro_expansion(&node, expanded))
-            .collect::<Vec<_>>();
+        let mut expansions = Vec::new();
+        for meta in node.attrs().filter_map(|attr| attr.meta()) {
+            let Some(expanded) = semantics.expand_derive_macro(&meta) else {
+                continue;
+            };
+            // `resolve_derive_macro` yields one entry per derive, including built-in ones for which
+            // `expand_derive_macro` returns `None`; we use it to recover the built-in expander.
+            let resolved = semantics.resolve_derive_macro(&meta).unwrap_or_default();
+            for (i, expanded) in expanded.into_iter().enumerate() {
+                let label = if let Some(expanded) = expanded {
+                    self.process_item_macro_expansion(&node, expanded)
+                } else if let Some(expander) = resolved
+                    .get(i)
+                    .and_then(|m| m.as_ref())
+                    .and_then(|m| find_builtin_derive(&m.name(semantics.db)))
+                {
+                    self.emit_builtin_derive_expansion(&node, expander)
+                } else {
+                    None
+                };
+                expansions.extend(label);
+            }
+        }
         generated::TypeItem::emit_derive_macro_expansions(
             label.into(),
             expansions,
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index 30ac31db7126..511bc3e6d77b 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -10,6 +10,16 @@ use ra_ap_syntax::ast::{
 #[rustfmt::skip]
 use ra_ap_syntax::{AstNode, ast};
 impl Translator<'_> {
+    pub(crate) fn emit_any_attr(
+        &mut self,
+        node: &ast::AnyAttr,
+    ) -> Option<Label<generated::AnyAttr>> {
+        let label = match node {
+            ast::AnyAttr::Attr(inner) => self.emit_attr(inner).map(Into::into),
+            ast::AnyAttr::DocComment(inner) => self.emit_doc_comment(inner).map(Into::into),
+        }?;
+        Some(label)
+    }
     pub(crate) fn emit_asm_operand(
         &mut self,
         node: &ast::AsmOperand,
@@ -53,6 +63,18 @@ impl Translator<'_> {
         self.post_emit(node, label);
         Some(label)
     }
+    pub(crate) fn emit_cfg_predicate(
+        &mut self,
+        node: &ast::CfgPredicate,
+    ) -> Option<Label<generated::CfgPredicate>> {
+        let label = match node {
+            ast::CfgPredicate::CfgAtom(inner) => self.emit_cfg_atom(inner).map(Into::into),
+            ast::CfgPredicate::CfgComposite(inner) => {
+                self.emit_cfg_composite(inner).map(Into::into)
+            }
+        }?;
+        Some(label)
+    }
     pub(crate) fn emit_expr(&mut self, node: &ast::Expr) -> Option<Label<generated::Expr>> {
         let label = match node {
             ast::Expr::ArrayExpr(inner) => self.emit_array_expr(inner).map(Into::into),
@@ -64,12 +86,16 @@ impl Translator<'_> {
             ast::Expr::BreakExpr(inner) => self.emit_break_expr(inner).map(Into::into),
             ast::Expr::CallExpr(inner) => self.emit_call_expr(inner).map(Into::into),
             ast::Expr::CastExpr(inner) => self.emit_cast_expr(inner).map(Into::into),
+            ast::Expr::CfgPredExpr(inner) => self.emit_cfg_pred_expr(inner).map(Into::into),
             ast::Expr::ClosureExpr(inner) => self.emit_closure_expr(inner).map(Into::into),
             ast::Expr::ContinueExpr(inner) => self.emit_continue_expr(inner).map(Into::into),
             ast::Expr::FieldExpr(inner) => self.emit_field_expr(inner).map(Into::into),
             ast::Expr::ForExpr(inner) => self.emit_for_expr(inner).map(Into::into),
             ast::Expr::FormatArgsExpr(inner) => self.emit_format_args_expr(inner).map(Into::into),
             ast::Expr::IfExpr(inner) => self.emit_if_expr(inner).map(Into::into),
+            ast::Expr::IncludeBytesExpr(inner) => {
+                self.emit_include_bytes_expr(inner).map(Into::into)
+            }
             ast::Expr::IndexExpr(inner) => self.emit_index_expr(inner).map(Into::into),
             ast::Expr::LetExpr(inner) => self.emit_let_expr(inner).map(Into::into),
             ast::Expr::Literal(inner) => self.emit_literal(inner).map(Into::into),
@@ -78,7 +104,7 @@ impl Translator<'_> {
             ast::Expr::MatchExpr(inner) => self.emit_match_expr(inner).map(Into::into),
             ast::Expr::MethodCallExpr(inner) => self.emit_method_call_expr(inner).map(Into::into),
             ast::Expr::OffsetOfExpr(inner) => self.emit_offset_of_expr(inner).map(Into::into),
-            ast::Expr::ParenExpr(inner) => self.emit_paren_expr(inner).map(Into::into),
+            ast::Expr::ParenExpr(inner) => self.emit_parenthesized_expr(inner),
             ast::Expr::PathExpr(inner) => self.emit_path_expr(inner).map(Into::into),
             ast::Expr::PrefixExpr(inner) => self.emit_prefix_expr(inner).map(Into::into),
             ast::Expr::RangeExpr(inner) => self.emit_range_expr(inner).map(Into::into),
@@ -149,15 +175,33 @@ impl Translator<'_> {
         }?;
         Some(label)
     }
+    pub(crate) fn emit_meta(&mut self, node: &ast::Meta) -> Option<Label<generated::Meta>> {
+        if let Some(label) = self.pre_emit(node) {
+            return Some(label);
+        }
+        let label = match node {
+            ast::Meta::CfgAttrMeta(inner) => self.emit_cfg_attr_meta(inner).map(Into::into),
+            ast::Meta::CfgMeta(inner) => self.emit_cfg_meta(inner).map(Into::into),
+            ast::Meta::KeyValueMeta(inner) => self.emit_key_value_meta(inner).map(Into::into),
+            ast::Meta::PathMeta(inner) => self.emit_path_meta(inner).map(Into::into),
+            ast::Meta::TokenTreeMeta(inner) => self.emit_token_tree_meta(inner).map(Into::into),
+            ast::Meta::UnsafeMeta(inner) => self.emit_unsafe_meta(inner).map(Into::into),
+        }?;
+        self.post_emit(node, label);
+        Some(label)
+    }
     pub(crate) fn emit_pat(&mut self, node: &ast::Pat) -> Option<Label<generated::Pat>> {
         let label = match node {
             ast::Pat::BoxPat(inner) => self.emit_box_pat(inner).map(Into::into),
+            ast::Pat::CfgPredPat(inner) => self.emit_cfg_pred_pat(inner).map(Into::into),
             ast::Pat::ConstBlockPat(inner) => self.emit_const_block_pat(inner).map(Into::into),
+            ast::Pat::DerefPat(inner) => self.emit_deref_pat(inner).map(Into::into),
             ast::Pat::IdentPat(inner) => self.emit_ident_pat(inner).map(Into::into),
             ast::Pat::LiteralPat(inner) => self.emit_literal_pat(inner).map(Into::into),
             ast::Pat::MacroPat(inner) => self.emit_macro_pat(inner).map(Into::into),
+            ast::Pat::NotNull(inner) => self.emit_not_null(inner).map(Into::into),
             ast::Pat::OrPat(inner) => self.emit_or_pat(inner).map(Into::into),
-            ast::Pat::ParenPat(inner) => self.emit_paren_pat(inner).map(Into::into),
+            ast::Pat::ParenPat(inner) => self.emit_parenthesized_pat(inner),
             ast::Pat::PathPat(inner) => self.emit_path_pat(inner).map(Into::into),
             ast::Pat::RangePat(inner) => self.emit_range_pat(inner).map(Into::into),
             ast::Pat::RecordPat(inner) => self.emit_record_pat(inner).map(Into::into),
@@ -190,6 +234,7 @@ impl Translator<'_> {
             ast::Type::NeverType(inner) => self.emit_never_type(inner).map(Into::into),
             ast::Type::ParenType(inner) => self.emit_paren_type(inner).map(Into::into),
             ast::Type::PathType(inner) => self.emit_path_type(inner).map(Into::into),
+            ast::Type::PatternType(inner) => self.emit_pattern_type(inner).map(Into::into),
             ast::Type::PtrType(inner) => self.emit_ptr_type(inner).map(Into::into),
             ast::Type::RefType(inner) => self.emit_ref_type(inner).map(Into::into),
             ast::Type::SliceType(inner) => self.emit_slice_type(inner).map(Into::into),
@@ -226,7 +271,6 @@ impl Translator<'_> {
             ast::Item::Static(inner) => self.emit_static(inner).map(Into::into),
             ast::Item::Struct(inner) => self.emit_struct(inner).map(Into::into),
             ast::Item::Trait(inner) => self.emit_trait(inner).map(Into::into),
-            ast::Item::TraitAlias(inner) => self.emit_trait_alias(inner).map(Into::into),
             ast::Item::TypeAlias(inner) => self.emit_type_alias(inner).map(Into::into),
             ast::Item::Union(inner) => self.emit_union(inner).map(Into::into),
             ast::Item::Use(inner) => self.emit_use(inner).map(Into::into),
@@ -264,7 +308,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let exprs = node.exprs().filter_map(|x| self.emit_expr(&x)).collect();
         let is_semicolon = node.semicolon_token().is_some();
         let label = self.trap.emit(generated::ArrayExprInternal {
@@ -296,9 +341,15 @@ impl Translator<'_> {
         &mut self,
         node: &ast::AsmClobberAbi,
     ) -> Option<Label<generated::AsmClobberAbi>> {
-        let label = self
-            .trap
-            .emit(generated::AsmClobberAbi { id: TrapId::Star });
+        if self.should_be_excluded(node) {
+            return None;
+        }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
+        let label = self.trap.emit(generated::AsmClobberAbi {
+            id: TrapId::Star,
+            attrs,
+        });
         self.emit_location(label, node);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
@@ -334,11 +385,12 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let asm_pieces = node
             .asm_pieces()
             .filter_map(|x| self.emit_asm_piece(&x))
             .collect();
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let template = node.template().filter_map(|x| self.emit_expr(&x)).collect();
         let label = self.trap.emit(generated::AsmExpr {
             id: TrapId::Star,
@@ -382,11 +434,17 @@ impl Translator<'_> {
         &mut self,
         node: &ast::AsmOperandNamed,
     ) -> Option<Label<generated::AsmOperandNamed>> {
+        if self.should_be_excluded(node) {
+            return None;
+        }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let asm_operand = node.asm_operand().and_then(|x| self.emit_asm_operand(&x));
         let name = node.name().and_then(|x| self.emit_name(&x));
         let label = self.trap.emit(generated::AsmOperandNamed {
             id: TrapId::Star,
             asm_operand,
+            attrs,
             name,
         });
         self.emit_location(label, node);
@@ -410,6 +468,11 @@ impl Translator<'_> {
         &mut self,
         node: &ast::AsmOptions,
     ) -> Option<Label<generated::AsmOptionsList>> {
+        if self.should_be_excluded(node) {
+            return None;
+        }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let asm_options = node
             .asm_options()
             .filter_map(|x| self.emit_asm_option(&x))
@@ -417,6 +480,7 @@ impl Translator<'_> {
         let label = self.trap.emit(generated::AsmOptionsList {
             id: TrapId::Star,
             asm_options,
+            attrs,
         });
         self.emit_location(label, node);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
@@ -471,11 +535,12 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let assoc_items = node
             .assoc_items()
             .filter_map(|x| self.emit_assoc_item(&x))
             .collect();
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let label = self.trap.emit(generated::AssocItemList {
             id: TrapId::Star,
             assoc_items,
@@ -535,7 +600,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::AwaitExpr {
             id: TrapId::Star,
@@ -553,7 +619,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::BecomeExpr {
             id: TrapId::Star,
@@ -571,7 +638,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let lhs = node.lhs().and_then(|x| self.emit_expr(&x));
         let operator_name = node.try_get_text();
         let rhs = node.rhs().and_then(|x| self.emit_expr(&x));
@@ -593,15 +661,18 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let is_async = node.async_token().is_some();
         let is_const = node.const_token().is_some();
         let is_gen = node.gen_token().is_some();
         let is_move = node.move_token().is_some();
-        let is_try = node.try_token().is_some();
         let is_unsafe = node.unsafe_token().is_some();
         let label = node.label().and_then(|x| self.emit_label(&x));
         let stmt_list = node.stmt_list().and_then(|x| self.emit_stmt_list(&x));
+        let try_block_modifier = node
+            .try_block_modifier()
+            .and_then(|x| self.emit_try_block_modifier(&x));
         let label = self.trap.emit(generated::BlockExpr {
             id: TrapId::Star,
             attrs,
@@ -609,10 +680,10 @@ impl Translator<'_> {
             is_const,
             is_gen,
             is_move,
-            is_try,
             is_unsafe,
             label,
             stmt_list,
+            try_block_modifier,
         });
         self.emit_location(label, node);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
@@ -635,7 +706,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
         let label = self.trap.emit(generated::BreakExpr {
@@ -655,8 +727,9 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let arg_list = node.arg_list().and_then(|x| self.emit_arg_list(&x));
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let function = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::CallExpr {
             id: TrapId::Star,
@@ -675,7 +748,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let label = self.trap.emit(generated::CastExpr {
@@ -688,6 +762,93 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
+    pub(crate) fn emit_cfg_atom(
+        &mut self,
+        node: &ast::CfgAtom,
+    ) -> Option<Label<generated::CfgAtom>> {
+        let label = self.trap.emit(generated::CfgAtom { id: TrapId::Star });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
+    pub(crate) fn emit_cfg_attr_meta(
+        &mut self,
+        node: &ast::CfgAttrMeta,
+    ) -> Option<Label<generated::CfgAttrMeta>> {
+        let cfg_predicate = node
+            .cfg_predicate()
+            .and_then(|x| self.emit_cfg_predicate(&x));
+        let metas = node.metas().filter_map(|x| self.emit_meta(&x)).collect();
+        let label = self.trap.emit(generated::CfgAttrMeta {
+            id: TrapId::Star,
+            cfg_predicate,
+            metas,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
+    pub(crate) fn emit_cfg_composite(
+        &mut self,
+        node: &ast::CfgComposite,
+    ) -> Option<Label<generated::CfgComposite>> {
+        let cfg_predicates = node
+            .cfg_predicates()
+            .filter_map(|x| self.emit_cfg_predicate(&x))
+            .collect();
+        let label = self.trap.emit(generated::CfgComposite {
+            id: TrapId::Star,
+            cfg_predicates,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
+    pub(crate) fn emit_cfg_meta(
+        &mut self,
+        node: &ast::CfgMeta,
+    ) -> Option<Label<generated::CfgMeta>> {
+        let cfg_predicate = node
+            .cfg_predicate()
+            .and_then(|x| self.emit_cfg_predicate(&x));
+        let label = self.trap.emit(generated::CfgMeta {
+            id: TrapId::Star,
+            cfg_predicate,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
+    pub(crate) fn emit_cfg_pred_expr(
+        &mut self,
+        node: &ast::CfgPredExpr,
+    ) -> Option<Label<generated::CfgPredExpr>> {
+        let cfg_predicate = node
+            .cfg_predicate()
+            .and_then(|x| self.emit_cfg_predicate(&x));
+        let label = self.trap.emit(generated::CfgPredExpr {
+            id: TrapId::Star,
+            cfg_predicate,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
+    pub(crate) fn emit_cfg_pred_pat(
+        &mut self,
+        node: &ast::CfgPredPat,
+    ) -> Option<Label<generated::CfgPredPat>> {
+        let cfg_predicate = node
+            .cfg_predicate()
+            .and_then(|x| self.emit_cfg_predicate(&x));
+        let label = self.trap.emit(generated::CfgPredPat {
+            id: TrapId::Star,
+            cfg_predicate,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
     pub(crate) fn emit_closure_expr(
         &mut self,
         node: &ast::ClosureExpr,
@@ -695,7 +856,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let closure_body = node.body().and_then(|x| self.emit_expr(&x));
         let for_binder = node.for_binder().and_then(|x| self.emit_for_binder(&x));
         let is_async = node.async_token().is_some();
@@ -729,7 +891,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let body = if self.should_skip_bodies() {
             None
         } else {
@@ -796,7 +959,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let default_val = node.default_val().and_then(|x| self.emit_const_arg(&x));
         let is_const = node.const_token().is_some();
         let name = node.name().and_then(|x| self.emit_name(&x));
@@ -820,7 +984,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
         let label = self.trap.emit(generated::ContinueExpr {
             id: TrapId::Star,
@@ -831,6 +996,28 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
+    pub(crate) fn emit_deref_pat(
+        &mut self,
+        node: &ast::DerefPat,
+    ) -> Option<Label<generated::DerefPat>> {
+        let pat = node.pat().and_then(|x| self.emit_pat(&x));
+        let label = self.trap.emit(generated::DerefPat {
+            id: TrapId::Star,
+            pat,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
+    pub(crate) fn emit_doc_comment(
+        &mut self,
+        node: &ast::DocComment,
+    ) -> Option<Label<generated::DocComment>> {
+        let label = self.trap.emit(generated::DocComment { id: TrapId::Star });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
     pub(crate) fn emit_dyn_trait_type(
         &mut self,
         node: &ast::DynTraitType,
@@ -853,7 +1040,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let generic_param_list = node
             .generic_param_list()
             .and_then(|x| self.emit_generic_param_list(&x));
@@ -895,8 +1083,9 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let abi = node.abi().and_then(|x| self.emit_abi(&x));
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let extern_item_list = node
             .extern_item_list()
             .and_then(|x| self.emit_extern_item_list(&x));
@@ -919,7 +1108,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let identifier = node.name_ref().and_then(|x| self.emit_name_ref(&x));
         let rename = node.rename().and_then(|x| self.emit_rename(&x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(&x));
@@ -941,7 +1131,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let extern_items = node
             .extern_items()
             .filter_map(|x| self.emit_extern_item(&x))
@@ -962,7 +1153,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let container = node.expr().and_then(|x| self.emit_expr(&x));
         let identifier = node.name_ref().and_then(|x| self.emit_name_ref(&x));
         let label = self.trap.emit(generated::FieldExpr {
@@ -982,8 +1174,9 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let abi = node.abi().and_then(|x| self.emit_abi(&x));
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let function_body = if self.should_skip_bodies() {
             None
         } else {
@@ -1069,7 +1262,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let iterable = node.iterable().and_then(|x| self.emit_expr(&x));
         let label = node.label().and_then(|x| self.emit_label(&x));
         let loop_body = node.loop_body().and_then(|x| self.emit_block_expr(&x));
@@ -1123,11 +1317,12 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let args = node
             .args()
             .filter_map(|x| self.emit_format_args_arg(&x))
             .collect();
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let template = node.template().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::FormatArgsExpr {
             id: TrapId::Star,
@@ -1178,7 +1373,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let is_mut = node.mut_token().is_some();
         let is_ref = node.ref_token().is_some();
         let name = node.name().and_then(|x| self.emit_name(&x));
@@ -1199,7 +1395,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let condition = node.condition().and_then(|x| self.emit_expr(&x));
         let else_ = node.else_branch().and_then(|x| self.emit_else_branch(&x));
         let then = node.then_branch().and_then(|x| self.emit_block_expr(&x));
@@ -1218,10 +1415,11 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let assoc_item_list = node
             .assoc_item_list()
             .and_then(|x| self.emit_assoc_item_list(&x));
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let generic_param_list = node
             .generic_param_list()
             .and_then(|x| self.emit_generic_param_list(&x));
@@ -1249,6 +1447,21 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
+    pub(crate) fn emit_impl_restriction(
+        &mut self,
+        node: &ast::ImplRestriction,
+    ) -> Option<Label<generated::ImplRestriction>> {
+        let visibility_inner = node
+            .visibility_inner()
+            .and_then(|x| self.emit_visibility_inner(&x));
+        let label = self.trap.emit(generated::ImplRestriction {
+            id: TrapId::Star,
+            visibility_inner,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
     pub(crate) fn emit_impl_trait_type(
         &mut self,
         node: &ast::ImplTraitType,
@@ -1264,6 +1477,17 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
+    pub(crate) fn emit_include_bytes_expr(
+        &mut self,
+        node: &ast::IncludeBytesExpr,
+    ) -> Option<Label<generated::IncludeBytesExpr>> {
+        let label = self
+            .trap
+            .emit(generated::IncludeBytesExpr { id: TrapId::Star });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
     pub(crate) fn emit_index_expr(
         &mut self,
         node: &ast::IndexExpr,
@@ -1271,7 +1495,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let base = node.base().and_then(|x| self.emit_expr(&x));
         let index = node.index().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::IndexExpr {
@@ -1302,7 +1527,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let items = node.items().filter_map(|x| self.emit_item(&x)).collect();
         let label = self.trap.emit(generated::ItemList {
             id: TrapId::Star,
@@ -1313,6 +1539,21 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
+    pub(crate) fn emit_key_value_meta(
+        &mut self,
+        node: &ast::KeyValueMeta,
+    ) -> Option<Label<generated::KeyValueMeta>> {
+        let expr = node.expr().and_then(|x| self.emit_expr(&x));
+        let path = node.path().and_then(|x| self.emit_path(&x));
+        let label = self.trap.emit(generated::KeyValueMeta {
+            id: TrapId::Star,
+            expr,
+            path,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
     pub(crate) fn emit_label(&mut self, node: &ast::Label) -> Option<Label<generated::Label>> {
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
         let label = self.trap.emit(generated::Label {
@@ -1343,7 +1584,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let scrutinee = node.expr().and_then(|x| self.emit_expr(&x));
         let pat = node.pat().and_then(|x| self.emit_pat(&x));
         let label = self.trap.emit(generated::LetExpr {
@@ -1363,7 +1605,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let initializer = node.initializer().and_then(|x| self.emit_expr(&x));
         let let_else = node.let_else().and_then(|x| self.emit_let_else(&x));
         let pat = node.pat().and_then(|x| self.emit_pat(&x));
@@ -1413,7 +1656,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
         let type_bound_list = node
             .type_bound_list()
@@ -1435,7 +1679,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let text_value = node.try_get_text();
         let label = self.trap.emit(generated::LiteralExpr {
             id: TrapId::Star,
@@ -1466,7 +1711,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let label = node.label().and_then(|x| self.emit_label(&x));
         let loop_body = node.loop_body().and_then(|x| self.emit_block_expr(&x));
         let label = self.trap.emit(generated::LoopExpr {
@@ -1489,7 +1735,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let path = node.path().and_then(|x| self.emit_path(&x));
         let token_tree = if self.should_skip_bodies() {
             None
@@ -1514,12 +1761,13 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let args = if self.should_skip_bodies() {
             None
         } else {
             node.args().and_then(|x| self.emit_token_tree(&x))
         };
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let body = if self.should_skip_bodies() {
             None
         } else {
@@ -1543,9 +1791,11 @@ impl Translator<'_> {
         &mut self,
         node: &ast::MacroExpr,
     ) -> Option<Label<generated::MacroExpr>> {
+        let attrs = self.take_parenthesized_expr_attrs(node.syntax());
         let macro_call = node.macro_call().and_then(|x| self.emit_macro_call(&x));
         let label = self.trap.emit(generated::MacroExpr {
             id: TrapId::Star,
+            attrs,
             macro_call,
         });
         self.emit_location(label, node);
@@ -1585,7 +1835,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let name = node.name().and_then(|x| self.emit_name(&x));
         let token_tree = node.token_tree().and_then(|x| self.emit_token_tree(&x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(&x));
@@ -1620,7 +1871,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let guard = node.guard().and_then(|x| self.emit_match_guard(&x));
         let pat = node.pat().and_then(|x| self.emit_pat(&x));
@@ -1642,11 +1894,12 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let arms = node
             .arms()
             .filter_map(|x| self.emit_match_arm(&x))
             .collect();
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let label = self.trap.emit(generated::MatchArmList {
             id: TrapId::Star,
             arms,
@@ -1663,7 +1916,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let scrutinee = node.expr().and_then(|x| self.emit_expr(&x));
         let match_arm_list = node
             .match_arm_list()
@@ -1691,26 +1945,6 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
-    pub(crate) fn emit_meta(&mut self, node: &ast::Meta) -> Option<Label<generated::Meta>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
-        let expr = node.expr().and_then(|x| self.emit_expr(&x));
-        let is_unsafe = node.unsafe_token().is_some();
-        let path = node.path().and_then(|x| self.emit_path(&x));
-        let token_tree = node.token_tree().and_then(|x| self.emit_token_tree(&x));
-        let label = self.trap.emit(generated::Meta {
-            id: TrapId::Star,
-            expr,
-            is_unsafe,
-            path,
-            token_tree,
-        });
-        self.emit_location(label, node);
-        self.post_emit(node, label);
-        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
-        Some(label)
-    }
     pub(crate) fn emit_method_call_expr(
         &mut self,
         node: &ast::MethodCallExpr,
@@ -1718,8 +1952,9 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let arg_list = node.arg_list().and_then(|x| self.emit_arg_list(&x));
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let generic_arg_list = node
             .generic_arg_list()
             .and_then(|x| self.emit_generic_arg_list(&x));
@@ -1741,7 +1976,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let item_list = node.item_list().and_then(|x| self.emit_item_list(&x));
         let name = node.name().and_then(|x| self.emit_name(&x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(&x));
@@ -1756,6 +1992,23 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
+    pub(crate) fn emit_mut_restriction(
+        &mut self,
+        node: &ast::MutRestriction,
+    ) -> Option<Label<generated::MutRestriction>> {
+        let is_mut = node.mut_token().is_some();
+        let visibility_inner = node
+            .visibility_inner()
+            .and_then(|x| self.emit_visibility_inner(&x));
+        let label = self.trap.emit(generated::MutRestriction {
+            id: TrapId::Star,
+            is_mut,
+            visibility_inner,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
     pub(crate) fn emit_name(&mut self, node: &ast::Name) -> Option<Label<generated::Name>> {
         let text = node.try_get_text();
         let label = self.trap.emit(generated::Name {
@@ -1790,6 +2043,15 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
+    pub(crate) fn emit_not_null(
+        &mut self,
+        node: &ast::NotNull,
+    ) -> Option<Label<generated::NotNull>> {
+        let label = self.trap.emit(generated::NotNull { id: TrapId::Star });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
     pub(crate) fn emit_offset_of_expr(
         &mut self,
         node: &ast::OffsetOfExpr,
@@ -1797,7 +2059,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let fields = node
             .fields()
             .filter_map(|x| self.emit_name_ref(&x))
@@ -1827,7 +2090,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let pat = if self.should_skip_bodies() {
             None
         } else {
@@ -1859,37 +2123,6 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
-    pub(crate) fn emit_paren_expr(
-        &mut self,
-        node: &ast::ParenExpr,
-    ) -> Option<Label<generated::ParenExpr>> {
-        if self.should_be_excluded(node) {
-            return None;
-        }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
-        let expr = node.expr().and_then(|x| self.emit_expr(&x));
-        let label = self.trap.emit(generated::ParenExpr {
-            id: TrapId::Star,
-            attrs,
-            expr,
-        });
-        self.emit_location(label, node);
-        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
-        Some(label)
-    }
-    pub(crate) fn emit_paren_pat(
-        &mut self,
-        node: &ast::ParenPat,
-    ) -> Option<Label<generated::ParenPat>> {
-        let pat = node.pat().and_then(|x| self.emit_pat(&x));
-        let label = self.trap.emit(generated::ParenPat {
-            id: TrapId::Star,
-            pat,
-        });
-        self.emit_location(label, node);
-        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
-        Some(label)
-    }
     pub(crate) fn emit_paren_type(
         &mut self,
         node: &ast::ParenType,
@@ -1938,7 +2171,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let path = node.path().and_then(|x| self.emit_path(&x));
         let label = self.trap.emit(generated::PathExpr {
             id: TrapId::Star,
@@ -1949,6 +2183,19 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
+    pub(crate) fn emit_path_meta(
+        &mut self,
+        node: &ast::PathMeta,
+    ) -> Option<Label<generated::PathMeta>> {
+        let path = node.path().and_then(|x| self.emit_path(&x));
+        let label = self.trap.emit(generated::PathMeta {
+            id: TrapId::Star,
+            path,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
     pub(crate) fn emit_path_pat(
         &mut self,
         node: &ast::PathPat,
@@ -2006,6 +2253,21 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
+    pub(crate) fn emit_pattern_type(
+        &mut self,
+        node: &ast::PatternType,
+    ) -> Option<Label<generated::PatternTypeRepr>> {
+        let pat = node.pat().and_then(|x| self.emit_pat(&x));
+        let type_repr = node.ty().and_then(|x| self.emit_type(&x));
+        let label = self.trap.emit(generated::PatternTypeRepr {
+            id: TrapId::Star,
+            pat,
+            type_repr,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
     pub(crate) fn emit_prefix_expr(
         &mut self,
         node: &ast::PrefixExpr,
@@ -2013,7 +2275,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let operator_name = node.try_get_text();
         let label = self.trap.emit(generated::PrefixExpr {
@@ -2050,7 +2313,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let end = node.end().and_then(|x| self.emit_expr(&x));
         let operator_name = node.try_get_text();
         let start = node.start().and_then(|x| self.emit_expr(&x));
@@ -2086,12 +2350,14 @@ impl Translator<'_> {
         &mut self,
         node: &ast::RecordExpr,
     ) -> Option<Label<generated::StructExpr>> {
+        let attrs = self.take_parenthesized_expr_attrs(node.syntax());
         let path = node.path().and_then(|x| self.emit_path(&x));
         let struct_expr_field_list = node
             .record_expr_field_list()
             .and_then(|x| self.emit_record_expr_field_list(&x));
         let label = self.trap.emit(generated::StructExpr {
             id: TrapId::Star,
+            attrs,
             path,
             struct_expr_field_list,
         });
@@ -2106,7 +2372,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let identifier = node.name_ref().and_then(|x| self.emit_name_ref(&x));
         let label = self.trap.emit(generated::StructExprField {
@@ -2126,7 +2393,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let fields = node
             .fields()
             .filter_map(|x| self.emit_record_expr_field(&x))
@@ -2149,17 +2417,22 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
-        let default = node.expr().and_then(|x| self.emit_expr(&x));
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
+        let default_val = node.default_val().and_then(|x| self.emit_const_arg(&x));
         let is_unsafe = node.unsafe_token().is_some();
+        let mut_restriction = node
+            .mut_restriction()
+            .and_then(|x| self.emit_mut_restriction(&x));
         let name = node.name().and_then(|x| self.emit_name(&x));
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(&x));
         let label = self.trap.emit(generated::StructField {
             id: TrapId::Star,
             attrs,
-            default,
+            default_val,
             is_unsafe,
+            mut_restriction,
             name,
             type_repr,
             visibility,
@@ -2208,7 +2481,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let identifier = node.name_ref().and_then(|x| self.emit_name_ref(&x));
         let pat = node.pat().and_then(|x| self.emit_pat(&x));
         let label = self.trap.emit(generated::StructPatField {
@@ -2246,7 +2520,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let is_const = node.const_token().is_some();
         let is_mut = node.mut_token().is_some();
@@ -2309,7 +2584,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let label = self.trap.emit(generated::RestPat {
             id: TrapId::Star,
             attrs,
@@ -2338,7 +2614,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::ReturnExpr {
             id: TrapId::Star,
@@ -2367,7 +2644,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let is_ref = node.amp_token().is_some();
         let is_mut = node.mut_token().is_some();
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
@@ -2419,7 +2697,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let items = node.items().filter_map(|x| self.emit_item(&x)).collect();
         let label = self.trap.emit(generated::SourceFile {
             id: TrapId::Star,
@@ -2434,7 +2713,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let body = if self.should_skip_bodies() {
             None
         } else {
@@ -2468,7 +2748,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let statements = node
             .statements()
             .filter_map(|x| self.emit_stmt(&x))
@@ -2491,7 +2772,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let field_list = node.field_list().and_then(|x| self.emit_field_list(&x));
         let generic_param_list = node
             .generic_param_list()
@@ -2522,17 +2804,36 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
+    pub(crate) fn emit_token_tree_meta(
+        &mut self,
+        node: &ast::TokenTreeMeta,
+    ) -> Option<Label<generated::TokenTreeMeta>> {
+        let path = node.path().and_then(|x| self.emit_path(&x));
+        let token_tree = node.token_tree().and_then(|x| self.emit_token_tree(&x));
+        let label = self.trap.emit(generated::TokenTreeMeta {
+            id: TrapId::Star,
+            path,
+            token_tree,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
     pub(crate) fn emit_trait(&mut self, node: &ast::Trait) -> Option<Label<generated::Trait>> {
         if self.should_be_excluded(node) {
             return None;
         }
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let assoc_item_list = node
             .assoc_item_list()
             .and_then(|x| self.emit_assoc_item_list(&x));
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let generic_param_list = node
             .generic_param_list()
             .and_then(|x| self.emit_generic_param_list(&x));
+        let impl_restriction = node
+            .impl_restriction()
+            .and_then(|x| self.emit_impl_restriction(&x));
         let is_auto = node.auto_token().is_some();
         let is_unsafe = node.unsafe_token().is_some();
         let name = node.name().and_then(|x| self.emit_name(&x));
@@ -2546,6 +2847,7 @@ impl Translator<'_> {
             assoc_item_list,
             attrs,
             generic_param_list,
+            impl_restriction,
             is_auto,
             is_unsafe,
             name,
@@ -2557,31 +2859,16 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
-    pub(crate) fn emit_trait_alias(
+    pub(crate) fn emit_try_block_modifier(
         &mut self,
-        node: &ast::TraitAlias,
-    ) -> Option<Label<generated::TraitAlias>> {
-        if self.should_be_excluded(node) {
-            return None;
-        }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
-        let generic_param_list = node
-            .generic_param_list()
-            .and_then(|x| self.emit_generic_param_list(&x));
-        let name = node.name().and_then(|x| self.emit_name(&x));
-        let type_bound_list = node
-            .type_bound_list()
-            .and_then(|x| self.emit_type_bound_list(&x));
-        let visibility = node.visibility().and_then(|x| self.emit_visibility(&x));
-        let where_clause = node.where_clause().and_then(|x| self.emit_where_clause(&x));
-        let label = self.trap.emit(generated::TraitAlias {
+        node: &ast::TryBlockModifier,
+    ) -> Option<Label<generated::TryBlockModifier>> {
+        let is_try = node.try_token().is_some();
+        let type_repr = node.ty().and_then(|x| self.emit_type(&x));
+        let label = self.trap.emit(generated::TryBlockModifier {
             id: TrapId::Star,
-            attrs,
-            generic_param_list,
-            name,
-            type_bound_list,
-            visibility,
-            where_clause,
+            is_try,
+            type_repr,
         });
         self.emit_location(label, node);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
@@ -2594,7 +2881,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::TryExpr {
             id: TrapId::Star,
@@ -2612,7 +2900,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let fields = node.fields().filter_map(|x| self.emit_expr(&x)).collect();
         let label = self.trap.emit(generated::TupleExpr {
             id: TrapId::Star,
@@ -2630,12 +2919,17 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
+        let mut_restriction = node
+            .mut_restriction()
+            .and_then(|x| self.emit_mut_restriction(&x));
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(&x));
         let label = self.trap.emit(generated::TupleField {
             id: TrapId::Star,
             attrs,
+            mut_restriction,
             type_repr,
             visibility,
         });
@@ -2707,7 +3001,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let generic_param_list = node
             .generic_param_list()
             .and_then(|x| self.emit_generic_param_list(&x));
@@ -2795,7 +3090,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let default_type = node.default_type().and_then(|x| self.emit_type(&x));
         let name = node.name().and_then(|x| self.emit_name(&x));
         let type_bound_list = node
@@ -2819,7 +3115,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let label = self.trap.emit(generated::UnderscoreExpr {
             id: TrapId::Star,
             attrs,
@@ -2835,7 +3132,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let generic_param_list = node
             .generic_param_list()
             .and_then(|x| self.emit_generic_param_list(&x));
@@ -2859,11 +3157,27 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
+    pub(crate) fn emit_unsafe_meta(
+        &mut self,
+        node: &ast::UnsafeMeta,
+    ) -> Option<Label<generated::UnsafeMeta>> {
+        let is_unsafe = node.unsafe_token().is_some();
+        let meta = node.meta().and_then(|x| self.emit_meta(&x));
+        let label = self.trap.emit(generated::UnsafeMeta {
+            id: TrapId::Star,
+            is_unsafe,
+            meta,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
     pub(crate) fn emit_use(&mut self, node: &ast::Use) -> Option<Label<generated::Use>> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let use_tree = node.use_tree().and_then(|x| self.emit_use_tree(&x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(&x));
         let label = self.trap.emit(generated::Use {
@@ -2936,15 +3250,16 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
-        let discriminant = node.expr().and_then(|x| self.emit_expr(&x));
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
+        let const_arg = node.const_arg().and_then(|x| self.emit_const_arg(&x));
         let field_list = node.field_list().and_then(|x| self.emit_field_list(&x));
         let name = node.name().and_then(|x| self.emit_name(&x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(&x));
         let label = self.trap.emit(generated::Variant {
             id: TrapId::Star,
             attrs,
-            discriminant,
+            const_arg,
             field_list,
             name,
             visibility,
@@ -2973,8 +3288,23 @@ impl Translator<'_> {
         &mut self,
         node: &ast::Visibility,
     ) -> Option<Label<generated::Visibility>> {
-        let path = node.path().and_then(|x| self.emit_path(&x));
+        let visibility_inner = node
+            .visibility_inner()
+            .and_then(|x| self.emit_visibility_inner(&x));
         let label = self.trap.emit(generated::Visibility {
+            id: TrapId::Star,
+            visibility_inner,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
+    pub(crate) fn emit_visibility_inner(
+        &mut self,
+        node: &ast::VisibilityInner,
+    ) -> Option<Label<generated::VisibilityInner>> {
+        let path = node.path().and_then(|x| self.emit_path(&x));
+        let label = self.trap.emit(generated::VisibilityInner {
             id: TrapId::Star,
             path,
         });
@@ -3026,7 +3356,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let condition = node.condition().and_then(|x| self.emit_expr(&x));
         let label = node.label().and_then(|x| self.emit_label(&x));
         let loop_body = node.loop_body().and_then(|x| self.emit_block_expr(&x));
@@ -3057,7 +3388,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::YeetExpr {
             id: TrapId::Star,
@@ -3075,7 +3407,8 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
+        let mut attrs = self.take_parenthesized_expr_attrs(node.syntax());
+        attrs.extend(node.attrs_with_doc().filter_map(|x| self.emit_any_attr(&x)));
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::YieldExpr {
             id: TrapId::Star,
@@ -3093,6 +3426,9 @@ impl HasTrapClass for ast::AssocItem {
 impl HasTrapClass for ast::ExternItem {
     type TrapClass = generated::ExternItem;
 }
+impl HasTrapClass for ast::Meta {
+    type TrapClass = generated::Meta;
+}
 impl HasTrapClass for ast::Item {
     type TrapClass = generated::Item;
 }
@@ -3108,9 +3444,6 @@ impl HasTrapClass for ast::Fn {
 impl HasTrapClass for ast::MacroCall {
     type TrapClass = generated::MacroCall;
 }
-impl HasTrapClass for ast::Meta {
-    type TrapClass = generated::Meta;
-}
 impl HasTrapClass for ast::PathSegment {
     type TrapClass = generated::PathSegment;
 }
diff --git a/rust/extractor/src/util.rs b/rust/extractor/src/util.rs
new file mode 100644
index 000000000000..a12ca6de74a1
--- /dev/null
+++ b/rust/extractor/src/util.rs
@@ -0,0 +1,15 @@
+use std::cmp::Ordering;
+
+/// Compares options using a custom comparator, with `None` ordered before `Some`.
+pub(crate) fn cmp_option_by<T>(
+    left: &Option<T>,
+    right: &Option<T>,
+    compare: impl FnOnce(&T, &T) -> Ordering,
+) -> Ordering {
+    match (left, right) {
+        (Some(left), Some(right)) => compare(left, right),
+        (Some(_), None) => Ordering::Greater,
+        (None, Some(_)) => Ordering::Less,
+        (None, None) => Ordering::Equal,
+    }
+}
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index daf63567c42b..54dac41504d7 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -1,65 +1,75 @@
-lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 3f4499c892277e07380232b2c90138d7c312911ef8af4a89ba0c9c2958da028b d8a8b330f8dc43e009c261a41801893230b6b568f503c17faeae9cea54714075
+lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll ec38e8864833e5dc3b4bc5f507dcc6bcf2b6a5c629b0d734980d690fb8174666 5dbceaad3a76d9032dd650f599b66528173ab8fc6f2e6c67eada1ed8f668ea59
 lib/codeql/rust/elements/Abi.qll 485a2e79f6f7bfd1c02a6e795a71e62dede3c3e150149d5f8f18b761253b7208 6159ba175e7ead0dd2e3f2788f49516c306ee11b1a443bd4bdc00b7017d559bd
 lib/codeql/rust/elements/Addressable.qll 13011bfd2e1556694c3d440cc34af8527da4df49ad92b62f2939d3699ff2cea5 ddb25935f7553a1a384b1abe2e4b4fa90ab50b952dadec32fd867afcb054f4be
+lib/codeql/rust/elements/AnyAttr.qll 31536ed6ba02c538ff192089dc40c6f984ce808406f0522eed49539b9ae8a0da c6df96292f0f96415af4e8b3736e870475c21829ab08a8fe56d221ee4bb4cbd7
 lib/codeql/rust/elements/ArgList.qll 3d2f6f5542340b80a4c6e944ac17aba0d00727588bb66e501453ac0f80c82f83 afd52700bf5a337f19827846667cd0fb1fea5abbbcbc353828e292a727ea58c9
-lib/codeql/rust/elements/ArrayExpr.qll e4e7cff3518c50ec908271906dd46c1fbe9098faa1e8cd06a27f0a6e8d165ed1 fe02a4f4197f57ecd1e8e82d6c9384148ec29d8b106d7f696795b2f325e4a71b
+lib/codeql/rust/elements/ArrayExpr.qll 28b5d11ec05307cafbb6481e8992a6864e5a99688a427200926948d7342ba858 c5a97c717d97044b20b811eac19a675bf2cd9e7077526e85bd1b1b03e74c99df
 lib/codeql/rust/elements/ArrayListExpr.qll 451aedcecb479c385ff497588c7a07fda304fd5b873270223a4f2c804e96b245 a8cb008f6f732215623b5626c84b37b651ca01ccafb2cf4c835df35d5140c6ad
 lib/codeql/rust/elements/ArrayRepeatExpr.qll 4b7ed5be7d2caaf69f6fc0cd05b0e2416c52d547b1a73fb23d5a13007f75f4dd f6366f21cc48376b5fdf37e8c5c2b19415d4cbdeef09f33bb99cde5cb0f5b0e7
 lib/codeql/rust/elements/ArrayTypeRepr.qll a3e61c99567893aa26c610165696e54d11c16053b6b7122275eff2c778f0a52d 36a487dcb083816b85f3eec181a1f9b47bba012765486e54db61c7ffe9a0fcbf
-lib/codeql/rust/elements/AsmClobberAbi.qll eb5628916f41ab47e333b4528fba3fb80caecd2805fb20ba4f5c8d59c9677f14 636fce6b3a7f04141d0d3a53734d08a188a45bcc04f755bb66746d4f0a13fa72
+lib/codeql/rust/elements/AsmClobberAbi.qll c48e5ab858fd470875c5e518545fb2184055c3dff51583f87addad196830ce3b f86775fa7130ac7d551e1ecaa0dfb2f56447d307b5624a3e149f242a7f1a0156
 lib/codeql/rust/elements/AsmConst.qll f408468624dd0c80c6dcf62d17e65a94cd477a5a760be1b5fdd07c8189a3b4ea e4159073b3ee6d247e8962ce925da55ea39ee2cd1649f8b785a92aea17dbf144
 lib/codeql/rust/elements/AsmDirSpec.qll 0c439c031c9f60596373aee8ae2ee70068582548ae365a3c7c19c8b5e2b030d2 0127b08b99bd8725cb6273c1a930aef4434897f23611cfc4ec2dd1b7c9d7e3d0
-lib/codeql/rust/elements/AsmExpr.qll 0a477c401583a778ea6736070eaf8959f9312135e863e45fafb6c160da2e8f1b 0447b2438c694f9e9bd2629abb66281724d27b17e534fa8e9a19b2ea30af18d2
+lib/codeql/rust/elements/AsmExpr.qll 0b41bce54caf83a09d2144108bb953bd3fa4b7e59efa2803ef982de4a7556e66 bbaff708b20863e340799d89f11fa14b027a91730c497db4119dcd836f38b88d
 lib/codeql/rust/elements/AsmLabel.qll 5fa3401c49329ddc845bd95d5f498a455202f685e962dfec9bc91550577da800 f54fe1dcd3c76f36e6abc7b56dc5d6f5b1c30d0fb434db21dd8a1ce731fc6abf
 lib/codeql/rust/elements/AsmOperand.qll 3987a289233fe09f41f20b27939655cc72fa46847969a55cca6d6393f906969a 8810ff2a64f29d1441a449f5fd74bdc1107782172c7a21baaeb48a40930b7d5a
 lib/codeql/rust/elements/AsmOperandExpr.qll 72d4455cf742dc977b0a33ea21539422aaf2263f36c6f4420ddcb360ac606a0a 03bd01e81b291c915deb20ce33d5bdf73a709fbc007ab7570490e9a8e7c8604c
-lib/codeql/rust/elements/AsmOperandNamed.qll c65bcf6f4ad5ebb447873ac170bd5d29dc5fe557f7aaccbdb46a09b2583df673 d7e277e43414ca2c529c5a4e967f4c6cca34ee7239ab1a993558b0731ce9722b
+lib/codeql/rust/elements/AsmOperandNamed.qll c3718ee466de4dd011d82468d9479c09a0dc0ed8bb5c57e06a55809d5e2e407e c238074990f5c1b714f2f43fd1f5f6108139acff17e6366981500b3a640be801
 lib/codeql/rust/elements/AsmOption.qll 7ad333a4bb152dbf7c1df0d90424ff20031841822e49b26cc615230b1c186581 9c2a087ea7f7c386eff170337f0c29568dea3d49a570b35207652b08e24a9355
-lib/codeql/rust/elements/AsmOptionsList.qll 3dd55a8b15ada811c9225b0fe9b733eabf22313e7bd1ae6a99fdcb9a6facea07 32d996dde8802e4a2afd8c3624f055cb4e4c18591dc236f3b5bf0c0d4e57f822
+lib/codeql/rust/elements/AsmOptionsList.qll b37e9a2ae6f55a04dcdda14c60d92e8967271b5403c50078ce9a0cb09ecf1a4b c845470813cdace38378e190b6359a94cdc0d2933f97a1d4121b9eb542ce5ffa
 lib/codeql/rust/elements/AsmPiece.qll 8650bf07246fac95533876db66178e4b30ed3210de9487b25acd2da2d145416a 42155a47d5d5e6ea2833127e78059fa81126a602e178084957c7d9ff88c1a9a3
 lib/codeql/rust/elements/AsmRegOperand.qll 27abfffe1fc99e243d9b915f9a9694510133e5f72100ec0df53796d27a45de0c 8919ab83081dae2970adb6033340c6a18751ffd6a8157cf8c55916ac4253c791
 lib/codeql/rust/elements/AsmRegSpec.qll 77483fc3d1de8761564e2f7b57ecf1300d67de50b66c11144bb4e3e0059ebfd6 521f8dd0af859b7eef6ab2edab2f422c9ff65aa11bad065cfba2ec082e0c786b
 lib/codeql/rust/elements/AsmSym.qll ba29b59ae2a4aa68bdc09e61b324fd26e8b7e188af852345676fc5434d818eef 10ba571059888f13f71ac5e75d20b58f3aa6eecead0d4c32a7617018c7c72e0e
 lib/codeql/rust/elements/AssocItem.qll 7a65365df8ae0603f892b6d9a27372ad81d06945abd408a2f25a6595a6ea3b6e 24bc6dd8485bcd7d236067cb37bda1300a891009d0a739681aee218449304ed2
-lib/codeql/rust/elements/AssocItemList.qll 5d2660e199e59647e3a8b6234531428f6e0a236ed2ced3c9fede13e7f83a5ba5 a2a8e87ab8978f77a70e4c0a8cc7322c522fc4a7a05116646a2b97a2f47428a4
+lib/codeql/rust/elements/AssocItemList.qll 72c3a9914e2f5370e14e1b66a53ec255e51d6c9b980050db3a1f266644dbb1dd 95eb70e4847ca0601df6de49d820b19a8316427f9ce1fe149c4e2fdf5b0d9776
 lib/codeql/rust/elements/AssocTypeArg.qll 6ceeec7a0ec78a6f8b2e74c0798d4727ad350cebde954b4ffe442b06e08eb4aa d615f5cd696892518387d20f04dae240fb10ee7c9577028fb6f2a51cd9f5b9e4
 lib/codeql/rust/elements/AstNode.qll 5ee6355afb1cafd6dfe408b8c21836a1ba2aeb709fb618802aa09f9342646084 dee708f19c1b333cbd9609819db3dfdb48a0c90d26266c380f31357b1e2d6141
-lib/codeql/rust/elements/Attr.qll 2cb6a6adf1ff9ee40bc37434320d77d74ae41ff10bbd4956414c429039eede36 e85784299917ad8a58f13824b20508f217b379507f9249e6801643cf9628db1e
-lib/codeql/rust/elements/AwaitExpr.qll d8b37c01f7d27f0ec40d92a533a8f09a06af7ece1ae832b4ea8f2450c1762511 92cdb7ff0efddf26bed2b7b2729fddd197e26c1a11c8fec0c747aab642710c21
-lib/codeql/rust/elements/BecomeExpr.qll 7a3cfc4894feb6be1cde664f675b18936434e68ccea52e55314c33d01491e34f 49666eca509b30d44bb02702bda67239c76bf8d9f231022c9cf6ecca123f8616
-lib/codeql/rust/elements/BinaryExpr.qll 394522da3bc3a716fc7bc40c3560143ca840f5d210cfcba2a752c3026dd0f725 fbbd6fb79bf16a7d9820613654c584cd7ff3e7a29988f3920b6cfbe746acfd8d
-lib/codeql/rust/elements/BlockExpr.qll b5cf57119b15f27d0bc258dfa375b0ef2730c157870ff543f0dc7a8cfe514182 f6a01999606b010c81ef9c6ff1385e6640632b6f5ce067ffeb0ef0af0a0aeb92
+lib/codeql/rust/elements/Attr.qll 3ed0d532e86a75fced330d56b79a8253b34a422c7d69dbd3a005e8e90edc2d71 63c705f18058a8fad318431d9bd6cf96052a9450c0555399587b269793793740
+lib/codeql/rust/elements/AwaitExpr.qll 45d8a1fb7e5909fb226de10637e12243da8ce6e7eee47fd15fc2d96bb3409597 653da09e4d366eeb3f63bb9e5cc495981760fc682adab63e9b01715203709c6e
+lib/codeql/rust/elements/BecomeExpr.qll ec2153c3c30091246d4ef0807f36946c99efd04b622e9ffad124e6320b24f13f b490e35ae7f28481243b7661e2f3625f43f21fd194847b555701bd3ad9c8ec6c
+lib/codeql/rust/elements/BinaryExpr.qll c85021c10b83533eaeb42249b36049a86c6d77ea409279d954c1b84a97f41507 8269f3347219994bd248b73492c46ff46f54974c16d1c67e19b8bc6f33a24dc5
+lib/codeql/rust/elements/BlockExpr.qll 4227c6c8e695d6735b00e17e3270f43e1ef1e75a42f5eec98afd5cd942528b5a 353a0abd4f8ff17b82d91e20f9d874f2eda2ac43f80f713ef5ee475a9de66c72
 lib/codeql/rust/elements/BoxPat.qll 1b2c3fff171aa6aa238c9460b122f26c79e04577cea67fa856de99842ba873d4 0caf8d23ed6e0997a6b8751def27641582151fba6e24fccf798712a4690b42f1
-lib/codeql/rust/elements/BreakExpr.qll 7ca3807a20e9a9a988d1fd7abebf240325ed422fcb45c719ba46272f031f94db dffb7379d3f3ba220acfbd05eb7bb6cfd9cfda211e9c8b1f5240ca5fa61be3fc
-lib/codeql/rust/elements/CallExpr.qll ee3997f265dc1b6b2fc7134548dd88d509b6bcbc26cf65061a31980f9900ae26 7e86e0ab24ce78c3f592a5614eac083d00f331664f021a438f74e2e0785f4609
-lib/codeql/rust/elements/Callable.qll 08a46e987b8fde29069795a536fcd1ad1a96f60341f72293e4d07e20334d554f cfc2be9287000718e5ff3c2a35bb45ffc93fd36d97f2e034888e9aa2ae9af555
-lib/codeql/rust/elements/CastExpr.qll 2fe1f36ba31fa29de309baf0a665cfcae67b61c73345e8f9bbd41e8c235fec45 c5b4c1e9dc24eb2357799defcb2df25989075e3a80e8663b74204a1c1b70e29a
+lib/codeql/rust/elements/BreakExpr.qll a65dceb7f7ae95c62e09d0a2fef65d42742e8da4522da17be3041ddf4d1a7e43 e29f58494f6d9ead7a8feaaa2c92c14ce26374363bec4187cc7e0b8b96f31764
+lib/codeql/rust/elements/CallExpr.qll 73224f72b5d17eb898f80a554240d6e49d2db116de8ea9a21654a2d8118ba508 091b061717e89f940a3275d15bc3e2691da3e6bdd79ac7ff21183f1343fdb818
+lib/codeql/rust/elements/Callable.qll e18ba43e85cb659cc4c88195681129488444c0f8943e0b23473b5baa29175159 1dbd41a5089e1d8dc1d9a046ebed338f835471a59d27595e497960af543084e0
+lib/codeql/rust/elements/CastExpr.qll dc78fffc320cd5564a7003dd512b77a96f7935fad4c9ef4681acf60d860b5a21 044c60a7be44620b066bec2105e13e940149d56decd41a292957e079d717daab
+lib/codeql/rust/elements/CfgAtom.qll 0567c41550cbcf88f334f0285bac32f87726099f2444108b7842e1ecf8a3a36b 6a3858268921c4a9bb8db9239867b5e46b54d1f5d133a6f19cfd648de4d15b65
+lib/codeql/rust/elements/CfgAttrMeta.qll 85f6503abce5c1c3de06df0c0d2ae8fda4206b94bc8103d54550ad2d84a93fb4 af1e7967d7c9c80f1a4725d8a045d645b247f5aa1a3a462a08eea39c4ab4491f
+lib/codeql/rust/elements/CfgComposite.qll 50f624532b6f6086ac507c294da7dc3a96d4154d70541449c89b4395cbe366a7 6aa0c7a1484b02833b7cc7692018f96dd6724b8f76a1e171171b7f5aac69e3a6
+lib/codeql/rust/elements/CfgMeta.qll 583c4561968f787ea1fb7fe8af165273e0f35c2e1efd26364a004edeebee5786 86eca520313dc40b0e523d8941858909c2632eb32c01d74ddb1c524527fbd8eb
+lib/codeql/rust/elements/CfgPredExpr.qll 9d4a04f440f249b8f86e0cba433f186c5c062d70a14ff14ebd3fa694c89d17bd b70fa1d6569a71976e0e33c17d2cc6b7974404c59bb6ed44ab00500039bb4376
+lib/codeql/rust/elements/CfgPredPat.qll a59d8f02e2aad1b7ca009855ab6bdb36947810c8b1eb2cc9c244f1917b8055ca f3e943de097f82da14bf00b38804f1cbb7b2bbbbc8f011a99bf50f449c29656d
+lib/codeql/rust/elements/CfgPredicate.qll e86f55f98b8f09fb5da9af550cb6c43089d8deb2e3b83d7e195e9bddc8cf201b ba30cf064ba1236139c8c55bfab204b9256e407db983b42b23319690c7ff5562
 lib/codeql/rust/elements/ClosureExpr.qll 69e0b7a7c7a4c348fcada5ad4da22dd2f51747109f856be239cede315a56d695 93400650282e2d4e682b826e9f5f844aa893dda126548e41ea1c703d2bf209ca
-lib/codeql/rust/elements/Comment.qll fedad50575125e9a64a8a8776a8c1dbf1e76df990f01849d9f0955f9d74cb2a6 8eb1afad1e1007a4f0090fdac65d81726b23eda6517d067fd0185f70f17635ab
-lib/codeql/rust/elements/Const.qll 5f4d11e01162a06127ba56519efd66d1ecfb5de7c1792fc1c283a56cf2127373 8c618ac774267d25db70cc05a080f8a408dc23ab7e88c0fc543eda8b4d4cb995
+lib/codeql/rust/elements/Comment.qll e3613664af81b7a6d77466b4c37d723c74cc220121473dd8a0e552db7d9a0b71 108c4ab7455ea70dd0ccdaacb4baae31ba68b81c9f516b4c903aa9aa7db4fbc1
+lib/codeql/rust/elements/Const.qll a415c85d44b10b62f220bb81f7e130626ae9b3527293f3100ee8c137ae90e868 fbe5a124307e195f422220df436919b1dca21315ca3573cb8ce9f1712c6c9b67
 lib/codeql/rust/elements/ConstArg.qll 01865b3be4790c627a062c59ea608462931abcb2f94a132cf265318664fd1251 a2c6bbf63dbfa999e511b6941143a51c9392477d8ccd25e081f85475936ff558
 lib/codeql/rust/elements/ConstBlockPat.qll a25f42b84dbeb33e10955735ef53b8bb7e3258522d6d1a9068f19adaf1af89d9 eeb816d2b54db77a1e7bb70e90b68d040a0cd44e9d44455a223311c3615c5e6e
-lib/codeql/rust/elements/ConstParam.qll 87776586f7ff562ff3c71373f45cf70486f9a832613a0aaac943311c451cc057 67a31616688106d5130951f2162e5229bff0fde08ff647943663cac427d7048b
-lib/codeql/rust/elements/ContinueExpr.qll 9f27c5d5c819ad0ebc5bd10967ba8d33a9dc95b9aae278fcfb1fcf9216bda79c 0dc061445a6b89854fdce92aaf022fdc76b724511a50bb777496ce75c9ecb262
+lib/codeql/rust/elements/ConstParam.qll 176d1bdff98ff6b12a5d0a5f893cea5303b4d764762ceb7bd282a1d3476b202e f41cc576e6ef10e131ad2bea0a852c718324ca31830422001fa80e15e2b0132b
+lib/codeql/rust/elements/ContinueExpr.qll 5ace5d28439708480b1ade7bac00840ae7035e254fbc1b2b0fd348a220f0ba0e ebd8069b0a336f036643e40db5885c248dce90c3a1b3211576569fae7a53cc35
 lib/codeql/rust/elements/Crate.qll 1426960e6f36195e42ea5ea321405c1a72fccd40cd6c0a33673c321c20302d8d 1571a89f89dab43c5291b71386de7aadf52730755ba10f9d696db9ad2f760aff
+lib/codeql/rust/elements/DerefPat.qll 0ec42df5cf3b08931a0fab900e9a2196fa3a1a742c15b9af743fd952cdca2fe9 3022254ed99abde37ecf0a1678b12534740b58f1bb1b68c6e823fcaa57fde579
+lib/codeql/rust/elements/DocComment.qll 4eaff6b4c17afe55573d55471a3f2025351da6bbea20eefcaccebb64cd5b0e96 438be47ea65656953b6ee95ad42f0dfb5f2e77507c59d55b74645375fa457d7d
 lib/codeql/rust/elements/DynTraitTypeRepr.qll e4d27112d27ae93c621defd2c976fd4e90663ab7f6115e83ae4fe8106cb5e015 eb9fde89698588f3b7116f62388c54e937f99559b22c93d11a5596e754560072
 lib/codeql/rust/elements/Element.qll 0b62d139fef54ed2cf2e2334806aa9bfbc036c9c2085d558f15a42cc3fa84c48 24b999b93df79383ef27ede46e38da752868c88a07fe35fcff5d526684ba7294
 lib/codeql/rust/elements/Enum.qll 13c1a3bddfff6c9cc644902652883aefc7721bc94bd8084a1a49acc156996d12 17a898434329437479de4fef27ce11f5996b1953168066bd6d51f93594cc79d1
 lib/codeql/rust/elements/Expr.qll e5d65e805ccf440d64d331e55df4c4144ab8c8f63f367382494714087659ffe8 2bbc1e5d3a65f413ec33d9822fa451fbdbe32349158db58cc0bfcfafb0e21bda
 lib/codeql/rust/elements/ExprStmt.qll 00ac4c7d0192b9e8b0f28d5ae59c27729ff5a831ca11938ea3e677a262337a64 7cc02aa5346cd7c50d75ca63cd6501097b0a3979eb2ed838adff114fe17d35a3
-lib/codeql/rust/elements/ExternBlock.qll 96c70d0761ec385fe17aa7228e15fd1711949d5abba5877a1c2f4c180d202125 38ad458868a368d437b2dda44307d788a85c887f45ea76c99adbfc9a53f14d81
-lib/codeql/rust/elements/ExternCrate.qll 776cf8ef7e6611ebb682f20bb8cf47b24cc8fe08ba0b0cf892c19c95a1ecec3e 1a74eb2974d93c1a8beb9a4f5e3432bb50b6bcdd6e450d1f966534edbdff9cd0
+lib/codeql/rust/elements/ExternBlock.qll 86dabe90752e12b8bce9046439c9a26cc970d8708aa7ba2550d8309c8bbb9d98 a6cad4f93219b8b99515bb685f8cef8d5f54db2cc260ad3cdd4b296537d6be19
+lib/codeql/rust/elements/ExternCrate.qll ac3ec31ff23e2cc821021c0d9df7f29c292f925337010a1c9d1990a4fd35933b 1ede8d480ee3f4c057b7cb2ff4c47ea0fbea9d053d744b7d97917db947ffb6b9
 lib/codeql/rust/elements/ExternItem.qll 24301f14e9b7dda6eb5263ba46ae806eedd5901c114399e712a86164b8f03002 0cbb368952bda103c75eba504a7f2840da7d9d17bd64e087184055de2fa6f862
-lib/codeql/rust/elements/ExternItemList.qll eceb0fcd3a6f9d87fa044da1da112ce96b75c8e0f0897d51e44c5822a3e430dc 2255f1121d7cec4e29401ad08b728f02a920a82da48f16b6bb86c5056775be31
-lib/codeql/rust/elements/FieldExpr.qll 8102cd659f9059cf6af2a22033cfcd2aae9c35204b86f7d219a05f1f8de54b3b f818169dddf5102095ae1410583615f80031376a08b5307d0c464e79953c3975
+lib/codeql/rust/elements/ExternItemList.qll 9a8f4ec829ee78e839889fc174bce8460fa08c544a50c622ef72758ce961f5dc c0028e8c7ee62b799e2a2ca8ae11ca5020ae5908836b07bb8291a4f96aba992e
+lib/codeql/rust/elements/FieldExpr.qll c31af00d6227e5ebcfe1b5c33e7dc6c9307025432a77444cabf32ebee1b3c913 f657dfe295a099596f420ecbefb42e9e76b093b6b751e75a301da16228c0dc30
 lib/codeql/rust/elements/FieldList.qll 72f3eace2f0c0600b1ad059819ae756f1feccd15562e0449a3f039a680365462 50e4c01df7b801613688b06bb47ccc36e6c8c7fa2e50cc62cb4705c9abf5ee31
 lib/codeql/rust/elements/FnPtrTypeRepr.qll d4586ac5ee2382b5ef9daafa77c7b3c1b7564647aa20d1efb1626299cde87ba9 48d9b63725c9cd89d79f9806fa5d5f22d7815e70bbd78d8da40a2359ac53fef5
 lib/codeql/rust/elements/ForBinder.qll ee29b55cb4c1fa5180cc4ee1236ac089fe9f67ffa9e5a1474003b717f1ac6e0f 5b811c8cf9550cb675034315e03c5cbbfa7544ad3a696988e04d780037d434bf
-lib/codeql/rust/elements/ForExpr.qll a050f60cf6fcc3ce66f5042be1b8096e5207fe2674d7477f9e299091ca99a4bd d7198495139649778894e930163add2d16b5588dd12bd6e094a9aec6863cb16f
+lib/codeql/rust/elements/ForExpr.qll a55765a80f017385828a2de41a1c3ad66d98169742b5726b49158dba0c29c0a4 78d6b2a3b560faa1c759fb94ad1fbbc9da76fab20bb10d5be42e3416735b1d2c
 lib/codeql/rust/elements/ForTypeRepr.qll c85c5e368b9db4a308b55259b3e6b1f4d37050984de43b24971243d6ca6dcec5 51b1c3ddac2fb9616ec44816bcbb549df2c15bbbe674d045a7b1c352c1e335e3
 lib/codeql/rust/elements/Format.qll 1b186730710e7e29ea47594998f0b359ad308927f84841adae0c0cb35fc8aeda d6f7bfdda60a529fb9e9a1975628d5bd11aa28a45e295c7526692ac662fd19f8
 lib/codeql/rust/elements/FormatArgsArg.qll a2c23cd512d44dd60b7d65eba52cc3adf6e2fbbcd0588be375daa16002cd7741 d9c5fe183fb228375223d83f857b7a9ee686f1d3e341bcf323d7c6f39652f88b
-lib/codeql/rust/elements/FormatArgsExpr.qll 8127cbe4082f7acc3d8a05298c2c9bea302519b8a6cd2d158a83c516d18fc487 88cf9b3bedd69a1150968f9a465c904bbb6805da0e0b90cfd1fc0dab1f6d9319
+lib/codeql/rust/elements/FormatArgsExpr.qll 6bbecaca2ddcd498b47d608638f4664bceab935a9cf221f8e369556b0ab09686 d4074f1146c2cfcc9266e3794250a70398f1ba3906949a44460db3d52ebb840a
 lib/codeql/rust/elements/FormatArgument.qll f6fe17ee1481c353dd42edae8b5fa79aeb99dff25b4842ec9a6f267b1837d1e3 5aed19c2daf2383b89ad7fd527375641cff26ddee7afddb89bc0d18d520f4034
 lib/codeql/rust/elements/FormatTemplateVariableAccess.qll ff3218a1dda30c232d0ecd9d1c60bbb9f3973456ef0bee1d1a12ad14b1e082b5 e4316291c939800d8b34d477d92be9404a30d52b7eee37302aef3d3205cf4ae0
 lib/codeql/rust/elements/Function.qll a5d1654003137bcfd5b0bdfaf73778f6316521dd896aaa58b95422f795e2d674 e13ad1cc560525d94917fb5a0c9605e022d3f2e33042933a1c7141556ca75ce8
@@ -67,131 +77,140 @@ lib/codeql/rust/elements/GenericArg.qll 5f8666af395208f8ad2044063788fa2c0c317cc0
 lib/codeql/rust/elements/GenericArgList.qll dcf274db517b0e8f19e4545d77f86cdd4066ff2805e68c808d0bb5750b49f569 1055a82929e850264e501b367ef4d314a3e6bb8943ec95f4284d157fb4d0092f
 lib/codeql/rust/elements/GenericParam.qll 87adf96aac385f2a182008a7b90aad46cf46d70134364123871afb43e5ea2590 be82f1986b263053d7b894a8998ddb59543200a2aa8df5a44c217b8773f60307
 lib/codeql/rust/elements/GenericParamList.qll 25fcaa68bc7798d75974d12607fae0afc7f84d43091b2d0c66a504095ef05667 3b71115c6af0b8e7f84d8c2d5ac9f23595ad2b22dbd19a9ea71906ca99340878
-lib/codeql/rust/elements/IdentPat.qll ad5f202316d4eeee3ca81ea445728f4ad7eb6bb7d81232bc958c22a93d064bf2 7ce2772e391e593d8fd23b2b44e26d0d7e780327ec973fcc9dce52a75fda0e36
-lib/codeql/rust/elements/IfExpr.qll f62153e8098b3eb08b569d4e25c750bc686665651579db4bc9e11dcef8e75d63 55006a55d612f189e73caa02f7b4deda388c692f0a801cdda9f833f2afdca778
-lib/codeql/rust/elements/Impl.qll 0d69c9ace5dac87ed095cfd5d4a8baf7e17ebce1132f3a7d6fa2bf4325deff8d d908fc5da7d3a59fb0a286a6ce581bdabdb48c4ac6ecd070455c271c2352208c
+lib/codeql/rust/elements/IdentPat.qll d1bae7ccb33fc37116f52bf47ad61fa8f16236581f02cb79707ed3b107635ab1 74be8545bedf1901d360c707758653a6d6b98a0018133b9ed68d182cfcebdc11
+lib/codeql/rust/elements/IfExpr.qll 54cfc62c9010177035e264f517f88adab7e32b96188820520402a6f1d81dae23 93cc4da58b72ddd14231dd4d05e185e471862e6674becdabcb7aac00389a2dfc
+lib/codeql/rust/elements/Impl.qll 1970ee6261e312e7ce79529f0542985704295d7ace6b2cf6b172ccb2d128ff1e 469c174d59233eed8cceca86dbed4471fc836fdd8d6ccaa5d96196d28cb65f30
+lib/codeql/rust/elements/ImplRestriction.qll 2282977f216bf14779fc160c3faa6d261aa2892450701c7b4312e5085240eaeb f242f91243475380de834d8780355ab0bf582a9aa1e9f882ddbedb87559345cf
 lib/codeql/rust/elements/ImplTraitTypeRepr.qll 1d559b16c659f447a1bde94cc656718f20f133f767060437b755ac81eea9f852 de69c596701f0af4db28c5802d092a39c88a90bf42ea85aea25eecb79417e454
-lib/codeql/rust/elements/IndexExpr.qll 0e2e9f018d06ae72be0fc4ddbc019a9aacd8a06f42b4c4431760bd149e7f2290 2bcfd557abd53a48e48de7915c4f2089107c62dfb3e732a904848248dfd3727b
+lib/codeql/rust/elements/IncludeBytesExpr.qll c2bf15235d5a380a0e5dce98cc81b3189f093a5a8f9a218751a475e8275ad4cb acc4ccfb8afc033f0bf48914f5f9066f74400d6b3545575f6a7c73d7f74feeaf
+lib/codeql/rust/elements/IndexExpr.qll 16b5ba3786a1ca401bd5e2bf6e6e54ca77a147b7c7a40b514424b4189aa8b049 8a9dc17e11a37de93dc79b0265da20ebe2313d88311abff1bb7d1250373629f4
 lib/codeql/rust/elements/InferTypeRepr.qll 1b8bdcb574a7b6e7dd49f4cfb96655a6ccc355744b424b8c2593fe8218090d53 c20a2a5b0346dc277721deb450e732a47812c8e872ffb60aaba351b1708e9477
 lib/codeql/rust/elements/Item.qll 59d2ac7b5b111579951bf42f68834ecf6dab47a5fb342ed0841c905b977923ab 0d220ec12a373098b26e6cb3a7b327b2d0c1882c3d9b6de00f4df1e8d00bae68
-lib/codeql/rust/elements/ItemList.qll b302d25a7570504e88bfcedf7afc99d25740f320ab27a4a9def1ae66569a4c15 4012a5e43639fa39d5313356ff3ab56c4bb567add1ce012bfede4835406a9571
+lib/codeql/rust/elements/ItemList.qll 938d86bd2169fee81bae9972b8c55a52fac4240fcab28c15f88ec69312d40327 128f86abe89aadac114d1cca82d7b70065102d17a1cf0b8ff3452963f1ced557
+lib/codeql/rust/elements/KeyValueMeta.qll b66aeedd5a548ae94ed680c399a32176cb5999f972cc3a434a05b802e5a25264 02944562b4f66e99b8503e1d87a9f1cc4ba80bae49a4108c6f884cc54398a379
 lib/codeql/rust/elements/Label.qll a31d41db351af7f99a55b26cdbbc7f13b4e96b660a74e2f1cc90c17ee8df8d73 689f87cb056c8a2aefe1a0bfc2486a32feb44eb3175803c61961a6aeee53d66e
 lib/codeql/rust/elements/LabelableExpr.qll 598be487cd051b004ab95cbbc3029100069dc9955851c492029d80f230e56f0d 92c49b3cfdaba07982f950e18a8d62dae4e96f5d9ae0d7d2f4292628361f0ddc
 lib/codeql/rust/elements/LetElse.qll abb12749e1e05047e62f04fcaaf0947acc4dc431be80cb5939308f3531f29700 2799133c6bc84d5bb242a6bce7d26be885b31a3e2d2a7757c46c300b9ef07a20
-lib/codeql/rust/elements/LetExpr.qll 435f233890799a9f52972a023e381bc6fe2e0b3df1e696dc98b21682a3c1d88e b34da72dd222a381e098f160551ec614ebb98eb46af35c6e1d337e173d8ec4b9
-lib/codeql/rust/elements/LetStmt.qll b89881b3e57317941f74adb39f16eb665380128a6bdfaacf4dce2499cdaea2e2 2890d12a475f045a8a1213e5c7751a05e63a72978a20fd3f4862e281048b2f0e
+lib/codeql/rust/elements/LetExpr.qll 4a060be3f0aef2d4dc5da1cb9a20217cef8ed6860c86ffff71d961b3b4a6439d ad83c10ae61d70edf0d86f9a8c41ab44289e138dbc8deb4ac5d5f2fc171c8d8c
+lib/codeql/rust/elements/LetStmt.qll aeb9ca626257543925abc5592817eac94d8db3bc4e700eb1ef455e1b27ad9168 d01497e8b99c45c5f25b02818afae8902edb6c402a57f01430d5794d074e6838
 lib/codeql/rust/elements/Lifetime.qll ae154c4c604a084faab000fe48a75a3da597278da85eb414e54dd00c9135b0a5 199fe5d858597ea7ae09275611b510002796d7c4a3b75e62807f11beaecae4cf
 lib/codeql/rust/elements/LifetimeArg.qll 400f53abc28b351b7889909ee501a7bb52881cf71e974e17f56b7748c1460dc9 17a352bb72af2b6119735d24d6a8650ad60de71d19a53acfea0e58d9e5d927aa
-lib/codeql/rust/elements/LifetimeParam.qll d1c2986b9011a39aa995eb24f3404c0ca95f4bdf9d77572ddf3feeb47f212070 d8709455db51ff5831edc52e7465477660b859312d228d2f1d3e99d427526540
-lib/codeql/rust/elements/LiteralExpr.qll 40b67404b7c2b81e5afabc53a2a93e0a503f687bb31a2b4bfa4e07b2d764eb8d 67ab1be2286e769fba7a50ca16748e3c141760ccaefaebae99faa71f523a43d5
+lib/codeql/rust/elements/LifetimeParam.qll 6dea0f704d9f80eed52cc1e65ca322b80479a558480f56d4d76c677984be4dd0 c8edd4add8dd45fa6dc128d9ab36f1776e82163b9d2929ce1150cc753f3b2d41
+lib/codeql/rust/elements/LiteralExpr.qll 1469d89005bd868474679cdd9ace2d252eb80fc3c936bd7ec3e5bba73aeb98ca 82215354397ea15f35ec60d8b8f0e5cf8d76826c026a4d56518b0bb27d320154
 lib/codeql/rust/elements/LiteralPat.qll daffb5f380a47543669c8cc92628b0e0de478c3ac82685802c63e8d75a206bed adfe9796598cf6ca4a9170c89ffd871e117f1cea6dd7dd80ecbbb947327a1a5d
 lib/codeql/rust/elements/Locatable.qll 2855efa4a469b54e0ca85daa89309a8b991cded6f3f10db361010831ba1e11d3 00c3406d14603f90abea11bf074eaf2c0b623a30e29cf6afc3a247cb58b92f0f
-lib/codeql/rust/elements/LoopExpr.qll ee171177650fa23eef102a9580765f4b6073a1cc41bab1ec31ad4f84ffe6c2c9 bfcf0cca4dc944270d9748a202829a38c64dfae167c0d3a4202788ceb9daf5f6
+lib/codeql/rust/elements/LoopExpr.qll c646d912c459cc3e80e3836b2282ffa0371a374dca0929cdd591c230ac27a778 55418a36f6e01a59d47c1a740a662b8ded950288eb4026bb926c3b3da68c6b21
 lib/codeql/rust/elements/LoopingExpr.qll 7ad7d4bbfd05adc0bb9b4ca90ff3377b8298121ca5360ffb45d5a7a1e20fe37a 964168b2045ee9bad827bba53f10a64d649b3513f2d1e3c17a1b1f11d0fc7f3a
-lib/codeql/rust/elements/MacroCall.qll 452aee152b655cdd5a69bf973977072f000a6451f626469a3f7313f0468ffc18 a8652d0de1c6c2118d683d5465ba4115dd4c65031896440269a2a0522d90fceb
-lib/codeql/rust/elements/MacroDef.qll 5bcf2bba7ba40879fe47370bfeb65b23c67c463be20535327467338a1e2e04bb c3d28416fc08e5d79149fccd388fea2bc3097bce074468a323383056404926db
-lib/codeql/rust/elements/MacroExpr.qll 640554f4964def19936a16ce88a03fb12f74ec2bcfe38b88d32742b79f85d909 a284fb66e012664a33a4e9c8fd3e38d3ffd588fccd6b16b02270da55fc025f7a
+lib/codeql/rust/elements/MacroCall.qll ce9b38c0a2c693febe769ecfcfea1b89efef044e4d37f3e9878cc8ed105538da 4ebd0e15a79a4917bf7b5b9551dd0c7a026e0a84a4873d33895869d3b4fd1317
+lib/codeql/rust/elements/MacroDef.qll f8628d41adac93bfee660905101a9382f16537a16891f7c1e0e8c553ae4f51c6 0ee343f5cdaf94b355b4061c6e56ede21e131aa6c647338c1102fe4e6e70d63c
+lib/codeql/rust/elements/MacroExpr.qll e7ceece69e06d97fe98b2135843dc46c784eb7f7d4997bf8424444784148ec36 8a8dae1b3dbd9f1d84f9274bb85d71dba8739a2e75fb869cd2106b157523ad29
 lib/codeql/rust/elements/MacroItems.qll f2d80ff23634ac6bc3e96e8d73154587f9d24edb56654b5c0ae426124d2709ea f794f751b77fc50d7cc3069c93c22dd3a479182edce15c1b22c8da31d2e30a12
 lib/codeql/rust/elements/MacroPat.qll 8d9384d7e000add77ad9955c142800f71a993262b7923b3a4466eaf3a17ebed7 1561e5597c8dd6b6359dc7f0a01e3afe6568bf0aa4e9cc865469d5308c270b0e
-lib/codeql/rust/elements/MacroRules.qll 0fdf609ff28bacf8780fa75a4cee5f0b7864b8bd3b4abcf91303baabc83c0a83 2a4cef936232406b36ab897e40ea25352b07016001f6750380e007f91ce6a799
+lib/codeql/rust/elements/MacroRules.qll 6886c8cbc08960c93321bc99f9481a5f5a9748ed4d8a285b67cc59b0b06313ec 800e3a899897d60131b17b98c51553d667983ed8ec6629ba2c8110f9838975af
 lib/codeql/rust/elements/MacroTypeRepr.qll 664934eb58bf32ddc843f5133056e3605c7ca9d401729d5358e288ccde4dcdad 7601309ad9cf7159955af8f6eec7968bbecf5bfcc05201bc8573cf1e7ea14b08
-lib/codeql/rust/elements/MatchArm.qll c39fd6cc0da24b1ff8d1e42835bcfee7695ad13580e3c7c50acd7c881b1cd894 62a31d2bd125e6aaebefc406e541a641271d3c497a377959f94dd4735b2bfbf8
-lib/codeql/rust/elements/MatchArmList.qll f221c5e344814fa44db06ab897afdc249e8e88118953116c9c9b745aa2189614 8ff30685e631c5daa6c42390dfb11fd76a4ff2e374013e3dabc67b4c135c0bc4
-lib/codeql/rust/elements/MatchExpr.qll e9ef1664f020823b6f4bb72d906a9dc0c1ee6432d4a9a13f7dbdbab2b2b1ee4d 38d71e5c487abcb5682293c573343be66e499a6e131bb630604c120d34b7777b
+lib/codeql/rust/elements/MatchArm.qll be04e85dffea501f32561ed20b0343c91a849c7bcbe40a1b83e0198c289dc517 e59cc08d9fdf3c600a76b42f3eb18cc61b0b908f8bb0f8db28d784128fc47c23
+lib/codeql/rust/elements/MatchArmList.qll 6107bc87703bee8812be1f988f480719f46ee3a2a0d72682d59f359de08fb4a2 b9d81da9b87a453abd71bd4401d09b10c5aa97cd03b251c40210b5b6702a9953
+lib/codeql/rust/elements/MatchExpr.qll 58e5182b374ec2f174b1b221bf451dffe815a1155b9fc6b6a50f311b21a660d6 5d2a90170f8ff1f22129293724a0a206bb53e11bc367c9152e904f0caace0913
 lib/codeql/rust/elements/MatchGuard.qll 58256689a90f24b16401543452c2a32f00d619ddac6c0fe8b65a8cd3e46401bb 8efb2ac03c69a9db687e382331085d7a6cfbf8eca559174ba2727a9549ec7ddd
-lib/codeql/rust/elements/Meta.qll b17d7bf605bd0cf4f6d6c6cf4f39a16cfc431d256d45b93663a7569181d36168 815cdfef06231de4b4b1c85e321b8ccb3e22379e5a4e111df9cc9ca6be593841
-lib/codeql/rust/elements/MethodCallExpr.qll 914633f304c587addced988a7f161a1a4b3297ce370f6a959b7a042b1c04dace 289a0854d6323df915ee5f268523ee597ba20a37c646bbb2a79c9ed1f7aa2260
+lib/codeql/rust/elements/Meta.qll e54802dadd2f1b914a821f9e9335f6088d4782751e36c014e1fcf18eb4134b14 552a5ebbd998cba27fa7ea9b91b387c36ab10964deab546afdba52463ed8661a
+lib/codeql/rust/elements/MethodCallExpr.qll 396bdac0486a3868f77f268e0dbf64b0d0e1a919a613b84c3faa8047727b2377 edbff51f3faa232ee31b94b8c899ad748cb41d9b97d26e58d0d4345cf4839c9f
 lib/codeql/rust/elements/Missing.qll 70e6ac9790314752849c9888443c98223ccfc93a193998b7ce350b2c6ebe8ea4 e2f0623511acaa76b091f748d417714137a8b94f1f2bdbbd177f1c682c786dad
-lib/codeql/rust/elements/Module.qll 0bc85019177709256f8078d9de2a36f62f848d476225bff7bba1e35f249875c7 3fbb70e0c417a644dd0cada2c364c6e6876cfa16f37960e219c87e49c966c94e
+lib/codeql/rust/elements/Module.qll 232aaed52c31fd36980aeefa112f74caf01ec90b17e0374cca036f3dbb1adb57 99a90d97abac18e4e1975f20151865508f163a1e86a985ec1133cec917259296
+lib/codeql/rust/elements/MutRestriction.qll b018f04a3960b91bbc8fcc2fbb7a25c359eba05504175ca0c61775f23d001751 85c9d2f6d4fd205861aea9de3fcd6c7e710b514d57873156cde347e41fdb6afb
 lib/codeql/rust/elements/Name.qll af41479d4260fe931d46154dda15484e4733c952b98f0e370106e6e9e8ce398b e188a0d0309dd1b684c0cb88df435b38e306eb94d6b66a2b748e75252f15e095
 lib/codeql/rust/elements/NameRef.qll 587308f2276853303fd5e8804fad255e200fdbb115c4abf7635435856884e254 6cb64e921d2dde8fc87cb26b6539254b883a7313689798180791a2905eb3f418
 lib/codeql/rust/elements/NeverTypeRepr.qll e523e284b9becb3d55e2f322f4497428bfa307c904745878545695a73d7e3a52 4af09ebae3348ba581b59f1b5fa4c45defc8fa785622719fa98ebefee2396367
-lib/codeql/rust/elements/OffsetOfExpr.qll 370734a01c72364c9d6a904597190dac99dc1262631229732c8687fd1b3e2aa0 e222d2688aa18ed6eec04f2f6ac1537f5c7467d2cef878122e8fc158d4f6f99e
+lib/codeql/rust/elements/NotNull.qll f1aaa23ac86ff3418b61ebf2c69ee30c0351c725be241f38de8b9e0a42b2c1dc 40f29691234c3722183744c5336e0645b9005388284a605458e19aeeed99877b
+lib/codeql/rust/elements/OffsetOfExpr.qll 93ef5857aecf19e554cef625a17e3010fa52442236731f7372a47801c93b82c0 ea6d2fbfdf9cbe9f6c55df8a5431efb996c4ba4dc5b4a218d80b85a914e239ef
 lib/codeql/rust/elements/OrPat.qll 408b71f51edbfc79bf93b86fb058d01fa79caf2ebfeef37b50ae1da886c71b68 4a3f2b00db33fe26ee0859e35261016312cb491e23c46746cdd6d8bb1f6c88ef
 lib/codeql/rust/elements/Param.qll d0c0a427c003bbbacaeb0c2f4566f35b997ad0bca4d49f97b50c3a4bd1ddbd71 e654a17dfcb7aaeb589e7944c38f591c4cf922ebceb834071bcb9f9165ee48be
-lib/codeql/rust/elements/ParamBase.qll 6fe595b1bebd4a760e17fb364e5aa77505cc57b9bda89c21abdad1ce9e496419 f03316c25d38ecc56c16d7d36358144072159f6ab176315293c7bf3b45b35fff
+lib/codeql/rust/elements/ParamBase.qll 7a728bda96be0b146e91e2abd54f9b4d4d48633c3406579ee6f74db64c77c6c5 ce7a62bf9ffcc0c887b9cbdb5eb991aaa2da22bf908729c795c684852dbb0a64
 lib/codeql/rust/elements/ParamList.qll 08cba1bf455e333e5a96a321cd48e7e7276406912ec0589bf20d09cf54ede390 fb3777b5a19e18ef0f5c90b246b61ac94568db2dd8e3c44fbe6b4b8cc15cc0cf
-lib/codeql/rust/elements/ParenExpr.qll 3cd9ecbb466188a2644411582686ec67f4aab42472adfdb155918a9c7ea5aca9 8a9264065e0b52afab1121f212a8c75458635f07b2a7eb28202d5668b67cd865
-lib/codeql/rust/elements/ParenPat.qll 9359011e3fdf6a40396625c361f644e8c91f4d52570097e813817ed53196808e 34ed1a87043b25da439d6c9973f8b5461f4f6c11d233f8753ff76157628c66b8
 lib/codeql/rust/elements/ParenTypeRepr.qll 2388b6c663b2d02c834592c5da5cafac71baa55d4a0eaaca341e13f52dd0e14d 029454c18859a639c4b87825932e5dfe8026cec6ab87adaa4a0d464149e51b07
 lib/codeql/rust/elements/ParenthesizedArgList.qll aa3be48d2f8b5cec56db3866fb7d4e0cd97787e9123e2d947912eb8155bf372b 32790971728c9ae2f3d59155d46283aaf4f08238e47bb028a1f20a6d3a734b98
 lib/codeql/rust/elements/Pat.qll 56211c5cb4709e7c12a2bfd2da5e413a451672d99e23a8386c08ad0b999fd45c b1b1893a13a75c4f0390f7e2a14ee98a46f067cfdc991a8d43adc82497d20aff
 lib/codeql/rust/elements/Path.qll 16264a9c978a3027f623530e386a9ad16541305b252fed5e1bedcfbe1d6475d5 8c21063c7f344ce686342e7c12542fec05004e364681f7a31b65f5ee9263a46d
 lib/codeql/rust/elements/PathAstNode.qll 68160b08272ecde0e636779b7c547f808356d69d1150863b37188ea84e110cab cafa2de0bf3be978854319bbcf5ad1591acd64abd7b0958ff14c96a7529fcc99
-lib/codeql/rust/elements/PathExpr.qll 0232228845a2005fc63d6b8aea8b49ff50415e0e90fd18f863ee1d6e44f53c07 47b15cc6ae576d13f14b29ffa4620451accc603ff87071dfe48660dbe018bf36
+lib/codeql/rust/elements/PathExpr.qll 1a400e0ded29addd40483987d21e10daf75486b0d810a5b1c18f1ec2334edde4 93337e451c6ee6cae10d6f3813376f54ff88b143e7b1bd9df88d4d72cdf6e90e
 lib/codeql/rust/elements/PathExprBase.qll bb41092ec690ae926e3233c215dcaf1fd8e161b8a6955151949f492e02dba13a b2257072f8062d31c29c63ee1311b07e0d2eb37075f582cfc76bb542ef773198
+lib/codeql/rust/elements/PathMeta.qll 56021df592b69c9c735db2ebe2b14ee5b5e0a76546d7a6bafaed9d9ba4ff2ba8 23c34dbd742698f9197ce5b48970b77520131ad31c12e2d88cdfd98de0708b3c
 lib/codeql/rust/elements/PathPat.qll a7069d1dd77ba66814d6c84e135ed2975d7fcf379624079e6a76dc44b5de832e 2294d524b65ab0d038094b2a00f73feb8ab70c8f49fb4d91e9d390073205631d
 lib/codeql/rust/elements/PathSegment.qll c54e9d03fc76f3b21c0cfe719617d03d2a172a47c8f884a259566dd6c63d23f2 4995473961f723239b8ac52804aeb373ef2ac26df0f3719c4ca67858039f2132
 lib/codeql/rust/elements/PathTypeRepr.qll 1b68e119ac82fdf5f421ded88a1739bfb8009c61e2745be11b34c3a025de18aa 48d9b49ee871f3932a0806709b4a21dadfdbe5cef8bab8d71aab69b6e4e7b432
-lib/codeql/rust/elements/PrefixExpr.qll 107e7bd111b637fd6d76026062d54c2780760b965f172ef119c50dd0714a377d 46954a9404e561c51682395729daac3bda5442113f29839d043e9605d63f7f6d
+lib/codeql/rust/elements/PatternTypeRepr.qll 719a26a7b7e40bf6d336a68e93a5a84efb9a87341d96472ba9599555aa7a92a0 3f1d6f860466463dcfe09fb233c9ba4319b3ccb0d45097bd0280c9ceb4f2dbfe
+lib/codeql/rust/elements/PrefixExpr.qll af33c38bd272ffd0a748140dd5de1ef07d8b159447a70fb702bba32e6a3f675f 03dd14ddc043faca622b5aeeed4ded50e2f433d2eb8ff671cb98158f6c29943b
 lib/codeql/rust/elements/PtrTypeRepr.qll 91a3816030ee8e8aae19759589b1b212a09e931b2858a0fef5a3a23f1fb5e342 db7371e63d9cb8b394c5438f4e8c80c1149ca45335ce3a46e6d564ed0cf3938a
-lib/codeql/rust/elements/RangeExpr.qll 43785bea08a6a537010db1138e68ae92eed7e481744188dfb3bad119425ff740 5e81cfbdf4617372a73d662a248a0b380c1f40988a5daefb7f00057cae10d3d4
+lib/codeql/rust/elements/RangeExpr.qll bf987805ace1c7291b38fcf96f462077c7423ee455dcc292f81c8c1d7e6b6a2c b1a2f31cb323b147f92ffae9bc899bd9dd77f7abb0cbda26820bb00fc344a5d0
 lib/codeql/rust/elements/RangePat.qll b5c0cfc84b8a767d58593fa7102dcf4be3ff8b02ba2f5360c384fa8af4aac830 cc28399dd99630bfa50c54e641a3833abe6643137d010a0a25749d1d70e8c911
-lib/codeql/rust/elements/RefExpr.qll 91a0d3a86002289dc01ffbe8daca13e34e92e522fbb508241a9d51faf1d4a9d2 b6e63d8e6f8956d2501706d129a6f5f24b410ea6539839757c76ba950c410582
+lib/codeql/rust/elements/RefExpr.qll 786481c856125c416160b07566d99233f8dbadd1345487052affea04478fbf78 46f6821c32bf43042e2b1706717f9be0c3b9bd5b4450c1ec89351a4ca3334d63
 lib/codeql/rust/elements/RefPat.qll fe076bdccb454111b38f360837d180274ba8a003b4cffe910b5197cd74188089 2604c8bb2b0b47091d5fc4aa276de46fe3561e346bd98f291c3783cef402ba06
 lib/codeql/rust/elements/RefTypeRepr.qll 563d2edc097aa1896b3dea5a3918e6225f23dda91b3fb46e2f4c32feb813d56c af3bd746239130e3e94dd41ab682473b29b8b900b05c557beb8a2eba6508ebd9
 lib/codeql/rust/elements/Rename.qll 5cb0ebad580d9842cfe65033059d4d373a1386f047f3a78f402a93e060e2c13e 642c6f37d94442575df12b2e998572a725d094ac5ae76147a56057e75138d72b
-lib/codeql/rust/elements/RestPat.qll 5fedfac18080b068f597c9bbb84de672834f72cc22295d6312e111f151f8e3c7 c0e1f77bfcdd40e8ab06ad8c138e6098d79940247758adf9de03a05b00c23de3
+lib/codeql/rust/elements/RestPat.qll 6aa7edb4a7afa144856840b34720543c06f429b0c6ae3bd3befd892d38f1d406 e6fbc81e5f3a5c294f5f555943d0027be5a29a0a1553ec8a746e801d942ccc49
 lib/codeql/rust/elements/RetTypeRepr.qll d68b7c6c2eda13821fcfe085ac3d63010d89a206be09d23deaf531cac405ba96 6db787a96d95265ca20a17ce00603a678b39ac8c7c1d0e1ad6ed119dcf9858fa
-lib/codeql/rust/elements/ReturnExpr.qll b87187cff55bc33c8c18558c9b88617179183d1341b322c1cab35ba07167bbdb 892f3a9df2187e745c869e67f33c228ee42754bc9e4f8f4c1718472eb8f8c80f
+lib/codeql/rust/elements/ReturnExpr.qll 72a624b04e2bc7088ec0ff37a80c083ae80e12fd30fbfecf975945a726ce5147 206902414a218eea96367f78ed84e1dc5b67789ca9a05cd3584165ac66ab5cea
 lib/codeql/rust/elements/ReturnTypeSyntax.qll f30b779f79bc2f0329d5585a462511e1aaa9da63182cb45231873a9bd9644d19 5ba004dae2bca323ced27bb4b2f54f725ae974421ab11b176eac4888c642b3fa
 lib/codeql/rust/elements/SelfParam.qll e36b54cdc57529935910b321c336783e9e2662c762f3cd6af492d819373ff188 7a4735dbf532fc0c33ebdb0b5c1dfc4e5267e79ceff4ca8977065eb0ce54aaf5
 lib/codeql/rust/elements/SlicePat.qll f48f13bb13378cc68f935d5b09175c316f3e81f50ef6a3ac5fdbfbfb473d6fc1 4c8df0b092274f37028e287a949f1a287f7505b7c2c36ee8d5f47fb8365d278a
 lib/codeql/rust/elements/SliceTypeRepr.qll 730e4d0eeefb9b2284e15b41cd0afc3cbe2556120484df424c8e5242afd852f9 100772263b08f498ce8db203ba572be4e92edd361df7c0e9bd7b20c7ac2820fb
-lib/codeql/rust/elements/SourceFile.qll 0b6a3e58767c07602b19975009a2ad53ecf1fd721302af543badb643c1fbb6c4 511d5564aab70b1fcd625e07f3d7e3ceb0c4811a5740de64a55a9a728ba8d32c
-lib/codeql/rust/elements/Static.qll 9dca6d4fb80fb4ead49a3de89bec2b02bae6f96fbc2601dde35a2aa69a9bfdb0 70f67bc75d7799dab04ea7a7fd13286bb76bbe514be16d23149c59dfb31fd0c9
+lib/codeql/rust/elements/SourceFile.qll ce8fe0ca541d3dd81b6c4b9dcc828044588e2f9de4c3d124173e7db92695acae 1bd386f29ce86b1756ab46070b9883de901d756cf5e3a90e7bf7714f83931a84
+lib/codeql/rust/elements/Static.qll 5000eac308407c62bd416dde284dcba421070b8498ff41c092ddc5a7064f3d19 b8f8fe3d802cd9ca9e20522db183a22e2c5a9eef9dcab431858bf8f7f7a663ef
 lib/codeql/rust/elements/Stmt.qll 532b12973037301246daf7d8c0177f734202f43d9261c7a4ca6f5080eea8ca64 b838643c4f2b4623d2c816cddad0e68ca3e11f2879ab7beaece46f489ec4b1f3
-lib/codeql/rust/elements/StmtList.qll 8bad277dfd88735195b8fd43bb1395cb2393c488d89304d6a6e6d8ec3eb24b73 cd1d483aecb8bb1876b8153a872f680febc2ef6c315d661c85ec1b2fa07e4fc0
+lib/codeql/rust/elements/StmtList.qll c4f35907b0fcdb08e7b0ba020ec74542883c1ad0b91447eacb59f7da9053e870 4051c26397c48f8e76dd0eedd46468eb014b81fec917ca905749101e3a068b9a
 lib/codeql/rust/elements/Struct.qll e60a859c0112b7a7ce4a4752e936e0d58f413ceb895db25d77ece2fcc9d8881c 8bf69f80bb9ef54644d9540b8be7d331f73ba362817508489ff91619718bee6b
-lib/codeql/rust/elements/StructExpr.qll 84f384ef74c723796e514186037a91dd9666556f62c717f133ce22e9dda4425f 176497835252cfdfe110e58ebde9fbde553d03e44e07d3e4d8041e835dbf31b9
-lib/codeql/rust/elements/StructExprField.qll 3eb9f17ecd1ad38679689eb4ecc169d3a0b5b7a3fc597ae5a957a7aea2f74e4f 8fcd26f266f203004899a60447ba16e7eae4e3a654fbec7f54e26857730ede93
-lib/codeql/rust/elements/StructExprFieldList.qll 6efb2ec4889b38556dc679bb89bbd4bd76ed6a60014c41f8e232288fc23b2d52 dc867a0a4710621e04b36bbec7d317d6f360e0d6ac68b79168c8b714babde31d
-lib/codeql/rust/elements/StructField.qll c43a552ce22c768c7f4c878501f08ecd4eae3554c5cd885dcd2e8625fe705233 bfd7934835ca41eb70e4064198d9b40ec9812842fb4349e412d1aaf98c3cd625
+lib/codeql/rust/elements/StructExpr.qll 98051ac5463576dc2ca5af20ab4c7bd38795ebd1b29b7facb4453a516103d282 ec1e010101dc4f9787234587e9e6f3b0cfdcf72488337cdd3d4676b84a8fe97a
+lib/codeql/rust/elements/StructExprField.qll 762e7d22ea56ab685267fd3a71c3a06c2e130bdc3243ae348390f478a29156e2 251df91dac242f37b628b0a13aaffb7da7b7345a418e4031b611cbb543ee04b3
+lib/codeql/rust/elements/StructExprFieldList.qll d882eff7a43a2efaac04cb9be8c149a7735aaf833d43fc95b9913159fa76227f 3bff7111c861fa66413d294078d085f3b2cc326c78104f3102bba6834b01084b
+lib/codeql/rust/elements/StructField.qll 85254d9db0b012cd356fa6d94666b501d73fdba23725a80856d64afaaea718c2 f4c9e9195a3e99afebe38c7f84621963cde643135c4ac17936e381f83f61d378
 lib/codeql/rust/elements/StructFieldList.qll ee3cf510d35fad0edfeec68315fbe986a6d5323fbaddcfb688682be9a6508352 8cafe522251f98eb10eb45073e434a814165c25e436850f81b1d73ef88d6ae83
 lib/codeql/rust/elements/StructPat.qll cdd1e8417d1c8cb3d14356390d71eb2916a295d95f240f48d4c2fb21bf4398cb 69c3456a13ef3e978a9a145b9e232198a30360f771feb41a917e507410611f6c
-lib/codeql/rust/elements/StructPatField.qll 856aa7d7c6d9b3c17514cbd12a36164e6e9d5923245770d0af3afb759a15204a 1bd1a294d84ad5e4da24e03b4882b215c50473875014859dbf26555d1f4ec2d5
+lib/codeql/rust/elements/StructPatField.qll b6f1a036a1581b743e855c14a67b5e42af6d5dc55225f05e3e919d45b32820fe 16ae3332f1951ea80d88e048e2c49db607c9ef605f3bd767c6331be7cca9a2fb
 lib/codeql/rust/elements/StructPatFieldList.qll 44619afedcda047e51ee3e319f738d5c49ff5e3f8811155a3ef9874d12bc091d 6b4412a5b0f3ebc0a9f228129c1727b1d6a1947fc826e62fa8e34b2c7d3864ed
 lib/codeql/rust/elements/Token.qll e2de97c32e12c7ac9369f8dccabc22d89bfcbf7f6acd99f1aa7faa38eb4ac2b2 888d7e1743e802790e78bae694fedb4aba361b600fb9d9ecf022436f2138e13c
 lib/codeql/rust/elements/TokenTree.qll 23e57fd945ce509df5122aa46f7971360788945cb7a67ddc229de5f44b80e6e9 18a7834edf5d6808e9126c0ce2e9554211faaf21bf7e9e2fa09aa167654e43a9
-lib/codeql/rust/elements/Trait.qll f78a917c2f2e5a0dfcd7c36e95ad67b1fa218484ee509610db8ca38453bebd4c 2a12f03870ebf86e104bdc3b61aae8512bfafbbf79a0cff5c3c27a04635926af
-lib/codeql/rust/elements/TraitAlias.qll 1d82d043f24dbac04baa7aa3882c6884b8ffbc5d9b97669ce8efb7e2c8d3d2c8 505ba5426e87b3c49721f440fbc9ad6b0e7d89d1b1a51ca3fa3a6cc2d36f8b82
-lib/codeql/rust/elements/TryExpr.qll cb452f53292a1396139f64a35f05bb11501f6b363f8affc9f2d5f1945ad4a647 d60ad731bfe256d0f0b688bdc31708759a3d990c11dee4f1d85ccc0d9e07bec9
-lib/codeql/rust/elements/TupleExpr.qll 1b1be270198f9d3db1c28c4caaa4a7fe9b5ae14651f1a10e2891a7d78d6ad18b 4f585aa684dfbff753e342903ddd60ee4d7c374b8bddeb645784d10903c90ae0
-lib/codeql/rust/elements/TupleField.qll 8d6288fd79959d5ef3732397c0a05a47fcb09091383058d1dba7268a950f8c32 1518cdd0fd9746d09fcdbecabc2a3ce6b36b6d983883850beed3f55c2bdf2c16
+lib/codeql/rust/elements/TokenTreeMeta.qll f784784313490314520f6aa9f4dac0f4fbf990427ed39c36185a9526e8d1726d 9c8a74c34ba908d3e886f3e7b041dbaf46a981e26ecc1b66a22d11c1b5155e3f
+lib/codeql/rust/elements/Trait.qll a6f2312932f41455ea17b11e7762eb42ca53d7ef33cde62bd5aa5d6a974bd1df 1826f35d302ed99ff82a43f0d65c12ce39702e1533ae7b22852dc4e165ffd5e0
+lib/codeql/rust/elements/TryBlockModifier.qll 1567952cea9392e7af28cbe6b7c4aaf00f231e5caeb1292a6fc515918b2891bf 622cbadf10f955f5558475d8015f16667773dabf7db7bdabcc9dbff5425a9fb8
+lib/codeql/rust/elements/TryExpr.qll 970ca19d4f9c334bf8118c3dbbdf7cbb84fd18bcefd790ff24fb7eb70ef87568 b5a78ee55860a845bd66ec8729e6ed49ccd469b586355144762681d75cde5973
+lib/codeql/rust/elements/TupleExpr.qll d8de51fac971dbb6105a954a83170ad3ffabbf494244c3a650d767b66dbb80be 19a868298aa82363f3b2779e1af3ad09c582b7b1ba5260281eaa982a4a03a889
+lib/codeql/rust/elements/TupleField.qll 514fe4b90c4a5fe4ce3b59be9559d0dc19ce309244f15b1fd4aa41477508a4c2 f790814b3fc21fc71a5831947870fda11768e800aa9f2c790e841a6dfc3e5ac9
 lib/codeql/rust/elements/TupleFieldList.qll 2fa47599f78aa4639a40239cf49bc2f97d84118125b949c71fec4390589caaf0 3f71a86e38bdc6fe9f0c082a43d763c4f34b4bdab99c383cdc5d8b59e887cee0
 lib/codeql/rust/elements/TuplePat.qll 028cdea43868b0fdd2fc4c31ff25b6bbb40813e8aaccf72186051a280db7632e 38c56187971671e6a9dd0c6ccccb2ee4470aa82852110c6b89884496eb4abc64
 lib/codeql/rust/elements/TupleStructPat.qll da398a23eb616bf7dd586b2a87f4ab00f28623418f081cd7b1cc3de497ef1819 6573bf3f8501c30af3aeb23d96db9f5bea7ab73e2b7ef3473095c03e96c20a5c
 lib/codeql/rust/elements/TupleTypeRepr.qll 1ac5abf6281ea31680a4098407fbe55459d08f92a50dec20d1f8b93d498eee41 6d9625cce4e4abf6b6e6c22e47880fbd23740d07b621137bd7fa0a2ee13badd9
-lib/codeql/rust/elements/TypeAlias.qll b59f24488f0d7de8d4046a9e0ca1e1f54d1d5c11e035898b11ab97e151fc600f 7b25c9e14c8bb310cec796824904fcefced2cc486d55e981b80b7620e73dd2d7
+lib/codeql/rust/elements/TypeAlias.qll f6d7246ea897e894df2b41dd31cf7df2fd66467059c810b88586f45952ea107b bdbd98a4d2f3dbe77aac110dbce24607f0d92619aaf2b17d0b5eeb8cd3b68d66
 lib/codeql/rust/elements/TypeArg.qll e91dbb399d2ab7cf7af9dd5f743a551d0bf91dba3cfb76cea9e2d42ada0f9f2e c67d64e20e35a9bba5092651e0f82c75ba53b8c165e823bc81d67975107ae375
 lib/codeql/rust/elements/TypeBound.qll 33583aed81734348c5097851cde3568668f259c000ccde901c75a3f2eef30237 3c9e541d47c5cfbcb0b1c5806f5d9abd7f51382d1efc1328742439e11285ab32
 lib/codeql/rust/elements/TypeBoundList.qll 61a861e89b3de23801c723531cd3331a61214817a230aaae74d91cb60f0e096f d54e3d830bb550c5ba082ccd09bc0dc4e6e44e8d11066a7afba5a7172aa687a8
-lib/codeql/rust/elements/TypeItem.qll 5676a801adccd2685c6beff4e2587b6da595ecaa9befb88dc29428eb53988a86 3bfdeb9d0cd4f79a9eb85829e9572bd1e4d0971e67cd3952ae5b811a955b26b5
-lib/codeql/rust/elements/TypeParam.qll 0787c1cc0c121e5b46f7d8e25153fd1b181bd3432eb040cf3b4ae3ed9ac2f28c 50092950f52a4e3bfd961dff4ffd8a719ef66ca1a0914bd33e26fed538321999
+lib/codeql/rust/elements/TypeItem.qll 7cf52c0c1d76a549a09d0b17372a9ec7fef0d85ad4984be348e7a7b96d2f5432 7e45927c55827816982a61dc3bb4b684d11e9f125b2578148fa8dc9ad4c6093a
+lib/codeql/rust/elements/TypeParam.qll ff412cff7cf08dde0682f7e995a26039b5afedef3c5febbaf5f2e3bf9829d95f 55673f07b4d5c4a13d9082a706f7e76d19f75f5691b072f6848bae5372828b7a
 lib/codeql/rust/elements/TypeRepr.qll ea41b05ef0aaac71da460f9a6a8331cf98166f2c388526068ddacbd67488c892 11a01e42dab9183bac14de1ca49131788ede99e75b0ef759efcbc7cf08524184
-lib/codeql/rust/elements/UnderscoreExpr.qll 233661b82b87c8cda16d8f2e17965658c3dc6b69efb23cb8eb9c4f50c68521e0 8edff8e80aac2ecf83a6b58f310cab688cbaeea0a0e68a298b644e565960cc74
+lib/codeql/rust/elements/UnderscoreExpr.qll ee0d0dfc50c15b978f40293fe494dfd5a1f28a15dd605ce4a975af87d093ff46 f207d066fc575d66b596f06f171b1cc2c270ea3452781964b67c4730e1fb392c
 lib/codeql/rust/elements/Unextracted.qll 12e60c79ef5b94d72b579b19970622e7b73822ebc13fbcfedfe953527ab1ac36 ec015db2eb12c3c82693ddc71d32d9ab9ef7a958e741e2510681bb707ceca23e
 lib/codeql/rust/elements/Unimplemented.qll bf624d28163e5c99accda16c0c99f938bec4a3b1b920a463e86fc8529ff5ff02 013bc7777298d250338f835cd494b5a8accea2d6a4f9561851f283ac129a446b
 lib/codeql/rust/elements/Union.qll e23ca528f8573e77dfa7eca71457e2022c92f22292ce84d021d304e52820ee66 eed20ac3797faaa248bc47ef81fa79a5d5c372b4c6289a075d041a84dd8bd6f4
-lib/codeql/rust/elements/Use.qll fdcf70574403c2f219353211b6930f2f9bc79f41c2594e07548de5a8c6cbb24d e41f2b689fcbeb7b84c7ba8d09592f7561626559318642b73574bbac83f74546
+lib/codeql/rust/elements/UnsafeMeta.qll 10473d5527b564c69e9290553f000fcd7ae7502c22e3e183372530541bb81b5b 028220efdf4f4c8c24297d5fc7159126b06c6f1e46eff518ddc55caef5e45cf2
+lib/codeql/rust/elements/Use.qll 4c0a1c90fb1fd20af9c2bda0fae89de8689af38d6d8f0198fa32901a2c522af8 db41ab566526ae9664fd94dff53198ddbe69ba4e177c0200fb33e0b863ac5674
 lib/codeql/rust/elements/UseBoundGenericArg.qll f16903f8fff676d3700eaad5490804624391141472ecc3166ccb1f70c794c120 5efda98088d096b42f53ceccae78c05f15c6953525b514d849681cb2cf65b147
 lib/codeql/rust/elements/UseBoundGenericArgs.qll 841913cfbb84de14aab1820a5433eae978bbadbb8e6d413b8ba70780c7328335 c9ec9d086cff91d15c3aea64f1080b22b41cdaf64e3c8b192aaaec17604a5d10
 lib/codeql/rust/elements/UseTree.qll e67c148f63668319c37914a46ff600692de477242a0129fa1bb9839754c0f830 de9b39d3d078d51ec9130db6579bff13e6297e60556a7214a5c51cbf89d92791
 lib/codeql/rust/elements/UseTreeList.qll 92ebfee4392a485b38fb3265fdede7c8f2ed1dbe2ab860aa61b1497c33874d25 a4e677455d20838e422e430eebd73d0a488e34e8c960f375fef7b99e79d4c911
-lib/codeql/rust/elements/Variant.qll 7895461fa728f6c3a7293799c5e6b965b413b679566dcbd40bbe2609db8b6cde b0413547365a301bd9fbb6b266757f956394abad0a77f0e424446e23ec7d83e9
+lib/codeql/rust/elements/Variant.qll 2c9585c0d414d228dbedbab4bf70cfe80d5bae5ffbf3f42568bbb21c1eb7ed38 cb045f5e5d2933e68876ed5da055c422a678e2194a5390a1907a8018a054329f
 lib/codeql/rust/elements/VariantList.qll 39803fbb873d48202c2a511c00c8eafede06e519894e0fd050c2a85bf5f4aa73 1735f89b2b8f6d5960a276b87ea10e4bb8c848c24a5d5fad7f3add7a4d94b7da
-lib/codeql/rust/elements/Visibility.qll aa69e8a3fd3b01f6fea0ae2d841a2adc51f4e46dcfc9f8f03c34fbe96f7e24e7 0d475e97e07b73c8da2b53555085b8309d8dc69c113bcb396fc901361dbfe6b8
+lib/codeql/rust/elements/Visibility.qll af9f001cd30e92bd004480fe348adf7ce745ac3de381b1f4723b46ad63be7622 07cb39b9b8c3866bfa1b46eac45e3a5ba1a5877cf51424891b72bc7d3f54dca4
+lib/codeql/rust/elements/VisibilityInner.qll 623e85ffe63d033c4465e2fdeacba2ae51ae7b9d2e9cb15cd4edfb878f8af415 d6ef0775ffd62e51c2739a3a20f3aed1001d8b66f6410625b1f44cdf4ef1f8c0
 lib/codeql/rust/elements/WhereClause.qll 4e28e11ceec835a093e469854a4b615e698309cdcbc39ed83810e2e4e7c5953f 4736baf689b87dd6669cb0ef9e27eb2c0f2776ce7f29d7693670bbcea06eb4e4
 lib/codeql/rust/elements/WherePred.qll 589027c2fddb07620f74b8ed5e471fab49bef389749e498069d7c1fe50912cc7 dd7c90ff9c5bd563f0b8a088e0890ee11c6d5b2269223f22be01f0e1dbe0f5e2
-lib/codeql/rust/elements/WhileExpr.qll 4a37e3ecd37c306a9b93b610a0e45e18adc22fcd4ce955a519b679e9f89b97e8 82026faa73b94390544e61ed2f3aaeaabd3e457439bb76d2fb06b0d1edd63f49
+lib/codeql/rust/elements/WhileExpr.qll 898a5acadef1d1afa89b635c3d21ab0e876b1109a61c7ea6b4d0e4c8a7a42a45 76e7b8613b47f51cb48157378930dc1ada97aad53be574da8298a0445dace8d9
 lib/codeql/rust/elements/WildcardPat.qll 4f941afc5f9f8d319719312399a8f787c75a0dbb709ec7cf488f019339635aab a9140a86da752f9126e586ddb9424b23b3fb4841a5420bac48108c38bb218930
-lib/codeql/rust/elements/YeetExpr.qll 4172bf70de31cab17639da6eed4a12a7afcefd7aa9182216c3811c822d3d6b17 88223aab1bef696f508e0605615d6b83e1eaef755314e6a651ae977edd3757c3
-lib/codeql/rust/elements/YieldExpr.qll de2dc096a077f6c57bba9d1c2b2dcdbecce501333753b866d77c3ffbe06aa516 1f3e8949689c09ed356ff4777394fe39f2ed2b1e6c381fd391790da4f5d5c76a
+lib/codeql/rust/elements/YeetExpr.qll e0ff2b538e775fb209bd695e5ead57a61140ee2f12b389de6ccd7576c41ba5e2 ccf0d5e3ac30b445a9976464fd92010c9603fc1e4e0689919eaec605395ca55f
+lib/codeql/rust/elements/YieldExpr.qll 8c6f411383aa962a7bc1eb09fdcc6365f14ae02680354e542ae805de1f70d29f 53e8d487fb14e62d9385426e9ce5895da45ee697d6fb00ece426e85e20d0b4b2
 lib/codeql/rust/elements/internal/AbiConstructor.qll 4484538db49d7c1d31c139f0f21879fceb48d00416e24499a1d4b1337b4141ac 460818e397f2a1a8f2e5466d9551698b0e569d4640fcb87de6c4268a519b3da1
 lib/codeql/rust/elements/internal/AbiImpl.qll 28a2b6bdb38fd626e5d7d1ed29b839b95976c3a03717d840669eb17c4d6f0c7a 8e83877855abe760f3be8f45c2cf91c1f6e810ec0301313910b8104b2474d9cf
+lib/codeql/rust/elements/internal/AnyAttrImpl.qll bbb753548cf0e6eeb75a59415b95ac764a35973953514bb684f310033428c442 7daf318b371d55b2715f9327fc8ef9dda85143ce3f464a31c6514ab3921101a9
 lib/codeql/rust/elements/internal/ArgListConstructor.qll a73685c8792ae23a2d628e7357658efb3f6e34006ff6e9661863ef116ec0b015 0bee572a046e8dfc031b1216d729843991519d94ae66280f5e795d20aea07a22
 lib/codeql/rust/elements/internal/ArgListImpl.qll 0903b2ca31b3e5439f631582d12f17d77721d63fdb54dc41372d19b742881ce4 2c71c153ccca4b4988e6a25c37e58dc8ecb5a7483273afff563a8542f33e7949
-lib/codeql/rust/elements/internal/ArrayExprInternal.qll 07a219b3d3fba3ff8b18e77686b2f58ab01acd99e0f5d5cad5d91af937e228f5 7528fc0e2064c481f0d6cbff3835950a044e429a2cd00c4d8442d2e132560d37
+lib/codeql/rust/elements/internal/ArrayExprInternal.qll 9cca08ca8db32d62ea011e7f82e41b77bf9be62b30fc8ae0efb38702e7901c53 464278a0e0c2de785d3a1c912eb3325e13dd56f4e311e4ab0de9a07b601a363a
 lib/codeql/rust/elements/internal/ArrayExprInternalConstructor.qll f9756bc40beee99c5e4355bf157030b440c532dff5bdf43e848b3aa1a00fea90 39467f7f313e6f9ede1fe92375ee408098dc65291ca8ee50e36a3684a2767836
 lib/codeql/rust/elements/internal/ArrayExprInternalImpl.qll ae4488846c8309b2d4a51d54b36fce0a75107917c0b1f8af5ccf40797f570580 37838c7d6a04b95a16ed46e963d7e56def7a30b5e5ef1ab7e0dfdb5f256fa874
 lib/codeql/rust/elements/internal/ArrayTypeReprConstructor.qll 52fea288f2031ae4fd5e5fe62300311134ed1dec29e372500487bf2c294516c1 fa6484f548aa0b85867813166f4b6699517dda9906e42d361f5e8c6486bdcb81
@@ -236,6 +255,19 @@ lib/codeql/rust/elements/internal/BoxPatConstructor.qll 153f110ba25fd6c889092bfd
 lib/codeql/rust/elements/internal/BreakExprConstructor.qll 356be043c28e0b34fdf925a119c945632ee883c6f5ebb9a27003c6a8d250afd9 bb77e66b04bb9489340e7506931559b94285c6904b6f9d2f83b214cba4f3cfd5
 lib/codeql/rust/elements/internal/CallExprConstructor.qll 742b38e862e2cf82fd1ecc4d4fc5b4782a9c7c07f031452b2bae7aa59d5aa13a cad6e0a8be21d91b20ac2ec16cab9c30eae810b452c0f1992ed87d5c7f4144dc
 lib/codeql/rust/elements/internal/CastExprConstructor.qll f3d6e10c4731f38a384675aeab3fba47d17b9e15648293787092bb3247ed808d d738a7751dbadb70aa1dcffcf8af7fa61d4cf8029798369a7e8620013afff4ed
+lib/codeql/rust/elements/internal/CfgAtomConstructor.qll b71484029b4fdaa5df6b42f6b38c3feb0ad72284e5badf3d8413b78d6d14240b 146c73c0354d67fbccba5eb2fe21918ab441d953e005b4ec5482c80388d9493d
+lib/codeql/rust/elements/internal/CfgAtomImpl.qll 47ca5355933e1c405dc2edec7bff9fd9be5132f708d6d7e0237a9f0a809eefa7 965eeca1d9ba5045735b16fa0340c0227f22418e0545f381c4df36eac23cf3fe
+lib/codeql/rust/elements/internal/CfgAttrMetaConstructor.qll 8cae731f5e86830dec3367b1c69e807389bc434b4f83ff6e13427e4106ec6f2c 0ced22b35219edf0250a8542062f66641f03c13575a3c71d4d718ce5146288ea
+lib/codeql/rust/elements/internal/CfgAttrMetaImpl.qll 2b8a578d52aea3ab218f1337ba2c8737cf16e9c64580b1916860dc66ae3e9025 e92e5e8dc79b1da72873af410b778054df7e22bc9080719d60371bc72bc27043
+lib/codeql/rust/elements/internal/CfgCompositeConstructor.qll 160bfbccdd80c9b9421b33cb302f6fe48bebe80050a01ad72a43f7332100f834 0102cad0255d632cac4ffaf334ce15f9beff9d7eb7d14a50255ef5c0e4b67d7b
+lib/codeql/rust/elements/internal/CfgCompositeImpl.qll 840a148dc5c4b213ffdaca6213d6f2dfa3c1dad3f99293f8244baa3bf6902909 36e9291b124c52bb2e4620bead8acf2f9be4a2281eccfd74411adaf91914dd20
+lib/codeql/rust/elements/internal/CfgMetaConstructor.qll 335cb7a36e430b08a12c5548d0a91bbb9a00aaa2f9b0dc7b2fa526882ec0271e 0bd7002f58c1c19c22023d6f03874d84e083e1aa09ec9cac888661d5ad632f6b
+lib/codeql/rust/elements/internal/CfgMetaImpl.qll 9d820fb4dee32288e467a8b667ba191588381d8ec2a0ce0e5e8645ee437a16a8 5888fb533768a36d94f56f81058aa0d00c4a2c13721af42bdd30628747698bce
+lib/codeql/rust/elements/internal/CfgPredExprConstructor.qll 2dc5dc48249f69bbb824786fe8ff84258f8aa71d6da2182b67659624a82de672 abb538b0a7907d59e1e1305f8f200d16860a4f8e38a39832f2f3f7668ae3248c
+lib/codeql/rust/elements/internal/CfgPredExprImpl.qll ef87fbc24432d7b735d467dcdee1dc84d77de98be60ffa3ebec9c47a0363e0af eccd8f349e684a8d87683bf39511cdd4bad06a8a6943e9fbba0d625a6608dab5
+lib/codeql/rust/elements/internal/CfgPredPatConstructor.qll 33c2b178e02d65dc96bbcbd0fb38781b413b8b7585a2d371e39730be9b45ecfc 6df70c182b75140f6704045cbbfac34c122fec8a791232b8a2f569f9f86008ec
+lib/codeql/rust/elements/internal/CfgPredPatImpl.qll 7619be43f0d2080b2db0b6dbd9b73bf2ead575140dc36b5288195ce469332739 7c0a931f97e3f0c70a432d8fe803db7872a25cfb5ef3f06caddfde52cbf750c4
+lib/codeql/rust/elements/internal/CfgPredicateImpl.qll 3ba6c6732a7de4df967dd2cb2b4cc99db8aefb2301b75521f1b369052e3a2ec0 c07d4366f98f374f24e235f809946dc513a16203e4c1eb151c8185a5bc79e70d
 lib/codeql/rust/elements/internal/ClosureExprConstructor.qll a348229d2b25c7ebd43b58461830b7915e92d31ae83436ec831e0c4873f6218a 70a1d2ac33db3ac4da5826b0e8628f2f29a8f9cdfd8e4fd0e488d90ce0031a38
 lib/codeql/rust/elements/internal/CommentConstructor.qll 0b4a6a976d667bf7595500dfb91b9cfc87460a501837ba5382d9a8d8321d7736 7d02d8c94a319dc48e7978d5270e33fc5c308d443768ff96b618236d250123f1
 lib/codeql/rust/elements/internal/ConstArgConstructor.qll f63021dc1ca2276786da3a981d06c18d7a360b5e75c08bca5d1afece4f7c4a83 487a870cbf5ed6554d671a8e159edd9261d853eba2d28ce2bd459759f47f11f2
@@ -247,6 +279,10 @@ lib/codeql/rust/elements/internal/ConstParamConstructor.qll f6645f952aac87c7e00e
 lib/codeql/rust/elements/internal/ConstParamImpl.qll c6995be58f84d1df65897c80f7ee3dd8eb410bb3e634ff1bfe1be94dfb3fdf32 bcfb5547b40f24bcec20056fe1d36724b734c920b0bc7538fe2974b03f4478fe
 lib/codeql/rust/elements/internal/ContinueExprConstructor.qll cd93f1b35ccdb031d7e8deba92f6a76187f6009c454f3ea07e89ba459de57ca6 6f658e7d580c4c9068b01d6dd6f72888b8800860668a6653f8c3b27dc9996935
 lib/codeql/rust/elements/internal/CrateConstructor.qll 2a3710ed6ff4ffdbc773ac16e2cf176415be8908e1d59fd0702bdeddbae096f4 f75a069b0ef71e54089001eb3a34b8a9e4ce8e4f65ffa71b669b38cf86e0af40
+lib/codeql/rust/elements/internal/DerefPatConstructor.qll a92a1e9b310a7dc92f31952b08c264cbd57265a5c619ff1abecf739ed4f6525f f86e26668b88baa571ca7521782141ce92f816ec366024c21c953bc335482c10
+lib/codeql/rust/elements/internal/DerefPatImpl.qll b43a939e3d373b411fe7b8b2b8192f6cb58860fd806aaa83f20b7e2be06c7e63 21b433843baa1aef9d5a67bd4cfcfbbb08a64a1e8d31ab254ecdc2ef1f1854c0
+lib/codeql/rust/elements/internal/DocCommentConstructor.qll 15c8f57255cf370db771bddc4b83fd52fdebf411fa8d532af978526e6361b866 8799fe6f06edaabf8e134145b79b9548e78b36d3672052dca27182c146202671
+lib/codeql/rust/elements/internal/DocCommentImpl.qll 8d99541bda48ed1cda5ae2c28fe0b692f6b45f85e1bfb20385cb48056019f15b 0eda975e74f1ea9fa84df31aa45008f084a0deac2903dfb16763039c1879a2e1
 lib/codeql/rust/elements/internal/DynTraitTypeReprConstructor.qll 6964e6c80fb7f5e283c1d15562cef18ed097452b7fcbc04eff780c7646675c7a f03c4830bf1b958fdfb6563136fa21c911b2e41ce1d1caee14ec572c7232866d
 lib/codeql/rust/elements/internal/EnumConstructor.qll eca1a13937faacb1db50e4cf69d175f992f2204a5aaed9144bb6f3cb63814ac5 1bafba78b2729fdb052a25a1ba3f4f70871564aa4df632b4a1d467858a437924
 lib/codeql/rust/elements/internal/ExprImpl.qll ab20ee174e2e786f34af6e5dedf3ec071bb89fc266b3e91df6377f72aa38d3f2 f68192700f449bf1c229cfbaabd5353c7c559941c915d5a0c88752cf9844194b
@@ -280,11 +316,17 @@ lib/codeql/rust/elements/internal/GenericParamListConstructor.qll 7221146d1724e0
 lib/codeql/rust/elements/internal/IdentPatConstructor.qll 09792f5a070996b65f095dc6b1b9e0fb096a56648eed26c0643c59f82377cab0 0bb1a9fcdc62b5197aef3dd6e0ea4d679dde10d5be54b57b5209727ba66e078b
 lib/codeql/rust/elements/internal/IfExprConstructor.qll 03088b54c8fa623f93a5b5a7eb896f680e8b0e9025488157a02c48aaebc6ad56 906f916c3690d0721a31dd31b302dcdcec4233bb507683007d82cf10793a648f
 lib/codeql/rust/elements/internal/ImplConstructor.qll 24edccca59f70d812d1458b412a45310ddc096d095332f6e3258903c54c1bb44 7eb673b3ab33a0873ee5ce189105425066b376821cce0fc9eb8ace22995f0bc7
+lib/codeql/rust/elements/internal/ImplRestrictionConstructor.qll 7d58e3efd82a6869fec0c95733d710223563ba063a11096bc78bdaa2b52228ee 83c219aabb5d037dcece2e723b8424f0a853d5a7c15562c1b5b964e8ea43fd2d
+lib/codeql/rust/elements/internal/ImplRestrictionImpl.qll 5023ad9d8103df7c23b3d301ab6a957b2ed17a7b6f78b724e1cfb913423439dc 35ccaf051a5cbc3bf76578a6a30ff11b6f2520bb55232751ec951d9d65119aa5
 lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll 1ed355e5e56f432b24b6f4778e4dc45c6e65095190cacb7a5015529e0c9d01f8 c8505185a042da4eb20a0cc32323194a0290c4bf821c7e0fce7351b194b10f31
+lib/codeql/rust/elements/internal/IncludeBytesExprConstructor.qll 62d20cf32e8c0fa62ef5b472e3b5538b95cc6bf275955f195a4924c2f38c9ba8 5fd4b50e9760af5a5c76d616658adde406470c4c9eac9b846dc0b7583e6460c1
+lib/codeql/rust/elements/internal/IncludeBytesExprImpl.qll cf1da0abb200dceedf5000fe6565456fd1526310565df1f210ec12c37b3b1f4f 82195e928034735f3e41b4d4cf48d411cf6719089f0529a843e79a1dabb94b21
 lib/codeql/rust/elements/internal/IndexExprConstructor.qll 99bdc3d793c4dbd993860da60abe2b7c604345d645e86916462bc55a6939a5d1 3fe9d7da725956903707806aadbecac8d5b3874e8bed63c9bab54fff630e75dd
 lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll bc5f16853401617fc9c5af8a1287a23c5921df1b615cfbe2d7c7a70145ecfcbd da93bd28ea2daade2cbb0a729be3fbf05f72bc02009565c7bb062e4f68fdb9e7
 lib/codeql/rust/elements/internal/ItemListConstructor.qll 08af3bd12536941c3dd4a43c81cc861be24325e242e2593c087a3ce632674291 2fa166159c409d2aaffa73a30babb40829a6de580bd40894d909ee6152801082
 lib/codeql/rust/elements/internal/ItemListImpl.qll 195dbe93c334ad2bfc29db530bda9aaea88fc31696b2f230faae9e6c2ecb74a8 e498983a5b2f7a91e2fd336e85ac17e521a18c677784a0788d95bb283f3652e7
+lib/codeql/rust/elements/internal/KeyValueMetaConstructor.qll 946f4df587ae7c77445faec67b0c796e008a10c642e5bdf881f9f75e819a1f93 d2bff94a5f8967fabadb76424917383e1472467db1d90214b1b871ebf8da672d
+lib/codeql/rust/elements/internal/KeyValueMetaImpl.qll 6f895ee05d983885ad3624b5c64483f2c9024888ed62781889c589ba6fadb4eb 4004bb1b22c30e27f7e2262e9788d1ad3ea4cb08729d8910140c54663a123b91
 lib/codeql/rust/elements/internal/LabelConstructor.qll 1f814c94251e664bfa1b1a606aef995382e40e78d4f953350ec951ee0bc8bd34 3157fb8c7c6bd365a739f217ad73ba1e0b65ccd59b922e5ab034e3449915b36c
 lib/codeql/rust/elements/internal/LetElseConstructor.qll b2b5d68e5701379a0870aa6278078e09f06aa18ddd14045fc6ae62e90827ece7 7359e70bea8a78bcaf6e6ecc8cc37c5135ae31415b74645594456cc8daa82118
 lib/codeql/rust/elements/internal/LetExprConstructor.qll 66f27cbdafb2b72b31d99645ec5ed72f4b762a7d6f5d292d7639dd8b86272972 7da048f4d7f677919c41d5c87ead301eacc12ece634d30b30a8ae1fab580ff30
@@ -317,25 +359,25 @@ lib/codeql/rust/elements/internal/MatchArmListImpl.qll 16de8d9e0768ee42c5069df5c
 lib/codeql/rust/elements/internal/MatchExprConstructor.qll 0355ca543a0f9ad56697bc2e1e2511fa3f233bc1f6344d9e1c2369106901c696 78622807a1c4bff61b751c715639510146c7a713e0c4f63246e9a2cf302f4875
 lib/codeql/rust/elements/internal/MatchGuardConstructor.qll d4cae02d2902fe8d3cb6b9c2796137863f41f55840f6623935a1c99df43f28d8 0c89f2ca71a2fd5a3f365291e784cb779e34ba0542d9285515e1856424cec60d
 lib/codeql/rust/elements/internal/MatchGuardImpl.qll 489040ca1ea85edda91405fab3d12321b6541d2888c35356d3c14c707bf1468e 2b60223a822b840356a3668da3f9578e6a9b8f683fcdd3dbd99b5354c7d96095
-lib/codeql/rust/elements/internal/MetaConstructor.qll 49ab9aafdcab7785fc5fc9fb8f7c5bb0ae76cf85d0d259c4b3ac4b0eccbbeb56 bc11aef22661077e398b6ca75e3701fd8d0ac94a0e96dc556a6f6de4089d8b8c
-lib/codeql/rust/elements/internal/MetaImpl.qll ab77681dc271d26b4eb77d792fd9b24fce65b0f4a88056ad09aa9400d26b4b58 270e58d97c03357e92f777ce2bd332e2718e077a7faaa6778941a9d5b14e135d
 lib/codeql/rust/elements/internal/MethodCallExprConstructor.qll a1b3c4587f0ae60d206980b1d9e6881d998f29d2b592a73421d6a44124c70c20 8d4eaa3eb54653fac17f7d95e9cc833fe1398d27c02b2388cd9af8724a560ded
 lib/codeql/rust/elements/internal/MissingConstructor.qll aab0b7f2846f14a5914661a18c7c9eae71b9bde2162a3c5e5e8a8ecafa20e854 8f30b00b5b7918a7500786cc749b61695158b5b3cc8e9f2277b6b6bf0f7850a0
 lib/codeql/rust/elements/internal/MissingImpl.qll e81caa383797dfe837cf101fb78d23ab150b32fef7b47ffcc5489bfcd942ac3e 9f3212d45d77e5888e435e7babd55c1e6b42c3c16f5b1f71170ac41f93ee8d0b
 lib/codeql/rust/elements/internal/ModuleConstructor.qll 31cc83c9d8f25ac07375d19e568f05c068e1f5aa205ff3d9ac31c2510e6f8468 8a70f3f1c18ff87f17e6baf2f05ccaed55c70469288192fc39ef0bb5531b8c0e
+lib/codeql/rust/elements/internal/MutRestrictionConstructor.qll 002e0b35790932db84a5643d9ffc531b10dc327b1b44b966e773bf9b4e46a325 5d81599d543825b8ace752dc03bafc9bae7f13bc8bcbb3db5e2e0243fc9c6772
+lib/codeql/rust/elements/internal/MutRestrictionImpl.qll 80e2f1b224a71df6a8c6544c1feb19a92b300cf3447c9905814a6539f89f1dde 16099f2adf7b4b9401f3320fc16d27c170b0d00221d9a062d373216150a2559b
 lib/codeql/rust/elements/internal/NameConstructor.qll a760134c6d4fc785746e1a5dc042a6bf25b8adaa3947a6897c31e50fd91dd5fd 1359f903d57112bcc1f62a609febb288301bfa810e569aa12e1045fd48b5b5c9
 lib/codeql/rust/elements/internal/NameRefConstructor.qll 5ff6eacc614fd41f98b54cbb4960a07a1471cf4ea291758d33e54a48fd5d1bc4 c538d65414a24dfdbeb49cfd997588227559ba038f0b55d14bb5d89ed1a016f2
 lib/codeql/rust/elements/internal/NamedCrate.qll 6c697076387b5af00422e227540d100ff7c03d3001f6a4c5b61433191d022490 2276f85411db199598fc6a5d8d6ec5762e42b1b45c98e398eeb75e69c697b57f
 lib/codeql/rust/elements/internal/NamedCrateConstructor.qll 72e07ece16f787dfd993982848689dc2e11845aa5634e9ee5ad8865b95cb59dc ea6555ae33cabe408935649b5e8c6218158036a3b7c4e1abc8bd7cd51c05a912
 lib/codeql/rust/elements/internal/NamedCrateImpl.qll ba1f775ca6177a5bdb2ef1891a3fd505642e2fec63910f958f380039499f45bf f66b503b3574d3be75b79870b754015740f58195c4924b71c21ba4e673efd8c4
 lib/codeql/rust/elements/internal/NeverTypeReprConstructor.qll 2e0a9c75e389e9ef41a18dd9b5d6c29ffe1d1d633e51ef1de90ec553236d201a 61ea87802fd1c3a68e864ccd76657253a228b06471e4c55bcf94ca2be554f866
+lib/codeql/rust/elements/internal/NotNullConstructor.qll 40e9254021ce7f09861c8d4ac70c3595953e8ade756a3da039d99a638fe8f0f3 3264d3ba76e04cdee673ae38dd3fcd7660978dc17d86c9b8f062bd0fbf3e5d3e
+lib/codeql/rust/elements/internal/NotNullImpl.qll d76de5a4967440f52b2b968bae371d7e3aa11b98a38e7de0591720346e70224c 667b432d8500db42c56653b329ef80c7d3079f24efa360528d438c9dff5c9507
 lib/codeql/rust/elements/internal/OffsetOfExprConstructor.qll 616e146562adb3ac0fba4d6f55dd6ce60518ed377c0856f1f09ba49593e7bfab 80518ce90fc6d08011d6f5fc2a543958067739e1b0a6a5f2ed90fc9b1db078f0
 lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll e52d4596068cc54719438121f7d5afcaab04e0c70168ac5e4df1a3a0969817a6 6ab37e659d79e02fb2685d6802ae124157bf14b6f790b31688f437c87f40f52c
 lib/codeql/rust/elements/internal/OrPatConstructor.qll 4ef583e07298487c0c4c6d7c76ffcc04b1e5fe58aba0c1da3e2c8446a9e0c92b 980a6bd176ae5e5b11c134569910c5468ba91f480982d846e222d031a6a05f1a
 lib/codeql/rust/elements/internal/ParamConstructor.qll b98a2d8969f289fdcc8c0fb11cbd19a3b0c71be038c4a74f5988295a2bae52f0 77d81b31064167945b79b19d9697b57ca24462c3a7cc19e462c4693ce87db532
 lib/codeql/rust/elements/internal/ParamListConstructor.qll 3123142ab3cab46fb53d7f3eff6ba2d3ff7a45b78839a53dc1979a9c6a54920e 165f3d777ea257cfcf142cc4ba9a0ebcd1902eb99842b8a6657c87087f3df6fe
-lib/codeql/rust/elements/internal/ParenExprConstructor.qll 104b67dc3fd53ab52e2a42ffde37f3a3a50647aa7bf35df9ba9528e9670da210 d1f5937756e87a477710c61698d141cdad0ccce8b07ecb51bab00330a1ca9835
-lib/codeql/rust/elements/internal/ParenPatConstructor.qll 9aea3c3b677755177d85c63e20234c234f530a16db20ab699de05ca3f1b59787 29f24aed0d880629a53b30550467ade09a0a778dbf88891769c1e11b0b239f98
 lib/codeql/rust/elements/internal/ParenTypeReprConstructor.qll b3825399f90c8546c254df1f3285fe6053b8137e4705978de50017be941c9f42 696fa20ce5bd4731566b88c8ea13df836627354d37cc9d39514d89d8fb730200
 lib/codeql/rust/elements/internal/ParenthesizedArgListConstructor.qll 67f49d376e87a58d7b22eb6e8f90c5b3d295a732be657b27ea6b86835a0ac327 6549e4f5bccb2d29dfeb207625f4d940344ac1bb4c7a7ae007a8eb1c4c985da0
 lib/codeql/rust/elements/internal/ParenthesizedArgListImpl.qll c885ff2903fcbe89540aff643d416e8d0dd5dcf1f7a77f48b9952f4679f8c92b 7e5d8e6d77999f02fe4267ceac6892b2063b1252cf5fa3bceab7898c6bad5c54
@@ -343,9 +385,13 @@ lib/codeql/rust/elements/internal/PathAstNodeImpl.qll 5a38c42a9127fc2071a9e8f091
 lib/codeql/rust/elements/internal/PathConstructor.qll 5c6354c28faf9f28f3efee8e19bdb82773adcf4b0c1a38788b06af25bcb6bc4a 3e2aeef7b6b9cda7f7f45a6c8119c98803aa644cf6a492cf0fce318eba40fe8f
 lib/codeql/rust/elements/internal/PathExprBaseImpl.qll e8b09447ee41b4123f7d94c6b366b2602d8022c9644f1088c670c7794307ab2e 96b9b328771aaf19ba18d0591e85fcc915c0f930b2479b433de3bfdd2ea25249
 lib/codeql/rust/elements/internal/PathExprConstructor.qll cf6e0a338a8ed2d1042bdee4c2c49be5827e8c572d8c56e828db265d39e59ae3 36a3d1b7c5cc2cf527616be787b32071b9e2a6613a4f6b3f82e2a3b0e02a516f
+lib/codeql/rust/elements/internal/PathMetaConstructor.qll de6ebd053e66f0c72e6acb59c7a7e7326abfe0331e65080cc539030b93c49e32 327a8d8b5a6d721daa763cb5dac83247f9b2d9650be53ce01cbae02b15fbad94
+lib/codeql/rust/elements/internal/PathMetaImpl.qll 052152ec17c827054b1e9fccfc7cd7cb12fc0787e82242fde5724fd7a77b3b39 677460de83898bdfc9f06460ddb5dab2d4d884a88998c879b7eff5018d9b434a
 lib/codeql/rust/elements/internal/PathPatConstructor.qll 966c4ea22218ef71e000d7ce8dd5b570c39ad96b9239a3aa8a38292e2a9f36d2 8a1f348e9257ffc6e6bedcd70389b8e7ec2a3ed6e7b3733744ddfab284826e57
 lib/codeql/rust/elements/internal/PathSegmentConstructor.qll 2d9639e42035dc7e73b7d6ddb8a977beadc6b4492dee4292b2f85b4409344441 c337fc3b9ef56366428772563e3f25f711474d16e860d3e89c1395a95d9e83e7
 lib/codeql/rust/elements/internal/PathTypeReprConstructor.qll e05e7be13d48e7f832e735254777692d4be827a745b1fd94b9649d46fe574393 4aa1e6935a4479b61f205265cbbba01ce96d09a680c20d5decf30d1374d484d4
+lib/codeql/rust/elements/internal/PatternTypeReprConstructor.qll cf17aaca86534afe86518f1dc2fdbf548fc0e9bf241d1e698a94940ce875d1f2 5799da5538796765846bcf09391ec2388cc96fdc6fea60819301ab6387d5d146
+lib/codeql/rust/elements/internal/PatternTypeReprImpl.qll 38052ab7f6f18d73556644291546d1f58709c2e44c7fdbcb259a4e5102bc1a08 f63d6fb495a1cad07ae55de210e766fdf15f011de4d8b7b2e8124d556287db26
 lib/codeql/rust/elements/internal/PrefixExprConstructor.qll 90c50b0df2d4b4cbf5e2b7d67a9d243a1af9bfff660b7a70d8b9c7859c28bca7 1a1b5ea1f06ed8d41a658c872e8e1915c241a7c799c691df81b9a7b55d8f2f1e
 lib/codeql/rust/elements/internal/PtrTypeReprConstructor.qll c8bd3502dc23429577fbff0fe3e3c78b812b2237b2bb65862c137083fdaa7a4a 4d5c135be30f71a3712acbc22bdb6c425fa6463043a9ee64543da31151d68366
 lib/codeql/rust/elements/internal/PtrTypeReprImpl.qll cb3cf7960a05f2c1930067fc62c5a207fc5faac143758b9b9e5f117fbd073f2f 40545d4768380f0dde9b708932f92f57566ac49f3f9b4147a8ff2ea90a0947c7
@@ -390,9 +436,11 @@ lib/codeql/rust/elements/internal/StructPatFieldListImpl.qll 046464430ba9cc0a924
 lib/codeql/rust/elements/internal/TokenImpl.qll 87629ffee74cacc6e8af5e96e18e62fb0fa4043d3ba1e7360daa880e628f8530 d54e213e39ae2b9bb92ab377dc72d72ba5bca88b72d29032507cdcbef201a215
 lib/codeql/rust/elements/internal/TokenTreeConstructor.qll 0be1f838b04ff944560aa477cbe4ab1ad0b3f4ae982de84773faac5902fcae45 254b387adc2e1e3c355651ab958785d0b8babbc0030194234698a1219e9497b3
 lib/codeql/rust/elements/internal/TokenTreeImpl.qll 7c16b22a8ff4ad33be25c3d2d43b8f043cab7626538ac5d8938b074dc663b4f4 793e04299d571a8cea2097e6c43136c5e618b31da91ccc68bda334c3d2c3793d
-lib/codeql/rust/elements/internal/TraitAliasConstructor.qll d2f159cac53b9d65ec8176b8c8ccb944541cd35c64f0d1ceabb32cd975c000bf 6564981793de762af2775cc729e25054ea788648509d151cbfdbdf99fc9ed364
-lib/codeql/rust/elements/internal/TraitAliasImpl.qll 434cf074a461219ad01ab2f116681213302fc62dabc4131d118b3bc2f2fd1af4 59e6f8893431e563897304e6f22da466c69410cf59206b634b426e8fef93b159
+lib/codeql/rust/elements/internal/TokenTreeMetaConstructor.qll 059903cc9cbc77d753f1e7833bbc6ba42d55d281bdf0a3ec1c79d0224be1613f b387eb1eb56f83ff9b2831552db5f23af9b8b8bd822e277f2c1e95ed88b71c1f
+lib/codeql/rust/elements/internal/TokenTreeMetaImpl.qll e0c30c264f05a5b610c6d1c7bdacd804b4188031e3968756e6670d51b9b7ee02 084adcb4898a694a8be217a416b693e8291848f3802d4437a2004384ab079037
 lib/codeql/rust/elements/internal/TraitConstructor.qll 1f790e63c32f1a22ae1b039ca585b5fe6ffef6339c1e2bf8bca108febb433035 535cebd676001bfbbb724d8006fa2da94e585951b8fd54c7dc092732214615b5
+lib/codeql/rust/elements/internal/TryBlockModifierConstructor.qll 55a69eced15a1637cb84889e50cf465bbc677baaf4bf3e4e5ab37615018f5803 ee6141225ade44559067474a75b27e3c68dbb149dc9c24dacc1e9d8c791f13f7
+lib/codeql/rust/elements/internal/TryBlockModifierImpl.qll 97ab789b3a0d9f9e851cee967cc92ae28446355e7bfeb7ff598787f18b9fdfa5 6f24a42b5e4c448f3ac447200becbf63b83bf1f26e99fca933f5e4262906d278
 lib/codeql/rust/elements/internal/TryExprConstructor.qll 98e3077ebc4d76f687488b344f532b698512af215b66f0a74b5cea8ed180836c b95603c10c262911eeffdf4ccba14849e8443916b360e287963d5f2582d8e434
 lib/codeql/rust/elements/internal/TryExprImpl.qll cacf43a49ba518be3f94e4a355f5889861edc41f77601eff27e0ed774eca6651 5f4a6a346ec457d5de89b32419e8b4c2deddc55e2d61dbb59842d7f34aa11c44
 lib/codeql/rust/elements/internal/TupleExprConstructor.qll 71c38786723225d3d90399b8a085b2b2664c62256654db9e1288fadd56745b9d 639ad70b49ebadc027127fbdc9de14e5180169a4285908233bc38ccac6f14110
@@ -417,6 +465,8 @@ lib/codeql/rust/elements/internal/UnextractedImpl.qll 5c23df7e448184d76ccab2c227
 lib/codeql/rust/elements/internal/UnimplementedConstructor.qll 70b0489fdc75fed389de8203947ed9c8eabb91373a1264eb2c8018ddbb2d9baa 0f2592c1697a2f2f913014ecd73b0e3ff1ec5b038ba1c3a22e7939bf8759e664
 lib/codeql/rust/elements/internal/UnimplementedImpl.qll 06771abc088e0a8fc24032c9d2633618e8e40343ef8757a68cc0a70f1617165a 5738f626f1f4f573fdf7dcd5bd57a0948d290ed89342b9160e95ef3c84044f9a
 lib/codeql/rust/elements/internal/UnionConstructor.qll d650551a1b3ef29c5a770bdad626269cf539ed0c675af954bc847d2c6111f3f6 aca9064ad653a126ab4f03703e96b274587c852dc5e7ff3fea0fec4d45993f10
+lib/codeql/rust/elements/internal/UnsafeMetaConstructor.qll 89c041ebd8ff05137d0244c97b9cd8ea1afffbc1d6d3e6aab906546897d851aa 6da0034021f992ae39977694418a4d8f2fe6b426f54f606a2a089c3896e6eb52
+lib/codeql/rust/elements/internal/UnsafeMetaImpl.qll 38134143aec9d5f48762a1d70330a8899bd3e94265f80b0772e7db3987a7a107 7731646d9a29357c7567a08129d018c4b09982781d8b6cb73d93bcea7f71f0a1
 lib/codeql/rust/elements/internal/UseBoundGenericArgImpl.qll 2f90bfd5e43113da1155445bef0334ab84acddef102bd62dfa2ef908717a5d09 dd2fa3c6081d79e1d96360dbdb339128cd944e7b7dc26c449c04f970ee1d7848
 lib/codeql/rust/elements/internal/UseBoundGenericArgsConstructor.qll 84d4a959d098fcd1713cb169e15b4945d846121701d2c5709b11e19202c21f2b 93113c92be9bc9f0b8530c308fe482dfeddc7dc827fc44049cecb3eab28df731
 lib/codeql/rust/elements/internal/UseBoundGenericArgsImpl.qll 0f98d47c1e09c46dd3da66a4770181a0caae0512b362faaec997af22bb5f4ce7 1919235e50b9d2fee9bd5d407a0bc023a02dbb04b2662349fad5a8d6cfa98069
@@ -428,6 +478,8 @@ lib/codeql/rust/elements/internal/VariantConstructor.qll 0297d4a9a9b32448d6d6063
 lib/codeql/rust/elements/internal/VariantListConstructor.qll c841fb345eb46ea3978a0ed7a689f8955efc9178044b140b74d98a6bcd0c926a c9e52d112abdba2b60013fa01a944c8770766bf7368f9878e6b13daaa4eed446
 lib/codeql/rust/elements/internal/VariantListImpl.qll 4ceeda617696eb547c707589ba26103cf4c5c3d889955531be24cbf224e79dff 4258196c126fd2fad0e18068cb3d570a67034a8b26e2f13f8223d7f1a246d1a4
 lib/codeql/rust/elements/internal/VisibilityConstructor.qll 1fd30663d87945f08d15cfaca54f586a658f26b7a98ea45ac73a35d36d4f65d0 6ddaf11742cc8fbbe03af2aa578394041ae077911e62d2fa6c885ae0543ba53a
+lib/codeql/rust/elements/internal/VisibilityInnerConstructor.qll 6d845ba35a3bc8521fb49d1691d6aa10f1f7f4b7f27f12f4d3e316d8d3d6050c eecc48b25464df7e723ce1e9706b2b9ffbb8ccac26edb78b0901ce9912675edc
+lib/codeql/rust/elements/internal/VisibilityInnerImpl.qll 9a536441b258a5dae6518b7efa36a881244194f7e0f842a1c730dfeaa979d462 de14821d1d9ffeac766b01ee3ec248c73a531b4d3a7357e5b609e4de40ffea93
 lib/codeql/rust/elements/internal/WhereClauseConstructor.qll 6d6f0f0376cf45fac37ea0c7c4345d08718d2a3d6d913e591de1de9e640317c9 ff690f3d4391e5f1fae6e9014365810105e8befe9d6b52a82625994319af9ffd
 lib/codeql/rust/elements/internal/WhereClauseImpl.qll 006e330df395183d15896e5f81128e24b8274d849fe45afb5040444e4b764226 ed5e8317b5f33104e5c322588dc400755c8852bbb77ef835177b13af7480fd43
 lib/codeql/rust/elements/internal/WherePredConstructor.qll f331c37085792a01159e8c218e9ef827e80e99b7c3d5978b6489808f05bd11f8 179cad3e4c5aaaf27755891694ef3569322fcf34c5290e6af49e5b5e3f8aa732
@@ -438,69 +490,79 @@ lib/codeql/rust/elements/internal/YeetExprConstructor.qll 7763e1717d367215658725
 lib/codeql/rust/elements/internal/YeetExprImpl.qll e8924147c3ebe0c32d04c5b33edfd82ae965c32479acfd4429eeab525cf42efb b2debcfa42df901f254c58705a5009825ec153464c9ab4b323aa439e5924e59e
 lib/codeql/rust/elements/internal/YieldExprConstructor.qll 8cbfa6405acb151ee31ccc7c89336948a597d783e8890e5c3e53853850871712 966f685eb6b9063bc359213323d3ff760b536158ecd17608e7618a3e9adf475f
 lib/codeql/rust/elements/internal/YieldExprImpl.qll af184649a348ddd0be16dee9daae307240bf123ace09243950342e9d71ededd9 17df90f67dd51623e8a5715b344ccd8740c8fc415af092469f801b99caacb70d
-lib/codeql/rust/elements/internal/generated/Abi.qll f5a22afe5596c261b4409395056ce3227b25d67602d51d0b72734d870f614df3 06d1c242ccd31f1cc90212823077e1a7a9e93cd3771a14ebe2f0659c979f3dd1
+lib/codeql/rust/elements/internal/generated/Abi.qll 43ccb654c5cb29c850607ac338c0a289284174825c2a1b6e52fafe8e227ec3b2 72c40ceef8dffe8b7328d0400d367bd757ede03771b901bb46c771e5a5530e1e
 lib/codeql/rust/elements/internal/generated/Addressable.qll 624c380d385af6563885417d1e8ecd5d9b7abf1435c0ab79a1b9a405387874a3 e2755dc2155d6f2bc0e2d54006da0e62ee359440592db9d6a8b73202ef28e64f
-lib/codeql/rust/elements/internal/generated/ArgList.qll e41f48258082876a8ceac9107209d94fdd00a62d2e4c632987a01a8394c4aff6 bf1982d14f8cd55fa0c3da2c6aab56fc73b15a3572ffc72d9a94f2c860f8f3b7
-lib/codeql/rust/elements/internal/generated/ArrayExpr.qll 73806a0de8168b38a9436fa6b8c6d68c92eeab3d64a1ae7edfff82f871929992 7ad998cdd8f4fed226473517ad7a5765cb35608033047aad53bf8aa3969fd03b
-lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll 67a7b0fae04b11cf771727ff39a123fb2d5ce6e2d650d32478fcb33a26ed5688 15833405fa85f6abe0e5146dac283cb5a142a07f08300ccc15a1dae30ed88942
+lib/codeql/rust/elements/internal/generated/AnyAttr.qll a5f4fdb031b994cda17b155dab60ce107780c196e5b3b61893d37de1115e3abc 7e92bd44103a65ca5b4d1c8f6f5c8b99d30e4cf97bd166a79eec7d99b7dfe287
+lib/codeql/rust/elements/internal/generated/ArgList.qll 7e2b7dbccc506fb5df7b85885ce1c9cadfc98d98cd8c291d84bd3a0d67fdd577 a8fe85d1bfeb9786fc6179b6cc7f783168162f1ae6aa100db9cfd210af43b043
+lib/codeql/rust/elements/internal/generated/ArrayExpr.qll c74800cd41389e20565b45eb44b2b9cd95942134ccd3a871c0cdb2e96d1c66c0 4070716f48f299365ae9396c2eda7819f42cfcb9741f3a68dfe520d8eb3267bf
+lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll f53d90ef09422ba858ede6b19bb0010bd729f418627b33185ab03672f5e62184 49ae24d9fa473753d525aa3d86fe87a8b5b55117ffb684b027516527e0709d05
 lib/codeql/rust/elements/internal/generated/ArrayListExpr.qll f325163c2bd401286305330482bee20d060cecd24afa9e49deab7ba7e72ca056 ae3f5b303e31fc6c48b38172304ee8dcf3af2b2ba693767824ea8a944b6be0eb
 lib/codeql/rust/elements/internal/generated/ArrayRepeatExpr.qll ac2035488d5b9328f01ce2dd5bd7598e3af1cbb383ddb48b648e1e8908ea82fc 3ec910b184115fb3750692287e8039560e20bd6a5fb26ac1f9c346424d8eaa48
-lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll d1db33bc2c13e5bc6faa9c7009c50b336296b10ed69723499db2680ff105604d e581ca7f2e5089e272c4ef99630daac2511440314a71267ff3e66f857f13ee69
-lib/codeql/rust/elements/internal/generated/AsmClobberAbi.qll 579cabafcf0387a9270112ffa53c0b542c1bfbbebfe5c916ac2e6a9b2453539a 8048f5d8759425c55dc46d8fe502687edc29209e290094e9bcd24ff943c8d801
-lib/codeql/rust/elements/internal/generated/AsmConst.qll 26c96fc41f2b517b7756fd602c8b0cd4849c7090013fb3f8a5e290e5eabe80cc f0f1bf3e8ae7e20e1c2ab638428190c58ee242a7d15c480ed9c5f789ce42c9cb
-lib/codeql/rust/elements/internal/generated/AsmDirSpec.qll 4064e9c98aeebfebf29d013f6280f44548996d6f185b19bf96b1b23384c976b9 2bb0b99d20c0fdd6d54d4a1947a02372b6e4b197fb887ad058290ae97f015953
-lib/codeql/rust/elements/internal/generated/AsmExpr.qll afabf734bf93040451cb22d22f71ab9b2abb176bd6e0d862f5cc67d687f84e4c 7e35b3bc93b5e6f6b7259f3261234421eb5778a47192bc0f5e54d062d3bc8dde
-lib/codeql/rust/elements/internal/generated/AsmLabel.qll 3e97e64f0682709f05464218e0182f64537e08079b0f276738c83eae92c22d25 3ce70364762bc8c0eeb13940406a0613a815a0ae68b24f7e3a1a649a6fe05c89
+lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll 9bd3ead45e102631eb77f7597667833a92eeb18d89254e0be62d7050ecbf24a3 9381025db82c59a8af6bc1c804cd45380f955f6c49004d1dbf67c579e25b40eb
+lib/codeql/rust/elements/internal/generated/AsmClobberAbi.qll ef0cfc30109a687f48c10d6519dbdd493e403bd65ac708bf493fb4923fd177d7 d671faeb3dbc31ce29d108146758564ccb67ac0db59995417e84431cf5470071
+lib/codeql/rust/elements/internal/generated/AsmConst.qll 56d180e14aa90537b0a0a9c22bc684c23b9e30bebdc955979419655f9c61dd1d 1d7f4387f0282651af1e2ee789395d56d1074328f496db91e5b747f5aef9413d
+lib/codeql/rust/elements/internal/generated/AsmDirSpec.qll ca1cb42a0132433ce77b3b626cb6cd88bf4ecd3197fc3d310f37999123a4b870 8f07f2d7c51f33cf4bac9c751d89eb5c8a659d9ebac3056b119559e0eebc00f3
+lib/codeql/rust/elements/internal/generated/AsmExpr.qll aa0ef950e9b7a2a4508d8f8d9c64475adc0c459c2eb288867fe86f1b9681b36f ad3438f398e6f34b2b2f79666a80ab38542ae24c5356cf18d9804061b24c034d
+lib/codeql/rust/elements/internal/generated/AsmLabel.qll 0af8151c20ab3eaefdfdad15a3d67067d8852de1c2430d7c7063a33962df7de8 990b1bb7f561e8375d58e108177b696adb8c4a3e19d0568c78137d9197e86383
 lib/codeql/rust/elements/internal/generated/AsmOperand.qll a18ddb65ba0de6b61fb73e6a39398a127ccd4180b12fea43398e1e8f3e829ecd 22d2162566bcf18e8bb39eac9c1de0ae563013767ef5efebff6d844cb4038cae
-lib/codeql/rust/elements/internal/generated/AsmOperandExpr.qll 6ec1db45e8523331d516263476bbda1006251ce137c2cd324d9b6c6fabf358df b6278d4e605fb5422ab1e563649da793bacf28cd587328f9cc36ca57799510d0
-lib/codeql/rust/elements/internal/generated/AsmOperandNamed.qll 61c48af0a277b011cb46ad9e9f3255ae22c943a11aafc8c591cac6444ed3e6d1 448afb29e6582339229f092ff2de6b953c09c10f2353a1f8eb54e5dfa639881f
-lib/codeql/rust/elements/internal/generated/AsmOption.qll 9aa5df0f677363111b395b3fb09a0882d61c38f97ba811713490f52c851fa8db d863469f626c6e9a6a69faee4216226dd13c62fbf76ba93717d7d12fd95e0c9f
-lib/codeql/rust/elements/internal/generated/AsmOptionsList.qll 998234952d4052b1864014456e6db7e775b8016b44d67608b2cbba9a730453de 8fb7cf5343fb317d8cbe6f3ebb22d80749a1131b28a89d189ecb8f99321ed5f0
+lib/codeql/rust/elements/internal/generated/AsmOperandExpr.qll 40c8ff956a00c374d3023f064f96dee98d2e740e220196d9768c1fce240d0f1e a0bf7b4d6920285d2e1e46ae525ba5da4902d7817b49c261daf7ad0067b975ed
+lib/codeql/rust/elements/internal/generated/AsmOperandNamed.qll 8667bbeff23275df0fce082eca3fac49600cee2c927dc3675e62df97f6d43ee8 4efc1f21dbff76b85500b32db0ca55247038734e655d7c0caa2947fb21f77f99
+lib/codeql/rust/elements/internal/generated/AsmOption.qll 0ae798dca45107d488e2feede94e3ef5f5da596bcc358608e815e7addbf282e6 8e987e2f5027d0c1be8148694413610cd8b8b7622f6d55db8dbb162a46c22f73
+lib/codeql/rust/elements/internal/generated/AsmOptionsList.qll dd3ed13fd792d32eb94556dea759b59e506e7b5bfd10d4036d5b9708765b35c8 15c8e65f2109db233a03589f7b5e3f1ae8a66637b21b77bb9840784dfccdd2b2
 lib/codeql/rust/elements/internal/generated/AsmPiece.qll 17f425727781cdda3a2ec59e20a70e7eb14c75298298e7a014316593fb18f1f9 67656da151f466288d5e7f6cd7723ccb4660df81a9414398c00f7a7c97a19163
-lib/codeql/rust/elements/internal/generated/AsmRegOperand.qll e1412c7a9135669cb3e07f82dcf2bebc2ea28958d9ffb9520ae48d299344997c d81f18570703c9eb300241bd1900b7969d12d71cec0a3ce55c33f7d586600c24
-lib/codeql/rust/elements/internal/generated/AsmRegSpec.qll 73a24744f62dd6dfa28a0978087828f009fb0619762798f5e0965003fff1e8ec fdb8fd2f89b64086a2ca873c683c02a68d088bb01007d534617d0b7f67fde2cb
-lib/codeql/rust/elements/internal/generated/AsmSym.qll 476ee9ad15db015c43633072175bca3822af30c379ee10eb8ffc091c88d573f6 9f24baf36506eb959e9077dc5ba1cddbc4d93e3d8cba6e357dff5f9780d1e492
+lib/codeql/rust/elements/internal/generated/AsmRegOperand.qll d6c77d79c86ca7cb02725c41d06f55e2cd982643bd09790c6ad66a8c93432147 588a5ae9257150a006246476acedaa0d8fabe7008c49d296e64bd4b36a85bb00
+lib/codeql/rust/elements/internal/generated/AsmRegSpec.qll 2f0c45f6c3776ca6fdb46350759a39340efcdb97eb5a2b31073022677a0dbffa d80d44f6a06d328335e0b30abf32dafbb91be1ddf239f2a8444c2111341c14af
+lib/codeql/rust/elements/internal/generated/AsmSym.qll 2fa14d2445051e271c2a5806408c3d558219e86e18aeba6163fce538e10d78a9 863e3a0755c6baa565abde23db06efa0293f1ce7c871bb3e58a9cb282730816a
 lib/codeql/rust/elements/internal/generated/AssocItem.qll 188fd2aaaef11cc926cf202adc64f294988fe2b3ec768d586d260c23877bbe21 58332ddaeff27fa80ce329d3964f4cc05f2cc807eb2a7a4cd6c26e90442e7f3a
-lib/codeql/rust/elements/internal/generated/AssocItemList.qll 52900dcf32ef749a3bd285b4a01ff337df3c52255fe2698c9c1547c40652f3b9 10709dd626a527c37186b02c4ea738a9edb6c9e97b87370de206d3eb9941575b
-lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll a93a42278263bb0c9692aca507108e25f99292aef2a9822501b31489c4ce620d afd9559e0c799988ef7ff1957a5a9ebc4fb92c6e960cbe7fecf12a0a484fef08
+lib/codeql/rust/elements/internal/generated/AssocItemList.qll 8dbe7ec0446546f92128d82a4445e412408436aefcfefcb080661f297d1d5d44 2e71d3d9b8947aad1a21e8c4662c7a3933dbb87e24d15dfb3df919906648da4d
+lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll 0f5bd621dda4c3869f05df713b3c4f64a257ccf0b95f8bd61506ec9922cfb2f7 0661102323b0200ea310a38fd86b9dd32b67b3f48b9a248e0f5bd0b9dfb05513
 lib/codeql/rust/elements/internal/generated/AstNode.qll 1cbfae6a732a1de54b56669ee69d875b0e1d15e58d9aa621df9337c59db5619d 37e16a0c70ae69c5dc1b6df241b9acca96a6326d6cca15456699c44a81c93666
-lib/codeql/rust/elements/internal/generated/Attr.qll 3f306e301c79f58018f1d5f39b4232760ebba7cad7208b78ffcf77e962041459 865a985c0af86b3463440975216b863256d9bf5960e664dd9c0fe2e602b4828b
-lib/codeql/rust/elements/internal/generated/AwaitExpr.qll 1d71af702a1f397fb231fae3e0642b3deeba0cd5a43c1d8fabdff29cac979340 e0bfa007bdecc5a09a266d449d723ae35f5a24fbdfc11e4e48aeea3ec0c5147c
-lib/codeql/rust/elements/internal/generated/BecomeExpr.qll 7a211b785a4a2f961242d1d73fd031d381aad809f7b600ce7f7f864518bb7242 17a0388680007871748cfdc6621f700a7c2817b9601e1bd817fb48561e7c63ad
-lib/codeql/rust/elements/internal/generated/BinaryExpr.qll 64e9bd9c571edd6e5f3e7662b956b1d87fa0354ce6fe95da9caf25ac16b66c68 3fca09fdbe879db2ca3293618896a462e96376a2963d15cce3d5b1baac552fcb
-lib/codeql/rust/elements/internal/generated/BlockExpr.qll 5a5ddbe34bc478a7bd9b0d07d3b6f017c2d1f20581d859251a963314e6514d1f 9804c30b8b279038b864c52557535f854bd012bacdfe8e5840f1f777c74e52df
+lib/codeql/rust/elements/internal/generated/Attr.qll 9f2984187eb8a52a3012cfac6ed2d22f428eaaeced591972d1c7657550cc10da 4e0227cba4875c4aead5098076ab7b78c4b8cbc185285967d9568fd9984326b4
+lib/codeql/rust/elements/internal/generated/AwaitExpr.qll 33387ef5cafb5086b29b3b262a92525d6b934fc2c3d256b301862c478bb4526a 223da72521668522496838cb47d345eb24a3e822d335b1389783935010517056
+lib/codeql/rust/elements/internal/generated/BecomeExpr.qll 90dacf4743b4251cb860231e0a85a1c2b555c5613448ac8acb1efdcc3d1cd0c8 6fc4d5a09128fa3066ec3fec7d33fb51dddce2153cd6e0aba5275f476cd72b17
+lib/codeql/rust/elements/internal/generated/BinaryExpr.qll c82c2fbbf2c8ccaf3ecb32d20d350dc9bbcab075b2e8736c9e9b2aa4f0ec7b49 08a2b366fc5862c14795784d0bba82cea30d4d2487c34f860dbe278c9dc45afb
+lib/codeql/rust/elements/internal/generated/BlockExpr.qll a12f24b72b18c04c445d21d47f8c99a8fbcda5678b77c7915635e5976886350c 82eaaf157672d0a712b03698e18ec7bf4e2573b5599f3dbb18c7c945399f3f54
 lib/codeql/rust/elements/internal/generated/BoxPat.qll 597bed52f7489e0addce3266f7bee5be7c53d2d1263eceec3a252d041ca0908f b8ccf363ca5f1a988547caf1fd266a55aec7cbf8623578deea99765d264b0151
-lib/codeql/rust/elements/internal/generated/BreakExpr.qll 0f428a8b2f4209b134c2ffc3e1c93c30bc6b0e9c9172f140cefa88c1f77d8690 957b39f38ff6befe9061f55bc0b403c2f1c366dd0cf63b874bae6f8216576d76
-lib/codeql/rust/elements/internal/generated/CallExpr.qll 6096035ba2ef1ce3e6254d5b8497dcb6cd7570253423c778a9dd7e158f928644 e56caf9ba094ddfc4952ed5072c5f6f139db8029fa6bd6328d1a118e96a1d5fe
-lib/codeql/rust/elements/internal/generated/Callable.qll 12368b998c771c6b80f54123cea4d3600af7432ab34c9e571bc0bf3894ceb17e 273a9fd9cdae56cf2edbdc9c49b15da49cd5ad04be70acbbe2475c9c50200183
-lib/codeql/rust/elements/internal/generated/CastExpr.qll ddc20054b0b339ad4d40298f3461490d25d00af87c876da5ffbc6a11c0832295 f4247307afcd74d80e926f29f8c57e78c50800984483e6b6003a44681e4a71f3
+lib/codeql/rust/elements/internal/generated/BreakExpr.qll c5bcbba71dee9c5210928999fe15c27ba99498c6bde62b1a3a529df131dfd57e da73aaeb27fe48137ae271156c122db05df1ed42f56f5e3f14d478598370337a
+lib/codeql/rust/elements/internal/generated/CallExpr.qll 65c74ff4a17fded2431eed80f05f593d34fd63c96450df1c98e5cc6f23c3fd06 fd6f9e5a607d454349adfcd5639fc7f8164b9eda968126e3857393cb2bcbba50
+lib/codeql/rust/elements/internal/generated/Callable.qll 02a4cfbf9d53a21504d612981fe786ad65861027554dd998a2bbc890cfacc788 d80a4cf8967e0008d72a813de6cf9c75ad4adb590df671e7c769a35be3c4ebb0
+lib/codeql/rust/elements/internal/generated/CastExpr.qll 047eac7fb489df68543001618231747f8b9e6a51d6c9c856ad8eeadf330b83af e6fa71e63e4211fdf393958627c3a327adce516019ddc991ce50a6c882d320c5
+lib/codeql/rust/elements/internal/generated/CfgAtom.qll 1b7672e06fe19c7ba484937c3101ff7f5a48fc19e8fff2cb5ecbffc6fce612bc 6dacd084ed0110cc477881fd0f709c6c996ec8a038549bf885a0abb21261bb1d
+lib/codeql/rust/elements/internal/generated/CfgAttrMeta.qll 4531aaa627f4d44787970f18dfe30b957f51d83ab2396bac436563c40d144ca9 1731ecd335431b0a2ec70403dc1ad7bce1f8e171a4d6b575d340f1d683fa6c92
+lib/codeql/rust/elements/internal/generated/CfgComposite.qll 4f30fa0495381774cd7993a38e1fbe94dff63a5742e8b836bbc35987b746df1a 595ff31b5990845085bbb963ba408dd1246aed1952bee2836ad9d92a1da6e4c7
+lib/codeql/rust/elements/internal/generated/CfgMeta.qll 7fd8ee49428da70ba1e52bf9017bbe30b690443c26147c77aa9bcffd7d09338d ec4d34dbd1e7ca412ce3d242f1bd6695a5fe9f263d5bc68ce12610facedf3e93
+lib/codeql/rust/elements/internal/generated/CfgPredExpr.qll 316ec9ce880a35b3887ebdcedd1ecd9570832b1fb16ae05877fe3d39c8f84d3f 3c5beddb8e7ecc600bb35fe8718b26ed7d6b49067f650dcbe273b2fcf4d34af6
+lib/codeql/rust/elements/internal/generated/CfgPredPat.qll 39f2520f785798428c2c72089dee08e41d26c1db1107f85727bdd77893a59be1 719f0a2f44818f2b44e18a5bba35375d4ad6ce8db920362bcb451196bd74f418
+lib/codeql/rust/elements/internal/generated/CfgPredicate.qll 736fe7385e2af5bb86c349bb1b8dd030aef191541f6af24694e3c460b8272f61 4117ee073683eb5fb81bae9e7e49b4ad0991cfcb53e0b7b4160199931a300632
 lib/codeql/rust/elements/internal/generated/ClosureExpr.qll 818aff75d86821c670d8ba0720c3270681b3e070140a9c41beab2a811b43eee6 9bf2d1d38f6c4a99d7c058f8ed096141f5ba6a75d2d26a464f0d65ed4e554222
-lib/codeql/rust/elements/internal/generated/Comment.qll cd1ef861e3803618f9f78a4ac00516d50ecfecdca1c1d14304dc5327cbe07a3b 8b67345aeb15beb5895212228761ea3496297846c93fd2127b417406ae87c201
-lib/codeql/rust/elements/internal/generated/Const.qll 3e606f0198b6461a94964dba7a4d386408f01651d75378eeab251dfceccf49c8 20fe276cded4764bdb1cd50de956bea88d7cd731909c0b84b4abb972b3094959
-lib/codeql/rust/elements/internal/generated/ConstArg.qll c52bf746f2dc89b8d71b8419736707bfcbb09cca424c3ba76e888e2add415bf6 89309a9df4fde23cfd3d8492908ccec4d90cc8457d35c507ef81371a369941b4
-lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll 7526d83ee9565d74776f42db58b1a2efff6fb324cfc7137f51f2206fee815d79 0ab3c22908ff790e7092e576a5df3837db33c32a7922a513a0f5e495729c1ac5
-lib/codeql/rust/elements/internal/generated/ConstParam.qll 2e24198f636e4932c79f28c324f395ae5f61f713795ed4543e920913898e2815 5abe6d3df395c679c28a7720479bad455c53bc5ade9133f1ff113ea54dc66c11
-lib/codeql/rust/elements/internal/generated/ContinueExpr.qll e2010feb14fb6edeb83a991d9357e50edb770172ddfde2e8670b0d3e68169f28 48d09d661e1443002f6d22b8710e22c9c36d9daa9cde09c6366a61e960d717cb
+lib/codeql/rust/elements/internal/generated/Comment.qll 9e306a2947185ca15946a3d43dea09d10000b3ba8b28b4691a4b4be6697b7a53 c3df90920fcb595afe5c6e6b614ed0cc61c7679d9785ff17aa0db7cdaedc1115
+lib/codeql/rust/elements/internal/generated/Const.qll 3672acd4e96c74c0f863c1d45fd0080342aa630ca48e4d47b625491764d17356 453539b270befbaa60f607b40a982155c0e0e34c93dad125f89ee8fbf2fe2d9f
+lib/codeql/rust/elements/internal/generated/ConstArg.qll acee83548e8e4203603fbf4fab8a4c309109a41b91e79e52577eb6dae0765b89 8d2291de34ec278dadde7daaa309d599a3db6ec6d9e9b71b467b47d13598e51b
+lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll abdbab1c9fda654548708ec38deb79e6d5b4abc448be0533b114b670ce8c4e16 d04845ebacc2bafc1d70ddbab5f72293038064340c75b7449e26b340ad8010f5
+lib/codeql/rust/elements/internal/generated/ConstParam.qll 1517f721791072dfd4cc9b42b58c1c80089390dbde1791e8b17879dd7a34a3bd 1e0e6f10d06f3c81b390b0ca9090550ba82793bb2c02b3463ac3c368a4d4791d
+lib/codeql/rust/elements/internal/generated/ContinueExpr.qll cea8a3058b79561d5bdbe1c9ea089623bdb822313590b0e8a664742c98d6d5f1 dcd0c25efe63d3b24ae70105c2b3133ff5c1ec00314c513e56fef940385f5934
 lib/codeql/rust/elements/internal/generated/Crate.qll 37f3760d7c0c1c3ca809d07daf7215a8eae6053eda05e88ed7db6e07f4db0781 649a3d7cd7ee99f95f8a4d3d3c41ea2fa848ce7d8415ccbac62977dfc9a49d35
-lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll b2e0e728b6708923b862d9d8d6104d13f572da17e393ec1485b8465e4bfdc206 4a87ea9669c55c4905ce4e781b680f674989591b0cb56af1e9fa1058c13300b3
+lib/codeql/rust/elements/internal/generated/DerefPat.qll cdae06ddb54d7f6962c150d08b5617c502ccd18b39e5024ec590db5c09ffca65 8a1e215232bd73c98f9bc4f95677aa4d0e165512ee9b9b3ca608456ef42011ae
+lib/codeql/rust/elements/internal/generated/DocComment.qll 6fa6168f0240c38d887111a35d633155f158828597193659dc942f5174d3cd43 ed127dbe884fd1d58bf3bba3447c617ca84ceb7b515e0f7c9f91dd2bd75d9685
+lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll dd708e6bdbc01c427a9465750d8c12d99d68828b5cc8193b2f1e7ae9d8307f32 b198c2069ae80ce57d5c1e479ba47b511ced2d21e00e7ec05d4c76c83766e454
 lib/codeql/rust/elements/internal/generated/Element.qll d56d22c060fa929464f837b1e16475a4a2a2e42d68235a014f7369bcb48431db 0e48426ca72179f675ac29aa49bbaadb8b1d27b08ad5cbc72ec5a005c291848e
 lib/codeql/rust/elements/internal/generated/Enum.qll 3ed69005ab7cf68745a67cc9891bd68a83f6ab927febf077de9e4092cb373b0b 604fd03d1c46884b3c93e5bff3951ec41593320e1f7382c1a7143a64063827bc
 lib/codeql/rust/elements/internal/generated/Expr.qll 5fa34f2ed21829a1509417440dae42d416234ff43433002974328e7aabb8f30f 46f3972c7413b7db28a3ea8acb5a50a74b6dd9b658e8725f6953a8829ac912f8
-lib/codeql/rust/elements/internal/generated/ExprStmt.qll d1112230015fbeb216b43407a268dc2ccd0f9e0836ab2dca4800c51b38fa1d7d 4a80562dcc55efa5e72c6c3b1d6747ab44fe494e76faff2b8f6e9f10a4b08b5b
-lib/codeql/rust/elements/internal/generated/ExternBlock.qll e7faac92297a53ac6e0420eec36255a54f360eeb962bf663a00da709407832dd 5ff32c54ec7097d43cc3311492090b9b90f411eead3bc849f258858f29405e81
-lib/codeql/rust/elements/internal/generated/ExternCrate.qll f1a64a1c2f5b07b1186c6259374251d289e59e2d274e95a2ecff7c70e7cbe799 fd9b5b61d49121f54dd739f87efaea1a37c5f438c8e98290b1227223808e24c5
+lib/codeql/rust/elements/internal/generated/ExprStmt.qll a389b43ecb47855f89c6ddce3aaf0f789342c3c79610fe44840053b86ddfd33c 96647d1faec5e9dc57994644f178e9e8834de4a22fc1074a6e19a396bc875ff6
+lib/codeql/rust/elements/internal/generated/ExternBlock.qll 54b0b24cc1f98854c52799f8c112fde2adfbeb290dbfb9b35ba6ec9df44ee968 3aca30b492caf5fe8b6355151aad28c2bfc648c62fbf72e800f4f3709384fadc
+lib/codeql/rust/elements/internal/generated/ExternCrate.qll 8841aedf9935f85cd3123230222eb0be6d3d4c9053920d746c07359d919116ee 2fd5a69c63df32861968f358afb8618c64d148316480f795d5f73684fd8817b9
 lib/codeql/rust/elements/internal/generated/ExternItem.qll 08c02dbc8a96df25725ccec69ef5e19089ae03faea2efb86be892077ea1bc8ab 8afe7b6a87445dde4ce2c790ad05c2ccf771996d10625e6fc100113f219e8e32
-lib/codeql/rust/elements/internal/generated/ExternItemList.qll cb3ec330f70b760393af8ca60929ad5cca2f3863f7655d3f144719ab55184f33 e6829b21b275c7c59f27056501fee7a2d3462ed6a6682d9b37d3c0f0f11d16b8
+lib/codeql/rust/elements/internal/generated/ExternItemList.qll 8e6814e3789d36d7832c9f5b75ba56ede234ac9f86646d8e9c9776fcfa38031b e07e2ed3cef725af0b55fd1d051836d1a3334dca76e60c8e828c0802c8b81df0
 lib/codeql/rust/elements/internal/generated/ExtractorStep.qll 61cd504a1aab98b1c977ee8cff661258351d11ca1fec77038c0a17d359f5810e 5e57b50f3e8e3114a55159fb11a524c6944363f5f8a380abccc8b220dedc70ca
-lib/codeql/rust/elements/internal/generated/FieldExpr.qll d6077fcc563702bb8d626d2fda60df171023636f98b4a345345e131da1a03dfc 03f9eb65abfab778e6d2c7090c08fe75c38c967302f5a9fa96ab0c24e954929d
+lib/codeql/rust/elements/internal/generated/FieldExpr.qll ea8df03984b989aad74f432d2240ead980d531398ea0b793bc230ad2f3590b6a 0af68d588849b62aa51f4bdacedf6fe3e528b24a91bfb893210ded8b5846b811
 lib/codeql/rust/elements/internal/generated/FieldList.qll 35bb72a673c02afafc1f6128aeb26853d3a1cdbaea246332affa17a023ece70e b7012dd214788de9248e9ab6eea1a896329d5731fa0b39e23df1b39df2b7eb9c
-lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll f218fa57a01ecc39b58fa15893d6499c15ff8ab8fd9f4ed3078f0ca8b3f15c7e 2d1a7325cf2bd0174ce6fc15e0cbe39c7c1d8b40db5f91e5329acb339a1ad1e8
+lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll e9b45cf0e1ed7cc31b6dc56e171d33a0986a0753397e4eb7a3540f91831247a2 ec5607555ba1feb16e3f0ef4c4bbe67d14cb5eb4cd0c83d5aaf6a88de4008b60
 lib/codeql/rust/elements/internal/generated/ForBinder.qll 7be6b8e3934db8cd4ac326625cf637dda4b175fd7573a52d2feb147769c4c6a1 234484b9b4cf3a20c97334417700db5029da65313410b3c9e929512c509e5c27
-lib/codeql/rust/elements/internal/generated/ForExpr.qll 7c497d2c612fd175069037d6d7ff9339e8aec63259757bb56269e9ca8b0114ea dc48c0ad3945868d6bd5e41ca34a41f8ee74d8ba0adc62b440256f59c7f21096
-lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll 7daa3b938592b590d604203e7d0fc5c34c2bffe6adcceee5a5e0c681ed16214c f1380179cbdc188ad133c946d9e17e85aed0d77771b319f663d8eada0f7cf17d
+lib/codeql/rust/elements/internal/generated/ForExpr.qll c233389730f4f46dfedd2f80f57bfcda7f0d14176e85bcdf7528de4fc0404f99 7ff0415873cdaa1ce925ecbc152824916101b047246af3d9caa1d95039e0e8ee
+lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll 8d960834b5fb55f50f6259d565961e8604f4298ff7a69120ceb9a21257ba629c f93c3477bffe1c648bb1d2c126f608fe8eee41abe7a306a7b6f16957d280b1c9
 lib/codeql/rust/elements/internal/generated/Format.qll 934351f8a8ffd914cc3fd88aca8e81bf646236fe34d15e0df7aeeb0b942b203f da9f146e6f52bafd67dcfd3b916692cf8f66031e0b1d5d17fc8dda5eefb99ca0
-lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll c762a4af8609472e285dd1b1aec8251421aec49f8d0e5ce9df2cc5e2722326f8 c8c226b94b32447634b445c62bd9af7e11b93a706f8fa35d2de4fda3ce951926
-lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll 8aed8715a27d3af3de56ded4610c6792a25216b1544eb7e57c8b0b37c14bd9c1 590a2b0063d2ecd00bbbd1ce29603c8fd69972e34e6daddf309c915ce4ec1375
+lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll 24a0c1e6b1d51cf25c9c04bea2d3692978c6accdba1c9b990edf3804d382d784 3e309db56048786599debc41f97a0fa8436ae44abe8498b2218438cf9eafef47
+lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll baa40c000c2f982da7ed998b81d96e22de477647ea90ded2d278385f5601effb eb91a90418eebd53421c12d8a9c61235c0655ec7157d064bf677a8f6e38d79b1
 lib/codeql/rust/elements/internal/generated/FormatArgument.qll cd05153276e63e689c95d5537fbc7d892615f62e110323759ef02e23a7587407 be2a4531b498f01625effa4c631d51ee8857698b00cfb829074120a0f2696d57
 lib/codeql/rust/elements/internal/generated/FormatTemplateVariableAccess.qll a6175214fad445df9234b3ee9bf5147da75baf82473fb8d384b455e3add0dac1 a928db0ff126b2e54a18f5c488232abd1bd6c5eda24591d3c3bb80c6ee71c770
 lib/codeql/rust/elements/internal/generated/Function.qll 25aa44c816233b9259b4ca12a15b6aff5856f4147d6a72fd0ec2fdebb24a5131 62a8a9080bf555950a854f84444d79cbe72d69b1d3f73ac801bb11e732fc7e46
@@ -508,289 +570,312 @@ lib/codeql/rust/elements/internal/generated/GenericArg.qll 908dadf36a631bc9f4423
 lib/codeql/rust/elements/internal/generated/GenericArgList.qll b8cd936bba6f28344e28c98acf38acb8ef43af6ecf8367d79ed487e5b9da17cb 8b14331261e49d004807285b02fca190aafd62bfb9378b05c7d9c1e95525fe7b
 lib/codeql/rust/elements/internal/generated/GenericParam.qll 85ac027a42b3300febc9f7ede1098d3ffae7bac571cba6391bc00f9061780324 806cb9d1b0e93442bef180e362c4abc055ab31867ff34bac734b89d32bd82aa1
 lib/codeql/rust/elements/internal/generated/GenericParamList.qll b18fa5fd435d94857c9863bbcc40571af0b1efba1b31ba9159c95568f5c58fce 6e70f1e9a1823d28d60e0e753ac8fbbe8deb10c94365f893b0c8f8ea4061b460
-lib/codeql/rust/elements/internal/generated/IdentPat.qll 1fe5061759848fdc9588b27606efb1187ce9c13d12ad0a2a19666d250dd62db3 87dbc8b88c31079076a896b48e0c483a600d7d11c1c4bf266581bdfc9c93ae98
-lib/codeql/rust/elements/internal/generated/IfExpr.qll 413dd7a20c6b98c0d2ad2e5b50981c14bf96c1a719ace3e341d78926219a5af7 c9a2d44e3baa6a265a29a683ca3c1683352457987c92f599c5771b4f3b4bafff
-lib/codeql/rust/elements/internal/generated/Impl.qll bdc3da08b23ab098e92927a57c2e99eeb78ea8561cf11accc51db3033492b500 4b45be6b0c51f03999619705104574d78c262ed2497921f2ca8696844b17addc
+lib/codeql/rust/elements/internal/generated/IdentPat.qll fe54beb3fcc87ec1842a7dd9155383bc727e37564b367d750a70cc1e43591bee 05e5daa38fdd131d76fc4ca028b5dcfd28581649333381bd902615342e034c8b
+lib/codeql/rust/elements/internal/generated/IfExpr.qll c4a956006c5918eb7bf27d141e5a579b4d215c81eb8a19cf01d28f80a750f4cd 76a2e0f0b53787c148030a9a7a21ffae45be1443cc05e6bedaac5ca8b66fa7cb
+lib/codeql/rust/elements/internal/generated/Impl.qll 5c7fa64799818d08e29498adde1bcbb9a79a9f62ff75b69df5fb429d504c7141 a289f2e9de212957cd9fff00c5083bf19cb05a7af0d8a43bfb88580e17bc8f05
+lib/codeql/rust/elements/internal/generated/ImplRestriction.qll d74591e8fa8d164207270766c2d7cbc3ecee42cf69ac9401bc6343a038ad9429 eb6fb67bd66d3a04f483b9291ae8a876ff71b627b127f44bdac40ab3008eeabc
 lib/codeql/rust/elements/internal/generated/ImplTraitTypeRepr.qll e376a2e34ba51df403d42b02afe25140543e3e53aaf04b9ea118eb575acb4644 dc3a7e3eac758423c90a9803cc40dfdf53818bd62ee894982cd636f6b1596dfc
-lib/codeql/rust/elements/internal/generated/IndexExpr.qll cf951fc40f6690e966b4dc78fa9a6221aa5c6cade44759dcb52254f799292d11 1572e71918cc4e0b7e028331b6d98c9db23100a3646cd3874d1915e06ab6211d
+lib/codeql/rust/elements/internal/generated/IncludeBytesExpr.qll 9a047dabc395b00509b457dc86a0029f10272a1ce3a6b2194a7391ca7beba0fd ca929e0686255d4e860fb80c33e5ba580e0083e61b12ed3819394dff14d6b46c
+lib/codeql/rust/elements/internal/generated/IndexExpr.qll 717c7fdd3965e9ae3c97fd2950a2e74a475e1b6ec27aa2f3c31cffe085e897c9 a722686016736f008207940e5206dc041cc270ef6d47144578abbf9d2836e60b
 lib/codeql/rust/elements/internal/generated/InferTypeRepr.qll 4f101c1cb1278e919f9195cac4aa0c768e304c1881394b500874e7627e62d6c4 dca3f85d0a78ecc8bf030b4324f0d219ffff60784a2ecf565a4257e888dea0ff
 lib/codeql/rust/elements/internal/generated/Item.qll 03077c9d2f3200ebbc5df5d31f7d9b78a3ae25957ac46899a19a93684b2d7306 6492e341b9d9270c0181da0a5330f588238ced81657041ad1ad343db2bdf210b
-lib/codeql/rust/elements/internal/generated/ItemList.qll 1571a3ab0f2c7c0d8384549f8eac7f6e6863c42f3ec5d5ea5e01fc26b9f1056f 7b2cade995505f214df9bb2d73143a28b2499f76d88abc56ae8fcc59bf709204
+lib/codeql/rust/elements/internal/generated/ItemList.qll 50ec7cf624f0b785d2a8ffbf4284f1ed4aa0eea6a8c462d58ad96a0e8f89f8d0 ba35994d3203d638407eb08c21481836380d90290a3c2b58cbcf4951682ca22b
+lib/codeql/rust/elements/internal/generated/KeyValueMeta.qll 6e1cd898cb80b7abfe3e64ce232b60aa0efc134722c4eb9150d4604e139557a9 d2da54005a3a266594b01cbbab85aa999d99f7a69cdd55627707bea2fbdf9f72
 lib/codeql/rust/elements/internal/generated/Label.qll 6630fe16e9d2de6c759ff2684f5b9950bc8566a1525c835c131ebb26f3eea63e 671143775e811fd88ec90961837a6c0ee4db96e54f42efd80c5ae2571661f108
 lib/codeql/rust/elements/internal/generated/LabelableExpr.qll 896fd165b438b60d7169e8f30fa2a94946490c4d284e1bbadfec4253b909ee6c 5c6b029ea0b22cf096df2b15fe6f9384ad3e65b50b253cae7f19a2e5ffb04a58
 lib/codeql/rust/elements/internal/generated/LetElse.qll 9e6f7057b8cb7d37b0ea79d540520028febe017ed8e9def95927ffa3fcdc1af4 3ee7d344d718898f25eb2a7a646d3c6704e8f1f22b83d0c0ea727cff74161946
-lib/codeql/rust/elements/internal/generated/LetExpr.qll 5983b8e1a528c9ad57932a54eb832d5bcf6307b15e1d423ffa2402e8a5d8afa4 8a6affdc42de32aa1bfc93002352227fc251540304765e53967bab6e4383f4ae
-lib/codeql/rust/elements/internal/generated/LetStmt.qll 21e0fadccc1e7523ef1c638fc3e2af47256791eff70d1be01a9c377659ee36ef 21ccb4821bdbde409f17ae96790e395546d6c20d2411fccf88bad6ef623a473e
+lib/codeql/rust/elements/internal/generated/LetExpr.qll 68f90572f7e188be82882d2036451de306d87aa171b0cc80eb3679efc3bcc932 360866bc8b38ab59ef4adc4876f2f7d972b4e4bc10bf93408af2e7c99f610063
+lib/codeql/rust/elements/internal/generated/LetStmt.qll 4adb65dbf4b930bc2404937152e6dce7dd2b456e9c9f000be1cee665c674cd11 71e4ab3172a330835e27dc3e4111ce13f69abc5f3558f01e6267134928b832b7
 lib/codeql/rust/elements/internal/generated/Lifetime.qll 2f07b2467c816098158ed5c74d2123245fe901d0d1cca3ff5c18d1c58af70f4e d0ba493bc337a53fd3e7486b1b3c9d36c5a0b217d9525fc0e206733b3ed3fa74
-lib/codeql/rust/elements/internal/generated/LifetimeArg.qll 9e2378391fb130513972176ee2aa033e9fd1a55f1d4253da2d646317e33fa0fb 8168f867666e8e2bba994c7a025cd101907a4e870dc374b93ec0e55bb1bd8b4e
-lib/codeql/rust/elements/internal/generated/LifetimeParam.qll 62ad874c198eac8ae96bceb3b28ad500f84464f66302c05f6a53af45f0816c82 386362c79b0641061655b3030ec04f6b80a4ef508e1628eea46a8836acada943
-lib/codeql/rust/elements/internal/generated/LiteralExpr.qll f3a564d0a3ed0d915f5ab48e12246777e4972ad987cd9deaafeb94cf407b2877 2337c3d5f60361bd10f6aeca301e88255f5dffb85301cf36cbbfa1a65bfad1cd
+lib/codeql/rust/elements/internal/generated/LifetimeArg.qll 479f82ecbc9a295afb047e4d52d53f816c455b8c526197adf99f4745d67d28e5 9548e850b7f3e14954d0d7139cf4f6913200b3dd74a210627a8512032eb9bf15
+lib/codeql/rust/elements/internal/generated/LifetimeParam.qll 89ee276680c54dd83e68f06e9dc4439b22b781052000c96273c23362f7a6f8e6 c1f4cd01ae225d406cae6df3f800fc7b04dd00802de9476f8e77721ac778932a
+lib/codeql/rust/elements/internal/generated/LiteralExpr.qll 94cc039b4f41e5e037bd24e849d3b550c8a0ff2022e88d5696c2f6c4a6b83caa 314b41fff5e243c99bff82d373cb3092f9175bd7451d2251a3b64a8d1f880279
 lib/codeql/rust/elements/internal/generated/LiteralPat.qll f36b09cf39330019c111eeaf7255ce3240178342d0ddaace59dbfee760aa4dbb d58667cf4aa0952450957f340696cb2fd22587206986c209234162c72bdb9d9a
 lib/codeql/rust/elements/internal/generated/Locatable.qll c897dc1bdd4dfcb6ded83a4a93332ca3d8f421bae02493ea2a0555023071775e b32d242f8c9480dc9b53c1e13a5cb8dcfce575b0373991c082c1db460a3e37b8
-lib/codeql/rust/elements/internal/generated/LoopExpr.qll db6bc87e795c9852426ec661fa2c2c54106805897408b43a67f5b82fb4657afd 1492866ccf8213469be85bbdbcae0142f4e2a39df305d4c0d664229ecd1ebdb9
+lib/codeql/rust/elements/internal/generated/LoopExpr.qll 99d0e55c574ea81ff2433bbbb37e0edc92b992fdb4662045139f9a8a294b2c85 41114f3992c453517d7a0dd0a7ada308d2e15e8f5e0f2da86ff5e7635f5844bc
 lib/codeql/rust/elements/internal/generated/LoopingExpr.qll 0792c38d84b8c68114da2bbdfef32ef803b696cb0fd06e10e101756d5c46976c 111fe961fad512722006323c3f2a075fddf59bd3eb5c7afc349835fcec8eb102
-lib/codeql/rust/elements/internal/generated/MacroCall.qll 1a7ee9c782ebc9ab0a807762aabebc9e0a7ef10c6eb945679737598630b20af2 782a437654cb316355c020e89d50b07c93ba7817715fa5d42a9e807cf12d1a43
-lib/codeql/rust/elements/internal/generated/MacroDef.qll 90393408d9e10ff6167789367c30f9bfe1d3e8ac3b83871c6cb30a8ae37eef47 f022d1df45bc9546cb9fd7059f20e16a3acfaae2053bbd10075fe467c96e2379
-lib/codeql/rust/elements/internal/generated/MacroExpr.qll 5a86ae36a28004ce5e7eb30addf763eef0f1c614466f4507a3935b0dab2c7ce3 11c15e8ebd36455ec9f6b7819134f6b22a15a3644678ca96b911ed0eb1181873
-lib/codeql/rust/elements/internal/generated/MacroItems.qll bf10b946e9addb8dd7cef032ebc4480492ab3f9625edbabe69f41dcb81d448fe f6788fe1022e1d699056111d47e0f815eb1fa2826c3b6a6b43c0216d82d3904b
-lib/codeql/rust/elements/internal/generated/MacroPat.qll 77af514f2e8b068f6428075bc6c759df5d52f0782f2fed90c3fa3e532871b4b6 27cda2ff01c0e7b8d27a5b3c4fc41947c3457a035833ad39e25913ba696c8ae0
-lib/codeql/rust/elements/internal/generated/MacroRules.qll 29d7f9a13a8d313d7a71055b2e831b30d879bdc1baa46815117621a477551dd7 9bd09859bfbbce3220266420b6d0d2cf067b3499c04752bff9fddc367da16275
-lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll e82e49cfcb5ee010e241b1d2ec9a13b1b741b545f392ceeab11b28d0925c7a84 cafd02b27d80fa734234341dedd63a6595b0408ec086fb3ba37a6b53fcce5b3e
-lib/codeql/rust/elements/internal/generated/MatchArm.qll f8c4c955c50f8398159c492d9d0a74f7b71e9510fcb8a3aab1d06e0f7e15b263 713939c7ef77ca73d95788096163c26213ab49f34ed41c6f4bc09a1ef9607b0d
-lib/codeql/rust/elements/internal/generated/MatchArmList.qll 12d969ecb267a749918e93beda6ad2e5e5198f1683c7611772a0734a2748b04b 9226ff7cadcab4dc69009f3deeda7320c3cee9f4c5b40d6439a2fe2a9b8e8617
-lib/codeql/rust/elements/internal/generated/MatchExpr.qll b686842e7000fd61e3a0598bf245fb4e18167b99eca9162fdfdff0b0963def22 00f1743b1b0f1a92c5a687f5260fda02d80cc5871694cad0d5e7d94bac7fe977
-lib/codeql/rust/elements/internal/generated/MatchGuard.qll 58fa1d6979ef22de2bd68574c7ffcf4a021d7543445f68834d879ff8cee3abcb 072f22a7929df3c0e764b2a770b4cdf03504b3053067d9b9008d6655fb5837e1
-lib/codeql/rust/elements/internal/generated/Meta.qll 15e98e8d38f5618b7053057a629b135aae5e105fbf72731833a644fb695244c0 2977b6a0781c89383e87c595b14a39851f27b2508296f3e77466eea44c916188
-lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll ffce98a6a1921822b12ead721cff0878553eb3e049c5d2184a7abce32b6615b4 d1408a0f47ee5764fe7b484494daf6e1f99b1c6a505274c48545b3e650ef8baf
-lib/codeql/rust/elements/internal/generated/Missing.qll 16735d91df04a4e1ae52fae25db5f59a044e540755734bbab46b5fbb0fe6b0bd 28ca4e49fb7e6b4734be2f2f69e7c224c570344cc160ef80c5a5cd413e750dad
-lib/codeql/rust/elements/internal/generated/Module.qll ebae5d8963c9fd569c0fbad1d7770abd3fd2479437f236cbce0505ba9f9af52c fa3c382115fed18a26f1a755d8749a201b9489f82c09448a88fb8e9e1435fe5f
+lib/codeql/rust/elements/internal/generated/MacroCall.qll a5dec6bd770884845b41539c61df8084a1ea24255e68077db8506275c76c9c97 292a5add471407e33d2a449f7b52b92db09a7148596437dc1d152deccd41095f
+lib/codeql/rust/elements/internal/generated/MacroDef.qll 9f57e22747469747eaf6d4b7e93e3e50abc26a11cac143b1c7bfc623dfa54050 ff5fc2fed898ac98af7d0bbe701e6c03d627d2a4b54e98e015cb64ed21f2afd8
+lib/codeql/rust/elements/internal/generated/MacroExpr.qll b9256934abfd59f41a936e6f71c24cc70e0bc5dc694d8e26492a199ea02bb8dd 3010f338226f7154ef8e0044a530ca6cd8cda7bee3ccb717080ea32f25b13a07
+lib/codeql/rust/elements/internal/generated/MacroItems.qll e641c26572c1b517b8f068cd76737b5f92f89f5015763e379e39d86b8f6440cc 4055ba4210bd96a4840601a260b6db50b9598eeef8a7650e5350fa28f84341b4
+lib/codeql/rust/elements/internal/generated/MacroPat.qll 5c044c3cfc984e71902b7326c1f8b06a629863c80b61c0574022e905dfaa5f35 d12f30547b3eb264d0baa2ab284b394221f6c5363dbe6b2fe51e3bb557e1d057
+lib/codeql/rust/elements/internal/generated/MacroRules.qll cd528d00634ae4fb4d2b030393f50bd6fd73c6165ada1bb6fc60c5dafb259a22 f05bf6bd8e05d411c98b440b333539acfaf9c37fd7ea03757fe7719f444de0fe
+lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll 747b614f532651bc890390a7ab1431b4892c263695e44a050e528232655f56ef aebca14e28277d92a1c0e8f15a57ea1d2e82121e9d13fa33f949041211695e89
+lib/codeql/rust/elements/internal/generated/MatchArm.qll 8d738b8fa2d853c020fad6c51c75e226e3f68eb510feb8cbd21af7978c02ef66 950523d6346e032d167fc454173b2a6c616dc2a976d4d76b821fba1dbc69ff5e
+lib/codeql/rust/elements/internal/generated/MatchArmList.qll df52c5f2b2d49f88e4e7d267446729984abc3ed1c94d6a10905f7ea442e7cc48 8e594c1b253eb2c4fee9dac8c70acb9b39e00c6ac4ef7632faee001ab22e2609
+lib/codeql/rust/elements/internal/generated/MatchExpr.qll 50214d0a7307165407b2606ffa998a201a2d661b48e9c1b0844452c3c8961a63 9275c78d25857d13622fd7d5ece13e2c89c4c32dba03b4a51ccd5ae8e10648d7
+lib/codeql/rust/elements/internal/generated/MatchGuard.qll b789fe3b0e78ee21b6712b5ec3eb97388ce04441469b7db63aa795b046daaf57 64a90af32944d6f4a8680a0cf87a78fa9bb60a2fcf16ec22717e81ed1bb69337
+lib/codeql/rust/elements/internal/generated/Meta.qll 5c3358c737d504dacfa3227b80ceeead3cdeebbd7498d1d0ac88570cac1d91ec cd04ebdf19cf6710ce43e888211e61b0740aa6298db9a5ec79f29a1301a60b40
+lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll 72cbbc38170ad277f1b316ef2ce2ab4467ea7041f08eb6294f96ce60becbbf86 21892aa6d343678fe2f51841a16d57c40fad63f4d12b087dcd325bca5a7d94c5
+lib/codeql/rust/elements/internal/generated/Missing.qll 1810565cc670fadb5724bb93dd17363e107c79334c5dbd98bc85fda1b2be8b10 e9c91ba13715af0e6390e9d121523d622702bc569f8a148015a0d4e6f0488230
+lib/codeql/rust/elements/internal/generated/Module.qll 7837f4deb3d95d963be20500c25c2d11c6eda6ecc0936d421581628602044b33 666e2b1505552df6da3b050e479e6e3a49eb791281dab8b0ed934f32228ac0e6
+lib/codeql/rust/elements/internal/generated/MutRestriction.qll 01fe01b18327c05e76d94c448b8c124811171252fbfde0ea2f9a0988af1483c6 95695424b50bde72bc50390d6739a7acefe0396207e2914f47d7f7258073c37a
 lib/codeql/rust/elements/internal/generated/Name.qll e6bd6240a051383a52b21ab539bc204ce7bcd51a1a4379e497dff008d4eef5b4 578a3b45e70f519d57b3e3a3450f6272716c849940daee49889717c7aaa85fc9
 lib/codeql/rust/elements/internal/generated/NameRef.qll 090c15ed6c44fc4f1a7236215f42e16921912d3030119ac22bc7ffe2dcdb4ba8 b61cc486e6764272c4e8377523bf043d0beae4926606dbcb48f8205c6a0b9a90
-lib/codeql/rust/elements/internal/generated/NamedCrate.qll e190dd742751ea2de914d0750c93fcad3100d3ebb4e3f47f6adc0a7fa3e7932c 755ead62328df8a4496dc4ad6fea7243ab6144138ed62d7368fa53737eef5819
+lib/codeql/rust/elements/internal/generated/NamedCrate.qll 058d4c396383e19c5ce3b7835f2d76d477eedfe6771acd076f0d4b87cda2437e b5d44e4b31dc4fef46ec1219e6134d5d66df0512214b516ba1bfc9c0f024878c
 lib/codeql/rust/elements/internal/generated/NeverTypeRepr.qll 4f13c6e850814a4759fdb5fca83a50e4094c27edee4d2e74fe209b10d8fb01c3 231f39610e56f68f48c70ca8a17a6f447458e83218e529fff147ed039516a2f7
-lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll c86eecd11345a807571542e220ced8ccc8bb78f81de61fff6fc6b23ff379cd12 76a692d3ad5e26751e574c7d9b13cf698d471e1783f53a312e808c0b21a110ab
+lib/codeql/rust/elements/internal/generated/NotNull.qll c78815961df086065fd140a55b1eb7eff883940c8b31dcd79341e3f9f035423b 4b7cb75c48b791f8b8ca5e9144bdfd97ce59a207c2b8ade1da7b97fff2311134
+lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll a45aae00d59bfb99e02fad638b4acd62b5645bd2cd87617ff4af79e75e586a5f 67a6a01fba661521e1891f3faf89b64446574e5b698ccfc207e34e438d686345
 lib/codeql/rust/elements/internal/generated/OrPat.qll 0dc6bd6ada8d11b7f708f71c8208fc2c28629e9c265c3df3c2dc9bea30de5afa 892119fc1de2e3315489203c56ee3ed3df8b9806e927ee58aa6083e5b2156dab
 lib/codeql/rust/elements/internal/generated/Param.qll 19f03396897c1b7b494df2d0e9677c1a2fc6d4ae190e64e5be51145aba9de2e2 3d63116e70457226ea7488a9f6ed9c7cea3233b0e5cab443db9566c17b125e80
-lib/codeql/rust/elements/internal/generated/ParamBase.qll 218f3b821675c0851b93dd78946e6e1189a41995dc84d1f5c4ac7f82609740f7 4c281b4f5364dab23d176859e6b2196a4228a65549e9f63287fa832bd209e13d
-lib/codeql/rust/elements/internal/generated/ParamList.qll eaa0cd4402d3665013d47ec556cc05c30a0666aece43163cf5847789389d05bf a08d09d0d3dfca6f3efade49687800bae7e6f01714ed0a151abd4885cd74a1b6
-lib/codeql/rust/elements/internal/generated/ParenExpr.qll 812d2ff65079277f39f15c084657a955a960a7c1c0e96dd60472a58d56b945eb eb8c607f43e1fcbb41f37a10de203a1db806690e10ff4f04d48ed874189cb0eb
-lib/codeql/rust/elements/internal/generated/ParenPat.qll 24f9dc7fce75827d6fddb856cd48f80168143151b27295c0bab6db5a06567a09 ebadbc6f5498e9ed754b39893ce0763840409a0721036a25b56e1ead7dcc09aa
+lib/codeql/rust/elements/internal/generated/ParamBase.qll 1923276ebdc2dee2a469c905b7816910bbfd32a5938bd363f500dd5c780899a8 5058ee451c0e5c3030b9673130d7766e16a4cdd6e02002a3abb67a79a41dea6c
+lib/codeql/rust/elements/internal/generated/ParamList.qll d8e73957983491302faa560ba0756f125dec0b310d59def54d4763408e1b81c9 701fa4e1364478617b2f73c9d86bdba6f4a6c04f58208b9ed35a388f11e11938
 lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll 03f5c5b96a37adeb845352d7fcea3e098da9050e534972d14ac0f70d60a2d776 ed3d6e5d02086523087adebce4e89e35461eb95f2a66d1d4100fe23fc691b126
-lib/codeql/rust/elements/internal/generated/ParentChild.qll dc5e9e16e0d43cf25ebdce03b84aa3bf0f52fe0c61de4db4a9887c961290b37e b26f0f2c27b664d0fe53aba35955df31a58adad0963a951039b6c6bbd34f83ea
-lib/codeql/rust/elements/internal/generated/ParenthesizedArgList.qll d901fdc8142a5b8847cc98fc2afcfd16428b8ace4fbffb457e761b5fd3901a77 5dbb0aea5a13f937da666ccb042494af8f11e776ade1459d16b70a4dd193f9fb
+lib/codeql/rust/elements/internal/generated/ParentChild.qll 89ddacd72c3c92178682f23e8e8caf48fe4bd18d8b4cef890bfdb367e156a1bb a8a75e4c1e25266a4857ad6ea93bf4c0971bb8ae246881d8bfb5501a9f6a0632
+lib/codeql/rust/elements/internal/generated/ParenthesizedArgList.qll 4e85b4bcabdbde71602d557fa0dd5ccbab09d2360d2bb470384cb85437e1611f 688af26f360655ee6454fa45b3169cc9db6ed46d8f58c2470111703e1e7a117f
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
 lib/codeql/rust/elements/internal/generated/Path.qll 9b12afb46fc5a9ad3a811b05472621bbecccb900c47504feb7f29d96b28421ca bcacbffc36fb3e0c9b26523b5963af0ffa9fd6b19f00a2a31bdb2316071546bd
 lib/codeql/rust/elements/internal/generated/PathAstNode.qll b02654422f80e398027069135bb01205358f0ab82ded3408d83d066f300996a3 345e7f92a75bfc71657b223602f60c36f7637d6f2e3798f07e2d2926eea2431b
-lib/codeql/rust/elements/internal/generated/PathExpr.qll 34ebad4d062ce8b7e517f2ab09d52745fb8455203f4a936df7284ad296638387 ba66781cdbdeb89c27a4bfb2be0f27f85fb34978d699b4e343446fb0d7ad2aa6
+lib/codeql/rust/elements/internal/generated/PathExpr.qll 3ee0fe021b0586d977a9ff8c1e0de6d7293d5a6fa2a8def92c3ac2bb3a4974f3 f04473f93ac306c14b32aa4bef63e112092ad9236b6294f057bac4e2bd3ff2c4
 lib/codeql/rust/elements/internal/generated/PathExprBase.qll d8218e201b8557fa6d9ca2c30b764e5ad9a04a2e4fb695cc7219bbd7636a6ac2 4ef178426d7095a156f4f8c459b4d16f63abc64336cb50a6cf883a5f7ee09113
+lib/codeql/rust/elements/internal/generated/PathMeta.qll 9e47ae77903bb2bdf1fa7f130ae45e444b0847722a22c7b5edaa8bdd1ae038df a80c417c5df58d944504ca8657fd6066cbf84939a70840bc813b6b41d138ee04
 lib/codeql/rust/elements/internal/generated/PathPat.qll 003d10a4d18681da67c7b20fcb16b15047cf9cc4b1723e7674ef74e40589cc5a 955e66f6d317ca5562ad1b5b13e1cd230c29e2538b8e86f072795b0fdd8a1c66
 lib/codeql/rust/elements/internal/generated/PathSegment.qll 48b452229b644ea323460cd44e258d3ea8482b3e8b4cb14c3b1df581da004fa8 2025badcfab385756009a499e08eecc8ffd7fa590cd2b777adb283eebcc432c6
 lib/codeql/rust/elements/internal/generated/PathTypeRepr.qll f12fe234d7fb1a12678b524434fcdd801453d90eb778b9173f7197ff3d957557 a1be605f8937c5bd3a3a9cb277782c24446c9f5ef8363e6f5ee8f6229886b6f6
-lib/codeql/rust/elements/internal/generated/PrefixExpr.qll c9ede5f2deb7b41bc8240969e8554f645057018fe96e7e9ad9c2924c8b14722b 5ae2e3c3dc8fa73e7026ef6534185afa6b0b5051804435d8b741dd3640c864e1
-lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll 8d0ea4f6c7f8203340bf4b91ecedad3ed217a65d8be48d498f2e12da7687a6d0 6f74182fd3fe8099af31b55edeaacc0c54637d0a29736f15d2cd58d11d3de260
+lib/codeql/rust/elements/internal/generated/PatternTypeRepr.qll 6d11342c39915b5173cf735957af0e3f92398f22b6bc189bfbcdc46851d4d33c 3ef6765f7dfb39c2280aeec4f15f42e4056d2d6644a279a8726c43feb28a9a38
+lib/codeql/rust/elements/internal/generated/PrefixExpr.qll ad0d828228907deba302c11ec8adfe675fa262fa3edf594ed856b20436de1bfb b8d0c0d3ada47e86e3d896b0c24caa586c096cea38bfd5ac18b1a2b8c48dfaa2
+lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll d7a400b238d7edf2b46596dab12e61add04e4930c9fe40c6b7de6d29fe3e3155 914d3b3a80823d2965664b6d4dd161598424d5477f7a1c7f872ae4894896430b
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f
-lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
-lib/codeql/rust/elements/internal/generated/RangePat.qll 80826a6a6868a803aa2372e31c52a03e1811a3f1f2abdb469f91ca0bfdd9ecb6 34ee1e208c1690cba505dff2c588837c0cd91e185e2a87d1fe673191962276a9
-lib/codeql/rust/elements/internal/generated/Raw.qll 6e38ac8ae1fbd7af0dd516f1c37e52e6ef1169103ad7dd998796ff8cd2dbac7a f4a7515e1757404b101ea3c8bb154d11d1babb138cb2afddf1618eab377d9625
-lib/codeql/rust/elements/internal/generated/RefExpr.qll 7d995884e3dc1c25fc719f5d7253179344d63650e217e9ff6530285fe7a57f64 f2c3c12551deea4964b66553fb9b6423ee16fec53bd63db4796191aa60dc6c66
+lib/codeql/rust/elements/internal/generated/RangeExpr.qll 7a1ff277e5e8a6731d6cb664a09da07cce2bd6ca3541008b381cd5a5a636a15f 2a9d51363a1a55a080d39575c623ba11cb0f259c04f40351fbb5b89358b31aa6
+lib/codeql/rust/elements/internal/generated/RangePat.qll a0c805eb31a773e16806384bd11592563c61b720e694bd444b93c28b5cf00d65 4b82088a62e7e5027f5930a697a18b5d4fd2a831a7bb6123d1b3f8ff4a9255ea
+lib/codeql/rust/elements/internal/generated/Raw.qll 2059c5d19a9f0241ad81491f29830bae92ad32ca10bcaef3c97e82e65e6d3a23 d89c634e3374828ab2deeb5635ca2a5935fef2df693138dbf6cda522a5468c38
+lib/codeql/rust/elements/internal/generated/RefExpr.qll c7b711ac05f7fe8fb97b81b09e794e7756141570265e3a995e40e7c79bb2b49d 11b572508c010e79a7edb0f1b349a4ea3e2fc68f6d7bc3f38fbeacf0c91d68e2
 lib/codeql/rust/elements/internal/generated/RefPat.qll 456ede39837463ee22a630ec7ab6c8630d3664a8ea206fcc6e4f199e92fa564c 5622062765f32930465ba6b170e986706f159f6070f48adee3c20e24e8df4e05
-lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll 5b0663a6d234572fb3e467e276d019415caa95ef006438cc59b7af4e1783161e 0e27c8a8f0e323c0e4d6db01fca821bf07c0864d293cdf96fa891b10820c1e4b
-lib/codeql/rust/elements/internal/generated/Rename.qll 53dd50d35aa38cb6eb4174c94e8e23042b42bdc4f38df009489ebf707380483b db14fbce0d95b4dae3d7512f9bdee92e0dc2dffde5ba5d7458f2f5dd632876b0
-lib/codeql/rust/elements/internal/generated/RestPat.qll 369f5828bb78f2856d528679a9869f81859b375c2f831ff72f4507daaee976e3 17f24ce8aa6a27359c10a654667b7877ca7a1509509e2ab246ed26fe15ef66b4
-lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll 853b7fd6c1f3678d0f9315ac23a99a0828a6e54148de24016a265039c7b1941c f1e140d2b113c494601143b735482869ee817c8a7d92026f6a511bc5c1420552
-lib/codeql/rust/elements/internal/generated/ReturnExpr.qll c9c05400d326cd8e0da11c3bfa524daa08b2579ecaee80e468076e5dd7911d56 e7694926727220f46a7617b6ca336767450e359c6fa3782e82b1e21d85d37268
-lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll 7b7692ca9fbe627afa0759050a740f0f42a8083446c1c3196084f5698fc570c3 96a735d60a3919c7c994f7b67930c9e51a3713940678d04a5fee54557d733c24
-lib/codeql/rust/elements/internal/generated/SelfParam.qll 076c583f7f34e29aaaf3319e9d64565a34c64caa5a6dfca240c0cc7800e9a14c 375afed1772d193b71980d3825c4ac438e90b295cba0baf58319d29a3a8463a0
-lib/codeql/rust/elements/internal/generated/SlicePat.qll 722b1bd47a980ac9c91d018133b251c65ee817682e06708ad130031fbd01379b 7e0ce13b9de2040d2ef9d0948aab3f39e5fdc28d38c40bfbee590e2125dbe41c
-lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll 6f4f9d7e29784ce95dc6f9fcdf044909d55c7282c732a81b0108dc4000e96b48 a188436cd6d4d071fd45b943d9778e46ee9a465940bdd1a2903269b4b7a01e21
-lib/codeql/rust/elements/internal/generated/SourceFile.qll 4bc95c88b49868d1da1a887b35e43ae81e51a69407e79463f5e8824801859380 5641581d70241c0d0d0426976968576ebbef10c183f0371583b243e4e5bbf576
-lib/codeql/rust/elements/internal/generated/Static.qll 1a6c87d3c5602e3d02268ebe2463a4ac64614ad25e8966a9bdb9c0ef58991365 cc1fe16d70cdce41a12e41a8f80cc38bdd7efa49c1544e35342fcf3cd26b8219
+lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll fbab8bae4d3eac10338a9bc5743f3ac9c0feab11107d6d28825f4e97bcd59bad 224f6aec466ddcde526ce8df23d2f925887232b462730af078815a68b47c133d
+lib/codeql/rust/elements/internal/generated/Rename.qll dcc205cf6a1cbceb97c363379ecf67d7640ed992a73af4597ecabd2b65dbe898 7794510d6594d289a6fa655f8618fa7ac4c0667158afbc236590248e1f0cbad1
+lib/codeql/rust/elements/internal/generated/RestPat.qll 79a20b2ddf13fd32d744614dcc6a952f9d4a9fb528c1c312fba49ef103e19704 a0b1acda14c8404f67cc0ec80cc42d40aae3d48e3bdce62c6bb24037095a4d14
+lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll 7e60c74c696cebe3a9fb6bbed28bb3446ae0804b2177ed5613892762f17fb684 80be5ba25f852ad54daca4a4c24df1b09cb3d501bdc02afafe1c0ef2f9644efe
+lib/codeql/rust/elements/internal/generated/ReturnExpr.qll 52a062c7d71a8cc868048302e5ba14bed85f3c6d5cbdfddce189fbf4645e9102 c622015d79619079f56e811f345bfbd8759936c516e9584744663a40f45b5497
+lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll 3c2eee8dceae1b28dbee1b64ed2db6a932227dd9581eed089d68e8882eff4db0 a9f942ae7839954927239a842832592920754b510f12ae16057f6a2a0c561bf5
+lib/codeql/rust/elements/internal/generated/SelfParam.qll 9c85961392d3d36f7dfdde1311a17962b0eeafb64e9e748b580abed2c4a49ad5 da6f438bba6e1e97cbd4a16bb5bf07defe75023c38280fd7160367de1899141b
+lib/codeql/rust/elements/internal/generated/SlicePat.qll 457281f265db001f59cb7fdb518a58406981114642d003ff9bf555f4d59c5a34 8256531d5a4a16d083601fcc0d3d3accccc631562e5948b26ae2b0111dd19c6c
+lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll 15e720c364638c14fad9dcca4f6627572423718189678c7252a462400cebd56e 7bafd93d6ec9e1196917becd6679778e552f5bc3d58537801071f957d77e61ba
+lib/codeql/rust/elements/internal/generated/SourceFile.qll 3080dd8948cf1752819cf9168b003479d5733088e9ae426b1180fd8baa34126f 56fc68a8e9e64592a8cb6b2cdef15a8474d4f016a98c74bde1dee5280672c149
+lib/codeql/rust/elements/internal/generated/Static.qll e5e0c498cc2f484f2f34fc76342bcf3eaba33b4d076fc2780651a4f6f5aa19a5 119c3a069402fc0493efc4004aaa7d13f6335242b9d03a02cba969b258828b93
 lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
-lib/codeql/rust/elements/internal/generated/StmtList.qll 834b87cd93f0c5b41736fb52a6c25fd0e3bdce41d5a64cb3d0810c54e90507f4 ec42f2dfa322044ceaaf90d278f0e7e751d63710facbaf3f5ee69ca3c64ecd06
+lib/codeql/rust/elements/internal/generated/StmtList.qll 6825e8b8b04e001ec8ae1cee416ea7eb240f306d2d586a1648395ec520e620d6 1d65eab64a80356d8a97412a21504df004cc87a71899a85a09be92843ffa2c77
 lib/codeql/rust/elements/internal/generated/Struct.qll 56775b98f793c108bd0eb8f35dbbc4983c170138e92c7378c24f45d2e612ca39 7bd83f2686f2f7a6b55b82156028c1951fde4c3ac9fc0248b1bb28f35b949fd4
-lib/codeql/rust/elements/internal/generated/StructExpr.qll e77702890561102af38f52d836729e82569c964f8d4c7e680b27992c1ff0f141 23dc51f68107ab0e5c9dd88a6bcc85bb66e8e0f4064cb4d416f50f2ba5db698c
-lib/codeql/rust/elements/internal/generated/StructExprField.qll 6bdc52ed325fd014495410c619536079b8c404e2247bd2435aa7685dd56c3833 501a30650cf813176ff325a1553da6030f78d14be3f84fea6d38032f4262c6b0
-lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll 298d33442d1054922d2f97133a436ee559f1f35b7708523284d1f7eee7ebf443 7febe38a79fadf3dcb53fb8f8caf4c2780f5df55a1f8336269c7b674d53c6272
-lib/codeql/rust/elements/internal/generated/StructField.qll 0ccd678b64b82fdab7ffe9eb74f0d393b22da4459fe72248828896b5204c009c 0faf5a517eccc43141a48809ed35b864341a35764de2dba7442daa899ff4ff69
-lib/codeql/rust/elements/internal/generated/StructFieldList.qll 5da528a51a6a5db9d245772aec462d1767bcc7341e5bedd1dc1bbedd3e4ab920 dac4cee3280eef1136ffc7fbc11b84b754eb6290fc159c6397a39ae91ceeaa13
+lib/codeql/rust/elements/internal/generated/StructExpr.qll af9000c85de0a41c35060a391b4370849e6aedb91b28cc2132c6f61de0dcfe26 37baeef41f8fc4f8c7106898cec0708ef8db2127cdd19dc950594d067b50ffc8
+lib/codeql/rust/elements/internal/generated/StructExprField.qll 57d2f65527189accc061dad65076faea36285164ae4ba983e8cbc804eae82783 4de4689ea56c1477a7e8df27be6398abf10ec39f22a42d13c4d8064a56665a3b
+lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll 599aeb4e8737093743db7477a1b423b61a2f4a53b094bc10df15c9cfd4aa3bc3 4a021e1534ce4c140280bc8d63e87c10b23620f30daaf1d29bf201588d2e310c
+lib/codeql/rust/elements/internal/generated/StructField.qll 08fa20cc832a014f78f37079becc64de95d0111f6022bdf0d5a6793167ab7a0f 2041f5bef78d589e5e53daf44e9f11796b40510bd0b5d44ae55a0ac7b49c42dd
+lib/codeql/rust/elements/internal/generated/StructFieldList.qll 2abf0688ca9659d205d8dabb98724b656493f4529e54e6d2a83f7073929ed5ef f2542e614e258845325e9103c26d50304fe45d21c4ce0630b52c91c8ce01a3dd
 lib/codeql/rust/elements/internal/generated/StructPat.qll c76fa005c2fd0448a8803233e1e8818c4123301eb66ac5cf69d0b9eaafc61e98 6e0dffccdce24bca20e87d5ba0f0995c9a1ae8983283e71e7dbfcf6fffc67a58
-lib/codeql/rust/elements/internal/generated/StructPatField.qll 5b5c7302dbc4a902ca8e69ff31875c867e295a16a626ba3cef29cd0aa248f179 4e192a0df79947f5cb0d47fdbbba7986137a6a40a1be92ae119873e2fad67edf
-lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll 1a95a1bd9f64fb18e9571657cf2d02a8b13c747048a1f0f74baf31b91f0392ad fc274e414ff4ed54386046505920de92755ad0b4d39a7523cdffa4830bd53b37
-lib/codeql/rust/elements/internal/generated/Synth.qll 3b9f71b9b6b9952c967e1ba74175b74dd563492d5adc00a27e19ab735bf37918 3ef3e4fe71ab08f772ebd68036cba7b2ec4109d706cfb03747aa05835f376628
-lib/codeql/rust/elements/internal/generated/SynthConstructors.qll ec935bac4f775b64c76cd15ab975d885f544e77bf4833fd0f47acd40438fe66f ec935bac4f775b64c76cd15ab975d885f544e77bf4833fd0f47acd40438fe66f
+lib/codeql/rust/elements/internal/generated/StructPatField.qll 65fd5e42e0cb513ee2d5179d37169c02fcf91360aa2294a61657892939187b4a df48d60618f3319f544123fc615178689ceff848078bbb7b5d2c4d9f8feb0dd0
+lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll 342ca25fbd8bf8fef84d06e263f59f010e21418658c1f79f40c52e5ce76ca158 c950a39a946904b84a2557fb1febd59906e42e5de4903e88d0da67ba3e14a250
+lib/codeql/rust/elements/internal/generated/Synth.qll edc9e01c09f2483ff23a41a54fad2772d2f24fee6fe1ac28a1231bf345a31134 47a0c4a58457e48f614398b383559347cd34479576528becc3d0bb391547c871
+lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 7bde7d013cb4b119748826a9ad363ba43203eff5a2360ff16a14f4e7d160fef5 7bde7d013cb4b119748826a9ad363ba43203eff5a2360ff16a14f4e7d160fef5
 lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b
-lib/codeql/rust/elements/internal/generated/TokenTree.qll 1a3c4f5f30659738641abdd28cb793dab3cfde484196b59656fc0a2767e53511 de2ebb210c7759ef7a6f7ee9f805e1cac879221287281775fc80ba34a5492edf
-lib/codeql/rust/elements/internal/generated/Trait.qll 8fa41b50fa0f68333534f2b66bb4ec8e103ff09ac8fa5c2cc64bc04beafec205 ce1c9aa6d0e2f05d28aab8e1165c3b9fb8e24681ade0cf6a9df2e8617abeae7e
-lib/codeql/rust/elements/internal/generated/TraitAlias.qll 40a296cf89eceaf02a32db90acb42bdc90df10e717bae3ab95bc09d842360a5b af85cf1f8fa46a8b04b763cdcacc6643b83c074c58c1344e485157d2ceb26306
-lib/codeql/rust/elements/internal/generated/TryExpr.qll 73052d7d309427a30019ad962ee332d22e7e48b9cc98ee60261ca2df2f433f93 d9dd70bf69eaa22475acd78bea504341e3574742a51ad9118566f39038a02d85
-lib/codeql/rust/elements/internal/generated/TupleExpr.qll 98f10bc72d09f98e3be87f41b1a3cbf037f4a7e3d3560dfa6d5759905a8177a5 6a9eb5568c518876b2912371e2b7b774cf5245097c5a0206eda35b749995f00b
-lib/codeql/rust/elements/internal/generated/TupleField.qll 121f7b35e28b86592f83e00993f9041acbe7ab636db894d03055149c7f15fd32 b1ba9e1182307a44bb5afc11e92d62e7eb2c819ccdfb28ef54943b6fec676827
-lib/codeql/rust/elements/internal/generated/TupleFieldList.qll e7874518ce353f58312b02fb646f19eb109b3d868f8b550c84b7d6fc3a85fd5a f4bff793bbdbc252688296953116146f5c9a0894e14a7d3e4883a5ac211c122f
-lib/codeql/rust/elements/internal/generated/TuplePat.qll 4e13b509e1c9dd1581a9dc50d38e0a6e36abc1254ea9c732b5b3e6503335afeb 298028df9eb84e106e625ed09d6b20038ad47bfc2faf634a0ffea50b17b5805d
+lib/codeql/rust/elements/internal/generated/TokenTree.qll 3d855014747ae2996375f05bdaef1dd07464692ea09f47174a92f705a5ef63bb b85fed50862f97bce98fb4cbd3f275b553ef3e8dedf215915736197078867427
+lib/codeql/rust/elements/internal/generated/TokenTreeMeta.qll 390121812f4f16753747d1eca17580a16385332e49fa93de89a5a5dc029a3a36 fa1e30306690fef85c6f455f4b51b1b14efd046b862e0160b311469da14ac98d
+lib/codeql/rust/elements/internal/generated/Trait.qll 210be3b1552348a94c6ef05d69b389d67734d505a9f0c7cfe621786569aadbe6 7f72b8d3a96e216fcf1ad3b0e03c3684cb6057654e097cafc1aebe46ca4c1a9e
+lib/codeql/rust/elements/internal/generated/TryBlockModifier.qll d2ddf8ab5b06d2236acbfef8edade7f669f8a01b2fda2b5c7a2a5821f3cf2075 b8e5d3d057d425508dadb6c620b3e09d05ceb36fdf94dc1276157c6d8c5edec6
+lib/codeql/rust/elements/internal/generated/TryExpr.qll 5b3b2e3a7aa92627a8fc165399cb0f216ae2dd6bce1b18e0c564505736ec0ace 9cae4d39c9b6aa4f500aa5b0daf589ec2946949a2a6e4ff707bc501585017efa
+lib/codeql/rust/elements/internal/generated/TupleExpr.qll 4671e41bf6f9f14819859febb89693ac41d1b442460213ee7933765f106c7c79 af129da49edb15f8b6f54a21cd9fa9275b1de3f706f3420aa6294fed7da392fc
+lib/codeql/rust/elements/internal/generated/TupleField.qll 0090091ee333a9dfdca4900f94adea8c6b24a75b14e61b29b7d0963301fa09d0 1a36b0e1c9bdb63845af7f3f5b1b695bbca79620cd3934e06dd6f9b1130a8ad1
+lib/codeql/rust/elements/internal/generated/TupleFieldList.qll ef5453baded5c9d7f6f358e096ef0bd67ed3062bdd41e07cbba7495e6f27ea8c e0add270f62a397de4ce53fa207d6ce4e6bbd5229d9cac7ab172b07de1dcba6c
+lib/codeql/rust/elements/internal/generated/TuplePat.qll 583d3a449745b81bf1c3c79b85add13067579226b85a7b005561ec55c5ffae8e c454a0b18086c687702d3146776727f15f9c1326c0806d90ff7797d41bc69e75
 lib/codeql/rust/elements/internal/generated/TupleStructPat.qll 6539d0edbdc16e7df849514d51980d4cd1a2c9cbb58ca9e5273851f96df4eb36 45a13bae5220d5737cbd04713a17af5b33d8bb4cfdf17ddd64b298ab0c1eea24
-lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll 1756cdbad56d634bf4726bc39c768386754e62650492d7d6344012038236a05b 3ac0997a47f95f28cc70c782173ce345fcb5b073be10f3c0b414d1df8443e04c
-lib/codeql/rust/elements/internal/generated/TypeAlias.qll 0d0c97d9e9213b8f0390b3456737d4611701a570b9943bb20b348c4efc8e4693 a83c701c0d8914e01517dfa9253a12be962f0a7ed2f75fbaae25a13432db403f
-lib/codeql/rust/elements/internal/generated/TypeArg.qll 80245e4b52bef30e5033d4c765c72531324385deea1435dc623290271ff05b1d 097926e918dcd897ea1609010c5490dbf45d4d8f4cffb9166bcadf316a2f1558
-lib/codeql/rust/elements/internal/generated/TypeBound.qll ed27681b76b8f3ad790daad4a08f3bc243452821246bcb240b1d925bc1c362a3 8fdc0caf91f1894d8711d68547185eb029446898b66f60fc0d10ef862cd6292e
+lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll f6b0db3882b09b914c98c2c96b249416773bf6509a90028bae14dabc2194ad21 66fd831c7a75fd28cf374d8c89069861b69140baf9c912635a3e18d23c9e8414
+lib/codeql/rust/elements/internal/generated/TypeAlias.qll 3ce9173a983ca7131591fdc3abf0f30adcac10bd22e36851b91114f9f32f59a1 97b9b3f3a74805ef27870e43509a69e5efb9b154019f0759b566025d0a06e19d
+lib/codeql/rust/elements/internal/generated/TypeArg.qll 87f9aa99436eacc911d3cd52b3572a940c6fa291ab3e61cc9ef8477546d4caa1 f0a45180180871aa629e81ea63ffaac0966f2f1c333a7e0bac3a6ad043629be8
+lib/codeql/rust/elements/internal/generated/TypeBound.qll 80863e417e974265101a64401e70537c3377b324fb85d0efba6c8bd51b7a5b93 5da768b567e354be82919d213e3d860d06a6ed769d72974259820fccfb09118f
 lib/codeql/rust/elements/internal/generated/TypeBoundList.qll c5d43dc27075a0d5370ba4bc56b4e247357af5d2989625deff284e7846a3a48b c33c87d080e6eb6df01e98b8b0031d780472fcaf3a1ed156a038669c0e05bf0a
-lib/codeql/rust/elements/internal/generated/TypeItem.qll 940b197a06b11621db980ae8ff8c0c6684cebeff62987ad8267f3838aa768d0a ab0e3b6e23acd1970ea4e2a32bef3cced27072ec9c5d16428626ec2632b33d14
-lib/codeql/rust/elements/internal/generated/TypeParam.qll 81a8d39f1e227de031187534e5d8e2c34f42ad3433061d686cadfbdd0df54285 893795d62b5b89997574e9057701d308bea2c4dca6053042c5308c512137e697
+lib/codeql/rust/elements/internal/generated/TypeItem.qll 6e2733ff2d3e1403efa4d46db2a4cd229ccddfb4e50f2bd0ae9c9ed018d7bb62 8cd3dec69fe3e88886303748f51247915068b499234f5c7acbb77512dbf49172
+lib/codeql/rust/elements/internal/generated/TypeParam.qll 2fbfba8adae62bd8f73abd0d93381376c4a496d2e04409ff30465b711b506315 d540d7e0c85943e692d229b2f38d5f116b7ad0c11a76a9ef520d96d75f3ee9d0
 lib/codeql/rust/elements/internal/generated/TypeRepr.qll 1e7b9d2ddab86e35dad7c31a6453a2a60747420f8bc2e689d5163cab4fec71bb eb80e3947649e511e7f3555ffc1fd87199e7a32624449ca80ffad996cdf9e2f3
-lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll b3780c99c5d57159bef4c6bd2fd8ec44ebd1854c892c1ca776c740f71249e58c 2fd451cbf0a779e8042e439882e7d9cadc19d1e596df3bbb086d16f2596407c7
+lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll 6f60133a61d099449bf268fda7941f016e16b9b1c52d6239720df87a8245bbda 3e5d7cb1ed0755f74482127317569881df09aa131e9a61cb032587dbc3442f47
 lib/codeql/rust/elements/internal/generated/Unextracted.qll 01563dfd769d6dc3c6b8a40d9a4dc0d99a3b6a0c6725c180d2bf4d7633929a17 a93ce90f8c03f4305e59de9c63f089fc7935298fc9a73d091d76933cf63e790c
-lib/codeql/rust/elements/internal/generated/Unimplemented.qll a3eb304781991bff1227de1e4422b68bf91e7b344e4f6c9e874b324e82a35e60 6bc4839fda3850a56dc993b79ef9ba921008395c8432b184e14438fba4566f21
+lib/codeql/rust/elements/internal/generated/Unimplemented.qll 7f81857a0a4e993697cdb05fa7ef16d041fff9e5ed491e34102b846cfa12434c fba05d2e35cc04ad2fbbf34d92af8db85f5d518dadd0e484bef2f7dde5f8490a
 lib/codeql/rust/elements/internal/generated/Union.qll 4df8fc632f7bcc0cbd564cd1c148c1a2438f26e6a83cd6470e15870120f677fe c74dea0a4ddfd581b9208d7907ea134219cafd217294315acf5c595de38a61f3
-lib/codeql/rust/elements/internal/generated/Use.qll cf95b5c4756b25bee74113207786e37464ffbc0fb5f776a04c651300afc53753 1fe26b3904db510184cb688cb0eeb0a8dbac7ac15e27a3b572d839743c738393
+lib/codeql/rust/elements/internal/generated/UnsafeMeta.qll 4ae970d7db0093a1ecf82f429cb307b38327b618d3a3eddb70b4ec650d58f6fc 2fb1ceac4b60218e55240d30f1ecaf950a4697b49680b2787618bc5a45530e67
+lib/codeql/rust/elements/internal/generated/Use.qll 124d3af15c56aa62b98bf365350df6571a898b133b5690a304ae7a808254d42d c0d514e7c3def97239bb1e9e18324cc1022f5dd6e9ab20476ec37ec7a7bad747
 lib/codeql/rust/elements/internal/generated/UseBoundGenericArg.qll 69162794e871291545ea04f61259b2d000671a96f7ca129f7dd9ed6e984067c4 31de9ebc0634b38e2347e0608b4ea888892f1f2732a2892464078cd8a07b4ee8
-lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll cedde7ccf689e3a2a246113be94544c206c56fb1c01b83b074e1f6edd3acfced f022ea4c653d1b5f311917efde8e59be27394ce7f6abf2561bb1e42f93f74adf
+lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll cdf4253b51aa9fb1639089f73f17640f1732e099644d7e8c5f527b5b04175b52 228df08b8597069d7b11aa6b03b35e0d749d32802eb4d2239ba8dd22def5f0e6
 lib/codeql/rust/elements/internal/generated/UseTree.qll 3d7cbcc8ae76068b8f660c7d5b81b05595026043015cd6b4d42a60ed4c165811 b9f0bcf82feb31f31406e787670fee93e1aa0966bcc0e4cc285c342e88793e4e
-lib/codeql/rust/elements/internal/generated/UseTreeList.qll 38efaa569b76ca79be047703279388e8f64583a126b98078fbbb6586e0c6eb56 1623a50fd2d3b1e4b85323ad73dd655172f7cbc658d3506aaa6b409e9ebe576e
-lib/codeql/rust/elements/internal/generated/Variant.qll fa6909715133049b3dba4622e6262fa30c4a9478b6219ec4fd12e07c58750709 71fc2ddac97fc4c4e6b92a13ee217cccc81dffc7c12295b6bc97c56ad25a92cc
-lib/codeql/rust/elements/internal/generated/VariantList.qll 3f70bfde982e5c5e8ee45da6ebe149286214f8d40377d5bc5e25df6ae8f3e2d1 22e5f428bf64fd3fd21c537bfa69a46089aad7c363d72c6566474fbe1d75859e
-lib/codeql/rust/elements/internal/generated/Visibility.qll af1069733c0120fae8610b3ebbcdcebe4b4c9ce4c3e3d9be3f82a93541873625 266106bdff4d7041d017871d755c011e7dd396c5999803d9e46725b6a03a2458
-lib/codeql/rust/elements/internal/generated/WhereClause.qll aec72d358689d99741c769b6e8e72b92c1458138c097ec2380e917aa68119ff0 81bb9d303bc0c8d2513dc7a2b8802ec15345b364e6c1e8b300f7860aac219c36
-lib/codeql/rust/elements/internal/generated/WherePred.qll 73b28efc1682bf527bdc97a07568d08666d61686940400c99095cb9593bc8df3 2ec1fb5577d033c120d31f1620753b3618fcb7f384a35a6d3e6b5e0bb375a8a5
-lib/codeql/rust/elements/internal/generated/WhileExpr.qll 0353aab87c49569e1fbf5828b8f44457230edfa6b408fb5ec70e3d9b70f2e277 e1ba7c9c41ff150b9aaa43642c0714def4407850f2149232260c1a2672dd574a
+lib/codeql/rust/elements/internal/generated/UseTreeList.qll c8fa4298bd1dc476a16c8b0c2b043674bde9d7360f53eb8a215170fffd32317b 18aa0c886a1f0d805d9fc1771fe73ff1cf3796183ba1e1f5a9408ae359b556c5
+lib/codeql/rust/elements/internal/generated/Variant.qll b98e89a7bd18f21b92479de422e6c1ca56bef067e34a3fd2539b31cfda93039c e6b54bc66c92d7627457c6a2f0d328bc65fc514420bbe578d0ff6bf88ea2f26c
+lib/codeql/rust/elements/internal/generated/VariantList.qll 7d5ffa311b62ecd8d263c8dd843d76b5d7f5f306b6702cbc49d574a3af7fdd5b 947abb4cd46ad3265473fcb29287da4782f932ecd571da0170abed63e1b830e0
+lib/codeql/rust/elements/internal/generated/Visibility.qll c6c3099cb563c010e18012772c57bea636967e30f0f90b026f744441fb4c9263 f0db2927498fd5900eedacaaec5f3f538829c1f46306b593ff95699fa6535f68
+lib/codeql/rust/elements/internal/generated/VisibilityInner.qll c5117329df3fda9a02095f4084c95a7f8ad68f742ba7ee13d5f06e1abae33fc2 2bde934b77717cd74b59735cbe8f3ae5f700325c3e8176a04d8aabe7548c7ec1
+lib/codeql/rust/elements/internal/generated/WhereClause.qll f1ddc9cee259e4d6d9799e2d72bf2e0acb09926246cdb0d8d1914c0cb907bd71 0924e2b188bb20a652f366fafaa6afc251502a0c2bc048204111ba8e18209cd2
+lib/codeql/rust/elements/internal/generated/WherePred.qll 373edb54ae03834e6f69a0d3ab08a0392ea35bc20012e4df71d29d401ac49c63 15fcae3f3bc4baf3569ee0f361fc6117ce8cb55ed7152f1c04ee67da909dc4ee
+lib/codeql/rust/elements/internal/generated/WhileExpr.qll e45b9ceafee6e933e37d70ea2e9c37da6c5054e2c89bcca850c4dc3dd69c5421 7caf1d3215b74741d96f23814642d09eb806f04d87a4d1b8fadcf9599349959e
 lib/codeql/rust/elements/internal/generated/WildcardPat.qll d74b70b57a0a66bfae017a329352a5b27a6b9e73dd5521d627f680e810c6c59e 4b913b548ba27ff3c82fcd32cf996ff329cb57d176d3bebd0fcef394486ea499
-lib/codeql/rust/elements/internal/generated/YeetExpr.qll cac328200872a35337b4bcb15c851afb4743f82c080f9738d295571eb01d7392 94af734eea08129b587fed849b643e7572800e8330c0b57d727d41abda47930b
-lib/codeql/rust/elements/internal/generated/YieldExpr.qll 37e5f0c1e373a22bbc53d8b7f2c0e1f476e5be5080b8437c5e964f4e83fad79a 4a9a68643401637bf48e5c2b2f74a6bf0ddcb4ff76f6bffb61d436b685621e85
-lib/codeql/rust/elements.qll be9c7606d429b62fcb8686285e8eeff41f45f0dd22feb5b4fd3ea2f3cdfb39be be9c7606d429b62fcb8686285e8eeff41f45f0dd22feb5b4fd3ea2f3cdfb39be
+lib/codeql/rust/elements/internal/generated/YeetExpr.qll c45a2a3c691b03c80aff5d1fdebe94c46856c1a00d42d6eaefec7f17222751d5 6c8e54035a6454a91f93d94e325f79dad275c7b86cdad2295248c94ebb0c5b00
+lib/codeql/rust/elements/internal/generated/YieldExpr.qll ff60cf5a7c074117c3ea6721567944caa3d77034373d2fb31db8307aa9ffb4e6 39ec18ce5702bbac2580ab464dee1f6afc0a7dfbb7cc314b6ec8fb4efacba69e
+lib/codeql/rust/elements.qll c5100ed31e25a299c447bb0f1b62d9575706416c51963ca504dc17a25e25f224 c5100ed31e25a299c447bb0f1b62d9575706416c51963ca504dc17a25e25f224
 test/extractor-tests/generated/Abi/Abi.ql 086ed104ab1a7e7fe5c1ed29e03f1719a797c7096c738868bf6ebe872ab8fdaa fe23fe67ab0d9201e1177ea3f844b18ed428e13e3ce77381bf2b6910adfa3a0e
 test/extractor-tests/generated/ArgList/ArgList.ql da97b5b25418b2aa8cb8df793f48870c89fa00759cdade8ddba60d7f1f4bbc01 acfd5d2caf67282ad2d57b961068472100482d0f770a52a3c00214c647d18c75
-test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql 42b365276aa43e2cad588338463542d3ce1dd0db3a428621554584b07a1431d5 08a66a8b69af35ee3bc64c35c453a19a6c9881cc6cc7e65275d1fff056121270
-test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql 339629d69e2d7db153e2c738d70d2df33f395ae2377f07eb247132ede87b9899 07e0611667c09456241aabf80dc420fe1f5c13b1bce324da92e6b18d250c3896
+test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql 97d27b10e3b76f90538102014b45b254bc223e9bac17bd8059bdaeb063b2f734 b28efee84fdb8a4a0290110fc7820dfdbc934d02ab38813dd1074f9dcf5a6b03
+test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql 307d1105ca74175e7568fbdcd8d426aa1ee6498632d389f69ace64ef0404e22f bc9cd9725453440224b9884d1ba60fdf7f1f6bb5ee5b04ddce6faafee7b374ae
 test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql b262300235ab5bf4fe7712c0208390c7e876413a37a433340fbc078318233e83 68cfb18e8fb73b53cf8a8e73e8bf5e7ba11f32ca6b4695a64ebab51ac7d58d1b
-test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.ql adfcfcdc6ac2a9a4849ea592e37da4221b6279cf2ea1112d32b6c89fda33e85e 7438490536e27b7173dec731f6925531a0e3fa839639c97a53905ba72d7efbe5
+test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.ql 4fe5dc0154fd8a95192b56eedeaa989d2e3b11725afe6b4d670dd6123a45e850 95b1198060308efe3de18166c24c260ba8eb23767af54b3edb978dd6fd4f686c
 test/extractor-tests/generated/AsmConst/AsmConst.ql 82f322fc8a01f4ccc86b3ecca86a9515313120764c6a3ac00b968e4441625422 62831f204c5c2d0f155152c661f9b5d4a4b685df6e40693106fbef0379378981
 test/extractor-tests/generated/AsmDirSpec/AsmDirSpec.ql 518a739c91481f67b27bfd1989d9dcbada12de54901eb6d598c896cd72f1f5fe 4567661eecf475fb05e13749b9250bcec51056b6db5a6ae7df24b7ba5cfb88c2
-test/extractor-tests/generated/AsmExpr/AsmExpr.ql 817faad3ea0b9da9a12026a8cfd91a0363595ce594fc5bc6ac43b112f911b2cd f0d5866dec3474f13fc85686aeb63e2fa8079b8f2774f0185959be00314eff87
+test/extractor-tests/generated/AsmExpr/AsmExpr.ql 650eb94d97cffe68e5e48a3145bdbd42655f1d978c8b721322c4faa22983741a 962c38da1012fb0292dedbe6e3f0cf96dff7bdfd12938574b3c2c755c66fe207
 test/extractor-tests/generated/AsmLabel/AsmLabel.ql 130bf49dc1f5ae79e3588415b9a4c25dfdcbcac1884db9b2fb802a68e33180e5 c087e47d8953d312488fcc0b1bcbfca02521e3683e2063eaf380d76399bca037
 test/extractor-tests/generated/AsmOperandExpr/AsmOperandExpr.ql e866fd4715e78511352bb286c1120cbd52c4d960664d57dd99f0380eb1db7109 081d6a6267a3e251a123099b4c1e7d3c5a3b56e0efe9db7c7db24db1c08b7e0d
-test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql fb1eb1f275ad251ba2e0876cf1d097bb33f20d06b0e50f8c01f7c11c71057688 e308567ffd18671cf172853a5c594f0f211d492c7e2fb58be412703d1b342b41
+test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql 5479a45903e7c56b2b0fc3175f84cb05afa2f52a6794b26ec8015afdda4545f2 be9a958cfcb98fe77d278c33bc7f08fe6a4438013997b08f0671033ed14aee65
 test/extractor-tests/generated/AsmOption/AsmOption.ql d613c40391f4985414cc3541f900b6e3f5f9ef157d2bfb96a773710af4b059ed 8450ef57a5a891db514e8340151d161e515b59ae7b963fd5eebf3bf862eaff08
-test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.ql e0e76f1d6e454c60db632baabd29642f315c4bf9284bab9ff8368604df15e77a 8450851f062232e7ea92845f406287f945c16e1e1a69a3189773e6e86df8a64f
+test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.ql 50d7539422fdc5ac45925c27fcec21f92b719bdb8f6f217300c8b00fc2c1ed9b 74bde7d8b414df196019653503ba08cff0f09ee40ce5600ce89311bd549ac2ee
 test/extractor-tests/generated/AsmRegOperand/AsmRegOperand.ql 4ad6aa224e980602aaa77a601bda1065b1814249d889b54eda4da99dfcb53a8c b2503095957c7e3cdd345e8ccc594aa0f7590954e64a831660aed9a515f74d80
 test/extractor-tests/generated/AsmRegSpec/AsmRegSpec.ql 3ae5068254b83bc4663230d2d21f16e189d213acbb4f25924819288b433d4a7c eea94d02b9bccb20d9ac9627667b84eeb486b5976b1b37fa0b94767c83c44a3e
 test/extractor-tests/generated/AsmSym/AsmSym.ql b3dadbd288d92dad7517f7997aa3e5974f807a30793486d174bfa9cc67128fc3 4f82ca31ef7e5a7d9a86567516a257a212ecca911c02d9a67de792ae66960def
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql 553cf7850a60985438e85079d3b55ec821fff6912d2076c2847e19626e9443c0 6c1c52cc2d4823b450bf3f3c9b166514863155f842faeaeae4bac8587a63efc8
 test/extractor-tests/generated/Attr/Attr.ql 88f9a524b557e81006a5079ac6d703c42df03ee510b7bc10cd22b481275d1939 49580ff1d1c34fd2ff636b983a19a96af0e36da939b5ac556817a741bb3b0435
-test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql 93ccb34e00b37deecd6d3019bb47948daffe55a2d5d031c60b4f6fa7a61412a4 5502459743efd8346ab943ff3334545407b21aaf0771bf422be58a5df5d27381
-test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql 7076b3f965c680e8f03bccd9ecb4495d03d35a4f460ec43628c19314eae8b49e 961e6e656e467ba389bbc6db39f345d9a8afaae4584d357dfe47484c6afadb99
-test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql 4e849e6eaae581f487aa74d09d1106e441c876b06474389687a04df446690a4d 6cd36dfdb0af25396d2219fe2789f898e2393cc3f10a25410b2ede5d216707cd
-test/extractor-tests/generated/BlockExpr/BlockExpr.ql cd6ef66de9e56ebb74964e59617d47999fb8c9081e885acece17a3b747a35ae1 6766844c1b87e518688565f2469575af5ca4e0ff4eb0c0b620df73a451d86a0b
+test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql d1d5308b57f929629000db9363da4fa38dea479586581c7eb7f2b1049714482c 2167562066d145f944e41ff7bc88bc0a02dde54840c780c16fb0f21c92a0f293
+test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql 859216d35d0f497de51fbdcc0bd7d92c52226de6f8d448bc083fd364b5a5729a 4e590d3baaa46e2e92f91d94eb95cdb0ab43c5c55cac7349e2e69f77d62dfd1e
+test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql 7b427e2d8c1b903e4ccb0ff3d57ab9af8dadcebe7df277b7581cf05f2bb37681 beb8cc33b2fc9c00e704c693f14fe091a846e6efb880249cfc674a84f5c01513
+test/extractor-tests/generated/BlockExpr/BlockExpr.ql b989734c229b1f25184f5bdc875098231bfe80e26fc6e47b349f83c7c60a064a 6b8e98e81edcf98b905670646ab9127ec186c372ed8a48a30c898933f872bb46
 test/extractor-tests/generated/BoxPat/BoxPat.ql 854c9ba4e045dbe7ea1666866c1c443a92597df0ce02f4ca5993142925941c39 a22c17cce0bff7d1df51b817d2cb1a61045357f91be14465166971efa5f5daad
-test/extractor-tests/generated/BreakExpr/BreakExpr.ql c2181211da3dfe983cfca93ead32d5d211e91181899b9477152c58124eaa846d 57e57b926e14db2efb2e88e04699608b2ba9797ee4f6c4f710135b6858982256
-test/extractor-tests/generated/CallExpr/CallExpr.ql 16d85d6e5cb68384d0b932fb4506c1855019b819f2c5faa39a4472f39427623a 14df8383948cedaff88f514f7239c1ec8c424720d24e3546cbcd0b689acecdb1
-test/extractor-tests/generated/CastExpr/CastExpr.ql 3480ec51072399409b7553ab6139c832db6ed4ca991f3a7a2282a39afe07c6f2 614c8ea7a2fe30d57583dbf84ed7a12743c2aba49d8c6252d31af3ed10853a39
-test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql 675ae07193241fbd710ece4f74f86e9b00f47841299b1c5934f55dbf13a4b4af 21fb0664619c9c889e9491bfd651c2814dcf0f158dd6269937bd0acc18be6b0e
+test/extractor-tests/generated/BreakExpr/BreakExpr.ql 0b37a56f98b38a6b027f136efe3d42011fe1a152a9dc80d19515ea3eb39fa461 95ec2437898817b6baae4fdb4bf2e64ecb6f159d3659c63d5f308e7aaade4258
+test/extractor-tests/generated/CallExpr/CallExpr.ql 112f1774333114a7e7bd70ee1f9478a794af1b85a0bf7220c12783e26544405a 35b9aa4ccbeab68daf406c4f90373fd785641e3e8e987115164bd512b7d2a1ad
+test/extractor-tests/generated/CastExpr/CastExpr.ql 683e56fc7598a151c1c54f255359b61b7c619f9ce9ff4f5463c0bccca226d40d b9e2915bdc4f4c315fafb1afe215c90e66924f1c6ed6c9236e2ddd339f31ef23
+test/extractor-tests/generated/CfgAtom/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/CfgAttrMeta/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/CfgComposite/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/CfgMeta/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/CfgPredExpr/CfgPredExpr.ql ee04d84f8da7fbfb60c585e0ca56e6bbb5e06f2e78306c6e594e1c1def39972c e5c5e20e39bda63e5f46a115fbaf8a6b6ac1ea41b4dda438ddea81c498baeddf
+test/extractor-tests/generated/CfgPredPat/CfgPredPat.ql 5cbae186f92545bf083c19a35a5b0b5c03d65054047f09ef3065df5718b675f1 22dac46bdd82e5c84f8a1e4bb2b0b864614650978bfc60191258f09f07a0550d
+test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql 1fe39a8ba8256bcac2d741a74d5414e4e8b329459d1747daf948f57b8d321d19 5e2296d89e386cf4b789ad8afe102d3ede78011224fe6f182b235d1550ec5e6e
 test/extractor-tests/generated/Comment/Comment.ql 0e0454911d2cf2e7ef5c6d860b84c57b9d490090914ebcf4fa0e8a70f777f066 cbd1c195276ef163f8d3c122344738c884dc9fb70eb2f9b7067829d735d48c4c
-test/extractor-tests/generated/Const/Const.ql 97797a56743b519c1990682ccb22af6d997ed5eea1e280b52ad31b16a5836f9e e5289ebcb71a25b7ac0a7e1aa0111e4f3ec83d26b7f83e819509c9b9d756921d
+test/extractor-tests/generated/Const/Const.ql d554b324b7ae3ed9265fea942782adf05bd1e6b7d0b3308b393b2484e4adaf68 2c4aef753236468c2b602f572dabc2fd7d8e2c137536badaba14c08d30475fc2
 test/extractor-tests/generated/ConstArg/ConstArg.ql 21c7caf1939ff9fcc1bf0fe6dec5c6a6929f714cf1e17faf7a2f4a31c910194b 61eac00f4727f7269f926c53f53a62b5fae82ce7a02b42d23b9de6337b6f9d6e
 test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql e2198f9ef913f7ecb9e96a4e5e4849737b664dbdf1ef67428d372ea1c29bbb35 c49aaaafd65c4dfadd1fae42a2078dba90bbd3fa1bcb09b88501c5085ab22c49
-test/extractor-tests/generated/ConstParam/ConstParam.ql 6facb2402e1cbf23d836f619ef68e2d8496b3c0c438e71266de24d8690852468 211ed6f7384f86d849f559410b2ac09da3df278bdeea9e77c4d9c26a727a6990
-test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql 58b5046a4da06a4cd2d942720603313126888b2249b218bef6f7c44ca469ccfa eeb84a04deb4c4496b7f9b38798cc7fdc179a486c8beaa0b33bf87e7f9482b1a
+test/extractor-tests/generated/ConstParam/ConstParam.ql f998c3ba95e7f566c22ea088f1ead3dc0a78b33c34361f0ca079af8bcf19067e 1e9ab5b815930f0d5653a161312fd645d5e51e7f6fdc9ef7370be89f6e1a4a08
+test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql 5f96fd36affb6c55faf1e77d67d93764df72b002fd5f8ecc32373cce4553cd88 fb733d9ea135b27fa486f93fe7c8352680f1a021d03e3ef6102a9b15d807e5aa
 test/extractor-tests/generated/Crate/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/DerefPat/DerefPat.ql 6e2d15d74675242430b923155a79162d97b526c2642dc81485d1c34d883881a9 c102390dc801bda5816506e00a295ec10a5866233c4a980735e42cc3cefd6d07
+test/extractor-tests/generated/DocComment/DocComment.ql 91a38ef6538f64af675ea8310dc7c391b5620a5013ffa8b6d2c08f51b14fa361 a2d16fee3451ceab43083f312b2b11a88b551800ee33efbfd2782499a88362e3
 test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql ff54195d2e09424faaac4e145a40208bf0e57acc57dfa8247b3751862a317c4b 583d5b98aa31a9af6ad73df000ca529f57f67aa6daaa50ca5673a56eb57bf507
-test/extractor-tests/generated/Enum/Enum.ql 9a612c818952e867e2665d8c919905d563bb76191f3f522370c7344863589205 c32cf1973082f5d519e3eb04fca0309b3dd9637cf34e58c10a8e34cd9fe36d2d
+test/extractor-tests/generated/Enum/Enum.ql 19a1c7c6f559c347f87dc647a3b893ebd106f0f2692e3f417df4e8326d1217eb 721c935ff4e1a8a3be12de54251b77cddac7462df69ebc16a8ea5bc39bf5ffc2
 test/extractor-tests/generated/ExprStmt/ExprStmt.ql 7c62a97f7f910ae6e0e9aff7fdd78b369d21257ccab52afe6307ddea2e15dad1 2d32a366c4acbea3136ff1f9f9dadf76b148f82ad1d7170f02efd977d8a07ae9
-test/extractor-tests/generated/ExternBlock/ExternBlock.ql b61e37f1c387bc91be127b5425089f9f1d687f4f1708cad334c0bb00dba5bae3 dc03f0f0912b2cfbce74c3bc31d261cdbea740847212ac3472ecf719d8eb71f7
-test/extractor-tests/generated/ExternCrate/ExternCrate.ql 55d2d9d32cb5e894cc2ee5242d688aaa8428ba7757cccea67d1c064db6de2514 46a2c57660a42ee6eaa532b0c86f4cc2d3de795c33ee7cadbff650bd0f23206b
-test/extractor-tests/generated/ExternItemList/ExternItemList.ql 7f4d538d8878a0166b1868f391abf34df1d5e986a7a2e9ceaddb36d95bc7f46c 37072596f5a1e28ad98cc87dbfed00afadd83fa007f03d5b17d4dee8922b100f
-test/extractor-tests/generated/FieldExpr/FieldExpr.ql 2a04baaf57a22b65bd5b9e142e59cc2b7d3dd3174910ddc0c2510094f2dd32b1 d8e4fb4384aade1770c907d16795a4af9884051390a5a05935ad4b4df2e757a0
+test/extractor-tests/generated/ExternBlock/ExternBlock.ql 0e9842ba53d4dbd0e42f1c12c164319d384b00ad1be25115926a189cc4cf1d1f f3ff8106b119d9876a7b0d7c6346642722cf119ea4ef53fc08227b05dce578d2
+test/extractor-tests/generated/ExternCrate/ExternCrate.ql 6466d46c3a0e3aab15850a2b95c374ca849dc028c810e7407d23c471be9c2ce9 1a8f9da387e6b6bd96528502934ea5dad09a3e0bb972d98827dc347b5a0ab1f6
+test/extractor-tests/generated/ExternItemList/ExternItemList.ql de065a5fd32fde533bb7bfffee1ac1e5fd64c7b83141f70da3a0ff2005d41f65 4120c181d384e256d5e6025f9bcafaf1d3fb8ccd6b52543c51e58c2218de9650
+test/extractor-tests/generated/FieldExpr/FieldExpr.ql 93d337168561b96d086669611e7a4c64427076421aac15d79d501216f67273af a15279adafef8225d6bd041527cbcc1048b0425988fdd07cda8a4c45c0c3b468
 test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql 1501730f1e02e9d22b07b18bb42a5372e1d327bda62bdc81d75f9966946cb97d 28625f0b7ee4d7ab37fc13206585961e89a5e509a93215c16136d2382418b7af
 test/extractor-tests/generated/ForBinder/ForBinder.ql c95fd006eaddb9535eda0d527d71cdd5d3745fe464fd809a8d58b8c4dfc8790e 1d8b38059b8a25965eab9a8a1286384aa994d7cac7414b70b63c6a3d6bcf3c39
-test/extractor-tests/generated/ForExpr/ForExpr.ql 3bac38bf33e140ae9f88371ec90409f7de867e39cdea46f02b15519b236b57cb aade1baf6e6081b3b9bce5b7e95fe4b7ffe00ea9450fd6e1d6692ad97cf93fe9
+test/extractor-tests/generated/ForExpr/ForExpr.ql 8309bdb427278c87e0d5a7027fee03e63c46f9ec393fe761a1527b8fccc6a160 b55d13f8cdbae222b67654e0035f753c2bef7e223cd2f69bf9d5ee42a9ee15b2
 test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql 5961055988b3a7749fb80e24d924bf1b67b0c52a6c895379beedd66a34bad04f d8ab72fac742314ead1aa0e1fed2535cc6597d278f3eef017bc9f8fd8cde83e7
 test/extractor-tests/generated/FormatArgsExpr/Format.ql 237ed2e01d9a75ee8521d6578333a7b1d566f09ef2102c4efcbb34ea58f2f9e8 09007ce4de701c0d1c0967f4f728ea9e627d9db19431bd9caebbf28ee51a1f36
 test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql 5abcb565dcd2822e2ea142d19b8c92194ee17c71c3db7595248690034559d174 1ffa743fc678701ffeefff6c14c1414bb9158e6756f32380dd590ff44b19ca5a
-test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql 243c2f9d830f1eae915749e81ac78d3c140280385b0002d10fcc4d2feaf14711 72b90a99a8b1c16baf1e254e1e3463c3ce5409624a2a90829122717d4e5a2b74
+test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql 100d407c3c561f16ce2634c7a035a3455a66b3d01cc7364bf8af527867a4f04d 5e0541628095b9159e377b3c3aaa37579a29a66243465c7a16a4db33deea3203
 test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql 0a345eb48dba8e535d12a00e88008e71b3ce692fbf8f9686c8885e158635dffe eab1f230fd572474a3f304f97d05bbf4a004c52773aaf2d34f999192244c0b80
 test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.ql 24108cdc54feb77c24bb7894744e36e374f0c03d46d6e6c3fcb2012b1ad117f6 05a6b6f51029ee1a15039aa9d738bb1fd7145148f1aad790198fba832572c719
-test/extractor-tests/generated/Function/Function.ql a98895a935f82c61538a93ad981d55a049dfc44eb7f4a28b0b3d611247617518 ed9e9b3d3804e83a40fe3d39888efb308eb2eb9d99c7a1adc5ab821cff2a44c0
+test/extractor-tests/generated/Function/Function.ql abfa9cffbbcf15975dfd5c9b0512419bfeb0826453c34dd13396c28e2afbeaa3 9fdda768f863f3671989fabc9c87b963945bcea70e3147b8fad6f71e72b582e1
 test/extractor-tests/generated/GenericArgList/GenericArgList.ql 9bd6873e56a381a693fed0f595d60d973d0073ba7afa303750d5c6a0b887a811 0b373079f65aa91cacabfc9729c91215082a915197eb657b66bcdb3b6d5e7e53
 test/extractor-tests/generated/GenericParamList/GenericParamList.ql 206f270690f5c142777d43cf87b65d6dda5ec9f3953c17ee943fe3d0e7b7761c 38a6e0bbca916778f85b106609df6d5929baed006d55811ec0d71c75fe137e92
-test/extractor-tests/generated/IdentPat/IdentPat.ql 23006eddf0ca1188e11ba5ee25ad62a83157b83e0b99119bf924c7f74fd8e70d 6e572f48f607f0ced309113304019ccc0a828f6ddd71e818369504dcf832a0b5
-test/extractor-tests/generated/IfExpr/IfExpr.ql 540b21838ad3e1ed879b66c1903eb8517d280f99babcbf3c5307c278db42f003 a6f84a7588ce7587936f24375518a365c571210844b99cb614596e14dd5e4dfd
-test/extractor-tests/generated/Impl/Impl.ql c96ec30d703aa607b7aad9f6eaca1b0069799cdefcc1481f4aa4f7378f477f7f 3528e1502b6f7b323d964630ecfb8255f683486b75300457e2a2d95aa36771f3
+test/extractor-tests/generated/IdentPat/IdentPat.ql 939ce994f33455e8f23b43bb61f3a09af13b37f1475ac0a726bb683ac9a13ab8 13733894a584d379766905bafb5f643dbeeb05b9ea2f7cb87a68aec5f8a8e7d6
+test/extractor-tests/generated/IfExpr/IfExpr.ql bf727b0a8bbd6d571c0efd32d5137c66a9868aaddba6bdcd4dcab399f6b8c04c b062e3c30f5465806bfdf28407757111b5cabaa880e0f4f2a759d32230b435d5
+test/extractor-tests/generated/Impl/Impl.ql dcc9ae900f73e6631eb5d1aa0a4ad52287ced67e8c347ce34a6d1b65f296686d f89d2442181b6289ec2177d7e2e1f5ed7baca0d36a526a4611281ef6804de557
+test/extractor-tests/generated/ImplRestriction/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
 test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql 311c6c1e18bd74fbcd367f940d2cf91777eaba6b3d6307149beb529216d086fb 16c7c81618d7f49da30b4f026dcacfb23ed130dbfcfa19b5cb44dc6e15101401
-test/extractor-tests/generated/IndexExpr/IndexExpr.ql ecfca80175a78b633bf41684a0f8f5eebe0b8a23f8de9ff27142936687711263 27d4832911f7272376a199550d57d8488e75e0eeeeb7abbfb3b135350a30d277
+test/extractor-tests/generated/IncludeBytesExpr/IncludeBytesExpr.ql 88ce15de29b08d5a09791b7bace113d0a742a9dc80f8e677289fa93f68f90ab5 e2315f877371632c7c606ffec092dbb4dba2a5c8ed5b898ba049d1d5d34e3665
+test/extractor-tests/generated/IndexExpr/IndexExpr.ql f7a495ab23e11c8390a892d5041ee6493b040215f898e193e9730ebbf1a5ba34 18c9d2260a60197f286a2957d95f12762f25bff3c5727180b51e1fef2337078a
 test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql 6ba01a9e229e7dfdb2878a0bdbeb6c0888c4a068984b820e7a48d4b84995daa2 7120cafd267e956dbb4af5e19d57237275d334ffe5ff0fb635d65d309381aa46
-test/extractor-tests/generated/ItemList/ItemList.ql e29302a9212b07fdaf93618852be30adfac64b292e9a0ddbf63addb803daaa98 7e69a78b0f58ef9344892113799092149024c1352b0965a6326d8a45cd44771a
+test/extractor-tests/generated/ItemList/ItemList.ql 49aff38f3cc3d3f48f2ae916d773f8fbd04ee4d2e6f8ab7fc9f37e65aa7dcccf fe015eb77d633fd8115963d3a4d5344e28c598dea994209d1a095c6cc5bb0ed3
+test/extractor-tests/generated/KeyValueMeta/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
 test/extractor-tests/generated/Label/Label.ql da1f302da6cb31e6ccb73c722d9d5cfaad6a26d9869b3fa09fe50b03e26f3d9b 5fbfabfef6567ec6609be1af7859eba8ecb1f7f1878b8fac426e0d7098c17ba1
 test/extractor-tests/generated/LetElse/LetElse.ql ec8e7362ce9f903731ed6bfc190fc18a6f60abf150f5cee878a0fb9adaa20b94 2e019b6e246caabe4800ab940bc150bd8e466d59dde87bd614bf064adb703c8f
-test/extractor-tests/generated/LetExpr/LetExpr.ql 59f70af49ba496559a7ccfe30e737597fb473794d677627d344a9285f85dad33 b59d1f665c600055666a422c4008878cecf17d9ff847cd02b6e0e82ca73073bc
-test/extractor-tests/generated/LetStmt/LetStmt.ql d89291bb071484b1e79b009b2a310a5104a2ac0e85a8581ed73135e1351c27c8 45e20da515173e372c1d1d87392eae64d6d482eab0393f9753d1ebe792241d39
+test/extractor-tests/generated/LetExpr/LetExpr.ql be466576ff713715a38349f3a7d2130d416ab37144f09b4adf0a18ea52b8d73f 612f181d772df00e2d5a166e419dd0517aadab0561f8d08cd0d364267f12a843
+test/extractor-tests/generated/LetStmt/LetStmt.ql d89d5d8ff566fb78724039fa0e53a52b7e6c71b77257c09965eedad6a8da8886 46be6bdff454dc90164f5a914cacc0a2e11059f3f1d781fdb4d18eeb8e7a6013
 test/extractor-tests/generated/Lifetime/Lifetime.ql 9ca2da890633be36338a60e41c19a32ed03a7397ffd5c2271de964ded59b380f 475925d5aaa3c7763f3fdc703b8510408b6f729a4855d9e7ed2cf642cb7e0f98
 test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql ba052a01e76251c45960451fa183cd33e7435dd2906a8a085d99ce7bfba8ee05 bfa2de807b23f139342ef820d05f50e3b3573027427d0c77b710aea5a94fc839
-test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql a96f586af332969878a4e9df8f9dfca99e5c98b6f60315dd1b3fea47c4cbace9 01d87c8d686466e15e19f85aa9b2536f7b8035181444d532ff11286c77b14dcb
-test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql 00570642966d233a10ec3106ae65e6ea865c29d0776fdbc452815f528301117c adb286ad3bd763f1b1b350cac91bc2615869dcb9b0faf29276ace9a99d31f0cc
+test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql b9c38b067aad4738f19d71b88b8b17d10ddced1ec33cd4fc5b720712e378cd0f 9e9a51c81cd45edcd67d625929c8015989f4dc850cce7db34b7774d40b6b07d9
+test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql f7980d574dcd77629f26dc5838c090665a6550772116072c42d23dff3bb363b0 19bfdd781be84635234ebfdf265f7bbd9d18125e8374acea8b381e07af1c84d7
 test/extractor-tests/generated/LiteralPat/LiteralPat.ql 863d4902e7e22de3176398cbb908e6f5f487b3d22c0f9f7a5498a1ebc112c0fd 47e3f70c5c32f17050d3ca8c8b42d94ecd38e378627880d8100b7ca182cfa793
-test/extractor-tests/generated/LoopExpr/LoopExpr.ql a178e25f63b4d517482ec63e5dfb6903dd41dadd8db39be2dd2a831e8456811f f34165f78179960cc7e5876dac26a1d0f6f67933eff9a015b92ca0e2872b63e8
-test/extractor-tests/generated/MacroCall/MacroCall.ql 28abee68c0681334e4ffd412f1b9b9b0fe844a6ae6c915ec18ea186b4766f58e c8c73902827d69a4b903ab3028408086b64b9f5d9a4da97620a2100f45ceaf69
-test/extractor-tests/generated/MacroDef/MacroDef.ql edcdd65706641c2827cac546091a99e0a1473ff8d383efd968023db411591197 b7832c67c6dd32e9e5ecfa4b6256e7cd820f55d49c44458a140cbf4d46542eb3
+test/extractor-tests/generated/LoopExpr/LoopExpr.ql beb3084530fe1d1a10cff5dae4402d814f1f9b008b0e0e74d0b50c71a83e6500 4d2c666bae06e3f8bdd82db23d0783f2d8aa62feaf3a63cb4e5a19b092071b0c
+test/extractor-tests/generated/MacroCall/MacroCall.ql c2cda717672182b654354a1b8984e4cf7723422e1ffda98316ebbfb2f6648824 cd2a0a521dd59d15d903263c4151e7ec4e72837ef03069a86163a33cbc2eea2f
+test/extractor-tests/generated/MacroDef/MacroDef.ql 9a5711012579011338674ac11cb41693a4a670eb978f97b68f518797e368cfc4 fac93bddd68cde5131e0719461403b788af9326ff0361bc0517f6335ea33c955
 test/extractor-tests/generated/MacroExpr/MacroExpr.ql 83fadb88fd8f913bb1b1cda26d21b173bdc94bb6682a74eaddce650ebf72aa41 1c502cde6a95ec637e43d348c613be3dec4092b69d2c8692abdc5a9377e37f5f
 test/extractor-tests/generated/MacroItems/MacroItems.ql 0f8c1d134a28b80c70d5fff7c120f17350f6116689fdd7f67bdbfbaa0302c224 9f0594aa6d96c4f368d6c6521d0b58ab456611842afbfd040cb84f8858241677
 test/extractor-tests/generated/MacroPat/MacroPat.ql 71f65d80e670ec43db768693b8d44d627278a69e938517dc9068c76785ffd102 b1577dd669cafa9cf97aa998a7f30ac4a94aff129787a2d5a1cdac553fd56397
-test/extractor-tests/generated/MacroRules/MacroRules.ql 9a6d5d9ec6cc77dd2f893e5315910c73f2ae2fc418b4a3a172799a16fefea456 413c8005e02dc1d79e6710e7dfc184cfa0e6bfb34d172b6b97bd7fa81ccd2594
+test/extractor-tests/generated/MacroRules/MacroRules.ql 942f1400cecada57d75624c52361afe1668005cbfd4de150ffa3b77c4c771675 3aee2d699f7f0e38e326f66742fbb2d219010da7f27ee2eced760b03ac01b0fa
 test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql ebe8451a9256c9d7e77749beca88d0fd5ab73c76404bed4ff6e0c75f126159cc 72dd6d5ca4133e318fd51bb9007519b938e618cd4ef27bfe52b9c8c8cbd484ea
-test/extractor-tests/generated/MatchArm/MatchArm.ql 704976bd48e56a0a2fce7c2d9454b6cd24b1bf924633702ebcd71d8521b9b171 7c2bb501002c997a680c69b6d0856da13868125913e726f1a12b97907f32064a
-test/extractor-tests/generated/MatchArmList/MatchArmList.ql bbc679fe6d8dedf9131d0fa5faa7b44c138c5f56b9cf3cb209fd3ccd614b689c 916c53a2b68646b52f2d28eca2a19218ba9d12eb8edf7c6cc4140dace1bf4e0d
-test/extractor-tests/generated/MatchExpr/MatchExpr.ql b75a5936401bb5ca38686f1413f5c8267ad685722560a2e9041dacf2f8d54abc 7da57118fe5b1f7f5cbe8d6b5f3ae70816fd4837b1c2e6401b98175b36ca233f
+test/extractor-tests/generated/MatchArm/MatchArm.ql 1f5c87e967303558919212909553f2bb39dda5a7cc58358cc89c3fce94b34f72 5f60f7ec2fa1fb53bc59e0658078bed926764a18d6a2ecdb319d1356e793656f
+test/extractor-tests/generated/MatchArmList/MatchArmList.ql 6b02e3342635eeae31e658de7b42cf05603aa10e84231daaf84f280292817342 218d9a94833311186e4bf9c913a3462329a47168db2045711378e2950ee9841c
+test/extractor-tests/generated/MatchExpr/MatchExpr.ql 9e5c80747c92f47f7ac2fe117883e4dcb1de8bad6e44b5cb32ab2ff5c0494b8d c7d051194e36e96bdd1595510df8d177e53b578948a7252be5d975a5136329f7
 test/extractor-tests/generated/MatchGuard/MatchGuard.ql 91de18a0a18d120db568b2c329e5cb26f83e327cf22c5825c555ea17249d7d23 0bcdb25895362128517227c860b9dad76851215c2cdf9b2d0e5cc3534278f4ec
-test/extractor-tests/generated/Meta/Meta.ql 43dd1cd669099b38396b316616992af6d84b0c1cee953b19235a00ab3d3bb43c 80b1885809aa074357e21707d1f8c6dca19f0b968ccff43229bb0d5c6fffb2b2
-test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 9d5af6b4771a8725fa5b56ccb3e2a33158b18c876546b88e6dc63da1f887910a 494c8c2fe5584aac45c828b38d8bb20c113927a1e909773d4a2dbd3965d26170
-test/extractor-tests/generated/Module/Module.ql d7c442fd1b1f4f00da87e2228fc1aeeab0bb86648b2aa06a9dd6f40dbae1ee28 3229388727d14048e87238bcda5fde1bed503e5cac088922381e5833cfc32fa9
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 92814b91df080cd9c26aa3e94b96b544e889c810d7604328108a0301a1f75e19 b143b64546d80c0cedc1cdfffb239dbd276c7c6f5b96596f32d1c4df2d6d9190
+test/extractor-tests/generated/Module/Module.ql cd8477839d3d78ad34bee8064d8f3fc2f5583f74d048645a9acdb210be86c21c 5450373d5d30984a639397d0479289cc290be917c96ea7b43127d5acec2c6c31
+test/extractor-tests/generated/MutRestriction/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
 test/extractor-tests/generated/Name/Name.ql b2fe417f7c816f71d12622b4f84ece74eba3c128c806266a55b53f8120fa4fb3 8bc65bbf3f2909637485f5db7830d6fc110a94c9b12eefe12d7627f41eae2256
 test/extractor-tests/generated/NameRef/NameRef.ql 210a70e0957f3444195eed3a3dfbb5806e349238c0b390dc00597e6b8b05fcec d74fbce3c71aa7b08ae4cb646ccb114335767cb4fe000322f9dd371c1bb3784f
 test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql 4e73ec96fccb00fe241546ff12c47329a9c67b7ae40a58a5afa39ecb611b84d4 bb716f72db039e0a82de959e390259a82cf99ba4482070602b7b6b42511976e5
-test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql 851d84073f4a14cef24ce945a099bc43b22381fc21672ba9ba424623d66d9e0e b3ca3309da0054501dc49f83b9e1b51c155966a14504521565ea980cf1600f55
+test/extractor-tests/generated/NotNull/NotNull.ql d79c3007161f3296a4e0516e3edf8e33152a6e359bc241b0f532b0058442e59b 3c991600d3fe64df36e0c00d38e4e31a1d796eec6ad47e2d34a8619b7e9c7afc
+test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql 247b7daa146ed7b46db84db57b562acc072601656184e6bbf71f08ac9d59375e f14087a794840c8398a65dbd6b796fe37812b12bc5bab2bf04843afc1f950227
 test/extractor-tests/generated/OrPat/OrPat.ql 8742e1708da0bcc172c8cc637082672c92a136aa50bb2f0ef928387337aefa3e 1901c223502e8cc046c233a10d923226373bad0837264e2b837fd549929020e3
-test/extractor-tests/generated/Param/Param.ql de90709cbd61e1852c857ffb6cedd17818464c93bb7bdc92c900ee04f4d2a27c a105ee30716345987989d48c4fa6194c34741fc48528515aeca673662b5259cb
+test/extractor-tests/generated/Param/Param.ql 853cea9f6ceeec98bf861721aebe575971ad1e04eb216fbd8246ece46af9c7bf f43b20554b36209e1234cd62f01945df48490a8d8e629c501cb954ca40b30832
 test/extractor-tests/generated/ParamList/ParamList.ql 015cfeec048fc89698d75a04492a0e39303b1264f80e2b6977d178aba18a745d 349455ea6fe026a482bf9d63e9581ed2f368de3331bd2f0b9591ec20ee2a5f21
-test/extractor-tests/generated/ParenExpr/ParenExpr.ql 5ac9654a149f32638a663894db769152ce5a5abff7051e4d865bf0ac2485759a 3fa0afc9522c241d7530cc6d1e52b662d920f0459684bec82fcfda30d2ec9871
-test/extractor-tests/generated/ParenPat/ParenPat.ql 50f99c6a7e5e2f76dc5bbc10a6b2db5f5f40b85e80a992aa616e424744a7606d 5ae681b09e7b8793d2d8fa36e9e7d9b6c32fc94d6c26d43425407d05d351fcb3
 test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql 86a45a9f9696a55562a7125f08297bcd50b368225a13cd31b6e9eb4071d04e13 53c0b8c4f453a748c9534220960c6ce8c52bd7501cf1d1f74e3928fc6512667c
 test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.ql 6d0e3f7cbcc835f2a5784ccb09b0d65c2bb063c1904edded2e7fc8c9fb57c4fa e41c898b8b0d61078e0d76c6e2e141251dca71f79ad5fa119c012220c54cc409
 test/extractor-tests/generated/Path/Path.ql 0f6b63c723da7f140411c8e9a4bb9fbe043a997a1748a4a491add4bd6e81fd6e 5081db5bd590b72780c3c8032532e65b5d453c327c8771da6b87c10e30071523
-test/extractor-tests/generated/Path/PathExpr.ql caa2a41b5cc3af837fcf52b49abc5f45ba924821ea0f75d5b25daa8d2b6d4b66 7c2d587d7a73c21dcc0a85c38baa0adcd64826719b2f12f92ae758d290f37706
+test/extractor-tests/generated/Path/PathExpr.ql 8b073ac78a95a08f7be4fd62b659ffe4a736f3e481de6ab80535a96caa560c62 3d3aece2b05ad0f59e4756003b2c35ffc3b768edc776457f385a8c1af8f79a98
 test/extractor-tests/generated/Path/PathPat.ql 8a6a759f4bbf4fa9c23fd235ce4d63f04bd715a86a6e71bba0a324fe1231d947 be23d83e4f6ac209f3f7c382fce6b9bc57db17a26b236bdf8215848285e345ff
 test/extractor-tests/generated/Path/PathSegment.ql 87774cc2e9d1be7aaf8748d418b151d7ec03fb20fda9430ebabd86ddaebf5538 699545d8eb2d6325bcd2c253d56339bd71170b34e80efe5155189fbbdde9fbbc
 test/extractor-tests/generated/Path/PathTypeRepr.ql 32023340cb9aa1fbf52a1a3e330c6f3206e1c64c9dce2f795d9e434aa5a1533b f451de0d4941ab79014d2883b46291f9f05f79d479fcdcab387020ab3ed68703
-test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql 63e9dbae0d0b46d5e9d60c313e408c4c7ee1a93c5a26fe4c01a632911de961d0 09fcc28bb22553356aebf9ea93811703e5404b88022be8dab61ac81d3b187b75
+test/extractor-tests/generated/PathMeta/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/PatternTypeRepr/PatternTypeRepr.ql ada52e0ac5a61244cec32e185a968eaf2aa7c3237126d9cd57646cab0d63d950 c8169395b50236ba21fb7703206a57a98c3919a68f75c792cf387b14351c2018
+test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql 915562efc4c7cff5e8ecc68ffd5276bb8af86e7ae0c7c9f161c1bd1d30c15982 cfd7ca44581a6b910d4bfb3d46094b37dd691854f2eede739f790dc5ceecdb25
 test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql d9289bfe1e72d9560b3878e4557f8cfda578ef7bce67eb29d7320921c0ba46a5 f3ea108aa25635bffa7673bb66b2581ce246d3aae86edf878c6f1abca2493c16
-test/extractor-tests/generated/RangeExpr/RangeExpr.ql c9776706d933606d1463bb08ed76457ac03a9558f6dac0218ef2012bc5e8e48f 77cafee86abc2680e1f9c925fbe664c05ba1b9a2533b1873242ef01dde1ce308
+test/extractor-tests/generated/RangeExpr/RangeExpr.ql d004ebc71854d6faffe830bff4e9b22b047ff41ee709c1d5947306b5e887f47d 938bba2d631b410580d6e2b44d24a57f6d6cbf4915852611dccb5cc8ee23698e
 test/extractor-tests/generated/RangePat/RangePat.ql 72b6a5e250fcec844f96623f265762462966775326ad0ad4df03203ff17f0066 04c375e98d6c7d336ebf7dee522f0fc716b7ec8141752534ed083c5d2550c679
-test/extractor-tests/generated/RefExpr/RefExpr.ql 4359b9e10727fc505213a896c4c8761258f355b572e11675a5081d811affb4ea 0c46fcbd866334d168e1c4c481b4ad419df048e4ba74488875b2799d316291a7
+test/extractor-tests/generated/RefExpr/RefExpr.ql 411a1626e83cd9bcf539e161243658cbf89a9b4d053bd7134850cf692567deac 60ec15387cfa0a108c1b80babf94017b78a0502c7bdfd8c02ec503cabb1559f7
 test/extractor-tests/generated/RefPat/RefPat.ql c83d5e79a7d5977f658d64e8caea471b948400bcb90a3610283bdb5e9757b99e 26fa8a337e242ce660eb0dc25709148b837fff3229b259bfcd2987261c58c38b
 test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql c545689e4cee2035d79fdc3d9b720e7231232f57f35d16848b20d4659650a8c0 f248b342115cb0691f3ebe38ec9a65c8a36440cdf2f28b3ca7faed779a6d4164
 test/extractor-tests/generated/Rename/Rename.ql b65855515219a5fc1889f619d76e3fbb8fbe6a631f931e313608964640f68abe 7da9373ceb58054189036fcf5a262d9cb6897ea9d1008c963f8a18c34b99a60b
-test/extractor-tests/generated/RestPat/RestPat.ql 59fbb7dc4bbad60a0a7ec91d8997ccf8a7036d4bb20c88332791906d88672c1f b104f06c2d350a9d703abdb28619672618d0082a0fbe7bcc67fa8df5526b266d
+test/extractor-tests/generated/RestPat/RestPat.ql ddfa54457f4c5be5d518608b45411184efc42cc8dfbdf0133a91280181d1cdd6 67f9e2d39f8b528e89b7154f261bb1534f00f82790156aef3b26d5e7d563e2d3
 test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql a6a8ad01a54f8f4384d3e1ab6352cca1e55c9041673705658b9feec3e3a1d3b4 d9ba5a13087e7731019d947219f20af547664965b2b304bd23155994ea1aa397
-test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql b44ca36c30cd584c9f976e625a6bc09242792016d5e78057f9ec4174f3a0341f f61dcce549d282a9b7f0bbdcb612909799156231f22f2b5824ec6083630013ec
+test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql f246c95e9897958b75ff487f918d05c1b15b2c05efdaeba01e87f77ea61be139 b3d7537a1285949c7449f3c624210e27d5f2aa0aa933633ab0ffaba1b01c1851
 test/extractor-tests/generated/ReturnTypeSyntax/ReturnTypeSyntax.ql b08a4d4ad63ea6e62f8b9646fd838cac9d122a93f5716ee91ff7c62fa987a1d0 264d485a301f4220eaa580ae90964b05c1a2b19b898698e7cdcc86b624ba3aba
-test/extractor-tests/generated/SelfParam/SelfParam.ql 7e57dd845ddc9142cce250c7e67e36044f2cc27b618a3b8876db7a6ac336d3e3 e546b5a690770e57bcfb07a662430f62128a3fed4eb46bd17c60c9e4595154ba
+test/extractor-tests/generated/SelfParam/SelfParam.ql f7a9e0f0ef2cff8491a8b1e8a56a78de50121b3a49231dd2284b5c4420e196d8 1293a235bc9338e8d3cd4334f167237b888e5a3feae6898e7bc321ee12f97eae
 test/extractor-tests/generated/SlicePat/SlicePat.ql ec056b803471d22c8575313e0caca89a3d527d228719375e87cc6061c3da4ffe fb0af765ce9d04805cdd445e2222d6f956c6789285705bb1079e540935ae6cc5
 test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql a009f2ba47f3b082db274b6bd7068d65c0205bd11b13d2c202e43a6b9b48e76b a3092ea5f2b7113235aec5136800205265f1607c5cfac9f5a3552bed5d98cdf2
-test/extractor-tests/generated/SourceFile/SourceFile.ql 19ae5570a88b9e2d82db66685a31b01cc8e0c86c622a4bfaabe8c5b397b27eea 60e2ba5eb82518d6408254fb4ec01277b6c6c0e4316d4f3cdc809da9c32c4a57
-test/extractor-tests/generated/Static/Static.ql ec2e5cf081453bbae16216d1250f5d8324be81d1d6ad8744e969934d2ef21b0d 7bde1afbafdc16f9c999e902626c77dc0efe3f1b3d687e9fe1a3e9db6b1f62a9
-test/extractor-tests/generated/StmtList/StmtList.ql 4c6b9d5d8fd7535f97d81b968d4f67fc50e10c5d0f980e7c2704bbf5cd07481e ad972adb8d9a7892e6f8a12d96649340441f947afc99e633ea438c4d5c795ce4
-test/extractor-tests/generated/Struct/Struct.ql 57e837e3c665d24870d99492c8874441ce1445b314863ae405cc6f721d2ac14c ddeee05945e91356a1dc66976ef4830230b1c024ace02f974ff42c8193fd3464
+test/extractor-tests/generated/SourceFile/SourceFile.ql cbff8d6579c058a7bf4035f92861a0d9e2a989026c3756d298f84bae5aa023f1 b870df0a46c9d01162423152286480ea4fea47a10ec76e073c4b72eca2e79372
+test/extractor-tests/generated/Static/Static.ql e40778afa94a6d9dbc8ada23b70d0816729a6161725db5a64b85229cf7fdbee9 228d1367e6337d9ee48efd31bb2026793442e1cdf818bb97370c482ef2ca2d8a
+test/extractor-tests/generated/StmtList/StmtList.ql 6b12ed68dd446435724880f6bd10e07449830bb42fa86d7190085e9a5bb5342d 0ea0478d6c953ccd5bde4a0d2ffb35393ccc5e1887c51bb4fd98fdcaddf4764a
+test/extractor-tests/generated/Struct/Struct.ql 540c85ec92138c1bacf7023cff7371abb24f4068211e9f0967784b1b075fa6a0 43e599ab89f973d68187e5e560c56a969fb1ef836f16966cfb55817d93430231
 test/extractor-tests/generated/StructExpr/StructExpr.ql 3b98205260e750cc7adc42b318deef2854cc3b4f921cbcfffc6d701553af3903 368bccf01db2fa069dca30d9fb0878f8e6a88d4ce58b333b24a18620933e4c91
-test/extractor-tests/generated/StructExprField/StructExprField.ql b65375963aa24f0d1dd4c10784e32ab8c337ad431462ea1d081a0e456fbb1362 7f5a49e8df03ed0890b51c2e941d636fbbf70445a53d3af2c0f34a04f26bc6ef
-test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql 01dc3ef66d79836a3d372464f05454015648ab093f9547c5d9c5d55271acb718 83625301c097fa38d4e6021ea28b8adc6338076c8c2aa88a86a22aac412839f6
-test/extractor-tests/generated/StructField/StructField.ql dbdb627202975a0ca07ed441449ecc95d9d0764084a49a18e7849164b2e65ce2 8e7f32f28d15104575eaa985e892c162ec775adf3481c227ef618b5668168de7
+test/extractor-tests/generated/StructExprField/StructExprField.ql b6c5ffb51b457579bc378993a4e8d8e76104892da3e09b896571de194a507995 00b1c17c432c44da9c84ed9f41ad48cd98a899b43d7b9bdd634570e6bba06a3d
+test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql 94a52f44be3a1bd8a2245849dfeb00df7c8e274afbd60ad980030dc563ab8fa9 6dc9414b678d6811069e405d42916d603c98e591b7807d214f86b0e7ba836206
+test/extractor-tests/generated/StructField/StructField.ql 40205d6adadd24ca678bb6512246c6d0ce612045bca9958f739ff0a5d8832341 cf52647e60f8ee502469fba9c1fb19d49964a2196537f04d782275693e9a84a0
 test/extractor-tests/generated/StructFieldList/StructFieldList.ql 292170b20f3a55c0cd6a8d78ce99474ca68daf6fb380cffe00b2bd7074e1b73a 404bab780f290ae04d1d71d3c6d4e0092bb3d8c55e956168d2a445cbd6d1f06d
 test/extractor-tests/generated/StructPat/StructPat.ql 894babd64d3def35717cbeed6eb4799cf9f52e73992822b72fc521c93efb4935 5bd1502b69014d70464b4b76795e1732ac2a6db5d028bea52929cf1998af5f07
-test/extractor-tests/generated/StructPatField/StructPatField.ql 92cb6a4b5234359c02d66085b10d41f37b77370491ed478ad6d4d9b12b943ecf 14bc2079763b53bc6ab11356f3bb21820ae9e4dd1b2a42a78665c32181c4ef92
+test/extractor-tests/generated/StructPatField/StructPatField.ql 6676040c60c361ef7727fb54efae39c19374d3f27b62c97fb0dccb9fdbd3f87b 71418d75796d9ee63f71b2a91638459bbb8b7066f343f4b60770d17cbf200a80
 test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql a3ba3e99d3c87d5e0ae0ad82cbea3600ac1745e9364d54d8d51224b51a5a09a5 5942ed2722c006bae99de9174249110bfc79594c5ef9a6dfc098ae2be269b8f3
 test/extractor-tests/generated/TokenTree/TokenTree.ql 55592f43a6fe99045d0b0b1e2323211d3a3fd64a8c7d2b083f2518d4c3e2e4b0 8eeef2060c80b0918857ba9b3a8543a4b866ca04be3d5ca18aae8a26cbdb836e
-test/extractor-tests/generated/Trait/AssocItemList.ql 065c4903992500423d796800e7dc9a5835a07cbada595108f3af6efa72517782 aa797bf5ddefb800d5ca7f49c19c5124b1007e1658129b27c8c3de34427c7f08
-test/extractor-tests/generated/Trait/Trait.ql e59d9d97baedc5691f9fb837e3600b1b33808c598971d8abe28121a9c70292b4 0da2808421a1e1acbc61076d4b50c559f2abf02cbd5f69ba15a65457887ff435
-test/extractor-tests/generated/TraitAlias/TraitAlias.ql 9a4bcbf850afd833606f9447493b848e9a5df593198e5fc7a3a5bfb1c4c0782c 1f738eaf245220142d9fe5b88718980494b1e3c5b68609f5ee591056f23ea765
-test/extractor-tests/generated/TryExpr/TryExpr.ql 4e3c224a7d5fb8f01654c7d3c79414daa575897cfa6f351fcd5b5832f53a151f d961a497c304c1c5aa1d94e04aed2bf17a2c422e315f05986e1a9027e69dbd2a
-test/extractor-tests/generated/TupleExpr/TupleExpr.ql 4011d94438903e96fa321285558f5791bee7e1d1fb26be0381586511cf439d1b c6bc8d08a8d5d98d7a52b72d5c597b63754fe12cec653c520833e4b71a9dcea4
-test/extractor-tests/generated/TupleField/TupleField.ql ed681b7fee5e68d24db4999389727b2589e5af793d3c2ddc8b1e245713c0e1f8 4f867b29adf91b4bfa5052e16d392c16bf260e858aad11b60c42f1eddb476e61
+test/extractor-tests/generated/TokenTreeMeta/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Trait/AssocItemList.ql bd5c8c66ea5c2ffb77642317d4654d679ca7ca677a727fd1ce35c16069d5a860 fa29f18e30bded6c591fd0e0dcf674ea9db4c8a73d3c13388239e259fc27c59e
+test/extractor-tests/generated/Trait/Trait.ql e7e22e1b42cd1f181519bcfcfa8c5a55e70f8c9d6a8c24f4233c506f67511f02 8d9d9607691a45434d7922aa46fda1a553a89beec2c6fae5747425f7f0cd040c
+test/extractor-tests/generated/TryBlockModifier/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TryExpr/TryExpr.ql 3351b3100138ffecd80b28b0d7cb82faed4b7537db106bb8913a9dde92630833 3b66ced56613a6f985e2768f940a3ef9baf3c48eabe2e3bfbcd9667f35a433a6
+test/extractor-tests/generated/TupleExpr/TupleExpr.ql 913d873a72d3a6451c42280cd6970dc9df37dbfe764d92c14883aee526d15e72 4e170c90e62a1dff01700b9cb143a7d21da556576a6f01d72d30d6bdec2e1566
+test/extractor-tests/generated/TupleField/TupleField.ql 28f5d9be1f8371630803cf3b6f16bcfe31780ef1cc2edd83e274bbcc862b789e 010ab34b303a55876c525a3b7f7ff1c4fa5595a93bdeba460de2780cd7a64f5c
 test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql 3c3fcef21231550bbbf6804314b94d44cc18d445987c23cb6f2c88015570cc4a 8958e6748296bc6d0ad469e52852c38445fe462a8599a2e71867aa5d7066595e
 test/extractor-tests/generated/TuplePat/TuplePat.ql 80609f1c525e90e13f34d55a81d47a83a03e064241f8d33232e2a79eaeea5159 d289b19dae4cbae0180cc58bb946f41646bb9dc008f5ce8a0e12eaddbc7e63e9
 test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql ea588383e16328486156e872f4d6f999a35534cde49d69b66a6186f01b1c2581 2a2e179b4241a4ff7d486e987cb667ba62025bc8dd48a507142cfec882bd35cc
 test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql 2f1503734d272cd0616e5885cd344659cbd0ae7309a375c8351f57f2b86c3302 276a4fe91b8dc64cdca4467343e2bb2e240c66ec1e4e11bf8cba73819c6532cc
-test/extractor-tests/generated/TypeAlias/TypeAlias.ql cbd2ed23ffff6bae81b121e32c9a7efce43c23d33f82fbfcee833b1043892c60 abf9779da9ee2b267a3dc3be7143f111cac8441c378828329749457bb56aeee3
+test/extractor-tests/generated/TypeAlias/TypeAlias.ql 1a58ab02f37709f2e5840da18630834296d02d9b54f481ff2ede92ebf1b014bb 17cd7b4d501d04abe132379f090599ebd24f08587e09af77af223a49659fee1f
 test/extractor-tests/generated/TypeArg/TypeArg.ql e1ca286c03bd2d44054f5dd75aac250382037f243046c49ec752ad8d65e4c0ba f316d5fa84a721427c0aadf6bfa0ed4cfd86e4d318cfb0fe82efc52e65c4733b
 test/extractor-tests/generated/TypeBound/TypeBound.ql 41d0a7b6538de12797c5aa4152ea701517abe685b1160615f2d74203e7a00d34 f57128c66df37791f93db269451b1c617c991d8723ecb9efe4b8ff8b2559472c
 test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql 6827529eca62f5e7be87538af6231099f5932f39d8694f7a76369273b93f28ea 539dac4ccda7e51b7ae1a9e05d8a56a98176d9de25d5ed4347ebe2fbea8adeb1
-test/extractor-tests/generated/TypeParam/TypeParam.ql c5f8f62f2877c719c3cf069f9d0ca83cebc14f7611c6c2dce86c85114ea2635c 751c630986f35a8d0d32fbeb61ca6ff801c96cd1829dbccc874fbf5f5158e98d
-test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql a7b7a93104fff28515154cf8e79045d3eea2494b5c46f1caf36639c53b1c64a7 070ee2e1664e3291646ea56681b5c93331f94dcc519deb28622beca3e26e16f3
-test/extractor-tests/generated/Union/Union.ql 427757ef5aa4e95fde8f5047263cbbbc7e2614f9efabc51c9a5f9ba8d9b68310 d1d8840a4324e5727e1ecf6e696741e902b807b39ec82686b94211803eb2d0ba
-test/extractor-tests/generated/Use/Use.ql 1f084f3b49c910c6e01d2a81be2443e84c2836a5855b89874965efaf25d17511 d5bf37ba65f4d280312ca798bae22d2735c00cf91ff05ed6321f69b76b4551bc
+test/extractor-tests/generated/TypeParam/TypeParam.ql ac6d88dacb41679d83738b81a6a800d8cc8318d92bbe611cc9f4146b07b90a31 ca3244dbce2863a28668a144f41ff317f049fdaa32ea1095f12ef2ff87a553ac
+test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql 56e017d8b13ff3707d3bbf4a7e3739d02bc3947de85c88418918ee7771920281 8d02bd73453c528828e0afca32e9c512dd2f9ff359b333c6464c83591f8b1d65
+test/extractor-tests/generated/Union/Union.ql c2d924a62918580209b46d0e115c7f22db04360c402c2b9fa30e87f1c338d9af 80bad77b2316b536068e3d082769b87071220462ee223890276e541f430da44c
+test/extractor-tests/generated/UnsafeMeta/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Use/Use.ql 8ad25a5c136252e18e551251bc22228c8853e05f3a8935f2f3fad5b2e86283d6 a7b98e9802b4095e9d501aefd7d47583c20ea0eb85cb01fd7e750ba60aafb9e3
 test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.ql 46ff2cf0fc8b561b21f8dff3230550f2feafbe52a7ea8b28bf183abef94ff241 92646f3bd15a8cf4c23ee9de4d857ac5c147e570ef0eb223423a109b4b79aedf
 test/extractor-tests/generated/UseTree/UseTree.ql 3c2bc924b54b9af5c95784023d4098924571ba464c5982124acea712c3ce0e93 8d9f963b61a9a8a83efd93438ce8b43d4aa763493338ad9afd2a3dc7a440892d
 test/extractor-tests/generated/UseTreeList/UseTreeList.ql faff7bfc060d5b0a922f38b37bf586596566186f704c9921651785580e86d684 81e5b90edeef0d3883547844a030e72b555d714de1ed8dded1c22a3772b4449a
-test/extractor-tests/generated/Variant/Variant.ql 6b1936698cec413f1645d52e3f4d6d995968d432466241eb823c1ae635c852dd 0b5b0248f09ae01b683ea835299d51fa26f6b5a584e889c538b0f0cf13106d0f
+test/extractor-tests/generated/Variant/Variant.ql b5d1bf573a46b31d759ff9613c8367f06c3118f4df5d13e51c6cd73dca447a65 7ed1d0339d5aa8fa60832deaa63be9856696f85b2e5b67cbbbc176ebd2c6f05b
 test/extractor-tests/generated/VariantList/VariantList.ql 1c1d82ce3ecfa7daaae1920662510e81892ed899a3c2f785e2ff3670245a03cd 29d4c5ab2b737a92c7525789e10a4aa9848f1a327e34f4e9543018021106b303
-test/extractor-tests/generated/Visibility/Visibility.ql 725d47d7444332133df603f9b06592dc40b0f83bf5e21ad4781c5658e001a3aa 2d65a30702a8bb5bc91caf6ae2d0e4c769b3eeb0d72ffbd9cdb81048be4061ad
+test/extractor-tests/generated/Visibility/Visibility.ql 3bdf8f1ff70f62eabda19086d2c6b2c7e9cf4f7bb327b053a0115089d4aa9f56 7f89b2519ac4ef8e3afdfce58aa66edc921d36ecf28550f5cc3bce190db752e8
+test/extractor-tests/generated/VisibilityInner/VisibilityInner.ql c71530193ac5395f4b6b0b57efaf0c0076a9e4c115bfbd38a41546045dfa0d75 059ad90ec71d5339928f79338bd7d459d24881762f65d1534b5ded860b533ced
 test/extractor-tests/generated/WhereClause/WhereClause.ql a6f0e69ffa6b997cac04d4da442eb8bde517a576840c953abcc40863b9099ba1 7ce888fffc3038d5b18f8c94d3b045815cd45500e1bb3849c05fc874edbeb695
 test/extractor-tests/generated/WherePred/WherePred.ql 8f73500a04f8748221b181bb9a51bef6c09d5ddf046488303594821e3191b370 8fb51d095a3c39b51ec8b4515fc02474ba36067ca4dfd48dff7e14d1c3881ea3
-test/extractor-tests/generated/WhileExpr/WhileExpr.ql dcfe1ed375514a7b7513272767ed195cdbf339b56e00e62d207ca1eee080f164 f067283510655f0cf810cae834ac29ad2c6007ba312d027ebcdf695a23ec33e4
+test/extractor-tests/generated/WhileExpr/WhileExpr.ql af3616d65bad6e81ef6db0463d68bf5b198e179e3ebb1ef191d235abe62068a7 2e4399a7ff4ca3fce4c14420b1004e901ae55307a6fd87dcc456660b1b0338ac
 test/extractor-tests/generated/WildcardPat/WildcardPat.ql d36f52a1d00d338b43894b6f8e198ad0c409542f436e3e57d527205c3dfee38c 4e1321e714cedb606e0d84f10ed37c72da61b3a1616754b967f721ff0bc0e4ee
-test/extractor-tests/generated/YeetExpr/YeetExpr.ql 5c552b490ccf5b123f7a2fa3e73d03d008e4df5928ffa0bd503dc6bd7736462c 09a4f413ae045051abe392f29949d6feab1a808d666c6b8dac0901f84a8a4740
-test/extractor-tests/generated/YieldExpr/YieldExpr.ql 1d948eaa69ccffb12a2f832b84918d36becfd356d1c6d7cfa9315df03e77ca95 c31281830aee6866b0d4757a427183df4d2f06245345db61f69e9bfa5cd09a63
+test/extractor-tests/generated/YeetExpr/YeetExpr.ql 445f8bae65c2da84237018e6ff1d630da45446e4741e0217fe76bfc8b73ea5e5 b64c617171b727998e47994f052f217652b794f2cdd9799c0dd1ba0b34e2113d
+test/extractor-tests/generated/YieldExpr/YieldExpr.ql 2a257abc729331574a58c12192b2473554930a9c89d05646b030f067ff11e886 ae825976b44270c28ae41be8d0856efbdeab8bcacf20cd56ba1932dfec35a7c7
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index e88e5d2d9609..55dd6f8c9b9f 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -3,6 +3,7 @@
 /lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll linguist-generated
 /lib/codeql/rust/elements/Abi.qll linguist-generated
 /lib/codeql/rust/elements/Addressable.qll linguist-generated
+/lib/codeql/rust/elements/AnyAttr.qll linguist-generated
 /lib/codeql/rust/elements/ArgList.qll linguist-generated
 /lib/codeql/rust/elements/ArrayExpr.qll linguist-generated
 /lib/codeql/rust/elements/ArrayListExpr.qll linguist-generated
@@ -36,6 +37,13 @@
 /lib/codeql/rust/elements/CallExpr.qll linguist-generated
 /lib/codeql/rust/elements/Callable.qll linguist-generated
 /lib/codeql/rust/elements/CastExpr.qll linguist-generated
+/lib/codeql/rust/elements/CfgAtom.qll linguist-generated
+/lib/codeql/rust/elements/CfgAttrMeta.qll linguist-generated
+/lib/codeql/rust/elements/CfgComposite.qll linguist-generated
+/lib/codeql/rust/elements/CfgMeta.qll linguist-generated
+/lib/codeql/rust/elements/CfgPredExpr.qll linguist-generated
+/lib/codeql/rust/elements/CfgPredPat.qll linguist-generated
+/lib/codeql/rust/elements/CfgPredicate.qll linguist-generated
 /lib/codeql/rust/elements/ClosureExpr.qll linguist-generated
 /lib/codeql/rust/elements/Comment.qll linguist-generated
 /lib/codeql/rust/elements/Const.qll linguist-generated
@@ -44,6 +52,8 @@
 /lib/codeql/rust/elements/ConstParam.qll linguist-generated
 /lib/codeql/rust/elements/ContinueExpr.qll linguist-generated
 /lib/codeql/rust/elements/Crate.qll linguist-generated
+/lib/codeql/rust/elements/DerefPat.qll linguist-generated
+/lib/codeql/rust/elements/DocComment.qll linguist-generated
 /lib/codeql/rust/elements/DynTraitTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Element.qll linguist-generated
 /lib/codeql/rust/elements/Enum.qll linguist-generated
@@ -72,11 +82,14 @@
 /lib/codeql/rust/elements/IdentPat.qll linguist-generated
 /lib/codeql/rust/elements/IfExpr.qll linguist-generated
 /lib/codeql/rust/elements/Impl.qll linguist-generated
+/lib/codeql/rust/elements/ImplRestriction.qll linguist-generated
 /lib/codeql/rust/elements/ImplTraitTypeRepr.qll linguist-generated
+/lib/codeql/rust/elements/IncludeBytesExpr.qll linguist-generated
 /lib/codeql/rust/elements/IndexExpr.qll linguist-generated
 /lib/codeql/rust/elements/InferTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Item.qll linguist-generated
 /lib/codeql/rust/elements/ItemList.qll linguist-generated
+/lib/codeql/rust/elements/KeyValueMeta.qll linguist-generated
 /lib/codeql/rust/elements/Label.qll linguist-generated
 /lib/codeql/rust/elements/LabelableExpr.qll linguist-generated
 /lib/codeql/rust/elements/LetElse.qll linguist-generated
@@ -105,16 +118,16 @@
 /lib/codeql/rust/elements/MethodCallExpr.qll linguist-generated
 /lib/codeql/rust/elements/Missing.qll linguist-generated
 /lib/codeql/rust/elements/Module.qll linguist-generated
+/lib/codeql/rust/elements/MutRestriction.qll linguist-generated
 /lib/codeql/rust/elements/Name.qll linguist-generated
 /lib/codeql/rust/elements/NameRef.qll linguist-generated
 /lib/codeql/rust/elements/NeverTypeRepr.qll linguist-generated
+/lib/codeql/rust/elements/NotNull.qll linguist-generated
 /lib/codeql/rust/elements/OffsetOfExpr.qll linguist-generated
 /lib/codeql/rust/elements/OrPat.qll linguist-generated
 /lib/codeql/rust/elements/Param.qll linguist-generated
 /lib/codeql/rust/elements/ParamBase.qll linguist-generated
 /lib/codeql/rust/elements/ParamList.qll linguist-generated
-/lib/codeql/rust/elements/ParenExpr.qll linguist-generated
-/lib/codeql/rust/elements/ParenPat.qll linguist-generated
 /lib/codeql/rust/elements/ParenTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/ParenthesizedArgList.qll linguist-generated
 /lib/codeql/rust/elements/Pat.qll linguist-generated
@@ -122,9 +135,11 @@
 /lib/codeql/rust/elements/PathAstNode.qll linguist-generated
 /lib/codeql/rust/elements/PathExpr.qll linguist-generated
 /lib/codeql/rust/elements/PathExprBase.qll linguist-generated
+/lib/codeql/rust/elements/PathMeta.qll linguist-generated
 /lib/codeql/rust/elements/PathPat.qll linguist-generated
 /lib/codeql/rust/elements/PathSegment.qll linguist-generated
 /lib/codeql/rust/elements/PathTypeRepr.qll linguist-generated
+/lib/codeql/rust/elements/PatternTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/PrefixExpr.qll linguist-generated
 /lib/codeql/rust/elements/PtrTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/RangeExpr.qll linguist-generated
@@ -155,8 +170,9 @@
 /lib/codeql/rust/elements/StructPatFieldList.qll linguist-generated
 /lib/codeql/rust/elements/Token.qll linguist-generated
 /lib/codeql/rust/elements/TokenTree.qll linguist-generated
+/lib/codeql/rust/elements/TokenTreeMeta.qll linguist-generated
 /lib/codeql/rust/elements/Trait.qll linguist-generated
-/lib/codeql/rust/elements/TraitAlias.qll linguist-generated
+/lib/codeql/rust/elements/TryBlockModifier.qll linguist-generated
 /lib/codeql/rust/elements/TryExpr.qll linguist-generated
 /lib/codeql/rust/elements/TupleExpr.qll linguist-generated
 /lib/codeql/rust/elements/TupleField.qll linguist-generated
@@ -175,6 +191,7 @@
 /lib/codeql/rust/elements/Unextracted.qll linguist-generated
 /lib/codeql/rust/elements/Unimplemented.qll linguist-generated
 /lib/codeql/rust/elements/Union.qll linguist-generated
+/lib/codeql/rust/elements/UnsafeMeta.qll linguist-generated
 /lib/codeql/rust/elements/Use.qll linguist-generated
 /lib/codeql/rust/elements/UseBoundGenericArg.qll linguist-generated
 /lib/codeql/rust/elements/UseBoundGenericArgs.qll linguist-generated
@@ -183,6 +200,7 @@
 /lib/codeql/rust/elements/Variant.qll linguist-generated
 /lib/codeql/rust/elements/VariantList.qll linguist-generated
 /lib/codeql/rust/elements/Visibility.qll linguist-generated
+/lib/codeql/rust/elements/VisibilityInner.qll linguist-generated
 /lib/codeql/rust/elements/WhereClause.qll linguist-generated
 /lib/codeql/rust/elements/WherePred.qll linguist-generated
 /lib/codeql/rust/elements/WhileExpr.qll linguist-generated
@@ -191,6 +209,7 @@
 /lib/codeql/rust/elements/YieldExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/AbiConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/AbiImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/AnyAttrImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ArgListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ArgListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ArrayExprInternal.qll linguist-generated
@@ -238,6 +257,19 @@
 /lib/codeql/rust/elements/internal/BreakExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CallExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CastExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/CfgAtomConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/CfgAtomImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/CfgAttrMetaConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/CfgAttrMetaImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/CfgCompositeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/CfgCompositeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/CfgMetaConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/CfgMetaImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/CfgPredExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/CfgPredExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/CfgPredPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/CfgPredPatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/CfgPredicateImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ClosureExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CommentConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstArgConstructor.qll linguist-generated
@@ -249,6 +281,10 @@
 /lib/codeql/rust/elements/internal/ConstParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ContinueExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CrateConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/DerefPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/DerefPatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/DocCommentConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/DocCommentImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/DynTraitTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/EnumConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExprImpl.qll linguist-generated
@@ -282,11 +318,17 @@
 /lib/codeql/rust/elements/internal/IdentPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/IfExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ImplConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplRestrictionConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplRestrictionImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/IncludeBytesExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/IncludeBytesExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/IndexExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ItemListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ItemListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/KeyValueMetaConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/KeyValueMetaImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LabelConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LetElseConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LetExprConstructor.qll linguist-generated
@@ -319,25 +361,25 @@
 /lib/codeql/rust/elements/internal/MatchExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchGuardConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchGuardImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/MetaConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/MetaImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MethodCallExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MissingConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MissingImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ModuleConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MutRestrictionConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MutRestrictionImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/NameConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/NameRefConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/NamedCrate.qll linguist-generated
 /lib/codeql/rust/elements/internal/NamedCrateConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/NamedCrateImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/NeverTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/NotNullConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/NotNullImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/OffsetOfExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/OrPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParamConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParamListConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ParenExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ParenPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParenTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParenthesizedArgListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParenthesizedArgListImpl.qll linguist-generated
@@ -345,9 +387,13 @@
 /lib/codeql/rust/elements/internal/PathConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathExprBaseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PathMetaConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PathMetaImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathSegmentConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PatternTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PatternTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PrefixExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PtrTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PtrTypeReprImpl.qll linguist-generated
@@ -392,9 +438,11 @@
 /lib/codeql/rust/elements/internal/TokenImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TokenTreeConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TokenTreeImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/TraitAliasConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/TraitAliasImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TokenTreeMetaConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TokenTreeMetaImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TraitConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TryBlockModifierConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TryBlockModifierImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TryExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TryExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TupleExprConstructor.qll linguist-generated
@@ -419,6 +467,8 @@
 /lib/codeql/rust/elements/internal/UnimplementedConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnimplementedImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnionConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/UnsafeMetaConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/UnsafeMetaImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UseBoundGenericArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UseBoundGenericArgsConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/UseBoundGenericArgsImpl.qll linguist-generated
@@ -430,6 +480,8 @@
 /lib/codeql/rust/elements/internal/VariantListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/VariantListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/VisibilityConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/VisibilityInnerConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/VisibilityInnerImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/WhereClauseConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/WhereClauseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/WherePredConstructor.qll linguist-generated
@@ -442,6 +494,7 @@
 /lib/codeql/rust/elements/internal/YieldExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Abi.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Addressable.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/AnyAttr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ArgList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ArrayExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll linguist-generated
@@ -476,6 +529,13 @@
 /lib/codeql/rust/elements/internal/generated/CallExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Callable.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/CastExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/CfgAtom.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/CfgAttrMeta.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/CfgComposite.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/CfgMeta.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/CfgPredExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/CfgPredPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/CfgPredicate.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ClosureExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Comment.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Const.qll linguist-generated
@@ -484,6 +544,8 @@
 /lib/codeql/rust/elements/internal/generated/ConstParam.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ContinueExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Crate.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/DerefPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/DocComment.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Element.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Enum.qll linguist-generated
@@ -513,11 +575,14 @@
 /lib/codeql/rust/elements/internal/generated/IdentPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/IfExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Impl.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ImplRestriction.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ImplTraitTypeRepr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/IncludeBytesExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/IndexExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/InferTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Item.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ItemList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/KeyValueMeta.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Label.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LabelableExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LetElse.qll linguist-generated
@@ -546,17 +611,17 @@
 /lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Missing.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Module.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MutRestriction.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Name.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/NameRef.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/NamedCrate.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/NeverTypeRepr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/NotNull.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/OrPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Param.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParamBase.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParamList.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ParenExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ParenPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParentChild.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParenthesizedArgList.qll linguist-generated
@@ -565,9 +630,11 @@
 /lib/codeql/rust/elements/internal/generated/PathAstNode.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PathExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PathExprBase.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/PathMeta.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PathPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PathSegment.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PathTypeRepr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/PatternTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PrefixExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll linguist-generated
@@ -602,8 +669,9 @@
 /lib/codeql/rust/elements/internal/generated/SynthConstructors.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Token.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TokenTree.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TokenTreeMeta.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Trait.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/TraitAlias.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TryBlockModifier.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TryExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TupleExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TupleField.qll linguist-generated
@@ -622,6 +690,7 @@
 /lib/codeql/rust/elements/internal/generated/Unextracted.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Unimplemented.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Union.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/UnsafeMeta.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Use.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/UseBoundGenericArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll linguist-generated
@@ -630,6 +699,7 @@
 /lib/codeql/rust/elements/internal/generated/Variant.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/VariantList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Visibility.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/VisibilityInner.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/WhereClause.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/WherePred.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/WhileExpr.qll linguist-generated
@@ -664,6 +734,12 @@
 /test/extractor-tests/generated/BreakExpr/BreakExpr.ql linguist-generated
 /test/extractor-tests/generated/CallExpr/CallExpr.ql linguist-generated
 /test/extractor-tests/generated/CastExpr/CastExpr.ql linguist-generated
+/test/extractor-tests/generated/CfgAtom/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/CfgAttrMeta/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/CfgComposite/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/CfgMeta/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/CfgPredExpr/CfgPredExpr.ql linguist-generated
+/test/extractor-tests/generated/CfgPredPat/CfgPredPat.ql linguist-generated
 /test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql linguist-generated
 /test/extractor-tests/generated/Comment/Comment.ql linguist-generated
 /test/extractor-tests/generated/Const/Const.ql linguist-generated
@@ -672,6 +748,8 @@
 /test/extractor-tests/generated/ConstParam/ConstParam.ql linguist-generated
 /test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql linguist-generated
 /test/extractor-tests/generated/Crate/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/DerefPat/DerefPat.ql linguist-generated
+/test/extractor-tests/generated/DocComment/DocComment.ql linguist-generated
 /test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/Enum/Enum.ql linguist-generated
 /test/extractor-tests/generated/ExprStmt/ExprStmt.ql linguist-generated
@@ -694,10 +772,13 @@
 /test/extractor-tests/generated/IdentPat/IdentPat.ql linguist-generated
 /test/extractor-tests/generated/IfExpr/IfExpr.ql linguist-generated
 /test/extractor-tests/generated/Impl/Impl.ql linguist-generated
+/test/extractor-tests/generated/ImplRestriction/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/IncludeBytesExpr/IncludeBytesExpr.ql linguist-generated
 /test/extractor-tests/generated/IndexExpr/IndexExpr.ql linguist-generated
 /test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/ItemList/ItemList.ql linguist-generated
+/test/extractor-tests/generated/KeyValueMeta/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/Label/Label.ql linguist-generated
 /test/extractor-tests/generated/LetElse/LetElse.ql linguist-generated
 /test/extractor-tests/generated/LetExpr/LetExpr.ql linguist-generated
@@ -719,18 +800,17 @@
 /test/extractor-tests/generated/MatchArmList/MatchArmList.ql linguist-generated
 /test/extractor-tests/generated/MatchExpr/MatchExpr.ql linguist-generated
 /test/extractor-tests/generated/MatchGuard/MatchGuard.ql linguist-generated
-/test/extractor-tests/generated/Meta/Meta.ql linguist-generated
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql linguist-generated
 /test/extractor-tests/generated/Module/Module.ql linguist-generated
+/test/extractor-tests/generated/MutRestriction/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/Name/Name.ql linguist-generated
 /test/extractor-tests/generated/NameRef/NameRef.ql linguist-generated
 /test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/NotNull/NotNull.ql linguist-generated
 /test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql linguist-generated
 /test/extractor-tests/generated/OrPat/OrPat.ql linguist-generated
 /test/extractor-tests/generated/Param/Param.ql linguist-generated
 /test/extractor-tests/generated/ParamList/ParamList.ql linguist-generated
-/test/extractor-tests/generated/ParenExpr/ParenExpr.ql linguist-generated
-/test/extractor-tests/generated/ParenPat/ParenPat.ql linguist-generated
 /test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.ql linguist-generated
 /test/extractor-tests/generated/Path/Path.ql linguist-generated
@@ -738,6 +818,8 @@
 /test/extractor-tests/generated/Path/PathPat.ql linguist-generated
 /test/extractor-tests/generated/Path/PathSegment.ql linguist-generated
 /test/extractor-tests/generated/Path/PathTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/PathMeta/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/PatternTypeRepr/PatternTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql linguist-generated
 /test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/RangeExpr/RangeExpr.ql linguist-generated
@@ -766,9 +848,10 @@
 /test/extractor-tests/generated/StructPatField/StructPatField.ql linguist-generated
 /test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql linguist-generated
 /test/extractor-tests/generated/TokenTree/TokenTree.ql linguist-generated
+/test/extractor-tests/generated/TokenTreeMeta/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/Trait/AssocItemList.ql linguist-generated
 /test/extractor-tests/generated/Trait/Trait.ql linguist-generated
-/test/extractor-tests/generated/TraitAlias/TraitAlias.ql linguist-generated
+/test/extractor-tests/generated/TryBlockModifier/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/TryExpr/TryExpr.ql linguist-generated
 /test/extractor-tests/generated/TupleExpr/TupleExpr.ql linguist-generated
 /test/extractor-tests/generated/TupleField/TupleField.ql linguist-generated
@@ -783,6 +866,7 @@
 /test/extractor-tests/generated/TypeParam/TypeParam.ql linguist-generated
 /test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql linguist-generated
 /test/extractor-tests/generated/Union/Union.ql linguist-generated
+/test/extractor-tests/generated/UnsafeMeta/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/Use/Use.ql linguist-generated
 /test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.ql linguist-generated
 /test/extractor-tests/generated/UseTree/UseTree.ql linguist-generated
@@ -790,6 +874,7 @@
 /test/extractor-tests/generated/Variant/Variant.ql linguist-generated
 /test/extractor-tests/generated/VariantList/VariantList.ql linguist-generated
 /test/extractor-tests/generated/Visibility/Visibility.ql linguist-generated
+/test/extractor-tests/generated/VisibilityInner/VisibilityInner.ql linguist-generated
 /test/extractor-tests/generated/WhereClause/WhereClause.ql linguist-generated
 /test/extractor-tests/generated/WherePred/WherePred.ql linguist-generated
 /test/extractor-tests/generated/WhileExpr/WhileExpr.ql linguist-generated
diff --git a/rust/ql/consistency-queries/SsaConsistency.ql b/rust/ql/consistency-queries/SsaConsistency.ql
index 1774f269749c..4cbce78c5207 100644
--- a/rust/ql/consistency-queries/SsaConsistency.ql
+++ b/rust/ql/consistency-queries/SsaConsistency.ql
@@ -8,3 +8,4 @@
 import codeql.rust.dataflow.Ssa
 import codeql.rust.dataflow.internal.SsaImpl
 import Consistency
+import DataFlowIntegration::DfConsistency
diff --git a/rust/ql/integration-tests/conftest.py b/rust/ql/integration-tests/conftest.py
index 578a81a849a9..d7d6738100ab 100644
--- a/rust/ql/integration-tests/conftest.py
+++ b/rust/ql/integration-tests/conftest.py
@@ -5,6 +5,16 @@
 import tomllib
 
 
+def pytest_configure(config):
+    # Install the fixed toolchain used by the extractor before xdist starts its
+    # workers to avoid concurrent rustup downloads. The version here should
+    # match `FIXED_RUST_TOOLCHAIN`.
+    if not hasattr(config, "workerinput"):
+        commands.run(
+            "rustup toolchain install 1.99.0 --profile minimal --component rust-src"
+        )
+
+
 @pytest.fixture(params=[2018, 2021, 2024])
 def rust_edition(request):
     return request.param
diff --git a/rust/ql/integration-tests/dependency-features/.cargo/config.toml b/rust/ql/integration-tests/dependency-features/.cargo/config.toml
new file mode 100644
index 000000000000..6f5d1edd7231
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/.cargo/config.toml
@@ -0,0 +1,7 @@
+# Add a source definition backed by the directories in "dependencies"
+[source.test-dependencies]
+directory = "dependencies"
+
+# Map crates.io to our local source definition
+[source.crates-io]
+replace-with = "test-dependencies"
diff --git a/rust/ql/integration-tests/dependency-features/dependencies/alpha/.cargo-checksum.json b/rust/ql/integration-tests/dependency-features/dependencies/alpha/.cargo-checksum.json
new file mode 100644
index 000000000000..09bf61c6fa41
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/dependencies/alpha/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files": {}, "package": null}
diff --git a/rust/ql/integration-tests/dependency-features/dependencies/alpha/Cargo.toml b/rust/ql/integration-tests/dependency-features/dependencies/alpha/Cargo.toml
new file mode 100644
index 000000000000..151c6e5949f1
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/dependencies/alpha/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "alpha"
+version = "0.1.0"
+edition = "2024"
+
+[features]
+a = []
+b = []
diff --git a/rust/ql/integration-tests/dependency-features/dependencies/alpha/src/lib.rs b/rust/ql/integration-tests/dependency-features/dependencies/alpha/src/lib.rs
new file mode 100644
index 000000000000..70d16610593c
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/dependencies/alpha/src/lib.rs
@@ -0,0 +1,27 @@
+#[cfg(all(feature = "a", feature = "b"))]
+pub fn a() {}
+
+#[cfg(all(feature = "a", not(feature = "b")))]
+mod only_a;
+
+#[cfg(all(feature = "a", not(feature = "b")))]
+pub use only_a::a;
+
+#[cfg(feature = "b")]
+pub fn b() {}
+
+#[cfg(feature = "b")]
+#[macro_export]
+macro_rules! invoke {
+    () => {
+        $crate::b()
+    };
+}
+
+#[cfg(not(feature = "b"))]
+#[macro_export]
+macro_rules! invoke {
+    () => {
+        $crate::a()
+    };
+}
diff --git a/rust/ql/integration-tests/dependency-features/dependencies/alpha/src/only_a.rs b/rust/ql/integration-tests/dependency-features/dependencies/alpha/src/only_a.rs
new file mode 100644
index 000000000000..6dcbbb1ccfe8
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/dependencies/alpha/src/only_a.rs
@@ -0,0 +1,7 @@
+macro_rules! define_a {
+    () => {
+        pub fn a() {}
+    };
+}
+
+define_a!();
diff --git a/rust/ql/integration-tests/dependency-features/dependencies/beta/.cargo-checksum.json b/rust/ql/integration-tests/dependency-features/dependencies/beta/.cargo-checksum.json
new file mode 100644
index 000000000000..09bf61c6fa41
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/dependencies/beta/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files": {}, "package": null}
diff --git a/rust/ql/integration-tests/dependency-features/dependencies/beta/Cargo.toml b/rust/ql/integration-tests/dependency-features/dependencies/beta/Cargo.toml
new file mode 100644
index 000000000000..b9c6e4f70445
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/dependencies/beta/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "beta"
+version = "0.1.0"
+edition = "2024"
+
+[features]
+a = []
+b = []
diff --git a/rust/ql/integration-tests/dependency-features/dependencies/beta/src/lib.rs b/rust/ql/integration-tests/dependency-features/dependencies/beta/src/lib.rs
new file mode 100644
index 000000000000..c2aafb3b633e
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/dependencies/beta/src/lib.rs
@@ -0,0 +1,21 @@
+#[cfg(feature = "a")]
+pub fn a() {}
+
+#[cfg(feature = "b")]
+pub fn b() {}
+
+#[cfg(feature = "b")]
+#[macro_export]
+macro_rules! invoke {
+    () => {
+        $crate::b()
+    };
+}
+
+#[cfg(not(feature = "b"))]
+#[macro_export]
+macro_rules! invoke {
+    () => {
+        $crate::a()
+    };
+}
diff --git a/rust/ql/integration-tests/dependency-features/functions.ql b/rust/ql/integration-tests/dependency-features/functions.ql
new file mode 100644
index 000000000000..a475c9258072
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/functions.ql
@@ -0,0 +1,13 @@
+import rust
+
+from Call c, string target
+where
+  c.getFile().getRelativePath() in [
+      "first/src/lib.rs", "second/src/lib.rs", "src/lib.rs", "build.rs"
+    ] and
+  (
+    target = c.getStaticTarget().getCanonicalPath()
+    or
+    not exists(c.getStaticTarget()) and target = "<unresolved>"
+  )
+select c, target
diff --git a/rust/ql/integration-tests/dependency-features/functions.rich.expected b/rust/ql/integration-tests/dependency-features/functions.rich.expected
new file mode 100644
index 000000000000..796c4e1aae87
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/functions.rich.expected
@@ -0,0 +1,4 @@
+| source/first/src/lib.rs:2:5:2:18 | ...::b(...) | alpha::b |
+| source/first/src/lib.rs:3:5:3:17 | ...::a(...) | beta::a |
+| source/second/src/lib.rs:2:5:2:18 | ...::a(...) | alpha::a |
+| source/second/src/lib.rs:3:5:3:17 | ...::b(...) | beta::b |
diff --git a/rust/ql/integration-tests/dependency-features/functions.rich.reversed.expected b/rust/ql/integration-tests/dependency-features/functions.rich.reversed.expected
new file mode 100644
index 000000000000..f352f77ba179
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/functions.rich.reversed.expected
@@ -0,0 +1,4 @@
+| source/first/src/lib.rs:2:5:2:18 | ...::a(...) | alpha::a |
+| source/first/src/lib.rs:3:5:3:17 | ...::b(...) | beta::b |
+| source/second/src/lib.rs:2:5:2:18 | ...::b(...) | alpha::b |
+| source/second/src/lib.rs:3:5:3:17 | ...::a(...) | beta::a |
diff --git a/rust/ql/integration-tests/dependency-features/functions.tie.expected b/rust/ql/integration-tests/dependency-features/functions.tie.expected
new file mode 100644
index 000000000000..31cbfba529fa
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/functions.tie.expected
@@ -0,0 +1,4 @@
+| source/first/src/lib.rs:2:5:2:18 | ...::a(...) | <unresolved> |
+| source/first/src/lib.rs:3:5:3:17 | ...::b(...) | beta::b |
+| source/second/src/lib.rs:2:5:2:18 | ...::b(...) | alpha::b |
+| source/second/src/lib.rs:3:5:3:17 | ...::a(...) | <unresolved> |
diff --git a/rust/ql/integration-tests/dependency-features/functions.tie.reversed.expected b/rust/ql/integration-tests/dependency-features/functions.tie.reversed.expected
new file mode 100644
index 000000000000..a4475eb87c83
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/functions.tie.reversed.expected
@@ -0,0 +1,4 @@
+| source/first/src/lib.rs:2:5:2:18 | ...::b(...) | alpha::b |
+| source/first/src/lib.rs:3:5:3:17 | ...::a(...) | <unresolved> |
+| source/second/src/lib.rs:2:5:2:18 | ...::a(...) | <unresolved> |
+| source/second/src/lib.rs:3:5:3:17 | ...::b(...) | beta::b |
diff --git a/rust/ql/integration-tests/dependency-features/inactive-module.ql b/rust/ql/integration-tests/dependency-features/inactive-module.ql
new file mode 100644
index 000000000000..9096a1ac43c6
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/inactive-module.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where f.getFile().getBaseName() = "only_a.rs"
+select f, f.getName()
diff --git a/rust/ql/integration-tests/dependency-features/inactive-module.rich.expected b/rust/ql/integration-tests/dependency-features/inactive-module.rich.expected
new file mode 100644
index 000000000000..377f38232a12
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/inactive-module.rich.expected
@@ -0,0 +1 @@
+| dependencies/alpha/src/only_a.rs:7:1:7:9 | fn a | dependencies/alpha/src/only_a.rs:7:1:7:9 | a |
diff --git a/rust/ql/integration-tests/dependency-features/inactive-module.rich.reversed.expected b/rust/ql/integration-tests/dependency-features/inactive-module.rich.reversed.expected
new file mode 100644
index 000000000000..377f38232a12
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/inactive-module.rich.reversed.expected
@@ -0,0 +1 @@
+| dependencies/alpha/src/only_a.rs:7:1:7:9 | fn a | dependencies/alpha/src/only_a.rs:7:1:7:9 | a |
diff --git a/rust/ql/integration-tests/dependency-features/inactive-module.tie.expected b/rust/ql/integration-tests/dependency-features/inactive-module.tie.expected
new file mode 100644
index 000000000000..377f38232a12
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/inactive-module.tie.expected
@@ -0,0 +1 @@
+| dependencies/alpha/src/only_a.rs:7:1:7:9 | fn a | dependencies/alpha/src/only_a.rs:7:1:7:9 | a |
diff --git a/rust/ql/integration-tests/dependency-features/inactive-module.tie.reversed.expected b/rust/ql/integration-tests/dependency-features/inactive-module.tie.reversed.expected
new file mode 100644
index 000000000000..377f38232a12
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/inactive-module.tie.reversed.expected
@@ -0,0 +1 @@
+| dependencies/alpha/src/only_a.rs:7:1:7:9 | fn a | dependencies/alpha/src/only_a.rs:7:1:7:9 | a |
diff --git a/rust/ql/integration-tests/dependency-features/source/first/src/lib.rs b/rust/ql/integration-tests/dependency-features/source/first/src/lib.rs
new file mode 100644
index 000000000000..a4a49f20b4ce
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/source/first/src/lib.rs
@@ -0,0 +1,4 @@
+pub fn emit() {
+    alpha::invoke!();
+    beta::invoke!();
+}
diff --git a/rust/ql/integration-tests/dependency-features/source/second/src/lib.rs b/rust/ql/integration-tests/dependency-features/source/second/src/lib.rs
new file mode 100644
index 000000000000..a4a49f20b4ce
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/source/second/src/lib.rs
@@ -0,0 +1,4 @@
+pub fn emit() {
+    alpha::invoke!();
+    beta::invoke!();
+}
diff --git a/rust/ql/integration-tests/dependency-features/test_dependency_features.py b/rust/ql/integration-tests/dependency-features/test_dependency_features.py
new file mode 100644
index 000000000000..a7da594e6908
--- /dev/null
+++ b/rust/ql/integration-tests/dependency-features/test_dependency_features.py
@@ -0,0 +1,82 @@
+import json
+from textwrap import dedent
+
+import commands
+import pytest
+
+
+@pytest.mark.parametrize(
+    ("configurations", "reverse"),
+    [
+        pytest.param(
+            configurations,
+            reverse,
+            marks=pytest.mark.ql_test(
+                expected=f".{expected}{'.reversed' if reverse else ''}.expected"
+            ),
+            id=f"{name}{'-reversed' if reverse else ''}",
+        )
+        for name, expected, configurations in [
+            ("more-features", "rich", [(["a", "b"], ["a"]), (["a"], ["a", "b"])]),
+            ("equal-features", "tie", [(["a"], ["b"]), (["b"], ["a"])]),
+        ]
+        for reverse in [False, True]
+    ],
+)
+def test_dependency_features(codeql, rust, cwd, configurations, reverse):
+    """
+    Two independent workspaces, `source/first` and `source/second`, share the
+    local dependencies `alpha` and `beta`, but enable different Cargo features
+    (their `Cargo.toml` are created in this test).
+
+    Below is an overview of the files in the test setup.
+    ```
+    dependency-features/
+    |-- dependencies/
+    |   |-- alpha/
+    |   |   |-- Cargo.toml
+    |   |   `-- src/lib.rs       # feature-gated functions and invoke! macro
+    |   `-- beta/
+    |       |-- Cargo.toml
+    |       `-- src/lib.rs       # feature-gated functions and invoke! macro
+    |-- source/
+    |   |-- first/
+    |   |   |-- Cargo.toml       # generated by this test for each configuration
+    |   |   `-- src/lib.rs       # calls alpha::invoke! and beta::invoke!
+    |   `-- second/
+    |       |-- Cargo.toml       # generated by this test for each configuration
+    |       `-- src/lib.rs       # calls alpha::invoke! and beta::invoke!
+    ```
+
+    Each `src/lib.rs` file calls a macro from each dependency. The macros expand
+    to different calls depending on the enabled features. The `functions.ql`
+    query checks which calls and targets are extracted for the `src/lib.rs`
+    files.
+
+    Alpha's `only_a` module is disabled by feature `b`. Its item macro must still
+    be expanded using a configuration in which the module is enabled, even when
+    a richer configuration wins for alpha's other files.
+    """
+    if reverse:
+        configurations = configurations[::-1]
+    for workspace, features in zip(["first", "second"], configurations):
+        manifest = cwd / "source" / workspace / "Cargo.toml"
+        manifest.write_text(
+            dedent(f"""\
+                [package]
+                name = "{workspace}"
+                version = "0.1.0"
+                edition = "2024"
+
+                [workspace]
+
+                [dependencies]
+                """)
+            + "\n".join(
+                f'{name} = {{ version = "=0.1.0", features = {json.dumps(enabled)} }}'
+                for name, enabled in zip(["alpha", "beta"], features)
+            )
+            + "\n"
+        )
+        commands.run(f'cargo check --quiet --manifest-path "{manifest}"')
+    codeql.database.create(source_root="source")
diff --git a/rust/ql/integration-tests/hello-project/summary.expected b/rust/ql/integration-tests/hello-project/summary.expected
index 0d639fe44f75..e83ef6d22658 100644
--- a/rust/ql/integration-tests/hello-project/summary.expected
+++ b/rust/ql/integration-tests/hello-project/summary.expected
@@ -1,6 +1,6 @@
 | Extraction errors | 0 |
 | Extraction warnings | 0 |
-| Files extracted - total | 5 |
+| Files extracted - total user | 5 |
 | Files extracted - with errors | 0 |
 | Files extracted - without errors | 5 |
 | Files extracted - without errors % | 100 |
diff --git a/rust/ql/integration-tests/hello-workspace/summary.cargo.expected b/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
index 11fba34f9019..85d2b9971712 100644
--- a/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
+++ b/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
@@ -1,6 +1,6 @@
 | Extraction errors | 0 |
 | Extraction warnings | 0 |
-| Files extracted - total | 4 |
+| Files extracted - total user | 4 |
 | Files extracted - with errors | 0 |
 | Files extracted - without errors | 4 |
 | Files extracted - without errors % | 100 |
diff --git a/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected b/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
index 11fba34f9019..85d2b9971712 100644
--- a/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
+++ b/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
@@ -1,6 +1,6 @@
 | Extraction errors | 0 |
 | Extraction warnings | 0 |
-| Files extracted - total | 4 |
+| Files extracted - total user | 4 |
 | Files extracted - with errors | 0 |
 | Files extracted - without errors | 4 |
 | Files extracted - without errors % | 100 |
diff --git a/rust/ql/integration-tests/query-suite/rust-code-scanning.qls.expected b/rust/ql/integration-tests/query-suite/rust-code-scanning.qls.expected
index 9b10079767ba..609045ce523a 100644
--- a/rust/ql/integration-tests/query-suite/rust-code-scanning.qls.expected
+++ b/rust/ql/integration-tests/query-suite/rust-code-scanning.qls.expected
@@ -10,6 +10,7 @@ ql/rust/ql/src/queries/diagnostics/UnextractedElements.ql
 ql/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql
 ql/rust/ql/src/queries/security/CWE-020/RegexInjection.ql
 ql/rust/ql/src/queries/security/CWE-022/TaintedPath.ql
+ql/rust/ql/src/queries/security/CWE-078/CommandInjection.ql
 ql/rust/ql/src/queries/security/CWE-079/XSS.ql
 ql/rust/ql/src/queries/security/CWE-089/SqlInjection.ql
 ql/rust/ql/src/queries/security/CWE-295/DisabledCertificateCheck.ql
@@ -19,6 +20,7 @@ ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql
 ql/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql
 ql/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.ql
 ql/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.ql
+ql/rust/ql/src/queries/security/CWE-502/UnsafeDeserialization.ql
 ql/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql
 ql/rust/ql/src/queries/security/CWE-770/UncontrolledAllocationSize.ql
 ql/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql
diff --git a/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected b/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected
index 4059cb40ab61..61f9ef2ea992 100644
--- a/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected
+++ b/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected
@@ -10,6 +10,7 @@ ql/rust/ql/src/queries/diagnostics/UnextractedElements.ql
 ql/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql
 ql/rust/ql/src/queries/security/CWE-020/RegexInjection.ql
 ql/rust/ql/src/queries/security/CWE-022/TaintedPath.ql
+ql/rust/ql/src/queries/security/CWE-078/CommandInjection.ql
 ql/rust/ql/src/queries/security/CWE-079/XSS.ql
 ql/rust/ql/src/queries/security/CWE-089/SqlInjection.ql
 ql/rust/ql/src/queries/security/CWE-117/LogInjection.ql
@@ -20,6 +21,7 @@ ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql
 ql/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql
 ql/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.ql
 ql/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.ql
+ql/rust/ql/src/queries/security/CWE-502/UnsafeDeserialization.ql
 ql/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql
 ql/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql
 ql/rust/ql/src/queries/security/CWE-770/UncontrolledAllocationSize.ql
diff --git a/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected b/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected
index 2d660d4f3a3e..df665c496fdd 100644
--- a/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected
+++ b/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected
@@ -10,6 +10,7 @@ ql/rust/ql/src/queries/diagnostics/UnextractedElements.ql
 ql/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql
 ql/rust/ql/src/queries/security/CWE-020/RegexInjection.ql
 ql/rust/ql/src/queries/security/CWE-022/TaintedPath.ql
+ql/rust/ql/src/queries/security/CWE-078/CommandInjection.ql
 ql/rust/ql/src/queries/security/CWE-079/XSS.ql
 ql/rust/ql/src/queries/security/CWE-089/SqlInjection.ql
 ql/rust/ql/src/queries/security/CWE-117/LogInjection.ql
@@ -20,6 +21,7 @@ ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql
 ql/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql
 ql/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.ql
 ql/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.ql
+ql/rust/ql/src/queries/security/CWE-502/UnsafeDeserialization.ql
 ql/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql
 ql/rust/ql/src/queries/security/CWE-770/UncontrolledAllocationSize.ql
 ql/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql
diff --git a/rust/ql/integration-tests/rust-version/Cargo.toml b/rust/ql/integration-tests/rust-version/Cargo.toml
new file mode 100644
index 000000000000..a723b83f36e8
--- /dev/null
+++ b/rust/ql/integration-tests/rust-version/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "rust-version"
+version = "0.1.0"
+edition = "2024"
+rust-version = "1.999.0"
+
+[dependencies]
+macros = { path = "macros" }
+
+[workspace]
+members = ["macros"]
diff --git a/rust/ql/integration-tests/rust-version/build.rs b/rust/ql/integration-tests/rust-version/build.rs
new file mode 100644
index 000000000000..524bc147a5e7
--- /dev/null
+++ b/rust/ql/integration-tests/rust-version/build.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let out_dir = std::env::var("OUT_DIR").unwrap();
+    std::fs::write(
+        std::path::Path::new(&out_dir).join("generated.rs"),
+        "pub fn from_build_script() -> u32 { 42 }\n",
+    )
+    .unwrap();
+    println!("cargo:rerun-if-changed=build.rs");
+}
diff --git a/rust/ql/integration-tests/rust-version/functions.expected b/rust/ql/integration-tests/rust-version/functions.expected
new file mode 100644
index 000000000000..120f73681b6f
--- /dev/null
+++ b/rust/ql/integration-tests/rust-version/functions.expected
@@ -0,0 +1,2 @@
+| from_build_script |
+| from_proc_macro |
diff --git a/rust/ql/integration-tests/rust-version/functions.ql b/rust/ql/integration-tests/rust-version/functions.ql
new file mode 100644
index 000000000000..cf3a29569257
--- /dev/null
+++ b/rust/ql/integration-tests/rust-version/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where f.fromSource() and f.getName().getText() = ["from_build_script", "from_proc_macro"]
+select f.getName().getText()
diff --git a/rust/ql/integration-tests/rust-version/macros/Cargo.toml b/rust/ql/integration-tests/rust-version/macros/Cargo.toml
new file mode 100644
index 000000000000..a49335042bcd
--- /dev/null
+++ b/rust/ql/integration-tests/rust-version/macros/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "macros"
+version = "0.1.0"
+edition = "2024"
+
+[lib]
+proc-macro = true
diff --git a/rust/ql/integration-tests/rust-version/macros/src/lib.rs b/rust/ql/integration-tests/rust-version/macros/src/lib.rs
new file mode 100644
index 000000000000..75f199d1b10c
--- /dev/null
+++ b/rust/ql/integration-tests/rust-version/macros/src/lib.rs
@@ -0,0 +1,6 @@
+extern crate proc_macro;
+
+#[proc_macro]
+pub fn generate(_: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    "pub fn from_proc_macro() -> u32 { 43 }".parse().unwrap()
+}
diff --git a/rust/ql/integration-tests/rust-version/src/main.rs b/rust/ql/integration-tests/rust-version/src/main.rs
new file mode 100644
index 000000000000..a51c9de834aa
--- /dev/null
+++ b/rust/ql/integration-tests/rust-version/src/main.rs
@@ -0,0 +1,7 @@
+include!(concat!(env!("OUT_DIR"), "/generated.rs"));
+
+macros::generate!();
+
+fn main() {
+    println!("{} {}", from_build_script(), from_proc_macro());
+}
diff --git a/rust/ql/integration-tests/rust-version/test_rust_version.py b/rust/ql/integration-tests/rust-version/test_rust_version.py
new file mode 100644
index 000000000000..d334187ca5a6
--- /dev/null
+++ b/rust/ql/integration-tests/rust-version/test_rust_version.py
@@ -0,0 +1,10 @@
+import pytest
+
+
+@pytest.mark.parametrize("rust_edition", [2024])
+@pytest.mark.parametrize("extra_args", [None, "--offline", "--ignore-rust-version"])
+def test_rust_version(codeql, rust, cargo, extra_args):
+    env = {}
+    if extra_args is not None:
+        env["CODEQL_EXTRACTOR_RUST_OPTION_CARGO_EXTRA_ARGS"] = extra_args
+    codeql.database.create(_env=env)
diff --git a/rust/ql/integration-tests/workspace-with-glob/steps.expected b/rust/ql/integration-tests/workspace-with-glob/steps.expected
index 4b0e6ed828b6..3ea9ee61bed3 100644
--- a/rust/ql/integration-tests/workspace-with-glob/steps.expected
+++ b/rust/ql/integration-tests/workspace-with-glob/steps.expected
@@ -6,6 +6,7 @@
 | lib/src/lib.rs:0:0:0:0 | Extract(lib/src/lib.rs) |
 | lib/src/lib.rs:0:0:0:0 | Parse(lib/src/lib.rs) |
 | other/Cargo.toml:0:0:0:0 | LoadManifest(other/Cargo.toml) |
+| other/Cargo.toml:0:0:0:0 | LoadManifest(other/Cargo.toml) |
 | other/src/lib.rs:0:0:0:0 | Extract(other/src/lib.rs) |
 | other/src/lib.rs:0:0:0:0 | LoadSource(other/src/lib.rs) |
 | other/src/lib.rs:0:0:0:0 | Parse(other/src/lib.rs) |
diff --git a/rust/ql/lib/CHANGELOG.md b/rust/ql/lib/CHANGELOG.md
index c4da1d50e0aa..2fddae495d8d 100644
--- a/rust/ql/lib/CHANGELOG.md
+++ b/rust/ql/lib/CHANGELOG.md
@@ -1,3 +1,66 @@
+## 0.2.25
+
+### Minor Analysis Improvements
+
+* The early return taken by the `?` operator no longer makes the unwrapped value of `x?` flow out of the enclosing function. This fixes false positive results from queries such as `rust/cleartext-logging`, where a sensitive value read with `?` was reported as part of an unrelated return value.
+* Added neutral models to inhibit spurious generated sink models for `actix_web::HttpRequest::connection_info` and the methods built on it, such as `full_url` and `url_for`. This fixes some false positive results from queries such as `rust/uncontrolled-allocation-size` and `rust/log-injection`.
+* Added neutral models to inhibit spurious generated sink models for `Vec` and `VecDeque` methods such as `insert`, `remove` and `push_back`. This fixes some false positive results from queries such as `rust/cleartext-logging`.
+
+## 0.2.24
+
+### Minor Analysis Improvements
+
+* The Rust extractor has been upgraded to use `rust-analyzer` version 0.0.357. As a result, the AST exposed by the Rust libraries now includes the `CfgPredExpr` and `CfgPredPat` classes.
+
+## 0.2.23
+
+### Minor Analysis Improvements
+
+* The Rust extractor has been upgraded to use `rust-analyzer` version 0.0.352. As a result, the AST exposed by the Rust libraries now includes the `AnyAttr` and `DocComment` classes.
+* Improve data flow for async blocks when used with `await`.
+* Added new flow summary models for the `native-tls`, `async-native-tls`, and `tokio-native-tls` crates.
+
+## 0.2.22
+
+### Minor Analysis Improvements
+
+* Fix path resolution for `m::{self}` paths where `m` is a trait.
+* Added data-flow models for `core::fmt::Write`. This may improve detection of vulnerabilities where tainted data is written to a formatted output buffer.
+* The Rust extractor has been upgraded to use `rust-analyzer` version 0.0.347. As a result, the AST exposed by the Rust libraries has changed: new `DerefPat`, `ImplRestriction`, `IncludeBytesExpr`, `MutRestriction`, `NotNull`, `PatternTypeRepr`, and `VisibilityInner` classes have been added; the `FormatArgsArgName` class has been removed in favour of `FormatArgsArg.getName()`, which now returns a `Name`; `Visibility.getPath()` has been moved onto the new `VisibilityInner` class, reachable via `Visibility.getVisibilityInner()`; and `attrs` have been added to the inline assembly nodes, `getMutRestriction()` to `StructField` and `TupleField`, and `getImplRestriction()` to `Trait`.
+
+## 0.2.21
+
+### Minor Analysis Improvements
+
+* Canonical paths for Rust trait items now use the format `<crate::Trait>::item` instead of
+  `crate::Trait::item`. Custom data extension models that reference trait items must be
+  updated to use the new format.
+
+## 0.2.20
+
+### Major Analysis Improvements
+
+* The alert locations for data flow queries have been improved. The new locations are more precise and are based on the actual source and sink nodes. Example:
+```rust
+let _ = conn.query(
+//      ^^^^                 old alert location
+    unsafe_query.as_str(),
+//  ^^^^^^^^^^^^^^^^^^^^^    new alert location
+)?;
+```
+This means that some alerts will have their locations changed, and hence appear as new alerts (while the old alerts will disappear).
+
+### Minor Analysis Improvements
+
+* Canonical paths for Rust trait items now use the format `crate::Trait::item` instead of
+  `<_ as crate::Trait>::item`. Custom data extension models that reference trait items
+  must be updated to use the new format.
+* The Rust extractor has been upgraded to use `rust-analyzer` version 0.0.328. As a result, the AST exposed by the Rust libraries has changed: the `TraitAlias` class has been removed, `cfg` attributes are now modeled by the new `CfgMeta`, `CfgAtom`, `CfgComposite`, `CfgPredicate`, and `CfgAttrMeta` classes, and the `Meta` class has been refined into the `KeyValueMeta`, `PathMeta`, `TokenTreeMeta`, and `UnsafeMeta` subclasses. New `TryBlockModifier` and `FormatArgsArgName` classes have also been added.
+
+## 0.2.19
+
+No user-facing changes.
+
 ## 0.2.18
 
 No user-facing changes.
diff --git a/rust/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md b/rust/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md
new file mode 100644
index 000000000000..9a51edefa011
--- /dev/null
+++ b/rust/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The sensitive data heuristics treat names built on `trusted_schema`, such as SQLite's `set_trusted_schema` setting, as non-sensitive. This removes false positive results from queries that use the sensitive data library (for example `rust/cleartext-logging`).
diff --git a/rust/ql/lib/change-notes/2026-11-03-parenthesized-expressions-and-patterns.md b/rust/ql/lib/change-notes/2026-11-03-parenthesized-expressions-and-patterns.md
new file mode 100644
index 000000000000..e60e0e6da66e
--- /dev/null
+++ b/rust/ql/lib/change-notes/2026-11-03-parenthesized-expressions-and-patterns.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* The Rust AST no longer exposes `ParenExpr` and `ParenPat` nodes. Parenthesized expressions and patterns are represented by their inner entities instead.
+* The `rust/access-after-lifetime-ended` query now detects more accesses through pointers to struct fields created by `std::ptr::addr_of!` and `std::ptr::addr_of_mut!`.
diff --git a/rust/ql/lib/change-notes/released/0.2.19.md b/rust/ql/lib/change-notes/released/0.2.19.md
new file mode 100644
index 000000000000..40c7c07e47b7
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.2.19.md
@@ -0,0 +1,3 @@
+## 0.2.19
+
+No user-facing changes.
diff --git a/rust/ql/lib/change-notes/released/0.2.20.md b/rust/ql/lib/change-notes/released/0.2.20.md
new file mode 100644
index 000000000000..e165ed9153e8
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.2.20.md
@@ -0,0 +1,20 @@
+## 0.2.20
+
+### Major Analysis Improvements
+
+* The alert locations for data flow queries have been improved. The new locations are more precise and are based on the actual source and sink nodes. Example:
+```rust
+let _ = conn.query(
+//      ^^^^                 old alert location
+    unsafe_query.as_str(),
+//  ^^^^^^^^^^^^^^^^^^^^^    new alert location
+)?;
+```
+This means that some alerts will have their locations changed, and hence appear as new alerts (while the old alerts will disappear).
+
+### Minor Analysis Improvements
+
+* Canonical paths for Rust trait items now use the format `crate::Trait::item` instead of
+  `<_ as crate::Trait>::item`. Custom data extension models that reference trait items
+  must be updated to use the new format.
+* The Rust extractor has been upgraded to use `rust-analyzer` version 0.0.328. As a result, the AST exposed by the Rust libraries has changed: the `TraitAlias` class has been removed, `cfg` attributes are now modeled by the new `CfgMeta`, `CfgAtom`, `CfgComposite`, `CfgPredicate`, and `CfgAttrMeta` classes, and the `Meta` class has been refined into the `KeyValueMeta`, `PathMeta`, `TokenTreeMeta`, and `UnsafeMeta` subclasses. New `TryBlockModifier` and `FormatArgsArgName` classes have also been added.
diff --git a/rust/ql/lib/change-notes/released/0.2.21.md b/rust/ql/lib/change-notes/released/0.2.21.md
new file mode 100644
index 000000000000..bf7b2c0c0178
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.2.21.md
@@ -0,0 +1,7 @@
+## 0.2.21
+
+### Minor Analysis Improvements
+
+* Canonical paths for Rust trait items now use the format `<crate::Trait>::item` instead of
+  `crate::Trait::item`. Custom data extension models that reference trait items must be
+  updated to use the new format.
diff --git a/rust/ql/lib/change-notes/released/0.2.22.md b/rust/ql/lib/change-notes/released/0.2.22.md
new file mode 100644
index 000000000000..e23bf68bd293
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.2.22.md
@@ -0,0 +1,7 @@
+## 0.2.22
+
+### Minor Analysis Improvements
+
+* Fix path resolution for `m::{self}` paths where `m` is a trait.
+* Added data-flow models for `core::fmt::Write`. This may improve detection of vulnerabilities where tainted data is written to a formatted output buffer.
+* The Rust extractor has been upgraded to use `rust-analyzer` version 0.0.347. As a result, the AST exposed by the Rust libraries has changed: new `DerefPat`, `ImplRestriction`, `IncludeBytesExpr`, `MutRestriction`, `NotNull`, `PatternTypeRepr`, and `VisibilityInner` classes have been added; the `FormatArgsArgName` class has been removed in favour of `FormatArgsArg.getName()`, which now returns a `Name`; `Visibility.getPath()` has been moved onto the new `VisibilityInner` class, reachable via `Visibility.getVisibilityInner()`; and `attrs` have been added to the inline assembly nodes, `getMutRestriction()` to `StructField` and `TupleField`, and `getImplRestriction()` to `Trait`.
diff --git a/rust/ql/lib/change-notes/released/0.2.23.md b/rust/ql/lib/change-notes/released/0.2.23.md
new file mode 100644
index 000000000000..06b7df3d1796
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.2.23.md
@@ -0,0 +1,7 @@
+## 0.2.23
+
+### Minor Analysis Improvements
+
+* The Rust extractor has been upgraded to use `rust-analyzer` version 0.0.352. As a result, the AST exposed by the Rust libraries now includes the `AnyAttr` and `DocComment` classes.
+* Improve data flow for async blocks when used with `await`.
+* Added new flow summary models for the `native-tls`, `async-native-tls`, and `tokio-native-tls` crates.
diff --git a/rust/ql/lib/change-notes/released/0.2.24.md b/rust/ql/lib/change-notes/released/0.2.24.md
new file mode 100644
index 000000000000..311b37f0a6e5
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.2.24.md
@@ -0,0 +1,5 @@
+## 0.2.24
+
+### Minor Analysis Improvements
+
+* The Rust extractor has been upgraded to use `rust-analyzer` version 0.0.357. As a result, the AST exposed by the Rust libraries now includes the `CfgPredExpr` and `CfgPredPat` classes.
diff --git a/rust/ql/lib/change-notes/released/0.2.25.md b/rust/ql/lib/change-notes/released/0.2.25.md
new file mode 100644
index 000000000000..8442f171cf2b
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.2.25.md
@@ -0,0 +1,7 @@
+## 0.2.25
+
+### Minor Analysis Improvements
+
+* The early return taken by the `?` operator no longer makes the unwrapped value of `x?` flow out of the enclosing function. This fixes false positive results from queries such as `rust/cleartext-logging`, where a sensitive value read with `?` was reported as part of an unrelated return value.
+* Added neutral models to inhibit spurious generated sink models for `actix_web::HttpRequest::connection_info` and the methods built on it, such as `full_url` and `url_for`. This fixes some false positive results from queries such as `rust/uncontrolled-allocation-size` and `rust/log-injection`.
+* Added neutral models to inhibit spurious generated sink models for `Vec` and `VecDeque` methods such as `insert`, `remove` and `push_back`. This fixes some false positive results from queries such as `rust/cleartext-logging`.
diff --git a/rust/ql/lib/codeql-pack.release.yml b/rust/ql/lib/codeql-pack.release.yml
index 22e36b609026..901f478b99b2 100644
--- a/rust/ql/lib/codeql-pack.release.yml
+++ b/rust/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.2.18
+lastReleaseVersion: 0.2.25
diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index 93ff7be604e0..883ef83ae546 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -5,6 +5,7 @@ private import codeql.util.FileSystem
 private import codeql.rust.elements.SourceFile
 private import codeql.rust.elements.AstNode
 private import codeql.rust.elements.Comment
+private import codeql.rust.elements.DocComment
 private import codeql.rust.Diagnostics
 private import codeql.rust.elements.internal.ExtractorStep
 
@@ -66,6 +67,7 @@ class File extends Container, Impl::File {
       count(int line |
         exists(AstNode node, Location loc |
           not node instanceof Comment and
+          not node instanceof DocComment and
           not node instanceof SourceFile and
           loc = node.getLocation()
         |
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll b/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll
index 02393cb98c26..1958f17d663e 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll
@@ -13,7 +13,6 @@ private import codeql.rust.Diagnostics
 
 private predicate nonPostOrderExpr(Expr e) {
   not e instanceof LetExpr and
-  not e instanceof ParenExpr and
   exists(AstNode last, Completion c |
     CfgImpl::last(e, last, c) and
     last != e and
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
index ee1c0e6ab6b2..b4c3864a8d3f 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
@@ -23,18 +23,7 @@ private module CfgNodesInput implements InputSig<Location> {
 
   class CfgNode = AstCfgNode;
 
-  private AstNode desugar(AstNode n) {
-    result = n.(ParenPat).getPat()
-    or
-    result = n.(ParenExpr).getExpr()
-  }
-
-  AstNode getDesugared(AstNode n) {
-    result = getDesugared(desugar(n))
-    or
-    not exists(desugar(n)) and
-    result = n
-  }
+  AstNode getDesugared(AstNode n) { result = n }
 }
 
 import MakeCfgNodes<Location, CfgNodesInput>
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index 33da4db473eb..cfc77ce98638 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -84,8 +84,6 @@ class BooleanCompletion extends ConditionalCompletion, TBooleanCompletion {
     e = any(BinaryLogicalOperation blo).getLhs()
     or
     exists(Expr parent | this.isValidForSpecific0(parent) |
-      e = parent.(ParenExpr).getExpr()
-      or
       e = parent.(LogicalNotExpr).getExpr()
       or
       e = parent.(BinaryLogicalOperation).getRhs()
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index f8a182685b64..c7e2ee2ea32d 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -380,6 +380,8 @@ module ExprTrees {
 
   class LiteralExprTree extends LeafTree instanceof LiteralExpr { }
 
+  class CfgPredExprTree extends LeafTree instanceof CfgPredExpr { }
+
   abstract class LoopingExprTree extends PostOrderTree {
     override predicate propagatesAbnormal(AstNode child) { child = this.getLoopBody() }
 
@@ -501,20 +503,6 @@ module ExprTrees {
 
   class OffsetOfExprTree extends LeafTree instanceof OffsetOfExpr { }
 
-  class ParenExprTree extends ControlFlowTree, ParenExpr {
-    private ControlFlowTree expr;
-
-    ParenExprTree() { expr = super.getExpr() }
-
-    override predicate propagatesAbnormal(AstNode child) { expr.propagatesAbnormal(child) }
-
-    override predicate first(AstNode first) { expr.first(first) }
-
-    override predicate last(AstNode last, Completion c) { expr.last(last, c) }
-
-    override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
-  }
-
   class PathExprTree extends LeafTree instanceof PathExpr { }
 
   class RangeExprTree extends StandardPostOrderTree instanceof RangeExpr {
@@ -624,8 +612,14 @@ module PatternTrees {
     override Pat getPat(int i) { i = 0 and result = this.getPat() }
   }
 
+  class DerefPatTree extends PreOrderPatTree, DerefPat {
+    override Pat getPat(int i) { i = 0 and result = this.getPat() }
+  }
+
   class RestPatTree extends LeafTree, RestPat { }
 
+  class CfgPredPatTree extends LeafTree, CfgPredPat { }
+
   class LiteralPatTree extends StandardPostOrderTree, LiteralPat {
     override AstNode getChildNode(int i) { i = 0 and result = this.getLiteral() }
   }
@@ -646,20 +640,6 @@ module PatternTrees {
     }
   }
 
-  class ParenPatTree extends ControlFlowTree, ParenPat {
-    private ControlFlowTree pat;
-
-    ParenPatTree() { pat = this.getPat() }
-
-    override predicate propagatesAbnormal(AstNode child) { pat.propagatesAbnormal(child) }
-
-    override predicate first(AstNode first) { pat.first(first) }
-
-    override predicate last(AstNode last, Completion c) { pat.last(last, c) }
-
-    override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
-  }
-
   class PathPatTree extends LeafTree, PathPat { }
 
   class WildcardPatTree extends LeafTree, WildcardPat { }
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
index 303920ce7d0e..3ee1430f556e 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
@@ -35,7 +35,8 @@ final class CallableScope extends CfgScopeImpl, Callable {
   CallableScope() {
     // A function without a body corresponds to a trait method signature and
     // should not have a CFG scope.
-    this.hasBody()
+    this.hasBody() and
+    this.fromSource() // exclude stubs in tests defined using `additionalExternalFile`
   }
 
   override predicate scopeFirst(AstNode first) {
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
index 6aeaa3dd4f4b..44c6cc0dc6d7 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
@@ -115,12 +115,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this array expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this array expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this array expression.
@@ -229,12 +229,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this asm expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this asm expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this asm expression.
@@ -287,12 +287,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this await expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this await expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this await expression.
@@ -343,12 +343,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this become expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this become expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this become expression.
@@ -399,12 +399,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this binary expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this binary expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this binary expression.
@@ -475,12 +475,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this block expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this block expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this block expression.
@@ -507,11 +507,6 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
        */
       predicate isMove() { node.isMove() }
 
-      /**
-       * Holds if this block expression is try.
-       */
-      predicate isTry() { node.isTry() }
-
       /**
        * Holds if this block expression is unsafe.
        */
@@ -526,6 +521,16 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
        * Holds if `getStmtList()` exists.
        */
       predicate hasStmtList() { exists(this.getStmtList()) }
+
+      /**
+       * Gets the try block modifier of this block expression, if it exists.
+       */
+      TryBlockModifier getTryBlockModifier() { result = node.getTryBlockModifier() }
+
+      /**
+       * Holds if `getTryBlockModifier()` exists.
+       */
+      predicate hasTryBlockModifier() { exists(this.getTryBlockModifier()) }
     }
 
     final private class ParentBoxPat extends ParentAstNode, BoxPat {
@@ -610,12 +615,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this break expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this break expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this break expression.
@@ -686,12 +691,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this call expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this call expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this call expression.
@@ -736,12 +741,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this cast expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this cast expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this cast expression.
@@ -771,6 +776,79 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasTypeRepr() { exists(this.getTypeRepr()) }
     }
 
+    final private class ParentCfgPredExpr extends ParentAstNode, CfgPredExpr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A configuration predicate expression resulting from expansion of a `cfg!` macro call.
+     * It has type `bool` and evaluates to whether the configuration predicate holds.
+     *
+     * Rust-analyzer expands `cfg!(...)` in expression position to its internal `builtin#cfg(...)`
+     * syntax, as illustrated below:
+     * ```rust
+     * builtin#cfg(unix);
+     * builtin#cfg(target_os = "windows");
+     * builtin#cfg(any(unix, target_os = "windows"));
+     * ```
+     */
+    final class CfgPredExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private CfgPredExpr node;
+
+      CfgPredExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `CfgPredExpr`. */
+      CfgPredExpr getCfgPredExpr() { result = node }
+
+      /**
+       * Gets the cfg predicate of this cfg pred expression, if it exists.
+       */
+      CfgPredicate getCfgPredicate() { result = node.getCfgPredicate() }
+
+      /**
+       * Holds if `getCfgPredicate()` exists.
+       */
+      predicate hasCfgPredicate() { exists(this.getCfgPredicate()) }
+    }
+
+    final private class ParentCfgPredPat extends ParentAstNode, CfgPredPat {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A configuration predicate pattern resulting from expansion of a `cfg!` macro call.
+     * It matches `true` when the configuration predicate holds and `false` otherwise.
+     *
+     * Rust-analyzer expands `cfg!(...)` in pattern position to its internal `builtin#cfg(...)`
+     * syntax, as illustrated below:
+     * ```rust
+     * match true {
+     *     builtin#cfg(unix) => (),
+     *     builtin#cfg(target_os = "windows") => (),
+     *     builtin#cfg(any(unix, target_os = "windows")) => (),
+     *     _ => (),
+     * };
+     * ```
+     */
+    final class CfgPredPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private CfgPredPat node;
+
+      CfgPredPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `CfgPredPat`. */
+      CfgPredPat getCfgPredPat() { result = node }
+
+      /**
+       * Gets the cfg predicate of this cfg pred pattern, if it exists.
+       */
+      CfgPredicate getCfgPredicate() { result = node.getCfgPredicate() }
+
+      /**
+       * Holds if `getCfgPredicate()` exists.
+       */
+      predicate hasCfgPredicate() { exists(this.getCfgPredicate()) }
+    }
+
     final private class ParentConstBlockPat extends ParentAstNode, ConstBlockPat {
       override predicate relevantChild(AstNode child) {
         none()
@@ -846,12 +924,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this continue expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this continue expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this continue expression.
@@ -869,6 +947,46 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasLifetime() { exists(this.getLifetime()) }
     }
 
+    final private class ParentDerefPat extends ParentAstNode, DerefPat {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getPat()
+      }
+    }
+
+    /**
+     * A deref pattern, matching the value behind a smart pointer. This is an experimental
+     * Rust feature that cannot be written directly in stable Rust; the example below uses
+     * rust-analyzer's canonical `builtin#deref` syntax for such patterns:
+     * ```rust
+     * match x {
+     *     builtin#deref(y) => y,
+     *     _ => 0,
+     * };
+     * ```
+     */
+    final class DerefPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private DerefPat node;
+
+      DerefPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `DerefPat`. */
+      DerefPat getDerefPat() { result = node }
+
+      /**
+       * Gets the pattern of this deref pattern, if it exists.
+       */
+      PatCfgNode getPat() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
+      }
+
+      /**
+       * Holds if `getPat()` exists.
+       */
+      predicate hasPat() { exists(this.getPat()) }
+    }
+
     final private class ParentExpr extends ParentAstNode, Expr {
       override predicate relevantChild(AstNode child) { none() }
     }
@@ -910,12 +1028,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this field expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this field expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this field expression.
@@ -976,12 +1094,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this for expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this for expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this for expression.
@@ -1110,12 +1228,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this format arguments expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this format arguments expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this format arguments expression.
@@ -1203,12 +1321,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this ident pattern (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this ident pattern.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this ident pattern.
@@ -1288,12 +1406,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this if expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this if expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this if expression.
@@ -1337,6 +1455,25 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasThen() { exists(this.getThen()) }
     }
 
+    final private class ParentIncludeBytesExpr extends ParentAstNode, IncludeBytesExpr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * An expression produced by the built-in `include_bytes!` macro, embedding the contents of a file as a byte array. For example:
+     * ```rust
+     * let data = include_bytes!("data.bin");
+     * ```
+     */
+    final class IncludeBytesExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private IncludeBytesExpr node;
+
+      IncludeBytesExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `IncludeBytesExpr`. */
+      IncludeBytesExpr getIncludeBytesExpr() { result = node }
+    }
+
     final private class ParentIndexExpr extends ParentAstNode, IndexExpr {
       override predicate relevantChild(AstNode child) {
         none()
@@ -1365,12 +1502,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this index expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this index expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this index expression.
@@ -1457,12 +1594,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this let expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this let expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this let expression.
@@ -1528,12 +1665,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this let statement (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this let statement.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this let statement.
@@ -1613,12 +1750,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this literal expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this literal expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this literal expression.
@@ -1713,12 +1850,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this loop expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this loop expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this loop expression.
@@ -1781,12 +1918,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this macro call (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this macro call.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this macro call.
@@ -1848,6 +1985,21 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /** Gets the underlying `MacroExpr`. */
       MacroExpr getMacroExpr() { result = node }
 
+      /**
+       * Gets the `index`th attr of this macro expression (0-based).
+       */
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this macro expression.
+       */
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this macro expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
       /**
        * Gets the macro call of this macro expression, if it exists.
        */
@@ -1941,12 +2093,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this match expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this match expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this match expression.
@@ -2016,12 +2168,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this method call expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this method call expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this method call expression.
@@ -2093,6 +2245,28 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasText() { exists(this.getText()) }
     }
 
+    final private class ParentNotNull extends ParentAstNode, NotNull {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * The `!null` pattern used in a pattern type to denote a non-null value. Pattern types
+     * are an experimental, mostly compiler-internal feature (used in the standard library for
+     * types such as `NonZero` and `NonNull`) and cannot be written directly in stable Rust;
+     * the example below uses rust-analyzer's canonical `builtin#pattern_type` syntax:
+     * ```rust
+     * type NonNull = builtin#pattern_type(*const () is !null);
+     * ```
+     */
+    final class NotNullCfgNode extends CfgNodeFinal, PatCfgNode {
+      private NotNull node;
+
+      NotNullCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `NotNull`. */
+      NotNull getNotNull() { result = node }
+    }
+
     final private class ParentOffsetOfExpr extends ParentAstNode, OffsetOfExpr {
       override predicate relevantChild(AstNode child) { none() }
     }
@@ -2114,12 +2288,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this offset of expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this offset of expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this offset of expression.
@@ -2249,12 +2423,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this parameter base (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this parameter base.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this parameter base.
@@ -2312,12 +2486,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this path expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this path expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this path expression.
@@ -2390,12 +2564,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this prefix expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this prefix expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this prefix expression.
@@ -2457,12 +2631,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this range expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this range expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this range expression.
@@ -2595,12 +2769,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this reference expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this reference expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this reference expression.
@@ -2702,12 +2876,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this rest pattern (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this rest pattern.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this rest pattern.
@@ -2747,12 +2921,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this return expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this return expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this return expression.
@@ -2899,6 +3073,21 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /** Gets the underlying `StructExpr`. */
       StructExpr getStructExpr() { result = node }
 
+      /**
+       * Gets the `index`th attr of this struct expression (0-based).
+       */
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this struct expression.
+       */
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this struct expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
       /**
        * Gets the struct expression field list of this struct expression, if it exists.
        */
@@ -2970,12 +3159,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this try expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this try expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this try expression.
@@ -3022,12 +3211,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this tuple expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this tuple expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this tuple expression.
@@ -3158,12 +3347,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this underscore expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this underscore expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this underscore expression.
@@ -3200,12 +3389,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this while expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this while expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this while expression.
@@ -3271,12 +3460,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this yeet expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this yeet expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this yeet expression.
@@ -3324,12 +3513,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /**
        * Gets the `index`th attr of this yield expression (0-based).
        */
-      Attr getAttr(int index) { result = node.getAttr(index) }
+      AnyAttr getAttr(int index) { result = node.getAttr(index) }
 
       /**
        * Gets any of the attrs of this yield expression.
        */
-      Attr getAnAttr() { result = this.getAttr(_) }
+      AnyAttr getAnAttr() { result = this.getAttr(_) }
 
       /**
        * Gets the number of attrs of this yield expression.
@@ -3510,6 +3699,18 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
           cfgNode
         )
       or
+      pred = "getPat" and
+      parent =
+        any(Nodes::DerefPatCfgNode cfgNode, DerefPat astNode |
+          astNode = cfgNode.getDerefPat() and
+          child = getDesugared(astNode.getPat()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getPat().getAstNode()
+        |
+          cfgNode
+        )
+      or
       pred = "getContainer" and
       parent =
         any(Nodes::FieldExprCfgNode cfgNode, FieldExpr astNode |
diff --git a/rust/ql/lib/codeql/rust/dataflow/FlowBarrier.qll b/rust/ql/lib/codeql/rust/dataflow/FlowBarrier.qll
index 49e1d6769219..c81976f1f280 100644
--- a/rust/ql/lib/codeql/rust/dataflow/FlowBarrier.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/FlowBarrier.qll
@@ -44,9 +44,9 @@ module FlowBarrier {
     Range() { any() }
 
     override predicate isBarrier(
-      string output, string kind, Impl::Public::Provenance provenance, string model
+      string output, string kind, Impl::Public::Provenance provenance, boolean isExact, string model
     ) {
-      this.isBarrier(output, kind) and provenance = "manual" and model = ""
+      this.isBarrier(output, kind) and provenance = "manual" and isExact = true and model = ""
     }
 
     /**
@@ -67,9 +67,13 @@ module FlowBarrierGuard {
     Range() { any() }
 
     override predicate isBarrierGuard(
-      string input, string branch, string kind, Impl::Public::Provenance provenance, string model
+      string input, string branch, string kind, Impl::Public::Provenance provenance,
+      boolean isExact, string model
     ) {
-      this.isBarrierGuard(input, branch, kind) and provenance = "manual" and model = ""
+      this.isBarrierGuard(input, branch, kind) and
+      provenance = "manual" and
+      isExact = true and
+      model = ""
     }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/dataflow/FlowSink.qll b/rust/ql/lib/codeql/rust/dataflow/FlowSink.qll
index d4883b7b1b9c..0e800afa7c2b 100644
--- a/rust/ql/lib/codeql/rust/dataflow/FlowSink.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/FlowSink.qll
@@ -36,9 +36,9 @@ module FlowSink {
     Range() { any() }
 
     override predicate isSink(
-      string input, string kind, Impl::Public::Provenance provenance, string model
+      string input, string kind, Impl::Public::Provenance provenance, boolean isExact, string model
     ) {
-      this.isSink(input, kind) and provenance = "manual" and model = ""
+      this.isSink(input, kind) and provenance = "manual" and isExact = true and model = ""
     }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/dataflow/FlowSource.qll b/rust/ql/lib/codeql/rust/dataflow/FlowSource.qll
index 51562fdf83a3..a298d9c1fad6 100644
--- a/rust/ql/lib/codeql/rust/dataflow/FlowSource.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/FlowSource.qll
@@ -42,9 +42,9 @@ module FlowSource {
     Range() { any() }
 
     override predicate isSource(
-      string output, string kind, Impl::Public::Provenance provenance, string model
+      string output, string kind, Impl::Public::Provenance provenance, boolean isExact, string model
     ) {
-      this.isSource(output, kind) and provenance = "manual" and model = ""
+      this.isSource(output, kind) and provenance = "manual" and isExact = true and model = ""
     }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll
index ca6c0747ba3a..a21552cb3355 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll
@@ -21,7 +21,7 @@ private module Input implements InputSig<Location, RustDataFlow> {
     or
     n.(Node::PostUpdateNode).getPreUpdateNode().asExpr() = getPostUpdateReverseStep(_, _)
     or
-    FlowSummaryImpl::Private::Steps::sourceLocalStep(_, n, _)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(_, n, _, _)
   }
 
   predicate missingLocationExclude(RustDataFlow::Node n) { not exists(n.asExpr().getLocation()) }
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
index c18ac5e026b1..befe95178930 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
@@ -11,6 +11,7 @@ private import rust
 private import SsaImpl as SsaImpl
 private import codeql.rust.controlflow.internal.Scope as Scope
 private import codeql.rust.elements.internal.CallExprImpl::Impl as CallExprImpl
+private import codeql.rust.elements.internal.VariableImpl::Impl as VariableImpl
 private import codeql.rust.internal.PathResolution
 private import codeql.rust.controlflow.ControlFlowGraph
 private import codeql.rust.dataflow.Ssa
@@ -62,6 +63,9 @@ final class DataFlowCall extends TDataFlowCall {
   /** Gets the underlying call, if any. */
   Call asCall() { this = TCall(result) }
 
+  /** Gets the underlying await expression, if any. */
+  AwaitExpr asAwaitExpr() { this = TAwaitExpr(result) }
+
   predicate isImplicitDerefCall(Expr e, DerefChain derefChain, int i, Function target) {
     this = TImplicitDerefCall(e, derefChain, i, target)
   }
@@ -73,7 +77,8 @@ final class DataFlowCall extends TDataFlowCall {
   }
 
   DataFlowCallable getEnclosingCallable() {
-    result.asCfgScope() = this.asCall().getEnclosingCfgScope()
+    result.asCfgScope() =
+      [this.asCall().getEnclosingCfgScope(), this.asAwaitExpr().getEnclosingCfgScope()]
     or
     result.asCfgScope() = any(Expr e | this.isImplicitDerefCall(e, _, _, _)).getEnclosingCfgScope()
     or
@@ -81,7 +86,7 @@ final class DataFlowCall extends TDataFlowCall {
   }
 
   string toString() {
-    result = this.asCall().toString()
+    result = [this.asCall().toString(), this.asAwaitExpr().toString()]
     or
     exists(Expr e, DerefChain derefChain, int i |
       this.isImplicitDerefCall(e, derefChain, i, _) and
@@ -97,7 +102,7 @@ final class DataFlowCall extends TDataFlowCall {
   }
 
   Location getLocation() {
-    result = this.asCall().getLocation()
+    result = [this.asCall().getLocation(), this.asAwaitExpr().getLocation()]
     or
     result = any(Expr e | this.isImplicitDerefCall(e, _, _, _)).getLocation()
   }
@@ -150,8 +155,7 @@ private Expr getALastEvalNode(Expr e) {
     ) or
   result = e.(MatchExpr).getAnArm().getExpr() or
   result = e.(MacroExpr).getMacroCall().getMacroCallExpansion() or
-  result.(BreakExpr).getTarget() = e or
-  result = e.(ParenExpr).getExpr()
+  result.(BreakExpr).getTarget() = e
 }
 
 /**
@@ -179,17 +183,7 @@ Expr getPostUpdateReverseStep(Expr e, boolean preservesValue) {
 
 module LocalFlow {
   predicate flowSummaryLocalStep(Node nodeFrom, Node nodeTo, string model) {
-    exists(FlowSummaryImpl::Public::SummarizedCallable c |
-      FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-        nodeTo.(FlowSummaryNode).getSummaryNode(), true, model) and
-      c = nodeFrom.(FlowSummaryNode).getSummarizedCallable()
-    )
-    or
-    FlowSummaryImpl::Private::Steps::sourceLocalStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),
-      nodeTo, model)
-    or
-    FlowSummaryImpl::Private::Steps::sinkLocalStep(nodeFrom,
-      nodeTo.(FlowSummaryNode).getSummaryNode(), model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, true, model)
   }
 
   pragma[nomagic]
@@ -235,8 +229,6 @@ module LocalFlow {
       nodeFrom.asExpr() = match.getScrutinee() and
       nodeTo.asPat() = match.getAnArm().getPat()
     )
-    or
-    nodeFrom.asExpr() = nodeTo.asExpr().(ParenExpr).getExpr()
   }
 
   pragma[nomagic]
@@ -367,7 +359,7 @@ private module Aliases {
  *
  * However, this would require support for [generalized reverse flow][1], which
  * is not yet implemented, so instead we simulate reverse flow where it would
- * have applied via the model for `<_ as core::ops::index::IndexMut>::index_mut`.
+ * have applied via the model for `<core::ops::index::IndexMut>::index_mut`.
  *
  * The same is the case for compound assignments like `a[i] += rhs`, which are
  * treated as `(*a.index_mut(i)).add_assign(rhs)`.
@@ -440,7 +432,7 @@ module RustDataFlowGen<RustDataFlowInputSig Input> implements InputSig<Location>
       or
       result = "self" and this.isSelf()
       or
-      result = "closure self" and this.isClosureSelf()
+      result = "closure-self" and this.isClosureSelf()
     }
 
     ParamBase getParameterIn(ParamList ps) {
@@ -448,6 +440,8 @@ module RustDataFlowGen<RustDataFlowInputSig Input> implements InputSig<Location>
       or
       result = ps.getSelfParam() and this.isSelf()
     }
+
+    ParamBase getParameter(Callable c) { result = this.getParameterIn(c.getParamList()) }
   }
 
   /**
@@ -488,32 +482,20 @@ module RustDataFlowGen<RustDataFlowInputSig Input> implements InputSig<Location>
     node instanceof ImplicitBorrowNode or
     node instanceof DerefOutNode or
     node instanceof IndexOutNode or
-    node.asExpr() instanceof ParenExpr or
     nodeIsHidden(node.(PostUpdateNode).getPreUpdateNode())
   }
 
-  private Expr stripParens(Expr e) {
-    not e instanceof ParenExpr and
-    result = e
-    or
-    result = stripParens(e.(ParenExpr).getExpr())
-  }
-
   predicate neverSkipInPathGraph(Node node) {
     node.(Node::Node).asPat() = any(LetStmt s).getPat()
     or
     node.(Node::Node).asPat() = any(LetExpr e).getPat()
     or
-    node.(Node::Node).asExpr() = stripParens(any(AssignmentExpr a).getLhs())
+    node.(Node::Node).asExpr() = any(AssignmentExpr a).getLhs()
     or
     exists(MatchExpr match |
-      node.asExpr() = stripParens(match.getScrutinee()) or
+      node.asExpr() = match.getScrutinee() or
       node.asPat() = match.getAnArm().getPat()
     )
-    or
-    FlowSummaryImpl::Private::Steps::sourceLocalStep(_, node, _)
-    or
-    FlowSummaryImpl::Private::Steps::sinkLocalStep(node, _, _)
   }
 
   class DataFlowExpr = Expr;
@@ -583,7 +565,7 @@ module RustDataFlowGen<RustDataFlowInputSig Input> implements InputSig<Location>
 
   class LambdaCallKind = LambdaCallKindAlias;
 
-  predicate forceHighPrecision(Content c) { none() }
+  predicate forceHighPrecision(Content c) { any() }
 
   class ContentApprox = ContentApproxAlias;
 
@@ -652,10 +634,7 @@ module RustDataFlowGen<RustDataFlowInputSig Input> implements InputSig<Location>
    * variable.
    */
   predicate jumpStep(Node node1, Node node2) {
-    FlowSummaryImpl::Private::Steps::summaryJumpStep(node1.(FlowSummaryNode).getSummaryNode(),
-      node2.(FlowSummaryNode).getSummaryNode())
-    or
-    FlowSummaryImpl::Private::Steps::sourceJumpStep(node1.(FlowSummaryNode).getSummaryNode(), node2)
+    FlowSummaryImpl::Private::Steps::summaryJumpStep(node1, node2)
     or
     exists(Const c |
       node1.asExpr() = c.getBody() and
@@ -1019,7 +998,11 @@ module RustDataFlowGen<RustDataFlowInputSig Input> implements InputSig<Location>
    */
   predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node receiver) {
     (
-      receiver.asExpr() = call.asCall().(CallExprImpl::DynamicCallExpr).getFunction()
+      receiver.asExpr() =
+        [
+          call.asCall().(CallExprImpl::DynamicCallExpr).getFunction(),
+          call.asAwaitExpr().getExpr()
+        ]
       or
       call.isSummaryCall(_, receiver.(FlowSummaryNode).getSummaryNode())
     ) and
@@ -1077,7 +1060,7 @@ module VariableCapture {
     final class CapturedParameter extends CapturedVariable {
       ParamBase p;
 
-      CapturedParameter() { p = this.getParameter() }
+      CapturedParameter() { this.isParameter(p) }
 
       SourceParameterNode getParameterNode() { result.getParameter() = p }
     }
@@ -1087,33 +1070,22 @@ module VariableCapture {
     }
 
     class VariableWrite extends Expr {
-      Expr source;
       CapturedVariable v;
 
       VariableWrite() {
-        exists(AssignmentExpr assign, Variable::VariableWriteAccess write |
-          this = assign and
-          v = write.getVariable() and
-          assign.getLhs() = write and
-          assign.getRhs() = source
-        )
+        this = v.getName()
         or
-        this =
-          any(LetStmt ls |
-            v.getPat() = ls.getPat() and
-            ls.getInitializer() = source
-          )
+        v = this.(Variable::VariableWriteAccess).getVariable()
+      }
+
+      override predicate hasCfgNode(BasicBlocks::BasicBlock bb, int i) {
+        not this instanceof VariableWriteAccess and
+        super.hasCfgNode(bb, i)
         or
-        this =
-          any(LetExpr le |
-            v.getPat() = le.getPat() and
-            le.getScrutinee() = source
-          )
+        this.(VariableWriteAccess).getAssignmentExpr() = bb.getNode(i).getAstNode()
       }
 
       CapturedVariable getVariable() { result = v }
-
-      Expr getSource() { result = source }
     }
 
     class VariableRead extends Expr {
@@ -1152,7 +1124,7 @@ module VariableCapture {
     or
     result.(Flow::ExprNode).getExpr() = n.asExpr()
     or
-    result.(Flow::VariableWriteSourceNode).getVariableWrite().getSource() = n.asExpr()
+    result.(Flow::VariableWriteSourceNode).getVariableWrite() = n.getAstNode()
     or
     result.(Flow::ExprPostUpdateNode).getExpr() = n.(PostUpdateNode).getPreUpdateNode().asExpr()
     or
@@ -1191,6 +1163,7 @@ private module Cached {
       Stages::DataFlowStage::ref() and
       call.hasEnclosingCfgScope()
     } or
+    TAwaitExpr(AwaitExpr await) { await.hasEnclosingCfgScope() } or
     TImplicitDerefCall(Expr e, DerefChain derefChain, int i, Function target) {
       TypeInference::implicitDerefChainBorrow(e, derefChain, _) and
       target = derefChain.getElement(i).getDerefFunction() and
@@ -1289,10 +1262,10 @@ private module Cached {
       FlowSummaryImpl::Public::AcceptingValue acceptingValue, string kind, string model
     |
       FlowSummaryImpl::Private::barrierGuardSpec(b, stack, acceptingValue, kind, model) and
-      e = FlowSummaryImpl::StepsInput::getSinkNode(b, stack.headOfSingleton()).asExpr() and
+      e = FlowSummaryImpl::Input2::getASinkReportingElement(b, stack.headOfSingleton()) and
       kmp = TMkPair(kind, model) and
       gv = convertAcceptingValue(acceptingValue) and
-      g = b.getCall()
+      g.(Call).getResolvedTarget() = b
     )
   }
 
@@ -1303,15 +1276,8 @@ private module Cached {
       FlowSummaryImpl::Public::BarrierElement b,
       FlowSummaryImpl::Private::SummaryComponentStack stack
     |
-      FlowSummaryImpl::Private::barrierSpec(b, stack, kind, model)
-    |
-      n = FlowSummaryImpl::StepsInput::getSourceNode(b, stack, false)
-      or
-      // For barriers like `Argument[0]` we want to target the pre-update node
-      n =
-        FlowSummaryImpl::StepsInput::getSourceNode(b, stack, true)
-            .(PostUpdateNode)
-            .getPreUpdateNode()
+      FlowSummaryImpl::Private::barrierSpec(b, stack, kind, model) and
+      n.asExpr() = FlowSummaryImpl::Input2::getASourceReportingElement(b, stack.headOfSingleton())
     )
     or
     ParameterizedBarrierGuard<TKindModelPair, barrierGuardChecks/4>::getABarrierNode(TMkPair(kind,
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
index d9104da11ad5..1294a108ef7e 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
@@ -33,50 +33,25 @@ module Input implements InputSig<Location, RustDataFlow> {
 
   class SummarizedCallableBase = Function;
 
-  class FlowSummaryCallBase = Void;
+  class FlowSummaryCallBase extends Void {
+    Location getLocation() { none() }
+  }
 
   predicate callableFromSource(SummarizedCallableBase c) { c.fromSource() }
 
-  abstract private class SourceSinkBase extends AstNode {
-    /** Gets the associated call. */
-    abstract Call getCall();
-
-    /** Holds if the associated call resolves to `path`. */
-    final predicate callResolvesTo(string path) {
-      path = this.getCall().getResolvedTarget().getCanonicalPath()
-    }
+  DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
+    result.asSummarizedCallable() = c
   }
 
-  abstract class SourceBase extends SourceSinkBase { }
-
-  abstract class SinkBase extends SourceSinkBase { }
-
   predicate neutralElement(
     Input::SummarizedCallableBase c, string kind, string provenance, boolean isExact
   ) {
-    exists(string path |
-      neutralModel(path, kind, provenance, _) and
-      c.getCanonicalPath() = path and
-      isExact = true
+    exists(string path, Provenance orig |
+      neutralModel(path, kind, orig, _) and
+      interpretPath(path, c, orig, provenance, isExact)
     )
   }
 
-  private class CallExprFunction extends SourceBase, SinkBase {
-    private CallExpr call;
-
-    CallExprFunction() { this = call.getFunction() }
-
-    override Call getCall() { result = call }
-  }
-
-  private class MethodCallExprNameRef extends SourceBase, SinkBase {
-    private MethodCallExpr call;
-
-    MethodCallExprNameRef() { this = call.getIdentifier() }
-
-    override MethodCallExpr getCall() { result = call }
-  }
-
   RustDataFlow::ArgumentPosition callbackSelfParameterPosition() { result.isClosureSelf() }
 
   ReturnKind getStandardReturnValueKind() { result = TNormalReturnKind() }
@@ -147,75 +122,107 @@ module Input implements InputSig<Location, RustDataFlow> {
 
 private import Make<Location, RustDataFlow, Input> as Impl
 
-module StepsInput implements Impl::Private::StepsInputSig {
-  Impl::Private::SummaryNode getSummaryNode(RustDataFlow::Node n) {
-    result = n.(FlowSummaryNode).getSummaryNode()
-  }
+/** Gets the argument of `call` described by `sc`, if any. */
+private Expr getArg(Call call, Impl::Private::SummaryComponent sc) {
+  exists(RustDataFlow::ArgumentPosition pos |
+    sc = Impl::Private::SummaryComponent::argument(pos) and
+    result = pos.getArgument(call)
+  )
+}
 
-  DataFlowCall getACall(Public::SummarizedCallable sc) { result.asCall().getStaticTarget() = sc }
+/** Get the callable that `expr` refers to. */
+private Callable getCallable(Expr expr) {
+  result = resolvePath(expr.(PathExpr).getPath()).(Function)
+  or
+  result = expr.(ClosureExpr)
+  or
+  // The expression is an SSA read of an assignment of a closure
+  exists(Ssa::Definition def |
+    def.getARead() = expr and
+    def.getAnUltimateDefinition().(Ssa::WriteDefinition).assigns(result.(ClosureExpr))
+  )
+}
 
-  /** Gets the argument of `source` described by `sc`, if any. */
-  private Expr getSourceNodeArgument(Input::SourceBase source, Impl::Private::SummaryComponent sc) {
-    exists(RustDataFlow::ArgumentPosition pos |
-      sc = Impl::Private::SummaryComponent::argument(pos) and
-      result = pos.getArgument(source.getCall())
-    )
+module Input2 implements Impl::Private::InputSig2 {
+  class SourceSinkReportingElement extends AstNode {
+    DataFlowCallable getEnclosingCallable() { result.asCfgScope() = this.getEnclosingCfgScope() }
+
+    SourceSinkReportingElement getASuccessor(Impl::Private::SummaryComponent sc) {
+      exists(RustDataFlow::ArgumentPosition pos |
+        sc = Impl::Private::SummaryComponent::parameter(pos) and
+        result = pos.getParameter(getCallable(this))
+      )
+      or
+      exists(Callable c |
+        sc = Impl::Private::SummaryComponent::return(_) and
+        c = getCallable(this) and
+        isReturnedValue(result) and
+        result.getEnclosingCfgScope() = c
+      )
+    }
   }
 
-  /** Get the callable that `expr` refers to. */
-  private Callable getCallable(Expr expr) {
-    result = resolvePath(expr.(PathExpr).getPath()).(Function)
-    or
-    result = expr.(ClosureExpr)
+  SourceSinkReportingElement getASourceReportingElement(
+    Input::SummarizedCallableBase source, Impl::Private::SummaryComponent sc
+  ) {
+    exists(Call call | call.getResolvedTarget() = source |
+      sc = Impl::Private::SummaryComponent::return(_) and
+      result = call
+      or
+      result = getArg(call, sc)
+    )
     or
-    // The expression is an SSA read of an assignment of a closure
-    exists(Ssa::Definition def |
-      def.getARead() = expr and
-      def.getAnUltimateDefinition().(Ssa::WriteDefinition).assigns(result.(ClosureExpr))
+    exists(RustDataFlow::ArgumentPosition pos |
+      sc = Impl::Private::SummaryComponent::parameter(pos)
+    |
+      exists(Function f |
+        f = source
+        or
+        f.implements(source)
+      |
+        result = pos.getParameter(f)
+      )
     )
   }
 
-  RustDataFlow::DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) {
-    result.asCfgScope() = source.getEnclosingCfgScope()
+  bindingset[e, sc]
+  NodePublic getSourceDataFlowNode(SourceSinkReportingElement e, Impl::Private::SummaryComponent sc) {
+    if sc = Impl::Private::SummaryComponent::argument(_)
+    then result.(PostUpdateNode).getPreUpdateNode().(Node).getAstNode() = e
+    else result.(Node).getAstNode() = e
   }
 
-  additional RustDataFlow::Node getSourceNode(
-    Input::SourceBase source, Impl::Private::SummaryComponentStack s, boolean isArgPostUpdate
+  SourceSinkReportingElement getASinkReportingElement(
+    Input::SummarizedCallableBase sink, Impl::Private::SummaryComponent sc
   ) {
-    s.head() = Impl::Private::SummaryComponent::return(_) and
-    result.asExpr() = source.getCall() and
-    isArgPostUpdate = false
-    or
-    exists(RustDataFlow::ArgumentPosition pos, Expr arg |
-      s.head() = Impl::Private::SummaryComponent::parameter(pos) and
-      arg = getSourceNodeArgument(source, s.tail().headOfSingleton()) and
-      result.asParameter() = getCallable(arg).getParam(pos.getPosition()) and
-      isArgPostUpdate = false
+    exists(Call call |
+      call.getResolvedTarget() = sink and
+      result = getArg(call, sc)
     )
-    or
-    result.(RustDataFlow::PostUpdateNode).getPreUpdateNode().asExpr() =
-      getSourceNodeArgument(source, s.headOfSingleton()) and
-    isArgPostUpdate = true
   }
 
-  RustDataFlow::Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) {
-    result = getSourceNode(source, s, _)
+  bindingset[e, sc]
+  NodePublic getSinkDataFlowNode(SourceSinkReportingElement e, Impl::Private::SummaryComponent sc) {
+    result.asExpr() = e and
+    exists(sc)
   }
+}
 
-  RustDataFlow::Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) {
-    exists(InvocationExpr call, Expr arg, RustDataFlow::ArgumentPosition pos |
-      result.asExpr() = arg and
-      sc = Impl::Private::SummaryComponent::argument(pos) and
-      call = sink.getCall() and
-      arg = pos.getArgument(call)
-    )
+private import Impl::Private::Make2<Input2> as Impl2
+
+module StepsInput implements Impl2::StepsInputSig {
+  Impl2::SummaryNode getSummaryNode(RustDataFlow::Node n) {
+    result = n.(FlowSummaryNode).getSummaryNode()
   }
+
+  DataFlowCall getACall(Public::SummarizedCallable sc) { result.asCall().getStaticTarget() = sc }
 }
 
 module Private {
   import Impl::Private
+  import Impl2
 
-  module Steps = Impl::Private::Steps<StepsInput>;
+  module Steps = Impl2::Steps<StepsInput>;
 
   private import codeql.rust.dataflow.FlowSource
   private import codeql.rust.dataflow.FlowSink
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll b/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
index 8652b93f4aa9..3949ebbb7900 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
@@ -58,6 +58,10 @@ private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSummary
 private import codeql.rust.dataflow.FlowSource
 private import codeql.rust.dataflow.FlowSink
+private import codeql.rust.internal.CachedStages
+private import codeql.rust.internal.typeinference.FunctionType
+private import codeql.rust.internal.typeinference.TypeMention
+private import codeql.rust.frameworks.stdlib.Stdlib
 
 /**
  * Holds if in a call to the function with canonical path `path`, the value referred
@@ -170,6 +174,26 @@ predicate interpretModelForTest(QlBuiltins::ExtensionId madId, string model) {
   )
 }
 
+bindingset[path]
+pragma[inline_late]
+private Function interpretPath0(string path) { path = result.getCanonicalPath() }
+
+bindingset[path, orig]
+pragma[inline_late]
+predicate interpretPath(string path, Function f, Provenance orig, Provenance p, boolean isExact) {
+  exists(Function f0 | f0 = interpretPath0(path) |
+    f = f0 and
+    isExact = true and
+    p = orig
+    or
+    f.implements(f0) and
+    isExact = false and
+    // making inherited models generated means that source code definitions and
+    // exact generated models take precedence
+    p = "hq-generated"
+  )
+}
+
 private class SummarizedCallableFromModel extends SummarizedCallable::Range {
   string input_;
   string output_;
@@ -179,19 +203,9 @@ private class SummarizedCallableFromModel extends SummarizedCallable::Range {
   QlBuiltins::ExtensionId madId;
 
   SummarizedCallableFromModel() {
-    exists(string path, Function f, Provenance p |
+    exists(string path, Provenance p |
       summaryModel(path, input_, output_, kind, p, madId) and
-      f.getCanonicalPath() = path
-    |
-      this = f and
-      isExact_ = true and
-      p_ = p
-      or
-      this.implements(f) and
-      isExact_ = false and
-      // making inherited models generated means that source code definitions and
-      // exact generated models take precedence
-      p_ = "hq-generated"
+      interpretPath(path, this, p, p_, isExact_)
     )
   }
 
@@ -207,80 +221,132 @@ private class SummarizedCallableFromModel extends SummarizedCallable::Range {
   }
 }
 
+/**
+ * Holds if library function `f` has a callback at position `n`. In this case we
+ * add a flow model that achieves the effect of simulating that the callback is
+ * invoked, which is needed for flow through captured variables to work.
+ */
+cached
+predicate mayInvokeCallback(Function f, int n) {
+  Stages::TypeInferenceStage::ref() and
+  exists(TypeMention tm, Trait trait |
+    tm = f.getParam(n).getTypeRepr() and
+    trait = getALookupTrait(f, tm.getType()) and
+    trait.getSupertrait*() instanceof FnOnceTrait and
+    not f.fromSource()
+  )
+}
+
+private class SummarizedCallableWithCallback extends SummarizedCallable::Range {
+  private int pos;
+
+  SummarizedCallableWithCallback() { mayInvokeCallback(this, pos) }
+
+  override predicate propagatesFlow(
+    string input, string output, boolean preservesValue, Provenance p, boolean isExact, string model
+  ) {
+    input = "Argument[" + pos + "]" and
+    output = "Argument[" + pos + "].Parameter[closure-self]" and
+    preservesValue = true and
+    p = "hq-generated" and
+    isExact = true and
+    model = "heuristic-callback"
+  }
+}
+
 private class FlowSourceFromModel extends FlowSource::Range {
   private string path;
+  private string kind_;
+  private Provenance orig;
+  private Provenance p_;
+  private boolean isExact_;
 
   FlowSourceFromModel() {
-    sourceModel(path, _, _, _, _) and
-    this.callResolvesTo(path)
+    sourceModel(path, _, kind_, orig, _) and
+    interpretPath(path, this, orig, p_, isExact_)
   }
 
-  override predicate isSource(string output, string kind, Provenance provenance, string model) {
+  override predicate isSource(
+    string output, string kind, Provenance provenance, boolean isExact, string model
+  ) {
     exists(QlBuiltins::ExtensionId madId |
-      sourceModel(path, output, kind, provenance, madId) and
-      model = "MaD:" + madId.toString()
-    ) and
-    // Only apply generated models when no neutral model exists
-    // (the shared code only applies neutral models to summaries at present)
-    not (
-      provenance.isGenerated() and
-      neutralModel(path, "source", _, _)
+      sourceModel(path, output, kind, orig, madId) and
+      model = "MaD:" + madId.toString() and
+      kind = kind_ and
+      provenance = p_ and
+      isExact = isExact_
     )
   }
 }
 
 private class FlowSinkFromModel extends FlowSink::Range {
   private string path;
+  private string kind_;
+  private Provenance orig;
+  private Provenance p_;
+  private boolean isExact_;
 
   FlowSinkFromModel() {
-    sinkModel(path, _, _, _, _) and
-    this.callResolvesTo(path)
+    sinkModel(path, _, kind_, orig, _) and
+    interpretPath(path, this, orig, p_, isExact_)
   }
 
-  override predicate isSink(string input, string kind, Provenance provenance, string model) {
+  override predicate isSink(
+    string input, string kind, Provenance provenance, boolean isExact, string model
+  ) {
     exists(QlBuiltins::ExtensionId madId |
-      sinkModel(path, input, kind, provenance, madId) and
-      model = "MaD:" + madId.toString()
-    ) and
-    // Only apply generated models when no neutral model exists
-    // (the shared code only applies neutral models to summaries at present)
-    not (
-      provenance.isGenerated() and
-      neutralModel(path, "sink", _, _)
+      sinkModel(path, input, kind, orig, madId) and
+      model = "MaD:" + madId.toString() and
+      kind = kind_ and
+      provenance = p_ and
+      isExact = isExact_
     )
   }
 }
 
 private class FlowBarrierFromModel extends FlowBarrier::Range {
   private string path;
+  private Provenance orig;
+  private Provenance p_;
+  private boolean isExact_;
 
   FlowBarrierFromModel() {
-    barrierModel(path, _, _, _, _) and
-    this.callResolvesTo(path)
+    barrierModel(path, _, _, orig, _) and
+    interpretPath(path, this, orig, p_, isExact_)
   }
 
-  override predicate isBarrier(string output, string kind, Provenance provenance, string model) {
+  override predicate isBarrier(
+    string output, string kind, Provenance provenance, boolean isExact, string model
+  ) {
     exists(QlBuiltins::ExtensionId madId |
-      barrierModel(path, output, kind, provenance, madId) and
-      model = "MaD:" + madId.toString()
+      barrierModel(path, output, kind, orig, madId) and
+      model = "MaD:" + madId.toString() and
+      provenance = p_ and
+      isExact = isExact_
     )
   }
 }
 
 private class FlowBarrierGuardFromModel extends FlowBarrierGuard::Range {
   private string path;
+  private Provenance orig;
+  private Provenance p_;
+  private boolean isExact_;
 
   FlowBarrierGuardFromModel() {
-    barrierGuardModel(path, _, _, _, _, _) and
-    this.callResolvesTo(path)
+    barrierGuardModel(path, _, _, _, orig, _) and
+    interpretPath(path, this, orig, p_, isExact_)
   }
 
   override predicate isBarrierGuard(
-    string input, string acceptingValue, string kind, Provenance provenance, string model
+    string input, string acceptingValue, string kind, Provenance provenance, boolean isExact,
+    string model
   ) {
     exists(QlBuiltins::ExtensionId madId |
-      barrierGuardModel(path, input, acceptingValue, kind, provenance, madId) and
-      model = "MaD:" + madId.toString()
+      barrierGuardModel(path, input, acceptingValue, kind, orig, madId) and
+      model = "MaD:" + madId.toString() and
+      provenance = p_ and
+      isExact = isExact_
     )
   }
 }
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll b/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
index 9ef2c3a08faf..654283a30f27 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
@@ -93,25 +93,16 @@ class FlowSummaryNode extends Node, TFlowSummaryNode {
   }
 
   override CfgScope getCfgScope() {
-    result = this.getSummaryNode().getSourceElement().getEnclosingCfgScope()
-    or
-    result = this.getSummaryNode().getSinkElement().getEnclosingCfgScope()
+    result = this.getSummaryNode().getSourceSinkReportingElement().getEnclosingCfgScope()
   }
 
   override DataFlowCallable getEnclosingCallable() {
-    result.asCfgScope() = this.getCfgScope()
-    or
-    result.asSummarizedCallable() = this.getSummarizedCallable()
+    result = this.getSummaryNode().getEnclosingCallable()
   }
 
   override Location getLocation() {
     Stages::DataFlowStage::ref() and
-    exists(this.getSummarizedCallable()) and
-    result instanceof EmptyLocation
-    or
-    result = this.getSourceElement().getLocation()
-    or
-    result = this.getSinkElement().getLocation()
+    result = this.getSummaryNode().getLocation()
   }
 
   override string toString() {
@@ -444,6 +435,20 @@ final class ClosureArgumentNode extends ArgumentNode, ExprNode {
   }
 }
 
+/**
+ * A data flow node that represents the run-time representation of an async
+ * block passed into its body when awaited.
+ */
+final class AsyncBlockArgumentNode extends ArgumentNode, ExprNode {
+  private AwaitExpr await;
+
+  AsyncBlockArgumentNode() { this.asExpr() = await.getExpr() }
+
+  override predicate isArgumentOf(DataFlowCall call, RustDataFlow::ArgumentPosition pos) {
+    call.asAwaitExpr() = await and pos.isClosureSelf()
+  }
+}
+
 /** An SSA node. */
 class SsaNode extends Node, TSsaNode {
   SsaImpl::DataFlowIntegration::SsaNode node;
@@ -467,8 +472,17 @@ abstract class ReturnNode extends Node {
   abstract ReturnKind getKind();
 }
 
+/** Holds if the value of `n` is returned from its enclosing callable. */
+predicate isReturnedValue(AstNode n) {
+  exists(SuccessorType t | n.getACfgNode().getASuccessor(t) instanceof AnnotatedExitCfgNode |
+    // The early return of `x?` returns the `Err` or `None` held by `x`, which is
+    // a different value from the one `x?` evaluates to
+    not (n instanceof TryExpr and t instanceof ReturnSuccessor)
+  )
+}
+
 final class ExprReturnNode extends ExprNode, ReturnNode {
-  ExprReturnNode() { n.getACfgNode().getASuccessor() instanceof AnnotatedExitCfgNode }
+  ExprReturnNode() { isReturnedValue(n) }
 
   override ReturnKind getKind() { result = TNormalReturnKind() }
 }
@@ -494,12 +508,17 @@ final private class ExprOutNode extends ExprNode, OutNode {
       not call instanceof DerefExpr and // Handled by `DerefOutNode`
       not call instanceof IndexExpr // Handled by `IndexOutNode`
     )
+    or
+    this.asExpr() instanceof AwaitExpr
   }
 
   /** Gets the underlying call node that includes this out node. */
   override DataFlowCall getCall(ReturnKind kind) {
     result.asCall() = n and
     kind = TNormalReturnKind()
+    or
+    result.asAwaitExpr() = n and
+    kind = TNormalReturnKind()
   }
 }
 
@@ -761,9 +780,7 @@ newtype TNode =
   TIndexOutNode(IndexExpr ie, Boolean isPost) or
   TSsaNode(SsaImpl::DataFlowIntegration::SsaNode node) or
   TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn) {
-    forall(AstNode n | n = sn.getSinkElement() or n = sn.getSourceElement() |
-      n.hasEnclosingCfgScope()
-    )
+    forall(AstNode n | n = sn.getSourceSinkReportingElement() | n.hasEnclosingCfgScope())
   } or
   TClosureSelfReferenceNode(CfgScope c) { lambdaCreationExpr(c) } or
   TCaptureNode(VariableCapture::Flow::SynthesizedCaptureNode cn) or
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
index 7e5af70911d7..6791a22f946f 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
@@ -83,8 +83,7 @@ module RustTaintTrackingGen<DataFlowImpl::RustDataFlowInputSig I> implements
         pred.(Node::PostUpdateNode).getPreUpdateNode().asExpr(), _, succ, _)
     )
     or
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(pred,
-      succ.(Node::FlowSummaryNode).getSummaryNode(), false, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(pred, succ, false, model)
   }
 
   /**
diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll
index b7ca8fe1ca5c..b9a6b62200c3 100644
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -6,6 +6,7 @@
 import codeql.files.FileSystem
 import codeql.rust.elements.Abi
 import codeql.rust.elements.Addressable
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.ArgList
 import codeql.rust.elements.ArrayExpr
 import codeql.rust.elements.ArrayListExpr
@@ -39,6 +40,13 @@ import codeql.rust.elements.BreakExpr
 import codeql.rust.elements.CallExpr
 import codeql.rust.elements.Callable
 import codeql.rust.elements.CastExpr
+import codeql.rust.elements.CfgAtom
+import codeql.rust.elements.CfgAttrMeta
+import codeql.rust.elements.CfgComposite
+import codeql.rust.elements.CfgMeta
+import codeql.rust.elements.CfgPredExpr
+import codeql.rust.elements.CfgPredPat
+import codeql.rust.elements.CfgPredicate
 import codeql.rust.elements.ClosureExpr
 import codeql.rust.elements.Comment
 import codeql.rust.elements.Const
@@ -47,6 +55,8 @@ import codeql.rust.elements.ConstBlockPat
 import codeql.rust.elements.ConstParam
 import codeql.rust.elements.ContinueExpr
 import codeql.rust.elements.Crate
+import codeql.rust.elements.DerefPat
+import codeql.rust.elements.DocComment
 import codeql.rust.elements.DynTraitTypeRepr
 import codeql.rust.elements.Element
 import codeql.rust.elements.Enum
@@ -75,11 +85,14 @@ import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.IdentPat
 import codeql.rust.elements.IfExpr
 import codeql.rust.elements.Impl
+import codeql.rust.elements.ImplRestriction
 import codeql.rust.elements.ImplTraitTypeRepr
+import codeql.rust.elements.IncludeBytesExpr
 import codeql.rust.elements.IndexExpr
 import codeql.rust.elements.InferTypeRepr
 import codeql.rust.elements.Item
 import codeql.rust.elements.ItemList
+import codeql.rust.elements.KeyValueMeta
 import codeql.rust.elements.Label
 import codeql.rust.elements.LabelableExpr
 import codeql.rust.elements.LetElse
@@ -108,16 +121,16 @@ import codeql.rust.elements.Meta
 import codeql.rust.elements.MethodCallExpr
 import codeql.rust.elements.Missing
 import codeql.rust.elements.Module
+import codeql.rust.elements.MutRestriction
 import codeql.rust.elements.Name
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.NeverTypeRepr
+import codeql.rust.elements.NotNull
 import codeql.rust.elements.OffsetOfExpr
 import codeql.rust.elements.OrPat
 import codeql.rust.elements.Param
 import codeql.rust.elements.ParamBase
 import codeql.rust.elements.ParamList
-import codeql.rust.elements.ParenExpr
-import codeql.rust.elements.ParenPat
 import codeql.rust.elements.ParenTypeRepr
 import codeql.rust.elements.ParenthesizedArgList
 import codeql.rust.elements.Pat
@@ -125,9 +138,11 @@ import codeql.rust.elements.Path
 import codeql.rust.elements.PathAstNode
 import codeql.rust.elements.PathExpr
 import codeql.rust.elements.PathExprBase
+import codeql.rust.elements.PathMeta
 import codeql.rust.elements.PathPat
 import codeql.rust.elements.PathSegment
 import codeql.rust.elements.PathTypeRepr
+import codeql.rust.elements.PatternTypeRepr
 import codeql.rust.elements.PrefixExpr
 import codeql.rust.elements.PtrTypeRepr
 import codeql.rust.elements.RangeExpr
@@ -158,8 +173,9 @@ import codeql.rust.elements.StructPatField
 import codeql.rust.elements.StructPatFieldList
 import codeql.rust.elements.Token
 import codeql.rust.elements.TokenTree
+import codeql.rust.elements.TokenTreeMeta
 import codeql.rust.elements.Trait
-import codeql.rust.elements.TraitAlias
+import codeql.rust.elements.TryBlockModifier
 import codeql.rust.elements.TryExpr
 import codeql.rust.elements.TupleExpr
 import codeql.rust.elements.TupleField
@@ -178,6 +194,7 @@ import codeql.rust.elements.UnderscoreExpr
 import codeql.rust.elements.Unextracted
 import codeql.rust.elements.Unimplemented
 import codeql.rust.elements.Union
+import codeql.rust.elements.UnsafeMeta
 import codeql.rust.elements.Use
 import codeql.rust.elements.UseBoundGenericArg
 import codeql.rust.elements.UseBoundGenericArgs
@@ -186,6 +203,7 @@ import codeql.rust.elements.UseTreeList
 import codeql.rust.elements.Variant
 import codeql.rust.elements.VariantList
 import codeql.rust.elements.Visibility
+import codeql.rust.elements.VisibilityInner
 import codeql.rust.elements.WhereClause
 import codeql.rust.elements.WherePred
 import codeql.rust.elements.WhileExpr
diff --git a/rust/ql/lib/codeql/rust/elements/AnyAttr.qll b/rust/ql/lib/codeql/rust/elements/AnyAttr.qll
new file mode 100644
index 000000000000..45ab68eaa5a6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/AnyAttr.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `AnyAttr`.
+ */
+
+private import internal.AnyAttrImpl
+import codeql.rust.elements.AstNode
+
+final class AnyAttr = Impl::AnyAttr;
diff --git a/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll b/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll
index b1895a1295a0..11880de78c6a 100644
--- a/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.ArrayExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/AsmClobberAbi.qll b/rust/ql/lib/codeql/rust/elements/AsmClobberAbi.qll
index 253dcdfc9fa4..d49527e50132 100644
--- a/rust/ql/lib/codeql/rust/elements/AsmClobberAbi.qll
+++ b/rust/ql/lib/codeql/rust/elements/AsmClobberAbi.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.AsmClobberAbiImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AsmPiece
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/AsmExpr.qll b/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
index a4b588ff985b..cdd114c0c987 100644
--- a/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.AsmExprImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AsmPiece
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Item
 
diff --git a/rust/ql/lib/codeql/rust/elements/AsmOperandNamed.qll b/rust/ql/lib/codeql/rust/elements/AsmOperandNamed.qll
index cb54a585539a..b650aa27c662 100644
--- a/rust/ql/lib/codeql/rust/elements/AsmOperandNamed.qll
+++ b/rust/ql/lib/codeql/rust/elements/AsmOperandNamed.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.AsmOperandNamedImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AsmOperand
 import codeql.rust.elements.AsmPiece
 import codeql.rust.elements.Name
diff --git a/rust/ql/lib/codeql/rust/elements/AsmOptionsList.qll b/rust/ql/lib/codeql/rust/elements/AsmOptionsList.qll
index dc82f9cb4afd..045de1fecce3 100644
--- a/rust/ql/lib/codeql/rust/elements/AsmOptionsList.qll
+++ b/rust/ql/lib/codeql/rust/elements/AsmOptionsList.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.AsmOptionsListImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AsmOption
 import codeql.rust.elements.AsmPiece
 
diff --git a/rust/ql/lib/codeql/rust/elements/AssocItemList.qll b/rust/ql/lib/codeql/rust/elements/AssocItemList.qll
index 86ae3df7a6b1..ae0be6b190f2 100644
--- a/rust/ql/lib/codeql/rust/elements/AssocItemList.qll
+++ b/rust/ql/lib/codeql/rust/elements/AssocItemList.qll
@@ -4,9 +4,9 @@
  */
 
 private import internal.AssocItemListImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AssocItem
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 
 /**
  * A list of `AssocItem` elements, as appearing in a `Trait` or `Impl`.
diff --git a/rust/ql/lib/codeql/rust/elements/Attr.qll b/rust/ql/lib/codeql/rust/elements/Attr.qll
index 176d8987f7f0..b97465119278 100644
--- a/rust/ql/lib/codeql/rust/elements/Attr.qll
+++ b/rust/ql/lib/codeql/rust/elements/Attr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.AttrImpl
-import codeql.rust.elements.AstNode
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Meta
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/AwaitExpr.qll b/rust/ql/lib/codeql/rust/elements/AwaitExpr.qll
index 16c6790294c2..606aceee2e12 100644
--- a/rust/ql/lib/codeql/rust/elements/AwaitExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/AwaitExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.AwaitExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/BecomeExpr.qll b/rust/ql/lib/codeql/rust/elements/BecomeExpr.qll
index 0348b8628497..1de66d732ba3 100644
--- a/rust/ql/lib/codeql/rust/elements/BecomeExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BecomeExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.BecomeExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/BinaryExpr.qll b/rust/ql/lib/codeql/rust/elements/BinaryExpr.qll
index 39df861aba8d..d36afaaad8e4 100644
--- a/rust/ql/lib/codeql/rust/elements/BinaryExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BinaryExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.BinaryExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/BlockExpr.qll b/rust/ql/lib/codeql/rust/elements/BlockExpr.qll
index 9e87d381525d..30bd15e08c4f 100644
--- a/rust/ql/lib/codeql/rust/elements/BlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BlockExpr.qll
@@ -4,9 +4,10 @@
  */
 
 private import internal.BlockExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.LabelableExpr
 import codeql.rust.elements.StmtList
+import codeql.rust.elements.TryBlockModifier
 
 /**
  * A block expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/BreakExpr.qll b/rust/ql/lib/codeql/rust/elements/BreakExpr.qll
index 8aec2220dc7a..5e0fb18eb93e 100644
--- a/rust/ql/lib/codeql/rust/elements/BreakExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BreakExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.BreakExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Lifetime
 
diff --git a/rust/ql/lib/codeql/rust/elements/CallExpr.qll b/rust/ql/lib/codeql/rust/elements/CallExpr.qll
index 1344af3a124a..cd245a0cf9c1 100644
--- a/rust/ql/lib/codeql/rust/elements/CallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/CallExpr.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.CallExprImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.ArgList
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/Callable.qll b/rust/ql/lib/codeql/rust/elements/Callable.qll
index b2088f08f66a..7b6789d135f4 100644
--- a/rust/ql/lib/codeql/rust/elements/Callable.qll
+++ b/rust/ql/lib/codeql/rust/elements/Callable.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.CallableImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Param
 import codeql.rust.elements.ParamList
diff --git a/rust/ql/lib/codeql/rust/elements/CastExpr.qll b/rust/ql/lib/codeql/rust/elements/CastExpr.qll
index 968a6062a15e..2b40353d3574 100644
--- a/rust/ql/lib/codeql/rust/elements/CastExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/CastExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.CastExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.TypeRepr
 
diff --git a/rust/ql/lib/codeql/rust/elements/CfgAtom.qll b/rust/ql/lib/codeql/rust/elements/CfgAtom.qll
new file mode 100644
index 000000000000..6aecca369fe9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/CfgAtom.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `CfgAtom`.
+ */
+
+private import internal.CfgAtomImpl
+import codeql.rust.elements.CfgPredicate
+
+final class CfgAtom = Impl::CfgAtom;
diff --git a/rust/ql/lib/codeql/rust/elements/CfgAttrMeta.qll b/rust/ql/lib/codeql/rust/elements/CfgAttrMeta.qll
new file mode 100644
index 000000000000..b8c3364f4874
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/CfgAttrMeta.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `CfgAttrMeta`.
+ */
+
+private import internal.CfgAttrMetaImpl
+import codeql.rust.elements.CfgPredicate
+import codeql.rust.elements.Meta
+
+final class CfgAttrMeta = Impl::CfgAttrMeta;
diff --git a/rust/ql/lib/codeql/rust/elements/CfgComposite.qll b/rust/ql/lib/codeql/rust/elements/CfgComposite.qll
new file mode 100644
index 000000000000..61aac82a2709
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/CfgComposite.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `CfgComposite`.
+ */
+
+private import internal.CfgCompositeImpl
+import codeql.rust.elements.CfgPredicate
+
+final class CfgComposite = Impl::CfgComposite;
diff --git a/rust/ql/lib/codeql/rust/elements/CfgMeta.qll b/rust/ql/lib/codeql/rust/elements/CfgMeta.qll
new file mode 100644
index 000000000000..f32ade7e63c7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/CfgMeta.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `CfgMeta`.
+ */
+
+private import internal.CfgMetaImpl
+import codeql.rust.elements.CfgPredicate
+import codeql.rust.elements.Meta
+
+final class CfgMeta = Impl::CfgMeta;
diff --git a/rust/ql/lib/codeql/rust/elements/CfgPredExpr.qll b/rust/ql/lib/codeql/rust/elements/CfgPredExpr.qll
new file mode 100644
index 000000000000..ac0c60bc1f70
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/CfgPredExpr.qll
@@ -0,0 +1,22 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `CfgPredExpr`.
+ */
+
+private import internal.CfgPredExprImpl
+import codeql.rust.elements.CfgPredicate
+import codeql.rust.elements.Expr
+
+/**
+ * A configuration predicate expression resulting from expansion of a `cfg!` macro call.
+ * It has type `bool` and evaluates to whether the configuration predicate holds.
+ *
+ * Rust-analyzer expands `cfg!(...)` in expression position to its internal `builtin#cfg(...)`
+ * syntax, as illustrated below:
+ * ```rust
+ * builtin#cfg(unix);
+ * builtin#cfg(target_os = "windows");
+ * builtin#cfg(any(unix, target_os = "windows"));
+ * ```
+ */
+final class CfgPredExpr = Impl::CfgPredExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/CfgPredPat.qll b/rust/ql/lib/codeql/rust/elements/CfgPredPat.qll
new file mode 100644
index 000000000000..ee633839aa49
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/CfgPredPat.qll
@@ -0,0 +1,25 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `CfgPredPat`.
+ */
+
+private import internal.CfgPredPatImpl
+import codeql.rust.elements.CfgPredicate
+import codeql.rust.elements.Pat
+
+/**
+ * A configuration predicate pattern resulting from expansion of a `cfg!` macro call.
+ * It matches `true` when the configuration predicate holds and `false` otherwise.
+ *
+ * Rust-analyzer expands `cfg!(...)` in pattern position to its internal `builtin#cfg(...)`
+ * syntax, as illustrated below:
+ * ```rust
+ * match true {
+ *     builtin#cfg(unix) => (),
+ *     builtin#cfg(target_os = "windows") => (),
+ *     builtin#cfg(any(unix, target_os = "windows")) => (),
+ *     _ => (),
+ * };
+ * ```
+ */
+final class CfgPredPat = Impl::CfgPredPat;
diff --git a/rust/ql/lib/codeql/rust/elements/CfgPredicate.qll b/rust/ql/lib/codeql/rust/elements/CfgPredicate.qll
new file mode 100644
index 000000000000..399705fb4a7d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/CfgPredicate.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `CfgPredicate`.
+ */
+
+private import internal.CfgPredicateImpl
+import codeql.rust.elements.AstNode
+
+final class CfgPredicate = Impl::CfgPredicate;
diff --git a/rust/ql/lib/codeql/rust/elements/Comment.qll b/rust/ql/lib/codeql/rust/elements/Comment.qll
index 9a830ad29d97..c1c801a8bf6d 100644
--- a/rust/ql/lib/codeql/rust/elements/Comment.qll
+++ b/rust/ql/lib/codeql/rust/elements/Comment.qll
@@ -12,6 +12,7 @@ import codeql.rust.elements.Token
  * ```rust
  * // this is a comment
  * /// This is a doc comment
+ * fn documented() {}
  * ```
  */
 final class Comment = Impl::Comment;
diff --git a/rust/ql/lib/codeql/rust/elements/Const.qll b/rust/ql/lib/codeql/rust/elements/Const.qll
index 39aea3e25dc4..383995338a8e 100644
--- a/rust/ql/lib/codeql/rust/elements/Const.qll
+++ b/rust/ql/lib/codeql/rust/elements/Const.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.ConstImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AssocItem
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Name
diff --git a/rust/ql/lib/codeql/rust/elements/ConstParam.qll b/rust/ql/lib/codeql/rust/elements/ConstParam.qll
index c0135100863f..5c1fe12d6277 100644
--- a/rust/ql/lib/codeql/rust/elements/ConstParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/ConstParam.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.ConstParamImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.ConstArg
 import codeql.rust.elements.GenericParam
 import codeql.rust.elements.Name
diff --git a/rust/ql/lib/codeql/rust/elements/ContinueExpr.qll b/rust/ql/lib/codeql/rust/elements/ContinueExpr.qll
index 7db17ff82777..ac5f512ca916 100644
--- a/rust/ql/lib/codeql/rust/elements/ContinueExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ContinueExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.ContinueExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Lifetime
 
diff --git a/rust/ql/lib/codeql/rust/elements/DerefPat.qll b/rust/ql/lib/codeql/rust/elements/DerefPat.qll
new file mode 100644
index 000000000000..ba4364e92962
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/DerefPat.qll
@@ -0,0 +1,20 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `DerefPat`.
+ */
+
+private import internal.DerefPatImpl
+import codeql.rust.elements.Pat
+
+/**
+ * A deref pattern, matching the value behind a smart pointer. This is an experimental
+ * Rust feature that cannot be written directly in stable Rust; the example below uses
+ * rust-analyzer's canonical `builtin#deref` syntax for such patterns:
+ * ```rust
+ * match x {
+ *     builtin#deref(y) => y,
+ *     _ => 0,
+ * };
+ * ```
+ */
+final class DerefPat = Impl::DerefPat;
diff --git a/rust/ql/lib/codeql/rust/elements/DocComment.qll b/rust/ql/lib/codeql/rust/elements/DocComment.qll
new file mode 100644
index 000000000000..ef2e3d7762a3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/DocComment.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `DocComment`.
+ */
+
+private import internal.DocCommentImpl
+import codeql.rust.elements.AnyAttr
+
+/**
+ * A documentation comment.
+ *
+ * For example:
+ * ```rust
+ * /// Documents `documented`.
+ * fn documented() {}
+ * ```
+ */
+final class DocComment = Impl::DocComment;
diff --git a/rust/ql/lib/codeql/rust/elements/ExternBlock.qll b/rust/ql/lib/codeql/rust/elements/ExternBlock.qll
index 7b191ae07a64..dc90cfe32095 100644
--- a/rust/ql/lib/codeql/rust/elements/ExternBlock.qll
+++ b/rust/ql/lib/codeql/rust/elements/ExternBlock.qll
@@ -5,7 +5,7 @@
 
 private import internal.ExternBlockImpl
 import codeql.rust.elements.Abi
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.ExternItemList
 import codeql.rust.elements.Item
 
diff --git a/rust/ql/lib/codeql/rust/elements/ExternCrate.qll b/rust/ql/lib/codeql/rust/elements/ExternCrate.qll
index b54450cadf43..949d30c8f2d4 100644
--- a/rust/ql/lib/codeql/rust/elements/ExternCrate.qll
+++ b/rust/ql/lib/codeql/rust/elements/ExternCrate.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.ExternCrateImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Item
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.Rename
diff --git a/rust/ql/lib/codeql/rust/elements/ExternItemList.qll b/rust/ql/lib/codeql/rust/elements/ExternItemList.qll
index fa6aee3d1ee7..11243a98fe51 100644
--- a/rust/ql/lib/codeql/rust/elements/ExternItemList.qll
+++ b/rust/ql/lib/codeql/rust/elements/ExternItemList.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.ExternItemListImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.ExternItem
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/FieldExpr.qll b/rust/ql/lib/codeql/rust/elements/FieldExpr.qll
index ab8a9594954c..0ddfac6524c4 100644
--- a/rust/ql/lib/codeql/rust/elements/FieldExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/FieldExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.FieldExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.NameRef
 
diff --git a/rust/ql/lib/codeql/rust/elements/ForExpr.qll b/rust/ql/lib/codeql/rust/elements/ForExpr.qll
index 10247d0b909b..0702aa5e7942 100644
--- a/rust/ql/lib/codeql/rust/elements/ForExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ForExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.ForExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.LoopingExpr
 import codeql.rust.elements.Pat
diff --git a/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll b/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll
index 419a48a53351..850944f426c6 100644
--- a/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.FormatArgsExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Format
 import codeql.rust.elements.FormatArgsArg
diff --git a/rust/ql/lib/codeql/rust/elements/IdentPat.qll b/rust/ql/lib/codeql/rust/elements/IdentPat.qll
index 91ad47b42e1f..5b4431d39cbc 100644
--- a/rust/ql/lib/codeql/rust/elements/IdentPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/IdentPat.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.IdentPatImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Name
 import codeql.rust.elements.Pat
 
diff --git a/rust/ql/lib/codeql/rust/elements/IfExpr.qll b/rust/ql/lib/codeql/rust/elements/IfExpr.qll
index d3689b9957a8..628154204726 100644
--- a/rust/ql/lib/codeql/rust/elements/IfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/IfExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.IfExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.Expr
 
diff --git a/rust/ql/lib/codeql/rust/elements/Impl.qll b/rust/ql/lib/codeql/rust/elements/Impl.qll
index 3324e05dc516..b21dac93e3f3 100644
--- a/rust/ql/lib/codeql/rust/elements/Impl.qll
+++ b/rust/ql/lib/codeql/rust/elements/Impl.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.ImplImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AssocItemList
-import codeql.rust.elements.Attr
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Item
 import codeql.rust.elements.TypeRepr
diff --git a/rust/ql/lib/codeql/rust/elements/ImplRestriction.qll b/rust/ql/lib/codeql/rust/elements/ImplRestriction.qll
new file mode 100644
index 000000000000..23bd1c0ace6e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ImplRestriction.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ImplRestriction`.
+ */
+
+private import internal.ImplRestrictionImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.VisibilityInner
+
+/**
+ * An implementation restriction, limiting where a trait can be implemented. For example the `impl(crate)` restriction (an unstable feature).
+ */
+final class ImplRestriction = Impl::ImplRestriction;
diff --git a/rust/ql/lib/codeql/rust/elements/IncludeBytesExpr.qll b/rust/ql/lib/codeql/rust/elements/IncludeBytesExpr.qll
new file mode 100644
index 000000000000..f6aff4cf27f0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/IncludeBytesExpr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `IncludeBytesExpr`.
+ */
+
+private import internal.IncludeBytesExprImpl
+import codeql.rust.elements.Expr
+
+/**
+ * An expression produced by the built-in `include_bytes!` macro, embedding the contents of a file as a byte array. For example:
+ * ```rust
+ * let data = include_bytes!("data.bin");
+ * ```
+ */
+final class IncludeBytesExpr = Impl::IncludeBytesExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/IndexExpr.qll b/rust/ql/lib/codeql/rust/elements/IndexExpr.qll
index ea19aad353d0..27a192be611c 100644
--- a/rust/ql/lib/codeql/rust/elements/IndexExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/IndexExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.IndexExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/ItemList.qll b/rust/ql/lib/codeql/rust/elements/ItemList.qll
index fe912d5402ad..bdbef5fdf87d 100644
--- a/rust/ql/lib/codeql/rust/elements/ItemList.qll
+++ b/rust/ql/lib/codeql/rust/elements/ItemList.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.ItemListImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Item
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/KeyValueMeta.qll b/rust/ql/lib/codeql/rust/elements/KeyValueMeta.qll
new file mode 100644
index 000000000000..87b2bec9f045
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/KeyValueMeta.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `KeyValueMeta`.
+ */
+
+private import internal.KeyValueMetaImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Meta
+import codeql.rust.elements.Path
+
+final class KeyValueMeta = Impl::KeyValueMeta;
diff --git a/rust/ql/lib/codeql/rust/elements/LetExpr.qll b/rust/ql/lib/codeql/rust/elements/LetExpr.qll
index 0792a10cbb7b..7fd4fcc6bb55 100644
--- a/rust/ql/lib/codeql/rust/elements/LetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/LetExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.LetExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Pat
 
diff --git a/rust/ql/lib/codeql/rust/elements/LetStmt.qll b/rust/ql/lib/codeql/rust/elements/LetStmt.qll
index 48960e3a5c60..0af452514ef4 100644
--- a/rust/ql/lib/codeql/rust/elements/LetStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/LetStmt.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.LetStmtImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.LetElse
 import codeql.rust.elements.Pat
diff --git a/rust/ql/lib/codeql/rust/elements/LifetimeParam.qll b/rust/ql/lib/codeql/rust/elements/LifetimeParam.qll
index c47be28fee71..7cb12444bd39 100644
--- a/rust/ql/lib/codeql/rust/elements/LifetimeParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/LifetimeParam.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.LifetimeParamImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.GenericParam
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeBoundList
diff --git a/rust/ql/lib/codeql/rust/elements/LiteralExpr.qll b/rust/ql/lib/codeql/rust/elements/LiteralExpr.qll
index 91fcd8910cef..691d3ce1981d 100644
--- a/rust/ql/lib/codeql/rust/elements/LiteralExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/LiteralExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.LiteralExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/LoopExpr.qll b/rust/ql/lib/codeql/rust/elements/LoopExpr.qll
index cdb6d743b50f..21e01a5c2d66 100644
--- a/rust/ql/lib/codeql/rust/elements/LoopExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/LoopExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.LoopExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.LoopingExpr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/MacroCall.qll b/rust/ql/lib/codeql/rust/elements/MacroCall.qll
index 240ff7ab97d5..6f3e8d33e212 100644
--- a/rust/ql/lib/codeql/rust/elements/MacroCall.qll
+++ b/rust/ql/lib/codeql/rust/elements/MacroCall.qll
@@ -4,9 +4,9 @@
  */
 
 private import internal.MacroCallImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AssocItem
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.ExternItem
 import codeql.rust.elements.Path
 import codeql.rust.elements.TokenTree
diff --git a/rust/ql/lib/codeql/rust/elements/MacroDef.qll b/rust/ql/lib/codeql/rust/elements/MacroDef.qll
index 9bd06c4d156c..60d96843b2b4 100644
--- a/rust/ql/lib/codeql/rust/elements/MacroDef.qll
+++ b/rust/ql/lib/codeql/rust/elements/MacroDef.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.MacroDefImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Item
 import codeql.rust.elements.Name
 import codeql.rust.elements.TokenTree
diff --git a/rust/ql/lib/codeql/rust/elements/MacroExpr.qll b/rust/ql/lib/codeql/rust/elements/MacroExpr.qll
index 9b063903caa8..054dcd367711 100644
--- a/rust/ql/lib/codeql/rust/elements/MacroExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/MacroExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.MacroExprImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.MacroCall
 
diff --git a/rust/ql/lib/codeql/rust/elements/MacroRules.qll b/rust/ql/lib/codeql/rust/elements/MacroRules.qll
index 776069c2eb9c..78048a772329 100644
--- a/rust/ql/lib/codeql/rust/elements/MacroRules.qll
+++ b/rust/ql/lib/codeql/rust/elements/MacroRules.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.MacroRulesImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Item
 import codeql.rust.elements.Name
 import codeql.rust.elements.TokenTree
diff --git a/rust/ql/lib/codeql/rust/elements/MatchArm.qll b/rust/ql/lib/codeql/rust/elements/MatchArm.qll
index 39505198021f..893280e2fbb7 100644
--- a/rust/ql/lib/codeql/rust/elements/MatchArm.qll
+++ b/rust/ql/lib/codeql/rust/elements/MatchArm.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.MatchArmImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.MatchGuard
 import codeql.rust.elements.Pat
diff --git a/rust/ql/lib/codeql/rust/elements/MatchArmList.qll b/rust/ql/lib/codeql/rust/elements/MatchArmList.qll
index 664db7b53f2b..0133dbe18fdf 100644
--- a/rust/ql/lib/codeql/rust/elements/MatchArmList.qll
+++ b/rust/ql/lib/codeql/rust/elements/MatchArmList.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.MatchArmListImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.MatchArm
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/MatchExpr.qll b/rust/ql/lib/codeql/rust/elements/MatchExpr.qll
index ec1a5c538a4f..02d54ac281eb 100644
--- a/rust/ql/lib/codeql/rust/elements/MatchExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/MatchExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.MatchExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.MatchArmList
 
diff --git a/rust/ql/lib/codeql/rust/elements/Meta.qll b/rust/ql/lib/codeql/rust/elements/Meta.qll
index 46fcafb43c2f..8086286cd7e4 100644
--- a/rust/ql/lib/codeql/rust/elements/Meta.qll
+++ b/rust/ql/lib/codeql/rust/elements/Meta.qll
@@ -5,9 +5,6 @@
 
 private import internal.MetaImpl
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Expr
-import codeql.rust.elements.Path
-import codeql.rust.elements.TokenTree
 
 /**
  * A meta item in an attribute.
diff --git a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
index 3ac0fccc42d5..b9157530b3c2 100644
--- a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.MethodCallExprImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.ArgList
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
diff --git a/rust/ql/lib/codeql/rust/elements/Module.qll b/rust/ql/lib/codeql/rust/elements/Module.qll
index efb31c3e74f6..233c7973cd0f 100644
--- a/rust/ql/lib/codeql/rust/elements/Module.qll
+++ b/rust/ql/lib/codeql/rust/elements/Module.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.ModuleImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Item
 import codeql.rust.elements.ItemList
 import codeql.rust.elements.Name
diff --git a/rust/ql/lib/codeql/rust/elements/MutRestriction.qll b/rust/ql/lib/codeql/rust/elements/MutRestriction.qll
new file mode 100644
index 000000000000..57a938005b1d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MutRestriction.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MutRestriction`.
+ */
+
+private import internal.MutRestrictionImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.VisibilityInner
+
+/**
+ * A mutability restriction, limiting where a field can be mutated. For example the `mut(crate)` restriction (an unstable feature).
+ */
+final class MutRestriction = Impl::MutRestriction;
diff --git a/rust/ql/lib/codeql/rust/elements/NotNull.qll b/rust/ql/lib/codeql/rust/elements/NotNull.qll
new file mode 100644
index 000000000000..62489c2da7b3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/NotNull.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `NotNull`.
+ */
+
+private import internal.NotNullImpl
+import codeql.rust.elements.Pat
+
+/**
+ * The `!null` pattern used in a pattern type to denote a non-null value. Pattern types
+ * are an experimental, mostly compiler-internal feature (used in the standard library for
+ * types such as `NonZero` and `NonNull`) and cannot be written directly in stable Rust;
+ * the example below uses rust-analyzer's canonical `builtin#pattern_type` syntax:
+ * ```rust
+ * type NonNull = builtin#pattern_type(*const () is !null);
+ * ```
+ */
+final class NotNull = Impl::NotNull;
diff --git a/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll b/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
index 4136158913a4..6194776ad332 100644
--- a/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.OffsetOfExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.TypeRepr
diff --git a/rust/ql/lib/codeql/rust/elements/ParamBase.qll b/rust/ql/lib/codeql/rust/elements/ParamBase.qll
index ca46906a14fe..27729d6acfa4 100644
--- a/rust/ql/lib/codeql/rust/elements/ParamBase.qll
+++ b/rust/ql/lib/codeql/rust/elements/ParamBase.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.ParamBaseImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.TypeRepr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/ParenExpr.qll b/rust/ql/lib/codeql/rust/elements/ParenExpr.qll
deleted file mode 100644
index 1233ac2b6af2..000000000000
--- a/rust/ql/lib/codeql/rust/elements/ParenExpr.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ParenExpr`.
- */
-
-private import internal.ParenExprImpl
-import codeql.rust.elements.Attr
-import codeql.rust.elements.Expr
-
-/**
- * A parenthesized expression.
- *
- * For example:
- * ```rust
- * (x + y)
- * ```
- */
-final class ParenExpr = Impl::ParenExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ParenPat.qll b/rust/ql/lib/codeql/rust/elements/ParenPat.qll
deleted file mode 100644
index 6789be949792..000000000000
--- a/rust/ql/lib/codeql/rust/elements/ParenPat.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ParenPat`.
- */
-
-private import internal.ParenPatImpl
-import codeql.rust.elements.Pat
-
-/**
- * A parenthesized pattern.
- *
- * For example:
- * ```rust
- * let (x) = 1;
- * //  ^^^
- * ```
- */
-final class ParenPat = Impl::ParenPat;
diff --git a/rust/ql/lib/codeql/rust/elements/PathExpr.qll b/rust/ql/lib/codeql/rust/elements/PathExpr.qll
index 8d423d766875..99d20ebc2fb9 100644
--- a/rust/ql/lib/codeql/rust/elements/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/PathExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.PathExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.PathAstNode
 import codeql.rust.elements.PathExprBase
 
diff --git a/rust/ql/lib/codeql/rust/elements/PathMeta.qll b/rust/ql/lib/codeql/rust/elements/PathMeta.qll
new file mode 100644
index 000000000000..53fd0ed669e6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/PathMeta.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `PathMeta`.
+ */
+
+private import internal.PathMetaImpl
+import codeql.rust.elements.Meta
+import codeql.rust.elements.Path
+
+final class PathMeta = Impl::PathMeta;
diff --git a/rust/ql/lib/codeql/rust/elements/PatternTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/PatternTypeRepr.qll
new file mode 100644
index 000000000000..c54b6b806af8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/PatternTypeRepr.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `PatternTypeRepr`.
+ */
+
+private import internal.PatternTypeReprImpl
+import codeql.rust.elements.Pat
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A pattern type, constraining a type to values matching a pattern. Pattern types are an
+ * experimental, mostly compiler-internal feature and cannot be written directly in stable
+ * Rust; the example below uses rust-analyzer's canonical `builtin#pattern_type` syntax:
+ * ```rust
+ * type NonZero = builtin#pattern_type(u32 is 1..);
+ * ```
+ */
+final class PatternTypeRepr = Impl::PatternTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/PrefixExpr.qll b/rust/ql/lib/codeql/rust/elements/PrefixExpr.qll
index 8bc627a39e7d..3c19b77a9495 100644
--- a/rust/ql/lib/codeql/rust/elements/PrefixExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/PrefixExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.PrefixExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/RangeExpr.qll b/rust/ql/lib/codeql/rust/elements/RangeExpr.qll
index 78fec598e0cd..05aabde10f3b 100644
--- a/rust/ql/lib/codeql/rust/elements/RangeExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/RangeExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.RangeExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/RefExpr.qll b/rust/ql/lib/codeql/rust/elements/RefExpr.qll
index 8bbc0a8c87ec..5ff1a527d641 100644
--- a/rust/ql/lib/codeql/rust/elements/RefExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/RefExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.RefExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/RestPat.qll b/rust/ql/lib/codeql/rust/elements/RestPat.qll
index 9c20f0c5c9b6..313ebd83765b 100644
--- a/rust/ql/lib/codeql/rust/elements/RestPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/RestPat.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.RestPatImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Pat
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/ReturnExpr.qll b/rust/ql/lib/codeql/rust/elements/ReturnExpr.qll
index 73a499ec7876..5db2b121054c 100644
--- a/rust/ql/lib/codeql/rust/elements/ReturnExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ReturnExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.ReturnExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/SourceFile.qll b/rust/ql/lib/codeql/rust/elements/SourceFile.qll
index aaa7f1d7be48..e94ef5ce5595 100644
--- a/rust/ql/lib/codeql/rust/elements/SourceFile.qll
+++ b/rust/ql/lib/codeql/rust/elements/SourceFile.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.SourceFileImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Item
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/Static.qll b/rust/ql/lib/codeql/rust/elements/Static.qll
index ae6e8b3b6a46..74a9e2fe8472 100644
--- a/rust/ql/lib/codeql/rust/elements/Static.qll
+++ b/rust/ql/lib/codeql/rust/elements/Static.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.StaticImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.ExternItem
 import codeql.rust.elements.Name
diff --git a/rust/ql/lib/codeql/rust/elements/StmtList.qll b/rust/ql/lib/codeql/rust/elements/StmtList.qll
index 9401cb99084c..924529584e8a 100644
--- a/rust/ql/lib/codeql/rust/elements/StmtList.qll
+++ b/rust/ql/lib/codeql/rust/elements/StmtList.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.StmtListImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Stmt
 
diff --git a/rust/ql/lib/codeql/rust/elements/StructExpr.qll b/rust/ql/lib/codeql/rust/elements/StructExpr.qll
index dfb1ae4f819a..ab84f10b2da1 100644
--- a/rust/ql/lib/codeql/rust/elements/StructExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/StructExpr.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.StructExprImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.PathAstNode
 import codeql.rust.elements.StructExprFieldList
diff --git a/rust/ql/lib/codeql/rust/elements/StructExprField.qll b/rust/ql/lib/codeql/rust/elements/StructExprField.qll
index eb63860cf9a4..7ee69ef661c4 100644
--- a/rust/ql/lib/codeql/rust/elements/StructExprField.qll
+++ b/rust/ql/lib/codeql/rust/elements/StructExprField.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.StructExprFieldImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.NameRef
 
diff --git a/rust/ql/lib/codeql/rust/elements/StructExprFieldList.qll b/rust/ql/lib/codeql/rust/elements/StructExprFieldList.qll
index 091460538fc3..696043288ebb 100644
--- a/rust/ql/lib/codeql/rust/elements/StructExprFieldList.qll
+++ b/rust/ql/lib/codeql/rust/elements/StructExprFieldList.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.StructExprFieldListImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.StructExprField
 
diff --git a/rust/ql/lib/codeql/rust/elements/StructField.qll b/rust/ql/lib/codeql/rust/elements/StructField.qll
index 6d363a17b12d..1940db3f7229 100644
--- a/rust/ql/lib/codeql/rust/elements/StructField.qll
+++ b/rust/ql/lib/codeql/rust/elements/StructField.qll
@@ -4,9 +4,10 @@
  */
 
 private import internal.StructFieldImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
-import codeql.rust.elements.Expr
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.MutRestriction
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
diff --git a/rust/ql/lib/codeql/rust/elements/StructPatField.qll b/rust/ql/lib/codeql/rust/elements/StructPatField.qll
index f8584d6e4f8c..dbf52ba10af2 100644
--- a/rust/ql/lib/codeql/rust/elements/StructPatField.qll
+++ b/rust/ql/lib/codeql/rust/elements/StructPatField.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.StructPatFieldImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.Pat
 
diff --git a/rust/ql/lib/codeql/rust/elements/TokenTreeMeta.qll b/rust/ql/lib/codeql/rust/elements/TokenTreeMeta.qll
new file mode 100644
index 000000000000..1299a44550b0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TokenTreeMeta.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TokenTreeMeta`.
+ */
+
+private import internal.TokenTreeMetaImpl
+import codeql.rust.elements.Meta
+import codeql.rust.elements.Path
+import codeql.rust.elements.TokenTree
+
+final class TokenTreeMeta = Impl::TokenTreeMeta;
diff --git a/rust/ql/lib/codeql/rust/elements/Trait.qll b/rust/ql/lib/codeql/rust/elements/Trait.qll
index ee1166922ccd..de90f54c9ff4 100644
--- a/rust/ql/lib/codeql/rust/elements/Trait.qll
+++ b/rust/ql/lib/codeql/rust/elements/Trait.qll
@@ -4,9 +4,10 @@
  */
 
 private import internal.TraitImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AssocItemList
-import codeql.rust.elements.Attr
 import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.ImplRestriction
 import codeql.rust.elements.Item
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeBoundList
diff --git a/rust/ql/lib/codeql/rust/elements/TraitAlias.qll b/rust/ql/lib/codeql/rust/elements/TraitAlias.qll
deleted file mode 100644
index 956fa76ab212..000000000000
--- a/rust/ql/lib/codeql/rust/elements/TraitAlias.qll
+++ /dev/null
@@ -1,23 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `TraitAlias`.
- */
-
-private import internal.TraitAliasImpl
-import codeql.rust.elements.Attr
-import codeql.rust.elements.GenericParamList
-import codeql.rust.elements.Item
-import codeql.rust.elements.Name
-import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.Visibility
-import codeql.rust.elements.WhereClause
-
-/**
- * A trait alias.
- *
- * For example:
- * ```rust
- * trait Foo = Bar + Baz;
- * ```
- */
-final class TraitAlias = Impl::TraitAlias;
diff --git a/rust/ql/lib/codeql/rust/elements/TryBlockModifier.qll b/rust/ql/lib/codeql/rust/elements/TryBlockModifier.qll
new file mode 100644
index 000000000000..b7265e12f26a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TryBlockModifier.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TryBlockModifier`.
+ */
+
+private import internal.TryBlockModifierImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.TypeRepr
+
+final class TryBlockModifier = Impl::TryBlockModifier;
diff --git a/rust/ql/lib/codeql/rust/elements/TryExpr.qll b/rust/ql/lib/codeql/rust/elements/TryExpr.qll
index 683b302528f6..1e7d3cb2ac7b 100644
--- a/rust/ql/lib/codeql/rust/elements/TryExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/TryExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.TryExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/TupleExpr.qll b/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
index 471abb51a3b2..9c388f26d20f 100644
--- a/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.TupleExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/TupleField.qll b/rust/ql/lib/codeql/rust/elements/TupleField.qll
index 3e63f377aeb6..8e16df5d387c 100644
--- a/rust/ql/lib/codeql/rust/elements/TupleField.qll
+++ b/rust/ql/lib/codeql/rust/elements/TupleField.qll
@@ -4,8 +4,9 @@
  */
 
 private import internal.TupleFieldImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
+import codeql.rust.elements.MutRestriction
 import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
diff --git a/rust/ql/lib/codeql/rust/elements/TypeAlias.qll b/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
index 051b381003bc..79b2ddb18c44 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.TypeAliasImpl
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AssocItem
-import codeql.rust.elements.Attr
 import codeql.rust.elements.ExternItem
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Name
diff --git a/rust/ql/lib/codeql/rust/elements/TypeItem.qll b/rust/ql/lib/codeql/rust/elements/TypeItem.qll
index 48d22478df05..44987602e40b 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeItem.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeItem.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.TypeItemImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Item
 import codeql.rust.elements.MacroItems
diff --git a/rust/ql/lib/codeql/rust/elements/TypeParam.qll b/rust/ql/lib/codeql/rust/elements/TypeParam.qll
index 126892685cd4..7a710c459b5d 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeParam.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.TypeParamImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.GenericParam
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeBoundList
diff --git a/rust/ql/lib/codeql/rust/elements/UnderscoreExpr.qll b/rust/ql/lib/codeql/rust/elements/UnderscoreExpr.qll
index 14d9a39d55f0..61beeffbfa89 100644
--- a/rust/ql/lib/codeql/rust/elements/UnderscoreExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/UnderscoreExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.UnderscoreExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/UnsafeMeta.qll b/rust/ql/lib/codeql/rust/elements/UnsafeMeta.qll
new file mode 100644
index 000000000000..ec1bec4e7743
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/UnsafeMeta.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `UnsafeMeta`.
+ */
+
+private import internal.UnsafeMetaImpl
+import codeql.rust.elements.Meta
+
+final class UnsafeMeta = Impl::UnsafeMeta;
diff --git a/rust/ql/lib/codeql/rust/elements/Use.qll b/rust/ql/lib/codeql/rust/elements/Use.qll
index 4d5f9bd3948f..817c53dc141f 100644
--- a/rust/ql/lib/codeql/rust/elements/Use.qll
+++ b/rust/ql/lib/codeql/rust/elements/Use.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.UseImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Item
 import codeql.rust.elements.UseTree
 import codeql.rust.elements.Visibility
diff --git a/rust/ql/lib/codeql/rust/elements/Variant.qll b/rust/ql/lib/codeql/rust/elements/Variant.qll
index dfe5199f1592..918ff71d9746 100644
--- a/rust/ql/lib/codeql/rust/elements/Variant.qll
+++ b/rust/ql/lib/codeql/rust/elements/Variant.qll
@@ -5,8 +5,8 @@
 
 private import internal.VariantImpl
 import codeql.rust.elements.Addressable
-import codeql.rust.elements.Attr
-import codeql.rust.elements.Expr
+import codeql.rust.elements.AnyAttr
+import codeql.rust.elements.ConstArg
 import codeql.rust.elements.FieldList
 import codeql.rust.elements.Name
 import codeql.rust.elements.Visibility
diff --git a/rust/ql/lib/codeql/rust/elements/Visibility.qll b/rust/ql/lib/codeql/rust/elements/Visibility.qll
index 9fd60b6ba27c..fe62d91fb18d 100644
--- a/rust/ql/lib/codeql/rust/elements/Visibility.qll
+++ b/rust/ql/lib/codeql/rust/elements/Visibility.qll
@@ -5,7 +5,7 @@
 
 private import internal.VisibilityImpl
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Path
+import codeql.rust.elements.VisibilityInner
 
 /**
  * A visibility modifier.
diff --git a/rust/ql/lib/codeql/rust/elements/VisibilityInner.qll b/rust/ql/lib/codeql/rust/elements/VisibilityInner.qll
new file mode 100644
index 000000000000..f17c65ff6dec
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/VisibilityInner.qll
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `VisibilityInner`.
+ */
+
+private import internal.VisibilityInnerImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Path
+
+/**
+ * The parenthesized inner part of a visibility modifier or restriction, such as the `(in path)` in `pub(in path)`, or the `(crate)` in `pub(crate)`. For example the `(in foo::bar)` in:
+ * ```rust
+ * pub(in foo::bar) struct S;
+ * //  ^^^^^^^^^^^^
+ * ```
+ */
+final class VisibilityInner = Impl::VisibilityInner;
diff --git a/rust/ql/lib/codeql/rust/elements/WhileExpr.qll b/rust/ql/lib/codeql/rust/elements/WhileExpr.qll
index 2103d983e70f..0eb6b01423db 100644
--- a/rust/ql/lib/codeql/rust/elements/WhileExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/WhileExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.WhileExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.LoopingExpr
 
diff --git a/rust/ql/lib/codeql/rust/elements/YeetExpr.qll b/rust/ql/lib/codeql/rust/elements/YeetExpr.qll
index c7e9f8ebdb75..e76e1d6dc956 100644
--- a/rust/ql/lib/codeql/rust/elements/YeetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/YeetExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.YeetExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/YieldExpr.qll b/rust/ql/lib/codeql/rust/elements/YieldExpr.qll
index f156071d6f3a..47dde4b2a602 100644
--- a/rust/ql/lib/codeql/rust/elements/YieldExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/YieldExpr.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.YieldExprImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AnyAttrImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AnyAttrImpl.qll
new file mode 100644
index 000000000000..2fd999cf17e9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AnyAttrImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `AnyAttr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.AnyAttr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `AnyAttr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class AnyAttr extends Generated::AnyAttr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprImpl.qll
index 97f237e47723..b39f7397b127 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ArrayExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprImpl.qll
@@ -7,6 +7,7 @@
 private import codeql.rust.elements.internal.generated.ArrayExpr
 private import codeql.rust.elements.internal.generated.Raw
 private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.AnyAttr
 
 /**
  * INTERNAL: This module contains the customizable definition of `ArrayExpr` and should not
@@ -31,8 +32,8 @@ module Impl {
       result = Synth::convertExprFromRaw(this.getUnderlyingEntity().getExpr(index))
     }
 
-    override Attr getAttr(int index) {
-      result = Synth::convertAttrFromRaw(this.getUnderlyingEntity().getAttr(index))
+    override AnyAttr getAttr(int index) {
+      result = Synth::convertAnyAttrFromRaw(this.getUnderlyingEntity().getAttr(index))
     }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayExprInternal.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprInternal.qll
index d904ecd23e8c..543b7220191e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ArrayExprInternal.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprInternal.qll
@@ -4,7 +4,7 @@
  */
 
 private import ArrayExprInternalImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CfgAtomConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/CfgAtomConstructor.qll
new file mode 100644
index 000000000000..7e1b8e962853
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CfgAtomConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `CfgAtom` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `CfgAtom` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructCfgAtom(Raw::CfgAtom id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CfgAtomImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CfgAtomImpl.qll
new file mode 100644
index 000000000000..6f1515cb7d1b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CfgAtomImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `CfgAtom`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.CfgAtom
+
+/**
+ * INTERNAL: This module contains the customizable definition of `CfgAtom` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class CfgAtom extends Generated::CfgAtom { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CfgAttrMetaConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/CfgAttrMetaConstructor.qll
new file mode 100644
index 000000000000..585a8c07e3c9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CfgAttrMetaConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `CfgAttrMeta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `CfgAttrMeta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructCfgAttrMeta(Raw::CfgAttrMeta id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CfgAttrMetaImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CfgAttrMetaImpl.qll
new file mode 100644
index 000000000000..5e189d4126de
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CfgAttrMetaImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `CfgAttrMeta`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.CfgAttrMeta
+
+/**
+ * INTERNAL: This module contains the customizable definition of `CfgAttrMeta` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class CfgAttrMeta extends Generated::CfgAttrMeta { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CfgCompositeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/CfgCompositeConstructor.qll
new file mode 100644
index 000000000000..ad4c42ec5729
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CfgCompositeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `CfgComposite` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `CfgComposite` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructCfgComposite(Raw::CfgComposite id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CfgCompositeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CfgCompositeImpl.qll
new file mode 100644
index 000000000000..58c9a10af763
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CfgCompositeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `CfgComposite`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.CfgComposite
+
+/**
+ * INTERNAL: This module contains the customizable definition of `CfgComposite` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class CfgComposite extends Generated::CfgComposite { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CfgMetaConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/CfgMetaConstructor.qll
new file mode 100644
index 000000000000..3f374993ccd7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CfgMetaConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `CfgMeta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `CfgMeta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructCfgMeta(Raw::CfgMeta id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CfgMetaImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CfgMetaImpl.qll
new file mode 100644
index 000000000000..f3c75352121e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CfgMetaImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `CfgMeta`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.CfgMeta
+
+/**
+ * INTERNAL: This module contains the customizable definition of `CfgMeta` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class CfgMeta extends Generated::CfgMeta { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CfgPredExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/CfgPredExprConstructor.qll
new file mode 100644
index 000000000000..93c1466a6c6c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CfgPredExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `CfgPredExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `CfgPredExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructCfgPredExpr(Raw::CfgPredExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CfgPredExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CfgPredExprImpl.qll
new file mode 100644
index 000000000000..b4987870c3da
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CfgPredExprImpl.qll
@@ -0,0 +1,28 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `CfgPredExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.CfgPredExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `CfgPredExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A configuration predicate expression resulting from expansion of a `cfg!` macro call.
+   * It has type `bool` and evaluates to whether the configuration predicate holds.
+   *
+   * Rust-analyzer expands `cfg!(...)` in expression position to its internal `builtin#cfg(...)`
+   * syntax, as illustrated below:
+   * ```rust
+   * builtin#cfg(unix);
+   * builtin#cfg(target_os = "windows");
+   * builtin#cfg(any(unix, target_os = "windows"));
+   * ```
+   */
+  class CfgPredExpr extends Generated::CfgPredExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CfgPredPatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/CfgPredPatConstructor.qll
new file mode 100644
index 000000000000..d3066b0f1dd1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CfgPredPatConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `CfgPredPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `CfgPredPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructCfgPredPat(Raw::CfgPredPat id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CfgPredPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CfgPredPatImpl.qll
new file mode 100644
index 000000000000..ac9e15cf6136
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CfgPredPatImpl.qll
@@ -0,0 +1,31 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `CfgPredPat`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.CfgPredPat
+
+/**
+ * INTERNAL: This module contains the customizable definition of `CfgPredPat` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A configuration predicate pattern resulting from expansion of a `cfg!` macro call.
+   * It matches `true` when the configuration predicate holds and `false` otherwise.
+   *
+   * Rust-analyzer expands `cfg!(...)` in pattern position to its internal `builtin#cfg(...)`
+   * syntax, as illustrated below:
+   * ```rust
+   * match true {
+   *     builtin#cfg(unix) => (),
+   *     builtin#cfg(target_os = "windows") => (),
+   *     builtin#cfg(any(unix, target_os = "windows")) => (),
+   *     _ => (),
+   * };
+   * ```
+   */
+  class CfgPredPat extends Generated::CfgPredPat { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CfgPredicateImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CfgPredicateImpl.qll
new file mode 100644
index 000000000000..eda245d0777f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CfgPredicateImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `CfgPredicate`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.CfgPredicate
+
+/**
+ * INTERNAL: This module contains the customizable definition of `CfgPredicate` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class CfgPredicate extends Generated::CfgPredicate { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
index cef396dea18b..b55fc8aca390 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
@@ -28,7 +28,9 @@ module Impl {
    * ```
    */
   class ClosureExpr extends Generated::ClosureExpr {
-    override string toStringImpl() { result = "|...| " + this.getBody().toAbbreviatedString() }
+    override string toStringImpl() {
+      result = "|...| " + concat(this.getBody().toAbbreviatedString())
+    }
 
     override Expr getBody() { result = this.getClosureBody() }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
index 77972720b02f..922763c089f1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
@@ -17,6 +17,7 @@ module Impl {
    * ```rust
    * // this is a comment
    * /// This is a doc comment
+   * fn documented() {}
    * ```
    */
   class Comment extends Generated::Comment {
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll
index e90ae6217798..c71260913f79 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll
@@ -28,7 +28,7 @@ module Impl {
     /** Gets an access to this constant item. */
     ConstAccess getAnAccess() { this = result.getConst() }
 
-    override string toStringImpl() { result = "const " + this.getName().getText() }
+    override string toStringImpl() { result = "const " + concat(this.getName().getText()) }
   }
 
   /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DerefPatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/DerefPatConstructor.qll
new file mode 100644
index 000000000000..8c195ffea0c5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/DerefPatConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `DerefPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `DerefPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructDerefPat(Raw::DerefPat id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DerefPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/DerefPatImpl.qll
new file mode 100644
index 000000000000..ec44a20c2b5e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/DerefPatImpl.qll
@@ -0,0 +1,27 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `DerefPat`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.DerefPat
+
+/**
+ * INTERNAL: This module contains the customizable definition of `DerefPat` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A deref pattern, matching the value behind a smart pointer. This is an experimental
+   * Rust feature that cannot be written directly in stable Rust; the example below uses
+   * rust-analyzer's canonical `builtin#deref` syntax for such patterns:
+   * ```rust
+   * match x {
+   *     builtin#deref(y) => y,
+   *     _ => 0,
+   * };
+   * ```
+   */
+  class DerefPat extends Generated::DerefPat { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DocCommentConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/DocCommentConstructor.qll
new file mode 100644
index 000000000000..2d62b9d56c1d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/DocCommentConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `DocComment` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `DocComment` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructDocComment(Raw::DocComment id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DocCommentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/DocCommentImpl.qll
new file mode 100644
index 000000000000..5b43fb6fb6fb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/DocCommentImpl.qll
@@ -0,0 +1,25 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `DocComment`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.DocComment
+
+/**
+ * INTERNAL: This module contains the customizable definition of `DocComment` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A documentation comment.
+   *
+   * For example:
+   * ```rust
+   * /// Documents `documented`.
+   * fn documented() {}
+   * ```
+   */
+  class DocComment extends Generated::DocComment { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
index 277e77d8eab5..56ce9c6b7322 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
@@ -124,7 +124,7 @@ module Impl {
   class Element extends Generated::Element {
     Element() { MacroExpansion::isRelevantElement(this) }
 
-    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+    override string toStringImpl() { none() }
 
     /**
      * INTERNAL: Do not use.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
index 3862cc42137e..568dae0e7df0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
@@ -23,7 +23,7 @@ module Impl {
    * ```
    */
   class Enum extends Generated::Enum {
-    override string toStringImpl() { result = "enum " + this.getName().getText() }
+    override string toStringImpl() { result = "enum " + concat(this.getName().getText()) }
 
     /** Gets the variant named `name`, if any. */
     pragma[nomagic]
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
index db5578b835ae..29591826d0e6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
@@ -31,7 +31,7 @@ module Impl {
     override string toStringImpl() {
       exists(string abbr, string name |
         abbr = this.getContainer().toAbbreviatedString() and
-        name = this.getIdentifier().getText() and
+        name = concat(this.getIdentifier().getText()) and
         if abbr = "..." then result = "... ." + name else result = abbr + "." + name
       )
     }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessConstructor.qll
index 40cb174a0710..b7a4e9ae0be1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessConstructor.qll
@@ -35,8 +35,8 @@ private predicate formatArgsHasArg(
 }
 
 pragma[nomagic]
-private predicate formatArgsHasArgName(Raw::FormatArgsExpr parent, string name) {
-  parent.getArg(_).getName().getText() = name
+private predicate formatArgsHasArgName(Raw::FormatArgsExpr parent) {
+  exists(parent.getArg(_).getName())
 }
 
 /**
@@ -48,6 +48,6 @@ predicate unboundNamedFormatArgument(
 ) {
   exists(string name |
     formatArgsHasArg(parent, arg, name, index, kind) and
-    not formatArgsHasArgName(parent, name)
+    not formatArgsHasArgName(parent)
   )
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
index 69b85bb1ee24..c5d3d9c5379a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
@@ -27,7 +27,7 @@ module Impl {
    * ```
    */
   class Function extends Generated::Function {
-    override string toStringImpl() { result = "fn " + this.getName().getText() }
+    override string toStringImpl() { result = "fn " + concat(this.getName().getText()) }
 
     pragma[nomagic]
     private predicate hasPotentialCommentAt(File f, int line) {
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
index 4c039a6f957f..e8a0ad279130 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
@@ -34,7 +34,7 @@ module Impl {
           or
           not this.hasTraitTy() and trait = ""
         ) and
-        result = "impl " + trait + this.getSelfTy().toAbbreviatedString() + " { ... }"
+        result = "impl " + trait + concat(this.getSelfTy().toAbbreviatedString()) + " { ... }"
       )
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplRestrictionConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplRestrictionConstructor.qll
new file mode 100644
index 000000000000..0e0a7a420efc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplRestrictionConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ImplRestriction` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ImplRestriction` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructImplRestriction(Raw::ImplRestriction id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplRestrictionImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplRestrictionImpl.qll
new file mode 100644
index 000000000000..7240c6a6bcea
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplRestrictionImpl.qll
@@ -0,0 +1,19 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ImplRestriction`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ImplRestriction
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ImplRestriction` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * An implementation restriction, limiting where a trait can be implemented. For example the `impl(crate)` restriction (an unstable feature).
+   */
+  class ImplRestriction extends Generated::ImplRestriction { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IncludeBytesExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/IncludeBytesExprConstructor.qll
new file mode 100644
index 000000000000..52ba275a28f4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/IncludeBytesExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `IncludeBytesExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `IncludeBytesExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructIncludeBytesExpr(Raw::IncludeBytesExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IncludeBytesExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IncludeBytesExprImpl.qll
new file mode 100644
index 000000000000..750abcb2f098
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/IncludeBytesExprImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `IncludeBytesExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.IncludeBytesExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `IncludeBytesExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * An expression produced by the built-in `include_bytes!` macro, embedding the contents of a file as a byte array. For example:
+   * ```rust
+   * let data = include_bytes!("data.bin");
+   * ```
+   */
+  class IncludeBytesExpr extends Generated::IncludeBytesExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll
index 46e554e4b420..0edbad6d2b86 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll
@@ -22,11 +22,11 @@ module Impl {
    * enum E {}
    * ```
    */
-  class Item extends Generated::Item { }
-
-  private class ItemWithAttributeMacroExpansion extends Item {
-    ItemWithAttributeMacroExpansion() { this.hasAttributeMacroExpansion() }
-
-    override string toStringImpl() { result = "(item with attribute macro expansion)" }
+  class Item extends Generated::Item {
+    override string toStringImpl() {
+      if this.hasAttributeMacroExpansion()
+      then result = "(item with attribute macro expansion)"
+      else result = super.toStringImpl()
+    }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/KeyValueMetaConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/KeyValueMetaConstructor.qll
new file mode 100644
index 000000000000..b9a506a485cc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/KeyValueMetaConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `KeyValueMeta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `KeyValueMeta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructKeyValueMeta(Raw::KeyValueMeta id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/KeyValueMetaImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/KeyValueMetaImpl.qll
new file mode 100644
index 000000000000..ac3befd85b60
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/KeyValueMetaImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `KeyValueMeta`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.KeyValueMeta
+
+/**
+ * INTERNAL: This module contains the customizable definition of `KeyValueMeta` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class KeyValueMeta extends Generated::KeyValueMeta { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
index 8e048517f63c..b5c22bfb69dc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
@@ -24,7 +24,9 @@ module Impl {
    * ```
    */
   class MacroCall extends Generated::MacroCall {
-    override string toStringImpl() { result = this.getPath().toAbbreviatedString() + "!..." }
+    override string toStringImpl() {
+      result = concat(this.getPath().toAbbreviatedString()) + "!..."
+    }
 
     /**
      * Gets the macro definition that this macro call resolves to.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MetaConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MetaConstructor.qll
deleted file mode 100644
index 0cd1ca6bbe9f..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/MetaConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `Meta` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `Meta` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructMeta(Raw::Meta id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MetaImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MetaImpl.qll
index bbac494ed3c9..693724e96ae6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MetaImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MetaImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Meta`.
  *
@@ -12,6 +11,9 @@ private import codeql.rust.elements.internal.generated.Meta
  * be referenced directly.
  */
 module Impl {
+  private import rust
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A meta item in an attribute.
    *
@@ -26,5 +28,15 @@ module Impl {
    * }
    * ```
    */
-  class Meta extends Generated::Meta { }
+  class Meta extends Generated::Meta {
+    /** Gets the path, if it exists. */
+    pragma[nomagic]
+    Path getMetaPath() {
+      result = this.(PathMeta).getPath()
+      or
+      result = this.(KeyValueMeta).getPath()
+      or
+      result = this.(TokenTreeMeta).getPath()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
index 19f63f0790fa..bf1a1b12817d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
@@ -24,6 +24,6 @@ module Impl {
    * ```
    */
   class Module extends Generated::Module {
-    override string toStringImpl() { result = "mod " + this.getName().getText() }
+    override string toStringImpl() { result = "mod " + concat(this.getName().getText()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MutRestrictionConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MutRestrictionConstructor.qll
new file mode 100644
index 000000000000..57f71b2319a5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MutRestrictionConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MutRestriction` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MutRestriction` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMutRestriction(Raw::MutRestriction id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MutRestrictionImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MutRestrictionImpl.qll
new file mode 100644
index 000000000000..6d8722a09e6c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MutRestrictionImpl.qll
@@ -0,0 +1,19 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MutRestriction`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MutRestriction
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MutRestriction` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A mutability restriction, limiting where a field can be mutated. For example the `mut(crate)` restriction (an unstable feature).
+   */
+  class MutRestriction extends Generated::MutRestriction { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NotNullConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/NotNullConstructor.qll
new file mode 100644
index 000000000000..6c7de057d9af
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NotNullConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `NotNull` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `NotNull` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructNotNull(Raw::NotNull id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NotNullImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NotNullImpl.qll
new file mode 100644
index 000000000000..19365f23a2d5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NotNullImpl.qll
@@ -0,0 +1,25 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `NotNull`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.NotNull
+
+/**
+ * INTERNAL: This module contains the customizable definition of `NotNull` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * The `!null` pattern used in a pattern type to denote a non-null value. Pattern types
+   * are an experimental, mostly compiler-internal feature (used in the standard library for
+   * types such as `NonZero` and `NonNull`) and cannot be written directly in stable Rust;
+   * the example below uses rust-analyzer's canonical `builtin#pattern_type` syntax:
+   * ```rust
+   * type NonNull = builtin#pattern_type(*const () is !null);
+   * ```
+   */
+  class NotNull extends Generated::NotNull { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenExprConstructor.qll
deleted file mode 100644
index 95452ccb610a..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenExprConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ParenExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `ParenExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructParenExpr(Raw::ParenExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
deleted file mode 100644
index f52fd3aa0674..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * This module provides a hand-modifiable wrapper around the generated class `ParenExpr`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.ParenExpr
-
-/**
- * INTERNAL: This module contains the customizable definition of `ParenExpr` and should not
- * be referenced directly.
- */
-module Impl {
-  // the following QLdoc is generated: if you need to edit it, do it in the schema file
-  /**
-   * A parenthesized expression.
-   *
-   * For example:
-   * ```rust
-   * (x + y)
-   * ```
-   */
-  class ParenExpr extends Generated::ParenExpr {
-    override string toStringImpl() {
-      result = "(" + this.getExpr().toAbbreviatedString() + ")"
-      or
-      // In macro expansions such as
-      //
-      // ```rust
-      // [
-      //     "a",
-      //     "b",
-      //     #[cfg(target_os = "macos")]
-      //     "c",
-      // ]
-      // ```
-      //
-      // the last array element will give rise to an empty `ParenExpr` when not
-      // compiling for macos.
-      not exists(this.getExpr().toAbbreviatedString()) and
-      result = "(...)"
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenPatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenPatConstructor.qll
deleted file mode 100644
index 68ef6e0b0365..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenPatConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ParenPat` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `ParenPat` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructParenPat(Raw::ParenPat id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
deleted file mode 100644
index f6fa342e8f93..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * This module provides a hand-modifiable wrapper around the generated class `ParenPat`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.ParenPat
-
-/**
- * INTERNAL: This module contains the customizable definition of `ParenPat` and should not
- * be referenced directly.
- */
-module Impl {
-  // the following QLdoc is generated: if you need to edit it, do it in the schema file
-  /**
-   * A parenthesized pattern.
-   *
-   * For example:
-   * ```rust
-   * let (x) = 1;
-   * //  ^^^
-   * ```
-   */
-  class ParenPat extends Generated::ParenPat {
-    override string toStringImpl() { result = "(" + this.getPat().toAbbreviatedString() + ")" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
index c96bae09eeb3..8db0462f6b0c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
@@ -22,6 +22,8 @@ module Impl {
    * ```
    */
   class ParenTypeRepr extends Generated::ParenTypeRepr {
-    override string toStringImpl() { result = "(" + this.getTypeRepr().toAbbreviatedString() + ")" }
+    override string toStringImpl() {
+      result = "(" + concat(this.getTypeRepr().toAbbreviatedString()) + ")"
+    }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathMetaConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PathMetaConstructor.qll
new file mode 100644
index 000000000000..5d8fd0da4f62
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathMetaConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `PathMeta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `PathMeta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructPathMeta(Raw::PathMeta id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathMetaImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathMetaImpl.qll
new file mode 100644
index 000000000000..fd58653419e7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathMetaImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `PathMeta`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.PathMeta
+
+/**
+ * INTERNAL: This module contains the customizable definition of `PathMeta` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class PathMeta extends Generated::PathMeta { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
index 42c32802bc2c..6512d8dd805c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * - `<T as Iterator>`
    */
   class PathSegment extends Generated::PathSegment {
-    override string toStringImpl() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = concat(this.toAbbreviatedString()) }
 
     override string toAbbreviatedString() {
       result = strictconcat(int i | | this.toAbbreviatedStringPart(i), "::" order by i)
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PatternTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PatternTypeReprConstructor.qll
new file mode 100644
index 000000000000..00878cb3430d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PatternTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `PatternTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `PatternTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructPatternTypeRepr(Raw::PatternTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PatternTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PatternTypeReprImpl.qll
new file mode 100644
index 000000000000..16cb9358ebae
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PatternTypeReprImpl.qll
@@ -0,0 +1,24 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `PatternTypeRepr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.PatternTypeRepr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `PatternTypeRepr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A pattern type, constraining a type to values matching a pattern. Pattern types are an
+   * experimental, mostly compiler-internal feature and cannot be written directly in stable
+   * Rust; the example below uses rust-analyzer's canonical `builtin#pattern_type` syntax:
+   * ```rust
+   * type NonZero = builtin#pattern_type(u32 is 1..);
+   * ```
+   */
+  class PatternTypeRepr extends Generated::PatternTypeRepr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StaticImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StaticImpl.qll
index 8002947bae8e..69696d243bff 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/StaticImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/StaticImpl.qll
@@ -28,7 +28,7 @@ module Impl {
     /** Gets an access to this static item. */
     StaticAccess getAnAccess() { this = result.getStatic() }
 
-    override string toStringImpl() { result = "static " + this.getName().getText() }
+    override string toStringImpl() { result = "static " + concat(this.getName().getText()) }
   }
 
   /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
index 23fa1e76d9a8..4a33d26b06ac 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
@@ -23,7 +23,7 @@ module Impl {
    * ```
    */
   class Struct extends Generated::Struct {
-    override string toStringImpl() { result = "struct " + this.getName().getText() }
+    override string toStringImpl() { result = "struct " + concat(this.getName().getText()) }
 
     /** Gets the record field named `name`, if any. */
     pragma[nomagic]
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TokenTreeMetaConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TokenTreeMetaConstructor.qll
new file mode 100644
index 000000000000..8cb49c13e668
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TokenTreeMetaConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TokenTreeMeta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TokenTreeMeta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTokenTreeMeta(Raw::TokenTreeMeta id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TokenTreeMetaImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TokenTreeMetaImpl.qll
new file mode 100644
index 000000000000..b61b222879d8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TokenTreeMetaImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TokenTreeMeta`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TokenTreeMeta
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TokenTreeMeta` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class TokenTreeMeta extends Generated::TokenTreeMeta { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitAliasConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitAliasConstructor.qll
deleted file mode 100644
index ee417d726513..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/TraitAliasConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `TraitAlias` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `TraitAlias` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructTraitAlias(Raw::TraitAlias id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitAliasImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitAliasImpl.qll
deleted file mode 100644
index c11516896b47..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/TraitAliasImpl.qll
+++ /dev/null
@@ -1,24 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `TraitAlias`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.TraitAlias
-
-/**
- * INTERNAL: This module contains the customizable definition of `TraitAlias` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A trait alias.
-   *
-   * For example:
-   * ```rust
-   * trait Foo = Bar + Baz;
-   * ```
-   */
-  class TraitAlias extends Generated::TraitAlias { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
index bb9ffa83244f..8fb9ea0f1329 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
@@ -26,7 +26,7 @@ module Impl {
    * ```
    */
   class Trait extends Generated::Trait {
-    override string toStringImpl() { result = "trait " + this.getName().getText() }
+    override string toStringImpl() { result = "trait " + concat(this.getName().getText()) }
 
     /**
      * Gets the number of generic parameters of this trait.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TryBlockModifierConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TryBlockModifierConstructor.qll
new file mode 100644
index 000000000000..1da4a8262b07
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TryBlockModifierConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TryBlockModifier` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TryBlockModifier` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTryBlockModifier(Raw::TryBlockModifier id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TryBlockModifierImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TryBlockModifierImpl.qll
new file mode 100644
index 000000000000..8be62790eeeb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TryBlockModifierImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TryBlockModifier`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TryBlockModifier
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TryBlockModifier` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class TryBlockModifier extends Generated::TryBlockModifier { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll
index 0d386b6edb05..f5676dd6dfed 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * ```
    */
   class TypeBoundList extends Generated::TypeBoundList {
-    override string toStringImpl() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = concat(this.toAbbreviatedString()) }
 
     private string toAbbreviatedStringPart(int index) {
       result = this.getBound(index).toAbbreviatedString()
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnsafeMetaConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UnsafeMetaConstructor.qll
new file mode 100644
index 000000000000..3ffc0efcac72
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnsafeMetaConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `UnsafeMeta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `UnsafeMeta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructUnsafeMeta(Raw::UnsafeMeta id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnsafeMetaImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UnsafeMetaImpl.qll
new file mode 100644
index 000000000000..7da4ed5ace29
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnsafeMetaImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `UnsafeMeta`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.UnsafeMeta
+
+/**
+ * INTERNAL: This module contains the customizable definition of `UnsafeMeta` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class UnsafeMeta extends Generated::UnsafeMeta { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UseImpl.qll
index a5baa18b81c0..78fb41812580 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UseImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseImpl.qll
@@ -19,6 +19,8 @@ module Impl {
    * ```
    */
   class Use extends Generated::Use {
-    override string toStringImpl() { result = "use " + this.getUseTree().toAbbreviatedString() }
+    override string toStringImpl() {
+      result = "use " + concat(this.getUseTree().toAbbreviatedString())
+    }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 80f2259623bb..0c2c6b158212 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -310,7 +310,12 @@ module Impl {
     /** Holds if this variable is captured. */
     predicate isCaptured() { this.getAnAccess().isCapture() }
 
-    /** Gets the parameter that introduces this variable, if any. */
+    /**
+     * Gets the parameter that introduces this variable, if any.
+     *
+     * Note that this variable need not be a direct parameter; it could
+     * also be introduced through a destructuring pattern.
+     */
     cached
     ParamBase getParameter() {
       CachedStage::ref() and
@@ -319,6 +324,14 @@ module Impl {
       result.(Param).getPat() = getAPatAncestor*(this.getPat())
     }
 
+    /** Holds if this variable corresponds directly to the parameter `p`. */
+    predicate isParameter(ParamBase p) {
+      CachedStage::ref() and
+      p = this.getSelfParam()
+      or
+      p.(Param).getPat() = this.getPat()
+    }
+
     /** Holds if this variable is mutable. */
     predicate isMutable() { this.getPat().isMut() or this.getSelfParam().isMut() }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VisibilityImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VisibilityImpl.qll
index e2bc7140b59e..7fb16d018736 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VisibilityImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VisibilityImpl.qll
@@ -25,9 +25,9 @@ module Impl {
     override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() {
-      result = "pub(" + this.getPath().toAbbreviatedString() + ")"
+      result = "pub(" + this.getVisibilityInner().getPath().toAbbreviatedString() + ")"
       or
-      not this.hasPath() and result = "pub"
+      not exists(this.getVisibilityInner().getPath()) and result = "pub"
     }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VisibilityInnerConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/VisibilityInnerConstructor.qll
new file mode 100644
index 000000000000..c6eca06336a8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VisibilityInnerConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `VisibilityInner` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `VisibilityInner` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructVisibilityInner(Raw::VisibilityInner id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VisibilityInnerImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VisibilityInnerImpl.qll
new file mode 100644
index 000000000000..ad896e5dcd25
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VisibilityInnerImpl.qll
@@ -0,0 +1,23 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `VisibilityInner`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.VisibilityInner
+
+/**
+ * INTERNAL: This module contains the customizable definition of `VisibilityInner` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * The parenthesized inner part of a visibility modifier or restriction, such as the `(in path)` in `pub(in path)`, or the `(crate)` in `pub(crate)`. For example the `(in foo::bar)` in:
+   * ```rust
+   * pub(in foo::bar) struct S;
+   * //  ^^^^^^^^^^^^
+   * ```
+   */
+  class VisibilityInner extends Generated::VisibilityInner { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Abi.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Abi.qll
index 0f1089c4284a..6db2656c06f8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Abi.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Abi.qll
@@ -27,6 +27,8 @@ module Generated {
   class Abi extends Synth::TAbi, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "Abi" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the abi string of this abi, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AnyAttr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AnyAttr.qll
new file mode 100644
index 000000000000..58ab955fb673
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AnyAttr.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `AnyAttr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `AnyAttr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::AnyAttr` class directly.
+   * Use the subclass `AnyAttr`, where the following predicates are available.
+   */
+  class AnyAttr extends Synth::TAnyAttr, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArgList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArgList.qll
index c75d722e7938..e20cb6bab8cd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ArgList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArgList.qll
@@ -28,6 +28,8 @@ module Generated {
   class ArgList extends Synth::TArgList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "ArgList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th argument of this argument list (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll
index cb6d92d0dd5f..cd1af8bd6a36 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -43,12 +43,12 @@ module Generated {
     /**
      * Gets the `index`th attr of this array expression (0-based).
      */
-    Attr getAttr(int index) { none() }
+    AnyAttr getAttr(int index) { none() }
 
     /**
      * Gets any of the attrs of this array expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this array expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll
index 15c86caa17b1..e628c7498a9c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -22,12 +22,14 @@ module Generated {
   class ArrayExprInternal extends Synth::TArrayExprInternal, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "ArrayExprInternal" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this array expression internal (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertArrayExprInternalToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertArrayExprInternalToRaw(this)
               .(Raw::ArrayExprInternal)
               .getAttr(index))
     }
@@ -35,7 +37,7 @@ module Generated {
     /**
      * Gets any of the attrs of this array expression internal.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this array expression internal.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll
index c8e682937108..4d4d9addec92 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll
@@ -29,6 +29,8 @@ module Generated {
   class ArrayTypeRepr extends Synth::TArrayTypeRepr, TypeReprImpl::TypeRepr {
     override string getAPrimaryQlClass() { result = "ArrayTypeRepr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the const argument of this array type representation, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmClobberAbi.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmClobberAbi.qll
index 9a47d6081123..b6e7388fd167 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmClobberAbi.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmClobberAbi.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AsmPieceImpl::Impl as AsmPieceImpl
 
 /**
@@ -27,5 +28,27 @@ module Generated {
    */
   class AsmClobberAbi extends Synth::TAsmClobberAbi, AsmPieceImpl::AsmPiece {
     override string getAPrimaryQlClass() { result = "AsmClobberAbi" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the `index`th attr of this asm clobber abi (0-based).
+     */
+    AnyAttr getAttr(int index) {
+      result =
+        Synth::convertAnyAttrFromRaw(Synth::convertAsmClobberAbiToRaw(this)
+              .(Raw::AsmClobberAbi)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this asm clobber abi.
+     */
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this asm clobber abi.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmConst.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmConst.qll
index eb685ef2deb8..fc6fb8a03b1e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmConst.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmConst.qll
@@ -29,6 +29,8 @@ module Generated {
   class AsmConst extends Synth::TAsmConst, AsmOperandImpl::AsmOperand {
     override string getAPrimaryQlClass() { result = "AsmConst" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the expression of this asm const, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmDirSpec.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmDirSpec.qll
index 520e2d88ad66..4560dc7b24ce 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmDirSpec.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmDirSpec.qll
@@ -27,5 +27,7 @@ module Generated {
    */
   class AsmDirSpec extends Synth::TAsmDirSpec, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "AsmDirSpec" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
index 95e4d08aa406..094727bbcdc2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AsmPiece
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
@@ -31,6 +31,8 @@ module Generated {
   class AsmExpr extends Synth::TAsmExpr, ExprImpl::Expr, ItemImpl::Item {
     override string getAPrimaryQlClass() { result = "AsmExpr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th asm piece of this asm expression (0-based).
      */
@@ -54,15 +56,15 @@ module Generated {
     /**
      * Gets the `index`th attr of this asm expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertAsmExprToRaw(this).(Raw::AsmExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertAsmExprToRaw(this).(Raw::AsmExpr).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this asm expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this asm expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmLabel.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmLabel.qll
index 7d5f750f098c..991e7b5b6342 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmLabel.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmLabel.qll
@@ -32,6 +32,8 @@ module Generated {
   class AsmLabel extends Synth::TAsmLabel, AsmOperandImpl::AsmOperand {
     override string getAPrimaryQlClass() { result = "AsmLabel" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the block expression of this asm label, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOperandExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOperandExpr.qll
index 5f5fd7ff09d1..194b8a939c58 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOperandExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOperandExpr.qll
@@ -29,6 +29,8 @@ module Generated {
   class AsmOperandExpr extends Synth::TAsmOperandExpr, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "AsmOperandExpr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the in expression of this asm operand expression, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOperandNamed.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOperandNamed.qll
index 158acb3aa48d..f3ba52d8b80f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOperandNamed.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOperandNamed.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AsmOperand
 import codeql.rust.elements.internal.AsmPieceImpl::Impl as AsmPieceImpl
 import codeql.rust.elements.Name
@@ -30,6 +31,8 @@ module Generated {
   class AsmOperandNamed extends Synth::TAsmOperandNamed, AsmPieceImpl::AsmPiece {
     override string getAPrimaryQlClass() { result = "AsmOperandNamed" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the asm operand of this asm operand named, if it exists.
      */
@@ -45,6 +48,26 @@ module Generated {
      */
     final predicate hasAsmOperand() { exists(this.getAsmOperand()) }
 
+    /**
+     * Gets the `index`th attr of this asm operand named (0-based).
+     */
+    AnyAttr getAttr(int index) {
+      result =
+        Synth::convertAnyAttrFromRaw(Synth::convertAsmOperandNamedToRaw(this)
+              .(Raw::AsmOperandNamed)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this asm operand named.
+     */
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this asm operand named.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the name of this asm operand named, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOption.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOption.qll
index 9c3d309f3078..0c9c861a662d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOption.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOption.qll
@@ -28,6 +28,8 @@ module Generated {
   class AsmOption extends Synth::TAsmOption, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "AsmOption" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Holds if this asm option is raw.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOptionsList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOptionsList.qll
index de8f7bccb0f8..caf46d05f1d3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOptionsList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmOptionsList.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AsmOption
 import codeql.rust.elements.internal.AsmPieceImpl::Impl as AsmPieceImpl
 
@@ -29,6 +30,8 @@ module Generated {
   class AsmOptionsList extends Synth::TAsmOptionsList, AsmPieceImpl::AsmPiece {
     override string getAPrimaryQlClass() { result = "AsmOptionsList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th asm option of this asm options list (0-based).
      */
@@ -48,5 +51,25 @@ module Generated {
      * Gets the number of asm options of this asm options list.
      */
     final int getNumberOfAsmOptions() { result = count(int i | exists(this.getAsmOption(i))) }
+
+    /**
+     * Gets the `index`th attr of this asm options list (0-based).
+     */
+    AnyAttr getAttr(int index) {
+      result =
+        Synth::convertAnyAttrFromRaw(Synth::convertAsmOptionsListToRaw(this)
+              .(Raw::AsmOptionsList)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this asm options list.
+     */
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this asm options list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmRegOperand.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmRegOperand.qll
index a294732fd96b..a66d2cbf867c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmRegOperand.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmRegOperand.qll
@@ -31,6 +31,8 @@ module Generated {
   class AsmRegOperand extends Synth::TAsmRegOperand, AsmOperandImpl::AsmOperand {
     override string getAPrimaryQlClass() { result = "AsmRegOperand" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the asm dir spec of this asm reg operand, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmRegSpec.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmRegSpec.qll
index 60f0c5803fe9..610a8624606d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmRegSpec.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmRegSpec.qll
@@ -29,6 +29,8 @@ module Generated {
   class AsmRegSpec extends Synth::TAsmRegSpec, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "AsmRegSpec" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the identifier of this asm reg spec, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmSym.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmSym.qll
index 269b6721eb1e..ff21032734a6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmSym.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmSym.qll
@@ -29,6 +29,8 @@ module Generated {
   class AsmSym extends Synth::TAsmSym, AsmOperandImpl::AsmOperand {
     override string getAPrimaryQlClass() { result = "AsmSym" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the path of this asm sym, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll
index 8a6dc5a43eda..42c6e17b2967 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll
@@ -6,9 +6,9 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AssocItem
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `AssocItemList` and should not
@@ -23,6 +23,8 @@ module Generated {
   class AssocItemList extends Synth::TAssocItemList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "AssocItemList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th assoc item of this assoc item list (0-based).
      */
@@ -46,9 +48,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this assoc item list (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertAssocItemListToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertAssocItemListToRaw(this)
               .(Raw::AssocItemList)
               .getAttr(index))
     }
@@ -56,7 +58,7 @@ module Generated {
     /**
      * Gets any of the attrs of this assoc item list.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this assoc item list.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
index 50e5fb32fe6e..cffbdb25b299 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
@@ -40,6 +40,8 @@ module Generated {
   class AssocTypeArg extends Synth::TAssocTypeArg, GenericArgImpl::GenericArg {
     override string getAPrimaryQlClass() { result = "AssocTypeArg" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the const argument of this assoc type argument, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Attr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Attr.qll
index 351b77154e3d..2bd74215afe4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Attr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Attr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.internal.AnyAttrImpl::Impl as AnyAttrImpl
 import codeql.rust.elements.Meta
 
 /**
@@ -26,9 +26,11 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Attr` class directly.
    * Use the subclass `Attr`, where the following predicates are available.
    */
-  class Attr extends Synth::TAttr, AstNodeImpl::AstNode {
+  class Attr extends Synth::TAttr, AnyAttrImpl::AnyAttr {
     override string getAPrimaryQlClass() { result = "Attr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the meta of this attr, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AwaitExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AwaitExpr.qll
index baef03315c92..68939224b243 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AwaitExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AwaitExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -32,15 +32,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this await expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertAwaitExprToRaw(this).(Raw::AwaitExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertAwaitExprToRaw(this)
+              .(Raw::AwaitExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this await expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this await expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BecomeExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BecomeExpr.qll
index 7fdd78fcbee9..966b6f1361c7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BecomeExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BecomeExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -35,9 +35,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this become expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertBecomeExprToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertBecomeExprToRaw(this)
               .(Raw::BecomeExpr)
               .getAttr(index))
     }
@@ -45,7 +45,7 @@ module Generated {
     /**
      * Gets any of the attrs of this become expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this become expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BinaryExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BinaryExpr.qll
index 68e7d391e396..111428d0a208 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BinaryExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BinaryExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -33,9 +33,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this binary expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertBinaryExprToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertBinaryExprToRaw(this)
               .(Raw::BinaryExpr)
               .getAttr(index))
     }
@@ -43,7 +43,7 @@ module Generated {
     /**
      * Gets any of the attrs of this binary expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this binary expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
index 6a01a0c45880..0a2f8c903213 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
@@ -6,9 +6,10 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.LabelableExprImpl::Impl as LabelableExprImpl
 import codeql.rust.elements.StmtList
+import codeql.rust.elements.TryBlockModifier
 
 /**
  * INTERNAL: This module contains the fully generated definition of `BlockExpr` and should not
@@ -37,15 +38,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this block expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertBlockExprToRaw(this)
+              .(Raw::BlockExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this block expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this block expression.
@@ -72,11 +75,6 @@ module Generated {
      */
     predicate isMove() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isMove() }
 
-    /**
-     * Holds if this block expression is try.
-     */
-    predicate isTry() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isTry() }
-
     /**
      * Holds if this block expression is unsafe.
      */
@@ -96,5 +94,20 @@ module Generated {
      * Holds if `getStmtList()` exists.
      */
     final predicate hasStmtList() { exists(this.getStmtList()) }
+
+    /**
+     * Gets the try block modifier of this block expression, if it exists.
+     */
+    TryBlockModifier getTryBlockModifier() {
+      result =
+        Synth::convertTryBlockModifierFromRaw(Synth::convertBlockExprToRaw(this)
+              .(Raw::BlockExpr)
+              .getTryBlockModifier())
+    }
+
+    /**
+     * Holds if `getTryBlockModifier()` exists.
+     */
+    final predicate hasTryBlockModifier() { exists(this.getTryBlockModifier()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll
index dae4a83377cf..3425bc0bad60 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.Lifetime
@@ -49,15 +49,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this break expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertBreakExprToRaw(this).(Raw::BreakExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertBreakExprToRaw(this)
+              .(Raw::BreakExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this break expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this break expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
index 196b78c1bde1..785f22044206 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.ArgList
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -49,15 +49,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this call expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertCallExprToRaw(this).(Raw::CallExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertCallExprToRaw(this)
+              .(Raw::CallExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this call expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this call expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll
index b2eb4d96d91f..2d608f9e7b01 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Param
 import codeql.rust.elements.ParamList
@@ -41,15 +41,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this callable (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertCallableToRaw(this).(Raw::Callable).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertCallableToRaw(this)
+              .(Raw::Callable)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this callable.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this callable.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
index a3725ff1a45f..cc6ea30fff00 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.TypeRepr
@@ -30,15 +30,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this cast expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertCastExprToRaw(this).(Raw::CastExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertCastExprToRaw(this)
+              .(Raw::CastExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this cast expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this cast expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CfgAtom.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgAtom.qll
new file mode 100644
index 000000000000..2943c4c6ae06
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgAtom.qll
@@ -0,0 +1,25 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `CfgAtom`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.CfgPredicateImpl::Impl as CfgPredicateImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `CfgAtom` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::CfgAtom` class directly.
+   * Use the subclass `CfgAtom`, where the following predicates are available.
+   */
+  class CfgAtom extends Synth::TCfgAtom, CfgPredicateImpl::CfgPredicate {
+    override string getAPrimaryQlClass() { result = "CfgAtom" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CfgAttrMeta.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgAttrMeta.qll
new file mode 100644
index 000000000000..e92309bff64d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgAttrMeta.qll
@@ -0,0 +1,62 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `CfgAttrMeta`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.CfgPredicate
+import codeql.rust.elements.Meta
+import codeql.rust.elements.internal.MetaImpl::Impl as MetaImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `CfgAttrMeta` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::CfgAttrMeta` class directly.
+   * Use the subclass `CfgAttrMeta`, where the following predicates are available.
+   */
+  class CfgAttrMeta extends Synth::TCfgAttrMeta, MetaImpl::Meta {
+    override string getAPrimaryQlClass() { result = "CfgAttrMeta" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the cfg predicate of this cfg attr meta, if it exists.
+     */
+    CfgPredicate getCfgPredicate() {
+      result =
+        Synth::convertCfgPredicateFromRaw(Synth::convertCfgAttrMetaToRaw(this)
+              .(Raw::CfgAttrMeta)
+              .getCfgPredicate())
+    }
+
+    /**
+     * Holds if `getCfgPredicate()` exists.
+     */
+    final predicate hasCfgPredicate() { exists(this.getCfgPredicate()) }
+
+    /**
+     * Gets the `index`th meta of this cfg attr meta (0-based).
+     */
+    Meta getMeta(int index) {
+      result =
+        Synth::convertMetaFromRaw(Synth::convertCfgAttrMetaToRaw(this)
+              .(Raw::CfgAttrMeta)
+              .getMeta(index))
+    }
+
+    /**
+     * Gets any of the metas of this cfg attr meta.
+     */
+    final Meta getAMeta() { result = this.getMeta(_) }
+
+    /**
+     * Gets the number of metas of this cfg attr meta.
+     */
+    final int getNumberOfMetas() { result = count(int i | exists(this.getMeta(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CfgComposite.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgComposite.qll
new file mode 100644
index 000000000000..1000b1b2528d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgComposite.qll
@@ -0,0 +1,46 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `CfgComposite`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.CfgPredicate
+import codeql.rust.elements.internal.CfgPredicateImpl::Impl as CfgPredicateImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `CfgComposite` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::CfgComposite` class directly.
+   * Use the subclass `CfgComposite`, where the following predicates are available.
+   */
+  class CfgComposite extends Synth::TCfgComposite, CfgPredicateImpl::CfgPredicate {
+    override string getAPrimaryQlClass() { result = "CfgComposite" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the `index`th cfg predicate of this cfg composite (0-based).
+     */
+    CfgPredicate getCfgPredicate(int index) {
+      result =
+        Synth::convertCfgPredicateFromRaw(Synth::convertCfgCompositeToRaw(this)
+              .(Raw::CfgComposite)
+              .getCfgPredicate(index))
+    }
+
+    /**
+     * Gets any of the cfg predicates of this cfg composite.
+     */
+    final CfgPredicate getACfgPredicate() { result = this.getCfgPredicate(_) }
+
+    /**
+     * Gets the number of cfg predicates of this cfg composite.
+     */
+    final int getNumberOfCfgPredicates() { result = count(int i | exists(this.getCfgPredicate(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CfgMeta.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgMeta.qll
new file mode 100644
index 000000000000..7a76175fe25a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgMeta.qll
@@ -0,0 +1,41 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `CfgMeta`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.CfgPredicate
+import codeql.rust.elements.internal.MetaImpl::Impl as MetaImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `CfgMeta` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::CfgMeta` class directly.
+   * Use the subclass `CfgMeta`, where the following predicates are available.
+   */
+  class CfgMeta extends Synth::TCfgMeta, MetaImpl::Meta {
+    override string getAPrimaryQlClass() { result = "CfgMeta" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the cfg predicate of this cfg meta, if it exists.
+     */
+    CfgPredicate getCfgPredicate() {
+      result =
+        Synth::convertCfgPredicateFromRaw(Synth::convertCfgMetaToRaw(this)
+              .(Raw::CfgMeta)
+              .getCfgPredicate())
+    }
+
+    /**
+     * Holds if `getCfgPredicate()` exists.
+     */
+    final predicate hasCfgPredicate() { exists(this.getCfgPredicate()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CfgPredExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgPredExpr.qll
new file mode 100644
index 000000000000..2800e249b14f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgPredExpr.qll
@@ -0,0 +1,51 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `CfgPredExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.CfgPredicate
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `CfgPredExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A configuration predicate expression resulting from expansion of a `cfg!` macro call.
+   * It has type `bool` and evaluates to whether the configuration predicate holds.
+   *
+   * Rust-analyzer expands `cfg!(...)` in expression position to its internal `builtin#cfg(...)`
+   * syntax, as illustrated below:
+   * ```rust
+   * builtin#cfg(unix);
+   * builtin#cfg(target_os = "windows");
+   * builtin#cfg(any(unix, target_os = "windows"));
+   * ```
+   * INTERNAL: Do not reference the `Generated::CfgPredExpr` class directly.
+   * Use the subclass `CfgPredExpr`, where the following predicates are available.
+   */
+  class CfgPredExpr extends Synth::TCfgPredExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "CfgPredExpr" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the cfg predicate of this cfg pred expression, if it exists.
+     */
+    CfgPredicate getCfgPredicate() {
+      result =
+        Synth::convertCfgPredicateFromRaw(Synth::convertCfgPredExprToRaw(this)
+              .(Raw::CfgPredExpr)
+              .getCfgPredicate())
+    }
+
+    /**
+     * Holds if `getCfgPredicate()` exists.
+     */
+    final predicate hasCfgPredicate() { exists(this.getCfgPredicate()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CfgPredPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgPredPat.qll
new file mode 100644
index 000000000000..53e8410b9691
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgPredPat.qll
@@ -0,0 +1,54 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `CfgPredPat`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.CfgPredicate
+import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `CfgPredPat` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A configuration predicate pattern resulting from expansion of a `cfg!` macro call.
+   * It matches `true` when the configuration predicate holds and `false` otherwise.
+   *
+   * Rust-analyzer expands `cfg!(...)` in pattern position to its internal `builtin#cfg(...)`
+   * syntax, as illustrated below:
+   * ```rust
+   * match true {
+   *     builtin#cfg(unix) => (),
+   *     builtin#cfg(target_os = "windows") => (),
+   *     builtin#cfg(any(unix, target_os = "windows")) => (),
+   *     _ => (),
+   * };
+   * ```
+   * INTERNAL: Do not reference the `Generated::CfgPredPat` class directly.
+   * Use the subclass `CfgPredPat`, where the following predicates are available.
+   */
+  class CfgPredPat extends Synth::TCfgPredPat, PatImpl::Pat {
+    override string getAPrimaryQlClass() { result = "CfgPredPat" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the cfg predicate of this cfg pred pattern, if it exists.
+     */
+    CfgPredicate getCfgPredicate() {
+      result =
+        Synth::convertCfgPredicateFromRaw(Synth::convertCfgPredPatToRaw(this)
+              .(Raw::CfgPredPat)
+              .getCfgPredicate())
+    }
+
+    /**
+     * Holds if `getCfgPredicate()` exists.
+     */
+    final predicate hasCfgPredicate() { exists(this.getCfgPredicate()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CfgPredicate.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgPredicate.qll
new file mode 100644
index 000000000000..f5187ecf1e05
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CfgPredicate.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `CfgPredicate`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `CfgPredicate` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::CfgPredicate` class directly.
+   * Use the subclass `CfgPredicate`, where the following predicates are available.
+   */
+  class CfgPredicate extends Synth::TCfgPredicate, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Comment.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Comment.qll
index 7a4ca595f113..1d763f81f416 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Comment.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Comment.qll
@@ -19,6 +19,7 @@ module Generated {
    * ```rust
    * // this is a comment
    * /// This is a doc comment
+   * fn documented() {}
    * ```
    * INTERNAL: Do not reference the `Generated::Comment` class directly.
    * Use the subclass `Comment`, where the following predicates are available.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
index 07ffd9058bba..1ffbf0a5ce8c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AssocItemImpl::Impl as AssocItemImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Name
@@ -36,14 +36,15 @@ module Generated {
     /**
      * Gets the `index`th attr of this const (0-based).
      */
-    Attr getAttr(int index) {
-      result = Synth::convertAttrFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getAttr(index))
+    AnyAttr getAttr(int index) {
+      result =
+        Synth::convertAnyAttrFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this const.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this const.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstArg.qll
index d9a9ee1d8553..2ed69e654c86 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstArg.qll
@@ -28,6 +28,8 @@ module Generated {
   class ConstArg extends Synth::TConstArg, GenericArgImpl::GenericArg {
     override string getAPrimaryQlClass() { result = "ConstArg" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the expression of this const argument, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
index 971308952917..d75a9b25c6f9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
@@ -28,6 +28,8 @@ module Generated {
   class ConstBlockPat extends Synth::TConstBlockPat, PatImpl::Pat {
     override string getAPrimaryQlClass() { result = "ConstBlockPat" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the block expression of this const block pattern, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
index c2268deec020..a0899b6b55ee 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.ConstArg
 import codeql.rust.elements.internal.GenericParamImpl::Impl as GenericParamImpl
 import codeql.rust.elements.Name
@@ -31,12 +31,14 @@ module Generated {
   class ConstParam extends Synth::TConstParam, GenericParamImpl::GenericParam {
     override string getAPrimaryQlClass() { result = "ConstParam" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this const parameter (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertConstParamToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertConstParamToRaw(this)
               .(Raw::ConstParam)
               .getAttr(index))
     }
@@ -44,7 +46,7 @@ module Generated {
     /**
      * Gets any of the attrs of this const parameter.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this const parameter.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ContinueExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ContinueExpr.qll
index 9e8df8e22e6b..806598159cca 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ContinueExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ContinueExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.Lifetime
 
@@ -40,9 +40,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this continue expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertContinueExprToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertContinueExprToRaw(this)
               .(Raw::ContinueExpr)
               .getAttr(index))
     }
@@ -50,7 +50,7 @@ module Generated {
     /**
      * Gets any of the attrs of this continue expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this continue expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/DerefPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/DerefPat.qll
new file mode 100644
index 000000000000..99cd951ee8d7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/DerefPat.qll
@@ -0,0 +1,47 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `DerefPat`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Pat
+import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `DerefPat` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A deref pattern, matching the value behind a smart pointer. This is an experimental
+   * Rust feature that cannot be written directly in stable Rust; the example below uses
+   * rust-analyzer's canonical `builtin#deref` syntax for such patterns:
+   * ```rust
+   * match x {
+   *     builtin#deref(y) => y,
+   *     _ => 0,
+   * };
+   * ```
+   * INTERNAL: Do not reference the `Generated::DerefPat` class directly.
+   * Use the subclass `DerefPat`, where the following predicates are available.
+   */
+  class DerefPat extends Synth::TDerefPat, PatImpl::Pat {
+    override string getAPrimaryQlClass() { result = "DerefPat" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the pattern of this deref pattern, if it exists.
+     */
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertDerefPatToRaw(this).(Raw::DerefPat).getPat())
+    }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/DocComment.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/DocComment.qll
new file mode 100644
index 000000000000..bfa1ca1f8d86
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/DocComment.qll
@@ -0,0 +1,32 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `DocComment`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AnyAttrImpl::Impl as AnyAttrImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `DocComment` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A documentation comment.
+   *
+   * For example:
+   * ```rust
+   * /// Documents `documented`.
+   * fn documented() {}
+   * ```
+   * INTERNAL: Do not reference the `Generated::DocComment` class directly.
+   * Use the subclass `DocComment`, where the following predicates are available.
+   */
+  class DocComment extends Synth::TDocComment, AnyAttrImpl::AnyAttr {
+    override string getAPrimaryQlClass() { result = "DocComment" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll
index 8e82d3f428c6..2f65e909d553 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll
@@ -28,6 +28,8 @@ module Generated {
   class DynTraitTypeRepr extends Synth::TDynTraitTypeRepr, TypeReprImpl::TypeRepr {
     override string getAPrimaryQlClass() { result = "DynTraitTypeRepr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the type bound list of this dyn trait type representation, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExprStmt.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExprStmt.qll
index 23396d0c9042..fda34aec572a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ExprStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExprStmt.qll
@@ -27,6 +27,8 @@ module Generated {
   class ExprStmt extends Synth::TExprStmt, StmtImpl::Stmt {
     override string getAPrimaryQlClass() { result = "ExprStmt" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the expression of this expression statement, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll
index 9b769440bd3b..2fd7276f3832 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll
@@ -7,7 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.Abi
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.ExternItemList
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 
@@ -31,6 +31,8 @@ module Generated {
   class ExternBlock extends Synth::TExternBlock, ItemImpl::Item {
     override string getAPrimaryQlClass() { result = "ExternBlock" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the abi of this extern block, if it exists.
      */
@@ -47,9 +49,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this extern block (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertExternBlockToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertExternBlockToRaw(this)
               .(Raw::ExternBlock)
               .getAttr(index))
     }
@@ -57,7 +59,7 @@ module Generated {
     /**
      * Gets any of the attrs of this extern block.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this extern block.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll
index 3484139b9fc2..86f458498c26 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.Rename
@@ -30,12 +30,14 @@ module Generated {
   class ExternCrate extends Synth::TExternCrate, ItemImpl::Item {
     override string getAPrimaryQlClass() { result = "ExternCrate" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this extern crate (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertExternCrateToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertExternCrateToRaw(this)
               .(Raw::ExternCrate)
               .getAttr(index))
     }
@@ -43,7 +45,7 @@ module Generated {
     /**
      * Gets any of the attrs of this extern crate.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this extern crate.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItemList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItemList.qll
index 250fe549b52f..dd383f8812a8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItemList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItemList.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.ExternItem
 
 /**
@@ -31,12 +31,14 @@ module Generated {
   class ExternItemList extends Synth::TExternItemList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "ExternItemList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this extern item list (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertExternItemListToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertExternItemListToRaw(this)
               .(Raw::ExternItemList)
               .getAttr(index))
     }
@@ -44,7 +46,7 @@ module Generated {
     /**
      * Gets any of the attrs of this extern item list.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this extern item list.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll
index acb19cd2a52e..78777854304e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.NameRef
@@ -30,15 +30,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this field expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertFieldExprToRaw(this).(Raw::FieldExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertFieldExprToRaw(this)
+              .(Raw::FieldExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this field expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this field expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll
index c250406e68c9..9139b1616f11 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll
@@ -30,6 +30,8 @@ module Generated {
   class FnPtrTypeRepr extends Synth::TFnPtrTypeRepr, TypeReprImpl::TypeRepr {
     override string getAPrimaryQlClass() { result = "FnPtrTypeRepr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the abi of this fn ptr type representation, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll
index 6089b1b73ba5..e6882d093f6b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.LoopingExprImpl::Impl as LoopingExprImpl
 import codeql.rust.elements.Pat
@@ -34,15 +34,15 @@ module Generated {
     /**
      * Gets the `index`th attr of this for expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this for expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this for expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
index 56745b56f009..ecf9924b26d0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
@@ -29,6 +29,8 @@ module Generated {
   class ForTypeRepr extends Synth::TForTypeRepr, TypeReprImpl::TypeRepr {
     override string getAPrimaryQlClass() { result = "ForTypeRepr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the for binder of this for type representation, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll
index 80ca340284fa..6cc08f872a91 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll
@@ -26,6 +26,8 @@ module Generated {
   class FormatArgsArg extends Synth::TFormatArgsArg, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "FormatArgsArg" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the expression of this format arguments argument, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll
index 38034779e053..e722b445a474 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.Format
@@ -32,6 +32,8 @@ module Generated {
   class FormatArgsExpr extends Synth::TFormatArgsExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "FormatArgsExpr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th argument of this format arguments expression (0-based).
      */
@@ -55,9 +57,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this format arguments expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertFormatArgsExprToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertFormatArgsExprToRaw(this)
               .(Raw::FormatArgsExpr)
               .getAttr(index))
     }
@@ -65,7 +67,7 @@ module Generated {
     /**
      * Gets any of the attrs of this format arguments expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this format arguments expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
index d016899bc01d..80c74776b0d0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Name
 import codeql.rust.elements.Pat
 import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
@@ -39,15 +39,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this ident pattern (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertIdentPatToRaw(this)
+              .(Raw::IdentPat)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this ident pattern.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this ident pattern.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/IfExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/IfExpr.qll
index 57d726b6210e..cb0207b69e7d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/IfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/IfExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
@@ -39,15 +39,15 @@ module Generated {
     /**
      * Gets the `index`th attr of this if expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertIfExprToRaw(this).(Raw::IfExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertIfExprToRaw(this).(Raw::IfExpr).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this if expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this if expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
index 915e8940fb0e..2394ea45aba8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AssocItemList
-import codeql.rust.elements.Attr
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.TypeRepr
@@ -52,14 +52,15 @@ module Generated {
     /**
      * Gets the `index`th attr of this impl (0-based).
      */
-    Attr getAttr(int index) {
-      result = Synth::convertAttrFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getAttr(index))
+    AnyAttr getAttr(int index) {
+      result =
+        Synth::convertAnyAttrFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this impl.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this impl.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ImplRestriction.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ImplRestriction.qll
new file mode 100644
index 000000000000..29d077d8795c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ImplRestriction.qll
@@ -0,0 +1,42 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ImplRestriction`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.VisibilityInner
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ImplRestriction` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * An implementation restriction, limiting where a trait can be implemented. For example the `impl(crate)` restriction (an unstable feature).
+   * INTERNAL: Do not reference the `Generated::ImplRestriction` class directly.
+   * Use the subclass `ImplRestriction`, where the following predicates are available.
+   */
+  class ImplRestriction extends Synth::TImplRestriction, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ImplRestriction" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the visibility inner of this impl restriction, if it exists.
+     */
+    VisibilityInner getVisibilityInner() {
+      result =
+        Synth::convertVisibilityInnerFromRaw(Synth::convertImplRestrictionToRaw(this)
+              .(Raw::ImplRestriction)
+              .getVisibilityInner())
+    }
+
+    /**
+     * Holds if `getVisibilityInner()` exists.
+     */
+    final predicate hasVisibilityInner() { exists(this.getVisibilityInner()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/IncludeBytesExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/IncludeBytesExpr.qll
new file mode 100644
index 000000000000..23af5459aa6e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/IncludeBytesExpr.qll
@@ -0,0 +1,29 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `IncludeBytesExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `IncludeBytesExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * An expression produced by the built-in `include_bytes!` macro, embedding the contents of a file as a byte array. For example:
+   * ```rust
+   * let data = include_bytes!("data.bin");
+   * ```
+   * INTERNAL: Do not reference the `Generated::IncludeBytesExpr` class directly.
+   * Use the subclass `IncludeBytesExpr`, where the following predicates are available.
+   */
+  class IncludeBytesExpr extends Synth::TIncludeBytesExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "IncludeBytesExpr" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/IndexExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/IndexExpr.qll
index 51a9cd393e42..04ffbc070c9c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/IndexExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/IndexExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -30,15 +30,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this index expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertIndexExprToRaw(this).(Raw::IndexExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertIndexExprToRaw(this)
+              .(Raw::IndexExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this index expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this index expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ItemList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ItemList.qll
index 5d470ac9a779..9f3bc8d1205b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ItemList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ItemList.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Item
 
 /**
@@ -31,18 +31,22 @@ module Generated {
   class ItemList extends Synth::TItemList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "ItemList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this item list (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertItemListToRaw(this).(Raw::ItemList).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertItemListToRaw(this)
+              .(Raw::ItemList)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this item list.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this item list.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/KeyValueMeta.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/KeyValueMeta.qll
new file mode 100644
index 000000000000..cae2b17bf00d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/KeyValueMeta.qll
@@ -0,0 +1,57 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `KeyValueMeta`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.MetaImpl::Impl as MetaImpl
+import codeql.rust.elements.Path
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `KeyValueMeta` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::KeyValueMeta` class directly.
+   * Use the subclass `KeyValueMeta`, where the following predicates are available.
+   */
+  class KeyValueMeta extends Synth::TKeyValueMeta, MetaImpl::Meta {
+    override string getAPrimaryQlClass() { result = "KeyValueMeta" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the expression of this key value meta, if it exists.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertKeyValueMetaToRaw(this)
+              .(Raw::KeyValueMeta)
+              .getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the path of this key value meta, if it exists.
+     */
+    Path getPath() {
+      result =
+        Synth::convertPathFromRaw(Synth::convertKeyValueMetaToRaw(this)
+              .(Raw::KeyValueMeta)
+              .getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
index 45e0fa589dab..77833e329bff 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.Pat
@@ -32,15 +32,15 @@ module Generated {
     /**
      * Gets the `index`th attr of this let expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this let expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this let expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
index c971a1548a56..81acdb5b7d53 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.LetElse
 import codeql.rust.elements.Pat
@@ -39,15 +39,15 @@ module Generated {
     /**
      * Gets the `index`th attr of this let statement (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this let statement.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this let statement.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeArg.qll
index 7ae2873fa606..c17a9e391299 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeArg.qll
@@ -28,6 +28,8 @@ module Generated {
   class LifetimeArg extends Synth::TLifetimeArg, GenericArgImpl::GenericArg {
     override string getAPrimaryQlClass() { result = "LifetimeArg" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the lifetime of this lifetime argument, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeParam.qll
index a293bfd54276..f1459f7c6804 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeParam.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.GenericParamImpl::Impl as GenericParamImpl
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeBoundList
@@ -30,12 +30,14 @@ module Generated {
   class LifetimeParam extends Synth::TLifetimeParam, GenericParamImpl::GenericParam {
     override string getAPrimaryQlClass() { result = "LifetimeParam" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this lifetime parameter (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertLifetimeParamToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertLifetimeParamToRaw(this)
               .(Raw::LifetimeParam)
               .getAttr(index))
     }
@@ -43,7 +45,7 @@ module Generated {
     /**
      * Gets any of the attrs of this lifetime parameter.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this lifetime parameter.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralExpr.qll
index 57967d06538e..82ccf7256602 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
 /**
@@ -35,9 +35,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this literal expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertLiteralExprToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertLiteralExprToRaw(this)
               .(Raw::LiteralExpr)
               .getAttr(index))
     }
@@ -45,7 +45,7 @@ module Generated {
     /**
      * Gets any of the attrs of this literal expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this literal expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll
index 510c3dedb683..7264047a41a2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.LoopingExprImpl::Impl as LoopingExprImpl
 
 /**
@@ -46,15 +46,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this loop expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertLoopExprToRaw(this).(Raw::LoopExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertLoopExprToRaw(this)
+              .(Raw::LoopExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this loop expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this loop expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll
index bcca8b8deef3..c9ab7696a850 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll
@@ -6,9 +6,9 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AssocItemImpl::Impl as AssocItemImpl
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
 import codeql.rust.elements.Path
 import codeql.rust.elements.TokenTree
@@ -34,15 +34,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this macro call (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertMacroCallToRaw(this).(Raw::MacroCall).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertMacroCallToRaw(this)
+              .(Raw::MacroCall)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this macro call.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this macro call.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroDef.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroDef.qll
index b10858d06854..90a598c561f8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroDef.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroDef.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.Name
 import codeql.rust.elements.TokenTree
@@ -32,6 +32,8 @@ module Generated {
   class MacroDef extends Synth::TMacroDef, ItemImpl::Item {
     override string getAPrimaryQlClass() { result = "MacroDef" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the arguments of this macro def, if it exists.
      */
@@ -48,15 +50,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this macro def (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertMacroDefToRaw(this).(Raw::MacroDef).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertMacroDefToRaw(this)
+              .(Raw::MacroDef)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this macro def.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this macro def.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroExpr.qll
index 60e6ae6708eb..ce18135527b7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.MacroCall
 
@@ -27,6 +28,28 @@ module Generated {
   class MacroExpr extends Synth::TMacroExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "MacroExpr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the `index`th attr of this macro expression (0-based).
+     */
+    AnyAttr getAttr(int index) {
+      result =
+        Synth::convertAnyAttrFromRaw(Synth::convertMacroExprToRaw(this)
+              .(Raw::MacroExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this macro expression.
+     */
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this macro expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the macro call of this macro expression, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll
index 5dc115ecba4f..2a30b7db55c6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll
@@ -35,6 +35,8 @@ module Generated {
   class MacroItems extends Synth::TMacroItems, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "MacroItems" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th item of this macro items (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll
index e967082bc775..2710500847e6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll
@@ -36,6 +36,8 @@ module Generated {
   class MacroPat extends Synth::TMacroPat, PatImpl::Pat {
     override string getAPrimaryQlClass() { result = "MacroPat" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the macro call of this macro pattern, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroRules.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroRules.qll
index d7c915a9363e..0bf5ab98b3ba 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroRules.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroRules.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.Name
 import codeql.rust.elements.TokenTree
@@ -32,12 +32,14 @@ module Generated {
   class MacroRules extends Synth::TMacroRules, ItemImpl::Item {
     override string getAPrimaryQlClass() { result = "MacroRules" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this macro rules (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertMacroRulesToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertMacroRulesToRaw(this)
               .(Raw::MacroRules)
               .getAttr(index))
     }
@@ -45,7 +47,7 @@ module Generated {
     /**
      * Gets any of the attrs of this macro rules.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this macro rules.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll
index e6b901ba3d97..ead66c1d8639 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll
@@ -31,6 +31,8 @@ module Generated {
   class MacroTypeRepr extends Synth::TMacroTypeRepr, TypeReprImpl::TypeRepr {
     override string getAPrimaryQlClass() { result = "MacroTypeRepr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the macro call of this macro type representation, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
index 47782a2accb1..f45fafe2aea4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.MatchGuard
 import codeql.rust.elements.Pat
@@ -40,15 +40,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this match arm (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertMatchArmToRaw(this)
+              .(Raw::MatchArm)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this match arm.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this match arm.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArmList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArmList.qll
index b3b97b7a1751..a96e6286111c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArmList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArmList.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.MatchArm
 
 /**
@@ -33,6 +33,8 @@ module Generated {
   class MatchArmList extends Synth::TMatchArmList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "MatchArmList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th arm of this match arm list (0-based).
      */
@@ -56,9 +58,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this match arm list (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertMatchArmListToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertMatchArmListToRaw(this)
               .(Raw::MatchArmList)
               .getAttr(index))
     }
@@ -66,7 +68,7 @@ module Generated {
     /**
      * Gets any of the attrs of this match arm list.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this match arm list.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll
index 8f49407e5f9e..8dd6a058765b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.MatchArmList
@@ -39,15 +39,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this match expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertMatchExprToRaw(this).(Raw::MatchExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertMatchExprToRaw(this)
+              .(Raw::MatchExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this match expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this match expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchGuard.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchGuard.qll
index b0b52879f52c..e0ab9e2ed245 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchGuard.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchGuard.qll
@@ -31,6 +31,8 @@ module Generated {
   class MatchGuard extends Synth::TMatchGuard, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "MatchGuard" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the condition of this match guard, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll
index 27e6c03a3287..aa5181ee326a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll
@@ -7,9 +7,6 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Expr
-import codeql.rust.elements.Path
-import codeql.rust.elements.TokenTree
 
 /**
  * INTERNAL: This module contains the fully generated definition of `Meta` and should not
@@ -32,49 +29,5 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Meta` class directly.
    * Use the subclass `Meta`, where the following predicates are available.
    */
-  class Meta extends Synth::TMeta, AstNodeImpl::AstNode {
-    override string getAPrimaryQlClass() { result = "Meta" }
-
-    /**
-     * Gets the expression of this meta, if it exists.
-     */
-    Expr getExpr() {
-      result = Synth::convertExprFromRaw(Synth::convertMetaToRaw(this).(Raw::Meta).getExpr())
-    }
-
-    /**
-     * Holds if `getExpr()` exists.
-     */
-    final predicate hasExpr() { exists(this.getExpr()) }
-
-    /**
-     * Holds if this meta is unsafe.
-     */
-    predicate isUnsafe() { Synth::convertMetaToRaw(this).(Raw::Meta).isUnsafe() }
-
-    /**
-     * Gets the path of this meta, if it exists.
-     */
-    Path getPath() {
-      result = Synth::convertPathFromRaw(Synth::convertMetaToRaw(this).(Raw::Meta).getPath())
-    }
-
-    /**
-     * Holds if `getPath()` exists.
-     */
-    final predicate hasPath() { exists(this.getPath()) }
-
-    /**
-     * Gets the token tree of this meta, if it exists.
-     */
-    TokenTree getTokenTree() {
-      result =
-        Synth::convertTokenTreeFromRaw(Synth::convertMetaToRaw(this).(Raw::Meta).getTokenTree())
-    }
-
-    /**
-     * Holds if `getTokenTree()` exists.
-     */
-    final predicate hasTokenTree() { exists(this.getTokenTree()) }
-  }
+  class Meta extends Synth::TMeta, AstNodeImpl::AstNode { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
index 18d6803211b3..e3f874f366be 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.ArgList
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.GenericArgList
@@ -52,9 +52,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this method call expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertMethodCallExprToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertMethodCallExprToRaw(this)
               .(Raw::MethodCallExpr)
               .getAttr(index))
     }
@@ -62,7 +62,7 @@ module Generated {
     /**
      * Gets any of the attrs of this method call expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this method call expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Missing.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Missing.qll
index 9eff62a26c46..6011345a730e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Missing.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Missing.qll
@@ -20,5 +20,7 @@ module Generated {
    */
   class Missing extends Synth::TMissing, UnextractedImpl::Unextracted {
     override string getAPrimaryQlClass() { result = "Missing" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Module.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Module.qll
index b4513c9ae855..7c27a66ff614 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Module.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Module.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.ItemList
 import codeql.rust.elements.Name
@@ -36,15 +36,15 @@ module Generated {
     /**
      * Gets the `index`th attr of this module (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertModuleToRaw(this).(Raw::Module).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertModuleToRaw(this).(Raw::Module).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this module.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this module.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MutRestriction.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MutRestriction.qll
new file mode 100644
index 000000000000..8213b036b8b3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MutRestriction.qll
@@ -0,0 +1,47 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MutRestriction`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.VisibilityInner
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MutRestriction` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A mutability restriction, limiting where a field can be mutated. For example the `mut(crate)` restriction (an unstable feature).
+   * INTERNAL: Do not reference the `Generated::MutRestriction` class directly.
+   * Use the subclass `MutRestriction`, where the following predicates are available.
+   */
+  class MutRestriction extends Synth::TMutRestriction, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "MutRestriction" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Holds if this mut restriction is mut.
+     */
+    predicate isMut() { Synth::convertMutRestrictionToRaw(this).(Raw::MutRestriction).isMut() }
+
+    /**
+     * Gets the visibility inner of this mut restriction, if it exists.
+     */
+    VisibilityInner getVisibilityInner() {
+      result =
+        Synth::convertVisibilityInnerFromRaw(Synth::convertMutRestrictionToRaw(this)
+              .(Raw::MutRestriction)
+              .getVisibilityInner())
+    }
+
+    /**
+     * Holds if `getVisibilityInner()` exists.
+     */
+    final predicate hasVisibilityInner() { exists(this.getVisibilityInner()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/NamedCrate.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/NamedCrate.qll
index 8068f52970eb..9670f154299b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/NamedCrate.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/NamedCrate.qll
@@ -21,6 +21,8 @@ module Generated {
   class NamedCrate extends Synth::TNamedCrate, ElementImpl::Element {
     override string getAPrimaryQlClass() { result = "NamedCrate" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the name of this named crate.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/NotNull.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/NotNull.qll
new file mode 100644
index 000000000000..467a1ba73a09
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/NotNull.qll
@@ -0,0 +1,32 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `NotNull`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `NotNull` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * The `!null` pattern used in a pattern type to denote a non-null value. Pattern types
+   * are an experimental, mostly compiler-internal feature (used in the standard library for
+   * types such as `NonZero` and `NonNull`) and cannot be written directly in stable Rust;
+   * the example below uses rust-analyzer's canonical `builtin#pattern_type` syntax:
+   * ```rust
+   * type NonNull = builtin#pattern_type(*const () is !null);
+   * ```
+   * INTERNAL: Do not reference the `Generated::NotNull` class directly.
+   * Use the subclass `NotNull`, where the following predicates are available.
+   */
+  class NotNull extends Synth::TNotNull, PatImpl::Pat {
+    override string getAPrimaryQlClass() { result = "NotNull" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
index c66a1af823a3..206897a9659d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.TypeRepr
@@ -27,12 +27,14 @@ module Generated {
   class OffsetOfExpr extends Synth::TOffsetOfExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "OffsetOfExpr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this offset of expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertOffsetOfExprToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertOffsetOfExprToRaw(this)
               .(Raw::OffsetOfExpr)
               .getAttr(index))
     }
@@ -40,7 +42,7 @@ module Generated {
     /**
      * Gets any of the attrs of this offset of expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this offset of expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParamBase.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParamBase.qll
index 3202b2149e41..325a0441317d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParamBase.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParamBase.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.TypeRepr
 
 /**
@@ -24,15 +24,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this parameter base (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertParamBaseToRaw(this).(Raw::ParamBase).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertParamBaseToRaw(this)
+              .(Raw::ParamBase)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this parameter base.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this parameter base.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParamList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParamList.qll
index 1e13899b9a57..110cbcc396fb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParamList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParamList.qll
@@ -29,6 +29,8 @@ module Generated {
   class ParamList extends Synth::TParamList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "ParamList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th parameter of this parameter list (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenExpr.qll
deleted file mode 100644
index 560398ca7f29..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenExpr.qll
+++ /dev/null
@@ -1,62 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ParenExpr`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
-import codeql.rust.elements.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ParenExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A parenthesized expression.
-   *
-   * For example:
-   * ```rust
-   * (x + y)
-   * ```
-   * INTERNAL: Do not reference the `Generated::ParenExpr` class directly.
-   * Use the subclass `ParenExpr`, where the following predicates are available.
-   */
-  class ParenExpr extends Synth::TParenExpr, ExprImpl::Expr {
-    override string getAPrimaryQlClass() { result = "ParenExpr" }
-
-    /**
-     * Gets the `index`th attr of this paren expression (0-based).
-     */
-    Attr getAttr(int index) {
-      result =
-        Synth::convertAttrFromRaw(Synth::convertParenExprToRaw(this).(Raw::ParenExpr).getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this paren expression.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this paren expression.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
-    /**
-     * Gets the expression of this paren expression, if it exists.
-     */
-    Expr getExpr() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertParenExprToRaw(this).(Raw::ParenExpr).getExpr())
-    }
-
-    /**
-     * Holds if `getExpr()` exists.
-     */
-    final predicate hasExpr() { exists(this.getExpr()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll
deleted file mode 100644
index ddf678e24473..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll
+++ /dev/null
@@ -1,43 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ParenPat`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Pat
-import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ParenPat` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A parenthesized pattern.
-   *
-   * For example:
-   * ```rust
-   * let (x) = 1;
-   * //  ^^^
-   * ```
-   * INTERNAL: Do not reference the `Generated::ParenPat` class directly.
-   * Use the subclass `ParenPat`, where the following predicates are available.
-   */
-  class ParenPat extends Synth::TParenPat, PatImpl::Pat {
-    override string getAPrimaryQlClass() { result = "ParenPat" }
-
-    /**
-     * Gets the pattern of this paren pattern, if it exists.
-     */
-    Pat getPat() {
-      result = Synth::convertPatFromRaw(Synth::convertParenPatToRaw(this).(Raw::ParenPat).getPat())
-    }
-
-    /**
-     * Holds if `getPat()` exists.
-     */
-    final predicate hasPat() { exists(this.getPat()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
index 344898886c1b..3d6489af4894 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
@@ -140,18 +140,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfAttr(Attr e, int index, string partialPredicateCall) {
-    exists(int n, int nMeta |
-      n = 0 and
-      nMeta = n + 1 and
-      (
-        none()
-        or
-        index = n and result = e.getMeta() and partialPredicateCall = "Meta()"
-      )
-    )
-  }
-
   private Element getImmediateChildOfExternItemList(
     ExternItemList e, int index, string partialPredicateCall
   ) {
@@ -232,6 +220,20 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfImplRestriction(
+    ImplRestriction e, int index, string partialPredicateCall
+  ) {
+    exists(int n, int nVisibilityInner |
+      n = 0 and
+      nVisibilityInner = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getVisibilityInner() and partialPredicateCall = "VisibilityInner()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfItemList(ItemList e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nItem |
       n = 0 and
@@ -339,20 +341,16 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfMeta(Meta e, int index, string partialPredicateCall) {
-    exists(int n, int nExpr, int nPath, int nTokenTree |
+  private Element getImmediateChildOfMutRestriction(
+    MutRestriction e, int index, string partialPredicateCall
+  ) {
+    exists(int n, int nVisibilityInner |
       n = 0 and
-      nExpr = n + 1 and
-      nPath = nExpr + 1 and
-      nTokenTree = nPath + 1 and
+      nVisibilityInner = n + 1 and
       (
         none()
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
-        or
-        index = nExpr and result = e.getPath() and partialPredicateCall = "Path()"
-        or
-        index = nPath and result = e.getTokenTree() and partialPredicateCall = "TokenTree()"
+        index = n and result = e.getVisibilityInner() and partialPredicateCall = "VisibilityInner()"
       )
     )
   }
@@ -567,11 +565,15 @@ private module Impl {
   private Element getImmediateChildOfStructField(
     StructField e, int index, string partialPredicateCall
   ) {
-    exists(int n, int nAttr, int nDefault, int nName, int nTypeRepr, int nVisibility |
+    exists(
+      int n, int nAttr, int nDefaultVal, int nMutRestriction, int nName, int nTypeRepr,
+      int nVisibility
+    |
       n = 0 and
       nAttr = n + e.getNumberOfAttrs() and
-      nDefault = nAttr + 1 and
-      nName = nDefault + 1 and
+      nDefaultVal = nAttr + 1 and
+      nMutRestriction = nDefaultVal + 1 and
+      nName = nMutRestriction + 1 and
       nTypeRepr = nName + 1 and
       nVisibility = nTypeRepr + 1 and
       (
@@ -580,9 +582,13 @@ private module Impl {
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nAttr and result = e.getDefault() and partialPredicateCall = "Default()"
+        index = nAttr and result = e.getDefaultVal() and partialPredicateCall = "DefaultVal()"
+        or
+        index = nDefaultVal and
+        result = e.getMutRestriction() and
+        partialPredicateCall = "MutRestriction()"
         or
-        index = nDefault and result = e.getName() and partialPredicateCall = "Name()"
+        index = nMutRestriction and result = e.getName() and partialPredicateCall = "Name()"
         or
         index = nName and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
@@ -634,11 +640,26 @@ private module Impl {
     none()
   }
 
+  private Element getImmediateChildOfTryBlockModifier(
+    TryBlockModifier e, int index, string partialPredicateCall
+  ) {
+    exists(int n, int nTypeRepr |
+      n = 0 and
+      nTypeRepr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfTupleField(TupleField e, int index, string partialPredicateCall) {
-    exists(int n, int nAttr, int nTypeRepr, int nVisibility |
+    exists(int n, int nAttr, int nMutRestriction, int nTypeRepr, int nVisibility |
       n = 0 and
       nAttr = n + e.getNumberOfAttrs() and
-      nTypeRepr = nAttr + 1 and
+      nMutRestriction = nAttr + 1 and
+      nTypeRepr = nMutRestriction + 1 and
       nVisibility = nTypeRepr + 1 and
       (
         none()
@@ -646,7 +667,11 @@ private module Impl {
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nAttr and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
+        index = nAttr and
+        result = e.getMutRestriction() and
+        partialPredicateCall = "MutRestriction()"
+        or
+        index = nMutRestriction and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
         index = nTypeRepr and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
@@ -755,6 +780,20 @@ private module Impl {
   }
 
   private Element getImmediateChildOfVisibility(Visibility e, int index, string partialPredicateCall) {
+    exists(int n, int nVisibilityInner |
+      n = 0 and
+      nVisibilityInner = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getVisibilityInner() and partialPredicateCall = "VisibilityInner()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfVisibilityInner(
+    VisibilityInner e, int index, string partialPredicateCall
+  ) {
     exists(int n, int nPath |
       n = 0 and
       nPath = n + 1 and
@@ -845,7 +884,16 @@ private module Impl {
   private Element getImmediateChildOfAsmClobberAbi(
     AsmClobberAbi e, int index, string partialPredicateCall
   ) {
-    none()
+    exists(int n, int nAttr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      (
+        none()
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+      )
+    )
   }
 
   private Element getImmediateChildOfAsmConst(AsmConst e, int index, string partialPredicateCall) {
@@ -875,16 +923,20 @@ private module Impl {
   private Element getImmediateChildOfAsmOperandNamed(
     AsmOperandNamed e, int index, string partialPredicateCall
   ) {
-    exists(int n, int nAsmOperand, int nName |
+    exists(int n, int nAsmOperand, int nAttr, int nName |
       n = 0 and
       nAsmOperand = n + 1 and
-      nName = nAsmOperand + 1 and
+      nAttr = nAsmOperand + e.getNumberOfAttrs() and
+      nName = nAttr + 1 and
       (
         none()
         or
         index = n and result = e.getAsmOperand() and partialPredicateCall = "AsmOperand()"
         or
-        index = nAsmOperand and result = e.getName() and partialPredicateCall = "Name()"
+        result = e.getAttr(index - nAsmOperand) and
+        partialPredicateCall = "Attr(" + (index - nAsmOperand).toString() + ")"
+        or
+        index = nAttr and result = e.getName() and partialPredicateCall = "Name()"
       )
     )
   }
@@ -892,14 +944,18 @@ private module Impl {
   private Element getImmediateChildOfAsmOptionsList(
     AsmOptionsList e, int index, string partialPredicateCall
   ) {
-    exists(int n, int nAsmOption |
+    exists(int n, int nAsmOption, int nAttr |
       n = 0 and
       nAsmOption = n + e.getNumberOfAsmOptions() and
+      nAttr = nAsmOption + e.getNumberOfAttrs() and
       (
         none()
         or
         result = e.getAsmOption(index - n) and
         partialPredicateCall = "AsmOption(" + (index - n).toString() + ")"
+        or
+        result = e.getAttr(index - nAsmOption) and
+        partialPredicateCall = "Attr(" + (index - nAsmOption).toString() + ")"
       )
     )
   }
@@ -988,6 +1044,18 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfAttr(Attr e, int index, string partialPredicateCall) {
+    exists(int n, int nMeta |
+      n = 0 and
+      nMeta = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getMeta() and partialPredicateCall = "Meta()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfAwaitExpr(AwaitExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr |
       n = 0 and
@@ -1108,6 +1176,81 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfCfgAtom(CfgAtom e, int index, string partialPredicateCall) {
+    none()
+  }
+
+  private Element getImmediateChildOfCfgAttrMeta(
+    CfgAttrMeta e, int index, string partialPredicateCall
+  ) {
+    exists(int n, int nCfgPredicate, int nMeta |
+      n = 0 and
+      nCfgPredicate = n + 1 and
+      nMeta = nCfgPredicate + e.getNumberOfMetas() and
+      (
+        none()
+        or
+        index = n and result = e.getCfgPredicate() and partialPredicateCall = "CfgPredicate()"
+        or
+        result = e.getMeta(index - nCfgPredicate) and
+        partialPredicateCall = "Meta(" + (index - nCfgPredicate).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfCfgComposite(
+    CfgComposite e, int index, string partialPredicateCall
+  ) {
+    exists(int n, int nCfgPredicate |
+      n = 0 and
+      nCfgPredicate = n + e.getNumberOfCfgPredicates() and
+      (
+        none()
+        or
+        result = e.getCfgPredicate(index - n) and
+        partialPredicateCall = "CfgPredicate(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfCfgMeta(CfgMeta e, int index, string partialPredicateCall) {
+    exists(int n, int nCfgPredicate |
+      n = 0 and
+      nCfgPredicate = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getCfgPredicate() and partialPredicateCall = "CfgPredicate()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfCfgPredExpr(
+    CfgPredExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int n, int nCfgPredicate |
+      n = 0 and
+      nCfgPredicate = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getCfgPredicate() and partialPredicateCall = "CfgPredicate()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfCfgPredPat(CfgPredPat e, int index, string partialPredicateCall) {
+    exists(int n, int nCfgPredicate |
+      n = 0 and
+      nCfgPredicate = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getCfgPredicate() and partialPredicateCall = "CfgPredicate()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfClosureExpr(
     ClosureExpr e, int index, string partialPredicateCall
   ) {
@@ -1205,6 +1348,22 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfDerefPat(DerefPat e, int index, string partialPredicateCall) {
+    exists(int n, int nPat |
+      n = 0 and
+      nPat = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfDocComment(DocComment e, int index, string partialPredicateCall) {
+    none()
+  }
+
   private Element getImmediateChildOfDynTraitTypeRepr(
     DynTraitTypeRepr e, int index, string partialPredicateCall
   ) {
@@ -1368,6 +1527,12 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfIncludeBytesExpr(
+    IncludeBytesExpr e, int index, string partialPredicateCall
+  ) {
+    none()
+  }
+
   private Element getImmediateChildOfIndexExpr(IndexExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nBase, int nIndex |
       n = 0 and
@@ -1393,6 +1558,23 @@ private module Impl {
     none()
   }
 
+  private Element getImmediateChildOfKeyValueMeta(
+    KeyValueMeta e, int index, string partialPredicateCall
+  ) {
+    exists(int n, int nExpr, int nPath |
+      n = 0 and
+      nExpr = n + 1 and
+      nPath = nExpr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        or
+        index = nExpr and result = e.getPath() and partialPredicateCall = "Path()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfLetExpr(LetExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nScrutinee, int nPat |
       n = 0 and
@@ -1506,13 +1688,17 @@ private module Impl {
   }
 
   private Element getImmediateChildOfMacroExpr(MacroExpr e, int index, string partialPredicateCall) {
-    exists(int n, int nMacroCall |
+    exists(int n, int nAttr, int nMacroCall |
       n = 0 and
-      nMacroCall = n + 1 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nMacroCall = nAttr + 1 and
       (
         none()
         or
-        index = n and result = e.getMacroCall() and partialPredicateCall = "MacroCall()"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getMacroCall() and partialPredicateCall = "MacroCall()"
       )
     )
   }
@@ -1605,6 +1791,10 @@ private module Impl {
     none()
   }
 
+  private Element getImmediateChildOfNotNull(NotNull e, int index, string partialPredicateCall) {
+    none()
+  }
+
   private Element getImmediateChildOfOffsetOfExpr(
     OffsetOfExpr e, int index, string partialPredicateCall
   ) {
@@ -1659,49 +1849,47 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfParenExpr(ParenExpr e, int index, string partialPredicateCall) {
-    exists(int n, int nAttr, int nExpr |
+  private Element getImmediateChildOfParenTypeRepr(
+    ParenTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int n, int nTypeRepr |
       n = 0 and
-      nAttr = n + e.getNumberOfAttrs() and
-      nExpr = nAttr + 1 and
+      nTypeRepr = n + 1 and
       (
         none()
         or
-        result = e.getAttr(index - n) and
-        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
-        or
-        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
 
-  private Element getImmediateChildOfParenPat(ParenPat e, int index, string partialPredicateCall) {
-    exists(int n, int nPat |
+  private Element getImmediateChildOfPathMeta(PathMeta e, int index, string partialPredicateCall) {
+    exists(int n, int nPath |
       n = 0 and
-      nPat = n + 1 and
+      nPath = n + 1 and
       (
         none()
         or
-        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
       )
     )
   }
 
-  private Element getImmediateChildOfParenTypeRepr(
-    ParenTypeRepr e, int index, string partialPredicateCall
-  ) {
-    exists(int n, int nTypeRepr |
+  private Element getImmediateChildOfPathPat(PathPat e, int index, string partialPredicateCall) {
+    exists(int n, int nPath |
       n = 0 and
-      nTypeRepr = n + 1 and
+      nPath = n + 1 and
       (
         none()
         or
-        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
       )
     )
   }
 
-  private Element getImmediateChildOfPathPat(PathPat e, int index, string partialPredicateCall) {
+  private Element getImmediateChildOfPathTypeRepr(
+    PathTypeRepr e, int index, string partialPredicateCall
+  ) {
     exists(int n, int nPath |
       n = 0 and
       nPath = n + 1 and
@@ -1713,16 +1901,19 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfPathTypeRepr(
-    PathTypeRepr e, int index, string partialPredicateCall
+  private Element getImmediateChildOfPatternTypeRepr(
+    PatternTypeRepr e, int index, string partialPredicateCall
   ) {
-    exists(int n, int nPath |
+    exists(int n, int nPat, int nTypeRepr |
       n = 0 and
-      nPath = n + 1 and
+      nPat = n + 1 and
+      nTypeRepr = nPat + 1 and
       (
         none()
         or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
+        or
+        index = nPat and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -1915,16 +2106,20 @@ private module Impl {
   }
 
   private Element getImmediateChildOfStructExpr(StructExpr e, int index, string partialPredicateCall) {
-    exists(int n, int nPath, int nStructExprFieldList |
+    exists(int n, int nPath, int nAttr, int nStructExprFieldList |
       n = 0 and
       nPath = n + 1 and
-      nStructExprFieldList = nPath + 1 and
+      nAttr = nPath + e.getNumberOfAttrs() and
+      nStructExprFieldList = nAttr + 1 and
       (
         none()
         or
         index = n and result = e.getPath() and partialPredicateCall = "Path()"
         or
-        index = nPath and
+        result = e.getAttr(index - nPath) and
+        partialPredicateCall = "Attr(" + (index - nPath).toString() + ")"
+        or
+        index = nAttr and
         result = e.getStructExprFieldList() and
         partialPredicateCall = "StructExprFieldList()"
       )
@@ -1963,6 +2158,23 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfTokenTreeMeta(
+    TokenTreeMeta e, int index, string partialPredicateCall
+  ) {
+    exists(int n, int nPath, int nTokenTree |
+      n = 0 and
+      nPath = n + 1 and
+      nTokenTree = nPath + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+        or
+        index = nPath and result = e.getTokenTree() and partialPredicateCall = "TokenTree()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfTryExpr(TryExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr |
       n = 0 and
@@ -2106,12 +2318,24 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfUnsafeMeta(UnsafeMeta e, int index, string partialPredicateCall) {
+    exists(int n, int nMeta |
+      n = 0 and
+      nMeta = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getMeta() and partialPredicateCall = "Meta()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfVariant(Variant e, int index, string partialPredicateCall) {
-    exists(int n, int nAttr, int nDiscriminant, int nFieldList, int nName, int nVisibility |
+    exists(int n, int nAttr, int nConstArg, int nFieldList, int nName, int nVisibility |
       n = 0 and
       nAttr = n + e.getNumberOfAttrs() and
-      nDiscriminant = nAttr + 1 and
-      nFieldList = nDiscriminant + 1 and
+      nConstArg = nAttr + 1 and
+      nFieldList = nConstArg + 1 and
       nName = nFieldList + 1 and
       nVisibility = nName + 1 and
       (
@@ -2120,9 +2344,9 @@ private module Impl {
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nAttr and result = e.getDiscriminant() and partialPredicateCall = "Discriminant()"
+        index = nAttr and result = e.getConstArg() and partialPredicateCall = "ConstArg()"
         or
-        index = nDiscriminant and result = e.getFieldList() and partialPredicateCall = "FieldList()"
+        index = nConstArg and result = e.getFieldList() and partialPredicateCall = "FieldList()"
         or
         index = nFieldList and result = e.getName() and partialPredicateCall = "Name()"
         or
@@ -2242,11 +2466,12 @@ private module Impl {
   }
 
   private Element getImmediateChildOfBlockExpr(BlockExpr e, int index, string partialPredicateCall) {
-    exists(int n, int nLabel, int nAttr, int nStmtList |
+    exists(int n, int nLabel, int nAttr, int nStmtList, int nTryBlockModifier |
       n = 0 and
       nLabel = n + 1 and
       nAttr = nLabel + e.getNumberOfAttrs() and
       nStmtList = nAttr + 1 and
+      nTryBlockModifier = nStmtList + 1 and
       (
         none()
         or
@@ -2256,6 +2481,10 @@ private module Impl {
         partialPredicateCall = "Attr(" + (index - nLabel).toString() + ")"
         or
         index = nAttr and result = e.getStmtList() and partialPredicateCall = "StmtList()"
+        or
+        index = nStmtList and
+        result = e.getTryBlockModifier() and
+        partialPredicateCall = "TryBlockModifier()"
       )
     )
   }
@@ -2482,14 +2711,15 @@ private module Impl {
   private Element getImmediateChildOfTrait(Trait e, int index, string partialPredicateCall) {
     exists(
       int n, int nAttributeMacroExpansion, int nAssocItemList, int nAttr, int nGenericParamList,
-      int nName, int nTypeBoundList, int nVisibility, int nWhereClause
+      int nImplRestriction, int nName, int nTypeBoundList, int nVisibility, int nWhereClause
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
       nAssocItemList = nAttributeMacroExpansion + 1 and
       nAttr = nAssocItemList + e.getNumberOfAttrs() and
       nGenericParamList = nAttr + 1 and
-      nName = nGenericParamList + 1 and
+      nImplRestriction = nGenericParamList + 1 and
+      nName = nImplRestriction + 1 and
       nTypeBoundList = nName + 1 and
       nVisibility = nTypeBoundList + 1 and
       nWhereClause = nVisibility + 1 and
@@ -2511,49 +2741,11 @@ private module Impl {
         result = e.getGenericParamList() and
         partialPredicateCall = "GenericParamList()"
         or
-        index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
-        or
-        index = nName and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
+        index = nGenericParamList and
+        result = e.getImplRestriction() and
+        partialPredicateCall = "ImplRestriction()"
         or
-        index = nTypeBoundList and
-        result = e.getVisibility() and
-        partialPredicateCall = "Visibility()"
-        or
-        index = nVisibility and
-        result = e.getWhereClause() and
-        partialPredicateCall = "WhereClause()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfTraitAlias(TraitAlias e, int index, string partialPredicateCall) {
-    exists(
-      int n, int nAttributeMacroExpansion, int nAttr, int nGenericParamList, int nName,
-      int nTypeBoundList, int nVisibility, int nWhereClause
-    |
-      n = 0 and
-      nAttributeMacroExpansion = n + 1 and
-      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
-      nGenericParamList = nAttr + 1 and
-      nName = nGenericParamList + 1 and
-      nTypeBoundList = nName + 1 and
-      nVisibility = nTypeBoundList + 1 and
-      nWhereClause = nVisibility + 1 and
-      (
-        none()
-        or
-        index = n and
-        result = e.getAttributeMacroExpansion() and
-        partialPredicateCall = "AttributeMacroExpansion()"
-        or
-        result = e.getAttr(index - nAttributeMacroExpansion) and
-        partialPredicateCall = "Attr(" + (index - nAttributeMacroExpansion).toString() + ")"
-        or
-        index = nAttr and
-        result = e.getGenericParamList() and
-        partialPredicateCall = "GenericParamList()"
-        or
-        index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
+        index = nImplRestriction and result = e.getName() and partialPredicateCall = "Name()"
         or
         index = nName and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
         or
@@ -3037,8 +3229,6 @@ private module Impl {
     or
     result = getImmediateChildOfAssocItemList(e, index, partialAccessor)
     or
-    result = getImmediateChildOfAttr(e, index, partialAccessor)
-    or
     result = getImmediateChildOfExternItemList(e, index, partialAccessor)
     or
     result = getImmediateChildOfForBinder(e, index, partialAccessor)
@@ -3049,6 +3239,8 @@ private module Impl {
     or
     result = getImmediateChildOfGenericParamList(e, index, partialAccessor)
     or
+    result = getImmediateChildOfImplRestriction(e, index, partialAccessor)
+    or
     result = getImmediateChildOfItemList(e, index, partialAccessor)
     or
     result = getImmediateChildOfLabel(e, index, partialAccessor)
@@ -3063,7 +3255,7 @@ private module Impl {
     or
     result = getImmediateChildOfMatchGuard(e, index, partialAccessor)
     or
-    result = getImmediateChildOfMeta(e, index, partialAccessor)
+    result = getImmediateChildOfMutRestriction(e, index, partialAccessor)
     or
     result = getImmediateChildOfName(e, index, partialAccessor)
     or
@@ -3097,6 +3289,8 @@ private module Impl {
     or
     result = getImmediateChildOfTokenTree(e, index, partialAccessor)
     or
+    result = getImmediateChildOfTryBlockModifier(e, index, partialAccessor)
+    or
     result = getImmediateChildOfTupleField(e, index, partialAccessor)
     or
     result = getImmediateChildOfTypeBound(e, index, partialAccessor)
@@ -3113,6 +3307,8 @@ private module Impl {
     or
     result = getImmediateChildOfVisibility(e, index, partialAccessor)
     or
+    result = getImmediateChildOfVisibilityInner(e, index, partialAccessor)
+    or
     result = getImmediateChildOfWhereClause(e, index, partialAccessor)
     or
     result = getImmediateChildOfWherePred(e, index, partialAccessor)
@@ -3137,6 +3333,8 @@ private module Impl {
     or
     result = getImmediateChildOfAssocTypeArg(e, index, partialAccessor)
     or
+    result = getImmediateChildOfAttr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfAwaitExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfBecomeExpr(e, index, partialAccessor)
@@ -3151,6 +3349,18 @@ private module Impl {
     or
     result = getImmediateChildOfCastExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfCfgAtom(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfCfgAttrMeta(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfCfgComposite(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfCfgMeta(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfCfgPredExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfCfgPredPat(e, index, partialAccessor)
+    or
     result = getImmediateChildOfClosureExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfComment(e, index, partialAccessor)
@@ -3163,6 +3373,10 @@ private module Impl {
     or
     result = getImmediateChildOfContinueExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfDerefPat(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfDocComment(e, index, partialAccessor)
+    or
     result = getImmediateChildOfDynTraitTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfExprStmt(e, index, partialAccessor)
@@ -3181,10 +3395,14 @@ private module Impl {
     or
     result = getImmediateChildOfImplTraitTypeRepr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfIncludeBytesExpr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfIndexExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfInferTypeRepr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfKeyValueMeta(e, index, partialAccessor)
+    or
     result = getImmediateChildOfLetExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfLetStmt(e, index, partialAccessor)
@@ -3213,22 +3431,24 @@ private module Impl {
     or
     result = getImmediateChildOfNeverTypeRepr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfNotNull(e, index, partialAccessor)
+    or
     result = getImmediateChildOfOffsetOfExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfOrPat(e, index, partialAccessor)
     or
     result = getImmediateChildOfParam(e, index, partialAccessor)
     or
-    result = getImmediateChildOfParenExpr(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfParenPat(e, index, partialAccessor)
-    or
     result = getImmediateChildOfParenTypeRepr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfPathMeta(e, index, partialAccessor)
+    or
     result = getImmediateChildOfPathPat(e, index, partialAccessor)
     or
     result = getImmediateChildOfPathTypeRepr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfPatternTypeRepr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfPrefixExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfPtrTypeRepr(e, index, partialAccessor)
@@ -3259,6 +3479,8 @@ private module Impl {
     or
     result = getImmediateChildOfStructPat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfTokenTreeMeta(e, index, partialAccessor)
+    or
     result = getImmediateChildOfTryExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfTupleExpr(e, index, partialAccessor)
@@ -3277,6 +3499,8 @@ private module Impl {
     or
     result = getImmediateChildOfUnderscoreExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfUnsafeMeta(e, index, partialAccessor)
+    or
     result = getImmediateChildOfVariant(e, index, partialAccessor)
     or
     result = getImmediateChildOfWildcardPat(e, index, partialAccessor)
@@ -3311,8 +3535,6 @@ private module Impl {
     or
     result = getImmediateChildOfTrait(e, index, partialAccessor)
     or
-    result = getImmediateChildOfTraitAlias(e, index, partialAccessor)
-    or
     result = getImmediateChildOfUse(e, index, partialAccessor)
     or
     result = getImmediateChildOfConst(e, index, partialAccessor)
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenthesizedArgList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenthesizedArgList.qll
index 6057a7eb3269..637f927914dd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenthesizedArgList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenthesizedArgList.qll
@@ -33,6 +33,8 @@ module Generated {
   class ParenthesizedArgList extends Synth::TParenthesizedArgList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "ParenthesizedArgList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th type argument of this parenthesized argument list (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
index 7409a2854534..8c27fefce3e4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.PathAstNodeImpl::Impl as PathAstNodeImpl
 import codeql.rust.elements.internal.PathExprBaseImpl::Impl as PathExprBaseImpl
 
@@ -34,15 +34,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this path expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertPathExprToRaw(this).(Raw::PathExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertPathExprToRaw(this)
+              .(Raw::PathExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this path expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this path expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathMeta.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathMeta.qll
new file mode 100644
index 000000000000..bfc707da0dcf
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathMeta.qll
@@ -0,0 +1,39 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `PathMeta`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.MetaImpl::Impl as MetaImpl
+import codeql.rust.elements.Path
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `PathMeta` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::PathMeta` class directly.
+   * Use the subclass `PathMeta`, where the following predicates are available.
+   */
+  class PathMeta extends Synth::TPathMeta, MetaImpl::Meta {
+    override string getAPrimaryQlClass() { result = "PathMeta" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the path of this path meta, if it exists.
+     */
+    Path getPath() {
+      result =
+        Synth::convertPathFromRaw(Synth::convertPathMetaToRaw(this).(Raw::PathMeta).getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PatternTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PatternTypeRepr.qll
new file mode 100644
index 000000000000..fc7446d80515
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PatternTypeRepr.qll
@@ -0,0 +1,63 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `PatternTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Pat
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `PatternTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A pattern type, constraining a type to values matching a pattern. Pattern types are an
+   * experimental, mostly compiler-internal feature and cannot be written directly in stable
+   * Rust; the example below uses rust-analyzer's canonical `builtin#pattern_type` syntax:
+   * ```rust
+   * type NonZero = builtin#pattern_type(u32 is 1..);
+   * ```
+   * INTERNAL: Do not reference the `Generated::PatternTypeRepr` class directly.
+   * Use the subclass `PatternTypeRepr`, where the following predicates are available.
+   */
+  class PatternTypeRepr extends Synth::TPatternTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "PatternTypeRepr" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the pattern of this pattern type representation, if it exists.
+     */
+    Pat getPat() {
+      result =
+        Synth::convertPatFromRaw(Synth::convertPatternTypeReprToRaw(this)
+              .(Raw::PatternTypeRepr)
+              .getPat())
+    }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
+
+    /**
+     * Gets the type representation of this pattern type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertPatternTypeReprToRaw(this)
+              .(Raw::PatternTypeRepr)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PrefixExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PrefixExpr.qll
index d8c4bc290515..3d969c5fab0e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PrefixExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PrefixExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -31,9 +31,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this prefix expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertPrefixExprToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertPrefixExprToRaw(this)
               .(Raw::PrefixExpr)
               .getAttr(index))
     }
@@ -41,7 +41,7 @@ module Generated {
     /**
      * Gets any of the attrs of this prefix expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this prefix expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll
index 34c116a037e0..c9af74c2d9cd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll
@@ -29,6 +29,8 @@ module Generated {
   class PtrTypeRepr extends Synth::TPtrTypeRepr, TypeReprImpl::TypeRepr {
     override string getAPrimaryQlClass() { result = "PtrTypeRepr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Holds if this ptr type representation is const.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RangeExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RangeExpr.qll
index 06595838c222..e2aff274200b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RangeExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RangeExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -34,15 +34,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this range expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertRangeExprToRaw(this)
+              .(Raw::RangeExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this range expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this range expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
index 60ea7b90fd7d..c4b7f6f23292 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
@@ -29,6 +29,8 @@ module Generated {
   class RangePat extends Synth::TRangePat, PatImpl::Pat {
     override string getAPrimaryQlClass() { result = "RangePat" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the end of this range pattern, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index c2baf289b2e9..b133553edd3f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -165,6 +165,11 @@ module Raw {
    */
   class Addressable extends @addressable, AstNode { }
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class AnyAttr extends @any_attr, AstNode { }
+
   /**
    * INTERNAL: Do not use.
    * A list of arguments in a function or method call.
@@ -342,7 +347,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this assoc item list (0-based).
      */
-    Attr getAttr(int index) { assoc_item_list_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { assoc_item_list_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this assoc item list.
@@ -365,38 +370,6 @@ module Raw {
     )
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * An attribute applied to an item.
-   *
-   * For example:
-   * ```rust
-   * #[derive(Debug)]
-   * //^^^^^^^^^^^^^
-   * struct S;
-   * ```
-   */
-  class Attr extends @attr, AstNode {
-    override string toString() { result = "Attr" }
-
-    /**
-     * Gets the meta of this attr, if it exists.
-     */
-    Meta getMeta() { attr_meta(this, result) }
-  }
-
-  private Element getImmediateChildOfAttr(Attr e, int index) {
-    exists(int n, int nMeta |
-      n = 0 and
-      nMeta = n + 1 and
-      (
-        none()
-        or
-        index = n and result = e.getMeta()
-      )
-    )
-  }
-
   /**
    * INTERNAL: Do not use.
    * A callable. Either a `Function` or a `ClosureExpr`.
@@ -410,7 +383,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this callable (0-based).
      */
-    Attr getAttr(int index) { callable_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { callable_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this callable.
@@ -418,6 +391,11 @@ module Raw {
     int getNumberOfAttrs() { result = count(int i | callable_attrs(this, i, _)) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class CfgPredicate extends @cfg_predicate, AstNode { }
+
   /**
    * INTERNAL: Do not use.
    * The base class for expressions.
@@ -442,7 +420,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this extern item list (0-based).
      */
-    Attr getAttr(int index) { extern_item_list_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { extern_item_list_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this extern item list.
@@ -662,6 +640,31 @@ module Raw {
     )
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * An implementation restriction, limiting where a trait can be implemented. For example the `impl(crate)` restriction (an unstable feature).
+   */
+  class ImplRestriction extends @impl_restriction, AstNode {
+    override string toString() { result = "ImplRestriction" }
+
+    /**
+     * Gets the visibility inner of this impl restriction, if it exists.
+     */
+    VisibilityInner getVisibilityInner() { impl_restriction_visibility_inners(this, result) }
+  }
+
+  private Element getImmediateChildOfImplRestriction(ImplRestriction e, int index) {
+    exists(int n, int nVisibilityInner |
+      n = 0 and
+      nVisibilityInner = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getVisibilityInner()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A list of items in a module or block.
@@ -680,7 +683,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this item list (0-based).
      */
-    Attr getAttr(int index) { item_list_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { item_list_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this item list.
@@ -842,7 +845,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this match arm (0-based).
      */
-    Attr getAttr(int index) { match_arm_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { match_arm_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this match arm.
@@ -916,7 +919,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this match arm list (0-based).
      */
-    Attr getAttr(int index) { match_arm_list_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { match_arm_list_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this match arm list.
@@ -988,44 +991,34 @@ module Raw {
    * }
    * ```
    */
-  class Meta extends @meta, AstNode {
-    override string toString() { result = "Meta" }
-
-    /**
-     * Gets the expression of this meta, if it exists.
-     */
-    Expr getExpr() { meta_exprs(this, result) }
+  class Meta extends @meta, AstNode { }
 
-    /**
-     * Holds if this meta is unsafe.
-     */
-    predicate isUnsafe() { meta_is_unsafe(this) }
+  /**
+   * INTERNAL: Do not use.
+   * A mutability restriction, limiting where a field can be mutated. For example the `mut(crate)` restriction (an unstable feature).
+   */
+  class MutRestriction extends @mut_restriction, AstNode {
+    override string toString() { result = "MutRestriction" }
 
     /**
-     * Gets the path of this meta, if it exists.
+     * Holds if this mut restriction is mut.
      */
-    Path getPath() { meta_paths(this, result) }
+    predicate isMut() { mut_restriction_is_mut(this) }
 
     /**
-     * Gets the token tree of this meta, if it exists.
+     * Gets the visibility inner of this mut restriction, if it exists.
      */
-    TokenTree getTokenTree() { meta_token_trees(this, result) }
+    VisibilityInner getVisibilityInner() { mut_restriction_visibility_inners(this, result) }
   }
 
-  private Element getImmediateChildOfMeta(Meta e, int index) {
-    exists(int n, int nExpr, int nPath, int nTokenTree |
+  private Element getImmediateChildOfMutRestriction(MutRestriction e, int index) {
+    exists(int n, int nVisibilityInner |
       n = 0 and
-      nExpr = n + 1 and
-      nPath = nExpr + 1 and
-      nTokenTree = nPath + 1 and
+      nVisibilityInner = n + 1 and
       (
         none()
         or
-        index = n and result = e.getExpr()
-        or
-        index = nExpr and result = e.getPath()
-        or
-        index = nPath and result = e.getTokenTree()
+        index = n and result = e.getVisibilityInner()
       )
     )
   }
@@ -1059,7 +1052,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this parameter base (0-based).
      */
-    Attr getAttr(int index) { param_base_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { param_base_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this parameter base.
@@ -1401,7 +1394,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this source file (0-based).
      */
-    Attr getAttr(int index) { source_file_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { source_file_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this source file.
@@ -1461,7 +1454,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this statement list (0-based).
      */
-    Attr getAttr(int index) { stmt_list_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { stmt_list_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this statement list.
@@ -1521,7 +1514,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this struct expression field (0-based).
      */
-    Attr getAttr(int index) { struct_expr_field_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { struct_expr_field_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this struct expression field.
@@ -1573,7 +1566,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this struct expression field list (0-based).
      */
-    Attr getAttr(int index) { struct_expr_field_list_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { struct_expr_field_list_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this struct expression field list.
@@ -1630,7 +1623,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this struct field (0-based).
      */
-    Attr getAttr(int index) { struct_field_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { struct_field_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this struct field.
@@ -1638,15 +1631,20 @@ module Raw {
     int getNumberOfAttrs() { result = count(int i | struct_field_attrs(this, i, _)) }
 
     /**
-     * Gets the default of this struct field, if it exists.
+     * Gets the default val of this struct field, if it exists.
      */
-    Expr getDefault() { struct_field_defaults(this, result) }
+    ConstArg getDefaultVal() { struct_field_default_vals(this, result) }
 
     /**
      * Holds if this struct field is unsafe.
      */
     predicate isUnsafe() { struct_field_is_unsafe(this) }
 
+    /**
+     * Gets the mut restriction of this struct field, if it exists.
+     */
+    MutRestriction getMutRestriction() { struct_field_mut_restrictions(this, result) }
+
     /**
      * Gets the name of this struct field, if it exists.
      */
@@ -1664,11 +1662,15 @@ module Raw {
   }
 
   private Element getImmediateChildOfStructField(StructField e, int index) {
-    exists(int n, int nAttr, int nDefault, int nName, int nTypeRepr, int nVisibility |
+    exists(
+      int n, int nAttr, int nDefaultVal, int nMutRestriction, int nName, int nTypeRepr,
+      int nVisibility
+    |
       n = 0 and
       nAttr = n + e.getNumberOfAttrs() and
-      nDefault = nAttr + 1 and
-      nName = nDefault + 1 and
+      nDefaultVal = nAttr + 1 and
+      nMutRestriction = nDefaultVal + 1 and
+      nName = nMutRestriction + 1 and
       nTypeRepr = nName + 1 and
       nVisibility = nTypeRepr + 1 and
       (
@@ -1676,9 +1678,11 @@ module Raw {
         or
         result = e.getAttr(index - n)
         or
-        index = nAttr and result = e.getDefault()
+        index = nAttr and result = e.getDefaultVal()
+        or
+        index = nDefaultVal and result = e.getMutRestriction()
         or
-        index = nDefault and result = e.getName()
+        index = nMutRestriction and result = e.getName()
         or
         index = nName and result = e.getTypeRepr()
         or
@@ -1700,7 +1704,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this struct pattern field (0-based).
      */
-    Attr getAttr(int index) { struct_pat_field_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { struct_pat_field_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this struct pattern field.
@@ -1806,6 +1810,35 @@ module Raw {
 
   private Element getImmediateChildOfTokenTree(TokenTree e, int index) { none() }
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TryBlockModifier extends @try_block_modifier, AstNode {
+    override string toString() { result = "TryBlockModifier" }
+
+    /**
+     * Holds if this try block modifier is try.
+     */
+    predicate isTry() { try_block_modifier_is_try(this) }
+
+    /**
+     * Gets the type representation of this try block modifier, if it exists.
+     */
+    TypeRepr getTypeRepr() { try_block_modifier_type_reprs(this, result) }
+  }
+
+  private Element getImmediateChildOfTryBlockModifier(TryBlockModifier e, int index) {
+    exists(int n, int nTypeRepr |
+      n = 0 and
+      nTypeRepr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A field in a tuple struct or tuple variant.
@@ -1822,13 +1855,18 @@ module Raw {
     /**
      * Gets the `index`th attr of this tuple field (0-based).
      */
-    Attr getAttr(int index) { tuple_field_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { tuple_field_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this tuple field.
      */
     int getNumberOfAttrs() { result = count(int i | tuple_field_attrs(this, i, _)) }
 
+    /**
+     * Gets the mut restriction of this tuple field, if it exists.
+     */
+    MutRestriction getMutRestriction() { tuple_field_mut_restrictions(this, result) }
+
     /**
      * Gets the type representation of this tuple field, if it exists.
      */
@@ -1841,17 +1879,20 @@ module Raw {
   }
 
   private Element getImmediateChildOfTupleField(TupleField e, int index) {
-    exists(int n, int nAttr, int nTypeRepr, int nVisibility |
+    exists(int n, int nAttr, int nMutRestriction, int nTypeRepr, int nVisibility |
       n = 0 and
       nAttr = n + e.getNumberOfAttrs() and
-      nTypeRepr = nAttr + 1 and
+      nMutRestriction = nAttr + 1 and
+      nTypeRepr = nMutRestriction + 1 and
       nVisibility = nTypeRepr + 1 and
       (
         none()
         or
         result = e.getAttr(index - n)
         or
-        index = nAttr and result = e.getTypeRepr()
+        index = nAttr and result = e.getMutRestriction()
+        or
+        index = nMutRestriction and result = e.getTypeRepr()
         or
         index = nTypeRepr and result = e.getVisibility()
       )
@@ -2155,12 +2196,41 @@ module Raw {
     override string toString() { result = "Visibility" }
 
     /**
-     * Gets the path of this visibility, if it exists.
+     * Gets the visibility inner of this visibility, if it exists.
      */
-    Path getPath() { visibility_paths(this, result) }
+    VisibilityInner getVisibilityInner() { visibility_visibility_inners(this, result) }
   }
 
   private Element getImmediateChildOfVisibility(Visibility e, int index) {
+    exists(int n, int nVisibilityInner |
+      n = 0 and
+      nVisibilityInner = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getVisibilityInner()
+      )
+    )
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * The parenthesized inner part of a visibility modifier or restriction, such as the `(in path)` in `pub(in path)`, or the `(crate)` in `pub(crate)`. For example the `(in foo::bar)` in:
+   * ```rust
+   * pub(in foo::bar) struct S;
+   * //  ^^^^^^^^^^^^
+   * ```
+   */
+  class VisibilityInner extends @visibility_inner, AstNode {
+    override string toString() { result = "VisibilityInner" }
+
+    /**
+     * Gets the path of this visibility inner, if it exists.
+     */
+    Path getPath() { visibility_inner_paths(this, result) }
+  }
+
+  private Element getImmediateChildOfVisibilityInner(VisibilityInner e, int index) {
     exists(int n, int nPath |
       n = 0 and
       nPath = n + 1 and
@@ -2274,7 +2344,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this array expression internal (0-based).
      */
-    Attr getAttr(int index) { array_expr_internal_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { array_expr_internal_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this array expression internal.
@@ -2364,9 +2434,29 @@ module Raw {
    */
   class AsmClobberAbi extends @asm_clobber_abi, AsmPiece {
     override string toString() { result = "AsmClobberAbi" }
+
+    /**
+     * Gets the `index`th attr of this asm clobber abi (0-based).
+     */
+    AnyAttr getAttr(int index) { asm_clobber_abi_attrs(this, index, result) }
+
+    /**
+     * Gets the number of attrs of this asm clobber abi.
+     */
+    int getNumberOfAttrs() { result = count(int i | asm_clobber_abi_attrs(this, i, _)) }
   }
 
-  private Element getImmediateChildOfAsmClobberAbi(AsmClobberAbi e, int index) { none() }
+  private Element getImmediateChildOfAsmClobberAbi(AsmClobberAbi e, int index) {
+    exists(int n, int nAttr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+      )
+    )
+  }
 
   /**
    * INTERNAL: Do not use.
@@ -2459,6 +2549,16 @@ module Raw {
      */
     AsmOperand getAsmOperand() { asm_operand_named_asm_operands(this, result) }
 
+    /**
+     * Gets the `index`th attr of this asm operand named (0-based).
+     */
+    AnyAttr getAttr(int index) { asm_operand_named_attrs(this, index, result) }
+
+    /**
+     * Gets the number of attrs of this asm operand named.
+     */
+    int getNumberOfAttrs() { result = count(int i | asm_operand_named_attrs(this, i, _)) }
+
     /**
      * Gets the name of this asm operand named, if it exists.
      */
@@ -2466,16 +2566,19 @@ module Raw {
   }
 
   private Element getImmediateChildOfAsmOperandNamed(AsmOperandNamed e, int index) {
-    exists(int n, int nAsmOperand, int nName |
+    exists(int n, int nAsmOperand, int nAttr, int nName |
       n = 0 and
       nAsmOperand = n + 1 and
-      nName = nAsmOperand + 1 and
+      nAttr = nAsmOperand + e.getNumberOfAttrs() and
+      nName = nAttr + 1 and
       (
         none()
         or
         index = n and result = e.getAsmOperand()
         or
-        index = nAsmOperand and result = e.getName()
+        result = e.getAttr(index - nAsmOperand)
+        or
+        index = nAttr and result = e.getName()
       )
     )
   }
@@ -2503,16 +2606,29 @@ module Raw {
      * Gets the number of asm options of this asm options list.
      */
     int getNumberOfAsmOptions() { result = count(int i | asm_options_list_asm_options(this, i, _)) }
+
+    /**
+     * Gets the `index`th attr of this asm options list (0-based).
+     */
+    AnyAttr getAttr(int index) { asm_options_list_attrs(this, index, result) }
+
+    /**
+     * Gets the number of attrs of this asm options list.
+     */
+    int getNumberOfAttrs() { result = count(int i | asm_options_list_attrs(this, i, _)) }
   }
 
   private Element getImmediateChildOfAsmOptionsList(AsmOptionsList e, int index) {
-    exists(int n, int nAsmOption |
+    exists(int n, int nAsmOption, int nAttr |
       n = 0 and
       nAsmOption = n + e.getNumberOfAsmOptions() and
+      nAttr = nAsmOption + e.getNumberOfAttrs() and
       (
         none()
         or
         result = e.getAsmOption(index - n)
+        or
+        result = e.getAttr(index - nAsmOption)
       )
     )
   }
@@ -2692,6 +2808,38 @@ module Raw {
     )
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * An attribute applied to an item.
+   *
+   * For example:
+   * ```rust
+   * #[derive(Debug)]
+   * //^^^^^^^^^^^^^
+   * struct S;
+   * ```
+   */
+  class Attr extends @attr, AnyAttr {
+    override string toString() { result = "Attr" }
+
+    /**
+     * Gets the meta of this attr, if it exists.
+     */
+    Meta getMeta() { attr_meta(this, result) }
+  }
+
+  private Element getImmediateChildOfAttr(Attr e, int index) {
+    exists(int n, int nMeta |
+      n = 0 and
+      nMeta = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getMeta()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An `await` expression. For example:
@@ -2708,7 +2856,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this await expression (0-based).
      */
-    Attr getAttr(int index) { await_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { await_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this await expression.
@@ -2755,7 +2903,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this become expression (0-based).
      */
-    Attr getAttr(int index) { become_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { become_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this become expression.
@@ -2800,7 +2948,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this binary expression (0-based).
      */
-    Attr getAttr(int index) { binary_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { binary_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this binary expression.
@@ -2904,7 +3052,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this break expression (0-based).
      */
-    Attr getAttr(int index) { break_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { break_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this break expression.
@@ -2964,7 +3112,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this call expression (0-based).
      */
-    Attr getAttr(int index) { call_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { call_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this call expression.
@@ -3008,7 +3156,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this cast expression (0-based).
      */
-    Attr getAttr(int index) { cast_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { cast_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this cast expression.
@@ -3044,6 +3192,178 @@ module Raw {
     )
   }
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class CfgAtom extends @cfg_atom, CfgPredicate {
+    override string toString() { result = "CfgAtom" }
+  }
+
+  private Element getImmediateChildOfCfgAtom(CfgAtom e, int index) { none() }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class CfgAttrMeta extends @cfg_attr_meta, Meta {
+    override string toString() { result = "CfgAttrMeta" }
+
+    /**
+     * Gets the cfg predicate of this cfg attr meta, if it exists.
+     */
+    CfgPredicate getCfgPredicate() { cfg_attr_meta_cfg_predicates(this, result) }
+
+    /**
+     * Gets the `index`th meta of this cfg attr meta (0-based).
+     */
+    Meta getMeta(int index) { cfg_attr_meta_metas(this, index, result) }
+
+    /**
+     * Gets the number of metas of this cfg attr meta.
+     */
+    int getNumberOfMetas() { result = count(int i | cfg_attr_meta_metas(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfCfgAttrMeta(CfgAttrMeta e, int index) {
+    exists(int n, int nCfgPredicate, int nMeta |
+      n = 0 and
+      nCfgPredicate = n + 1 and
+      nMeta = nCfgPredicate + e.getNumberOfMetas() and
+      (
+        none()
+        or
+        index = n and result = e.getCfgPredicate()
+        or
+        result = e.getMeta(index - nCfgPredicate)
+      )
+    )
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class CfgComposite extends @cfg_composite, CfgPredicate {
+    override string toString() { result = "CfgComposite" }
+
+    /**
+     * Gets the `index`th cfg predicate of this cfg composite (0-based).
+     */
+    CfgPredicate getCfgPredicate(int index) { cfg_composite_cfg_predicates(this, index, result) }
+
+    /**
+     * Gets the number of cfg predicates of this cfg composite.
+     */
+    int getNumberOfCfgPredicates() {
+      result = count(int i | cfg_composite_cfg_predicates(this, i, _))
+    }
+  }
+
+  private Element getImmediateChildOfCfgComposite(CfgComposite e, int index) {
+    exists(int n, int nCfgPredicate |
+      n = 0 and
+      nCfgPredicate = n + e.getNumberOfCfgPredicates() and
+      (
+        none()
+        or
+        result = e.getCfgPredicate(index - n)
+      )
+    )
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class CfgMeta extends @cfg_meta, Meta {
+    override string toString() { result = "CfgMeta" }
+
+    /**
+     * Gets the cfg predicate of this cfg meta, if it exists.
+     */
+    CfgPredicate getCfgPredicate() { cfg_meta_cfg_predicates(this, result) }
+  }
+
+  private Element getImmediateChildOfCfgMeta(CfgMeta e, int index) {
+    exists(int n, int nCfgPredicate |
+      n = 0 and
+      nCfgPredicate = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getCfgPredicate()
+      )
+    )
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A configuration predicate expression resulting from expansion of a `cfg!` macro call.
+   * It has type `bool` and evaluates to whether the configuration predicate holds.
+   *
+   * Rust-analyzer expands `cfg!(...)` in expression position to its internal `builtin#cfg(...)`
+   * syntax, as illustrated below:
+   * ```rust
+   * builtin#cfg(unix);
+   * builtin#cfg(target_os = "windows");
+   * builtin#cfg(any(unix, target_os = "windows"));
+   * ```
+   */
+  class CfgPredExpr extends @cfg_pred_expr, Expr {
+    override string toString() { result = "CfgPredExpr" }
+
+    /**
+     * Gets the cfg predicate of this cfg pred expression, if it exists.
+     */
+    CfgPredicate getCfgPredicate() { cfg_pred_expr_cfg_predicates(this, result) }
+  }
+
+  private Element getImmediateChildOfCfgPredExpr(CfgPredExpr e, int index) {
+    exists(int n, int nCfgPredicate |
+      n = 0 and
+      nCfgPredicate = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getCfgPredicate()
+      )
+    )
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A configuration predicate pattern resulting from expansion of a `cfg!` macro call.
+   * It matches `true` when the configuration predicate holds and `false` otherwise.
+   *
+   * Rust-analyzer expands `cfg!(...)` in pattern position to its internal `builtin#cfg(...)`
+   * syntax, as illustrated below:
+   * ```rust
+   * match true {
+   *     builtin#cfg(unix) => (),
+   *     builtin#cfg(target_os = "windows") => (),
+   *     builtin#cfg(any(unix, target_os = "windows")) => (),
+   *     _ => (),
+   * };
+   * ```
+   */
+  class CfgPredPat extends @cfg_pred_pat, Pat {
+    override string toString() { result = "CfgPredPat" }
+
+    /**
+     * Gets the cfg predicate of this cfg pred pattern, if it exists.
+     */
+    CfgPredicate getCfgPredicate() { cfg_pred_pat_cfg_predicates(this, result) }
+  }
+
+  private Element getImmediateChildOfCfgPredPat(CfgPredPat e, int index) {
+    exists(int n, int nCfgPredicate |
+      n = 0 and
+      nCfgPredicate = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getCfgPredicate()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A closure expression. For example:
@@ -3134,6 +3454,7 @@ module Raw {
    * ```rust
    * // this is a comment
    * /// This is a doc comment
+   * fn documented() {}
    * ```
    */
   class Comment extends @comment, Token {
@@ -3235,7 +3556,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this const parameter (0-based).
      */
-    Attr getAttr(int index) { const_param_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { const_param_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this const parameter.
@@ -3308,7 +3629,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this continue expression (0-based).
      */
-    Attr getAttr(int index) { continue_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { continue_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this continue expression.
@@ -3336,6 +3657,55 @@ module Raw {
     )
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A deref pattern, matching the value behind a smart pointer. This is an experimental
+   * Rust feature that cannot be written directly in stable Rust; the example below uses
+   * rust-analyzer's canonical `builtin#deref` syntax for such patterns:
+   * ```rust
+   * match x {
+   *     builtin#deref(y) => y,
+   *     _ => 0,
+   * };
+   * ```
+   */
+  class DerefPat extends @deref_pat, Pat {
+    override string toString() { result = "DerefPat" }
+
+    /**
+     * Gets the pattern of this deref pattern, if it exists.
+     */
+    Pat getPat() { deref_pat_pats(this, result) }
+  }
+
+  private Element getImmediateChildOfDerefPat(DerefPat e, int index) {
+    exists(int n, int nPat |
+      n = 0 and
+      nPat = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPat()
+      )
+    )
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A documentation comment.
+   *
+   * For example:
+   * ```rust
+   * /// Documents `documented`.
+   * fn documented() {}
+   * ```
+   */
+  class DocComment extends @doc_comment, AnyAttr {
+    override string toString() { result = "DocComment" }
+  }
+
+  private Element getImmediateChildOfDocComment(DocComment e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * A dynamic trait object type.
@@ -3410,7 +3780,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this field expression (0-based).
      */
-    Attr getAttr(int index) { field_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { field_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this field expression.
@@ -3574,7 +3944,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this format arguments expression (0-based).
      */
-    Attr getAttr(int index) { format_args_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { format_args_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this format arguments expression.
@@ -3628,7 +3998,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this ident pattern (0-based).
      */
-    Attr getAttr(int index) { ident_pat_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { ident_pat_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this ident pattern.
@@ -3696,7 +4066,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this if expression (0-based).
      */
-    Attr getAttr(int index) { if_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { if_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this if expression.
@@ -3771,6 +4141,19 @@ module Raw {
     )
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * An expression produced by the built-in `include_bytes!` macro, embedding the contents of a file as a byte array. For example:
+   * ```rust
+   * let data = include_bytes!("data.bin");
+   * ```
+   */
+  class IncludeBytesExpr extends @include_bytes_expr, Expr {
+    override string toString() { result = "IncludeBytesExpr" }
+  }
+
+  private Element getImmediateChildOfIncludeBytesExpr(IncludeBytesExpr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * An index expression. For example:
@@ -3785,7 +4168,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this index expression (0-based).
      */
-    Attr getAttr(int index) { index_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { index_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this index expression.
@@ -3855,6 +4238,38 @@ module Raw {
     MacroItems getAttributeMacroExpansion() { item_attribute_macro_expansions(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class KeyValueMeta extends @key_value_meta, Meta {
+    override string toString() { result = "KeyValueMeta" }
+
+    /**
+     * Gets the expression of this key value meta, if it exists.
+     */
+    Expr getExpr() { key_value_meta_exprs(this, result) }
+
+    /**
+     * Gets the path of this key value meta, if it exists.
+     */
+    Path getPath() { key_value_meta_paths(this, result) }
+  }
+
+  private Element getImmediateChildOfKeyValueMeta(KeyValueMeta e, int index) {
+    exists(int n, int nExpr, int nPath |
+      n = 0 and
+      nExpr = n + 1 and
+      nPath = nExpr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getExpr()
+        or
+        index = nExpr and result = e.getPath()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * The base class for expressions that can be labeled (`LoopExpr`, `ForExpr`, `WhileExpr` or `BlockExpr`).
@@ -3881,7 +4296,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this let expression (0-based).
      */
-    Attr getAttr(int index) { let_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { let_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this let expression.
@@ -3937,7 +4352,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this let statement (0-based).
      */
-    Attr getAttr(int index) { let_stmt_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { let_stmt_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this let statement.
@@ -4057,7 +4472,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this lifetime parameter (0-based).
      */
-    Attr getAttr(int index) { lifetime_param_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { lifetime_param_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this lifetime parameter.
@@ -4113,7 +4528,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this literal expression (0-based).
      */
-    Attr getAttr(int index) { literal_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { literal_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this literal expression.
@@ -4181,6 +4596,16 @@ module Raw {
   class MacroExpr extends @macro_expr, Expr {
     override string toString() { result = "MacroExpr" }
 
+    /**
+     * Gets the `index`th attr of this macro expression (0-based).
+     */
+    AnyAttr getAttr(int index) { macro_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the number of attrs of this macro expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | macro_expr_attrs(this, i, _)) }
+
     /**
      * Gets the macro call of this macro expression, if it exists.
      */
@@ -4188,13 +4613,16 @@ module Raw {
   }
 
   private Element getImmediateChildOfMacroExpr(MacroExpr e, int index) {
-    exists(int n, int nMacroCall |
+    exists(int n, int nAttr, int nMacroCall |
       n = 0 and
-      nMacroCall = n + 1 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nMacroCall = nAttr + 1 and
       (
         none()
         or
-        index = n and result = e.getMacroCall()
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getMacroCall()
       )
     )
   }
@@ -4294,7 +4722,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this match expression (0-based).
      */
-    Attr getAttr(int index) { match_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { match_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this match expression.
@@ -4353,7 +4781,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this method call expression (0-based).
      */
-    Attr getAttr(int index) { method_call_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { method_call_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this method call expression.
@@ -4437,6 +4865,22 @@ module Raw {
 
   private Element getImmediateChildOfNeverTypeRepr(NeverTypeRepr e, int index) { none() }
 
+  /**
+   * INTERNAL: Do not use.
+   * The `!null` pattern used in a pattern type to denote a non-null value. Pattern types
+   * are an experimental, mostly compiler-internal feature (used in the standard library for
+   * types such as `NonZero` and `NonNull`) and cannot be written directly in stable Rust;
+   * the example below uses rust-analyzer's canonical `builtin#pattern_type` syntax:
+   * ```rust
+   * type NonNull = builtin#pattern_type(*const () is !null);
+   * ```
+   */
+  class NotNull extends @not_null, Pat {
+    override string toString() { result = "NotNull" }
+  }
+
+  private Element getImmediateChildOfNotNull(NotNull e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    *  An `offset_of` expression. For example:
@@ -4450,7 +4894,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this offset of expression (0-based).
      */
-    Attr getAttr(int index) { offset_of_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { offset_of_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this offset of expression.
@@ -4564,115 +5008,65 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A parenthesized expression.
+   * A parenthesized type.
    *
    * For example:
    * ```rust
-   * (x + y)
+   * let x: (i32);
+   * //     ^^^^^
    * ```
    */
-  class ParenExpr extends @paren_expr, Expr {
-    override string toString() { result = "ParenExpr" }
-
-    /**
-     * Gets the `index`th attr of this paren expression (0-based).
-     */
-    Attr getAttr(int index) { paren_expr_attrs(this, index, result) }
-
-    /**
-     * Gets the number of attrs of this paren expression.
-     */
-    int getNumberOfAttrs() { result = count(int i | paren_expr_attrs(this, i, _)) }
+  class ParenTypeRepr extends @paren_type_repr, TypeRepr {
+    override string toString() { result = "ParenTypeRepr" }
 
     /**
-     * Gets the expression of this paren expression, if it exists.
+     * Gets the type representation of this paren type representation, if it exists.
      */
-    Expr getExpr() { paren_expr_exprs(this, result) }
+    TypeRepr getTypeRepr() { paren_type_repr_type_reprs(this, result) }
   }
 
-  private Element getImmediateChildOfParenExpr(ParenExpr e, int index) {
-    exists(int n, int nAttr, int nExpr |
+  private Element getImmediateChildOfParenTypeRepr(ParenTypeRepr e, int index) {
+    exists(int n, int nTypeRepr |
       n = 0 and
-      nAttr = n + e.getNumberOfAttrs() and
-      nExpr = nAttr + 1 and
+      nTypeRepr = n + 1 and
       (
         none()
         or
-        result = e.getAttr(index - n)
-        or
-        index = nAttr and result = e.getExpr()
+        index = n and result = e.getTypeRepr()
       )
     )
   }
 
   /**
    * INTERNAL: Do not use.
-   * A parenthesized pattern.
-   *
-   * For example:
-   * ```rust
-   * let (x) = 1;
-   * //  ^^^
-   * ```
+   * A path expression or a variable access in a formatting template. See `PathExpr` and `FormatTemplateVariableAccess` for further details.
    */
-  class ParenPat extends @paren_pat, Pat {
-    override string toString() { result = "ParenPat" }
-
-    /**
-     * Gets the pattern of this paren pattern, if it exists.
-     */
-    Pat getPat() { paren_pat_pats(this, result) }
-  }
-
-  private Element getImmediateChildOfParenPat(ParenPat e, int index) {
-    exists(int n, int nPat |
-      n = 0 and
-      nPat = n + 1 and
-      (
-        none()
-        or
-        index = n and result = e.getPat()
-      )
-    )
-  }
+  class PathExprBase extends @path_expr_base, Expr { }
 
   /**
    * INTERNAL: Do not use.
-   * A parenthesized type.
-   *
-   * For example:
-   * ```rust
-   * let x: (i32);
-   * //     ^^^^^
-   * ```
    */
-  class ParenTypeRepr extends @paren_type_repr, TypeRepr {
-    override string toString() { result = "ParenTypeRepr" }
+  class PathMeta extends @path_meta, Meta {
+    override string toString() { result = "PathMeta" }
 
     /**
-     * Gets the type representation of this paren type representation, if it exists.
+     * Gets the path of this path meta, if it exists.
      */
-    TypeRepr getTypeRepr() { paren_type_repr_type_reprs(this, result) }
+    Path getPath() { path_meta_paths(this, result) }
   }
 
-  private Element getImmediateChildOfParenTypeRepr(ParenTypeRepr e, int index) {
-    exists(int n, int nTypeRepr |
+  private Element getImmediateChildOfPathMeta(PathMeta e, int index) {
+    exists(int n, int nPath |
       n = 0 and
-      nTypeRepr = n + 1 and
+      nPath = n + 1 and
       (
         none()
         or
-        index = n and result = e.getTypeRepr()
+        index = n and result = e.getPath()
       )
     )
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A path expression or a variable access in a formatting template. See `PathExpr` and `FormatTemplateVariableAccess` for further details.
-   */
-  class PathExprBase extends @path_expr_base, Expr { }
-
   /**
    * INTERNAL: Do not use.
    * A path pattern. For example:
@@ -4728,6 +5122,44 @@ module Raw {
     )
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A pattern type, constraining a type to values matching a pattern. Pattern types are an
+   * experimental, mostly compiler-internal feature and cannot be written directly in stable
+   * Rust; the example below uses rust-analyzer's canonical `builtin#pattern_type` syntax:
+   * ```rust
+   * type NonZero = builtin#pattern_type(u32 is 1..);
+   * ```
+   */
+  class PatternTypeRepr extends @pattern_type_repr, TypeRepr {
+    override string toString() { result = "PatternTypeRepr" }
+
+    /**
+     * Gets the pattern of this pattern type representation, if it exists.
+     */
+    Pat getPat() { pattern_type_repr_pats(this, result) }
+
+    /**
+     * Gets the type representation of this pattern type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() { pattern_type_repr_type_reprs(this, result) }
+  }
+
+  private Element getImmediateChildOfPatternTypeRepr(PatternTypeRepr e, int index) {
+    exists(int n, int nPat, int nTypeRepr |
+      n = 0 and
+      nPat = n + 1 and
+      nTypeRepr = nPat + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPat()
+        or
+        index = nPat and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A unary operation expression. For example:
@@ -4743,7 +5175,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this prefix expression (0-based).
      */
-    Attr getAttr(int index) { prefix_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { prefix_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this prefix expression.
@@ -4836,7 +5268,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this range expression (0-based).
      */
-    Attr getAttr(int index) { range_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { range_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this range expression.
@@ -4938,7 +5370,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this reference expression (0-based).
      */
-    Attr getAttr(int index) { ref_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { ref_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this reference expression.
@@ -5078,7 +5510,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this rest pattern (0-based).
      */
-    Attr getAttr(int index) { rest_pat_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { rest_pat_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this rest pattern.
@@ -5118,7 +5550,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this return expression (0-based).
      */
-    Attr getAttr(int index) { return_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { return_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this return expression.
@@ -5286,6 +5718,16 @@ module Raw {
   class StructExpr extends @struct_expr, Expr, PathAstNode {
     override string toString() { result = "StructExpr" }
 
+    /**
+     * Gets the `index`th attr of this struct expression (0-based).
+     */
+    AnyAttr getAttr(int index) { struct_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the number of attrs of this struct expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | struct_expr_attrs(this, i, _)) }
+
     /**
      * Gets the struct expression field list of this struct expression, if it exists.
      */
@@ -5295,16 +5737,19 @@ module Raw {
   }
 
   private Element getImmediateChildOfStructExpr(StructExpr e, int index) {
-    exists(int n, int nPath, int nStructExprFieldList |
+    exists(int n, int nPath, int nAttr, int nStructExprFieldList |
       n = 0 and
       nPath = n + 1 and
-      nStructExprFieldList = nPath + 1 and
+      nAttr = nPath + e.getNumberOfAttrs() and
+      nStructExprFieldList = nAttr + 1 and
       (
         none()
         or
         index = n and result = e.getPath()
         or
-        index = nPath and result = e.getStructExprFieldList()
+        result = e.getAttr(index - nPath)
+        or
+        index = nAttr and result = e.getStructExprFieldList()
       )
     )
   }
@@ -5379,6 +5824,38 @@ module Raw {
     )
   }
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TokenTreeMeta extends @token_tree_meta, Meta {
+    override string toString() { result = "TokenTreeMeta" }
+
+    /**
+     * Gets the path of this token tree meta, if it exists.
+     */
+    Path getPath() { token_tree_meta_paths(this, result) }
+
+    /**
+     * Gets the token tree of this token tree meta, if it exists.
+     */
+    TokenTree getTokenTree() { token_tree_meta_token_trees(this, result) }
+  }
+
+  private Element getImmediateChildOfTokenTreeMeta(TokenTreeMeta e, int index) {
+    exists(int n, int nPath, int nTokenTree |
+      n = 0 and
+      nPath = n + 1 and
+      nTokenTree = nPath + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath()
+        or
+        index = nPath and result = e.getTokenTree()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A try expression using the `?` operator.
@@ -5395,7 +5872,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this try expression (0-based).
      */
-    Attr getAttr(int index) { try_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { try_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this try expression.
@@ -5438,7 +5915,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this tuple expression (0-based).
      */
-    Attr getAttr(int index) { tuple_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { tuple_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this tuple expression.
@@ -5664,7 +6141,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this type parameter (0-based).
      */
-    Attr getAttr(int index) { type_param_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { type_param_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this type parameter.
@@ -5721,7 +6198,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this underscore expression (0-based).
      */
-    Attr getAttr(int index) { underscore_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { underscore_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this underscore expression.
@@ -5741,6 +6218,35 @@ module Raw {
     )
   }
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class UnsafeMeta extends @unsafe_meta, Meta {
+    override string toString() { result = "UnsafeMeta" }
+
+    /**
+     * Holds if this unsafe meta is unsafe.
+     */
+    predicate isUnsafe() { unsafe_meta_is_unsafe(this) }
+
+    /**
+     * Gets the meta of this unsafe meta, if it exists.
+     */
+    Meta getMeta() { unsafe_meta_meta(this, result) }
+  }
+
+  private Element getImmediateChildOfUnsafeMeta(UnsafeMeta e, int index) {
+    exists(int n, int nMeta |
+      n = 0 and
+      nMeta = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getMeta()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A variant in an enum declaration.
@@ -5757,7 +6263,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this variant (0-based).
      */
-    Attr getAttr(int index) { variant_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { variant_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this variant.
@@ -5765,9 +6271,9 @@ module Raw {
     int getNumberOfAttrs() { result = count(int i | variant_attrs(this, i, _)) }
 
     /**
-     * Gets the discriminant of this variant, if it exists.
+     * Gets the const argument of this variant, if it exists.
      */
-    Expr getDiscriminant() { variant_discriminants(this, result) }
+    ConstArg getConstArg() { variant_const_args(this, result) }
 
     /**
      * Gets the field list of this variant, if it exists.
@@ -5786,11 +6292,11 @@ module Raw {
   }
 
   private Element getImmediateChildOfVariant(Variant e, int index) {
-    exists(int n, int nAttr, int nDiscriminant, int nFieldList, int nName, int nVisibility |
+    exists(int n, int nAttr, int nConstArg, int nFieldList, int nName, int nVisibility |
       n = 0 and
       nAttr = n + e.getNumberOfAttrs() and
-      nDiscriminant = nAttr + 1 and
-      nFieldList = nDiscriminant + 1 and
+      nConstArg = nAttr + 1 and
+      nFieldList = nConstArg + 1 and
       nName = nFieldList + 1 and
       nVisibility = nName + 1 and
       (
@@ -5798,9 +6304,9 @@ module Raw {
         or
         result = e.getAttr(index - n)
         or
-        index = nAttr and result = e.getDiscriminant()
+        index = nAttr and result = e.getConstArg()
         or
-        index = nDiscriminant and result = e.getFieldList()
+        index = nConstArg and result = e.getFieldList()
         or
         index = nFieldList and result = e.getName()
         or
@@ -5837,7 +6343,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this yeet expression (0-based).
      */
-    Attr getAttr(int index) { yeet_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { yeet_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this yeet expression.
@@ -5881,7 +6387,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this yield expression (0-based).
      */
-    Attr getAttr(int index) { yield_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { yield_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this yield expression.
@@ -5935,7 +6441,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this asm expression (0-based).
      */
-    Attr getAttr(int index) { asm_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { asm_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this asm expression.
@@ -6007,7 +6513,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this block expression (0-based).
      */
-    Attr getAttr(int index) { block_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { block_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this block expression.
@@ -6034,11 +6540,6 @@ module Raw {
      */
     predicate isMove() { block_expr_is_move(this) }
 
-    /**
-     * Holds if this block expression is try.
-     */
-    predicate isTry() { block_expr_is_try(this) }
-
     /**
      * Holds if this block expression is unsafe.
      */
@@ -6048,14 +6549,20 @@ module Raw {
      * Gets the statement list of this block expression, if it exists.
      */
     StmtList getStmtList() { block_expr_stmt_lists(this, result) }
+
+    /**
+     * Gets the try block modifier of this block expression, if it exists.
+     */
+    TryBlockModifier getTryBlockModifier() { block_expr_try_block_modifiers(this, result) }
   }
 
   private Element getImmediateChildOfBlockExpr(BlockExpr e, int index) {
-    exists(int n, int nLabel, int nAttr, int nStmtList |
+    exists(int n, int nLabel, int nAttr, int nStmtList, int nTryBlockModifier |
       n = 0 and
       nLabel = n + 1 and
       nAttr = nLabel + e.getNumberOfAttrs() and
       nStmtList = nAttr + 1 and
+      nTryBlockModifier = nStmtList + 1 and
       (
         none()
         or
@@ -6064,6 +6571,8 @@ module Raw {
         result = e.getAttr(index - nLabel)
         or
         index = nAttr and result = e.getStmtList()
+        or
+        index = nStmtList and result = e.getTryBlockModifier()
       )
     )
   }
@@ -6090,7 +6599,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this extern block (0-based).
      */
-    Attr getAttr(int index) { extern_block_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { extern_block_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this extern block.
@@ -6144,7 +6653,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this extern crate (0-based).
      */
-    Attr getAttr(int index) { extern_crate_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { extern_crate_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this extern crate.
@@ -6229,7 +6738,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this impl (0-based).
      */
-    Attr getAttr(int index) { impl_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { impl_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this impl.
@@ -6346,7 +6855,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this macro def (0-based).
      */
-    Attr getAttr(int index) { macro_def_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { macro_def_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this macro def.
@@ -6416,7 +6925,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this macro rules (0-based).
      */
-    Attr getAttr(int index) { macro_rules_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { macro_rules_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this macro rules.
@@ -6483,7 +6992,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this module (0-based).
      */
-    Attr getAttr(int index) { module_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { module_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this module.
@@ -6548,7 +7057,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this path expression (0-based).
      */
-    Attr getAttr(int index) { path_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { path_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this path expression.
@@ -6595,7 +7104,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this trait (0-based).
      */
-    Attr getAttr(int index) { trait_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { trait_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this trait.
@@ -6607,6 +7116,11 @@ module Raw {
      */
     GenericParamList getGenericParamList() { trait_generic_param_lists(this, result) }
 
+    /**
+     * Gets the impl restriction of this trait, if it exists.
+     */
+    ImplRestriction getImplRestriction() { trait_impl_restrictions(this, result) }
+
     /**
      * Holds if this trait is auto.
      */
@@ -6641,14 +7155,15 @@ module Raw {
   private Element getImmediateChildOfTrait(Trait e, int index) {
     exists(
       int n, int nAttributeMacroExpansion, int nAssocItemList, int nAttr, int nGenericParamList,
-      int nName, int nTypeBoundList, int nVisibility, int nWhereClause
+      int nImplRestriction, int nName, int nTypeBoundList, int nVisibility, int nWhereClause
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
       nAssocItemList = nAttributeMacroExpansion + 1 and
       nAttr = nAssocItemList + e.getNumberOfAttrs() and
       nGenericParamList = nAttr + 1 and
-      nName = nGenericParamList + 1 and
+      nImplRestriction = nGenericParamList + 1 and
+      nName = nImplRestriction + 1 and
       nTypeBoundList = nName + 1 and
       nVisibility = nTypeBoundList + 1 and
       nWhereClause = nVisibility + 1 and
@@ -6663,88 +7178,9 @@ module Raw {
         or
         index = nAttr and result = e.getGenericParamList()
         or
-        index = nGenericParamList and result = e.getName()
-        or
-        index = nName and result = e.getTypeBoundList()
-        or
-        index = nTypeBoundList and result = e.getVisibility()
-        or
-        index = nVisibility and result = e.getWhereClause()
-      )
-    )
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A trait alias.
-   *
-   * For example:
-   * ```rust
-   * trait Foo = Bar + Baz;
-   * ```
-   */
-  class TraitAlias extends @trait_alias, Item {
-    override string toString() { result = "TraitAlias" }
-
-    /**
-     * Gets the `index`th attr of this trait alias (0-based).
-     */
-    Attr getAttr(int index) { trait_alias_attrs(this, index, result) }
-
-    /**
-     * Gets the number of attrs of this trait alias.
-     */
-    int getNumberOfAttrs() { result = count(int i | trait_alias_attrs(this, i, _)) }
-
-    /**
-     * Gets the generic parameter list of this trait alias, if it exists.
-     */
-    GenericParamList getGenericParamList() { trait_alias_generic_param_lists(this, result) }
-
-    /**
-     * Gets the name of this trait alias, if it exists.
-     */
-    Name getName() { trait_alias_names(this, result) }
-
-    /**
-     * Gets the type bound list of this trait alias, if it exists.
-     */
-    TypeBoundList getTypeBoundList() { trait_alias_type_bound_lists(this, result) }
-
-    /**
-     * Gets the visibility of this trait alias, if it exists.
-     */
-    Visibility getVisibility() { trait_alias_visibilities(this, result) }
-
-    /**
-     * Gets the where clause of this trait alias, if it exists.
-     */
-    WhereClause getWhereClause() { trait_alias_where_clauses(this, result) }
-  }
-
-  private Element getImmediateChildOfTraitAlias(TraitAlias e, int index) {
-    exists(
-      int n, int nAttributeMacroExpansion, int nAttr, int nGenericParamList, int nName,
-      int nTypeBoundList, int nVisibility, int nWhereClause
-    |
-      n = 0 and
-      nAttributeMacroExpansion = n + 1 and
-      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
-      nGenericParamList = nAttr + 1 and
-      nName = nGenericParamList + 1 and
-      nTypeBoundList = nName + 1 and
-      nVisibility = nTypeBoundList + 1 and
-      nWhereClause = nVisibility + 1 and
-      (
-        none()
-        or
-        index = n and result = e.getAttributeMacroExpansion()
-        or
-        result = e.getAttr(index - nAttributeMacroExpansion)
-        or
-        index = nAttr and result = e.getGenericParamList()
+        index = nGenericParamList and result = e.getImplRestriction()
         or
-        index = nGenericParamList and result = e.getName()
+        index = nImplRestriction and result = e.getName()
         or
         index = nName and result = e.getTypeBoundList()
         or
@@ -6777,7 +7213,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this type item (0-based).
      */
-    Attr getAttr(int index) { type_item_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { type_item_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this type item.
@@ -6818,7 +7254,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this use (0-based).
      */
-    Attr getAttr(int index) { use_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { use_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this use.
@@ -6872,7 +7308,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this const (0-based).
      */
-    Attr getAttr(int index) { const_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { const_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this const.
@@ -7035,7 +7471,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this for expression (0-based).
      */
-    Attr getAttr(int index) { for_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { for_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this for expression.
@@ -7235,7 +7671,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this loop expression (0-based).
      */
-    Attr getAttr(int index) { loop_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { loop_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this loop expression.
@@ -7276,7 +7712,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this macro call (0-based).
      */
-    Attr getAttr(int index) { macro_call_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { macro_call_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this macro call.
@@ -7341,7 +7777,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this static (0-based).
      */
-    Attr getAttr(int index) { static_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { static_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this static.
@@ -7487,7 +7923,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this type alias (0-based).
      */
-    Attr getAttr(int index) { type_alias_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { type_alias_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this type alias.
@@ -7637,7 +8073,7 @@ module Raw {
     /**
      * Gets the `index`th attr of this while expression (0-based).
      */
-    Attr getAttr(int index) { while_expr_attrs(this, index, result) }
+    AnyAttr getAttr(int index) { while_expr_attrs(this, index, result) }
 
     /**
      * Gets the number of attrs of this while expression.
@@ -7704,8 +8140,6 @@ module Raw {
     or
     result = getImmediateChildOfAssocItemList(e, index)
     or
-    result = getImmediateChildOfAttr(e, index)
-    or
     result = getImmediateChildOfExternItemList(e, index)
     or
     result = getImmediateChildOfForBinder(e, index)
@@ -7716,6 +8150,8 @@ module Raw {
     or
     result = getImmediateChildOfGenericParamList(e, index)
     or
+    result = getImmediateChildOfImplRestriction(e, index)
+    or
     result = getImmediateChildOfItemList(e, index)
     or
     result = getImmediateChildOfLabel(e, index)
@@ -7730,7 +8166,7 @@ module Raw {
     or
     result = getImmediateChildOfMatchGuard(e, index)
     or
-    result = getImmediateChildOfMeta(e, index)
+    result = getImmediateChildOfMutRestriction(e, index)
     or
     result = getImmediateChildOfName(e, index)
     or
@@ -7764,6 +8200,8 @@ module Raw {
     or
     result = getImmediateChildOfTokenTree(e, index)
     or
+    result = getImmediateChildOfTryBlockModifier(e, index)
+    or
     result = getImmediateChildOfTupleField(e, index)
     or
     result = getImmediateChildOfTypeBound(e, index)
@@ -7780,6 +8218,8 @@ module Raw {
     or
     result = getImmediateChildOfVisibility(e, index)
     or
+    result = getImmediateChildOfVisibilityInner(e, index)
+    or
     result = getImmediateChildOfWhereClause(e, index)
     or
     result = getImmediateChildOfWherePred(e, index)
@@ -7804,6 +8244,8 @@ module Raw {
     or
     result = getImmediateChildOfAssocTypeArg(e, index)
     or
+    result = getImmediateChildOfAttr(e, index)
+    or
     result = getImmediateChildOfAwaitExpr(e, index)
     or
     result = getImmediateChildOfBecomeExpr(e, index)
@@ -7818,6 +8260,18 @@ module Raw {
     or
     result = getImmediateChildOfCastExpr(e, index)
     or
+    result = getImmediateChildOfCfgAtom(e, index)
+    or
+    result = getImmediateChildOfCfgAttrMeta(e, index)
+    or
+    result = getImmediateChildOfCfgComposite(e, index)
+    or
+    result = getImmediateChildOfCfgMeta(e, index)
+    or
+    result = getImmediateChildOfCfgPredExpr(e, index)
+    or
+    result = getImmediateChildOfCfgPredPat(e, index)
+    or
     result = getImmediateChildOfClosureExpr(e, index)
     or
     result = getImmediateChildOfComment(e, index)
@@ -7830,6 +8284,10 @@ module Raw {
     or
     result = getImmediateChildOfContinueExpr(e, index)
     or
+    result = getImmediateChildOfDerefPat(e, index)
+    or
+    result = getImmediateChildOfDocComment(e, index)
+    or
     result = getImmediateChildOfDynTraitTypeRepr(e, index)
     or
     result = getImmediateChildOfExprStmt(e, index)
@@ -7848,10 +8306,14 @@ module Raw {
     or
     result = getImmediateChildOfImplTraitTypeRepr(e, index)
     or
+    result = getImmediateChildOfIncludeBytesExpr(e, index)
+    or
     result = getImmediateChildOfIndexExpr(e, index)
     or
     result = getImmediateChildOfInferTypeRepr(e, index)
     or
+    result = getImmediateChildOfKeyValueMeta(e, index)
+    or
     result = getImmediateChildOfLetExpr(e, index)
     or
     result = getImmediateChildOfLetStmt(e, index)
@@ -7880,22 +8342,24 @@ module Raw {
     or
     result = getImmediateChildOfNeverTypeRepr(e, index)
     or
+    result = getImmediateChildOfNotNull(e, index)
+    or
     result = getImmediateChildOfOffsetOfExpr(e, index)
     or
     result = getImmediateChildOfOrPat(e, index)
     or
     result = getImmediateChildOfParam(e, index)
     or
-    result = getImmediateChildOfParenExpr(e, index)
-    or
-    result = getImmediateChildOfParenPat(e, index)
-    or
     result = getImmediateChildOfParenTypeRepr(e, index)
     or
+    result = getImmediateChildOfPathMeta(e, index)
+    or
     result = getImmediateChildOfPathPat(e, index)
     or
     result = getImmediateChildOfPathTypeRepr(e, index)
     or
+    result = getImmediateChildOfPatternTypeRepr(e, index)
+    or
     result = getImmediateChildOfPrefixExpr(e, index)
     or
     result = getImmediateChildOfPtrTypeRepr(e, index)
@@ -7926,6 +8390,8 @@ module Raw {
     or
     result = getImmediateChildOfStructPat(e, index)
     or
+    result = getImmediateChildOfTokenTreeMeta(e, index)
+    or
     result = getImmediateChildOfTryExpr(e, index)
     or
     result = getImmediateChildOfTupleExpr(e, index)
@@ -7944,6 +8410,8 @@ module Raw {
     or
     result = getImmediateChildOfUnderscoreExpr(e, index)
     or
+    result = getImmediateChildOfUnsafeMeta(e, index)
+    or
     result = getImmediateChildOfVariant(e, index)
     or
     result = getImmediateChildOfWildcardPat(e, index)
@@ -7972,8 +8440,6 @@ module Raw {
     or
     result = getImmediateChildOfTrait(e, index)
     or
-    result = getImmediateChildOfTraitAlias(e, index)
-    or
     result = getImmediateChildOfUse(e, index)
     or
     result = getImmediateChildOfConst(e, index)
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll
index 4eef67e3ed17..2958a3cb5d5e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -32,15 +32,15 @@ module Generated {
     /**
      * Gets the `index`th attr of this reference expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertRefExprToRaw(this).(Raw::RefExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertRefExprToRaw(this).(Raw::RefExpr).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this reference expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this reference expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll
index b770a268431d..df8567ceb556 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll
@@ -30,6 +30,8 @@ module Generated {
   class RefTypeRepr extends Synth::TRefTypeRepr, TypeReprImpl::TypeRepr {
     override string getAPrimaryQlClass() { result = "RefTypeRepr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Holds if this reference type representation is mut.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Rename.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Rename.qll
index 31dfe0d307cc..2b477678488a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Rename.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Rename.qll
@@ -28,6 +28,8 @@ module Generated {
   class Rename extends Synth::TRename, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "Rename" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the name of this rename, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll
index 0134255b8285..2c90825335ed 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
 
 /**
@@ -31,15 +31,15 @@ module Generated {
     /**
      * Gets the `index`th attr of this rest pattern (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertRestPatToRaw(this).(Raw::RestPat).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertRestPatToRaw(this).(Raw::RestPat).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this rest pattern.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this rest pattern.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll
index 1589d16f20d6..d54da0d2f4a3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll
@@ -28,6 +28,8 @@ module Generated {
   class RetTypeRepr extends Synth::TRetTypeRepr, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "RetTypeRepr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the type representation of this ret type representation, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnExpr.qll
index 184b14b8fcf0..5d74d2b9f1ac 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -36,9 +36,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this return expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertReturnExprToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertReturnExprToRaw(this)
               .(Raw::ReturnExpr)
               .getAttr(index))
     }
@@ -46,7 +46,7 @@ module Generated {
     /**
      * Gets any of the attrs of this return expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this return expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll
index 9b8a30c800ad..fdf9167b2e59 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll
@@ -36,5 +36,7 @@ module Generated {
    */
   class ReturnTypeSyntax extends Synth::TReturnTypeSyntax, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "ReturnTypeSyntax" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
index 1092de3cc08c..ec408668e296 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
@@ -33,6 +33,8 @@ module Generated {
   class SelfParam extends Synth::TSelfParam, ParamBaseImpl::ParamBase {
     override string getAPrimaryQlClass() { result = "SelfParam" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Holds if this self parameter is reference.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
index 2a2521248722..b11fa654b956 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
@@ -29,6 +29,8 @@ module Generated {
   class SlicePat extends Synth::TSlicePat, PatImpl::Pat {
     override string getAPrimaryQlClass() { result = "SlicePat" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th pattern of this slice pattern (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll
index 176b4e699e43..3c772c0f04bd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll
@@ -28,6 +28,8 @@ module Generated {
   class SliceTypeRepr extends Synth::TSliceTypeRepr, TypeReprImpl::TypeRepr {
     override string getAPrimaryQlClass() { result = "SliceTypeRepr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the type representation of this slice type representation, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SourceFile.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SourceFile.qll
index 64854b410cad..6369b1dc8714 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SourceFile.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SourceFile.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Item
 
 /**
@@ -29,12 +29,14 @@ module Generated {
   class SourceFile extends Synth::TSourceFile, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "SourceFile" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this source file (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertSourceFileToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertSourceFileToRaw(this)
               .(Raw::SourceFile)
               .getAttr(index))
     }
@@ -42,7 +44,7 @@ module Generated {
     /**
      * Gets any of the attrs of this source file.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this source file.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
index 075b48c42e31..fec03b164e38 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
 import codeql.rust.elements.Name
@@ -34,15 +34,15 @@ module Generated {
     /**
      * Gets the `index`th attr of this static (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this static.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this static.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll
index 26a7f1f363a4..8ad2c09784ac 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Stmt
 
@@ -35,18 +35,22 @@ module Generated {
   class StmtList extends Synth::TStmtList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "StmtList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this statement list (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertStmtListToRaw(this).(Raw::StmtList).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertStmtListToRaw(this)
+              .(Raw::StmtList)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this statement list.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this statement list.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll
index c9fbacd72686..4753f0063e10 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.internal.PathAstNodeImpl::Impl as PathAstNodeImpl
 import codeql.rust.elements.StructExprFieldList
@@ -29,6 +30,26 @@ module Generated {
   class StructExpr extends Synth::TStructExpr, ExprImpl::Expr, PathAstNodeImpl::PathAstNode {
     override string getAPrimaryQlClass() { result = "StructExpr" }
 
+    /**
+     * Gets the `index`th attr of this struct expression (0-based).
+     */
+    AnyAttr getAttr(int index) {
+      result =
+        Synth::convertAnyAttrFromRaw(Synth::convertStructExprToRaw(this)
+              .(Raw::StructExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this struct expression.
+     */
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this struct expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the struct expression field list of this struct expression, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprField.qll
index 16dfbd946af1..98a085d30597 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprField.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.NameRef
 
@@ -30,9 +30,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this struct expression field (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertStructExprFieldToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertStructExprFieldToRaw(this)
               .(Raw::StructExprField)
               .getAttr(index))
     }
@@ -40,7 +40,7 @@ module Generated {
     /**
      * Gets any of the attrs of this struct expression field.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this struct expression field.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll
index 66ab2785d422..670afb51129d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.StructExprField
 
@@ -30,12 +30,14 @@ module Generated {
   class StructExprFieldList extends Synth::TStructExprFieldList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "StructExprFieldList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this struct expression field list (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertStructExprFieldListToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertStructExprFieldListToRaw(this)
               .(Raw::StructExprFieldList)
               .getAttr(index))
     }
@@ -43,7 +45,7 @@ module Generated {
     /**
      * Gets any of the attrs of this struct expression field list.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this struct expression field list.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructField.qll
index 9650d4fd2c12..0bedf9aff6d6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/StructField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructField.qll
@@ -6,9 +6,10 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
-import codeql.rust.elements.Expr
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.MutRestriction
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
@@ -35,9 +36,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this struct field (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertStructFieldToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertStructFieldToRaw(this)
               .(Raw::StructField)
               .getAttr(index))
     }
@@ -45,7 +46,7 @@ module Generated {
     /**
      * Gets any of the attrs of this struct field.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this struct field.
@@ -53,25 +54,40 @@ module Generated {
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the default of this struct field, if it exists.
+     * Gets the default val of this struct field, if it exists.
      */
-    Expr getDefault() {
+    ConstArg getDefaultVal() {
       result =
-        Synth::convertExprFromRaw(Synth::convertStructFieldToRaw(this)
+        Synth::convertConstArgFromRaw(Synth::convertStructFieldToRaw(this)
               .(Raw::StructField)
-              .getDefault())
+              .getDefaultVal())
     }
 
     /**
-     * Holds if `getDefault()` exists.
+     * Holds if `getDefaultVal()` exists.
      */
-    final predicate hasDefault() { exists(this.getDefault()) }
+    final predicate hasDefaultVal() { exists(this.getDefaultVal()) }
 
     /**
      * Holds if this struct field is unsafe.
      */
     predicate isUnsafe() { Synth::convertStructFieldToRaw(this).(Raw::StructField).isUnsafe() }
 
+    /**
+     * Gets the mut restriction of this struct field, if it exists.
+     */
+    MutRestriction getMutRestriction() {
+      result =
+        Synth::convertMutRestrictionFromRaw(Synth::convertStructFieldToRaw(this)
+              .(Raw::StructField)
+              .getMutRestriction())
+    }
+
+    /**
+     * Holds if `getMutRestriction()` exists.
+     */
+    final predicate hasMutRestriction() { exists(this.getMutRestriction()) }
+
     /**
      * Gets the name of this struct field, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructFieldList.qll
index 624391a3da6f..7222c1877537 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/StructFieldList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructFieldList.qll
@@ -28,6 +28,8 @@ module Generated {
   class StructFieldList extends Synth::TStructFieldList, FieldListImpl::FieldList {
     override string getAPrimaryQlClass() { result = "StructFieldList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th field of this struct field list (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatField.qll
index 40a2d3f74d52..996db9e8f888 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatField.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.Pat
 
@@ -30,9 +30,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this struct pattern field (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertStructPatFieldToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertStructPatFieldToRaw(this)
               .(Raw::StructPatField)
               .getAttr(index))
     }
@@ -40,7 +40,7 @@ module Generated {
     /**
      * Gets any of the attrs of this struct pattern field.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this struct pattern field.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll
index 46a5407626ba..ec2afa90be46 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll
@@ -29,6 +29,8 @@ module Generated {
   class StructPatFieldList extends Synth::TStructPatFieldList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "StructPatFieldList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th field of this struct pattern field list (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
index eebd86348e0c..3bf058220f3e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
@@ -130,6 +130,30 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TCastExpr(Raw::CastExpr id) { constructCastExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TCfgAtom(Raw::CfgAtom id) { constructCfgAtom(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TCfgAttrMeta(Raw::CfgAttrMeta id) { constructCfgAttrMeta(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TCfgComposite(Raw::CfgComposite id) { constructCfgComposite(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TCfgMeta(Raw::CfgMeta id) { constructCfgMeta(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TCfgPredExpr(Raw::CfgPredExpr id) { constructCfgPredExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TCfgPredPat(Raw::CfgPredPat id) { constructCfgPredPat(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -162,6 +186,14 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TCrate(Raw::Crate id) { constructCrate(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TDerefPat(Raw::DerefPat id) { constructDerefPat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TDocComment(Raw::DocComment id) { constructDocComment(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -262,10 +294,18 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TImpl(Raw::Impl id) { constructImpl(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TImplRestriction(Raw::ImplRestriction id) { constructImplRestriction(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TImplTraitTypeRepr(Raw::ImplTraitTypeRepr id) { constructImplTraitTypeRepr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TIncludeBytesExpr(Raw::IncludeBytesExpr id) { constructIncludeBytesExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -278,6 +318,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TItemList(Raw::ItemList id) { constructItemList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TKeyValueMeta(Raw::KeyValueMeta id) { constructKeyValueMeta(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -362,10 +406,6 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TMatchGuard(Raw::MatchGuard id) { constructMatchGuard(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TMeta(Raw::Meta id) { constructMeta(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -378,6 +418,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TModule(Raw::Module id) { constructModule(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMutRestriction(Raw::MutRestriction id) { constructMutRestriction(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -394,6 +438,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TNeverTypeRepr(Raw::NeverTypeRepr id) { constructNeverTypeRepr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TNotNull(Raw::NotNull id) { constructNotNull(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -410,14 +458,6 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TParamList(Raw::ParamList id) { constructParamList(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TParenExpr(Raw::ParenExpr id) { constructParenExpr(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TParenPat(Raw::ParenPat id) { constructParenPat(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -434,6 +474,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TPathExpr(Raw::PathExpr id) { constructPathExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TPathMeta(Raw::PathMeta id) { constructPathMeta(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -446,6 +490,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TPathTypeRepr(Raw::PathTypeRepr id) { constructPathTypeRepr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TPatternTypeRepr(Raw::PatternTypeRepr id) { constructPatternTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -558,6 +606,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TTokenTree(Raw::TokenTree id) { constructTokenTree(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTokenTreeMeta(Raw::TokenTreeMeta id) { constructTokenTreeMeta(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -565,7 +617,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TTraitAlias(Raw::TraitAlias id) { constructTraitAlias(id) } or
+    TTryBlockModifier(Raw::TryBlockModifier id) { constructTryBlockModifier(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -626,6 +678,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TUnion(Raw::Union id) { constructUnion(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TUnsafeMeta(Raw::UnsafeMeta id) { constructUnsafeMeta(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -654,6 +710,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TVisibility(Raw::Visibility id) { constructVisibility(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TVisibilityInner(Raw::VisibilityInner id) { constructVisibilityInner(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -684,6 +744,11 @@ module Synth {
    */
   class TAddressable = TItem or TVariant;
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TAnyAttr = TAttr or TDocComment;
+
   /**
    * INTERNAL: Do not use.
    */
@@ -708,33 +773,39 @@ module Synth {
    * INTERNAL: Do not use.
    */
   class TAstNode =
-    TAbi or TAddressable or TArgList or TAsmDirSpec or TAsmOperand or TAsmOperandExpr or
-        TAsmOption or TAsmPiece or TAsmRegSpec or TAssocItemList or TAttr or TCallable or TExpr or
-        TExternItemList or TFieldList or TForBinder or TFormatArgsArg or TGenericArg or
-        TGenericArgList or TGenericParam or TGenericParamList or TItemList or TLabel or TLetElse or
-        TMacroItems or TMatchArm or TMatchArmList or TMatchGuard or TMeta or TName or TParamBase or
-        TParamList or TParenthesizedArgList or TPat or TPath or TPathAstNode or TPathSegment or
-        TRename or TRetTypeRepr or TReturnTypeSyntax or TSourceFile or TStmt or TStmtList or
-        TStructExprField or TStructExprFieldList or TStructField or TStructPatField or
-        TStructPatFieldList or TToken or TTokenTree or TTupleField or TTypeBound or
-        TTypeBoundList or TTypeRepr or TUseBoundGenericArg or TUseBoundGenericArgs or TUseTree or
-        TUseTreeList or TVariantList or TVisibility or TWhereClause or TWherePred;
+    TAbi or TAddressable or TAnyAttr or TArgList or TAsmDirSpec or TAsmOperand or TAsmOperandExpr or
+        TAsmOption or TAsmPiece or TAsmRegSpec or TAssocItemList or TCallable or TCfgPredicate or
+        TExpr or TExternItemList or TFieldList or TForBinder or TFormatArgsArg or TGenericArg or
+        TGenericArgList or TGenericParam or TGenericParamList or TImplRestriction or TItemList or
+        TLabel or TLetElse or TMacroItems or TMatchArm or TMatchArmList or TMatchGuard or TMeta or
+        TMutRestriction or TName or TParamBase or TParamList or TParenthesizedArgList or TPat or
+        TPath or TPathAstNode or TPathSegment or TRename or TRetTypeRepr or TReturnTypeSyntax or
+        TSourceFile or TStmt or TStmtList or TStructExprField or TStructExprFieldList or
+        TStructField or TStructPatField or TStructPatFieldList or TToken or TTokenTree or
+        TTryBlockModifier or TTupleField or TTypeBound or TTypeBoundList or TTypeRepr or
+        TUseBoundGenericArg or TUseBoundGenericArgs or TUseTree or TUseTreeList or TVariantList or
+        TVisibility or TVisibilityInner or TWhereClause or TWherePred;
 
   /**
    * INTERNAL: Do not use.
    */
   class TCallable = TClosureExpr or TFunction;
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TCfgPredicate = TCfgAtom or TCfgComposite;
+
   /**
    * INTERNAL: Do not use.
    */
   class TExpr =
     TArrayExpr or TArrayExprInternal or TAsmExpr or TAwaitExpr or TBecomeExpr or TBinaryExpr or
-        TBreakExpr or TCallExpr or TCastExpr or TClosureExpr or TContinueExpr or TFieldExpr or
-        TFormatArgsExpr or TIfExpr or TIndexExpr or TLabelableExpr or TLetExpr or TLiteralExpr or
-        TMacroExpr or TMatchExpr or TMethodCallExpr or TOffsetOfExpr or TParenExpr or
-        TPathExprBase or TPrefixExpr or TRangeExpr or TRefExpr or TReturnExpr or TStructExpr or
-        TTryExpr or TTupleExpr or TUnderscoreExpr or TYeetExpr or TYieldExpr;
+        TBreakExpr or TCallExpr or TCastExpr or TCfgPredExpr or TClosureExpr or TContinueExpr or
+        TFieldExpr or TFormatArgsExpr or TIfExpr or TIncludeBytesExpr or TIndexExpr or
+        TLabelableExpr or TLetExpr or TLiteralExpr or TMacroExpr or TMatchExpr or TMethodCallExpr or
+        TOffsetOfExpr or TPathExprBase or TPrefixExpr or TRangeExpr or TRefExpr or TReturnExpr or
+        TStructExpr or TTryExpr or TTupleExpr or TUnderscoreExpr or TYeetExpr or TYieldExpr;
 
   /**
    * INTERNAL: Do not use.
@@ -761,7 +832,7 @@ module Synth {
    */
   class TItem =
     TAsmExpr or TAssocItem or TExternBlock or TExternCrate or TExternItem or TImpl or TMacroDef or
-        TMacroRules or TModule or TTrait or TTraitAlias or TTypeItem or TUse;
+        TMacroRules or TModule or TTrait or TTypeItem or TUse;
 
   /**
    * INTERNAL: Do not use.
@@ -778,6 +849,12 @@ module Synth {
    */
   class TLoopingExpr = TForExpr or TLoopExpr or TWhileExpr;
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TMeta =
+    TCfgAttrMeta or TCfgMeta or TKeyValueMeta or TPathMeta or TTokenTreeMeta or TUnsafeMeta;
+
   /**
    * INTERNAL: Do not use.
    */
@@ -787,9 +864,9 @@ module Synth {
    * INTERNAL: Do not use.
    */
   class TPat =
-    TBoxPat or TConstBlockPat or TIdentPat or TLiteralPat or TMacroPat or TOrPat or TParenPat or
-        TPathPat or TRangePat or TRefPat or TRestPat or TSlicePat or TStructPat or TTuplePat or
-        TTupleStructPat or TWildcardPat;
+    TBoxPat or TCfgPredPat or TConstBlockPat or TDerefPat or TIdentPat or TLiteralPat or
+        TMacroPat or TNotNull or TOrPat or TPathPat or TRangePat or TRefPat or TRestPat or
+        TSlicePat or TStructPat or TTuplePat or TTupleStructPat or TWildcardPat;
 
   /**
    * INTERNAL: Do not use.
@@ -822,7 +899,7 @@ module Synth {
   class TTypeRepr =
     TArrayTypeRepr or TDynTraitTypeRepr or TFnPtrTypeRepr or TForTypeRepr or TImplTraitTypeRepr or
         TInferTypeRepr or TMacroTypeRepr or TNeverTypeRepr or TParenTypeRepr or TPathTypeRepr or
-        TPtrTypeRepr or TRefTypeRepr or TSliceTypeRepr or TTupleTypeRepr;
+        TPatternTypeRepr or TPtrTypeRepr or TRefTypeRepr or TSliceTypeRepr or TTupleTypeRepr;
 
   /**
    * INTERNAL: Do not use.
@@ -1054,6 +1131,48 @@ module Synth {
    */
   TCastExpr convertCastExprFromRaw(Raw::Element e) { result = TCastExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TCfgAtom`, if possible.
+   */
+  TCfgAtom convertCfgAtomFromRaw(Raw::Element e) { result = TCfgAtom(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TCfgAttrMeta`, if possible.
+   */
+  TCfgAttrMeta convertCfgAttrMetaFromRaw(Raw::Element e) { result = TCfgAttrMeta(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TCfgComposite`, if possible.
+   */
+  TCfgComposite convertCfgCompositeFromRaw(Raw::Element e) { result = TCfgComposite(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TCfgMeta`, if possible.
+   */
+  TCfgMeta convertCfgMetaFromRaw(Raw::Element e) { result = TCfgMeta(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TCfgPredExpr`, if possible.
+   */
+  TCfgPredExpr convertCfgPredExprFromRaw(Raw::Element e) { result = TCfgPredExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TCfgPredPat`, if possible.
+   */
+  TCfgPredPat convertCfgPredPatFromRaw(Raw::Element e) { result = TCfgPredPat(e) }
+
   /**
    * INTERNAL: Do not use.
    *
@@ -1110,6 +1229,20 @@ module Synth {
    */
   TCrate convertCrateFromRaw(Raw::Element e) { result = TCrate(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TDerefPat`, if possible.
+   */
+  TDerefPat convertDerefPatFromRaw(Raw::Element e) { result = TDerefPat(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TDocComment`, if possible.
+   */
+  TDocComment convertDocCommentFromRaw(Raw::Element e) { result = TDocComment(e) }
+
   /**
    * INTERNAL: Do not use.
    *
@@ -1273,6 +1406,13 @@ module Synth {
    */
   TImpl convertImplFromRaw(Raw::Element e) { result = TImpl(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TImplRestriction`, if possible.
+   */
+  TImplRestriction convertImplRestrictionFromRaw(Raw::Element e) { result = TImplRestriction(e) }
+
   /**
    * INTERNAL: Do not use.
    *
@@ -1282,6 +1422,13 @@ module Synth {
     result = TImplTraitTypeRepr(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TIncludeBytesExpr`, if possible.
+   */
+  TIncludeBytesExpr convertIncludeBytesExprFromRaw(Raw::Element e) { result = TIncludeBytesExpr(e) }
+
   /**
    * INTERNAL: Do not use.
    *
@@ -1303,6 +1450,13 @@ module Synth {
    */
   TItemList convertItemListFromRaw(Raw::Element e) { result = TItemList(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TKeyValueMeta`, if possible.
+   */
+  TKeyValueMeta convertKeyValueMetaFromRaw(Raw::Element e) { result = TKeyValueMeta(e) }
+
   /**
    * INTERNAL: Do not use.
    *
@@ -1450,13 +1604,6 @@ module Synth {
    */
   TMatchGuard convertMatchGuardFromRaw(Raw::Element e) { result = TMatchGuard(e) }
 
-  /**
-   * INTERNAL: Do not use.
-   *
-   * Converts a raw element to a synthesized `TMeta`, if possible.
-   */
-  TMeta convertMetaFromRaw(Raw::Element e) { result = TMeta(e) }
-
   /**
    * INTERNAL: Do not use.
    *
@@ -1478,6 +1625,13 @@ module Synth {
    */
   TModule convertModuleFromRaw(Raw::Element e) { result = TModule(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TMutRestriction`, if possible.
+   */
+  TMutRestriction convertMutRestrictionFromRaw(Raw::Element e) { result = TMutRestriction(e) }
+
   /**
    * INTERNAL: Do not use.
    *
@@ -1506,6 +1660,13 @@ module Synth {
    */
   TNeverTypeRepr convertNeverTypeReprFromRaw(Raw::Element e) { result = TNeverTypeRepr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TNotNull`, if possible.
+   */
+  TNotNull convertNotNullFromRaw(Raw::Element e) { result = TNotNull(e) }
+
   /**
    * INTERNAL: Do not use.
    *
@@ -1534,20 +1695,6 @@ module Synth {
    */
   TParamList convertParamListFromRaw(Raw::Element e) { result = TParamList(e) }
 
-  /**
-   * INTERNAL: Do not use.
-   *
-   * Converts a raw element to a synthesized `TParenExpr`, if possible.
-   */
-  TParenExpr convertParenExprFromRaw(Raw::Element e) { result = TParenExpr(e) }
-
-  /**
-   * INTERNAL: Do not use.
-   *
-   * Converts a raw element to a synthesized `TParenPat`, if possible.
-   */
-  TParenPat convertParenPatFromRaw(Raw::Element e) { result = TParenPat(e) }
-
   /**
    * INTERNAL: Do not use.
    *
@@ -1578,6 +1725,13 @@ module Synth {
    */
   TPathExpr convertPathExprFromRaw(Raw::Element e) { result = TPathExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TPathMeta`, if possible.
+   */
+  TPathMeta convertPathMetaFromRaw(Raw::Element e) { result = TPathMeta(e) }
+
   /**
    * INTERNAL: Do not use.
    *
@@ -1599,6 +1753,13 @@ module Synth {
    */
   TPathTypeRepr convertPathTypeReprFromRaw(Raw::Element e) { result = TPathTypeRepr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TPatternTypeRepr`, if possible.
+   */
+  TPatternTypeRepr convertPatternTypeReprFromRaw(Raw::Element e) { result = TPatternTypeRepr(e) }
+
   /**
    * INTERNAL: Do not use.
    *
@@ -1799,6 +1960,13 @@ module Synth {
    */
   TTokenTree convertTokenTreeFromRaw(Raw::Element e) { result = TTokenTree(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TTokenTreeMeta`, if possible.
+   */
+  TTokenTreeMeta convertTokenTreeMetaFromRaw(Raw::Element e) { result = TTokenTreeMeta(e) }
+
   /**
    * INTERNAL: Do not use.
    *
@@ -1809,9 +1977,9 @@ module Synth {
   /**
    * INTERNAL: Do not use.
    *
-   * Converts a raw element to a synthesized `TTraitAlias`, if possible.
+   * Converts a raw element to a synthesized `TTryBlockModifier`, if possible.
    */
-  TTraitAlias convertTraitAliasFromRaw(Raw::Element e) { result = TTraitAlias(e) }
+  TTryBlockModifier convertTryBlockModifierFromRaw(Raw::Element e) { result = TTryBlockModifier(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1918,6 +2086,13 @@ module Synth {
    */
   TUnion convertUnionFromRaw(Raw::Element e) { result = TUnion(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TUnsafeMeta`, if possible.
+   */
+  TUnsafeMeta convertUnsafeMetaFromRaw(Raw::Element e) { result = TUnsafeMeta(e) }
+
   /**
    * INTERNAL: Do not use.
    *
@@ -1969,6 +2144,13 @@ module Synth {
    */
   TVisibility convertVisibilityFromRaw(Raw::Element e) { result = TVisibility(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TVisibilityInner`, if possible.
+   */
+  TVisibilityInner convertVisibilityInnerFromRaw(Raw::Element e) { result = TVisibilityInner(e) }
+
   /**
    * INTERNAL: Do not use.
    *
@@ -2021,6 +2203,16 @@ module Synth {
     result = convertVariantFromRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TAnyAttr`, if possible.
+   */
+  TAnyAttr convertAnyAttrFromRaw(Raw::Element e) {
+    result = convertAttrFromRaw(e)
+    or
+    result = convertDocCommentFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TArrayExpr`, if possible.
@@ -2080,6 +2272,8 @@ module Synth {
     or
     result = convertAddressableFromRaw(e)
     or
+    result = convertAnyAttrFromRaw(e)
+    or
     result = convertArgListFromRaw(e)
     or
     result = convertAsmDirSpecFromRaw(e)
@@ -2096,10 +2290,10 @@ module Synth {
     or
     result = convertAssocItemListFromRaw(e)
     or
-    result = convertAttrFromRaw(e)
-    or
     result = convertCallableFromRaw(e)
     or
+    result = convertCfgPredicateFromRaw(e)
+    or
     result = convertExprFromRaw(e)
     or
     result = convertExternItemListFromRaw(e)
@@ -2118,6 +2312,8 @@ module Synth {
     or
     result = convertGenericParamListFromRaw(e)
     or
+    result = convertImplRestrictionFromRaw(e)
+    or
     result = convertItemListFromRaw(e)
     or
     result = convertLabelFromRaw(e)
@@ -2134,6 +2330,8 @@ module Synth {
     or
     result = convertMetaFromRaw(e)
     or
+    result = convertMutRestrictionFromRaw(e)
+    or
     result = convertNameFromRaw(e)
     or
     result = convertParamBaseFromRaw(e)
@@ -2176,6 +2374,8 @@ module Synth {
     or
     result = convertTokenTreeFromRaw(e)
     or
+    result = convertTryBlockModifierFromRaw(e)
+    or
     result = convertTupleFieldFromRaw(e)
     or
     result = convertTypeBoundFromRaw(e)
@@ -2196,6 +2396,8 @@ module Synth {
     or
     result = convertVisibilityFromRaw(e)
     or
+    result = convertVisibilityInnerFromRaw(e)
+    or
     result = convertWhereClauseFromRaw(e)
     or
     result = convertWherePredFromRaw(e)
@@ -2211,6 +2413,16 @@ module Synth {
     result = convertFunctionFromRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TCfgPredicate`, if possible.
+   */
+  TCfgPredicate convertCfgPredicateFromRaw(Raw::Element e) {
+    result = convertCfgAtomFromRaw(e)
+    or
+    result = convertCfgCompositeFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TElement`, if possible.
@@ -2248,6 +2460,8 @@ module Synth {
     or
     result = convertCastExprFromRaw(e)
     or
+    result = convertCfgPredExprFromRaw(e)
+    or
     result = convertClosureExprFromRaw(e)
     or
     result = convertContinueExprFromRaw(e)
@@ -2258,6 +2472,8 @@ module Synth {
     or
     result = convertIfExprFromRaw(e)
     or
+    result = convertIncludeBytesExprFromRaw(e)
+    or
     result = convertIndexExprFromRaw(e)
     or
     result = convertLabelableExprFromRaw(e)
@@ -2274,8 +2490,6 @@ module Synth {
     or
     result = convertOffsetOfExprFromRaw(e)
     or
-    result = convertParenExprFromRaw(e)
-    or
     result = convertPathExprBaseFromRaw(e)
     or
     result = convertPrefixExprFromRaw(e)
@@ -2374,8 +2588,6 @@ module Synth {
     or
     result = convertTraitFromRaw(e)
     or
-    result = convertTraitAliasFromRaw(e)
-    or
     result = convertTypeItemFromRaw(e)
     or
     result = convertUseFromRaw(e)
@@ -2417,6 +2629,24 @@ module Synth {
     result = convertWhileExprFromRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TMeta`, if possible.
+   */
+  TMeta convertMetaFromRaw(Raw::Element e) {
+    result = convertCfgAttrMetaFromRaw(e)
+    or
+    result = convertCfgMetaFromRaw(e)
+    or
+    result = convertKeyValueMetaFromRaw(e)
+    or
+    result = convertPathMetaFromRaw(e)
+    or
+    result = convertTokenTreeMetaFromRaw(e)
+    or
+    result = convertUnsafeMetaFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TParamBase`, if possible.
@@ -2434,17 +2664,21 @@ module Synth {
   TPat convertPatFromRaw(Raw::Element e) {
     result = convertBoxPatFromRaw(e)
     or
+    result = convertCfgPredPatFromRaw(e)
+    or
     result = convertConstBlockPatFromRaw(e)
     or
+    result = convertDerefPatFromRaw(e)
+    or
     result = convertIdentPatFromRaw(e)
     or
     result = convertLiteralPatFromRaw(e)
     or
     result = convertMacroPatFromRaw(e)
     or
-    result = convertOrPatFromRaw(e)
+    result = convertNotNullFromRaw(e)
     or
-    result = convertParenPatFromRaw(e)
+    result = convertOrPatFromRaw(e)
     or
     result = convertPathPatFromRaw(e)
     or
@@ -2546,6 +2780,8 @@ module Synth {
     or
     result = convertPathTypeReprFromRaw(e)
     or
+    result = convertPatternTypeReprFromRaw(e)
+    or
     result = convertPtrTypeReprFromRaw(e)
     or
     result = convertRefTypeReprFromRaw(e)
@@ -2751,6 +2987,42 @@ module Synth {
    */
   Raw::Element convertCastExprToRaw(TCastExpr e) { e = TCastExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TCfgAtom` to a raw DB element, if possible.
+   */
+  Raw::Element convertCfgAtomToRaw(TCfgAtom e) { e = TCfgAtom(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TCfgAttrMeta` to a raw DB element, if possible.
+   */
+  Raw::Element convertCfgAttrMetaToRaw(TCfgAttrMeta e) { e = TCfgAttrMeta(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TCfgComposite` to a raw DB element, if possible.
+   */
+  Raw::Element convertCfgCompositeToRaw(TCfgComposite e) { e = TCfgComposite(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TCfgMeta` to a raw DB element, if possible.
+   */
+  Raw::Element convertCfgMetaToRaw(TCfgMeta e) { e = TCfgMeta(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TCfgPredExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertCfgPredExprToRaw(TCfgPredExpr e) { e = TCfgPredExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TCfgPredPat` to a raw DB element, if possible.
+   */
+  Raw::Element convertCfgPredPatToRaw(TCfgPredPat e) { e = TCfgPredPat(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TClosureExpr` to a raw DB element, if possible.
@@ -2799,6 +3071,18 @@ module Synth {
    */
   Raw::Element convertCrateToRaw(TCrate e) { e = TCrate(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TDerefPat` to a raw DB element, if possible.
+   */
+  Raw::Element convertDerefPatToRaw(TDerefPat e) { e = TDerefPat(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TDocComment` to a raw DB element, if possible.
+   */
+  Raw::Element convertDocCommentToRaw(TDocComment e) { e = TDocComment(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDynTraitTypeRepr` to a raw DB element, if possible.
@@ -2937,6 +3221,12 @@ module Synth {
    */
   Raw::Element convertImplToRaw(TImpl e) { e = TImpl(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TImplRestriction` to a raw DB element, if possible.
+   */
+  Raw::Element convertImplRestrictionToRaw(TImplRestriction e) { e = TImplRestriction(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TImplTraitTypeRepr` to a raw DB element, if possible.
@@ -2945,6 +3235,12 @@ module Synth {
     e = TImplTraitTypeRepr(result)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TIncludeBytesExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertIncludeBytesExprToRaw(TIncludeBytesExpr e) { e = TIncludeBytesExpr(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TIndexExpr` to a raw DB element, if possible.
@@ -2963,6 +3259,12 @@ module Synth {
    */
   Raw::Element convertItemListToRaw(TItemList e) { e = TItemList(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TKeyValueMeta` to a raw DB element, if possible.
+   */
+  Raw::Element convertKeyValueMetaToRaw(TKeyValueMeta e) { e = TKeyValueMeta(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TLabel` to a raw DB element, if possible.
@@ -3089,12 +3391,6 @@ module Synth {
    */
   Raw::Element convertMatchGuardToRaw(TMatchGuard e) { e = TMatchGuard(result) }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TMeta` to a raw DB element, if possible.
-   */
-  Raw::Element convertMetaToRaw(TMeta e) { e = TMeta(result) }
-
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TMethodCallExpr` to a raw DB element, if possible.
@@ -3113,6 +3409,12 @@ module Synth {
    */
   Raw::Element convertModuleToRaw(TModule e) { e = TModule(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMutRestriction` to a raw DB element, if possible.
+   */
+  Raw::Element convertMutRestrictionToRaw(TMutRestriction e) { e = TMutRestriction(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TName` to a raw DB element, if possible.
@@ -3137,6 +3439,12 @@ module Synth {
    */
   Raw::Element convertNeverTypeReprToRaw(TNeverTypeRepr e) { e = TNeverTypeRepr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TNotNull` to a raw DB element, if possible.
+   */
+  Raw::Element convertNotNullToRaw(TNotNull e) { e = TNotNull(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TOffsetOfExpr` to a raw DB element, if possible.
@@ -3161,18 +3469,6 @@ module Synth {
    */
   Raw::Element convertParamListToRaw(TParamList e) { e = TParamList(result) }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TParenExpr` to a raw DB element, if possible.
-   */
-  Raw::Element convertParenExprToRaw(TParenExpr e) { e = TParenExpr(result) }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TParenPat` to a raw DB element, if possible.
-   */
-  Raw::Element convertParenPatToRaw(TParenPat e) { e = TParenPat(result) }
-
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TParenTypeRepr` to a raw DB element, if possible.
@@ -3199,6 +3495,12 @@ module Synth {
    */
   Raw::Element convertPathExprToRaw(TPathExpr e) { e = TPathExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TPathMeta` to a raw DB element, if possible.
+   */
+  Raw::Element convertPathMetaToRaw(TPathMeta e) { e = TPathMeta(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPathPat` to a raw DB element, if possible.
@@ -3217,6 +3519,12 @@ module Synth {
    */
   Raw::Element convertPathTypeReprToRaw(TPathTypeRepr e) { e = TPathTypeRepr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TPatternTypeRepr` to a raw DB element, if possible.
+   */
+  Raw::Element convertPatternTypeReprToRaw(TPatternTypeRepr e) { e = TPatternTypeRepr(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPrefixExpr` to a raw DB element, if possible.
@@ -3389,6 +3697,12 @@ module Synth {
    */
   Raw::Element convertTokenTreeToRaw(TTokenTree e) { e = TTokenTree(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTokenTreeMeta` to a raw DB element, if possible.
+   */
+  Raw::Element convertTokenTreeMetaToRaw(TTokenTreeMeta e) { e = TTokenTreeMeta(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTrait` to a raw DB element, if possible.
@@ -3397,9 +3711,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TTraitAlias` to a raw DB element, if possible.
+   * Converts a synthesized `TTryBlockModifier` to a raw DB element, if possible.
    */
-  Raw::Element convertTraitAliasToRaw(TTraitAlias e) { e = TTraitAlias(result) }
+  Raw::Element convertTryBlockModifierToRaw(TTryBlockModifier e) { e = TTryBlockModifier(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -3491,6 +3805,12 @@ module Synth {
    */
   Raw::Element convertUnionToRaw(TUnion e) { e = TUnion(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TUnsafeMeta` to a raw DB element, if possible.
+   */
+  Raw::Element convertUnsafeMetaToRaw(TUnsafeMeta e) { e = TUnsafeMeta(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TUse` to a raw DB element, if possible.
@@ -3535,6 +3855,12 @@ module Synth {
    */
   Raw::Element convertVisibilityToRaw(TVisibility e) { e = TVisibility(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TVisibilityInner` to a raw DB element, if possible.
+   */
+  Raw::Element convertVisibilityInnerToRaw(TVisibilityInner e) { e = TVisibilityInner(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TWhereClause` to a raw DB element, if possible.
@@ -3581,6 +3907,16 @@ module Synth {
     result = convertVariantToRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TAnyAttr` to a raw DB element, if possible.
+   */
+  Raw::Element convertAnyAttrToRaw(TAnyAttr e) {
+    result = convertAttrToRaw(e)
+    or
+    result = convertDocCommentToRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TArrayExpr` to a raw DB element, if possible.
@@ -3640,6 +3976,8 @@ module Synth {
     or
     result = convertAddressableToRaw(e)
     or
+    result = convertAnyAttrToRaw(e)
+    or
     result = convertArgListToRaw(e)
     or
     result = convertAsmDirSpecToRaw(e)
@@ -3656,10 +3994,10 @@ module Synth {
     or
     result = convertAssocItemListToRaw(e)
     or
-    result = convertAttrToRaw(e)
-    or
     result = convertCallableToRaw(e)
     or
+    result = convertCfgPredicateToRaw(e)
+    or
     result = convertExprToRaw(e)
     or
     result = convertExternItemListToRaw(e)
@@ -3678,6 +4016,8 @@ module Synth {
     or
     result = convertGenericParamListToRaw(e)
     or
+    result = convertImplRestrictionToRaw(e)
+    or
     result = convertItemListToRaw(e)
     or
     result = convertLabelToRaw(e)
@@ -3694,6 +4034,8 @@ module Synth {
     or
     result = convertMetaToRaw(e)
     or
+    result = convertMutRestrictionToRaw(e)
+    or
     result = convertNameToRaw(e)
     or
     result = convertParamBaseToRaw(e)
@@ -3736,6 +4078,8 @@ module Synth {
     or
     result = convertTokenTreeToRaw(e)
     or
+    result = convertTryBlockModifierToRaw(e)
+    or
     result = convertTupleFieldToRaw(e)
     or
     result = convertTypeBoundToRaw(e)
@@ -3756,6 +4100,8 @@ module Synth {
     or
     result = convertVisibilityToRaw(e)
     or
+    result = convertVisibilityInnerToRaw(e)
+    or
     result = convertWhereClauseToRaw(e)
     or
     result = convertWherePredToRaw(e)
@@ -3771,6 +4117,16 @@ module Synth {
     result = convertFunctionToRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TCfgPredicate` to a raw DB element, if possible.
+   */
+  Raw::Element convertCfgPredicateToRaw(TCfgPredicate e) {
+    result = convertCfgAtomToRaw(e)
+    or
+    result = convertCfgCompositeToRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TElement` to a raw DB element, if possible.
@@ -3808,6 +4164,8 @@ module Synth {
     or
     result = convertCastExprToRaw(e)
     or
+    result = convertCfgPredExprToRaw(e)
+    or
     result = convertClosureExprToRaw(e)
     or
     result = convertContinueExprToRaw(e)
@@ -3818,6 +4176,8 @@ module Synth {
     or
     result = convertIfExprToRaw(e)
     or
+    result = convertIncludeBytesExprToRaw(e)
+    or
     result = convertIndexExprToRaw(e)
     or
     result = convertLabelableExprToRaw(e)
@@ -3834,8 +4194,6 @@ module Synth {
     or
     result = convertOffsetOfExprToRaw(e)
     or
-    result = convertParenExprToRaw(e)
-    or
     result = convertPathExprBaseToRaw(e)
     or
     result = convertPrefixExprToRaw(e)
@@ -3934,8 +4292,6 @@ module Synth {
     or
     result = convertTraitToRaw(e)
     or
-    result = convertTraitAliasToRaw(e)
-    or
     result = convertTypeItemToRaw(e)
     or
     result = convertUseToRaw(e)
@@ -3977,6 +4333,24 @@ module Synth {
     result = convertWhileExprToRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMeta` to a raw DB element, if possible.
+   */
+  Raw::Element convertMetaToRaw(TMeta e) {
+    result = convertCfgAttrMetaToRaw(e)
+    or
+    result = convertCfgMetaToRaw(e)
+    or
+    result = convertKeyValueMetaToRaw(e)
+    or
+    result = convertPathMetaToRaw(e)
+    or
+    result = convertTokenTreeMetaToRaw(e)
+    or
+    result = convertUnsafeMetaToRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TParamBase` to a raw DB element, if possible.
@@ -3994,17 +4368,21 @@ module Synth {
   Raw::Element convertPatToRaw(TPat e) {
     result = convertBoxPatToRaw(e)
     or
+    result = convertCfgPredPatToRaw(e)
+    or
     result = convertConstBlockPatToRaw(e)
     or
+    result = convertDerefPatToRaw(e)
+    or
     result = convertIdentPatToRaw(e)
     or
     result = convertLiteralPatToRaw(e)
     or
     result = convertMacroPatToRaw(e)
     or
-    result = convertOrPatToRaw(e)
+    result = convertNotNullToRaw(e)
     or
-    result = convertParenPatToRaw(e)
+    result = convertOrPatToRaw(e)
     or
     result = convertPathPatToRaw(e)
     or
@@ -4106,6 +4484,8 @@ module Synth {
     or
     result = convertPathTypeReprToRaw(e)
     or
+    result = convertPatternTypeReprToRaw(e)
+    or
     result = convertPtrTypeReprToRaw(e)
     or
     result = convertRefTypeReprToRaw(e)
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
index 613af726ba4e..2af06d4594be 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
@@ -32,6 +32,12 @@ import codeql.rust.elements.internal.BoxPatConstructor
 import codeql.rust.elements.internal.BreakExprConstructor
 import codeql.rust.elements.internal.CallExprConstructor
 import codeql.rust.elements.internal.CastExprConstructor
+import codeql.rust.elements.internal.CfgAtomConstructor
+import codeql.rust.elements.internal.CfgAttrMetaConstructor
+import codeql.rust.elements.internal.CfgCompositeConstructor
+import codeql.rust.elements.internal.CfgMetaConstructor
+import codeql.rust.elements.internal.CfgPredExprConstructor
+import codeql.rust.elements.internal.CfgPredPatConstructor
 import codeql.rust.elements.internal.ClosureExprConstructor
 import codeql.rust.elements.internal.CommentConstructor
 import codeql.rust.elements.internal.ConstConstructor
@@ -40,6 +46,8 @@ import codeql.rust.elements.internal.ConstBlockPatConstructor
 import codeql.rust.elements.internal.ConstParamConstructor
 import codeql.rust.elements.internal.ContinueExprConstructor
 import codeql.rust.elements.internal.CrateConstructor
+import codeql.rust.elements.internal.DerefPatConstructor
+import codeql.rust.elements.internal.DocCommentConstructor
 import codeql.rust.elements.internal.DynTraitTypeReprConstructor
 import codeql.rust.elements.internal.EnumConstructor
 import codeql.rust.elements.internal.ExprStmtConstructor
@@ -63,10 +71,13 @@ import codeql.rust.elements.internal.GenericParamListConstructor
 import codeql.rust.elements.internal.IdentPatConstructor
 import codeql.rust.elements.internal.IfExprConstructor
 import codeql.rust.elements.internal.ImplConstructor
+import codeql.rust.elements.internal.ImplRestrictionConstructor
 import codeql.rust.elements.internal.ImplTraitTypeReprConstructor
+import codeql.rust.elements.internal.IncludeBytesExprConstructor
 import codeql.rust.elements.internal.IndexExprConstructor
 import codeql.rust.elements.internal.InferTypeReprConstructor
 import codeql.rust.elements.internal.ItemListConstructor
+import codeql.rust.elements.internal.KeyValueMetaConstructor
 import codeql.rust.elements.internal.LabelConstructor
 import codeql.rust.elements.internal.LetElseConstructor
 import codeql.rust.elements.internal.LetExprConstructor
@@ -88,27 +99,28 @@ import codeql.rust.elements.internal.MatchArmConstructor
 import codeql.rust.elements.internal.MatchArmListConstructor
 import codeql.rust.elements.internal.MatchExprConstructor
 import codeql.rust.elements.internal.MatchGuardConstructor
-import codeql.rust.elements.internal.MetaConstructor
 import codeql.rust.elements.internal.MethodCallExprConstructor
 import codeql.rust.elements.internal.MissingConstructor
 import codeql.rust.elements.internal.ModuleConstructor
+import codeql.rust.elements.internal.MutRestrictionConstructor
 import codeql.rust.elements.internal.NameConstructor
 import codeql.rust.elements.internal.NameRefConstructor
 import codeql.rust.elements.internal.NamedCrateConstructor
 import codeql.rust.elements.internal.NeverTypeReprConstructor
+import codeql.rust.elements.internal.NotNullConstructor
 import codeql.rust.elements.internal.OffsetOfExprConstructor
 import codeql.rust.elements.internal.OrPatConstructor
 import codeql.rust.elements.internal.ParamConstructor
 import codeql.rust.elements.internal.ParamListConstructor
-import codeql.rust.elements.internal.ParenExprConstructor
-import codeql.rust.elements.internal.ParenPatConstructor
 import codeql.rust.elements.internal.ParenTypeReprConstructor
 import codeql.rust.elements.internal.ParenthesizedArgListConstructor
 import codeql.rust.elements.internal.PathConstructor
 import codeql.rust.elements.internal.PathExprConstructor
+import codeql.rust.elements.internal.PathMetaConstructor
 import codeql.rust.elements.internal.PathPatConstructor
 import codeql.rust.elements.internal.PathSegmentConstructor
 import codeql.rust.elements.internal.PathTypeReprConstructor
+import codeql.rust.elements.internal.PatternTypeReprConstructor
 import codeql.rust.elements.internal.PrefixExprConstructor
 import codeql.rust.elements.internal.PtrTypeReprConstructor
 import codeql.rust.elements.internal.RangeExprConstructor
@@ -137,8 +149,9 @@ import codeql.rust.elements.internal.StructPatConstructor
 import codeql.rust.elements.internal.StructPatFieldConstructor
 import codeql.rust.elements.internal.StructPatFieldListConstructor
 import codeql.rust.elements.internal.TokenTreeConstructor
+import codeql.rust.elements.internal.TokenTreeMetaConstructor
 import codeql.rust.elements.internal.TraitConstructor
-import codeql.rust.elements.internal.TraitAliasConstructor
+import codeql.rust.elements.internal.TryBlockModifierConstructor
 import codeql.rust.elements.internal.TryExprConstructor
 import codeql.rust.elements.internal.TupleExprConstructor
 import codeql.rust.elements.internal.TupleFieldConstructor
@@ -154,6 +167,7 @@ import codeql.rust.elements.internal.TypeParamConstructor
 import codeql.rust.elements.internal.UnderscoreExprConstructor
 import codeql.rust.elements.internal.UnimplementedConstructor
 import codeql.rust.elements.internal.UnionConstructor
+import codeql.rust.elements.internal.UnsafeMetaConstructor
 import codeql.rust.elements.internal.UseConstructor
 import codeql.rust.elements.internal.UseBoundGenericArgsConstructor
 import codeql.rust.elements.internal.UseTreeConstructor
@@ -161,6 +175,7 @@ import codeql.rust.elements.internal.UseTreeListConstructor
 import codeql.rust.elements.internal.VariantConstructor
 import codeql.rust.elements.internal.VariantListConstructor
 import codeql.rust.elements.internal.VisibilityConstructor
+import codeql.rust.elements.internal.VisibilityInnerConstructor
 import codeql.rust.elements.internal.WhereClauseConstructor
 import codeql.rust.elements.internal.WherePredConstructor
 import codeql.rust.elements.internal.WhileExprConstructor
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTree.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTree.qll
index 258a730ec643..f15483c9073d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTree.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTree.qll
@@ -30,5 +30,7 @@ module Generated {
    */
   class TokenTree extends Synth::TTokenTree, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "TokenTree" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTreeMeta.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTreeMeta.qll
new file mode 100644
index 000000000000..1aa4c6048f63
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTreeMeta.qll
@@ -0,0 +1,57 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TokenTreeMeta`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.MetaImpl::Impl as MetaImpl
+import codeql.rust.elements.Path
+import codeql.rust.elements.TokenTree
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TokenTreeMeta` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::TokenTreeMeta` class directly.
+   * Use the subclass `TokenTreeMeta`, where the following predicates are available.
+   */
+  class TokenTreeMeta extends Synth::TTokenTreeMeta, MetaImpl::Meta {
+    override string getAPrimaryQlClass() { result = "TokenTreeMeta" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the path of this token tree meta, if it exists.
+     */
+    Path getPath() {
+      result =
+        Synth::convertPathFromRaw(Synth::convertTokenTreeMetaToRaw(this)
+              .(Raw::TokenTreeMeta)
+              .getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+
+    /**
+     * Gets the token tree of this token tree meta, if it exists.
+     */
+    TokenTree getTokenTree() {
+      result =
+        Synth::convertTokenTreeFromRaw(Synth::convertTokenTreeMetaToRaw(this)
+              .(Raw::TokenTreeMeta)
+              .getTokenTree())
+    }
+
+    /**
+     * Holds if `getTokenTree()` exists.
+     */
+    final predicate hasTokenTree() { exists(this.getTokenTree()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll
index fff0363a3c75..87df0ae058c9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll
@@ -6,9 +6,10 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.AssocItemList
-import codeql.rust.elements.Attr
 import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.ImplRestriction
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeBoundList
@@ -55,14 +56,15 @@ module Generated {
     /**
      * Gets the `index`th attr of this trait (0-based).
      */
-    Attr getAttr(int index) {
-      result = Synth::convertAttrFromRaw(Synth::convertTraitToRaw(this).(Raw::Trait).getAttr(index))
+    AnyAttr getAttr(int index) {
+      result =
+        Synth::convertAnyAttrFromRaw(Synth::convertTraitToRaw(this).(Raw::Trait).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this trait.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this trait.
@@ -84,6 +86,21 @@ module Generated {
      */
     final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
 
+    /**
+     * Gets the impl restriction of this trait, if it exists.
+     */
+    ImplRestriction getImplRestriction() {
+      result =
+        Synth::convertImplRestrictionFromRaw(Synth::convertTraitToRaw(this)
+              .(Raw::Trait)
+              .getImplRestriction())
+    }
+
+    /**
+     * Holds if `getImplRestriction()` exists.
+     */
+    final predicate hasImplRestriction() { exists(this.getImplRestriction()) }
+
     /**
      * Holds if this trait is auto.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TraitAlias.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TraitAlias.qll
deleted file mode 100644
index 0ca44b1f577d..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TraitAlias.qll
+++ /dev/null
@@ -1,128 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `TraitAlias`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
-import codeql.rust.elements.GenericParamList
-import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
-import codeql.rust.elements.Name
-import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.Visibility
-import codeql.rust.elements.WhereClause
-
-/**
- * INTERNAL: This module contains the fully generated definition of `TraitAlias` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A trait alias.
-   *
-   * For example:
-   * ```rust
-   * trait Foo = Bar + Baz;
-   * ```
-   * INTERNAL: Do not reference the `Generated::TraitAlias` class directly.
-   * Use the subclass `TraitAlias`, where the following predicates are available.
-   */
-  class TraitAlias extends Synth::TTraitAlias, ItemImpl::Item {
-    override string getAPrimaryQlClass() { result = "TraitAlias" }
-
-    /**
-     * Gets the `index`th attr of this trait alias (0-based).
-     */
-    Attr getAttr(int index) {
-      result =
-        Synth::convertAttrFromRaw(Synth::convertTraitAliasToRaw(this)
-              .(Raw::TraitAlias)
-              .getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this trait alias.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this trait alias.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
-    /**
-     * Gets the generic parameter list of this trait alias, if it exists.
-     */
-    GenericParamList getGenericParamList() {
-      result =
-        Synth::convertGenericParamListFromRaw(Synth::convertTraitAliasToRaw(this)
-              .(Raw::TraitAlias)
-              .getGenericParamList())
-    }
-
-    /**
-     * Holds if `getGenericParamList()` exists.
-     */
-    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
-
-    /**
-     * Gets the name of this trait alias, if it exists.
-     */
-    Name getName() {
-      result =
-        Synth::convertNameFromRaw(Synth::convertTraitAliasToRaw(this).(Raw::TraitAlias).getName())
-    }
-
-    /**
-     * Holds if `getName()` exists.
-     */
-    final predicate hasName() { exists(this.getName()) }
-
-    /**
-     * Gets the type bound list of this trait alias, if it exists.
-     */
-    TypeBoundList getTypeBoundList() {
-      result =
-        Synth::convertTypeBoundListFromRaw(Synth::convertTraitAliasToRaw(this)
-              .(Raw::TraitAlias)
-              .getTypeBoundList())
-    }
-
-    /**
-     * Holds if `getTypeBoundList()` exists.
-     */
-    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
-
-    /**
-     * Gets the visibility of this trait alias, if it exists.
-     */
-    Visibility getVisibility() {
-      result =
-        Synth::convertVisibilityFromRaw(Synth::convertTraitAliasToRaw(this)
-              .(Raw::TraitAlias)
-              .getVisibility())
-    }
-
-    /**
-     * Holds if `getVisibility()` exists.
-     */
-    final predicate hasVisibility() { exists(this.getVisibility()) }
-
-    /**
-     * Gets the where clause of this trait alias, if it exists.
-     */
-    WhereClause getWhereClause() {
-      result =
-        Synth::convertWhereClauseFromRaw(Synth::convertTraitAliasToRaw(this)
-              .(Raw::TraitAlias)
-              .getWhereClause())
-    }
-
-    /**
-     * Holds if `getWhereClause()` exists.
-     */
-    final predicate hasWhereClause() { exists(this.getWhereClause()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TryBlockModifier.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TryBlockModifier.qll
new file mode 100644
index 000000000000..a1fcc4faa355
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TryBlockModifier.qll
@@ -0,0 +1,46 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TryBlockModifier`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TryBlockModifier` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::TryBlockModifier` class directly.
+   * Use the subclass `TryBlockModifier`, where the following predicates are available.
+   */
+  class TryBlockModifier extends Synth::TTryBlockModifier, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "TryBlockModifier" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Holds if this try block modifier is try.
+     */
+    predicate isTry() { Synth::convertTryBlockModifierToRaw(this).(Raw::TryBlockModifier).isTry() }
+
+    /**
+     * Gets the type representation of this try block modifier, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertTryBlockModifierToRaw(this)
+              .(Raw::TryBlockModifier)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TryExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TryExpr.qll
index f4c5bbf6e9be..3c39a95d946c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TryExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TryExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -29,18 +29,20 @@ module Generated {
   class TryExpr extends Synth::TTryExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "TryExpr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this try expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertTryExprToRaw(this).(Raw::TryExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertTryExprToRaw(this).(Raw::TryExpr).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this try expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this try expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
index 9a3b414dda0e..4ca4c2db4acf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -28,18 +28,22 @@ module Generated {
   class TupleExpr extends Synth::TTupleExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "TupleExpr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this tuple expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertTupleExprToRaw(this).(Raw::TupleExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertTupleExprToRaw(this)
+              .(Raw::TupleExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this tuple expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this tuple expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll
index 8d39a116f5c0..ea1d1f7a204e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll
@@ -6,8 +6,9 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.MutRestriction
 import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
@@ -30,12 +31,14 @@ module Generated {
   class TupleField extends Synth::TTupleField, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "TupleField" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this tuple field (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertTupleFieldToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertTupleFieldToRaw(this)
               .(Raw::TupleField)
               .getAttr(index))
     }
@@ -43,13 +46,28 @@ module Generated {
     /**
      * Gets any of the attrs of this tuple field.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this tuple field.
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
+    /**
+     * Gets the mut restriction of this tuple field, if it exists.
+     */
+    MutRestriction getMutRestriction() {
+      result =
+        Synth::convertMutRestrictionFromRaw(Synth::convertTupleFieldToRaw(this)
+              .(Raw::TupleField)
+              .getMutRestriction())
+    }
+
+    /**
+     * Holds if `getMutRestriction()` exists.
+     */
+    final predicate hasMutRestriction() { exists(this.getMutRestriction()) }
+
     /**
      * Gets the type representation of this tuple field, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleFieldList.qll
index 6d68797e64b0..57de287b3622 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleFieldList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleFieldList.qll
@@ -28,6 +28,8 @@ module Generated {
   class TupleFieldList extends Synth::TTupleFieldList, FieldListImpl::FieldList {
     override string getAPrimaryQlClass() { result = "TupleFieldList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th field of this tuple field list (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
index 724a827f7c3b..a17a085f3ac7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
@@ -26,6 +26,8 @@ module Generated {
   class TuplePat extends Synth::TTuplePat, PatImpl::Pat {
     override string getAPrimaryQlClass() { result = "TuplePat" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th field of this tuple pattern (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll
index dead3a445e73..132f3bdabe83 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll
@@ -28,6 +28,8 @@ module Generated {
   class TupleTypeRepr extends Synth::TTupleTypeRepr, TypeReprImpl::TypeRepr {
     override string getAPrimaryQlClass() { result = "TupleTypeRepr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th field of this tuple type representation (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
index 063658e0a7bc..1be6bb72dd8a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.AssocItemImpl::Impl as AssocItemImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Name
@@ -40,15 +40,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this type alias (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertTypeAliasToRaw(this).(Raw::TypeAlias).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertTypeAliasToRaw(this)
+              .(Raw::TypeAlias)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this type alias.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this type alias.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll
index 1b6b1c13219a..97896e199a83 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll
@@ -28,6 +28,8 @@ module Generated {
   class TypeArg extends Synth::TTypeArg, GenericArgImpl::GenericArg {
     override string getAPrimaryQlClass() { result = "TypeArg" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the type representation of this type argument, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
index 958867911ce8..a262298cc03d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
@@ -33,6 +33,8 @@ module Generated {
   class TypeBound extends Synth::TTypeBound, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "TypeBound" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the for binder of this type bound, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeItem.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeItem.qll
index 5bc8bfb3c775..89689198e1c1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeItem.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeItem.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.MacroItems
@@ -50,15 +50,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this type item (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertTypeItemToRaw(this).(Raw::TypeItem).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertTypeItemToRaw(this)
+              .(Raw::TypeItem)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this type item.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this type item.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll
index 5379ca78306e..4f1bab54291f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.GenericParamImpl::Impl as GenericParamImpl
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeBoundList
@@ -34,15 +34,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this type parameter (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertTypeParamToRaw(this).(Raw::TypeParam).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertTypeParamToRaw(this)
+              .(Raw::TypeParam)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this type parameter.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this type parameter.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll
index 89cc654eb17c..3bef3093824a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
 /**
@@ -28,9 +28,9 @@ module Generated {
     /**
      * Gets the `index`th attr of this underscore expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertUnderscoreExprToRaw(this)
+        Synth::convertAnyAttrFromRaw(Synth::convertUnderscoreExprToRaw(this)
               .(Raw::UnderscoreExpr)
               .getAttr(index))
     }
@@ -38,7 +38,7 @@ module Generated {
     /**
      * Gets any of the attrs of this underscore expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this underscore expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Unimplemented.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Unimplemented.qll
index 04e38d47781d..8b6d1e3bf263 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Unimplemented.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Unimplemented.qll
@@ -20,5 +20,7 @@ module Generated {
    */
   class Unimplemented extends Synth::TUnimplemented, UnextractedImpl::Unextracted {
     override string getAPrimaryQlClass() { result = "Unimplemented" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UnsafeMeta.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UnsafeMeta.qll
new file mode 100644
index 000000000000..4af13f9e9a68
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/UnsafeMeta.qll
@@ -0,0 +1,44 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `UnsafeMeta`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Meta
+import codeql.rust.elements.internal.MetaImpl::Impl as MetaImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `UnsafeMeta` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::UnsafeMeta` class directly.
+   * Use the subclass `UnsafeMeta`, where the following predicates are available.
+   */
+  class UnsafeMeta extends Synth::TUnsafeMeta, MetaImpl::Meta {
+    override string getAPrimaryQlClass() { result = "UnsafeMeta" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Holds if this unsafe meta is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertUnsafeMetaToRaw(this).(Raw::UnsafeMeta).isUnsafe() }
+
+    /**
+     * Gets the meta of this unsafe meta, if it exists.
+     */
+    Meta getMeta() {
+      result =
+        Synth::convertMetaFromRaw(Synth::convertUnsafeMetaToRaw(this).(Raw::UnsafeMeta).getMeta())
+    }
+
+    /**
+     * Holds if `getMeta()` exists.
+     */
+    final predicate hasMeta() { exists(this.getMeta()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Use.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Use.qll
index ba3cc1de397b..d37aba410806 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Use.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Use.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.UseTree
 import codeql.rust.elements.Visibility
@@ -30,14 +30,14 @@ module Generated {
     /**
      * Gets the `index`th attr of this use (0-based).
      */
-    Attr getAttr(int index) {
-      result = Synth::convertAttrFromRaw(Synth::convertUseToRaw(this).(Raw::Use).getAttr(index))
+    AnyAttr getAttr(int index) {
+      result = Synth::convertAnyAttrFromRaw(Synth::convertUseToRaw(this).(Raw::Use).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this use.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this use.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll
index 3f76518c2404..600a9270b883 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll
@@ -28,6 +28,8 @@ module Generated {
   class UseBoundGenericArgs extends Synth::TUseBoundGenericArgs, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "UseBoundGenericArgs" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th use bound generic argument of this use bound generic arguments (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UseTreeList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UseTreeList.qll
index bb21ec82936f..03e21bc1fc91 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/UseTreeList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/UseTreeList.qll
@@ -28,6 +28,8 @@ module Generated {
   class UseTreeList extends Synth::TUseTreeList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "UseTreeList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th use tree of this use tree list (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll
index 7da69072953c..6a01ee479782 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll
@@ -7,8 +7,8 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AddressableImpl::Impl as AddressableImpl
-import codeql.rust.elements.Attr
-import codeql.rust.elements.Expr
+import codeql.rust.elements.AnyAttr
+import codeql.rust.elements.ConstArg
 import codeql.rust.elements.FieldList
 import codeql.rust.elements.Name
 import codeql.rust.elements.Visibility
@@ -35,15 +35,15 @@ module Generated {
     /**
      * Gets the `index`th attr of this variant (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertVariantToRaw(this).(Raw::Variant).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertVariantToRaw(this).(Raw::Variant).getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this variant.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this variant.
@@ -51,17 +51,17 @@ module Generated {
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the discriminant of this variant, if it exists.
+     * Gets the const argument of this variant, if it exists.
      */
-    Expr getDiscriminant() {
+    ConstArg getConstArg() {
       result =
-        Synth::convertExprFromRaw(Synth::convertVariantToRaw(this).(Raw::Variant).getDiscriminant())
+        Synth::convertConstArgFromRaw(Synth::convertVariantToRaw(this).(Raw::Variant).getConstArg())
     }
 
     /**
-     * Holds if `getDiscriminant()` exists.
+     * Holds if `getConstArg()` exists.
      */
-    final predicate hasDiscriminant() { exists(this.getDiscriminant()) }
+    final predicate hasConstArg() { exists(this.getConstArg()) }
 
     /**
      * Gets the field list of this variant, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/VariantList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/VariantList.qll
index e0ba8bfab156..a0347ac51c5e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/VariantList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/VariantList.qll
@@ -28,6 +28,8 @@ module Generated {
   class VariantList extends Synth::TVariantList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "VariantList" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th variant of this variant list (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Visibility.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Visibility.qll
index 340f53af63c9..e37eff57a895 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Visibility.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Visibility.qll
@@ -7,7 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Path
+import codeql.rust.elements.VisibilityInner
 
 /**
  * INTERNAL: This module contains the fully generated definition of `Visibility` and should not
@@ -29,16 +29,18 @@ module Generated {
     override string getAPrimaryQlClass() { result = "Visibility" }
 
     /**
-     * Gets the path of this visibility, if it exists.
+     * Gets the visibility inner of this visibility, if it exists.
      */
-    Path getPath() {
+    VisibilityInner getVisibilityInner() {
       result =
-        Synth::convertPathFromRaw(Synth::convertVisibilityToRaw(this).(Raw::Visibility).getPath())
+        Synth::convertVisibilityInnerFromRaw(Synth::convertVisibilityToRaw(this)
+              .(Raw::Visibility)
+              .getVisibilityInner())
     }
 
     /**
-     * Holds if `getPath()` exists.
+     * Holds if `getVisibilityInner()` exists.
      */
-    final predicate hasPath() { exists(this.getPath()) }
+    final predicate hasVisibilityInner() { exists(this.getVisibilityInner()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/VisibilityInner.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/VisibilityInner.qll
new file mode 100644
index 000000000000..4d6956f0657f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/VisibilityInner.qll
@@ -0,0 +1,46 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `VisibilityInner`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Path
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `VisibilityInner` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * The parenthesized inner part of a visibility modifier or restriction, such as the `(in path)` in `pub(in path)`, or the `(crate)` in `pub(crate)`. For example the `(in foo::bar)` in:
+   * ```rust
+   * pub(in foo::bar) struct S;
+   * //  ^^^^^^^^^^^^
+   * ```
+   * INTERNAL: Do not reference the `Generated::VisibilityInner` class directly.
+   * Use the subclass `VisibilityInner`, where the following predicates are available.
+   */
+  class VisibilityInner extends Synth::TVisibilityInner, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "VisibilityInner" }
+
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
+    /**
+     * Gets the path of this visibility inner, if it exists.
+     */
+    Path getPath() {
+      result =
+        Synth::convertPathFromRaw(Synth::convertVisibilityInnerToRaw(this)
+              .(Raw::VisibilityInner)
+              .getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WhereClause.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WhereClause.qll
index 5b7080a7afaf..59cc942ead6d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/WhereClause.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WhereClause.qll
@@ -28,6 +28,8 @@ module Generated {
   class WhereClause extends Synth::TWhereClause, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "WhereClause" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th predicate of this where clause (0-based).
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
index 7a96b326f1c2..a33f78c430d5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
@@ -33,6 +33,8 @@ module Generated {
   class WherePred extends Synth::TWherePred, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "WherePred" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the for binder of this where pred, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll
index b62e1256d618..ff711730b790 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.LoopingExprImpl::Impl as LoopingExprImpl
 
@@ -33,15 +33,17 @@ module Generated {
     /**
      * Gets the `index`th attr of this while expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertWhileExprToRaw(this).(Raw::WhileExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertWhileExprToRaw(this)
+              .(Raw::WhileExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this while expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this while expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/YeetExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/YeetExpr.qll
index a9bd1e991d55..d4817bc25b71 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/YeetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/YeetExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -28,18 +28,22 @@ module Generated {
   class YeetExpr extends Synth::TYeetExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "YeetExpr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this yeet expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertYeetExprToRaw(this).(Raw::YeetExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertYeetExprToRaw(this)
+              .(Raw::YeetExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this yeet expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this yeet expression.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/YieldExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/YieldExpr.qll
index 03541b83cfb6..e2705af69fa3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/YieldExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/YieldExpr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Attr
+import codeql.rust.elements.AnyAttr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -29,18 +29,22 @@ module Generated {
   class YieldExpr extends Synth::TYieldExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "YieldExpr" }
 
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
+
     /**
      * Gets the `index`th attr of this yield expression (0-based).
      */
-    Attr getAttr(int index) {
+    AnyAttr getAttr(int index) {
       result =
-        Synth::convertAttrFromRaw(Synth::convertYieldExprToRaw(this).(Raw::YieldExpr).getAttr(index))
+        Synth::convertAnyAttrFromRaw(Synth::convertYieldExprToRaw(this)
+              .(Raw::YieldExpr)
+              .getAttr(index))
     }
 
     /**
      * Gets any of the attrs of this yield expression.
      */
-    final Attr getAnAttr() { result = this.getAttr(_) }
+    final AnyAttr getAnAttr() { result = this.getAttr(_) }
 
     /**
      * Gets the number of attrs of this yield expression.
diff --git a/rust/ql/lib/codeql/rust/frameworks/actix-web.model.yml b/rust/ql/lib/codeql/rust/frameworks/actix-web.model.yml
index bef64edf68d6..863bcc98c153 100644
--- a/rust/ql/lib/codeql/rust/frameworks/actix-web.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/actix-web.model.yml
@@ -15,4 +15,15 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
-        - ["<actix_web::types::path::Path>::into_inner", "Argument[self]", "ReturnValue", "taint", "manual"]
\ No newline at end of file
+        - ["<actix_web::types::path::Path>::into_inner", "Argument[self]", "ReturnValue", "taint", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: neutralModel
+    data:
+      - ["<actix_web::info::ConnectionInfo as actix_web::extract::FromRequest>::from_request", "sink", "manual"]
+      - ["<actix_web::request::HttpRequest>::connection_info", "sink", "manual"]
+      - ["<actix_web::request::HttpRequest>::full_url", "sink", "manual"]
+      - ["<actix_web::request::HttpRequest>::url_for", "sink", "manual"]
+      - ["<actix_web::request::HttpRequest>::url_for_static", "sink", "manual"]
+      - ["<actix_web::rmap::ResourceMap>::url_for", "sink", "manual"]
+      - ["<actix_web::service::ServiceRequest>::connection_info", "sink", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/asyncstd/io.model.yml b/rust/ql/lib/codeql/rust/frameworks/asyncstd/io.model.yml
index 99e14d0f0bc6..dfc63f6f846f 100644
--- a/rust/ql/lib/codeql/rust/frameworks/asyncstd/io.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/asyncstd/io.model.yml
@@ -3,5 +3,5 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
-      - ["<_ as async_std::io::read::ReadExt>::read", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as async_std::io::read::ReadExt>::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<async_std::io::read::ReadExt>::read", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
+      - ["<async_std::io::read::ReadExt>::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/axum.model.yml b/rust/ql/lib/codeql/rust/frameworks/axum.model.yml
index 7ae7dec36359..55783beebf41 100644
--- a/rust/ql/lib/codeql/rust/frameworks/axum.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/axum.model.yml
@@ -20,4 +20,9 @@ extensions:
       - ["<axum::routing::method_routing::MethodRouter>::patch", "Argument[0].Parameter[0..7]", "remote", "manual"]
       # on
       - ["axum::routing::method_routing::on", "Argument[1].Parameter[0..7]", "remote", "manual"]
-      - ["<axum::routing::method_routing::MethodRouter>::on", "Argument[1].Parameter[0..7]", "remote", "manual"]
\ No newline at end of file
+      - ["<axum::routing::method_routing::MethodRouter>::on", "Argument[1].Parameter[0..7]", "remote", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: excludeFieldTaintStep
+    data:
+      - ["axum::extract::state::State(0)"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/futures.model.yml b/rust/ql/lib/codeql/rust/frameworks/futures.model.yml
index 29feee13616d..b608ae46f5f5 100644
--- a/rust/ql/lib/codeql/rust/frameworks/futures.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/futures.model.yml
@@ -5,11 +5,12 @@ extensions:
     data:
       - ["futures_executor::local_pool::block_on", "Argument[0]", "ReturnValue", "value", "manual"]
       - ["<futures_util::io::buf_reader::BufReader>::new", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as futures_util::io::AsyncReadExt>::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as futures_util::io::AsyncReadExt>::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as futures_util::io::AsyncBufReadExt>::read_line", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as futures_util::io::AsyncBufReadExt>::read_until", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
-      - ["<_ as futures_util::io::AsyncBufReadExt>::fill_buf", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as futures_util::io::AsyncBufReadExt>::lines", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<_ as futures_io::if_std::AsyncBufRead>::poll_fill_buf", "Argument[self].Reference", "ReturnValue.Field[core::task::poll::Poll::Ready(0)].Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as futures_io::if_std::AsyncRead>::poll_read", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
+      - ["<futures_util::io::AsyncReadExt>::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<futures_util::io::AsyncReadExt>::read_to_string", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<futures_util::io::AsyncReadExt>::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<futures_util::io::AsyncBufReadExt>::read_line", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<futures_util::io::AsyncBufReadExt>::read_until", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
+      - ["<futures_util::io::AsyncBufReadExt>::fill_buf", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<futures_util::io::AsyncBufReadExt>::lines", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<futures_io::if_std::AsyncBufRead>::poll_fill_buf", "Argument[self].Reference", "ReturnValue.Field[core::task::poll::Poll::Ready(0)].Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<futures_io::if_std::AsyncRead>::poll_read", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/log.model.yml b/rust/ql/lib/codeql/rust/frameworks/log.model.yml
index 6c60ddaa726b..0237a6399a29 100644
--- a/rust/ql/lib/codeql/rust/frameworks/log.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/log.model.yml
@@ -14,6 +14,10 @@ extensions:
       - ["<std::io::stdio::StdoutLock as std::io::Write>::write_all", "Argument[0]", "log-injection", "manual"]
       - ["<std::io::stdio::StderrLock as std::io::Write>::write", "Argument[0]", "log-injection", "manual"]
       - ["<std::io::stdio::StderrLock as std::io::Write>::write_all", "Argument[0]", "log-injection", "manual"]
+      - ["<std::io::stdio::StdoutLock as core::io::write::Write>::write", "Argument[0]", "log-injection", "manual"]
+      - ["<std::io::stdio::StdoutLock as core::io::write::Write>::write_all", "Argument[0]", "log-injection", "manual"]
+      - ["<std::io::stdio::StderrLock as core::io::write::Write>::write", "Argument[0]", "log-injection", "manual"]
+      - ["<std::io::stdio::StderrLock as core::io::write::Write>::write_all", "Argument[0]", "log-injection", "manual"]
       - ["core::panicking::panic_fmt", "Argument[0]", "log-injection", "manual"]
       - ["core::panicking::assert_failed", "Argument[3].Field[core::option::Option::Some(0)]", "log-injection", "manual"]
       - ["<core::option::Option>::expect", "Argument[0]", "log-injection", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/mysql-async.model.yml b/rust/ql/lib/codeql/rust/frameworks/mysql-async.model.yml
index 4c8858457c1d..d0c1a5acf2b3 100644
--- a/rust/ql/lib/codeql/rust/frameworks/mysql-async.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/mysql-async.model.yml
@@ -3,28 +3,28 @@ extensions:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
-      - ["<_ as mysql_async::queryable::Queryable>::query", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::query_drop", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::query_first", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::query_fold", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::query_stream", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::query_map", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query_drop", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query_first", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query_fold", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query_stream", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query_map", "Argument[0]", "sql-injection", "manual"]
       - ["<mysql_async::conn::Conn as mysql_async::queryable::Queryable>::query_iter", "Argument[0]", "sql-injection", "manual"]
       - ["<mysql_async::conn::Conn as mysql_async::queryable::Queryable>::prep", "Argument[0]", "sql-injection", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sourceModel
     data:
-      - ["<_ as mysql_async::queryable::Queryable>::query", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::exec", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::query_first", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "database", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::exec_first", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "database", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::query_fold", "Argument[2].Parameter[1]", "database", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::exec_fold", "Argument[3].Parameter[1]", "database", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
+      - ["<mysql_async::queryable::Queryable>::exec", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query_first", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "database", "manual"]
+      - ["<mysql_async::queryable::Queryable>::exec_first", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "database", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query_fold", "Argument[2].Parameter[1]", "database", "manual"]
+      - ["<mysql_async::queryable::Queryable>::exec_fold", "Argument[3].Parameter[1]", "database", "manual"]
       - ["<mysql_async::conn::Conn as mysql_async::queryable::Queryable>::query_iter", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
       - ["<mysql_async::conn::Conn as mysql_async::queryable::Queryable>::exec_iter", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::query_map", "Argument[1].Parameter[0]", "database", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::exec_map", "Argument[2].Parameter[0]", "database", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query_map", "Argument[1].Parameter[0]", "database", "manual"]
+      - ["<mysql_async::queryable::Queryable>::exec_map", "Argument[2].Parameter[0]", "database", "manual"]
       - ["<mysql_common::row::Row>::get", "ReturnValue.Field[core::option::Option::Some(0)]", "database", "manual"]
       - ["<mysql_common::row::Row>::get_opt", "ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]", "database", "manual"]
       - ["<mysql_common::row::Row>::take", "ReturnValue.Field[core::option::Option::Some(0)]", "database", "manual"]
@@ -35,9 +35,9 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
-      - ["<_ as mysql_async::queryable::Queryable>::query_fold", "Argument[1]", "Argument[2].Parameter[0]", "value", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::query_fold", "Argument[2].ReturnValue", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "value", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::exec_fold", "Argument[2]", "Argument[3].Parameter[0]", "value", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::exec_fold", "Argument[3].ReturnValue", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "value", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::query_map", "Argument[1].ReturnValue", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
-      - ["<_ as mysql_async::queryable::Queryable>::query_map", "Argument[2].ReturnValue", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query_fold", "Argument[1]", "Argument[2].Parameter[0]", "value", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query_fold", "Argument[2].ReturnValue", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "value", "manual"]
+      - ["<mysql_async::queryable::Queryable>::exec_fold", "Argument[2]", "Argument[3].Parameter[0]", "value", "manual"]
+      - ["<mysql_async::queryable::Queryable>::exec_fold", "Argument[3].ReturnValue", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "value", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query_map", "Argument[1].ReturnValue", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
+      - ["<mysql_async::queryable::Queryable>::query_map", "Argument[2].ReturnValue", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/mysql.model.yml b/rust/ql/lib/codeql/rust/frameworks/mysql.model.yml
index 7d6fa520eb85..819d4c65b8b4 100644
--- a/rust/ql/lib/codeql/rust/frameworks/mysql.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/mysql.model.yml
@@ -3,52 +3,52 @@ extensions:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
-      - ["<_ as mysql::conn::queryable::Queryable>::query", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_opt", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_drop", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_first", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_first_opt", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_fold", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_fold_opt", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_opt", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_drop", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_first", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_first_opt", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_fold", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_fold_opt", "Argument[0]", "sql-injection", "manual"]
       - ["<mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::query_iter", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_map", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_map_opt", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_map", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_map_opt", "Argument[0]", "sql-injection", "manual"]
       - ["<mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::prep", "Argument[0]", "sql-injection", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sourceModel
     data:
-      - ["<_ as mysql::conn::queryable::Queryable>::query", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_opt", "ReturnValue.Field[core::result::Result::Ok(0)].Element.Field[core::result::Result::Ok(0)]", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec_opt", "ReturnValue.Field[core::result::Result::Ok(0)].Element.Field[core::result::Result::Ok(0)]", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_first", "ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec_first", "ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_first_opt", "ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec_first_opt", "ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_fold", "Argument[2].Parameter[1]", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec_fold", "Argument[3].Parameter[1]", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_fold_opt", "Argument[2].Parameter[1].Field[core::result::Result::Ok(0)]", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec_fold_opt", "Argument[3].Parameter[1].Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_opt", "ReturnValue.Field[core::result::Result::Ok(0)].Element.Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec_opt", "ReturnValue.Field[core::result::Result::Ok(0)].Element.Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_first", "ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec_first", "ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_first_opt", "ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec_first_opt", "ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_fold", "Argument[2].Parameter[1]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec_fold", "Argument[3].Parameter[1]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_fold_opt", "Argument[2].Parameter[1].Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec_fold_opt", "Argument[3].Parameter[1].Field[core::result::Result::Ok(0)]", "database", "manual"]
       - ["<mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::query_iter", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
       - ["<mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::exec_iter", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_map", "Argument[1].Parameter[0]", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_map_opt", "Argument[1].Parameter[0].Field[core::result::Result::Ok(0)]", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec_map", "Argument[2].Parameter[0]", "database", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec_map_opt", "Argument[2].Parameter[0].Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_map", "Argument[1].Parameter[0]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_map_opt", "Argument[1].Parameter[0].Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec_map", "Argument[2].Parameter[0]", "database", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec_map_opt", "Argument[2].Parameter[0].Field[core::result::Result::Ok(0)]", "database", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
-      - ["<_ as mysql::conn::queryable::Queryable>::query_fold", "Argument[1]", "Argument[2].Parameter[0]", "value", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_fold", "Argument[2].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)]", "value", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec_fold", "Argument[2]", "Argument[3].Parameter[0]", "value", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec_fold", "Argument[3].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)]", "value", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_fold_opt", "Argument[1]", "Argument[2].Parameter[0]", "value", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_fold_opt", "Argument[2].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)]", "value", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec_fold_opt", "Argument[2]", "Argument[3].Parameter[0]", "value", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec_fold_opt", "Argument[3].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)]", "value", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_map", "Argument[1].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::query_map_opt", "Argument[1].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec_map", "Argument[2].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
-      - ["<_ as mysql::conn::queryable::Queryable>::exec_map_opt", "Argument[2].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_fold", "Argument[1]", "Argument[2].Parameter[0]", "value", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_fold", "Argument[2].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)]", "value", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec_fold", "Argument[2]", "Argument[3].Parameter[0]", "value", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec_fold", "Argument[3].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)]", "value", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_fold_opt", "Argument[1]", "Argument[2].Parameter[0]", "value", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_fold_opt", "Argument[2].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)]", "value", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec_fold_opt", "Argument[2]", "Argument[3].Parameter[0]", "value", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec_fold_opt", "Argument[3].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)]", "value", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_map", "Argument[1].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::query_map_opt", "Argument[1].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec_map", "Argument[2].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
+      - ["<mysql::conn::queryable::Queryable>::exec_map_opt", "Argument[2].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/native-tls.model.yml b/rust/ql/lib/codeql/rust/frameworks/native-tls.model.yml
index 1da63eb7961a..4d142efbd62c 100644
--- a/rust/ql/lib/codeql/rust/frameworks/native-tls.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/native-tls.model.yml
@@ -7,3 +7,11 @@ extensions:
       - ["<native_tls::TlsConnectorBuilder>::danger_accept_invalid_hostnames", "Argument[0]", "disable-certificate", "manual"]
       - ["<async_native_tls::connect::TlsConnector>::danger_accept_invalid_certs", "Argument[0]", "disable-certificate", "manual"]
       - ["<async_native_tls::connect::TlsConnector>::danger_accept_invalid_hostnames", "Argument[0]", "disable-certificate", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["<native_tls::TlsConnector>::connect", "Argument[1]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<async_native_tls::connect::TlsConnector>::connect", "Argument[1]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["async_native_tls::connect::connect", "Argument[1]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio_native_tls::TlsConnector>::connect", "Argument[1]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/rustcrypto/rustcrypto.model.yml b/rust/ql/lib/codeql/rust/frameworks/rustcrypto/rustcrypto.model.yml
index 7ceae820001c..e745e0caf9af 100644
--- a/rust/ql/lib/codeql/rust/frameworks/rustcrypto/rustcrypto.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/rustcrypto/rustcrypto.model.yml
@@ -3,19 +3,19 @@ extensions:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
-      - ["<_ as digest::digest::Digest>::new_with_prefix", "Argument[0]", "hasher-input", "manual"]
-      - ["<_ as digest::digest::Digest>::update", "Argument[0]", "hasher-input", "manual"]
-      - ["<_ as digest::digest::Digest>::chain_update", "Argument[0]", "hasher-input", "manual"]
-      - ["<_ as digest::digest::Digest>::digest", "Argument[0]", "hasher-input", "manual"]
+      - ["<digest::digest::Digest>::new_with_prefix", "Argument[0]", "hasher-input", "manual"]
+      - ["<digest::digest::Digest>::update", "Argument[0]", "hasher-input", "manual"]
+      - ["<digest::digest::Digest>::chain_update", "Argument[0]", "hasher-input", "manual"]
+      - ["<digest::digest::Digest>::digest", "Argument[0]", "hasher-input", "manual"]
       - ["md5::compute", "Argument[0]", "hasher-input", "manual"]
-      - ["<_ as crypto_common::KeyInit>::new", "Argument[0]", "credentials-key", "manual"]
-      - ["<_ as crypto_common::KeyInit>::new", "Argument[1]", "credentials-iv", "manual"]
-      - ["<_ as crypto_common::KeyInit>::new_from_slice", "Argument[0]", "credentials-key", "manual"]
-      - ["<_ as crypto_common::KeyInit>::new_from_slice", "Argument[1]", "credentials-iv", "manual"]
-      - ["<_ as crypto_common::KeyIvInit>::new", "Argument[0]", "credentials-key", "manual"]
-      - ["<_ as crypto_common::KeyIvInit>::new", "Argument[1]", "credentials-iv", "manual"]
-      - ["<_ as crypto_common::KeyIvInit>::new_from_slice", "Argument[0]", "credentials-key", "manual"]
-      - ["<_ as crypto_common::KeyIvInit>::new_from_slice", "Argument[1]", "credentials-iv", "manual"]
+      - ["<crypto_common::KeyInit>::new", "Argument[0]", "credentials-key", "manual"]
+      - ["<crypto_common::KeyInit>::new", "Argument[1]", "credentials-iv", "manual"]
+      - ["<crypto_common::KeyInit>::new_from_slice", "Argument[0]", "credentials-key", "manual"]
+      - ["<crypto_common::KeyInit>::new_from_slice", "Argument[1]", "credentials-iv", "manual"]
+      - ["<crypto_common::KeyIvInit>::new", "Argument[0]", "credentials-key", "manual"]
+      - ["<crypto_common::KeyIvInit>::new", "Argument[1]", "credentials-iv", "manual"]
+      - ["<crypto_common::KeyIvInit>::new_from_slice", "Argument[0]", "credentials-key", "manual"]
+      - ["<crypto_common::KeyIvInit>::new_from_slice", "Argument[1]", "credentials-iv", "manual"]
       - ["<cipher::stream_wrapper::StreamCipherCoreWrapper as crypto_common::KeyInit>::new", "Argument[0]", "credentials-key", "manual"]
       - ["<cipher::stream_wrapper::StreamCipherCoreWrapper as crypto_common::KeyInit>::new", "Argument[1]", "credentials-iv", "manual"]
       - ["<cipher::stream_wrapper::StreamCipherCoreWrapper as crypto_common::KeyInit>::new_from_slice", "Argument[0]", "credentials-key", "manual"]
@@ -32,4 +32,4 @@ extensions:
       - ["<digest::core_api::wrapper::CoreWrapper as crypto_common::KeyIvInit>::new", "Argument[1]", "credentials-iv", "manual"]
       - ["<digest::core_api::wrapper::CoreWrapper as crypto_common::KeyIvInit>::new_from_slice", "Argument[0]", "credentials-key", "manual"]
       - ["<digest::core_api::wrapper::CoreWrapper as crypto_common::KeyIvInit>::new_from_slice", "Argument[1]", "credentials-iv", "manual"]
-      - ["<_ as aead::Aead>::encrypt", "Argument[0]", "credentials-nonce", "manual"]
+      - ["<aead::Aead>::encrypt", "Argument[0]", "credentials-nonce", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/serde.model.yml b/rust/ql/lib/codeql/rust/frameworks/serde.model.yml
new file mode 100644
index 000000000000..4d1f2655f07d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/serde.model.yml
@@ -0,0 +1,25 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      # serde_json deserialization functions
+      - ["serde_json::de::from_str", "Argument[0]", "unsafe-deserialization", "manual"]
+      - ["serde_json::de::from_slice", "Argument[0]", "unsafe-deserialization", "manual"]
+      - ["serde_json::de::from_reader", "Argument[0]", "unsafe-deserialization", "manual"]
+      - ["serde_json::value::from_value", "Argument[0]", "unsafe-deserialization", "manual"]
+      - ["serde_json::value::from_value", "Argument[0].Field[serde_json::value::Value::String(0)]", "unsafe-deserialization", "manual"]
+      # bincode deserialization functions
+      - ["bincode::deserialize", "Argument[0]", "unsafe-deserialization", "manual"]
+      - ["bincode::deserialize_from", "Argument[0]", "unsafe-deserialization", "manual"]
+      # rmp_serde (MessagePack) deserialization functions
+      - ["rmp_serde::decode::from_slice", "Argument[0]", "unsafe-deserialization", "manual"]
+      - ["rmp_serde::decode::from_read", "Argument[0]", "unsafe-deserialization", "manual"]
+      # ciborium (CBOR) deserialization functions
+      - ["ciborium::de::from_reader", "Argument[0]", "unsafe-deserialization", "manual"]
+      # serde_yaml deserialization functions
+      - ["serde_yaml::de::from_str", "Argument[0]", "unsafe-deserialization", "manual"]
+      - ["serde_yaml::de::from_slice", "Argument[0]", "unsafe-deserialization", "manual"]
+      - ["serde_yaml::de::from_reader", "Argument[0]", "unsafe-deserialization", "manual"]
+      # toml deserialization
+      - ["toml::de::from_str", "Argument[0]", "unsafe-deserialization", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/sqlx.model.yml b/rust/ql/lib/codeql/rust/frameworks/sqlx.model.yml
index 082bde1f9425..4f6c2369b4d0 100644
--- a/rust/ql/lib/codeql/rust/frameworks/sqlx.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/sqlx.model.yml
@@ -10,7 +10,7 @@ extensions:
       - ["sqlx_core::query_scalar::query_scalar", "Argument[0]", "sql-injection", "manual"]
       - ["sqlx_core::query_scalar_with::query_scalar_with", "Argument[0]", "sql-injection", "manual"]
       - ["sqlx_core::raw_sql::raw_sql", "Argument[0]", "sql-injection", "manual"]
-      - ["<_ as sqlx_core::executor::Executor>::execute", "Argument[0]", "sql-injection", "manual"]
+      - ["<sqlx_core::executor::Executor>::execute", "Argument[0]", "sql-injection", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sourceModel
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/alloc.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/alloc.model.yml
index 78d1cbdec29e..21909e7a428e 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/alloc.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/alloc.model.yml
@@ -13,12 +13,13 @@ extensions:
       - ["alloc::alloc::alloc", "Argument[0]", "alloc-layout", "manual"]
       - ["alloc::alloc::alloc_zeroed", "Argument[0]", "alloc-layout", "manual"]
       - ["alloc::alloc::realloc", "Argument[2]", "alloc-size", "manual"]
-      - ["<_ as core::alloc::global::GlobalAlloc>::alloc", "Argument[0]", "alloc-layout", "manual"]
-      - ["<_ as core::alloc::global::GlobalAlloc>::alloc_zeroed", "Argument[0]", "alloc-layout", "manual"]
-      - ["<_ as core::alloc::Allocator>::allocate", "Argument[0]", "alloc-layout", "manual"]
-      - ["<_ as core::alloc::Allocator>::allocate_zeroed", "Argument[0]", "alloc-layout", "manual"]
-      - ["<_ as core::alloc::Allocator>::grow", "Argument[2]", "alloc-layout", "manual"]
-      - ["<_ as core::alloc::Allocator>::grow_zeroed", "Argument[2]", "alloc-layout", "manual"]
+      - ["<core::alloc::global::GlobalAlloc>::alloc", "Argument[0]", "alloc-layout", "manual"]
+      - ["<core::alloc::global::GlobalAlloc>::alloc_zeroed", "Argument[0]", "alloc-layout", "manual"]
+      - ["<core::alloc::global::GlobalAlloc>::realloc", "Argument[2]", "alloc-size", "manual"]
+      - ["<core::alloc::Allocator>::allocate", "Argument[0]", "alloc-layout", "manual"]
+      - ["<core::alloc::Allocator>::allocate_zeroed", "Argument[0]", "alloc-layout", "manual"]
+      - ["<core::alloc::Allocator>::grow", "Argument[2]", "alloc-layout", "manual"]
+      - ["<core::alloc::Allocator>::grow_zeroed", "Argument[2]", "alloc-layout", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: summaryModel
@@ -49,13 +50,16 @@ extensions:
       # String
       - ["<alloc::string::String>::as_str", "Argument[self].Reference", "ReturnValue.Reference", "taint", "manual"]
       - ["<alloc::string::String>::as_bytes", "Argument[self].Reference", "ReturnValue.Reference.Element", "taint", "manual"]
-      - ["<_ as alloc::string::ToString>::to_string", "Argument[self].Reference", "ReturnValue", "taint", "manual"]
+      - ["<alloc::string::ToString>::to_string", "Argument[self].Reference", "ReturnValue", "taint", "manual"]
         # Overwrite generated model
       - ["<alloc::string::String as core::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "manual"]
       - ["<alloc::string::String as core::ops::arith::Add>::add", "Argument[0].Reference", "ReturnValue", "taint", "manual"]
       # Vec
       - ["alloc::vec::from_elem", "Argument[0]", "ReturnValue.Element", "value", "manual"]
       - ["<alloc::vec::Vec as core::ops::deref::Deref>::deref", "Argument[self].Reference.Element", "ReturnValue.Reference.Element", "value", "manual"]
+      # ToOwned
+      - ["<alloc::borrow::ToOwned>::to_owned", "Argument[self].Reference", "ReturnValue", "taint", "manual"]
+      - ["<alloc::borrow::ToOwned>::clone_into", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: neutralModel
@@ -66,3 +70,29 @@ extensions:
       - ["<alloc::rc::Rc as core::convert::From>::from", "sink", "manual"]
       - ["<alloc::string::String>::split_off", "sink", "manual"]
       - ["<alloc::vec::Vec>::split_off", "sink", "manual"]
+      - ["<alloc::vec::Vec>::insert", "sink", "manual"]
+      - ["<alloc::vec::Vec>::insert_mut", "sink", "manual"]
+      - ["<alloc::vec::Vec>::remove", "sink", "manual"]
+      - ["<alloc::vec::Vec>::swap_remove", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque as alloc::collections::vec_deque::spec_extend::SpecExtend>::spec_extend", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque as core::iter::traits::collect::Extend>::extend_one", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque as core::iter::traits::collect::Extend>::extend_reserve", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque as std::io::Write>::write_all_vectored", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque as std::io::Write>::write_vectored", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::append", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::insert", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::insert_mut", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::make_contiguous", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::push_back", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::push_back_mut", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::push_front", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::push_front_mut", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::remove", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::reserve", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::reserve_exact", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::rotate_left", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::rotate_right", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::shrink_to", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::shrink_to_fit", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::try_reserve", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque>::try_reserve_exact", "sink", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/core.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/core.model.yml
index 895ebe98bd6b..604b92f33d1a 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/core.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/core.model.yml
@@ -6,102 +6,103 @@ extensions:
       # Builtin deref
       - ["<& as core::ops::deref::Deref>::deref", "Argument[self].Reference", "ReturnValue", "value", "manual"]
       - ["<&mut as core::ops::deref::Deref>::deref", "Argument[self].Reference", "ReturnValue", "value", "manual"]
-      - ["<_ as core::ops::deref::Deref>::deref", "Argument[self].Reference", "ReturnValue.Reference", "taint", "manual"]
+      - ["<core::ops::deref::Deref>::deref", "Argument[self].Reference", "ReturnValue.Reference", "taint", "manual"]
+        # for the pseudo implementation in `builtins/types.rs`
+      - ["<[;] as core::ops::deref::Deref>::deref", "Argument[self].Reference", "ReturnValue.Reference", "value", "manual"]
       # Index
-      - ["<_ as core::ops::index::Index>::index", "Argument[self].Reference.Element", "ReturnValue.Reference", "value", "manual"]
-      - ["<_ as core::ops::index::IndexMut>::index_mut", "Argument[self].Reference.Element", "ReturnValue.Reference", "value", "manual"]
+      - ["<core::ops::index::Index>::index", "Argument[self].Reference.Element", "ReturnValue.Reference", "value", "manual"]
+      - ["<core::ops::index::IndexMut>::index_mut", "Argument[self].Reference.Element", "ReturnValue.Reference", "value", "manual"]
       # Unary operators
-      - ["<_ as core::ops::arith::Neg>::neg", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<core::ops::arith::Neg>::neg", "Argument[self]", "ReturnValue", "taint", "manual"]
       - ["<core::num::wrapping::Wrapping as core::ops::arith::Neg>::neg", "Argument[self].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<core::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "manual"]
       - ["<core::num::wrapping::Wrapping as core::ops::bit::Not>::not", "Argument[self].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
       # Arithmetic operators
-      - ["<_ as core::ops::arith::Add>::add", "Argument[self,0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::ops::arith::Add>::add", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::arith::Sub>::sub", "Argument[self,0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::ops::arith::Sub>::sub", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::arith::Mul>::mul", "Argument[self,0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::ops::arith::Mul>::mul", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::arith::Div>::div", "Argument[self,0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::ops::arith::Div>::div", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::arith::Rem>::rem", "Argument[self,0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::ops::arith::Rem>::rem", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::Add>::add", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["<core::ops::arith::Add>::add", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::Sub>::sub", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["<core::ops::arith::Sub>::sub", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::Mul>::mul", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["<core::ops::arith::Mul>::mul", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::Div>::div", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["<core::ops::arith::Div>::div", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::Rem>::rem", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["<core::ops::arith::Rem>::rem", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
       # Arithmetic assignment expressions
-      - ["<_ as core::ops::arith::AddAssign>::add_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::arith::AddAssign>::add_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::arith::AddAssign>::add_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::arith::AddAssign>::add_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::arith::SubAssign>::sub_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::arith::SubAssign>::sub_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::arith::SubAssign>::sub_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::arith::SubAssign>::sub_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::arith::MulAssign>::mul_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::arith::MulAssign>::mul_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::arith::MulAssign>::mul_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::arith::MulAssign>::mul_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::arith::DivAssign>::div_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::arith::DivAssign>::div_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::arith::DivAssign>::div_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::arith::DivAssign>::div_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::arith::RemAssign>::rem_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::arith::RemAssign>::rem_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::arith::RemAssign>::rem_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::arith::RemAssign>::rem_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::AddAssign>::add_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::arith::AddAssign>::add_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::arith::AddAssign>::add_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::AddAssign>::add_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::SubAssign>::sub_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::arith::SubAssign>::sub_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::arith::SubAssign>::sub_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::SubAssign>::sub_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::MulAssign>::mul_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::arith::MulAssign>::mul_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::arith::MulAssign>::mul_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::MulAssign>::mul_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::DivAssign>::div_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::arith::DivAssign>::div_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::arith::DivAssign>::div_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::DivAssign>::div_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::RemAssign>::rem_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::arith::RemAssign>::rem_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::arith::RemAssign>::rem_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::arith::RemAssign>::rem_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
       # Bitwise operators
-      - ["<_ as core::ops::bit::BitAnd>::bitand", "Argument[self,0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitAnd>::bitand", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitOr>::bitor", "Argument[self,0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitOr>::bitor", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitXor>::bitxor", "Argument[self,0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitXor>::bitxor", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::BitAnd>::bitand", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["<core::ops::bit::BitAnd>::bitand", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::BitOr>::bitor", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["<core::ops::bit::BitOr>::bitor", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::BitXor>::bitxor", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["<core::ops::bit::BitXor>::bitxor", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
       # Bitwise assignment operators
-      - ["<_ as core::ops::bit::BitAndAssign>::bitand_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitAndAssign>::bitand_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitAndAssign>::bitand_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitAndAssign>::bitand_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitOrAssign>::bitor_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitOrAssign>::bitor_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitOrAssign>::bitor_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitOrAssign>::bitor_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitXorAssign>::bitxor_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitXorAssign>::bitxor_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitXorAssign>::bitxor_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::bit::BitXorAssign>::bitxor_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::BitAndAssign>::bitand_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::bit::BitAndAssign>::bitand_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::bit::BitAndAssign>::bitand_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::BitAndAssign>::bitand_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::BitOrAssign>::bitor_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::bit::BitOrAssign>::bitor_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::bit::BitOrAssign>::bitor_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::BitOrAssign>::bitor_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::BitXorAssign>::bitxor_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::bit::BitXorAssign>::bitxor_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::bit::BitXorAssign>::bitxor_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::BitXorAssign>::bitxor_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
       # Shift operators
-      - ["<_ as core::ops::bit::Shl>::shl", "Argument[self,0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::ops::bit::Shl>::shl", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::bit::Shr>::shr", "Argument[self,0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::ops::bit::Shr>::shr", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::Shl>::shl", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["<core::ops::bit::Shl>::shl", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::Shr>::shr", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["<core::ops::bit::Shr>::shr", "Argument[self,0].Field[core::num::wrapping::Wrapping(0)]", "ReturnValue.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
       # Shift assignment operators
-      - ["<_ as core::ops::bit::ShlAssign>::shl_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::bit::ShlAssign>::shl_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::bit::ShlAssign>::shl_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::bit::ShlAssign>::shl_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::bit::ShrAssign>::shr_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::bit::ShrAssign>::shr_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
-      - ["<_ as core::ops::bit::ShrAssign>::shr_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
-      - ["<_ as core::ops::bit::ShrAssign>::shr_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::ShlAssign>::shl_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::bit::ShlAssign>::shl_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::bit::ShlAssign>::shl_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::ShlAssign>::shl_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::ShrAssign>::shr_assign", "Argument[self].Reference", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::bit::ShrAssign>::shr_assign", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::ops::bit::ShrAssign>::shr_assign", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
+      - ["<core::ops::bit::ShrAssign>::shr_assign", "Argument[0].Field[core::num::wrapping::Wrapping(0)]", "Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]", "taint", "manual"]
       # Clone
-      - ["<_ as core::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "manual"]
+      - ["<core::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "manual"]
       # Conversions
-      - ["<_ as core::convert::Into>::into", "Argument[self].Element", "ReturnValue.Element", "taint", "manual"]
-      - ["<_ as core::convert::Into>::into", "Argument[self].Reference.Element", "ReturnValue.Element", "taint", "manual"]
+      - ["<core::convert::Into>::into", "Argument[self].Element", "ReturnValue.Element", "taint", "manual"]
+      - ["<core::convert::Into>::into", "Argument[self].Reference.Element", "ReturnValue.Element", "taint", "manual"]
       # From
-      - ["<_ as core::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["<core::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "manual"]
       # Iterator
       - ["<core::result::Result>::iter", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
-      - ["<_ as value_trait::array::Array>::iter", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
+      - ["<value_trait::array::Array>::iter", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
       - ["<core::result::Result>::iter_mut", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
       - ["<core::result::Result>::into_iter", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
-      - ["<_ as core::iter::traits::iterator::Iterator>::for_each", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
-      - ["<_ as core::iter::traits::iterator::Iterator>::nth", "Argument[self].Reference.Element", "ReturnValue.Field[core::option::Option::Some(0)]", "value", "manual"]
-      - ["<_ as core::iter::traits::iterator::Iterator>::next", "Argument[self].Reference.Element", "ReturnValue.Field[core::option::Option::Some(0)]", "value", "manual"]
-      - ["<_ as core::iter::traits::iterator::Iterator>::collect", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
-      - ["<_ as core::iter::traits::iterator::Iterator>::map", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
-      - ["<_ as core::iter::traits::iterator::Iterator>::for_each", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
-      - ["<_ as core::iter::traits::iterator::Iterator>::chain", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::iter::traits::iterator::Iterator>::chain", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::iter::traits::iterator::Iterator>::take", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<core::iter::traits::iterator::Iterator>::for_each", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
+      - ["<core::iter::traits::iterator::Iterator>::nth", "Argument[self].Reference.Element", "ReturnValue.Field[core::option::Option::Some(0)]", "value", "manual"]
+      - ["<core::iter::traits::iterator::Iterator>::next", "Argument[self].Reference.Element", "ReturnValue.Field[core::option::Option::Some(0)]", "value", "manual"]
+      - ["<core::iter::traits::iterator::Iterator>::collect", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
+      - ["<core::iter::traits::iterator::Iterator>::map", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
+      - ["<core::iter::traits::iterator::Iterator>::chain", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<core::iter::traits::iterator::Iterator>::chain", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["<core::iter::traits::iterator::Iterator>::take", "Argument[self]", "ReturnValue", "taint", "manual"]
       # Option
       - ["<core::option::Option>::map", "Argument[self].Field[core::option::Option::Some(0)]", "Argument[0].Parameter[0]", "value", "manual"]
       - ["<core::option::Option>::map", "Argument[0].ReturnValue", "ReturnValue.Field[core::option::Option::Some(0)]", "value", "manual"]
@@ -110,6 +111,7 @@ extensions:
       # This model is not precise, but helps in cases where a `Pin` is implicitly dereferenced.
       - ["<core::pin::Pin>::new", "Argument[0].Reference", "ReturnValue", "value", "manual"]
       - ["<core::pin::Pin>::new_unchecked", "Argument[0]", "ReturnValue.Field[core::pin::Pin::pointer]", "value", "manual"]
+      - ["core::pin::pin_new_unchecked_in_helper", "Argument[0].Reference.Field[core::pin::PinMacroHelper::value]", "ReturnValue.Field[core::pin::Pin::pointer].Reference", "value", "manual"]
       - ["<core::pin::Pin>::into_inner", "Argument[0].Field[core::pin::Pin::pointer]", "ReturnValue", "value", "manual"]
       - ["<core::pin::Pin>::into_inner_unchecked", "Argument[0].Field[core::pin::Pin::pointer]", "ReturnValue", "value", "manual"]
       - ["<core::pin::Pin>::set", "Argument[0]", "Argument[self].Reference.Field[core::pin::Pin::pointer]", "value", "manual"]
@@ -129,12 +131,19 @@ extensions:
       - ["<core::str>::parse", "Argument[self].Reference", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
       - ["<core::str>::trim", "Argument[self].Reference", "ReturnValue.Reference", "taint", "manual"]
       - ["<core::str>::to_string", "Argument[self].Reference", "ReturnValue", "taint", "manual"]
+      # Fmt
+      - ["<core::fmt::Write>::write_fmt", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::fmt::Write>::write_str", "Argument[0].Reference", "Argument[self].Reference", "taint", "manual"]
+      - ["<core::fmt::Write>::write_char", "Argument[0]", "Argument[self].Reference", "taint", "manual"]
+      - ["core::fmt::write", "Argument[1]", "Argument[0].Reference", "taint", "manual"]
       # Ord
-      - ["<_ as core::cmp::Ord>::min", "Argument[self,0]", "ReturnValue", "value", "manual"]
-      - ["<_ as core::cmp::Ord>::max", "Argument[self,0]", "ReturnValue", "value", "manual"]
-      - ["<_ as core::cmp::Ord>::clamp", "Argument[self,0,1]", "ReturnValue", "value", "manual"]
+      - ["<core::cmp::Ord>::min", "Argument[self,0]", "ReturnValue", "value", "manual"]
+      - ["<core::cmp::Ord>::max", "Argument[self,0]", "ReturnValue", "value", "manual"]
+      - ["<core::cmp::Ord>::clamp", "Argument[self,0,1]", "ReturnValue", "value", "manual"]
       # Slice
       - ["<[]>::get", "Argument[self].Reference.Element", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "value", "manual"]
+      - ["<[]>::iter", "Argument[self].Reference.Element", "ReturnValue.Element.Reference", "value", "manual"]
+      - ["<[]>::iter_mut", "Argument[self].Reference.Element", "ReturnValue.Element.Reference", "value", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sourceModel
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml
index 96f32915f739..a9c108102acf 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml
@@ -89,4 +89,6 @@ extensions:
       # Overwrite generated models
       - ["<std::fs::File as std::io::Read>::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
       - ["<std::fs::File as std::io::Read>::read_to_string", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::fs::File as alloc::io::read::Read>::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::fs::File as alloc::io::read::Read>::read_to_string", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
       
\ No newline at end of file
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/io.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/io.model.yml
index d3eb2fa58af3..779d0dc2a1fd 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/io.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/io.model.yml
@@ -9,20 +9,20 @@ extensions:
       extensible: summaryModel
     data:
       - ["<std::io::buffered::bufreader::BufReader>::new", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as std::io::BufRead>::fill_buf", "Argument[self].Reference", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<std::io::BufRead>::fill_buf", "Argument[self].Reference", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
       - ["<std::io::buffered::bufreader::BufReader>::buffer", "Argument[self].Reference", "ReturnValue.Reference", "taint", "manual"]
-      - ["<_ as std::io::Read>::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as std::io::Read>::read_to_string", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as std::io::Read>::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as std::io::Read>::read_exact", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as std::io::BufRead>::read_line", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as std::io::BufRead>::read_until", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
-      - ["<_ as std::io::BufRead>::split", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<_ as std::io::BufRead>::lines", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<_ as std::io::Read>::bytes", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<_ as std::io::Read>::chain", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<_ as std::io::Read>::chain", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as std::io::Read>::take", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<std::io::Read>::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::Read>::read_to_string", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::Read>::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::Read>::read_exact", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::BufRead>::read_line", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::BufRead>::read_until", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
+      - ["<std::io::BufRead>::split", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<std::io::BufRead>::lines", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<std::io::Read>::bytes", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<std::io::Read>::chain", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<std::io::Read>::chain", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["<std::io::Read>::take", "Argument[self]", "ReturnValue", "taint", "manual"]
       - ["<std::io::stdio::Stdin>::lock", "Argument[self].Reference", "ReturnValue", "taint", "manual"]
       - ["<std::io::stdio::Stdin>::read_line", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
       - ["<std::io::Split as core::iter::traits::iterator::Iterator>::next", "Argument[self].Reference.Element", "ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]", "value", "manual"]
@@ -41,3 +41,34 @@ extensions:
       - ["<std::io::stdio::StdinRaw as std::io::Read>::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
       - ["<std::io::stdio::StdinRaw as std::io::Read>::read_exact", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
       - ["<std::io::buffered::bufreader::BufReader as std::io::BufRead>::fill_buf", "Argument[self].Reference", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      # Rust 1.99 moved the shared I/O implementation from `std` to `alloc`.
+      - ["<alloc::io::buffered::bufreader::BufReader>::new", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["<alloc::io::buf_read::BufRead>::fill_buf", "Argument[self].Reference", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<alloc::io::buffered::bufreader::BufReader>::buffer", "Argument[self].Reference", "ReturnValue.Reference", "taint", "manual"]
+      - ["<alloc::io::read::Read>::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<alloc::io::read::Read>::read_to_string", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<alloc::io::read::Read>::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<alloc::io::read::Read>::read_exact", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<alloc::io::buf_read::BufRead>::read_line", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<alloc::io::buf_read::BufRead>::read_until", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
+      - ["<alloc::io::buf_read::BufRead>::split", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<alloc::io::buf_read::BufRead>::lines", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<alloc::io::read::Read>::bytes", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<alloc::io::read::Read>::chain", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<alloc::io::read::Read>::chain", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["<alloc::io::read::Read>::take", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<alloc::io::util::Split as core::iter::traits::iterator::Iterator>::next", "Argument[self].Reference.Element", "ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]", "value", "manual"]
+      - ["<std::io::stdio::Stdin as alloc::io::read::Read>::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::stdio::Stdin as alloc::io::read::Read>::read_to_string", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::stdio::Stdin as alloc::io::read::Read>::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::stdio::Stdin as alloc::io::read::Read>::read_exact", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::stdio::StdinLock as alloc::io::read::Read>::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::stdio::StdinLock as alloc::io::read::Read>::read_to_string", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::stdio::StdinLock as alloc::io::read::Read>::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::stdio::StdinLock as alloc::io::read::Read>::read_exact", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::stdio::StdinLock as alloc::io::buf_read::BufRead>::fill_buf", "Argument[self].Reference", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<std::io::stdio::StdinRaw as alloc::io::read::Read>::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::stdio::StdinRaw as alloc::io::read::Read>::read_to_string", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::stdio::StdinRaw as alloc::io::read::Read>::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<std::io::stdio::StdinRaw as alloc::io::read::Read>::read_exact", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<alloc::io::buffered::bufreader::BufReader as alloc::io::buf_read::BufRead>::fill_buf", "Argument[self].Reference", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/process.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/process.model.yml
new file mode 100644
index 000000000000..0187f073d679
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/process.model.yml
@@ -0,0 +1,15 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      # std::process::Command - the command name itself
+      - ["<std::process::Command>::new", "Argument[0]", "command-injection", "manual"]
+      # std::process::Command - arguments passed to the command
+      - ["<std::process::Command>::arg", "Argument[0]", "command-injection", "manual"]
+      - ["<std::process::Command>::args", "Argument[0]", "command-injection", "manual"]
+      # tokio::process::Command - the command name itself
+      - ["<tokio::process::Command>::new", "Argument[0]", "command-injection", "manual"]
+      # tokio::process::Command - arguments passed to the command
+      - ["<tokio::process::Command>::arg", "Argument[0]", "command-injection", "manual"]
+      - ["<tokio::process::Command>::args", "Argument[0]", "command-injection", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/tokio/io.model.yml b/rust/ql/lib/codeql/rust/frameworks/tokio/io.model.yml
index b5dafedb8b38..9e3a3f2ac8b8 100644
--- a/rust/ql/lib/codeql/rust/frameworks/tokio/io.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/tokio/io.model.yml
@@ -9,40 +9,40 @@ extensions:
       extensible: summaryModel
     data:
       - ["<tokio::io::util::buf_reader::BufReader>::new", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::fill_buf", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::fill_buf", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
       - ["<tokio::io::util::buf_reader::BufReader>::buffer", "Argument[self].Reference", "ReturnValue.Reference", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_to_string", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_exact", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::read_line", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::read_until", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::split", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_to_string", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_exact", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::read_line", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::read_until", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
+      - ["<tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::split", "Argument[self]", "ReturnValue", "taint", "manual"]
       - ["<tokio::io::util::split::Split>::next_segment", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::lines", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::lines", "Argument[self]", "ReturnValue", "taint", "manual"]
       - ["<tokio::io::util::lines::Lines>::next_line", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_buf", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u8", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u8_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u16", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u16_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u32", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u32_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u64", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u64_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u128", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u128_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i8", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i8_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i16", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i16_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i32", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i32_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i64", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i64_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i128", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i128_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_f32", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>:::read_f32_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_f64", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_f64_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_buf", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_u8", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_u8_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_u16", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_u16_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_u32", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_u32_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_u64", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_u64_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_u128", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_u128_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_i8", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_i8_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_i16", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_i16_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_i32", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_i32_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_i64", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_i64_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_i128", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_i128_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_f32", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_f32_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_f64", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<tokio::io::util::async_read_ext::AsyncReadExt>::read_f64_le", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/warp.model.yml b/rust/ql/lib/codeql/rust/frameworks/warp.model.yml
index 18757da57109..916b506fc9e4 100644
--- a/rust/ql/lib/codeql/rust/frameworks/warp.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/warp.model.yml
@@ -3,9 +3,9 @@ extensions:
       pack: codeql/rust-all
       extensible: sourceModel
     data:
-      - ["<_ as warp::filter::Filter>::then", "Argument[0].Parameter[0..7]", "remote", "manual"]
-      - ["<_ as warp::filter::Filter>::map", "Argument[0].Parameter[0..7]", "remote", "manual"]
-      - ["<_ as warp::filter::Filter>::and_then", "Argument[0].Parameter[0..7]", "remote", "manual"]
+      - ["<warp::filter::Filter>::then", "Argument[0].Parameter[0..7]", "remote", "manual"]
+      - ["<warp::filter::Filter>::map", "Argument[0].Parameter[0..7]", "remote", "manual"]
+      - ["<warp::filter::Filter>::and_then", "Argument[0].Parameter[0..7]", "remote", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sinkModel
diff --git a/rust/ql/lib/codeql/rust/internal/AstConsistency.qll b/rust/ql/lib/codeql/rust/internal/AstConsistency.qll
index 97f49a42560c..75a87c4e2866 100644
--- a/rust/ql/lib/codeql/rust/internal/AstConsistency.qll
+++ b/rust/ql/lib/codeql/rust/internal/AstConsistency.qll
@@ -5,6 +5,16 @@
 private import rust
 private import codeql.rust.elements.internal.generated.ParentChild
 
+private predicate missingToString(Element e) { not exists(e.toString()) }
+
+/**
+ * Holds if `e` lacks a `toString()` result.
+ */
+query predicate missingToString(Element e, string cls) {
+  missingToString(e) and
+  cls = e.getPrimaryQlClasses()
+}
+
 private predicate multipleToStrings(Element e) { strictcount(e.toString()) > 1 }
 
 /**
@@ -86,6 +96,9 @@ query predicate multipleVariableTargets(VariableAccess va, Variable v1) {
  */
 int getAstInconsistencyCounts(string type) {
   // total results from all the AST consistency query predicates.
+  type = "Missing toString" and
+  result = count(Element e | missingToString(e) | e)
+  or
   type = "Multiple toStrings" and
   result = count(Element e | multipleToStrings(e) | e)
   or
diff --git a/rust/ql/lib/codeql/rust/internal/CachedStages.qll b/rust/ql/lib/codeql/rust/internal/CachedStages.qll
index a92770ed2384..020cf83188e7 100644
--- a/rust/ql/lib/codeql/rust/internal/CachedStages.qll
+++ b/rust/ql/lib/codeql/rust/internal/CachedStages.qll
@@ -30,6 +30,8 @@ import rust
  * The `backref` predicate starts with `1 = 1 or` to ensure that the predicate will be optimized down to a constant by the optimizer.
  */
 module Stages {
+  private import codeql.rust.internal.typeinference.TypeInference as TypeInference
+
   /**
    * The abstract syntex tree (AST) stage.
    */
@@ -126,32 +128,7 @@ module Stages {
   /**
    * The type inference stage.
    */
-  cached
-  module TypeInferenceStage {
-    private import codeql.rust.internal.typeinference.Type
-    private import codeql.rust.internal.typeinference.TypeInference
-
-    /**
-     * Always holds.
-     * Ensures that a predicate is evaluated as part of the type inference stage.
-     */
-    cached
-    predicate ref() { 1 = 1 }
-
-    /**
-     * DO NOT USE!
-     *
-     * Contains references to each predicate that use the above `ref` predicate.
-     */
-    cached
-    predicate backref() {
-      1 = 1
-      or
-      exists(Type t)
-      or
-      exists(inferType(_))
-    }
-  }
+  module TypeInferenceStage = TypeInference::CachedStage;
 
   /**
    * The data flow stage.
diff --git a/rust/ql/lib/codeql/rust/internal/Definitions.qll b/rust/ql/lib/codeql/rust/internal/Definitions.qll
index aedcc3fc69c5..6055e1a9965b 100644
--- a/rust/ql/lib/codeql/rust/internal/Definitions.qll
+++ b/rust/ql/lib/codeql/rust/internal/Definitions.qll
@@ -8,6 +8,7 @@ private import codeql.rust.elements.Variable
 private import codeql.rust.elements.Locatable
 private import codeql.rust.elements.FormatArgsExpr
 private import codeql.rust.elements.FormatArgsArg
+private import codeql.rust.elements.Name
 private import codeql.rust.elements.Format
 private import codeql.rust.elements.MacroCall
 private import codeql.rust.elements.NamedFormatArgument
@@ -33,7 +34,7 @@ private module Cached {
   cached
   newtype TDef =
     TVariable(Variable v) or
-    TFormatArgsArgName(Name name) { name = any(FormatArgsArg a).getName() } or
+    TFormatArgsArgDef(Name name) { name = any(FormatArgsArg a).getName() } or
     TFormatArgsArgIndex(Expr e) { e = any(FormatArgsArg a).getExpr() } or
     TItemNode(ItemNode i)
 
@@ -58,7 +59,7 @@ class Definition extends Cached::TDef {
   /** Gets the location of this variable. */
   Location getLocation() {
     result = this.asVariable().getLocation() or
-    result = this.asName().getLocation() or
+    result = this.asFormatArgsArgName().getLocation() or
     result = this.asExpr().getLocation() or
     result = this.asItemNode().getLocation()
   }
@@ -66,8 +67,8 @@ class Definition extends Cached::TDef {
   /** Gets this definition as a `Variable` */
   Variable asVariable() { this = Cached::TVariable(result) }
 
-  /** Gets this definition as a `Name` */
-  Name asName() { this = Cached::TFormatArgsArgName(result) }
+  /** Gets this definition as a format argument name */
+  Name asFormatArgsArgName() { this = Cached::TFormatArgsArgDef(result) }
 
   /** Gets this definition as an `Expr` */
   Expr asExpr() { this = Cached::TFormatArgsArgIndex(result) }
@@ -79,7 +80,7 @@ class Definition extends Cached::TDef {
   string toString() {
     result = this.asExpr().toString() or
     result = this.asVariable().toString() or
-    result = this.asName().getText() or
+    result = this.asFormatArgsArgName().toString() or
     result = this.asItemNode().toString()
   }
 }
@@ -100,12 +101,11 @@ private class NamedFormatArgumentUse extends Use instanceof NamedFormatArgument
   NamedFormatArgumentUse() {
     exists(FormatArgsExpr parent |
       parent = this.getParent().getParent() and
-      parent.getAnArg().getName() = def and
-      this.getName() = def.getText()
+      parent.getAnArg().getName() = def
     )
   }
 
-  override Definition getDefinition() { result.asName() = def }
+  override Definition getDefinition() { result.asFormatArgsArgName() = def }
 
   override string getUseType() { result = "format argument" }
 }
diff --git a/rust/ql/lib/codeql/rust/internal/PathResolution.qll b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
index 1d2c70848247..30ddb6f12c36 100644
--- a/rust/ql/lib/codeql/rust/internal/PathResolution.qll
+++ b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
@@ -48,6 +48,7 @@ private import codeql.rust.elements.internal.CallExprImpl::Impl as CallExprImpl
 private import codeql.rust.internal.CachedStages
 private import codeql.rust.frameworks.stdlib.Builtins as Builtins
 private import codeql.util.Option
+private import codeql.util.SemVer
 
 private newtype TNamespace =
   TTypeNamespace() or
@@ -263,7 +264,7 @@ abstract class ItemNode extends Locatable {
   pragma[nomagic]
   final Attr getAttr(string name) {
     result = this.getAnAttr() and
-    result.getMeta().getPath().(PathExt).isUnqualified(name)
+    result.getMeta().getMetaPath().(PathExt).isUnqualified(name)
   }
 
   final predicate hasAttr(string name) { exists(this.getAttr(name)) }
@@ -426,7 +427,7 @@ abstract class ItemNode extends Locatable {
       if
         this instanceof Module or
         this instanceof Enum or
-        this instanceof Struct or
+        this instanceof Trait or
         this instanceof Crate
       then (
         kind.isBoth() and
@@ -568,6 +569,16 @@ class CrateItemNode extends NamedItemNode instanceof Crate {
     )
   }
 
+  pragma[nomagic]
+  predicate isLatestVersion(string name) {
+    this =
+      max(CrateItemNode c, string ver |
+        name = c.getName() and ver = padSemVer(c.(Crate).getVersion())
+      |
+        c order by ver
+      )
+  }
+
   override string getName() { result = Crate.super.getName() }
 
   override Namespace getNamespace() {
@@ -874,7 +885,12 @@ final class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
    */
   predicate isBlanketImplementation() { exists(this.getBlanketImplementationTypeParam()) }
 
-  override predicate hasCanonicalPath(Crate c) { this.resolveSelfTy().hasCanonicalPathPrefix(c) }
+  override predicate hasCanonicalPath(Crate c) {
+    this.resolveSelfTy().hasCanonicalPathPrefix(c)
+    or
+    this.isBlanketImplementation() and
+    c.getASourceFile().getFile() = this.getFile()
+  }
 
   /**
    * Holds if `(c1, c2)` forms a pair of crates for the type and trait
@@ -920,7 +936,12 @@ final class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
     result = "<"
     or
     i = 1 and
-    result = this.getSelfCanonicalPath(c)
+    (
+      result = this.getSelfCanonicalPath(c)
+      or
+      this.isBlanketImplementation() and
+      result = "_"
+    )
     or
     if exists(this.getTraitPath())
     then
@@ -1095,7 +1116,7 @@ final class TraitItemNode extends ImplOrTraitItemNode, NamedItemNode, TypeItemNo
   bindingset[c]
   private string getCanonicalPathPart(Crate c, int i) {
     i = 0 and
-    result = "<_ as "
+    result = "<"
     or
     i = 1 and
     result = this.getCanonicalPathPrefix(c)
@@ -1379,8 +1400,8 @@ private predicate fileModuleInlineLate(SourceFile f, string name, Folder folder)
  * [1]: https://doc.rust-lang.org/reference/items/modules.html#r-items.mod.outlined.path
  */
 private Meta getPathAttrMeta(Module m) {
-  result = m.getAnAttr().getMeta() and
-  result.getPath().getText() = "path"
+  result = m.getAnAttr().(Attr).getMeta() and
+  result.getMetaPath().getText() = "path"
 }
 
 /**
@@ -1441,7 +1462,7 @@ private predicate modImportNestedLookup(Module m, ModuleItemNode ancestor, Folde
 }
 
 private predicate pathAttrImport(Folder f, Module m, string relativePath) {
-  exists(Meta meta |
+  exists(KeyValueMeta meta |
     f = m.getFile().getParentContainer() and
     meta = getPathAttrMeta(m) and
     relativePath = meta.getExpr().(LiteralExpr).getTextValue().regexpCapture("\"(.+)\"", 1)
@@ -1519,11 +1540,11 @@ private predicate crateDependencyEdge(SourceFileItemNode file, string name, Crat
   crateDependency(file, name, dep)
   or
   // As a fallback, give all files access to crates that do not conflict with known dependencies
-  // and declarations. This is in order to workaround incomplete crate dependency information
-  // provided by the extractor, as well as `CrateItemNode.getASourceFile()` being unable to map
-  // a given file to its crate (for example, if the file is `mod` imported inside a macro that the
-  // extractor is unable to expand).
-  name = dep.getName() and
+  // and declarations, as long as those crates have a unique latest version.
+  // This is in order to workaround incomplete crate dependency information provided by the extractor,
+  // as well as `CrateItemNode.getASourceFile()` being unable to map a given file to its crate (for
+  // example, if the file is `mod` imported inside a macro that the extractor is unable to expand).
+  dep = unique(CrateItemNode dep0 | dep0.isLatestVersion(name)) and
   not hasDeclOrDep(file, name)
 }
 
@@ -1825,7 +1846,7 @@ private module DollarCrateResolution {
     or
     exists(ItemNode type |
       expansion = type.(TypeItem).getDeriveMacroExpansion(_) and
-      macroDefPath = type.getAttr("derive").getMeta().getPath()
+      macroDefPath = type.getAttr("derive").getMeta().getMetaPath()
     )
   }
 
@@ -1962,7 +1983,7 @@ private predicate pathUsesNamespace(PathExt p, Namespace n) {
   or
   n.isType() and
   (
-    p = any(Visibility v).getPath()
+    p = any(Visibility v).getVisibilityInner().getPath()
     or
     p = any(StructExpr re).getPath()
     or
@@ -1984,7 +2005,7 @@ private predicate pathUsesNamespace(PathExt p, Namespace n) {
   (
     p = any(MacroCall mc).getPath()
     or
-    p = any(Meta m).getPath()
+    p = any(Meta m).getMetaPath()
   )
 }
 
@@ -2375,6 +2396,11 @@ private module Debug {
     useImportEdge(use, name, item, kind)
   }
 
+  predicate debugCrateDependencyEdge(SourceFileItemNode file, string name, CrateItemNode dep) {
+    file = getRelevantLocatable() and
+    crateDependencyEdge(file, name, dep)
+  }
+
   ItemNode debugGetASuccessor(ItemNode i, string name, SuccessorKind kind) {
     i = getRelevantLocatable() and
     result = i.getASuccessor(name, kind, _)
@@ -2399,4 +2425,10 @@ private module Debug {
     result = i.getCanonicalPath(c) and
     i = getRelevantLocatable()
   }
+
+  predicate debugCallTargetCanonicalPath(Call call, Function f, string path) {
+    call = getRelevantLocatable() and
+    f = call.getStaticTarget() and
+    path = f.getCanonicalPath()
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll b/rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll
index 7c56300f3581..68242aa41d36 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll
@@ -96,8 +96,7 @@ module SatisfiesBlanketConstraint<
 
     Type getTypeAt(TypePath path) {
       result = at.getTypeAt(blanketPath.appendInverse(path)) and
-      not result = TNeverType() and
-      not result = TUnknownType()
+      not result instanceof PseudoType
     }
 
     string toString() { result = at.toString() + " [blanket at " + blanketPath.toString() + "]" }
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/DerefChain.qll b/rust/ql/lib/codeql/rust/internal/typeinference/DerefChain.qll
index 5c40f623f170..f71bb093c3b7 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/DerefChain.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/DerefChain.qll
@@ -60,7 +60,10 @@ private module UnboundListInput implements UnboundListImpl::InputSig<Location> {
 
   class Element = DerefImplItemNode;
 
-  int getId(Element e) { idOfRaw(Synth::convertAstNodeToRaw(e), result) }
+  int getId(Element e) {
+    CachedStage::ref() and
+    idOfRaw(Synth::convertAstNodeToRaw(e), result)
+  }
 
   string getElementString(Element e) { result = e.resolveSelfTy().getName() }
 
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll
index 9af026149cc9..6f7aa7b50f33 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll
@@ -166,9 +166,9 @@ predicate traitTypeParameterOccurrence(
 }
 
 pragma[nomagic]
-private predicate functionResolutionDependsOnArgumentCand(
-  ImplItemNode impl, Function f, string functionName, TypeParameter traitTp, FunctionPosition pos,
-  TypePath path
+predicate functionResolutionDependsOnArgumentCand(
+  ImplItemNode impl, Function f, string functionName, TypeParamTypeParameter traitTp,
+  FunctionPosition pos, TypePath path
 ) {
   /*
    * As seen in the example below, when an implementation has a sibling for a
@@ -199,12 +199,14 @@ private predicate functionResolutionDependsOnArgumentCand(
   )
 }
 
-private predicate functionResolutionDependsOnPositionalArgumentCand(
-  ImplItemNode impl, Function f, string functionName, TypeParameter traitTp
+pragma[nomagic]
+predicate functionResolutionDependsOnPositionalArgumentCand(
+  ImplItemNode impl, Function f, string functionName, TypeParamTypeParameter traitTp, int pos,
+  TypePath path
 ) {
-  exists(FunctionPosition pos |
-    functionResolutionDependsOnArgumentCand(impl, f, functionName, traitTp, pos, _) and
-    pos.isPosition()
+  exists(FunctionPosition pos0 |
+    functionResolutionDependsOnArgumentCand(impl, f, functionName, traitTp, pos0, path) and
+    pos = pos0.asPosition()
   )
 }
 
@@ -223,7 +225,7 @@ private Type getAssocFunctionNonTypeParameterTypeAt(
  */
 pragma[nomagic]
 private predicate hasEquivalentPositionalSibling(
-  ImplItemNode impl, ImplItemNode sibling, Function f, TypeParameter traitTp
+  ImplItemNode impl, ImplItemNode sibling, Function f, TypeParamTypeParameter traitTp
 ) {
   exists(string functionName, FunctionPosition pos, TypePath path |
     functionResolutionDependsOnArgumentCand(impl, f, functionName, traitTp, pos, path) and
@@ -255,7 +257,7 @@ private predicate hasEquivalentPositionalSibling(
  *
  * `traitTp` is a type parameter of the trait being implemented by `impl`, and
  * we need to check that the type of `f` corresponding to `traitTp` is satisfied
- * at any one of the positions `pos` in which that type occurs in `f`.
+ * at any one of the positions `pos` in which that type occurs at `path` in `f`.
  *
  * Type parameters that only occur in return positions are only included when
  * all other type parameters that occur in a positional position are insufficient
@@ -283,19 +285,20 @@ private predicate hasEquivalentPositionalSibling(
  */
 pragma[nomagic]
 predicate functionResolutionDependsOnArgument(
-  ImplItemNode impl, Function f, TypeParameter traitTp, FunctionPosition pos
+  ImplItemNode impl, Function f, TypeParamTypeParameter traitTp, FunctionPosition pos, TypePath path
 ) {
   exists(string functionName |
-    functionResolutionDependsOnArgumentCand(impl, f, functionName, traitTp, pos, _)
+    functionResolutionDependsOnArgumentCand(impl, f, functionName, traitTp, pos, path)
   |
-    if functionResolutionDependsOnPositionalArgumentCand(impl, f, functionName, traitTp)
+    if functionResolutionDependsOnPositionalArgumentCand(impl, f, functionName, traitTp, _, _)
     then any()
     else
       // `traitTp` only occurs in return position; check that it is indeed needed for disambiguation
       exists(ImplItemNode sibling |
         implSiblings(_, impl, sibling) and
-        forall(TypeParameter otherTraitTp |
-          functionResolutionDependsOnPositionalArgumentCand(impl, f, functionName, otherTraitTp)
+        forall(TypeParamTypeParameter otherTraitTp |
+          functionResolutionDependsOnPositionalArgumentCand(impl, f, functionName, otherTraitTp, _,
+            _)
         |
           hasEquivalentPositionalSibling(impl, sibling, f, otherTraitTp)
         )
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll
index d128875eda7e..730be63db6a6 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll
@@ -329,8 +329,7 @@ module ArgIsInstantiationOf<ArgSig Arg, IsInstantiationOfInputSig<Arg, AssocFunc
   private class ArgSubst extends ArgFinal {
     Type getTypeAt(TypePath path) {
       result = substituteLookupTraits0(this.getEnclosingItemNode(), super.getTypeAt(path)) and
-      not result = TNeverType() and
-      not result = TUnknownType()
+      not result instanceof PseudoType
     }
   }
 
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/Type.qll b/rust/ql/lib/codeql/rust/internal/typeinference/Type.qll
index 9ae79f2d58c9..66151047eca2 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/Type.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/Type.qll
@@ -36,8 +36,13 @@ newtype TType =
   TTrait(Trait t) or
   TImplTraitType(ImplTraitTypeRepr impl) or
   TDynTraitType(Trait t) { t = any(DynTraitTypeRepr dt).getTrait() } or
-  TNeverType() or
   TUnknownType() or
+  TClosureParameterPseudoType(Param p) {
+    exists(ClosureExpr ce |
+      p = ce.getParam(_) and
+      not p.hasTypeRepr()
+    )
+  } or
   TTypeParamTypeParameter(TypeParam t) or
   TAssociatedTypeTypeParameter(Trait trait, AssocType typeAlias) {
     getTraitAssocType(trait) = typeAlias
@@ -326,14 +331,6 @@ TypeParamTypeParameter getSliceTypeParameter() {
   result = any(SliceType t).getPositionalTypeParameter(0)
 }
 
-class NeverType extends Type, TNeverType {
-  override TypeParameter getPositionalTypeParameter(int i) { none() }
-
-  override string toString() { result = "!" }
-
-  override Location getLocation() { result instanceof EmptyLocation }
-}
-
 abstract class PtrType extends StructType { }
 
 pragma[nomagic]
@@ -355,6 +352,10 @@ class PtrConstType extends PtrType {
   override string toString() { result = "*const" }
 }
 
+abstract class PseudoType extends Type {
+  override TypeParameter getPositionalTypeParameter(int i) { none() }
+}
+
 /**
  * A special pseudo type used to indicate that the actual type may have to be
  * inferred by propagating type information back into call arguments.
@@ -377,14 +378,24 @@ class PtrConstType extends PtrType {
  * into call arguments (including method call receivers), in order to avoid
  * combinatorial explosions.
  */
-class UnknownType extends Type, TUnknownType {
-  override TypeParameter getPositionalTypeParameter(int i) { none() }
-
-  override string toString() { result = "(context typed)" }
+class UnknownType extends PseudoType, TUnknownType {
+  override string toString() { result = "(unknown type)" }
 
   override Location getLocation() { result instanceof EmptyLocation }
 }
 
+class ClosureParameterPseudoType extends PseudoType, TClosureParameterPseudoType {
+  private Param param;
+
+  ClosureParameterPseudoType() { this = TClosureParameterPseudoType(param) }
+
+  Param getParam() { result = param }
+
+  override string toString() { result = "(closure parameter " + param + ")" }
+
+  override Location getLocation() { result = param.getLocation() }
+}
+
 /** A type parameter. */
 abstract class TypeParameter extends Type {
   override TypeParameter getPositionalTypeParameter(int i) { none() }
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll b/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
index b5ed2be06f97..0a26d0a0cbbb 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
@@ -14,22 +14,14 @@ private import FunctionType
 private import FunctionOverloading as FunctionOverloading
 private import BlanketImplementation as BlanketImplementation
 private import codeql.rust.elements.internal.VariableImpl::Impl as VariableImpl
-private import codeql.rust.internal.CachedStages
 private import codeql.typeinference.internal.TypeInference
 private import codeql.rust.frameworks.stdlib.Stdlib
 private import codeql.rust.frameworks.stdlib.Builtins as Builtins
 private import codeql.rust.elements.internal.CallExprImpl::Impl as CallExprImpl
+private import utils.test.InlineExpectationsTest
 
 class Type = T::Type;
 
-private newtype TTypeArgumentPosition =
-  // method type parameters are matched by position instead of by type
-  // parameter entity, to avoid extra recursion through method call resolution
-  TMethodTypeArgumentPosition(int pos) {
-    exists(any(MethodCallExpr mce).getGenericArgList().getTypeArg(pos))
-  } or
-  TTypeParamTypeArgumentPosition(TypeParam tp)
-
 private module Input1 implements InputSig1<Location> {
   private import Type as T
   private import codeql.rust.elements.internal.generated.Raw
@@ -37,63 +29,14 @@ private module Input1 implements InputSig1<Location> {
 
   class Type = T::Type;
 
-  predicate isPseudoType(Type t) {
-    t instanceof UnknownType or
-    t instanceof NeverType
-  }
+  class PseudoType = T::PseudoType;
 
   class TypeParameter = T::TypeParameter;
 
   class TypeAbstraction = TA::TypeAbstraction;
 
-  class TypeArgumentPosition extends TTypeArgumentPosition {
-    int asMethodTypeArgumentPosition() { this = TMethodTypeArgumentPosition(result) }
-
-    TypeParam asTypeParam() { this = TTypeParamTypeArgumentPosition(result) }
-
-    string toString() {
-      result = this.asMethodTypeArgumentPosition().toString()
-      or
-      result = this.asTypeParam().toString()
-    }
-  }
-
-  private newtype TTypeParameterPosition =
-    TTypeParamTypeParameterPosition(TypeParam tp) or
-    TImplicitTypeParameterPosition()
-
-  class TypeParameterPosition extends TTypeParameterPosition {
-    TypeParam asTypeParam() { this = TTypeParamTypeParameterPosition(result) }
-
-    /**
-     * Holds if this is the implicit type parameter position used to represent
-     * parameters that are never passed explicitly as arguments.
-     */
-    predicate isImplicit() { this = TImplicitTypeParameterPosition() }
-
-    string toString() {
-      result = this.asTypeParam().toString()
-      or
-      result = "Implicit" and this.isImplicit()
-    }
-  }
-
-  /** Holds if `typeParam`, `param` and `ppos` all concern the same `TypeParam`. */
-  additional predicate typeParamMatchPosition(
-    TypeParam typeParam, TypeParamTypeParameter param, TypeParameterPosition ppos
-  ) {
-    typeParam = param.getTypeParam() and typeParam = ppos.asTypeParam()
-  }
-
-  bindingset[apos]
-  bindingset[ppos]
-  predicate typeArgumentParameterPositionMatch(TypeArgumentPosition apos, TypeParameterPosition ppos) {
-    apos.asTypeParam() = ppos.asTypeParam()
-    or
-    apos.asMethodTypeArgumentPosition() = ppos.asTypeParam().getPosition()
-  }
-
   int getTypeParameterId(TypeParameter tp) {
+    CachedStage::ref() and
     tp =
       rank[result](TypeParameter tp0, int kind, int id1, int id2 |
         kind = 1 and
@@ -272,26 +215,6 @@ private module M2 = Make2<TypeMention, Input2>;
 
 import M2
 
-module Consistency {
-  import M2::Consistency
-
-  private Type inferCertainTypeAdj(AstNode n, TypePath path) {
-    result = CertainTypeInference::inferCertainType(n, path) and
-    not result = TNeverType()
-  }
-
-  predicate nonUniqueCertainType(AstNode n, TypePath path, Type t) {
-    strictcount(inferCertainTypeAdj(n, path)) > 1 and
-    t = inferCertainTypeAdj(n, path) and
-    // Suppress the inconsistency if `n` is a self parameter and the type
-    // mention for the self type has multiple types for a path.
-    not exists(ImplItemNode impl, TypePath selfTypePath |
-      n = impl.getAnAssocItem().(Function).getSelfParam() and
-      strictcount(impl.(Impl).getSelfTy().(TypeMention).getTypeAt(selfTypePath)) > 1
-    )
-  }
-}
-
 /** A function without a `self` parameter. */
 private class NonMethodFunction extends Function {
   NonMethodFunction() { not this.hasSelfParam() }
@@ -329,933 +252,182 @@ private class FunctionDeclaration extends Function {
     or
     this = i.asSome().getAnAssocItem()
   }
-
-  TypeParam getTypeParam(ImplOrTraitItemNodeOption i) {
-    i = parent and
-    result = [this.getGenericParamList().getATypeParam(), i.asSome().getTypeParam(_)]
-  }
-
-  TypeParameter getTypeParameter(ImplOrTraitItemNodeOption i, TypeParameterPosition ppos) {
-    typeParamMatchPosition(this.getTypeParam(i), result, ppos)
-    or
-    // For every `TypeParam` of this function, any associated types accessed on
-    // the type parameter are also type parameters.
-    ppos.isImplicit() and
-    result.(TypeParamAssociatedTypeTypeParameter).getTypeParam() = this.getTypeParam(i)
-    or
-    i = parent and
-    (
-      ppos.isImplicit() and result = TSelfTypeParameter(i.asSome())
-      or
-      ppos.isImplicit() and result.(AssociatedTypeTypeParameter).getTrait() = i.asSome()
-      or
-      ppos.isImplicit() and this = result.(ImplTraitTypeTypeParameter).getFunction()
-    )
-  }
-
-  pragma[nomagic]
-  Type getParameterType(ImplOrTraitItemNodeOption i, FunctionPosition pos, TypePath path) {
-    i = parent and
-    (
-      not pos.isReturn() and
-      result = getAssocFunctionTypeAt(this, i.asSome(), pos, path)
-      or
-      i.isNone() and
-      result = this.getParam(pos.asPosition()).getTypeRepr().(TypeMention).getTypeAt(path)
-    )
-  }
-
-  private Type resolveRetType(ImplOrTraitItemNodeOption i, TypePath path) {
-    i = parent and
-    (
-      result =
-        getAssocFunctionTypeAt(this, i.asSome(), any(FunctionPosition ret | ret.isReturn()), path)
-      or
-      i.isNone() and
-      result = getReturnTypeMention(this).getTypeAt(path)
-    )
-  }
-
-  Type getReturnType(ImplOrTraitItemNodeOption i, TypePath path) {
-    if this.isAsync()
-    then
-      i = parent and
-      path.isEmpty() and
-      result = getFutureTraitType()
-      or
-      exists(TypePath suffix |
-        result = this.resolveRetType(i, suffix) and
-        path = TypePath::cons(getDynFutureOutputTypeParameter(), suffix)
-      )
-    else result = this.resolveRetType(i, path)
-  }
-
-  string toStringExt(ImplOrTraitItemNode i) {
-    i = parent.asSome() and
-    if this = i.getAnAssocItem()
-    then result = this.toString()
-    else
-      result = this + " [" + [i.(Impl).getSelfTy().toString(), i.(Trait).getName().toString()] + "]"
-  }
 }
 
 private class AssocFunctionDeclaration extends FunctionDeclaration {
   AssocFunctionDeclaration() { this.isAssoc(_) }
 }
 
+/**
+ * Holds if `me` is a call to the `panic!` macro.
+ *
+ * `panic!` needs special treatment, because it expands to a block expression
+ * that looks like it should have type `()` instead of the correct `!` type.
+ */
 pragma[nomagic]
-private TypeMention getCallExprTypeMentionArgument(CallExpr ce, TypeArgumentPosition apos) {
-  exists(Path p, int i | p = CallExprImpl::getFunctionPath(ce) |
-    apos.asTypeParam() = resolvePath(p).getTypeParam(pragma[only_bind_into](i)) and
-    result = getPathTypeArgument(p, pragma[only_bind_into](i))
-  )
+private predicate isPanicMacroCall(MacroExpr me) {
+  me.getMacroCall().resolveMacro().(MacroRules).getName().getText() = "panic"
 }
 
-pragma[nomagic]
-private Type getCallExprTypeArgument(CallExpr ce, TypeArgumentPosition apos, TypePath path) {
-  result = getCallExprTypeMentionArgument(ce, apos).getTypeAt(path)
-  or
-  // Handle constructions that use `Self(...)` syntax
-  exists(Path p, TypePath path0 |
-    p = CallExprImpl::getFunctionPath(ce) and
-    result = p.(TypeMention).getTypeAt(path0) and
-    path0.isCons(TTypeParamTypeParameter(apos.asTypeParam()), path)
-  )
+private Type inferStructExprType(StructExpr se, TypePath path) {
+  result = se.getPath().(TypeMention).getTypeAt(path)
 }
 
-/** Gets the type annotation that applies to `n`, if any. */
-private TypeMention getTypeAnnotation(AstNode n) {
-  exists(LetStmt let |
-    n = let.getPat() and
-    result = let.getTypeRepr()
-  )
-  or
-  result = n.(SelfParam).getTypeRepr()
-  or
-  exists(Param p |
-    n = p.getPat() and
-    result = p.getTypeRepr()
-  )
+private Type inferStructPatType(StructPat sp, TypePath path) {
+  result = sp.getPath().(TypeMention).getTypeAt(path)
 }
 
-/** Gets the type of `n`, which has an explicit type annotation. */
 pragma[nomagic]
-private Type inferAnnotatedType(AstNode n, TypePath path) {
-  result = getTypeAnnotation(n).getTypeAt(path)
+private Struct getRangeType(RangeExpr re) {
+  re instanceof RangeFromExpr and
+  result instanceof RangeFromStruct
+  or
+  re instanceof RangeToExpr and
+  result instanceof RangeToStruct
+  or
+  re instanceof RangeFromToExpr and
+  result instanceof RangeStruct
+  or
+  re instanceof RangeInclusiveExpr and
+  result instanceof RangeInclusiveStruct
   or
-  result = n.(ShorthandSelfParameterMention).getTypeAt(path)
+  re instanceof RangeToInclusiveExpr and
+  result instanceof RangeToInclusiveStruct
 }
 
 pragma[nomagic]
-private Type inferFunctionBodyType(AstNode n, TypePath path) {
-  exists(Function f |
-    n = f.getFunctionBody() and
-    result = getReturnTypeMention(f).getTypeAt(path) and
-    not exists(ImplTraitReturnType i | i.getFunction() = f |
-      result = i or result = i.getATypeParameter()
-    )
-  )
+private DataType inferRangeFullExprType(RangeFullExpr re) {
+  exists(re) and result.getTypeItem() instanceof RangeFullStruct
 }
 
-/**
- * Holds if `me` is a call to the `panic!` macro.
- *
- * `panic!` needs special treatment, because it expands to a block expression
- * that looks like it should have type `()` instead of the correct `!` type.
- */
 pragma[nomagic]
-private predicate isPanicMacroCall(MacroExpr me) {
-  me.getMacroCall().resolveMacro().(MacroRules).getName().getText() = "panic"
+private TupleType inferTupleRootType(AstNode n) {
+  result.getArity() = [n.(TupleExpr).getNumberOfFields(), n.(TuplePat).getTupleArity()]
 }
 
-// Due to "binding modes" the type of the pattern is not necessarily the
-// same as the type of the initializer. However, when the pattern is an
-// identifier pattern, its type is guaranteed to be the same as the type of the
-// initializer.
-private predicate identLetStmt(LetStmt let, IdentPat lhs, Expr rhs) {
-  let.getPat() = lhs and
-  let.getInitializer() = rhs
+pragma[nomagic]
+private Path getCallExprPathQualifier(CallExpr ce) {
+  result = CallExprImpl::getFunctionPath(ce).getQualifier()
 }
 
 /**
- * Gets the root type of a closure.
+ * Gets the type qualifier of function call `ce`, if any.
+ *
+ * For example, the type qualifier of `Foo::<i32>::default()` is `Foo::<i32>`,
+ * but only when `Foo` is not a trait. The type qualifier of `<Foo as Bar>::baz()`
+ * is `Foo`.
  *
- * We model closures as `dyn Fn` trait object types. A closure might implement
- * only `Fn`, `FnMut`, or `FnOnce`. But since `Fn` is a subtrait of the others,
- * giving closures the type `dyn Fn` works well in practice -- even if not
- * entirely accurate.
+ * `isDefaultTypeArg` indicates whether the returned type is a default type
+ * argument, for example in `Vec::new()` the default type for the type parameter
+ * `A` of `Vec` is `Global`.
  */
-private DynTraitType closureRootType() {
-  result = TDynTraitType(any(FnTrait t)) // always exists because of the mention in `builtins/mentions.rs`
-}
-
-/** Gets the path to a closure's return type. */
-private TypePath closureReturnPath() {
-  result =
-    TypePath::singleton(TDynTraitTypeParameter(any(FnTrait t), any(FnOnceTrait t).getOutputType()))
+pragma[nomagic]
+private Type getCallExprTypeQualifier(CallExpr ce, TypePath path, boolean isDefaultTypeArg) {
+  exists(Path p, TypeMention tm |
+    p = getCallExprPathQualifier(ce) and
+    tm = [p.(AstNode), p.getSegment().getTypeRepr()]
+  |
+    result = tm.getTypeAt(path) and
+    not resolvePath(tm) instanceof Trait and
+    isDefaultTypeArg = false
+    or
+    exists(TypeParameter tp, TypePath suffix |
+      result =
+        tm.(NonAliasPathTypeMention).getDefaultTypeForTypeParameterInNonAnnotationAt(tp, suffix) and
+      path = TypePath::cons(tp, suffix) and
+      isDefaultTypeArg = true
+    )
+  )
 }
 
-/** Gets the path to a closure's `index`th parameter type, where the arity is `arity`. */
+/**
+ * Gets the trait qualifier of function call `ce`, if any.
+ *
+ * For example, the trait qualifier of `Default::<i32>::default()` is `Default`.
+ */
 pragma[nomagic]
-private TypePath closureParameterPath(int arity, int index) {
-  result =
-    TypePath::cons(TDynTraitTypeParameter(_, any(FnTrait t).getTypeParam()),
-      TypePath::singleton(getTupleTypeParameter(arity, index)))
+private Trait getCallExprTraitQualifier(CallExpr ce) {
+  exists(PathExt qualifierPath |
+    qualifierPath = getCallExprPathQualifier(ce) and
+    result = resolvePath(qualifierPath) and
+    // When the qualifier is `Self` and resolves to a trait, it's inside a
+    // trait method's default implementation. This is not a dispatch whose
+    // target is inferred from the type of the receiver, but should always
+    // resolve to the function in the trait block as path resolution does.
+    not qualifierPath.isUnqualified("Self")
+  )
 }
 
-/** Module for inferring certain type information. */
-module CertainTypeInference {
-  pragma[nomagic]
-  private predicate callResolvesTo(CallExpr ce, Path p, Function f) {
-    p = CallExprImpl::getFunctionPath(ce) and
-    f = resolvePath(p)
-  }
+pragma[nomagic]
+private predicate nonAssocFunction(ItemNode i) { not i instanceof AssocFunctionDeclaration }
 
-  pragma[nomagic]
-  private Type getCallExprType(CallExpr ce, Path p, FunctionDeclaration f, TypePath path) {
-    exists(ImplOrTraitItemNodeOption i |
-      callResolvesTo(ce, p, f) and
-      result = f.getReturnType(i, path) and
-      f.isDirectlyFor(i)
-    )
+/**
+ * A call expression that can only resolve to something that is not an associated
+ * function, and hence does not need type inference for resolution.
+ */
+private class NonAssocCallExpr extends CallExpr {
+  NonAssocCallExpr() {
+    forex(ItemNode i | i = CallExprImpl::getResolvedFunction(this) | nonAssocFunction(i))
   }
 
-  pragma[nomagic]
-  private Type getCertainCallExprType(CallExpr ce, Path p, TypePath tp) {
-    forex(Function f | callResolvesTo(ce, p, f) | result = getCallExprType(ce, p, f, tp))
-  }
+  /**
+   * Gets the target of this call, which can be resolved using only path resolution.
+   */
+  ItemNode resolveCallTargetViaPathResolution() { result = CallExprImpl::getResolvedFunction(this) }
 
-  pragma[nomagic]
-  private TypePath getPathToImplSelfTypeParam(TypeParam tp) {
-    exists(ImplItemNode impl |
-      tp = impl.getTypeParam(_) and
-      TTypeParamTypeParameter(tp) = impl.(Impl).getSelfTy().(TypeMention).getTypeAt(result)
+  Expr getArgument(int i) {
+    exists(ArgumentPosition pos |
+      i = pos.asPosition() and
+      result = this.getSyntacticArgument(pos)
     )
   }
+}
 
-  pragma[nomagic]
-  private Type inferCertainCallExprType(CallExpr ce, TypePath path) {
-    exists(Type ty, TypePath prefix, Path p | ty = getCertainCallExprType(ce, p, prefix) |
-      exists(TypePath suffix, TypeParam tp |
-        tp = ty.(TypeParamTypeParameter).getTypeParam() and
-        path = prefix.append(suffix)
-      |
-        // For type parameters of the `impl` block we must resolve their
-        // instantiation from the path. For instance, for `impl<A> for Foo<A>`
-        // and the path `Foo<i64>::bar` we must resolve `A` to `i64`.
-        exists(TypePath pathToTp |
-          pathToTp = getPathToImplSelfTypeParam(tp) and
-          result = p.getQualifier().(TypeMention).getTypeAt(pathToTp.appendInverse(suffix))
-        )
-        or
-        // For type parameters of the function we must resolve their
-        // instantiation from the path. For instance, for `fn bar<A>(a: A) -> A`
-        // and the path `bar<i64>`, we must resolve `A` to `i64`.
-        result = getCallExprTypeArgument(ce, TTypeParamTypeArgumentPosition(tp), suffix)
-      )
-      or
-      not ty instanceof TypeParameter and
-      result = ty and
-      path = prefix
-    )
-  }
+/**
+ * Holds if the type path `path` pointing to `type` is stripped of any leading
+ * complex root type allowed for `self` parameters, such as `&`, `Box`, `Rc`,
+ * `Arc`, and `Pin`.
+ *
+ * We strip away the complex root type for performance reasons only, which will
+ * allow us to construct a much smaller set of candidate call targets (otherwise,
+ * for example _a lot_ of methods have a `self` parameter with a `&` root type).
+ */
+bindingset[path, type]
+private predicate isComplexRootStripped(TypePath path, Type type) {
+  path.isEmpty() and
+  not validSelfType(type)
+  or
+  exists(TypeParameter tp |
+    complexSelfRoot(_, tp) and
+    path = TypePath::singleton(tp) and
+    exists(type)
+  )
+}
 
-  private Type inferCertainStructExprType(StructExpr se, TypePath path) {
-    result = se.getPath().(TypeMention).getTypeAt(path)
-  }
+private newtype TBorrowKind =
+  TNoBorrowKind() or
+  TSomeBorrowKind(Boolean isMutable)
 
-  private Type inferCertainStructPatType(StructPat sp, TypePath path) {
-    result = sp.getPath().(TypeMention).getTypeAt(path)
-  }
+private class BorrowKind extends TBorrowKind {
+  predicate isNoBorrow() { this = TNoBorrowKind() }
 
-  predicate certainTypeEquality(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
-    prefix1.isEmpty() and
-    prefix2.isEmpty() and
-    (
-      exists(Variable v | n1 = v.getAnAccess() |
-        n2 = v.getPat().getName() or n2 = v.getParameter().(SelfParam)
-      )
-      or
-      // A `let` statement with a type annotation is a coercion site and hence
-      // is not a certain type equality.
-      exists(LetStmt let |
-        not let.hasTypeRepr() and
-        identLetStmt(let, n1, n2)
-      )
-      or
-      exists(LetExpr let |
-        // Similarly as for let statements, we need to rule out binding modes
-        // changing the type.
-        let.getPat().(IdentPat) = n1 and
-        let.getScrutinee() = n2
-      )
-      or
-      n1 = n2.(ParenExpr).getExpr()
-    )
-    or
-    n1 =
-      any(IdentPat ip |
-        n2 = ip.getName() and
-        prefix1.isEmpty() and
-        if ip.isRef()
-        then
-          exists(boolean isMutable | if ip.isMut() then isMutable = true else isMutable = false |
-            prefix2 = TypePath::singleton(getRefTypeParameter(isMutable))
-          )
-        else prefix2.isEmpty()
-      )
-    or
-    exists(CallExprImpl::DynamicCallExpr dce, TupleType tt, int i |
-      n1 = dce.getArgList() and
-      tt.getArity() = dce.getNumberOfSyntacticArguments() and
-      n2 = dce.getSyntacticPositionalArgument(i) and
-      prefix1 = TypePath::singleton(tt.getPositionalTypeParameter(i)) and
-      prefix2.isEmpty()
-    )
-    or
-    exists(ClosureExpr ce, int index |
-      n1 = ce and
-      n2 = ce.getParam(index).getPat() and
-      prefix1 = closureParameterPath(ce.getNumberOfParams(), index) and
-      prefix2.isEmpty()
-    )
-  }
+  predicate isSharedBorrow() { this = TSomeBorrowKind(false) }
 
-  pragma[nomagic]
-  private Type inferCertainTypeEquality(AstNode n, TypePath path) {
-    exists(TypePath prefix1, AstNode n2, TypePath prefix2, TypePath suffix |
-      result = inferCertainType(n2, prefix2.appendInverse(suffix)) and
-      path = prefix1.append(suffix)
-    |
-      certainTypeEquality(n, prefix1, n2, prefix2)
-      or
-      certainTypeEquality(n2, prefix2, n, prefix1)
+  predicate isMutableBorrow() { this = TSomeBorrowKind(true) }
+
+  RefType getRefType() {
+    exists(boolean isMutable |
+      this = TSomeBorrowKind(isMutable) and
+      result = getRefType(isMutable)
     )
   }
 
-  /**
-   * Holds if `n` has complete and certain type information and if `n` has the
-   * resulting type at `path`.
-   */
-  cached
-  Type inferCertainType(AstNode n, TypePath path) {
-    result = inferAnnotatedType(n, path) and
-    Stages::TypeInferenceStage::ref()
-    or
-    result = inferFunctionBodyType(n, path)
-    or
-    result = inferCertainCallExprType(n, path)
-    or
-    result = inferCertainTypeEquality(n, path)
-    or
-    result = inferLiteralType(n, path, true)
-    or
-    result = inferRefPatType(n) and
-    path.isEmpty()
-    or
-    result = inferRefExprType(n) and
-    path.isEmpty()
-    or
-    result = inferLogicalOperationType(n, path)
-    or
-    result = inferCertainStructExprType(n, path)
+  string toString() {
+    this.isNoBorrow() and
+    result = ""
     or
-    result = inferCertainStructPatType(n, path)
-    or
-    result = inferRangeExprType(n) and
-    path.isEmpty()
-    or
-    result = inferTupleRootType(n) and
-    path.isEmpty()
-    or
-    result = inferBlockExprType(n, path)
-    or
-    result = inferArrayExprType(n) and
-    path.isEmpty()
-    or
-    result = inferCastExprType(n, path)
-    or
-    exprHasUnitType(n) and
-    path.isEmpty() and
-    result instanceof UnitType
-    or
-    isPanicMacroCall(n) and
-    path.isEmpty() and
-    result instanceof NeverType
-    or
-    n instanceof ClosureExpr and
-    path.isEmpty() and
-    result = closureRootType()
-    or
-    infersCertainTypeAt(n, path, result.getATypeParameter())
-  }
-
-  /**
-   * Holds if `n` has complete and certain type information at the type path
-   * `prefix.tp`. This entails that the type at `prefix` must be the type
-   * that declares `tp`.
-   */
-  pragma[nomagic]
-  private predicate infersCertainTypeAt(AstNode n, TypePath prefix, TypeParameter tp) {
-    exists(TypePath path |
-      exists(inferCertainType(n, path)) and
-      path.isSnoc(prefix, tp)
-    )
-  }
-
-  /**
-   * Holds if `n` has complete and certain type information at `path`.
-   */
-  pragma[nomagic]
-  predicate hasInferredCertainType(AstNode n, TypePath path) { exists(inferCertainType(n, path)) }
-
-  /**
-   * Holds if `n` having type `t` at `path` conflicts with certain type information
-   * at `prefix`.
-   */
-  bindingset[n, prefix, path, t]
-  pragma[inline_late]
-  predicate certainTypeConflict(AstNode n, TypePath prefix, TypePath path, Type t) {
-    inferCertainType(n, path) != t
-    or
-    // If we infer that `n` has _some_ type at `T1.T2....Tn`, and we also
-    // know that `n` certainly has type `certainType` at `T1.T2...Ti`, `0 <= i < n`,
-    // then it must be the case that `T(i+1)` is a type parameter of `certainType`,
-    // otherwise there is a conflict.
-    //
-    // Below, `prefix` is `T1.T2...Ti` and `tp` is `T(i+1)`.
-    exists(TypePath suffix, TypeParameter tp, Type certainType |
-      path = prefix.appendInverse(suffix) and
-      tp = suffix.getHead() and
-      inferCertainType(n, prefix) = certainType and
-      not certainType.getATypeParameter() = tp
-    )
-  }
-}
-
-private Type inferLogicalOperationType(AstNode n, TypePath path) {
-  exists(Builtins::Bool t, BinaryLogicalOperation be |
-    n = [be, be.getLhs(), be.getRhs()] and
-    path.isEmpty() and
-    result = TDataType(t)
-  )
-}
-
-private Type inferAssignmentOperationType(AstNode n, TypePath path) {
-  n instanceof AssignmentOperation and
-  path.isEmpty() and
-  result instanceof UnitType
-}
-
-pragma[nomagic]
-private Struct getRangeType(RangeExpr re) {
-  re instanceof RangeFromExpr and
-  result instanceof RangeFromStruct
-  or
-  re instanceof RangeToExpr and
-  result instanceof RangeToStruct
-  or
-  re instanceof RangeFullExpr and
-  result instanceof RangeFullStruct
-  or
-  re instanceof RangeFromToExpr and
-  result instanceof RangeStruct
-  or
-  re instanceof RangeInclusiveExpr and
-  result instanceof RangeInclusiveStruct
-  or
-  re instanceof RangeToInclusiveExpr and
-  result instanceof RangeToInclusiveStruct
-}
-
-private predicate bodyReturns(Expr body, Expr e) {
-  exists(ReturnExpr re, Callable c |
-    e = re.getExpr() and
-    c = re.getEnclosingCallable() and
-    body = c.getBody()
-  )
-}
-
-/**
- * Holds if the type tree of `n1` at `prefix1` should be equal to the type tree
- * of `n2` at `prefix2` and type information should propagate in both directions
- * through the type equality.
- */
-private predicate typeEquality(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
-  CertainTypeInference::certainTypeEquality(n1, prefix1, n2, prefix2)
-  or
-  prefix1.isEmpty() and
-  prefix2.isEmpty() and
-  (
-    exists(LetStmt let |
-      let.getPat() = n1 and
-      let.getInitializer() = n2
-    )
-    or
-    n2 =
-      any(MatchExpr me |
-        n1 = me.getAnArm().getExpr() and
-        me.getNumberOfArms() = 1
-      )
-    or
-    exists(LetExpr let |
-      n1 = let.getScrutinee() and
-      n2 = let.getPat()
-    )
-    or
-    exists(MatchExpr me |
-      n1 = me.getScrutinee() and
-      n2 = me.getAnArm().getPat()
-    )
-    or
-    n1 = n2.(OrPat).getAPat()
-    or
-    n1 = n2.(ParenPat).getPat()
-    or
-    n1 = n2.(LiteralPat).getLiteral()
-    or
-    exists(BreakExpr break |
-      break.getExpr() = n1 and
-      break.getTarget() = n2.(LoopExpr)
-    )
-    or
-    exists(AssignmentExpr be |
-      n1 = be.getLhs() and
-      n2 = be.getRhs()
-    )
-    or
-    n1 = n2.(MacroExpr).getMacroCall().getMacroCallExpansion() and
-    not isPanicMacroCall(n2)
-    or
-    n1 = n2.(MacroPat).getMacroCall().getMacroCallExpansion()
-    or
-    bodyReturns(n1, n2) and
-    strictcount(Expr e | bodyReturns(n1, e)) = 1
-  )
-  or
-  n2 =
-    any(RefExpr re |
-      n1 = re.getExpr() and
-      prefix1.isEmpty() and
-      prefix2 = TypePath::singleton(inferRefExprType(re).getPositionalTypeParameter(0))
-    )
-  or
-  n2 =
-    any(RefPat rp |
-      n1 = rp.getPat() and
-      prefix1.isEmpty() and
-      exists(boolean isMutable | if rp.isMut() then isMutable = true else isMutable = false |
-        prefix2 = TypePath::singleton(getRefTypeParameter(isMutable))
-      )
-    )
-  or
-  exists(int i, int arity |
-    prefix1.isEmpty() and
-    prefix2 = TypePath::singleton(getTupleTypeParameter(arity, i))
-  |
-    arity = n2.(TupleExpr).getNumberOfFields() and
-    n1 = n2.(TupleExpr).getField(i)
-    or
-    arity = n2.(TuplePat).getTupleArity() and
-    n1 = n2.(TuplePat).getField(i)
-  )
-  or
-  exists(BlockExpr be |
-    n1 = be and
-    n2 = be.getStmtList().getTailExpr() and
-    if be.isAsync()
-    then
-      prefix1 = TypePath::singleton(getDynFutureOutputTypeParameter()) and
-      prefix2.isEmpty()
-    else (
-      prefix1.isEmpty() and
-      prefix2.isEmpty()
-    )
-  )
-  or
-  // an array list expression with only one element (such as `[1]`) has type from that element
-  n1 =
-    any(ArrayListExpr ale |
-      ale.getAnExpr() = n2 and
-      ale.getNumberOfExprs() = 1
-    ) and
-  prefix1 = TypePath::singleton(getArrayTypeParameter()) and
-  prefix2.isEmpty()
-  or
-  // an array repeat expression (`[1; 3]`) has the type of the repeat operand
-  n1.(ArrayRepeatExpr).getRepeatOperand() = n2 and
-  prefix1 = TypePath::singleton(getArrayTypeParameter()) and
-  prefix2.isEmpty()
-}
-
-/**
- * Holds if `child` is a child of `parent`, and the Rust compiler applies [least
- * upper bound (LUB) coercion][1] to infer the type of `parent` from the type of
- * `child`.
- *
- * In this case, we want type information to only flow from `child` to `parent`,
- * to avoid (a) either having to model LUB coercions, or (b) risk combinatorial
- * explosion in inferred types.
- *
- * [1]: https://doc.rust-lang.org/reference/type-coercions.html#r-coerce.least-upper-bound
- */
-private predicate lubCoercion(AstNode parent, AstNode child, TypePath prefix) {
-  child = parent.(IfExpr).getABranch() and
-  prefix.isEmpty()
-  or
-  parent =
-    any(MatchExpr me |
-      child = me.getAnArm().getExpr() and
-      me.getNumberOfArms() > 1
-    ) and
-  prefix.isEmpty()
-  or
-  parent =
-    any(ArrayListExpr ale |
-      child = ale.getAnExpr() and
-      ale.getNumberOfExprs() > 1
-    ) and
-  prefix = TypePath::singleton(getArrayTypeParameter())
-  or
-  bodyReturns(parent, child) and
-  strictcount(Expr e | bodyReturns(parent, e)) > 1 and
-  prefix.isEmpty()
-  or
-  parent = any(ClosureExpr ce | not ce.hasRetType() and ce.getClosureBody() = child) and
-  prefix = closureReturnPath()
-  or
-  exists(Struct s |
-    child = [parent.(RangeExpr).getStart(), parent.(RangeExpr).getEnd()] and
-    prefix = TypePath::singleton(TTypeParamTypeParameter(s.getGenericParamList().getATypeParam())) and
-    s = getRangeType(parent)
-  )
-}
-
-private Type inferUnknownTypeFromAnnotation(AstNode n, TypePath path) {
-  inferType(n, path) = TUnknownType() and
-  // Normally, these are coercion sites, but in case a type is unknown we
-  // allow for type information to flow from the type annotation.
-  exists(TypeMention tm | result = tm.getTypeAt(path) |
-    tm = any(LetStmt let | identLetStmt(let, _, n)).getTypeRepr()
-    or
-    tm = any(ClosureExpr ce | n = ce.getBody()).getRetType().getTypeRepr()
-    or
-    tm = getReturnTypeMention(any(Function f | n = f.getBody()))
-  )
-}
-
-/**
- * Holds if the type tree of `n1` at `prefix1` should be equal to the type tree
- * of `n2` at `prefix2`, but type information should only propagate from `n1` to
- * `n2`.
- */
-private predicate typeEqualityAsymmetric(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
-  lubCoercion(n2, n1, prefix2) and
-  prefix1.isEmpty()
-  or
-  exists(AstNode mid, TypePath prefixMid, TypePath suffix |
-    typeEquality(n1, prefixMid, mid, prefix2) or
-    typeEquality(mid, prefix2, n1, prefixMid)
-  |
-    lubCoercion(mid, n2, suffix) and
-    not lubCoercion(mid, n1, _) and
-    prefix1 = prefixMid.append(suffix)
-  )
-  or
-  // When `n2` is `*n1` propagate type information from a raw pointer type
-  // parameter at `n1`. The other direction is handled in
-  // `inferDereferencedExprPtrType`.
-  n1 = n2.(DerefExpr).getExpr() and
-  prefix1 = TypePath::singleton(getPtrTypeParameter()) and
-  prefix2.isEmpty()
-}
-
-pragma[nomagic]
-private Type inferTypeEquality(AstNode n, TypePath path) {
-  exists(TypePath prefix1, AstNode n2, TypePath prefix2, TypePath suffix |
-    result = inferType(n2, prefix2.appendInverse(suffix)) and
-    path = prefix1.append(suffix)
-  |
-    typeEquality(n, prefix1, n2, prefix2)
-    or
-    typeEquality(n2, prefix2, n, prefix1)
-    or
-    typeEqualityAsymmetric(n2, prefix2, n, prefix1)
-  )
-}
-
-pragma[nomagic]
-private TupleType inferTupleRootType(AstNode n) {
-  // `typeEquality` handles the non-root cases
-  result.getArity() = [n.(TupleExpr).getNumberOfFields(), n.(TuplePat).getTupleArity()]
-}
-
-pragma[nomagic]
-private Path getCallExprPathQualifier(CallExpr ce) {
-  result = CallExprImpl::getFunctionPath(ce).getQualifier()
-}
-
-/**
- * Gets the type qualifier of function call `ce`, if any.
- *
- * For example, the type qualifier of `Foo::<i32>::default()` is `Foo::<i32>`,
- * but only when `Foo` is not a trait. The type qualifier of `<Foo as Bar>::baz()`
- * is `Foo`.
- *
- * `isDefaultTypeArg` indicates whether the returned type is a default type
- * argument, for example in `Vec::new()` the default type for the type parameter
- * `A` of `Vec` is `Global`.
- */
-pragma[nomagic]
-private Type getCallExprTypeQualifier(CallExpr ce, TypePath path, boolean isDefaultTypeArg) {
-  exists(Path p, TypeMention tm |
-    p = getCallExprPathQualifier(ce) and
-    tm = [p.(AstNode), p.getSegment().getTypeRepr()]
-  |
-    result = tm.getTypeAt(path) and
-    not resolvePath(tm) instanceof Trait and
-    isDefaultTypeArg = false
-    or
-    exists(TypeParameter tp, TypePath suffix |
-      result =
-        tm.(NonAliasPathTypeMention).getDefaultTypeForTypeParameterInNonAnnotationAt(tp, suffix) and
-      path = TypePath::cons(tp, suffix) and
-      isDefaultTypeArg = true
-    )
-  )
-}
-
-/**
- * Gets the trait qualifier of function call `ce`, if any.
- *
- * For example, the trait qualifier of `Default::<i32>::default()` is `Default`.
- */
-pragma[nomagic]
-private Trait getCallExprTraitQualifier(CallExpr ce) {
-  exists(PathExt qualifierPath |
-    qualifierPath = getCallExprPathQualifier(ce) and
-    result = resolvePath(qualifierPath) and
-    // When the qualifier is `Self` and resolves to a trait, it's inside a
-    // trait method's default implementation. This is not a dispatch whose
-    // target is inferred from the type of the receiver, but should always
-    // resolve to the function in the trait block as path resolution does.
-    not qualifierPath.isUnqualified("Self")
-  )
-}
-
-pragma[nomagic]
-private predicate nonAssocFunction(ItemNode i) { not i instanceof AssocFunctionDeclaration }
-
-/**
- * A call expression that can only resolve to something that is not an associated
- * function, and hence does not need type inference for resolution.
- */
-private class NonAssocCallExpr extends CallExpr {
-  NonAssocCallExpr() {
-    forex(ItemNode i | i = CallExprImpl::getResolvedFunction(this) | nonAssocFunction(i))
-  }
-
-  /**
-   * Gets the target of this call, which can be resolved using only path resolution.
-   */
-  ItemNode resolveCallTargetViaPathResolution() { result = CallExprImpl::getResolvedFunction(this) }
-
-  pragma[nomagic]
-  Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
-    result = getCallExprTypeArgument(this, apos, path)
-  }
-
-  AstNode getNodeAt(FunctionPosition pos) {
-    result = this.getSyntacticArgument(pos.asArgumentPosition())
-    or
-    result = this and pos.isReturn()
-  }
-
-  pragma[nomagic]
-  Type getInferredType(FunctionPosition pos, TypePath path) {
-    pos.isTypeQualifier() and
-    result = getCallExprTypeQualifier(this, path, false)
-    or
-    result = inferType(this.getNodeAt(pos), path)
-  }
-}
-
-/**
- * Provides functionality related to context-based typing of calls.
- */
-private module ContextTyping {
-  /**
-   * Holds if `f` mentions type parameter `tp` at some non-return position,
-   * possibly via a constraint on another mentioned type parameter.
-   */
-  pragma[nomagic]
-  private predicate assocFunctionMentionsTypeParameterAtNonRetPos(
-    ImplOrTraitItemNode i, Function f, TypeParameter tp
-  ) {
-    exists(FunctionPosition nonRetPos |
-      not nonRetPos.isReturn() and
-      not nonRetPos.isTypeQualifier() and
-      tp = getAssocFunctionTypeAt(f, i, nonRetPos, _)
-    )
-    or
-    exists(TypeParameter mid |
-      assocFunctionMentionsTypeParameterAtNonRetPos(i, f, mid) and
-      tp = getATypeParameterConstraint(mid).getTypeAt(_)
-    )
-  }
-
-  /**
-   * Holds if the return type of the function `f` inside `i` at `path` is type
-   * parameter `tp`, and `tp` does not appear in the type of any parameter of
-   * `f`.
-   *
-   * In this case, the context in which `f` is called may be needed to infer
-   * the instantiation of `tp`.
-   *
-   * This covers functions like `Default::default` and `Vec::new`.
-   */
-  pragma[nomagic]
-  private predicate assocFunctionReturnContextTypedAt(
-    ImplOrTraitItemNode i, Function f, FunctionPosition pos, TypePath path, TypeParameter tp
-  ) {
-    pos.isReturn() and
-    tp = getAssocFunctionTypeAt(f, i, pos, path) and
-    not assocFunctionMentionsTypeParameterAtNonRetPos(i, f, tp)
-  }
-
-  /**
-   * A call where the type of the result may have to be inferred from the
-   * context in which the call appears, for example a call like
-   * `Default::default()`.
-   */
-  abstract class ContextTypedCallCand extends AstNode {
-    abstract Type getTypeArgument(TypeArgumentPosition apos, TypePath path);
-
-    predicate hasTypeArgument(TypeArgumentPosition apos) { exists(this.getTypeArgument(apos, _)) }
-
-    /**
-     * Holds if this call resolves to `target` inside `i`, and the return type
-     * at `pos` and `path` may have to be inferred from the context.
-     */
-    bindingset[this, i, target]
-    predicate hasUnknownTypeAt(
-      ImplOrTraitItemNode i, Function target, FunctionPosition pos, TypePath path
-    ) {
-      exists(TypeParameter tp |
-        assocFunctionReturnContextTypedAt(i, target, pos, path, tp) and
-        // check that no explicit type arguments have been supplied for `tp`
-        not exists(TypeArgumentPosition tapos | this.hasTypeArgument(tapos) |
-          exists(int j |
-            j = tapos.asMethodTypeArgumentPosition() and
-            tp = TTypeParamTypeParameter(target.getGenericParamList().getTypeParam(j))
-          )
-          or
-          TTypeParamTypeParameter(tapos.asTypeParam()) = tp
-        ) and
-        not (
-          tp instanceof TSelfTypeParameter and
-          exists(getCallExprTypeQualifier(this, _, _))
-        )
-      )
-    }
-  }
-
-  pragma[nomagic]
-  private predicate hasUnknownTypeAt(AstNode n, TypePath path) {
-    inferType(n, path) = TUnknownType()
-  }
-
-  pragma[nomagic]
-  private predicate hasUnknownType(AstNode n) { hasUnknownTypeAt(n, _) }
-
-  newtype FunctionPositionKind =
-    SelfKind() or
-    ReturnKind() or
-    PositionalKind()
-
-  signature Type inferCallTypeSig(AstNode n, FunctionPositionKind kind, TypePath path);
-
-  /**
-   * Given a predicate `inferCallType` for inferring the type of a call at a given
-   * position, this module exposes the predicate `check`, which wraps the input
-   * predicate and checks that types are only propagated into arguments when they
-   * are context-typed.
-   */
-  module CheckContextTyping<inferCallTypeSig/3 inferCallType> {
-    pragma[nomagic]
-    private Type inferCallNonReturnType(
-      AstNode n, FunctionPositionKind kind, TypePath prefix, TypePath path
-    ) {
-      result = inferCallType(n, kind, path) and
-      hasUnknownType(n) and
-      kind != ReturnKind() and
-      prefix = path.getAPrefix()
-    }
-
-    pragma[nomagic]
-    Type check(AstNode n, TypePath path) {
-      result = inferCallType(n, ReturnKind(), path)
-      or
-      exists(FunctionPositionKind kind, TypePath prefix |
-        result = inferCallNonReturnType(n, kind, prefix, path) and
-        hasUnknownTypeAt(n, prefix)
-      |
-        // Never propagate type information directly into the receiver, since its type
-        // must already have been known in order to resolve the call
-        if kind = SelfKind() then not prefix.isEmpty() else any()
-      )
-    }
-  }
-}
-
-/**
- * Holds if the type path `path` pointing to `type` is stripped of any leading
- * complex root type allowed for `self` parameters, such as `&`, `Box`, `Rc`,
- * `Arc`, and `Pin`.
- *
- * We strip away the complex root type for performance reasons only, which will
- * allow us to construct a much smaller set of candidate call targets (otherwise,
- * for example _a lot_ of methods have a `self` parameter with a `&` root type).
- */
-bindingset[path, type]
-private predicate isComplexRootStripped(TypePath path, Type type) {
-  (
-    path.isEmpty() and
-    not validSelfType(type)
-    or
-    exists(TypeParameter tp |
-      complexSelfRoot(_, tp) and
-      path = TypePath::singleton(tp) and
-      exists(type)
-    )
-  ) and
-  type != TNeverType()
-}
-
-private newtype TBorrowKind =
-  TNoBorrowKind() or
-  TSomeBorrowKind(Boolean isMutable)
-
-private class BorrowKind extends TBorrowKind {
-  predicate isNoBorrow() { this = TNoBorrowKind() }
-
-  predicate isSharedBorrow() { this = TSomeBorrowKind(false) }
-
-  predicate isMutableBorrow() { this = TSomeBorrowKind(true) }
-
-  RefType getRefType() {
-    exists(boolean isMutable |
-      this = TSomeBorrowKind(isMutable) and
-      result = getRefType(isMutable)
-    )
-  }
-
-  string toString() {
-    this.isNoBorrow() and
-    result = ""
-    or
-    this.isMutableBorrow() and
-    result = "&mut"
+    this.isMutableBorrow() and
+    result = "&mut"
     or
     this.isSharedBorrow() and
     result = "&"
@@ -1698,8 +870,7 @@ private module AssocFunctionResolution {
       not this.hasReceiver() and
       exists(TypePath strippedTypePath, Type strippedType |
         strippedType = substituteLookupTraits(this, this.getTypeAt(selfPos, strippedTypePath)) and
-        strippedType != TNeverType() and
-        strippedType != TUnknownType()
+        not strippedType instanceof PseudoType
       |
         nonBlanketLikeCandidate(this, _, selfPos, _, _, strippedTypePath, strippedType)
         or
@@ -1795,8 +966,7 @@ private module AssocFunctionResolution {
       FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow, TypePath path
     ) {
       result = this.getSelfTypeAt(selfPos, derefChain, borrow, path) and
-      result != TNeverType() and
-      result != TUnknownType()
+      not result instanceof PseudoType
     }
 
     pragma[nomagic]
@@ -1926,6 +1096,14 @@ private module AssocFunctionResolution {
       )
     }
 
+    pragma[nomagic]
+    predicate resolutionDependsOnReturnType(TypePath path) {
+      exists(AssocFunctionCallCand afcc |
+        afcc = MkAssocFunctionCallCand(this, _, _, _) and
+        afcc.resolutionDependsOnReturnType(path)
+      )
+    }
+
     /**
      * Holds if the argument `arg` of this call has been implicitly dereferenced
      * and borrowed according to `derefChain` and `borrow`, in order to be able to
@@ -2036,7 +1214,7 @@ private module AssocFunctionResolution {
       result = this.getOperand(pos.asPosition())
     }
 
-    private predicate implicitBorrowAt(FunctionPosition pos, boolean isMutable) {
+    predicate implicitBorrowAt(FunctionPosition pos, boolean isMutable) {
       exists(int borrows | this.isOverloaded(_, _, borrows) |
         pos.asPosition() = 0 and
         borrows >= 1 and
@@ -2401,11 +1579,65 @@ private module AssocFunctionResolution {
     pragma[nomagic]
     AssocFunctionDeclaration resolveCallTarget(ImplOrTraitItemNode i) {
       result = this.resolveCallTargetCand(i) and
-      not FunctionOverloading::functionResolutionDependsOnArgument(i, result, _, _)
+      not FunctionOverloading::functionResolutionDependsOnArgument(i, result, _, _, _)
       or
       OverloadedCallArgsAreInstantiationsOf::argsAreInstantiationsOf(this, i, result)
     }
 
+    pragma[nomagic]
+    private predicate hasUnknownTypeAtPos(int pos, TypePath path) {
+      exists(FunctionPosition pos0 |
+        inferType(afc_.getNodeAt(pos0), path) = TUnknownType() and
+        pos = pos0.asPosition()
+      )
+    }
+
+    pragma[nomagic]
+    private predicate resolutionDependsOnReturnTypeCand(
+      ImplOrTraitItemNode i, AssocFunctionDeclaration target, TypeParameter traitTp, TypePath path
+    ) {
+      exists(FunctionPosition pos |
+        target = this.resolveCallTargetCand(i) and
+        FunctionOverloading::functionResolutionDependsOnArgument(i, target, traitTp, pos, path) and
+        pos.isReturn()
+      )
+    }
+
+    pragma[nomagic]
+    private predicate resolutionDependsOnPositionalAndReturnTypeCand(
+      ImplOrTraitItemNode i, AssocFunctionDeclaration target, TypePath path, int pos0,
+      TypePath prefix
+    ) {
+      exists(TypeParameter traitTp, TypePath path0 |
+        this.resolutionDependsOnReturnTypeCand(i, target, traitTp, path) and
+        FunctionOverloading::functionResolutionDependsOnPositionalArgumentCand(i, target, _,
+          traitTp, pos0, path0) and
+        prefix = path0.getAPrefix()
+      )
+    }
+
+    /**
+     * Holds if resolving this call requires contextual information about the
+     * return type at `path`.
+     */
+    pragma[nomagic]
+    predicate resolutionDependsOnReturnType(TypePath path) {
+      exists(ImplOrTraitItemNode i, AssocFunctionDeclaration target |
+        exists(TypeParameter traitTp |
+          this.resolutionDependsOnReturnTypeCand(i, target, traitTp, path) and
+          not FunctionOverloading::functionResolutionDependsOnPositionalArgumentCand(i, target, _,
+            traitTp, _, _)
+        )
+        or
+        // when `traitTp` is also mentioned in a parameter, require that typing of the
+        // corresponding argument also needs contextual typing
+        exists(int pos0, TypePath prefix |
+          this.resolutionDependsOnPositionalAndReturnTypeCand(i, target, path, pos0, prefix) and
+          this.hasUnknownTypeAtPos(pos0, prefix)
+        )
+      )
+    }
+
     string toString() {
       result = afc_ + " at " + selfPos_ + " [" + derefChain.toString() + "; " + borrow + "]"
     }
@@ -2435,8 +1667,7 @@ private module AssocFunctionResolution {
 
       Type getTypeAt(TypePath path) {
         result = substituteLookupTraits(afc, afc.getSelfTypeAtNoBorrow(selfPos, derefChain, path)) and
-        result != TNeverType() and
-        result != TUnknownType()
+        not result instanceof PseudoType
       }
 
       string toString() { result = afc + " [" + derefChain.toString() + "]" }
@@ -2631,7 +1862,7 @@ private module AssocFunctionResolution {
     ArgsAreInstantiationsOfInputSig
   {
     predicate toCheck(ImplOrTraitItemNode i, Function f, TypeParameter traitTp, FunctionPosition pos) {
-      FunctionOverloading::functionResolutionDependsOnArgument(i, f, traitTp, pos)
+      FunctionOverloading::functionResolutionDependsOnArgument(i, f, traitTp, pos, _)
     }
 
     class Call extends AssocFunctionCallCand {
@@ -2655,1287 +1886,1291 @@ private module AssocFunctionResolution {
   }
 }
 
-/**
- * A matching configuration for resolving types of function call expressions
- * like `foo.bar(baz)` and `Foo::bar(baz)`.
- */
-private module FunctionCallMatchingInput implements MatchingWithEnvironmentInputSig {
-  import FunctionPositionMatchingInput
-
-  private newtype TDeclaration =
-    TFunctionDeclaration(ImplOrTraitItemNodeOption i, FunctionDeclaration f) { f.isFor(i) }
-
-  final class Declaration extends TFunctionDeclaration {
-    ImplOrTraitItemNodeOption i;
-    FunctionDeclaration f;
+pragma[nomagic]
+private Type getFieldExprLookupType(FieldExpr fe, string name, DerefChain derefChain) {
+  exists(TypePath path |
+    result = inferType(fe.getContainer(), path) and
+    name = fe.getIdentifier().getText() and
+    isComplexRootStripped(path, result)
+  |
+    // TODO: Support full derefence chains as for method calls
+    path.isEmpty() and
+    derefChain = DerefChain::nil()
+    or
+    exists(DerefImplItemNode impl, TypeParamTypeParameter tp |
+      tp = impl.getFirstSelfTypeParameter() and
+      path.getHead() = tp and
+      derefChain = DerefChain::singleton(impl)
+    )
+  )
+}
+
+pragma[nomagic]
+private Type getTupleFieldExprLookupType(FieldExpr fe, int pos, DerefChain derefChain) {
+  exists(string name |
+    result = getFieldExprLookupType(fe, name, derefChain) and
+    pos = name.toInt()
+  )
+}
 
-    Declaration() { this = TFunctionDeclaration(i, f) }
+/** Gets the root type of the reference expression `ref`. */
+pragma[nomagic]
+private Type inferRefExprType(RefExpr ref) {
+  if ref.isRaw()
+  then
+    ref.isMut() and result instanceof PtrMutType
+    or
+    ref.isConst() and result instanceof PtrConstType
+  else
+    if ref.isMut()
+    then result instanceof RefMutType
+    else result instanceof RefSharedType
+}
 
-    FunctionDeclaration getFunction() { result = f }
+/** Gets the root type of the reference node `ref`. */
+pragma[nomagic]
+private Type inferRefPatType(AstNode ref) {
+  exists(boolean isMut |
+    ref =
+      any(IdentPat ip |
+        ip.isRef() and
+        if ip.isMut() then isMut = true else isMut = false
+      ).getName()
+    or
+    ref = any(RefPat rp | if rp.isMut() then isMut = true else isMut = false)
+  |
+    result = getRefType(isMut)
+  )
+}
 
-    predicate isAssocFunction(ImplOrTraitItemNode i_, Function f_) {
-      i_ = i.asSome() and
-      f_ = f
-    }
+pragma[nomagic]
+private StructType getStrStruct() { result = TDataType(any(Builtins::Str s)) }
 
-    TypeParameter getTypeParameter(TypeParameterPosition ppos) {
-      result = f.getTypeParameter(i, ppos)
-    }
+pragma[nomagic]
+private Type inferLiteralType(LiteralExpr le, TypePath path, boolean certain) {
+  path.isEmpty() and
+  exists(Builtins::BuiltinType t | result = TDataType(t) |
+    le instanceof CharLiteralExpr and
+    t instanceof Builtins::Char and
+    certain = true
+    or
+    le =
+      any(NumberLiteralExpr ne |
+        t.getName() = ne.getSuffix() and
+        certain = true
+        or
+        // When a number literal has no suffix, the type may depend on the context.
+        // For simplicity, we assume either `i32` or `f64`.
+        not exists(ne.getSuffix()) and
+        certain = false and
+        (
+          ne instanceof IntegerLiteralExpr and
+          t instanceof Builtins::I32
+          or
+          ne instanceof FloatLiteralExpr and
+          t instanceof Builtins::F64
+        )
+      )
+    or
+    le instanceof BooleanLiteralExpr and
+    t instanceof Builtins::Bool and
+    certain = true
+  )
+  or
+  le instanceof StringLiteralExpr and
+  (
+    path.isEmpty() and result instanceof RefSharedType
+    or
+    path = TypePath::singleton(getRefTypeParameter(false)) and
+    result = getStrStruct()
+  ) and
+  certain = true
+}
 
-    Type getDeclaredType(FunctionPosition pos, TypePath path) {
-      result = f.getParameterType(i, pos, path)
-      or
-      pos.isReturn() and
-      result = f.getReturnType(i, path)
-    }
+pragma[nomagic]
+private DynTraitType getFutureTraitType() { result.getTrait() instanceof FutureTrait }
 
-    string toString() {
-      i.isNone() and result = f.toString()
-      or
-      result = f.toStringExt(i.asSome())
-    }
+pragma[nomagic]
+private AssociatedTypeTypeParameter getFutureOutputTypeParameter() {
+  result = getAssociatedTypeTypeParameter(any(FutureTrait ft).getOutputType())
+}
 
-    Location getLocation() { result = f.getLocation() }
-  }
+pragma[nomagic]
+private DynTraitTypeParameter getDynFutureOutputTypeParameter() {
+  result.getTraitTypeParameter() = getFutureOutputTypeParameter()
+}
 
-  pragma[nomagic]
-  private TypeMention getAdditionalTypeParameterConstraint(TypeParameter tp, Declaration decl) {
-    result =
-      tp.(TypeParamTypeParameter)
-          .getTypeParam()
-          .getAdditionalTypeBound(decl.getFunction(), _)
-          .getTypeRepr()
-  }
+pragma[nomagic]
+predicate isUnitBlockExpr(BlockExpr be) {
+  not be.getStmtList().hasTailExpr() and
+  not exists(Callable c |
+    be = c.getBody() and
+    c = any(ReturnExpr re).getEnclosingCallable()
+  ) and
+  not be.hasLabel()
+}
 
-  bindingset[decl]
-  TypeMention getATypeParameterConstraint(TypeParameter tp, Declaration decl) {
-    result = Input2::getATypeParameterConstraint(tp) and
-    exists(decl)
-    or
-    result = getAdditionalTypeParameterConstraint(tp, decl)
-  }
+pragma[nomagic]
+private Type inferAsyncUnitBlockExprType(AsyncBlockExpr be, TypePath path) {
+  isUnitBlockExpr(be) and
+  path = TypePath::singleton(getDynFutureOutputTypeParameter()) and
+  result instanceof UnitType
+}
 
-  class AccessEnvironment = string;
+pragma[nomagic]
+private predicate exprHasUnitType(AstNode e) {
+  e = any(IfExpr ie | not ie.hasElse())
+  or
+  e instanceof WhileExpr
+  or
+  e instanceof ForExpr
+  or
+  e instanceof AssignmentOperation
+  or
+  e = any(BlockExpr be | isUnitBlockExpr(be) and not be.isAsync())
+  or
+  exists(CallExprImpl::DynamicCallExpr dce |
+    e = dce.getArgList() and
+    dce.getNumberOfSyntacticArguments() = 0
+  )
+}
 
-  bindingset[derefChain, borrow]
-  private AccessEnvironment encodeDerefChainBorrow(DerefChain derefChain, BorrowKind borrow) {
-    result = derefChain + ";" + borrow
-  }
+final private class AwaitTarget extends Expr {
+  AwaitTarget() { this = any(AwaitExpr ae).getExpr() }
 
-  bindingset[derefChainBorrow]
-  additional predicate decodeDerefChainBorrow(
-    string derefChainBorrow, DerefChain derefChain, BorrowKind borrow
-  ) {
-    exists(int i |
-      i = derefChainBorrow.indexOf(";") and
-      derefChain = derefChainBorrow.prefix(i) and
-      borrow.toString() = derefChainBorrow.suffix(i + 1)
-    )
-  }
+  Type getTypeAt(TypePath path) { result = inferType(this, path) }
+}
 
-  private string noDerefChainBorrow() {
-    exists(DerefChain derefChain, BorrowKind borrow |
-      derefChain.isEmpty() and
-      borrow.isNoBorrow() and
-      result = encodeDerefChainBorrow(derefChain, borrow)
-    )
+private module AwaitSatisfiesTypeInput implements SatisfiesTypeInputSig<AwaitTarget> {
+  pragma[nomagic]
+  predicate relevantConstraint(AwaitTarget term, Type constraint) {
+    exists(term) and
+    constraint.(TraitType).getTrait() instanceof FutureTrait
   }
+}
 
-  abstract class Access extends ContextTyping::ContextTypedCallCand {
-    abstract AstNode getNodeAt(FunctionPosition pos);
-
-    bindingset[derefChainBorrow]
-    abstract Type getInferredType(string derefChainBorrow, FunctionPosition pos, TypePath path);
+private module AwaitSatisfiesType = SatisfiesType<AwaitTarget, AwaitSatisfiesTypeInput>;
 
-    abstract Declaration getTarget(string derefChainBorrow);
+pragma[nomagic]
+private Type inferAwaitExprType(AstNode n, TypePath path) {
+  exists(TypePath exprPath |
+    AwaitSatisfiesType::satisfiesConstraint(n.(AwaitExpr).getExpr(), _, exprPath, result) and
+    exprPath.isCons(getFutureOutputTypeParameter(), path)
+  )
+}
 
-    /**
-     * Holds if the return type of this call at `path` may have to be inferred
-     * from the context.
-     */
-    abstract predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path);
-  }
+pragma[nomagic]
+private Type inferEmptyArrayListExprType(ArrayListExpr ae) {
+  ae.getNumberOfExprs() = 0 and result instanceof ArrayType
+}
 
-  private class AssocFunctionCallAccess extends Access instanceof AssocFunctionResolution::AssocFunctionCall
-  {
-    AssocFunctionCallAccess() {
-      // handled in the `OperationMatchingInput` module
-      not this instanceof Operation
-    }
+/**
+ * A matching configuration for resolving types of deconstruction patterns like
+ * `let Foo { bar } = ...` or `let Some(x) = ...`.
+ */
+private module DeconstructionPatMatchingInput implements MatchingInputSig {
+  import FunctionPositionMatchingInput
 
-    pragma[nomagic]
-    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
-      result =
-        this.(MethodCallExpr)
-            .getGenericArgList()
-            .getTypeArg(apos.asMethodTypeArgumentPosition())
-            .(TypeMention)
-            .getTypeAt(path)
+  class Declaration extends Input3::Constructor {
+    Type getDeclaredType(FunctionPosition pos, TypePath path) {
+      result = this.getParameter(pos.asPosition()).getType().getTypeAt(path)
       or
-      result = getCallExprTypeArgument(this, apos, path)
+      pos.isReturn() and
+      result = this.getType().getTypeAt(path)
     }
+  }
 
-    override AstNode getNodeAt(FunctionPosition pos) {
-      result = AssocFunctionResolution::AssocFunctionCall.super.getNodeAt(pos)
-    }
+  class Access extends Pat instanceof PathAstNode {
+    Access() { this instanceof TupleStructPat or this instanceof StructPat }
 
-    pragma[nomagic]
-    private Type getInferredSelfType(FunctionPosition pos, string derefChainBorrow, TypePath path) {
-      exists(DerefChain derefChain, BorrowKind borrow |
-        result = super.getSelfTypeAt(pos, derefChain, borrow, path) and
-        derefChainBorrow = encodeDerefChainBorrow(derefChain, borrow) and
-        super.hasReceiverAtPos(pos)
-      )
-    }
+    Type getTypeArgument(int pos, TypePath path) { none() }
 
-    pragma[nomagic]
-    private Type getInferredNonSelfType(FunctionPosition pos, TypePath path) {
-      if
-        // index expression `x[i]` desugars to `*x.index(i)`, so we must account for
-        // the implicit deref
-        pos.isReturn() and
-        this instanceof IndexExpr
-      then
-        path.isEmpty() and
-        result instanceof RefType
-        or
-        exists(TypePath suffix |
-          result = super.getTypeAt(pos, suffix) and
-          path = TypePath::cons(getRefTypeParameter(_), suffix)
+    AstNode getNodeAt(AccessPosition apos) {
+      this =
+        any(StructPat sp |
+          result =
+            sp.getPatField(pragma[only_bind_into](sp.getNthStructField(apos.asPosition())
+                  .getName()
+                  .getText())).getPat()
         )
-      else (
-        not super.hasReceiverAtPos(pos) and
-        result = super.getTypeAt(pos, path)
-      )
-    }
-
-    bindingset[derefChainBorrow]
-    override Type getInferredType(string derefChainBorrow, FunctionPosition pos, TypePath path) {
-      result = this.getInferredSelfType(pos, derefChainBorrow, path)
       or
-      result = this.getInferredNonSelfType(pos, path)
-    }
-
-    private AssocFunctionDeclaration getTarget(ImplOrTraitItemNode i, string derefChainBorrow) {
-      exists(DerefChain derefChain, BorrowKind borrow |
-        derefChainBorrow = encodeDerefChainBorrow(derefChain, borrow) and
-        result = super.resolveCallTarget(i, _, derefChain, borrow) // mutual recursion; resolving method calls requires resolving types and vice versa
-      )
-    }
-
-    override Declaration getTarget(string derefChainBorrow) {
-      exists(ImplOrTraitItemNode i | result.isAssocFunction(i, this.getTarget(i, derefChainBorrow)))
+      result = this.(TupleStructPat).getField(apos.asPosition())
+      or
+      result = this and
+      apos.isReturn()
     }
 
-    pragma[nomagic]
-    override predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path) {
-      exists(ImplOrTraitItemNode i |
-        this.hasUnknownTypeAt(i, this.getTarget(i, derefChainBorrow), pos, path)
-      )
+    Type getInferredType(AccessPosition apos, TypePath path) {
+      result = inferType(this.getNodeAt(apos), path)
       or
-      derefChainBorrow = noDerefChainBorrow() and
-      forex(ImplOrTraitItemNode i, Function f |
-        f = CallExprImpl::getResolvedFunction(this) and
-        f = i.getAnAssocItem()
-      |
-        this.hasUnknownTypeAt(i, f, pos, path)
-      )
+      // The struct/enum type is supplied explicitly as a type qualifier, e.g.
+      // `let Foo::<Bar>::Variant { ... } = ...` or
+      // `let Option::<Foo>::Some(x) = ...`.
+      apos.isReturn() and
+      result = super.getPath().(TypeMention).getTypeAt(path)
     }
+
+    Declaration getTarget() { result = resolvePath(super.getPath()) }
   }
+}
 
-  private class NonAssocFunctionCallAccess extends Access instanceof NonAssocCallExpr,
-    CallExprImpl::CallExprCall
-  {
-    pragma[nomagic]
-    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
-      result = NonAssocCallExpr.super.getTypeArgument(apos, path)
-    }
+private module DeconstructionPatMatching = Matching<DeconstructionPatMatchingInput>;
 
-    override AstNode getNodeAt(FunctionPosition pos) {
-      result = NonAssocCallExpr.super.getNodeAt(pos)
-    }
+/**
+ * Gets the type of `n` at `path`, where `n` is a pattern for a constructor,
+ * either a struct pattern or a tuple-struct pattern.
+ */
+pragma[nomagic]
+private Type inferDeconstructionPatType(AstNode n, TypePath path) {
+  exists(DeconstructionPatMatchingInput::Access a, FunctionPosition apos |
+    n = a.getNodeAt(apos) and
+    result = DeconstructionPatMatching::inferAccessType(a, apos, path)
+  )
+}
 
-    pragma[nomagic]
-    private Type getInferredType(FunctionPosition pos, TypePath path) {
-      result = super.getInferredType(pos, path)
-    }
+final private class ForIterableExpr extends Expr {
+  ForIterableExpr() { this = any(ForExpr fe).getIterable() }
 
-    bindingset[derefChainBorrow]
-    override Type getInferredType(string derefChainBorrow, FunctionPosition pos, TypePath path) {
-      exists(derefChainBorrow) and
-      result = this.getInferredType(pos, path)
-    }
+  Type getTypeAt(TypePath path) { result = inferType(this, path) }
+}
 
-    pragma[nomagic]
-    private Declaration getTarget() {
-      result =
-        TFunctionDeclaration(ImplOrTraitItemNodeOption::none_(),
-          super.resolveCallTargetViaPathResolution())
-    }
+private module ForIterableSatisfiesTypeInput implements SatisfiesTypeInputSig<ForIterableExpr> {
+  predicate relevantConstraint(ForIterableExpr term, Type constraint) {
+    exists(term) and
+    exists(Trait t | t = constraint.(TraitType).getTrait() |
+      // TODO: Remove the line below once we can handle the `impl<I: Iterator> IntoIterator for I` implementation
+      t instanceof IteratorTrait or
+      t instanceof IntoIteratorTrait
+    )
+  }
+}
 
-    override Declaration getTarget(string derefChainBorrow) {
-      result = this.getTarget() and
-      derefChainBorrow = noDerefChainBorrow()
-    }
+pragma[nomagic]
+private AssociatedTypeTypeParameter getIteratorItemTypeParameter() {
+  result = getAssociatedTypeTypeParameter(any(IteratorTrait t).getItemType())
+}
 
-    pragma[nomagic]
-    override predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path) {
-      derefChainBorrow = noDerefChainBorrow() and
-      exists(FunctionDeclaration f, TypeParameter tp |
-        f = super.resolveCallTargetViaPathResolution() and
-        pos.isReturn() and
-        tp = f.getReturnType(_, path) and
-        not tp = f.getParameterType(_, _, _) and
-        // check that no explicit type arguments have been supplied for `tp`
-        not exists(TypeArgumentPosition tapos |
-          this.hasTypeArgument(tapos) and
-          TTypeParamTypeParameter(tapos.asTypeParam()) = tp
-        )
-      )
-    }
-  }
+pragma[nomagic]
+private AssociatedTypeTypeParameter getIntoIteratorItemTypeParameter() {
+  result = getAssociatedTypeTypeParameter(any(IntoIteratorTrait t).getItemType())
 }
 
-private module FunctionCallMatching = MatchingWithEnvironment<FunctionCallMatchingInput>;
+private module ForIterableSatisfiesType =
+  SatisfiesType<ForIterableExpr, ForIterableSatisfiesTypeInput>;
 
 pragma[nomagic]
-private Type inferFunctionCallType0(
-  FunctionCallMatchingInput::Access call, FunctionPosition pos, AstNode n, DerefChain derefChain,
-  BorrowKind borrow, TypePath path
-) {
-  exists(TypePath path0 |
-    n = call.getNodeAt(pos) and
-    exists(string derefChainBorrow |
-      FunctionCallMatchingInput::decodeDerefChainBorrow(derefChainBorrow, derefChain, borrow)
-    |
-      result = FunctionCallMatching::inferAccessType(call, derefChainBorrow, pos, path0)
-      or
-      call.hasUnknownTypeAt(derefChainBorrow, pos, path0) and
-      result = TUnknownType()
-    )
+private Type inferForLoopExprType(AstNode n, TypePath path) {
+  // type of iterable -> type of pattern (loop variable)
+  exists(ForExpr fe, TypePath exprPath, AssociatedTypeTypeParameter tp |
+    n = fe.getPat() and
+    ForIterableSatisfiesType::satisfiesConstraint(fe.getIterable(), _, exprPath, result) and
+    exprPath.isCons(tp, path)
   |
-    if
-      // index expression `x[i]` desugars to `*x.index(i)`, so we must account for
-      // the implicit deref
-      pos.isReturn() and
-      call instanceof IndexExpr
-    then path0.isCons(getRefTypeParameter(_), path)
-    else path = path0
+    tp = getIntoIteratorItemTypeParameter()
+    or
+    // TODO: Remove once we can handle the `impl<I: Iterator> IntoIterator for I` implementation
+    tp = getIteratorItemTypeParameter() and
+    inferType(fe.getIterable()) != getArrayTypeParameter()
   )
 }
 
-pragma[nomagic]
-private Type inferFunctionCallTypeNonSelf(AstNode n, FunctionPosition pos, TypePath path) {
-  exists(FunctionCallMatchingInput::Access call |
-    result = inferFunctionCallType0(call, pos, n, _, _, path) and
-    not call.(AssocFunctionResolution::AssocFunctionCall).hasReceiverAtPos(pos)
+/** Holds if `n` is implicitly dereferenced and/or borrowed. */
+cached
+predicate implicitDerefChainBorrow(Expr e, DerefChain derefChain, boolean borrow) {
+  CachedStage::ref() and
+  exists(BorrowKind bk |
+    any(AssocFunctionResolution::AssocFunctionCall afc)
+        .argumentHasImplicitDerefChainBorrow(e, derefChain, bk) and
+    if bk.isNoBorrow() then borrow = false else borrow = true
   )
+  or
+  e =
+    any(FieldExpr fe |
+      exists(resolveStructFieldExpr(fe, derefChain))
+      or
+      exists(resolveTupleFieldExpr(fe, derefChain))
+    ).getContainer() and
+  not derefChain.isEmpty() and
+  borrow = false
 }
 
 /**
- * Gets the type of `n` at `path` after applying `derefChain`, where `n` is the
- * `self` argument of a method call.
+ * Gets an item (function or tuple struct/variant) that `call` resolves to, if
+ * any.
  *
- * The predicate recursively pops the head of `derefChain` until it becomes
- * empty, at which point the inferred type can be applied back to `n`.
+ * The parameter `dispatch` is `true` if and only if the resolved target is a
+ * trait item because a precise target could not be determined from the
+ * types (for instance in the presence of generics or `dyn` types)
  */
-pragma[nomagic]
-private Type inferFunctionCallTypeSelf(
-  FunctionCallMatchingInput::Access call, AstNode n, DerefChain derefChain, TypePath path
-) {
-  exists(FunctionPosition pos, BorrowKind borrow, TypePath path0 |
-    call.(AssocFunctionResolution::AssocFunctionCall).hasReceiverAtPos(pos) and
-    result = inferFunctionCallType0(call, pos, n, derefChain, borrow, path0)
-  |
-    borrow.isNoBorrow() and
-    path = path0
-    or
-    // adjust for implicit borrow
-    exists(TypePath prefix |
-      prefix = TypePath::singleton(borrow.getRefType().getPositionalTypeParameter(0)) and
-      path0 = prefix.appendInverse(path)
-    )
-  )
+cached
+Addressable resolveCallTarget(InvocationExpr call, boolean dispatch) {
+  CachedStage::ref() and
+  dispatch = false and
+  result = call.(NonAssocCallExpr).resolveCallTargetViaPathResolution()
   or
-  // adjust for implicit deref
-  exists(
-    DerefChain derefChain0, Type t0, TypePath path0, DerefImplItemNode impl, Type selfParamType,
-    TypePath selfPath
-  |
-    t0 = inferFunctionCallTypeSelf(call, n, derefChain0, path0) and
-    derefChain0.isCons(impl, derefChain) and
-    selfParamType = impl.resolveSelfTypeAt(selfPath)
-  |
-    result = selfParamType and
-    path = selfPath and
-    not result instanceof TypeParameter
+  exists(ImplOrTraitItemNode i |
+    i instanceof TraitItemNode and dispatch = true
     or
-    exists(TypePath pathToTypeParam, TypePath suffix |
-      impl.targetHasTypeParameterAt(pathToTypeParam, selfParamType) and
-      path0 = pathToTypeParam.appendInverse(suffix) and
-      result = t0 and
-      path = selfPath.append(suffix)
-    )
+    i instanceof ImplItemNode and dispatch = false
+  |
+    result = call.(AssocFunctionResolution::AssocFunctionCall).resolveCallTarget(i, _, _, _) and
+    not call instanceof CallExprImpl::DynamicCallExpr and
+    not i instanceof Builtins::BuiltinImpl
   )
 }
 
-private Type inferFunctionCallTypePreCheck(
-  AstNode n, ContextTyping::FunctionPositionKind kind, TypePath path
-) {
-  exists(FunctionPosition pos |
-    result = inferFunctionCallTypeNonSelf(n, pos, path) and
-    if pos.isPosition()
-    then kind = ContextTyping::PositionalKind()
-    else kind = ContextTyping::ReturnKind()
-  )
-  or
-  exists(FunctionCallMatchingInput::Access a |
-    result = inferFunctionCallTypeSelf(a, n, DerefChain::nil(), path) and
-    if a.(AssocFunctionResolution::AssocFunctionCall).hasReceiver()
-    then kind = ContextTyping::SelfKind()
-    else kind = ContextTyping::PositionalKind()
+/**
+ * Gets the struct field that the field expression `fe` resolves to, if any.
+ */
+cached
+StructField resolveStructFieldExpr(FieldExpr fe, DerefChain derefChain) {
+  CachedStage::ref() and
+  exists(string name, DataType ty |
+    ty = getFieldExprLookupType(fe, pragma[only_bind_into](name), derefChain)
+  |
+    result = ty.(StructType).getTypeItem().getStructField(pragma[only_bind_into](name)) or
+    result = ty.(UnionType).getTypeItem().getStructField(pragma[only_bind_into](name))
   )
 }
 
 /**
- * Gets the type of `n` at `path`, where `n` is either a function call or an
- * argument/receiver of a function call.
+ * Gets the tuple field that the field expression `fe` resolves to, if any.
  */
-private predicate inferFunctionCallType =
-  ContextTyping::CheckContextTyping<inferFunctionCallTypePreCheck/3>::check/2;
+cached
+TupleField resolveTupleFieldExpr(FieldExpr fe, DerefChain derefChain) {
+  CachedStage::ref() and
+  exists(int i |
+    result =
+      getTupleFieldExprLookupType(fe, pragma[only_bind_into](i), derefChain)
+          .(StructType)
+          .getTypeItem()
+          .getTupleField(pragma[only_bind_into](i))
+  )
+}
+
+private module Input3 implements InputSig3 {
+  private import rust as Rust
+  private import codeql.rust.dataflow.internal.ModelsAsData
 
-abstract private class Constructor extends Addressable {
-  final TypeParameter getTypeParameter(TypeParameterPosition ppos) {
-    typeParamMatchPosition(this.getTypeItem().getGenericParamList().getATypeParam(), result, ppos)
+  predicate cacheRevRef() {
+    (implicitDerefChainBorrow(_, _, _) implies any())
+    or
+    (exists(resolveCallTarget(_, _)) implies any())
+    or
+    (exists(resolveStructFieldExpr(_, _)) implies any())
+    or
+    (exists(resolveTupleFieldExpr(_, _)) implies any())
+    or
+    (mayInvokeCallback(_, _) implies any())
   }
 
-  abstract TypeItem getTypeItem();
+  predicate inferTypeForDefaults = M3::inferType/2;
 
-  abstract TypeRepr getParameterTypeRepr(int pos);
+  class UnknownType = T::UnknownType;
 
-  Type getReturnType(TypePath path) {
-    result = TDataType(this.getTypeItem()) and
-    path.isEmpty()
-    or
-    result = TTypeParamTypeParameter(this.getTypeItem().getGenericParamList().getATypeParam()) and
-    path = TypePath::singleton(result)
+  class BoolType extends DataType {
+    BoolType() { this.getTypeItem() instanceof Builtins::Bool }
   }
 
-  Type getDeclaredType(FunctionPosition pos, TypePath path) {
-    result = this.getParameterType(pos.asPosition(), path)
-    or
-    pos.isReturn() and
-    result = this.getReturnType(path)
-  }
+  class AstNode = Rust::AstNode;
 
-  Type getParameterType(int pos, TypePath path) {
-    result = this.getParameterTypeRepr(pos).(TypeMention).getTypeAt(path)
-  }
-}
+  final class Expr = ExprImpl;
 
-private class StructConstructor extends Constructor instanceof Struct {
-  override TypeItem getTypeItem() { result = this }
+  abstract private class ExprImpl extends AstNode { }
 
-  override TypeRepr getParameterTypeRepr(int i) {
-    result = [super.getTupleField(i).getTypeRepr(), super.getNthStructField(i).getTypeRepr()]
+  private class ExprExpr extends ExprImpl, Rust::Expr { }
+
+  private class ArgListExpr extends ExprImpl, ArgList { }
+
+  class Cast extends Expr, CastExpr {
+    TypeMention getType() { result = this.getTypeRepr() }
   }
-}
 
-private class VariantConstructor extends Constructor instanceof Variant {
-  override TypeItem getTypeItem() { result = super.getEnum() }
+  class Switch extends Rust::MatchExpr {
+    Expr getExpr() { result = this.getScrutinee() }
 
-  override TypeRepr getParameterTypeRepr(int i) {
-    result = [super.getTupleField(i).getTypeRepr(), super.getNthStructField(i).getTypeRepr()]
+    Case getCase(int index) { result = this.getArm(index) }
   }
-}
 
-/**
- * A matching configuration for resolving types of constructions of enums and
- * structs, such as `Result::Ok(42)`, `Foo { bar: 1 }` and `None`.
- */
-private module ConstructionMatchingInput implements MatchingInputSig {
-  import FunctionPositionMatchingInput
+  class Case extends Rust::MatchArm {
+    AstNode getAPattern() { result = this.getPat() }
 
-  class Declaration = Constructor;
+    AstNode getBody() { result = this.getExpr() }
+  }
 
-  abstract class Access extends AstNode {
-    abstract Type getInferredType(FunctionPosition pos, TypePath path);
+  class ConditionalExpr extends Expr instanceof IfExpr {
+    Expr getCondition() { result = super.getCondition() }
 
-    abstract Declaration getTarget();
+    Expr getThen() { result = super.getThen() }
 
-    abstract AstNode getNodeAt(AccessPosition apos);
+    Expr getElse() { result = super.getElse() }
+  }
 
-    abstract Type getTypeArgument(TypeArgumentPosition apos, TypePath path);
+  class BinaryExpr extends Expr, Rust::BinaryExpr {
+    Expr getLeftOperand() { result = super.getLhs() }
 
-    /**
-     * Holds if the return type of this construction expression at `path` may
-     * have to be inferred from the context. For example in `Result::Ok(42)` the
-     * error type has to be inferred from the context.
-     */
-    pragma[nomagic]
-    predicate hasUnknownTypeAt(FunctionPosition pos, TypePath path) {
-      exists(Declaration d, TypeParameter tp |
-        d = this.getTarget() and
-        pos.isReturn() and
-        tp = d.getReturnType(path) and
-        not exists(FunctionPosition pos2 | not pos2.isReturn() and tp = d.getDeclaredType(pos2, _)) and
-        // check that no explicit type arguments have been supplied for `tp`
-        not exists(TypeArgumentPosition tapos |
-          exists(this.getTypeArgument(tapos, _)) and
-          TTypeParamTypeParameter(tapos.asTypeParam()) = tp
-        )
-      )
-    }
+    Expr getRightOperand() { result = super.getRhs() }
   }
 
-  private class NonAssocCallAccess extends Access, NonAssocCallExpr,
-    ContextTyping::ContextTypedCallCand
-  {
-    NonAssocCallAccess() {
-      this instanceof CallExprImpl::TupleStructExpr or
-      this instanceof CallExprImpl::TupleVariantExpr
-    }
+  class LogicalAndExpr extends BinaryExpr, Rust::LogicalAndExpr { }
 
-    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
-      result = NonAssocCallExpr.super.getTypeArgument(apos, path)
-    }
+  class LogicalOrExpr extends BinaryExpr, Rust::LogicalOrExpr { }
 
-    override AstNode getNodeAt(AccessPosition apos) {
-      result = NonAssocCallExpr.super.getNodeAt(apos)
-    }
+  final class Assignment = AssignmentImpl;
 
-    override Type getInferredType(FunctionPosition pos, TypePath path) {
-      result = NonAssocCallExpr.super.getInferredType(pos, path)
-    }
+  abstract private class AssignmentImpl extends BinaryExpr { }
 
-    override Declaration getTarget() { result = this.resolveCallTargetViaPathResolution() }
+  class AssignExpr extends AssignmentImpl, Rust::AssignmentExpr { }
+
+  // Required by the shared type-inference signature; parenthesized expressions are transparent.
+  abstract class ParenExpr extends Expr {
+    Expr getExpr() { none() }
   }
 
-  abstract private class StructAccess extends Access instanceof PathAstNode {
-    pragma[nomagic]
-    override Type getInferredType(AccessPosition apos, TypePath path) {
-      result = inferType(this.getNodeAt(apos), path)
-    }
+  final class Declaration = DeclarationImpl;
 
-    pragma[nomagic]
-    override Declaration getTarget() { result = resolvePath(super.getPath()) }
+  abstract private class DeclarationImpl extends AstNode {
+    abstract TypeMention getDeclaringType();
 
-    pragma[nomagic]
-    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
-      // Handle constructions that use `Self {...}` syntax
-      exists(TypeMention tm, TypePath path0 |
-        tm = super.getPath() and
-        result = tm.getTypeAt(path0) and
-        path0.isCons(TTypeParamTypeParameter(apos.asTypeParam()), path)
-      )
-    }
+    abstract TypeMention getType();
   }
 
-  private class StructExprAccess extends StructAccess, StructExpr {
-    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
-      result = super.getTypeArgument(apos, path)
-      or
-      exists(TypePath suffix |
-        suffix.isCons(TTypeParamTypeParameter(apos.asTypeParam()), path) and
-        result = CertainTypeInference::inferCertainType(this, suffix)
-      )
+  private newtype TVariable =
+    TVariableVariable(Rust::Variable v) or
+    TConstVariable(Const c) or
+    TStaticVariable(Static s)
+
+  class Variable extends TVariable {
+    Rust::Variable asLocalVariable() { this = TVariableVariable(result) }
+
+    Const asConst() { this = TConstVariable(result) }
+
+    Static asStatic() { this = TStaticVariable(result) }
+
+    AstNode getDefiningNode() {
+      result = this.asLocalVariable().getPat().getName() or
+      this.asLocalVariable().isParameter(result.(SelfParam)) or
+      result = this.asConst().getName() or
+      result = this.asStatic().getName()
     }
 
-    override AstNode getNodeAt(AccessPosition apos) {
-      result =
-        this.getFieldExpr(pragma[only_bind_into](this.getNthStructField(apos.asPosition())
-              .getName()
-              .getText())).getExpr()
+    Expr getAnAccess() {
+      result = this.asLocalVariable().getAnAccess()
       or
-      result = this and apos.isReturn()
+      result = this.asConst().getAnAccess()
+      or
+      result = this.asStatic().getAnAccess()
     }
+
+    string toString() { result = this.getDefiningNode().toString() }
+
+    Location getLocation() { result = this.getDefiningNode().getLocation() }
   }
 
-  /** A potential nullary struct/variant construction such as `None`. */
-  private class PathExprAccess extends StructAccess, PathExpr {
-    PathExprAccess() { not exists(CallExpr ce | this = ce.getFunction()) }
+  final class VariableDeclaration = VariableDeclarationImpl;
+
+  abstract private class VariableDeclarationImpl extends DeclarationImpl {
+    abstract predicate preservesInitializerType();
+
+    abstract AstNode getPattern();
 
-    override AstNode getNodeAt(AccessPosition apos) { result = this and apos.isReturn() }
+    abstract AstNode getInitializer();
+
+    override TypeMention getDeclaringType() { none() }
   }
-}
 
-private module ConstructionMatching = Matching<ConstructionMatchingInput>;
+  private class LetExprDeclaration extends VariableDeclarationImpl instanceof LetExpr {
+    override predicate preservesInitializerType() { super.getPat() instanceof IdentPat }
 
-pragma[nomagic]
-private Type inferConstructionTypePreCheck(
-  AstNode n, ContextTyping::FunctionPositionKind kind, TypePath path
-) {
-  exists(ConstructionMatchingInput::Access a, FunctionPosition pos |
-    n = a.getNodeAt(pos) and
-    if pos.isPosition()
-    then kind = ContextTyping::PositionalKind()
-    else kind = ContextTyping::ReturnKind()
-  |
-    result = ConstructionMatching::inferAccessType(a, pos, path)
-    or
-    a.hasUnknownTypeAt(pos, path) and
-    result = TUnknownType()
-  )
-}
+    override TypeMention getType() { none() }
 
-private predicate inferConstructionType =
-  ContextTyping::CheckContextTyping<inferConstructionTypePreCheck/3>::check/2;
+    override AstNode getPattern() { result = super.getPat() }
 
-/**
- * A matching configuration for resolving types of operations like `a + b`.
- */
-private module OperationMatchingInput implements MatchingInputSig {
-  private import codeql.rust.elements.internal.OperationImpl::Impl as OperationImpl
-  import FunctionPositionMatchingInput
+    override AstNode getInitializer() { result = super.getScrutinee() }
+  }
 
-  class Declaration extends FunctionCallMatchingInput::Declaration {
-    private Method getSelfOrImpl() {
-      result = f
-      or
-      f.implements(result)
+  private class LetStmtDeclaration extends VariableDeclarationImpl instanceof LetStmt {
+    override predicate preservesInitializerType() {
+      not super.hasTypeRepr() and
+      // Due to "binding modes" the type of the pattern is not necessarily the
+      // same as the type of the initializer. However, when the pattern is an
+      // identifier pattern, its type is guaranteed to be the same as the type of the
+      // initializer.
+      super.getPat() instanceof IdentPat
     }
 
-    pragma[nomagic]
-    private predicate borrowsAt(FunctionPosition pos) {
-      exists(TraitItemNode t, string path, string method |
-        this.getSelfOrImpl() = t.getAssocItem(method) and
-        path = t.getCanonicalPath(_) and
-        exists(int borrows | OperationImpl::isOverloaded(_, _, path, method, borrows) |
-          pos.asPosition() = 0 and borrows >= 1
-          or
-          pos.asPosition() = 1 and
-          borrows >= 2
-        )
-      )
-    }
+    override TypeMention getType() { result = super.getTypeRepr() }
 
-    pragma[nomagic]
-    private predicate derefsReturn() { this.getSelfOrImpl() = any(DerefTrait t).getDerefFunction() }
+    override AstNode getPattern() { result = super.getPat() }
 
-    Type getDeclaredType(FunctionPosition pos, TypePath path) {
-      exists(TypePath path0 |
-        result = super.getDeclaredType(pos, path0) and
-        if
-          this.borrowsAt(pos)
-          or
-          pos.isReturn() and this.derefsReturn()
-        then path0.isCons(getRefTypeParameter(_), path)
-        else path0 = path
-      )
-    }
+    override AstNode getInitializer() { result = LetStmt.super.getInitializer() }
   }
 
-  class Access extends AssocFunctionResolution::OperationAssocFunctionCall {
-    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) { none() }
+  private class ConstDeclaration extends VariableDeclarationImpl instanceof Const {
+    override predicate preservesInitializerType() { none() }
 
-    pragma[nomagic]
-    Type getInferredType(FunctionPosition pos, TypePath path) {
-      result = inferType(this.getNodeAt(pos), path)
-    }
+    override TypeMention getType() { result = super.getTypeRepr() }
 
-    Declaration getTarget() {
-      exists(ImplOrTraitItemNode i |
-        result.isAssocFunction(i, this.resolveCallTarget(i, _, _, _)) // mutual recursion
-      )
-    }
+    override AstNode getPattern() { result = super.getName() }
+
+    override AstNode getInitializer() { result = super.getBody() }
   }
-}
 
-private module OperationMatching = Matching<OperationMatchingInput>;
+  private class StaticDeclaration extends VariableDeclarationImpl instanceof Static {
+    override predicate preservesInitializerType() { none() }
 
-pragma[nomagic]
-private Type inferOperationTypePreCheck(
-  AstNode n, ContextTyping::FunctionPositionKind kind, TypePath path
-) {
-  exists(OperationMatchingInput::Access a, FunctionPosition pos |
-    n = a.getNodeAt(pos) and
-    result = OperationMatching::inferAccessType(a, pos, path) and
-    if pos.asPosition() = 0
-    then kind = ContextTyping::SelfKind()
-    else
-      if pos.isPosition()
-      then kind = ContextTyping::PositionalKind()
-      else kind = ContextTyping::ReturnKind()
-  )
-}
+    override TypeMention getType() { result = super.getTypeRepr() }
 
-private predicate inferOperationType =
-  ContextTyping::CheckContextTyping<inferOperationTypePreCheck/3>::check/2;
+    override AstNode getPattern() { result = super.getName() }
 
-pragma[nomagic]
-private Type getFieldExprLookupType(FieldExpr fe, string name, DerefChain derefChain) {
-  exists(TypePath path |
-    result = inferType(fe.getContainer(), path) and
-    name = fe.getIdentifier().getText() and
-    isComplexRootStripped(path, result)
-  |
-    // TODO: Support full derefence chains as for method calls
-    path.isEmpty() and
-    derefChain = DerefChain::nil()
-    or
-    exists(DerefImplItemNode impl, TypeParamTypeParameter tp |
-      tp = impl.getFirstSelfTypeParameter() and
-      path.getHead() = tp and
-      derefChain = DerefChain::singleton(impl)
-    )
-  )
-}
+    override AstNode getInitializer() { result = super.getBody() }
+  }
 
-pragma[nomagic]
-private Type getTupleFieldExprLookupType(FieldExpr fe, int pos, DerefChain derefChain) {
-  exists(string name |
-    result = getFieldExprLookupType(fe, name, derefChain) and
-    pos = name.toInt()
-  )
-}
+  final class Field = FieldImpl;
 
-/**
- * A matching configuration for resolving types of field expressions like `x.field`.
- */
-private module FieldExprMatchingInput implements MatchingInputSig {
-  private newtype TDeclarationPosition =
-    TSelfDeclarationPosition() or
-    TFieldPos()
+  abstract private class FieldImpl extends DeclarationImpl {
+    // no case for variants as those can only be destructured using pattern matching
+    abstract Struct getStruct();
 
-  class DeclarationPosition extends TDeclarationPosition {
-    predicate isSelf() { this = TSelfDeclarationPosition() }
+    override TypeMention getDeclaringType() { result = this.getStruct() }
+  }
 
-    predicate isField() { this = TFieldPos() }
+  private class StructFieldDecl extends FieldImpl instanceof StructField {
+    override Struct getStruct() { this = result.getAStructField() }
 
-    string toString() {
-      this.isSelf() and
-      result = "self"
-      or
-      this.isField() and
-      result = "(field)"
-    }
+    override TypeMention getType() { result = StructField.super.getTypeRepr() }
   }
 
-  private newtype TDeclaration =
-    TStructFieldDecl(StructField sf) or
-    TTupleFieldDecl(TupleField tf)
+  private class TupleFieldDecl extends FieldImpl instanceof TupleField {
+    override Struct getStruct() { this = result.getATupleField() }
 
-  abstract class Declaration extends TDeclaration {
-    TypeParameter getTypeParameter(TypeParameterPosition ppos) { none() }
+    override TypeMention getType() { result = TupleField.super.getTypeRepr() }
+  }
 
-    abstract Type getDeclaredType(DeclarationPosition dpos, TypePath path);
+  class FieldAccess extends Expr, FieldExpr {
+    Expr getReceiver() { result = this.getContainer() }
 
-    abstract string toString();
+    Field getField() {
+      // mutual recursion; resolving fields requires resolving types and vice versa
+      result =
+        [
+          resolveStructFieldExpr(this, _).(AstNode),
+          resolveTupleFieldExpr(this, _)
+        ]
+    }
+  }
 
-    abstract Location getLocation();
+  Type inferFieldAccessReceiverType(FieldAccess fa, TypePath path) {
+    exists(TypePath path0 | result = inferType(fa.getReceiver(), path0) |
+      // adjust for implicit deref
+      path0.isCons(getRefTypeParameter(_), path)
+      or
+      not path0.isCons(getRefTypeParameter(_), _) and
+      not (result instanceof RefType and path0.isEmpty()) and
+      path = path0
+    )
   }
 
-  abstract private class StructOrTupleFieldDecl extends Declaration {
-    abstract AstNode getAstNode();
+  Type inferFieldAccessReceiverTypeContextual(Expr receiver, TypePath path) {
+    exists(TypePath path0, Type receiverType |
+      result = M3::inferFieldAccessReceiverTypeContextualDefault(_, receiver, path0) and
+      receiverType = inferType(receiver) and
+      not path0.isEmpty()
+    |
+      // adjust for implicit deref
+      path = TypePath::cons(receiverType.(RefType).getPositionalTypeParameter(0), path0)
+      or
+      not receiverType instanceof RefType and
+      path = path0
+    )
+  }
 
-    abstract TypeRepr getTypeRepr();
+  class Return extends ReturnExpr {
+    Expr getExpr() { result = super.getExpr() }
+  }
 
-    override Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
-      dpos.isSelf() and
-      // no case for variants as those can only be destructured using pattern matching
-      exists(Struct s | this.getAstNode() = [s.getStructField(_).(AstNode), s.getTupleField(_)] |
-        result = TDataType(s) and
-        path.isEmpty()
-        or
-        result = TTypeParamTypeParameter(s.getGenericParamList().getATypeParam()) and
-        path = TypePath::singleton(result)
-      )
-      or
-      dpos.isField() and
-      result = this.getTypeRepr().(TypeMention).getTypeAt(path)
-    }
+  final class Parameter = ParameterImpl;
 
-    override string toString() { result = this.getAstNode().toString() }
+  abstract private class ParameterImpl extends VariableDeclarationImpl {
+    override predicate preservesInitializerType() { none() } // doesn't really matter, since there are no initializers/default values
 
-    override Location getLocation() { result = this.getAstNode().getLocation() }
+    override AstNode getInitializer() { none() }
   }
 
-  private class StructFieldDecl extends StructOrTupleFieldDecl, TStructFieldDecl {
-    private StructField sf;
+  private class SelfParamParameter extends ParameterImpl, SelfParam {
+    override AstNode getPattern() { result = this }
 
-    StructFieldDecl() { this = TStructFieldDecl(sf) }
+    override TypeMention getType() { result = getSelfParamTypeMention(this) }
+  }
 
-    override AstNode getAstNode() { result = sf }
+  private class ParamParameter extends ParameterImpl, Param {
+    override AstNode getPattern() { result = this.getPat() }
 
-    override TypeRepr getTypeRepr() { result = sf.getTypeRepr() }
+    override TypeMention getType() { result = this.getTypeRepr() }
   }
 
-  private class TupleFieldDecl extends StructOrTupleFieldDecl, TTupleFieldDecl {
-    private TupleField tf;
+  private class TupleFieldParameter extends ParameterImpl instanceof TupleField {
+    override AstNode getPattern() { none() }
 
-    TupleFieldDecl() { this = TTupleFieldDecl(tf) }
+    override TypeMention getType() { result = super.getTypeRepr() }
+  }
 
-    override AstNode getAstNode() { result = tf }
+  private class StructFieldParameter extends ParameterImpl instanceof StructField {
+    override AstNode getPattern() { none() }
 
-    override TypeRepr getTypeRepr() { result = tf.getTypeRepr() }
+    override TypeMention getType() { result = super.getTypeRepr() }
   }
 
-  class AccessPosition = DeclarationPosition;
+  final class Callable = CallableImpl;
 
-  class Access extends FieldExpr {
-    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) { none() }
+  abstract private class CallableImpl extends DeclarationImpl {
+    abstract TypeParameter getTypeParameter(int pos);
 
-    AstNode getNodeAt(AccessPosition apos) {
-      result = this.getContainer() and
-      apos.isSelf()
-      or
-      result = this and
-      apos.isField()
-    }
+    abstract TypeMention getAdditionalTypeParameterConstraint(TypeParameter tp);
 
-    Type getInferredType(AccessPosition apos, TypePath path) {
-      exists(TypePath path0 | result = inferType(this.getNodeAt(apos), path0) |
-        if apos.isSelf()
-        then
-          // adjust for implicit deref
-          path0.isCons(getRefTypeParameter(_), path)
-          or
-          not path0.isCons(getRefTypeParameter(_), _) and
-          not (result instanceof RefType and path0.isEmpty()) and
-          path = path0
-        else path = path0
+    abstract Parameter getParameter(int i);
+
+    abstract AstNode getBody();
+  }
+
+  private class CallableCallable extends CallableImpl instanceof Rust::Callable {
+    override TypeMention getDeclaringType() {
+      exists(ImplOrTraitItemNode implOrTrait | this = implOrTrait.getAnAssocItem() |
+        result = implOrTrait.(Impl).getSelfTy() or
+        result = implOrTrait.(Trait)
       )
     }
 
-    Declaration getTarget() {
-      // mutual recursion; resolving fields requires resolving types and vice versa
+    override TypeParameter getTypeParameter(int pos) {
+      result = TTypeParamTypeParameter(this.(Function).getGenericParamList().getTypeParam(pos))
+    }
+
+    override TypeMention getAdditionalTypeParameterConstraint(TypeParameter tp) {
       result =
-        [
-          TStructFieldDecl(resolveStructFieldExpr(this, _)).(TDeclaration),
-          TTupleFieldDecl(resolveTupleFieldExpr(this, _))
-        ]
+        tp.(TypeParamTypeParameter).getTypeParam().getAdditionalTypeBound(this, _).getTypeRepr()
     }
-  }
 
-  predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
-    apos = dpos
+    override Parameter getParameter(int i) {
+      i = 0 and
+      result = super.getSelfParam()
+      or
+      exists(int pos | result = super.getParam(pos) |
+        if this instanceof Method then i = pos + 1 else i = pos
+      )
+    }
+
+    override TypeMention getType() { result = getReturnTypeMention(this) }
+
+    override AstNode getBody() { result = Rust::Callable.super.getBody() }
   }
-}
 
-private module FieldExprMatching = Matching<FieldExprMatchingInput>;
+  Callable getEnclosingCallable(AstNode node) { result = node.getEnclosingCallable() }
 
-/**
- * Gets the type of `n` at `path`, where `n` is either a field expression or
- * the receiver of field expression call.
- */
-pragma[nomagic]
-private Type inferFieldExprType(AstNode n, TypePath path) {
-  exists(
-    FieldExprMatchingInput::Access a, FieldExprMatchingInput::AccessPosition apos, TypePath path0
-  |
-    n = a.getNodeAt(apos) and
-    result = FieldExprMatching::inferAccessType(a, apos, path0)
-  |
-    if apos.isSelf()
-    then
-      exists(Type receiverType | receiverType = inferType(n) |
-        if receiverType instanceof RefType
-        then
-          // adjust for implicit deref
-          not path0.isCons(getRefTypeParameter(_), _) and
-          not (path0.isEmpty() and result instanceof RefType) and
-          path = TypePath::cons(getRefTypeParameter(_), path0)
-        else path = path0
-      )
-    else path = path0
-  )
-}
+  additional final class Constructor = ConstructorImpl;
+
+  abstract private class ConstructorImpl extends CallableImpl {
+    abstract TypeItem getTypeItem();
+
+    override TypeMention getDeclaringType() { result = this.getTypeItem() }
 
-/** Gets the root type of the reference expression `ref`. */
-pragma[nomagic]
-private Type inferRefExprType(RefExpr ref) {
-  if ref.isRaw()
-  then
-    ref.isMut() and result instanceof PtrMutType
-    or
-    ref.isConst() and result instanceof PtrConstType
-  else
-    if ref.isMut()
-    then result instanceof RefMutType
-    else result instanceof RefSharedType
-}
+    override TypeMention getAdditionalTypeParameterConstraint(TypeParameter tp) { none() }
 
-/** Gets the root type of the reference node `ref`. */
-pragma[nomagic]
-private Type inferRefPatType(AstNode ref) {
-  exists(boolean isMut |
-    ref =
-      any(IdentPat ip |
-        ip.isRef() and
-        if ip.isMut() then isMut = true else isMut = false
-      ).getName()
-    or
-    ref = any(RefPat rp | if rp.isMut() then isMut = true else isMut = false)
-  |
-    result = getRefType(isMut)
-  )
-}
+    override TypeParameter getTypeParameter(int pos) {
+      result = TTypeParamTypeParameter(this.getTypeItem().getGenericParamList().getTypeParam(pos))
+    }
 
-pragma[nomagic]
-private Type inferTryExprType(TryExpr te, TypePath path) {
-  exists(TypeParam tp, TypePath path0 |
-    result = inferType(te.getExpr(), path0) and
-    path0.isCons(TTypeParamTypeParameter(tp), path)
-  |
-    tp = any(ResultEnum r).getGenericParamList().getGenericParam(0)
-    or
-    tp = any(OptionEnum o).getGenericParamList().getGenericParam(0)
-  )
-}
+    override TypeMention getType() { result = this.getTypeItem() }
 
-pragma[nomagic]
-private StructType getStrStruct() { result = TDataType(any(Builtins::Str s)) }
+    override AstNode getBody() { none() }
+  }
 
-pragma[nomagic]
-private Type inferLiteralType(LiteralExpr le, TypePath path, boolean certain) {
-  path.isEmpty() and
-  exists(Builtins::BuiltinType t | result = TDataType(t) |
-    le instanceof CharLiteralExpr and
-    t instanceof Builtins::Char and
-    certain = true
+  private class StructConstructor extends ConstructorImpl instanceof Struct {
+    override TypeItem getTypeItem() { result = this }
+
+    override Parameter getParameter(int i) {
+      result = [super.getTupleField(i).(AstNode), super.getNthStructField(i)]
+    }
+  }
+
+  private class VariantConstructor extends ConstructorImpl instanceof Variant {
+    override TypeItem getTypeItem() { result = super.getEnum() }
+
+    override Parameter getParameter(int i) {
+      result = [super.getTupleField(i).(AstNode), super.getNthStructField(i)]
+    }
+  }
+
+  Type getCallableReturnType(Callable c, TypePath path) {
+    result = c.(Constructor).getType().getTypeAt(path)
     or
-    le =
-      any(NumberLiteralExpr ne |
-        t.getName() = ne.getSuffix() and
-        certain = true
-        or
-        // When a number literal has no suffix, the type may depend on the context.
-        // For simplicity, we assume either `i32` or `f64`.
-        not exists(ne.getSuffix()) and
-        certain = false and
-        (
-          ne instanceof IntegerLiteralExpr and
-          t instanceof Builtins::I32
-          or
-          ne instanceof FloatLiteralExpr and
-          t instanceof Builtins::F64
-        )
+    if c.(Function).isAsync() or c.(ClosureExpr).isAsync()
+    then
+      path.isEmpty() and
+      result = getFutureTraitType()
+      or
+      exists(TypePath suffix |
+        result = getReturnTypeMention(c).getTypeAt(suffix) and
+        path = TypePath::cons(getDynFutureOutputTypeParameter(), suffix)
       )
-    or
-    le instanceof BooleanLiteralExpr and
-    t instanceof Builtins::Bool and
-    certain = true
-  )
-  or
-  le instanceof StringLiteralExpr and
-  (
-    path.isEmpty() and result instanceof RefSharedType
-    or
-    path = TypePath::singleton(getRefTypeParameter(false)) and
-    result = getStrStruct()
-  ) and
-  certain = true
-}
+    else result = getReturnTypeMention(c).getTypeAt(path)
+  }
 
-pragma[nomagic]
-private DynTraitType getFutureTraitType() { result.getTrait() instanceof FutureTrait }
+  class InvocationResolutionContext = string;
 
-pragma[nomagic]
-private AssociatedTypeTypeParameter getFutureOutputTypeParameter() {
-  result = getAssociatedTypeTypeParameter(any(FutureTrait ft).getOutputType())
-}
+  bindingset[derefChain, borrow]
+  private InvocationResolutionContext encodeDerefChainBorrow(
+    DerefChain derefChain, BorrowKind borrow
+  ) {
+    result = derefChain + ";" + borrow
+  }
 
-pragma[nomagic]
-private DynTraitTypeParameter getDynFutureOutputTypeParameter() {
-  result.getTraitTypeParameter() = getFutureOutputTypeParameter()
-}
+  bindingset[derefChainBorrow]
+  private predicate decodeDerefChainBorrow(
+    string derefChainBorrow, DerefChain derefChain, BorrowKind borrow
+  ) {
+    exists(int i |
+      i = derefChainBorrow.indexOf(";") and
+      derefChain = derefChainBorrow.prefix(i) and
+      borrow.toString() = derefChainBorrow.suffix(i + 1)
+    )
+  }
 
-pragma[nomagic]
-predicate isUnitBlockExpr(BlockExpr be) {
-  not be.getStmtList().hasTailExpr() and
-  not be = any(Callable c).getBody() and
-  not be.hasLabel()
-}
+  private string noDerefChainBorrow() {
+    exists(DerefChain derefChain, BorrowKind borrow |
+      derefChain.isEmpty() and
+      borrow.isNoBorrow() and
+      result = encodeDerefChainBorrow(derefChain, borrow)
+    )
+  }
 
-pragma[nomagic]
-private Type inferBlockExprType(BlockExpr be, TypePath path) {
-  // `typeEquality` handles the non-root case
-  if be instanceof AsyncBlockExpr
-  then (
-    path.isEmpty() and
-    result = getFutureTraitType()
-    or
-    isUnitBlockExpr(be) and
-    path = TypePath::singleton(getDynFutureOutputTypeParameter()) and
-    result instanceof UnitType
-  ) else (
-    isUnitBlockExpr(be) and
-    path.isEmpty() and
-    result instanceof UnitType
-  )
-}
+  final class Invocation = InvocationImpl;
 
-pragma[nomagic]
-private predicate exprHasUnitType(Expr e) {
-  e = any(IfExpr ie | not ie.hasElse())
-  or
-  e instanceof WhileExpr
-  or
-  e instanceof ForExpr
-}
+  abstract private class InvocationImpl extends Expr {
+    abstract Type getTypeQualifier(TypePath path);
 
-final private class AwaitTarget extends Expr {
-  AwaitTarget() { this = any(AwaitExpr ae).getExpr() }
+    abstract Type getTypeArgument(int pos, TypePath path);
 
-  Type getTypeAt(TypePath path) { result = inferType(this, path) }
-}
+    abstract Expr getArgument(int i);
+
+    abstract Callable getTarget(string derefChainBorrow);
+
+    abstract Callable getATargetForTypeQualifierMatching();
+  }
 
-private module AwaitSatisfiesTypeInput implements SatisfiesTypeInputSig<AwaitTarget> {
   pragma[nomagic]
-  predicate relevantConstraint(AwaitTarget term, Type constraint) {
-    exists(term) and
-    constraint.(TraitType).getTrait() instanceof FutureTrait
+  private Type getCallExprTypeArgument(CallExpr ce, int pos, TypePath path) {
+    exists(Path p |
+      p = CallExprImpl::getFunctionPath(ce) and
+      result = getPathTypeArgument(p, pos).getTypeAt(path)
+    )
   }
-}
 
-private module AwaitSatisfiesType = SatisfiesType<AwaitTarget, AwaitSatisfiesTypeInput>;
+  private class AssocFunctionCall extends InvocationImpl instanceof AssocFunctionResolution::AssocFunctionCall
+  {
+    override Type getTypeQualifier(TypePath path) {
+      result = getCallExprTypeQualifier(this, path, _)
+    }
 
-pragma[nomagic]
-private Type inferAwaitExprType(AstNode n, TypePath path) {
-  exists(TypePath exprPath |
-    AwaitSatisfiesType::satisfiesConstraint(n.(AwaitExpr).getExpr(), _, exprPath, result) and
-    exprPath.isCons(getFutureOutputTypeParameter(), path)
-  )
-}
+    pragma[nomagic]
+    override Type getTypeArgument(int pos, TypePath path) {
+      result = getCallExprTypeArgument(this, pos, path)
+      or
+      result =
+        this.(MethodCallExpr).getGenericArgList().getTypeArg(pos).(TypeMention).getTypeAt(path)
+    }
 
-/**
- * Gets the root type of the array expression `ae`.
- */
-pragma[nomagic]
-private Type inferArrayExprType(ArrayExpr ae) { exists(ae) and result instanceof ArrayType }
+    override Expr getArgument(int i) {
+      exists(FunctionPosition pos |
+        i = pos.asPosition() and
+        result = super.getNodeAt(pos)
+      )
+    }
 
-/**
- * Gets the root type of the range expression `re`.
- */
-pragma[nomagic]
-private Type inferRangeExprType(RangeExpr re) { result = TDataType(getRangeType(re)) }
+    pragma[nomagic]
+    Type getInferredSelfType(int pos, string derefChainBorrow, TypePath path) {
+      exists(FunctionPosition fpos, DerefChain derefChain, BorrowKind borrow |
+        result = super.getSelfTypeAt(fpos, derefChain, borrow, path) and
+        derefChainBorrow = encodeDerefChainBorrow(derefChain, borrow) and
+        super.hasReceiverAtPos(fpos) and
+        pos = fpos.asPosition()
+      )
+    }
 
-pragma[nomagic]
-private Type getInferredDerefType(DerefExpr de, TypePath path) { result = inferType(de, path) }
+    pragma[nomagic]
+    Type getInferredNonSelfType(int pos, TypePath path) {
+      exists(FunctionPosition fpos |
+        not super.hasReceiverAtPos(fpos) and
+        result = super.getTypeAt(fpos, path) and
+        pos = fpos.asPosition()
+      )
+    }
 
-pragma[nomagic]
-private PtrType getInferredDerefExprPtrType(DerefExpr de) { result = inferType(de.getExpr()) }
+    override Callable getTarget(string derefChainBorrow) {
+      exists(DerefChain derefChain, BorrowKind borrow |
+        derefChainBorrow = encodeDerefChainBorrow(derefChain, borrow) and
+        result = super.resolveCallTarget(_, _, derefChain, borrow) // mutual recursion; resolving method calls requires resolving types and vice versa
+      )
+    }
 
-/**
- * Gets the inferred type of `n` at `path` when `n` occurs in a dereference
- * expression `*n` and when `n` is known to have a raw pointer type.
- *
- * The other direction is handled in `typeEqualityAsymmetric`.
- */
-private Type inferDereferencedExprPtrType(AstNode n, TypePath path) {
-  exists(DerefExpr de, PtrType type, TypePath suffix |
-    de.getExpr() = n and
-    type = getInferredDerefExprPtrType(de) and
-    result = getInferredDerefType(de, suffix) and
-    path = TypePath::cons(type.getPositionalTypeParameter(0), suffix)
-  )
-}
+    override Callable getATargetForTypeQualifierMatching() {
+      result = CallExprImpl::getResolvedFunction(this)
+    }
+  }
 
-/**
- * A matching configuration for resolving types of deconstruction patterns like
- * `let Foo { bar } = ...` or `let Some(x) = ...`.
- */
-private module DeconstructionPatMatchingInput implements MatchingInputSig {
-  import FunctionPositionMatchingInput
+  private class NonAssocFunctionCall extends InvocationImpl instanceof NonAssocCallExpr,
+    CallExprImpl::CallExprCall
+  {
+    override Type getTypeQualifier(TypePath path) { none() }
 
-  class Declaration = ConstructionMatchingInput::Declaration;
+    pragma[nomagic]
+    override Type getTypeArgument(int pos, TypePath path) {
+      result = getCallExprTypeArgument(this, pos, path)
+    }
 
-  class Access extends Pat instanceof PathAstNode {
-    Access() { this instanceof TupleStructPat or this instanceof StructPat }
+    override Expr getArgument(int i) { result = NonAssocCallExpr.super.getArgument(i) }
 
-    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) { none() }
+    pragma[nomagic]
+    private Callable getTarget() { result = super.resolveCallTargetViaPathResolution() }
 
-    AstNode getNodeAt(AccessPosition apos) {
-      this =
-        any(StructPat sp |
-          result =
-            sp.getPatField(pragma[only_bind_into](sp.getNthStructField(apos.asPosition())
-                  .getName()
-                  .getText())).getPat()
-        )
-      or
-      result = this.(TupleStructPat).getField(apos.asPosition())
-      or
-      result = this and
-      apos.isReturn()
+    override Callable getTarget(string derefChainBorrow) {
+      result = this.getTarget() and
+      derefChainBorrow = noDerefChainBorrow()
     }
 
-    Type getInferredType(AccessPosition apos, TypePath path) {
-      result = inferType(this.getNodeAt(apos), path)
-      or
-      // The struct/enum type is supplied explicitly as a type qualifier, e.g.
-      // `let Foo::<Bar>::Variant { ... } = ...` or
-      // `let Option::<Foo>::Some(x) = ...`.
-      apos.isReturn() and
-      result = super.getPath().(TypeMention).getTypeAt(path)
+    override Callable getATargetForTypeQualifierMatching() {
+      none() // non-assoc function calls cannot have type qualifiers
     }
-
-    Declaration getTarget() { result = resolvePath(super.getPath()) }
   }
-}
 
-private module DeconstructionPatMatching = Matching<DeconstructionPatMatchingInput>;
+  abstract private class Construction extends InvocationImpl {
+    abstract Constructor getTarget();
 
-/**
- * Gets the type of `n` at `path`, where `n` is a pattern for a constructor,
- * either a struct pattern or a tuple-struct pattern.
- */
-pragma[nomagic]
-private Type inferDeconstructionPatType(AstNode n, TypePath path) {
-  exists(DeconstructionPatMatchingInput::Access a, FunctionPosition apos |
-    n = a.getNodeAt(apos) and
-    result = DeconstructionPatMatching::inferAccessType(a, apos, path)
-  )
-}
+    override Callable getTarget(string derefChainBorrow) {
+      result = this.getTarget() and
+      derefChainBorrow = noDerefChainBorrow()
+    }
+
+    override Callable getATargetForTypeQualifierMatching() { result = this.getTarget() }
+  }
+
+  private class NonAssocCallConstruction extends Construction instanceof NonAssocCallExpr {
+    NonAssocCallConstruction() {
+      this instanceof CallExprImpl::TupleStructExpr or
+      this instanceof CallExprImpl::TupleVariantExpr
+    }
 
-final private class ForIterableExpr extends Expr {
-  ForIterableExpr() { this = any(ForExpr fe).getIterable() }
+    override Type getTypeQualifier(TypePath path) {
+      result = CallExprImpl::getFunctionPath(this).(TypeMention).getTypeAt(path)
+    }
 
-  Type getTypeAt(TypePath path) { result = inferType(this, path) }
-}
+    override Type getTypeArgument(int pos, TypePath path) { none() }
 
-private module ForIterableSatisfiesTypeInput implements SatisfiesTypeInputSig<ForIterableExpr> {
-  predicate relevantConstraint(ForIterableExpr term, Type constraint) {
-    exists(term) and
-    exists(Trait t | t = constraint.(TraitType).getTrait() |
-      // TODO: Remove the line below once we can handle the `impl<I: Iterator> IntoIterator for I` implementation
-      t instanceof IteratorTrait or
-      t instanceof IntoIteratorTrait
-    )
+    override Expr getArgument(int i) { result = NonAssocCallExpr.super.getArgument(i) }
+
+    override Constructor getTarget() { result = super.resolveCallTargetViaPathResolution() }
   }
-}
 
-pragma[nomagic]
-private AssociatedTypeTypeParameter getIteratorItemTypeParameter() {
-  result = getAssociatedTypeTypeParameter(any(IteratorTrait t).getItemType())
-}
+  abstract private class StructConstruction extends Construction instanceof PathAstNode {
+    pragma[nomagic]
+    override Constructor getTarget() { result = resolvePath(super.getPath()) }
 
-pragma[nomagic]
-private AssociatedTypeTypeParameter getIntoIteratorItemTypeParameter() {
-  result = getAssociatedTypeTypeParameter(any(IntoIteratorTrait t).getItemType())
-}
+    override Type getTypeQualifier(TypePath path) {
+      result = super.getPath().(TypeMention).getTypeAt(path)
+    }
 
-private module ForIterableSatisfiesType =
-  SatisfiesType<ForIterableExpr, ForIterableSatisfiesTypeInput>;
+    pragma[nomagic]
+    override Type getTypeArgument(int pos, TypePath path) { none() }
+  }
 
-pragma[nomagic]
-private Type inferForLoopExprType(AstNode n, TypePath path) {
-  // type of iterable -> type of pattern (loop variable)
-  exists(ForExpr fe, TypePath exprPath, AssociatedTypeTypeParameter tp |
-    n = fe.getPat() and
-    ForIterableSatisfiesType::satisfiesConstraint(fe.getIterable(), _, exprPath, result) and
-    exprPath.isCons(tp, path)
-  |
-    tp = getIntoIteratorItemTypeParameter()
-    or
-    // TODO: Remove once we can handle the `impl<I: Iterator> IntoIterator for I` implementation
-    tp = getIteratorItemTypeParameter() and
-    inferType(fe.getIterable()) != getArrayTypeParameter()
-  )
-}
+  private class StructExprConstruction extends StructConstruction, StructExpr {
+    override Expr getArgument(int i) {
+      result =
+        this.getFieldExpr(pragma[only_bind_into](this.getNthStructField(i).getName().getText()))
+            .getExpr()
+    }
+  }
 
-pragma[nomagic]
-private Type inferClosureExprType(AstNode n, TypePath path) {
-  exists(ClosureExpr ce |
-    n = ce and
-    (
-      path = TypePath::singleton(TDynTraitTypeParameter(_, any(FnTrait t).getTypeParam())) and
-      result.(TupleType).getArity() = ce.getNumberOfParams()
-      or
-      exists(TypePath path0 |
-        result = ce.getRetType().getTypeRepr().(TypeMention).getTypeAt(path0) and
-        path = closureReturnPath().append(path0)
-      )
-    )
-    or
-    exists(Param p |
-      p = ce.getAParam() and
-      not p.hasTypeRepr() and
-      n = p.getPat() and
-      result = TUnknownType() and
-      path.isEmpty()
-    )
-  )
-}
+  /** A potential nullary struct/variant construction such as `None`. */
+  private class PathExprConstruction extends StructConstruction, PathExpr {
+    PathExprConstruction() { not exists(CallExpr ce | this = ce.getFunction()) }
 
-pragma[nomagic]
-private TupleType inferArgList(ArgList args, TypePath path) {
-  exists(CallExprImpl::DynamicCallExpr dce |
-    args = dce.getArgList() and
-    result.getArity() = dce.getNumberOfSyntacticArguments() and
-    path.isEmpty()
-  )
-}
+    override Expr getArgument(int i) { none() }
+  }
 
-pragma[nomagic]
-private Type inferCastExprType(CastExpr ce, TypePath path) {
-  result = ce.getTypeRepr().(TypeMention).getTypeAt(path)
-}
+  pragma[nomagic]
+  private Type inferNonAssocFunctionCallArgumentType(Invocation invocation, int pos, TypePath path) {
+    not invocation instanceof AssocFunctionCall and
+    result = inferType(invocation.getArgument(pos), path)
+  }
 
-cached
-private module Cached {
-  /** Holds if `n` is implicitly dereferenced and/or borrowed. */
-  cached
-  predicate implicitDerefChainBorrow(Expr e, DerefChain derefChain, boolean borrow) {
-    exists(BorrowKind bk |
-      any(AssocFunctionResolution::AssocFunctionCall afc)
-          .argumentHasImplicitDerefChainBorrow(e, derefChain, bk) and
-      if bk.isNoBorrow() then borrow = false else borrow = true
-    )
+  bindingset[derefChainBorrow]
+  Type inferInvocationArgumentType(
+    Invocation invocation, string derefChainBorrow, int pos, TypePath path
+  ) {
+    result = inferNonAssocFunctionCallArgumentType(invocation, pos, path)
     or
-    e =
-      any(FieldExpr fe |
-        exists(resolveStructFieldExpr(fe, derefChain))
+    invocation =
+      any(AssocFunctionCall afc |
+        result = afc.getInferredSelfType(pos, derefChainBorrow, path)
         or
-        exists(resolveTupleFieldExpr(fe, derefChain))
-      ).getContainer() and
-    not derefChain.isEmpty() and
-    borrow = false
+        result = afc.getInferredNonSelfType(pos, path)
+      )
+  }
+
+  pragma[nomagic]
+  private Type inferInvocationArgumentTypeContextualDefault(
+    Invocation invocation, int pos, Expr arg, DerefChain derefChain, BorrowKind borrow,
+    TypePath path
+  ) {
+    exists(string derefChainBorrow |
+      decodeDerefChainBorrow(derefChainBorrow, derefChain, borrow) and
+      result =
+        M3::inferInvocationArgumentTypeContextualDefault(invocation, derefChainBorrow, pos, arg,
+          path)
+    )
   }
 
   /**
-   * Gets an item (function or tuple struct/variant) that `call` resolves to, if
-   * any.
+   * Gets the type of `receiver` at `path` after applying `derefChain`, where
+   * `receiver` is the `self` argument of a method call.
    *
-   * The parameter `dispatch` is `true` if and only if the resolved target is a
-   * trait item because a precise target could not be determined from the
-   * types (for instance in the presence of generics or `dyn` types)
+   * The predicate recursively pops the head of `derefChain` until it becomes
+   * empty, at which point the inferred type can be applied back to `receiver`.
    */
-  cached
-  Addressable resolveCallTarget(InvocationExpr call, boolean dispatch) {
-    dispatch = false and
-    result = call.(NonAssocCallExpr).resolveCallTargetViaPathResolution()
-    or
-    exists(ImplOrTraitItemNode i |
-      i instanceof TraitItemNode and dispatch = true
+  pragma[nomagic]
+  private Type inferInvocationSelfArgumentTypeContextual(
+    Invocation invocation, Expr receiver, DerefChain derefChain, TypePath path
+  ) {
+    exists(FunctionPosition pos, BorrowKind borrow, TypePath path0 |
+      invocation.(AssocFunctionResolution::AssocFunctionCall).hasReceiverAtPos(pos) and
+      result =
+        inferInvocationArgumentTypeContextualDefault(invocation, pos.asPosition(), receiver,
+          derefChain, borrow, path0)
+    |
+      borrow.isNoBorrow() and
+      path = path0
       or
-      i instanceof ImplItemNode and dispatch = false
+      // adjust for implicit borrow
+      exists(TypePath prefix |
+        prefix = TypePath::singleton(borrow.getRefType().getPositionalTypeParameter(0)) and
+        path0 = prefix.appendInverse(path)
+      )
+    )
+    or
+    // adjust for implicit deref
+    exists(
+      DerefChain derefChain0, Type t0, TypePath path0, DerefImplItemNode impl, Type selfParamType,
+      TypePath selfPath
     |
-      result = call.(AssocFunctionResolution::AssocFunctionCall).resolveCallTarget(i, _, _, _) and
-      not call instanceof CallExprImpl::DynamicCallExpr and
-      not i instanceof Builtins::BuiltinImpl
+      t0 = inferInvocationSelfArgumentTypeContextual(invocation, receiver, derefChain0, path0) and
+      derefChain0.isCons(impl, derefChain) and
+      selfParamType = impl.resolveSelfTypeAt(selfPath)
+    |
+      result = selfParamType and
+      path = selfPath and
+      not result instanceof TypeParameter
+      or
+      exists(TypePath pathToTypeParam, TypePath suffix |
+        impl.targetHasTypeParameterAt(pathToTypeParam, selfParamType) and
+        path0 = pathToTypeParam.appendInverse(suffix) and
+        result = t0 and
+        path = selfPath.append(suffix)
+      )
     )
   }
 
-  /**
-   * Gets the struct field that the field expression `fe` resolves to, if any.
-   */
-  cached
-  StructField resolveStructFieldExpr(FieldExpr fe, DerefChain derefChain) {
-    exists(string name, DataType ty |
-      ty = getFieldExprLookupType(fe, pragma[only_bind_into](name), derefChain)
+  Type inferInvocationArgumentTypeContextual(Expr arg, TypePath path) {
+    exists(Invocation invocation, FunctionPosition pos, TypePath path0 |
+      result =
+        inferInvocationArgumentTypeContextualDefault(invocation, pos.asPosition(), arg, _, _, path0) and
+      not invocation.(AssocFunctionResolution::AssocFunctionCall).hasReceiverAtPos(pos)
+      or
+      pos.asPosition() = 0 and
+      result = inferInvocationSelfArgumentTypeContextual(invocation, arg, DerefChain::nil(), path0) and
+      not path0.isEmpty()
     |
-      result = ty.(StructType).getTypeItem().getStructField(pragma[only_bind_into](name)) or
-      result = ty.(UnionType).getTypeItem().getStructField(pragma[only_bind_into](name))
+      if invocation.(AssocFunctionResolution::OperationAssocFunctionCall).implicitBorrowAt(pos, _)
+      then
+        // adjust for implicit borrow
+        path0.isCons(getRefTypeParameter(_), path)
+      else path = path0
     )
   }
 
-  /**
-   * Gets the tuple field that the field expression `fe` resolves to, if any.
-   */
-  cached
-  TupleField resolveTupleFieldExpr(FieldExpr fe, DerefChain derefChain) {
-    exists(int i |
-      result =
-        getTupleFieldExprLookupType(fe, pragma[only_bind_into](i), derefChain)
-            .(StructType)
-            .getTypeItem()
-            .getTupleField(pragma[only_bind_into](i))
+  Type inferInvocationType(Invocation invocation, TypePath path) {
+    exists(TypePath path0 |
+      result = M3::inferInvocationTypeDefault(invocation, _, path0) and
+      // index expression `x[i]` desugars to `*x.index(i)`, so we must account for
+      // the implicit deref
+      if invocation instanceof IndexExpr or invocation instanceof DerefExpr
+      then path0.isCons(getRefTypeParameter(_), path)
+      else path = path0
+    )
+  }
+
+  Type inferInvocationTypeContextual(Invocation invocation, TypePath path) {
+    exists(TypePath path0 |
+      result = inferType(invocation, path0) and
+      // index expression `x[i]` desugars to `*x.index(i)`, so we must account for
+      // the implicit deref
+      if invocation instanceof IndexExpr or invocation instanceof DerefExpr
+      then path = TypePath::cons(getRefTypeParameter(_), path0)
+      else path = path0
     )
   }
 
+  class Closure extends Expr, Callable instanceof Rust::ClosureExpr {
+    Expr getDefiningExpr() { result = this }
+  }
+
+  class ClosureParameterPseudoType extends T::ClosureParameterPseudoType {
+    Parameter getParameter() { result = this.getParam() }
+  }
+
   /**
-   * Gets a type at `path` that `n` infers to, if any.
-   *
-   * The type inference implementation works by computing all possible types, so
-   * the result is not necessarily unique. For example, in
-   *
-   * ```rust
-   * trait MyTrait {
-   *     fn foo(&self) -> &Self;
-   *
-   *     fn bar(&self) -> &Self {
-   *        self.foo()
-   *     }
-   * }
-   *
-   * struct MyStruct;
-   *
-   * impl MyTrait for MyStruct {
-   *     fn foo(&self) -> &MyStruct {
-   *         self
-   *     }
-   * }
+   * Gets the root type of a closure.
    *
-   * fn baz() {
-   *     let x = MyStruct;
-   *     x.bar();
-   * }
-   * ```
-   *
-   * the type inference engine will roughly make the following deductions:
-   *
-   * 1. `MyStruct` has type `MyStruct`.
-   * 2. `x` has type `MyStruct` (via 1.).
-   * 3. The return type of `bar` is `&Self`.
-   * 3. `x.bar()` has type `&MyStruct` (via 2 and 3, by matching the implicit `Self`
-   *    type parameter with `MyStruct`.).
-   * 4. The return type of `bar` is `&MyTrait`.
-   * 5. `x.bar()` has type `&MyTrait` (via 2 and 4).
+   * We model closures as `dyn Fn` trait object types. A closure might implement
+   * only `Fn`, `FnMut`, or `FnOnce`. But since `Fn` is a subtrait of the others,
+   * giving closures the type `dyn Fn` works well in practice -- even if not
+   * entirely accurate.
    */
-  cached
-  Type inferType(AstNode n, TypePath path) {
-    Stages::TypeInferenceStage::ref() and
-    result = CertainTypeInference::inferCertainType(n, path)
+  pragma[nomagic]
+  private Type closureRootType() {
+    result = TDynTraitType(any(FnTrait t)) // always exists because of the mention in `builtins/mentions.rs`
+  }
+
+  bindingset[c]
+  Type getClosureType(Closure c) {
+    result = closureRootType() and
+    exists(c)
+  }
+
+  /** Gets the path to a closure's `index`th parameter type, where the arity is `arity`. */
+  pragma[nomagic]
+  private TypePath closureParameterPath(int arity, int index) {
+    result =
+      TypePath::cons(TDynTraitTypeParameter(_, any(FnTrait t).getTypeParam()),
+        TypePath::singleton(getTupleTypeParameter(arity, index)))
+  }
+
+  TypePath getClosureParameterTypePath(Parameter p) {
+    exists(ClosureExpr ce, int index |
+      p = ce.getParam(index) and
+      result = closureParameterPath(ce.getNumberOfParams(), index)
+    )
+  }
+
+  /** Gets the path to a closure's return type. */
+  pragma[nomagic]
+  private TypePath closureReturnPath() {
+    result =
+      TypePath::singleton(TDynTraitTypeParameter(any(FnTrait t), any(FnOnceTrait t).getOutputType()))
+  }
+
+  bindingset[c]
+  TypePath getClosureReturnTypePath(Closure c) {
+    result = closureReturnPath() and
+    exists(c)
+  }
+
+  pragma[nomagic]
+  private Type inferClosureArgsType(ClosureExpr ce, TypePath path) {
+    path = TypePath::singleton(TDynTraitTypeParameter(_, any(FnTrait t).getTypeParam())) and
+    result.(TupleType).getArity() = ce.getNumberOfParams()
+  }
+
+  predicate stepLanguageSpecific(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
+    // When `n2` is `*n1` propagate type information from a raw pointer type
+    // parameter at `n1` (all other deref expressions are handled as calls)
+    n1 = n2.(DerefExpr).getExpr() and
+    prefix1 = TypePath::singleton(getPtrTypeParameter()) and
+    prefix2.isEmpty()
     or
-    // Don't propagate type information into a node which conflicts with certain
-    // type information.
-    forall(TypePath prefix |
-      CertainTypeInference::hasInferredCertainType(n, prefix) and
-      prefix.isPrefixOf(path)
-    |
-      not CertainTypeInference::certainTypeConflict(n, prefix, path, result)
-    ) and
+    prefix1.isEmpty() and
     (
-      result = inferAssignmentOperationType(n, path)
-      or
-      result = inferTypeEquality(n, path)
-      or
-      result = inferFunctionCallType(n, path)
-      or
-      result = inferConstructionType(n, path)
-      or
-      result = inferOperationType(n, path)
-      or
-      result = inferFieldExprType(n, path)
+      prefix2 = TypePath::singleton(getArrayTypeParameter()) and
+      (
+        n1 = n2.(ArrayListExpr).getAnExpr()
+        or
+        n2.(ArrayRepeatExpr).getRepeatOperand() = n1
+      )
       or
-      result = inferTryExprType(n, path)
+      exists(Struct s |
+        n1 = [n2.(RangeExpr).getStart(), n2.(RangeExpr).getEnd()] and
+        prefix2 =
+          TypePath::singleton(TTypeParamTypeParameter(s.getGenericParamList().getATypeParam())) and
+        s = getRangeType(n2)
+      )
       or
-      result = inferLiteralType(n, path, false)
+      n2 =
+        any(RefExpr re |
+          n1 = re.getExpr() and
+          prefix2 = TypePath::singleton(inferRefExprType(re).getPositionalTypeParameter(0))
+        )
       or
-      result = inferAwaitExprType(n, path)
+      exists(BlockExpr be |
+        n2 = be and
+        n1 = be.getStmtList().getTailExpr() and
+        if be.isAsync()
+        then prefix2 = TypePath::singleton(getDynFutureOutputTypeParameter())
+        else prefix2.isEmpty()
+      )
       or
-      result = inferDereferencedExprPtrType(n, path)
+      // Rust closure types like `Fn(A, B) -> C` are syntactic sugar for `Fn<Args = (A, B), Output = C>`,
+      // so in calls to a closure, we consider the entire argument list as a single tuple argument.
+      exists(CallExprImpl::DynamicCallExpr dce, TupleType tt, int i |
+        n1 = dce.getSyntacticPositionalArgument(i) and
+        n2 = dce.getArgList() and
+        tt.getArity() = dce.getNumberOfSyntacticArguments() and
+        prefix2 = TypePath::singleton(tt.getPositionalTypeParameter(i))
+      )
       or
-      result = inferForLoopExprType(n, path)
+      n1 =
+        any(IdentPat ip |
+          n2 = ip.getName() and
+          if ip.isRef()
+          then
+            exists(boolean isMutable | if ip.isMut() then isMutable = true else isMutable = false |
+              prefix2 = TypePath::singleton(getRefTypeParameter(isMutable))
+            )
+          else prefix2.isEmpty()
+        )
       or
-      result = inferClosureExprType(n, path)
+      prefix2.isEmpty() and
+      (
+        n2 = n1.(OrPat).getAPat()
+        or
+        n2 = n1.(LiteralPat).getLiteral()
+        or
+        exists(BreakExpr break |
+          break.getExpr() = n1 and
+          break.getTarget() = n2.(LoopExpr)
+        )
+        or
+        n1 = n2.(MacroExpr).getMacroCall().getMacroCallExpansion() and
+        not isPanicMacroCall(n2)
+        or
+        n1 = n2.(MacroPat).getMacroCall().getMacroCallExpansion()
+      )
+    )
+    or
+    n1 =
+      any(RefPat rp |
+        n2 = rp.getPat() and
+        prefix2.isEmpty() and
+        exists(boolean isMutable | if rp.isMut() then isMutable = true else isMutable = false |
+          prefix1 = TypePath::singleton(getRefTypeParameter(isMutable))
+        )
+      )
+    or
+    exists(int i, int arity, TypePath path |
+      path = TypePath::singleton(getTupleTypeParameter(arity, i))
+    |
+      arity = n2.(TupleExpr).getNumberOfFields() and
+      n1 = n2.(TupleExpr).getField(i) and
+      prefix1.isEmpty() and
+      prefix2 = path
       or
-      result = inferArgList(n, path)
+      arity = n1.(TuplePat).getTupleArity() and
+      n2 = n1.(TuplePat).getField(i) and
+      prefix2.isEmpty() and
+      prefix1 = path
+    )
+    or
+    exists(TypeParam tp, Enum e |
+      n1 = n2.(TryExpr).getExpr() and
+      tp = e.getGenericParamList().getGenericParam(0) and
+      prefix1 = TypePath::singleton(TTypeParamTypeParameter(tp)) and
+      prefix2.isEmpty()
+    |
+      e instanceof ResultEnum
       or
-      result = inferDeconstructionPatType(n, path)
+      e instanceof OptionEnum
+    )
+  }
+
+  pragma[nomagic]
+  private Type inferUnknownType(AstNode n, TypePath path) {
+    result = TUnknownType() and
+    (
+      n.(AssocFunctionResolution::AssocFunctionCall).resolutionDependsOnReturnType(path)
       or
-      result = inferUnknownTypeFromAnnotation(n, path)
+      n.(ArrayListExpr).getNumberOfExprs() = 0 and
+      path = TypePath::singleton(getArrayTypeParameter())
     )
   }
+
+  pragma[nomagic]
+  Type inferTypeLanguageSpecific(AstNode n, TypePath path) {
+    result = inferLiteralType(n, path, false)
+    or
+    result = inferAwaitExprType(n, path)
+    or
+    result = inferForLoopExprType(n, path)
+    or
+    result = inferDeconstructionPatType(n, path)
+    or
+    result = inferUnknownType(n, path)
+  }
+
+  pragma[nomagic]
+  Type inferTypeCertainLanguageSpecific(AstNode n, TypePath path) {
+    result = inferLiteralType(n, path, true)
+    or
+    (n instanceof CfgPredExpr or n instanceof CfgPredPat) and
+    path.isEmpty() and
+    result instanceof BoolType
+    or
+    result = inferRefPatType(n) and
+    path.isEmpty()
+    or
+    result = inferStructExprType(n, path)
+    or
+    result = inferStructPatType(n, path)
+    or
+    result = inferEmptyArrayListExprType(n) and
+    path.isEmpty()
+    or
+    result = inferRangeFullExprType(n) and
+    path.isEmpty()
+    or
+    result = inferTupleRootType(n) and
+    path.isEmpty()
+    or
+    result = inferAsyncUnitBlockExprType(n, path)
+    or
+    exprHasUnitType(n) and
+    path.isEmpty() and
+    result instanceof UnitType
+    or
+    result = inferClosureArgsType(n, path)
+  }
 }
 
-import Cached
+private module M3 = Make3<Input3>;
 
-/**
- * Gets a type that `n` infers to, if any.
- */
-Type inferType(AstNode n) { result = inferType(n, TypePath::nil()) }
+predicate inferType = M3::inferType/1;
+
+predicate inferType = M3::inferType/2;
+
+predicate inferTypeCertain = M3::inferTypeCertain/2;
+
+module Consistency = M3::Consistency;
+
+module CachedStage = M3::CachedStage;
+
+private predicate typeTestAstNodeRepr(AstNode n, string repr) {
+  repr = [n.toString(), n.(IdentPat).getName().getText()]
+}
+
+module TypeTest implements TestSig {
+  private module M = M3::TypeTest<typeTestAstNodeRepr/2>;
+
+  import M
+
+  predicate hasOptionalResult = M::hasOptionalResult/4;
+}
 
 /** Provides predicates for debugging the type inference implementation. */
 private module Debug {
@@ -3969,81 +3204,31 @@ private module Debug {
     t = self.getTypeAt(path)
   }
 
-  predicate debugInferFunctionCallType(AstNode n, TypePath path, Type t) {
-    n = getRelevantLocatable() and
-    t = inferFunctionCallType(n, path)
-  }
-
-  predicate debugInferConstructionType(AstNode n, TypePath path, Type t) {
-    n = getRelevantLocatable() and
-    t = inferConstructionType(n, path)
-  }
-
   predicate debugTypeMention(TypeMention tm, TypePath path, Type type) {
     tm = getRelevantLocatable() and
     tm.getTypeAt(path) = type
   }
 
-  Type debugInferAnnotatedType(AstNode n, TypePath path) {
-    n = getRelevantLocatable() and
-    result = inferAnnotatedType(n, path)
-  }
-
-  pragma[nomagic]
-  private int countTypesAtPath(AstNode n, TypePath path, Type t) {
-    t = inferType(n, path) and
-    result = strictcount(Type t0 | t0 = inferType(n, path))
-  }
-
-  pragma[nomagic]
-  private predicate atLimit(AstNode n) {
-    exists(TypePath path0 | exists(inferType(n, path0)) and path0.length() >= getTypePathLimit())
-  }
-
-  Type debugInferTypeForNodeAtLimit(AstNode n, TypePath path) {
-    result = inferType(n, path) and
-    atLimit(n)
-  }
-
-  predicate countTypesForNodeAtLimit(AstNode n, int c) {
-    n = getRelevantLocatable() and
-    c = strictcount(Type t, TypePath path | t = debugInferTypeForNodeAtLimit(n, path))
-  }
+  predicate atLimit = M3::Debug::atLimit/1;
 
-  predicate maxTypes(AstNode n, TypePath path, Type t, int c) {
-    c = countTypesAtPath(n, path, t) and
-    c = max(countTypesAtPath(_, _, _))
-  }
+  predicate inferTypeForNodeAtLimit = M3::Debug::inferTypeForNodeAtLimit/2;
 
-  pragma[nomagic]
-  private predicate typePathLength(AstNode n, TypePath path, Type t, int len) {
-    t = inferType(n, path) and
-    len = path.length()
-  }
+  predicate countTypesForNodeAtLimit = M3::Debug::countTypesForNodeAtLimit/2;
 
-  predicate maxTypePath(AstNode n, TypePath path, Type t, int len) {
-    typePathLength(n, path, t, len) and
-    len = max(int i | typePathLength(_, _, _, i))
-  }
+  predicate maxTypes = M3::Debug::maxTypes/4;
 
-  pragma[nomagic]
-  private int countTypePaths(AstNode n, TypePath path, Type t) {
-    t = inferType(n, path) and
-    result = strictcount(TypePath path0, Type t0 | t0 = inferType(n, path0))
-  }
+  predicate maxTypePath = M3::Debug::maxTypePath/4;
 
-  predicate maxTypePaths(AstNode n, TypePath path, Type t, int c) {
-    c = countTypePaths(n, path, t) and
-    c = max(countTypePaths(_, _, _))
-  }
+  predicate maxTypePaths = M3::Debug::maxTypePaths/4;
 
-  Type debugInferCertainType(AstNode n, TypePath path) {
+  Type debugInferTypeCertain(AstNode n, TypePath path) {
     n = getRelevantLocatable() and
-    result = CertainTypeInference::inferCertainType(n, path)
+    result = inferTypeCertain(n, path)
   }
 
   Type debugInferCertainNonUniqueType(AstNode n, TypePath path) {
     n = getRelevantLocatable() and
-    Consistency::nonUniqueCertainType(n, path, result)
+    Consistency::nonUniqueCertainType(n, path) and
+    result = inferTypeCertain(n, path)
   }
 }
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/TypeInferenceConsistency.qll b/rust/ql/lib/codeql/rust/internal/typeinference/TypeInferenceConsistency.qll
index 96e0bea2f189..6aff8c2ad531 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/TypeInferenceConsistency.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/TypeInferenceConsistency.qll
@@ -10,11 +10,8 @@ private import TypeInference::Consistency as Consistency
 import TypeInference::Consistency
 
 query predicate illFormedTypeMention(TypeMention tm) {
-  // NOTE: We do not use `illFormedTypeMention` from the shared library as it is
-  // instantiated with `PreTypeMention` and we are interested in inconsistencies
-  // for `TypeMention`.
-  not exists(tm.getTypeAt(TypePath::nil())) and
-  exists(tm.getLocation()) and
+  Consistency::illFormedTypeMention(tm) and
+  not tm instanceof NeverTypeReprMention and
   // avoid overlap with `PathTypeMention`
   not tm instanceof PathTypeReprMention and
   // known limitation for type mentions that would mention an escaping type parameter
@@ -31,7 +28,7 @@ query predicate illFormedTypeMention(TypeMention tm) {
 }
 
 query predicate nonUniqueCertainType(AstNode n, TypePath path) {
-  Consistency::nonUniqueCertainType(n, path, _) and
+  Consistency::nonUniqueCertainType(n, path) and
   n.fromSource() // Only include inconsistencies in the source.
 }
 
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/TypeMention.qll b/rust/ql/lib/codeql/rust/internal/typeinference/TypeMention.qll
index c4650f97c34b..b124e6405d87 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/TypeMention.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/TypeMention.qll
@@ -601,10 +601,12 @@ private module MkTypeMention<getAdditionalPathTypeAtSig/2 getAdditionalPathTypeA
   }
 
   pragma[nomagic]
-  TypeMention getReturnTypeMention(Function f) {
-    result.(ShorthandReturnTypeMention) = f.getName()
+  TypeMention getReturnTypeMention(Callable c) {
+    result.(ShorthandReturnTypeMention) = c.(Function).getName()
     or
-    result = f.getRetType().getTypeRepr()
+    result = c.(Function).getRetType().getTypeRepr()
+    or
+    result = c.(ClosureExpr).getRetType().getTypeRepr()
   }
 
   class DynTraitTypeReprMention extends TypeMentionImpl instanceof DynTraitTypeRepr {
@@ -676,7 +678,7 @@ private module MkTypeMention<getAdditionalPathTypeAtSig/2 getAdditionalPathTypeA
   }
 
   class NeverTypeReprMention extends TypeMentionImpl, NeverTypeRepr {
-    override Type getTypeAt(TypePath path) { result = TNeverType() and path.isEmpty() }
+    override Type getTypeAt(TypePath path) { none() }
   }
 
   class PtrTypeReprMention extends TypeMentionImpl instanceof PtrTypeRepr {
@@ -695,6 +697,31 @@ private module MkTypeMention<getAdditionalPathTypeAtSig/2 getAdditionalPathTypeA
       )
     }
   }
+
+  /**
+   * A `_` type mention, which means that the type must be inferred from the context.
+   */
+  class InferTypeReprMention extends TypeMentionImpl, InferTypeRepr {
+    override Type getTypeAt(TypePath path) { result = TUnknownType() and path.isEmpty() }
+  }
+
+  /**
+   * A type item mention that resolves to itself.
+   *
+   * This is used to represent the "return type" of structs and variants.
+   */
+  class TypeItemMention extends TypeMentionImpl instanceof TypeItem {
+    override Type getTypeAt(TypePath typePath) {
+      typePath.isEmpty() and
+      result = TDataType(this)
+      or
+      exists(TypeParam tp |
+        tp = this.(ItemNode).getTypeParam(_) and
+        typePath = TypePath::singleton(result) and
+        result = TTypeParamTypeParameter(tp)
+      )
+    }
+  }
 }
 
 private Type preGetAdditionalPathTypeAt(Path p, TypePath typePath) { none() }
diff --git a/rust/ql/lib/codeql/rust/security/CommandInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/CommandInjectionExtensions.qll
new file mode 100644
index 000000000000..2abcec6eb6f9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/security/CommandInjectionExtensions.qll
@@ -0,0 +1,122 @@
+/**
+ * Provides classes and predicates for reasoning about command injection
+ * vulnerabilities (CWE-078).
+ */
+
+import rust
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowSink
+private import codeql.rust.dataflow.FlowBarrier
+private import codeql.rust.Concepts
+private import codeql.rust.security.Barriers as Barriers
+
+/**
+ * Provides default sources, sinks and barriers for detecting command injection
+ * vulnerabilities, as well as extension points for adding your own.
+ */
+module CommandInjection {
+  /**
+   * A data flow source for command injection vulnerabilities.
+   */
+  abstract class Source extends DataFlow::Node { }
+
+  /**
+   * A data flow sink for command injection vulnerabilities.
+   */
+  abstract class Sink extends QuerySink::Range {
+    override string getSinkType() { result = "CommandInjection" }
+  }
+
+  /**
+   * A barrier for command injection vulnerabilities.
+   */
+  abstract class Barrier extends DataFlow::Node { }
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+
+  /**
+   * A sink for command injection from model data.
+   */
+  private class ModelsAsDataSink extends Sink {
+    ModelsAsDataSink() { sinkNode(this, "command-injection") }
+  }
+
+  /**
+   * A barrier for command injection from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, "command-injection") }
+  }
+
+  /**
+   * A barrier for command injection vulnerabilities for nodes whose type is a
+   * numeric type, which is unlikely to expose any vulnerability.
+   */
+  private class NumericTypeBarrier extends Barrier instanceof Barriers::NumericTypeBarrier { }
+
+  private class BooleanTypeBarrier extends Barrier instanceof Barriers::BooleanTypeBarrier { }
+
+  private class FieldlessEnumTypeBarrier extends Barrier instanceof Barriers::FieldlessEnumTypeBarrier
+  { }
+
+  /**
+   * A sanitizer guard for command injection vulnerabilities.
+   */
+  class SanitizerGuard extends Barrier {
+    SanitizerGuard() { this = DataFlow::BarrierGuard<sanitizerGuard/3>::getABarrierNode() }
+  }
+}
+
+private predicate sanitizerGuard(AstNode g, Expr e, boolean branch) {
+  g.(SanitizerGuard::Range).checks(e, branch)
+}
+
+/**
+ * Provides a class for modeling new command injection safety checks.
+ */
+module SanitizerGuard {
+  /**
+   * A data-flow node that checks whether a command is safe.
+   */
+  abstract class Range extends AstNode {
+    /**
+     * Holds if this guard validates `e` upon evaluating to `branch`.
+     */
+    abstract predicate checks(Expr e, boolean branch);
+  }
+}
+
+/**
+ * A successful membership check against a (presumed) command allowlist. For example:
+ * ```
+ * if allowlist.contains(&commmand) { ... }
+ * ```
+ */
+private class AllowlistContainsCheck extends SanitizerGuard::Range, MethodCall {
+  AllowlistContainsCheck() { this.getStaticTarget().getName().getText() = "contains" }
+
+  override predicate checks(Expr e, boolean branch) {
+    e.getParentNode*() = this.getPositionalArgument(0) and
+    branch = true
+  }
+}
+
+/**
+ * An equality check against a (presumed) allowed command value. For example:
+ * ```
+ * if command == "ls" { ... }
+ * ```
+ */
+private class AllowlistEqualityCheck extends SanitizerGuard::Range, EqualityOperation {
+  override predicate checks(Expr e, boolean branch) {
+    e = this.getAnOperand() and
+    (
+      this instanceof EqualsOperation and branch = true
+      or
+      this instanceof NotEqualsOperation and branch = false
+    )
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/security/DisabledCertificateCheckExtensions.qll b/rust/ql/lib/codeql/rust/security/DisabledCertificateCheckExtensions.qll
index a5933bc74b1c..d6685dfcb161 100644
--- a/rust/ql/lib/codeql/rust/security/DisabledCertificateCheckExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/DisabledCertificateCheckExtensions.qll
@@ -39,12 +39,15 @@ module DisabledCertificateCheckExtensions {
    */
   private class HeuristicSink extends Sink {
     HeuristicSink() {
-      exists(Call call |
+      exists(Call call, Expr arg |
+        arg = this.asExpr() and
         call.getStaticTarget().getName().getText() =
           ["danger_accept_invalid_certs", "danger_accept_invalid_hostnames"] and
-        call.getPositionalArgument(0) = this.asExpr() and
+        call.getPositionalArgument(0) = arg and
         // don't duplicate modeled sinks
-        not exists(ModelsAsDataSink s | s.(Node::FlowSummaryNode).getSinkElement().getCall() = call)
+        not exists(ModelsAsDataSink s |
+          s.(Node::FlowSummaryNode).getSummaryNode().getSourceSinkReportingElement() = arg
+        )
       )
     }
   }
diff --git a/rust/ql/lib/codeql/rust/security/HardcodedCryptographicValueExtensions.qll b/rust/ql/lib/codeql/rust/security/HardcodedCryptographicValueExtensions.qll
index fe5a8b038410..71f2f4cdbe31 100644
--- a/rust/ql/lib/codeql/rust/security/HardcodedCryptographicValueExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/HardcodedCryptographicValueExtensions.qll
@@ -62,14 +62,22 @@ module HardcodedCryptographicValue {
   abstract class Barrier extends DataFlow::Node { }
 
   /**
-   * Holds if `e` is a literal or a combination of literals that is constant.
+   * Holds if `e` is a literal or an expression that contains a constant. For example:
+   * ```
+   * ["hello", "world", s]
+   * ```
    */
-  private predicate isConstant(Expr e) {
+  private predicate hasConstant(Expr e) {
     e instanceof LiteralExpr // e.g. `0`
     or
-    forex(Expr elem | elem = e.(ArrayListExpr).getExpr(_) | isConstant(elem)) // e.g. `[0, 0, 0, 0]`
+    exists(Expr elem | elem = e.(ArrayListExpr).getExpr(_) | hasConstant(elem)) // e.g. `[0, 0, 0, 0]`
     or
-    isConstant(e.(ArrayRepeatExpr).getRepeatOperand()) // e.g. `[0; 10]`
+    hasConstant(e.(ArrayRepeatExpr).getRepeatOperand()) // e.g. `[0; 10]`
+    or
+    // a match expression with one or more constant arms; taint would reach here
+    // anyway, but we make it a source to avoid reporting many similar results
+    // on each match arm.
+    hasConstant(e.(MatchExpr).getMatchArmList().getAnArm().getExpr())
     or
     // e.g. `const MY_CONST: u64 = ...`
     // the constant initializer / body is the preferred source location for flow paths, when available.
@@ -81,15 +89,15 @@ module HardcodedCryptographicValue {
     not exists(e.(ConstAccess).getConst().getBody())
     or
     // e.g. `1 << 4`
-    isConstant(e.(BinaryExpr).getLhs()) and
-    isConstant(e.(BinaryExpr).getRhs())
+    hasConstant(e.(BinaryExpr).getLhs()) and
+    hasConstant(e.(BinaryExpr).getRhs())
   }
 
   /**
    * A constant, considered as a flow source.
    */
   private class ConstantSource extends Source {
-    ConstantSource() { isConstant(this.asExpr()) }
+    ConstantSource() { hasConstant(this.asExpr()) }
   }
 
   /**
@@ -118,8 +126,9 @@ module HardcodedCryptographicValue {
 
     HeuristicSinks() {
       // any argument going to a parameter whose name matches a credential name
-      exists(Call c, Function f, int argIndex, string argName |
-        c.getPositionalArgument(argIndex) = this.asExpr() and
+      exists(Call c, Function f, Expr arg, int argIndex, string argName |
+        arg = this.asExpr() and
+        c.getPositionalArgument(argIndex) = arg and
         c.getStaticTarget() = f and
         f.getParam(argIndex).getPat().(IdentPat).getName().getText() = argName and
         (
@@ -134,7 +143,9 @@ module HardcodedCryptographicValue {
           // note: matching "key" results in too many false positives
         ) and
         // don't duplicate modeled sinks
-        not exists(ModelsAsDataSinks s | s.(Node::FlowSummaryNode).getSinkElement().getCall() = c)
+        not exists(ModelsAsDataSinks s |
+          s.(Node::FlowSummaryNode).getSummaryNode().getSourceSinkReportingElement() = arg
+        )
       )
     }
 
diff --git a/rust/ql/lib/codeql/rust/security/UnsafeDeserializationExtensions.qll b/rust/ql/lib/codeql/rust/security/UnsafeDeserializationExtensions.qll
new file mode 100644
index 000000000000..70b0c55184c0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/security/UnsafeDeserializationExtensions.qll
@@ -0,0 +1,64 @@
+/**
+ * Provides classes and predicates for reasoning about unsafe deserialization
+ * vulnerabilities (CWE-502).
+ */
+
+import rust
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowSink
+private import codeql.rust.dataflow.FlowBarrier
+private import codeql.rust.Concepts
+private import codeql.rust.security.Barriers as Barriers
+
+/**
+ * Provides default sources, sinks and barriers for detecting unsafe deserialization
+ * vulnerabilities, as well as extension points for adding your own.
+ */
+module UnsafeDeserialization {
+  /**
+   * A data flow source for unsafe deserialization vulnerabilities.
+   */
+  abstract class Source extends DataFlow::Node { }
+
+  /**
+   * A data flow sink for unsafe deserialization vulnerabilities.
+   */
+  abstract class Sink extends QuerySink::Range {
+    override string getSinkType() { result = "UnsafeDeserialization" }
+  }
+
+  /**
+   * A barrier for unsafe deserialization vulnerabilities.
+   */
+  abstract class Barrier extends DataFlow::Node { }
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+
+  /**
+   * A sink for unsafe deserialization from model data.
+   */
+  private class ModelsAsDataSink extends Sink {
+    ModelsAsDataSink() { sinkNode(this, "unsafe-deserialization") }
+  }
+
+  /**
+   * A barrier for unsafe deserialization from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, "unsafe-deserialization") }
+  }
+
+  /**
+   * A barrier for unsafe deserialization for nodes whose type is a numeric
+   * type, which is unlikely to expose any vulnerability.
+   */
+  private class NumericTypeBarrier extends Barrier instanceof Barriers::NumericTypeBarrier { }
+
+  private class BooleanTypeBarrier extends Barrier instanceof Barriers::BooleanTypeBarrier { }
+
+  private class FieldlessEnumTypeBarrier extends Barrier instanceof Barriers::FieldlessEnumTypeBarrier
+  { }
+}
diff --git a/rust/ql/lib/codeql/rust/security/WeakSensitiveDataHashingExtensions.qll b/rust/ql/lib/codeql/rust/security/WeakSensitiveDataHashingExtensions.qll
index bd29f0498b35..25e6f4d5c7b7 100644
--- a/rust/ql/lib/codeql/rust/security/WeakSensitiveDataHashingExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/WeakSensitiveDataHashingExtensions.qll
@@ -186,11 +186,15 @@ class ModeledHashOperation extends Cryptography::CryptographicOperation::Range {
   string algorithmName;
 
   ModeledHashOperation() {
-    exists(CallExpr call |
+    exists(CallExpr call, Expr e |
       sinkNode(input, "hasher-input") and
-      call = input.(Node::FlowSummaryNode).getSinkElement().getCall() and
-      call = this.asExpr() and
+      e = this.asExpr() and
+      e = input.(Node::FlowSummaryNode).getSummaryNode().getSourceSinkReportingElement() and
       algorithmName = call.getFunction().(PathExpr).getPath().getQualifier().getText()
+    |
+      call = e
+      or
+      call.getASyntacticArgument() = e
     )
   }
 
diff --git a/rust/ql/lib/qlpack.yml b/rust/ql/lib/qlpack.yml
index 14e8ab08f4d9..7d8cfa5680a2 100644
--- a/rust/ql/lib/qlpack.yml
+++ b/rust/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-all
-version: 0.2.19-dev
+version: 0.2.26-dev
 groups: rust
 extractor: rust
 dbscheme: rust.dbscheme
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index e1bce498ef78..7980434ec600 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -183,6 +183,7 @@ named_crates(
 @ast_node =
   @abi
 | @addressable
+| @any_attr
 | @arg_list
 | @asm_dir_spec
 | @asm_operand
@@ -191,8 +192,8 @@ named_crates(
 | @asm_piece
 | @asm_reg_spec
 | @assoc_item_list
-| @attr
 | @callable
+| @cfg_predicate
 | @expr
 | @extern_item_list
 | @field_list
@@ -202,6 +203,7 @@ named_crates(
 | @generic_arg_list
 | @generic_param
 | @generic_param_list
+| @impl_restriction
 | @item_list
 | @label
 | @let_else
@@ -210,6 +212,7 @@ named_crates(
 | @match_arm_list
 | @match_guard
 | @meta
+| @mut_restriction
 | @name
 | @param_base
 | @param_list
@@ -231,6 +234,7 @@ named_crates(
 | @struct_pat_field_list
 | @token
 | @token_tree
+| @try_block_modifier
 | @tuple_field
 | @type_bound
 | @type_bound_list
@@ -241,6 +245,7 @@ named_crates(
 | @use_tree_list
 | @variant_list
 | @visibility
+| @visibility_inner
 | @where_clause
 | @where_pred
 ;
@@ -298,6 +303,11 @@ abi_abi_strings(
 | @variant
 ;
 
+@any_attr =
+  @attr
+| @doc_comment
+;
+
 arg_lists(
   unique int id: @arg_list
 );
@@ -376,17 +386,7 @@ assoc_item_list_assoc_items(
 assoc_item_list_attrs(
   int id: @assoc_item_list ref,
   int index: int ref,
-  int attr: @attr ref
-);
-
-attrs(
-  unique int id: @attr
-);
-
-#keyset[id]
-attr_meta(
-  int id: @attr ref,
-  int meta: @meta ref
+  int attr: @any_attr ref
 );
 
 @callable =
@@ -404,9 +404,14 @@ callable_param_lists(
 callable_attrs(
   int id: @callable ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
 @expr =
   @array_expr_internal
 | @asm_expr
@@ -416,11 +421,13 @@ callable_attrs(
 | @break_expr
 | @call_expr
 | @cast_expr
+| @cfg_pred_expr
 | @closure_expr
 | @continue_expr
 | @field_expr
 | @format_args_expr
 | @if_expr
+| @include_bytes_expr
 | @index_expr
 | @labelable_expr
 | @let_expr
@@ -429,7 +436,6 @@ callable_attrs(
 | @match_expr
 | @method_call_expr
 | @offset_of_expr
-| @paren_expr
 | @path_expr_base
 | @prefix_expr
 | @range_expr
@@ -451,7 +457,7 @@ extern_item_lists(
 extern_item_list_attrs(
   int id: @extern_item_list ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id, index]
@@ -527,6 +533,16 @@ generic_param_list_generic_params(
   int generic_param: @generic_param ref
 );
 
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
 item_lists(
   unique int id: @item_list
 );
@@ -535,7 +551,7 @@ item_lists(
 item_list_attrs(
   int id: @item_list ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id, index]
@@ -584,7 +600,7 @@ match_arms(
 match_arm_attrs(
   int id: @match_arm ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -620,7 +636,7 @@ match_arm_list_arms(
 match_arm_list_attrs(
   int id: @match_arm_list ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 match_guards(
@@ -633,31 +649,28 @@ match_guard_conditions(
   int condition: @expr ref
 );
 
-meta(
-  unique int id: @meta
-);
-
-#keyset[id]
-meta_exprs(
-  int id: @meta ref,
-  int expr: @expr ref
-);
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
 
-#keyset[id]
-meta_is_unsafe(
-  int id: @meta ref
+mut_restrictions(
+  unique int id: @mut_restriction
 );
 
 #keyset[id]
-meta_paths(
-  int id: @meta ref,
-  int path: @path ref
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
 );
 
 #keyset[id]
-meta_token_trees(
-  int id: @meta ref,
-  int token_tree: @token_tree ref
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
 );
 
 names(
@@ -679,7 +692,7 @@ name_texts(
 param_base_attrs(
   int id: @param_base ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -718,12 +731,14 @@ parenthesized_arg_list_type_args(
 
 @pat =
   @box_pat
+| @cfg_pred_pat
 | @const_block_pat
+| @deref_pat
 | @ident_pat
 | @literal_pat
 | @macro_pat
+| @not_null
 | @or_pat
-| @paren_pat
 | @path_pat
 | @range_pat
 | @ref_pat
@@ -843,7 +858,7 @@ source_files(
 source_file_attrs(
   int id: @source_file ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id, index]
@@ -867,7 +882,7 @@ stmt_lists(
 stmt_list_attrs(
   int id: @stmt_list ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id, index]
@@ -891,7 +906,7 @@ struct_expr_fields(
 struct_expr_field_attrs(
   int id: @struct_expr_field ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -914,7 +929,7 @@ struct_expr_field_lists(
 struct_expr_field_list_attrs(
   int id: @struct_expr_field_list ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id, index]
@@ -938,13 +953,13 @@ struct_fields(
 struct_field_attrs(
   int id: @struct_field ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
-struct_field_defaults(
+struct_field_default_vals(
   int id: @struct_field ref,
-  int default: @expr ref
+  int default_val: @const_arg ref
 );
 
 #keyset[id]
@@ -952,6 +967,12 @@ struct_field_is_unsafe(
   int id: @struct_field ref
 );
 
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
 #keyset[id]
 struct_field_names(
   int id: @struct_field ref,
@@ -978,7 +999,7 @@ struct_pat_fields(
 struct_pat_field_attrs(
   int id: @struct_pat_field ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1018,6 +1039,21 @@ token_trees(
   unique int id: @token_tree
 );
 
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
 tuple_fields(
   unique int id: @tuple_field
 );
@@ -1026,7 +1062,13 @@ tuple_fields(
 tuple_field_attrs(
   int id: @tuple_field ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
 );
 
 #keyset[id]
@@ -1101,6 +1143,7 @@ type_bound_list_bounds(
 | @never_type_repr
 | @paren_type_repr
 | @path_type_repr
+| @pattern_type_repr
 | @ptr_type_repr
 | @ref_type_repr
 | @slice_type_repr
@@ -1177,8 +1220,18 @@ visibilities(
 );
 
 #keyset[id]
-visibility_paths(
+visibility_visibility_inners(
   int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
   int path: @path ref
 );
 
@@ -1229,7 +1282,7 @@ array_expr_internals(
 array_expr_internal_attrs(
   int id: @array_expr_internal ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id, index]
@@ -1264,6 +1317,13 @@ asm_clobber_abis(
   unique int id: @asm_clobber_abi
 );
 
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
 asm_consts(
   unique int id: @asm_const
 );
@@ -1299,6 +1359,13 @@ asm_operand_named_asm_operands(
   int asm_operand: @asm_operand ref
 );
 
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
 #keyset[id]
 asm_operand_named_names(
   int id: @asm_operand_named ref,
@@ -1316,6 +1383,13 @@ asm_options_list_asm_options(
   int asm_option: @asm_option ref
 );
 
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
 asm_reg_operands(
   unique int id: @asm_reg_operand
 );
@@ -1400,6 +1474,16 @@ assoc_type_arg_type_bound_lists(
   int type_bound_list: @type_bound_list ref
 );
 
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
 await_exprs(
   unique int id: @await_expr
 );
@@ -1408,7 +1492,7 @@ await_exprs(
 await_expr_attrs(
   int id: @await_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1425,7 +1509,7 @@ become_exprs(
 become_expr_attrs(
   int id: @become_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1442,7 +1526,7 @@ binary_exprs(
 binary_expr_attrs(
   int id: @binary_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1481,7 +1565,7 @@ break_exprs(
 break_expr_attrs(
   int id: @break_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1510,7 +1594,7 @@ call_expr_arg_lists(
 call_expr_attrs(
   int id: @call_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1527,7 +1611,7 @@ cast_exprs(
 cast_expr_attrs(
   int id: @cast_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1542,6 +1626,68 @@ cast_expr_type_reprs(
   int type_repr: @type_repr ref
 );
 
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_exprs(
+  unique int id: @cfg_pred_expr
+);
+
+#keyset[id]
+cfg_pred_expr_cfg_predicates(
+  int id: @cfg_pred_expr ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_pats(
+  unique int id: @cfg_pred_pat
+);
+
+#keyset[id]
+cfg_pred_pat_cfg_predicates(
+  int id: @cfg_pred_pat ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
 closure_exprs(
   unique int id: @closure_expr
 );
@@ -1628,7 +1774,7 @@ const_params(
 const_param_attrs(
   int id: @const_param ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1662,7 +1808,7 @@ continue_exprs(
 continue_expr_attrs(
   int id: @continue_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1671,6 +1817,20 @@ continue_expr_lifetimes(
   int lifetime: @lifetime ref
 );
 
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+doc_comments(
+  unique int id: @doc_comment
+);
+
 dyn_trait_type_reprs(
   unique int id: @dyn_trait_type_repr
 );
@@ -1699,7 +1859,7 @@ field_exprs(
 field_expr_attrs(
   int id: @field_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1782,7 +1942,7 @@ format_args_expr_args(
 format_args_expr_attrs(
   int id: @format_args_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1799,7 +1959,7 @@ ident_pats(
 ident_pat_attrs(
   int id: @ident_pat ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1832,7 +1992,7 @@ if_exprs(
 if_expr_attrs(
   int id: @if_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1863,6 +2023,10 @@ impl_trait_type_repr_type_bound_lists(
   int type_bound_list: @type_bound_list ref
 );
 
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
 index_exprs(
   unique int id: @index_expr
 );
@@ -1871,7 +2035,7 @@ index_exprs(
 index_expr_attrs(
   int id: @index_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1901,7 +2065,6 @@ infer_type_reprs(
 | @macro_rules
 | @module
 | @trait
-| @trait_alias
 | @type_item
 | @use
 ;
@@ -1912,6 +2075,22 @@ item_attribute_macro_expansions(
   int attribute_macro_expansion: @macro_items ref
 );
 
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
 @labelable_expr =
   @block_expr
 | @looping_expr
@@ -1931,7 +2110,7 @@ let_exprs(
 let_expr_attrs(
   int id: @let_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -1954,7 +2133,7 @@ let_stmts(
 let_stmt_attrs(
   int id: @let_stmt ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2009,7 +2188,7 @@ lifetime_params(
 lifetime_param_attrs(
   int id: @lifetime_param ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2032,7 +2211,7 @@ literal_exprs(
 literal_expr_attrs(
   int id: @literal_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2055,6 +2234,13 @@ macro_exprs(
   unique int id: @macro_expr
 );
 
+#keyset[id, index]
+macro_expr_attrs(
+  int id: @macro_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
 #keyset[id]
 macro_expr_macro_calls(
   int id: @macro_expr ref,
@@ -2089,7 +2275,7 @@ match_exprs(
 match_expr_attrs(
   int id: @match_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2118,7 +2304,7 @@ method_call_expr_arg_lists(
 method_call_expr_attrs(
   int id: @method_call_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2153,6 +2339,10 @@ never_type_reprs(
   unique int id: @never_type_repr
 );
 
+not_nulls(
+  unique int id: @not_null
+);
+
 offset_of_exprs(
   unique int id: @offset_of_expr
 );
@@ -2161,7 +2351,7 @@ offset_of_exprs(
 offset_of_expr_attrs(
   int id: @offset_of_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id, index]
@@ -2198,33 +2388,6 @@ param_pats(
   int pat: @pat ref
 );
 
-paren_exprs(
-  unique int id: @paren_expr
-);
-
-#keyset[id, index]
-paren_expr_attrs(
-  int id: @paren_expr ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
-#keyset[id]
-paren_expr_exprs(
-  int id: @paren_expr ref,
-  int expr: @expr ref
-);
-
-paren_pats(
-  unique int id: @paren_pat
-);
-
-#keyset[id]
-paren_pat_pats(
-  int id: @paren_pat ref,
-  int pat: @pat ref
-);
-
 paren_type_reprs(
   unique int id: @paren_type_repr
 );
@@ -2239,6 +2402,16 @@ paren_type_repr_type_reprs(
   @path_expr
 ;
 
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
 path_pats(
   unique int id: @path_pat
 );
@@ -2253,6 +2426,22 @@ path_type_repr_paths(
   int path: @path ref
 );
 
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
 prefix_exprs(
   unique int id: @prefix_expr
 );
@@ -2261,7 +2450,7 @@ prefix_exprs(
 prefix_expr_attrs(
   int id: @prefix_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2304,7 +2493,7 @@ range_exprs(
 range_expr_attrs(
   int id: @range_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2355,7 +2544,7 @@ ref_exprs(
 ref_expr_attrs(
   int id: @ref_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2423,7 +2612,7 @@ rest_pats(
 rest_pat_attrs(
   int id: @rest_pat ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 return_exprs(
@@ -2434,7 +2623,7 @@ return_exprs(
 return_expr_attrs(
   int id: @return_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2494,6 +2683,13 @@ struct_exprs(
   unique int id: @struct_expr
 );
 
+#keyset[id, index]
+struct_expr_attrs(
+  int id: @struct_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
 #keyset[id]
 struct_expr_struct_expr_field_lists(
   int id: @struct_expr ref,
@@ -2521,6 +2717,22 @@ struct_pat_struct_pat_field_lists(
   int struct_pat_field_list: @struct_pat_field_list ref
 );
 
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
 try_exprs(
   unique int id: @try_expr
 );
@@ -2529,7 +2741,7 @@ try_exprs(
 try_expr_attrs(
   int id: @try_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2546,7 +2758,7 @@ tuple_exprs(
 tuple_expr_attrs(
   int id: @tuple_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id, index]
@@ -2618,7 +2830,7 @@ type_params(
 type_param_attrs(
   int id: @type_param ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2647,7 +2859,22 @@ underscore_exprs(
 underscore_expr_attrs(
   int id: @underscore_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
 );
 
 variants(
@@ -2658,13 +2885,13 @@ variants(
 variant_attrs(
   int id: @variant ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
-variant_discriminants(
+variant_const_args(
   int id: @variant ref,
-  int discriminant: @expr ref
+  int const_arg: @const_arg ref
 );
 
 #keyset[id]
@@ -2697,7 +2924,7 @@ yeet_exprs(
 yeet_expr_attrs(
   int id: @yeet_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2714,7 +2941,7 @@ yield_exprs(
 yield_expr_attrs(
   int id: @yield_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2738,7 +2965,7 @@ asm_expr_asm_pieces(
 asm_expr_attrs(
   int id: @asm_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id, index]
@@ -2763,7 +2990,7 @@ block_exprs(
 block_expr_attrs(
   int id: @block_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2786,11 +3013,6 @@ block_expr_is_move(
   int id: @block_expr ref
 );
 
-#keyset[id]
-block_expr_is_try(
-  int id: @block_expr ref
-);
-
 #keyset[id]
 block_expr_is_unsafe(
   int id: @block_expr ref
@@ -2802,6 +3024,12 @@ block_expr_stmt_lists(
   int stmt_list: @stmt_list ref
 );
 
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
 extern_blocks(
   unique int id: @extern_block
 );
@@ -2816,7 +3044,7 @@ extern_block_abis(
 extern_block_attrs(
   int id: @extern_block ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2838,7 +3066,7 @@ extern_crates(
 extern_crate_attrs(
   int id: @extern_crate ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2880,7 +3108,7 @@ impl_assoc_item_lists(
 impl_attrs(
   int id: @impl ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2954,7 +3182,7 @@ macro_def_args(
 macro_def_attrs(
   int id: @macro_def ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -2983,7 +3211,7 @@ macro_rules(
 macro_rules_attrs(
   int id: @macro_rules ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -3012,7 +3240,7 @@ modules(
 module_attrs(
   int id: @module ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -3041,7 +3269,7 @@ path_exprs(
 path_expr_attrs(
   int id: @path_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 traits(
@@ -3058,7 +3286,7 @@ trait_assoc_item_lists(
 trait_attrs(
   int id: @trait ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -3067,6 +3295,12 @@ trait_generic_param_lists(
   int generic_param_list: @generic_param_list ref
 );
 
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
 #keyset[id]
 trait_is_auto(
   int id: @trait ref
@@ -3101,47 +3335,6 @@ trait_where_clauses(
   int where_clause: @where_clause ref
 );
 
-trait_aliases(
-  unique int id: @trait_alias
-);
-
-#keyset[id, index]
-trait_alias_attrs(
-  int id: @trait_alias ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
-#keyset[id]
-trait_alias_generic_param_lists(
-  int id: @trait_alias ref,
-  int generic_param_list: @generic_param_list ref
-);
-
-#keyset[id]
-trait_alias_names(
-  int id: @trait_alias ref,
-  int name: @name ref
-);
-
-#keyset[id]
-trait_alias_type_bound_lists(
-  int id: @trait_alias ref,
-  int type_bound_list: @type_bound_list ref
-);
-
-#keyset[id]
-trait_alias_visibilities(
-  int id: @trait_alias ref,
-  int visibility: @visibility ref
-);
-
-#keyset[id]
-trait_alias_where_clauses(
-  int id: @trait_alias ref,
-  int where_clause: @where_clause ref
-);
-
 @type_item =
   @enum
 | @struct
@@ -3159,7 +3352,7 @@ type_item_derive_macro_expansions(
 type_item_attrs(
   int id: @type_item ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -3194,7 +3387,7 @@ uses(
 use_attrs(
   int id: @use ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -3217,7 +3410,7 @@ consts(
 const_attrs(
   int id: @const ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -3289,7 +3482,7 @@ for_exprs(
 for_expr_attrs(
   int id: @for_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -3388,7 +3581,7 @@ loop_exprs(
 loop_expr_attrs(
   int id: @loop_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 macro_calls(
@@ -3399,7 +3592,7 @@ macro_calls(
 macro_call_attrs(
   int id: @macro_call ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -3428,7 +3621,7 @@ statics(
 static_attrs(
   int id: @static ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -3488,7 +3681,7 @@ type_aliases(
 type_alias_attrs(
   int id: @type_alias ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
@@ -3550,7 +3743,7 @@ while_exprs(
 while_expr_attrs(
   int id: @while_expr ref,
   int index: int ref,
-  int attr: @attr ref
+  int attr: @any_attr ref
 );
 
 #keyset[id]
diff --git a/rust/ql/lib/upgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/old.dbscheme b/rust/ql/lib/upgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/old.dbscheme
new file mode 100644
index 000000000000..3af0bba56aa5
--- /dev/null
+++ b/rust/ql/lib/upgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/old.dbscheme
@@ -0,0 +1,3746 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @any_attr
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+@any_attr =
+  @attr
+| @doc_comment
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+doc_comments(
+  unique int id: @doc_comment
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/rust.dbscheme b/rust/ql/lib/upgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/rust.dbscheme
new file mode 100644
index 000000000000..9487e73d9da6
--- /dev/null
+++ b/rust/ql/lib/upgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/rust.dbscheme
@@ -0,0 +1,3768 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @any_attr
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+@any_attr =
+  @attr
+| @doc_comment
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @cfg_pred_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @cfg_pred_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_exprs(
+  unique int id: @cfg_pred_expr
+);
+
+#keyset[id]
+cfg_pred_expr_cfg_predicates(
+  int id: @cfg_pred_expr ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_pats(
+  unique int id: @cfg_pred_pat
+);
+
+#keyset[id]
+cfg_pred_pat_cfg_predicates(
+  int id: @cfg_pred_pat ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+doc_comments(
+  unique int id: @doc_comment
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/upgrade.properties b/rust/ql/lib/upgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/upgrade.properties
new file mode 100644
index 000000000000..d4a28bb96979
--- /dev/null
+++ b/rust/ql/lib/upgrades/3af0bba56aa51dfb325939cc3b52cd0a3eb0965f/upgrade.properties
@@ -0,0 +1,2 @@
+description: Update rust-analyzer to 0.0.357
+compatibility: full
diff --git a/rust/ql/lib/upgrades/66a489863649185f4a9770f894505803059a1312/upgrade.ql b/rust/ql/lib/upgrades/66a489863649185f4a9770f894505803059a1312/upgrade.ql
new file mode 100644
index 000000000000..db588965363a
--- /dev/null
+++ b/rust/ql/lib/upgrades/66a489863649185f4a9770f894505803059a1312/upgrade.ql
@@ -0,0 +1,205 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+private predicate oldMetaHasExpr(Element meta) { meta_exprs(meta, _) }
+
+private predicate oldMetaHasPath(Element meta) { meta_paths(meta, _) }
+
+private predicate oldMetaHasTokenTree(Element meta) { meta_token_trees(meta, _) }
+
+private predicate oldMetaIsPath(Element meta) {
+  oldMetaHasPath(meta) and not oldMetaHasExpr(meta) and not oldMetaHasTokenTree(meta)
+}
+
+private predicate oldMetaIsKeyValue(Element meta) { oldMetaHasPath(meta) and oldMetaHasExpr(meta) }
+
+private predicate oldMetaIsTokenTree(Element meta) {
+  oldMetaHasPath(meta) and oldMetaHasTokenTree(meta) and not oldMetaHasExpr(meta)
+}
+
+private predicate oldMetaHasInnerShape(Element meta) {
+  oldMetaIsPath(meta) or oldMetaIsKeyValue(meta) or oldMetaIsTokenTree(meta)
+}
+
+newtype TAddedElement =
+  TFormatArgsArgName(Element arg, Element name) { format_args_arg_names(arg, name) } or
+  TTryBlockModifier(Element block) { block_expr_is_try(block) } or
+  TStructFieldDefaultConstArg(Element field, Element expr) { struct_field_defaults(field, expr) } or
+  TVariantDiscriminantConstArg(Element variant, Element expr) {
+    variant_discriminants(variant, expr)
+  } or
+  TUnsafePathMeta(Element meta) { meta_is_unsafe(meta) and oldMetaIsPath(meta) } or
+  TUnsafeKeyValueMeta(Element meta) { meta_is_unsafe(meta) and oldMetaIsKeyValue(meta) } or
+  TUnsafeTokenTreeMeta(Element meta) { meta_is_unsafe(meta) and oldMetaIsTokenTree(meta) }
+
+module Fresh = QlBuiltins::NewEntity<TAddedElement>;
+
+class TNewElement = @element or Fresh::EntityId;
+
+class NewElement extends TNewElement {
+  string toString() { none() }
+}
+
+private predicate isFreshInnerMeta(NewElement id, Element oldMeta) {
+  id = Fresh::map(TUnsafePathMeta(oldMeta)) or
+  id = Fresh::map(TUnsafeKeyValueMeta(oldMeta)) or
+  id = Fresh::map(TUnsafeTokenTreeMeta(oldMeta))
+}
+
+query predicate new_format_args_arg_names(NewElement id) {
+  id = Fresh::map(TFormatArgsArgName(_, _))
+}
+
+query predicate new_format_args_arg_arg_names(Element id, NewElement arg_name) {
+  arg_name = Fresh::map(TFormatArgsArgName(id, _))
+}
+
+query predicate new_try_block_modifiers(NewElement id) { id = Fresh::map(TTryBlockModifier(_)) }
+
+query predicate new_try_block_modifier_is_try(NewElement id) {
+  id = Fresh::map(TTryBlockModifier(_))
+}
+
+query predicate new_block_expr_try_block_modifiers(Element id, NewElement try_block_modifier) {
+  try_block_modifier = Fresh::map(TTryBlockModifier(id))
+}
+
+query predicate new_const_args(NewElement id) {
+  const_args(id) or
+  id = Fresh::map(TStructFieldDefaultConstArg(_, _)) or
+  id = Fresh::map(TVariantDiscriminantConstArg(_, _))
+}
+
+query predicate new_const_arg_exprs(NewElement id, Element expr) {
+  const_arg_exprs(id, expr) or
+  id = Fresh::map(TStructFieldDefaultConstArg(_, expr)) or
+  id = Fresh::map(TVariantDiscriminantConstArg(_, expr))
+}
+
+query predicate new_struct_field_default_vals(Element id, NewElement default_val) {
+  default_val = Fresh::map(TStructFieldDefaultConstArg(id, _))
+}
+
+query predicate new_variant_const_args(Element id, NewElement const_arg) {
+  const_arg = Fresh::map(TVariantDiscriminantConstArg(id, _))
+}
+
+query predicate new_traits(Element id) { traits(id) or trait_aliases(id) }
+
+query predicate new_trait_attrs(Element id, int index, Element attr) {
+  trait_attrs(id, index, attr) or trait_alias_attrs(id, index, attr)
+}
+
+query predicate new_trait_generic_param_lists(Element id, Element generic_param_list) {
+  trait_generic_param_lists(id, generic_param_list) or
+  trait_alias_generic_param_lists(id, generic_param_list)
+}
+
+query predicate new_trait_names(Element id, Element name) {
+  trait_names(id, name) or trait_alias_names(id, name)
+}
+
+query predicate new_trait_type_bound_lists(Element id, Element type_bound_list) {
+  trait_type_bound_lists(id, type_bound_list) or trait_alias_type_bound_lists(id, type_bound_list)
+}
+
+query predicate new_trait_visibilities(Element id, Element visibility) {
+  trait_visibilities(id, visibility) or trait_alias_visibilities(id, visibility)
+}
+
+query predicate new_trait_where_clauses(Element id, Element where_clause) {
+  trait_where_clauses(id, where_clause) or trait_alias_where_clauses(id, where_clause)
+}
+
+query predicate new_path_meta(NewElement id) {
+  meta(id) and not meta_is_unsafe(id) and oldMetaIsPath(id)
+  or
+  id = Fresh::map(TUnsafePathMeta(_))
+}
+
+query predicate new_path_meta_paths(NewElement id, Element path) {
+  meta_paths(id, path) and not meta_is_unsafe(id) and oldMetaIsPath(id)
+  or
+  exists(Element oldMeta | id = Fresh::map(TUnsafePathMeta(oldMeta)) and meta_paths(oldMeta, path))
+}
+
+query predicate new_key_value_meta(NewElement id) {
+  meta(id) and not meta_is_unsafe(id) and oldMetaIsKeyValue(id)
+  or
+  id = Fresh::map(TUnsafeKeyValueMeta(_))
+}
+
+query predicate new_key_value_meta_exprs(NewElement id, Element expr) {
+  meta_exprs(id, expr) and not meta_is_unsafe(id) and oldMetaIsKeyValue(id)
+  or
+  exists(Element oldMeta |
+    id = Fresh::map(TUnsafeKeyValueMeta(oldMeta)) and meta_exprs(oldMeta, expr)
+  )
+}
+
+query predicate new_key_value_meta_paths(NewElement id, Element path) {
+  meta_paths(id, path) and not meta_is_unsafe(id) and oldMetaIsKeyValue(id)
+  or
+  exists(Element oldMeta |
+    id = Fresh::map(TUnsafeKeyValueMeta(oldMeta)) and meta_paths(oldMeta, path)
+  )
+}
+
+query predicate new_token_tree_meta(NewElement id) {
+  meta(id) and not meta_is_unsafe(id) and oldMetaIsTokenTree(id)
+  or
+  id = Fresh::map(TUnsafeTokenTreeMeta(_))
+}
+
+query predicate new_token_tree_meta_paths(NewElement id, Element path) {
+  meta_paths(id, path) and not meta_is_unsafe(id) and oldMetaIsTokenTree(id)
+  or
+  exists(Element oldMeta |
+    id = Fresh::map(TUnsafeTokenTreeMeta(oldMeta)) and meta_paths(oldMeta, path)
+  )
+}
+
+query predicate new_token_tree_meta_token_trees(NewElement id, Element token_tree) {
+  meta_token_trees(id, token_tree) and not meta_is_unsafe(id) and oldMetaIsTokenTree(id)
+  or
+  exists(Element oldMeta |
+    id = Fresh::map(TUnsafeTokenTreeMeta(oldMeta)) and meta_token_trees(oldMeta, token_tree)
+  )
+}
+
+query predicate new_unsafe_meta(Element id) { meta_is_unsafe(id) }
+
+query predicate new_unsafe_meta_is_unsafe(Element id) { meta_is_unsafe(id) }
+
+query predicate new_unsafe_meta_meta(Element id, NewElement inner) {
+  meta_is_unsafe(id) and oldMetaHasInnerShape(id) and isFreshInnerMeta(inner, id)
+}
+
+query predicate new_locatable_locations(NewElement id, Location location) {
+  locatable_locations(id, location)
+  or
+  exists(Element arg, Element name |
+    id = Fresh::map(TFormatArgsArgName(arg, name)) and locatable_locations(name, location)
+  )
+  or
+  exists(Element block |
+    id = Fresh::map(TTryBlockModifier(block)) and locatable_locations(block, location)
+  )
+  or
+  exists(Element field, Element expr |
+    id = Fresh::map(TStructFieldDefaultConstArg(field, expr)) and
+    locatable_locations(expr, location)
+  )
+  or
+  exists(Element variant, Element expr |
+    id = Fresh::map(TVariantDiscriminantConstArg(variant, expr)) and
+    locatable_locations(expr, location)
+  )
+  or
+  exists(Element oldMeta | isFreshInnerMeta(id, oldMeta) and locatable_locations(oldMeta, location))
+}
diff --git a/rust/ql/lib/upgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/old.dbscheme b/rust/ql/lib/upgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/old.dbscheme
new file mode 100644
index 000000000000..852696f20117
--- /dev/null
+++ b/rust/ql/lib/upgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/old.dbscheme
@@ -0,0 +1,3737 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/rust.dbscheme b/rust/ql/lib/upgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/rust.dbscheme
new file mode 100644
index 000000000000..3af0bba56aa5
--- /dev/null
+++ b/rust/ql/lib/upgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/rust.dbscheme
@@ -0,0 +1,3746 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @any_attr
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+@any_attr =
+  @attr
+| @doc_comment
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+doc_comments(
+  unique int id: @doc_comment
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/upgrade.properties b/rust/ql/lib/upgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/upgrade.properties
new file mode 100644
index 000000000000..28aa700f8c0f
--- /dev/null
+++ b/rust/ql/lib/upgrades/852696f20117c338fbb4e6a4f5ed69df79682c37/upgrade.properties
@@ -0,0 +1,2 @@
+description: Update rust-analyzer to 0.0.352
+compatibility: full
diff --git a/rust/ql/lib/upgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/old.dbscheme b/rust/ql/lib/upgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/old.dbscheme
new file mode 100644
index 000000000000..9487e73d9da6
--- /dev/null
+++ b/rust/ql/lib/upgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/old.dbscheme
@@ -0,0 +1,3768 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @any_attr
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+@any_attr =
+  @attr
+| @doc_comment
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @cfg_pred_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @cfg_pred_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_exprs(
+  unique int id: @cfg_pred_expr
+);
+
+#keyset[id]
+cfg_pred_expr_cfg_predicates(
+  int id: @cfg_pred_expr ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_pats(
+  unique int id: @cfg_pred_pat
+);
+
+#keyset[id]
+cfg_pred_pat_cfg_predicates(
+  int id: @cfg_pred_pat ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+doc_comments(
+  unique int id: @doc_comment
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/rust.dbscheme b/rust/ql/lib/upgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/rust.dbscheme
new file mode 100644
index 000000000000..7980434ec600
--- /dev/null
+++ b/rust/ql/lib/upgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/rust.dbscheme
@@ -0,0 +1,3753 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @any_attr
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+@any_attr =
+  @attr
+| @doc_comment
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @cfg_pred_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @cfg_pred_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_exprs(
+  unique int id: @cfg_pred_expr
+);
+
+#keyset[id]
+cfg_pred_expr_cfg_predicates(
+  int id: @cfg_pred_expr ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_pred_pats(
+  unique int id: @cfg_pred_pat
+);
+
+#keyset[id]
+cfg_pred_pat_cfg_predicates(
+  int id: @cfg_pred_pat ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+doc_comments(
+  unique int id: @doc_comment
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id, index]
+macro_expr_attrs(
+  int id: @macro_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id, index]
+struct_expr_attrs(
+  int id: @struct_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @any_attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/upgrade.properties b/rust/ql/lib/upgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/upgrade.properties
new file mode 100644
index 000000000000..202c3973d95f
--- /dev/null
+++ b/rust/ql/lib/upgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/upgrade.properties
@@ -0,0 +1,112 @@
+description: Remove parenthesized expression and pattern nodes
+compatibility: partial
+
+locatable_locations.rel: run upgrade.ql new_locatable_locations
+macro_call_macro_call_expansions.rel: run upgrade.ql new_macro_call_macro_call_expansions
+comments.rel: run upgrade.ql new_comments
+
+arg_list_args.rel: run upgrade.ql new_arg_list_args
+asm_operand_expr_in_exprs.rel: run upgrade.ql new_asm_operand_expr_in_exprs
+asm_operand_expr_out_exprs.rel: run upgrade.ql new_asm_operand_expr_out_exprs
+format_args_arg_exprs.rel: run upgrade.ql new_format_args_arg_exprs
+match_arm_exprs.rel: run upgrade.ql new_match_arm_exprs
+match_arm_pats.rel: run upgrade.ql new_match_arm_pats
+match_guard_conditions.rel: run upgrade.ql new_match_guard_conditions
+stmt_list_tail_exprs.rel: run upgrade.ql new_stmt_list_tail_exprs
+struct_expr_field_exprs.rel: run upgrade.ql new_struct_expr_field_exprs
+struct_expr_field_list_spreads.rel: run upgrade.ql new_struct_expr_field_list_spreads
+struct_pat_field_pats.rel: run upgrade.ql new_struct_pat_field_pats
+array_expr_internal_exprs.rel: run upgrade.ql new_array_expr_internal_exprs
+asm_const_exprs.rel: run upgrade.ql new_asm_const_exprs
+await_expr_exprs.rel: run upgrade.ql new_await_expr_exprs
+become_expr_exprs.rel: run upgrade.ql new_become_expr_exprs
+binary_expr_lhs.rel: run upgrade.ql new_binary_expr_lhs
+binary_expr_rhs.rel: run upgrade.ql new_binary_expr_rhs
+box_pat_pats.rel: run upgrade.ql new_box_pat_pats
+break_expr_exprs.rel: run upgrade.ql new_break_expr_exprs
+call_expr_functions.rel: run upgrade.ql new_call_expr_functions
+cast_expr_exprs.rel: run upgrade.ql new_cast_expr_exprs
+closure_expr_closure_bodies.rel: run upgrade.ql new_closure_expr_closure_bodies
+const_arg_exprs.rel: run upgrade.ql new_const_arg_exprs
+deref_pat_pats.rel: run upgrade.ql new_deref_pat_pats
+expr_stmt_exprs.rel: run upgrade.ql new_expr_stmt_exprs
+field_expr_containers.rel: run upgrade.ql new_field_expr_containers
+format_args_expr_templates.rel: run upgrade.ql new_format_args_expr_templates
+ident_pat_pats.rel: run upgrade.ql new_ident_pat_pats
+if_expr_conditions.rel: run upgrade.ql new_if_expr_conditions
+if_expr_elses.rel: run upgrade.ql new_if_expr_elses
+index_expr_bases.rel: run upgrade.ql new_index_expr_bases
+index_expr_indices.rel: run upgrade.ql new_index_expr_indices
+key_value_meta_exprs.rel: run upgrade.ql new_key_value_meta_exprs
+let_expr_scrutinees.rel: run upgrade.ql new_let_expr_scrutinees
+let_expr_pats.rel: run upgrade.ql new_let_expr_pats
+let_stmt_initializers.rel: run upgrade.ql new_let_stmt_initializers
+let_stmt_pats.rel: run upgrade.ql new_let_stmt_pats
+match_expr_scrutinees.rel: run upgrade.ql new_match_expr_scrutinees
+method_call_expr_receivers.rel: run upgrade.ql new_method_call_expr_receivers
+or_pat_pats.rel: run upgrade.ql new_or_pat_pats
+param_pats.rel: run upgrade.ql new_param_pats
+pattern_type_repr_pats.rel: run upgrade.ql new_pattern_type_repr_pats
+prefix_expr_exprs.rel: run upgrade.ql new_prefix_expr_exprs
+range_expr_ends.rel: run upgrade.ql new_range_expr_ends
+range_expr_starts.rel: run upgrade.ql new_range_expr_starts
+range_pat_ends.rel: run upgrade.ql new_range_pat_ends
+range_pat_starts.rel: run upgrade.ql new_range_pat_starts
+ref_expr_exprs.rel: run upgrade.ql new_ref_expr_exprs
+ref_pat_pats.rel: run upgrade.ql new_ref_pat_pats
+return_expr_exprs.rel: run upgrade.ql new_return_expr_exprs
+slice_pat_pats.rel: run upgrade.ql new_slice_pat_pats
+try_expr_exprs.rel: run upgrade.ql new_try_expr_exprs
+tuple_expr_fields.rel: run upgrade.ql new_tuple_expr_fields
+tuple_pat_fields.rel: run upgrade.ql new_tuple_pat_fields
+tuple_struct_pat_fields.rel: run upgrade.ql new_tuple_struct_pat_fields
+yeet_expr_exprs.rel: run upgrade.ql new_yeet_expr_exprs
+yield_expr_exprs.rel: run upgrade.ql new_yield_expr_exprs
+asm_expr_templates.rel: run upgrade.ql new_asm_expr_templates
+const_bodies.rel: run upgrade.ql new_const_bodies
+for_expr_iterables.rel: run upgrade.ql new_for_expr_iterables
+for_expr_pats.rel: run upgrade.ql new_for_expr_pats
+static_bodies.rel: run upgrade.ql new_static_bodies
+while_expr_conditions.rel: run upgrade.ql new_while_expr_conditions
+
+array_expr_internal_attrs.rel: run upgrade.ql new_array_expr_internal_attrs
+block_expr_attrs.rel: run upgrade.ql new_block_expr_attrs
+callable_attrs.rel: run upgrade.ql new_callable_attrs
+asm_expr_attrs.rel: run upgrade.ql new_asm_expr_attrs
+await_expr_attrs.rel: run upgrade.ql new_await_expr_attrs
+become_expr_attrs.rel: run upgrade.ql new_become_expr_attrs
+binary_expr_attrs.rel: run upgrade.ql new_binary_expr_attrs
+break_expr_attrs.rel: run upgrade.ql new_break_expr_attrs
+call_expr_attrs.rel: run upgrade.ql new_call_expr_attrs
+cast_expr_attrs.rel: run upgrade.ql new_cast_expr_attrs
+continue_expr_attrs.rel: run upgrade.ql new_continue_expr_attrs
+field_expr_attrs.rel: run upgrade.ql new_field_expr_attrs
+format_args_expr_attrs.rel: run upgrade.ql new_format_args_expr_attrs
+for_expr_attrs.rel: run upgrade.ql new_for_expr_attrs
+if_expr_attrs.rel: run upgrade.ql new_if_expr_attrs
+index_expr_attrs.rel: run upgrade.ql new_index_expr_attrs
+let_expr_attrs.rel: run upgrade.ql new_let_expr_attrs
+literal_expr_attrs.rel: run upgrade.ql new_literal_expr_attrs
+loop_expr_attrs.rel: run upgrade.ql new_loop_expr_attrs
+macro_expr_attrs.rel: run upgrade.ql new_macro_expr_attrs
+match_expr_attrs.rel: run upgrade.ql new_match_expr_attrs
+method_call_expr_attrs.rel: run upgrade.ql new_method_call_expr_attrs
+offset_of_expr_attrs.rel: run upgrade.ql new_offset_of_expr_attrs
+path_expr_attrs.rel: run upgrade.ql new_path_expr_attrs
+prefix_expr_attrs.rel: run upgrade.ql new_prefix_expr_attrs
+range_expr_attrs.rel: run upgrade.ql new_range_expr_attrs
+ref_expr_attrs.rel: run upgrade.ql new_ref_expr_attrs
+return_expr_attrs.rel: run upgrade.ql new_return_expr_attrs
+try_expr_attrs.rel: run upgrade.ql new_try_expr_attrs
+struct_expr_attrs.rel: run upgrade.ql new_struct_expr_attrs
+tuple_expr_attrs.rel: run upgrade.ql new_tuple_expr_attrs
+underscore_expr_attrs.rel: run upgrade.ql new_underscore_expr_attrs
+yeet_expr_attrs.rel: run upgrade.ql new_yeet_expr_attrs
+yield_expr_attrs.rel: run upgrade.ql new_yield_expr_attrs
+while_expr_attrs.rel: run upgrade.ql new_while_expr_attrs
+
+paren_exprs.rel: delete
+paren_expr_exprs.rel: delete
+paren_expr_attrs.rel: delete
+paren_pats.rel: delete
+paren_pat_pats.rel: delete
diff --git a/rust/ql/lib/upgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/upgrade.ql b/rust/ql/lib/upgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/upgrade.ql
new file mode 100644
index 000000000000..ee77bd5215ee
--- /dev/null
+++ b/rust/ql/lib/upgrades/9487e73d9da6508522f07a34bc4aafa8d55c0f5f/upgrade.ql
@@ -0,0 +1,697 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+class Expr extends Element, @expr { }
+
+class Pat extends Element, @pat { }
+
+class AnyAttr extends Element, @any_attr { }
+
+class ParenExpr extends Element, @paren_expr { }
+
+class ArgList extends Element, @arg_list { }
+
+class ArrayExprInternal extends Element, @array_expr_internal { }
+
+class BlockExpr extends Element, @block_expr { }
+
+class AsmConst extends Element, @asm_const { }
+
+class AsmExpr extends Element, @asm_expr { }
+
+class AsmOperandExpr extends Element, @asm_operand_expr { }
+
+class AwaitExpr extends Element, @await_expr { }
+
+class BecomeExpr extends Element, @become_expr { }
+
+class BinaryExpr extends Element, @binary_expr { }
+
+class BoxPat extends Element, @box_pat { }
+
+class BreakExpr extends Element, @break_expr { }
+
+class CallExpr extends Element, @call_expr { }
+
+class CastExpr extends Element, @cast_expr { }
+
+class ClosureExpr extends Element, @closure_expr { }
+
+class Const extends Element, @const { }
+
+class ConstArg extends Element, @const_arg { }
+
+class ContinueExpr extends Element, @continue_expr { }
+
+class DerefPat extends Element, @deref_pat { }
+
+class ExprStmt extends Element, @expr_stmt { }
+
+class FieldExpr extends Element, @field_expr { }
+
+class ForExpr extends Element, @for_expr { }
+
+class FormatArgsArg extends Element, @format_args_arg { }
+
+class FormatArgsExpr extends Element, @format_args_expr { }
+
+class IdentPat extends Element, @ident_pat { }
+
+class IfExpr extends Element, @if_expr { }
+
+class IndexExpr extends Element, @index_expr { }
+
+class KeyValueMeta extends Element, @key_value_meta { }
+
+class LetExpr extends Element, @let_expr { }
+
+class LetStmt extends Element, @let_stmt { }
+
+class LiteralExpr extends Element, @literal_expr { }
+
+class MatchArm extends Element, @match_arm { }
+
+class MatchExpr extends Element, @match_expr { }
+
+class MatchGuard extends Element, @match_guard { }
+
+class MacroExpr extends Element, @macro_expr { }
+
+class MethodCallExpr extends Element, @method_call_expr { }
+
+class OrPat extends Element, @or_pat { }
+
+class OffsetOfExpr extends Element, @offset_of_expr { }
+
+class Param extends Element, @param { }
+
+class PatternTypeRepr extends Element, @pattern_type_repr { }
+
+class PathExpr extends Element, @path_expr { }
+
+class PrefixExpr extends Element, @prefix_expr { }
+
+class RangeExpr extends Element, @range_expr { }
+
+class RangePat extends Element, @range_pat { }
+
+class RefExpr extends Element, @ref_expr { }
+
+class RefPat extends Element, @ref_pat { }
+
+class ReturnExpr extends Element, @return_expr { }
+
+class SlicePat extends Element, @slice_pat { }
+
+class Static extends Element, @static { }
+
+class StmtList extends Element, @stmt_list { }
+
+class StructExpr extends Element, @struct_expr { }
+
+class StructExprField extends Element, @struct_expr_field { }
+
+class StructExprFieldList extends Element, @struct_expr_field_list { }
+
+class StructPatField extends Element, @struct_pat_field { }
+
+class TryExpr extends Element, @try_expr { }
+
+class TupleExpr extends Element, @tuple_expr { }
+
+class TuplePat extends Element, @tuple_pat { }
+
+class TupleStructPat extends Element, @tuple_struct_pat { }
+
+class LoopExpr extends Element, @loop_expr { }
+
+class UnderscoreExpr extends Element, @underscore_expr { }
+
+class WhileExpr extends Element, @while_expr { }
+
+class YeetExpr extends Element, @yeet_expr { }
+
+class YieldExpr extends Element, @yield_expr { }
+
+private predicate stripExpr(Expr expr, Expr unwrapped) {
+  expr = unwrapped and not paren_exprs(expr)
+  or
+  exists(Expr inner |
+    paren_expr_exprs(expr, inner) and
+    stripExpr(inner, unwrapped)
+  )
+}
+
+private predicate stripPat(Pat pat, Pat unwrapped) {
+  pat = unwrapped and not paren_pats(pat)
+  or
+  exists(Pat inner |
+    paren_pat_pats(pat, inner) and
+    stripPat(inner, unwrapped)
+  )
+}
+
+private predicate stripAstNode(Element node, Element unwrapped) {
+  exists(Expr expr | node = expr and stripExpr(expr, unwrapped))
+  or
+  exists(Pat pat | node = pat and stripPat(pat, unwrapped))
+  or
+  node = unwrapped and not paren_exprs(node) and not paren_pats(node)
+}
+
+private predicate deletedNode(Element id) { paren_exprs(id) or paren_pats(id) }
+
+private predicate wrapsExpr(Expr outer, Expr inner) {
+  paren_expr_exprs(outer, inner)
+  or
+  exists(Expr child |
+    paren_expr_exprs(outer, child) and
+    wrapsExpr(child, inner)
+  )
+}
+
+private int numberOfParenthesizedExprAttrs(Expr expr) {
+  result =
+    count(ParenExpr wrapper, int index |
+      stripExpr(wrapper, expr) and
+      paren_expr_attrs(wrapper, index, _)
+    )
+}
+
+private int numberOfOuterParenthesizedExprAttrs(ParenExpr expr) {
+  result =
+    count(ParenExpr outer, int index |
+      wrapsExpr(outer, expr) and
+      outer != expr and
+      paren_expr_attrs(outer, index, _)
+    )
+}
+
+private predicate exprAttrs(Element id, int index, AnyAttr attr) {
+  array_expr_internal_attrs(id, index, attr) or
+  asm_expr_attrs(id, index, attr) or
+  await_expr_attrs(id, index, attr) or
+  become_expr_attrs(id, index, attr) or
+  binary_expr_attrs(id, index, attr) or
+  break_expr_attrs(id, index, attr) or
+  call_expr_attrs(id, index, attr) or
+  cast_expr_attrs(id, index, attr) or
+  block_expr_attrs(id, index, attr) or
+  callable_attrs(id, index, attr) or
+  continue_expr_attrs(id, index, attr) or
+  field_expr_attrs(id, index, attr) or
+  format_args_expr_attrs(id, index, attr) or
+  for_expr_attrs(id, index, attr) or
+  if_expr_attrs(id, index, attr) or
+  index_expr_attrs(id, index, attr) or
+  let_expr_attrs(id, index, attr) or
+  literal_expr_attrs(id, index, attr) or
+  loop_expr_attrs(id, index, attr) or
+  match_expr_attrs(id, index, attr) or
+  method_call_expr_attrs(id, index, attr) or
+  offset_of_expr_attrs(id, index, attr) or
+  path_expr_attrs(id, index, attr) or
+  prefix_expr_attrs(id, index, attr) or
+  range_expr_attrs(id, index, attr) or
+  ref_expr_attrs(id, index, attr) or
+  return_expr_attrs(id, index, attr) or
+  try_expr_attrs(id, index, attr) or
+  tuple_expr_attrs(id, index, attr) or
+  underscore_expr_attrs(id, index, attr) or
+  while_expr_attrs(id, index, attr) or
+  yeet_expr_attrs(id, index, attr) or
+  yield_expr_attrs(id, index, attr)
+}
+
+private predicate mergedExprAttrs(Expr expr, int index, AnyAttr attr) {
+  exists(int originalIndex |
+    exprAttrs(expr, originalIndex, attr) and
+    index = originalIndex + numberOfParenthesizedExprAttrs(expr)
+  )
+  or
+  exists(ParenExpr wrapper, int originalIndex |
+    paren_expr_attrs(wrapper, originalIndex, attr) and
+    stripExpr(wrapper, expr) and
+    index = numberOfOuterParenthesizedExprAttrs(wrapper) + originalIndex
+  )
+}
+
+query predicate new_locatable_locations(Element id, Location location) {
+  locatable_locations(id, location) and not deletedNode(id)
+}
+
+query predicate new_macro_call_macro_call_expansions(Element macroCall, Element expansion) {
+  exists(Element oldExpansion |
+    macro_call_macro_call_expansions(macroCall, oldExpansion) and
+    stripAstNode(oldExpansion, expansion)
+  )
+}
+
+query predicate new_comments(Element id, Element parent, string text) {
+  exists(Element oldParent |
+    comments(id, oldParent, text) and
+    stripAstNode(oldParent, parent)
+  )
+}
+
+query predicate new_arg_list_args(ArgList id, int index, Expr arg) {
+  arg =
+    rank[index + 1](Expr oldArg, Expr unwrappedArg, int oldIndex |
+      arg_list_args(id, oldIndex, oldArg) and stripExpr(oldArg, unwrappedArg)
+    |
+      unwrappedArg order by oldIndex
+    )
+}
+
+query predicate new_asm_operand_expr_in_exprs(AsmOperandExpr id, Expr in_expr) {
+  exists(Expr oldExpr | asm_operand_expr_in_exprs(id, oldExpr) and stripExpr(oldExpr, in_expr))
+}
+
+query predicate new_asm_operand_expr_out_exprs(AsmOperandExpr id, Expr out_expr) {
+  exists(Expr oldExpr | asm_operand_expr_out_exprs(id, oldExpr) and stripExpr(oldExpr, out_expr))
+}
+
+query predicate new_format_args_arg_exprs(FormatArgsArg id, Expr expr) {
+  exists(Expr oldExpr | format_args_arg_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_match_arm_exprs(MatchArm id, Expr expr) {
+  exists(Expr oldExpr | match_arm_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_match_arm_pats(MatchArm id, Pat pat) {
+  exists(Pat oldPat | match_arm_pats(id, oldPat) and stripPat(oldPat, pat))
+}
+
+query predicate new_match_guard_conditions(MatchGuard id, Expr condition) {
+  exists(Expr oldExpr | match_guard_conditions(id, oldExpr) and stripExpr(oldExpr, condition))
+}
+
+query predicate new_stmt_list_tail_exprs(StmtList id, Expr tail_expr) {
+  exists(Expr oldExpr | stmt_list_tail_exprs(id, oldExpr) and stripExpr(oldExpr, tail_expr))
+}
+
+query predicate new_struct_expr_field_exprs(StructExprField id, Expr expr) {
+  exists(Expr oldExpr | struct_expr_field_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_struct_expr_field_list_spreads(StructExprFieldList id, Expr spread) {
+  exists(Expr oldExpr | struct_expr_field_list_spreads(id, oldExpr) and stripExpr(oldExpr, spread))
+}
+
+query predicate new_struct_pat_field_pats(StructPatField id, Pat pat) {
+  exists(Pat oldPat | struct_pat_field_pats(id, oldPat) and stripPat(oldPat, pat))
+}
+
+query predicate new_array_expr_internal_exprs(ArrayExprInternal id, int index, Expr expr) {
+  expr =
+    rank[index + 1](Expr oldExpr, Expr unwrappedExpr, int oldIndex |
+      array_expr_internal_exprs(id, oldIndex, oldExpr) and stripExpr(oldExpr, unwrappedExpr)
+    |
+      unwrappedExpr order by oldIndex
+    )
+}
+
+query predicate new_asm_const_exprs(AsmConst id, Expr expr) {
+  exists(Expr oldExpr | asm_const_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_await_expr_exprs(AwaitExpr id, Expr expr) {
+  exists(Expr oldExpr | await_expr_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_become_expr_exprs(BecomeExpr id, Expr expr) {
+  exists(Expr oldExpr | become_expr_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_binary_expr_lhs(BinaryExpr id, Expr lhs) {
+  exists(Expr oldExpr | binary_expr_lhs(id, oldExpr) and stripExpr(oldExpr, lhs))
+}
+
+query predicate new_binary_expr_rhs(BinaryExpr id, Expr rhs) {
+  exists(Expr oldExpr | binary_expr_rhs(id, oldExpr) and stripExpr(oldExpr, rhs))
+}
+
+query predicate new_box_pat_pats(BoxPat id, Pat pat) {
+  exists(Pat oldPat | box_pat_pats(id, oldPat) and stripPat(oldPat, pat))
+}
+
+query predicate new_break_expr_exprs(BreakExpr id, Expr expr) {
+  exists(Expr oldExpr | break_expr_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_call_expr_functions(CallExpr id, Expr function) {
+  exists(Expr oldExpr | call_expr_functions(id, oldExpr) and stripExpr(oldExpr, function))
+}
+
+query predicate new_cast_expr_exprs(CastExpr id, Expr expr) {
+  exists(Expr oldExpr | cast_expr_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_closure_expr_closure_bodies(ClosureExpr id, Expr closure_body) {
+  exists(Expr oldExpr |
+    closure_expr_closure_bodies(id, oldExpr) and stripExpr(oldExpr, closure_body)
+  )
+}
+
+query predicate new_const_arg_exprs(ConstArg id, Expr expr) {
+  exists(Expr oldExpr | const_arg_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_deref_pat_pats(DerefPat id, Pat pat) {
+  exists(Pat oldPat | deref_pat_pats(id, oldPat) and stripPat(oldPat, pat))
+}
+
+query predicate new_expr_stmt_exprs(ExprStmt id, Expr expr) {
+  exists(Expr oldExpr | expr_stmt_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_field_expr_containers(FieldExpr id, Expr container) {
+  exists(Expr oldExpr | field_expr_containers(id, oldExpr) and stripExpr(oldExpr, container))
+}
+
+query predicate new_format_args_expr_templates(FormatArgsExpr id, Expr template) {
+  exists(Expr oldExpr | format_args_expr_templates(id, oldExpr) and stripExpr(oldExpr, template))
+}
+
+query predicate new_ident_pat_pats(IdentPat id, Pat pat) {
+  exists(Pat oldPat | ident_pat_pats(id, oldPat) and stripPat(oldPat, pat))
+}
+
+query predicate new_if_expr_conditions(IfExpr id, Expr condition) {
+  exists(Expr oldExpr | if_expr_conditions(id, oldExpr) and stripExpr(oldExpr, condition))
+}
+
+query predicate new_if_expr_elses(IfExpr id, Expr else_) {
+  exists(Expr oldExpr | if_expr_elses(id, oldExpr) and stripExpr(oldExpr, else_))
+}
+
+query predicate new_index_expr_bases(IndexExpr id, Expr base) {
+  exists(Expr oldExpr | index_expr_bases(id, oldExpr) and stripExpr(oldExpr, base))
+}
+
+query predicate new_index_expr_indices(IndexExpr id, Expr index) {
+  exists(Expr oldExpr | index_expr_indices(id, oldExpr) and stripExpr(oldExpr, index))
+}
+
+query predicate new_key_value_meta_exprs(KeyValueMeta id, Expr expr) {
+  exists(Expr oldExpr | key_value_meta_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_let_expr_scrutinees(LetExpr id, Expr scrutinee) {
+  exists(Expr oldExpr | let_expr_scrutinees(id, oldExpr) and stripExpr(oldExpr, scrutinee))
+}
+
+query predicate new_let_expr_pats(LetExpr id, Pat pat) {
+  exists(Pat oldPat | let_expr_pats(id, oldPat) and stripPat(oldPat, pat))
+}
+
+query predicate new_let_stmt_initializers(LetStmt id, Expr initializer) {
+  exists(Expr oldExpr | let_stmt_initializers(id, oldExpr) and stripExpr(oldExpr, initializer))
+}
+
+query predicate new_let_stmt_pats(LetStmt id, Pat pat) {
+  exists(Pat oldPat | let_stmt_pats(id, oldPat) and stripPat(oldPat, pat))
+}
+
+query predicate new_match_expr_scrutinees(MatchExpr id, Expr scrutinee) {
+  exists(Expr oldExpr | match_expr_scrutinees(id, oldExpr) and stripExpr(oldExpr, scrutinee))
+}
+
+query predicate new_method_call_expr_receivers(MethodCallExpr id, Expr receiver) {
+  exists(Expr oldExpr | method_call_expr_receivers(id, oldExpr) and stripExpr(oldExpr, receiver))
+}
+
+query predicate new_or_pat_pats(OrPat id, int index, Pat pat) {
+  pat =
+    rank[index + 1](Pat oldPat, Pat unwrappedPat, int oldIndex |
+      or_pat_pats(id, oldIndex, oldPat) and stripPat(oldPat, unwrappedPat)
+    |
+      unwrappedPat order by oldIndex
+    )
+}
+
+query predicate new_param_pats(Param id, Pat pat) {
+  exists(Pat oldPat | param_pats(id, oldPat) and stripPat(oldPat, pat))
+}
+
+query predicate new_pattern_type_repr_pats(PatternTypeRepr id, Pat pat) {
+  exists(Pat oldPat | pattern_type_repr_pats(id, oldPat) and stripPat(oldPat, pat))
+}
+
+query predicate new_prefix_expr_exprs(PrefixExpr id, Expr expr) {
+  exists(Expr oldExpr | prefix_expr_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_range_expr_ends(RangeExpr id, Expr end) {
+  exists(Expr oldExpr | range_expr_ends(id, oldExpr) and stripExpr(oldExpr, end))
+}
+
+query predicate new_range_expr_starts(RangeExpr id, Expr start) {
+  exists(Expr oldExpr | range_expr_starts(id, oldExpr) and stripExpr(oldExpr, start))
+}
+
+query predicate new_range_pat_ends(RangePat id, Pat end) {
+  exists(Pat oldPat | range_pat_ends(id, oldPat) and stripPat(oldPat, end))
+}
+
+query predicate new_range_pat_starts(RangePat id, Pat start) {
+  exists(Pat oldPat | range_pat_starts(id, oldPat) and stripPat(oldPat, start))
+}
+
+query predicate new_ref_expr_exprs(RefExpr id, Expr expr) {
+  exists(Expr oldExpr | ref_expr_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_ref_pat_pats(RefPat id, Pat pat) {
+  exists(Pat oldPat | ref_pat_pats(id, oldPat) and stripPat(oldPat, pat))
+}
+
+query predicate new_return_expr_exprs(ReturnExpr id, Expr expr) {
+  exists(Expr oldExpr | return_expr_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_slice_pat_pats(SlicePat id, int index, Pat pat) {
+  pat =
+    rank[index + 1](Pat oldPat, Pat unwrappedPat, int oldIndex |
+      slice_pat_pats(id, oldIndex, oldPat) and stripPat(oldPat, unwrappedPat)
+    |
+      unwrappedPat order by oldIndex
+    )
+}
+
+query predicate new_try_expr_exprs(TryExpr id, Expr expr) {
+  exists(Expr oldExpr | try_expr_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_tuple_expr_fields(TupleExpr id, int index, Expr field) {
+  field =
+    rank[index + 1](Expr oldExpr, Expr unwrappedExpr, int oldIndex |
+      tuple_expr_fields(id, oldIndex, oldExpr) and stripExpr(oldExpr, unwrappedExpr)
+    |
+      unwrappedExpr order by oldIndex
+    )
+}
+
+query predicate new_tuple_pat_fields(TuplePat id, int index, Pat field) {
+  field =
+    rank[index + 1](Pat oldPat, Pat unwrappedPat, int oldIndex |
+      tuple_pat_fields(id, oldIndex, oldPat) and stripPat(oldPat, unwrappedPat)
+    |
+      unwrappedPat order by oldIndex
+    )
+}
+
+query predicate new_tuple_struct_pat_fields(TupleStructPat id, int index, Pat field) {
+  field =
+    rank[index + 1](Pat oldPat, Pat unwrappedPat, int oldIndex |
+      tuple_struct_pat_fields(id, oldIndex, oldPat) and stripPat(oldPat, unwrappedPat)
+    |
+      unwrappedPat order by oldIndex
+    )
+}
+
+query predicate new_yeet_expr_exprs(YeetExpr id, Expr expr) {
+  exists(Expr oldExpr | yeet_expr_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_yield_expr_exprs(YieldExpr id, Expr expr) {
+  exists(Expr oldExpr | yield_expr_exprs(id, oldExpr) and stripExpr(oldExpr, expr))
+}
+
+query predicate new_asm_expr_templates(AsmExpr id, int index, Expr template) {
+  template =
+    rank[index + 1](Expr oldExpr, Expr unwrappedExpr, int oldIndex |
+      asm_expr_templates(id, oldIndex, oldExpr) and stripExpr(oldExpr, unwrappedExpr)
+    |
+      unwrappedExpr order by oldIndex
+    )
+}
+
+query predicate new_const_bodies(Const id, Expr body) {
+  exists(Expr oldExpr | const_bodies(id, oldExpr) and stripExpr(oldExpr, body))
+}
+
+query predicate new_for_expr_iterables(ForExpr id, Expr iterable) {
+  exists(Expr oldExpr | for_expr_iterables(id, oldExpr) and stripExpr(oldExpr, iterable))
+}
+
+query predicate new_for_expr_pats(ForExpr id, Pat pat) {
+  exists(Pat oldPat | for_expr_pats(id, oldPat) and stripPat(oldPat, pat))
+}
+
+query predicate new_static_bodies(Static id, Expr body) {
+  exists(Expr oldExpr | static_bodies(id, oldExpr) and stripExpr(oldExpr, body))
+}
+
+query predicate new_while_expr_conditions(WhileExpr id, Expr condition) {
+  exists(Expr oldExpr | while_expr_conditions(id, oldExpr) and stripExpr(oldExpr, condition))
+}
+
+query predicate new_array_expr_internal_attrs(ArrayExprInternal id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_block_expr_attrs(BlockExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_callable_attrs(Element id, int index, AnyAttr attr) {
+  exists(ClosureExpr expr | id = expr and mergedExprAttrs(expr, index, attr))
+  or
+  callable_attrs(id, index, attr) and
+  not exists(ClosureExpr expr | id = expr)
+}
+
+query predicate new_asm_expr_attrs(AsmExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_await_expr_attrs(AwaitExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_become_expr_attrs(BecomeExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_binary_expr_attrs(BinaryExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_break_expr_attrs(BreakExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_call_expr_attrs(CallExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_cast_expr_attrs(CastExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_continue_expr_attrs(ContinueExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_field_expr_attrs(FieldExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_format_args_expr_attrs(FormatArgsExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_for_expr_attrs(ForExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_if_expr_attrs(IfExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_index_expr_attrs(IndexExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_let_expr_attrs(LetExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_literal_expr_attrs(LiteralExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_loop_expr_attrs(LoopExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_macro_expr_attrs(MacroExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_match_expr_attrs(MatchExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_method_call_expr_attrs(MethodCallExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_offset_of_expr_attrs(OffsetOfExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_path_expr_attrs(PathExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_prefix_expr_attrs(PrefixExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_range_expr_attrs(RangeExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_ref_expr_attrs(RefExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_return_expr_attrs(ReturnExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_try_expr_attrs(TryExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_struct_expr_attrs(StructExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_tuple_expr_attrs(TupleExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_underscore_expr_attrs(UnderscoreExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_yeet_expr_attrs(YeetExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_yield_expr_attrs(YieldExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
+
+query predicate new_while_expr_attrs(WhileExpr id, int index, AnyAttr attr) {
+  mergedExprAttrs(id, index, attr)
+}
diff --git a/rust/ql/lib/upgrades/e1bce498ef78280ebe0a32b1d9d6f26c96eaf41f/old.dbscheme b/rust/ql/lib/upgrades/e1bce498ef78280ebe0a32b1d9d6f26c96eaf41f/old.dbscheme
new file mode 100644
index 000000000000..e1bce498ef78
--- /dev/null
+++ b/rust/ql/lib/upgrades/e1bce498ef78280ebe0a32b1d9d6f26c96eaf41f/old.dbscheme
@@ -0,0 +1,3560 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/e1bce498ef78280ebe0a32b1d9d6f26c96eaf41f/rust.dbscheme b/rust/ql/lib/upgrades/e1bce498ef78280ebe0a32b1d9d6f26c96eaf41f/rust.dbscheme
new file mode 100644
index 000000000000..ed6b1d3d5140
--- /dev/null
+++ b/rust/ql/lib/upgrades/e1bce498ef78280ebe0a32b1d9d6f26c96eaf41f/rust.dbscheme
@@ -0,0 +1,3627 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @format_args_arg_name
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_arg_names(
+  int id: @format_args_arg ref,
+  int arg_name: @format_args_arg_name ref
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+format_args_arg_names(
+  unique int id: @format_args_arg_name
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/e1bce498ef78280ebe0a32b1d9d6f26c96eaf41f/upgrade.properties b/rust/ql/lib/upgrades/e1bce498ef78280ebe0a32b1d9d6f26c96eaf41f/upgrade.properties
new file mode 100644
index 000000000000..55145c26245b
--- /dev/null
+++ b/rust/ql/lib/upgrades/e1bce498ef78280ebe0a32b1d9d6f26c96eaf41f/upgrade.properties
@@ -0,0 +1,46 @@
+description: Upgrade from rust-analyzer 0.0.301 to 0.0.328
+compatibility: full
+
+block_expr_is_try.rel: delete
+format_args_arg_names.rel: run upgrade.ql new_format_args_arg_names
+format_args_arg_arg_names.rel: run upgrade.ql new_format_args_arg_arg_names
+meta.rel: delete
+meta_exprs.rel: delete
+meta_is_unsafe.rel: delete
+meta_paths.rel: delete
+meta_token_trees.rel: delete
+path_meta.rel: run upgrade.ql new_path_meta
+path_meta_paths.rel: run upgrade.ql new_path_meta_paths
+key_value_meta.rel: run upgrade.ql new_key_value_meta
+key_value_meta_exprs.rel: run upgrade.ql new_key_value_meta_exprs
+key_value_meta_paths.rel: run upgrade.ql new_key_value_meta_paths
+token_tree_meta.rel: run upgrade.ql new_token_tree_meta
+token_tree_meta_paths.rel: run upgrade.ql new_token_tree_meta_paths
+token_tree_meta_token_trees.rel: run upgrade.ql new_token_tree_meta_token_trees
+unsafe_meta.rel: run upgrade.ql new_unsafe_meta
+unsafe_meta_is_unsafe.rel: run upgrade.ql new_unsafe_meta_is_unsafe
+unsafe_meta_meta.rel: run upgrade.ql new_unsafe_meta_meta
+struct_field_defaults.rel: delete
+struct_field_default_vals.rel: run upgrade.ql new_struct_field_default_vals
+variant_discriminants.rel: delete
+variant_const_args.rel: run upgrade.ql new_variant_const_args
+trait_aliases.rel: delete
+trait_alias_attrs.rel: delete
+trait_alias_generic_param_lists.rel: delete
+trait_alias_names.rel: delete
+trait_alias_type_bound_lists.rel: delete
+trait_alias_visibilities.rel: delete
+trait_alias_where_clauses.rel: delete
+try_block_modifiers.rel: run upgrade.ql new_try_block_modifiers
+try_block_modifier_is_try.rel: run upgrade.ql new_try_block_modifier_is_try
+block_expr_try_block_modifiers.rel: run upgrade.ql new_block_expr_try_block_modifiers
+const_args.rel: run upgrade.ql new_const_args
+const_arg_exprs.rel: run upgrade.ql new_const_arg_exprs
+traits.rel: run upgrade.ql new_traits
+trait_attrs.rel: run upgrade.ql new_trait_attrs
+trait_generic_param_lists.rel: run upgrade.ql new_trait_generic_param_lists
+trait_names.rel: run upgrade.ql new_trait_names
+trait_type_bound_lists.rel: run upgrade.ql new_trait_type_bound_lists
+trait_visibilities.rel: run upgrade.ql new_trait_visibilities
+trait_where_clauses.rel: run upgrade.ql new_trait_where_clauses
+locatable_locations.rel: run upgrade.ql new_locatable_locations
diff --git a/rust/ql/lib/upgrades/e1bce498ef78280ebe0a32b1d9d6f26c96eaf41f/upgrade.ql b/rust/ql/lib/upgrades/e1bce498ef78280ebe0a32b1d9d6f26c96eaf41f/upgrade.ql
new file mode 100644
index 000000000000..db588965363a
--- /dev/null
+++ b/rust/ql/lib/upgrades/e1bce498ef78280ebe0a32b1d9d6f26c96eaf41f/upgrade.ql
@@ -0,0 +1,205 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+private predicate oldMetaHasExpr(Element meta) { meta_exprs(meta, _) }
+
+private predicate oldMetaHasPath(Element meta) { meta_paths(meta, _) }
+
+private predicate oldMetaHasTokenTree(Element meta) { meta_token_trees(meta, _) }
+
+private predicate oldMetaIsPath(Element meta) {
+  oldMetaHasPath(meta) and not oldMetaHasExpr(meta) and not oldMetaHasTokenTree(meta)
+}
+
+private predicate oldMetaIsKeyValue(Element meta) { oldMetaHasPath(meta) and oldMetaHasExpr(meta) }
+
+private predicate oldMetaIsTokenTree(Element meta) {
+  oldMetaHasPath(meta) and oldMetaHasTokenTree(meta) and not oldMetaHasExpr(meta)
+}
+
+private predicate oldMetaHasInnerShape(Element meta) {
+  oldMetaIsPath(meta) or oldMetaIsKeyValue(meta) or oldMetaIsTokenTree(meta)
+}
+
+newtype TAddedElement =
+  TFormatArgsArgName(Element arg, Element name) { format_args_arg_names(arg, name) } or
+  TTryBlockModifier(Element block) { block_expr_is_try(block) } or
+  TStructFieldDefaultConstArg(Element field, Element expr) { struct_field_defaults(field, expr) } or
+  TVariantDiscriminantConstArg(Element variant, Element expr) {
+    variant_discriminants(variant, expr)
+  } or
+  TUnsafePathMeta(Element meta) { meta_is_unsafe(meta) and oldMetaIsPath(meta) } or
+  TUnsafeKeyValueMeta(Element meta) { meta_is_unsafe(meta) and oldMetaIsKeyValue(meta) } or
+  TUnsafeTokenTreeMeta(Element meta) { meta_is_unsafe(meta) and oldMetaIsTokenTree(meta) }
+
+module Fresh = QlBuiltins::NewEntity<TAddedElement>;
+
+class TNewElement = @element or Fresh::EntityId;
+
+class NewElement extends TNewElement {
+  string toString() { none() }
+}
+
+private predicate isFreshInnerMeta(NewElement id, Element oldMeta) {
+  id = Fresh::map(TUnsafePathMeta(oldMeta)) or
+  id = Fresh::map(TUnsafeKeyValueMeta(oldMeta)) or
+  id = Fresh::map(TUnsafeTokenTreeMeta(oldMeta))
+}
+
+query predicate new_format_args_arg_names(NewElement id) {
+  id = Fresh::map(TFormatArgsArgName(_, _))
+}
+
+query predicate new_format_args_arg_arg_names(Element id, NewElement arg_name) {
+  arg_name = Fresh::map(TFormatArgsArgName(id, _))
+}
+
+query predicate new_try_block_modifiers(NewElement id) { id = Fresh::map(TTryBlockModifier(_)) }
+
+query predicate new_try_block_modifier_is_try(NewElement id) {
+  id = Fresh::map(TTryBlockModifier(_))
+}
+
+query predicate new_block_expr_try_block_modifiers(Element id, NewElement try_block_modifier) {
+  try_block_modifier = Fresh::map(TTryBlockModifier(id))
+}
+
+query predicate new_const_args(NewElement id) {
+  const_args(id) or
+  id = Fresh::map(TStructFieldDefaultConstArg(_, _)) or
+  id = Fresh::map(TVariantDiscriminantConstArg(_, _))
+}
+
+query predicate new_const_arg_exprs(NewElement id, Element expr) {
+  const_arg_exprs(id, expr) or
+  id = Fresh::map(TStructFieldDefaultConstArg(_, expr)) or
+  id = Fresh::map(TVariantDiscriminantConstArg(_, expr))
+}
+
+query predicate new_struct_field_default_vals(Element id, NewElement default_val) {
+  default_val = Fresh::map(TStructFieldDefaultConstArg(id, _))
+}
+
+query predicate new_variant_const_args(Element id, NewElement const_arg) {
+  const_arg = Fresh::map(TVariantDiscriminantConstArg(id, _))
+}
+
+query predicate new_traits(Element id) { traits(id) or trait_aliases(id) }
+
+query predicate new_trait_attrs(Element id, int index, Element attr) {
+  trait_attrs(id, index, attr) or trait_alias_attrs(id, index, attr)
+}
+
+query predicate new_trait_generic_param_lists(Element id, Element generic_param_list) {
+  trait_generic_param_lists(id, generic_param_list) or
+  trait_alias_generic_param_lists(id, generic_param_list)
+}
+
+query predicate new_trait_names(Element id, Element name) {
+  trait_names(id, name) or trait_alias_names(id, name)
+}
+
+query predicate new_trait_type_bound_lists(Element id, Element type_bound_list) {
+  trait_type_bound_lists(id, type_bound_list) or trait_alias_type_bound_lists(id, type_bound_list)
+}
+
+query predicate new_trait_visibilities(Element id, Element visibility) {
+  trait_visibilities(id, visibility) or trait_alias_visibilities(id, visibility)
+}
+
+query predicate new_trait_where_clauses(Element id, Element where_clause) {
+  trait_where_clauses(id, where_clause) or trait_alias_where_clauses(id, where_clause)
+}
+
+query predicate new_path_meta(NewElement id) {
+  meta(id) and not meta_is_unsafe(id) and oldMetaIsPath(id)
+  or
+  id = Fresh::map(TUnsafePathMeta(_))
+}
+
+query predicate new_path_meta_paths(NewElement id, Element path) {
+  meta_paths(id, path) and not meta_is_unsafe(id) and oldMetaIsPath(id)
+  or
+  exists(Element oldMeta | id = Fresh::map(TUnsafePathMeta(oldMeta)) and meta_paths(oldMeta, path))
+}
+
+query predicate new_key_value_meta(NewElement id) {
+  meta(id) and not meta_is_unsafe(id) and oldMetaIsKeyValue(id)
+  or
+  id = Fresh::map(TUnsafeKeyValueMeta(_))
+}
+
+query predicate new_key_value_meta_exprs(NewElement id, Element expr) {
+  meta_exprs(id, expr) and not meta_is_unsafe(id) and oldMetaIsKeyValue(id)
+  or
+  exists(Element oldMeta |
+    id = Fresh::map(TUnsafeKeyValueMeta(oldMeta)) and meta_exprs(oldMeta, expr)
+  )
+}
+
+query predicate new_key_value_meta_paths(NewElement id, Element path) {
+  meta_paths(id, path) and not meta_is_unsafe(id) and oldMetaIsKeyValue(id)
+  or
+  exists(Element oldMeta |
+    id = Fresh::map(TUnsafeKeyValueMeta(oldMeta)) and meta_paths(oldMeta, path)
+  )
+}
+
+query predicate new_token_tree_meta(NewElement id) {
+  meta(id) and not meta_is_unsafe(id) and oldMetaIsTokenTree(id)
+  or
+  id = Fresh::map(TUnsafeTokenTreeMeta(_))
+}
+
+query predicate new_token_tree_meta_paths(NewElement id, Element path) {
+  meta_paths(id, path) and not meta_is_unsafe(id) and oldMetaIsTokenTree(id)
+  or
+  exists(Element oldMeta |
+    id = Fresh::map(TUnsafeTokenTreeMeta(oldMeta)) and meta_paths(oldMeta, path)
+  )
+}
+
+query predicate new_token_tree_meta_token_trees(NewElement id, Element token_tree) {
+  meta_token_trees(id, token_tree) and not meta_is_unsafe(id) and oldMetaIsTokenTree(id)
+  or
+  exists(Element oldMeta |
+    id = Fresh::map(TUnsafeTokenTreeMeta(oldMeta)) and meta_token_trees(oldMeta, token_tree)
+  )
+}
+
+query predicate new_unsafe_meta(Element id) { meta_is_unsafe(id) }
+
+query predicate new_unsafe_meta_is_unsafe(Element id) { meta_is_unsafe(id) }
+
+query predicate new_unsafe_meta_meta(Element id, NewElement inner) {
+  meta_is_unsafe(id) and oldMetaHasInnerShape(id) and isFreshInnerMeta(inner, id)
+}
+
+query predicate new_locatable_locations(NewElement id, Location location) {
+  locatable_locations(id, location)
+  or
+  exists(Element arg, Element name |
+    id = Fresh::map(TFormatArgsArgName(arg, name)) and locatable_locations(name, location)
+  )
+  or
+  exists(Element block |
+    id = Fresh::map(TTryBlockModifier(block)) and locatable_locations(block, location)
+  )
+  or
+  exists(Element field, Element expr |
+    id = Fresh::map(TStructFieldDefaultConstArg(field, expr)) and
+    locatable_locations(expr, location)
+  )
+  or
+  exists(Element variant, Element expr |
+    id = Fresh::map(TVariantDiscriminantConstArg(variant, expr)) and
+    locatable_locations(expr, location)
+  )
+  or
+  exists(Element oldMeta | isFreshInnerMeta(id, oldMeta) and locatable_locations(oldMeta, location))
+}
diff --git a/rust/ql/lib/upgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/old.dbscheme b/rust/ql/lib/upgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/old.dbscheme
new file mode 100644
index 000000000000..ed6b1d3d5140
--- /dev/null
+++ b/rust/ql/lib/upgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/old.dbscheme
@@ -0,0 +1,3627 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @format_args_arg_name
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_arg_names(
+  int id: @format_args_arg ref,
+  int arg_name: @format_args_arg_name ref
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+format_args_arg_names(
+  unique int id: @format_args_arg_name
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/rust.dbscheme b/rust/ql/lib/upgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/rust.dbscheme
new file mode 100644
index 000000000000..852696f20117
--- /dev/null
+++ b/rust/ql/lib/upgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/rust.dbscheme
@@ -0,0 +1,3737 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_comments (unique int id: @yaml_comment,
+               string text: string ref,
+               string tostring: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error | @yaml_comment;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @cfg_predicate
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @impl_restriction
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @mut_restriction
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @try_block_modifier
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @visibility_inner
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@cfg_predicate =
+  @cfg_atom
+| @cfg_composite
+;
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @include_bytes_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+impl_restrictions(
+  unique int id: @impl_restriction
+);
+
+#keyset[id]
+impl_restriction_visibility_inners(
+  int id: @impl_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+@meta =
+  @cfg_attr_meta
+| @cfg_meta
+| @key_value_meta
+| @path_meta
+| @token_tree_meta
+| @unsafe_meta
+;
+
+mut_restrictions(
+  unique int id: @mut_restriction
+);
+
+#keyset[id]
+mut_restriction_is_mut(
+  int id: @mut_restriction ref
+);
+
+#keyset[id]
+mut_restriction_visibility_inners(
+  int id: @mut_restriction ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @deref_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @not_null
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_default_vals(
+  int id: @struct_field ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_mut_restrictions(
+  int id: @struct_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+try_block_modifiers(
+  unique int id: @try_block_modifier
+);
+
+#keyset[id]
+try_block_modifier_is_try(
+  int id: @try_block_modifier ref
+);
+
+#keyset[id]
+try_block_modifier_type_reprs(
+  int id: @try_block_modifier ref,
+  int type_repr: @type_repr ref
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_mut_restrictions(
+  int id: @tuple_field ref,
+  int mut_restriction: @mut_restriction ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @pattern_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_visibility_inners(
+  int id: @visibility ref,
+  int visibility_inner: @visibility_inner ref
+);
+
+visibility_inners(
+  unique int id: @visibility_inner
+);
+
+#keyset[id]
+visibility_inner_paths(
+  int id: @visibility_inner ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+#keyset[id, index]
+asm_clobber_abi_attrs(
+  int id: @asm_clobber_abi ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id, index]
+asm_operand_named_attrs(
+  int id: @asm_operand_named ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+#keyset[id, index]
+asm_options_list_attrs(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+cfg_atoms(
+  unique int id: @cfg_atom
+);
+
+cfg_attr_meta(
+  unique int id: @cfg_attr_meta
+);
+
+#keyset[id]
+cfg_attr_meta_cfg_predicates(
+  int id: @cfg_attr_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+#keyset[id, index]
+cfg_attr_meta_metas(
+  int id: @cfg_attr_meta ref,
+  int index: int ref,
+  int meta: @meta ref
+);
+
+cfg_composites(
+  unique int id: @cfg_composite
+);
+
+#keyset[id, index]
+cfg_composite_cfg_predicates(
+  int id: @cfg_composite ref,
+  int index: int ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+cfg_meta(
+  unique int id: @cfg_meta
+);
+
+#keyset[id]
+cfg_meta_cfg_predicates(
+  int id: @cfg_meta ref,
+  int cfg_predicate: @cfg_predicate ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+deref_pats(
+  unique int id: @deref_pat
+);
+
+#keyset[id]
+deref_pat_pats(
+  int id: @deref_pat ref,
+  int pat: @pat ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+include_bytes_exprs(
+  unique int id: @include_bytes_expr
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+key_value_meta(
+  unique int id: @key_value_meta
+);
+
+#keyset[id]
+key_value_meta_exprs(
+  int id: @key_value_meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+key_value_meta_paths(
+  int id: @key_value_meta ref,
+  int path: @path ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+not_nulls(
+  unique int id: @not_null
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_meta(
+  unique int id: @path_meta
+);
+
+#keyset[id]
+path_meta_paths(
+  int id: @path_meta ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+pattern_type_reprs(
+  unique int id: @pattern_type_repr
+);
+
+#keyset[id]
+pattern_type_repr_pats(
+  int id: @pattern_type_repr ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+pattern_type_repr_type_reprs(
+  int id: @pattern_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+token_tree_meta(
+  unique int id: @token_tree_meta
+);
+
+#keyset[id]
+token_tree_meta_paths(
+  int id: @token_tree_meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+token_tree_meta_token_trees(
+  int id: @token_tree_meta ref,
+  int token_tree: @token_tree ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+unsafe_meta(
+  unique int id: @unsafe_meta
+);
+
+#keyset[id]
+unsafe_meta_is_unsafe(
+  int id: @unsafe_meta ref
+);
+
+#keyset[id]
+unsafe_meta_meta(
+  int id: @unsafe_meta ref,
+  int meta: @meta ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_const_args(
+  int id: @variant ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+#keyset[id]
+block_expr_try_block_modifiers(
+  int id: @block_expr ref,
+  int try_block_modifier: @try_block_modifier ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_trait_ties(
+  int id: @impl ref,
+  int trait_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_impl_restrictions(
+  int id: @trait ref,
+  int impl_restriction: @impl_restriction ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/upgrade.properties b/rust/ql/lib/upgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/upgrade.properties
new file mode 100644
index 000000000000..2cd62911a238
--- /dev/null
+++ b/rust/ql/lib/upgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/upgrade.properties
@@ -0,0 +1,13 @@
+description: Update rust-analyzer to 0.0.347
+compatibility: partial
+
+visibility_inners.rel: run upgrade.ql new_visibility_inners
+visibility_visibility_inners.rel: run upgrade.ql new_visibility_visibility_inners
+visibility_inner_paths.rel: run upgrade.ql new_visibility_inner_paths
+visibility_paths.rel: delete
+
+names.rel: run upgrade.ql new_names
+format_args_arg_names.rel: run upgrade.ql new_format_args_arg_names
+format_args_arg_arg_names.rel: delete
+
+locatable_locations.rel: run upgrade.ql new_locatable_locations
diff --git a/rust/ql/lib/upgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/upgrade.ql b/rust/ql/lib/upgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/upgrade.ql
new file mode 100644
index 000000000000..b96a8fd33b88
--- /dev/null
+++ b/rust/ql/lib/upgrades/ed6b1d3d51401eafee5e4b24e1093d731309ac94/upgrade.ql
@@ -0,0 +1,53 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+// The old schema stored a visibility's path directly on the `Visibility`. The new schema inserts a
+// genuinely-new `VisibilityInner` node between `Visibility` and its path, so we synthesise one per
+// visibility that has a path, reusing the visibility's location.
+newtype TSynth = TVisibilityInner(Element visibility) { visibility_paths(visibility, _) }
+
+module Fresh = QlBuiltins::NewEntity<TSynth>;
+
+class TNewElement = @element or Fresh::EntityId;
+
+class NewElement extends TNewElement {
+  string toString() { none() }
+}
+
+query predicate new_visibility_inners(Fresh::EntityId id) { id = Fresh::map(TVisibilityInner(_)) }
+
+query predicate new_visibility_visibility_inners(Element visibility, Fresh::EntityId inner) {
+  inner = Fresh::map(TVisibilityInner(visibility))
+}
+
+query predicate new_visibility_inner_paths(Fresh::EntityId inner, Element path) {
+  exists(Element visibility |
+    inner = Fresh::map(TVisibilityInner(visibility)) and
+    visibility_paths(visibility, path)
+  )
+}
+
+// The old schema represented a format argument's name as a dedicated text-less
+// `@format_args_arg_name` placeholder (entity table `format_args_arg_names`, linked to the arg via
+// `format_args_arg_arg_names`). The new schema uses a regular `@name` node instead, so we repurpose
+// the placeholder ids as `@name`s by adding them to `names`. They carry no text; re-extraction
+// recovers it.
+query predicate new_names(Element id) { names(id) or format_args_arg_names(id) }
+
+query predicate new_format_args_arg_names(Element arg, Element name) {
+  format_args_arg_arg_names(arg, name)
+}
+
+query predicate new_locatable_locations(NewElement id, Location location) {
+  locatable_locations(id, location)
+  or
+  exists(Element visibility |
+    id = Fresh::map(TVisibilityInner(visibility)) and
+    locatable_locations(visibility, location)
+  )
+}
diff --git a/rust/ql/lib/utils/test/InlineExpectationsTestQuery.ql b/rust/ql/lib/utils/test/InlineExpectationsTestQuery.ql
index e5821ba4f50c..d97f49cb382f 100644
--- a/rust/ql/lib/utils/test/InlineExpectationsTestQuery.ql
+++ b/rust/ql/lib/utils/test/InlineExpectationsTestQuery.ql
@@ -6,16 +6,4 @@ private import rust
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>
diff --git a/rust/ql/lib/utils/test/InlineFlowTest.qll b/rust/ql/lib/utils/test/InlineFlowTest.qll
index 704172b95bd9..2b43ed49bf87 100644
--- a/rust/ql/lib/utils/test/InlineFlowTest.qll
+++ b/rust/ql/lib/utils/test/InlineFlowTest.qll
@@ -29,6 +29,21 @@ private module FlowTestImpl implements InputSig<Location, RustDataFlow> {
     any(CallExpr call | callTargetName(call, "sink")).getASyntacticArgument() = sink.asExpr()
   }
 
+  private string getSummaryNodeArgString(AstNode n) {
+    exists(Call call |
+      n = call
+      or
+      not n instanceof Call and
+      n = call.getASyntacticArgument() // `n` is a callback
+    |
+      result = call.getPositionalArgument(0).toString()
+    )
+    or
+    result = n.(Call).getPositionalArgument(0).toString()
+    or
+    result = n.(Param).getPat().(IdentPat).getName().getText()
+  }
+
   private string getSourceArgString(DataFlow::Node src) {
     defaultSource(src) and
     exists(Expr arg | arg = src.asExpr().(Call).getPositionalArgument(0) |
@@ -38,9 +53,11 @@ private module FlowTestImpl implements InputSig<Location, RustDataFlow> {
       result = arg.(ArrayListExpr).getExpr(0).toString()
     )
     or
-    sourceNode(src, _) and
-    result =
-      src.(Node::FlowSummaryNode).getSourceElement().getCall().getPositionalArgument(0).toString() and
+    exists(AstNode n |
+      sourceNode(src, _) and
+      n = src.(Node::FlowSummaryNode).getSummaryNode().getSourceSinkReportingElement() and
+      result = getSummaryNodeArgString(n)
+    ) and
     // Don't use the result if it contains spaces
     not result.matches("% %")
   }
diff --git a/rust/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll b/rust/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
index c189e1c7e80e..5dc1dbaeb03d 100644
--- a/rust/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/rust/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
@@ -11,4 +11,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = R::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(R::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }
diff --git a/rust/ql/src/CHANGELOG.md b/rust/ql/src/CHANGELOG.md
index 1732a4853b12..4488024c245b 100644
--- a/rust/ql/src/CHANGELOG.md
+++ b/rust/ql/src/CHANGELOG.md
@@ -1,3 +1,39 @@
+## 0.1.46
+
+No user-facing changes.
+
+## 0.1.45
+
+No user-facing changes.
+
+## 0.1.44
+
+No user-facing changes.
+
+## 0.1.43
+
+No user-facing changes.
+
+## 0.1.42
+
+### New Queries
+
+* Added a new query, `rust/command-line-injection`, to detect uncontrolled command lines.
+
+### Minor Analysis Improvements
+
+* The `rust/hard-coded-cryptographic-value` query has been adjusted to produce
+fewer results in certain situations where many results were being produced with very similar source locations.
+* The `rust/unused-variable` query no longer reports variables in functions containing the standard `todo!()` or `unimplemented!()` macros.
+
+## 0.1.41
+
+No user-facing changes.
+
+## 0.1.40
+
+No user-facing changes.
+
 ## 0.1.39
 
 No user-facing changes.
diff --git a/rust/ql/src/change-notes/2026-08-11-unsafe-deserialization.md b/rust/ql/src/change-notes/2026-08-11-unsafe-deserialization.md
new file mode 100644
index 000000000000..6e78b9a8606a
--- /dev/null
+++ b/rust/ql/src/change-notes/2026-08-11-unsafe-deserialization.md
@@ -0,0 +1,4 @@
+---
+category: newQuery
+---
+* Added a new query, `rust/unsafe-deserialization`, to detect deserialization of user-controlled data.
diff --git a/rust/ql/src/change-notes/released/0.1.40.md b/rust/ql/src/change-notes/released/0.1.40.md
new file mode 100644
index 000000000000..f7aacd7a077e
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.40.md
@@ -0,0 +1,3 @@
+## 0.1.40
+
+No user-facing changes.
diff --git a/rust/ql/src/change-notes/released/0.1.41.md b/rust/ql/src/change-notes/released/0.1.41.md
new file mode 100644
index 000000000000..023c4889f070
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.41.md
@@ -0,0 +1,3 @@
+## 0.1.41
+
+No user-facing changes.
diff --git a/rust/ql/src/change-notes/released/0.1.42.md b/rust/ql/src/change-notes/released/0.1.42.md
new file mode 100644
index 000000000000..617d6a48de02
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.42.md
@@ -0,0 +1,11 @@
+## 0.1.42
+
+### New Queries
+
+* Added a new query, `rust/command-line-injection`, to detect uncontrolled command lines.
+
+### Minor Analysis Improvements
+
+* The `rust/hard-coded-cryptographic-value` query has been adjusted to produce
+fewer results in certain situations where many results were being produced with very similar source locations.
+* The `rust/unused-variable` query no longer reports variables in functions containing the standard `todo!()` or `unimplemented!()` macros.
diff --git a/rust/ql/src/change-notes/released/0.1.43.md b/rust/ql/src/change-notes/released/0.1.43.md
new file mode 100644
index 000000000000..d398bbdfcd6c
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.43.md
@@ -0,0 +1,3 @@
+## 0.1.43
+
+No user-facing changes.
diff --git a/rust/ql/src/change-notes/released/0.1.44.md b/rust/ql/src/change-notes/released/0.1.44.md
new file mode 100644
index 000000000000..63fb6aebea79
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.44.md
@@ -0,0 +1,3 @@
+## 0.1.44
+
+No user-facing changes.
diff --git a/rust/ql/src/change-notes/released/0.1.45.md b/rust/ql/src/change-notes/released/0.1.45.md
new file mode 100644
index 000000000000..ed391d81b27d
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.45.md
@@ -0,0 +1,3 @@
+## 0.1.45
+
+No user-facing changes.
diff --git a/rust/ql/src/change-notes/released/0.1.46.md b/rust/ql/src/change-notes/released/0.1.46.md
new file mode 100644
index 000000000000..b77394641b83
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.46.md
@@ -0,0 +1,3 @@
+## 0.1.46
+
+No user-facing changes.
diff --git a/rust/ql/src/codeql-pack.release.yml b/rust/ql/src/codeql-pack.release.yml
index 2ae59ee1c0ae..4058070c89ec 100644
--- a/rust/ql/src/codeql-pack.release.yml
+++ b/rust/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.39
+lastReleaseVersion: 0.1.46
diff --git a/rust/ql/src/qlpack.yml b/rust/ql/src/qlpack.yml
index 74a67365b1da..b47ffadb209e 100644
--- a/rust/ql/src/qlpack.yml
+++ b/rust/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-queries
-version: 0.1.40-dev
+version: 0.1.47-dev
 groups:
   - rust
   - queries
diff --git a/rust/ql/src/queries/security/CWE-078/CommandInjection.qhelp b/rust/ql/src/queries/security/CWE-078/CommandInjection.qhelp
new file mode 100644
index 000000000000..3e7b336090b4
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-078/CommandInjection.qhelp
@@ -0,0 +1,40 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+
+<p>
+If a system command is built from user-provided data without sufficient sanitization, a user may be able to run malicious commands. An attacker can craft input to change the meaning of the command, potentially gaining control of the system.
+</p>
+
+</overview>
+<recommendation>
+
+<p>
+If possible, use hard-coded string literals for commands. If the command must be built from user-provided data, do not pass user input directly to shell commands. Instead, use APIs that accept command arguments as separate parameters (such as <code>std::process::Command</code> with individual <code>.arg()</code> calls for each argument), which avoids shell interpretation of special characters. If shell execution is necessary, validate and sanitize user input against an allowlist of permitted values.
+</p>
+
+</recommendation>
+<example>
+
+<p>
+In the following example, a command is constructed directly from user-controlled input obtained via an HTTP request. An attacker could supply a malicious value to execute arbitrary commands.
+</p>
+
+<sample src="CommandInjectionBad.rs" />
+
+<p>
+A safer approach uses a fixed command with validated arguments, or avoids shell interpretation entirely:
+</p>
+
+<sample src="CommandInjectionGood.rs" />
+
+</example>
+<references>
+
+<li>OWASP: <a href="https://owasp.org/www-community/attacks/Command_Injection">Command Injection</a>.</li>
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Code_injection#Shell_injection">Shell injection</a>.</li>
+
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/security/CWE-078/CommandInjection.ql b/rust/ql/src/queries/security/CWE-078/CommandInjection.ql
new file mode 100644
index 000000000000..b6e93a8d88a1
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-078/CommandInjection.ql
@@ -0,0 +1,42 @@
+/**
+ * @name Uncontrolled command line
+ * @description Using externally controlled strings in a command line may allow a malicious
+ *              user to change the meaning of the command.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 9.8
+ * @precision high
+ * @id rust/command-line-injection
+ * @tags security
+ *       external/cwe/cwe-078
+ *       external/cwe/cwe-088
+ */
+
+import rust
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.dataflow.TaintTracking
+import codeql.rust.security.CommandInjectionExtensions
+
+/**
+ * A taint configuration for detecting command injection vulnerabilities.
+ */
+module CommandInjectionConfig implements DataFlow::ConfigSig {
+  import CommandInjection
+
+  predicate isSource(DataFlow::Node node) { node instanceof Source }
+
+  predicate isSink(DataFlow::Node node) { node instanceof Sink }
+
+  predicate isBarrier(DataFlow::Node barrier) { barrier instanceof Barrier }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+}
+
+module CommandInjectionFlow = TaintTracking::Global<CommandInjectionConfig>;
+
+import CommandInjectionFlow::PathGraph
+
+from CommandInjectionFlow::PathNode sourceNode, CommandInjectionFlow::PathNode sinkNode
+where CommandInjectionFlow::flowPath(sourceNode, sinkNode)
+select sinkNode.getNode(), sourceNode, sinkNode, "This command line depends on a $@.",
+  sourceNode.getNode(), "user-provided value"
diff --git a/rust/ql/src/queries/security/CWE-078/CommandInjectionBad.rs b/rust/ql/src/queries/security/CWE-078/CommandInjectionBad.rs
new file mode 100644
index 000000000000..fa81cef9fe15
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-078/CommandInjectionBad.rs
@@ -0,0 +1,10 @@
+use std::process::Command;
+
+fn handle_request(user_input: &str) {
+    // BAD: user input is passed directly to a shell command
+    Command::new("sh")
+        .arg("-c")
+        .arg(user_input)
+        .output()
+        .expect("failed to execute");
+}
diff --git a/rust/ql/src/queries/security/CWE-078/CommandInjectionGood.rs b/rust/ql/src/queries/security/CWE-078/CommandInjectionGood.rs
new file mode 100644
index 000000000000..9892c47fda21
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-078/CommandInjectionGood.rs
@@ -0,0 +1,12 @@
+use std::process::Command;
+
+fn handle_request(filename: &str) {
+    // GOOD: user input is checked against an allowlist before passing into a shell command
+    let allowed_names = ["report.pdf", "summary.txt", "data.csv"];
+    if allowed_names.contains(&filename) {
+        Command::new("cat")
+            .arg(filename)
+            .output()
+            .expect("failed to execute");
+    }
+}
diff --git a/rust/ql/src/queries/security/CWE-502/UnsafeDeserialization.qhelp b/rust/ql/src/queries/security/CWE-502/UnsafeDeserialization.qhelp
new file mode 100644
index 000000000000..be4ec5fc583e
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-502/UnsafeDeserialization.qhelp
@@ -0,0 +1,49 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+
+<p>
+Deserializing untrusted data without validation can allow an attacker to cause denial of service, consume excessive resources, or in some cases execute arbitrary code. Rust's memory safety mitigates some risks, but deserializing untrusted data with libraries like<code>serde</code>, <code>bincode</code>, or <code>rmp-serde</code> can still lead to panics, excessive memory allocation, or logic bugs. This is especially true when trait objects or polymorphic types are involved.
+
+</p>
+
+</overview>
+<recommendation>
+
+<p>
+
+Avoid deserializing untrusted data with formats that allow unbounded allocation or polymorphic dispatch. Where possible, prefer formats with schema validation, such as Protocol Buffers, when processing untrusted input.
+If you do use <code>serde</code>, consider:
+
+</p>
+<ul>
+<li>Validating input size before deserialization.</li>
+<li>Using <code>#[serde(deny_unknown_fields)]</code> to reject unexpected data.</li>
+<li>Avoiding <code>#[typetag]</code> or trait object deserialization with untrusted input.</li>
+<li>Using bounded containers (e.g., limiting <code>Vec</code> length via custom deserializers).</li>
+</ul>
+
+</recommendation>
+<example>
+
+<p>
+In the following example, data from an HTTP request is directly deserialized without any validation. An attacker could send a crafted payload that causes excessive memory allocation or other unintended behavior.
+</p>
+
+<sample src="UnsafeDeserializationBad.rs" />
+
+<p>
+A safer approach validates the input size and uses strict deserialization settings:
+</p>
+
+<sample src="UnsafeDeserializationGood.rs" />
+
+</example>
+<references>
+
+<li>OWASP: <a href="https://community.owasp.org/vulnerabilities/Deserialization_of_untrusted_data">Deserialization of untrusted data</a>.</li>
+
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/security/CWE-502/UnsafeDeserialization.ql b/rust/ql/src/queries/security/CWE-502/UnsafeDeserialization.ql
new file mode 100644
index 000000000000..9b1a824c540c
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-502/UnsafeDeserialization.ql
@@ -0,0 +1,42 @@
+/**
+ * @name Deserialization of user-controlled data
+ * @description Deserializing user-controlled data without validation can cause a denial of service and, in some cases, arbitrary code execution.
+ *              code execution, denial of service, or other harmful effects.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 9.8
+ * @precision high
+ * @id rust/unsafe-deserialization
+ * @tags security
+ *       external/cwe/cwe-502
+ */
+
+import rust
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.dataflow.TaintTracking
+import codeql.rust.security.UnsafeDeserializationExtensions
+
+/**
+ * A taint configuration for detecting unsafe deserialization vulnerabilities.
+ */
+module UnsafeDeserializationConfig implements DataFlow::ConfigSig {
+  import UnsafeDeserialization
+
+  predicate isSource(DataFlow::Node node) { node instanceof Source }
+
+  predicate isSink(DataFlow::Node node) { node instanceof Sink }
+
+  predicate isBarrier(DataFlow::Node barrier) { barrier instanceof Barrier }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+}
+
+module UnsafeDeserializationFlow = TaintTracking::Global<UnsafeDeserializationConfig>;
+
+import UnsafeDeserializationFlow::PathGraph
+
+from UnsafeDeserializationFlow::PathNode sourceNode, UnsafeDeserializationFlow::PathNode sinkNode
+where UnsafeDeserializationFlow::flowPath(sourceNode, sinkNode)
+select sinkNode.getNode(), sourceNode, sinkNode,
+  "This deserialization operation processes $@ without validation.", sourceNode.getNode(),
+  "user-provided data"
diff --git a/rust/ql/src/queries/security/CWE-502/UnsafeDeserializationBad.rs b/rust/ql/src/queries/security/CWE-502/UnsafeDeserializationBad.rs
new file mode 100644
index 000000000000..8e4f2c6b2c0a
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-502/UnsafeDeserializationBad.rs
@@ -0,0 +1,12 @@
+use serde::Deserialize;
+
+#[derive(Deserialize)]
+struct UserData {
+    name: String,
+    items: Vec<String>,
+}
+
+fn handle_request(body: &[u8]) -> UserData {
+    // BAD: deserializing user-controlled data without size validation
+    serde_json::from_slice(body).unwrap()
+}
diff --git a/rust/ql/src/queries/security/CWE-502/UnsafeDeserializationGood.rs b/rust/ql/src/queries/security/CWE-502/UnsafeDeserializationGood.rs
new file mode 100644
index 000000000000..a7d69fb48a56
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-502/UnsafeDeserializationGood.rs
@@ -0,0 +1,30 @@
+use serde::Deserialize;
+
+const MAX_BODY_SIZE: usize = 1024 * 1024; // 1 MB limit
+
+#[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
+struct UserData {
+    name: String,
+    #[serde(deserialize_with = "bounded_vec")]
+    items: Vec<String>,
+}
+
+fn bounded_vec<'de, D>(deserializer: D) -> Result<Vec<String>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let v = Vec::<String>::deserialize(deserializer)?;
+    if v.len() > 100 {
+        return Err(serde::de::Error::custom("too many items"));
+    }
+    Ok(v)
+}
+
+fn handle_request(body: &[u8]) -> Result<UserData, String> {
+    // GOOD: validate input size before deserialization, use bounded containers
+    if body.len() > MAX_BODY_SIZE {
+        return Err("payload too large".to_string());
+    }
+    serde_json::from_slice(body).map_err(|e| e.to_string())
+}
diff --git a/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql b/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql
index 7a206856adf8..a45f4fb0209d 100644
--- a/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql
+++ b/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql
@@ -20,7 +20,7 @@ class CtorAttr extends Attr {
   string whichAttr;
 
   CtorAttr() {
-    whichAttr = this.getMeta().getPath().getText() and
+    whichAttr = this.getMeta().getMetaPath().getText() and
     whichAttr = ["ctor", "dtor"]
   }
 
diff --git a/rust/ql/src/queries/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
index 36eeb0df4ef4..861aedfe6cc0 100644
--- a/rust/ql/src/queries/summary/Stats.qll
+++ b/rust/ql/src/queries/summary/Stats.qll
@@ -33,6 +33,7 @@ private import codeql.rust.security.UncontrolledAllocationSizeExtensions
 private import codeql.rust.security.UseOfHttpExtensions
 private import codeql.rust.security.WeakSensitiveDataHashingExtensions
 private import codeql.rust.security.XssExtensions
+private import codeql.rust.security.UnsafeDeserializationExtensions
 
 /**
  * Gets a count of the total number of lines of code in the database.
@@ -131,7 +132,8 @@ predicate extractionStats(string key, int value) {
   key = "Extraction warnings" and
   value = count(ExtractionWarning w | not exists(w.getLocation()) or w.getLocation().fromSource())
   or
-  key = "Files extracted - total" and value = count(ExtractedFile f | exists(f.getRelativePath()))
+  key = "Files extracted - total user" and
+  value = count(ExtractedFile f | exists(f.getRelativePath()))
   or
   key = "Files extracted - with errors" and
   value =
@@ -160,6 +162,13 @@ predicate extractionStats(string key, int value) {
   value = count(MacroCall mc | mc.fromSource() and not mc.hasMacroCallExpansion())
 }
 
+/**
+ * Gets further summary statistics about extraction.
+ */
+predicate extractionStatsExtra(string key, int value) {
+  key = "Files extracted - total" and value = count(File f)
+}
+
 /**
  * Gets summary statistics about inconsistencies.
  */
diff --git a/rust/ql/src/queries/summary/SummaryStats.ql b/rust/ql/src/queries/summary/SummaryStats.ql
index 47a2c91a9eda..adfd302d0f8b 100644
--- a/rust/ql/src/queries/summary/SummaryStats.ql
+++ b/rust/ql/src/queries/summary/SummaryStats.ql
@@ -15,6 +15,8 @@ where
   or
   extractionStats(key, value)
   or
+  extractionStatsExtra(key, value)
+  or
   inconsistencyStats(key, value)
   or
   typeInferenceInconsistencyStats(key, value)
diff --git a/rust/ql/src/queries/unusedentities/UnusedVariable.qll b/rust/ql/src/queries/unusedentities/UnusedVariable.qll
index 744af559dd2a..22070162d78a 100644
--- a/rust/ql/src/queries/unusedentities/UnusedVariable.qll
+++ b/rust/ql/src/queries/unusedentities/UnusedVariable.qll
@@ -1,4 +1,5 @@
 import rust
+private import codeql.rust.internal.PathResolution
 
 /**
  * A deliberately unused variable, for example `_` or `_x`.
@@ -23,9 +24,13 @@ predicate isUnused(Variable v) {
  */
 class IncompleteCallable extends Callable {
   IncompleteCallable() {
-    exists(MacroExpr me |
-      me.getEnclosingCallable() = this and
+    exists(MacroExpr me | me.getEnclosingCallable() = this |
       not me.getMacroCall().hasMacroCallExpansion()
+      or
+      exists(ItemNode i |
+        i.getCanonicalPath(_) = ["core::macros::unimplemented", "core::macros::todo"] and
+        me.getMacroCall().resolveMacro() = i
+      )
     )
   }
 }
diff --git a/rust/ql/test/.gitignore b/rust/ql/test/.gitignore
index 29291fe2d12c..9ea6b0797852 100644
--- a/rust/ql/test/.gitignore
+++ b/rust/ql/test/.gitignore
@@ -6,4 +6,3 @@ Cargo.toml
 lib.rs
 .proc_macro/
 .lib/
-
diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
index cfdb7fc723b0..4950c4652e51 100644
--- a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
+++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
@@ -3,18 +3,20 @@
 | {EXTERNAL LOCATION} | fn trim | <core::str>::trim |
 | lib.rs:1:1:1:18 | mod anonymous | test::anonymous |
 | lib.rs:2:1:2:16 | mod regular | test::regular |
+| regular.rs:1:1:2:18 | fn eq | <test::regular::Struct as core::cmp::PartialEq>::eq |
+| regular.rs:1:1:2:18 | impl ...::Eq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::Eq> |
+| regular.rs:1:1:2:18 | impl ...::PartialEq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::PartialEq> |
 | regular.rs:1:1:2:18 | struct Struct | test::regular::Struct |
-| regular.rs:2:12:2:17 | fn eq | <test::regular::Struct as core::cmp::PartialEq>::eq |
-| regular.rs:2:12:2:17 | impl ...::Eq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::Eq> |
-| regular.rs:2:12:2:17 | impl ...::PartialEq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::PartialEq> |
 | regular.rs:4:1:6:1 | trait Trait | test::regular::Trait |
-| regular.rs:5:5:5:16 | fn f | <_ as test::regular::Trait>::f |
+| regular.rs:5:5:5:16 | fn f | <test::regular::Trait>::f |
 | regular.rs:8:1:10:1 | impl Trait for Struct { ... } | <test::regular::Struct as test::regular::Trait> |
 | regular.rs:9:5:9:18 | fn f | <test::regular::Struct as test::regular::Trait>::f |
 | regular.rs:12:1:14:1 | impl Struct { ... } | <test::regular::Struct> |
 | regular.rs:13:5:13:18 | fn g | <test::regular::Struct>::g |
 | regular.rs:16:1:18:1 | trait TraitWithBlanketImpl | test::regular::TraitWithBlanketImpl |
-| regular.rs:17:5:17:16 | fn h | <_ as test::regular::TraitWithBlanketImpl>::h |
+| regular.rs:17:5:17:16 | fn h | <test::regular::TraitWithBlanketImpl>::h |
+| regular.rs:20:1:22:1 | impl TraitWithBlanketImpl for T { ... } | <_ as test::regular::TraitWithBlanketImpl> |
+| regular.rs:21:5:21:18 | fn h | <_ as test::regular::TraitWithBlanketImpl>::h |
 | regular.rs:24:1:24:12 | fn free | test::regular::free |
 | regular.rs:26:1:32:1 | fn usage | test::regular::usage |
 | regular.rs:34:1:38:1 | enum MyEnum | test::regular::MyEnum |
@@ -27,6 +29,6 @@
 | regular.rs:66:5:66:40 | fn is_alphanum | test::regular::is_alphanum |
 | regular.rs:69:1:71:1 | fn is_number_or_letter | test::regular::is_number_or_letter |
 | regular.rs:73:1:75:1 | trait Abs | test::regular::Abs |
-| regular.rs:74:5:74:25 | fn abs | <_ as test::regular::Abs>::abs |
+| regular.rs:74:5:74:25 | fn abs | <test::regular::Abs>::abs |
 | regular.rs:77:1:85:1 | impl Abs for i32 { ... } | <core::i32 as test::regular::Abs> |
 | regular.rs:78:5:84:5 | fn abs | <core::i32 as test::regular::Abs>::abs |
diff --git a/rust/ql/test/extractor-tests/crate_graph/crates.expected b/rust/ql/test/extractor-tests/crate_graph/crates.expected
index f4bd0ae031ba..1f9dfe24c2ed 100644
--- a/rust/ql/test/extractor-tests/crate_graph/crates.expected
+++ b/rust/ql/test/extractor-tests/crate_graph/crates.expected
@@ -17,7 +17,7 @@
 #-----| std -> Crate(std@0.0.0)
 #-----| test -> Crate(test@0.0.0)
 
-#-----| Crate(cfg_if@1.0.1)
+#-----| Crate(cfg_if@1.0.4)
 #-----| core -> Crate(core@0.0.0)
 
 #-----| Crate(compiler_builtins@0.1.160)
@@ -43,6 +43,8 @@
 #-----| block_buffer -> Crate(block_buffer@0.10.4)
 #-----| crypto_common -> Crate(crypto_common@0.1.6)
 
+#-----| Crate(foldhash@0.2.0)
+
 #-----| Crate(generic_array@0.14.7)
 #-----| proc_macro -> Crate(proc_macro@0.0.0)
 #-----| alloc -> Crate(alloc@0.0.0)
@@ -51,16 +53,16 @@
 #-----| test -> Crate(test@0.0.0)
 #-----| typenum -> Crate(typenum@1.18.0)
 
-#-----| Crate(getopts@0.2.23)
+#-----| Crate(getopts@0.2.24)
 #-----| core -> Crate(core@0.0.0)
 #-----| std -> Crate(std@0.0.0)
-#-----| unicode_width -> Crate(unicode_width@0.2.1)
 
-#-----| Crate(hashbrown@0.15.4)
+#-----| Crate(hashbrown@0.17.1)
 #-----| alloc -> Crate(alloc@0.0.0)
 #-----| core -> Crate(core@0.0.0)
+#-----| foldhash -> Crate(foldhash@0.2.0)
 
-#-----| Crate(libc@0.2.174)
+#-----| Crate(libc@0.2.189)
 #-----| rustc_std_workspace_core -> Crate(core@0.0.0)
 
 main.rs:
@@ -96,55 +98,52 @@ main.rs:
 #-----| Crate(panic_unwind@0.0.0)
 #-----| alloc -> Crate(alloc@0.0.0)
 #-----| core -> Crate(core@0.0.0)
-#-----| cfg_if -> Crate(cfg_if@1.0.1)
-#-----| libc -> Crate(libc@0.2.174)
+#-----| libc -> Crate(libc@0.2.189)
 #-----| unwind -> Crate(unwind@0.0.0)
 
 #-----| Crate(proc_macro@0.0.0)
 #-----| core -> Crate(core@0.0.0)
 #-----| std -> Crate(std@0.0.0)
-#-----| rustc_literal_escaper -> Crate(rustc_literal_escaper@0.0.5)
+#-----| rustc_literal_escaper -> Crate(rustc_literal_escaper@0.0.8)
 
-#-----| Crate(rand@0.9.2)
-#-----| rand_core -> Crate(rand_core@0.9.3)
+#-----| Crate(rand@0.9.5)
+#-----| rand_core -> Crate(rand_core@0.9.5)
 
-#-----| Crate(rand_core@0.9.3)
+#-----| Crate(rand_core@0.9.5)
 
 #-----| Crate(rand_xorshift@0.4.0)
-#-----| rand_core -> Crate(rand_core@0.9.3)
+#-----| rand_core -> Crate(rand_core@0.9.5)
 
-#-----| Crate(rustc_demangle@0.1.25)
+#-----| Crate(rustc_demangle@0.1.28)
 #-----| core -> Crate(core@0.0.0)
 
-#-----| Crate(rustc_literal_escaper@0.0.5)
+#-----| Crate(rustc_literal_escaper@0.0.8)
 #-----| core -> Crate(core@0.0.0)
-#-----| std -> Crate(std@0.0.0)
 
 #-----| Crate(std@0.0.0)
 #-----| alloc -> Crate(alloc@0.0.0)
 #-----| core -> Crate(core@0.0.0)
-#-----| cfg_if -> Crate(cfg_if@1.0.1)
-#-----| hashbrown -> Crate(hashbrown@0.15.4)
-#-----| libc -> Crate(libc@0.2.174)
-#-----| rand -> Crate(rand@0.9.2)
-#-----| rand_xorshift -> Crate(rand_xorshift@0.4.0)
-#-----| rustc_demangle -> Crate(rustc_demangle@0.1.25)
 #-----| panic_abort -> Crate(panic_abort@0.0.0)
+#-----| libc -> Crate(libc@0.2.189)
 #-----| unwind -> Crate(unwind@0.0.0)
 #-----| panic_unwind -> Crate(panic_unwind@0.0.0)
 #-----| std_detect -> Crate(std_detect@0.1.5)
+#-----| cfg_if -> Crate(cfg_if@1.0.4)
+#-----| hashbrown -> Crate(hashbrown@0.17.1)
+#-----| rand -> Crate(rand@0.9.5)
+#-----| rand_xorshift -> Crate(rand_xorshift@0.4.0)
+#-----| rustc_demangle -> Crate(rustc_demangle@0.1.28)
 
 #-----| Crate(std_detect@0.1.5)
 #-----| alloc -> Crate(alloc@0.0.0)
 #-----| core -> Crate(core@0.0.0)
-#-----| cfg_if -> Crate(cfg_if@1.0.1)
-#-----| libc -> Crate(libc@0.2.174)
+#-----| libc -> Crate(libc@0.2.189)
 
 #-----| Crate(test@0.0.0)
 #-----| core -> Crate(core@0.0.0)
 #-----| std -> Crate(std@0.0.0)
-#-----| getopts -> Crate(getopts@0.2.23)
-#-----| libc -> Crate(libc@0.2.174)
+#-----| libc -> Crate(libc@0.2.189)
+#-----| getopts -> Crate(getopts@0.2.24)
 
 lib.rs:
 #    0| Crate(test@0.0.1)
@@ -163,14 +162,9 @@ lib.rs:
 #-----| std -> Crate(std@0.0.0)
 #-----| test -> Crate(test@0.0.0)
 
-#-----| Crate(unicode_width@0.2.1)
-#-----| core -> Crate(core@0.0.0)
-#-----| std -> Crate(std@0.0.0)
-
 #-----| Crate(unwind@0.0.0)
 #-----| core -> Crate(core@0.0.0)
-#-----| cfg_if -> Crate(cfg_if@1.0.1)
-#-----| libc -> Crate(libc@0.2.174)
+#-----| libc -> Crate(libc@0.2.189)
 
 #-----| Crate(version_check@0.9.5)
 #-----| proc_macro -> Crate(proc_macro@0.0.0)
diff --git a/rust/ql/test/extractor-tests/generated/.generated_tests.list b/rust/ql/test/extractor-tests/generated/.generated_tests.list
index 0d23450af31f..85068306a94c 100644
--- a/rust/ql/test/extractor-tests/generated/.generated_tests.list
+++ b/rust/ql/test/extractor-tests/generated/.generated_tests.list
@@ -25,13 +25,17 @@ BoxPat/gen_box_pat.rs 1493e24b732370b577ade38c47db17fa157df19f5390606a67a6040e49
 BreakExpr/gen_break_expr.rs aacdf9df7fc51d19742b9e813835c0bd0913017e8d62765960e06b27d58b9031 aacdf9df7fc51d19742b9e813835c0bd0913017e8d62765960e06b27d58b9031
 CallExpr/gen_call_expr.rs 228705e9b0c46d34aa035da3c139a8c3e93fb144d3310592d5bad38ac97382c2 228705e9b0c46d34aa035da3c139a8c3e93fb144d3310592d5bad38ac97382c2
 CastExpr/gen_cast_expr.rs c3892211fbae4fed7cb1f25ff1679fd79d2878bf0bf2bd4b7982af23d00129f5 c3892211fbae4fed7cb1f25ff1679fd79d2878bf0bf2bd4b7982af23d00129f5
+CfgPredExpr/gen_cfg_pred_expr.rs fd4a01de87225132c7c6de4d0014a2dc56ab253697464c9da7a16213a5c3fe5b fd4a01de87225132c7c6de4d0014a2dc56ab253697464c9da7a16213a5c3fe5b
+CfgPredPat/gen_cfg_pred_pat.rs a764f03c829993cb7fa3791c67cd0cdd394983486a3c86d75ced251658cc8b5a a764f03c829993cb7fa3791c67cd0cdd394983486a3c86d75ced251658cc8b5a
 ClosureExpr/gen_closure_expr.rs bd95408103b7f2084e526e6d35cf3319b2e9d7219aff4c80e4e6691180c549b4 bd95408103b7f2084e526e6d35cf3319b2e9d7219aff4c80e4e6691180c549b4
-Comment/gen_comment.rs 1e1f9f43161a79c096c2056e8b7f5346385ab7addcdec68c2d53b383dd3debe6 1e1f9f43161a79c096c2056e8b7f5346385ab7addcdec68c2d53b383dd3debe6
+Comment/gen_comment.rs cfe4ffad0c027a138894f6730e754ece90e0ecd38efc8d893aba966024d6153b cfe4ffad0c027a138894f6730e754ece90e0ecd38efc8d893aba966024d6153b
 Const/gen_const.rs a3b971134a4204d0da12563fcefa9ab72f3f2f2e957e82b70c8548b5807f375f a3b971134a4204d0da12563fcefa9ab72f3f2f2e957e82b70c8548b5807f375f
 ConstArg/gen_const_arg.rs 6a15d099c61ffa814e8e0e0fca2d8ff481d73ad81959064e0a214d3172a9d49e 6a15d099c61ffa814e8e0e0fca2d8ff481d73ad81959064e0a214d3172a9d49e
 ConstBlockPat/gen_const_block_pat.rs 7e3057cd24d22e752354369cf7e08e9536642812c0947b36aa5d8290a45476fd 7e3057cd24d22e752354369cf7e08e9536642812c0947b36aa5d8290a45476fd
 ConstParam/gen_const_param.rs 71f22d907b0011dafc333f37635f0ee5b1eef2313b5a26cd2a21508a8e96c19a 71f22d907b0011dafc333f37635f0ee5b1eef2313b5a26cd2a21508a8e96c19a
 ContinueExpr/gen_continue_expr.rs 63840dcd8440aaf1b96b713b80eb2b56acb1639d3200b3c732b45291a071b5ff 63840dcd8440aaf1b96b713b80eb2b56acb1639d3200b3c732b45291a071b5ff
+DerefPat/gen_deref_pat.rs a9452902f0913a52d4d19abe37d510086897032d5da2517a4e3f75a478f5f77a a9452902f0913a52d4d19abe37d510086897032d5da2517a4e3f75a478f5f77a
+DocComment/gen_doc_comment.rs fe6c28b0d26f396598fc57aea8dcbdba0f9f43eae0d59a833426de8cfc47e299 fe6c28b0d26f396598fc57aea8dcbdba0f9f43eae0d59a833426de8cfc47e299
 DynTraitTypeRepr/gen_dyn_trait_type_repr.rs 1864f3900bdae6f4a0a428e0b2a1266b758dfa8f27059353a639612d8829f4dd 1864f3900bdae6f4a0a428e0b2a1266b758dfa8f27059353a639612d8829f4dd
 Enum/gen_enum.rs 59c6dc0185c6b0dd877ce1b2291d3b8ab05041194b7bfc948e97baa4908605fa 59c6dc0185c6b0dd877ce1b2291d3b8ab05041194b7bfc948e97baa4908605fa
 ExprStmt/gen_expr_stmt.rs 6ce47428a8d33b902c1f14b06cc375d08eff95251e4a81dac2fa51872b7649b1 6ce47428a8d33b902c1f14b06cc375d08eff95251e4a81dac2fa51872b7649b1
@@ -54,6 +58,7 @@ IdentPat/gen_ident_pat.rs 87f9201ca47683ff6f12a0c844c062fdedb6d86546794522d358b1
 IfExpr/gen_if_expr.rs 2df66735394ebb20db29d3fbf2721ad4812afbe8d4614d03f26265c1f481f1e8 2df66735394ebb20db29d3fbf2721ad4812afbe8d4614d03f26265c1f481f1e8
 Impl/gen_impl.rs a3f91dbcbb89f660e1c67eb6211def495cced5ab069515c6151e442365f64899 a3f91dbcbb89f660e1c67eb6211def495cced5ab069515c6151e442365f64899
 ImplTraitTypeRepr/gen_impl_trait_type_repr.rs ebfa4d350ae5759bf7df6adf790d2d892c7a0d708f3340ccf3e12a681cb78f00 ebfa4d350ae5759bf7df6adf790d2d892c7a0d708f3340ccf3e12a681cb78f00
+IncludeBytesExpr/gen_include_bytes_expr.rs d993b5155810929c79b485f270707540cee3cbd24f667962d7279da4a2497548 d993b5155810929c79b485f270707540cee3cbd24f667962d7279da4a2497548
 IndexExpr/gen_index_expr.rs 22d7f81ba43dc63f1f49e21a2c25ce25a1b8f6e8e95e1a66f518f010a4d73c61 22d7f81ba43dc63f1f49e21a2c25ce25a1b8f6e8e95e1a66f518f010a4d73c61
 InferTypeRepr/gen_infer_type_repr.rs cd50eaeffdf16e0e896b14b665590251a4d383c123502ed667d8b1f75000f559 cd50eaeffdf16e0e896b14b665590251a4d383c123502ed667d8b1f75000f559
 ItemList/gen_item_list.rs 5da9f631030568c80aa0b126369990070cebcd1805827a8077320d4bec789a4e 5da9f631030568c80aa0b126369990070cebcd1805827a8077320d4bec789a4e
@@ -78,24 +83,23 @@ MatchArm/gen_match_arm.rs 4f4e717930729b2161b9cf9cd5e2b86b8e919204f5f7d4993d2c4e
 MatchArmList/gen_match_arm_list.rs 6dcb92591c86771d2aeb762e4274d3e61a7d6c1a42da3dbace1cbc545b474080 6dcb92591c86771d2aeb762e4274d3e61a7d6c1a42da3dbace1cbc545b474080
 MatchExpr/gen_match_expr.rs 081c5d4c78cb71ccd13fb37a93d7f525267c51b179f44b5a22ca3297897002a0 081c5d4c78cb71ccd13fb37a93d7f525267c51b179f44b5a22ca3297897002a0
 MatchGuard/gen_match_guard.rs f0e84a1f608c0361983c516a40216cea149620a36e0aed7ff39b0b7d77a9ab8a f0e84a1f608c0361983c516a40216cea149620a36e0aed7ff39b0b7d77a9ab8a
-Meta/gen_meta.rs 39172a1f7dd02fa3149e7a1fc1dc1f135aa87c84057ee721cd9b373517042b25 39172a1f7dd02fa3149e7a1fc1dc1f135aa87c84057ee721cd9b373517042b25
 MethodCallExpr/gen_method_call_expr.rs f696e63c5302f46dcac7bc2914fe899d029996d5064ffe8252cfa173a06f9dd3 f696e63c5302f46dcac7bc2914fe899d029996d5064ffe8252cfa173a06f9dd3
 Module/gen_module.rs 815605a604fea1d9276684f8d6738a4e833eacad57ceeb27e2095fc450264fc1 815605a604fea1d9276684f8d6738a4e833eacad57ceeb27e2095fc450264fc1
 Name/gen_name.rs 8a7fe65ee632a47d12eaa313e7248ac9210e5a381e9522499ca68f94c39e72c0 8a7fe65ee632a47d12eaa313e7248ac9210e5a381e9522499ca68f94c39e72c0
 NameRef/gen_name_ref.rs c8c922e77a7d62b8272359ccdabbf7e15411f31ca85f15a3afdd94bec7ec64e7 c8c922e77a7d62b8272359ccdabbf7e15411f31ca85f15a3afdd94bec7ec64e7
 NeverTypeRepr/gen_never_type_repr.rs cc7d1c861eaf89772109f142815839976f25f89956ed1b11822df5e7e333d6d4 cc7d1c861eaf89772109f142815839976f25f89956ed1b11822df5e7e333d6d4
+NotNull/gen_not_null.rs 3cc516b4fcf50ef6c45452158820e5386883cafa759480d41c896c21f559a979 3cc516b4fcf50ef6c45452158820e5386883cafa759480d41c896c21f559a979
 OffsetOfExpr/gen_offset_of_expr.rs 8e2077b4d7b85c91c17c3630511bc4f929950e9007261cbf0471c4a064c4b934 8e2077b4d7b85c91c17c3630511bc4f929950e9007261cbf0471c4a064c4b934
 OrPat/gen_or_pat.rs 71feef6e056bfe4cc8c22c9eb54fa3fecef613606769061d0efd059adbbd6f56 71feef6e056bfe4cc8c22c9eb54fa3fecef613606769061d0efd059adbbd6f56
 Param/gen_param.rs 39f3979d6cb10e4c43e0b5601af2a92b7520a75a104211955bbbb5e6f13e9db9 39f3979d6cb10e4c43e0b5601af2a92b7520a75a104211955bbbb5e6f13e9db9
 ParamList/gen_param_list.rs a842001c434b9716a131a77b5ec78ee5dd911ef7c42d22bf5e7bdac24c9a20bd a842001c434b9716a131a77b5ec78ee5dd911ef7c42d22bf5e7bdac24c9a20bd
-ParenExpr/gen_paren_expr.rs caaf419c59d65ca911479dea7d62756a55593b3da65b02942a36abd975389f29 caaf419c59d65ca911479dea7d62756a55593b3da65b02942a36abd975389f29
-ParenPat/gen_paren_pat.rs 47a0c5b6ec3e51452c2c2e6882ed98aca9891b08246ec231484df8d226985212 47a0c5b6ec3e51452c2c2e6882ed98aca9891b08246ec231484df8d226985212
 ParenTypeRepr/gen_paren_type_repr.rs 28194256a3d7bdcc49283f4be5e3ad3efb0ea2996126abed2a76c6cd9954c879 28194256a3d7bdcc49283f4be5e3ad3efb0ea2996126abed2a76c6cd9954c879
 ParenthesizedArgList/gen_parenthesized_arg_list.rs 161083eb292e1d70ca97b5afda8e27bc96db95678b39cb680de638ac0e49be72 161083eb292e1d70ca97b5afda8e27bc96db95678b39cb680de638ac0e49be72
 Path/gen_path.rs 490268d6bfb1635883b8bdefc683d59c4dd0e9c7f86c2e55954661efb3ab0253 490268d6bfb1635883b8bdefc683d59c4dd0e9c7f86c2e55954661efb3ab0253
 Path/gen_path_expr.rs dcc9cc16cafff0e2225c1853a91612d3f666016c53fcb4ab5716ed31a33a41cd dcc9cc16cafff0e2225c1853a91612d3f666016c53fcb4ab5716ed31a33a41cd
 Path/gen_path_pat.rs fd7f941f8b33f19d3693be1fdb595c2fb2e85e8296702b82bf12bcd44632f371 fd7f941f8b33f19d3693be1fdb595c2fb2e85e8296702b82bf12bcd44632f371
 Path/gen_path_type_repr.rs 2a59f36d62a8a6e0e2caacd2b7a78943ddb48af2bb2d82b0e63b387ec24e052d 2a59f36d62a8a6e0e2caacd2b7a78943ddb48af2bb2d82b0e63b387ec24e052d
+PatternTypeRepr/gen_pattern_type_repr.rs 7e98df3851d63ed6509b7e634e8854dbf3294ed5cfc275b50bbbff55bf431f5e 7e98df3851d63ed6509b7e634e8854dbf3294ed5cfc275b50bbbff55bf431f5e
 PrefixExpr/gen_prefix_expr.rs c4b53e87f370713b9a9e257be26d082b0761497bac19b1d7401a31b22b30d1ab c4b53e87f370713b9a9e257be26d082b0761497bac19b1d7401a31b22b30d1ab
 PtrTypeRepr/gen_ptr_type_repr.rs b833d2a02add897c53ad5f0d436e1f5fa8919809592e1ded56b0c1c99b8344bd b833d2a02add897c53ad5f0d436e1f5fa8919809592e1ded56b0c1c99b8344bd
 RangeExpr/gen_range_expr.rs 3f27cff9cc76b2703beff622d1453b84121e1970a869e45f9428deac92c4ecb0 3f27cff9cc76b2703beff622d1453b84121e1970a869e45f9428deac92c4ecb0
@@ -125,7 +129,6 @@ StructPatField/gen_struct_pat_field.rs dfdab8cef7dcfee40451744c8d2c7c4ae67fdb8bd
 StructPatFieldList/gen_struct_pat_field_list.rs 06c0e56c78a6b28909d94d9519ba41ac8a6005741f82b947ef14db51e8cbebd0 06c0e56c78a6b28909d94d9519ba41ac8a6005741f82b947ef14db51e8cbebd0
 TokenTree/gen_token_tree.rs 3fdc9a36a1870bb2bedf66c8fe37d368f4ac18488e7118b86e3979d3957a8f94 3fdc9a36a1870bb2bedf66c8fe37d368f4ac18488e7118b86e3979d3957a8f94
 Trait/gen_trait.rs bac694993e224f9c6dd86cfb28c54846ae1b3bae45a1e58d3149c884184487ea bac694993e224f9c6dd86cfb28c54846ae1b3bae45a1e58d3149c884184487ea
-TraitAlias/gen_trait_alias.rs 425d78a7cb87db7737ceaf713c9a62e0411537374d1bc58c5b1fb80cc25732c9 425d78a7cb87db7737ceaf713c9a62e0411537374d1bc58c5b1fb80cc25732c9
 TryExpr/gen_try_expr.rs f60198181a423661f4ed1bf6f98d475f40ada190b7b5fc6af97aa5e45ca29a1e f60198181a423661f4ed1bf6f98d475f40ada190b7b5fc6af97aa5e45ca29a1e
 TupleExpr/gen_tuple_expr.rs 27e56846b3f08c37c8a345169c2a532b2023d231d46a5bdf586bbc6d8fb36a01 27e56846b3f08c37c8a345169c2a532b2023d231d46a5bdf586bbc6d8fb36a01
 TupleField/gen_tuple_field.rs 20507753ddb979a33d0e568ae5ebe466f039e7ab7b8f2e6ce15b28b3e4450615 20507753ddb979a33d0e568ae5ebe466f039e7ab7b8f2e6ce15b28b3e4450615
@@ -147,6 +150,7 @@ UseTreeList/gen_use_tree_list.rs 2494aadcec03a3f7a6e2ae448ee70ec6774f840e9519c66
 Variant/gen_variant.rs fa3d3a9e3e0c3aa565b965fad9c3dc2ffd5a8d82963e3a55a9acbb0f14b603d6 fa3d3a9e3e0c3aa565b965fad9c3dc2ffd5a8d82963e3a55a9acbb0f14b603d6
 VariantList/gen_variant_list.rs a1faa4d59b072f139d14cb8a6d63a0ce8c473170d6320a07ce6bb9d517f8486d a1faa4d59b072f139d14cb8a6d63a0ce8c473170d6320a07ce6bb9d517f8486d
 Visibility/gen_visibility.rs cfa4b05fa7ba7c4ffa8f9c880b13792735e4f7e92a648f43110e914075e97a52 cfa4b05fa7ba7c4ffa8f9c880b13792735e4f7e92a648f43110e914075e97a52
+VisibilityInner/gen_visibility_inner.rs d392d92d56b4da0bb7ba1d4fc6aecf0932e4174e7ccd2fc64ea68d659aca1ee7 d392d92d56b4da0bb7ba1d4fc6aecf0932e4174e7ccd2fc64ea68d659aca1ee7
 WhereClause/gen_where_clause.rs 22522c933be47f8f7f9d0caddfa41925c08df343c564baad2fe2daa14f1bfb1a 22522c933be47f8f7f9d0caddfa41925c08df343c564baad2fe2daa14f1bfb1a
 WherePred/gen_where_pred.rs 7036e34f1a1f77c5cf031f385be4583472ea4f99e8b4b4ec3c72a65c23e418bb 7036e34f1a1f77c5cf031f385be4583472ea4f99e8b4b4ec3c72a65c23e418bb
 WhileExpr/gen_while_expr.rs 97276c5946a36001638491c99a36170d22bc6011c5e59f621b37c7a2d7737879 97276c5946a36001638491c99a36170d22bc6011c5e59f621b37c7a2d7737879
diff --git a/rust/ql/test/extractor-tests/generated/.gitattributes b/rust/ql/test/extractor-tests/generated/.gitattributes
index 660ad73721ab..6c6eb4fd4895 100644
--- a/rust/ql/test/extractor-tests/generated/.gitattributes
+++ b/rust/ql/test/extractor-tests/generated/.gitattributes
@@ -27,6 +27,8 @@
 /BreakExpr/gen_break_expr.rs linguist-generated
 /CallExpr/gen_call_expr.rs linguist-generated
 /CastExpr/gen_cast_expr.rs linguist-generated
+/CfgPredExpr/gen_cfg_pred_expr.rs linguist-generated
+/CfgPredPat/gen_cfg_pred_pat.rs linguist-generated
 /ClosureExpr/gen_closure_expr.rs linguist-generated
 /Comment/gen_comment.rs linguist-generated
 /Const/gen_const.rs linguist-generated
@@ -34,6 +36,8 @@
 /ConstBlockPat/gen_const_block_pat.rs linguist-generated
 /ConstParam/gen_const_param.rs linguist-generated
 /ContinueExpr/gen_continue_expr.rs linguist-generated
+/DerefPat/gen_deref_pat.rs linguist-generated
+/DocComment/gen_doc_comment.rs linguist-generated
 /DynTraitTypeRepr/gen_dyn_trait_type_repr.rs linguist-generated
 /Enum/gen_enum.rs linguist-generated
 /ExprStmt/gen_expr_stmt.rs linguist-generated
@@ -56,6 +60,7 @@
 /IfExpr/gen_if_expr.rs linguist-generated
 /Impl/gen_impl.rs linguist-generated
 /ImplTraitTypeRepr/gen_impl_trait_type_repr.rs linguist-generated
+/IncludeBytesExpr/gen_include_bytes_expr.rs linguist-generated
 /IndexExpr/gen_index_expr.rs linguist-generated
 /InferTypeRepr/gen_infer_type_repr.rs linguist-generated
 /ItemList/gen_item_list.rs linguist-generated
@@ -80,24 +85,23 @@
 /MatchArmList/gen_match_arm_list.rs linguist-generated
 /MatchExpr/gen_match_expr.rs linguist-generated
 /MatchGuard/gen_match_guard.rs linguist-generated
-/Meta/gen_meta.rs linguist-generated
 /MethodCallExpr/gen_method_call_expr.rs linguist-generated
 /Module/gen_module.rs linguist-generated
 /Name/gen_name.rs linguist-generated
 /NameRef/gen_name_ref.rs linguist-generated
 /NeverTypeRepr/gen_never_type_repr.rs linguist-generated
+/NotNull/gen_not_null.rs linguist-generated
 /OffsetOfExpr/gen_offset_of_expr.rs linguist-generated
 /OrPat/gen_or_pat.rs linguist-generated
 /Param/gen_param.rs linguist-generated
 /ParamList/gen_param_list.rs linguist-generated
-/ParenExpr/gen_paren_expr.rs linguist-generated
-/ParenPat/gen_paren_pat.rs linguist-generated
 /ParenTypeRepr/gen_paren_type_repr.rs linguist-generated
 /ParenthesizedArgList/gen_parenthesized_arg_list.rs linguist-generated
 /Path/gen_path.rs linguist-generated
 /Path/gen_path_expr.rs linguist-generated
 /Path/gen_path_pat.rs linguist-generated
 /Path/gen_path_type_repr.rs linguist-generated
+/PatternTypeRepr/gen_pattern_type_repr.rs linguist-generated
 /PrefixExpr/gen_prefix_expr.rs linguist-generated
 /PtrTypeRepr/gen_ptr_type_repr.rs linguist-generated
 /RangeExpr/gen_range_expr.rs linguist-generated
@@ -127,7 +131,6 @@
 /StructPatFieldList/gen_struct_pat_field_list.rs linguist-generated
 /TokenTree/gen_token_tree.rs linguist-generated
 /Trait/gen_trait.rs linguist-generated
-/TraitAlias/gen_trait_alias.rs linguist-generated
 /TryExpr/gen_try_expr.rs linguist-generated
 /TupleExpr/gen_tuple_expr.rs linguist-generated
 /TupleField/gen_tuple_field.rs linguist-generated
@@ -149,6 +152,7 @@
 /Variant/gen_variant.rs linguist-generated
 /VariantList/gen_variant_list.rs linguist-generated
 /Visibility/gen_visibility.rs linguist-generated
+/VisibilityInner/gen_visibility_inner.rs linguist-generated
 /WhereClause/gen_where_clause.rs linguist-generated
 /WherePred/gen_where_pred.rs linguist-generated
 /WhileExpr/gen_while_expr.rs linguist-generated
diff --git a/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql
index 36f7bb41db93..aa65ae36d0e5 100644
--- a/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql
@@ -8,6 +8,6 @@ query predicate getExpr(ArrayListExpr x, int index, Expr getExpr) {
   toBeTested(x) and not x.isUnknown() and getExpr = x.getExpr(index)
 }
 
-query predicate getAttr(ArrayListExpr x, int index, Attr getAttr) {
+query predicate getAttr(ArrayListExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
diff --git a/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql
index 7f337fc87b55..e4fd0bd28375 100644
--- a/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql
@@ -18,6 +18,6 @@ query predicate getExpr(ArrayRepeatExpr x, int index, Expr getExpr) {
   toBeTested(x) and not x.isUnknown() and getExpr = x.getExpr(index)
 }
 
-query predicate getAttr(ArrayRepeatExpr x, int index, Attr getAttr) {
+query predicate getAttr(ArrayRepeatExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
diff --git a/rust/ql/test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.expected b/rust/ql/test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.expected
index 10f3409cc794..bc4d5d6e3f8f 100644
--- a/rust/ql/test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.expected
+++ b/rust/ql/test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.expected
@@ -1 +1,3 @@
+instances
 | gen_asm_clobber_abi.rs:8:14:8:29 | AsmClobberAbi |
+getAttr
diff --git a/rust/ql/test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.ql b/rust/ql/test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.ql
index 65680442dfb8..140d39dbcd6b 100644
--- a/rust/ql/test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.ql
+++ b/rust/ql/test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.ql
@@ -3,3 +3,7 @@ import codeql.rust.elements
 import TestUtils
 
 query predicate instances(AsmClobberAbi x) { toBeTested(x) and not x.isUnknown() }
+
+query predicate getAttr(AsmClobberAbi x, int index, AnyAttr getAttr) {
+  toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
+}
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
index e802491c3262..4169fb61ee54 100644
--- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
@@ -14,7 +14,7 @@ query predicate getAsmPiece(AsmExpr x, int index, AsmPiece getAsmPiece) {
   toBeTested(x) and not x.isUnknown() and getAsmPiece = x.getAsmPiece(index)
 }
 
-query predicate getAttr(AsmExpr x, int index, Attr getAttr) {
+query predicate getAttr(AsmExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.expected b/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.expected
index c8aec731ff8c..36351bbf80ae 100644
--- a/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.expected
+++ b/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.expected
@@ -4,5 +4,6 @@ instances
 getAsmOperand
 | gen_asm_operand_named.rs:8:34:8:43 | AsmOperandNamed | gen_asm_operand_named.rs:8:34:8:43 | AsmRegOperand |
 | gen_asm_operand_named.rs:8:46:8:62 | AsmOperandNamed | gen_asm_operand_named.rs:8:54:8:62 | AsmRegOperand |
+getAttr
 getName
 | gen_asm_operand_named.rs:8:46:8:62 | AsmOperandNamed | gen_asm_operand_named.rs:8:46:8:50 | input |
diff --git a/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql b/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql
index 9c900afe42e1..cb72ad4ac5f9 100644
--- a/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql
+++ b/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql
@@ -8,6 +8,10 @@ query predicate getAsmOperand(AsmOperandNamed x, AsmOperand getAsmOperand) {
   toBeTested(x) and not x.isUnknown() and getAsmOperand = x.getAsmOperand()
 }
 
+query predicate getAttr(AsmOperandNamed x, int index, AnyAttr getAttr) {
+  toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
+}
+
 query predicate getName(AsmOperandNamed x, Name getName) {
   toBeTested(x) and not x.isUnknown() and getName = x.getName()
 }
diff --git a/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.expected b/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.expected
index cf9ec35d070e..c0634930367a 100644
--- a/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.expected
+++ b/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.expected
@@ -3,3 +3,4 @@ instances
 getAsmOption
 | gen_asm_options_list.rs:8:14:8:36 | AsmOptionsList | 0 | gen_asm_options_list.rs:8:22:8:28 | AsmOption |
 | gen_asm_options_list.rs:8:14:8:36 | AsmOptionsList | 1 | gen_asm_options_list.rs:8:31:8:35 | AsmOption |
+getAttr
diff --git a/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.ql b/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.ql
index a4806cce3535..c8edb669a4d4 100644
--- a/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.ql
+++ b/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.ql
@@ -7,3 +7,7 @@ query predicate instances(AsmOptionsList x) { toBeTested(x) and not x.isUnknown(
 query predicate getAsmOption(AsmOptionsList x, int index, AsmOption getAsmOption) {
   toBeTested(x) and not x.isUnknown() and getAsmOption = x.getAsmOption(index)
 }
+
+query predicate getAttr(AsmOptionsList x, int index, AnyAttr getAttr) {
+  toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
+}
diff --git a/rust/ql/test/extractor-tests/generated/Attr/Attr.expected b/rust/ql/test/extractor-tests/generated/Attr/Attr.expected
index 1272453173d9..98a72a41f18a 100644
--- a/rust/ql/test/extractor-tests/generated/Attr/Attr.expected
+++ b/rust/ql/test/extractor-tests/generated/Attr/Attr.expected
@@ -1,4 +1,4 @@
 instances
 | gen_attr.rs:7:5:7:20 | Attr |
 getMeta
-| gen_attr.rs:7:5:7:20 | Attr | gen_attr.rs:7:7:7:19 | Meta |
+| gen_attr.rs:7:5:7:20 | Attr | gen_attr.rs:7:7:7:19 | TokenTreeMeta |
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql
index d98d833c9515..67f77a98a5a7 100644
--- a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(AwaitExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(AwaitExpr x, int index, Attr getAttr) {
+query predicate getAttr(AwaitExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql
index d8b5775da70f..1a89ccf2d3d1 100644
--- a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(BecomeExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(BecomeExpr x, int index, Attr getAttr) {
+query predicate getAttr(BecomeExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql
index 6b5bf4ba206b..a85b69df6c69 100644
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(BinaryExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(BinaryExpr x, int index, Attr getAttr) {
+query predicate getAttr(BinaryExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
index 0423524834b7..843d156ff9a6 100644
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
@@ -1,7 +1,7 @@
 instances
-| gen_block_expr.rs:3:28:12:1 | { ... } | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no |
-| gen_block_expr.rs:5:5:7:5 | { ... } | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no |
-| gen_block_expr.rs:8:5:11:5 | 'label: { ... } | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no |
+| gen_block_expr.rs:3:28:12:1 | { ... } | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isUnsafe: | no |
+| gen_block_expr.rs:5:5:7:5 | { ... } | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isUnsafe: | no |
+| gen_block_expr.rs:8:5:11:5 | 'label: { ... } | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isUnsafe: | no |
 getLabel
 | gen_block_expr.rs:8:5:11:5 | 'label: { ... } | gen_block_expr.rs:8:5:8:11 | 'label |
 getAttr
@@ -9,3 +9,4 @@ getStmtList
 | gen_block_expr.rs:3:28:12:1 | { ... } | gen_block_expr.rs:3:28:12:1 | StmtList |
 | gen_block_expr.rs:5:5:7:5 | { ... } | gen_block_expr.rs:5:5:7:5 | StmtList |
 | gen_block_expr.rs:8:5:11:5 | 'label: { ... } | gen_block_expr.rs:8:13:11:5 | StmtList |
+getTryBlockModifier
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
index 4b69689bb913..f0fd854a784f 100644
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
@@ -4,8 +4,8 @@ import TestUtils
 
 query predicate instances(
   BlockExpr x, string isAsync__label, string isAsync, string isConst__label, string isConst,
-  string isGen__label, string isGen, string isMove__label, string isMove, string isTry__label,
-  string isTry, string isUnsafe__label, string isUnsafe
+  string isGen__label, string isGen, string isMove__label, string isMove, string isUnsafe__label,
+  string isUnsafe
 ) {
   toBeTested(x) and
   not x.isUnknown() and
@@ -17,8 +17,6 @@ query predicate instances(
   (if x.isGen() then isGen = "yes" else isGen = "no") and
   isMove__label = "isMove:" and
   (if x.isMove() then isMove = "yes" else isMove = "no") and
-  isTry__label = "isTry:" and
-  (if x.isTry() then isTry = "yes" else isTry = "no") and
   isUnsafe__label = "isUnsafe:" and
   if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
 }
@@ -27,10 +25,14 @@ query predicate getLabel(BlockExpr x, Label getLabel) {
   toBeTested(x) and not x.isUnknown() and getLabel = x.getLabel()
 }
 
-query predicate getAttr(BlockExpr x, int index, Attr getAttr) {
+query predicate getAttr(BlockExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
 query predicate getStmtList(BlockExpr x, StmtList getStmtList) {
   toBeTested(x) and not x.isUnknown() and getStmtList = x.getStmtList()
 }
+
+query predicate getTryBlockModifier(BlockExpr x, TryBlockModifier getTryBlockModifier) {
+  toBeTested(x) and not x.isUnknown() and getTryBlockModifier = x.getTryBlockModifier()
+}
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql
index c9d9fb9ee66a..e00123f75038 100644
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(BreakExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(BreakExpr x, int index, Attr getAttr) {
+query predicate getAttr(BreakExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
index 4d3b26f2f788..939fc70213e8 100644
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
@@ -8,7 +8,7 @@ query predicate getArgList(CallExpr x, ArgList getArgList) {
   toBeTested(x) and not x.isUnknown() and getArgList = x.getArgList()
 }
 
-query predicate getAttr(CallExpr x, int index, Attr getAttr) {
+query predicate getAttr(CallExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
index 46c06b4c21cd..319cfb40888a 100644
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(CastExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(CastExpr x, int index, Attr getAttr) {
+query predicate getAttr(CastExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/CfgAtom/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/CfgAtom/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CfgAtom/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/CfgAttrMeta/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/CfgAttrMeta/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CfgAttrMeta/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/CfgComposite/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/CfgComposite/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CfgComposite/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/CfgMeta/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/CfgMeta/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CfgMeta/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/CfgPredExpr/CfgPredExpr.expected b/rust/ql/test/extractor-tests/generated/CfgPredExpr/CfgPredExpr.expected
new file mode 100644
index 000000000000..07ebd398df5e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CfgPredExpr/CfgPredExpr.expected
@@ -0,0 +1,8 @@
+instances
+| gen_cfg_pred_expr.rs:9:5:9:21 | CfgPredExpr |
+| gen_cfg_pred_expr.rs:10:5:10:38 | CfgPredExpr |
+| gen_cfg_pred_expr.rs:11:5:11:49 | CfgPredExpr |
+getCfgPredicate
+| gen_cfg_pred_expr.rs:9:5:9:21 | CfgPredExpr | gen_cfg_pred_expr.rs:9:17:9:20 | CfgAtom |
+| gen_cfg_pred_expr.rs:10:5:10:38 | CfgPredExpr | gen_cfg_pred_expr.rs:10:17:10:37 | CfgAtom |
+| gen_cfg_pred_expr.rs:11:5:11:49 | CfgPredExpr | gen_cfg_pred_expr.rs:11:17:11:48 | CfgComposite |
diff --git a/rust/ql/test/extractor-tests/generated/CfgPredExpr/CfgPredExpr.ql b/rust/ql/test/extractor-tests/generated/CfgPredExpr/CfgPredExpr.ql
new file mode 100644
index 000000000000..ee144ebfda76
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CfgPredExpr/CfgPredExpr.ql
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+query predicate instances(CfgPredExpr x) { toBeTested(x) and not x.isUnknown() }
+
+query predicate getCfgPredicate(CfgPredExpr x, CfgPredicate getCfgPredicate) {
+  toBeTested(x) and not x.isUnknown() and getCfgPredicate = x.getCfgPredicate()
+}
diff --git a/rust/ql/test/extractor-tests/generated/CfgPredExpr/gen_cfg_pred_expr.rs b/rust/ql/test/extractor-tests/generated/CfgPredExpr/gen_cfg_pred_expr.rs
new file mode 100644
index 000000000000..47eb51d6165a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CfgPredExpr/gen_cfg_pred_expr.rs
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+
+fn test_cfg_pred_expr() -> () {
+    // A configuration predicate expression resulting from expansion of a `cfg!` macro call.
+    // It has type `bool` and evaluates to whether the configuration predicate holds.
+    // 
+    // Rust-analyzer expands `cfg!(...)` in expression position to its internal `builtin#cfg(...)`
+    // syntax, as illustrated below:
+    builtin#cfg(unix);
+    builtin#cfg(target_os = "windows");
+    builtin#cfg(any(unix, target_os = "windows"));
+}
diff --git a/rust/ql/test/extractor-tests/generated/CfgPredPat/CfgPredPat.expected b/rust/ql/test/extractor-tests/generated/CfgPredPat/CfgPredPat.expected
new file mode 100644
index 000000000000..0edd3716bed6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CfgPredPat/CfgPredPat.expected
@@ -0,0 +1,8 @@
+instances
+| gen_cfg_pred_pat.rs:10:9:10:25 | CfgPredPat |
+| gen_cfg_pred_pat.rs:11:9:11:42 | CfgPredPat |
+| gen_cfg_pred_pat.rs:12:9:12:53 | CfgPredPat |
+getCfgPredicate
+| gen_cfg_pred_pat.rs:10:9:10:25 | CfgPredPat | gen_cfg_pred_pat.rs:10:21:10:24 | CfgAtom |
+| gen_cfg_pred_pat.rs:11:9:11:42 | CfgPredPat | gen_cfg_pred_pat.rs:11:21:11:41 | CfgAtom |
+| gen_cfg_pred_pat.rs:12:9:12:53 | CfgPredPat | gen_cfg_pred_pat.rs:12:21:12:52 | CfgComposite |
diff --git a/rust/ql/test/extractor-tests/generated/CfgPredPat/CfgPredPat.ql b/rust/ql/test/extractor-tests/generated/CfgPredPat/CfgPredPat.ql
new file mode 100644
index 000000000000..9b2a926a7553
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CfgPredPat/CfgPredPat.ql
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+query predicate instances(CfgPredPat x) { toBeTested(x) and not x.isUnknown() }
+
+query predicate getCfgPredicate(CfgPredPat x, CfgPredicate getCfgPredicate) {
+  toBeTested(x) and not x.isUnknown() and getCfgPredicate = x.getCfgPredicate()
+}
diff --git a/rust/ql/test/extractor-tests/generated/CfgPredPat/gen_cfg_pred_pat.rs b/rust/ql/test/extractor-tests/generated/CfgPredPat/gen_cfg_pred_pat.rs
new file mode 100644
index 000000000000..560004dd3cc5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CfgPredPat/gen_cfg_pred_pat.rs
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+
+fn test_cfg_pred_pat() -> () {
+    // A configuration predicate pattern resulting from expansion of a `cfg!` macro call.
+    // It matches `true` when the configuration predicate holds and `false` otherwise.
+    // 
+    // Rust-analyzer expands `cfg!(...)` in pattern position to its internal `builtin#cfg(...)`
+    // syntax, as illustrated below:
+    match true {
+        builtin#cfg(unix) => (),
+        builtin#cfg(target_os = "windows") => (),
+        builtin#cfg(any(unix, target_os = "windows")) => (),
+        _ => (),
+    };
+}
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
index 1d7a9412b163..9c7daaa37791 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
@@ -25,7 +25,7 @@ query predicate getParamList(ClosureExpr x, ParamList getParamList) {
   toBeTested(x) and not x.isUnknown() and getParamList = x.getParamList()
 }
 
-query predicate getAttr(ClosureExpr x, int index, Attr getAttr) {
+query predicate getAttr(ClosureExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/Comment/Comment.expected b/rust/ql/test/extractor-tests/generated/Comment/Comment.expected
index 24e95f123d8c..63e22a39a90f 100644
--- a/rust/ql/test/extractor-tests/generated/Comment/Comment.expected
+++ b/rust/ql/test/extractor-tests/generated/Comment/Comment.expected
@@ -1,7 +1,4 @@
-| comments.rs:1:1:3:2 | /**...*/ | getParent: | comments.rs:1:1:9:1 | fn foo | getText: | /** \n* A doc comment\n*/ |
 | comments.rs:6:17:6:34 | //... | getParent: | comments.rs:6:17:8:16 | fn nested | getText: | // print some text |
-| comments.rs:7:3:7:31 | ///... | getParent: | comments.rs:6:17:8:16 | fn nested | getText: | /// This is a nested function |
-| gen_comment.rs:1:1:1:36 | //... | getParent: | gen_comment.rs:1:1:7:2 | SourceFile | getText: | // generated by codegen, do not edit |
-| gen_comment.rs:4:5:4:30 | //... | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | // A comment. For example: |
-| gen_comment.rs:5:5:5:24 | //... | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | // this is a comment |
-| gen_comment.rs:6:5:6:29 | ///... | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | /// This is a doc comment |
+| gen_comment.rs:1:1:1:36 | //... | getParent: | gen_comment.rs:1:1:8:2 | SourceFile | getText: | // generated by codegen, do not edit |
+| gen_comment.rs:4:5:4:30 | //... | getParent: | gen_comment.rs:4:5:7:22 | fn documented | getText: | // A comment. For example: |
+| gen_comment.rs:5:5:5:24 | //... | getParent: | gen_comment.rs:4:5:7:22 | fn documented | getText: | // this is a comment |
diff --git a/rust/ql/test/extractor-tests/generated/Comment/gen_comment.rs b/rust/ql/test/extractor-tests/generated/Comment/gen_comment.rs
index 1e9682754d8b..9570180a25ec 100644
--- a/rust/ql/test/extractor-tests/generated/Comment/gen_comment.rs
+++ b/rust/ql/test/extractor-tests/generated/Comment/gen_comment.rs
@@ -4,4 +4,5 @@ fn test_comment() -> () {
     // A comment. For example:
     // this is a comment
     /// This is a doc comment
+    fn documented() {}
 }
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.ql b/rust/ql/test/extractor-tests/generated/Const/Const.ql
index 70420980d67d..820c85ef1601 100644
--- a/rust/ql/test/extractor-tests/generated/Const/Const.ql
+++ b/rust/ql/test/extractor-tests/generated/Const/Const.ql
@@ -22,7 +22,7 @@ query predicate getAttributeMacroExpansion(Const x, MacroItems getAttributeMacro
   getAttributeMacroExpansion = x.getAttributeMacroExpansion()
 }
 
-query predicate getAttr(Const x, int index, Attr getAttr) {
+query predicate getAttr(Const x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
index cfbf6f3cc45a..cd2f1e32ba6b 100644
--- a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
@@ -9,7 +9,7 @@ query predicate instances(ConstParam x, string isConst__label, string isConst) {
   if x.isConst() then isConst = "yes" else isConst = "no"
 }
 
-query predicate getAttr(ConstParam x, int index, Attr getAttr) {
+query predicate getAttr(ConstParam x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql
index 590b8d1faa50..2f12bb4e77b3 100644
--- a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(ContinueExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(ContinueExpr x, int index, Attr getAttr) {
+query predicate getAttr(ContinueExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/DerefPat/DerefPat.expected b/rust/ql/test/extractor-tests/generated/DerefPat/DerefPat.expected
new file mode 100644
index 000000000000..30bba2359390
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/DerefPat/DerefPat.expected
@@ -0,0 +1,4 @@
+instances
+| gen_deref_pat.rs:8:9:8:24 | DerefPat |
+getPat
+| gen_deref_pat.rs:8:9:8:24 | DerefPat | gen_deref_pat.rs:8:23:8:23 | y |
diff --git a/rust/ql/test/extractor-tests/generated/DerefPat/DerefPat.ql b/rust/ql/test/extractor-tests/generated/DerefPat/DerefPat.ql
new file mode 100644
index 000000000000..f17a3c41f132
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/DerefPat/DerefPat.ql
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+query predicate instances(DerefPat x) { toBeTested(x) and not x.isUnknown() }
+
+query predicate getPat(DerefPat x, Pat getPat) {
+  toBeTested(x) and not x.isUnknown() and getPat = x.getPat()
+}
diff --git a/rust/ql/test/extractor-tests/generated/DerefPat/gen_deref_pat.rs b/rust/ql/test/extractor-tests/generated/DerefPat/gen_deref_pat.rs
new file mode 100644
index 000000000000..b8c06cc3cc15
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/DerefPat/gen_deref_pat.rs
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+
+fn test_deref_pat() -> () {
+    // A deref pattern, matching the value behind a smart pointer. This is an experimental
+    // Rust feature that cannot be written directly in stable Rust; the example below uses
+    // rust-analyzer's canonical `builtin#deref` syntax for such patterns:
+    match x {
+        builtin#deref(y) => y,
+        _ => 0,
+    };
+}
diff --git a/rust/ql/test/extractor-tests/generated/DocComment/DocComment.expected b/rust/ql/test/extractor-tests/generated/DocComment/DocComment.expected
new file mode 100644
index 000000000000..f6d50c75a94b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/DocComment/DocComment.expected
@@ -0,0 +1 @@
+| gen_doc_comment.rs:7:5:7:31 | DocComment |
diff --git a/rust/ql/test/extractor-tests/generated/DocComment/DocComment.ql b/rust/ql/test/extractor-tests/generated/DocComment/DocComment.ql
new file mode 100644
index 000000000000..ce4a0407e4f9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/DocComment/DocComment.ql
@@ -0,0 +1,5 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+query predicate instances(DocComment x) { toBeTested(x) and not x.isUnknown() }
diff --git a/rust/ql/test/extractor-tests/generated/DocComment/gen_doc_comment.rs b/rust/ql/test/extractor-tests/generated/DocComment/gen_doc_comment.rs
new file mode 100644
index 000000000000..99a2adc1bfa9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/DocComment/gen_doc_comment.rs
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+
+fn test_doc_comment() -> () {
+    // A documentation comment.
+    // 
+    // For example:
+    /// Documents `documented`.
+    fn documented() {}
+}
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum.expected
index de3c33c0a7c3..b4c9b900914d 100644
--- a/rust/ql/test/extractor-tests/generated/Enum/Enum.expected
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum.expected
@@ -6,7 +6,7 @@ getAttr
 getGenericParamList
 getName
 | gen_enum.rs:4:5:7:34 | enum E | gen_enum.rs:7:10:7:10 | E |
-getVariantList
-| gen_enum.rs:4:5:7:34 | enum E | gen_enum.rs:7:12:7:34 | VariantList |
 getVisibility
 getWhereClause
+getVariantList
+| gen_enum.rs:4:5:7:34 | enum E | gen_enum.rs:7:12:7:34 | VariantList |
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
index d9843feecc36..6a7c5f4b4727 100644
--- a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
@@ -14,7 +14,7 @@ query predicate getDeriveMacroExpansion(Enum x, int index, MacroItems getDeriveM
   toBeTested(x) and not x.isUnknown() and getDeriveMacroExpansion = x.getDeriveMacroExpansion(index)
 }
 
-query predicate getAttr(Enum x, int index, Attr getAttr) {
+query predicate getAttr(Enum x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
index 9769e173593c..55304733bcef 100644
--- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
@@ -19,7 +19,7 @@ query predicate getAbi(ExternBlock x, Abi getAbi) {
   toBeTested(x) and not x.isUnknown() and getAbi = x.getAbi()
 }
 
-query predicate getAttr(ExternBlock x, int index, Attr getAttr) {
+query predicate getAttr(ExternBlock x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
index 2898d60f487a..91f32acdad59 100644
--- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
@@ -10,7 +10,7 @@ query predicate getAttributeMacroExpansion(ExternCrate x, MacroItems getAttribut
   getAttributeMacroExpansion = x.getAttributeMacroExpansion()
 }
 
-query predicate getAttr(ExternCrate x, int index, Attr getAttr) {
+query predicate getAttr(ExternCrate x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.ql b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.ql
index b947daaff649..ed34935cf56d 100644
--- a/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.ql
+++ b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(ExternItemList x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(ExternItemList x, int index, Attr getAttr) {
+query predicate getAttr(ExternItemList x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql
index 49780f145b8f..f0a1eccf6b41 100644
--- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(FieldExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(FieldExpr x, int index, Attr getAttr) {
+query predicate getAttr(FieldExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql
index 1bb7bba5c49b..c4455587eff2 100644
--- a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql
@@ -12,7 +12,7 @@ query predicate getLoopBody(ForExpr x, BlockExpr getLoopBody) {
   toBeTested(x) and not x.isUnknown() and getLoopBody = x.getLoopBody()
 }
 
-query predicate getAttr(ForExpr x, int index, Attr getAttr) {
+query predicate getAttr(ForExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql
index 04e7a007e677..6b4acc184c81 100644
--- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql
@@ -8,7 +8,7 @@ query predicate getArg(FormatArgsExpr x, int index, FormatArgsArg getArg) {
   toBeTested(x) and not x.isUnknown() and getArg = x.getArg(index)
 }
 
-query predicate getAttr(FormatArgsExpr x, int index, Attr getAttr) {
+query predicate getAttr(FormatArgsExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.ql b/rust/ql/test/extractor-tests/generated/Function/Function.ql
index ca2bf4d5f704..df05aaf4ca9a 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.ql
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.ql
@@ -33,7 +33,7 @@ query predicate getParamList(Function x, ParamList getParamList) {
   toBeTested(x) and not x.isUnknown() and getParamList = x.getParamList()
 }
 
-query predicate getAttr(Function x, int index, Attr getAttr) {
+query predicate getAttr(Function x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql
index a70bc32ca79c..08edaba54285 100644
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql
@@ -13,7 +13,7 @@ query predicate instances(
   if x.isRef() then isRef = "yes" else isRef = "no"
 }
 
-query predicate getAttr(IdentPat x, int index, Attr getAttr) {
+query predicate getAttr(IdentPat x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql
index c41248fa322e..679fd4ab7ca1 100644
--- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(IfExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(IfExpr x, int index, Attr getAttr) {
+query predicate getAttr(IfExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
index 0a791b4659dc..5bae361644d6 100644
--- a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
@@ -26,7 +26,7 @@ query predicate getAssocItemList(Impl x, AssocItemList getAssocItemList) {
   toBeTested(x) and not x.isUnknown() and getAssocItemList = x.getAssocItemList()
 }
 
-query predicate getAttr(Impl x, int index, Attr getAttr) {
+query predicate getAttr(Impl x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/ImplRestriction/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ImplRestriction/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ImplRestriction/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/IncludeBytesExpr/IncludeBytesExpr.expected b/rust/ql/test/extractor-tests/generated/IncludeBytesExpr/IncludeBytesExpr.expected
new file mode 100644
index 000000000000..bb50091ec579
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IncludeBytesExpr/IncludeBytesExpr.expected
@@ -0,0 +1 @@
+| gen_include_bytes_expr.rs:5:16:5:29 | IncludeBytesExpr |
diff --git a/rust/ql/test/extractor-tests/generated/IncludeBytesExpr/IncludeBytesExpr.ql b/rust/ql/test/extractor-tests/generated/IncludeBytesExpr/IncludeBytesExpr.ql
new file mode 100644
index 000000000000..389544ae9961
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IncludeBytesExpr/IncludeBytesExpr.ql
@@ -0,0 +1,5 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+query predicate instances(IncludeBytesExpr x) { toBeTested(x) and not x.isUnknown() }
diff --git a/rust/ql/test/extractor-tests/generated/IncludeBytesExpr/gen_include_bytes_expr.rs b/rust/ql/test/extractor-tests/generated/IncludeBytesExpr/gen_include_bytes_expr.rs
new file mode 100644
index 000000000000..620437fe24db
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IncludeBytesExpr/gen_include_bytes_expr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_include_bytes_expr() -> () {
+    // An expression produced by the built-in `include_bytes!` macro, embedding the contents of a file as a byte array. For example:
+    let data = include_bytes!("data.bin");
+}
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql
index a7a870b1423f..d74f88370548 100644
--- a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(IndexExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(IndexExpr x, int index, Attr getAttr) {
+query predicate getAttr(IndexExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/ItemList/ItemList.ql b/rust/ql/test/extractor-tests/generated/ItemList/ItemList.ql
index 015b8f79125d..b98c99f621f2 100644
--- a/rust/ql/test/extractor-tests/generated/ItemList/ItemList.ql
+++ b/rust/ql/test/extractor-tests/generated/ItemList/ItemList.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(ItemList x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(ItemList x, int index, Attr getAttr) {
+query predicate getAttr(ItemList x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/KeyValueMeta/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/KeyValueMeta/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/KeyValueMeta/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql
index 2f8de7cd2d75..4fa3ee0b9a48 100644
--- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(LetExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(LetExpr x, int index, Attr getAttr) {
+query predicate getAttr(LetExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
index 07feca933996..6ed5bdbb2487 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(LetStmt x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(LetStmt x, int index, Attr getAttr) {
+query predicate getAttr(LetStmt x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql
index bddc4418ba46..f9ce69ca0e20 100644
--- a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql
+++ b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(LifetimeParam x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(LifetimeParam x, int index, Attr getAttr) {
+query predicate getAttr(LifetimeParam x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql
index 0b49e28cff23..25b73d9b5548 100644
--- a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(LiteralExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(LiteralExpr x, int index, Attr getAttr) {
+query predicate getAttr(LiteralExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql
index c266b1c064e2..6121f2fec46b 100644
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql
@@ -12,6 +12,6 @@ query predicate getLoopBody(LoopExpr x, BlockExpr getLoopBody) {
   toBeTested(x) and not x.isUnknown() and getLoopBody = x.getLoopBody()
 }
 
-query predicate getAttr(LoopExpr x, int index, Attr getAttr) {
+query predicate getAttr(LoopExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
index 5081eca422e2..97c8427f7e84 100644
--- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
@@ -10,7 +10,7 @@ query predicate getAttributeMacroExpansion(MacroCall x, MacroItems getAttributeM
   getAttributeMacroExpansion = x.getAttributeMacroExpansion()
 }
 
-query predicate getAttr(MacroCall x, int index, Attr getAttr) {
+query predicate getAttr(MacroCall x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
index 18aece7ccb5a..c501d29a5901 100644
--- a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
@@ -14,7 +14,7 @@ query predicate getArgs(MacroDef x, TokenTree getArgs) {
   toBeTested(x) and not x.isUnknown() and getArgs = x.getArgs()
 }
 
-query predicate getAttr(MacroDef x, int index, Attr getAttr) {
+query predicate getAttr(MacroDef x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
index 156893a07eba..a3560c0fdef1 100644
--- a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
@@ -1,7 +1,7 @@
 instances
 | gen_macro_items.rs:5:5:5:12 | MacroItems |
-| gen_macro_items.rs:13:12:13:14 | MacroItems |
+| gen_macro_items.rs:12:5:13:15 | MacroItems |
 getItem
 | gen_macro_items.rs:5:5:5:12 | MacroItems | 0 | gen_macro_items.rs:5:5:5:38 | use ...::Path |
 | gen_macro_items.rs:5:5:5:12 | MacroItems | 1 | gen_macro_items.rs:5:5:5:38 | fn get_parent |
-| gen_macro_items.rs:13:12:13:14 | MacroItems | 0 | gen_macro_items.rs:13:12:13:14 | impl ...::Debug for Bar::<...> { ... } |
+| gen_macro_items.rs:12:5:13:15 | MacroItems | 0 | gen_macro_items.rs:12:5:13:15 | impl ...::Debug for Bar::<...> { ... } |
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
index 4dc862c73d72..b9008136eb5c 100644
--- a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
@@ -10,7 +10,7 @@ query predicate getAttributeMacroExpansion(MacroRules x, MacroItems getAttribute
   getAttributeMacroExpansion = x.getAttributeMacroExpansion()
 }
 
-query predicate getAttr(MacroRules x, int index, Attr getAttr) {
+query predicate getAttr(MacroRules x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql
index 11450061ab03..afee0c3752a3 100644
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(MatchArm x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(MatchArm x, int index, Attr getAttr) {
+query predicate getAttr(MatchArm x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.ql b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.ql
index 5565aeafc7d2..23c9001cb230 100644
--- a/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.ql
+++ b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.ql
@@ -8,6 +8,6 @@ query predicate getArm(MatchArmList x, int index, MatchArm getArm) {
   toBeTested(x) and not x.isUnknown() and getArm = x.getArm(index)
 }
 
-query predicate getAttr(MatchArmList x, int index, Attr getAttr) {
+query predicate getAttr(MatchArmList x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql
index c8cc9448d5e2..f6bead25f6b7 100644
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(MatchExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(MatchExpr x, int index, Attr getAttr) {
+query predicate getAttr(MatchExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/Meta/Meta.ql b/rust/ql/test/extractor-tests/generated/Meta/Meta.ql
deleted file mode 100644
index dd054ea7e993..000000000000
--- a/rust/ql/test/extractor-tests/generated/Meta/Meta.ql
+++ /dev/null
@@ -1,22 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-query predicate instances(Meta x, string isUnsafe__label, string isUnsafe) {
-  toBeTested(x) and
-  not x.isUnknown() and
-  isUnsafe__label = "isUnsafe:" and
-  if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
-}
-
-query predicate getExpr(Meta x, Expr getExpr) {
-  toBeTested(x) and not x.isUnknown() and getExpr = x.getExpr()
-}
-
-query predicate getPath(Meta x, Path getPath) {
-  toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
-}
-
-query predicate getTokenTree(Meta x, TokenTree getTokenTree) {
-  toBeTested(x) and not x.isUnknown() and getTokenTree = x.getTokenTree()
-}
diff --git a/rust/ql/test/extractor-tests/generated/Meta/gen_meta.rs b/rust/ql/test/extractor-tests/generated/Meta/gen_meta.rs
deleted file mode 100644
index 104540323f95..000000000000
--- a/rust/ql/test/extractor-tests/generated/Meta/gen_meta.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_meta() -> () {
-    // A meta item in an attribute.
-    // 
-    // For example:
-    #[unsafe(lint::name = "reason_for_bypass")]
-    //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    #[deprecated(since = "1.2.0", note = "Use bar instead", unsafe=true)]
-    //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    fn foo() {
-        // ...
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
index 8ecc14ee820f..326cde39ab9f 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
@@ -8,7 +8,7 @@ query predicate getArgList(MethodCallExpr x, ArgList getArgList) {
   toBeTested(x) and not x.isUnknown() and getArgList = x.getArgList()
 }
 
-query predicate getAttr(MethodCallExpr x, int index, Attr getAttr) {
+query predicate getAttr(MethodCallExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.ql b/rust/ql/test/extractor-tests/generated/Module/Module.ql
index 8bd4b7af92f5..6b95c094b3ee 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module.ql
+++ b/rust/ql/test/extractor-tests/generated/Module/Module.ql
@@ -10,7 +10,7 @@ query predicate getAttributeMacroExpansion(Module x, MacroItems getAttributeMacr
   getAttributeMacroExpansion = x.getAttributeMacroExpansion()
 }
 
-query predicate getAttr(Module x, int index, Attr getAttr) {
+query predicate getAttr(Module x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/MutRestriction/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MutRestriction/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MutRestriction/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
index 7e8d7f8718b1..c02b6c823544 100644
--- a/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
+++ b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
@@ -1,2 +1 @@
 | gen_never_type_repr.rs:7:17:7:17 | ! |
-| gen_never_type_repr.rs:7:21:7:26 | ! |
diff --git a/rust/ql/test/extractor-tests/generated/NotNull/NotNull.expected b/rust/ql/test/extractor-tests/generated/NotNull/NotNull.expected
new file mode 100644
index 000000000000..cde11bfed217
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NotNull/NotNull.expected
@@ -0,0 +1 @@
+| gen_not_null.rs:8:54:8:58 | NotNull |
diff --git a/rust/ql/test/extractor-tests/generated/NotNull/NotNull.ql b/rust/ql/test/extractor-tests/generated/NotNull/NotNull.ql
new file mode 100644
index 000000000000..2c8a984917cd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NotNull/NotNull.ql
@@ -0,0 +1,5 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+query predicate instances(NotNull x) { toBeTested(x) and not x.isUnknown() }
diff --git a/rust/ql/test/extractor-tests/generated/NotNull/gen_not_null.rs b/rust/ql/test/extractor-tests/generated/NotNull/gen_not_null.rs
new file mode 100644
index 000000000000..f7bdf40318d2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NotNull/gen_not_null.rs
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+
+fn test_not_null() -> () {
+    // The `!null` pattern used in a pattern type to denote a non-null value. Pattern types
+    // are an experimental, mostly compiler-internal feature (used in the standard library for
+    // types such as `NonZero` and `NonNull`) and cannot be written directly in stable Rust;
+    // the example below uses rust-analyzer's canonical `builtin#pattern_type` syntax:
+    type NonNull = builtin#pattern_type(*const () is !null);
+}
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
index 64208e34bbf0..ab07dd52f9f0 100644
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(OffsetOfExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(OffsetOfExpr x, int index, Attr getAttr) {
+query predicate getAttr(OffsetOfExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param.ql b/rust/ql/test/extractor-tests/generated/Param/Param.ql
index ff1a261ef04d..eb1721256d7d 100644
--- a/rust/ql/test/extractor-tests/generated/Param/Param.ql
+++ b/rust/ql/test/extractor-tests/generated/Param/Param.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(Param x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(Param x, int index, Attr getAttr) {
+query predicate getAttr(Param x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.expected b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.expected
deleted file mode 100644
index 57a89a35cdef..000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-instances
-| gen_paren_expr.rs:7:5:7:11 | (...) |
-getAttr
-getExpr
-| gen_paren_expr.rs:7:5:7:11 | (...) | gen_paren_expr.rs:7:6:7:10 | ... + ... |
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.ql b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.ql
deleted file mode 100644
index 1074fc3cd009..000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.ql
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-query predicate instances(ParenExpr x) { toBeTested(x) and not x.isUnknown() }
-
-query predicate getAttr(ParenExpr x, int index, Attr getAttr) {
-  toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
-}
-
-query predicate getExpr(ParenExpr x, Expr getExpr) {
-  toBeTested(x) and not x.isUnknown() and getExpr = x.getExpr()
-}
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/gen_paren_expr.rs b/rust/ql/test/extractor-tests/generated/ParenExpr/gen_paren_expr.rs
deleted file mode 100644
index 292053784d80..000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenExpr/gen_paren_expr.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_paren_expr() -> () {
-    // A parenthesized expression.
-    // 
-    // For example:
-    (x + y)
-}
diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.expected b/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.expected
deleted file mode 100644
index 2e26da6da78c..000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-instances
-| gen_paren_pat.rs:7:9:7:11 | (...) |
-getPat
-| gen_paren_pat.rs:7:9:7:11 | (...) | gen_paren_pat.rs:7:10:7:10 | x |
diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.ql b/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.ql
deleted file mode 100644
index 18b7c74b94b8..000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.ql
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-query predicate instances(ParenPat x) { toBeTested(x) and not x.isUnknown() }
-
-query predicate getPat(ParenPat x, Pat getPat) {
-  toBeTested(x) and not x.isUnknown() and getPat = x.getPat()
-}
diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/gen_paren_pat.rs b/rust/ql/test/extractor-tests/generated/ParenPat/gen_paren_pat.rs
deleted file mode 100644
index 33785db95d3d..000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenPat/gen_paren_pat.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_paren_pat() -> () {
-    // A parenthesized pattern.
-    // 
-    // For example:
-    let (x) = 1;
-    //  ^^^
-}
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql b/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql
index 87017b801ec5..9f2e9598d7fb 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql
@@ -8,6 +8,6 @@ query predicate getPath(PathExpr x, Path getPath) {
   toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
 }
 
-query predicate getAttr(PathExpr x, int index, Attr getAttr) {
+query predicate getAttr(PathExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
diff --git a/rust/ql/test/extractor-tests/generated/PathMeta/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/PathMeta/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathMeta/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/PatternTypeRepr/PatternTypeRepr.expected b/rust/ql/test/extractor-tests/generated/PatternTypeRepr/PatternTypeRepr.expected
new file mode 100644
index 000000000000..9e50c1315f74
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PatternTypeRepr/PatternTypeRepr.expected
@@ -0,0 +1,6 @@
+instances
+| gen_pattern_type_repr.rs:7:20:7:51 | PatternTypeRepr |
+getPat
+| gen_pattern_type_repr.rs:7:20:7:51 | PatternTypeRepr | gen_pattern_type_repr.rs:7:48:7:50 | RangePat |
+getTypeRepr
+| gen_pattern_type_repr.rs:7:20:7:51 | PatternTypeRepr | gen_pattern_type_repr.rs:7:41:7:43 | u32 |
diff --git a/rust/ql/test/extractor-tests/generated/PatternTypeRepr/PatternTypeRepr.ql b/rust/ql/test/extractor-tests/generated/PatternTypeRepr/PatternTypeRepr.ql
new file mode 100644
index 000000000000..eb0f19358068
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PatternTypeRepr/PatternTypeRepr.ql
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+query predicate instances(PatternTypeRepr x) { toBeTested(x) and not x.isUnknown() }
+
+query predicate getPat(PatternTypeRepr x, Pat getPat) {
+  toBeTested(x) and not x.isUnknown() and getPat = x.getPat()
+}
+
+query predicate getTypeRepr(PatternTypeRepr x, TypeRepr getTypeRepr) {
+  toBeTested(x) and not x.isUnknown() and getTypeRepr = x.getTypeRepr()
+}
diff --git a/rust/ql/test/extractor-tests/generated/PatternTypeRepr/gen_pattern_type_repr.rs b/rust/ql/test/extractor-tests/generated/PatternTypeRepr/gen_pattern_type_repr.rs
new file mode 100644
index 000000000000..ac721868a8e1
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PatternTypeRepr/gen_pattern_type_repr.rs
@@ -0,0 +1,8 @@
+// generated by codegen, do not edit
+
+fn test_pattern_type_repr() -> () {
+    // A pattern type, constraining a type to values matching a pattern. Pattern types are an
+    // experimental, mostly compiler-internal feature and cannot be written directly in stable
+    // Rust; the example below uses rust-analyzer's canonical `builtin#pattern_type` syntax:
+    type NonZero = builtin#pattern_type(u32 is 1..);
+}
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql
index 0765d6e07d98..381e78667243 100644
--- a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(PrefixExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(PrefixExpr x, int index, Attr getAttr) {
+query predicate getAttr(PrefixExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql
index 69a699f14be5..51ab448b3513 100644
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(RangeExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(RangeExpr x, int index, Attr getAttr) {
+query predicate getAttr(RangeExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql
index a9ae1f9ae8d4..75fb6437cfba 100644
--- a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql
@@ -16,7 +16,7 @@ query predicate instances(
   if x.isRaw() then isRaw = "yes" else isRaw = "no"
 }
 
-query predicate getAttr(RefExpr x, int index, Attr getAttr) {
+query predicate getAttr(RefExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/RestPat/RestPat.ql b/rust/ql/test/extractor-tests/generated/RestPat/RestPat.ql
index 3754d7fd2f23..503d3a0f561b 100644
--- a/rust/ql/test/extractor-tests/generated/RestPat/RestPat.ql
+++ b/rust/ql/test/extractor-tests/generated/RestPat/RestPat.ql
@@ -4,6 +4,6 @@ import TestUtils
 
 query predicate instances(RestPat x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(RestPat x, int index, Attr getAttr) {
+query predicate getAttr(RestPat x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql
index 11eeed2222cb..a83dc49b9b70 100644
--- a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(ReturnExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(ReturnExpr x, int index, Attr getAttr) {
+query predicate getAttr(ReturnExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
index 07dd03a406f1..4e7a446bfabe 100644
--- a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
@@ -13,7 +13,7 @@ query predicate instances(
   if x.isMut() then isMut = "yes" else isMut = "no"
 }
 
-query predicate getAttr(SelfParam x, int index, Attr getAttr) {
+query predicate getAttr(SelfParam x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.ql b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.ql
index 257752e706e6..23afc0e4a34d 100644
--- a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.ql
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(SourceFile x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(SourceFile x, int index, Attr getAttr) {
+query predicate getAttr(SourceFile x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.ql b/rust/ql/test/extractor-tests/generated/Static/Static.ql
index dfd2dd939182..bcc2aaa66b82 100644
--- a/rust/ql/test/extractor-tests/generated/Static/Static.ql
+++ b/rust/ql/test/extractor-tests/generated/Static/Static.ql
@@ -22,7 +22,7 @@ query predicate getAttributeMacroExpansion(Static x, MacroItems getAttributeMacr
   getAttributeMacroExpansion = x.getAttributeMacroExpansion()
 }
 
-query predicate getAttr(Static x, int index, Attr getAttr) {
+query predicate getAttr(Static x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/StmtList.ql b/rust/ql/test/extractor-tests/generated/StmtList/StmtList.ql
index 1dcc1ce6db1e..64896338509a 100644
--- a/rust/ql/test/extractor-tests/generated/StmtList/StmtList.ql
+++ b/rust/ql/test/extractor-tests/generated/StmtList/StmtList.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(StmtList x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(StmtList x, int index, Attr getAttr) {
+query predicate getAttr(StmtList x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct.expected
index 040a035c249c..a703bbc2d072 100644
--- a/rust/ql/test/extractor-tests/generated/Struct/Struct.expected
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct.expected
@@ -3,10 +3,10 @@ instances
 getAttributeMacroExpansion
 getDeriveMacroExpansion
 getAttr
-getFieldList
-| gen_struct.rs:4:5:8:5 | struct Point | gen_struct.rs:5:18:8:5 | StructFieldList |
 getGenericParamList
 getName
 | gen_struct.rs:4:5:8:5 | struct Point | gen_struct.rs:5:12:5:16 | Point |
 getVisibility
 getWhereClause
+getFieldList
+| gen_struct.rs:4:5:8:5 | struct Point | gen_struct.rs:5:18:8:5 | StructFieldList |
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
index a4cf01bbfdc7..73a8ee4c18b4 100644
--- a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
@@ -14,7 +14,7 @@ query predicate getDeriveMacroExpansion(Struct x, int index, MacroItems getDeriv
   toBeTested(x) and not x.isUnknown() and getDeriveMacroExpansion = x.getDeriveMacroExpansion(index)
 }
 
-query predicate getAttr(Struct x, int index, Attr getAttr) {
+query predicate getAttr(Struct x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.ql b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.ql
index 4b4703c88287..2d912a64e7f5 100644
--- a/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.ql
+++ b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(StructExprField x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(StructExprField x, int index, Attr getAttr) {
+query predicate getAttr(StructExprField x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql
index dfa2ea4c324a..7f55585646e8 100644
--- a/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql
+++ b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(StructExprFieldList x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(StructExprFieldList x, int index, Attr getAttr) {
+query predicate getAttr(StructExprFieldList x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/StructField/StructField.expected b/rust/ql/test/extractor-tests/generated/StructField/StructField.expected
index 285d3530c66f..e9bd7c377576 100644
--- a/rust/ql/test/extractor-tests/generated/StructField/StructField.expected
+++ b/rust/ql/test/extractor-tests/generated/StructField/StructField.expected
@@ -1,7 +1,8 @@
 instances
 | gen_struct_field.rs:7:16:7:21 | x: i32 | isUnsafe: | no |
 getAttr
-getDefault
+getDefaultVal
+getMutRestriction
 getName
 | gen_struct_field.rs:7:16:7:21 | x: i32 | gen_struct_field.rs:7:16:7:16 | x |
 getTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/StructField/StructField.ql b/rust/ql/test/extractor-tests/generated/StructField/StructField.ql
index 773f282e36b3..d4dc086c3161 100644
--- a/rust/ql/test/extractor-tests/generated/StructField/StructField.ql
+++ b/rust/ql/test/extractor-tests/generated/StructField/StructField.ql
@@ -9,12 +9,16 @@ query predicate instances(StructField x, string isUnsafe__label, string isUnsafe
   if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
 }
 
-query predicate getAttr(StructField x, int index, Attr getAttr) {
+query predicate getAttr(StructField x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
-query predicate getDefault(StructField x, Expr getDefault) {
-  toBeTested(x) and not x.isUnknown() and getDefault = x.getDefault()
+query predicate getDefaultVal(StructField x, ConstArg getDefaultVal) {
+  toBeTested(x) and not x.isUnknown() and getDefaultVal = x.getDefaultVal()
+}
+
+query predicate getMutRestriction(StructField x, MutRestriction getMutRestriction) {
+  toBeTested(x) and not x.isUnknown() and getMutRestriction = x.getMutRestriction()
 }
 
 query predicate getName(StructField x, Name getName) {
diff --git a/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.ql b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.ql
index 4b3c605590d5..0c9b71df3dd7 100644
--- a/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.ql
+++ b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(StructPatField x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(StructPatField x, int index, Attr getAttr) {
+query predicate getAttr(StructPatField x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/TokenTreeMeta/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TokenTreeMeta/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TokenTreeMeta/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.ql b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.ql
index bbef174971fe..b04cd6e432e4 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.ql
+++ b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.ql
@@ -8,6 +8,6 @@ query predicate getAssocItem(AssocItemList x, int index, AssocItem getAssocItem)
   toBeTested(x) and not x.isUnknown() and getAssocItem = x.getAssocItem(index)
 }
 
-query predicate getAttr(AssocItemList x, int index, Attr getAttr) {
+query predicate getAttr(AssocItemList x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
index 9e8d41cb5ff5..c93a13757517 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
@@ -8,6 +8,7 @@ getAssocItemList
 getAttr
 getGenericParamList
 | gen_trait.rs:10:1:10:57 | trait Foo | gen_trait.rs:10:14:10:30 | <...> |
+getImplRestriction
 getName
 | gen_trait.rs:3:1:8:1 | trait Frobinizable | gen_trait.rs:4:7:4:18 | Frobinizable |
 | gen_trait.rs:10:1:10:57 | trait Foo | gen_trait.rs:10:11:10:13 | Foo |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
index 20e9b7f1e240..dfe87d9bd5a3 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
@@ -23,7 +23,7 @@ query predicate getAssocItemList(Trait x, AssocItemList getAssocItemList) {
   toBeTested(x) and not x.isUnknown() and getAssocItemList = x.getAssocItemList()
 }
 
-query predicate getAttr(Trait x, int index, Attr getAttr) {
+query predicate getAttr(Trait x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
@@ -31,6 +31,10 @@ query predicate getGenericParamList(Trait x, GenericParamList getGenericParamLis
   toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList()
 }
 
+query predicate getImplRestriction(Trait x, ImplRestriction getImplRestriction) {
+  toBeTested(x) and not x.isUnknown() and getImplRestriction = x.getImplRestriction()
+}
+
 query predicate getName(Trait x, Name getName) {
   toBeTested(x) and not x.isUnknown() and getName = x.getName()
 }
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql
deleted file mode 100644
index c0fee75678af..000000000000
--- a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql
+++ /dev/null
@@ -1,35 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-query predicate instances(TraitAlias x) { toBeTested(x) and not x.isUnknown() }
-
-query predicate getAttributeMacroExpansion(TraitAlias x, MacroItems getAttributeMacroExpansion) {
-  toBeTested(x) and
-  not x.isUnknown() and
-  getAttributeMacroExpansion = x.getAttributeMacroExpansion()
-}
-
-query predicate getAttr(TraitAlias x, int index, Attr getAttr) {
-  toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
-}
-
-query predicate getGenericParamList(TraitAlias x, GenericParamList getGenericParamList) {
-  toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList()
-}
-
-query predicate getName(TraitAlias x, Name getName) {
-  toBeTested(x) and not x.isUnknown() and getName = x.getName()
-}
-
-query predicate getTypeBoundList(TraitAlias x, TypeBoundList getTypeBoundList) {
-  toBeTested(x) and not x.isUnknown() and getTypeBoundList = x.getTypeBoundList()
-}
-
-query predicate getVisibility(TraitAlias x, Visibility getVisibility) {
-  toBeTested(x) and not x.isUnknown() and getVisibility = x.getVisibility()
-}
-
-query predicate getWhereClause(TraitAlias x, WhereClause getWhereClause) {
-  toBeTested(x) and not x.isUnknown() and getWhereClause = x.getWhereClause()
-}
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/gen_trait_alias.rs b/rust/ql/test/extractor-tests/generated/TraitAlias/gen_trait_alias.rs
deleted file mode 100644
index 6fa75a8a08d4..000000000000
--- a/rust/ql/test/extractor-tests/generated/TraitAlias/gen_trait_alias.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_trait_alias() -> () {
-    // A trait alias.
-    // 
-    // For example:
-    trait Foo = Bar + Baz;
-}
diff --git a/rust/ql/test/extractor-tests/generated/TryBlockModifier/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TryBlockModifier/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TryBlockModifier/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.ql b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.ql
index fc42bca14a93..9c24d794602d 100644
--- a/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(TryExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(TryExpr x, int index, Attr getAttr) {
+query predicate getAttr(TryExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql
index 0b49fca4cee8..3fc780bfc5c7 100644
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(TupleExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(TupleExpr x, int index, Attr getAttr) {
+query predicate getAttr(TupleExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.expected b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.expected
index 6c653a9c37f4..56f7369b8ec5 100644
--- a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.expected
@@ -2,6 +2,7 @@ instances
 | gen_tuple_field.rs:7:14:7:16 | TupleField |
 | gen_tuple_field.rs:7:19:7:24 | TupleField |
 getAttr
+getMutRestriction
 getTypeRepr
 | gen_tuple_field.rs:7:14:7:16 | TupleField | gen_tuple_field.rs:7:14:7:16 | i32 |
 | gen_tuple_field.rs:7:19:7:24 | TupleField | gen_tuple_field.rs:7:19:7:24 | String |
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql
index 01c15ace3ddf..91f5db297d96 100644
--- a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql
@@ -4,10 +4,14 @@ import TestUtils
 
 query predicate instances(TupleField x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(TupleField x, int index, Attr getAttr) {
+query predicate getAttr(TupleField x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
+query predicate getMutRestriction(TupleField x, MutRestriction getMutRestriction) {
+  toBeTested(x) and not x.isUnknown() and getMutRestriction = x.getMutRestriction()
+}
+
 query predicate getTypeRepr(TupleField x, TypeRepr getTypeRepr) {
   toBeTested(x) and not x.isUnknown() and getTypeRepr = x.getTypeRepr()
 }
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
index 925be1f44a30..4d337609cddf 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
@@ -15,7 +15,7 @@ query predicate getAttributeMacroExpansion(TypeAlias x, MacroItems getAttributeM
   getAttributeMacroExpansion = x.getAttributeMacroExpansion()
 }
 
-query predicate getAttr(TypeAlias x, int index, Attr getAttr) {
+query predicate getAttr(TypeAlias x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.ql b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.ql
index 61f38aab8352..a2be2a61baf0 100644
--- a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(TypeParam x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(TypeParam x, int index, Attr getAttr) {
+query predicate getAttr(TypeParam x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql
index 13324f21bf24..b17002defbc6 100644
--- a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql
@@ -4,6 +4,6 @@ import TestUtils
 
 query predicate instances(UnderscoreExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(UnderscoreExpr x, int index, Attr getAttr) {
+query predicate getAttr(UnderscoreExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.expected b/rust/ql/test/extractor-tests/generated/Union/Union.expected
index b83a39b708da..b52769ad2fbe 100644
--- a/rust/ql/test/extractor-tests/generated/Union/Union.expected
+++ b/rust/ql/test/extractor-tests/generated/Union/Union.expected
@@ -6,7 +6,7 @@ getAttr
 getGenericParamList
 getName
 | gen_union.rs:4:5:7:32 | union U | gen_union.rs:7:11:7:11 | U |
-getStructFieldList
-| gen_union.rs:4:5:7:32 | union U | gen_union.rs:7:13:7:32 | StructFieldList |
 getVisibility
 getWhereClause
+getStructFieldList
+| gen_union.rs:4:5:7:32 | union U | gen_union.rs:7:13:7:32 | StructFieldList |
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.ql b/rust/ql/test/extractor-tests/generated/Union/Union.ql
index 922e8ef4a591..da29f652ce2f 100644
--- a/rust/ql/test/extractor-tests/generated/Union/Union.ql
+++ b/rust/ql/test/extractor-tests/generated/Union/Union.ql
@@ -14,7 +14,7 @@ query predicate getDeriveMacroExpansion(Union x, int index, MacroItems getDerive
   toBeTested(x) and not x.isUnknown() and getDeriveMacroExpansion = x.getDeriveMacroExpansion(index)
 }
 
-query predicate getAttr(Union x, int index, Attr getAttr) {
+query predicate getAttr(Union x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeMeta/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/UnsafeMeta/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UnsafeMeta/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use.ql b/rust/ql/test/extractor-tests/generated/Use/Use.ql
index e6940ef9e245..119943bb7d71 100644
--- a/rust/ql/test/extractor-tests/generated/Use/Use.ql
+++ b/rust/ql/test/extractor-tests/generated/Use/Use.ql
@@ -10,7 +10,7 @@ query predicate getAttributeMacroExpansion(Use x, MacroItems getAttributeMacroEx
   getAttributeMacroExpansion = x.getAttributeMacroExpansion()
 }
 
-query predicate getAttr(Use x, int index, Attr getAttr) {
+query predicate getAttr(Use x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant.expected
index 4c67e1684b00..112c0a3522a5 100644
--- a/rust/ql/test/extractor-tests/generated/Variant/Variant.expected
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant.expected
@@ -3,7 +3,7 @@ instances
 | gen_variant.rs:7:17:7:22 | B |
 | gen_variant.rs:7:25:7:36 | C |
 getAttr
-getDiscriminant
+getConstArg
 getFieldList
 | gen_variant.rs:7:17:7:22 | B | gen_variant.rs:7:18:7:22 | TupleFieldList |
 | gen_variant.rs:7:25:7:36 | C | gen_variant.rs:7:27:7:36 | StructFieldList |
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
index 61c142671163..9e4b13be85e9 100644
--- a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
@@ -4,12 +4,12 @@ import TestUtils
 
 query predicate instances(Variant x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(Variant x, int index, Attr getAttr) {
+query predicate getAttr(Variant x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
-query predicate getDiscriminant(Variant x, Expr getDiscriminant) {
-  toBeTested(x) and not x.isUnknown() and getDiscriminant = x.getDiscriminant()
+query predicate getConstArg(Variant x, ConstArg getConstArg) {
+  toBeTested(x) and not x.isUnknown() and getConstArg = x.getConstArg()
 }
 
 query predicate getFieldList(Variant x, FieldList getFieldList) {
diff --git a/rust/ql/test/extractor-tests/generated/Visibility/Visibility.expected b/rust/ql/test/extractor-tests/generated/Visibility/Visibility.expected
index 2d032d6eee46..b843c1448381 100644
--- a/rust/ql/test/extractor-tests/generated/Visibility/Visibility.expected
+++ b/rust/ql/test/extractor-tests/generated/Visibility/Visibility.expected
@@ -1,4 +1,4 @@
 instances
 | gen_visibility.rs:7:7:7:9 | pub |
 | lib.rs:1:1:1:3 | pub |
-getPath
+getVisibilityInner
diff --git a/rust/ql/test/extractor-tests/generated/Visibility/Visibility.ql b/rust/ql/test/extractor-tests/generated/Visibility/Visibility.ql
index 651d0aecb2f3..c3093262904b 100644
--- a/rust/ql/test/extractor-tests/generated/Visibility/Visibility.ql
+++ b/rust/ql/test/extractor-tests/generated/Visibility/Visibility.ql
@@ -4,6 +4,6 @@ import TestUtils
 
 query predicate instances(Visibility x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getPath(Visibility x, Path getPath) {
-  toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
+query predicate getVisibilityInner(Visibility x, VisibilityInner getVisibilityInner) {
+  toBeTested(x) and not x.isUnknown() and getVisibilityInner = x.getVisibilityInner()
 }
diff --git a/rust/ql/test/extractor-tests/generated/VisibilityInner/VisibilityInner.expected b/rust/ql/test/extractor-tests/generated/VisibilityInner/VisibilityInner.expected
new file mode 100644
index 000000000000..c2de2f439823
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/VisibilityInner/VisibilityInner.expected
@@ -0,0 +1,4 @@
+instances
+| gen_visibility_inner.rs:5:8:5:20 | VisibilityInner |
+getPath
+| gen_visibility_inner.rs:5:8:5:20 | VisibilityInner | gen_visibility_inner.rs:5:12:5:19 | ...::bar |
diff --git a/rust/ql/test/extractor-tests/generated/VisibilityInner/VisibilityInner.ql b/rust/ql/test/extractor-tests/generated/VisibilityInner/VisibilityInner.ql
new file mode 100644
index 000000000000..9bc1434fce57
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/VisibilityInner/VisibilityInner.ql
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+query predicate instances(VisibilityInner x) { toBeTested(x) and not x.isUnknown() }
+
+query predicate getPath(VisibilityInner x, Path getPath) {
+  toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
+}
diff --git a/rust/ql/test/extractor-tests/generated/VisibilityInner/gen_visibility_inner.rs b/rust/ql/test/extractor-tests/generated/VisibilityInner/gen_visibility_inner.rs
new file mode 100644
index 000000000000..70dd4bad6820
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/VisibilityInner/gen_visibility_inner.rs
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+
+fn test_visibility_inner() -> () {
+    // The parenthesized inner part of a visibility modifier or restriction, such as the `(in path)` in `pub(in path)`, or the `(crate)` in `pub(crate)`. For example the `(in foo::bar)` in:
+    pub(in foo::bar) struct S;
+    //  ^^^^^^^^^^^^
+}
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql
index 67a0dc562ad2..47b19361ed83 100644
--- a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql
@@ -12,7 +12,7 @@ query predicate getLoopBody(WhileExpr x, BlockExpr getLoopBody) {
   toBeTested(x) and not x.isUnknown() and getLoopBody = x.getLoopBody()
 }
 
-query predicate getAttr(WhileExpr x, int index, Attr getAttr) {
+query predicate getAttr(WhileExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql
index 88d4e570a1e8..64db2d71ae3e 100644
--- a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(YeetExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(YeetExpr x, int index, Attr getAttr) {
+query predicate getAttr(YeetExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql
index 68281d39d9e9..4680d571066f 100644
--- a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 query predicate instances(YieldExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getAttr(YieldExpr x, int index, Attr getAttr) {
+query predicate getAttr(YieldExpr x, int index, AnyAttr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/Cargo.lock b/rust/ql/test/extractor-tests/macro-expansion-cfg/Cargo.lock
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ParenExpr/Cargo.lock
rename to rust/ql/test/extractor-tests/macro-expansion-cfg/Cargo.lock
diff --git a/rust/ql/test/extractor-tests/macro-expansion-cfg/cfg_macro.expected b/rust/ql/test/extractor-tests/macro-expansion-cfg/cfg_macro.expected
new file mode 100644
index 000000000000..51ce8be37062
--- /dev/null
+++ b/rust/ql/test/extractor-tests/macro-expansion-cfg/cfg_macro.expected
@@ -0,0 +1,2 @@
+| cfg_macro.rs:15:1:15:15 | fn from_macro_enabled | from_macro_enabled |
+| cfg_macro.rs:21:1:22:26 | fn direct_enabled | direct_enabled |
diff --git a/rust/ql/test/extractor-tests/macro-expansion-cfg/cfg_macro.ql b/rust/ql/test/extractor-tests/macro-expansion-cfg/cfg_macro.ql
new file mode 100644
index 000000000000..93c4b4d80edf
--- /dev/null
+++ b/rust/ql/test/extractor-tests/macro-expansion-cfg/cfg_macro.ql
@@ -0,0 +1,6 @@
+import rust
+import TestUtils
+
+query predicate functions(Function f, string name) {
+  toBeTested(f) and name = f.getName().getText()
+}
diff --git a/rust/ql/test/extractor-tests/macro-expansion-cfg/cfg_macro.rs b/rust/ql/test/extractor-tests/macro-expansion-cfg/cfg_macro.rs
new file mode 100644
index 000000000000..ea4799b49b5e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/macro-expansion-cfg/cfg_macro.rs
@@ -0,0 +1,22 @@
+// Regression test: `#[cfg(...)]`-disabled items produced by a macro expansion must be
+// excluded from extraction, just like disabled items written directly in a source file.
+// `any()` is always false and `all()` is always true, so this does not depend on crate features.
+
+macro_rules! make_cfg_items {
+    () => {
+        #[cfg(any())] // always false: must be excluded
+        pub fn from_macro_disabled() {}
+
+        #[cfg(all())] // always true: must be kept
+        pub fn from_macro_enabled() {}
+    };
+}
+
+make_cfg_items!();
+
+// Baseline: the same predicates on items written directly in the file (not via a macro).
+#[cfg(any())] // always false: must be excluded
+pub fn direct_disabled() {}
+
+#[cfg(all())] // always true: must be kept
+pub fn direct_enabled() {}
diff --git a/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected b/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected
index 1c584f952897..5a1568f12d83 100644
--- a/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected
+++ b/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected
@@ -174,7 +174,7 @@ macro_expansion.rs:
 #    1|           getPath(): [Path] MyTrait
 #    1|             getSegment(): [PathSegment] MyTrait
 #    1|               getIdentifier(): [NameRef] MyTrait
-#    3|   getItem(1): [Function] (item with attribute macro expansion)
+#    3|   getItem(1): [Function] fn 
 #    4|     getAttributeMacroExpansion(): [MacroItems] MacroItems
 #    4|       getItem(0): [Function] fn foo
 #    4|         getParamList(): [ParamList] ParamList
@@ -190,7 +190,7 @@ macro_expansion.rs:
 #    5|                         getIdentifier(): [NameRef] concat
 #    5|                     getTokenTree(): [TokenTree] TokenTree
 #    5|                     getMacroCallExpansion(): [StringLiteralExpr] "Hello world!"
-#    7|             getStatement(1): [Function] (item with attribute macro expansion)
+#    7|             getStatement(1): [Function] fn 
 #    8|               getAttributeMacroExpansion(): [MacroItems] MacroItems
 #    8|                 getItem(0): [Function] fn inner_0
 #    8|                   getParamList(): [ParamList] ParamList
@@ -203,7 +203,7 @@ macro_expansion.rs:
 #    8|                     getStmtList(): [StmtList] StmtList
 #    8|                   getName(): [Name] inner_1
 #    7|               getAttr(0): [Attr] Attr
-#    7|                 getMeta(): [Meta] Meta
+#    7|                 getMeta(): [TokenTreeMeta] TokenTreeMeta
 #    7|                   getPath(): [Path] repeat
 #    7|                     getSegment(): [PathSegment] repeat
 #    7|                       getIdentifier(): [NameRef] repeat
@@ -238,7 +238,7 @@ macro_expansion.rs:
 #    5|                         getIdentifier(): [NameRef] concat
 #    5|                     getTokenTree(): [TokenTree] TokenTree
 #    5|                     getMacroCallExpansion(): [StringLiteralExpr] "Hello world!"
-#    7|             getStatement(1): [Function] (item with attribute macro expansion)
+#    7|             getStatement(1): [Function] fn 
 #    8|               getAttributeMacroExpansion(): [MacroItems] MacroItems
 #    8|                 getItem(0): [Function] fn inner_0
 #    8|                   getParamList(): [ParamList] ParamList
@@ -251,7 +251,7 @@ macro_expansion.rs:
 #    8|                     getStmtList(): [StmtList] StmtList
 #    8|                   getName(): [Name] inner_1
 #    7|               getAttr(0): [Attr] Attr
-#    7|                 getMeta(): [Meta] Meta
+#    7|                 getMeta(): [TokenTreeMeta] TokenTreeMeta
 #    7|                   getPath(): [Path] repeat
 #    7|                     getSegment(): [PathSegment] repeat
 #    7|                       getIdentifier(): [NameRef] repeat
@@ -273,13 +273,13 @@ macro_expansion.rs:
 #    4|         getName(): [Name] foo_new
 #    4|         getVisibility(): [Visibility] pub
 #    3|     getAttr(0): [Attr] Attr
-#    3|       getMeta(): [Meta] Meta
+#    3|       getMeta(): [PathMeta] PathMeta
 #    3|         getPath(): [Path] add_one
 #    3|           getSegment(): [PathSegment] add_one
 #    3|             getIdentifier(): [NameRef] add_one
-#   14|   getItem(2): [Function] (item with attribute macro expansion)
+#   14|   getItem(2): [Function] fn 
 #   15|     getAttributeMacroExpansion(): [MacroItems] MacroItems
-#   15|       getItem(0): [Function] (item with attribute macro expansion)
+#   15|       getItem(0): [Function] fn 
 #   16|         getAttributeMacroExpansion(): [MacroItems] MacroItems
 #   16|           getItem(0): [Function] fn bar_0
 #   16|             getParamList(): [ParamList] ParamList
@@ -294,11 +294,11 @@ macro_expansion.rs:
 #   16|             getName(): [Name] bar_0_new
 #   16|             getVisibility(): [Visibility] pub
 #   15|         getAttr(0): [Attr] Attr
-#   15|           getMeta(): [Meta] Meta
+#   15|           getMeta(): [PathMeta] PathMeta
 #   15|             getPath(): [Path] add_one
 #   15|               getSegment(): [PathSegment] add_one
 #   15|                 getIdentifier(): [NameRef] add_one
-#   15|       getItem(1): [Function] (item with attribute macro expansion)
+#   15|       getItem(1): [Function] fn 
 #   16|         getAttributeMacroExpansion(): [MacroItems] MacroItems
 #   16|           getItem(0): [Function] fn bar_1
 #   16|             getParamList(): [ParamList] ParamList
@@ -313,25 +313,25 @@ macro_expansion.rs:
 #   16|             getName(): [Name] bar_1_new
 #   16|             getVisibility(): [Visibility] pub
 #   15|         getAttr(0): [Attr] Attr
-#   15|           getMeta(): [Meta] Meta
+#   15|           getMeta(): [PathMeta] PathMeta
 #   15|             getPath(): [Path] add_one
 #   15|               getSegment(): [PathSegment] add_one
 #   15|                 getIdentifier(): [NameRef] add_one
 #   14|     getAttr(0): [Attr] Attr
-#   14|       getMeta(): [Meta] Meta
+#   14|       getMeta(): [TokenTreeMeta] TokenTreeMeta
 #   14|         getPath(): [Path] repeat
 #   14|           getSegment(): [PathSegment] repeat
 #   14|             getIdentifier(): [NameRef] repeat
 #   14|         getTokenTree(): [TokenTree] TokenTree
 #   15|     getAttr(1): [Attr] Attr
-#   15|       getMeta(): [Meta] Meta
+#   15|       getMeta(): [PathMeta] PathMeta
 #   15|         getPath(): [Path] add_one
 #   15|           getSegment(): [PathSegment] add_one
 #   15|             getIdentifier(): [NameRef] add_one
-#   18|   getItem(3): [Function] (item with attribute macro expansion)
+#   18|   getItem(3): [Function] fn 
 #   18|     getAttributeMacroExpansion(): [MacroItems] MacroItems
 #   18|     getAttr(0): [Attr] Attr
-#   18|       getMeta(): [Meta] Meta
+#   18|       getMeta(): [PathMeta] PathMeta
 #   18|         getPath(): [Path] erase
 #   18|           getSegment(): [PathSegment] erase
 #   18|             getIdentifier(): [NameRef] erase
@@ -343,7 +343,7 @@ macro_expansion.rs:
 #   28|     getVisibility(): [Visibility] pub
 #   30|   getItem(6): [Impl] impl S { ... }
 #   30|     getAssocItemList(): [AssocItemList] AssocItemList
-#   31|       getAssocItem(0): [Function] (item with attribute macro expansion)
+#   31|       getAssocItem(0): [Function] fn 
 #   32|         getAttributeMacroExpansion(): [MacroItems] MacroItems
 #   32|           getItem(0): [Function] fn bzz_0
 #   32|             getParamList(): [ParamList] ParamList
@@ -496,7 +496,7 @@ macro_expansion.rs:
 #   32|             getName(): [Name] bzz_2
 #   32|             getVisibility(): [Visibility] pub
 #   31|         getAttr(0): [Attr] Attr
-#   31|           getMeta(): [Meta] Meta
+#   31|           getMeta(): [TokenTreeMeta] TokenTreeMeta
 #   31|             getPath(): [Path] repeat
 #   31|               getSegment(): [PathSegment] repeat
 #   31|                 getIdentifier(): [NameRef] repeat
@@ -579,13 +579,12 @@ macro_expansion.rs:
 #   56|                                     getMacroCallExpansion(): [FormatArgsExpr] FormatArgsExpr
 #   57|                                       getArg(0): [FormatArgsArg] FormatArgsArg
 #   57|                                         getExpr(): [StringLiteralExpr] "hi"
-#   56|                                       getTemplate(): [ParenExpr] (...)
-#   56|                                         getExpr(): [MacroExpr] MacroExpr
-#   56|                                           getMacroCall(): [MacroCall] concat!...
-#   56|                                             getPath(): [Path] concat
-#   56|                                               getSegment(): [PathSegment] concat
-#   56|                                                 getIdentifier(): [NameRef] concat
-#   56|                                             getTokenTree(): [TokenTree] TokenTree
+#   56|                                       getTemplate(): [MacroExpr] MacroExpr
+#   56|                                         getMacroCall(): [MacroCall] concat!...
+#   56|                                           getPath(): [Path] concat
+#   56|                                             getSegment(): [PathSegment] concat
+#   56|                                               getIdentifier(): [NameRef] concat
+#   56|                                           getTokenTree(): [TokenTree] TokenTree
 #   55|                               getFunction(): [PathExpr] ...::format
 #   55|                                 getPath(): [Path] ...::format
 #   55|                                   getQualifier(): [Path] ...::fmt
@@ -631,7 +630,7 @@ macro_expansion.rs:
 #   63|   getItem(12): [Function] fn documented
 #   64|     getParamList(): [ParamList] ParamList
 #   63|     getAttr(0): [Attr] Attr
-#   63|       getMeta(): [Meta] Meta
+#   63|       getMeta(): [KeyValueMeta] KeyValueMeta
 #   63|         getExpr(): [MacroExpr] MacroExpr
 #   63|           getMacroCall(): [MacroCall] include_str!...
 #   63|             getPath(): [Path] include_str
@@ -720,10 +719,10 @@ macro_expansion.rs:
 #   79|                 getSegment(): [PathSegment] i32
 #   79|                   getIdentifier(): [NameRef] i32
 #   83|   getItem(17): [Struct] struct MyDerive
-#   84|     getDeriveMacroExpansion(0): [MacroItems] MacroItems
-#   84|       getItem(0): [Impl] impl ...::Debug for MyDerive::<...> { ... }
-#   84|         getAssocItemList(): [AssocItemList] AssocItemList
-#   84|           getAssocItem(0): [Function] fn fmt
+#   83|     getDeriveMacroExpansion(0): [MacroItems] MacroItems
+#   83|       getItem(0): [Impl] impl ...::Debug for MyDerive::<...> { ... }
+#   83|         getAssocItemList(): [AssocItemList] AssocItemList
+#   83|           getAssocItem(0): [Function] fn fmt
 #   83|             getParamList(): [ParamList] ParamList
 #   83|               getParam(0): [Param] ...: ...
 #   83|                 getTypeRepr(): [RefTypeRepr] RefTypeRepr
@@ -741,22 +740,22 @@ macro_expansion.rs:
 #   83|                   getName(): [Name] f
 #   83|               getSelfParam(): [SelfParam] SelfParam
 #   83|                 getName(): [Name] self
-#   84|             getFunctionBody(): [BlockExpr] { ... }
-#   84|               getStmtList(): [StmtList] StmtList
-#   84|                 getTailExpr(): [MatchExpr] match self { ... }
+#   83|             getFunctionBody(): [BlockExpr] { ... }
+#   83|               getStmtList(): [StmtList] StmtList
+#   83|                 getTailExpr(): [MatchExpr] match self { ... }
 #   83|                   getScrutinee(): [VariableAccess] self
 #   83|                     getPath(): [Path] self
 #   83|                       getSegment(): [PathSegment] self
 #   83|                         getIdentifier(): [NameRef] self
-#   84|                   getMatchArmList(): [MatchArmList] MatchArmList
-#   84|                     getArm(0): [MatchArm] ... => ...
-#   85|                       getExpr(): [MethodCallExpr] ... .finish()
+#   83|                   getMatchArmList(): [MatchArmList] MatchArmList
+#   83|                     getArm(0): [MatchArm] ... => ...
+#   83|                       getExpr(): [MethodCallExpr] ... .finish()
 #   83|                         getArgList(): [ArgList] ArgList
 #   83|                         getIdentifier(): [NameRef] finish
-#   85|                         getReceiver(): [MethodCallExpr] ... .field(...)
-#   85|                           getArgList(): [ArgList] ArgList
+#   83|                         getReceiver(): [MethodCallExpr] ... .field(...)
+#   83|                           getArgList(): [ArgList] ArgList
 #   83|                             getArg(0): [StringLiteralExpr] "field"
-#   85|                             getArg(1): [RefExpr] &field
+#   83|                             getArg(1): [RefExpr] &field
 #   85|                               getExpr(): [VariableAccess] field
 #   85|                                 getPath(): [Path] field
 #   85|                                   getSegment(): [PathSegment] field
@@ -770,12 +769,12 @@ macro_expansion.rs:
 #   83|                               getPath(): [Path] f
 #   83|                                 getSegment(): [PathSegment] f
 #   83|                                   getIdentifier(): [NameRef] f
-#   84|                       getPat(): [StructPat] MyDerive {...}
+#   83|                       getPat(): [StructPat] MyDerive {...}
 #   84|                         getPath(): [Path] MyDerive
 #   84|                           getSegment(): [PathSegment] MyDerive
 #   84|                             getIdentifier(): [NameRef] MyDerive
-#   85|                         getStructPatFieldList(): [StructPatFieldList] StructPatFieldList
-#   85|                           getField(0): [StructPatField] field: ...
+#   83|                         getStructPatFieldList(): [StructPatFieldList] StructPatFieldList
+#   83|                           getField(0): [StructPatField] field: ...
 #   85|                             getIdentifier(): [NameRef] field
 #   85|                             getPat(): [IdentPat] field
 #   85|                               getName(): [Name] field
@@ -792,9 +791,9 @@ macro_expansion.rs:
 #   83|                   getSegment(): [PathSegment] Result
 #   83|                     getIdentifier(): [NameRef] Result
 #   83|         getGenericParamList(): [GenericParamList] <...>
-#   84|         getSelfTy(): [PathTypeRepr] MyDerive::<...>
-#   84|           getPath(): [Path] MyDerive::<...>
-#   84|             getSegment(): [PathSegment] MyDerive::<...>
+#   83|         getSelfTy(): [PathTypeRepr] MyDerive::<...>
+#   83|           getPath(): [Path] MyDerive::<...>
+#   83|             getSegment(): [PathSegment] MyDerive::<...>
 #   83|               getGenericArgList(): [GenericArgList] <...>
 #   84|               getIdentifier(): [NameRef] MyDerive
 #   83|         getTraitTy(): [PathTypeRepr] ...::Debug
@@ -809,7 +808,7 @@ macro_expansion.rs:
 #   83|               getIdentifier(): [NameRef] Debug
 #   83|         getWhereClause(): [WhereClause] WhereClause
 #   83|     getAttr(0): [Attr] Attr
-#   83|       getMeta(): [Meta] Meta
+#   83|       getMeta(): [TokenTreeMeta] TokenTreeMeta
 #   83|         getPath(): [Path] derive
 #   83|           getSegment(): [PathSegment] derive
 #   83|             getIdentifier(): [NameRef] derive
@@ -823,10 +822,10 @@ macro_expansion.rs:
 #   85|             getSegment(): [PathSegment] usize
 #   85|               getIdentifier(): [NameRef] usize
 #   88|   getItem(18): [Enum] enum MyDeriveEnum
-#   89|     getDeriveMacroExpansion(0): [MacroItems] MacroItems
-#   89|       getItem(0): [Impl] impl ...::PartialEq for MyDeriveEnum::<...> { ... }
-#   89|         getAssocItemList(): [AssocItemList] AssocItemList
-#   89|           getAssocItem(0): [Function] fn eq
+#   88|     getDeriveMacroExpansion(0): [MacroItems] MacroItems
+#   88|       getItem(0): [Impl] impl ...::PartialEq for MyDeriveEnum::<...> { ... }
+#   88|         getAssocItemList(): [AssocItemList] AssocItemList
+#   88|           getAssocItem(0): [Function] fn eq
 #   88|             getParamList(): [ParamList] ParamList
 #   88|               getParam(0): [Param] ...: ...
 #   88|                 getTypeRepr(): [RefTypeRepr] RefTypeRepr
@@ -838,9 +837,9 @@ macro_expansion.rs:
 #   88|                   getName(): [Name] other
 #   88|               getSelfParam(): [SelfParam] SelfParam
 #   88|                 getName(): [Name] self
-#   89|             getFunctionBody(): [BlockExpr] { ... }
-#   89|               getStmtList(): [StmtList] StmtList
-#   89|                 getTailExpr(): [MatchExpr] match ... { ... }
+#   88|             getFunctionBody(): [BlockExpr] { ... }
+#   88|               getStmtList(): [StmtList] StmtList
+#   88|                 getTailExpr(): [MatchExpr] match ... { ... }
 #   88|                   getScrutinee(): [TupleExpr] TupleExpr
 #   88|                     getField(0): [VariableAccess] self
 #   88|                       getPath(): [Path] self
@@ -850,36 +849,36 @@ macro_expansion.rs:
 #   88|                       getPath(): [Path] other
 #   88|                         getSegment(): [PathSegment] other
 #   88|                           getIdentifier(): [NameRef] other
-#   89|                   getMatchArmList(): [MatchArmList] MatchArmList
-#   89|                     getArm(0): [MatchArm] ... => true
+#   88|                   getMatchArmList(): [MatchArmList] MatchArmList
+#   88|                     getArm(0): [MatchArm] ... => true
 #   88|                       getExpr(): [BooleanLiteralExpr] true
-#   89|                       getPat(): [TuplePat] TuplePat
-#   89|                         getField(0): [PathPat] ...::Variant1
-#   89|                           getPath(): [Path] ...::Variant1
+#   88|                       getPat(): [TuplePat] TuplePat
+#   88|                         getField(0): [PathPat] ...::Variant1
+#   88|                           getPath(): [Path] ...::Variant1
 #   89|                             getQualifier(): [Path] MyDeriveEnum
 #   89|                               getSegment(): [PathSegment] MyDeriveEnum
 #   89|                                 getIdentifier(): [NameRef] MyDeriveEnum
 #   90|                             getSegment(): [PathSegment] Variant1
 #   90|                               getIdentifier(): [NameRef] Variant1
-#   89|                         getField(1): [PathPat] ...::Variant1
-#   89|                           getPath(): [Path] ...::Variant1
+#   88|                         getField(1): [PathPat] ...::Variant1
+#   88|                           getPath(): [Path] ...::Variant1
 #   89|                             getQualifier(): [Path] MyDeriveEnum
 #   89|                               getSegment(): [PathSegment] MyDeriveEnum
 #   89|                                 getIdentifier(): [NameRef] MyDeriveEnum
 #   90|                             getSegment(): [PathSegment] Variant1
 #   90|                               getIdentifier(): [NameRef] Variant1
-#   89|                     getArm(1): [MatchArm] ... => true
+#   88|                     getArm(1): [MatchArm] ... => true
 #   88|                       getExpr(): [BooleanLiteralExpr] true
-#   89|                       getPat(): [TuplePat] TuplePat
-#   89|                         getField(0): [PathPat] ...::Variant2
-#   89|                           getPath(): [Path] ...::Variant2
+#   88|                       getPat(): [TuplePat] TuplePat
+#   88|                         getField(0): [PathPat] ...::Variant2
+#   88|                           getPath(): [Path] ...::Variant2
 #   89|                             getQualifier(): [Path] MyDeriveEnum
 #   89|                               getSegment(): [PathSegment] MyDeriveEnum
 #   89|                                 getIdentifier(): [NameRef] MyDeriveEnum
 #   91|                             getSegment(): [PathSegment] Variant2
 #   91|                               getIdentifier(): [NameRef] Variant2
-#   89|                         getField(1): [PathPat] ...::Variant2
-#   89|                           getPath(): [Path] ...::Variant2
+#   88|                         getField(1): [PathPat] ...::Variant2
+#   88|                           getPath(): [Path] ...::Variant2
 #   89|                             getQualifier(): [Path] MyDeriveEnum
 #   89|                               getSegment(): [PathSegment] MyDeriveEnum
 #   89|                                 getIdentifier(): [NameRef] MyDeriveEnum
@@ -896,9 +895,9 @@ macro_expansion.rs:
 #   88|                   getSegment(): [PathSegment] bool
 #   88|                     getIdentifier(): [NameRef] bool
 #   88|         getGenericParamList(): [GenericParamList] <...>
-#   89|         getSelfTy(): [PathTypeRepr] MyDeriveEnum::<...>
-#   89|           getPath(): [Path] MyDeriveEnum::<...>
-#   89|             getSegment(): [PathSegment] MyDeriveEnum::<...>
+#   88|         getSelfTy(): [PathTypeRepr] MyDeriveEnum::<...>
+#   88|           getPath(): [Path] MyDeriveEnum::<...>
+#   88|             getSegment(): [PathSegment] MyDeriveEnum::<...>
 #   88|               getGenericArgList(): [GenericArgList] <...>
 #   89|               getIdentifier(): [NameRef] MyDeriveEnum
 #   88|         getTraitTy(): [PathTypeRepr] ...::PartialEq
@@ -912,13 +911,13 @@ macro_expansion.rs:
 #   88|             getSegment(): [PathSegment] PartialEq
 #   88|               getIdentifier(): [NameRef] PartialEq
 #   88|         getWhereClause(): [WhereClause] WhereClause
-#   89|     getDeriveMacroExpansion(1): [MacroItems] MacroItems
-#   89|       getItem(0): [Impl] impl ...::Eq for MyDeriveEnum::<...> { ... }
+#   88|     getDeriveMacroExpansion(1): [MacroItems] MacroItems
+#   88|       getItem(0): [Impl] impl ...::Eq for MyDeriveEnum::<...> { ... }
 #   88|         getAssocItemList(): [AssocItemList] AssocItemList
 #   88|         getGenericParamList(): [GenericParamList] <...>
-#   89|         getSelfTy(): [PathTypeRepr] MyDeriveEnum::<...>
-#   89|           getPath(): [Path] MyDeriveEnum::<...>
-#   89|             getSegment(): [PathSegment] MyDeriveEnum::<...>
+#   88|         getSelfTy(): [PathTypeRepr] MyDeriveEnum::<...>
+#   88|           getPath(): [Path] MyDeriveEnum::<...>
+#   88|             getSegment(): [PathSegment] MyDeriveEnum::<...>
 #   88|               getGenericArgList(): [GenericArgList] <...>
 #   89|               getIdentifier(): [NameRef] MyDeriveEnum
 #   88|         getTraitTy(): [PathTypeRepr] ...::Eq
@@ -933,7 +932,7 @@ macro_expansion.rs:
 #   88|               getIdentifier(): [NameRef] Eq
 #   88|         getWhereClause(): [WhereClause] WhereClause
 #   88|     getAttr(0): [Attr] Attr
-#   88|       getMeta(): [Meta] Meta
+#   88|       getMeta(): [TokenTreeMeta] TokenTreeMeta
 #   88|         getPath(): [Path] derive
 #   88|           getSegment(): [PathSegment] derive
 #   88|             getIdentifier(): [NameRef] derive
@@ -989,7 +988,7 @@ macro_expansion.rs:
 #   98|             getSegment(): [PathSegment] MyTrait
 #   98|               getIdentifier(): [NameRef] MyTrait
 #   98|     getAttr(0): [Attr] Attr
-#   98|       getMeta(): [Meta] Meta
+#   98|       getMeta(): [TokenTreeMeta] TokenTreeMeta
 #   98|         getPath(): [Path] derive
 #   98|           getSegment(): [PathSegment] derive
 #   98|             getIdentifier(): [NameRef] derive
@@ -1051,7 +1050,7 @@ proc_macro.rs:
 #    5|         getPat(): [IdentPat] item
 #    5|           getName(): [Name] item
 #    4|     getAttr(0): [Attr] Attr
-#    4|       getMeta(): [Meta] Meta
+#    4|       getMeta(): [PathMeta] PathMeta
 #    4|         getPath(): [Path] proc_macro_attribute
 #    4|           getSegment(): [PathSegment] proc_macro_attribute
 #    4|             getIdentifier(): [NameRef] proc_macro_attribute
@@ -1386,13 +1385,12 @@ proc_macro.rs:
 #   12|                           getSegment(): [PathSegment] new_ast
 #   12|                             getIdentifier(): [NameRef] new_ast
 #    9|               getIdentifier(): [NameRef] map
-#    8|               getReceiver(): [ParenExpr] (...)
-#    8|                 getExpr(): [RangeExpr] 0..number
-#    8|                   getEnd(): [VariableAccess] number
-#    8|                     getPath(): [Path] number
-#    8|                       getSegment(): [PathSegment] number
-#    8|                         getIdentifier(): [NameRef] number
-#    8|                   getStart(): [IntegerLiteralExpr] 0
+#    8|               getReceiver(): [RangeExpr] 0..number
+#    8|                 getEnd(): [VariableAccess] number
+#    8|                   getPath(): [Path] number
+#    8|                     getSegment(): [PathSegment] number
+#    8|                       getIdentifier(): [NameRef] number
+#    8|                 getStart(): [IntegerLiteralExpr] 0
 #    8|           getPat(): [IdentPat] items
 #    8|             getName(): [Name] items
 #   15|         getTailExpr(): [MethodCallExpr] ... .into()
@@ -1627,7 +1625,7 @@ proc_macro.rs:
 #   16|                                                                                       getStmtList(): [StmtList] StmtList
 #   16|                                                                                         getStatement(0): [LetStmt] let ... = ...
 #   15|                                                                                           getAttr(0): [Attr] Attr
-#   15|                                                                                             getMeta(): [Meta] Meta
+#   15|                                                                                             getMeta(): [TokenTreeMeta] TokenTreeMeta
 #   15|                                                                                               getPath(): [Path] allow
 #   15|                                                                                                 getSegment(): [PathSegment] allow
 #   15|                                                                                                   getIdentifier(): [NameRef] allow
@@ -2068,7 +2066,7 @@ proc_macro.rs:
 #   21|         getPat(): [IdentPat] item
 #   21|           getName(): [Name] item
 #   20|     getAttr(0): [Attr] Attr
-#   20|       getMeta(): [Meta] Meta
+#   20|       getMeta(): [PathMeta] PathMeta
 #   20|         getPath(): [Path] proc_macro_attribute
 #   20|           getSegment(): [PathSegment] proc_macro_attribute
 #   20|             getIdentifier(): [NameRef] proc_macro_attribute
@@ -2511,7 +2509,7 @@ proc_macro.rs:
 #   32|         getPat(): [IdentPat] _item
 #   32|           getName(): [Name] _item
 #   31|     getAttr(0): [Attr] Attr
-#   31|       getMeta(): [Meta] Meta
+#   31|       getMeta(): [PathMeta] PathMeta
 #   31|         getPath(): [Path] proc_macro_attribute
 #   31|           getSegment(): [PathSegment] proc_macro_attribute
 #   31|             getIdentifier(): [NameRef] proc_macro_attribute
@@ -2543,7 +2541,7 @@ proc_macro.rs:
 #   37|         getPat(): [IdentPat] input
 #   37|           getName(): [Name] input
 #   36|     getAttr(0): [Attr] Attr
-#   36|       getMeta(): [Meta] Meta
+#   36|       getMeta(): [TokenTreeMeta] TokenTreeMeta
 #   36|         getPath(): [Path] proc_macro_derive
 #   36|           getSegment(): [PathSegment] proc_macro_derive
 #   36|             getIdentifier(): [NameRef] proc_macro_derive
diff --git a/rust/ql/test/extractor-tests/macro-expansion/test.expected b/rust/ql/test/extractor-tests/macro-expansion/test.expected
index f7d5cae7340e..65ee3f3e7fad 100644
--- a/rust/ql/test/extractor-tests/macro-expansion/test.expected
+++ b/rust/ql/test/extractor-tests/macro-expansion/test.expected
@@ -1,37 +1,37 @@
 attribute_macros
-| macro_expansion.rs:3:1:12:1 | (item with attribute macro expansion) | 0 | macro_expansion.rs:4:1:12:1 | fn foo |
-| macro_expansion.rs:3:1:12:1 | (item with attribute macro expansion) | 1 | macro_expansion.rs:4:1:12:1 | fn foo_new |
-| macro_expansion.rs:7:5:8:17 | (item with attribute macro expansion) | 0 | macro_expansion.rs:8:5:8:17 | fn inner_0 |
-| macro_expansion.rs:7:5:8:17 | (item with attribute macro expansion) | 0 | macro_expansion.rs:8:5:8:17 | fn inner_0 |
-| macro_expansion.rs:7:5:8:17 | (item with attribute macro expansion) | 1 | macro_expansion.rs:8:5:8:17 | fn inner_1 |
-| macro_expansion.rs:7:5:8:17 | (item with attribute macro expansion) | 1 | macro_expansion.rs:8:5:8:17 | fn inner_1 |
-| macro_expansion.rs:14:1:16:15 | (item with attribute macro expansion) | 0 | macro_expansion.rs:15:1:16:15 | (item with attribute macro expansion) |
-| macro_expansion.rs:14:1:16:15 | (item with attribute macro expansion) | 1 | macro_expansion.rs:15:1:16:15 | (item with attribute macro expansion) |
-| macro_expansion.rs:15:1:16:15 | (item with attribute macro expansion) | 0 | macro_expansion.rs:16:1:16:15 | fn bar_0 |
-| macro_expansion.rs:15:1:16:15 | (item with attribute macro expansion) | 0 | macro_expansion.rs:16:1:16:15 | fn bar_1 |
-| macro_expansion.rs:15:1:16:15 | (item with attribute macro expansion) | 1 | macro_expansion.rs:16:1:16:15 | fn bar_0_new |
-| macro_expansion.rs:15:1:16:15 | (item with attribute macro expansion) | 1 | macro_expansion.rs:16:1:16:15 | fn bar_1_new |
-| macro_expansion.rs:31:5:34:5 | (item with attribute macro expansion) | 0 | macro_expansion.rs:32:5:34:5 | fn bzz_0 |
-| macro_expansion.rs:31:5:34:5 | (item with attribute macro expansion) | 1 | macro_expansion.rs:32:5:34:5 | fn bzz_1 |
-| macro_expansion.rs:31:5:34:5 | (item with attribute macro expansion) | 2 | macro_expansion.rs:32:5:34:5 | fn bzz_2 |
+| macro_expansion.rs:3:1:12:1 | fn  | 0 | macro_expansion.rs:4:1:12:1 | fn foo |
+| macro_expansion.rs:3:1:12:1 | fn  | 1 | macro_expansion.rs:4:1:12:1 | fn foo_new |
+| macro_expansion.rs:7:5:8:17 | fn  | 0 | macro_expansion.rs:8:5:8:17 | fn inner_0 |
+| macro_expansion.rs:7:5:8:17 | fn  | 0 | macro_expansion.rs:8:5:8:17 | fn inner_0 |
+| macro_expansion.rs:7:5:8:17 | fn  | 1 | macro_expansion.rs:8:5:8:17 | fn inner_1 |
+| macro_expansion.rs:7:5:8:17 | fn  | 1 | macro_expansion.rs:8:5:8:17 | fn inner_1 |
+| macro_expansion.rs:14:1:16:15 | fn  | 0 | macro_expansion.rs:15:1:16:15 | fn  |
+| macro_expansion.rs:14:1:16:15 | fn  | 1 | macro_expansion.rs:15:1:16:15 | fn  |
+| macro_expansion.rs:15:1:16:15 | fn  | 0 | macro_expansion.rs:16:1:16:15 | fn bar_0 |
+| macro_expansion.rs:15:1:16:15 | fn  | 0 | macro_expansion.rs:16:1:16:15 | fn bar_1 |
+| macro_expansion.rs:15:1:16:15 | fn  | 1 | macro_expansion.rs:16:1:16:15 | fn bar_0_new |
+| macro_expansion.rs:15:1:16:15 | fn  | 1 | macro_expansion.rs:16:1:16:15 | fn bar_1_new |
+| macro_expansion.rs:31:5:34:5 | fn  | 0 | macro_expansion.rs:32:5:34:5 | fn bzz_0 |
+| macro_expansion.rs:31:5:34:5 | fn  | 1 | macro_expansion.rs:32:5:34:5 | fn bzz_1 |
+| macro_expansion.rs:31:5:34:5 | fn  | 2 | macro_expansion.rs:32:5:34:5 | fn bzz_2 |
 derive_macros
-| macro_expansion.rs:83:1:86:1 | struct MyDerive | 0 | 0 | macro_expansion.rs:84:8:85:9 | impl ...::Debug for MyDerive::<...> { ... } |
-| macro_expansion.rs:88:1:92:1 | enum MyDeriveEnum | 0 | 0 | macro_expansion.rs:89:6:91:12 | impl ...::PartialEq for MyDeriveEnum::<...> { ... } |
-| macro_expansion.rs:88:1:92:1 | enum MyDeriveEnum | 1 | 0 | macro_expansion.rs:89:6:89:17 | impl ...::Eq for MyDeriveEnum::<...> { ... } |
+| macro_expansion.rs:83:1:86:1 | struct MyDerive | 0 | 0 | macro_expansion.rs:83:1:86:1 | impl ...::Debug for MyDerive::<...> { ... } |
+| macro_expansion.rs:88:1:92:1 | enum MyDeriveEnum | 0 | 0 | macro_expansion.rs:88:1:92:1 | impl ...::PartialEq for MyDeriveEnum::<...> { ... } |
+| macro_expansion.rs:88:1:92:1 | enum MyDeriveEnum | 1 | 0 | macro_expansion.rs:88:1:92:1 | impl ...::Eq for MyDeriveEnum::<...> { ... } |
 | macro_expansion.rs:98:1:102:1 | union MyDeriveUnion | 0 | 0 | macro_expansion.rs:99:7:99:19 | const CONST_MyDeriveUnion |
 | macro_expansion.rs:98:1:102:1 | union MyDeriveUnion | 0 | 1 | macro_expansion.rs:99:7:99:19 | impl MyTrait for MyDeriveUnion { ... } |
 macro_calls
 | macro_expansion.rs:5:9:5:35 | concat!... | macro_expansion.rs:5:17:5:34 | "Hello world!" |
 | macro_expansion.rs:5:9:5:35 | concat!... | macro_expansion.rs:5:17:5:34 | "Hello world!" |
-| macro_expansion.rs:31:5:31:16 | ...::format_args_nl!... | macro_expansion.rs:31:5:31:16 | FormatArgsExpr |
-| macro_expansion.rs:31:5:31:16 | ...::format_args_nl!... | macro_expansion.rs:31:5:31:16 | FormatArgsExpr |
-| macro_expansion.rs:31:5:31:16 | ...::format_args_nl!... | macro_expansion.rs:31:5:31:16 | FormatArgsExpr |
-| macro_expansion.rs:31:5:31:16 | println!... | macro_expansion.rs:31:5:31:16 | { ... } |
-| macro_expansion.rs:31:5:31:16 | println!... | macro_expansion.rs:31:5:31:16 | { ... } |
-| macro_expansion.rs:31:5:31:16 | println!... | macro_expansion.rs:31:5:31:16 | { ... } |
-| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:5:31:16 | { ... } |
-| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:5:31:16 | { ... } |
-| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:5:31:16 | { ... } |
+| macro_expansion.rs:31:7:31:15 | ...::format_args_nl!... | macro_expansion.rs:31:7:31:15 | FormatArgsExpr |
+| macro_expansion.rs:31:7:31:15 | ...::format_args_nl!... | macro_expansion.rs:31:7:31:15 | FormatArgsExpr |
+| macro_expansion.rs:31:7:31:15 | ...::format_args_nl!... | macro_expansion.rs:31:7:31:15 | FormatArgsExpr |
+| macro_expansion.rs:31:7:31:15 | println!... | macro_expansion.rs:31:7:31:15 | { ... } |
+| macro_expansion.rs:31:7:31:15 | println!... | macro_expansion.rs:31:7:31:15 | { ... } |
+| macro_expansion.rs:31:7:31:15 | println!... | macro_expansion.rs:31:7:31:15 | { ... } |
+| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:7:31:15 | { ... } |
+| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:7:31:15 | { ... } |
+| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:7:31:15 | { ... } |
 | macro_expansion.rs:44:5:44:13 | def_x!... | macro_expansion.rs:44:5:44:10 | MacroItems |
 | macro_expansion.rs:53:9:53:25 | concat!... | macro_expansion.rs:53:17:53:24 | "xy" |
 | macro_expansion.rs:55:9:58:5 | my_macro!... | macro_expansion.rs:56:9:57:13 | MacroExpr |
diff --git a/rust/ql/test/extractor-tests/macro-in-library/PrintAst.expected b/rust/ql/test/extractor-tests/macro-in-library/PrintAst.expected
index aa0fc42f81d8..8f167fdbb3ba 100644
--- a/rust/ql/test/extractor-tests/macro-in-library/PrintAst.expected
+++ b/rust/ql/test/extractor-tests/macro-in-library/PrintAst.expected
@@ -5,7 +5,7 @@ lib.rs:
 #    1|     getVisibility(): [Visibility] pub
 macro_in_library.rs:
 #    1| [SourceFile] SourceFile
-#    1|   getItem(0): [MacroCall] (item with attribute macro expansion)
+#    1|   getItem(0): [MacroCall] !...
 #    2|     getAttributeMacroExpansion(): [MacroItems] MacroItems
 #    2|       getItem(0): [Function] fn foo
 #    2|         getParamList(): [ParamList] ParamList
@@ -50,7 +50,7 @@ proc_macro.rs:
 #    5|             getSegment(): [PathSegment] TokenStream
 #    5|               getIdentifier(): [NameRef] TokenStream
 #    4|     getAttr(0): [Attr] Attr
-#    4|       getMeta(): [Meta] Meta
+#    4|       getMeta(): [PathMeta] PathMeta
 #    4|         getPath(): [Path] proc_macro_attribute
 #    4|           getSegment(): [PathSegment] proc_macro_attribute
 #    4|             getIdentifier(): [NameRef] proc_macro_attribute
diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/Cargo.lock b/rust/ql/test/extractor-tests/parenthesized/Cargo.lock
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ParenPat/Cargo.lock
rename to rust/ql/test/extractor-tests/parenthesized/Cargo.lock
diff --git a/rust/ql/test/extractor-tests/parenthesized/parenthesized.rs b/rust/ql/test/extractor-tests/parenthesized/parenthesized.rs
new file mode 100644
index 000000000000..f6877d335d99
--- /dev/null
+++ b/rust/ql/test/extractor-tests/parenthesized/parenthesized.rs
@@ -0,0 +1,21 @@
+fn attributed_non_leaf_expr() {
+    let _ = [#[allow(unused)] (1 + 2)];
+}
+
+struct S {
+    field: i32,
+}
+
+fn attributed_macro_expr() {
+    let _ = [#[allow(unused)] (vec![1])];
+}
+
+fn attributed_struct_expr() {
+    let _ = [#[allow(unused)] (S { field: 1 })];
+}
+
+fn comments_in_parentheses() {
+    let _ = (1 + 2 /* expression parentheses */);
+    let (value /* pattern parentheses */) = 1;
+    let _ = value;
+}
diff --git a/rust/ql/test/extractor-tests/parenthesized/parenthesized_attrs.expected b/rust/ql/test/extractor-tests/parenthesized/parenthesized_attrs.expected
new file mode 100644
index 000000000000..a4933188a80d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/parenthesized/parenthesized_attrs.expected
@@ -0,0 +1 @@
+| parenthesized.rs:2:32:2:36 | ... + ... | parenthesized.rs:2:14:2:29 | Attr |
diff --git a/rust/ql/test/extractor-tests/parenthesized/parenthesized_attrs.ql b/rust/ql/test/extractor-tests/parenthesized/parenthesized_attrs.ql
new file mode 100644
index 000000000000..17077e5d77ed
--- /dev/null
+++ b/rust/ql/test/extractor-tests/parenthesized/parenthesized_attrs.ql
@@ -0,0 +1,5 @@
+import codeql.rust.elements
+
+from BinaryExpr expr
+where expr.getAnAttr() instanceof Attr
+select expr, expr.getAnAttr()
diff --git a/rust/ql/test/extractor-tests/parenthesized/parenthesized_comments.expected b/rust/ql/test/extractor-tests/parenthesized/parenthesized_comments.expected
new file mode 100644
index 000000000000..f33bd502f3a9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/parenthesized/parenthesized_comments.expected
@@ -0,0 +1,2 @@
+| parenthesized.rs:18:20:18:47 | /*...*/ | parenthesized.rs:18:14:18:18 | ... + ... |
+| parenthesized.rs:19:16:19:40 | /*...*/ | parenthesized.rs:19:10:19:14 | value |
diff --git a/rust/ql/test/extractor-tests/parenthesized/parenthesized_comments.ql b/rust/ql/test/extractor-tests/parenthesized/parenthesized_comments.ql
new file mode 100644
index 000000000000..5be53c2ccae8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/parenthesized/parenthesized_comments.ql
@@ -0,0 +1,7 @@
+import codeql.rust.elements
+
+from Comment comment
+where
+  comment.getText() = "/* expression parentheses */" or
+  comment.getText() = "/* pattern parentheses */"
+select comment, comment.getParent()
diff --git a/rust/ql/test/extractor-tests/parenthesized/parenthesized_special_attrs.expected b/rust/ql/test/extractor-tests/parenthesized/parenthesized_special_attrs.expected
new file mode 100644
index 000000000000..ccc89b27a3eb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/parenthesized/parenthesized_special_attrs.expected
@@ -0,0 +1,2 @@
+| parenthesized.rs:10:32:10:38 | MacroExpr | parenthesized.rs:10:14:10:29 | Attr |
+| parenthesized.rs:14:32:14:45 | S {...} | parenthesized.rs:14:14:14:29 | Attr |
diff --git a/rust/ql/test/extractor-tests/parenthesized/parenthesized_special_attrs.ql b/rust/ql/test/extractor-tests/parenthesized/parenthesized_special_attrs.ql
new file mode 100644
index 000000000000..0ba8861e9380
--- /dev/null
+++ b/rust/ql/test/extractor-tests/parenthesized/parenthesized_special_attrs.ql
@@ -0,0 +1,8 @@
+import codeql.rust.elements
+
+from Expr expr, AnyAttr attr
+where
+  exists(MacroExpr macro | expr = macro and macro.getAnAttr() = attr)
+  or
+  exists(StructExpr struct | expr = struct and struct.getAnAttr() = attr)
+select expr, attr
diff --git a/rust/ql/test/library-tests/controlflow/BasicBlocks.expected b/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
index 80357ae29f86..99d1fce9e2c7 100644
--- a/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
+++ b/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
@@ -1,4 +1,12 @@
 dominates
+| cfg.rs:1:1:3:1 | enter fn cfg_expr | cfg.rs:1:1:3:1 | enter fn cfg_expr |
+| cfg.rs:5:1:10:1 | enter fn cfg_pat | cfg.rs:5:1:10:1 | enter fn cfg_pat |
+| cfg.rs:5:1:10:1 | enter fn cfg_pat | cfg.rs:6:5:9:5 | match value { ... } |
+| cfg.rs:5:1:10:1 | enter fn cfg_pat | cfg.rs:7:23:7:26 | true |
+| cfg.rs:5:1:10:1 | enter fn cfg_pat | cfg.rs:8:9:8:9 | _ |
+| cfg.rs:6:5:9:5 | match value { ... } | cfg.rs:6:5:9:5 | match value { ... } |
+| cfg.rs:7:23:7:26 | true | cfg.rs:7:23:7:26 | true |
+| cfg.rs:8:9:8:9 | _ | cfg.rs:8:9:8:9 | _ |
 | test.rs:5:5:8:5 | enter fn function_call | test.rs:5:5:8:5 | enter fn function_call |
 | test.rs:10:5:13:5 | enter fn method_call | test.rs:10:5:13:5 | enter fn method_call |
 | test.rs:18:5:24:5 | enter fn next | test.rs:18:5:24:5 | enter fn next |
@@ -743,7 +751,6 @@ dominates
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(true)] ! ... |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | if ... {...} |
 | test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | ExprStmt |
-| test.rs:533:13:533:19 | enter fn panic_cold_explicit | test.rs:533:13:533:19 | enter fn panic_cold_explicit |
 | test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | [boolean(false)] ! ... |
 | test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:19 | ExprStmt |
 | test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:21:533:48 | [boolean(true)] ! ... |
@@ -751,7 +758,6 @@ dominates
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:539:5:548:5 | enter fn const_block_panic |
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:541:9:546:9 | if false {...} |
 | test.rs:541:9:546:9 | if false {...} | test.rs:541:9:546:9 | if false {...} |
-| test.rs:544:17:544:22 | enter fn panic_cold_explicit | test.rs:544:17:544:22 | enter fn panic_cold_explicit |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:551:1:556:1 | enter fn dead_code |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:553:9:553:17 | ExprStmt |
 | test.rs:553:9:553:17 | ExprStmt | test.rs:553:9:553:17 | ExprStmt |
@@ -785,6 +791,14 @@ dominates
 | test.rs:615:5:617:5 | enter fn negated | test.rs:615:5:617:5 | enter fn negated |
 | test.rs:619:5:621:5 | enter fn multifly_add | test.rs:619:5:621:5 | enter fn multifly_add |
 postDominance
+| cfg.rs:1:1:3:1 | enter fn cfg_expr | cfg.rs:1:1:3:1 | enter fn cfg_expr |
+| cfg.rs:5:1:10:1 | enter fn cfg_pat | cfg.rs:5:1:10:1 | enter fn cfg_pat |
+| cfg.rs:6:5:9:5 | match value { ... } | cfg.rs:5:1:10:1 | enter fn cfg_pat |
+| cfg.rs:6:5:9:5 | match value { ... } | cfg.rs:6:5:9:5 | match value { ... } |
+| cfg.rs:6:5:9:5 | match value { ... } | cfg.rs:7:23:7:26 | true |
+| cfg.rs:6:5:9:5 | match value { ... } | cfg.rs:8:9:8:9 | _ |
+| cfg.rs:7:23:7:26 | true | cfg.rs:7:23:7:26 | true |
+| cfg.rs:8:9:8:9 | _ | cfg.rs:8:9:8:9 | _ |
 | test.rs:5:5:8:5 | enter fn function_call | test.rs:5:5:8:5 | enter fn function_call |
 | test.rs:10:5:13:5 | enter fn method_call | test.rs:10:5:13:5 | enter fn method_call |
 | test.rs:18:5:24:5 | enter fn next | test.rs:18:5:24:5 | enter fn next |
@@ -1424,7 +1438,6 @@ postDominance
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:529:5:537:5 | enter fn const_block_assert |
 | test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | ExprStmt |
 | test.rs:533:13:533:19 | ExprStmt | test.rs:533:21:533:48 | [boolean(true)] ! ... |
-| test.rs:533:13:533:19 | enter fn panic_cold_explicit | test.rs:533:13:533:19 | enter fn panic_cold_explicit |
 | test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | [boolean(false)] ! ... |
 | test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:21:533:48 | [boolean(true)] ! ... |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:529:5:537:5 | enter fn const_block_assert |
@@ -1435,7 +1448,6 @@ postDominance
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:539:5:548:5 | enter fn const_block_panic |
 | test.rs:541:9:546:9 | if false {...} | test.rs:539:5:548:5 | enter fn const_block_panic |
 | test.rs:541:9:546:9 | if false {...} | test.rs:541:9:546:9 | if false {...} |
-| test.rs:544:17:544:22 | enter fn panic_cold_explicit | test.rs:544:17:544:22 | enter fn panic_cold_explicit |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:551:1:556:1 | enter fn dead_code |
 | test.rs:553:9:553:17 | ExprStmt | test.rs:551:1:556:1 | enter fn dead_code |
 | test.rs:553:9:553:17 | ExprStmt | test.rs:553:9:553:17 | ExprStmt |
@@ -1467,6 +1479,9 @@ postDominance
 | test.rs:615:5:617:5 | enter fn negated | test.rs:615:5:617:5 | enter fn negated |
 | test.rs:619:5:621:5 | enter fn multifly_add | test.rs:619:5:621:5 | enter fn multifly_add |
 immediateDominator
+| cfg.rs:6:5:9:5 | match value { ... } | cfg.rs:5:1:10:1 | enter fn cfg_pat |
+| cfg.rs:7:23:7:26 | true | cfg.rs:5:1:10:1 | enter fn cfg_pat |
+| cfg.rs:8:9:8:9 | _ | cfg.rs:5:1:10:1 | enter fn cfg_pat |
 | test.rs:19:9:23:9 | if ... {...} else {...} | test.rs:18:5:24:5 | enter fn next |
 | test.rs:20:13:20:13 | n | test.rs:18:5:24:5 | enter fn next |
 | test.rs:22:13:22:13 | 3 | test.rs:18:5:24:5 | enter fn next |
@@ -2091,6 +2106,8 @@ successor
 | test.rs:571:9:573:9 | if ... {...} | test.rs:575:9:577:9 | if ... {...} | false |
 | test.rs:571:9:573:9 | if ... {...} | test.rs:576:13:576:27 | ExprStmt | true |
 joinBlockPredecessor
+| cfg.rs:6:5:9:5 | match value { ... } | cfg.rs:7:23:7:26 | true | 0 |
+| cfg.rs:6:5:9:5 | match value { ... } | cfg.rs:8:9:8:9 | _ | 1 |
 | test.rs:19:9:23:9 | if ... {...} else {...} | test.rs:20:13:20:13 | n | 1 |
 | test.rs:19:9:23:9 | if ... {...} else {...} | test.rs:22:13:22:13 | 3 | 0 |
 | test.rs:26:5:42:5 | exit fn test_break_and_continue (normal) | test.rs:31:17:31:29 | ExprStmt | 0 |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 2d1036c93c93..b5b97f21e8f5 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -1,4 +1,25 @@
 edges
+| cfg.rs:1:1:3:1 | enter fn cfg_expr | cfg.rs:2:9:2:14 | CfgPredExpr |  |
+| cfg.rs:1:1:3:1 | exit fn cfg_expr (normal) | cfg.rs:1:1:3:1 | exit fn cfg_expr |  |
+| cfg.rs:1:27:3:1 | { ... } | cfg.rs:1:1:3:1 | exit fn cfg_expr (normal) |  |
+| cfg.rs:2:5:2:14 | MacroExpr | cfg.rs:1:27:3:1 | { ... } |  |
+| cfg.rs:2:5:2:14 | cfg!... | cfg.rs:2:5:2:14 | MacroExpr |  |
+| cfg.rs:2:9:2:14 | CfgPredExpr | cfg.rs:2:9:2:14 | { ... } |  |
+| cfg.rs:2:9:2:14 | { ... } | cfg.rs:2:5:2:14 | cfg!... |  |
+| cfg.rs:5:1:10:1 | enter fn cfg_pat | cfg.rs:5:16:5:20 | value |  |
+| cfg.rs:5:1:10:1 | exit fn cfg_pat (normal) | cfg.rs:5:1:10:1 | exit fn cfg_pat |  |
+| cfg.rs:5:16:5:20 | value | cfg.rs:5:16:5:20 | value |  |
+| cfg.rs:5:16:5:20 | value | cfg.rs:5:16:5:26 | ...: bool | match |
+| cfg.rs:5:16:5:26 | ...: bool | cfg.rs:6:11:6:15 | value |  |
+| cfg.rs:5:37:10:1 | { ... } | cfg.rs:5:1:10:1 | exit fn cfg_pat (normal) |  |
+| cfg.rs:6:5:9:5 | match value { ... } | cfg.rs:5:37:10:1 | { ... } |  |
+| cfg.rs:6:11:6:15 | value | cfg.rs:7:9:7:18 | MacroPat |  |
+| cfg.rs:7:9:7:18 | MacroPat | cfg.rs:7:13:7:18 | CfgPredPat | match |
+| cfg.rs:7:13:7:18 | CfgPredPat | cfg.rs:7:23:7:26 | true | match |
+| cfg.rs:7:13:7:18 | CfgPredPat | cfg.rs:8:9:8:9 | _ | no-match |
+| cfg.rs:7:23:7:26 | true | cfg.rs:6:5:9:5 | match value { ... } |  |
+| cfg.rs:8:9:8:9 | _ | cfg.rs:8:14:8:18 | false | match |
+| cfg.rs:8:14:8:18 | false | cfg.rs:6:5:9:5 | match value { ... } |  |
 | test.rs:5:5:8:5 | enter fn function_call | test.rs:6:9:6:64 | ExprStmt |  |
 | test.rs:5:5:8:5 | exit fn function_call (normal) | test.rs:5:5:8:5 | exit fn function_call |  |
 | test.rs:5:24:8:5 | { ... } | test.rs:5:5:8:5 | exit fn function_call (normal) |  |
@@ -1288,20 +1309,13 @@ edges
 | test.rs:529:41:537:5 | { ... } | test.rs:529:5:537:5 | exit fn const_block_assert (normal) |  |
 | test.rs:532:9:534:9 | ExprStmt | test.rs:533:13:533:50 | ExprStmt |  |
 | test.rs:532:9:534:9 | { ... } | test.rs:536:9:536:10 | 42 |  |
+| test.rs:533:13:533:19 | "explicit panic" | test.rs:533:13:533:19 | ...::panic(...) |  |
+| test.rs:533:13:533:19 | ...::panic | test.rs:533:13:533:19 | "explicit panic" |  |
+| test.rs:533:13:533:19 | ...::panic(...) | test.rs:533:13:533:19 | { ... } |  |
 | test.rs:533:13:533:19 | ...::panic_2021!... | test.rs:533:13:533:19 | MacroExpr |  |
-| test.rs:533:13:533:19 | ...::panic_explicit | test.rs:533:13:533:19 | ...::panic_explicit(...) |  |
-| test.rs:533:13:533:19 | ...::panic_explicit(...) | test.rs:533:13:533:19 | { ... } |  |
-| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | fn panic_cold_explicit |  |
-| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | panic_cold_explicit |  |
+| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | ...::panic |  |
 | test.rs:533:13:533:19 | MacroExpr | test.rs:533:13:533:19 | { ... } |  |
-| test.rs:533:13:533:19 | enter fn panic_cold_explicit | test.rs:533:13:533:19 | ...::panic_explicit |  |
-| test.rs:533:13:533:19 | exit fn panic_cold_explicit (normal) | test.rs:533:13:533:19 | exit fn panic_cold_explicit |  |
-| test.rs:533:13:533:19 | fn panic_cold_explicit | test.rs:533:13:533:19 | ExprStmt |  |
-| test.rs:533:13:533:19 | panic_cold_explicit | test.rs:533:13:533:19 | panic_cold_explicit(...) |  |
-| test.rs:533:13:533:19 | panic_cold_explicit(...) | test.rs:533:13:533:19 | { ... } |  |
 | test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | ...::panic_2021!... |  |
-| test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | exit fn panic_cold_explicit (normal) |  |
-| test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | { ... } |  |
 | test.rs:533:13:533:19 | { ... } | test.rs:533:21:533:48 | if ... {...} |  |
 | test.rs:533:13:533:49 | MacroExpr | test.rs:532:9:534:9 | { ... } |  |
 | test.rs:533:13:533:49 | assert!... | test.rs:533:13:533:49 | MacroExpr |  |
@@ -1323,11 +1337,6 @@ edges
 | test.rs:541:9:546:9 | ExprStmt | test.rs:541:12:541:16 | false |  |
 | test.rs:541:9:546:9 | if false {...} | test.rs:547:9:547:9 | N |  |
 | test.rs:541:12:541:16 | false | test.rs:541:9:546:9 | if false {...} | false |
-| test.rs:544:17:544:22 | ...::panic_explicit | test.rs:544:17:544:22 | ...::panic_explicit(...) |  |
-| test.rs:544:17:544:22 | ...::panic_explicit(...) | test.rs:544:17:544:22 | { ... } |  |
-| test.rs:544:17:544:22 | enter fn panic_cold_explicit | test.rs:544:17:544:22 | ...::panic_explicit |  |
-| test.rs:544:17:544:22 | exit fn panic_cold_explicit (normal) | test.rs:544:17:544:22 | exit fn panic_cold_explicit |  |
-| test.rs:544:17:544:22 | { ... } | test.rs:544:17:544:22 | exit fn panic_cold_explicit (normal) |  |
 | test.rs:547:9:547:9 | N | test.rs:539:35:548:5 | { ... } |  |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:552:5:554:5 | ExprStmt |  |
 | test.rs:551:1:556:1 | exit fn dead_code (normal) | test.rs:551:1:556:1 | exit fn dead_code |  |
diff --git a/rust/ql/test/library-tests/controlflow/cfg.rs b/rust/ql/test/library-tests/controlflow/cfg.rs
new file mode 100644
index 000000000000..874f75e97b18
--- /dev/null
+++ b/rust/ql/test/library-tests/controlflow/cfg.rs
@@ -0,0 +1,10 @@
+pub fn cfg_expr() -> bool {
+    cfg!(unix)
+}
+
+pub fn cfg_pat(value: bool) -> bool {
+    match value {
+        cfg!(unix) => true,
+        _ => false,
+    }
+}
diff --git a/rust/ql/test/library-tests/dataflow/barrier/external_file.rs b/rust/ql/test/library-tests/dataflow/barrier/external_file.rs
new file mode 100644
index 000000000000..8edf52027b65
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/barrier/external_file.rs
@@ -0,0 +1,8 @@
+pub trait MyBarrierTrait2 {
+    fn sanitize2(s: &str);
+}
+
+impl<T> MyBarrierTrait2 for T {
+    // inherits model from the trait function
+    fn sanitize2(s: &str) {}
+}
diff --git a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ext.yml b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ext.yml
index 58e55a040d21..090db71d51f9 100644
--- a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ext.yml
+++ b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ext.yml
@@ -4,8 +4,16 @@ extensions:
       extensible: barrierModel
     data:
       - ["main::sanitize", "ReturnValue", "test-barrier", "manual"]
+      - ["<main::external_file::MyBarrierTrait2>::sanitize2", "Argument[0]", "test-barrier", "manual"]
+      - ["<_ as main::MyBarrierTrait3>::sanitize3", "Argument[0]", "test-barrier", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: barrierGuardModel
     data:
       - ["main::verify_safe", "Argument[0]", "true", "test-barrier", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: additionalExternalFile
+    data:
+      - ["external_file.rs"]
+
diff --git a/rust/ql/test/library-tests/dataflow/barrier/main.rs b/rust/ql/test/library-tests/dataflow/barrier/main.rs
index 268a8673bc9b..f0467631fff8 100644
--- a/rust/ql/test/library-tests/dataflow/barrier/main.rs
+++ b/rust/ql/test/library-tests/dataflow/barrier/main.rs
@@ -46,3 +46,25 @@ fn with_barrier_guard() {
         sink(s);
     }
 }
+
+mod external_file;
+use external_file::*;
+
+trait MyBarrierTrait3 {
+    fn sanitize3(s: &str);
+}
+
+impl<T> MyBarrierTrait3 for T {
+    // has an explicit model
+    fn sanitize3(s: &str) {}
+}
+
+fn with_trait_barriers() {
+    let s = source(2);
+    <()>::sanitize2(s);
+    sink(s);
+
+    let s = source(3);
+    <()>::sanitize3(s);
+    sink(s);
+}
diff --git a/rust/ql/test/library-tests/dataflow/collections/inline-flow.expected b/rust/ql/test/library-tests/dataflow/collections/inline-flow.expected
index e3eba23d036a..b8bc4fd7d7f3 100644
--- a/rust/ql/test/library-tests/dataflow/collections/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/collections/inline-flow.expected
@@ -1,7 +1,7 @@
 models
 | 1 | Summary: <& as core::ops::deref::Deref>::deref; Argument[self].Reference; ReturnValue; value |
-| 2 | Summary: <_ as core::ops::arith::AddAssign>::add_assign; Argument[0]; Argument[self].Reference; taint |
-| 3 | Summary: <_ as core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
+| 2 | Summary: <core::ops::arith::AddAssign>::add_assign; Argument[0]; Argument[self].Reference; taint |
+| 3 | Summary: <core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
 edges
 | main.rs:15:13:15:13 | s | main.rs:16:20:16:20 | s | provenance |  |
 | main.rs:15:17:15:25 | source(...) | main.rs:15:13:15:13 | s | provenance |  |
diff --git a/rust/ql/test/library-tests/dataflow/global/inline-flow.expected b/rust/ql/test/library-tests/dataflow/global/inline-flow.expected
index 4828b56542b8..e281c8d483e5 100644
--- a/rust/ql/test/library-tests/dataflow/global/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/global/inline-flow.expected
@@ -1,7 +1,8 @@
 models
 | 1 | Summary: <& as core::ops::deref::Deref>::deref; Argument[self].Reference; ReturnValue; value |
-| 2 | Summary: <_ as core::ops::arith::Mul>::mul; Argument[self,0]; ReturnValue; taint |
-| 3 | Summary: futures_executor::local_pool::block_on; Argument[0]; ReturnValue; value |
+| 2 | Summary: <core::ops::arith::Mul>::mul; Argument[self,0]; ReturnValue; taint |
+| 3 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 4 | Summary: futures_executor::local_pool::block_on; Argument[0]; ReturnValue; value |
 edges
 | main.rs:12:28:14:1 | { ... } | main.rs:17:13:17:23 | get_data(...) | provenance |  |
 | main.rs:13:5:13:13 | source(...) | main.rs:12:28:14:1 | { ... } | provenance |  |
@@ -16,10 +17,11 @@ edges
 | main.rs:38:16:38:24 | source(...) | main.rs:38:5:38:5 | [post] a [MyStruct] | provenance |  |
 | main.rs:39:10:39:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | provenance |  |
 | main.rs:39:10:39:10 | a [MyStruct] | main.rs:39:10:39:21 | a.get_data() | provenance |  |
+| main.rs:44:6:47:5 | [post] { ... } [&ref, MyStruct] | main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] | provenance |  |
 | main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] | main.rs:46:14:46:14 | [post] a [MyStruct] | provenance |  |
 | main.rs:46:14:46:14 | [post] a [MyStruct] | main.rs:49:10:49:10 | a [MyStruct] | provenance |  |
 | main.rs:48:15:48:23 | source(...) | main.rs:26:28:26:33 | ...: i64 | provenance |  |
-| main.rs:48:15:48:23 | source(...) | main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] | provenance |  |
+| main.rs:48:15:48:23 | source(...) | main.rs:44:6:47:5 | [post] { ... } [&ref, MyStruct] | provenance |  |
 | main.rs:49:10:49:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | provenance |  |
 | main.rs:49:10:49:10 | a [MyStruct] | main.rs:49:10:49:21 | a.get_data() | provenance |  |
 | main.rs:52:12:52:17 | ...: i64 | main.rs:53:10:53:10 | n | provenance |  |
@@ -196,10 +198,12 @@ edges
 | main.rs:342:9:342:9 | a | main.rs:343:10:343:10 | a | provenance |  |
 | main.rs:342:13:342:26 | async_source(...) | main.rs:342:9:342:9 | a | provenance |  |
 | main.rs:346:13:346:13 | c | main.rs:347:14:347:14 | c | provenance |  |
+| main.rs:346:13:346:13 | c | main.rs:348:9:348:9 | c | provenance |  |
 | main.rs:346:17:346:25 | source(...) | main.rs:346:13:346:13 | c | provenance |  |
+| main.rs:348:9:348:9 | c | main.rs:350:10:350:16 | await b | provenance |  |
 | main.rs:354:9:354:9 | a | main.rs:355:10:355:10 | a | provenance |  |
 | main.rs:354:13:354:55 | ...::block_on(...) | main.rs:354:9:354:9 | a | provenance |  |
-| main.rs:354:41:354:54 | async_source(...) | main.rs:354:13:354:55 | ...::block_on(...) | provenance | MaD:3 |
+| main.rs:354:41:354:54 | async_source(...) | main.rs:354:13:354:55 | ...::block_on(...) | provenance | MaD:4 |
 | main.rs:366:44:368:9 | { ... } | main.rs:403:18:403:38 | t.get_double_number() | provenance |  |
 | main.rs:366:44:368:9 | { ... } | main.rs:407:18:407:50 | ...::get_double_number(...) | provenance |  |
 | main.rs:367:13:367:29 | self.get_number() | main.rs:367:13:367:33 | ... * ... | provenance | MaD:2 |
@@ -231,6 +235,14 @@ edges
 | main.rs:433:32:433:43 | STATIC_VALUE | main.rs:433:17:433:28 | static_value | provenance |  |
 | main.rs:436:13:436:24 | STATIC_VALUE | main.rs:427:5:427:46 | static STATIC_VALUE | provenance |  |
 | main.rs:436:28:436:37 | source(...) | main.rs:436:13:436:24 | STATIC_VALUE | provenance |  |
+| main.rs:466:55:469:5 | { ... } [Ok] | main.rs:473:14:473:39 | unwrapped_value_returned(...) [Ok] | provenance |  |
+| main.rs:467:13:467:13 | a [Ok, Ok] | main.rs:468:9:468:9 | a [Ok, Ok] | provenance |  |
+| main.rs:467:48:467:65 | Ok(...) [Ok, Ok] | main.rs:467:13:467:13 | a [Ok, Ok] | provenance |  |
+| main.rs:467:51:467:64 | Ok(...) [Ok] | main.rs:467:48:467:65 | Ok(...) [Ok, Ok] | provenance |  |
+| main.rs:467:54:467:63 | source(...) | main.rs:467:51:467:64 | Ok(...) [Ok] | provenance |  |
+| main.rs:468:9:468:9 | a [Ok, Ok] | main.rs:468:9:468:10 | TryExpr [Ok] | provenance |  |
+| main.rs:468:9:468:10 | TryExpr [Ok] | main.rs:466:55:469:5 | { ... } [Ok] | provenance |  |
+| main.rs:473:14:473:39 | unwrapped_value_returned(...) [Ok] | main.rs:473:14:473:48 | ... .unwrap() | provenance | MaD:3 |
 nodes
 | main.rs:12:28:14:1 | { ... } | semmle.label | { ... } |
 | main.rs:13:5:13:13 | source(...) | semmle.label | source(...) |
@@ -247,6 +259,7 @@ nodes
 | main.rs:38:16:38:24 | source(...) | semmle.label | source(...) |
 | main.rs:39:10:39:10 | a [MyStruct] | semmle.label | a [MyStruct] |
 | main.rs:39:10:39:21 | a.get_data() | semmle.label | a.get_data() |
+| main.rs:44:6:47:5 | [post] { ... } [&ref, MyStruct] | semmle.label | [post] { ... } [&ref, MyStruct] |
 | main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] | semmle.label | [post] &mut a [&ref, MyStruct] |
 | main.rs:46:14:46:14 | [post] a [MyStruct] | semmle.label | [post] a [MyStruct] |
 | main.rs:48:15:48:23 | source(...) | semmle.label | source(...) |
@@ -443,6 +456,8 @@ nodes
 | main.rs:346:13:346:13 | c | semmle.label | c |
 | main.rs:346:17:346:25 | source(...) | semmle.label | source(...) |
 | main.rs:347:14:347:14 | c | semmle.label | c |
+| main.rs:348:9:348:9 | c | semmle.label | c |
+| main.rs:350:10:350:16 | await b | semmle.label | await b |
 | main.rs:354:9:354:9 | a | semmle.label | a |
 | main.rs:354:13:354:55 | ...::block_on(...) | semmle.label | ...::block_on(...) |
 | main.rs:354:41:354:54 | async_source(...) | semmle.label | async_source(...) |
@@ -484,10 +499,19 @@ nodes
 | main.rs:436:13:436:24 | STATIC_VALUE | semmle.label | STATIC_VALUE |
 | main.rs:436:28:436:37 | source(...) | semmle.label | source(...) |
 | main.rs:437:18:437:29 | STATIC_VALUE | semmle.label | STATIC_VALUE |
+| main.rs:466:55:469:5 | { ... } [Ok] | semmle.label | { ... } [Ok] |
+| main.rs:467:13:467:13 | a [Ok, Ok] | semmle.label | a [Ok, Ok] |
+| main.rs:467:48:467:65 | Ok(...) [Ok, Ok] | semmle.label | Ok(...) [Ok, Ok] |
+| main.rs:467:51:467:64 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
+| main.rs:467:54:467:63 | source(...) | semmle.label | source(...) |
+| main.rs:468:9:468:9 | a [Ok, Ok] | semmle.label | a [Ok, Ok] |
+| main.rs:468:9:468:10 | TryExpr [Ok] | semmle.label | TryExpr [Ok] |
+| main.rs:473:14:473:39 | unwrapped_value_returned(...) [Ok] | semmle.label | unwrapped_value_returned(...) [Ok] |
+| main.rs:473:14:473:48 | ... .unwrap() | semmle.label | ... .unwrap() |
 subpaths
 | main.rs:38:16:38:24 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | main.rs:38:5:38:5 | [post] a [MyStruct] |
 | main.rs:39:10:39:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:39:10:39:21 | a.get_data() |
-| main.rs:48:15:48:23 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] |
+| main.rs:48:15:48:23 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | main.rs:44:6:47:5 | [post] { ... } [&ref, MyStruct] |
 | main.rs:49:10:49:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:49:10:49:21 | a.get_data() |
 | main.rs:67:26:67:26 | a | main.rs:61:17:61:22 | ...: i64 | main.rs:61:32:63:1 | { ... } | main.rs:67:13:67:27 | pass_through(...) |
 | main.rs:72:26:75:5 | { ... } | main.rs:61:17:61:22 | ...: i64 | main.rs:61:32:63:1 | { ... } | main.rs:72:13:75:6 | pass_through(...) |
@@ -539,6 +563,7 @@ testFailures
 | main.rs:337:10:337:10 | a | main.rs:336:13:336:21 | source(...) | main.rs:337:10:337:10 | a | $@ | main.rs:336:13:336:21 | source(...) | source(...) |
 | main.rs:343:10:343:10 | a | main.rs:336:13:336:21 | source(...) | main.rs:343:10:343:10 | a | $@ | main.rs:336:13:336:21 | source(...) | source(...) |
 | main.rs:347:14:347:14 | c | main.rs:346:17:346:25 | source(...) | main.rs:347:14:347:14 | c | $@ | main.rs:346:17:346:25 | source(...) | source(...) |
+| main.rs:350:10:350:16 | await b | main.rs:346:17:346:25 | source(...) | main.rs:350:10:350:16 | await b | $@ | main.rs:346:17:346:25 | source(...) | source(...) |
 | main.rs:355:10:355:10 | a | main.rs:336:13:336:21 | source(...) | main.rs:355:10:355:10 | a | $@ | main.rs:336:13:336:21 | source(...) | source(...) |
 | main.rs:404:14:404:15 | n1 | main.rs:379:13:379:21 | source(...) | main.rs:404:14:404:15 | n1 | $@ | main.rs:379:13:379:21 | source(...) | source(...) |
 | main.rs:408:14:408:15 | n2 | main.rs:379:13:379:21 | source(...) | main.rs:408:14:408:15 | n2 | $@ | main.rs:379:13:379:21 | source(...) | source(...) |
@@ -550,3 +575,4 @@ testFailures
 | main.rs:434:18:434:29 | static_value | main.rs:436:28:436:37 | source(...) | main.rs:434:18:434:29 | static_value | $@ | main.rs:436:28:436:37 | source(...) | source(...) |
 | main.rs:437:18:437:29 | STATIC_VALUE | main.rs:427:36:427:45 | source(...) | main.rs:437:18:437:29 | STATIC_VALUE | $@ | main.rs:427:36:427:45 | source(...) | source(...) |
 | main.rs:437:18:437:29 | STATIC_VALUE | main.rs:436:28:436:37 | source(...) | main.rs:437:18:437:29 | STATIC_VALUE | $@ | main.rs:436:28:436:37 | source(...) | source(...) |
+| main.rs:473:14:473:48 | ... .unwrap() | main.rs:467:54:467:63 | source(...) | main.rs:473:14:473:48 | ... .unwrap() | $@ | main.rs:467:54:467:63 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/global/main.rs b/rust/ql/test/library-tests/dataflow/global/main.rs
index b3a3af1be95e..ba49a11b7783 100644
--- a/rust/ql/test/library-tests/dataflow/global/main.rs
+++ b/rust/ql/test/library-tests/dataflow/global/main.rs
@@ -347,7 +347,7 @@ async fn test_async_await_async_part() {
         sink(c); // $ hasValueFlow=2
         c
     };
-    sink(b.await); // $ MISSING: hasValueFlow=2
+    sink(b.await); // $ hasValueFlow=2
 }
 
 fn test_async_await() {
@@ -454,3 +454,22 @@ fn main() {
     test_operator_overloading();
     test_async_await();
 }
+
+mod try_operator {
+    use super::{sink, source};
+
+    fn unwrapped_value_not_returned() -> Option<i64> {
+        let _a = Some(source(50))?;
+        Some(0)
+    }
+
+    fn unwrapped_value_returned() -> Result<i64, i64> {
+        let a: Result<Result<i64, i64>, i64> = Ok(Ok(source(51)));
+        a?
+    }
+
+    fn test_try_operator() {
+        sink(unwrapped_value_not_returned().unwrap());
+        sink(unwrapped_value_returned().unwrap()); // $ hasValueFlow=51
+    }
+}
diff --git a/rust/ql/test/library-tests/dataflow/global/viableCallable.expected b/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
index 6f30416d54a7..cb6efb107ff5 100644
--- a/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
+++ b/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
@@ -145,3 +145,11 @@
 | main.rs:452:5:452:25 | data_through_method(...) | main.rs:187:1:199:1 | fn data_through_method |
 | main.rs:454:5:454:31 | test_operator_overloading(...) | main.rs:256:1:298:1 | fn test_operator_overloading |
 | main.rs:455:5:455:22 | test_async_await(...) | main.rs:353:1:358:1 | fn test_async_await |
+| main.rs:462:23:462:32 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:467:54:467:63 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:472:9:472:53 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:472:14:472:43 | unwrapped_value_not_returned(...) | main.rs:461:5:464:5 | fn unwrapped_value_not_returned |
+| main.rs:472:14:472:52 | ... .unwrap() | {EXTERNAL LOCATION} | [summarized] fn unwrap |
+| main.rs:473:9:473:49 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:473:14:473:39 | unwrapped_value_returned(...) | main.rs:466:5:469:5 | fn unwrapped_value_returned |
+| main.rs:473:14:473:48 | ... .unwrap() | {EXTERNAL LOCATION} | [summarized] fn unwrap |
diff --git a/rust/ql/test/library-tests/dataflow/lambdas/Cargo.lock b/rust/ql/test/library-tests/dataflow/lambdas/Cargo.lock
index b9856cfaf77d..5786eb119a9a 100644
--- a/rust/ql/test/library-tests/dataflow/lambdas/Cargo.lock
+++ b/rust/ql/test/library-tests/dataflow/lambdas/Cargo.lock
@@ -2,6 +2,150 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "futures"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d"
+
+[[package]]
+name = "futures-task"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd"
+
+[[package]]
+name = "futures-util"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "memchr"
+version = "2.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "syn"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "test"
 version = "0.0.1"
+dependencies = [
+ "futures",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
diff --git a/rust/ql/test/library-tests/dataflow/lambdas/external_file.rs b/rust/ql/test/library-tests/dataflow/lambdas/external_file.rs
new file mode 100644
index 000000000000..c43269e48c16
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/lambdas/external_file.rs
@@ -0,0 +1,11 @@
+pub fn may_invoke_callback1<F: Fn(i64)>(f: F) {}
+
+pub fn may_invoke_callback2<F: FnOnce(i64)>(f: F) {}
+
+pub fn may_invoke_callback3(f: impl Fn(i64)) {}
+
+pub fn may_invoke_callback4<T>(f: T)
+where
+    T: for<'a> FnOnce(&'a mut i64),
+{
+}
diff --git a/rust/ql/test/library-tests/dataflow/lambdas/inline-flow.expected b/rust/ql/test/library-tests/dataflow/lambdas/inline-flow.expected
index ca4bbe77479a..d7071417b883 100644
--- a/rust/ql/test/library-tests/dataflow/lambdas/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/lambdas/inline-flow.expected
@@ -1,4 +1,6 @@
 models
+| 1 | Summary: <& as core::ops::deref::Deref>::deref; Argument[self].Reference; ReturnValue; value |
+| 2 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
 edges
 | main.rs:10:20:10:52 | if cond {...} else {...} | main.rs:11:10:11:16 | f(...) | provenance |  |
 | main.rs:10:30:10:39 | source(...) | main.rs:10:20:10:52 | if cond {...} else {...} | provenance |  |
@@ -6,55 +8,94 @@ edges
 | main.rs:22:9:22:9 | a | main.rs:23:13:23:13 | a | provenance |  |
 | main.rs:22:13:22:22 | source(...) | main.rs:22:9:22:9 | a | provenance |  |
 | main.rs:23:13:23:13 | a | main.rs:15:20:15:23 | ... | provenance |  |
-| main.rs:27:20:27:23 | ... | main.rs:27:26:27:52 | if cond {...} else {...} | provenance |  |
-| main.rs:28:9:28:9 | a | main.rs:29:21:29:21 | a | provenance |  |
-| main.rs:28:13:28:22 | source(...) | main.rs:28:9:28:9 | a | provenance |  |
-| main.rs:29:9:29:9 | b | main.rs:30:10:30:10 | b | provenance |  |
-| main.rs:29:13:29:22 | f(...) | main.rs:29:9:29:9 | b | provenance |  |
-| main.rs:29:21:29:21 | a | main.rs:27:20:27:23 | ... | provenance |  |
-| main.rs:29:21:29:21 | a | main.rs:29:13:29:22 | f(...) | provenance |  |
-| main.rs:37:16:37:25 | source(...) | main.rs:39:5:39:5 | [post] f : ... => .. [captured capt] | provenance |  |
-| main.rs:39:5:39:5 | [post] f : ... => .. [captured capt] | main.rs:40:10:40:13 | capt | provenance |  |
-| main.rs:39:5:39:5 | [post] f : ... => .. [captured capt] | main.rs:44:5:44:5 | g [captured capt] | provenance |  |
-| main.rs:44:5:44:5 | g [captured capt] | main.rs:42:14:42:17 | capt | provenance |  |
-| main.rs:47:29:49:1 | { ... } | main.rs:57:10:57:12 | f(...) | provenance |  |
-| main.rs:48:5:48:14 | source(...) | main.rs:47:29:49:1 | { ... } | provenance |  |
-| main.rs:51:17:51:25 | ...: i64 | main.rs:52:10:52:13 | data | provenance |  |
-| main.rs:62:9:62:9 | a | main.rs:63:7:63:7 | a | provenance |  |
-| main.rs:62:13:62:22 | source(...) | main.rs:62:9:62:9 | a | provenance |  |
-| main.rs:63:7:63:7 | a | main.rs:51:17:51:25 | ...: i64 | provenance |  |
-| main.rs:66:24:66:32 | ...: i64 | main.rs:66:42:72:1 | { ... } | provenance |  |
-| main.rs:76:9:76:9 | a | main.rs:77:21:77:21 | a | provenance |  |
-| main.rs:76:13:76:22 | source(...) | main.rs:76:9:76:9 | a | provenance |  |
-| main.rs:77:9:77:9 | b | main.rs:78:10:78:10 | b | provenance |  |
-| main.rs:77:13:77:22 | f(...) | main.rs:77:9:77:9 | b | provenance |  |
-| main.rs:77:21:77:21 | a | main.rs:66:24:66:32 | ...: i64 | provenance |  |
-| main.rs:77:21:77:21 | a | main.rs:77:13:77:22 | f(...) | provenance |  |
-| main.rs:81:28:81:33 | ...: i64 | main.rs:82:7:82:7 | x | provenance |  |
-| main.rs:81:28:81:33 | ...: i64 | main.rs:82:7:82:7 | x | provenance |  |
-| main.rs:81:28:81:33 | ...: i64 | main.rs:82:7:82:7 | x | provenance |  |
-| main.rs:82:7:82:7 | x | main.rs:87:12:87:12 | ... | provenance |  |
-| main.rs:82:7:82:7 | x | main.rs:89:12:89:12 | ... | provenance |  |
-| main.rs:82:7:82:7 | x | main.rs:99:17:99:17 | ... | provenance |  |
-| main.rs:82:7:82:7 | x | main.rs:101:17:101:17 | ... | provenance |  |
-| main.rs:86:9:86:9 | a | main.rs:87:24:87:24 | a | provenance |  |
-| main.rs:86:13:86:22 | source(...) | main.rs:86:9:86:9 | a | provenance |  |
-| main.rs:87:12:87:12 | ... | main.rs:87:20:87:20 | x | provenance |  |
-| main.rs:87:24:87:24 | a | main.rs:81:28:81:33 | ...: i64 | provenance |  |
-| main.rs:88:9:88:9 | b | main.rs:89:24:89:24 | b | provenance |  |
-| main.rs:88:13:88:22 | source(...) | main.rs:88:9:88:9 | b | provenance |  |
-| main.rs:89:12:89:12 | ... | main.rs:89:20:89:20 | x | provenance |  |
-| main.rs:89:24:89:24 | b | main.rs:81:28:81:33 | ...: i64 | provenance |  |
-| main.rs:93:33:93:38 | ...: i64 | main.rs:94:14:94:14 | x | provenance |  |
-| main.rs:94:14:94:14 | x | main.rs:81:28:81:33 | ...: i64 | provenance |  |
-| main.rs:98:9:98:9 | a | main.rs:99:29:99:29 | a | provenance |  |
-| main.rs:98:13:98:22 | source(...) | main.rs:98:9:98:9 | a | provenance |  |
-| main.rs:99:17:99:17 | ... | main.rs:99:25:99:25 | x | provenance |  |
-| main.rs:99:29:99:29 | a | main.rs:93:33:93:38 | ...: i64 | provenance |  |
-| main.rs:100:9:100:9 | b | main.rs:101:29:101:29 | b | provenance |  |
-| main.rs:100:13:100:22 | source(...) | main.rs:100:9:100:9 | b | provenance |  |
-| main.rs:101:17:101:17 | ... | main.rs:101:25:101:25 | x | provenance |  |
-| main.rs:101:29:101:29 | b | main.rs:93:33:93:38 | ...: i64 | provenance |  |
+| main.rs:27:9:27:18 | TuplePat [tuple.0] | main.rs:27:10:27:14 | mut x | provenance |  |
+| main.rs:27:10:27:14 | mut x | main.rs:28:6:28:6 | x | provenance |  |
+| main.rs:27:22:27:35 | TupleExpr [tuple.0] | main.rs:27:9:27:18 | TuplePat [tuple.0] | provenance |  |
+| main.rs:27:23:27:31 | source(...) | main.rs:27:22:27:35 | TupleExpr [tuple.0] | provenance |  |
+| main.rs:28:6:28:6 | x | main.rs:29:6:29:15 | \|...\| ... : ... => .. [captured x] | provenance |  |
+| main.rs:29:6:29:15 | \|...\| ... : ... => .. [captured x] | main.rs:29:14:29:14 | x | provenance |  |
+| main.rs:33:9:33:16 | TuplePat [tuple.0] | main.rs:33:10:33:14 | ref x | provenance |  |
+| main.rs:33:10:33:14 | ref x | main.rs:33:14:33:14 | x [&ref] | provenance |  |
+| main.rs:33:14:33:14 | x [&ref] | main.rs:34:6:34:16 | \|...\| ... : ... => .. [captured x, &ref] | provenance |  |
+| main.rs:33:20:33:31 | TupleExpr [tuple.0] | main.rs:33:9:33:16 | TuplePat [tuple.0] | provenance |  |
+| main.rs:33:21:33:29 | source(...) | main.rs:33:20:33:31 | TupleExpr [tuple.0] | provenance |  |
+| main.rs:34:6:34:16 | \|...\| ... : ... => .. [captured x, &ref] | main.rs:34:15:34:15 | x [&ref] | provenance |  |
+| main.rs:34:15:34:15 | x [&ref] | main.rs:34:14:34:15 | * ... | provenance | MaD:1 |
+| main.rs:38:20:38:27 | ... | main.rs:38:30:38:56 | if cond {...} else {...} | provenance |  |
+| main.rs:39:9:39:9 | a | main.rs:40:21:40:21 | a | provenance |  |
+| main.rs:39:13:39:22 | source(...) | main.rs:39:9:39:9 | a | provenance |  |
+| main.rs:40:9:40:9 | b | main.rs:41:10:41:10 | b | provenance |  |
+| main.rs:40:13:40:22 | f(...) | main.rs:40:9:40:9 | b | provenance |  |
+| main.rs:40:21:40:21 | a | main.rs:38:20:38:27 | ... | provenance |  |
+| main.rs:40:21:40:21 | a | main.rs:40:13:40:22 | f(...) | provenance |  |
+| main.rs:48:9:48:12 | capt | main.rs:50:5:50:5 | [post] f : ... => .. [captured capt] | provenance |  |
+| main.rs:48:16:48:25 | source(...) | main.rs:48:9:48:12 | capt | provenance |  |
+| main.rs:50:5:50:5 | [post] f : ... => .. [captured capt] | main.rs:51:10:51:13 | capt | provenance |  |
+| main.rs:50:5:50:5 | [post] f : ... => .. [captured capt] | main.rs:55:5:55:5 | g [captured capt] | provenance |  |
+| main.rs:55:5:55:5 | g [captured capt] | main.rs:53:14:53:17 | capt | provenance |  |
+| main.rs:58:29:60:1 | { ... } | main.rs:68:10:68:12 | f(...) | provenance |  |
+| main.rs:59:5:59:14 | source(...) | main.rs:58:29:60:1 | { ... } | provenance |  |
+| main.rs:62:17:62:25 | ...: i64 | main.rs:63:10:63:13 | data | provenance |  |
+| main.rs:73:9:73:9 | a | main.rs:74:7:74:7 | a | provenance |  |
+| main.rs:73:13:73:22 | source(...) | main.rs:73:9:73:9 | a | provenance |  |
+| main.rs:74:7:74:7 | a | main.rs:62:17:62:25 | ...: i64 | provenance |  |
+| main.rs:77:24:77:32 | ...: i64 | main.rs:77:42:83:1 | { ... } | provenance |  |
+| main.rs:87:9:87:9 | a | main.rs:88:21:88:21 | a | provenance |  |
+| main.rs:87:13:87:22 | source(...) | main.rs:87:9:87:9 | a | provenance |  |
+| main.rs:88:9:88:9 | b | main.rs:89:10:89:10 | b | provenance |  |
+| main.rs:88:13:88:22 | f(...) | main.rs:88:9:88:9 | b | provenance |  |
+| main.rs:88:21:88:21 | a | main.rs:77:24:77:32 | ...: i64 | provenance |  |
+| main.rs:88:21:88:21 | a | main.rs:88:13:88:22 | f(...) | provenance |  |
+| main.rs:92:28:92:33 | ...: i64 | main.rs:93:7:93:7 | x | provenance |  |
+| main.rs:92:28:92:33 | ...: i64 | main.rs:93:7:93:7 | x | provenance |  |
+| main.rs:92:28:92:33 | ...: i64 | main.rs:93:7:93:7 | x | provenance |  |
+| main.rs:93:7:93:7 | x | main.rs:98:12:98:12 | ... | provenance |  |
+| main.rs:93:7:93:7 | x | main.rs:100:12:100:12 | ... | provenance |  |
+| main.rs:93:7:93:7 | x | main.rs:110:17:110:17 | ... | provenance |  |
+| main.rs:93:7:93:7 | x | main.rs:112:17:112:17 | ... | provenance |  |
+| main.rs:97:9:97:9 | a | main.rs:98:24:98:24 | a | provenance |  |
+| main.rs:97:13:97:22 | source(...) | main.rs:97:9:97:9 | a | provenance |  |
+| main.rs:98:12:98:12 | ... | main.rs:98:20:98:20 | x | provenance |  |
+| main.rs:98:24:98:24 | a | main.rs:92:28:92:33 | ...: i64 | provenance |  |
+| main.rs:99:9:99:9 | b | main.rs:100:24:100:24 | b | provenance |  |
+| main.rs:99:13:99:22 | source(...) | main.rs:99:9:99:9 | b | provenance |  |
+| main.rs:100:12:100:12 | ... | main.rs:100:20:100:20 | x | provenance |  |
+| main.rs:100:24:100:24 | b | main.rs:92:28:92:33 | ...: i64 | provenance |  |
+| main.rs:104:33:104:38 | ...: i64 | main.rs:105:14:105:14 | x | provenance |  |
+| main.rs:105:14:105:14 | x | main.rs:92:28:92:33 | ...: i64 | provenance |  |
+| main.rs:109:9:109:9 | a | main.rs:110:29:110:29 | a | provenance |  |
+| main.rs:109:13:109:22 | source(...) | main.rs:109:9:109:9 | a | provenance |  |
+| main.rs:110:17:110:17 | ... | main.rs:110:25:110:25 | x | provenance |  |
+| main.rs:110:29:110:29 | a | main.rs:104:33:104:38 | ...: i64 | provenance |  |
+| main.rs:111:9:111:9 | b | main.rs:112:29:112:29 | b | provenance |  |
+| main.rs:111:13:111:22 | source(...) | main.rs:111:9:111:9 | b | provenance |  |
+| main.rs:112:17:112:17 | ... | main.rs:112:25:112:25 | x | provenance |  |
+| main.rs:112:29:112:29 | b | main.rs:104:33:104:38 | ...: i64 | provenance |  |
+| main.rs:120:9:120:9 | a | main.rs:121:26:121:36 | \|...\| ... : ... => .. [captured a] | provenance |  |
+| main.rs:120:9:120:9 | a | main.rs:122:26:122:36 | \|...\| ... : ... => .. [captured a] | provenance |  |
+| main.rs:120:9:120:9 | a | main.rs:123:26:123:36 | \|...\| ... : ... => .. [captured a] | provenance |  |
+| main.rs:120:9:120:9 | a | main.rs:124:26:124:36 | \|...\| ... : ... => .. [captured a] | provenance |  |
+| main.rs:120:13:120:22 | source(...) | main.rs:120:9:120:9 | a | provenance |  |
+| main.rs:121:26:121:36 | \|...\| ... : ... => .. [captured a] | main.rs:121:35:121:35 | a | provenance | heuristic-callback |
+| main.rs:122:26:122:36 | \|...\| ... : ... => .. [captured a] | main.rs:122:35:122:35 | a | provenance | heuristic-callback |
+| main.rs:123:26:123:36 | \|...\| ... : ... => .. [captured a] | main.rs:123:35:123:35 | a | provenance | heuristic-callback |
+| main.rs:124:26:124:36 | \|...\| ... : ... => .. [captured a] | main.rs:124:35:124:35 | a | provenance | heuristic-callback |
+| main.rs:131:30:131:40 | source(...) | main.rs:132:14:132:25 | await future | provenance |  |
+| main.rs:136:13:136:16 | data | main.rs:137:9:139:9 | { ... } : ... => .. [captured data] | provenance |  |
+| main.rs:136:20:136:30 | source(...) | main.rs:136:13:136:16 | data | provenance |  |
+| main.rs:137:9:139:9 | { ... } : ... => .. [captured data] | main.rs:138:18:138:21 | data | provenance |  |
+| main.rs:144:13:144:16 | data | main.rs:146:14:146:19 | future [captured data] | provenance |  |
+| main.rs:144:20:144:30 | source(...) | main.rs:144:13:144:16 | data | provenance |  |
+| main.rs:146:14:146:19 | future [captured data] | main.rs:145:30:145:33 | data | provenance |  |
+| main.rs:146:14:146:19 | future [captured data] | main.rs:146:14:146:25 | await future | provenance |  |
+| main.rs:152:9:154:9 | [post] { ... } : ... => .. [captured captured] | main.rs:156:14:156:21 | captured | provenance |  |
+| main.rs:153:13:153:20 | captured | main.rs:152:9:154:9 | [post] { ... } : ... => .. [captured captured] | provenance |  |
+| main.rs:153:24:153:34 | source(...) | main.rs:153:13:153:20 | captured | provenance |  |
+| main.rs:183:16:183:40 | TryExpr [Some] | main.rs:184:10:184:12 | f(...) [Some] | provenance |  |
+| main.rs:183:17:183:38 | Some(...) [Some, Some] | main.rs:183:16:183:40 | TryExpr [Some] | provenance |  |
+| main.rs:183:22:183:37 | Some(...) [Some] | main.rs:183:17:183:38 | Some(...) [Some, Some] | provenance |  |
+| main.rs:183:27:183:36 | source(...) | main.rs:183:22:183:37 | Some(...) [Some] | provenance |  |
+| main.rs:184:10:184:12 | f(...) [Some] | main.rs:184:10:184:21 | ... .unwrap() | provenance | MaD:2 |
 nodes
 | main.rs:10:20:10:52 | if cond {...} else {...} | semmle.label | if cond {...} else {...} |
 | main.rs:10:30:10:39 | source(...) | semmle.label | source(...) |
@@ -64,79 +105,138 @@ nodes
 | main.rs:22:9:22:9 | a | semmle.label | a |
 | main.rs:22:13:22:22 | source(...) | semmle.label | source(...) |
 | main.rs:23:13:23:13 | a | semmle.label | a |
-| main.rs:27:20:27:23 | ... | semmle.label | ... |
-| main.rs:27:26:27:52 | if cond {...} else {...} | semmle.label | if cond {...} else {...} |
-| main.rs:28:9:28:9 | a | semmle.label | a |
-| main.rs:28:13:28:22 | source(...) | semmle.label | source(...) |
-| main.rs:29:9:29:9 | b | semmle.label | b |
-| main.rs:29:13:29:22 | f(...) | semmle.label | f(...) |
-| main.rs:29:21:29:21 | a | semmle.label | a |
-| main.rs:30:10:30:10 | b | semmle.label | b |
-| main.rs:37:16:37:25 | source(...) | semmle.label | source(...) |
-| main.rs:39:5:39:5 | [post] f : ... => .. [captured capt] | semmle.label | [post] f : ... => .. [captured capt] |
-| main.rs:40:10:40:13 | capt | semmle.label | capt |
-| main.rs:42:14:42:17 | capt | semmle.label | capt |
-| main.rs:44:5:44:5 | g [captured capt] | semmle.label | g [captured capt] |
-| main.rs:47:29:49:1 | { ... } | semmle.label | { ... } |
-| main.rs:48:5:48:14 | source(...) | semmle.label | source(...) |
-| main.rs:51:17:51:25 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:52:10:52:13 | data | semmle.label | data |
-| main.rs:57:10:57:12 | f(...) | semmle.label | f(...) |
-| main.rs:62:9:62:9 | a | semmle.label | a |
-| main.rs:62:13:62:22 | source(...) | semmle.label | source(...) |
-| main.rs:63:7:63:7 | a | semmle.label | a |
-| main.rs:66:24:66:32 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:66:42:72:1 | { ... } | semmle.label | { ... } |
-| main.rs:76:9:76:9 | a | semmle.label | a |
-| main.rs:76:13:76:22 | source(...) | semmle.label | source(...) |
-| main.rs:77:9:77:9 | b | semmle.label | b |
-| main.rs:77:13:77:22 | f(...) | semmle.label | f(...) |
-| main.rs:77:21:77:21 | a | semmle.label | a |
-| main.rs:78:10:78:10 | b | semmle.label | b |
-| main.rs:81:28:81:33 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:81:28:81:33 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:81:28:81:33 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:82:7:82:7 | x | semmle.label | x |
-| main.rs:82:7:82:7 | x | semmle.label | x |
-| main.rs:82:7:82:7 | x | semmle.label | x |
-| main.rs:86:9:86:9 | a | semmle.label | a |
-| main.rs:86:13:86:22 | source(...) | semmle.label | source(...) |
-| main.rs:87:12:87:12 | ... | semmle.label | ... |
-| main.rs:87:20:87:20 | x | semmle.label | x |
-| main.rs:87:24:87:24 | a | semmle.label | a |
+| main.rs:27:9:27:18 | TuplePat [tuple.0] | semmle.label | TuplePat [tuple.0] |
+| main.rs:27:10:27:14 | mut x | semmle.label | mut x |
+| main.rs:27:22:27:35 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
+| main.rs:27:23:27:31 | source(...) | semmle.label | source(...) |
+| main.rs:28:6:28:6 | x | semmle.label | x |
+| main.rs:29:6:29:15 | \|...\| ... : ... => .. [captured x] | semmle.label | \|...\| ... : ... => .. [captured x] |
+| main.rs:29:14:29:14 | x | semmle.label | x |
+| main.rs:33:9:33:16 | TuplePat [tuple.0] | semmle.label | TuplePat [tuple.0] |
+| main.rs:33:10:33:14 | ref x | semmle.label | ref x |
+| main.rs:33:14:33:14 | x [&ref] | semmle.label | x [&ref] |
+| main.rs:33:20:33:31 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
+| main.rs:33:21:33:29 | source(...) | semmle.label | source(...) |
+| main.rs:34:6:34:16 | \|...\| ... : ... => .. [captured x, &ref] | semmle.label | \|...\| ... : ... => .. [captured x, &ref] |
+| main.rs:34:14:34:15 | * ... | semmle.label | * ... |
+| main.rs:34:15:34:15 | x [&ref] | semmle.label | x [&ref] |
+| main.rs:38:20:38:27 | ... | semmle.label | ... |
+| main.rs:38:30:38:56 | if cond {...} else {...} | semmle.label | if cond {...} else {...} |
+| main.rs:39:9:39:9 | a | semmle.label | a |
+| main.rs:39:13:39:22 | source(...) | semmle.label | source(...) |
+| main.rs:40:9:40:9 | b | semmle.label | b |
+| main.rs:40:13:40:22 | f(...) | semmle.label | f(...) |
+| main.rs:40:21:40:21 | a | semmle.label | a |
+| main.rs:41:10:41:10 | b | semmle.label | b |
+| main.rs:48:9:48:12 | capt | semmle.label | capt |
+| main.rs:48:16:48:25 | source(...) | semmle.label | source(...) |
+| main.rs:50:5:50:5 | [post] f : ... => .. [captured capt] | semmle.label | [post] f : ... => .. [captured capt] |
+| main.rs:51:10:51:13 | capt | semmle.label | capt |
+| main.rs:53:14:53:17 | capt | semmle.label | capt |
+| main.rs:55:5:55:5 | g [captured capt] | semmle.label | g [captured capt] |
+| main.rs:58:29:60:1 | { ... } | semmle.label | { ... } |
+| main.rs:59:5:59:14 | source(...) | semmle.label | source(...) |
+| main.rs:62:17:62:25 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:63:10:63:13 | data | semmle.label | data |
+| main.rs:68:10:68:12 | f(...) | semmle.label | f(...) |
+| main.rs:73:9:73:9 | a | semmle.label | a |
+| main.rs:73:13:73:22 | source(...) | semmle.label | source(...) |
+| main.rs:74:7:74:7 | a | semmle.label | a |
+| main.rs:77:24:77:32 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:77:42:83:1 | { ... } | semmle.label | { ... } |
+| main.rs:87:9:87:9 | a | semmle.label | a |
+| main.rs:87:13:87:22 | source(...) | semmle.label | source(...) |
 | main.rs:88:9:88:9 | b | semmle.label | b |
-| main.rs:88:13:88:22 | source(...) | semmle.label | source(...) |
-| main.rs:89:12:89:12 | ... | semmle.label | ... |
-| main.rs:89:20:89:20 | x | semmle.label | x |
-| main.rs:89:24:89:24 | b | semmle.label | b |
-| main.rs:93:33:93:38 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:94:14:94:14 | x | semmle.label | x |
-| main.rs:98:9:98:9 | a | semmle.label | a |
-| main.rs:98:13:98:22 | source(...) | semmle.label | source(...) |
-| main.rs:99:17:99:17 | ... | semmle.label | ... |
-| main.rs:99:25:99:25 | x | semmle.label | x |
-| main.rs:99:29:99:29 | a | semmle.label | a |
-| main.rs:100:9:100:9 | b | semmle.label | b |
-| main.rs:100:13:100:22 | source(...) | semmle.label | source(...) |
-| main.rs:101:17:101:17 | ... | semmle.label | ... |
-| main.rs:101:25:101:25 | x | semmle.label | x |
-| main.rs:101:29:101:29 | b | semmle.label | b |
+| main.rs:88:13:88:22 | f(...) | semmle.label | f(...) |
+| main.rs:88:21:88:21 | a | semmle.label | a |
+| main.rs:89:10:89:10 | b | semmle.label | b |
+| main.rs:92:28:92:33 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:92:28:92:33 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:92:28:92:33 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:93:7:93:7 | x | semmle.label | x |
+| main.rs:93:7:93:7 | x | semmle.label | x |
+| main.rs:93:7:93:7 | x | semmle.label | x |
+| main.rs:97:9:97:9 | a | semmle.label | a |
+| main.rs:97:13:97:22 | source(...) | semmle.label | source(...) |
+| main.rs:98:12:98:12 | ... | semmle.label | ... |
+| main.rs:98:20:98:20 | x | semmle.label | x |
+| main.rs:98:24:98:24 | a | semmle.label | a |
+| main.rs:99:9:99:9 | b | semmle.label | b |
+| main.rs:99:13:99:22 | source(...) | semmle.label | source(...) |
+| main.rs:100:12:100:12 | ... | semmle.label | ... |
+| main.rs:100:20:100:20 | x | semmle.label | x |
+| main.rs:100:24:100:24 | b | semmle.label | b |
+| main.rs:104:33:104:38 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:105:14:105:14 | x | semmle.label | x |
+| main.rs:109:9:109:9 | a | semmle.label | a |
+| main.rs:109:13:109:22 | source(...) | semmle.label | source(...) |
+| main.rs:110:17:110:17 | ... | semmle.label | ... |
+| main.rs:110:25:110:25 | x | semmle.label | x |
+| main.rs:110:29:110:29 | a | semmle.label | a |
+| main.rs:111:9:111:9 | b | semmle.label | b |
+| main.rs:111:13:111:22 | source(...) | semmle.label | source(...) |
+| main.rs:112:17:112:17 | ... | semmle.label | ... |
+| main.rs:112:25:112:25 | x | semmle.label | x |
+| main.rs:112:29:112:29 | b | semmle.label | b |
+| main.rs:120:9:120:9 | a | semmle.label | a |
+| main.rs:120:13:120:22 | source(...) | semmle.label | source(...) |
+| main.rs:121:26:121:36 | \|...\| ... : ... => .. [captured a] | semmle.label | \|...\| ... : ... => .. [captured a] |
+| main.rs:121:35:121:35 | a | semmle.label | a |
+| main.rs:122:26:122:36 | \|...\| ... : ... => .. [captured a] | semmle.label | \|...\| ... : ... => .. [captured a] |
+| main.rs:122:35:122:35 | a | semmle.label | a |
+| main.rs:123:26:123:36 | \|...\| ... : ... => .. [captured a] | semmle.label | \|...\| ... : ... => .. [captured a] |
+| main.rs:123:35:123:35 | a | semmle.label | a |
+| main.rs:124:26:124:36 | \|...\| ... : ... => .. [captured a] | semmle.label | \|...\| ... : ... => .. [captured a] |
+| main.rs:124:35:124:35 | a | semmle.label | a |
+| main.rs:131:30:131:40 | source(...) | semmle.label | source(...) |
+| main.rs:132:14:132:25 | await future | semmle.label | await future |
+| main.rs:136:13:136:16 | data | semmle.label | data |
+| main.rs:136:20:136:30 | source(...) | semmle.label | source(...) |
+| main.rs:137:9:139:9 | { ... } : ... => .. [captured data] | semmle.label | { ... } : ... => .. [captured data] |
+| main.rs:138:18:138:21 | data | semmle.label | data |
+| main.rs:144:13:144:16 | data | semmle.label | data |
+| main.rs:144:20:144:30 | source(...) | semmle.label | source(...) |
+| main.rs:145:30:145:33 | data | semmle.label | data |
+| main.rs:146:14:146:19 | future [captured data] | semmle.label | future [captured data] |
+| main.rs:146:14:146:25 | await future | semmle.label | await future |
+| main.rs:152:9:154:9 | [post] { ... } : ... => .. [captured captured] | semmle.label | [post] { ... } : ... => .. [captured captured] |
+| main.rs:153:13:153:20 | captured | semmle.label | captured |
+| main.rs:153:24:153:34 | source(...) | semmle.label | source(...) |
+| main.rs:156:14:156:21 | captured | semmle.label | captured |
+| main.rs:183:16:183:40 | TryExpr [Some] | semmle.label | TryExpr [Some] |
+| main.rs:183:17:183:38 | Some(...) [Some, Some] | semmle.label | Some(...) [Some, Some] |
+| main.rs:183:22:183:37 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:183:27:183:36 | source(...) | semmle.label | source(...) |
+| main.rs:184:10:184:12 | f(...) [Some] | semmle.label | f(...) [Some] |
+| main.rs:184:10:184:21 | ... .unwrap() | semmle.label | ... .unwrap() |
 subpaths
-| main.rs:29:21:29:21 | a | main.rs:27:20:27:23 | ... | main.rs:27:26:27:52 | if cond {...} else {...} | main.rs:29:13:29:22 | f(...) |
-| main.rs:77:21:77:21 | a | main.rs:66:24:66:32 | ...: i64 | main.rs:66:42:72:1 | { ... } | main.rs:77:13:77:22 | f(...) |
+| main.rs:40:21:40:21 | a | main.rs:38:20:38:27 | ... | main.rs:38:30:38:56 | if cond {...} else {...} | main.rs:40:13:40:22 | f(...) |
+| main.rs:88:21:88:21 | a | main.rs:77:24:77:32 | ...: i64 | main.rs:77:42:83:1 | { ... } | main.rs:88:13:88:22 | f(...) |
+| main.rs:146:14:146:19 | future [captured data] | main.rs:145:30:145:33 | data | main.rs:145:30:145:33 | data | main.rs:146:14:146:25 | await future |
 testFailures
 #select
 | main.rs:11:10:11:16 | f(...) | main.rs:10:30:10:39 | source(...) | main.rs:11:10:11:16 | f(...) | $@ | main.rs:10:30:10:39 | source(...) | source(...) |
 | main.rs:17:18:17:21 | data | main.rs:22:13:22:22 | source(...) | main.rs:17:18:17:21 | data | $@ | main.rs:22:13:22:22 | source(...) | source(...) |
-| main.rs:30:10:30:10 | b | main.rs:28:13:28:22 | source(...) | main.rs:30:10:30:10 | b | $@ | main.rs:28:13:28:22 | source(...) | source(...) |
-| main.rs:40:10:40:13 | capt | main.rs:37:16:37:25 | source(...) | main.rs:40:10:40:13 | capt | $@ | main.rs:37:16:37:25 | source(...) | source(...) |
-| main.rs:42:14:42:17 | capt | main.rs:37:16:37:25 | source(...) | main.rs:42:14:42:17 | capt | $@ | main.rs:37:16:37:25 | source(...) | source(...) |
-| main.rs:52:10:52:13 | data | main.rs:62:13:62:22 | source(...) | main.rs:52:10:52:13 | data | $@ | main.rs:62:13:62:22 | source(...) | source(...) |
-| main.rs:57:10:57:12 | f(...) | main.rs:48:5:48:14 | source(...) | main.rs:57:10:57:12 | f(...) | $@ | main.rs:48:5:48:14 | source(...) | source(...) |
-| main.rs:78:10:78:10 | b | main.rs:76:13:76:22 | source(...) | main.rs:78:10:78:10 | b | $@ | main.rs:76:13:76:22 | source(...) | source(...) |
-| main.rs:87:20:87:20 | x | main.rs:86:13:86:22 | source(...) | main.rs:87:20:87:20 | x | $@ | main.rs:86:13:86:22 | source(...) | source(...) |
-| main.rs:89:20:89:20 | x | main.rs:88:13:88:22 | source(...) | main.rs:89:20:89:20 | x | $@ | main.rs:88:13:88:22 | source(...) | source(...) |
-| main.rs:99:25:99:25 | x | main.rs:98:13:98:22 | source(...) | main.rs:99:25:99:25 | x | $@ | main.rs:98:13:98:22 | source(...) | source(...) |
-| main.rs:99:25:99:25 | x | main.rs:100:13:100:22 | source(...) | main.rs:99:25:99:25 | x | $@ | main.rs:100:13:100:22 | source(...) | source(...) |
-| main.rs:101:25:101:25 | x | main.rs:98:13:98:22 | source(...) | main.rs:101:25:101:25 | x | $@ | main.rs:98:13:98:22 | source(...) | source(...) |
-| main.rs:101:25:101:25 | x | main.rs:100:13:100:22 | source(...) | main.rs:101:25:101:25 | x | $@ | main.rs:100:13:100:22 | source(...) | source(...) |
+| main.rs:29:14:29:14 | x | main.rs:27:23:27:31 | source(...) | main.rs:29:14:29:14 | x | $@ | main.rs:27:23:27:31 | source(...) | source(...) |
+| main.rs:34:14:34:15 | * ... | main.rs:33:21:33:29 | source(...) | main.rs:34:14:34:15 | * ... | $@ | main.rs:33:21:33:29 | source(...) | source(...) |
+| main.rs:41:10:41:10 | b | main.rs:39:13:39:22 | source(...) | main.rs:41:10:41:10 | b | $@ | main.rs:39:13:39:22 | source(...) | source(...) |
+| main.rs:51:10:51:13 | capt | main.rs:48:16:48:25 | source(...) | main.rs:51:10:51:13 | capt | $@ | main.rs:48:16:48:25 | source(...) | source(...) |
+| main.rs:53:14:53:17 | capt | main.rs:48:16:48:25 | source(...) | main.rs:53:14:53:17 | capt | $@ | main.rs:48:16:48:25 | source(...) | source(...) |
+| main.rs:63:10:63:13 | data | main.rs:73:13:73:22 | source(...) | main.rs:63:10:63:13 | data | $@ | main.rs:73:13:73:22 | source(...) | source(...) |
+| main.rs:68:10:68:12 | f(...) | main.rs:59:5:59:14 | source(...) | main.rs:68:10:68:12 | f(...) | $@ | main.rs:59:5:59:14 | source(...) | source(...) |
+| main.rs:89:10:89:10 | b | main.rs:87:13:87:22 | source(...) | main.rs:89:10:89:10 | b | $@ | main.rs:87:13:87:22 | source(...) | source(...) |
+| main.rs:98:20:98:20 | x | main.rs:97:13:97:22 | source(...) | main.rs:98:20:98:20 | x | $@ | main.rs:97:13:97:22 | source(...) | source(...) |
+| main.rs:100:20:100:20 | x | main.rs:99:13:99:22 | source(...) | main.rs:100:20:100:20 | x | $@ | main.rs:99:13:99:22 | source(...) | source(...) |
+| main.rs:110:25:110:25 | x | main.rs:109:13:109:22 | source(...) | main.rs:110:25:110:25 | x | $@ | main.rs:109:13:109:22 | source(...) | source(...) |
+| main.rs:110:25:110:25 | x | main.rs:111:13:111:22 | source(...) | main.rs:110:25:110:25 | x | $@ | main.rs:111:13:111:22 | source(...) | source(...) |
+| main.rs:112:25:112:25 | x | main.rs:109:13:109:22 | source(...) | main.rs:112:25:112:25 | x | $@ | main.rs:109:13:109:22 | source(...) | source(...) |
+| main.rs:112:25:112:25 | x | main.rs:111:13:111:22 | source(...) | main.rs:112:25:112:25 | x | $@ | main.rs:111:13:111:22 | source(...) | source(...) |
+| main.rs:121:35:121:35 | a | main.rs:120:13:120:22 | source(...) | main.rs:121:35:121:35 | a | $@ | main.rs:120:13:120:22 | source(...) | source(...) |
+| main.rs:122:35:122:35 | a | main.rs:120:13:120:22 | source(...) | main.rs:122:35:122:35 | a | $@ | main.rs:120:13:120:22 | source(...) | source(...) |
+| main.rs:123:35:123:35 | a | main.rs:120:13:120:22 | source(...) | main.rs:123:35:123:35 | a | $@ | main.rs:120:13:120:22 | source(...) | source(...) |
+| main.rs:124:35:124:35 | a | main.rs:120:13:120:22 | source(...) | main.rs:124:35:124:35 | a | $@ | main.rs:120:13:120:22 | source(...) | source(...) |
+| main.rs:132:14:132:25 | await future | main.rs:131:30:131:40 | source(...) | main.rs:132:14:132:25 | await future | $@ | main.rs:131:30:131:40 | source(...) | source(...) |
+| main.rs:138:18:138:21 | data | main.rs:136:20:136:30 | source(...) | main.rs:138:18:138:21 | data | $@ | main.rs:136:20:136:30 | source(...) | source(...) |
+| main.rs:146:14:146:25 | await future | main.rs:144:20:144:30 | source(...) | main.rs:146:14:146:25 | await future | $@ | main.rs:144:20:144:30 | source(...) | source(...) |
+| main.rs:156:14:156:21 | captured | main.rs:153:24:153:34 | source(...) | main.rs:156:14:156:21 | captured | $@ | main.rs:153:24:153:34 | source(...) | source(...) |
+| main.rs:184:10:184:21 | ... .unwrap() | main.rs:183:27:183:36 | source(...) | main.rs:184:10:184:21 | ... .unwrap() | $@ | main.rs:183:27:183:36 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/lambdas/inline-flow.ext.yml b/rust/ql/test/library-tests/dataflow/lambdas/inline-flow.ext.yml
new file mode 100644
index 000000000000..542463856481
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/lambdas/inline-flow.ext.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: additionalExternalFile
+    data:
+      - ["external_file.rs"]
diff --git a/rust/ql/test/library-tests/dataflow/lambdas/main.rs b/rust/ql/test/library-tests/dataflow/lambdas/main.rs
index 66295f004a22..3a49a108f06b 100644
--- a/rust/ql/test/library-tests/dataflow/lambdas/main.rs
+++ b/rust/ql/test/library-tests/dataflow/lambdas/main.rs
@@ -23,8 +23,19 @@ fn closure_flow_in() {
     f(true, a);
 }
 
+fn closure_flow_in2() {
+    let (mut x, y) = (source(1), 0);
+    (x) = x;
+    (|| sink(x))(); // $ hasValueFlow=1
+}
+
+fn closure_flow_in3() {
+    let (ref x,) = (source(1),);
+    (|| sink(*x))(); // $ hasValueFlow=1
+}
+
 fn closure_flow_through() {
-    let f = |cond, data| if cond { data } else { 0 };
+    let f = |cond, ((data))| if cond { data } else { 0 };
     let a = source(43);
     let b = f(true, a);
     sink(b); // $ hasValueFlow=43
@@ -102,9 +113,81 @@ fn test_apply_wrap() {
     apply_wrap(|x| sink(x), 0);
 }
 
+mod external_file;
+use external_file::*;
+
+fn test_external_call() {
+    let a = source(81);
+    may_invoke_callback1(|x| sink(a)); // $ hasValueFlow=81
+    may_invoke_callback2(|x| sink(a)); // $ hasValueFlow=81
+    may_invoke_callback3(|x| sink(a)); // $ hasValueFlow=81
+    may_invoke_callback4(|x| sink(a)); // $ hasValueFlow=81
+}
+
+mod async_blocks {
+    use super::{sink, source};
+
+    async fn async_block_flow_out() {
+        let future = async { source(206) };
+        sink(future.await); // $ hasValueFlow=206
+    }
+
+    async fn async_block_flow_in() {
+        let data = source(207);
+        async {
+            sink(data); // $ hasValueFlow=207
+        }
+        .await;
+    }
+
+    async fn async_block_flow_through() {
+        let data = source(208);
+        let future = async { data };
+        sink(future.await); // $ hasValueFlow=208
+    }
+
+    async fn async_block_captured_variable() {
+        let mut captured = 1;
+        sink(captured);
+        async {
+            captured = source(209);
+        }
+        .await;
+        sink(captured); // $ hasValueFlow=209
+    }
+
+    async fn boxed_async_block_captured_variable() {
+        let mut captured = 1;
+        sink(captured);
+        Box::pin(async {
+            captured = source(210);
+        })
+        .await;
+        sink(captured); // $ MISSING: hasValueFlow=210
+    }
+
+    async fn test_async_blocks() {
+        async_block_flow_out().await;
+        async_block_flow_in().await;
+        async_block_flow_through().await;
+        async_block_captured_variable().await;
+        boxed_async_block_captured_variable().await;
+    }
+
+    pub fn main() {
+        futures::executor::block_on(test_async_blocks());
+    }
+}
+
+fn closure_flow_out_try() {
+    let f = || (Some(Some(source(93))))?;
+    sink(f().unwrap()); // $ hasValueFlow=93
+}
+
 fn main() {
     closure_flow_out();
     closure_flow_in();
+    closure_flow_in2();
     closure_flow_through();
     closure_captured_variable();
     function_flow_in();
@@ -112,4 +195,5 @@ fn main() {
     function_flows_through();
     test_apply();
     test_apply_wrap();
+    async_blocks::main();
 }
diff --git a/rust/ql/test/library-tests/dataflow/lambdas/options.yml b/rust/ql/test/library-tests/dataflow/lambdas/options.yml
new file mode 100644
index 000000000000..72214fcdfc77
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/lambdas/options.yml
@@ -0,0 +1,3 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - futures = { version = "0.3" }
diff --git a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
index 7d70ff90eaa6..9c039d360fc5 100644
--- a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
+++ b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
@@ -9,6 +9,7 @@ localStep
 | main.rs:7:9:7:9 | s | main.rs:7:9:7:9 | s |
 | main.rs:7:9:7:14 | ...: i64 | main.rs:7:9:7:9 | s |
 | main.rs:8:14:8:20 | FormatArgsExpr | main.rs:8:14:8:20 | MacroExpr |
+| main.rs:8:14:8:20 | MacroExpr | main.rs:8:14:8:20 | MacroExpr |
 | main.rs:8:14:8:20 | [post] MacroExpr | main.rs:8:14:8:20 | [post] FormatArgsExpr |
 | main.rs:8:14:8:20 | { ... } | main.rs:8:5:8:21 | MacroExpr |
 | main.rs:8:14:8:20 | { ... } | main.rs:8:14:8:20 | { ... } |
@@ -17,6 +18,7 @@ localStep
 | main.rs:11:13:11:14 | sr | main.rs:11:13:11:14 | sr |
 | main.rs:11:13:11:20 | ...: ... | main.rs:11:13:11:14 | sr |
 | main.rs:12:14:12:21 | FormatArgsExpr | main.rs:12:14:12:21 | MacroExpr |
+| main.rs:12:14:12:21 | MacroExpr | main.rs:12:14:12:21 | MacroExpr |
 | main.rs:12:14:12:21 | [post] MacroExpr | main.rs:12:14:12:21 | [post] FormatArgsExpr |
 | main.rs:12:14:12:21 | { ... } | main.rs:12:5:12:22 | MacroExpr |
 | main.rs:12:14:12:21 | { ... } | main.rs:12:14:12:21 | { ... } |
@@ -424,12 +426,16 @@ localStep
 | main.rs:335:32:335:45 | Ok(...) | main.rs:335:9:335:10 | s1 |
 | main.rs:336:10:336:11 | [post] s1 | main.rs:337:10:337:11 | s1 |
 | main.rs:336:10:336:11 | s1 | main.rs:337:10:337:11 | s1 |
+| main.rs:336:20:336:21 | "" | main.rs:336:20:336:21 | "" |
+| main.rs:337:24:337:25 | "" | main.rs:337:24:337:25 | "" |
 | main.rs:339:9:339:10 | [SSA] s2 | main.rs:340:10:340:11 | s2 |
 | main.rs:339:9:339:10 | s2 | main.rs:339:9:339:10 | [SSA] s2 |
 | main.rs:339:9:339:10 | s2 | main.rs:339:9:339:10 | s2 |
 | main.rs:339:32:339:46 | Err(...) | main.rs:339:9:339:10 | s2 |
 | main.rs:340:10:340:11 | [post] s2 | main.rs:341:10:341:11 | s2 |
 | main.rs:340:10:340:11 | s2 | main.rs:341:10:341:11 | s2 |
+| main.rs:340:20:340:21 | "" | main.rs:340:20:340:21 | "" |
+| main.rs:341:24:341:25 | "" | main.rs:341:24:341:25 | "" |
 | main.rs:350:9:350:10 | [SSA] s1 | main.rs:352:11:352:12 | s1 |
 | main.rs:350:9:350:10 | s1 | main.rs:350:9:350:10 | [SSA] s1 |
 | main.rs:350:9:350:10 | s1 | main.rs:350:9:350:10 | s1 |
@@ -666,8 +672,8 @@ localStep
 | main.rs:478:39:478:72 | ...: Vec::<...> | main.rs:478:39:478:43 | names |
 | main.rs:479:9:479:20 | default_name | main.rs:479:9:479:20 | [SSA] default_name |
 | main.rs:479:9:479:20 | default_name | main.rs:479:9:479:20 | default_name |
+| main.rs:479:9:479:20 | default_name | main.rs:480:9:480:20 | SSA phi read(default_name) |
 | main.rs:479:24:479:45 | ... .to_string() | main.rs:479:9:479:20 | default_name |
-| main.rs:479:24:479:45 | ... .to_string() | main.rs:480:9:480:20 | SSA phi read(default_name) |
 | main.rs:480:5:486:5 | for ... in ... { ... } | main.rs:478:75:487:1 | { ... } |
 | main.rs:480:9:480:20 | SSA phi read(default_name) | main.rs:482:41:482:67 | default_name |
 | main.rs:480:10:480:13 | [SSA] cond | main.rs:481:12:481:15 | cond |
@@ -695,6 +701,7 @@ localStep
 | main.rs:500:16:500:16 | s | main.rs:500:16:500:16 | s |
 | main.rs:500:16:500:24 | ...: String | main.rs:500:16:500:16 | s |
 | main.rs:501:14:501:20 | FormatArgsExpr | main.rs:501:14:501:20 | MacroExpr |
+| main.rs:501:14:501:20 | MacroExpr | main.rs:501:14:501:20 | MacroExpr |
 | main.rs:501:14:501:20 | [post] MacroExpr | main.rs:501:14:501:20 | [post] FormatArgsExpr |
 | main.rs:501:14:501:20 | { ... } | main.rs:501:5:501:21 | MacroExpr |
 | main.rs:501:14:501:20 | { ... } | main.rs:501:14:501:20 | { ... } |
@@ -756,6 +763,7 @@ localStep
 | main.rs:535:20:535:20 | x | main.rs:535:20:535:20 | x |
 | main.rs:536:5:536:6 | [post] vs | main.rs:538:14:538:15 | vs |
 | main.rs:536:5:536:6 | vs | main.rs:538:14:538:15 | vs |
+| main.rs:536:24:536:35 | \|...\| ... | main.rs:536:24:536:35 | \|...\| ... |
 | main.rs:536:25:536:25 | ... | main.rs:536:25:536:25 | x |
 | main.rs:536:25:536:25 | [SSA] x | main.rs:536:34:536:34 | x |
 | main.rs:536:25:536:25 | x | main.rs:536:25:536:25 | [SSA] x |
@@ -937,26 +945,57 @@ readStep
 | main.rs:519:10:519:11 | [post] vs [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:519:10:519:11 | [post] vs |
 | main.rs:519:10:519:14 | vs[0] [pre-dereferenced] | file://:0:0:0:0 | &ref | main.rs:519:10:519:14 | vs[0] |
 | main.rs:520:10:520:35 | * ... [pre-dereferenced] | file://:0:0:0:0 | &ref | main.rs:520:10:520:35 | * ... |
+| main.rs:520:11:520:12 | [post] vs [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:520:11:520:12 | [post] vs [implicit deref 0 in state after deref] |
+| main.rs:520:11:520:12 | [post] vs [implicit deref 0 in state after borrow] | file://:0:0:0:0 | &ref | main.rs:520:11:520:12 | [post] vs |
+| main.rs:520:11:520:12 | vs [implicit deref 0 in state before deref] | file://:0:0:0:0 | &ref | main.rs:520:11:520:12 | vs [implicit deref 0 in state after deref] |
+| main.rs:520:11:520:19 | [post] vs.iter() [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:520:11:520:19 | [post] vs.iter() |
 | main.rs:520:11:520:35 | [post] ... .unwrap() [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:520:11:520:35 | [post] ... .unwrap() |
 | main.rs:521:10:521:35 | * ... [pre-dereferenced] | file://:0:0:0:0 | &ref | main.rs:521:10:521:35 | * ... |
+| main.rs:521:11:521:12 | [post] vs [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:521:11:521:12 | [post] vs [implicit deref 0 in state after deref] |
+| main.rs:521:11:521:12 | [post] vs [implicit deref 0 in state after borrow] | file://:0:0:0:0 | &ref | main.rs:521:11:521:12 | [post] vs |
+| main.rs:521:11:521:12 | vs [implicit deref 0 in state before deref] | file://:0:0:0:0 | &ref | main.rs:521:11:521:12 | vs [implicit deref 0 in state after deref] |
+| main.rs:521:11:521:19 | [post] vs.iter() [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:521:11:521:19 | [post] vs.iter() |
 | main.rs:521:11:521:35 | [post] ... .unwrap() [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:521:11:521:35 | [post] ... .unwrap() |
 | main.rs:523:14:523:15 | vs | file://:0:0:0:0 | element | main.rs:523:9:523:9 | v |
 | main.rs:526:9:526:10 | &... | file://:0:0:0:0 | &ref | main.rs:526:10:526:10 | v |
+| main.rs:526:15:526:16 | [post] vs [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:526:15:526:16 | [post] vs [implicit deref 0 in state after deref] |
+| main.rs:526:15:526:16 | [post] vs [implicit deref 0 in state after borrow] | file://:0:0:0:0 | &ref | main.rs:526:15:526:16 | [post] vs |
+| main.rs:526:15:526:16 | vs [implicit deref 0 in state before deref] | file://:0:0:0:0 | &ref | main.rs:526:15:526:16 | vs [implicit deref 0 in state after deref] |
 | main.rs:526:15:526:23 | vs.iter() | file://:0:0:0:0 | element | main.rs:526:9:526:10 | &... |
+| main.rs:530:26:530:27 | [post] vs [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:530:26:530:27 | [post] vs [implicit deref 0 in state after deref] |
+| main.rs:530:26:530:27 | [post] vs [implicit deref 0 in state after borrow] | file://:0:0:0:0 | &ref | main.rs:530:26:530:27 | [post] vs |
+| main.rs:530:26:530:27 | vs [implicit deref 0 in state before deref] | file://:0:0:0:0 | &ref | main.rs:530:26:530:27 | vs [implicit deref 0 in state after deref] |
 | main.rs:531:9:531:10 | &... | file://:0:0:0:0 | &ref | main.rs:531:10:531:10 | v |
 | main.rs:531:15:531:17 | vs2 | file://:0:0:0:0 | element | main.rs:531:9:531:10 | &... |
+| main.rs:535:5:535:6 | [post] vs [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:535:5:535:6 | [post] vs [implicit deref 0 in state after deref] |
+| main.rs:535:5:535:6 | [post] vs [implicit deref 0 in state after borrow] | file://:0:0:0:0 | &ref | main.rs:535:5:535:6 | [post] vs |
+| main.rs:535:5:535:6 | vs [implicit deref 0 in state before deref] | file://:0:0:0:0 | &ref | main.rs:535:5:535:6 | vs [implicit deref 0 in state after deref] |
 | main.rs:535:28:535:29 | * ... [pre-dereferenced] | file://:0:0:0:0 | &ref | main.rs:535:28:535:29 | * ... |
 | main.rs:535:29:535:29 | [post] x [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:535:29:535:29 | [post] x |
+| main.rs:536:5:536:6 | [post] vs [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:536:5:536:6 | [post] vs [implicit deref 0 in state after deref] |
+| main.rs:536:5:536:6 | [post] vs [implicit deref 0 in state after borrow] | file://:0:0:0:0 | &ref | main.rs:536:5:536:6 | [post] vs |
+| main.rs:536:5:536:6 | vs [implicit deref 0 in state before deref] | file://:0:0:0:0 | &ref | main.rs:536:5:536:6 | vs [implicit deref 0 in state after deref] |
 | main.rs:536:33:536:34 | * ... [pre-dereferenced] | file://:0:0:0:0 | &ref | main.rs:536:33:536:34 | * ... |
 | main.rs:536:34:536:34 | [post] x [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:536:34:536:34 | [post] x |
 | main.rs:538:14:538:27 | vs.into_iter() | file://:0:0:0:0 | element | main.rs:538:9:538:9 | v |
 | main.rs:544:10:544:15 | [post] vs_mut [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:544:10:544:15 | [post] vs_mut |
 | main.rs:544:10:544:18 | vs_mut[0] [pre-dereferenced] | file://:0:0:0:0 | &ref | main.rs:544:10:544:18 | vs_mut[0] |
 | main.rs:545:10:545:39 | * ... [pre-dereferenced] | file://:0:0:0:0 | &ref | main.rs:545:10:545:39 | * ... |
+| main.rs:545:11:545:16 | [post] vs_mut [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:545:11:545:16 | [post] vs_mut [implicit deref 0 in state after deref] |
+| main.rs:545:11:545:16 | [post] vs_mut [implicit deref 0 in state after borrow] | file://:0:0:0:0 | &ref | main.rs:545:11:545:16 | [post] vs_mut |
+| main.rs:545:11:545:16 | vs_mut [implicit deref 0 in state before deref] | file://:0:0:0:0 | &ref | main.rs:545:11:545:16 | vs_mut [implicit deref 0 in state after deref] |
+| main.rs:545:11:545:23 | [post] vs_mut.iter() [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:545:11:545:23 | [post] vs_mut.iter() |
 | main.rs:545:11:545:39 | [post] ... .unwrap() [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:545:11:545:39 | [post] ... .unwrap() |
 | main.rs:546:10:546:39 | * ... [pre-dereferenced] | file://:0:0:0:0 | &ref | main.rs:546:10:546:39 | * ... |
+| main.rs:546:11:546:16 | [post] vs_mut [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:546:11:546:16 | [post] vs_mut [implicit deref 0 in state after deref] |
+| main.rs:546:11:546:16 | [post] vs_mut [implicit deref 0 in state after borrow] | file://:0:0:0:0 | &ref | main.rs:546:11:546:16 | [post] vs_mut |
+| main.rs:546:11:546:16 | vs_mut [implicit deref 0 in state before deref] | file://:0:0:0:0 | &ref | main.rs:546:11:546:16 | vs_mut [implicit deref 0 in state after deref] |
+| main.rs:546:11:546:23 | [post] vs_mut.iter() [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:546:11:546:23 | [post] vs_mut.iter() |
 | main.rs:546:11:546:39 | [post] ... .unwrap() [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:546:11:546:39 | [post] ... .unwrap() |
 | main.rs:548:9:548:14 | &mut ... | file://:0:0:0:0 | &ref | main.rs:548:14:548:14 | v |
+| main.rs:548:19:548:24 | [post] vs_mut [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:548:19:548:24 | [post] vs_mut [implicit deref 0 in state after deref] |
+| main.rs:548:19:548:24 | [post] vs_mut [implicit deref 0 in state after borrow] | file://:0:0:0:0 | &ref | main.rs:548:19:548:24 | [post] vs_mut |
+| main.rs:548:19:548:24 | vs_mut [implicit deref 0 in state before deref] | file://:0:0:0:0 | &ref | main.rs:548:19:548:24 | vs_mut [implicit deref 0 in state after deref] |
 | main.rs:548:19:548:35 | vs_mut.iter_mut() | file://:0:0:0:0 | element | main.rs:548:9:548:14 | &mut ... |
 | main.rs:562:10:562:15 | * ... [pre-dereferenced] | file://:0:0:0:0 | &ref | main.rs:562:10:562:15 | * ... |
 | main.rs:562:11:562:15 | [post] c_ref [implicit borrow] | file://:0:0:0:0 | &ref | main.rs:562:11:562:15 | [post] c_ref |
@@ -1062,17 +1101,39 @@ storeStep
 | main.rs:517:30:517:30 | 3 | file://:0:0:0:0 | element | main.rs:517:14:517:34 | [...] |
 | main.rs:517:33:517:33 | 4 | file://:0:0:0:0 | element | main.rs:517:14:517:34 | [...] |
 | main.rs:519:10:519:11 | vs | file://:0:0:0:0 | &ref | main.rs:519:10:519:11 | vs [implicit borrow] |
+| main.rs:520:11:520:12 | vs | file://:0:0:0:0 | &ref | main.rs:520:11:520:12 | vs [implicit deref 0 in state after borrow] |
+| main.rs:520:11:520:12 | vs [implicit deref 0 in state after deref] | file://:0:0:0:0 | &ref | main.rs:520:11:520:12 | vs [implicit borrow] |
+| main.rs:520:11:520:19 | vs.iter() | file://:0:0:0:0 | &ref | main.rs:520:11:520:19 | vs.iter() [implicit borrow] |
 | main.rs:520:11:520:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:520:11:520:35 | ... .unwrap() [implicit borrow] |
+| main.rs:521:11:521:12 | vs | file://:0:0:0:0 | &ref | main.rs:521:11:521:12 | vs [implicit deref 0 in state after borrow] |
+| main.rs:521:11:521:12 | vs [implicit deref 0 in state after deref] | file://:0:0:0:0 | &ref | main.rs:521:11:521:12 | vs [implicit borrow] |
+| main.rs:521:11:521:19 | vs.iter() | file://:0:0:0:0 | &ref | main.rs:521:11:521:19 | vs.iter() [implicit borrow] |
 | main.rs:521:11:521:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:521:11:521:35 | ... .unwrap() [implicit borrow] |
+| main.rs:526:15:526:16 | vs | file://:0:0:0:0 | &ref | main.rs:526:15:526:16 | vs [implicit deref 0 in state after borrow] |
+| main.rs:526:15:526:16 | vs [implicit deref 0 in state after deref] | file://:0:0:0:0 | &ref | main.rs:526:15:526:16 | vs [implicit borrow] |
+| main.rs:530:26:530:27 | vs | file://:0:0:0:0 | &ref | main.rs:530:26:530:27 | vs [implicit deref 0 in state after borrow] |
+| main.rs:530:26:530:27 | vs [implicit deref 0 in state after deref] | file://:0:0:0:0 | &ref | main.rs:530:26:530:27 | vs [implicit borrow] |
+| main.rs:535:5:535:6 | vs | file://:0:0:0:0 | &ref | main.rs:535:5:535:6 | vs [implicit deref 0 in state after borrow] |
+| main.rs:535:5:535:6 | vs [implicit deref 0 in state after deref] | file://:0:0:0:0 | &ref | main.rs:535:5:535:6 | vs [implicit borrow] |
 | main.rs:535:29:535:29 | x | file://:0:0:0:0 | &ref | main.rs:535:29:535:29 | x [implicit borrow] |
+| main.rs:536:5:536:6 | vs | file://:0:0:0:0 | &ref | main.rs:536:5:536:6 | vs [implicit deref 0 in state after borrow] |
+| main.rs:536:5:536:6 | vs [implicit deref 0 in state after deref] | file://:0:0:0:0 | &ref | main.rs:536:5:536:6 | vs [implicit borrow] |
 | main.rs:536:34:536:34 | x | file://:0:0:0:0 | &ref | main.rs:536:34:536:34 | x [implicit borrow] |
 | main.rs:542:23:542:32 | source(...) | file://:0:0:0:0 | element | main.rs:542:22:542:42 | [...] |
 | main.rs:542:35:542:35 | 2 | file://:0:0:0:0 | element | main.rs:542:22:542:42 | [...] |
 | main.rs:542:38:542:38 | 3 | file://:0:0:0:0 | element | main.rs:542:22:542:42 | [...] |
 | main.rs:542:41:542:41 | 4 | file://:0:0:0:0 | element | main.rs:542:22:542:42 | [...] |
 | main.rs:544:10:544:15 | vs_mut | file://:0:0:0:0 | &ref | main.rs:544:10:544:15 | vs_mut [implicit borrow] |
+| main.rs:545:11:545:16 | vs_mut | file://:0:0:0:0 | &ref | main.rs:545:11:545:16 | vs_mut [implicit deref 0 in state after borrow] |
+| main.rs:545:11:545:16 | vs_mut [implicit deref 0 in state after deref] | file://:0:0:0:0 | &ref | main.rs:545:11:545:16 | vs_mut [implicit borrow] |
+| main.rs:545:11:545:23 | vs_mut.iter() | file://:0:0:0:0 | &ref | main.rs:545:11:545:23 | vs_mut.iter() [implicit borrow] |
 | main.rs:545:11:545:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:545:11:545:39 | ... .unwrap() [implicit borrow] |
+| main.rs:546:11:546:16 | vs_mut | file://:0:0:0:0 | &ref | main.rs:546:11:546:16 | vs_mut [implicit deref 0 in state after borrow] |
+| main.rs:546:11:546:16 | vs_mut [implicit deref 0 in state after deref] | file://:0:0:0:0 | &ref | main.rs:546:11:546:16 | vs_mut [implicit borrow] |
+| main.rs:546:11:546:23 | vs_mut.iter() | file://:0:0:0:0 | &ref | main.rs:546:11:546:23 | vs_mut.iter() [implicit borrow] |
 | main.rs:546:11:546:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:546:11:546:39 | ... .unwrap() [implicit borrow] |
+| main.rs:548:19:548:24 | vs_mut | file://:0:0:0:0 | &ref | main.rs:548:19:548:24 | vs_mut [implicit deref 0 in state after borrow] |
+| main.rs:548:19:548:24 | vs_mut [implicit deref 0 in state after deref] | file://:0:0:0:0 | &ref | main.rs:548:19:548:24 | vs_mut [implicit borrow] |
 | main.rs:557:18:557:18 | c | file://:0:0:0:0 | &ref | main.rs:557:17:557:18 | &c |
 | main.rs:560:15:560:15 | b | file://:0:0:0:0 | &ref | main.rs:560:14:560:15 | &b |
 | main.rs:562:11:562:15 | c_ref | file://:0:0:0:0 | &ref | main.rs:562:11:562:15 | c_ref [implicit borrow] |
diff --git a/rust/ql/test/library-tests/dataflow/local/inline-flow.expected b/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
index 3b8052fdc84a..0ffebef2f4b2 100644
--- a/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
@@ -1,23 +1,28 @@
 models
 | 1 | Summary: <& as core::ops::deref::Deref>::deref; Argument[self].Reference; ReturnValue; value |
-| 2 | Summary: <_ as alloc::string::ToString>::to_string; Argument[self].Reference; ReturnValue; taint |
-| 3 | Summary: <_ as core::convert::Into>::into; Argument[self].Element; ReturnValue.Element; taint |
-| 4 | Summary: <_ as core::convert::Into>::into; Argument[self].Reference.Element; ReturnValue.Element; taint |
-| 5 | Summary: <_ as core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
-| 6 | Summary: <alloc::boxed::Box as core::ops::deref::Deref>::deref; Argument[self].Reference.Field[alloc::boxed::Box(0)]; ReturnValue.Reference; value |
-| 7 | Summary: <alloc::boxed::Box>::new; Argument[0]; ReturnValue.Field[alloc::boxed::Box(0)]; value |
-| 8 | Summary: <alloc::string::String as core::ops::deref::Deref>::deref; Argument[self]; ReturnValue; value |
+| 2 | Summary: <[;] as core::ops::deref::Deref>::deref; Argument[self].Reference; ReturnValue.Reference; value |
+| 3 | Summary: <alloc::boxed::Box as core::ops::deref::Deref>::deref; Argument[self].Reference.Field[alloc::boxed::Box(0)]; ReturnValue.Reference; value |
+| 4 | Summary: <alloc::boxed::Box>::new; Argument[0]; ReturnValue.Field[alloc::boxed::Box(0)]; value |
+| 5 | Summary: <alloc::string::String as core::ops::deref::Deref>::deref; Argument[self]; ReturnValue; value |
+| 6 | Summary: <alloc::string::ToString>::to_string; Argument[self].Reference; ReturnValue; taint |
+| 7 | Summary: <core::convert::Into>::into; Argument[self].Element; ReturnValue.Element; taint |
+| 8 | Summary: <core::convert::Into>::into; Argument[self].Reference.Element; ReturnValue.Element; taint |
 | 9 | Summary: <core::i64 as core::convert::From>::from; Argument[0]; ReturnValue; taint |
-| 10 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
-| 11 | Summary: <core::option::Option>::unwrap_or; Argument[0]; ReturnValue; value |
-| 12 | Summary: <core::option::Option>::unwrap_or; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
-| 13 | Summary: <core::option::Option>::unwrap_or_else; Argument[0].ReturnValue; ReturnValue; value |
-| 14 | Summary: <core::option::Option>::unwrap_or_else; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
-| 15 | Summary: <core::result::Result>::err; Argument[self].Field[core::result::Result::Err(0)]; ReturnValue.Field[core::option::Option::Some(0)]; value |
-| 16 | Summary: <core::result::Result>::expect; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 17 | Summary: <core::result::Result>::expect_err; Argument[self].Field[core::result::Result::Err(0)]; ReturnValue; value |
-| 18 | Summary: <core::result::Result>::ok; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue.Field[core::option::Option::Some(0)]; value |
-| 19 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 10 | Summary: <core::iter::traits::iterator::Iterator>::collect; Argument[self].Element; ReturnValue.Element; value |
+| 11 | Summary: <core::iter::traits::iterator::Iterator>::map; Argument[self].Element; Argument[0].Parameter[0]; value |
+| 12 | Summary: <core::iter::traits::iterator::Iterator>::next; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 13 | Summary: <core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 14 | Summary: <core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
+| 15 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 16 | Summary: <core::option::Option>::unwrap_or; Argument[0]; ReturnValue; value |
+| 17 | Summary: <core::option::Option>::unwrap_or; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 18 | Summary: <core::option::Option>::unwrap_or_else; Argument[0].ReturnValue; ReturnValue; value |
+| 19 | Summary: <core::option::Option>::unwrap_or_else; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 20 | Summary: <core::result::Result>::err; Argument[self].Field[core::result::Result::Err(0)]; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 21 | Summary: <core::result::Result>::expect; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 22 | Summary: <core::result::Result>::expect_err; Argument[self].Field[core::result::Result::Err(0)]; ReturnValue; value |
+| 23 | Summary: <core::result::Result>::ok; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 24 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
 edges
 | main.rs:23:9:23:9 | s | main.rs:24:10:24:10 | s | provenance |  |
 | main.rs:23:9:23:9 | s | main.rs:26:12:26:12 | x | provenance |  |
@@ -45,8 +50,8 @@ edges
 | main.rs:82:5:82:5 | l | main.rs:83:10:83:10 | l | provenance |  |
 | main.rs:115:9:115:9 | i [Box(0)] | main.rs:116:11:116:11 | i [Box(0)] | provenance |  |
 | main.rs:115:13:115:31 | ...::new(...) [Box(0)] | main.rs:115:9:115:9 | i [Box(0)] | provenance |  |
-| main.rs:115:22:115:30 | source(...) | main.rs:115:13:115:31 | ...::new(...) [Box(0)] | provenance | MaD:7 |
-| main.rs:116:11:116:11 | i [Box(0)] | main.rs:116:10:116:11 | * ... | provenance | MaD:6 |
+| main.rs:115:22:115:30 | source(...) | main.rs:115:13:115:31 | ...::new(...) [Box(0)] | provenance | MaD:4 |
+| main.rs:116:11:116:11 | i [Box(0)] | main.rs:116:10:116:11 | * ... | provenance | MaD:3 |
 | main.rs:123:9:123:9 | a [tuple.0] | main.rs:124:10:124:10 | a [tuple.0] | provenance |  |
 | main.rs:123:13:123:26 | TupleExpr [tuple.0] | main.rs:123:9:123:9 | a [tuple.0] | provenance |  |
 | main.rs:123:14:123:22 | source(...) | main.rs:123:13:123:26 | TupleExpr [tuple.0] | provenance |  |
@@ -129,17 +134,17 @@ edges
 | main.rs:278:9:278:10 | s1 [Some] | main.rs:279:10:279:11 | s1 [Some] | provenance |  |
 | main.rs:278:14:278:29 | Some(...) [Some] | main.rs:278:9:278:10 | s1 [Some] | provenance |  |
 | main.rs:278:19:278:28 | source(...) | main.rs:278:14:278:29 | Some(...) [Some] | provenance |  |
-| main.rs:279:10:279:11 | s1 [Some] | main.rs:279:10:279:20 | s1.unwrap() | provenance | MaD:10 |
+| main.rs:279:10:279:11 | s1 [Some] | main.rs:279:10:279:20 | s1.unwrap() | provenance | MaD:15 |
 | main.rs:283:9:283:10 | s1 [Some] | main.rs:284:10:284:11 | s1 [Some] | provenance |  |
 | main.rs:283:14:283:29 | Some(...) [Some] | main.rs:283:9:283:10 | s1 [Some] | provenance |  |
 | main.rs:283:19:283:28 | source(...) | main.rs:283:14:283:29 | Some(...) [Some] | provenance |  |
-| main.rs:284:10:284:11 | s1 [Some] | main.rs:284:10:284:24 | s1.unwrap_or(...) | provenance | MaD:12 |
-| main.rs:287:23:287:32 | source(...) | main.rs:287:10:287:33 | s2.unwrap_or(...) | provenance | MaD:11 |
+| main.rs:284:10:284:11 | s1 [Some] | main.rs:284:10:284:24 | s1.unwrap_or(...) | provenance | MaD:17 |
+| main.rs:287:23:287:32 | source(...) | main.rs:287:10:287:33 | s2.unwrap_or(...) | provenance | MaD:16 |
 | main.rs:291:9:291:10 | s1 [Some] | main.rs:292:10:292:11 | s1 [Some] | provenance |  |
 | main.rs:291:14:291:29 | Some(...) [Some] | main.rs:291:9:291:10 | s1 [Some] | provenance |  |
 | main.rs:291:19:291:28 | source(...) | main.rs:291:14:291:29 | Some(...) [Some] | provenance |  |
-| main.rs:292:10:292:11 | s1 [Some] | main.rs:292:10:292:32 | s1.unwrap_or_else(...) | provenance | MaD:14 |
-| main.rs:295:31:295:40 | source(...) | main.rs:295:10:295:41 | s2.unwrap_or_else(...) | provenance | MaD:13 |
+| main.rs:292:10:292:11 | s1 [Some] | main.rs:292:10:292:32 | s1.unwrap_or_else(...) | provenance | MaD:19 |
+| main.rs:295:31:295:40 | source(...) | main.rs:295:10:295:41 | s2.unwrap_or_else(...) | provenance | MaD:18 |
 | main.rs:299:9:299:10 | s1 [Some] | main.rs:301:14:301:15 | s1 [Some] | provenance |  |
 | main.rs:299:14:299:29 | Some(...) [Some] | main.rs:299:9:299:10 | s1 [Some] | provenance |  |
 | main.rs:299:19:299:28 | source(...) | main.rs:299:14:299:29 | Some(...) [Some] | provenance |  |
@@ -150,16 +155,16 @@ edges
 | main.rs:308:32:308:45 | Ok(...) [Ok] | main.rs:308:9:308:10 | r1 [Ok] | provenance |  |
 | main.rs:308:35:308:44 | source(...) | main.rs:308:32:308:45 | Ok(...) [Ok] | provenance |  |
 | main.rs:309:9:309:11 | o1a [Some] | main.rs:311:10:311:12 | o1a [Some] | provenance |  |
-| main.rs:309:28:309:29 | r1 [Ok] | main.rs:309:28:309:34 | r1.ok() [Some] | provenance | MaD:18 |
+| main.rs:309:28:309:29 | r1 [Ok] | main.rs:309:28:309:34 | r1.ok() [Some] | provenance | MaD:23 |
 | main.rs:309:28:309:34 | r1.ok() [Some] | main.rs:309:9:309:11 | o1a [Some] | provenance |  |
-| main.rs:311:10:311:12 | o1a [Some] | main.rs:311:10:311:21 | o1a.unwrap() | provenance | MaD:10 |
+| main.rs:311:10:311:12 | o1a [Some] | main.rs:311:10:311:21 | o1a.unwrap() | provenance | MaD:15 |
 | main.rs:314:9:314:10 | r2 [Err] | main.rs:316:28:316:29 | r2 [Err] | provenance |  |
 | main.rs:314:32:314:46 | Err(...) [Err] | main.rs:314:9:314:10 | r2 [Err] | provenance |  |
 | main.rs:314:36:314:45 | source(...) | main.rs:314:32:314:46 | Err(...) [Err] | provenance |  |
 | main.rs:316:9:316:11 | o2b [Some] | main.rs:318:10:318:12 | o2b [Some] | provenance |  |
-| main.rs:316:28:316:29 | r2 [Err] | main.rs:316:28:316:35 | r2.err() [Some] | provenance | MaD:15 |
+| main.rs:316:28:316:29 | r2 [Err] | main.rs:316:28:316:35 | r2.err() [Some] | provenance | MaD:20 |
 | main.rs:316:28:316:35 | r2.err() [Some] | main.rs:316:9:316:11 | o2b [Some] | provenance |  |
-| main.rs:318:10:318:12 | o2b [Some] | main.rs:318:10:318:21 | o2b.unwrap() | provenance | MaD:10 |
+| main.rs:318:10:318:12 | o2b [Some] | main.rs:318:10:318:21 | o2b.unwrap() | provenance | MaD:15 |
 | main.rs:322:9:322:10 | s1 [Ok] | main.rs:325:14:325:15 | s1 [Ok] | provenance |  |
 | main.rs:322:32:322:45 | Ok(...) [Ok] | main.rs:322:9:322:10 | s1 [Ok] | provenance |  |
 | main.rs:322:35:322:44 | source(...) | main.rs:322:32:322:45 | Ok(...) [Ok] | provenance |  |
@@ -169,11 +174,11 @@ edges
 | main.rs:335:9:335:10 | s1 [Ok] | main.rs:336:10:336:11 | s1 [Ok] | provenance |  |
 | main.rs:335:32:335:45 | Ok(...) [Ok] | main.rs:335:9:335:10 | s1 [Ok] | provenance |  |
 | main.rs:335:35:335:44 | source(...) | main.rs:335:32:335:45 | Ok(...) [Ok] | provenance |  |
-| main.rs:336:10:336:11 | s1 [Ok] | main.rs:336:10:336:22 | s1.expect(...) | provenance | MaD:16 |
+| main.rs:336:10:336:11 | s1 [Ok] | main.rs:336:10:336:22 | s1.expect(...) | provenance | MaD:21 |
 | main.rs:339:9:339:10 | s2 [Err] | main.rs:341:10:341:11 | s2 [Err] | provenance |  |
 | main.rs:339:32:339:46 | Err(...) [Err] | main.rs:339:9:339:10 | s2 [Err] | provenance |  |
 | main.rs:339:36:339:45 | source(...) | main.rs:339:32:339:46 | Err(...) [Err] | provenance |  |
-| main.rs:341:10:341:11 | s2 [Err] | main.rs:341:10:341:26 | s2.expect_err(...) | provenance | MaD:17 |
+| main.rs:341:10:341:11 | s2 [Err] | main.rs:341:10:341:26 | s2.expect_err(...) | provenance | MaD:22 |
 | main.rs:350:9:350:10 | s1 [A] | main.rs:352:11:352:12 | s1 [A] | provenance |  |
 | main.rs:350:14:350:39 | ...::A(...) [A] | main.rs:350:9:350:10 | s1 [A] | provenance |  |
 | main.rs:350:29:350:38 | source(...) | main.rs:350:14:350:39 | ...::A(...) [A] | provenance |  |
@@ -222,13 +227,13 @@ edges
 | main.rs:430:16:430:33 | [...] [element] | main.rs:430:9:430:12 | arr1 [element] | provenance |  |
 | main.rs:430:23:430:32 | source(...) | main.rs:430:16:430:33 | [...] [element] | provenance |  |
 | main.rs:431:9:431:10 | n1 | main.rs:432:10:432:11 | n1 | provenance |  |
-| main.rs:431:14:431:17 | arr1 [element] | main.rs:431:14:431:20 | arr1[2] | provenance | MaD:5 |
+| main.rs:431:14:431:17 | arr1 [element] | main.rs:431:14:431:20 | arr1[2] | provenance | MaD:14 |
 | main.rs:431:14:431:20 | arr1[2] | main.rs:431:9:431:10 | n1 | provenance |  |
 | main.rs:434:9:434:12 | arr2 [element] | main.rs:435:14:435:17 | arr2 [element] | provenance |  |
 | main.rs:434:16:434:31 | [...; 10] [element] | main.rs:434:9:434:12 | arr2 [element] | provenance |  |
 | main.rs:434:17:434:26 | source(...) | main.rs:434:16:434:31 | [...; 10] [element] | provenance |  |
 | main.rs:435:9:435:10 | n2 | main.rs:436:10:436:11 | n2 | provenance |  |
-| main.rs:435:14:435:17 | arr2 [element] | main.rs:435:14:435:20 | arr2[4] | provenance | MaD:5 |
+| main.rs:435:14:435:17 | arr2 [element] | main.rs:435:14:435:20 | arr2[4] | provenance | MaD:14 |
 | main.rs:435:14:435:20 | arr2[4] | main.rs:435:9:435:10 | n2 | provenance |  |
 | main.rs:444:9:444:12 | arr1 [element] | main.rs:445:15:445:18 | arr1 [element] | provenance |  |
 | main.rs:444:16:444:33 | [...] [element] | main.rs:444:9:444:12 | arr1 [element] | provenance |  |
@@ -249,9 +254,9 @@ edges
 | main.rs:470:5:470:11 | [post] mut_arr [element] | main.rs:473:10:473:16 | mut_arr [element] | provenance |  |
 | main.rs:470:18:470:27 | source(...) | main.rs:470:5:470:11 | [post] mut_arr [element] | provenance |  |
 | main.rs:471:9:471:9 | d | main.rs:472:10:472:10 | d | provenance |  |
-| main.rs:471:13:471:19 | mut_arr [element] | main.rs:471:13:471:22 | mut_arr[1] | provenance | MaD:5 |
+| main.rs:471:13:471:19 | mut_arr [element] | main.rs:471:13:471:22 | mut_arr[1] | provenance | MaD:14 |
 | main.rs:471:13:471:22 | mut_arr[1] | main.rs:471:9:471:9 | d | provenance |  |
-| main.rs:473:10:473:16 | mut_arr [element] | main.rs:473:10:473:19 | mut_arr[0] | provenance | MaD:5 |
+| main.rs:473:10:473:16 | mut_arr [element] | main.rs:473:10:473:19 | mut_arr[0] | provenance | MaD:14 |
 | main.rs:496:9:496:9 | s | main.rs:497:10:497:10 | s | provenance |  |
 | main.rs:496:25:496:26 | source(...) | main.rs:496:9:496:9 | s | provenance |  |
 | main.rs:505:9:505:9 | a | main.rs:506:13:506:13 | a | provenance |  |
@@ -260,27 +265,70 @@ edges
 | main.rs:506:9:506:9 | b | main.rs:507:13:507:13 | b | provenance |  |
 | main.rs:506:9:506:9 | b | main.rs:508:18:508:18 | b | provenance |  |
 | main.rs:506:9:506:9 | b | main.rs:511:17:511:17 | b | provenance |  |
-| main.rs:506:13:506:13 | a | main.rs:506:13:506:25 | a.to_string() | provenance | MaD:2 |
+| main.rs:506:13:506:13 | a | main.rs:506:13:506:25 | a.to_string() | provenance | MaD:6 |
 | main.rs:506:13:506:25 | a.to_string() | main.rs:506:9:506:9 | b | provenance |  |
 | main.rs:507:9:507:9 | c | main.rs:512:10:512:10 | c | provenance |  |
-| main.rs:507:13:507:13 | b | main.rs:507:13:507:28 | b.parse() [Ok] | provenance | MaD:8 |
-| main.rs:507:13:507:28 | b.parse() [Ok] | main.rs:507:13:507:37 | ... .unwrap() | provenance | MaD:19 |
+| main.rs:507:13:507:13 | b | main.rs:507:13:507:28 | b.parse() [Ok] | provenance | MaD:5 |
+| main.rs:507:13:507:28 | b.parse() [Ok] | main.rs:507:13:507:37 | ... .unwrap() | provenance | MaD:24 |
 | main.rs:507:13:507:37 | ... .unwrap() | main.rs:507:9:507:9 | c | provenance |  |
 | main.rs:508:9:508:9 | d | main.rs:513:10:513:10 | d | provenance |  |
-| main.rs:508:18:508:18 | b | main.rs:508:18:508:26 | b.parse() [Ok] | provenance | MaD:8 |
-| main.rs:508:18:508:26 | b.parse() [Ok] | main.rs:508:18:508:35 | ... .unwrap() | provenance | MaD:19 |
+| main.rs:508:18:508:18 | b | main.rs:508:18:508:26 | b.parse() [Ok] | provenance | MaD:5 |
+| main.rs:508:18:508:26 | b.parse() [Ok] | main.rs:508:18:508:35 | ... .unwrap() | provenance | MaD:24 |
 | main.rs:508:18:508:35 | ... .unwrap() | main.rs:508:9:508:9 | d | provenance |  |
 | main.rs:517:9:517:10 | vs [element] | main.rs:519:10:519:11 | vs [element] | provenance |  |
+| main.rs:517:9:517:10 | vs [element] | main.rs:520:11:520:12 | vs [element] | provenance |  |
+| main.rs:517:9:517:10 | vs [element] | main.rs:521:11:521:12 | vs [element] | provenance |  |
 | main.rs:517:9:517:10 | vs [element] | main.rs:523:14:523:15 | vs [element] | provenance |  |
+| main.rs:517:9:517:10 | vs [element] | main.rs:526:15:526:16 | vs [element] | provenance |  |
+| main.rs:517:9:517:10 | vs [element] | main.rs:530:26:530:27 | vs [element] | provenance |  |
+| main.rs:517:9:517:10 | vs [element] | main.rs:535:5:535:6 | vs [element] | provenance |  |
 | main.rs:517:14:517:34 | [...] [element] | main.rs:517:9:517:10 | vs [element] | provenance |  |
 | main.rs:517:15:517:24 | source(...) | main.rs:517:14:517:34 | [...] [element] | provenance |  |
-| main.rs:519:10:519:11 | vs [element] | main.rs:519:10:519:14 | vs[0] | provenance | MaD:5 |
+| main.rs:519:10:519:11 | vs [element] | main.rs:519:10:519:14 | vs[0] | provenance | MaD:14 |
+| main.rs:520:11:520:12 | vs [element] | main.rs:520:11:520:19 | vs.iter() [element, &ref] | provenance | MaD:2 |
+| main.rs:520:11:520:19 | vs.iter() [element, &ref] | main.rs:520:11:520:26 | ... .next() [Some, &ref] | provenance | MaD:12 |
+| main.rs:520:11:520:26 | ... .next() [Some, &ref] | main.rs:520:11:520:35 | ... .unwrap() [&ref] | provenance | MaD:15 |
+| main.rs:520:11:520:35 | ... .unwrap() [&ref] | main.rs:520:10:520:35 | * ... | provenance | MaD:1 |
+| main.rs:521:11:521:12 | vs [element] | main.rs:521:11:521:19 | vs.iter() [element, &ref] | provenance | MaD:2 |
+| main.rs:521:11:521:19 | vs.iter() [element, &ref] | main.rs:521:11:521:26 | ... .nth(...) [Some, &ref] | provenance | MaD:13 |
+| main.rs:521:11:521:26 | ... .nth(...) [Some, &ref] | main.rs:521:11:521:35 | ... .unwrap() [&ref] | provenance | MaD:15 |
+| main.rs:521:11:521:35 | ... .unwrap() [&ref] | main.rs:521:10:521:35 | * ... | provenance | MaD:1 |
 | main.rs:523:9:523:9 | v | main.rs:524:14:524:14 | v | provenance |  |
 | main.rs:523:14:523:15 | vs [element] | main.rs:523:9:523:9 | v | provenance |  |
+| main.rs:526:9:526:10 | &... [&ref] | main.rs:526:10:526:10 | v | provenance |  |
+| main.rs:526:10:526:10 | v | main.rs:527:14:527:14 | v | provenance |  |
+| main.rs:526:15:526:16 | vs [element] | main.rs:526:15:526:23 | vs.iter() [element, &ref] | provenance | MaD:2 |
+| main.rs:526:15:526:23 | vs.iter() [element, &ref] | main.rs:526:9:526:10 | &... [&ref] | provenance |  |
+| main.rs:530:9:530:11 | vs2 [element, &ref] | main.rs:531:15:531:17 | vs2 [element, &ref] | provenance |  |
+| main.rs:530:26:530:27 | vs [element] | main.rs:530:26:530:34 | vs.iter() [element, &ref] | provenance | MaD:2 |
+| main.rs:530:26:530:34 | vs.iter() [element, &ref] | main.rs:530:26:530:44 | ... .collect() [element, &ref] | provenance | MaD:10 |
+| main.rs:530:26:530:44 | ... .collect() [element, &ref] | main.rs:530:9:530:11 | vs2 [element, &ref] | provenance |  |
+| main.rs:531:9:531:10 | &... [&ref] | main.rs:531:10:531:10 | v | provenance |  |
+| main.rs:531:10:531:10 | v | main.rs:532:14:532:14 | v | provenance |  |
+| main.rs:531:15:531:17 | vs2 [element, &ref] | main.rs:531:9:531:10 | &... [&ref] | provenance |  |
+| main.rs:535:5:535:6 | vs [element] | main.rs:535:5:535:13 | vs.iter() [element, &ref] | provenance | MaD:2 |
+| main.rs:535:5:535:13 | vs.iter() [element, &ref] | main.rs:535:20:535:20 | ... [&ref] | provenance | MaD:11 |
+| main.rs:535:20:535:20 | ... [&ref] | main.rs:535:29:535:29 | x [&ref] | provenance |  |
+| main.rs:535:29:535:29 | x [&ref] | main.rs:535:28:535:29 | * ... | provenance | MaD:1 |
 | main.rs:542:9:542:18 | mut vs_mut [element] | main.rs:544:10:544:15 | vs_mut [element] | provenance |  |
+| main.rs:542:9:542:18 | mut vs_mut [element] | main.rs:545:11:545:16 | vs_mut [element] | provenance |  |
+| main.rs:542:9:542:18 | mut vs_mut [element] | main.rs:546:11:546:16 | vs_mut [element] | provenance |  |
+| main.rs:542:9:542:18 | mut vs_mut [element] | main.rs:548:19:548:24 | vs_mut [element] | provenance |  |
 | main.rs:542:22:542:42 | [...] [element] | main.rs:542:9:542:18 | mut vs_mut [element] | provenance |  |
 | main.rs:542:23:542:32 | source(...) | main.rs:542:22:542:42 | [...] [element] | provenance |  |
-| main.rs:544:10:544:15 | vs_mut [element] | main.rs:544:10:544:18 | vs_mut[0] | provenance | MaD:5 |
+| main.rs:544:10:544:15 | vs_mut [element] | main.rs:544:10:544:18 | vs_mut[0] | provenance | MaD:14 |
+| main.rs:545:11:545:16 | vs_mut [element] | main.rs:545:11:545:23 | vs_mut.iter() [element, &ref] | provenance | MaD:2 |
+| main.rs:545:11:545:23 | vs_mut.iter() [element, &ref] | main.rs:545:11:545:30 | ... .next() [Some, &ref] | provenance | MaD:12 |
+| main.rs:545:11:545:30 | ... .next() [Some, &ref] | main.rs:545:11:545:39 | ... .unwrap() [&ref] | provenance | MaD:15 |
+| main.rs:545:11:545:39 | ... .unwrap() [&ref] | main.rs:545:10:545:39 | * ... | provenance | MaD:1 |
+| main.rs:546:11:546:16 | vs_mut [element] | main.rs:546:11:546:23 | vs_mut.iter() [element, &ref] | provenance | MaD:2 |
+| main.rs:546:11:546:23 | vs_mut.iter() [element, &ref] | main.rs:546:11:546:30 | ... .nth(...) [Some, &ref] | provenance | MaD:13 |
+| main.rs:546:11:546:30 | ... .nth(...) [Some, &ref] | main.rs:546:11:546:39 | ... .unwrap() [&ref] | provenance | MaD:15 |
+| main.rs:546:11:546:39 | ... .unwrap() [&ref] | main.rs:546:10:546:39 | * ... | provenance | MaD:1 |
+| main.rs:548:9:548:14 | &mut ... [&ref] | main.rs:548:14:548:14 | v | provenance |  |
+| main.rs:548:14:548:14 | v | main.rs:549:14:549:14 | v | provenance |  |
+| main.rs:548:19:548:24 | vs_mut [element] | main.rs:548:19:548:35 | vs_mut.iter_mut() [element, &ref] | provenance | MaD:2 |
+| main.rs:548:19:548:35 | vs_mut.iter_mut() [element, &ref] | main.rs:548:9:548:14 | &mut ... [&ref] | provenance |  |
 | main.rs:554:9:554:9 | a | main.rs:559:10:559:10 | a | provenance |  |
 | main.rs:554:13:554:22 | source(...) | main.rs:554:9:554:9 | a | provenance |  |
 | main.rs:555:9:555:9 | b | main.rs:560:15:560:15 | b | provenance |  |
@@ -297,15 +345,15 @@ edges
 | main.rs:566:9:566:9 | a | main.rs:569:10:569:10 | a | provenance |  |
 | main.rs:566:9:566:9 | a | main.rs:570:20:570:20 | a | provenance |  |
 | main.rs:566:18:566:27 | source(...) | main.rs:566:9:566:9 | a | provenance |  |
-| main.rs:569:10:569:10 | a | main.rs:569:10:569:17 | a.into() | provenance | MaD:3 |
-| main.rs:569:10:569:10 | a | main.rs:569:10:569:17 | a.into() | provenance | MaD:4 |
+| main.rs:569:10:569:10 | a | main.rs:569:10:569:17 | a.into() | provenance | MaD:7 |
+| main.rs:569:10:569:10 | a | main.rs:569:10:569:17 | a.into() | provenance | MaD:8 |
 | main.rs:570:20:570:20 | a | main.rs:570:10:570:21 | ...::from(...) | provenance | ReflexiveFrom |
 | main.rs:572:9:572:9 | b | main.rs:574:10:574:17 | b as i64 | provenance |  |
 | main.rs:572:9:572:9 | b | main.rs:575:10:575:10 | b | provenance |  |
 | main.rs:572:9:572:9 | b | main.rs:576:20:576:20 | b | provenance |  |
 | main.rs:572:18:572:27 | source(...) | main.rs:572:9:572:9 | b | provenance |  |
-| main.rs:575:10:575:10 | b | main.rs:575:10:575:17 | b.into() | provenance | MaD:3 |
-| main.rs:575:10:575:10 | b | main.rs:575:10:575:17 | b.into() | provenance | MaD:4 |
+| main.rs:575:10:575:10 | b | main.rs:575:10:575:17 | b.into() | provenance | MaD:7 |
+| main.rs:575:10:575:10 | b | main.rs:575:10:575:17 | b.into() | provenance | MaD:8 |
 | main.rs:576:20:576:20 | b | main.rs:576:10:576:21 | ...::from(...) | provenance | MaD:9 |
 nodes
 | main.rs:19:10:19:18 | source(...) | semmle.label | source(...) |
@@ -609,14 +657,57 @@ nodes
 | main.rs:517:15:517:24 | source(...) | semmle.label | source(...) |
 | main.rs:519:10:519:11 | vs [element] | semmle.label | vs [element] |
 | main.rs:519:10:519:14 | vs[0] | semmle.label | vs[0] |
+| main.rs:520:10:520:35 | * ... | semmle.label | * ... |
+| main.rs:520:11:520:12 | vs [element] | semmle.label | vs [element] |
+| main.rs:520:11:520:19 | vs.iter() [element, &ref] | semmle.label | vs.iter() [element, &ref] |
+| main.rs:520:11:520:26 | ... .next() [Some, &ref] | semmle.label | ... .next() [Some, &ref] |
+| main.rs:520:11:520:35 | ... .unwrap() [&ref] | semmle.label | ... .unwrap() [&ref] |
+| main.rs:521:10:521:35 | * ... | semmle.label | * ... |
+| main.rs:521:11:521:12 | vs [element] | semmle.label | vs [element] |
+| main.rs:521:11:521:19 | vs.iter() [element, &ref] | semmle.label | vs.iter() [element, &ref] |
+| main.rs:521:11:521:26 | ... .nth(...) [Some, &ref] | semmle.label | ... .nth(...) [Some, &ref] |
+| main.rs:521:11:521:35 | ... .unwrap() [&ref] | semmle.label | ... .unwrap() [&ref] |
 | main.rs:523:9:523:9 | v | semmle.label | v |
 | main.rs:523:14:523:15 | vs [element] | semmle.label | vs [element] |
 | main.rs:524:14:524:14 | v | semmle.label | v |
+| main.rs:526:9:526:10 | &... [&ref] | semmle.label | &... [&ref] |
+| main.rs:526:10:526:10 | v | semmle.label | v |
+| main.rs:526:15:526:16 | vs [element] | semmle.label | vs [element] |
+| main.rs:526:15:526:23 | vs.iter() [element, &ref] | semmle.label | vs.iter() [element, &ref] |
+| main.rs:527:14:527:14 | v | semmle.label | v |
+| main.rs:530:9:530:11 | vs2 [element, &ref] | semmle.label | vs2 [element, &ref] |
+| main.rs:530:26:530:27 | vs [element] | semmle.label | vs [element] |
+| main.rs:530:26:530:34 | vs.iter() [element, &ref] | semmle.label | vs.iter() [element, &ref] |
+| main.rs:530:26:530:44 | ... .collect() [element, &ref] | semmle.label | ... .collect() [element, &ref] |
+| main.rs:531:9:531:10 | &... [&ref] | semmle.label | &... [&ref] |
+| main.rs:531:10:531:10 | v | semmle.label | v |
+| main.rs:531:15:531:17 | vs2 [element, &ref] | semmle.label | vs2 [element, &ref] |
+| main.rs:532:14:532:14 | v | semmle.label | v |
+| main.rs:535:5:535:6 | vs [element] | semmle.label | vs [element] |
+| main.rs:535:5:535:13 | vs.iter() [element, &ref] | semmle.label | vs.iter() [element, &ref] |
+| main.rs:535:20:535:20 | ... [&ref] | semmle.label | ... [&ref] |
+| main.rs:535:28:535:29 | * ... | semmle.label | * ... |
+| main.rs:535:29:535:29 | x [&ref] | semmle.label | x [&ref] |
 | main.rs:542:9:542:18 | mut vs_mut [element] | semmle.label | mut vs_mut [element] |
 | main.rs:542:22:542:42 | [...] [element] | semmle.label | [...] [element] |
 | main.rs:542:23:542:32 | source(...) | semmle.label | source(...) |
 | main.rs:544:10:544:15 | vs_mut [element] | semmle.label | vs_mut [element] |
 | main.rs:544:10:544:18 | vs_mut[0] | semmle.label | vs_mut[0] |
+| main.rs:545:10:545:39 | * ... | semmle.label | * ... |
+| main.rs:545:11:545:16 | vs_mut [element] | semmle.label | vs_mut [element] |
+| main.rs:545:11:545:23 | vs_mut.iter() [element, &ref] | semmle.label | vs_mut.iter() [element, &ref] |
+| main.rs:545:11:545:30 | ... .next() [Some, &ref] | semmle.label | ... .next() [Some, &ref] |
+| main.rs:545:11:545:39 | ... .unwrap() [&ref] | semmle.label | ... .unwrap() [&ref] |
+| main.rs:546:10:546:39 | * ... | semmle.label | * ... |
+| main.rs:546:11:546:16 | vs_mut [element] | semmle.label | vs_mut [element] |
+| main.rs:546:11:546:23 | vs_mut.iter() [element, &ref] | semmle.label | vs_mut.iter() [element, &ref] |
+| main.rs:546:11:546:30 | ... .nth(...) [Some, &ref] | semmle.label | ... .nth(...) [Some, &ref] |
+| main.rs:546:11:546:39 | ... .unwrap() [&ref] | semmle.label | ... .unwrap() [&ref] |
+| main.rs:548:9:548:14 | &mut ... [&ref] | semmle.label | &mut ... [&ref] |
+| main.rs:548:14:548:14 | v | semmle.label | v |
+| main.rs:548:19:548:24 | vs_mut [element] | semmle.label | vs_mut [element] |
+| main.rs:548:19:548:35 | vs_mut.iter_mut() [element, &ref] | semmle.label | vs_mut.iter_mut() [element, &ref] |
+| main.rs:549:14:549:14 | v | semmle.label | v |
 | main.rs:554:9:554:9 | a | semmle.label | a |
 | main.rs:554:13:554:22 | source(...) | semmle.label | source(...) |
 | main.rs:555:9:555:9 | b | semmle.label | b |
@@ -711,8 +802,16 @@ testFailures
 | main.rs:512:10:512:10 | c | main.rs:505:13:505:22 | source(...) | main.rs:512:10:512:10 | c | $@ | main.rs:505:13:505:22 | source(...) | source(...) |
 | main.rs:513:10:513:10 | d | main.rs:505:13:505:22 | source(...) | main.rs:513:10:513:10 | d | $@ | main.rs:505:13:505:22 | source(...) | source(...) |
 | main.rs:519:10:519:14 | vs[0] | main.rs:517:15:517:24 | source(...) | main.rs:519:10:519:14 | vs[0] | $@ | main.rs:517:15:517:24 | source(...) | source(...) |
+| main.rs:520:10:520:35 | * ... | main.rs:517:15:517:24 | source(...) | main.rs:520:10:520:35 | * ... | $@ | main.rs:517:15:517:24 | source(...) | source(...) |
+| main.rs:521:10:521:35 | * ... | main.rs:517:15:517:24 | source(...) | main.rs:521:10:521:35 | * ... | $@ | main.rs:517:15:517:24 | source(...) | source(...) |
 | main.rs:524:14:524:14 | v | main.rs:517:15:517:24 | source(...) | main.rs:524:14:524:14 | v | $@ | main.rs:517:15:517:24 | source(...) | source(...) |
+| main.rs:527:14:527:14 | v | main.rs:517:15:517:24 | source(...) | main.rs:527:14:527:14 | v | $@ | main.rs:517:15:517:24 | source(...) | source(...) |
+| main.rs:532:14:532:14 | v | main.rs:517:15:517:24 | source(...) | main.rs:532:14:532:14 | v | $@ | main.rs:517:15:517:24 | source(...) | source(...) |
+| main.rs:535:28:535:29 | * ... | main.rs:517:15:517:24 | source(...) | main.rs:535:28:535:29 | * ... | $@ | main.rs:517:15:517:24 | source(...) | source(...) |
 | main.rs:544:10:544:18 | vs_mut[0] | main.rs:542:23:542:32 | source(...) | main.rs:544:10:544:18 | vs_mut[0] | $@ | main.rs:542:23:542:32 | source(...) | source(...) |
+| main.rs:545:10:545:39 | * ... | main.rs:542:23:542:32 | source(...) | main.rs:545:10:545:39 | * ... | $@ | main.rs:542:23:542:32 | source(...) | source(...) |
+| main.rs:546:10:546:39 | * ... | main.rs:542:23:542:32 | source(...) | main.rs:546:10:546:39 | * ... | $@ | main.rs:542:23:542:32 | source(...) | source(...) |
+| main.rs:549:14:549:14 | v | main.rs:542:23:542:32 | source(...) | main.rs:549:14:549:14 | v | $@ | main.rs:542:23:542:32 | source(...) | source(...) |
 | main.rs:559:10:559:10 | a | main.rs:554:13:554:22 | source(...) | main.rs:559:10:559:10 | a | $@ | main.rs:554:13:554:22 | source(...) | source(...) |
 | main.rs:560:14:560:15 | &b | main.rs:555:13:555:22 | source(...) | main.rs:560:14:560:15 | &b | $@ | main.rs:555:13:555:22 | source(...) | source(...) |
 | main.rs:561:14:561:18 | c_ref | main.rs:556:13:556:22 | source(...) | main.rs:561:14:561:18 | c_ref | $@ | main.rs:556:13:556:22 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/local/main.rs b/rust/ql/test/library-tests/dataflow/local/main.rs
index 41f34da6122d..0a4dbaceee9b 100644
--- a/rust/ql/test/library-tests/dataflow/local/main.rs
+++ b/rust/ql/test/library-tests/dataflow/local/main.rs
@@ -517,22 +517,22 @@ fn iterators() {
     let vs = [source(91), 2, 3, 4];
 
     sink(vs[0]); // $ hasValueFlow=91
-    sink(*vs.iter().next().unwrap()); // $ MISSING: hasValueFlow=91
-    sink(*vs.iter().nth(0).unwrap()); // $ MISSING: hasValueFlow=91
+    sink(*vs.iter().next().unwrap()); // $ hasValueFlow=91
+    sink(*vs.iter().nth(0).unwrap()); // $ hasValueFlow=91
 
     for v in vs {
         sink(v); // $ hasValueFlow=91
     }
     for &v in vs.iter() {
-        sink(v); // $ MISSING: hasValueFlow=91
+        sink(v); // $ hasValueFlow=91
     }
 
     let vs2: Vec<&i64> = vs.iter().collect();
     for &v in vs2 {
-        sink(v); // $ MISSING: hasValueFlow=91
+        sink(v); // $ hasValueFlow=91
     }
 
-    vs.iter().map(|x| sink(*x)); // $ MISSING: hasValueFlow=91
+    vs.iter().map(|x| sink(*x)); // $ hasValueFlow=91
     vs.iter().for_each(|x| sink(*x)); // $ MISSING: hasValueFlow=91
 
     for v in vs.into_iter() {
@@ -542,11 +542,11 @@ fn iterators() {
     let mut vs_mut = [source(92), 2, 3, 4];
 
     sink(vs_mut[0]); // $ hasValueFlow=92
-    sink(*vs_mut.iter().next().unwrap()); // $ MISSING: hasValueFlow=92
-    sink(*vs_mut.iter().nth(0).unwrap()); // $ MISSING: hasValueFlow=92
+    sink(*vs_mut.iter().next().unwrap()); // $ hasValueFlow=92
+    sink(*vs_mut.iter().nth(0).unwrap()); // $ hasValueFlow=92
 
     for &mut v in vs_mut.iter_mut() {
-        sink(v); // $ MISSING: hasValueFlow=92
+        sink(v); // $ hasValueFlow=92
     }
 }
 
diff --git a/rust/ql/test/library-tests/dataflow/local/options.yml b/rust/ql/test/library-tests/dataflow/local/options.yml
index a394083e5212..c2541fc242c2 100644
--- a/rust/ql/test/library-tests/dataflow/local/options.yml
+++ b/rust/ql/test/library-tests/dataflow/local/options.yml
@@ -1 +1,2 @@
 qltest_use_nightly: true
+qltest_edition: "2024"
diff --git a/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected b/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
index cba4f0a3028e..4bc7d7d98e21 100644
--- a/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
@@ -1,15 +1,15 @@
 models
 | 1 | Summary: <& as core::ops::deref::Deref>::deref; Argument[self].Reference; ReturnValue; value |
-| 2 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
-| 3 | Summary: <_ as core::cmp::Ord>::clamp; Argument[self,0,1]; ReturnValue; value |
-| 4 | Summary: <_ as core::cmp::Ord>::max; Argument[self,0]; ReturnValue; value |
-| 5 | Summary: <_ as core::cmp::Ord>::min; Argument[self,0]; ReturnValue; value |
-| 6 | Summary: <_ as core::ops::arith::Add>::add; Argument[self,0]; ReturnValue; taint |
-| 7 | Summary: <alloc::boxed::Box>::into_pin; Argument[0]; ReturnValue.Field[core::pin::Pin::pointer]; value |
-| 8 | Summary: <alloc::boxed::Box>::new; Argument[0]; ReturnValue.Field[alloc::boxed::Box(0)]; value |
-| 9 | Summary: <alloc::boxed::Box>::pin; Argument[0]; ReturnValue.Field[core::pin::Pin::pointer].Field[alloc::boxed::Box(0)]; value |
-| 10 | Summary: <core::i64 as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
-| 11 | Summary: <core::i64 as core::clone::Clone>::clone; Argument[self]; ReturnValue; value |
+| 2 | Summary: <alloc::boxed::Box>::into_pin; Argument[0]; ReturnValue.Field[core::pin::Pin::pointer]; value |
+| 3 | Summary: <alloc::boxed::Box>::new; Argument[0]; ReturnValue.Field[alloc::boxed::Box(0)]; value |
+| 4 | Summary: <alloc::boxed::Box>::pin; Argument[0]; ReturnValue.Field[core::pin::Pin::pointer].Field[alloc::boxed::Box(0)]; value |
+| 5 | Summary: <core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 6 | Summary: <core::cmp::Ord>::clamp; Argument[self,0,1]; ReturnValue; value |
+| 7 | Summary: <core::cmp::Ord>::max; Argument[self,0]; ReturnValue; value |
+| 8 | Summary: <core::cmp::Ord>::min; Argument[self,0]; ReturnValue; value |
+| 9 | Summary: <core::i64 as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 10 | Summary: <core::i64 as core::clone::Clone>::clone; Argument[self]; ReturnValue; value |
+| 11 | Summary: <core::ops::arith::Add>::add; Argument[self,0]; ReturnValue; taint |
 | 12 | Summary: <core::option::Option>::map_or; Argument[1].ReturnValue; ReturnValue; value |
 | 13 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
 | 14 | Summary: <core::option::Option>::zip; Argument[0].Field[core::option::Option::Some(0)]; ReturnValue.Field[core::option::Option::Some(0)].Field[1]; value |
@@ -21,8 +21,9 @@ models
 | 20 | Summary: <core::pin::Pin>::new; Argument[0]; ReturnValue.Field[core::pin::Pin::pointer]; value |
 | 21 | Summary: <core::pin::Pin>::new_unchecked; Argument[0]; ReturnValue.Field[core::pin::Pin::pointer]; value |
 | 22 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 23 | Summary: core::ptr::read; Argument[0].Reference; ReturnValue; value |
-| 24 | Summary: core::ptr::write; Argument[1]; Argument[0].Reference; value |
+| 23 | Summary: core::pin::pin_new_unchecked_in_helper; Argument[0].Reference.Field[core::pin::PinMacroHelper::value]; ReturnValue.Field[core::pin::Pin::pointer].Reference; value |
+| 24 | Summary: core::ptr::read; Argument[0].Reference; ReturnValue; value |
+| 25 | Summary: core::ptr::write; Argument[1]; Argument[0].Reference; value |
 edges
 | main.rs:12:9:12:9 | a [Some] | main.rs:13:10:13:10 | a [Some] | provenance |  |
 | main.rs:12:9:12:9 | a [Some] | main.rs:14:13:14:13 | a [Some] | provenance |  |
@@ -30,7 +31,7 @@ edges
 | main.rs:12:18:12:27 | source(...) | main.rs:12:13:12:28 | Some(...) [Some] | provenance |  |
 | main.rs:13:10:13:10 | a [Some] | main.rs:13:10:13:19 | a.unwrap() | provenance | MaD:13 |
 | main.rs:14:9:14:9 | b [Some] | main.rs:15:10:15:10 | b [Some] | provenance |  |
-| main.rs:14:13:14:13 | a [Some] | main.rs:14:13:14:21 | a.clone() [Some] | provenance | MaD:2 |
+| main.rs:14:13:14:13 | a [Some] | main.rs:14:13:14:21 | a.clone() [Some] | provenance | MaD:5 |
 | main.rs:14:13:14:21 | a.clone() [Some] | main.rs:14:9:14:9 | b [Some] | provenance |  |
 | main.rs:15:10:15:10 | b [Some] | main.rs:15:10:15:19 | b.unwrap() | provenance | MaD:13 |
 | main.rs:19:9:19:9 | a [Ok] | main.rs:20:10:20:10 | a [Ok] | provenance |  |
@@ -39,7 +40,7 @@ edges
 | main.rs:19:34:19:43 | source(...) | main.rs:19:31:19:44 | Ok(...) [Ok] | provenance |  |
 | main.rs:20:10:20:10 | a [Ok] | main.rs:20:10:20:19 | a.unwrap() | provenance | MaD:22 |
 | main.rs:21:9:21:9 | b [Ok] | main.rs:22:10:22:10 | b [Ok] | provenance |  |
-| main.rs:21:13:21:13 | a [Ok] | main.rs:21:13:21:21 | a.clone() [Ok] | provenance | MaD:2 |
+| main.rs:21:13:21:13 | a [Ok] | main.rs:21:13:21:21 | a.clone() [Ok] | provenance | MaD:5 |
 | main.rs:21:13:21:21 | a.clone() [Ok] | main.rs:21:9:21:9 | b [Ok] | provenance |  |
 | main.rs:22:10:22:10 | b [Ok] | main.rs:22:10:22:19 | b.unwrap() | provenance | MaD:22 |
 | main.rs:26:9:26:9 | a | main.rs:27:10:27:10 | a | provenance |  |
@@ -47,8 +48,8 @@ edges
 | main.rs:26:13:26:22 | source(...) | main.rs:26:9:26:9 | a | provenance |  |
 | main.rs:28:9:28:9 | b | main.rs:29:10:29:10 | b | provenance |  |
 | main.rs:28:9:28:9 | b [&ref] | main.rs:29:10:29:10 | b | provenance |  |
-| main.rs:28:13:28:13 | a | main.rs:28:13:28:21 | a.clone() | provenance | MaD:10 |
-| main.rs:28:13:28:13 | a | main.rs:28:13:28:21 | a.clone() [&ref] | provenance | MaD:11 |
+| main.rs:28:13:28:13 | a | main.rs:28:13:28:21 | a.clone() | provenance | MaD:9 |
+| main.rs:28:13:28:13 | a | main.rs:28:13:28:21 | a.clone() [&ref] | provenance | MaD:10 |
 | main.rs:28:13:28:21 | a.clone() | main.rs:28:9:28:9 | b | provenance |  |
 | main.rs:28:13:28:21 | a.clone() [&ref] | main.rs:28:9:28:9 | b [&ref] | provenance |  |
 | main.rs:43:18:43:22 | SelfParam [&ref, Wrapper] | main.rs:44:26:44:31 | self.n | provenance |  |
@@ -81,14 +82,14 @@ edges
 | main.rs:79:13:79:13 | b | main.rs:80:14:80:14 | b | provenance |  |
 | main.rs:79:17:79:47 | a.map_or(...) | main.rs:79:13:79:13 | b | provenance |  |
 | main.rs:79:33:79:46 | ... + ... | main.rs:79:17:79:47 | a.map_or(...) | provenance | MaD:12 |
-| main.rs:79:37:79:46 | source(...) | main.rs:79:33:79:46 | ... + ... | provenance | MaD:6 |
+| main.rs:79:37:79:46 | source(...) | main.rs:79:33:79:46 | ... + ... | provenance | MaD:11 |
 | main.rs:92:29:92:29 | [post] y [&ref] | main.rs:93:33:93:33 | y [&ref] | provenance |  |
-| main.rs:92:32:92:41 | source(...) | main.rs:92:29:92:29 | [post] y [&ref] | provenance | MaD:24 |
-| main.rs:93:33:93:33 | y [&ref] | main.rs:93:18:93:34 | ...::read(...) | provenance | MaD:23 |
+| main.rs:92:32:92:41 | source(...) | main.rs:92:29:92:29 | [post] y [&ref] | provenance | MaD:25 |
+| main.rs:93:33:93:33 | y [&ref] | main.rs:93:18:93:34 | ...::read(...) | provenance | MaD:24 |
 | main.rs:108:13:108:17 | mut i | main.rs:109:34:109:34 | i | provenance |  |
 | main.rs:108:13:108:17 | mut i | main.rs:110:33:110:33 | i | provenance |  |
 | main.rs:108:13:108:17 | mut i | main.rs:111:47:111:47 | i | provenance |  |
-| main.rs:108:13:108:17 | mut i | main.rs:112:24:112:27 | mut pinned | provenance |  |
+| main.rs:108:13:108:17 | mut i | main.rs:112:29:112:29 | i | provenance |  |
 | main.rs:108:13:108:17 | mut i | main.rs:113:14:113:14 | i | provenance |  |
 | main.rs:108:21:108:30 | source(...) | main.rs:108:13:108:17 | mut i | provenance |  |
 | main.rs:109:13:109:20 | mut pin1 | main.rs:114:15:114:18 | pin1 | provenance |  |
@@ -102,16 +103,18 @@ edges
 | main.rs:109:34:109:34 | i | main.rs:109:33:109:34 | &i [&ref] | provenance |  |
 | main.rs:110:13:110:20 | mut pin2 [Pin, Box(0)] | main.rs:116:15:116:18 | pin2 [Pin, Box(0)] | provenance |  |
 | main.rs:110:24:110:34 | ...::pin(...) [Pin, Box(0)] | main.rs:110:13:110:20 | mut pin2 [Pin, Box(0)] | provenance |  |
-| main.rs:110:33:110:33 | i | main.rs:110:24:110:34 | ...::pin(...) [Pin, Box(0)] | provenance | MaD:9 |
+| main.rs:110:33:110:33 | i | main.rs:110:24:110:34 | ...::pin(...) [Pin, Box(0)] | provenance | MaD:4 |
 | main.rs:111:13:111:20 | mut pin3 [Pin, Box(0)] | main.rs:117:15:117:18 | pin3 [Pin, Box(0)] | provenance |  |
 | main.rs:111:24:111:49 | ...::into_pin(...) [Pin, Box(0)] | main.rs:111:13:111:20 | mut pin3 [Pin, Box(0)] | provenance |  |
-| main.rs:111:38:111:48 | ...::new(...) [Box(0)] | main.rs:111:24:111:49 | ...::into_pin(...) [Pin, Box(0)] | provenance | MaD:7 |
-| main.rs:111:47:111:47 | i | main.rs:111:38:111:48 | ...::new(...) [Box(0)] | provenance | MaD:8 |
+| main.rs:111:38:111:48 | ...::new(...) [Box(0)] | main.rs:111:24:111:49 | ...::into_pin(...) [Pin, Box(0)] | provenance | MaD:2 |
+| main.rs:111:47:111:47 | i | main.rs:111:38:111:48 | ...::new(...) [Box(0)] | provenance | MaD:3 |
 | main.rs:112:13:112:20 | mut pin4 [Pin, &ref] | main.rs:118:15:118:18 | pin4 [Pin, &ref] | provenance |  |
-| main.rs:112:24:112:27 | &mut pinned [&ref] | main.rs:112:24:112:27 | ...::new_unchecked(...) [Pin, &ref] | provenance | MaD:21 |
-| main.rs:112:24:112:27 | ...::new_unchecked(...) [Pin, &ref] | main.rs:112:13:112:20 | mut pin4 [Pin, &ref] | provenance |  |
-| main.rs:112:24:112:27 | mut pinned | main.rs:112:24:112:27 | pinned | provenance |  |
-| main.rs:112:24:112:27 | pinned | main.rs:112:24:112:27 | &mut pinned [&ref] | provenance |  |
+| main.rs:112:24:112:27 | &mut pinned [&ref, PinMacroHelper] | main.rs:112:24:112:27 | ...::pin_new_unchecked_in_helper(...) [Pin, &ref] | provenance | MaD:23 |
+| main.rs:112:24:112:27 | ...::pin_new_unchecked_in_helper(...) [Pin, &ref] | main.rs:112:13:112:20 | mut pin4 [Pin, &ref] | provenance |  |
+| main.rs:112:24:112:27 | mut pinned [PinMacroHelper] | main.rs:112:24:112:27 | pinned [PinMacroHelper] | provenance |  |
+| main.rs:112:24:112:27 | pinned [PinMacroHelper] | main.rs:112:24:112:27 | &mut pinned [&ref, PinMacroHelper] | provenance |  |
+| main.rs:112:29:112:29 | ...::PinMacroHelper {...} [PinMacroHelper] | main.rs:112:24:112:27 | mut pinned [PinMacroHelper] | provenance |  |
+| main.rs:112:29:112:29 | i | main.rs:112:29:112:29 | ...::PinMacroHelper {...} [PinMacroHelper] | provenance |  |
 | main.rs:114:15:114:18 | pin1 | main.rs:114:14:114:18 | * ... | provenance | MaD:15 |
 | main.rs:114:15:114:18 | pin1 | main.rs:114:14:114:18 | * ... | provenance | MaD:16 |
 | main.rs:114:15:114:18 | pin1 [Pin, &ref] | main.rs:114:14:114:18 | * ... | provenance | MaD:16 |
@@ -147,17 +150,17 @@ edges
 | main.rs:154:9:154:9 | b | main.rs:155:19:155:19 | b | provenance |  |
 | main.rs:154:13:154:22 | source(...) | main.rs:154:9:154:9 | b | provenance |  |
 | main.rs:155:9:155:9 | c | main.rs:156:10:156:10 | c | provenance |  |
-| main.rs:155:13:155:13 | a | main.rs:155:13:155:20 | a.min(...) | provenance | MaD:5 |
+| main.rs:155:13:155:13 | a | main.rs:155:13:155:20 | a.min(...) | provenance | MaD:8 |
 | main.rs:155:13:155:20 | a.min(...) | main.rs:155:9:155:9 | c | provenance |  |
-| main.rs:155:19:155:19 | b | main.rs:155:13:155:20 | a.min(...) | provenance | MaD:5 |
+| main.rs:155:19:155:19 | b | main.rs:155:13:155:20 | a.min(...) | provenance | MaD:8 |
 | main.rs:158:9:158:9 | d | main.rs:160:13:160:13 | d | provenance |  |
 | main.rs:158:13:158:22 | source(...) | main.rs:158:9:158:9 | d | provenance |  |
 | main.rs:159:9:159:9 | e | main.rs:160:19:160:19 | e | provenance |  |
 | main.rs:159:13:159:22 | source(...) | main.rs:159:9:159:9 | e | provenance |  |
 | main.rs:160:9:160:9 | f | main.rs:161:10:161:10 | f | provenance |  |
-| main.rs:160:13:160:13 | d | main.rs:160:13:160:20 | d.max(...) | provenance | MaD:4 |
+| main.rs:160:13:160:13 | d | main.rs:160:13:160:20 | d.max(...) | provenance | MaD:7 |
 | main.rs:160:13:160:20 | d.max(...) | main.rs:160:9:160:9 | f | provenance |  |
-| main.rs:160:19:160:19 | e | main.rs:160:13:160:20 | d.max(...) | provenance | MaD:4 |
+| main.rs:160:19:160:19 | e | main.rs:160:13:160:20 | d.max(...) | provenance | MaD:7 |
 | main.rs:163:9:163:9 | g | main.rs:166:13:166:13 | g | provenance |  |
 | main.rs:163:13:163:22 | source(...) | main.rs:163:9:163:9 | g | provenance |  |
 | main.rs:164:9:164:9 | h | main.rs:166:21:166:21 | h | provenance |  |
@@ -165,10 +168,10 @@ edges
 | main.rs:165:9:165:9 | i | main.rs:166:24:166:24 | i | provenance |  |
 | main.rs:165:13:165:22 | source(...) | main.rs:165:9:165:9 | i | provenance |  |
 | main.rs:166:9:166:9 | j | main.rs:167:10:167:10 | j | provenance |  |
-| main.rs:166:13:166:13 | g | main.rs:166:13:166:25 | g.clamp(...) | provenance | MaD:3 |
+| main.rs:166:13:166:13 | g | main.rs:166:13:166:25 | g.clamp(...) | provenance | MaD:6 |
 | main.rs:166:13:166:25 | g.clamp(...) | main.rs:166:9:166:9 | j | provenance |  |
-| main.rs:166:21:166:21 | h | main.rs:166:13:166:25 | g.clamp(...) | provenance | MaD:3 |
-| main.rs:166:24:166:24 | i | main.rs:166:13:166:25 | g.clamp(...) | provenance | MaD:3 |
+| main.rs:166:21:166:21 | h | main.rs:166:13:166:25 | g.clamp(...) | provenance | MaD:6 |
+| main.rs:166:24:166:24 | i | main.rs:166:13:166:25 | g.clamp(...) | provenance | MaD:6 |
 nodes
 | main.rs:12:9:12:9 | a [Some] | semmle.label | a [Some] |
 | main.rs:12:13:12:28 | Some(...) [Some] | semmle.label | Some(...) [Some] |
@@ -253,10 +256,12 @@ nodes
 | main.rs:111:38:111:48 | ...::new(...) [Box(0)] | semmle.label | ...::new(...) [Box(0)] |
 | main.rs:111:47:111:47 | i | semmle.label | i |
 | main.rs:112:13:112:20 | mut pin4 [Pin, &ref] | semmle.label | mut pin4 [Pin, &ref] |
-| main.rs:112:24:112:27 | &mut pinned [&ref] | semmle.label | &mut pinned [&ref] |
-| main.rs:112:24:112:27 | ...::new_unchecked(...) [Pin, &ref] | semmle.label | ...::new_unchecked(...) [Pin, &ref] |
-| main.rs:112:24:112:27 | mut pinned | semmle.label | mut pinned |
-| main.rs:112:24:112:27 | pinned | semmle.label | pinned |
+| main.rs:112:24:112:27 | &mut pinned [&ref, PinMacroHelper] | semmle.label | &mut pinned [&ref, PinMacroHelper] |
+| main.rs:112:24:112:27 | ...::pin_new_unchecked_in_helper(...) [Pin, &ref] | semmle.label | ...::pin_new_unchecked_in_helper(...) [Pin, &ref] |
+| main.rs:112:24:112:27 | mut pinned [PinMacroHelper] | semmle.label | mut pinned [PinMacroHelper] |
+| main.rs:112:24:112:27 | pinned [PinMacroHelper] | semmle.label | pinned [PinMacroHelper] |
+| main.rs:112:29:112:29 | ...::PinMacroHelper {...} [PinMacroHelper] | semmle.label | ...::PinMacroHelper {...} [PinMacroHelper] |
+| main.rs:112:29:112:29 | i | semmle.label | i |
 | main.rs:113:14:113:14 | i | semmle.label | i |
 | main.rs:114:14:114:18 | * ... | semmle.label | * ... |
 | main.rs:114:15:114:18 | pin1 | semmle.label | pin1 |
diff --git a/rust/ql/test/library-tests/dataflow/models/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/models/CONSISTENCY/PathResolutionConsistency.expected
new file mode 100644
index 000000000000..432af9baefcd
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/models/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,2 @@
+multipleResolvedTargets
+| main.rs:220:20:220:25 | ... != ... |
diff --git a/rust/ql/test/library-tests/dataflow/models/external_file.rs b/rust/ql/test/library-tests/dataflow/models/external_file.rs
index 0e351a475d38..6a45ab80c0f8 100644
--- a/rust/ql/test/library-tests/dataflow/models/external_file.rs
+++ b/rust/ql/test/library-tests/dataflow/models/external_file.rs
@@ -1,4 +1,3 @@
-
 pub fn generated_source(i: i64) -> i64 {
     0
 }
@@ -28,3 +27,34 @@ pub fn neutral_generated_summary(i: i64) -> i64 {
 pub fn neutral_manual_summary(i: i64) -> i64 {
     0
 }
+
+pub trait MyTrait2 {
+    fn flow_through2(i: i64) -> i64;
+}
+
+impl<T> MyTrait2 for T {
+    // inherits model from the trait function
+    fn flow_through2(i: i64) -> i64 {
+        0
+    }
+}
+
+pub trait MySourceTrait2 {
+    fn produce2(i: i64) -> i64;
+}
+
+impl<T> MySourceTrait2 for T {
+    // inherits model from the trait function
+    fn produce2(i: i64) -> i64 {
+        0
+    }
+}
+
+pub trait MySinkTrait2 {
+    fn consume2(i: i64);
+}
+
+impl<T> MySinkTrait2 for T {
+    // inherits model from the trait function
+    fn consume2(i: i64) {}
+}
diff --git a/rust/ql/test/library-tests/dataflow/models/main.rs b/rust/ql/test/library-tests/dataflow/models/main.rs
index 61e5928636d7..bb773c85e980 100644
--- a/rust/ql/test/library-tests/dataflow/models/main.rs
+++ b/rust/ql/test/library-tests/dataflow/models/main.rs
@@ -75,6 +75,7 @@ fn test_set_var_pos() {
 enum MyFieldEnum {
     C { field_c: i64 },
     D { field_d: i64 },
+    E { field_e: Option<i64> },
 }
 
 // has a flow model
@@ -101,6 +102,7 @@ fn test_set_var_field() {
     match e1 {
         MyFieldEnum::C { field_c: i } => sink(i),
         MyFieldEnum::D { field_d: i } => sink(i), // $ hasValueFlow=5
+        MyFieldEnum::E { field_e: o } => (),
     }
 }
 
@@ -246,11 +248,29 @@ fn enum_source(i: i64) -> MyFieldEnum {
     MyFieldEnum::C { field_c: 0 }
 }
 
+// has a source model
+fn enum_source_nested(i: i64) -> MyFieldEnum {
+    MyFieldEnum::C { field_c: 0 }
+}
+
 fn test_enum_source() {
     let s = enum_source(12);
     match s {
         MyFieldEnum::C { field_c: i } => sink(i),
         MyFieldEnum::D { field_d: i } => sink(i), // $ hasValueFlow=12
+        MyFieldEnum::E { field_e: o } => (),
+    }
+
+    let s = enum_source_nested(13);
+    match s {
+        MyFieldEnum::C { field_c: i } => sink(i),
+        MyFieldEnum::D { field_d: i } => sink(i),
+        MyFieldEnum::E { field_e: o } => {
+            match o {
+                Some(i) => sink(i), // $ hasValueFlow=13
+                None => (),
+            }
+        }
     }
 }
 
@@ -260,17 +280,24 @@ fn test_enum_method_source() {
     match s {
         MyFieldEnum::C { field_c: i } => sink(i), // $ hasValueFlow=13
         MyFieldEnum::D { field_d: i } => sink(i),
+        MyFieldEnum::E { field_e: o } => (),
     }
 }
 
 mod source_into_function {
     use super::sink;
+    use crate::MyFieldEnum;
 
     // has a source model
     fn pass_source<A>(_i: i64, f: impl FnOnce(i64) -> A) -> A {
         f(42)
     }
 
+    // has a source model
+    fn pass_source_nested(_i: i64, f: impl FnOnce(MyFieldEnum) -> ()) {
+        f(MyFieldEnum::C { field_c: 0 })
+    }
+
     fn test_source_into_function() {
         let a = |a| sink(a); // $ hasValueFlow=1
         pass_source(1, a);
@@ -287,16 +314,58 @@ mod source_into_function {
         pass_source(4, async move |a| {
             sink(a); // $ hasValueFlow=4
         });
+
+        pass_source_nested(5, |e| {
+            match e {
+                MyFieldEnum::C { field_c: i } => sink(i),
+                MyFieldEnum::D { field_d: i } => sink(i),
+                MyFieldEnum::E { field_e: o } => {
+                    match o {
+                        Some(i) => sink(i), // $ hasValueFlow=5
+                        None => (),
+                    }
+                }
+            }
+        });
+    }
+}
+
+mod sink_out_of_function {
+    use super::source;
+    use crate::MyFieldEnum;
+
+    // has a sink model
+    fn pass_sink(f: impl FnOnce(()) -> i64) {}
+
+    // has a sink model
+    fn pass_sink_nested(f: impl FnOnce(()) -> MyFieldEnum) {}
+
+    fn test_sink_out_of_function() {
+        let a = |a| source(1);
+        pass_sink(a); // $ hasValueFlow=1
+
+        let b = |_a| {
+            let s = source(2);
+            MyFieldEnum::E {
+                field_e: Option::Some(s),
+            }
+        };
+        pass_sink_nested(b); // $ hasValueFlow=2
     }
 }
 
 // has a sink model
 fn enum_sink(e: MyFieldEnum) {}
 
+// has a sink model
+fn enum_sink_nested(e: MyFieldEnum) {}
+
 fn test_enum_sink() {
     let s = source(14);
     enum_sink(MyFieldEnum::C { field_c: s }); // $ hasValueFlow=14
     enum_sink(MyFieldEnum::D { field_d: s });
+    enum_sink_nested(MyFieldEnum::E { field_e: None });
+    enum_sink_nested(MyFieldEnum::E { field_e: Some(s) }); // $ hasValueFlow=14
 }
 
 fn test_enum_method_sink() {
@@ -332,6 +401,17 @@ fn test_arg_source() {
     sink(i) // $ hasValueFlow=i
 }
 
+trait MyTrait {
+    // has a source model
+    fn test_param_source(i: i64);
+}
+
+impl MyTrait for () {
+    fn test_param_source(i: i64) {
+        sink(i) // $ hasValueFlow=i
+    }
+}
+
 struct MyStruct2(i64);
 
 impl PartialEq for MyStruct {
@@ -380,6 +460,37 @@ impl Ord for MyStruct2 {
     }
 }
 
+trait MyTrait3 {
+    fn flow_through3(i: i64) -> i64;
+}
+
+impl<T> MyTrait3 for T {
+    // has an explicit model
+    fn flow_through3(i: i64) -> i64 {
+        0
+    }
+}
+
+trait MySourceTrait3 {
+    fn produce3(i: i64) -> i64;
+}
+
+impl<T> MySourceTrait3 for T {
+    // has an explicit model
+    fn produce3(i: i64) -> i64 {
+        0
+    }
+}
+
+trait MySinkTrait3 {
+    fn consume3(i: i64);
+}
+
+impl<T> MySinkTrait3 for T {
+    // has an explicit model
+    fn consume3(i: i64) {}
+}
+
 fn test_trait_model<T: Ord>(x: T) {
     let x1 = source(20).max(0);
     sink(x1); // $ hasValueFlow=20
@@ -408,6 +519,22 @@ fn test_trait_model<T: Ord>(x: T) {
 
     let x7 = (source(28) as i32) < 1;
     sink(x7);
+
+    let x8 = <()>::flow_through2(source(29));
+    sink(x8); // $ hasValueFlow=29
+
+    let x9 = <()>::flow_through3(source(30));
+    sink(x9); // $ hasValueFlow=30
+
+    let x10 = <()>::produce2(31);
+    sink(x10); // $ hasValueFlow=31
+
+    let x11 = <()>::produce3(32);
+    sink(x11); // $ hasValueFlow=32
+
+    <()>::consume2(source(33)); // $ hasValueFlow=33
+
+    <()>::consume3(source(34)); // $ hasValueFlow=34
 }
 
 mod external_file;
@@ -454,3 +581,18 @@ async fn main() {
     test_neutrals();
     let dummy = Some(0); // ensure that the the `lang:core` crate is extracted
 }
+
+mod try_in_sink_callback {
+    use super::source;
+
+    // has a sink model
+    fn pass_sink_option(f: impl FnOnce(()) -> Option<i64>) {}
+
+    fn test_try_in_sink_callback() {
+        let a = |_a| {
+            let _s = Some(source(100))?;
+            Some(0)
+        };
+        pass_sink_option(a);
+    }
+}
diff --git a/rust/ql/test/library-tests/dataflow/models/models.expected b/rust/ql/test/library-tests/dataflow/models/models.expected
index e5ea563eaefe..084bc23457eb 100644
--- a/rust/ql/test/library-tests/dataflow/models/models.expected
+++ b/rust/ql/test/library-tests/dataflow/models/models.expected
@@ -1,36 +1,48 @@
 models
-| 1 | Sink: <main::MyFieldEnum>::sink; Argument[self].Field[main::MyFieldEnum::D::field_d]; test-sink |
-| 2 | Sink: main::enum_sink; Argument[0].Field[main::MyFieldEnum::C::field_c]; test-sink |
-| 3 | Sink: main::external_file::generated_sink; Argument[0]; test-sink |
-| 4 | Sink: main::external_file::neutral_manual_sink; Argument[0]; test-sink |
-| 5 | Sink: main::simple_sink; Argument[0]; test-sink |
-| 6 | Source: <main::MyFieldEnum>::source; ReturnValue.Field[main::MyFieldEnum::C::field_c]; test-source |
-| 7 | Source: main::arg_source; Argument[0]; test-source |
-| 8 | Source: main::enum_source; ReturnValue.Field[main::MyFieldEnum::D::field_d]; test-source |
-| 9 | Source: main::external_file::generated_source; ReturnValue; test-source |
-| 10 | Source: main::external_file::neutral_manual_source; ReturnValue; test-source |
-| 11 | Source: main::simple_source; ReturnValue; test-source |
-| 12 | Source: main::source_into_function::pass_source; Argument[1].Parameter[0]; test-source |
-| 13 | Summary: <_ as core::cmp::Ord>::max; Argument[self,0]; ReturnValue; value |
-| 14 | Summary: <_ as core::cmp::PartialOrd>::lt; Argument[self].Reference; ReturnValue; taint |
-| 15 | Summary: <_ as core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
-| 16 | Summary: main::apply; Argument[0]; Argument[1].Parameter[0]; value |
-| 17 | Summary: main::apply; Argument[1].ReturnValue; ReturnValue; value |
-| 18 | Summary: main::coerce; Argument[0]; ReturnValue; taint |
-| 19 | Summary: main::external_file::generated_summary; Argument[0]; ReturnValue; value |
-| 20 | Summary: main::external_file::neutral_manual_summary; Argument[0]; ReturnValue; value |
-| 21 | Summary: main::get_array_element; Argument[0].Element; ReturnValue; value |
-| 22 | Summary: main::get_async_number; Argument[0]; ReturnValue.Future; value |
-| 23 | Summary: main::get_struct_field; Argument[0].Field[main::MyStruct::field1]; ReturnValue; value |
-| 24 | Summary: main::get_tuple_element; Argument[0].Field[0]; ReturnValue; value |
-| 25 | Summary: main::get_var_field; Argument[0].Field[main::MyFieldEnum::C::field_c]; ReturnValue; value |
-| 26 | Summary: main::get_var_pos; Argument[0].Field[main::MyPosEnum::A(0)]; ReturnValue; value |
-| 27 | Summary: main::set_array_element; Argument[0]; ReturnValue.Element; value |
-| 28 | Summary: main::set_struct_field; Argument[0]; ReturnValue.Field[main::MyStruct::field2]; value |
-| 29 | Summary: main::set_tuple_element; Argument[0]; ReturnValue.Field[1]; value |
-| 30 | Summary: main::set_var_field; Argument[0]; ReturnValue.Field[main::MyFieldEnum::D::field_d]; value |
-| 31 | Summary: main::set_var_pos; Argument[0]; ReturnValue.Field[main::MyPosEnum::B(0)]; value |
-| 32 | Summary: main::snd; Argument[1]; ReturnValue; value |
+| 1 | Sink: <_ as main::MySinkTrait3>::consume3; Argument[0]; test-sink |
+| 2 | Sink: <main::MyFieldEnum>::sink; Argument[self].Field[main::MyFieldEnum::D::field_d]; test-sink |
+| 3 | Sink: <main::external_file::MySinkTrait2>::consume2; Argument[0]; test-sink |
+| 4 | Sink: main::enum_sink; Argument[0].Field[main::MyFieldEnum::C::field_c]; test-sink |
+| 5 | Sink: main::enum_sink_nested; Argument[0].Field[main::MyFieldEnum::E::field_e].Field[core::option::Option::Some(0)]; test-sink |
+| 6 | Sink: main::external_file::generated_sink; Argument[0]; test-sink |
+| 7 | Sink: main::external_file::neutral_manual_sink; Argument[0]; test-sink |
+| 8 | Sink: main::simple_sink; Argument[0]; test-sink |
+| 9 | Sink: main::sink_out_of_function::pass_sink; Argument[0].ReturnValue; test-sink |
+| 10 | Sink: main::sink_out_of_function::pass_sink_nested; Argument[0].ReturnValue.Field[main::MyFieldEnum::E::field_e].Field[core::option::Option::Some(0)]; test-sink |
+| 11 | Source: <_ as main::MySourceTrait3>::produce3; ReturnValue; test-source |
+| 12 | Source: <main::MyFieldEnum>::source; ReturnValue.Field[main::MyFieldEnum::C::field_c]; test-source |
+| 13 | Source: <main::MyTrait>::test_param_source; Parameter[0]; test-source |
+| 14 | Source: <main::external_file::MySourceTrait2>::produce2; ReturnValue; test-source |
+| 15 | Source: main::arg_source; Argument[0]; test-source |
+| 16 | Source: main::enum_source; ReturnValue.Field[main::MyFieldEnum::D::field_d]; test-source |
+| 17 | Source: main::enum_source_nested; ReturnValue.Field[main::MyFieldEnum::E::field_e].Field[core::option::Option::Some(0)]; test-source |
+| 18 | Source: main::external_file::generated_source; ReturnValue; test-source |
+| 19 | Source: main::external_file::neutral_manual_source; ReturnValue; test-source |
+| 20 | Source: main::simple_source; ReturnValue; test-source |
+| 21 | Source: main::source_into_function::pass_source; Argument[1].Parameter[0]; test-source |
+| 22 | Source: main::source_into_function::pass_source_nested; Argument[1].Parameter[0].Field[main::MyFieldEnum::E::field_e].Field[core::option::Option::Some(0)]; test-source |
+| 23 | Summary: <_ as main::MyTrait3>::flow_through3; Argument[0]; ReturnValue; value |
+| 24 | Summary: <core::cmp::Ord>::max; Argument[self,0]; ReturnValue; value |
+| 25 | Summary: <core::cmp::PartialOrd>::lt; Argument[self].Reference; ReturnValue; taint |
+| 26 | Summary: <core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
+| 27 | Summary: <main::external_file::MyTrait2>::flow_through2; Argument[0]; ReturnValue; value |
+| 28 | Summary: main::apply; Argument[0]; Argument[1].Parameter[0]; value |
+| 29 | Summary: main::apply; Argument[1].ReturnValue; ReturnValue; value |
+| 30 | Summary: main::coerce; Argument[0]; ReturnValue; taint |
+| 31 | Summary: main::external_file::generated_summary; Argument[0]; ReturnValue; value |
+| 32 | Summary: main::external_file::neutral_manual_summary; Argument[0]; ReturnValue; value |
+| 33 | Summary: main::get_array_element; Argument[0].Element; ReturnValue; value |
+| 34 | Summary: main::get_async_number; Argument[0]; ReturnValue.Future; value |
+| 35 | Summary: main::get_struct_field; Argument[0].Field[main::MyStruct::field1]; ReturnValue; value |
+| 36 | Summary: main::get_tuple_element; Argument[0].Field[0]; ReturnValue; value |
+| 37 | Summary: main::get_var_field; Argument[0].Field[main::MyFieldEnum::C::field_c]; ReturnValue; value |
+| 38 | Summary: main::get_var_pos; Argument[0].Field[main::MyPosEnum::A(0)]; ReturnValue; value |
+| 39 | Summary: main::set_array_element; Argument[0]; ReturnValue.Element; value |
+| 40 | Summary: main::set_struct_field; Argument[0]; ReturnValue.Field[main::MyStruct::field2]; value |
+| 41 | Summary: main::set_tuple_element; Argument[0]; ReturnValue.Field[1]; value |
+| 42 | Summary: main::set_var_field; Argument[0]; ReturnValue.Field[main::MyFieldEnum::D::field_d]; value |
+| 43 | Summary: main::set_var_pos; Argument[0]; ReturnValue.Field[main::MyPosEnum::B(0)]; value |
+| 44 | Summary: main::snd; Argument[1]; ReturnValue; value |
 edges
 | main.rs:15:9:15:9 | s | main.rs:16:19:16:19 | s | provenance |  |
 | main.rs:15:9:15:9 | s | main.rs:16:19:16:19 | s | provenance |  |
@@ -40,13 +52,13 @@ edges
 | main.rs:16:19:16:19 | s | main.rs:16:10:16:20 | identity(...) | provenance | QL |
 | main.rs:25:9:25:9 | s | main.rs:26:17:26:17 | s | provenance |  |
 | main.rs:25:13:25:22 | source(...) | main.rs:25:9:25:9 | s | provenance |  |
-| main.rs:26:17:26:17 | s | main.rs:26:10:26:18 | coerce(...) | provenance | MaD:18 |
+| main.rs:26:17:26:17 | s | main.rs:26:10:26:18 | coerce(...) | provenance | MaD:30 |
 | main.rs:41:9:41:10 | s1 | main.rs:42:17:42:18 | s1 | provenance |  |
 | main.rs:41:9:41:10 | s1 | main.rs:42:17:42:18 | s1 | provenance |  |
 | main.rs:41:14:41:23 | source(...) | main.rs:41:9:41:10 | s1 | provenance |  |
 | main.rs:41:14:41:23 | source(...) | main.rs:41:9:41:10 | s1 | provenance |  |
-| main.rs:42:17:42:18 | s1 | main.rs:42:10:42:19 | snd(...) | provenance | MaD:32 |
-| main.rs:42:17:42:18 | s1 | main.rs:42:10:42:19 | snd(...) | provenance | MaD:32 |
+| main.rs:42:17:42:18 | s1 | main.rs:42:10:42:19 | snd(...) | provenance | MaD:44 |
+| main.rs:42:17:42:18 | s1 | main.rs:42:10:42:19 | snd(...) | provenance | MaD:44 |
 | main.rs:54:9:54:9 | s | main.rs:55:27:55:27 | s | provenance |  |
 | main.rs:54:9:54:9 | s | main.rs:55:27:55:27 | s | provenance |  |
 | main.rs:54:13:54:21 | source(...) | main.rs:54:9:54:9 | s | provenance |  |
@@ -57,8 +69,8 @@ edges
 | main.rs:55:14:55:28 | ...::A(...) [A] | main.rs:55:9:55:10 | e1 [A] | provenance |  |
 | main.rs:55:27:55:27 | s | main.rs:55:14:55:28 | ...::A(...) [A] | provenance |  |
 | main.rs:55:27:55:27 | s | main.rs:55:14:55:28 | ...::A(...) [A] | provenance |  |
-| main.rs:56:22:56:23 | e1 [A] | main.rs:56:10:56:24 | get_var_pos(...) | provenance | MaD:26 |
-| main.rs:56:22:56:23 | e1 [A] | main.rs:56:10:56:24 | get_var_pos(...) | provenance | MaD:26 |
+| main.rs:56:22:56:23 | e1 [A] | main.rs:56:10:56:24 | get_var_pos(...) | provenance | MaD:38 |
+| main.rs:56:22:56:23 | e1 [A] | main.rs:56:10:56:24 | get_var_pos(...) | provenance | MaD:38 |
 | main.rs:67:9:67:9 | s | main.rs:68:26:68:26 | s | provenance |  |
 | main.rs:67:9:67:9 | s | main.rs:68:26:68:26 | s | provenance |  |
 | main.rs:67:13:67:21 | source(...) | main.rs:67:9:67:9 | s | provenance |  |
@@ -67,276 +79,350 @@ edges
 | main.rs:68:9:68:10 | e1 [B] | main.rs:69:11:69:12 | e1 [B] | provenance |  |
 | main.rs:68:14:68:27 | set_var_pos(...) [B] | main.rs:68:9:68:10 | e1 [B] | provenance |  |
 | main.rs:68:14:68:27 | set_var_pos(...) [B] | main.rs:68:9:68:10 | e1 [B] | provenance |  |
-| main.rs:68:26:68:26 | s | main.rs:68:14:68:27 | set_var_pos(...) [B] | provenance | MaD:31 |
-| main.rs:68:26:68:26 | s | main.rs:68:14:68:27 | set_var_pos(...) [B] | provenance | MaD:31 |
+| main.rs:68:26:68:26 | s | main.rs:68:14:68:27 | set_var_pos(...) [B] | provenance | MaD:43 |
+| main.rs:68:26:68:26 | s | main.rs:68:14:68:27 | set_var_pos(...) [B] | provenance | MaD:43 |
 | main.rs:69:11:69:12 | e1 [B] | main.rs:71:9:71:23 | ...::B(...) [B] | provenance |  |
 | main.rs:69:11:69:12 | e1 [B] | main.rs:71:9:71:23 | ...::B(...) [B] | provenance |  |
 | main.rs:71:9:71:23 | ...::B(...) [B] | main.rs:71:22:71:22 | i | provenance |  |
 | main.rs:71:9:71:23 | ...::B(...) [B] | main.rs:71:22:71:22 | i | provenance |  |
 | main.rs:71:22:71:22 | i | main.rs:71:33:71:33 | i | provenance |  |
 | main.rs:71:22:71:22 | i | main.rs:71:33:71:33 | i | provenance |  |
-| main.rs:86:9:86:9 | s | main.rs:87:40:87:40 | s | provenance |  |
-| main.rs:86:9:86:9 | s | main.rs:87:40:87:40 | s | provenance |  |
-| main.rs:86:13:86:21 | source(...) | main.rs:86:9:86:9 | s | provenance |  |
-| main.rs:86:13:86:21 | source(...) | main.rs:86:9:86:9 | s | provenance |  |
-| main.rs:87:9:87:10 | e1 [C] | main.rs:88:24:88:25 | e1 [C] | provenance |  |
-| main.rs:87:9:87:10 | e1 [C] | main.rs:88:24:88:25 | e1 [C] | provenance |  |
-| main.rs:87:14:87:42 | ...::C {...} [C] | main.rs:87:9:87:10 | e1 [C] | provenance |  |
-| main.rs:87:14:87:42 | ...::C {...} [C] | main.rs:87:9:87:10 | e1 [C] | provenance |  |
-| main.rs:87:40:87:40 | s | main.rs:87:14:87:42 | ...::C {...} [C] | provenance |  |
-| main.rs:87:40:87:40 | s | main.rs:87:14:87:42 | ...::C {...} [C] | provenance |  |
-| main.rs:88:24:88:25 | e1 [C] | main.rs:88:10:88:26 | get_var_field(...) | provenance | MaD:25 |
-| main.rs:88:24:88:25 | e1 [C] | main.rs:88:10:88:26 | get_var_field(...) | provenance | MaD:25 |
-| main.rs:99:9:99:9 | s | main.rs:100:28:100:28 | s | provenance |  |
-| main.rs:99:9:99:9 | s | main.rs:100:28:100:28 | s | provenance |  |
-| main.rs:99:13:99:21 | source(...) | main.rs:99:9:99:9 | s | provenance |  |
-| main.rs:99:13:99:21 | source(...) | main.rs:99:9:99:9 | s | provenance |  |
-| main.rs:100:9:100:10 | e1 [D] | main.rs:101:11:101:12 | e1 [D] | provenance |  |
-| main.rs:100:9:100:10 | e1 [D] | main.rs:101:11:101:12 | e1 [D] | provenance |  |
-| main.rs:100:14:100:29 | set_var_field(...) [D] | main.rs:100:9:100:10 | e1 [D] | provenance |  |
-| main.rs:100:14:100:29 | set_var_field(...) [D] | main.rs:100:9:100:10 | e1 [D] | provenance |  |
-| main.rs:100:28:100:28 | s | main.rs:100:14:100:29 | set_var_field(...) [D] | provenance | MaD:30 |
-| main.rs:100:28:100:28 | s | main.rs:100:14:100:29 | set_var_field(...) [D] | provenance | MaD:30 |
-| main.rs:101:11:101:12 | e1 [D] | main.rs:103:9:103:37 | ...::D {...} [D] | provenance |  |
-| main.rs:101:11:101:12 | e1 [D] | main.rs:103:9:103:37 | ...::D {...} [D] | provenance |  |
-| main.rs:103:9:103:37 | ...::D {...} [D] | main.rs:103:35:103:35 | i | provenance |  |
-| main.rs:103:9:103:37 | ...::D {...} [D] | main.rs:103:35:103:35 | i | provenance |  |
-| main.rs:103:35:103:35 | i | main.rs:103:47:103:47 | i | provenance |  |
-| main.rs:103:35:103:35 | i | main.rs:103:47:103:47 | i | provenance |  |
-| main.rs:118:9:118:9 | s | main.rs:120:17:120:17 | s | provenance |  |
-| main.rs:118:9:118:9 | s | main.rs:120:17:120:17 | s | provenance |  |
-| main.rs:118:13:118:21 | source(...) | main.rs:118:9:118:9 | s | provenance |  |
-| main.rs:118:13:118:21 | source(...) | main.rs:118:9:118:9 | s | provenance |  |
-| main.rs:119:9:119:17 | my_struct [MyStruct.field1] | main.rs:123:27:123:35 | my_struct [MyStruct.field1] | provenance |  |
-| main.rs:119:9:119:17 | my_struct [MyStruct.field1] | main.rs:123:27:123:35 | my_struct [MyStruct.field1] | provenance |  |
-| main.rs:119:21:122:5 | MyStruct {...} [MyStruct.field1] | main.rs:119:9:119:17 | my_struct [MyStruct.field1] | provenance |  |
-| main.rs:119:21:122:5 | MyStruct {...} [MyStruct.field1] | main.rs:119:9:119:17 | my_struct [MyStruct.field1] | provenance |  |
-| main.rs:120:17:120:17 | s | main.rs:119:21:122:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
-| main.rs:120:17:120:17 | s | main.rs:119:21:122:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
-| main.rs:123:27:123:35 | my_struct [MyStruct.field1] | main.rs:123:10:123:36 | get_struct_field(...) | provenance | MaD:23 |
-| main.rs:123:27:123:35 | my_struct [MyStruct.field1] | main.rs:123:10:123:36 | get_struct_field(...) | provenance | MaD:23 |
-| main.rs:140:9:140:9 | s | main.rs:141:38:141:38 | s | provenance |  |
-| main.rs:140:9:140:9 | s | main.rs:141:38:141:38 | s | provenance |  |
-| main.rs:140:13:140:21 | source(...) | main.rs:140:9:140:9 | s | provenance |  |
-| main.rs:140:13:140:21 | source(...) | main.rs:140:9:140:9 | s | provenance |  |
-| main.rs:141:9:141:17 | my_struct [MyStruct.field2] | main.rs:143:10:143:18 | my_struct [MyStruct.field2] | provenance |  |
-| main.rs:141:9:141:17 | my_struct [MyStruct.field2] | main.rs:143:10:143:18 | my_struct [MyStruct.field2] | provenance |  |
-| main.rs:141:21:141:39 | set_struct_field(...) [MyStruct.field2] | main.rs:141:9:141:17 | my_struct [MyStruct.field2] | provenance |  |
-| main.rs:141:21:141:39 | set_struct_field(...) [MyStruct.field2] | main.rs:141:9:141:17 | my_struct [MyStruct.field2] | provenance |  |
-| main.rs:141:38:141:38 | s | main.rs:141:21:141:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:28 |
-| main.rs:141:38:141:38 | s | main.rs:141:21:141:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:28 |
-| main.rs:143:10:143:18 | my_struct [MyStruct.field2] | main.rs:143:10:143:25 | my_struct.field2 | provenance |  |
-| main.rs:143:10:143:18 | my_struct [MyStruct.field2] | main.rs:143:10:143:25 | my_struct.field2 | provenance |  |
-| main.rs:152:9:152:9 | s | main.rs:153:29:153:29 | s | provenance |  |
-| main.rs:152:9:152:9 | s | main.rs:153:29:153:29 | s | provenance |  |
-| main.rs:152:13:152:21 | source(...) | main.rs:152:9:152:9 | s | provenance |  |
-| main.rs:152:13:152:21 | source(...) | main.rs:152:9:152:9 | s | provenance |  |
-| main.rs:153:28:153:30 | [...] [element] | main.rs:153:10:153:31 | get_array_element(...) | provenance | MaD:21 |
-| main.rs:153:28:153:30 | [...] [element] | main.rs:153:10:153:31 | get_array_element(...) | provenance | MaD:21 |
-| main.rs:153:29:153:29 | s | main.rs:153:28:153:30 | [...] [element] | provenance |  |
-| main.rs:153:29:153:29 | s | main.rs:153:28:153:30 | [...] [element] | provenance |  |
-| main.rs:162:9:162:9 | s | main.rs:163:33:163:33 | s | provenance |  |
-| main.rs:162:9:162:9 | s | main.rs:163:33:163:33 | s | provenance |  |
-| main.rs:162:13:162:21 | source(...) | main.rs:162:9:162:9 | s | provenance |  |
-| main.rs:162:13:162:21 | source(...) | main.rs:162:9:162:9 | s | provenance |  |
-| main.rs:163:9:163:11 | arr [element] | main.rs:164:10:164:12 | arr [element] | provenance |  |
-| main.rs:163:9:163:11 | arr [element] | main.rs:164:10:164:12 | arr [element] | provenance |  |
-| main.rs:163:15:163:34 | set_array_element(...) [element] | main.rs:163:9:163:11 | arr [element] | provenance |  |
-| main.rs:163:15:163:34 | set_array_element(...) [element] | main.rs:163:9:163:11 | arr [element] | provenance |  |
-| main.rs:163:33:163:33 | s | main.rs:163:15:163:34 | set_array_element(...) [element] | provenance | MaD:27 |
-| main.rs:163:33:163:33 | s | main.rs:163:15:163:34 | set_array_element(...) [element] | provenance | MaD:27 |
-| main.rs:164:10:164:12 | arr [element] | main.rs:164:10:164:15 | arr[0] | provenance | MaD:15 |
-| main.rs:164:10:164:12 | arr [element] | main.rs:164:10:164:15 | arr[0] | provenance | MaD:15 |
-| main.rs:173:9:173:9 | s | main.rs:174:14:174:14 | s | provenance |  |
-| main.rs:173:9:173:9 | s | main.rs:174:14:174:14 | s | provenance |  |
-| main.rs:173:13:173:22 | source(...) | main.rs:173:9:173:9 | s | provenance |  |
-| main.rs:173:13:173:22 | source(...) | main.rs:173:9:173:9 | s | provenance |  |
-| main.rs:174:9:174:9 | t [tuple.0] | main.rs:175:28:175:28 | t [tuple.0] | provenance |  |
-| main.rs:174:9:174:9 | t [tuple.0] | main.rs:175:28:175:28 | t [tuple.0] | provenance |  |
-| main.rs:174:13:174:18 | TupleExpr [tuple.0] | main.rs:174:9:174:9 | t [tuple.0] | provenance |  |
-| main.rs:174:13:174:18 | TupleExpr [tuple.0] | main.rs:174:9:174:9 | t [tuple.0] | provenance |  |
-| main.rs:174:14:174:14 | s | main.rs:174:13:174:18 | TupleExpr [tuple.0] | provenance |  |
-| main.rs:174:14:174:14 | s | main.rs:174:13:174:18 | TupleExpr [tuple.0] | provenance |  |
-| main.rs:175:28:175:28 | t [tuple.0] | main.rs:175:10:175:29 | get_tuple_element(...) | provenance | MaD:24 |
-| main.rs:175:28:175:28 | t [tuple.0] | main.rs:175:10:175:29 | get_tuple_element(...) | provenance | MaD:24 |
-| main.rs:186:9:186:9 | s | main.rs:187:31:187:31 | s | provenance |  |
-| main.rs:186:9:186:9 | s | main.rs:187:31:187:31 | s | provenance |  |
-| main.rs:186:13:186:22 | source(...) | main.rs:186:9:186:9 | s | provenance |  |
-| main.rs:186:13:186:22 | source(...) | main.rs:186:9:186:9 | s | provenance |  |
-| main.rs:187:9:187:9 | t [tuple.1] | main.rs:189:10:189:10 | t [tuple.1] | provenance |  |
-| main.rs:187:9:187:9 | t [tuple.1] | main.rs:189:10:189:10 | t [tuple.1] | provenance |  |
-| main.rs:187:13:187:32 | set_tuple_element(...) [tuple.1] | main.rs:187:9:187:9 | t [tuple.1] | provenance |  |
-| main.rs:187:13:187:32 | set_tuple_element(...) [tuple.1] | main.rs:187:9:187:9 | t [tuple.1] | provenance |  |
-| main.rs:187:31:187:31 | s | main.rs:187:13:187:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:29 |
-| main.rs:187:31:187:31 | s | main.rs:187:13:187:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:29 |
-| main.rs:189:10:189:10 | t [tuple.1] | main.rs:189:10:189:12 | t.1 | provenance |  |
-| main.rs:189:10:189:10 | t [tuple.1] | main.rs:189:10:189:12 | t.1 | provenance |  |
-| main.rs:201:9:201:9 | s | main.rs:206:11:206:11 | s | provenance |  |
-| main.rs:201:9:201:9 | s | main.rs:206:11:206:11 | s | provenance |  |
-| main.rs:201:13:201:22 | source(...) | main.rs:201:9:201:9 | s | provenance |  |
-| main.rs:201:13:201:22 | source(...) | main.rs:201:9:201:9 | s | provenance |  |
-| main.rs:202:14:202:14 | ... | main.rs:203:14:203:14 | n | provenance |  |
-| main.rs:202:14:202:14 | ... | main.rs:203:14:203:14 | n | provenance |  |
-| main.rs:206:11:206:11 | s | main.rs:202:14:202:14 | ... | provenance | MaD:16 |
-| main.rs:206:11:206:11 | s | main.rs:202:14:202:14 | ... | provenance | MaD:16 |
-| main.rs:210:13:210:22 | source(...) | main.rs:212:23:212:23 | f [captured s] | provenance |  |
-| main.rs:210:13:210:22 | source(...) | main.rs:212:23:212:23 | f [captured s] | provenance |  |
-| main.rs:211:40:211:40 | s | main.rs:211:17:211:42 | if ... {...} else {...} | provenance |  |
-| main.rs:211:40:211:40 | s | main.rs:211:17:211:42 | if ... {...} else {...} | provenance |  |
-| main.rs:212:9:212:9 | t | main.rs:213:10:213:10 | t | provenance |  |
-| main.rs:212:9:212:9 | t | main.rs:213:10:213:10 | t | provenance |  |
-| main.rs:212:13:212:24 | apply(...) | main.rs:212:9:212:9 | t | provenance |  |
-| main.rs:212:13:212:24 | apply(...) | main.rs:212:9:212:9 | t | provenance |  |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | provenance | MaD:16 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | provenance | MaD:16 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | provenance | MaD:17 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | provenance | MaD:17 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:212:13:212:24 | apply(...) | provenance | MaD:16 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:212:13:212:24 | apply(...) | provenance | MaD:16 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:212:13:212:24 | apply(...) | provenance | MaD:17 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:212:13:212:24 | apply(...) | provenance | MaD:17 |
-| main.rs:217:9:217:9 | s | main.rs:219:19:219:19 | s | provenance |  |
-| main.rs:217:9:217:9 | s | main.rs:219:19:219:19 | s | provenance |  |
-| main.rs:217:13:217:22 | source(...) | main.rs:217:9:217:9 | s | provenance |  |
-| main.rs:217:13:217:22 | source(...) | main.rs:217:9:217:9 | s | provenance |  |
-| main.rs:218:14:218:14 | ... | main.rs:218:17:218:42 | if ... {...} else {...} | provenance |  |
-| main.rs:218:14:218:14 | ... | main.rs:218:17:218:42 | if ... {...} else {...} | provenance |  |
-| main.rs:219:9:219:9 | t | main.rs:220:10:220:10 | t | provenance |  |
-| main.rs:219:9:219:9 | t | main.rs:220:10:220:10 | t | provenance |  |
-| main.rs:219:13:219:23 | apply(...) | main.rs:219:9:219:9 | t | provenance |  |
-| main.rs:219:13:219:23 | apply(...) | main.rs:219:9:219:9 | t | provenance |  |
-| main.rs:219:19:219:19 | s | main.rs:218:14:218:14 | ... | provenance | MaD:16 |
-| main.rs:219:19:219:19 | s | main.rs:218:14:218:14 | ... | provenance | MaD:16 |
-| main.rs:219:19:219:19 | s | main.rs:219:13:219:23 | apply(...) | provenance | MaD:16 |
-| main.rs:219:19:219:19 | s | main.rs:219:13:219:23 | apply(...) | provenance | MaD:16 |
-| main.rs:229:9:229:9 | s | main.rs:230:30:230:30 | s | provenance |  |
-| main.rs:229:9:229:9 | s | main.rs:230:30:230:30 | s | provenance |  |
-| main.rs:229:13:229:22 | source(...) | main.rs:229:9:229:9 | s | provenance |  |
-| main.rs:229:13:229:22 | source(...) | main.rs:229:9:229:9 | s | provenance |  |
-| main.rs:230:9:230:9 | t | main.rs:231:10:231:10 | t | provenance |  |
-| main.rs:230:9:230:9 | t | main.rs:231:10:231:10 | t | provenance |  |
-| main.rs:230:13:230:31 | get_async_number(...) [future] | main.rs:230:13:230:37 | await ... | provenance |  |
-| main.rs:230:13:230:31 | get_async_number(...) [future] | main.rs:230:13:230:37 | await ... | provenance |  |
-| main.rs:230:13:230:37 | await ... | main.rs:230:9:230:9 | t | provenance |  |
-| main.rs:230:13:230:37 | await ... | main.rs:230:9:230:9 | t | provenance |  |
-| main.rs:230:30:230:30 | s | main.rs:230:13:230:31 | get_async_number(...) [future] | provenance | MaD:22 |
-| main.rs:230:30:230:30 | s | main.rs:230:13:230:31 | get_async_number(...) [future] | provenance | MaD:22 |
-| main.rs:250:9:250:9 | s [D] | main.rs:251:11:251:11 | s [D] | provenance |  |
-| main.rs:250:9:250:9 | s [D] | main.rs:251:11:251:11 | s [D] | provenance |  |
-| main.rs:250:13:250:23 | enum_source | main.rs:250:13:250:27 | enum_source(...) [D] | provenance | Src:MaD:8  |
-| main.rs:250:13:250:23 | enum_source | main.rs:250:13:250:27 | enum_source(...) [D] | provenance | Src:MaD:8  |
-| main.rs:250:13:250:27 | enum_source(...) [D] | main.rs:250:9:250:9 | s [D] | provenance |  |
-| main.rs:250:13:250:27 | enum_source(...) [D] | main.rs:250:9:250:9 | s [D] | provenance |  |
-| main.rs:251:11:251:11 | s [D] | main.rs:253:9:253:37 | ...::D {...} [D] | provenance |  |
-| main.rs:251:11:251:11 | s [D] | main.rs:253:9:253:37 | ...::D {...} [D] | provenance |  |
-| main.rs:253:9:253:37 | ...::D {...} [D] | main.rs:253:35:253:35 | i | provenance |  |
-| main.rs:253:9:253:37 | ...::D {...} [D] | main.rs:253:35:253:35 | i | provenance |  |
-| main.rs:253:35:253:35 | i | main.rs:253:47:253:47 | i | provenance |  |
-| main.rs:253:35:253:35 | i | main.rs:253:47:253:47 | i | provenance |  |
-| main.rs:259:9:259:9 | s [C] | main.rs:260:11:260:11 | s [C] | provenance |  |
-| main.rs:259:9:259:9 | s [C] | main.rs:260:11:260:11 | s [C] | provenance |  |
-| main.rs:259:13:259:24 | e.source(...) [C] | main.rs:259:9:259:9 | s [C] | provenance |  |
-| main.rs:259:13:259:24 | e.source(...) [C] | main.rs:259:9:259:9 | s [C] | provenance |  |
-| main.rs:259:15:259:20 | source | main.rs:259:13:259:24 | e.source(...) [C] | provenance | Src:MaD:6  |
-| main.rs:259:15:259:20 | source | main.rs:259:13:259:24 | e.source(...) [C] | provenance | Src:MaD:6  |
-| main.rs:260:11:260:11 | s [C] | main.rs:261:9:261:37 | ...::C {...} [C] | provenance |  |
-| main.rs:260:11:260:11 | s [C] | main.rs:261:9:261:37 | ...::C {...} [C] | provenance |  |
-| main.rs:261:9:261:37 | ...::C {...} [C] | main.rs:261:35:261:35 | i | provenance |  |
-| main.rs:261:9:261:37 | ...::C {...} [C] | main.rs:261:35:261:35 | i | provenance |  |
-| main.rs:261:35:261:35 | i | main.rs:261:47:261:47 | i | provenance |  |
-| main.rs:261:35:261:35 | i | main.rs:261:47:261:47 | i | provenance |  |
-| main.rs:275:18:275:18 | ... | main.rs:275:26:275:26 | a | provenance |  |
-| main.rs:275:18:275:18 | ... | main.rs:275:26:275:26 | a | provenance |  |
-| main.rs:276:9:276:19 | pass_source | main.rs:275:18:275:18 | ... | provenance | Src:MaD:12  |
-| main.rs:276:9:276:19 | pass_source | main.rs:275:18:275:18 | ... | provenance | Src:MaD:12  |
-| main.rs:278:9:278:19 | pass_source | main.rs:278:25:278:25 | ... | provenance | Src:MaD:12  |
-| main.rs:278:9:278:19 | pass_source | main.rs:278:25:278:25 | ... | provenance | Src:MaD:12  |
-| main.rs:278:25:278:25 | ... | main.rs:279:18:279:18 | a | provenance |  |
-| main.rs:278:25:278:25 | ... | main.rs:279:18:279:18 | a | provenance |  |
-| main.rs:282:14:282:19 | ...: i64 | main.rs:283:18:283:18 | a | provenance |  |
-| main.rs:282:14:282:19 | ...: i64 | main.rs:283:18:283:18 | a | provenance |  |
-| main.rs:285:9:285:19 | pass_source | main.rs:282:14:282:19 | ...: i64 | provenance | Src:MaD:12  |
-| main.rs:285:9:285:19 | pass_source | main.rs:282:14:282:19 | ...: i64 | provenance | Src:MaD:12  |
-| main.rs:287:9:287:19 | pass_source | main.rs:287:36:287:36 | ... | provenance | Src:MaD:12  |
-| main.rs:287:9:287:19 | pass_source | main.rs:287:36:287:36 | ... | provenance | Src:MaD:12  |
-| main.rs:287:36:287:36 | ... | main.rs:288:18:288:18 | a | provenance |  |
-| main.rs:287:36:287:36 | ... | main.rs:288:18:288:18 | a | provenance |  |
-| main.rs:297:9:297:9 | s | main.rs:298:41:298:41 | s | provenance |  |
-| main.rs:297:9:297:9 | s | main.rs:298:41:298:41 | s | provenance |  |
-| main.rs:297:13:297:22 | source(...) | main.rs:297:9:297:9 | s | provenance |  |
-| main.rs:297:13:297:22 | source(...) | main.rs:297:9:297:9 | s | provenance |  |
-| main.rs:298:15:298:43 | ...::C {...} [C] | main.rs:298:5:298:13 | enum_sink | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:298:15:298:43 | ...::C {...} [C] | main.rs:298:5:298:13 | enum_sink | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:298:41:298:41 | s | main.rs:298:15:298:43 | ...::C {...} [C] | provenance |  |
-| main.rs:298:41:298:41 | s | main.rs:298:15:298:43 | ...::C {...} [C] | provenance |  |
-| main.rs:303:9:303:9 | s | main.rs:304:39:304:39 | s | provenance |  |
-| main.rs:303:9:303:9 | s | main.rs:304:39:304:39 | s | provenance |  |
-| main.rs:303:13:303:22 | source(...) | main.rs:303:9:303:9 | s | provenance |  |
-| main.rs:303:13:303:22 | source(...) | main.rs:303:9:303:9 | s | provenance |  |
-| main.rs:304:9:304:9 | e [D] | main.rs:305:5:305:5 | e [D] | provenance |  |
-| main.rs:304:9:304:9 | e [D] | main.rs:305:5:305:5 | e [D] | provenance |  |
-| main.rs:304:13:304:41 | ...::D {...} [D] | main.rs:304:9:304:9 | e [D] | provenance |  |
-| main.rs:304:13:304:41 | ...::D {...} [D] | main.rs:304:9:304:9 | e [D] | provenance |  |
-| main.rs:304:39:304:39 | s | main.rs:304:13:304:41 | ...::D {...} [D] | provenance |  |
-| main.rs:304:39:304:39 | s | main.rs:304:13:304:41 | ...::D {...} [D] | provenance |  |
-| main.rs:305:5:305:5 | e [D] | main.rs:305:7:305:10 | sink | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:305:5:305:5 | e [D] | main.rs:305:7:305:10 | sink | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:314:9:314:9 | s | main.rs:315:10:315:10 | s | provenance |  |
-| main.rs:314:9:314:9 | s | main.rs:315:10:315:10 | s | provenance |  |
-| main.rs:314:13:314:25 | simple_source | main.rs:314:13:314:29 | simple_source(...) | provenance | Src:MaD:11 MaD:11 |
-| main.rs:314:13:314:25 | simple_source | main.rs:314:13:314:29 | simple_source(...) | provenance | Src:MaD:11 MaD:11 |
-| main.rs:314:13:314:29 | simple_source(...) | main.rs:314:9:314:9 | s | provenance |  |
-| main.rs:314:13:314:29 | simple_source(...) | main.rs:314:9:314:9 | s | provenance |  |
-| main.rs:322:9:322:9 | s | main.rs:323:17:323:17 | s | provenance |  |
-| main.rs:322:9:322:9 | s | main.rs:323:17:323:17 | s | provenance |  |
-| main.rs:322:13:322:22 | source(...) | main.rs:322:9:322:9 | s | provenance |  |
-| main.rs:322:13:322:22 | source(...) | main.rs:322:9:322:9 | s | provenance |  |
-| main.rs:323:17:323:17 | s | main.rs:323:5:323:15 | simple_sink | provenance | MaD:5 Sink:MaD:5 |
-| main.rs:323:17:323:17 | s | main.rs:323:5:323:15 | simple_sink | provenance | MaD:5 Sink:MaD:5 |
-| main.rs:331:5:331:14 | arg_source | main.rs:331:16:331:16 | [post] i | provenance | Src:MaD:7 MaD:7 |
-| main.rs:331:5:331:14 | arg_source | main.rs:331:16:331:16 | [post] i | provenance | Src:MaD:7 MaD:7 |
-| main.rs:331:16:331:16 | [post] i | main.rs:332:10:332:10 | i | provenance |  |
-| main.rs:331:16:331:16 | [post] i | main.rs:332:10:332:10 | i | provenance |  |
-| main.rs:384:9:384:10 | x1 | main.rs:385:10:385:11 | x1 | provenance |  |
-| main.rs:384:9:384:10 | x1 | main.rs:385:10:385:11 | x1 | provenance |  |
-| main.rs:384:14:384:23 | source(...) | main.rs:384:14:384:30 | ... .max(...) | provenance | MaD:13 |
-| main.rs:384:14:384:23 | source(...) | main.rs:384:14:384:30 | ... .max(...) | provenance | MaD:13 |
-| main.rs:384:14:384:30 | ... .max(...) | main.rs:384:9:384:10 | x1 | provenance |  |
-| main.rs:384:14:384:30 | ... .max(...) | main.rs:384:9:384:10 | x1 | provenance |  |
-| main.rs:387:9:387:10 | x2 [MyStruct.field1] | main.rs:395:10:395:11 | x2 [MyStruct.field1] | provenance |  |
-| main.rs:387:9:387:10 | x2 [MyStruct.field1] | main.rs:395:10:395:11 | x2 [MyStruct.field1] | provenance |  |
-| main.rs:387:14:394:6 | ... .max(...) [MyStruct.field1] | main.rs:387:9:387:10 | x2 [MyStruct.field1] | provenance |  |
-| main.rs:387:14:394:6 | ... .max(...) [MyStruct.field1] | main.rs:387:9:387:10 | x2 [MyStruct.field1] | provenance |  |
-| main.rs:387:15:390:5 | MyStruct {...} [MyStruct.field1] | main.rs:387:14:394:6 | ... .max(...) [MyStruct.field1] | provenance | MaD:13 |
-| main.rs:387:15:390:5 | MyStruct {...} [MyStruct.field1] | main.rs:387:14:394:6 | ... .max(...) [MyStruct.field1] | provenance | MaD:13 |
-| main.rs:388:17:388:26 | source(...) | main.rs:387:15:390:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
-| main.rs:388:17:388:26 | source(...) | main.rs:387:15:390:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
-| main.rs:395:10:395:11 | x2 [MyStruct.field1] | main.rs:395:10:395:18 | x2.field1 | provenance |  |
-| main.rs:395:10:395:11 | x2 [MyStruct.field1] | main.rs:395:10:395:18 | x2.field1 | provenance |  |
-| main.rs:400:9:400:10 | x4 | main.rs:401:10:401:11 | x4 | provenance |  |
-| main.rs:400:9:400:10 | x4 | main.rs:401:10:401:11 | x4 | provenance |  |
-| main.rs:400:14:400:23 | source(...) | main.rs:400:14:400:30 | ... .max(...) | provenance | MaD:13 |
-| main.rs:400:14:400:23 | source(...) | main.rs:400:14:400:30 | ... .max(...) | provenance | MaD:13 |
-| main.rs:400:14:400:30 | ... .max(...) | main.rs:400:9:400:10 | x4 | provenance |  |
-| main.rs:400:14:400:30 | ... .max(...) | main.rs:400:9:400:10 | x4 | provenance |  |
-| main.rs:403:9:403:10 | x5 | main.rs:404:10:404:11 | x5 | provenance |  |
-| main.rs:403:14:403:23 | source(...) | main.rs:403:14:403:30 | ... .lt(...) | provenance | MaD:14 |
-| main.rs:403:14:403:30 | ... .lt(...) | main.rs:403:9:403:10 | x5 | provenance |  |
-| main.rs:406:9:406:10 | x6 | main.rs:407:10:407:11 | x6 | provenance |  |
-| main.rs:406:14:406:23 | source(...) | main.rs:406:14:406:27 | ... < ... | provenance | MaD:14 |
-| main.rs:406:14:406:27 | ... < ... | main.rs:406:9:406:10 | x6 | provenance |  |
-| main.rs:422:10:422:25 | generated_source | main.rs:422:10:422:28 | generated_source(...) | provenance | Src:MaD:9 MaD:9 |
-| main.rs:422:10:422:25 | generated_source | main.rs:422:10:422:28 | generated_source(...) | provenance | Src:MaD:9 MaD:9 |
-| main.rs:424:10:424:30 | neutral_manual_source | main.rs:424:10:424:33 | neutral_manual_source(...) | provenance | Src:MaD:10 MaD:10 |
-| main.rs:424:10:424:30 | neutral_manual_source | main.rs:424:10:424:33 | neutral_manual_source(...) | provenance | Src:MaD:10 MaD:10 |
-| main.rs:425:20:425:28 | source(...) | main.rs:425:5:425:18 | generated_sink | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:425:20:425:28 | source(...) | main.rs:425:5:425:18 | generated_sink | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:427:25:427:33 | source(...) | main.rs:427:5:427:23 | neutral_manual_sink | provenance | MaD:4 Sink:MaD:4 |
-| main.rs:427:25:427:33 | source(...) | main.rs:427:5:427:23 | neutral_manual_sink | provenance | MaD:4 Sink:MaD:4 |
-| main.rs:428:28:428:36 | source(...) | main.rs:428:10:428:37 | generated_summary(...) | provenance | MaD:19 |
-| main.rs:428:28:428:36 | source(...) | main.rs:428:10:428:37 | generated_summary(...) | provenance | MaD:19 |
-| main.rs:430:33:430:41 | source(...) | main.rs:430:10:430:42 | neutral_manual_summary(...) | provenance | MaD:20 |
-| main.rs:430:33:430:41 | source(...) | main.rs:430:10:430:42 | neutral_manual_summary(...) | provenance | MaD:20 |
+| main.rs:87:9:87:9 | s | main.rs:88:40:88:40 | s | provenance |  |
+| main.rs:87:9:87:9 | s | main.rs:88:40:88:40 | s | provenance |  |
+| main.rs:87:13:87:21 | source(...) | main.rs:87:9:87:9 | s | provenance |  |
+| main.rs:87:13:87:21 | source(...) | main.rs:87:9:87:9 | s | provenance |  |
+| main.rs:88:9:88:10 | e1 [C] | main.rs:89:24:89:25 | e1 [C] | provenance |  |
+| main.rs:88:9:88:10 | e1 [C] | main.rs:89:24:89:25 | e1 [C] | provenance |  |
+| main.rs:88:14:88:42 | ...::C {...} [C] | main.rs:88:9:88:10 | e1 [C] | provenance |  |
+| main.rs:88:14:88:42 | ...::C {...} [C] | main.rs:88:9:88:10 | e1 [C] | provenance |  |
+| main.rs:88:40:88:40 | s | main.rs:88:14:88:42 | ...::C {...} [C] | provenance |  |
+| main.rs:88:40:88:40 | s | main.rs:88:14:88:42 | ...::C {...} [C] | provenance |  |
+| main.rs:89:24:89:25 | e1 [C] | main.rs:89:10:89:26 | get_var_field(...) | provenance | MaD:37 |
+| main.rs:89:24:89:25 | e1 [C] | main.rs:89:10:89:26 | get_var_field(...) | provenance | MaD:37 |
+| main.rs:100:9:100:9 | s | main.rs:101:28:101:28 | s | provenance |  |
+| main.rs:100:9:100:9 | s | main.rs:101:28:101:28 | s | provenance |  |
+| main.rs:100:13:100:21 | source(...) | main.rs:100:9:100:9 | s | provenance |  |
+| main.rs:100:13:100:21 | source(...) | main.rs:100:9:100:9 | s | provenance |  |
+| main.rs:101:9:101:10 | e1 [D] | main.rs:102:11:102:12 | e1 [D] | provenance |  |
+| main.rs:101:9:101:10 | e1 [D] | main.rs:102:11:102:12 | e1 [D] | provenance |  |
+| main.rs:101:14:101:29 | set_var_field(...) [D] | main.rs:101:9:101:10 | e1 [D] | provenance |  |
+| main.rs:101:14:101:29 | set_var_field(...) [D] | main.rs:101:9:101:10 | e1 [D] | provenance |  |
+| main.rs:101:28:101:28 | s | main.rs:101:14:101:29 | set_var_field(...) [D] | provenance | MaD:42 |
+| main.rs:101:28:101:28 | s | main.rs:101:14:101:29 | set_var_field(...) [D] | provenance | MaD:42 |
+| main.rs:102:11:102:12 | e1 [D] | main.rs:104:9:104:37 | ...::D {...} [D] | provenance |  |
+| main.rs:102:11:102:12 | e1 [D] | main.rs:104:9:104:37 | ...::D {...} [D] | provenance |  |
+| main.rs:104:9:104:37 | ...::D {...} [D] | main.rs:104:35:104:35 | i | provenance |  |
+| main.rs:104:9:104:37 | ...::D {...} [D] | main.rs:104:35:104:35 | i | provenance |  |
+| main.rs:104:35:104:35 | i | main.rs:104:47:104:47 | i | provenance |  |
+| main.rs:104:35:104:35 | i | main.rs:104:47:104:47 | i | provenance |  |
+| main.rs:120:9:120:9 | s | main.rs:122:17:122:17 | s | provenance |  |
+| main.rs:120:9:120:9 | s | main.rs:122:17:122:17 | s | provenance |  |
+| main.rs:120:13:120:21 | source(...) | main.rs:120:9:120:9 | s | provenance |  |
+| main.rs:120:13:120:21 | source(...) | main.rs:120:9:120:9 | s | provenance |  |
+| main.rs:121:9:121:17 | my_struct [MyStruct.field1] | main.rs:125:27:125:35 | my_struct [MyStruct.field1] | provenance |  |
+| main.rs:121:9:121:17 | my_struct [MyStruct.field1] | main.rs:125:27:125:35 | my_struct [MyStruct.field1] | provenance |  |
+| main.rs:121:21:124:5 | MyStruct {...} [MyStruct.field1] | main.rs:121:9:121:17 | my_struct [MyStruct.field1] | provenance |  |
+| main.rs:121:21:124:5 | MyStruct {...} [MyStruct.field1] | main.rs:121:9:121:17 | my_struct [MyStruct.field1] | provenance |  |
+| main.rs:122:17:122:17 | s | main.rs:121:21:124:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
+| main.rs:122:17:122:17 | s | main.rs:121:21:124:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
+| main.rs:125:27:125:35 | my_struct [MyStruct.field1] | main.rs:125:10:125:36 | get_struct_field(...) | provenance | MaD:35 |
+| main.rs:125:27:125:35 | my_struct [MyStruct.field1] | main.rs:125:10:125:36 | get_struct_field(...) | provenance | MaD:35 |
+| main.rs:142:9:142:9 | s | main.rs:143:38:143:38 | s | provenance |  |
+| main.rs:142:9:142:9 | s | main.rs:143:38:143:38 | s | provenance |  |
+| main.rs:142:13:142:21 | source(...) | main.rs:142:9:142:9 | s | provenance |  |
+| main.rs:142:13:142:21 | source(...) | main.rs:142:9:142:9 | s | provenance |  |
+| main.rs:143:9:143:17 | my_struct [MyStruct.field2] | main.rs:145:10:145:18 | my_struct [MyStruct.field2] | provenance |  |
+| main.rs:143:9:143:17 | my_struct [MyStruct.field2] | main.rs:145:10:145:18 | my_struct [MyStruct.field2] | provenance |  |
+| main.rs:143:21:143:39 | set_struct_field(...) [MyStruct.field2] | main.rs:143:9:143:17 | my_struct [MyStruct.field2] | provenance |  |
+| main.rs:143:21:143:39 | set_struct_field(...) [MyStruct.field2] | main.rs:143:9:143:17 | my_struct [MyStruct.field2] | provenance |  |
+| main.rs:143:38:143:38 | s | main.rs:143:21:143:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:40 |
+| main.rs:143:38:143:38 | s | main.rs:143:21:143:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:40 |
+| main.rs:145:10:145:18 | my_struct [MyStruct.field2] | main.rs:145:10:145:25 | my_struct.field2 | provenance |  |
+| main.rs:145:10:145:18 | my_struct [MyStruct.field2] | main.rs:145:10:145:25 | my_struct.field2 | provenance |  |
+| main.rs:154:9:154:9 | s | main.rs:155:29:155:29 | s | provenance |  |
+| main.rs:154:9:154:9 | s | main.rs:155:29:155:29 | s | provenance |  |
+| main.rs:154:13:154:21 | source(...) | main.rs:154:9:154:9 | s | provenance |  |
+| main.rs:154:13:154:21 | source(...) | main.rs:154:9:154:9 | s | provenance |  |
+| main.rs:155:28:155:30 | [...] [element] | main.rs:155:10:155:31 | get_array_element(...) | provenance | MaD:33 |
+| main.rs:155:28:155:30 | [...] [element] | main.rs:155:10:155:31 | get_array_element(...) | provenance | MaD:33 |
+| main.rs:155:29:155:29 | s | main.rs:155:28:155:30 | [...] [element] | provenance |  |
+| main.rs:155:29:155:29 | s | main.rs:155:28:155:30 | [...] [element] | provenance |  |
+| main.rs:164:9:164:9 | s | main.rs:165:33:165:33 | s | provenance |  |
+| main.rs:164:9:164:9 | s | main.rs:165:33:165:33 | s | provenance |  |
+| main.rs:164:13:164:21 | source(...) | main.rs:164:9:164:9 | s | provenance |  |
+| main.rs:164:13:164:21 | source(...) | main.rs:164:9:164:9 | s | provenance |  |
+| main.rs:165:9:165:11 | arr [element] | main.rs:166:10:166:12 | arr [element] | provenance |  |
+| main.rs:165:9:165:11 | arr [element] | main.rs:166:10:166:12 | arr [element] | provenance |  |
+| main.rs:165:15:165:34 | set_array_element(...) [element] | main.rs:165:9:165:11 | arr [element] | provenance |  |
+| main.rs:165:15:165:34 | set_array_element(...) [element] | main.rs:165:9:165:11 | arr [element] | provenance |  |
+| main.rs:165:33:165:33 | s | main.rs:165:15:165:34 | set_array_element(...) [element] | provenance | MaD:39 |
+| main.rs:165:33:165:33 | s | main.rs:165:15:165:34 | set_array_element(...) [element] | provenance | MaD:39 |
+| main.rs:166:10:166:12 | arr [element] | main.rs:166:10:166:15 | arr[0] | provenance | MaD:26 |
+| main.rs:166:10:166:12 | arr [element] | main.rs:166:10:166:15 | arr[0] | provenance | MaD:26 |
+| main.rs:175:9:175:9 | s | main.rs:176:14:176:14 | s | provenance |  |
+| main.rs:175:9:175:9 | s | main.rs:176:14:176:14 | s | provenance |  |
+| main.rs:175:13:175:22 | source(...) | main.rs:175:9:175:9 | s | provenance |  |
+| main.rs:175:13:175:22 | source(...) | main.rs:175:9:175:9 | s | provenance |  |
+| main.rs:176:9:176:9 | t [tuple.0] | main.rs:177:28:177:28 | t [tuple.0] | provenance |  |
+| main.rs:176:9:176:9 | t [tuple.0] | main.rs:177:28:177:28 | t [tuple.0] | provenance |  |
+| main.rs:176:13:176:18 | TupleExpr [tuple.0] | main.rs:176:9:176:9 | t [tuple.0] | provenance |  |
+| main.rs:176:13:176:18 | TupleExpr [tuple.0] | main.rs:176:9:176:9 | t [tuple.0] | provenance |  |
+| main.rs:176:14:176:14 | s | main.rs:176:13:176:18 | TupleExpr [tuple.0] | provenance |  |
+| main.rs:176:14:176:14 | s | main.rs:176:13:176:18 | TupleExpr [tuple.0] | provenance |  |
+| main.rs:177:28:177:28 | t [tuple.0] | main.rs:177:10:177:29 | get_tuple_element(...) | provenance | MaD:36 |
+| main.rs:177:28:177:28 | t [tuple.0] | main.rs:177:10:177:29 | get_tuple_element(...) | provenance | MaD:36 |
+| main.rs:188:9:188:9 | s | main.rs:189:31:189:31 | s | provenance |  |
+| main.rs:188:9:188:9 | s | main.rs:189:31:189:31 | s | provenance |  |
+| main.rs:188:13:188:22 | source(...) | main.rs:188:9:188:9 | s | provenance |  |
+| main.rs:188:13:188:22 | source(...) | main.rs:188:9:188:9 | s | provenance |  |
+| main.rs:189:9:189:9 | t [tuple.1] | main.rs:191:10:191:10 | t [tuple.1] | provenance |  |
+| main.rs:189:9:189:9 | t [tuple.1] | main.rs:191:10:191:10 | t [tuple.1] | provenance |  |
+| main.rs:189:13:189:32 | set_tuple_element(...) [tuple.1] | main.rs:189:9:189:9 | t [tuple.1] | provenance |  |
+| main.rs:189:13:189:32 | set_tuple_element(...) [tuple.1] | main.rs:189:9:189:9 | t [tuple.1] | provenance |  |
+| main.rs:189:31:189:31 | s | main.rs:189:13:189:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:41 |
+| main.rs:189:31:189:31 | s | main.rs:189:13:189:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:41 |
+| main.rs:191:10:191:10 | t [tuple.1] | main.rs:191:10:191:12 | t.1 | provenance |  |
+| main.rs:191:10:191:10 | t [tuple.1] | main.rs:191:10:191:12 | t.1 | provenance |  |
+| main.rs:203:9:203:9 | s | main.rs:208:11:208:11 | s | provenance |  |
+| main.rs:203:9:203:9 | s | main.rs:208:11:208:11 | s | provenance |  |
+| main.rs:203:13:203:22 | source(...) | main.rs:203:9:203:9 | s | provenance |  |
+| main.rs:203:13:203:22 | source(...) | main.rs:203:9:203:9 | s | provenance |  |
+| main.rs:204:14:204:14 | ... | main.rs:205:14:205:14 | n | provenance |  |
+| main.rs:204:14:204:14 | ... | main.rs:205:14:205:14 | n | provenance |  |
+| main.rs:208:11:208:11 | s | main.rs:204:14:204:14 | ... | provenance | MaD:28 |
+| main.rs:208:11:208:11 | s | main.rs:204:14:204:14 | ... | provenance | MaD:28 |
+| main.rs:212:9:212:9 | s | main.rs:214:23:214:23 | f [captured s] | provenance |  |
+| main.rs:212:9:212:9 | s | main.rs:214:23:214:23 | f [captured s] | provenance |  |
+| main.rs:212:13:212:22 | source(...) | main.rs:212:9:212:9 | s | provenance |  |
+| main.rs:212:13:212:22 | source(...) | main.rs:212:9:212:9 | s | provenance |  |
+| main.rs:213:40:213:40 | s | main.rs:213:17:213:42 | if ... {...} else {...} | provenance |  |
+| main.rs:213:40:213:40 | s | main.rs:213:17:213:42 | if ... {...} else {...} | provenance |  |
+| main.rs:214:9:214:9 | t | main.rs:215:10:215:10 | t | provenance |  |
+| main.rs:214:9:214:9 | t | main.rs:215:10:215:10 | t | provenance |  |
+| main.rs:214:13:214:24 | apply(...) | main.rs:214:9:214:9 | t | provenance |  |
+| main.rs:214:13:214:24 | apply(...) | main.rs:214:9:214:9 | t | provenance |  |
+| main.rs:214:23:214:23 | f [captured s] | main.rs:213:40:213:40 | s | provenance | MaD:28 |
+| main.rs:214:23:214:23 | f [captured s] | main.rs:213:40:213:40 | s | provenance | MaD:28 |
+| main.rs:214:23:214:23 | f [captured s] | main.rs:213:40:213:40 | s | provenance | MaD:29 |
+| main.rs:214:23:214:23 | f [captured s] | main.rs:213:40:213:40 | s | provenance | MaD:29 |
+| main.rs:214:23:214:23 | f [captured s] | main.rs:214:13:214:24 | apply(...) | provenance | MaD:28 |
+| main.rs:214:23:214:23 | f [captured s] | main.rs:214:13:214:24 | apply(...) | provenance | MaD:28 |
+| main.rs:214:23:214:23 | f [captured s] | main.rs:214:13:214:24 | apply(...) | provenance | MaD:29 |
+| main.rs:214:23:214:23 | f [captured s] | main.rs:214:13:214:24 | apply(...) | provenance | MaD:29 |
+| main.rs:219:9:219:9 | s | main.rs:221:19:221:19 | s | provenance |  |
+| main.rs:219:9:219:9 | s | main.rs:221:19:221:19 | s | provenance |  |
+| main.rs:219:13:219:22 | source(...) | main.rs:219:9:219:9 | s | provenance |  |
+| main.rs:219:13:219:22 | source(...) | main.rs:219:9:219:9 | s | provenance |  |
+| main.rs:220:14:220:14 | ... | main.rs:220:17:220:42 | if ... {...} else {...} | provenance |  |
+| main.rs:220:14:220:14 | ... | main.rs:220:17:220:42 | if ... {...} else {...} | provenance |  |
+| main.rs:221:9:221:9 | t | main.rs:222:10:222:10 | t | provenance |  |
+| main.rs:221:9:221:9 | t | main.rs:222:10:222:10 | t | provenance |  |
+| main.rs:221:13:221:23 | apply(...) | main.rs:221:9:221:9 | t | provenance |  |
+| main.rs:221:13:221:23 | apply(...) | main.rs:221:9:221:9 | t | provenance |  |
+| main.rs:221:19:221:19 | s | main.rs:220:14:220:14 | ... | provenance | MaD:28 |
+| main.rs:221:19:221:19 | s | main.rs:220:14:220:14 | ... | provenance | MaD:28 |
+| main.rs:221:19:221:19 | s | main.rs:221:13:221:23 | apply(...) | provenance | MaD:28 |
+| main.rs:221:19:221:19 | s | main.rs:221:13:221:23 | apply(...) | provenance | MaD:28 |
+| main.rs:231:9:231:9 | s | main.rs:232:30:232:30 | s | provenance |  |
+| main.rs:231:9:231:9 | s | main.rs:232:30:232:30 | s | provenance |  |
+| main.rs:231:13:231:22 | source(...) | main.rs:231:9:231:9 | s | provenance |  |
+| main.rs:231:13:231:22 | source(...) | main.rs:231:9:231:9 | s | provenance |  |
+| main.rs:232:9:232:9 | t | main.rs:233:10:233:10 | t | provenance |  |
+| main.rs:232:9:232:9 | t | main.rs:233:10:233:10 | t | provenance |  |
+| main.rs:232:13:232:31 | get_async_number(...) [future] | main.rs:232:13:232:37 | await ... | provenance |  |
+| main.rs:232:13:232:31 | get_async_number(...) [future] | main.rs:232:13:232:37 | await ... | provenance |  |
+| main.rs:232:13:232:37 | await ... | main.rs:232:9:232:9 | t | provenance |  |
+| main.rs:232:13:232:37 | await ... | main.rs:232:9:232:9 | t | provenance |  |
+| main.rs:232:30:232:30 | s | main.rs:232:13:232:31 | get_async_number(...) [future] | provenance | MaD:34 |
+| main.rs:232:30:232:30 | s | main.rs:232:13:232:31 | get_async_number(...) [future] | provenance | MaD:34 |
+| main.rs:257:9:257:9 | s [D] | main.rs:258:11:258:11 | s [D] | provenance |  |
+| main.rs:257:9:257:9 | s [D] | main.rs:258:11:258:11 | s [D] | provenance |  |
+| main.rs:257:13:257:27 | enum_source(...) | main.rs:257:9:257:9 | s [D] | provenance | Src:MaD:16  |
+| main.rs:257:13:257:27 | enum_source(...) | main.rs:257:9:257:9 | s [D] | provenance | Src:MaD:16  |
+| main.rs:258:11:258:11 | s [D] | main.rs:260:9:260:37 | ...::D {...} [D] | provenance |  |
+| main.rs:258:11:258:11 | s [D] | main.rs:260:9:260:37 | ...::D {...} [D] | provenance |  |
+| main.rs:260:9:260:37 | ...::D {...} [D] | main.rs:260:35:260:35 | i | provenance |  |
+| main.rs:260:9:260:37 | ...::D {...} [D] | main.rs:260:35:260:35 | i | provenance |  |
+| main.rs:260:35:260:35 | i | main.rs:260:47:260:47 | i | provenance |  |
+| main.rs:260:35:260:35 | i | main.rs:260:47:260:47 | i | provenance |  |
+| main.rs:264:9:264:9 | s [E, Some] | main.rs:265:11:265:11 | s [E, Some] | provenance |  |
+| main.rs:264:9:264:9 | s [E, Some] | main.rs:265:11:265:11 | s [E, Some] | provenance |  |
+| main.rs:264:13:264:34 | enum_source_nested(...) | main.rs:264:9:264:9 | s [E, Some] | provenance | Src:MaD:17  |
+| main.rs:264:13:264:34 | enum_source_nested(...) | main.rs:264:9:264:9 | s [E, Some] | provenance | Src:MaD:17  |
+| main.rs:265:11:265:11 | s [E, Some] | main.rs:268:9:268:37 | ...::E {...} [E, Some] | provenance |  |
+| main.rs:265:11:265:11 | s [E, Some] | main.rs:268:9:268:37 | ...::E {...} [E, Some] | provenance |  |
+| main.rs:268:9:268:37 | ...::E {...} [E, Some] | main.rs:268:35:268:35 | o [Some] | provenance |  |
+| main.rs:268:9:268:37 | ...::E {...} [E, Some] | main.rs:268:35:268:35 | o [Some] | provenance |  |
+| main.rs:268:35:268:35 | o [Some] | main.rs:269:19:269:19 | o [Some] | provenance |  |
+| main.rs:268:35:268:35 | o [Some] | main.rs:269:19:269:19 | o [Some] | provenance |  |
+| main.rs:269:19:269:19 | o [Some] | main.rs:270:17:270:23 | Some(...) [Some] | provenance |  |
+| main.rs:269:19:269:19 | o [Some] | main.rs:270:17:270:23 | Some(...) [Some] | provenance |  |
+| main.rs:270:17:270:23 | Some(...) [Some] | main.rs:270:22:270:22 | i | provenance |  |
+| main.rs:270:17:270:23 | Some(...) [Some] | main.rs:270:22:270:22 | i | provenance |  |
+| main.rs:270:22:270:22 | i | main.rs:270:33:270:33 | i | provenance |  |
+| main.rs:270:22:270:22 | i | main.rs:270:33:270:33 | i | provenance |  |
+| main.rs:279:9:279:9 | s [C] | main.rs:280:11:280:11 | s [C] | provenance |  |
+| main.rs:279:9:279:9 | s [C] | main.rs:280:11:280:11 | s [C] | provenance |  |
+| main.rs:279:13:279:24 | e.source(...) | main.rs:279:9:279:9 | s [C] | provenance | Src:MaD:12  |
+| main.rs:279:13:279:24 | e.source(...) | main.rs:279:9:279:9 | s [C] | provenance | Src:MaD:12  |
+| main.rs:280:11:280:11 | s [C] | main.rs:281:9:281:37 | ...::C {...} [C] | provenance |  |
+| main.rs:280:11:280:11 | s [C] | main.rs:281:9:281:37 | ...::C {...} [C] | provenance |  |
+| main.rs:281:9:281:37 | ...::C {...} [C] | main.rs:281:35:281:35 | i | provenance |  |
+| main.rs:281:9:281:37 | ...::C {...} [C] | main.rs:281:35:281:35 | i | provenance |  |
+| main.rs:281:35:281:35 | i | main.rs:281:47:281:47 | i | provenance |  |
+| main.rs:281:35:281:35 | i | main.rs:281:47:281:47 | i | provenance |  |
+| main.rs:302:18:302:18 | ... | main.rs:302:26:302:26 | a | provenance |  |
+| main.rs:302:18:302:18 | ... | main.rs:302:26:302:26 | a | provenance |  |
+| main.rs:303:24:303:24 | a | main.rs:302:18:302:18 | ... | provenance | Src:MaD:21  |
+| main.rs:303:24:303:24 | a | main.rs:302:18:302:18 | ... | provenance | Src:MaD:21  |
+| main.rs:305:24:307:9 | \|...\| ... | main.rs:305:25:305:25 | ... | provenance | Src:MaD:21  |
+| main.rs:305:24:307:9 | \|...\| ... | main.rs:305:25:305:25 | ... | provenance | Src:MaD:21  |
+| main.rs:305:25:305:25 | ... | main.rs:306:18:306:18 | a | provenance |  |
+| main.rs:305:25:305:25 | ... | main.rs:306:18:306:18 | a | provenance |  |
+| main.rs:309:14:309:19 | ...: i64 | main.rs:310:18:310:18 | a | provenance |  |
+| main.rs:309:14:309:19 | ...: i64 | main.rs:310:18:310:18 | a | provenance |  |
+| main.rs:312:24:312:24 | f | main.rs:309:14:309:19 | ...: i64 | provenance | Src:MaD:21  |
+| main.rs:312:24:312:24 | f | main.rs:309:14:309:19 | ...: i64 | provenance | Src:MaD:21  |
+| main.rs:314:24:316:9 | \|...\| ... | main.rs:314:36:314:36 | ... | provenance | Src:MaD:21  |
+| main.rs:314:24:316:9 | \|...\| ... | main.rs:314:36:314:36 | ... | provenance | Src:MaD:21  |
+| main.rs:314:36:314:36 | ... | main.rs:315:18:315:18 | a | provenance |  |
+| main.rs:314:36:314:36 | ... | main.rs:315:18:315:18 | a | provenance |  |
+| main.rs:318:31:329:9 | \|...\| ... | main.rs:318:31:329:9 | \|...\| ... [E, Some] | provenance | Src:MaD:22  |
+| main.rs:318:31:329:9 | \|...\| ... | main.rs:318:31:329:9 | \|...\| ... [E, Some] | provenance | Src:MaD:22  |
+| main.rs:318:31:329:9 | \|...\| ... [E, Some] | main.rs:318:32:318:32 | ... [E, Some] | provenance |  |
+| main.rs:318:31:329:9 | \|...\| ... [E, Some] | main.rs:318:32:318:32 | ... [E, Some] | provenance |  |
+| main.rs:318:32:318:32 | ... [E, Some] | main.rs:319:19:319:19 | e [E, Some] | provenance |  |
+| main.rs:318:32:318:32 | ... [E, Some] | main.rs:319:19:319:19 | e [E, Some] | provenance |  |
+| main.rs:319:19:319:19 | e [E, Some] | main.rs:322:17:322:45 | ...::E {...} [E, Some] | provenance |  |
+| main.rs:319:19:319:19 | e [E, Some] | main.rs:322:17:322:45 | ...::E {...} [E, Some] | provenance |  |
+| main.rs:322:17:322:45 | ...::E {...} [E, Some] | main.rs:322:43:322:43 | o [Some] | provenance |  |
+| main.rs:322:17:322:45 | ...::E {...} [E, Some] | main.rs:322:43:322:43 | o [Some] | provenance |  |
+| main.rs:322:43:322:43 | o [Some] | main.rs:323:27:323:27 | o [Some] | provenance |  |
+| main.rs:322:43:322:43 | o [Some] | main.rs:323:27:323:27 | o [Some] | provenance |  |
+| main.rs:323:27:323:27 | o [Some] | main.rs:324:25:324:31 | Some(...) [Some] | provenance |  |
+| main.rs:323:27:323:27 | o [Some] | main.rs:324:25:324:31 | Some(...) [Some] | provenance |  |
+| main.rs:324:25:324:31 | Some(...) [Some] | main.rs:324:30:324:30 | i | provenance |  |
+| main.rs:324:25:324:31 | Some(...) [Some] | main.rs:324:30:324:30 | i | provenance |  |
+| main.rs:324:30:324:30 | i | main.rs:324:41:324:41 | i | provenance |  |
+| main.rs:324:30:324:30 | i | main.rs:324:41:324:41 | i | provenance |  |
+| main.rs:344:21:344:29 | source(...) | main.rs:345:19:345:19 | a | provenance | Sink:MaD:9 |
+| main.rs:344:21:344:29 | source(...) | main.rs:345:19:345:19 | a | provenance | Sink:MaD:9 |
+| main.rs:347:22:352:9 | { ... } [E, Some] | main.rs:353:26:353:26 | b [E, Some] | provenance |  |
+| main.rs:347:22:352:9 | { ... } [E, Some] | main.rs:353:26:353:26 | b [E, Some] | provenance |  |
+| main.rs:348:17:348:17 | s | main.rs:350:39:350:39 | s | provenance |  |
+| main.rs:348:17:348:17 | s | main.rs:350:39:350:39 | s | provenance |  |
+| main.rs:348:21:348:29 | source(...) | main.rs:348:17:348:17 | s | provenance |  |
+| main.rs:348:21:348:29 | source(...) | main.rs:348:17:348:17 | s | provenance |  |
+| main.rs:349:13:351:13 | ...::E {...} [E, Some] | main.rs:347:22:352:9 | { ... } [E, Some] | provenance |  |
+| main.rs:349:13:351:13 | ...::E {...} [E, Some] | main.rs:347:22:352:9 | { ... } [E, Some] | provenance |  |
+| main.rs:350:26:350:40 | ...::Some(...) [Some] | main.rs:349:13:351:13 | ...::E {...} [E, Some] | provenance |  |
+| main.rs:350:26:350:40 | ...::Some(...) [Some] | main.rs:349:13:351:13 | ...::E {...} [E, Some] | provenance |  |
+| main.rs:350:39:350:39 | s | main.rs:350:26:350:40 | ...::Some(...) [Some] | provenance |  |
+| main.rs:350:39:350:39 | s | main.rs:350:26:350:40 | ...::Some(...) [Some] | provenance |  |
+| main.rs:353:26:353:26 | b [E, Some] | main.rs:353:26:353:26 | b | provenance | Sink:MaD:10 |
+| main.rs:353:26:353:26 | b [E, Some] | main.rs:353:26:353:26 | b | provenance | Sink:MaD:10 |
+| main.rs:364:9:364:9 | s | main.rs:365:41:365:41 | s | provenance |  |
+| main.rs:364:9:364:9 | s | main.rs:365:41:365:41 | s | provenance |  |
+| main.rs:364:9:364:9 | s | main.rs:368:53:368:53 | s | provenance |  |
+| main.rs:364:9:364:9 | s | main.rs:368:53:368:53 | s | provenance |  |
+| main.rs:364:13:364:22 | source(...) | main.rs:364:9:364:9 | s | provenance |  |
+| main.rs:364:13:364:22 | source(...) | main.rs:364:9:364:9 | s | provenance |  |
+| main.rs:365:15:365:43 | ...::C {...} [C] | main.rs:365:15:365:43 | ...::C {...} | provenance | Sink:MaD:4 |
+| main.rs:365:15:365:43 | ...::C {...} [C] | main.rs:365:15:365:43 | ...::C {...} | provenance | Sink:MaD:4 |
+| main.rs:365:41:365:41 | s | main.rs:365:15:365:43 | ...::C {...} [C] | provenance |  |
+| main.rs:365:41:365:41 | s | main.rs:365:15:365:43 | ...::C {...} [C] | provenance |  |
+| main.rs:368:22:368:56 | ...::E {...} [E, Some] | main.rs:368:22:368:56 | ...::E {...} | provenance | Sink:MaD:5 |
+| main.rs:368:22:368:56 | ...::E {...} [E, Some] | main.rs:368:22:368:56 | ...::E {...} | provenance | Sink:MaD:5 |
+| main.rs:368:48:368:54 | Some(...) [Some] | main.rs:368:22:368:56 | ...::E {...} [E, Some] | provenance |  |
+| main.rs:368:48:368:54 | Some(...) [Some] | main.rs:368:22:368:56 | ...::E {...} [E, Some] | provenance |  |
+| main.rs:368:53:368:53 | s | main.rs:368:48:368:54 | Some(...) [Some] | provenance |  |
+| main.rs:368:53:368:53 | s | main.rs:368:48:368:54 | Some(...) [Some] | provenance |  |
+| main.rs:372:9:372:9 | s | main.rs:373:39:373:39 | s | provenance |  |
+| main.rs:372:9:372:9 | s | main.rs:373:39:373:39 | s | provenance |  |
+| main.rs:372:13:372:22 | source(...) | main.rs:372:9:372:9 | s | provenance |  |
+| main.rs:372:13:372:22 | source(...) | main.rs:372:9:372:9 | s | provenance |  |
+| main.rs:373:9:373:9 | e [D] | main.rs:374:5:374:5 | e | provenance | Sink:MaD:2 |
+| main.rs:373:9:373:9 | e [D] | main.rs:374:5:374:5 | e | provenance | Sink:MaD:2 |
+| main.rs:373:13:373:41 | ...::D {...} [D] | main.rs:373:9:373:9 | e [D] | provenance |  |
+| main.rs:373:13:373:41 | ...::D {...} [D] | main.rs:373:9:373:9 | e [D] | provenance |  |
+| main.rs:373:39:373:39 | s | main.rs:373:13:373:41 | ...::D {...} [D] | provenance |  |
+| main.rs:373:39:373:39 | s | main.rs:373:13:373:41 | ...::D {...} [D] | provenance |  |
+| main.rs:383:9:383:9 | s | main.rs:384:10:384:10 | s | provenance |  |
+| main.rs:383:9:383:9 | s | main.rs:384:10:384:10 | s | provenance |  |
+| main.rs:383:13:383:29 | simple_source(...) | main.rs:383:9:383:9 | s | provenance | Src:MaD:20  |
+| main.rs:383:13:383:29 | simple_source(...) | main.rs:383:9:383:9 | s | provenance | Src:MaD:20  |
+| main.rs:391:9:391:9 | s | main.rs:392:17:392:17 | s | provenance | Sink:MaD:8 |
+| main.rs:391:9:391:9 | s | main.rs:392:17:392:17 | s | provenance | Sink:MaD:8 |
+| main.rs:391:13:391:22 | source(...) | main.rs:391:9:391:9 | s | provenance |  |
+| main.rs:391:13:391:22 | source(...) | main.rs:391:9:391:9 | s | provenance |  |
+| main.rs:400:16:400:16 | i | main.rs:401:10:401:10 | i | provenance | Src:MaD:15  |
+| main.rs:400:16:400:16 | i | main.rs:401:10:401:10 | i | provenance | Src:MaD:15  |
+| main.rs:410:26:410:31 | ...: i64 | main.rs:411:14:411:14 | i | provenance | Src:MaD:13  |
+| main.rs:410:26:410:31 | ...: i64 | main.rs:411:14:411:14 | i | provenance | Src:MaD:13  |
+| main.rs:495:9:495:10 | x1 | main.rs:496:10:496:11 | x1 | provenance |  |
+| main.rs:495:9:495:10 | x1 | main.rs:496:10:496:11 | x1 | provenance |  |
+| main.rs:495:14:495:23 | source(...) | main.rs:495:14:495:30 | ... .max(...) | provenance | MaD:24 |
+| main.rs:495:14:495:23 | source(...) | main.rs:495:14:495:30 | ... .max(...) | provenance | MaD:24 |
+| main.rs:495:14:495:30 | ... .max(...) | main.rs:495:9:495:10 | x1 | provenance |  |
+| main.rs:495:14:495:30 | ... .max(...) | main.rs:495:9:495:10 | x1 | provenance |  |
+| main.rs:498:9:498:10 | x2 [MyStruct.field1] | main.rs:506:10:506:11 | x2 [MyStruct.field1] | provenance |  |
+| main.rs:498:9:498:10 | x2 [MyStruct.field1] | main.rs:506:10:506:11 | x2 [MyStruct.field1] | provenance |  |
+| main.rs:498:14:505:6 | ... .max(...) [MyStruct.field1] | main.rs:498:9:498:10 | x2 [MyStruct.field1] | provenance |  |
+| main.rs:498:14:505:6 | ... .max(...) [MyStruct.field1] | main.rs:498:9:498:10 | x2 [MyStruct.field1] | provenance |  |
+| main.rs:498:15:501:5 | MyStruct {...} [MyStruct.field1] | main.rs:498:14:505:6 | ... .max(...) [MyStruct.field1] | provenance | MaD:24 |
+| main.rs:498:15:501:5 | MyStruct {...} [MyStruct.field1] | main.rs:498:14:505:6 | ... .max(...) [MyStruct.field1] | provenance | MaD:24 |
+| main.rs:499:17:499:26 | source(...) | main.rs:498:15:501:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
+| main.rs:499:17:499:26 | source(...) | main.rs:498:15:501:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
+| main.rs:506:10:506:11 | x2 [MyStruct.field1] | main.rs:506:10:506:18 | x2.field1 | provenance |  |
+| main.rs:506:10:506:11 | x2 [MyStruct.field1] | main.rs:506:10:506:18 | x2.field1 | provenance |  |
+| main.rs:511:9:511:10 | x4 | main.rs:512:10:512:11 | x4 | provenance |  |
+| main.rs:511:9:511:10 | x4 | main.rs:512:10:512:11 | x4 | provenance |  |
+| main.rs:511:14:511:23 | source(...) | main.rs:511:14:511:30 | ... .max(...) | provenance | MaD:24 |
+| main.rs:511:14:511:23 | source(...) | main.rs:511:14:511:30 | ... .max(...) | provenance | MaD:24 |
+| main.rs:511:14:511:30 | ... .max(...) | main.rs:511:9:511:10 | x4 | provenance |  |
+| main.rs:511:14:511:30 | ... .max(...) | main.rs:511:9:511:10 | x4 | provenance |  |
+| main.rs:514:9:514:10 | x5 | main.rs:515:10:515:11 | x5 | provenance |  |
+| main.rs:514:14:514:23 | source(...) | main.rs:514:14:514:30 | ... .lt(...) | provenance | MaD:25 |
+| main.rs:514:14:514:30 | ... .lt(...) | main.rs:514:9:514:10 | x5 | provenance |  |
+| main.rs:517:9:517:10 | x6 | main.rs:518:10:518:11 | x6 | provenance |  |
+| main.rs:517:14:517:23 | source(...) | main.rs:517:14:517:27 | ... < ... | provenance | MaD:25 |
+| main.rs:517:14:517:27 | ... < ... | main.rs:517:9:517:10 | x6 | provenance |  |
+| main.rs:523:9:523:10 | x8 | main.rs:524:10:524:11 | x8 | provenance |  |
+| main.rs:523:9:523:10 | x8 | main.rs:524:10:524:11 | x8 | provenance |  |
+| main.rs:523:14:523:44 | ...::flow_through2(...) | main.rs:523:9:523:10 | x8 | provenance |  |
+| main.rs:523:14:523:44 | ...::flow_through2(...) | main.rs:523:9:523:10 | x8 | provenance |  |
+| main.rs:523:34:523:43 | source(...) | main.rs:523:14:523:44 | ...::flow_through2(...) | provenance | MaD:27 |
+| main.rs:523:34:523:43 | source(...) | main.rs:523:14:523:44 | ...::flow_through2(...) | provenance | MaD:27 |
+| main.rs:526:9:526:10 | x9 | main.rs:527:10:527:11 | x9 | provenance |  |
+| main.rs:526:9:526:10 | x9 | main.rs:527:10:527:11 | x9 | provenance |  |
+| main.rs:526:14:526:44 | ...::flow_through3(...) | main.rs:526:9:526:10 | x9 | provenance |  |
+| main.rs:526:14:526:44 | ...::flow_through3(...) | main.rs:526:9:526:10 | x9 | provenance |  |
+| main.rs:526:34:526:43 | source(...) | main.rs:526:14:526:44 | ...::flow_through3(...) | provenance | MaD:23 |
+| main.rs:526:34:526:43 | source(...) | main.rs:526:14:526:44 | ...::flow_through3(...) | provenance | MaD:23 |
+| main.rs:529:9:529:11 | x10 | main.rs:530:10:530:12 | x10 | provenance |  |
+| main.rs:529:9:529:11 | x10 | main.rs:530:10:530:12 | x10 | provenance |  |
+| main.rs:529:15:529:32 | ...::produce2(...) | main.rs:529:9:529:11 | x10 | provenance | Src:MaD:14  |
+| main.rs:529:15:529:32 | ...::produce2(...) | main.rs:529:9:529:11 | x10 | provenance | Src:MaD:14  |
+| main.rs:532:9:532:11 | x11 | main.rs:533:10:533:12 | x11 | provenance |  |
+| main.rs:532:9:532:11 | x11 | main.rs:533:10:533:12 | x11 | provenance |  |
+| main.rs:532:15:532:32 | ...::produce3(...) | main.rs:532:9:532:11 | x11 | provenance | Src:MaD:11  |
+| main.rs:532:15:532:32 | ...::produce3(...) | main.rs:532:9:532:11 | x11 | provenance | Src:MaD:11  |
+| main.rs:535:20:535:29 | source(...) | main.rs:535:20:535:29 | source(...) | provenance | Sink:MaD:3 |
+| main.rs:535:20:535:29 | source(...) | main.rs:535:20:535:29 | source(...) | provenance | Sink:MaD:3 |
+| main.rs:537:20:537:29 | source(...) | main.rs:537:20:537:29 | source(...) | provenance | Sink:MaD:1 |
+| main.rs:537:20:537:29 | source(...) | main.rs:537:20:537:29 | source(...) | provenance | Sink:MaD:1 |
+| main.rs:549:10:549:28 | generated_source(...) | main.rs:549:10:549:28 | generated_source(...) | provenance | Src:MaD:18  |
+| main.rs:549:10:549:28 | generated_source(...) | main.rs:549:10:549:28 | generated_source(...) | provenance | Src:MaD:18  |
+| main.rs:551:10:551:33 | neutral_manual_source(...) | main.rs:551:10:551:33 | neutral_manual_source(...) | provenance | Src:MaD:19  |
+| main.rs:551:10:551:33 | neutral_manual_source(...) | main.rs:551:10:551:33 | neutral_manual_source(...) | provenance | Src:MaD:19  |
+| main.rs:552:20:552:28 | source(...) | main.rs:552:20:552:28 | source(...) | provenance | Sink:MaD:6 |
+| main.rs:552:20:552:28 | source(...) | main.rs:552:20:552:28 | source(...) | provenance | Sink:MaD:6 |
+| main.rs:554:25:554:33 | source(...) | main.rs:554:25:554:33 | source(...) | provenance | Sink:MaD:7 |
+| main.rs:554:25:554:33 | source(...) | main.rs:554:25:554:33 | source(...) | provenance | Sink:MaD:7 |
+| main.rs:555:28:555:36 | source(...) | main.rs:555:10:555:37 | generated_summary(...) | provenance | MaD:31 |
+| main.rs:555:28:555:36 | source(...) | main.rs:555:10:555:37 | generated_summary(...) | provenance | MaD:31 |
+| main.rs:557:33:557:41 | source(...) | main.rs:557:10:557:42 | neutral_manual_summary(...) | provenance | MaD:32 |
+| main.rs:557:33:557:41 | source(...) | main.rs:557:10:557:42 | neutral_manual_summary(...) | provenance | MaD:32 |
 nodes
 | main.rs:15:9:15:9 | s | semmle.label | s |
 | main.rs:15:9:15:9 | s | semmle.label | s |
@@ -390,335 +476,431 @@ nodes
 | main.rs:71:22:71:22 | i | semmle.label | i |
 | main.rs:71:33:71:33 | i | semmle.label | i |
 | main.rs:71:33:71:33 | i | semmle.label | i |
-| main.rs:86:9:86:9 | s | semmle.label | s |
-| main.rs:86:9:86:9 | s | semmle.label | s |
-| main.rs:86:13:86:21 | source(...) | semmle.label | source(...) |
-| main.rs:86:13:86:21 | source(...) | semmle.label | source(...) |
-| main.rs:87:9:87:10 | e1 [C] | semmle.label | e1 [C] |
-| main.rs:87:9:87:10 | e1 [C] | semmle.label | e1 [C] |
-| main.rs:87:14:87:42 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
-| main.rs:87:14:87:42 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
-| main.rs:87:40:87:40 | s | semmle.label | s |
-| main.rs:87:40:87:40 | s | semmle.label | s |
-| main.rs:88:10:88:26 | get_var_field(...) | semmle.label | get_var_field(...) |
-| main.rs:88:10:88:26 | get_var_field(...) | semmle.label | get_var_field(...) |
-| main.rs:88:24:88:25 | e1 [C] | semmle.label | e1 [C] |
-| main.rs:88:24:88:25 | e1 [C] | semmle.label | e1 [C] |
-| main.rs:99:9:99:9 | s | semmle.label | s |
-| main.rs:99:9:99:9 | s | semmle.label | s |
-| main.rs:99:13:99:21 | source(...) | semmle.label | source(...) |
-| main.rs:99:13:99:21 | source(...) | semmle.label | source(...) |
-| main.rs:100:9:100:10 | e1 [D] | semmle.label | e1 [D] |
-| main.rs:100:9:100:10 | e1 [D] | semmle.label | e1 [D] |
-| main.rs:100:14:100:29 | set_var_field(...) [D] | semmle.label | set_var_field(...) [D] |
-| main.rs:100:14:100:29 | set_var_field(...) [D] | semmle.label | set_var_field(...) [D] |
-| main.rs:100:28:100:28 | s | semmle.label | s |
-| main.rs:100:28:100:28 | s | semmle.label | s |
-| main.rs:101:11:101:12 | e1 [D] | semmle.label | e1 [D] |
-| main.rs:101:11:101:12 | e1 [D] | semmle.label | e1 [D] |
-| main.rs:103:9:103:37 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
-| main.rs:103:9:103:37 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
-| main.rs:103:35:103:35 | i | semmle.label | i |
-| main.rs:103:35:103:35 | i | semmle.label | i |
-| main.rs:103:47:103:47 | i | semmle.label | i |
-| main.rs:103:47:103:47 | i | semmle.label | i |
-| main.rs:118:9:118:9 | s | semmle.label | s |
-| main.rs:118:9:118:9 | s | semmle.label | s |
-| main.rs:118:13:118:21 | source(...) | semmle.label | source(...) |
-| main.rs:118:13:118:21 | source(...) | semmle.label | source(...) |
-| main.rs:119:9:119:17 | my_struct [MyStruct.field1] | semmle.label | my_struct [MyStruct.field1] |
-| main.rs:119:9:119:17 | my_struct [MyStruct.field1] | semmle.label | my_struct [MyStruct.field1] |
-| main.rs:119:21:122:5 | MyStruct {...} [MyStruct.field1] | semmle.label | MyStruct {...} [MyStruct.field1] |
-| main.rs:119:21:122:5 | MyStruct {...} [MyStruct.field1] | semmle.label | MyStruct {...} [MyStruct.field1] |
-| main.rs:120:17:120:17 | s | semmle.label | s |
-| main.rs:120:17:120:17 | s | semmle.label | s |
-| main.rs:123:10:123:36 | get_struct_field(...) | semmle.label | get_struct_field(...) |
-| main.rs:123:10:123:36 | get_struct_field(...) | semmle.label | get_struct_field(...) |
-| main.rs:123:27:123:35 | my_struct [MyStruct.field1] | semmle.label | my_struct [MyStruct.field1] |
-| main.rs:123:27:123:35 | my_struct [MyStruct.field1] | semmle.label | my_struct [MyStruct.field1] |
-| main.rs:140:9:140:9 | s | semmle.label | s |
-| main.rs:140:9:140:9 | s | semmle.label | s |
-| main.rs:140:13:140:21 | source(...) | semmle.label | source(...) |
-| main.rs:140:13:140:21 | source(...) | semmle.label | source(...) |
-| main.rs:141:9:141:17 | my_struct [MyStruct.field2] | semmle.label | my_struct [MyStruct.field2] |
-| main.rs:141:9:141:17 | my_struct [MyStruct.field2] | semmle.label | my_struct [MyStruct.field2] |
-| main.rs:141:21:141:39 | set_struct_field(...) [MyStruct.field2] | semmle.label | set_struct_field(...) [MyStruct.field2] |
-| main.rs:141:21:141:39 | set_struct_field(...) [MyStruct.field2] | semmle.label | set_struct_field(...) [MyStruct.field2] |
-| main.rs:141:38:141:38 | s | semmle.label | s |
-| main.rs:141:38:141:38 | s | semmle.label | s |
-| main.rs:143:10:143:18 | my_struct [MyStruct.field2] | semmle.label | my_struct [MyStruct.field2] |
-| main.rs:143:10:143:18 | my_struct [MyStruct.field2] | semmle.label | my_struct [MyStruct.field2] |
-| main.rs:143:10:143:25 | my_struct.field2 | semmle.label | my_struct.field2 |
-| main.rs:143:10:143:25 | my_struct.field2 | semmle.label | my_struct.field2 |
-| main.rs:152:9:152:9 | s | semmle.label | s |
-| main.rs:152:9:152:9 | s | semmle.label | s |
-| main.rs:152:13:152:21 | source(...) | semmle.label | source(...) |
-| main.rs:152:13:152:21 | source(...) | semmle.label | source(...) |
-| main.rs:153:10:153:31 | get_array_element(...) | semmle.label | get_array_element(...) |
-| main.rs:153:10:153:31 | get_array_element(...) | semmle.label | get_array_element(...) |
-| main.rs:153:28:153:30 | [...] [element] | semmle.label | [...] [element] |
-| main.rs:153:28:153:30 | [...] [element] | semmle.label | [...] [element] |
-| main.rs:153:29:153:29 | s | semmle.label | s |
-| main.rs:153:29:153:29 | s | semmle.label | s |
-| main.rs:162:9:162:9 | s | semmle.label | s |
-| main.rs:162:9:162:9 | s | semmle.label | s |
-| main.rs:162:13:162:21 | source(...) | semmle.label | source(...) |
-| main.rs:162:13:162:21 | source(...) | semmle.label | source(...) |
-| main.rs:163:9:163:11 | arr [element] | semmle.label | arr [element] |
-| main.rs:163:9:163:11 | arr [element] | semmle.label | arr [element] |
-| main.rs:163:15:163:34 | set_array_element(...) [element] | semmle.label | set_array_element(...) [element] |
-| main.rs:163:15:163:34 | set_array_element(...) [element] | semmle.label | set_array_element(...) [element] |
-| main.rs:163:33:163:33 | s | semmle.label | s |
-| main.rs:163:33:163:33 | s | semmle.label | s |
-| main.rs:164:10:164:12 | arr [element] | semmle.label | arr [element] |
-| main.rs:164:10:164:12 | arr [element] | semmle.label | arr [element] |
-| main.rs:164:10:164:15 | arr[0] | semmle.label | arr[0] |
-| main.rs:164:10:164:15 | arr[0] | semmle.label | arr[0] |
-| main.rs:173:9:173:9 | s | semmle.label | s |
-| main.rs:173:9:173:9 | s | semmle.label | s |
-| main.rs:173:13:173:22 | source(...) | semmle.label | source(...) |
-| main.rs:173:13:173:22 | source(...) | semmle.label | source(...) |
-| main.rs:174:9:174:9 | t [tuple.0] | semmle.label | t [tuple.0] |
-| main.rs:174:9:174:9 | t [tuple.0] | semmle.label | t [tuple.0] |
-| main.rs:174:13:174:18 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
-| main.rs:174:13:174:18 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
-| main.rs:174:14:174:14 | s | semmle.label | s |
-| main.rs:174:14:174:14 | s | semmle.label | s |
-| main.rs:175:10:175:29 | get_tuple_element(...) | semmle.label | get_tuple_element(...) |
-| main.rs:175:10:175:29 | get_tuple_element(...) | semmle.label | get_tuple_element(...) |
-| main.rs:175:28:175:28 | t [tuple.0] | semmle.label | t [tuple.0] |
-| main.rs:175:28:175:28 | t [tuple.0] | semmle.label | t [tuple.0] |
-| main.rs:186:9:186:9 | s | semmle.label | s |
-| main.rs:186:9:186:9 | s | semmle.label | s |
-| main.rs:186:13:186:22 | source(...) | semmle.label | source(...) |
-| main.rs:186:13:186:22 | source(...) | semmle.label | source(...) |
-| main.rs:187:9:187:9 | t [tuple.1] | semmle.label | t [tuple.1] |
-| main.rs:187:9:187:9 | t [tuple.1] | semmle.label | t [tuple.1] |
-| main.rs:187:13:187:32 | set_tuple_element(...) [tuple.1] | semmle.label | set_tuple_element(...) [tuple.1] |
-| main.rs:187:13:187:32 | set_tuple_element(...) [tuple.1] | semmle.label | set_tuple_element(...) [tuple.1] |
-| main.rs:187:31:187:31 | s | semmle.label | s |
-| main.rs:187:31:187:31 | s | semmle.label | s |
-| main.rs:189:10:189:10 | t [tuple.1] | semmle.label | t [tuple.1] |
-| main.rs:189:10:189:10 | t [tuple.1] | semmle.label | t [tuple.1] |
-| main.rs:189:10:189:12 | t.1 | semmle.label | t.1 |
-| main.rs:189:10:189:12 | t.1 | semmle.label | t.1 |
-| main.rs:201:9:201:9 | s | semmle.label | s |
-| main.rs:201:9:201:9 | s | semmle.label | s |
-| main.rs:201:13:201:22 | source(...) | semmle.label | source(...) |
-| main.rs:201:13:201:22 | source(...) | semmle.label | source(...) |
-| main.rs:202:14:202:14 | ... | semmle.label | ... |
-| main.rs:202:14:202:14 | ... | semmle.label | ... |
-| main.rs:203:14:203:14 | n | semmle.label | n |
-| main.rs:203:14:203:14 | n | semmle.label | n |
-| main.rs:206:11:206:11 | s | semmle.label | s |
-| main.rs:206:11:206:11 | s | semmle.label | s |
-| main.rs:210:13:210:22 | source(...) | semmle.label | source(...) |
-| main.rs:210:13:210:22 | source(...) | semmle.label | source(...) |
-| main.rs:211:17:211:42 | if ... {...} else {...} | semmle.label | if ... {...} else {...} |
-| main.rs:211:17:211:42 | if ... {...} else {...} | semmle.label | if ... {...} else {...} |
-| main.rs:211:40:211:40 | s | semmle.label | s |
-| main.rs:211:40:211:40 | s | semmle.label | s |
-| main.rs:212:9:212:9 | t | semmle.label | t |
-| main.rs:212:9:212:9 | t | semmle.label | t |
-| main.rs:212:13:212:24 | apply(...) | semmle.label | apply(...) |
-| main.rs:212:13:212:24 | apply(...) | semmle.label | apply(...) |
-| main.rs:212:23:212:23 | f [captured s] | semmle.label | f [captured s] |
-| main.rs:212:23:212:23 | f [captured s] | semmle.label | f [captured s] |
-| main.rs:213:10:213:10 | t | semmle.label | t |
-| main.rs:213:10:213:10 | t | semmle.label | t |
-| main.rs:217:9:217:9 | s | semmle.label | s |
-| main.rs:217:9:217:9 | s | semmle.label | s |
-| main.rs:217:13:217:22 | source(...) | semmle.label | source(...) |
-| main.rs:217:13:217:22 | source(...) | semmle.label | source(...) |
-| main.rs:218:14:218:14 | ... | semmle.label | ... |
-| main.rs:218:14:218:14 | ... | semmle.label | ... |
-| main.rs:218:17:218:42 | if ... {...} else {...} | semmle.label | if ... {...} else {...} |
-| main.rs:218:17:218:42 | if ... {...} else {...} | semmle.label | if ... {...} else {...} |
-| main.rs:219:9:219:9 | t | semmle.label | t |
-| main.rs:219:9:219:9 | t | semmle.label | t |
-| main.rs:219:13:219:23 | apply(...) | semmle.label | apply(...) |
-| main.rs:219:13:219:23 | apply(...) | semmle.label | apply(...) |
-| main.rs:219:19:219:19 | s | semmle.label | s |
-| main.rs:219:19:219:19 | s | semmle.label | s |
-| main.rs:220:10:220:10 | t | semmle.label | t |
-| main.rs:220:10:220:10 | t | semmle.label | t |
-| main.rs:229:9:229:9 | s | semmle.label | s |
-| main.rs:229:9:229:9 | s | semmle.label | s |
-| main.rs:229:13:229:22 | source(...) | semmle.label | source(...) |
-| main.rs:229:13:229:22 | source(...) | semmle.label | source(...) |
-| main.rs:230:9:230:9 | t | semmle.label | t |
-| main.rs:230:9:230:9 | t | semmle.label | t |
-| main.rs:230:13:230:31 | get_async_number(...) [future] | semmle.label | get_async_number(...) [future] |
-| main.rs:230:13:230:31 | get_async_number(...) [future] | semmle.label | get_async_number(...) [future] |
-| main.rs:230:13:230:37 | await ... | semmle.label | await ... |
-| main.rs:230:13:230:37 | await ... | semmle.label | await ... |
-| main.rs:230:30:230:30 | s | semmle.label | s |
-| main.rs:230:30:230:30 | s | semmle.label | s |
-| main.rs:231:10:231:10 | t | semmle.label | t |
-| main.rs:231:10:231:10 | t | semmle.label | t |
-| main.rs:250:9:250:9 | s [D] | semmle.label | s [D] |
-| main.rs:250:9:250:9 | s [D] | semmle.label | s [D] |
-| main.rs:250:13:250:23 | enum_source | semmle.label | enum_source |
-| main.rs:250:13:250:23 | enum_source | semmle.label | enum_source |
-| main.rs:250:13:250:27 | enum_source(...) [D] | semmle.label | enum_source(...) [D] |
-| main.rs:250:13:250:27 | enum_source(...) [D] | semmle.label | enum_source(...) [D] |
-| main.rs:251:11:251:11 | s [D] | semmle.label | s [D] |
-| main.rs:251:11:251:11 | s [D] | semmle.label | s [D] |
-| main.rs:253:9:253:37 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
-| main.rs:253:9:253:37 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
-| main.rs:253:35:253:35 | i | semmle.label | i |
-| main.rs:253:35:253:35 | i | semmle.label | i |
-| main.rs:253:47:253:47 | i | semmle.label | i |
-| main.rs:253:47:253:47 | i | semmle.label | i |
-| main.rs:259:9:259:9 | s [C] | semmle.label | s [C] |
-| main.rs:259:9:259:9 | s [C] | semmle.label | s [C] |
-| main.rs:259:13:259:24 | e.source(...) [C] | semmle.label | e.source(...) [C] |
-| main.rs:259:13:259:24 | e.source(...) [C] | semmle.label | e.source(...) [C] |
-| main.rs:259:15:259:20 | source | semmle.label | source |
-| main.rs:259:15:259:20 | source | semmle.label | source |
-| main.rs:260:11:260:11 | s [C] | semmle.label | s [C] |
-| main.rs:260:11:260:11 | s [C] | semmle.label | s [C] |
-| main.rs:261:9:261:37 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
-| main.rs:261:9:261:37 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
-| main.rs:261:35:261:35 | i | semmle.label | i |
-| main.rs:261:35:261:35 | i | semmle.label | i |
-| main.rs:261:47:261:47 | i | semmle.label | i |
-| main.rs:261:47:261:47 | i | semmle.label | i |
-| main.rs:275:18:275:18 | ... | semmle.label | ... |
-| main.rs:275:18:275:18 | ... | semmle.label | ... |
-| main.rs:275:26:275:26 | a | semmle.label | a |
-| main.rs:275:26:275:26 | a | semmle.label | a |
-| main.rs:276:9:276:19 | pass_source | semmle.label | pass_source |
-| main.rs:276:9:276:19 | pass_source | semmle.label | pass_source |
-| main.rs:278:9:278:19 | pass_source | semmle.label | pass_source |
-| main.rs:278:9:278:19 | pass_source | semmle.label | pass_source |
-| main.rs:278:25:278:25 | ... | semmle.label | ... |
-| main.rs:278:25:278:25 | ... | semmle.label | ... |
-| main.rs:279:18:279:18 | a | semmle.label | a |
-| main.rs:279:18:279:18 | a | semmle.label | a |
-| main.rs:282:14:282:19 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:282:14:282:19 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:283:18:283:18 | a | semmle.label | a |
-| main.rs:283:18:283:18 | a | semmle.label | a |
-| main.rs:285:9:285:19 | pass_source | semmle.label | pass_source |
-| main.rs:285:9:285:19 | pass_source | semmle.label | pass_source |
-| main.rs:287:9:287:19 | pass_source | semmle.label | pass_source |
-| main.rs:287:9:287:19 | pass_source | semmle.label | pass_source |
-| main.rs:287:36:287:36 | ... | semmle.label | ... |
-| main.rs:287:36:287:36 | ... | semmle.label | ... |
-| main.rs:288:18:288:18 | a | semmle.label | a |
-| main.rs:288:18:288:18 | a | semmle.label | a |
-| main.rs:297:9:297:9 | s | semmle.label | s |
-| main.rs:297:9:297:9 | s | semmle.label | s |
-| main.rs:297:13:297:22 | source(...) | semmle.label | source(...) |
-| main.rs:297:13:297:22 | source(...) | semmle.label | source(...) |
-| main.rs:298:5:298:13 | enum_sink | semmle.label | enum_sink |
-| main.rs:298:5:298:13 | enum_sink | semmle.label | enum_sink |
-| main.rs:298:15:298:43 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
-| main.rs:298:15:298:43 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
-| main.rs:298:41:298:41 | s | semmle.label | s |
-| main.rs:298:41:298:41 | s | semmle.label | s |
-| main.rs:303:9:303:9 | s | semmle.label | s |
-| main.rs:303:9:303:9 | s | semmle.label | s |
-| main.rs:303:13:303:22 | source(...) | semmle.label | source(...) |
-| main.rs:303:13:303:22 | source(...) | semmle.label | source(...) |
-| main.rs:304:9:304:9 | e [D] | semmle.label | e [D] |
-| main.rs:304:9:304:9 | e [D] | semmle.label | e [D] |
-| main.rs:304:13:304:41 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
-| main.rs:304:13:304:41 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
-| main.rs:304:39:304:39 | s | semmle.label | s |
-| main.rs:304:39:304:39 | s | semmle.label | s |
-| main.rs:305:5:305:5 | e [D] | semmle.label | e [D] |
-| main.rs:305:5:305:5 | e [D] | semmle.label | e [D] |
-| main.rs:305:7:305:10 | sink | semmle.label | sink |
-| main.rs:305:7:305:10 | sink | semmle.label | sink |
-| main.rs:314:9:314:9 | s | semmle.label | s |
-| main.rs:314:9:314:9 | s | semmle.label | s |
-| main.rs:314:13:314:25 | simple_source | semmle.label | simple_source |
-| main.rs:314:13:314:25 | simple_source | semmle.label | simple_source |
-| main.rs:314:13:314:29 | simple_source(...) | semmle.label | simple_source(...) |
-| main.rs:314:13:314:29 | simple_source(...) | semmle.label | simple_source(...) |
-| main.rs:315:10:315:10 | s | semmle.label | s |
-| main.rs:315:10:315:10 | s | semmle.label | s |
-| main.rs:322:9:322:9 | s | semmle.label | s |
-| main.rs:322:9:322:9 | s | semmle.label | s |
-| main.rs:322:13:322:22 | source(...) | semmle.label | source(...) |
-| main.rs:322:13:322:22 | source(...) | semmle.label | source(...) |
-| main.rs:323:5:323:15 | simple_sink | semmle.label | simple_sink |
-| main.rs:323:5:323:15 | simple_sink | semmle.label | simple_sink |
-| main.rs:323:17:323:17 | s | semmle.label | s |
-| main.rs:323:17:323:17 | s | semmle.label | s |
-| main.rs:331:5:331:14 | arg_source | semmle.label | arg_source |
-| main.rs:331:5:331:14 | arg_source | semmle.label | arg_source |
-| main.rs:331:16:331:16 | [post] i | semmle.label | [post] i |
-| main.rs:331:16:331:16 | [post] i | semmle.label | [post] i |
-| main.rs:332:10:332:10 | i | semmle.label | i |
-| main.rs:332:10:332:10 | i | semmle.label | i |
-| main.rs:384:9:384:10 | x1 | semmle.label | x1 |
-| main.rs:384:9:384:10 | x1 | semmle.label | x1 |
-| main.rs:384:14:384:23 | source(...) | semmle.label | source(...) |
-| main.rs:384:14:384:23 | source(...) | semmle.label | source(...) |
-| main.rs:384:14:384:30 | ... .max(...) | semmle.label | ... .max(...) |
-| main.rs:384:14:384:30 | ... .max(...) | semmle.label | ... .max(...) |
-| main.rs:385:10:385:11 | x1 | semmle.label | x1 |
-| main.rs:385:10:385:11 | x1 | semmle.label | x1 |
-| main.rs:387:9:387:10 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
-| main.rs:387:9:387:10 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
-| main.rs:387:14:394:6 | ... .max(...) [MyStruct.field1] | semmle.label | ... .max(...) [MyStruct.field1] |
-| main.rs:387:14:394:6 | ... .max(...) [MyStruct.field1] | semmle.label | ... .max(...) [MyStruct.field1] |
-| main.rs:387:15:390:5 | MyStruct {...} [MyStruct.field1] | semmle.label | MyStruct {...} [MyStruct.field1] |
-| main.rs:387:15:390:5 | MyStruct {...} [MyStruct.field1] | semmle.label | MyStruct {...} [MyStruct.field1] |
-| main.rs:388:17:388:26 | source(...) | semmle.label | source(...) |
-| main.rs:388:17:388:26 | source(...) | semmle.label | source(...) |
-| main.rs:395:10:395:11 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
-| main.rs:395:10:395:11 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
-| main.rs:395:10:395:18 | x2.field1 | semmle.label | x2.field1 |
-| main.rs:395:10:395:18 | x2.field1 | semmle.label | x2.field1 |
-| main.rs:400:9:400:10 | x4 | semmle.label | x4 |
-| main.rs:400:9:400:10 | x4 | semmle.label | x4 |
-| main.rs:400:14:400:23 | source(...) | semmle.label | source(...) |
-| main.rs:400:14:400:23 | source(...) | semmle.label | source(...) |
-| main.rs:400:14:400:30 | ... .max(...) | semmle.label | ... .max(...) |
-| main.rs:400:14:400:30 | ... .max(...) | semmle.label | ... .max(...) |
-| main.rs:401:10:401:11 | x4 | semmle.label | x4 |
-| main.rs:401:10:401:11 | x4 | semmle.label | x4 |
-| main.rs:403:9:403:10 | x5 | semmle.label | x5 |
-| main.rs:403:14:403:23 | source(...) | semmle.label | source(...) |
-| main.rs:403:14:403:30 | ... .lt(...) | semmle.label | ... .lt(...) |
-| main.rs:404:10:404:11 | x5 | semmle.label | x5 |
-| main.rs:406:9:406:10 | x6 | semmle.label | x6 |
-| main.rs:406:14:406:23 | source(...) | semmle.label | source(...) |
-| main.rs:406:14:406:27 | ... < ... | semmle.label | ... < ... |
-| main.rs:407:10:407:11 | x6 | semmle.label | x6 |
-| main.rs:422:10:422:25 | generated_source | semmle.label | generated_source |
-| main.rs:422:10:422:25 | generated_source | semmle.label | generated_source |
-| main.rs:422:10:422:28 | generated_source(...) | semmle.label | generated_source(...) |
-| main.rs:422:10:422:28 | generated_source(...) | semmle.label | generated_source(...) |
-| main.rs:424:10:424:30 | neutral_manual_source | semmle.label | neutral_manual_source |
-| main.rs:424:10:424:30 | neutral_manual_source | semmle.label | neutral_manual_source |
-| main.rs:424:10:424:33 | neutral_manual_source(...) | semmle.label | neutral_manual_source(...) |
-| main.rs:424:10:424:33 | neutral_manual_source(...) | semmle.label | neutral_manual_source(...) |
-| main.rs:425:5:425:18 | generated_sink | semmle.label | generated_sink |
-| main.rs:425:5:425:18 | generated_sink | semmle.label | generated_sink |
-| main.rs:425:20:425:28 | source(...) | semmle.label | source(...) |
-| main.rs:425:20:425:28 | source(...) | semmle.label | source(...) |
-| main.rs:427:5:427:23 | neutral_manual_sink | semmle.label | neutral_manual_sink |
-| main.rs:427:5:427:23 | neutral_manual_sink | semmle.label | neutral_manual_sink |
-| main.rs:427:25:427:33 | source(...) | semmle.label | source(...) |
-| main.rs:427:25:427:33 | source(...) | semmle.label | source(...) |
-| main.rs:428:10:428:37 | generated_summary(...) | semmle.label | generated_summary(...) |
-| main.rs:428:10:428:37 | generated_summary(...) | semmle.label | generated_summary(...) |
-| main.rs:428:28:428:36 | source(...) | semmle.label | source(...) |
-| main.rs:428:28:428:36 | source(...) | semmle.label | source(...) |
-| main.rs:430:10:430:42 | neutral_manual_summary(...) | semmle.label | neutral_manual_summary(...) |
-| main.rs:430:10:430:42 | neutral_manual_summary(...) | semmle.label | neutral_manual_summary(...) |
-| main.rs:430:33:430:41 | source(...) | semmle.label | source(...) |
-| main.rs:430:33:430:41 | source(...) | semmle.label | source(...) |
+| main.rs:87:9:87:9 | s | semmle.label | s |
+| main.rs:87:9:87:9 | s | semmle.label | s |
+| main.rs:87:13:87:21 | source(...) | semmle.label | source(...) |
+| main.rs:87:13:87:21 | source(...) | semmle.label | source(...) |
+| main.rs:88:9:88:10 | e1 [C] | semmle.label | e1 [C] |
+| main.rs:88:9:88:10 | e1 [C] | semmle.label | e1 [C] |
+| main.rs:88:14:88:42 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:88:14:88:42 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:88:40:88:40 | s | semmle.label | s |
+| main.rs:88:40:88:40 | s | semmle.label | s |
+| main.rs:89:10:89:26 | get_var_field(...) | semmle.label | get_var_field(...) |
+| main.rs:89:10:89:26 | get_var_field(...) | semmle.label | get_var_field(...) |
+| main.rs:89:24:89:25 | e1 [C] | semmle.label | e1 [C] |
+| main.rs:89:24:89:25 | e1 [C] | semmle.label | e1 [C] |
+| main.rs:100:9:100:9 | s | semmle.label | s |
+| main.rs:100:9:100:9 | s | semmle.label | s |
+| main.rs:100:13:100:21 | source(...) | semmle.label | source(...) |
+| main.rs:100:13:100:21 | source(...) | semmle.label | source(...) |
+| main.rs:101:9:101:10 | e1 [D] | semmle.label | e1 [D] |
+| main.rs:101:9:101:10 | e1 [D] | semmle.label | e1 [D] |
+| main.rs:101:14:101:29 | set_var_field(...) [D] | semmle.label | set_var_field(...) [D] |
+| main.rs:101:14:101:29 | set_var_field(...) [D] | semmle.label | set_var_field(...) [D] |
+| main.rs:101:28:101:28 | s | semmle.label | s |
+| main.rs:101:28:101:28 | s | semmle.label | s |
+| main.rs:102:11:102:12 | e1 [D] | semmle.label | e1 [D] |
+| main.rs:102:11:102:12 | e1 [D] | semmle.label | e1 [D] |
+| main.rs:104:9:104:37 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
+| main.rs:104:9:104:37 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
+| main.rs:104:35:104:35 | i | semmle.label | i |
+| main.rs:104:35:104:35 | i | semmle.label | i |
+| main.rs:104:47:104:47 | i | semmle.label | i |
+| main.rs:104:47:104:47 | i | semmle.label | i |
+| main.rs:120:9:120:9 | s | semmle.label | s |
+| main.rs:120:9:120:9 | s | semmle.label | s |
+| main.rs:120:13:120:21 | source(...) | semmle.label | source(...) |
+| main.rs:120:13:120:21 | source(...) | semmle.label | source(...) |
+| main.rs:121:9:121:17 | my_struct [MyStruct.field1] | semmle.label | my_struct [MyStruct.field1] |
+| main.rs:121:9:121:17 | my_struct [MyStruct.field1] | semmle.label | my_struct [MyStruct.field1] |
+| main.rs:121:21:124:5 | MyStruct {...} [MyStruct.field1] | semmle.label | MyStruct {...} [MyStruct.field1] |
+| main.rs:121:21:124:5 | MyStruct {...} [MyStruct.field1] | semmle.label | MyStruct {...} [MyStruct.field1] |
+| main.rs:122:17:122:17 | s | semmle.label | s |
+| main.rs:122:17:122:17 | s | semmle.label | s |
+| main.rs:125:10:125:36 | get_struct_field(...) | semmle.label | get_struct_field(...) |
+| main.rs:125:10:125:36 | get_struct_field(...) | semmle.label | get_struct_field(...) |
+| main.rs:125:27:125:35 | my_struct [MyStruct.field1] | semmle.label | my_struct [MyStruct.field1] |
+| main.rs:125:27:125:35 | my_struct [MyStruct.field1] | semmle.label | my_struct [MyStruct.field1] |
+| main.rs:142:9:142:9 | s | semmle.label | s |
+| main.rs:142:9:142:9 | s | semmle.label | s |
+| main.rs:142:13:142:21 | source(...) | semmle.label | source(...) |
+| main.rs:142:13:142:21 | source(...) | semmle.label | source(...) |
+| main.rs:143:9:143:17 | my_struct [MyStruct.field2] | semmle.label | my_struct [MyStruct.field2] |
+| main.rs:143:9:143:17 | my_struct [MyStruct.field2] | semmle.label | my_struct [MyStruct.field2] |
+| main.rs:143:21:143:39 | set_struct_field(...) [MyStruct.field2] | semmle.label | set_struct_field(...) [MyStruct.field2] |
+| main.rs:143:21:143:39 | set_struct_field(...) [MyStruct.field2] | semmle.label | set_struct_field(...) [MyStruct.field2] |
+| main.rs:143:38:143:38 | s | semmle.label | s |
+| main.rs:143:38:143:38 | s | semmle.label | s |
+| main.rs:145:10:145:18 | my_struct [MyStruct.field2] | semmle.label | my_struct [MyStruct.field2] |
+| main.rs:145:10:145:18 | my_struct [MyStruct.field2] | semmle.label | my_struct [MyStruct.field2] |
+| main.rs:145:10:145:25 | my_struct.field2 | semmle.label | my_struct.field2 |
+| main.rs:145:10:145:25 | my_struct.field2 | semmle.label | my_struct.field2 |
+| main.rs:154:9:154:9 | s | semmle.label | s |
+| main.rs:154:9:154:9 | s | semmle.label | s |
+| main.rs:154:13:154:21 | source(...) | semmle.label | source(...) |
+| main.rs:154:13:154:21 | source(...) | semmle.label | source(...) |
+| main.rs:155:10:155:31 | get_array_element(...) | semmle.label | get_array_element(...) |
+| main.rs:155:10:155:31 | get_array_element(...) | semmle.label | get_array_element(...) |
+| main.rs:155:28:155:30 | [...] [element] | semmle.label | [...] [element] |
+| main.rs:155:28:155:30 | [...] [element] | semmle.label | [...] [element] |
+| main.rs:155:29:155:29 | s | semmle.label | s |
+| main.rs:155:29:155:29 | s | semmle.label | s |
+| main.rs:164:9:164:9 | s | semmle.label | s |
+| main.rs:164:9:164:9 | s | semmle.label | s |
+| main.rs:164:13:164:21 | source(...) | semmle.label | source(...) |
+| main.rs:164:13:164:21 | source(...) | semmle.label | source(...) |
+| main.rs:165:9:165:11 | arr [element] | semmle.label | arr [element] |
+| main.rs:165:9:165:11 | arr [element] | semmle.label | arr [element] |
+| main.rs:165:15:165:34 | set_array_element(...) [element] | semmle.label | set_array_element(...) [element] |
+| main.rs:165:15:165:34 | set_array_element(...) [element] | semmle.label | set_array_element(...) [element] |
+| main.rs:165:33:165:33 | s | semmle.label | s |
+| main.rs:165:33:165:33 | s | semmle.label | s |
+| main.rs:166:10:166:12 | arr [element] | semmle.label | arr [element] |
+| main.rs:166:10:166:12 | arr [element] | semmle.label | arr [element] |
+| main.rs:166:10:166:15 | arr[0] | semmle.label | arr[0] |
+| main.rs:166:10:166:15 | arr[0] | semmle.label | arr[0] |
+| main.rs:175:9:175:9 | s | semmle.label | s |
+| main.rs:175:9:175:9 | s | semmle.label | s |
+| main.rs:175:13:175:22 | source(...) | semmle.label | source(...) |
+| main.rs:175:13:175:22 | source(...) | semmle.label | source(...) |
+| main.rs:176:9:176:9 | t [tuple.0] | semmle.label | t [tuple.0] |
+| main.rs:176:9:176:9 | t [tuple.0] | semmle.label | t [tuple.0] |
+| main.rs:176:13:176:18 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
+| main.rs:176:13:176:18 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
+| main.rs:176:14:176:14 | s | semmle.label | s |
+| main.rs:176:14:176:14 | s | semmle.label | s |
+| main.rs:177:10:177:29 | get_tuple_element(...) | semmle.label | get_tuple_element(...) |
+| main.rs:177:10:177:29 | get_tuple_element(...) | semmle.label | get_tuple_element(...) |
+| main.rs:177:28:177:28 | t [tuple.0] | semmle.label | t [tuple.0] |
+| main.rs:177:28:177:28 | t [tuple.0] | semmle.label | t [tuple.0] |
+| main.rs:188:9:188:9 | s | semmle.label | s |
+| main.rs:188:9:188:9 | s | semmle.label | s |
+| main.rs:188:13:188:22 | source(...) | semmle.label | source(...) |
+| main.rs:188:13:188:22 | source(...) | semmle.label | source(...) |
+| main.rs:189:9:189:9 | t [tuple.1] | semmle.label | t [tuple.1] |
+| main.rs:189:9:189:9 | t [tuple.1] | semmle.label | t [tuple.1] |
+| main.rs:189:13:189:32 | set_tuple_element(...) [tuple.1] | semmle.label | set_tuple_element(...) [tuple.1] |
+| main.rs:189:13:189:32 | set_tuple_element(...) [tuple.1] | semmle.label | set_tuple_element(...) [tuple.1] |
+| main.rs:189:31:189:31 | s | semmle.label | s |
+| main.rs:189:31:189:31 | s | semmle.label | s |
+| main.rs:191:10:191:10 | t [tuple.1] | semmle.label | t [tuple.1] |
+| main.rs:191:10:191:10 | t [tuple.1] | semmle.label | t [tuple.1] |
+| main.rs:191:10:191:12 | t.1 | semmle.label | t.1 |
+| main.rs:191:10:191:12 | t.1 | semmle.label | t.1 |
+| main.rs:203:9:203:9 | s | semmle.label | s |
+| main.rs:203:9:203:9 | s | semmle.label | s |
+| main.rs:203:13:203:22 | source(...) | semmle.label | source(...) |
+| main.rs:203:13:203:22 | source(...) | semmle.label | source(...) |
+| main.rs:204:14:204:14 | ... | semmle.label | ... |
+| main.rs:204:14:204:14 | ... | semmle.label | ... |
+| main.rs:205:14:205:14 | n | semmle.label | n |
+| main.rs:205:14:205:14 | n | semmle.label | n |
+| main.rs:208:11:208:11 | s | semmle.label | s |
+| main.rs:208:11:208:11 | s | semmle.label | s |
+| main.rs:212:9:212:9 | s | semmle.label | s |
+| main.rs:212:9:212:9 | s | semmle.label | s |
+| main.rs:212:13:212:22 | source(...) | semmle.label | source(...) |
+| main.rs:212:13:212:22 | source(...) | semmle.label | source(...) |
+| main.rs:213:17:213:42 | if ... {...} else {...} | semmle.label | if ... {...} else {...} |
+| main.rs:213:17:213:42 | if ... {...} else {...} | semmle.label | if ... {...} else {...} |
+| main.rs:213:40:213:40 | s | semmle.label | s |
+| main.rs:213:40:213:40 | s | semmle.label | s |
+| main.rs:214:9:214:9 | t | semmle.label | t |
+| main.rs:214:9:214:9 | t | semmle.label | t |
+| main.rs:214:13:214:24 | apply(...) | semmle.label | apply(...) |
+| main.rs:214:13:214:24 | apply(...) | semmle.label | apply(...) |
+| main.rs:214:23:214:23 | f [captured s] | semmle.label | f [captured s] |
+| main.rs:214:23:214:23 | f [captured s] | semmle.label | f [captured s] |
+| main.rs:215:10:215:10 | t | semmle.label | t |
+| main.rs:215:10:215:10 | t | semmle.label | t |
+| main.rs:219:9:219:9 | s | semmle.label | s |
+| main.rs:219:9:219:9 | s | semmle.label | s |
+| main.rs:219:13:219:22 | source(...) | semmle.label | source(...) |
+| main.rs:219:13:219:22 | source(...) | semmle.label | source(...) |
+| main.rs:220:14:220:14 | ... | semmle.label | ... |
+| main.rs:220:14:220:14 | ... | semmle.label | ... |
+| main.rs:220:17:220:42 | if ... {...} else {...} | semmle.label | if ... {...} else {...} |
+| main.rs:220:17:220:42 | if ... {...} else {...} | semmle.label | if ... {...} else {...} |
+| main.rs:221:9:221:9 | t | semmle.label | t |
+| main.rs:221:9:221:9 | t | semmle.label | t |
+| main.rs:221:13:221:23 | apply(...) | semmle.label | apply(...) |
+| main.rs:221:13:221:23 | apply(...) | semmle.label | apply(...) |
+| main.rs:221:19:221:19 | s | semmle.label | s |
+| main.rs:221:19:221:19 | s | semmle.label | s |
+| main.rs:222:10:222:10 | t | semmle.label | t |
+| main.rs:222:10:222:10 | t | semmle.label | t |
+| main.rs:231:9:231:9 | s | semmle.label | s |
+| main.rs:231:9:231:9 | s | semmle.label | s |
+| main.rs:231:13:231:22 | source(...) | semmle.label | source(...) |
+| main.rs:231:13:231:22 | source(...) | semmle.label | source(...) |
+| main.rs:232:9:232:9 | t | semmle.label | t |
+| main.rs:232:9:232:9 | t | semmle.label | t |
+| main.rs:232:13:232:31 | get_async_number(...) [future] | semmle.label | get_async_number(...) [future] |
+| main.rs:232:13:232:31 | get_async_number(...) [future] | semmle.label | get_async_number(...) [future] |
+| main.rs:232:13:232:37 | await ... | semmle.label | await ... |
+| main.rs:232:13:232:37 | await ... | semmle.label | await ... |
+| main.rs:232:30:232:30 | s | semmle.label | s |
+| main.rs:232:30:232:30 | s | semmle.label | s |
+| main.rs:233:10:233:10 | t | semmle.label | t |
+| main.rs:233:10:233:10 | t | semmle.label | t |
+| main.rs:257:9:257:9 | s [D] | semmle.label | s [D] |
+| main.rs:257:9:257:9 | s [D] | semmle.label | s [D] |
+| main.rs:257:13:257:27 | enum_source(...) | semmle.label | enum_source(...) |
+| main.rs:257:13:257:27 | enum_source(...) | semmle.label | enum_source(...) |
+| main.rs:258:11:258:11 | s [D] | semmle.label | s [D] |
+| main.rs:258:11:258:11 | s [D] | semmle.label | s [D] |
+| main.rs:260:9:260:37 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
+| main.rs:260:9:260:37 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
+| main.rs:260:35:260:35 | i | semmle.label | i |
+| main.rs:260:35:260:35 | i | semmle.label | i |
+| main.rs:260:47:260:47 | i | semmle.label | i |
+| main.rs:260:47:260:47 | i | semmle.label | i |
+| main.rs:264:9:264:9 | s [E, Some] | semmle.label | s [E, Some] |
+| main.rs:264:9:264:9 | s [E, Some] | semmle.label | s [E, Some] |
+| main.rs:264:13:264:34 | enum_source_nested(...) | semmle.label | enum_source_nested(...) |
+| main.rs:264:13:264:34 | enum_source_nested(...) | semmle.label | enum_source_nested(...) |
+| main.rs:265:11:265:11 | s [E, Some] | semmle.label | s [E, Some] |
+| main.rs:265:11:265:11 | s [E, Some] | semmle.label | s [E, Some] |
+| main.rs:268:9:268:37 | ...::E {...} [E, Some] | semmle.label | ...::E {...} [E, Some] |
+| main.rs:268:9:268:37 | ...::E {...} [E, Some] | semmle.label | ...::E {...} [E, Some] |
+| main.rs:268:35:268:35 | o [Some] | semmle.label | o [Some] |
+| main.rs:268:35:268:35 | o [Some] | semmle.label | o [Some] |
+| main.rs:269:19:269:19 | o [Some] | semmle.label | o [Some] |
+| main.rs:269:19:269:19 | o [Some] | semmle.label | o [Some] |
+| main.rs:270:17:270:23 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:270:17:270:23 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:270:22:270:22 | i | semmle.label | i |
+| main.rs:270:22:270:22 | i | semmle.label | i |
+| main.rs:270:33:270:33 | i | semmle.label | i |
+| main.rs:270:33:270:33 | i | semmle.label | i |
+| main.rs:279:9:279:9 | s [C] | semmle.label | s [C] |
+| main.rs:279:9:279:9 | s [C] | semmle.label | s [C] |
+| main.rs:279:13:279:24 | e.source(...) | semmle.label | e.source(...) |
+| main.rs:279:13:279:24 | e.source(...) | semmle.label | e.source(...) |
+| main.rs:280:11:280:11 | s [C] | semmle.label | s [C] |
+| main.rs:280:11:280:11 | s [C] | semmle.label | s [C] |
+| main.rs:281:9:281:37 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:281:9:281:37 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:281:35:281:35 | i | semmle.label | i |
+| main.rs:281:35:281:35 | i | semmle.label | i |
+| main.rs:281:47:281:47 | i | semmle.label | i |
+| main.rs:281:47:281:47 | i | semmle.label | i |
+| main.rs:302:18:302:18 | ... | semmle.label | ... |
+| main.rs:302:18:302:18 | ... | semmle.label | ... |
+| main.rs:302:26:302:26 | a | semmle.label | a |
+| main.rs:302:26:302:26 | a | semmle.label | a |
+| main.rs:303:24:303:24 | a | semmle.label | a |
+| main.rs:303:24:303:24 | a | semmle.label | a |
+| main.rs:305:24:307:9 | \|...\| ... | semmle.label | \|...\| ... |
+| main.rs:305:24:307:9 | \|...\| ... | semmle.label | \|...\| ... |
+| main.rs:305:25:305:25 | ... | semmle.label | ... |
+| main.rs:305:25:305:25 | ... | semmle.label | ... |
+| main.rs:306:18:306:18 | a | semmle.label | a |
+| main.rs:306:18:306:18 | a | semmle.label | a |
+| main.rs:309:14:309:19 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:309:14:309:19 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:310:18:310:18 | a | semmle.label | a |
+| main.rs:310:18:310:18 | a | semmle.label | a |
+| main.rs:312:24:312:24 | f | semmle.label | f |
+| main.rs:312:24:312:24 | f | semmle.label | f |
+| main.rs:314:24:316:9 | \|...\| ... | semmle.label | \|...\| ... |
+| main.rs:314:24:316:9 | \|...\| ... | semmle.label | \|...\| ... |
+| main.rs:314:36:314:36 | ... | semmle.label | ... |
+| main.rs:314:36:314:36 | ... | semmle.label | ... |
+| main.rs:315:18:315:18 | a | semmle.label | a |
+| main.rs:315:18:315:18 | a | semmle.label | a |
+| main.rs:318:31:329:9 | \|...\| ... | semmle.label | \|...\| ... |
+| main.rs:318:31:329:9 | \|...\| ... | semmle.label | \|...\| ... |
+| main.rs:318:31:329:9 | \|...\| ... [E, Some] | semmle.label | \|...\| ... [E, Some] |
+| main.rs:318:31:329:9 | \|...\| ... [E, Some] | semmle.label | \|...\| ... [E, Some] |
+| main.rs:318:32:318:32 | ... [E, Some] | semmle.label | ... [E, Some] |
+| main.rs:318:32:318:32 | ... [E, Some] | semmle.label | ... [E, Some] |
+| main.rs:319:19:319:19 | e [E, Some] | semmle.label | e [E, Some] |
+| main.rs:319:19:319:19 | e [E, Some] | semmle.label | e [E, Some] |
+| main.rs:322:17:322:45 | ...::E {...} [E, Some] | semmle.label | ...::E {...} [E, Some] |
+| main.rs:322:17:322:45 | ...::E {...} [E, Some] | semmle.label | ...::E {...} [E, Some] |
+| main.rs:322:43:322:43 | o [Some] | semmle.label | o [Some] |
+| main.rs:322:43:322:43 | o [Some] | semmle.label | o [Some] |
+| main.rs:323:27:323:27 | o [Some] | semmle.label | o [Some] |
+| main.rs:323:27:323:27 | o [Some] | semmle.label | o [Some] |
+| main.rs:324:25:324:31 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:324:25:324:31 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:324:30:324:30 | i | semmle.label | i |
+| main.rs:324:30:324:30 | i | semmle.label | i |
+| main.rs:324:41:324:41 | i | semmle.label | i |
+| main.rs:324:41:324:41 | i | semmle.label | i |
+| main.rs:344:21:344:29 | source(...) | semmle.label | source(...) |
+| main.rs:344:21:344:29 | source(...) | semmle.label | source(...) |
+| main.rs:345:19:345:19 | a | semmle.label | a |
+| main.rs:345:19:345:19 | a | semmle.label | a |
+| main.rs:347:22:352:9 | { ... } [E, Some] | semmle.label | { ... } [E, Some] |
+| main.rs:347:22:352:9 | { ... } [E, Some] | semmle.label | { ... } [E, Some] |
+| main.rs:348:17:348:17 | s | semmle.label | s |
+| main.rs:348:17:348:17 | s | semmle.label | s |
+| main.rs:348:21:348:29 | source(...) | semmle.label | source(...) |
+| main.rs:348:21:348:29 | source(...) | semmle.label | source(...) |
+| main.rs:349:13:351:13 | ...::E {...} [E, Some] | semmle.label | ...::E {...} [E, Some] |
+| main.rs:349:13:351:13 | ...::E {...} [E, Some] | semmle.label | ...::E {...} [E, Some] |
+| main.rs:350:26:350:40 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
+| main.rs:350:26:350:40 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
+| main.rs:350:39:350:39 | s | semmle.label | s |
+| main.rs:350:39:350:39 | s | semmle.label | s |
+| main.rs:353:26:353:26 | b | semmle.label | b |
+| main.rs:353:26:353:26 | b | semmle.label | b |
+| main.rs:353:26:353:26 | b [E, Some] | semmle.label | b [E, Some] |
+| main.rs:353:26:353:26 | b [E, Some] | semmle.label | b [E, Some] |
+| main.rs:364:9:364:9 | s | semmle.label | s |
+| main.rs:364:9:364:9 | s | semmle.label | s |
+| main.rs:364:13:364:22 | source(...) | semmle.label | source(...) |
+| main.rs:364:13:364:22 | source(...) | semmle.label | source(...) |
+| main.rs:365:15:365:43 | ...::C {...} | semmle.label | ...::C {...} |
+| main.rs:365:15:365:43 | ...::C {...} | semmle.label | ...::C {...} |
+| main.rs:365:15:365:43 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:365:15:365:43 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:365:41:365:41 | s | semmle.label | s |
+| main.rs:365:41:365:41 | s | semmle.label | s |
+| main.rs:368:22:368:56 | ...::E {...} | semmle.label | ...::E {...} |
+| main.rs:368:22:368:56 | ...::E {...} | semmle.label | ...::E {...} |
+| main.rs:368:22:368:56 | ...::E {...} [E, Some] | semmle.label | ...::E {...} [E, Some] |
+| main.rs:368:22:368:56 | ...::E {...} [E, Some] | semmle.label | ...::E {...} [E, Some] |
+| main.rs:368:48:368:54 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:368:48:368:54 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:368:53:368:53 | s | semmle.label | s |
+| main.rs:368:53:368:53 | s | semmle.label | s |
+| main.rs:372:9:372:9 | s | semmle.label | s |
+| main.rs:372:9:372:9 | s | semmle.label | s |
+| main.rs:372:13:372:22 | source(...) | semmle.label | source(...) |
+| main.rs:372:13:372:22 | source(...) | semmle.label | source(...) |
+| main.rs:373:9:373:9 | e [D] | semmle.label | e [D] |
+| main.rs:373:9:373:9 | e [D] | semmle.label | e [D] |
+| main.rs:373:13:373:41 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
+| main.rs:373:13:373:41 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
+| main.rs:373:39:373:39 | s | semmle.label | s |
+| main.rs:373:39:373:39 | s | semmle.label | s |
+| main.rs:374:5:374:5 | e | semmle.label | e |
+| main.rs:374:5:374:5 | e | semmle.label | e |
+| main.rs:383:9:383:9 | s | semmle.label | s |
+| main.rs:383:9:383:9 | s | semmle.label | s |
+| main.rs:383:13:383:29 | simple_source(...) | semmle.label | simple_source(...) |
+| main.rs:383:13:383:29 | simple_source(...) | semmle.label | simple_source(...) |
+| main.rs:384:10:384:10 | s | semmle.label | s |
+| main.rs:384:10:384:10 | s | semmle.label | s |
+| main.rs:391:9:391:9 | s | semmle.label | s |
+| main.rs:391:9:391:9 | s | semmle.label | s |
+| main.rs:391:13:391:22 | source(...) | semmle.label | source(...) |
+| main.rs:391:13:391:22 | source(...) | semmle.label | source(...) |
+| main.rs:392:17:392:17 | s | semmle.label | s |
+| main.rs:392:17:392:17 | s | semmle.label | s |
+| main.rs:400:16:400:16 | i | semmle.label | i |
+| main.rs:400:16:400:16 | i | semmle.label | i |
+| main.rs:401:10:401:10 | i | semmle.label | i |
+| main.rs:401:10:401:10 | i | semmle.label | i |
+| main.rs:410:26:410:31 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:410:26:410:31 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:411:14:411:14 | i | semmle.label | i |
+| main.rs:411:14:411:14 | i | semmle.label | i |
+| main.rs:495:9:495:10 | x1 | semmle.label | x1 |
+| main.rs:495:9:495:10 | x1 | semmle.label | x1 |
+| main.rs:495:14:495:23 | source(...) | semmle.label | source(...) |
+| main.rs:495:14:495:23 | source(...) | semmle.label | source(...) |
+| main.rs:495:14:495:30 | ... .max(...) | semmle.label | ... .max(...) |
+| main.rs:495:14:495:30 | ... .max(...) | semmle.label | ... .max(...) |
+| main.rs:496:10:496:11 | x1 | semmle.label | x1 |
+| main.rs:496:10:496:11 | x1 | semmle.label | x1 |
+| main.rs:498:9:498:10 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
+| main.rs:498:9:498:10 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
+| main.rs:498:14:505:6 | ... .max(...) [MyStruct.field1] | semmle.label | ... .max(...) [MyStruct.field1] |
+| main.rs:498:14:505:6 | ... .max(...) [MyStruct.field1] | semmle.label | ... .max(...) [MyStruct.field1] |
+| main.rs:498:15:501:5 | MyStruct {...} [MyStruct.field1] | semmle.label | MyStruct {...} [MyStruct.field1] |
+| main.rs:498:15:501:5 | MyStruct {...} [MyStruct.field1] | semmle.label | MyStruct {...} [MyStruct.field1] |
+| main.rs:499:17:499:26 | source(...) | semmle.label | source(...) |
+| main.rs:499:17:499:26 | source(...) | semmle.label | source(...) |
+| main.rs:506:10:506:11 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
+| main.rs:506:10:506:11 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
+| main.rs:506:10:506:18 | x2.field1 | semmle.label | x2.field1 |
+| main.rs:506:10:506:18 | x2.field1 | semmle.label | x2.field1 |
+| main.rs:511:9:511:10 | x4 | semmle.label | x4 |
+| main.rs:511:9:511:10 | x4 | semmle.label | x4 |
+| main.rs:511:14:511:23 | source(...) | semmle.label | source(...) |
+| main.rs:511:14:511:23 | source(...) | semmle.label | source(...) |
+| main.rs:511:14:511:30 | ... .max(...) | semmle.label | ... .max(...) |
+| main.rs:511:14:511:30 | ... .max(...) | semmle.label | ... .max(...) |
+| main.rs:512:10:512:11 | x4 | semmle.label | x4 |
+| main.rs:512:10:512:11 | x4 | semmle.label | x4 |
+| main.rs:514:9:514:10 | x5 | semmle.label | x5 |
+| main.rs:514:14:514:23 | source(...) | semmle.label | source(...) |
+| main.rs:514:14:514:30 | ... .lt(...) | semmle.label | ... .lt(...) |
+| main.rs:515:10:515:11 | x5 | semmle.label | x5 |
+| main.rs:517:9:517:10 | x6 | semmle.label | x6 |
+| main.rs:517:14:517:23 | source(...) | semmle.label | source(...) |
+| main.rs:517:14:517:27 | ... < ... | semmle.label | ... < ... |
+| main.rs:518:10:518:11 | x6 | semmle.label | x6 |
+| main.rs:523:9:523:10 | x8 | semmle.label | x8 |
+| main.rs:523:9:523:10 | x8 | semmle.label | x8 |
+| main.rs:523:14:523:44 | ...::flow_through2(...) | semmle.label | ...::flow_through2(...) |
+| main.rs:523:14:523:44 | ...::flow_through2(...) | semmle.label | ...::flow_through2(...) |
+| main.rs:523:34:523:43 | source(...) | semmle.label | source(...) |
+| main.rs:523:34:523:43 | source(...) | semmle.label | source(...) |
+| main.rs:524:10:524:11 | x8 | semmle.label | x8 |
+| main.rs:524:10:524:11 | x8 | semmle.label | x8 |
+| main.rs:526:9:526:10 | x9 | semmle.label | x9 |
+| main.rs:526:9:526:10 | x9 | semmle.label | x9 |
+| main.rs:526:14:526:44 | ...::flow_through3(...) | semmle.label | ...::flow_through3(...) |
+| main.rs:526:14:526:44 | ...::flow_through3(...) | semmle.label | ...::flow_through3(...) |
+| main.rs:526:34:526:43 | source(...) | semmle.label | source(...) |
+| main.rs:526:34:526:43 | source(...) | semmle.label | source(...) |
+| main.rs:527:10:527:11 | x9 | semmle.label | x9 |
+| main.rs:527:10:527:11 | x9 | semmle.label | x9 |
+| main.rs:529:9:529:11 | x10 | semmle.label | x10 |
+| main.rs:529:9:529:11 | x10 | semmle.label | x10 |
+| main.rs:529:15:529:32 | ...::produce2(...) | semmle.label | ...::produce2(...) |
+| main.rs:529:15:529:32 | ...::produce2(...) | semmle.label | ...::produce2(...) |
+| main.rs:530:10:530:12 | x10 | semmle.label | x10 |
+| main.rs:530:10:530:12 | x10 | semmle.label | x10 |
+| main.rs:532:9:532:11 | x11 | semmle.label | x11 |
+| main.rs:532:9:532:11 | x11 | semmle.label | x11 |
+| main.rs:532:15:532:32 | ...::produce3(...) | semmle.label | ...::produce3(...) |
+| main.rs:532:15:532:32 | ...::produce3(...) | semmle.label | ...::produce3(...) |
+| main.rs:533:10:533:12 | x11 | semmle.label | x11 |
+| main.rs:533:10:533:12 | x11 | semmle.label | x11 |
+| main.rs:535:20:535:29 | source(...) | semmle.label | source(...) |
+| main.rs:535:20:535:29 | source(...) | semmle.label | source(...) |
+| main.rs:535:20:535:29 | source(...) | semmle.label | source(...) |
+| main.rs:535:20:535:29 | source(...) | semmle.label | source(...) |
+| main.rs:537:20:537:29 | source(...) | semmle.label | source(...) |
+| main.rs:537:20:537:29 | source(...) | semmle.label | source(...) |
+| main.rs:537:20:537:29 | source(...) | semmle.label | source(...) |
+| main.rs:537:20:537:29 | source(...) | semmle.label | source(...) |
+| main.rs:549:10:549:28 | generated_source(...) | semmle.label | generated_source(...) |
+| main.rs:549:10:549:28 | generated_source(...) | semmle.label | generated_source(...) |
+| main.rs:549:10:549:28 | generated_source(...) | semmle.label | generated_source(...) |
+| main.rs:549:10:549:28 | generated_source(...) | semmle.label | generated_source(...) |
+| main.rs:551:10:551:33 | neutral_manual_source(...) | semmle.label | neutral_manual_source(...) |
+| main.rs:551:10:551:33 | neutral_manual_source(...) | semmle.label | neutral_manual_source(...) |
+| main.rs:551:10:551:33 | neutral_manual_source(...) | semmle.label | neutral_manual_source(...) |
+| main.rs:551:10:551:33 | neutral_manual_source(...) | semmle.label | neutral_manual_source(...) |
+| main.rs:552:20:552:28 | source(...) | semmle.label | source(...) |
+| main.rs:552:20:552:28 | source(...) | semmle.label | source(...) |
+| main.rs:552:20:552:28 | source(...) | semmle.label | source(...) |
+| main.rs:552:20:552:28 | source(...) | semmle.label | source(...) |
+| main.rs:554:25:554:33 | source(...) | semmle.label | source(...) |
+| main.rs:554:25:554:33 | source(...) | semmle.label | source(...) |
+| main.rs:554:25:554:33 | source(...) | semmle.label | source(...) |
+| main.rs:554:25:554:33 | source(...) | semmle.label | source(...) |
+| main.rs:555:10:555:37 | generated_summary(...) | semmle.label | generated_summary(...) |
+| main.rs:555:10:555:37 | generated_summary(...) | semmle.label | generated_summary(...) |
+| main.rs:555:28:555:36 | source(...) | semmle.label | source(...) |
+| main.rs:555:28:555:36 | source(...) | semmle.label | source(...) |
+| main.rs:557:10:557:42 | neutral_manual_summary(...) | semmle.label | neutral_manual_summary(...) |
+| main.rs:557:10:557:42 | neutral_manual_summary(...) | semmle.label | neutral_manual_summary(...) |
+| main.rs:557:33:557:41 | source(...) | semmle.label | source(...) |
+| main.rs:557:33:557:41 | source(...) | semmle.label | source(...) |
 subpaths
-| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | main.rs:211:17:211:42 | if ... {...} else {...} | main.rs:212:13:212:24 | apply(...) |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | main.rs:211:17:211:42 | if ... {...} else {...} | main.rs:212:13:212:24 | apply(...) |
-| main.rs:219:19:219:19 | s | main.rs:218:14:218:14 | ... | main.rs:218:17:218:42 | if ... {...} else {...} | main.rs:219:13:219:23 | apply(...) |
-| main.rs:219:19:219:19 | s | main.rs:218:14:218:14 | ... | main.rs:218:17:218:42 | if ... {...} else {...} | main.rs:219:13:219:23 | apply(...) |
+| main.rs:214:23:214:23 | f [captured s] | main.rs:213:40:213:40 | s | main.rs:213:17:213:42 | if ... {...} else {...} | main.rs:214:13:214:24 | apply(...) |
+| main.rs:214:23:214:23 | f [captured s] | main.rs:213:40:213:40 | s | main.rs:213:17:213:42 | if ... {...} else {...} | main.rs:214:13:214:24 | apply(...) |
+| main.rs:221:19:221:19 | s | main.rs:220:14:220:14 | ... | main.rs:220:17:220:42 | if ... {...} else {...} | main.rs:221:13:221:23 | apply(...) |
+| main.rs:221:19:221:19 | s | main.rs:220:14:220:14 | ... | main.rs:220:17:220:42 | if ... {...} else {...} | main.rs:221:13:221:23 | apply(...) |
 testFailures
 invalidSpecComponent
 #select
@@ -731,69 +913,93 @@ invalidSpecComponent
 | main.rs:56:10:56:24 | get_var_pos(...) | main.rs:54:13:54:21 | source(...) | main.rs:56:10:56:24 | get_var_pos(...) | $@ | main.rs:54:13:54:21 | source(...) | source(...) |
 | main.rs:71:33:71:33 | i | main.rs:67:13:67:21 | source(...) | main.rs:71:33:71:33 | i | $@ | main.rs:67:13:67:21 | source(...) | source(...) |
 | main.rs:71:33:71:33 | i | main.rs:67:13:67:21 | source(...) | main.rs:71:33:71:33 | i | $@ | main.rs:67:13:67:21 | source(...) | source(...) |
-| main.rs:88:10:88:26 | get_var_field(...) | main.rs:86:13:86:21 | source(...) | main.rs:88:10:88:26 | get_var_field(...) | $@ | main.rs:86:13:86:21 | source(...) | source(...) |
-| main.rs:88:10:88:26 | get_var_field(...) | main.rs:86:13:86:21 | source(...) | main.rs:88:10:88:26 | get_var_field(...) | $@ | main.rs:86:13:86:21 | source(...) | source(...) |
-| main.rs:103:47:103:47 | i | main.rs:99:13:99:21 | source(...) | main.rs:103:47:103:47 | i | $@ | main.rs:99:13:99:21 | source(...) | source(...) |
-| main.rs:103:47:103:47 | i | main.rs:99:13:99:21 | source(...) | main.rs:103:47:103:47 | i | $@ | main.rs:99:13:99:21 | source(...) | source(...) |
-| main.rs:123:10:123:36 | get_struct_field(...) | main.rs:118:13:118:21 | source(...) | main.rs:123:10:123:36 | get_struct_field(...) | $@ | main.rs:118:13:118:21 | source(...) | source(...) |
-| main.rs:123:10:123:36 | get_struct_field(...) | main.rs:118:13:118:21 | source(...) | main.rs:123:10:123:36 | get_struct_field(...) | $@ | main.rs:118:13:118:21 | source(...) | source(...) |
-| main.rs:143:10:143:25 | my_struct.field2 | main.rs:140:13:140:21 | source(...) | main.rs:143:10:143:25 | my_struct.field2 | $@ | main.rs:140:13:140:21 | source(...) | source(...) |
-| main.rs:143:10:143:25 | my_struct.field2 | main.rs:140:13:140:21 | source(...) | main.rs:143:10:143:25 | my_struct.field2 | $@ | main.rs:140:13:140:21 | source(...) | source(...) |
-| main.rs:153:10:153:31 | get_array_element(...) | main.rs:152:13:152:21 | source(...) | main.rs:153:10:153:31 | get_array_element(...) | $@ | main.rs:152:13:152:21 | source(...) | source(...) |
-| main.rs:153:10:153:31 | get_array_element(...) | main.rs:152:13:152:21 | source(...) | main.rs:153:10:153:31 | get_array_element(...) | $@ | main.rs:152:13:152:21 | source(...) | source(...) |
-| main.rs:164:10:164:15 | arr[0] | main.rs:162:13:162:21 | source(...) | main.rs:164:10:164:15 | arr[0] | $@ | main.rs:162:13:162:21 | source(...) | source(...) |
-| main.rs:164:10:164:15 | arr[0] | main.rs:162:13:162:21 | source(...) | main.rs:164:10:164:15 | arr[0] | $@ | main.rs:162:13:162:21 | source(...) | source(...) |
-| main.rs:175:10:175:29 | get_tuple_element(...) | main.rs:173:13:173:22 | source(...) | main.rs:175:10:175:29 | get_tuple_element(...) | $@ | main.rs:173:13:173:22 | source(...) | source(...) |
-| main.rs:175:10:175:29 | get_tuple_element(...) | main.rs:173:13:173:22 | source(...) | main.rs:175:10:175:29 | get_tuple_element(...) | $@ | main.rs:173:13:173:22 | source(...) | source(...) |
-| main.rs:189:10:189:12 | t.1 | main.rs:186:13:186:22 | source(...) | main.rs:189:10:189:12 | t.1 | $@ | main.rs:186:13:186:22 | source(...) | source(...) |
-| main.rs:189:10:189:12 | t.1 | main.rs:186:13:186:22 | source(...) | main.rs:189:10:189:12 | t.1 | $@ | main.rs:186:13:186:22 | source(...) | source(...) |
-| main.rs:203:14:203:14 | n | main.rs:201:13:201:22 | source(...) | main.rs:203:14:203:14 | n | $@ | main.rs:201:13:201:22 | source(...) | source(...) |
-| main.rs:203:14:203:14 | n | main.rs:201:13:201:22 | source(...) | main.rs:203:14:203:14 | n | $@ | main.rs:201:13:201:22 | source(...) | source(...) |
-| main.rs:213:10:213:10 | t | main.rs:210:13:210:22 | source(...) | main.rs:213:10:213:10 | t | $@ | main.rs:210:13:210:22 | source(...) | source(...) |
-| main.rs:213:10:213:10 | t | main.rs:210:13:210:22 | source(...) | main.rs:213:10:213:10 | t | $@ | main.rs:210:13:210:22 | source(...) | source(...) |
-| main.rs:220:10:220:10 | t | main.rs:217:13:217:22 | source(...) | main.rs:220:10:220:10 | t | $@ | main.rs:217:13:217:22 | source(...) | source(...) |
-| main.rs:220:10:220:10 | t | main.rs:217:13:217:22 | source(...) | main.rs:220:10:220:10 | t | $@ | main.rs:217:13:217:22 | source(...) | source(...) |
-| main.rs:231:10:231:10 | t | main.rs:229:13:229:22 | source(...) | main.rs:231:10:231:10 | t | $@ | main.rs:229:13:229:22 | source(...) | source(...) |
-| main.rs:231:10:231:10 | t | main.rs:229:13:229:22 | source(...) | main.rs:231:10:231:10 | t | $@ | main.rs:229:13:229:22 | source(...) | source(...) |
-| main.rs:253:47:253:47 | i | main.rs:250:13:250:23 | enum_source | main.rs:253:47:253:47 | i | $@ | main.rs:250:13:250:23 | enum_source | enum_source |
-| main.rs:253:47:253:47 | i | main.rs:250:13:250:23 | enum_source | main.rs:253:47:253:47 | i | $@ | main.rs:250:13:250:23 | enum_source | enum_source |
-| main.rs:261:47:261:47 | i | main.rs:259:15:259:20 | source | main.rs:261:47:261:47 | i | $@ | main.rs:259:15:259:20 | source | source |
-| main.rs:261:47:261:47 | i | main.rs:259:15:259:20 | source | main.rs:261:47:261:47 | i | $@ | main.rs:259:15:259:20 | source | source |
-| main.rs:275:26:275:26 | a | main.rs:276:9:276:19 | pass_source | main.rs:275:26:275:26 | a | $@ | main.rs:276:9:276:19 | pass_source | pass_source |
-| main.rs:275:26:275:26 | a | main.rs:276:9:276:19 | pass_source | main.rs:275:26:275:26 | a | $@ | main.rs:276:9:276:19 | pass_source | pass_source |
-| main.rs:279:18:279:18 | a | main.rs:278:9:278:19 | pass_source | main.rs:279:18:279:18 | a | $@ | main.rs:278:9:278:19 | pass_source | pass_source |
-| main.rs:279:18:279:18 | a | main.rs:278:9:278:19 | pass_source | main.rs:279:18:279:18 | a | $@ | main.rs:278:9:278:19 | pass_source | pass_source |
-| main.rs:283:18:283:18 | a | main.rs:285:9:285:19 | pass_source | main.rs:283:18:283:18 | a | $@ | main.rs:285:9:285:19 | pass_source | pass_source |
-| main.rs:283:18:283:18 | a | main.rs:285:9:285:19 | pass_source | main.rs:283:18:283:18 | a | $@ | main.rs:285:9:285:19 | pass_source | pass_source |
-| main.rs:288:18:288:18 | a | main.rs:287:9:287:19 | pass_source | main.rs:288:18:288:18 | a | $@ | main.rs:287:9:287:19 | pass_source | pass_source |
-| main.rs:288:18:288:18 | a | main.rs:287:9:287:19 | pass_source | main.rs:288:18:288:18 | a | $@ | main.rs:287:9:287:19 | pass_source | pass_source |
-| main.rs:298:5:298:13 | enum_sink | main.rs:297:13:297:22 | source(...) | main.rs:298:5:298:13 | enum_sink | $@ | main.rs:297:13:297:22 | source(...) | source(...) |
-| main.rs:298:5:298:13 | enum_sink | main.rs:297:13:297:22 | source(...) | main.rs:298:5:298:13 | enum_sink | $@ | main.rs:297:13:297:22 | source(...) | source(...) |
-| main.rs:305:7:305:10 | sink | main.rs:303:13:303:22 | source(...) | main.rs:305:7:305:10 | sink | $@ | main.rs:303:13:303:22 | source(...) | source(...) |
-| main.rs:305:7:305:10 | sink | main.rs:303:13:303:22 | source(...) | main.rs:305:7:305:10 | sink | $@ | main.rs:303:13:303:22 | source(...) | source(...) |
-| main.rs:315:10:315:10 | s | main.rs:314:13:314:25 | simple_source | main.rs:315:10:315:10 | s | $@ | main.rs:314:13:314:25 | simple_source | simple_source |
-| main.rs:315:10:315:10 | s | main.rs:314:13:314:25 | simple_source | main.rs:315:10:315:10 | s | $@ | main.rs:314:13:314:25 | simple_source | simple_source |
-| main.rs:323:5:323:15 | simple_sink | main.rs:322:13:322:22 | source(...) | main.rs:323:5:323:15 | simple_sink | $@ | main.rs:322:13:322:22 | source(...) | source(...) |
-| main.rs:323:5:323:15 | simple_sink | main.rs:322:13:322:22 | source(...) | main.rs:323:5:323:15 | simple_sink | $@ | main.rs:322:13:322:22 | source(...) | source(...) |
-| main.rs:332:10:332:10 | i | main.rs:331:5:331:14 | arg_source | main.rs:332:10:332:10 | i | $@ | main.rs:331:5:331:14 | arg_source | arg_source |
-| main.rs:332:10:332:10 | i | main.rs:331:5:331:14 | arg_source | main.rs:332:10:332:10 | i | $@ | main.rs:331:5:331:14 | arg_source | arg_source |
-| main.rs:385:10:385:11 | x1 | main.rs:384:14:384:23 | source(...) | main.rs:385:10:385:11 | x1 | $@ | main.rs:384:14:384:23 | source(...) | source(...) |
-| main.rs:385:10:385:11 | x1 | main.rs:384:14:384:23 | source(...) | main.rs:385:10:385:11 | x1 | $@ | main.rs:384:14:384:23 | source(...) | source(...) |
-| main.rs:395:10:395:18 | x2.field1 | main.rs:388:17:388:26 | source(...) | main.rs:395:10:395:18 | x2.field1 | $@ | main.rs:388:17:388:26 | source(...) | source(...) |
-| main.rs:395:10:395:18 | x2.field1 | main.rs:388:17:388:26 | source(...) | main.rs:395:10:395:18 | x2.field1 | $@ | main.rs:388:17:388:26 | source(...) | source(...) |
-| main.rs:401:10:401:11 | x4 | main.rs:400:14:400:23 | source(...) | main.rs:401:10:401:11 | x4 | $@ | main.rs:400:14:400:23 | source(...) | source(...) |
-| main.rs:401:10:401:11 | x4 | main.rs:400:14:400:23 | source(...) | main.rs:401:10:401:11 | x4 | $@ | main.rs:400:14:400:23 | source(...) | source(...) |
-| main.rs:404:10:404:11 | x5 | main.rs:403:14:403:23 | source(...) | main.rs:404:10:404:11 | x5 | $@ | main.rs:403:14:403:23 | source(...) | source(...) |
-| main.rs:407:10:407:11 | x6 | main.rs:406:14:406:23 | source(...) | main.rs:407:10:407:11 | x6 | $@ | main.rs:406:14:406:23 | source(...) | source(...) |
-| main.rs:422:10:422:28 | generated_source(...) | main.rs:422:10:422:25 | generated_source | main.rs:422:10:422:28 | generated_source(...) | $@ | main.rs:422:10:422:25 | generated_source | generated_source |
-| main.rs:422:10:422:28 | generated_source(...) | main.rs:422:10:422:25 | generated_source | main.rs:422:10:422:28 | generated_source(...) | $@ | main.rs:422:10:422:25 | generated_source | generated_source |
-| main.rs:424:10:424:33 | neutral_manual_source(...) | main.rs:424:10:424:30 | neutral_manual_source | main.rs:424:10:424:33 | neutral_manual_source(...) | $@ | main.rs:424:10:424:30 | neutral_manual_source | neutral_manual_source |
-| main.rs:424:10:424:33 | neutral_manual_source(...) | main.rs:424:10:424:30 | neutral_manual_source | main.rs:424:10:424:33 | neutral_manual_source(...) | $@ | main.rs:424:10:424:30 | neutral_manual_source | neutral_manual_source |
-| main.rs:425:5:425:18 | generated_sink | main.rs:425:20:425:28 | source(...) | main.rs:425:5:425:18 | generated_sink | $@ | main.rs:425:20:425:28 | source(...) | source(...) |
-| main.rs:425:5:425:18 | generated_sink | main.rs:425:20:425:28 | source(...) | main.rs:425:5:425:18 | generated_sink | $@ | main.rs:425:20:425:28 | source(...) | source(...) |
-| main.rs:427:5:427:23 | neutral_manual_sink | main.rs:427:25:427:33 | source(...) | main.rs:427:5:427:23 | neutral_manual_sink | $@ | main.rs:427:25:427:33 | source(...) | source(...) |
-| main.rs:427:5:427:23 | neutral_manual_sink | main.rs:427:25:427:33 | source(...) | main.rs:427:5:427:23 | neutral_manual_sink | $@ | main.rs:427:25:427:33 | source(...) | source(...) |
-| main.rs:428:10:428:37 | generated_summary(...) | main.rs:428:28:428:36 | source(...) | main.rs:428:10:428:37 | generated_summary(...) | $@ | main.rs:428:28:428:36 | source(...) | source(...) |
-| main.rs:428:10:428:37 | generated_summary(...) | main.rs:428:28:428:36 | source(...) | main.rs:428:10:428:37 | generated_summary(...) | $@ | main.rs:428:28:428:36 | source(...) | source(...) |
-| main.rs:430:10:430:42 | neutral_manual_summary(...) | main.rs:430:33:430:41 | source(...) | main.rs:430:10:430:42 | neutral_manual_summary(...) | $@ | main.rs:430:33:430:41 | source(...) | source(...) |
-| main.rs:430:10:430:42 | neutral_manual_summary(...) | main.rs:430:33:430:41 | source(...) | main.rs:430:10:430:42 | neutral_manual_summary(...) | $@ | main.rs:430:33:430:41 | source(...) | source(...) |
+| main.rs:89:10:89:26 | get_var_field(...) | main.rs:87:13:87:21 | source(...) | main.rs:89:10:89:26 | get_var_field(...) | $@ | main.rs:87:13:87:21 | source(...) | source(...) |
+| main.rs:89:10:89:26 | get_var_field(...) | main.rs:87:13:87:21 | source(...) | main.rs:89:10:89:26 | get_var_field(...) | $@ | main.rs:87:13:87:21 | source(...) | source(...) |
+| main.rs:104:47:104:47 | i | main.rs:100:13:100:21 | source(...) | main.rs:104:47:104:47 | i | $@ | main.rs:100:13:100:21 | source(...) | source(...) |
+| main.rs:104:47:104:47 | i | main.rs:100:13:100:21 | source(...) | main.rs:104:47:104:47 | i | $@ | main.rs:100:13:100:21 | source(...) | source(...) |
+| main.rs:125:10:125:36 | get_struct_field(...) | main.rs:120:13:120:21 | source(...) | main.rs:125:10:125:36 | get_struct_field(...) | $@ | main.rs:120:13:120:21 | source(...) | source(...) |
+| main.rs:125:10:125:36 | get_struct_field(...) | main.rs:120:13:120:21 | source(...) | main.rs:125:10:125:36 | get_struct_field(...) | $@ | main.rs:120:13:120:21 | source(...) | source(...) |
+| main.rs:145:10:145:25 | my_struct.field2 | main.rs:142:13:142:21 | source(...) | main.rs:145:10:145:25 | my_struct.field2 | $@ | main.rs:142:13:142:21 | source(...) | source(...) |
+| main.rs:145:10:145:25 | my_struct.field2 | main.rs:142:13:142:21 | source(...) | main.rs:145:10:145:25 | my_struct.field2 | $@ | main.rs:142:13:142:21 | source(...) | source(...) |
+| main.rs:155:10:155:31 | get_array_element(...) | main.rs:154:13:154:21 | source(...) | main.rs:155:10:155:31 | get_array_element(...) | $@ | main.rs:154:13:154:21 | source(...) | source(...) |
+| main.rs:155:10:155:31 | get_array_element(...) | main.rs:154:13:154:21 | source(...) | main.rs:155:10:155:31 | get_array_element(...) | $@ | main.rs:154:13:154:21 | source(...) | source(...) |
+| main.rs:166:10:166:15 | arr[0] | main.rs:164:13:164:21 | source(...) | main.rs:166:10:166:15 | arr[0] | $@ | main.rs:164:13:164:21 | source(...) | source(...) |
+| main.rs:166:10:166:15 | arr[0] | main.rs:164:13:164:21 | source(...) | main.rs:166:10:166:15 | arr[0] | $@ | main.rs:164:13:164:21 | source(...) | source(...) |
+| main.rs:177:10:177:29 | get_tuple_element(...) | main.rs:175:13:175:22 | source(...) | main.rs:177:10:177:29 | get_tuple_element(...) | $@ | main.rs:175:13:175:22 | source(...) | source(...) |
+| main.rs:177:10:177:29 | get_tuple_element(...) | main.rs:175:13:175:22 | source(...) | main.rs:177:10:177:29 | get_tuple_element(...) | $@ | main.rs:175:13:175:22 | source(...) | source(...) |
+| main.rs:191:10:191:12 | t.1 | main.rs:188:13:188:22 | source(...) | main.rs:191:10:191:12 | t.1 | $@ | main.rs:188:13:188:22 | source(...) | source(...) |
+| main.rs:191:10:191:12 | t.1 | main.rs:188:13:188:22 | source(...) | main.rs:191:10:191:12 | t.1 | $@ | main.rs:188:13:188:22 | source(...) | source(...) |
+| main.rs:205:14:205:14 | n | main.rs:203:13:203:22 | source(...) | main.rs:205:14:205:14 | n | $@ | main.rs:203:13:203:22 | source(...) | source(...) |
+| main.rs:205:14:205:14 | n | main.rs:203:13:203:22 | source(...) | main.rs:205:14:205:14 | n | $@ | main.rs:203:13:203:22 | source(...) | source(...) |
+| main.rs:215:10:215:10 | t | main.rs:212:13:212:22 | source(...) | main.rs:215:10:215:10 | t | $@ | main.rs:212:13:212:22 | source(...) | source(...) |
+| main.rs:215:10:215:10 | t | main.rs:212:13:212:22 | source(...) | main.rs:215:10:215:10 | t | $@ | main.rs:212:13:212:22 | source(...) | source(...) |
+| main.rs:222:10:222:10 | t | main.rs:219:13:219:22 | source(...) | main.rs:222:10:222:10 | t | $@ | main.rs:219:13:219:22 | source(...) | source(...) |
+| main.rs:222:10:222:10 | t | main.rs:219:13:219:22 | source(...) | main.rs:222:10:222:10 | t | $@ | main.rs:219:13:219:22 | source(...) | source(...) |
+| main.rs:233:10:233:10 | t | main.rs:231:13:231:22 | source(...) | main.rs:233:10:233:10 | t | $@ | main.rs:231:13:231:22 | source(...) | source(...) |
+| main.rs:233:10:233:10 | t | main.rs:231:13:231:22 | source(...) | main.rs:233:10:233:10 | t | $@ | main.rs:231:13:231:22 | source(...) | source(...) |
+| main.rs:260:47:260:47 | i | main.rs:257:13:257:27 | enum_source(...) | main.rs:260:47:260:47 | i | $@ | main.rs:257:13:257:27 | enum_source(...) | enum_source(...) |
+| main.rs:260:47:260:47 | i | main.rs:257:13:257:27 | enum_source(...) | main.rs:260:47:260:47 | i | $@ | main.rs:257:13:257:27 | enum_source(...) | enum_source(...) |
+| main.rs:270:33:270:33 | i | main.rs:264:13:264:34 | enum_source_nested(...) | main.rs:270:33:270:33 | i | $@ | main.rs:264:13:264:34 | enum_source_nested(...) | enum_source_nested(...) |
+| main.rs:270:33:270:33 | i | main.rs:264:13:264:34 | enum_source_nested(...) | main.rs:270:33:270:33 | i | $@ | main.rs:264:13:264:34 | enum_source_nested(...) | enum_source_nested(...) |
+| main.rs:281:47:281:47 | i | main.rs:279:13:279:24 | e.source(...) | main.rs:281:47:281:47 | i | $@ | main.rs:279:13:279:24 | e.source(...) | e.source(...) |
+| main.rs:281:47:281:47 | i | main.rs:279:13:279:24 | e.source(...) | main.rs:281:47:281:47 | i | $@ | main.rs:279:13:279:24 | e.source(...) | e.source(...) |
+| main.rs:302:26:302:26 | a | main.rs:303:24:303:24 | a | main.rs:302:26:302:26 | a | $@ | main.rs:303:24:303:24 | a | a |
+| main.rs:302:26:302:26 | a | main.rs:303:24:303:24 | a | main.rs:302:26:302:26 | a | $@ | main.rs:303:24:303:24 | a | a |
+| main.rs:306:18:306:18 | a | main.rs:305:24:307:9 | \|...\| ... | main.rs:306:18:306:18 | a | $@ | main.rs:305:24:307:9 | \|...\| ... | \|...\| ... |
+| main.rs:306:18:306:18 | a | main.rs:305:24:307:9 | \|...\| ... | main.rs:306:18:306:18 | a | $@ | main.rs:305:24:307:9 | \|...\| ... | \|...\| ... |
+| main.rs:310:18:310:18 | a | main.rs:312:24:312:24 | f | main.rs:310:18:310:18 | a | $@ | main.rs:312:24:312:24 | f | f |
+| main.rs:310:18:310:18 | a | main.rs:312:24:312:24 | f | main.rs:310:18:310:18 | a | $@ | main.rs:312:24:312:24 | f | f |
+| main.rs:315:18:315:18 | a | main.rs:314:24:316:9 | \|...\| ... | main.rs:315:18:315:18 | a | $@ | main.rs:314:24:316:9 | \|...\| ... | \|...\| ... |
+| main.rs:315:18:315:18 | a | main.rs:314:24:316:9 | \|...\| ... | main.rs:315:18:315:18 | a | $@ | main.rs:314:24:316:9 | \|...\| ... | \|...\| ... |
+| main.rs:324:41:324:41 | i | main.rs:318:31:329:9 | \|...\| ... | main.rs:324:41:324:41 | i | $@ | main.rs:318:31:329:9 | \|...\| ... | \|...\| ... |
+| main.rs:324:41:324:41 | i | main.rs:318:31:329:9 | \|...\| ... | main.rs:324:41:324:41 | i | $@ | main.rs:318:31:329:9 | \|...\| ... | \|...\| ... |
+| main.rs:345:19:345:19 | a | main.rs:344:21:344:29 | source(...) | main.rs:345:19:345:19 | a | $@ | main.rs:344:21:344:29 | source(...) | source(...) |
+| main.rs:345:19:345:19 | a | main.rs:344:21:344:29 | source(...) | main.rs:345:19:345:19 | a | $@ | main.rs:344:21:344:29 | source(...) | source(...) |
+| main.rs:353:26:353:26 | b | main.rs:348:21:348:29 | source(...) | main.rs:353:26:353:26 | b | $@ | main.rs:348:21:348:29 | source(...) | source(...) |
+| main.rs:353:26:353:26 | b | main.rs:348:21:348:29 | source(...) | main.rs:353:26:353:26 | b | $@ | main.rs:348:21:348:29 | source(...) | source(...) |
+| main.rs:365:15:365:43 | ...::C {...} | main.rs:364:13:364:22 | source(...) | main.rs:365:15:365:43 | ...::C {...} | $@ | main.rs:364:13:364:22 | source(...) | source(...) |
+| main.rs:365:15:365:43 | ...::C {...} | main.rs:364:13:364:22 | source(...) | main.rs:365:15:365:43 | ...::C {...} | $@ | main.rs:364:13:364:22 | source(...) | source(...) |
+| main.rs:368:22:368:56 | ...::E {...} | main.rs:364:13:364:22 | source(...) | main.rs:368:22:368:56 | ...::E {...} | $@ | main.rs:364:13:364:22 | source(...) | source(...) |
+| main.rs:368:22:368:56 | ...::E {...} | main.rs:364:13:364:22 | source(...) | main.rs:368:22:368:56 | ...::E {...} | $@ | main.rs:364:13:364:22 | source(...) | source(...) |
+| main.rs:374:5:374:5 | e | main.rs:372:13:372:22 | source(...) | main.rs:374:5:374:5 | e | $@ | main.rs:372:13:372:22 | source(...) | source(...) |
+| main.rs:374:5:374:5 | e | main.rs:372:13:372:22 | source(...) | main.rs:374:5:374:5 | e | $@ | main.rs:372:13:372:22 | source(...) | source(...) |
+| main.rs:384:10:384:10 | s | main.rs:383:13:383:29 | simple_source(...) | main.rs:384:10:384:10 | s | $@ | main.rs:383:13:383:29 | simple_source(...) | simple_source(...) |
+| main.rs:384:10:384:10 | s | main.rs:383:13:383:29 | simple_source(...) | main.rs:384:10:384:10 | s | $@ | main.rs:383:13:383:29 | simple_source(...) | simple_source(...) |
+| main.rs:392:17:392:17 | s | main.rs:391:13:391:22 | source(...) | main.rs:392:17:392:17 | s | $@ | main.rs:391:13:391:22 | source(...) | source(...) |
+| main.rs:392:17:392:17 | s | main.rs:391:13:391:22 | source(...) | main.rs:392:17:392:17 | s | $@ | main.rs:391:13:391:22 | source(...) | source(...) |
+| main.rs:401:10:401:10 | i | main.rs:400:16:400:16 | i | main.rs:401:10:401:10 | i | $@ | main.rs:400:16:400:16 | i | i |
+| main.rs:401:10:401:10 | i | main.rs:400:16:400:16 | i | main.rs:401:10:401:10 | i | $@ | main.rs:400:16:400:16 | i | i |
+| main.rs:411:14:411:14 | i | main.rs:410:26:410:31 | ...: i64 | main.rs:411:14:411:14 | i | $@ | main.rs:410:26:410:31 | ...: i64 | ...: i64 |
+| main.rs:411:14:411:14 | i | main.rs:410:26:410:31 | ...: i64 | main.rs:411:14:411:14 | i | $@ | main.rs:410:26:410:31 | ...: i64 | ...: i64 |
+| main.rs:496:10:496:11 | x1 | main.rs:495:14:495:23 | source(...) | main.rs:496:10:496:11 | x1 | $@ | main.rs:495:14:495:23 | source(...) | source(...) |
+| main.rs:496:10:496:11 | x1 | main.rs:495:14:495:23 | source(...) | main.rs:496:10:496:11 | x1 | $@ | main.rs:495:14:495:23 | source(...) | source(...) |
+| main.rs:506:10:506:18 | x2.field1 | main.rs:499:17:499:26 | source(...) | main.rs:506:10:506:18 | x2.field1 | $@ | main.rs:499:17:499:26 | source(...) | source(...) |
+| main.rs:506:10:506:18 | x2.field1 | main.rs:499:17:499:26 | source(...) | main.rs:506:10:506:18 | x2.field1 | $@ | main.rs:499:17:499:26 | source(...) | source(...) |
+| main.rs:512:10:512:11 | x4 | main.rs:511:14:511:23 | source(...) | main.rs:512:10:512:11 | x4 | $@ | main.rs:511:14:511:23 | source(...) | source(...) |
+| main.rs:512:10:512:11 | x4 | main.rs:511:14:511:23 | source(...) | main.rs:512:10:512:11 | x4 | $@ | main.rs:511:14:511:23 | source(...) | source(...) |
+| main.rs:515:10:515:11 | x5 | main.rs:514:14:514:23 | source(...) | main.rs:515:10:515:11 | x5 | $@ | main.rs:514:14:514:23 | source(...) | source(...) |
+| main.rs:518:10:518:11 | x6 | main.rs:517:14:517:23 | source(...) | main.rs:518:10:518:11 | x6 | $@ | main.rs:517:14:517:23 | source(...) | source(...) |
+| main.rs:524:10:524:11 | x8 | main.rs:523:34:523:43 | source(...) | main.rs:524:10:524:11 | x8 | $@ | main.rs:523:34:523:43 | source(...) | source(...) |
+| main.rs:524:10:524:11 | x8 | main.rs:523:34:523:43 | source(...) | main.rs:524:10:524:11 | x8 | $@ | main.rs:523:34:523:43 | source(...) | source(...) |
+| main.rs:527:10:527:11 | x9 | main.rs:526:34:526:43 | source(...) | main.rs:527:10:527:11 | x9 | $@ | main.rs:526:34:526:43 | source(...) | source(...) |
+| main.rs:527:10:527:11 | x9 | main.rs:526:34:526:43 | source(...) | main.rs:527:10:527:11 | x9 | $@ | main.rs:526:34:526:43 | source(...) | source(...) |
+| main.rs:530:10:530:12 | x10 | main.rs:529:15:529:32 | ...::produce2(...) | main.rs:530:10:530:12 | x10 | $@ | main.rs:529:15:529:32 | ...::produce2(...) | ...::produce2(...) |
+| main.rs:530:10:530:12 | x10 | main.rs:529:15:529:32 | ...::produce2(...) | main.rs:530:10:530:12 | x10 | $@ | main.rs:529:15:529:32 | ...::produce2(...) | ...::produce2(...) |
+| main.rs:533:10:533:12 | x11 | main.rs:532:15:532:32 | ...::produce3(...) | main.rs:533:10:533:12 | x11 | $@ | main.rs:532:15:532:32 | ...::produce3(...) | ...::produce3(...) |
+| main.rs:533:10:533:12 | x11 | main.rs:532:15:532:32 | ...::produce3(...) | main.rs:533:10:533:12 | x11 | $@ | main.rs:532:15:532:32 | ...::produce3(...) | ...::produce3(...) |
+| main.rs:535:20:535:29 | source(...) | main.rs:535:20:535:29 | source(...) | main.rs:535:20:535:29 | source(...) | $@ | main.rs:535:20:535:29 | source(...) | source(...) |
+| main.rs:535:20:535:29 | source(...) | main.rs:535:20:535:29 | source(...) | main.rs:535:20:535:29 | source(...) | $@ | main.rs:535:20:535:29 | source(...) | source(...) |
+| main.rs:537:20:537:29 | source(...) | main.rs:537:20:537:29 | source(...) | main.rs:537:20:537:29 | source(...) | $@ | main.rs:537:20:537:29 | source(...) | source(...) |
+| main.rs:537:20:537:29 | source(...) | main.rs:537:20:537:29 | source(...) | main.rs:537:20:537:29 | source(...) | $@ | main.rs:537:20:537:29 | source(...) | source(...) |
+| main.rs:549:10:549:28 | generated_source(...) | main.rs:549:10:549:28 | generated_source(...) | main.rs:549:10:549:28 | generated_source(...) | $@ | main.rs:549:10:549:28 | generated_source(...) | generated_source(...) |
+| main.rs:549:10:549:28 | generated_source(...) | main.rs:549:10:549:28 | generated_source(...) | main.rs:549:10:549:28 | generated_source(...) | $@ | main.rs:549:10:549:28 | generated_source(...) | generated_source(...) |
+| main.rs:551:10:551:33 | neutral_manual_source(...) | main.rs:551:10:551:33 | neutral_manual_source(...) | main.rs:551:10:551:33 | neutral_manual_source(...) | $@ | main.rs:551:10:551:33 | neutral_manual_source(...) | neutral_manual_source(...) |
+| main.rs:551:10:551:33 | neutral_manual_source(...) | main.rs:551:10:551:33 | neutral_manual_source(...) | main.rs:551:10:551:33 | neutral_manual_source(...) | $@ | main.rs:551:10:551:33 | neutral_manual_source(...) | neutral_manual_source(...) |
+| main.rs:552:20:552:28 | source(...) | main.rs:552:20:552:28 | source(...) | main.rs:552:20:552:28 | source(...) | $@ | main.rs:552:20:552:28 | source(...) | source(...) |
+| main.rs:552:20:552:28 | source(...) | main.rs:552:20:552:28 | source(...) | main.rs:552:20:552:28 | source(...) | $@ | main.rs:552:20:552:28 | source(...) | source(...) |
+| main.rs:554:25:554:33 | source(...) | main.rs:554:25:554:33 | source(...) | main.rs:554:25:554:33 | source(...) | $@ | main.rs:554:25:554:33 | source(...) | source(...) |
+| main.rs:554:25:554:33 | source(...) | main.rs:554:25:554:33 | source(...) | main.rs:554:25:554:33 | source(...) | $@ | main.rs:554:25:554:33 | source(...) | source(...) |
+| main.rs:555:10:555:37 | generated_summary(...) | main.rs:555:28:555:36 | source(...) | main.rs:555:10:555:37 | generated_summary(...) | $@ | main.rs:555:28:555:36 | source(...) | source(...) |
+| main.rs:555:10:555:37 | generated_summary(...) | main.rs:555:28:555:36 | source(...) | main.rs:555:10:555:37 | generated_summary(...) | $@ | main.rs:555:28:555:36 | source(...) | source(...) |
+| main.rs:557:10:557:42 | neutral_manual_summary(...) | main.rs:557:33:557:41 | source(...) | main.rs:557:10:557:42 | neutral_manual_summary(...) | $@ | main.rs:557:33:557:41 | source(...) | source(...) |
+| main.rs:557:10:557:42 | neutral_manual_summary(...) | main.rs:557:33:557:41 | source(...) | main.rs:557:10:557:42 | neutral_manual_summary(...) | $@ | main.rs:557:33:557:41 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/models/models.ext.yml b/rust/ql/test/library-tests/dataflow/models/models.ext.yml
index 4e3377881a36..07edfd2fe612 100644
--- a/rust/ql/test/library-tests/dataflow/models/models.ext.yml
+++ b/rust/ql/test/library-tests/dataflow/models/models.ext.yml
@@ -5,22 +5,33 @@ extensions:
     data:
       - ["main::simple_source", "ReturnValue", "test-source", "manual"]
       - ["main::enum_source", "ReturnValue.Field[main::MyFieldEnum::D::field_d]", "test-source", "manual"]
+      - ["main::enum_source_nested", "ReturnValue.Field[main::MyFieldEnum::E::field_e].Field[core::option::Option::Some(0)]", "test-source", "manual"]
       - ["<main::MyFieldEnum>::source", "ReturnValue.Field[main::MyFieldEnum::C::field_c]", "test-source", "manual"]
       - ["main::arg_source", "Argument[0]", "test-source", "manual"]
+      - ["<main::MyTrait>::test_param_source", "Parameter[0]", "test-source", "manual"]
       - ["main::source_into_function::pass_source", "Argument[1].Parameter[0]", "test-source", "manual"]
+      - ["main::source_into_function::pass_source_nested", "Argument[1].Parameter[0].Field[main::MyFieldEnum::E::field_e].Field[core::option::Option::Some(0)]", "test-source", "manual"]
       - ["main::external_file::generated_source", "ReturnValue", "test-source", "dfc-generated"] # not actually generated, but we want to test behaviour of generated models here.
       - ["main::external_file::neutral_generated_source", "ReturnValue", "test-source", "dfc-generated"]
       - ["main::external_file::neutral_manual_source", "ReturnValue", "test-source", "manual"]
+      - ["<main::external_file::MySourceTrait2>::produce2", "ReturnValue", "test-source", "manual"]
+      - ["<_ as main::MySourceTrait3>::produce3", "ReturnValue", "test-source", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
       - ["main::simple_sink", "Argument[0]", "test-sink", "manual"]
       - ["main::enum_sink", "Argument[0].Field[main::MyFieldEnum::C::field_c]", "test-sink", "manual"]
+      - ["main::enum_sink_nested", "Argument[0].Field[main::MyFieldEnum::E::field_e].Field[core::option::Option::Some(0)]", "test-sink", "manual"]
       - ["<main::MyFieldEnum>::sink", "Argument[self].Field[main::MyFieldEnum::D::field_d]", "test-sink", "manual"]
+      - ["main::sink_out_of_function::pass_sink", "Argument[0].ReturnValue", "test-sink", "manual"]
+      - ["main::sink_out_of_function::pass_sink_nested", "Argument[0].ReturnValue.Field[main::MyFieldEnum::E::field_e].Field[core::option::Option::Some(0)]", "test-sink", "manual"]
+      - ["main::try_in_sink_callback::pass_sink_option", "Argument[0].ReturnValue", "test-sink", "manual"]
       - ["main::external_file::generated_sink", "Argument[0]", "test-sink", "dfc-generated"]
       - ["main::external_file::neutral_generated_sink", "Argument[0]", "test-sink", "dfc-generated"]
       - ["main::external_file::neutral_manual_sink", "Argument[0]", "test-sink", "manual"]
+      - ["<main::external_file::MySinkTrait2>::consume2", "Argument[0]", "test-sink", "manual"]
+      - ["<_ as main::MySinkTrait3>::consume3", "Argument[0]", "test-sink", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: summaryModel
@@ -42,12 +53,14 @@ extensions:
       - ["main::apply", "Argument[0]", "Argument[1].Parameter[0]", "value", "manual"]
       - ["main::apply", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
       - ["main::get_async_number", "Argument[0]", "ReturnValue.Future", "value", "manual"]
-      - ["<_ as core::cmp::PartialOrd>::lt", "Argument[self].Reference", "ReturnValue", "taint", "manual"]
+      - ["<core::cmp::PartialOrd>::lt", "Argument[self].Reference", "ReturnValue", "taint", "manual"]
       # Overwrites the generic trait model for i32
       - ["<core::i32 as core::cmp::PartialOrd>::lt", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["main::external_file::generated_summary", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["main::external_file::neutral_generated_summary", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["main::external_file::neutral_manual_summary", "Argument[0]", "ReturnValue", "value", "manual"]
+      - ["<main::external_file::MyTrait2>::flow_through2", "Argument[0]", "ReturnValue", "value", "manual"]
+      - ["<_ as main::MyTrait3>::flow_through3", "Argument[0]", "ReturnValue", "value", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: neutralModel
diff --git a/rust/ql/test/library-tests/dataflow/sources/database/InlineFlow.expected b/rust/ql/test/library-tests/dataflow/sources/database/InlineFlow.expected
index 5b3e890545b3..7135bcf0a373 100644
--- a/rust/ql/test/library-tests/dataflow/sources/database/InlineFlow.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/database/InlineFlow.expected
@@ -1,55 +1,55 @@
 models
-| 1 | Source: <_ as mysql::conn::queryable::Queryable>::query_first; ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]; database |
-| 2 | Source: <_ as mysql::conn::queryable::Queryable>::query_fold; Argument[2].Parameter[1]; database |
-| 3 | Source: <_ as mysql::conn::queryable::Queryable>::query_map; Argument[1].Parameter[0]; database |
-| 4 | Source: <_ as mysql_async::queryable::Queryable>::query_fold; Argument[2].Parameter[1]; database |
-| 5 | Source: <_ as mysql_async::queryable::Queryable>::query_map; Argument[1].Parameter[0]; database |
-| 6 | Source: <mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::exec_iter; ReturnValue.Field[core::result::Result::Ok(0)].Element; database |
+| 1 | Source: <mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::exec_iter; ReturnValue.Field[core::result::Result::Ok(0)].Element; database |
+| 2 | Source: <mysql::conn::queryable::Queryable>::query_first; ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]; database |
+| 3 | Source: <mysql::conn::queryable::Queryable>::query_fold; Argument[2].Parameter[1]; database |
+| 4 | Source: <mysql::conn::queryable::Queryable>::query_map; Argument[1].Parameter[0]; database |
+| 5 | Source: <mysql_async::queryable::Queryable>::query_fold; Argument[2].Parameter[1]; database |
+| 6 | Source: <mysql_async::queryable::Queryable>::query_map; Argument[1].Parameter[0]; database |
 | 7 | Source: <mysql_common::row::Row>::get; ReturnValue.Field[core::option::Option::Some(0)]; database |
 | 8 | Source: <mysql_common::row::Row>::get_opt; ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]; database |
 | 9 | Source: <mysql_common::row::Row>::take; ReturnValue.Field[core::option::Option::Some(0)]; database |
 | 10 | Source: <mysql_common::row::Row>::take_opt; ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]; database |
-| 11 | Summary: <_ as core::ops::arith::Add>::add; Argument[self,0].Field[core::num::wrapping::Wrapping(0)]; ReturnValue.Field[core::num::wrapping::Wrapping(0)]; taint |
-| 12 | Summary: <_ as core::ops::arith::Add>::add; Argument[self,0]; ReturnValue; taint |
-| 13 | Summary: <_ as mysql::conn::queryable::Queryable>::query_fold; Argument[2].ReturnValue; ReturnValue.Field[core::result::Result::Ok(0)]; value |
-| 14 | Summary: <_ as mysql_async::queryable::Queryable>::query_fold; Argument[2].ReturnValue; ReturnValue.Future.Field[core::result::Result::Ok(0)]; value |
-| 15 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
-| 16 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 11 | Summary: <core::ops::arith::Add>::add; Argument[self,0].Field[core::num::wrapping::Wrapping(0)]; ReturnValue.Field[core::num::wrapping::Wrapping(0)]; taint |
+| 12 | Summary: <core::ops::arith::Add>::add; Argument[self,0]; ReturnValue; taint |
+| 13 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 14 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 15 | Summary: <mysql::conn::queryable::Queryable>::query_fold; Argument[2].ReturnValue; ReturnValue.Field[core::result::Result::Ok(0)]; value |
+| 16 | Summary: <mysql_async::queryable::Queryable>::query_fold; Argument[2].ReturnValue; ReturnValue.Future.Field[core::result::Result::Ok(0)]; value |
 edges
 | test.rs:18:13:18:14 | v1 | test.rs:19:14:19:15 | v1 | provenance |  |
-| test.rs:18:24:18:33 | row.get(...) [Some] | test.rs:18:24:18:42 | ... .unwrap() | provenance | MaD:15 |
+| test.rs:18:24:18:33 | row.get(...) | test.rs:18:24:18:33 | row.get(...) [Some] | provenance | Src:MaD:7  |
+| test.rs:18:24:18:33 | row.get(...) [Some] | test.rs:18:24:18:42 | ... .unwrap() | provenance | MaD:13 |
 | test.rs:18:24:18:42 | ... .unwrap() | test.rs:18:13:18:14 | v1 | provenance |  |
-| test.rs:18:28:18:30 | get | test.rs:18:24:18:33 | row.get(...) [Some] | provenance | Src:MaD:7  |
 | test.rs:21:13:21:14 | v2 | test.rs:22:14:22:15 | v2 | provenance |  |
-| test.rs:21:24:21:37 | row.get_opt(...) [Some, Ok] | test.rs:21:24:21:46 | ... .unwrap() [Ok] | provenance | MaD:15 |
-| test.rs:21:24:21:46 | ... .unwrap() [Ok] | test.rs:21:24:21:55 | ... .unwrap() | provenance | MaD:16 |
+| test.rs:21:24:21:37 | row.get_opt(...) | test.rs:21:24:21:37 | row.get_opt(...) [Some, Ok] | provenance | Src:MaD:8  |
+| test.rs:21:24:21:37 | row.get_opt(...) [Some, Ok] | test.rs:21:24:21:46 | ... .unwrap() [Ok] | provenance | MaD:13 |
+| test.rs:21:24:21:46 | ... .unwrap() [Ok] | test.rs:21:24:21:55 | ... .unwrap() | provenance | MaD:14 |
 | test.rs:21:24:21:55 | ... .unwrap() | test.rs:21:13:21:14 | v2 | provenance |  |
-| test.rs:21:28:21:34 | get_opt | test.rs:21:24:21:37 | row.get_opt(...) [Some, Ok] | provenance | Src:MaD:8  |
 | test.rs:24:13:24:14 | v3 | test.rs:25:14:25:15 | v3 | provenance |  |
-| test.rs:24:24:24:34 | row.take(...) [Some] | test.rs:24:24:24:43 | ... .unwrap() | provenance | MaD:15 |
+| test.rs:24:24:24:34 | row.take(...) | test.rs:24:24:24:34 | row.take(...) [Some] | provenance | Src:MaD:9  |
+| test.rs:24:24:24:34 | row.take(...) [Some] | test.rs:24:24:24:43 | ... .unwrap() | provenance | MaD:13 |
 | test.rs:24:24:24:43 | ... .unwrap() | test.rs:24:13:24:14 | v3 | provenance |  |
-| test.rs:24:28:24:31 | take | test.rs:24:24:24:34 | row.take(...) [Some] | provenance | Src:MaD:9  |
 | test.rs:27:13:27:14 | v4 | test.rs:28:14:28:15 | v4 | provenance |  |
-| test.rs:27:24:27:38 | row.take_opt(...) [Some, Ok] | test.rs:27:24:27:47 | ... .unwrap() [Ok] | provenance | MaD:15 |
-| test.rs:27:24:27:47 | ... .unwrap() [Ok] | test.rs:27:24:27:56 | ... .unwrap() | provenance | MaD:16 |
+| test.rs:27:24:27:38 | row.take_opt(...) | test.rs:27:24:27:38 | row.take_opt(...) [Some, Ok] | provenance | Src:MaD:10  |
+| test.rs:27:24:27:38 | row.take_opt(...) [Some, Ok] | test.rs:27:24:27:47 | ... .unwrap() [Ok] | provenance | MaD:13 |
+| test.rs:27:24:27:47 | ... .unwrap() [Ok] | test.rs:27:24:27:56 | ... .unwrap() | provenance | MaD:14 |
 | test.rs:27:24:27:56 | ... .unwrap() | test.rs:27:13:27:14 | v4 | provenance |  |
-| test.rs:27:28:27:35 | take_opt | test.rs:27:24:27:38 | row.take_opt(...) [Some, Ok] | provenance | Src:MaD:10  |
 | test.rs:37:13:37:14 | v6 | test.rs:38:14:38:15 | v6 | provenance |  |
+| test.rs:37:23:37:63 | conn.query_first(...) | test.rs:37:23:37:63 | conn.query_first(...) [Ok, Some] | provenance | Src:MaD:2  |
 | test.rs:37:23:37:63 | conn.query_first(...) [Ok, Some] | test.rs:37:23:37:64 | TryExpr [Some] | provenance |  |
-| test.rs:37:23:37:64 | TryExpr [Some] | test.rs:37:23:37:73 | ... .unwrap() | provenance | MaD:15 |
+| test.rs:37:23:37:64 | TryExpr [Some] | test.rs:37:23:37:73 | ... .unwrap() | provenance | MaD:13 |
 | test.rs:37:23:37:73 | ... .unwrap() | test.rs:37:13:37:14 | v6 | provenance |  |
-| test.rs:37:28:37:38 | query_first | test.rs:37:23:37:63 | conn.query_first(...) [Ok, Some] | provenance | Src:MaD:1  |
 | test.rs:40:13:40:18 | mut t1 [element] | test.rs:42:20:42:21 | t1 [element] | provenance |  |
+| test.rs:40:22:40:71 | conn.exec_iter(...) | test.rs:40:22:40:71 | conn.exec_iter(...) [Ok, element] | provenance | Src:MaD:1  |
 | test.rs:40:22:40:71 | conn.exec_iter(...) [Ok, element] | test.rs:40:22:40:72 | TryExpr [element] | provenance |  |
 | test.rs:40:22:40:72 | TryExpr [element] | test.rs:40:13:40:18 | mut t1 [element] | provenance |  |
-| test.rs:40:27:40:35 | exec_iter | test.rs:40:22:40:71 | conn.exec_iter(...) [Ok, element] | provenance | Src:MaD:6  |
-| test.rs:41:14:41:61 | ... .get(...) [Some] | test.rs:41:14:41:70 | ... .unwrap() | provenance | MaD:15 |
-| test.rs:41:42:41:44 | get | test.rs:41:14:41:61 | ... .get(...) [Some] | provenance | Src:MaD:7  |
+| test.rs:41:14:41:61 | ... .get(...) | test.rs:41:14:41:61 | ... .get(...) [Some] | provenance | Src:MaD:7  |
+| test.rs:41:14:41:61 | ... .get(...) [Some] | test.rs:41:14:41:70 | ... .unwrap() | provenance | MaD:13 |
 | test.rs:42:13:42:15 | row | test.rs:44:22:44:22 | v | provenance |  |
 | test.rs:42:20:42:21 | t1 [element] | test.rs:42:13:42:15 | row | provenance |  |
-| test.rs:48:22:48:30 | query_map | test.rs:50:14:50:24 | ...: i64 | provenance | Src:MaD:3  |
+| test.rs:50:13:52:13 | \|...\| ... | test.rs:50:14:50:24 | ...: i64 | provenance | Src:MaD:4  |
 | test.rs:50:14:50:24 | ...: i64 | test.rs:51:22:51:27 | values | provenance |  |
-| test.rs:55:22:55:30 | query_map | test.rs:57:14:57:39 | ...: ... | provenance | Src:MaD:3  |
+| test.rs:57:13:61:13 | \|...\| ... | test.rs:57:14:57:39 | ...: ... | provenance | Src:MaD:4  |
 | test.rs:57:14:57:39 | ...: ... | test.rs:58:22:58:29 | values.0 | provenance |  |
 | test.rs:57:14:57:39 | ...: ... | test.rs:59:22:59:29 | values.1 | provenance |  |
 | test.rs:57:14:57:39 | ...: ... | test.rs:60:22:60:29 | values.2 | provenance |  |
@@ -59,16 +59,16 @@ edges
 | test.rs:64:21:67:10 | conn.query_fold(...) [Ok] | test.rs:64:21:67:11 | TryExpr | provenance |  |
 | test.rs:64:21:67:11 | TryExpr | test.rs:64:13:64:17 | total | provenance |  |
 | test.rs:64:21:67:11 | TryExpr [Wrapping] | test.rs:64:13:64:17 | total [Wrapping] | provenance |  |
-| test.rs:64:26:64:35 | query_fold | test.rs:64:76:64:83 | ...: i64 | provenance | Src:MaD:2  |
+| test.rs:64:65:67:9 | \|...\| ... | test.rs:64:76:64:83 | ...: i64 | provenance | Src:MaD:3  |
 | test.rs:64:76:64:83 | ...: i64 | test.rs:65:18:65:20 | row | provenance |  |
 | test.rs:64:76:64:83 | ...: i64 | test.rs:66:19:66:21 | row | provenance |  |
-| test.rs:64:86:67:9 | { ... } | test.rs:64:21:67:10 | conn.query_fold(...) [Ok] | provenance | MaD:13 |
-| test.rs:64:86:67:9 | { ... } [Wrapping] | test.rs:64:21:67:10 | conn.query_fold(...) [Ok, Wrapping] | provenance | MaD:13 |
+| test.rs:64:86:67:9 | { ... } | test.rs:64:21:67:10 | conn.query_fold(...) [Ok] | provenance | MaD:15 |
+| test.rs:64:86:67:9 | { ... } [Wrapping] | test.rs:64:21:67:10 | conn.query_fold(...) [Ok, Wrapping] | provenance | MaD:15 |
 | test.rs:66:13:66:21 | ... + ... | test.rs:64:86:67:9 | { ... } | provenance |  |
 | test.rs:66:13:66:21 | ... + ... [Wrapping] | test.rs:64:86:67:9 | { ... } [Wrapping] | provenance |  |
 | test.rs:66:19:66:21 | row | test.rs:66:13:66:21 | ... + ... | provenance | MaD:12 |
 | test.rs:66:19:66:21 | row | test.rs:66:13:66:21 | ... + ... [Wrapping] | provenance | MaD:11 |
-| test.rs:70:22:70:31 | query_fold | test.rs:70:83:70:105 | ...: ... | provenance | Src:MaD:2  |
+| test.rs:70:72:78:9 | \|...\| ... | test.rs:70:83:70:105 | ...: ... | provenance | Src:MaD:3  |
 | test.rs:70:83:70:105 | ...: ... | test.rs:71:17:71:18 | id | provenance |  |
 | test.rs:70:83:70:105 | ...: ... | test.rs:72:17:72:20 | name | provenance |  |
 | test.rs:70:83:70:105 | ...: ... | test.rs:73:17:73:19 | age | provenance |  |
@@ -76,26 +76,26 @@ edges
 | test.rs:72:17:72:20 | name | test.rs:75:18:75:21 | name | provenance |  |
 | test.rs:73:17:73:19 | age | test.rs:76:18:76:20 | age | provenance |  |
 | test.rs:105:13:105:14 | v1 | test.rs:106:14:106:15 | v1 | provenance |  |
-| test.rs:105:24:105:33 | row.get(...) [Some] | test.rs:105:24:105:42 | ... .unwrap() | provenance | MaD:15 |
+| test.rs:105:24:105:33 | row.get(...) | test.rs:105:24:105:33 | row.get(...) [Some] | provenance | Src:MaD:7  |
+| test.rs:105:24:105:33 | row.get(...) [Some] | test.rs:105:24:105:42 | ... .unwrap() | provenance | MaD:13 |
 | test.rs:105:24:105:42 | ... .unwrap() | test.rs:105:13:105:14 | v1 | provenance |  |
-| test.rs:105:28:105:30 | get | test.rs:105:24:105:33 | row.get(...) [Some] | provenance | Src:MaD:7  |
 | test.rs:108:13:108:14 | v2 | test.rs:109:14:109:15 | v2 | provenance |  |
-| test.rs:108:24:108:37 | row.get_opt(...) [Some, Ok] | test.rs:108:24:108:46 | ... .unwrap() [Ok] | provenance | MaD:15 |
-| test.rs:108:24:108:46 | ... .unwrap() [Ok] | test.rs:108:24:108:55 | ... .unwrap() | provenance | MaD:16 |
+| test.rs:108:24:108:37 | row.get_opt(...) | test.rs:108:24:108:37 | row.get_opt(...) [Some, Ok] | provenance | Src:MaD:8  |
+| test.rs:108:24:108:37 | row.get_opt(...) [Some, Ok] | test.rs:108:24:108:46 | ... .unwrap() [Ok] | provenance | MaD:13 |
+| test.rs:108:24:108:46 | ... .unwrap() [Ok] | test.rs:108:24:108:55 | ... .unwrap() | provenance | MaD:14 |
 | test.rs:108:24:108:55 | ... .unwrap() | test.rs:108:13:108:14 | v2 | provenance |  |
-| test.rs:108:28:108:34 | get_opt | test.rs:108:24:108:37 | row.get_opt(...) [Some, Ok] | provenance | Src:MaD:8  |
 | test.rs:111:13:111:14 | v3 | test.rs:112:14:112:15 | v3 | provenance |  |
-| test.rs:111:24:111:34 | row.take(...) [Some] | test.rs:111:24:111:43 | ... .unwrap() | provenance | MaD:15 |
+| test.rs:111:24:111:34 | row.take(...) | test.rs:111:24:111:34 | row.take(...) [Some] | provenance | Src:MaD:9  |
+| test.rs:111:24:111:34 | row.take(...) [Some] | test.rs:111:24:111:43 | ... .unwrap() | provenance | MaD:13 |
 | test.rs:111:24:111:43 | ... .unwrap() | test.rs:111:13:111:14 | v3 | provenance |  |
-| test.rs:111:28:111:31 | take | test.rs:111:24:111:34 | row.take(...) [Some] | provenance | Src:MaD:9  |
 | test.rs:114:13:114:14 | v4 | test.rs:115:14:115:15 | v4 | provenance |  |
-| test.rs:114:24:114:38 | row.take_opt(...) [Some, Ok] | test.rs:114:24:114:47 | ... .unwrap() [Ok] | provenance | MaD:15 |
-| test.rs:114:24:114:47 | ... .unwrap() [Ok] | test.rs:114:24:114:56 | ... .unwrap() | provenance | MaD:16 |
+| test.rs:114:24:114:38 | row.take_opt(...) | test.rs:114:24:114:38 | row.take_opt(...) [Some, Ok] | provenance | Src:MaD:10  |
+| test.rs:114:24:114:38 | row.take_opt(...) [Some, Ok] | test.rs:114:24:114:47 | ... .unwrap() [Ok] | provenance | MaD:13 |
+| test.rs:114:24:114:47 | ... .unwrap() [Ok] | test.rs:114:24:114:56 | ... .unwrap() | provenance | MaD:14 |
 | test.rs:114:24:114:56 | ... .unwrap() | test.rs:114:13:114:14 | v4 | provenance |  |
-| test.rs:114:28:114:35 | take_opt | test.rs:114:24:114:38 | row.take_opt(...) [Some, Ok] | provenance | Src:MaD:10  |
-| test.rs:135:22:135:30 | query_map | test.rs:137:14:137:24 | ...: i64 | provenance | Src:MaD:5  |
+| test.rs:137:13:139:13 | \|...\| ... | test.rs:137:14:137:24 | ...: i64 | provenance | Src:MaD:6  |
 | test.rs:137:14:137:24 | ...: i64 | test.rs:138:22:138:27 | values | provenance |  |
-| test.rs:142:22:142:30 | query_map | test.rs:144:14:144:39 | ...: ... | provenance | Src:MaD:5  |
+| test.rs:144:13:148:13 | \|...\| ... | test.rs:144:14:144:39 | ...: ... | provenance | Src:MaD:6  |
 | test.rs:144:14:144:39 | ...: ... | test.rs:145:22:145:29 | values.0 | provenance |  |
 | test.rs:144:14:144:39 | ...: ... | test.rs:146:22:146:29 | values.1 | provenance |  |
 | test.rs:144:14:144:39 | ...: ... | test.rs:147:22:147:29 | values.2 | provenance |  |
@@ -107,16 +107,16 @@ edges
 | test.rs:151:21:154:16 | await ... [Ok] | test.rs:151:21:154:17 | TryExpr | provenance |  |
 | test.rs:151:21:154:17 | TryExpr | test.rs:151:13:151:17 | total | provenance |  |
 | test.rs:151:21:154:17 | TryExpr [Wrapping] | test.rs:151:13:151:17 | total [Wrapping] | provenance |  |
-| test.rs:151:26:151:35 | query_fold | test.rs:151:76:151:83 | ...: i64 | provenance | Src:MaD:4  |
+| test.rs:151:65:154:9 | \|...\| ... | test.rs:151:76:151:83 | ...: i64 | provenance | Src:MaD:5  |
 | test.rs:151:76:151:83 | ...: i64 | test.rs:152:18:152:20 | row | provenance |  |
 | test.rs:151:76:151:83 | ...: i64 | test.rs:153:19:153:21 | row | provenance |  |
-| test.rs:151:86:154:9 | { ... } | test.rs:151:21:154:10 | conn.query_fold(...) [future, Ok] | provenance | MaD:14 |
-| test.rs:151:86:154:9 | { ... } [Wrapping] | test.rs:151:21:154:10 | conn.query_fold(...) [future, Ok, Wrapping] | provenance | MaD:14 |
+| test.rs:151:86:154:9 | { ... } | test.rs:151:21:154:10 | conn.query_fold(...) [future, Ok] | provenance | MaD:16 |
+| test.rs:151:86:154:9 | { ... } [Wrapping] | test.rs:151:21:154:10 | conn.query_fold(...) [future, Ok, Wrapping] | provenance | MaD:16 |
 | test.rs:153:13:153:21 | ... + ... | test.rs:151:86:154:9 | { ... } | provenance |  |
 | test.rs:153:13:153:21 | ... + ... [Wrapping] | test.rs:151:86:154:9 | { ... } [Wrapping] | provenance |  |
 | test.rs:153:19:153:21 | row | test.rs:153:13:153:21 | ... + ... | provenance | MaD:12 |
 | test.rs:153:19:153:21 | row | test.rs:153:13:153:21 | ... + ... [Wrapping] | provenance | MaD:11 |
-| test.rs:157:22:157:31 | query_fold | test.rs:157:83:157:105 | ...: ... | provenance | Src:MaD:4  |
+| test.rs:157:72:165:9 | \|...\| ... | test.rs:157:83:157:105 | ...: ... | provenance | Src:MaD:5  |
 | test.rs:157:83:157:105 | ...: ... | test.rs:158:17:158:18 | id | provenance |  |
 | test.rs:157:83:157:105 | ...: ... | test.rs:159:17:159:20 | name | provenance |  |
 | test.rs:157:83:157:105 | ...: ... | test.rs:160:17:160:19 | age | provenance |  |
@@ -125,47 +125,47 @@ edges
 | test.rs:160:17:160:19 | age | test.rs:163:18:163:20 | age | provenance |  |
 nodes
 | test.rs:18:13:18:14 | v1 | semmle.label | v1 |
+| test.rs:18:24:18:33 | row.get(...) | semmle.label | row.get(...) |
 | test.rs:18:24:18:33 | row.get(...) [Some] | semmle.label | row.get(...) [Some] |
 | test.rs:18:24:18:42 | ... .unwrap() | semmle.label | ... .unwrap() |
-| test.rs:18:28:18:30 | get | semmle.label | get |
 | test.rs:19:14:19:15 | v1 | semmle.label | v1 |
 | test.rs:21:13:21:14 | v2 | semmle.label | v2 |
+| test.rs:21:24:21:37 | row.get_opt(...) | semmle.label | row.get_opt(...) |
 | test.rs:21:24:21:37 | row.get_opt(...) [Some, Ok] | semmle.label | row.get_opt(...) [Some, Ok] |
 | test.rs:21:24:21:46 | ... .unwrap() [Ok] | semmle.label | ... .unwrap() [Ok] |
 | test.rs:21:24:21:55 | ... .unwrap() | semmle.label | ... .unwrap() |
-| test.rs:21:28:21:34 | get_opt | semmle.label | get_opt |
 | test.rs:22:14:22:15 | v2 | semmle.label | v2 |
 | test.rs:24:13:24:14 | v3 | semmle.label | v3 |
+| test.rs:24:24:24:34 | row.take(...) | semmle.label | row.take(...) |
 | test.rs:24:24:24:34 | row.take(...) [Some] | semmle.label | row.take(...) [Some] |
 | test.rs:24:24:24:43 | ... .unwrap() | semmle.label | ... .unwrap() |
-| test.rs:24:28:24:31 | take | semmle.label | take |
 | test.rs:25:14:25:15 | v3 | semmle.label | v3 |
 | test.rs:27:13:27:14 | v4 | semmle.label | v4 |
+| test.rs:27:24:27:38 | row.take_opt(...) | semmle.label | row.take_opt(...) |
 | test.rs:27:24:27:38 | row.take_opt(...) [Some, Ok] | semmle.label | row.take_opt(...) [Some, Ok] |
 | test.rs:27:24:27:47 | ... .unwrap() [Ok] | semmle.label | ... .unwrap() [Ok] |
 | test.rs:27:24:27:56 | ... .unwrap() | semmle.label | ... .unwrap() |
-| test.rs:27:28:27:35 | take_opt | semmle.label | take_opt |
 | test.rs:28:14:28:15 | v4 | semmle.label | v4 |
 | test.rs:37:13:37:14 | v6 | semmle.label | v6 |
+| test.rs:37:23:37:63 | conn.query_first(...) | semmle.label | conn.query_first(...) |
 | test.rs:37:23:37:63 | conn.query_first(...) [Ok, Some] | semmle.label | conn.query_first(...) [Ok, Some] |
 | test.rs:37:23:37:64 | TryExpr [Some] | semmle.label | TryExpr [Some] |
 | test.rs:37:23:37:73 | ... .unwrap() | semmle.label | ... .unwrap() |
-| test.rs:37:28:37:38 | query_first | semmle.label | query_first |
 | test.rs:38:14:38:15 | v6 | semmle.label | v6 |
 | test.rs:40:13:40:18 | mut t1 [element] | semmle.label | mut t1 [element] |
+| test.rs:40:22:40:71 | conn.exec_iter(...) | semmle.label | conn.exec_iter(...) |
 | test.rs:40:22:40:71 | conn.exec_iter(...) [Ok, element] | semmle.label | conn.exec_iter(...) [Ok, element] |
 | test.rs:40:22:40:72 | TryExpr [element] | semmle.label | TryExpr [element] |
-| test.rs:40:27:40:35 | exec_iter | semmle.label | exec_iter |
+| test.rs:41:14:41:61 | ... .get(...) | semmle.label | ... .get(...) |
 | test.rs:41:14:41:61 | ... .get(...) [Some] | semmle.label | ... .get(...) [Some] |
 | test.rs:41:14:41:70 | ... .unwrap() | semmle.label | ... .unwrap() |
-| test.rs:41:42:41:44 | get | semmle.label | get |
 | test.rs:42:13:42:15 | row | semmle.label | row |
 | test.rs:42:20:42:21 | t1 [element] | semmle.label | t1 [element] |
 | test.rs:44:22:44:22 | v | semmle.label | v |
-| test.rs:48:22:48:30 | query_map | semmle.label | query_map |
+| test.rs:50:13:52:13 | \|...\| ... | semmle.label | \|...\| ... |
 | test.rs:50:14:50:24 | ...: i64 | semmle.label | ...: i64 |
 | test.rs:51:22:51:27 | values | semmle.label | values |
-| test.rs:55:22:55:30 | query_map | semmle.label | query_map |
+| test.rs:57:13:61:13 | \|...\| ... | semmle.label | \|...\| ... |
 | test.rs:57:14:57:39 | ...: ... | semmle.label | ...: ... |
 | test.rs:58:22:58:29 | values.0 | semmle.label | values.0 |
 | test.rs:59:22:59:29 | values.1 | semmle.label | values.1 |
@@ -176,7 +176,7 @@ nodes
 | test.rs:64:21:67:10 | conn.query_fold(...) [Ok] | semmle.label | conn.query_fold(...) [Ok] |
 | test.rs:64:21:67:11 | TryExpr | semmle.label | TryExpr |
 | test.rs:64:21:67:11 | TryExpr [Wrapping] | semmle.label | TryExpr [Wrapping] |
-| test.rs:64:26:64:35 | query_fold | semmle.label | query_fold |
+| test.rs:64:65:67:9 | \|...\| ... | semmle.label | \|...\| ... |
 | test.rs:64:76:64:83 | ...: i64 | semmle.label | ...: i64 |
 | test.rs:64:86:67:9 | { ... } | semmle.label | { ... } |
 | test.rs:64:86:67:9 | { ... } [Wrapping] | semmle.label | { ... } [Wrapping] |
@@ -185,7 +185,7 @@ nodes
 | test.rs:66:13:66:21 | ... + ... [Wrapping] | semmle.label | ... + ... [Wrapping] |
 | test.rs:66:19:66:21 | row | semmle.label | row |
 | test.rs:68:14:68:18 | total | semmle.label | total |
-| test.rs:70:22:70:31 | query_fold | semmle.label | query_fold |
+| test.rs:70:72:78:9 | \|...\| ... | semmle.label | \|...\| ... |
 | test.rs:70:83:70:105 | ...: ... | semmle.label | ...: ... |
 | test.rs:71:17:71:18 | id | semmle.label | id |
 | test.rs:72:17:72:20 | name | semmle.label | name |
@@ -194,31 +194,31 @@ nodes
 | test.rs:75:18:75:21 | name | semmle.label | name |
 | test.rs:76:18:76:20 | age | semmle.label | age |
 | test.rs:105:13:105:14 | v1 | semmle.label | v1 |
+| test.rs:105:24:105:33 | row.get(...) | semmle.label | row.get(...) |
 | test.rs:105:24:105:33 | row.get(...) [Some] | semmle.label | row.get(...) [Some] |
 | test.rs:105:24:105:42 | ... .unwrap() | semmle.label | ... .unwrap() |
-| test.rs:105:28:105:30 | get | semmle.label | get |
 | test.rs:106:14:106:15 | v1 | semmle.label | v1 |
 | test.rs:108:13:108:14 | v2 | semmle.label | v2 |
+| test.rs:108:24:108:37 | row.get_opt(...) | semmle.label | row.get_opt(...) |
 | test.rs:108:24:108:37 | row.get_opt(...) [Some, Ok] | semmle.label | row.get_opt(...) [Some, Ok] |
 | test.rs:108:24:108:46 | ... .unwrap() [Ok] | semmle.label | ... .unwrap() [Ok] |
 | test.rs:108:24:108:55 | ... .unwrap() | semmle.label | ... .unwrap() |
-| test.rs:108:28:108:34 | get_opt | semmle.label | get_opt |
 | test.rs:109:14:109:15 | v2 | semmle.label | v2 |
 | test.rs:111:13:111:14 | v3 | semmle.label | v3 |
+| test.rs:111:24:111:34 | row.take(...) | semmle.label | row.take(...) |
 | test.rs:111:24:111:34 | row.take(...) [Some] | semmle.label | row.take(...) [Some] |
 | test.rs:111:24:111:43 | ... .unwrap() | semmle.label | ... .unwrap() |
-| test.rs:111:28:111:31 | take | semmle.label | take |
 | test.rs:112:14:112:15 | v3 | semmle.label | v3 |
 | test.rs:114:13:114:14 | v4 | semmle.label | v4 |
+| test.rs:114:24:114:38 | row.take_opt(...) | semmle.label | row.take_opt(...) |
 | test.rs:114:24:114:38 | row.take_opt(...) [Some, Ok] | semmle.label | row.take_opt(...) [Some, Ok] |
 | test.rs:114:24:114:47 | ... .unwrap() [Ok] | semmle.label | ... .unwrap() [Ok] |
 | test.rs:114:24:114:56 | ... .unwrap() | semmle.label | ... .unwrap() |
-| test.rs:114:28:114:35 | take_opt | semmle.label | take_opt |
 | test.rs:115:14:115:15 | v4 | semmle.label | v4 |
-| test.rs:135:22:135:30 | query_map | semmle.label | query_map |
+| test.rs:137:13:139:13 | \|...\| ... | semmle.label | \|...\| ... |
 | test.rs:137:14:137:24 | ...: i64 | semmle.label | ...: i64 |
 | test.rs:138:22:138:27 | values | semmle.label | values |
-| test.rs:142:22:142:30 | query_map | semmle.label | query_map |
+| test.rs:144:13:148:13 | \|...\| ... | semmle.label | \|...\| ... |
 | test.rs:144:14:144:39 | ...: ... | semmle.label | ...: ... |
 | test.rs:145:22:145:29 | values.0 | semmle.label | values.0 |
 | test.rs:146:22:146:29 | values.1 | semmle.label | values.1 |
@@ -231,7 +231,7 @@ nodes
 | test.rs:151:21:154:16 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:151:21:154:17 | TryExpr | semmle.label | TryExpr |
 | test.rs:151:21:154:17 | TryExpr [Wrapping] | semmle.label | TryExpr [Wrapping] |
-| test.rs:151:26:151:35 | query_fold | semmle.label | query_fold |
+| test.rs:151:65:154:9 | \|...\| ... | semmle.label | \|...\| ... |
 | test.rs:151:76:151:83 | ...: i64 | semmle.label | ...: i64 |
 | test.rs:151:86:154:9 | { ... } | semmle.label | { ... } |
 | test.rs:151:86:154:9 | { ... } [Wrapping] | semmle.label | { ... } [Wrapping] |
@@ -240,7 +240,7 @@ nodes
 | test.rs:153:13:153:21 | ... + ... [Wrapping] | semmle.label | ... + ... [Wrapping] |
 | test.rs:153:19:153:21 | row | semmle.label | row |
 | test.rs:155:14:155:18 | total | semmle.label | total |
-| test.rs:157:22:157:31 | query_fold | semmle.label | query_fold |
+| test.rs:157:72:165:9 | \|...\| ... | semmle.label | \|...\| ... |
 | test.rs:157:83:157:105 | ...: ... | semmle.label | ...: ... |
 | test.rs:158:17:158:18 | id | semmle.label | id |
 | test.rs:159:17:159:20 | name | semmle.label | name |
@@ -251,32 +251,32 @@ nodes
 subpaths
 testFailures
 #select
-| test.rs:19:14:19:15 | v1 | test.rs:18:28:18:30 | get | test.rs:19:14:19:15 | v1 | $@ | test.rs:18:28:18:30 | get | get |
-| test.rs:22:14:22:15 | v2 | test.rs:21:28:21:34 | get_opt | test.rs:22:14:22:15 | v2 | $@ | test.rs:21:28:21:34 | get_opt | get_opt |
-| test.rs:25:14:25:15 | v3 | test.rs:24:28:24:31 | take | test.rs:25:14:25:15 | v3 | $@ | test.rs:24:28:24:31 | take | take |
-| test.rs:28:14:28:15 | v4 | test.rs:27:28:27:35 | take_opt | test.rs:28:14:28:15 | v4 | $@ | test.rs:27:28:27:35 | take_opt | take_opt |
-| test.rs:38:14:38:15 | v6 | test.rs:37:28:37:38 | query_first | test.rs:38:14:38:15 | v6 | $@ | test.rs:37:28:37:38 | query_first | query_first |
-| test.rs:41:14:41:70 | ... .unwrap() | test.rs:41:42:41:44 | get | test.rs:41:14:41:70 | ... .unwrap() | $@ | test.rs:41:42:41:44 | get | get |
-| test.rs:44:22:44:22 | v | test.rs:40:27:40:35 | exec_iter | test.rs:44:22:44:22 | v | $@ | test.rs:40:27:40:35 | exec_iter | exec_iter |
-| test.rs:51:22:51:27 | values | test.rs:48:22:48:30 | query_map | test.rs:51:22:51:27 | values | $@ | test.rs:48:22:48:30 | query_map | query_map |
-| test.rs:58:22:58:29 | values.0 | test.rs:55:22:55:30 | query_map | test.rs:58:22:58:29 | values.0 | $@ | test.rs:55:22:55:30 | query_map | query_map |
-| test.rs:59:22:59:29 | values.1 | test.rs:55:22:55:30 | query_map | test.rs:59:22:59:29 | values.1 | $@ | test.rs:55:22:55:30 | query_map | query_map |
-| test.rs:60:22:60:29 | values.2 | test.rs:55:22:55:30 | query_map | test.rs:60:22:60:29 | values.2 | $@ | test.rs:55:22:55:30 | query_map | query_map |
-| test.rs:65:18:65:20 | row | test.rs:64:26:64:35 | query_fold | test.rs:65:18:65:20 | row | $@ | test.rs:64:26:64:35 | query_fold | query_fold |
-| test.rs:68:14:68:18 | total | test.rs:64:26:64:35 | query_fold | test.rs:68:14:68:18 | total | $@ | test.rs:64:26:64:35 | query_fold | query_fold |
-| test.rs:74:18:74:19 | id | test.rs:70:22:70:31 | query_fold | test.rs:74:18:74:19 | id | $@ | test.rs:70:22:70:31 | query_fold | query_fold |
-| test.rs:75:18:75:21 | name | test.rs:70:22:70:31 | query_fold | test.rs:75:18:75:21 | name | $@ | test.rs:70:22:70:31 | query_fold | query_fold |
-| test.rs:76:18:76:20 | age | test.rs:70:22:70:31 | query_fold | test.rs:76:18:76:20 | age | $@ | test.rs:70:22:70:31 | query_fold | query_fold |
-| test.rs:106:14:106:15 | v1 | test.rs:105:28:105:30 | get | test.rs:106:14:106:15 | v1 | $@ | test.rs:105:28:105:30 | get | get |
-| test.rs:109:14:109:15 | v2 | test.rs:108:28:108:34 | get_opt | test.rs:109:14:109:15 | v2 | $@ | test.rs:108:28:108:34 | get_opt | get_opt |
-| test.rs:112:14:112:15 | v3 | test.rs:111:28:111:31 | take | test.rs:112:14:112:15 | v3 | $@ | test.rs:111:28:111:31 | take | take |
-| test.rs:115:14:115:15 | v4 | test.rs:114:28:114:35 | take_opt | test.rs:115:14:115:15 | v4 | $@ | test.rs:114:28:114:35 | take_opt | take_opt |
-| test.rs:138:22:138:27 | values | test.rs:135:22:135:30 | query_map | test.rs:138:22:138:27 | values | $@ | test.rs:135:22:135:30 | query_map | query_map |
-| test.rs:145:22:145:29 | values.0 | test.rs:142:22:142:30 | query_map | test.rs:145:22:145:29 | values.0 | $@ | test.rs:142:22:142:30 | query_map | query_map |
-| test.rs:146:22:146:29 | values.1 | test.rs:142:22:142:30 | query_map | test.rs:146:22:146:29 | values.1 | $@ | test.rs:142:22:142:30 | query_map | query_map |
-| test.rs:147:22:147:29 | values.2 | test.rs:142:22:142:30 | query_map | test.rs:147:22:147:29 | values.2 | $@ | test.rs:142:22:142:30 | query_map | query_map |
-| test.rs:152:18:152:20 | row | test.rs:151:26:151:35 | query_fold | test.rs:152:18:152:20 | row | $@ | test.rs:151:26:151:35 | query_fold | query_fold |
-| test.rs:155:14:155:18 | total | test.rs:151:26:151:35 | query_fold | test.rs:155:14:155:18 | total | $@ | test.rs:151:26:151:35 | query_fold | query_fold |
-| test.rs:161:18:161:19 | id | test.rs:157:22:157:31 | query_fold | test.rs:161:18:161:19 | id | $@ | test.rs:157:22:157:31 | query_fold | query_fold |
-| test.rs:162:18:162:21 | name | test.rs:157:22:157:31 | query_fold | test.rs:162:18:162:21 | name | $@ | test.rs:157:22:157:31 | query_fold | query_fold |
-| test.rs:163:18:163:20 | age | test.rs:157:22:157:31 | query_fold | test.rs:163:18:163:20 | age | $@ | test.rs:157:22:157:31 | query_fold | query_fold |
+| test.rs:19:14:19:15 | v1 | test.rs:18:24:18:33 | row.get(...) | test.rs:19:14:19:15 | v1 | $@ | test.rs:18:24:18:33 | row.get(...) | row.get(...) |
+| test.rs:22:14:22:15 | v2 | test.rs:21:24:21:37 | row.get_opt(...) | test.rs:22:14:22:15 | v2 | $@ | test.rs:21:24:21:37 | row.get_opt(...) | row.get_opt(...) |
+| test.rs:25:14:25:15 | v3 | test.rs:24:24:24:34 | row.take(...) | test.rs:25:14:25:15 | v3 | $@ | test.rs:24:24:24:34 | row.take(...) | row.take(...) |
+| test.rs:28:14:28:15 | v4 | test.rs:27:24:27:38 | row.take_opt(...) | test.rs:28:14:28:15 | v4 | $@ | test.rs:27:24:27:38 | row.take_opt(...) | row.take_opt(...) |
+| test.rs:38:14:38:15 | v6 | test.rs:37:23:37:63 | conn.query_first(...) | test.rs:38:14:38:15 | v6 | $@ | test.rs:37:23:37:63 | conn.query_first(...) | conn.query_first(...) |
+| test.rs:41:14:41:70 | ... .unwrap() | test.rs:41:14:41:61 | ... .get(...) | test.rs:41:14:41:70 | ... .unwrap() | $@ | test.rs:41:14:41:61 | ... .get(...) | ... .get(...) |
+| test.rs:44:22:44:22 | v | test.rs:40:22:40:71 | conn.exec_iter(...) | test.rs:44:22:44:22 | v | $@ | test.rs:40:22:40:71 | conn.exec_iter(...) | conn.exec_iter(...) |
+| test.rs:51:22:51:27 | values | test.rs:50:13:52:13 | \|...\| ... | test.rs:51:22:51:27 | values | $@ | test.rs:50:13:52:13 | \|...\| ... | \|...\| ... |
+| test.rs:58:22:58:29 | values.0 | test.rs:57:13:61:13 | \|...\| ... | test.rs:58:22:58:29 | values.0 | $@ | test.rs:57:13:61:13 | \|...\| ... | \|...\| ... |
+| test.rs:59:22:59:29 | values.1 | test.rs:57:13:61:13 | \|...\| ... | test.rs:59:22:59:29 | values.1 | $@ | test.rs:57:13:61:13 | \|...\| ... | \|...\| ... |
+| test.rs:60:22:60:29 | values.2 | test.rs:57:13:61:13 | \|...\| ... | test.rs:60:22:60:29 | values.2 | $@ | test.rs:57:13:61:13 | \|...\| ... | \|...\| ... |
+| test.rs:65:18:65:20 | row | test.rs:64:65:67:9 | \|...\| ... | test.rs:65:18:65:20 | row | $@ | test.rs:64:65:67:9 | \|...\| ... | \|...\| ... |
+| test.rs:68:14:68:18 | total | test.rs:64:65:67:9 | \|...\| ... | test.rs:68:14:68:18 | total | $@ | test.rs:64:65:67:9 | \|...\| ... | \|...\| ... |
+| test.rs:74:18:74:19 | id | test.rs:70:72:78:9 | \|...\| ... | test.rs:74:18:74:19 | id | $@ | test.rs:70:72:78:9 | \|...\| ... | \|...\| ... |
+| test.rs:75:18:75:21 | name | test.rs:70:72:78:9 | \|...\| ... | test.rs:75:18:75:21 | name | $@ | test.rs:70:72:78:9 | \|...\| ... | \|...\| ... |
+| test.rs:76:18:76:20 | age | test.rs:70:72:78:9 | \|...\| ... | test.rs:76:18:76:20 | age | $@ | test.rs:70:72:78:9 | \|...\| ... | \|...\| ... |
+| test.rs:106:14:106:15 | v1 | test.rs:105:24:105:33 | row.get(...) | test.rs:106:14:106:15 | v1 | $@ | test.rs:105:24:105:33 | row.get(...) | row.get(...) |
+| test.rs:109:14:109:15 | v2 | test.rs:108:24:108:37 | row.get_opt(...) | test.rs:109:14:109:15 | v2 | $@ | test.rs:108:24:108:37 | row.get_opt(...) | row.get_opt(...) |
+| test.rs:112:14:112:15 | v3 | test.rs:111:24:111:34 | row.take(...) | test.rs:112:14:112:15 | v3 | $@ | test.rs:111:24:111:34 | row.take(...) | row.take(...) |
+| test.rs:115:14:115:15 | v4 | test.rs:114:24:114:38 | row.take_opt(...) | test.rs:115:14:115:15 | v4 | $@ | test.rs:114:24:114:38 | row.take_opt(...) | row.take_opt(...) |
+| test.rs:138:22:138:27 | values | test.rs:137:13:139:13 | \|...\| ... | test.rs:138:22:138:27 | values | $@ | test.rs:137:13:139:13 | \|...\| ... | \|...\| ... |
+| test.rs:145:22:145:29 | values.0 | test.rs:144:13:148:13 | \|...\| ... | test.rs:145:22:145:29 | values.0 | $@ | test.rs:144:13:148:13 | \|...\| ... | \|...\| ... |
+| test.rs:146:22:146:29 | values.1 | test.rs:144:13:148:13 | \|...\| ... | test.rs:146:22:146:29 | values.1 | $@ | test.rs:144:13:148:13 | \|...\| ... | \|...\| ... |
+| test.rs:147:22:147:29 | values.2 | test.rs:144:13:148:13 | \|...\| ... | test.rs:147:22:147:29 | values.2 | $@ | test.rs:144:13:148:13 | \|...\| ... | \|...\| ... |
+| test.rs:152:18:152:20 | row | test.rs:151:65:154:9 | \|...\| ... | test.rs:152:18:152:20 | row | $@ | test.rs:151:65:154:9 | \|...\| ... | \|...\| ... |
+| test.rs:155:14:155:18 | total | test.rs:151:65:154:9 | \|...\| ... | test.rs:155:14:155:18 | total | $@ | test.rs:151:65:154:9 | \|...\| ... | \|...\| ... |
+| test.rs:161:18:161:19 | id | test.rs:157:72:165:9 | \|...\| ... | test.rs:161:18:161:19 | id | $@ | test.rs:157:72:165:9 | \|...\| ... | \|...\| ... |
+| test.rs:162:18:162:21 | name | test.rs:157:72:165:9 | \|...\| ... | test.rs:162:18:162:21 | name | $@ | test.rs:157:72:165:9 | \|...\| ... | \|...\| ... |
+| test.rs:163:18:163:20 | age | test.rs:157:72:165:9 | \|...\| ... | test.rs:163:18:163:20 | age | $@ | test.rs:157:72:165:9 | \|...\| ... | \|...\| ... |
diff --git a/rust/ql/test/library-tests/dataflow/sources/database/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/database/TaintSources.expected
index 9132dfaa2b0f..3a0de1e351bb 100644
--- a/rust/ql/test/library-tests/dataflow/sources/database/TaintSources.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/database/TaintSources.expected
@@ -1,25 +1,25 @@
-| test.rs:15:47:15:51 | query | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:18:28:18:30 | get | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:21:28:21:34 | get_opt | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:24:28:24:31 | take | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:27:28:27:35 | take_opt | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:30:26:30:31 | as_ref | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:37:28:37:38 | query_first | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:40:27:40:35 | exec_iter | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:41:42:41:44 | get | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:48:22:48:30 | query_map | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:55:22:55:30 | query_map | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:64:26:64:35 | query_fold | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:70:22:70:31 | query_fold | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:102:53:102:57 | query | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:105:28:105:30 | get | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:108:28:108:34 | get_opt | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:111:28:111:31 | take | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:114:28:114:35 | take_opt | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:117:26:117:31 | as_ref | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:124:28:124:38 | query_first | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:127:27:127:35 | exec_iter | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:135:22:135:30 | query_map | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:142:22:142:30 | query_map | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:151:26:151:35 | query_fold | Flow source 'DatabaseSource' of type database (DEFAULT). |
-| test.rs:157:22:157:31 | query_fold | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:15:42:15:87 | conn.query(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:18:24:18:33 | row.get(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:21:24:21:37 | row.get_opt(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:24:24:24:34 | row.take(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:27:24:27:38 | row.take_opt(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:30:22:30:34 | row.as_ref(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:37:23:37:63 | conn.query_first(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:40:22:40:71 | conn.exec_iter(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:41:14:41:61 | ... .get(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:50:13:52:13 | \|...\| ... | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:57:13:61:13 | \|...\| ... | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:64:65:67:9 | \|...\| ... | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:70:72:78:9 | \|...\| ... | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:102:48:102:93 | conn.query(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:105:24:105:33 | row.get(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:108:24:108:37 | row.get_opt(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:111:24:111:34 | row.take(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:114:24:114:38 | row.take_opt(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:117:22:117:34 | row.as_ref(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:124:23:124:63 | conn.query_first(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:127:22:127:71 | conn.exec_iter(...) | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:137:13:139:13 | \|...\| ... | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:144:13:148:13 | \|...\| ... | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:151:65:154:9 | \|...\| ... | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:157:72:165:9 | \|...\| ... | Flow source 'DatabaseSource' of type database (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/database/test.rs b/rust/ql/test/library-tests/dataflow/sources/database/test.rs
index 618830091a6c..158cc8188b88 100644
--- a/rust/ql/test/library-tests/dataflow/sources/database/test.rs
+++ b/rust/ql/test/library-tests/dataflow/sources/database/test.rs
@@ -45,29 +45,29 @@ mod test_mysql {
             }
         }
 
-        let _ = conn.query_map( // $ Alert[rust/summary/taint-sources]
+        let _ = conn.query_map(
             "SELECT id FROM person",
             |values: i64| -> () {
                 sink(values); // $ hasTaintFlow
-            }
+            } // $ Alert[rust/summary/taint-sources]
         )?;
 
-        let _ = conn.query_map( // $ Alert[rust/summary/taint-sources]
+        let _ = conn.query_map(
             "SELECT id, name, age FROM person",
             |values: (i64, String, i32)| -> () {
                 sink(values.0); // $ hasTaintFlow
                 sink(values.1); // $ hasTaintFlow
                 sink(values.2); // $ hasTaintFlow
-            }
+            } // $ Alert[rust/summary/taint-sources]
         )?;
 
-        let total = conn.query_fold("SELECT id FROM person", 0, |acc: i64, row: i64| { // $ Alert[rust/summary/taint-sources]
+        let total = conn.query_fold("SELECT id FROM person", 0, |acc: i64, row: i64| {
             sink(row); // $ hasTaintFlow
             acc + row
-        })?;
+        })?; // $ Alert[rust/summary/taint-sources]
         sink(total); // $ hasTaintFlow
 
-        let _ = conn.query_fold("SELECT id, name, age FROM person", 0, |acc: i64, row: (i64, String, i32)| { // $ Alert[rust/summary/taint-sources]
+        let _ = conn.query_fold("SELECT id, name, age FROM person", 0, |acc: i64, row: (i64, String, i32)| {
             let id: i64 = row.0;
             let name: String = row.1;
             let age: i32 = row.2;
@@ -75,7 +75,7 @@ mod test_mysql {
             sink(name); // $ hasTaintFlow
             sink(age); // $ hasTaintFlow
             acc + 1
-        })?;
+        })?; // $ Alert[rust/summary/taint-sources]
 
         Ok(())
     }
@@ -132,29 +132,29 @@ mod test_mysql_async {
             }
         }
 
-        let _ = conn.query_map( // $ Alert[rust/summary/taint-sources]
+        let _ = conn.query_map(
             "SELECT id FROM person",
             |values: i64| -> () {
                 sink(values); // $ hasTaintFlow
-            }
+            } // $ Alert[rust/summary/taint-sources]
         ).await?;
 
-        let _ = conn.query_map( // $ Alert[rust/summary/taint-sources]
+        let _ = conn.query_map(
             "SELECT id, name, age FROM person",
             |values: (i64, String, i32)| -> () {
                 sink(values.0); // $ hasTaintFlow
                 sink(values.1); // $ hasTaintFlow
                 sink(values.2); // $ hasTaintFlow
-            }
+            } // $ Alert[rust/summary/taint-sources]
         ).await?;
 
-        let total = conn.query_fold("SELECT id FROM person", 0, |acc: i64, row: i64| { // $ Alert[rust/summary/taint-sources]
+        let total = conn.query_fold("SELECT id FROM person", 0, |acc: i64, row: i64| {
             sink(row); // $ hasTaintFlow
             acc + row
-        }).await?;
+        }).await?; // $ Alert[rust/summary/taint-sources]
         sink(total); // $ hasTaintFlow
 
-        let _ = conn.query_fold("SELECT id, name, age FROM person", 0, |acc: i64, row: (i64, String, i32)| { // $ Alert[rust/summary/taint-sources]
+        let _ = conn.query_fold("SELECT id, name, age FROM person", 0, |acc: i64, row: (i64, String, i32)| {
             let id: i64 = row.0;
             let name: String = row.1;
             let age: i32 = row.2;
@@ -162,7 +162,7 @@ mod test_mysql_async {
             sink(name); // $ hasTaintFlow
             sink(age); // $ hasTaintFlow
             acc + 1
-        }).await?;
+        }).await?; // $ Alert[rust/summary/taint-sources]
 
         let ids = "SELECT id FROM person".with(()).map(&mut conn,
             |person: i64| -> i64 {
diff --git a/rust/ql/test/library-tests/dataflow/sources/env/InlineFlow.expected b/rust/ql/test/library-tests/dataflow/sources/env/InlineFlow.expected
index 78527083096e..1cfff2c68405 100644
--- a/rust/ql/test/library-tests/dataflow/sources/env/InlineFlow.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/env/InlineFlow.expected
@@ -8,108 +8,108 @@ models
 | 7 | Source: std::env::var_os; ReturnValue.Field[core::option::Option::Some(0)]; environment |
 | 8 | Source: std::env::vars; ReturnValue.Element; environment |
 | 9 | Source: std::env::vars_os; ReturnValue.Element; environment |
-| 10 | Summary: <_ as core::iter::traits::iterator::Iterator>::collect; Argument[self].Element; ReturnValue.Element; value |
-| 11 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
-| 12 | Summary: <_ as core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
-| 13 | Summary: <alloc::string::String as core::ops::deref::Deref>::deref; Argument[self]; ReturnValue; value |
+| 10 | Summary: <alloc::string::String as core::ops::deref::Deref>::deref; Argument[self]; ReturnValue; value |
+| 11 | Summary: <core::iter::traits::iterator::Iterator>::collect; Argument[self].Element; ReturnValue.Element; value |
+| 12 | Summary: <core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 13 | Summary: <core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
 | 14 | Summary: <core::option::Option>::expect; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
 | 15 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
 | 16 | Summary: <core::result::Result>::expect; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
 | 17 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
 edges
-| test.rs:6:10:6:22 | ...::var | test.rs:6:10:6:30 | ...::var(...) | provenance | Src:MaD:6  |
-| test.rs:7:10:7:25 | ...::var_os | test.rs:7:10:7:33 | ...::var_os(...) | provenance | Src:MaD:7  |
+| test.rs:6:10:6:30 | ...::var(...) | test.rs:6:10:6:30 | ...::var(...) | provenance | Src:MaD:6  |
+| test.rs:7:10:7:33 | ...::var_os(...) | test.rs:7:10:7:33 | ...::var_os(...) | provenance | Src:MaD:7  |
 | test.rs:9:9:9:12 | var1 | test.rs:12:10:12:13 | var1 | provenance |  |
-| test.rs:9:16:9:28 | ...::var | test.rs:9:16:9:36 | ...::var(...) [Ok] | provenance | Src:MaD:6  |
+| test.rs:9:16:9:36 | ...::var(...) | test.rs:9:16:9:36 | ...::var(...) [Ok] | provenance | Src:MaD:6  |
 | test.rs:9:16:9:36 | ...::var(...) [Ok] | test.rs:9:16:9:59 | ... .expect(...) | provenance | MaD:16 |
 | test.rs:9:16:9:59 | ... .expect(...) | test.rs:9:9:9:12 | var1 | provenance |  |
 | test.rs:10:9:10:12 | var2 | test.rs:13:10:13:13 | var2 | provenance |  |
-| test.rs:10:16:10:31 | ...::var_os | test.rs:10:16:10:39 | ...::var_os(...) [Some] | provenance | Src:MaD:7  |
+| test.rs:10:16:10:39 | ...::var_os(...) | test.rs:10:16:10:39 | ...::var_os(...) [Some] | provenance | Src:MaD:7  |
 | test.rs:10:16:10:39 | ...::var_os(...) [Some] | test.rs:10:16:10:48 | ... .unwrap() | provenance | MaD:15 |
 | test.rs:10:16:10:48 | ... .unwrap() | test.rs:10:9:10:12 | var2 | provenance |  |
 | test.rs:15:9:15:20 | TuplePat | test.rs:16:14:16:16 | key | provenance |  |
 | test.rs:15:9:15:20 | TuplePat | test.rs:17:14:17:18 | value | provenance |  |
-| test.rs:15:25:15:38 | ...::vars | test.rs:15:25:15:40 | ...::vars(...) [element] | provenance | Src:MaD:8  |
+| test.rs:15:25:15:40 | ...::vars(...) | test.rs:15:25:15:40 | ...::vars(...) [element] | provenance | Src:MaD:8  |
 | test.rs:15:25:15:40 | ...::vars(...) [element] | test.rs:15:9:15:20 | TuplePat | provenance |  |
 | test.rs:20:9:20:20 | TuplePat | test.rs:21:14:21:16 | key | provenance |  |
 | test.rs:20:9:20:20 | TuplePat | test.rs:22:14:22:18 | value | provenance |  |
-| test.rs:20:25:20:41 | ...::vars_os | test.rs:20:25:20:43 | ...::vars_os(...) [element] | provenance | Src:MaD:9  |
+| test.rs:20:25:20:43 | ...::vars_os(...) | test.rs:20:25:20:43 | ...::vars_os(...) [element] | provenance | Src:MaD:9  |
 | test.rs:20:25:20:43 | ...::vars_os(...) [element] | test.rs:20:9:20:20 | TuplePat | provenance |  |
 | test.rs:27:9:27:12 | args [element] | test.rs:28:20:28:23 | args [element] | provenance |  |
 | test.rs:27:9:27:12 | args [element] | test.rs:29:17:29:20 | args [element] | provenance |  |
-| test.rs:27:29:27:42 | ...::args | test.rs:27:29:27:44 | ...::args(...) [element] | provenance | Src:MaD:1  |
-| test.rs:27:29:27:44 | ...::args(...) [element] | test.rs:27:29:27:54 | ... .collect() [element] | provenance | MaD:10 |
+| test.rs:27:29:27:44 | ...::args(...) | test.rs:27:29:27:44 | ...::args(...) [element] | provenance | Src:MaD:1  |
+| test.rs:27:29:27:44 | ...::args(...) [element] | test.rs:27:29:27:54 | ... .collect() [element] | provenance | MaD:11 |
 | test.rs:27:29:27:54 | ... .collect() [element] | test.rs:27:9:27:12 | args [element] | provenance |  |
 | test.rs:28:9:28:15 | my_path [&ref] | test.rs:34:10:34:16 | my_path | provenance |  |
 | test.rs:28:19:28:26 | &... [&ref] | test.rs:28:9:28:15 | my_path [&ref] | provenance |  |
-| test.rs:28:20:28:23 | args [element] | test.rs:28:20:28:26 | args[0] | provenance | MaD:12 |
+| test.rs:28:20:28:23 | args [element] | test.rs:28:20:28:26 | args[0] | provenance | MaD:13 |
 | test.rs:28:20:28:26 | args[0] | test.rs:28:19:28:26 | &... [&ref] | provenance |  |
 | test.rs:29:9:29:12 | arg1 [&ref] | test.rs:35:10:35:13 | arg1 | provenance |  |
 | test.rs:29:16:29:23 | &... [&ref] | test.rs:29:9:29:12 | arg1 [&ref] | provenance |  |
-| test.rs:29:17:29:20 | args [element] | test.rs:29:17:29:23 | args[1] | provenance | MaD:12 |
+| test.rs:29:17:29:20 | args [element] | test.rs:29:17:29:23 | args[1] | provenance | MaD:13 |
 | test.rs:29:17:29:23 | args[1] | test.rs:29:16:29:23 | &... [&ref] | provenance |  |
 | test.rs:30:9:30:12 | arg2 | test.rs:36:10:36:13 | arg2 | provenance |  |
-| test.rs:30:16:30:29 | ...::args | test.rs:30:16:30:31 | ...::args(...) [element] | provenance | Src:MaD:1  |
-| test.rs:30:16:30:31 | ...::args(...) [element] | test.rs:30:16:30:38 | ... .nth(...) [Some] | provenance | MaD:11 |
+| test.rs:30:16:30:31 | ...::args(...) | test.rs:30:16:30:31 | ...::args(...) [element] | provenance | Src:MaD:1  |
+| test.rs:30:16:30:31 | ...::args(...) [element] | test.rs:30:16:30:38 | ... .nth(...) [Some] | provenance | MaD:12 |
 | test.rs:30:16:30:38 | ... .nth(...) [Some] | test.rs:30:16:30:47 | ... .unwrap() | provenance | MaD:15 |
 | test.rs:30:16:30:47 | ... .unwrap() | test.rs:30:9:30:12 | arg2 | provenance |  |
 | test.rs:31:9:31:12 | arg3 | test.rs:37:10:37:13 | arg3 | provenance |  |
-| test.rs:31:16:31:32 | ...::args_os | test.rs:31:16:31:34 | ...::args_os(...) [element] | provenance | Src:MaD:2  |
-| test.rs:31:16:31:34 | ...::args_os(...) [element] | test.rs:31:16:31:41 | ... .nth(...) [Some] | provenance | MaD:11 |
+| test.rs:31:16:31:34 | ...::args_os(...) | test.rs:31:16:31:34 | ...::args_os(...) [element] | provenance | Src:MaD:2  |
+| test.rs:31:16:31:34 | ...::args_os(...) [element] | test.rs:31:16:31:41 | ... .nth(...) [Some] | provenance | MaD:12 |
 | test.rs:31:16:31:41 | ... .nth(...) [Some] | test.rs:31:16:31:50 | ... .unwrap() | provenance | MaD:15 |
 | test.rs:31:16:31:50 | ... .unwrap() | test.rs:31:9:31:12 | arg3 | provenance |  |
 | test.rs:32:9:32:12 | arg4 | test.rs:38:10:38:13 | arg4 | provenance |  |
-| test.rs:32:16:32:29 | ...::args | test.rs:32:16:32:31 | ...::args(...) [element] | provenance | Src:MaD:1  |
-| test.rs:32:16:32:31 | ...::args(...) [element] | test.rs:32:16:32:38 | ... .nth(...) [Some] | provenance | MaD:11 |
+| test.rs:32:16:32:31 | ...::args(...) | test.rs:32:16:32:31 | ...::args(...) [element] | provenance | Src:MaD:1  |
+| test.rs:32:16:32:31 | ...::args(...) [element] | test.rs:32:16:32:38 | ... .nth(...) [Some] | provenance | MaD:12 |
 | test.rs:32:16:32:38 | ... .nth(...) [Some] | test.rs:32:16:32:47 | ... .unwrap() | provenance | MaD:15 |
-| test.rs:32:16:32:47 | ... .unwrap() | test.rs:32:16:32:64 | ... .parse() [Ok] | provenance | MaD:13 |
+| test.rs:32:16:32:47 | ... .unwrap() | test.rs:32:16:32:64 | ... .parse() [Ok] | provenance | MaD:10 |
 | test.rs:32:16:32:64 | ... .parse() [Ok] | test.rs:32:16:32:73 | ... .unwrap() | provenance | MaD:17 |
 | test.rs:32:16:32:73 | ... .unwrap() | test.rs:32:9:32:12 | arg4 | provenance |  |
 | test.rs:40:9:40:11 | arg | test.rs:41:14:41:16 | arg | provenance |  |
-| test.rs:40:16:40:29 | ...::args | test.rs:40:16:40:31 | ...::args(...) [element] | provenance | Src:MaD:1  |
+| test.rs:40:16:40:31 | ...::args(...) | test.rs:40:16:40:31 | ...::args(...) [element] | provenance | Src:MaD:1  |
 | test.rs:40:16:40:31 | ...::args(...) [element] | test.rs:40:9:40:11 | arg | provenance |  |
 | test.rs:44:9:44:11 | arg | test.rs:45:14:45:16 | arg | provenance |  |
-| test.rs:44:16:44:32 | ...::args_os | test.rs:44:16:44:34 | ...::args_os(...) [element] | provenance | Src:MaD:2  |
+| test.rs:44:16:44:34 | ...::args_os(...) | test.rs:44:16:44:34 | ...::args_os(...) [element] | provenance | Src:MaD:2  |
 | test.rs:44:16:44:34 | ...::args_os(...) [element] | test.rs:44:9:44:11 | arg | provenance |  |
 | test.rs:50:9:50:11 | dir | test.rs:54:10:54:12 | dir | provenance |  |
-| test.rs:50:15:50:35 | ...::current_dir | test.rs:50:15:50:37 | ...::current_dir(...) [Ok] | provenance | Src:MaD:3  |
+| test.rs:50:15:50:37 | ...::current_dir(...) | test.rs:50:15:50:37 | ...::current_dir(...) [Ok] | provenance | Src:MaD:3  |
 | test.rs:50:15:50:37 | ...::current_dir(...) [Ok] | test.rs:50:15:50:54 | ... .expect(...) | provenance | MaD:16 |
 | test.rs:50:15:50:54 | ... .expect(...) | test.rs:50:9:50:11 | dir | provenance |  |
 | test.rs:51:9:51:11 | exe | test.rs:55:10:55:12 | exe | provenance |  |
-| test.rs:51:15:51:35 | ...::current_exe | test.rs:51:15:51:37 | ...::current_exe(...) [Ok] | provenance | Src:MaD:4  |
+| test.rs:51:15:51:37 | ...::current_exe(...) | test.rs:51:15:51:37 | ...::current_exe(...) [Ok] | provenance | Src:MaD:4  |
 | test.rs:51:15:51:37 | ...::current_exe(...) [Ok] | test.rs:51:15:51:54 | ... .expect(...) | provenance | MaD:16 |
 | test.rs:51:15:51:54 | ... .expect(...) | test.rs:51:9:51:11 | exe | provenance |  |
 | test.rs:52:9:52:12 | home | test.rs:56:10:56:13 | home | provenance |  |
-| test.rs:52:16:52:33 | ...::home_dir | test.rs:52:16:52:35 | ...::home_dir(...) [Some] | provenance | Src:MaD:5  |
+| test.rs:52:16:52:35 | ...::home_dir(...) | test.rs:52:16:52:35 | ...::home_dir(...) [Some] | provenance | Src:MaD:5  |
 | test.rs:52:16:52:35 | ...::home_dir(...) [Some] | test.rs:52:16:52:52 | ... .expect(...) | provenance | MaD:14 |
 | test.rs:52:16:52:52 | ... .expect(...) | test.rs:52:9:52:12 | home | provenance |  |
 nodes
-| test.rs:6:10:6:22 | ...::var | semmle.label | ...::var |
 | test.rs:6:10:6:30 | ...::var(...) | semmle.label | ...::var(...) |
-| test.rs:7:10:7:25 | ...::var_os | semmle.label | ...::var_os |
+| test.rs:6:10:6:30 | ...::var(...) | semmle.label | ...::var(...) |
+| test.rs:7:10:7:33 | ...::var_os(...) | semmle.label | ...::var_os(...) |
 | test.rs:7:10:7:33 | ...::var_os(...) | semmle.label | ...::var_os(...) |
 | test.rs:9:9:9:12 | var1 | semmle.label | var1 |
-| test.rs:9:16:9:28 | ...::var | semmle.label | ...::var |
+| test.rs:9:16:9:36 | ...::var(...) | semmle.label | ...::var(...) |
 | test.rs:9:16:9:36 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
 | test.rs:9:16:9:59 | ... .expect(...) | semmle.label | ... .expect(...) |
 | test.rs:10:9:10:12 | var2 | semmle.label | var2 |
-| test.rs:10:16:10:31 | ...::var_os | semmle.label | ...::var_os |
+| test.rs:10:16:10:39 | ...::var_os(...) | semmle.label | ...::var_os(...) |
 | test.rs:10:16:10:39 | ...::var_os(...) [Some] | semmle.label | ...::var_os(...) [Some] |
 | test.rs:10:16:10:48 | ... .unwrap() | semmle.label | ... .unwrap() |
 | test.rs:12:10:12:13 | var1 | semmle.label | var1 |
 | test.rs:13:10:13:13 | var2 | semmle.label | var2 |
 | test.rs:15:9:15:20 | TuplePat | semmle.label | TuplePat |
-| test.rs:15:25:15:38 | ...::vars | semmle.label | ...::vars |
+| test.rs:15:25:15:40 | ...::vars(...) | semmle.label | ...::vars(...) |
 | test.rs:15:25:15:40 | ...::vars(...) [element] | semmle.label | ...::vars(...) [element] |
 | test.rs:16:14:16:16 | key | semmle.label | key |
 | test.rs:17:14:17:18 | value | semmle.label | value |
 | test.rs:20:9:20:20 | TuplePat | semmle.label | TuplePat |
-| test.rs:20:25:20:41 | ...::vars_os | semmle.label | ...::vars_os |
+| test.rs:20:25:20:43 | ...::vars_os(...) | semmle.label | ...::vars_os(...) |
 | test.rs:20:25:20:43 | ...::vars_os(...) [element] | semmle.label | ...::vars_os(...) [element] |
 | test.rs:21:14:21:16 | key | semmle.label | key |
 | test.rs:22:14:22:18 | value | semmle.label | value |
 | test.rs:27:9:27:12 | args [element] | semmle.label | args [element] |
-| test.rs:27:29:27:42 | ...::args | semmle.label | ...::args |
+| test.rs:27:29:27:44 | ...::args(...) | semmle.label | ...::args(...) |
 | test.rs:27:29:27:44 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
 | test.rs:27:29:27:54 | ... .collect() [element] | semmle.label | ... .collect() [element] |
 | test.rs:28:9:28:15 | my_path [&ref] | semmle.label | my_path [&ref] |
@@ -121,17 +121,17 @@ nodes
 | test.rs:29:17:29:20 | args [element] | semmle.label | args [element] |
 | test.rs:29:17:29:23 | args[1] | semmle.label | args[1] |
 | test.rs:30:9:30:12 | arg2 | semmle.label | arg2 |
-| test.rs:30:16:30:29 | ...::args | semmle.label | ...::args |
+| test.rs:30:16:30:31 | ...::args(...) | semmle.label | ...::args(...) |
 | test.rs:30:16:30:31 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
 | test.rs:30:16:30:38 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
 | test.rs:30:16:30:47 | ... .unwrap() | semmle.label | ... .unwrap() |
 | test.rs:31:9:31:12 | arg3 | semmle.label | arg3 |
-| test.rs:31:16:31:32 | ...::args_os | semmle.label | ...::args_os |
+| test.rs:31:16:31:34 | ...::args_os(...) | semmle.label | ...::args_os(...) |
 | test.rs:31:16:31:34 | ...::args_os(...) [element] | semmle.label | ...::args_os(...) [element] |
 | test.rs:31:16:31:41 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
 | test.rs:31:16:31:50 | ... .unwrap() | semmle.label | ... .unwrap() |
 | test.rs:32:9:32:12 | arg4 | semmle.label | arg4 |
-| test.rs:32:16:32:29 | ...::args | semmle.label | ...::args |
+| test.rs:32:16:32:31 | ...::args(...) | semmle.label | ...::args(...) |
 | test.rs:32:16:32:31 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
 | test.rs:32:16:32:38 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
 | test.rs:32:16:32:47 | ... .unwrap() | semmle.label | ... .unwrap() |
@@ -143,23 +143,23 @@ nodes
 | test.rs:37:10:37:13 | arg3 | semmle.label | arg3 |
 | test.rs:38:10:38:13 | arg4 | semmle.label | arg4 |
 | test.rs:40:9:40:11 | arg | semmle.label | arg |
-| test.rs:40:16:40:29 | ...::args | semmle.label | ...::args |
+| test.rs:40:16:40:31 | ...::args(...) | semmle.label | ...::args(...) |
 | test.rs:40:16:40:31 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
 | test.rs:41:14:41:16 | arg | semmle.label | arg |
 | test.rs:44:9:44:11 | arg | semmle.label | arg |
-| test.rs:44:16:44:32 | ...::args_os | semmle.label | ...::args_os |
+| test.rs:44:16:44:34 | ...::args_os(...) | semmle.label | ...::args_os(...) |
 | test.rs:44:16:44:34 | ...::args_os(...) [element] | semmle.label | ...::args_os(...) [element] |
 | test.rs:45:14:45:16 | arg | semmle.label | arg |
 | test.rs:50:9:50:11 | dir | semmle.label | dir |
-| test.rs:50:15:50:35 | ...::current_dir | semmle.label | ...::current_dir |
+| test.rs:50:15:50:37 | ...::current_dir(...) | semmle.label | ...::current_dir(...) |
 | test.rs:50:15:50:37 | ...::current_dir(...) [Ok] | semmle.label | ...::current_dir(...) [Ok] |
 | test.rs:50:15:50:54 | ... .expect(...) | semmle.label | ... .expect(...) |
 | test.rs:51:9:51:11 | exe | semmle.label | exe |
-| test.rs:51:15:51:35 | ...::current_exe | semmle.label | ...::current_exe |
+| test.rs:51:15:51:37 | ...::current_exe(...) | semmle.label | ...::current_exe(...) |
 | test.rs:51:15:51:37 | ...::current_exe(...) [Ok] | semmle.label | ...::current_exe(...) [Ok] |
 | test.rs:51:15:51:54 | ... .expect(...) | semmle.label | ... .expect(...) |
 | test.rs:52:9:52:12 | home | semmle.label | home |
-| test.rs:52:16:52:33 | ...::home_dir | semmle.label | ...::home_dir |
+| test.rs:52:16:52:35 | ...::home_dir(...) | semmle.label | ...::home_dir(...) |
 | test.rs:52:16:52:35 | ...::home_dir(...) [Some] | semmle.label | ...::home_dir(...) [Some] |
 | test.rs:52:16:52:52 | ... .expect(...) | semmle.label | ... .expect(...) |
 | test.rs:54:10:54:12 | dir | semmle.label | dir |
@@ -168,21 +168,21 @@ nodes
 subpaths
 testFailures
 #select
-| test.rs:6:10:6:30 | ...::var(...) | test.rs:6:10:6:22 | ...::var | test.rs:6:10:6:30 | ...::var(...) | $@ | test.rs:6:10:6:22 | ...::var | ...::var |
-| test.rs:7:10:7:33 | ...::var_os(...) | test.rs:7:10:7:25 | ...::var_os | test.rs:7:10:7:33 | ...::var_os(...) | $@ | test.rs:7:10:7:25 | ...::var_os | ...::var_os |
-| test.rs:12:10:12:13 | var1 | test.rs:9:16:9:28 | ...::var | test.rs:12:10:12:13 | var1 | $@ | test.rs:9:16:9:28 | ...::var | ...::var |
-| test.rs:13:10:13:13 | var2 | test.rs:10:16:10:31 | ...::var_os | test.rs:13:10:13:13 | var2 | $@ | test.rs:10:16:10:31 | ...::var_os | ...::var_os |
-| test.rs:16:14:16:16 | key | test.rs:15:25:15:38 | ...::vars | test.rs:16:14:16:16 | key | $@ | test.rs:15:25:15:38 | ...::vars | ...::vars |
-| test.rs:17:14:17:18 | value | test.rs:15:25:15:38 | ...::vars | test.rs:17:14:17:18 | value | $@ | test.rs:15:25:15:38 | ...::vars | ...::vars |
-| test.rs:21:14:21:16 | key | test.rs:20:25:20:41 | ...::vars_os | test.rs:21:14:21:16 | key | $@ | test.rs:20:25:20:41 | ...::vars_os | ...::vars_os |
-| test.rs:22:14:22:18 | value | test.rs:20:25:20:41 | ...::vars_os | test.rs:22:14:22:18 | value | $@ | test.rs:20:25:20:41 | ...::vars_os | ...::vars_os |
-| test.rs:34:10:34:16 | my_path | test.rs:27:29:27:42 | ...::args | test.rs:34:10:34:16 | my_path | $@ | test.rs:27:29:27:42 | ...::args | ...::args |
-| test.rs:35:10:35:13 | arg1 | test.rs:27:29:27:42 | ...::args | test.rs:35:10:35:13 | arg1 | $@ | test.rs:27:29:27:42 | ...::args | ...::args |
-| test.rs:36:10:36:13 | arg2 | test.rs:30:16:30:29 | ...::args | test.rs:36:10:36:13 | arg2 | $@ | test.rs:30:16:30:29 | ...::args | ...::args |
-| test.rs:37:10:37:13 | arg3 | test.rs:31:16:31:32 | ...::args_os | test.rs:37:10:37:13 | arg3 | $@ | test.rs:31:16:31:32 | ...::args_os | ...::args_os |
-| test.rs:38:10:38:13 | arg4 | test.rs:32:16:32:29 | ...::args | test.rs:38:10:38:13 | arg4 | $@ | test.rs:32:16:32:29 | ...::args | ...::args |
-| test.rs:41:14:41:16 | arg | test.rs:40:16:40:29 | ...::args | test.rs:41:14:41:16 | arg | $@ | test.rs:40:16:40:29 | ...::args | ...::args |
-| test.rs:45:14:45:16 | arg | test.rs:44:16:44:32 | ...::args_os | test.rs:45:14:45:16 | arg | $@ | test.rs:44:16:44:32 | ...::args_os | ...::args_os |
-| test.rs:54:10:54:12 | dir | test.rs:50:15:50:35 | ...::current_dir | test.rs:54:10:54:12 | dir | $@ | test.rs:50:15:50:35 | ...::current_dir | ...::current_dir |
-| test.rs:55:10:55:12 | exe | test.rs:51:15:51:35 | ...::current_exe | test.rs:55:10:55:12 | exe | $@ | test.rs:51:15:51:35 | ...::current_exe | ...::current_exe |
-| test.rs:56:10:56:13 | home | test.rs:52:16:52:33 | ...::home_dir | test.rs:56:10:56:13 | home | $@ | test.rs:52:16:52:33 | ...::home_dir | ...::home_dir |
+| test.rs:6:10:6:30 | ...::var(...) | test.rs:6:10:6:30 | ...::var(...) | test.rs:6:10:6:30 | ...::var(...) | $@ | test.rs:6:10:6:30 | ...::var(...) | ...::var(...) |
+| test.rs:7:10:7:33 | ...::var_os(...) | test.rs:7:10:7:33 | ...::var_os(...) | test.rs:7:10:7:33 | ...::var_os(...) | $@ | test.rs:7:10:7:33 | ...::var_os(...) | ...::var_os(...) |
+| test.rs:12:10:12:13 | var1 | test.rs:9:16:9:36 | ...::var(...) | test.rs:12:10:12:13 | var1 | $@ | test.rs:9:16:9:36 | ...::var(...) | ...::var(...) |
+| test.rs:13:10:13:13 | var2 | test.rs:10:16:10:39 | ...::var_os(...) | test.rs:13:10:13:13 | var2 | $@ | test.rs:10:16:10:39 | ...::var_os(...) | ...::var_os(...) |
+| test.rs:16:14:16:16 | key | test.rs:15:25:15:40 | ...::vars(...) | test.rs:16:14:16:16 | key | $@ | test.rs:15:25:15:40 | ...::vars(...) | ...::vars(...) |
+| test.rs:17:14:17:18 | value | test.rs:15:25:15:40 | ...::vars(...) | test.rs:17:14:17:18 | value | $@ | test.rs:15:25:15:40 | ...::vars(...) | ...::vars(...) |
+| test.rs:21:14:21:16 | key | test.rs:20:25:20:43 | ...::vars_os(...) | test.rs:21:14:21:16 | key | $@ | test.rs:20:25:20:43 | ...::vars_os(...) | ...::vars_os(...) |
+| test.rs:22:14:22:18 | value | test.rs:20:25:20:43 | ...::vars_os(...) | test.rs:22:14:22:18 | value | $@ | test.rs:20:25:20:43 | ...::vars_os(...) | ...::vars_os(...) |
+| test.rs:34:10:34:16 | my_path | test.rs:27:29:27:44 | ...::args(...) | test.rs:34:10:34:16 | my_path | $@ | test.rs:27:29:27:44 | ...::args(...) | ...::args(...) |
+| test.rs:35:10:35:13 | arg1 | test.rs:27:29:27:44 | ...::args(...) | test.rs:35:10:35:13 | arg1 | $@ | test.rs:27:29:27:44 | ...::args(...) | ...::args(...) |
+| test.rs:36:10:36:13 | arg2 | test.rs:30:16:30:31 | ...::args(...) | test.rs:36:10:36:13 | arg2 | $@ | test.rs:30:16:30:31 | ...::args(...) | ...::args(...) |
+| test.rs:37:10:37:13 | arg3 | test.rs:31:16:31:34 | ...::args_os(...) | test.rs:37:10:37:13 | arg3 | $@ | test.rs:31:16:31:34 | ...::args_os(...) | ...::args_os(...) |
+| test.rs:38:10:38:13 | arg4 | test.rs:32:16:32:31 | ...::args(...) | test.rs:38:10:38:13 | arg4 | $@ | test.rs:32:16:32:31 | ...::args(...) | ...::args(...) |
+| test.rs:41:14:41:16 | arg | test.rs:40:16:40:31 | ...::args(...) | test.rs:41:14:41:16 | arg | $@ | test.rs:40:16:40:31 | ...::args(...) | ...::args(...) |
+| test.rs:45:14:45:16 | arg | test.rs:44:16:44:34 | ...::args_os(...) | test.rs:45:14:45:16 | arg | $@ | test.rs:44:16:44:34 | ...::args_os(...) | ...::args_os(...) |
+| test.rs:54:10:54:12 | dir | test.rs:50:15:50:37 | ...::current_dir(...) | test.rs:54:10:54:12 | dir | $@ | test.rs:50:15:50:37 | ...::current_dir(...) | ...::current_dir(...) |
+| test.rs:55:10:55:12 | exe | test.rs:51:15:51:37 | ...::current_exe(...) | test.rs:55:10:55:12 | exe | $@ | test.rs:51:15:51:37 | ...::current_exe(...) | ...::current_exe(...) |
+| test.rs:56:10:56:13 | home | test.rs:52:16:52:35 | ...::home_dir(...) | test.rs:56:10:56:13 | home | $@ | test.rs:52:16:52:35 | ...::home_dir(...) | ...::home_dir(...) |
diff --git a/rust/ql/test/library-tests/dataflow/sources/env/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/env/TaintSources.expected
index 16f43eff9147..f686e4f83a90 100644
--- a/rust/ql/test/library-tests/dataflow/sources/env/TaintSources.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/env/TaintSources.expected
@@ -1,15 +1,15 @@
-| test.rs:6:10:6:22 | ...::var | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
-| test.rs:7:10:7:25 | ...::var_os | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
-| test.rs:9:16:9:28 | ...::var | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
-| test.rs:10:16:10:31 | ...::var_os | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
-| test.rs:15:25:15:38 | ...::vars | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
-| test.rs:20:25:20:41 | ...::vars_os | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
-| test.rs:27:29:27:42 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:30:16:30:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:31:16:31:32 | ...::args_os | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:32:16:32:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:40:16:40:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:44:16:44:32 | ...::args_os | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:50:15:50:35 | ...::current_dir | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:51:15:51:35 | ...::current_exe | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:52:16:52:33 | ...::home_dir | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:6:10:6:30 | ...::var(...) | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:7:10:7:33 | ...::var_os(...) | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:9:16:9:36 | ...::var(...) | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:10:16:10:39 | ...::var_os(...) | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:15:25:15:40 | ...::vars(...) | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:20:25:20:43 | ...::vars_os(...) | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:27:29:27:44 | ...::args(...) | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:30:16:30:31 | ...::args(...) | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:31:16:31:34 | ...::args_os(...) | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:32:16:32:31 | ...::args(...) | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:40:16:40:31 | ...::args(...) | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:44:16:44:34 | ...::args_os(...) | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:50:15:50:37 | ...::current_dir(...) | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:51:15:51:37 | ...::current_exe(...) | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:52:16:52:35 | ...::home_dir(...) | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/file/InlineFlow.expected b/rust/ql/test/library-tests/dataflow/sources/file/InlineFlow.expected
index 27d884fe565b..62fc9592cd42 100644
--- a/rust/ql/test/library-tests/dataflow/sources/file/InlineFlow.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/file/InlineFlow.expected
@@ -15,47 +15,47 @@ models
 | 14 | Source: tokio::fs::read::read; ReturnValue.Future.Field[core::result::Result::Ok(0)]; file |
 | 15 | Source: tokio::fs::read_link::read_link; ReturnValue.Future.Field[core::result::Result::Ok(0)]; file |
 | 16 | Source: tokio::fs::read_to_string::read_to_string; ReturnValue.Future.Field[core::result::Result::Ok(0)]; file |
-| 17 | Summary: <_ as async_std::io::read::ReadExt>::read; Argument[self].Reference; Argument[0].Reference; taint |
-| 18 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
-| 19 | Summary: <_ as std::io::Read>::bytes; Argument[self]; ReturnValue; taint |
-| 20 | Summary: <_ as std::io::Read>::chain; Argument[0]; ReturnValue; taint |
-| 21 | Summary: <_ as std::io::Read>::chain; Argument[self]; ReturnValue; taint |
-| 22 | Summary: <_ as std::io::Read>::read; Argument[self].Reference; Argument[0].Reference; taint |
-| 23 | Summary: <_ as std::io::Read>::read_exact; Argument[self].Reference; Argument[0].Reference; taint |
-| 24 | Summary: <_ as std::io::Read>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
-| 25 | Summary: <_ as std::io::Read>::take; Argument[self]; ReturnValue; taint |
-| 26 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read; Argument[self].Reference; Argument[0].Reference; taint |
-| 27 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_buf; Argument[self].Reference; Argument[0].Reference; taint |
-| 28 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_exact; Argument[self].Reference; Argument[0].Reference; taint |
-| 29 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_f32; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
-| 30 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i16; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
-| 31 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i64_le; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
-| 32 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_to_end; Argument[self].Reference; Argument[0].Reference; taint |
-| 33 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
-| 34 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u8; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
-| 35 | Summary: <alloc::borrow::Cow>::to_mut; Argument[self].Reference.Field[alloc::borrow::Cow::Owned(0)]; ReturnValue.Reference; value |
-| 36 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
-| 37 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 38 | Summary: <std::ffi::os_str::OsString as core::ops::deref::Deref>::deref; Argument[self].Reference; ReturnValue.Reference; taint |
-| 39 | Summary: <std::ffi::os_str::OsString>::into_string; Argument[self].Field[std::ffi::os_str::OsString::inner].Field[std::sys::os_str::bytes::Buf::inner]; ReturnValue.Field[core::result::Result::Ok(0)].Field[alloc::string::String::vec]; value |
-| 40 | Summary: <std::fs::File as std::io::Read>::read_to_end; Argument[self].Reference; Argument[0].Reference; taint |
-| 41 | Summary: <std::fs::File as std::io::Read>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
-| 42 | Summary: <std::path::PathBuf as core::convert::From>::from; Argument[0]; ReturnValue.Field[std::path::PathBuf::inner]; value |
-| 43 | Summary: <std::path::PathBuf as core::ops::deref::Deref>::deref; Argument[self].Reference.Field[std::path::PathBuf::inner]; ReturnValue.Reference; value |
-| 44 | Summary: <std::path::PathBuf>::as_path; Argument[self].Reference; ReturnValue.Reference; value |
-| 45 | Summary: <std::path::PathBuf>::into_boxed_path; Argument[self]; ReturnValue.Field[alloc::boxed::Box(0)]; taint |
-| 46 | Summary: <std::path::PathBuf>::into_os_string; Argument[self].Field[std::path::PathBuf::inner]; ReturnValue; value |
+| 17 | Summary: <alloc::borrow::Cow>::to_mut; Argument[self].Reference.Field[alloc::borrow::Cow::Owned(0)]; ReturnValue.Reference; value |
+| 18 | Summary: <alloc::io::read::Read>::bytes; Argument[self]; ReturnValue; taint |
+| 19 | Summary: <alloc::io::read::Read>::chain; Argument[0]; ReturnValue; taint |
+| 20 | Summary: <alloc::io::read::Read>::chain; Argument[self]; ReturnValue; taint |
+| 21 | Summary: <alloc::io::read::Read>::read; Argument[self].Reference; Argument[0].Reference; taint |
+| 22 | Summary: <alloc::io::read::Read>::read_exact; Argument[self].Reference; Argument[0].Reference; taint |
+| 23 | Summary: <alloc::io::read::Read>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
+| 24 | Summary: <alloc::io::read::Read>::take; Argument[self]; ReturnValue; taint |
+| 25 | Summary: <async_std::io::read::ReadExt>::read; Argument[self].Reference; Argument[0].Reference; taint |
+| 26 | Summary: <core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 27 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 28 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 29 | Summary: <std::ffi::os_str::OsString as core::ops::deref::Deref>::deref; Argument[self].Reference; ReturnValue.Reference; taint |
+| 30 | Summary: <std::ffi::os_str::OsString>::into_string; Argument[self].Field[std::ffi::os_str::OsString::inner].Field[std::sys::os_str::bytes::Buf::inner]; ReturnValue.Field[core::result::Result::Ok(0)].Field[alloc::string::String::vec]; value |
+| 31 | Summary: <std::fs::File as alloc::io::read::Read>::read_to_end; Argument[self].Reference; Argument[0].Reference; taint |
+| 32 | Summary: <std::fs::File as alloc::io::read::Read>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
+| 33 | Summary: <std::path::PathBuf as core::convert::From>::from; Argument[0]; ReturnValue.Field[std::path::PathBuf::inner]; value |
+| 34 | Summary: <std::path::PathBuf as core::ops::deref::Deref>::deref; Argument[self].Reference.Field[std::path::PathBuf::inner]; ReturnValue.Reference; value |
+| 35 | Summary: <std::path::PathBuf>::as_path; Argument[self].Reference; ReturnValue.Reference; value |
+| 36 | Summary: <std::path::PathBuf>::into_boxed_path; Argument[self]; ReturnValue.Field[alloc::boxed::Box(0)]; taint |
+| 37 | Summary: <std::path::PathBuf>::into_os_string; Argument[self].Field[std::path::PathBuf::inner]; ReturnValue; value |
+| 38 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read; Argument[self].Reference; Argument[0].Reference; taint |
+| 39 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_buf; Argument[self].Reference; Argument[0].Reference; taint |
+| 40 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_exact; Argument[self].Reference; Argument[0].Reference; taint |
+| 41 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_f32; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 42 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_i16; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 43 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_i64_le; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 44 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_to_end; Argument[self].Reference; Argument[0].Reference; taint |
+| 45 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
+| 46 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_u8; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
 edges
 | test.rs:12:13:12:18 | buffer | test.rs:13:14:13:19 | buffer | provenance |  |
-| test.rs:12:31:12:43 | ...::read | test.rs:12:31:12:55 | ...::read(...) [Ok] | provenance | Src:MaD:11  |
+| test.rs:12:31:12:55 | ...::read(...) | test.rs:12:31:12:55 | ...::read(...) [Ok] | provenance | Src:MaD:11  |
 | test.rs:12:31:12:55 | ...::read(...) [Ok] | test.rs:12:31:12:56 | TryExpr | provenance |  |
 | test.rs:12:31:12:56 | TryExpr | test.rs:12:13:12:18 | buffer | provenance |  |
 | test.rs:17:13:17:18 | buffer | test.rs:18:14:18:19 | buffer | provenance |  |
-| test.rs:17:31:17:38 | ...::read | test.rs:17:31:17:50 | ...::read(...) [Ok] | provenance | Src:MaD:11  |
+| test.rs:17:31:17:50 | ...::read(...) | test.rs:17:31:17:50 | ...::read(...) [Ok] | provenance | Src:MaD:11  |
 | test.rs:17:31:17:50 | ...::read(...) [Ok] | test.rs:17:31:17:51 | TryExpr | provenance |  |
 | test.rs:17:31:17:51 | TryExpr | test.rs:17:13:17:18 | buffer | provenance |  |
 | test.rs:22:13:22:18 | buffer | test.rs:23:14:23:19 | buffer | provenance |  |
-| test.rs:22:22:22:39 | ...::read_to_string | test.rs:22:22:22:51 | ...::read_to_string(...) [Ok] | provenance | Src:MaD:13  |
+| test.rs:22:22:22:51 | ...::read_to_string(...) | test.rs:22:22:22:51 | ...::read_to_string(...) [Ok] | provenance | Src:MaD:13  |
 | test.rs:22:22:22:51 | ...::read_to_string(...) [Ok] | test.rs:22:22:22:52 | TryExpr | provenance |  |
 | test.rs:22:22:22:52 | TryExpr | test.rs:22:13:22:18 | buffer | provenance |  |
 | test.rs:30:13:30:16 | path | test.rs:31:14:31:17 | path | provenance |  |
@@ -70,73 +70,69 @@ edges
 | test.rs:30:13:30:16 | path | test.rs:40:14:40:17 | path | provenance |  |
 | test.rs:30:13:30:16 | path | test.rs:41:14:41:17 | path | provenance |  |
 | test.rs:30:13:30:16 | path | test.rs:42:14:42:17 | path | provenance |  |
-| test.rs:30:20:30:27 | e.path() | test.rs:30:13:30:16 | path | provenance |  |
-| test.rs:30:22:30:25 | path | test.rs:30:20:30:27 | e.path() | provenance | Src:MaD:4 MaD:4 |
-| test.rs:31:14:31:17 | path | test.rs:31:14:31:25 | path.clone() | provenance | MaD:18 |
-| test.rs:32:14:32:17 | path | test.rs:32:14:32:25 | path.clone() | provenance | MaD:18 |
-| test.rs:32:14:32:25 | path.clone() | test.rs:32:14:32:35 | ... .as_path() | provenance | MaD:44 |
-| test.rs:33:14:33:17 | path | test.rs:33:14:33:25 | path.clone() | provenance | MaD:18 |
-| test.rs:33:14:33:25 | path.clone() | test.rs:33:14:33:42 | ... .into_os_string() | provenance | MaD:46 |
-| test.rs:34:39:34:42 | path | test.rs:34:39:34:50 | path.clone() | provenance | MaD:18 |
-| test.rs:34:39:34:50 | path.clone() | test.rs:34:39:34:68 | ... .into_boxed_path() [Box(0)] | provenance | MaD:45 |
-| test.rs:34:39:34:68 | ... .into_boxed_path() [Box(0)] | test.rs:34:14:34:69 | ...::from(...) | provenance | MaD:42 |
-| test.rs:35:14:35:17 | path | test.rs:35:14:35:25 | path.clone() | provenance | MaD:18 |
-| test.rs:35:14:35:25 | path.clone() | test.rs:35:14:35:37 | ... .as_os_str() | provenance | MaD:43 |
-| test.rs:36:14:36:17 | path | test.rs:36:14:36:25 | path.clone() | provenance | MaD:18 |
-| test.rs:36:14:36:25 | path.clone() | test.rs:36:14:36:41 | ... .as_mut_os_str() | provenance | MaD:43 |
-| test.rs:37:14:37:17 | path | test.rs:37:14:37:26 | path.to_str() | provenance | MaD:43 |
-| test.rs:38:14:38:17 | path | test.rs:38:14:38:31 | path.to_path_buf() | provenance | MaD:43 |
-| test.rs:39:14:39:17 | path | test.rs:39:14:39:29 | path.file_name() [Some, &ref] | provenance | MaD:43 |
-| test.rs:39:14:39:29 | path.file_name() [Some, &ref] | test.rs:39:14:39:38 | ... .unwrap() | provenance | MaD:36 |
-| test.rs:40:14:40:17 | path | test.rs:40:14:40:29 | path.extension() [Some, &ref] | provenance | MaD:43 |
-| test.rs:40:14:40:29 | path.extension() [Some, &ref] | test.rs:40:14:40:38 | ... .unwrap() | provenance | MaD:36 |
-| test.rs:41:14:41:17 | path | test.rs:41:14:41:32 | path.canonicalize() [Ok] | provenance | MaD:43 |
-| test.rs:41:14:41:32 | path.canonicalize() [Ok] | test.rs:41:14:41:41 | ... .unwrap() | provenance | MaD:37 |
+| test.rs:30:20:30:27 | e.path() | test.rs:30:13:30:16 | path | provenance | Src:MaD:4  |
+| test.rs:31:14:31:17 | path | test.rs:31:14:31:25 | path.clone() | provenance | MaD:26 |
+| test.rs:32:14:32:17 | path | test.rs:32:14:32:25 | path.clone() | provenance | MaD:26 |
+| test.rs:32:14:32:25 | path.clone() | test.rs:32:14:32:35 | ... .as_path() | provenance | MaD:35 |
+| test.rs:33:14:33:17 | path | test.rs:33:14:33:25 | path.clone() | provenance | MaD:26 |
+| test.rs:33:14:33:25 | path.clone() | test.rs:33:14:33:42 | ... .into_os_string() | provenance | MaD:37 |
+| test.rs:34:39:34:42 | path | test.rs:34:39:34:50 | path.clone() | provenance | MaD:26 |
+| test.rs:34:39:34:50 | path.clone() | test.rs:34:39:34:68 | ... .into_boxed_path() [Box(0)] | provenance | MaD:36 |
+| test.rs:34:39:34:68 | ... .into_boxed_path() [Box(0)] | test.rs:34:14:34:69 | ...::from(...) | provenance | MaD:33 |
+| test.rs:35:14:35:17 | path | test.rs:35:14:35:25 | path.clone() | provenance | MaD:26 |
+| test.rs:35:14:35:25 | path.clone() | test.rs:35:14:35:37 | ... .as_os_str() | provenance | MaD:34 |
+| test.rs:36:14:36:17 | path | test.rs:36:14:36:25 | path.clone() | provenance | MaD:26 |
+| test.rs:36:14:36:25 | path.clone() | test.rs:36:14:36:41 | ... .as_mut_os_str() | provenance | MaD:34 |
+| test.rs:37:14:37:17 | path | test.rs:37:14:37:26 | path.to_str() | provenance | MaD:34 |
+| test.rs:38:14:38:17 | path | test.rs:38:14:38:31 | path.to_path_buf() | provenance | MaD:34 |
+| test.rs:39:14:39:17 | path | test.rs:39:14:39:29 | path.file_name() [Some, &ref] | provenance | MaD:34 |
+| test.rs:39:14:39:29 | path.file_name() [Some, &ref] | test.rs:39:14:39:38 | ... .unwrap() | provenance | MaD:27 |
+| test.rs:40:14:40:17 | path | test.rs:40:14:40:29 | path.extension() [Some, &ref] | provenance | MaD:34 |
+| test.rs:40:14:40:29 | path.extension() [Some, &ref] | test.rs:40:14:40:38 | ... .unwrap() | provenance | MaD:27 |
+| test.rs:41:14:41:17 | path | test.rs:41:14:41:32 | path.canonicalize() [Ok] | provenance | MaD:34 |
+| test.rs:41:14:41:32 | path.canonicalize() [Ok] | test.rs:41:14:41:41 | ... .unwrap() | provenance | MaD:28 |
 | test.rs:44:13:44:21 | file_name | test.rs:45:14:45:22 | file_name | provenance |  |
 | test.rs:44:13:44:21 | file_name | test.rs:46:14:46:22 | file_name | provenance |  |
 | test.rs:44:13:44:21 | file_name | test.rs:47:14:47:22 | file_name | provenance |  |
 | test.rs:44:13:44:21 | file_name | test.rs:48:14:48:22 | file_name | provenance |  |
 | test.rs:44:13:44:21 | file_name | test.rs:49:14:49:22 | file_name | provenance |  |
 | test.rs:44:13:44:21 | file_name | test.rs:50:14:50:22 | file_name | provenance |  |
-| test.rs:44:25:44:37 | e.file_name() | test.rs:44:13:44:21 | file_name | provenance |  |
-| test.rs:44:27:44:35 | file_name | test.rs:44:25:44:37 | e.file_name() | provenance | Src:MaD:3 MaD:3 |
-| test.rs:45:14:45:22 | file_name | test.rs:45:14:45:30 | file_name.clone() | provenance | MaD:18 |
-| test.rs:46:14:46:22 | file_name | test.rs:46:14:46:30 | file_name.clone() | provenance | MaD:18 |
-| test.rs:46:14:46:30 | file_name.clone() | test.rs:46:14:46:44 | ... .into_string() [Ok, String] | provenance | MaD:39 |
-| test.rs:46:14:46:44 | ... .into_string() [Ok, String] | test.rs:46:14:46:53 | ... .unwrap() | provenance | MaD:37 |
-| test.rs:47:14:47:22 | file_name | test.rs:47:14:47:31 | file_name.to_str() [Some, &ref] | provenance | MaD:38 |
-| test.rs:47:14:47:31 | file_name.to_str() [Some, &ref] | test.rs:47:14:47:40 | ... .unwrap() | provenance | MaD:36 |
-| test.rs:48:14:48:22 | file_name | test.rs:48:14:48:40 | file_name.to_string_lossy() [Owned] | provenance | MaD:38 |
-| test.rs:48:14:48:40 | file_name.to_string_lossy() [Owned] | test.rs:48:14:48:49 | ... .to_mut() | provenance | MaD:35 |
-| test.rs:49:14:49:22 | file_name | test.rs:49:14:49:30 | file_name.clone() | provenance | MaD:18 |
-| test.rs:49:14:49:30 | file_name.clone() | test.rs:49:14:49:49 | ... .as_encoded_bytes() | provenance | MaD:38 |
+| test.rs:44:25:44:37 | e.file_name() | test.rs:44:13:44:21 | file_name | provenance | Src:MaD:3  |
+| test.rs:45:14:45:22 | file_name | test.rs:45:14:45:30 | file_name.clone() | provenance | MaD:26 |
+| test.rs:46:14:46:22 | file_name | test.rs:46:14:46:30 | file_name.clone() | provenance | MaD:26 |
+| test.rs:46:14:46:30 | file_name.clone() | test.rs:46:14:46:44 | ... .into_string() [Ok, String] | provenance | MaD:30 |
+| test.rs:46:14:46:44 | ... .into_string() [Ok, String] | test.rs:46:14:46:53 | ... .unwrap() | provenance | MaD:28 |
+| test.rs:47:14:47:22 | file_name | test.rs:47:14:47:31 | file_name.to_str() [Some, &ref] | provenance | MaD:29 |
+| test.rs:47:14:47:31 | file_name.to_str() [Some, &ref] | test.rs:47:14:47:40 | ... .unwrap() | provenance | MaD:27 |
+| test.rs:48:14:48:22 | file_name | test.rs:48:14:48:40 | file_name.to_string_lossy() [Owned] | provenance | MaD:29 |
+| test.rs:48:14:48:40 | file_name.to_string_lossy() [Owned] | test.rs:48:14:48:49 | ... .to_mut() | provenance | MaD:17 |
+| test.rs:49:14:49:22 | file_name | test.rs:49:14:49:30 | file_name.clone() | provenance | MaD:26 |
+| test.rs:49:14:49:30 | file_name.clone() | test.rs:49:14:49:49 | ... .as_encoded_bytes() | provenance | MaD:29 |
 | test.rs:68:13:68:18 | target | test.rs:69:14:69:19 | target | provenance |  |
-| test.rs:68:22:68:34 | ...::read_link | test.rs:68:22:68:49 | ...::read_link(...) [Ok] | provenance | Src:MaD:12  |
+| test.rs:68:22:68:49 | ...::read_link(...) | test.rs:68:22:68:49 | ...::read_link(...) [Ok] | provenance | Src:MaD:12  |
 | test.rs:68:22:68:49 | ...::read_link(...) [Ok] | test.rs:68:22:68:50 | TryExpr | provenance |  |
 | test.rs:68:22:68:50 | TryExpr | test.rs:68:13:68:18 | target | provenance |  |
 | test.rs:77:13:77:18 | buffer | test.rs:78:14:78:19 | buffer | provenance |  |
-| test.rs:77:31:77:45 | ...::read | test.rs:77:31:77:57 | ...::read(...) [future, Ok] | provenance | Src:MaD:14  |
+| test.rs:77:31:77:57 | ...::read(...) | test.rs:77:31:77:57 | ...::read(...) [future, Ok] | provenance | Src:MaD:14  |
 | test.rs:77:31:77:57 | ...::read(...) [future, Ok] | test.rs:77:31:77:63 | await ... [Ok] | provenance |  |
 | test.rs:77:31:77:63 | await ... [Ok] | test.rs:77:31:77:64 | TryExpr | provenance |  |
 | test.rs:77:31:77:64 | TryExpr | test.rs:77:13:77:18 | buffer | provenance |  |
 | test.rs:82:13:82:18 | buffer | test.rs:83:14:83:19 | buffer | provenance |  |
-| test.rs:82:31:82:45 | ...::read | test.rs:82:31:82:57 | ...::read(...) [future, Ok] | provenance | Src:MaD:14  |
+| test.rs:82:31:82:57 | ...::read(...) | test.rs:82:31:82:57 | ...::read(...) [future, Ok] | provenance | Src:MaD:14  |
 | test.rs:82:31:82:57 | ...::read(...) [future, Ok] | test.rs:82:31:82:63 | await ... [Ok] | provenance |  |
 | test.rs:82:31:82:63 | await ... [Ok] | test.rs:82:31:82:64 | TryExpr | provenance |  |
 | test.rs:82:31:82:64 | TryExpr | test.rs:82:13:82:18 | buffer | provenance |  |
 | test.rs:87:13:87:18 | buffer | test.rs:88:14:88:19 | buffer | provenance |  |
-| test.rs:87:22:87:46 | ...::read_to_string | test.rs:87:22:87:58 | ...::read_to_string(...) [future, Ok] | provenance | Src:MaD:16  |
+| test.rs:87:22:87:58 | ...::read_to_string(...) | test.rs:87:22:87:58 | ...::read_to_string(...) [future, Ok] | provenance | Src:MaD:16  |
 | test.rs:87:22:87:58 | ...::read_to_string(...) [future, Ok] | test.rs:87:22:87:64 | await ... [Ok] | provenance |  |
 | test.rs:87:22:87:64 | await ... [Ok] | test.rs:87:22:87:65 | TryExpr | provenance |  |
 | test.rs:87:22:87:65 | TryExpr | test.rs:87:13:87:18 | buffer | provenance |  |
 | test.rs:93:13:93:16 | path | test.rs:95:14:95:17 | path | provenance |  |
-| test.rs:93:20:93:31 | entry.path() | test.rs:93:13:93:16 | path | provenance |  |
-| test.rs:93:26:93:29 | path | test.rs:93:20:93:31 | entry.path() | provenance | Src:MaD:10 MaD:10 |
+| test.rs:93:20:93:31 | entry.path() | test.rs:93:13:93:16 | path | provenance | Src:MaD:10  |
 | test.rs:94:13:94:21 | file_name | test.rs:96:14:96:22 | file_name | provenance |  |
-| test.rs:94:25:94:41 | entry.file_name() | test.rs:94:13:94:21 | file_name | provenance |  |
-| test.rs:94:31:94:39 | file_name | test.rs:94:25:94:41 | entry.file_name() | provenance | Src:MaD:9 MaD:9 |
+| test.rs:94:25:94:41 | entry.file_name() | test.rs:94:13:94:21 | file_name | provenance | Src:MaD:9  |
 | test.rs:100:13:100:18 | target | test.rs:101:14:101:19 | target | provenance |  |
-| test.rs:100:22:100:41 | ...::read_link | test.rs:100:22:100:56 | ...::read_link(...) [future, Ok] | provenance | Src:MaD:15  |
+| test.rs:100:22:100:56 | ...::read_link(...) | test.rs:100:22:100:56 | ...::read_link(...) [future, Ok] | provenance | Src:MaD:15  |
 | test.rs:100:22:100:56 | ...::read_link(...) [future, Ok] | test.rs:100:22:100:62 | await ... [Ok] | provenance |  |
 | test.rs:100:22:100:62 | await ... [Ok] | test.rs:100:22:100:63 | TryExpr | provenance |  |
 | test.rs:100:22:100:63 | TryExpr | test.rs:100:13:100:18 | target | provenance |  |
@@ -145,75 +141,75 @@ edges
 | test.rs:110:9:110:16 | mut file | test.rs:126:22:126:25 | file | provenance |  |
 | test.rs:110:9:110:16 | mut file | test.rs:132:9:132:12 | file | provenance |  |
 | test.rs:110:9:110:16 | mut file | test.rs:136:17:136:20 | file | provenance |  |
-| test.rs:110:20:110:38 | ...::open | test.rs:110:20:110:50 | ...::open(...) [Ok] | provenance | Src:MaD:5  |
+| test.rs:110:20:110:50 | ...::open(...) | test.rs:110:20:110:50 | ...::open(...) [Ok] | provenance | Src:MaD:5  |
 | test.rs:110:20:110:50 | ...::open(...) [Ok] | test.rs:110:20:110:51 | TryExpr | provenance |  |
 | test.rs:110:20:110:51 | TryExpr | test.rs:110:9:110:16 | mut file | provenance |  |
-| test.rs:114:22:114:25 | file | test.rs:114:32:114:42 | [post] &mut buffer [&ref] | provenance | MaD:22 |
+| test.rs:114:22:114:25 | file | test.rs:114:32:114:42 | [post] &mut buffer [&ref] | provenance | MaD:21 |
 | test.rs:114:32:114:42 | [post] &mut buffer [&ref] | test.rs:114:37:114:42 | [post] buffer | provenance |  |
 | test.rs:114:37:114:42 | [post] buffer | test.rs:115:15:115:20 | buffer | provenance |  |
 | test.rs:115:15:115:20 | buffer | test.rs:115:14:115:20 | &buffer | provenance |  |
-| test.rs:120:22:120:25 | file | test.rs:120:39:120:49 | [post] &mut buffer [&ref] | provenance | MaD:40 |
+| test.rs:120:22:120:25 | file | test.rs:120:39:120:49 | [post] &mut buffer [&ref] | provenance | MaD:31 |
 | test.rs:120:39:120:49 | [post] &mut buffer [&ref] | test.rs:120:44:120:49 | [post] buffer | provenance |  |
 | test.rs:120:44:120:49 | [post] buffer | test.rs:121:15:121:20 | buffer | provenance |  |
 | test.rs:121:15:121:20 | buffer | test.rs:121:14:121:20 | &buffer | provenance |  |
-| test.rs:126:22:126:25 | file | test.rs:126:42:126:52 | [post] &mut buffer [&ref] | provenance | MaD:41 |
+| test.rs:126:22:126:25 | file | test.rs:126:42:126:52 | [post] &mut buffer [&ref] | provenance | MaD:32 |
 | test.rs:126:42:126:52 | [post] &mut buffer [&ref] | test.rs:126:47:126:52 | [post] buffer | provenance |  |
 | test.rs:126:47:126:52 | [post] buffer | test.rs:127:15:127:20 | buffer | provenance |  |
 | test.rs:127:15:127:20 | buffer | test.rs:127:14:127:20 | &buffer | provenance |  |
-| test.rs:132:9:132:12 | file | test.rs:132:25:132:35 | [post] &mut buffer [&ref] | provenance | MaD:23 |
+| test.rs:132:9:132:12 | file | test.rs:132:25:132:35 | [post] &mut buffer [&ref] | provenance | MaD:22 |
 | test.rs:132:25:132:35 | [post] &mut buffer [&ref] | test.rs:132:30:132:35 | [post] buffer | provenance |  |
 | test.rs:132:30:132:35 | [post] buffer | test.rs:133:15:133:20 | buffer | provenance |  |
 | test.rs:133:15:133:20 | buffer | test.rs:133:14:133:20 | &buffer | provenance |  |
-| test.rs:136:17:136:20 | file | test.rs:136:17:136:28 | file.bytes() | provenance | MaD:19 |
+| test.rs:136:17:136:20 | file | test.rs:136:17:136:28 | file.bytes() | provenance | MaD:18 |
 | test.rs:136:17:136:28 | file.bytes() | test.rs:137:14:137:17 | byte | provenance |  |
 | test.rs:143:13:143:18 | mut f1 | test.rs:145:22:145:23 | f1 | provenance |  |
-| test.rs:143:22:143:63 | ... .open(...) [Ok] | test.rs:143:22:143:72 | ... .unwrap() | provenance | MaD:37 |
+| test.rs:143:22:143:63 | ... .open(...) | test.rs:143:22:143:63 | ... .open(...) [Ok] | provenance | Src:MaD:6  |
+| test.rs:143:22:143:63 | ... .open(...) [Ok] | test.rs:143:22:143:72 | ... .unwrap() | provenance | MaD:28 |
 | test.rs:143:22:143:72 | ... .unwrap() | test.rs:143:13:143:18 | mut f1 | provenance |  |
-| test.rs:143:50:143:53 | open | test.rs:143:22:143:63 | ... .open(...) [Ok] | provenance | Src:MaD:6  |
-| test.rs:145:22:145:23 | f1 | test.rs:145:30:145:40 | [post] &mut buffer [&ref] | provenance | MaD:22 |
+| test.rs:145:22:145:23 | f1 | test.rs:145:30:145:40 | [post] &mut buffer [&ref] | provenance | MaD:21 |
 | test.rs:145:30:145:40 | [post] &mut buffer [&ref] | test.rs:145:35:145:40 | [post] buffer | provenance |  |
 | test.rs:145:35:145:40 | [post] buffer | test.rs:146:15:146:20 | buffer | provenance |  |
 | test.rs:146:15:146:20 | buffer | test.rs:146:14:146:20 | &buffer | provenance |  |
 | test.rs:150:13:150:18 | mut f2 | test.rs:155:22:155:23 | f2 | provenance |  |
-| test.rs:150:22:152:27 | ... .open(...) [Ok] | test.rs:150:22:153:21 | ... .unwrap() | provenance | MaD:37 |
+| test.rs:150:22:152:27 | ... .open(...) | test.rs:150:22:152:27 | ... .open(...) [Ok] | provenance | Src:MaD:6  |
+| test.rs:150:22:152:27 | ... .open(...) [Ok] | test.rs:150:22:153:21 | ... .unwrap() | provenance | MaD:28 |
 | test.rs:150:22:153:21 | ... .unwrap() | test.rs:150:13:150:18 | mut f2 | provenance |  |
-| test.rs:152:14:152:17 | open | test.rs:150:22:152:27 | ... .open(...) [Ok] | provenance | Src:MaD:6  |
-| test.rs:155:22:155:23 | f2 | test.rs:155:30:155:40 | [post] &mut buffer [&ref] | provenance | MaD:22 |
+| test.rs:155:22:155:23 | f2 | test.rs:155:30:155:40 | [post] &mut buffer [&ref] | provenance | MaD:21 |
 | test.rs:155:30:155:40 | [post] &mut buffer [&ref] | test.rs:155:35:155:40 | [post] buffer | provenance |  |
 | test.rs:155:35:155:40 | [post] buffer | test.rs:156:15:156:20 | buffer | provenance |  |
 | test.rs:156:15:156:20 | buffer | test.rs:156:14:156:20 | &buffer | provenance |  |
 | test.rs:160:13:160:18 | mut f3 | test.rs:168:22:168:23 | f3 | provenance |  |
-| test.rs:160:22:165:27 | ... .open(...) [Ok] | test.rs:160:22:166:21 | ... .unwrap() | provenance | MaD:37 |
+| test.rs:160:22:165:27 | ... .open(...) | test.rs:160:22:165:27 | ... .open(...) [Ok] | provenance | Src:MaD:6  |
+| test.rs:160:22:165:27 | ... .open(...) [Ok] | test.rs:160:22:166:21 | ... .unwrap() | provenance | MaD:28 |
 | test.rs:160:22:166:21 | ... .unwrap() | test.rs:160:13:160:18 | mut f3 | provenance |  |
-| test.rs:165:14:165:17 | open | test.rs:160:22:165:27 | ... .open(...) [Ok] | provenance | Src:MaD:6  |
-| test.rs:168:22:168:23 | f3 | test.rs:168:30:168:40 | [post] &mut buffer [&ref] | provenance | MaD:22 |
+| test.rs:168:22:168:23 | f3 | test.rs:168:30:168:40 | [post] &mut buffer [&ref] | provenance | MaD:21 |
 | test.rs:168:30:168:40 | [post] &mut buffer [&ref] | test.rs:168:35:168:40 | [post] buffer | provenance |  |
 | test.rs:168:35:168:40 | [post] buffer | test.rs:169:15:169:20 | buffer | provenance |  |
 | test.rs:169:15:169:20 | buffer | test.rs:169:14:169:20 | &buffer | provenance |  |
 | test.rs:176:13:176:17 | file1 | test.rs:178:26:178:30 | file1 | provenance |  |
-| test.rs:176:21:176:39 | ...::open | test.rs:176:21:176:51 | ...::open(...) [Ok] | provenance | Src:MaD:5  |
+| test.rs:176:21:176:51 | ...::open(...) | test.rs:176:21:176:51 | ...::open(...) [Ok] | provenance | Src:MaD:5  |
 | test.rs:176:21:176:51 | ...::open(...) [Ok] | test.rs:176:21:176:52 | TryExpr | provenance |  |
 | test.rs:176:21:176:52 | TryExpr | test.rs:176:13:176:17 | file1 | provenance |  |
 | test.rs:177:13:177:17 | file2 | test.rs:178:38:178:42 | file2 | provenance |  |
-| test.rs:177:21:177:39 | ...::open | test.rs:177:21:177:59 | ...::open(...) [Ok] | provenance | Src:MaD:5  |
+| test.rs:177:21:177:59 | ...::open(...) | test.rs:177:21:177:59 | ...::open(...) [Ok] | provenance | Src:MaD:5  |
 | test.rs:177:21:177:59 | ...::open(...) [Ok] | test.rs:177:21:177:60 | TryExpr | provenance |  |
 | test.rs:177:21:177:60 | TryExpr | test.rs:177:13:177:17 | file2 | provenance |  |
 | test.rs:178:13:178:22 | mut reader | test.rs:179:9:179:14 | reader | provenance |  |
-| test.rs:178:26:178:30 | file1 | test.rs:178:26:178:43 | file1.chain(...) | provenance | MaD:21 |
+| test.rs:178:26:178:30 | file1 | test.rs:178:26:178:43 | file1.chain(...) | provenance | MaD:20 |
 | test.rs:178:26:178:43 | file1.chain(...) | test.rs:178:13:178:22 | mut reader | provenance |  |
-| test.rs:178:38:178:42 | file2 | test.rs:178:26:178:43 | file1.chain(...) | provenance | MaD:20 |
-| test.rs:179:9:179:14 | reader | test.rs:179:31:179:41 | [post] &mut buffer [&ref] | provenance | MaD:24 |
+| test.rs:178:38:178:42 | file2 | test.rs:178:26:178:43 | file1.chain(...) | provenance | MaD:19 |
+| test.rs:179:9:179:14 | reader | test.rs:179:31:179:41 | [post] &mut buffer [&ref] | provenance | MaD:23 |
 | test.rs:179:31:179:41 | [post] &mut buffer [&ref] | test.rs:179:36:179:41 | [post] buffer | provenance |  |
 | test.rs:179:36:179:41 | [post] buffer | test.rs:180:15:180:20 | buffer | provenance |  |
 | test.rs:180:15:180:20 | buffer | test.rs:180:14:180:20 | &buffer | provenance |  |
 | test.rs:185:13:185:17 | file1 | test.rs:186:26:186:30 | file1 | provenance |  |
-| test.rs:185:21:185:39 | ...::open | test.rs:185:21:185:51 | ...::open(...) [Ok] | provenance | Src:MaD:5  |
+| test.rs:185:21:185:51 | ...::open(...) | test.rs:185:21:185:51 | ...::open(...) [Ok] | provenance | Src:MaD:5  |
 | test.rs:185:21:185:51 | ...::open(...) [Ok] | test.rs:185:21:185:52 | TryExpr | provenance |  |
 | test.rs:185:21:185:52 | TryExpr | test.rs:185:13:185:17 | file1 | provenance |  |
 | test.rs:186:13:186:22 | mut reader | test.rs:187:9:187:14 | reader | provenance |  |
-| test.rs:186:26:186:30 | file1 | test.rs:186:26:186:40 | file1.take(...) | provenance | MaD:25 |
+| test.rs:186:26:186:30 | file1 | test.rs:186:26:186:40 | file1.take(...) | provenance | MaD:24 |
 | test.rs:186:26:186:40 | file1.take(...) | test.rs:186:13:186:22 | mut reader | provenance |  |
-| test.rs:187:9:187:14 | reader | test.rs:187:31:187:41 | [post] &mut buffer [&ref] | provenance | MaD:24 |
+| test.rs:187:9:187:14 | reader | test.rs:187:31:187:41 | [post] &mut buffer [&ref] | provenance | MaD:23 |
 | test.rs:187:31:187:41 | [post] &mut buffer [&ref] | test.rs:187:36:187:41 | [post] buffer | provenance |  |
 | test.rs:187:36:187:41 | [post] buffer | test.rs:188:15:188:20 | buffer | provenance |  |
 | test.rs:188:15:188:20 | buffer | test.rs:188:14:188:20 | &buffer | provenance |  |
@@ -226,96 +222,95 @@ edges
 | test.rs:197:9:197:16 | mut file | test.rs:226:18:226:21 | file | provenance |  |
 | test.rs:197:9:197:16 | mut file | test.rs:227:18:227:21 | file | provenance |  |
 | test.rs:197:9:197:16 | mut file | test.rs:236:9:236:12 | file | provenance |  |
-| test.rs:197:20:197:40 | ...::open | test.rs:197:20:197:52 | ...::open(...) [future, Ok] | provenance | Src:MaD:7  |
+| test.rs:197:20:197:52 | ...::open(...) | test.rs:197:20:197:52 | ...::open(...) [future, Ok] | provenance | Src:MaD:7  |
 | test.rs:197:20:197:52 | ...::open(...) [future, Ok] | test.rs:197:20:197:58 | await ... [Ok] | provenance |  |
 | test.rs:197:20:197:58 | await ... [Ok] | test.rs:197:20:197:59 | TryExpr | provenance |  |
 | test.rs:197:20:197:59 | TryExpr | test.rs:197:9:197:16 | mut file | provenance |  |
-| test.rs:201:22:201:25 | file | test.rs:201:32:201:42 | [post] &mut buffer [&ref] | provenance | MaD:26 |
+| test.rs:201:22:201:25 | file | test.rs:201:32:201:42 | [post] &mut buffer [&ref] | provenance | MaD:38 |
 | test.rs:201:32:201:42 | [post] &mut buffer [&ref] | test.rs:201:37:201:42 | [post] buffer | provenance |  |
 | test.rs:201:37:201:42 | [post] buffer | test.rs:202:15:202:20 | buffer | provenance |  |
 | test.rs:202:15:202:20 | buffer | test.rs:202:14:202:20 | &buffer | provenance |  |
-| test.rs:207:22:207:25 | file | test.rs:207:39:207:49 | [post] &mut buffer [&ref] | provenance | MaD:32 |
+| test.rs:207:22:207:25 | file | test.rs:207:39:207:49 | [post] &mut buffer [&ref] | provenance | MaD:44 |
 | test.rs:207:39:207:49 | [post] &mut buffer [&ref] | test.rs:207:44:207:49 | [post] buffer | provenance |  |
 | test.rs:207:44:207:49 | [post] buffer | test.rs:208:15:208:20 | buffer | provenance |  |
 | test.rs:208:15:208:20 | buffer | test.rs:208:14:208:20 | &buffer | provenance |  |
-| test.rs:213:22:213:25 | file | test.rs:213:42:213:52 | [post] &mut buffer [&ref] | provenance | MaD:33 |
+| test.rs:213:22:213:25 | file | test.rs:213:42:213:52 | [post] &mut buffer [&ref] | provenance | MaD:45 |
 | test.rs:213:42:213:52 | [post] &mut buffer [&ref] | test.rs:213:47:213:52 | [post] buffer | provenance |  |
 | test.rs:213:47:213:52 | [post] buffer | test.rs:214:15:214:20 | buffer | provenance |  |
 | test.rs:214:15:214:20 | buffer | test.rs:214:14:214:20 | &buffer | provenance |  |
-| test.rs:219:9:219:12 | file | test.rs:219:25:219:35 | [post] &mut buffer [&ref] | provenance | MaD:28 |
+| test.rs:219:9:219:12 | file | test.rs:219:25:219:35 | [post] &mut buffer [&ref] | provenance | MaD:40 |
 | test.rs:219:25:219:35 | [post] &mut buffer [&ref] | test.rs:219:30:219:35 | [post] buffer | provenance |  |
 | test.rs:219:30:219:35 | [post] buffer | test.rs:220:15:220:20 | buffer | provenance |  |
 | test.rs:220:15:220:20 | buffer | test.rs:220:14:220:20 | &buffer | provenance |  |
 | test.rs:224:13:224:14 | v1 | test.rs:228:14:228:15 | v1 | provenance |  |
-| test.rs:224:18:224:21 | file | test.rs:224:18:224:31 | file.read_u8() [future, Ok] | provenance | MaD:34 |
+| test.rs:224:18:224:21 | file | test.rs:224:18:224:31 | file.read_u8() [future, Ok] | provenance | MaD:46 |
 | test.rs:224:18:224:31 | file.read_u8() [future, Ok] | test.rs:224:18:224:37 | await ... [Ok] | provenance |  |
 | test.rs:224:18:224:37 | await ... [Ok] | test.rs:224:18:224:38 | TryExpr | provenance |  |
 | test.rs:224:18:224:38 | TryExpr | test.rs:224:13:224:14 | v1 | provenance |  |
 | test.rs:225:13:225:14 | v2 | test.rs:229:14:229:15 | v2 | provenance |  |
-| test.rs:225:18:225:21 | file | test.rs:225:18:225:32 | file.read_i16() [future, Ok] | provenance | MaD:30 |
+| test.rs:225:18:225:21 | file | test.rs:225:18:225:32 | file.read_i16() [future, Ok] | provenance | MaD:42 |
 | test.rs:225:18:225:32 | file.read_i16() [future, Ok] | test.rs:225:18:225:38 | await ... [Ok] | provenance |  |
 | test.rs:225:18:225:38 | await ... [Ok] | test.rs:225:18:225:39 | TryExpr | provenance |  |
 | test.rs:225:18:225:39 | TryExpr | test.rs:225:13:225:14 | v2 | provenance |  |
 | test.rs:226:13:226:14 | v3 | test.rs:230:14:230:15 | v3 | provenance |  |
-| test.rs:226:18:226:21 | file | test.rs:226:18:226:32 | file.read_f32() [future, Ok] | provenance | MaD:29 |
+| test.rs:226:18:226:21 | file | test.rs:226:18:226:32 | file.read_f32() [future, Ok] | provenance | MaD:41 |
 | test.rs:226:18:226:32 | file.read_f32() [future, Ok] | test.rs:226:18:226:38 | await ... [Ok] | provenance |  |
 | test.rs:226:18:226:38 | await ... [Ok] | test.rs:226:18:226:39 | TryExpr | provenance |  |
 | test.rs:226:18:226:39 | TryExpr | test.rs:226:13:226:14 | v3 | provenance |  |
 | test.rs:227:13:227:14 | v4 | test.rs:231:14:231:15 | v4 | provenance |  |
-| test.rs:227:18:227:21 | file | test.rs:227:18:227:35 | file.read_i64_le() [future, Ok] | provenance | MaD:31 |
+| test.rs:227:18:227:21 | file | test.rs:227:18:227:35 | file.read_i64_le() [future, Ok] | provenance | MaD:43 |
 | test.rs:227:18:227:35 | file.read_i64_le() [future, Ok] | test.rs:227:18:227:41 | await ... [Ok] | provenance |  |
 | test.rs:227:18:227:41 | await ... [Ok] | test.rs:227:18:227:42 | TryExpr | provenance |  |
 | test.rs:227:18:227:42 | TryExpr | test.rs:227:13:227:14 | v4 | provenance |  |
-| test.rs:236:9:236:12 | file | test.rs:236:23:236:33 | [post] &mut buffer [&ref] | provenance | MaD:27 |
+| test.rs:236:9:236:12 | file | test.rs:236:23:236:33 | [post] &mut buffer [&ref] | provenance | MaD:39 |
 | test.rs:236:23:236:33 | [post] &mut buffer [&ref] | test.rs:236:28:236:33 | [post] buffer | provenance |  |
 | test.rs:236:28:236:33 | [post] buffer | test.rs:237:15:237:20 | buffer | provenance |  |
 | test.rs:237:15:237:20 | buffer | test.rs:237:14:237:20 | &buffer | provenance |  |
 | test.rs:243:13:243:18 | mut f1 | test.rs:245:22:245:23 | f1 | provenance |  |
+| test.rs:243:22:243:65 | ... .open(...) | test.rs:243:22:243:65 | ... .open(...) [future, Ok] | provenance | Src:MaD:8  |
 | test.rs:243:22:243:65 | ... .open(...) [future, Ok] | test.rs:243:22:243:71 | await ... [Ok] | provenance |  |
 | test.rs:243:22:243:71 | await ... [Ok] | test.rs:243:22:243:72 | TryExpr | provenance |  |
 | test.rs:243:22:243:72 | TryExpr | test.rs:243:13:243:18 | mut f1 | provenance |  |
-| test.rs:243:52:243:55 | open | test.rs:243:22:243:65 | ... .open(...) [future, Ok] | provenance | Src:MaD:8  |
-| test.rs:245:22:245:23 | f1 | test.rs:245:30:245:40 | [post] &mut buffer [&ref] | provenance | MaD:26 |
+| test.rs:245:22:245:23 | f1 | test.rs:245:30:245:40 | [post] &mut buffer [&ref] | provenance | MaD:38 |
 | test.rs:245:30:245:40 | [post] &mut buffer [&ref] | test.rs:245:35:245:40 | [post] buffer | provenance |  |
 | test.rs:245:35:245:40 | [post] buffer | test.rs:246:15:246:20 | buffer | provenance |  |
 | test.rs:246:15:246:20 | buffer | test.rs:246:14:246:20 | &buffer | provenance |  |
 | test.rs:274:9:274:16 | mut file | test.rs:278:22:278:25 | file | provenance |  |
-| test.rs:274:20:274:44 | ...::open | test.rs:274:20:274:56 | ...::open(...) [future, Ok] | provenance | Src:MaD:1  |
+| test.rs:274:20:274:56 | ...::open(...) | test.rs:274:20:274:56 | ...::open(...) [future, Ok] | provenance | Src:MaD:1  |
 | test.rs:274:20:274:56 | ...::open(...) [future, Ok] | test.rs:274:20:274:62 | await ... [Ok] | provenance |  |
 | test.rs:274:20:274:62 | await ... [Ok] | test.rs:274:20:274:63 | TryExpr | provenance |  |
 | test.rs:274:20:274:63 | TryExpr | test.rs:274:9:274:16 | mut file | provenance |  |
-| test.rs:278:22:278:25 | file | test.rs:278:32:278:42 | [post] &mut buffer [&ref] | provenance | MaD:17 |
+| test.rs:278:22:278:25 | file | test.rs:278:32:278:42 | [post] &mut buffer [&ref] | provenance | MaD:25 |
 | test.rs:278:32:278:42 | [post] &mut buffer [&ref] | test.rs:278:37:278:42 | [post] buffer | provenance |  |
 | test.rs:278:37:278:42 | [post] buffer | test.rs:279:15:279:20 | buffer | provenance |  |
 | test.rs:279:15:279:20 | buffer | test.rs:279:14:279:20 | &buffer | provenance |  |
 | test.rs:285:13:285:18 | mut f1 | test.rs:287:22:287:23 | f1 | provenance |  |
+| test.rs:285:22:285:69 | ... .open(...) | test.rs:285:22:285:69 | ... .open(...) [future, Ok] | provenance | Src:MaD:2  |
 | test.rs:285:22:285:69 | ... .open(...) [future, Ok] | test.rs:285:22:285:75 | await ... [Ok] | provenance |  |
 | test.rs:285:22:285:75 | await ... [Ok] | test.rs:285:22:285:76 | TryExpr | provenance |  |
 | test.rs:285:22:285:76 | TryExpr | test.rs:285:13:285:18 | mut f1 | provenance |  |
-| test.rs:285:56:285:59 | open | test.rs:285:22:285:69 | ... .open(...) [future, Ok] | provenance | Src:MaD:2  |
-| test.rs:287:22:287:23 | f1 | test.rs:287:30:287:40 | [post] &mut buffer [&ref] | provenance | MaD:17 |
+| test.rs:287:22:287:23 | f1 | test.rs:287:30:287:40 | [post] &mut buffer [&ref] | provenance | MaD:25 |
 | test.rs:287:30:287:40 | [post] &mut buffer [&ref] | test.rs:287:35:287:40 | [post] buffer | provenance |  |
 | test.rs:287:35:287:40 | [post] buffer | test.rs:288:15:288:20 | buffer | provenance |  |
 | test.rs:288:15:288:20 | buffer | test.rs:288:14:288:20 | &buffer | provenance |  |
 nodes
 | test.rs:12:13:12:18 | buffer | semmle.label | buffer |
-| test.rs:12:31:12:43 | ...::read | semmle.label | ...::read |
+| test.rs:12:31:12:55 | ...::read(...) | semmle.label | ...::read(...) |
 | test.rs:12:31:12:55 | ...::read(...) [Ok] | semmle.label | ...::read(...) [Ok] |
 | test.rs:12:31:12:56 | TryExpr | semmle.label | TryExpr |
 | test.rs:13:14:13:19 | buffer | semmle.label | buffer |
 | test.rs:17:13:17:18 | buffer | semmle.label | buffer |
-| test.rs:17:31:17:38 | ...::read | semmle.label | ...::read |
+| test.rs:17:31:17:50 | ...::read(...) | semmle.label | ...::read(...) |
 | test.rs:17:31:17:50 | ...::read(...) [Ok] | semmle.label | ...::read(...) [Ok] |
 | test.rs:17:31:17:51 | TryExpr | semmle.label | TryExpr |
 | test.rs:18:14:18:19 | buffer | semmle.label | buffer |
 | test.rs:22:13:22:18 | buffer | semmle.label | buffer |
-| test.rs:22:22:22:39 | ...::read_to_string | semmle.label | ...::read_to_string |
+| test.rs:22:22:22:51 | ...::read_to_string(...) | semmle.label | ...::read_to_string(...) |
 | test.rs:22:22:22:51 | ...::read_to_string(...) [Ok] | semmle.label | ...::read_to_string(...) [Ok] |
 | test.rs:22:22:22:52 | TryExpr | semmle.label | TryExpr |
 | test.rs:23:14:23:19 | buffer | semmle.label | buffer |
 | test.rs:30:13:30:16 | path | semmle.label | path |
 | test.rs:30:20:30:27 | e.path() | semmle.label | e.path() |
-| test.rs:30:22:30:25 | path | semmle.label | path |
 | test.rs:31:14:31:17 | path | semmle.label | path |
 | test.rs:31:14:31:25 | path.clone() | semmle.label | path.clone() |
 | test.rs:32:14:32:17 | path | semmle.label | path |
@@ -350,7 +345,6 @@ nodes
 | test.rs:42:14:42:17 | path | semmle.label | path |
 | test.rs:44:13:44:21 | file_name | semmle.label | file_name |
 | test.rs:44:25:44:37 | e.file_name() | semmle.label | e.file_name() |
-| test.rs:44:27:44:35 | file_name | semmle.label | file_name |
 | test.rs:45:14:45:22 | file_name | semmle.label | file_name |
 | test.rs:45:14:45:30 | file_name.clone() | semmle.label | file_name.clone() |
 | test.rs:46:14:46:22 | file_name | semmle.label | file_name |
@@ -368,44 +362,42 @@ nodes
 | test.rs:49:14:49:49 | ... .as_encoded_bytes() | semmle.label | ... .as_encoded_bytes() |
 | test.rs:50:14:50:22 | file_name | semmle.label | file_name |
 | test.rs:68:13:68:18 | target | semmle.label | target |
-| test.rs:68:22:68:34 | ...::read_link | semmle.label | ...::read_link |
+| test.rs:68:22:68:49 | ...::read_link(...) | semmle.label | ...::read_link(...) |
 | test.rs:68:22:68:49 | ...::read_link(...) [Ok] | semmle.label | ...::read_link(...) [Ok] |
 | test.rs:68:22:68:50 | TryExpr | semmle.label | TryExpr |
 | test.rs:69:14:69:19 | target | semmle.label | target |
 | test.rs:77:13:77:18 | buffer | semmle.label | buffer |
-| test.rs:77:31:77:45 | ...::read | semmle.label | ...::read |
+| test.rs:77:31:77:57 | ...::read(...) | semmle.label | ...::read(...) |
 | test.rs:77:31:77:57 | ...::read(...) [future, Ok] | semmle.label | ...::read(...) [future, Ok] |
 | test.rs:77:31:77:63 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:77:31:77:64 | TryExpr | semmle.label | TryExpr |
 | test.rs:78:14:78:19 | buffer | semmle.label | buffer |
 | test.rs:82:13:82:18 | buffer | semmle.label | buffer |
-| test.rs:82:31:82:45 | ...::read | semmle.label | ...::read |
+| test.rs:82:31:82:57 | ...::read(...) | semmle.label | ...::read(...) |
 | test.rs:82:31:82:57 | ...::read(...) [future, Ok] | semmle.label | ...::read(...) [future, Ok] |
 | test.rs:82:31:82:63 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:82:31:82:64 | TryExpr | semmle.label | TryExpr |
 | test.rs:83:14:83:19 | buffer | semmle.label | buffer |
 | test.rs:87:13:87:18 | buffer | semmle.label | buffer |
-| test.rs:87:22:87:46 | ...::read_to_string | semmle.label | ...::read_to_string |
+| test.rs:87:22:87:58 | ...::read_to_string(...) | semmle.label | ...::read_to_string(...) |
 | test.rs:87:22:87:58 | ...::read_to_string(...) [future, Ok] | semmle.label | ...::read_to_string(...) [future, Ok] |
 | test.rs:87:22:87:64 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:87:22:87:65 | TryExpr | semmle.label | TryExpr |
 | test.rs:88:14:88:19 | buffer | semmle.label | buffer |
 | test.rs:93:13:93:16 | path | semmle.label | path |
 | test.rs:93:20:93:31 | entry.path() | semmle.label | entry.path() |
-| test.rs:93:26:93:29 | path | semmle.label | path |
 | test.rs:94:13:94:21 | file_name | semmle.label | file_name |
 | test.rs:94:25:94:41 | entry.file_name() | semmle.label | entry.file_name() |
-| test.rs:94:31:94:39 | file_name | semmle.label | file_name |
 | test.rs:95:14:95:17 | path | semmle.label | path |
 | test.rs:96:14:96:22 | file_name | semmle.label | file_name |
 | test.rs:100:13:100:18 | target | semmle.label | target |
-| test.rs:100:22:100:41 | ...::read_link | semmle.label | ...::read_link |
+| test.rs:100:22:100:56 | ...::read_link(...) | semmle.label | ...::read_link(...) |
 | test.rs:100:22:100:56 | ...::read_link(...) [future, Ok] | semmle.label | ...::read_link(...) [future, Ok] |
 | test.rs:100:22:100:62 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:100:22:100:63 | TryExpr | semmle.label | TryExpr |
 | test.rs:101:14:101:19 | target | semmle.label | target |
 | test.rs:110:9:110:16 | mut file | semmle.label | mut file |
-| test.rs:110:20:110:38 | ...::open | semmle.label | ...::open |
+| test.rs:110:20:110:50 | ...::open(...) | semmle.label | ...::open(...) |
 | test.rs:110:20:110:50 | ...::open(...) [Ok] | semmle.label | ...::open(...) [Ok] |
 | test.rs:110:20:110:51 | TryExpr | semmle.label | TryExpr |
 | test.rs:114:22:114:25 | file | semmle.label | file |
@@ -432,38 +424,38 @@ nodes
 | test.rs:136:17:136:28 | file.bytes() | semmle.label | file.bytes() |
 | test.rs:137:14:137:17 | byte | semmle.label | byte |
 | test.rs:143:13:143:18 | mut f1 | semmle.label | mut f1 |
+| test.rs:143:22:143:63 | ... .open(...) | semmle.label | ... .open(...) |
 | test.rs:143:22:143:63 | ... .open(...) [Ok] | semmle.label | ... .open(...) [Ok] |
 | test.rs:143:22:143:72 | ... .unwrap() | semmle.label | ... .unwrap() |
-| test.rs:143:50:143:53 | open | semmle.label | open |
 | test.rs:145:22:145:23 | f1 | semmle.label | f1 |
 | test.rs:145:30:145:40 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
 | test.rs:145:35:145:40 | [post] buffer | semmle.label | [post] buffer |
 | test.rs:146:14:146:20 | &buffer | semmle.label | &buffer |
 | test.rs:146:15:146:20 | buffer | semmle.label | buffer |
 | test.rs:150:13:150:18 | mut f2 | semmle.label | mut f2 |
+| test.rs:150:22:152:27 | ... .open(...) | semmle.label | ... .open(...) |
 | test.rs:150:22:152:27 | ... .open(...) [Ok] | semmle.label | ... .open(...) [Ok] |
 | test.rs:150:22:153:21 | ... .unwrap() | semmle.label | ... .unwrap() |
-| test.rs:152:14:152:17 | open | semmle.label | open |
 | test.rs:155:22:155:23 | f2 | semmle.label | f2 |
 | test.rs:155:30:155:40 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
 | test.rs:155:35:155:40 | [post] buffer | semmle.label | [post] buffer |
 | test.rs:156:14:156:20 | &buffer | semmle.label | &buffer |
 | test.rs:156:15:156:20 | buffer | semmle.label | buffer |
 | test.rs:160:13:160:18 | mut f3 | semmle.label | mut f3 |
+| test.rs:160:22:165:27 | ... .open(...) | semmle.label | ... .open(...) |
 | test.rs:160:22:165:27 | ... .open(...) [Ok] | semmle.label | ... .open(...) [Ok] |
 | test.rs:160:22:166:21 | ... .unwrap() | semmle.label | ... .unwrap() |
-| test.rs:165:14:165:17 | open | semmle.label | open |
 | test.rs:168:22:168:23 | f3 | semmle.label | f3 |
 | test.rs:168:30:168:40 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
 | test.rs:168:35:168:40 | [post] buffer | semmle.label | [post] buffer |
 | test.rs:169:14:169:20 | &buffer | semmle.label | &buffer |
 | test.rs:169:15:169:20 | buffer | semmle.label | buffer |
 | test.rs:176:13:176:17 | file1 | semmle.label | file1 |
-| test.rs:176:21:176:39 | ...::open | semmle.label | ...::open |
+| test.rs:176:21:176:51 | ...::open(...) | semmle.label | ...::open(...) |
 | test.rs:176:21:176:51 | ...::open(...) [Ok] | semmle.label | ...::open(...) [Ok] |
 | test.rs:176:21:176:52 | TryExpr | semmle.label | TryExpr |
 | test.rs:177:13:177:17 | file2 | semmle.label | file2 |
-| test.rs:177:21:177:39 | ...::open | semmle.label | ...::open |
+| test.rs:177:21:177:59 | ...::open(...) | semmle.label | ...::open(...) |
 | test.rs:177:21:177:59 | ...::open(...) [Ok] | semmle.label | ...::open(...) [Ok] |
 | test.rs:177:21:177:60 | TryExpr | semmle.label | TryExpr |
 | test.rs:178:13:178:22 | mut reader | semmle.label | mut reader |
@@ -476,7 +468,7 @@ nodes
 | test.rs:180:14:180:20 | &buffer | semmle.label | &buffer |
 | test.rs:180:15:180:20 | buffer | semmle.label | buffer |
 | test.rs:185:13:185:17 | file1 | semmle.label | file1 |
-| test.rs:185:21:185:39 | ...::open | semmle.label | ...::open |
+| test.rs:185:21:185:51 | ...::open(...) | semmle.label | ...::open(...) |
 | test.rs:185:21:185:51 | ...::open(...) [Ok] | semmle.label | ...::open(...) [Ok] |
 | test.rs:185:21:185:52 | TryExpr | semmle.label | TryExpr |
 | test.rs:186:13:186:22 | mut reader | semmle.label | mut reader |
@@ -488,7 +480,7 @@ nodes
 | test.rs:188:14:188:20 | &buffer | semmle.label | &buffer |
 | test.rs:188:15:188:20 | buffer | semmle.label | buffer |
 | test.rs:197:9:197:16 | mut file | semmle.label | mut file |
-| test.rs:197:20:197:40 | ...::open | semmle.label | ...::open |
+| test.rs:197:20:197:52 | ...::open(...) | semmle.label | ...::open(...) |
 | test.rs:197:20:197:52 | ...::open(...) [future, Ok] | semmle.label | ...::open(...) [future, Ok] |
 | test.rs:197:20:197:58 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:197:20:197:59 | TryExpr | semmle.label | TryExpr |
@@ -542,17 +534,17 @@ nodes
 | test.rs:237:14:237:20 | &buffer | semmle.label | &buffer |
 | test.rs:237:15:237:20 | buffer | semmle.label | buffer |
 | test.rs:243:13:243:18 | mut f1 | semmle.label | mut f1 |
+| test.rs:243:22:243:65 | ... .open(...) | semmle.label | ... .open(...) |
 | test.rs:243:22:243:65 | ... .open(...) [future, Ok] | semmle.label | ... .open(...) [future, Ok] |
 | test.rs:243:22:243:71 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:243:22:243:72 | TryExpr | semmle.label | TryExpr |
-| test.rs:243:52:243:55 | open | semmle.label | open |
 | test.rs:245:22:245:23 | f1 | semmle.label | f1 |
 | test.rs:245:30:245:40 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
 | test.rs:245:35:245:40 | [post] buffer | semmle.label | [post] buffer |
 | test.rs:246:14:246:20 | &buffer | semmle.label | &buffer |
 | test.rs:246:15:246:20 | buffer | semmle.label | buffer |
 | test.rs:274:9:274:16 | mut file | semmle.label | mut file |
-| test.rs:274:20:274:44 | ...::open | semmle.label | ...::open |
+| test.rs:274:20:274:56 | ...::open(...) | semmle.label | ...::open(...) |
 | test.rs:274:20:274:56 | ...::open(...) [future, Ok] | semmle.label | ...::open(...) [future, Ok] |
 | test.rs:274:20:274:62 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:274:20:274:63 | TryExpr | semmle.label | TryExpr |
@@ -562,10 +554,10 @@ nodes
 | test.rs:279:14:279:20 | &buffer | semmle.label | &buffer |
 | test.rs:279:15:279:20 | buffer | semmle.label | buffer |
 | test.rs:285:13:285:18 | mut f1 | semmle.label | mut f1 |
+| test.rs:285:22:285:69 | ... .open(...) | semmle.label | ... .open(...) |
 | test.rs:285:22:285:69 | ... .open(...) [future, Ok] | semmle.label | ... .open(...) [future, Ok] |
 | test.rs:285:22:285:75 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:285:22:285:76 | TryExpr | semmle.label | TryExpr |
-| test.rs:285:56:285:59 | open | semmle.label | open |
 | test.rs:287:22:287:23 | f1 | semmle.label | f1 |
 | test.rs:287:30:287:40 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
 | test.rs:287:35:287:40 | [post] buffer | semmle.label | [post] buffer |
@@ -574,54 +566,54 @@ nodes
 subpaths
 testFailures
 #select
-| test.rs:13:14:13:19 | buffer | test.rs:12:31:12:43 | ...::read | test.rs:13:14:13:19 | buffer | $@ | test.rs:12:31:12:43 | ...::read | ...::read |
-| test.rs:18:14:18:19 | buffer | test.rs:17:31:17:38 | ...::read | test.rs:18:14:18:19 | buffer | $@ | test.rs:17:31:17:38 | ...::read | ...::read |
-| test.rs:23:14:23:19 | buffer | test.rs:22:22:22:39 | ...::read_to_string | test.rs:23:14:23:19 | buffer | $@ | test.rs:22:22:22:39 | ...::read_to_string | ...::read_to_string |
-| test.rs:31:14:31:25 | path.clone() | test.rs:30:22:30:25 | path | test.rs:31:14:31:25 | path.clone() | $@ | test.rs:30:22:30:25 | path | path |
-| test.rs:32:14:32:35 | ... .as_path() | test.rs:30:22:30:25 | path | test.rs:32:14:32:35 | ... .as_path() | $@ | test.rs:30:22:30:25 | path | path |
-| test.rs:33:14:33:42 | ... .into_os_string() | test.rs:30:22:30:25 | path | test.rs:33:14:33:42 | ... .into_os_string() | $@ | test.rs:30:22:30:25 | path | path |
-| test.rs:34:14:34:69 | ...::from(...) | test.rs:30:22:30:25 | path | test.rs:34:14:34:69 | ...::from(...) | $@ | test.rs:30:22:30:25 | path | path |
-| test.rs:35:14:35:37 | ... .as_os_str() | test.rs:30:22:30:25 | path | test.rs:35:14:35:37 | ... .as_os_str() | $@ | test.rs:30:22:30:25 | path | path |
-| test.rs:36:14:36:41 | ... .as_mut_os_str() | test.rs:30:22:30:25 | path | test.rs:36:14:36:41 | ... .as_mut_os_str() | $@ | test.rs:30:22:30:25 | path | path |
-| test.rs:37:14:37:26 | path.to_str() | test.rs:30:22:30:25 | path | test.rs:37:14:37:26 | path.to_str() | $@ | test.rs:30:22:30:25 | path | path |
-| test.rs:38:14:38:31 | path.to_path_buf() | test.rs:30:22:30:25 | path | test.rs:38:14:38:31 | path.to_path_buf() | $@ | test.rs:30:22:30:25 | path | path |
-| test.rs:39:14:39:38 | ... .unwrap() | test.rs:30:22:30:25 | path | test.rs:39:14:39:38 | ... .unwrap() | $@ | test.rs:30:22:30:25 | path | path |
-| test.rs:40:14:40:38 | ... .unwrap() | test.rs:30:22:30:25 | path | test.rs:40:14:40:38 | ... .unwrap() | $@ | test.rs:30:22:30:25 | path | path |
-| test.rs:41:14:41:41 | ... .unwrap() | test.rs:30:22:30:25 | path | test.rs:41:14:41:41 | ... .unwrap() | $@ | test.rs:30:22:30:25 | path | path |
-| test.rs:42:14:42:17 | path | test.rs:30:22:30:25 | path | test.rs:42:14:42:17 | path | $@ | test.rs:30:22:30:25 | path | path |
-| test.rs:45:14:45:30 | file_name.clone() | test.rs:44:27:44:35 | file_name | test.rs:45:14:45:30 | file_name.clone() | $@ | test.rs:44:27:44:35 | file_name | file_name |
-| test.rs:46:14:46:53 | ... .unwrap() | test.rs:44:27:44:35 | file_name | test.rs:46:14:46:53 | ... .unwrap() | $@ | test.rs:44:27:44:35 | file_name | file_name |
-| test.rs:47:14:47:40 | ... .unwrap() | test.rs:44:27:44:35 | file_name | test.rs:47:14:47:40 | ... .unwrap() | $@ | test.rs:44:27:44:35 | file_name | file_name |
-| test.rs:48:14:48:49 | ... .to_mut() | test.rs:44:27:44:35 | file_name | test.rs:48:14:48:49 | ... .to_mut() | $@ | test.rs:44:27:44:35 | file_name | file_name |
-| test.rs:49:14:49:49 | ... .as_encoded_bytes() | test.rs:44:27:44:35 | file_name | test.rs:49:14:49:49 | ... .as_encoded_bytes() | $@ | test.rs:44:27:44:35 | file_name | file_name |
-| test.rs:50:14:50:22 | file_name | test.rs:44:27:44:35 | file_name | test.rs:50:14:50:22 | file_name | $@ | test.rs:44:27:44:35 | file_name | file_name |
-| test.rs:69:14:69:19 | target | test.rs:68:22:68:34 | ...::read_link | test.rs:69:14:69:19 | target | $@ | test.rs:68:22:68:34 | ...::read_link | ...::read_link |
-| test.rs:78:14:78:19 | buffer | test.rs:77:31:77:45 | ...::read | test.rs:78:14:78:19 | buffer | $@ | test.rs:77:31:77:45 | ...::read | ...::read |
-| test.rs:83:14:83:19 | buffer | test.rs:82:31:82:45 | ...::read | test.rs:83:14:83:19 | buffer | $@ | test.rs:82:31:82:45 | ...::read | ...::read |
-| test.rs:88:14:88:19 | buffer | test.rs:87:22:87:46 | ...::read_to_string | test.rs:88:14:88:19 | buffer | $@ | test.rs:87:22:87:46 | ...::read_to_string | ...::read_to_string |
-| test.rs:95:14:95:17 | path | test.rs:93:26:93:29 | path | test.rs:95:14:95:17 | path | $@ | test.rs:93:26:93:29 | path | path |
-| test.rs:96:14:96:22 | file_name | test.rs:94:31:94:39 | file_name | test.rs:96:14:96:22 | file_name | $@ | test.rs:94:31:94:39 | file_name | file_name |
-| test.rs:101:14:101:19 | target | test.rs:100:22:100:41 | ...::read_link | test.rs:101:14:101:19 | target | $@ | test.rs:100:22:100:41 | ...::read_link | ...::read_link |
-| test.rs:115:14:115:20 | &buffer | test.rs:110:20:110:38 | ...::open | test.rs:115:14:115:20 | &buffer | $@ | test.rs:110:20:110:38 | ...::open | ...::open |
-| test.rs:121:14:121:20 | &buffer | test.rs:110:20:110:38 | ...::open | test.rs:121:14:121:20 | &buffer | $@ | test.rs:110:20:110:38 | ...::open | ...::open |
-| test.rs:127:14:127:20 | &buffer | test.rs:110:20:110:38 | ...::open | test.rs:127:14:127:20 | &buffer | $@ | test.rs:110:20:110:38 | ...::open | ...::open |
-| test.rs:133:14:133:20 | &buffer | test.rs:110:20:110:38 | ...::open | test.rs:133:14:133:20 | &buffer | $@ | test.rs:110:20:110:38 | ...::open | ...::open |
-| test.rs:137:14:137:17 | byte | test.rs:110:20:110:38 | ...::open | test.rs:137:14:137:17 | byte | $@ | test.rs:110:20:110:38 | ...::open | ...::open |
-| test.rs:146:14:146:20 | &buffer | test.rs:143:50:143:53 | open | test.rs:146:14:146:20 | &buffer | $@ | test.rs:143:50:143:53 | open | open |
-| test.rs:156:14:156:20 | &buffer | test.rs:152:14:152:17 | open | test.rs:156:14:156:20 | &buffer | $@ | test.rs:152:14:152:17 | open | open |
-| test.rs:169:14:169:20 | &buffer | test.rs:165:14:165:17 | open | test.rs:169:14:169:20 | &buffer | $@ | test.rs:165:14:165:17 | open | open |
-| test.rs:180:14:180:20 | &buffer | test.rs:176:21:176:39 | ...::open | test.rs:180:14:180:20 | &buffer | $@ | test.rs:176:21:176:39 | ...::open | ...::open |
-| test.rs:180:14:180:20 | &buffer | test.rs:177:21:177:39 | ...::open | test.rs:180:14:180:20 | &buffer | $@ | test.rs:177:21:177:39 | ...::open | ...::open |
-| test.rs:188:14:188:20 | &buffer | test.rs:185:21:185:39 | ...::open | test.rs:188:14:188:20 | &buffer | $@ | test.rs:185:21:185:39 | ...::open | ...::open |
-| test.rs:202:14:202:20 | &buffer | test.rs:197:20:197:40 | ...::open | test.rs:202:14:202:20 | &buffer | $@ | test.rs:197:20:197:40 | ...::open | ...::open |
-| test.rs:208:14:208:20 | &buffer | test.rs:197:20:197:40 | ...::open | test.rs:208:14:208:20 | &buffer | $@ | test.rs:197:20:197:40 | ...::open | ...::open |
-| test.rs:214:14:214:20 | &buffer | test.rs:197:20:197:40 | ...::open | test.rs:214:14:214:20 | &buffer | $@ | test.rs:197:20:197:40 | ...::open | ...::open |
-| test.rs:220:14:220:20 | &buffer | test.rs:197:20:197:40 | ...::open | test.rs:220:14:220:20 | &buffer | $@ | test.rs:197:20:197:40 | ...::open | ...::open |
-| test.rs:228:14:228:15 | v1 | test.rs:197:20:197:40 | ...::open | test.rs:228:14:228:15 | v1 | $@ | test.rs:197:20:197:40 | ...::open | ...::open |
-| test.rs:229:14:229:15 | v2 | test.rs:197:20:197:40 | ...::open | test.rs:229:14:229:15 | v2 | $@ | test.rs:197:20:197:40 | ...::open | ...::open |
-| test.rs:230:14:230:15 | v3 | test.rs:197:20:197:40 | ...::open | test.rs:230:14:230:15 | v3 | $@ | test.rs:197:20:197:40 | ...::open | ...::open |
-| test.rs:231:14:231:15 | v4 | test.rs:197:20:197:40 | ...::open | test.rs:231:14:231:15 | v4 | $@ | test.rs:197:20:197:40 | ...::open | ...::open |
-| test.rs:237:14:237:20 | &buffer | test.rs:197:20:197:40 | ...::open | test.rs:237:14:237:20 | &buffer | $@ | test.rs:197:20:197:40 | ...::open | ...::open |
-| test.rs:246:14:246:20 | &buffer | test.rs:243:52:243:55 | open | test.rs:246:14:246:20 | &buffer | $@ | test.rs:243:52:243:55 | open | open |
-| test.rs:279:14:279:20 | &buffer | test.rs:274:20:274:44 | ...::open | test.rs:279:14:279:20 | &buffer | $@ | test.rs:274:20:274:44 | ...::open | ...::open |
-| test.rs:288:14:288:20 | &buffer | test.rs:285:56:285:59 | open | test.rs:288:14:288:20 | &buffer | $@ | test.rs:285:56:285:59 | open | open |
+| test.rs:13:14:13:19 | buffer | test.rs:12:31:12:55 | ...::read(...) | test.rs:13:14:13:19 | buffer | $@ | test.rs:12:31:12:55 | ...::read(...) | ...::read(...) |
+| test.rs:18:14:18:19 | buffer | test.rs:17:31:17:50 | ...::read(...) | test.rs:18:14:18:19 | buffer | $@ | test.rs:17:31:17:50 | ...::read(...) | ...::read(...) |
+| test.rs:23:14:23:19 | buffer | test.rs:22:22:22:51 | ...::read_to_string(...) | test.rs:23:14:23:19 | buffer | $@ | test.rs:22:22:22:51 | ...::read_to_string(...) | ...::read_to_string(...) |
+| test.rs:31:14:31:25 | path.clone() | test.rs:30:20:30:27 | e.path() | test.rs:31:14:31:25 | path.clone() | $@ | test.rs:30:20:30:27 | e.path() | e.path() |
+| test.rs:32:14:32:35 | ... .as_path() | test.rs:30:20:30:27 | e.path() | test.rs:32:14:32:35 | ... .as_path() | $@ | test.rs:30:20:30:27 | e.path() | e.path() |
+| test.rs:33:14:33:42 | ... .into_os_string() | test.rs:30:20:30:27 | e.path() | test.rs:33:14:33:42 | ... .into_os_string() | $@ | test.rs:30:20:30:27 | e.path() | e.path() |
+| test.rs:34:14:34:69 | ...::from(...) | test.rs:30:20:30:27 | e.path() | test.rs:34:14:34:69 | ...::from(...) | $@ | test.rs:30:20:30:27 | e.path() | e.path() |
+| test.rs:35:14:35:37 | ... .as_os_str() | test.rs:30:20:30:27 | e.path() | test.rs:35:14:35:37 | ... .as_os_str() | $@ | test.rs:30:20:30:27 | e.path() | e.path() |
+| test.rs:36:14:36:41 | ... .as_mut_os_str() | test.rs:30:20:30:27 | e.path() | test.rs:36:14:36:41 | ... .as_mut_os_str() | $@ | test.rs:30:20:30:27 | e.path() | e.path() |
+| test.rs:37:14:37:26 | path.to_str() | test.rs:30:20:30:27 | e.path() | test.rs:37:14:37:26 | path.to_str() | $@ | test.rs:30:20:30:27 | e.path() | e.path() |
+| test.rs:38:14:38:31 | path.to_path_buf() | test.rs:30:20:30:27 | e.path() | test.rs:38:14:38:31 | path.to_path_buf() | $@ | test.rs:30:20:30:27 | e.path() | e.path() |
+| test.rs:39:14:39:38 | ... .unwrap() | test.rs:30:20:30:27 | e.path() | test.rs:39:14:39:38 | ... .unwrap() | $@ | test.rs:30:20:30:27 | e.path() | e.path() |
+| test.rs:40:14:40:38 | ... .unwrap() | test.rs:30:20:30:27 | e.path() | test.rs:40:14:40:38 | ... .unwrap() | $@ | test.rs:30:20:30:27 | e.path() | e.path() |
+| test.rs:41:14:41:41 | ... .unwrap() | test.rs:30:20:30:27 | e.path() | test.rs:41:14:41:41 | ... .unwrap() | $@ | test.rs:30:20:30:27 | e.path() | e.path() |
+| test.rs:42:14:42:17 | path | test.rs:30:20:30:27 | e.path() | test.rs:42:14:42:17 | path | $@ | test.rs:30:20:30:27 | e.path() | e.path() |
+| test.rs:45:14:45:30 | file_name.clone() | test.rs:44:25:44:37 | e.file_name() | test.rs:45:14:45:30 | file_name.clone() | $@ | test.rs:44:25:44:37 | e.file_name() | e.file_name() |
+| test.rs:46:14:46:53 | ... .unwrap() | test.rs:44:25:44:37 | e.file_name() | test.rs:46:14:46:53 | ... .unwrap() | $@ | test.rs:44:25:44:37 | e.file_name() | e.file_name() |
+| test.rs:47:14:47:40 | ... .unwrap() | test.rs:44:25:44:37 | e.file_name() | test.rs:47:14:47:40 | ... .unwrap() | $@ | test.rs:44:25:44:37 | e.file_name() | e.file_name() |
+| test.rs:48:14:48:49 | ... .to_mut() | test.rs:44:25:44:37 | e.file_name() | test.rs:48:14:48:49 | ... .to_mut() | $@ | test.rs:44:25:44:37 | e.file_name() | e.file_name() |
+| test.rs:49:14:49:49 | ... .as_encoded_bytes() | test.rs:44:25:44:37 | e.file_name() | test.rs:49:14:49:49 | ... .as_encoded_bytes() | $@ | test.rs:44:25:44:37 | e.file_name() | e.file_name() |
+| test.rs:50:14:50:22 | file_name | test.rs:44:25:44:37 | e.file_name() | test.rs:50:14:50:22 | file_name | $@ | test.rs:44:25:44:37 | e.file_name() | e.file_name() |
+| test.rs:69:14:69:19 | target | test.rs:68:22:68:49 | ...::read_link(...) | test.rs:69:14:69:19 | target | $@ | test.rs:68:22:68:49 | ...::read_link(...) | ...::read_link(...) |
+| test.rs:78:14:78:19 | buffer | test.rs:77:31:77:57 | ...::read(...) | test.rs:78:14:78:19 | buffer | $@ | test.rs:77:31:77:57 | ...::read(...) | ...::read(...) |
+| test.rs:83:14:83:19 | buffer | test.rs:82:31:82:57 | ...::read(...) | test.rs:83:14:83:19 | buffer | $@ | test.rs:82:31:82:57 | ...::read(...) | ...::read(...) |
+| test.rs:88:14:88:19 | buffer | test.rs:87:22:87:58 | ...::read_to_string(...) | test.rs:88:14:88:19 | buffer | $@ | test.rs:87:22:87:58 | ...::read_to_string(...) | ...::read_to_string(...) |
+| test.rs:95:14:95:17 | path | test.rs:93:20:93:31 | entry.path() | test.rs:95:14:95:17 | path | $@ | test.rs:93:20:93:31 | entry.path() | entry.path() |
+| test.rs:96:14:96:22 | file_name | test.rs:94:25:94:41 | entry.file_name() | test.rs:96:14:96:22 | file_name | $@ | test.rs:94:25:94:41 | entry.file_name() | entry.file_name() |
+| test.rs:101:14:101:19 | target | test.rs:100:22:100:56 | ...::read_link(...) | test.rs:101:14:101:19 | target | $@ | test.rs:100:22:100:56 | ...::read_link(...) | ...::read_link(...) |
+| test.rs:115:14:115:20 | &buffer | test.rs:110:20:110:50 | ...::open(...) | test.rs:115:14:115:20 | &buffer | $@ | test.rs:110:20:110:50 | ...::open(...) | ...::open(...) |
+| test.rs:121:14:121:20 | &buffer | test.rs:110:20:110:50 | ...::open(...) | test.rs:121:14:121:20 | &buffer | $@ | test.rs:110:20:110:50 | ...::open(...) | ...::open(...) |
+| test.rs:127:14:127:20 | &buffer | test.rs:110:20:110:50 | ...::open(...) | test.rs:127:14:127:20 | &buffer | $@ | test.rs:110:20:110:50 | ...::open(...) | ...::open(...) |
+| test.rs:133:14:133:20 | &buffer | test.rs:110:20:110:50 | ...::open(...) | test.rs:133:14:133:20 | &buffer | $@ | test.rs:110:20:110:50 | ...::open(...) | ...::open(...) |
+| test.rs:137:14:137:17 | byte | test.rs:110:20:110:50 | ...::open(...) | test.rs:137:14:137:17 | byte | $@ | test.rs:110:20:110:50 | ...::open(...) | ...::open(...) |
+| test.rs:146:14:146:20 | &buffer | test.rs:143:22:143:63 | ... .open(...) | test.rs:146:14:146:20 | &buffer | $@ | test.rs:143:22:143:63 | ... .open(...) | ... .open(...) |
+| test.rs:156:14:156:20 | &buffer | test.rs:150:22:152:27 | ... .open(...) | test.rs:156:14:156:20 | &buffer | $@ | test.rs:150:22:152:27 | ... .open(...) | ... .open(...) |
+| test.rs:169:14:169:20 | &buffer | test.rs:160:22:165:27 | ... .open(...) | test.rs:169:14:169:20 | &buffer | $@ | test.rs:160:22:165:27 | ... .open(...) | ... .open(...) |
+| test.rs:180:14:180:20 | &buffer | test.rs:176:21:176:51 | ...::open(...) | test.rs:180:14:180:20 | &buffer | $@ | test.rs:176:21:176:51 | ...::open(...) | ...::open(...) |
+| test.rs:180:14:180:20 | &buffer | test.rs:177:21:177:59 | ...::open(...) | test.rs:180:14:180:20 | &buffer | $@ | test.rs:177:21:177:59 | ...::open(...) | ...::open(...) |
+| test.rs:188:14:188:20 | &buffer | test.rs:185:21:185:51 | ...::open(...) | test.rs:188:14:188:20 | &buffer | $@ | test.rs:185:21:185:51 | ...::open(...) | ...::open(...) |
+| test.rs:202:14:202:20 | &buffer | test.rs:197:20:197:52 | ...::open(...) | test.rs:202:14:202:20 | &buffer | $@ | test.rs:197:20:197:52 | ...::open(...) | ...::open(...) |
+| test.rs:208:14:208:20 | &buffer | test.rs:197:20:197:52 | ...::open(...) | test.rs:208:14:208:20 | &buffer | $@ | test.rs:197:20:197:52 | ...::open(...) | ...::open(...) |
+| test.rs:214:14:214:20 | &buffer | test.rs:197:20:197:52 | ...::open(...) | test.rs:214:14:214:20 | &buffer | $@ | test.rs:197:20:197:52 | ...::open(...) | ...::open(...) |
+| test.rs:220:14:220:20 | &buffer | test.rs:197:20:197:52 | ...::open(...) | test.rs:220:14:220:20 | &buffer | $@ | test.rs:197:20:197:52 | ...::open(...) | ...::open(...) |
+| test.rs:228:14:228:15 | v1 | test.rs:197:20:197:52 | ...::open(...) | test.rs:228:14:228:15 | v1 | $@ | test.rs:197:20:197:52 | ...::open(...) | ...::open(...) |
+| test.rs:229:14:229:15 | v2 | test.rs:197:20:197:52 | ...::open(...) | test.rs:229:14:229:15 | v2 | $@ | test.rs:197:20:197:52 | ...::open(...) | ...::open(...) |
+| test.rs:230:14:230:15 | v3 | test.rs:197:20:197:52 | ...::open(...) | test.rs:230:14:230:15 | v3 | $@ | test.rs:197:20:197:52 | ...::open(...) | ...::open(...) |
+| test.rs:231:14:231:15 | v4 | test.rs:197:20:197:52 | ...::open(...) | test.rs:231:14:231:15 | v4 | $@ | test.rs:197:20:197:52 | ...::open(...) | ...::open(...) |
+| test.rs:237:14:237:20 | &buffer | test.rs:197:20:197:52 | ...::open(...) | test.rs:237:14:237:20 | &buffer | $@ | test.rs:197:20:197:52 | ...::open(...) | ...::open(...) |
+| test.rs:246:14:246:20 | &buffer | test.rs:243:22:243:65 | ... .open(...) | test.rs:246:14:246:20 | &buffer | $@ | test.rs:243:22:243:65 | ... .open(...) | ... .open(...) |
+| test.rs:279:14:279:20 | &buffer | test.rs:274:20:274:56 | ...::open(...) | test.rs:279:14:279:20 | &buffer | $@ | test.rs:274:20:274:56 | ...::open(...) | ...::open(...) |
+| test.rs:288:14:288:20 | &buffer | test.rs:285:22:285:69 | ... .open(...) | test.rs:288:14:288:20 | &buffer | $@ | test.rs:285:22:285:69 | ... .open(...) | ... .open(...) |
diff --git a/rust/ql/test/library-tests/dataflow/sources/file/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/file/TaintSources.expected
index dc17269abe81..70a9ed34806f 100644
--- a/rust/ql/test/library-tests/dataflow/sources/file/TaintSources.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/file/TaintSources.expected
@@ -1,33 +1,33 @@
-| test.rs:12:31:12:43 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:17:31:17:38 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:22:22:22:39 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:27:26:27:37 | ...::read_dir | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:30:22:30:25 | path | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:44:27:44:35 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:53:60:53:67 | read_dir | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:56:22:56:25 | path | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:57:27:57:35 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:60:64:60:71 | read_dir | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:63:22:63:25 | path | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:64:27:64:35 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:68:22:68:34 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:77:31:77:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:82:31:82:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:87:22:87:46 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:93:26:93:29 | path | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:94:31:94:39 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:100:22:100:41 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:110:20:110:38 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:143:50:143:53 | open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:152:14:152:17 | open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:165:14:165:17 | open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:176:21:176:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:177:21:177:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:185:21:185:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:197:20:197:40 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:243:52:243:55 | open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:253:21:253:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:254:21:254:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:262:21:262:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:274:20:274:44 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:285:56:285:59 | open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:12:31:12:55 | ...::read(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:17:31:17:50 | ...::read(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:22:22:22:51 | ...::read_to_string(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:27:26:27:50 | ...::read_dir(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:30:20:30:27 | e.path() | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:44:25:44:37 | e.file_name() | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:53:26:53:69 | ... .read_dir() | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:56:20:56:27 | e.path() | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:57:25:57:37 | e.file_name() | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:60:26:60:73 | ... .read_dir() | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:63:20:63:27 | e.path() | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:64:25:64:37 | e.file_name() | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:68:22:68:49 | ...::read_link(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:77:31:77:57 | ...::read(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:82:31:82:57 | ...::read(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:87:22:87:58 | ...::read_to_string(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:93:20:93:31 | entry.path() | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:94:25:94:41 | entry.file_name() | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:100:22:100:56 | ...::read_link(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:110:20:110:50 | ...::open(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:143:22:143:63 | ... .open(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:150:22:152:27 | ... .open(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:160:22:165:27 | ... .open(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:176:21:176:51 | ...::open(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:177:21:177:59 | ...::open(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:185:21:185:51 | ...::open(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:197:20:197:52 | ...::open(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:243:22:243:65 | ... .open(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:253:21:253:53 | ...::open(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:254:21:254:61 | ...::open(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:262:21:262:53 | ...::open(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:274:20:274:56 | ...::open(...) | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:285:22:285:69 | ... .open(...) | Flow source 'FileSource' of type file (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/Cargo.lock b/rust/ql/test/library-tests/dataflow/sources/net/Cargo.lock
index 27790b8b768d..08dceba92341 100644
--- a/rust/ql/test/library-tests/dataflow/sources/net/Cargo.lock
+++ b/rust/ql/test/library-tests/dataflow/sources/net/Cargo.lock
@@ -92,6 +92,18 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "async-native-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9343dc5acf07e79ff82d0c37899f079db3534d99f189a1837c8e549c99405bec"
+dependencies = [
+ "futures-util",
+ "native-tls",
+ "thiserror",
+ "url",
+]
+
 [[package]]
 name = "async-std"
 version = "1.13.2"
@@ -1551,6 +1563,7 @@ dependencies = [
 name = "test"
 version = "0.0.1"
 dependencies = [
+ "async-native-tls",
  "async-std",
  "futures",
  "futures-rustls",
@@ -1558,11 +1571,32 @@ dependencies = [
  "http-body-util",
  "hyper",
  "hyper-util",
+ "native-tls",
  "reqwest",
  "rustls",
  "tokio",
 ]
 
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tinystr"
 version = "0.8.1"
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/InlineFlow.expected b/rust/ql/test/library-tests/dataflow/sources/net/InlineFlow.expected
index b5a008f98388..eaf74b90ea10 100644
--- a/rust/ql/test/library-tests/dataflow/sources/net/InlineFlow.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/net/InlineFlow.expected
@@ -7,398 +7,443 @@ models
 | 6 | Source: <tokio::net::tcp::stream::TcpStream>::connect; ReturnValue.Future.Field[core::result::Result::Ok(0)]; remote |
 | 7 | Source: reqwest::blocking::get; ReturnValue.Field[core::result::Result::Ok(0)]; remote |
 | 8 | Source: reqwest::get; ReturnValue.Future.Field[core::result::Result::Ok(0)]; remote |
-| 9 | Summary: <_ as core::ops::deref::Deref>::deref; Argument[self].Reference; ReturnValue.Reference; taint |
-| 10 | Summary: <_ as core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
-| 11 | Summary: <_ as futures_io::if_std::AsyncBufRead>::poll_fill_buf; Argument[self].Reference; ReturnValue.Field[core::task::poll::Poll::Ready(0)].Field[core::result::Result::Ok(0)]; taint |
-| 12 | Summary: <_ as futures_io::if_std::AsyncRead>::poll_read; Argument[self].Reference; Argument[1].Reference; taint |
-| 13 | Summary: <_ as futures_util::io::AsyncBufReadExt>::fill_buf; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
-| 14 | Summary: <_ as futures_util::io::AsyncBufReadExt>::read_line; Argument[self].Reference; Argument[0].Reference; taint |
-| 15 | Summary: <_ as futures_util::io::AsyncBufReadExt>::read_until; Argument[self].Reference; Argument[1].Reference; taint |
-| 16 | Summary: <_ as futures_util::io::AsyncReadExt>::read; Argument[self].Reference; Argument[0].Reference; taint |
-| 17 | Summary: <_ as futures_util::io::AsyncReadExt>::read_to_end; Argument[self].Reference; Argument[0].Reference; taint |
-| 18 | Summary: <_ as std::io::BufRead>::lines; Argument[self]; ReturnValue; taint |
-| 19 | Summary: <_ as std::io::BufRead>::read_line; Argument[self].Reference; Argument[0].Reference; taint |
-| 20 | Summary: <_ as std::io::Read>::read; Argument[self].Reference; Argument[0].Reference; taint |
-| 21 | Summary: <_ as std::io::Read>::read_to_end; Argument[self].Reference; Argument[0].Reference; taint |
-| 22 | Summary: <_ as std::io::Read>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
-| 23 | Summary: <_ as std::io::Read>::take; Argument[self]; ReturnValue; taint |
-| 24 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read; Argument[self].Reference; Argument[0].Reference; taint |
-| 25 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
-| 26 | Summary: <core::pin::Pin>::new; Argument[0].Reference; ReturnValue; value |
-| 27 | Summary: <core::pin::Pin>::new; Argument[0]; ReturnValue.Field[core::pin::Pin::pointer]; value |
-| 28 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 29 | Summary: <futures_rustls::TlsConnector>::connect; Argument[1]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
-| 30 | Summary: <futures_util::io::buf_reader::BufReader>::new; Argument[0]; ReturnValue; taint |
-| 31 | Summary: <http::response::Response>::body; Argument[self].Reference.Field[http::response::Response::body]; ReturnValue.Reference; value |
-| 32 | Summary: <http::response::Response>::body_mut; Argument[self].Reference.Field[http::response::Response::body]; ReturnValue.Reference; value |
-| 33 | Summary: <http::response::Response>::into_body; Argument[self].Field[http::response::Response::body]; ReturnValue; value |
-| 34 | Summary: <reqwest::async_impl::response::Response>::bytes; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
-| 35 | Summary: <reqwest::async_impl::response::Response>::chunk; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]; taint |
-| 36 | Summary: <reqwest::async_impl::response::Response>::text; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
-| 37 | Summary: <reqwest::blocking::response::Response>::bytes; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 38 | Summary: <reqwest::blocking::response::Response>::text; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 39 | Summary: <reqwest::blocking::response::Response>::text_with_charset; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 40 | Summary: <std::io::buffered::bufreader::BufReader>::new; Argument[0]; ReturnValue; taint |
-| 41 | Summary: <std::net::tcp::TcpStream>::try_clone; Argument[self].Reference; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 42 | Summary: <tokio::net::tcp::stream::TcpStream>::peek; Argument[self].Reference; Argument[0].Reference; taint |
-| 43 | Summary: <tokio::net::tcp::stream::TcpStream>::try_read; Argument[self].Reference; Argument[0].Reference; taint |
-| 44 | Summary: <tokio::net::tcp::stream::TcpStream>::try_read_buf; Argument[self].Reference; Argument[0].Reference; taint |
+| 9 | Summary: <alloc::io::buf_read::BufRead>::lines; Argument[self]; ReturnValue; taint |
+| 10 | Summary: <alloc::io::buf_read::BufRead>::read_line; Argument[self].Reference; Argument[0].Reference; taint |
+| 11 | Summary: <alloc::io::buffered::bufreader::BufReader>::new; Argument[0]; ReturnValue; taint |
+| 12 | Summary: <alloc::io::read::Read>::read; Argument[self].Reference; Argument[0].Reference; taint |
+| 13 | Summary: <alloc::io::read::Read>::read_to_end; Argument[self].Reference; Argument[0].Reference; taint |
+| 14 | Summary: <alloc::io::read::Read>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
+| 15 | Summary: <alloc::io::read::Read>::take; Argument[self]; ReturnValue; taint |
+| 16 | Summary: <core::ops::deref::Deref>::deref; Argument[self].Reference; ReturnValue.Reference; taint |
+| 17 | Summary: <core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
+| 18 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 19 | Summary: <core::pin::Pin>::new; Argument[0].Reference; ReturnValue; value |
+| 20 | Summary: <core::pin::Pin>::new; Argument[0]; ReturnValue.Field[core::pin::Pin::pointer]; value |
+| 21 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 22 | Summary: <futures_io::if_std::AsyncBufRead>::poll_fill_buf; Argument[self].Reference; ReturnValue.Field[core::task::poll::Poll::Ready(0)].Field[core::result::Result::Ok(0)]; taint |
+| 23 | Summary: <futures_io::if_std::AsyncRead>::poll_read; Argument[self].Reference; Argument[1].Reference; taint |
+| 24 | Summary: <futures_rustls::TlsConnector>::connect; Argument[1]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 25 | Summary: <futures_util::io::AsyncBufReadExt>::fill_buf; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 26 | Summary: <futures_util::io::AsyncBufReadExt>::read_line; Argument[self].Reference; Argument[0].Reference; taint |
+| 27 | Summary: <futures_util::io::AsyncBufReadExt>::read_until; Argument[self].Reference; Argument[1].Reference; taint |
+| 28 | Summary: <futures_util::io::AsyncReadExt>::read; Argument[self].Reference; Argument[0].Reference; taint |
+| 29 | Summary: <futures_util::io::AsyncReadExt>::read_to_end; Argument[self].Reference; Argument[0].Reference; taint |
+| 30 | Summary: <futures_util::io::AsyncReadExt>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
+| 31 | Summary: <futures_util::io::buf_reader::BufReader>::new; Argument[0]; ReturnValue; taint |
+| 32 | Summary: <http::response::Response>::body; Argument[self].Reference.Field[http::response::Response::body]; ReturnValue.Reference; value |
+| 33 | Summary: <http::response::Response>::body_mut; Argument[self].Reference.Field[http::response::Response::body]; ReturnValue.Reference; value |
+| 34 | Summary: <http::response::Response>::into_body; Argument[self].Field[http::response::Response::body]; ReturnValue; value |
+| 35 | Summary: <native_tls::TlsConnector>::connect; Argument[1]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 36 | Summary: <reqwest::async_impl::response::Response>::bytes; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 37 | Summary: <reqwest::async_impl::response::Response>::chunk; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]; taint |
+| 38 | Summary: <reqwest::async_impl::response::Response>::text; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 39 | Summary: <reqwest::blocking::response::Response>::bytes; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 40 | Summary: <reqwest::blocking::response::Response>::text; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 41 | Summary: <reqwest::blocking::response::Response>::text_with_charset; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 42 | Summary: <std::net::tcp::TcpStream>::try_clone; Argument[self].Reference; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 43 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read; Argument[self].Reference; Argument[0].Reference; taint |
+| 44 | Summary: <tokio::net::tcp::stream::TcpStream>::peek; Argument[self].Reference; Argument[0].Reference; taint |
+| 45 | Summary: <tokio::net::tcp::stream::TcpStream>::try_read; Argument[self].Reference; Argument[0].Reference; taint |
+| 46 | Summary: <tokio::net::tcp::stream::TcpStream>::try_read_buf; Argument[self].Reference; Argument[0].Reference; taint |
+| 47 | Summary: async_native_tls::connect::connect; Argument[1]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
 edges
 | test.rs:11:9:11:22 | remote_string1 | test.rs:12:10:12:23 | remote_string1 | provenance |  |
-| test.rs:11:26:11:47 | ...::get | test.rs:11:26:11:62 | ...::get(...) [Ok] | provenance | Src:MaD:7  |
+| test.rs:11:26:11:62 | ...::get(...) | test.rs:11:26:11:62 | ...::get(...) [Ok] | provenance | Src:MaD:7  |
 | test.rs:11:26:11:62 | ...::get(...) [Ok] | test.rs:11:26:11:63 | TryExpr | provenance |  |
-| test.rs:11:26:11:63 | TryExpr | test.rs:11:26:11:70 | ... .text() [Ok] | provenance | MaD:38 |
+| test.rs:11:26:11:63 | TryExpr | test.rs:11:26:11:70 | ... .text() [Ok] | provenance | MaD:40 |
 | test.rs:11:26:11:70 | ... .text() [Ok] | test.rs:11:26:11:71 | TryExpr | provenance |  |
 | test.rs:11:26:11:71 | TryExpr | test.rs:11:9:11:22 | remote_string1 | provenance |  |
 | test.rs:14:9:14:22 | remote_string2 | test.rs:15:10:15:23 | remote_string2 | provenance |  |
-| test.rs:14:26:14:47 | ...::get | test.rs:14:26:14:62 | ...::get(...) [Ok] | provenance | Src:MaD:7  |
-| test.rs:14:26:14:62 | ...::get(...) [Ok] | test.rs:14:26:14:71 | ... .unwrap() | provenance | MaD:28 |
-| test.rs:14:26:14:71 | ... .unwrap() | test.rs:14:26:14:78 | ... .text() [Ok] | provenance | MaD:38 |
-| test.rs:14:26:14:78 | ... .text() [Ok] | test.rs:14:26:14:87 | ... .unwrap() | provenance | MaD:28 |
+| test.rs:14:26:14:62 | ...::get(...) | test.rs:14:26:14:62 | ...::get(...) [Ok] | provenance | Src:MaD:7  |
+| test.rs:14:26:14:62 | ...::get(...) [Ok] | test.rs:14:26:14:71 | ... .unwrap() | provenance | MaD:21 |
+| test.rs:14:26:14:71 | ... .unwrap() | test.rs:14:26:14:78 | ... .text() [Ok] | provenance | MaD:40 |
+| test.rs:14:26:14:78 | ... .text() [Ok] | test.rs:14:26:14:87 | ... .unwrap() | provenance | MaD:21 |
 | test.rs:14:26:14:87 | ... .unwrap() | test.rs:14:9:14:22 | remote_string2 | provenance |  |
 | test.rs:17:9:17:22 | remote_string3 | test.rs:18:10:18:23 | remote_string3 | provenance |  |
-| test.rs:17:26:17:47 | ...::get | test.rs:17:26:17:62 | ...::get(...) [Ok] | provenance | Src:MaD:7  |
-| test.rs:17:26:17:62 | ...::get(...) [Ok] | test.rs:17:26:17:71 | ... .unwrap() | provenance | MaD:28 |
-| test.rs:17:26:17:71 | ... .unwrap() | test.rs:17:26:17:98 | ... .text_with_charset(...) [Ok] | provenance | MaD:39 |
-| test.rs:17:26:17:98 | ... .text_with_charset(...) [Ok] | test.rs:17:26:17:107 | ... .unwrap() | provenance | MaD:28 |
+| test.rs:17:26:17:62 | ...::get(...) | test.rs:17:26:17:62 | ...::get(...) [Ok] | provenance | Src:MaD:7  |
+| test.rs:17:26:17:62 | ...::get(...) [Ok] | test.rs:17:26:17:71 | ... .unwrap() | provenance | MaD:21 |
+| test.rs:17:26:17:71 | ... .unwrap() | test.rs:17:26:17:98 | ... .text_with_charset(...) [Ok] | provenance | MaD:41 |
+| test.rs:17:26:17:98 | ... .text_with_charset(...) [Ok] | test.rs:17:26:17:107 | ... .unwrap() | provenance | MaD:21 |
 | test.rs:17:26:17:107 | ... .unwrap() | test.rs:17:9:17:22 | remote_string3 | provenance |  |
 | test.rs:20:9:20:22 | remote_string4 | test.rs:21:10:21:23 | remote_string4 | provenance |  |
-| test.rs:20:26:20:47 | ...::get | test.rs:20:26:20:62 | ...::get(...) [Ok] | provenance | Src:MaD:7  |
-| test.rs:20:26:20:62 | ...::get(...) [Ok] | test.rs:20:26:20:71 | ... .unwrap() | provenance | MaD:28 |
-| test.rs:20:26:20:71 | ... .unwrap() | test.rs:20:26:20:79 | ... .bytes() [Ok] | provenance | MaD:37 |
-| test.rs:20:26:20:79 | ... .bytes() [Ok] | test.rs:20:26:20:88 | ... .unwrap() | provenance | MaD:28 |
+| test.rs:20:26:20:62 | ...::get(...) | test.rs:20:26:20:62 | ...::get(...) [Ok] | provenance | Src:MaD:7  |
+| test.rs:20:26:20:62 | ...::get(...) [Ok] | test.rs:20:26:20:71 | ... .unwrap() | provenance | MaD:21 |
+| test.rs:20:26:20:71 | ... .unwrap() | test.rs:20:26:20:79 | ... .bytes() [Ok] | provenance | MaD:39 |
+| test.rs:20:26:20:79 | ... .bytes() [Ok] | test.rs:20:26:20:88 | ... .unwrap() | provenance | MaD:21 |
 | test.rs:20:26:20:88 | ... .unwrap() | test.rs:20:9:20:22 | remote_string4 | provenance |  |
 | test.rs:23:9:23:22 | remote_string5 | test.rs:24:10:24:23 | remote_string5 | provenance |  |
-| test.rs:23:26:23:37 | ...::get | test.rs:23:26:23:52 | ...::get(...) [future, Ok] | provenance | Src:MaD:8  |
+| test.rs:23:26:23:52 | ...::get(...) | test.rs:23:26:23:52 | ...::get(...) [future, Ok] | provenance | Src:MaD:8  |
 | test.rs:23:26:23:52 | ...::get(...) [future, Ok] | test.rs:23:26:23:58 | await ... [Ok] | provenance |  |
 | test.rs:23:26:23:58 | await ... [Ok] | test.rs:23:26:23:59 | TryExpr | provenance |  |
-| test.rs:23:26:23:59 | TryExpr | test.rs:23:26:23:66 | ... .text() [future, Ok] | provenance | MaD:36 |
+| test.rs:23:26:23:59 | TryExpr | test.rs:23:26:23:66 | ... .text() [future, Ok] | provenance | MaD:38 |
 | test.rs:23:26:23:66 | ... .text() [future, Ok] | test.rs:23:26:23:72 | await ... [Ok] | provenance |  |
 | test.rs:23:26:23:72 | await ... [Ok] | test.rs:23:26:23:73 | TryExpr | provenance |  |
 | test.rs:23:26:23:73 | TryExpr | test.rs:23:9:23:22 | remote_string5 | provenance |  |
 | test.rs:26:9:26:22 | remote_string6 | test.rs:27:10:27:23 | remote_string6 | provenance |  |
-| test.rs:26:26:26:37 | ...::get | test.rs:26:26:26:52 | ...::get(...) [future, Ok] | provenance | Src:MaD:8  |
+| test.rs:26:26:26:52 | ...::get(...) | test.rs:26:26:26:52 | ...::get(...) [future, Ok] | provenance | Src:MaD:8  |
 | test.rs:26:26:26:52 | ...::get(...) [future, Ok] | test.rs:26:26:26:58 | await ... [Ok] | provenance |  |
 | test.rs:26:26:26:58 | await ... [Ok] | test.rs:26:26:26:59 | TryExpr | provenance |  |
-| test.rs:26:26:26:59 | TryExpr | test.rs:26:26:26:67 | ... .bytes() [future, Ok] | provenance | MaD:34 |
+| test.rs:26:26:26:59 | TryExpr | test.rs:26:26:26:67 | ... .bytes() [future, Ok] | provenance | MaD:36 |
 | test.rs:26:26:26:67 | ... .bytes() [future, Ok] | test.rs:26:26:26:73 | await ... [Ok] | provenance |  |
 | test.rs:26:26:26:73 | await ... [Ok] | test.rs:26:26:26:74 | TryExpr | provenance |  |
 | test.rs:26:26:26:74 | TryExpr | test.rs:26:9:26:22 | remote_string6 | provenance |  |
 | test.rs:29:9:29:20 | mut request1 | test.rs:30:10:30:17 | request1 | provenance |  |
 | test.rs:29:9:29:20 | mut request1 | test.rs:31:29:31:36 | request1 | provenance |  |
-| test.rs:29:24:29:35 | ...::get | test.rs:29:24:29:50 | ...::get(...) [future, Ok] | provenance | Src:MaD:8  |
+| test.rs:29:24:29:50 | ...::get(...) | test.rs:29:24:29:50 | ...::get(...) [future, Ok] | provenance | Src:MaD:8  |
 | test.rs:29:24:29:50 | ...::get(...) [future, Ok] | test.rs:29:24:29:56 | await ... [Ok] | provenance |  |
 | test.rs:29:24:29:56 | await ... [Ok] | test.rs:29:24:29:57 | TryExpr | provenance |  |
 | test.rs:29:24:29:57 | TryExpr | test.rs:29:9:29:20 | mut request1 | provenance |  |
-| test.rs:30:10:30:17 | request1 | test.rs:30:10:30:25 | request1.chunk() [future, Ok, Some] | provenance | MaD:35 |
+| test.rs:30:10:30:17 | request1 | test.rs:30:10:30:25 | request1.chunk() [future, Ok, Some] | provenance | MaD:37 |
 | test.rs:30:10:30:25 | request1.chunk() [future, Ok, Some] | test.rs:30:10:30:31 | await ... [Ok, Some] | provenance |  |
 | test.rs:30:10:30:31 | await ... [Ok, Some] | test.rs:30:10:30:32 | TryExpr [Some] | provenance |  |
-| test.rs:30:10:30:32 | TryExpr [Some] | test.rs:30:10:30:41 | ... .unwrap() | provenance | MaD:25 |
+| test.rs:30:10:30:32 | TryExpr [Some] | test.rs:30:10:30:41 | ... .unwrap() | provenance | MaD:18 |
 | test.rs:31:15:31:25 | Some(...) [Some] | test.rs:31:20:31:24 | chunk | provenance |  |
 | test.rs:31:20:31:24 | chunk | test.rs:32:14:32:18 | chunk | provenance |  |
-| test.rs:31:29:31:36 | request1 | test.rs:31:29:31:44 | request1.chunk() [future, Ok, Some] | provenance | MaD:35 |
+| test.rs:31:29:31:36 | request1 | test.rs:31:29:31:44 | request1.chunk() [future, Ok, Some] | provenance | MaD:37 |
 | test.rs:31:29:31:44 | request1.chunk() [future, Ok, Some] | test.rs:31:29:31:50 | await ... [Ok, Some] | provenance |  |
 | test.rs:31:29:31:50 | await ... [Ok, Some] | test.rs:31:29:31:51 | TryExpr [Some] | provenance |  |
 | test.rs:31:29:31:51 | TryExpr [Some] | test.rs:31:15:31:25 | Some(...) [Some] | provenance |  |
 | test.rs:60:13:60:20 | response | test.rs:61:15:61:22 | response | provenance |  |
 | test.rs:60:13:60:20 | response | test.rs:62:14:62:21 | response | provenance |  |
+| test.rs:60:24:60:51 | sender.send_request(...) | test.rs:60:24:60:51 | sender.send_request(...) [future, Ok] | provenance | Src:MaD:2  |
 | test.rs:60:24:60:51 | sender.send_request(...) [future, Ok] | test.rs:60:24:60:57 | await ... [Ok] | provenance |  |
 | test.rs:60:24:60:57 | await ... [Ok] | test.rs:60:24:60:58 | TryExpr | provenance |  |
 | test.rs:60:24:60:58 | TryExpr | test.rs:60:13:60:20 | response | provenance |  |
-| test.rs:60:31:60:42 | send_request | test.rs:60:24:60:51 | sender.send_request(...) [future, Ok] | provenance | Src:MaD:2  |
 | test.rs:61:15:61:22 | response | test.rs:61:14:61:22 | &response | provenance |  |
 | test.rs:67:9:67:20 | mut response | test.rs:68:11:68:18 | response | provenance |  |
 | test.rs:67:9:67:20 | mut response | test.rs:76:18:76:25 | response | provenance |  |
 | test.rs:67:9:67:20 | mut response | test.rs:77:18:77:25 | response | provenance |  |
 | test.rs:67:9:67:20 | mut response | test.rs:79:24:79:31 | response | provenance |  |
+| test.rs:67:24:67:51 | sender.send_request(...) | test.rs:67:24:67:51 | sender.send_request(...) [future, Ok] | provenance | Src:MaD:2  |
 | test.rs:67:24:67:51 | sender.send_request(...) [future, Ok] | test.rs:67:24:67:57 | await ... [Ok] | provenance |  |
 | test.rs:67:24:67:57 | await ... [Ok] | test.rs:67:24:67:58 | TryExpr | provenance |  |
 | test.rs:67:24:67:58 | TryExpr | test.rs:67:9:67:20 | mut response | provenance |  |
-| test.rs:67:31:67:42 | send_request | test.rs:67:24:67:51 | sender.send_request(...) [future, Ok] | provenance | Src:MaD:2  |
 | test.rs:68:11:68:18 | response | test.rs:68:10:68:18 | &response | provenance |  |
-| test.rs:76:18:76:25 | response | test.rs:76:18:76:32 | response.body() | provenance | MaD:31 |
-| test.rs:77:18:77:25 | response | test.rs:77:18:77:36 | response.body_mut() | provenance | MaD:32 |
+| test.rs:76:18:76:25 | response | test.rs:76:18:76:32 | response.body() | provenance | MaD:32 |
+| test.rs:77:18:77:25 | response | test.rs:77:18:77:36 | response.body_mut() | provenance | MaD:33 |
 | test.rs:79:17:79:20 | body | test.rs:80:19:80:22 | body | provenance |  |
-| test.rs:79:24:79:31 | response | test.rs:79:24:79:43 | response.into_body() | provenance | MaD:33 |
+| test.rs:79:24:79:31 | response | test.rs:79:24:79:43 | response.into_body() | provenance | MaD:34 |
 | test.rs:79:24:79:43 | response.into_body() | test.rs:79:17:79:20 | body | provenance |  |
 | test.rs:80:19:80:22 | body | test.rs:80:18:80:22 | &body | provenance |  |
 | test.rs:155:13:155:22 | mut stream | test.rs:162:17:162:22 | stream | provenance |  |
-| test.rs:155:26:155:53 | ...::connect | test.rs:155:26:155:62 | ...::connect(...) [Ok] | provenance | Src:MaD:4  |
+| test.rs:155:26:155:62 | ...::connect(...) | test.rs:155:26:155:62 | ...::connect(...) [Ok] | provenance | Src:MaD:4  |
 | test.rs:155:26:155:62 | ...::connect(...) [Ok] | test.rs:155:26:155:63 | TryExpr | provenance |  |
 | test.rs:155:26:155:63 | TryExpr | test.rs:155:13:155:22 | mut stream | provenance |  |
-| test.rs:162:17:162:22 | stream | test.rs:162:29:162:39 | [post] &mut buffer [&ref] | provenance | MaD:20 |
+| test.rs:162:17:162:22 | stream | test.rs:162:29:162:39 | [post] &mut buffer [&ref] | provenance | MaD:12 |
 | test.rs:162:29:162:39 | [post] &mut buffer [&ref] | test.rs:162:34:162:39 | [post] buffer | provenance |  |
 | test.rs:162:34:162:39 | [post] buffer | test.rs:165:15:165:20 | buffer | provenance |  |
 | test.rs:162:34:162:39 | [post] buffer | test.rs:166:14:166:19 | buffer | provenance |  |
 | test.rs:165:15:165:20 | buffer | test.rs:165:14:165:20 | &buffer | provenance |  |
-| test.rs:166:14:166:19 | buffer | test.rs:166:14:166:22 | buffer[0] | provenance | MaD:10 |
+| test.rs:166:14:166:19 | buffer | test.rs:166:14:166:22 | buffer[0] | provenance | MaD:17 |
 | test.rs:174:13:174:22 | mut stream | test.rs:182:58:182:63 | stream | provenance |  |
 | test.rs:174:13:174:22 | mut stream | test.rs:203:54:203:59 | stream | provenance |  |
-| test.rs:174:26:174:61 | ...::connect_timeout | test.rs:174:26:174:105 | ...::connect_timeout(...) [Ok] | provenance | Src:MaD:5  |
+| test.rs:174:26:174:105 | ...::connect_timeout(...) | test.rs:174:26:174:105 | ...::connect_timeout(...) [Ok] | provenance | Src:MaD:5  |
 | test.rs:174:26:174:105 | ...::connect_timeout(...) [Ok] | test.rs:174:26:174:106 | TryExpr | provenance |  |
 | test.rs:174:26:174:106 | TryExpr | test.rs:174:13:174:22 | mut stream | provenance |  |
 | test.rs:182:21:182:30 | mut reader | test.rs:185:27:185:32 | reader | provenance |  |
-| test.rs:182:34:182:64 | ...::new(...) | test.rs:182:34:182:74 | ... .take(...) | provenance | MaD:23 |
+| test.rs:182:34:182:64 | ...::new(...) | test.rs:182:34:182:74 | ... .take(...) | provenance | MaD:15 |
 | test.rs:182:34:182:74 | ... .take(...) | test.rs:182:21:182:30 | mut reader | provenance |  |
-| test.rs:182:58:182:63 | stream | test.rs:182:34:182:64 | ...::new(...) | provenance | MaD:40 |
-| test.rs:185:27:185:32 | reader | test.rs:185:44:185:52 | [post] &mut line [&ref] | provenance | MaD:19 |
+| test.rs:182:58:182:63 | stream | test.rs:182:34:182:64 | ...::new(...) | provenance | MaD:11 |
+| test.rs:185:27:185:32 | reader | test.rs:185:44:185:52 | [post] &mut line [&ref] | provenance | MaD:10 |
 | test.rs:185:44:185:52 | [post] &mut line [&ref] | test.rs:185:49:185:52 | [post] line | provenance |  |
 | test.rs:185:49:185:52 | [post] line | test.rs:192:35:192:38 | line | provenance |  |
 | test.rs:192:35:192:38 | line | test.rs:192:34:192:38 | &line | provenance |  |
 | test.rs:203:21:203:26 | reader | test.rs:204:29:204:34 | reader | provenance |  |
-| test.rs:203:30:203:73 | ...::new(...) | test.rs:203:30:203:83 | ... .take(...) | provenance | MaD:23 |
+| test.rs:203:30:203:73 | ...::new(...) | test.rs:203:30:203:83 | ... .take(...) | provenance | MaD:15 |
 | test.rs:203:30:203:83 | ... .take(...) | test.rs:203:21:203:26 | reader | provenance |  |
-| test.rs:203:54:203:59 | stream | test.rs:203:54:203:71 | stream.try_clone() [Ok] | provenance | MaD:41 |
+| test.rs:203:54:203:59 | stream | test.rs:203:54:203:71 | stream.try_clone() [Ok] | provenance | MaD:42 |
 | test.rs:203:54:203:71 | stream.try_clone() [Ok] | test.rs:203:54:203:72 | TryExpr | provenance |  |
-| test.rs:203:54:203:72 | TryExpr | test.rs:203:30:203:73 | ...::new(...) | provenance | MaD:40 |
-| test.rs:204:29:204:34 | reader | test.rs:204:29:204:42 | reader.lines() | provenance | MaD:18 |
+| test.rs:203:54:203:72 | TryExpr | test.rs:203:30:203:73 | ...::new(...) | provenance | MaD:11 |
+| test.rs:204:29:204:34 | reader | test.rs:204:29:204:42 | reader.lines() | provenance | MaD:9 |
 | test.rs:204:29:204:42 | reader.lines() | test.rs:205:28:205:37 | Ok(...) | provenance |  |
 | test.rs:205:28:205:37 | Ok(...) | test.rs:207:30:207:35 | string | provenance |  |
 | test.rs:224:9:224:24 | mut tokio_stream | test.rs:232:17:232:28 | tokio_stream | provenance |  |
 | test.rs:224:9:224:24 | mut tokio_stream | test.rs:236:18:236:29 | tokio_stream | provenance |  |
 | test.rs:224:9:224:24 | mut tokio_stream | test.rs:252:19:252:30 | tokio_stream | provenance |  |
 | test.rs:224:9:224:24 | mut tokio_stream | test.rs:275:19:275:30 | tokio_stream | provenance |  |
-| test.rs:224:28:224:57 | ...::connect | test.rs:224:28:224:66 | ...::connect(...) [future, Ok] | provenance | Src:MaD:6  |
+| test.rs:224:28:224:66 | ...::connect(...) | test.rs:224:28:224:66 | ...::connect(...) [future, Ok] | provenance | Src:MaD:6  |
 | test.rs:224:28:224:66 | ...::connect(...) [future, Ok] | test.rs:224:28:224:72 | await ... [Ok] | provenance |  |
 | test.rs:224:28:224:72 | await ... [Ok] | test.rs:224:28:224:73 | TryExpr | provenance |  |
 | test.rs:224:28:224:73 | TryExpr | test.rs:224:9:224:24 | mut tokio_stream | provenance |  |
-| test.rs:232:17:232:28 | tokio_stream | test.rs:232:35:232:46 | [post] &mut buffer1 [&ref] | provenance | MaD:42 |
+| test.rs:232:17:232:28 | tokio_stream | test.rs:232:35:232:46 | [post] &mut buffer1 [&ref] | provenance | MaD:44 |
 | test.rs:232:35:232:46 | [post] &mut buffer1 [&ref] | test.rs:232:40:232:46 | [post] buffer1 | provenance |  |
 | test.rs:232:40:232:46 | [post] buffer1 | test.rs:239:15:239:21 | buffer1 | provenance |  |
 | test.rs:232:40:232:46 | [post] buffer1 | test.rs:240:14:240:20 | buffer1 | provenance |  |
-| test.rs:236:18:236:29 | tokio_stream | test.rs:236:36:236:47 | [post] &mut buffer2 [&ref] | provenance | MaD:24 |
+| test.rs:236:18:236:29 | tokio_stream | test.rs:236:36:236:47 | [post] &mut buffer2 [&ref] | provenance | MaD:43 |
 | test.rs:236:36:236:47 | [post] &mut buffer2 [&ref] | test.rs:236:41:236:47 | [post] buffer2 | provenance |  |
 | test.rs:236:41:236:47 | [post] buffer2 | test.rs:243:15:243:21 | buffer2 | provenance |  |
 | test.rs:236:41:236:47 | [post] buffer2 | test.rs:244:14:244:20 | buffer2 | provenance |  |
 | test.rs:239:15:239:21 | buffer1 | test.rs:239:14:239:21 | &buffer1 | provenance |  |
-| test.rs:240:14:240:20 | buffer1 | test.rs:240:14:240:23 | buffer1[0] | provenance | MaD:10 |
+| test.rs:240:14:240:20 | buffer1 | test.rs:240:14:240:23 | buffer1[0] | provenance | MaD:17 |
 | test.rs:243:15:243:21 | buffer2 | test.rs:243:14:243:21 | &buffer2 | provenance |  |
-| test.rs:244:14:244:20 | buffer2 | test.rs:244:14:244:23 | buffer2[0] | provenance | MaD:10 |
-| test.rs:252:19:252:30 | tokio_stream | test.rs:252:41:252:51 | [post] &mut buffer [&ref] | provenance | MaD:43 |
+| test.rs:244:14:244:20 | buffer2 | test.rs:244:14:244:23 | buffer2[0] | provenance | MaD:17 |
+| test.rs:252:19:252:30 | tokio_stream | test.rs:252:41:252:51 | [post] &mut buffer [&ref] | provenance | MaD:45 |
 | test.rs:252:41:252:51 | [post] &mut buffer [&ref] | test.rs:252:46:252:51 | [post] buffer | provenance |  |
 | test.rs:252:46:252:51 | [post] buffer | test.rs:259:27:259:32 | buffer | provenance |  |
 | test.rs:259:27:259:32 | buffer | test.rs:259:26:259:32 | &buffer | provenance |  |
-| test.rs:275:19:275:30 | tokio_stream | test.rs:275:45:275:55 | [post] &mut buffer [&ref] | provenance | MaD:44 |
+| test.rs:275:19:275:30 | tokio_stream | test.rs:275:45:275:55 | [post] &mut buffer [&ref] | provenance | MaD:46 |
 | test.rs:275:45:275:55 | [post] &mut buffer [&ref] | test.rs:275:50:275:55 | [post] buffer | provenance |  |
 | test.rs:275:50:275:55 | [post] buffer | test.rs:282:27:282:32 | buffer | provenance |  |
 | test.rs:282:27:282:32 | buffer | test.rs:282:26:282:32 | &buffer | provenance |  |
 | test.rs:332:9:332:18 | mut client | test.rs:333:22:333:27 | client | provenance |  |
-| test.rs:332:22:332:50 | ...::new | test.rs:332:22:332:75 | ...::new(...) [Ok] | provenance | Src:MaD:3  |
-| test.rs:332:22:332:75 | ...::new(...) [Ok] | test.rs:332:22:332:84 | ... .unwrap() | provenance | MaD:28 |
+| test.rs:332:22:332:75 | ...::new(...) | test.rs:332:22:332:75 | ...::new(...) [Ok] | provenance | Src:MaD:3  |
+| test.rs:332:22:332:75 | ...::new(...) [Ok] | test.rs:332:22:332:84 | ... .unwrap() | provenance | MaD:21 |
 | test.rs:332:22:332:84 | ... .unwrap() | test.rs:332:9:332:18 | mut client | provenance |  |
 | test.rs:333:9:333:18 | mut reader | test.rs:334:11:334:16 | reader | provenance |  |
 | test.rs:333:9:333:18 | mut reader | test.rs:338:22:338:27 | reader | provenance |  |
 | test.rs:333:9:333:18 | mut reader | test.rs:344:22:344:27 | reader | provenance |  |
 | test.rs:333:9:333:18 | mut reader | test.rs:350:22:350:27 | reader | provenance |  |
-| test.rs:333:22:333:27 | client | test.rs:333:22:333:36 | client.reader() | provenance | MaD:9 |
+| test.rs:333:22:333:27 | client | test.rs:333:22:333:36 | client.reader() | provenance | MaD:16 |
 | test.rs:333:22:333:36 | client.reader() | test.rs:333:9:333:18 | mut reader | provenance |  |
 | test.rs:334:11:334:16 | reader | test.rs:334:10:334:16 | &reader | provenance |  |
-| test.rs:338:22:338:27 | reader | test.rs:338:34:338:44 | [post] &mut buffer [&ref] | provenance | MaD:20 |
+| test.rs:338:22:338:27 | reader | test.rs:338:34:338:44 | [post] &mut buffer [&ref] | provenance | MaD:12 |
 | test.rs:338:34:338:44 | [post] &mut buffer [&ref] | test.rs:338:39:338:44 | [post] buffer | provenance |  |
 | test.rs:338:39:338:44 | [post] buffer | test.rs:339:15:339:20 | buffer | provenance |  |
 | test.rs:339:15:339:20 | buffer | test.rs:339:14:339:20 | &buffer | provenance |  |
-| test.rs:344:22:344:27 | reader | test.rs:344:41:344:51 | [post] &mut buffer [&ref] | provenance | MaD:21 |
+| test.rs:344:22:344:27 | reader | test.rs:344:41:344:51 | [post] &mut buffer [&ref] | provenance | MaD:13 |
 | test.rs:344:41:344:51 | [post] &mut buffer [&ref] | test.rs:344:46:344:51 | [post] buffer | provenance |  |
 | test.rs:344:46:344:51 | [post] buffer | test.rs:345:15:345:20 | buffer | provenance |  |
 | test.rs:345:15:345:20 | buffer | test.rs:345:14:345:20 | &buffer | provenance |  |
-| test.rs:350:22:350:27 | reader | test.rs:350:44:350:54 | [post] &mut buffer [&ref] | provenance | MaD:22 |
+| test.rs:350:22:350:27 | reader | test.rs:350:44:350:54 | [post] &mut buffer [&ref] | provenance | MaD:14 |
 | test.rs:350:44:350:54 | [post] &mut buffer [&ref] | test.rs:350:49:350:54 | [post] buffer | provenance |  |
 | test.rs:350:49:350:54 | [post] buffer | test.rs:351:15:351:20 | buffer | provenance |  |
 | test.rs:351:15:351:20 | buffer | test.rs:351:14:351:20 | &buffer | provenance |  |
-| test.rs:373:13:373:15 | tcp | test.rs:374:15:374:17 | tcp | provenance |  |
-| test.rs:373:13:373:15 | tcp | test.rs:380:57:380:59 | tcp | provenance |  |
-| test.rs:373:19:373:36 | ...::connect | test.rs:373:19:373:41 | ...::connect(...) [future, Ok] | provenance | Src:MaD:1  |
-| test.rs:373:19:373:41 | ...::connect(...) [future, Ok] | test.rs:373:19:373:47 | await ... [Ok] | provenance |  |
-| test.rs:373:19:373:47 | await ... [Ok] | test.rs:373:19:373:48 | TryExpr | provenance |  |
-| test.rs:373:19:373:48 | TryExpr | test.rs:373:13:373:15 | tcp | provenance |  |
-| test.rs:374:15:374:17 | tcp | test.rs:374:14:374:17 | &tcp | provenance |  |
-| test.rs:380:13:380:22 | mut reader | test.rs:381:15:381:20 | reader | provenance |  |
-| test.rs:380:13:380:22 | mut reader | test.rs:386:44:386:49 | reader | provenance |  |
-| test.rs:380:13:380:22 | mut reader | test.rs:399:68:399:73 | reader | provenance |  |
-| test.rs:380:13:380:22 | mut reader | test.rs:403:31:403:36 | reader | provenance |  |
-| test.rs:380:13:380:22 | mut reader | test.rs:408:55:408:60 | reader | provenance |  |
-| test.rs:380:26:380:60 | connector.connect(...) [future, Ok] | test.rs:380:26:380:66 | await ... [Ok] | provenance |  |
-| test.rs:380:26:380:66 | await ... [Ok] | test.rs:380:26:380:67 | TryExpr | provenance |  |
-| test.rs:380:26:380:67 | TryExpr | test.rs:380:13:380:22 | mut reader | provenance |  |
-| test.rs:380:57:380:59 | tcp | test.rs:380:26:380:60 | connector.connect(...) [future, Ok] | provenance | MaD:29 |
-| test.rs:381:15:381:20 | reader | test.rs:381:14:381:20 | &reader | provenance |  |
-| test.rs:386:17:386:26 | mut pinned | test.rs:387:19:387:24 | pinned | provenance |  |
-| test.rs:386:17:386:26 | mut pinned | test.rs:389:30:389:35 | pinned | provenance |  |
-| test.rs:386:17:386:26 | mut pinned [Pin, &ref] | test.rs:387:19:387:24 | pinned [Pin, &ref] | provenance |  |
-| test.rs:386:30:386:50 | ...::new(...) | test.rs:386:17:386:26 | mut pinned | provenance |  |
-| test.rs:386:30:386:50 | ...::new(...) [Pin, &ref] | test.rs:386:17:386:26 | mut pinned [Pin, &ref] | provenance |  |
-| test.rs:386:39:386:49 | &mut reader [&ref] | test.rs:386:30:386:50 | ...::new(...) | provenance | MaD:26 |
-| test.rs:386:39:386:49 | &mut reader [&ref] | test.rs:386:30:386:50 | ...::new(...) [Pin, &ref] | provenance | MaD:27 |
-| test.rs:386:44:386:49 | reader | test.rs:386:39:386:49 | &mut reader [&ref] | provenance |  |
-| test.rs:387:19:387:24 | pinned | test.rs:387:18:387:24 | &pinned | provenance |  |
-| test.rs:387:19:387:24 | pinned [Pin, &ref] | test.rs:387:18:387:24 | &pinned | provenance |  |
-| test.rs:389:30:389:35 | pinned | test.rs:389:56:389:66 | [post] &mut buffer [&ref] | provenance | MaD:12 |
-| test.rs:389:56:389:66 | [post] &mut buffer [&ref] | test.rs:389:61:389:66 | [post] buffer | provenance |  |
-| test.rs:389:61:389:66 | [post] buffer | test.rs:391:23:391:28 | buffer | provenance |  |
-| test.rs:389:61:389:66 | [post] buffer | test.rs:392:23:392:28 | buffer | provenance |  |
-| test.rs:389:61:389:66 | [post] buffer | test.rs:392:23:392:33 | buffer[...] | provenance |  |
-| test.rs:391:23:391:28 | buffer | test.rs:391:22:391:28 | &buffer | provenance |  |
-| test.rs:392:23:392:28 | buffer | test.rs:392:23:392:33 | buffer[...] | provenance | MaD:10 |
-| test.rs:392:23:392:33 | buffer[...] | test.rs:392:22:392:33 | &... | provenance |  |
-| test.rs:399:63:399:73 | &mut reader [&ref] | test.rs:399:76:399:87 | [post] &mut buffer1 [&ref] | provenance | MaD:16 |
-| test.rs:399:68:399:73 | reader | test.rs:399:63:399:73 | &mut reader [&ref] | provenance |  |
-| test.rs:399:76:399:87 | [post] &mut buffer1 [&ref] | test.rs:399:81:399:87 | [post] buffer1 | provenance |  |
-| test.rs:399:81:399:87 | [post] buffer1 | test.rs:400:19:400:25 | buffer1 | provenance |  |
-| test.rs:399:81:399:87 | [post] buffer1 | test.rs:400:19:400:40 | buffer1[...] | provenance |  |
-| test.rs:400:19:400:25 | buffer1 | test.rs:400:19:400:40 | buffer1[...] | provenance | MaD:10 |
-| test.rs:400:19:400:40 | buffer1[...] | test.rs:400:18:400:40 | &... | provenance |  |
-| test.rs:403:31:403:36 | reader | test.rs:403:43:403:54 | [post] &mut buffer2 [&ref] | provenance | MaD:16 |
-| test.rs:403:43:403:54 | [post] &mut buffer2 [&ref] | test.rs:403:48:403:54 | [post] buffer2 | provenance |  |
-| test.rs:403:48:403:54 | [post] buffer2 | test.rs:405:19:405:25 | buffer2 | provenance |  |
-| test.rs:403:48:403:54 | [post] buffer2 | test.rs:405:19:405:40 | buffer2[...] | provenance |  |
-| test.rs:405:19:405:25 | buffer2 | test.rs:405:19:405:40 | buffer2[...] | provenance | MaD:10 |
-| test.rs:405:19:405:40 | buffer2[...] | test.rs:405:18:405:40 | &... | provenance |  |
-| test.rs:408:13:408:23 | mut reader2 | test.rs:409:15:409:21 | reader2 | provenance |  |
-| test.rs:408:13:408:23 | mut reader2 | test.rs:413:44:413:50 | reader2 | provenance |  |
-| test.rs:408:13:408:23 | mut reader2 | test.rs:423:41:423:47 | reader2 | provenance |  |
-| test.rs:408:13:408:23 | mut reader2 | test.rs:437:26:437:32 | reader2 | provenance |  |
-| test.rs:408:13:408:23 | mut reader2 | test.rs:444:44:444:50 | reader2 | provenance |  |
-| test.rs:408:13:408:23 | mut reader2 | test.rs:457:68:457:74 | reader2 | provenance |  |
-| test.rs:408:13:408:23 | mut reader2 | test.rs:461:31:461:37 | reader2 | provenance |  |
-| test.rs:408:13:408:23 | mut reader2 | test.rs:467:44:467:50 | reader2 | provenance |  |
-| test.rs:408:13:408:23 | mut reader2 | test.rs:479:26:479:32 | reader2 | provenance |  |
-| test.rs:408:13:408:23 | mut reader2 | test.rs:486:31:486:37 | reader2 | provenance |  |
-| test.rs:408:13:408:23 | mut reader2 | test.rs:493:31:493:37 | reader2 | provenance |  |
-| test.rs:408:13:408:23 | mut reader2 | test.rs:500:31:500:37 | reader2 | provenance |  |
-| test.rs:408:27:408:61 | ...::new(...) | test.rs:408:13:408:23 | mut reader2 | provenance |  |
-| test.rs:408:55:408:60 | reader | test.rs:408:27:408:61 | ...::new(...) | provenance | MaD:30 |
-| test.rs:409:15:409:21 | reader2 | test.rs:409:14:409:21 | &reader2 | provenance |  |
-| test.rs:413:17:413:26 | mut pinned | test.rs:414:19:414:24 | pinned | provenance |  |
-| test.rs:413:17:413:26 | mut pinned | test.rs:416:26:416:31 | pinned | provenance |  |
-| test.rs:413:17:413:26 | mut pinned [Pin, &ref] | test.rs:414:19:414:24 | pinned [Pin, &ref] | provenance |  |
-| test.rs:413:30:413:51 | ...::new(...) | test.rs:413:17:413:26 | mut pinned | provenance |  |
-| test.rs:413:30:413:51 | ...::new(...) [Pin, &ref] | test.rs:413:17:413:26 | mut pinned [Pin, &ref] | provenance |  |
-| test.rs:413:39:413:50 | &mut reader2 [&ref] | test.rs:413:30:413:51 | ...::new(...) | provenance | MaD:26 |
-| test.rs:413:39:413:50 | &mut reader2 [&ref] | test.rs:413:30:413:51 | ...::new(...) [Pin, &ref] | provenance | MaD:27 |
-| test.rs:413:44:413:50 | reader2 | test.rs:413:39:413:50 | &mut reader2 [&ref] | provenance |  |
-| test.rs:414:19:414:24 | pinned | test.rs:414:18:414:24 | &pinned | provenance |  |
-| test.rs:414:19:414:24 | pinned [Pin, &ref] | test.rs:414:18:414:24 | &pinned | provenance |  |
-| test.rs:416:17:416:22 | buffer [Ready, Ok] | test.rs:417:20:417:39 | ...::Ready(...) [Ready, Ok] | provenance |  |
-| test.rs:416:17:416:22 | buffer [Ready, Ok] | test.rs:418:23:418:28 | buffer [Ready, Ok] | provenance |  |
-| test.rs:416:26:416:31 | pinned | test.rs:416:26:416:54 | pinned.poll_fill_buf(...) [Ready, Ok] | provenance | MaD:11 |
-| test.rs:416:26:416:54 | pinned.poll_fill_buf(...) [Ready, Ok] | test.rs:416:17:416:22 | buffer [Ready, Ok] | provenance |  |
-| test.rs:417:20:417:39 | ...::Ready(...) [Ready, Ok] | test.rs:417:32:417:38 | Ok(...) [Ok] | provenance |  |
-| test.rs:417:32:417:38 | Ok(...) [Ok] | test.rs:417:35:417:37 | buf | provenance |  |
-| test.rs:417:35:417:37 | buf | test.rs:419:22:419:24 | buf | provenance |  |
-| test.rs:418:23:418:28 | buffer [Ready, Ok] | test.rs:418:22:418:28 | &buffer | provenance |  |
-| test.rs:423:17:423:23 | buffer2 [Ready, Ok] | test.rs:424:20:424:26 | buffer2 [Ready, Ok] | provenance |  |
-| test.rs:423:27:423:48 | ...::new(...) | test.rs:423:27:423:71 | ... .poll_fill_buf(...) [Ready, Ok] | provenance | MaD:11 |
-| test.rs:423:27:423:71 | ... .poll_fill_buf(...) [Ready, Ok] | test.rs:423:17:423:23 | buffer2 [Ready, Ok] | provenance |  |
-| test.rs:423:36:423:47 | &mut reader2 [&ref] | test.rs:423:27:423:48 | ...::new(...) | provenance | MaD:26 |
-| test.rs:423:41:423:47 | reader2 | test.rs:423:36:423:47 | &mut reader2 [&ref] | provenance |  |
-| test.rs:424:20:424:26 | buffer2 [Ready, Ok] | test.rs:425:17:425:36 | ...::Ready(...) [Ready, Ok] | provenance |  |
-| test.rs:424:20:424:26 | buffer2 [Ready, Ok] | test.rs:426:27:426:33 | buffer2 [Ready, Ok] | provenance |  |
-| test.rs:425:17:425:36 | ...::Ready(...) [Ready, Ok] | test.rs:425:29:425:35 | Ok(...) [Ok] | provenance |  |
-| test.rs:425:29:425:35 | Ok(...) [Ok] | test.rs:425:32:425:34 | buf | provenance |  |
-| test.rs:425:32:425:34 | buf | test.rs:427:26:427:28 | buf | provenance |  |
-| test.rs:426:27:426:33 | buffer2 [Ready, Ok] | test.rs:426:26:426:33 | &buffer2 | provenance |  |
-| test.rs:437:17:437:22 | buffer | test.rs:438:18:438:23 | buffer | provenance |  |
-| test.rs:437:26:437:32 | reader2 | test.rs:437:26:437:43 | reader2.fill_buf() [future, Ok] | provenance | MaD:13 |
-| test.rs:437:26:437:43 | reader2.fill_buf() [future, Ok] | test.rs:437:26:437:49 | await ... [Ok] | provenance |  |
-| test.rs:437:26:437:49 | await ... [Ok] | test.rs:437:26:437:50 | TryExpr | provenance |  |
-| test.rs:437:26:437:50 | TryExpr | test.rs:437:17:437:22 | buffer | provenance |  |
-| test.rs:444:17:444:26 | mut pinned | test.rs:445:19:445:24 | pinned | provenance |  |
-| test.rs:444:17:444:26 | mut pinned | test.rs:447:30:447:35 | pinned | provenance |  |
-| test.rs:444:17:444:26 | mut pinned [Pin, &ref] | test.rs:445:19:445:24 | pinned [Pin, &ref] | provenance |  |
-| test.rs:444:30:444:51 | ...::new(...) | test.rs:444:17:444:26 | mut pinned | provenance |  |
-| test.rs:444:30:444:51 | ...::new(...) [Pin, &ref] | test.rs:444:17:444:26 | mut pinned [Pin, &ref] | provenance |  |
-| test.rs:444:39:444:50 | &mut reader2 [&ref] | test.rs:444:30:444:51 | ...::new(...) | provenance | MaD:26 |
-| test.rs:444:39:444:50 | &mut reader2 [&ref] | test.rs:444:30:444:51 | ...::new(...) [Pin, &ref] | provenance | MaD:27 |
-| test.rs:444:44:444:50 | reader2 | test.rs:444:39:444:50 | &mut reader2 [&ref] | provenance |  |
-| test.rs:445:19:445:24 | pinned | test.rs:445:18:445:24 | &pinned | provenance |  |
-| test.rs:445:19:445:24 | pinned [Pin, &ref] | test.rs:445:18:445:24 | &pinned | provenance |  |
-| test.rs:447:30:447:35 | pinned | test.rs:447:56:447:66 | [post] &mut buffer [&ref] | provenance | MaD:12 |
-| test.rs:447:56:447:66 | [post] &mut buffer [&ref] | test.rs:447:61:447:66 | [post] buffer | provenance |  |
-| test.rs:447:61:447:66 | [post] buffer | test.rs:448:19:448:24 | buffer | provenance |  |
-| test.rs:447:61:447:66 | [post] buffer | test.rs:450:23:450:28 | buffer | provenance |  |
-| test.rs:447:61:447:66 | [post] buffer | test.rs:450:23:450:33 | buffer[...] | provenance |  |
-| test.rs:448:19:448:24 | buffer | test.rs:448:18:448:24 | &buffer | provenance |  |
-| test.rs:450:23:450:28 | buffer | test.rs:450:23:450:33 | buffer[...] | provenance | MaD:10 |
-| test.rs:450:23:450:33 | buffer[...] | test.rs:450:22:450:33 | &... | provenance |  |
-| test.rs:457:63:457:74 | &mut reader2 [&ref] | test.rs:457:77:457:88 | [post] &mut buffer1 [&ref] | provenance | MaD:16 |
-| test.rs:457:68:457:74 | reader2 | test.rs:457:63:457:74 | &mut reader2 [&ref] | provenance |  |
-| test.rs:457:77:457:88 | [post] &mut buffer1 [&ref] | test.rs:457:82:457:88 | [post] buffer1 | provenance |  |
-| test.rs:457:82:457:88 | [post] buffer1 | test.rs:458:19:458:25 | buffer1 | provenance |  |
-| test.rs:457:82:457:88 | [post] buffer1 | test.rs:458:19:458:40 | buffer1[...] | provenance |  |
-| test.rs:458:19:458:25 | buffer1 | test.rs:458:19:458:40 | buffer1[...] | provenance | MaD:10 |
-| test.rs:458:19:458:40 | buffer1[...] | test.rs:458:18:458:40 | &... | provenance |  |
-| test.rs:461:31:461:37 | reader2 | test.rs:461:44:461:55 | [post] &mut buffer2 [&ref] | provenance | MaD:16 |
-| test.rs:461:44:461:55 | [post] &mut buffer2 [&ref] | test.rs:461:49:461:55 | [post] buffer2 | provenance |  |
-| test.rs:461:49:461:55 | [post] buffer2 | test.rs:462:19:462:25 | buffer2 | provenance |  |
-| test.rs:461:49:461:55 | [post] buffer2 | test.rs:462:19:462:40 | buffer2[...] | provenance |  |
-| test.rs:462:19:462:25 | buffer2 | test.rs:462:19:462:40 | buffer2[...] | provenance | MaD:10 |
-| test.rs:462:19:462:40 | buffer2[...] | test.rs:462:18:462:40 | &... | provenance |  |
-| test.rs:467:17:467:26 | mut pinned | test.rs:468:19:468:24 | pinned | provenance |  |
-| test.rs:467:17:467:26 | mut pinned | test.rs:470:26:470:31 | pinned | provenance |  |
-| test.rs:467:17:467:26 | mut pinned [Pin, &ref] | test.rs:468:19:468:24 | pinned [Pin, &ref] | provenance |  |
-| test.rs:467:30:467:51 | ...::new(...) | test.rs:467:17:467:26 | mut pinned | provenance |  |
-| test.rs:467:30:467:51 | ...::new(...) [Pin, &ref] | test.rs:467:17:467:26 | mut pinned [Pin, &ref] | provenance |  |
-| test.rs:467:39:467:50 | &mut reader2 [&ref] | test.rs:467:30:467:51 | ...::new(...) | provenance | MaD:26 |
-| test.rs:467:39:467:50 | &mut reader2 [&ref] | test.rs:467:30:467:51 | ...::new(...) [Pin, &ref] | provenance | MaD:27 |
-| test.rs:467:44:467:50 | reader2 | test.rs:467:39:467:50 | &mut reader2 [&ref] | provenance |  |
-| test.rs:468:19:468:24 | pinned | test.rs:468:18:468:24 | &pinned | provenance |  |
-| test.rs:468:19:468:24 | pinned [Pin, &ref] | test.rs:468:18:468:24 | &pinned | provenance |  |
-| test.rs:470:17:470:22 | buffer [Ready, Ok] | test.rs:471:19:471:24 | buffer [Ready, Ok] | provenance |  |
-| test.rs:470:17:470:22 | buffer [Ready, Ok] | test.rs:472:20:472:39 | ...::Ready(...) [Ready, Ok] | provenance |  |
-| test.rs:470:26:470:31 | pinned | test.rs:470:26:470:54 | pinned.poll_fill_buf(...) [Ready, Ok] | provenance | MaD:11 |
-| test.rs:470:26:470:54 | pinned.poll_fill_buf(...) [Ready, Ok] | test.rs:470:17:470:22 | buffer [Ready, Ok] | provenance |  |
-| test.rs:471:19:471:24 | buffer [Ready, Ok] | test.rs:471:18:471:24 | &buffer | provenance |  |
-| test.rs:472:20:472:39 | ...::Ready(...) [Ready, Ok] | test.rs:472:32:472:38 | Ok(...) [Ok] | provenance |  |
-| test.rs:472:32:472:38 | Ok(...) [Ok] | test.rs:472:35:472:37 | buf | provenance |  |
-| test.rs:472:35:472:37 | buf | test.rs:473:22:473:24 | buf | provenance |  |
-| test.rs:479:17:479:22 | buffer | test.rs:480:18:480:23 | buffer | provenance |  |
-| test.rs:479:26:479:32 | reader2 | test.rs:479:26:479:43 | reader2.fill_buf() [future, Ok] | provenance | MaD:13 |
-| test.rs:479:26:479:43 | reader2.fill_buf() [future, Ok] | test.rs:479:26:479:49 | await ... [Ok] | provenance |  |
-| test.rs:479:26:479:49 | await ... [Ok] | test.rs:479:26:479:50 | TryExpr | provenance |  |
-| test.rs:479:26:479:50 | TryExpr | test.rs:479:17:479:22 | buffer | provenance |  |
-| test.rs:486:31:486:37 | reader2 | test.rs:486:57:486:65 | [post] &mut line [&ref] | provenance | MaD:15 |
-| test.rs:486:57:486:65 | [post] &mut line [&ref] | test.rs:486:62:486:65 | [post] line | provenance |  |
-| test.rs:486:62:486:65 | [post] line | test.rs:487:19:487:22 | line | provenance |  |
-| test.rs:487:19:487:22 | line | test.rs:487:18:487:22 | &line | provenance |  |
-| test.rs:493:31:493:37 | reader2 | test.rs:493:49:493:57 | [post] &mut line [&ref] | provenance | MaD:14 |
-| test.rs:493:49:493:57 | [post] &mut line [&ref] | test.rs:493:54:493:57 | [post] line | provenance |  |
-| test.rs:493:54:493:57 | [post] line | test.rs:494:19:494:22 | line | provenance |  |
-| test.rs:494:19:494:22 | line | test.rs:494:18:494:22 | &line | provenance |  |
-| test.rs:500:31:500:37 | reader2 | test.rs:500:51:500:61 | [post] &mut buffer [&ref] | provenance | MaD:17 |
-| test.rs:500:51:500:61 | [post] &mut buffer [&ref] | test.rs:500:56:500:61 | [post] buffer | provenance |  |
-| test.rs:500:56:500:61 | [post] buffer | test.rs:501:19:501:24 | buffer | provenance |  |
-| test.rs:501:19:501:24 | buffer | test.rs:501:18:501:24 | &buffer | provenance |  |
+| test.rs:359:9:359:14 | stream | test.rs:361:59:361:64 | stream | provenance |  |
+| test.rs:359:18:359:54 | ...::connect(...) | test.rs:359:18:359:54 | ...::connect(...) [Ok] | provenance | Src:MaD:4  |
+| test.rs:359:18:359:54 | ...::connect(...) [Ok] | test.rs:359:18:359:55 | TryExpr | provenance |  |
+| test.rs:359:18:359:55 | TryExpr | test.rs:359:9:359:14 | stream | provenance |  |
+| test.rs:361:9:361:18 | mut stream | test.rs:362:11:362:16 | stream | provenance |  |
+| test.rs:361:9:361:18 | mut stream | test.rs:367:22:367:27 | stream | provenance |  |
+| test.rs:361:9:361:18 | mut stream | test.rs:373:5:373:10 | stream | provenance |  |
+| test.rs:361:22:361:65 | connector.connect(...) [Ok] | test.rs:361:22:361:66 | TryExpr | provenance |  |
+| test.rs:361:22:361:66 | TryExpr | test.rs:361:9:361:18 | mut stream | provenance |  |
+| test.rs:361:59:361:64 | stream | test.rs:361:22:361:65 | connector.connect(...) [Ok] | provenance | MaD:35 |
+| test.rs:362:11:362:16 | stream | test.rs:362:10:362:16 | &stream | provenance |  |
+| test.rs:367:22:367:27 | stream | test.rs:367:34:367:44 | [post] &mut buffer [&ref] | provenance | MaD:12 |
+| test.rs:367:34:367:44 | [post] &mut buffer [&ref] | test.rs:367:39:367:44 | [post] buffer | provenance |  |
+| test.rs:367:39:367:44 | [post] buffer | test.rs:370:11:370:16 | buffer | provenance |  |
+| test.rs:367:39:367:44 | [post] buffer | test.rs:370:11:370:30 | buffer[...] | provenance |  |
+| test.rs:370:11:370:16 | buffer | test.rs:370:11:370:30 | buffer[...] | provenance | MaD:17 |
+| test.rs:370:11:370:30 | buffer[...] | test.rs:370:10:370:30 | &... | provenance |  |
+| test.rs:373:5:373:10 | stream | test.rs:373:27:373:39 | [post] &mut response [&ref] | provenance | MaD:14 |
+| test.rs:373:27:373:39 | [post] &mut response [&ref] | test.rs:373:32:373:39 | [post] response | provenance |  |
+| test.rs:373:32:373:39 | [post] response | test.rs:375:10:375:17 | response | provenance |  |
+| test.rs:384:9:384:15 | stream0 | test.rs:386:67:386:73 | stream0 | provenance |  |
+| test.rs:384:19:384:61 | ...::connect(...) | test.rs:384:19:384:61 | ...::connect(...) [future, Ok] | provenance | Src:MaD:1  |
+| test.rs:384:19:384:61 | ...::connect(...) [future, Ok] | test.rs:384:19:384:67 | await ... [Ok] | provenance |  |
+| test.rs:384:19:384:67 | await ... [Ok] | test.rs:384:19:384:68 | TryExpr | provenance |  |
+| test.rs:384:19:384:68 | TryExpr | test.rs:384:9:384:15 | stream0 | provenance |  |
+| test.rs:386:9:386:18 | mut stream | test.rs:387:11:387:16 | stream | provenance |  |
+| test.rs:386:9:386:18 | mut stream | test.rs:394:22:394:27 | stream | provenance |  |
+| test.rs:386:9:386:18 | mut stream | test.rs:400:5:400:10 | stream | provenance |  |
+| test.rs:386:22:386:74 | ...::connect(...) [future, Ok] | test.rs:386:22:386:80 | await ... [Ok] | provenance |  |
+| test.rs:386:22:386:80 | await ... [Ok] | test.rs:386:22:386:81 | TryExpr | provenance |  |
+| test.rs:386:22:386:81 | TryExpr | test.rs:386:9:386:18 | mut stream | provenance |  |
+| test.rs:386:67:386:73 | stream0 | test.rs:386:22:386:74 | ...::connect(...) [future, Ok] | provenance | MaD:47 |
+| test.rs:387:11:387:16 | stream | test.rs:387:10:387:16 | &stream | provenance |  |
+| test.rs:394:22:394:27 | stream | test.rs:394:34:394:44 | [post] &mut buffer [&ref] | provenance | MaD:28 |
+| test.rs:394:34:394:44 | [post] &mut buffer [&ref] | test.rs:394:39:394:44 | [post] buffer | provenance |  |
+| test.rs:394:39:394:44 | [post] buffer | test.rs:397:11:397:16 | buffer | provenance |  |
+| test.rs:394:39:394:44 | [post] buffer | test.rs:397:11:397:30 | buffer[...] | provenance |  |
+| test.rs:397:11:397:16 | buffer | test.rs:397:11:397:30 | buffer[...] | provenance | MaD:17 |
+| test.rs:397:11:397:30 | buffer[...] | test.rs:397:10:397:30 | &... | provenance |  |
+| test.rs:400:5:400:10 | stream | test.rs:400:27:400:39 | [post] &mut response [&ref] | provenance | MaD:30 |
+| test.rs:400:27:400:39 | [post] &mut response [&ref] | test.rs:400:32:400:39 | [post] response | provenance |  |
+| test.rs:400:32:400:39 | [post] response | test.rs:402:10:402:17 | response | provenance |  |
+| test.rs:423:13:423:15 | tcp | test.rs:424:15:424:17 | tcp | provenance |  |
+| test.rs:423:13:423:15 | tcp | test.rs:430:57:430:59 | tcp | provenance |  |
+| test.rs:423:19:423:41 | ...::connect(...) | test.rs:423:19:423:41 | ...::connect(...) [future, Ok] | provenance | Src:MaD:1  |
+| test.rs:423:19:423:41 | ...::connect(...) [future, Ok] | test.rs:423:19:423:47 | await ... [Ok] | provenance |  |
+| test.rs:423:19:423:47 | await ... [Ok] | test.rs:423:19:423:48 | TryExpr | provenance |  |
+| test.rs:423:19:423:48 | TryExpr | test.rs:423:13:423:15 | tcp | provenance |  |
+| test.rs:424:15:424:17 | tcp | test.rs:424:14:424:17 | &tcp | provenance |  |
+| test.rs:430:13:430:22 | mut reader | test.rs:431:15:431:20 | reader | provenance |  |
+| test.rs:430:13:430:22 | mut reader | test.rs:436:44:436:49 | reader | provenance |  |
+| test.rs:430:13:430:22 | mut reader | test.rs:449:68:449:73 | reader | provenance |  |
+| test.rs:430:13:430:22 | mut reader | test.rs:453:31:453:36 | reader | provenance |  |
+| test.rs:430:13:430:22 | mut reader | test.rs:458:55:458:60 | reader | provenance |  |
+| test.rs:430:26:430:60 | connector.connect(...) [future, Ok] | test.rs:430:26:430:66 | await ... [Ok] | provenance |  |
+| test.rs:430:26:430:66 | await ... [Ok] | test.rs:430:26:430:67 | TryExpr | provenance |  |
+| test.rs:430:26:430:67 | TryExpr | test.rs:430:13:430:22 | mut reader | provenance |  |
+| test.rs:430:57:430:59 | tcp | test.rs:430:26:430:60 | connector.connect(...) [future, Ok] | provenance | MaD:24 |
+| test.rs:431:15:431:20 | reader | test.rs:431:14:431:20 | &reader | provenance |  |
+| test.rs:436:17:436:26 | mut pinned | test.rs:437:19:437:24 | pinned | provenance |  |
+| test.rs:436:17:436:26 | mut pinned | test.rs:439:30:439:35 | pinned | provenance |  |
+| test.rs:436:17:436:26 | mut pinned [Pin, &ref] | test.rs:437:19:437:24 | pinned [Pin, &ref] | provenance |  |
+| test.rs:436:30:436:50 | ...::new(...) | test.rs:436:17:436:26 | mut pinned | provenance |  |
+| test.rs:436:30:436:50 | ...::new(...) [Pin, &ref] | test.rs:436:17:436:26 | mut pinned [Pin, &ref] | provenance |  |
+| test.rs:436:39:436:49 | &mut reader [&ref] | test.rs:436:30:436:50 | ...::new(...) | provenance | MaD:19 |
+| test.rs:436:39:436:49 | &mut reader [&ref] | test.rs:436:30:436:50 | ...::new(...) [Pin, &ref] | provenance | MaD:20 |
+| test.rs:436:44:436:49 | reader | test.rs:436:39:436:49 | &mut reader [&ref] | provenance |  |
+| test.rs:437:19:437:24 | pinned | test.rs:437:18:437:24 | &pinned | provenance |  |
+| test.rs:437:19:437:24 | pinned [Pin, &ref] | test.rs:437:18:437:24 | &pinned | provenance |  |
+| test.rs:439:30:439:35 | pinned | test.rs:439:56:439:66 | [post] &mut buffer [&ref] | provenance | MaD:23 |
+| test.rs:439:56:439:66 | [post] &mut buffer [&ref] | test.rs:439:61:439:66 | [post] buffer | provenance |  |
+| test.rs:439:61:439:66 | [post] buffer | test.rs:441:23:441:28 | buffer | provenance |  |
+| test.rs:439:61:439:66 | [post] buffer | test.rs:442:23:442:28 | buffer | provenance |  |
+| test.rs:439:61:439:66 | [post] buffer | test.rs:442:23:442:33 | buffer[...] | provenance |  |
+| test.rs:441:23:441:28 | buffer | test.rs:441:22:441:28 | &buffer | provenance |  |
+| test.rs:442:23:442:28 | buffer | test.rs:442:23:442:33 | buffer[...] | provenance | MaD:17 |
+| test.rs:442:23:442:33 | buffer[...] | test.rs:442:22:442:33 | &... | provenance |  |
+| test.rs:449:63:449:73 | &mut reader [&ref] | test.rs:449:76:449:87 | [post] &mut buffer1 [&ref] | provenance | MaD:28 |
+| test.rs:449:68:449:73 | reader | test.rs:449:63:449:73 | &mut reader [&ref] | provenance |  |
+| test.rs:449:76:449:87 | [post] &mut buffer1 [&ref] | test.rs:449:81:449:87 | [post] buffer1 | provenance |  |
+| test.rs:449:81:449:87 | [post] buffer1 | test.rs:450:19:450:25 | buffer1 | provenance |  |
+| test.rs:449:81:449:87 | [post] buffer1 | test.rs:450:19:450:40 | buffer1[...] | provenance |  |
+| test.rs:450:19:450:25 | buffer1 | test.rs:450:19:450:40 | buffer1[...] | provenance | MaD:17 |
+| test.rs:450:19:450:40 | buffer1[...] | test.rs:450:18:450:40 | &... | provenance |  |
+| test.rs:453:31:453:36 | reader | test.rs:453:43:453:54 | [post] &mut buffer2 [&ref] | provenance | MaD:28 |
+| test.rs:453:43:453:54 | [post] &mut buffer2 [&ref] | test.rs:453:48:453:54 | [post] buffer2 | provenance |  |
+| test.rs:453:48:453:54 | [post] buffer2 | test.rs:455:19:455:25 | buffer2 | provenance |  |
+| test.rs:453:48:453:54 | [post] buffer2 | test.rs:455:19:455:40 | buffer2[...] | provenance |  |
+| test.rs:455:19:455:25 | buffer2 | test.rs:455:19:455:40 | buffer2[...] | provenance | MaD:17 |
+| test.rs:455:19:455:40 | buffer2[...] | test.rs:455:18:455:40 | &... | provenance |  |
+| test.rs:458:13:458:23 | mut reader2 | test.rs:459:15:459:21 | reader2 | provenance |  |
+| test.rs:458:13:458:23 | mut reader2 | test.rs:463:44:463:50 | reader2 | provenance |  |
+| test.rs:458:13:458:23 | mut reader2 | test.rs:473:41:473:47 | reader2 | provenance |  |
+| test.rs:458:13:458:23 | mut reader2 | test.rs:487:26:487:32 | reader2 | provenance |  |
+| test.rs:458:13:458:23 | mut reader2 | test.rs:494:44:494:50 | reader2 | provenance |  |
+| test.rs:458:13:458:23 | mut reader2 | test.rs:507:68:507:74 | reader2 | provenance |  |
+| test.rs:458:13:458:23 | mut reader2 | test.rs:511:31:511:37 | reader2 | provenance |  |
+| test.rs:458:13:458:23 | mut reader2 | test.rs:517:44:517:50 | reader2 | provenance |  |
+| test.rs:458:13:458:23 | mut reader2 | test.rs:529:26:529:32 | reader2 | provenance |  |
+| test.rs:458:13:458:23 | mut reader2 | test.rs:536:31:536:37 | reader2 | provenance |  |
+| test.rs:458:13:458:23 | mut reader2 | test.rs:543:31:543:37 | reader2 | provenance |  |
+| test.rs:458:13:458:23 | mut reader2 | test.rs:550:31:550:37 | reader2 | provenance |  |
+| test.rs:458:27:458:61 | ...::new(...) | test.rs:458:13:458:23 | mut reader2 | provenance |  |
+| test.rs:458:55:458:60 | reader | test.rs:458:27:458:61 | ...::new(...) | provenance | MaD:31 |
+| test.rs:459:15:459:21 | reader2 | test.rs:459:14:459:21 | &reader2 | provenance |  |
+| test.rs:463:17:463:26 | mut pinned | test.rs:464:19:464:24 | pinned | provenance |  |
+| test.rs:463:17:463:26 | mut pinned | test.rs:466:26:466:31 | pinned | provenance |  |
+| test.rs:463:17:463:26 | mut pinned [Pin, &ref] | test.rs:464:19:464:24 | pinned [Pin, &ref] | provenance |  |
+| test.rs:463:30:463:51 | ...::new(...) | test.rs:463:17:463:26 | mut pinned | provenance |  |
+| test.rs:463:30:463:51 | ...::new(...) [Pin, &ref] | test.rs:463:17:463:26 | mut pinned [Pin, &ref] | provenance |  |
+| test.rs:463:39:463:50 | &mut reader2 [&ref] | test.rs:463:30:463:51 | ...::new(...) | provenance | MaD:19 |
+| test.rs:463:39:463:50 | &mut reader2 [&ref] | test.rs:463:30:463:51 | ...::new(...) [Pin, &ref] | provenance | MaD:20 |
+| test.rs:463:44:463:50 | reader2 | test.rs:463:39:463:50 | &mut reader2 [&ref] | provenance |  |
+| test.rs:464:19:464:24 | pinned | test.rs:464:18:464:24 | &pinned | provenance |  |
+| test.rs:464:19:464:24 | pinned [Pin, &ref] | test.rs:464:18:464:24 | &pinned | provenance |  |
+| test.rs:466:17:466:22 | buffer [Ready, Ok] | test.rs:467:20:467:39 | ...::Ready(...) [Ready, Ok] | provenance |  |
+| test.rs:466:17:466:22 | buffer [Ready, Ok] | test.rs:468:23:468:28 | buffer [Ready, Ok] | provenance |  |
+| test.rs:466:26:466:31 | pinned | test.rs:466:26:466:54 | pinned.poll_fill_buf(...) [Ready, Ok] | provenance | MaD:22 |
+| test.rs:466:26:466:54 | pinned.poll_fill_buf(...) [Ready, Ok] | test.rs:466:17:466:22 | buffer [Ready, Ok] | provenance |  |
+| test.rs:467:20:467:39 | ...::Ready(...) [Ready, Ok] | test.rs:467:32:467:38 | Ok(...) [Ok] | provenance |  |
+| test.rs:467:32:467:38 | Ok(...) [Ok] | test.rs:467:35:467:37 | buf | provenance |  |
+| test.rs:467:35:467:37 | buf | test.rs:469:22:469:24 | buf | provenance |  |
+| test.rs:468:23:468:28 | buffer [Ready, Ok] | test.rs:468:22:468:28 | &buffer | provenance |  |
+| test.rs:473:17:473:23 | buffer2 [Ready, Ok] | test.rs:474:20:474:26 | buffer2 [Ready, Ok] | provenance |  |
+| test.rs:473:27:473:48 | ...::new(...) | test.rs:473:27:473:71 | ... .poll_fill_buf(...) [Ready, Ok] | provenance | MaD:22 |
+| test.rs:473:27:473:71 | ... .poll_fill_buf(...) [Ready, Ok] | test.rs:473:17:473:23 | buffer2 [Ready, Ok] | provenance |  |
+| test.rs:473:36:473:47 | &mut reader2 [&ref] | test.rs:473:27:473:48 | ...::new(...) | provenance | MaD:19 |
+| test.rs:473:41:473:47 | reader2 | test.rs:473:36:473:47 | &mut reader2 [&ref] | provenance |  |
+| test.rs:474:20:474:26 | buffer2 [Ready, Ok] | test.rs:475:17:475:36 | ...::Ready(...) [Ready, Ok] | provenance |  |
+| test.rs:474:20:474:26 | buffer2 [Ready, Ok] | test.rs:476:27:476:33 | buffer2 [Ready, Ok] | provenance |  |
+| test.rs:475:17:475:36 | ...::Ready(...) [Ready, Ok] | test.rs:475:29:475:35 | Ok(...) [Ok] | provenance |  |
+| test.rs:475:29:475:35 | Ok(...) [Ok] | test.rs:475:32:475:34 | buf | provenance |  |
+| test.rs:475:32:475:34 | buf | test.rs:477:26:477:28 | buf | provenance |  |
+| test.rs:476:27:476:33 | buffer2 [Ready, Ok] | test.rs:476:26:476:33 | &buffer2 | provenance |  |
+| test.rs:487:17:487:22 | buffer | test.rs:488:18:488:23 | buffer | provenance |  |
+| test.rs:487:26:487:32 | reader2 | test.rs:487:26:487:43 | reader2.fill_buf() [future, Ok] | provenance | MaD:25 |
+| test.rs:487:26:487:43 | reader2.fill_buf() [future, Ok] | test.rs:487:26:487:49 | await ... [Ok] | provenance |  |
+| test.rs:487:26:487:49 | await ... [Ok] | test.rs:487:26:487:50 | TryExpr | provenance |  |
+| test.rs:487:26:487:50 | TryExpr | test.rs:487:17:487:22 | buffer | provenance |  |
+| test.rs:494:17:494:26 | mut pinned | test.rs:495:19:495:24 | pinned | provenance |  |
+| test.rs:494:17:494:26 | mut pinned | test.rs:497:30:497:35 | pinned | provenance |  |
+| test.rs:494:17:494:26 | mut pinned [Pin, &ref] | test.rs:495:19:495:24 | pinned [Pin, &ref] | provenance |  |
+| test.rs:494:30:494:51 | ...::new(...) | test.rs:494:17:494:26 | mut pinned | provenance |  |
+| test.rs:494:30:494:51 | ...::new(...) [Pin, &ref] | test.rs:494:17:494:26 | mut pinned [Pin, &ref] | provenance |  |
+| test.rs:494:39:494:50 | &mut reader2 [&ref] | test.rs:494:30:494:51 | ...::new(...) | provenance | MaD:19 |
+| test.rs:494:39:494:50 | &mut reader2 [&ref] | test.rs:494:30:494:51 | ...::new(...) [Pin, &ref] | provenance | MaD:20 |
+| test.rs:494:44:494:50 | reader2 | test.rs:494:39:494:50 | &mut reader2 [&ref] | provenance |  |
+| test.rs:495:19:495:24 | pinned | test.rs:495:18:495:24 | &pinned | provenance |  |
+| test.rs:495:19:495:24 | pinned [Pin, &ref] | test.rs:495:18:495:24 | &pinned | provenance |  |
+| test.rs:497:30:497:35 | pinned | test.rs:497:56:497:66 | [post] &mut buffer [&ref] | provenance | MaD:23 |
+| test.rs:497:56:497:66 | [post] &mut buffer [&ref] | test.rs:497:61:497:66 | [post] buffer | provenance |  |
+| test.rs:497:61:497:66 | [post] buffer | test.rs:498:19:498:24 | buffer | provenance |  |
+| test.rs:497:61:497:66 | [post] buffer | test.rs:500:23:500:28 | buffer | provenance |  |
+| test.rs:497:61:497:66 | [post] buffer | test.rs:500:23:500:33 | buffer[...] | provenance |  |
+| test.rs:498:19:498:24 | buffer | test.rs:498:18:498:24 | &buffer | provenance |  |
+| test.rs:500:23:500:28 | buffer | test.rs:500:23:500:33 | buffer[...] | provenance | MaD:17 |
+| test.rs:500:23:500:33 | buffer[...] | test.rs:500:22:500:33 | &... | provenance |  |
+| test.rs:507:63:507:74 | &mut reader2 [&ref] | test.rs:507:77:507:88 | [post] &mut buffer1 [&ref] | provenance | MaD:28 |
+| test.rs:507:68:507:74 | reader2 | test.rs:507:63:507:74 | &mut reader2 [&ref] | provenance |  |
+| test.rs:507:77:507:88 | [post] &mut buffer1 [&ref] | test.rs:507:82:507:88 | [post] buffer1 | provenance |  |
+| test.rs:507:82:507:88 | [post] buffer1 | test.rs:508:19:508:25 | buffer1 | provenance |  |
+| test.rs:507:82:507:88 | [post] buffer1 | test.rs:508:19:508:40 | buffer1[...] | provenance |  |
+| test.rs:508:19:508:25 | buffer1 | test.rs:508:19:508:40 | buffer1[...] | provenance | MaD:17 |
+| test.rs:508:19:508:40 | buffer1[...] | test.rs:508:18:508:40 | &... | provenance |  |
+| test.rs:511:31:511:37 | reader2 | test.rs:511:44:511:55 | [post] &mut buffer2 [&ref] | provenance | MaD:28 |
+| test.rs:511:44:511:55 | [post] &mut buffer2 [&ref] | test.rs:511:49:511:55 | [post] buffer2 | provenance |  |
+| test.rs:511:49:511:55 | [post] buffer2 | test.rs:512:19:512:25 | buffer2 | provenance |  |
+| test.rs:511:49:511:55 | [post] buffer2 | test.rs:512:19:512:40 | buffer2[...] | provenance |  |
+| test.rs:512:19:512:25 | buffer2 | test.rs:512:19:512:40 | buffer2[...] | provenance | MaD:17 |
+| test.rs:512:19:512:40 | buffer2[...] | test.rs:512:18:512:40 | &... | provenance |  |
+| test.rs:517:17:517:26 | mut pinned | test.rs:518:19:518:24 | pinned | provenance |  |
+| test.rs:517:17:517:26 | mut pinned | test.rs:520:26:520:31 | pinned | provenance |  |
+| test.rs:517:17:517:26 | mut pinned [Pin, &ref] | test.rs:518:19:518:24 | pinned [Pin, &ref] | provenance |  |
+| test.rs:517:30:517:51 | ...::new(...) | test.rs:517:17:517:26 | mut pinned | provenance |  |
+| test.rs:517:30:517:51 | ...::new(...) [Pin, &ref] | test.rs:517:17:517:26 | mut pinned [Pin, &ref] | provenance |  |
+| test.rs:517:39:517:50 | &mut reader2 [&ref] | test.rs:517:30:517:51 | ...::new(...) | provenance | MaD:19 |
+| test.rs:517:39:517:50 | &mut reader2 [&ref] | test.rs:517:30:517:51 | ...::new(...) [Pin, &ref] | provenance | MaD:20 |
+| test.rs:517:44:517:50 | reader2 | test.rs:517:39:517:50 | &mut reader2 [&ref] | provenance |  |
+| test.rs:518:19:518:24 | pinned | test.rs:518:18:518:24 | &pinned | provenance |  |
+| test.rs:518:19:518:24 | pinned [Pin, &ref] | test.rs:518:18:518:24 | &pinned | provenance |  |
+| test.rs:520:17:520:22 | buffer [Ready, Ok] | test.rs:521:19:521:24 | buffer [Ready, Ok] | provenance |  |
+| test.rs:520:17:520:22 | buffer [Ready, Ok] | test.rs:522:20:522:39 | ...::Ready(...) [Ready, Ok] | provenance |  |
+| test.rs:520:26:520:31 | pinned | test.rs:520:26:520:54 | pinned.poll_fill_buf(...) [Ready, Ok] | provenance | MaD:22 |
+| test.rs:520:26:520:54 | pinned.poll_fill_buf(...) [Ready, Ok] | test.rs:520:17:520:22 | buffer [Ready, Ok] | provenance |  |
+| test.rs:521:19:521:24 | buffer [Ready, Ok] | test.rs:521:18:521:24 | &buffer | provenance |  |
+| test.rs:522:20:522:39 | ...::Ready(...) [Ready, Ok] | test.rs:522:32:522:38 | Ok(...) [Ok] | provenance |  |
+| test.rs:522:32:522:38 | Ok(...) [Ok] | test.rs:522:35:522:37 | buf | provenance |  |
+| test.rs:522:35:522:37 | buf | test.rs:523:22:523:24 | buf | provenance |  |
+| test.rs:529:17:529:22 | buffer | test.rs:530:18:530:23 | buffer | provenance |  |
+| test.rs:529:26:529:32 | reader2 | test.rs:529:26:529:43 | reader2.fill_buf() [future, Ok] | provenance | MaD:25 |
+| test.rs:529:26:529:43 | reader2.fill_buf() [future, Ok] | test.rs:529:26:529:49 | await ... [Ok] | provenance |  |
+| test.rs:529:26:529:49 | await ... [Ok] | test.rs:529:26:529:50 | TryExpr | provenance |  |
+| test.rs:529:26:529:50 | TryExpr | test.rs:529:17:529:22 | buffer | provenance |  |
+| test.rs:536:31:536:37 | reader2 | test.rs:536:57:536:65 | [post] &mut line [&ref] | provenance | MaD:27 |
+| test.rs:536:57:536:65 | [post] &mut line [&ref] | test.rs:536:62:536:65 | [post] line | provenance |  |
+| test.rs:536:62:536:65 | [post] line | test.rs:537:19:537:22 | line | provenance |  |
+| test.rs:537:19:537:22 | line | test.rs:537:18:537:22 | &line | provenance |  |
+| test.rs:543:31:543:37 | reader2 | test.rs:543:49:543:57 | [post] &mut line [&ref] | provenance | MaD:26 |
+| test.rs:543:49:543:57 | [post] &mut line [&ref] | test.rs:543:54:543:57 | [post] line | provenance |  |
+| test.rs:543:54:543:57 | [post] line | test.rs:544:19:544:22 | line | provenance |  |
+| test.rs:544:19:544:22 | line | test.rs:544:18:544:22 | &line | provenance |  |
+| test.rs:550:31:550:37 | reader2 | test.rs:550:51:550:61 | [post] &mut buffer [&ref] | provenance | MaD:29 |
+| test.rs:550:51:550:61 | [post] &mut buffer [&ref] | test.rs:550:56:550:61 | [post] buffer | provenance |  |
+| test.rs:550:56:550:61 | [post] buffer | test.rs:551:19:551:24 | buffer | provenance |  |
+| test.rs:551:19:551:24 | buffer | test.rs:551:18:551:24 | &buffer | provenance |  |
 nodes
 | test.rs:11:9:11:22 | remote_string1 | semmle.label | remote_string1 |
-| test.rs:11:26:11:47 | ...::get | semmle.label | ...::get |
+| test.rs:11:26:11:62 | ...::get(...) | semmle.label | ...::get(...) |
 | test.rs:11:26:11:62 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
 | test.rs:11:26:11:63 | TryExpr | semmle.label | TryExpr |
 | test.rs:11:26:11:70 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
 | test.rs:11:26:11:71 | TryExpr | semmle.label | TryExpr |
 | test.rs:12:10:12:23 | remote_string1 | semmle.label | remote_string1 |
 | test.rs:14:9:14:22 | remote_string2 | semmle.label | remote_string2 |
-| test.rs:14:26:14:47 | ...::get | semmle.label | ...::get |
+| test.rs:14:26:14:62 | ...::get(...) | semmle.label | ...::get(...) |
 | test.rs:14:26:14:62 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
 | test.rs:14:26:14:71 | ... .unwrap() | semmle.label | ... .unwrap() |
 | test.rs:14:26:14:78 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
 | test.rs:14:26:14:87 | ... .unwrap() | semmle.label | ... .unwrap() |
 | test.rs:15:10:15:23 | remote_string2 | semmle.label | remote_string2 |
 | test.rs:17:9:17:22 | remote_string3 | semmle.label | remote_string3 |
-| test.rs:17:26:17:47 | ...::get | semmle.label | ...::get |
+| test.rs:17:26:17:62 | ...::get(...) | semmle.label | ...::get(...) |
 | test.rs:17:26:17:62 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
 | test.rs:17:26:17:71 | ... .unwrap() | semmle.label | ... .unwrap() |
 | test.rs:17:26:17:98 | ... .text_with_charset(...) [Ok] | semmle.label | ... .text_with_charset(...) [Ok] |
 | test.rs:17:26:17:107 | ... .unwrap() | semmle.label | ... .unwrap() |
 | test.rs:18:10:18:23 | remote_string3 | semmle.label | remote_string3 |
 | test.rs:20:9:20:22 | remote_string4 | semmle.label | remote_string4 |
-| test.rs:20:26:20:47 | ...::get | semmle.label | ...::get |
+| test.rs:20:26:20:62 | ...::get(...) | semmle.label | ...::get(...) |
 | test.rs:20:26:20:62 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
 | test.rs:20:26:20:71 | ... .unwrap() | semmle.label | ... .unwrap() |
 | test.rs:20:26:20:79 | ... .bytes() [Ok] | semmle.label | ... .bytes() [Ok] |
 | test.rs:20:26:20:88 | ... .unwrap() | semmle.label | ... .unwrap() |
 | test.rs:21:10:21:23 | remote_string4 | semmle.label | remote_string4 |
 | test.rs:23:9:23:22 | remote_string5 | semmle.label | remote_string5 |
-| test.rs:23:26:23:37 | ...::get | semmle.label | ...::get |
+| test.rs:23:26:23:52 | ...::get(...) | semmle.label | ...::get(...) |
 | test.rs:23:26:23:52 | ...::get(...) [future, Ok] | semmle.label | ...::get(...) [future, Ok] |
 | test.rs:23:26:23:58 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:23:26:23:59 | TryExpr | semmle.label | TryExpr |
@@ -407,7 +452,7 @@ nodes
 | test.rs:23:26:23:73 | TryExpr | semmle.label | TryExpr |
 | test.rs:24:10:24:23 | remote_string5 | semmle.label | remote_string5 |
 | test.rs:26:9:26:22 | remote_string6 | semmle.label | remote_string6 |
-| test.rs:26:26:26:37 | ...::get | semmle.label | ...::get |
+| test.rs:26:26:26:52 | ...::get(...) | semmle.label | ...::get(...) |
 | test.rs:26:26:26:52 | ...::get(...) [future, Ok] | semmle.label | ...::get(...) [future, Ok] |
 | test.rs:26:26:26:58 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:26:26:26:59 | TryExpr | semmle.label | TryExpr |
@@ -416,7 +461,7 @@ nodes
 | test.rs:26:26:26:74 | TryExpr | semmle.label | TryExpr |
 | test.rs:27:10:27:23 | remote_string6 | semmle.label | remote_string6 |
 | test.rs:29:9:29:20 | mut request1 | semmle.label | mut request1 |
-| test.rs:29:24:29:35 | ...::get | semmle.label | ...::get |
+| test.rs:29:24:29:50 | ...::get(...) | semmle.label | ...::get(...) |
 | test.rs:29:24:29:50 | ...::get(...) [future, Ok] | semmle.label | ...::get(...) [future, Ok] |
 | test.rs:29:24:29:56 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:29:24:29:57 | TryExpr | semmle.label | TryExpr |
@@ -433,18 +478,18 @@ nodes
 | test.rs:31:29:31:51 | TryExpr [Some] | semmle.label | TryExpr [Some] |
 | test.rs:32:14:32:18 | chunk | semmle.label | chunk |
 | test.rs:60:13:60:20 | response | semmle.label | response |
+| test.rs:60:24:60:51 | sender.send_request(...) | semmle.label | sender.send_request(...) |
 | test.rs:60:24:60:51 | sender.send_request(...) [future, Ok] | semmle.label | sender.send_request(...) [future, Ok] |
 | test.rs:60:24:60:57 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:60:24:60:58 | TryExpr | semmle.label | TryExpr |
-| test.rs:60:31:60:42 | send_request | semmle.label | send_request |
 | test.rs:61:14:61:22 | &response | semmle.label | &response |
 | test.rs:61:15:61:22 | response | semmle.label | response |
 | test.rs:62:14:62:21 | response | semmle.label | response |
 | test.rs:67:9:67:20 | mut response | semmle.label | mut response |
+| test.rs:67:24:67:51 | sender.send_request(...) | semmle.label | sender.send_request(...) |
 | test.rs:67:24:67:51 | sender.send_request(...) [future, Ok] | semmle.label | sender.send_request(...) [future, Ok] |
 | test.rs:67:24:67:57 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:67:24:67:58 | TryExpr | semmle.label | TryExpr |
-| test.rs:67:31:67:42 | send_request | semmle.label | send_request |
 | test.rs:68:10:68:18 | &response | semmle.label | &response |
 | test.rs:68:11:68:18 | response | semmle.label | response |
 | test.rs:76:18:76:25 | response | semmle.label | response |
@@ -457,7 +502,7 @@ nodes
 | test.rs:80:18:80:22 | &body | semmle.label | &body |
 | test.rs:80:19:80:22 | body | semmle.label | body |
 | test.rs:155:13:155:22 | mut stream | semmle.label | mut stream |
-| test.rs:155:26:155:53 | ...::connect | semmle.label | ...::connect |
+| test.rs:155:26:155:62 | ...::connect(...) | semmle.label | ...::connect(...) |
 | test.rs:155:26:155:62 | ...::connect(...) [Ok] | semmle.label | ...::connect(...) [Ok] |
 | test.rs:155:26:155:63 | TryExpr | semmle.label | TryExpr |
 | test.rs:162:17:162:22 | stream | semmle.label | stream |
@@ -468,7 +513,7 @@ nodes
 | test.rs:166:14:166:19 | buffer | semmle.label | buffer |
 | test.rs:166:14:166:22 | buffer[0] | semmle.label | buffer[0] |
 | test.rs:174:13:174:22 | mut stream | semmle.label | mut stream |
-| test.rs:174:26:174:61 | ...::connect_timeout | semmle.label | ...::connect_timeout |
+| test.rs:174:26:174:105 | ...::connect_timeout(...) | semmle.label | ...::connect_timeout(...) |
 | test.rs:174:26:174:105 | ...::connect_timeout(...) [Ok] | semmle.label | ...::connect_timeout(...) [Ok] |
 | test.rs:174:26:174:106 | TryExpr | semmle.label | TryExpr |
 | test.rs:182:21:182:30 | mut reader | semmle.label | mut reader |
@@ -491,7 +536,7 @@ nodes
 | test.rs:205:28:205:37 | Ok(...) | semmle.label | Ok(...) |
 | test.rs:207:30:207:35 | string | semmle.label | string |
 | test.rs:224:9:224:24 | mut tokio_stream | semmle.label | mut tokio_stream |
-| test.rs:224:28:224:57 | ...::connect | semmle.label | ...::connect |
+| test.rs:224:28:224:66 | ...::connect(...) | semmle.label | ...::connect(...) |
 | test.rs:224:28:224:66 | ...::connect(...) [future, Ok] | semmle.label | ...::connect(...) [future, Ok] |
 | test.rs:224:28:224:72 | await ... [Ok] | semmle.label | await ... [Ok] |
 | test.rs:224:28:224:73 | TryExpr | semmle.label | TryExpr |
@@ -520,7 +565,7 @@ nodes
 | test.rs:282:26:282:32 | &buffer | semmle.label | &buffer |
 | test.rs:282:27:282:32 | buffer | semmle.label | buffer |
 | test.rs:332:9:332:18 | mut client | semmle.label | mut client |
-| test.rs:332:22:332:50 | ...::new | semmle.label | ...::new |
+| test.rs:332:22:332:75 | ...::new(...) | semmle.label | ...::new(...) |
 | test.rs:332:22:332:75 | ...::new(...) [Ok] | semmle.label | ...::new(...) [Ok] |
 | test.rs:332:22:332:84 | ... .unwrap() | semmle.label | ... .unwrap() |
 | test.rs:333:9:333:18 | mut reader | semmle.label | mut reader |
@@ -543,214 +588,262 @@ nodes
 | test.rs:350:49:350:54 | [post] buffer | semmle.label | [post] buffer |
 | test.rs:351:14:351:20 | &buffer | semmle.label | &buffer |
 | test.rs:351:15:351:20 | buffer | semmle.label | buffer |
-| test.rs:373:13:373:15 | tcp | semmle.label | tcp |
-| test.rs:373:19:373:36 | ...::connect | semmle.label | ...::connect |
-| test.rs:373:19:373:41 | ...::connect(...) [future, Ok] | semmle.label | ...::connect(...) [future, Ok] |
-| test.rs:373:19:373:47 | await ... [Ok] | semmle.label | await ... [Ok] |
-| test.rs:373:19:373:48 | TryExpr | semmle.label | TryExpr |
-| test.rs:374:14:374:17 | &tcp | semmle.label | &tcp |
-| test.rs:374:15:374:17 | tcp | semmle.label | tcp |
-| test.rs:380:13:380:22 | mut reader | semmle.label | mut reader |
-| test.rs:380:26:380:60 | connector.connect(...) [future, Ok] | semmle.label | connector.connect(...) [future, Ok] |
-| test.rs:380:26:380:66 | await ... [Ok] | semmle.label | await ... [Ok] |
-| test.rs:380:26:380:67 | TryExpr | semmle.label | TryExpr |
-| test.rs:380:57:380:59 | tcp | semmle.label | tcp |
-| test.rs:381:14:381:20 | &reader | semmle.label | &reader |
-| test.rs:381:15:381:20 | reader | semmle.label | reader |
-| test.rs:386:17:386:26 | mut pinned | semmle.label | mut pinned |
-| test.rs:386:17:386:26 | mut pinned [Pin, &ref] | semmle.label | mut pinned [Pin, &ref] |
-| test.rs:386:30:386:50 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:386:30:386:50 | ...::new(...) [Pin, &ref] | semmle.label | ...::new(...) [Pin, &ref] |
-| test.rs:386:39:386:49 | &mut reader [&ref] | semmle.label | &mut reader [&ref] |
-| test.rs:386:44:386:49 | reader | semmle.label | reader |
-| test.rs:387:18:387:24 | &pinned | semmle.label | &pinned |
-| test.rs:387:19:387:24 | pinned | semmle.label | pinned |
-| test.rs:387:19:387:24 | pinned [Pin, &ref] | semmle.label | pinned [Pin, &ref] |
-| test.rs:389:30:389:35 | pinned | semmle.label | pinned |
-| test.rs:389:56:389:66 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
-| test.rs:389:61:389:66 | [post] buffer | semmle.label | [post] buffer |
-| test.rs:391:22:391:28 | &buffer | semmle.label | &buffer |
-| test.rs:391:23:391:28 | buffer | semmle.label | buffer |
-| test.rs:392:22:392:33 | &... | semmle.label | &... |
-| test.rs:392:23:392:28 | buffer | semmle.label | buffer |
-| test.rs:392:23:392:33 | buffer[...] | semmle.label | buffer[...] |
-| test.rs:399:63:399:73 | &mut reader [&ref] | semmle.label | &mut reader [&ref] |
-| test.rs:399:68:399:73 | reader | semmle.label | reader |
-| test.rs:399:76:399:87 | [post] &mut buffer1 [&ref] | semmle.label | [post] &mut buffer1 [&ref] |
-| test.rs:399:81:399:87 | [post] buffer1 | semmle.label | [post] buffer1 |
-| test.rs:400:18:400:40 | &... | semmle.label | &... |
-| test.rs:400:19:400:25 | buffer1 | semmle.label | buffer1 |
-| test.rs:400:19:400:40 | buffer1[...] | semmle.label | buffer1[...] |
-| test.rs:403:31:403:36 | reader | semmle.label | reader |
-| test.rs:403:43:403:54 | [post] &mut buffer2 [&ref] | semmle.label | [post] &mut buffer2 [&ref] |
-| test.rs:403:48:403:54 | [post] buffer2 | semmle.label | [post] buffer2 |
-| test.rs:405:18:405:40 | &... | semmle.label | &... |
-| test.rs:405:19:405:25 | buffer2 | semmle.label | buffer2 |
-| test.rs:405:19:405:40 | buffer2[...] | semmle.label | buffer2[...] |
-| test.rs:408:13:408:23 | mut reader2 | semmle.label | mut reader2 |
-| test.rs:408:27:408:61 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:408:55:408:60 | reader | semmle.label | reader |
-| test.rs:409:14:409:21 | &reader2 | semmle.label | &reader2 |
-| test.rs:409:15:409:21 | reader2 | semmle.label | reader2 |
-| test.rs:413:17:413:26 | mut pinned | semmle.label | mut pinned |
-| test.rs:413:17:413:26 | mut pinned [Pin, &ref] | semmle.label | mut pinned [Pin, &ref] |
-| test.rs:413:30:413:51 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:413:30:413:51 | ...::new(...) [Pin, &ref] | semmle.label | ...::new(...) [Pin, &ref] |
-| test.rs:413:39:413:50 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
-| test.rs:413:44:413:50 | reader2 | semmle.label | reader2 |
-| test.rs:414:18:414:24 | &pinned | semmle.label | &pinned |
-| test.rs:414:19:414:24 | pinned | semmle.label | pinned |
-| test.rs:414:19:414:24 | pinned [Pin, &ref] | semmle.label | pinned [Pin, &ref] |
-| test.rs:416:17:416:22 | buffer [Ready, Ok] | semmle.label | buffer [Ready, Ok] |
-| test.rs:416:26:416:31 | pinned | semmle.label | pinned |
-| test.rs:416:26:416:54 | pinned.poll_fill_buf(...) [Ready, Ok] | semmle.label | pinned.poll_fill_buf(...) [Ready, Ok] |
-| test.rs:417:20:417:39 | ...::Ready(...) [Ready, Ok] | semmle.label | ...::Ready(...) [Ready, Ok] |
-| test.rs:417:32:417:38 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
-| test.rs:417:35:417:37 | buf | semmle.label | buf |
-| test.rs:418:22:418:28 | &buffer | semmle.label | &buffer |
-| test.rs:418:23:418:28 | buffer [Ready, Ok] | semmle.label | buffer [Ready, Ok] |
-| test.rs:419:22:419:24 | buf | semmle.label | buf |
-| test.rs:423:17:423:23 | buffer2 [Ready, Ok] | semmle.label | buffer2 [Ready, Ok] |
-| test.rs:423:27:423:48 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:423:27:423:71 | ... .poll_fill_buf(...) [Ready, Ok] | semmle.label | ... .poll_fill_buf(...) [Ready, Ok] |
-| test.rs:423:36:423:47 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
-| test.rs:423:41:423:47 | reader2 | semmle.label | reader2 |
-| test.rs:424:20:424:26 | buffer2 [Ready, Ok] | semmle.label | buffer2 [Ready, Ok] |
-| test.rs:425:17:425:36 | ...::Ready(...) [Ready, Ok] | semmle.label | ...::Ready(...) [Ready, Ok] |
-| test.rs:425:29:425:35 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
-| test.rs:425:32:425:34 | buf | semmle.label | buf |
-| test.rs:426:26:426:33 | &buffer2 | semmle.label | &buffer2 |
-| test.rs:426:27:426:33 | buffer2 [Ready, Ok] | semmle.label | buffer2 [Ready, Ok] |
-| test.rs:427:26:427:28 | buf | semmle.label | buf |
-| test.rs:437:17:437:22 | buffer | semmle.label | buffer |
-| test.rs:437:26:437:32 | reader2 | semmle.label | reader2 |
-| test.rs:437:26:437:43 | reader2.fill_buf() [future, Ok] | semmle.label | reader2.fill_buf() [future, Ok] |
-| test.rs:437:26:437:49 | await ... [Ok] | semmle.label | await ... [Ok] |
-| test.rs:437:26:437:50 | TryExpr | semmle.label | TryExpr |
-| test.rs:438:18:438:23 | buffer | semmle.label | buffer |
-| test.rs:444:17:444:26 | mut pinned | semmle.label | mut pinned |
-| test.rs:444:17:444:26 | mut pinned [Pin, &ref] | semmle.label | mut pinned [Pin, &ref] |
-| test.rs:444:30:444:51 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:444:30:444:51 | ...::new(...) [Pin, &ref] | semmle.label | ...::new(...) [Pin, &ref] |
-| test.rs:444:39:444:50 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
-| test.rs:444:44:444:50 | reader2 | semmle.label | reader2 |
-| test.rs:445:18:445:24 | &pinned | semmle.label | &pinned |
-| test.rs:445:19:445:24 | pinned | semmle.label | pinned |
-| test.rs:445:19:445:24 | pinned [Pin, &ref] | semmle.label | pinned [Pin, &ref] |
-| test.rs:447:30:447:35 | pinned | semmle.label | pinned |
-| test.rs:447:56:447:66 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
-| test.rs:447:61:447:66 | [post] buffer | semmle.label | [post] buffer |
-| test.rs:448:18:448:24 | &buffer | semmle.label | &buffer |
-| test.rs:448:19:448:24 | buffer | semmle.label | buffer |
-| test.rs:450:22:450:33 | &... | semmle.label | &... |
-| test.rs:450:23:450:28 | buffer | semmle.label | buffer |
-| test.rs:450:23:450:33 | buffer[...] | semmle.label | buffer[...] |
-| test.rs:457:63:457:74 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
-| test.rs:457:68:457:74 | reader2 | semmle.label | reader2 |
-| test.rs:457:77:457:88 | [post] &mut buffer1 [&ref] | semmle.label | [post] &mut buffer1 [&ref] |
-| test.rs:457:82:457:88 | [post] buffer1 | semmle.label | [post] buffer1 |
-| test.rs:458:18:458:40 | &... | semmle.label | &... |
-| test.rs:458:19:458:25 | buffer1 | semmle.label | buffer1 |
-| test.rs:458:19:458:40 | buffer1[...] | semmle.label | buffer1[...] |
-| test.rs:461:31:461:37 | reader2 | semmle.label | reader2 |
-| test.rs:461:44:461:55 | [post] &mut buffer2 [&ref] | semmle.label | [post] &mut buffer2 [&ref] |
-| test.rs:461:49:461:55 | [post] buffer2 | semmle.label | [post] buffer2 |
-| test.rs:462:18:462:40 | &... | semmle.label | &... |
-| test.rs:462:19:462:25 | buffer2 | semmle.label | buffer2 |
-| test.rs:462:19:462:40 | buffer2[...] | semmle.label | buffer2[...] |
-| test.rs:467:17:467:26 | mut pinned | semmle.label | mut pinned |
-| test.rs:467:17:467:26 | mut pinned [Pin, &ref] | semmle.label | mut pinned [Pin, &ref] |
-| test.rs:467:30:467:51 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:467:30:467:51 | ...::new(...) [Pin, &ref] | semmle.label | ...::new(...) [Pin, &ref] |
-| test.rs:467:39:467:50 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
-| test.rs:467:44:467:50 | reader2 | semmle.label | reader2 |
-| test.rs:468:18:468:24 | &pinned | semmle.label | &pinned |
-| test.rs:468:19:468:24 | pinned | semmle.label | pinned |
-| test.rs:468:19:468:24 | pinned [Pin, &ref] | semmle.label | pinned [Pin, &ref] |
-| test.rs:470:17:470:22 | buffer [Ready, Ok] | semmle.label | buffer [Ready, Ok] |
-| test.rs:470:26:470:31 | pinned | semmle.label | pinned |
-| test.rs:470:26:470:54 | pinned.poll_fill_buf(...) [Ready, Ok] | semmle.label | pinned.poll_fill_buf(...) [Ready, Ok] |
-| test.rs:471:18:471:24 | &buffer | semmle.label | &buffer |
-| test.rs:471:19:471:24 | buffer [Ready, Ok] | semmle.label | buffer [Ready, Ok] |
-| test.rs:472:20:472:39 | ...::Ready(...) [Ready, Ok] | semmle.label | ...::Ready(...) [Ready, Ok] |
-| test.rs:472:32:472:38 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
-| test.rs:472:35:472:37 | buf | semmle.label | buf |
-| test.rs:473:22:473:24 | buf | semmle.label | buf |
-| test.rs:479:17:479:22 | buffer | semmle.label | buffer |
-| test.rs:479:26:479:32 | reader2 | semmle.label | reader2 |
-| test.rs:479:26:479:43 | reader2.fill_buf() [future, Ok] | semmle.label | reader2.fill_buf() [future, Ok] |
-| test.rs:479:26:479:49 | await ... [Ok] | semmle.label | await ... [Ok] |
-| test.rs:479:26:479:50 | TryExpr | semmle.label | TryExpr |
-| test.rs:480:18:480:23 | buffer | semmle.label | buffer |
-| test.rs:486:31:486:37 | reader2 | semmle.label | reader2 |
-| test.rs:486:57:486:65 | [post] &mut line [&ref] | semmle.label | [post] &mut line [&ref] |
-| test.rs:486:62:486:65 | [post] line | semmle.label | [post] line |
-| test.rs:487:18:487:22 | &line | semmle.label | &line |
-| test.rs:487:19:487:22 | line | semmle.label | line |
-| test.rs:493:31:493:37 | reader2 | semmle.label | reader2 |
-| test.rs:493:49:493:57 | [post] &mut line [&ref] | semmle.label | [post] &mut line [&ref] |
-| test.rs:493:54:493:57 | [post] line | semmle.label | [post] line |
-| test.rs:494:18:494:22 | &line | semmle.label | &line |
-| test.rs:494:19:494:22 | line | semmle.label | line |
-| test.rs:500:31:500:37 | reader2 | semmle.label | reader2 |
-| test.rs:500:51:500:61 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
-| test.rs:500:56:500:61 | [post] buffer | semmle.label | [post] buffer |
-| test.rs:501:18:501:24 | &buffer | semmle.label | &buffer |
-| test.rs:501:19:501:24 | buffer | semmle.label | buffer |
+| test.rs:359:9:359:14 | stream | semmle.label | stream |
+| test.rs:359:18:359:54 | ...::connect(...) | semmle.label | ...::connect(...) |
+| test.rs:359:18:359:54 | ...::connect(...) [Ok] | semmle.label | ...::connect(...) [Ok] |
+| test.rs:359:18:359:55 | TryExpr | semmle.label | TryExpr |
+| test.rs:361:9:361:18 | mut stream | semmle.label | mut stream |
+| test.rs:361:22:361:65 | connector.connect(...) [Ok] | semmle.label | connector.connect(...) [Ok] |
+| test.rs:361:22:361:66 | TryExpr | semmle.label | TryExpr |
+| test.rs:361:59:361:64 | stream | semmle.label | stream |
+| test.rs:362:10:362:16 | &stream | semmle.label | &stream |
+| test.rs:362:11:362:16 | stream | semmle.label | stream |
+| test.rs:367:22:367:27 | stream | semmle.label | stream |
+| test.rs:367:34:367:44 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:367:39:367:44 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:370:10:370:30 | &... | semmle.label | &... |
+| test.rs:370:11:370:16 | buffer | semmle.label | buffer |
+| test.rs:370:11:370:30 | buffer[...] | semmle.label | buffer[...] |
+| test.rs:373:5:373:10 | stream | semmle.label | stream |
+| test.rs:373:27:373:39 | [post] &mut response [&ref] | semmle.label | [post] &mut response [&ref] |
+| test.rs:373:32:373:39 | [post] response | semmle.label | [post] response |
+| test.rs:375:10:375:17 | response | semmle.label | response |
+| test.rs:384:9:384:15 | stream0 | semmle.label | stream0 |
+| test.rs:384:19:384:61 | ...::connect(...) | semmle.label | ...::connect(...) |
+| test.rs:384:19:384:61 | ...::connect(...) [future, Ok] | semmle.label | ...::connect(...) [future, Ok] |
+| test.rs:384:19:384:67 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:384:19:384:68 | TryExpr | semmle.label | TryExpr |
+| test.rs:386:9:386:18 | mut stream | semmle.label | mut stream |
+| test.rs:386:22:386:74 | ...::connect(...) [future, Ok] | semmle.label | ...::connect(...) [future, Ok] |
+| test.rs:386:22:386:80 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:386:22:386:81 | TryExpr | semmle.label | TryExpr |
+| test.rs:386:67:386:73 | stream0 | semmle.label | stream0 |
+| test.rs:387:10:387:16 | &stream | semmle.label | &stream |
+| test.rs:387:11:387:16 | stream | semmle.label | stream |
+| test.rs:394:22:394:27 | stream | semmle.label | stream |
+| test.rs:394:34:394:44 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:394:39:394:44 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:397:10:397:30 | &... | semmle.label | &... |
+| test.rs:397:11:397:16 | buffer | semmle.label | buffer |
+| test.rs:397:11:397:30 | buffer[...] | semmle.label | buffer[...] |
+| test.rs:400:5:400:10 | stream | semmle.label | stream |
+| test.rs:400:27:400:39 | [post] &mut response [&ref] | semmle.label | [post] &mut response [&ref] |
+| test.rs:400:32:400:39 | [post] response | semmle.label | [post] response |
+| test.rs:402:10:402:17 | response | semmle.label | response |
+| test.rs:423:13:423:15 | tcp | semmle.label | tcp |
+| test.rs:423:19:423:41 | ...::connect(...) | semmle.label | ...::connect(...) |
+| test.rs:423:19:423:41 | ...::connect(...) [future, Ok] | semmle.label | ...::connect(...) [future, Ok] |
+| test.rs:423:19:423:47 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:423:19:423:48 | TryExpr | semmle.label | TryExpr |
+| test.rs:424:14:424:17 | &tcp | semmle.label | &tcp |
+| test.rs:424:15:424:17 | tcp | semmle.label | tcp |
+| test.rs:430:13:430:22 | mut reader | semmle.label | mut reader |
+| test.rs:430:26:430:60 | connector.connect(...) [future, Ok] | semmle.label | connector.connect(...) [future, Ok] |
+| test.rs:430:26:430:66 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:430:26:430:67 | TryExpr | semmle.label | TryExpr |
+| test.rs:430:57:430:59 | tcp | semmle.label | tcp |
+| test.rs:431:14:431:20 | &reader | semmle.label | &reader |
+| test.rs:431:15:431:20 | reader | semmle.label | reader |
+| test.rs:436:17:436:26 | mut pinned | semmle.label | mut pinned |
+| test.rs:436:17:436:26 | mut pinned [Pin, &ref] | semmle.label | mut pinned [Pin, &ref] |
+| test.rs:436:30:436:50 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:436:30:436:50 | ...::new(...) [Pin, &ref] | semmle.label | ...::new(...) [Pin, &ref] |
+| test.rs:436:39:436:49 | &mut reader [&ref] | semmle.label | &mut reader [&ref] |
+| test.rs:436:44:436:49 | reader | semmle.label | reader |
+| test.rs:437:18:437:24 | &pinned | semmle.label | &pinned |
+| test.rs:437:19:437:24 | pinned | semmle.label | pinned |
+| test.rs:437:19:437:24 | pinned [Pin, &ref] | semmle.label | pinned [Pin, &ref] |
+| test.rs:439:30:439:35 | pinned | semmle.label | pinned |
+| test.rs:439:56:439:66 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:439:61:439:66 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:441:22:441:28 | &buffer | semmle.label | &buffer |
+| test.rs:441:23:441:28 | buffer | semmle.label | buffer |
+| test.rs:442:22:442:33 | &... | semmle.label | &... |
+| test.rs:442:23:442:28 | buffer | semmle.label | buffer |
+| test.rs:442:23:442:33 | buffer[...] | semmle.label | buffer[...] |
+| test.rs:449:63:449:73 | &mut reader [&ref] | semmle.label | &mut reader [&ref] |
+| test.rs:449:68:449:73 | reader | semmle.label | reader |
+| test.rs:449:76:449:87 | [post] &mut buffer1 [&ref] | semmle.label | [post] &mut buffer1 [&ref] |
+| test.rs:449:81:449:87 | [post] buffer1 | semmle.label | [post] buffer1 |
+| test.rs:450:18:450:40 | &... | semmle.label | &... |
+| test.rs:450:19:450:25 | buffer1 | semmle.label | buffer1 |
+| test.rs:450:19:450:40 | buffer1[...] | semmle.label | buffer1[...] |
+| test.rs:453:31:453:36 | reader | semmle.label | reader |
+| test.rs:453:43:453:54 | [post] &mut buffer2 [&ref] | semmle.label | [post] &mut buffer2 [&ref] |
+| test.rs:453:48:453:54 | [post] buffer2 | semmle.label | [post] buffer2 |
+| test.rs:455:18:455:40 | &... | semmle.label | &... |
+| test.rs:455:19:455:25 | buffer2 | semmle.label | buffer2 |
+| test.rs:455:19:455:40 | buffer2[...] | semmle.label | buffer2[...] |
+| test.rs:458:13:458:23 | mut reader2 | semmle.label | mut reader2 |
+| test.rs:458:27:458:61 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:458:55:458:60 | reader | semmle.label | reader |
+| test.rs:459:14:459:21 | &reader2 | semmle.label | &reader2 |
+| test.rs:459:15:459:21 | reader2 | semmle.label | reader2 |
+| test.rs:463:17:463:26 | mut pinned | semmle.label | mut pinned |
+| test.rs:463:17:463:26 | mut pinned [Pin, &ref] | semmle.label | mut pinned [Pin, &ref] |
+| test.rs:463:30:463:51 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:463:30:463:51 | ...::new(...) [Pin, &ref] | semmle.label | ...::new(...) [Pin, &ref] |
+| test.rs:463:39:463:50 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
+| test.rs:463:44:463:50 | reader2 | semmle.label | reader2 |
+| test.rs:464:18:464:24 | &pinned | semmle.label | &pinned |
+| test.rs:464:19:464:24 | pinned | semmle.label | pinned |
+| test.rs:464:19:464:24 | pinned [Pin, &ref] | semmle.label | pinned [Pin, &ref] |
+| test.rs:466:17:466:22 | buffer [Ready, Ok] | semmle.label | buffer [Ready, Ok] |
+| test.rs:466:26:466:31 | pinned | semmle.label | pinned |
+| test.rs:466:26:466:54 | pinned.poll_fill_buf(...) [Ready, Ok] | semmle.label | pinned.poll_fill_buf(...) [Ready, Ok] |
+| test.rs:467:20:467:39 | ...::Ready(...) [Ready, Ok] | semmle.label | ...::Ready(...) [Ready, Ok] |
+| test.rs:467:32:467:38 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
+| test.rs:467:35:467:37 | buf | semmle.label | buf |
+| test.rs:468:22:468:28 | &buffer | semmle.label | &buffer |
+| test.rs:468:23:468:28 | buffer [Ready, Ok] | semmle.label | buffer [Ready, Ok] |
+| test.rs:469:22:469:24 | buf | semmle.label | buf |
+| test.rs:473:17:473:23 | buffer2 [Ready, Ok] | semmle.label | buffer2 [Ready, Ok] |
+| test.rs:473:27:473:48 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:473:27:473:71 | ... .poll_fill_buf(...) [Ready, Ok] | semmle.label | ... .poll_fill_buf(...) [Ready, Ok] |
+| test.rs:473:36:473:47 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
+| test.rs:473:41:473:47 | reader2 | semmle.label | reader2 |
+| test.rs:474:20:474:26 | buffer2 [Ready, Ok] | semmle.label | buffer2 [Ready, Ok] |
+| test.rs:475:17:475:36 | ...::Ready(...) [Ready, Ok] | semmle.label | ...::Ready(...) [Ready, Ok] |
+| test.rs:475:29:475:35 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
+| test.rs:475:32:475:34 | buf | semmle.label | buf |
+| test.rs:476:26:476:33 | &buffer2 | semmle.label | &buffer2 |
+| test.rs:476:27:476:33 | buffer2 [Ready, Ok] | semmle.label | buffer2 [Ready, Ok] |
+| test.rs:477:26:477:28 | buf | semmle.label | buf |
+| test.rs:487:17:487:22 | buffer | semmle.label | buffer |
+| test.rs:487:26:487:32 | reader2 | semmle.label | reader2 |
+| test.rs:487:26:487:43 | reader2.fill_buf() [future, Ok] | semmle.label | reader2.fill_buf() [future, Ok] |
+| test.rs:487:26:487:49 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:487:26:487:50 | TryExpr | semmle.label | TryExpr |
+| test.rs:488:18:488:23 | buffer | semmle.label | buffer |
+| test.rs:494:17:494:26 | mut pinned | semmle.label | mut pinned |
+| test.rs:494:17:494:26 | mut pinned [Pin, &ref] | semmle.label | mut pinned [Pin, &ref] |
+| test.rs:494:30:494:51 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:494:30:494:51 | ...::new(...) [Pin, &ref] | semmle.label | ...::new(...) [Pin, &ref] |
+| test.rs:494:39:494:50 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
+| test.rs:494:44:494:50 | reader2 | semmle.label | reader2 |
+| test.rs:495:18:495:24 | &pinned | semmle.label | &pinned |
+| test.rs:495:19:495:24 | pinned | semmle.label | pinned |
+| test.rs:495:19:495:24 | pinned [Pin, &ref] | semmle.label | pinned [Pin, &ref] |
+| test.rs:497:30:497:35 | pinned | semmle.label | pinned |
+| test.rs:497:56:497:66 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:497:61:497:66 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:498:18:498:24 | &buffer | semmle.label | &buffer |
+| test.rs:498:19:498:24 | buffer | semmle.label | buffer |
+| test.rs:500:22:500:33 | &... | semmle.label | &... |
+| test.rs:500:23:500:28 | buffer | semmle.label | buffer |
+| test.rs:500:23:500:33 | buffer[...] | semmle.label | buffer[...] |
+| test.rs:507:63:507:74 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
+| test.rs:507:68:507:74 | reader2 | semmle.label | reader2 |
+| test.rs:507:77:507:88 | [post] &mut buffer1 [&ref] | semmle.label | [post] &mut buffer1 [&ref] |
+| test.rs:507:82:507:88 | [post] buffer1 | semmle.label | [post] buffer1 |
+| test.rs:508:18:508:40 | &... | semmle.label | &... |
+| test.rs:508:19:508:25 | buffer1 | semmle.label | buffer1 |
+| test.rs:508:19:508:40 | buffer1[...] | semmle.label | buffer1[...] |
+| test.rs:511:31:511:37 | reader2 | semmle.label | reader2 |
+| test.rs:511:44:511:55 | [post] &mut buffer2 [&ref] | semmle.label | [post] &mut buffer2 [&ref] |
+| test.rs:511:49:511:55 | [post] buffer2 | semmle.label | [post] buffer2 |
+| test.rs:512:18:512:40 | &... | semmle.label | &... |
+| test.rs:512:19:512:25 | buffer2 | semmle.label | buffer2 |
+| test.rs:512:19:512:40 | buffer2[...] | semmle.label | buffer2[...] |
+| test.rs:517:17:517:26 | mut pinned | semmle.label | mut pinned |
+| test.rs:517:17:517:26 | mut pinned [Pin, &ref] | semmle.label | mut pinned [Pin, &ref] |
+| test.rs:517:30:517:51 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:517:30:517:51 | ...::new(...) [Pin, &ref] | semmle.label | ...::new(...) [Pin, &ref] |
+| test.rs:517:39:517:50 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
+| test.rs:517:44:517:50 | reader2 | semmle.label | reader2 |
+| test.rs:518:18:518:24 | &pinned | semmle.label | &pinned |
+| test.rs:518:19:518:24 | pinned | semmle.label | pinned |
+| test.rs:518:19:518:24 | pinned [Pin, &ref] | semmle.label | pinned [Pin, &ref] |
+| test.rs:520:17:520:22 | buffer [Ready, Ok] | semmle.label | buffer [Ready, Ok] |
+| test.rs:520:26:520:31 | pinned | semmle.label | pinned |
+| test.rs:520:26:520:54 | pinned.poll_fill_buf(...) [Ready, Ok] | semmle.label | pinned.poll_fill_buf(...) [Ready, Ok] |
+| test.rs:521:18:521:24 | &buffer | semmle.label | &buffer |
+| test.rs:521:19:521:24 | buffer [Ready, Ok] | semmle.label | buffer [Ready, Ok] |
+| test.rs:522:20:522:39 | ...::Ready(...) [Ready, Ok] | semmle.label | ...::Ready(...) [Ready, Ok] |
+| test.rs:522:32:522:38 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
+| test.rs:522:35:522:37 | buf | semmle.label | buf |
+| test.rs:523:22:523:24 | buf | semmle.label | buf |
+| test.rs:529:17:529:22 | buffer | semmle.label | buffer |
+| test.rs:529:26:529:32 | reader2 | semmle.label | reader2 |
+| test.rs:529:26:529:43 | reader2.fill_buf() [future, Ok] | semmle.label | reader2.fill_buf() [future, Ok] |
+| test.rs:529:26:529:49 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:529:26:529:50 | TryExpr | semmle.label | TryExpr |
+| test.rs:530:18:530:23 | buffer | semmle.label | buffer |
+| test.rs:536:31:536:37 | reader2 | semmle.label | reader2 |
+| test.rs:536:57:536:65 | [post] &mut line [&ref] | semmle.label | [post] &mut line [&ref] |
+| test.rs:536:62:536:65 | [post] line | semmle.label | [post] line |
+| test.rs:537:18:537:22 | &line | semmle.label | &line |
+| test.rs:537:19:537:22 | line | semmle.label | line |
+| test.rs:543:31:543:37 | reader2 | semmle.label | reader2 |
+| test.rs:543:49:543:57 | [post] &mut line [&ref] | semmle.label | [post] &mut line [&ref] |
+| test.rs:543:54:543:57 | [post] line | semmle.label | [post] line |
+| test.rs:544:18:544:22 | &line | semmle.label | &line |
+| test.rs:544:19:544:22 | line | semmle.label | line |
+| test.rs:550:31:550:37 | reader2 | semmle.label | reader2 |
+| test.rs:550:51:550:61 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:550:56:550:61 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:551:18:551:24 | &buffer | semmle.label | &buffer |
+| test.rs:551:19:551:24 | buffer | semmle.label | buffer |
 subpaths
 testFailures
 #select
-| test.rs:12:10:12:23 | remote_string1 | test.rs:11:26:11:47 | ...::get | test.rs:12:10:12:23 | remote_string1 | $@ | test.rs:11:26:11:47 | ...::get | ...::get |
-| test.rs:15:10:15:23 | remote_string2 | test.rs:14:26:14:47 | ...::get | test.rs:15:10:15:23 | remote_string2 | $@ | test.rs:14:26:14:47 | ...::get | ...::get |
-| test.rs:18:10:18:23 | remote_string3 | test.rs:17:26:17:47 | ...::get | test.rs:18:10:18:23 | remote_string3 | $@ | test.rs:17:26:17:47 | ...::get | ...::get |
-| test.rs:21:10:21:23 | remote_string4 | test.rs:20:26:20:47 | ...::get | test.rs:21:10:21:23 | remote_string4 | $@ | test.rs:20:26:20:47 | ...::get | ...::get |
-| test.rs:24:10:24:23 | remote_string5 | test.rs:23:26:23:37 | ...::get | test.rs:24:10:24:23 | remote_string5 | $@ | test.rs:23:26:23:37 | ...::get | ...::get |
-| test.rs:27:10:27:23 | remote_string6 | test.rs:26:26:26:37 | ...::get | test.rs:27:10:27:23 | remote_string6 | $@ | test.rs:26:26:26:37 | ...::get | ...::get |
-| test.rs:30:10:30:41 | ... .unwrap() | test.rs:29:24:29:35 | ...::get | test.rs:30:10:30:41 | ... .unwrap() | $@ | test.rs:29:24:29:35 | ...::get | ...::get |
-| test.rs:32:14:32:18 | chunk | test.rs:29:24:29:35 | ...::get | test.rs:32:14:32:18 | chunk | $@ | test.rs:29:24:29:35 | ...::get | ...::get |
-| test.rs:61:14:61:22 | &response | test.rs:60:31:60:42 | send_request | test.rs:61:14:61:22 | &response | $@ | test.rs:60:31:60:42 | send_request | send_request |
-| test.rs:62:14:62:21 | response | test.rs:60:31:60:42 | send_request | test.rs:62:14:62:21 | response | $@ | test.rs:60:31:60:42 | send_request | send_request |
-| test.rs:68:10:68:18 | &response | test.rs:67:31:67:42 | send_request | test.rs:68:10:68:18 | &response | $@ | test.rs:67:31:67:42 | send_request | send_request |
-| test.rs:76:18:76:32 | response.body() | test.rs:67:31:67:42 | send_request | test.rs:76:18:76:32 | response.body() | $@ | test.rs:67:31:67:42 | send_request | send_request |
-| test.rs:77:18:77:36 | response.body_mut() | test.rs:67:31:67:42 | send_request | test.rs:77:18:77:36 | response.body_mut() | $@ | test.rs:67:31:67:42 | send_request | send_request |
-| test.rs:80:18:80:22 | &body | test.rs:67:31:67:42 | send_request | test.rs:80:18:80:22 | &body | $@ | test.rs:67:31:67:42 | send_request | send_request |
-| test.rs:165:14:165:20 | &buffer | test.rs:155:26:155:53 | ...::connect | test.rs:165:14:165:20 | &buffer | $@ | test.rs:155:26:155:53 | ...::connect | ...::connect |
-| test.rs:166:14:166:22 | buffer[0] | test.rs:155:26:155:53 | ...::connect | test.rs:166:14:166:22 | buffer[0] | $@ | test.rs:155:26:155:53 | ...::connect | ...::connect |
-| test.rs:192:34:192:38 | &line | test.rs:174:26:174:61 | ...::connect_timeout | test.rs:192:34:192:38 | &line | $@ | test.rs:174:26:174:61 | ...::connect_timeout | ...::connect_timeout |
-| test.rs:207:30:207:35 | string | test.rs:174:26:174:61 | ...::connect_timeout | test.rs:207:30:207:35 | string | $@ | test.rs:174:26:174:61 | ...::connect_timeout | ...::connect_timeout |
-| test.rs:239:14:239:21 | &buffer1 | test.rs:224:28:224:57 | ...::connect | test.rs:239:14:239:21 | &buffer1 | $@ | test.rs:224:28:224:57 | ...::connect | ...::connect |
-| test.rs:240:14:240:23 | buffer1[0] | test.rs:224:28:224:57 | ...::connect | test.rs:240:14:240:23 | buffer1[0] | $@ | test.rs:224:28:224:57 | ...::connect | ...::connect |
-| test.rs:243:14:243:21 | &buffer2 | test.rs:224:28:224:57 | ...::connect | test.rs:243:14:243:21 | &buffer2 | $@ | test.rs:224:28:224:57 | ...::connect | ...::connect |
-| test.rs:244:14:244:23 | buffer2[0] | test.rs:224:28:224:57 | ...::connect | test.rs:244:14:244:23 | buffer2[0] | $@ | test.rs:224:28:224:57 | ...::connect | ...::connect |
-| test.rs:259:26:259:32 | &buffer | test.rs:224:28:224:57 | ...::connect | test.rs:259:26:259:32 | &buffer | $@ | test.rs:224:28:224:57 | ...::connect | ...::connect |
-| test.rs:282:26:282:32 | &buffer | test.rs:224:28:224:57 | ...::connect | test.rs:282:26:282:32 | &buffer | $@ | test.rs:224:28:224:57 | ...::connect | ...::connect |
-| test.rs:334:10:334:16 | &reader | test.rs:332:22:332:50 | ...::new | test.rs:334:10:334:16 | &reader | $@ | test.rs:332:22:332:50 | ...::new | ...::new |
-| test.rs:339:14:339:20 | &buffer | test.rs:332:22:332:50 | ...::new | test.rs:339:14:339:20 | &buffer | $@ | test.rs:332:22:332:50 | ...::new | ...::new |
-| test.rs:345:14:345:20 | &buffer | test.rs:332:22:332:50 | ...::new | test.rs:345:14:345:20 | &buffer | $@ | test.rs:332:22:332:50 | ...::new | ...::new |
-| test.rs:351:14:351:20 | &buffer | test.rs:332:22:332:50 | ...::new | test.rs:351:14:351:20 | &buffer | $@ | test.rs:332:22:332:50 | ...::new | ...::new |
-| test.rs:374:14:374:17 | &tcp | test.rs:373:19:373:36 | ...::connect | test.rs:374:14:374:17 | &tcp | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:381:14:381:20 | &reader | test.rs:373:19:373:36 | ...::connect | test.rs:381:14:381:20 | &reader | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:387:18:387:24 | &pinned | test.rs:373:19:373:36 | ...::connect | test.rs:387:18:387:24 | &pinned | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:391:22:391:28 | &buffer | test.rs:373:19:373:36 | ...::connect | test.rs:391:22:391:28 | &buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:392:22:392:33 | &... | test.rs:373:19:373:36 | ...::connect | test.rs:392:22:392:33 | &... | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:400:18:400:40 | &... | test.rs:373:19:373:36 | ...::connect | test.rs:400:18:400:40 | &... | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:405:18:405:40 | &... | test.rs:373:19:373:36 | ...::connect | test.rs:405:18:405:40 | &... | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:409:14:409:21 | &reader2 | test.rs:373:19:373:36 | ...::connect | test.rs:409:14:409:21 | &reader2 | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:414:18:414:24 | &pinned | test.rs:373:19:373:36 | ...::connect | test.rs:414:18:414:24 | &pinned | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:418:22:418:28 | &buffer | test.rs:373:19:373:36 | ...::connect | test.rs:418:22:418:28 | &buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:419:22:419:24 | buf | test.rs:373:19:373:36 | ...::connect | test.rs:419:22:419:24 | buf | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:426:26:426:33 | &buffer2 | test.rs:373:19:373:36 | ...::connect | test.rs:426:26:426:33 | &buffer2 | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:427:26:427:28 | buf | test.rs:373:19:373:36 | ...::connect | test.rs:427:26:427:28 | buf | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:438:18:438:23 | buffer | test.rs:373:19:373:36 | ...::connect | test.rs:438:18:438:23 | buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:445:18:445:24 | &pinned | test.rs:373:19:373:36 | ...::connect | test.rs:445:18:445:24 | &pinned | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:448:18:448:24 | &buffer | test.rs:373:19:373:36 | ...::connect | test.rs:448:18:448:24 | &buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:450:22:450:33 | &... | test.rs:373:19:373:36 | ...::connect | test.rs:450:22:450:33 | &... | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:458:18:458:40 | &... | test.rs:373:19:373:36 | ...::connect | test.rs:458:18:458:40 | &... | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:462:18:462:40 | &... | test.rs:373:19:373:36 | ...::connect | test.rs:462:18:462:40 | &... | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:468:18:468:24 | &pinned | test.rs:373:19:373:36 | ...::connect | test.rs:468:18:468:24 | &pinned | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:471:18:471:24 | &buffer | test.rs:373:19:373:36 | ...::connect | test.rs:471:18:471:24 | &buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:473:22:473:24 | buf | test.rs:373:19:373:36 | ...::connect | test.rs:473:22:473:24 | buf | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:480:18:480:23 | buffer | test.rs:373:19:373:36 | ...::connect | test.rs:480:18:480:23 | buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:487:18:487:22 | &line | test.rs:373:19:373:36 | ...::connect | test.rs:487:18:487:22 | &line | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:494:18:494:22 | &line | test.rs:373:19:373:36 | ...::connect | test.rs:494:18:494:22 | &line | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
-| test.rs:501:18:501:24 | &buffer | test.rs:373:19:373:36 | ...::connect | test.rs:501:18:501:24 | &buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:12:10:12:23 | remote_string1 | test.rs:11:26:11:62 | ...::get(...) | test.rs:12:10:12:23 | remote_string1 | $@ | test.rs:11:26:11:62 | ...::get(...) | ...::get(...) |
+| test.rs:15:10:15:23 | remote_string2 | test.rs:14:26:14:62 | ...::get(...) | test.rs:15:10:15:23 | remote_string2 | $@ | test.rs:14:26:14:62 | ...::get(...) | ...::get(...) |
+| test.rs:18:10:18:23 | remote_string3 | test.rs:17:26:17:62 | ...::get(...) | test.rs:18:10:18:23 | remote_string3 | $@ | test.rs:17:26:17:62 | ...::get(...) | ...::get(...) |
+| test.rs:21:10:21:23 | remote_string4 | test.rs:20:26:20:62 | ...::get(...) | test.rs:21:10:21:23 | remote_string4 | $@ | test.rs:20:26:20:62 | ...::get(...) | ...::get(...) |
+| test.rs:24:10:24:23 | remote_string5 | test.rs:23:26:23:52 | ...::get(...) | test.rs:24:10:24:23 | remote_string5 | $@ | test.rs:23:26:23:52 | ...::get(...) | ...::get(...) |
+| test.rs:27:10:27:23 | remote_string6 | test.rs:26:26:26:52 | ...::get(...) | test.rs:27:10:27:23 | remote_string6 | $@ | test.rs:26:26:26:52 | ...::get(...) | ...::get(...) |
+| test.rs:30:10:30:41 | ... .unwrap() | test.rs:29:24:29:50 | ...::get(...) | test.rs:30:10:30:41 | ... .unwrap() | $@ | test.rs:29:24:29:50 | ...::get(...) | ...::get(...) |
+| test.rs:32:14:32:18 | chunk | test.rs:29:24:29:50 | ...::get(...) | test.rs:32:14:32:18 | chunk | $@ | test.rs:29:24:29:50 | ...::get(...) | ...::get(...) |
+| test.rs:61:14:61:22 | &response | test.rs:60:24:60:51 | sender.send_request(...) | test.rs:61:14:61:22 | &response | $@ | test.rs:60:24:60:51 | sender.send_request(...) | sender.send_request(...) |
+| test.rs:62:14:62:21 | response | test.rs:60:24:60:51 | sender.send_request(...) | test.rs:62:14:62:21 | response | $@ | test.rs:60:24:60:51 | sender.send_request(...) | sender.send_request(...) |
+| test.rs:68:10:68:18 | &response | test.rs:67:24:67:51 | sender.send_request(...) | test.rs:68:10:68:18 | &response | $@ | test.rs:67:24:67:51 | sender.send_request(...) | sender.send_request(...) |
+| test.rs:76:18:76:32 | response.body() | test.rs:67:24:67:51 | sender.send_request(...) | test.rs:76:18:76:32 | response.body() | $@ | test.rs:67:24:67:51 | sender.send_request(...) | sender.send_request(...) |
+| test.rs:77:18:77:36 | response.body_mut() | test.rs:67:24:67:51 | sender.send_request(...) | test.rs:77:18:77:36 | response.body_mut() | $@ | test.rs:67:24:67:51 | sender.send_request(...) | sender.send_request(...) |
+| test.rs:80:18:80:22 | &body | test.rs:67:24:67:51 | sender.send_request(...) | test.rs:80:18:80:22 | &body | $@ | test.rs:67:24:67:51 | sender.send_request(...) | sender.send_request(...) |
+| test.rs:165:14:165:20 | &buffer | test.rs:155:26:155:62 | ...::connect(...) | test.rs:165:14:165:20 | &buffer | $@ | test.rs:155:26:155:62 | ...::connect(...) | ...::connect(...) |
+| test.rs:166:14:166:22 | buffer[0] | test.rs:155:26:155:62 | ...::connect(...) | test.rs:166:14:166:22 | buffer[0] | $@ | test.rs:155:26:155:62 | ...::connect(...) | ...::connect(...) |
+| test.rs:192:34:192:38 | &line | test.rs:174:26:174:105 | ...::connect_timeout(...) | test.rs:192:34:192:38 | &line | $@ | test.rs:174:26:174:105 | ...::connect_timeout(...) | ...::connect_timeout(...) |
+| test.rs:207:30:207:35 | string | test.rs:174:26:174:105 | ...::connect_timeout(...) | test.rs:207:30:207:35 | string | $@ | test.rs:174:26:174:105 | ...::connect_timeout(...) | ...::connect_timeout(...) |
+| test.rs:239:14:239:21 | &buffer1 | test.rs:224:28:224:66 | ...::connect(...) | test.rs:239:14:239:21 | &buffer1 | $@ | test.rs:224:28:224:66 | ...::connect(...) | ...::connect(...) |
+| test.rs:240:14:240:23 | buffer1[0] | test.rs:224:28:224:66 | ...::connect(...) | test.rs:240:14:240:23 | buffer1[0] | $@ | test.rs:224:28:224:66 | ...::connect(...) | ...::connect(...) |
+| test.rs:243:14:243:21 | &buffer2 | test.rs:224:28:224:66 | ...::connect(...) | test.rs:243:14:243:21 | &buffer2 | $@ | test.rs:224:28:224:66 | ...::connect(...) | ...::connect(...) |
+| test.rs:244:14:244:23 | buffer2[0] | test.rs:224:28:224:66 | ...::connect(...) | test.rs:244:14:244:23 | buffer2[0] | $@ | test.rs:224:28:224:66 | ...::connect(...) | ...::connect(...) |
+| test.rs:259:26:259:32 | &buffer | test.rs:224:28:224:66 | ...::connect(...) | test.rs:259:26:259:32 | &buffer | $@ | test.rs:224:28:224:66 | ...::connect(...) | ...::connect(...) |
+| test.rs:282:26:282:32 | &buffer | test.rs:224:28:224:66 | ...::connect(...) | test.rs:282:26:282:32 | &buffer | $@ | test.rs:224:28:224:66 | ...::connect(...) | ...::connect(...) |
+| test.rs:334:10:334:16 | &reader | test.rs:332:22:332:75 | ...::new(...) | test.rs:334:10:334:16 | &reader | $@ | test.rs:332:22:332:75 | ...::new(...) | ...::new(...) |
+| test.rs:339:14:339:20 | &buffer | test.rs:332:22:332:75 | ...::new(...) | test.rs:339:14:339:20 | &buffer | $@ | test.rs:332:22:332:75 | ...::new(...) | ...::new(...) |
+| test.rs:345:14:345:20 | &buffer | test.rs:332:22:332:75 | ...::new(...) | test.rs:345:14:345:20 | &buffer | $@ | test.rs:332:22:332:75 | ...::new(...) | ...::new(...) |
+| test.rs:351:14:351:20 | &buffer | test.rs:332:22:332:75 | ...::new(...) | test.rs:351:14:351:20 | &buffer | $@ | test.rs:332:22:332:75 | ...::new(...) | ...::new(...) |
+| test.rs:362:10:362:16 | &stream | test.rs:359:18:359:54 | ...::connect(...) | test.rs:362:10:362:16 | &stream | $@ | test.rs:359:18:359:54 | ...::connect(...) | ...::connect(...) |
+| test.rs:370:10:370:30 | &... | test.rs:359:18:359:54 | ...::connect(...) | test.rs:370:10:370:30 | &... | $@ | test.rs:359:18:359:54 | ...::connect(...) | ...::connect(...) |
+| test.rs:375:10:375:17 | response | test.rs:359:18:359:54 | ...::connect(...) | test.rs:375:10:375:17 | response | $@ | test.rs:359:18:359:54 | ...::connect(...) | ...::connect(...) |
+| test.rs:387:10:387:16 | &stream | test.rs:384:19:384:61 | ...::connect(...) | test.rs:387:10:387:16 | &stream | $@ | test.rs:384:19:384:61 | ...::connect(...) | ...::connect(...) |
+| test.rs:397:10:397:30 | &... | test.rs:384:19:384:61 | ...::connect(...) | test.rs:397:10:397:30 | &... | $@ | test.rs:384:19:384:61 | ...::connect(...) | ...::connect(...) |
+| test.rs:402:10:402:17 | response | test.rs:384:19:384:61 | ...::connect(...) | test.rs:402:10:402:17 | response | $@ | test.rs:384:19:384:61 | ...::connect(...) | ...::connect(...) |
+| test.rs:424:14:424:17 | &tcp | test.rs:423:19:423:41 | ...::connect(...) | test.rs:424:14:424:17 | &tcp | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:431:14:431:20 | &reader | test.rs:423:19:423:41 | ...::connect(...) | test.rs:431:14:431:20 | &reader | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:437:18:437:24 | &pinned | test.rs:423:19:423:41 | ...::connect(...) | test.rs:437:18:437:24 | &pinned | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:441:22:441:28 | &buffer | test.rs:423:19:423:41 | ...::connect(...) | test.rs:441:22:441:28 | &buffer | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:442:22:442:33 | &... | test.rs:423:19:423:41 | ...::connect(...) | test.rs:442:22:442:33 | &... | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:450:18:450:40 | &... | test.rs:423:19:423:41 | ...::connect(...) | test.rs:450:18:450:40 | &... | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:455:18:455:40 | &... | test.rs:423:19:423:41 | ...::connect(...) | test.rs:455:18:455:40 | &... | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:459:14:459:21 | &reader2 | test.rs:423:19:423:41 | ...::connect(...) | test.rs:459:14:459:21 | &reader2 | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:464:18:464:24 | &pinned | test.rs:423:19:423:41 | ...::connect(...) | test.rs:464:18:464:24 | &pinned | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:468:22:468:28 | &buffer | test.rs:423:19:423:41 | ...::connect(...) | test.rs:468:22:468:28 | &buffer | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:469:22:469:24 | buf | test.rs:423:19:423:41 | ...::connect(...) | test.rs:469:22:469:24 | buf | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:476:26:476:33 | &buffer2 | test.rs:423:19:423:41 | ...::connect(...) | test.rs:476:26:476:33 | &buffer2 | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:477:26:477:28 | buf | test.rs:423:19:423:41 | ...::connect(...) | test.rs:477:26:477:28 | buf | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:488:18:488:23 | buffer | test.rs:423:19:423:41 | ...::connect(...) | test.rs:488:18:488:23 | buffer | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:495:18:495:24 | &pinned | test.rs:423:19:423:41 | ...::connect(...) | test.rs:495:18:495:24 | &pinned | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:498:18:498:24 | &buffer | test.rs:423:19:423:41 | ...::connect(...) | test.rs:498:18:498:24 | &buffer | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:500:22:500:33 | &... | test.rs:423:19:423:41 | ...::connect(...) | test.rs:500:22:500:33 | &... | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:508:18:508:40 | &... | test.rs:423:19:423:41 | ...::connect(...) | test.rs:508:18:508:40 | &... | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:512:18:512:40 | &... | test.rs:423:19:423:41 | ...::connect(...) | test.rs:512:18:512:40 | &... | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:518:18:518:24 | &pinned | test.rs:423:19:423:41 | ...::connect(...) | test.rs:518:18:518:24 | &pinned | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:521:18:521:24 | &buffer | test.rs:423:19:423:41 | ...::connect(...) | test.rs:521:18:521:24 | &buffer | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:523:22:523:24 | buf | test.rs:423:19:423:41 | ...::connect(...) | test.rs:523:22:523:24 | buf | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:530:18:530:23 | buffer | test.rs:423:19:423:41 | ...::connect(...) | test.rs:530:18:530:23 | buffer | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:537:18:537:22 | &line | test.rs:423:19:423:41 | ...::connect(...) | test.rs:537:18:537:22 | &line | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:544:18:544:22 | &line | test.rs:423:19:423:41 | ...::connect(...) | test.rs:544:18:544:22 | &line | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
+| test.rs:551:18:551:24 | &buffer | test.rs:423:19:423:41 | ...::connect(...) | test.rs:551:18:551:24 | &buffer | $@ | test.rs:423:19:423:41 | ...::connect(...) | ...::connect(...) |
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/net/TaintSources.expected
index bfe1ce0e56bc..3c0bd8892d76 100644
--- a/rust/ql/test/library-tests/dataflow/sources/net/TaintSources.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/net/TaintSources.expected
@@ -1,17 +1,19 @@
-| test.rs:11:26:11:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:14:26:14:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:17:26:17:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:20:26:20:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:23:26:23:37 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:26:26:26:37 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:29:24:29:35 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:45:18:45:47 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:60:31:60:42 | send_request | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:67:31:67:42 | send_request | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:155:26:155:53 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:174:26:174:61 | ...::connect_timeout | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:224:28:224:57 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:306:22:306:49 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:332:22:332:50 | ...::new | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:373:19:373:36 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:519:16:519:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:11:26:11:62 | ...::get(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:14:26:14:62 | ...::get(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:17:26:17:62 | ...::get(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:20:26:20:62 | ...::get(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:23:26:23:52 | ...::get(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:26:26:26:52 | ...::get(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:29:24:29:50 | ...::get(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:45:18:45:56 | ...::connect(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:60:24:60:51 | sender.send_request(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:67:24:67:51 | sender.send_request(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:155:26:155:62 | ...::connect(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:174:26:174:105 | ...::connect_timeout(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:224:28:224:66 | ...::connect(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:306:22:306:58 | ...::connect(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:332:22:332:75 | ...::new(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:359:18:359:54 | ...::connect(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:384:19:384:61 | ...::connect(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:423:19:423:41 | ...::connect(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:569:16:569:31 | ...::args(...) | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/options.yml b/rust/ql/test/library-tests/dataflow/sources/net/options.yml
index 24cda1561c0f..00ae29ae611c 100644
--- a/rust/ql/test/library-tests/dataflow/sources/net/options.yml
+++ b/rust/ql/test/library-tests/dataflow/sources/net/options.yml
@@ -10,3 +10,5 @@ qltest_dependencies:
     - rustls = { version = "0.23.27" }
     - futures-rustls = { version = "0.26.0" }
     - async-std = { version = "1.13.1" }
+    - native-tls = { version = "0.2.14" }
+    - async-native-tls = { version = "0.5.0" }
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/test.rs b/rust/ql/test/library-tests/dataflow/sources/net/test.rs
index bb6f54cb913d..81fb1982108c 100644
--- a/rust/ql/test/library-tests/dataflow/sources/net/test.rs
+++ b/rust/ql/test/library-tests/dataflow/sources/net/test.rs
@@ -354,6 +354,56 @@ fn test_rustls() -> std::io::Result<()> {
     Ok(())
 }
 
+fn test_native_tls() -> Result<(), Box<dyn std::error::Error>> {
+    let address = "www.example.com:443";
+    let stream = std::net::TcpStream::connect(address)?; // $ Alert[rust/summary/taint-sources]
+    let connector = native_tls::TlsConnector::new()?;
+    let mut stream = connector.connect("www.example.com", stream)?;
+    sink(&stream); // $ hasTaintFlow=address
+
+    stream.write_all(b"GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: close\r\n\r\n")?;
+
+    let mut buffer = [0u8; 100];
+    let bytes_read = stream.read(&mut buffer)?;
+    println!("bytes_read = {}", bytes_read);
+    println!("buffer = {:?}", &buffer[..bytes_read]);
+    sink(&buffer[..bytes_read]); // $ hasTaintFlow=address
+
+    let mut response = String::new();
+    stream.read_to_string(&mut response)?;
+    println!("rest of response = '{}'", response);
+    sink(response); // $ hasTaintFlow=address
+
+    Ok(())
+}
+
+async fn test_async_native_tls() -> Result<(), Box<dyn std::error::Error>> {
+    use futures::io::{AsyncReadExt, AsyncWriteExt};
+
+    let address = "www.example.com:443";
+    let stream0 = async_std::net::TcpStream::connect(address).await?; // $ Alert[rust/summary/taint-sources]
+    let connector = async_native_tls::TlsConnector::new();
+    let mut stream = async_native_tls::connect("www.example.com", stream0).await?;
+    sink(&stream); // $ hasTaintFlow=address
+
+    stream
+        .write_all(b"GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: close\r\n\r\n")
+        .await?;
+
+    let mut buffer = [0u8; 100];
+    let bytes_read = stream.read(&mut buffer).await?;
+    println!("bytes_read = {}", bytes_read);
+    println!("buffer = {:?}", &buffer[..bytes_read]);
+    sink(&buffer[..bytes_read]); // $ hasTaintFlow=address
+
+    let mut response = String::new();
+    stream.read_to_string(&mut response).await?;
+    println!("rest of response = '{}'", response);
+    sink(response); // $ hasTaintFlow=address
+
+    Ok(())
+}
+
 mod futures_rustls {
     use async_std::net::TcpStream;
     use async_std::sync::Arc;
@@ -548,6 +598,18 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         Err(e) => println!("error: {}", e),
     }
 
+    println!("test_native_tls...");
+    match test_native_tls() {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    println!("test_async_native_tls...");
+    match futures::executor::block_on(test_async_native_tls()) {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
     println!("test_rustls...");
     match test_rustls() {
         Ok(_) => println!("complete"),
diff --git a/rust/ql/test/library-tests/dataflow/sources/stdin/InlineFlow.expected b/rust/ql/test/library-tests/dataflow/sources/stdin/InlineFlow.expected
index c407a05f90d2..e517200295b2 100644
--- a/rust/ql/test/library-tests/dataflow/sources/stdin/InlineFlow.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/stdin/InlineFlow.expected
@@ -1,165 +1,161 @@
 models
 | 1 | Source: std::io::stdio::stdin; ReturnValue; stdin |
 | 2 | Source: tokio::io::stdin::stdin; ReturnValue; stdin |
-| 3 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
-| 4 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
-| 5 | Summary: <_ as core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
-| 6 | Summary: <_ as std::io::BufRead>::lines; Argument[self]; ReturnValue; taint |
-| 7 | Summary: <_ as std::io::BufRead>::read_line; Argument[self].Reference; Argument[0].Reference; taint |
-| 8 | Summary: <_ as std::io::BufRead>::read_until; Argument[self].Reference; Argument[1].Reference; taint |
-| 9 | Summary: <_ as std::io::BufRead>::split; Argument[self]; ReturnValue; taint |
-| 10 | Summary: <_ as std::io::Read>::bytes; Argument[self]; ReturnValue; taint |
-| 11 | Summary: <_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::fill_buf; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
-| 12 | Summary: <_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::lines; Argument[self]; ReturnValue; taint |
-| 13 | Summary: <_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::read_line; Argument[self].Reference; Argument[0].Reference; taint |
-| 14 | Summary: <_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::read_until; Argument[self].Reference; Argument[1].Reference; taint |
-| 15 | Summary: <_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::split; Argument[self]; ReturnValue; taint |
-| 16 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read; Argument[self].Reference; Argument[0].Reference; taint |
-| 17 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_buf; Argument[self].Reference; Argument[0].Reference; taint |
-| 18 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_exact; Argument[self].Reference; Argument[0].Reference; taint |
-| 19 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_f32; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
-| 20 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i16; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
-| 21 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i64_le; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
-| 22 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_to_end; Argument[self].Reference; Argument[0].Reference; taint |
-| 23 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
-| 24 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u8; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
-| 25 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
-| 26 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 27 | Summary: <std::io::Split as core::iter::traits::iterator::Iterator>::next; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]; value |
-| 28 | Summary: <std::io::buffered::bufreader::BufReader as std::io::BufRead>::fill_buf; Argument[self].Reference; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 29 | Summary: <std::io::buffered::bufreader::BufReader>::buffer; Argument[self].Reference; ReturnValue.Reference; taint |
-| 30 | Summary: <std::io::buffered::bufreader::BufReader>::new; Argument[0]; ReturnValue; taint |
-| 31 | Summary: <std::io::stdio::Stdin as std::io::Read>::read; Argument[self].Reference; Argument[0].Reference; taint |
-| 32 | Summary: <std::io::stdio::Stdin as std::io::Read>::read_exact; Argument[self].Reference; Argument[0].Reference; taint |
-| 33 | Summary: <std::io::stdio::Stdin as std::io::Read>::read_to_end; Argument[self].Reference; Argument[0].Reference; taint |
-| 34 | Summary: <std::io::stdio::Stdin as std::io::Read>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
-| 35 | Summary: <std::io::stdio::Stdin>::lock; Argument[self].Reference; ReturnValue; taint |
-| 36 | Summary: <std::io::stdio::StdinLock as std::io::Read>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
+| 3 | Summary: <alloc::io::buf_read::BufRead>::lines; Argument[self]; ReturnValue; taint |
+| 4 | Summary: <alloc::io::buf_read::BufRead>::read_line; Argument[self].Reference; Argument[0].Reference; taint |
+| 5 | Summary: <alloc::io::buf_read::BufRead>::read_until; Argument[self].Reference; Argument[1].Reference; taint |
+| 6 | Summary: <alloc::io::buf_read::BufRead>::split; Argument[self]; ReturnValue; taint |
+| 7 | Summary: <alloc::io::buffered::bufreader::BufReader as alloc::io::buf_read::BufRead>::fill_buf; Argument[self].Reference; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 8 | Summary: <alloc::io::buffered::bufreader::BufReader>::buffer; Argument[self].Reference; ReturnValue.Reference; taint |
+| 9 | Summary: <alloc::io::buffered::bufreader::BufReader>::new; Argument[0]; ReturnValue; taint |
+| 10 | Summary: <alloc::io::read::Read>::bytes; Argument[self]; ReturnValue; taint |
+| 11 | Summary: <alloc::io::util::Split as core::iter::traits::iterator::Iterator>::next; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]; value |
+| 12 | Summary: <core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 13 | Summary: <core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 14 | Summary: <core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
+| 15 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 16 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 17 | Summary: <std::io::stdio::Stdin as alloc::io::read::Read>::read; Argument[self].Reference; Argument[0].Reference; taint |
+| 18 | Summary: <std::io::stdio::Stdin as alloc::io::read::Read>::read_exact; Argument[self].Reference; Argument[0].Reference; taint |
+| 19 | Summary: <std::io::stdio::Stdin as alloc::io::read::Read>::read_to_end; Argument[self].Reference; Argument[0].Reference; taint |
+| 20 | Summary: <std::io::stdio::Stdin as alloc::io::read::Read>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
+| 21 | Summary: <std::io::stdio::Stdin>::lock; Argument[self].Reference; ReturnValue; taint |
+| 22 | Summary: <std::io::stdio::StdinLock as alloc::io::read::Read>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
+| 23 | Summary: <tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::fill_buf; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 24 | Summary: <tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::lines; Argument[self]; ReturnValue; taint |
+| 25 | Summary: <tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::read_line; Argument[self].Reference; Argument[0].Reference; taint |
+| 26 | Summary: <tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::read_until; Argument[self].Reference; Argument[1].Reference; taint |
+| 27 | Summary: <tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::split; Argument[self]; ReturnValue; taint |
+| 28 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read; Argument[self].Reference; Argument[0].Reference; taint |
+| 29 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_buf; Argument[self].Reference; Argument[0].Reference; taint |
+| 30 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_exact; Argument[self].Reference; Argument[0].Reference; taint |
+| 31 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_f32; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 32 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_i16; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 33 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_i64_le; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 34 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_to_end; Argument[self].Reference; Argument[0].Reference; taint |
+| 35 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_to_string; Argument[self].Reference; Argument[0].Reference; taint |
+| 36 | Summary: <tokio::io::util::async_read_ext::AsyncReadExt>::read_u8; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
 | 37 | Summary: <tokio::io::util::buf_reader::BufReader>::buffer; Argument[self].Reference; ReturnValue.Reference; taint |
 | 38 | Summary: <tokio::io::util::buf_reader::BufReader>::new; Argument[0]; ReturnValue; taint |
 | 39 | Summary: <tokio::io::util::lines::Lines>::next_line; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]; taint |
 | 40 | Summary: <tokio::io::util::split::Split>::next_segment; Argument[self].Reference; ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]; taint |
 edges
-| test.rs:13:22:13:35 | ...::stdin | test.rs:13:22:13:37 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
-| test.rs:13:22:13:37 | ...::stdin(...) | test.rs:13:44:13:54 | [post] &mut buffer [&ref] | provenance | MaD:31 |
+| test.rs:13:22:13:37 | ...::stdin(...) | test.rs:13:22:13:37 | ...::stdin(...) | provenance | Src:MaD:1  |
+| test.rs:13:22:13:37 | ...::stdin(...) | test.rs:13:44:13:54 | [post] &mut buffer [&ref] | provenance | MaD:17 |
 | test.rs:13:44:13:54 | [post] &mut buffer [&ref] | test.rs:13:49:13:54 | [post] buffer | provenance |  |
 | test.rs:13:49:13:54 | [post] buffer | test.rs:14:15:14:20 | buffer | provenance |  |
 | test.rs:14:15:14:20 | buffer | test.rs:14:14:14:20 | &buffer | provenance |  |
-| test.rs:19:22:19:35 | ...::stdin | test.rs:19:22:19:37 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
-| test.rs:19:22:19:37 | ...::stdin(...) | test.rs:19:51:19:61 | [post] &mut buffer [&ref] | provenance | MaD:33 |
+| test.rs:19:22:19:37 | ...::stdin(...) | test.rs:19:22:19:37 | ...::stdin(...) | provenance | Src:MaD:1  |
+| test.rs:19:22:19:37 | ...::stdin(...) | test.rs:19:51:19:61 | [post] &mut buffer [&ref] | provenance | MaD:19 |
 | test.rs:19:51:19:61 | [post] &mut buffer [&ref] | test.rs:19:56:19:61 | [post] buffer | provenance |  |
 | test.rs:19:56:19:61 | [post] buffer | test.rs:20:15:20:20 | buffer | provenance |  |
 | test.rs:20:15:20:20 | buffer | test.rs:20:14:20:20 | &buffer | provenance |  |
-| test.rs:25:22:25:35 | ...::stdin | test.rs:25:22:25:37 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
-| test.rs:25:22:25:37 | ...::stdin(...) | test.rs:25:54:25:64 | [post] &mut buffer [&ref] | provenance | MaD:34 |
+| test.rs:25:22:25:37 | ...::stdin(...) | test.rs:25:22:25:37 | ...::stdin(...) | provenance | Src:MaD:1  |
+| test.rs:25:22:25:37 | ...::stdin(...) | test.rs:25:54:25:64 | [post] &mut buffer [&ref] | provenance | MaD:20 |
 | test.rs:25:54:25:64 | [post] &mut buffer [&ref] | test.rs:25:59:25:64 | [post] buffer | provenance |  |
 | test.rs:25:59:25:64 | [post] buffer | test.rs:26:15:26:20 | buffer | provenance |  |
 | test.rs:26:15:26:20 | buffer | test.rs:26:14:26:20 | &buffer | provenance |  |
-| test.rs:31:22:31:35 | ...::stdin | test.rs:31:22:31:37 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
-| test.rs:31:22:31:37 | ...::stdin(...) | test.rs:31:22:31:44 | ... .lock() | provenance | MaD:35 |
-| test.rs:31:22:31:44 | ... .lock() | test.rs:31:61:31:71 | [post] &mut buffer [&ref] | provenance | MaD:36 |
+| test.rs:31:22:31:37 | ...::stdin(...) | test.rs:31:22:31:37 | ...::stdin(...) | provenance | Src:MaD:1  |
+| test.rs:31:22:31:37 | ...::stdin(...) | test.rs:31:22:31:44 | ... .lock() | provenance | MaD:21 |
+| test.rs:31:22:31:44 | ... .lock() | test.rs:31:61:31:71 | [post] &mut buffer [&ref] | provenance | MaD:22 |
 | test.rs:31:61:31:71 | [post] &mut buffer [&ref] | test.rs:31:66:31:71 | [post] buffer | provenance |  |
 | test.rs:31:66:31:71 | [post] buffer | test.rs:32:15:32:20 | buffer | provenance |  |
 | test.rs:32:15:32:20 | buffer | test.rs:32:14:32:20 | &buffer | provenance |  |
-| test.rs:37:9:37:22 | ...::stdin | test.rs:37:9:37:24 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
-| test.rs:37:9:37:24 | ...::stdin(...) | test.rs:37:37:37:47 | [post] &mut buffer [&ref] | provenance | MaD:32 |
+| test.rs:37:9:37:24 | ...::stdin(...) | test.rs:37:9:37:24 | ...::stdin(...) | provenance | Src:MaD:1  |
+| test.rs:37:9:37:24 | ...::stdin(...) | test.rs:37:37:37:47 | [post] &mut buffer [&ref] | provenance | MaD:18 |
 | test.rs:37:37:37:47 | [post] &mut buffer [&ref] | test.rs:37:42:37:47 | [post] buffer | provenance |  |
 | test.rs:37:42:37:47 | [post] buffer | test.rs:38:15:38:20 | buffer | provenance |  |
 | test.rs:38:15:38:20 | buffer | test.rs:38:14:38:20 | &buffer | provenance |  |
-| test.rs:41:17:41:30 | ...::stdin | test.rs:41:17:41:32 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
+| test.rs:41:17:41:32 | ...::stdin(...) | test.rs:41:17:41:32 | ...::stdin(...) | provenance | Src:MaD:1  |
 | test.rs:41:17:41:32 | ...::stdin(...) | test.rs:41:17:41:40 | ... .bytes() | provenance | MaD:10 |
 | test.rs:41:17:41:40 | ... .bytes() | test.rs:42:14:42:17 | byte | provenance |  |
 | test.rs:48:13:48:22 | mut reader | test.rs:49:20:49:25 | reader | provenance |  |
 | test.rs:48:26:48:66 | ...::new(...) | test.rs:48:13:48:22 | mut reader | provenance |  |
-| test.rs:48:50:48:63 | ...::stdin | test.rs:48:50:48:65 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
-| test.rs:48:50:48:65 | ...::stdin(...) | test.rs:48:26:48:66 | ...::new(...) | provenance | MaD:30 |
+| test.rs:48:50:48:65 | ...::stdin(...) | test.rs:48:26:48:66 | ...::new(...) | provenance | MaD:9 |
+| test.rs:48:50:48:65 | ...::stdin(...) | test.rs:48:50:48:65 | ...::stdin(...) | provenance | Src:MaD:1  |
 | test.rs:49:13:49:16 | data | test.rs:50:15:50:18 | data | provenance |  |
-| test.rs:49:20:49:25 | reader | test.rs:49:20:49:36 | reader.fill_buf() [Ok] | provenance | MaD:28 |
+| test.rs:49:20:49:25 | reader | test.rs:49:20:49:36 | reader.fill_buf() [Ok] | provenance | MaD:7 |
 | test.rs:49:20:49:36 | reader.fill_buf() [Ok] | test.rs:49:20:49:37 | TryExpr | provenance |  |
 | test.rs:49:20:49:37 | TryExpr | test.rs:49:13:49:16 | data | provenance |  |
 | test.rs:50:15:50:18 | data | test.rs:50:14:50:18 | &data | provenance |  |
 | test.rs:54:13:54:18 | reader | test.rs:55:20:55:25 | reader | provenance |  |
 | test.rs:54:22:54:62 | ...::new(...) | test.rs:54:13:54:18 | reader | provenance |  |
-| test.rs:54:46:54:59 | ...::stdin | test.rs:54:46:54:61 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
-| test.rs:54:46:54:61 | ...::stdin(...) | test.rs:54:22:54:62 | ...::new(...) | provenance | MaD:30 |
+| test.rs:54:46:54:61 | ...::stdin(...) | test.rs:54:22:54:62 | ...::new(...) | provenance | MaD:9 |
+| test.rs:54:46:54:61 | ...::stdin(...) | test.rs:54:46:54:61 | ...::stdin(...) | provenance | Src:MaD:1  |
 | test.rs:55:13:55:16 | data [&ref] | test.rs:56:15:56:18 | data [&ref] | provenance |  |
-| test.rs:55:20:55:25 | reader | test.rs:55:20:55:34 | reader.buffer() [&ref] | provenance | MaD:29 |
+| test.rs:55:20:55:25 | reader | test.rs:55:20:55:34 | reader.buffer() [&ref] | provenance | MaD:8 |
 | test.rs:55:20:55:34 | reader.buffer() [&ref] | test.rs:55:13:55:16 | data [&ref] | provenance |  |
 | test.rs:56:15:56:18 | data [&ref] | test.rs:56:14:56:18 | &data | provenance |  |
 | test.rs:61:13:61:22 | mut reader | test.rs:62:9:62:14 | reader | provenance |  |
 | test.rs:61:26:61:66 | ...::new(...) | test.rs:61:13:61:22 | mut reader | provenance |  |
-| test.rs:61:50:61:63 | ...::stdin | test.rs:61:50:61:65 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
-| test.rs:61:50:61:65 | ...::stdin(...) | test.rs:61:26:61:66 | ...::new(...) | provenance | MaD:30 |
-| test.rs:62:9:62:14 | reader | test.rs:62:26:62:36 | [post] &mut buffer [&ref] | provenance | MaD:7 |
+| test.rs:61:50:61:65 | ...::stdin(...) | test.rs:61:26:61:66 | ...::new(...) | provenance | MaD:9 |
+| test.rs:61:50:61:65 | ...::stdin(...) | test.rs:61:50:61:65 | ...::stdin(...) | provenance | Src:MaD:1  |
+| test.rs:62:9:62:14 | reader | test.rs:62:26:62:36 | [post] &mut buffer [&ref] | provenance | MaD:4 |
 | test.rs:62:26:62:36 | [post] &mut buffer [&ref] | test.rs:62:31:62:36 | [post] buffer | provenance |  |
 | test.rs:62:31:62:36 | [post] buffer | test.rs:63:15:63:20 | buffer | provenance |  |
 | test.rs:63:15:63:20 | buffer | test.rs:63:14:63:20 | &buffer | provenance |  |
 | test.rs:68:13:68:22 | mut reader | test.rs:69:9:69:14 | reader | provenance |  |
 | test.rs:68:26:68:66 | ...::new(...) | test.rs:68:13:68:22 | mut reader | provenance |  |
-| test.rs:68:50:68:63 | ...::stdin | test.rs:68:50:68:65 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
-| test.rs:68:50:68:65 | ...::stdin(...) | test.rs:68:26:68:66 | ...::new(...) | provenance | MaD:30 |
-| test.rs:69:9:69:14 | reader | test.rs:69:33:69:43 | [post] &mut buffer [&ref] | provenance | MaD:8 |
+| test.rs:68:50:68:65 | ...::stdin(...) | test.rs:68:26:68:66 | ...::new(...) | provenance | MaD:9 |
+| test.rs:68:50:68:65 | ...::stdin(...) | test.rs:68:50:68:65 | ...::stdin(...) | provenance | Src:MaD:1  |
+| test.rs:69:9:69:14 | reader | test.rs:69:33:69:43 | [post] &mut buffer [&ref] | provenance | MaD:5 |
 | test.rs:69:33:69:43 | [post] &mut buffer [&ref] | test.rs:69:38:69:43 | [post] buffer | provenance |  |
 | test.rs:69:38:69:43 | [post] buffer | test.rs:70:15:70:20 | buffer | provenance |  |
 | test.rs:69:38:69:43 | [post] buffer | test.rs:71:14:71:19 | buffer | provenance |  |
 | test.rs:70:15:70:20 | buffer | test.rs:70:14:70:20 | &buffer | provenance |  |
-| test.rs:71:14:71:19 | buffer | test.rs:71:14:71:22 | buffer[0] | provenance | MaD:5 |
+| test.rs:71:14:71:19 | buffer | test.rs:71:14:71:22 | buffer[0] | provenance | MaD:14 |
 | test.rs:75:13:75:28 | mut reader_split | test.rs:76:14:76:25 | reader_split | provenance |  |
 | test.rs:75:13:75:28 | mut reader_split | test.rs:77:33:77:44 | reader_split | provenance |  |
-| test.rs:75:32:75:72 | ...::new(...) | test.rs:75:32:75:84 | ... .split(...) | provenance | MaD:9 |
+| test.rs:75:32:75:72 | ...::new(...) | test.rs:75:32:75:84 | ... .split(...) | provenance | MaD:6 |
 | test.rs:75:32:75:84 | ... .split(...) | test.rs:75:13:75:28 | mut reader_split | provenance |  |
-| test.rs:75:56:75:69 | ...::stdin | test.rs:75:56:75:71 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
-| test.rs:75:56:75:71 | ...::stdin(...) | test.rs:75:32:75:72 | ...::new(...) | provenance | MaD:30 |
-| test.rs:76:14:76:25 | reader_split | test.rs:76:14:76:32 | reader_split.next() [Some, Ok] | provenance | MaD:27 |
-| test.rs:76:14:76:32 | reader_split.next() [Some, Ok] | test.rs:76:14:76:41 | ... .unwrap() [Ok] | provenance | MaD:25 |
-| test.rs:76:14:76:41 | ... .unwrap() [Ok] | test.rs:76:14:76:50 | ... .unwrap() | provenance | MaD:26 |
+| test.rs:75:56:75:71 | ...::stdin(...) | test.rs:75:32:75:72 | ...::new(...) | provenance | MaD:9 |
+| test.rs:75:56:75:71 | ...::stdin(...) | test.rs:75:56:75:71 | ...::stdin(...) | provenance | Src:MaD:1  |
+| test.rs:76:14:76:25 | reader_split | test.rs:76:14:76:32 | reader_split.next() [Some, Ok] | provenance | MaD:11 |
+| test.rs:76:14:76:32 | reader_split.next() [Some, Ok] | test.rs:76:14:76:41 | ... .unwrap() [Ok] | provenance | MaD:15 |
+| test.rs:76:14:76:41 | ... .unwrap() [Ok] | test.rs:76:14:76:50 | ... .unwrap() | provenance | MaD:16 |
 | test.rs:77:19:77:29 | Some(...) [Some, Ok] | test.rs:77:24:77:28 | chunk [Ok] | provenance |  |
 | test.rs:77:24:77:28 | chunk [Ok] | test.rs:78:18:78:22 | chunk [Ok] | provenance |  |
-| test.rs:77:33:77:44 | reader_split | test.rs:77:33:77:51 | reader_split.next() [Some, Ok] | provenance | MaD:27 |
+| test.rs:77:33:77:44 | reader_split | test.rs:77:33:77:51 | reader_split.next() [Some, Ok] | provenance | MaD:11 |
 | test.rs:77:33:77:51 | reader_split.next() [Some, Ok] | test.rs:77:19:77:29 | Some(...) [Some, Ok] | provenance |  |
-| test.rs:78:18:78:22 | chunk [Ok] | test.rs:78:18:78:31 | chunk.unwrap() | provenance | MaD:26 |
+| test.rs:78:18:78:22 | chunk [Ok] | test.rs:78:18:78:31 | chunk.unwrap() | provenance | MaD:16 |
 | test.rs:83:13:83:18 | reader | test.rs:84:21:84:26 | reader | provenance |  |
 | test.rs:83:22:83:62 | ...::new(...) | test.rs:83:13:83:18 | reader | provenance |  |
-| test.rs:83:46:83:59 | ...::stdin | test.rs:83:46:83:61 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
-| test.rs:83:46:83:61 | ...::stdin(...) | test.rs:83:22:83:62 | ...::new(...) | provenance | MaD:30 |
-| test.rs:84:21:84:26 | reader | test.rs:84:21:84:34 | reader.lines() | provenance | MaD:6 |
+| test.rs:83:46:83:61 | ...::stdin(...) | test.rs:83:22:83:62 | ...::new(...) | provenance | MaD:9 |
+| test.rs:83:46:83:61 | ...::stdin(...) | test.rs:83:46:83:61 | ...::stdin(...) | provenance | Src:MaD:1  |
+| test.rs:84:21:84:26 | reader | test.rs:84:21:84:34 | reader.lines() | provenance | MaD:3 |
 | test.rs:84:21:84:34 | reader.lines() | test.rs:85:18:85:21 | line | provenance |  |
 | test.rs:90:13:90:18 | reader | test.rs:91:20:91:25 | reader | provenance |  |
 | test.rs:90:22:90:62 | ...::new(...) | test.rs:90:13:90:18 | reader | provenance |  |
-| test.rs:90:46:90:59 | ...::stdin | test.rs:90:46:90:61 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
-| test.rs:90:46:90:61 | ...::stdin(...) | test.rs:90:22:90:62 | ...::new(...) | provenance | MaD:30 |
+| test.rs:90:46:90:61 | ...::stdin(...) | test.rs:90:22:90:62 | ...::new(...) | provenance | MaD:9 |
+| test.rs:90:46:90:61 | ...::stdin(...) | test.rs:90:46:90:61 | ...::stdin(...) | provenance | Src:MaD:1  |
 | test.rs:91:13:91:16 | line | test.rs:92:14:92:17 | line | provenance |  |
-| test.rs:91:20:91:25 | reader | test.rs:91:20:91:33 | reader.lines() | provenance | MaD:6 |
-| test.rs:91:20:91:33 | reader.lines() | test.rs:91:20:91:40 | ... .nth(...) [Some] | provenance | MaD:4 |
-| test.rs:91:20:91:40 | ... .nth(...) [Some] | test.rs:91:20:91:49 | ... .unwrap() | provenance | MaD:25 |
+| test.rs:91:20:91:25 | reader | test.rs:91:20:91:33 | reader.lines() | provenance | MaD:3 |
+| test.rs:91:20:91:33 | reader.lines() | test.rs:91:20:91:40 | ... .nth(...) [Some] | provenance | MaD:13 |
+| test.rs:91:20:91:40 | ... .nth(...) [Some] | test.rs:91:20:91:49 | ... .unwrap() | provenance | MaD:15 |
 | test.rs:91:20:91:49 | ... .unwrap() | test.rs:91:13:91:16 | line | provenance |  |
-| test.rs:92:14:92:17 | line | test.rs:92:14:92:26 | line.unwrap() | provenance | MaD:26 |
-| test.rs:92:14:92:26 | line.unwrap() | test.rs:92:14:92:34 | ... .clone() | provenance | MaD:3 |
+| test.rs:92:14:92:17 | line | test.rs:92:14:92:26 | line.unwrap() | provenance | MaD:16 |
+| test.rs:92:14:92:26 | line.unwrap() | test.rs:92:14:92:34 | ... .clone() | provenance | MaD:12 |
 | test.rs:109:13:109:21 | mut stdin | test.rs:111:22:111:26 | stdin | provenance |  |
-| test.rs:109:25:109:40 | ...::stdin | test.rs:109:25:109:42 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
-| test.rs:109:25:109:42 | ...::stdin(...) | test.rs:109:13:109:21 | mut stdin | provenance |  |
-| test.rs:111:22:111:26 | stdin | test.rs:111:33:111:43 | [post] &mut buffer [&ref] | provenance | MaD:16 |
+| test.rs:109:25:109:42 | ...::stdin(...) | test.rs:109:13:109:21 | mut stdin | provenance | Src:MaD:2  |
+| test.rs:111:22:111:26 | stdin | test.rs:111:33:111:43 | [post] &mut buffer [&ref] | provenance | MaD:28 |
 | test.rs:111:33:111:43 | [post] &mut buffer [&ref] | test.rs:111:38:111:43 | [post] buffer | provenance |  |
 | test.rs:111:38:111:43 | [post] buffer | test.rs:112:15:112:20 | buffer | provenance |  |
 | test.rs:112:15:112:20 | buffer | test.rs:112:14:112:20 | &buffer | provenance |  |
 | test.rs:116:13:116:21 | mut stdin | test.rs:118:22:118:26 | stdin | provenance |  |
-| test.rs:116:25:116:40 | ...::stdin | test.rs:116:25:116:42 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
-| test.rs:116:25:116:42 | ...::stdin(...) | test.rs:116:13:116:21 | mut stdin | provenance |  |
-| test.rs:118:22:118:26 | stdin | test.rs:118:40:118:50 | [post] &mut buffer [&ref] | provenance | MaD:22 |
+| test.rs:116:25:116:42 | ...::stdin(...) | test.rs:116:13:116:21 | mut stdin | provenance | Src:MaD:2  |
+| test.rs:118:22:118:26 | stdin | test.rs:118:40:118:50 | [post] &mut buffer [&ref] | provenance | MaD:34 |
 | test.rs:118:40:118:50 | [post] &mut buffer [&ref] | test.rs:118:45:118:50 | [post] buffer | provenance |  |
 | test.rs:118:45:118:50 | [post] buffer | test.rs:119:15:119:20 | buffer | provenance |  |
 | test.rs:119:15:119:20 | buffer | test.rs:119:14:119:20 | &buffer | provenance |  |
 | test.rs:123:13:123:21 | mut stdin | test.rs:125:22:125:26 | stdin | provenance |  |
-| test.rs:123:25:123:40 | ...::stdin | test.rs:123:25:123:42 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
-| test.rs:123:25:123:42 | ...::stdin(...) | test.rs:123:13:123:21 | mut stdin | provenance |  |
-| test.rs:125:22:125:26 | stdin | test.rs:125:43:125:53 | [post] &mut buffer [&ref] | provenance | MaD:23 |
+| test.rs:123:25:123:42 | ...::stdin(...) | test.rs:123:13:123:21 | mut stdin | provenance | Src:MaD:2  |
+| test.rs:125:22:125:26 | stdin | test.rs:125:43:125:53 | [post] &mut buffer [&ref] | provenance | MaD:35 |
 | test.rs:125:43:125:53 | [post] &mut buffer [&ref] | test.rs:125:48:125:53 | [post] buffer | provenance |  |
 | test.rs:125:48:125:53 | [post] buffer | test.rs:126:15:126:20 | buffer | provenance |  |
 | test.rs:126:15:126:20 | buffer | test.rs:126:14:126:20 | &buffer | provenance |  |
 | test.rs:130:13:130:21 | mut stdin | test.rs:132:9:132:13 | stdin | provenance |  |
-| test.rs:130:25:130:40 | ...::stdin | test.rs:130:25:130:42 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
-| test.rs:130:25:130:42 | ...::stdin(...) | test.rs:130:13:130:21 | mut stdin | provenance |  |
-| test.rs:132:9:132:13 | stdin | test.rs:132:26:132:36 | [post] &mut buffer [&ref] | provenance | MaD:18 |
+| test.rs:130:25:130:42 | ...::stdin(...) | test.rs:130:13:130:21 | mut stdin | provenance | Src:MaD:2  |
+| test.rs:132:9:132:13 | stdin | test.rs:132:26:132:36 | [post] &mut buffer [&ref] | provenance | MaD:30 |
 | test.rs:132:26:132:36 | [post] &mut buffer [&ref] | test.rs:132:31:132:36 | [post] buffer | provenance |  |
 | test.rs:132:31:132:36 | [post] buffer | test.rs:133:15:133:20 | buffer | provenance |  |
 | test.rs:133:15:133:20 | buffer | test.rs:133:14:133:20 | &buffer | provenance |  |
@@ -167,81 +163,79 @@ edges
 | test.rs:137:13:137:21 | mut stdin | test.rs:139:18:139:22 | stdin | provenance |  |
 | test.rs:137:13:137:21 | mut stdin | test.rs:140:18:140:22 | stdin | provenance |  |
 | test.rs:137:13:137:21 | mut stdin | test.rs:141:18:141:22 | stdin | provenance |  |
-| test.rs:137:25:137:40 | ...::stdin | test.rs:137:25:137:42 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
-| test.rs:137:25:137:42 | ...::stdin(...) | test.rs:137:13:137:21 | mut stdin | provenance |  |
+| test.rs:137:25:137:42 | ...::stdin(...) | test.rs:137:13:137:21 | mut stdin | provenance | Src:MaD:2  |
 | test.rs:138:13:138:14 | v1 | test.rs:142:14:142:15 | v1 | provenance |  |
-| test.rs:138:18:138:22 | stdin | test.rs:138:18:138:32 | stdin.read_u8() [future, Ok] | provenance | MaD:24 |
+| test.rs:138:18:138:22 | stdin | test.rs:138:18:138:32 | stdin.read_u8() [future, Ok] | provenance | MaD:36 |
 | test.rs:138:18:138:32 | stdin.read_u8() [future, Ok] | test.rs:138:18:138:38 | await ... [Ok] | provenance |  |
 | test.rs:138:18:138:38 | await ... [Ok] | test.rs:138:18:138:39 | TryExpr | provenance |  |
 | test.rs:138:18:138:39 | TryExpr | test.rs:138:13:138:14 | v1 | provenance |  |
 | test.rs:139:13:139:14 | v2 | test.rs:143:14:143:15 | v2 | provenance |  |
-| test.rs:139:18:139:22 | stdin | test.rs:139:18:139:33 | stdin.read_i16() [future, Ok] | provenance | MaD:20 |
+| test.rs:139:18:139:22 | stdin | test.rs:139:18:139:33 | stdin.read_i16() [future, Ok] | provenance | MaD:32 |
 | test.rs:139:18:139:33 | stdin.read_i16() [future, Ok] | test.rs:139:18:139:39 | await ... [Ok] | provenance |  |
 | test.rs:139:18:139:39 | await ... [Ok] | test.rs:139:18:139:40 | TryExpr | provenance |  |
 | test.rs:139:18:139:40 | TryExpr | test.rs:139:13:139:14 | v2 | provenance |  |
 | test.rs:140:13:140:14 | v3 | test.rs:144:14:144:15 | v3 | provenance |  |
-| test.rs:140:18:140:22 | stdin | test.rs:140:18:140:33 | stdin.read_f32() [future, Ok] | provenance | MaD:19 |
+| test.rs:140:18:140:22 | stdin | test.rs:140:18:140:33 | stdin.read_f32() [future, Ok] | provenance | MaD:31 |
 | test.rs:140:18:140:33 | stdin.read_f32() [future, Ok] | test.rs:140:18:140:39 | await ... [Ok] | provenance |  |
 | test.rs:140:18:140:39 | await ... [Ok] | test.rs:140:18:140:40 | TryExpr | provenance |  |
 | test.rs:140:18:140:40 | TryExpr | test.rs:140:13:140:14 | v3 | provenance |  |
 | test.rs:141:13:141:14 | v4 | test.rs:145:14:145:15 | v4 | provenance |  |
-| test.rs:141:18:141:22 | stdin | test.rs:141:18:141:36 | stdin.read_i64_le() [future, Ok] | provenance | MaD:21 |
+| test.rs:141:18:141:22 | stdin | test.rs:141:18:141:36 | stdin.read_i64_le() [future, Ok] | provenance | MaD:33 |
 | test.rs:141:18:141:36 | stdin.read_i64_le() [future, Ok] | test.rs:141:18:141:42 | await ... [Ok] | provenance |  |
 | test.rs:141:18:141:42 | await ... [Ok] | test.rs:141:18:141:43 | TryExpr | provenance |  |
 | test.rs:141:18:141:43 | TryExpr | test.rs:141:13:141:14 | v4 | provenance |  |
 | test.rs:149:13:149:21 | mut stdin | test.rs:151:9:151:13 | stdin | provenance |  |
-| test.rs:149:25:149:40 | ...::stdin | test.rs:149:25:149:42 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
-| test.rs:149:25:149:42 | ...::stdin(...) | test.rs:149:13:149:21 | mut stdin | provenance |  |
-| test.rs:151:9:151:13 | stdin | test.rs:151:24:151:34 | [post] &mut buffer [&ref] | provenance | MaD:17 |
+| test.rs:149:25:149:42 | ...::stdin(...) | test.rs:149:13:149:21 | mut stdin | provenance | Src:MaD:2  |
+| test.rs:151:9:151:13 | stdin | test.rs:151:24:151:34 | [post] &mut buffer [&ref] | provenance | MaD:29 |
 | test.rs:151:24:151:34 | [post] &mut buffer [&ref] | test.rs:151:29:151:34 | [post] buffer | provenance |  |
 | test.rs:151:29:151:34 | [post] buffer | test.rs:152:15:152:20 | buffer | provenance |  |
 | test.rs:152:15:152:20 | buffer | test.rs:152:14:152:20 | &buffer | provenance |  |
 | test.rs:158:13:158:22 | mut reader | test.rs:159:20:159:25 | reader | provenance |  |
 | test.rs:158:26:158:70 | ...::new(...) | test.rs:158:13:158:22 | mut reader | provenance |  |
-| test.rs:158:52:158:67 | ...::stdin | test.rs:158:52:158:69 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
 | test.rs:158:52:158:69 | ...::stdin(...) | test.rs:158:26:158:70 | ...::new(...) | provenance | MaD:38 |
+| test.rs:158:52:158:69 | ...::stdin(...) | test.rs:158:52:158:69 | ...::stdin(...) | provenance | Src:MaD:2  |
 | test.rs:159:13:159:16 | data | test.rs:160:15:160:18 | data | provenance |  |
-| test.rs:159:20:159:25 | reader | test.rs:159:20:159:36 | reader.fill_buf() [future, Ok] | provenance | MaD:11 |
+| test.rs:159:20:159:25 | reader | test.rs:159:20:159:36 | reader.fill_buf() [future, Ok] | provenance | MaD:23 |
 | test.rs:159:20:159:36 | reader.fill_buf() [future, Ok] | test.rs:159:20:159:42 | await ... [Ok] | provenance |  |
 | test.rs:159:20:159:42 | await ... [Ok] | test.rs:159:20:159:43 | TryExpr | provenance |  |
 | test.rs:159:20:159:43 | TryExpr | test.rs:159:13:159:16 | data | provenance |  |
 | test.rs:160:15:160:18 | data | test.rs:160:14:160:18 | &data | provenance |  |
 | test.rs:164:13:164:18 | reader | test.rs:165:20:165:25 | reader | provenance |  |
 | test.rs:164:22:164:66 | ...::new(...) | test.rs:164:13:164:18 | reader | provenance |  |
-| test.rs:164:48:164:63 | ...::stdin | test.rs:164:48:164:65 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
 | test.rs:164:48:164:65 | ...::stdin(...) | test.rs:164:22:164:66 | ...::new(...) | provenance | MaD:38 |
+| test.rs:164:48:164:65 | ...::stdin(...) | test.rs:164:48:164:65 | ...::stdin(...) | provenance | Src:MaD:2  |
 | test.rs:165:13:165:16 | data [&ref] | test.rs:166:15:166:18 | data [&ref] | provenance |  |
 | test.rs:165:20:165:25 | reader | test.rs:165:20:165:34 | reader.buffer() [&ref] | provenance | MaD:37 |
 | test.rs:165:20:165:34 | reader.buffer() [&ref] | test.rs:165:13:165:16 | data [&ref] | provenance |  |
 | test.rs:166:15:166:18 | data [&ref] | test.rs:166:14:166:18 | &data | provenance |  |
 | test.rs:171:13:171:22 | mut reader | test.rs:172:9:172:14 | reader | provenance |  |
 | test.rs:171:26:171:70 | ...::new(...) | test.rs:171:13:171:22 | mut reader | provenance |  |
-| test.rs:171:52:171:67 | ...::stdin | test.rs:171:52:171:69 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
 | test.rs:171:52:171:69 | ...::stdin(...) | test.rs:171:26:171:70 | ...::new(...) | provenance | MaD:38 |
-| test.rs:172:9:172:14 | reader | test.rs:172:26:172:36 | [post] &mut buffer [&ref] | provenance | MaD:13 |
+| test.rs:171:52:171:69 | ...::stdin(...) | test.rs:171:52:171:69 | ...::stdin(...) | provenance | Src:MaD:2  |
+| test.rs:172:9:172:14 | reader | test.rs:172:26:172:36 | [post] &mut buffer [&ref] | provenance | MaD:25 |
 | test.rs:172:26:172:36 | [post] &mut buffer [&ref] | test.rs:172:31:172:36 | [post] buffer | provenance |  |
 | test.rs:172:31:172:36 | [post] buffer | test.rs:173:15:173:20 | buffer | provenance |  |
 | test.rs:173:15:173:20 | buffer | test.rs:173:14:173:20 | &buffer | provenance |  |
 | test.rs:178:13:178:22 | mut reader | test.rs:179:9:179:14 | reader | provenance |  |
 | test.rs:178:26:178:70 | ...::new(...) | test.rs:178:13:178:22 | mut reader | provenance |  |
-| test.rs:178:52:178:67 | ...::stdin | test.rs:178:52:178:69 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
 | test.rs:178:52:178:69 | ...::stdin(...) | test.rs:178:26:178:70 | ...::new(...) | provenance | MaD:38 |
-| test.rs:179:9:179:14 | reader | test.rs:179:33:179:43 | [post] &mut buffer [&ref] | provenance | MaD:14 |
+| test.rs:178:52:178:69 | ...::stdin(...) | test.rs:178:52:178:69 | ...::stdin(...) | provenance | Src:MaD:2  |
+| test.rs:179:9:179:14 | reader | test.rs:179:33:179:43 | [post] &mut buffer [&ref] | provenance | MaD:26 |
 | test.rs:179:33:179:43 | [post] &mut buffer [&ref] | test.rs:179:38:179:43 | [post] buffer | provenance |  |
 | test.rs:179:38:179:43 | [post] buffer | test.rs:180:15:180:20 | buffer | provenance |  |
 | test.rs:179:38:179:43 | [post] buffer | test.rs:181:14:181:19 | buffer | provenance |  |
 | test.rs:180:15:180:20 | buffer | test.rs:180:14:180:20 | &buffer | provenance |  |
-| test.rs:181:14:181:19 | buffer | test.rs:181:14:181:22 | buffer[0] | provenance | MaD:5 |
+| test.rs:181:14:181:19 | buffer | test.rs:181:14:181:22 | buffer[0] | provenance | MaD:14 |
 | test.rs:185:13:185:28 | mut reader_split | test.rs:186:14:186:25 | reader_split | provenance |  |
 | test.rs:185:13:185:28 | mut reader_split | test.rs:187:33:187:44 | reader_split | provenance |  |
-| test.rs:185:32:185:76 | ...::new(...) | test.rs:185:32:185:88 | ... .split(...) | provenance | MaD:15 |
+| test.rs:185:32:185:76 | ...::new(...) | test.rs:185:32:185:88 | ... .split(...) | provenance | MaD:27 |
 | test.rs:185:32:185:88 | ... .split(...) | test.rs:185:13:185:28 | mut reader_split | provenance |  |
-| test.rs:185:58:185:73 | ...::stdin | test.rs:185:58:185:75 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
 | test.rs:185:58:185:75 | ...::stdin(...) | test.rs:185:32:185:76 | ...::new(...) | provenance | MaD:38 |
+| test.rs:185:58:185:75 | ...::stdin(...) | test.rs:185:58:185:75 | ...::stdin(...) | provenance | Src:MaD:2  |
 | test.rs:186:14:186:25 | reader_split | test.rs:186:14:186:40 | reader_split.next_segment() [future, Ok, Some] | provenance | MaD:40 |
 | test.rs:186:14:186:40 | reader_split.next_segment() [future, Ok, Some] | test.rs:186:14:186:46 | await ... [Ok, Some] | provenance |  |
 | test.rs:186:14:186:46 | await ... [Ok, Some] | test.rs:186:14:186:47 | TryExpr [Some] | provenance |  |
-| test.rs:186:14:186:47 | TryExpr [Some] | test.rs:186:14:186:56 | ... .unwrap() | provenance | MaD:25 |
+| test.rs:186:14:186:47 | TryExpr [Some] | test.rs:186:14:186:56 | ... .unwrap() | provenance | MaD:15 |
 | test.rs:187:19:187:29 | Some(...) [Some] | test.rs:187:24:187:28 | chunk | provenance |  |
 | test.rs:187:24:187:28 | chunk | test.rs:188:18:188:22 | chunk | provenance |  |
 | test.rs:187:33:187:44 | reader_split | test.rs:187:33:187:59 | reader_split.next_segment() [future, Ok, Some] | provenance | MaD:40 |
@@ -250,16 +244,16 @@ edges
 | test.rs:187:33:187:66 | TryExpr [Some] | test.rs:187:19:187:29 | Some(...) [Some] | provenance |  |
 | test.rs:193:13:193:18 | reader | test.rs:194:25:194:30 | reader | provenance |  |
 | test.rs:193:22:193:66 | ...::new(...) | test.rs:193:13:193:18 | reader | provenance |  |
-| test.rs:193:48:193:63 | ...::stdin | test.rs:193:48:193:65 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
 | test.rs:193:48:193:65 | ...::stdin(...) | test.rs:193:22:193:66 | ...::new(...) | provenance | MaD:38 |
+| test.rs:193:48:193:65 | ...::stdin(...) | test.rs:193:48:193:65 | ...::stdin(...) | provenance | Src:MaD:2  |
 | test.rs:194:13:194:21 | mut lines | test.rs:195:14:195:18 | lines | provenance |  |
 | test.rs:194:13:194:21 | mut lines | test.rs:196:32:196:36 | lines | provenance |  |
-| test.rs:194:25:194:30 | reader | test.rs:194:25:194:38 | reader.lines() | provenance | MaD:12 |
+| test.rs:194:25:194:30 | reader | test.rs:194:25:194:38 | reader.lines() | provenance | MaD:24 |
 | test.rs:194:25:194:38 | reader.lines() | test.rs:194:13:194:21 | mut lines | provenance |  |
 | test.rs:195:14:195:18 | lines | test.rs:195:14:195:30 | lines.next_line() [future, Ok, Some] | provenance | MaD:39 |
 | test.rs:195:14:195:30 | lines.next_line() [future, Ok, Some] | test.rs:195:14:195:36 | await ... [Ok, Some] | provenance |  |
 | test.rs:195:14:195:36 | await ... [Ok, Some] | test.rs:195:14:195:37 | TryExpr [Some] | provenance |  |
-| test.rs:195:14:195:37 | TryExpr [Some] | test.rs:195:14:195:46 | ... .unwrap() | provenance | MaD:25 |
+| test.rs:195:14:195:37 | TryExpr [Some] | test.rs:195:14:195:46 | ... .unwrap() | provenance | MaD:15 |
 | test.rs:196:19:196:28 | Some(...) [Some] | test.rs:196:24:196:27 | line | provenance |  |
 | test.rs:196:24:196:27 | line | test.rs:197:18:197:21 | line | provenance |  |
 | test.rs:196:32:196:36 | lines | test.rs:196:32:196:48 | lines.next_line() [future, Ok, Some] | provenance | MaD:39 |
@@ -267,44 +261,44 @@ edges
 | test.rs:196:32:196:54 | await ... [Ok, Some] | test.rs:196:32:196:55 | TryExpr [Some] | provenance |  |
 | test.rs:196:32:196:55 | TryExpr [Some] | test.rs:196:19:196:28 | Some(...) [Some] | provenance |  |
 nodes
-| test.rs:13:22:13:35 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:13:22:13:37 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:13:22:13:37 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:13:44:13:54 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
 | test.rs:13:49:13:54 | [post] buffer | semmle.label | [post] buffer |
 | test.rs:14:14:14:20 | &buffer | semmle.label | &buffer |
 | test.rs:14:15:14:20 | buffer | semmle.label | buffer |
-| test.rs:19:22:19:35 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:19:22:19:37 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:19:22:19:37 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:19:51:19:61 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
 | test.rs:19:56:19:61 | [post] buffer | semmle.label | [post] buffer |
 | test.rs:20:14:20:20 | &buffer | semmle.label | &buffer |
 | test.rs:20:15:20:20 | buffer | semmle.label | buffer |
-| test.rs:25:22:25:35 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:25:22:25:37 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:25:22:25:37 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:25:54:25:64 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
 | test.rs:25:59:25:64 | [post] buffer | semmle.label | [post] buffer |
 | test.rs:26:14:26:20 | &buffer | semmle.label | &buffer |
 | test.rs:26:15:26:20 | buffer | semmle.label | buffer |
-| test.rs:31:22:31:35 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:31:22:31:37 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:31:22:31:37 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:31:22:31:44 | ... .lock() | semmle.label | ... .lock() |
 | test.rs:31:61:31:71 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
 | test.rs:31:66:31:71 | [post] buffer | semmle.label | [post] buffer |
 | test.rs:32:14:32:20 | &buffer | semmle.label | &buffer |
 | test.rs:32:15:32:20 | buffer | semmle.label | buffer |
-| test.rs:37:9:37:22 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:37:9:37:24 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:37:9:37:24 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:37:37:37:47 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
 | test.rs:37:42:37:47 | [post] buffer | semmle.label | [post] buffer |
 | test.rs:38:14:38:20 | &buffer | semmle.label | &buffer |
 | test.rs:38:15:38:20 | buffer | semmle.label | buffer |
-| test.rs:41:17:41:30 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:41:17:41:32 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:41:17:41:32 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:41:17:41:40 | ... .bytes() | semmle.label | ... .bytes() |
 | test.rs:42:14:42:17 | byte | semmle.label | byte |
 | test.rs:48:13:48:22 | mut reader | semmle.label | mut reader |
 | test.rs:48:26:48:66 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:48:50:48:63 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:48:50:48:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:48:50:48:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:49:13:49:16 | data | semmle.label | data |
 | test.rs:49:20:49:25 | reader | semmle.label | reader |
@@ -314,7 +308,7 @@ nodes
 | test.rs:50:15:50:18 | data | semmle.label | data |
 | test.rs:54:13:54:18 | reader | semmle.label | reader |
 | test.rs:54:22:54:62 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:54:46:54:59 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:54:46:54:61 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:54:46:54:61 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:55:13:55:16 | data [&ref] | semmle.label | data [&ref] |
 | test.rs:55:20:55:25 | reader | semmle.label | reader |
@@ -323,7 +317,7 @@ nodes
 | test.rs:56:15:56:18 | data [&ref] | semmle.label | data [&ref] |
 | test.rs:61:13:61:22 | mut reader | semmle.label | mut reader |
 | test.rs:61:26:61:66 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:61:50:61:63 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:61:50:61:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:61:50:61:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:62:9:62:14 | reader | semmle.label | reader |
 | test.rs:62:26:62:36 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
@@ -332,7 +326,7 @@ nodes
 | test.rs:63:15:63:20 | buffer | semmle.label | buffer |
 | test.rs:68:13:68:22 | mut reader | semmle.label | mut reader |
 | test.rs:68:26:68:66 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:68:50:68:63 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:68:50:68:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:68:50:68:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:69:9:69:14 | reader | semmle.label | reader |
 | test.rs:69:33:69:43 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
@@ -344,7 +338,7 @@ nodes
 | test.rs:75:13:75:28 | mut reader_split | semmle.label | mut reader_split |
 | test.rs:75:32:75:72 | ...::new(...) | semmle.label | ...::new(...) |
 | test.rs:75:32:75:84 | ... .split(...) | semmle.label | ... .split(...) |
-| test.rs:75:56:75:69 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:75:56:75:71 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:75:56:75:71 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:76:14:76:25 | reader_split | semmle.label | reader_split |
 | test.rs:76:14:76:32 | reader_split.next() [Some, Ok] | semmle.label | reader_split.next() [Some, Ok] |
@@ -358,14 +352,14 @@ nodes
 | test.rs:78:18:78:31 | chunk.unwrap() | semmle.label | chunk.unwrap() |
 | test.rs:83:13:83:18 | reader | semmle.label | reader |
 | test.rs:83:22:83:62 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:83:46:83:59 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:83:46:83:61 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:83:46:83:61 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:84:21:84:26 | reader | semmle.label | reader |
 | test.rs:84:21:84:34 | reader.lines() | semmle.label | reader.lines() |
 | test.rs:85:18:85:21 | line | semmle.label | line |
 | test.rs:90:13:90:18 | reader | semmle.label | reader |
 | test.rs:90:22:90:62 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:90:46:90:59 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:90:46:90:61 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:90:46:90:61 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:91:13:91:16 | line | semmle.label | line |
 | test.rs:91:20:91:25 | reader | semmle.label | reader |
@@ -376,7 +370,6 @@ nodes
 | test.rs:92:14:92:26 | line.unwrap() | semmle.label | line.unwrap() |
 | test.rs:92:14:92:34 | ... .clone() | semmle.label | ... .clone() |
 | test.rs:109:13:109:21 | mut stdin | semmle.label | mut stdin |
-| test.rs:109:25:109:40 | ...::stdin | semmle.label | ...::stdin |
 | test.rs:109:25:109:42 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:111:22:111:26 | stdin | semmle.label | stdin |
 | test.rs:111:33:111:43 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
@@ -384,7 +377,6 @@ nodes
 | test.rs:112:14:112:20 | &buffer | semmle.label | &buffer |
 | test.rs:112:15:112:20 | buffer | semmle.label | buffer |
 | test.rs:116:13:116:21 | mut stdin | semmle.label | mut stdin |
-| test.rs:116:25:116:40 | ...::stdin | semmle.label | ...::stdin |
 | test.rs:116:25:116:42 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:118:22:118:26 | stdin | semmle.label | stdin |
 | test.rs:118:40:118:50 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
@@ -392,7 +384,6 @@ nodes
 | test.rs:119:14:119:20 | &buffer | semmle.label | &buffer |
 | test.rs:119:15:119:20 | buffer | semmle.label | buffer |
 | test.rs:123:13:123:21 | mut stdin | semmle.label | mut stdin |
-| test.rs:123:25:123:40 | ...::stdin | semmle.label | ...::stdin |
 | test.rs:123:25:123:42 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:125:22:125:26 | stdin | semmle.label | stdin |
 | test.rs:125:43:125:53 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
@@ -400,7 +391,6 @@ nodes
 | test.rs:126:14:126:20 | &buffer | semmle.label | &buffer |
 | test.rs:126:15:126:20 | buffer | semmle.label | buffer |
 | test.rs:130:13:130:21 | mut stdin | semmle.label | mut stdin |
-| test.rs:130:25:130:40 | ...::stdin | semmle.label | ...::stdin |
 | test.rs:130:25:130:42 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:132:9:132:13 | stdin | semmle.label | stdin |
 | test.rs:132:26:132:36 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
@@ -408,7 +398,6 @@ nodes
 | test.rs:133:14:133:20 | &buffer | semmle.label | &buffer |
 | test.rs:133:15:133:20 | buffer | semmle.label | buffer |
 | test.rs:137:13:137:21 | mut stdin | semmle.label | mut stdin |
-| test.rs:137:25:137:40 | ...::stdin | semmle.label | ...::stdin |
 | test.rs:137:25:137:42 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:138:13:138:14 | v1 | semmle.label | v1 |
 | test.rs:138:18:138:22 | stdin | semmle.label | stdin |
@@ -435,7 +424,6 @@ nodes
 | test.rs:144:14:144:15 | v3 | semmle.label | v3 |
 | test.rs:145:14:145:15 | v4 | semmle.label | v4 |
 | test.rs:149:13:149:21 | mut stdin | semmle.label | mut stdin |
-| test.rs:149:25:149:40 | ...::stdin | semmle.label | ...::stdin |
 | test.rs:149:25:149:42 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:151:9:151:13 | stdin | semmle.label | stdin |
 | test.rs:151:24:151:34 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
@@ -444,7 +432,7 @@ nodes
 | test.rs:152:15:152:20 | buffer | semmle.label | buffer |
 | test.rs:158:13:158:22 | mut reader | semmle.label | mut reader |
 | test.rs:158:26:158:70 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:158:52:158:67 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:158:52:158:69 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:158:52:158:69 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:159:13:159:16 | data | semmle.label | data |
 | test.rs:159:20:159:25 | reader | semmle.label | reader |
@@ -455,7 +443,7 @@ nodes
 | test.rs:160:15:160:18 | data | semmle.label | data |
 | test.rs:164:13:164:18 | reader | semmle.label | reader |
 | test.rs:164:22:164:66 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:164:48:164:63 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:164:48:164:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:164:48:164:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:165:13:165:16 | data [&ref] | semmle.label | data [&ref] |
 | test.rs:165:20:165:25 | reader | semmle.label | reader |
@@ -464,7 +452,7 @@ nodes
 | test.rs:166:15:166:18 | data [&ref] | semmle.label | data [&ref] |
 | test.rs:171:13:171:22 | mut reader | semmle.label | mut reader |
 | test.rs:171:26:171:70 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:171:52:171:67 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:171:52:171:69 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:171:52:171:69 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:172:9:172:14 | reader | semmle.label | reader |
 | test.rs:172:26:172:36 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
@@ -473,7 +461,7 @@ nodes
 | test.rs:173:15:173:20 | buffer | semmle.label | buffer |
 | test.rs:178:13:178:22 | mut reader | semmle.label | mut reader |
 | test.rs:178:26:178:70 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:178:52:178:67 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:178:52:178:69 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:178:52:178:69 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:179:9:179:14 | reader | semmle.label | reader |
 | test.rs:179:33:179:43 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
@@ -485,7 +473,7 @@ nodes
 | test.rs:185:13:185:28 | mut reader_split | semmle.label | mut reader_split |
 | test.rs:185:32:185:76 | ...::new(...) | semmle.label | ...::new(...) |
 | test.rs:185:32:185:88 | ... .split(...) | semmle.label | ... .split(...) |
-| test.rs:185:58:185:73 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:185:58:185:75 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:185:58:185:75 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:186:14:186:25 | reader_split | semmle.label | reader_split |
 | test.rs:186:14:186:40 | reader_split.next_segment() [future, Ok, Some] | semmle.label | reader_split.next_segment() [future, Ok, Some] |
@@ -501,7 +489,7 @@ nodes
 | test.rs:188:18:188:22 | chunk | semmle.label | chunk |
 | test.rs:193:13:193:18 | reader | semmle.label | reader |
 | test.rs:193:22:193:66 | ...::new(...) | semmle.label | ...::new(...) |
-| test.rs:193:48:193:63 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:193:48:193:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:193:48:193:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | test.rs:194:13:194:21 | mut lines | semmle.label | mut lines |
 | test.rs:194:25:194:30 | reader | semmle.label | reader |
@@ -521,36 +509,36 @@ nodes
 subpaths
 testFailures
 #select
-| test.rs:14:14:14:20 | &buffer | test.rs:13:22:13:35 | ...::stdin | test.rs:14:14:14:20 | &buffer | $@ | test.rs:13:22:13:35 | ...::stdin | ...::stdin |
-| test.rs:20:14:20:20 | &buffer | test.rs:19:22:19:35 | ...::stdin | test.rs:20:14:20:20 | &buffer | $@ | test.rs:19:22:19:35 | ...::stdin | ...::stdin |
-| test.rs:26:14:26:20 | &buffer | test.rs:25:22:25:35 | ...::stdin | test.rs:26:14:26:20 | &buffer | $@ | test.rs:25:22:25:35 | ...::stdin | ...::stdin |
-| test.rs:32:14:32:20 | &buffer | test.rs:31:22:31:35 | ...::stdin | test.rs:32:14:32:20 | &buffer | $@ | test.rs:31:22:31:35 | ...::stdin | ...::stdin |
-| test.rs:38:14:38:20 | &buffer | test.rs:37:9:37:22 | ...::stdin | test.rs:38:14:38:20 | &buffer | $@ | test.rs:37:9:37:22 | ...::stdin | ...::stdin |
-| test.rs:42:14:42:17 | byte | test.rs:41:17:41:30 | ...::stdin | test.rs:42:14:42:17 | byte | $@ | test.rs:41:17:41:30 | ...::stdin | ...::stdin |
-| test.rs:50:14:50:18 | &data | test.rs:48:50:48:63 | ...::stdin | test.rs:50:14:50:18 | &data | $@ | test.rs:48:50:48:63 | ...::stdin | ...::stdin |
-| test.rs:56:14:56:18 | &data | test.rs:54:46:54:59 | ...::stdin | test.rs:56:14:56:18 | &data | $@ | test.rs:54:46:54:59 | ...::stdin | ...::stdin |
-| test.rs:63:14:63:20 | &buffer | test.rs:61:50:61:63 | ...::stdin | test.rs:63:14:63:20 | &buffer | $@ | test.rs:61:50:61:63 | ...::stdin | ...::stdin |
-| test.rs:70:14:70:20 | &buffer | test.rs:68:50:68:63 | ...::stdin | test.rs:70:14:70:20 | &buffer | $@ | test.rs:68:50:68:63 | ...::stdin | ...::stdin |
-| test.rs:71:14:71:22 | buffer[0] | test.rs:68:50:68:63 | ...::stdin | test.rs:71:14:71:22 | buffer[0] | $@ | test.rs:68:50:68:63 | ...::stdin | ...::stdin |
-| test.rs:76:14:76:50 | ... .unwrap() | test.rs:75:56:75:69 | ...::stdin | test.rs:76:14:76:50 | ... .unwrap() | $@ | test.rs:75:56:75:69 | ...::stdin | ...::stdin |
-| test.rs:78:18:78:31 | chunk.unwrap() | test.rs:75:56:75:69 | ...::stdin | test.rs:78:18:78:31 | chunk.unwrap() | $@ | test.rs:75:56:75:69 | ...::stdin | ...::stdin |
-| test.rs:85:18:85:21 | line | test.rs:83:46:83:59 | ...::stdin | test.rs:85:18:85:21 | line | $@ | test.rs:83:46:83:59 | ...::stdin | ...::stdin |
-| test.rs:92:14:92:34 | ... .clone() | test.rs:90:46:90:59 | ...::stdin | test.rs:92:14:92:34 | ... .clone() | $@ | test.rs:90:46:90:59 | ...::stdin | ...::stdin |
-| test.rs:112:14:112:20 | &buffer | test.rs:109:25:109:40 | ...::stdin | test.rs:112:14:112:20 | &buffer | $@ | test.rs:109:25:109:40 | ...::stdin | ...::stdin |
-| test.rs:119:14:119:20 | &buffer | test.rs:116:25:116:40 | ...::stdin | test.rs:119:14:119:20 | &buffer | $@ | test.rs:116:25:116:40 | ...::stdin | ...::stdin |
-| test.rs:126:14:126:20 | &buffer | test.rs:123:25:123:40 | ...::stdin | test.rs:126:14:126:20 | &buffer | $@ | test.rs:123:25:123:40 | ...::stdin | ...::stdin |
-| test.rs:133:14:133:20 | &buffer | test.rs:130:25:130:40 | ...::stdin | test.rs:133:14:133:20 | &buffer | $@ | test.rs:130:25:130:40 | ...::stdin | ...::stdin |
-| test.rs:142:14:142:15 | v1 | test.rs:137:25:137:40 | ...::stdin | test.rs:142:14:142:15 | v1 | $@ | test.rs:137:25:137:40 | ...::stdin | ...::stdin |
-| test.rs:143:14:143:15 | v2 | test.rs:137:25:137:40 | ...::stdin | test.rs:143:14:143:15 | v2 | $@ | test.rs:137:25:137:40 | ...::stdin | ...::stdin |
-| test.rs:144:14:144:15 | v3 | test.rs:137:25:137:40 | ...::stdin | test.rs:144:14:144:15 | v3 | $@ | test.rs:137:25:137:40 | ...::stdin | ...::stdin |
-| test.rs:145:14:145:15 | v4 | test.rs:137:25:137:40 | ...::stdin | test.rs:145:14:145:15 | v4 | $@ | test.rs:137:25:137:40 | ...::stdin | ...::stdin |
-| test.rs:152:14:152:20 | &buffer | test.rs:149:25:149:40 | ...::stdin | test.rs:152:14:152:20 | &buffer | $@ | test.rs:149:25:149:40 | ...::stdin | ...::stdin |
-| test.rs:160:14:160:18 | &data | test.rs:158:52:158:67 | ...::stdin | test.rs:160:14:160:18 | &data | $@ | test.rs:158:52:158:67 | ...::stdin | ...::stdin |
-| test.rs:166:14:166:18 | &data | test.rs:164:48:164:63 | ...::stdin | test.rs:166:14:166:18 | &data | $@ | test.rs:164:48:164:63 | ...::stdin | ...::stdin |
-| test.rs:173:14:173:20 | &buffer | test.rs:171:52:171:67 | ...::stdin | test.rs:173:14:173:20 | &buffer | $@ | test.rs:171:52:171:67 | ...::stdin | ...::stdin |
-| test.rs:180:14:180:20 | &buffer | test.rs:178:52:178:67 | ...::stdin | test.rs:180:14:180:20 | &buffer | $@ | test.rs:178:52:178:67 | ...::stdin | ...::stdin |
-| test.rs:181:14:181:22 | buffer[0] | test.rs:178:52:178:67 | ...::stdin | test.rs:181:14:181:22 | buffer[0] | $@ | test.rs:178:52:178:67 | ...::stdin | ...::stdin |
-| test.rs:186:14:186:56 | ... .unwrap() | test.rs:185:58:185:73 | ...::stdin | test.rs:186:14:186:56 | ... .unwrap() | $@ | test.rs:185:58:185:73 | ...::stdin | ...::stdin |
-| test.rs:188:18:188:22 | chunk | test.rs:185:58:185:73 | ...::stdin | test.rs:188:18:188:22 | chunk | $@ | test.rs:185:58:185:73 | ...::stdin | ...::stdin |
-| test.rs:195:14:195:46 | ... .unwrap() | test.rs:193:48:193:63 | ...::stdin | test.rs:195:14:195:46 | ... .unwrap() | $@ | test.rs:193:48:193:63 | ...::stdin | ...::stdin |
-| test.rs:197:18:197:21 | line | test.rs:193:48:193:63 | ...::stdin | test.rs:197:18:197:21 | line | $@ | test.rs:193:48:193:63 | ...::stdin | ...::stdin |
+| test.rs:14:14:14:20 | &buffer | test.rs:13:22:13:37 | ...::stdin(...) | test.rs:14:14:14:20 | &buffer | $@ | test.rs:13:22:13:37 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:20:14:20:20 | &buffer | test.rs:19:22:19:37 | ...::stdin(...) | test.rs:20:14:20:20 | &buffer | $@ | test.rs:19:22:19:37 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:26:14:26:20 | &buffer | test.rs:25:22:25:37 | ...::stdin(...) | test.rs:26:14:26:20 | &buffer | $@ | test.rs:25:22:25:37 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:32:14:32:20 | &buffer | test.rs:31:22:31:37 | ...::stdin(...) | test.rs:32:14:32:20 | &buffer | $@ | test.rs:31:22:31:37 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:38:14:38:20 | &buffer | test.rs:37:9:37:24 | ...::stdin(...) | test.rs:38:14:38:20 | &buffer | $@ | test.rs:37:9:37:24 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:42:14:42:17 | byte | test.rs:41:17:41:32 | ...::stdin(...) | test.rs:42:14:42:17 | byte | $@ | test.rs:41:17:41:32 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:50:14:50:18 | &data | test.rs:48:50:48:65 | ...::stdin(...) | test.rs:50:14:50:18 | &data | $@ | test.rs:48:50:48:65 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:56:14:56:18 | &data | test.rs:54:46:54:61 | ...::stdin(...) | test.rs:56:14:56:18 | &data | $@ | test.rs:54:46:54:61 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:63:14:63:20 | &buffer | test.rs:61:50:61:65 | ...::stdin(...) | test.rs:63:14:63:20 | &buffer | $@ | test.rs:61:50:61:65 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:70:14:70:20 | &buffer | test.rs:68:50:68:65 | ...::stdin(...) | test.rs:70:14:70:20 | &buffer | $@ | test.rs:68:50:68:65 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:71:14:71:22 | buffer[0] | test.rs:68:50:68:65 | ...::stdin(...) | test.rs:71:14:71:22 | buffer[0] | $@ | test.rs:68:50:68:65 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:76:14:76:50 | ... .unwrap() | test.rs:75:56:75:71 | ...::stdin(...) | test.rs:76:14:76:50 | ... .unwrap() | $@ | test.rs:75:56:75:71 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:78:18:78:31 | chunk.unwrap() | test.rs:75:56:75:71 | ...::stdin(...) | test.rs:78:18:78:31 | chunk.unwrap() | $@ | test.rs:75:56:75:71 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:85:18:85:21 | line | test.rs:83:46:83:61 | ...::stdin(...) | test.rs:85:18:85:21 | line | $@ | test.rs:83:46:83:61 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:92:14:92:34 | ... .clone() | test.rs:90:46:90:61 | ...::stdin(...) | test.rs:92:14:92:34 | ... .clone() | $@ | test.rs:90:46:90:61 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:112:14:112:20 | &buffer | test.rs:109:25:109:42 | ...::stdin(...) | test.rs:112:14:112:20 | &buffer | $@ | test.rs:109:25:109:42 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:119:14:119:20 | &buffer | test.rs:116:25:116:42 | ...::stdin(...) | test.rs:119:14:119:20 | &buffer | $@ | test.rs:116:25:116:42 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:126:14:126:20 | &buffer | test.rs:123:25:123:42 | ...::stdin(...) | test.rs:126:14:126:20 | &buffer | $@ | test.rs:123:25:123:42 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:133:14:133:20 | &buffer | test.rs:130:25:130:42 | ...::stdin(...) | test.rs:133:14:133:20 | &buffer | $@ | test.rs:130:25:130:42 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:142:14:142:15 | v1 | test.rs:137:25:137:42 | ...::stdin(...) | test.rs:142:14:142:15 | v1 | $@ | test.rs:137:25:137:42 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:143:14:143:15 | v2 | test.rs:137:25:137:42 | ...::stdin(...) | test.rs:143:14:143:15 | v2 | $@ | test.rs:137:25:137:42 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:144:14:144:15 | v3 | test.rs:137:25:137:42 | ...::stdin(...) | test.rs:144:14:144:15 | v3 | $@ | test.rs:137:25:137:42 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:145:14:145:15 | v4 | test.rs:137:25:137:42 | ...::stdin(...) | test.rs:145:14:145:15 | v4 | $@ | test.rs:137:25:137:42 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:152:14:152:20 | &buffer | test.rs:149:25:149:42 | ...::stdin(...) | test.rs:152:14:152:20 | &buffer | $@ | test.rs:149:25:149:42 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:160:14:160:18 | &data | test.rs:158:52:158:69 | ...::stdin(...) | test.rs:160:14:160:18 | &data | $@ | test.rs:158:52:158:69 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:166:14:166:18 | &data | test.rs:164:48:164:65 | ...::stdin(...) | test.rs:166:14:166:18 | &data | $@ | test.rs:164:48:164:65 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:173:14:173:20 | &buffer | test.rs:171:52:171:69 | ...::stdin(...) | test.rs:173:14:173:20 | &buffer | $@ | test.rs:171:52:171:69 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:180:14:180:20 | &buffer | test.rs:178:52:178:69 | ...::stdin(...) | test.rs:180:14:180:20 | &buffer | $@ | test.rs:178:52:178:69 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:181:14:181:22 | buffer[0] | test.rs:178:52:178:69 | ...::stdin(...) | test.rs:181:14:181:22 | buffer[0] | $@ | test.rs:178:52:178:69 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:186:14:186:56 | ... .unwrap() | test.rs:185:58:185:75 | ...::stdin(...) | test.rs:186:14:186:56 | ... .unwrap() | $@ | test.rs:185:58:185:75 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:188:18:188:22 | chunk | test.rs:185:58:185:75 | ...::stdin(...) | test.rs:188:18:188:22 | chunk | $@ | test.rs:185:58:185:75 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:195:14:195:46 | ... .unwrap() | test.rs:193:48:193:65 | ...::stdin(...) | test.rs:195:14:195:46 | ... .unwrap() | $@ | test.rs:193:48:193:65 | ...::stdin(...) | ...::stdin(...) |
+| test.rs:197:18:197:21 | line | test.rs:193:48:193:65 | ...::stdin(...) | test.rs:197:18:197:21 | line | $@ | test.rs:193:48:193:65 | ...::stdin(...) | ...::stdin(...) |
diff --git a/rust/ql/test/library-tests/dataflow/sources/stdin/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/stdin/TaintSources.expected
index 085237733145..aeca83904a13 100644
--- a/rust/ql/test/library-tests/dataflow/sources/stdin/TaintSources.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/stdin/TaintSources.expected
@@ -1,26 +1,26 @@
-| test.rs:13:22:13:35 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:19:22:19:35 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:25:22:25:35 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:31:22:31:35 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:37:9:37:22 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:41:17:41:30 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:48:50:48:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:54:46:54:59 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:61:50:61:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:68:50:68:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:75:56:75:69 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:83:46:83:59 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:90:46:90:59 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:96:46:96:59 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:109:25:109:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:116:25:116:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:123:25:123:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:130:25:130:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:137:25:137:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:149:25:149:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:158:52:158:67 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:164:48:164:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:171:52:171:67 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:178:52:178:67 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:185:58:185:73 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:193:48:193:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:13:22:13:37 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:19:22:19:37 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:25:22:25:37 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:31:22:31:37 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:37:9:37:24 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:41:17:41:32 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:48:50:48:65 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:54:46:54:61 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:61:50:61:65 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:68:50:68:65 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:75:56:75:71 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:83:46:83:61 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:90:46:90:61 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:96:46:96:61 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:109:25:109:42 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:116:25:116:42 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:123:25:123:42 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:130:25:130:42 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:137:25:137:42 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:149:25:149:42 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:158:52:158:69 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:164:48:164:65 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:171:52:171:69 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:178:52:178:69 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:185:58:185:75 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:193:48:193:65 | ...::stdin(...) | Flow source 'StdInSource' of type stdin (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/CONSISTENCY/TypeInferenceConsistency.expected b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/CONSISTENCY/TypeInferenceConsistency.expected
deleted file mode 100644
index f1bdb2cddbd6..000000000000
--- a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/CONSISTENCY/TypeInferenceConsistency.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-nonUniqueCertainType
-| test.rs:131:30:131:39 | ...::get(...) |  |
-| test.rs:132:34:132:43 | ...::get(...) |  |
-| test.rs:133:30:133:39 | ...::get(...) |  |
diff --git a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/InlineFlow.expected b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/InlineFlow.expected
index d3c65fac62ff..a32c200ed7fd 100644
--- a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/InlineFlow.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/InlineFlow.expected
@@ -1,11 +1,11 @@
 models
-| 1 | Source: <_ as warp::filter::Filter>::and_then; Argument[0].Parameter[0..7]; remote |
-| 2 | Source: <_ as warp::filter::Filter>::map; Argument[0].Parameter[0..7]; remote |
-| 3 | Source: <_ as warp::filter::Filter>::then; Argument[0].Parameter[0..7]; remote |
-| 4 | Source: <actix_web::resource::Resource>::to; Argument[0].Parameter[0..7]; remote |
-| 5 | Source: <actix_web::route::Route>::to; Argument[0].Parameter[0..7]; remote |
-| 6 | Source: <axum::routing::method_routing::MethodRouter>::get; Argument[0].Parameter[0..7]; remote |
-| 7 | Source: <axum::routing::method_routing::MethodRouter>::on; Argument[1].Parameter[0..7]; remote |
+| 1 | Source: <actix_web::resource::Resource>::to; Argument[0].Parameter[0..7]; remote |
+| 2 | Source: <actix_web::route::Route>::to; Argument[0].Parameter[0..7]; remote |
+| 3 | Source: <axum::routing::method_routing::MethodRouter>::get; Argument[0].Parameter[0..7]; remote |
+| 4 | Source: <axum::routing::method_routing::MethodRouter>::on; Argument[1].Parameter[0..7]; remote |
+| 5 | Source: <warp::filter::Filter>::and_then; Argument[0].Parameter[0..7]; remote |
+| 6 | Source: <warp::filter::Filter>::map; Argument[0].Parameter[0..7]; remote |
+| 7 | Source: <warp::filter::Filter>::then; Argument[0].Parameter[0..7]; remote |
 | 8 | Source: axum::routing::method_routing::get; Argument[0].Parameter[0..7]; remote |
 | 9 | Source: axum::routing::method_routing::post; Argument[0].Parameter[0..7]; remote |
 | 10 | Source: axum::routing::method_routing::put; Argument[0].Parameter[0..7]; remote |
@@ -39,40 +39,42 @@ edges
 | test.rs:107:22:107:25 | path | test.rs:107:22:107:38 | path.into_inner() | provenance | MaD:11 |
 | test.rs:107:22:107:38 | path.into_inner() | test.rs:107:13:107:18 | TuplePat | provenance |  |
 | test.rs:115:33:115:65 | ...: ...::Query::<...> | test.rs:116:14:116:14 | a | provenance |  |
-| test.rs:121:5:121:20 | to | test.rs:122:33:122:55 | ...: ...::Path::<...> | provenance | Src:MaD:4  |
-| test.rs:122:33:122:55 | ...: ...::Path::<...> | test.rs:123:17:123:20 | path | provenance |  |
-| test.rs:123:13:123:13 | a | test.rs:124:14:124:14 | a | provenance |  |
-| test.rs:123:17:123:20 | path | test.rs:123:17:123:33 | path.into_inner() | provenance | MaD:11 |
-| test.rs:123:17:123:33 | path.into_inner() | test.rs:123:13:123:13 | a | provenance |  |
-| test.rs:131:41:131:42 | to | test.rs:97:33:97:55 | ...: ...::Path::<...> | provenance | Src:MaD:5  |
-| test.rs:132:45:132:46 | to | test.rs:106:33:106:65 | ...: ...::Path::<...> | provenance | Src:MaD:5  |
-| test.rs:133:41:133:42 | to | test.rs:115:33:115:65 | ...: ...::Query::<...> | provenance | Src:MaD:5  |
-| test.rs:147:32:147:52 | ...: Path::<...> | test.rs:148:14:148:14 | a | provenance |  |
-| test.rs:147:32:147:52 | ...: Path::<...> | test.rs:149:14:149:14 | a | provenance |  |
-| test.rs:147:32:147:52 | ...: Path::<...> | test.rs:150:14:150:14 | a | provenance |  |
-| test.rs:148:14:148:14 | a | test.rs:148:14:148:23 | a.as_str() | provenance | MaD:13 |
-| test.rs:149:14:149:14 | a | test.rs:149:14:149:25 | a.as_bytes() | provenance | MaD:12 |
-| test.rs:155:32:155:67 | ...: Path::<...> | test.rs:156:14:156:14 | a | provenance |  |
-| test.rs:155:32:155:67 | ...: Path::<...> | test.rs:157:14:157:14 | b | provenance |  |
-| test.rs:162:32:162:76 | ...: Query::<...> | test.rs:164:18:164:20 | key | provenance |  |
-| test.rs:162:32:162:76 | ...: Query::<...> | test.rs:165:18:165:22 | value | provenance |  |
-| test.rs:179:32:179:69 | ...: Json::<...> | test.rs:181:14:181:20 | payload | provenance |  |
-| test.rs:186:32:186:43 | ...: String | test.rs:187:14:187:17 | body | provenance |  |
-| test.rs:192:32:192:43 | ...: String | test.rs:193:14:193:17 | body | provenance |  |
-| test.rs:200:30:200:32 | get | test.rs:147:32:147:52 | ...: Path::<...> | provenance | Src:MaD:8  |
-| test.rs:201:34:201:37 | post | test.rs:155:32:155:67 | ...: Path::<...> | provenance | Src:MaD:9  |
-| test.rs:202:29:202:31 | put | test.rs:162:32:162:76 | ...: Query::<...> | provenance | Src:MaD:10  |
-| test.rs:205:40:205:41 | on | test.rs:179:32:179:69 | ...: Json::<...> | provenance | Src:MaD:7  |
-| test.rs:207:29:207:31 | get | test.rs:186:32:186:43 | ...: String | provenance | Src:MaD:8  |
-| test.rs:207:52:207:54 | get | test.rs:192:32:192:43 | ...: String | provenance | Src:MaD:6  |
-| test.rs:222:33:222:35 | map | test.rs:222:38:222:46 | ...: String | provenance | Src:MaD:2  |
-| test.rs:222:38:222:46 | ...: String | test.rs:224:18:224:18 | a | provenance |  |
-| test.rs:230:46:230:49 | then | test.rs:231:25:231:33 | ...: String | provenance | Src:MaD:3  |
-| test.rs:231:25:231:33 | ...: String | test.rs:232:22:232:22 | a | provenance |  |
-| test.rs:239:50:239:57 | and_then | test.rs:240:26:240:32 | ...: u64 | provenance | Src:MaD:1  |
-| test.rs:240:26:240:32 | ...: u64 | test.rs:243:22:243:23 | id | provenance |  |
-| test.rs:252:75:252:77 | map | test.rs:253:15:253:23 | ...: String | provenance | Src:MaD:2  |
-| test.rs:253:15:253:23 | ...: String | test.rs:255:22:255:22 | a | provenance |  |
+| test.rs:123:14:123:31 | my_actix_handler_4 | test.rs:123:33:123:55 | ...: ...::Path::<...> | provenance | Src:MaD:1  |
+| test.rs:123:33:123:55 | ...: ...::Path::<...> | test.rs:124:17:124:20 | path | provenance |  |
+| test.rs:124:13:124:13 | a | test.rs:125:14:125:14 | a | provenance |  |
+| test.rs:124:17:124:20 | path | test.rs:124:17:124:33 | path.into_inner() | provenance | MaD:11 |
+| test.rs:124:17:124:33 | path.into_inner() | test.rs:124:13:124:13 | a | provenance |  |
+| test.rs:132:44:132:61 | my_actix_handler_1 | test.rs:97:33:97:55 | ...: ...::Path::<...> | provenance | Src:MaD:2  |
+| test.rs:133:48:133:65 | my_actix_handler_2 | test.rs:106:33:106:65 | ...: ...::Path::<...> | provenance | Src:MaD:2  |
+| test.rs:134:44:134:61 | my_actix_handler_3 | test.rs:115:33:115:65 | ...: ...::Query::<...> | provenance | Src:MaD:2  |
+| test.rs:148:32:148:52 | ...: Path::<...> | test.rs:149:14:149:14 | a | provenance |  |
+| test.rs:148:32:148:52 | ...: Path::<...> | test.rs:150:14:150:14 | a | provenance |  |
+| test.rs:148:32:148:52 | ...: Path::<...> | test.rs:151:14:151:14 | a | provenance |  |
+| test.rs:149:14:149:14 | a | test.rs:149:14:149:23 | a.as_str() | provenance | MaD:13 |
+| test.rs:150:14:150:14 | a | test.rs:150:14:150:25 | a.as_bytes() | provenance | MaD:12 |
+| test.rs:156:32:156:67 | ...: Path::<...> | test.rs:157:14:157:14 | a | provenance |  |
+| test.rs:156:32:156:67 | ...: Path::<...> | test.rs:158:14:158:14 | b | provenance |  |
+| test.rs:163:32:163:76 | ...: Query::<...> | test.rs:165:18:165:20 | key | provenance |  |
+| test.rs:163:32:163:76 | ...: Query::<...> | test.rs:166:18:166:22 | value | provenance |  |
+| test.rs:180:32:180:69 | ...: Json::<...> | test.rs:182:14:182:20 | payload | provenance |  |
+| test.rs:187:32:187:43 | ...: String | test.rs:188:14:188:17 | body | provenance |  |
+| test.rs:193:32:193:43 | ...: String | test.rs:194:14:194:17 | body | provenance |  |
+| test.rs:199:50:199:61 | ...: String | test.rs:201:14:201:17 | body | provenance |  |
+| test.rs:208:34:208:50 | my_axum_handler_1 | test.rs:148:32:148:52 | ...: Path::<...> | provenance | Src:MaD:8  |
+| test.rs:209:39:209:55 | my_axum_handler_2 | test.rs:156:32:156:67 | ...: Path::<...> | provenance | Src:MaD:9  |
+| test.rs:210:33:210:49 | my_axum_handler_3 | test.rs:163:32:163:76 | ...: Query::<...> | provenance | Src:MaD:10  |
+| test.rs:213:65:213:81 | my_axum_handler_5 | test.rs:180:32:180:69 | ...: Json::<...> | provenance | Src:MaD:4  |
+| test.rs:215:33:215:49 | my_axum_handler_6 | test.rs:187:32:187:43 | ...: String | provenance | Src:MaD:8  |
+| test.rs:215:56:215:72 | my_axum_handler_7 | test.rs:193:32:193:43 | ...: String | provenance | Src:MaD:3  |
+| test.rs:216:33:216:49 | my_axum_handler_8 | test.rs:199:50:199:61 | ...: String | provenance | Src:MaD:8  |
+| test.rs:231:37:236:9 | \|...\| ... | test.rs:231:38:231:46 | ...: String | provenance | Src:MaD:6  |
+| test.rs:231:38:231:46 | ...: String | test.rs:233:18:233:18 | a | provenance |  |
+| test.rs:240:13:244:13 | \|...\| ... | test.rs:240:25:240:33 | ...: String | provenance | Src:MaD:7  |
+| test.rs:240:25:240:33 | ...: String | test.rs:241:22:241:22 | a | provenance |  |
+| test.rs:249:13:257:9 | \|...\| ... | test.rs:249:26:249:32 | ...: u64 | provenance | Src:MaD:5  |
+| test.rs:249:26:249:32 | ...: u64 | test.rs:252:22:252:23 | id | provenance |  |
+| test.rs:262:13:267:14 | \|...\| ... | test.rs:262:15:262:23 | ...: String | provenance | Src:MaD:6  |
+| test.rs:262:15:262:23 | ...: String | test.rs:264:22:264:22 | a | provenance |  |
 nodes
 | test.rs:11:31:11:31 | a | semmle.label | a |
 | test.rs:13:14:13:14 | a | semmle.label | a |
@@ -108,51 +110,54 @@ nodes
 | test.rs:110:14:110:14 | b | semmle.label | b |
 | test.rs:115:33:115:65 | ...: ...::Query::<...> | semmle.label | ...: ...::Query::<...> |
 | test.rs:116:14:116:14 | a | semmle.label | a |
-| test.rs:121:5:121:20 | to | semmle.label | to |
-| test.rs:122:33:122:55 | ...: ...::Path::<...> | semmle.label | ...: ...::Path::<...> |
-| test.rs:123:13:123:13 | a | semmle.label | a |
-| test.rs:123:17:123:20 | path | semmle.label | path |
-| test.rs:123:17:123:33 | path.into_inner() | semmle.label | path.into_inner() |
-| test.rs:124:14:124:14 | a | semmle.label | a |
-| test.rs:131:41:131:42 | to | semmle.label | to |
-| test.rs:132:45:132:46 | to | semmle.label | to |
-| test.rs:133:41:133:42 | to | semmle.label | to |
-| test.rs:147:32:147:52 | ...: Path::<...> | semmle.label | ...: Path::<...> |
-| test.rs:148:14:148:14 | a | semmle.label | a |
-| test.rs:148:14:148:23 | a.as_str() | semmle.label | a.as_str() |
+| test.rs:123:14:123:31 | my_actix_handler_4 | semmle.label | my_actix_handler_4 |
+| test.rs:123:33:123:55 | ...: ...::Path::<...> | semmle.label | ...: ...::Path::<...> |
+| test.rs:124:13:124:13 | a | semmle.label | a |
+| test.rs:124:17:124:20 | path | semmle.label | path |
+| test.rs:124:17:124:33 | path.into_inner() | semmle.label | path.into_inner() |
+| test.rs:125:14:125:14 | a | semmle.label | a |
+| test.rs:132:44:132:61 | my_actix_handler_1 | semmle.label | my_actix_handler_1 |
+| test.rs:133:48:133:65 | my_actix_handler_2 | semmle.label | my_actix_handler_2 |
+| test.rs:134:44:134:61 | my_actix_handler_3 | semmle.label | my_actix_handler_3 |
+| test.rs:148:32:148:52 | ...: Path::<...> | semmle.label | ...: Path::<...> |
 | test.rs:149:14:149:14 | a | semmle.label | a |
-| test.rs:149:14:149:25 | a.as_bytes() | semmle.label | a.as_bytes() |
+| test.rs:149:14:149:23 | a.as_str() | semmle.label | a.as_str() |
 | test.rs:150:14:150:14 | a | semmle.label | a |
-| test.rs:155:32:155:67 | ...: Path::<...> | semmle.label | ...: Path::<...> |
-| test.rs:156:14:156:14 | a | semmle.label | a |
-| test.rs:157:14:157:14 | b | semmle.label | b |
-| test.rs:162:32:162:76 | ...: Query::<...> | semmle.label | ...: Query::<...> |
-| test.rs:164:18:164:20 | key | semmle.label | key |
-| test.rs:165:18:165:22 | value | semmle.label | value |
-| test.rs:179:32:179:69 | ...: Json::<...> | semmle.label | ...: Json::<...> |
-| test.rs:181:14:181:20 | payload | semmle.label | payload |
-| test.rs:186:32:186:43 | ...: String | semmle.label | ...: String |
-| test.rs:187:14:187:17 | body | semmle.label | body |
-| test.rs:192:32:192:43 | ...: String | semmle.label | ...: String |
-| test.rs:193:14:193:17 | body | semmle.label | body |
-| test.rs:200:30:200:32 | get | semmle.label | get |
-| test.rs:201:34:201:37 | post | semmle.label | post |
-| test.rs:202:29:202:31 | put | semmle.label | put |
-| test.rs:205:40:205:41 | on | semmle.label | on |
-| test.rs:207:29:207:31 | get | semmle.label | get |
-| test.rs:207:52:207:54 | get | semmle.label | get |
-| test.rs:222:33:222:35 | map | semmle.label | map |
-| test.rs:222:38:222:46 | ...: String | semmle.label | ...: String |
-| test.rs:224:18:224:18 | a | semmle.label | a |
-| test.rs:230:46:230:49 | then | semmle.label | then |
-| test.rs:231:25:231:33 | ...: String | semmle.label | ...: String |
-| test.rs:232:22:232:22 | a | semmle.label | a |
-| test.rs:239:50:239:57 | and_then | semmle.label | and_then |
-| test.rs:240:26:240:32 | ...: u64 | semmle.label | ...: u64 |
-| test.rs:243:22:243:23 | id | semmle.label | id |
-| test.rs:252:75:252:77 | map | semmle.label | map |
-| test.rs:253:15:253:23 | ...: String | semmle.label | ...: String |
-| test.rs:255:22:255:22 | a | semmle.label | a |
+| test.rs:150:14:150:25 | a.as_bytes() | semmle.label | a.as_bytes() |
+| test.rs:151:14:151:14 | a | semmle.label | a |
+| test.rs:156:32:156:67 | ...: Path::<...> | semmle.label | ...: Path::<...> |
+| test.rs:157:14:157:14 | a | semmle.label | a |
+| test.rs:158:14:158:14 | b | semmle.label | b |
+| test.rs:163:32:163:76 | ...: Query::<...> | semmle.label | ...: Query::<...> |
+| test.rs:165:18:165:20 | key | semmle.label | key |
+| test.rs:166:18:166:22 | value | semmle.label | value |
+| test.rs:180:32:180:69 | ...: Json::<...> | semmle.label | ...: Json::<...> |
+| test.rs:182:14:182:20 | payload | semmle.label | payload |
+| test.rs:187:32:187:43 | ...: String | semmle.label | ...: String |
+| test.rs:188:14:188:17 | body | semmle.label | body |
+| test.rs:193:32:193:43 | ...: String | semmle.label | ...: String |
+| test.rs:194:14:194:17 | body | semmle.label | body |
+| test.rs:199:50:199:61 | ...: String | semmle.label | ...: String |
+| test.rs:201:14:201:17 | body | semmle.label | body |
+| test.rs:208:34:208:50 | my_axum_handler_1 | semmle.label | my_axum_handler_1 |
+| test.rs:209:39:209:55 | my_axum_handler_2 | semmle.label | my_axum_handler_2 |
+| test.rs:210:33:210:49 | my_axum_handler_3 | semmle.label | my_axum_handler_3 |
+| test.rs:213:65:213:81 | my_axum_handler_5 | semmle.label | my_axum_handler_5 |
+| test.rs:215:33:215:49 | my_axum_handler_6 | semmle.label | my_axum_handler_6 |
+| test.rs:215:56:215:72 | my_axum_handler_7 | semmle.label | my_axum_handler_7 |
+| test.rs:216:33:216:49 | my_axum_handler_8 | semmle.label | my_axum_handler_8 |
+| test.rs:231:37:236:9 | \|...\| ... | semmle.label | \|...\| ... |
+| test.rs:231:38:231:46 | ...: String | semmle.label | ...: String |
+| test.rs:233:18:233:18 | a | semmle.label | a |
+| test.rs:240:13:244:13 | \|...\| ... | semmle.label | \|...\| ... |
+| test.rs:240:25:240:33 | ...: String | semmle.label | ...: String |
+| test.rs:241:22:241:22 | a | semmle.label | a |
+| test.rs:249:13:257:9 | \|...\| ... | semmle.label | \|...\| ... |
+| test.rs:249:26:249:32 | ...: u64 | semmle.label | ...: u64 |
+| test.rs:252:22:252:23 | id | semmle.label | id |
+| test.rs:262:13:267:14 | \|...\| ... | semmle.label | \|...\| ... |
+| test.rs:262:15:262:23 | ...: String | semmle.label | ...: String |
+| test.rs:264:22:264:22 | a | semmle.label | a |
 subpaths
 testFailures
 #select
@@ -166,24 +171,25 @@ testFailures
 | test.rs:60:14:60:17 | ms.a | test.rs:58:14:58:15 | ms | test.rs:60:14:60:17 | ms.a | $@ | test.rs:58:14:58:15 | ms | ms |
 | test.rs:61:14:61:17 | ms.b | test.rs:58:14:58:15 | ms | test.rs:61:14:61:17 | ms.b | $@ | test.rs:58:14:58:15 | ms | ms |
 | test.rs:70:14:70:14 | a | test.rs:68:15:68:15 | a | test.rs:70:14:70:14 | a | $@ | test.rs:68:15:68:15 | a | a |
-| test.rs:99:14:99:23 | a.as_str() | test.rs:131:41:131:42 | to | test.rs:99:14:99:23 | a.as_str() | $@ | test.rs:131:41:131:42 | to | to |
-| test.rs:100:14:100:25 | a.as_bytes() | test.rs:131:41:131:42 | to | test.rs:100:14:100:25 | a.as_bytes() | $@ | test.rs:131:41:131:42 | to | to |
-| test.rs:101:14:101:14 | a | test.rs:131:41:131:42 | to | test.rs:101:14:101:14 | a | $@ | test.rs:131:41:131:42 | to | to |
-| test.rs:109:14:109:14 | a | test.rs:132:45:132:46 | to | test.rs:109:14:109:14 | a | $@ | test.rs:132:45:132:46 | to | to |
-| test.rs:110:14:110:14 | b | test.rs:132:45:132:46 | to | test.rs:110:14:110:14 | b | $@ | test.rs:132:45:132:46 | to | to |
-| test.rs:116:14:116:14 | a | test.rs:133:41:133:42 | to | test.rs:116:14:116:14 | a | $@ | test.rs:133:41:133:42 | to | to |
-| test.rs:124:14:124:14 | a | test.rs:121:5:121:20 | to | test.rs:124:14:124:14 | a | $@ | test.rs:121:5:121:20 | to | to |
-| test.rs:148:14:148:23 | a.as_str() | test.rs:200:30:200:32 | get | test.rs:148:14:148:23 | a.as_str() | $@ | test.rs:200:30:200:32 | get | get |
-| test.rs:149:14:149:25 | a.as_bytes() | test.rs:200:30:200:32 | get | test.rs:149:14:149:25 | a.as_bytes() | $@ | test.rs:200:30:200:32 | get | get |
-| test.rs:150:14:150:14 | a | test.rs:200:30:200:32 | get | test.rs:150:14:150:14 | a | $@ | test.rs:200:30:200:32 | get | get |
-| test.rs:156:14:156:14 | a | test.rs:201:34:201:37 | post | test.rs:156:14:156:14 | a | $@ | test.rs:201:34:201:37 | post | post |
-| test.rs:157:14:157:14 | b | test.rs:201:34:201:37 | post | test.rs:157:14:157:14 | b | $@ | test.rs:201:34:201:37 | post | post |
-| test.rs:164:18:164:20 | key | test.rs:202:29:202:31 | put | test.rs:164:18:164:20 | key | $@ | test.rs:202:29:202:31 | put | put |
-| test.rs:165:18:165:22 | value | test.rs:202:29:202:31 | put | test.rs:165:18:165:22 | value | $@ | test.rs:202:29:202:31 | put | put |
-| test.rs:181:14:181:20 | payload | test.rs:205:40:205:41 | on | test.rs:181:14:181:20 | payload | $@ | test.rs:205:40:205:41 | on | on |
-| test.rs:187:14:187:17 | body | test.rs:207:29:207:31 | get | test.rs:187:14:187:17 | body | $@ | test.rs:207:29:207:31 | get | get |
-| test.rs:193:14:193:17 | body | test.rs:207:52:207:54 | get | test.rs:193:14:193:17 | body | $@ | test.rs:207:52:207:54 | get | get |
-| test.rs:224:18:224:18 | a | test.rs:222:33:222:35 | map | test.rs:224:18:224:18 | a | $@ | test.rs:222:33:222:35 | map | map |
-| test.rs:232:22:232:22 | a | test.rs:230:46:230:49 | then | test.rs:232:22:232:22 | a | $@ | test.rs:230:46:230:49 | then | then |
-| test.rs:243:22:243:23 | id | test.rs:239:50:239:57 | and_then | test.rs:243:22:243:23 | id | $@ | test.rs:239:50:239:57 | and_then | and_then |
-| test.rs:255:22:255:22 | a | test.rs:252:75:252:77 | map | test.rs:255:22:255:22 | a | $@ | test.rs:252:75:252:77 | map | map |
+| test.rs:99:14:99:23 | a.as_str() | test.rs:132:44:132:61 | my_actix_handler_1 | test.rs:99:14:99:23 | a.as_str() | $@ | test.rs:132:44:132:61 | my_actix_handler_1 | my_actix_handler_1 |
+| test.rs:100:14:100:25 | a.as_bytes() | test.rs:132:44:132:61 | my_actix_handler_1 | test.rs:100:14:100:25 | a.as_bytes() | $@ | test.rs:132:44:132:61 | my_actix_handler_1 | my_actix_handler_1 |
+| test.rs:101:14:101:14 | a | test.rs:132:44:132:61 | my_actix_handler_1 | test.rs:101:14:101:14 | a | $@ | test.rs:132:44:132:61 | my_actix_handler_1 | my_actix_handler_1 |
+| test.rs:109:14:109:14 | a | test.rs:133:48:133:65 | my_actix_handler_2 | test.rs:109:14:109:14 | a | $@ | test.rs:133:48:133:65 | my_actix_handler_2 | my_actix_handler_2 |
+| test.rs:110:14:110:14 | b | test.rs:133:48:133:65 | my_actix_handler_2 | test.rs:110:14:110:14 | b | $@ | test.rs:133:48:133:65 | my_actix_handler_2 | my_actix_handler_2 |
+| test.rs:116:14:116:14 | a | test.rs:134:44:134:61 | my_actix_handler_3 | test.rs:116:14:116:14 | a | $@ | test.rs:134:44:134:61 | my_actix_handler_3 | my_actix_handler_3 |
+| test.rs:125:14:125:14 | a | test.rs:123:14:123:31 | my_actix_handler_4 | test.rs:125:14:125:14 | a | $@ | test.rs:123:14:123:31 | my_actix_handler_4 | my_actix_handler_4 |
+| test.rs:149:14:149:23 | a.as_str() | test.rs:208:34:208:50 | my_axum_handler_1 | test.rs:149:14:149:23 | a.as_str() | $@ | test.rs:208:34:208:50 | my_axum_handler_1 | my_axum_handler_1 |
+| test.rs:150:14:150:25 | a.as_bytes() | test.rs:208:34:208:50 | my_axum_handler_1 | test.rs:150:14:150:25 | a.as_bytes() | $@ | test.rs:208:34:208:50 | my_axum_handler_1 | my_axum_handler_1 |
+| test.rs:151:14:151:14 | a | test.rs:208:34:208:50 | my_axum_handler_1 | test.rs:151:14:151:14 | a | $@ | test.rs:208:34:208:50 | my_axum_handler_1 | my_axum_handler_1 |
+| test.rs:157:14:157:14 | a | test.rs:209:39:209:55 | my_axum_handler_2 | test.rs:157:14:157:14 | a | $@ | test.rs:209:39:209:55 | my_axum_handler_2 | my_axum_handler_2 |
+| test.rs:158:14:158:14 | b | test.rs:209:39:209:55 | my_axum_handler_2 | test.rs:158:14:158:14 | b | $@ | test.rs:209:39:209:55 | my_axum_handler_2 | my_axum_handler_2 |
+| test.rs:165:18:165:20 | key | test.rs:210:33:210:49 | my_axum_handler_3 | test.rs:165:18:165:20 | key | $@ | test.rs:210:33:210:49 | my_axum_handler_3 | my_axum_handler_3 |
+| test.rs:166:18:166:22 | value | test.rs:210:33:210:49 | my_axum_handler_3 | test.rs:166:18:166:22 | value | $@ | test.rs:210:33:210:49 | my_axum_handler_3 | my_axum_handler_3 |
+| test.rs:182:14:182:20 | payload | test.rs:213:65:213:81 | my_axum_handler_5 | test.rs:182:14:182:20 | payload | $@ | test.rs:213:65:213:81 | my_axum_handler_5 | my_axum_handler_5 |
+| test.rs:188:14:188:17 | body | test.rs:215:33:215:49 | my_axum_handler_6 | test.rs:188:14:188:17 | body | $@ | test.rs:215:33:215:49 | my_axum_handler_6 | my_axum_handler_6 |
+| test.rs:194:14:194:17 | body | test.rs:215:56:215:72 | my_axum_handler_7 | test.rs:194:14:194:17 | body | $@ | test.rs:215:56:215:72 | my_axum_handler_7 | my_axum_handler_7 |
+| test.rs:201:14:201:17 | body | test.rs:216:33:216:49 | my_axum_handler_8 | test.rs:201:14:201:17 | body | $@ | test.rs:216:33:216:49 | my_axum_handler_8 | my_axum_handler_8 |
+| test.rs:233:18:233:18 | a | test.rs:231:37:236:9 | \|...\| ... | test.rs:233:18:233:18 | a | $@ | test.rs:231:37:236:9 | \|...\| ... | \|...\| ... |
+| test.rs:241:22:241:22 | a | test.rs:240:13:244:13 | \|...\| ... | test.rs:241:22:241:22 | a | $@ | test.rs:240:13:244:13 | \|...\| ... | \|...\| ... |
+| test.rs:252:22:252:23 | id | test.rs:249:13:257:9 | \|...\| ... | test.rs:252:22:252:23 | id | $@ | test.rs:249:13:257:9 | \|...\| ... | \|...\| ... |
+| test.rs:264:22:264:22 | a | test.rs:262:13:267:14 | \|...\| ... | test.rs:264:22:264:22 | a | $@ | test.rs:262:13:267:14 | \|...\| ... | \|...\| ... |
diff --git a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/TaintSources.expected
index 146406e7192c..ede8cb0d4ad0 100644
--- a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/TaintSources.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/TaintSources.expected
@@ -3,123 +3,131 @@
 | test.rs:48:14:48:30 | MyStruct {...} | Flow source 'RemoteSource' of type remote (DEFAULT). |
 | test.rs:58:14:58:15 | ms | Flow source 'RemoteSource' of type remote (DEFAULT). |
 | test.rs:68:15:68:15 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:121:5:121:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:121:5:121:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:121:5:121:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:121:5:121:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:121:5:121:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:121:5:121:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:121:5:121:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:121:5:121:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:131:41:131:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:131:41:131:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:131:41:131:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:131:41:131:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:131:41:131:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:131:41:131:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:131:41:131:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:131:41:131:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:132:45:132:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:132:45:132:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:132:45:132:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:132:45:132:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:132:45:132:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:132:45:132:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:132:45:132:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:132:45:132:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:133:41:133:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:133:41:133:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:133:41:133:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:133:41:133:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:133:41:133:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:133:41:133:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:133:41:133:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:133:41:133:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:200:30:200:32 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:200:30:200:32 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:200:30:200:32 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:200:30:200:32 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:200:30:200:32 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:200:30:200:32 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:200:30:200:32 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:200:30:200:32 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:201:34:201:37 | post | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:201:34:201:37 | post | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:201:34:201:37 | post | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:201:34:201:37 | post | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:201:34:201:37 | post | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:201:34:201:37 | post | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:201:34:201:37 | post | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:201:34:201:37 | post | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:202:29:202:31 | put | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:202:29:202:31 | put | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:202:29:202:31 | put | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:202:29:202:31 | put | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:202:29:202:31 | put | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:202:29:202:31 | put | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:202:29:202:31 | put | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:202:29:202:31 | put | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:17:205:19 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:17:205:19 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:17:205:19 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:17:205:19 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:17:205:19 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:17:205:19 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:17:205:19 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:17:205:19 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:40:205:41 | on | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:40:205:41 | on | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:40:205:41 | on | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:40:205:41 | on | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:40:205:41 | on | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:40:205:41 | on | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:40:205:41 | on | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:205:40:205:41 | on | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:29:207:31 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:29:207:31 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:29:207:31 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:29:207:31 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:29:207:31 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:29:207:31 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:29:207:31 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:29:207:31 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:52:207:54 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:52:207:54 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:52:207:54 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:52:207:54 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:52:207:54 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:52:207:54 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:52:207:54 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:207:52:207:54 | get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:222:33:222:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:222:33:222:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:222:33:222:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:222:33:222:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:222:33:222:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:222:33:222:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:222:33:222:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:222:33:222:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:230:46:230:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:230:46:230:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:230:46:230:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:230:46:230:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:230:46:230:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:230:46:230:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:230:46:230:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:230:46:230:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:239:50:239:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:239:50:239:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:239:50:239:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:239:50:239:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:239:50:239:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:239:50:239:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:239:50:239:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:239:50:239:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:252:75:252:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:252:75:252:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:252:75:252:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:252:75:252:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:252:75:252:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:252:75:252:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:252:75:252:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:252:75:252:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:123:14:123:31 | my_actix_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:123:14:123:31 | my_actix_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:123:14:123:31 | my_actix_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:123:14:123:31 | my_actix_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:123:14:123:31 | my_actix_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:123:14:123:31 | my_actix_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:123:14:123:31 | my_actix_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:123:14:123:31 | my_actix_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:132:44:132:61 | my_actix_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:132:44:132:61 | my_actix_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:132:44:132:61 | my_actix_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:132:44:132:61 | my_actix_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:132:44:132:61 | my_actix_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:132:44:132:61 | my_actix_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:132:44:132:61 | my_actix_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:132:44:132:61 | my_actix_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:133:48:133:65 | my_actix_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:133:48:133:65 | my_actix_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:133:48:133:65 | my_actix_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:133:48:133:65 | my_actix_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:133:48:133:65 | my_actix_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:133:48:133:65 | my_actix_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:133:48:133:65 | my_actix_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:133:48:133:65 | my_actix_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:134:44:134:61 | my_actix_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:134:44:134:61 | my_actix_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:134:44:134:61 | my_actix_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:134:44:134:61 | my_actix_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:134:44:134:61 | my_actix_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:134:44:134:61 | my_actix_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:134:44:134:61 | my_actix_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:134:44:134:61 | my_actix_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:208:34:208:50 | my_axum_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:208:34:208:50 | my_axum_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:208:34:208:50 | my_axum_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:208:34:208:50 | my_axum_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:208:34:208:50 | my_axum_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:208:34:208:50 | my_axum_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:208:34:208:50 | my_axum_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:208:34:208:50 | my_axum_handler_1 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:209:39:209:55 | my_axum_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:209:39:209:55 | my_axum_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:209:39:209:55 | my_axum_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:209:39:209:55 | my_axum_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:209:39:209:55 | my_axum_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:209:39:209:55 | my_axum_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:209:39:209:55 | my_axum_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:209:39:209:55 | my_axum_handler_2 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:210:33:210:49 | my_axum_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:210:33:210:49 | my_axum_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:210:33:210:49 | my_axum_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:210:33:210:49 | my_axum_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:210:33:210:49 | my_axum_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:210:33:210:49 | my_axum_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:210:33:210:49 | my_axum_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:210:33:210:49 | my_axum_handler_3 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:21:213:37 | my_axum_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:21:213:37 | my_axum_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:21:213:37 | my_axum_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:21:213:37 | my_axum_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:21:213:37 | my_axum_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:21:213:37 | my_axum_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:21:213:37 | my_axum_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:21:213:37 | my_axum_handler_4 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:65:213:81 | my_axum_handler_5 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:65:213:81 | my_axum_handler_5 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:65:213:81 | my_axum_handler_5 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:65:213:81 | my_axum_handler_5 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:65:213:81 | my_axum_handler_5 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:65:213:81 | my_axum_handler_5 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:65:213:81 | my_axum_handler_5 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:213:65:213:81 | my_axum_handler_5 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:33:215:49 | my_axum_handler_6 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:33:215:49 | my_axum_handler_6 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:33:215:49 | my_axum_handler_6 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:33:215:49 | my_axum_handler_6 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:33:215:49 | my_axum_handler_6 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:33:215:49 | my_axum_handler_6 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:33:215:49 | my_axum_handler_6 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:33:215:49 | my_axum_handler_6 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:56:215:72 | my_axum_handler_7 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:56:215:72 | my_axum_handler_7 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:56:215:72 | my_axum_handler_7 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:56:215:72 | my_axum_handler_7 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:56:215:72 | my_axum_handler_7 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:56:215:72 | my_axum_handler_7 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:56:215:72 | my_axum_handler_7 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:215:56:215:72 | my_axum_handler_7 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:216:33:216:49 | my_axum_handler_8 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:216:33:216:49 | my_axum_handler_8 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:216:33:216:49 | my_axum_handler_8 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:216:33:216:49 | my_axum_handler_8 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:216:33:216:49 | my_axum_handler_8 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:216:33:216:49 | my_axum_handler_8 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:216:33:216:49 | my_axum_handler_8 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:216:33:216:49 | my_axum_handler_8 | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:231:37:236:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:231:37:236:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:231:37:236:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:231:37:236:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:231:37:236:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:231:37:236:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:231:37:236:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:231:37:236:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:240:13:244:13 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:240:13:244:13 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:240:13:244:13 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:240:13:244:13 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:240:13:244:13 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:240:13:244:13 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:240:13:244:13 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:240:13:244:13 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:249:13:257:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:249:13:257:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:249:13:257:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:249:13:257:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:249:13:257:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:249:13:257:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:249:13:257:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:249:13:257:9 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:262:13:267:14 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:262:13:267:14 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:262:13:267:14 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:262:13:267:14 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:262:13:267:14 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:262:13:267:14 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:262:13:267:14 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:262:13:267:14 | \|...\| ... | Flow source 'RemoteSource' of type remote (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/test.rs b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/test.rs
index c6c487fed28d..b9d05a5816aa 100644
--- a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/test.rs
+++ b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/test.rs
@@ -118,8 +118,9 @@ mod actix_test {
         "".to_string()
     }
 
-    #[get("/4/{a}")] // $ Alert[rust/summary/taint-sources]
-    async fn my_actix_handler_4(path: web::Path<String>) -> String {
+    #[rustfmt::skip]
+    #[get("/4/{a}")]
+    async fn my_actix_handler_4(path: web::Path<String>) -> String { // $ Alert[rust/summary/taint-sources]
         let a = path.into_inner();
         sink(a); // $ hasTaintFlow=my_actix_handler_4
 
@@ -139,7 +140,7 @@ mod actix_test {
 
 mod axum_test {
     use super::sink;
-    use axum::extract::{Json, Path, Query, Request};
+    use axum::extract::{Json, Path, Query, Request, State};
     use axum::routing::{get, post, put, MethodFilter};
     use axum::Router;
     use std::collections::HashMap;
@@ -195,6 +196,13 @@ mod axum_test {
         ""
     }
 
+    async fn my_axum_handler_8(state: State<()>, body: String) -> &'static str {
+        sink(state.0);
+        sink(body); // $ hasTaintFlow=my_axum_handler_8
+
+        ""
+    }
+
     async fn test_axum() {
         let app = Router::<()>::new()
             .route("/1/{a}", get(my_axum_handler_1)) // $ Alert[rust/summary/taint-sources])
@@ -204,7 +212,8 @@ mod axum_test {
                 "/4/:a",
                 get(my_axum_handler_4).on(MethodFilter::DELETE, my_axum_handler_5), // $ Alert[rust/summary/taint-sources])
             )
-            .route("/5/:a", get(my_axum_handler_6).get(my_axum_handler_7)); // $ Alert[rust/summary/taint-sources])
+            .route("/5/:a", get(my_axum_handler_6).get(my_axum_handler_7)) // $ Alert[rust/summary/taint-sources])
+            .route("/6/:a", get(my_axum_handler_8)); // $ Alert[rust/summary/taint-sources])
 
         // ...
     }
@@ -219,24 +228,24 @@ mod warp_test {
     async fn test_warp() {
         // A route with parameter and `map`
         let map_route =
-            warp::path::param().map(|a: String| // $ Alert[rust/summary/taint-sources]
+            warp::path::param().map(|a: String|
             {
             sink(a); // $ hasTaintFlow
 
             "".to_string()
-        });
+        }); // $ Alert[rust/summary/taint-sources]
 
         // A route with parameter and `then`
-        let then_route = warp::path::param().then( // $ Alert[rust/summary/taint-sources]
+        let then_route = warp::path::param().then(
             async move |a: String| {
                 sink(a); // $ hasTaintFlow
 
                 "".to_string()
-            },
+            }, // $ Alert[rust/summary/taint-sources]
         );
 
         // A route with parameter and `and_then`
-        let and_then_route = warp::path::param().and_then( // $ Alert[rust/summary/taint-sources] 
+        let and_then_route = warp::path::param().and_then(
             async move | id: u64 |
             {
             if id != 0 {
@@ -245,17 +254,17 @@ mod warp_test {
             } else {
                 Err(warp::reject::not_found())
             }
-        },
+        }, // $ Alert[rust/summary/taint-sources] 
         );
 
         // A route with path, parameter, and `and_then`
-        let path_and_map_route = warp::path("1").and(warp::path::param()).map( // $ Alert[rust/summary/taint-sources] 
+        let path_and_map_route = warp::path("1").and(warp::path::param()).map(
             | a: String |
             {
                 sink(a); // $ hasTaintFlow
 
                 "".to_string()
-             },
+             }, // $ Alert[rust/summary/taint-sources]
         );
 
         let routes = warp::get().and(
diff --git a/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected b/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected
index 4f8a04f22ab3..c02095aee9eb 100644
--- a/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected
@@ -1,10 +1,10 @@
 models
-| 1 | Summary: <_ as alloc::string::ToString>::to_string; Argument[self].Reference; ReturnValue; taint |
-| 2 | Summary: <_ as core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
-| 3 | Summary: <alloc::string::String as core::convert::From>::from; Argument[0].Field[alloc::borrow::Cow::Owned(0)]; ReturnValue; value |
-| 4 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
-| 5 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[self]; ReturnValue; taint |
-| 6 | Summary: <alloc::string::String>::as_str; Argument[self].Reference; ReturnValue.Reference; taint |
+| 1 | Summary: <alloc::string::String as core::convert::From>::from; Argument[0].Field[alloc::borrow::Cow::Owned(0)]; ReturnValue; value |
+| 2 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
+| 3 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[self]; ReturnValue; taint |
+| 4 | Summary: <alloc::string::String>::as_str; Argument[self].Reference; ReturnValue.Reference; taint |
+| 5 | Summary: <alloc::string::ToString>::to_string; Argument[self].Reference; ReturnValue; taint |
+| 6 | Summary: <core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
 | 7 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
 | 8 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 edges
@@ -13,30 +13,30 @@ edges
 | main.rs:27:13:27:22 | source(...) | main.rs:27:9:27:9 | s | provenance |  |
 | main.rs:28:9:28:14 | sliced [&ref] | main.rs:29:16:29:21 | sliced | provenance |  |
 | main.rs:28:18:28:25 | &... [&ref] | main.rs:28:9:28:14 | sliced [&ref] | provenance |  |
-| main.rs:28:19:28:19 | s | main.rs:28:19:28:25 | s[...] | provenance | MaD:2 |
+| main.rs:28:19:28:19 | s | main.rs:28:19:28:25 | s[...] | provenance | MaD:6 |
 | main.rs:28:19:28:25 | s[...] | main.rs:28:18:28:25 | &... [&ref] | provenance |  |
 | main.rs:33:9:33:10 | s1 | main.rs:36:14:36:15 | s1 | provenance |  |
 | main.rs:33:14:33:23 | source(...) | main.rs:33:9:33:10 | s1 | provenance |  |
 | main.rs:36:9:36:10 | s4 | main.rs:39:10:39:11 | s4 | provenance |  |
-| main.rs:36:14:36:15 | s1 | main.rs:36:14:36:20 | ... + ... | provenance | MaD:5 |
+| main.rs:36:14:36:15 | s1 | main.rs:36:14:36:20 | ... + ... | provenance | MaD:3 |
 | main.rs:36:14:36:20 | ... + ... | main.rs:36:9:36:10 | s4 | provenance |  |
 | main.rs:44:9:44:10 | s1 | main.rs:47:34:47:35 | s1 | provenance |  |
 | main.rs:44:14:44:23 | source(...) | main.rs:44:9:44:10 | s1 | provenance |  |
-| main.rs:47:33:47:35 | &s1 [&ref] | main.rs:47:10:47:35 | ... + ... | provenance | MaD:4 |
+| main.rs:47:33:47:35 | &s1 [&ref] | main.rs:47:10:47:35 | ... + ... | provenance | MaD:2 |
 | main.rs:47:34:47:35 | s1 | main.rs:47:33:47:35 | &s1 [&ref] | provenance |  |
 | main.rs:52:9:52:10 | s1 | main.rs:53:27:53:28 | s1 | provenance |  |
 | main.rs:52:14:52:29 | source_slice(...) | main.rs:52:9:52:10 | s1 | provenance |  |
 | main.rs:53:9:53:10 | s2 | main.rs:54:10:54:11 | s2 | provenance |  |
 | main.rs:53:14:53:29 | ...::from(...) | main.rs:53:9:53:10 | s2 | provenance |  |
-| main.rs:53:27:53:28 | s1 | main.rs:53:14:53:29 | ...::from(...) | provenance | MaD:3 |
+| main.rs:53:27:53:28 | s1 | main.rs:53:14:53:29 | ...::from(...) | provenance | MaD:1 |
 | main.rs:58:9:58:10 | s1 | main.rs:59:14:59:15 | s1 | provenance |  |
 | main.rs:58:14:58:29 | source_slice(...) | main.rs:58:9:58:10 | s1 | provenance |  |
 | main.rs:59:9:59:10 | s2 | main.rs:60:10:60:11 | s2 | provenance |  |
-| main.rs:59:14:59:15 | s1 | main.rs:59:14:59:27 | s1.to_string() | provenance | MaD:1 |
+| main.rs:59:14:59:15 | s1 | main.rs:59:14:59:27 | s1.to_string() | provenance | MaD:5 |
 | main.rs:59:14:59:27 | s1.to_string() | main.rs:59:9:59:10 | s2 | provenance |  |
 | main.rs:64:9:64:9 | s | main.rs:65:16:65:16 | s | provenance |  |
 | main.rs:64:13:64:22 | source(...) | main.rs:64:9:64:9 | s | provenance |  |
-| main.rs:65:16:65:16 | s | main.rs:65:16:65:25 | s.as_str() | provenance | MaD:6 |
+| main.rs:65:16:65:16 | s | main.rs:65:16:65:25 | s.as_str() | provenance | MaD:4 |
 | main.rs:69:9:69:9 | s | main.rs:71:34:71:61 | MacroExpr | provenance |  |
 | main.rs:69:9:69:9 | s | main.rs:74:34:74:59 | MacroExpr | provenance |  |
 | main.rs:69:9:69:9 | s | main.rs:81:39:81:64 | MacroExpr | provenance |  |
diff --git a/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.expected b/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.expected
index 763bff966d3f..2f3bba8677f1 100644
--- a/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.expected
@@ -1,61 +1,61 @@
 models
-| 1 | Summary: <_ as core::ops::arith::Add>::add; Argument[self,0].Field[core::num::wrapping::Wrapping(0)]; ReturnValue.Field[core::num::wrapping::Wrapping(0)]; taint |
-| 2 | Summary: <_ as core::ops::arith::Add>::add; Argument[self,0]; ReturnValue; taint |
-| 3 | Summary: <_ as core::ops::arith::AddAssign>::add_assign; Argument[0].Field[core::num::wrapping::Wrapping(0)]; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; taint |
-| 4 | Summary: <_ as core::ops::arith::AddAssign>::add_assign; Argument[0]; Argument[self].Reference; taint |
-| 5 | Summary: <_ as core::ops::arith::AddAssign>::add_assign; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; taint |
-| 6 | Summary: <_ as core::ops::arith::AddAssign>::add_assign; Argument[self].Reference; Argument[self].Reference; taint |
-| 7 | Summary: <_ as core::ops::arith::Mul>::mul; Argument[self,0]; ReturnValue; taint |
-| 8 | Summary: <_ as core::ops::arith::MulAssign>::mul_assign; Argument[0]; Argument[self].Reference; taint |
-| 9 | Summary: <_ as core::ops::arith::MulAssign>::mul_assign; Argument[self].Reference; Argument[self].Reference; taint |
-| 10 | Summary: <_ as core::ops::arith::Neg>::neg; Argument[self]; ReturnValue; taint |
-| 11 | Summary: <_ as core::ops::arith::Sub>::sub; Argument[self,0]; ReturnValue; taint |
-| 12 | Summary: <_ as core::ops::arith::SubAssign>::sub_assign; Argument[0]; Argument[self].Reference; taint |
-| 13 | Summary: <_ as core::ops::arith::SubAssign>::sub_assign; Argument[self].Reference; Argument[self].Reference; taint |
-| 14 | Summary: <_ as core::ops::bit::BitAnd>::bitand; Argument[self,0].Field[core::num::wrapping::Wrapping(0)]; ReturnValue.Field[core::num::wrapping::Wrapping(0)]; taint |
-| 15 | Summary: <_ as core::ops::bit::BitAndAssign>::bitand_assign; Argument[0].Field[core::num::wrapping::Wrapping(0)]; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; taint |
-| 16 | Summary: <_ as core::ops::bit::BitAndAssign>::bitand_assign; Argument[0]; Argument[self].Reference; taint |
-| 17 | Summary: <_ as core::ops::bit::BitAndAssign>::bitand_assign; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; taint |
-| 18 | Summary: <_ as core::ops::bit::BitAndAssign>::bitand_assign; Argument[self].Reference; Argument[self].Reference; taint |
-| 19 | Summary: <_ as core::ops::bit::BitOr>::bitor; Argument[self,0]; ReturnValue; taint |
-| 20 | Summary: <_ as core::ops::bit::BitXor>::bitxor; Argument[self,0]; ReturnValue; taint |
-| 21 | Summary: <_ as core::ops::bit::BitXorAssign>::bitxor_assign; Argument[0]; Argument[self].Reference; taint |
-| 22 | Summary: <_ as core::ops::bit::BitXorAssign>::bitxor_assign; Argument[self].Reference; Argument[self].Reference; taint |
-| 23 | Summary: <_ as core::ops::bit::Not>::not; Argument[self]; ReturnValue; taint |
-| 24 | Summary: <_ as core::ops::bit::Shl>::shl; Argument[self,0].Field[core::num::wrapping::Wrapping(0)]; ReturnValue.Field[core::num::wrapping::Wrapping(0)]; taint |
-| 25 | Summary: <_ as core::ops::bit::Shl>::shl; Argument[self,0]; ReturnValue; taint |
-| 26 | Summary: <_ as core::ops::bit::ShlAssign>::shl_assign; Argument[0].Field[core::num::wrapping::Wrapping(0)]; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; taint |
-| 27 | Summary: <_ as core::ops::bit::ShlAssign>::shl_assign; Argument[0]; Argument[self].Reference; taint |
-| 28 | Summary: <_ as core::ops::bit::ShlAssign>::shl_assign; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; taint |
-| 29 | Summary: <_ as core::ops::bit::ShlAssign>::shl_assign; Argument[self].Reference; Argument[self].Reference; taint |
-| 30 | Summary: <_ as core::ops::bit::Shr>::shr; Argument[self,0]; ReturnValue; taint |
-| 31 | Summary: <_ as core::ops::bit::ShrAssign>::shr_assign; Argument[0]; Argument[self].Reference; taint |
-| 32 | Summary: <_ as core::ops::bit::ShrAssign>::shr_assign; Argument[self].Reference; Argument[self].Reference; taint |
-| 33 | Summary: <_ as core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
-| 34 | Summary: <core::num::wrapping::Wrapping as core::ops::arith::Neg>::neg; Argument[self].Field[core::num::wrapping::Wrapping(0)]; ReturnValue.Field[core::num::wrapping::Wrapping(0)]; taint |
-| 35 | Summary: <core::num::wrapping::Wrapping as core::ops::bit::Not>::not; Argument[self].Field[core::num::wrapping::Wrapping(0)]; ReturnValue.Field[core::num::wrapping::Wrapping(0)]; taint |
+| 1 | Summary: <core::num::wrapping::Wrapping as core::ops::arith::Neg>::neg; Argument[self].Field[core::num::wrapping::Wrapping(0)]; ReturnValue.Field[core::num::wrapping::Wrapping(0)]; taint |
+| 2 | Summary: <core::num::wrapping::Wrapping as core::ops::bit::Not>::not; Argument[self].Field[core::num::wrapping::Wrapping(0)]; ReturnValue.Field[core::num::wrapping::Wrapping(0)]; taint |
+| 3 | Summary: <core::ops::arith::Add>::add; Argument[self,0].Field[core::num::wrapping::Wrapping(0)]; ReturnValue.Field[core::num::wrapping::Wrapping(0)]; taint |
+| 4 | Summary: <core::ops::arith::Add>::add; Argument[self,0]; ReturnValue; taint |
+| 5 | Summary: <core::ops::arith::AddAssign>::add_assign; Argument[0].Field[core::num::wrapping::Wrapping(0)]; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; taint |
+| 6 | Summary: <core::ops::arith::AddAssign>::add_assign; Argument[0]; Argument[self].Reference; taint |
+| 7 | Summary: <core::ops::arith::AddAssign>::add_assign; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; taint |
+| 8 | Summary: <core::ops::arith::AddAssign>::add_assign; Argument[self].Reference; Argument[self].Reference; taint |
+| 9 | Summary: <core::ops::arith::Mul>::mul; Argument[self,0]; ReturnValue; taint |
+| 10 | Summary: <core::ops::arith::MulAssign>::mul_assign; Argument[0]; Argument[self].Reference; taint |
+| 11 | Summary: <core::ops::arith::MulAssign>::mul_assign; Argument[self].Reference; Argument[self].Reference; taint |
+| 12 | Summary: <core::ops::arith::Neg>::neg; Argument[self]; ReturnValue; taint |
+| 13 | Summary: <core::ops::arith::Sub>::sub; Argument[self,0]; ReturnValue; taint |
+| 14 | Summary: <core::ops::arith::SubAssign>::sub_assign; Argument[0]; Argument[self].Reference; taint |
+| 15 | Summary: <core::ops::arith::SubAssign>::sub_assign; Argument[self].Reference; Argument[self].Reference; taint |
+| 16 | Summary: <core::ops::bit::BitAnd>::bitand; Argument[self,0].Field[core::num::wrapping::Wrapping(0)]; ReturnValue.Field[core::num::wrapping::Wrapping(0)]; taint |
+| 17 | Summary: <core::ops::bit::BitAndAssign>::bitand_assign; Argument[0].Field[core::num::wrapping::Wrapping(0)]; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; taint |
+| 18 | Summary: <core::ops::bit::BitAndAssign>::bitand_assign; Argument[0]; Argument[self].Reference; taint |
+| 19 | Summary: <core::ops::bit::BitAndAssign>::bitand_assign; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; taint |
+| 20 | Summary: <core::ops::bit::BitAndAssign>::bitand_assign; Argument[self].Reference; Argument[self].Reference; taint |
+| 21 | Summary: <core::ops::bit::BitOr>::bitor; Argument[self,0]; ReturnValue; taint |
+| 22 | Summary: <core::ops::bit::BitXor>::bitxor; Argument[self,0]; ReturnValue; taint |
+| 23 | Summary: <core::ops::bit::BitXorAssign>::bitxor_assign; Argument[0]; Argument[self].Reference; taint |
+| 24 | Summary: <core::ops::bit::BitXorAssign>::bitxor_assign; Argument[self].Reference; Argument[self].Reference; taint |
+| 25 | Summary: <core::ops::bit::Not>::not; Argument[self]; ReturnValue; taint |
+| 26 | Summary: <core::ops::bit::Shl>::shl; Argument[self,0].Field[core::num::wrapping::Wrapping(0)]; ReturnValue.Field[core::num::wrapping::Wrapping(0)]; taint |
+| 27 | Summary: <core::ops::bit::Shl>::shl; Argument[self,0]; ReturnValue; taint |
+| 28 | Summary: <core::ops::bit::ShlAssign>::shl_assign; Argument[0].Field[core::num::wrapping::Wrapping(0)]; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; taint |
+| 29 | Summary: <core::ops::bit::ShlAssign>::shl_assign; Argument[0]; Argument[self].Reference; taint |
+| 30 | Summary: <core::ops::bit::ShlAssign>::shl_assign; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; Argument[self].Reference.Field[core::num::wrapping::Wrapping(0)]; taint |
+| 31 | Summary: <core::ops::bit::ShlAssign>::shl_assign; Argument[self].Reference; Argument[self].Reference; taint |
+| 32 | Summary: <core::ops::bit::Shr>::shr; Argument[self,0]; ReturnValue; taint |
+| 33 | Summary: <core::ops::bit::ShrAssign>::shr_assign; Argument[0]; Argument[self].Reference; taint |
+| 34 | Summary: <core::ops::bit::ShrAssign>::shr_assign; Argument[self].Reference; Argument[self].Reference; taint |
+| 35 | Summary: <core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
 edges
 | main.rs:12:9:12:9 | a | main.rs:13:10:13:10 | a | provenance |  |
 | main.rs:12:9:12:9 | a | main.rs:14:14:14:14 | a | provenance |  |
 | main.rs:12:13:12:22 | source(...) | main.rs:12:9:12:9 | a | provenance |  |
-| main.rs:13:10:13:10 | a | main.rs:13:10:13:14 | ... + ... | provenance | MaD:2 |
-| main.rs:14:14:14:14 | a | main.rs:14:10:14:14 | ... + ... | provenance | MaD:2 |
+| main.rs:13:10:13:10 | a | main.rs:13:10:13:14 | ... + ... | provenance | MaD:4 |
+| main.rs:14:14:14:14 | a | main.rs:14:10:14:14 | ... + ... | provenance | MaD:4 |
 | main.rs:16:9:16:13 | mut b | main.rs:17:5:17:5 | b | provenance |  |
 | main.rs:16:17:16:26 | source(...) | main.rs:16:9:16:13 | mut b | provenance |  |
-| main.rs:17:5:17:5 | b | main.rs:18:10:18:10 | b | provenance | MaD:6 |
-| main.rs:21:10:21:19 | source(...) | main.rs:22:10:22:10 | c | provenance | MaD:4 |
+| main.rs:17:5:17:5 | b | main.rs:18:10:18:10 | b | provenance | MaD:8 |
+| main.rs:21:10:21:19 | source(...) | main.rs:22:10:22:10 | c | provenance | MaD:6 |
 | main.rs:26:9:26:9 | a | main.rs:27:11:27:11 | a | provenance |  |
 | main.rs:26:13:26:21 | source(...) | main.rs:26:9:26:9 | a | provenance |  |
-| main.rs:27:11:27:11 | a | main.rs:27:10:27:11 | - ... | provenance | MaD:10 |
-| main.rs:29:11:29:19 | source(...) | main.rs:29:10:29:19 | ! ... | provenance | MaD:23 |
-| main.rs:31:10:31:18 | source(...) | main.rs:31:10:31:22 | ... - ... | provenance | MaD:11 |
-| main.rs:32:17:32:25 | source(...) | main.rs:32:10:32:25 | ... - ... | provenance | MaD:11 |
-| main.rs:34:10:34:18 | source(...) | main.rs:34:10:34:22 | ... * ... | provenance | MaD:7 |
-| main.rs:35:17:35:25 | source(...) | main.rs:35:10:35:25 | ... * ... | provenance | MaD:7 |
-| main.rs:37:10:37:18 | source(...) | main.rs:37:10:37:23 | ... << ... | provenance | MaD:25 |
-| main.rs:38:18:38:26 | source(...) | main.rs:38:10:38:26 | ... << ... | provenance | MaD:25 |
-| main.rs:40:10:40:18 | source(...) | main.rs:40:10:40:22 | ... ^ ... | provenance | MaD:20 |
-| main.rs:41:18:41:27 | source(...) | main.rs:41:10:41:27 | ... ^ ... | provenance | MaD:20 |
+| main.rs:27:11:27:11 | a | main.rs:27:10:27:11 | - ... | provenance | MaD:12 |
+| main.rs:29:11:29:19 | source(...) | main.rs:29:10:29:19 | ! ... | provenance | MaD:25 |
+| main.rs:31:10:31:18 | source(...) | main.rs:31:10:31:22 | ... - ... | provenance | MaD:13 |
+| main.rs:32:17:32:25 | source(...) | main.rs:32:10:32:25 | ... - ... | provenance | MaD:13 |
+| main.rs:34:10:34:18 | source(...) | main.rs:34:10:34:22 | ... * ... | provenance | MaD:9 |
+| main.rs:35:17:35:25 | source(...) | main.rs:35:10:35:25 | ... * ... | provenance | MaD:9 |
+| main.rs:37:10:37:18 | source(...) | main.rs:37:10:37:23 | ... << ... | provenance | MaD:27 |
+| main.rs:38:18:38:26 | source(...) | main.rs:38:10:38:26 | ... << ... | provenance | MaD:27 |
+| main.rs:40:10:40:18 | source(...) | main.rs:40:10:40:22 | ... ^ ... | provenance | MaD:22 |
+| main.rs:41:18:41:27 | source(...) | main.rs:41:10:41:27 | ... ^ ... | provenance | MaD:22 |
 | main.rs:45:9:45:9 | a | main.rs:46:9:46:9 | b | provenance |  |
 | main.rs:45:13:45:22 | source(...) | main.rs:45:9:45:9 | a | provenance |  |
 | main.rs:46:9:46:9 | b | main.rs:47:10:47:17 | b as i64 | provenance |  |
@@ -64,11 +64,11 @@ edges
 | main.rs:60:17:60:26 | source(...) | main.rs:60:13:60:13 | s | provenance |  |
 | main.rs:61:13:61:18 | sliced [&ref] | main.rs:62:14:62:19 | sliced | provenance |  |
 | main.rs:61:22:61:29 | &... [&ref] | main.rs:61:13:61:18 | sliced [&ref] | provenance |  |
-| main.rs:61:23:61:23 | s | main.rs:61:23:61:29 | s[...] | provenance | MaD:33 |
+| main.rs:61:23:61:23 | s | main.rs:61:23:61:29 | s[...] | provenance | MaD:35 |
 | main.rs:61:23:61:29 | s[...] | main.rs:61:22:61:29 | &... [&ref] | provenance |  |
 | main.rs:76:13:76:15 | arr | main.rs:77:14:77:16 | arr | provenance |  |
 | main.rs:76:19:76:28 | source(...) | main.rs:76:13:76:15 | arr | provenance |  |
-| main.rs:77:14:77:16 | arr | main.rs:77:14:77:19 | arr[1] | provenance | MaD:33 |
+| main.rs:77:14:77:16 | arr | main.rs:77:14:77:19 | arr[1] | provenance | MaD:35 |
 | main.rs:92:9:92:12 | [post] arr2 [element] | main.rs:93:14:93:17 | arr2 | provenance |  |
 | main.rs:92:19:92:28 | source(...) | main.rs:92:9:92:12 | [post] arr2 [element] | provenance |  |
 | main.rs:113:14:113:47 | TupleExpr [tuple.0] | main.rs:113:14:113:49 | ... .0 | provenance |  |
@@ -87,56 +87,56 @@ edges
 | main.rs:131:14:131:64 | TupleExpr [tuple.0] | main.rs:131:14:131:66 | ... .0 | provenance |  |
 | main.rs:131:14:131:66 | ... .0 | main.rs:131:14:131:68 | ... .1 | provenance |  |
 | main.rs:131:15:131:29 | source_tuple(...) | main.rs:131:14:131:64 | TupleExpr [tuple.0] | provenance |  |
-| main.rs:141:10:141:18 | source(...) | main.rs:141:10:141:28 | ... .add(...) | provenance | MaD:2 |
-| main.rs:143:19:143:27 | source(...) | main.rs:143:10:143:28 | 1i64.add(...) | provenance | MaD:2 |
-| main.rs:146:10:146:18 | source(...) | main.rs:146:10:146:28 | ... .sub(...) | provenance | MaD:11 |
-| main.rs:148:19:148:27 | source(...) | main.rs:148:10:148:28 | 1i64.sub(...) | provenance | MaD:11 |
-| main.rs:151:10:151:18 | source(...) | main.rs:151:10:151:28 | ... .mul(...) | provenance | MaD:7 |
-| main.rs:153:19:153:27 | source(...) | main.rs:153:10:153:28 | 1i64.mul(...) | provenance | MaD:7 |
-| main.rs:156:10:156:18 | source(...) | main.rs:156:10:156:28 | ... .shl(...) | provenance | MaD:25 |
-| main.rs:157:10:157:18 | source(...) | main.rs:157:10:157:25 | ... .shl(...) | provenance | MaD:25 |
-| main.rs:158:19:158:27 | source(...) | main.rs:158:10:158:28 | 1i64.shl(...) | provenance | MaD:25 |
-| main.rs:160:10:160:18 | source(...) | main.rs:160:10:160:28 | ... .shr(...) | provenance | MaD:30 |
-| main.rs:161:10:161:18 | source(...) | main.rs:161:10:161:25 | ... .shr(...) | provenance | MaD:30 |
-| main.rs:162:19:162:27 | source(...) | main.rs:162:10:162:28 | 1i64.shr(...) | provenance | MaD:30 |
-| main.rs:164:10:164:18 | source(...) | main.rs:164:10:164:30 | ... .bitor(...) | provenance | MaD:19 |
-| main.rs:165:10:165:18 | source(...) | main.rs:165:10:165:27 | ... .bitor(...) | provenance | MaD:19 |
-| main.rs:166:21:166:29 | source(...) | main.rs:166:10:166:30 | 1i64.bitor(...) | provenance | MaD:19 |
-| main.rs:167:18:167:26 | source(...) | main.rs:167:10:167:27 | 1.bitor(...) | provenance | MaD:19 |
+| main.rs:141:10:141:18 | source(...) | main.rs:141:10:141:28 | ... .add(...) | provenance | MaD:4 |
+| main.rs:143:19:143:27 | source(...) | main.rs:143:10:143:28 | 1i64.add(...) | provenance | MaD:4 |
+| main.rs:146:10:146:18 | source(...) | main.rs:146:10:146:28 | ... .sub(...) | provenance | MaD:13 |
+| main.rs:148:19:148:27 | source(...) | main.rs:148:10:148:28 | 1i64.sub(...) | provenance | MaD:13 |
+| main.rs:151:10:151:18 | source(...) | main.rs:151:10:151:28 | ... .mul(...) | provenance | MaD:9 |
+| main.rs:153:19:153:27 | source(...) | main.rs:153:10:153:28 | 1i64.mul(...) | provenance | MaD:9 |
+| main.rs:156:10:156:18 | source(...) | main.rs:156:10:156:28 | ... .shl(...) | provenance | MaD:27 |
+| main.rs:157:10:157:18 | source(...) | main.rs:157:10:157:25 | ... .shl(...) | provenance | MaD:27 |
+| main.rs:158:19:158:27 | source(...) | main.rs:158:10:158:28 | 1i64.shl(...) | provenance | MaD:27 |
+| main.rs:160:10:160:18 | source(...) | main.rs:160:10:160:28 | ... .shr(...) | provenance | MaD:32 |
+| main.rs:161:10:161:18 | source(...) | main.rs:161:10:161:25 | ... .shr(...) | provenance | MaD:32 |
+| main.rs:162:19:162:27 | source(...) | main.rs:162:10:162:28 | 1i64.shr(...) | provenance | MaD:32 |
+| main.rs:164:10:164:18 | source(...) | main.rs:164:10:164:30 | ... .bitor(...) | provenance | MaD:21 |
+| main.rs:165:10:165:18 | source(...) | main.rs:165:10:165:27 | ... .bitor(...) | provenance | MaD:21 |
+| main.rs:166:21:166:29 | source(...) | main.rs:166:10:166:30 | 1i64.bitor(...) | provenance | MaD:21 |
+| main.rs:167:18:167:26 | source(...) | main.rs:167:10:167:27 | 1.bitor(...) | provenance | MaD:21 |
 | main.rs:170:5:170:5 | [post] a | main.rs:171:5:171:5 | a | provenance |  |
 | main.rs:170:5:170:5 | [post] a | main.rs:172:5:172:5 | a | provenance |  |
 | main.rs:170:5:170:5 | [post] a | main.rs:173:5:173:5 | a | provenance |  |
 | main.rs:170:5:170:5 | [post] a | main.rs:174:5:174:5 | a | provenance |  |
 | main.rs:170:5:170:5 | [post] a | main.rs:175:5:175:5 | a | provenance |  |
 | main.rs:170:5:170:5 | [post] a | main.rs:176:10:176:10 | a | provenance |  |
-| main.rs:170:18:170:26 | source(...) | main.rs:170:5:170:5 | [post] a | provenance | MaD:4 |
+| main.rs:170:18:170:26 | source(...) | main.rs:170:5:170:5 | [post] a | provenance | MaD:6 |
 | main.rs:171:5:171:5 | [post] a | main.rs:172:5:172:5 | a | provenance |  |
 | main.rs:171:5:171:5 | [post] a | main.rs:173:5:173:5 | a | provenance |  |
 | main.rs:171:5:171:5 | [post] a | main.rs:174:5:174:5 | a | provenance |  |
 | main.rs:171:5:171:5 | [post] a | main.rs:175:5:175:5 | a | provenance |  |
 | main.rs:171:5:171:5 | [post] a | main.rs:176:10:176:10 | a | provenance |  |
-| main.rs:171:5:171:5 | a | main.rs:171:5:171:5 | [post] a | provenance | MaD:13 |
-| main.rs:171:18:171:26 | source(...) | main.rs:171:5:171:5 | [post] a | provenance | MaD:12 |
+| main.rs:171:5:171:5 | a | main.rs:171:5:171:5 | [post] a | provenance | MaD:15 |
+| main.rs:171:18:171:26 | source(...) | main.rs:171:5:171:5 | [post] a | provenance | MaD:14 |
 | main.rs:172:5:172:5 | [post] a | main.rs:173:5:173:5 | a | provenance |  |
 | main.rs:172:5:172:5 | [post] a | main.rs:174:5:174:5 | a | provenance |  |
 | main.rs:172:5:172:5 | [post] a | main.rs:175:5:175:5 | a | provenance |  |
 | main.rs:172:5:172:5 | [post] a | main.rs:176:10:176:10 | a | provenance |  |
-| main.rs:172:5:172:5 | a | main.rs:172:5:172:5 | [post] a | provenance | MaD:9 |
-| main.rs:172:18:172:26 | source(...) | main.rs:172:5:172:5 | [post] a | provenance | MaD:8 |
+| main.rs:172:5:172:5 | a | main.rs:172:5:172:5 | [post] a | provenance | MaD:11 |
+| main.rs:172:18:172:26 | source(...) | main.rs:172:5:172:5 | [post] a | provenance | MaD:10 |
 | main.rs:173:5:173:5 | [post] a | main.rs:174:5:174:5 | a | provenance |  |
 | main.rs:173:5:173:5 | [post] a | main.rs:175:5:175:5 | a | provenance |  |
 | main.rs:173:5:173:5 | [post] a | main.rs:176:10:176:10 | a | provenance |  |
-| main.rs:173:5:173:5 | a | main.rs:173:5:173:5 | [post] a | provenance | MaD:29 |
-| main.rs:173:18:173:26 | source(...) | main.rs:173:5:173:5 | [post] a | provenance | MaD:27 |
+| main.rs:173:5:173:5 | a | main.rs:173:5:173:5 | [post] a | provenance | MaD:31 |
+| main.rs:173:18:173:26 | source(...) | main.rs:173:5:173:5 | [post] a | provenance | MaD:29 |
 | main.rs:174:5:174:5 | [post] a | main.rs:175:5:175:5 | a | provenance |  |
 | main.rs:174:5:174:5 | [post] a | main.rs:176:10:176:10 | a | provenance |  |
-| main.rs:174:5:174:5 | a | main.rs:174:5:174:5 | [post] a | provenance | MaD:32 |
-| main.rs:174:18:174:26 | source(...) | main.rs:174:5:174:5 | [post] a | provenance | MaD:31 |
+| main.rs:174:5:174:5 | a | main.rs:174:5:174:5 | [post] a | provenance | MaD:34 |
+| main.rs:174:18:174:26 | source(...) | main.rs:174:5:174:5 | [post] a | provenance | MaD:33 |
 | main.rs:175:5:175:5 | [post] a | main.rs:176:10:176:10 | a | provenance |  |
-| main.rs:175:5:175:5 | a | main.rs:175:5:175:5 | [post] a | provenance | MaD:22 |
-| main.rs:175:21:175:29 | source(...) | main.rs:175:5:175:5 | [post] a | provenance | MaD:21 |
-| main.rs:178:10:178:18 | source(...) | main.rs:178:10:178:24 | ... .neg() | provenance | MaD:10 |
-| main.rs:179:10:179:18 | source(...) | main.rs:179:10:179:24 | ... .not() | provenance | MaD:23 |
+| main.rs:175:5:175:5 | a | main.rs:175:5:175:5 | [post] a | provenance | MaD:24 |
+| main.rs:175:21:175:29 | source(...) | main.rs:175:5:175:5 | [post] a | provenance | MaD:23 |
+| main.rs:178:10:178:18 | source(...) | main.rs:178:10:178:24 | ... .neg() | provenance | MaD:12 |
+| main.rs:179:10:179:18 | source(...) | main.rs:179:10:179:24 | ... .not() | provenance | MaD:25 |
 | main.rs:199:13:199:17 | mut a [Wrapping] | main.rs:201:21:201:21 | a [Wrapping] | provenance |  |
 | main.rs:199:13:199:17 | mut a [Wrapping] | main.rs:203:9:203:9 | a [Wrapping] | provenance |  |
 | main.rs:199:13:199:17 | mut a [Wrapping] | main.rs:204:9:204:9 | a [Wrapping] | provenance |  |
@@ -149,52 +149,52 @@ edges
 | main.rs:203:9:203:9 | [post] a | main.rs:206:21:206:23 | a.0 | provenance |  |
 | main.rs:203:9:203:9 | [post] a [Wrapping] | main.rs:204:9:204:9 | a [Wrapping] | provenance |  |
 | main.rs:203:9:203:9 | [post] a [Wrapping] | main.rs:206:21:206:21 | a [Wrapping] | provenance |  |
-| main.rs:203:9:203:9 | a [Wrapping] | main.rs:203:9:203:9 | [post] a [Wrapping] | provenance | MaD:5 |
-| main.rs:203:22:203:30 | source(...) | main.rs:203:9:203:9 | [post] a | provenance | MaD:4 |
-| main.rs:203:22:203:30 | source(...) | main.rs:203:9:203:9 | [post] a [Wrapping] | provenance | MaD:3 |
+| main.rs:203:9:203:9 | a [Wrapping] | main.rs:203:9:203:9 | [post] a [Wrapping] | provenance | MaD:7 |
+| main.rs:203:22:203:30 | source(...) | main.rs:203:9:203:9 | [post] a | provenance | MaD:6 |
+| main.rs:203:22:203:30 | source(...) | main.rs:203:9:203:9 | [post] a [Wrapping] | provenance | MaD:5 |
 | main.rs:204:9:204:9 | [post] a | main.rs:205:14:205:14 | a | provenance |  |
 | main.rs:204:9:204:9 | [post] a | main.rs:206:21:206:23 | a.0 | provenance |  |
 | main.rs:204:9:204:9 | [post] a [Wrapping] | main.rs:206:21:206:21 | a [Wrapping] | provenance |  |
-| main.rs:204:9:204:9 | a | main.rs:204:9:204:9 | [post] a | provenance | MaD:6 |
-| main.rs:204:9:204:9 | a | main.rs:204:9:204:9 | [post] a [Wrapping] | provenance | MaD:5 |
-| main.rs:204:9:204:9 | a [Wrapping] | main.rs:204:9:204:9 | [post] a [Wrapping] | provenance | MaD:5 |
-| main.rs:204:22:204:47 | Wrapping(...) [Wrapping] | main.rs:204:9:204:9 | [post] a [Wrapping] | provenance | MaD:3 |
+| main.rs:204:9:204:9 | a | main.rs:204:9:204:9 | [post] a | provenance | MaD:8 |
+| main.rs:204:9:204:9 | a | main.rs:204:9:204:9 | [post] a [Wrapping] | provenance | MaD:7 |
+| main.rs:204:9:204:9 | a [Wrapping] | main.rs:204:9:204:9 | [post] a [Wrapping] | provenance | MaD:7 |
+| main.rs:204:22:204:47 | Wrapping(...) [Wrapping] | main.rs:204:9:204:9 | [post] a [Wrapping] | provenance | MaD:5 |
 | main.rs:204:31:204:46 | ...::source(...) | main.rs:204:22:204:47 | Wrapping(...) [Wrapping] | provenance |  |
 | main.rs:206:21:206:21 | a [Wrapping] | main.rs:206:21:206:23 | a.0 | provenance |  |
 | main.rs:208:9:208:9 | a | main.rs:209:9:209:9 | a | provenance |  |
 | main.rs:208:13:208:21 | source(...) | main.rs:208:9:208:9 | a | provenance |  |
-| main.rs:209:9:209:9 | a | main.rs:210:9:210:9 | a | provenance | MaD:6 |
-| main.rs:209:9:209:9 | a | main.rs:210:9:210:9 | a [Wrapping] | provenance | MaD:5 |
-| main.rs:209:14:209:22 | source(...) | main.rs:210:9:210:9 | a | provenance | MaD:4 |
-| main.rs:209:14:209:22 | source(...) | main.rs:210:9:210:9 | a [Wrapping] | provenance | MaD:3 |
-| main.rs:210:9:210:9 | a | main.rs:211:14:211:14 | a | provenance | MaD:6 |
-| main.rs:210:9:210:9 | a | main.rs:212:21:212:21 | a [Wrapping] | provenance | MaD:5 |
-| main.rs:210:9:210:9 | a | main.rs:212:21:212:23 | a.0 | provenance | MaD:6 |
-| main.rs:210:9:210:9 | a [Wrapping] | main.rs:212:21:212:21 | a [Wrapping] | provenance | MaD:5 |
-| main.rs:210:14:210:49 | ...::Wrapping(...) [Wrapping] | main.rs:212:21:212:21 | a [Wrapping] | provenance | MaD:3 |
+| main.rs:209:9:209:9 | a | main.rs:210:9:210:9 | a | provenance | MaD:8 |
+| main.rs:209:9:209:9 | a | main.rs:210:9:210:9 | a [Wrapping] | provenance | MaD:7 |
+| main.rs:209:14:209:22 | source(...) | main.rs:210:9:210:9 | a | provenance | MaD:6 |
+| main.rs:209:14:209:22 | source(...) | main.rs:210:9:210:9 | a [Wrapping] | provenance | MaD:5 |
+| main.rs:210:9:210:9 | a | main.rs:211:14:211:14 | a | provenance | MaD:8 |
+| main.rs:210:9:210:9 | a | main.rs:212:21:212:21 | a [Wrapping] | provenance | MaD:7 |
+| main.rs:210:9:210:9 | a | main.rs:212:21:212:23 | a.0 | provenance | MaD:8 |
+| main.rs:210:9:210:9 | a [Wrapping] | main.rs:212:21:212:21 | a [Wrapping] | provenance | MaD:7 |
+| main.rs:210:14:210:49 | ...::Wrapping(...) [Wrapping] | main.rs:212:21:212:21 | a [Wrapping] | provenance | MaD:5 |
 | main.rs:210:33:210:48 | ...::source(...) | main.rs:210:14:210:49 | ...::Wrapping(...) [Wrapping] | provenance |  |
 | main.rs:212:21:212:21 | a [Wrapping] | main.rs:212:21:212:23 | a.0 | provenance |  |
 | main.rs:214:9:214:9 | a | main.rs:215:9:215:9 | a | provenance |  |
 | main.rs:214:13:214:21 | source(...) | main.rs:214:9:214:9 | a | provenance |  |
-| main.rs:215:9:215:9 | a | main.rs:216:9:216:9 | a | provenance | MaD:18 |
-| main.rs:215:9:215:9 | a | main.rs:216:9:216:9 | a [Wrapping] | provenance | MaD:17 |
-| main.rs:215:14:215:22 | source(...) | main.rs:216:9:216:9 | a | provenance | MaD:16 |
-| main.rs:215:14:215:22 | source(...) | main.rs:216:9:216:9 | a [Wrapping] | provenance | MaD:15 |
-| main.rs:216:9:216:9 | a | main.rs:217:14:217:14 | a | provenance | MaD:18 |
-| main.rs:216:9:216:9 | a | main.rs:218:21:218:21 | a [Wrapping] | provenance | MaD:17 |
-| main.rs:216:9:216:9 | a | main.rs:218:21:218:23 | a.0 | provenance | MaD:18 |
-| main.rs:216:9:216:9 | a [Wrapping] | main.rs:218:21:218:21 | a [Wrapping] | provenance | MaD:17 |
-| main.rs:216:14:216:39 | Wrapping(...) [Wrapping] | main.rs:218:21:218:21 | a [Wrapping] | provenance | MaD:15 |
+| main.rs:215:9:215:9 | a | main.rs:216:9:216:9 | a | provenance | MaD:20 |
+| main.rs:215:9:215:9 | a | main.rs:216:9:216:9 | a [Wrapping] | provenance | MaD:19 |
+| main.rs:215:14:215:22 | source(...) | main.rs:216:9:216:9 | a | provenance | MaD:18 |
+| main.rs:215:14:215:22 | source(...) | main.rs:216:9:216:9 | a [Wrapping] | provenance | MaD:17 |
+| main.rs:216:9:216:9 | a | main.rs:217:14:217:14 | a | provenance | MaD:20 |
+| main.rs:216:9:216:9 | a | main.rs:218:21:218:21 | a [Wrapping] | provenance | MaD:19 |
+| main.rs:216:9:216:9 | a | main.rs:218:21:218:23 | a.0 | provenance | MaD:20 |
+| main.rs:216:9:216:9 | a [Wrapping] | main.rs:218:21:218:21 | a [Wrapping] | provenance | MaD:19 |
+| main.rs:216:14:216:39 | Wrapping(...) [Wrapping] | main.rs:218:21:218:21 | a [Wrapping] | provenance | MaD:17 |
 | main.rs:216:23:216:38 | ...::source(...) | main.rs:216:14:216:39 | Wrapping(...) [Wrapping] | provenance |  |
 | main.rs:218:21:218:21 | a [Wrapping] | main.rs:218:21:218:23 | a.0 | provenance |  |
 | main.rs:220:9:220:9 | a | main.rs:221:9:221:9 | a | provenance |  |
 | main.rs:220:13:220:22 | source(...) | main.rs:220:9:220:9 | a | provenance |  |
-| main.rs:221:9:221:9 | a | main.rs:222:14:222:14 | a | provenance | MaD:29 |
-| main.rs:221:9:221:9 | a | main.rs:223:21:223:21 | a [Wrapping] | provenance | MaD:28 |
-| main.rs:221:9:221:9 | a | main.rs:223:21:223:23 | a.0 | provenance | MaD:29 |
-| main.rs:221:15:221:30 | source_usize(...) | main.rs:222:14:222:14 | a | provenance | MaD:27 |
-| main.rs:221:15:221:30 | source_usize(...) | main.rs:223:21:223:21 | a [Wrapping] | provenance | MaD:26 |
-| main.rs:221:15:221:30 | source_usize(...) | main.rs:223:21:223:23 | a.0 | provenance | MaD:27 |
+| main.rs:221:9:221:9 | a | main.rs:222:14:222:14 | a | provenance | MaD:31 |
+| main.rs:221:9:221:9 | a | main.rs:223:21:223:21 | a [Wrapping] | provenance | MaD:30 |
+| main.rs:221:9:221:9 | a | main.rs:223:21:223:23 | a.0 | provenance | MaD:31 |
+| main.rs:221:15:221:30 | source_usize(...) | main.rs:222:14:222:14 | a | provenance | MaD:29 |
+| main.rs:221:15:221:30 | source_usize(...) | main.rs:223:21:223:21 | a [Wrapping] | provenance | MaD:28 |
+| main.rs:221:15:221:30 | source_usize(...) | main.rs:223:21:223:23 | a.0 | provenance | MaD:29 |
 | main.rs:223:21:223:21 | a [Wrapping] | main.rs:223:21:223:23 | a.0 | provenance |  |
 | main.rs:225:13:225:13 | b [Wrapping] | main.rs:227:18:227:18 | b [Wrapping] | provenance |  |
 | main.rs:225:13:225:13 | b [Wrapping] | main.rs:229:18:229:18 | b [Wrapping] | provenance |  |
@@ -212,43 +212,43 @@ edges
 | main.rs:226:32:226:57 | Wrapping(...) [Wrapping] | main.rs:226:13:226:13 | c [Wrapping] | provenance |  |
 | main.rs:226:41:226:56 | ...::source(...) | main.rs:226:32:226:57 | Wrapping(...) [Wrapping] | provenance |  |
 | main.rs:227:13:227:14 | v1 [Wrapping] | main.rs:228:21:228:22 | v1 [Wrapping] | provenance |  |
-| main.rs:227:18:227:18 | b [Wrapping] | main.rs:227:18:227:22 | ... + ... [Wrapping] | provenance | MaD:1 |
+| main.rs:227:18:227:18 | b [Wrapping] | main.rs:227:18:227:22 | ... + ... [Wrapping] | provenance | MaD:3 |
 | main.rs:227:18:227:22 | ... + ... [Wrapping] | main.rs:227:13:227:14 | v1 [Wrapping] | provenance |  |
-| main.rs:227:22:227:22 | c [Wrapping] | main.rs:227:18:227:22 | ... + ... [Wrapping] | provenance | MaD:1 |
+| main.rs:227:22:227:22 | c [Wrapping] | main.rs:227:18:227:22 | ... + ... [Wrapping] | provenance | MaD:3 |
 | main.rs:228:21:228:22 | v1 [Wrapping] | main.rs:228:21:228:24 | v1.0 | provenance |  |
 | main.rs:229:13:229:14 | v2 [Wrapping] | main.rs:230:21:230:22 | v2 [Wrapping] | provenance |  |
-| main.rs:229:18:229:18 | b [Wrapping] | main.rs:229:18:229:25 | b.add(...) [Wrapping] | provenance | MaD:1 |
+| main.rs:229:18:229:18 | b [Wrapping] | main.rs:229:18:229:25 | b.add(...) [Wrapping] | provenance | MaD:3 |
 | main.rs:229:18:229:25 | b.add(...) [Wrapping] | main.rs:229:13:229:14 | v2 [Wrapping] | provenance |  |
-| main.rs:229:24:229:24 | c [Wrapping] | main.rs:229:18:229:25 | b.add(...) [Wrapping] | provenance | MaD:1 |
+| main.rs:229:24:229:24 | c [Wrapping] | main.rs:229:18:229:25 | b.add(...) [Wrapping] | provenance | MaD:3 |
 | main.rs:230:21:230:22 | v2 [Wrapping] | main.rs:230:21:230:24 | v2.0 | provenance |  |
 | main.rs:231:13:231:14 | v3 [Wrapping] | main.rs:232:21:232:22 | v3 [Wrapping] | provenance |  |
 | main.rs:231:18:231:19 | - ... [Wrapping] | main.rs:231:13:231:14 | v3 [Wrapping] | provenance |  |
-| main.rs:231:19:231:19 | b [Wrapping] | main.rs:231:18:231:19 | - ... [Wrapping] | provenance | MaD:34 |
+| main.rs:231:19:231:19 | b [Wrapping] | main.rs:231:18:231:19 | - ... [Wrapping] | provenance | MaD:1 |
 | main.rs:232:21:232:22 | v3 [Wrapping] | main.rs:232:21:232:24 | v3.0 | provenance |  |
 | main.rs:233:13:233:14 | v4 [Wrapping] | main.rs:234:21:234:22 | v4 [Wrapping] | provenance |  |
-| main.rs:233:18:233:18 | b [Wrapping] | main.rs:233:18:233:24 | b.neg() [Wrapping] | provenance | MaD:34 |
+| main.rs:233:18:233:18 | b [Wrapping] | main.rs:233:18:233:24 | b.neg() [Wrapping] | provenance | MaD:1 |
 | main.rs:233:18:233:24 | b.neg() [Wrapping] | main.rs:233:13:233:14 | v4 [Wrapping] | provenance |  |
 | main.rs:234:21:234:22 | v4 [Wrapping] | main.rs:234:21:234:24 | v4.0 | provenance |  |
 | main.rs:235:13:235:14 | v5 [Wrapping] | main.rs:236:21:236:22 | v5 [Wrapping] | provenance |  |
 | main.rs:235:18:235:19 | ! ... [Wrapping] | main.rs:235:13:235:14 | v5 [Wrapping] | provenance |  |
-| main.rs:235:19:235:19 | b [Wrapping] | main.rs:235:18:235:19 | ! ... [Wrapping] | provenance | MaD:35 |
+| main.rs:235:19:235:19 | b [Wrapping] | main.rs:235:18:235:19 | ! ... [Wrapping] | provenance | MaD:2 |
 | main.rs:236:21:236:22 | v5 [Wrapping] | main.rs:236:21:236:24 | v5.0 | provenance |  |
 | main.rs:237:13:237:14 | v6 [Wrapping] | main.rs:238:21:238:22 | v6 [Wrapping] | provenance |  |
-| main.rs:237:18:237:18 | b [Wrapping] | main.rs:237:18:237:24 | b.not() [Wrapping] | provenance | MaD:35 |
+| main.rs:237:18:237:18 | b [Wrapping] | main.rs:237:18:237:24 | b.not() [Wrapping] | provenance | MaD:2 |
 | main.rs:237:18:237:24 | b.not() [Wrapping] | main.rs:237:13:237:14 | v6 [Wrapping] | provenance |  |
 | main.rs:238:21:238:22 | v6 [Wrapping] | main.rs:238:21:238:24 | v6.0 | provenance |  |
 | main.rs:239:13:239:14 | v7 [Wrapping] | main.rs:240:21:240:22 | v7 [Wrapping] | provenance |  |
-| main.rs:239:18:239:18 | b [Wrapping] | main.rs:239:18:239:22 | ... & ... [Wrapping] | provenance | MaD:14 |
+| main.rs:239:18:239:18 | b [Wrapping] | main.rs:239:18:239:22 | ... & ... [Wrapping] | provenance | MaD:16 |
 | main.rs:239:18:239:22 | ... & ... [Wrapping] | main.rs:239:13:239:14 | v7 [Wrapping] | provenance |  |
-| main.rs:239:22:239:22 | c [Wrapping] | main.rs:239:18:239:22 | ... & ... [Wrapping] | provenance | MaD:14 |
+| main.rs:239:22:239:22 | c [Wrapping] | main.rs:239:18:239:22 | ... & ... [Wrapping] | provenance | MaD:16 |
 | main.rs:240:21:240:22 | v7 [Wrapping] | main.rs:240:21:240:24 | v7.0 | provenance |  |
 | main.rs:241:13:241:14 | v8 | main.rs:242:21:242:24 | v8.0 | provenance |  |
 | main.rs:241:13:241:14 | v8 [Wrapping] | main.rs:242:21:242:22 | v8 [Wrapping] | provenance |  |
-| main.rs:241:18:241:18 | b [Wrapping] | main.rs:241:18:241:37 | ... << ... [Wrapping] | provenance | MaD:24 |
+| main.rs:241:18:241:18 | b [Wrapping] | main.rs:241:18:241:37 | ... << ... [Wrapping] | provenance | MaD:26 |
 | main.rs:241:18:241:37 | ... << ... | main.rs:241:13:241:14 | v8 | provenance |  |
 | main.rs:241:18:241:37 | ... << ... [Wrapping] | main.rs:241:13:241:14 | v8 [Wrapping] | provenance |  |
-| main.rs:241:23:241:37 | source_usize(...) | main.rs:241:18:241:37 | ... << ... | provenance | MaD:25 |
-| main.rs:241:23:241:37 | source_usize(...) | main.rs:241:18:241:37 | ... << ... [Wrapping] | provenance | MaD:24 |
+| main.rs:241:23:241:37 | source_usize(...) | main.rs:241:18:241:37 | ... << ... | provenance | MaD:27 |
+| main.rs:241:23:241:37 | source_usize(...) | main.rs:241:18:241:37 | ... << ... [Wrapping] | provenance | MaD:26 |
 | main.rs:242:21:242:22 | v8 [Wrapping] | main.rs:242:21:242:24 | v8.0 | provenance |  |
 nodes
 | main.rs:12:9:12:9 | a | semmle.label | a |
diff --git a/rust/ql/test/library-tests/definitions/Definitions.expected b/rust/ql/test/library-tests/definitions/Definitions.expected
index 23ad4e291de3..3a3b079f4583 100644
--- a/rust/ql/test/library-tests/definitions/Definitions.expected
+++ b/rust/ql/test/library-tests/definitions/Definitions.expected
@@ -11,8 +11,8 @@
 | main.rs:20:16:20:16 | x | main.rs:19:20:19:20 | x | local variable |
 | main.rs:29:5:29:11 | println | {EXTERNAL LOCATION} | MacroRules | path |
 | main.rs:29:22:29:26 | value | main.rs:29:50:29:54 | value | format argument |
-| main.rs:29:29:29:33 | width | main.rs:26:9:26:13 | width | local variable |
-| main.rs:29:36:29:44 | precision | main.rs:27:9:27:17 | precision | local variable |
+| main.rs:29:29:29:33 | width | main.rs:29:50:29:54 | value | format argument |
+| main.rs:29:36:29:44 | precision | main.rs:29:50:29:54 | value | format argument |
 | main.rs:30:5:30:11 | println | {EXTERNAL LOCATION} | MacroRules | path |
 | main.rs:30:22:30:22 | 0 | main.rs:30:34:30:38 | value | format argument |
 | main.rs:30:25:30:25 | 1 | main.rs:30:41:30:45 | width | format argument |
diff --git a/rust/ql/test/library-tests/frameworks/postgres/main.rs b/rust/ql/test/library-tests/frameworks/postgres/main.rs
index 262e22855bf1..64844da4b238 100644
--- a/rust/ql/test/library-tests/frameworks/postgres/main.rs
+++ b/rust/ql/test/library-tests/frameworks/postgres/main.rs
@@ -7,12 +7,12 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let mut conn = postgres::Client::connect("host=localhost user=postgres", postgres::NoTls)?;
 
-    conn.execute(       // $ sql-sink
+    conn.execute(
         "CREATE TABLE person (
             id SERIAL PRIMARY KEY,
             name VARCHAR NOT NULL,
             age INT NOT NULL
-        )",
+        )", // $ sql-sink
         &[],
     )?;
 
diff --git a/rust/ql/test/library-tests/frameworks/rusqlite/main.rs b/rust/ql/test/library-tests/frameworks/rusqlite/main.rs
index 441aa35f798b..58fb407e12e9 100644
--- a/rust/ql/test/library-tests/frameworks/rusqlite/main.rs
+++ b/rust/ql/test/library-tests/frameworks/rusqlite/main.rs
@@ -16,12 +16,12 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let connection = Connection::open_in_memory()?;
 
-    connection.execute(       // $ sql-sink
+    connection.execute(
         "CREATE TABLE person (
             id INTEGER PRIMARY KEY AUTOINCREMENT,
             name VARCHAR NOT NULL,
             age INT NOT NULL
-        )",
+        )", // $ sql-sink
         (),
     )?;
 
diff --git a/rust/ql/test/library-tests/path-resolution/invalid/main.rs b/rust/ql/test/library-tests/path-resolution/invalid/main.rs
index b58fcb2d9346..08918a9b60e1 100644
--- a/rust/ql/test/library-tests/path-resolution/invalid/main.rs
+++ b/rust/ql/test/library-tests/path-resolution/invalid/main.rs
@@ -4,3 +4,15 @@ struct A; // A1
 struct A; // A2
 
 fn f(x: A) {} // $ item=A2 (the latter occurence takes precedence)
+
+/// Test `m::{self}` where `m` is a struct. Per the Rust specification `m` must
+/// resolve to a module, trait, or enum:
+/// https://doc.rust-lang.org/reference/items/use-declarations.html#r-items.use.self.module
+mod self_import_from_struct {
+    struct MyStruct; // Struct
+
+    #[rustfmt::skip]
+    use self::MyStruct::{ // $ item=Struct
+        self // $ SPURIOUS: item=self_import_from_struct
+    };
+}
diff --git a/rust/ql/test/library-tests/path-resolution/main.rs b/rust/ql/test/library-tests/path-resolution/main.rs
index f95b6ef09ef3..781641e98ce0 100644
--- a/rust/ql/test/library-tests/path-resolution/main.rs
+++ b/rust/ql/test/library-tests/path-resolution/main.rs
@@ -685,29 +685,38 @@ mod m18 {
     }
 }
 
-mod m21 {
-    mod m22 {
+/// Test importing modules, traits, and enums with `{self}`.
+mod self_imports {
+    mod definitions {
+        pub mod my_module {
+            pub fn f() {} // I107
+        } // I104
+        pub trait MyTrait {} // I105
         pub enum MyEnum {
-            A, // I104
-        } // I105
+            A, // I108
+        } // I106
+    }
 
-        pub struct MyStruct; // I106
-    } // I107
+    mod imports {
+        #[rustfmt::skip]
+        use super::definitions::my_module::{ // $ item=I104
+            self // $ item=I104
+        };
 
-    mod m33 {
         #[rustfmt::skip]
-        use super::m22::MyEnum::{ // $ item=I105
+        use super::definitions::MyTrait::{ // $ item=I105
             self // $ item=I105
         };
 
         #[rustfmt::skip]
-        use super::m22::MyStruct::{ // $ item=I106
+        use super::definitions::MyEnum::{ // $ item=I106
             self // $ item=I106
         };
 
-        fn f() {
-            let _ = MyEnum::A; // $ item=I104
-            let _ = MyStruct {}; // $ item=I106
+        #[rustfmt::skip]
+        fn f<T: MyTrait>() { // $ item=I105
+            my_module::f(); // $ item=I107
+            let _ = MyEnum::A; // $ item=I108
         }
     }
 }
diff --git a/rust/ql/test/library-tests/path-resolution/path-resolution.expected b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
index ef881e62f53b..9df115b9bdb1 100644
--- a/rust/ql/test/library-tests/path-resolution/path-resolution.expected
+++ b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
@@ -1,4 +1,5 @@
 mod
+| invalid/main.rs:8:1:18:1 | mod self_import_from_struct |
 | lib.rs:1:1:1:11 | mod my |
 | main.rs:1:1:1:7 | mod my |
 | main.rs:8:1:8:8 | mod my2 |
@@ -25,18 +26,19 @@ mod
 | main.rs:668:1:686:1 | mod m18 |
 | main.rs:673:5:685:5 | mod m19 |
 | main.rs:678:9:684:9 | mod m20 |
-| main.rs:688:1:713:1 | mod m21 |
-| main.rs:689:5:695:5 | mod m22 |
-| main.rs:697:5:712:5 | mod m33 |
-| main.rs:715:1:740:1 | mod m23 |
-| main.rs:742:1:810:1 | mod m24 |
-| main.rs:827:1:879:1 | mod associated_types |
-| main.rs:881:1:954:1 | mod associated_types_subtrait |
-| main.rs:960:1:979:1 | mod impl_with_attribute_macro |
-| main.rs:981:1:1022:1 | mod patterns |
-| main.rs:1024:1:1068:1 | mod self_constructors |
-| main.rs:1070:1:1099:1 | mod self_types |
-| main.rs:1101:1:1145:1 | mod const_static |
+| main.rs:688:1:722:1 | mod self_imports |
+| main.rs:690:5:698:5 | mod definitions |
+| main.rs:691:9:693:9 | mod my_module |
+| main.rs:700:5:721:5 | mod imports |
+| main.rs:724:1:749:1 | mod m23 |
+| main.rs:751:1:819:1 | mod m24 |
+| main.rs:836:1:888:1 | mod associated_types |
+| main.rs:890:1:963:1 | mod associated_types_subtrait |
+| main.rs:969:1:988:1 | mod impl_with_attribute_macro |
+| main.rs:990:1:1031:1 | mod patterns |
+| main.rs:1033:1:1077:1 | mod self_constructors |
+| main.rs:1079:1:1108:1 | mod self_types |
+| main.rs:1110:1:1154:1 | mod const_static |
 | my2/mod.rs:1:1:1:16 | mod nested2 |
 | my2/mod.rs:20:1:20:12 | mod my3 |
 | my2/mod.rs:22:1:23:10 | mod mymod |
@@ -53,6 +55,9 @@ mod
 | my/nested.rs:2:5:11:5 | mod nested2 |
 resolvePath
 | invalid/main.rs:6:9:6:9 | A | invalid/main.rs:3:11:4:9 | struct A |
+| invalid/main.rs:15:9:15:12 | self | invalid/main.rs:8:1:18:1 | mod self_import_from_struct |
+| invalid/main.rs:15:9:15:22 | ...::MyStruct | invalid/main.rs:12:5:12:20 | struct MyStruct |
+| invalid/main.rs:16:9:16:12 | self | invalid/main.rs:8:1:18:1 | mod self_import_from_struct |
 | main.rs:4:8:4:9 | my | main.rs:1:1:1:7 | mod my |
 | main.rs:4:14:4:17 | self | main.rs:1:1:1:7 | mod my |
 | main.rs:6:5:6:6 | my | main.rs:1:1:1:7 | mod my |
@@ -78,7 +83,7 @@ resolvePath
 | main.rs:37:17:37:24 | ...::f | main.rs:26:9:28:9 | fn f |
 | main.rs:39:17:39:23 | println | {EXTERNAL LOCATION} | MacroRules |
 | main.rs:40:17:40:17 | f | main.rs:26:9:28:9 | fn f |
-| main.rs:47:9:47:13 | super | main.rs:1:1:1184:2 | SourceFile |
+| main.rs:47:9:47:13 | super | main.rs:1:1:1193:2 | SourceFile |
 | main.rs:47:9:47:17 | ...::m1 | main.rs:20:1:44:1 | mod m1 |
 | main.rs:47:9:47:21 | ...::m2 | main.rs:25:5:43:5 | mod m2 |
 | main.rs:47:9:47:24 | ...::g | main.rs:30:9:34:9 | fn g |
@@ -93,7 +98,7 @@ resolvePath
 | main.rs:68:17:68:19 | Foo | main.rs:66:9:66:21 | struct Foo |
 | main.rs:71:13:71:15 | Foo | main.rs:60:5:60:17 | struct Foo |
 | main.rs:73:5:73:5 | f | main.rs:62:5:69:5 | fn f |
-| main.rs:75:5:75:8 | self | main.rs:1:1:1184:2 | SourceFile |
+| main.rs:75:5:75:8 | self | main.rs:1:1:1193:2 | SourceFile |
 | main.rs:75:5:75:11 | ...::i | main.rs:78:1:90:1 | fn i |
 | main.rs:79:5:79:11 | println | {EXTERNAL LOCATION} | MacroRules |
 | main.rs:81:13:81:15 | Foo | main.rs:55:1:55:13 | struct Foo |
@@ -115,7 +120,7 @@ resolvePath
 | main.rs:112:9:112:15 | println | {EXTERNAL LOCATION} | MacroRules |
 | main.rs:118:9:118:15 | println | {EXTERNAL LOCATION} | MacroRules |
 | main.rs:122:9:122:15 | println | {EXTERNAL LOCATION} | MacroRules |
-| main.rs:125:13:125:17 | super | main.rs:1:1:1184:2 | SourceFile |
+| main.rs:125:13:125:17 | super | main.rs:1:1:1193:2 | SourceFile |
 | main.rs:125:13:125:21 | ...::m5 | main.rs:110:1:114:1 | mod m5 |
 | main.rs:126:9:126:9 | f | main.rs:111:5:113:5 | fn f |
 | main.rs:126:9:126:9 | f | main.rs:117:5:119:5 | fn f |
@@ -385,307 +390,313 @@ resolvePath
 | main.rs:682:17:682:21 | super | main.rs:673:5:685:5 | mod m19 |
 | main.rs:682:17:682:28 | ...::super | main.rs:668:1:686:1 | mod m18 |
 | main.rs:682:17:682:31 | ...::f | main.rs:669:5:671:5 | fn f |
-| main.rs:699:13:699:17 | super | main.rs:688:1:713:1 | mod m21 |
-| main.rs:699:13:699:22 | ...::m22 | main.rs:689:5:695:5 | mod m22 |
-| main.rs:699:13:699:30 | ...::MyEnum | main.rs:690:9:692:9 | enum MyEnum |
-| main.rs:700:13:700:16 | self | main.rs:690:9:692:9 | enum MyEnum |
-| main.rs:704:13:704:17 | super | main.rs:688:1:713:1 | mod m21 |
-| main.rs:704:13:704:22 | ...::m22 | main.rs:689:5:695:5 | mod m22 |
-| main.rs:704:13:704:32 | ...::MyStruct | main.rs:694:9:694:28 | struct MyStruct |
-| main.rs:705:13:705:16 | self | main.rs:694:9:694:28 | struct MyStruct |
-| main.rs:709:21:709:26 | MyEnum | main.rs:690:9:692:9 | enum MyEnum |
-| main.rs:709:21:709:29 | ...::A | main.rs:691:13:691:13 | A |
-| main.rs:710:21:710:28 | MyStruct | main.rs:694:9:694:28 | struct MyStruct |
-| main.rs:726:10:728:5 | Trait1::<...> | main.rs:716:5:721:5 | trait Trait1 |
-| main.rs:727:7:727:10 | Self | main.rs:723:5:723:13 | struct S |
-| main.rs:729:11:729:11 | S | main.rs:723:5:723:13 | struct S |
-| main.rs:731:13:731:19 | println | {EXTERNAL LOCATION} | MacroRules |
-| main.rs:737:17:737:17 | S | main.rs:723:5:723:13 | struct S |
-| main.rs:753:15:753:15 | T | main.rs:752:26:752:26 | T |
-| main.rs:758:9:758:24 | GenericStruct::<...> | main.rs:751:5:754:5 | struct GenericStruct |
-| main.rs:758:23:758:23 | T | main.rs:757:10:757:10 | T |
-| main.rs:760:9:760:9 | T | main.rs:757:10:757:10 | T |
-| main.rs:760:12:760:17 | TraitA | main.rs:743:5:745:5 | trait TraitA |
-| main.rs:769:9:769:24 | GenericStruct::<...> | main.rs:751:5:754:5 | struct GenericStruct |
-| main.rs:769:23:769:23 | T | main.rs:768:10:768:10 | T |
-| main.rs:771:9:771:9 | T | main.rs:768:10:768:10 | T |
-| main.rs:771:12:771:17 | TraitB | main.rs:747:5:749:5 | trait TraitB |
-| main.rs:772:9:772:9 | T | main.rs:768:10:768:10 | T |
-| main.rs:772:12:772:17 | TraitA | main.rs:743:5:745:5 | trait TraitA |
-| main.rs:783:10:783:15 | TraitA | main.rs:743:5:745:5 | trait TraitA |
-| main.rs:783:21:783:31 | Implementor | main.rs:780:5:780:23 | struct Implementor |
-| main.rs:785:13:785:19 | println | {EXTERNAL LOCATION} | MacroRules |
-| main.rs:790:10:790:15 | TraitB | main.rs:747:5:749:5 | trait TraitB |
-| main.rs:790:21:790:31 | Implementor | main.rs:780:5:780:23 | struct Implementor |
-| main.rs:792:13:792:19 | println | {EXTERNAL LOCATION} | MacroRules |
-| main.rs:798:24:798:34 | Implementor | main.rs:780:5:780:23 | struct Implementor |
-| main.rs:799:23:799:35 | GenericStruct | main.rs:751:5:754:5 | struct GenericStruct |
-| main.rs:805:9:805:36 | GenericStruct::<...> | main.rs:751:5:754:5 | struct GenericStruct |
-| main.rs:805:9:805:50 | ...::call_trait_a | main.rs:762:9:764:9 | fn call_trait_a |
-| main.rs:805:25:805:35 | Implementor | main.rs:780:5:780:23 | struct Implementor |
-| main.rs:808:9:808:36 | GenericStruct::<...> | main.rs:751:5:754:5 | struct GenericStruct |
-| main.rs:808:9:808:47 | ...::call_both | main.rs:774:9:777:9 | fn call_both |
-| main.rs:808:25:808:35 | Implementor | main.rs:780:5:780:23 | struct Implementor |
-| main.rs:814:3:814:12 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
-| main.rs:814:3:814:24 | ...::add_suffix | proc_macro.rs:4:1:13:1 | fn add_suffix |
-| main.rs:818:6:818:12 | AStruct | main.rs:817:1:817:17 | struct AStruct |
-| main.rs:820:7:820:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
-| main.rs:820:7:820:28 | ...::add_suffix | proc_macro.rs:4:1:13:1 | fn add_suffix |
-| main.rs:823:7:823:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
-| main.rs:823:7:823:28 | ...::add_suffix | proc_macro.rs:4:1:13:1 | fn add_suffix |
-| main.rs:828:9:828:11 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:828:9:828:19 | ...::marker | {EXTERNAL LOCATION} | mod marker |
-| main.rs:828:9:828:32 | ...::PhantomData | {EXTERNAL LOCATION} | struct PhantomData |
-| main.rs:829:9:829:11 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:829:9:829:19 | ...::result | {EXTERNAL LOCATION} | mod result |
-| main.rs:829:9:829:27 | ...::Result | {EXTERNAL LOCATION} | enum Result |
-| main.rs:837:19:837:22 | Self | main.rs:831:5:839:5 | trait Reduce |
-| main.rs:837:19:837:29 | ...::Input | main.rs:832:9:832:19 | type Input |
-| main.rs:838:14:838:46 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
-| main.rs:838:21:838:24 | Self | main.rs:831:5:839:5 | trait Reduce |
-| main.rs:838:21:838:32 | ...::Output | main.rs:833:21:834:20 | type Output |
-| main.rs:838:35:838:38 | Self | main.rs:831:5:839:5 | trait Reduce |
-| main.rs:838:35:838:45 | ...::Error | main.rs:832:21:833:19 | type Error |
-| main.rs:842:17:842:34 | PhantomData::<...> | {EXTERNAL LOCATION} | struct PhantomData |
-| main.rs:842:29:842:33 | Input | main.rs:841:19:841:23 | Input |
-| main.rs:843:17:843:34 | PhantomData::<...> | {EXTERNAL LOCATION} | struct PhantomData |
-| main.rs:843:29:843:33 | Error | main.rs:841:26:841:30 | Error |
-| main.rs:850:11:850:16 | Reduce | main.rs:831:5:839:5 | trait Reduce |
-| main.rs:851:13:854:9 | MyImpl::<...> | main.rs:841:5:844:5 | struct MyImpl |
-| main.rs:852:13:852:17 | Input | main.rs:848:13:848:17 | Input |
-| main.rs:853:13:853:17 | Error | main.rs:849:13:849:17 | Error |
-| main.rs:856:22:859:9 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
-| main.rs:857:13:857:17 | Input | main.rs:848:13:848:17 | Input |
-| main.rs:858:13:858:16 | Self | main.rs:846:5:878:5 | impl Reduce for MyImpl::<...> { ... } |
-| main.rs:858:13:858:23 | ...::Error | main.rs:860:11:864:9 | type Error |
-| main.rs:861:22:863:9 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
-| main.rs:862:11:862:15 | Error | main.rs:849:13:849:17 | Error |
-| main.rs:866:13:866:17 | Input | main.rs:848:13:848:17 | Input |
-| main.rs:871:19:871:22 | Self | main.rs:846:5:878:5 | impl Reduce for MyImpl::<...> { ... } |
-| main.rs:871:19:871:29 | ...::Input | main.rs:856:9:860:9 | type Input |
-| main.rs:872:14:875:9 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
-| main.rs:873:13:873:16 | Self | main.rs:846:5:878:5 | impl Reduce for MyImpl::<...> { ... } |
-| main.rs:873:13:873:24 | ...::Output | main.rs:864:11:867:9 | type Output |
-| main.rs:874:13:874:16 | Self | main.rs:846:5:878:5 | impl Reduce for MyImpl::<...> { ... } |
-| main.rs:874:13:874:23 | ...::Error | main.rs:860:11:864:9 | type Error |
-| main.rs:886:16:886:20 | Super | main.rs:882:5:884:5 | trait Super |
-| main.rs:888:19:888:22 | Self | main.rs:886:5:890:5 | trait Sub |
-| main.rs:888:19:888:27 | ...::Out | main.rs:883:9:883:17 | type Out |
-| main.rs:893:9:893:10 | ST | main.rs:892:14:892:15 | ST |
-| main.rs:897:10:897:14 | Super | main.rs:882:5:884:5 | trait Super |
-| main.rs:897:20:897:25 | S::<...> | main.rs:892:5:894:6 | struct S |
-| main.rs:897:22:897:24 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:898:20:898:23 | char | {EXTERNAL LOCATION} | struct char |
-| main.rs:903:10:903:14 | Super | main.rs:882:5:884:5 | trait Super |
-| main.rs:903:20:903:26 | S::<...> | main.rs:892:5:894:6 | struct S |
-| main.rs:903:22:903:25 | bool | {EXTERNAL LOCATION} | struct bool |
-| main.rs:904:20:904:22 | i64 | {EXTERNAL LOCATION} | struct i64 |
-| main.rs:909:10:909:12 | Sub | main.rs:886:5:890:5 | trait Sub |
-| main.rs:909:18:909:23 | S::<...> | main.rs:892:5:894:6 | struct S |
-| main.rs:909:20:909:22 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:910:19:910:22 | Self | main.rs:908:5:913:5 | impl Sub for S::<...> { ... } |
-| main.rs:910:19:910:27 | ...::Out | main.rs:883:9:883:17 | type Out |
-| main.rs:916:10:916:12 | Sub | main.rs:886:5:890:5 | trait Sub |
-| main.rs:916:18:916:24 | S::<...> | main.rs:892:5:894:6 | struct S |
-| main.rs:916:20:916:23 | bool | {EXTERNAL LOCATION} | struct bool |
-| main.rs:917:19:917:22 | Self | main.rs:915:5:920:5 | impl Sub for S::<...> { ... } |
-| main.rs:917:19:917:27 | ...::Out | main.rs:883:9:883:17 | type Out |
-| main.rs:926:19:926:26 | SuperAlt | main.rs:922:5:924:5 | trait SuperAlt |
-| main.rs:928:23:928:26 | Self | main.rs:926:5:930:5 | trait SubAlt |
-| main.rs:928:23:928:31 | ...::Out | main.rs:923:9:923:17 | type Out |
-| main.rs:933:13:933:20 | SuperAlt | main.rs:922:5:924:5 | trait SuperAlt |
-| main.rs:933:26:933:29 | S::<...> | main.rs:892:5:894:6 | struct S |
-| main.rs:933:28:933:28 | A | main.rs:933:10:933:10 | A |
-| main.rs:934:20:934:20 | A | main.rs:933:10:933:10 | A |
-| main.rs:939:13:939:18 | SubAlt | main.rs:926:5:930:5 | trait SubAlt |
-| main.rs:939:24:939:27 | S::<...> | main.rs:892:5:894:6 | struct S |
-| main.rs:939:26:939:26 | A | main.rs:939:10:939:10 | A |
-| main.rs:940:23:940:26 | Self | main.rs:938:5:943:5 | impl SubAlt for S::<...> { ... } |
-| main.rs:940:23:940:31 | ...::Out | main.rs:923:9:923:17 | type Out |
-| main.rs:946:10:946:16 | S::<...> | main.rs:892:5:894:6 | struct S |
-| main.rs:946:12:946:15 | bool | {EXTERNAL LOCATION} | struct bool |
-| main.rs:948:21:948:37 | <...> | main.rs:882:5:884:5 | trait Super |
-| main.rs:948:21:948:42 | ...::Out | main.rs:883:9:883:17 | type Out |
-| main.rs:948:22:948:27 | S::<...> | main.rs:892:5:894:6 | struct S |
-| main.rs:948:24:948:26 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:948:32:948:36 | Super | main.rs:882:5:884:5 | trait Super |
-| main.rs:949:21:949:38 | <...> | main.rs:882:5:884:5 | trait Super |
-| main.rs:949:21:949:43 | ...::Out | main.rs:883:9:883:17 | type Out |
-| main.rs:949:22:949:28 | S::<...> | main.rs:892:5:894:6 | struct S |
-| main.rs:949:24:949:27 | bool | {EXTERNAL LOCATION} | struct bool |
-| main.rs:949:33:949:37 | Super | main.rs:882:5:884:5 | trait Super |
-| main.rs:951:21:951:41 | <...> | main.rs:922:5:924:5 | trait SuperAlt |
-| main.rs:951:21:951:46 | ...::Out | main.rs:923:9:923:17 | type Out |
-| main.rs:951:22:951:28 | S::<...> | main.rs:892:5:894:6 | struct S |
-| main.rs:951:24:951:27 | bool | {EXTERNAL LOCATION} | struct bool |
-| main.rs:951:33:951:40 | SuperAlt | main.rs:922:5:924:5 | trait SuperAlt |
-| main.rs:956:5:956:7 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:956:11:956:14 | self | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:958:15:958:17 | ztd | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:958:15:958:25 | ...::string | {EXTERNAL LOCATION} | mod string |
-| main.rs:958:15:958:33 | ...::String | {EXTERNAL LOCATION} | struct String |
-| main.rs:968:7:968:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
-| main.rs:968:7:968:26 | ...::identity | proc_macro.rs:15:1:18:1 | fn identity |
-| main.rs:969:10:969:15 | ATrait | main.rs:964:5:966:5 | trait ATrait |
-| main.rs:969:21:969:23 | i64 | {EXTERNAL LOCATION} | struct i64 |
-| main.rs:971:11:971:13 | i64 | {EXTERNAL LOCATION} | struct i64 |
-| main.rs:977:17:977:19 | Foo | main.rs:962:5:962:15 | struct Foo |
-| main.rs:983:22:983:32 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
-| main.rs:983:29:983:31 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:984:17:984:20 | Some | {EXTERNAL LOCATION} | Some |
-| main.rs:985:17:985:27 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
-| main.rs:985:24:985:26 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:986:13:986:16 | Some | {EXTERNAL LOCATION} | Some |
-| main.rs:987:17:987:20 | None | {EXTERNAL LOCATION} | None |
-| main.rs:989:13:989:16 | None | {EXTERNAL LOCATION} | None |
-| main.rs:990:17:990:20 | None | {EXTERNAL LOCATION} | None |
-| main.rs:999:19:999:29 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
-| main.rs:999:26:999:28 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1000:26:1000:29 | test | main.rs:982:5:996:5 | fn test |
-| main.rs:1006:14:1006:16 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1011:17:1011:20 | Some | {EXTERNAL LOCATION} | Some |
-| main.rs:1013:13:1013:16 | Some | {EXTERNAL LOCATION} | Some |
-| main.rs:1018:13:1018:16 | Some | {EXTERNAL LOCATION} | Some |
-| main.rs:1018:18:1018:18 | z | main.rs:1005:5:1007:12 | const z |
-| main.rs:1018:24:1018:24 | z | main.rs:1005:5:1007:12 | const z |
-| main.rs:1026:24:1026:26 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1029:10:1029:20 | TupleStruct | main.rs:1026:5:1026:28 | struct TupleStruct |
-| main.rs:1031:19:1031:21 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1031:27:1031:30 | Self | main.rs:1026:5:1026:28 | struct TupleStruct |
-| main.rs:1032:21:1032:24 | Self | main.rs:1026:5:1026:28 | struct TupleStruct |
-| main.rs:1033:31:1033:34 | Self | main.rs:1026:5:1026:28 | struct TupleStruct |
-| main.rs:1039:12:1039:14 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1043:10:1043:21 | StructStruct | main.rs:1038:5:1040:5 | struct StructStruct |
-| main.rs:1045:19:1045:21 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1045:27:1045:30 | Self | main.rs:1038:5:1040:5 | struct StructStruct |
-| main.rs:1046:13:1046:16 | Self | main.rs:1038:5:1040:5 | struct StructStruct |
-| main.rs:1052:13:1052:15 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1057:10:1057:15 | MyEnum | main.rs:1050:5:1054:5 | enum MyEnum |
-| main.rs:1058:25:1058:27 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1060:17:1060:20 | Self | main.rs:1056:5:1067:5 | impl MyEnum { ... } |
-| main.rs:1060:17:1060:23 | ...::A | main.rs:1051:9:1053:9 | A |
-| main.rs:1073:15:1073:15 | T | main.rs:1072:31:1072:31 | T |
-| main.rs:1074:15:1074:31 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
-| main.rs:1074:22:1074:30 | Box::<...> | {EXTERNAL LOCATION} | struct Box |
-| main.rs:1074:26:1074:29 | Self | main.rs:1072:5:1075:5 | struct NonEmptyListStruct |
-| main.rs:1078:16:1078:16 | T | main.rs:1077:27:1077:27 | T |
-| main.rs:1079:14:1079:14 | T | main.rs:1077:27:1077:27 | T |
-| main.rs:1079:17:1079:25 | Box::<...> | {EXTERNAL LOCATION} | struct Box |
-| main.rs:1079:21:1079:24 | Self | main.rs:1077:5:1080:5 | enum NonEmptyListEnum |
-| main.rs:1083:10:1083:30 | NonEmptyListEnum::<...> | main.rs:1077:5:1080:5 | enum NonEmptyListEnum |
-| main.rs:1083:27:1083:29 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1084:30:1084:32 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1084:38:1084:41 | Self | main.rs:1077:5:1080:5 | enum NonEmptyListEnum |
-| main.rs:1085:17:1085:32 | NonEmptyListEnum | main.rs:1077:5:1080:5 | enum NonEmptyListEnum |
-| main.rs:1086:13:1086:16 | Self | main.rs:1082:5:1088:5 | impl NonEmptyListEnum::<...> { ... } |
-| main.rs:1086:13:1086:24 | ...::Single | main.rs:1078:9:1078:17 | Single |
-| main.rs:1094:13:1094:16 | Copy | {EXTERNAL LOCATION} | trait Copy |
-| main.rs:1096:17:1096:17 | T | main.rs:1093:9:1093:9 | T |
-| main.rs:1097:16:1097:16 | T | main.rs:1093:9:1093:9 | T |
-| main.rs:1097:23:1097:26 | Self | main.rs:1090:5:1098:5 | union NonEmptyListUnion |
-| main.rs:1103:9:1103:13 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
-| main.rs:1103:9:1103:27 | ...::const_static | main.rs:1101:1:1145:1 | mod const_static |
-| main.rs:1105:27:1105:29 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1107:29:1107:31 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1110:17:1110:26 | CONST_ITEM | main.rs:1105:5:1105:35 | const CONST_ITEM |
-| main.rs:1111:17:1111:27 | STATIC_ITEM | main.rs:1107:5:1107:37 | static STATIC_ITEM |
-| main.rs:1112:17:1112:28 | const_static | main.rs:1101:1:1145:1 | mod const_static |
-| main.rs:1112:17:1112:40 | ...::CONST_ITEM | main.rs:1105:5:1105:35 | const CONST_ITEM |
-| main.rs:1113:17:1113:28 | const_static | main.rs:1101:1:1145:1 | mod const_static |
-| main.rs:1113:17:1113:41 | ...::STATIC_ITEM | main.rs:1107:5:1107:37 | static STATIC_ITEM |
-| main.rs:1114:17:1114:27 | CONST_ALIAS | main.rs:1117:9:1118:13 | const CONST_ALIAS |
-| main.rs:1115:17:1115:28 | STATIC_ALIAS | main.rs:1118:15:1120:13 | static STATIC_ALIAS |
-| main.rs:1117:28:1117:30 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1117:34:1117:43 | CONST_ITEM | main.rs:1105:5:1105:35 | const CONST_ITEM |
-| main.rs:1119:30:1119:32 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1119:36:1119:46 | STATIC_ITEM | main.rs:1107:5:1107:37 | static STATIC_ITEM |
-| main.rs:1122:17:1122:27 | CONST_ALIAS | main.rs:1117:9:1118:13 | const CONST_ALIAS |
-| main.rs:1123:17:1123:28 | STATIC_ALIAS | main.rs:1118:15:1120:13 | static STATIC_ALIAS |
-| main.rs:1126:32:1126:34 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1126:38:1126:47 | CONST_ITEM | main.rs:1105:5:1105:35 | const CONST_ITEM |
-| main.rs:1128:34:1128:36 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1128:40:1128:50 | STATIC_ITEM | main.rs:1107:5:1107:37 | static STATIC_ITEM |
-| main.rs:1131:21:1131:31 | CONST_ALIAS | main.rs:1126:13:1127:17 | const CONST_ALIAS |
-| main.rs:1132:21:1132:32 | STATIC_ALIAS | main.rs:1127:19:1129:17 | static STATIC_ALIAS |
-| main.rs:1136:32:1136:34 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1136:38:1136:47 | CONST_ITEM | main.rs:1105:5:1105:35 | const CONST_ITEM |
-| main.rs:1138:34:1138:36 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:1138:40:1138:50 | STATIC_ITEM | main.rs:1107:5:1107:37 | static STATIC_ITEM |
-| main.rs:1141:21:1141:31 | CONST_ALIAS | main.rs:1136:13:1137:17 | const CONST_ALIAS |
-| main.rs:1142:21:1142:32 | STATIC_ALIAS | main.rs:1137:19:1139:17 | static STATIC_ALIAS |
-| main.rs:1148:5:1148:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:1148:5:1148:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
-| main.rs:1148:5:1148:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
-| main.rs:1148:5:1148:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
-| main.rs:1148:5:1148:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
-| main.rs:1149:5:1149:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:1149:5:1149:9 | ...::f | my.rs:5:1:7:1 | fn f |
-| main.rs:1150:5:1150:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
-| main.rs:1150:5:1150:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
-| main.rs:1150:5:1150:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
-| main.rs:1150:5:1150:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:1151:5:1151:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:1152:5:1152:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:1153:5:1153:9 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
-| main.rs:1153:5:1153:12 | ...::h | main.rs:57:1:76:1 | fn h |
-| main.rs:1154:5:1154:6 | m1 | main.rs:20:1:44:1 | mod m1 |
-| main.rs:1154:5:1154:10 | ...::m2 | main.rs:25:5:43:5 | mod m2 |
-| main.rs:1154:5:1154:13 | ...::g | main.rs:30:9:34:9 | fn g |
-| main.rs:1155:5:1155:6 | m1 | main.rs:20:1:44:1 | mod m1 |
-| main.rs:1155:5:1155:10 | ...::m2 | main.rs:25:5:43:5 | mod m2 |
-| main.rs:1155:5:1155:14 | ...::m3 | main.rs:36:9:42:9 | mod m3 |
-| main.rs:1155:5:1155:17 | ...::h | main.rs:37:27:41:13 | fn h |
-| main.rs:1156:5:1156:6 | m4 | main.rs:46:1:53:1 | mod m4 |
-| main.rs:1156:5:1156:9 | ...::i | main.rs:49:5:52:5 | fn i |
-| main.rs:1157:5:1157:5 | h | main.rs:57:1:76:1 | fn h |
-| main.rs:1158:5:1158:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:1159:5:1159:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:1160:5:1160:5 | j | main.rs:104:1:108:1 | fn j |
-| main.rs:1161:5:1161:6 | m6 | main.rs:116:1:128:1 | mod m6 |
-| main.rs:1161:5:1161:9 | ...::g | main.rs:121:5:127:5 | fn g |
-| main.rs:1162:5:1162:6 | m7 | main.rs:130:1:149:1 | mod m7 |
-| main.rs:1162:5:1162:9 | ...::f | main.rs:141:5:148:5 | fn f |
-| main.rs:1163:5:1163:6 | m8 | main.rs:151:1:205:1 | mod m8 |
-| main.rs:1163:5:1163:9 | ...::g | main.rs:189:5:204:5 | fn g |
-| main.rs:1164:5:1164:6 | m9 | main.rs:207:1:215:1 | mod m9 |
-| main.rs:1164:5:1164:9 | ...::f | main.rs:210:5:214:5 | fn f |
-| main.rs:1165:5:1165:7 | m11 | main.rs:238:1:275:1 | mod m11 |
-| main.rs:1165:5:1165:10 | ...::f | main.rs:243:5:246:5 | fn f |
-| main.rs:1166:5:1166:7 | m15 | main.rs:306:1:375:1 | mod m15 |
-| main.rs:1166:5:1166:10 | ...::f | main.rs:362:5:374:5 | fn f |
-| main.rs:1167:5:1167:7 | m16 | main.rs:377:1:575:1 | mod m16 |
-| main.rs:1167:5:1167:10 | ...::f | main.rs:447:5:471:5 | fn f |
-| main.rs:1168:5:1168:20 | trait_visibility | main.rs:577:1:634:1 | mod trait_visibility |
-| main.rs:1168:5:1168:23 | ...::f | main.rs:604:5:633:5 | fn f |
-| main.rs:1169:5:1169:7 | m17 | main.rs:636:1:666:1 | mod m17 |
-| main.rs:1169:5:1169:10 | ...::f | main.rs:660:5:665:5 | fn f |
-| main.rs:1170:5:1170:11 | nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
-| main.rs:1170:5:1170:14 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
-| main.rs:1171:5:1171:11 | nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
-| main.rs:1171:5:1171:14 | ...::f | my2/nested2.rs:23:9:25:9 | fn f |
-| main.rs:1172:5:1172:7 | my3 | my2/mod.rs:20:1:20:12 | mod my3 |
-| main.rs:1172:5:1172:10 | ...::f | my2/my3/mod.rs:1:1:5:1 | fn f |
-| main.rs:1173:5:1173:12 | nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
-| main.rs:1174:5:1174:12 | my_alias | main.rs:1:1:1:7 | mod my |
-| main.rs:1174:5:1174:22 | ...::nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
-| main.rs:1175:5:1175:7 | m18 | main.rs:668:1:686:1 | mod m18 |
-| main.rs:1175:5:1175:12 | ...::m19 | main.rs:673:5:685:5 | mod m19 |
-| main.rs:1175:5:1175:17 | ...::m20 | main.rs:678:9:684:9 | mod m20 |
-| main.rs:1175:5:1175:20 | ...::g | main.rs:679:13:683:13 | fn g |
-| main.rs:1176:5:1176:7 | m23 | main.rs:715:1:740:1 | mod m23 |
-| main.rs:1176:5:1176:10 | ...::f | main.rs:735:5:739:5 | fn f |
-| main.rs:1177:5:1177:7 | m24 | main.rs:742:1:810:1 | mod m24 |
-| main.rs:1177:5:1177:10 | ...::f | main.rs:796:5:809:5 | fn f |
-| main.rs:1178:5:1178:8 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
-| main.rs:1178:5:1178:11 | ...::h | main.rs:57:1:76:1 | fn h |
-| main.rs:1179:5:1179:13 | z_changed | main.rs:815:1:815:9 | fn z_changed |
-| main.rs:1180:5:1180:11 | AStruct | main.rs:817:1:817:17 | struct AStruct |
-| main.rs:1180:5:1180:22 | ...::z_on_type | main.rs:821:5:821:17 | fn z_on_type |
-| main.rs:1181:5:1181:11 | AStruct | main.rs:817:1:817:17 | struct AStruct |
-| main.rs:1182:5:1182:29 | impl_with_attribute_macro | main.rs:960:1:979:1 | mod impl_with_attribute_macro |
-| main.rs:1182:5:1182:35 | ...::test | main.rs:975:5:978:5 | fn test |
-| main.rs:1183:5:1183:12 | patterns | main.rs:981:1:1022:1 | mod patterns |
-| main.rs:1183:5:1183:18 | ...::test | main.rs:982:5:996:5 | fn test |
+| main.rs:702:13:702:17 | super | main.rs:688:1:722:1 | mod self_imports |
+| main.rs:702:13:702:30 | ...::definitions | main.rs:690:5:698:5 | mod definitions |
+| main.rs:702:13:702:41 | ...::my_module | main.rs:691:9:693:9 | mod my_module |
+| main.rs:703:13:703:16 | self | main.rs:691:9:693:9 | mod my_module |
+| main.rs:707:13:707:17 | super | main.rs:688:1:722:1 | mod self_imports |
+| main.rs:707:13:707:30 | ...::definitions | main.rs:690:5:698:5 | mod definitions |
+| main.rs:707:13:707:39 | ...::MyTrait | main.rs:693:11:694:28 | trait MyTrait |
+| main.rs:708:13:708:16 | self | main.rs:693:11:694:28 | trait MyTrait |
+| main.rs:712:13:712:17 | super | main.rs:688:1:722:1 | mod self_imports |
+| main.rs:712:13:712:30 | ...::definitions | main.rs:690:5:698:5 | mod definitions |
+| main.rs:712:13:712:38 | ...::MyEnum | main.rs:694:30:697:9 | enum MyEnum |
+| main.rs:713:13:713:16 | self | main.rs:694:30:697:9 | enum MyEnum |
+| main.rs:717:17:717:23 | MyTrait | main.rs:693:11:694:28 | trait MyTrait |
+| main.rs:718:13:718:21 | my_module | main.rs:691:9:693:9 | mod my_module |
+| main.rs:718:13:718:24 | ...::f | main.rs:692:13:692:25 | fn f |
+| main.rs:719:21:719:26 | MyEnum | main.rs:694:30:697:9 | enum MyEnum |
+| main.rs:719:21:719:29 | ...::A | main.rs:696:13:696:13 | A |
+| main.rs:735:10:737:5 | Trait1::<...> | main.rs:725:5:730:5 | trait Trait1 |
+| main.rs:736:7:736:10 | Self | main.rs:732:5:732:13 | struct S |
+| main.rs:738:11:738:11 | S | main.rs:732:5:732:13 | struct S |
+| main.rs:740:13:740:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:746:17:746:17 | S | main.rs:732:5:732:13 | struct S |
+| main.rs:762:15:762:15 | T | main.rs:761:26:761:26 | T |
+| main.rs:767:9:767:24 | GenericStruct::<...> | main.rs:760:5:763:5 | struct GenericStruct |
+| main.rs:767:23:767:23 | T | main.rs:766:10:766:10 | T |
+| main.rs:769:9:769:9 | T | main.rs:766:10:766:10 | T |
+| main.rs:769:12:769:17 | TraitA | main.rs:752:5:754:5 | trait TraitA |
+| main.rs:778:9:778:24 | GenericStruct::<...> | main.rs:760:5:763:5 | struct GenericStruct |
+| main.rs:778:23:778:23 | T | main.rs:777:10:777:10 | T |
+| main.rs:780:9:780:9 | T | main.rs:777:10:777:10 | T |
+| main.rs:780:12:780:17 | TraitB | main.rs:756:5:758:5 | trait TraitB |
+| main.rs:781:9:781:9 | T | main.rs:777:10:777:10 | T |
+| main.rs:781:12:781:17 | TraitA | main.rs:752:5:754:5 | trait TraitA |
+| main.rs:792:10:792:15 | TraitA | main.rs:752:5:754:5 | trait TraitA |
+| main.rs:792:21:792:31 | Implementor | main.rs:789:5:789:23 | struct Implementor |
+| main.rs:794:13:794:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:799:10:799:15 | TraitB | main.rs:756:5:758:5 | trait TraitB |
+| main.rs:799:21:799:31 | Implementor | main.rs:789:5:789:23 | struct Implementor |
+| main.rs:801:13:801:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:807:24:807:34 | Implementor | main.rs:789:5:789:23 | struct Implementor |
+| main.rs:808:23:808:35 | GenericStruct | main.rs:760:5:763:5 | struct GenericStruct |
+| main.rs:814:9:814:36 | GenericStruct::<...> | main.rs:760:5:763:5 | struct GenericStruct |
+| main.rs:814:9:814:50 | ...::call_trait_a | main.rs:771:9:773:9 | fn call_trait_a |
+| main.rs:814:25:814:35 | Implementor | main.rs:789:5:789:23 | struct Implementor |
+| main.rs:817:9:817:36 | GenericStruct::<...> | main.rs:760:5:763:5 | struct GenericStruct |
+| main.rs:817:9:817:47 | ...::call_both | main.rs:783:9:786:9 | fn call_both |
+| main.rs:817:25:817:35 | Implementor | main.rs:789:5:789:23 | struct Implementor |
+| main.rs:823:3:823:12 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
+| main.rs:823:3:823:24 | ...::add_suffix | proc_macro.rs:4:1:13:1 | fn add_suffix |
+| main.rs:827:6:827:12 | AStruct | main.rs:826:1:826:17 | struct AStruct |
+| main.rs:829:7:829:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
+| main.rs:829:7:829:28 | ...::add_suffix | proc_macro.rs:4:1:13:1 | fn add_suffix |
+| main.rs:832:7:832:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
+| main.rs:832:7:832:28 | ...::add_suffix | proc_macro.rs:4:1:13:1 | fn add_suffix |
+| main.rs:837:9:837:11 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:837:9:837:19 | ...::marker | {EXTERNAL LOCATION} | mod marker |
+| main.rs:837:9:837:32 | ...::PhantomData | {EXTERNAL LOCATION} | struct PhantomData |
+| main.rs:838:9:838:11 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:838:9:838:19 | ...::result | {EXTERNAL LOCATION} | mod result |
+| main.rs:838:9:838:27 | ...::Result | {EXTERNAL LOCATION} | enum Result |
+| main.rs:846:19:846:22 | Self | main.rs:840:5:848:5 | trait Reduce |
+| main.rs:846:19:846:29 | ...::Input | main.rs:841:9:841:19 | type Input |
+| main.rs:847:14:847:46 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
+| main.rs:847:21:847:24 | Self | main.rs:840:5:848:5 | trait Reduce |
+| main.rs:847:21:847:32 | ...::Output | main.rs:842:21:843:20 | type Output |
+| main.rs:847:35:847:38 | Self | main.rs:840:5:848:5 | trait Reduce |
+| main.rs:847:35:847:45 | ...::Error | main.rs:841:21:842:19 | type Error |
+| main.rs:851:17:851:34 | PhantomData::<...> | {EXTERNAL LOCATION} | struct PhantomData |
+| main.rs:851:29:851:33 | Input | main.rs:850:19:850:23 | Input |
+| main.rs:852:17:852:34 | PhantomData::<...> | {EXTERNAL LOCATION} | struct PhantomData |
+| main.rs:852:29:852:33 | Error | main.rs:850:26:850:30 | Error |
+| main.rs:859:11:859:16 | Reduce | main.rs:840:5:848:5 | trait Reduce |
+| main.rs:860:13:863:9 | MyImpl::<...> | main.rs:850:5:853:5 | struct MyImpl |
+| main.rs:861:13:861:17 | Input | main.rs:857:13:857:17 | Input |
+| main.rs:862:13:862:17 | Error | main.rs:858:13:858:17 | Error |
+| main.rs:865:22:868:9 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
+| main.rs:866:13:866:17 | Input | main.rs:857:13:857:17 | Input |
+| main.rs:867:13:867:16 | Self | main.rs:855:5:887:5 | impl Reduce for MyImpl::<...> { ... } |
+| main.rs:867:13:867:23 | ...::Error | main.rs:869:11:873:9 | type Error |
+| main.rs:870:22:872:9 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
+| main.rs:871:11:871:15 | Error | main.rs:858:13:858:17 | Error |
+| main.rs:875:13:875:17 | Input | main.rs:857:13:857:17 | Input |
+| main.rs:880:19:880:22 | Self | main.rs:855:5:887:5 | impl Reduce for MyImpl::<...> { ... } |
+| main.rs:880:19:880:29 | ...::Input | main.rs:865:9:869:9 | type Input |
+| main.rs:881:14:884:9 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
+| main.rs:882:13:882:16 | Self | main.rs:855:5:887:5 | impl Reduce for MyImpl::<...> { ... } |
+| main.rs:882:13:882:24 | ...::Output | main.rs:873:11:876:9 | type Output |
+| main.rs:883:13:883:16 | Self | main.rs:855:5:887:5 | impl Reduce for MyImpl::<...> { ... } |
+| main.rs:883:13:883:23 | ...::Error | main.rs:869:11:873:9 | type Error |
+| main.rs:895:16:895:20 | Super | main.rs:891:5:893:5 | trait Super |
+| main.rs:897:19:897:22 | Self | main.rs:895:5:899:5 | trait Sub |
+| main.rs:897:19:897:27 | ...::Out | main.rs:892:9:892:17 | type Out |
+| main.rs:902:9:902:10 | ST | main.rs:901:14:901:15 | ST |
+| main.rs:906:10:906:14 | Super | main.rs:891:5:893:5 | trait Super |
+| main.rs:906:20:906:25 | S::<...> | main.rs:901:5:903:6 | struct S |
+| main.rs:906:22:906:24 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:907:20:907:23 | char | {EXTERNAL LOCATION} | struct char |
+| main.rs:912:10:912:14 | Super | main.rs:891:5:893:5 | trait Super |
+| main.rs:912:20:912:26 | S::<...> | main.rs:901:5:903:6 | struct S |
+| main.rs:912:22:912:25 | bool | {EXTERNAL LOCATION} | struct bool |
+| main.rs:913:20:913:22 | i64 | {EXTERNAL LOCATION} | struct i64 |
+| main.rs:918:10:918:12 | Sub | main.rs:895:5:899:5 | trait Sub |
+| main.rs:918:18:918:23 | S::<...> | main.rs:901:5:903:6 | struct S |
+| main.rs:918:20:918:22 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:919:19:919:22 | Self | main.rs:917:5:922:5 | impl Sub for S::<...> { ... } |
+| main.rs:919:19:919:27 | ...::Out | main.rs:892:9:892:17 | type Out |
+| main.rs:925:10:925:12 | Sub | main.rs:895:5:899:5 | trait Sub |
+| main.rs:925:18:925:24 | S::<...> | main.rs:901:5:903:6 | struct S |
+| main.rs:925:20:925:23 | bool | {EXTERNAL LOCATION} | struct bool |
+| main.rs:926:19:926:22 | Self | main.rs:924:5:929:5 | impl Sub for S::<...> { ... } |
+| main.rs:926:19:926:27 | ...::Out | main.rs:892:9:892:17 | type Out |
+| main.rs:935:19:935:26 | SuperAlt | main.rs:931:5:933:5 | trait SuperAlt |
+| main.rs:937:23:937:26 | Self | main.rs:935:5:939:5 | trait SubAlt |
+| main.rs:937:23:937:31 | ...::Out | main.rs:932:9:932:17 | type Out |
+| main.rs:942:13:942:20 | SuperAlt | main.rs:931:5:933:5 | trait SuperAlt |
+| main.rs:942:26:942:29 | S::<...> | main.rs:901:5:903:6 | struct S |
+| main.rs:942:28:942:28 | A | main.rs:942:10:942:10 | A |
+| main.rs:943:20:943:20 | A | main.rs:942:10:942:10 | A |
+| main.rs:948:13:948:18 | SubAlt | main.rs:935:5:939:5 | trait SubAlt |
+| main.rs:948:24:948:27 | S::<...> | main.rs:901:5:903:6 | struct S |
+| main.rs:948:26:948:26 | A | main.rs:948:10:948:10 | A |
+| main.rs:949:23:949:26 | Self | main.rs:947:5:952:5 | impl SubAlt for S::<...> { ... } |
+| main.rs:949:23:949:31 | ...::Out | main.rs:932:9:932:17 | type Out |
+| main.rs:955:10:955:16 | S::<...> | main.rs:901:5:903:6 | struct S |
+| main.rs:955:12:955:15 | bool | {EXTERNAL LOCATION} | struct bool |
+| main.rs:957:21:957:37 | <...> | main.rs:891:5:893:5 | trait Super |
+| main.rs:957:21:957:42 | ...::Out | main.rs:892:9:892:17 | type Out |
+| main.rs:957:22:957:27 | S::<...> | main.rs:901:5:903:6 | struct S |
+| main.rs:957:24:957:26 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:957:32:957:36 | Super | main.rs:891:5:893:5 | trait Super |
+| main.rs:958:21:958:38 | <...> | main.rs:891:5:893:5 | trait Super |
+| main.rs:958:21:958:43 | ...::Out | main.rs:892:9:892:17 | type Out |
+| main.rs:958:22:958:28 | S::<...> | main.rs:901:5:903:6 | struct S |
+| main.rs:958:24:958:27 | bool | {EXTERNAL LOCATION} | struct bool |
+| main.rs:958:33:958:37 | Super | main.rs:891:5:893:5 | trait Super |
+| main.rs:960:21:960:41 | <...> | main.rs:931:5:933:5 | trait SuperAlt |
+| main.rs:960:21:960:46 | ...::Out | main.rs:932:9:932:17 | type Out |
+| main.rs:960:22:960:28 | S::<...> | main.rs:901:5:903:6 | struct S |
+| main.rs:960:24:960:27 | bool | {EXTERNAL LOCATION} | struct bool |
+| main.rs:960:33:960:40 | SuperAlt | main.rs:931:5:933:5 | trait SuperAlt |
+| main.rs:965:5:965:7 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:965:11:965:14 | self | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:967:15:967:17 | ztd | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:967:15:967:25 | ...::string | {EXTERNAL LOCATION} | mod string |
+| main.rs:967:15:967:33 | ...::String | {EXTERNAL LOCATION} | struct String |
+| main.rs:977:7:977:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
+| main.rs:977:7:977:26 | ...::identity | proc_macro.rs:15:1:18:1 | fn identity |
+| main.rs:978:10:978:15 | ATrait | main.rs:973:5:975:5 | trait ATrait |
+| main.rs:978:21:978:23 | i64 | {EXTERNAL LOCATION} | struct i64 |
+| main.rs:980:11:980:13 | i64 | {EXTERNAL LOCATION} | struct i64 |
+| main.rs:986:17:986:19 | Foo | main.rs:971:5:971:15 | struct Foo |
+| main.rs:992:22:992:32 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
+| main.rs:992:29:992:31 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:993:17:993:20 | Some | {EXTERNAL LOCATION} | Some |
+| main.rs:994:17:994:27 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
+| main.rs:994:24:994:26 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:995:13:995:16 | Some | {EXTERNAL LOCATION} | Some |
+| main.rs:996:17:996:20 | None | {EXTERNAL LOCATION} | None |
+| main.rs:998:13:998:16 | None | {EXTERNAL LOCATION} | None |
+| main.rs:999:17:999:20 | None | {EXTERNAL LOCATION} | None |
+| main.rs:1008:19:1008:29 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
+| main.rs:1008:26:1008:28 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1009:26:1009:29 | test | main.rs:991:5:1005:5 | fn test |
+| main.rs:1015:14:1015:16 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1020:17:1020:20 | Some | {EXTERNAL LOCATION} | Some |
+| main.rs:1022:13:1022:16 | Some | {EXTERNAL LOCATION} | Some |
+| main.rs:1027:13:1027:16 | Some | {EXTERNAL LOCATION} | Some |
+| main.rs:1027:18:1027:18 | z | main.rs:1014:5:1016:12 | const z |
+| main.rs:1027:24:1027:24 | z | main.rs:1014:5:1016:12 | const z |
+| main.rs:1035:24:1035:26 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1038:10:1038:20 | TupleStruct | main.rs:1035:5:1035:28 | struct TupleStruct |
+| main.rs:1040:19:1040:21 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1040:27:1040:30 | Self | main.rs:1035:5:1035:28 | struct TupleStruct |
+| main.rs:1041:21:1041:24 | Self | main.rs:1035:5:1035:28 | struct TupleStruct |
+| main.rs:1042:31:1042:34 | Self | main.rs:1035:5:1035:28 | struct TupleStruct |
+| main.rs:1048:12:1048:14 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1052:10:1052:21 | StructStruct | main.rs:1047:5:1049:5 | struct StructStruct |
+| main.rs:1054:19:1054:21 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1054:27:1054:30 | Self | main.rs:1047:5:1049:5 | struct StructStruct |
+| main.rs:1055:13:1055:16 | Self | main.rs:1047:5:1049:5 | struct StructStruct |
+| main.rs:1061:13:1061:15 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1066:10:1066:15 | MyEnum | main.rs:1059:5:1063:5 | enum MyEnum |
+| main.rs:1067:25:1067:27 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1069:17:1069:20 | Self | main.rs:1065:5:1076:5 | impl MyEnum { ... } |
+| main.rs:1069:17:1069:23 | ...::A | main.rs:1060:9:1062:9 | A |
+| main.rs:1082:15:1082:15 | T | main.rs:1081:31:1081:31 | T |
+| main.rs:1083:15:1083:31 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
+| main.rs:1083:22:1083:30 | Box::<...> | {EXTERNAL LOCATION} | struct Box |
+| main.rs:1083:26:1083:29 | Self | main.rs:1081:5:1084:5 | struct NonEmptyListStruct |
+| main.rs:1087:16:1087:16 | T | main.rs:1086:27:1086:27 | T |
+| main.rs:1088:14:1088:14 | T | main.rs:1086:27:1086:27 | T |
+| main.rs:1088:17:1088:25 | Box::<...> | {EXTERNAL LOCATION} | struct Box |
+| main.rs:1088:21:1088:24 | Self | main.rs:1086:5:1089:5 | enum NonEmptyListEnum |
+| main.rs:1092:10:1092:30 | NonEmptyListEnum::<...> | main.rs:1086:5:1089:5 | enum NonEmptyListEnum |
+| main.rs:1092:27:1092:29 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1093:30:1093:32 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1093:38:1093:41 | Self | main.rs:1086:5:1089:5 | enum NonEmptyListEnum |
+| main.rs:1094:17:1094:32 | NonEmptyListEnum | main.rs:1086:5:1089:5 | enum NonEmptyListEnum |
+| main.rs:1095:13:1095:16 | Self | main.rs:1091:5:1097:5 | impl NonEmptyListEnum::<...> { ... } |
+| main.rs:1095:13:1095:24 | ...::Single | main.rs:1087:9:1087:17 | Single |
+| main.rs:1103:13:1103:16 | Copy | {EXTERNAL LOCATION} | trait Copy |
+| main.rs:1105:17:1105:17 | T | main.rs:1102:9:1102:9 | T |
+| main.rs:1106:16:1106:16 | T | main.rs:1102:9:1102:9 | T |
+| main.rs:1106:23:1106:26 | Self | main.rs:1099:5:1107:5 | union NonEmptyListUnion |
+| main.rs:1112:9:1112:13 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
+| main.rs:1112:9:1112:27 | ...::const_static | main.rs:1110:1:1154:1 | mod const_static |
+| main.rs:1114:27:1114:29 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1116:29:1116:31 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1119:17:1119:26 | CONST_ITEM | main.rs:1114:5:1114:35 | const CONST_ITEM |
+| main.rs:1120:17:1120:27 | STATIC_ITEM | main.rs:1116:5:1116:37 | static STATIC_ITEM |
+| main.rs:1121:17:1121:28 | const_static | main.rs:1110:1:1154:1 | mod const_static |
+| main.rs:1121:17:1121:40 | ...::CONST_ITEM | main.rs:1114:5:1114:35 | const CONST_ITEM |
+| main.rs:1122:17:1122:28 | const_static | main.rs:1110:1:1154:1 | mod const_static |
+| main.rs:1122:17:1122:41 | ...::STATIC_ITEM | main.rs:1116:5:1116:37 | static STATIC_ITEM |
+| main.rs:1123:17:1123:27 | CONST_ALIAS | main.rs:1126:9:1127:13 | const CONST_ALIAS |
+| main.rs:1124:17:1124:28 | STATIC_ALIAS | main.rs:1127:15:1129:13 | static STATIC_ALIAS |
+| main.rs:1126:28:1126:30 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1126:34:1126:43 | CONST_ITEM | main.rs:1114:5:1114:35 | const CONST_ITEM |
+| main.rs:1128:30:1128:32 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1128:36:1128:46 | STATIC_ITEM | main.rs:1116:5:1116:37 | static STATIC_ITEM |
+| main.rs:1131:17:1131:27 | CONST_ALIAS | main.rs:1126:9:1127:13 | const CONST_ALIAS |
+| main.rs:1132:17:1132:28 | STATIC_ALIAS | main.rs:1127:15:1129:13 | static STATIC_ALIAS |
+| main.rs:1135:32:1135:34 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1135:38:1135:47 | CONST_ITEM | main.rs:1114:5:1114:35 | const CONST_ITEM |
+| main.rs:1137:34:1137:36 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1137:40:1137:50 | STATIC_ITEM | main.rs:1116:5:1116:37 | static STATIC_ITEM |
+| main.rs:1140:21:1140:31 | CONST_ALIAS | main.rs:1135:13:1136:17 | const CONST_ALIAS |
+| main.rs:1141:21:1141:32 | STATIC_ALIAS | main.rs:1136:19:1138:17 | static STATIC_ALIAS |
+| main.rs:1145:32:1145:34 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1145:38:1145:47 | CONST_ITEM | main.rs:1114:5:1114:35 | const CONST_ITEM |
+| main.rs:1147:34:1147:36 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:1147:40:1147:50 | STATIC_ITEM | main.rs:1116:5:1116:37 | static STATIC_ITEM |
+| main.rs:1150:21:1150:31 | CONST_ALIAS | main.rs:1145:13:1146:17 | const CONST_ALIAS |
+| main.rs:1151:21:1151:32 | STATIC_ALIAS | main.rs:1146:19:1148:17 | static STATIC_ALIAS |
+| main.rs:1157:5:1157:6 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:1157:5:1157:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
+| main.rs:1157:5:1157:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
+| main.rs:1157:5:1157:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
+| main.rs:1157:5:1157:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
+| main.rs:1158:5:1158:6 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:1158:5:1158:9 | ...::f | my.rs:5:1:7:1 | fn f |
+| main.rs:1159:5:1159:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
+| main.rs:1159:5:1159:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
+| main.rs:1159:5:1159:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
+| main.rs:1159:5:1159:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:1160:5:1160:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:1161:5:1161:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:1162:5:1162:9 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
+| main.rs:1162:5:1162:12 | ...::h | main.rs:57:1:76:1 | fn h |
+| main.rs:1163:5:1163:6 | m1 | main.rs:20:1:44:1 | mod m1 |
+| main.rs:1163:5:1163:10 | ...::m2 | main.rs:25:5:43:5 | mod m2 |
+| main.rs:1163:5:1163:13 | ...::g | main.rs:30:9:34:9 | fn g |
+| main.rs:1164:5:1164:6 | m1 | main.rs:20:1:44:1 | mod m1 |
+| main.rs:1164:5:1164:10 | ...::m2 | main.rs:25:5:43:5 | mod m2 |
+| main.rs:1164:5:1164:14 | ...::m3 | main.rs:36:9:42:9 | mod m3 |
+| main.rs:1164:5:1164:17 | ...::h | main.rs:37:27:41:13 | fn h |
+| main.rs:1165:5:1165:6 | m4 | main.rs:46:1:53:1 | mod m4 |
+| main.rs:1165:5:1165:9 | ...::i | main.rs:49:5:52:5 | fn i |
+| main.rs:1166:5:1166:5 | h | main.rs:57:1:76:1 | fn h |
+| main.rs:1167:5:1167:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:1168:5:1168:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:1169:5:1169:5 | j | main.rs:104:1:108:1 | fn j |
+| main.rs:1170:5:1170:6 | m6 | main.rs:116:1:128:1 | mod m6 |
+| main.rs:1170:5:1170:9 | ...::g | main.rs:121:5:127:5 | fn g |
+| main.rs:1171:5:1171:6 | m7 | main.rs:130:1:149:1 | mod m7 |
+| main.rs:1171:5:1171:9 | ...::f | main.rs:141:5:148:5 | fn f |
+| main.rs:1172:5:1172:6 | m8 | main.rs:151:1:205:1 | mod m8 |
+| main.rs:1172:5:1172:9 | ...::g | main.rs:189:5:204:5 | fn g |
+| main.rs:1173:5:1173:6 | m9 | main.rs:207:1:215:1 | mod m9 |
+| main.rs:1173:5:1173:9 | ...::f | main.rs:210:5:214:5 | fn f |
+| main.rs:1174:5:1174:7 | m11 | main.rs:238:1:275:1 | mod m11 |
+| main.rs:1174:5:1174:10 | ...::f | main.rs:243:5:246:5 | fn f |
+| main.rs:1175:5:1175:7 | m15 | main.rs:306:1:375:1 | mod m15 |
+| main.rs:1175:5:1175:10 | ...::f | main.rs:362:5:374:5 | fn f |
+| main.rs:1176:5:1176:7 | m16 | main.rs:377:1:575:1 | mod m16 |
+| main.rs:1176:5:1176:10 | ...::f | main.rs:447:5:471:5 | fn f |
+| main.rs:1177:5:1177:20 | trait_visibility | main.rs:577:1:634:1 | mod trait_visibility |
+| main.rs:1177:5:1177:23 | ...::f | main.rs:604:5:633:5 | fn f |
+| main.rs:1178:5:1178:7 | m17 | main.rs:636:1:666:1 | mod m17 |
+| main.rs:1178:5:1178:10 | ...::f | main.rs:660:5:665:5 | fn f |
+| main.rs:1179:5:1179:11 | nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
+| main.rs:1179:5:1179:14 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
+| main.rs:1180:5:1180:11 | nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
+| main.rs:1180:5:1180:14 | ...::f | my2/nested2.rs:23:9:25:9 | fn f |
+| main.rs:1181:5:1181:7 | my3 | my2/mod.rs:20:1:20:12 | mod my3 |
+| main.rs:1181:5:1181:10 | ...::f | my2/my3/mod.rs:1:1:5:1 | fn f |
+| main.rs:1182:5:1182:12 | nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
+| main.rs:1183:5:1183:12 | my_alias | main.rs:1:1:1:7 | mod my |
+| main.rs:1183:5:1183:22 | ...::nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
+| main.rs:1184:5:1184:7 | m18 | main.rs:668:1:686:1 | mod m18 |
+| main.rs:1184:5:1184:12 | ...::m19 | main.rs:673:5:685:5 | mod m19 |
+| main.rs:1184:5:1184:17 | ...::m20 | main.rs:678:9:684:9 | mod m20 |
+| main.rs:1184:5:1184:20 | ...::g | main.rs:679:13:683:13 | fn g |
+| main.rs:1185:5:1185:7 | m23 | main.rs:724:1:749:1 | mod m23 |
+| main.rs:1185:5:1185:10 | ...::f | main.rs:744:5:748:5 | fn f |
+| main.rs:1186:5:1186:7 | m24 | main.rs:751:1:819:1 | mod m24 |
+| main.rs:1186:5:1186:10 | ...::f | main.rs:805:5:818:5 | fn f |
+| main.rs:1187:5:1187:8 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
+| main.rs:1187:5:1187:11 | ...::h | main.rs:57:1:76:1 | fn h |
+| main.rs:1188:5:1188:13 | z_changed | main.rs:824:1:824:9 | fn z_changed |
+| main.rs:1189:5:1189:11 | AStruct | main.rs:826:1:826:17 | struct AStruct |
+| main.rs:1189:5:1189:22 | ...::z_on_type | main.rs:830:5:830:17 | fn z_on_type |
+| main.rs:1190:5:1190:11 | AStruct | main.rs:826:1:826:17 | struct AStruct |
+| main.rs:1191:5:1191:29 | impl_with_attribute_macro | main.rs:969:1:988:1 | mod impl_with_attribute_macro |
+| main.rs:1191:5:1191:35 | ...::test | main.rs:984:5:987:5 | fn test |
+| main.rs:1192:5:1192:12 | patterns | main.rs:990:1:1031:1 | mod patterns |
+| main.rs:1192:5:1192:18 | ...::test | main.rs:991:5:1005:5 | fn test |
 | my2/mod.rs:4:5:4:11 | println | {EXTERNAL LOCATION} | MacroRules |
 | my2/mod.rs:5:5:5:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
 | my2/mod.rs:5:5:5:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
@@ -711,7 +722,7 @@ resolvePath
 | my2/my3/mod.rs:3:5:3:5 | g | my2/mod.rs:3:1:6:1 | fn g |
 | my2/my3/mod.rs:4:5:4:5 | h | main.rs:57:1:76:1 | fn h |
 | my2/my3/mod.rs:7:5:7:9 | super | my2/mod.rs:1:1:25:34 | SourceFile |
-| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:1184:2 | SourceFile |
+| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:1193:2 | SourceFile |
 | my2/my3/mod.rs:7:5:7:19 | ...::h | main.rs:57:1:76:1 | fn h |
 | my2/my3/mod.rs:8:5:8:9 | super | my2/mod.rs:1:1:25:34 | SourceFile |
 | my2/my3/mod.rs:8:5:8:12 | ...::g | my2/mod.rs:3:1:6:1 | fn g |
diff --git a/rust/ql/test/library-tests/sensitivedata/test.rs b/rust/ql/test/library-tests/sensitivedata/test.rs
index e2bb5a5f595c..0dfc94ccf558 100644
--- a/rust/ql/test/library-tests/sensitivedata/test.rs
+++ b/rust/ql/test/library-tests/sensitivedata/test.rs
@@ -97,10 +97,17 @@ fn get_public_key() -> String { get_string() }
 fn get_secret_token() -> String { get_string() }
 fn get_next_token() -> String { get_string() }
 
+struct Connection;
+
+impl Connection {
+	fn set_trusted_schema(&mut self, enabled: bool) -> bool { enabled }
+}
+
 fn test_credentials(
 	account_key: &str, accnt_key: &str, license_key: &str, secret_key: &str, is_secret: bool, num_accounts: i64,
 	username: String, user_name: String, userid: i64, user_id: i64, my_user_id_64: i64, id: i64, uid: i64, uuid: i64, guid: i64, unique_id: i64,
 	sessionkey: &[u64; 4], session_key: &[u64; 4], hashkey: &[u64; 4], hash_key: &[u64; 4], sessionkeypath: &[u64; 4], account_key_path: &[u64; 4],
+	trusted_token: &str, trusted_schema: bool, trustedSchema: bool, conn: &mut Connection,
 	ms: &MyStruct
 ) {
 	// credentials
@@ -125,6 +132,7 @@ fn test_credentials(
 	sink(get_secure_key()); // $ MISSING: sensitive=secret
 	sink(get_private_key()); // $ MISSING: sensitive=secret
 	sink(get_secret_token()); // $ sensitive=secret
+	sink(trusted_token); // $ sensitive=secret
 
 	// not (necessarily) credentials
 
@@ -146,6 +154,9 @@ fn test_credentials(
 
 	sink(get_public_key());
 	sink(get_next_token());
+	sink(trusted_schema);
+	sink(trustedSchema);
+	sink(conn.set_trusted_schema(false));
 }
 
 struct MacAddr {
diff --git a/rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected
index a4a779dcb69c..7dc23f9976a5 100644
--- a/rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,5 +1,4 @@
 multipleResolvedTargets
 | main.rs:2240:9:2240:31 | ... .my_add(...) |
 | main.rs:2242:9:2242:29 | ... .my_add(...) |
-| main.rs:2757:13:2757:17 | x.f() |
 | regressions.rs:179:17:179:27 | ... + ... |
diff --git a/rust/ql/test/library-tests/type-inference/cfg.rs b/rust/ql/test/library-tests/type-inference/cfg.rs
new file mode 100644
index 000000000000..59019b739d74
--- /dev/null
+++ b/rust/ql/test/library-tests/type-inference/cfg.rs
@@ -0,0 +1,17 @@
+pub fn expressions() {
+    let unix = cfg!(unix); // $ certainType=unix:bool
+    let windows = cfg!(target_os = "windows"); // $ certainType=windows:bool
+    let either = cfg!(any(unix, target_os = "windows")); // $ certainType=either:bool
+    let always = cfg!(all()); // $ certainType=always:bool
+    let never = cfg!(any()); // $ certainType=never:bool
+}
+
+pub fn patterns() {
+    let value = Default::default(); // $ target=default type=value:bool
+    match value {
+        cfg!(unix) => (),
+        cfg!(target_os = "windows") => (),
+        cfg!(any(unix, target_os = "windows")) => (),
+        _ => (),
+    }
+}
diff --git a/rust/ql/test/library-tests/type-inference/closure.rs b/rust/ql/test/library-tests/type-inference/closure.rs
index 635b169bf96b..0c28c057d28a 100644
--- a/rust/ql/test/library-tests/type-inference/closure.rs
+++ b/rust/ql/test/library-tests/type-inference/closure.rs
@@ -28,6 +28,14 @@ mod simple_closures {
         let id2 = |b| b;
         let arg = Default::default(); // $ target=default type=arg:bool
         let _b2: bool = id2(arg); // $ certainType=_b2:bool
+
+        // The parameter type of `f1` is inferred from the argument.
+        let f1 = |x| (x, false); // $ type=x@Option<T>:i32
+        let _r = f1(Some(0)); // $ type=_r@(T_2)<T0>.Option<T>:i32
+
+        // The return type of `f2` is inferred from the type of the call expression.
+        let f2 = |x| (x, false); // $ type=x@Option<T>:i32
+        let _r: Option<i32> = f2(Default::default()).0; // $ fieldof=Tuple2 target=default
     }
 }
 
@@ -64,7 +72,7 @@ mod fn_once_trait {
         let _r = apply(f, true); // $ target=apply type=_r:i64
 
         let f = |x| x + 1; // $ type=x:i64 $ MISSING: target=add
-        let _r2 = apply_two(f); // $ target=apply_two certainType=_r2:i64
+        let _r2 = apply_two(f); // $ target=apply_two type=_r2:i64
     }
 }
 
@@ -101,7 +109,7 @@ mod fn_mut_trait {
         let _r = apply(f, true); // $ target=apply type=_r:i64
 
         let f = |x| x + 1; // $ type=x:i64 $ MISSING: target=add
-        let _r2 = apply_two(f); // $ target=apply_two certainType=_r2:i64
+        let _r2 = apply_two(f); // $ target=apply_two type=_r2:i64
     }
 }
 
@@ -138,7 +146,7 @@ mod fn_trait {
         let _r = apply(f, true); // $ target=apply type=_r:i64
 
         let f = |x| x + 1; // $ type=x:i64 $ MISSING: target=add
-        let _r2 = apply_two(f); // $ target=apply_two certainType=_r2:i64
+        let _r2 = apply_two(f); // $ target=apply_two type=_r2:i64
     }
 }
 
diff --git a/rust/ql/test/library-tests/type-inference/dereference.rs b/rust/ql/test/library-tests/type-inference/dereference.rs
index 99886987d995..71a0a15b6b8f 100644
--- a/rust/ql/test/library-tests/type-inference/dereference.rs
+++ b/rust/ql/test/library-tests/type-inference/dereference.rs
@@ -141,7 +141,7 @@ mod implicit_deref_coercion_cycle {
 
     #[rustfmt::skip]
     pub fn test() {
-        let mut key_to_key = HashMap::<&Key, &Key>::new(); // $ target=new
+        let mut key_to_key = HashMap::<_, &Key>::new(); // $ target=new
         let mut key = &Key {}; // Initialize key2 to a reference
         if let Some(ref_key) = key_to_key.get(key) { // $ target=get
             // Below `ref_key` is implicitly dereferenced from `&&Key` to `&Key`
diff --git a/rust/ql/test/library-tests/type-inference/main.rs b/rust/ql/test/library-tests/type-inference/main.rs
index 392380df0f77..006835b89188 100644
--- a/rust/ql/test/library-tests/type-inference/main.rs
+++ b/rust/ql/test/library-tests/type-inference/main.rs
@@ -1085,7 +1085,7 @@ mod option_methods {
     struct S;
 
     pub fn f() {
-        let x1 = MyOption::<S>::new(); // $ certainType=x1@MyOption<T>:S target=new
+        let x1 = MyOption::<S>::new(); // $ type=x1@MyOption<T>:S target=new
         println!("{:?}", x1);
 
         let mut x2 = MyOption::new(); // $ target=new
@@ -1412,7 +1412,7 @@ mod builtins {
 
         impl<T: Default, const N: usize> MyTrait<T> for [T; N] {
             fn my_method(&self) -> &T {
-                self.get(0).unwrap() // $ MISSING: target=get target=unwrap
+                self.get(0).unwrap() // $ target=get target=unwrap
             }
 
             fn my_func() -> T {
@@ -1970,7 +1970,7 @@ mod impl_trait {
     impl<T: Clone> MyTrait<T> for S3<T> {
         fn get_a(&self) -> T {
             let S3(t) = self;
-            t.clone()
+            t.clone() // $ MISSING: target=clone type=t@&<TRef>:T (we do not currently handle complex "binding modes")
         }
     }
 
@@ -2337,29 +2337,29 @@ mod loops {
 
         // for loops with containers
 
-        let vals3 = vec![1, 2, 3]; // $ type=vals3:Vec $ MISSING: type=vals3@Vec<T>:i32
-        for i in vals3 {} // $ MISSING: type=i:i32
+        let vals3 = vec![1, 2, 3]; // $ type=vals3:Vec type=vals3@Vec<T>:i32
+        for i in vals3 {} // $ type=i:i32
 
-        let vals4a: Vec<u16> = [1u16, 2, 3].to_vec(); // $ certainType=vals4a@Vec<T>:u16
+        let vals4a = [1u16, 2, 3].to_vec(); // $ type=vals4a@Vec<T>:u16 target=to_vec
         for u in vals4a {} // $ type=u:u16
 
-        let vals4b = [1u16, 2, 3].to_vec(); // $ MISSING: type=vals4b:Vec type=vals4b@Vec<T>:u16
-        for u in vals4b {} // $ MISSING: type=u:u16
+        let vals4b = [1u16, 2, 3].to_vec(); // $ type=vals4b@Vec<T>:u16 target=to_vec
+        for u in vals4b {} // $ type=u:u16
 
         let vals5 = Vec::from([1u32, 2, 3]); // $ target=from type=vals5@Vec<T>:u32
         for u in vals5 {} // $ type=u:u32
 
-        let vals6: Vec<&u64> = [1u64, 2, 3].iter().collect(); // $ certainType=vals6@Vec<T>.&<TRef>:u64
+        let vals6: Vec<&u64> = [1u64, 2, 3].iter().collect(); // $ certainType=vals6@Vec<T>.&<TRef>:u64 target=iter target=collect
         for u in vals6 {} // $ type=u@&<TRef>:u64
 
         let mut vals7 = Vec::new(); // $ target=new type=vals7@Vec<T>:u8
         vals7.push(1u8); // $ target=push
         for u in vals7 {} // $ type=u:u8
 
-        let matrix1 = vec![vec![1, 2], vec![3, 4]]; // $ type=matrix1:Vec $ MISSING: type=matrix1@Vec<T>:Vec type=matrix1@Vec<T>.Vec<T>:i32
+        let matrix1 = vec![vec![1, 2], vec![3, 4]]; // $ type=matrix1:Vec type=matrix1@Vec<T>:Vec type=matrix1@Vec<T>.Vec<T>:i32
         #[rustfmt::skip]
-        let _ = for row in matrix1 { // $ MISSING: type=row:Vec type=row@Vec<T>:i32
-            for cell in row { // $ MISSING: type=cell:i32
+        let _ = for row in matrix1 { // $ type=row:Vec type=row@Vec<T>:i32
+            for cell in row { // $ type=cell:i32
             }
         };
 
@@ -2416,10 +2416,10 @@ mod explicit_type_args {
 
     pub fn f() {
         let x1: Option<S1<S2>> = S1::assoc_fun(); // $ certainType=x1@Option<T>.S1<T>:S2 target=assoc_fun
-        let x2 = S1::<S2>::assoc_fun(); // $ certainType=x2@Option<T>.S1<T>:S2 target=assoc_fun
-        let x3 = S3::assoc_fun(); // $ certainType=x3@Option<T>.S1<T>:S2 target=assoc_fun
-        let x4 = S1::<S2>::method(S1::default()); // $ target=method target=default certainType=x4@S1<T>:S2
-        let x5 = S3::method(S1::default()); // $ target=method target=default certainType=x5@S1<T>:S2
+        let x2 = S1::<S2>::assoc_fun(); // $ type=x2@Option<T>.S1<T>:S2 target=assoc_fun
+        let x3 = S3::assoc_fun(); // $ type=x3@Option<T>.S1<T>:S2 target=assoc_fun
+        let x4 = S1::<S2>::method(S1::default()); // $ target=method target=default type=x4@S1<T>:S2
+        let x5 = S3::method(S1::default()); // $ target=method target=default type=x5@S1<T>:S2
         let x6 = S4::<S2>(Default::default()); // $ type=x6@S4<T4>:S2 target=default
         let x7 = S4(S2); // $ type=x7@S4<T4>:S2
         let x8 = S4(0); // $ type=x8@S4<T4>:i32
@@ -2434,8 +2434,8 @@ mod explicit_type_args {
         {
             field: S2::default(), // $ target=default
         };
-        let x14 = foo::<i32>(Default::default()); // $ certainType=x14:i32 target=default target=foo
-        let x15 = S1::<S2>::default(); // $ certainType=x15@S1<T>:S2 target=default
+        let x14 = foo::<i32>(Default::default()); // $ type=x14:i32 target=default target=foo
+        let x15 = S1::<S2>::default(); // $ type=x15@S1<T>:S2 target=default
     }
 }
 
@@ -2451,8 +2451,8 @@ mod tuples {
     }
 
     pub fn f() {
-        let a = S1::get_pair(); // $ target=get_pair certainType=a:(T_2)
-        let mut b = S1::get_pair(); // $ target=get_pair certainType=b:(T_2)
+        let a = S1::get_pair(); // $ target=get_pair type=a:(T_2)
+        let mut b = S1::get_pair(); // $ target=get_pair type=b:(T_2)
         let (c, d) = S1::get_pair(); // $ target=get_pair type=c:S1 type=d:S1
         let (mut e, f) = S1::get_pair(); // $ target=get_pair type=e:S1 type=f:S1
         let (mut g, mut h) = S1::get_pair(); // $ target=get_pair type=g:S1 type=h:S1
@@ -2550,11 +2550,11 @@ pub mod path_buf {
     }
 
     pub fn f() {
-        let path1 = Path::new(); // $ target=new certainType=path1:Path
+        let path1 = Path::new(); // $ target=new type=path1:Path
         let path2 = path1.canonicalize(); // $ target=canonicalize
         let path3 = path2.unwrap(); // $ target=unwrap type=path3:PathBuf
 
-        let pathbuf1 = PathBuf::new(); // $ target=new certainType=pathbuf1:PathBuf
+        let pathbuf1 = PathBuf::new(); // $ target=new type=pathbuf1:PathBuf
         let pathbuf2 = pathbuf1.canonicalize(); // $ target=canonicalize
         let pathbuf3 = pathbuf2.unwrap(); // $ target=unwrap type=pathbuf3:PathBuf
     }
@@ -2754,7 +2754,7 @@ mod literal_overlap {
 
     pub fn f() -> usize {
         let mut x = 0;
-        x = x.f(); // $ target=usizef $ SPURIOUS: target=i32f
+        x = x.f(); // $ MISSING: target=usizef $ SPURIOUS: target=i32f
         x
     }
 
@@ -2800,6 +2800,41 @@ mod arg_trait_bounds {
     }
 }
 
+fn empty_array() {
+    let arr1: [i32; 0] = []; // $ type=arr1@[;]<TArray>:i32
+    let arr2 = [true; 0]; // $ type=arr2@[;]<TArray>:bool
+
+    let arr3 = []; // $ type=arr3@[;]<TArray>:i32
+
+    fn pin_array<T>(arr: [T; 0], x: T) {}
+    pin_array(arr3, 1); // $ target=pin_array
+}
+
+mod contextual_bound {
+    #[derive(Default)]
+    struct S<T>(T);
+    struct MyThingA<A>(A);
+    struct MyThingB<B>(B);
+
+    trait MyTrait<T> {}
+
+    impl<T> MyTrait<T> for MyThingA<T> {}
+
+    impl<T> MyTrait<[T; 1]> for MyThingB<T> {}
+
+    fn bar<T1, T2: MyTrait<T1>>(x: T1, y: Option<T2>) {}
+
+    fn test_bar() {
+        let x = S(0);
+        let y = MyThingA(Default::default()); // $ type=y@MyThingA<A>.S<T>:i32 target=default
+        bar(x, Some(y)); // $ target=bar
+
+        let x = S(0);
+        let z = MyThingB(Default::default()); // $ type=z@MyThingB<B>.S<T>:i32 target=default
+        bar([x], Some(z)); // $ target=bar
+    }
+}
+
 fn main() {
     field_access::f(); // $ target=f
     method_impl::f(); // $ target=f
@@ -2835,4 +2870,5 @@ fn main() {
     dyn_type::test(); // $ target=test
     if_expr::f(true); // $ target=f
     local_function::f(); // $ target=f
+    empty_array(); // $ target=empty_array
 }
diff --git a/rust/ql/test/library-tests/type-inference/overloading.rs b/rust/ql/test/library-tests/type-inference/overloading.rs
index 06353a12c8f2..2c442db4afdd 100644
--- a/rust/ql/test/library-tests/type-inference/overloading.rs
+++ b/rust/ql/test/library-tests/type-inference/overloading.rs
@@ -509,7 +509,7 @@ mod trait_bound_impl_overlap {
 
     fn test() {
         let x = S(0);
-        let y = call_f(x); // $ target=call_f type=y:i32
+        let y = call_f(x); // $ target=call_f $ MISSING: type=y:i32 (we currently do not detect that contextual inference is needed)
         let z: i32 = y;
 
         let x = S(0);
diff --git a/rust/ql/test/library-tests/type-inference/pattern_matching.rs b/rust/ql/test/library-tests/type-inference/pattern_matching.rs
index bc85b0ee96ff..b00dfc95212d 100755
--- a/rust/ql/test/library-tests/type-inference/pattern_matching.rs
+++ b/rust/ql/test/library-tests/type-inference/pattern_matching.rs
@@ -779,13 +779,13 @@ pub fn patterns_in_function_parameters() {
 
     // Call the functions to use them
     let point = Point { x: 5, y: 10 };
-    let extracted = extract_point(point); // $ target=extract_point certainType=extracted@(T_2)<T0>:i32 certainType=extracted@(T_2)<T1>:i32
+    let extracted = extract_point(point); // $ target=extract_point type=extracted@(T_2)<T0>:i32 type=extracted@(T_2)<T1>:i32
 
     let color = Color(200, 100, 50);
-    let red = extract_color(color); // $ target=extract_color certainType=red:u8
+    let red = extract_color(color); // $ target=extract_color type=red:u8
 
     let tuple = (42i32, 3.14f64, true);
-    let tuple_extracted = extract_tuple(tuple); // $ target=extract_tuple certainType=tuple_extracted@(T_2)<T0>:i32 certainType=tuple_extracted@(T_2)<T1>:bool
+    let tuple_extracted = extract_tuple(tuple); // $ target=extract_tuple type=tuple_extracted@(T_2)<T0>:i32 type=tuple_extracted@(T_2)<T1>:bool
 }
 
 #[rustfmt::skip]
diff --git a/rust/ql/test/library-tests/type-inference/type-inference.expected b/rust/ql/test/library-tests/type-inference/type-inference.expected
index 20f20e21861c..6321f11c3b85 100644
--- a/rust/ql/test/library-tests/type-inference/type-inference.expected
+++ b/rust/ql/test/library-tests/type-inference/type-inference.expected
@@ -1,7 +1,6 @@
 inferCertainType
 | associated_types.rs:5:15:5:18 | SelfParam |  | associated_types.rs:1:1:2:21 | Wrapper |
 | associated_types.rs:5:15:5:18 | SelfParam | A | associated_types.rs:4:6:4:6 | A |
-| associated_types.rs:5:26:7:5 | { ... } |  | associated_types.rs:4:6:4:6 | A |
 | associated_types.rs:6:9:6:12 | self |  | associated_types.rs:1:1:2:21 | Wrapper |
 | associated_types.rs:6:9:6:12 | self | A | associated_types.rs:4:6:4:6 | A |
 | associated_types.rs:23:12:23:16 | SelfParam |  | {EXTERNAL LOCATION} | & |
@@ -12,14 +11,12 @@ inferCertainType
 | associated_types.rs:26:37:26:38 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:29:43:29:46 | item |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:29:43:29:46 | item | TRef | associated_types.rs:29:11:29:40 | T |
-| associated_types.rs:29:58:31:1 | { ... } |  | associated_types.rs:29:8:29:8 | O |
 | associated_types.rs:30:5:30:8 | item |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:30:5:30:8 | item | TRef | associated_types.rs:29:11:29:40 | T |
 | associated_types.rs:37:20:37:24 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:37:20:37:24 | SelfParam | TRef | associated_types.rs:33:1:38:1 | Self [trait AnotherGet] |
 | associated_types.rs:44:12:44:16 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:44:12:44:16 | SelfParam | TRef | associated_types.rs:10:1:11:9 | S |
-| associated_types.rs:44:35:46:5 | { ... } |  | associated_types.rs:16:1:17:10 | S3 |
 | associated_types.rs:53:20:53:24 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:53:20:53:24 | SelfParam | TRef | associated_types.rs:10:1:11:9 | S |
 | associated_types.rs:53:50:55:5 | { ... } |  | {EXTERNAL LOCATION} | bool |
@@ -27,7 +24,6 @@ inferCertainType
 | associated_types.rs:62:12:62:16 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:62:12:62:16 | SelfParam | TRef | associated_types.rs:1:1:2:21 | Wrapper |
 | associated_types.rs:62:12:62:16 | SelfParam | TRef.A | associated_types.rs:58:6:58:12 | T |
-| associated_types.rs:62:35:64:5 | { ... } |  | associated_types.rs:58:6:58:12 | T |
 | associated_types.rs:63:9:63:12 | self |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:63:9:63:12 | self | TRef | associated_types.rs:1:1:2:21 | Wrapper |
 | associated_types.rs:63:9:63:12 | self | TRef.A | associated_types.rs:58:6:58:12 | T |
@@ -43,30 +39,30 @@ inferCertainType
 | associated_types.rs:81:9:81:11 | 'a' |  | {EXTERNAL LOCATION} | char |
 | associated_types.rs:92:15:92:18 | SelfParam |  | associated_types.rs:88:5:103:5 | Self [trait MyTrait] |
 | associated_types.rs:94:15:94:18 | SelfParam |  | associated_types.rs:88:5:103:5 | Self [trait MyTrait] |
-| associated_types.rs:98:9:102:9 | { ... } |  | associated_types.rs:89:9:89:28 | AssociatedType[MyTrait] |
 | associated_types.rs:99:13:99:16 | self |  | associated_types.rs:88:5:103:5 | Self [trait MyTrait] |
 | associated_types.rs:109:15:109:18 | SelfParam |  | associated_types.rs:10:1:11:9 | S |
-| associated_types.rs:109:45:111:9 | { ... } |  | associated_types.rs:16:1:17:10 | S3 |
 | associated_types.rs:118:15:118:18 | SelfParam |  | associated_types.rs:13:1:14:10 | S2 |
-| associated_types.rs:118:45:120:9 | { ... } |  | associated_types.rs:1:1:2:21 | Wrapper |
-| associated_types.rs:118:45:120:9 | { ... } | A | associated_types.rs:13:1:14:10 | S2 |
 | associated_types.rs:119:21:119:24 | self |  | associated_types.rs:13:1:14:10 | S2 |
 | associated_types.rs:123:19:137:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| associated_types.rs:126:9:126:33 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:126:18:126:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:126:18:126:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| associated_types.rs:126:18:126:32 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:126:18:126:32 | { ... } |  | {EXTERNAL LOCATION} | () |
+| associated_types.rs:126:18:126:32 | { ... } |  | {EXTERNAL LOCATION} | () |
+| associated_types.rs:131:9:131:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:131:18:131:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:131:18:131:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| associated_types.rs:131:18:131:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:131:18:131:26 | { ... } |  | {EXTERNAL LOCATION} | () |
+| associated_types.rs:131:18:131:26 | { ... } |  | {EXTERNAL LOCATION} | () |
+| associated_types.rs:134:9:134:33 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:134:18:134:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:134:18:134:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| associated_types.rs:134:18:134:32 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:134:18:134:32 | { ... } |  | {EXTERNAL LOCATION} | () |
+| associated_types.rs:134:18:134:32 | { ... } |  | {EXTERNAL LOCATION} | () |
+| associated_types.rs:136:9:136:33 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:136:18:136:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:136:18:136:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| associated_types.rs:136:18:136:32 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| associated_types.rs:136:18:136:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:136:18:136:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:144:9:144:9 | a |  | associated_types.rs:16:1:17:10 | S3 |
 | associated_types.rs:145:9:145:9 | b |  | {EXTERNAL LOCATION} | i32 |
@@ -84,23 +80,18 @@ inferCertainType
 | associated_types.rs:173:17:173:21 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:173:17:173:21 | SelfParam | TRef | associated_types.rs:67:1:67:23 | Odd |
 | associated_types.rs:173:17:173:21 | SelfParam | TRef.OddT | {EXTERNAL LOCATION} | i32 |
-| associated_types.rs:173:52:176:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
 | associated_types.rs:181:17:181:21 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:181:17:181:21 | SelfParam | TRef | associated_types.rs:67:1:67:23 | Odd |
 | associated_types.rs:181:17:181:21 | SelfParam | TRef.OddT | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:181:52:184:9 | { ... } |  | {EXTERNAL LOCATION} | char |
 | associated_types.rs:187:19:192:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| associated_types.rs:188:9:188:34 | using_as(...) |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:188:25:188:28 | true |  | {EXTERNAL LOCATION} | bool |
 | associated_types.rs:188:31:188:33 | 'a' |  | {EXTERNAL LOCATION} | char |
 | associated_types.rs:190:22:190:26 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:191:22:191:25 | true |  | {EXTERNAL LOCATION} | bool |
 | associated_types.rs:206:20:206:20 | t |  | associated_types.rs:204:17:204:17 | T |
 | associated_types.rs:211:20:211:20 | t |  | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:211:45:217:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:212:16:212:16 | t |  | {EXTERNAL LOCATION} | bool |
 | associated_types.rs:222:20:222:20 | t |  | {EXTERNAL LOCATION} | i32 |
-| associated_types.rs:222:44:224:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
 | associated_types.rs:223:13:223:13 | t |  | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:229:23:229:27 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:229:23:229:27 | SelfParam | TRef | associated_types.rs:10:1:11:9 | S |
@@ -109,22 +100,17 @@ inferCertainType
 | associated_types.rs:237:19:241:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:239:28:239:31 | true |  | {EXTERNAL LOCATION} | bool |
 | associated_types.rs:248:30:248:34 | thing |  | associated_types.rs:248:19:248:27 | T |
-| associated_types.rs:248:65:250:5 | { ... } |  | associated_types.rs:248:19:248:27 | T::Output[GetSet] |
 | associated_types.rs:249:9:249:13 | thing |  | associated_types.rs:248:19:248:27 | T |
 | associated_types.rs:252:33:252:37 | thing |  | associated_types.rs:252:22:252:30 | T |
-| associated_types.rs:252:56:254:5 | { ... } |  | associated_types.rs:252:22:252:30 | T::Output[GetSet] |
 | associated_types.rs:253:9:253:13 | thing |  | associated_types.rs:252:22:252:30 | T |
 | associated_types.rs:256:48:256:52 | thing |  | associated_types.rs:256:33:256:45 | T |
 | associated_types.rs:256:91:261:5 | { ... } |  | {EXTERNAL LOCATION} | (T_2) |
-| associated_types.rs:256:91:261:5 | { ... } | T0 | associated_types.rs:256:33:256:45 | T::Output[GetSet] |
-| associated_types.rs:256:91:261:5 | { ... } | T1 | associated_types.rs:256:33:256:45 | T::AnotherOutput[AnotherGet] |
 | associated_types.rs:257:9:260:9 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
 | associated_types.rs:258:13:258:17 | thing |  | associated_types.rs:256:33:256:45 | T |
 | associated_types.rs:259:13:259:17 | thing |  | associated_types.rs:256:33:256:45 | T |
 | associated_types.rs:268:20:268:24 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:268:20:268:24 | SelfParam | TRef | associated_types.rs:1:1:2:21 | Wrapper |
 | associated_types.rs:268:20:268:24 | SelfParam | TRef.A | associated_types.rs:264:10:264:11 | TI |
-| associated_types.rs:268:41:270:9 | { ... } |  | associated_types.rs:264:10:264:11 | TI::Output[GetSet] |
 | associated_types.rs:269:13:269:16 | self |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:269:13:269:16 | self | TRef | associated_types.rs:1:1:2:21 | Wrapper |
 | associated_types.rs:269:13:269:16 | self | TRef.A | associated_types.rs:264:10:264:11 | TI |
@@ -134,7 +120,6 @@ inferCertainType
 | associated_types.rs:286:21:286:25 | SelfParam | TRef | associated_types.rs:282:5:287:5 | Self [trait GetSetWrap] |
 | associated_types.rs:293:21:293:25 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:293:21:293:25 | SelfParam | TRef | associated_types.rs:10:1:11:9 | S |
-| associated_types.rs:293:43:295:9 | { ... } |  | associated_types.rs:10:1:11:9 | S |
 | associated_types.rs:303:21:303:25 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:303:21:303:25 | SelfParam | TRef | associated_types.rs:1:1:2:21 | Wrapper |
 | associated_types.rs:303:21:303:25 | SelfParam | TRef.A | associated_types.rs:299:10:299:11 | TI |
@@ -143,7 +128,6 @@ inferCertainType
 | associated_types.rs:304:13:304:16 | self | TRef.A | associated_types.rs:299:10:299:11 | TI |
 | associated_types.rs:308:19:322:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:311:13:314:9 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
-| associated_types.rs:314:13:314:39 | tp_assoc_from_supertrait(...) |  | {EXTERNAL LOCATION} | (T_2) |
 | associated_types.rs:329:26:329:26 | x |  | associated_types.rs:329:23:329:23 | T |
 | associated_types.rs:332:5:334:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:333:18:333:18 | x |  | associated_types.rs:329:23:329:23 | T |
@@ -151,12 +135,14 @@ inferCertainType
 | associated_types.rs:340:5:344:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:341:19:341:19 | x |  | associated_types.rs:337:21:337:21 | T |
 | associated_types.rs:342:23:342:24 | &x |  | {EXTERNAL LOCATION} | & |
+| associated_types.rs:342:23:342:24 | &x | TRef | associated_types.rs:337:21:337:21 | T |
 | associated_types.rs:342:24:342:24 | x |  | associated_types.rs:337:21:337:21 | T |
 | associated_types.rs:343:18:343:18 | x |  | associated_types.rs:337:21:337:21 | T |
 | associated_types.rs:347:23:347:23 | x |  | associated_types.rs:347:20:347:20 | T |
 | associated_types.rs:351:5:355:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:352:19:352:19 | x |  | associated_types.rs:347:20:347:20 | T |
 | associated_types.rs:353:23:353:24 | &x |  | {EXTERNAL LOCATION} | & |
+| associated_types.rs:353:23:353:24 | &x | TRef | associated_types.rs:347:20:347:20 | T |
 | associated_types.rs:353:24:353:24 | x |  | associated_types.rs:347:20:347:20 | T |
 | associated_types.rs:354:18:354:18 | x |  | associated_types.rs:347:20:347:20 | T |
 | associated_types.rs:361:17:361:21 | SelfParam |  | {EXTERNAL LOCATION} | & |
@@ -172,7 +158,6 @@ inferCertainType
 | associated_types.rs:384:23:384:27 | SelfParam | TRef | associated_types.rs:377:5:388:5 | Self [trait MyTraitAssoc2] |
 | associated_types.rs:384:30:384:30 | a |  | associated_types.rs:384:20:384:20 | A |
 | associated_types.rs:384:36:384:36 | b |  | associated_types.rs:384:20:384:20 | A |
-| associated_types.rs:384:76:387:9 | { ... } |  | associated_types.rs:378:9:378:52 | GenericAssociatedType[MyTraitAssoc2] |
 | associated_types.rs:385:13:385:16 | self |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:385:13:385:16 | self | TRef | associated_types.rs:377:5:388:5 | Self [trait MyTraitAssoc2] |
 | associated_types.rs:385:22:385:22 | a |  | associated_types.rs:384:20:384:20 | A |
@@ -182,8 +167,6 @@ inferCertainType
 | associated_types.rs:395:19:395:23 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:395:19:395:23 | SelfParam | TRef | associated_types.rs:10:1:11:9 | S |
 | associated_types.rs:395:26:395:26 | a |  | associated_types.rs:395:16:395:16 | A |
-| associated_types.rs:395:46:397:9 | { ... } |  | associated_types.rs:1:1:2:21 | Wrapper |
-| associated_types.rs:395:46:397:9 | { ... } | A | associated_types.rs:395:16:395:16 | A |
 | associated_types.rs:396:21:396:21 | a |  | associated_types.rs:395:16:395:16 | A |
 | associated_types.rs:400:19:407:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:403:25:403:28 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
@@ -197,13 +180,10 @@ inferCertainType
 | associated_types.rs:422:20:422:24 | SelfParam | TRef | associated_types.rs:413:5:423:5 | Self [trait TraitMultipleAssoc] |
 | associated_types.rs:429:21:429:25 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:429:21:429:25 | SelfParam | TRef | associated_types.rs:16:1:17:10 | S3 |
-| associated_types.rs:429:34:431:9 | { ... } |  | associated_types.rs:16:1:17:10 | S3 |
 | associated_types.rs:433:20:433:24 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:433:20:433:24 | SelfParam | TRef | associated_types.rs:16:1:17:10 | S3 |
-| associated_types.rs:433:43:435:9 | { ... } |  | associated_types.rs:10:1:11:9 | S |
 | associated_types.rs:437:20:437:24 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:437:20:437:24 | SelfParam | TRef | associated_types.rs:16:1:17:10 | S3 |
-| associated_types.rs:437:43:439:9 | { ... } |  | associated_types.rs:13:1:14:10 | S2 |
 | associated_types.rs:442:19:446:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:454:24:454:28 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:454:24:454:28 | SelfParam | TRef | associated_types.rs:452:5:455:5 | Self [trait Subtrait] |
@@ -221,7 +201,6 @@ inferCertainType
 | associated_types.rs:474:16:474:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:474:16:474:20 | SelfParam | TRef | associated_types.rs:469:5:469:24 | MyType |
 | associated_types.rs:474:16:474:20 | SelfParam | TRef.T | associated_types.rs:471:10:471:16 | T |
-| associated_types.rs:474:39:476:9 | { ... } |  | associated_types.rs:471:10:471:16 | T |
 | associated_types.rs:475:13:475:16 | self |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:475:13:475:16 | self | TRef | associated_types.rs:469:5:469:24 | MyType |
 | associated_types.rs:475:13:475:16 | self | TRef.T | associated_types.rs:471:10:471:16 | T |
@@ -230,28 +209,25 @@ inferCertainType
 | associated_types.rs:478:16:478:20 | SelfParam | TRef.T | associated_types.rs:471:10:471:16 | T |
 | associated_types.rs:478:23:478:30 | _content |  | associated_types.rs:471:10:471:16 | T |
 | associated_types.rs:478:47:480:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| associated_types.rs:479:13:479:43 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:479:22:479:42 | "Inserting content: \\n" |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:479:22:479:42 | "Inserting content: \\n" | TRef | {EXTERNAL LOCATION} | str |
-| associated_types.rs:479:22:479:42 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| associated_types.rs:479:22:479:42 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:479:22:479:42 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:485:24:485:28 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:485:24:485:28 | SelfParam | TRef | associated_types.rs:469:5:469:24 | MyType |
 | associated_types.rs:485:24:485:28 | SelfParam | TRef.T | associated_types.rs:483:10:483:16 | T |
-| associated_types.rs:485:47:487:9 | { ... } |  | associated_types.rs:483:10:483:16 | T |
 | associated_types.rs:486:15:486:18 | self |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:486:15:486:18 | self | TRef | associated_types.rs:469:5:469:24 | MyType |
 | associated_types.rs:486:15:486:18 | self | TRef.T | associated_types.rs:483:10:483:16 | T |
 | associated_types.rs:492:24:492:28 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:492:24:492:28 | SelfParam | TRef | associated_types.rs:67:1:67:23 | Odd |
 | associated_types.rs:492:24:492:28 | SelfParam | TRef.OddT | {EXTERNAL LOCATION} | i32 |
-| associated_types.rs:492:47:495:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
 | associated_types.rs:500:24:500:28 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:500:24:500:28 | SelfParam | TRef | associated_types.rs:67:1:67:23 | Odd |
 | associated_types.rs:500:24:500:28 | SelfParam | TRef.OddT | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:500:47:502:9 | { ... } |  | {EXTERNAL LOCATION} | char |
 | associated_types.rs:505:33:505:36 | item |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:505:33:505:36 | item | TRef | associated_types.rs:505:20:505:30 | T |
-| associated_types.rs:505:56:507:5 | { ... } |  | associated_types.rs:505:20:505:30 | T::Output[GetSet] |
 | associated_types.rs:506:9:506:12 | item |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:506:9:506:12 | item | TRef | associated_types.rs:505:20:505:30 | T |
 | associated_types.rs:509:35:509:38 | item |  | {EXTERNAL LOCATION} | & |
@@ -276,9 +252,6 @@ inferCertainType
 | associated_types.rs:536:16:536:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:536:16:536:20 | SelfParam | TRef | associated_types.rs:529:5:529:20 | ST |
 | associated_types.rs:536:16:536:20 | SelfParam | TRef.T | associated_types.rs:531:10:531:21 | Output |
-| associated_types.rs:536:39:538:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| associated_types.rs:536:39:538:9 | { ... } | E | associated_types.rs:531:10:531:21 | Output |
-| associated_types.rs:536:39:538:9 | { ... } | T | associated_types.rs:531:10:531:21 | Output |
 | associated_types.rs:537:16:537:19 | self |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:537:16:537:19 | self | TRef | associated_types.rs:529:5:529:20 | ST |
 | associated_types.rs:537:16:537:19 | self | TRef.T | associated_types.rs:531:10:531:21 | Output |
@@ -323,18 +296,9 @@ inferCertainType
 | associated_types.rs:565:19:565:19 | t | TRef.dyn(AnotherOutput) | {EXTERNAL LOCATION} | bool |
 | associated_types.rs:565:19:565:19 | t | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:569:15:578:1 | { ... } |  | {EXTERNAL LOCATION} | () |
-| associated_types.rs:570:5:570:48 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| associated_types.rs:571:5:571:48 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| associated_types.rs:572:5:572:59 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| associated_types.rs:573:5:573:45 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| associated_types.rs:574:5:574:35 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| associated_types.rs:575:5:575:37 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| associated_types.rs:576:5:576:41 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| associated_types.rs:577:5:577:46 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:15:18:15:22 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:15:18:15:22 | SelfParam | TRef | blanket_impl.rs:9:5:10:14 | S2 |
 | blanket_impl.rs:15:42:17:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| blanket_impl.rs:15:42:17:9 | { ... } | TRef | blanket_impl.rs:6:5:7:14 | S1 |
 | blanket_impl.rs:16:13:16:15 | &S1 |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:21:19:21:23 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:21:19:21:23 | SelfParam | TRef | blanket_impl.rs:20:5:22:5 | Self [trait Clone1] |
@@ -342,49 +306,51 @@ inferCertainType
 | blanket_impl.rs:25:22:25:26 | SelfParam | TRef | blanket_impl.rs:24:5:28:5 | Self [trait Duplicatable] |
 | blanket_impl.rs:32:19:32:23 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:32:19:32:23 | SelfParam | TRef | blanket_impl.rs:6:5:7:14 | S1 |
-| blanket_impl.rs:32:34:34:9 | { ... } |  | blanket_impl.rs:6:5:7:14 | S1 |
 | blanket_impl.rs:33:14:33:17 | self |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:33:14:33:17 | self | TRef | blanket_impl.rs:6:5:7:14 | S1 |
 | blanket_impl.rs:40:22:40:26 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:40:22:40:26 | SelfParam | TRef | blanket_impl.rs:38:10:38:18 | T |
-| blanket_impl.rs:40:37:42:9 | { ... } |  | blanket_impl.rs:38:10:38:18 | T |
 | blanket_impl.rs:41:13:41:16 | self |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:41:13:41:16 | self | TRef | blanket_impl.rs:38:10:38:18 | T |
 | blanket_impl.rs:45:33:60:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:47:9:47:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:47:18:47:25 | "{x1:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:47:18:47:25 | "{x1:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| blanket_impl.rs:47:18:47:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:47:18:47:25 | { ... } |  | {EXTERNAL LOCATION} | () |
-| blanket_impl.rs:48:18:48:22 | (...) |  | {EXTERNAL LOCATION} | & |
+| blanket_impl.rs:47:18:47:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:48:19:48:21 | &S1 |  | {EXTERNAL LOCATION} | & |
+| blanket_impl.rs:49:9:49:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:49:18:49:25 | "{x2:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:49:18:49:25 | "{x2:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| blanket_impl.rs:49:18:49:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:49:18:49:25 | { ... } |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:49:18:49:25 | { ... } |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:51:9:51:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:51:18:51:25 | "{x3:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:51:18:51:25 | "{x3:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| blanket_impl.rs:51:18:51:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:51:18:51:25 | { ... } |  | {EXTERNAL LOCATION} | () |
-| blanket_impl.rs:52:18:52:22 | (...) |  | {EXTERNAL LOCATION} | & |
+| blanket_impl.rs:51:18:51:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:52:19:52:21 | &S1 |  | {EXTERNAL LOCATION} | & |
+| blanket_impl.rs:53:9:53:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:53:18:53:25 | "{x4:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:53:18:53:25 | "{x4:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| blanket_impl.rs:53:18:53:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:53:18:53:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:53:18:53:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:54:32:54:34 | &S1 |  | {EXTERNAL LOCATION} | & |
+| blanket_impl.rs:55:9:55:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:55:18:55:25 | "{x5:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:55:18:55:25 | "{x5:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| blanket_impl.rs:55:18:55:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:55:18:55:25 | { ... } |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:55:18:55:25 | { ... } |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:57:9:57:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:57:18:57:25 | "{x6:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:57:18:57:25 | "{x6:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| blanket_impl.rs:57:18:57:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:57:18:57:25 | { ... } |  | {EXTERNAL LOCATION} | () |
-| blanket_impl.rs:58:18:58:22 | (...) |  | {EXTERNAL LOCATION} | & |
+| blanket_impl.rs:57:18:57:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:58:19:58:21 | &S2 |  | {EXTERNAL LOCATION} | & |
+| blanket_impl.rs:59:9:59:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:59:18:59:25 | "{x7:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:59:18:59:25 | "{x7:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| blanket_impl.rs:59:18:59:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:59:18:59:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:59:18:59:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:68:24:68:24 | x |  | {EXTERNAL LOCATION} | i64 |
 | blanket_impl.rs:68:32:68:32 | y |  | blanket_impl.rs:67:5:69:5 | Self [trait Trait1] |
@@ -396,28 +362,28 @@ inferCertainType
 | blanket_impl.rs:78:13:78:13 | y |  | blanket_impl.rs:64:5:65:14 | S1 |
 | blanket_impl.rs:84:24:84:24 | x |  | {EXTERNAL LOCATION} | i64 |
 | blanket_impl.rs:84:32:84:32 | y |  | blanket_impl.rs:82:10:82:18 | T |
-| blanket_impl.rs:84:49:86:9 | { ... } |  | blanket_impl.rs:82:10:82:18 | T |
 | blanket_impl.rs:85:28:85:28 | x |  | {EXTERNAL LOCATION} | i64 |
 | blanket_impl.rs:85:31:85:31 | y |  | blanket_impl.rs:82:10:82:18 | T |
 | blanket_impl.rs:89:33:98:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| blanket_impl.rs:90:13:90:14 | x1 |  | blanket_impl.rs:64:5:65:14 | S1 |
-| blanket_impl.rs:90:18:90:39 | ...::assoc_func1(...) |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:91:9:91:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:91:18:91:25 | "{x1:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:91:18:91:25 | "{x1:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| blanket_impl.rs:91:18:91:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:91:18:91:25 | { ... } |  | {EXTERNAL LOCATION} | () |
-| blanket_impl.rs:91:20:91:21 | x1 |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:91:18:91:25 | { ... } |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:93:9:93:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:93:18:93:25 | "{x2:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:93:18:93:25 | "{x2:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| blanket_impl.rs:93:18:93:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:93:18:93:25 | { ... } |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:93:18:93:25 | { ... } |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:95:9:95:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:95:18:95:25 | "{x3:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:95:18:95:25 | "{x3:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| blanket_impl.rs:95:18:95:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:95:18:95:25 | { ... } |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:95:18:95:25 | { ... } |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:97:9:97:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:97:18:97:25 | "{x4:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:97:18:97:25 | "{x4:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| blanket_impl.rs:97:18:97:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:97:18:97:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:97:18:97:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:108:22:108:26 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:108:22:108:26 | SelfParam | TRef | blanket_impl.rs:107:5:109:5 | Self [trait Flag] |
@@ -425,33 +391,24 @@ inferCertainType
 | blanket_impl.rs:112:26:112:30 | SelfParam | TRef | blanket_impl.rs:111:5:113:5 | Self [trait TryFlag] |
 | blanket_impl.rs:119:26:119:30 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:119:26:119:30 | SelfParam | TRef | blanket_impl.rs:115:10:115:11 | Fl |
-| blanket_impl.rs:119:49:121:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| blanket_impl.rs:119:49:121:9 | { ... } | T | {EXTERNAL LOCATION} | bool |
 | blanket_impl.rs:120:18:120:21 | self |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:120:18:120:21 | self | TRef | blanket_impl.rs:115:10:115:11 | Fl |
 | blanket_impl.rs:126:32:126:36 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:126:32:126:36 | SelfParam | TRef | blanket_impl.rs:124:5:129:5 | Self [trait TryFlagExt] |
-| blanket_impl.rs:126:55:128:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| blanket_impl.rs:126:55:128:9 | { ... } | T | {EXTERNAL LOCATION} | bool |
 | blanket_impl.rs:127:13:127:16 | self |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:127:13:127:16 | self | TRef | blanket_impl.rs:124:5:129:5 | Self [trait TryFlagExt] |
 | blanket_impl.rs:135:32:135:36 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:135:32:135:36 | SelfParam | TRef | blanket_impl.rs:133:5:136:5 | Self [trait AnotherTryFlag] |
 | blanket_impl.rs:144:26:144:30 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:144:26:144:30 | SelfParam | TRef | blanket_impl.rs:138:5:140:5 | MyTryFlag |
-| blanket_impl.rs:144:49:146:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| blanket_impl.rs:144:49:146:9 | { ... } | T | {EXTERNAL LOCATION} | bool |
 | blanket_impl.rs:145:18:145:21 | self |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:145:18:145:21 | self | TRef | blanket_impl.rs:138:5:140:5 | MyTryFlag |
 | blanket_impl.rs:155:22:155:26 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:155:22:155:26 | SelfParam | TRef | blanket_impl.rs:149:5:151:5 | MyFlag |
-| blanket_impl.rs:155:37:157:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
 | blanket_impl.rs:156:13:156:16 | self |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:156:13:156:16 | self | TRef | blanket_impl.rs:149:5:151:5 | MyFlag |
 | blanket_impl.rs:166:32:166:36 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:166:32:166:36 | SelfParam | TRef | blanket_impl.rs:160:5:162:5 | MyOtherFlag |
-| blanket_impl.rs:166:55:168:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| blanket_impl.rs:166:55:168:9 | { ... } | T | {EXTERNAL LOCATION} | bool |
 | blanket_impl.rs:167:18:167:21 | self |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:167:18:167:21 | self | TRef | blanket_impl.rs:160:5:162:5 | MyOtherFlag |
 | blanket_impl.rs:171:15:184:5 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -478,31 +435,25 @@ inferCertainType
 | blanket_impl.rs:226:21:226:22 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:231:15:231:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:231:15:231:18 | SelfParam | TRef | blanket_impl.rs:229:10:229:27 | T |
-| blanket_impl.rs:231:21:233:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:232:13:232:16 | self |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:232:13:232:16 | self | TRef | blanket_impl.rs:229:10:229:27 | T |
 | blanket_impl.rs:238:15:238:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:238:15:238:18 | SelfParam | TRef | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:238:15:238:18 | SelfParam | TRef.TRef | blanket_impl.rs:188:5:189:14 | S1 |
-| blanket_impl.rs:238:21:240:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:239:13:239:16 | self |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:239:13:239:16 | self | TRef | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:239:13:239:16 | self | TRef.TRef | blanket_impl.rs:188:5:189:14 | S1 |
 | blanket_impl.rs:245:15:245:18 | SelfParam |  | blanket_impl.rs:243:10:243:20 | T |
-| blanket_impl.rs:245:21:247:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:246:13:246:16 | self |  | blanket_impl.rs:243:10:243:20 | T |
 | blanket_impl.rs:252:15:252:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:252:15:252:18 | SelfParam | TRef | blanket_impl.rs:250:10:250:10 | T |
 | blanket_impl.rs:252:21:252:22 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:255:33:263:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| blanket_impl.rs:257:18:257:22 | (...) |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:257:19:257:21 | &S1 |  | {EXTERNAL LOCATION} | & |
-| blanket_impl.rs:258:18:258:23 | (...) |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:258:19:258:22 | &... |  | {EXTERNAL LOCATION} | & |
+| blanket_impl.rs:258:19:258:22 | &... | TRef | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:258:20:258:22 | &S1 |  | {EXTERNAL LOCATION} | & |
-| blanket_impl.rs:260:18:260:22 | (...) |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:260:19:260:21 | &S1 |  | {EXTERNAL LOCATION} | & |
-| blanket_impl.rs:262:18:262:22 | (...) |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:262:19:262:21 | &S2 |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:272:21:272:25 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:272:21:272:25 | SelfParam | TRef | blanket_impl.rs:271:5:274:5 | Self [trait Executor] |
@@ -512,23 +463,26 @@ inferCertainType
 | blanket_impl.rs:277:21:277:25 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:277:21:277:25 | SelfParam | TRef | blanket_impl.rs:276:10:276:22 | T |
 | blanket_impl.rs:277:28:279:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:278:13:278:42 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:278:22:278:41 | "Executor::execute1\\n" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:278:22:278:41 | "Executor::execute1\\n" | TRef | {EXTERNAL LOCATION} | str |
-| blanket_impl.rs:278:22:278:41 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:278:22:278:41 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:278:22:278:41 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:281:24:281:28 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:281:24:281:28 | SelfParam | TRef | blanket_impl.rs:276:10:276:22 | T |
 | blanket_impl.rs:281:31:281:36 | _query |  | blanket_impl.rs:281:21:281:21 | E |
 | blanket_impl.rs:281:42:283:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:282:13:282:42 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:282:22:282:41 | "Executor::execute2\\n" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:282:22:282:41 | "Executor::execute2\\n" | TRef | {EXTERNAL LOCATION} | str |
-| blanket_impl.rs:282:22:282:41 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| blanket_impl.rs:282:22:282:41 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:282:22:282:41 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:290:16:300:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:291:13:291:13 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
 | blanket_impl.rs:291:17:291:34 | MySqlConnection {...} |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
 | blanket_impl.rs:293:9:293:9 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
 | blanket_impl.rs:294:35:294:36 | &c |  | {EXTERNAL LOCATION} | & |
+| blanket_impl.rs:294:35:294:36 | &c | TRef | blanket_impl.rs:286:5:286:29 | MySqlConnection |
 | blanket_impl.rs:294:36:294:36 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
 | blanket_impl.rs:296:9:296:9 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
 | blanket_impl.rs:296:20:296:40 | "SELECT * FROM users" |  | {EXTERNAL LOCATION} | & |
@@ -537,33 +491,58 @@ inferCertainType
 | blanket_impl.rs:297:28:297:48 | "SELECT * FROM users" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:297:28:297:48 | "SELECT * FROM users" | TRef | {EXTERNAL LOCATION} | str |
 | blanket_impl.rs:298:35:298:36 | &c |  | {EXTERNAL LOCATION} | & |
+| blanket_impl.rs:298:35:298:36 | &c | TRef | blanket_impl.rs:286:5:286:29 | MySqlConnection |
 | blanket_impl.rs:298:36:298:36 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
 | blanket_impl.rs:298:39:298:59 | "SELECT * FROM users" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:298:39:298:59 | "SELECT * FROM users" | TRef | {EXTERNAL LOCATION} | str |
 | blanket_impl.rs:299:43:299:44 | &c |  | {EXTERNAL LOCATION} | & |
+| blanket_impl.rs:299:43:299:44 | &c | TRef | blanket_impl.rs:286:5:286:29 | MySqlConnection |
 | blanket_impl.rs:299:44:299:44 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
 | blanket_impl.rs:299:47:299:67 | "SELECT * FROM users" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:299:47:299:67 | "SELECT * FROM users" | TRef | {EXTERNAL LOCATION} | str |
-| closure.rs:4:19:31:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| cfg.rs:1:22:7:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| cfg.rs:2:9:2:12 | unix |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:2:16:2:25 | MacroExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:2:20:2:25 | CfgPredExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:3:9:3:15 | windows |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:3:19:3:45 | MacroExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:3:23:3:45 | CfgPredExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:4:9:4:14 | either |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:4:18:4:55 | MacroExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:4:22:4:55 | CfgPredExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:5:9:5:14 | always |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:5:18:5:28 | MacroExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:5:22:5:28 | CfgPredExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:6:9:6:13 | never |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:6:17:6:27 | MacroExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:6:21:6:27 | CfgPredExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:12:9:12:18 | MacroPat |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:12:13:12:18 | CfgPredPat |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:12:23:12:24 | TupleExpr |  | {EXTERNAL LOCATION} | () |
+| cfg.rs:13:9:13:35 | MacroPat |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:13:13:13:35 | CfgPredPat |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:13:40:13:41 | TupleExpr |  | {EXTERNAL LOCATION} | () |
+| cfg.rs:14:9:14:46 | MacroPat |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:14:13:14:46 | CfgPredPat |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:14:51:14:52 | TupleExpr |  | {EXTERNAL LOCATION} | () |
+| cfg.rs:15:14:15:15 | TupleExpr |  | {EXTERNAL LOCATION} | () |
+| closure.rs:4:19:39:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | closure.rs:6:13:6:22 | my_closure |  | {EXTERNAL LOCATION} | dyn Fn |
 | closure.rs:6:13:6:22 | my_closure | dyn(Args) | {EXTERNAL LOCATION} | (T_2) |
-| closure.rs:6:13:6:22 | my_closure | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:6:13:6:22 | my_closure | dyn(Args).T1 | {EXTERNAL LOCATION} | bool |
 | closure.rs:6:26:6:38 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
 | closure.rs:6:26:6:38 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_2) |
-| closure.rs:6:26:6:38 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:6:26:6:38 | \|...\| ... | dyn(Args).T1 | {EXTERNAL LOCATION} | bool |
-| closure.rs:6:27:6:27 | a |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:6:30:6:30 | b |  | {EXTERNAL LOCATION} | bool |
 | closure.rs:6:33:6:33 | a |  | {EXTERNAL LOCATION} | bool |
 | closure.rs:6:33:6:38 | ... && ... |  | {EXTERNAL LOCATION} | bool |
 | closure.rs:6:38:6:38 | b |  | {EXTERNAL LOCATION} | bool |
 | closure.rs:8:13:8:13 | x |  | {EXTERNAL LOCATION} | i64 |
 | closure.rs:8:22:8:25 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
 | closure.rs:9:13:9:19 | add_one |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:9:13:9:19 | add_one | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:9:23:9:34 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:9:23:9:34 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:9:31:9:34 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
 | closure.rs:10:18:10:24 | add_one |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:10:18:10:24 | add_one | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:10:25:10:27 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:10:25:10:27 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
 | closure.rs:10:26:10:26 | x |  | {EXTERNAL LOCATION} | i64 |
@@ -578,330 +557,379 @@ inferCertainType
 | closure.rs:15:18:15:25 | add_zero |  | {EXTERNAL LOCATION} | dyn Fn |
 | closure.rs:15:18:15:25 | add_zero | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:15:18:15:25 | add_zero | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:15:26:15:28 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:17:13:17:21 | _get_bool |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:17:13:17:21 | _get_bool | dyn(Args) | {EXTERNAL LOCATION} | () |
+| closure.rs:17:13:17:21 | _get_bool | dyn(Output) | {EXTERNAL LOCATION} | bool |
 | closure.rs:17:25:21:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:17:25:21:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | () |
+| closure.rs:17:25:21:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | bool |
 | closure.rs:24:13:24:14 | id |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:24:13:24:14 | id | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:24:18:24:22 | \|...\| b |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:24:18:24:22 | \|...\| b | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:25:18:25:19 | id |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:25:18:25:19 | id | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:25:20:25:25 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:25:20:25:25 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
 | closure.rs:25:21:25:24 | true |  | {EXTERNAL LOCATION} | bool |
 | closure.rs:28:13:28:15 | id2 |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:28:13:28:15 | id2 | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:28:19:28:23 | \|...\| b |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:28:19:28:23 | \|...\| b | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:30:13:30:15 | _b2 |  | {EXTERNAL LOCATION} | bool |
 | closure.rs:30:25:30:27 | id2 |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:35:44:35:44 | f |  | closure.rs:35:20:35:41 | F |
-| closure.rs:35:50:37:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:36:23:36:23 | f |  | closure.rs:35:20:35:41 | F |
-| closure.rs:36:24:36:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:36:24:36:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:36:25:36:28 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:39:45:39:45 | f |  | closure.rs:39:28:39:42 | F |
-| closure.rs:39:51:41:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:40:23:40:23 | f |  | closure.rs:39:28:39:42 | F |
-| closure.rs:40:24:40:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:40:24:40:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:40:25:40:28 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:43:46:43:46 | f |  | closure.rs:43:22:43:43 | F |
-| closure.rs:43:52:46:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:45:9:45:9 | f |  | closure.rs:43:22:43:43 | F |
-| closure.rs:48:39:48:39 | f |  | closure.rs:48:20:48:36 | F |
-| closure.rs:48:45:48:45 | a |  | closure.rs:48:14:48:14 | A |
-| closure.rs:48:56:50:5 | { ... } |  | closure.rs:48:17:48:17 | B |
-| closure.rs:49:9:49:9 | f |  | closure.rs:48:20:48:36 | F |
-| closure.rs:49:10:49:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:49:10:49:12 | ArgList | T0 | closure.rs:48:14:48:14 | A |
-| closure.rs:49:11:49:11 | a |  | closure.rs:48:14:48:14 | A |
-| closure.rs:52:18:52:18 | f |  | closure.rs:52:21:52:43 | impl ... |
-| closure.rs:52:53:54:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:53:9:53:9 | f |  | closure.rs:52:21:52:43 | impl ... |
-| closure.rs:56:15:68:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:57:13:57:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:57:13:57:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:57:13:57:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:57:17:63:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:57:17:63:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:57:17:63:9 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:57:18:57:18 | x |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:58:16:58:16 | x |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:64:24:64:24 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:64:24:64:24 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:64:24:64:24 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:64:27:64:30 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:66:13:66:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:66:17:66:25 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:67:13:67:15 | _r2 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:67:19:67:30 | apply_two(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:67:29:67:29 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:72:47:72:47 | f |  | closure.rs:72:20:72:40 | F |
-| closure.rs:72:53:74:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:73:23:73:23 | f |  | closure.rs:72:20:72:40 | F |
-| closure.rs:73:24:73:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:73:24:73:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:73:25:73:28 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:76:48:76:48 | f |  | closure.rs:76:28:76:41 | F |
-| closure.rs:76:54:78:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:77:23:77:23 | f |  | closure.rs:76:28:76:41 | F |
-| closure.rs:77:24:77:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:77:24:77:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:77:25:77:28 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:80:49:80:49 | f |  | closure.rs:80:22:80:42 | F |
-| closure.rs:80:55:83:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:82:9:82:9 | f |  | closure.rs:80:22:80:42 | F |
-| closure.rs:85:42:85:42 | f |  | closure.rs:85:20:85:35 | F |
-| closure.rs:85:48:85:48 | a |  | closure.rs:85:14:85:14 | A |
-| closure.rs:85:59:87:5 | { ... } |  | closure.rs:85:17:85:17 | B |
-| closure.rs:86:9:86:9 | f |  | closure.rs:85:20:85:35 | F |
-| closure.rs:86:10:86:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:86:10:86:12 | ArgList | T0 | closure.rs:85:14:85:14 | A |
-| closure.rs:86:11:86:11 | a |  | closure.rs:85:14:85:14 | A |
-| closure.rs:89:22:89:22 | f |  | closure.rs:89:25:89:46 | impl ... |
-| closure.rs:89:56:91:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:90:9:90:9 | f |  | closure.rs:89:25:89:46 | impl ... |
-| closure.rs:93:15:105:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:94:13:94:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:94:13:94:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:94:13:94:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:94:17:100:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:94:17:100:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:94:17:100:9 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:94:18:94:18 | x |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:95:16:95:16 | x |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:101:24:101:24 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:101:24:101:24 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:101:24:101:24 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:101:27:101:30 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:103:13:103:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:103:17:103:25 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:104:13:104:15 | _r2 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:104:19:104:30 | apply_two(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:104:29:104:29 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:109:40:109:40 | f |  | closure.rs:109:20:109:37 | F |
-| closure.rs:109:46:111:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:110:23:110:23 | f |  | closure.rs:109:20:109:37 | F |
-| closure.rs:110:24:110:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:110:24:110:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:110:25:110:28 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:113:41:113:41 | f |  | closure.rs:113:28:113:38 | F |
-| closure.rs:113:47:115:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:114:23:114:23 | f |  | closure.rs:113:28:113:38 | F |
-| closure.rs:114:24:114:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:114:24:114:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:114:25:114:28 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:117:42:117:42 | f |  | closure.rs:117:22:117:39 | F |
-| closure.rs:117:48:120:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:119:9:119:9 | f |  | closure.rs:117:22:117:39 | F |
-| closure.rs:122:35:122:35 | f |  | closure.rs:122:20:122:32 | F |
-| closure.rs:122:41:122:41 | a |  | closure.rs:122:14:122:14 | A |
-| closure.rs:122:52:124:5 | { ... } |  | closure.rs:122:17:122:17 | B |
-| closure.rs:123:9:123:9 | f |  | closure.rs:122:20:122:32 | F |
-| closure.rs:123:10:123:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:123:10:123:12 | ArgList | T0 | closure.rs:122:14:122:14 | A |
-| closure.rs:123:11:123:11 | a |  | closure.rs:122:14:122:14 | A |
-| closure.rs:126:18:126:18 | f |  | closure.rs:126:21:126:39 | impl ... |
-| closure.rs:126:49:128:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:127:9:127:9 | f |  | closure.rs:126:21:126:39 | impl ... |
-| closure.rs:130:15:142:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:131:13:131:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:131:13:131:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:131:13:131:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:131:17:137:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:131:17:137:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:131:17:137:9 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:131:18:131:18 | x |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:132:16:132:16 | x |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:138:24:138:24 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:138:24:138:24 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:138:24:138:24 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:138:27:138:30 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:140:13:140:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:140:17:140:25 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:141:13:141:15 | _r2 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:141:19:141:30 | apply_two(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:141:29:141:29 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:146:54:146:54 | f |  | {EXTERNAL LOCATION} | Box |
-| closure.rs:146:54:146:54 | f | A | {EXTERNAL LOCATION} | Global |
-| closure.rs:146:54:146:54 | f | T | closure.rs:146:26:146:51 | F |
-| closure.rs:146:65:146:67 | arg |  | closure.rs:146:20:146:20 | A |
-| closure.rs:146:78:148:5 | { ... } |  | closure.rs:146:23:146:23 | B |
-| closure.rs:147:9:147:9 | f |  | {EXTERNAL LOCATION} | Box |
-| closure.rs:147:9:147:9 | f | A | {EXTERNAL LOCATION} | Global |
-| closure.rs:147:9:147:9 | f | T | closure.rs:146:26:146:51 | F |
-| closure.rs:147:10:147:14 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:147:10:147:14 | ArgList | T0 | closure.rs:146:20:146:20 | A |
-| closure.rs:147:11:147:13 | arg |  | closure.rs:146:20:146:20 | A |
-| closure.rs:150:30:150:30 | f |  | {EXTERNAL LOCATION} | Box |
-| closure.rs:150:30:150:30 | f | A | {EXTERNAL LOCATION} | Global |
-| closure.rs:150:30:150:30 | f | T | {EXTERNAL LOCATION} | dyn FnOnce |
-| closure.rs:150:30:150:30 | f | T.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:150:30:150:30 | f | T.dyn(Args).T0 | closure.rs:150:24:150:24 | A |
-| closure.rs:150:30:150:30 | f | T.dyn(Output) | closure.rs:150:27:150:27 | B |
-| closure.rs:150:58:150:60 | arg |  | closure.rs:150:24:150:24 | A |
-| closure.rs:150:66:153:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:151:31:151:31 | f |  | {EXTERNAL LOCATION} | Box |
-| closure.rs:151:31:151:31 | f | A | {EXTERNAL LOCATION} | Global |
-| closure.rs:151:31:151:31 | f | T | {EXTERNAL LOCATION} | dyn FnOnce |
-| closure.rs:151:31:151:31 | f | T.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:151:31:151:31 | f | T.dyn(Args).T0 | closure.rs:150:24:150:24 | A |
-| closure.rs:151:31:151:31 | f | T.dyn(Output) | closure.rs:150:27:150:27 | B |
-| closure.rs:151:34:151:36 | arg |  | closure.rs:150:24:150:24 | A |
-| closure.rs:152:31:152:53 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| closure.rs:152:31:152:53 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| closure.rs:152:40:152:52 | \|...\| true |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:152:40:152:52 | \|...\| true | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:152:40:152:52 | \|...\| true | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:152:41:152:41 | _ |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:152:49:152:52 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:157:34:157:34 | f |  | closure.rs:157:15:157:31 | F |
-| closure.rs:157:40:157:40 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:157:55:159:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:158:9:158:9 | f |  | closure.rs:157:15:157:31 | F |
-| closure.rs:158:10:158:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:158:10:158:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:158:11:158:11 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:161:15:161:15 | f |  | closure.rs:161:18:161:36 | impl ... |
-| closure.rs:161:39:161:39 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:161:54:163:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:162:9:162:9 | f |  | closure.rs:161:18:161:36 | impl ... |
-| closure.rs:162:10:162:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:162:10:162:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:162:11:162:11 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:165:15:165:15 | f |  | {EXTERNAL LOCATION} | & |
-| closure.rs:165:15:165:15 | f | TRef | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:165:15:165:15 | f | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:165:15:165:15 | f | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:165:15:165:15 | f | TRef.dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:165:39:165:39 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:165:54:167:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:166:9:166:9 | f |  | {EXTERNAL LOCATION} | & |
-| closure.rs:166:9:166:9 | f | TRef | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:166:9:166:9 | f | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:166:9:166:9 | f | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:166:9:166:9 | f | TRef.dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:30:25:30:27 | id2 | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:30:28:30:32 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:33:13:33:14 | f1 |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:33:13:33:14 | f1 | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:33:18:33:31 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:33:18:33:31 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:33:22:33:31 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
+| closure.rs:33:26:33:30 | false |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:34:18:34:19 | f1 |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:34:18:34:19 | f1 | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:34:20:34:28 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:37:13:37:14 | f2 |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:37:13:37:14 | f2 | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:37:18:37:31 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:37:18:37:31 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:37:22:37:31 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
+| closure.rs:37:26:37:30 | false |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:38:13:38:14 | _r |  | {EXTERNAL LOCATION} | Option |
+| closure.rs:38:13:38:14 | _r | T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:38:31:38:32 | f2 |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:38:31:38:32 | f2 | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:38:33:38:52 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:43:44:43:44 | f |  | closure.rs:43:20:43:41 | F |
+| closure.rs:43:50:45:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:44:23:44:23 | f |  | closure.rs:43:20:43:41 | F |
+| closure.rs:44:24:44:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:44:24:44:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:44:25:44:28 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:47:45:47:45 | f |  | closure.rs:47:28:47:42 | F |
+| closure.rs:47:51:49:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:48:23:48:23 | f |  | closure.rs:47:28:47:42 | F |
+| closure.rs:48:24:48:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:48:24:48:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:48:25:48:28 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:51:46:51:46 | f |  | closure.rs:51:22:51:43 | F |
+| closure.rs:51:52:54:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:53:9:53:9 | f |  | closure.rs:51:22:51:43 | F |
+| closure.rs:53:10:53:14 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:56:39:56:39 | f |  | closure.rs:56:20:56:36 | F |
+| closure.rs:56:45:56:45 | a |  | closure.rs:56:14:56:14 | A |
+| closure.rs:57:9:57:9 | f |  | closure.rs:56:20:56:36 | F |
+| closure.rs:57:10:57:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:57:10:57:12 | ArgList | T0 | closure.rs:56:14:56:14 | A |
+| closure.rs:57:11:57:11 | a |  | closure.rs:56:14:56:14 | A |
+| closure.rs:60:18:60:18 | f |  | closure.rs:60:21:60:43 | impl ... |
+| closure.rs:61:9:61:9 | f |  | closure.rs:60:21:60:43 | impl ... |
+| closure.rs:61:10:61:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:64:15:76:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:65:13:65:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:65:13:65:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:65:13:65:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:65:13:65:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:65:17:71:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:65:17:71:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:65:17:71:9 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:65:17:71:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:65:18:65:18 | x |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:66:16:66:16 | x |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:72:24:72:24 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:72:24:72:24 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:72:24:72:24 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:72:24:72:24 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:72:27:72:30 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:74:13:74:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:74:13:74:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:74:17:74:25 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:74:17:74:25 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:75:29:75:29 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:75:29:75:29 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:80:47:80:47 | f |  | closure.rs:80:20:80:40 | F |
+| closure.rs:80:53:82:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:81:23:81:23 | f |  | closure.rs:80:20:80:40 | F |
+| closure.rs:81:24:81:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:81:24:81:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:81:25:81:28 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:84:48:84:48 | f |  | closure.rs:84:28:84:41 | F |
+| closure.rs:84:54:86:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:85:23:85:23 | f |  | closure.rs:84:28:84:41 | F |
+| closure.rs:85:24:85:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:85:24:85:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:85:25:85:28 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:88:49:88:49 | f |  | closure.rs:88:22:88:42 | F |
+| closure.rs:88:55:91:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:90:9:90:9 | f |  | closure.rs:88:22:88:42 | F |
+| closure.rs:90:10:90:14 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:93:42:93:42 | f |  | closure.rs:93:20:93:35 | F |
+| closure.rs:93:48:93:48 | a |  | closure.rs:93:14:93:14 | A |
+| closure.rs:94:9:94:9 | f |  | closure.rs:93:20:93:35 | F |
+| closure.rs:94:10:94:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:94:10:94:12 | ArgList | T0 | closure.rs:93:14:93:14 | A |
+| closure.rs:94:11:94:11 | a |  | closure.rs:93:14:93:14 | A |
+| closure.rs:97:22:97:22 | f |  | closure.rs:97:25:97:46 | impl ... |
+| closure.rs:98:9:98:9 | f |  | closure.rs:97:25:97:46 | impl ... |
+| closure.rs:98:10:98:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:101:15:113:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:102:13:102:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:102:13:102:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:102:13:102:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:102:13:102:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:102:17:108:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:102:17:108:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:102:17:108:9 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:102:17:108:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:102:18:102:18 | x |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:103:16:103:16 | x |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:109:24:109:24 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:109:24:109:24 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:109:24:109:24 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:109:24:109:24 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:109:27:109:30 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:111:13:111:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:111:13:111:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:111:17:111:25 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:111:17:111:25 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:112:29:112:29 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:112:29:112:29 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:117:40:117:40 | f |  | closure.rs:117:20:117:37 | F |
+| closure.rs:117:46:119:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:118:23:118:23 | f |  | closure.rs:117:20:117:37 | F |
+| closure.rs:118:24:118:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:118:24:118:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:118:25:118:28 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:121:41:121:41 | f |  | closure.rs:121:28:121:38 | F |
+| closure.rs:121:47:123:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:122:23:122:23 | f |  | closure.rs:121:28:121:38 | F |
+| closure.rs:122:24:122:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:122:24:122:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:122:25:122:28 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:125:42:125:42 | f |  | closure.rs:125:22:125:39 | F |
+| closure.rs:125:48:128:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:127:9:127:9 | f |  | closure.rs:125:22:125:39 | F |
+| closure.rs:127:10:127:14 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:130:35:130:35 | f |  | closure.rs:130:20:130:32 | F |
+| closure.rs:130:41:130:41 | a |  | closure.rs:130:14:130:14 | A |
+| closure.rs:131:9:131:9 | f |  | closure.rs:130:20:130:32 | F |
+| closure.rs:131:10:131:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:131:10:131:12 | ArgList | T0 | closure.rs:130:14:130:14 | A |
+| closure.rs:131:11:131:11 | a |  | closure.rs:130:14:130:14 | A |
+| closure.rs:134:18:134:18 | f |  | closure.rs:134:21:134:39 | impl ... |
+| closure.rs:135:9:135:9 | f |  | closure.rs:134:21:134:39 | impl ... |
+| closure.rs:135:10:135:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:138:15:150:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:139:13:139:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:139:13:139:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:139:13:139:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:139:13:139:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:139:17:145:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:139:17:145:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:139:17:145:9 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:139:17:145:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:139:18:139:18 | x |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:140:16:140:16 | x |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:146:24:146:24 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:146:24:146:24 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:146:24:146:24 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:146:24:146:24 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:146:27:146:30 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:148:13:148:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:148:13:148:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:148:17:148:25 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:148:17:148:25 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:149:29:149:29 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:149:29:149:29 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:154:54:154:54 | f |  | {EXTERNAL LOCATION} | Box |
+| closure.rs:154:54:154:54 | f | A | {EXTERNAL LOCATION} | Global |
+| closure.rs:154:54:154:54 | f | T | closure.rs:154:26:154:51 | F |
+| closure.rs:154:65:154:67 | arg |  | closure.rs:154:20:154:20 | A |
+| closure.rs:155:9:155:9 | f |  | {EXTERNAL LOCATION} | Box |
+| closure.rs:155:9:155:9 | f | A | {EXTERNAL LOCATION} | Global |
+| closure.rs:155:9:155:9 | f | T | closure.rs:154:26:154:51 | F |
+| closure.rs:155:10:155:14 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:155:10:155:14 | ArgList | T0 | closure.rs:154:20:154:20 | A |
+| closure.rs:155:11:155:13 | arg |  | closure.rs:154:20:154:20 | A |
+| closure.rs:158:30:158:30 | f |  | {EXTERNAL LOCATION} | Box |
+| closure.rs:158:30:158:30 | f | A | {EXTERNAL LOCATION} | Global |
+| closure.rs:158:30:158:30 | f | T | {EXTERNAL LOCATION} | dyn FnOnce |
+| closure.rs:158:30:158:30 | f | T.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:158:30:158:30 | f | T.dyn(Args).T0 | closure.rs:158:24:158:24 | A |
+| closure.rs:158:30:158:30 | f | T.dyn(Output) | closure.rs:158:27:158:27 | B |
+| closure.rs:158:58:158:60 | arg |  | closure.rs:158:24:158:24 | A |
+| closure.rs:158:66:161:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:159:31:159:31 | f |  | {EXTERNAL LOCATION} | Box |
+| closure.rs:159:31:159:31 | f | A | {EXTERNAL LOCATION} | Global |
+| closure.rs:159:31:159:31 | f | T | {EXTERNAL LOCATION} | dyn FnOnce |
+| closure.rs:159:31:159:31 | f | T.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:159:31:159:31 | f | T.dyn(Args).T0 | closure.rs:158:24:158:24 | A |
+| closure.rs:159:31:159:31 | f | T.dyn(Output) | closure.rs:158:27:158:27 | B |
+| closure.rs:159:34:159:36 | arg |  | closure.rs:158:24:158:24 | A |
+| closure.rs:160:40:160:52 | \|...\| true |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:160:40:160:52 | \|...\| true | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:160:40:160:52 | \|...\| true | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:160:41:160:41 | _ |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:160:49:160:52 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:165:34:165:34 | f |  | closure.rs:165:15:165:31 | F |
+| closure.rs:165:40:165:40 | a |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:166:9:166:9 | f |  | closure.rs:165:15:165:31 | F |
 | closure.rs:166:10:166:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:166:10:166:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
 | closure.rs:166:11:166:11 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:169:41:169:41 | f |  | closure.rs:169:15:169:34 | F |
-| closure.rs:169:47:169:47 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:169:62:171:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:170:9:170:9 | f |  | closure.rs:169:15:169:34 | F |
+| closure.rs:169:15:169:15 | f |  | closure.rs:169:18:169:36 | impl ... |
+| closure.rs:169:39:169:39 | a |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:170:9:170:9 | f |  | closure.rs:169:18:169:36 | impl ... |
 | closure.rs:170:10:170:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:170:10:170:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
 | closure.rs:170:11:170:11 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:173:15:173:15 | f |  | {EXTERNAL LOCATION} | &mut |
-| closure.rs:173:15:173:15 | f | TRefMut | {EXTERNAL LOCATION} | dyn FnMut |
-| closure.rs:173:15:173:15 | f | TRefMut.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:173:15:173:15 | f | TRefMut.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:173:15:173:15 | f | TRefMut.dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:173:46:173:46 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:173:61:175:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:174:9:174:9 | f |  | {EXTERNAL LOCATION} | &mut |
-| closure.rs:174:9:174:9 | f | TRefMut | {EXTERNAL LOCATION} | dyn FnMut |
-| closure.rs:174:9:174:9 | f | TRefMut.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:174:9:174:9 | f | TRefMut.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:174:9:174:9 | f | TRefMut.dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:173:15:173:15 | f |  | {EXTERNAL LOCATION} | & |
+| closure.rs:173:15:173:15 | f | TRef | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:173:15:173:15 | f | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:173:15:173:15 | f | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:173:15:173:15 | f | TRef.dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:173:39:173:39 | a |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:174:9:174:9 | f |  | {EXTERNAL LOCATION} | & |
+| closure.rs:174:9:174:9 | f | TRef | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:174:9:174:9 | f | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:174:9:174:9 | f | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:174:9:174:9 | f | TRef.dyn(Output) | {EXTERNAL LOCATION} | i64 |
 | closure.rs:174:10:174:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:174:10:174:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
 | closure.rs:174:11:174:11 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:177:18:177:18 | f |  | closure.rs:177:21:177:37 | impl ... |
-| closure.rs:177:40:177:40 | a |  | closure.rs:177:15:177:15 | T |
-| closure.rs:177:53:179:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:178:9:178:9 | f |  | closure.rs:177:21:177:37 | impl ... |
+| closure.rs:177:41:177:41 | f |  | closure.rs:177:15:177:34 | F |
+| closure.rs:177:47:177:47 | a |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:178:9:178:9 | f |  | closure.rs:177:15:177:34 | F |
 | closure.rs:178:10:178:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:178:10:178:12 | ArgList | T0 | closure.rs:177:15:177:15 | T |
-| closure.rs:178:11:178:11 | a |  | closure.rs:177:15:177:15 | T |
-| closure.rs:181:42:181:42 | f |  | closure.rs:181:18:181:35 | F |
-| closure.rs:181:48:181:48 | a |  | closure.rs:181:15:181:15 | T |
-| closure.rs:181:61:183:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:182:9:182:9 | f |  | closure.rs:181:18:181:35 | F |
+| closure.rs:178:10:178:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:178:11:178:11 | a |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:181:15:181:15 | f |  | {EXTERNAL LOCATION} | &mut |
+| closure.rs:181:15:181:15 | f | TRefMut | {EXTERNAL LOCATION} | dyn FnMut |
+| closure.rs:181:15:181:15 | f | TRefMut.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:181:15:181:15 | f | TRefMut.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:181:15:181:15 | f | TRefMut.dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:181:46:181:46 | a |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:182:9:182:9 | f |  | {EXTERNAL LOCATION} | &mut |
+| closure.rs:182:9:182:9 | f | TRefMut | {EXTERNAL LOCATION} | dyn FnMut |
+| closure.rs:182:9:182:9 | f | TRefMut.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:182:9:182:9 | f | TRefMut.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:182:9:182:9 | f | TRefMut.dyn(Output) | {EXTERNAL LOCATION} | i64 |
 | closure.rs:182:10:182:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:182:10:182:12 | ArgList | T0 | closure.rs:181:15:181:15 | T |
-| closure.rs:182:11:182:11 | a |  | closure.rs:181:15:181:15 | T |
-| closure.rs:185:15:206:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:186:13:186:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:186:17:186:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:187:13:187:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:187:18:187:32 | apply1(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:187:25:187:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:187:28:187:31 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:189:13:189:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:189:17:189:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:190:13:190:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:190:18:190:32 | apply2(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:190:25:190:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:190:28:190:31 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:192:13:192:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:192:17:192:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:193:13:193:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:193:18:193:33 | apply3(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:193:25:193:26 | &f |  | {EXTERNAL LOCATION} | & |
-| closure.rs:193:26:193:26 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:193:29:193:32 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:195:13:195:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:195:17:195:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:196:13:196:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:196:18:196:32 | apply4(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:196:25:196:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:196:28:196:31 | 4i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:198:17:198:17 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:198:21:198:25 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:199:13:199:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:199:18:199:37 | apply5(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:199:25:199:30 | &mut f |  | {EXTERNAL LOCATION} | &mut |
-| closure.rs:199:30:199:30 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:199:33:199:36 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:201:13:201:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:201:17:201:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:202:13:202:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:202:18:202:32 | apply6(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:202:25:202:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:202:28:202:31 | 6i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:204:13:204:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:204:17:204:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:205:13:205:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:205:18:205:32 | apply7(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:205:25:205:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:205:28:205:31 | 7i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:217:18:217:22 | SelfParam |  | {EXTERNAL LOCATION} | & |
-| closure.rs:217:18:217:22 | SelfParam | TRef | closure.rs:212:5:212:19 | S |
-| closure.rs:217:18:217:22 | SelfParam | TRef.T | closure.rs:214:10:214:10 | T |
-| closure.rs:217:42:219:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| closure.rs:217:42:219:9 | { ... } | TRef | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:217:42:219:9 | { ... } | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:217:42:219:9 | { ... } | TRef.dyn(Args).T0 | closure.rs:214:10:214:10 | T |
-| closure.rs:217:42:219:9 | { ... } | TRef.dyn(Output) | {EXTERNAL LOCATION} | bool |
-| closure.rs:218:13:218:22 | &... |  | {EXTERNAL LOCATION} | & |
-| closure.rs:218:14:218:22 | \|...\| false |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:218:18:218:22 | false |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:222:19:248:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:223:13:223:13 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:223:17:223:20 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:226:21:226:23 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:226:21:226:23 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:226:22:226:22 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:228:13:228:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:228:17:228:20 | 0i32 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:231:21:231:23 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:231:21:231:23 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:231:22:231:22 | x |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:232:13:232:17 | s_ref |  | {EXTERNAL LOCATION} | & |
-| closure.rs:232:21:232:22 | &s |  | {EXTERNAL LOCATION} | & |
-| closure.rs:240:20:240:24 | s_ref |  | {EXTERNAL LOCATION} | & |
-| closure.rs:240:25:240:27 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:240:25:240:27 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:240:26:240:26 | x |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:246:13:246:13 | c |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:246:17:246:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:247:9:247:12 | (...) |  | {EXTERNAL LOCATION} | & |
-| closure.rs:247:10:247:11 | &c |  | {EXTERNAL LOCATION} | & |
-| closure.rs:247:11:247:11 | c |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:247:13:247:15 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:247:13:247:15 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:247:14:247:14 | x |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:182:10:182:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:182:11:182:11 | a |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:185:18:185:18 | f |  | closure.rs:185:21:185:37 | impl ... |
+| closure.rs:185:40:185:40 | a |  | closure.rs:185:15:185:15 | T |
+| closure.rs:186:9:186:9 | f |  | closure.rs:185:21:185:37 | impl ... |
+| closure.rs:186:10:186:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:186:10:186:12 | ArgList | T0 | closure.rs:185:15:185:15 | T |
+| closure.rs:186:11:186:11 | a |  | closure.rs:185:15:185:15 | T |
+| closure.rs:189:42:189:42 | f |  | closure.rs:189:18:189:35 | F |
+| closure.rs:189:48:189:48 | a |  | closure.rs:189:15:189:15 | T |
+| closure.rs:190:9:190:9 | f |  | closure.rs:189:18:189:35 | F |
+| closure.rs:190:10:190:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:190:10:190:12 | ArgList | T0 | closure.rs:189:15:189:15 | T |
+| closure.rs:190:11:190:11 | a |  | closure.rs:189:15:189:15 | T |
+| closure.rs:193:15:214:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:194:13:194:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:194:13:194:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:194:17:194:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:194:17:194:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:195:25:195:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:195:25:195:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:195:28:195:31 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:197:13:197:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:197:13:197:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:197:17:197:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:197:17:197:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:198:25:198:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:198:25:198:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:198:28:198:31 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:200:13:200:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:200:13:200:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:200:17:200:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:200:17:200:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:201:25:201:26 | &f |  | {EXTERNAL LOCATION} | & |
+| closure.rs:201:25:201:26 | &f | TRef | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:201:25:201:26 | &f | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:201:26:201:26 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:201:26:201:26 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:201:29:201:32 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:203:13:203:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:203:13:203:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:203:17:203:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:203:17:203:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:204:25:204:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:204:25:204:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:204:28:204:31 | 4i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:206:17:206:17 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:206:17:206:17 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:206:21:206:25 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:206:21:206:25 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:207:25:207:30 | &mut f |  | {EXTERNAL LOCATION} | &mut |
+| closure.rs:207:25:207:30 | &mut f | TRefMut | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:207:25:207:30 | &mut f | TRefMut.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:207:30:207:30 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:207:30:207:30 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:207:33:207:36 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:209:13:209:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:209:13:209:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:209:17:209:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:209:17:209:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:210:25:210:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:210:25:210:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:210:28:210:31 | 6i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:212:13:212:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:212:13:212:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:212:17:212:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:212:17:212:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:213:25:213:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:213:25:213:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:213:28:213:31 | 7i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:225:18:225:22 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| closure.rs:225:18:225:22 | SelfParam | TRef | closure.rs:220:5:220:19 | S |
+| closure.rs:225:18:225:22 | SelfParam | TRef.T | closure.rs:222:10:222:10 | T |
+| closure.rs:225:42:227:9 | { ... } |  | {EXTERNAL LOCATION} | & |
+| closure.rs:225:42:227:9 | { ... } | TRef | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:225:42:227:9 | { ... } | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:226:13:226:22 | &... |  | {EXTERNAL LOCATION} | & |
+| closure.rs:226:13:226:22 | &... | TRef | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:226:13:226:22 | &... | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:226:14:226:22 | \|...\| false |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:226:14:226:22 | \|...\| false | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:226:18:226:22 | false |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:230:19:256:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:231:13:231:13 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:231:17:231:20 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:234:21:234:23 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:234:21:234:23 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:234:22:234:22 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:236:13:236:13 | x |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:236:17:236:20 | 0i32 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:239:21:239:23 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:239:21:239:23 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
+| closure.rs:239:22:239:22 | x |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:240:13:240:17 | s_ref |  | {EXTERNAL LOCATION} | & |
+| closure.rs:240:21:240:22 | &s |  | {EXTERNAL LOCATION} | & |
+| closure.rs:248:20:248:24 | s_ref |  | {EXTERNAL LOCATION} | & |
+| closure.rs:248:25:248:27 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:248:25:248:27 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
+| closure.rs:248:26:248:26 | x |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:254:13:254:13 | c |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:254:13:254:13 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:254:17:254:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:254:17:254:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:255:10:255:11 | &c |  | {EXTERNAL LOCATION} | & |
+| closure.rs:255:10:255:11 | &c | TRef | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:255:10:255:11 | &c | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:255:11:255:11 | c |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:255:11:255:11 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:255:13:255:15 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:255:13:255:15 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
+| closure.rs:255:14:255:14 | x |  | {EXTERNAL LOCATION} | i32 |
 | dereference.rs:13:14:13:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:13:14:13:18 | SelfParam | TRef | dereference.rs:5:1:7:1 | MyIntPointer |
 | dereference.rs:13:29:15:5 | { ... } |  | {EXTERNAL LOCATION} | & |
-| dereference.rs:13:29:15:5 | { ... } | TRef | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:14:9:14:19 | &... |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:14:10:14:13 | self |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:14:10:14:13 | self | TRef | dereference.rs:5:1:7:1 | MyIntPointer |
@@ -909,7 +937,6 @@ inferCertainType
 | dereference.rs:26:14:26:18 | SelfParam | TRef | dereference.rs:18:1:20:1 | MySmartPointer |
 | dereference.rs:26:14:26:18 | SelfParam | TRef.T | dereference.rs:22:6:22:6 | T |
 | dereference.rs:26:27:28:5 | { ... } |  | {EXTERNAL LOCATION} | & |
-| dereference.rs:26:27:28:5 | { ... } | TRef | dereference.rs:22:6:22:6 | T |
 | dereference.rs:27:9:27:19 | &... |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:27:10:27:13 | self |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:27:10:27:13 | self | TRef | dereference.rs:18:1:20:1 | MySmartPointer |
@@ -918,7 +945,6 @@ inferCertainType
 | dereference.rs:33:18:33:26 | SelfParam | TRefMut | dereference.rs:18:1:20:1 | MySmartPointer |
 | dereference.rs:33:18:33:26 | SelfParam | TRefMut.T | dereference.rs:31:6:31:6 | T |
 | dereference.rs:33:39:35:5 | { ... } |  | {EXTERNAL LOCATION} | &mut |
-| dereference.rs:33:39:35:5 | { ... } | TRefMut | dereference.rs:31:6:31:6 | T |
 | dereference.rs:34:9:34:23 | &mut ... |  | {EXTERNAL LOCATION} | &mut |
 | dereference.rs:34:14:34:17 | self |  | {EXTERNAL LOCATION} | &mut |
 | dereference.rs:34:14:34:17 | self | TRefMut | dereference.rs:18:1:20:1 | MySmartPointer |
@@ -927,7 +953,6 @@ inferCertainType
 | dereference.rs:41:12:41:16 | SelfParam | TRef | dereference.rs:38:1:38:15 | S |
 | dereference.rs:41:12:41:16 | SelfParam | TRef.T | dereference.rs:40:6:40:6 | T |
 | dereference.rs:41:25:43:5 | { ... } |  | {EXTERNAL LOCATION} | & |
-| dereference.rs:41:25:43:5 | { ... } | TRef | dereference.rs:40:6:40:6 | T |
 | dereference.rs:42:9:42:15 | &... |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:42:10:42:13 | self |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:42:10:42:13 | self | TRef | dereference.rs:38:1:38:15 | S |
@@ -960,23 +985,30 @@ inferCertainType
 | dereference.rs:71:17:71:18 | c3 |  | dereference.rs:18:1:20:1 | MySmartPointer |
 | dereference.rs:74:31:86:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:76:9:76:10 | e1 |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:76:9:76:10 | e1 | TRef | {EXTERNAL LOCATION} | char |
 | dereference.rs:76:14:76:17 | &'a' |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:76:14:76:17 | &'a' | TRef | {EXTERNAL LOCATION} | char |
 | dereference.rs:76:15:76:17 | 'a' |  | {EXTERNAL LOCATION} | char |
 | dereference.rs:77:15:77:16 | e1 |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:77:15:77:16 | e1 | TRef | {EXTERNAL LOCATION} | char |
 | dereference.rs:80:9:80:10 | e2 |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:80:9:80:10 | e2 | TRef | {EXTERNAL LOCATION} | char |
 | dereference.rs:80:14:80:17 | &'a' |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:80:14:80:17 | &'a' | TRef | {EXTERNAL LOCATION} | char |
 | dereference.rs:80:15:80:17 | 'a' |  | {EXTERNAL LOCATION} | char |
 | dereference.rs:81:16:81:17 | e2 |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:81:16:81:17 | e2 | TRef | {EXTERNAL LOCATION} | char |
 | dereference.rs:84:9:84:10 | e3 |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:84:9:84:10 | e3 | TRef | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:84:14:84:19 | &34i64 |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:84:14:84:19 | &34i64 | TRef | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:84:15:84:19 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:85:17:85:18 | e3 |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:85:17:85:18 | e3 | TRef | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:88:31:100:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:90:9:90:10 | g1 |  | {EXTERNAL LOCATION} | Box |
 | dereference.rs:90:9:90:10 | g1 | A | {EXTERNAL LOCATION} | Global |
 | dereference.rs:90:9:90:10 | g1 | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:90:25:90:37 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| dereference.rs:90:25:90:37 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | dereference.rs:90:34:90:36 | 'a' |  | {EXTERNAL LOCATION} | char |
 | dereference.rs:91:15:91:16 | g1 |  | {EXTERNAL LOCATION} | Box |
 | dereference.rs:91:15:91:16 | g1 | A | {EXTERNAL LOCATION} | Global |
@@ -984,8 +1016,6 @@ inferCertainType
 | dereference.rs:94:9:94:10 | g2 |  | {EXTERNAL LOCATION} | Box |
 | dereference.rs:94:9:94:10 | g2 | A | {EXTERNAL LOCATION} | Global |
 | dereference.rs:94:9:94:10 | g2 | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:94:25:94:37 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| dereference.rs:94:25:94:37 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | dereference.rs:94:34:94:36 | 'a' |  | {EXTERNAL LOCATION} | char |
 | dereference.rs:95:16:95:17 | g2 |  | {EXTERNAL LOCATION} | Box |
 | dereference.rs:95:16:95:17 | g2 | A | {EXTERNAL LOCATION} | Global |
@@ -993,8 +1023,6 @@ inferCertainType
 | dereference.rs:98:9:98:10 | g3 |  | {EXTERNAL LOCATION} | Box |
 | dereference.rs:98:9:98:10 | g3 | A | {EXTERNAL LOCATION} | Global |
 | dereference.rs:98:9:98:10 | g3 | T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:98:24:98:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| dereference.rs:98:24:98:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | dereference.rs:98:33:98:37 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:99:17:99:18 | g3 |  | {EXTERNAL LOCATION} | Box |
 | dereference.rs:99:17:99:18 | g3 | A | {EXTERNAL LOCATION} | Global |
@@ -1012,70 +1040,41 @@ inferCertainType
 | dereference.rs:111:13:111:45 | MySmartPointer {...} |  | dereference.rs:18:1:20:1 | MySmartPointer |
 | dereference.rs:111:39:111:42 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:112:14:112:14 | z |  | dereference.rs:18:1:20:1 | MySmartPointer |
-| dereference.rs:114:9:114:9 | v |  | {EXTERNAL LOCATION} | Vec |
-| dereference.rs:114:9:114:9 | v | A | {EXTERNAL LOCATION} | Global |
-| dereference.rs:114:13:114:22 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
-| dereference.rs:114:13:114:22 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | dereference.rs:115:13:115:13 | x |  | dereference.rs:18:1:20:1 | MySmartPointer |
 | dereference.rs:115:17:115:43 | MySmartPointer {...} |  | dereference.rs:18:1:20:1 | MySmartPointer |
-| dereference.rs:115:41:115:41 | v |  | {EXTERNAL LOCATION} | Vec |
-| dereference.rs:115:41:115:41 | v | A | {EXTERNAL LOCATION} | Global |
 | dereference.rs:116:5:116:5 | x |  | dereference.rs:18:1:20:1 | MySmartPointer |
 | dereference.rs:143:19:151:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| dereference.rs:144:17:144:26 | key_to_key |  | {EXTERNAL LOCATION} | HashMap |
-| dereference.rs:144:17:144:26 | key_to_key | K | {EXTERNAL LOCATION} | & |
-| dereference.rs:144:17:144:26 | key_to_key | K.TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:144:17:144:26 | key_to_key | S | {EXTERNAL LOCATION} | RandomState |
-| dereference.rs:144:17:144:26 | key_to_key | V | {EXTERNAL LOCATION} | & |
-| dereference.rs:144:17:144:26 | key_to_key | V.TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:144:30:144:57 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
-| dereference.rs:144:30:144:57 | ...::new(...) | K | {EXTERNAL LOCATION} | & |
-| dereference.rs:144:30:144:57 | ...::new(...) | K.TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:144:30:144:57 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
-| dereference.rs:144:30:144:57 | ...::new(...) | V | {EXTERNAL LOCATION} | & |
-| dereference.rs:144:30:144:57 | ...::new(...) | V.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:145:17:145:19 | key |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:145:17:145:19 | key | TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:145:23:145:29 | &... |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:145:23:145:29 | &... | TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:145:24:145:29 | Key {...} |  | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:146:9:149:9 | if ... {...} |  | {EXTERNAL LOCATION} | () |
-| dereference.rs:146:32:146:41 | key_to_key |  | {EXTERNAL LOCATION} | HashMap |
-| dereference.rs:146:32:146:41 | key_to_key | K | {EXTERNAL LOCATION} | & |
-| dereference.rs:146:32:146:41 | key_to_key | K.TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:146:32:146:41 | key_to_key | S | {EXTERNAL LOCATION} | RandomState |
-| dereference.rs:146:32:146:41 | key_to_key | V | {EXTERNAL LOCATION} | & |
-| dereference.rs:146:32:146:41 | key_to_key | V.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:146:47:146:49 | key |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:146:47:146:49 | key | TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:146:52:149:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:148:13:148:15 | key |  | {EXTERNAL LOCATION} | & |
-| dereference.rs:150:9:150:18 | key_to_key |  | {EXTERNAL LOCATION} | HashMap |
-| dereference.rs:150:9:150:18 | key_to_key | K | {EXTERNAL LOCATION} | & |
-| dereference.rs:150:9:150:18 | key_to_key | K.TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:150:9:150:18 | key_to_key | S | {EXTERNAL LOCATION} | RandomState |
-| dereference.rs:150:9:150:18 | key_to_key | V | {EXTERNAL LOCATION} | & |
-| dereference.rs:150:9:150:18 | key_to_key | V.TRef | dereference.rs:122:5:123:21 | Key |
+| dereference.rs:148:13:148:15 | key | TRef | dereference.rs:122:5:123:21 | Key |
+| dereference.rs:148:13:148:25 | ... = ... |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:150:27:150:29 | key |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:150:27:150:29 | key | TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:150:32:150:34 | key |  | {EXTERNAL LOCATION} | & |
+| dereference.rs:150:32:150:34 | key | TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:156:16:156:19 | SelfParam |  | dereference.rs:155:5:157:5 | Self [trait MyTrait1] |
 | dereference.rs:163:16:163:19 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:163:16:163:19 | SelfParam | TRef | dereference.rs:159:5:159:13 | S |
-| dereference.rs:163:27:165:9 | { ... } |  | dereference.rs:159:5:159:13 | S |
 | dereference.rs:170:16:170:19 | SelfParam |  | {EXTERNAL LOCATION} | &mut |
 | dereference.rs:170:16:170:19 | SelfParam | TRefMut | dereference.rs:159:5:159:13 | S |
-| dereference.rs:170:29:172:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:176:16:176:19 | SelfParam |  | dereference.rs:175:5:177:5 | Self [trait MyTrait2] |
 | dereference.rs:176:22:176:24 | arg |  | dereference.rs:175:20:175:21 | T1 |
 | dereference.rs:181:16:181:19 | SelfParam |  | dereference.rs:159:5:159:13 | S |
 | dereference.rs:181:22:181:24 | arg |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:181:22:181:24 | arg | TRef | dereference.rs:159:5:159:13 | S |
-| dereference.rs:181:36:183:9 | { ... } |  | dereference.rs:159:5:159:13 | S |
 | dereference.rs:188:16:188:19 | SelfParam |  | dereference.rs:159:5:159:13 | S |
 | dereference.rs:188:22:188:24 | arg |  | {EXTERNAL LOCATION} | &mut |
 | dereference.rs:188:22:188:24 | arg | TRefMut | dereference.rs:159:5:159:13 | S |
-| dereference.rs:188:42:190:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:193:19:200:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| dereference.rs:194:17:194:20 | (...) |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:194:18:194:19 | &S |  | {EXTERNAL LOCATION} | & |
-| dereference.rs:196:17:196:24 | (...) |  | {EXTERNAL LOCATION} | &mut |
 | dereference.rs:196:18:196:23 | &mut S |  | {EXTERNAL LOCATION} | &mut |
 | dereference.rs:198:23:198:24 | &S |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:199:23:199:28 | &mut S |  | {EXTERNAL LOCATION} | &mut |
@@ -1084,30 +1083,24 @@ inferCertainType
 | dereference.rs:213:16:213:24 | SelfParam |  | {EXTERNAL LOCATION} | &mut |
 | dereference.rs:213:16:213:24 | SelfParam | TRefMut | dereference.rs:205:5:205:17 | Foo |
 | dereference.rs:213:27:215:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| dereference.rs:214:13:214:39 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:214:22:214:38 | "In struct impl!\\n" |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:214:22:214:38 | "In struct impl!\\n" | TRef | {EXTERNAL LOCATION} | str |
-| dereference.rs:214:22:214:38 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| dereference.rs:214:22:214:38 | { ... } |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:214:22:214:38 | { ... } |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:220:16:220:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:220:16:220:20 | SelfParam | TRef | dereference.rs:205:5:205:17 | Foo |
 | dereference.rs:220:23:222:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| dereference.rs:221:13:221:38 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:221:22:221:37 | "In trait impl!\\n" |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:221:22:221:37 | "In trait impl!\\n" | TRef | {EXTERNAL LOCATION} | str |
-| dereference.rs:221:22:221:37 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| dereference.rs:221:22:221:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:221:22:221:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:225:19:228:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:226:17:226:17 | f |  | dereference.rs:205:5:205:17 | Foo |
 | dereference.rs:226:21:226:26 | Foo {...} |  | dereference.rs:205:5:205:17 | Foo |
 | dereference.rs:227:9:227:9 | f |  | dereference.rs:205:5:205:17 | Foo |
 | dereference.rs:231:15:240:1 | { ... } |  | {EXTERNAL LOCATION} | () |
-| dereference.rs:232:5:232:38 | explicit_monomorphic_dereference(...) |  | {EXTERNAL LOCATION} | () |
-| dereference.rs:233:5:233:38 | explicit_polymorphic_dereference(...) |  | {EXTERNAL LOCATION} | () |
-| dereference.rs:234:5:234:30 | explicit_ref_dereference(...) |  | {EXTERNAL LOCATION} | () |
-| dereference.rs:235:5:235:30 | explicit_box_dereference(...) |  | {EXTERNAL LOCATION} | () |
-| dereference.rs:236:5:236:26 | implicit_dereference(...) |  | {EXTERNAL LOCATION} | () |
-| dereference.rs:237:5:237:41 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| dereference.rs:238:5:238:26 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| dereference.rs:239:5:239:34 | ...::main(...) |  | {EXTERNAL LOCATION} | () |
 | dyn_type.rs:7:10:7:14 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:7:10:7:14 | SelfParam | TRef | dyn_type.rs:5:1:8:1 | Self [trait MyTrait1] |
 | dyn_type.rs:12:12:12:16 | SelfParam |  | {EXTERNAL LOCATION} | & |
@@ -1116,16 +1109,13 @@ inferCertainType
 | dyn_type.rs:18:12:18:16 | SelfParam | TRef | dyn_type.rs:15:1:19:1 | Self [trait AssocTrait] |
 | dyn_type.rs:28:10:28:14 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:28:10:28:14 | SelfParam | TRef | dyn_type.rs:21:1:24:1 | MyStruct |
-| dyn_type.rs:28:27:30:5 | { ... } |  | {EXTERNAL LOCATION} | String |
 | dyn_type.rs:29:17:29:30 | "MyTrait1: {}" |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:29:17:29:30 | "MyTrait1: {}" | TRef | {EXTERNAL LOCATION} | str |
-| dyn_type.rs:29:17:29:42 | ...::format(...) |  | {EXTERNAL LOCATION} | String |
 | dyn_type.rs:29:33:29:36 | self |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:29:33:29:36 | self | TRef | dyn_type.rs:21:1:24:1 | MyStruct |
 | dyn_type.rs:40:12:40:16 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:40:12:40:16 | SelfParam | TRef | dyn_type.rs:33:1:36:1 | GenStruct |
 | dyn_type.rs:40:12:40:16 | SelfParam | TRef.A | dyn_type.rs:38:6:38:21 | A |
-| dyn_type.rs:40:24:42:5 | { ... } |  | dyn_type.rs:38:6:38:21 | A |
 | dyn_type.rs:41:9:41:12 | self |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:41:9:41:12 | self | TRef | dyn_type.rs:33:1:36:1 | GenStruct |
 | dyn_type.rs:41:9:41:12 | self | TRef.A | dyn_type.rs:38:6:38:21 | A |
@@ -1133,8 +1123,6 @@ inferCertainType
 | dyn_type.rs:51:12:51:16 | SelfParam | TRef | dyn_type.rs:33:1:36:1 | GenStruct |
 | dyn_type.rs:51:12:51:16 | SelfParam | TRef.A | dyn_type.rs:45:6:45:8 | GGP |
 | dyn_type.rs:51:34:53:5 | { ... } |  | {EXTERNAL LOCATION} | (T_2) |
-| dyn_type.rs:51:34:53:5 | { ... } | T0 | dyn_type.rs:45:6:45:8 | GGP |
-| dyn_type.rs:51:34:53:5 | { ... } | T1 | {EXTERNAL LOCATION} | bool |
 | dyn_type.rs:52:9:52:34 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
 | dyn_type.rs:52:10:52:13 | self |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:52:10:52:13 | self | TRef | dyn_type.rs:33:1:36:1 | GenStruct |
@@ -1142,16 +1130,9 @@ inferCertainType
 | dyn_type.rs:52:30:52:33 | true |  | {EXTERNAL LOCATION} | bool |
 | dyn_type.rs:56:40:56:40 | a |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:56:40:56:40 | a | TRef | dyn_type.rs:56:13:56:37 | G |
-| dyn_type.rs:56:52:58:1 | { ... } |  | dyn_type.rs:56:10:56:10 | A |
 | dyn_type.rs:57:5:57:5 | a |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:57:5:57:5 | a | TRef | dyn_type.rs:56:13:56:37 | G |
 | dyn_type.rs:60:46:60:46 | a |  | dyn_type.rs:60:18:60:43 | A |
-| dyn_type.rs:60:78:62:1 | { ... } |  | {EXTERNAL LOCATION} | Box |
-| dyn_type.rs:60:78:62:1 | { ... } | A | {EXTERNAL LOCATION} | Global |
-| dyn_type.rs:60:78:62:1 | { ... } | T | dyn_type.rs:10:1:13:1 | dyn GenericGet |
-| dyn_type.rs:60:78:62:1 | { ... } | T.dyn(A) | dyn_type.rs:60:18:60:43 | A |
-| dyn_type.rs:61:5:61:36 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| dyn_type.rs:61:5:61:36 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | dyn_type.rs:61:14:61:35 | GenStruct {...} |  | dyn_type.rs:33:1:36:1 | GenStruct |
 | dyn_type.rs:61:33:61:33 | a |  | dyn_type.rs:60:18:60:43 | A |
 | dyn_type.rs:64:25:64:27 | obj |  | {EXTERNAL LOCATION} | & |
@@ -1170,32 +1151,17 @@ inferCertainType
 | dyn_type.rs:70:26:70:28 | obj | TRef | dyn_type.rs:10:1:13:1 | dyn GenericGet |
 | dyn_type.rs:70:26:70:28 | obj | TRef.dyn(A) | {EXTERNAL LOCATION} | String |
 | dyn_type.rs:73:26:76:1 | { ... } |  | {EXTERNAL LOCATION} | () |
-| dyn_type.rs:74:9:74:11 | obj |  | {EXTERNAL LOCATION} | Box |
-| dyn_type.rs:74:9:74:11 | obj | A | {EXTERNAL LOCATION} | Global |
-| dyn_type.rs:74:9:74:11 | obj | T | dyn_type.rs:10:1:13:1 | dyn GenericGet |
-| dyn_type.rs:74:15:74:33 | get_box_trait(...) |  | {EXTERNAL LOCATION} | Box |
-| dyn_type.rs:74:15:74:33 | get_box_trait(...) | A | {EXTERNAL LOCATION} | Global |
-| dyn_type.rs:74:15:74:33 | get_box_trait(...) | T | dyn_type.rs:10:1:13:1 | dyn GenericGet |
 | dyn_type.rs:74:29:74:32 | true |  | {EXTERNAL LOCATION} | bool |
-| dyn_type.rs:75:21:75:23 | obj |  | {EXTERNAL LOCATION} | Box |
-| dyn_type.rs:75:21:75:23 | obj | A | {EXTERNAL LOCATION} | Global |
-| dyn_type.rs:75:21:75:23 | obj | T | dyn_type.rs:10:1:13:1 | dyn GenericGet |
 | dyn_type.rs:78:24:78:24 | a |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:78:24:78:24 | a | TRef | dyn_type.rs:15:1:19:1 | dyn AssocTrait |
 | dyn_type.rs:78:24:78:24 | a | TRef.dyn(AP) | dyn_type.rs:78:21:78:21 | B |
 | dyn_type.rs:78:24:78:24 | a | TRef.dyn(GP) | dyn_type.rs:78:18:78:18 | A |
-| dyn_type.rs:78:65:80:1 | { ... } |  | {EXTERNAL LOCATION} | (T_2) |
-| dyn_type.rs:78:65:80:1 | { ... } | T0 | dyn_type.rs:78:18:78:18 | A |
-| dyn_type.rs:78:65:80:1 | { ... } | T1 | dyn_type.rs:78:21:78:21 | B |
 | dyn_type.rs:79:5:79:5 | a |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:79:5:79:5 | a | TRef | dyn_type.rs:15:1:19:1 | dyn AssocTrait |
 | dyn_type.rs:79:5:79:5 | a | TRef.dyn(AP) | dyn_type.rs:78:21:78:21 | B |
 | dyn_type.rs:79:5:79:5 | a | TRef.dyn(GP) | dyn_type.rs:78:18:78:18 | A |
 | dyn_type.rs:82:55:82:55 | a |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:82:55:82:55 | a | TRef | dyn_type.rs:82:20:82:52 | T |
-| dyn_type.rs:82:72:84:1 | { ... } |  | {EXTERNAL LOCATION} | (T_2) |
-| dyn_type.rs:82:72:84:1 | { ... } | T0 | dyn_type.rs:82:14:82:14 | A |
-| dyn_type.rs:82:72:84:1 | { ... } | T1 | dyn_type.rs:82:17:82:17 | B |
 | dyn_type.rs:83:5:83:5 | a |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:83:5:83:5 | a | TRef | dyn_type.rs:82:20:82:52 | T |
 | dyn_type.rs:86:20:86:22 | obj |  | {EXTERNAL LOCATION} | & |
@@ -1209,45 +1175,39 @@ inferCertainType
 | dyn_type.rs:90:11:90:13 | obj | TRef.dyn(AP) | {EXTERNAL LOCATION} | bool |
 | dyn_type.rs:90:11:90:13 | obj | TRef.dyn(GP) | {EXTERNAL LOCATION} | i64 |
 | dyn_type.rs:91:9:94:5 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
-| dyn_type.rs:94:9:94:26 | assoc_dyn_get(...) |  | {EXTERNAL LOCATION} | (T_2) |
 | dyn_type.rs:94:23:94:25 | obj |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:94:23:94:25 | obj | TRef | dyn_type.rs:15:1:19:1 | dyn AssocTrait |
 | dyn_type.rs:94:23:94:25 | obj | TRef.dyn(AP) | {EXTERNAL LOCATION} | bool |
 | dyn_type.rs:94:23:94:25 | obj | TRef.dyn(GP) | {EXTERNAL LOCATION} | i64 |
 | dyn_type.rs:95:9:98:5 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
-| dyn_type.rs:98:9:98:22 | assoc_get(...) |  | {EXTERNAL LOCATION} | (T_2) |
 | dyn_type.rs:98:19:98:21 | obj |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:98:19:98:21 | obj | TRef | dyn_type.rs:15:1:19:1 | dyn AssocTrait |
 | dyn_type.rs:98:19:98:21 | obj | TRef.dyn(AP) | {EXTERNAL LOCATION} | bool |
 | dyn_type.rs:98:19:98:21 | obj | TRef.dyn(GP) | {EXTERNAL LOCATION} | i64 |
 | dyn_type.rs:101:15:108:1 | { ... } |  | {EXTERNAL LOCATION} | () |
-| dyn_type.rs:102:5:102:49 | test_basic_dyn_trait(...) |  | {EXTERNAL LOCATION} | () |
 | dyn_type.rs:102:26:102:48 | &... |  | {EXTERNAL LOCATION} | & |
+| dyn_type.rs:102:26:102:48 | &... | TRef | dyn_type.rs:21:1:24:1 | MyStruct |
 | dyn_type.rs:102:27:102:48 | MyStruct {...} |  | dyn_type.rs:21:1:24:1 | MyStruct |
-| dyn_type.rs:103:5:105:6 | test_generic_dyn_trait(...) |  | {EXTERNAL LOCATION} | () |
 | dyn_type.rs:103:28:105:5 | &... |  | {EXTERNAL LOCATION} | & |
+| dyn_type.rs:103:28:105:5 | &... | TRef | dyn_type.rs:33:1:36:1 | GenStruct |
 | dyn_type.rs:103:29:105:5 | GenStruct {...} |  | dyn_type.rs:33:1:36:1 | GenStruct |
 | dyn_type.rs:104:16:104:17 | "" |  | {EXTERNAL LOCATION} | & |
 | dyn_type.rs:104:16:104:17 | "" | TRef | {EXTERNAL LOCATION} | str |
-| dyn_type.rs:106:5:106:25 | test_poly_dyn_trait(...) |  | {EXTERNAL LOCATION} | () |
-| dyn_type.rs:107:5:107:46 | test_assoc_type(...) |  | {EXTERNAL LOCATION} | () |
 | dyn_type.rs:107:21:107:45 | &... |  | {EXTERNAL LOCATION} | & |
+| dyn_type.rs:107:21:107:45 | &... | TRef | dyn_type.rs:33:1:36:1 | GenStruct |
 | dyn_type.rs:107:22:107:45 | GenStruct {...} |  | dyn_type.rs:33:1:36:1 | GenStruct |
 | invalid/main.rs:8:16:8:19 | SelfParam |  | invalid/main.rs:7:5:9:5 | Self [trait T1] |
 | invalid/main.rs:8:22:8:23 | { ... } |  | {EXTERNAL LOCATION} | () |
 | invalid/main.rs:12:16:12:19 | SelfParam |  | invalid/main.rs:11:5:15:5 | Self [trait T2] |
-| invalid/main.rs:12:22:14:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | invalid/main.rs:13:13:13:16 | self |  | invalid/main.rs:11:5:15:5 | Self [trait T2] |
 | invalid/main.rs:25:22:25:25 | SelfParam |  | invalid/main.rs:24:5:26:5 | Self [trait AddAlias] |
 | invalid/main.rs:25:28:25:32 | other |  | invalid/main.rs:24:5:26:5 | Self [trait AddAlias] |
 | invalid/main.rs:29:22:29:25 | SelfParam |  | invalid/main.rs:21:5:22:20 | Num |
 | invalid/main.rs:29:28:29:32 | other |  | invalid/main.rs:21:5:22:20 | Num |
-| invalid/main.rs:29:49:31:9 | { ... } |  | invalid/main.rs:21:5:22:20 | Num |
 | invalid/main.rs:30:17:30:20 | self |  | invalid/main.rs:21:5:22:20 | Num |
 | invalid/main.rs:30:26:30:30 | other |  | invalid/main.rs:21:5:22:20 | Num |
 | invalid/main.rs:39:16:39:19 | SelfParam |  | invalid/main.rs:35:10:35:20 | T |
 | invalid/main.rs:39:22:39:26 | other |  | invalid/main.rs:35:10:35:20 | T |
-| invalid/main.rs:39:43:41:9 | { ... } |  | invalid/main.rs:35:10:35:20 | T |
 | invalid/main.rs:40:13:40:16 | self |  | invalid/main.rs:35:10:35:20 | T |
 | invalid/main.rs:40:28:40:32 | other |  | invalid/main.rs:35:10:35:20 | T |
 | invalid/main.rs:44:30:49:5 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -1257,26 +1217,24 @@ inferCertainType
 | invalid/main.rs:61:22:61:26 | SelfParam | TRef | invalid/main.rs:60:5:64:5 | Self [trait Duplicatable] |
 | invalid/main.rs:68:19:68:23 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | invalid/main.rs:68:19:68:23 | SelfParam | TRef | invalid/main.rs:53:5:54:14 | S1 |
-| invalid/main.rs:68:34:70:9 | { ... } |  | invalid/main.rs:53:5:54:14 | S1 |
 | invalid/main.rs:69:14:69:17 | self |  | {EXTERNAL LOCATION} | & |
 | invalid/main.rs:69:14:69:17 | self | TRef | invalid/main.rs:53:5:54:14 | S1 |
 | invalid/main.rs:75:22:75:26 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | invalid/main.rs:75:22:75:26 | SelfParam | TRef | invalid/main.rs:53:5:54:14 | S1 |
-| invalid/main.rs:75:37:77:9 | { ... } |  | invalid/main.rs:53:5:54:14 | S1 |
 | invalid/main.rs:76:14:76:17 | self |  | {EXTERNAL LOCATION} | & |
 | invalid/main.rs:76:14:76:17 | self | TRef | invalid/main.rs:53:5:54:14 | S1 |
 | invalid/main.rs:83:22:83:26 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | invalid/main.rs:83:22:83:26 | SelfParam | TRef | invalid/main.rs:81:10:81:18 | T |
-| invalid/main.rs:83:37:85:9 | { ... } |  | invalid/main.rs:81:10:81:18 | T |
 | invalid/main.rs:84:13:84:16 | self |  | {EXTERNAL LOCATION} | & |
 | invalid/main.rs:84:13:84:16 | self | TRef | invalid/main.rs:81:10:81:18 | T |
 | invalid/main.rs:88:33:92:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:25:30:28:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:26:13:26:13 | x |  | main.rs:5:5:8:5 | MyThing |
 | main.rs:26:17:26:32 | MyThing {...} |  | main.rs:5:5:8:5 | MyThing |
+| main.rs:27:9:27:29 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:27:18:27:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:27:18:27:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:27:18:27:28 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:27:18:27:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:27:18:27:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:27:26:27:26 | x |  | main.rs:5:5:8:5 | MyThing |
 | main.rs:30:29:30:29 | x |  | main.rs:16:5:19:5 | GenericThing |
@@ -1284,34 +1242,38 @@ inferCertainType
 | main.rs:30:46:33:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:31:17:31:17 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:31:17:31:17 | x | A | {EXTERNAL LOCATION} | bool |
+| main.rs:32:9:32:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:32:18:32:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:32:18:32:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:32:18:32:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:32:18:32:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:32:18:32:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:35:31:63:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:37:13:37:13 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:37:13:37:13 | x | A | main.rs:3:5:4:13 | S |
 | main.rs:37:17:37:42 | GenericThing::<...> {...} |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:37:17:37:42 | GenericThing::<...> {...} | A | main.rs:3:5:4:13 | S |
+| main.rs:38:9:38:29 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:38:18:38:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:38:18:38:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:38:18:38:28 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:38:18:38:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:38:18:38:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:38:26:38:26 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:38:26:38:26 | x | A | main.rs:3:5:4:13 | S |
 | main.rs:41:13:41:13 | y |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:41:17:41:37 | GenericThing {...} |  | main.rs:16:5:19:5 | GenericThing |
+| main.rs:42:9:42:29 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:42:18:42:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:42:18:42:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:42:18:42:28 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:42:18:42:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:42:18:42:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:42:26:42:26 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:42:26:42:26 | x | A | main.rs:3:5:4:13 | S |
 | main.rs:46:13:46:13 | x |  | main.rs:21:5:23:5 | OptionS |
 | main.rs:46:17:48:9 | OptionS {...} |  | main.rs:21:5:23:5 | OptionS |
+| main.rs:49:9:49:29 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:49:18:49:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:49:18:49:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:49:18:49:28 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:49:18:49:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:49:18:49:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:49:26:49:26 | x |  | main.rs:21:5:23:5 | OptionS |
 | main.rs:52:13:52:13 | x |  | main.rs:16:5:19:5 | GenericThing |
@@ -1320,9 +1282,10 @@ inferCertainType
 | main.rs:52:17:54:9 | GenericThing::<...> {...} |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:52:17:54:9 | GenericThing::<...> {...} | A | main.rs:10:5:14:5 | MyOption |
 | main.rs:52:17:54:9 | GenericThing::<...> {...} | A.T | main.rs:3:5:4:13 | S |
+| main.rs:55:9:55:29 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:55:18:55:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:55:18:55:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:55:18:55:28 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:55:18:55:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:55:18:55:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:55:26:55:26 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:55:26:55:26 | x | A | main.rs:10:5:14:5 | MyOption |
@@ -1332,15 +1295,14 @@ inferCertainType
 | main.rs:61:13:61:13 | a |  | main.rs:10:5:14:5 | MyOption |
 | main.rs:61:13:61:13 | a | T | main.rs:3:5:4:13 | S |
 | main.rs:61:30:61:30 | x |  | main.rs:16:5:19:5 | GenericThing |
+| main.rs:62:9:62:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:62:18:62:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:62:18:62:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:62:18:62:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:62:18:62:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:62:18:62:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:62:26:62:26 | a |  | main.rs:10:5:14:5 | MyOption |
 | main.rs:62:26:62:26 | a | T | main.rs:3:5:4:13 | S |
 | main.rs:65:16:68:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:66:9:66:29 | simple_field_access(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:67:9:67:30 | generic_field_access(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:75:19:75:22 | SelfParam |  | main.rs:72:5:72:21 | Foo |
 | main.rs:75:33:77:9 | { ... } |  | main.rs:72:5:72:21 | Foo |
 | main.rs:76:13:76:16 | self |  | main.rs:72:5:72:21 | Foo |
@@ -1348,9 +1310,10 @@ inferCertainType
 | main.rs:79:32:81:9 | { ... } |  | main.rs:72:5:72:21 | Foo |
 | main.rs:80:13:80:16 | self |  | main.rs:72:5:72:21 | Foo |
 | main.rs:84:23:89:5 | { ... } |  | main.rs:72:5:72:21 | Foo |
+| main.rs:85:9:85:34 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:85:18:85:33 | "main.rs::m1::f\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:85:18:85:33 | "main.rs::m1::f\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:85:18:85:33 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:85:18:85:33 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:85:18:85:33 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:86:13:86:13 | x |  | main.rs:72:5:72:21 | Foo |
 | main.rs:86:17:86:22 | Foo {...} |  | main.rs:72:5:72:21 | Foo |
@@ -1358,17 +1321,15 @@ inferCertainType
 | main.rs:88:9:88:9 | x |  | main.rs:72:5:72:21 | Foo |
 | main.rs:91:14:91:14 | x |  | main.rs:72:5:72:21 | Foo |
 | main.rs:91:22:91:22 | y |  | main.rs:72:5:72:21 | Foo |
-| main.rs:91:37:95:5 | { ... } |  | main.rs:72:5:72:21 | Foo |
+| main.rs:92:9:92:34 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:92:18:92:33 | "main.rs::m1::g\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:92:18:92:33 | "main.rs::m1::g\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:92:18:92:33 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:92:18:92:33 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:92:18:92:33 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:93:9:93:9 | x |  | main.rs:72:5:72:21 | Foo |
 | main.rs:94:9:94:9 | y |  | main.rs:72:5:72:21 | Foo |
-| main.rs:102:30:105:9 | { ... } |  | main.rs:99:5:99:29 | ATupleStruct |
 | main.rs:116:25:116:28 | SelfParam |  | main.rs:115:5:117:5 | Self [trait MyTrait] |
 | main.rs:121:25:121:28 | SelfParam |  | main.rs:110:5:113:5 | MyThing |
-| main.rs:121:39:123:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
 | main.rs:122:13:122:16 | self |  | main.rs:110:5:113:5 | MyThing |
 | main.rs:126:16:135:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:127:13:127:13 | x |  | main.rs:110:5:113:5 | MyThing |
@@ -1386,29 +1347,28 @@ inferCertainType
 | main.rs:144:25:144:29 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:144:25:144:29 | SelfParam | TRef | main.rs:142:9:147:9 | Self [trait Foo] |
 | main.rs:144:32:146:13 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:145:17:145:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:145:26:145:31 | "foo!\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:145:26:145:31 | "foo!\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:145:26:145:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:145:26:145:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:145:26:145:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:151:25:151:29 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:151:25:151:29 | SelfParam | TRef | main.rs:149:9:154:9 | Self [trait Bar] |
 | main.rs:151:32:153:13 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:152:17:152:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:152:26:152:31 | "bar!\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:152:26:152:31 | "bar!\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:152:26:152:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:152:26:152:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:152:26:152:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:163:15:184:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:165:9:168:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:169:9:172:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:173:9:176:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:177:9:183:9 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:181:13:181:29 | ...::a_method(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:181:27:181:28 | &x |  | {EXTERNAL LOCATION} | & |
-| main.rs:182:13:182:29 | ...::a_method(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:182:27:182:28 | &x |  | {EXTERNAL LOCATION} | & |
 | main.rs:200:15:200:18 | SelfParam |  | main.rs:188:5:191:5 | MyThing |
 | main.rs:200:15:200:18 | SelfParam | A | main.rs:193:5:194:14 | S1 |
-| main.rs:200:27:202:9 | { ... } |  | main.rs:193:5:194:14 | S1 |
 | main.rs:201:13:201:16 | self |  | main.rs:188:5:191:5 | MyThing |
 | main.rs:201:13:201:16 | self | A | main.rs:193:5:194:14 | S1 |
 | main.rs:207:15:207:18 | SelfParam |  | main.rs:188:5:191:5 | MyThing |
@@ -1421,7 +1381,6 @@ inferCertainType
 | main.rs:208:23:208:26 | self | A | main.rs:195:5:196:14 | S2 |
 | main.rs:213:15:213:18 | SelfParam |  | main.rs:188:5:191:5 | MyThing |
 | main.rs:213:15:213:18 | SelfParam | A | main.rs:212:10:212:10 | T |
-| main.rs:213:26:215:9 | { ... } |  | main.rs:212:10:212:10 | T |
 | main.rs:214:13:214:16 | self |  | main.rs:188:5:191:5 | MyThing |
 | main.rs:214:13:214:16 | self | A | main.rs:212:10:212:10 | T |
 | main.rs:218:16:234:5 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -1429,38 +1388,44 @@ inferCertainType
 | main.rs:219:17:219:33 | MyThing {...} |  | main.rs:188:5:191:5 | MyThing |
 | main.rs:220:13:220:13 | y |  | main.rs:188:5:191:5 | MyThing |
 | main.rs:220:17:220:33 | MyThing {...} |  | main.rs:188:5:191:5 | MyThing |
+| main.rs:223:9:223:29 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:223:18:223:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:223:18:223:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:223:18:223:28 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:223:18:223:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:223:18:223:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:223:26:223:26 | x |  | main.rs:188:5:191:5 | MyThing |
+| main.rs:224:9:224:29 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:224:18:224:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:224:18:224:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:224:18:224:28 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:224:18:224:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:224:18:224:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:224:26:224:26 | y |  | main.rs:188:5:191:5 | MyThing |
+| main.rs:226:9:226:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:226:18:226:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:226:18:226:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:226:18:226:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:226:18:226:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:226:18:226:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:226:26:226:26 | x |  | main.rs:188:5:191:5 | MyThing |
+| main.rs:227:9:227:34 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:227:18:227:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:227:18:227:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:227:18:227:33 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:227:18:227:33 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:227:18:227:33 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:227:26:227:26 | y |  | main.rs:188:5:191:5 | MyThing |
 | main.rs:229:13:229:13 | x |  | main.rs:188:5:191:5 | MyThing |
 | main.rs:229:17:229:33 | MyThing {...} |  | main.rs:188:5:191:5 | MyThing |
 | main.rs:230:13:230:13 | y |  | main.rs:188:5:191:5 | MyThing |
 | main.rs:230:17:230:33 | MyThing {...} |  | main.rs:188:5:191:5 | MyThing |
+| main.rs:232:9:232:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:232:18:232:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:232:18:232:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:232:18:232:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:232:18:232:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:232:18:232:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:232:26:232:26 | x |  | main.rs:188:5:191:5 | MyThing |
+| main.rs:233:9:233:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:233:18:233:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:233:18:233:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:233:18:233:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:233:18:233:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:233:18:233:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:233:26:233:26 | y |  | main.rs:188:5:191:5 | MyThing |
 | main.rs:257:15:257:18 | SelfParam |  | main.rs:256:5:265:5 | Self [trait MyTrait] |
@@ -1471,14 +1436,11 @@ inferCertainType
 | main.rs:273:16:273:19 | SelfParam |  | main.rs:271:5:276:5 | Self [trait MyProduct] |
 | main.rs:275:16:275:19 | SelfParam |  | main.rs:271:5:276:5 | Self [trait MyProduct] |
 | main.rs:278:43:278:43 | x |  | main.rs:278:26:278:40 | T2 |
-| main.rs:278:56:280:5 | { ... } |  | main.rs:278:22:278:23 | T1 |
 | main.rs:279:9:279:9 | x |  | main.rs:278:26:278:40 | T2 |
 | main.rs:282:71:282:71 | x |  | main.rs:282:53:282:68 | T3 |
-| main.rs:282:84:284:5 | { ... } |  | main.rs:282:32:282:33 | T1 |
 | main.rs:283:9:283:9 | x |  | main.rs:282:53:282:68 | T3 |
 | main.rs:288:15:288:18 | SelfParam |  | main.rs:238:5:241:5 | MyThing |
 | main.rs:288:15:288:18 | SelfParam | A | main.rs:249:5:250:14 | S1 |
-| main.rs:288:27:290:9 | { ... } |  | main.rs:249:5:250:14 | S1 |
 | main.rs:289:13:289:16 | self |  | main.rs:238:5:241:5 | MyThing |
 | main.rs:289:13:289:16 | self | A | main.rs:249:5:250:14 | S1 |
 | main.rs:295:15:295:18 | SelfParam |  | main.rs:238:5:241:5 | MyThing |
@@ -1492,27 +1454,22 @@ inferCertainType
 | main.rs:302:15:302:18 | SelfParam |  | main.rs:238:5:241:5 | MyThing |
 | main.rs:302:15:302:18 | SelfParam | A | main.rs:251:5:252:14 | S2 |
 | main.rs:302:36:304:9 | { ... } |  | main.rs:238:5:241:5 | MyThing |
-| main.rs:302:36:304:9 | { ... } | A | main.rs:249:5:250:14 | S1 |
 | main.rs:303:13:303:29 | MyThing {...} |  | main.rs:238:5:241:5 | MyThing |
 | main.rs:314:15:314:18 | SelfParam |  | main.rs:238:5:241:5 | MyThing |
 | main.rs:314:15:314:18 | SelfParam | A | main.rs:253:5:254:14 | S3 |
-| main.rs:314:27:316:9 | { ... } |  | main.rs:309:10:309:11 | TD |
 | main.rs:321:15:321:18 | SelfParam |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:321:15:321:18 | SelfParam | P1 | main.rs:319:10:319:10 | I |
 | main.rs:321:15:321:18 | SelfParam | P2 | main.rs:249:5:250:14 | S1 |
-| main.rs:321:26:323:9 | { ... } |  | main.rs:319:10:319:10 | I |
 | main.rs:322:13:322:16 | self |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:322:13:322:16 | self | P1 | main.rs:319:10:319:10 | I |
 | main.rs:322:13:322:16 | self | P2 | main.rs:249:5:250:14 | S1 |
 | main.rs:328:15:328:18 | SelfParam |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:328:15:328:18 | SelfParam | P1 | main.rs:249:5:250:14 | S1 |
 | main.rs:328:15:328:18 | SelfParam | P2 | main.rs:251:5:252:14 | S2 |
-| main.rs:328:27:330:9 | { ... } |  | main.rs:253:5:254:14 | S3 |
 | main.rs:335:15:335:18 | SelfParam |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:335:15:335:18 | SelfParam | P1 | main.rs:238:5:241:5 | MyThing |
 | main.rs:335:15:335:18 | SelfParam | P1.A | main.rs:333:10:333:11 | TT |
 | main.rs:335:15:335:18 | SelfParam | P2 | main.rs:253:5:254:14 | S3 |
-| main.rs:335:27:338:9 | { ... } |  | main.rs:333:10:333:11 | TT |
 | main.rs:336:25:336:28 | self |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:336:25:336:28 | self | P1 | main.rs:238:5:241:5 | MyThing |
 | main.rs:336:25:336:28 | self | P1.A | main.rs:333:10:333:11 | TT |
@@ -1520,53 +1477,43 @@ inferCertainType
 | main.rs:344:16:344:19 | SelfParam |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:344:16:344:19 | SelfParam | P1 | main.rs:342:10:342:10 | A |
 | main.rs:344:16:344:19 | SelfParam | P2 | main.rs:342:10:342:10 | A |
-| main.rs:344:27:346:9 | { ... } |  | main.rs:342:10:342:10 | A |
 | main.rs:345:13:345:16 | self |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:345:13:345:16 | self | P1 | main.rs:342:10:342:10 | A |
 | main.rs:345:13:345:16 | self | P2 | main.rs:342:10:342:10 | A |
 | main.rs:349:16:349:19 | SelfParam |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:349:16:349:19 | SelfParam | P1 | main.rs:342:10:342:10 | A |
 | main.rs:349:16:349:19 | SelfParam | P2 | main.rs:342:10:342:10 | A |
-| main.rs:349:27:351:9 | { ... } |  | main.rs:342:10:342:10 | A |
 | main.rs:350:13:350:16 | self |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:350:13:350:16 | self | P1 | main.rs:342:10:342:10 | A |
 | main.rs:350:13:350:16 | self | P2 | main.rs:342:10:342:10 | A |
 | main.rs:357:16:357:19 | SelfParam |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:357:16:357:19 | SelfParam | P1 | main.rs:251:5:252:14 | S2 |
 | main.rs:357:16:357:19 | SelfParam | P2 | main.rs:249:5:250:14 | S1 |
-| main.rs:357:28:359:9 | { ... } |  | main.rs:249:5:250:14 | S1 |
 | main.rs:358:13:358:16 | self |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:358:13:358:16 | self | P1 | main.rs:251:5:252:14 | S2 |
 | main.rs:358:13:358:16 | self | P2 | main.rs:249:5:250:14 | S1 |
 | main.rs:362:16:362:19 | SelfParam |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:362:16:362:19 | SelfParam | P1 | main.rs:251:5:252:14 | S2 |
 | main.rs:362:16:362:19 | SelfParam | P2 | main.rs:249:5:250:14 | S1 |
-| main.rs:362:28:364:9 | { ... } |  | main.rs:251:5:252:14 | S2 |
 | main.rs:363:13:363:16 | self |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:363:13:363:16 | self | P1 | main.rs:251:5:252:14 | S2 |
 | main.rs:363:13:363:16 | self | P2 | main.rs:249:5:250:14 | S1 |
 | main.rs:367:46:367:46 | p |  | main.rs:367:24:367:43 | P |
-| main.rs:367:58:369:5 | { ... } |  | main.rs:367:16:367:17 | V1 |
 | main.rs:368:9:368:9 | p |  | main.rs:367:24:367:43 | P |
 | main.rs:371:46:371:46 | p |  | main.rs:371:24:371:43 | P |
-| main.rs:371:58:373:5 | { ... } |  | main.rs:371:20:371:21 | V2 |
 | main.rs:372:9:372:9 | p |  | main.rs:371:24:371:43 | P |
 | main.rs:375:54:375:54 | p |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:375:54:375:54 | p | P1 | main.rs:375:20:375:21 | V0 |
 | main.rs:375:54:375:54 | p | P2 | main.rs:375:32:375:51 | P |
-| main.rs:375:78:377:5 | { ... } |  | main.rs:375:24:375:25 | V1 |
 | main.rs:376:9:376:9 | p |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:376:9:376:9 | p | P1 | main.rs:375:20:375:21 | V0 |
 | main.rs:376:9:376:9 | p | P2 | main.rs:375:32:375:51 | P |
 | main.rs:381:23:381:26 | SelfParam |  | main.rs:379:5:382:5 | Self [trait ConvertTo] |
 | main.rs:386:23:386:26 | SelfParam |  | main.rs:384:10:384:23 | T |
-| main.rs:386:35:388:9 | { ... } |  | main.rs:249:5:250:14 | S1 |
 | main.rs:387:13:387:16 | self |  | main.rs:384:10:384:23 | T |
 | main.rs:391:41:391:45 | thing |  | main.rs:391:23:391:38 | T |
-| main.rs:391:57:393:5 | { ... } |  | main.rs:391:19:391:20 | TS |
 | main.rs:392:9:392:13 | thing |  | main.rs:391:23:391:38 | T |
 | main.rs:395:56:395:60 | thing |  | main.rs:395:39:395:53 | TP |
-| main.rs:395:73:398:5 | { ... } |  | main.rs:249:5:250:14 | S1 |
 | main.rs:397:9:397:13 | thing |  | main.rs:395:39:395:53 | TP |
 | main.rs:400:16:473:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:401:13:401:20 | thing_s1 |  | main.rs:238:5:241:5 | MyThing |
@@ -1575,102 +1522,118 @@ inferCertainType
 | main.rs:402:24:402:40 | MyThing {...} |  | main.rs:238:5:241:5 | MyThing |
 | main.rs:403:13:403:20 | thing_s3 |  | main.rs:238:5:241:5 | MyThing |
 | main.rs:403:24:403:40 | MyThing {...} |  | main.rs:238:5:241:5 | MyThing |
+| main.rs:407:9:407:39 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:407:18:407:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:407:18:407:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:407:18:407:38 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:407:18:407:38 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:407:18:407:38 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:407:26:407:33 | thing_s1 |  | main.rs:238:5:241:5 | MyThing |
+| main.rs:408:9:408:41 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:408:18:408:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:408:18:408:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:408:18:408:40 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:408:18:408:40 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:408:18:408:40 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:408:26:408:33 | thing_s2 |  | main.rs:238:5:241:5 | MyThing |
 | main.rs:409:13:409:14 | s3 |  | main.rs:253:5:254:14 | S3 |
 | main.rs:409:22:409:29 | thing_s3 |  | main.rs:238:5:241:5 | MyThing |
+| main.rs:410:9:410:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:410:18:410:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:410:18:410:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:410:18:410:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:410:18:410:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:410:18:410:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:410:26:410:27 | s3 |  | main.rs:253:5:254:14 | S3 |
 | main.rs:412:13:412:14 | p1 |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:412:18:412:42 | MyPair {...} |  | main.rs:243:5:247:5 | MyPair |
+| main.rs:413:9:413:33 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:413:18:413:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:413:18:413:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:413:18:413:32 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:413:18:413:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:413:18:413:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:413:26:413:27 | p1 |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:415:13:415:14 | p2 |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:415:18:415:42 | MyPair {...} |  | main.rs:243:5:247:5 | MyPair |
+| main.rs:416:9:416:33 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:416:18:416:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:416:18:416:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:416:18:416:32 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:416:18:416:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:416:18:416:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:416:26:416:27 | p2 |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:418:13:418:14 | p3 |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:418:18:421:9 | MyPair {...} |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:419:17:419:33 | MyThing {...} |  | main.rs:238:5:241:5 | MyThing |
+| main.rs:422:9:422:33 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:422:18:422:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:422:18:422:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:422:18:422:32 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:422:18:422:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:422:18:422:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:422:26:422:27 | p3 |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:425:13:425:13 | a |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:425:17:425:41 | MyPair {...} |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:426:17:426:17 | a |  | main.rs:243:5:247:5 | MyPair |
+| main.rs:427:9:427:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:427:18:427:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:427:18:427:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:427:18:427:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:427:18:427:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:427:18:427:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:428:17:428:17 | a |  | main.rs:243:5:247:5 | MyPair |
+| main.rs:429:9:429:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:429:18:429:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:429:18:429:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:429:18:429:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:429:18:429:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:429:18:429:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:435:13:435:13 | b |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:435:17:435:41 | MyPair {...} |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:436:17:436:17 | b |  | main.rs:243:5:247:5 | MyPair |
+| main.rs:437:9:437:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:437:18:437:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:437:18:437:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:437:18:437:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:437:18:437:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:437:18:437:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:438:17:438:17 | b |  | main.rs:243:5:247:5 | MyPair |
+| main.rs:439:9:439:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:439:18:439:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:439:18:439:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:439:18:439:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:439:18:439:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:439:18:439:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:443:31:443:38 | thing_s1 |  | main.rs:238:5:241:5 | MyThing |
+| main.rs:444:9:444:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:444:18:444:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:444:18:444:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:444:18:444:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:444:18:444:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:444:18:444:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:445:31:445:38 | thing_s2 |  | main.rs:238:5:241:5 | MyThing |
+| main.rs:446:9:446:29 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:446:18:446:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:446:18:446:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:446:18:446:28 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:446:18:446:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:446:18:446:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:449:13:449:13 | a |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:449:17:449:41 | MyPair {...} |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:450:25:450:25 | a |  | main.rs:243:5:247:5 | MyPair |
+| main.rs:451:9:451:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:451:18:451:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:451:18:451:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:451:18:451:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:451:18:451:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:451:18:451:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:452:25:452:25 | a |  | main.rs:243:5:247:5 | MyPair |
+| main.rs:453:9:453:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:453:18:453:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:453:18:453:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:453:18:453:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:453:18:453:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:453:18:453:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:456:13:456:13 | b |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:456:17:456:41 | MyPair {...} |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:457:25:457:25 | b |  | main.rs:243:5:247:5 | MyPair |
+| main.rs:458:9:458:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:458:18:458:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:458:18:458:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:458:18:458:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:458:18:458:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:458:18:458:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:459:25:459:25 | b |  | main.rs:243:5:247:5 | MyPair |
+| main.rs:460:9:460:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:460:18:460:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:460:18:460:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:460:18:460:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:460:18:460:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:460:18:460:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:462:13:462:13 | c |  | main.rs:243:5:247:5 | MyPair |
 | main.rs:462:17:465:9 | MyPair {...} |  | main.rs:243:5:247:5 | MyPair |
@@ -1686,37 +1649,42 @@ inferCertainType
 | main.rs:499:64:499:64 | x |  | main.rs:499:45:499:61 | T |
 | main.rs:499:70:503:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:501:18:501:18 | x |  | main.rs:499:45:499:61 | T |
+| main.rs:502:9:502:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:502:18:502:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:502:18:502:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:502:18:502:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:502:18:502:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:502:18:502:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:505:65:505:65 | x |  | main.rs:505:46:505:62 | T |
 | main.rs:505:71:509:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:507:18:507:18 | x |  | main.rs:505:46:505:62 | T |
+| main.rs:508:9:508:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:508:18:508:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:508:18:508:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:508:18:508:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:508:18:508:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:508:18:508:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:511:49:511:49 | x |  | main.rs:511:30:511:46 | T |
 | main.rs:511:55:514:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:512:17:512:17 | x |  | main.rs:511:30:511:46 | T |
+| main.rs:513:9:513:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:513:18:513:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:513:18:513:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:513:18:513:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:513:18:513:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:513:18:513:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:516:53:516:53 | x |  | main.rs:516:34:516:50 | T |
 | main.rs:516:59:519:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:517:17:517:17 | x |  | main.rs:516:34:516:50 | T |
+| main.rs:518:9:518:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:518:18:518:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:518:18:518:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:518:18:518:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:518:18:518:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:518:18:518:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:521:43:521:43 | x |  | main.rs:521:40:521:40 | T |
 | main.rs:524:5:527:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:525:17:525:17 | x |  | main.rs:521:40:521:40 | T |
+| main.rs:526:9:526:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:526:18:526:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:526:18:526:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:526:18:526:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:526:18:526:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:526:18:526:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:530:16:530:19 | SelfParam |  | main.rs:529:5:533:5 | Self [trait Pair] |
 | main.rs:532:16:532:19 | SelfParam |  | main.rs:529:5:533:5 | Self [trait Pair] |
@@ -1730,46 +1698,48 @@ inferCertainType
 | main.rs:544:70:549:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:546:18:546:18 | x |  | main.rs:544:41:544:55 | T |
 | main.rs:547:18:547:18 | y |  | main.rs:544:41:544:55 | T |
+| main.rs:548:9:548:38 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:548:18:548:29 | "{:?}, {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:548:18:548:29 | "{:?}, {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:548:18:548:37 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:548:18:548:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:548:18:548:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:551:69:551:69 | x |  | main.rs:551:52:551:66 | T |
 | main.rs:551:75:551:75 | y |  | main.rs:551:52:551:66 | T |
 | main.rs:551:81:556:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:553:18:553:18 | x |  | main.rs:551:52:551:66 | T |
 | main.rs:554:18:554:18 | y |  | main.rs:551:52:551:66 | T |
+| main.rs:555:9:555:38 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:555:18:555:29 | "{:?}, {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:555:18:555:29 | "{:?}, {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:555:18:555:37 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:555:18:555:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:555:18:555:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:558:50:558:50 | x |  | main.rs:558:41:558:47 | T |
 | main.rs:558:56:558:56 | y |  | main.rs:558:41:558:47 | T |
 | main.rs:558:62:563:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:560:18:560:18 | x |  | main.rs:558:41:558:47 | T |
 | main.rs:561:18:561:18 | y |  | main.rs:558:41:558:47 | T |
+| main.rs:562:9:562:38 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:562:18:562:29 | "{:?}, {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:562:18:562:29 | "{:?}, {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:562:18:562:37 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:562:18:562:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:562:18:562:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:565:54:565:54 | x |  | main.rs:565:41:565:51 | T |
 | main.rs:565:60:565:60 | y |  | main.rs:565:41:565:51 | T |
 | main.rs:565:66:570:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:567:18:567:18 | x |  | main.rs:565:41:565:51 | T |
 | main.rs:568:18:568:18 | y |  | main.rs:565:41:565:51 | T |
+| main.rs:569:9:569:38 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:569:18:569:29 | "{:?}, {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:569:18:569:29 | "{:?}, {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:569:18:569:37 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:569:18:569:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:569:18:569:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:577:18:577:22 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:577:18:577:22 | SelfParam | TRef | main.rs:574:5:578:5 | Self [trait TraitWithSelfTp] |
 | main.rs:580:40:580:44 | thing |  | {EXTERNAL LOCATION} | & |
 | main.rs:580:40:580:44 | thing | TRef | main.rs:580:17:580:37 | T |
-| main.rs:580:56:582:5 | { ... } |  | main.rs:580:14:580:14 | A |
 | main.rs:581:9:581:13 | thing |  | {EXTERNAL LOCATION} | & |
 | main.rs:581:9:581:13 | thing | TRef | main.rs:580:17:580:37 | T |
 | main.rs:585:44:585:48 | thing |  | main.rs:585:24:585:41 | S |
-| main.rs:585:61:588:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:586:19:586:23 | thing |  | main.rs:585:24:585:41 | S |
 | main.rs:593:55:593:59 | thing |  | {EXTERNAL LOCATION} | & |
 | main.rs:593:55:593:59 | thing | TRef | main.rs:593:25:593:52 | S |
@@ -1778,8 +1748,6 @@ inferCertainType
 | main.rs:595:25:595:29 | thing | TRef | main.rs:593:25:593:52 | S |
 | main.rs:604:18:604:22 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:604:18:604:22 | SelfParam | TRef | main.rs:598:5:600:5 | MyStruct |
-| main.rs:604:41:606:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| main.rs:604:41:606:9 | { ... } | T | main.rs:598:5:600:5 | MyStruct |
 | main.rs:605:18:605:47 | MyStruct {...} |  | main.rs:598:5:600:5 | MyStruct |
 | main.rs:605:36:605:39 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:605:36:605:39 | self | TRef | main.rs:598:5:600:5 | MyStruct |
@@ -1787,63 +1755,49 @@ inferCertainType
 | main.rs:612:13:612:13 | s |  | main.rs:598:5:600:5 | MyStruct |
 | main.rs:612:17:612:37 | MyStruct {...} |  | main.rs:598:5:600:5 | MyStruct |
 | main.rs:613:25:613:26 | &s |  | {EXTERNAL LOCATION} | & |
+| main.rs:613:25:613:26 | &s | TRef | main.rs:598:5:600:5 | MyStruct |
 | main.rs:613:26:613:26 | s |  | main.rs:598:5:600:5 | MyStruct |
 | main.rs:629:15:629:18 | SelfParam |  | main.rs:628:5:639:5 | Self [trait MyTrait] |
 | main.rs:631:15:631:18 | SelfParam |  | main.rs:628:5:639:5 | Self [trait MyTrait] |
-| main.rs:634:9:636:9 | { ... } |  | main.rs:628:19:628:19 | A |
 | main.rs:635:13:635:16 | self |  | main.rs:628:5:639:5 | Self [trait MyTrait] |
 | main.rs:638:18:638:18 | x |  | main.rs:628:5:639:5 | Self [trait MyTrait] |
 | main.rs:642:15:642:18 | SelfParam |  | main.rs:625:5:626:14 | S2 |
-| main.rs:642:26:644:9 | { ... } |  | main.rs:641:10:641:19 | T |
 | main.rs:646:18:646:18 | x |  | main.rs:625:5:626:14 | S2 |
-| main.rs:646:32:648:9 | { ... } |  | main.rs:641:10:641:19 | T |
 | main.rs:652:15:652:18 | SelfParam |  | main.rs:623:5:624:14 | S1 |
-| main.rs:652:28:654:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:656:18:656:18 | x |  | main.rs:623:5:624:14 | S1 |
-| main.rs:656:34:658:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:663:50:663:50 | x |  | main.rs:663:26:663:47 | T2 |
-| main.rs:663:63:666:5 | { ... } |  | main.rs:663:22:663:23 | T1 |
 | main.rs:664:9:664:9 | x |  | main.rs:663:26:663:47 | T2 |
 | main.rs:665:9:665:9 | x |  | main.rs:663:26:663:47 | T2 |
 | main.rs:667:52:667:52 | x |  | main.rs:667:28:667:49 | T2 |
-| main.rs:667:65:671:5 | { ... } |  | main.rs:667:24:667:25 | T1 |
 | main.rs:668:24:668:24 | x |  | main.rs:667:28:667:49 | T2 |
 | main.rs:670:16:670:16 | x |  | main.rs:667:28:667:49 | T2 |
 | main.rs:672:52:672:52 | x |  | main.rs:672:28:672:49 | T2 |
-| main.rs:672:65:676:5 | { ... } |  | main.rs:672:24:672:25 | T1 |
 | main.rs:673:29:673:29 | x |  | main.rs:672:28:672:49 | T2 |
 | main.rs:675:21:675:21 | x |  | main.rs:672:28:672:49 | T2 |
 | main.rs:677:55:677:55 | x |  | main.rs:677:31:677:52 | T2 |
-| main.rs:677:68:681:5 | { ... } |  | main.rs:677:27:677:28 | T1 |
 | main.rs:678:27:678:27 | x |  | main.rs:677:31:677:52 | T2 |
 | main.rs:680:19:680:19 | x |  | main.rs:677:31:677:52 | T2 |
 | main.rs:682:55:682:55 | x |  | main.rs:682:31:682:52 | T2 |
-| main.rs:682:68:686:5 | { ... } |  | main.rs:682:27:682:28 | T1 |
 | main.rs:683:32:683:32 | x |  | main.rs:682:31:682:52 | T2 |
 | main.rs:685:24:685:24 | x |  | main.rs:682:31:682:52 | T2 |
 | main.rs:690:49:690:49 | x |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:690:49:690:49 | x | T | main.rs:690:32:690:46 | T2 |
-| main.rs:690:71:692:5 | { ... } |  | main.rs:690:28:690:29 | T1 |
 | main.rs:691:9:691:9 | x |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:691:9:691:9 | x | T | main.rs:690:32:690:46 | T2 |
 | main.rs:693:51:693:51 | x |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:693:51:693:51 | x | T | main.rs:693:34:693:48 | T2 |
-| main.rs:693:73:695:5 | { ... } |  | main.rs:693:30:693:31 | T1 |
 | main.rs:694:16:694:16 | x |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:694:16:694:16 | x | T | main.rs:693:34:693:48 | T2 |
 | main.rs:696:51:696:51 | x |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:696:51:696:51 | x | T | main.rs:696:34:696:48 | T2 |
-| main.rs:696:73:698:5 | { ... } |  | main.rs:696:30:696:31 | T1 |
 | main.rs:697:21:697:21 | x |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:697:21:697:21 | x | T | main.rs:696:34:696:48 | T2 |
 | main.rs:701:15:701:18 | SelfParam |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:701:15:701:18 | SelfParam | T | main.rs:700:10:700:10 | T |
-| main.rs:701:26:703:9 | { ... } |  | main.rs:700:10:700:10 | T |
 | main.rs:702:13:702:16 | self |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:702:13:702:16 | self | T | main.rs:700:10:700:10 | T |
 | main.rs:705:18:705:18 | x |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:705:18:705:18 | x | T | main.rs:700:10:700:10 | T |
-| main.rs:705:32:707:9 | { ... } |  | main.rs:700:10:700:10 | T |
 | main.rs:706:13:706:13 | x |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:706:13:706:13 | x | T | main.rs:700:10:700:10 | T |
 | main.rs:712:15:712:18 | SelfParam |  | main.rs:710:5:713:5 | Self [trait MyTrait2] |
@@ -1861,28 +1815,32 @@ inferCertainType
 | main.rs:726:17:726:33 | MyThing {...} |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:727:13:727:13 | y |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:727:17:727:33 | MyThing {...} |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:729:9:729:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:729:18:729:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:729:18:729:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:729:18:729:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:729:18:729:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:729:18:729:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:729:26:729:26 | x |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:730:9:730:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:730:18:730:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:730:18:730:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:730:18:730:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:730:18:730:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:730:18:730:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:730:26:730:26 | y |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:732:13:732:13 | x |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:732:17:732:33 | MyThing {...} |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:733:13:733:13 | y |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:733:17:733:33 | MyThing {...} |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:735:9:735:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:735:18:735:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:735:18:735:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:735:18:735:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:735:18:735:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:735:18:735:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:735:26:735:26 | x |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:736:9:736:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:736:18:736:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:736:18:736:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:736:18:736:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:736:18:736:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:736:18:736:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:736:26:736:26 | y |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:738:13:738:14 | x2 |  | main.rs:618:5:621:5 | MyThing |
@@ -1890,54 +1848,64 @@ inferCertainType
 | main.rs:739:13:739:14 | y2 |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:739:18:739:34 | MyThing {...} |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:741:31:741:32 | x2 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:742:9:742:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:742:18:742:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:742:18:742:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:742:18:742:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:742:18:742:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:742:18:742:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:743:33:743:34 | x2 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:744:9:744:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:744:18:744:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:744:18:744:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:744:18:744:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:744:18:744:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:744:18:744:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:745:33:745:34 | x2 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:746:9:746:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:746:18:746:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:746:18:746:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:746:18:746:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:746:18:746:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:746:18:746:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:747:31:747:32 | y2 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:748:9:748:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:748:18:748:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:748:18:748:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:748:18:748:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:748:18:748:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:748:18:748:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:749:33:749:34 | y2 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:750:9:750:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:750:18:750:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:750:18:750:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:750:18:750:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:750:18:750:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:750:18:750:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:751:33:751:34 | y2 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:752:9:752:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:752:18:752:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:752:18:752:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:752:18:752:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:752:18:752:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:752:18:752:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:753:36:753:37 | x2 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:754:9:754:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:754:18:754:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:754:18:754:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:754:18:754:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:754:18:754:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:754:18:754:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:755:36:755:37 | x2 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:756:9:756:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:756:18:756:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:756:18:756:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:756:18:756:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:756:18:756:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:756:18:756:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:757:36:757:37 | y2 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:758:9:758:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:758:18:758:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:758:18:758:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:758:18:758:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:758:18:758:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:758:18:758:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:759:36:759:37 | y2 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:760:9:760:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:760:18:760:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:760:18:760:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:760:18:760:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:760:18:760:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:760:18:760:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:762:13:762:14 | x3 |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:762:18:764:9 | MyThing {...} |  | main.rs:618:5:621:5 | MyThing |
@@ -1946,130 +1914,140 @@ inferCertainType
 | main.rs:765:18:767:9 | MyThing {...} |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:766:16:766:32 | MyThing {...} |  | main.rs:618:5:621:5 | MyThing |
 | main.rs:769:37:769:38 | x3 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:770:9:770:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:770:18:770:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:770:18:770:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:770:18:770:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:770:18:770:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:770:18:770:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:771:39:771:40 | x3 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:772:9:772:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:772:18:772:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:772:18:772:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:772:18:772:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:772:18:772:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:772:18:772:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:773:39:773:40 | x3 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:774:9:774:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:774:18:774:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:774:18:774:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:774:18:774:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:774:18:774:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:774:18:774:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:775:37:775:38 | y3 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:776:9:776:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:776:18:776:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:776:18:776:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:776:18:776:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:776:18:776:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:776:18:776:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:777:39:777:40 | y3 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:778:9:778:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:778:18:778:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:778:18:778:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:778:18:778:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:778:18:778:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:778:18:778:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:779:39:779:40 | y3 |  | main.rs:618:5:621:5 | MyThing |
+| main.rs:780:9:780:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:780:18:780:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:780:18:780:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:780:18:780:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:780:18:780:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:780:18:780:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:782:13:782:13 | y |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:799:15:799:18 | SelfParam |  | main.rs:787:5:791:5 | MyEnum |
 | main.rs:799:15:799:18 | SelfParam | A | main.rs:798:10:798:10 | T |
-| main.rs:799:26:804:9 | { ... } |  | main.rs:798:10:798:10 | T |
 | main.rs:800:19:800:22 | self |  | main.rs:787:5:791:5 | MyEnum |
 | main.rs:800:19:800:22 | self | A | main.rs:798:10:798:10 | T |
 | main.rs:802:17:802:32 | ...::C2 {...} |  | main.rs:787:5:791:5 | MyEnum |
 | main.rs:807:16:813:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:809:13:809:13 | y |  | main.rs:787:5:791:5 | MyEnum |
 | main.rs:809:17:809:36 | ...::C2 {...} |  | main.rs:787:5:791:5 | MyEnum |
+| main.rs:811:9:811:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:811:18:811:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:811:18:811:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:811:18:811:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:811:18:811:31 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:811:18:811:31 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:812:9:812:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:812:18:812:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:812:18:812:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:812:18:812:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:812:18:812:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:812:18:812:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:812:26:812:26 | y |  | main.rs:787:5:791:5 | MyEnum |
 | main.rs:834:15:834:18 | SelfParam |  | main.rs:832:5:835:5 | Self [trait MyTrait1] |
 | main.rs:839:15:839:19 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:839:15:839:19 | SelfParam | TRef | main.rs:837:5:849:5 | Self [trait MyTrait2] |
-| main.rs:842:9:848:9 | { ... } |  | main.rs:837:20:837:22 | Tr2 |
 | main.rs:844:17:844:20 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:844:17:844:20 | self | TRef | main.rs:837:5:849:5 | Self [trait MyTrait2] |
 | main.rs:846:27:846:30 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:846:27:846:30 | self | TRef | main.rs:837:5:849:5 | Self [trait MyTrait2] |
 | main.rs:853:15:853:18 | SelfParam |  | main.rs:851:5:863:5 | Self [trait MyTrait3] |
-| main.rs:856:9:862:9 | { ... } |  | main.rs:851:20:851:22 | Tr3 |
 | main.rs:858:17:858:20 | self |  | main.rs:851:5:863:5 | Self [trait MyTrait3] |
 | main.rs:860:26:860:30 | &self |  | {EXTERNAL LOCATION} | & |
+| main.rs:860:26:860:30 | &self | TRef | main.rs:851:5:863:5 | Self [trait MyTrait3] |
 | main.rs:860:27:860:30 | self |  | main.rs:851:5:863:5 | Self [trait MyTrait3] |
 | main.rs:867:15:867:18 | SelfParam |  | main.rs:817:5:820:5 | MyThing |
 | main.rs:867:15:867:18 | SelfParam | A | main.rs:865:10:865:10 | T |
-| main.rs:867:26:869:9 | { ... } |  | main.rs:865:10:865:10 | T |
 | main.rs:868:13:868:16 | self |  | main.rs:817:5:820:5 | MyThing |
 | main.rs:868:13:868:16 | self | A | main.rs:865:10:865:10 | T |
 | main.rs:876:15:876:18 | SelfParam |  | main.rs:822:5:825:5 | MyThing2 |
 | main.rs:876:15:876:18 | SelfParam | A | main.rs:874:10:874:10 | T |
 | main.rs:876:35:878:9 | { ... } |  | main.rs:817:5:820:5 | MyThing |
-| main.rs:876:35:878:9 | { ... } | A | main.rs:874:10:874:10 | T |
 | main.rs:877:13:877:33 | MyThing {...} |  | main.rs:817:5:820:5 | MyThing |
 | main.rs:877:26:877:29 | self |  | main.rs:822:5:825:5 | MyThing2 |
 | main.rs:877:26:877:29 | self | A | main.rs:874:10:874:10 | T |
 | main.rs:885:44:885:44 | x |  | main.rs:885:26:885:41 | T2 |
-| main.rs:885:57:887:5 | { ... } |  | main.rs:885:22:885:23 | T1 |
 | main.rs:886:9:886:9 | x |  | main.rs:885:26:885:41 | T2 |
 | main.rs:889:56:889:56 | x |  | main.rs:889:39:889:53 | T |
 | main.rs:889:62:893:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:891:17:891:17 | x |  | main.rs:889:39:889:53 | T |
+| main.rs:892:9:892:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:892:18:892:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:892:18:892:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:892:18:892:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:892:18:892:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:892:18:892:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:895:16:919:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:896:13:896:13 | x |  | main.rs:817:5:820:5 | MyThing |
 | main.rs:896:17:896:33 | MyThing {...} |  | main.rs:817:5:820:5 | MyThing |
 | main.rs:897:13:897:13 | y |  | main.rs:817:5:820:5 | MyThing |
 | main.rs:897:17:897:33 | MyThing {...} |  | main.rs:817:5:820:5 | MyThing |
+| main.rs:899:9:899:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:899:18:899:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:899:18:899:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:899:18:899:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:899:18:899:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:899:18:899:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:899:26:899:26 | x |  | main.rs:817:5:820:5 | MyThing |
+| main.rs:900:9:900:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:900:18:900:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:900:18:900:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:900:18:900:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:900:18:900:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:900:18:900:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:900:26:900:26 | y |  | main.rs:817:5:820:5 | MyThing |
 | main.rs:902:13:902:13 | x |  | main.rs:817:5:820:5 | MyThing |
 | main.rs:902:17:902:33 | MyThing {...} |  | main.rs:817:5:820:5 | MyThing |
 | main.rs:903:13:903:13 | y |  | main.rs:817:5:820:5 | MyThing |
 | main.rs:903:17:903:33 | MyThing {...} |  | main.rs:817:5:820:5 | MyThing |
+| main.rs:905:9:905:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:905:18:905:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:905:18:905:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:905:18:905:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:905:18:905:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:905:18:905:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:905:26:905:26 | x |  | main.rs:817:5:820:5 | MyThing |
+| main.rs:906:9:906:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:906:18:906:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:906:18:906:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:906:18:906:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:906:18:906:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:906:18:906:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:906:26:906:26 | y |  | main.rs:817:5:820:5 | MyThing |
 | main.rs:908:13:908:13 | x |  | main.rs:822:5:825:5 | MyThing2 |
 | main.rs:908:17:908:34 | MyThing2 {...} |  | main.rs:822:5:825:5 | MyThing2 |
 | main.rs:909:13:909:13 | y |  | main.rs:822:5:825:5 | MyThing2 |
 | main.rs:909:17:909:34 | MyThing2 {...} |  | main.rs:822:5:825:5 | MyThing2 |
+| main.rs:911:9:911:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:911:18:911:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:911:18:911:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:911:18:911:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:911:18:911:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:911:18:911:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:911:26:911:26 | x |  | main.rs:822:5:825:5 | MyThing2 |
+| main.rs:912:9:912:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:912:18:912:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:912:18:912:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:912:18:912:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:912:18:912:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:912:18:912:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:912:26:912:26 | y |  | main.rs:822:5:825:5 | MyThing2 |
 | main.rs:914:13:914:13 | x |  | main.rs:817:5:820:5 | MyThing |
@@ -2085,49 +2063,41 @@ inferCertainType
 | main.rs:936:9:936:9 | x |  | {EXTERNAL LOCATION} | & |
 | main.rs:936:9:936:9 | x | TRef | main.rs:935:11:935:19 | T |
 | main.rs:940:17:940:20 | SelfParam |  | main.rs:925:5:926:14 | S1 |
-| main.rs:940:29:942:9 | { ... } |  | main.rs:928:5:929:14 | S2 |
 | main.rs:945:21:945:21 | x |  | main.rs:945:13:945:14 | T1 |
-| main.rs:948:5:950:5 | { ... } |  | main.rs:945:17:945:18 | T2 |
 | main.rs:949:9:949:9 | x |  | main.rs:945:13:945:14 | T1 |
 | main.rs:952:16:968:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:954:9:954:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:954:18:954:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:954:18:954:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:954:18:954:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:954:18:954:31 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:954:26:954:31 | id(...) |  | {EXTERNAL LOCATION} | & |
+| main.rs:954:18:954:31 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:954:29:954:30 | &x |  | {EXTERNAL LOCATION} | & |
+| main.rs:957:9:957:38 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:957:18:957:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:957:18:957:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:957:18:957:37 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:957:18:957:37 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:957:26:957:37 | id::<...>(...) |  | {EXTERNAL LOCATION} | & |
-| main.rs:957:26:957:37 | id::<...>(...) | TRef | main.rs:925:5:926:14 | S1 |
+| main.rs:957:18:957:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:957:35:957:36 | &x |  | {EXTERNAL LOCATION} | & |
+| main.rs:961:9:961:45 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:961:18:961:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:961:18:961:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:961:18:961:44 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:961:18:961:44 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:961:26:961:44 | id::<...>(...) |  | {EXTERNAL LOCATION} | & |
-| main.rs:961:26:961:44 | id::<...>(...) | TRef | main.rs:931:5:931:25 | dyn Trait |
+| main.rs:961:18:961:44 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:961:42:961:43 | &x |  | {EXTERNAL LOCATION} | & |
-| main.rs:964:9:964:25 | into::<...>(...) |  | main.rs:928:5:929:14 | S2 |
 | main.rs:967:13:967:13 | y |  | main.rs:928:5:929:14 | S2 |
 | main.rs:981:22:981:25 | SelfParam |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:981:22:981:25 | SelfParam | Fst | main.rs:980:10:980:12 | Fst |
 | main.rs:981:22:981:25 | SelfParam | Snd | main.rs:980:15:980:17 | Snd |
-| main.rs:981:35:988:9 | { ... } |  | main.rs:980:15:980:17 | Snd |
 | main.rs:982:19:982:22 | self |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:982:19:982:22 | self | Fst | main.rs:980:10:980:12 | Fst |
 | main.rs:982:19:982:22 | self | Snd | main.rs:980:15:980:17 | Snd |
-| main.rs:983:43:983:82 | MacroExpr |  | file://:0:0:0:0 | ! |
 | main.rs:983:50:983:81 | "PairNone has no second elemen... |  | {EXTERNAL LOCATION} | & |
 | main.rs:983:50:983:81 | "PairNone has no second elemen... | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:983:50:983:81 | ...::panic_fmt(...) |  | file://:0:0:0:0 | ! |
+| main.rs:983:50:983:81 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:983:50:983:81 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:984:43:984:81 | MacroExpr |  | file://:0:0:0:0 | ! |
 | main.rs:984:50:984:80 | "PairFst has no second element... |  | {EXTERNAL LOCATION} | & |
 | main.rs:984:50:984:80 | "PairFst has no second element... | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:984:50:984:80 | ...::panic_fmt(...) |  | file://:0:0:0:0 | ! |
+| main.rs:984:50:984:80 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:984:50:984:80 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1012:10:1012:10 | t |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:1012:10:1012:10 | t | Fst | main.rs:994:5:995:14 | S2 |
@@ -2140,17 +2110,19 @@ inferCertainType
 | main.rs:1013:17:1013:17 | t | Snd | main.rs:972:5:978:5 | PairOption |
 | main.rs:1013:17:1013:17 | t | Snd.Fst | main.rs:994:5:995:14 | S2 |
 | main.rs:1013:17:1013:17 | t | Snd.Snd | main.rs:997:5:998:14 | S3 |
+| main.rs:1014:9:1014:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1014:18:1014:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1014:18:1014:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1014:18:1014:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1014:18:1014:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1014:18:1014:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1025:16:1045:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1027:13:1027:14 | p1 |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:1027:13:1027:14 | p1 | Fst | main.rs:991:5:992:14 | S1 |
 | main.rs:1027:13:1027:14 | p1 | Snd | main.rs:994:5:995:14 | S2 |
+| main.rs:1028:9:1028:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1028:18:1028:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1028:18:1028:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1028:18:1028:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1028:18:1028:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1028:18:1028:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1028:26:1028:27 | p1 |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:1028:26:1028:27 | p1 | Fst | main.rs:991:5:992:14 | S1 |
@@ -2158,32 +2130,34 @@ inferCertainType
 | main.rs:1031:13:1031:14 | p2 |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:1031:13:1031:14 | p2 | Fst | main.rs:991:5:992:14 | S1 |
 | main.rs:1031:13:1031:14 | p2 | Snd | main.rs:994:5:995:14 | S2 |
+| main.rs:1032:9:1032:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1032:18:1032:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1032:18:1032:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1032:18:1032:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1032:18:1032:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1032:18:1032:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1032:26:1032:27 | p2 |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:1032:26:1032:27 | p2 | Fst | main.rs:991:5:992:14 | S1 |
 | main.rs:1032:26:1032:27 | p2 | Snd | main.rs:994:5:995:14 | S2 |
 | main.rs:1035:13:1035:14 | p3 |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:1035:13:1035:14 | p3 | Fst | main.rs:994:5:995:14 | S2 |
+| main.rs:1036:9:1036:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1036:18:1036:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1036:18:1036:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1036:18:1036:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1036:18:1036:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1036:18:1036:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1036:26:1036:27 | p3 |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:1036:26:1036:27 | p3 | Fst | main.rs:994:5:995:14 | S2 |
 | main.rs:1039:13:1039:14 | p3 |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:1039:13:1039:14 | p3 | Fst | main.rs:994:5:995:14 | S2 |
 | main.rs:1039:13:1039:14 | p3 | Snd | main.rs:997:5:998:14 | S3 |
+| main.rs:1040:9:1040:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1040:18:1040:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1040:18:1040:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1040:18:1040:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1040:18:1040:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1040:18:1040:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1040:26:1040:27 | p3 |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:1040:26:1040:27 | p3 | Fst | main.rs:994:5:995:14 | S2 |
 | main.rs:1040:26:1040:27 | p3 | Snd | main.rs:997:5:998:14 | S3 |
-| main.rs:1042:9:1042:55 | g(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1044:13:1044:13 | x |  | {EXTERNAL LOCATION} | Result |
 | main.rs:1044:13:1044:13 | x | E | main.rs:991:5:992:14 | S1 |
 | main.rs:1044:13:1044:13 | x | T | main.rs:1017:5:1017:34 | S4 |
@@ -2205,90 +2179,72 @@ inferCertainType
 | main.rs:1066:16:1066:24 | SelfParam | TRefMut.T | main.rs:1064:10:1064:10 | T |
 | main.rs:1066:27:1066:31 | value |  | main.rs:1064:10:1064:10 | T |
 | main.rs:1066:37:1066:38 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:1070:26:1072:9 | { ... } |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1070:26:1072:9 | { ... } | T | main.rs:1069:10:1069:10 | T |
 | main.rs:1076:20:1076:23 | SelfParam |  | main.rs:1049:5:1053:5 | MyOption |
 | main.rs:1076:20:1076:23 | SelfParam | T | main.rs:1049:5:1053:5 | MyOption |
 | main.rs:1076:20:1076:23 | SelfParam | T.T | main.rs:1075:10:1075:10 | T |
-| main.rs:1076:41:1081:9 | { ... } |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1076:41:1081:9 | { ... } | T | main.rs:1075:10:1075:10 | T |
 | main.rs:1077:19:1077:22 | self |  | main.rs:1049:5:1053:5 | MyOption |
 | main.rs:1077:19:1077:22 | self | T | main.rs:1049:5:1053:5 | MyOption |
 | main.rs:1077:19:1077:22 | self | T.T | main.rs:1075:10:1075:10 | T |
 | main.rs:1087:16:1132:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:1088:13:1088:14 | x1 |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1088:13:1088:14 | x1 | T | main.rs:1084:5:1085:13 | S |
-| main.rs:1088:18:1088:37 | ...::new(...) |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1088:18:1088:37 | ...::new(...) | T | main.rs:1084:5:1085:13 | S |
+| main.rs:1089:9:1089:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1089:18:1089:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1089:18:1089:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1089:18:1089:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1089:18:1089:27 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:1089:26:1089:27 | x1 |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1089:26:1089:27 | x1 | T | main.rs:1084:5:1085:13 | S |
-| main.rs:1091:17:1091:18 | x2 |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1091:22:1091:36 | ...::new(...) |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1092:9:1092:10 | x2 |  | main.rs:1049:5:1053:5 | MyOption |
+| main.rs:1089:18:1089:27 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1093:9:1093:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1093:18:1093:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1093:18:1093:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1093:18:1093:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1093:18:1093:27 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:1093:26:1093:27 | x2 |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1095:17:1095:18 | x3 |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1095:22:1095:36 | ...::new(...) |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1096:9:1096:10 | x3 |  | main.rs:1049:5:1053:5 | MyOption |
+| main.rs:1093:18:1093:27 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1097:9:1097:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1097:18:1097:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1097:18:1097:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1097:18:1097:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1097:18:1097:27 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:1097:26:1097:27 | x3 |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1099:17:1099:18 | x4 |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1099:22:1099:36 | ...::new(...) |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1100:9:1100:33 | ...::set(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1097:18:1097:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1100:23:1100:29 | &mut x4 |  | {EXTERNAL LOCATION} | &mut |
-| main.rs:1100:28:1100:29 | x4 |  | main.rs:1049:5:1053:5 | MyOption |
+| main.rs:1101:9:1101:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1101:18:1101:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1101:18:1101:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1101:18:1101:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1101:18:1101:27 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:1101:26:1101:27 | x4 |  | main.rs:1049:5:1053:5 | MyOption |
+| main.rs:1101:18:1101:27 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1104:9:1104:38 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1104:18:1104:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1104:18:1104:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1104:18:1104:37 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1104:18:1104:37 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1104:18:1104:37 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1107:9:1107:62 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1107:18:1107:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1107:18:1107:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1107:18:1107:61 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1107:18:1107:61 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:1107:26:1107:61 | ...::flatten(...) |  | main.rs:1049:5:1053:5 | MyOption |
-| main.rs:1107:26:1107:61 | ...::flatten(...) | T | main.rs:1084:5:1085:13 | S |
+| main.rs:1107:18:1107:61 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1115:9:1115:33 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1115:18:1115:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1115:18:1115:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1115:18:1115:32 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1115:18:1115:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1115:18:1115:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1119:13:1119:16 | true |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1120:13:1120:17 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1122:9:1122:36 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1122:18:1122:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1122:18:1122:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1122:18:1122:35 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1122:18:1122:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1122:18:1122:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1125:30:1130:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1126:13:1128:13 | if ... {...} |  | {EXTERNAL LOCATION} | () |
 | main.rs:1126:22:1128:13 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1131:9:1131:35 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1131:18:1131:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1131:18:1131:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1131:18:1131:34 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1131:18:1131:34 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1131:18:1131:34 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1149:15:1149:18 | SelfParam |  | main.rs:1137:5:1138:19 | S |
 | main.rs:1149:15:1149:18 | SelfParam | T | main.rs:1148:10:1148:10 | T |
-| main.rs:1149:26:1151:9 | { ... } |  | main.rs:1148:10:1148:10 | T |
 | main.rs:1150:13:1150:16 | self |  | main.rs:1137:5:1138:19 | S |
 | main.rs:1150:13:1150:16 | self | T | main.rs:1148:10:1148:10 | T |
 | main.rs:1153:15:1153:19 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1153:15:1153:19 | SelfParam | TRef | main.rs:1137:5:1138:19 | S |
 | main.rs:1153:15:1153:19 | SelfParam | TRef.T | main.rs:1148:10:1148:10 | T |
 | main.rs:1153:28:1155:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1153:28:1155:9 | { ... } | TRef | main.rs:1148:10:1148:10 | T |
 | main.rs:1154:13:1154:19 | &... |  | {EXTERNAL LOCATION} | & |
 | main.rs:1154:14:1154:17 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1154:14:1154:17 | self | TRef | main.rs:1137:5:1138:19 | S |
@@ -2297,7 +2253,6 @@ inferCertainType
 | main.rs:1157:15:1157:25 | SelfParam | TRef | main.rs:1137:5:1138:19 | S |
 | main.rs:1157:15:1157:25 | SelfParam | TRef.T | main.rs:1148:10:1148:10 | T |
 | main.rs:1157:34:1159:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1157:34:1159:9 | { ... } | TRef | main.rs:1148:10:1148:10 | T |
 | main.rs:1158:13:1158:19 | &... |  | {EXTERNAL LOCATION} | & |
 | main.rs:1158:14:1158:17 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1158:14:1158:17 | self | TRef | main.rs:1137:5:1138:19 | S |
@@ -2308,104 +2263,115 @@ inferCertainType
 | main.rs:1170:29:1170:33 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1170:29:1170:33 | SelfParam | TRef | {EXTERNAL LOCATION} | & |
 | main.rs:1170:29:1170:33 | SelfParam | TRef.TRef | main.rs:1143:5:1146:5 | MyInt |
-| main.rs:1170:43:1172:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1171:17:1171:20 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1171:17:1171:20 | self | TRef | {EXTERNAL LOCATION} | & |
 | main.rs:1171:17:1171:20 | self | TRef.TRef | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1175:33:1175:36 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1175:33:1175:36 | SelfParam | TRef | main.rs:1143:5:1146:5 | MyInt |
-| main.rs:1175:46:1177:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1176:15:1176:18 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1176:15:1176:18 | self | TRef | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1180:16:1230:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1182:9:1182:33 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1182:18:1182:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1182:18:1182:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1182:18:1182:32 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1182:18:1182:32 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1182:18:1182:32 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1186:9:1186:33 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1186:18:1186:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1186:18:1186:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1186:18:1186:32 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1186:18:1186:32 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1186:18:1186:32 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1187:9:1187:33 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1187:18:1187:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1187:18:1187:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1187:18:1187:32 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1187:18:1187:32 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1187:18:1187:32 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1191:9:1191:42 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1191:18:1191:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1191:18:1191:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1191:18:1191:41 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1191:18:1191:41 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:1191:26:1191:41 | ...::m2(...) |  | {EXTERNAL LOCATION} | & |
-| main.rs:1191:26:1191:41 | ...::m2(...) | TRef | main.rs:1140:5:1141:14 | S2 |
+| main.rs:1191:18:1191:41 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1191:38:1191:40 | &x3 |  | {EXTERNAL LOCATION} | & |
+| main.rs:1192:9:1192:42 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1192:18:1192:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1192:18:1192:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1192:18:1192:41 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1192:18:1192:41 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:1192:26:1192:41 | ...::m3(...) |  | {EXTERNAL LOCATION} | & |
-| main.rs:1192:26:1192:41 | ...::m3(...) | TRef | main.rs:1140:5:1141:14 | S2 |
+| main.rs:1192:18:1192:41 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1192:38:1192:40 | &x3 |  | {EXTERNAL LOCATION} | & |
 | main.rs:1194:13:1194:14 | x4 |  | {EXTERNAL LOCATION} | & |
 | main.rs:1194:18:1194:23 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1196:9:1196:33 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1196:18:1196:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1196:18:1196:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1196:18:1196:32 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1196:18:1196:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1196:18:1196:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1196:26:1196:27 | x4 |  | {EXTERNAL LOCATION} | & |
+| main.rs:1197:9:1197:33 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1197:18:1197:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1197:18:1197:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1197:18:1197:32 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1197:18:1197:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1197:18:1197:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1197:26:1197:27 | x4 |  | {EXTERNAL LOCATION} | & |
 | main.rs:1199:13:1199:14 | x5 |  | {EXTERNAL LOCATION} | & |
 | main.rs:1199:18:1199:23 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1201:9:1201:33 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1201:18:1201:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1201:18:1201:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1201:18:1201:32 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1201:18:1201:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1201:18:1201:32 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1201:26:1201:27 | x5 |  | {EXTERNAL LOCATION} | & |
+| main.rs:1202:9:1202:30 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1202:18:1202:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1202:18:1202:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1202:18:1202:29 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1202:18:1202:29 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1202:18:1202:29 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1202:26:1202:27 | x5 |  | {EXTERNAL LOCATION} | & |
 | main.rs:1204:13:1204:14 | x6 |  | {EXTERNAL LOCATION} | & |
 | main.rs:1204:18:1204:23 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1207:9:1207:36 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1207:18:1207:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1207:18:1207:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1207:18:1207:35 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1207:18:1207:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1207:18:1207:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1207:28:1207:29 | x6 |  | {EXTERNAL LOCATION} | & |
 | main.rs:1209:20:1209:22 | &S2 |  | {EXTERNAL LOCATION} | & |
+| main.rs:1213:9:1213:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1213:18:1213:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1213:18:1213:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1213:18:1213:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1213:18:1213:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1213:18:1213:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1215:13:1215:14 | x9 |  | {EXTERNAL LOCATION} | String |
 | main.rs:1215:26:1215:32 | "Hello" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1215:26:1215:32 | "Hello" | TRef | {EXTERNAL LOCATION} | str |
 | main.rs:1219:17:1219:18 | x9 |  | {EXTERNAL LOCATION} | String |
 | main.rs:1221:13:1221:20 | my_thing |  | {EXTERNAL LOCATION} | & |
+| main.rs:1221:13:1221:20 | my_thing | TRef | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1221:24:1221:39 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1221:24:1221:39 | &... | TRef | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1221:25:1221:39 | MyInt {...} |  | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1223:17:1223:24 | my_thing |  | {EXTERNAL LOCATION} | & |
+| main.rs:1223:17:1223:24 | my_thing | TRef | main.rs:1143:5:1146:5 | MyInt |
+| main.rs:1224:9:1224:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1224:18:1224:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1224:18:1224:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1224:18:1224:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1224:18:1224:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1224:18:1224:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1227:13:1227:20 | my_thing |  | {EXTERNAL LOCATION} | & |
+| main.rs:1227:13:1227:20 | my_thing | TRef | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1227:24:1227:39 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1227:24:1227:39 | &... | TRef | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1227:25:1227:39 | MyInt {...} |  | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1228:17:1228:24 | my_thing |  | {EXTERNAL LOCATION} | & |
+| main.rs:1228:17:1228:24 | my_thing | TRef | main.rs:1143:5:1146:5 | MyInt |
+| main.rs:1229:9:1229:27 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1229:18:1229:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1229:18:1229:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1229:18:1229:26 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1229:18:1229:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1229:18:1229:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1236:16:1236:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1236:16:1236:20 | SelfParam | TRef | main.rs:1234:5:1242:5 | Self [trait MyTrait] |
 | main.rs:1239:16:1239:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1239:16:1239:20 | SelfParam | TRef | main.rs:1234:5:1242:5 | Self [trait MyTrait] |
-| main.rs:1239:32:1241:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1239:32:1241:9 | { ... } | TRef | main.rs:1234:5:1242:5 | Self [trait MyTrait] |
 | main.rs:1240:13:1240:16 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1240:13:1240:16 | self | TRef | main.rs:1234:5:1242:5 | Self [trait MyTrait] |
 | main.rs:1248:16:1248:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
@@ -2438,30 +2404,56 @@ inferCertainType
 | main.rs:1270:13:1270:16 | self | TRef.T | main.rs:1264:10:1264:10 | T |
 | main.rs:1274:16:1280:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1279:15:1279:17 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1279:15:1279:17 | &... | TRef | {EXTERNAL LOCATION} | & |
 | main.rs:1279:16:1279:17 | &x |  | {EXTERNAL LOCATION} | & |
 | main.rs:1290:17:1290:25 | SelfParam |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1290:17:1290:25 | SelfParam | TRefMut | main.rs:1284:5:1287:5 | MyFlag |
 | main.rs:1290:28:1292:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1291:13:1291:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1291:13:1291:16 | self | TRefMut | main.rs:1284:5:1287:5 | MyFlag |
+| main.rs:1291:13:1291:34 | ... = ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1291:26:1291:29 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1291:26:1291:29 | self | TRefMut | main.rs:1284:5:1287:5 | MyFlag |
 | main.rs:1298:15:1298:19 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1298:15:1298:19 | SelfParam | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1298:31:1300:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1298:31:1300:9 | { ... } | TRef | main.rs:1295:5:1295:13 | S |
+| main.rs:1298:31:1300:9 | { ... } | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1298:31:1300:9 | { ... } | TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1298:31:1300:9 | { ... } | TRef.TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1298:31:1300:9 | { ... } | TRef.TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1299:13:1299:19 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1299:13:1299:19 | &... | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1299:13:1299:19 | &... | TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1299:13:1299:19 | &... | TRef.TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1299:13:1299:19 | &... | TRef.TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1299:14:1299:19 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1299:14:1299:19 | &... | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1299:14:1299:19 | &... | TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1299:14:1299:19 | &... | TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1299:15:1299:19 | &self |  | {EXTERNAL LOCATION} | & |
+| main.rs:1299:15:1299:19 | &self | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1299:15:1299:19 | &self | TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1299:16:1299:19 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1299:16:1299:19 | self | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1302:15:1302:25 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1302:15:1302:25 | SelfParam | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1302:37:1304:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1302:37:1304:9 | { ... } | TRef | main.rs:1295:5:1295:13 | S |
+| main.rs:1302:37:1304:9 | { ... } | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1302:37:1304:9 | { ... } | TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1302:37:1304:9 | { ... } | TRef.TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1302:37:1304:9 | { ... } | TRef.TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1303:13:1303:19 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1303:13:1303:19 | &... | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1303:13:1303:19 | &... | TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1303:13:1303:19 | &... | TRef.TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1303:13:1303:19 | &... | TRef.TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1303:14:1303:19 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1303:14:1303:19 | &... | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1303:14:1303:19 | &... | TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1303:14:1303:19 | &... | TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1303:15:1303:19 | &self |  | {EXTERNAL LOCATION} | & |
+| main.rs:1303:15:1303:19 | &self | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1303:15:1303:19 | &self | TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1303:16:1303:19 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1303:16:1303:19 | self | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1306:15:1306:15 | x |  | {EXTERNAL LOCATION} | & |
@@ -2473,10 +2465,22 @@ inferCertainType
 | main.rs:1310:15:1310:15 | x |  | {EXTERNAL LOCATION} | & |
 | main.rs:1310:15:1310:15 | x | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1310:34:1312:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1310:34:1312:9 | { ... } | TRef | main.rs:1295:5:1295:13 | S |
+| main.rs:1310:34:1312:9 | { ... } | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1310:34:1312:9 | { ... } | TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1310:34:1312:9 | { ... } | TRef.TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1310:34:1312:9 | { ... } | TRef.TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1311:13:1311:16 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1311:13:1311:16 | &... | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1311:13:1311:16 | &... | TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1311:13:1311:16 | &... | TRef.TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1311:13:1311:16 | &... | TRef.TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1311:14:1311:16 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1311:14:1311:16 | &... | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1311:14:1311:16 | &... | TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1311:14:1311:16 | &... | TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1311:15:1311:16 | &x |  | {EXTERNAL LOCATION} | & |
+| main.rs:1311:15:1311:16 | &x | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1311:15:1311:16 | &x | TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1311:16:1311:16 | x |  | {EXTERNAL LOCATION} | & |
 | main.rs:1311:16:1311:16 | x | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1315:16:1328:5 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -2484,78 +2488,64 @@ inferCertainType
 | main.rs:1316:17:1316:20 | S {...} |  | main.rs:1295:5:1295:13 | S |
 | main.rs:1317:9:1317:9 | x |  | main.rs:1295:5:1295:13 | S |
 | main.rs:1318:9:1318:9 | x |  | main.rs:1295:5:1295:13 | S |
-| main.rs:1319:9:1319:17 | ...::f3(...) |  | {EXTERNAL LOCATION} | & |
-| main.rs:1319:9:1319:17 | ...::f3(...) | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1319:15:1319:16 | &x |  | {EXTERNAL LOCATION} | & |
+| main.rs:1319:15:1319:16 | &x | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1319:16:1319:16 | x |  | main.rs:1295:5:1295:13 | S |
 | main.rs:1321:19:1321:24 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1321:19:1321:24 | &... | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1321:19:1321:24 | &... | TRef.TRef | {EXTERNAL LOCATION} | bool |
 | main.rs:1321:20:1321:24 | &true |  | {EXTERNAL LOCATION} | & |
+| main.rs:1321:20:1321:24 | &true | TRef | {EXTERNAL LOCATION} | bool |
 | main.rs:1321:21:1321:24 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1326:9:1326:31 | ...::flip(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1326:22:1326:30 | &mut flag |  | {EXTERNAL LOCATION} | &mut |
+| main.rs:1327:9:1327:30 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1327:18:1327:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1327:18:1327:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1327:18:1327:29 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1327:18:1327:29 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:1342:43:1345:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1342:43:1345:5 | { ... } | E | main.rs:1334:5:1335:14 | S1 |
-| main.rs:1342:43:1345:5 | { ... } | T | main.rs:1334:5:1335:14 | S1 |
-| main.rs:1349:46:1353:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1349:46:1353:5 | { ... } | E | main.rs:1337:5:1338:14 | S2 |
-| main.rs:1349:46:1353:5 | { ... } | T | main.rs:1334:5:1335:14 | S1 |
-| main.rs:1357:40:1362:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1357:40:1362:5 | { ... } | E | main.rs:1337:5:1338:14 | S2 |
-| main.rs:1357:40:1362:5 | { ... } | T | main.rs:1334:5:1335:14 | S1 |
+| main.rs:1327:18:1327:29 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1360:24:1360:28 | \|...\| s |  | {EXTERNAL LOCATION} | dyn Fn |
+| main.rs:1360:24:1360:28 | \|...\| s | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
 | main.rs:1366:30:1366:34 | input |  | {EXTERNAL LOCATION} | Result |
 | main.rs:1366:30:1366:34 | input | E | main.rs:1334:5:1335:14 | S1 |
 | main.rs:1366:30:1366:34 | input | T | main.rs:1366:20:1366:27 | T |
-| main.rs:1366:69:1373:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1366:69:1373:5 | { ... } | E | main.rs:1334:5:1335:14 | S1 |
-| main.rs:1366:69:1373:5 | { ... } | T | main.rs:1366:20:1366:27 | T |
 | main.rs:1367:21:1367:25 | input |  | {EXTERNAL LOCATION} | Result |
 | main.rs:1367:21:1367:25 | input | E | main.rs:1334:5:1335:14 | S1 |
 | main.rs:1367:21:1367:25 | input | T | main.rs:1366:20:1366:27 | T |
 | main.rs:1368:49:1371:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| main.rs:1368:49:1371:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| main.rs:1369:13:1369:31 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1369:22:1369:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1369:22:1369:27 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1369:22:1369:30 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1369:22:1369:30 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1369:22:1369:30 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1376:16:1392:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1377:9:1379:9 | if ... {...} |  | {EXTERNAL LOCATION} | () |
-| main.rs:1377:37:1377:52 | try_same_error(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1377:37:1377:52 | try_same_error(...) | E | main.rs:1334:5:1335:14 | S1 |
-| main.rs:1377:37:1377:52 | try_same_error(...) | T | main.rs:1334:5:1335:14 | S1 |
 | main.rs:1377:54:1379:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1378:13:1378:36 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1378:22:1378:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1378:22:1378:27 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1378:22:1378:35 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1378:22:1378:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1378:22:1378:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1381:9:1383:9 | if ... {...} |  | {EXTERNAL LOCATION} | () |
-| main.rs:1381:37:1381:55 | try_convert_error(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1381:37:1381:55 | try_convert_error(...) | E | main.rs:1337:5:1338:14 | S2 |
-| main.rs:1381:37:1381:55 | try_convert_error(...) | T | main.rs:1334:5:1335:14 | S1 |
 | main.rs:1381:57:1383:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1382:13:1382:36 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1382:22:1382:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1382:22:1382:27 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1382:22:1382:35 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1382:22:1382:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1382:22:1382:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1385:9:1387:9 | if ... {...} |  | {EXTERNAL LOCATION} | () |
-| main.rs:1385:37:1385:49 | try_chained(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1385:37:1385:49 | try_chained(...) | E | main.rs:1337:5:1338:14 | S2 |
-| main.rs:1385:37:1385:49 | try_chained(...) | T | main.rs:1334:5:1335:14 | S1 |
 | main.rs:1385:51:1387:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1386:13:1386:36 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1386:22:1386:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1386:22:1386:27 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1386:22:1386:35 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1386:22:1386:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1386:22:1386:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1389:9:1391:9 | if ... {...} |  | {EXTERNAL LOCATION} | () |
-| main.rs:1389:37:1389:63 | try_complex(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1389:37:1389:63 | try_complex(...) | E | main.rs:1334:5:1335:14 | S1 |
 | main.rs:1389:65:1391:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1390:13:1390:36 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:1390:22:1390:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:1390:22:1390:27 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:1390:22:1390:35 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:1390:22:1390:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1390:22:1390:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1396:16:1487:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1397:13:1397:13 | x |  | {EXTERNAL LOCATION} | i32 |
@@ -2578,103 +2568,78 @@ inferCertainType
 | main.rs:1414:26:1414:30 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1414:26:1414:30 | SelfParam | TRef | {EXTERNAL LOCATION} | [;] |
 | main.rs:1414:26:1414:30 | SelfParam | TRef.TArray | main.rs:1413:14:1413:23 | T |
-| main.rs:1414:39:1416:13 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1414:39:1416:13 | { ... } | TRef | main.rs:1413:14:1413:23 | T |
 | main.rs:1415:17:1415:20 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1415:17:1415:20 | self | TRef | {EXTERNAL LOCATION} | [;] |
 | main.rs:1415:17:1415:20 | self | TRef.TArray | main.rs:1413:14:1413:23 | T |
-| main.rs:1418:31:1420:13 | { ... } |  | main.rs:1413:14:1413:23 | T |
 | main.rs:1423:17:1423:25 | [...] |  | {EXTERNAL LOCATION} | [;] |
-| main.rs:1424:13:1424:13 | x |  | {EXTERNAL LOCATION} | & |
-| main.rs:1424:17:1424:47 | ...::my_method(...) |  | {EXTERNAL LOCATION} | & |
 | main.rs:1424:37:1424:46 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1424:37:1424:46 | &... | TRef | {EXTERNAL LOCATION} | [;] |
 | main.rs:1424:38:1424:46 | [...] |  | {EXTERNAL LOCATION} | [;] |
-| main.rs:1425:13:1425:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1425:17:1425:37 | ...::my_func(...) |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1428:26:1428:30 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1428:26:1428:30 | SelfParam | TRef | {EXTERNAL LOCATION} | [] |
 | main.rs:1428:26:1428:30 | SelfParam | TRef.TSlice | main.rs:1427:14:1427:23 | T |
-| main.rs:1428:39:1430:13 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1428:39:1430:13 | { ... } | TRef | main.rs:1427:14:1427:23 | T |
 | main.rs:1429:17:1429:20 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1429:17:1429:20 | self | TRef | {EXTERNAL LOCATION} | [] |
 | main.rs:1429:17:1429:20 | self | TRef.TSlice | main.rs:1427:14:1427:23 | T |
-| main.rs:1432:31:1434:13 | { ... } |  | main.rs:1427:14:1427:23 | T |
 | main.rs:1437:13:1437:13 | s |  | {EXTERNAL LOCATION} | & |
 | main.rs:1437:13:1437:13 | s | TRef | {EXTERNAL LOCATION} | [] |
 | main.rs:1437:13:1437:13 | s | TRef.TSlice | {EXTERNAL LOCATION} | i32 |
 | main.rs:1437:25:1437:34 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:1437:25:1437:34 | &... | TRef | {EXTERNAL LOCATION} | [;] |
 | main.rs:1437:26:1437:34 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:1438:17:1438:17 | s |  | {EXTERNAL LOCATION} | & |
 | main.rs:1438:17:1438:17 | s | TRef | {EXTERNAL LOCATION} | [] |
 | main.rs:1438:17:1438:17 | s | TRef.TSlice | {EXTERNAL LOCATION} | i32 |
-| main.rs:1439:13:1439:13 | x |  | {EXTERNAL LOCATION} | & |
-| main.rs:1439:17:1439:35 | ...::my_method(...) |  | {EXTERNAL LOCATION} | & |
 | main.rs:1439:34:1439:34 | s |  | {EXTERNAL LOCATION} | & |
 | main.rs:1439:34:1439:34 | s | TRef | {EXTERNAL LOCATION} | [] |
 | main.rs:1439:34:1439:34 | s | TRef.TSlice | {EXTERNAL LOCATION} | i32 |
-| main.rs:1440:13:1440:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1440:17:1440:34 | ...::my_func(...) |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1443:26:1443:30 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1443:26:1443:30 | SelfParam | TRef | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:1443:26:1443:30 | SelfParam | TRef.T0 | main.rs:1442:14:1442:23 | T |
 | main.rs:1443:26:1443:30 | SelfParam | TRef.T1 | {EXTERNAL LOCATION} | i32 |
 | main.rs:1443:39:1445:13 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1443:39:1445:13 | { ... } | TRef | main.rs:1442:14:1442:23 | T |
 | main.rs:1444:17:1444:23 | &... |  | {EXTERNAL LOCATION} | & |
 | main.rs:1444:18:1444:21 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1444:18:1444:21 | self | TRef | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:1444:18:1444:21 | self | TRef.T0 | main.rs:1442:14:1442:23 | T |
 | main.rs:1444:18:1444:21 | self | TRef.T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:1447:31:1449:13 | { ... } |  | main.rs:1442:14:1442:23 | T |
 | main.rs:1452:13:1452:13 | p |  | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:1452:17:1452:23 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:1453:17:1453:17 | p |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:1454:13:1454:13 | x |  | {EXTERNAL LOCATION} | & |
-| main.rs:1454:17:1454:39 | ...::my_method(...) |  | {EXTERNAL LOCATION} | & |
 | main.rs:1454:37:1454:38 | &p |  | {EXTERNAL LOCATION} | & |
+| main.rs:1454:37:1454:38 | &p | TRef | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:1454:38:1454:38 | p |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:1455:13:1455:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1455:17:1455:39 | ...::my_func(...) |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1458:26:1458:30 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1458:26:1458:30 | SelfParam | TRef | {EXTERNAL LOCATION} | & |
 | main.rs:1458:26:1458:30 | SelfParam | TRef.TRef | main.rs:1457:14:1457:23 | T |
-| main.rs:1458:39:1460:13 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1458:39:1460:13 | { ... } | TRef | main.rs:1457:14:1457:23 | T |
 | main.rs:1459:18:1459:21 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1459:18:1459:21 | self | TRef | {EXTERNAL LOCATION} | & |
 | main.rs:1459:18:1459:21 | self | TRef.TRef | main.rs:1457:14:1457:23 | T |
-| main.rs:1462:31:1464:13 | { ... } |  | main.rs:1457:14:1457:23 | T |
 | main.rs:1467:13:1467:13 | r |  | {EXTERNAL LOCATION} | & |
 | main.rs:1467:17:1467:19 | &42 |  | {EXTERNAL LOCATION} | & |
 | main.rs:1468:17:1468:17 | r |  | {EXTERNAL LOCATION} | & |
-| main.rs:1469:13:1469:13 | x |  | {EXTERNAL LOCATION} | & |
-| main.rs:1469:17:1469:35 | ...::my_method(...) |  | {EXTERNAL LOCATION} | & |
 | main.rs:1469:33:1469:34 | &r |  | {EXTERNAL LOCATION} | & |
+| main.rs:1469:33:1469:34 | &r | TRef | {EXTERNAL LOCATION} | & |
 | main.rs:1469:34:1469:34 | r |  | {EXTERNAL LOCATION} | & |
-| main.rs:1470:13:1470:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1470:17:1470:33 | ...::my_func(...) |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1473:26:1473:30 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1473:26:1473:30 | SelfParam | TRef | {EXTERNAL LOCATION} | *mut |
 | main.rs:1473:26:1473:30 | SelfParam | TRef.TPtrMut | main.rs:1472:14:1472:23 | T |
 | main.rs:1473:39:1475:13 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1473:39:1475:13 | { ... } | TRef | main.rs:1472:14:1472:23 | T |
+| main.rs:1474:17:1474:34 | { ... } |  | {EXTERNAL LOCATION} | & |
 | main.rs:1474:26:1474:32 | &... |  | {EXTERNAL LOCATION} | & |
 | main.rs:1474:29:1474:32 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1474:29:1474:32 | self | TRef | {EXTERNAL LOCATION} | *mut |
 | main.rs:1474:29:1474:32 | self | TRef.TPtrMut | main.rs:1472:14:1472:23 | T |
-| main.rs:1477:31:1479:13 | { ... } |  | main.rs:1472:14:1472:23 | T |
 | main.rs:1483:13:1483:13 | p |  | {EXTERNAL LOCATION} | *mut |
 | main.rs:1483:13:1483:13 | p | TPtrMut | {EXTERNAL LOCATION} | i32 |
 | main.rs:1483:27:1483:32 | &mut v |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1484:26:1484:26 | p |  | {EXTERNAL LOCATION} | *mut |
 | main.rs:1484:26:1484:26 | p | TPtrMut | {EXTERNAL LOCATION} | i32 |
-| main.rs:1485:26:1485:48 | ...::my_method(...) |  | {EXTERNAL LOCATION} | & |
 | main.rs:1485:46:1485:47 | &p |  | {EXTERNAL LOCATION} | & |
+| main.rs:1485:46:1485:47 | &p | TRef | {EXTERNAL LOCATION} | *mut |
+| main.rs:1485:46:1485:47 | &p | TRef.TPtrMut | {EXTERNAL LOCATION} | i32 |
 | main.rs:1485:47:1485:47 | p |  | {EXTERNAL LOCATION} | *mut |
 | main.rs:1485:47:1485:47 | p | TPtrMut | {EXTERNAL LOCATION} | i32 |
-| main.rs:1486:13:1486:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1486:17:1486:37 | ...::my_func(...) |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1492:16:1504:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1493:13:1493:13 | x |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1493:17:1493:20 | true |  | {EXTERNAL LOCATION} | bool |
@@ -2685,7 +2650,10 @@ inferCertainType
 | main.rs:1494:17:1494:29 | ... \|\| ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1494:25:1494:29 | false |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1498:17:1500:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1499:17:1499:17 | z |  | {EXTERNAL LOCATION} | () |
+| main.rs:1499:22:1499:26 | ... = ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1500:16:1502:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:1501:13:1501:17 | ... = ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1517:30:1519:9 | { ... } |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1518:13:1518:31 | Vec2 {...} |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1525:16:1525:19 | SelfParam |  | main.rs:1510:5:1515:5 | Vec2 |
@@ -2702,9 +2670,11 @@ inferCertainType
 | main.rs:1535:45:1538:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1536:13:1536:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1536:13:1536:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1536:13:1536:27 | ... += ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1536:23:1536:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1537:13:1537:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1537:13:1537:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1537:13:1537:27 | ... += ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1537:23:1537:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1543:16:1543:19 | SelfParam |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1543:22:1543:24 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
@@ -2720,9 +2690,11 @@ inferCertainType
 | main.rs:1553:45:1556:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1554:13:1554:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1554:13:1554:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1554:13:1554:27 | ... -= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1554:23:1554:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1555:13:1555:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1555:13:1555:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1555:13:1555:27 | ... -= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1555:23:1555:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1561:16:1561:19 | SelfParam |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1561:22:1561:24 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
@@ -2738,9 +2710,11 @@ inferCertainType
 | main.rs:1570:45:1573:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1571:13:1571:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1571:13:1571:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1571:13:1571:27 | ... *= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1571:23:1571:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1572:13:1572:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1572:13:1572:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1572:13:1572:27 | ... *= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1572:23:1572:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1578:16:1578:19 | SelfParam |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1578:22:1578:24 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
@@ -2756,9 +2730,11 @@ inferCertainType
 | main.rs:1587:45:1590:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1588:13:1588:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1588:13:1588:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1588:13:1588:27 | ... /= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1588:23:1588:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1589:13:1589:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1589:13:1589:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1589:13:1589:27 | ... /= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1589:23:1589:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1595:16:1595:19 | SelfParam |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1595:22:1595:24 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
@@ -2774,9 +2750,11 @@ inferCertainType
 | main.rs:1604:45:1607:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1605:13:1605:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1605:13:1605:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1605:13:1605:27 | ... %= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1605:23:1605:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1606:13:1606:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1606:13:1606:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1606:13:1606:27 | ... %= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1606:23:1606:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1612:19:1612:22 | SelfParam |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1612:25:1612:27 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
@@ -2792,9 +2770,11 @@ inferCertainType
 | main.rs:1621:48:1624:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1622:13:1622:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1622:13:1622:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1622:13:1622:27 | ... &= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1622:23:1622:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1623:13:1623:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1623:13:1623:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1623:13:1623:27 | ... &= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1623:23:1623:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1629:18:1629:21 | SelfParam |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1629:24:1629:26 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
@@ -2810,9 +2790,11 @@ inferCertainType
 | main.rs:1638:47:1641:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1639:13:1639:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1639:13:1639:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1639:13:1639:27 | ... \|= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1639:23:1639:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1640:13:1640:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1640:13:1640:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1640:13:1640:27 | ... \|= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1640:23:1640:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1646:19:1646:22 | SelfParam |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1646:25:1646:27 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
@@ -2828,9 +2810,11 @@ inferCertainType
 | main.rs:1655:48:1658:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1656:13:1656:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1656:13:1656:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1656:13:1656:27 | ... ^= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1656:23:1656:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1657:13:1657:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1657:13:1657:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1657:13:1657:27 | ... ^= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1657:23:1657:25 | rhs |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1663:16:1663:19 | SelfParam |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1663:22:1663:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
@@ -2846,9 +2830,11 @@ inferCertainType
 | main.rs:1672:44:1675:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1673:13:1673:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1673:13:1673:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1673:13:1673:26 | ... <<= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1673:24:1673:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
 | main.rs:1674:13:1674:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1674:13:1674:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1674:13:1674:26 | ... <<= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1674:24:1674:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
 | main.rs:1680:16:1680:19 | SelfParam |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1680:22:1680:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
@@ -2864,9 +2850,11 @@ inferCertainType
 | main.rs:1689:44:1692:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1690:13:1690:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1690:13:1690:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1690:13:1690:26 | ... >>= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1690:24:1690:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
 | main.rs:1691:13:1691:16 | self |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1691:13:1691:16 | self | TRefMut | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1691:13:1691:26 | ... >>= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1691:24:1691:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
 | main.rs:1697:16:1697:19 | SelfParam |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1697:30:1702:9 | { ... } |  | main.rs:1510:5:1515:5 | Vec2 |
@@ -2914,8 +2902,6 @@ inferCertainType
 | main.rs:1726:24:1726:28 | SelfParam | TRef | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1726:31:1726:35 | other |  | {EXTERNAL LOCATION} | & |
 | main.rs:1726:31:1726:35 | other | TRef | main.rs:1510:5:1515:5 | Vec2 |
-| main.rs:1726:75:1728:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| main.rs:1726:75:1728:9 | { ... } | T | {EXTERNAL LOCATION} | Ordering |
 | main.rs:1727:14:1727:17 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1727:14:1727:17 | self | TRef | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1727:23:1727:26 | self |  | {EXTERNAL LOCATION} | & |
@@ -2991,7 +2977,6 @@ inferCertainType
 | main.rs:1743:44:1743:48 | other | TRef | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1747:26:1747:26 | a |  | main.rs:1747:18:1747:23 | T |
 | main.rs:1747:32:1747:32 | b |  | main.rs:1747:18:1747:23 | T |
-| main.rs:1747:51:1749:5 | { ... } |  | main.rs:1747:18:1747:23 | T::Output[Add] |
 | main.rs:1748:9:1748:9 | a |  | main.rs:1747:18:1747:23 | T |
 | main.rs:1748:13:1748:13 | b |  | main.rs:1747:18:1747:23 | T |
 | main.rs:1751:16:1882:5 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -3022,22 +3007,27 @@ inferCertainType
 | main.rs:1771:17:1771:30 | i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1771:34:1771:38 | 23i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1772:9:1772:22 | i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1772:9:1772:31 | ... += ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1772:27:1772:31 | 24i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1774:17:1774:30 | i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1774:34:1774:38 | 25i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1775:9:1775:22 | i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1775:9:1775:31 | ... -= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1775:27:1775:31 | 26i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1777:17:1777:30 | i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1777:34:1777:38 | 27i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1778:9:1778:22 | i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1778:9:1778:31 | ... *= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1778:27:1778:31 | 28i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1780:17:1780:30 | i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1780:34:1780:38 | 29i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1781:9:1781:22 | i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1781:9:1781:31 | ... /= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1781:27:1781:31 | 30i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1783:17:1783:30 | i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1783:34:1783:38 | 31i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1784:9:1784:22 | i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1784:9:1784:31 | ... %= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1784:27:1784:31 | 32i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1787:26:1787:30 | 33i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1787:34:1787:38 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
@@ -3052,22 +3042,27 @@ inferCertainType
 | main.rs:1794:17:1794:33 | i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1794:37:1794:41 | 43i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1795:9:1795:25 | i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1795:9:1795:34 | ... &= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1795:30:1795:34 | 44i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1797:17:1797:32 | i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1797:36:1797:40 | 45i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1798:9:1798:24 | i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1798:9:1798:33 | ... \|= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1798:29:1798:33 | 46i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1800:17:1800:33 | i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1800:37:1800:41 | 47i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1801:9:1801:25 | i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1801:9:1801:34 | ... ^= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1801:30:1801:34 | 48i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1803:17:1803:30 | i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1803:34:1803:38 | 49i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1804:9:1804:22 | i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1804:9:1804:32 | ... <<= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1804:28:1804:32 | 50i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1806:17:1806:30 | i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1806:34:1806:38 | 51i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1807:9:1807:22 | i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1807:9:1807:32 | ... >>= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1807:28:1807:32 | 52i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1809:24:1809:28 | 53i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1810:24:1810:28 | 54i64 |  | {EXTERNAL LOCATION} | i64 |
@@ -3100,22 +3095,27 @@ inferCertainType
 | main.rs:1832:17:1832:31 | vec2_add_assign |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1832:35:1832:36 | v1 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1833:9:1833:23 | vec2_add_assign |  | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1833:9:1833:29 | ... += ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1833:28:1833:29 | v2 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1835:17:1835:31 | vec2_sub_assign |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1835:35:1835:36 | v1 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1836:9:1836:23 | vec2_sub_assign |  | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1836:9:1836:29 | ... -= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1836:28:1836:29 | v2 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1838:17:1838:31 | vec2_mul_assign |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1838:35:1838:36 | v1 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1839:9:1839:23 | vec2_mul_assign |  | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1839:9:1839:29 | ... *= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1839:28:1839:29 | v2 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1841:17:1841:31 | vec2_div_assign |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1841:35:1841:36 | v1 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1842:9:1842:23 | vec2_div_assign |  | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1842:9:1842:29 | ... /= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1842:28:1842:29 | v2 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1844:17:1844:31 | vec2_rem_assign |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1844:35:1844:36 | v1 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1845:9:1845:23 | vec2_rem_assign |  | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1845:9:1845:29 | ... %= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1845:28:1845:29 | v2 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1848:27:1848:28 | v1 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1848:32:1848:33 | v2 |  | main.rs:1510:5:1515:5 | Vec2 |
@@ -3130,22 +3130,27 @@ inferCertainType
 | main.rs:1855:17:1855:34 | vec2_bitand_assign |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1855:38:1855:39 | v1 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1856:9:1856:26 | vec2_bitand_assign |  | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1856:9:1856:32 | ... &= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1856:31:1856:32 | v2 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1858:17:1858:33 | vec2_bitor_assign |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1858:37:1858:38 | v1 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1859:9:1859:25 | vec2_bitor_assign |  | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1859:9:1859:31 | ... \|= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1859:30:1859:31 | v2 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1861:17:1861:34 | vec2_bitxor_assign |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1861:38:1861:39 | v1 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1862:9:1862:26 | vec2_bitxor_assign |  | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1862:9:1862:32 | ... ^= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1862:31:1862:32 | v2 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1864:17:1864:31 | vec2_shl_assign |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1864:35:1864:36 | v1 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1865:9:1865:23 | vec2_shl_assign |  | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1865:9:1865:32 | ... <<= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1865:29:1865:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
 | main.rs:1867:17:1867:31 | vec2_shr_assign |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1867:35:1867:36 | v1 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1868:9:1868:23 | vec2_shr_assign |  | main.rs:1510:5:1515:5 | Vec2 |
+| main.rs:1868:9:1868:32 | ... >>= ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1868:29:1868:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
 | main.rs:1871:25:1871:26 | v1 |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1872:25:1872:26 | v1 |  | main.rs:1510:5:1515:5 | Vec2 |
@@ -3153,8 +3158,10 @@ inferCertainType
 | main.rs:1881:30:1881:48 | Vec2 {...} |  | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1891:18:1891:21 | SelfParam |  | main.rs:1888:5:1888:14 | S1 |
 | main.rs:1891:24:1891:25 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:1894:25:1896:5 | { ... } |  | main.rs:1888:5:1888:14 | S1 |
+| main.rs:1898:41:1900:5 | { ... } |  | {EXTERNAL LOCATION} | dyn Future |
 | main.rs:1899:9:1899:20 | { ... } |  | {EXTERNAL LOCATION} | dyn Future |
+| main.rs:1902:41:1904:5 | { ... } |  | {EXTERNAL LOCATION} | dyn Future |
+| main.rs:1902:41:1904:5 | { ... } | dyn(Output) | {EXTERNAL LOCATION} | () |
 | main.rs:1903:9:1903:16 | { ... } |  | {EXTERNAL LOCATION} | dyn Future |
 | main.rs:1903:9:1903:16 | { ... } | dyn(Output) | {EXTERNAL LOCATION} | () |
 | main.rs:1912:13:1912:42 | SelfParam |  | {EXTERNAL LOCATION} | Pin |
@@ -3162,14 +3169,7 @@ inferCertainType
 | main.rs:1912:13:1912:42 | SelfParam | Ptr.TRefMut | main.rs:1906:5:1906:14 | S2 |
 | main.rs:1913:13:1913:15 | _cx |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:1913:13:1913:15 | _cx | TRefMut | {EXTERNAL LOCATION} | Context |
-| main.rs:1914:44:1916:9 | { ... } |  | {EXTERNAL LOCATION} | Poll |
-| main.rs:1914:44:1916:9 | { ... } | T | main.rs:1888:5:1888:14 | S1 |
 | main.rs:1923:22:1931:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:1924:9:1924:12 | f1(...) |  | {EXTERNAL LOCATION} | dyn Future |
-| main.rs:1924:9:1924:12 | f1(...) | dyn(Output) | main.rs:1888:5:1888:14 | S1 |
-| main.rs:1925:9:1925:12 | f2(...) |  | main.rs:1898:16:1898:39 | impl ... |
-| main.rs:1926:9:1926:12 | f3(...) |  | main.rs:1902:16:1902:39 | impl ... |
-| main.rs:1927:9:1927:12 | f4(...) |  | main.rs:1919:16:1919:39 | impl ... |
 | main.rs:1929:13:1929:13 | b |  | {EXTERNAL LOCATION} | dyn Future |
 | main.rs:1929:17:1929:28 | { ... } |  | {EXTERNAL LOCATION} | dyn Future |
 | main.rs:1930:9:1930:9 | b |  | {EXTERNAL LOCATION} | dyn Future |
@@ -3189,63 +3189,30 @@ inferCertainType
 | main.rs:1961:18:1961:22 | SelfParam | TRef | main.rs:1960:5:1962:5 | Self [trait MyTrait] |
 | main.rs:1965:18:1965:22 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1965:18:1965:22 | SelfParam | TRef | main.rs:1935:5:1936:14 | S1 |
-| main.rs:1965:31:1967:9 | { ... } |  | main.rs:1937:5:1937:14 | S2 |
 | main.rs:1971:18:1971:22 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1971:18:1971:22 | SelfParam | TRef | main.rs:1938:5:1938:22 | S3 |
 | main.rs:1971:18:1971:22 | SelfParam | TRef.T3 | main.rs:1970:10:1970:17 | T |
-| main.rs:1971:30:1974:9 | { ... } |  | main.rs:1970:10:1970:17 | T |
 | main.rs:1972:25:1972:28 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1972:25:1972:28 | self | TRef | main.rs:1938:5:1938:22 | S3 |
 | main.rs:1972:25:1972:28 | self | TRef.T3 | main.rs:1970:10:1970:17 | T |
 | main.rs:1981:41:1981:41 | t |  | main.rs:1981:26:1981:38 | B |
-| main.rs:1981:52:1983:5 | { ... } |  | main.rs:1981:23:1981:23 | A |
 | main.rs:1982:9:1982:9 | t |  | main.rs:1981:26:1981:38 | B |
 | main.rs:1985:34:1985:34 | x |  | main.rs:1985:24:1985:31 | T |
-| main.rs:1985:59:1987:5 | { ... } |  | main.rs:1985:43:1985:57 | impl ... |
-| main.rs:1985:59:1987:5 | { ... } | impl(T) | main.rs:1985:24:1985:31 | T |
 | main.rs:1986:12:1986:12 | x |  | main.rs:1985:24:1985:31 | T |
 | main.rs:1989:34:1989:34 | x |  | main.rs:1989:24:1989:31 | T |
-| main.rs:1989:67:1991:5 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| main.rs:1989:67:1991:5 | { ... } | T | main.rs:1989:50:1989:64 | impl ... |
-| main.rs:1989:67:1991:5 | { ... } | T.impl(T) | main.rs:1989:24:1989:31 | T |
 | main.rs:1990:17:1990:17 | x |  | main.rs:1989:24:1989:31 | T |
 | main.rs:1993:34:1993:34 | x |  | main.rs:1993:24:1993:31 | T |
 | main.rs:1993:78:1995:5 | { ... } |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:1993:78:1995:5 | { ... } | T0 | main.rs:1993:44:1993:58 | impl ... |
-| main.rs:1993:78:1995:5 | { ... } | T0.impl(T) | main.rs:1993:24:1993:31 | T |
-| main.rs:1993:78:1995:5 | { ... } | T1 | main.rs:1993:61:1993:75 | impl ... |
-| main.rs:1993:78:1995:5 | { ... } | T1.impl(T) | main.rs:1993:24:1993:31 | T |
 | main.rs:1994:9:1994:30 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:1994:13:1994:13 | x |  | main.rs:1993:24:1993:31 | T |
 | main.rs:1994:28:1994:28 | x |  | main.rs:1993:24:1993:31 | T |
 | main.rs:1997:26:1997:26 | t |  | main.rs:1997:29:1997:43 | impl ... |
-| main.rs:1997:51:1999:5 | { ... } |  | main.rs:1997:23:1997:23 | A |
 | main.rs:1998:9:1998:9 | t |  | main.rs:1997:29:1997:43 | impl ... |
 | main.rs:2001:16:2015:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2002:13:2002:13 | x |  | main.rs:1956:16:1956:35 | impl ... + ... |
-| main.rs:2002:17:2002:20 | f1(...) |  | main.rs:1956:16:1956:35 | impl ... + ... |
-| main.rs:2003:9:2003:9 | x |  | main.rs:1956:16:1956:35 | impl ... + ... |
-| main.rs:2004:9:2004:9 | x |  | main.rs:1956:16:1956:35 | impl ... + ... |
-| main.rs:2005:13:2005:13 | a |  | main.rs:1977:28:1977:43 | impl ... |
-| main.rs:2005:17:2005:32 | get_a_my_trait(...) |  | main.rs:1977:28:1977:43 | impl ... |
-| main.rs:2006:32:2006:32 | a |  | main.rs:1977:28:1977:43 | impl ... |
-| main.rs:2007:13:2007:13 | a |  | main.rs:1977:28:1977:43 | impl ... |
-| main.rs:2007:17:2007:32 | get_a_my_trait(...) |  | main.rs:1977:28:1977:43 | impl ... |
-| main.rs:2008:32:2008:32 | a |  | main.rs:1977:28:1977:43 | impl ... |
-| main.rs:2010:17:2010:35 | get_a_my_trait2(...) |  | main.rs:1985:43:1985:57 | impl ... |
-| main.rs:2013:17:2013:35 | get_a_my_trait3(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2013:17:2013:35 | get_a_my_trait3(...) | T | main.rs:1989:50:1989:64 | impl ... |
-| main.rs:2014:17:2014:35 | get_a_my_trait4(...) |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2014:17:2014:35 | get_a_my_trait4(...) | T0 | main.rs:1993:44:1993:58 | impl ... |
-| main.rs:2014:17:2014:35 | get_a_my_trait4(...) | T1 | main.rs:1993:61:1993:75 | impl ... |
 | main.rs:2025:16:2025:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:2025:16:2025:20 | SelfParam | TRef | main.rs:2021:5:2022:13 | S |
-| main.rs:2025:31:2027:9 | { ... } |  | main.rs:2021:5:2022:13 | S |
 | main.rs:2036:26:2038:9 | { ... } |  | main.rs:2030:5:2033:5 | MyVec |
-| main.rs:2036:26:2038:9 | { ... } | T | main.rs:2035:10:2035:10 | T |
 | main.rs:2037:13:2037:38 | MyVec {...} |  | main.rs:2030:5:2033:5 | MyVec |
-| main.rs:2037:27:2037:36 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2037:27:2037:36 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2040:17:2040:25 | SelfParam |  | {EXTERNAL LOCATION} | &mut |
 | main.rs:2040:17:2040:25 | SelfParam | TRefMut | main.rs:2030:5:2033:5 | MyVec |
 | main.rs:2040:17:2040:25 | SelfParam | TRefMut.T | main.rs:2035:10:2035:10 | T |
@@ -3260,7 +3227,6 @@ inferCertainType
 | main.rs:2049:18:2049:22 | SelfParam | TRef.T | main.rs:2045:10:2045:10 | T |
 | main.rs:2049:25:2049:29 | index |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2049:56:2051:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:2049:56:2051:9 | { ... } | TRef | main.rs:2045:10:2045:10 | T |
 | main.rs:2050:13:2050:29 | &... |  | {EXTERNAL LOCATION} | & |
 | main.rs:2050:14:2050:17 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:2050:14:2050:17 | self | TRef | main.rs:2030:5:2033:5 | MyVec |
@@ -3275,28 +3241,22 @@ inferCertainType
 | main.rs:2055:17:2055:21 | slice | TRef.TSlice | main.rs:2021:5:2022:13 | S |
 | main.rs:2058:37:2058:37 | a |  | main.rs:2058:20:2058:34 | T |
 | main.rs:2058:43:2058:43 | b |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2061:5:2063:5 | { ... } |  | main.rs:2058:20:2058:34 | T::Output[Index] |
 | main.rs:2062:9:2062:9 | a |  | main.rs:2058:20:2058:34 | T |
 | main.rs:2062:11:2062:11 | b |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2065:16:2076:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2066:17:2066:19 | vec |  | main.rs:2030:5:2033:5 | MyVec |
-| main.rs:2066:23:2066:34 | ...::new(...) |  | main.rs:2030:5:2033:5 | MyVec |
-| main.rs:2067:9:2067:11 | vec |  | main.rs:2030:5:2033:5 | MyVec |
-| main.rs:2068:9:2068:11 | vec |  | main.rs:2030:5:2033:5 | MyVec |
 | main.rs:2070:13:2070:14 | xs |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2070:13:2070:14 | xs | TArray | main.rs:2021:5:2022:13 | S |
 | main.rs:2070:26:2070:28 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2071:17:2071:18 | xs |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2071:17:2071:18 | xs | TArray | main.rs:2021:5:2022:13 | S |
-| main.rs:2073:29:2073:31 | vec |  | main.rs:2030:5:2033:5 | MyVec |
-| main.rs:2075:9:2075:26 | analyze_slice(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:2075:23:2075:25 | &xs |  | {EXTERNAL LOCATION} | & |
+| main.rs:2075:23:2075:25 | &xs | TRef | {EXTERNAL LOCATION} | [;] |
+| main.rs:2075:23:2075:25 | &xs | TRef.TArray | main.rs:2021:5:2022:13 | S |
 | main.rs:2075:24:2075:25 | xs |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2075:24:2075:25 | xs | TArray | main.rs:2021:5:2022:13 | S |
 | main.rs:2080:16:2082:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2081:25:2081:35 | "Hello, {}" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2081:25:2081:35 | "Hello, {}" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:2081:25:2081:45 | ...::format(...) |  | {EXTERNAL LOCATION} | String |
 | main.rs:2081:38:2081:45 | "World!" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2081:38:2081:45 | "World!" | TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2090:19:2090:22 | SelfParam |  | main.rs:2086:5:2091:5 | Self [trait MyAdd] |
@@ -3308,19 +3268,15 @@ inferCertainType
 | main.rs:2106:19:2106:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2106:25:2106:29 | value |  | {EXTERNAL LOCATION} | & |
 | main.rs:2106:25:2106:29 | value | TRef | {EXTERNAL LOCATION} | i64 |
-| main.rs:2106:46:2108:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2107:14:2107:18 | value |  | {EXTERNAL LOCATION} | & |
 | main.rs:2107:14:2107:18 | value | TRef | {EXTERNAL LOCATION} | i64 |
 | main.rs:2115:19:2115:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2115:25:2115:29 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2115:46:2121:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2116:16:2116:20 | value |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2130:19:2130:22 | SelfParam |  | main.rs:2124:5:2124:19 | S |
 | main.rs:2130:19:2130:22 | SelfParam | T | main.rs:2126:10:2126:17 | T |
 | main.rs:2130:25:2130:29 | other |  | main.rs:2124:5:2124:19 | S |
 | main.rs:2130:25:2130:29 | other | T | main.rs:2126:10:2126:17 | T |
-| main.rs:2130:54:2132:9 | { ... } |  | main.rs:2124:5:2124:19 | S |
-| main.rs:2130:54:2132:9 | { ... } | T | main.rs:2126:10:2126:17 | T::Output[MyAdd] |
 | main.rs:2131:16:2131:19 | self |  | main.rs:2124:5:2124:19 | S |
 | main.rs:2131:16:2131:19 | self | T | main.rs:2126:10:2126:17 | T |
 | main.rs:2131:31:2131:35 | other |  | main.rs:2124:5:2124:19 | S |
@@ -3328,8 +3284,6 @@ inferCertainType
 | main.rs:2139:19:2139:22 | SelfParam |  | main.rs:2124:5:2124:19 | S |
 | main.rs:2139:19:2139:22 | SelfParam | T | main.rs:2135:10:2135:17 | T |
 | main.rs:2139:25:2139:29 | other |  | main.rs:2135:10:2135:17 | T |
-| main.rs:2139:51:2141:9 | { ... } |  | main.rs:2124:5:2124:19 | S |
-| main.rs:2139:51:2141:9 | { ... } | T | main.rs:2135:10:2135:17 | T::Output[MyAdd] |
 | main.rs:2140:16:2140:19 | self |  | main.rs:2124:5:2124:19 | S |
 | main.rs:2140:16:2140:19 | self | T | main.rs:2135:10:2135:17 | T |
 | main.rs:2140:31:2140:35 | other |  | main.rs:2135:10:2135:17 | T |
@@ -3337,8 +3291,6 @@ inferCertainType
 | main.rs:2151:19:2151:22 | SelfParam | T | main.rs:2144:14:2144:14 | T |
 | main.rs:2151:25:2151:29 | other |  | {EXTERNAL LOCATION} | & |
 | main.rs:2151:25:2151:29 | other | TRef | main.rs:2144:14:2144:14 | T |
-| main.rs:2151:55:2153:9 | { ... } |  | main.rs:2124:5:2124:19 | S |
-| main.rs:2151:55:2153:9 | { ... } | T | main.rs:2144:14:2144:14 | T::Output[MyAdd] |
 | main.rs:2152:16:2152:19 | self |  | main.rs:2124:5:2124:19 | S |
 | main.rs:2152:16:2152:19 | self | T | main.rs:2144:14:2144:14 | T |
 | main.rs:2152:31:2152:35 | other |  | {EXTERNAL LOCATION} | & |
@@ -3348,7 +3300,6 @@ inferCertainType
 | main.rs:2163:40:2165:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2164:13:2164:17 | value |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2170:20:2170:24 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2170:41:2176:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2171:16:2171:20 | value |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2181:21:2181:25 | value |  | main.rs:2179:19:2179:19 | T |
 | main.rs:2181:31:2181:31 | x |  | main.rs:2179:5:2182:5 | Self [trait MyFrom2] |
@@ -3363,13 +3314,10 @@ inferCertainType
 | main.rs:2204:15:2204:15 | x |  | main.rs:2202:5:2208:5 | Self [trait MySelfTrait] |
 | main.rs:2207:15:2207:15 | x |  | main.rs:2202:5:2208:5 | Self [trait MySelfTrait] |
 | main.rs:2212:15:2212:15 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2212:31:2214:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2213:13:2213:13 | x |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2217:15:2217:15 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2217:32:2219:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2218:13:2218:13 | x |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2224:15:2224:15 | x |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2224:31:2226:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2229:15:2229:15 | x |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2229:32:2231:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2230:13:2230:13 | x |  | {EXTERNAL LOCATION} | bool |
@@ -3379,6 +3327,7 @@ inferCertainType
 | main.rs:2236:18:2236:21 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2237:9:2237:9 | x |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2237:18:2237:22 | &5i64 |  | {EXTERNAL LOCATION} | & |
+| main.rs:2237:18:2237:22 | &5i64 | TRef | {EXTERNAL LOCATION} | i64 |
 | main.rs:2237:19:2237:22 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2238:9:2238:9 | x |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2238:18:2238:21 | true |  | {EXTERNAL LOCATION} | bool |
@@ -3388,43 +3337,30 @@ inferCertainType
 | main.rs:2241:24:2241:27 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2242:11:2242:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2242:24:2242:28 | &3i64 |  | {EXTERNAL LOCATION} | & |
+| main.rs:2242:24:2242:28 | &3i64 | TRef | {EXTERNAL LOCATION} | i64 |
 | main.rs:2242:25:2242:28 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2244:13:2244:13 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2244:17:2244:35 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2244:30:2244:34 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2245:13:2245:13 | y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2245:17:2245:34 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2245:30:2245:33 | true |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2246:13:2246:13 | z |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2246:38:2246:42 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2247:9:2247:34 | ...::my_from2(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:2247:23:2247:27 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2247:30:2247:33 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2248:9:2248:33 | ...::my_from2(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:2248:23:2248:26 | true |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2248:29:2248:32 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2249:9:2249:38 | ...::my_from2(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:2249:27:2249:31 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2249:34:2249:37 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2251:9:2251:22 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2251:17:2251:21 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2252:9:2252:22 | ...::f2(...) |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2252:17:2252:21 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2253:9:2253:22 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2253:18:2253:21 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2254:9:2254:22 | ...::f2(...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2254:18:2254:21 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2255:9:2255:30 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2255:25:2255:29 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2256:25:2256:29 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2257:9:2257:29 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2257:25:2257:28 | true |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2258:25:2258:28 | true |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2266:26:2268:9 | { ... } |  | main.rs:2263:5:2263:24 | MyCallable |
 | main.rs:2267:13:2267:25 | MyCallable {...} |  | main.rs:2263:5:2263:24 | MyCallable |
 | main.rs:2270:17:2270:21 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:2270:17:2270:21 | SelfParam | TRef | main.rs:2263:5:2263:24 | MyCallable |
-| main.rs:2270:31:2272:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2275:16:2382:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2278:9:2278:29 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2278:18:2278:26 | [...] |  | {EXTERNAL LOCATION} | [;] |
@@ -3432,6 +3368,7 @@ inferCertainType
 | main.rs:2279:9:2279:44 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2279:18:2279:26 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2279:32:2279:40 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| main.rs:2279:32:2279:40 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
 | main.rs:2279:43:2279:44 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2280:9:2280:41 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2280:18:2280:26 | [...] |  | {EXTERNAL LOCATION} | [;] |
@@ -3443,10 +3380,13 @@ inferCertainType
 | main.rs:2283:18:2283:22 | vals1 |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2283:24:2283:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2285:13:2285:17 | vals2 |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2285:13:2285:17 | vals2 | TArray | {EXTERNAL LOCATION} | u16 |
 | main.rs:2285:21:2285:29 | [1u16; 3] |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2285:21:2285:29 | [1u16; 3] | TArray | {EXTERNAL LOCATION} | u16 |
 | main.rs:2285:22:2285:25 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:2286:9:2286:25 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2286:18:2286:22 | vals2 |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2286:18:2286:22 | vals2 | TArray | {EXTERNAL LOCATION} | u16 |
 | main.rs:2286:24:2286:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2288:13:2288:17 | vals3 |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2288:13:2288:17 | vals3 | TArray | {EXTERNAL LOCATION} | u32 |
@@ -3472,10 +3412,12 @@ inferCertainType
 | main.rs:2294:43:2294:47 | "baz" | TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2295:9:2295:29 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2295:18:2295:26 | &strings1 |  | {EXTERNAL LOCATION} | & |
+| main.rs:2295:18:2295:26 | &strings1 | TRef | {EXTERNAL LOCATION} | [;] |
 | main.rs:2295:19:2295:26 | strings1 |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2295:28:2295:29 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2296:9:2296:33 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2296:18:2296:30 | &mut strings1 |  | {EXTERNAL LOCATION} | &mut |
+| main.rs:2296:18:2296:30 | &mut strings1 | TRefMut | {EXTERNAL LOCATION} | [;] |
 | main.rs:2296:23:2296:30 | strings1 |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2296:32:2296:33 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2297:9:2297:28 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
@@ -3483,38 +3425,32 @@ inferCertainType
 | main.rs:2297:27:2297:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2299:13:2299:20 | strings2 |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2300:9:2304:9 | [...] |  | {EXTERNAL LOCATION} | [;] |
-| main.rs:2301:13:2301:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
 | main.rs:2301:26:2301:30 | "foo" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2301:26:2301:30 | "foo" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:2302:13:2302:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
 | main.rs:2302:26:2302:30 | "bar" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2302:26:2302:30 | "bar" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:2303:13:2303:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
 | main.rs:2303:26:2303:30 | "baz" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2303:26:2303:30 | "baz" | TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2305:9:2305:28 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2305:18:2305:25 | strings2 |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2305:27:2305:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2307:13:2307:20 | strings3 |  | {EXTERNAL LOCATION} | & |
+| main.rs:2307:13:2307:20 | strings3 | TRef | {EXTERNAL LOCATION} | [;] |
 | main.rs:2308:9:2312:9 | &... |  | {EXTERNAL LOCATION} | & |
+| main.rs:2308:9:2312:9 | &... | TRef | {EXTERNAL LOCATION} | [;] |
 | main.rs:2308:10:2312:9 | [...] |  | {EXTERNAL LOCATION} | [;] |
-| main.rs:2309:13:2309:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
 | main.rs:2309:26:2309:30 | "foo" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2309:26:2309:30 | "foo" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:2310:13:2310:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
 | main.rs:2310:26:2310:30 | "bar" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2310:26:2310:30 | "bar" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:2311:13:2311:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
 | main.rs:2311:26:2311:30 | "baz" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2311:26:2311:30 | "baz" | TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2313:9:2313:28 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2313:18:2313:25 | strings3 |  | {EXTERNAL LOCATION} | & |
+| main.rs:2313:18:2313:25 | strings3 | TRef | {EXTERNAL LOCATION} | [;] |
 | main.rs:2313:27:2313:28 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2315:13:2315:21 | callables |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2315:25:2315:81 | [...] |  | {EXTERNAL LOCATION} | [;] |
-| main.rs:2315:26:2315:42 | ...::new(...) |  | main.rs:2263:5:2263:24 | MyCallable |
-| main.rs:2315:45:2315:61 | ...::new(...) |  | main.rs:2263:5:2263:24 | MyCallable |
-| main.rs:2315:64:2315:80 | ...::new(...) |  | main.rs:2263:5:2263:24 | MyCallable |
 | main.rs:2316:9:2320:9 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2317:12:2317:20 | callables |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2318:9:2320:9 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -3523,6 +3459,7 @@ inferCertainType
 | main.rs:2324:24:2324:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2325:9:2325:29 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2325:18:2325:26 | [...] |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2325:18:2325:26 | [...] | TArray | {EXTERNAL LOCATION} | Range |
 | main.rs:2325:19:2325:21 | 0u8 |  | {EXTERNAL LOCATION} | u8 |
 | main.rs:2325:19:2325:25 | 0u8..10 |  | {EXTERNAL LOCATION} | Range |
 | main.rs:2325:28:2325:29 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -3550,26 +3487,17 @@ inferCertainType
 | main.rs:2336:25:2336:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2341:9:2341:25 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2341:24:2341:25 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2343:13:2343:18 | vals4a |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2343:13:2343:18 | vals4a | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2343:13:2343:18 | vals4a | T | {EXTERNAL LOCATION} | u16 |
-| main.rs:2343:32:2343:43 | [...] |  | {EXTERNAL LOCATION} | [;] |
-| main.rs:2343:33:2343:36 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2343:22:2343:33 | [...] |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2343:23:2343:26 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:2344:9:2344:26 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2344:18:2344:23 | vals4a |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2344:18:2344:23 | vals4a | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2344:18:2344:23 | vals4a | T | {EXTERNAL LOCATION} | u16 |
 | main.rs:2344:25:2344:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2346:22:2346:33 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2346:23:2346:26 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:2347:9:2347:26 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2347:25:2347:26 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2349:13:2349:17 | vals5 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2349:21:2349:43 | ...::from(...) |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2349:31:2349:42 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2349:32:2349:35 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
 | main.rs:2350:9:2350:25 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2350:18:2350:22 | vals5 |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2350:24:2350:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2352:13:2352:17 | vals6 |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2352:13:2352:17 | vals6 | A | {EXTERNAL LOCATION} | Global |
@@ -3583,65 +3511,34 @@ inferCertainType
 | main.rs:2353:18:2353:22 | vals6 | T | {EXTERNAL LOCATION} | & |
 | main.rs:2353:18:2353:22 | vals6 | T.TRef | {EXTERNAL LOCATION} | u64 |
 | main.rs:2353:24:2353:25 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2355:17:2355:21 | vals7 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2355:17:2355:21 | vals7 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2355:25:2355:34 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2355:25:2355:34 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2356:9:2356:13 | vals7 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2356:9:2356:13 | vals7 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2356:20:2356:22 | 1u8 |  | {EXTERNAL LOCATION} | u8 |
 | main.rs:2357:9:2357:25 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2357:18:2357:22 | vals7 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2357:18:2357:22 | vals7 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2357:24:2357:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2361:17:2364:9 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2361:36:2364:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2362:13:2363:13 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2362:29:2363:13 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2366:17:2366:20 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2366:17:2366:20 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2366:24:2366:55 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2366:24:2366:55 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2367:9:2367:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2367:9:2367:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2367:24:2367:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2367:24:2367:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2367:33:2367:37 | "one" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2367:33:2367:37 | "one" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:2368:9:2368:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2368:9:2368:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2368:24:2368:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2368:24:2368:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2368:33:2368:37 | "two" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2368:33:2368:37 | "two" | TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2369:9:2369:33 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2369:20:2369:23 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2369:20:2369:23 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2369:32:2369:33 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2370:9:2370:37 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2370:22:2370:25 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2370:22:2370:25 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2370:36:2370:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2371:9:2371:42 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2371:13:2371:24 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2371:29:2371:32 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2371:29:2371:32 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2371:41:2371:42 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2372:9:2372:36 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2372:13:2372:24 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:2372:29:2372:33 | &map1 |  | {EXTERNAL LOCATION} | & |
-| main.rs:2372:30:2372:33 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2372:30:2372:33 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2372:35:2372:36 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2376:17:2376:17 | a |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2378:17:2381:9 | while ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2378:23:2378:23 | a |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2379:9:2381:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2380:13:2380:13 | a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2392:40:2394:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2392:40:2394:9 | { ... } | T | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2392:40:2394:9 | { ... } | T.T | main.rs:2391:10:2391:19 | T |
-| main.rs:2396:30:2398:9 | { ... } |  | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2396:30:2398:9 | { ... } | T | main.rs:2391:10:2391:19 | T |
+| main.rs:2380:13:2380:18 | ... += ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:2400:19:2400:22 | SelfParam |  | main.rs:2386:5:2386:20 | S1 |
 | main.rs:2400:19:2400:22 | SelfParam | T | main.rs:2391:10:2391:19 | T |
 | main.rs:2400:33:2402:9 | { ... } |  | main.rs:2386:5:2386:20 | S1 |
@@ -3655,31 +3552,6 @@ inferCertainType
 | main.rs:2418:13:2418:14 | x1 |  | {EXTERNAL LOCATION} | Option |
 | main.rs:2418:13:2418:14 | x1 | T | main.rs:2386:5:2386:20 | S1 |
 | main.rs:2418:13:2418:14 | x1 | T.T | main.rs:2388:5:2389:14 | S2 |
-| main.rs:2418:34:2418:48 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2418:34:2418:48 | ...::assoc_fun(...) | T | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2419:13:2419:14 | x2 |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2419:13:2419:14 | x2 | T | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2419:13:2419:14 | x2 | T.T | main.rs:2388:5:2389:14 | S2 |
-| main.rs:2419:18:2419:38 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2419:18:2419:38 | ...::assoc_fun(...) | T | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2419:18:2419:38 | ...::assoc_fun(...) | T.T | main.rs:2388:5:2389:14 | S2 |
-| main.rs:2420:13:2420:14 | x3 |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2420:13:2420:14 | x3 | T | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2420:13:2420:14 | x3 | T.T | main.rs:2388:5:2389:14 | S2 |
-| main.rs:2420:18:2420:32 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2420:18:2420:32 | ...::assoc_fun(...) | T | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2420:18:2420:32 | ...::assoc_fun(...) | T.T | main.rs:2388:5:2389:14 | S2 |
-| main.rs:2421:13:2421:14 | x4 |  | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2421:13:2421:14 | x4 | T | main.rs:2388:5:2389:14 | S2 |
-| main.rs:2421:18:2421:48 | ...::method(...) |  | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2421:18:2421:48 | ...::method(...) | T | main.rs:2388:5:2389:14 | S2 |
-| main.rs:2421:35:2421:47 | ...::default(...) |  | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2422:13:2422:14 | x5 |  | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2422:13:2422:14 | x5 | T | main.rs:2388:5:2389:14 | S2 |
-| main.rs:2422:18:2422:42 | ...::method(...) |  | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2422:18:2422:42 | ...::method(...) | T | main.rs:2388:5:2389:14 | S2 |
-| main.rs:2422:29:2422:41 | ...::default(...) |  | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2426:21:2426:33 | ...::default(...) |  | main.rs:2388:5:2389:14 | S2 |
 | main.rs:2427:13:2427:15 | x10 |  | main.rs:2409:5:2411:5 | S5 |
 | main.rs:2427:13:2427:15 | x10 | T5 | main.rs:2388:5:2389:14 | S2 |
 | main.rs:2427:19:2430:9 | S5::<...> {...} |  | main.rs:2409:5:2411:5 | S5 |
@@ -3690,52 +3562,16 @@ inferCertainType
 | main.rs:2432:19:2432:33 | S5 {...} |  | main.rs:2409:5:2411:5 | S5 |
 | main.rs:2433:13:2433:15 | x13 |  | main.rs:2409:5:2411:5 | S5 |
 | main.rs:2433:19:2436:9 | S5 {...} |  | main.rs:2409:5:2411:5 | S5 |
-| main.rs:2435:20:2435:32 | ...::default(...) |  | main.rs:2388:5:2389:14 | S2 |
-| main.rs:2437:13:2437:15 | x14 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2437:19:2437:48 | foo::<...>(...) |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2438:13:2438:15 | x15 |  | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2438:13:2438:15 | x15 | T | main.rs:2388:5:2389:14 | S2 |
-| main.rs:2438:19:2438:37 | ...::default(...) |  | main.rs:2386:5:2386:20 | S1 |
-| main.rs:2438:19:2438:37 | ...::default(...) | T | main.rs:2388:5:2389:14 | S2 |
 | main.rs:2447:35:2449:9 | { ... } |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2447:35:2449:9 | { ... } | T0 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2447:35:2449:9 | { ... } | T1 | main.rs:2443:5:2444:16 | S1 |
 | main.rs:2448:13:2448:26 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:2448:14:2448:18 | S1 {...} |  | main.rs:2443:5:2444:16 | S1 |
 | main.rs:2448:21:2448:25 | S1 {...} |  | main.rs:2443:5:2444:16 | S1 |
 | main.rs:2450:16:2450:19 | SelfParam |  | main.rs:2443:5:2444:16 | S1 |
 | main.rs:2450:22:2450:23 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2453:16:2487:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2454:13:2454:13 | a |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2454:13:2454:13 | a | T0 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2454:13:2454:13 | a | T1 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2454:17:2454:30 | ...::get_pair(...) |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2454:17:2454:30 | ...::get_pair(...) | T0 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2454:17:2454:30 | ...::get_pair(...) | T1 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2455:17:2455:17 | b |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2455:17:2455:17 | b | T0 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2455:17:2455:17 | b | T1 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2455:21:2455:34 | ...::get_pair(...) |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2455:21:2455:34 | ...::get_pair(...) | T0 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2455:21:2455:34 | ...::get_pair(...) | T1 | main.rs:2443:5:2444:16 | S1 |
 | main.rs:2456:13:2456:18 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2456:22:2456:35 | ...::get_pair(...) |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2456:22:2456:35 | ...::get_pair(...) | T0 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2456:22:2456:35 | ...::get_pair(...) | T1 | main.rs:2443:5:2444:16 | S1 |
 | main.rs:2457:13:2457:22 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2457:26:2457:39 | ...::get_pair(...) |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2457:26:2457:39 | ...::get_pair(...) | T0 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2457:26:2457:39 | ...::get_pair(...) | T1 | main.rs:2443:5:2444:16 | S1 |
 | main.rs:2458:13:2458:26 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2458:30:2458:43 | ...::get_pair(...) |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2458:30:2458:43 | ...::get_pair(...) | T0 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2458:30:2458:43 | ...::get_pair(...) | T1 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2460:9:2460:9 | a |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2460:9:2460:9 | a | T0 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2460:9:2460:9 | a | T1 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2461:9:2461:9 | b |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2461:9:2461:9 | b | T0 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2461:9:2461:9 | b | T1 | main.rs:2443:5:2444:16 | S1 |
 | main.rs:2474:13:2474:16 | pair |  | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:2474:20:2474:25 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:2475:13:2475:13 | i |  | {EXTERNAL LOCATION} | i64 |
@@ -3744,81 +3580,57 @@ inferCertainType
 | main.rs:2476:23:2476:26 | pair |  | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:2478:20:2478:25 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2480:13:2480:18 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
+| main.rs:2480:23:2480:42 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:2480:30:2480:41 | "unexpected" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2480:30:2480:41 | "unexpected" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:2480:30:2480:41 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:2480:30:2480:41 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2481:18:2481:35 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:2481:25:2481:34 | "expected" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2481:25:2481:34 | "expected" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:2481:25:2481:34 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:2481:25:2481:34 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2485:13:2485:13 | y |  | {EXTERNAL LOCATION} | & |
 | main.rs:2485:17:2485:31 | &... |  | {EXTERNAL LOCATION} | & |
-| main.rs:2485:18:2485:31 | ...::get_pair(...) |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:2485:18:2485:31 | ...::get_pair(...) | T0 | main.rs:2443:5:2444:16 | S1 |
-| main.rs:2485:18:2485:31 | ...::get_pair(...) | T1 | main.rs:2443:5:2444:16 | S1 |
 | main.rs:2486:9:2486:9 | y |  | {EXTERNAL LOCATION} | & |
-| main.rs:2492:27:2514:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2493:13:2493:23 | boxed_value |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2493:13:2493:23 | boxed_value | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2493:27:2493:42 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2493:27:2493:42 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2493:36:2493:41 | 100i32 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2496:15:2496:25 | boxed_value |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2496:15:2496:25 | boxed_value | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2497:24:2499:13 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2498:17:2498:37 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:2498:26:2498:36 | "Boxed 100\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2498:26:2498:36 | "Boxed 100\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:2498:26:2498:36 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2498:26:2498:36 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2498:26:2498:36 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2500:22:2503:13 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2502:17:2502:52 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:2502:26:2502:42 | "Boxed value: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2502:26:2502:42 | "Boxed value: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:2502:26:2502:51 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:2502:26:2502:51 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2507:13:2507:22 | nested_box |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2507:13:2507:22 | nested_box | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2507:26:2507:50 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2507:26:2507:50 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2507:35:2507:49 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2507:35:2507:49 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2502:26:2502:51 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2507:44:2507:48 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2508:15:2508:24 | nested_box |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2508:15:2508:24 | nested_box | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2509:26:2512:13 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2511:17:2511:60 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:2511:26:2511:43 | "Nested boxed: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2511:26:2511:43 | "Nested boxed: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:2511:26:2511:59 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2511:26:2511:59 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2511:26:2511:59 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2523:36:2525:9 | { ... } |  | main.rs:2520:5:2520:22 | Path |
 | main.rs:2524:13:2524:19 | Path {...} |  | main.rs:2520:5:2520:22 | Path |
 | main.rs:2527:29:2527:33 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:2527:29:2527:33 | SelfParam | TRef | main.rs:2520:5:2520:22 | Path |
-| main.rs:2527:59:2529:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2527:59:2529:9 | { ... } | E | {EXTERNAL LOCATION} | () |
-| main.rs:2527:59:2529:9 | { ... } | T | main.rs:2532:5:2532:25 | PathBuf |
-| main.rs:2528:16:2528:29 | ...::new(...) |  | main.rs:2532:5:2532:25 | PathBuf |
 | main.rs:2535:39:2537:9 | { ... } |  | main.rs:2532:5:2532:25 | PathBuf |
 | main.rs:2536:13:2536:22 | PathBuf {...} |  | main.rs:2532:5:2532:25 | PathBuf |
 | main.rs:2545:18:2545:22 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:2545:18:2545:22 | SelfParam | TRef | main.rs:2532:5:2532:25 | PathBuf |
 | main.rs:2545:34:2549:9 | { ... } |  | {EXTERNAL LOCATION} | & |
 | main.rs:2545:34:2549:9 | { ... } | TRef | main.rs:2520:5:2520:22 | Path |
-| main.rs:2547:33:2547:43 | ...::new(...) |  | main.rs:2520:5:2520:22 | Path |
+| main.rs:2547:20:2547:23 | path |  | main.rs:2520:5:2520:22 | Path |
 | main.rs:2548:13:2548:17 | &path |  | {EXTERNAL LOCATION} | & |
+| main.rs:2548:13:2548:17 | &path | TRef | main.rs:2520:5:2520:22 | Path |
+| main.rs:2548:14:2548:17 | path |  | main.rs:2520:5:2520:22 | Path |
 | main.rs:2552:16:2560:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2553:13:2553:17 | path1 |  | main.rs:2520:5:2520:22 | Path |
-| main.rs:2553:21:2553:31 | ...::new(...) |  | main.rs:2520:5:2520:22 | Path |
-| main.rs:2554:21:2554:25 | path1 |  | main.rs:2520:5:2520:22 | Path |
-| main.rs:2557:13:2557:20 | pathbuf1 |  | main.rs:2532:5:2532:25 | PathBuf |
-| main.rs:2557:24:2557:37 | ...::new(...) |  | main.rs:2532:5:2532:25 | PathBuf |
-| main.rs:2558:24:2558:31 | pathbuf1 |  | main.rs:2532:5:2532:25 | PathBuf |
 | main.rs:2565:14:2565:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:2565:14:2565:18 | SelfParam | TRef | main.rs:2564:5:2566:5 | Self [trait MyTrait] |
 | main.rs:2572:14:2572:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:2572:14:2572:18 | SelfParam | TRef | main.rs:2568:5:2569:19 | S |
 | main.rs:2572:14:2572:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2572:28:2574:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2573:13:2573:16 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:2573:13:2573:16 | self | TRef | main.rs:2568:5:2569:19 | S |
 | main.rs:2573:13:2573:16 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
@@ -3826,7 +3638,6 @@ inferCertainType
 | main.rs:2578:14:2578:18 | SelfParam | TRef | main.rs:2568:5:2569:19 | S |
 | main.rs:2578:14:2578:18 | SelfParam | TRef.T | main.rs:2568:5:2569:19 | S |
 | main.rs:2578:14:2578:18 | SelfParam | TRef.T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2578:28:2580:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2579:13:2579:16 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:2579:13:2579:16 | self | TRef | main.rs:2568:5:2569:19 | S |
 | main.rs:2579:13:2579:16 | self | TRef.T | main.rs:2568:5:2569:19 | S |
@@ -3834,53 +3645,40 @@ inferCertainType
 | main.rs:2584:15:2584:19 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:2584:15:2584:19 | SelfParam | TRef | main.rs:2568:5:2569:19 | S |
 | main.rs:2584:15:2584:19 | SelfParam | TRef.T | main.rs:2583:10:2583:16 | T |
-| main.rs:2584:33:2586:9 | { ... } |  | main.rs:2568:5:2569:19 | S |
-| main.rs:2584:33:2586:9 | { ... } | T | main.rs:2568:5:2569:19 | S |
-| main.rs:2584:33:2586:9 | { ... } | T.T | main.rs:2583:10:2583:16 | T |
 | main.rs:2585:17:2585:20 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:2585:17:2585:20 | self | TRef | main.rs:2568:5:2569:19 | S |
 | main.rs:2585:17:2585:20 | self | TRef.T | main.rs:2583:10:2583:16 | T |
 | main.rs:2589:14:2589:14 | b |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2589:48:2606:5 | { ... } |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2589:48:2606:5 | { ... } | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2589:48:2606:5 | { ... } | T | main.rs:2564:5:2566:5 | dyn MyTrait |
-| main.rs:2589:48:2606:5 | { ... } | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
 | main.rs:2590:20:2590:20 | b |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2600:12:2600:12 | b |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2602:13:2602:23 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2602:13:2602:23 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2604:13:2604:23 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2604:13:2604:23 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2610:22:2614:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2611:18:2611:18 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2611:33:2613:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2612:13:2612:13 | x |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2619:11:2619:14 | cond |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2619:30:2627:5 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2621:13:2621:13 | a |  | {EXTERNAL LOCATION} | () |
+| main.rs:2621:17:2625:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2622:13:2624:13 | if cond {...} |  | {EXTERNAL LOCATION} | () |
 | main.rs:2622:16:2622:19 | cond |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2622:21:2624:13 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2630:20:2637:5 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2635:9:2635:30 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:2635:18:2635:26 | "b: {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2635:18:2635:26 | "b: {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:2635:18:2635:29 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:2635:18:2635:29 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2639:20:2641:5 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2635:18:2635:29 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2644:11:2644:14 | cond |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2644:30:2652:5 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2645:13:2645:13 | a |  | {EXTERNAL LOCATION} | () |
 | main.rs:2645:17:2649:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2646:13:2648:13 | if cond {...} |  | {EXTERNAL LOCATION} | () |
 | main.rs:2646:16:2646:19 | cond |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2646:21:2648:13 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2650:9:2650:30 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:2650:18:2650:26 | "a: {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2650:18:2650:26 | "a: {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:2650:18:2650:29 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2650:18:2650:29 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2650:18:2650:29 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2650:29:2650:29 | a |  | {EXTERNAL LOCATION} | () |
 | main.rs:2660:14:2660:17 | SelfParam |  | main.rs:2656:5:2657:13 | S |
 | main.rs:2660:20:2660:21 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2663:41:2665:5 | { ... } |  | main.rs:2663:22:2663:31 | T |
 | main.rs:2667:16:2720:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2669:13:2669:13 | x |  | {EXTERNAL LOCATION} | Option |
 | main.rs:2669:13:2669:13 | x | T | {EXTERNAL LOCATION} | i32 |
@@ -3888,7 +3686,6 @@ inferCertainType
 | main.rs:2673:26:2673:28 | opt | T | main.rs:2673:23:2673:23 | T |
 | main.rs:2673:42:2673:42 | x |  | main.rs:2673:23:2673:23 | T |
 | main.rs:2673:48:2673:49 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2676:9:2676:24 | pin_option(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:2683:13:2683:13 | x |  | main.rs:2678:9:2681:9 | MyEither |
 | main.rs:2683:17:2683:39 | ...::A {...} |  | main.rs:2678:9:2681:9 | MyEither |
 | main.rs:2684:13:2684:13 | x |  | main.rs:2678:9:2681:9 | MyEither |
@@ -3903,7 +3700,6 @@ inferCertainType
 | main.rs:2687:13:2687:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
 | main.rs:2687:17:2689:9 | ...::B::<...> {...} |  | main.rs:2678:9:2681:9 | MyEither |
 | main.rs:2687:17:2689:9 | ...::B::<...> {...} | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2688:20:2688:32 | ...::new(...) |  | {EXTERNAL LOCATION} | String |
 | main.rs:2691:29:2691:29 | e |  | main.rs:2678:9:2681:9 | MyEither |
 | main.rs:2691:29:2691:29 | e | T1 | main.rs:2691:26:2691:26 | T |
 | main.rs:2691:29:2691:29 | e | T2 | {EXTERNAL LOCATION} | String |
@@ -3911,8 +3707,6 @@ inferCertainType
 | main.rs:2691:59:2691:60 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2694:13:2694:13 | x |  | main.rs:2678:9:2681:9 | MyEither |
 | main.rs:2694:17:2696:9 | ...::B {...} |  | main.rs:2678:9:2681:9 | MyEither |
-| main.rs:2695:20:2695:32 | ...::new(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2697:9:2697:27 | pin_my_either(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:2697:23:2697:23 | x |  | main.rs:2678:9:2681:9 | MyEither |
 | main.rs:2700:13:2700:13 | x |  | {EXTERNAL LOCATION} | Result |
 | main.rs:2700:13:2700:13 | x | E | {EXTERNAL LOCATION} | String |
@@ -3922,26 +3716,12 @@ inferCertainType
 | main.rs:2704:29:2704:31 | res | T | main.rs:2704:23:2704:23 | T |
 | main.rs:2704:48:2704:48 | x |  | main.rs:2704:26:2704:26 | E |
 | main.rs:2704:54:2704:55 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2707:9:2707:28 | pin_result(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:2707:23:2707:27 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2709:17:2709:17 | x |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2709:17:2709:17 | x | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2709:21:2709:30 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2709:21:2709:30 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2710:9:2710:9 | x |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2710:9:2710:9 | x | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2713:9:2713:9 | x |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2713:9:2713:9 | x | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2716:9:2716:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2719:9:2719:9 | x |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2719:9:2719:9 | x | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2726:14:2726:17 | SelfParam |  | main.rs:2724:5:2732:5 | Self [trait MyTrait] |
 | main.rs:2729:14:2729:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:2729:14:2729:18 | SelfParam | TRef | main.rs:2724:5:2732:5 | Self [trait MyTrait] |
 | main.rs:2729:21:2729:25 | other |  | {EXTERNAL LOCATION} | & |
 | main.rs:2729:21:2729:25 | other | TRef | main.rs:2724:5:2732:5 | Self [trait MyTrait] |
-| main.rs:2729:44:2731:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:2729:44:2731:9 | { ... } | TRef | main.rs:2724:5:2732:5 | Self [trait MyTrait] |
 | main.rs:2730:13:2730:16 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:2730:13:2730:16 | self | TRef | main.rs:2724:5:2732:5 | Self [trait MyTrait] |
 | main.rs:2736:14:2736:17 | SelfParam |  | {EXTERNAL LOCATION} | i32 |
@@ -3956,7 +3736,7 @@ inferCertainType
 | main.rs:2750:28:2752:9 | { ... } | TRef | main.rs:2748:10:2748:10 | T |
 | main.rs:2751:13:2751:16 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:2751:13:2751:16 | self | TRef | main.rs:2748:10:2748:10 | T |
-| main.rs:2755:25:2759:5 | { ... } |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2757:9:2757:17 | ... = ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:2761:12:2769:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2762:13:2762:13 | x |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2763:13:2763:13 | y |  | {EXTERNAL LOCATION} | & |
@@ -3969,61 +3749,42 @@ inferCertainType
 | main.rs:2783:22:2783:26 | SelfParam | TRef | main.rs:2782:5:2784:5 | Self [trait Container] |
 | main.rs:2786:34:2786:34 | c |  | {EXTERNAL LOCATION} | & |
 | main.rs:2786:34:2786:34 | c | TRef | main.rs:2786:15:2786:31 | T |
-| main.rs:2786:49:2788:5 | { ... } |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2787:9:2787:9 | c |  | {EXTERNAL LOCATION} | & |
 | main.rs:2787:9:2787:9 | c | TRef | main.rs:2786:15:2786:31 | T |
 | main.rs:2791:22:2791:26 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:2791:22:2791:26 | SelfParam | TRef | main.rs:2780:5:2780:21 | Gen |
 | main.rs:2791:22:2791:26 | SelfParam | TRef.T | main.rs:2790:10:2790:17 | GT |
-| main.rs:2791:35:2793:9 | { ... } |  | main.rs:2790:10:2790:17 | GT |
 | main.rs:2792:13:2792:16 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:2792:13:2792:16 | self | TRef | main.rs:2780:5:2780:21 | Gen |
 | main.rs:2792:13:2792:16 | self | TRef.T | main.rs:2790:10:2790:17 | GT |
 | main.rs:2796:15:2800:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2799:17:2799:26 | my_get(...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2799:24:2799:25 | &g |  | {EXTERNAL LOCATION} | & |
-| main.rs:2803:11:2838:1 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2804:5:2804:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2805:5:2805:20 | ...::f(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2806:5:2806:60 | ...::g(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2806:20:2806:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2806:41:2806:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2807:5:2807:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2808:5:2808:41 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2809:5:2809:45 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2810:5:2810:30 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2811:5:2811:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2812:5:2812:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2813:5:2813:32 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2814:5:2814:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2815:5:2815:36 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2816:5:2816:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2817:5:2817:29 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2818:5:2818:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2819:5:2819:24 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2820:5:2820:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2821:5:2821:18 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2822:5:2822:15 | ...::f(...) |  | {EXTERNAL LOCATION} | dyn Future |
-| main.rs:2822:5:2822:15 | ...::f(...) | dyn(Output) | {EXTERNAL LOCATION} | () |
-| main.rs:2823:5:2823:19 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2824:5:2824:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2825:5:2825:14 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2826:5:2826:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2827:5:2827:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2828:5:2828:43 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2829:5:2829:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2830:5:2830:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2831:5:2831:28 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2832:5:2832:23 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2833:5:2833:41 | ...::test_all_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2834:5:2834:49 | ...::box_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2835:5:2835:20 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2836:5:2836:20 | ...::f(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2836:5:2836:20 | ...::f(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2836:5:2836:20 | ...::f(...) | T | main.rs:2564:5:2566:5 | dyn MyTrait |
-| main.rs:2836:5:2836:20 | ...::f(...) | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2836:16:2836:19 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2837:5:2837:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2803:18:2811:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2804:9:2804:12 | arr1 |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2804:9:2804:12 | arr1 | TArray | {EXTERNAL LOCATION} | i32 |
+| main.rs:2804:26:2804:27 | [...] |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2805:9:2805:12 | arr2 |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2805:9:2805:12 | arr2 | TArray | {EXTERNAL LOCATION} | bool |
+| main.rs:2805:16:2805:24 | [true; 0] |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2805:16:2805:24 | [true; 0] | TArray | {EXTERNAL LOCATION} | bool |
+| main.rs:2805:17:2805:20 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2807:9:2807:12 | arr3 |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2807:16:2807:17 | [...] |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2809:21:2809:23 | arr |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2809:21:2809:23 | arr | TArray | main.rs:2809:18:2809:18 | T |
+| main.rs:2809:34:2809:34 | x |  | main.rs:2809:18:2809:18 | T |
+| main.rs:2809:40:2809:41 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2810:15:2810:18 | arr3 |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2825:33:2825:33 | x |  | main.rs:2825:12:2825:13 | T1 |
+| main.rs:2825:40:2825:40 | y |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2825:40:2825:40 | y | T | main.rs:2825:16:2825:30 | T2 |
+| main.rs:2825:55:2825:56 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2827:19:2835:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2834:13:2834:15 | [...] |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2838:11:2874:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2841:20:2841:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2841:41:2841:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2871:16:2871:19 | true |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:4:19:4:23 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:4:19:4:23 | SelfParam | TRef | overloading.rs:2:5:11:5 | Self [trait FirstTrait] |
 | overloading.rs:4:34:6:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
@@ -4032,7 +3793,6 @@ inferCertainType
 | overloading.rs:8:20:8:24 | SelfParam | TRef | overloading.rs:2:5:11:5 | Self [trait FirstTrait] |
 | overloading.rs:14:19:14:23 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:14:19:14:23 | SelfParam | TRef | overloading.rs:12:5:19:5 | Self [trait SecondTrait] |
-| overloading.rs:14:33:16:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:18:20:18:24 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:18:20:18:24 | SelfParam | TRef | overloading.rs:12:5:19:5 | Self [trait SecondTrait] |
 | overloading.rs:24:20:24:24 | SelfParam |  | {EXTERNAL LOCATION} | & |
@@ -4043,7 +3803,6 @@ inferCertainType
 | overloading.rs:30:13:30:16 | true |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:35:20:35:24 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:35:20:35:24 | SelfParam | TRef | overloading.rs:20:5:21:13 | S |
-| overloading.rs:35:34:37:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:43:20:43:24 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:43:20:43:24 | SelfParam | TRef | overloading.rs:40:5:40:14 | S2 |
 | overloading.rs:43:35:45:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
@@ -4051,46 +3810,22 @@ inferCertainType
 | overloading.rs:48:31:50:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:49:13:49:17 | false |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:53:16:70:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| overloading.rs:56:13:56:15 | _b1 |  | {EXTERNAL LOCATION} | bool |
-| overloading.rs:56:19:56:40 | ...::method(...) |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:56:38:56:39 | &s |  | {EXTERNAL LOCATION} | & |
-| overloading.rs:57:13:57:15 | _b2 |  | {EXTERNAL LOCATION} | bool |
-| overloading.rs:57:19:57:47 | ...::method(...) |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:57:45:57:46 | &s |  | {EXTERNAL LOCATION} | & |
-| overloading.rs:58:13:58:15 | _b3 |  | {EXTERNAL LOCATION} | bool |
-| overloading.rs:58:19:58:64 | ...::method(...) |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:58:45:58:63 | &... |  | {EXTERNAL LOCATION} | & |
-| overloading.rs:59:13:59:15 | _b4 |  | {EXTERNAL LOCATION} | bool |
-| overloading.rs:59:19:59:48 | ...::method2(...) |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:59:46:59:47 | &s |  | {EXTERNAL LOCATION} | & |
-| overloading.rs:60:13:60:15 | _b5 |  | {EXTERNAL LOCATION} | bool |
-| overloading.rs:60:19:60:65 | ...::method2(...) |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:60:46:60:64 | &... |  | {EXTERNAL LOCATION} | & |
-| overloading.rs:62:13:62:15 | _n1 |  | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:62:19:62:41 | ...::method(...) |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:62:39:62:40 | &s |  | {EXTERNAL LOCATION} | & |
-| overloading.rs:63:13:63:15 | _n2 |  | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:63:19:63:48 | ...::method(...) |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:63:46:63:47 | &s |  | {EXTERNAL LOCATION} | & |
-| overloading.rs:64:13:64:15 | _n3 |  | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:64:19:64:65 | ...::method(...) |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:64:46:64:64 | &... |  | {EXTERNAL LOCATION} | & |
-| overloading.rs:65:13:65:15 | _n4 |  | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:65:19:65:49 | ...::method2(...) |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:65:47:65:48 | &s |  | {EXTERNAL LOCATION} | & |
-| overloading.rs:66:13:66:15 | _n5 |  | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:66:19:66:66 | ...::method2(...) |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:66:47:66:65 | &... |  | {EXTERNAL LOCATION} | & |
-| overloading.rs:68:9:68:37 | ...::function(...) |  | {EXTERNAL LOCATION} | bool |
-| overloading.rs:69:9:69:38 | ...::function(...) |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:78:26:78:29 | SelfParam |  | overloading.rs:77:5:81:5 | Self [trait OverlappingTrait] |
 | overloading.rs:80:28:80:31 | SelfParam |  | overloading.rs:77:5:81:5 | Self [trait OverlappingTrait] |
 | overloading.rs:80:34:80:35 | s1 |  | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:85:26:85:29 | SelfParam |  | overloading.rs:74:5:75:14 | S1 |
-| overloading.rs:85:38:87:9 | { ... } |  | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:90:28:90:31 | SelfParam |  | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:90:34:90:35 | s1 |  | overloading.rs:74:5:75:14 | S1 |
-| overloading.rs:90:48:92:9 | { ... } |  | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:97:26:97:29 | SelfParam |  | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:97:38:99:9 | { ... } |  | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:98:13:98:16 | self |  | overloading.rs:74:5:75:14 | S1 |
@@ -4099,24 +3834,18 @@ inferCertainType
 | overloading.rs:103:13:103:16 | self |  | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:111:26:111:29 | SelfParam |  | overloading.rs:107:5:107:22 | S2 |
 | overloading.rs:111:26:111:29 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:111:38:113:9 | { ... } |  | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:116:28:116:31 | SelfParam |  | overloading.rs:107:5:107:22 | S2 |
 | overloading.rs:116:28:116:31 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:116:40:118:9 | { ... } |  | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:123:26:123:29 | SelfParam |  | overloading.rs:107:5:107:22 | S2 |
 | overloading.rs:123:26:123:29 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:123:38:125:9 | { ... } |  | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:128:28:128:31 | SelfParam |  | overloading.rs:107:5:107:22 | S2 |
 | overloading.rs:128:28:128:31 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:128:34:128:35 | s1 |  | overloading.rs:74:5:75:14 | S1 |
-| overloading.rs:128:48:130:9 | { ... } |  | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:135:26:135:29 | SelfParam |  | overloading.rs:107:5:107:22 | S2 |
 | overloading.rs:135:26:135:29 | SelfParam | T2 | overloading.rs:74:5:75:14 | S1 |
-| overloading.rs:135:38:137:9 | { ... } |  | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:140:28:140:31 | SelfParam |  | overloading.rs:107:5:107:22 | S2 |
 | overloading.rs:140:28:140:31 | SelfParam | T2 | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:140:34:140:35 | s1 |  | overloading.rs:74:5:75:14 | S1 |
-| overloading.rs:140:48:142:9 | { ... } |  | overloading.rs:74:5:75:14 | S1 |
 | overloading.rs:149:14:149:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:149:14:149:18 | SelfParam | TRef | overloading.rs:148:5:150:5 | Self [trait OverlappingTrait2] |
 | overloading.rs:149:21:149:21 | x |  | {EXTERNAL LOCATION} | & |
@@ -4153,84 +3882,81 @@ inferCertainType
 | overloading.rs:188:14:188:18 | SelfParam | TRef.T5 | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:188:21:188:22 | { ... } |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:197:16:223:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:199:9:199:43 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:199:18:199:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:199:18:199:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| overloading.rs:199:18:199:42 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:199:18:199:42 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:199:18:199:42 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:200:9:200:46 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:200:18:200:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:200:18:200:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| overloading.rs:200:18:200:45 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:200:18:200:45 | { ... } |  | {EXTERNAL LOCATION} | () |
-| overloading.rs:200:26:200:45 | ...::common_method(...) |  | overloading.rs:74:5:75:14 | S1 |
+| overloading.rs:200:18:200:45 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:201:9:201:45 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:201:18:201:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:201:18:201:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| overloading.rs:201:18:201:44 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:201:18:201:44 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:201:18:201:44 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:202:9:202:48 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:202:18:202:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:202:18:202:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| overloading.rs:202:18:202:47 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:202:18:202:47 | { ... } |  | {EXTERNAL LOCATION} | () |
-| overloading.rs:202:26:202:47 | ...::common_method_2(...) |  | overloading.rs:74:5:75:14 | S1 |
+| overloading.rs:202:18:202:47 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:205:9:205:43 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:205:18:205:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:205:18:205:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| overloading.rs:205:18:205:42 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:205:18:205:42 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:205:18:205:42 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:206:9:206:57 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:206:18:206:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:206:18:206:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| overloading.rs:206:18:206:56 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:206:18:206:56 | { ... } |  | {EXTERNAL LOCATION} | () |
-| overloading.rs:206:26:206:56 | ...::common_method(...) |  | overloading.rs:74:5:75:14 | S1 |
+| overloading.rs:206:18:206:56 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:209:9:209:43 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:209:18:209:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:209:18:209:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| overloading.rs:209:18:209:42 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:209:18:209:42 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:209:18:209:42 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:210:9:210:50 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:210:18:210:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:210:18:210:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| overloading.rs:210:18:210:49 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:210:18:210:49 | { ... } |  | {EXTERNAL LOCATION} | () |
-| overloading.rs:210:26:210:49 | ...::common_method(...) |  | overloading.rs:74:5:75:14 | S1 |
+| overloading.rs:210:18:210:49 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:211:9:211:57 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:211:18:211:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:211:18:211:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| overloading.rs:211:18:211:56 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:211:18:211:56 | { ... } |  | {EXTERNAL LOCATION} | () |
-| overloading.rs:211:26:211:56 | ...::common_method(...) |  | overloading.rs:74:5:75:14 | S1 |
+| overloading.rs:211:18:211:56 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:214:9:214:32 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:214:18:214:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:214:18:214:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| overloading.rs:214:18:214:31 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:214:18:214:31 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:214:18:214:31 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:215:9:215:38 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:215:18:215:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:215:18:215:23 | "{:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| overloading.rs:215:18:215:37 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:215:18:215:37 | { ... } |  | {EXTERNAL LOCATION} | () |
-| overloading.rs:215:26:215:37 | ...::m(...) |  | {EXTERNAL LOCATION} | & |
-| overloading.rs:215:26:215:37 | ...::m(...) | TRef | overloading.rs:145:5:146:22 | S3 |
+| overloading.rs:215:18:215:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:215:32:215:33 | &w |  | {EXTERNAL LOCATION} | & |
-| overloading.rs:218:9:218:18 | ...::m(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:218:15:218:17 | &S4 |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:219:12:219:15 | 0i32 |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:220:9:220:24 | ...::m(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:220:15:220:23 | &... |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:220:19:220:22 | 0i32 |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:221:12:221:15 | true |  | {EXTERNAL LOCATION} | bool |
-| overloading.rs:222:9:222:24 | ...::m(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:222:15:222:23 | &... |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:222:19:222:22 | true |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:228:14:228:17 | SelfParam |  | overloading.rs:227:5:229:5 | Self [trait Trait1] |
 | overloading.rs:228:20:228:20 | x |  | overloading.rs:227:18:227:19 | T1 |
 | overloading.rs:233:14:233:17 | SelfParam |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:233:20:233:20 | x |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:233:35:235:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:240:14:240:17 | SelfParam |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:240:20:240:20 | x |  | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:240:35:242:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:246:14:246:17 | SelfParam |  | overloading.rs:245:5:247:5 | Self [trait Trait2] |
 | overloading.rs:246:20:246:20 | x |  | overloading.rs:245:18:245:19 | T1 |
 | overloading.rs:251:14:251:17 | SelfParam |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:251:20:251:20 | x |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:251:35:253:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:258:14:258:17 | SelfParam |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:258:20:258:20 | x |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:258:35:260:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:263:12:270:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:265:21:265:24 | 0i32 |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:266:13:266:13 | z |  | {EXTERNAL LOCATION} | i32 |
@@ -4238,11 +3964,9 @@ inferCertainType
 | overloading.rs:268:13:268:13 | z |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:269:13:269:13 | z |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:269:26:269:29 | 0i32 |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:286:35:288:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:295:35:297:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:296:13:296:16 | true |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:302:14:302:14 | x |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:302:29:304:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:309:14:309:14 | x |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:309:31:311:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:310:13:310:16 | true |  | {EXTERNAL LOCATION} | bool |
@@ -4251,36 +3975,22 @@ inferCertainType
 | overloading.rs:330:14:330:17 | SelfParam |  | overloading.rs:327:5:331:5 | Self [trait MyTrait] |
 | overloading.rs:334:14:334:17 | SelfParam |  | overloading.rs:325:5:325:25 | S |
 | overloading.rs:334:14:334:17 | SelfParam | T | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:334:27:336:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:335:13:335:16 | self |  | overloading.rs:325:5:325:25 | S |
 | overloading.rs:335:13:335:16 | self | T | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:338:14:338:17 | SelfParam |  | overloading.rs:325:5:325:25 | S |
 | overloading.rs:338:14:338:17 | SelfParam | T | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:338:27:340:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:339:13:339:16 | self |  | overloading.rs:325:5:325:25 | S |
 | overloading.rs:339:13:339:16 | self | T | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:344:14:344:17 | SelfParam |  | overloading.rs:325:5:325:25 | S |
 | overloading.rs:344:14:344:17 | SelfParam | T | {EXTERNAL LOCATION} | bool |
-| overloading.rs:344:28:346:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:345:13:345:16 | self |  | overloading.rs:325:5:325:25 | S |
 | overloading.rs:345:13:345:16 | self | T | {EXTERNAL LOCATION} | bool |
 | overloading.rs:352:14:352:17 | SelfParam |  | overloading.rs:325:5:325:25 | S |
 | overloading.rs:352:14:352:17 | SelfParam | T | overloading.rs:349:10:349:10 | T |
-| overloading.rs:352:25:359:9 | { ... } |  | overloading.rs:325:5:325:25 | S |
-| overloading.rs:352:25:359:9 | { ... } | T | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:353:17:353:17 | x |  | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:353:21:353:47 | ...::f(...) |  | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:354:17:354:17 | x |  | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:354:21:354:61 | ...::f(...) |  | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:367:17:370:5 | { ... } |  | overloading.rs:364:5:365:13 | S |
 | overloading.rs:378:17:378:17 | _ |  | overloading.rs:364:5:365:13 | S |
-| overloading.rs:378:31:380:9 | { ... } |  | overloading.rs:372:5:372:14 | S1 |
 | overloading.rs:385:17:385:17 | _ |  | overloading.rs:374:5:374:14 | S2 |
-| overloading.rs:385:32:387:9 | { ... } |  | overloading.rs:372:5:372:14 | S1 |
 | overloading.rs:392:17:392:17 | _ |  | overloading.rs:364:5:365:13 | S |
-| overloading.rs:392:31:394:9 | { ... } |  | overloading.rs:374:5:374:14 | S2 |
 | overloading.rs:397:10:397:10 | b |  | {EXTERNAL LOCATION} | bool |
-| overloading.rs:397:25:401:5 | { ... } |  | overloading.rs:372:5:372:14 | S1 |
 | overloading.rs:398:20:398:20 | b |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:408:16:408:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:408:16:408:20 | SelfParam | TRef | overloading.rs:407:5:410:5 | Self [trait Trait] |
@@ -4297,12 +4007,9 @@ inferCertainType
 | overloading.rs:422:16:422:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:422:16:422:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
 | overloading.rs:422:16:422:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:422:23:426:9 | { ... } |  | {EXTERNAL LOCATION} | () |
-| overloading.rs:423:13:423:24 | ...::foo(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:423:20:423:23 | self |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:423:20:423:23 | self | TRef | overloading.rs:405:5:405:19 | S |
 | overloading.rs:423:20:423:23 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:424:13:424:31 | ...::foo(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:424:27:424:30 | self |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:424:27:424:30 | self | TRef | overloading.rs:405:5:405:19 | S |
 | overloading.rs:424:27:424:30 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
@@ -4312,12 +4019,9 @@ inferCertainType
 | overloading.rs:429:16:429:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:429:16:429:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
 | overloading.rs:429:16:429:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:429:23:433:9 | { ... } |  | {EXTERNAL LOCATION} | () |
-| overloading.rs:430:13:430:24 | ...::bar(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:430:20:430:23 | self |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:430:20:430:23 | self | TRef | overloading.rs:405:5:405:19 | S |
 | overloading.rs:430:20:430:23 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:431:13:431:31 | ...::bar(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:431:27:431:30 | self |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:431:27:431:30 | self | TRef | overloading.rs:405:5:405:19 | S |
 | overloading.rs:431:27:431:30 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
@@ -4327,8 +4031,6 @@ inferCertainType
 | overloading.rs:438:16:438:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:438:16:438:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
 | overloading.rs:438:16:438:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:438:23:442:9 | { ... } |  | {EXTERNAL LOCATION} | () |
-| overloading.rs:440:13:440:31 | ...::foo(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:440:27:440:30 | self |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:440:27:440:30 | self | TRef | overloading.rs:405:5:405:19 | S |
 | overloading.rs:440:27:440:30 | self | TRef.T | {EXTERNAL LOCATION} | i64 |
@@ -4338,8 +4040,6 @@ inferCertainType
 | overloading.rs:445:16:445:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:445:16:445:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
 | overloading.rs:445:16:445:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:445:23:449:9 | { ... } |  | {EXTERNAL LOCATION} | () |
-| overloading.rs:447:13:447:31 | ...::bar(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:447:27:447:30 | self |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:447:27:447:30 | self | TRef | overloading.rs:405:5:405:19 | S |
 | overloading.rs:447:27:447:30 | self | TRef.T | {EXTERNAL LOCATION} | i64 |
@@ -4354,64 +4054,57 @@ inferCertainType
 | overloading.rs:467:14:467:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:467:14:467:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
 | overloading.rs:467:14:467:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:467:28:469:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:473:14:473:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:473:14:473:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
 | overloading.rs:473:14:473:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:473:28:475:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:481:14:481:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:481:14:481:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
 | overloading.rs:481:14:481:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:481:21:481:21 | x |  | overloading.rs:464:5:464:19 | S |
 | overloading.rs:481:21:481:21 | x | T | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:481:48:483:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:489:14:489:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:489:14:489:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
 | overloading.rs:489:14:489:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:489:21:489:21 | x |  | overloading.rs:464:5:464:19 | S |
 | overloading.rs:489:21:489:21 | x | T | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:489:48:491:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:497:14:497:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:497:14:497:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
 | overloading.rs:497:14:497:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:497:21:497:21 | x |  | overloading.rs:464:5:464:19 | S |
 | overloading.rs:497:21:497:21 | x | T | {EXTERNAL LOCATION} | bool |
-| overloading.rs:497:49:499:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:502:36:502:36 | x |  | overloading.rs:502:19:502:33 | T2 |
-| overloading.rs:502:49:504:5 | { ... } |  | overloading.rs:502:15:502:16 | T1 |
 | overloading.rs:503:9:503:9 | x |  | overloading.rs:502:19:502:33 | T2 |
 | overloading.rs:506:38:506:38 | x |  | overloading.rs:506:16:506:17 | T1 |
 | overloading.rs:506:45:506:45 | y |  | overloading.rs:506:20:506:35 | T2 |
-| overloading.rs:506:66:508:5 | { ... } |  | overloading.rs:506:20:506:35 | T2::Output[MyTrait2] |
 | overloading.rs:507:9:507:9 | y |  | overloading.rs:506:20:506:35 | T2 |
 | overloading.rs:507:13:507:13 | x |  | overloading.rs:506:16:506:17 | T1 |
 | overloading.rs:510:15:522:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:513:13:513:13 | z |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:516:13:516:13 | y |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:516:17:516:35 | call_f::<...>(...) |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:519:27:519:30 | 0i32 |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:521:27:521:30 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:13:26:133:1 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| pattern_matching.rs:13:26:133:1 | { ... } | T | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:15:5:18:5 | if ... {...} |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:15:31:18:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:17:9:17:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:17:18:17:25 | "{mesg}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:17:18:17:25 | "{mesg}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:17:18:17:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:17:18:17:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:17:18:17:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:20:23:23:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:22:13:22:30 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:22:22:22:29 | "{mesg}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:22:22:22:29 | "{mesg}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:22:22:22:29 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:22:22:22:29 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:22:22:22:29 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:24:17:24:18 | TupleExpr |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:28:5:28:22 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:28:14:28:21 | "{mesg}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:28:14:28:21 | "{mesg}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:28:14:28:21 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:28:14:28:21 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:28:14:28:21 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:30:5:30:22 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:30:14:30:21 | "{mesg}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:30:14:30:21 | "{mesg}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:30:14:30:21 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:30:14:30:21 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:30:14:30:21 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:32:9:32:14 | value2 |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:32:18:32:26 | &... |  | {EXTERNAL LOCATION} | & |
@@ -4419,18 +4112,20 @@ inferCertainType
 | pattern_matching.rs:33:12:33:22 | &... |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:33:26:33:31 | value2 |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:33:33:36:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:35:9:35:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:35:18:35:25 | "{mesg}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:35:18:35:25 | "{mesg}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:35:18:35:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:35:18:35:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:35:18:35:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:39:5:42:5 | if ... {...} |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:39:16:39:19 | mesg |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:39:30:42:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:40:13:40:16 | mesg |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:40:20:40:23 | mesg |  | {EXTERNAL LOCATION} | & |
+| pattern_matching.rs:41:9:41:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:41:18:41:25 | "{mesg}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:41:18:41:25 | "{mesg}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:41:18:41:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:41:18:41:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:41:18:41:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:41:20:41:23 | mesg |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:45:5:48:5 | if ... {...} |  | {EXTERNAL LOCATION} | () |
@@ -4438,9 +4133,10 @@ inferCertainType
 | pattern_matching.rs:45:36:48:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:46:13:46:16 | mesg |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:46:20:46:23 | mesg |  | {EXTERNAL LOCATION} | & |
+| pattern_matching.rs:47:9:47:26 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:47:18:47:25 | "{mesg}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:47:18:47:25 | "{mesg}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:47:18:47:25 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:47:18:47:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:47:18:47:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:47:20:47:23 | mesg |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:50:13:50:18 | value5 |  | {EXTERNAL LOCATION} | & |
@@ -4481,32 +4177,34 @@ inferCertainType
 | pattern_matching.rs:121:5:123:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:127:13:130:5 | if ... {...} |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:128:5:130:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:168:27:217:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:169:9:169:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:169:17:169:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:171:11:171:15 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:173:15:176:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:174:17:174:29 | literal_match |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:174:33:174:37 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:175:13:175:58 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:175:22:175:42 | "Literal pattern: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:175:22:175:42 | "Literal pattern: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:175:22:175:57 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:175:22:175:57 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:175:22:175:57 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:175:45:175:57 | literal_match |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:177:15:180:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:178:17:178:32 | negative_literal |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:178:36:178:40 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:179:13:179:62 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:179:22:179:43 | "Negative literal: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:179:22:179:43 | "Negative literal: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:179:22:179:61 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:179:22:179:61 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:179:22:179:61 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:179:46:179:61 | negative_literal |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:181:14:184:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:182:17:182:28 | zero_literal |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:182:32:182:36 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:183:13:183:54 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:183:22:183:39 | "Zero literal: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:183:22:183:39 | "Zero literal: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:183:22:183:53 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:183:22:183:53 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:183:22:183:53 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:183:42:183:53 | zero_literal |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:185:14:185:15 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -4516,9 +4214,10 @@ inferCertainType
 | pattern_matching.rs:190:17:193:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:191:17:191:24 | pi_match |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:191:28:191:36 | float_val |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:192:13:192:48 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:192:22:192:37 | "Pi matched: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:192:22:192:37 | "Pi matched: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:192:22:192:47 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:192:22:192:47 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:192:22:192:47 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:192:40:192:47 | pi_match |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:194:14:194:15 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -4535,9 +4234,10 @@ inferCertainType
 | pattern_matching.rs:200:17:200:27 | hello_match | TRef | {EXTERNAL LOCATION} | str |
 | pattern_matching.rs:200:31:200:40 | string_val |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:200:31:200:40 | string_val | TRef | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:201:13:201:55 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:201:22:201:41 | "String literal: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:201:22:201:41 | "String literal: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:201:22:201:54 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:201:22:201:54 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:201:22:201:54 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:201:44:201:54 | hello_match |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:201:44:201:54 | hello_match | TRef | {EXTERNAL LOCATION} | str |
@@ -4549,124 +4249,139 @@ inferCertainType
 | pattern_matching.rs:208:17:211:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:209:17:209:26 | true_match |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:209:30:209:37 | bool_val |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:210:13:210:52 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:210:22:210:39 | "True literal: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:210:22:210:39 | "True literal: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:210:22:210:51 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:210:22:210:51 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:210:22:210:51 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:210:42:210:51 | true_match |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:212:9:212:13 | false |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:212:18:215:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:213:17:213:27 | false_match |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:213:31:213:38 | bool_val |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:214:13:214:54 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:214:22:214:40 | "False literal: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:214:22:214:40 | "False literal: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:214:22:214:53 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:214:22:214:53 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:214:22:214:53 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:214:43:214:53 | false_match |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:219:30:277:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:220:9:220:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:220:17:220:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:223:11:223:15 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:224:14:227:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:226:13:226:59 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:226:22:226:45 | "Identifier pattern: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:226:22:226:45 | "Identifier pattern: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:226:22:226:58 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:226:22:226:58 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:226:22:226:58 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:231:11:231:16 | &value |  | {EXTERNAL LOCATION} | & |
+| pattern_matching.rs:231:11:231:16 | &value | TRef | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:231:12:231:16 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:232:13:232:13 | x |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:232:18:235:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:233:17:233:25 | ref_bound |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:233:29:233:29 | x |  | {EXTERNAL LOCATION} | & |
+| pattern_matching.rs:234:13:234:61 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:234:22:234:49 | "Reference identifier: {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:234:22:234:49 | "Reference identifier: {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:234:22:234:60 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:234:22:234:60 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:234:22:234:60 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:234:52:234:60 | ref_bound |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:239:13:239:25 | mutable_value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:239:29:239:33 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:240:11:240:23 | mutable_value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:241:18:245:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:243:13:243:18 | ... += ... |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:244:13:244:57 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:244:22:244:45 | "Mutable identifier: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:244:22:244:45 | "Mutable identifier: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:244:22:244:56 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:244:22:244:56 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:244:22:244:56 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:249:39:249:43 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:251:35:254:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:253:13:253:60 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:253:22:253:49 | "@ pattern with literal: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:253:22:253:49 | "@ pattern with literal: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:253:22:253:59 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:253:22:253:59 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:253:22:253:59 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:255:40:258:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:257:13:257:64 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:257:22:257:47 | "@ pattern with range: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:257:22:257:47 | "@ pattern with range: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:257:22:257:63 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:257:22:257:63 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:257:22:257:63 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:259:30:262:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:261:13:261:50 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:261:22:261:37 | "Some value: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:261:22:261:37 | "Some value: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:261:22:261:49 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:261:22:261:49 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:261:22:261:49 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:263:27:265:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:264:13:264:34 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:264:22:264:33 | "None value\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:264:22:264:33 | "None value\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:264:22:264:33 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:264:22:264:33 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:264:22:264:33 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:269:13:269:23 | ref_mut_val |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:269:27:269:30 | 5i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:270:11:270:26 | &mut ref_mut_val |  | {EXTERNAL LOCATION} | &mut |
+| pattern_matching.rs:270:11:270:26 | &mut ref_mut_val | TRefMut | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:270:16:270:26 | ref_mut_val |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:271:17:271:17 | x |  | {EXTERNAL LOCATION} | &mut |
 | pattern_matching.rs:271:22:275:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:272:17:272:29 | ref_mut_bound |  | {EXTERNAL LOCATION} | &mut |
 | pattern_matching.rs:272:33:272:33 | x |  | {EXTERNAL LOCATION} | &mut |
+| pattern_matching.rs:273:13:273:32 | ... += ... |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:273:15:273:27 | ref_mut_bound |  | {EXTERNAL LOCATION} | &mut |
+| pattern_matching.rs:274:13:274:39 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:274:22:274:38 | "Ref mut pattern\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:274:22:274:38 | "Ref mut pattern\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:274:22:274:38 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:274:22:274:38 | { ... } |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:279:28:290:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:274:22:274:38 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:280:9:280:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:280:17:280:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:282:11:282:15 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:283:15:283:40 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:283:24:283:39 | "Specific match\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:283:24:283:39 | "Specific match\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:283:24:283:39 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:283:24:283:39 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:285:14:288:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:286:17:286:32 | wildcard_context |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:286:36:286:40 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:287:13:287:66 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:287:22:287:47 | "Wildcard pattern for: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:287:22:287:47 | "Wildcard pattern for: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:287:22:287:65 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:287:22:287:65 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:287:22:287:65 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:287:50:287:65 | wildcard_context |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:292:25:324:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:293:9:293:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:293:17:293:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:295:11:295:15 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:297:19:300:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:298:17:298:31 | range_inclusive |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:298:35:298:39 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:299:13:299:60 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:299:22:299:42 | "Range inclusive: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:299:22:299:42 | "Range inclusive: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:299:22:299:59 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:299:22:299:59 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:299:22:299:59 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:299:45:299:59 | range_inclusive |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:301:17:304:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:302:17:302:26 | range_from |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:302:30:302:34 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:303:13:303:53 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:303:22:303:40 | "Range from 11: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:303:22:303:40 | "Range from 11: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:303:22:303:52 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:303:22:303:52 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:303:22:303:52 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:303:43:303:52 | range_from |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:305:17:308:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:306:17:306:34 | range_to_inclusive |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:306:38:306:42 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:307:13:307:68 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:307:22:307:47 | "Range to 0 inclusive: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:307:22:307:47 | "Range to 0 inclusive: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:307:22:307:67 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:307:22:307:67 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:307:22:307:67 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:307:50:307:67 | range_to_inclusive |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:309:14:309:15 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -4678,9 +4393,10 @@ inferCertainType
 | pattern_matching.rs:314:22:317:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:315:17:315:30 | lowercase_char |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:315:34:315:41 | char_val |  | {EXTERNAL LOCATION} | char |
+| pattern_matching.rs:316:13:316:58 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:316:22:316:41 | "Lowercase char: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:316:22:316:41 | "Lowercase char: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:316:22:316:57 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:316:22:316:57 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:316:22:316:57 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:316:44:316:57 | lowercase_char |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:318:9:318:11 | 'A' |  | {EXTERNAL LOCATION} | char |
@@ -4688,58 +4404,64 @@ inferCertainType
 | pattern_matching.rs:318:22:321:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:319:17:319:30 | uppercase_char |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:319:34:319:41 | char_val |  | {EXTERNAL LOCATION} | char |
+| pattern_matching.rs:320:13:320:58 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:320:22:320:41 | "Uppercase char: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:320:22:320:41 | "Uppercase char: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:320:22:320:57 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:320:22:320:57 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:320:22:320:57 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:320:44:320:57 | uppercase_char |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:322:14:322:15 | { ... } |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:326:29:355:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:327:9:327:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:327:17:327:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:328:13:328:25 | mutable_value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:328:29:328:33 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:331:11:331:16 | &value |  | {EXTERNAL LOCATION} | & |
+| pattern_matching.rs:331:11:331:16 | &value | TRef | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:331:12:331:16 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:332:9:332:11 | &42 |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:332:16:335:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:333:17:333:27 | deref_match |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:333:31:333:35 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:334:13:334:59 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:334:22:334:45 | "Dereferenced match: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:334:22:334:45 | "Dereferenced match: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:334:22:334:58 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:334:22:334:58 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:334:22:334:58 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:334:48:334:58 | deref_match |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:336:9:336:10 | &... |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:336:15:339:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:338:13:338:61 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:338:22:338:47 | "Dereferenced binding: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:338:22:338:47 | "Dereferenced binding: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:338:22:338:60 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:338:22:338:60 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:338:22:338:60 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:342:11:342:28 | &mut mutable_value |  | {EXTERNAL LOCATION} | &mut |
+| pattern_matching.rs:342:11:342:28 | &mut mutable_value | TRefMut | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:342:16:342:28 | mutable_value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:343:9:343:18 | &mut ... |  | {EXTERNAL LOCATION} | &mut |
 | pattern_matching.rs:343:18:343:18 | x |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:343:23:346:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:344:17:344:29 | mut_ref_bound |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:344:33:344:33 | x |  | {EXTERNAL LOCATION} | & |
+| pattern_matching.rs:345:13:345:62 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:345:22:345:46 | "Mutable ref pattern: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:345:22:345:46 | "Mutable ref pattern: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:345:22:345:61 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:345:22:345:61 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:345:22:345:61 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:345:49:345:61 | mut_ref_bound |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:349:11:349:16 | &value |  | {EXTERNAL LOCATION} | & |
+| pattern_matching.rs:349:11:349:16 | &value | TRef | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:349:12:349:16 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:350:13:350:13 | x |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:350:18:353:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:351:17:351:27 | ref_pattern |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:351:31:351:31 | x |  | {EXTERNAL LOCATION} | & |
+| pattern_matching.rs:352:13:352:58 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:352:22:352:44 | "Reference pattern: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:352:22:352:44 | "Reference pattern: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:352:22:352:57 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:352:22:352:57 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:352:22:352:57 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:352:47:352:57 | ref_pattern |  | {EXTERNAL LOCATION} | & |
-| pattern_matching.rs:357:26:398:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:358:9:358:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:358:17:358:38 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:361:11:361:15 | point |  | pattern_matching.rs:135:1:140:1 | Point |
@@ -4747,70 +4469,79 @@ inferCertainType
 | pattern_matching.rs:362:33:365:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:363:17:363:22 | origin |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:363:26:363:30 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:364:13:364:50 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:364:22:364:41 | "Origin point: {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:364:22:364:41 | "Origin point: {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:364:22:364:49 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:364:22:364:49 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:364:22:364:49 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:364:44:364:49 | origin |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:366:9:366:25 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:366:30:370:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:368:17:368:28 | x_axis_point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:368:32:368:36 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:369:13:369:81 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:369:22:369:56 | "Point on x-axis: x={}, point=... |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:369:22:369:56 | "Point on x-axis: x={}, point=... | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:369:22:369:80 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:369:22:369:80 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:369:22:369:80 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:369:69:369:80 | x_axis_point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:371:9:371:27 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:371:32:374:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:372:17:372:27 | ten_x_point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:372:31:372:35 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:373:13:373:58 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:373:22:373:44 | "Point with x=10: {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:373:22:373:44 | "Point with x=10: {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:373:22:373:57 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:373:22:373:57 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:373:22:373:57 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:373:47:373:57 | ten_x_point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:375:9:375:22 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:375:27:379:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:378:13:378:69 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:378:22:378:46 | "General point: ({}, {})\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:378:22:378:46 | "General point: ({}, {})\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:378:22:378:68 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:378:22:378:68 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:378:22:378:68 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:383:9:383:13 | shape |  | pattern_matching.rs:145:1:150:1 | Shape |
 | pattern_matching.rs:383:17:386:5 | ...::Rectangle {...} |  | pattern_matching.rs:145:1:150:1 | Shape |
 | pattern_matching.rs:387:11:387:15 | shape |  | pattern_matching.rs:145:1:150:1 | Shape |
 | pattern_matching.rs:388:9:391:9 | ...::Rectangle {...} |  | pattern_matching.rs:145:1:150:1 | Shape |
 | pattern_matching.rs:391:14:395:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:394:13:394:65 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:394:22:394:39 | "Rectangle: {}x{}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:394:22:394:39 | "Rectangle: {}x{}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:394:22:394:64 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:394:22:394:64 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:394:22:394:64 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:396:14:396:15 | { ... } |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:400:32:441:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:405:29:408:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:407:13:407:49 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:407:22:407:37 | "Pure red: {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:407:22:407:37 | "Pure red: {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:407:22:407:48 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:407:22:407:48 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:407:22:407:48 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:409:27:417:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:413:13:416:13 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:414:17:414:37 | "Color: ({}, {}, {})\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:414:17:414:37 | "Color: ({}, {}, {})\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:414:17:415:62 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:414:17:415:62 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:414:17:415:62 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:422:27:425:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:424:13:424:58 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:424:22:424:42 | "Reddish color: {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:424:22:424:42 | "Reddish color: {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:424:22:424:57 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:424:22:424:57 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:424:22:424:57 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:426:25:429:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:428:13:428:55 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:428:22:428:45 | "Any color with red: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:428:22:428:45 | "Any color with red: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:428:22:428:54 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:428:22:428:54 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:428:22:428:54 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:436:23:439:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:438:13:438:50 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:438:22:438:34 | "Wrapped: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:438:22:438:34 | "Wrapped: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:438:22:438:49 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:438:22:438:49 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:438:22:438:49 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:443:25:498:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:444:9:444:13 | tuple |  | {EXTERNAL LOCATION} | (T_3) |
@@ -4823,22 +4554,25 @@ inferCertainType
 | pattern_matching.rs:448:24:451:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:449:17:449:27 | exact_tuple |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:449:31:449:35 | tuple |  | {EXTERNAL LOCATION} | (T_3) |
+| pattern_matching.rs:450:13:450:54 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:450:22:450:40 | "Exact tuple: {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:450:22:450:40 | "Exact tuple: {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:450:22:450:53 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:450:22:450:53 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:450:22:450:53 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:450:43:450:53 | exact_tuple |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:452:9:452:17 | TuplePat |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:452:22:457:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:456:13:456:80 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:456:22:456:42 | "Tuple: ({}, {}, {})\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:456:22:456:42 | "Tuple: ({}, {}, {})\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:456:22:456:79 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:456:22:456:79 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:456:22:456:79 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:461:11:461:15 | tuple |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:462:24:465:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:464:13:464:54 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:464:22:464:40 | "First element: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:464:22:464:40 | "First element: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:464:22:464:53 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:464:22:464:53 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:464:22:464:53 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:469:9:469:12 | unit |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:469:16:469:17 | TupleExpr |  | {EXTERNAL LOCATION} | () |
@@ -4847,26 +4581,32 @@ inferCertainType
 | pattern_matching.rs:471:15:474:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:472:17:472:26 | unit_value |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:472:30:472:33 | unit |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:473:13:473:52 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:473:22:473:39 | "Unit value: {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:473:22:473:39 | "Unit value: {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:473:22:473:51 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:473:22:473:51 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:473:22:473:51 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:473:42:473:51 | unit_value |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:478:9:478:14 | single |  | {EXTERNAL LOCATION} | (T_1) |
+| pattern_matching.rs:478:9:478:14 | single | T0 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:478:18:478:25 | TupleExpr |  | {EXTERNAL LOCATION} | (T_1) |
+| pattern_matching.rs:478:18:478:25 | TupleExpr | T0 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:478:19:478:23 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:479:11:479:16 | single |  | {EXTERNAL LOCATION} | (T_1) |
+| pattern_matching.rs:479:11:479:16 | single | T0 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:480:9:480:12 | TuplePat |  | {EXTERNAL LOCATION} | (T_1) |
 | pattern_matching.rs:480:17:483:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:482:13:482:61 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:482:22:482:47 | "Single element tuple: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:482:22:482:47 | "Single element tuple: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:482:22:482:60 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:482:22:482:60 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:482:22:482:60 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:487:9:487:18 | ref_tuple1 |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:487:9:487:18 | ref_tuple1 | TRef | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:487:9:487:18 | ref_tuple1 | TRef.T0 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:487:9:487:18 | ref_tuple1 | TRef.T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:487:35:487:41 | &... |  | {EXTERNAL LOCATION} | & |
+| pattern_matching.rs:487:35:487:41 | &... | TRef | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:487:36:487:41 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:488:5:491:5 | if ... {...} |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:488:12:488:17 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
@@ -4875,41 +4615,46 @@ inferCertainType
 | pattern_matching.rs:488:21:488:30 | ref_tuple1 | TRef.T0 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:488:21:488:30 | ref_tuple1 | TRef.T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:488:32:491:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:489:9:489:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:489:18:489:24 | "n: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:489:18:489:24 | "n: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:489:18:489:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:489:18:489:27 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:489:18:489:27 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:490:9:490:28 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:490:18:490:24 | "m: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:490:18:490:24 | "m: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:490:18:490:27 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:490:18:490:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:490:18:490:27 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:494:9:494:18 | ref_tuple2 |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:494:9:494:18 | ref_tuple2 | TRef | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:494:9:494:18 | ref_tuple2 | TRef.T0 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:494:9:494:18 | ref_tuple2 | TRef.T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:494:35:494:41 | &... |  | {EXTERNAL LOCATION} | & |
+| pattern_matching.rs:494:35:494:41 | &... | TRef | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:494:36:494:41 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:495:9:495:14 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:495:18:495:27 | ref_tuple2 |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:495:18:495:27 | ref_tuple2 | TRef | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:495:18:495:27 | ref_tuple2 | TRef.T0 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:495:18:495:27 | ref_tuple2 | TRef.T1 | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:496:5:496:24 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:496:14:496:20 | "n: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:496:14:496:20 | "n: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:496:14:496:23 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:496:14:496:23 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:496:14:496:23 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:497:5:497:24 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:497:14:497:20 | "m: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:497:14:497:20 | "m: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:497:14:497:23 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:497:14:497:23 | { ... } |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:500:33:520:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:497:14:497:23 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:501:9:501:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:501:17:501:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:504:11:504:15 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:505:16:508:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:507:13:507:62 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:507:22:507:48 | "Parenthesized pattern: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:507:22:507:48 | "Parenthesized pattern: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:507:22:507:61 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:507:22:507:61 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:507:22:507:61 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:512:9:512:13 | tuple |  | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:512:17:512:28 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
@@ -4918,15 +4663,16 @@ inferCertainType
 | pattern_matching.rs:513:11:513:15 | tuple |  | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:514:9:514:16 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:514:21:518:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:517:13:517:72 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:517:22:517:53 | "Parenthesized in tuple: {}, {... |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:517:22:517:53 | "Parenthesized in tuple: {}, {... | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:517:22:517:71 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:517:22:517:71 | { ... } |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:522:25:563:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:517:22:517:71 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:523:9:523:13 | slice |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:523:9:523:13 | slice | TRef | {EXTERNAL LOCATION} | [] |
 | pattern_matching.rs:523:9:523:13 | slice | TRef.TSlice | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:523:25:523:40 | &... |  | {EXTERNAL LOCATION} | & |
+| pattern_matching.rs:523:25:523:40 | &... | TRef | {EXTERNAL LOCATION} | [;] |
 | pattern_matching.rs:523:26:523:40 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | pattern_matching.rs:526:11:526:15 | slice |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:526:11:526:15 | slice | TRef | {EXTERNAL LOCATION} | [] |
@@ -4938,89 +4684,100 @@ inferCertainType
 | pattern_matching.rs:528:31:528:35 | slice |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:528:31:528:35 | slice | TRef | {EXTERNAL LOCATION} | [] |
 | pattern_matching.rs:528:31:528:35 | slice | TRef.TSlice | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:529:13:529:54 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:529:22:529:40 | "Empty slice: {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:529:22:529:40 | "Empty slice: {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:529:22:529:53 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:529:22:529:53 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:529:22:529:53 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:529:43:529:53 | empty_slice |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:529:43:529:53 | empty_slice | TRef | {EXTERNAL LOCATION} | [] |
 | pattern_matching.rs:529:43:529:53 | empty_slice | TRef.TSlice | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:531:16:534:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:533:13:533:55 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:533:22:533:41 | "Single element: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:533:22:533:41 | "Single element: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:533:22:533:54 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:533:22:533:54 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:533:22:533:54 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:535:28:539:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:538:13:538:71 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:538:22:538:43 | "Two elements: {}, {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:538:22:538:43 | "Two elements: {}, {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:538:22:538:70 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:538:22:538:70 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:538:22:538:70 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:540:39:550:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:544:13:549:13 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:545:17:545:53 | "First: {}, last: {}, middle l... |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:545:17:545:53 | "First: {}, last: {}, middle l... | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:545:17:548:34 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:545:17:548:34 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:545:17:548:34 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:554:9:554:13 | array |  | {EXTERNAL LOCATION} | [;] |
 | pattern_matching.rs:554:17:554:28 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | pattern_matching.rs:554:18:554:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:555:11:555:15 | array |  | {EXTERNAL LOCATION} | [;] |
 | pattern_matching.rs:556:22:561:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:560:13:560:71 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:560:22:560:49 | "Array elements: {}, {}, {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:560:22:560:49 | "Array elements: {}, {}, {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:560:22:560:70 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:560:22:560:70 | { ... } |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:565:24:601:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:560:22:560:70 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:567:11:567:18 | CONSTANT |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:568:9:568:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:568:17:568:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:570:11:570:15 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:571:21:574:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:572:17:572:27 | const_match |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:572:31:572:35 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:573:13:573:57 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:573:22:573:43 | "Matches constant: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:573:22:573:43 | "Matches constant: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:573:22:573:56 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:573:22:573:56 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:573:22:573:56 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:573:46:573:56 | const_match |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:575:14:575:15 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:579:33:579:37 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:581:27:583:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:582:13:582:36 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:582:22:582:35 | "None variant\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:582:22:582:35 | "None variant\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:582:22:582:35 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:582:22:582:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:582:22:582:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:584:30:587:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:586:13:586:50 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:586:22:586:37 | "Some value: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:586:22:586:37 | "Some value: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:586:22:586:49 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:586:22:586:49 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:586:22:586:49 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:592:39:595:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:594:13:594:46 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:594:22:594:35 | "Ok value: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:594:22:594:35 | "Ok value: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:594:22:594:45 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:594:22:594:45 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:594:22:594:45 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:596:40:599:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:598:13:598:44 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:598:22:598:32 | "Error: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:598:22:598:32 | "Error: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:598:22:598:43 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:598:22:598:43 | { ... } |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:603:22:638:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:598:22:598:43 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:604:9:604:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:604:17:604:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:607:11:607:15 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:608:22:611:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:609:17:609:25 | small_num |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:609:29:609:33 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:610:13:610:51 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:610:22:610:39 | "Small number: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:610:22:610:39 | "Small number: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:610:22:610:50 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:610:22:610:50 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:610:22:610:50 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:610:42:610:50 | small_num |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:612:20:615:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:613:17:613:25 | round_num |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:613:29:613:33 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:614:13:614:51 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:614:22:614:39 | "Round number: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:614:22:614:39 | "Round number: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:614:22:614:50 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:614:22:614:50 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:614:22:614:50 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:614:42:614:50 | round_num |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:616:14:616:15 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -5030,22 +4787,23 @@ inferCertainType
 | pattern_matching.rs:622:9:622:29 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:622:33:622:53 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:622:58:626:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:625:13:625:63 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:625:22:625:46 | "Point on axis: ({}, {})\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:625:22:625:46 | "Point on axis: ({}, {})\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:625:22:625:62 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:625:22:625:62 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:625:22:625:62 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:627:14:627:15 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:631:11:631:15 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:632:30:635:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:633:17:633:30 | range_or_value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:633:34:633:38 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:634:13:634:52 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:634:22:634:35 | "In range: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:634:22:634:35 | "In range: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:634:22:634:51 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:634:22:634:51 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:634:22:634:51 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:634:38:634:51 | range_or_value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:636:14:636:15 | { ... } |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:640:24:674:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:641:9:641:13 | tuple |  | {EXTERNAL LOCATION} | (T_4) |
 | pattern_matching.rs:641:17:641:41 | TupleExpr |  | {EXTERNAL LOCATION} | (T_4) |
 | pattern_matching.rs:641:18:641:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
@@ -5054,30 +4812,34 @@ inferCertainType
 | pattern_matching.rs:641:38:641:40 | 4u8 |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:644:11:644:15 | tuple |  | {EXTERNAL LOCATION} | (T_4) |
 | pattern_matching.rs:645:24:648:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:647:13:647:55 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:647:22:647:42 | "First with rest: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:647:22:647:42 | "First with rest: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:647:22:647:54 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:647:22:647:54 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:647:22:647:54 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:651:11:651:15 | tuple |  | {EXTERNAL LOCATION} | (T_4) |
 | pattern_matching.rs:652:23:655:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:654:13:654:53 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:654:22:654:41 | "Last with rest: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:654:22:654:41 | "Last with rest: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:654:22:654:52 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:654:22:654:52 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:654:22:654:52 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:658:11:658:15 | tuple |  | {EXTERNAL LOCATION} | (T_4) |
 | pattern_matching.rs:659:30:663:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:662:13:662:68 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:662:22:662:45 | "First and last: {}, {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:662:22:662:45 | "First and last: {}, {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:662:22:662:67 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:662:22:662:67 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:662:22:662:67 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:667:9:667:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:667:17:667:38 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:668:11:668:15 | point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:669:9:669:23 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:669:28:672:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:671:13:671:48 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:671:22:671:39 | "X coordinate: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:671:22:671:39 | "X coordinate: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:671:22:671:47 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:671:22:671:47 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:671:22:671:47 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:676:25:696:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:694:21:694:25 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
@@ -5086,7 +4848,6 @@ inferCertainType
 | pattern_matching.rs:695:21:695:25 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:695:21:695:25 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:695:21:695:25 | { ... } |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:698:34:724:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:700:9:700:20 | complex_data |  | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:700:24:700:79 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:700:25:700:44 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
@@ -5094,23 +4855,26 @@ inferCertainType
 | pattern_matching.rs:704:9:704:61 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:704:10:704:26 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:704:66:712:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:708:13:711:13 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:709:17:709:57 | "Complex nested: y={}, green={... |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:709:17:709:57 | "Complex nested: y={}, green={... | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:709:17:710:44 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:709:17:710:44 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:709:17:710:44 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:714:9:714:41 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:714:10:714:24 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:714:45:714:71 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:714:46:714:67 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:714:76:717:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:716:13:716:66 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:716:22:716:50 | "Alternative complex: x={:?}\\n... |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:716:22:716:50 | "Alternative complex: x={:?}\\n... | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:716:22:716:65 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:716:22:716:65 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:716:22:716:65 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:719:18:722:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:721:13:721:63 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:721:22:721:47 | "Other complex data: {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:721:22:721:47 | "Other complex data: {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:721:22:721:62 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:721:22:721:62 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:721:22:721:62 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:726:37:758:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:728:9:728:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
@@ -5144,60 +4908,49 @@ inferCertainType
 | pattern_matching.rs:760:42:789:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:763:22:763:35 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:763:59:767:5 | { ... } |  | {EXTERNAL LOCATION} | (T_2) |
-| pattern_matching.rs:763:59:767:5 | { ... } | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:763:59:767:5 | { ... } | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:766:9:766:26 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
 | pattern_matching.rs:769:22:769:35 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:769:51:772:5 | { ... } |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:774:22:774:38 | TuplePat |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:774:22:774:38 | TuplePat | T0 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:774:22:774:38 | TuplePat | T1 | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:774:22:774:38 | TuplePat | T2 | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:774:23:774:27 | first |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:774:30:774:30 | _ |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:774:33:774:37 | third |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:774:74:778:5 | { ... } |  | {EXTERNAL LOCATION} | (T_2) |
-| pattern_matching.rs:774:74:778:5 | { ... } | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:774:74:778:5 | { ... } | T1 | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:775:13:775:23 | param_first |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:775:27:775:31 | first |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:776:13:776:23 | param_third |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:776:27:776:31 | third |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:777:9:777:34 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
+| pattern_matching.rs:777:10:777:20 | param_first |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:777:23:777:33 | param_third |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:781:9:781:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:781:17:781:37 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:782:9:782:17 | extracted |  | {EXTERNAL LOCATION} | (T_2) |
-| pattern_matching.rs:782:9:782:17 | extracted | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:782:9:782:17 | extracted | T1 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:782:21:782:40 | extract_point(...) |  | {EXTERNAL LOCATION} | (T_2) |
-| pattern_matching.rs:782:21:782:40 | extract_point(...) | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:782:21:782:40 | extract_point(...) | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:782:35:782:39 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:785:9:785:11 | red |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:785:15:785:34 | extract_color(...) |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:787:9:787:13 | tuple |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:787:17:787:38 | TupleExpr |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:787:18:787:22 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:787:25:787:31 | 3.14f64 |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:787:34:787:37 | true |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:788:9:788:23 | tuple_extracted |  | {EXTERNAL LOCATION} | (T_2) |
-| pattern_matching.rs:788:9:788:23 | tuple_extracted | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:788:9:788:23 | tuple_extracted | T1 | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:788:27:788:46 | extract_tuple(...) |  | {EXTERNAL LOCATION} | (T_2) |
-| pattern_matching.rs:788:27:788:46 | extract_tuple(...) | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:788:27:788:46 | extract_tuple(...) | T1 | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:788:41:788:45 | tuple |  | {EXTERNAL LOCATION} | (T_3) |
-| pattern_matching.rs:792:35:824:1 | { ... } |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:794:23:794:42 | (...) |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:794:23:794:42 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:794:45:794:64 | (...) |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:794:45:794:64 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:795:5:799:5 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:795:9:795:22 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:795:34:799:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:798:9:798:59 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:798:18:798:42 | "Point in loop: ({}, {})\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:798:18:798:42 | "Point in loop: ({}, {})\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:798:18:798:58 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:798:18:798:58 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:798:18:798:58 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:802:39:802:43 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:803:5:806:5 | if ... {...} |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:803:50:806:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:805:9:805:55 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:805:18:805:44 | "If let with @ pattern: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:805:18:805:44 | "If let with @ pattern: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:805:18:805:54 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:805:18:805:54 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:805:18:805:54 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:809:13:809:17 | stack |  | {EXTERNAL LOCATION} | Vec |
 | pattern_matching.rs:809:13:809:17 | stack | A | {EXTERNAL LOCATION} | Global |
@@ -5208,132 +4961,95 @@ inferCertainType
 | pattern_matching.rs:810:25:810:29 | stack | A | {EXTERNAL LOCATION} | Global |
 | pattern_matching.rs:810:25:810:29 | stack | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:810:37:813:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:812:9:812:43 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:812:18:812:29 | "Popped: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:812:18:812:29 | "Popped: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:812:18:812:42 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:812:18:812:42 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:812:18:812:42 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:816:9:816:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:816:17:816:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:817:11:817:15 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:818:23:821:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:820:13:820:45 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:820:22:820:35 | "Positive: {}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:820:22:820:35 | "Positive: {}\\n" | TRef | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:820:22:820:44 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:820:22:820:44 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:820:22:820:44 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:822:14:822:15 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:826:28:846:1 | { ... } |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:827:5:827:7 | f(...) |  | {EXTERNAL LOCATION} | Option |
-| pattern_matching.rs:827:5:827:7 | f(...) | T | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:828:5:828:22 | literal_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:829:5:829:25 | identifier_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:830:5:830:23 | wildcard_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:831:5:831:20 | range_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:832:5:832:24 | reference_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:833:5:833:21 | record_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:834:5:834:27 | tuple_struct_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:835:5:835:20 | tuple_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:836:5:836:28 | parenthesized_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:837:5:837:20 | slice_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:838:5:838:19 | path_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:839:5:839:17 | or_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:840:5:840:19 | rest_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:841:5:841:20 | macro_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:842:5:842:29 | complex_nested_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:843:5:843:32 | patterns_in_let_statements(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:844:5:844:37 | patterns_in_function_parameters(...) |  | {EXTERNAL LOCATION} | () |
-| pattern_matching.rs:845:5:845:30 | patterns_in_control_flow(...) |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:3:28:3:28 | x |  | {EXTERNAL LOCATION} | *const |
 | raw_pointer.rs:3:28:3:28 | x | TPtrConst | {EXTERNAL LOCATION} | i32 |
-| raw_pointer.rs:3:50:6:1 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | raw_pointer.rs:4:24:4:24 | x |  | {EXTERNAL LOCATION} | *const |
 | raw_pointer.rs:4:24:4:24 | x | TPtrConst | {EXTERNAL LOCATION} | i32 |
 | raw_pointer.rs:8:26:8:26 | x |  | {EXTERNAL LOCATION} | *mut |
 | raw_pointer.rs:8:26:8:26 | x | TPtrMut | {EXTERNAL LOCATION} | bool |
-| raw_pointer.rs:8:47:11:1 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | raw_pointer.rs:9:24:9:24 | x |  | {EXTERNAL LOCATION} | *mut |
 | raw_pointer.rs:9:24:9:24 | x | TPtrMut | {EXTERNAL LOCATION} | bool |
 | raw_pointer.rs:13:23:19:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:14:9:14:9 | a |  | {EXTERNAL LOCATION} | i64 |
 | raw_pointer.rs:15:9:15:9 | x |  | {EXTERNAL LOCATION} | *const |
+| raw_pointer.rs:15:9:15:9 | x | TPtrConst | {EXTERNAL LOCATION} | i64 |
 | raw_pointer.rs:15:13:15:24 | &raw const a |  | {EXTERNAL LOCATION} | *const |
+| raw_pointer.rs:15:13:15:24 | &raw const a | TPtrConst | {EXTERNAL LOCATION} | i64 |
 | raw_pointer.rs:15:24:15:24 | a |  | {EXTERNAL LOCATION} | i64 |
 | raw_pointer.rs:16:5:18:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:17:19:17:19 | x |  | {EXTERNAL LOCATION} | *const |
+| raw_pointer.rs:17:19:17:19 | x | TPtrConst | {EXTERNAL LOCATION} | i64 |
 | raw_pointer.rs:21:21:27:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:22:13:22:13 | a |  | {EXTERNAL LOCATION} | i32 |
 | raw_pointer.rs:22:17:22:21 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
 | raw_pointer.rs:23:9:23:9 | x |  | {EXTERNAL LOCATION} | *mut |
+| raw_pointer.rs:23:9:23:9 | x | TPtrMut | {EXTERNAL LOCATION} | i32 |
 | raw_pointer.rs:23:13:23:22 | &raw mut a |  | {EXTERNAL LOCATION} | *mut |
+| raw_pointer.rs:23:13:23:22 | &raw mut a | TPtrMut | {EXTERNAL LOCATION} | i32 |
 | raw_pointer.rs:23:22:23:22 | a |  | {EXTERNAL LOCATION} | i32 |
 | raw_pointer.rs:24:5:26:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:25:19:25:19 | x |  | {EXTERNAL LOCATION} | *mut |
+| raw_pointer.rs:25:19:25:19 | x | TPtrMut | {EXTERNAL LOCATION} | i32 |
 | raw_pointer.rs:29:18:29:21 | cond |  | {EXTERNAL LOCATION} | bool |
 | raw_pointer.rs:29:30:40:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:30:9:30:9 | a |  | {EXTERNAL LOCATION} | i32 |
 | raw_pointer.rs:30:13:30:17 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
-| raw_pointer.rs:32:9:32:19 | ptr_written |  | {EXTERNAL LOCATION} | *mut |
-| raw_pointer.rs:32:23:32:32 | null_mut(...) |  | {EXTERNAL LOCATION} | *mut |
 | raw_pointer.rs:33:5:39:5 | if cond {...} |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:33:8:33:11 | cond |  | {EXTERNAL LOCATION} | bool |
+| raw_pointer.rs:33:13:39:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:34:9:38:9 | { ... } |  | {EXTERNAL LOCATION} | () |
-| raw_pointer.rs:36:14:36:24 | ptr_written |  | {EXTERNAL LOCATION} | *mut |
+| raw_pointer.rs:36:13:36:28 | ... = ... |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:36:28:36:28 | a |  | {EXTERNAL LOCATION} | i32 |
-| raw_pointer.rs:37:23:37:33 | ptr_written |  | {EXTERNAL LOCATION} | *mut |
 | raw_pointer.rs:42:24:42:27 | cond |  | {EXTERNAL LOCATION} | bool |
 | raw_pointer.rs:42:36:51:1 | { ... } |  | {EXTERNAL LOCATION} | () |
-| raw_pointer.rs:44:9:44:16 | ptr_read |  | {EXTERNAL LOCATION} | *mut |
-| raw_pointer.rs:44:20:44:29 | null_mut(...) |  | {EXTERNAL LOCATION} | *mut |
 | raw_pointer.rs:45:5:50:5 | if cond {...} |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:45:8:45:11 | cond |  | {EXTERNAL LOCATION} | bool |
+| raw_pointer.rs:45:13:50:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:46:9:49:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:48:17:48:18 | _y |  | {EXTERNAL LOCATION} | i64 |
-| raw_pointer.rs:48:28:48:35 | ptr_read |  | {EXTERNAL LOCATION} | *mut |
 | raw_pointer.rs:53:15:60:1 | { ... } |  | {EXTERNAL LOCATION} | () |
-| raw_pointer.rs:54:5:54:32 | raw_pointer_const_deref(...) |  | {EXTERNAL LOCATION} | i32 |
 | raw_pointer.rs:54:29:54:31 | &10 |  | {EXTERNAL LOCATION} | & |
-| raw_pointer.rs:55:5:55:36 | raw_pointer_mut_deref(...) |  | {EXTERNAL LOCATION} | i32 |
 | raw_pointer.rs:55:27:55:35 | &mut true |  | {EXTERNAL LOCATION} | &mut |
+| raw_pointer.rs:55:27:55:35 | &mut true | TRefMut | {EXTERNAL LOCATION} | bool |
 | raw_pointer.rs:55:32:55:35 | true |  | {EXTERNAL LOCATION} | bool |
-| raw_pointer.rs:56:5:56:22 | raw_const_borrow(...) |  | {EXTERNAL LOCATION} | () |
-| raw_pointer.rs:57:5:57:20 | raw_mut_borrow(...) |  | {EXTERNAL LOCATION} | () |
-| raw_pointer.rs:58:5:58:24 | raw_mut_write(...) |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:58:19:58:23 | false |  | {EXTERNAL LOCATION} | bool |
-| raw_pointer.rs:59:5:59:30 | raw_type_from_deref(...) |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:59:25:59:29 | false |  | {EXTERNAL LOCATION} | bool |
 | regressions.rs:10:17:10:17 | s |  | regressions.rs:3:5:3:23 | S |
 | regressions.rs:10:17:10:17 | s | T | regressions.rs:9:10:9:10 | T |
-| regressions.rs:10:34:12:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| regressions.rs:10:34:12:9 | { ... } | T | regressions.rs:9:10:9:10 | T |
 | regressions.rs:11:18:11:18 | s |  | regressions.rs:3:5:3:23 | S |
 | regressions.rs:11:18:11:18 | s | T | regressions.rs:9:10:9:10 | T |
-| regressions.rs:15:21:33:5 | { ... } |  | regressions.rs:5:5:7:5 | E |
-| regressions.rs:16:17:16:21 | vec_e |  | {EXTERNAL LOCATION} | Vec |
-| regressions.rs:16:17:16:21 | vec_e | A | {EXTERNAL LOCATION} | Global |
-| regressions.rs:16:25:16:34 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
-| regressions.rs:16:25:16:34 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | regressions.rs:19:13:19:13 | e |  | regressions.rs:5:5:7:5 | E |
 | regressions.rs:19:17:19:40 | ...::V {...} |  | regressions.rs:5:5:7:5 | E |
-| regressions.rs:19:29:19:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
-| regressions.rs:19:29:19:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | regressions.rs:21:9:23:9 | if ... {...} |  | {EXTERNAL LOCATION} | () |
 | regressions.rs:21:32:23:9 | { ... } |  | {EXTERNAL LOCATION} | () |
-| regressions.rs:22:13:22:17 | vec_e |  | {EXTERNAL LOCATION} | Vec |
-| regressions.rs:22:13:22:17 | vec_e | A | {EXTERNAL LOCATION} | Global |
+| regressions.rs:24:9:24:24 | ... = ... |  | {EXTERNAL LOCATION} | () |
 | regressions.rs:24:17:24:17 | e |  | regressions.rs:5:5:7:5 | E |
 | regressions.rs:27:17:30:9 | if ... {...} |  | {EXTERNAL LOCATION} | () |
-| regressions.rs:27:37:27:41 | vec_e |  | {EXTERNAL LOCATION} | Vec |
-| regressions.rs:27:37:27:41 | vec_e | A | {EXTERNAL LOCATION} | Global |
 | regressions.rs:28:9:30:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:29:13:29:31 | ... = ... |  | {EXTERNAL LOCATION} | () |
 | regressions.rs:48:16:48:19 | SelfParam |  | regressions.rs:39:5:40:14 | S1 |
 | regressions.rs:48:22:48:25 | _rhs |  | regressions.rs:39:5:40:14 | S1 |
-| regressions.rs:48:50:50:9 | { ... } |  | regressions.rs:39:5:40:14 | S1 |
 | regressions.rs:57:16:57:19 | SelfParam |  | regressions.rs:39:5:40:14 | S1 |
 | regressions.rs:57:22:57:25 | _rhs |  | regressions.rs:41:5:42:14 | S2 |
-| regressions.rs:57:48:59:9 | { ... } |  | regressions.rs:41:5:42:14 | S2 |
 | regressions.rs:66:16:66:19 | SelfParam |  | regressions.rs:39:5:40:14 | S1 |
 | regressions.rs:66:22:66:26 | other |  | {EXTERNAL LOCATION} | & |
 | regressions.rs:66:22:66:26 | other | TRef | regressions.rs:41:5:42:14 | S2 |
-| regressions.rs:66:61:68:9 | { ... } |  | regressions.rs:41:5:42:14 | S2 |
 | regressions.rs:67:22:67:25 | self |  | regressions.rs:39:5:40:14 | S1 |
 | regressions.rs:67:29:67:33 | other |  | {EXTERNAL LOCATION} | & |
 | regressions.rs:67:29:67:33 | other | TRef | regressions.rs:41:5:42:14 | S2 |
@@ -5344,11 +5060,8 @@ inferCertainType
 | regressions.rs:86:34:88:9 | { ... } |  | regressions.rs:85:10:85:10 | T |
 | regressions.rs:87:13:87:13 | s |  | regressions.rs:85:10:85:10 | T |
 | regressions.rs:92:20:92:22 | val |  | regressions.rs:91:10:91:10 | T |
-| regressions.rs:92:41:94:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| regressions.rs:92:41:94:9 | { ... } | T | regressions.rs:91:10:91:10 | T |
 | regressions.rs:93:18:93:20 | val |  | regressions.rs:91:10:91:10 | T |
 | regressions.rs:99:22:99:22 | x |  | regressions.rs:99:18:99:19 | T2 |
-| regressions.rs:103:5:107:5 | { ... } |  | regressions.rs:99:18:99:19 | T2 |
 | regressions.rs:104:33:104:33 | x |  | regressions.rs:99:18:99:19 | T2 |
 | regressions.rs:113:14:113:17 | SelfParam |  | regressions.rs:111:5:114:5 | Self [trait MyTrait] |
 | regressions.rs:118:14:118:17 | SelfParam |  | {EXTERNAL LOCATION} | & |
@@ -5361,14 +5074,8 @@ inferCertainType
 | regressions.rs:128:24:128:27 | self | T | regressions.rs:123:10:123:10 | T |
 | regressions.rs:139:17:139:17 | _ |  | {EXTERNAL LOCATION} | & |
 | regressions.rs:139:17:139:17 | _ | TRef | regressions.rs:135:5:135:14 | S1 |
-| regressions.rs:139:33:141:9 | { ... } |  | regressions.rs:136:5:136:22 | S2 |
-| regressions.rs:139:33:141:9 | { ... } | T2 | regressions.rs:135:5:135:14 | S1 |
 | regressions.rs:145:17:145:17 | t |  | regressions.rs:144:10:144:10 | T |
-| regressions.rs:145:31:147:9 | { ... } |  | regressions.rs:136:5:136:22 | S2 |
-| regressions.rs:145:31:147:9 | { ... } | T2 | regressions.rs:144:10:144:10 | T |
 | regressions.rs:146:16:146:16 | t |  | regressions.rs:144:10:144:10 | T |
-| regressions.rs:150:24:153:5 | { ... } |  | regressions.rs:136:5:136:22 | S2 |
-| regressions.rs:150:24:153:5 | { ... } | T2 | regressions.rs:135:5:135:14 | S1 |
 | regressions.rs:164:16:164:19 | SelfParam |  | regressions.rs:158:5:158:19 | S |
 | regressions.rs:164:16:164:19 | SelfParam | T | regressions.rs:160:10:160:10 | T |
 | regressions.rs:164:22:164:25 | _rhs |  | regressions.rs:158:5:158:19 | S |
@@ -5434,10 +5141,8 @@ inferType
 | associated_types.rs:81:9:81:11 | 'a' |  | {EXTERNAL LOCATION} | char |
 | associated_types.rs:92:15:92:18 | SelfParam |  | associated_types.rs:88:5:103:5 | Self [trait MyTrait] |
 | associated_types.rs:94:15:94:18 | SelfParam |  | associated_types.rs:88:5:103:5 | Self [trait MyTrait] |
-| associated_types.rs:98:9:102:9 | { ... } |  | associated_types.rs:89:9:89:28 | AssociatedType[MyTrait] |
 | associated_types.rs:99:13:99:16 | self |  | associated_types.rs:88:5:103:5 | Self [trait MyTrait] |
 | associated_types.rs:99:13:99:21 | self.m1() |  | associated_types.rs:89:9:89:28 | AssociatedType[MyTrait] |
-| associated_types.rs:101:13:101:43 | ...::default(...) |  | associated_types.rs:89:9:89:28 | AssociatedType[MyTrait] |
 | associated_types.rs:109:15:109:18 | SelfParam |  | associated_types.rs:10:1:11:9 | S |
 | associated_types.rs:109:45:111:9 | { ... } |  | associated_types.rs:16:1:17:10 | S3 |
 | associated_types.rs:110:13:110:14 | S3 |  | associated_types.rs:16:1:17:10 | S3 |
@@ -5777,8 +5482,6 @@ inferType
 | associated_types.rs:485:24:485:28 | SelfParam | TRef | associated_types.rs:469:5:469:24 | MyType |
 | associated_types.rs:485:24:485:28 | SelfParam | TRef.T | associated_types.rs:483:10:483:16 | T |
 | associated_types.rs:485:47:487:9 | { ... } |  | associated_types.rs:483:10:483:16 | T |
-| associated_types.rs:486:13:486:19 | (...) |  | associated_types.rs:469:5:469:24 | MyType |
-| associated_types.rs:486:13:486:19 | (...) | T | associated_types.rs:483:10:483:16 | T |
 | associated_types.rs:486:13:486:21 | ... .0 |  | associated_types.rs:483:10:483:16 | T |
 | associated_types.rs:486:14:486:18 | * ... |  | associated_types.rs:469:5:469:24 | MyType |
 | associated_types.rs:486:14:486:18 | * ... | T | associated_types.rs:483:10:483:16 | T |
@@ -5874,8 +5577,6 @@ inferType
 | associated_types.rs:550:31:550:31 | t | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:550:61:558:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:552:13:552:15 | _a1 |  | {EXTERNAL LOCATION} | i32 |
-| associated_types.rs:552:19:552:22 | (...) |  | associated_types.rs:19:1:27:1 | dyn GetSet |
-| associated_types.rs:552:19:552:22 | (...) | dyn(Output) | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:552:19:552:28 | ... .get() |  | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:552:20:552:21 | * ... |  | associated_types.rs:19:1:27:1 | dyn GetSet |
 | associated_types.rs:552:20:552:21 | * ... | dyn(Output) | {EXTERNAL LOCATION} | i32 |
@@ -5898,9 +5599,6 @@ inferType
 | associated_types.rs:560:36:560:36 | t | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:560:92:566:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:561:13:561:15 | _a1 |  | {EXTERNAL LOCATION} | i32 |
-| associated_types.rs:561:19:561:22 | (...) |  | associated_types.rs:33:1:38:1 | dyn AnotherGet |
-| associated_types.rs:561:19:561:22 | (...) | dyn(AnotherOutput) | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:561:19:561:22 | (...) | dyn(Output) | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:561:19:561:28 | ... .get() |  | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:561:20:561:21 | * ... |  | associated_types.rs:33:1:38:1 | dyn AnotherGet |
 | associated_types.rs:561:20:561:21 | * ... | dyn(AnotherOutput) | {EXTERNAL LOCATION} | bool |
@@ -5922,9 +5620,6 @@ inferType
 | associated_types.rs:563:23:563:23 | t | TRef.dyn(AnotherOutput) | {EXTERNAL LOCATION} | bool |
 | associated_types.rs:563:23:563:23 | t | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:564:13:564:15 | _b1 |  | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:564:19:564:22 | (...) |  | associated_types.rs:33:1:38:1 | dyn AnotherGet |
-| associated_types.rs:564:19:564:22 | (...) | dyn(AnotherOutput) | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:564:19:564:22 | (...) | dyn(Output) | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:564:19:564:36 | ... .get_another() |  | {EXTERNAL LOCATION} | bool |
 | associated_types.rs:564:20:564:21 | * ... |  | associated_types.rs:33:1:38:1 | dyn AnotherGet |
 | associated_types.rs:564:20:564:21 | * ... | dyn(AnotherOutput) | {EXTERNAL LOCATION} | bool |
@@ -5983,8 +5678,6 @@ inferType
 | blanket_impl.rs:47:18:47:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:47:20:47:21 | x1 |  | blanket_impl.rs:6:5:7:14 | S1 |
 | blanket_impl.rs:48:13:48:14 | x2 |  | blanket_impl.rs:6:5:7:14 | S1 |
-| blanket_impl.rs:48:18:48:22 | (...) |  | {EXTERNAL LOCATION} | & |
-| blanket_impl.rs:48:18:48:22 | (...) | TRef | blanket_impl.rs:6:5:7:14 | S1 |
 | blanket_impl.rs:48:18:48:31 | ... .clone1() |  | blanket_impl.rs:6:5:7:14 | S1 |
 | blanket_impl.rs:48:19:48:21 | &S1 |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:48:19:48:21 | &S1 | TRef | blanket_impl.rs:6:5:7:14 | S1 |
@@ -6007,8 +5700,6 @@ inferType
 | blanket_impl.rs:51:18:51:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:51:20:51:21 | x3 |  | blanket_impl.rs:6:5:7:14 | S1 |
 | blanket_impl.rs:52:13:52:14 | x4 |  | blanket_impl.rs:6:5:7:14 | S1 |
-| blanket_impl.rs:52:18:52:22 | (...) |  | {EXTERNAL LOCATION} | & |
-| blanket_impl.rs:52:18:52:22 | (...) | TRef | blanket_impl.rs:6:5:7:14 | S1 |
 | blanket_impl.rs:52:18:52:34 | ... .duplicate() |  | blanket_impl.rs:6:5:7:14 | S1 |
 | blanket_impl.rs:52:19:52:21 | &S1 |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:52:19:52:21 | &S1 | TRef | blanket_impl.rs:6:5:7:14 | S1 |
@@ -6043,8 +5734,6 @@ inferType
 | blanket_impl.rs:57:18:57:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:57:20:57:21 | x6 |  | blanket_impl.rs:6:5:7:14 | S1 |
 | blanket_impl.rs:58:13:58:14 | x7 |  | blanket_impl.rs:6:5:7:14 | S1 |
-| blanket_impl.rs:58:18:58:22 | (...) |  | {EXTERNAL LOCATION} | & |
-| blanket_impl.rs:58:18:58:22 | (...) | TRef | blanket_impl.rs:9:5:10:14 | S2 |
 | blanket_impl.rs:58:18:58:34 | ... .duplicate() |  | blanket_impl.rs:6:5:7:14 | S1 |
 | blanket_impl.rs:58:19:58:21 | &S2 |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:58:19:58:21 | &S2 | TRef | blanket_impl.rs:9:5:10:14 | S2 |
@@ -6218,16 +5907,11 @@ inferType
 | blanket_impl.rs:256:18:256:19 | S1 |  | blanket_impl.rs:188:5:189:14 | S1 |
 | blanket_impl.rs:256:18:256:24 | S1.m1() |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:257:13:257:14 | x2 |  | {EXTERNAL LOCATION} | () |
-| blanket_impl.rs:257:18:257:22 | (...) |  | {EXTERNAL LOCATION} | & |
-| blanket_impl.rs:257:18:257:22 | (...) | TRef | blanket_impl.rs:188:5:189:14 | S1 |
 | blanket_impl.rs:257:18:257:27 | ... .m2() |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:257:19:257:21 | &S1 |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:257:19:257:21 | &S1 | TRef | blanket_impl.rs:188:5:189:14 | S1 |
 | blanket_impl.rs:257:20:257:21 | S1 |  | blanket_impl.rs:188:5:189:14 | S1 |
 | blanket_impl.rs:258:13:258:14 | x3 |  | {EXTERNAL LOCATION} | () |
-| blanket_impl.rs:258:18:258:23 | (...) |  | {EXTERNAL LOCATION} | & |
-| blanket_impl.rs:258:18:258:23 | (...) | TRef | {EXTERNAL LOCATION} | & |
-| blanket_impl.rs:258:18:258:23 | (...) | TRef.TRef | blanket_impl.rs:188:5:189:14 | S1 |
 | blanket_impl.rs:258:18:258:28 | ... .m2() |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:258:19:258:22 | &... |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:258:19:258:22 | &... | TRef | {EXTERNAL LOCATION} | & |
@@ -6239,8 +5923,6 @@ inferType
 | blanket_impl.rs:259:18:259:19 | S1 |  | blanket_impl.rs:188:5:189:14 | S1 |
 | blanket_impl.rs:259:18:259:24 | S1.m4() |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:260:13:260:14 | x5 |  | {EXTERNAL LOCATION} | () |
-| blanket_impl.rs:260:18:260:22 | (...) |  | {EXTERNAL LOCATION} | & |
-| blanket_impl.rs:260:18:260:22 | (...) | TRef | blanket_impl.rs:188:5:189:14 | S1 |
 | blanket_impl.rs:260:18:260:27 | ... .m4() |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:260:19:260:21 | &S1 |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:260:19:260:21 | &S1 | TRef | blanket_impl.rs:188:5:189:14 | S1 |
@@ -6249,8 +5931,6 @@ inferType
 | blanket_impl.rs:261:18:261:19 | S2 |  | blanket_impl.rs:191:5:192:14 | S2 |
 | blanket_impl.rs:261:18:261:24 | S2.m4() |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:262:13:262:14 | x7 |  | {EXTERNAL LOCATION} | () |
-| blanket_impl.rs:262:18:262:22 | (...) |  | {EXTERNAL LOCATION} | & |
-| blanket_impl.rs:262:18:262:22 | (...) | TRef | blanket_impl.rs:191:5:192:14 | S2 |
 | blanket_impl.rs:262:18:262:27 | ... .m4() |  | {EXTERNAL LOCATION} | () |
 | blanket_impl.rs:262:19:262:21 | &S2 |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:262:19:262:21 | &S2 | TRef | blanket_impl.rs:191:5:192:14 | S2 |
@@ -6308,7 +5988,39 @@ inferType
 | blanket_impl.rs:299:44:299:44 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
 | blanket_impl.rs:299:47:299:67 | "SELECT * FROM users" |  | {EXTERNAL LOCATION} | & |
 | blanket_impl.rs:299:47:299:67 | "SELECT * FROM users" | TRef | {EXTERNAL LOCATION} | str |
-| closure.rs:4:19:31:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| cfg.rs:1:22:7:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| cfg.rs:2:9:2:12 | unix |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:2:16:2:25 | MacroExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:2:20:2:25 | CfgPredExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:3:9:3:15 | windows |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:3:19:3:45 | MacroExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:3:23:3:45 | CfgPredExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:4:9:4:14 | either |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:4:18:4:55 | MacroExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:4:22:4:55 | CfgPredExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:5:9:5:14 | always |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:5:18:5:28 | MacroExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:5:22:5:28 | CfgPredExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:6:9:6:13 | never |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:6:17:6:27 | MacroExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:6:21:6:27 | CfgPredExpr |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:9:19:17:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| cfg.rs:10:9:10:13 | value |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:10:17:10:34 | ...::default(...) |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:11:5:16:5 | match value { ... } |  | {EXTERNAL LOCATION} | () |
+| cfg.rs:11:11:11:15 | value |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:12:9:12:18 | MacroPat |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:12:13:12:18 | CfgPredPat |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:12:23:12:24 | TupleExpr |  | {EXTERNAL LOCATION} | () |
+| cfg.rs:13:9:13:35 | MacroPat |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:13:13:13:35 | CfgPredPat |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:13:40:13:41 | TupleExpr |  | {EXTERNAL LOCATION} | () |
+| cfg.rs:14:9:14:46 | MacroPat |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:14:13:14:46 | CfgPredPat |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:14:51:14:52 | TupleExpr |  | {EXTERNAL LOCATION} | () |
+| cfg.rs:15:9:15:9 | _ |  | {EXTERNAL LOCATION} | bool |
+| cfg.rs:15:14:15:15 | TupleExpr |  | {EXTERNAL LOCATION} | () |
+| closure.rs:4:19:39:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | closure.rs:6:13:6:22 | my_closure |  | {EXTERNAL LOCATION} | dyn Fn |
 | closure.rs:6:13:6:22 | my_closure | dyn(Args) | {EXTERNAL LOCATION} | (T_2) |
 | closure.rs:6:13:6:22 | my_closure | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
@@ -6418,570 +6130,658 @@ inferType
 | closure.rs:30:28:30:32 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:30:28:30:32 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
 | closure.rs:30:29:30:31 | arg |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:35:44:35:44 | f |  | closure.rs:35:20:35:41 | F |
-| closure.rs:35:50:37:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:36:13:36:19 | _return |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:36:23:36:23 | f |  | closure.rs:35:20:35:41 | F |
-| closure.rs:36:23:36:29 | f(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:36:24:36:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:36:24:36:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:36:25:36:28 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:39:45:39:45 | f |  | closure.rs:39:28:39:42 | F |
-| closure.rs:39:51:41:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:40:13:40:19 | _return |  | {EXTERNAL LOCATION} | () |
-| closure.rs:40:23:40:23 | f |  | closure.rs:39:28:39:42 | F |
-| closure.rs:40:23:40:29 | f(...) |  | {EXTERNAL LOCATION} | () |
-| closure.rs:40:24:40:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:40:24:40:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:40:25:40:28 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:43:46:43:46 | f |  | closure.rs:43:22:43:43 | F |
-| closure.rs:43:52:46:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:44:13:44:15 | arg |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:44:19:44:36 | ...::default(...) |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:45:9:45:9 | f |  | closure.rs:43:22:43:43 | F |
-| closure.rs:45:9:45:14 | f(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:45:10:45:14 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:45:10:45:14 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:45:11:45:13 | arg |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:48:39:48:39 | f |  | closure.rs:48:20:48:36 | F |
-| closure.rs:48:45:48:45 | a |  | closure.rs:48:14:48:14 | A |
-| closure.rs:48:56:50:5 | { ... } |  | closure.rs:48:17:48:17 | B |
-| closure.rs:49:9:49:9 | f |  | closure.rs:48:20:48:36 | F |
-| closure.rs:49:9:49:12 | f(...) |  | closure.rs:48:17:48:17 | B |
-| closure.rs:49:10:49:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:49:10:49:12 | ArgList | T0 | closure.rs:48:14:48:14 | A |
-| closure.rs:49:11:49:11 | a |  | closure.rs:48:14:48:14 | A |
-| closure.rs:52:18:52:18 | f |  | closure.rs:52:21:52:43 | impl ... |
-| closure.rs:52:53:54:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:53:9:53:9 | f |  | closure.rs:52:21:52:43 | impl ... |
-| closure.rs:53:9:53:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:53:10:53:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:53:10:53:12 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:53:11:53:11 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:56:15:68:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:57:13:57:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:57:13:57:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:57:13:57:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:57:13:57:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:57:17:63:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:57:17:63:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:57:17:63:9 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:57:17:63:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:57:18:57:18 | x |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:57:34:63:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:58:13:62:13 | if x {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:58:16:58:16 | x |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:58:18:60:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:59:17:59:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:60:20:62:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:61:17:61:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:64:13:64:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:64:18:64:31 | apply(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:64:24:64:24 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:64:24:64:24 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:64:24:64:24 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:64:24:64:24 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:64:27:64:30 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:66:13:66:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:66:13:66:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:66:13:66:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:66:17:66:25 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:66:17:66:25 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:66:17:66:25 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:66:18:66:18 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:66:21:66:21 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:66:25:66:25 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:67:13:67:15 | _r2 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:67:19:67:30 | apply_two(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:67:29:67:29 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:67:29:67:29 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:67:29:67:29 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:72:47:72:47 | f |  | closure.rs:72:20:72:40 | F |
-| closure.rs:72:53:74:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:73:13:73:19 | _return |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:73:23:73:23 | f |  | closure.rs:72:20:72:40 | F |
-| closure.rs:73:23:73:29 | f(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:73:24:73:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:73:24:73:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:73:25:73:28 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:76:48:76:48 | f |  | closure.rs:76:28:76:41 | F |
-| closure.rs:76:54:78:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:77:13:77:19 | _return |  | {EXTERNAL LOCATION} | () |
-| closure.rs:77:23:77:23 | f |  | closure.rs:76:28:76:41 | F |
-| closure.rs:77:23:77:29 | f(...) |  | {EXTERNAL LOCATION} | () |
-| closure.rs:77:24:77:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:77:24:77:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:77:25:77:28 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:80:49:80:49 | f |  | closure.rs:80:22:80:42 | F |
-| closure.rs:80:55:83:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:81:13:81:15 | arg |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:81:19:81:36 | ...::default(...) |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:82:9:82:9 | f |  | closure.rs:80:22:80:42 | F |
-| closure.rs:82:9:82:14 | f(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:82:10:82:14 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:82:10:82:14 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:82:11:82:13 | arg |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:85:42:85:42 | f |  | closure.rs:85:20:85:35 | F |
-| closure.rs:85:48:85:48 | a |  | closure.rs:85:14:85:14 | A |
-| closure.rs:85:59:87:5 | { ... } |  | closure.rs:85:17:85:17 | B |
-| closure.rs:86:9:86:9 | f |  | closure.rs:85:20:85:35 | F |
-| closure.rs:86:9:86:12 | f(...) |  | closure.rs:85:17:85:17 | B |
-| closure.rs:86:10:86:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:86:10:86:12 | ArgList | T0 | closure.rs:85:14:85:14 | A |
-| closure.rs:86:11:86:11 | a |  | closure.rs:85:14:85:14 | A |
-| closure.rs:89:22:89:22 | f |  | closure.rs:89:25:89:46 | impl ... |
-| closure.rs:89:56:91:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:90:9:90:9 | f |  | closure.rs:89:25:89:46 | impl ... |
-| closure.rs:90:9:90:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:90:10:90:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:90:10:90:12 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:90:11:90:11 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:93:15:105:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:94:13:94:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:94:13:94:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:94:13:94:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:94:13:94:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:94:17:100:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:94:17:100:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:94:17:100:9 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:94:17:100:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:94:18:94:18 | x |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:94:34:100:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:95:13:99:13 | if x {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:95:16:95:16 | x |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:95:18:97:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:96:17:96:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:97:20:99:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:98:17:98:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:101:13:101:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:101:18:101:31 | apply(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:101:24:101:24 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:101:24:101:24 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:101:24:101:24 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:101:24:101:24 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:101:27:101:30 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:103:13:103:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:103:13:103:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:103:13:103:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:103:17:103:25 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:103:17:103:25 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:103:17:103:25 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:103:18:103:18 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:103:21:103:21 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:103:25:103:25 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:104:13:104:15 | _r2 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:104:19:104:30 | apply_two(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:104:29:104:29 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:104:29:104:29 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:104:29:104:29 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:109:40:109:40 | f |  | closure.rs:109:20:109:37 | F |
-| closure.rs:109:46:111:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:110:13:110:19 | _return |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:110:23:110:23 | f |  | closure.rs:109:20:109:37 | F |
-| closure.rs:110:23:110:29 | f(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:110:24:110:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:110:24:110:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:110:25:110:28 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:113:41:113:41 | f |  | closure.rs:113:28:113:38 | F |
-| closure.rs:113:47:115:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:114:13:114:19 | _return |  | {EXTERNAL LOCATION} | () |
-| closure.rs:114:23:114:23 | f |  | closure.rs:113:28:113:38 | F |
-| closure.rs:114:23:114:29 | f(...) |  | {EXTERNAL LOCATION} | () |
-| closure.rs:114:24:114:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:114:24:114:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:114:25:114:28 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:117:42:117:42 | f |  | closure.rs:117:22:117:39 | F |
-| closure.rs:117:48:120:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:118:13:118:15 | arg |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:118:19:118:36 | ...::default(...) |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:119:9:119:9 | f |  | closure.rs:117:22:117:39 | F |
-| closure.rs:119:9:119:14 | f(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:119:10:119:14 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:119:10:119:14 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:119:11:119:13 | arg |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:122:35:122:35 | f |  | closure.rs:122:20:122:32 | F |
-| closure.rs:122:41:122:41 | a |  | closure.rs:122:14:122:14 | A |
-| closure.rs:122:52:124:5 | { ... } |  | closure.rs:122:17:122:17 | B |
-| closure.rs:123:9:123:9 | f |  | closure.rs:122:20:122:32 | F |
-| closure.rs:123:9:123:12 | f(...) |  | closure.rs:122:17:122:17 | B |
-| closure.rs:123:10:123:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:123:10:123:12 | ArgList | T0 | closure.rs:122:14:122:14 | A |
-| closure.rs:123:11:123:11 | a |  | closure.rs:122:14:122:14 | A |
-| closure.rs:126:18:126:18 | f |  | closure.rs:126:21:126:39 | impl ... |
-| closure.rs:126:49:128:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:127:9:127:9 | f |  | closure.rs:126:21:126:39 | impl ... |
-| closure.rs:127:9:127:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:127:10:127:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:127:10:127:12 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:127:11:127:11 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:130:15:142:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:131:13:131:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:131:13:131:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:131:13:131:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:131:13:131:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:131:17:137:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:131:17:137:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:131:17:137:9 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:131:17:137:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:131:18:131:18 | x |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:131:34:137:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:132:13:136:13 | if x {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:132:16:132:16 | x |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:132:18:134:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:133:17:133:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:134:20:136:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:135:17:135:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:138:13:138:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:138:18:138:31 | apply(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:138:24:138:24 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:138:24:138:24 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:138:24:138:24 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
-| closure.rs:138:24:138:24 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:138:27:138:30 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:140:13:140:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:140:13:140:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:140:13:140:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:140:17:140:25 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:140:17:140:25 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:140:17:140:25 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:140:18:140:18 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:140:21:140:21 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:140:25:140:25 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:141:13:141:15 | _r2 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:141:19:141:30 | apply_two(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:141:29:141:29 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:141:29:141:29 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:141:29:141:29 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:146:54:146:54 | f |  | {EXTERNAL LOCATION} | Box |
-| closure.rs:146:54:146:54 | f | A | {EXTERNAL LOCATION} | Global |
-| closure.rs:146:54:146:54 | f | T | closure.rs:146:26:146:51 | F |
-| closure.rs:146:65:146:67 | arg |  | closure.rs:146:20:146:20 | A |
-| closure.rs:146:78:148:5 | { ... } |  | closure.rs:146:23:146:23 | B |
-| closure.rs:147:9:147:9 | f |  | {EXTERNAL LOCATION} | Box |
-| closure.rs:147:9:147:9 | f | A | {EXTERNAL LOCATION} | Global |
-| closure.rs:147:9:147:9 | f | T | closure.rs:146:26:146:51 | F |
-| closure.rs:147:9:147:14 | f(...) |  | closure.rs:146:23:146:23 | B |
-| closure.rs:147:10:147:14 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:147:10:147:14 | ArgList | T0 | closure.rs:146:20:146:20 | A |
-| closure.rs:147:11:147:13 | arg |  | closure.rs:146:20:146:20 | A |
-| closure.rs:150:30:150:30 | f |  | {EXTERNAL LOCATION} | Box |
-| closure.rs:150:30:150:30 | f | A | {EXTERNAL LOCATION} | Global |
-| closure.rs:150:30:150:30 | f | T | {EXTERNAL LOCATION} | dyn FnOnce |
-| closure.rs:150:30:150:30 | f | T.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:150:30:150:30 | f | T.dyn(Args).T0 | closure.rs:150:24:150:24 | A |
-| closure.rs:150:30:150:30 | f | T.dyn(Output) | closure.rs:150:27:150:27 | B |
-| closure.rs:150:58:150:60 | arg |  | closure.rs:150:24:150:24 | A |
-| closure.rs:150:66:153:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:151:13:151:15 | _r1 |  | closure.rs:150:27:150:27 | B |
-| closure.rs:151:19:151:37 | apply_boxed(...) |  | closure.rs:150:27:150:27 | B |
-| closure.rs:151:31:151:31 | f |  | {EXTERNAL LOCATION} | Box |
-| closure.rs:151:31:151:31 | f | A | {EXTERNAL LOCATION} | Global |
-| closure.rs:151:31:151:31 | f | T | {EXTERNAL LOCATION} | dyn FnOnce |
-| closure.rs:151:31:151:31 | f | T.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:151:31:151:31 | f | T.dyn(Args).T0 | closure.rs:150:24:150:24 | A |
-| closure.rs:151:31:151:31 | f | T.dyn(Output) | closure.rs:150:27:150:27 | B |
-| closure.rs:151:34:151:36 | arg |  | closure.rs:150:24:150:24 | A |
-| closure.rs:152:13:152:15 | _r2 |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:152:19:152:57 | apply_boxed(...) |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:152:31:152:53 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| closure.rs:152:31:152:53 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| closure.rs:152:31:152:53 | ...::new(...) | T | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:152:31:152:53 | ...::new(...) | T.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:152:31:152:53 | ...::new(...) | T.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:152:31:152:53 | ...::new(...) | T.dyn(Output) | {EXTERNAL LOCATION} | bool |
-| closure.rs:152:40:152:52 | \|...\| true |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:152:40:152:52 | \|...\| true | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:152:40:152:52 | \|...\| true | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:152:40:152:52 | \|...\| true | dyn(Output) | {EXTERNAL LOCATION} | bool |
-| closure.rs:152:41:152:41 | _ |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:152:49:152:52 | true |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:152:56:152:56 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:157:34:157:34 | f |  | closure.rs:157:15:157:31 | F |
-| closure.rs:157:40:157:40 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:157:55:159:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:158:9:158:9 | f |  | closure.rs:157:15:157:31 | F |
-| closure.rs:158:9:158:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:158:10:158:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:158:10:158:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:158:11:158:11 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:161:15:161:15 | f |  | closure.rs:161:18:161:36 | impl ... |
-| closure.rs:161:39:161:39 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:161:54:163:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:162:9:162:9 | f |  | closure.rs:161:18:161:36 | impl ... |
-| closure.rs:162:9:162:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:162:10:162:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:162:10:162:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:162:11:162:11 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:165:15:165:15 | f |  | {EXTERNAL LOCATION} | & |
-| closure.rs:165:15:165:15 | f | TRef | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:165:15:165:15 | f | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:165:15:165:15 | f | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:165:15:165:15 | f | TRef.dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:165:39:165:39 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:165:54:167:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:166:9:166:9 | f |  | {EXTERNAL LOCATION} | & |
-| closure.rs:166:9:166:9 | f | TRef | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:166:9:166:9 | f | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:166:9:166:9 | f | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:166:9:166:9 | f | TRef.dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:33:13:33:14 | f1 |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:33:13:33:14 | f1 | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:33:13:33:14 | f1 | dyn(Args).T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:33:13:33:14 | f1 | dyn(Args).T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:33:13:33:14 | f1 | dyn(Output) | {EXTERNAL LOCATION} | (T_2) |
+| closure.rs:33:13:33:14 | f1 | dyn(Output).T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:33:13:33:14 | f1 | dyn(Output).T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:33:13:33:14 | f1 | dyn(Output).T1 | {EXTERNAL LOCATION} | bool |
+| closure.rs:33:18:33:31 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:33:18:33:31 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:33:18:33:31 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:33:18:33:31 | \|...\| ... | dyn(Args).T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:33:18:33:31 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | (T_2) |
+| closure.rs:33:18:33:31 | \|...\| ... | dyn(Output).T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:33:18:33:31 | \|...\| ... | dyn(Output).T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:33:18:33:31 | \|...\| ... | dyn(Output).T1 | {EXTERNAL LOCATION} | bool |
+| closure.rs:33:19:33:19 | x |  | {EXTERNAL LOCATION} | Option |
+| closure.rs:33:19:33:19 | x | T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:33:22:33:31 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
+| closure.rs:33:22:33:31 | TupleExpr | T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:33:22:33:31 | TupleExpr | T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:33:22:33:31 | TupleExpr | T1 | {EXTERNAL LOCATION} | bool |
+| closure.rs:33:23:33:23 | x |  | {EXTERNAL LOCATION} | Option |
+| closure.rs:33:23:33:23 | x | T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:33:26:33:30 | false |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:34:13:34:14 | _r |  | {EXTERNAL LOCATION} | (T_2) |
+| closure.rs:34:13:34:14 | _r | T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:34:13:34:14 | _r | T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:34:13:34:14 | _r | T1 | {EXTERNAL LOCATION} | bool |
+| closure.rs:34:18:34:19 | f1 |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:34:18:34:19 | f1 | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:34:18:34:19 | f1 | dyn(Args).T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:34:18:34:19 | f1 | dyn(Args).T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:34:18:34:19 | f1 | dyn(Output) | {EXTERNAL LOCATION} | (T_2) |
+| closure.rs:34:18:34:19 | f1 | dyn(Output).T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:34:18:34:19 | f1 | dyn(Output).T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:34:18:34:19 | f1 | dyn(Output).T1 | {EXTERNAL LOCATION} | bool |
+| closure.rs:34:18:34:28 | f1(...) |  | {EXTERNAL LOCATION} | (T_2) |
+| closure.rs:34:18:34:28 | f1(...) | T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:34:18:34:28 | f1(...) | T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:34:18:34:28 | f1(...) | T1 | {EXTERNAL LOCATION} | bool |
+| closure.rs:34:20:34:28 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:34:20:34:28 | ArgList | T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:34:20:34:28 | ArgList | T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:34:21:34:27 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| closure.rs:34:21:34:27 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:34:26:34:26 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:37:13:37:14 | f2 |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:37:13:37:14 | f2 | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:37:13:37:14 | f2 | dyn(Args).T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:37:13:37:14 | f2 | dyn(Args).T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:37:13:37:14 | f2 | dyn(Output) | {EXTERNAL LOCATION} | (T_2) |
+| closure.rs:37:13:37:14 | f2 | dyn(Output).T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:37:13:37:14 | f2 | dyn(Output).T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:37:13:37:14 | f2 | dyn(Output).T1 | {EXTERNAL LOCATION} | bool |
+| closure.rs:37:18:37:31 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:37:18:37:31 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:37:18:37:31 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:37:18:37:31 | \|...\| ... | dyn(Args).T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:37:18:37:31 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | (T_2) |
+| closure.rs:37:18:37:31 | \|...\| ... | dyn(Output).T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:37:18:37:31 | \|...\| ... | dyn(Output).T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:37:18:37:31 | \|...\| ... | dyn(Output).T1 | {EXTERNAL LOCATION} | bool |
+| closure.rs:37:19:37:19 | x |  | {EXTERNAL LOCATION} | Option |
+| closure.rs:37:19:37:19 | x | T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:37:22:37:31 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
+| closure.rs:37:22:37:31 | TupleExpr | T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:37:22:37:31 | TupleExpr | T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:37:22:37:31 | TupleExpr | T1 | {EXTERNAL LOCATION} | bool |
+| closure.rs:37:23:37:23 | x |  | {EXTERNAL LOCATION} | Option |
+| closure.rs:37:23:37:23 | x | T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:37:26:37:30 | false |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:38:13:38:14 | _r |  | {EXTERNAL LOCATION} | Option |
+| closure.rs:38:13:38:14 | _r | T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:38:31:38:32 | f2 |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:38:31:38:32 | f2 | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:38:31:38:32 | f2 | dyn(Args).T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:38:31:38:32 | f2 | dyn(Args).T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:38:31:38:32 | f2 | dyn(Output) | {EXTERNAL LOCATION} | (T_2) |
+| closure.rs:38:31:38:32 | f2 | dyn(Output).T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:38:31:38:32 | f2 | dyn(Output).T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:38:31:38:32 | f2 | dyn(Output).T1 | {EXTERNAL LOCATION} | bool |
+| closure.rs:38:31:38:52 | f2(...) |  | {EXTERNAL LOCATION} | (T_2) |
+| closure.rs:38:31:38:52 | f2(...) | T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:38:31:38:52 | f2(...) | T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:38:31:38:52 | f2(...) | T1 | {EXTERNAL LOCATION} | bool |
+| closure.rs:38:31:38:54 | ... .0 |  | {EXTERNAL LOCATION} | Option |
+| closure.rs:38:31:38:54 | ... .0 | T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:38:33:38:52 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:38:33:38:52 | ArgList | T0 | {EXTERNAL LOCATION} | Option |
+| closure.rs:38:33:38:52 | ArgList | T0.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:38:34:38:51 | ...::default(...) |  | {EXTERNAL LOCATION} | Option |
+| closure.rs:38:34:38:51 | ...::default(...) | T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:43:44:43:44 | f |  | closure.rs:43:20:43:41 | F |
+| closure.rs:43:50:45:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:44:13:44:19 | _return |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:44:23:44:23 | f |  | closure.rs:43:20:43:41 | F |
+| closure.rs:44:23:44:29 | f(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:44:24:44:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:44:24:44:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:44:25:44:28 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:47:45:47:45 | f |  | closure.rs:47:28:47:42 | F |
+| closure.rs:47:51:49:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:48:13:48:19 | _return |  | {EXTERNAL LOCATION} | () |
+| closure.rs:48:23:48:23 | f |  | closure.rs:47:28:47:42 | F |
+| closure.rs:48:23:48:29 | f(...) |  | {EXTERNAL LOCATION} | () |
+| closure.rs:48:24:48:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:48:24:48:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:48:25:48:28 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:51:46:51:46 | f |  | closure.rs:51:22:51:43 | F |
+| closure.rs:51:52:54:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:52:13:52:15 | arg |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:52:19:52:36 | ...::default(...) |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:53:9:53:9 | f |  | closure.rs:51:22:51:43 | F |
+| closure.rs:53:9:53:14 | f(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:53:10:53:14 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:53:10:53:14 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:53:11:53:13 | arg |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:56:39:56:39 | f |  | closure.rs:56:20:56:36 | F |
+| closure.rs:56:45:56:45 | a |  | closure.rs:56:14:56:14 | A |
+| closure.rs:56:56:58:5 | { ... } |  | closure.rs:56:17:56:17 | B |
+| closure.rs:57:9:57:9 | f |  | closure.rs:56:20:56:36 | F |
+| closure.rs:57:9:57:12 | f(...) |  | closure.rs:56:17:56:17 | B |
+| closure.rs:57:10:57:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:57:10:57:12 | ArgList | T0 | closure.rs:56:14:56:14 | A |
+| closure.rs:57:11:57:11 | a |  | closure.rs:56:14:56:14 | A |
+| closure.rs:60:18:60:18 | f |  | closure.rs:60:21:60:43 | impl ... |
+| closure.rs:60:53:62:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:61:9:61:9 | f |  | closure.rs:60:21:60:43 | impl ... |
+| closure.rs:61:9:61:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:61:10:61:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:61:10:61:12 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
+| closure.rs:61:11:61:11 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:64:15:76:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:65:13:65:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:65:13:65:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:65:13:65:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:65:13:65:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:65:17:71:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:65:17:71:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:65:17:71:9 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:65:17:71:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:65:18:65:18 | x |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:65:34:71:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:66:13:70:13 | if x {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:66:16:66:16 | x |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:66:18:68:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:67:17:67:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:68:20:70:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:69:17:69:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:72:13:72:14 | _r |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:72:18:72:31 | apply(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:72:24:72:24 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:72:24:72:24 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:72:24:72:24 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:72:24:72:24 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:72:27:72:30 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:74:13:74:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:74:13:74:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:74:13:74:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:74:17:74:25 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:74:17:74:25 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:74:17:74:25 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:74:18:74:18 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:74:21:74:21 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:74:25:74:25 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:75:13:75:15 | _r2 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:75:19:75:30 | apply_two(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:75:29:75:29 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:75:29:75:29 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:75:29:75:29 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:80:47:80:47 | f |  | closure.rs:80:20:80:40 | F |
+| closure.rs:80:53:82:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:81:13:81:19 | _return |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:81:23:81:23 | f |  | closure.rs:80:20:80:40 | F |
+| closure.rs:81:23:81:29 | f(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:81:24:81:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:81:24:81:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:81:25:81:28 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:84:48:84:48 | f |  | closure.rs:84:28:84:41 | F |
+| closure.rs:84:54:86:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:85:13:85:19 | _return |  | {EXTERNAL LOCATION} | () |
+| closure.rs:85:23:85:23 | f |  | closure.rs:84:28:84:41 | F |
+| closure.rs:85:23:85:29 | f(...) |  | {EXTERNAL LOCATION} | () |
+| closure.rs:85:24:85:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:85:24:85:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:85:25:85:28 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:88:49:88:49 | f |  | closure.rs:88:22:88:42 | F |
+| closure.rs:88:55:91:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:89:13:89:15 | arg |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:89:19:89:36 | ...::default(...) |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:90:9:90:9 | f |  | closure.rs:88:22:88:42 | F |
+| closure.rs:90:9:90:14 | f(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:90:10:90:14 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:90:10:90:14 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:90:11:90:13 | arg |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:93:42:93:42 | f |  | closure.rs:93:20:93:35 | F |
+| closure.rs:93:48:93:48 | a |  | closure.rs:93:14:93:14 | A |
+| closure.rs:93:59:95:5 | { ... } |  | closure.rs:93:17:93:17 | B |
+| closure.rs:94:9:94:9 | f |  | closure.rs:93:20:93:35 | F |
+| closure.rs:94:9:94:12 | f(...) |  | closure.rs:93:17:93:17 | B |
+| closure.rs:94:10:94:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:94:10:94:12 | ArgList | T0 | closure.rs:93:14:93:14 | A |
+| closure.rs:94:11:94:11 | a |  | closure.rs:93:14:93:14 | A |
+| closure.rs:97:22:97:22 | f |  | closure.rs:97:25:97:46 | impl ... |
+| closure.rs:97:56:99:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:98:9:98:9 | f |  | closure.rs:97:25:97:46 | impl ... |
+| closure.rs:98:9:98:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:98:10:98:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:98:10:98:12 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
+| closure.rs:98:11:98:11 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:101:15:113:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:102:13:102:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:102:13:102:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:102:13:102:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:102:13:102:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:102:17:108:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:102:17:108:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:102:17:108:9 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:102:17:108:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:102:18:102:18 | x |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:102:34:108:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:103:13:107:13 | if x {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:103:16:103:16 | x |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:103:18:105:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:104:17:104:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:105:20:107:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:106:17:106:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:109:13:109:14 | _r |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:109:18:109:31 | apply(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:109:24:109:24 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:109:24:109:24 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:109:24:109:24 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:109:24:109:24 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:109:27:109:30 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:111:13:111:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:111:13:111:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:111:13:111:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:111:17:111:25 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:111:17:111:25 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:111:17:111:25 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:111:18:111:18 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:111:21:111:21 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:111:25:111:25 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:112:13:112:15 | _r2 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:112:19:112:30 | apply_two(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:112:29:112:29 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:112:29:112:29 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:112:29:112:29 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:117:40:117:40 | f |  | closure.rs:117:20:117:37 | F |
+| closure.rs:117:46:119:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:118:13:118:19 | _return |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:118:23:118:23 | f |  | closure.rs:117:20:117:37 | F |
+| closure.rs:118:23:118:29 | f(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:118:24:118:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:118:24:118:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:118:25:118:28 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:121:41:121:41 | f |  | closure.rs:121:28:121:38 | F |
+| closure.rs:121:47:123:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:122:13:122:19 | _return |  | {EXTERNAL LOCATION} | () |
+| closure.rs:122:23:122:23 | f |  | closure.rs:121:28:121:38 | F |
+| closure.rs:122:23:122:29 | f(...) |  | {EXTERNAL LOCATION} | () |
+| closure.rs:122:24:122:29 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:122:24:122:29 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:122:25:122:28 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:125:42:125:42 | f |  | closure.rs:125:22:125:39 | F |
+| closure.rs:125:48:128:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:126:13:126:15 | arg |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:126:19:126:36 | ...::default(...) |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:127:9:127:9 | f |  | closure.rs:125:22:125:39 | F |
+| closure.rs:127:9:127:14 | f(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:127:10:127:14 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:127:10:127:14 | ArgList | T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:127:11:127:13 | arg |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:130:35:130:35 | f |  | closure.rs:130:20:130:32 | F |
+| closure.rs:130:41:130:41 | a |  | closure.rs:130:14:130:14 | A |
+| closure.rs:130:52:132:5 | { ... } |  | closure.rs:130:17:130:17 | B |
+| closure.rs:131:9:131:9 | f |  | closure.rs:130:20:130:32 | F |
+| closure.rs:131:9:131:12 | f(...) |  | closure.rs:130:17:130:17 | B |
+| closure.rs:131:10:131:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:131:10:131:12 | ArgList | T0 | closure.rs:130:14:130:14 | A |
+| closure.rs:131:11:131:11 | a |  | closure.rs:130:14:130:14 | A |
+| closure.rs:134:18:134:18 | f |  | closure.rs:134:21:134:39 | impl ... |
+| closure.rs:134:49:136:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:135:9:135:9 | f |  | closure.rs:134:21:134:39 | impl ... |
+| closure.rs:135:9:135:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:135:10:135:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:135:10:135:12 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
+| closure.rs:135:11:135:11 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:138:15:150:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:139:13:139:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:139:13:139:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:139:13:139:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:139:13:139:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:139:17:145:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:139:17:145:9 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:139:17:145:9 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:139:17:145:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:139:18:139:18 | x |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:139:34:145:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:140:13:144:13 | if x {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:140:16:140:16 | x |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:140:18:142:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:141:17:141:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:142:20:144:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:143:17:143:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:146:13:146:14 | _r |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:146:18:146:31 | apply(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:146:24:146:24 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:146:24:146:24 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:146:24:146:24 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | bool |
+| closure.rs:146:24:146:24 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:146:27:146:30 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:148:13:148:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:148:13:148:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:148:13:148:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:148:17:148:25 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:148:17:148:25 | \|...\| ... | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:148:17:148:25 | \|...\| ... | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:148:18:148:18 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:148:21:148:21 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:148:25:148:25 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:149:13:149:15 | _r2 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:149:19:149:30 | apply_two(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:149:29:149:29 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:149:29:149:29 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:149:29:149:29 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:154:54:154:54 | f |  | {EXTERNAL LOCATION} | Box |
+| closure.rs:154:54:154:54 | f | A | {EXTERNAL LOCATION} | Global |
+| closure.rs:154:54:154:54 | f | T | closure.rs:154:26:154:51 | F |
+| closure.rs:154:65:154:67 | arg |  | closure.rs:154:20:154:20 | A |
+| closure.rs:154:78:156:5 | { ... } |  | closure.rs:154:23:154:23 | B |
+| closure.rs:155:9:155:9 | f |  | {EXTERNAL LOCATION} | Box |
+| closure.rs:155:9:155:9 | f | A | {EXTERNAL LOCATION} | Global |
+| closure.rs:155:9:155:9 | f | T | closure.rs:154:26:154:51 | F |
+| closure.rs:155:9:155:14 | f(...) |  | closure.rs:154:23:154:23 | B |
+| closure.rs:155:10:155:14 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:155:10:155:14 | ArgList | T0 | closure.rs:154:20:154:20 | A |
+| closure.rs:155:11:155:13 | arg |  | closure.rs:154:20:154:20 | A |
+| closure.rs:158:30:158:30 | f |  | {EXTERNAL LOCATION} | Box |
+| closure.rs:158:30:158:30 | f | A | {EXTERNAL LOCATION} | Global |
+| closure.rs:158:30:158:30 | f | T | {EXTERNAL LOCATION} | dyn FnOnce |
+| closure.rs:158:30:158:30 | f | T.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:158:30:158:30 | f | T.dyn(Args).T0 | closure.rs:158:24:158:24 | A |
+| closure.rs:158:30:158:30 | f | T.dyn(Output) | closure.rs:158:27:158:27 | B |
+| closure.rs:158:58:158:60 | arg |  | closure.rs:158:24:158:24 | A |
+| closure.rs:158:66:161:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:159:13:159:15 | _r1 |  | closure.rs:158:27:158:27 | B |
+| closure.rs:159:19:159:37 | apply_boxed(...) |  | closure.rs:158:27:158:27 | B |
+| closure.rs:159:31:159:31 | f |  | {EXTERNAL LOCATION} | Box |
+| closure.rs:159:31:159:31 | f | A | {EXTERNAL LOCATION} | Global |
+| closure.rs:159:31:159:31 | f | T | {EXTERNAL LOCATION} | dyn FnOnce |
+| closure.rs:159:31:159:31 | f | T.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:159:31:159:31 | f | T.dyn(Args).T0 | closure.rs:158:24:158:24 | A |
+| closure.rs:159:31:159:31 | f | T.dyn(Output) | closure.rs:158:27:158:27 | B |
+| closure.rs:159:34:159:36 | arg |  | closure.rs:158:24:158:24 | A |
+| closure.rs:160:13:160:15 | _r2 |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:160:19:160:57 | apply_boxed(...) |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:160:31:160:53 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| closure.rs:160:31:160:53 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| closure.rs:160:31:160:53 | ...::new(...) | T | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:160:31:160:53 | ...::new(...) | T.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:160:31:160:53 | ...::new(...) | T.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:160:31:160:53 | ...::new(...) | T.dyn(Output) | {EXTERNAL LOCATION} | bool |
+| closure.rs:160:40:160:52 | \|...\| true |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:160:40:160:52 | \|...\| true | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:160:40:160:52 | \|...\| true | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:160:40:160:52 | \|...\| true | dyn(Output) | {EXTERNAL LOCATION} | bool |
+| closure.rs:160:41:160:41 | _ |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:160:49:160:52 | true |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:160:56:160:56 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:165:34:165:34 | f |  | closure.rs:165:15:165:31 | F |
+| closure.rs:165:40:165:40 | a |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:165:55:167:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:166:9:166:9 | f |  | closure.rs:165:15:165:31 | F |
 | closure.rs:166:9:166:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
 | closure.rs:166:10:166:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:166:10:166:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
 | closure.rs:166:11:166:11 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:169:41:169:41 | f |  | closure.rs:169:15:169:34 | F |
-| closure.rs:169:47:169:47 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:169:62:171:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:170:9:170:9 | f |  | closure.rs:169:15:169:34 | F |
+| closure.rs:169:15:169:15 | f |  | closure.rs:169:18:169:36 | impl ... |
+| closure.rs:169:39:169:39 | a |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:169:54:171:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:170:9:170:9 | f |  | closure.rs:169:18:169:36 | impl ... |
 | closure.rs:170:9:170:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
 | closure.rs:170:10:170:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:170:10:170:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
 | closure.rs:170:11:170:11 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:173:15:173:15 | f |  | {EXTERNAL LOCATION} | &mut |
-| closure.rs:173:15:173:15 | f | TRefMut | {EXTERNAL LOCATION} | dyn FnMut |
-| closure.rs:173:15:173:15 | f | TRefMut.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:173:15:173:15 | f | TRefMut.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:173:15:173:15 | f | TRefMut.dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:173:46:173:46 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:173:61:175:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:174:9:174:9 | f |  | {EXTERNAL LOCATION} | &mut |
-| closure.rs:174:9:174:9 | f | TRefMut | {EXTERNAL LOCATION} | dyn FnMut |
-| closure.rs:174:9:174:9 | f | TRefMut.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:174:9:174:9 | f | TRefMut.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:174:9:174:9 | f | TRefMut.dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:173:15:173:15 | f |  | {EXTERNAL LOCATION} | & |
+| closure.rs:173:15:173:15 | f | TRef | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:173:15:173:15 | f | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:173:15:173:15 | f | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:173:15:173:15 | f | TRef.dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:173:39:173:39 | a |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:173:54:175:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:174:9:174:9 | f |  | {EXTERNAL LOCATION} | & |
+| closure.rs:174:9:174:9 | f | TRef | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:174:9:174:9 | f | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:174:9:174:9 | f | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:174:9:174:9 | f | TRef.dyn(Output) | {EXTERNAL LOCATION} | i64 |
 | closure.rs:174:9:174:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
 | closure.rs:174:10:174:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
 | closure.rs:174:10:174:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
 | closure.rs:174:11:174:11 | a |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:177:18:177:18 | f |  | closure.rs:177:21:177:37 | impl ... |
-| closure.rs:177:40:177:40 | a |  | closure.rs:177:15:177:15 | T |
-| closure.rs:177:53:179:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:178:9:178:9 | f |  | closure.rs:177:21:177:37 | impl ... |
+| closure.rs:177:41:177:41 | f |  | closure.rs:177:15:177:34 | F |
+| closure.rs:177:47:177:47 | a |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:177:62:179:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:178:9:178:9 | f |  | closure.rs:177:15:177:34 | F |
 | closure.rs:178:9:178:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
 | closure.rs:178:10:178:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:178:10:178:12 | ArgList | T0 | closure.rs:177:15:177:15 | T |
-| closure.rs:178:11:178:11 | a |  | closure.rs:177:15:177:15 | T |
-| closure.rs:181:42:181:42 | f |  | closure.rs:181:18:181:35 | F |
-| closure.rs:181:48:181:48 | a |  | closure.rs:181:15:181:15 | T |
+| closure.rs:178:10:178:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:178:11:178:11 | a |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:181:15:181:15 | f |  | {EXTERNAL LOCATION} | &mut |
+| closure.rs:181:15:181:15 | f | TRefMut | {EXTERNAL LOCATION} | dyn FnMut |
+| closure.rs:181:15:181:15 | f | TRefMut.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:181:15:181:15 | f | TRefMut.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:181:15:181:15 | f | TRefMut.dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:181:46:181:46 | a |  | {EXTERNAL LOCATION} | i64 |
 | closure.rs:181:61:183:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:182:9:182:9 | f |  | closure.rs:181:18:181:35 | F |
+| closure.rs:182:9:182:9 | f |  | {EXTERNAL LOCATION} | &mut |
+| closure.rs:182:9:182:9 | f | TRefMut | {EXTERNAL LOCATION} | dyn FnMut |
+| closure.rs:182:9:182:9 | f | TRefMut.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:182:9:182:9 | f | TRefMut.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:182:9:182:9 | f | TRefMut.dyn(Output) | {EXTERNAL LOCATION} | i64 |
 | closure.rs:182:9:182:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
 | closure.rs:182:10:182:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:182:10:182:12 | ArgList | T0 | closure.rs:181:15:181:15 | T |
-| closure.rs:182:11:182:11 | a |  | closure.rs:181:15:181:15 | T |
-| closure.rs:185:15:206:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:186:13:186:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:186:13:186:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:186:13:186:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:186:13:186:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:186:17:186:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:186:17:186:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:186:17:186:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:186:17:186:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:186:18:186:18 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:186:21:186:21 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:187:13:187:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:187:18:187:32 | apply1(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:187:25:187:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:187:25:187:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:187:25:187:25 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:187:25:187:25 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:187:28:187:31 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:189:13:189:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:189:13:189:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:189:13:189:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:189:13:189:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:189:17:189:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:189:17:189:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:189:17:189:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:189:17:189:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:189:18:189:18 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:189:21:189:21 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:190:13:190:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:190:18:190:32 | apply2(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:190:25:190:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:190:25:190:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:190:25:190:25 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:190:25:190:25 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:190:28:190:31 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:192:13:192:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:192:13:192:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:192:13:192:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:192:13:192:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:192:17:192:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:192:17:192:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:192:17:192:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:192:17:192:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:192:18:192:18 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:192:21:192:21 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:193:13:193:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:193:18:193:33 | apply3(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:193:25:193:26 | &f |  | {EXTERNAL LOCATION} | & |
-| closure.rs:193:25:193:26 | &f | TRef | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:193:25:193:26 | &f | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:193:25:193:26 | &f | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:193:25:193:26 | &f | TRef.dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:193:26:193:26 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:193:26:193:26 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:193:26:193:26 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:193:26:193:26 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:193:29:193:32 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:195:13:195:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:195:13:195:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:195:13:195:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:195:13:195:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:195:17:195:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:195:17:195:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:195:17:195:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:195:17:195:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:195:18:195:18 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:195:21:195:21 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:196:13:196:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:196:18:196:32 | apply4(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:196:25:196:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:196:25:196:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:196:25:196:25 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:196:25:196:25 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:196:28:196:31 | 4i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:198:17:198:17 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:198:17:198:17 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:198:21:198:25 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:198:21:198:25 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:199:13:199:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:199:18:199:37 | apply5(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:199:25:199:30 | &mut f |  | {EXTERNAL LOCATION} | &mut |
-| closure.rs:199:25:199:30 | &mut f | TRefMut | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:199:25:199:30 | &mut f | TRefMut.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:199:30:199:30 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:199:30:199:30 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:199:33:199:36 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:201:13:201:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:201:13:201:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:201:13:201:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:201:13:201:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:201:17:201:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:201:17:201:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:201:17:201:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:201:17:201:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:201:18:201:18 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:201:21:201:21 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:202:13:202:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:202:18:202:32 | apply6(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:202:25:202:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:202:25:202:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:202:25:202:25 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:202:25:202:25 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:202:28:202:31 | 6i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:204:13:204:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:204:13:204:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:204:13:204:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:204:13:204:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:204:17:204:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:204:17:204:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:204:17:204:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:204:17:204:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:204:18:204:18 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:204:21:204:21 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:205:13:205:14 | _r |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:205:18:205:32 | apply7(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:205:25:205:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:205:25:205:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:205:25:205:25 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:205:25:205:25 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
-| closure.rs:205:28:205:31 | 7i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:217:18:217:22 | SelfParam |  | {EXTERNAL LOCATION} | & |
-| closure.rs:217:18:217:22 | SelfParam | TRef | closure.rs:212:5:212:19 | S |
-| closure.rs:217:18:217:22 | SelfParam | TRef.T | closure.rs:214:10:214:10 | T |
-| closure.rs:217:42:219:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| closure.rs:217:42:219:9 | { ... } | TRef | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:217:42:219:9 | { ... } | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:217:42:219:9 | { ... } | TRef.dyn(Args).T0 | closure.rs:214:10:214:10 | T |
-| closure.rs:217:42:219:9 | { ... } | TRef.dyn(Output) | {EXTERNAL LOCATION} | bool |
-| closure.rs:218:13:218:22 | &... |  | {EXTERNAL LOCATION} | & |
-| closure.rs:218:13:218:22 | &... | TRef | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:218:13:218:22 | &... | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:218:13:218:22 | &... | TRef.dyn(Args).T0 | closure.rs:214:10:214:10 | T |
-| closure.rs:218:13:218:22 | &... | TRef.dyn(Output) | {EXTERNAL LOCATION} | bool |
-| closure.rs:218:14:218:22 | \|...\| false |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:218:14:218:22 | \|...\| false | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:218:14:218:22 | \|...\| false | dyn(Args).T0 | closure.rs:214:10:214:10 | T |
-| closure.rs:218:14:218:22 | \|...\| false | dyn(Output) | {EXTERNAL LOCATION} | bool |
-| closure.rs:218:15:218:15 | _ |  | closure.rs:214:10:214:10 | T |
-| closure.rs:218:18:218:22 | false |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:222:19:248:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| closure.rs:223:13:223:13 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:223:17:223:20 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:224:13:224:13 | v |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:224:17:224:34 | ...::default(...) |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:225:13:225:13 | s |  | closure.rs:212:5:212:19 | S |
-| closure.rs:225:13:225:13 | s | T | {EXTERNAL LOCATION} | i64 |
-| closure.rs:225:17:225:20 | S(...) |  | closure.rs:212:5:212:19 | S |
-| closure.rs:225:17:225:20 | S(...) | T | {EXTERNAL LOCATION} | i64 |
-| closure.rs:225:19:225:19 | v |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:226:13:226:16 | _ret |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:226:20:226:20 | s |  | closure.rs:212:5:212:19 | S |
-| closure.rs:226:20:226:20 | s | T | {EXTERNAL LOCATION} | i64 |
-| closure.rs:226:20:226:23 | s(...) |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:226:21:226:23 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:226:21:226:23 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
-| closure.rs:226:22:226:22 | x |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:228:13:228:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:228:17:228:20 | 0i32 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:229:13:229:13 | v |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:229:17:229:34 | ...::default(...) |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:230:13:230:13 | s |  | closure.rs:212:5:212:19 | S |
-| closure.rs:230:13:230:13 | s | T | {EXTERNAL LOCATION} | i32 |
-| closure.rs:230:17:230:20 | S(...) |  | closure.rs:212:5:212:19 | S |
-| closure.rs:230:17:230:20 | S(...) | T | {EXTERNAL LOCATION} | i32 |
-| closure.rs:230:19:230:19 | v |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:231:13:231:16 | _ret |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:231:20:231:20 | s |  | closure.rs:212:5:212:19 | S |
-| closure.rs:231:20:231:20 | s | T | {EXTERNAL LOCATION} | i32 |
-| closure.rs:231:20:231:23 | s(...) |  | {EXTERNAL LOCATION} | bool |
-| closure.rs:231:21:231:23 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:231:21:231:23 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:231:22:231:22 | x |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:232:13:232:17 | s_ref |  | {EXTERNAL LOCATION} | & |
-| closure.rs:232:13:232:17 | s_ref | TRef | closure.rs:212:5:212:19 | S |
-| closure.rs:232:13:232:17 | s_ref | TRef.T | {EXTERNAL LOCATION} | i32 |
-| closure.rs:232:21:232:22 | &s |  | {EXTERNAL LOCATION} | & |
-| closure.rs:232:21:232:22 | &s | TRef | closure.rs:212:5:212:19 | S |
-| closure.rs:232:21:232:22 | &s | TRef.T | {EXTERNAL LOCATION} | i32 |
-| closure.rs:232:22:232:22 | s |  | closure.rs:212:5:212:19 | S |
-| closure.rs:232:22:232:22 | s | T | {EXTERNAL LOCATION} | i32 |
-| closure.rs:240:20:240:24 | s_ref |  | {EXTERNAL LOCATION} | & |
-| closure.rs:240:20:240:24 | s_ref | TRef | closure.rs:212:5:212:19 | S |
-| closure.rs:240:20:240:24 | s_ref | TRef.T | {EXTERNAL LOCATION} | i32 |
-| closure.rs:240:25:240:27 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:240:25:240:27 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:240:26:240:26 | x |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:246:13:246:13 | c |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:246:13:246:13 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:246:13:246:13 | c | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:246:13:246:13 | c | dyn(Output) | {EXTERNAL LOCATION} | i32 |
-| closure.rs:246:17:246:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:246:17:246:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:246:17:246:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:246:17:246:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i32 |
-| closure.rs:246:18:246:18 | x |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:246:21:246:21 | x |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:247:9:247:12 | (...) |  | {EXTERNAL LOCATION} | & |
-| closure.rs:247:9:247:12 | (...) | TRef | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:247:9:247:12 | (...) | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:247:9:247:12 | (...) | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:247:9:247:12 | (...) | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
-| closure.rs:247:9:247:15 | ...(...) |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:247:10:247:11 | &c |  | {EXTERNAL LOCATION} | & |
-| closure.rs:247:10:247:11 | &c | TRef | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:247:10:247:11 | &c | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:247:10:247:11 | &c | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:247:10:247:11 | &c | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
-| closure.rs:247:11:247:11 | c |  | {EXTERNAL LOCATION} | dyn Fn |
-| closure.rs:247:11:247:11 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:247:11:247:11 | c | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:247:11:247:11 | c | dyn(Output) | {EXTERNAL LOCATION} | i32 |
-| closure.rs:247:13:247:15 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
-| closure.rs:247:13:247:15 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
-| closure.rs:247:14:247:14 | x |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:182:10:182:12 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:182:11:182:11 | a |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:185:18:185:18 | f |  | closure.rs:185:21:185:37 | impl ... |
+| closure.rs:185:40:185:40 | a |  | closure.rs:185:15:185:15 | T |
+| closure.rs:185:53:187:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:186:9:186:9 | f |  | closure.rs:185:21:185:37 | impl ... |
+| closure.rs:186:9:186:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:186:10:186:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:186:10:186:12 | ArgList | T0 | closure.rs:185:15:185:15 | T |
+| closure.rs:186:11:186:11 | a |  | closure.rs:185:15:185:15 | T |
+| closure.rs:189:42:189:42 | f |  | closure.rs:189:18:189:35 | F |
+| closure.rs:189:48:189:48 | a |  | closure.rs:189:15:189:15 | T |
+| closure.rs:189:61:191:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:190:9:190:9 | f |  | closure.rs:189:18:189:35 | F |
+| closure.rs:190:9:190:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:190:10:190:12 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:190:10:190:12 | ArgList | T0 | closure.rs:189:15:189:15 | T |
+| closure.rs:190:11:190:11 | a |  | closure.rs:189:15:189:15 | T |
+| closure.rs:193:15:214:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:194:13:194:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:194:13:194:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:194:13:194:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:194:13:194:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:194:17:194:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:194:17:194:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:194:17:194:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:194:17:194:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:194:18:194:18 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:194:21:194:21 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:195:13:195:14 | _r |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:195:18:195:32 | apply1(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:195:25:195:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:195:25:195:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:195:25:195:25 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:195:25:195:25 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:195:28:195:31 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:197:13:197:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:197:13:197:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:197:13:197:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:197:13:197:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:197:17:197:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:197:17:197:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:197:17:197:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:197:17:197:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:197:18:197:18 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:197:21:197:21 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:198:13:198:14 | _r |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:198:18:198:32 | apply2(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:198:25:198:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:198:25:198:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:198:25:198:25 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:198:25:198:25 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:198:28:198:31 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:200:13:200:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:200:13:200:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:200:13:200:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:200:13:200:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:200:17:200:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:200:17:200:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:200:17:200:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:200:17:200:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:200:18:200:18 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:200:21:200:21 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:201:13:201:14 | _r |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:201:18:201:33 | apply3(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:201:25:201:26 | &f |  | {EXTERNAL LOCATION} | & |
+| closure.rs:201:25:201:26 | &f | TRef | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:201:25:201:26 | &f | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:201:25:201:26 | &f | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:201:25:201:26 | &f | TRef.dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:201:26:201:26 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:201:26:201:26 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:201:26:201:26 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:201:26:201:26 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:201:29:201:32 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:203:13:203:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:203:13:203:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:203:13:203:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:203:13:203:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:203:17:203:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:203:17:203:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:203:17:203:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:203:17:203:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:203:18:203:18 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:203:21:203:21 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:204:13:204:14 | _r |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:204:18:204:32 | apply4(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:204:25:204:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:204:25:204:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:204:25:204:25 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:204:25:204:25 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:204:28:204:31 | 4i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:206:17:206:17 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:206:17:206:17 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:206:21:206:25 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:206:21:206:25 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:207:13:207:14 | _r |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:207:18:207:37 | apply5(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:207:25:207:30 | &mut f |  | {EXTERNAL LOCATION} | &mut |
+| closure.rs:207:25:207:30 | &mut f | TRefMut | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:207:25:207:30 | &mut f | TRefMut.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:207:30:207:30 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:207:30:207:30 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:207:33:207:36 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:209:13:209:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:209:13:209:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:209:13:209:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:209:13:209:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:209:17:209:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:209:17:209:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:209:17:209:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:209:17:209:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:209:18:209:18 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:209:21:209:21 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:210:13:210:14 | _r |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:210:18:210:32 | apply6(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:210:25:210:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:210:25:210:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:210:25:210:25 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:210:25:210:25 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:210:28:210:31 | 6i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:212:13:212:13 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:212:13:212:13 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:212:13:212:13 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:212:13:212:13 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:212:17:212:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:212:17:212:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:212:17:212:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:212:17:212:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:212:18:212:18 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:212:21:212:21 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:213:13:213:14 | _r |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:213:18:213:32 | apply7(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:213:25:213:25 | f |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:213:25:213:25 | f | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:213:25:213:25 | f | dyn(Args).T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:213:25:213:25 | f | dyn(Output) | {EXTERNAL LOCATION} | i64 |
+| closure.rs:213:28:213:31 | 7i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:225:18:225:22 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| closure.rs:225:18:225:22 | SelfParam | TRef | closure.rs:220:5:220:19 | S |
+| closure.rs:225:18:225:22 | SelfParam | TRef.T | closure.rs:222:10:222:10 | T |
+| closure.rs:225:42:227:9 | { ... } |  | {EXTERNAL LOCATION} | & |
+| closure.rs:225:42:227:9 | { ... } | TRef | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:225:42:227:9 | { ... } | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:225:42:227:9 | { ... } | TRef.dyn(Args).T0 | closure.rs:222:10:222:10 | T |
+| closure.rs:225:42:227:9 | { ... } | TRef.dyn(Output) | {EXTERNAL LOCATION} | bool |
+| closure.rs:226:13:226:22 | &... |  | {EXTERNAL LOCATION} | & |
+| closure.rs:226:13:226:22 | &... | TRef | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:226:13:226:22 | &... | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:226:13:226:22 | &... | TRef.dyn(Args).T0 | closure.rs:222:10:222:10 | T |
+| closure.rs:226:13:226:22 | &... | TRef.dyn(Output) | {EXTERNAL LOCATION} | bool |
+| closure.rs:226:14:226:22 | \|...\| false |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:226:14:226:22 | \|...\| false | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:226:14:226:22 | \|...\| false | dyn(Args).T0 | closure.rs:222:10:222:10 | T |
+| closure.rs:226:14:226:22 | \|...\| false | dyn(Output) | {EXTERNAL LOCATION} | bool |
+| closure.rs:226:15:226:15 | _ |  | closure.rs:222:10:222:10 | T |
+| closure.rs:226:18:226:22 | false |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:230:19:256:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| closure.rs:231:13:231:13 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:231:17:231:20 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:232:13:232:13 | v |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:232:17:232:34 | ...::default(...) |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:233:13:233:13 | s |  | closure.rs:220:5:220:19 | S |
+| closure.rs:233:13:233:13 | s | T | {EXTERNAL LOCATION} | i64 |
+| closure.rs:233:17:233:20 | S(...) |  | closure.rs:220:5:220:19 | S |
+| closure.rs:233:17:233:20 | S(...) | T | {EXTERNAL LOCATION} | i64 |
+| closure.rs:233:19:233:19 | v |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:234:13:234:16 | _ret |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:234:20:234:20 | s |  | closure.rs:220:5:220:19 | S |
+| closure.rs:234:20:234:20 | s | T | {EXTERNAL LOCATION} | i64 |
+| closure.rs:234:20:234:23 | s(...) |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:234:21:234:23 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:234:21:234:23 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
+| closure.rs:234:22:234:22 | x |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:236:13:236:13 | x |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:236:17:236:20 | 0i32 |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:237:13:237:13 | v |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:237:17:237:34 | ...::default(...) |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:238:13:238:13 | s |  | closure.rs:220:5:220:19 | S |
+| closure.rs:238:13:238:13 | s | T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:238:17:238:20 | S(...) |  | closure.rs:220:5:220:19 | S |
+| closure.rs:238:17:238:20 | S(...) | T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:238:19:238:19 | v |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:239:13:239:16 | _ret |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:239:20:239:20 | s |  | closure.rs:220:5:220:19 | S |
+| closure.rs:239:20:239:20 | s | T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:239:20:239:23 | s(...) |  | {EXTERNAL LOCATION} | bool |
+| closure.rs:239:21:239:23 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:239:21:239:23 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
+| closure.rs:239:22:239:22 | x |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:240:13:240:17 | s_ref |  | {EXTERNAL LOCATION} | & |
+| closure.rs:240:13:240:17 | s_ref | TRef | closure.rs:220:5:220:19 | S |
+| closure.rs:240:13:240:17 | s_ref | TRef.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:240:21:240:22 | &s |  | {EXTERNAL LOCATION} | & |
+| closure.rs:240:21:240:22 | &s | TRef | closure.rs:220:5:220:19 | S |
+| closure.rs:240:21:240:22 | &s | TRef.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:240:22:240:22 | s |  | closure.rs:220:5:220:19 | S |
+| closure.rs:240:22:240:22 | s | T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:248:20:248:24 | s_ref |  | {EXTERNAL LOCATION} | & |
+| closure.rs:248:20:248:24 | s_ref | TRef | closure.rs:220:5:220:19 | S |
+| closure.rs:248:20:248:24 | s_ref | TRef.T | {EXTERNAL LOCATION} | i32 |
+| closure.rs:248:25:248:27 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:248:25:248:27 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
+| closure.rs:248:26:248:26 | x |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:254:13:254:13 | c |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:254:13:254:13 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:254:13:254:13 | c | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
+| closure.rs:254:13:254:13 | c | dyn(Output) | {EXTERNAL LOCATION} | i32 |
+| closure.rs:254:17:254:21 | \|...\| x |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:254:17:254:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:254:17:254:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
+| closure.rs:254:17:254:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i32 |
+| closure.rs:254:18:254:18 | x |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:254:21:254:21 | x |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:255:9:255:15 | ...(...) |  | {EXTERNAL LOCATION} | i32 |
+| closure.rs:255:10:255:11 | &c |  | {EXTERNAL LOCATION} | & |
+| closure.rs:255:10:255:11 | &c | TRef | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:255:10:255:11 | &c | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:255:10:255:11 | &c | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
+| closure.rs:255:10:255:11 | &c | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
+| closure.rs:255:11:255:11 | c |  | {EXTERNAL LOCATION} | dyn Fn |
+| closure.rs:255:11:255:11 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:255:11:255:11 | c | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
+| closure.rs:255:11:255:11 | c | dyn(Output) | {EXTERNAL LOCATION} | i32 |
+| closure.rs:255:13:255:15 | ArgList |  | {EXTERNAL LOCATION} | (T_1) |
+| closure.rs:255:13:255:15 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
+| closure.rs:255:14:255:14 | x |  | {EXTERNAL LOCATION} | i32 |
 | dereference.rs:13:14:13:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:13:14:13:18 | SelfParam | TRef | dereference.rs:5:1:7:1 | MyIntPointer |
 | dereference.rs:13:29:15:5 | { ... } |  | {EXTERNAL LOCATION} | & |
@@ -7043,7 +6843,6 @@ inferType
 | dereference.rs:56:14:56:42 | MyIntPointer {...} |  | dereference.rs:5:1:7:1 | MyIntPointer |
 | dereference.rs:56:36:56:40 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:57:9:57:11 | _b3 |  | {EXTERNAL LOCATION} | bool |
-| dereference.rs:57:15:57:19 | (...) |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:57:15:57:33 | ... .is_positive() |  | {EXTERNAL LOCATION} | bool |
 | dereference.rs:57:16:57:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:57:17:57:18 | a3 |  | dereference.rs:5:1:7:1 | MyIntPointer |
@@ -7074,7 +6873,6 @@ inferType
 | dereference.rs:70:14:70:44 | MySmartPointer {...} | T | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:70:38:70:42 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:71:9:71:11 | _d3 |  | {EXTERNAL LOCATION} | bool |
-| dereference.rs:71:15:71:19 | (...) |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:71:15:71:33 | ... .is_positive() |  | {EXTERNAL LOCATION} | bool |
 | dereference.rs:71:16:71:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:71:17:71:18 | c3 |  | dereference.rs:18:1:20:1 | MySmartPointer |
@@ -7106,7 +6904,6 @@ inferType
 | dereference.rs:84:14:84:19 | &34i64 | TRef | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:84:15:84:19 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:85:9:85:11 | _f3 |  | {EXTERNAL LOCATION} | bool |
-| dereference.rs:85:15:85:19 | (...) |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:85:15:85:33 | ... .is_positive() |  | {EXTERNAL LOCATION} | bool |
 | dereference.rs:85:16:85:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:85:17:85:18 | e3 |  | {EXTERNAL LOCATION} | & |
@@ -7146,7 +6943,6 @@ inferType
 | dereference.rs:98:24:98:38 | ...::new(...) | T | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:98:33:98:37 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:99:9:99:11 | _h3 |  | {EXTERNAL LOCATION} | bool |
-| dereference.rs:99:15:99:19 | (...) |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:99:15:99:33 | ... .is_positive() |  | {EXTERNAL LOCATION} | bool |
 | dereference.rs:99:16:99:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:99:17:99:18 | g3 |  | {EXTERNAL LOCATION} | Box |
@@ -7209,37 +7005,34 @@ inferType
 | dereference.rs:116:12:116:12 | 0 |  | {EXTERNAL LOCATION} | i32 |
 | dereference.rs:143:19:151:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:144:17:144:26 | key_to_key |  | {EXTERNAL LOCATION} | HashMap |
+| dereference.rs:144:17:144:26 | key_to_key | A | {EXTERNAL LOCATION} | Global |
 | dereference.rs:144:17:144:26 | key_to_key | K | {EXTERNAL LOCATION} | & |
 | dereference.rs:144:17:144:26 | key_to_key | K.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:144:17:144:26 | key_to_key | S | {EXTERNAL LOCATION} | RandomState |
 | dereference.rs:144:17:144:26 | key_to_key | V | {EXTERNAL LOCATION} | & |
 | dereference.rs:144:17:144:26 | key_to_key | V.TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:144:30:144:57 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
-| dereference.rs:144:30:144:57 | ...::new(...) | K | {EXTERNAL LOCATION} | & |
-| dereference.rs:144:30:144:57 | ...::new(...) | K.TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:144:30:144:57 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
-| dereference.rs:144:30:144:57 | ...::new(...) | V | {EXTERNAL LOCATION} | & |
-| dereference.rs:144:30:144:57 | ...::new(...) | V.TRef | dereference.rs:122:5:123:21 | Key |
+| dereference.rs:144:30:144:54 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
+| dereference.rs:144:30:144:54 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| dereference.rs:144:30:144:54 | ...::new(...) | K | {EXTERNAL LOCATION} | & |
+| dereference.rs:144:30:144:54 | ...::new(...) | K.TRef | dereference.rs:122:5:123:21 | Key |
+| dereference.rs:144:30:144:54 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
+| dereference.rs:144:30:144:54 | ...::new(...) | V | {EXTERNAL LOCATION} | & |
+| dereference.rs:144:30:144:54 | ...::new(...) | V.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:145:17:145:19 | key |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:145:17:145:19 | key | TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:145:17:145:19 | key | TRef | {EXTERNAL LOCATION} | & |
-| dereference.rs:145:17:145:19 | key | TRef.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:145:23:145:29 | &... |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:145:23:145:29 | &... | TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:145:23:145:29 | &... | TRef | {EXTERNAL LOCATION} | & |
-| dereference.rs:145:23:145:29 | &... | TRef.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:145:24:145:29 | Key {...} |  | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:146:9:149:9 | if ... {...} |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:146:16:146:28 | Some(...) |  | {EXTERNAL LOCATION} | Option |
 | dereference.rs:146:16:146:28 | Some(...) | T | {EXTERNAL LOCATION} | & |
-| dereference.rs:146:16:146:28 | Some(...) | T.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:146:16:146:28 | Some(...) | T.TRef | {EXTERNAL LOCATION} | & |
 | dereference.rs:146:16:146:28 | Some(...) | T.TRef.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:146:21:146:27 | ref_key |  | {EXTERNAL LOCATION} | & |
-| dereference.rs:146:21:146:27 | ref_key | TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:146:21:146:27 | ref_key | TRef | {EXTERNAL LOCATION} | & |
 | dereference.rs:146:21:146:27 | ref_key | TRef.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:146:32:146:41 | key_to_key |  | {EXTERNAL LOCATION} | HashMap |
+| dereference.rs:146:32:146:41 | key_to_key | A | {EXTERNAL LOCATION} | Global |
 | dereference.rs:146:32:146:41 | key_to_key | K | {EXTERNAL LOCATION} | & |
 | dereference.rs:146:32:146:41 | key_to_key | K.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:146:32:146:41 | key_to_key | S | {EXTERNAL LOCATION} | RandomState |
@@ -7247,24 +7040,19 @@ inferType
 | dereference.rs:146:32:146:41 | key_to_key | V.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:146:32:146:50 | key_to_key.get(...) |  | {EXTERNAL LOCATION} | Option |
 | dereference.rs:146:32:146:50 | key_to_key.get(...) | T | {EXTERNAL LOCATION} | & |
-| dereference.rs:146:32:146:50 | key_to_key.get(...) | T.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:146:32:146:50 | key_to_key.get(...) | T.TRef | {EXTERNAL LOCATION} | & |
 | dereference.rs:146:32:146:50 | key_to_key.get(...) | T.TRef.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:146:47:146:49 | key |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:146:47:146:49 | key | TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:146:47:146:49 | key | TRef | {EXTERNAL LOCATION} | & |
-| dereference.rs:146:47:146:49 | key | TRef.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:146:52:149:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:148:13:148:15 | key |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:148:13:148:15 | key | TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:148:13:148:15 | key | TRef | {EXTERNAL LOCATION} | & |
-| dereference.rs:148:13:148:15 | key | TRef.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:148:13:148:25 | ... = ... |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:148:19:148:25 | ref_key |  | {EXTERNAL LOCATION} | & |
-| dereference.rs:148:19:148:25 | ref_key | TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:148:19:148:25 | ref_key | TRef | {EXTERNAL LOCATION} | & |
 | dereference.rs:148:19:148:25 | ref_key | TRef.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:150:9:150:18 | key_to_key |  | {EXTERNAL LOCATION} | HashMap |
+| dereference.rs:150:9:150:18 | key_to_key | A | {EXTERNAL LOCATION} | Global |
 | dereference.rs:150:9:150:18 | key_to_key | K | {EXTERNAL LOCATION} | & |
 | dereference.rs:150:9:150:18 | key_to_key | K.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:150:9:150:18 | key_to_key | S | {EXTERNAL LOCATION} | RandomState |
@@ -7273,16 +7061,10 @@ inferType
 | dereference.rs:150:9:150:35 | key_to_key.insert(...) |  | {EXTERNAL LOCATION} | Option |
 | dereference.rs:150:9:150:35 | key_to_key.insert(...) | T | {EXTERNAL LOCATION} | & |
 | dereference.rs:150:9:150:35 | key_to_key.insert(...) | T.TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:150:9:150:35 | key_to_key.insert(...) | T.TRef | {EXTERNAL LOCATION} | & |
-| dereference.rs:150:9:150:35 | key_to_key.insert(...) | T.TRef.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:150:27:150:29 | key |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:150:27:150:29 | key | TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:150:27:150:29 | key | TRef | {EXTERNAL LOCATION} | & |
-| dereference.rs:150:27:150:29 | key | TRef.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:150:32:150:34 | key |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:150:32:150:34 | key | TRef | dereference.rs:122:5:123:21 | Key |
-| dereference.rs:150:32:150:34 | key | TRef | {EXTERNAL LOCATION} | & |
-| dereference.rs:150:32:150:34 | key | TRef.TRef | dereference.rs:122:5:123:21 | Key |
 | dereference.rs:156:16:156:19 | SelfParam |  | dereference.rs:155:5:157:5 | Self [trait MyTrait1] |
 | dereference.rs:163:16:163:19 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:163:16:163:19 | SelfParam | TRef | dereference.rs:159:5:159:13 | S |
@@ -7290,9 +7072,8 @@ inferType
 | dereference.rs:164:13:164:13 | S |  | dereference.rs:159:5:159:13 | S |
 | dereference.rs:170:16:170:19 | SelfParam |  | {EXTERNAL LOCATION} | &mut |
 | dereference.rs:170:16:170:19 | SelfParam | TRefMut | dereference.rs:159:5:159:13 | S |
-| dereference.rs:170:29:172:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:170:29:172:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | dereference.rs:171:13:171:14 | 42 |  | {EXTERNAL LOCATION} | i32 |
-| dereference.rs:171:13:171:14 | 42 |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:176:16:176:19 | SelfParam |  | dereference.rs:175:5:177:5 | Self [trait MyTrait2] |
 | dereference.rs:176:22:176:24 | arg |  | dereference.rs:175:20:175:21 | T1 |
 | dereference.rs:181:16:181:19 | SelfParam |  | dereference.rs:159:5:159:13 | S |
@@ -7303,13 +7084,10 @@ inferType
 | dereference.rs:188:16:188:19 | SelfParam |  | dereference.rs:159:5:159:13 | S |
 | dereference.rs:188:22:188:24 | arg |  | {EXTERNAL LOCATION} | &mut |
 | dereference.rs:188:22:188:24 | arg | TRefMut | dereference.rs:159:5:159:13 | S |
-| dereference.rs:188:42:190:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:188:42:190:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | dereference.rs:189:13:189:14 | 42 |  | {EXTERNAL LOCATION} | i32 |
-| dereference.rs:189:13:189:14 | 42 |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:193:19:200:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | dereference.rs:194:13:194:13 | x |  | dereference.rs:159:5:159:13 | S |
-| dereference.rs:194:17:194:20 | (...) |  | {EXTERNAL LOCATION} | & |
-| dereference.rs:194:17:194:20 | (...) | TRef | dereference.rs:159:5:159:13 | S |
 | dereference.rs:194:17:194:26 | ... .foo() |  | dereference.rs:159:5:159:13 | S |
 | dereference.rs:194:18:194:19 | &S |  | {EXTERNAL LOCATION} | & |
 | dereference.rs:194:18:194:19 | &S | TRef | dereference.rs:159:5:159:13 | S |
@@ -7318,8 +7096,6 @@ inferType
 | dereference.rs:195:17:195:17 | S |  | dereference.rs:159:5:159:13 | S |
 | dereference.rs:195:17:195:23 | S.foo() |  | dereference.rs:159:5:159:13 | S |
 | dereference.rs:196:13:196:13 | z |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:196:17:196:24 | (...) |  | {EXTERNAL LOCATION} | &mut |
-| dereference.rs:196:17:196:24 | (...) | TRefMut | dereference.rs:159:5:159:13 | S |
 | dereference.rs:196:17:196:30 | ... .foo() |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:196:18:196:23 | &mut S |  | {EXTERNAL LOCATION} | &mut |
 | dereference.rs:196:18:196:23 | &mut S | TRefMut | dereference.rs:159:5:159:13 | S |
@@ -7422,14 +7198,12 @@ inferType
 | dyn_type.rs:60:46:60:46 | a |  | dyn_type.rs:60:18:60:43 | A |
 | dyn_type.rs:60:78:62:1 | { ... } |  | {EXTERNAL LOCATION} | Box |
 | dyn_type.rs:60:78:62:1 | { ... } | A | {EXTERNAL LOCATION} | Global |
-| dyn_type.rs:60:78:62:1 | { ... } | T | dyn_type.rs:10:1:13:1 | dyn GenericGet |
-| dyn_type.rs:60:78:62:1 | { ... } | T.dyn(A) | dyn_type.rs:60:18:60:43 | A |
+| dyn_type.rs:60:78:62:1 | { ... } | T | dyn_type.rs:33:1:36:1 | GenStruct |
+| dyn_type.rs:60:78:62:1 | { ... } | T.A | dyn_type.rs:60:18:60:43 | A |
 | dyn_type.rs:61:5:61:36 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
 | dyn_type.rs:61:5:61:36 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| dyn_type.rs:61:5:61:36 | ...::new(...) | T | dyn_type.rs:10:1:13:1 | dyn GenericGet |
 | dyn_type.rs:61:5:61:36 | ...::new(...) | T | dyn_type.rs:33:1:36:1 | GenStruct |
 | dyn_type.rs:61:5:61:36 | ...::new(...) | T.A | dyn_type.rs:60:18:60:43 | A |
-| dyn_type.rs:61:5:61:36 | ...::new(...) | T.dyn(A) | dyn_type.rs:60:18:60:43 | A |
 | dyn_type.rs:61:14:61:35 | GenStruct {...} |  | dyn_type.rs:33:1:36:1 | GenStruct |
 | dyn_type.rs:61:14:61:35 | GenStruct {...} | A | dyn_type.rs:60:18:60:43 | A |
 | dyn_type.rs:61:33:61:33 | a |  | dyn_type.rs:60:18:60:43 | A |
@@ -7437,7 +7211,6 @@ inferType
 | dyn_type.rs:64:25:64:27 | obj | TRef | dyn_type.rs:5:1:8:1 | dyn MyTrait1 |
 | dyn_type.rs:64:45:66:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | dyn_type.rs:65:9:65:15 | _result |  | {EXTERNAL LOCATION} | String |
-| dyn_type.rs:65:19:65:24 | (...) |  | dyn_type.rs:5:1:8:1 | dyn MyTrait1 |
 | dyn_type.rs:65:19:65:28 | ... .m() |  | {EXTERNAL LOCATION} | String |
 | dyn_type.rs:65:20:65:23 | * ... |  | dyn_type.rs:5:1:8:1 | dyn MyTrait1 |
 | dyn_type.rs:65:21:65:23 | obj |  | {EXTERNAL LOCATION} | & |
@@ -7447,8 +7220,6 @@ inferType
 | dyn_type.rs:68:27:68:29 | obj | TRef.dyn(A) | {EXTERNAL LOCATION} | String |
 | dyn_type.rs:68:57:71:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | dyn_type.rs:69:9:69:16 | _result1 |  | {EXTERNAL LOCATION} | String |
-| dyn_type.rs:69:20:69:25 | (...) |  | dyn_type.rs:10:1:13:1 | dyn GenericGet |
-| dyn_type.rs:69:20:69:25 | (...) | dyn(A) | {EXTERNAL LOCATION} | String |
 | dyn_type.rs:69:20:69:31 | ... .get() |  | {EXTERNAL LOCATION} | String |
 | dyn_type.rs:69:21:69:24 | * ... |  | dyn_type.rs:10:1:13:1 | dyn GenericGet |
 | dyn_type.rs:69:21:69:24 | * ... | dyn(A) | {EXTERNAL LOCATION} | String |
@@ -7471,8 +7242,6 @@ inferType
 | dyn_type.rs:74:15:74:33 | get_box_trait(...) | T.dyn(A) | {EXTERNAL LOCATION} | bool |
 | dyn_type.rs:74:29:74:32 | true |  | {EXTERNAL LOCATION} | bool |
 | dyn_type.rs:75:9:75:15 | _result |  | {EXTERNAL LOCATION} | bool |
-| dyn_type.rs:75:19:75:24 | (...) |  | dyn_type.rs:10:1:13:1 | dyn GenericGet |
-| dyn_type.rs:75:19:75:24 | (...) | dyn(A) | {EXTERNAL LOCATION} | bool |
 | dyn_type.rs:75:19:75:30 | ... .get() |  | {EXTERNAL LOCATION} | bool |
 | dyn_type.rs:75:20:75:23 | * ... |  | dyn_type.rs:10:1:13:1 | dyn GenericGet |
 | dyn_type.rs:75:20:75:23 | * ... | dyn(A) | {EXTERNAL LOCATION} | bool |
@@ -7514,9 +7283,6 @@ inferType
 | dyn_type.rs:87:9:90:5 | TuplePat | T1 | {EXTERNAL LOCATION} | bool |
 | dyn_type.rs:88:9:88:11 | _gp |  | {EXTERNAL LOCATION} | i64 |
 | dyn_type.rs:89:9:89:11 | _ap |  | {EXTERNAL LOCATION} | bool |
-| dyn_type.rs:90:9:90:14 | (...) |  | dyn_type.rs:15:1:19:1 | dyn AssocTrait |
-| dyn_type.rs:90:9:90:14 | (...) | dyn(AP) | {EXTERNAL LOCATION} | bool |
-| dyn_type.rs:90:9:90:14 | (...) | dyn(GP) | {EXTERNAL LOCATION} | i64 |
 | dyn_type.rs:90:9:90:20 | ... .get() |  | {EXTERNAL LOCATION} | (T_2) |
 | dyn_type.rs:90:9:90:20 | ... .get() | T0 | {EXTERNAL LOCATION} | i64 |
 | dyn_type.rs:90:9:90:20 | ... .get() | T1 | {EXTERNAL LOCATION} | bool |
@@ -8526,14 +8292,13 @@ inferType
 | main.rs:581:9:581:13 | thing | TRef | main.rs:580:17:580:37 | T |
 | main.rs:581:9:581:21 | thing.get_a() |  | main.rs:580:14:580:14 | A |
 | main.rs:585:44:585:48 | thing |  | main.rs:585:24:585:41 | S |
-| main.rs:585:61:588:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:585:61:588:5 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:586:13:586:15 | _ms |  | {EXTERNAL LOCATION} | Option |
 | main.rs:586:13:586:15 | _ms | T | main.rs:585:24:585:41 | S |
 | main.rs:586:19:586:23 | thing |  | main.rs:585:24:585:41 | S |
 | main.rs:586:19:586:31 | thing.get_a() |  | {EXTERNAL LOCATION} | Option |
 | main.rs:586:19:586:31 | thing.get_a() | T | main.rs:585:24:585:41 | S |
 | main.rs:587:9:587:9 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:587:9:587:9 | 0 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:593:55:593:59 | thing |  | {EXTERNAL LOCATION} | & |
 | main.rs:593:55:593:59 | thing | TRef | main.rs:593:25:593:52 | S |
 | main.rs:593:66:596:5 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -8936,7 +8701,6 @@ inferType
 | main.rs:781:17:781:26 | ...::m2(...) |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:781:24:781:25 | S1 |  | main.rs:623:5:624:14 | S1 |
 | main.rs:782:13:782:13 | y |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:782:22:782:31 | ...::m2(...) |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:782:29:782:30 | S2 |  | main.rs:625:5:626:14 | S2 |
 | main.rs:799:15:799:18 | SelfParam |  | main.rs:787:5:791:5 | MyEnum |
 | main.rs:799:15:799:18 | SelfParam | A | main.rs:798:10:798:10 | T |
@@ -8989,10 +8753,8 @@ inferType
 | main.rs:843:16:843:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:843:16:843:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:843:20:843:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:843:22:845:13 | { ... } |  | main.rs:837:20:837:22 | Tr2 |
 | main.rs:844:17:844:20 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:844:17:844:20 | self | TRef | main.rs:837:5:849:5 | Self [trait MyTrait2] |
-| main.rs:844:17:844:25 | self.m1() |  | main.rs:837:20:837:22 | Tr2 |
 | main.rs:845:20:847:13 | { ... } |  | main.rs:837:20:837:22 | Tr2 |
 | main.rs:846:17:846:31 | ...::m1(...) |  | main.rs:837:20:837:22 | Tr2 |
 | main.rs:846:26:846:30 | * ... |  | main.rs:837:5:849:5 | Self [trait MyTrait2] |
@@ -9221,7 +8983,6 @@ inferType
 | main.rs:981:22:981:25 | SelfParam | Fst | main.rs:980:10:980:12 | Fst |
 | main.rs:981:22:981:25 | SelfParam | Snd | main.rs:980:15:980:17 | Snd |
 | main.rs:981:35:988:9 | { ... } |  | main.rs:980:15:980:17 | Snd |
-| main.rs:982:13:987:13 | match self { ... } |  | file://:0:0:0:0 | ! |
 | main.rs:982:13:987:13 | match self { ... } |  | main.rs:980:15:980:17 | Snd |
 | main.rs:982:19:982:22 | self |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:982:19:982:22 | self | Fst | main.rs:980:10:980:12 | Fst |
@@ -9229,20 +8990,16 @@ inferType
 | main.rs:983:17:983:38 | ...::PairNone(...) |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:983:17:983:38 | ...::PairNone(...) | Fst | main.rs:980:10:980:12 | Fst |
 | main.rs:983:17:983:38 | ...::PairNone(...) | Snd | main.rs:980:15:980:17 | Snd |
-| main.rs:983:43:983:82 | MacroExpr |  | file://:0:0:0:0 | ! |
 | main.rs:983:50:983:81 | "PairNone has no second elemen... |  | {EXTERNAL LOCATION} | & |
 | main.rs:983:50:983:81 | "PairNone has no second elemen... | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:983:50:983:81 | ...::panic_fmt(...) |  | file://:0:0:0:0 | ! |
 | main.rs:983:50:983:81 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:983:50:983:81 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:984:17:984:38 | ...::PairFst(...) |  | main.rs:972:5:978:5 | PairOption |
 | main.rs:984:17:984:38 | ...::PairFst(...) | Fst | main.rs:980:10:980:12 | Fst |
 | main.rs:984:17:984:38 | ...::PairFst(...) | Snd | main.rs:980:15:980:17 | Snd |
 | main.rs:984:37:984:37 | _ |  | main.rs:980:10:980:12 | Fst |
-| main.rs:984:43:984:81 | MacroExpr |  | file://:0:0:0:0 | ! |
 | main.rs:984:50:984:80 | "PairFst has no second element... |  | {EXTERNAL LOCATION} | & |
 | main.rs:984:50:984:80 | "PairFst has no second element... | TRef | {EXTERNAL LOCATION} | str |
-| main.rs:984:50:984:80 | ...::panic_fmt(...) |  | file://:0:0:0:0 | ! |
 | main.rs:984:50:984:80 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | main.rs:984:50:984:80 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:985:17:985:40 | ...::PairSnd(...) |  | main.rs:972:5:978:5 | PairOption |
@@ -9607,11 +9364,8 @@ inferType
 | main.rs:1170:29:1170:33 | SelfParam | TRef | {EXTERNAL LOCATION} | & |
 | main.rs:1170:29:1170:33 | SelfParam | TRef.TRef | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1170:43:1172:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1171:13:1171:22 | (...) |  | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1171:13:1171:24 | ... .a |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1171:14:1171:21 | * ... |  | main.rs:1143:5:1146:5 | MyInt |
-| main.rs:1171:15:1171:21 | (...) |  | {EXTERNAL LOCATION} | & |
-| main.rs:1171:15:1171:21 | (...) | TRef | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1171:16:1171:20 | * ... |  | {EXTERNAL LOCATION} | & |
 | main.rs:1171:16:1171:20 | * ... | TRef | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1171:17:1171:20 | self |  | {EXTERNAL LOCATION} | & |
@@ -9620,7 +9374,6 @@ inferType
 | main.rs:1175:33:1175:36 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1175:33:1175:36 | SelfParam | TRef | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1175:46:1177:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1176:13:1176:19 | (...) |  | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1176:13:1176:21 | ... .a |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1176:14:1176:18 | * ... |  | main.rs:1143:5:1146:5 | MyInt |
 | main.rs:1176:15:1176:18 | self |  | {EXTERNAL LOCATION} | & |
@@ -9771,8 +9524,6 @@ inferType
 | main.rs:1207:18:1207:35 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1207:18:1207:35 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1207:18:1207:35 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:1207:26:1207:30 | (...) |  | main.rs:1137:5:1138:19 | S |
-| main.rs:1207:26:1207:30 | (...) | T | main.rs:1140:5:1141:14 | S2 |
 | main.rs:1207:26:1207:35 | ... .m1() |  | main.rs:1140:5:1141:14 | S2 |
 | main.rs:1207:27:1207:29 | * ... |  | main.rs:1137:5:1138:19 | S |
 | main.rs:1207:27:1207:29 | * ... | T | main.rs:1140:5:1141:14 | S2 |
@@ -9936,10 +9687,12 @@ inferType
 | main.rs:1298:15:1298:19 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1298:15:1298:19 | SelfParam | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1298:31:1300:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1298:31:1300:9 | { ... } | TRef | main.rs:1295:5:1295:13 | S |
+| main.rs:1298:31:1300:9 | { ... } | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1298:31:1300:9 | { ... } | TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1298:31:1300:9 | { ... } | TRef.TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1298:31:1300:9 | { ... } | TRef.TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1299:13:1299:19 | &... |  | {EXTERNAL LOCATION} | & |
 | main.rs:1299:13:1299:19 | &... | TRef | {EXTERNAL LOCATION} | & |
-| main.rs:1299:13:1299:19 | &... | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1299:13:1299:19 | &... | TRef.TRef | {EXTERNAL LOCATION} | & |
 | main.rs:1299:13:1299:19 | &... | TRef.TRef.TRef | {EXTERNAL LOCATION} | & |
 | main.rs:1299:13:1299:19 | &... | TRef.TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
@@ -9955,10 +9708,12 @@ inferType
 | main.rs:1302:15:1302:25 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1302:15:1302:25 | SelfParam | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1302:37:1304:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1302:37:1304:9 | { ... } | TRef | main.rs:1295:5:1295:13 | S |
+| main.rs:1302:37:1304:9 | { ... } | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1302:37:1304:9 | { ... } | TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1302:37:1304:9 | { ... } | TRef.TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1302:37:1304:9 | { ... } | TRef.TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1303:13:1303:19 | &... |  | {EXTERNAL LOCATION} | & |
 | main.rs:1303:13:1303:19 | &... | TRef | {EXTERNAL LOCATION} | & |
-| main.rs:1303:13:1303:19 | &... | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1303:13:1303:19 | &... | TRef.TRef | {EXTERNAL LOCATION} | & |
 | main.rs:1303:13:1303:19 | &... | TRef.TRef.TRef | {EXTERNAL LOCATION} | & |
 | main.rs:1303:13:1303:19 | &... | TRef.TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
@@ -9980,10 +9735,12 @@ inferType
 | main.rs:1310:15:1310:15 | x |  | {EXTERNAL LOCATION} | & |
 | main.rs:1310:15:1310:15 | x | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1310:34:1312:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1310:34:1312:9 | { ... } | TRef | main.rs:1295:5:1295:13 | S |
+| main.rs:1310:34:1312:9 | { ... } | TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1310:34:1312:9 | { ... } | TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1310:34:1312:9 | { ... } | TRef.TRef.TRef | {EXTERNAL LOCATION} | & |
+| main.rs:1310:34:1312:9 | { ... } | TRef.TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1311:13:1311:16 | &... |  | {EXTERNAL LOCATION} | & |
 | main.rs:1311:13:1311:16 | &... | TRef | {EXTERNAL LOCATION} | & |
-| main.rs:1311:13:1311:16 | &... | TRef | main.rs:1295:5:1295:13 | S |
 | main.rs:1311:13:1311:16 | &... | TRef.TRef | {EXTERNAL LOCATION} | & |
 | main.rs:1311:13:1311:16 | &... | TRef.TRef.TRef | {EXTERNAL LOCATION} | & |
 | main.rs:1311:13:1311:16 | &... | TRef.TRef.TRef.TRef | main.rs:1295:5:1295:13 | S |
@@ -10236,12 +9993,12 @@ inferType
 | main.rs:1414:26:1414:30 | SelfParam | TRef | {EXTERNAL LOCATION} | [;] |
 | main.rs:1414:26:1414:30 | SelfParam | TRef.TArray | main.rs:1413:14:1413:23 | T |
 | main.rs:1414:39:1416:13 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1414:39:1416:13 | { ... } | TRef | main.rs:1413:14:1413:23 | T |
 | main.rs:1415:17:1415:20 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1415:17:1415:20 | self | TRef | {EXTERNAL LOCATION} | [;] |
 | main.rs:1415:17:1415:20 | self | TRef.TArray | main.rs:1413:14:1413:23 | T |
+| main.rs:1415:17:1415:27 | self.get(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:1415:17:1415:27 | self.get(...) | T | {EXTERNAL LOCATION} | & |
 | main.rs:1415:17:1415:36 | ... .unwrap() |  | {EXTERNAL LOCATION} | & |
-| main.rs:1415:17:1415:36 | ... .unwrap() | TRef | main.rs:1413:14:1413:23 | T |
 | main.rs:1415:26:1415:26 | 0 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1418:31:1420:13 | { ... } |  | main.rs:1413:14:1413:23 | T |
 | main.rs:1419:17:1419:28 | ...::default(...) |  | main.rs:1413:14:1413:23 | T |
@@ -10274,14 +10031,12 @@ inferType
 | main.rs:1428:26:1428:30 | SelfParam | TRef | {EXTERNAL LOCATION} | [] |
 | main.rs:1428:26:1428:30 | SelfParam | TRef.TSlice | main.rs:1427:14:1427:23 | T |
 | main.rs:1428:39:1430:13 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:1428:39:1430:13 | { ... } | TRef | main.rs:1427:14:1427:23 | T |
 | main.rs:1429:17:1429:20 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1429:17:1429:20 | self | TRef | {EXTERNAL LOCATION} | [] |
 | main.rs:1429:17:1429:20 | self | TRef.TSlice | main.rs:1427:14:1427:23 | T |
 | main.rs:1429:17:1429:27 | self.get(...) |  | {EXTERNAL LOCATION} | Option |
 | main.rs:1429:17:1429:27 | self.get(...) | T | {EXTERNAL LOCATION} | & |
 | main.rs:1429:17:1429:36 | ... .unwrap() |  | {EXTERNAL LOCATION} | & |
-| main.rs:1429:17:1429:36 | ... .unwrap() | TRef | main.rs:1427:14:1427:23 | T |
 | main.rs:1429:26:1429:26 | 0 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1432:31:1434:13 | { ... } |  | main.rs:1427:14:1427:23 | T |
 | main.rs:1433:17:1433:28 | ...::default(...) |  | main.rs:1427:14:1427:23 | T |
@@ -10289,10 +10044,8 @@ inferType
 | main.rs:1437:13:1437:13 | s | TRef | {EXTERNAL LOCATION} | [] |
 | main.rs:1437:13:1437:13 | s | TRef.TSlice | {EXTERNAL LOCATION} | i32 |
 | main.rs:1437:25:1437:34 | &... |  | {EXTERNAL LOCATION} | & |
-| main.rs:1437:25:1437:34 | &... | TRef | {EXTERNAL LOCATION} | [] |
 | main.rs:1437:25:1437:34 | &... | TRef | {EXTERNAL LOCATION} | [;] |
 | main.rs:1437:25:1437:34 | &... | TRef.TArray | {EXTERNAL LOCATION} | i32 |
-| main.rs:1437:25:1437:34 | &... | TRef.TSlice | {EXTERNAL LOCATION} | i32 |
 | main.rs:1437:26:1437:34 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:1437:26:1437:34 | [...] | TArray | {EXTERNAL LOCATION} | i32 |
 | main.rs:1437:27:1437:27 | 1 |  | {EXTERNAL LOCATION} | i32 |
@@ -10454,7 +10207,6 @@ inferType
 | main.rs:1498:12:1498:15 | cond |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1498:17:1500:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1499:17:1499:17 | z |  | {EXTERNAL LOCATION} | () |
-| main.rs:1499:21:1499:27 | (...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:1499:22:1499:22 | a |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:1499:22:1499:26 | ... = ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:1499:26:1499:26 | 1 |  | {EXTERNAL LOCATION} | i32 |
@@ -10823,7 +10575,6 @@ inferType
 | main.rs:1726:31:1726:35 | other | TRef | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1726:75:1728:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
 | main.rs:1726:75:1728:9 | { ... } | T | {EXTERNAL LOCATION} | Ordering |
-| main.rs:1727:13:1727:29 | (...) |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1727:13:1727:63 | ... .partial_cmp(...) |  | {EXTERNAL LOCATION} | Option |
 | main.rs:1727:13:1727:63 | ... .partial_cmp(...) | T | {EXTERNAL LOCATION} | Ordering |
 | main.rs:1727:14:1727:17 | self |  | {EXTERNAL LOCATION} | & |
@@ -10835,7 +10586,6 @@ inferType
 | main.rs:1727:23:1727:28 | self.y |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1727:43:1727:62 | &... |  | {EXTERNAL LOCATION} | & |
 | main.rs:1727:43:1727:62 | &... | TRef | {EXTERNAL LOCATION} | i64 |
-| main.rs:1727:44:1727:62 | (...) |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1727:45:1727:49 | other |  | {EXTERNAL LOCATION} | & |
 | main.rs:1727:45:1727:49 | other | TRef | main.rs:1510:5:1515:5 | Vec2 |
 | main.rs:1727:45:1727:51 | other.x |  | {EXTERNAL LOCATION} | i64 |
@@ -10931,32 +10681,26 @@ inferType
 | main.rs:1748:13:1748:13 | b |  | main.rs:1747:18:1747:23 | T |
 | main.rs:1751:16:1882:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:1755:13:1755:18 | i64_eq |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1755:22:1755:35 | (...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1755:23:1755:26 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1755:23:1755:34 | ... == ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1755:31:1755:34 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1756:13:1756:18 | i64_ne |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1756:22:1756:35 | (...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1756:23:1756:26 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1756:23:1756:34 | ... != ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1756:31:1756:34 | 4i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1757:13:1757:18 | i64_lt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1757:22:1757:34 | (...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1757:23:1757:26 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1757:23:1757:33 | ... < ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1757:30:1757:33 | 6i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1758:13:1758:18 | i64_le |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1758:22:1758:35 | (...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1758:23:1758:26 | 7i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1758:23:1758:34 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1758:31:1758:34 | 8i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1759:13:1759:18 | i64_gt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1759:22:1759:35 | (...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1759:23:1759:26 | 9i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1759:23:1759:34 | ... > ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1759:30:1759:34 | 10i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1760:13:1760:18 | i64_ge |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1760:22:1760:37 | (...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1760:23:1760:27 | 11i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1760:23:1760:36 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
 | main.rs:1760:32:1760:36 | 12i64 |  | {EXTERNAL LOCATION} | i64 |
@@ -11277,7 +11021,6 @@ inferType
 | main.rs:1971:18:1971:22 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:1971:18:1971:22 | SelfParam | TRef | main.rs:1938:5:1938:22 | S3 |
 | main.rs:1971:18:1971:22 | SelfParam | TRef.T3 | main.rs:1970:10:1970:17 | T |
-| main.rs:1971:30:1974:9 | { ... } |  | main.rs:1970:10:1970:17 | T |
 | main.rs:1972:17:1972:21 | S3(...) |  | {EXTERNAL LOCATION} | & |
 | main.rs:1972:17:1972:21 | S3(...) |  | main.rs:1938:5:1938:22 | S3 |
 | main.rs:1972:17:1972:21 | S3(...) | TRef | main.rs:1938:5:1938:22 | S3 |
@@ -11285,7 +11028,6 @@ inferType
 | main.rs:1972:25:1972:28 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:1972:25:1972:28 | self | TRef | main.rs:1938:5:1938:22 | S3 |
 | main.rs:1972:25:1972:28 | self | TRef.T3 | main.rs:1970:10:1970:17 | T |
-| main.rs:1973:13:1973:21 | t.clone() |  | main.rs:1970:10:1970:17 | T |
 | main.rs:1977:45:1979:5 | { ... } |  | main.rs:1935:5:1936:14 | S1 |
 | main.rs:1978:9:1978:10 | S1 |  | main.rs:1935:5:1936:14 | S1 |
 | main.rs:1981:41:1981:41 | t |  | main.rs:1981:26:1981:38 | B |
@@ -11293,50 +11035,38 @@ inferType
 | main.rs:1982:9:1982:9 | t |  | main.rs:1981:26:1981:38 | B |
 | main.rs:1982:9:1982:17 | t.get_a() |  | main.rs:1981:23:1981:23 | A |
 | main.rs:1985:34:1985:34 | x |  | main.rs:1985:24:1985:31 | T |
-| main.rs:1985:59:1987:5 | { ... } |  | main.rs:1985:43:1985:57 | impl ... |
-| main.rs:1985:59:1987:5 | { ... } | impl(T) | main.rs:1985:24:1985:31 | T |
+| main.rs:1985:59:1987:5 | { ... } |  | main.rs:1938:5:1938:22 | S3 |
+| main.rs:1985:59:1987:5 | { ... } | T3 | main.rs:1985:24:1985:31 | T |
 | main.rs:1986:9:1986:13 | S3(...) |  | main.rs:1938:5:1938:22 | S3 |
-| main.rs:1986:9:1986:13 | S3(...) |  | main.rs:1985:43:1985:57 | impl ... |
 | main.rs:1986:9:1986:13 | S3(...) | T3 | main.rs:1985:24:1985:31 | T |
-| main.rs:1986:9:1986:13 | S3(...) | impl(T) | main.rs:1985:24:1985:31 | T |
 | main.rs:1986:12:1986:12 | x |  | main.rs:1985:24:1985:31 | T |
 | main.rs:1989:34:1989:34 | x |  | main.rs:1989:24:1989:31 | T |
 | main.rs:1989:67:1991:5 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| main.rs:1989:67:1991:5 | { ... } | T | main.rs:1989:50:1989:64 | impl ... |
-| main.rs:1989:67:1991:5 | { ... } | T.impl(T) | main.rs:1989:24:1989:31 | T |
+| main.rs:1989:67:1991:5 | { ... } | T | main.rs:1938:5:1938:22 | S3 |
+| main.rs:1989:67:1991:5 | { ... } | T.T3 | main.rs:1989:24:1989:31 | T |
 | main.rs:1990:9:1990:19 | Some(...) |  | {EXTERNAL LOCATION} | Option |
 | main.rs:1990:9:1990:19 | Some(...) | T | main.rs:1938:5:1938:22 | S3 |
-| main.rs:1990:9:1990:19 | Some(...) | T | main.rs:1989:50:1989:64 | impl ... |
 | main.rs:1990:9:1990:19 | Some(...) | T.T3 | main.rs:1989:24:1989:31 | T |
-| main.rs:1990:9:1990:19 | Some(...) | T.impl(T) | main.rs:1989:24:1989:31 | T |
 | main.rs:1990:14:1990:18 | S3(...) |  | main.rs:1938:5:1938:22 | S3 |
 | main.rs:1990:14:1990:18 | S3(...) | T3 | main.rs:1989:24:1989:31 | T |
 | main.rs:1990:17:1990:17 | x |  | main.rs:1989:24:1989:31 | T |
 | main.rs:1993:34:1993:34 | x |  | main.rs:1993:24:1993:31 | T |
 | main.rs:1993:78:1995:5 | { ... } |  | {EXTERNAL LOCATION} | (T_2) |
-| main.rs:1993:78:1995:5 | { ... } | T0 | main.rs:1993:44:1993:58 | impl ... |
-| main.rs:1993:78:1995:5 | { ... } | T0.impl(T) | main.rs:1993:24:1993:31 | T |
-| main.rs:1993:78:1995:5 | { ... } | T1 | main.rs:1993:61:1993:75 | impl ... |
-| main.rs:1993:78:1995:5 | { ... } | T1.impl(T) | main.rs:1993:24:1993:31 | T |
+| main.rs:1993:78:1995:5 | { ... } | T0 | main.rs:1938:5:1938:22 | S3 |
+| main.rs:1993:78:1995:5 | { ... } | T0.T3 | main.rs:1993:24:1993:31 | T |
+| main.rs:1993:78:1995:5 | { ... } | T1 | main.rs:1938:5:1938:22 | S3 |
+| main.rs:1993:78:1995:5 | { ... } | T1.T3 | main.rs:1993:24:1993:31 | T |
 | main.rs:1994:9:1994:30 | TupleExpr |  | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:1994:9:1994:30 | TupleExpr | T0 | main.rs:1938:5:1938:22 | S3 |
-| main.rs:1994:9:1994:30 | TupleExpr | T0 | main.rs:1993:44:1993:58 | impl ... |
 | main.rs:1994:9:1994:30 | TupleExpr | T0.T3 | main.rs:1993:24:1993:31 | T |
-| main.rs:1994:9:1994:30 | TupleExpr | T0.impl(T) | main.rs:1993:24:1993:31 | T |
 | main.rs:1994:9:1994:30 | TupleExpr | T1 | main.rs:1938:5:1938:22 | S3 |
-| main.rs:1994:9:1994:30 | TupleExpr | T1 | main.rs:1993:61:1993:75 | impl ... |
 | main.rs:1994:9:1994:30 | TupleExpr | T1.T3 | main.rs:1993:24:1993:31 | T |
-| main.rs:1994:9:1994:30 | TupleExpr | T1.impl(T) | main.rs:1993:24:1993:31 | T |
 | main.rs:1994:10:1994:22 | S3(...) |  | main.rs:1938:5:1938:22 | S3 |
-| main.rs:1994:10:1994:22 | S3(...) |  | main.rs:1993:44:1993:58 | impl ... |
 | main.rs:1994:10:1994:22 | S3(...) | T3 | main.rs:1993:24:1993:31 | T |
-| main.rs:1994:10:1994:22 | S3(...) | impl(T) | main.rs:1993:24:1993:31 | T |
 | main.rs:1994:13:1994:13 | x |  | main.rs:1993:24:1993:31 | T |
 | main.rs:1994:13:1994:21 | x.clone() |  | main.rs:1993:24:1993:31 | T |
 | main.rs:1994:25:1994:29 | S3(...) |  | main.rs:1938:5:1938:22 | S3 |
-| main.rs:1994:25:1994:29 | S3(...) |  | main.rs:1993:61:1993:75 | impl ... |
 | main.rs:1994:25:1994:29 | S3(...) | T3 | main.rs:1993:24:1993:31 | T |
-| main.rs:1994:25:1994:29 | S3(...) | impl(T) | main.rs:1993:24:1993:31 | T |
 | main.rs:1994:28:1994:28 | x |  | main.rs:1993:24:1993:31 | T |
 | main.rs:1997:26:1997:26 | t |  | main.rs:1997:29:1997:43 | impl ... |
 | main.rs:1997:51:1999:5 | { ... } |  | main.rs:1997:23:1997:23 | A |
@@ -11504,18 +11234,13 @@ inferType
 | main.rs:2107:14:2107:18 | value | TRef | {EXTERNAL LOCATION} | i64 |
 | main.rs:2115:19:2115:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2115:25:2115:29 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2115:46:2121:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2115:46:2121:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2116:13:2120:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2116:13:2120:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2116:16:2116:20 | value |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2116:22:2118:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2116:22:2118:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2117:17:2117:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2117:17:2117:17 | 1 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2118:20:2120:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2118:20:2120:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2119:17:2119:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2119:17:2119:17 | 0 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2130:19:2130:22 | SelfParam |  | main.rs:2124:5:2124:19 | S |
 | main.rs:2130:19:2130:22 | SelfParam | T | main.rs:2126:10:2126:17 | T |
 | main.rs:2130:25:2130:29 | other |  | main.rs:2124:5:2124:19 | S |
@@ -11524,7 +11249,6 @@ inferType
 | main.rs:2130:54:2132:9 | { ... } | T | main.rs:2126:10:2126:17 | T::Output[MyAdd] |
 | main.rs:2131:13:2131:39 | S(...) |  | main.rs:2124:5:2124:19 | S |
 | main.rs:2131:13:2131:39 | S(...) | T | main.rs:2126:10:2126:17 | T::Output[MyAdd] |
-| main.rs:2131:15:2131:22 | (...) |  | main.rs:2126:10:2126:17 | T |
 | main.rs:2131:15:2131:38 | ... .my_add(...) |  | main.rs:2126:10:2126:17 | T::Output[MyAdd] |
 | main.rs:2131:16:2131:19 | self |  | main.rs:2124:5:2124:19 | S |
 | main.rs:2131:16:2131:19 | self | T | main.rs:2126:10:2126:17 | T |
@@ -11539,7 +11263,6 @@ inferType
 | main.rs:2139:51:2141:9 | { ... } | T | main.rs:2135:10:2135:17 | T::Output[MyAdd] |
 | main.rs:2140:13:2140:37 | S(...) |  | main.rs:2124:5:2124:19 | S |
 | main.rs:2140:13:2140:37 | S(...) | T | main.rs:2135:10:2135:17 | T::Output[MyAdd] |
-| main.rs:2140:15:2140:22 | (...) |  | main.rs:2135:10:2135:17 | T |
 | main.rs:2140:15:2140:36 | ... .my_add(...) |  | main.rs:2135:10:2135:17 | T::Output[MyAdd] |
 | main.rs:2140:16:2140:19 | self |  | main.rs:2124:5:2124:19 | S |
 | main.rs:2140:16:2140:19 | self | T | main.rs:2135:10:2135:17 | T |
@@ -11553,7 +11276,6 @@ inferType
 | main.rs:2151:55:2153:9 | { ... } | T | main.rs:2144:14:2144:14 | T::Output[MyAdd] |
 | main.rs:2152:13:2152:37 | S(...) |  | main.rs:2124:5:2124:19 | S |
 | main.rs:2152:13:2152:37 | S(...) | T | main.rs:2144:14:2144:14 | T::Output[MyAdd] |
-| main.rs:2152:15:2152:22 | (...) |  | main.rs:2144:14:2144:14 | T |
 | main.rs:2152:15:2152:36 | ... .my_add(...) |  | main.rs:2144:14:2144:14 | T::Output[MyAdd] |
 | main.rs:2152:16:2152:19 | self |  | main.rs:2124:5:2124:19 | S |
 | main.rs:2152:16:2152:19 | self | T | main.rs:2144:14:2144:14 | T |
@@ -11565,18 +11287,13 @@ inferType
 | main.rs:2163:40:2165:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2164:13:2164:17 | value |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2170:20:2170:24 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2170:41:2176:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2170:41:2176:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2171:13:2175:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2171:13:2175:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2171:16:2171:20 | value |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2171:22:2173:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2171:22:2173:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2172:17:2172:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2172:17:2172:17 | 1 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2173:20:2175:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2173:20:2175:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2174:17:2174:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2174:17:2174:17 | 0 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2181:21:2181:25 | value |  | main.rs:2179:19:2179:19 | T |
 | main.rs:2181:31:2181:31 | x |  | main.rs:2179:5:2182:5 | Self [trait MyFrom2] |
 | main.rs:2186:21:2186:25 | value |  | {EXTERNAL LOCATION} | i64 |
@@ -11595,26 +11312,20 @@ inferType
 | main.rs:2204:15:2204:15 | x |  | main.rs:2202:5:2208:5 | Self [trait MySelfTrait] |
 | main.rs:2207:15:2207:15 | x |  | main.rs:2202:5:2208:5 | Self [trait MySelfTrait] |
 | main.rs:2212:15:2212:15 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2212:31:2214:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2213:13:2213:13 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2213:13:2213:17 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2213:17:2213:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2217:15:2217:15 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2217:32:2219:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2218:13:2218:13 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2218:13:2218:17 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2218:17:2218:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2224:15:2224:15 | x |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2224:31:2226:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2224:31:2226:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2225:13:2225:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2225:13:2225:13 | 0 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2229:15:2229:15 | x |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2229:32:2231:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2230:13:2230:13 | x |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2234:16:2259:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2235:13:2235:13 | x |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2235:22:2235:23 | 73 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2235:22:2235:23 | 73 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2236:9:2236:9 | x |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2236:9:2236:22 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2236:18:2236:21 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
@@ -11690,9 +11401,8 @@ inferType
 | main.rs:2267:13:2267:25 | MyCallable {...} |  | main.rs:2263:5:2263:24 | MyCallable |
 | main.rs:2270:17:2270:21 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:2270:17:2270:21 | SelfParam | TRef | main.rs:2263:5:2263:24 | MyCallable |
-| main.rs:2270:31:2272:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2270:31:2272:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2271:13:2271:13 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2271:13:2271:13 | 1 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2275:16:2382:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2278:9:2278:29 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2278:13:2278:13 | i |  | {EXTERNAL LOCATION} | i32 |
@@ -11738,9 +11448,7 @@ inferType
 | main.rs:2282:21:2282:31 | [...] | TArray | {EXTERNAL LOCATION} | u8 |
 | main.rs:2282:22:2282:24 | 1u8 |  | {EXTERNAL LOCATION} | u8 |
 | main.rs:2282:27:2282:27 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2282:27:2282:27 | 2 |  | {EXTERNAL LOCATION} | u8 |
 | main.rs:2282:30:2282:30 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2282:30:2282:30 | 3 |  | {EXTERNAL LOCATION} | u8 |
 | main.rs:2283:9:2283:25 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2283:13:2283:13 | u |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2283:13:2283:13 | u |  | {EXTERNAL LOCATION} | u8 |
@@ -11764,13 +11472,9 @@ inferType
 | main.rs:2288:26:2288:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2288:31:2288:39 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2288:31:2288:39 | [...] | TArray | {EXTERNAL LOCATION} | i32 |
-| main.rs:2288:31:2288:39 | [...] | TArray | {EXTERNAL LOCATION} | u32 |
 | main.rs:2288:32:2288:32 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2288:32:2288:32 | 1 |  | {EXTERNAL LOCATION} | u32 |
 | main.rs:2288:35:2288:35 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2288:35:2288:35 | 2 |  | {EXTERNAL LOCATION} | u32 |
 | main.rs:2288:38:2288:38 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2288:38:2288:38 | 3 |  | {EXTERNAL LOCATION} | u32 |
 | main.rs:2289:9:2289:25 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2289:13:2289:13 | u |  | {EXTERNAL LOCATION} | u32 |
 | main.rs:2289:18:2289:22 | vals3 |  | {EXTERNAL LOCATION} | [;] |
@@ -11781,9 +11485,7 @@ inferType
 | main.rs:2291:26:2291:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2291:31:2291:36 | [1; 3] |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2291:31:2291:36 | [1; 3] | TArray | {EXTERNAL LOCATION} | i32 |
-| main.rs:2291:31:2291:36 | [1; 3] | TArray | {EXTERNAL LOCATION} | u64 |
 | main.rs:2291:32:2291:32 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2291:32:2291:32 | 1 |  | {EXTERNAL LOCATION} | u64 |
 | main.rs:2291:35:2291:35 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2292:9:2292:25 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2292:13:2292:13 | u |  | {EXTERNAL LOCATION} | u64 |
@@ -11911,7 +11613,6 @@ inferType
 | main.rs:2325:19:2325:25 | 0u8..10 | Idx | {EXTERNAL LOCATION} | i32 |
 | main.rs:2325:19:2325:25 | 0u8..10 | Idx | {EXTERNAL LOCATION} | u8 |
 | main.rs:2325:24:2325:25 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2325:24:2325:25 | 10 |  | {EXTERNAL LOCATION} | u8 |
 | main.rs:2325:28:2325:29 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2326:13:2326:17 | range |  | {EXTERNAL LOCATION} | Range |
 | main.rs:2326:13:2326:17 | range | Idx | {EXTERNAL LOCATION} | i32 |
@@ -11948,40 +11649,62 @@ inferType
 | main.rs:2336:25:2336:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2340:13:2340:17 | vals3 |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2340:13:2340:17 | vals3 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2340:13:2340:17 | vals3 | T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2340:21:2340:33 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2340:21:2340:33 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2340:21:2340:33 | MacroExpr | T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2340:26:2340:26 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2340:29:2340:29 | 2 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2340:32:2340:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2341:9:2341:25 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2341:13:2341:13 | i |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2341:18:2341:22 | vals3 |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2341:18:2341:22 | vals3 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2341:18:2341:22 | vals3 | T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2341:24:2341:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2343:13:2343:18 | vals4a |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2343:13:2343:18 | vals4a | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2343:13:2343:18 | vals4a | T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2343:13:2343:18 | vals4a | T | {EXTERNAL LOCATION} | u16 |
-| main.rs:2343:32:2343:43 | [...] |  | {EXTERNAL LOCATION} | [;] |
-| main.rs:2343:32:2343:43 | [...] | TArray | {EXTERNAL LOCATION} | i32 |
-| main.rs:2343:32:2343:43 | [...] | TArray | {EXTERNAL LOCATION} | u16 |
-| main.rs:2343:32:2343:52 | ... .to_vec() |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2343:32:2343:52 | ... .to_vec() | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2343:32:2343:52 | ... .to_vec() | T | {EXTERNAL LOCATION} | u16 |
-| main.rs:2343:33:2343:36 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2343:39:2343:39 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2343:42:2343:42 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2343:22:2343:33 | [...] |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2343:22:2343:33 | [...] | TArray | {EXTERNAL LOCATION} | i32 |
+| main.rs:2343:22:2343:33 | [...] | TArray | {EXTERNAL LOCATION} | u16 |
+| main.rs:2343:22:2343:42 | ... .to_vec() |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2343:22:2343:42 | ... .to_vec() | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2343:22:2343:42 | ... .to_vec() | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2343:22:2343:42 | ... .to_vec() | T | {EXTERNAL LOCATION} | u16 |
+| main.rs:2343:23:2343:26 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2343:29:2343:29 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2343:32:2343:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2344:9:2344:26 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2344:13:2344:13 | u |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2344:13:2344:13 | u |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:2344:18:2344:23 | vals4a |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2344:18:2344:23 | vals4a | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2344:18:2344:23 | vals4a | T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2344:18:2344:23 | vals4a | T | {EXTERNAL LOCATION} | u16 |
 | main.rs:2344:25:2344:26 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2346:13:2346:18 | vals4b |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2346:13:2346:18 | vals4b | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2346:13:2346:18 | vals4b | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2346:13:2346:18 | vals4b | T | {EXTERNAL LOCATION} | u16 |
 | main.rs:2346:22:2346:33 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2346:22:2346:33 | [...] | TArray | {EXTERNAL LOCATION} | i32 |
 | main.rs:2346:22:2346:33 | [...] | TArray | {EXTERNAL LOCATION} | u16 |
+| main.rs:2346:22:2346:42 | ... .to_vec() |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2346:22:2346:42 | ... .to_vec() | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2346:22:2346:42 | ... .to_vec() | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2346:22:2346:42 | ... .to_vec() | T | {EXTERNAL LOCATION} | u16 |
 | main.rs:2346:23:2346:26 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
 | main.rs:2346:29:2346:29 | 2 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2346:32:2346:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2347:9:2347:26 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2347:13:2347:13 | u |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2347:13:2347:13 | u |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2347:18:2347:23 | vals4b |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2347:18:2347:23 | vals4b | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2347:18:2347:23 | vals4b | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2347:18:2347:23 | vals4b | T | {EXTERNAL LOCATION} | u16 |
 | main.rs:2347:25:2347:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2349:13:2349:17 | vals5 |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2349:13:2349:17 | vals5 | A | {EXTERNAL LOCATION} | Global |
@@ -12012,9 +11735,13 @@ inferType
 | main.rs:2352:32:2352:43 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2352:32:2352:43 | [...] | TArray | {EXTERNAL LOCATION} | i32 |
 | main.rs:2352:32:2352:43 | [...] | TArray | {EXTERNAL LOCATION} | u64 |
+| main.rs:2352:32:2352:50 | ... .iter() |  | {EXTERNAL LOCATION} | Iter |
+| main.rs:2352:32:2352:50 | ... .iter() | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2352:32:2352:50 | ... .iter() | T | {EXTERNAL LOCATION} | u64 |
 | main.rs:2352:32:2352:60 | ... .collect() |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2352:32:2352:60 | ... .collect() | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2352:32:2352:60 | ... .collect() | T | {EXTERNAL LOCATION} | & |
+| main.rs:2352:32:2352:60 | ... .collect() | T.TRef | {EXTERNAL LOCATION} | i32 |
 | main.rs:2352:32:2352:60 | ... .collect() | T.TRef | {EXTERNAL LOCATION} | u64 |
 | main.rs:2352:33:2352:36 | 1u64 |  | {EXTERNAL LOCATION} | u64 |
 | main.rs:2352:39:2352:39 | 2 |  | {EXTERNAL LOCATION} | i32 |
@@ -12046,28 +11773,43 @@ inferType
 | main.rs:2357:24:2357:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2359:13:2359:19 | matrix1 |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2359:13:2359:19 | matrix1 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2359:13:2359:19 | matrix1 | T | {EXTERNAL LOCATION} | Vec |
+| main.rs:2359:13:2359:19 | matrix1 | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2359:13:2359:19 | matrix1 | T.T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2359:23:2359:50 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2359:23:2359:50 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2359:28:2359:37 | (...) |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2359:28:2359:37 | (...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2359:23:2359:50 | MacroExpr | T | {EXTERNAL LOCATION} | Vec |
+| main.rs:2359:23:2359:50 | MacroExpr | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2359:23:2359:50 | MacroExpr | T.T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2359:28:2359:37 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2359:28:2359:37 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2359:28:2359:37 | MacroExpr | T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2359:33:2359:33 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2359:36:2359:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2359:40:2359:49 | (...) |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2359:40:2359:49 | (...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2359:40:2359:49 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2359:40:2359:49 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2359:40:2359:49 | MacroExpr | T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2359:45:2359:45 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2359:48:2359:48 | 4 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2361:13:2361:13 | _ |  | {EXTERNAL LOCATION} | () |
 | main.rs:2361:17:2364:9 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2361:21:2361:23 | row |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2361:21:2361:23 | row | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2361:21:2361:23 | row | T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2361:28:2361:34 | matrix1 |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2361:28:2361:34 | matrix1 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2361:28:2361:34 | matrix1 | T | {EXTERNAL LOCATION} | Vec |
+| main.rs:2361:28:2361:34 | matrix1 | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2361:28:2361:34 | matrix1 | T.T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2361:36:2364:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2362:13:2363:13 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2362:17:2362:20 | cell |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2362:25:2362:27 | row |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2362:25:2362:27 | row | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2362:25:2362:27 | row | T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2362:29:2363:13 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2366:17:2366:20 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2366:17:2366:20 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2366:17:2366:20 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2366:17:2366:20 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2366:17:2366:20 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -12075,6 +11817,7 @@ inferType
 | main.rs:2366:17:2366:20 | map1 | V.T | {EXTERNAL LOCATION} | & |
 | main.rs:2366:17:2366:20 | map1 | V.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2366:24:2366:55 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2366:24:2366:55 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2366:24:2366:55 | ...::new(...) | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2366:24:2366:55 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2366:24:2366:55 | ...::new(...) | V | {EXTERNAL LOCATION} | Box |
@@ -12082,6 +11825,7 @@ inferType
 | main.rs:2366:24:2366:55 | ...::new(...) | V.T | {EXTERNAL LOCATION} | & |
 | main.rs:2366:24:2366:55 | ...::new(...) | V.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2367:9:2367:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2367:9:2367:12 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2367:9:2367:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2367:9:2367:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2367:9:2367:12 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -12101,6 +11845,7 @@ inferType
 | main.rs:2367:33:2367:37 | "one" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2367:33:2367:37 | "one" | TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2368:9:2368:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2368:9:2368:12 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2368:9:2368:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2368:9:2368:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2368:9:2368:12 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -12123,6 +11868,7 @@ inferType
 | main.rs:2369:13:2369:15 | key |  | {EXTERNAL LOCATION} | & |
 | main.rs:2369:13:2369:15 | key | TRef | {EXTERNAL LOCATION} | i32 |
 | main.rs:2369:20:2369:23 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2369:20:2369:23 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2369:20:2369:23 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2369:20:2369:23 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2369:20:2369:23 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -12143,6 +11889,7 @@ inferType
 | main.rs:2370:13:2370:17 | value | TRef.T | {EXTERNAL LOCATION} | & |
 | main.rs:2370:13:2370:17 | value | TRef.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2370:22:2370:25 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2370:22:2370:25 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2370:22:2370:25 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2370:22:2370:25 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2370:22:2370:25 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -12173,6 +11920,7 @@ inferType
 | main.rs:2371:19:2371:23 | value | TRef.T | {EXTERNAL LOCATION} | & |
 | main.rs:2371:19:2371:23 | value | TRef.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2371:29:2371:32 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2371:29:2371:32 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2371:29:2371:32 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2371:29:2371:32 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2371:29:2371:32 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -12204,6 +11952,7 @@ inferType
 | main.rs:2372:19:2372:23 | value | TRef.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2372:29:2372:33 | &map1 |  | {EXTERNAL LOCATION} | & |
 | main.rs:2372:29:2372:33 | &map1 | TRef | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2372:29:2372:33 | &map1 | TRef.A | {EXTERNAL LOCATION} | Global |
 | main.rs:2372:29:2372:33 | &map1 | TRef.K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2372:29:2372:33 | &map1 | TRef.S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2372:29:2372:33 | &map1 | TRef.V | {EXTERNAL LOCATION} | Box |
@@ -12211,6 +11960,7 @@ inferType
 | main.rs:2372:29:2372:33 | &map1 | TRef.V.T | {EXTERNAL LOCATION} | & |
 | main.rs:2372:29:2372:33 | &map1 | TRef.V.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2372:30:2372:33 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2372:30:2372:33 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2372:30:2372:33 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2372:30:2372:33 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2372:30:2372:33 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -12220,7 +11970,6 @@ inferType
 | main.rs:2372:35:2372:36 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2376:17:2376:17 | a |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2376:26:2376:26 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2376:26:2376:26 | 0 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2378:13:2378:13 | _ |  | {EXTERNAL LOCATION} | () |
 | main.rs:2378:17:2381:9 | while ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2378:23:2378:23 | a |  | {EXTERNAL LOCATION} | i64 |
@@ -12555,6 +12304,7 @@ inferType
 | main.rs:2545:18:2545:22 | SelfParam | TRef | main.rs:2532:5:2532:25 | PathBuf |
 | main.rs:2545:34:2549:9 | { ... } |  | {EXTERNAL LOCATION} | & |
 | main.rs:2545:34:2549:9 | { ... } | TRef | main.rs:2520:5:2520:22 | Path |
+| main.rs:2547:20:2547:23 | path |  | main.rs:2520:5:2520:22 | Path |
 | main.rs:2547:33:2547:43 | ...::new(...) |  | main.rs:2520:5:2520:22 | Path |
 | main.rs:2548:13:2548:17 | &path |  | {EXTERNAL LOCATION} | & |
 | main.rs:2548:13:2548:17 | &path | TRef | main.rs:2520:5:2520:22 | Path |
@@ -12628,8 +12378,10 @@ inferType
 | main.rs:2589:14:2589:14 | b |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2589:48:2606:5 | { ... } |  | {EXTERNAL LOCATION} | Box |
 | main.rs:2589:48:2606:5 | { ... } | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2589:48:2606:5 | { ... } | T | main.rs:2564:5:2566:5 | dyn MyTrait |
-| main.rs:2589:48:2606:5 | { ... } | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2589:48:2606:5 | { ... } | T | main.rs:2568:5:2569:19 | S |
+| main.rs:2589:48:2606:5 | { ... } | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2589:48:2606:5 | { ... } | T.T | main.rs:2568:5:2569:19 | S |
+| main.rs:2589:48:2606:5 | { ... } | T.T.T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2590:13:2590:13 | x |  | main.rs:2568:5:2569:19 | S |
 | main.rs:2590:13:2590:13 | x | T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2590:17:2595:9 | if b {...} else {...} |  | main.rs:2568:5:2569:19 | S |
@@ -12655,20 +12407,16 @@ inferType
 | main.rs:2599:19:2599:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2600:9:2605:9 | if b {...} else {...} |  | {EXTERNAL LOCATION} | Box |
 | main.rs:2600:9:2605:9 | if b {...} else {...} | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2600:9:2605:9 | if b {...} else {...} | T | main.rs:2564:5:2566:5 | dyn MyTrait |
 | main.rs:2600:9:2605:9 | if b {...} else {...} | T | main.rs:2568:5:2569:19 | S |
 | main.rs:2600:9:2605:9 | if b {...} else {...} | T.T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2600:9:2605:9 | if b {...} else {...} | T.T | main.rs:2568:5:2569:19 | S |
 | main.rs:2600:9:2605:9 | if b {...} else {...} | T.T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2600:9:2605:9 | if b {...} else {...} | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
 | main.rs:2600:12:2600:12 | b |  | {EXTERNAL LOCATION} | bool |
 | main.rs:2600:14:2603:9 | { ... } |  | {EXTERNAL LOCATION} | Box |
 | main.rs:2600:14:2603:9 | { ... } | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2600:14:2603:9 | { ... } | T | main.rs:2564:5:2566:5 | dyn MyTrait |
 | main.rs:2600:14:2603:9 | { ... } | T | main.rs:2568:5:2569:19 | S |
 | main.rs:2600:14:2603:9 | { ... } | T.T | main.rs:2568:5:2569:19 | S |
 | main.rs:2600:14:2603:9 | { ... } | T.T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2600:14:2603:9 | { ... } | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
 | main.rs:2601:17:2601:17 | x |  | main.rs:2568:5:2569:19 | S |
 | main.rs:2601:17:2601:17 | x | T | main.rs:2568:5:2569:19 | S |
 | main.rs:2601:17:2601:17 | x | T.T | {EXTERNAL LOCATION} | i32 |
@@ -12679,26 +12427,20 @@ inferType
 | main.rs:2601:21:2601:26 | x.m2() | T.T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2602:13:2602:23 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
 | main.rs:2602:13:2602:23 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2602:13:2602:23 | ...::new(...) | T | main.rs:2564:5:2566:5 | dyn MyTrait |
 | main.rs:2602:13:2602:23 | ...::new(...) | T | main.rs:2568:5:2569:19 | S |
 | main.rs:2602:13:2602:23 | ...::new(...) | T.T | main.rs:2568:5:2569:19 | S |
 | main.rs:2602:13:2602:23 | ...::new(...) | T.T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2602:13:2602:23 | ...::new(...) | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
 | main.rs:2602:22:2602:22 | x |  | main.rs:2568:5:2569:19 | S |
 | main.rs:2602:22:2602:22 | x | T | main.rs:2568:5:2569:19 | S |
 | main.rs:2602:22:2602:22 | x | T.T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2603:16:2605:9 | { ... } |  | {EXTERNAL LOCATION} | Box |
 | main.rs:2603:16:2605:9 | { ... } | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2603:16:2605:9 | { ... } | T | main.rs:2564:5:2566:5 | dyn MyTrait |
 | main.rs:2603:16:2605:9 | { ... } | T | main.rs:2568:5:2569:19 | S |
 | main.rs:2603:16:2605:9 | { ... } | T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2603:16:2605:9 | { ... } | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
 | main.rs:2604:13:2604:23 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
 | main.rs:2604:13:2604:23 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2604:13:2604:23 | ...::new(...) | T | main.rs:2564:5:2566:5 | dyn MyTrait |
 | main.rs:2604:13:2604:23 | ...::new(...) | T | main.rs:2568:5:2569:19 | S |
 | main.rs:2604:13:2604:23 | ...::new(...) | T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2604:13:2604:23 | ...::new(...) | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
 | main.rs:2604:22:2604:22 | x |  | main.rs:2568:5:2569:19 | S |
 | main.rs:2604:22:2604:22 | x | T | {EXTERNAL LOCATION} | i32 |
 | main.rs:2610:22:2614:5 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -12916,33 +12658,28 @@ inferType
 | main.rs:2750:28:2752:9 | { ... } | TRef | main.rs:2748:10:2748:10 | T |
 | main.rs:2751:13:2751:16 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:2751:13:2751:16 | self | TRef | main.rs:2748:10:2748:10 | T |
-| main.rs:2755:25:2759:5 | { ... } |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2755:25:2759:5 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2756:17:2756:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2756:17:2756:17 | x |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2756:21:2756:21 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2756:21:2756:21 | 0 |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2757:9:2757:9 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2757:9:2757:9 | x |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2757:9:2757:17 | ... = ... |  | {EXTERNAL LOCATION} | () |
 | main.rs:2757:13:2757:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2757:13:2757:13 | x |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2757:13:2757:17 | x.f() |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2757:13:2757:17 | x.f() |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2758:9:2758:9 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2758:9:2758:9 | x |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2761:12:2769:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2762:13:2762:13 | x |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2762:24:2762:24 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2762:24:2762:24 | 0 |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2763:13:2763:13 | y |  | {EXTERNAL LOCATION} | & |
 | main.rs:2763:13:2763:13 | y | TRef | {EXTERNAL LOCATION} | i32 |
 | main.rs:2763:17:2763:18 | &1 |  | {EXTERNAL LOCATION} | & |
 | main.rs:2763:17:2763:18 | &1 | TRef | {EXTERNAL LOCATION} | i32 |
 | main.rs:2763:18:2763:18 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2764:13:2764:13 | z |  | {EXTERNAL LOCATION} | & |
+| main.rs:2764:13:2764:13 | z | TRef | {EXTERNAL LOCATION} | i32 |
 | main.rs:2764:13:2764:13 | z | TRef | {EXTERNAL LOCATION} | usize |
 | main.rs:2764:17:2764:17 | x |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2764:17:2764:22 | x.g(...) |  | {EXTERNAL LOCATION} | & |
+| main.rs:2764:17:2764:22 | x.g(...) | TRef | {EXTERNAL LOCATION} | i32 |
 | main.rs:2764:17:2764:22 | x.g(...) | TRef | {EXTERNAL LOCATION} | usize |
 | main.rs:2764:21:2764:21 | y |  | {EXTERNAL LOCATION} | & |
 | main.rs:2764:21:2764:21 | y | TRef | {EXTERNAL LOCATION} | i32 |
@@ -12950,10 +12687,11 @@ inferType
 | main.rs:2766:17:2766:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2767:13:2767:13 | y |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2767:24:2767:24 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2767:24:2767:24 | 1 |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2768:13:2768:13 | z |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2768:13:2768:13 | z |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2768:17:2768:17 | x |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2768:17:2768:24 | x.max(...) |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2768:17:2768:24 | x.max(...) |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2768:23:2768:23 | y |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2783:22:2783:26 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | main.rs:2783:22:2783:26 | SelfParam | TRef | main.rs:2782:5:2784:5 | Self [trait Container] |
@@ -12988,48 +12726,129 @@ inferType
 | main.rs:2799:24:2799:25 | &g | TRef.T | {EXTERNAL LOCATION} | i64 |
 | main.rs:2799:25:2799:25 | g |  | main.rs:2780:5:2780:21 | Gen |
 | main.rs:2799:25:2799:25 | g | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2803:11:2838:1 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2804:5:2804:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2805:5:2805:20 | ...::f(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2806:5:2806:60 | ...::g(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2806:20:2806:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2806:41:2806:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2807:5:2807:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2808:5:2808:41 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2809:5:2809:45 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2810:5:2810:30 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2811:5:2811:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2812:5:2812:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2813:5:2813:32 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2814:5:2814:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2815:5:2815:36 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2816:5:2816:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2817:5:2817:29 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2818:5:2818:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2819:5:2819:24 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2820:5:2820:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2821:5:2821:18 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2822:5:2822:15 | ...::f(...) |  | {EXTERNAL LOCATION} | dyn Future |
-| main.rs:2822:5:2822:15 | ...::f(...) | dyn(Output) | {EXTERNAL LOCATION} | () |
-| main.rs:2823:5:2823:19 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2824:5:2824:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2825:5:2825:14 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2826:5:2826:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2827:5:2827:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2828:5:2828:43 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2829:5:2829:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2830:5:2830:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2831:5:2831:28 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2832:5:2832:23 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2833:5:2833:41 | ...::test_all_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2834:5:2834:49 | ...::box_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2835:5:2835:20 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2836:5:2836:20 | ...::f(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2836:5:2836:20 | ...::f(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2836:5:2836:20 | ...::f(...) | T | main.rs:2564:5:2566:5 | dyn MyTrait |
-| main.rs:2836:5:2836:20 | ...::f(...) | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2836:16:2836:19 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2837:5:2837:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2803:18:2811:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2804:9:2804:12 | arr1 |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2804:9:2804:12 | arr1 | TArray | {EXTERNAL LOCATION} | i32 |
+| main.rs:2804:21:2804:21 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2804:26:2804:27 | [...] |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2804:26:2804:27 | [...] | TArray | {EXTERNAL LOCATION} | i32 |
+| main.rs:2805:9:2805:12 | arr2 |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2805:9:2805:12 | arr2 | TArray | {EXTERNAL LOCATION} | bool |
+| main.rs:2805:16:2805:24 | [true; 0] |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2805:16:2805:24 | [true; 0] | TArray | {EXTERNAL LOCATION} | bool |
+| main.rs:2805:17:2805:20 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2805:23:2805:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2807:9:2807:12 | arr3 |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2807:9:2807:12 | arr3 | TArray | {EXTERNAL LOCATION} | i32 |
+| main.rs:2807:16:2807:17 | [...] |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2807:16:2807:17 | [...] | TArray | {EXTERNAL LOCATION} | i32 |
+| main.rs:2809:21:2809:23 | arr |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2809:21:2809:23 | arr | TArray | main.rs:2809:18:2809:18 | T |
+| main.rs:2809:30:2809:30 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2809:34:2809:34 | x |  | main.rs:2809:18:2809:18 | T |
+| main.rs:2809:40:2809:41 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2810:5:2810:22 | pin_array(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2810:15:2810:18 | arr3 |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2810:15:2810:18 | arr3 | TArray | {EXTERNAL LOCATION} | i32 |
+| main.rs:2810:21:2810:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2823:25:2823:25 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2825:33:2825:33 | x |  | main.rs:2825:12:2825:13 | T1 |
+| main.rs:2825:40:2825:40 | y |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2825:40:2825:40 | y | T | main.rs:2825:16:2825:30 | T2 |
+| main.rs:2825:55:2825:56 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2827:19:2835:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2828:13:2828:13 | x |  | main.rs:2814:5:2815:19 | S |
+| main.rs:2828:13:2828:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2828:17:2828:20 | S(...) |  | main.rs:2814:5:2815:19 | S |
+| main.rs:2828:17:2828:20 | S(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2828:19:2828:19 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2829:13:2829:13 | y |  | main.rs:2816:5:2816:26 | MyThingA |
+| main.rs:2829:13:2829:13 | y | A | main.rs:2814:5:2815:19 | S |
+| main.rs:2829:13:2829:13 | y | A.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2829:17:2829:44 | MyThingA(...) |  | main.rs:2816:5:2816:26 | MyThingA |
+| main.rs:2829:17:2829:44 | MyThingA(...) | A | main.rs:2814:5:2815:19 | S |
+| main.rs:2829:17:2829:44 | MyThingA(...) | A.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2829:26:2829:43 | ...::default(...) |  | main.rs:2814:5:2815:19 | S |
+| main.rs:2829:26:2829:43 | ...::default(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2830:9:2830:23 | bar(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2830:13:2830:13 | x |  | main.rs:2814:5:2815:19 | S |
+| main.rs:2830:13:2830:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2830:16:2830:22 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2830:16:2830:22 | Some(...) | T | main.rs:2816:5:2816:26 | MyThingA |
+| main.rs:2830:16:2830:22 | Some(...) | T.A | main.rs:2814:5:2815:19 | S |
+| main.rs:2830:16:2830:22 | Some(...) | T.A.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2830:21:2830:21 | y |  | main.rs:2816:5:2816:26 | MyThingA |
+| main.rs:2830:21:2830:21 | y | A | main.rs:2814:5:2815:19 | S |
+| main.rs:2830:21:2830:21 | y | A.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2832:13:2832:13 | x |  | main.rs:2814:5:2815:19 | S |
+| main.rs:2832:13:2832:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2832:17:2832:20 | S(...) |  | main.rs:2814:5:2815:19 | S |
+| main.rs:2832:17:2832:20 | S(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2832:19:2832:19 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2833:13:2833:13 | z |  | main.rs:2817:5:2817:26 | MyThingB |
+| main.rs:2833:13:2833:13 | z | B | main.rs:2814:5:2815:19 | S |
+| main.rs:2833:13:2833:13 | z | B.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2833:17:2833:44 | MyThingB(...) |  | main.rs:2817:5:2817:26 | MyThingB |
+| main.rs:2833:17:2833:44 | MyThingB(...) | B | main.rs:2814:5:2815:19 | S |
+| main.rs:2833:17:2833:44 | MyThingB(...) | B.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2833:26:2833:43 | ...::default(...) |  | main.rs:2814:5:2815:19 | S |
+| main.rs:2833:26:2833:43 | ...::default(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2834:9:2834:25 | bar(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2834:13:2834:15 | [...] |  | {EXTERNAL LOCATION} | [;] |
+| main.rs:2834:13:2834:15 | [...] | TArray | main.rs:2814:5:2815:19 | S |
+| main.rs:2834:13:2834:15 | [...] | TArray.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2834:14:2834:14 | x |  | main.rs:2814:5:2815:19 | S |
+| main.rs:2834:14:2834:14 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2834:18:2834:24 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2834:18:2834:24 | Some(...) | T | main.rs:2817:5:2817:26 | MyThingB |
+| main.rs:2834:18:2834:24 | Some(...) | T.B | main.rs:2814:5:2815:19 | S |
+| main.rs:2834:18:2834:24 | Some(...) | T.B.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2834:23:2834:23 | z |  | main.rs:2817:5:2817:26 | MyThingB |
+| main.rs:2834:23:2834:23 | z | B | main.rs:2814:5:2815:19 | S |
+| main.rs:2834:23:2834:23 | z | B.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2838:11:2874:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2839:5:2839:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2840:5:2840:20 | ...::f(...) |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2841:5:2841:60 | ...::g(...) |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2841:20:2841:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2841:41:2841:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2842:5:2842:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2843:5:2843:41 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2844:5:2844:45 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2845:5:2845:30 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2846:5:2846:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2847:5:2847:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2848:5:2848:32 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2849:5:2849:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2850:5:2850:36 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2851:5:2851:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2852:5:2852:29 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2853:5:2853:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2854:5:2854:24 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2855:5:2855:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2856:5:2856:18 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2857:5:2857:15 | ...::f(...) |  | {EXTERNAL LOCATION} | dyn Future |
+| main.rs:2857:5:2857:15 | ...::f(...) | dyn(Output) | {EXTERNAL LOCATION} | () |
+| main.rs:2858:5:2858:19 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2859:5:2859:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2860:5:2860:14 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2861:5:2861:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2862:5:2862:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2863:5:2863:43 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2864:5:2864:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2865:5:2865:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2866:5:2866:28 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2867:5:2867:23 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2868:5:2868:41 | ...::test_all_patterns(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2869:5:2869:49 | ...::box_patterns(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2870:5:2870:20 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2871:5:2871:20 | ...::f(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2871:5:2871:20 | ...::f(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2871:5:2871:20 | ...::f(...) | T | main.rs:2564:5:2566:5 | dyn MyTrait |
+| main.rs:2871:5:2871:20 | ...::f(...) | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2871:16:2871:19 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2872:5:2872:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2873:5:2873:17 | empty_array(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:4:19:4:23 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:4:19:4:23 | SelfParam | TRef | overloading.rs:2:5:11:5 | Self [trait FirstTrait] |
 | overloading.rs:4:34:6:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
@@ -13038,9 +12857,8 @@ inferType
 | overloading.rs:8:20:8:24 | SelfParam | TRef | overloading.rs:2:5:11:5 | Self [trait FirstTrait] |
 | overloading.rs:14:19:14:23 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:14:19:14:23 | SelfParam | TRef | overloading.rs:12:5:19:5 | Self [trait SecondTrait] |
-| overloading.rs:14:33:16:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:14:33:16:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:15:13:15:13 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:15:13:15:13 | 1 |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:18:20:18:24 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:18:20:18:24 | SelfParam | TRef | overloading.rs:12:5:19:5 | Self [trait SecondTrait] |
 | overloading.rs:24:20:24:24 | SelfParam |  | {EXTERNAL LOCATION} | & |
@@ -13051,9 +12869,8 @@ inferType
 | overloading.rs:30:13:30:16 | true |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:35:20:35:24 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:35:20:35:24 | SelfParam | TRef | overloading.rs:20:5:21:13 | S |
-| overloading.rs:35:34:37:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:35:34:37:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:36:13:36:13 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:36:13:36:13 | 1 |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:43:20:43:24 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:43:20:43:24 | SelfParam | TRef | overloading.rs:40:5:40:14 | S2 |
 | overloading.rs:43:35:45:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
@@ -13353,9 +13170,8 @@ inferType
 | overloading.rs:234:13:234:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:240:14:240:17 | SelfParam |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:240:20:240:20 | x |  | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:240:35:242:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:240:35:242:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:241:13:241:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:241:13:241:13 | 0 |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:246:14:246:17 | SelfParam |  | overloading.rs:245:5:247:5 | Self [trait Trait2] |
 | overloading.rs:246:20:246:20 | x |  | overloading.rs:245:18:245:19 | T1 |
 | overloading.rs:251:14:251:17 | SelfParam |  | {EXTERNAL LOCATION} | i32 |
@@ -13364,9 +13180,8 @@ inferType
 | overloading.rs:252:13:252:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:258:14:258:17 | SelfParam |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:258:20:258:20 | x |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:258:35:260:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:258:35:260:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:259:13:259:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:259:13:259:13 | 0 |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:263:12:270:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:264:13:264:13 | x |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:264:17:264:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
@@ -13429,7 +13244,7 @@ inferType
 | overloading.rs:352:14:352:17 | SelfParam |  | overloading.rs:325:5:325:25 | S |
 | overloading.rs:352:14:352:17 | SelfParam | T | overloading.rs:349:10:349:10 | T |
 | overloading.rs:352:25:359:9 | { ... } |  | overloading.rs:325:5:325:25 | S |
-| overloading.rs:352:25:359:9 | { ... } | T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:352:25:359:9 | { ... } | T | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:353:17:353:17 | x |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:353:21:353:47 | ...::f(...) |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:353:26:353:46 | S(...) |  | overloading.rs:325:5:325:25 | S |
@@ -13457,7 +13272,6 @@ inferType
 | overloading.rs:357:42:357:59 | ...::default(...) |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:358:13:358:16 | S(...) |  | overloading.rs:325:5:325:25 | S |
 | overloading.rs:358:13:358:16 | S(...) | T | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:358:13:358:16 | S(...) | T | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:358:15:358:15 | 0 |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:367:17:370:5 | { ... } |  | overloading.rs:364:5:365:13 | S |
 | overloading.rs:368:13:368:13 | x |  | overloading.rs:364:5:365:13 | S |
@@ -13502,7 +13316,6 @@ inferType
 | overloading.rs:422:16:422:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
 | overloading.rs:422:16:422:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:422:23:426:9 | { ... } |  | {EXTERNAL LOCATION} | () |
-| overloading.rs:423:13:423:24 | ...::foo(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:423:20:423:23 | self |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:423:20:423:23 | self | TRef | overloading.rs:405:5:405:19 | S |
 | overloading.rs:423:20:423:23 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
@@ -13567,9 +13380,8 @@ inferType
 | overloading.rs:473:14:473:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:473:14:473:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
 | overloading.rs:473:14:473:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:473:28:475:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:473:28:475:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:474:13:474:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:474:13:474:13 | 0 |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:481:14:481:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:481:14:481:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
 | overloading.rs:481:14:481:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
@@ -13582,17 +13394,15 @@ inferType
 | overloading.rs:489:14:489:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:489:21:489:21 | x |  | overloading.rs:464:5:464:19 | S |
 | overloading.rs:489:21:489:21 | x | T | {EXTERNAL LOCATION} | i64 |
-| overloading.rs:489:48:491:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:489:48:491:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:490:13:490:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:490:13:490:13 | 0 |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:497:14:497:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:497:14:497:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
 | overloading.rs:497:14:497:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:497:21:497:21 | x |  | overloading.rs:464:5:464:19 | S |
 | overloading.rs:497:21:497:21 | x | T | {EXTERNAL LOCATION} | bool |
-| overloading.rs:497:49:499:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:497:49:499:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:498:13:498:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:498:13:498:13 | 0 |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:502:36:502:36 | x |  | overloading.rs:502:19:502:33 | T2 |
 | overloading.rs:502:49:504:5 | { ... } |  | overloading.rs:502:15:502:16 | T1 |
 | overloading.rs:503:9:503:9 | x |  | overloading.rs:502:19:502:33 | T2 |
@@ -13609,12 +13419,9 @@ inferType
 | overloading.rs:511:17:511:20 | S(...) |  | overloading.rs:464:5:464:19 | S |
 | overloading.rs:511:17:511:20 | S(...) | T | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:511:19:511:19 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:512:13:512:13 | y |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:512:17:512:25 | call_f(...) |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:512:24:512:24 | x |  | overloading.rs:464:5:464:19 | S |
 | overloading.rs:512:24:512:24 | x | T | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:513:13:513:13 | z |  | {EXTERNAL LOCATION} | i32 |
-| overloading.rs:513:22:513:22 | y |  | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:515:13:515:13 | x |  | overloading.rs:464:5:464:19 | S |
 | overloading.rs:515:13:515:13 | x | T | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:515:17:515:20 | S(...) |  | overloading.rs:464:5:464:19 | S |
@@ -14589,32 +14396,24 @@ inferType
 | pattern_matching.rs:443:25:498:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:444:9:444:13 | tuple |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:444:9:444:13 | tuple | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:444:9:444:13 | tuple | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:444:9:444:13 | tuple | T1 | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:444:9:444:13 | tuple | T2 | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:444:9:444:13 | tuple | T2 | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:444:17:444:36 | TupleExpr |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:444:17:444:36 | TupleExpr | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:444:17:444:36 | TupleExpr | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:444:17:444:36 | TupleExpr | T1 | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:444:17:444:36 | TupleExpr | T2 | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:444:17:444:36 | TupleExpr | T2 | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:444:18:444:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:444:24:444:27 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:444:30:444:35 | 3.0f32 |  | {EXTERNAL LOCATION} | f32 |
 | pattern_matching.rs:447:5:458:5 | match tuple { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:447:11:447:15 | tuple |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:447:11:447:15 | tuple | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:447:11:447:15 | tuple | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:447:11:447:15 | tuple | T1 | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:447:11:447:15 | tuple | T2 | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:447:11:447:15 | tuple | T2 | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:448:9:448:19 | TuplePat |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:448:9:448:19 | TuplePat | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:448:9:448:19 | TuplePat | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:448:9:448:19 | TuplePat | T1 | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:448:9:448:19 | TuplePat | T2 | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:448:9:448:19 | TuplePat | T2 | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:448:10:448:10 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:448:13:448:13 | 2 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:448:13:448:13 | 2 |  | {EXTERNAL LOCATION} | i64 |
@@ -14623,16 +14422,12 @@ inferType
 | pattern_matching.rs:448:24:451:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:449:17:449:27 | exact_tuple |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:449:17:449:27 | exact_tuple | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:449:17:449:27 | exact_tuple | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:449:17:449:27 | exact_tuple | T1 | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:449:17:449:27 | exact_tuple | T2 | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:449:17:449:27 | exact_tuple | T2 | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:449:31:449:35 | tuple |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:449:31:449:35 | tuple | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:449:31:449:35 | tuple | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:449:31:449:35 | tuple | T1 | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:449:31:449:35 | tuple | T2 | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:449:31:449:35 | tuple | T2 | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:450:13:450:54 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:450:22:450:40 | "Exact tuple: {:?}\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:450:22:450:40 | "Exact tuple: {:?}\\n" | TRef | {EXTERNAL LOCATION} | str |
@@ -14641,32 +14436,22 @@ inferType
 | pattern_matching.rs:450:22:450:53 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:450:43:450:53 | exact_tuple |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:450:43:450:53 | exact_tuple | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:450:43:450:53 | exact_tuple | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:450:43:450:53 | exact_tuple | T1 | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:450:43:450:53 | exact_tuple | T2 | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:450:43:450:53 | exact_tuple | T2 | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:452:9:452:17 | TuplePat |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:452:9:452:17 | TuplePat | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:452:9:452:17 | TuplePat | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:452:9:452:17 | TuplePat | T1 | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:452:9:452:17 | TuplePat | T2 | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:452:9:452:17 | TuplePat | T2 | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:452:10:452:10 | a |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:452:13:452:13 | b |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:452:13:452:13 | b |  | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:452:16:452:16 | c |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:452:16:452:16 | c |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:452:22:457:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:453:17:453:26 | first_elem |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:453:30:453:30 | a |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:454:17:454:27 | second_elem |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:454:17:454:27 | second_elem |  | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:454:31:454:31 | b |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:454:31:454:31 | b |  | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:455:17:455:26 | third_elem |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:455:17:455:26 | third_elem |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:455:30:455:30 | c |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:455:30:455:30 | c |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:456:13:456:80 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:456:22:456:42 | "Tuple: ({}, {}, {})\\n" |  | {EXTERNAL LOCATION} | & |
 | pattern_matching.rs:456:22:456:42 | "Tuple: ({}, {}, {})\\n" | TRef | {EXTERNAL LOCATION} | str |
@@ -14674,23 +14459,17 @@ inferType
 | pattern_matching.rs:456:22:456:79 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:456:22:456:79 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:456:45:456:54 | first_elem |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:456:57:456:67 | second_elem |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:456:57:456:67 | second_elem |  | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:456:70:456:79 | third_elem |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:456:70:456:79 | third_elem |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:461:5:466:5 | match tuple { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:461:11:461:15 | tuple |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:461:11:461:15 | tuple | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:461:11:461:15 | tuple | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:461:11:461:15 | tuple | T1 | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:461:11:461:15 | tuple | T2 | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:461:11:461:15 | tuple | T2 | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:462:9:462:19 | TuplePat |  | {EXTERNAL LOCATION} | (T_3) |
 | pattern_matching.rs:462:9:462:19 | TuplePat | T0 | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:462:9:462:19 | TuplePat | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:462:9:462:19 | TuplePat | T1 | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:462:9:462:19 | TuplePat | T2 | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:462:9:462:19 | TuplePat | T2 | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:462:24:465:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:464:13:464:54 | MacroExpr |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:464:22:464:40 | "First element: {}\\n" |  | {EXTERNAL LOCATION} | & |
@@ -14801,7 +14580,6 @@ inferType
 | pattern_matching.rs:501:17:501:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:504:5:509:5 | match value { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:504:11:504:15 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:505:9:505:11 | (...) |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:505:10:505:10 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:505:16:508:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:506:17:506:27 | paren_bound |  | {EXTERNAL LOCATION} | i32 |
@@ -14829,7 +14607,6 @@ inferType
 | pattern_matching.rs:514:9:514:16 | TuplePat | T0 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:514:9:514:16 | TuplePat | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:514:10:514:10 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:514:13:514:15 | (...) |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:514:14:514:14 | y |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:514:21:518:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:515:17:515:23 | paren_x |  | {EXTERNAL LOCATION} | i32 |
@@ -14849,10 +14626,8 @@ inferType
 | pattern_matching.rs:523:9:523:13 | slice | TRef | {EXTERNAL LOCATION} | [] |
 | pattern_matching.rs:523:9:523:13 | slice | TRef.TSlice | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:523:25:523:40 | &... |  | {EXTERNAL LOCATION} | & |
-| pattern_matching.rs:523:25:523:40 | &... | TRef | {EXTERNAL LOCATION} | [] |
 | pattern_matching.rs:523:25:523:40 | &... | TRef | {EXTERNAL LOCATION} | [;] |
 | pattern_matching.rs:523:25:523:40 | &... | TRef.TArray | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:523:25:523:40 | &... | TRef.TSlice | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:523:26:523:40 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | pattern_matching.rs:523:26:523:40 | [...] | TArray | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:523:27:523:27 | 1 |  | {EXTERNAL LOCATION} | i32 |
@@ -14933,6 +14708,7 @@ inferType
 | pattern_matching.rs:560:22:560:70 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:560:22:560:70 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:565:24:601:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| pattern_matching.rs:567:11:567:18 | CONSTANT |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:567:27:567:28 | 42 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:568:9:568:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:568:17:568:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
@@ -15485,13 +15261,13 @@ inferType
 | pattern_matching.rs:792:35:824:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:794:9:794:14 | points |  | {EXTERNAL LOCATION} | Vec |
 | pattern_matching.rs:794:9:794:14 | points | A | {EXTERNAL LOCATION} | Global |
+| pattern_matching.rs:794:9:794:14 | points | T | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:794:18:794:65 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
 | pattern_matching.rs:794:18:794:65 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
-| pattern_matching.rs:794:23:794:42 | (...) |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:794:18:794:65 | MacroExpr | T | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:794:23:794:42 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:794:34:794:34 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:794:40:794:40 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:794:45:794:64 | (...) |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:794:45:794:64 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:794:56:794:56 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:794:62:794:62 | 4 |  | {EXTERNAL LOCATION} | i32 |
@@ -15501,6 +15277,7 @@ inferType
 | pattern_matching.rs:795:20:795:20 | y |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:795:27:795:32 | points |  | {EXTERNAL LOCATION} | Vec |
 | pattern_matching.rs:795:27:795:32 | points | A | {EXTERNAL LOCATION} | Global |
+| pattern_matching.rs:795:27:795:32 | points | T | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:795:34:799:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:796:13:796:18 | loop_x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:796:22:796:22 | x |  | {EXTERNAL LOCATION} | i32 |
@@ -15626,7 +15403,6 @@ inferType
 | raw_pointer.rs:13:23:19:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:14:9:14:9 | a |  | {EXTERNAL LOCATION} | i64 |
 | raw_pointer.rs:14:18:14:19 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| raw_pointer.rs:14:18:14:19 | 10 |  | {EXTERNAL LOCATION} | i64 |
 | raw_pointer.rs:15:9:15:9 | x |  | {EXTERNAL LOCATION} | *const |
 | raw_pointer.rs:15:9:15:9 | x | TPtrConst | {EXTERNAL LOCATION} | i64 |
 | raw_pointer.rs:15:13:15:24 | &raw const a |  | {EXTERNAL LOCATION} | *const |
diff --git a/rust/ql/test/library-tests/type-inference/type-inference.ql b/rust/ql/test/library-tests/type-inference/type-inference.ql
index 8dcc34ad8001..92c11c5494d0 100644
--- a/rust/ql/test/library-tests/type-inference/type-inference.ql
+++ b/rust/ql/test/library-tests/type-inference/type-inference.ql
@@ -12,14 +12,14 @@ private predicate relevantNode(AstNode n) {
 }
 
 query predicate inferCertainType(AstNode n, TypePath path, Type t) {
-  t = TypeInference::CertainTypeInference::inferCertainType(n, path) and
-  t != TUnknownType() and
+  t = TypeInference::inferTypeCertain(n, path) and
+  not t instanceof PseudoType and
   relevantNode(n)
 }
 
 query predicate inferType(AstNode n, TypePath path, Type t) {
   t = TypeInference::inferType(n, path) and
-  t != TUnknownType() and
+  not t instanceof PseudoType and
   relevantNode(n)
 }
 
@@ -59,26 +59,4 @@ module ResolveTest implements TestSig {
   }
 }
 
-module TypeTest implements TestSig {
-  string getARelevantTag() { result = ["type", "certainType"] }
-
-  predicate hasActualResult(Location location, string element, string tag, string value) { none() }
-
-  predicate hasOptionalResult(Location location, string element, string tag, string value) {
-    exists(AstNode n, TypePath path, Type t, string at |
-      t = TypeInference::inferType(n, path) and
-      (
-        tag = "type"
-        or
-        t = TypeInference::CertainTypeInference::inferCertainType(n, path) and
-        tag = "certainType"
-      ) and
-      location = n.getLocation() and
-      (if path.isEmpty() then at = "" else at = "@" + TypePath::printTypePathVerbose(path)) and
-      value = element + at + ":" + t.toString() and
-      element = [n.toString(), n.(IdentPat).getName().getText()]
-    )
-  }
-}
-
-import MakeTest<MergeTests<ResolveTest, TypeTest>>
+import MakeTest<MergeTests<ResolveTest, TypeInference::TypeTest>>
diff --git a/rust/ql/test/library-tests/variables/options.yml b/rust/ql/test/library-tests/variables/options.yml
index a394083e5212..c2541fc242c2 100644
--- a/rust/ql/test/library-tests/variables/options.yml
+++ b/rust/ql/test/library-tests/variables/options.yml
@@ -1 +1,2 @@
 qltest_use_nightly: true
+qltest_edition: "2024"
diff --git a/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected b/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
index 0028cd74b6ef..9205c8015ad8 100644
--- a/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
+++ b/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
@@ -1,3 +1,4 @@
+| Missing toString | 0 |
 | Multiple children | 0 |
 | Multiple locations | 0 |
 | Multiple parents | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/SsaConsistencyCounts.expected b/rust/ql/test/query-tests/diagnostics/SsaConsistencyCounts.expected
index 7e264176d32d..e69de29bb2d1 100644
--- a/rust/ql/test/query-tests/diagnostics/SsaConsistencyCounts.expected
+++ b/rust/ql/test/query-tests/diagnostics/SsaConsistencyCounts.expected
@@ -1,10 +0,0 @@
-| Definition cannot reach a read | 0 |
-| End of a basic block can be reached by multiple definitions | 0 |
-| Phi has less than 2 immediately prior references | 0 |
-| Phi node has less than two inputs | 0 |
-| Phi read has less than 2 immediately prior references | 0 |
-| Read can be reached from multiple definitions | 0 |
-| Read cannot be reached from a definition | 0 |
-| Read does not have a prior reference | 0 |
-| Read has multiple prior references | 0 |
-| Read is not dominated by a definition | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStatsReduced.expected b/rust/ql/test/query-tests/diagnostics/SummaryStatsReduced.expected
index ed21d9772fce..7756215d1023 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStatsReduced.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStatsReduced.expected
@@ -1,6 +1,6 @@
 | Extraction errors | 0 |
 | Extraction warnings | 7 |
-| Files extracted - total | 7 |
+| Files extracted - total user | 7 |
 | Files extracted - with errors | 3 |
 | Files extracted - without errors | 4 |
 | Files extracted - without errors % | 57 |
diff --git a/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected b/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected
index 2814af2b5ede..952fbcef17ff 100644
--- a/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected
+++ b/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected
@@ -1,8 +1,8 @@
 #select
-| main.rs:6:25:6:30 | &regex | main.rs:4:20:4:32 | ...::var | main.rs:6:25:6:30 | &regex | This regular expression is constructed from a $@. | main.rs:4:20:4:32 | ...::var | user-provided value |
+| main.rs:6:25:6:30 | &regex | main.rs:4:20:4:40 | ...::var(...) | main.rs:6:25:6:30 | &regex | This regular expression is constructed from a $@. | main.rs:4:20:4:40 | ...::var(...) | user-provided value |
 edges
 | main.rs:4:9:4:16 | username | main.rs:5:25:5:44 | MacroExpr | provenance |  |
-| main.rs:4:20:4:32 | ...::var | main.rs:4:20:4:40 | ...::var(...) [Ok] | provenance | Src:MaD:1  |
+| main.rs:4:20:4:40 | ...::var(...) | main.rs:4:20:4:40 | ...::var(...) [Ok] | provenance | Src:MaD:1  |
 | main.rs:4:20:4:40 | ...::var(...) [Ok] | main.rs:4:20:4:66 | ... .unwrap_or(...) | provenance | MaD:2 |
 | main.rs:4:20:4:66 | ... .unwrap_or(...) | main.rs:4:9:4:16 | username | provenance |  |
 | main.rs:5:9:5:13 | regex | main.rs:6:26:6:30 | regex | provenance |  |
@@ -18,7 +18,7 @@ models
 | 4 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
 | main.rs:4:9:4:16 | username | semmle.label | username |
-| main.rs:4:20:4:32 | ...::var | semmle.label | ...::var |
+| main.rs:4:20:4:40 | ...::var(...) | semmle.label | ...::var(...) |
 | main.rs:4:20:4:40 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
 | main.rs:4:20:4:66 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
 | main.rs:5:9:5:13 | regex | semmle.label | regex |
diff --git a/rust/ql/test/query-tests/security/CWE-022/Cargo.lock b/rust/ql/test/query-tests/security/CWE-022/Cargo.lock
index f6b8cfc2c4b4..a84a125fd6b2 100644
--- a/rust/ql/test/query-tests/security/CWE-022/Cargo.lock
+++ b/rust/ql/test/query-tests/security/CWE-022/Cargo.lock
@@ -151,6 +151,58 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
+[[package]]
+name = "axum"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90"
+dependencies = [
+ "axum-core",
+ "bytes",
+ "form_urlencoded",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "serde_core",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.75"
@@ -281,7 +333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -374,7 +426,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -566,6 +618,7 @@ dependencies = [
  "hyper",
  "pin-project-lite",
  "tokio",
+ "tower-service",
 ]
 
 [[package]]
@@ -634,6 +687,12 @@ dependencies = [
  "value-bag",
 ]
 
+[[package]]
+name = "matchit"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
+
 [[package]]
 name = "memchr"
 version = "2.7.5"
@@ -793,7 +852,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -900,7 +959,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -923,22 +982,32 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.229"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.229"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -953,6 +1022,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_path_to_error"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
+dependencies = [
+ "itoa",
+ "serde",
+ "serde_core",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -1018,6 +1098,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn"
+version = "3.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@@ -1032,6 +1123,7 @@ name = "test"
 version = "0.0.1"
 dependencies = [
  "async-std",
+ "axum",
  "poem",
  "tokio",
 ]
@@ -1053,7 +1145,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -1082,7 +1174,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -1115,12 +1207,41 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
 [[package]]
 name = "tracing"
 version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
+ "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -1134,7 +1255,7 @@ checksum = "1b1ffbcf9c6f6b99d386e7444eb608ba646ae452a36b39737deb9663b610f662"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -1207,7 +1328,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.103",
  "wasm-bindgen-shared",
 ]
 
@@ -1242,7 +1363,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.103",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
diff --git a/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected b/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected
index 182648d9caf6..225511e90839 100644
--- a/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected
+++ b/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected
@@ -1,58 +1,54 @@
 #select
-| src/main.rs:11:5:11:22 | ...::read_to_string | src/main.rs:7:11:7:19 | file_name | src/main.rs:11:5:11:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:7:11:7:19 | file_name | user-provided value |
-| src/main.rs:46:5:46:22 | ...::read_to_string | src/main.rs:38:11:38:19 | file_path | src/main.rs:46:5:46:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:38:11:38:19 | file_path | user-provided value |
-| src/main.rs:71:5:71:22 | ...::read_to_string | src/main.rs:63:11:63:19 | file_path | src/main.rs:71:5:71:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:63:11:63:19 | file_path | user-provided value |
-| src/main.rs:85:5:85:22 | ...::read_to_string | src/main.rs:76:11:76:19 | file_path | src/main.rs:85:5:85:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:76:11:76:19 | file_path | user-provided value |
-| src/main.rs:99:5:99:22 | ...::read_to_string | src/main.rs:90:11:90:19 | file_path | src/main.rs:99:5:99:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:90:11:90:19 | file_path | user-provided value |
-| src/main.rs:104:13:104:31 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:104:13:104:31 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
-| src/main.rs:107:13:107:31 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:107:13:107:31 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
-| src/main.rs:110:13:110:33 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:110:13:110:33 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
-| src/main.rs:113:13:113:37 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:113:13:113:37 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
-| src/main.rs:116:13:116:31 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:116:13:116:31 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
-| src/main.rs:119:13:119:31 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:119:13:119:31 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
-| src/main.rs:122:13:122:25 | ...::copy | src/main.rs:103:17:103:30 | ...::args | src/main.rs:122:13:122:25 | ...::copy | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
-| src/main.rs:123:13:123:25 | ...::copy | src/main.rs:103:17:103:30 | ...::args | src/main.rs:123:13:123:25 | ...::copy | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
-| src/main.rs:173:13:173:18 | exists | src/main.rs:185:17:185:30 | ...::args | src/main.rs:173:13:173:18 | exists | This path depends on a $@. | src/main.rs:185:17:185:30 | ...::args | user-provided value |
-| src/main.rs:174:25:174:34 | ...::open | src/main.rs:185:17:185:30 | ...::args | src/main.rs:174:25:174:34 | ...::open | This path depends on a $@. | src/main.rs:185:17:185:30 | ...::args | user-provided value |
-| src/main.rs:177:25:177:34 | ...::open | src/main.rs:185:17:185:30 | ...::args | src/main.rs:177:25:177:34 | ...::open | This path depends on a $@. | src/main.rs:185:17:185:30 | ...::args | user-provided value |
+| src/main.rs:11:24:11:32 | file_path | src/main.rs:7:11:7:19 | file_name | src/main.rs:11:24:11:32 | file_path | This path depends on a $@. | src/main.rs:7:11:7:19 | file_name | user-provided value |
+| src/main.rs:46:24:46:32 | file_path | src/main.rs:38:11:38:19 | file_path | src/main.rs:46:24:46:32 | file_path | This path depends on a $@. | src/main.rs:38:11:38:19 | file_path | user-provided value |
+| src/main.rs:71:24:71:32 | file_path | src/main.rs:63:11:63:19 | file_path | src/main.rs:71:24:71:32 | file_path | This path depends on a $@. | src/main.rs:63:11:63:19 | file_path | user-provided value |
+| src/main.rs:85:24:85:32 | file_path | src/main.rs:76:11:76:19 | file_path | src/main.rs:85:24:85:32 | file_path | This path depends on a $@. | src/main.rs:76:11:76:19 | file_path | user-provided value |
+| src/main.rs:99:24:99:32 | file_path | src/main.rs:90:11:90:19 | file_path | src/main.rs:99:24:99:32 | file_path | This path depends on a $@. | src/main.rs:90:11:90:19 | file_path | user-provided value |
+| src/main.rs:104:33:104:45 | path1.clone() | src/main.rs:103:17:103:32 | ...::args(...) | src/main.rs:104:33:104:45 | path1.clone() | This path depends on a $@. | src/main.rs:103:17:103:32 | ...::args(...) | user-provided value |
+| src/main.rs:107:33:107:37 | path2 | src/main.rs:103:17:103:32 | ...::args(...) | src/main.rs:107:33:107:37 | path2 | This path depends on a $@. | src/main.rs:103:17:103:32 | ...::args(...) | user-provided value |
+| src/main.rs:110:35:110:39 | path3 | src/main.rs:103:17:103:32 | ...::args(...) | src/main.rs:110:35:110:39 | path3 | This path depends on a $@. | src/main.rs:103:17:103:32 | ...::args(...) | user-provided value |
+| src/main.rs:113:39:113:43 | path4 | src/main.rs:103:17:103:32 | ...::args(...) | src/main.rs:113:39:113:43 | path4 | This path depends on a $@. | src/main.rs:103:17:103:32 | ...::args(...) | user-provided value |
+| src/main.rs:116:33:116:37 | path5 | src/main.rs:103:17:103:32 | ...::args(...) | src/main.rs:116:33:116:37 | path5 | This path depends on a $@. | src/main.rs:103:17:103:32 | ...::args(...) | user-provided value |
+| src/main.rs:119:33:119:37 | path6 | src/main.rs:103:17:103:32 | ...::args(...) | src/main.rs:119:33:119:37 | path6 | This path depends on a $@. | src/main.rs:103:17:103:32 | ...::args(...) | user-provided value |
+| src/main.rs:122:27:122:39 | path1.clone() | src/main.rs:103:17:103:32 | ...::args(...) | src/main.rs:122:27:122:39 | path1.clone() | This path depends on a $@. | src/main.rs:103:17:103:32 | ...::args(...) | user-provided value |
+| src/main.rs:123:37:123:49 | path1.clone() | src/main.rs:103:17:103:32 | ...::args(...) | src/main.rs:123:37:123:49 | path1.clone() | This path depends on a $@. | src/main.rs:103:17:103:32 | ...::args(...) | user-provided value |
+| src/main.rs:173:8:173:11 | path | src/main.rs:211:17:211:32 | ...::args(...) | src/main.rs:173:8:173:11 | path | This path depends on a $@. | src/main.rs:211:17:211:32 | ...::args(...) | user-provided value |
+| src/main.rs:174:36:174:43 | path_str | src/main.rs:211:17:211:32 | ...::args(...) | src/main.rs:174:36:174:43 | path_str | This path depends on a $@. | src/main.rs:211:17:211:32 | ...::args(...) | user-provided value |
+| src/main.rs:177:36:177:39 | path | src/main.rs:211:17:211:32 | ...::args(...) | src/main.rs:177:36:177:39 | path | This path depends on a $@. | src/main.rs:211:17:211:32 | ...::args(...) | user-provided value |
+| src/main.rs:201:73:201:76 | path | src/main.rs:208:33:208:39 | request | src/main.rs:201:73:201:76 | path | This path depends on a $@. | src/main.rs:208:33:208:39 | request | user-provided value |
 edges
 | src/main.rs:7:11:7:19 | file_name | src/main.rs:9:35:9:43 | file_name | provenance |  |
-| src/main.rs:9:9:9:17 | file_path | src/main.rs:11:24:11:32 | file_path | provenance |  |
+| src/main.rs:9:9:9:17 | file_path | src/main.rs:11:24:11:32 | file_path | provenance | Sink:MaD:6 |
 | src/main.rs:9:21:9:44 | ...::from(...) | src/main.rs:9:9:9:17 | file_path | provenance |  |
-| src/main.rs:9:35:9:43 | file_name | src/main.rs:9:21:9:44 | ...::from(...) | provenance | MaD:14 |
-| src/main.rs:11:24:11:32 | file_path | src/main.rs:11:5:11:22 | ...::read_to_string | provenance | MaD:6 Sink:MaD:6 |
+| src/main.rs:9:35:9:43 | file_name | src/main.rs:9:21:9:44 | ...::from(...) | provenance | MaD:15 |
 | src/main.rs:38:11:38:19 | file_path | src/main.rs:41:52:41:60 | file_path | provenance |  |
-| src/main.rs:41:9:41:17 | file_path | src/main.rs:46:24:46:32 | file_path | provenance |  |
+| src/main.rs:41:9:41:17 | file_path | src/main.rs:46:24:46:32 | file_path | provenance | Sink:MaD:6 |
 | src/main.rs:41:21:41:62 | public_path.join(...) | src/main.rs:41:9:41:17 | file_path | provenance |  |
-| src/main.rs:41:38:41:61 | ...::from(...) | src/main.rs:41:21:41:62 | public_path.join(...) | provenance | MaD:12 |
-| src/main.rs:41:52:41:60 | file_path | src/main.rs:41:38:41:61 | ...::from(...) | provenance | MaD:14 |
-| src/main.rs:46:24:46:32 | file_path | src/main.rs:46:5:46:22 | ...::read_to_string | provenance | MaD:6 Sink:MaD:6 |
+| src/main.rs:41:38:41:61 | ...::from(...) | src/main.rs:41:21:41:62 | public_path.join(...) | provenance | MaD:13 |
+| src/main.rs:41:52:41:60 | file_path | src/main.rs:41:38:41:61 | ...::from(...) | provenance | MaD:15 |
 | src/main.rs:63:11:63:19 | file_path | src/main.rs:66:32:66:40 | file_path | provenance |  |
-| src/main.rs:66:9:66:17 | file_path [&ref] | src/main.rs:71:24:71:32 | file_path [&ref] | provenance |  |
+| src/main.rs:66:9:66:17 | file_path [&ref] | src/main.rs:71:24:71:32 | file_path | provenance | Sink:MaD:6 |
 | src/main.rs:66:21:66:41 | ...::new(...) [&ref] | src/main.rs:66:9:66:17 | file_path [&ref] | provenance |  |
-| src/main.rs:66:31:66:40 | &file_path [&ref] | src/main.rs:66:21:66:41 | ...::new(...) [&ref] | provenance | MaD:13 |
+| src/main.rs:66:31:66:40 | &file_path [&ref] | src/main.rs:66:21:66:41 | ...::new(...) [&ref] | provenance | MaD:14 |
 | src/main.rs:66:32:66:40 | file_path | src/main.rs:66:31:66:40 | &file_path [&ref] | provenance |  |
-| src/main.rs:71:24:71:32 | file_path [&ref] | src/main.rs:71:5:71:22 | ...::read_to_string | provenance | MaD:6 Sink:MaD:6 |
 | src/main.rs:76:11:76:19 | file_path | src/main.rs:79:52:79:60 | file_path | provenance |  |
 | src/main.rs:79:9:79:17 | file_path | src/main.rs:80:21:80:29 | file_path | provenance |  |
 | src/main.rs:79:21:79:62 | public_path.join(...) | src/main.rs:79:9:79:17 | file_path | provenance |  |
-| src/main.rs:79:38:79:61 | ...::from(...) | src/main.rs:79:21:79:62 | public_path.join(...) | provenance | MaD:12 |
-| src/main.rs:79:52:79:60 | file_path | src/main.rs:79:38:79:61 | ...::from(...) | provenance | MaD:14 |
-| src/main.rs:80:9:80:17 | file_path | src/main.rs:85:24:85:32 | file_path | provenance |  |
-| src/main.rs:80:21:80:29 | file_path | src/main.rs:80:21:80:44 | file_path.canonicalize() [Ok] | provenance | MaD:15 |
-| src/main.rs:80:21:80:44 | file_path.canonicalize() [Ok] | src/main.rs:80:21:80:53 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:79:38:79:61 | ...::from(...) | src/main.rs:79:21:79:62 | public_path.join(...) | provenance | MaD:13 |
+| src/main.rs:79:52:79:60 | file_path | src/main.rs:79:38:79:61 | ...::from(...) | provenance | MaD:15 |
+| src/main.rs:80:9:80:17 | file_path | src/main.rs:85:24:85:32 | file_path | provenance | Sink:MaD:6 |
+| src/main.rs:80:21:80:29 | file_path | src/main.rs:80:21:80:44 | file_path.canonicalize() [Ok] | provenance | MaD:16 |
+| src/main.rs:80:21:80:44 | file_path.canonicalize() [Ok] | src/main.rs:80:21:80:53 | ... .unwrap() | provenance | MaD:12 |
 | src/main.rs:80:21:80:53 | ... .unwrap() | src/main.rs:80:9:80:17 | file_path | provenance |  |
-| src/main.rs:85:24:85:32 | file_path | src/main.rs:85:5:85:22 | ...::read_to_string | provenance | MaD:6 Sink:MaD:6 |
 | src/main.rs:90:11:90:19 | file_path | src/main.rs:93:32:93:40 | file_path | provenance |  |
 | src/main.rs:93:9:93:17 | file_path [&ref] | src/main.rs:98:21:98:29 | file_path [&ref] | provenance |  |
 | src/main.rs:93:21:93:41 | ...::new(...) [&ref] | src/main.rs:93:9:93:17 | file_path [&ref] | provenance |  |
-| src/main.rs:93:31:93:40 | &file_path [&ref] | src/main.rs:93:21:93:41 | ...::new(...) [&ref] | provenance | MaD:13 |
+| src/main.rs:93:31:93:40 | &file_path [&ref] | src/main.rs:93:21:93:41 | ...::new(...) [&ref] | provenance | MaD:14 |
 | src/main.rs:93:32:93:40 | file_path | src/main.rs:93:31:93:40 | &file_path [&ref] | provenance |  |
-| src/main.rs:98:9:98:17 | file_path | src/main.rs:99:24:99:32 | file_path | provenance |  |
+| src/main.rs:98:9:98:17 | file_path | src/main.rs:99:24:99:32 | file_path | provenance | Sink:MaD:6 |
 | src/main.rs:98:21:98:29 | file_path [&ref] | src/main.rs:98:21:98:44 | file_path.canonicalize() [Ok] | provenance | Config |
-| src/main.rs:98:21:98:44 | file_path.canonicalize() [Ok] | src/main.rs:98:21:98:53 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:98:21:98:44 | file_path.canonicalize() [Ok] | src/main.rs:98:21:98:53 | ... .unwrap() | provenance | MaD:12 |
 | src/main.rs:98:21:98:53 | ... .unwrap() | src/main.rs:98:9:98:17 | file_path | provenance |  |
-| src/main.rs:99:24:99:32 | file_path | src/main.rs:99:5:99:22 | ...::read_to_string | provenance | MaD:6 Sink:MaD:6 |
 | src/main.rs:103:9:103:13 | path1 | src/main.rs:104:33:104:37 | path1 | provenance |  |
 | src/main.rs:103:9:103:13 | path1 | src/main.rs:106:39:106:43 | path1 | provenance |  |
 | src/main.rs:103:9:103:13 | path1 | src/main.rs:109:41:109:45 | path1 | provenance |  |
@@ -60,63 +56,59 @@ edges
 | src/main.rs:103:9:103:13 | path1 | src/main.rs:115:39:115:43 | path1 | provenance |  |
 | src/main.rs:103:9:103:13 | path1 | src/main.rs:122:27:122:31 | path1 | provenance |  |
 | src/main.rs:103:9:103:13 | path1 | src/main.rs:123:37:123:41 | path1 | provenance |  |
-| src/main.rs:103:17:103:30 | ...::args | src/main.rs:103:17:103:32 | ...::args(...) [element] | provenance | Src:MaD:7  |
-| src/main.rs:103:17:103:32 | ...::args(...) [element] | src/main.rs:103:17:103:39 | ... .nth(...) [Some] | provenance | MaD:9 |
-| src/main.rs:103:17:103:39 | ... .nth(...) [Some] | src/main.rs:103:17:103:48 | ... .unwrap() | provenance | MaD:10 |
+| src/main.rs:103:17:103:32 | ...::args(...) | src/main.rs:103:17:103:32 | ...::args(...) [element] | provenance | Src:MaD:8  |
+| src/main.rs:103:17:103:32 | ...::args(...) [element] | src/main.rs:103:17:103:39 | ... .nth(...) [Some] | provenance | MaD:10 |
+| src/main.rs:103:17:103:39 | ... .nth(...) [Some] | src/main.rs:103:17:103:48 | ... .unwrap() | provenance | MaD:11 |
 | src/main.rs:103:17:103:48 | ... .unwrap() | src/main.rs:103:9:103:13 | path1 | provenance |  |
-| src/main.rs:104:33:104:37 | path1 | src/main.rs:104:33:104:45 | path1.clone() | provenance | MaD:8 |
-| src/main.rs:104:33:104:45 | path1.clone() | src/main.rs:104:13:104:31 | ...::open | provenance | MaD:2 Sink:MaD:2 |
-| src/main.rs:106:9:106:13 | path2 | src/main.rs:107:33:107:37 | path2 | provenance |  |
-| src/main.rs:106:17:106:52 | ...::canonicalize(...) [Ok] | src/main.rs:106:17:106:61 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:104:33:104:37 | path1 | src/main.rs:104:33:104:45 | path1.clone() | provenance | MaD:9 |
+| src/main.rs:104:33:104:45 | path1.clone() | src/main.rs:104:33:104:45 | path1.clone() | provenance | Sink:MaD:2 |
+| src/main.rs:106:9:106:13 | path2 | src/main.rs:107:33:107:37 | path2 | provenance | Sink:MaD:2 |
+| src/main.rs:106:17:106:52 | ...::canonicalize(...) [Ok] | src/main.rs:106:17:106:61 | ... .unwrap() | provenance | MaD:12 |
 | src/main.rs:106:17:106:61 | ... .unwrap() | src/main.rs:106:9:106:13 | path2 | provenance |  |
-| src/main.rs:106:39:106:43 | path1 | src/main.rs:106:39:106:51 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:106:39:106:43 | path1 | src/main.rs:106:39:106:51 | path1.clone() | provenance | MaD:9 |
 | src/main.rs:106:39:106:51 | path1.clone() | src/main.rs:106:17:106:52 | ...::canonicalize(...) [Ok] | provenance | Config |
-| src/main.rs:107:33:107:37 | path2 | src/main.rs:107:13:107:31 | ...::open | provenance | MaD:2 Sink:MaD:2 |
-| src/main.rs:109:9:109:13 | path3 | src/main.rs:110:35:110:39 | path3 | provenance |  |
+| src/main.rs:109:9:109:13 | path3 | src/main.rs:110:35:110:39 | path3 | provenance | Sink:MaD:4 |
 | src/main.rs:109:17:109:54 | ...::canonicalize(...) [future, Ok] | src/main.rs:109:17:109:60 | await ... [Ok] | provenance |  |
-| src/main.rs:109:17:109:60 | await ... [Ok] | src/main.rs:109:17:109:69 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:109:17:109:60 | await ... [Ok] | src/main.rs:109:17:109:69 | ... .unwrap() | provenance | MaD:12 |
 | src/main.rs:109:17:109:69 | ... .unwrap() | src/main.rs:109:9:109:13 | path3 | provenance |  |
-| src/main.rs:109:41:109:45 | path1 | src/main.rs:109:41:109:53 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:109:41:109:45 | path1 | src/main.rs:109:41:109:53 | path1.clone() | provenance | MaD:9 |
 | src/main.rs:109:41:109:53 | path1.clone() | src/main.rs:109:17:109:54 | ...::canonicalize(...) [future, Ok] | provenance | Config |
-| src/main.rs:110:35:110:39 | path3 | src/main.rs:110:13:110:33 | ...::open | provenance | MaD:4 Sink:MaD:4 |
-| src/main.rs:112:9:112:13 | path4 | src/main.rs:113:39:113:43 | path4 | provenance |  |
+| src/main.rs:112:9:112:13 | path4 | src/main.rs:113:39:113:43 | path4 | provenance | Sink:MaD:1 |
 | src/main.rs:112:17:112:58 | ...::canonicalize(...) [future, Ok] | src/main.rs:112:17:112:64 | await ... [Ok] | provenance |  |
-| src/main.rs:112:17:112:64 | await ... [Ok] | src/main.rs:112:17:112:73 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:112:17:112:64 | await ... [Ok] | src/main.rs:112:17:112:73 | ... .unwrap() | provenance | MaD:12 |
 | src/main.rs:112:17:112:73 | ... .unwrap() | src/main.rs:112:9:112:13 | path4 | provenance |  |
-| src/main.rs:112:45:112:49 | path1 | src/main.rs:112:45:112:57 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:112:45:112:49 | path1 | src/main.rs:112:45:112:57 | path1.clone() | provenance | MaD:9 |
 | src/main.rs:112:45:112:57 | path1.clone() | src/main.rs:112:17:112:58 | ...::canonicalize(...) [future, Ok] | provenance | Config |
-| src/main.rs:113:39:113:43 | path4 | src/main.rs:113:13:113:37 | ...::open | provenance | MaD:1 Sink:MaD:1 |
-| src/main.rs:115:9:115:13 | path5 [&ref] | src/main.rs:116:33:116:37 | path5 [&ref] | provenance |  |
+| src/main.rs:115:9:115:13 | path5 [&ref] | src/main.rs:116:33:116:37 | path5 | provenance | Sink:MaD:2 |
+| src/main.rs:115:9:115:13 | path5 [&ref] | src/main.rs:118:17:118:21 | path5 [&ref] | provenance |  |
 | src/main.rs:115:17:115:44 | ...::new(...) [&ref] | src/main.rs:115:9:115:13 | path5 [&ref] | provenance |  |
-| src/main.rs:115:38:115:43 | &path1 [&ref] | src/main.rs:115:17:115:44 | ...::new(...) [&ref] | provenance | MaD:13 |
+| src/main.rs:115:38:115:43 | &path1 [&ref] | src/main.rs:115:17:115:44 | ...::new(...) [&ref] | provenance | MaD:14 |
 | src/main.rs:115:39:115:43 | path1 | src/main.rs:115:38:115:43 | &path1 [&ref] | provenance |  |
-| src/main.rs:116:33:116:37 | path5 [&ref] | src/main.rs:116:13:116:31 | ...::open | provenance | MaD:2 Sink:MaD:2 |
-| src/main.rs:116:33:116:37 | path5 [&ref] | src/main.rs:118:17:118:21 | path5 [&ref] | provenance |  |
-| src/main.rs:118:9:118:13 | path6 | src/main.rs:119:33:119:37 | path6 | provenance |  |
+| src/main.rs:118:9:118:13 | path6 | src/main.rs:119:33:119:37 | path6 | provenance | Sink:MaD:2 |
 | src/main.rs:118:17:118:21 | path5 [&ref] | src/main.rs:118:17:118:36 | path5.canonicalize() [Ok] | provenance | Config |
-| src/main.rs:118:17:118:36 | path5.canonicalize() [Ok] | src/main.rs:118:17:118:45 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:118:17:118:36 | path5.canonicalize() [Ok] | src/main.rs:118:17:118:45 | ... .unwrap() | provenance | MaD:12 |
 | src/main.rs:118:17:118:45 | ... .unwrap() | src/main.rs:118:9:118:13 | path6 | provenance |  |
-| src/main.rs:119:33:119:37 | path6 | src/main.rs:119:13:119:31 | ...::open | provenance | MaD:2 Sink:MaD:2 |
-| src/main.rs:122:27:122:31 | path1 | src/main.rs:122:27:122:39 | path1.clone() | provenance | MaD:8 |
-| src/main.rs:122:27:122:39 | path1.clone() | src/main.rs:122:13:122:25 | ...::copy | provenance | MaD:5 Sink:MaD:5 |
-| src/main.rs:123:37:123:41 | path1 | src/main.rs:123:37:123:49 | path1.clone() | provenance | MaD:8 |
-| src/main.rs:123:37:123:49 | path1.clone() | src/main.rs:123:13:123:25 | ...::copy | provenance | MaD:5 Sink:MaD:5 |
+| src/main.rs:122:27:122:31 | path1 | src/main.rs:122:27:122:39 | path1.clone() | provenance | MaD:9 |
+| src/main.rs:122:27:122:39 | path1.clone() | src/main.rs:122:27:122:39 | path1.clone() | provenance | Sink:MaD:5 |
+| src/main.rs:123:37:123:41 | path1 | src/main.rs:123:37:123:49 | path1.clone() | provenance | MaD:9 |
+| src/main.rs:123:37:123:49 | path1.clone() | src/main.rs:123:37:123:49 | path1.clone() | provenance | Sink:MaD:5 |
 | src/main.rs:170:16:170:29 | ...: ... [&ref] | src/main.rs:172:26:172:33 | path_str [&ref] | provenance |  |
-| src/main.rs:170:16:170:29 | ...: ... [&ref] | src/main.rs:174:36:174:43 | path_str [&ref] | provenance |  |
-| src/main.rs:172:9:172:12 | path [&ref] | src/main.rs:173:8:173:11 | path [&ref] | provenance |  |
+| src/main.rs:170:16:170:29 | ...: ... [&ref] | src/main.rs:174:36:174:43 | path_str | provenance | Sink:MaD:2 |
+| src/main.rs:172:9:172:12 | path [&ref] | src/main.rs:173:8:173:11 | path | provenance | Sink:MaD:3 |
+| src/main.rs:172:9:172:12 | path [&ref] | src/main.rs:177:36:177:39 | path | provenance | Sink:MaD:2 |
 | src/main.rs:172:16:172:34 | ...::new(...) [&ref] | src/main.rs:172:9:172:12 | path [&ref] | provenance |  |
-| src/main.rs:172:26:172:33 | path_str [&ref] | src/main.rs:172:16:172:34 | ...::new(...) [&ref] | provenance | MaD:13 |
-| src/main.rs:173:8:173:11 | path [&ref] | src/main.rs:173:13:173:18 | exists | provenance | MaD:3 Sink:MaD:3 |
-| src/main.rs:173:8:173:11 | path [&ref] | src/main.rs:177:36:177:39 | path [&ref] | provenance |  |
-| src/main.rs:174:36:174:43 | path_str [&ref] | src/main.rs:174:25:174:34 | ...::open | provenance | MaD:2 Sink:MaD:2 |
-| src/main.rs:177:36:177:39 | path [&ref] | src/main.rs:177:25:177:34 | ...::open | provenance | MaD:2 Sink:MaD:2 |
-| src/main.rs:185:9:185:13 | path1 | src/main.rs:186:18:186:22 | path1 | provenance |  |
-| src/main.rs:185:17:185:30 | ...::args | src/main.rs:185:17:185:32 | ...::args(...) [element] | provenance | Src:MaD:7  |
-| src/main.rs:185:17:185:32 | ...::args(...) [element] | src/main.rs:185:17:185:39 | ... .nth(...) [Some] | provenance | MaD:9 |
-| src/main.rs:185:17:185:39 | ... .nth(...) [Some] | src/main.rs:185:17:185:48 | ... .unwrap() | provenance | MaD:10 |
-| src/main.rs:185:17:185:48 | ... .unwrap() | src/main.rs:185:9:185:13 | path1 | provenance |  |
-| src/main.rs:186:17:186:22 | &path1 [&ref] | src/main.rs:170:16:170:29 | ...: ... [&ref] | provenance |  |
-| src/main.rs:186:18:186:22 | path1 | src/main.rs:186:17:186:22 | &path1 [&ref] | provenance |  |
+| src/main.rs:172:26:172:33 | path_str [&ref] | src/main.rs:172:16:172:34 | ...::new(...) [&ref] | provenance | MaD:14 |
+| src/main.rs:200:18:200:41 | ...: Json::<...> | src/main.rs:201:41:201:77 | \|...\| ... : ... => .. [captured path] | provenance |  |
+| src/main.rs:201:41:201:77 | \|...\| ... : ... => .. [captured path] | src/main.rs:201:73:201:76 | path | provenance | heuristic-callback |
+| src/main.rs:201:73:201:76 | path | src/main.rs:201:73:201:76 | path | provenance | Sink:MaD:6 |
+| src/main.rs:208:33:208:39 | request | src/main.rs:200:18:200:41 | ...: Json::<...> | provenance | Src:MaD:7  |
+| src/main.rs:211:9:211:13 | path1 | src/main.rs:212:18:212:22 | path1 | provenance |  |
+| src/main.rs:211:17:211:32 | ...::args(...) | src/main.rs:211:17:211:32 | ...::args(...) [element] | provenance | Src:MaD:8  |
+| src/main.rs:211:17:211:32 | ...::args(...) [element] | src/main.rs:211:17:211:39 | ... .nth(...) [Some] | provenance | MaD:10 |
+| src/main.rs:211:17:211:39 | ... .nth(...) [Some] | src/main.rs:211:17:211:48 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:211:17:211:48 | ... .unwrap() | src/main.rs:211:9:211:13 | path1 | provenance |  |
+| src/main.rs:212:17:212:22 | &path1 [&ref] | src/main.rs:170:16:170:29 | ...: ... [&ref] | provenance |  |
+| src/main.rs:212:18:212:22 | path1 | src/main.rs:212:17:212:22 | &path1 [&ref] | provenance |  |
 models
 | 1 | Sink: <async_std::fs::file::File>::open; Argument[0]; path-injection |
 | 2 | Sink: <std::fs::File>::open; Argument[0]; path-injection |
@@ -124,36 +116,34 @@ models
 | 4 | Sink: <tokio::fs::file::File>::open; Argument[0]; path-injection |
 | 5 | Sink: std::fs::copy; Argument[0,1]; path-injection |
 | 6 | Sink: std::fs::read_to_string; Argument[0]; path-injection |
-| 7 | Source: std::env::args; ReturnValue.Element; commandargs |
-| 8 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
-| 9 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
-| 10 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
-| 11 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 12 | Summary: <std::path::Path>::join; Argument[0]; ReturnValue; taint |
-| 13 | Summary: <std::path::Path>::new; Argument[0].Reference; ReturnValue.Reference; value |
-| 14 | Summary: <std::path::PathBuf as core::convert::From>::from; Argument[0].Field[alloc::borrow::Cow::Owned(0)]; ReturnValue; value |
-| 15 | Summary: <std::path::PathBuf as core::ops::deref::Deref>::deref; Argument[self].Reference.Field[std::path::PathBuf::inner]; ReturnValue.Reference; value |
+| 7 | Source: axum::routing::method_routing::post; Argument[0].Parameter[0..7]; remote |
+| 8 | Source: std::env::args; ReturnValue.Element; commandargs |
+| 9 | Summary: <core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 10 | Summary: <core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 11 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 12 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 13 | Summary: <std::path::Path>::join; Argument[0]; ReturnValue; taint |
+| 14 | Summary: <std::path::Path>::new; Argument[0].Reference; ReturnValue.Reference; value |
+| 15 | Summary: <std::path::PathBuf as core::convert::From>::from; Argument[0].Field[alloc::borrow::Cow::Owned(0)]; ReturnValue; value |
+| 16 | Summary: <std::path::PathBuf as core::ops::deref::Deref>::deref; Argument[self].Reference.Field[std::path::PathBuf::inner]; ReturnValue.Reference; value |
 nodes
 | src/main.rs:7:11:7:19 | file_name | semmle.label | file_name |
 | src/main.rs:9:9:9:17 | file_path | semmle.label | file_path |
 | src/main.rs:9:21:9:44 | ...::from(...) | semmle.label | ...::from(...) |
 | src/main.rs:9:35:9:43 | file_name | semmle.label | file_name |
-| src/main.rs:11:5:11:22 | ...::read_to_string | semmle.label | ...::read_to_string |
 | src/main.rs:11:24:11:32 | file_path | semmle.label | file_path |
 | src/main.rs:38:11:38:19 | file_path | semmle.label | file_path |
 | src/main.rs:41:9:41:17 | file_path | semmle.label | file_path |
 | src/main.rs:41:21:41:62 | public_path.join(...) | semmle.label | public_path.join(...) |
 | src/main.rs:41:38:41:61 | ...::from(...) | semmle.label | ...::from(...) |
 | src/main.rs:41:52:41:60 | file_path | semmle.label | file_path |
-| src/main.rs:46:5:46:22 | ...::read_to_string | semmle.label | ...::read_to_string |
 | src/main.rs:46:24:46:32 | file_path | semmle.label | file_path |
 | src/main.rs:63:11:63:19 | file_path | semmle.label | file_path |
 | src/main.rs:66:9:66:17 | file_path [&ref] | semmle.label | file_path [&ref] |
 | src/main.rs:66:21:66:41 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
 | src/main.rs:66:31:66:40 | &file_path [&ref] | semmle.label | &file_path [&ref] |
 | src/main.rs:66:32:66:40 | file_path | semmle.label | file_path |
-| src/main.rs:71:5:71:22 | ...::read_to_string | semmle.label | ...::read_to_string |
-| src/main.rs:71:24:71:32 | file_path [&ref] | semmle.label | file_path [&ref] |
+| src/main.rs:71:24:71:32 | file_path | semmle.label | file_path |
 | src/main.rs:76:11:76:19 | file_path | semmle.label | file_path |
 | src/main.rs:79:9:79:17 | file_path | semmle.label | file_path |
 | src/main.rs:79:21:79:62 | public_path.join(...) | semmle.label | public_path.join(...) |
@@ -163,7 +153,6 @@ nodes
 | src/main.rs:80:21:80:29 | file_path | semmle.label | file_path |
 | src/main.rs:80:21:80:44 | file_path.canonicalize() [Ok] | semmle.label | file_path.canonicalize() [Ok] |
 | src/main.rs:80:21:80:53 | ... .unwrap() | semmle.label | ... .unwrap() |
-| src/main.rs:85:5:85:22 | ...::read_to_string | semmle.label | ...::read_to_string |
 | src/main.rs:85:24:85:32 | file_path | semmle.label | file_path |
 | src/main.rs:90:11:90:19 | file_path | semmle.label | file_path |
 | src/main.rs:93:9:93:17 | file_path [&ref] | semmle.label | file_path [&ref] |
@@ -174,22 +163,20 @@ nodes
 | src/main.rs:98:21:98:29 | file_path [&ref] | semmle.label | file_path [&ref] |
 | src/main.rs:98:21:98:44 | file_path.canonicalize() [Ok] | semmle.label | file_path.canonicalize() [Ok] |
 | src/main.rs:98:21:98:53 | ... .unwrap() | semmle.label | ... .unwrap() |
-| src/main.rs:99:5:99:22 | ...::read_to_string | semmle.label | ...::read_to_string |
 | src/main.rs:99:24:99:32 | file_path | semmle.label | file_path |
 | src/main.rs:103:9:103:13 | path1 | semmle.label | path1 |
-| src/main.rs:103:17:103:30 | ...::args | semmle.label | ...::args |
+| src/main.rs:103:17:103:32 | ...::args(...) | semmle.label | ...::args(...) |
 | src/main.rs:103:17:103:32 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
 | src/main.rs:103:17:103:39 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
 | src/main.rs:103:17:103:48 | ... .unwrap() | semmle.label | ... .unwrap() |
-| src/main.rs:104:13:104:31 | ...::open | semmle.label | ...::open |
 | src/main.rs:104:33:104:37 | path1 | semmle.label | path1 |
 | src/main.rs:104:33:104:45 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:104:33:104:45 | path1.clone() | semmle.label | path1.clone() |
 | src/main.rs:106:9:106:13 | path2 | semmle.label | path2 |
 | src/main.rs:106:17:106:52 | ...::canonicalize(...) [Ok] | semmle.label | ...::canonicalize(...) [Ok] |
 | src/main.rs:106:17:106:61 | ... .unwrap() | semmle.label | ... .unwrap() |
 | src/main.rs:106:39:106:43 | path1 | semmle.label | path1 |
 | src/main.rs:106:39:106:51 | path1.clone() | semmle.label | path1.clone() |
-| src/main.rs:107:13:107:31 | ...::open | semmle.label | ...::open |
 | src/main.rs:107:33:107:37 | path2 | semmle.label | path2 |
 | src/main.rs:109:9:109:13 | path3 | semmle.label | path3 |
 | src/main.rs:109:17:109:54 | ...::canonicalize(...) [future, Ok] | semmle.label | ...::canonicalize(...) [future, Ok] |
@@ -197,7 +184,6 @@ nodes
 | src/main.rs:109:17:109:69 | ... .unwrap() | semmle.label | ... .unwrap() |
 | src/main.rs:109:41:109:45 | path1 | semmle.label | path1 |
 | src/main.rs:109:41:109:53 | path1.clone() | semmle.label | path1.clone() |
-| src/main.rs:110:13:110:33 | ...::open | semmle.label | ...::open |
 | src/main.rs:110:35:110:39 | path3 | semmle.label | path3 |
 | src/main.rs:112:9:112:13 | path4 | semmle.label | path4 |
 | src/main.rs:112:17:112:58 | ...::canonicalize(...) [future, Ok] | semmle.label | ...::canonicalize(...) [future, Ok] |
@@ -205,41 +191,40 @@ nodes
 | src/main.rs:112:17:112:73 | ... .unwrap() | semmle.label | ... .unwrap() |
 | src/main.rs:112:45:112:49 | path1 | semmle.label | path1 |
 | src/main.rs:112:45:112:57 | path1.clone() | semmle.label | path1.clone() |
-| src/main.rs:113:13:113:37 | ...::open | semmle.label | ...::open |
 | src/main.rs:113:39:113:43 | path4 | semmle.label | path4 |
 | src/main.rs:115:9:115:13 | path5 [&ref] | semmle.label | path5 [&ref] |
 | src/main.rs:115:17:115:44 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
 | src/main.rs:115:38:115:43 | &path1 [&ref] | semmle.label | &path1 [&ref] |
 | src/main.rs:115:39:115:43 | path1 | semmle.label | path1 |
-| src/main.rs:116:13:116:31 | ...::open | semmle.label | ...::open |
-| src/main.rs:116:33:116:37 | path5 [&ref] | semmle.label | path5 [&ref] |
+| src/main.rs:116:33:116:37 | path5 | semmle.label | path5 |
 | src/main.rs:118:9:118:13 | path6 | semmle.label | path6 |
 | src/main.rs:118:17:118:21 | path5 [&ref] | semmle.label | path5 [&ref] |
 | src/main.rs:118:17:118:36 | path5.canonicalize() [Ok] | semmle.label | path5.canonicalize() [Ok] |
 | src/main.rs:118:17:118:45 | ... .unwrap() | semmle.label | ... .unwrap() |
-| src/main.rs:119:13:119:31 | ...::open | semmle.label | ...::open |
 | src/main.rs:119:33:119:37 | path6 | semmle.label | path6 |
-| src/main.rs:122:13:122:25 | ...::copy | semmle.label | ...::copy |
 | src/main.rs:122:27:122:31 | path1 | semmle.label | path1 |
 | src/main.rs:122:27:122:39 | path1.clone() | semmle.label | path1.clone() |
-| src/main.rs:123:13:123:25 | ...::copy | semmle.label | ...::copy |
+| src/main.rs:122:27:122:39 | path1.clone() | semmle.label | path1.clone() |
 | src/main.rs:123:37:123:41 | path1 | semmle.label | path1 |
 | src/main.rs:123:37:123:49 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:123:37:123:49 | path1.clone() | semmle.label | path1.clone() |
 | src/main.rs:170:16:170:29 | ...: ... [&ref] | semmle.label | ...: ... [&ref] |
 | src/main.rs:172:9:172:12 | path [&ref] | semmle.label | path [&ref] |
 | src/main.rs:172:16:172:34 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
 | src/main.rs:172:26:172:33 | path_str [&ref] | semmle.label | path_str [&ref] |
-| src/main.rs:173:8:173:11 | path [&ref] | semmle.label | path [&ref] |
-| src/main.rs:173:13:173:18 | exists | semmle.label | exists |
-| src/main.rs:174:25:174:34 | ...::open | semmle.label | ...::open |
-| src/main.rs:174:36:174:43 | path_str [&ref] | semmle.label | path_str [&ref] |
-| src/main.rs:177:25:177:34 | ...::open | semmle.label | ...::open |
-| src/main.rs:177:36:177:39 | path [&ref] | semmle.label | path [&ref] |
-| src/main.rs:185:9:185:13 | path1 | semmle.label | path1 |
-| src/main.rs:185:17:185:30 | ...::args | semmle.label | ...::args |
-| src/main.rs:185:17:185:32 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
-| src/main.rs:185:17:185:39 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
-| src/main.rs:185:17:185:48 | ... .unwrap() | semmle.label | ... .unwrap() |
-| src/main.rs:186:17:186:22 | &path1 [&ref] | semmle.label | &path1 [&ref] |
-| src/main.rs:186:18:186:22 | path1 | semmle.label | path1 |
+| src/main.rs:173:8:173:11 | path | semmle.label | path |
+| src/main.rs:174:36:174:43 | path_str | semmle.label | path_str |
+| src/main.rs:177:36:177:39 | path | semmle.label | path |
+| src/main.rs:200:18:200:41 | ...: Json::<...> | semmle.label | ...: Json::<...> |
+| src/main.rs:201:41:201:77 | \|...\| ... : ... => .. [captured path] | semmle.label | \|...\| ... : ... => .. [captured path] |
+| src/main.rs:201:73:201:76 | path | semmle.label | path |
+| src/main.rs:201:73:201:76 | path | semmle.label | path |
+| src/main.rs:208:33:208:39 | request | semmle.label | request |
+| src/main.rs:211:9:211:13 | path1 | semmle.label | path1 |
+| src/main.rs:211:17:211:32 | ...::args(...) | semmle.label | ...::args(...) |
+| src/main.rs:211:17:211:32 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| src/main.rs:211:17:211:39 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| src/main.rs:211:17:211:48 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:212:17:212:22 | &path1 [&ref] | semmle.label | &path1 [&ref] |
+| src/main.rs:212:18:212:22 | path1 | semmle.label | path1 |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-022/TaintedPathSinks.ql b/rust/ql/test/query-tests/security/CWE-022/TaintedPathSinks.ql
index 8660d779e2f0..a38213ae466c 100644
--- a/rust/ql/test/query-tests/security/CWE-022/TaintedPathSinks.ql
+++ b/rust/ql/test/query-tests/security/CWE-022/TaintedPathSinks.ql
@@ -15,42 +15,45 @@ module TaintedPathSinksTest implements TestSig {
   }
 
   predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(TaintedPath::Sink sink |
-      location = sink.getLocation() and
-      location.getFile().getBaseName() != "" and
-      element = sink.toString() and
-      tag = "path-injection-sink" and
-      value = ""
-    )
-    or
-    exists(DataFlow::Node node |
-      (
-        node instanceof TaintedPath::Barrier or
-        node instanceof TaintedPath::SanitizerGuard // tends to label the node *after* the check
-      ) and
-      location = node.getLocation() and
-      location.getFile().getBaseName() != "" and
-      element = node.toString() and
-      tag = "path-injection-barrier" and
-      value = ""
-    )
-    or
-    exists(DataFlow::Node node |
-      DataflowImpl::optionalBarrier(node, "normalize-path") and
-      location = node.getLocation() and
-      location.getFile().getBaseName() != "" and
-      element = node.toString() and
-      tag = "path-injection-normalize" and
-      value = ""
-    )
-    or
-    exists(DataFlow::Node node |
-      node instanceof Path::SafeAccessCheck and // tends to label the node *after* the check
-      location = node.getLocation() and
-      location.getFile().getBaseName() != "" and
-      element = node.toString() and
-      tag = "path-injection-checked" and
-      value = ""
+    location.fromSource() and
+    (
+      exists(TaintedPath::Sink sink |
+        location = sink.getLocation() and
+        location.getFile().getBaseName() != "" and
+        element = sink.toString() and
+        tag = "path-injection-sink" and
+        value = ""
+      )
+      or
+      exists(DataFlow::Node node |
+        (
+          node instanceof TaintedPath::Barrier or
+          node instanceof TaintedPath::SanitizerGuard // tends to label the node *after* the check
+        ) and
+        location = node.getLocation() and
+        location.getFile().getBaseName() != "" and
+        element = node.toString() and
+        tag = "path-injection-barrier" and
+        value = ""
+      )
+      or
+      exists(DataFlow::Node node |
+        DataflowImpl::optionalBarrier(node, "normalize-path") and
+        location = node.getLocation() and
+        location.getFile().getBaseName() != "" and
+        element = node.toString() and
+        tag = "path-injection-normalize" and
+        value = ""
+      )
+      or
+      exists(DataFlow::Node node |
+        node instanceof Path::SafeAccessCheck and // tends to label the node *after* the check
+        location = node.getLocation() and
+        location.getFile().getBaseName() != "" and
+        element = node.toString() and
+        tag = "path-injection-checked" and
+        value = ""
+      )
     )
   }
 }
diff --git a/rust/ql/test/query-tests/security/CWE-022/options.yml b/rust/ql/test/query-tests/security/CWE-022/options.yml
index 18392052c7c5..2c0b985581ec 100644
--- a/rust/ql/test/query-tests/security/CWE-022/options.yml
+++ b/rust/ql/test/query-tests/security/CWE-022/options.yml
@@ -3,3 +3,4 @@ qltest_dependencies:
     - poem = { version = "3.1.7" }
     - tokio = { version = "1.43.0", features = ["full"] }
     - async-std = { version = "1.13.1" }
+    - axum = { version = "0.8.4" }
\ No newline at end of file
diff --git a/rust/ql/test/query-tests/security/CWE-022/src/main.rs b/rust/ql/test/query-tests/security/CWE-022/src/main.rs
index f686fdf1d95b..5f1a11c40d55 100644
--- a/rust/ql/test/query-tests/security/CWE-022/src/main.rs
+++ b/rust/ql/test/query-tests/security/CWE-022/src/main.rs
@@ -181,7 +181,33 @@ fn my_function(path_str: &str) -> Result<(), std::io::Error> {
     Ok(())
 }
 
+use axum::{extract::State, routing::{get, post}, Json, Router};
+use std::sync::Arc;
+
+struct Config {
+    path: String,
+}
+
+async fn destructured(State(config): State<Arc<Config>>) {
+    let _ = tokio::task::spawn_blocking(move || std::fs::read_to_string(&config.path)).await; // $ path-injection-sink
+}
+
+async fn local_clone(state: State<Arc<Config>>) {
+    let config = Arc::clone(&state.0);
+    let _ = tokio::task::spawn_blocking(move || std::fs::read_to_string(&config.path)).await; // $ path-injection-sink
+}
+
+async fn request(Json(path): Json<String>) {
+    let _ = tokio::task::spawn_blocking(move || std::fs::read_to_string(path)).await; // $ Alert[rust/path-injection]=s3 path-injection-sink
+}
+
 fn main() {
+    let _: Router = Router::new()
+        .route("/destructured", get(destructured))
+        .route("/local-clone", get(local_clone))
+        .route("/request", post(request)) // $ Source=s3
+        .with_state(Arc::new(Config { path: String::from("configured-file") }));
+
     let path1 = std::env::args().nth(1).unwrap(); // $ Source=arg2
     my_function(&path1);
 }
diff --git a/rust/ql/test/query-tests/security/CWE-078/CommandInjection.expected b/rust/ql/test/query-tests/security/CWE-078/CommandInjection.expected
new file mode 100644
index 000000000000..392bc09cb0ba
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-078/CommandInjection.expected
@@ -0,0 +1,151 @@
+#select
+| main.rs:27:18:27:36 | arg_string.as_str() | main.rs:4:22:4:37 | ...::args(...) | main.rs:27:18:27:36 | arg_string.as_str() | This command line depends on a $@. | main.rs:4:22:4:37 | ...::args(...) | user-provided value |
+| main.rs:34:14:34:35 | remote_string.as_str() | main.rs:5:25:5:69 | ...::get(...) | main.rs:34:14:34:35 | remote_string.as_str() | This command line depends on a $@. | main.rs:5:25:5:69 | ...::get(...) | user-provided value |
+| main.rs:40:14:40:32 | arg_string.as_str() | main.rs:4:22:4:37 | ...::args(...) | main.rs:40:14:40:32 | arg_string.as_str() | This command line depends on a $@. | main.rs:4:22:4:37 | ...::args(...) | user-provided value |
+| main.rs:47:15:47:45 | &... | main.rs:5:25:5:69 | ...::get(...) | main.rs:47:15:47:45 | &... | This command line depends on a $@. | main.rs:5:25:5:69 | ...::get(...) | user-provided value |
+| main.rs:53:18:53:46 | concatenated_command.as_str() | main.rs:5:25:5:69 | ...::get(...) | main.rs:53:18:53:46 | concatenated_command.as_str() | This command line depends on a $@. | main.rs:5:25:5:69 | ...::get(...) | user-provided value |
+| main.rs:65:48:65:69 | remote_string.as_str() | main.rs:59:25:59:69 | ...::get(...) | main.rs:65:48:65:69 | remote_string.as_str() | This command line depends on a $@. | main.rs:59:25:59:69 | ...::get(...) | user-provided value |
+| main.rs:73:14:73:35 | remote_string.as_str() | main.rs:59:25:59:69 | ...::get(...) | main.rs:73:14:73:35 | remote_string.as_str() | This command line depends on a $@. | main.rs:59:25:59:69 | ...::get(...) | user-provided value |
+| main.rs:86:18:86:27 | user_input | main.rs:138:22:138:37 | ...::args(...) | main.rs:86:18:86:27 | user_input | This command line depends on a $@. | main.rs:138:22:138:37 | ...::args(...) | user-provided value |
+| main.rs:113:22:113:28 | command | main.rs:138:22:138:37 | ...::args(...) | main.rs:113:22:113:28 | command | This command line depends on a $@. | main.rs:138:22:138:37 | ...::args(...) | user-provided value |
+| main.rs:121:22:121:28 | command | main.rs:138:22:138:37 | ...::args(...) | main.rs:121:22:121:28 | command | This command line depends on a $@. | main.rs:138:22:138:37 | ...::args(...) | user-provided value |
+| main.rs:127:22:127:28 | command | main.rs:138:22:138:37 | ...::args(...) | main.rs:127:22:127:28 | command | This command line depends on a $@. | main.rs:138:22:138:37 | ...::args(...) | user-provided value |
+| main.rs:131:22:131:28 | command | main.rs:138:22:138:37 | ...::args(...) | main.rs:131:22:131:28 | command | This command line depends on a $@. | main.rs:138:22:138:37 | ...::args(...) | user-provided value |
+edges
+| main.rs:4:9:4:18 | arg_string | main.rs:27:18:27:27 | arg_string | provenance |  |
+| main.rs:4:9:4:18 | arg_string | main.rs:40:14:40:23 | arg_string | provenance |  |
+| main.rs:4:22:4:37 | ...::args(...) | main.rs:4:22:4:37 | ...::args(...) [element] | provenance | Src:MaD:7  |
+| main.rs:4:22:4:37 | ...::args(...) [element] | main.rs:4:22:4:44 | ... .nth(...) [Some] | provenance | MaD:9 |
+| main.rs:4:22:4:44 | ... .nth(...) [Some] | main.rs:4:22:4:74 | ... .unwrap_or(...) | provenance | MaD:10 |
+| main.rs:4:22:4:74 | ... .unwrap_or(...) | main.rs:4:9:4:18 | arg_string | provenance |  |
+| main.rs:5:9:5:21 | remote_string | main.rs:34:14:34:26 | remote_string | provenance |  |
+| main.rs:5:9:5:21 | remote_string | main.rs:47:23:47:35 | remote_string | provenance |  |
+| main.rs:5:9:5:21 | remote_string | main.rs:52:40:52:69 | MacroExpr | provenance |  |
+| main.rs:5:25:5:69 | ...::get(...) | main.rs:5:25:5:69 | ...::get(...) [Ok] | provenance | Src:MaD:6  |
+| main.rs:5:25:5:69 | ...::get(...) [Ok] | main.rs:5:25:6:17 | ... .unwrap() | provenance | MaD:11 |
+| main.rs:5:25:6:17 | ... .unwrap() | main.rs:5:25:7:15 | ... .text() [Ok] | provenance | MaD:13 |
+| main.rs:5:25:7:15 | ... .text() [Ok] | main.rs:5:25:8:38 | ... .unwrap_or(...) | provenance | MaD:12 |
+| main.rs:5:25:8:38 | ... .unwrap_or(...) | main.rs:5:9:5:21 | remote_string | provenance |  |
+| main.rs:27:18:27:27 | arg_string | main.rs:27:18:27:36 | arg_string.as_str() [&ref] | provenance | MaD:8 |
+| main.rs:27:18:27:36 | arg_string.as_str() [&ref] | main.rs:27:18:27:36 | arg_string.as_str() | provenance | Sink:MaD:3 |
+| main.rs:34:14:34:26 | remote_string | main.rs:34:14:34:35 | remote_string.as_str() [&ref] | provenance | MaD:8 |
+| main.rs:34:14:34:35 | remote_string.as_str() [&ref] | main.rs:34:14:34:35 | remote_string.as_str() | provenance | Sink:MaD:1 |
+| main.rs:40:14:40:23 | arg_string | main.rs:40:14:40:32 | arg_string.as_str() [&ref] | provenance | MaD:8 |
+| main.rs:40:14:40:32 | arg_string.as_str() [&ref] | main.rs:40:14:40:32 | arg_string.as_str() | provenance | Sink:MaD:1 |
+| main.rs:47:15:47:45 | &... [&ref, element, &ref] | main.rs:47:15:47:45 | &... | provenance | Sink:MaD:2 Sink:MaD:2 |
+| main.rs:47:15:47:45 | &... [&ref, element, &ref] | main.rs:47:15:47:45 | &... | provenance | Sink:MaD:2 Sink:MaD:2 Sink:MaD:2 |
+| main.rs:47:16:47:45 | [...] [element, &ref] | main.rs:47:15:47:45 | &... [&ref, element, &ref] | provenance |  |
+| main.rs:47:23:47:35 | remote_string | main.rs:47:23:47:44 | remote_string.as_str() [&ref] | provenance | MaD:8 |
+| main.rs:47:23:47:44 | remote_string.as_str() [&ref] | main.rs:47:16:47:45 | [...] [element, &ref] | provenance |  |
+| main.rs:52:9:52:28 | concatenated_command | main.rs:53:18:53:37 | concatenated_command | provenance |  |
+| main.rs:52:40:52:69 | ...::format(...) | main.rs:52:40:52:69 | { ... } | provenance |  |
+| main.rs:52:40:52:69 | ...::must_use(...) | main.rs:52:9:52:28 | concatenated_command | provenance |  |
+| main.rs:52:40:52:69 | MacroExpr | main.rs:52:40:52:69 | ...::format(...) | provenance | MaD:14 |
+| main.rs:52:40:52:69 | { ... } | main.rs:52:40:52:69 | ...::must_use(...) | provenance | MaD:15 |
+| main.rs:53:18:53:37 | concatenated_command | main.rs:53:18:53:46 | concatenated_command.as_str() [&ref] | provenance | MaD:8 |
+| main.rs:53:18:53:46 | concatenated_command.as_str() [&ref] | main.rs:53:18:53:46 | concatenated_command.as_str() | provenance | Sink:MaD:3 |
+| main.rs:59:9:59:21 | remote_string | main.rs:65:48:65:60 | remote_string | provenance |  |
+| main.rs:59:9:59:21 | remote_string | main.rs:73:14:73:26 | remote_string | provenance |  |
+| main.rs:59:25:59:69 | ...::get(...) | main.rs:59:25:59:69 | ...::get(...) [Ok] | provenance | Src:MaD:6  |
+| main.rs:59:25:59:69 | ...::get(...) [Ok] | main.rs:59:25:60:17 | ... .unwrap() | provenance | MaD:11 |
+| main.rs:59:25:60:17 | ... .unwrap() | main.rs:59:25:61:15 | ... .text() [Ok] | provenance | MaD:13 |
+| main.rs:59:25:61:15 | ... .text() [Ok] | main.rs:59:25:62:38 | ... .unwrap_or(...) | provenance | MaD:12 |
+| main.rs:59:25:62:38 | ... .unwrap_or(...) | main.rs:59:9:59:21 | remote_string | provenance |  |
+| main.rs:65:48:65:60 | remote_string | main.rs:65:48:65:69 | remote_string.as_str() [&ref] | provenance | MaD:8 |
+| main.rs:65:48:65:69 | remote_string.as_str() [&ref] | main.rs:65:48:65:69 | remote_string.as_str() | provenance | Sink:MaD:5 |
+| main.rs:73:14:73:26 | remote_string | main.rs:73:14:73:35 | remote_string.as_str() [&ref] | provenance | MaD:8 |
+| main.rs:73:14:73:35 | remote_string.as_str() [&ref] | main.rs:73:14:73:35 | remote_string.as_str() | provenance | Sink:MaD:4 |
+| main.rs:82:27:82:42 | ...: ... [&ref] | main.rs:86:18:86:27 | user_input | provenance | Sink:MaD:1 |
+| main.rs:107:30:107:42 | ...: ... [&ref] | main.rs:113:22:113:28 | command | provenance | Sink:MaD:3 |
+| main.rs:107:30:107:42 | ...: ... [&ref] | main.rs:121:22:121:28 | command | provenance | Sink:MaD:3 |
+| main.rs:107:30:107:42 | ...: ... [&ref] | main.rs:127:22:127:28 | command | provenance | Sink:MaD:3 |
+| main.rs:107:30:107:42 | ...: ... [&ref] | main.rs:131:22:131:28 | command | provenance | Sink:MaD:3 |
+| main.rs:138:9:138:18 | arg_string | main.rs:142:39:142:48 | arg_string | provenance |  |
+| main.rs:138:9:138:18 | arg_string | main.rs:144:31:144:40 | arg_string | provenance |  |
+| main.rs:138:22:138:37 | ...::args(...) | main.rs:138:22:138:37 | ...::args(...) [element] | provenance | Src:MaD:7  |
+| main.rs:138:22:138:37 | ...::args(...) [element] | main.rs:138:22:138:44 | ... .nth(...) [Some] | provenance | MaD:9 |
+| main.rs:138:22:138:44 | ... .nth(...) [Some] | main.rs:138:22:138:74 | ... .unwrap_or(...) | provenance | MaD:10 |
+| main.rs:138:22:138:74 | ... .unwrap_or(...) | main.rs:138:9:138:18 | arg_string | provenance |  |
+| main.rs:142:39:142:48 | arg_string | main.rs:142:39:142:57 | arg_string.as_str() [&ref] | provenance | MaD:8 |
+| main.rs:142:39:142:57 | arg_string.as_str() [&ref] | main.rs:82:27:82:42 | ...: ... [&ref] | provenance |  |
+| main.rs:144:31:144:40 | arg_string | main.rs:144:31:144:49 | arg_string.as_str() [&ref] | provenance | MaD:8 |
+| main.rs:144:31:144:49 | arg_string.as_str() [&ref] | main.rs:107:30:107:42 | ...: ... [&ref] | provenance |  |
+models
+| 1 | Sink: <std::process::Command>::arg; Argument[0]; command-injection |
+| 2 | Sink: <std::process::Command>::args; Argument[0]; command-injection |
+| 3 | Sink: <std::process::Command>::new; Argument[0]; command-injection |
+| 4 | Sink: <tokio::process::Command>::arg; Argument[0]; command-injection |
+| 5 | Sink: <tokio::process::Command>::new; Argument[0]; command-injection |
+| 6 | Source: reqwest::blocking::get; ReturnValue.Field[core::result::Result::Ok(0)]; remote |
+| 7 | Source: std::env::args; ReturnValue.Element; commandargs |
+| 8 | Summary: <alloc::string::String>::as_str; Argument[self].Reference; ReturnValue.Reference; taint |
+| 9 | Summary: <core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 10 | Summary: <core::option::Option>::unwrap_or; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 11 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 12 | Summary: <core::result::Result>::unwrap_or; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 13 | Summary: <reqwest::blocking::response::Response>::text; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 14 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
+| 15 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
+nodes
+| main.rs:4:9:4:18 | arg_string | semmle.label | arg_string |
+| main.rs:4:22:4:37 | ...::args(...) | semmle.label | ...::args(...) |
+| main.rs:4:22:4:37 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| main.rs:4:22:4:44 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| main.rs:4:22:4:74 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| main.rs:5:9:5:21 | remote_string | semmle.label | remote_string |
+| main.rs:5:25:5:69 | ...::get(...) | semmle.label | ...::get(...) |
+| main.rs:5:25:5:69 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| main.rs:5:25:6:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:5:25:7:15 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
+| main.rs:5:25:8:38 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| main.rs:27:18:27:27 | arg_string | semmle.label | arg_string |
+| main.rs:27:18:27:36 | arg_string.as_str() | semmle.label | arg_string.as_str() |
+| main.rs:27:18:27:36 | arg_string.as_str() [&ref] | semmle.label | arg_string.as_str() [&ref] |
+| main.rs:34:14:34:26 | remote_string | semmle.label | remote_string |
+| main.rs:34:14:34:35 | remote_string.as_str() | semmle.label | remote_string.as_str() |
+| main.rs:34:14:34:35 | remote_string.as_str() [&ref] | semmle.label | remote_string.as_str() [&ref] |
+| main.rs:40:14:40:23 | arg_string | semmle.label | arg_string |
+| main.rs:40:14:40:32 | arg_string.as_str() | semmle.label | arg_string.as_str() |
+| main.rs:40:14:40:32 | arg_string.as_str() [&ref] | semmle.label | arg_string.as_str() [&ref] |
+| main.rs:47:15:47:45 | &... | semmle.label | &... |
+| main.rs:47:15:47:45 | &... [&ref, element, &ref] | semmle.label | &... [&ref, element, &ref] |
+| main.rs:47:16:47:45 | [...] [element, &ref] | semmle.label | [...] [element, &ref] |
+| main.rs:47:23:47:35 | remote_string | semmle.label | remote_string |
+| main.rs:47:23:47:44 | remote_string.as_str() [&ref] | semmle.label | remote_string.as_str() [&ref] |
+| main.rs:52:9:52:28 | concatenated_command | semmle.label | concatenated_command |
+| main.rs:52:40:52:69 | ...::format(...) | semmle.label | ...::format(...) |
+| main.rs:52:40:52:69 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| main.rs:52:40:52:69 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:52:40:52:69 | { ... } | semmle.label | { ... } |
+| main.rs:53:18:53:37 | concatenated_command | semmle.label | concatenated_command |
+| main.rs:53:18:53:46 | concatenated_command.as_str() | semmle.label | concatenated_command.as_str() |
+| main.rs:53:18:53:46 | concatenated_command.as_str() [&ref] | semmle.label | concatenated_command.as_str() [&ref] |
+| main.rs:59:9:59:21 | remote_string | semmle.label | remote_string |
+| main.rs:59:25:59:69 | ...::get(...) | semmle.label | ...::get(...) |
+| main.rs:59:25:59:69 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| main.rs:59:25:60:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:59:25:61:15 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
+| main.rs:59:25:62:38 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| main.rs:65:48:65:60 | remote_string | semmle.label | remote_string |
+| main.rs:65:48:65:69 | remote_string.as_str() | semmle.label | remote_string.as_str() |
+| main.rs:65:48:65:69 | remote_string.as_str() [&ref] | semmle.label | remote_string.as_str() [&ref] |
+| main.rs:73:14:73:26 | remote_string | semmle.label | remote_string |
+| main.rs:73:14:73:35 | remote_string.as_str() | semmle.label | remote_string.as_str() |
+| main.rs:73:14:73:35 | remote_string.as_str() [&ref] | semmle.label | remote_string.as_str() [&ref] |
+| main.rs:82:27:82:42 | ...: ... [&ref] | semmle.label | ...: ... [&ref] |
+| main.rs:86:18:86:27 | user_input | semmle.label | user_input |
+| main.rs:107:30:107:42 | ...: ... [&ref] | semmle.label | ...: ... [&ref] |
+| main.rs:113:22:113:28 | command | semmle.label | command |
+| main.rs:121:22:121:28 | command | semmle.label | command |
+| main.rs:127:22:127:28 | command | semmle.label | command |
+| main.rs:131:22:131:28 | command | semmle.label | command |
+| main.rs:138:9:138:18 | arg_string | semmle.label | arg_string |
+| main.rs:138:22:138:37 | ...::args(...) | semmle.label | ...::args(...) |
+| main.rs:138:22:138:37 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| main.rs:138:22:138:44 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| main.rs:138:22:138:74 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| main.rs:142:39:142:48 | arg_string | semmle.label | arg_string |
+| main.rs:142:39:142:57 | arg_string.as_str() [&ref] | semmle.label | arg_string.as_str() [&ref] |
+| main.rs:144:31:144:40 | arg_string | semmle.label | arg_string |
+| main.rs:144:31:144:49 | arg_string.as_str() [&ref] | semmle.label | arg_string.as_str() [&ref] |
+subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-078/CommandInjection.qlref b/rust/ql/test/query-tests/security/CWE-078/CommandInjection.qlref
new file mode 100644
index 000000000000..3b14f15fafe6
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-078/CommandInjection.qlref
@@ -0,0 +1,4 @@
+query: queries/security/CWE-078/CommandInjection.ql
+postprocess:
+ - utils/test/PrettyPrintModels.ql
+ - utils/test/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/query-tests/security/CWE-078/main.rs b/rust/ql/test/query-tests/security/CWE-078/main.rs
new file mode 100644
index 000000000000..310f9eaee03a
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-078/main.rs
@@ -0,0 +1,145 @@
+use std::process::Command;
+
+fn test_std_command_injection() {
+    let arg_string = std::env::args().nth(1).unwrap_or(String::from("ls")); // $ Source=args1
+    let remote_string = reqwest::blocking::get("http://example.com/") // $ Source=remote1
+        .unwrap()
+        .text()
+        .unwrap_or(String::from("ls"));
+    let const_string = String::from("echo hello");
+
+    // --- safe cases ---
+
+    // Constant command and argument
+    Command::new("ls")
+        .arg("-la")
+        .output()
+        .expect("failed"); // safe
+
+    // Constant constructed command
+    Command::new(const_string.as_str())
+        .output()
+        .expect("failed"); // safe
+
+    // --- unsafe cases ---
+
+    // User input as the command itself
+    Command::new(arg_string.as_str()) // $ Alert[rust/command-line-injection]=args1
+        .output()
+        .expect("failed");
+
+    // User input as an argument to sh -c
+    Command::new("sh")
+        .arg("-c")
+        .arg(remote_string.as_str()) // $ Alert[rust/command-line-injection]=remote1
+        .output()
+        .expect("failed");
+
+    // User input as an argument
+    Command::new("grep")
+        .arg(arg_string.as_str()) // $ Alert[rust/command-line-injection]=args1
+        .arg("file.txt")
+        .output()
+        .expect("failed");
+
+    // Remote input via args()
+    Command::new("bash")
+        .args(&["-c", remote_string.as_str()]) // $ Alert[rust/command-line-injection]=remote1
+        .output()
+        .expect("failed");
+
+    // Remote input concatenated into a command
+    let concatenated_command = format!("sh -c echo {}", remote_string);
+    Command::new(concatenated_command.as_str()) // $ Alert[rust/command-line-injection]=remote1
+        .output()
+        .expect("failed");
+}
+
+async fn test_tokio_command_injection() {
+    let remote_string = reqwest::blocking::get("http://example.com/") // $ Source=remote2
+        .unwrap()
+        .text()
+        .unwrap_or(String::from("ls"));
+
+    // Unsafe: remote input as tokio command
+    let _output = tokio::process::Command::new(remote_string.as_str()) // $ Alert[rust/command-line-injection]=remote2
+        .output()
+        .await
+        .expect("failed");
+
+    // Unsafe: remote input as tokio command argument
+    tokio::process::Command::new("sh")
+        .arg("-c")
+        .arg(remote_string.as_str()) // $ Alert[rust/command-line-injection]=remote2
+        .output()
+        .await
+        .expect("failed");
+}
+
+mod qhelp_example_bad {
+    use std::process::Command;
+
+    pub fn handle_request(user_input: &str) {
+        // BAD
+        Command::new("sh")
+            .arg("-c")
+            .arg(user_input) // $ Alert[rust/command-line-injection]=args2
+            .output()
+            .expect("failed to execute");
+    }
+}
+
+mod qhelp_example_good {
+    use std::process::Command;
+
+    pub fn handle_request(filename: &str) {
+        // GOOD
+        let allowed_names = ["report.pdf", "summary.txt", "data.csv"];
+        if allowed_names.contains(&filename) {
+            Command::new("cat")
+                .arg(filename)
+                .output()
+                .expect("failed to execute");
+        }
+    }
+}
+
+fn test_allowlist_sanitizers(command: &str) {
+    let allowed_commands_array = ["cat", "git", "ls"];
+
+    if allowed_commands_array.contains(&command) {
+        Command::new(command).output().expect("failed");
+    } else {
+        Command::new(command).output().expect("failed"); // $ Alert[rust/command-line-injection]=args2
+    }
+
+    let allowed_commands_vec = vec!["cat", "git", "ls"];
+
+    if allowed_commands_vec.contains(&command) {
+        Command::new(command).output().expect("failed");
+    } else {
+        Command::new(command).output().expect("failed"); // $ Alert[rust/command-line-injection]=args2
+    }
+
+    if command == "ls" {
+        Command::new(command).output().expect("failed");
+    } else {
+        Command::new(command).output().expect("failed"); // $ Alert[rust/command-line-injection]=args2
+    }
+
+    if command != "ls" {
+        Command::new(command).output().expect("failed"); // $ Alert[rust/command-line-injection]=args2
+    } else {
+        Command::new(command).output().expect("failed");
+    }
+}
+
+fn main() {
+    let arg_string = std::env::args().nth(1).unwrap_or(String::from("ls")); // $ Source=args2
+
+    test_std_command_injection();
+    test_tokio_command_injection();
+    qhelp_example_bad::handle_request(arg_string.as_str());
+    qhelp_example_good::handle_request(arg_string.as_str());
+    test_allowlist_sanitizers(arg_string.as_str());
+}
diff --git a/rust/ql/test/query-tests/security/CWE-078/options.yml b/rust/ql/test/query-tests/security/CWE-078/options.yml
new file mode 100644
index 000000000000..78cb2f883af1
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-078/options.yml
@@ -0,0 +1,4 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - reqwest = { version = "0.12.9", features = ["blocking"] }
+    - tokio = { version = "1", features = ["full"] }
diff --git a/rust/ql/test/query-tests/security/CWE-079/actix/XSS.expected b/rust/ql/test/query-tests/security/CWE-079/actix/XSS.expected
index 9667a9216e6f..bdc89446d9f4 100644
--- a/rust/ql/test/query-tests/security/CWE-079/actix/XSS.expected
+++ b/rust/ql/test/query-tests/security/CWE-079/actix/XSS.expected
@@ -1,17 +1,16 @@
 #select
-| main.rs:25:5:25:13 | ...::new | main.rs:8:1:8:18 | to | main.rs:25:5:25:13 | ...::new | Cross-site scripting vulnerability due to a $@. | main.rs:8:1:8:18 | to | user-provided value |
+| main.rs:25:15:25:18 | html | main.rs:9:10:9:27 | vulnerable_handler | main.rs:25:15:25:18 | html | Cross-site scripting vulnerability due to a $@. | main.rs:9:10:9:27 | vulnerable_handler | user-provided value |
 edges
-| main.rs:8:1:8:18 | to | main.rs:9:29:9:51 | ...: ...::Path::<...> | provenance | Src:MaD:2  |
+| main.rs:9:10:9:27 | vulnerable_handler | main.rs:9:29:9:51 | ...: ...::Path::<...> | provenance | Src:MaD:2  |
 | main.rs:9:29:9:51 | ...: ...::Path::<...> | main.rs:10:22:10:25 | path | provenance |  |
 | main.rs:10:9:10:18 | user_input | main.rs:13:9:22:18 | MacroExpr | provenance |  |
 | main.rs:10:22:10:25 | path | main.rs:10:22:10:38 | path.into_inner() | provenance | MaD:3 |
 | main.rs:10:22:10:38 | path.into_inner() | main.rs:10:9:10:18 | user_input | provenance |  |
-| main.rs:12:9:12:12 | html | main.rs:25:15:25:18 | html | provenance |  |
+| main.rs:12:9:12:12 | html | main.rs:25:15:25:18 | html | provenance | Sink:MaD:1 |
 | main.rs:13:9:22:18 | ...::format(...) | main.rs:13:9:22:18 | { ... } | provenance |  |
 | main.rs:13:9:22:18 | ...::must_use(...) | main.rs:12:9:12:12 | html | provenance |  |
 | main.rs:13:9:22:18 | MacroExpr | main.rs:13:9:22:18 | ...::format(...) | provenance | MaD:4 |
 | main.rs:13:9:22:18 | { ... } | main.rs:13:9:22:18 | ...::must_use(...) | provenance | MaD:5 |
-| main.rs:25:15:25:18 | html | main.rs:25:5:25:13 | ...::new | provenance | MaD:1 Sink:MaD:1 |
 models
 | 1 | Sink: <actix_web::types::html::Html>::new; Argument[0]; html-injection |
 | 2 | Source: <actix_web::resource::Resource>::to; Argument[0].Parameter[0..7]; remote |
@@ -19,7 +18,7 @@ models
 | 4 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
 | 5 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
-| main.rs:8:1:8:18 | to | semmle.label | to |
+| main.rs:9:10:9:27 | vulnerable_handler | semmle.label | vulnerable_handler |
 | main.rs:9:29:9:51 | ...: ...::Path::<...> | semmle.label | ...: ...::Path::<...> |
 | main.rs:10:9:10:18 | user_input | semmle.label | user_input |
 | main.rs:10:22:10:25 | path | semmle.label | path |
@@ -29,6 +28,5 @@ nodes
 | main.rs:13:9:22:18 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:13:9:22:18 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:13:9:22:18 | { ... } | semmle.label | { ... } |
-| main.rs:25:5:25:13 | ...::new | semmle.label | ...::new |
 | main.rs:25:15:25:18 | html | semmle.label | html |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-079/actix/main.rs b/rust/ql/test/query-tests/security/CWE-079/actix/main.rs
index 42cd760ca6cb..9a0cb5def4e2 100644
--- a/rust/ql/test/query-tests/security/CWE-079/actix/main.rs
+++ b/rust/ql/test/query-tests/security/CWE-079/actix/main.rs
@@ -5,8 +5,8 @@ use actix_web::{
 };
 
 // The "bad" example from the qldoc
-#[get("/bad/{a}")] // $ Source=a
-async fn vulnerable_handler(path: web::Path<String>) -> impl Responder {
+#[get("/bad/{a}")]
+async fn vulnerable_handler(path: web::Path<String>) -> impl Responder { // $ Source=a
     let user_input = path.into_inner();
 
     let html = format!(
diff --git a/rust/ql/test/query-tests/security/CWE-079/axum/XSS.expected b/rust/ql/test/query-tests/security/CWE-079/axum/XSS.expected
index 385ce0f58c48..d087e05c6387 100644
--- a/rust/ql/test/query-tests/security/CWE-079/axum/XSS.expected
+++ b/rust/ql/test/query-tests/security/CWE-079/axum/XSS.expected
@@ -1,5 +1,5 @@
 #select
-| main.rs:10:10:10:21 | html_content | main.rs:15:51:15:53 | get | main.rs:10:10:10:21 | html_content | Cross-site scripting vulnerability due to a $@. | main.rs:15:51:15:53 | get | user-provided value |
+| main.rs:10:10:10:21 | html_content | main.rs:15:55:15:67 | greet_handler | main.rs:10:10:10:21 | html_content | Cross-site scripting vulnerability due to a $@. | main.rs:15:55:15:67 | greet_handler | user-provided value |
 edges
 | main.rs:8:24:8:59 | ...: Query::<...> | main.rs:9:32:9:63 | MacroExpr | provenance |  |
 | main.rs:9:9:9:20 | html_content | main.rs:10:10:10:21 | html_content | provenance |  |
@@ -7,7 +7,7 @@ edges
 | main.rs:9:32:9:63 | ...::must_use(...) | main.rs:9:9:9:20 | html_content | provenance |  |
 | main.rs:9:32:9:63 | MacroExpr | main.rs:9:32:9:63 | ...::format(...) | provenance | MaD:2 |
 | main.rs:9:32:9:63 | { ... } | main.rs:9:32:9:63 | ...::must_use(...) | provenance | MaD:3 |
-| main.rs:15:51:15:53 | get | main.rs:8:24:8:59 | ...: Query::<...> | provenance | Src:MaD:1  |
+| main.rs:15:55:15:67 | greet_handler | main.rs:8:24:8:59 | ...: Query::<...> | provenance | Src:MaD:1  |
 models
 | 1 | Source: axum::routing::method_routing::get; Argument[0].Parameter[0..7]; remote |
 | 2 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
@@ -20,5 +20,5 @@ nodes
 | main.rs:9:32:9:63 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:9:32:9:63 | { ... } | semmle.label | { ... } |
 | main.rs:10:10:10:21 | html_content | semmle.label | html_content |
-| main.rs:15:51:15:53 | get | semmle.label | get |
+| main.rs:15:55:15:67 | greet_handler | semmle.label | greet_handler |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-079/warp/XSS.expected b/rust/ql/test/query-tests/security/CWE-079/warp/XSS.expected
index 8a366d3b0d54..1609b5c0eaf6 100644
--- a/rust/ql/test/query-tests/security/CWE-079/warp/XSS.expected
+++ b/rust/ql/test/query-tests/security/CWE-079/warp/XSS.expected
@@ -1,27 +1,25 @@
 #select
-| main.rs:10:13:10:29 | ...::html | main.rs:7:10:7:12 | map | main.rs:10:13:10:29 | ...::html | Cross-site scripting vulnerability due to a $@. | main.rs:7:10:7:12 | map | user-provided value |
+| main.rs:10:31:10:34 | body | main.rs:7:14:11:9 | \|...\| ... | main.rs:10:31:10:34 | body | Cross-site scripting vulnerability due to a $@. | main.rs:7:14:11:9 | \|...\| ... | user-provided value |
 edges
-| main.rs:7:10:7:12 | map | main.rs:7:15:7:26 | ...: String | provenance | Src:MaD:2  |
+| main.rs:7:14:11:9 | \|...\| ... | main.rs:7:15:7:26 | ...: String | provenance | Src:MaD:2  |
 | main.rs:7:15:7:26 | ...: String | main.rs:9:32:9:56 | MacroExpr | provenance |  |
-| main.rs:9:17:9:20 | body | main.rs:10:31:10:34 | body | provenance |  |
+| main.rs:9:17:9:20 | body | main.rs:10:31:10:34 | body | provenance | Sink:MaD:1 |
 | main.rs:9:32:9:56 | ...::format(...) | main.rs:9:32:9:56 | { ... } | provenance |  |
 | main.rs:9:32:9:56 | ...::must_use(...) | main.rs:9:17:9:20 | body | provenance |  |
 | main.rs:9:32:9:56 | MacroExpr | main.rs:9:32:9:56 | ...::format(...) | provenance | MaD:3 |
 | main.rs:9:32:9:56 | { ... } | main.rs:9:32:9:56 | ...::must_use(...) | provenance | MaD:4 |
-| main.rs:10:31:10:34 | body | main.rs:10:13:10:29 | ...::html | provenance | MaD:1 Sink:MaD:1 |
 models
 | 1 | Sink: warp::reply::html; Argument[0]; html-injection |
-| 2 | Source: <_ as warp::filter::Filter>::map; Argument[0].Parameter[0..7]; remote |
+| 2 | Source: <warp::filter::Filter>::map; Argument[0].Parameter[0..7]; remote |
 | 3 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
 | 4 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
-| main.rs:7:10:7:12 | map | semmle.label | map |
+| main.rs:7:14:11:9 | \|...\| ... | semmle.label | \|...\| ... |
 | main.rs:7:15:7:26 | ...: String | semmle.label | ...: String |
 | main.rs:9:17:9:20 | body | semmle.label | body |
 | main.rs:9:32:9:56 | ...::format(...) | semmle.label | ...::format(...) |
 | main.rs:9:32:9:56 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:9:32:9:56 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:9:32:9:56 | { ... } | semmle.label | { ... } |
-| main.rs:10:13:10:29 | ...::html | semmle.label | ...::html |
 | main.rs:10:31:10:34 | body | semmle.label | body |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-079/warp/main.rs b/rust/ql/test/query-tests/security/CWE-079/warp/main.rs
index fb300f4cdd42..c40e14f39a92 100644
--- a/rust/ql/test/query-tests/security/CWE-079/warp/main.rs
+++ b/rust/ql/test/query-tests/security/CWE-079/warp/main.rs
@@ -4,11 +4,11 @@ use warp::Filter;
 pub async fn main() {
     let hello = warp::path("greet")
         .and(warp::path::param())
-        .map(|name: String| { // $ Source=name
+        .map(|name: String| {
             // Vulnerable to XSS because it directly includes user input in the response
             let body = format!("<h1>Hello, {name}!</h1>");
             warp::reply::html(body) // $ Alert[rust/xss]=name
-        });
+        }); // $ Source=name
 
     // Start the web server on port 3000
     warp::serve(hello).run(([127, 0, 0, 1], 3000)).await;
diff --git a/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected
index 570340060556..f01246e128df 100644
--- a/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected
+++ b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected
@@ -1,40 +1,40 @@
 #select
-| mysql.rs:25:32:25:36 | query | mysql.rs:12:33:12:54 | ...::get | mysql.rs:25:32:25:36 | query | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
-| mysql.rs:26:54:26:62 | query_opt | mysql.rs:12:33:12:54 | ...::get | mysql.rs:26:54:26:62 | query_opt | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
-| mysql.rs:27:14:27:23 | query_drop | mysql.rs:12:33:12:54 | ...::get | mysql.rs:27:14:27:23 | query_drop | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
-| mysql.rs:28:27:28:37 | query_first | mysql.rs:12:33:12:54 | ...::get | mysql.rs:28:27:28:37 | query_first | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
-| mysql.rs:29:49:29:63 | query_first_opt | mysql.rs:12:33:12:54 | ...::get | mysql.rs:29:49:29:63 | query_first_opt | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
-| mysql.rs:30:22:30:31 | query_fold | mysql.rs:12:33:12:54 | ...::get | mysql.rs:30:22:30:31 | query_fold | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
-| mysql.rs:31:22:31:35 | query_fold_opt | mysql.rs:12:33:12:54 | ...::get | mysql.rs:31:22:31:35 | query_fold_opt | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
-| mysql.rs:36:22:36:31 | query_iter | mysql.rs:12:33:12:54 | ...::get | mysql.rs:36:22:36:31 | query_iter | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
-| mysql.rs:37:22:37:30 | query_map | mysql.rs:12:33:12:54 | ...::get | mysql.rs:37:22:37:30 | query_map | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
-| mysql.rs:38:22:38:34 | query_map_opt | mysql.rs:12:33:12:54 | ...::get | mysql.rs:38:22:38:34 | query_map_opt | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
-| mysql.rs:42:33:42:37 | query | mysql.rs:12:33:12:54 | ...::get | mysql.rs:42:33:42:37 | query | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
-| mysql.rs:75:26:75:29 | prep | mysql.rs:12:33:12:54 | ...::get | mysql.rs:75:26:75:29 | prep | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
-| mysql.rs:80:15:80:24 | query_drop | mysql.rs:12:33:12:54 | ...::get | mysql.rs:80:15:80:24 | query_drop | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
-| mysql.rs:110:32:110:36 | query | mysql.rs:97:33:97:54 | ...::get | mysql.rs:110:32:110:36 | query | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
-| mysql.rs:111:14:111:23 | query_drop | mysql.rs:97:33:97:54 | ...::get | mysql.rs:111:14:111:23 | query_drop | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
-| mysql.rs:112:35:112:45 | query_first | mysql.rs:97:33:97:54 | ...::get | mysql.rs:112:35:112:45 | query_first | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
-| mysql.rs:114:14:114:23 | query_fold | mysql.rs:97:33:97:54 | ...::get | mysql.rs:114:14:114:23 | query_fold | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
-| mysql.rs:116:22:116:31 | query_iter | mysql.rs:97:33:97:54 | ...::get | mysql.rs:116:22:116:31 | query_iter | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
-| mysql.rs:118:14:118:25 | query_stream | mysql.rs:97:33:97:54 | ...::get | mysql.rs:118:14:118:25 | query_stream | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
-| mysql.rs:121:14:121:22 | query_map | mysql.rs:97:33:97:54 | ...::get | mysql.rs:121:14:121:22 | query_map | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
-| mysql.rs:149:26:149:29 | prep | mysql.rs:97:33:97:54 | ...::get | mysql.rs:149:26:149:29 | prep | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
-| mysql.rs:154:15:154:24 | query_drop | mysql.rs:97:33:97:54 | ...::get | mysql.rs:154:15:154:24 | query_drop | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
-| sqlx.rs:78:13:78:23 | ...::query | sqlx.rs:47:22:47:35 | ...::args | sqlx.rs:78:13:78:23 | ...::query | This query depends on a $@. | sqlx.rs:47:22:47:35 | ...::args | user-provided value |
-| sqlx.rs:80:17:80:27 | ...::query | sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:80:17:80:27 | ...::query | This query depends on a $@. | sqlx.rs:48:25:48:46 | ...::get | user-provided value |
-| sqlx.rs:81:17:81:27 | ...::query | sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:81:17:81:27 | ...::query | This query depends on a $@. | sqlx.rs:48:25:48:46 | ...::get | user-provided value |
-| sqlx.rs:82:17:82:27 | ...::query | sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:82:17:82:27 | ...::query | This query depends on a $@. | sqlx.rs:48:25:48:46 | ...::get | user-provided value |
-| sqlx.rs:113:17:113:29 | ...::raw_sql | sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:113:17:113:29 | ...::raw_sql | This query depends on a $@. | sqlx.rs:100:25:100:46 | ...::get | user-provided value |
-| sqlx.rs:120:17:120:27 | ...::query | sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:120:17:120:27 | ...::query | This query depends on a $@. | sqlx.rs:100:25:100:46 | ...::get | user-provided value |
-| sqlx.rs:127:17:127:27 | ...::query | sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:127:17:127:27 | ...::query | This query depends on a $@. | sqlx.rs:100:25:100:46 | ...::get | user-provided value |
-| sqlx.rs:136:40:136:53 | ...::query_as | sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:136:40:136:53 | ...::query_as | This query depends on a $@. | sqlx.rs:100:25:100:46 | ...::get | user-provided value |
-| sqlx.rs:145:40:145:53 | ...::query_as | sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:145:40:145:53 | ...::query_as | This query depends on a $@. | sqlx.rs:100:25:100:46 | ...::get | user-provided value |
-| sqlx.rs:153:17:153:27 | ...::query | sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:153:17:153:27 | ...::query | This query depends on a $@. | sqlx.rs:100:25:100:46 | ...::get | user-provided value |
-| sqlx.rs:188:17:188:27 | ...::query | sqlx.rs:173:25:173:46 | ...::get | sqlx.rs:188:17:188:27 | ...::query | This query depends on a $@. | sqlx.rs:173:25:173:46 | ...::get | user-provided value |
+| mysql.rs:25:38:25:58 | unsafe_query.as_str() | mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:25:38:25:58 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:12:33:12:77 | ...::get(...) | user-provided value |
+| mysql.rs:26:64:26:84 | unsafe_query.as_str() | mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:26:64:26:84 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:12:33:12:77 | ...::get(...) | user-provided value |
+| mysql.rs:27:25:27:45 | unsafe_query.as_str() | mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:27:25:27:45 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:12:33:12:77 | ...::get(...) | user-provided value |
+| mysql.rs:28:39:28:59 | unsafe_query.as_str() | mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:28:39:28:59 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:12:33:12:77 | ...::get(...) | user-provided value |
+| mysql.rs:29:65:29:85 | unsafe_query.as_str() | mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:29:65:29:85 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:12:33:12:77 | ...::get(...) | user-provided value |
+| mysql.rs:30:33:30:53 | unsafe_query.as_str() | mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:30:33:30:53 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:12:33:12:77 | ...::get(...) | user-provided value |
+| mysql.rs:32:13:32:33 | unsafe_query.as_str() | mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:32:13:32:33 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:12:33:12:77 | ...::get(...) | user-provided value |
+| mysql.rs:36:33:36:53 | unsafe_query.as_str() | mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:36:33:36:53 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:12:33:12:77 | ...::get(...) | user-provided value |
+| mysql.rs:37:32:37:52 | unsafe_query.as_str() | mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:37:32:37:52 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:12:33:12:77 | ...::get(...) | user-provided value |
+| mysql.rs:39:13:39:33 | unsafe_query.as_str() | mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:39:13:39:33 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:12:33:12:77 | ...::get(...) | user-provided value |
+| mysql.rs:42:39:42:59 | unsafe_query.as_str() | mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:42:39:42:59 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:12:33:12:77 | ...::get(...) | user-provided value |
+| mysql.rs:75:31:75:51 | unsafe_query.as_str() | mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:75:31:75:51 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:12:33:12:77 | ...::get(...) | user-provided value |
+| mysql.rs:80:26:80:46 | unsafe_query.as_str() | mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:80:26:80:46 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:12:33:12:77 | ...::get(...) | user-provided value |
+| mysql.rs:110:38:110:58 | unsafe_query.as_str() | mysql.rs:97:33:97:77 | ...::get(...) | mysql.rs:110:38:110:58 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:97:33:97:77 | ...::get(...) | user-provided value |
+| mysql.rs:111:25:111:45 | unsafe_query.as_str() | mysql.rs:97:33:97:77 | ...::get(...) | mysql.rs:111:25:111:45 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:97:33:97:77 | ...::get(...) | user-provided value |
+| mysql.rs:112:47:112:67 | unsafe_query.as_str() | mysql.rs:97:33:97:77 | ...::get(...) | mysql.rs:112:47:112:67 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:97:33:97:77 | ...::get(...) | user-provided value |
+| mysql.rs:114:25:114:45 | unsafe_query.as_str() | mysql.rs:97:33:97:77 | ...::get(...) | mysql.rs:114:25:114:45 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:97:33:97:77 | ...::get(...) | user-provided value |
+| mysql.rs:116:33:116:53 | unsafe_query.as_str() | mysql.rs:97:33:97:77 | ...::get(...) | mysql.rs:116:33:116:53 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:97:33:97:77 | ...::get(...) | user-provided value |
+| mysql.rs:118:40:118:60 | unsafe_query.as_str() | mysql.rs:97:33:97:77 | ...::get(...) | mysql.rs:118:40:118:60 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:97:33:97:77 | ...::get(...) | user-provided value |
+| mysql.rs:121:24:121:44 | unsafe_query.as_str() | mysql.rs:97:33:97:77 | ...::get(...) | mysql.rs:121:24:121:44 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:97:33:97:77 | ...::get(...) | user-provided value |
+| mysql.rs:149:31:149:51 | unsafe_query.as_str() | mysql.rs:97:33:97:77 | ...::get(...) | mysql.rs:149:31:149:51 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:97:33:97:77 | ...::get(...) | user-provided value |
+| mysql.rs:154:26:154:46 | unsafe_query.as_str() | mysql.rs:97:33:97:77 | ...::get(...) | mysql.rs:154:26:154:46 | unsafe_query.as_str() | This query depends on a $@. | mysql.rs:97:33:97:77 | ...::get(...) | user-provided value |
+| sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() | sqlx.rs:47:22:47:37 | ...::args(...) | sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() | This query depends on a $@. | sqlx.rs:47:22:47:37 | ...::args(...) | user-provided value |
+| sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() | sqlx.rs:48:25:48:69 | ...::get(...) | sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() | This query depends on a $@. | sqlx.rs:48:25:48:69 | ...::get(...) | user-provided value |
+| sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() | sqlx.rs:48:25:48:69 | ...::get(...) | sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() | This query depends on a $@. | sqlx.rs:48:25:48:69 | ...::get(...) | user-provided value |
+| sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() | sqlx.rs:48:25:48:69 | ...::get(...) | sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() | This query depends on a $@. | sqlx.rs:48:25:48:69 | ...::get(...) | user-provided value |
+| sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() | sqlx.rs:100:25:100:69 | ...::get(...) | sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() | This query depends on a $@. | sqlx.rs:100:25:100:69 | ...::get(...) | user-provided value |
+| sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() | sqlx.rs:100:25:100:69 | ...::get(...) | sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() | This query depends on a $@. | sqlx.rs:100:25:100:69 | ...::get(...) | user-provided value |
+| sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() | sqlx.rs:100:25:100:69 | ...::get(...) | sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() | This query depends on a $@. | sqlx.rs:100:25:100:69 | ...::get(...) | user-provided value |
+| sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() | sqlx.rs:100:25:100:69 | ...::get(...) | sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() | This query depends on a $@. | sqlx.rs:100:25:100:69 | ...::get(...) | user-provided value |
+| sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() | sqlx.rs:100:25:100:69 | ...::get(...) | sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() | This query depends on a $@. | sqlx.rs:100:25:100:69 | ...::get(...) | user-provided value |
+| sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() | sqlx.rs:100:25:100:69 | ...::get(...) | sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() | This query depends on a $@. | sqlx.rs:100:25:100:69 | ...::get(...) | user-provided value |
+| sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() | sqlx.rs:173:25:173:69 | ...::get(...) | sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() | This query depends on a $@. | sqlx.rs:173:25:173:69 | ...::get(...) | user-provided value |
 edges
 | mysql.rs:12:13:12:29 | mut remote_string | mysql.rs:18:71:18:83 | remote_string | provenance |  |
-| mysql.rs:12:33:12:54 | ...::get | mysql.rs:12:33:12:77 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
+| mysql.rs:12:33:12:77 | ...::get(...) | mysql.rs:12:33:12:77 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
 | mysql.rs:12:33:12:77 | ...::get(...) [Ok] | mysql.rs:12:33:13:21 | ... .unwrap() | provenance | MaD:30 |
 | mysql.rs:12:33:13:21 | ... .unwrap() | mysql.rs:12:33:14:19 | ... .text() [Ok] | provenance | MaD:32 |
 | mysql.rs:12:33:14:19 | ... .text() [Ok] | mysql.rs:12:33:15:40 | ... .unwrap_or(...) | provenance | MaD:31 |
@@ -52,38 +52,38 @@ edges
 | mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:42:39:42:50 | unsafe_query | provenance |  |
 | mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:75:31:75:42 | unsafe_query | provenance |  |
 | mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:80:26:80:37 | unsafe_query | provenance |  |
-| mysql.rs:18:13:18:83 | ... + ... | mysql.rs:18:13:18:89 | ... + ... | provenance | MaD:27 |
+| mysql.rs:18:13:18:83 | ... + ... | mysql.rs:18:13:18:89 | ... + ... | provenance | MaD:26 |
 | mysql.rs:18:13:18:89 | ... + ... | mysql.rs:17:13:17:24 | unsafe_query | provenance |  |
-| mysql.rs:18:70:18:83 | &remote_string [&ref] | mysql.rs:18:13:18:83 | ... + ... | provenance | MaD:26 |
+| mysql.rs:18:70:18:83 | &remote_string [&ref] | mysql.rs:18:13:18:83 | ... + ... | provenance | MaD:25 |
 | mysql.rs:18:71:18:83 | remote_string | mysql.rs:18:70:18:83 | &remote_string [&ref] | provenance |  |
-| mysql.rs:25:38:25:49 | unsafe_query | mysql.rs:25:38:25:58 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:25:38:25:58 | unsafe_query.as_str() [&ref] | mysql.rs:25:32:25:36 | query | provenance | MaD:1 Sink:MaD:1 |
-| mysql.rs:26:64:26:75 | unsafe_query | mysql.rs:26:64:26:84 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:26:64:26:84 | unsafe_query.as_str() [&ref] | mysql.rs:26:54:26:62 | query_opt | provenance | MaD:9 Sink:MaD:9 |
-| mysql.rs:27:25:27:36 | unsafe_query | mysql.rs:27:25:27:45 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:27:25:27:45 | unsafe_query.as_str() [&ref] | mysql.rs:27:14:27:23 | query_drop | provenance | MaD:2 Sink:MaD:2 |
-| mysql.rs:28:39:28:50 | unsafe_query | mysql.rs:28:39:28:59 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:28:39:28:59 | unsafe_query.as_str() [&ref] | mysql.rs:28:27:28:37 | query_first | provenance | MaD:3 Sink:MaD:3 |
-| mysql.rs:29:65:29:76 | unsafe_query | mysql.rs:29:65:29:85 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:29:65:29:85 | unsafe_query.as_str() [&ref] | mysql.rs:29:49:29:63 | query_first_opt | provenance | MaD:4 Sink:MaD:4 |
-| mysql.rs:30:33:30:44 | unsafe_query | mysql.rs:30:33:30:53 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:30:33:30:53 | unsafe_query.as_str() [&ref] | mysql.rs:30:22:30:31 | query_fold | provenance | MaD:5 Sink:MaD:5 |
-| mysql.rs:32:13:32:24 | unsafe_query | mysql.rs:32:13:32:33 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:32:13:32:33 | unsafe_query.as_str() [&ref] | mysql.rs:31:22:31:35 | query_fold_opt | provenance | MaD:6 Sink:MaD:6 |
-| mysql.rs:36:33:36:44 | unsafe_query | mysql.rs:36:33:36:53 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:36:33:36:53 | unsafe_query.as_str() [&ref] | mysql.rs:36:22:36:31 | query_iter | provenance | MaD:17 Sink:MaD:17 |
-| mysql.rs:37:32:37:43 | unsafe_query | mysql.rs:37:32:37:52 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:37:32:37:52 | unsafe_query.as_str() [&ref] | mysql.rs:37:22:37:30 | query_map | provenance | MaD:7 Sink:MaD:7 |
-| mysql.rs:39:13:39:24 | unsafe_query | mysql.rs:39:13:39:33 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:39:13:39:33 | unsafe_query.as_str() [&ref] | mysql.rs:38:22:38:34 | query_map_opt | provenance | MaD:8 Sink:MaD:8 |
-| mysql.rs:42:39:42:50 | unsafe_query | mysql.rs:42:39:42:59 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:42:39:42:59 | unsafe_query.as_str() [&ref] | mysql.rs:42:33:42:37 | query | provenance | MaD:1 Sink:MaD:1 |
-| mysql.rs:75:31:75:42 | unsafe_query | mysql.rs:75:31:75:51 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:75:31:75:51 | unsafe_query.as_str() [&ref] | mysql.rs:75:26:75:29 | prep | provenance | MaD:16 Sink:MaD:16 |
-| mysql.rs:80:26:80:37 | unsafe_query | mysql.rs:80:26:80:46 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:80:26:80:46 | unsafe_query.as_str() [&ref] | mysql.rs:80:15:80:24 | query_drop | provenance | MaD:2 Sink:MaD:2 |
+| mysql.rs:25:38:25:49 | unsafe_query | mysql.rs:25:38:25:58 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:25:38:25:58 | unsafe_query.as_str() [&ref] | mysql.rs:25:38:25:58 | unsafe_query.as_str() | provenance | Sink:MaD:3 |
+| mysql.rs:26:64:26:75 | unsafe_query | mysql.rs:26:64:26:84 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:26:64:26:84 | unsafe_query.as_str() [&ref] | mysql.rs:26:64:26:84 | unsafe_query.as_str() | provenance | Sink:MaD:11 |
+| mysql.rs:27:25:27:36 | unsafe_query | mysql.rs:27:25:27:45 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:27:25:27:45 | unsafe_query.as_str() [&ref] | mysql.rs:27:25:27:45 | unsafe_query.as_str() | provenance | Sink:MaD:4 |
+| mysql.rs:28:39:28:50 | unsafe_query | mysql.rs:28:39:28:59 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:28:39:28:59 | unsafe_query.as_str() [&ref] | mysql.rs:28:39:28:59 | unsafe_query.as_str() | provenance | Sink:MaD:5 |
+| mysql.rs:29:65:29:76 | unsafe_query | mysql.rs:29:65:29:85 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:29:65:29:85 | unsafe_query.as_str() [&ref] | mysql.rs:29:65:29:85 | unsafe_query.as_str() | provenance | Sink:MaD:6 |
+| mysql.rs:30:33:30:44 | unsafe_query | mysql.rs:30:33:30:53 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:30:33:30:53 | unsafe_query.as_str() [&ref] | mysql.rs:30:33:30:53 | unsafe_query.as_str() | provenance | Sink:MaD:7 |
+| mysql.rs:32:13:32:24 | unsafe_query | mysql.rs:32:13:32:33 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:32:13:32:33 | unsafe_query.as_str() [&ref] | mysql.rs:32:13:32:33 | unsafe_query.as_str() | provenance | Sink:MaD:8 |
+| mysql.rs:36:33:36:44 | unsafe_query | mysql.rs:36:33:36:53 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:36:33:36:53 | unsafe_query.as_str() [&ref] | mysql.rs:36:33:36:53 | unsafe_query.as_str() | provenance | Sink:MaD:2 |
+| mysql.rs:37:32:37:43 | unsafe_query | mysql.rs:37:32:37:52 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:37:32:37:52 | unsafe_query.as_str() [&ref] | mysql.rs:37:32:37:52 | unsafe_query.as_str() | provenance | Sink:MaD:9 |
+| mysql.rs:39:13:39:24 | unsafe_query | mysql.rs:39:13:39:33 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:39:13:39:33 | unsafe_query.as_str() [&ref] | mysql.rs:39:13:39:33 | unsafe_query.as_str() | provenance | Sink:MaD:10 |
+| mysql.rs:42:39:42:50 | unsafe_query | mysql.rs:42:39:42:59 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:42:39:42:59 | unsafe_query.as_str() [&ref] | mysql.rs:42:39:42:59 | unsafe_query.as_str() | provenance | Sink:MaD:3 |
+| mysql.rs:75:31:75:42 | unsafe_query | mysql.rs:75:31:75:51 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:75:31:75:51 | unsafe_query.as_str() [&ref] | mysql.rs:75:31:75:51 | unsafe_query.as_str() | provenance | Sink:MaD:1 |
+| mysql.rs:80:26:80:37 | unsafe_query | mysql.rs:80:26:80:46 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:80:26:80:46 | unsafe_query.as_str() [&ref] | mysql.rs:80:26:80:46 | unsafe_query.as_str() | provenance | Sink:MaD:4 |
 | mysql.rs:97:13:97:29 | mut remote_string | mysql.rs:103:71:103:83 | remote_string | provenance |  |
-| mysql.rs:97:33:97:54 | ...::get | mysql.rs:97:33:97:77 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
+| mysql.rs:97:33:97:77 | ...::get(...) | mysql.rs:97:33:97:77 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
 | mysql.rs:97:33:97:77 | ...::get(...) [Ok] | mysql.rs:97:33:98:21 | ... .unwrap() | provenance | MaD:30 |
 | mysql.rs:97:33:98:21 | ... .unwrap() | mysql.rs:97:33:99:19 | ... .text() [Ok] | provenance | MaD:32 |
 | mysql.rs:97:33:99:19 | ... .text() [Ok] | mysql.rs:97:33:100:40 | ... .unwrap_or(...) | provenance | MaD:31 |
@@ -97,37 +97,37 @@ edges
 | mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:121:24:121:35 | unsafe_query | provenance |  |
 | mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:149:31:149:42 | unsafe_query | provenance |  |
 | mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:154:26:154:37 | unsafe_query | provenance |  |
-| mysql.rs:103:13:103:83 | ... + ... | mysql.rs:103:13:103:89 | ... + ... | provenance | MaD:27 |
+| mysql.rs:103:13:103:83 | ... + ... | mysql.rs:103:13:103:89 | ... + ... | provenance | MaD:26 |
 | mysql.rs:103:13:103:89 | ... + ... | mysql.rs:102:13:102:24 | unsafe_query | provenance |  |
-| mysql.rs:103:70:103:83 | &remote_string [&ref] | mysql.rs:103:13:103:83 | ... + ... | provenance | MaD:26 |
+| mysql.rs:103:70:103:83 | &remote_string [&ref] | mysql.rs:103:13:103:83 | ... + ... | provenance | MaD:25 |
 | mysql.rs:103:71:103:83 | remote_string | mysql.rs:103:70:103:83 | &remote_string [&ref] | provenance |  |
-| mysql.rs:110:38:110:49 | unsafe_query | mysql.rs:110:38:110:58 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:110:38:110:58 | unsafe_query.as_str() [&ref] | mysql.rs:110:32:110:36 | query | provenance | MaD:10 Sink:MaD:10 |
-| mysql.rs:111:25:111:36 | unsafe_query | mysql.rs:111:25:111:45 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:111:25:111:45 | unsafe_query.as_str() [&ref] | mysql.rs:111:14:111:23 | query_drop | provenance | MaD:11 Sink:MaD:11 |
-| mysql.rs:112:47:112:58 | unsafe_query | mysql.rs:112:47:112:67 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:112:47:112:67 | unsafe_query.as_str() [&ref] | mysql.rs:112:35:112:45 | query_first | provenance | MaD:12 Sink:MaD:12 |
-| mysql.rs:114:25:114:36 | unsafe_query | mysql.rs:114:25:114:45 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:114:25:114:45 | unsafe_query.as_str() [&ref] | mysql.rs:114:14:114:23 | query_fold | provenance | MaD:13 Sink:MaD:13 |
-| mysql.rs:116:33:116:44 | unsafe_query | mysql.rs:116:33:116:53 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:116:33:116:53 | unsafe_query.as_str() [&ref] | mysql.rs:116:22:116:31 | query_iter | provenance | MaD:19 Sink:MaD:19 |
-| mysql.rs:118:40:118:51 | unsafe_query | mysql.rs:118:40:118:60 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:118:40:118:60 | unsafe_query.as_str() [&ref] | mysql.rs:118:14:118:25 | query_stream | provenance | MaD:15 Sink:MaD:15 |
-| mysql.rs:121:24:121:35 | unsafe_query | mysql.rs:121:24:121:44 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:121:24:121:44 | unsafe_query.as_str() [&ref] | mysql.rs:121:14:121:22 | query_map | provenance | MaD:14 Sink:MaD:14 |
-| mysql.rs:149:31:149:42 | unsafe_query | mysql.rs:149:31:149:51 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:149:31:149:51 | unsafe_query.as_str() [&ref] | mysql.rs:149:26:149:29 | prep | provenance | MaD:18 Sink:MaD:18 |
-| mysql.rs:154:26:154:37 | unsafe_query | mysql.rs:154:26:154:46 | unsafe_query.as_str() [&ref] | provenance | MaD:28 |
-| mysql.rs:154:26:154:46 | unsafe_query.as_str() [&ref] | mysql.rs:154:15:154:24 | query_drop | provenance | MaD:11 Sink:MaD:11 |
+| mysql.rs:110:38:110:49 | unsafe_query | mysql.rs:110:38:110:58 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:110:38:110:58 | unsafe_query.as_str() [&ref] | mysql.rs:110:38:110:58 | unsafe_query.as_str() | provenance | Sink:MaD:14 |
+| mysql.rs:111:25:111:36 | unsafe_query | mysql.rs:111:25:111:45 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:111:25:111:45 | unsafe_query.as_str() [&ref] | mysql.rs:111:25:111:45 | unsafe_query.as_str() | provenance | Sink:MaD:15 |
+| mysql.rs:112:47:112:58 | unsafe_query | mysql.rs:112:47:112:67 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:112:47:112:67 | unsafe_query.as_str() [&ref] | mysql.rs:112:47:112:67 | unsafe_query.as_str() | provenance | Sink:MaD:16 |
+| mysql.rs:114:25:114:36 | unsafe_query | mysql.rs:114:25:114:45 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:114:25:114:45 | unsafe_query.as_str() [&ref] | mysql.rs:114:25:114:45 | unsafe_query.as_str() | provenance | Sink:MaD:17 |
+| mysql.rs:116:33:116:44 | unsafe_query | mysql.rs:116:33:116:53 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:116:33:116:53 | unsafe_query.as_str() [&ref] | mysql.rs:116:33:116:53 | unsafe_query.as_str() | provenance | Sink:MaD:13 |
+| mysql.rs:118:40:118:51 | unsafe_query | mysql.rs:118:40:118:60 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:118:40:118:60 | unsafe_query.as_str() [&ref] | mysql.rs:118:40:118:60 | unsafe_query.as_str() | provenance | Sink:MaD:19 |
+| mysql.rs:121:24:121:35 | unsafe_query | mysql.rs:121:24:121:44 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:121:24:121:44 | unsafe_query.as_str() [&ref] | mysql.rs:121:24:121:44 | unsafe_query.as_str() | provenance | Sink:MaD:18 |
+| mysql.rs:149:31:149:42 | unsafe_query | mysql.rs:149:31:149:51 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:149:31:149:51 | unsafe_query.as_str() [&ref] | mysql.rs:149:31:149:51 | unsafe_query.as_str() | provenance | Sink:MaD:12 |
+| mysql.rs:154:26:154:37 | unsafe_query | mysql.rs:154:26:154:46 | unsafe_query.as_str() [&ref] | provenance | MaD:27 |
+| mysql.rs:154:26:154:46 | unsafe_query.as_str() [&ref] | mysql.rs:154:26:154:46 | unsafe_query.as_str() | provenance | Sink:MaD:15 |
 | sqlx.rs:47:9:47:18 | arg_string | sqlx.rs:53:27:53:36 | arg_string | provenance |  |
-| sqlx.rs:47:22:47:35 | ...::args | sqlx.rs:47:22:47:37 | ...::args(...) [element] | provenance | Src:MaD:24  |
-| sqlx.rs:47:22:47:37 | ...::args(...) [element] | sqlx.rs:47:22:47:44 | ... .nth(...) [Some] | provenance | MaD:25 |
+| sqlx.rs:47:22:47:37 | ...::args(...) | sqlx.rs:47:22:47:37 | ...::args(...) [element] | provenance | Src:MaD:24  |
+| sqlx.rs:47:22:47:37 | ...::args(...) [element] | sqlx.rs:47:22:47:44 | ... .nth(...) [Some] | provenance | MaD:28 |
 | sqlx.rs:47:22:47:44 | ... .nth(...) [Some] | sqlx.rs:47:22:47:77 | ... .unwrap_or(...) | provenance | MaD:29 |
 | sqlx.rs:47:22:47:77 | ... .unwrap_or(...) | sqlx.rs:47:9:47:18 | arg_string | provenance |  |
 | sqlx.rs:48:9:48:21 | remote_string | sqlx.rs:54:27:54:39 | remote_string | provenance |  |
 | sqlx.rs:48:9:48:21 | remote_string | sqlx.rs:55:84:55:96 | remote_string | provenance |  |
 | sqlx.rs:48:9:48:21 | remote_string | sqlx.rs:59:17:59:72 | MacroExpr | provenance |  |
-| sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:48:25:48:69 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
+| sqlx.rs:48:25:48:69 | ...::get(...) | sqlx.rs:48:25:48:69 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
 | sqlx.rs:48:25:48:69 | ...::get(...) [Ok] | sqlx.rs:48:25:48:78 | ... .unwrap() | provenance | MaD:30 |
 | sqlx.rs:48:25:48:78 | ... .unwrap() | sqlx.rs:48:25:48:85 | ... .text() [Ok] | provenance | MaD:32 |
 | sqlx.rs:48:25:48:85 | ... .text() [Ok] | sqlx.rs:48:25:48:118 | ... .unwrap_or(...) | provenance | MaD:31 |
@@ -139,25 +139,25 @@ edges
 | sqlx.rs:54:26:54:39 | &remote_string [&ref] | sqlx.rs:54:9:54:22 | unsafe_query_2 [&ref] | provenance |  |
 | sqlx.rs:54:27:54:39 | remote_string | sqlx.rs:54:26:54:39 | &remote_string [&ref] | provenance |  |
 | sqlx.rs:55:9:55:22 | unsafe_query_3 | sqlx.rs:81:29:81:42 | unsafe_query_3 | provenance |  |
-| sqlx.rs:55:26:55:96 | ... + ... | sqlx.rs:55:26:55:102 | ... + ... | provenance | MaD:27 |
+| sqlx.rs:55:26:55:96 | ... + ... | sqlx.rs:55:26:55:102 | ... + ... | provenance | MaD:26 |
 | sqlx.rs:55:26:55:102 | ... + ... | sqlx.rs:55:9:55:22 | unsafe_query_3 | provenance |  |
-| sqlx.rs:55:83:55:96 | &remote_string [&ref] | sqlx.rs:55:26:55:96 | ... + ... | provenance | MaD:26 |
+| sqlx.rs:55:83:55:96 | &remote_string [&ref] | sqlx.rs:55:26:55:96 | ... + ... | provenance | MaD:25 |
 | sqlx.rs:55:84:55:96 | remote_string | sqlx.rs:55:83:55:96 | &remote_string [&ref] | provenance |  |
 | sqlx.rs:56:9:56:22 | unsafe_query_4 | sqlx.rs:82:29:82:42 | unsafe_query_4 | provenance |  |
 | sqlx.rs:59:17:59:72 | ...::format(...) | sqlx.rs:59:17:59:72 | { ... } | provenance |  |
 | sqlx.rs:59:17:59:72 | ...::must_use(...) | sqlx.rs:56:9:56:22 | unsafe_query_4 | provenance |  |
 | sqlx.rs:59:17:59:72 | MacroExpr | sqlx.rs:59:17:59:72 | ...::format(...) | provenance | MaD:33 |
 | sqlx.rs:59:17:59:72 | { ... } | sqlx.rs:59:17:59:72 | ...::must_use(...) | provenance | MaD:34 |
-| sqlx.rs:78:25:78:38 | unsafe_query_1 [&ref] | sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() [&ref] | provenance | MaD:28 |
-| sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() [&ref] | sqlx.rs:78:13:78:23 | ...::query | provenance | MaD:20 Sink:MaD:20 |
-| sqlx.rs:80:29:80:42 | unsafe_query_2 [&ref] | sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() [&ref] | provenance | MaD:28 |
-| sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() [&ref] | sqlx.rs:80:17:80:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
-| sqlx.rs:81:29:81:42 | unsafe_query_3 | sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() [&ref] | provenance | MaD:28 |
-| sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() [&ref] | sqlx.rs:81:17:81:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
-| sqlx.rs:82:29:82:42 | unsafe_query_4 | sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() [&ref] | provenance | MaD:28 |
-| sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() [&ref] | sqlx.rs:82:17:82:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:78:25:78:38 | unsafe_query_1 [&ref] | sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() [&ref] | provenance | MaD:27 |
+| sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() [&ref] | sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() | provenance | Sink:MaD:20 |
+| sqlx.rs:80:29:80:42 | unsafe_query_2 [&ref] | sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() [&ref] | provenance | MaD:27 |
+| sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() [&ref] | sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() | provenance | Sink:MaD:20 |
+| sqlx.rs:81:29:81:42 | unsafe_query_3 | sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() [&ref] | provenance | MaD:27 |
+| sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() [&ref] | sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() | provenance | Sink:MaD:20 |
+| sqlx.rs:82:29:82:42 | unsafe_query_4 | sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() [&ref] | provenance | MaD:27 |
+| sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() [&ref] | sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() | provenance | Sink:MaD:20 |
 | sqlx.rs:100:9:100:21 | remote_string | sqlx.rs:102:84:102:96 | remote_string | provenance |  |
-| sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:100:25:100:69 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
+| sqlx.rs:100:25:100:69 | ...::get(...) | sqlx.rs:100:25:100:69 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
 | sqlx.rs:100:25:100:69 | ...::get(...) [Ok] | sqlx.rs:100:25:100:78 | ... .unwrap() | provenance | MaD:30 |
 | sqlx.rs:100:25:100:78 | ... .unwrap() | sqlx.rs:100:25:100:85 | ... .text() [Ok] | provenance | MaD:32 |
 | sqlx.rs:100:25:100:85 | ... .text() [Ok] | sqlx.rs:100:25:100:118 | ... .unwrap_or(...) | provenance | MaD:31 |
@@ -168,64 +168,64 @@ edges
 | sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:136:55:136:68 | unsafe_query_1 | provenance |  |
 | sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:145:55:145:68 | unsafe_query_1 | provenance |  |
 | sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:153:29:153:42 | unsafe_query_1 | provenance |  |
-| sqlx.rs:102:26:102:96 | ... + ... | sqlx.rs:102:26:102:102 | ... + ... | provenance | MaD:27 |
+| sqlx.rs:102:26:102:96 | ... + ... | sqlx.rs:102:26:102:102 | ... + ... | provenance | MaD:26 |
 | sqlx.rs:102:26:102:102 | ... + ... | sqlx.rs:102:9:102:22 | unsafe_query_1 | provenance |  |
-| sqlx.rs:102:83:102:96 | &remote_string [&ref] | sqlx.rs:102:26:102:96 | ... + ... | provenance | MaD:26 |
+| sqlx.rs:102:83:102:96 | &remote_string [&ref] | sqlx.rs:102:26:102:96 | ... + ... | provenance | MaD:25 |
 | sqlx.rs:102:84:102:96 | remote_string | sqlx.rs:102:83:102:96 | &remote_string [&ref] | provenance |  |
-| sqlx.rs:113:31:113:44 | unsafe_query_1 | sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() [&ref] | provenance | MaD:28 |
-| sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() [&ref] | sqlx.rs:113:17:113:29 | ...::raw_sql | provenance | MaD:22 Sink:MaD:22 |
-| sqlx.rs:120:29:120:42 | unsafe_query_1 | sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() [&ref] | provenance | MaD:28 |
-| sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() [&ref] | sqlx.rs:120:17:120:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
-| sqlx.rs:127:29:127:42 | unsafe_query_1 | sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() [&ref] | provenance | MaD:28 |
-| sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() [&ref] | sqlx.rs:127:17:127:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
-| sqlx.rs:136:55:136:68 | unsafe_query_1 | sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() [&ref] | provenance | MaD:28 |
-| sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() [&ref] | sqlx.rs:136:40:136:53 | ...::query_as | provenance | MaD:21 Sink:MaD:21 |
-| sqlx.rs:145:55:145:68 | unsafe_query_1 | sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() [&ref] | provenance | MaD:28 |
-| sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() [&ref] | sqlx.rs:145:40:145:53 | ...::query_as | provenance | MaD:21 Sink:MaD:21 |
-| sqlx.rs:153:29:153:42 | unsafe_query_1 | sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() [&ref] | provenance | MaD:28 |
-| sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() [&ref] | sqlx.rs:153:17:153:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:113:31:113:44 | unsafe_query_1 | sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() [&ref] | provenance | MaD:27 |
+| sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() [&ref] | sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() | provenance | Sink:MaD:22 |
+| sqlx.rs:120:29:120:42 | unsafe_query_1 | sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() [&ref] | provenance | MaD:27 |
+| sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() [&ref] | sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() | provenance | Sink:MaD:20 |
+| sqlx.rs:127:29:127:42 | unsafe_query_1 | sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() [&ref] | provenance | MaD:27 |
+| sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() [&ref] | sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() | provenance | Sink:MaD:20 |
+| sqlx.rs:136:55:136:68 | unsafe_query_1 | sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() [&ref] | provenance | MaD:27 |
+| sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() [&ref] | sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() | provenance | Sink:MaD:21 |
+| sqlx.rs:145:55:145:68 | unsafe_query_1 | sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() [&ref] | provenance | MaD:27 |
+| sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() [&ref] | sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() | provenance | Sink:MaD:21 |
+| sqlx.rs:153:29:153:42 | unsafe_query_1 | sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() [&ref] | provenance | MaD:27 |
+| sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() [&ref] | sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() | provenance | Sink:MaD:20 |
 | sqlx.rs:173:9:173:21 | remote_string | sqlx.rs:175:84:175:96 | remote_string | provenance |  |
-| sqlx.rs:173:25:173:46 | ...::get | sqlx.rs:173:25:173:69 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
+| sqlx.rs:173:25:173:69 | ...::get(...) | sqlx.rs:173:25:173:69 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
 | sqlx.rs:173:25:173:69 | ...::get(...) [Ok] | sqlx.rs:173:25:173:78 | ... .unwrap() | provenance | MaD:30 |
 | sqlx.rs:173:25:173:78 | ... .unwrap() | sqlx.rs:173:25:173:85 | ... .text() [Ok] | provenance | MaD:32 |
 | sqlx.rs:173:25:173:85 | ... .text() [Ok] | sqlx.rs:173:25:173:118 | ... .unwrap_or(...) | provenance | MaD:31 |
 | sqlx.rs:173:25:173:118 | ... .unwrap_or(...) | sqlx.rs:173:9:173:21 | remote_string | provenance |  |
 | sqlx.rs:175:9:175:22 | unsafe_query_1 | sqlx.rs:188:29:188:42 | unsafe_query_1 | provenance |  |
-| sqlx.rs:175:26:175:96 | ... + ... | sqlx.rs:175:26:175:102 | ... + ... | provenance | MaD:27 |
+| sqlx.rs:175:26:175:96 | ... + ... | sqlx.rs:175:26:175:102 | ... + ... | provenance | MaD:26 |
 | sqlx.rs:175:26:175:102 | ... + ... | sqlx.rs:175:9:175:22 | unsafe_query_1 | provenance |  |
-| sqlx.rs:175:83:175:96 | &remote_string [&ref] | sqlx.rs:175:26:175:96 | ... + ... | provenance | MaD:26 |
+| sqlx.rs:175:83:175:96 | &remote_string [&ref] | sqlx.rs:175:26:175:96 | ... + ... | provenance | MaD:25 |
 | sqlx.rs:175:84:175:96 | remote_string | sqlx.rs:175:83:175:96 | &remote_string [&ref] | provenance |  |
-| sqlx.rs:188:29:188:42 | unsafe_query_1 | sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() [&ref] | provenance | MaD:28 |
-| sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() [&ref] | sqlx.rs:188:17:188:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:188:29:188:42 | unsafe_query_1 | sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() [&ref] | provenance | MaD:27 |
+| sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() [&ref] | sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() | provenance | Sink:MaD:20 |
 models
-| 1 | Sink: <_ as mysql::conn::queryable::Queryable>::query; Argument[0]; sql-injection |
-| 2 | Sink: <_ as mysql::conn::queryable::Queryable>::query_drop; Argument[0]; sql-injection |
-| 3 | Sink: <_ as mysql::conn::queryable::Queryable>::query_first; Argument[0]; sql-injection |
-| 4 | Sink: <_ as mysql::conn::queryable::Queryable>::query_first_opt; Argument[0]; sql-injection |
-| 5 | Sink: <_ as mysql::conn::queryable::Queryable>::query_fold; Argument[0]; sql-injection |
-| 6 | Sink: <_ as mysql::conn::queryable::Queryable>::query_fold_opt; Argument[0]; sql-injection |
-| 7 | Sink: <_ as mysql::conn::queryable::Queryable>::query_map; Argument[0]; sql-injection |
-| 8 | Sink: <_ as mysql::conn::queryable::Queryable>::query_map_opt; Argument[0]; sql-injection |
-| 9 | Sink: <_ as mysql::conn::queryable::Queryable>::query_opt; Argument[0]; sql-injection |
-| 10 | Sink: <_ as mysql_async::queryable::Queryable>::query; Argument[0]; sql-injection |
-| 11 | Sink: <_ as mysql_async::queryable::Queryable>::query_drop; Argument[0]; sql-injection |
-| 12 | Sink: <_ as mysql_async::queryable::Queryable>::query_first; Argument[0]; sql-injection |
-| 13 | Sink: <_ as mysql_async::queryable::Queryable>::query_fold; Argument[0]; sql-injection |
-| 14 | Sink: <_ as mysql_async::queryable::Queryable>::query_map; Argument[0]; sql-injection |
-| 15 | Sink: <_ as mysql_async::queryable::Queryable>::query_stream; Argument[0]; sql-injection |
-| 16 | Sink: <mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::prep; Argument[0]; sql-injection |
-| 17 | Sink: <mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::query_iter; Argument[0]; sql-injection |
-| 18 | Sink: <mysql_async::conn::Conn as mysql_async::queryable::Queryable>::prep; Argument[0]; sql-injection |
-| 19 | Sink: <mysql_async::conn::Conn as mysql_async::queryable::Queryable>::query_iter; Argument[0]; sql-injection |
+| 1 | Sink: <mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::prep; Argument[0]; sql-injection |
+| 2 | Sink: <mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::query_iter; Argument[0]; sql-injection |
+| 3 | Sink: <mysql::conn::queryable::Queryable>::query; Argument[0]; sql-injection |
+| 4 | Sink: <mysql::conn::queryable::Queryable>::query_drop; Argument[0]; sql-injection |
+| 5 | Sink: <mysql::conn::queryable::Queryable>::query_first; Argument[0]; sql-injection |
+| 6 | Sink: <mysql::conn::queryable::Queryable>::query_first_opt; Argument[0]; sql-injection |
+| 7 | Sink: <mysql::conn::queryable::Queryable>::query_fold; Argument[0]; sql-injection |
+| 8 | Sink: <mysql::conn::queryable::Queryable>::query_fold_opt; Argument[0]; sql-injection |
+| 9 | Sink: <mysql::conn::queryable::Queryable>::query_map; Argument[0]; sql-injection |
+| 10 | Sink: <mysql::conn::queryable::Queryable>::query_map_opt; Argument[0]; sql-injection |
+| 11 | Sink: <mysql::conn::queryable::Queryable>::query_opt; Argument[0]; sql-injection |
+| 12 | Sink: <mysql_async::conn::Conn as mysql_async::queryable::Queryable>::prep; Argument[0]; sql-injection |
+| 13 | Sink: <mysql_async::conn::Conn as mysql_async::queryable::Queryable>::query_iter; Argument[0]; sql-injection |
+| 14 | Sink: <mysql_async::queryable::Queryable>::query; Argument[0]; sql-injection |
+| 15 | Sink: <mysql_async::queryable::Queryable>::query_drop; Argument[0]; sql-injection |
+| 16 | Sink: <mysql_async::queryable::Queryable>::query_first; Argument[0]; sql-injection |
+| 17 | Sink: <mysql_async::queryable::Queryable>::query_fold; Argument[0]; sql-injection |
+| 18 | Sink: <mysql_async::queryable::Queryable>::query_map; Argument[0]; sql-injection |
+| 19 | Sink: <mysql_async::queryable::Queryable>::query_stream; Argument[0]; sql-injection |
 | 20 | Sink: sqlx_core::query::query; Argument[0]; sql-injection |
 | 21 | Sink: sqlx_core::query_as::query_as; Argument[0]; sql-injection |
 | 22 | Sink: sqlx_core::raw_sql::raw_sql; Argument[0]; sql-injection |
 | 23 | Source: reqwest::blocking::get; ReturnValue.Field[core::result::Result::Ok(0)]; remote |
 | 24 | Source: std::env::args; ReturnValue.Element; commandargs |
-| 25 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
-| 26 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
-| 27 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[self]; ReturnValue; taint |
-| 28 | Summary: <alloc::string::String>::as_str; Argument[self].Reference; ReturnValue.Reference; taint |
+| 25 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
+| 26 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[self]; ReturnValue; taint |
+| 27 | Summary: <alloc::string::String>::as_str; Argument[self].Reference; ReturnValue.Reference; taint |
+| 28 | Summary: <core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
 | 29 | Summary: <core::option::Option>::unwrap_or; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
 | 30 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
 | 31 | Summary: <core::result::Result>::unwrap_or; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
@@ -234,7 +234,7 @@ models
 | 34 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
 | mysql.rs:12:13:12:29 | mut remote_string | semmle.label | mut remote_string |
-| mysql.rs:12:33:12:54 | ...::get | semmle.label | ...::get |
+| mysql.rs:12:33:12:77 | ...::get(...) | semmle.label | ...::get(...) |
 | mysql.rs:12:33:12:77 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
 | mysql.rs:12:33:13:21 | ... .unwrap() | semmle.label | ... .unwrap() |
 | mysql.rs:12:33:14:19 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
@@ -244,47 +244,47 @@ nodes
 | mysql.rs:18:13:18:89 | ... + ... | semmle.label | ... + ... |
 | mysql.rs:18:70:18:83 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
 | mysql.rs:18:71:18:83 | remote_string | semmle.label | remote_string |
-| mysql.rs:25:32:25:36 | query | semmle.label | query |
 | mysql.rs:25:38:25:49 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:25:38:25:58 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:25:38:25:58 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:26:54:26:62 | query_opt | semmle.label | query_opt |
 | mysql.rs:26:64:26:75 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:26:64:26:84 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:26:64:26:84 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:27:14:27:23 | query_drop | semmle.label | query_drop |
 | mysql.rs:27:25:27:36 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:27:25:27:45 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:27:25:27:45 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:28:27:28:37 | query_first | semmle.label | query_first |
 | mysql.rs:28:39:28:50 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:28:39:28:59 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:28:39:28:59 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:29:49:29:63 | query_first_opt | semmle.label | query_first_opt |
 | mysql.rs:29:65:29:76 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:29:65:29:85 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:29:65:29:85 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:30:22:30:31 | query_fold | semmle.label | query_fold |
 | mysql.rs:30:33:30:44 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:30:33:30:53 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:30:33:30:53 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:31:22:31:35 | query_fold_opt | semmle.label | query_fold_opt |
 | mysql.rs:32:13:32:24 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:32:13:32:33 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:32:13:32:33 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:36:22:36:31 | query_iter | semmle.label | query_iter |
 | mysql.rs:36:33:36:44 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:36:33:36:53 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:36:33:36:53 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:37:22:37:30 | query_map | semmle.label | query_map |
 | mysql.rs:37:32:37:43 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:37:32:37:52 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:37:32:37:52 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:38:22:38:34 | query_map_opt | semmle.label | query_map_opt |
 | mysql.rs:39:13:39:24 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:39:13:39:33 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:39:13:39:33 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:42:33:42:37 | query | semmle.label | query |
 | mysql.rs:42:39:42:50 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:42:39:42:59 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:42:39:42:59 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:75:26:75:29 | prep | semmle.label | prep |
 | mysql.rs:75:31:75:42 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:75:31:75:51 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:75:31:75:51 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:80:15:80:24 | query_drop | semmle.label | query_drop |
 | mysql.rs:80:26:80:37 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:80:26:80:46 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:80:26:80:46 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
 | mysql.rs:97:13:97:29 | mut remote_string | semmle.label | mut remote_string |
-| mysql.rs:97:33:97:54 | ...::get | semmle.label | ...::get |
+| mysql.rs:97:33:97:77 | ...::get(...) | semmle.label | ...::get(...) |
 | mysql.rs:97:33:97:77 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
 | mysql.rs:97:33:98:21 | ... .unwrap() | semmle.label | ... .unwrap() |
 | mysql.rs:97:33:99:19 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
@@ -294,40 +294,40 @@ nodes
 | mysql.rs:103:13:103:89 | ... + ... | semmle.label | ... + ... |
 | mysql.rs:103:70:103:83 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
 | mysql.rs:103:71:103:83 | remote_string | semmle.label | remote_string |
-| mysql.rs:110:32:110:36 | query | semmle.label | query |
 | mysql.rs:110:38:110:49 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:110:38:110:58 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:110:38:110:58 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:111:14:111:23 | query_drop | semmle.label | query_drop |
 | mysql.rs:111:25:111:36 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:111:25:111:45 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:111:25:111:45 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:112:35:112:45 | query_first | semmle.label | query_first |
 | mysql.rs:112:47:112:58 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:112:47:112:67 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:112:47:112:67 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:114:14:114:23 | query_fold | semmle.label | query_fold |
 | mysql.rs:114:25:114:36 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:114:25:114:45 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:114:25:114:45 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:116:22:116:31 | query_iter | semmle.label | query_iter |
 | mysql.rs:116:33:116:44 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:116:33:116:53 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:116:33:116:53 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:118:14:118:25 | query_stream | semmle.label | query_stream |
 | mysql.rs:118:40:118:51 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:118:40:118:60 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:118:40:118:60 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:121:14:121:22 | query_map | semmle.label | query_map |
 | mysql.rs:121:24:121:35 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:121:24:121:44 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:121:24:121:44 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:149:26:149:29 | prep | semmle.label | prep |
 | mysql.rs:149:31:149:42 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:149:31:149:51 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:149:31:149:51 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
-| mysql.rs:154:15:154:24 | query_drop | semmle.label | query_drop |
 | mysql.rs:154:26:154:37 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:154:26:154:46 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
 | mysql.rs:154:26:154:46 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
 | sqlx.rs:47:9:47:18 | arg_string | semmle.label | arg_string |
-| sqlx.rs:47:22:47:35 | ...::args | semmle.label | ...::args |
+| sqlx.rs:47:22:47:37 | ...::args(...) | semmle.label | ...::args(...) |
 | sqlx.rs:47:22:47:37 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
 | sqlx.rs:47:22:47:44 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
 | sqlx.rs:47:22:47:77 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
 | sqlx.rs:48:9:48:21 | remote_string | semmle.label | remote_string |
-| sqlx.rs:48:25:48:46 | ...::get | semmle.label | ...::get |
+| sqlx.rs:48:25:48:69 | ...::get(...) | semmle.label | ...::get(...) |
 | sqlx.rs:48:25:48:69 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
 | sqlx.rs:48:25:48:78 | ... .unwrap() | semmle.label | ... .unwrap() |
 | sqlx.rs:48:25:48:85 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
@@ -348,20 +348,20 @@ nodes
 | sqlx.rs:59:17:59:72 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | sqlx.rs:59:17:59:72 | MacroExpr | semmle.label | MacroExpr |
 | sqlx.rs:59:17:59:72 | { ... } | semmle.label | { ... } |
-| sqlx.rs:78:13:78:23 | ...::query | semmle.label | ...::query |
 | sqlx.rs:78:25:78:38 | unsafe_query_1 [&ref] | semmle.label | unsafe_query_1 [&ref] |
+| sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
 | sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
-| sqlx.rs:80:17:80:27 | ...::query | semmle.label | ...::query |
 | sqlx.rs:80:29:80:42 | unsafe_query_2 [&ref] | semmle.label | unsafe_query_2 [&ref] |
+| sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() | semmle.label | unsafe_query_2.as_str() |
 | sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() [&ref] | semmle.label | unsafe_query_2.as_str() [&ref] |
-| sqlx.rs:81:17:81:27 | ...::query | semmle.label | ...::query |
 | sqlx.rs:81:29:81:42 | unsafe_query_3 | semmle.label | unsafe_query_3 |
+| sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() | semmle.label | unsafe_query_3.as_str() |
 | sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() [&ref] | semmle.label | unsafe_query_3.as_str() [&ref] |
-| sqlx.rs:82:17:82:27 | ...::query | semmle.label | ...::query |
 | sqlx.rs:82:29:82:42 | unsafe_query_4 | semmle.label | unsafe_query_4 |
+| sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() | semmle.label | unsafe_query_4.as_str() |
 | sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() [&ref] | semmle.label | unsafe_query_4.as_str() [&ref] |
 | sqlx.rs:100:9:100:21 | remote_string | semmle.label | remote_string |
-| sqlx.rs:100:25:100:46 | ...::get | semmle.label | ...::get |
+| sqlx.rs:100:25:100:69 | ...::get(...) | semmle.label | ...::get(...) |
 | sqlx.rs:100:25:100:69 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
 | sqlx.rs:100:25:100:78 | ... .unwrap() | semmle.label | ... .unwrap() |
 | sqlx.rs:100:25:100:85 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
@@ -371,26 +371,26 @@ nodes
 | sqlx.rs:102:26:102:102 | ... + ... | semmle.label | ... + ... |
 | sqlx.rs:102:83:102:96 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
 | sqlx.rs:102:84:102:96 | remote_string | semmle.label | remote_string |
-| sqlx.rs:113:17:113:29 | ...::raw_sql | semmle.label | ...::raw_sql |
 | sqlx.rs:113:31:113:44 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
 | sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
-| sqlx.rs:120:17:120:27 | ...::query | semmle.label | ...::query |
 | sqlx.rs:120:29:120:42 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
 | sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
-| sqlx.rs:127:17:127:27 | ...::query | semmle.label | ...::query |
 | sqlx.rs:127:29:127:42 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
 | sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
-| sqlx.rs:136:40:136:53 | ...::query_as | semmle.label | ...::query_as |
 | sqlx.rs:136:55:136:68 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
 | sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
-| sqlx.rs:145:40:145:53 | ...::query_as | semmle.label | ...::query_as |
 | sqlx.rs:145:55:145:68 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
 | sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
-| sqlx.rs:153:17:153:27 | ...::query | semmle.label | ...::query |
 | sqlx.rs:153:29:153:42 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
 | sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
 | sqlx.rs:173:9:173:21 | remote_string | semmle.label | remote_string |
-| sqlx.rs:173:25:173:46 | ...::get | semmle.label | ...::get |
+| sqlx.rs:173:25:173:69 | ...::get(...) | semmle.label | ...::get(...) |
 | sqlx.rs:173:25:173:69 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
 | sqlx.rs:173:25:173:78 | ... .unwrap() | semmle.label | ... .unwrap() |
 | sqlx.rs:173:25:173:85 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
@@ -400,7 +400,7 @@ nodes
 | sqlx.rs:175:26:175:102 | ... + ... | semmle.label | ... + ... |
 | sqlx.rs:175:83:175:96 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
 | sqlx.rs:175:84:175:96 | remote_string | semmle.label | remote_string |
-| sqlx.rs:188:17:188:27 | ...::query | semmle.label | ...::query |
 | sqlx.rs:188:29:188:42 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
 | sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-089/mysql.rs b/rust/ql/test/query-tests/security/CWE-089/mysql.rs
index 71ee265e8bab..01b5fe7299c0 100644
--- a/rust/ql/test/query-tests/security/CWE-089/mysql.rs
+++ b/rust/ql/test/query-tests/security/CWE-089/mysql.rs
@@ -28,15 +28,15 @@ mod sync_test {
         let _: i64 = conn.query_first(unsafe_query.as_str())?.unwrap(); // $ sql-sink Alert[rust/sql-injection]=remote10
         let _: Result<i64, FromRowError> = conn.query_first_opt(unsafe_query.as_str())?.unwrap(); // $ sql-sink Alert[rust/sql-injection]=remote10
         let _ = conn.query_fold(unsafe_query.as_str(), 0, |_: i64, _: i64| -> i64 { 0 })?; // $ sql-sink Alert[rust/sql-injection]=remote10
-        let _ = conn.query_fold_opt( // $ sql-sink Alert[rust/sql-injection]=remote10
-            unsafe_query.as_str(),
+        let _ = conn.query_fold_opt(
+            unsafe_query.as_str(), // $ sql-sink Alert[rust/sql-injection]=remote10
             0,
             |_: i64, _: Result<i64, FromRowError>| -> i64 { 0 },
         )?;
         let _ = conn.query_iter(unsafe_query.as_str())?; // $ sql-sink Alert[rust/sql-injection]=remote10
         let _ = conn.query_map(unsafe_query.as_str(), |_: i64| -> () {})?; // $ sql-sink Alert[rust/sql-injection]=remote10
-        let _ = conn.query_map_opt( // $ sql-sink Alert[rust/sql-injection]=remote10
-            unsafe_query.as_str(),
+        let _ = conn.query_map_opt(
+            unsafe_query.as_str(), // $ sql-sink Alert[rust/sql-injection]=remote10
             |_: Result<i64, FromRowError>| -> () {},
         )?;
         let _: Vec<i64> = conn2.query(unsafe_query.as_str())?; // $ sql-sink Alert[rust/sql-injection]=remote10
diff --git a/rust/ql/test/query-tests/security/CWE-117/Cargo.lock b/rust/ql/test/query-tests/security/CWE-117/Cargo.lock
index 7629f8fa2fe3..89e1982788b4 100644
--- a/rust/ql/test/query-tests/security/CWE-117/Cargo.lock
+++ b/rust/ql/test/query-tests/security/CWE-117/Cargo.lock
@@ -4,6 +4,154 @@
 # It should be committed to the repository
 version = 4
 
+[[package]]
+name = "actix-codec"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c13df95297bcf9014dc89162b0cc69431e192e34e3b419612fc124cfcd45dbf"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "actix-http"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b796ba3c974e5133f6ca1a2c4e97c5941ea1a46d202df83344afaa18219f1a62"
+dependencies = [
+ "actix-codec",
+ "actix-service",
+ "actix-utils",
+ "bitflags",
+ "bytes",
+ "bytestring",
+ "derive_more",
+ "encoding_rs",
+ "foldhash",
+ "futures-core",
+ "http 0.2.12",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "language-tags",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "actix-router"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14f8c75c51892f18d9c46150c5ac7beb81c95f78c8b83a634d49f4ca32551fe7"
+dependencies = [
+ "bytestring",
+ "cfg-if",
+ "http 0.2.12",
+ "regex-lite",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "actix-rt"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92589714878ca59a7626ea19734f0e07a6a875197eec751bb5d3f99e64998c63"
+dependencies = [
+ "futures-core",
+ "tokio",
+]
+
+[[package]]
+name = "actix-server"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc8dcb6fa613d47c3b764a7dc672b4b31f25751dcbcf542f7b16f3e1f700044c"
+dependencies = [
+ "actix-rt",
+ "actix-service",
+ "actix-utils",
+ "futures-core",
+ "futures-util",
+ "mio",
+ "socket2 0.6.5",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "actix-service"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e46f36bf0e5af44bdc4bdb36fbbd421aa98c79a9bce724e1edeb3894e10dc7f"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "actix-utils"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0128396dd7313f697ad05b21b1a7be7d4cbb81888704f55996e4a27db196bb4d"
+dependencies = [
+ "local-waker",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "actix-web"
+version = "4.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81f8da0d2ae4200dde8773d72ba47a65c220b251ba7b9248db5bd263c247e959"
+dependencies = [
+ "actix-codec",
+ "actix-http",
+ "actix-router",
+ "actix-rt",
+ "actix-server",
+ "actix-service",
+ "actix-utils",
+ "bytes",
+ "bytestring",
+ "cfg-if",
+ "derive_more",
+ "encoding_rs",
+ "foldhash",
+ "futures-core",
+ "futures-util",
+ "impl-more",
+ "itoa",
+ "language-tags",
+ "log",
+ "mime",
+ "once_cell",
+ "pin-project-lite",
+ "regex-lite",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "smallvec",
+ "socket2 0.6.5",
+ "time",
+ "tokio",
+ "tracing",
+ "url",
+]
+
 [[package]]
 name = "addr2line"
 version = "0.24.2"
@@ -44,7 +192,7 @@ dependencies = [
  "bytes",
  "form_urlencoded",
  "futures-util",
- "http",
+ "http 1.3.1",
  "http-body",
  "http-body-util",
  "hyper",
@@ -75,7 +223,7 @@ checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1"
 dependencies = [
  "bytes",
  "futures-core",
- "http",
+ "http 1.3.1",
  "http-body",
  "http-body-util",
  "mime",
@@ -125,6 +273,15 @@ version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
+[[package]]
+name = "bytestring"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86566c496f2f47d9b8147a4c8b02ffdb69c919fe0c2b2e7195d22cbba0e635c9"
+dependencies = [
+ "bytes",
+]
+
 [[package]]
 name = "cc"
 version = "1.2.32"
@@ -140,6 +297,15 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
+[[package]]
+name = "convert_case"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -156,6 +322,35 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
+[[package]]
+name = "deranged"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e9de72ce2ad1f90dc62fa25f0f430ef85eb4b0d8fa0be4f30373bc40a21d28e"
+
+[[package]]
+name = "derive_more"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn",
+ "unicode-xid",
+]
+
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -217,6 +412,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -331,7 +532,7 @@ dependencies = [
  "fnv",
  "futures-core",
  "futures-sink",
- "http",
+ "http 1.3.1",
  "indexmap",
  "slab",
  "tokio",
@@ -351,6 +552,17 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "http"
 version = "1.3.1"
@@ -369,7 +581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http",
+ "http 1.3.1",
 ]
 
 [[package]]
@@ -380,7 +592,7 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
  "futures-core",
- "http",
+ "http 1.3.1",
  "http-body",
  "pin-project-lite",
 ]
@@ -413,7 +625,7 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "h2",
- "http",
+ "http 1.3.1",
  "http-body",
  "httparse",
  "httpdate",
@@ -430,7 +642,7 @@ version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
- "http",
+ "http 1.3.1",
  "hyper",
  "hyper-util",
  "rustls",
@@ -466,12 +678,12 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "http",
+ "http 1.3.1",
  "http-body",
  "hyper",
  "libc",
  "pin-project-lite",
- "socket2",
+ "socket2 0.5.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -584,6 +796,12 @@ dependencies = [
  "icu_properties",
 ]
 
+[[package]]
+name = "impl-more"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3a73c82a0b0747dba739b380c046a140b5ae747234bf701df3460282da7193"
+
 [[package]]
 name = "indexmap"
 version = "2.10.0"
@@ -627,6 +845,12 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "language-tags"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
+
 [[package]]
 name = "libc"
 version = "0.2.175"
@@ -645,6 +869,21 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
+[[package]]
+name = "local-waker"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
 [[package]]
 name = "log"
 version = "0.4.20"
@@ -685,6 +924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
+ "log",
  "wasi 0.11.1+wasi-snapshot-preview1",
  "windows-sys 0.59.0",
 ]
@@ -706,6 +946,12 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
+
 [[package]]
 name = "object"
 version = "0.36.7"
@@ -765,6 +1011,29 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -798,6 +1067,12 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "powerfmt"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.97"
@@ -822,6 +1097,15 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "regex"
 version = "1.11.1"
@@ -845,6 +1129,12 @@ dependencies = [
  "regex-syntax",
 ]
 
+[[package]]
+name = "regex-lite"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973"
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.5"
@@ -864,7 +1154,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2",
- "http",
+ "http 1.3.1",
  "http-body",
  "http-body-util",
  "hyper",
@@ -915,6 +1205,15 @@ version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
 
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
 [[package]]
 name = "rustix"
 version = "1.0.8"
@@ -991,6 +1290,12 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
 [[package]]
 name = "security-framework"
 version = "2.11.1"
@@ -1014,6 +1319,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "semver"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+
 [[package]]
 name = "serde"
 version = "1.0.228"
@@ -1084,6 +1395,16 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
+dependencies = [
+ "errno",
+ "libc",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.11"
@@ -1106,6 +1427,16 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -1196,12 +1527,43 @@ dependencies = [
 name = "test"
 version = "0.0.1"
 dependencies = [
+ "actix-web",
  "axum",
  "env_logger",
  "log",
  "reqwest",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134"
+dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
+ "serde_core",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
+
+[[package]]
+name = "time-macros"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
 [[package]]
 name = "tinystr"
 version = "0.8.1"
@@ -1222,8 +1584,10 @@ dependencies = [
  "bytes",
  "libc",
  "mio",
+ "parking_lot",
  "pin-project-lite",
- "socket2",
+ "signal-hook-registry",
+ "socket2 0.5.10",
  "tokio-macros",
  "windows-sys 0.52.0",
 ]
@@ -1308,9 +1672,21 @@ checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
  "pin-project-lite",
+ "tracing-attributes",
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-attributes"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tracing-core"
 version = "0.1.34"
@@ -1332,6 +1708,18 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -1481,6 +1869,12 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
 [[package]]
 name = "windows-registry"
 version = "0.2.0"
@@ -1560,7 +1954,7 @@ version = "0.53.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
  "windows_aarch64_gnullvm 0.53.0",
  "windows_aarch64_msvc 0.53.0",
  "windows_i686_gnu 0.53.0",
diff --git a/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected b/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected
index 4349f3738eb9..5ccfc2084386 100644
--- a/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected
+++ b/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected
@@ -1,110 +1,92 @@
 #select
-| main.rs:15:5:15:9 | ...::log | main.rs:8:29:8:37 | ...::args | main.rs:15:5:15:9 | ...::log | Log entry depends on a $@. | main.rs:8:29:8:37 | ...::args | user-provided value |
-| main.rs:16:5:16:9 | ...::log | main.rs:10:22:10:34 | ...::var | main.rs:16:5:16:9 | ...::log | Log entry depends on a $@. | main.rs:10:22:10:34 | ...::var | user-provided value |
-| main.rs:17:5:17:10 | ...::log | main.rs:11:23:11:44 | ...::get | main.rs:17:5:17:10 | ...::log | Log entry depends on a $@. | main.rs:11:23:11:44 | ...::get | user-provided value |
-| main.rs:18:5:18:10 | ...::log | main.rs:8:29:8:37 | ...::args | main.rs:18:5:18:10 | ...::log | Log entry depends on a $@. | main.rs:8:29:8:37 | ...::args | user-provided value |
-| main.rs:19:5:19:10 | ...::log | main.rs:10:22:10:34 | ...::var | main.rs:19:5:19:10 | ...::log | Log entry depends on a $@. | main.rs:10:22:10:34 | ...::var | user-provided value |
-| main.rs:23:5:23:9 | ...::log | main.rs:8:29:8:37 | ...::args | main.rs:23:5:23:9 | ...::log | Log entry depends on a $@. | main.rs:8:29:8:37 | ...::args | user-provided value |
-| main.rs:27:5:27:9 | ...::log | main.rs:8:29:8:37 | ...::args | main.rs:27:5:27:9 | ...::log | Log entry depends on a $@. | main.rs:8:29:8:37 | ...::args | user-provided value |
-| main.rs:30:5:30:9 | ...::log | main.rs:8:29:8:37 | ...::args | main.rs:30:5:30:9 | ...::log | Log entry depends on a $@. | main.rs:8:29:8:37 | ...::args | user-provided value |
-| main.rs:30:5:30:9 | ...::log | main.rs:11:23:11:44 | ...::get | main.rs:30:5:30:9 | ...::log | Log entry depends on a $@. | main.rs:11:23:11:44 | ...::get | user-provided value |
-| main.rs:66:5:66:9 | ...::log | main.rs:8:29:8:37 | ...::args | main.rs:66:5:66:9 | ...::log | Log entry depends on a $@. | main.rs:8:29:8:37 | ...::args | user-provided value |
-| main.rs:112:9:112:13 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:112:9:112:13 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
-| main.rs:113:9:113:13 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:113:9:113:13 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
-| main.rs:114:9:114:14 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:114:9:114:14 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
-| main.rs:115:9:115:14 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:115:9:115:14 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
-| main.rs:116:9:116:14 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:116:9:116:14 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
-| main.rs:119:9:119:13 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:119:9:119:13 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
-| main.rs:130:9:130:16 | ...::_print | main.rs:127:25:127:37 | ...::var | main.rs:130:9:130:16 | ...::_print | Log entry depends on a $@. | main.rs:127:25:127:37 | ...::var | user-provided value |
-| main.rs:131:9:131:17 | ...::_eprint | main.rs:127:25:127:37 | ...::var | main.rs:131:9:131:17 | ...::_eprint | Log entry depends on a $@. | main.rs:127:25:127:37 | ...::var | user-provided value |
-| main.rs:143:9:143:16 | ...::_print | main.rs:150:28:150:30 | get | main.rs:143:9:143:16 | ...::_print | Log entry depends on a $@. | main.rs:150:28:150:30 | get | user-provided value |
+| main.rs:15:11:15:36 | MacroExpr | main.rs:8:29:8:39 | ...::args(...) | main.rs:15:11:15:36 | MacroExpr | Log entry depends on a $@. | main.rs:8:29:8:39 | ...::args(...) | user-provided value |
+| main.rs:16:11:16:44 | MacroExpr | main.rs:10:22:10:48 | ...::var(...) | main.rs:16:11:16:44 | MacroExpr | Log entry depends on a $@. | main.rs:10:22:10:48 | ...::var(...) | user-provided value |
+| main.rs:17:12:17:46 | MacroExpr | main.rs:11:23:11:71 | ...::get(...) | main.rs:17:12:17:46 | MacroExpr | Log entry depends on a $@. | main.rs:11:23:11:71 | ...::get(...) | user-provided value |
+| main.rs:18:12:18:37 | MacroExpr | main.rs:8:29:8:39 | ...::args(...) | main.rs:18:12:18:37 | MacroExpr | Log entry depends on a $@. | main.rs:8:29:8:39 | ...::args(...) | user-provided value |
+| main.rs:19:12:19:39 | MacroExpr | main.rs:10:22:10:48 | ...::var(...) | main.rs:19:12:19:39 | MacroExpr | Log entry depends on a $@. | main.rs:10:22:10:48 | ...::var(...) | user-provided value |
+| main.rs:23:11:23:29 | MacroExpr | main.rs:8:29:8:39 | ...::args(...) | main.rs:23:11:23:29 | MacroExpr | Log entry depends on a $@. | main.rs:8:29:8:39 | ...::args(...) | user-provided value |
+| main.rs:27:11:27:26 | MacroExpr | main.rs:8:29:8:39 | ...::args(...) | main.rs:27:11:27:26 | MacroExpr | Log entry depends on a $@. | main.rs:8:29:8:39 | ...::args(...) | user-provided value |
+| main.rs:30:11:30:66 | MacroExpr | main.rs:8:29:8:39 | ...::args(...) | main.rs:30:11:30:66 | MacroExpr | Log entry depends on a $@. | main.rs:8:29:8:39 | ...::args(...) | user-provided value |
+| main.rs:30:11:30:66 | MacroExpr | main.rs:11:23:11:71 | ...::get(...) | main.rs:30:11:30:66 | MacroExpr | Log entry depends on a $@. | main.rs:11:23:11:71 | ...::get(...) | user-provided value |
+| main.rs:66:11:66:41 | MacroExpr | main.rs:8:29:8:39 | ...::args(...) | main.rs:66:11:66:41 | MacroExpr | Log entry depends on a $@. | main.rs:8:29:8:39 | ...::args(...) | user-provided value |
+| main.rs:112:15:112:35 | MacroExpr | main.rs:109:25:109:40 | ...::args(...) | main.rs:112:15:112:35 | MacroExpr | Log entry depends on a $@. | main.rs:109:25:109:40 | ...::args(...) | user-provided value |
+| main.rs:113:15:113:38 | MacroExpr | main.rs:109:25:109:40 | ...::args(...) | main.rs:113:15:113:38 | MacroExpr | Log entry depends on a $@. | main.rs:109:25:109:40 | ...::args(...) | user-provided value |
+| main.rs:114:16:114:37 | MacroExpr | main.rs:109:25:109:40 | ...::args(...) | main.rs:114:16:114:37 | MacroExpr | Log entry depends on a $@. | main.rs:109:25:109:40 | ...::args(...) | user-provided value |
+| main.rs:115:16:115:37 | MacroExpr | main.rs:109:25:109:40 | ...::args(...) | main.rs:115:16:115:37 | MacroExpr | Log entry depends on a $@. | main.rs:109:25:109:40 | ...::args(...) | user-provided value |
+| main.rs:116:16:116:37 | MacroExpr | main.rs:109:25:109:40 | ...::args(...) | main.rs:116:16:116:37 | MacroExpr | Log entry depends on a $@. | main.rs:109:25:109:40 | ...::args(...) | user-provided value |
+| main.rs:119:15:119:75 | MacroExpr | main.rs:109:25:109:40 | ...::args(...) | main.rs:119:15:119:75 | MacroExpr | Log entry depends on a $@. | main.rs:109:25:109:40 | ...::args(...) | user-provided value |
+| main.rs:130:18:130:38 | MacroExpr | main.rs:127:25:127:45 | ...::var(...) | main.rs:130:18:130:38 | MacroExpr | Log entry depends on a $@. | main.rs:127:25:127:45 | ...::var(...) | user-provided value |
+| main.rs:131:19:131:49 | MacroExpr | main.rs:127:25:127:45 | ...::var(...) | main.rs:131:19:131:49 | MacroExpr | Log entry depends on a $@. | main.rs:127:25:127:45 | ...::var(...) | user-provided value |
+| main.rs:143:18:143:40 | MacroExpr | main.rs:150:32:150:48 | my_axum_handler_1 | main.rs:143:18:143:40 | MacroExpr | Log entry depends on a $@. | main.rs:150:32:150:48 | my_axum_handler_1 | user-provided value |
 edges
 | main.rs:8:9:8:12 | args [element] | main.rs:9:20:9:23 | args [element] | provenance |  |
-| main.rs:8:29:8:37 | ...::args | main.rs:8:29:8:39 | ...::args(...) [element] | provenance | Src:MaD:6  |
-| main.rs:8:29:8:39 | ...::args(...) [element] | main.rs:8:29:8:49 | ... .collect() [element] | provenance | MaD:10 |
+| main.rs:8:29:8:39 | ...::args(...) | main.rs:8:29:8:39 | ...::args(...) [element] | provenance | Src:MaD:6  |
+| main.rs:8:29:8:39 | ...::args(...) [element] | main.rs:8:29:8:49 | ... .collect() [element] | provenance | MaD:12 |
 | main.rs:8:29:8:49 | ... .collect() [element] | main.rs:8:9:8:12 | args [element] | provenance |  |
-| main.rs:9:9:9:16 | username | main.rs:15:11:15:36 | MacroExpr | provenance |  |
-| main.rs:9:9:9:16 | username | main.rs:18:12:18:37 | MacroExpr | provenance |  |
+| main.rs:9:9:9:16 | username | main.rs:15:11:15:36 | MacroExpr | provenance | Sink:MaD:1 |
+| main.rs:9:9:9:16 | username | main.rs:18:12:18:37 | MacroExpr | provenance | Sink:MaD:1 |
 | main.rs:9:9:9:16 | username | main.rs:22:33:22:63 | MacroExpr | provenance |  |
 | main.rs:9:9:9:16 | username | main.rs:26:55:26:62 | username | provenance |  |
-| main.rs:9:9:9:16 | username | main.rs:30:11:30:66 | MacroExpr | provenance |  |
+| main.rs:9:9:9:16 | username | main.rs:30:11:30:66 | MacroExpr | provenance | Sink:MaD:1 |
 | main.rs:9:9:9:16 | username | main.rs:52:29:52:36 | username | provenance |  |
-| main.rs:9:20:9:23 | args [element] | main.rs:9:20:9:30 | args.get(...) [Some, &ref] | provenance | MaD:13 |
+| main.rs:9:20:9:23 | args [element] | main.rs:9:20:9:30 | args.get(...) [Some, &ref] | provenance | MaD:10 |
 | main.rs:9:20:9:30 | args.get(...) [Some, &ref] | main.rs:9:20:9:64 | ... .unwrap_or(...) [&ref] | provenance | MaD:16 |
-| main.rs:9:20:9:64 | ... .unwrap_or(...) [&ref] | main.rs:9:20:9:72 | ... .clone() | provenance | MaD:9 |
+| main.rs:9:20:9:64 | ... .unwrap_or(...) [&ref] | main.rs:9:20:9:72 | ... .clone() | provenance | MaD:11 |
 | main.rs:9:20:9:72 | ... .clone() | main.rs:9:9:9:16 | username | provenance |  |
-| main.rs:10:9:10:18 | user_input | main.rs:16:11:16:44 | MacroExpr | provenance |  |
-| main.rs:10:9:10:18 | user_input | main.rs:19:12:19:39 | MacroExpr | provenance |  |
-| main.rs:10:22:10:34 | ...::var | main.rs:10:22:10:48 | ...::var(...) [Ok] | provenance | Src:MaD:7  |
+| main.rs:10:9:10:18 | user_input | main.rs:16:11:16:44 | MacroExpr | provenance | Sink:MaD:1 |
+| main.rs:10:9:10:18 | user_input | main.rs:19:12:19:39 | MacroExpr | provenance | Sink:MaD:1 |
+| main.rs:10:22:10:48 | ...::var(...) | main.rs:10:22:10:48 | ...::var(...) [Ok] | provenance | Src:MaD:7  |
 | main.rs:10:22:10:48 | ...::var(...) [Ok] | main.rs:10:22:10:81 | ... .unwrap_or(...) | provenance | MaD:19 |
 | main.rs:10:22:10:81 | ... .unwrap_or(...) | main.rs:10:9:10:18 | user_input | provenance |  |
-| main.rs:11:9:11:19 | remote_data | main.rs:17:12:17:46 | MacroExpr | provenance |  |
-| main.rs:11:9:11:19 | remote_data | main.rs:30:11:30:66 | MacroExpr | provenance |  |
-| main.rs:11:23:11:44 | ...::get | main.rs:11:23:11:71 | ...::get(...) [Ok] | provenance | Src:MaD:5  |
+| main.rs:11:9:11:19 | remote_data | main.rs:17:12:17:46 | MacroExpr | provenance | Sink:MaD:1 |
+| main.rs:11:9:11:19 | remote_data | main.rs:30:11:30:66 | MacroExpr | provenance | Sink:MaD:1 |
+| main.rs:11:23:11:71 | ...::get(...) | main.rs:11:23:11:71 | ...::get(...) [Ok] | provenance | Src:MaD:5  |
 | main.rs:11:23:11:71 | ...::get(...) [Ok] | main.rs:11:23:12:17 | ... .unwrap() | provenance | MaD:18 |
 | main.rs:11:23:12:17 | ... .unwrap() | main.rs:11:23:12:24 | ... .text() [Ok] | provenance | MaD:21 |
 | main.rs:11:23:12:24 | ... .text() [Ok] | main.rs:11:23:12:61 | ... .unwrap_or(...) | provenance | MaD:19 |
 | main.rs:11:23:12:61 | ... .unwrap_or(...) | main.rs:11:9:11:19 | remote_data | provenance |  |
-| main.rs:15:11:15:36 | MacroExpr | main.rs:15:5:15:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:16:11:16:44 | MacroExpr | main.rs:16:5:16:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:17:12:17:46 | MacroExpr | main.rs:17:5:17:10 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:18:12:18:37 | MacroExpr | main.rs:18:5:18:10 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:19:12:19:39 | MacroExpr | main.rs:19:5:19:10 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:22:9:22:21 | formatted_msg | main.rs:23:11:23:29 | MacroExpr | provenance |  |
+| main.rs:22:9:22:21 | formatted_msg | main.rs:23:11:23:29 | MacroExpr | provenance | Sink:MaD:1 |
 | main.rs:22:33:22:63 | ...::format(...) | main.rs:22:33:22:63 | { ... } | provenance |  |
 | main.rs:22:33:22:63 | ...::must_use(...) | main.rs:22:9:22:21 | formatted_msg | provenance |  |
 | main.rs:22:33:22:63 | MacroExpr | main.rs:22:33:22:63 | ...::format(...) | provenance | MaD:22 |
 | main.rs:22:33:22:63 | { ... } | main.rs:22:33:22:63 | ...::must_use(...) | provenance | MaD:23 |
-| main.rs:23:11:23:29 | MacroExpr | main.rs:23:5:23:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:26:9:26:18 | concat_msg | main.rs:27:11:27:26 | MacroExpr | provenance |  |
+| main.rs:26:9:26:18 | concat_msg | main.rs:27:11:27:26 | MacroExpr | provenance | Sink:MaD:1 |
 | main.rs:26:22:26:62 | ... + ... | main.rs:26:9:26:18 | concat_msg | provenance |  |
-| main.rs:26:54:26:62 | &username [&ref] | main.rs:26:22:26:62 | ... + ... | provenance | MaD:12 |
+| main.rs:26:54:26:62 | &username [&ref] | main.rs:26:22:26:62 | ... + ... | provenance | MaD:8 |
 | main.rs:26:55:26:62 | username | main.rs:26:54:26:62 | &username [&ref] | provenance |  |
-| main.rs:27:11:27:26 | MacroExpr | main.rs:27:5:27:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:30:11:30:66 | MacroExpr | main.rs:30:5:30:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
 | main.rs:52:28:52:36 | &username [&ref] | main.rs:56:27:56:40 | ...: ... [&ref] | provenance |  |
 | main.rs:52:29:52:36 | username | main.rs:52:28:52:36 | &username [&ref] | provenance |  |
 | main.rs:56:27:56:40 | ...: ... [&ref] | main.rs:65:38:65:45 | username [&ref] | provenance |  |
 | main.rs:65:9:65:17 | user_info [UserInfo] | main.rs:66:28:66:36 | user_info [UserInfo] | provenance |  |
 | main.rs:65:21:65:59 | UserInfo {...} [UserInfo] | main.rs:65:9:65:17 | user_info [UserInfo] | provenance |  |
-| main.rs:65:38:65:45 | username [&ref] | main.rs:65:38:65:57 | username.to_string() | provenance | MaD:8 |
+| main.rs:65:38:65:45 | username [&ref] | main.rs:65:38:65:57 | username.to_string() | provenance | MaD:9 |
 | main.rs:65:38:65:57 | username.to_string() | main.rs:65:21:65:59 | UserInfo {...} [UserInfo] | provenance |  |
-| main.rs:66:11:66:41 | MacroExpr | main.rs:66:5:66:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
 | main.rs:66:28:66:36 | user_info [UserInfo] | main.rs:66:28:66:41 | user_info.name | provenance |  |
-| main.rs:66:28:66:41 | user_info.name | main.rs:66:11:66:41 | MacroExpr | provenance |  |
-| main.rs:109:13:109:21 | user_data | main.rs:112:15:112:35 | MacroExpr | provenance |  |
-| main.rs:109:13:109:21 | user_data | main.rs:113:15:113:38 | MacroExpr | provenance |  |
-| main.rs:109:13:109:21 | user_data | main.rs:114:16:114:37 | MacroExpr | provenance |  |
-| main.rs:109:13:109:21 | user_data | main.rs:115:16:115:37 | MacroExpr | provenance |  |
-| main.rs:109:13:109:21 | user_data | main.rs:116:16:116:37 | MacroExpr | provenance |  |
-| main.rs:109:13:109:21 | user_data | main.rs:119:15:119:75 | MacroExpr | provenance |  |
-| main.rs:109:25:109:38 | ...::args | main.rs:109:25:109:40 | ...::args(...) [element] | provenance | Src:MaD:6  |
-| main.rs:109:25:109:40 | ...::args(...) [element] | main.rs:109:25:109:47 | ... .nth(...) [Some] | provenance | MaD:11 |
+| main.rs:66:28:66:41 | user_info.name | main.rs:66:11:66:41 | MacroExpr | provenance | Sink:MaD:1 |
+| main.rs:109:13:109:21 | user_data | main.rs:112:15:112:35 | MacroExpr | provenance | Sink:MaD:1 |
+| main.rs:109:13:109:21 | user_data | main.rs:113:15:113:38 | MacroExpr | provenance | Sink:MaD:1 |
+| main.rs:109:13:109:21 | user_data | main.rs:114:16:114:37 | MacroExpr | provenance | Sink:MaD:1 |
+| main.rs:109:13:109:21 | user_data | main.rs:115:16:115:37 | MacroExpr | provenance | Sink:MaD:1 |
+| main.rs:109:13:109:21 | user_data | main.rs:116:16:116:37 | MacroExpr | provenance | Sink:MaD:1 |
+| main.rs:109:13:109:21 | user_data | main.rs:119:15:119:75 | MacroExpr | provenance | Sink:MaD:1 |
+| main.rs:109:25:109:40 | ...::args(...) | main.rs:109:25:109:40 | ...::args(...) [element] | provenance | Src:MaD:6  |
+| main.rs:109:25:109:40 | ...::args(...) [element] | main.rs:109:25:109:47 | ... .nth(...) [Some] | provenance | MaD:13 |
 | main.rs:109:25:109:47 | ... .nth(...) [Some] | main.rs:109:25:109:67 | ... .unwrap_or_default() | provenance | MaD:17 |
 | main.rs:109:25:109:67 | ... .unwrap_or_default() | main.rs:109:13:109:21 | user_data | provenance |  |
-| main.rs:112:15:112:35 | MacroExpr | main.rs:112:9:112:13 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:113:15:113:38 | MacroExpr | main.rs:113:9:113:13 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:114:16:114:37 | MacroExpr | main.rs:114:9:114:14 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:115:16:115:37 | MacroExpr | main.rs:115:9:115:14 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:116:16:116:37 | MacroExpr | main.rs:116:9:116:14 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:119:15:119:75 | MacroExpr | main.rs:119:9:119:13 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:127:13:127:21 | user_data | main.rs:130:18:130:38 | MacroExpr | provenance |  |
-| main.rs:127:13:127:21 | user_data | main.rs:131:19:131:49 | MacroExpr | provenance |  |
-| main.rs:127:25:127:37 | ...::var | main.rs:127:25:127:45 | ...::var(...) [Ok] | provenance | Src:MaD:7  |
+| main.rs:127:13:127:21 | user_data | main.rs:130:18:130:38 | MacroExpr | provenance | Sink:MaD:3 |
+| main.rs:127:13:127:21 | user_data | main.rs:131:19:131:49 | MacroExpr | provenance | Sink:MaD:2 |
+| main.rs:127:25:127:45 | ...::var(...) | main.rs:127:25:127:45 | ...::var(...) [Ok] | provenance | Src:MaD:7  |
 | main.rs:127:25:127:45 | ...::var(...) [Ok] | main.rs:127:25:127:65 | ... .unwrap_or_default() | provenance | MaD:20 |
 | main.rs:127:25:127:65 | ... .unwrap_or_default() | main.rs:127:13:127:21 | user_data | provenance |  |
-| main.rs:130:18:130:38 | MacroExpr | main.rs:130:9:130:16 | ...::_print | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:131:19:131:49 | MacroExpr | main.rs:131:9:131:17 | ...::_eprint | provenance | MaD:2 Sink:MaD:2 |
 | main.rs:140:32:140:59 | ...: Option::<...> | main.rs:141:22:141:27 | o_path | provenance |  |
 | main.rs:141:13:141:18 | m_path [Some] | main.rs:143:26:143:31 | m_path [Some] | provenance |  |
 | main.rs:141:22:141:27 | o_path | main.rs:141:22:141:38 | o_path.map(...) [Some] | provenance | MaD:14 |
 | main.rs:141:22:141:27 | o_path | main.rs:141:34:141:34 | ... | provenance | MaD:14 |
 | main.rs:141:22:141:38 | o_path.map(...) [Some] | main.rs:141:13:141:18 | m_path [Some] | provenance |  |
 | main.rs:141:34:141:34 | ... | main.rs:141:37:141:37 | x | provenance |  |
-| main.rs:143:18:143:40 | MacroExpr | main.rs:143:9:143:16 | ...::_print | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:143:26:143:31 | m_path [Some] | main.rs:143:26:143:40 | m_path.unwrap() | provenance | MaD:15 |
-| main.rs:143:26:143:40 | m_path.unwrap() | main.rs:143:18:143:40 | MacroExpr | provenance |  |
-| main.rs:150:28:150:30 | get | main.rs:140:32:140:59 | ...: Option::<...> | provenance | Src:MaD:4  |
+| main.rs:143:26:143:40 | m_path.unwrap() | main.rs:143:18:143:40 | MacroExpr | provenance | Sink:MaD:3 |
+| main.rs:150:32:150:48 | my_axum_handler_1 | main.rs:140:32:140:59 | ...: Option::<...> | provenance | Src:MaD:4  |
 models
 | 1 | Sink: log::__private_api::log; Argument[0]; log-injection |
 | 2 | Sink: std::io::stdio::_eprint; Argument[0]; log-injection |
@@ -113,12 +95,12 @@ models
 | 5 | Source: reqwest::blocking::get; ReturnValue.Field[core::result::Result::Ok(0)]; remote |
 | 6 | Source: std::env::args; ReturnValue.Element; commandargs |
 | 7 | Source: std::env::var; ReturnValue.Field[core::result::Result::Ok(0)]; environment |
-| 8 | Summary: <_ as alloc::string::ToString>::to_string; Argument[self].Reference; ReturnValue; taint |
-| 9 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
-| 10 | Summary: <_ as core::iter::traits::iterator::Iterator>::collect; Argument[self].Element; ReturnValue.Element; value |
-| 11 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
-| 12 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
-| 13 | Summary: <alloc::vec::Vec as core::ops::deref::Deref>::deref; Argument[self].Reference.Element; ReturnValue.Reference.Element; value |
+| 8 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
+| 9 | Summary: <alloc::string::ToString>::to_string; Argument[self].Reference; ReturnValue; taint |
+| 10 | Summary: <alloc::vec::Vec as core::ops::deref::Deref>::deref; Argument[self].Reference.Element; ReturnValue.Reference.Element; value |
+| 11 | Summary: <core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 12 | Summary: <core::iter::traits::iterator::Iterator>::collect; Argument[self].Element; ReturnValue.Element; value |
+| 13 | Summary: <core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
 | 14 | Summary: <core::option::Option>::map; Argument[self].Field[core::option::Option::Some(0)]; Argument[0].Parameter[0]; value |
 | 15 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
 | 16 | Summary: <core::option::Option>::unwrap_or; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
@@ -131,7 +113,7 @@ models
 | 23 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
 | main.rs:8:9:8:12 | args [element] | semmle.label | args [element] |
-| main.rs:8:29:8:37 | ...::args | semmle.label | ...::args |
+| main.rs:8:29:8:39 | ...::args(...) | semmle.label | ...::args(...) |
 | main.rs:8:29:8:39 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
 | main.rs:8:29:8:49 | ... .collect() [element] | semmle.label | ... .collect() [element] |
 | main.rs:9:9:9:16 | username | semmle.label | username |
@@ -140,39 +122,31 @@ nodes
 | main.rs:9:20:9:64 | ... .unwrap_or(...) [&ref] | semmle.label | ... .unwrap_or(...) [&ref] |
 | main.rs:9:20:9:72 | ... .clone() | semmle.label | ... .clone() |
 | main.rs:10:9:10:18 | user_input | semmle.label | user_input |
-| main.rs:10:22:10:34 | ...::var | semmle.label | ...::var |
+| main.rs:10:22:10:48 | ...::var(...) | semmle.label | ...::var(...) |
 | main.rs:10:22:10:48 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
 | main.rs:10:22:10:81 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
 | main.rs:11:9:11:19 | remote_data | semmle.label | remote_data |
-| main.rs:11:23:11:44 | ...::get | semmle.label | ...::get |
+| main.rs:11:23:11:71 | ...::get(...) | semmle.label | ...::get(...) |
 | main.rs:11:23:11:71 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
 | main.rs:11:23:12:17 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:11:23:12:24 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
 | main.rs:11:23:12:61 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
-| main.rs:15:5:15:9 | ...::log | semmle.label | ...::log |
 | main.rs:15:11:15:36 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:16:5:16:9 | ...::log | semmle.label | ...::log |
 | main.rs:16:11:16:44 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:17:5:17:10 | ...::log | semmle.label | ...::log |
 | main.rs:17:12:17:46 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:18:5:18:10 | ...::log | semmle.label | ...::log |
 | main.rs:18:12:18:37 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:19:5:19:10 | ...::log | semmle.label | ...::log |
 | main.rs:19:12:19:39 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:22:9:22:21 | formatted_msg | semmle.label | formatted_msg |
 | main.rs:22:33:22:63 | ...::format(...) | semmle.label | ...::format(...) |
 | main.rs:22:33:22:63 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:22:33:22:63 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:22:33:22:63 | { ... } | semmle.label | { ... } |
-| main.rs:23:5:23:9 | ...::log | semmle.label | ...::log |
 | main.rs:23:11:23:29 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:26:9:26:18 | concat_msg | semmle.label | concat_msg |
 | main.rs:26:22:26:62 | ... + ... | semmle.label | ... + ... |
 | main.rs:26:54:26:62 | &username [&ref] | semmle.label | &username [&ref] |
 | main.rs:26:55:26:62 | username | semmle.label | username |
-| main.rs:27:5:27:9 | ...::log | semmle.label | ...::log |
 | main.rs:27:11:27:26 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:30:5:30:9 | ...::log | semmle.label | ...::log |
 | main.rs:30:11:30:66 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:52:28:52:36 | &username [&ref] | semmle.label | &username [&ref] |
 | main.rs:52:29:52:36 | username | semmle.label | username |
@@ -181,34 +155,25 @@ nodes
 | main.rs:65:21:65:59 | UserInfo {...} [UserInfo] | semmle.label | UserInfo {...} [UserInfo] |
 | main.rs:65:38:65:45 | username [&ref] | semmle.label | username [&ref] |
 | main.rs:65:38:65:57 | username.to_string() | semmle.label | username.to_string() |
-| main.rs:66:5:66:9 | ...::log | semmle.label | ...::log |
 | main.rs:66:11:66:41 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:66:28:66:36 | user_info [UserInfo] | semmle.label | user_info [UserInfo] |
 | main.rs:66:28:66:41 | user_info.name | semmle.label | user_info.name |
 | main.rs:109:13:109:21 | user_data | semmle.label | user_data |
-| main.rs:109:25:109:38 | ...::args | semmle.label | ...::args |
+| main.rs:109:25:109:40 | ...::args(...) | semmle.label | ...::args(...) |
 | main.rs:109:25:109:40 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
 | main.rs:109:25:109:47 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
 | main.rs:109:25:109:67 | ... .unwrap_or_default() | semmle.label | ... .unwrap_or_default() |
-| main.rs:112:9:112:13 | ...::log | semmle.label | ...::log |
 | main.rs:112:15:112:35 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:113:9:113:13 | ...::log | semmle.label | ...::log |
 | main.rs:113:15:113:38 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:114:9:114:14 | ...::log | semmle.label | ...::log |
 | main.rs:114:16:114:37 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:115:9:115:14 | ...::log | semmle.label | ...::log |
 | main.rs:115:16:115:37 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:116:9:116:14 | ...::log | semmle.label | ...::log |
 | main.rs:116:16:116:37 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:119:9:119:13 | ...::log | semmle.label | ...::log |
 | main.rs:119:15:119:75 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:127:13:127:21 | user_data | semmle.label | user_data |
-| main.rs:127:25:127:37 | ...::var | semmle.label | ...::var |
+| main.rs:127:25:127:45 | ...::var(...) | semmle.label | ...::var(...) |
 | main.rs:127:25:127:45 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
 | main.rs:127:25:127:65 | ... .unwrap_or_default() | semmle.label | ... .unwrap_or_default() |
-| main.rs:130:9:130:16 | ...::_print | semmle.label | ...::_print |
 | main.rs:130:18:130:38 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:131:9:131:17 | ...::_eprint | semmle.label | ...::_eprint |
 | main.rs:131:19:131:49 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:140:32:140:59 | ...: Option::<...> | semmle.label | ...: Option::<...> |
 | main.rs:141:13:141:18 | m_path [Some] | semmle.label | m_path [Some] |
@@ -216,10 +181,9 @@ nodes
 | main.rs:141:22:141:38 | o_path.map(...) [Some] | semmle.label | o_path.map(...) [Some] |
 | main.rs:141:34:141:34 | ... | semmle.label | ... |
 | main.rs:141:37:141:37 | x | semmle.label | x |
-| main.rs:143:9:143:16 | ...::_print | semmle.label | ...::_print |
 | main.rs:143:18:143:40 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:143:26:143:31 | m_path [Some] | semmle.label | m_path [Some] |
 | main.rs:143:26:143:40 | m_path.unwrap() | semmle.label | m_path.unwrap() |
-| main.rs:150:28:150:30 | get | semmle.label | get |
+| main.rs:150:32:150:48 | my_axum_handler_1 | semmle.label | my_axum_handler_1 |
 subpaths
 | main.rs:141:22:141:27 | o_path | main.rs:141:34:141:34 | ... | main.rs:141:37:141:37 | x | main.rs:141:22:141:38 | o_path.map(...) [Some] |
diff --git a/rust/ql/test/query-tests/security/CWE-117/main.rs b/rust/ql/test/query-tests/security/CWE-117/main.rs
index 21eabac01c61..de6686e82ec6 100644
--- a/rust/ql/test/query-tests/security/CWE-117/main.rs
+++ b/rust/ql/test/query-tests/security/CWE-117/main.rs
@@ -150,3 +150,23 @@ mod axum_tests {
             .route("/{a}", get(my_axum_handler_1)); // $ Source=post_handler
     }
 }
+
+mod actix_tests {
+    use actix_web::dev::{ConnectionInfo, Payload};
+    use actix_web::{web, App, FromRequest, HttpRequest};
+
+    async fn connection_info_handler(req: HttpRequest) -> &'static str {
+        // reading the connection info does not log anything
+        let _ = req.connection_info();
+        let _ = req.full_url();
+        let _ = req.url_for("index", ["a"]);
+        let _ = req.url_for_static("index");
+        let _ = req.resource_map().url_for(&req, "index", ["a"]);
+        let _ = ConnectionInfo::from_request(&req, &mut Payload::None);
+        ""
+    }
+
+    fn test_actix() {
+        let _ = App::new().route("/", web::get().to(connection_info_handler));
+    }
+}
diff --git a/rust/ql/test/query-tests/security/CWE-117/options.yml b/rust/ql/test/query-tests/security/CWE-117/options.yml
index 8807ab636318..6115ec398b6e 100644
--- a/rust/ql/test/query-tests/security/CWE-117/options.yml
+++ b/rust/ql/test/query-tests/security/CWE-117/options.yml
@@ -4,3 +4,4 @@ qltest_dependencies:
     - env_logger = "0.10"
     - reqwest = { version = "0.12.9", features = ["blocking"] }
     - axum = { version = "0.8.7" }
+    - actix-web = { version = "4", default-features = false }
diff --git a/rust/ql/test/query-tests/security/CWE-295/DisabledCertificateCheck.expected b/rust/ql/test/query-tests/security/CWE-295/DisabledCertificateCheck.expected
index c807bc739fd0..922ebc6d2a3c 100644
--- a/rust/ql/test/query-tests/security/CWE-295/DisabledCertificateCheck.expected
+++ b/rust/ql/test/query-tests/security/CWE-295/DisabledCertificateCheck.expected
@@ -1,72 +1,63 @@
 #select
-| main.rs:4:4:4:30 | danger_accept_invalid_certs | main.rs:4:32:4:35 | true | main.rs:4:4:4:30 | danger_accept_invalid_certs | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:9:4:9:34 | danger_accept_invalid_hostnames | main.rs:9:36:9:39 | true | main.rs:9:4:9:34 | danger_accept_invalid_hostnames | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:16:4:16:30 | danger_accept_invalid_certs | main.rs:16:32:16:35 | true | main.rs:16:4:16:30 | danger_accept_invalid_certs | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:17:4:17:34 | danger_accept_invalid_hostnames | main.rs:17:36:17:39 | true | main.rs:17:4:17:34 | danger_accept_invalid_hostnames | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:37:4:37:30 | danger_accept_invalid_certs | main.rs:37:32:37:35 | true | main.rs:37:4:37:30 | danger_accept_invalid_certs | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:42:4:42:34 | danger_accept_invalid_hostnames | main.rs:42:36:42:39 | true | main.rs:42:4:42:34 | danger_accept_invalid_hostnames | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:47:4:47:30 | danger_accept_invalid_certs | main.rs:47:32:47:35 | true | main.rs:47:4:47:30 | danger_accept_invalid_certs | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:48:4:48:34 | danger_accept_invalid_hostnames | main.rs:48:36:48:39 | true | main.rs:48:4:48:34 | danger_accept_invalid_hostnames | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:55:4:55:30 | danger_accept_invalid_certs | main.rs:55:32:55:35 | true | main.rs:55:4:55:30 | danger_accept_invalid_certs | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:56:4:56:34 | danger_accept_invalid_hostnames | main.rs:56:36:56:39 | true | main.rs:56:4:56:34 | danger_accept_invalid_hostnames | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:83:4:83:30 | danger_accept_invalid_certs | main.rs:74:15:74:18 | true | main.rs:83:4:83:30 | danger_accept_invalid_certs | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:88:4:88:30 | danger_accept_invalid_certs | main.rs:75:22:75:25 | true | main.rs:88:4:88:30 | danger_accept_invalid_certs | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:93:4:93:30 | danger_accept_invalid_certs | main.rs:154:17:154:20 | true | main.rs:93:4:93:30 | danger_accept_invalid_certs | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:109:4:109:34 | danger_accept_invalid_hostnames | main.rs:107:17:107:31 | ...::exists | main.rs:109:4:109:34 | danger_accept_invalid_hostnames | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:115:4:115:34 | danger_accept_invalid_hostnames | main.rs:113:43:113:50 | metadata | main.rs:115:4:115:34 | danger_accept_invalid_hostnames | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:121:4:121:34 | danger_accept_invalid_hostnames | main.rs:119:11:119:27 | ...::metadata | main.rs:121:4:121:34 | danger_accept_invalid_hostnames | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:134:4:134:34 | danger_accept_invalid_hostnames | main.rs:129:14:129:27 | ...::stdin | main.rs:134:4:134:34 | danger_accept_invalid_hostnames | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
-| main.rs:146:4:146:34 | danger_accept_invalid_hostnames | main.rs:144:39:144:42 | true | main.rs:146:4:146:34 | danger_accept_invalid_hostnames | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:4:32:4:35 | true | main.rs:4:32:4:35 | true | main.rs:4:32:4:35 | true | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:9:36:9:39 | true | main.rs:9:36:9:39 | true | main.rs:9:36:9:39 | true | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:16:32:16:35 | true | main.rs:16:32:16:35 | true | main.rs:16:32:16:35 | true | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:17:36:17:39 | true | main.rs:17:36:17:39 | true | main.rs:17:36:17:39 | true | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:37:32:37:35 | true | main.rs:37:32:37:35 | true | main.rs:37:32:37:35 | true | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:42:36:42:39 | true | main.rs:42:36:42:39 | true | main.rs:42:36:42:39 | true | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:47:32:47:35 | true | main.rs:47:32:47:35 | true | main.rs:47:32:47:35 | true | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:48:36:48:39 | true | main.rs:48:36:48:39 | true | main.rs:48:36:48:39 | true | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:55:32:55:35 | true | main.rs:55:32:55:35 | true | main.rs:55:32:55:35 | true | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:56:36:56:39 | true | main.rs:56:36:56:39 | true | main.rs:56:36:56:39 | true | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:83:32:83:37 | always | main.rs:74:15:74:18 | true | main.rs:83:32:83:37 | always | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:88:32:88:40 | sometimes | main.rs:75:22:75:25 | true | main.rs:88:32:88:40 | sometimes | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:93:32:93:47 | sometimes_global | main.rs:154:17:154:20 | true | main.rs:93:32:93:47 | sometimes_global | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:109:36:109:37 | b1 | main.rs:107:17:107:42 | ...::exists(...) | main.rs:109:36:109:37 | b1 | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:115:36:115:37 | b2 | main.rs:113:11:113:52 | ... .metadata() | main.rs:115:36:115:37 | b2 | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:121:36:121:37 | b3 | main.rs:119:11:119:38 | ...::metadata(...) | main.rs:121:36:121:37 | b3 | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:134:36:134:37 | b4 | main.rs:129:14:129:29 | ...::stdin(...) | main.rs:134:36:134:37 | b4 | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
+| main.rs:146:36:146:37 | b6 | main.rs:144:39:144:42 | true | main.rs:146:36:146:37 | b6 | Disabling TLS certificate validation can expose the application to man-in-the-middle attacks. |
 edges
-| main.rs:4:32:4:35 | true | main.rs:4:4:4:30 | danger_accept_invalid_certs | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:9:36:9:39 | true | main.rs:9:4:9:34 | danger_accept_invalid_hostnames | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:16:32:16:35 | true | main.rs:16:4:16:30 | danger_accept_invalid_certs | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:17:36:17:39 | true | main.rs:17:4:17:34 | danger_accept_invalid_hostnames | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:37:32:37:35 | true | main.rs:37:4:37:30 | danger_accept_invalid_certs | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:42:36:42:39 | true | main.rs:42:4:42:34 | danger_accept_invalid_hostnames | provenance | MaD:6 Sink:MaD:6 |
-| main.rs:47:32:47:35 | true | main.rs:47:4:47:30 | danger_accept_invalid_certs | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:48:36:48:39 | true | main.rs:48:4:48:34 | danger_accept_invalid_hostnames | provenance | MaD:4 Sink:MaD:4 |
-| main.rs:55:32:55:35 | true | main.rs:55:4:55:30 | danger_accept_invalid_certs | provenance | MaD:5 Sink:MaD:5 |
-| main.rs:56:36:56:39 | true | main.rs:56:4:56:34 | danger_accept_invalid_hostnames | provenance | MaD:6 Sink:MaD:6 |
-| main.rs:73:19:73:40 | ...: bool | main.rs:93:32:93:47 | sometimes_global | provenance |  |
-| main.rs:74:6:74:11 | always | main.rs:83:32:83:37 | always | provenance |  |
+| main.rs:4:32:4:35 | true | main.rs:4:32:4:35 | true | provenance | Sink:MaD:1 |
+| main.rs:9:36:9:39 | true | main.rs:9:36:9:39 | true | provenance | Sink:MaD:2 |
+| main.rs:16:32:16:35 | true | main.rs:16:32:16:35 | true | provenance | Sink:MaD:1 |
+| main.rs:17:36:17:39 | true | main.rs:17:36:17:39 | true | provenance | Sink:MaD:2 |
+| main.rs:37:32:37:35 | true | main.rs:37:32:37:35 | true | provenance | Sink:MaD:3 |
+| main.rs:42:36:42:39 | true | main.rs:42:36:42:39 | true | provenance | Sink:MaD:6 |
+| main.rs:47:32:47:35 | true | main.rs:47:32:47:35 | true | provenance | Sink:MaD:3 |
+| main.rs:48:36:48:39 | true | main.rs:48:36:48:39 | true | provenance | Sink:MaD:4 |
+| main.rs:55:32:55:35 | true | main.rs:55:32:55:35 | true | provenance | Sink:MaD:5 |
+| main.rs:56:36:56:39 | true | main.rs:56:36:56:39 | true | provenance | Sink:MaD:6 |
+| main.rs:73:19:73:40 | ...: bool | main.rs:93:32:93:47 | sometimes_global | provenance | Sink:MaD:1 |
+| main.rs:74:6:74:11 | always | main.rs:83:32:83:37 | always | provenance | Sink:MaD:1 |
 | main.rs:74:15:74:18 | true | main.rs:74:6:74:11 | always | provenance |  |
-| main.rs:75:6:75:18 | mut sometimes | main.rs:88:32:88:40 | sometimes | provenance |  |
+| main.rs:75:6:75:18 | mut sometimes | main.rs:88:32:88:40 | sometimes | provenance | Sink:MaD:1 |
 | main.rs:75:22:75:25 | true | main.rs:75:6:75:18 | mut sometimes | provenance |  |
-| main.rs:83:32:83:37 | always | main.rs:83:4:83:30 | danger_accept_invalid_certs | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:88:32:88:40 | sometimes | main.rs:88:4:88:30 | danger_accept_invalid_certs | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:93:32:93:47 | sometimes_global | main.rs:93:4:93:30 | danger_accept_invalid_certs | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:107:6:107:7 | b1 | main.rs:109:36:109:37 | b1 | provenance |  |
-| main.rs:107:17:107:31 | ...::exists | main.rs:107:17:107:42 | ...::exists(...) [Ok] | provenance | Src:MaD:8  |
+| main.rs:107:6:107:7 | b1 | main.rs:109:36:109:37 | b1 | provenance | Sink:MaD:2 |
+| main.rs:107:17:107:42 | ...::exists(...) | main.rs:107:17:107:42 | ...::exists(...) [Ok] | provenance | Src:MaD:8  |
 | main.rs:107:17:107:42 | ...::exists(...) [Ok] | main.rs:107:17:107:51 | ... .unwrap() | provenance | MaD:12 |
 | main.rs:107:17:107:51 | ... .unwrap() | main.rs:107:6:107:7 | b1 | provenance |  |
-| main.rs:109:36:109:37 | b1 | main.rs:109:4:109:34 | danger_accept_invalid_hostnames | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:113:6:113:7 | b2 | main.rs:115:36:115:37 | b2 | provenance |  |
+| main.rs:113:6:113:7 | b2 | main.rs:115:36:115:37 | b2 | provenance | Sink:MaD:2 |
+| main.rs:113:11:113:52 | ... .metadata() | main.rs:113:11:113:52 | ... .metadata() [Ok] | provenance | Src:MaD:7  |
 | main.rs:113:11:113:52 | ... .metadata() [Ok] | main.rs:113:11:113:61 | ... .unwrap() | provenance | MaD:12 |
 | main.rs:113:11:113:61 | ... .unwrap() | main.rs:113:11:113:71 | ... .is_file() | provenance | MaD:15 |
 | main.rs:113:11:113:71 | ... .is_file() | main.rs:113:6:113:7 | b2 | provenance |  |
-| main.rs:113:43:113:50 | metadata | main.rs:113:11:113:52 | ... .metadata() [Ok] | provenance | Src:MaD:7  |
-| main.rs:115:36:115:37 | b2 | main.rs:115:4:115:34 | danger_accept_invalid_hostnames | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:119:6:119:7 | b3 | main.rs:121:36:121:37 | b3 | provenance |  |
-| main.rs:119:11:119:27 | ...::metadata | main.rs:119:11:119:38 | ...::metadata(...) [Ok] | provenance | Src:MaD:9  |
+| main.rs:119:6:119:7 | b3 | main.rs:121:36:121:37 | b3 | provenance | Sink:MaD:2 |
+| main.rs:119:11:119:38 | ...::metadata(...) | main.rs:119:11:119:38 | ...::metadata(...) [Ok] | provenance | Src:MaD:9  |
 | main.rs:119:11:119:38 | ...::metadata(...) [Ok] | main.rs:119:11:119:47 | ... .unwrap() | provenance | MaD:12 |
 | main.rs:119:11:119:47 | ... .unwrap() | main.rs:119:11:119:56 | ... .is_dir() | provenance | MaD:14 |
 | main.rs:119:11:119:56 | ... .is_dir() | main.rs:119:6:119:7 | b3 | provenance |  |
-| main.rs:121:36:121:37 | b3 | main.rs:121:4:121:34 | danger_accept_invalid_hostnames | provenance | MaD:2 Sink:MaD:2 |
 | main.rs:129:6:129:10 | input | main.rs:130:2:130:6 | input | provenance |  |
-| main.rs:129:14:129:27 | ...::stdin | main.rs:129:14:129:29 | ...::stdin(...) | provenance | Src:MaD:10 MaD:10 |
-| main.rs:129:14:129:29 | ...::stdin(...) | main.rs:129:6:129:10 | input | provenance |  |
+| main.rs:129:14:129:29 | ...::stdin(...) | main.rs:129:6:129:10 | input | provenance | Src:MaD:10  |
 | main.rs:130:2:130:6 | input | main.rs:130:18:130:32 | [post] &mut input_line [&ref] | provenance | MaD:16 |
 | main.rs:130:18:130:32 | [post] &mut input_line [&ref] | main.rs:130:23:130:32 | [post] input_line | provenance |  |
 | main.rs:130:23:130:32 | [post] input_line | main.rs:132:17:132:26 | input_line | provenance |  |
-| main.rs:132:6:132:7 | b4 | main.rs:134:36:134:37 | b4 | provenance |  |
+| main.rs:132:6:132:7 | b4 | main.rs:134:36:134:37 | b4 | provenance | Sink:MaD:2 |
 | main.rs:132:17:132:26 | input_line | main.rs:132:17:132:42 | input_line.parse() [Ok] | provenance | MaD:11 |
 | main.rs:132:17:132:42 | input_line.parse() [Ok] | main.rs:132:17:132:59 | ... .unwrap_or(...) | provenance | MaD:13 |
 | main.rs:132:17:132:59 | ... .unwrap_or(...) | main.rs:132:6:132:7 | b4 | provenance |  |
-| main.rs:134:36:134:37 | b4 | main.rs:134:4:134:34 | danger_accept_invalid_hostnames | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:144:6:144:7 | b6 | main.rs:146:36:146:37 | b6 | provenance |  |
+| main.rs:144:6:144:7 | b6 | main.rs:146:36:146:37 | b6 | provenance | Sink:MaD:2 |
 | main.rs:144:39:144:42 | true | main.rs:144:6:144:7 | b6 | provenance |  |
-| main.rs:146:36:146:37 | b6 | main.rs:146:4:146:34 | danger_accept_invalid_hostnames | provenance | MaD:2 Sink:MaD:2 |
 | main.rs:154:17:154:20 | true | main.rs:73:19:73:40 | ...: bool | provenance |  |
 models
 | 1 | Sink: <native_tls::TlsConnectorBuilder>::danger_accept_invalid_certs; Argument[0]; disable-certificate |
@@ -86,59 +77,52 @@ models
 | 15 | Summary: <std::fs::Metadata>::is_file; Argument[self].Reference; ReturnValue; taint |
 | 16 | Summary: <std::io::stdio::Stdin>::read_line; Argument[self].Reference; Argument[0].Reference; taint |
 nodes
-| main.rs:4:4:4:30 | danger_accept_invalid_certs | semmle.label | danger_accept_invalid_certs |
 | main.rs:4:32:4:35 | true | semmle.label | true |
-| main.rs:9:4:9:34 | danger_accept_invalid_hostnames | semmle.label | danger_accept_invalid_hostnames |
+| main.rs:4:32:4:35 | true | semmle.label | true |
+| main.rs:9:36:9:39 | true | semmle.label | true |
 | main.rs:9:36:9:39 | true | semmle.label | true |
-| main.rs:16:4:16:30 | danger_accept_invalid_certs | semmle.label | danger_accept_invalid_certs |
 | main.rs:16:32:16:35 | true | semmle.label | true |
-| main.rs:17:4:17:34 | danger_accept_invalid_hostnames | semmle.label | danger_accept_invalid_hostnames |
+| main.rs:16:32:16:35 | true | semmle.label | true |
 | main.rs:17:36:17:39 | true | semmle.label | true |
-| main.rs:37:4:37:30 | danger_accept_invalid_certs | semmle.label | danger_accept_invalid_certs |
+| main.rs:17:36:17:39 | true | semmle.label | true |
+| main.rs:37:32:37:35 | true | semmle.label | true |
 | main.rs:37:32:37:35 | true | semmle.label | true |
-| main.rs:42:4:42:34 | danger_accept_invalid_hostnames | semmle.label | danger_accept_invalid_hostnames |
 | main.rs:42:36:42:39 | true | semmle.label | true |
-| main.rs:47:4:47:30 | danger_accept_invalid_certs | semmle.label | danger_accept_invalid_certs |
+| main.rs:42:36:42:39 | true | semmle.label | true |
+| main.rs:47:32:47:35 | true | semmle.label | true |
 | main.rs:47:32:47:35 | true | semmle.label | true |
-| main.rs:48:4:48:34 | danger_accept_invalid_hostnames | semmle.label | danger_accept_invalid_hostnames |
 | main.rs:48:36:48:39 | true | semmle.label | true |
-| main.rs:55:4:55:30 | danger_accept_invalid_certs | semmle.label | danger_accept_invalid_certs |
+| main.rs:48:36:48:39 | true | semmle.label | true |
 | main.rs:55:32:55:35 | true | semmle.label | true |
-| main.rs:56:4:56:34 | danger_accept_invalid_hostnames | semmle.label | danger_accept_invalid_hostnames |
+| main.rs:55:32:55:35 | true | semmle.label | true |
+| main.rs:56:36:56:39 | true | semmle.label | true |
 | main.rs:56:36:56:39 | true | semmle.label | true |
 | main.rs:73:19:73:40 | ...: bool | semmle.label | ...: bool |
 | main.rs:74:6:74:11 | always | semmle.label | always |
 | main.rs:74:15:74:18 | true | semmle.label | true |
 | main.rs:75:6:75:18 | mut sometimes | semmle.label | mut sometimes |
 | main.rs:75:22:75:25 | true | semmle.label | true |
-| main.rs:83:4:83:30 | danger_accept_invalid_certs | semmle.label | danger_accept_invalid_certs |
 | main.rs:83:32:83:37 | always | semmle.label | always |
-| main.rs:88:4:88:30 | danger_accept_invalid_certs | semmle.label | danger_accept_invalid_certs |
 | main.rs:88:32:88:40 | sometimes | semmle.label | sometimes |
-| main.rs:93:4:93:30 | danger_accept_invalid_certs | semmle.label | danger_accept_invalid_certs |
 | main.rs:93:32:93:47 | sometimes_global | semmle.label | sometimes_global |
 | main.rs:107:6:107:7 | b1 | semmle.label | b1 |
-| main.rs:107:17:107:31 | ...::exists | semmle.label | ...::exists |
+| main.rs:107:17:107:42 | ...::exists(...) | semmle.label | ...::exists(...) |
 | main.rs:107:17:107:42 | ...::exists(...) [Ok] | semmle.label | ...::exists(...) [Ok] |
 | main.rs:107:17:107:51 | ... .unwrap() | semmle.label | ... .unwrap() |
-| main.rs:109:4:109:34 | danger_accept_invalid_hostnames | semmle.label | danger_accept_invalid_hostnames |
 | main.rs:109:36:109:37 | b1 | semmle.label | b1 |
 | main.rs:113:6:113:7 | b2 | semmle.label | b2 |
+| main.rs:113:11:113:52 | ... .metadata() | semmle.label | ... .metadata() |
 | main.rs:113:11:113:52 | ... .metadata() [Ok] | semmle.label | ... .metadata() [Ok] |
 | main.rs:113:11:113:61 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:113:11:113:71 | ... .is_file() | semmle.label | ... .is_file() |
-| main.rs:113:43:113:50 | metadata | semmle.label | metadata |
-| main.rs:115:4:115:34 | danger_accept_invalid_hostnames | semmle.label | danger_accept_invalid_hostnames |
 | main.rs:115:36:115:37 | b2 | semmle.label | b2 |
 | main.rs:119:6:119:7 | b3 | semmle.label | b3 |
-| main.rs:119:11:119:27 | ...::metadata | semmle.label | ...::metadata |
+| main.rs:119:11:119:38 | ...::metadata(...) | semmle.label | ...::metadata(...) |
 | main.rs:119:11:119:38 | ...::metadata(...) [Ok] | semmle.label | ...::metadata(...) [Ok] |
 | main.rs:119:11:119:47 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:119:11:119:56 | ... .is_dir() | semmle.label | ... .is_dir() |
-| main.rs:121:4:121:34 | danger_accept_invalid_hostnames | semmle.label | danger_accept_invalid_hostnames |
 | main.rs:121:36:121:37 | b3 | semmle.label | b3 |
 | main.rs:129:6:129:10 | input | semmle.label | input |
-| main.rs:129:14:129:27 | ...::stdin | semmle.label | ...::stdin |
 | main.rs:129:14:129:29 | ...::stdin(...) | semmle.label | ...::stdin(...) |
 | main.rs:130:2:130:6 | input | semmle.label | input |
 | main.rs:130:18:130:32 | [post] &mut input_line [&ref] | semmle.label | [post] &mut input_line [&ref] |
@@ -147,11 +131,9 @@ nodes
 | main.rs:132:17:132:26 | input_line | semmle.label | input_line |
 | main.rs:132:17:132:42 | input_line.parse() [Ok] | semmle.label | input_line.parse() [Ok] |
 | main.rs:132:17:132:59 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
-| main.rs:134:4:134:34 | danger_accept_invalid_hostnames | semmle.label | danger_accept_invalid_hostnames |
 | main.rs:134:36:134:37 | b4 | semmle.label | b4 |
 | main.rs:144:6:144:7 | b6 | semmle.label | b6 |
 | main.rs:144:39:144:42 | true | semmle.label | true |
-| main.rs:146:4:146:34 | danger_accept_invalid_hostnames | semmle.label | danger_accept_invalid_hostnames |
 | main.rs:146:36:146:37 | b6 | semmle.label | b6 |
 | main.rs:154:17:154:20 | true | semmle.label | true |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected b/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected
index 5807220eef0c..9a12c86d010f 100644
--- a/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected
+++ b/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected
@@ -1,50 +1,45 @@
 #select
-| main.rs:7:5:7:26 | ...::get | main.rs:6:50:6:57 | password | main.rs:7:5:7:26 | ...::get | This '...::get' operation transmits data which may contain unencrypted sensitive data from $@. | main.rs:6:50:6:57 | password | password |
-| main.rs:14:5:14:26 | ...::get | main.rs:12:50:12:57 | password | main.rs:14:5:14:26 | ...::get | This '...::get' operation transmits data which may contain unencrypted sensitive data from $@. | main.rs:12:50:12:57 | password | password |
-| main.rs:21:12:21:15 | post | main.rs:19:50:19:57 | password | main.rs:21:12:21:15 | post | This 'post' operation transmits data which may contain unencrypted sensitive data from $@. | main.rs:19:50:19:57 | password | password |
-| main.rs:28:12:28:18 | request | main.rs:26:50:26:57 | password | main.rs:28:12:28:18 | request | This 'request' operation transmits data which may contain unencrypted sensitive data from $@. | main.rs:26:50:26:57 | password | password |
-| main.rs:35:12:35:18 | request | main.rs:33:50:33:57 | password | main.rs:35:12:35:18 | request | This 'request' operation transmits data which may contain unencrypted sensitive data from $@. | main.rs:33:50:33:57 | password | password |
+| main.rs:7:28:7:30 | url | main.rs:6:50:6:57 | password | main.rs:7:28:7:30 | url | This 'url' operation transmits data which may contain unencrypted sensitive data from $@. | main.rs:6:50:6:57 | password | password |
+| main.rs:14:28:14:30 | url | main.rs:12:50:12:57 | password | main.rs:14:28:14:30 | url | This 'url' operation transmits data which may contain unencrypted sensitive data from $@. | main.rs:12:50:12:57 | password | password |
+| main.rs:21:17:21:19 | url | main.rs:19:50:19:57 | password | main.rs:21:17:21:19 | url | This 'url' operation transmits data which may contain unencrypted sensitive data from $@. | main.rs:19:50:19:57 | password | password |
+| main.rs:28:33:28:35 | url | main.rs:26:50:26:57 | password | main.rs:28:33:28:35 | url | This 'url' operation transmits data which may contain unencrypted sensitive data from $@. | main.rs:26:50:26:57 | password | password |
+| main.rs:35:33:35:35 | url | main.rs:33:50:33:57 | password | main.rs:35:33:35:35 | url | This 'url' operation transmits data which may contain unencrypted sensitive data from $@. | main.rs:33:50:33:57 | password | password |
 edges
-| main.rs:6:9:6:11 | url | main.rs:7:28:7:30 | url | provenance |  |
+| main.rs:6:9:6:11 | url | main.rs:7:28:7:30 | url | provenance | Sink:MaD:4 |
 | main.rs:6:23:6:57 | ...::format(...) | main.rs:6:23:6:57 | { ... } | provenance |  |
 | main.rs:6:23:6:57 | ...::must_use(...) | main.rs:6:9:6:11 | url | provenance |  |
 | main.rs:6:23:6:57 | MacroExpr | main.rs:6:23:6:57 | ...::format(...) | provenance | MaD:7 |
 | main.rs:6:23:6:57 | { ... } | main.rs:6:23:6:57 | ...::must_use(...) | provenance | MaD:8 |
 | main.rs:6:50:6:57 | password | main.rs:6:23:6:57 | MacroExpr | provenance |  |
-| main.rs:7:28:7:30 | url | main.rs:7:5:7:26 | ...::get | provenance | MaD:4 Sink:MaD:4 |
 | main.rs:12:9:12:15 | address | main.rs:13:27:13:33 | address | provenance |  |
 | main.rs:12:27:12:59 | ...::format(...) | main.rs:12:27:12:59 | { ... } | provenance |  |
 | main.rs:12:27:12:59 | ...::must_use(...) | main.rs:12:9:12:15 | address | provenance |  |
 | main.rs:12:27:12:59 | MacroExpr | main.rs:12:27:12:59 | ...::format(...) | provenance | MaD:7 |
 | main.rs:12:27:12:59 | { ... } | main.rs:12:27:12:59 | ...::must_use(...) | provenance | MaD:8 |
 | main.rs:12:50:12:57 | password | main.rs:12:27:12:59 | MacroExpr | provenance |  |
-| main.rs:13:9:13:11 | url | main.rs:14:28:14:30 | url | provenance |  |
+| main.rs:13:9:13:11 | url | main.rs:14:28:14:30 | url | provenance | Sink:MaD:4 |
 | main.rs:13:15:13:34 | ...::parse(...) [Ok] | main.rs:13:15:13:43 | ... .unwrap() | provenance | MaD:5 |
 | main.rs:13:15:13:43 | ... .unwrap() | main.rs:13:9:13:11 | url | provenance |  |
 | main.rs:13:26:13:33 | &address [&ref] | main.rs:13:15:13:34 | ...::parse(...) [Ok] | provenance | MaD:6 |
 | main.rs:13:27:13:33 | address | main.rs:13:26:13:33 | &address [&ref] | provenance |  |
-| main.rs:14:28:14:30 | url | main.rs:14:5:14:26 | ...::get | provenance | MaD:4 Sink:MaD:4 |
-| main.rs:19:9:19:11 | url | main.rs:21:17:21:19 | url | provenance |  |
+| main.rs:19:9:19:11 | url | main.rs:21:17:21:19 | url | provenance | Sink:MaD:1 |
 | main.rs:19:23:19:57 | ...::format(...) | main.rs:19:23:19:57 | { ... } | provenance |  |
 | main.rs:19:23:19:57 | ...::must_use(...) | main.rs:19:9:19:11 | url | provenance |  |
 | main.rs:19:23:19:57 | MacroExpr | main.rs:19:23:19:57 | ...::format(...) | provenance | MaD:7 |
 | main.rs:19:23:19:57 | { ... } | main.rs:19:23:19:57 | ...::must_use(...) | provenance | MaD:8 |
 | main.rs:19:50:19:57 | password | main.rs:19:23:19:57 | MacroExpr | provenance |  |
-| main.rs:21:17:21:19 | url | main.rs:21:12:21:15 | post | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:26:9:26:11 | url | main.rs:28:33:28:35 | url | provenance |  |
+| main.rs:26:9:26:11 | url | main.rs:28:33:28:35 | url | provenance | Sink:MaD:3 |
 | main.rs:26:23:26:57 | ...::format(...) | main.rs:26:23:26:57 | { ... } | provenance |  |
 | main.rs:26:23:26:57 | ...::must_use(...) | main.rs:26:9:26:11 | url | provenance |  |
 | main.rs:26:23:26:57 | MacroExpr | main.rs:26:23:26:57 | ...::format(...) | provenance | MaD:7 |
 | main.rs:26:23:26:57 | { ... } | main.rs:26:23:26:57 | ...::must_use(...) | provenance | MaD:8 |
 | main.rs:26:50:26:57 | password | main.rs:26:23:26:57 | MacroExpr | provenance |  |
-| main.rs:28:33:28:35 | url | main.rs:28:12:28:18 | request | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:33:9:33:11 | url | main.rs:35:33:35:35 | url | provenance |  |
+| main.rs:33:9:33:11 | url | main.rs:35:33:35:35 | url | provenance | Sink:MaD:2 |
 | main.rs:33:23:33:57 | ...::format(...) | main.rs:33:23:33:57 | { ... } | provenance |  |
 | main.rs:33:23:33:57 | ...::must_use(...) | main.rs:33:9:33:11 | url | provenance |  |
 | main.rs:33:23:33:57 | MacroExpr | main.rs:33:23:33:57 | ...::format(...) | provenance | MaD:7 |
 | main.rs:33:23:33:57 | { ... } | main.rs:33:23:33:57 | ...::must_use(...) | provenance | MaD:8 |
 | main.rs:33:50:33:57 | password | main.rs:33:23:33:57 | MacroExpr | provenance |  |
-| main.rs:35:33:35:35 | url | main.rs:35:12:35:18 | request | provenance | MaD:2 Sink:MaD:2 |
 models
 | 1 | Sink: <reqwest::async_impl::client::Client>::post; Argument[0]; request-url |
 | 2 | Sink: <reqwest::async_impl::client::Client>::request; Argument[1]; request-url |
@@ -61,7 +56,6 @@ nodes
 | main.rs:6:23:6:57 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:6:23:6:57 | { ... } | semmle.label | { ... } |
 | main.rs:6:50:6:57 | password | semmle.label | password |
-| main.rs:7:5:7:26 | ...::get | semmle.label | ...::get |
 | main.rs:7:28:7:30 | url | semmle.label | url |
 | main.rs:12:9:12:15 | address | semmle.label | address |
 | main.rs:12:27:12:59 | ...::format(...) | semmle.label | ...::format(...) |
@@ -74,7 +68,6 @@ nodes
 | main.rs:13:15:13:43 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:13:26:13:33 | &address [&ref] | semmle.label | &address [&ref] |
 | main.rs:13:27:13:33 | address | semmle.label | address |
-| main.rs:14:5:14:26 | ...::get | semmle.label | ...::get |
 | main.rs:14:28:14:30 | url | semmle.label | url |
 | main.rs:19:9:19:11 | url | semmle.label | url |
 | main.rs:19:23:19:57 | ...::format(...) | semmle.label | ...::format(...) |
@@ -82,7 +75,6 @@ nodes
 | main.rs:19:23:19:57 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:19:23:19:57 | { ... } | semmle.label | { ... } |
 | main.rs:19:50:19:57 | password | semmle.label | password |
-| main.rs:21:12:21:15 | post | semmle.label | post |
 | main.rs:21:17:21:19 | url | semmle.label | url |
 | main.rs:26:9:26:11 | url | semmle.label | url |
 | main.rs:26:23:26:57 | ...::format(...) | semmle.label | ...::format(...) |
@@ -90,7 +82,6 @@ nodes
 | main.rs:26:23:26:57 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:26:23:26:57 | { ... } | semmle.label | { ... } |
 | main.rs:26:50:26:57 | password | semmle.label | password |
-| main.rs:28:12:28:18 | request | semmle.label | request |
 | main.rs:28:33:28:35 | url | semmle.label | url |
 | main.rs:33:9:33:11 | url | semmle.label | url |
 | main.rs:33:23:33:57 | ...::format(...) | semmle.label | ...::format(...) |
@@ -98,6 +89,5 @@ nodes
 | main.rs:33:23:33:57 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:33:23:33:57 | { ... } | semmle.label | { ... } |
 | main.rs:33:50:33:57 | password | semmle.label | password |
-| main.rs:35:12:35:18 | request | semmle.label | request |
 | main.rs:35:33:35:35 | url | semmle.label | url |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected b/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
index 61de9de03b58..b87bd75ca140 100644
--- a/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
+++ b/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
@@ -1,318 +1,281 @@
 #select
-| test_logging.rs:42:5:42:10 | ...::log | test_logging.rs:42:28:42:35 | password | test_logging.rs:42:5:42:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:42:28:42:35 | password | password |
-| test_logging.rs:43:5:43:10 | ...::log | test_logging.rs:43:28:43:35 | password | test_logging.rs:43:5:43:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:43:28:43:35 | password | password |
-| test_logging.rs:44:5:44:9 | ...::log | test_logging.rs:44:27:44:34 | password | test_logging.rs:44:5:44:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:44:27:44:34 | password | password |
-| test_logging.rs:45:5:45:10 | ...::log | test_logging.rs:45:28:45:35 | password | test_logging.rs:45:5:45:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:45:28:45:35 | password | password |
-| test_logging.rs:46:5:46:9 | ...::log | test_logging.rs:46:27:46:34 | password | test_logging.rs:46:5:46:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:46:27:46:34 | password | password |
-| test_logging.rs:47:5:47:8 | ...::log | test_logging.rs:47:40:47:47 | password | test_logging.rs:47:5:47:8 | ...::log | This operation writes $@ to a log file. | test_logging.rs:47:40:47:47 | password | password |
-| test_logging.rs:52:5:52:10 | ...::log | test_logging.rs:52:28:52:35 | password | test_logging.rs:52:5:52:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:52:28:52:35 | password | password |
-| test_logging.rs:54:5:54:10 | ...::log | test_logging.rs:54:41:54:48 | password | test_logging.rs:54:5:54:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:54:41:54:48 | password | password |
-| test_logging.rs:56:5:56:10 | ...::log | test_logging.rs:56:39:56:46 | password | test_logging.rs:56:5:56:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:56:39:56:46 | password | password |
-| test_logging.rs:57:5:57:10 | ...::log | test_logging.rs:57:24:57:31 | password | test_logging.rs:57:5:57:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:57:24:57:31 | password | password |
-| test_logging.rs:58:5:58:10 | ...::log | test_logging.rs:58:24:58:31 | password | test_logging.rs:58:5:58:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:58:24:58:31 | password | password |
-| test_logging.rs:60:5:60:10 | ...::log | test_logging.rs:60:46:60:53 | password | test_logging.rs:60:5:60:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:60:46:60:53 | password | password |
-| test_logging.rs:61:5:61:10 | ...::log | test_logging.rs:61:21:61:28 | password | test_logging.rs:61:5:61:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:61:21:61:28 | password | password |
-| test_logging.rs:65:5:65:8 | ...::log | test_logging.rs:65:40:65:47 | password | test_logging.rs:65:5:65:8 | ...::log | This operation writes $@ to a log file. | test_logging.rs:65:40:65:47 | password | password |
-| test_logging.rs:67:5:67:8 | ...::log | test_logging.rs:67:58:67:65 | password | test_logging.rs:67:5:67:8 | ...::log | This operation writes $@ to a log file. | test_logging.rs:67:58:67:65 | password | password |
-| test_logging.rs:68:5:68:8 | ...::log | test_logging.rs:68:19:68:26 | password | test_logging.rs:68:5:68:8 | ...::log | This operation writes $@ to a log file. | test_logging.rs:68:19:68:26 | password | password |
-| test_logging.rs:72:5:72:10 | ...::log | test_logging.rs:72:39:72:46 | password | test_logging.rs:72:5:72:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:72:39:72:46 | password | password |
-| test_logging.rs:74:5:74:10 | ...::log | test_logging.rs:74:57:74:64 | password | test_logging.rs:74:5:74:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:74:57:74:64 | password | password |
-| test_logging.rs:75:5:75:10 | ...::log | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:5:75:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:75:21:75:28 | password | password |
-| test_logging.rs:76:5:76:10 | ...::log | test_logging.rs:76:39:76:46 | password | test_logging.rs:76:5:76:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:76:39:76:46 | password | password |
-| test_logging.rs:82:5:82:10 | ...::log | test_logging.rs:82:36:82:43 | password | test_logging.rs:82:5:82:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:82:36:82:43 | password | password |
-| test_logging.rs:84:5:84:10 | ...::log | test_logging.rs:84:54:84:61 | password | test_logging.rs:84:5:84:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:84:54:84:61 | password | password |
-| test_logging.rs:85:5:85:10 | ...::log | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:5:85:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:85:21:85:28 | password | password |
-| test_logging.rs:86:5:86:10 | ...::log | test_logging.rs:86:36:86:43 | password | test_logging.rs:86:5:86:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:86:36:86:43 | password | password |
-| test_logging.rs:94:5:94:9 | ...::log | test_logging.rs:93:15:93:22 | password | test_logging.rs:94:5:94:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:93:15:93:22 | password | password |
-| test_logging.rs:97:5:97:9 | ...::log | test_logging.rs:96:42:96:49 | password | test_logging.rs:97:5:97:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:96:42:96:49 | password | password |
-| test_logging.rs:100:5:100:9 | ...::log | test_logging.rs:99:38:99:45 | password | test_logging.rs:100:5:100:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:99:38:99:45 | password | password |
-| test_logging.rs:118:5:118:10 | ...::log | test_logging.rs:118:28:118:41 | get_password(...) | test_logging.rs:118:5:118:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:118:28:118:41 | get_password(...) | get_password(...) |
-| test_logging.rs:131:5:131:10 | ...::log | test_logging.rs:129:25:129:32 | password | test_logging.rs:131:5:131:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:129:25:129:32 | password | password |
-| test_logging.rs:141:5:141:9 | ...::log | test_logging.rs:141:27:141:37 | s1.password | test_logging.rs:141:5:141:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:141:27:141:37 | s1.password | s1.password |
-| test_logging.rs:151:5:151:9 | ...::log | test_logging.rs:151:27:151:37 | s2.password | test_logging.rs:151:5:151:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:151:27:151:37 | s2.password | s2.password |
-| test_logging.rs:176:22:176:31 | log_expect | test_logging.rs:176:70:176:78 | password2 | test_logging.rs:176:22:176:31 | log_expect | This operation writes $@ to a log file. | test_logging.rs:176:70:176:78 | password2 | password2 |
-| test_logging.rs:180:24:180:33 | log_expect | test_logging.rs:180:72:180:80 | password2 | test_logging.rs:180:24:180:33 | log_expect | This operation writes $@ to a log file. | test_logging.rs:180:72:180:80 | password2 | password2 |
-| test_logging.rs:184:25:184:34 | log_expect | test_logging.rs:183:51:183:59 | password2 | test_logging.rs:184:25:184:34 | log_expect | This operation writes $@ to a log file. | test_logging.rs:183:51:183:59 | password2 | password2 |
-| test_logging.rs:188:25:188:34 | log_unwrap | test_logging.rs:187:51:187:59 | password2 | test_logging.rs:188:25:188:34 | log_unwrap | This operation writes $@ to a log file. | test_logging.rs:187:51:187:59 | password2 | password2 |
-| test_logging.rs:192:5:192:10 | ...::_print | test_logging.rs:192:30:192:37 | password | test_logging.rs:192:5:192:10 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:192:30:192:37 | password | password |
-| test_logging.rs:193:5:193:12 | ...::_print | test_logging.rs:193:30:193:37 | password | test_logging.rs:193:5:193:12 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:193:30:193:37 | password | password |
-| test_logging.rs:194:5:194:11 | ...::_eprint | test_logging.rs:194:31:194:38 | password | test_logging.rs:194:5:194:11 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:194:31:194:38 | password | password |
-| test_logging.rs:195:5:195:13 | ...::_eprint | test_logging.rs:195:31:195:38 | password | test_logging.rs:195:5:195:13 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:195:31:195:38 | password | password |
-| test_logging.rs:199:13:199:18 | ...::panic_fmt | test_logging.rs:199:36:199:43 | password | test_logging.rs:199:13:199:18 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:199:36:199:43 | password | password |
-| test_logging.rs:202:13:202:17 | ...::panic_fmt | test_logging.rs:202:35:202:42 | password | test_logging.rs:202:13:202:17 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:202:35:202:42 | password | password |
-| test_logging.rs:205:13:205:26 | ...::panic_fmt | test_logging.rs:205:44:205:51 | password | test_logging.rs:205:13:205:26 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:205:44:205:51 | password | password |
-| test_logging.rs:208:13:208:24 | ...::panic_fmt | test_logging.rs:208:42:208:49 | password | test_logging.rs:208:13:208:24 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:208:42:208:49 | password | password |
-| test_logging.rs:211:13:211:19 | ...::panic_fmt | test_logging.rs:211:44:211:51 | password | test_logging.rs:211:13:211:19 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:211:44:211:51 | password | password |
-| test_logging.rs:214:13:214:22 | ...::assert_failed | test_logging.rs:214:46:214:53 | password | test_logging.rs:214:13:214:22 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:214:46:214:53 | password | password |
-| test_logging.rs:217:13:217:22 | ...::assert_failed | test_logging.rs:217:46:217:53 | password | test_logging.rs:217:13:217:22 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:217:46:217:53 | password | password |
-| test_logging.rs:220:13:220:25 | ...::panic_fmt | test_logging.rs:220:50:220:57 | password | test_logging.rs:220:13:220:25 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:220:50:220:57 | password | password |
-| test_logging.rs:223:13:223:28 | ...::assert_failed | test_logging.rs:223:52:223:59 | password | test_logging.rs:223:13:223:28 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:223:52:223:59 | password | password |
-| test_logging.rs:226:13:226:28 | ...::assert_failed | test_logging.rs:226:52:226:59 | password | test_logging.rs:226:13:226:28 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:226:52:226:59 | password | password |
-| test_logging.rs:229:23:229:28 | expect | test_logging.rs:229:54:229:61 | password | test_logging.rs:229:23:229:28 | expect | This operation writes $@ to a log file. | test_logging.rs:229:54:229:61 | password | password |
-| test_logging.rs:242:10:242:14 | write | test_logging.rs:242:42:242:49 | password | test_logging.rs:242:10:242:14 | write | This operation writes $@ to a log file. | test_logging.rs:242:42:242:49 | password | password |
-| test_logging.rs:245:10:245:18 | write_all | test_logging.rs:245:46:245:53 | password | test_logging.rs:245:10:245:18 | write_all | This operation writes $@ to a log file. | test_logging.rs:245:46:245:53 | password | password |
-| test_logging.rs:248:9:248:13 | write | test_logging.rs:248:41:248:48 | password | test_logging.rs:248:9:248:13 | write | This operation writes $@ to a log file. | test_logging.rs:248:41:248:48 | password | password |
-| test_logging.rs:251:9:251:13 | write | test_logging.rs:251:41:251:48 | password | test_logging.rs:251:9:251:13 | write | This operation writes $@ to a log file. | test_logging.rs:251:41:251:48 | password | password |
+| test_logging.rs:42:12:42:35 | MacroExpr | test_logging.rs:42:28:42:35 | password | test_logging.rs:42:12:42:35 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:42:28:42:35 | password | password |
+| test_logging.rs:43:12:43:35 | MacroExpr | test_logging.rs:43:28:43:35 | password | test_logging.rs:43:12:43:35 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:43:28:43:35 | password | password |
+| test_logging.rs:44:11:44:34 | MacroExpr | test_logging.rs:44:27:44:34 | password | test_logging.rs:44:11:44:34 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:44:27:44:34 | password | password |
+| test_logging.rs:45:12:45:35 | MacroExpr | test_logging.rs:45:28:45:35 | password | test_logging.rs:45:12:45:35 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:45:28:45:35 | password | password |
+| test_logging.rs:46:11:46:34 | MacroExpr | test_logging.rs:46:27:46:34 | password | test_logging.rs:46:11:46:34 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:46:27:46:34 | password | password |
+| test_logging.rs:47:24:47:47 | MacroExpr | test_logging.rs:47:40:47:47 | password | test_logging.rs:47:24:47:47 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:47:40:47:47 | password | password |
+| test_logging.rs:52:12:52:35 | MacroExpr | test_logging.rs:52:28:52:35 | password | test_logging.rs:52:12:52:35 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:52:28:52:35 | password | password |
+| test_logging.rs:54:12:54:48 | MacroExpr | test_logging.rs:54:41:54:48 | password | test_logging.rs:54:12:54:48 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:54:41:54:48 | password | password |
+| test_logging.rs:56:12:56:46 | MacroExpr | test_logging.rs:56:39:56:46 | password | test_logging.rs:56:12:56:46 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:56:39:56:46 | password | password |
+| test_logging.rs:57:12:57:33 | MacroExpr | test_logging.rs:57:24:57:31 | password | test_logging.rs:57:12:57:33 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:57:24:57:31 | password | password |
+| test_logging.rs:58:12:58:35 | MacroExpr | test_logging.rs:58:24:58:31 | password | test_logging.rs:58:12:58:35 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:58:24:58:31 | password | password |
+| test_logging.rs:60:30:60:53 | MacroExpr | test_logging.rs:60:46:60:53 | password | test_logging.rs:60:30:60:53 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:60:46:60:53 | password | password |
+| test_logging.rs:61:20:61:28 | &... | test_logging.rs:61:21:61:28 | password | test_logging.rs:61:20:61:28 | &... | This operation writes $@ to a log file. | test_logging.rs:61:21:61:28 | password | password |
+| test_logging.rs:65:24:65:47 | MacroExpr | test_logging.rs:65:40:65:47 | password | test_logging.rs:65:24:65:47 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:65:40:65:47 | password | password |
+| test_logging.rs:67:42:67:65 | MacroExpr | test_logging.rs:67:58:67:65 | password | test_logging.rs:67:42:67:65 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:67:58:67:65 | password | password |
+| test_logging.rs:68:18:68:26 | &... | test_logging.rs:68:19:68:26 | password | test_logging.rs:68:18:68:26 | &... | This operation writes $@ to a log file. | test_logging.rs:68:19:68:26 | password | password |
+| test_logging.rs:72:23:72:46 | MacroExpr | test_logging.rs:72:39:72:46 | password | test_logging.rs:72:23:72:46 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:72:39:72:46 | password | password |
+| test_logging.rs:74:41:74:64 | MacroExpr | test_logging.rs:74:57:74:64 | password | test_logging.rs:74:41:74:64 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:74:57:74:64 | password | password |
+| test_logging.rs:75:20:75:28 | &... | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:20:75:28 | &... | This operation writes $@ to a log file. | test_logging.rs:75:21:75:28 | password | password |
+| test_logging.rs:76:23:76:46 | MacroExpr | test_logging.rs:76:39:76:46 | password | test_logging.rs:76:23:76:46 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:76:39:76:46 | password | password |
+| test_logging.rs:82:20:82:43 | MacroExpr | test_logging.rs:82:36:82:43 | password | test_logging.rs:82:20:82:43 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:82:36:82:43 | password | password |
+| test_logging.rs:84:38:84:61 | MacroExpr | test_logging.rs:84:54:84:61 | password | test_logging.rs:84:38:84:61 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:84:54:84:61 | password | password |
+| test_logging.rs:85:20:85:28 | &... | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:20:85:28 | &... | This operation writes $@ to a log file. | test_logging.rs:85:21:85:28 | password | password |
+| test_logging.rs:86:20:86:43 | MacroExpr | test_logging.rs:86:36:86:43 | password | test_logging.rs:86:20:86:43 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:86:36:86:43 | password | password |
+| test_logging.rs:94:11:94:28 | MacroExpr | test_logging.rs:93:15:93:22 | password | test_logging.rs:94:11:94:28 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:93:15:93:22 | password | password |
+| test_logging.rs:97:11:97:18 | MacroExpr | test_logging.rs:96:42:96:49 | password | test_logging.rs:97:11:97:18 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:96:42:96:49 | password | password |
+| test_logging.rs:100:11:100:18 | MacroExpr | test_logging.rs:99:38:99:45 | password | test_logging.rs:100:11:100:18 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:99:38:99:45 | password | password |
+| test_logging.rs:104:11:104:18 | MacroExpr | test_logging.rs:103:37:103:44 | password | test_logging.rs:104:11:104:18 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:103:37:103:44 | password | password |
+| test_logging.rs:108:11:108:18 | MacroExpr | test_logging.rs:107:39:107:46 | password | test_logging.rs:108:11:108:18 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:107:39:107:46 | password | password |
+| test_logging.rs:118:12:118:41 | MacroExpr | test_logging.rs:118:28:118:41 | get_password(...) | test_logging.rs:118:12:118:41 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:118:28:118:41 | get_password(...) | get_password(...) |
+| test_logging.rs:131:12:131:31 | MacroExpr | test_logging.rs:129:25:129:32 | password | test_logging.rs:131:12:131:31 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:129:25:129:32 | password | password |
+| test_logging.rs:141:11:141:37 | MacroExpr | test_logging.rs:141:27:141:37 | s1.password | test_logging.rs:141:11:141:37 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:141:27:141:37 | s1.password | s1.password |
+| test_logging.rs:151:11:151:37 | MacroExpr | test_logging.rs:151:27:151:37 | s2.password | test_logging.rs:151:11:151:37 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:151:27:151:37 | s2.password | s2.password |
+| test_logging.rs:176:33:176:79 | &... | test_logging.rs:176:70:176:78 | password2 | test_logging.rs:176:33:176:79 | &... | This operation writes $@ to a log file. | test_logging.rs:176:70:176:78 | password2 | password2 |
+| test_logging.rs:180:35:180:81 | &... | test_logging.rs:180:72:180:80 | password2 | test_logging.rs:180:35:180:81 | &... | This operation writes $@ to a log file. | test_logging.rs:180:72:180:80 | password2 | password2 |
+| test_logging.rs:184:13:184:23 | err_result2 | test_logging.rs:183:51:183:59 | password2 | test_logging.rs:184:13:184:23 | err_result2 | This operation writes $@ to a log file. | test_logging.rs:183:51:183:59 | password2 | password2 |
+| test_logging.rs:188:13:188:23 | err_result3 | test_logging.rs:187:51:187:59 | password2 | test_logging.rs:188:13:188:23 | err_result3 | This operation writes $@ to a log file. | test_logging.rs:187:51:187:59 | password2 | password2 |
+| test_logging.rs:192:12:192:37 | MacroExpr | test_logging.rs:192:30:192:37 | password | test_logging.rs:192:12:192:37 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:192:30:192:37 | password | password |
+| test_logging.rs:193:14:193:37 | MacroExpr | test_logging.rs:193:30:193:37 | password | test_logging.rs:193:14:193:37 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:193:30:193:37 | password | password |
+| test_logging.rs:194:13:194:38 | MacroExpr | test_logging.rs:194:31:194:38 | password | test_logging.rs:194:13:194:38 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:194:31:194:38 | password | password |
+| test_logging.rs:195:15:195:38 | MacroExpr | test_logging.rs:195:31:195:38 | password | test_logging.rs:195:15:195:38 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:195:31:195:38 | password | password |
+| test_logging.rs:199:20:199:43 | MacroExpr | test_logging.rs:199:36:199:43 | password | test_logging.rs:199:20:199:43 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:199:36:199:43 | password | password |
+| test_logging.rs:202:19:202:42 | MacroExpr | test_logging.rs:202:35:202:42 | password | test_logging.rs:202:19:202:42 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:202:35:202:42 | password | password |
+| test_logging.rs:205:28:205:51 | MacroExpr | test_logging.rs:205:44:205:51 | password | test_logging.rs:205:28:205:51 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:205:44:205:51 | password | password |
+| test_logging.rs:208:26:208:49 | MacroExpr | test_logging.rs:208:42:208:49 | password | test_logging.rs:208:26:208:49 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:208:42:208:49 | password | password |
+| test_logging.rs:211:28:211:51 | MacroExpr | test_logging.rs:211:44:211:51 | password | test_logging.rs:211:28:211:51 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:211:44:211:51 | password | password |
+| test_logging.rs:214:30:214:53 | ...::Some(...) | test_logging.rs:214:46:214:53 | password | test_logging.rs:214:30:214:53 | ...::Some(...) | This operation writes $@ to a log file. | test_logging.rs:214:46:214:53 | password | password |
+| test_logging.rs:217:30:217:53 | ...::Some(...) | test_logging.rs:217:46:217:53 | password | test_logging.rs:217:30:217:53 | ...::Some(...) | This operation writes $@ to a log file. | test_logging.rs:217:46:217:53 | password | password |
+| test_logging.rs:220:34:220:57 | MacroExpr | test_logging.rs:220:50:220:57 | password | test_logging.rs:220:34:220:57 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:220:50:220:57 | password | password |
+| test_logging.rs:223:36:223:59 | ...::Some(...) | test_logging.rs:223:52:223:59 | password | test_logging.rs:223:36:223:59 | ...::Some(...) | This operation writes $@ to a log file. | test_logging.rs:223:52:223:59 | password | password |
+| test_logging.rs:226:36:226:59 | ...::Some(...) | test_logging.rs:226:52:226:59 | password | test_logging.rs:226:36:226:59 | ...::Some(...) | This operation writes $@ to a log file. | test_logging.rs:226:52:226:59 | password | password |
+| test_logging.rs:229:30:229:71 | ... .as_str() | test_logging.rs:229:54:229:61 | password | test_logging.rs:229:30:229:71 | ... .as_str() | This operation writes $@ to a log file. | test_logging.rs:229:54:229:61 | password | password |
+| test_logging.rs:242:16:242:61 | ... .as_bytes() | test_logging.rs:242:42:242:49 | password | test_logging.rs:242:16:242:61 | ... .as_bytes() | This operation writes $@ to a log file. | test_logging.rs:242:42:242:49 | password | password |
+| test_logging.rs:245:20:245:65 | ... .as_bytes() | test_logging.rs:245:46:245:53 | password | test_logging.rs:245:20:245:65 | ... .as_bytes() | This operation writes $@ to a log file. | test_logging.rs:245:46:245:53 | password | password |
+| test_logging.rs:248:15:248:60 | ... .as_bytes() | test_logging.rs:248:41:248:48 | password | test_logging.rs:248:15:248:60 | ... .as_bytes() | This operation writes $@ to a log file. | test_logging.rs:248:41:248:48 | password | password |
+| test_logging.rs:251:15:251:60 | ... .as_bytes() | test_logging.rs:251:41:251:48 | password | test_logging.rs:251:15:251:60 | ... .as_bytes() | This operation writes $@ to a log file. | test_logging.rs:251:41:251:48 | password | password |
+| test_logging.rs:290:11:290:31 | MacroExpr | test_logging.rs:289:17:289:39 | get_password_or_error(...) | test_logging.rs:290:11:290:31 | MacroExpr | This operation writes $@ to a log file. | test_logging.rs:289:17:289:39 | get_password_or_error(...) | get_password_or_error(...) |
 edges
-| test_logging.rs:42:12:42:35 | MacroExpr | test_logging.rs:42:5:42:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:42:28:42:35 | password | test_logging.rs:42:12:42:35 | MacroExpr | provenance |  |
-| test_logging.rs:43:12:43:35 | MacroExpr | test_logging.rs:43:5:43:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:43:28:43:35 | password | test_logging.rs:43:12:43:35 | MacroExpr | provenance |  |
-| test_logging.rs:44:11:44:34 | MacroExpr | test_logging.rs:44:5:44:9 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:44:27:44:34 | password | test_logging.rs:44:11:44:34 | MacroExpr | provenance |  |
-| test_logging.rs:45:12:45:35 | MacroExpr | test_logging.rs:45:5:45:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:45:28:45:35 | password | test_logging.rs:45:12:45:35 | MacroExpr | provenance |  |
-| test_logging.rs:46:11:46:34 | MacroExpr | test_logging.rs:46:5:46:9 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:46:27:46:34 | password | test_logging.rs:46:11:46:34 | MacroExpr | provenance |  |
-| test_logging.rs:47:24:47:47 | MacroExpr | test_logging.rs:47:5:47:8 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:47:40:47:47 | password | test_logging.rs:47:24:47:47 | MacroExpr | provenance |  |
-| test_logging.rs:52:12:52:35 | MacroExpr | test_logging.rs:52:5:52:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:52:28:52:35 | password | test_logging.rs:52:12:52:35 | MacroExpr | provenance |  |
-| test_logging.rs:54:12:54:48 | MacroExpr | test_logging.rs:54:5:54:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:54:41:54:48 | password | test_logging.rs:54:12:54:48 | MacroExpr | provenance |  |
-| test_logging.rs:56:12:56:46 | MacroExpr | test_logging.rs:56:5:56:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:56:39:56:46 | password | test_logging.rs:56:12:56:46 | MacroExpr | provenance |  |
-| test_logging.rs:57:12:57:33 | MacroExpr | test_logging.rs:57:5:57:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:57:24:57:31 | password | test_logging.rs:57:12:57:33 | MacroExpr | provenance |  |
-| test_logging.rs:58:12:58:35 | MacroExpr | test_logging.rs:58:5:58:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:58:24:58:31 | password | test_logging.rs:58:12:58:35 | MacroExpr | provenance |  |
-| test_logging.rs:60:30:60:53 | MacroExpr | test_logging.rs:60:5:60:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:60:46:60:53 | password | test_logging.rs:60:30:60:53 | MacroExpr | provenance |  |
-| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:5:61:10 | ...::log | provenance | MaD:12 Sink:MaD:12 Sink:MaD:12 |
-| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:5:61:10 | ...::log | provenance | MaD:12 Sink:MaD:12 Sink:MaD:12 Sink:MaD:12 |
-| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | test_logging.rs:61:5:61:10 | ...::log | provenance | MaD:12 Sink:MaD:12 Sink:MaD:12 |
+| test_logging.rs:42:28:42:35 | password | test_logging.rs:42:12:42:35 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:43:28:43:35 | password | test_logging.rs:43:12:43:35 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:44:27:44:34 | password | test_logging.rs:44:11:44:34 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:45:28:45:35 | password | test_logging.rs:45:12:45:35 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:46:27:46:34 | password | test_logging.rs:46:11:46:34 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:47:40:47:47 | password | test_logging.rs:47:24:47:47 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:52:28:52:35 | password | test_logging.rs:52:12:52:35 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:54:41:54:48 | password | test_logging.rs:54:12:54:48 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:56:39:56:46 | password | test_logging.rs:56:12:56:46 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:57:24:57:31 | password | test_logging.rs:57:12:57:33 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:58:24:58:31 | password | test_logging.rs:58:12:58:35 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:60:46:60:53 | password | test_logging.rs:60:30:60:53 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:20:61:28 | &... | provenance | Sink:MaD:12 Sink:MaD:12 |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:20:61:28 | &... | provenance | Sink:MaD:12 Sink:MaD:12 Sink:MaD:12 |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | test_logging.rs:61:20:61:28 | &... | provenance | Sink:MaD:12 Sink:MaD:12 |
 | test_logging.rs:61:20:61:28 | &password | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0] | provenance |  |
 | test_logging.rs:61:20:61:28 | &password [&ref] | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0, &ref] | provenance |  |
 | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | provenance |  |
 | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0] | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | provenance |  |
 | test_logging.rs:61:21:61:28 | password | test_logging.rs:61:20:61:28 | &password | provenance | Config |
 | test_logging.rs:61:21:61:28 | password | test_logging.rs:61:20:61:28 | &password [&ref] | provenance |  |
-| test_logging.rs:65:24:65:47 | MacroExpr | test_logging.rs:65:5:65:8 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:65:40:65:47 | password | test_logging.rs:65:24:65:47 | MacroExpr | provenance |  |
-| test_logging.rs:67:42:67:65 | MacroExpr | test_logging.rs:67:5:67:8 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:67:58:67:65 | password | test_logging.rs:67:42:67:65 | MacroExpr | provenance |  |
-| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:5:68:8 | ...::log | provenance | MaD:12 Sink:MaD:12 Sink:MaD:12 |
-| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:5:68:8 | ...::log | provenance | MaD:12 Sink:MaD:12 Sink:MaD:12 Sink:MaD:12 |
-| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | test_logging.rs:68:5:68:8 | ...::log | provenance | MaD:12 Sink:MaD:12 Sink:MaD:12 |
+| test_logging.rs:65:40:65:47 | password | test_logging.rs:65:24:65:47 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:67:58:67:65 | password | test_logging.rs:67:42:67:65 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:18:68:26 | &... | provenance | Sink:MaD:12 Sink:MaD:12 |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:18:68:26 | &... | provenance | Sink:MaD:12 Sink:MaD:12 Sink:MaD:12 |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | test_logging.rs:68:18:68:26 | &... | provenance | Sink:MaD:12 Sink:MaD:12 |
 | test_logging.rs:68:18:68:26 | &password | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0] | provenance |  |
 | test_logging.rs:68:18:68:26 | &password [&ref] | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0, &ref] | provenance |  |
 | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0, &ref] | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | provenance |  |
 | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0] | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | provenance |  |
 | test_logging.rs:68:19:68:26 | password | test_logging.rs:68:18:68:26 | &password | provenance | Config |
 | test_logging.rs:68:19:68:26 | password | test_logging.rs:68:18:68:26 | &password [&ref] | provenance |  |
-| test_logging.rs:72:23:72:46 | MacroExpr | test_logging.rs:72:5:72:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:72:39:72:46 | password | test_logging.rs:72:23:72:46 | MacroExpr | provenance |  |
-| test_logging.rs:74:41:74:64 | MacroExpr | test_logging.rs:74:5:74:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:74:57:74:64 | password | test_logging.rs:74:41:74:64 | MacroExpr | provenance |  |
-| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:10 | ...::log | provenance | MaD:12 Sink:MaD:12 Sink:MaD:12 |
-| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:10 | ...::log | provenance | MaD:12 Sink:MaD:12 Sink:MaD:12 Sink:MaD:12 |
-| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | test_logging.rs:75:5:75:10 | ...::log | provenance | MaD:12 Sink:MaD:12 Sink:MaD:12 |
+| test_logging.rs:72:39:72:46 | password | test_logging.rs:72:23:72:46 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:74:57:74:64 | password | test_logging.rs:74:41:74:64 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:20:75:28 | &... | provenance | Sink:MaD:12 Sink:MaD:12 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:20:75:28 | &... | provenance | Sink:MaD:12 Sink:MaD:12 Sink:MaD:12 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | test_logging.rs:75:20:75:28 | &... | provenance | Sink:MaD:12 Sink:MaD:12 |
 | test_logging.rs:75:20:75:28 | &password | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0] | provenance |  |
 | test_logging.rs:75:20:75:28 | &password [&ref] | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0, &ref] | provenance |  |
 | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | provenance |  |
 | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0] | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | provenance |  |
 | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:20:75:28 | &password | provenance | Config |
 | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:20:75:28 | &password [&ref] | provenance |  |
-| test_logging.rs:76:23:76:46 | MacroExpr | test_logging.rs:76:5:76:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:76:39:76:46 | password | test_logging.rs:76:23:76:46 | MacroExpr | provenance |  |
-| test_logging.rs:82:20:82:43 | MacroExpr | test_logging.rs:82:5:82:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:82:36:82:43 | password | test_logging.rs:82:20:82:43 | MacroExpr | provenance |  |
-| test_logging.rs:84:38:84:61 | MacroExpr | test_logging.rs:84:5:84:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:84:54:84:61 | password | test_logging.rs:84:38:84:61 | MacroExpr | provenance |  |
-| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:10 | ...::log | provenance | MaD:12 Sink:MaD:12 Sink:MaD:12 |
-| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:10 | ...::log | provenance | MaD:12 Sink:MaD:12 Sink:MaD:12 Sink:MaD:12 |
-| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | test_logging.rs:85:5:85:10 | ...::log | provenance | MaD:12 Sink:MaD:12 Sink:MaD:12 |
+| test_logging.rs:76:39:76:46 | password | test_logging.rs:76:23:76:46 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:82:36:82:43 | password | test_logging.rs:82:20:82:43 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:84:54:84:61 | password | test_logging.rs:84:38:84:61 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:20:85:28 | &... | provenance | Sink:MaD:12 Sink:MaD:12 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:20:85:28 | &... | provenance | Sink:MaD:12 Sink:MaD:12 Sink:MaD:12 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | test_logging.rs:85:20:85:28 | &... | provenance | Sink:MaD:12 Sink:MaD:12 |
 | test_logging.rs:85:20:85:28 | &password | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0] | provenance |  |
 | test_logging.rs:85:20:85:28 | &password [&ref] | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0, &ref] | provenance |  |
 | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | provenance |  |
 | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0] | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | provenance |  |
 | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:20:85:28 | &password | provenance | Config |
 | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:20:85:28 | &password [&ref] | provenance |  |
-| test_logging.rs:86:20:86:43 | MacroExpr | test_logging.rs:86:5:86:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:86:36:86:43 | password | test_logging.rs:86:20:86:43 | MacroExpr | provenance |  |
-| test_logging.rs:93:9:93:10 | m1 | test_logging.rs:94:11:94:28 | MacroExpr | provenance |  |
+| test_logging.rs:86:36:86:43 | password | test_logging.rs:86:20:86:43 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:93:9:93:10 | m1 | test_logging.rs:94:11:94:28 | MacroExpr | provenance | Sink:MaD:11 |
 | test_logging.rs:93:14:93:22 | &password | test_logging.rs:93:9:93:10 | m1 | provenance |  |
 | test_logging.rs:93:15:93:22 | password | test_logging.rs:93:14:93:22 | &password | provenance | Config |
-| test_logging.rs:94:11:94:28 | MacroExpr | test_logging.rs:94:5:94:9 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:96:9:96:10 | m2 | test_logging.rs:97:11:97:18 | MacroExpr | provenance |  |
+| test_logging.rs:96:9:96:10 | m2 | test_logging.rs:97:11:97:18 | MacroExpr | provenance | Sink:MaD:11 |
 | test_logging.rs:96:14:96:49 | ... + ... | test_logging.rs:96:9:96:10 | m2 | provenance |  |
-| test_logging.rs:96:41:96:49 | &password | test_logging.rs:96:14:96:49 | ... + ... | provenance | MaD:16 |
-| test_logging.rs:96:41:96:49 | &password [&ref] | test_logging.rs:96:14:96:49 | ... + ... | provenance | MaD:16 |
+| test_logging.rs:96:41:96:49 | &password | test_logging.rs:96:14:96:49 | ... + ... | provenance | MaD:15 |
+| test_logging.rs:96:41:96:49 | &password [&ref] | test_logging.rs:96:14:96:49 | ... + ... | provenance | MaD:15 |
 | test_logging.rs:96:42:96:49 | password | test_logging.rs:96:41:96:49 | &password | provenance | Config |
 | test_logging.rs:96:42:96:49 | password | test_logging.rs:96:41:96:49 | &password [&ref] | provenance |  |
-| test_logging.rs:97:11:97:18 | MacroExpr | test_logging.rs:97:5:97:9 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:99:9:99:10 | m3 | test_logging.rs:100:11:100:18 | MacroExpr | provenance |  |
+| test_logging.rs:99:9:99:10 | m3 | test_logging.rs:100:11:100:18 | MacroExpr | provenance | Sink:MaD:11 |
 | test_logging.rs:99:22:99:45 | ...::format(...) | test_logging.rs:99:22:99:45 | { ... } | provenance |  |
 | test_logging.rs:99:22:99:45 | ...::must_use(...) | test_logging.rs:99:9:99:10 | m3 | provenance |  |
-| test_logging.rs:99:22:99:45 | MacroExpr | test_logging.rs:99:22:99:45 | ...::format(...) | provenance | MaD:19 |
-| test_logging.rs:99:22:99:45 | { ... } | test_logging.rs:99:22:99:45 | ...::must_use(...) | provenance | MaD:20 |
+| test_logging.rs:99:22:99:45 | MacroExpr | test_logging.rs:99:22:99:45 | ...::format(...) | provenance | MaD:20 |
+| test_logging.rs:99:22:99:45 | { ... } | test_logging.rs:99:22:99:45 | ...::must_use(...) | provenance | MaD:21 |
 | test_logging.rs:99:38:99:45 | password | test_logging.rs:99:22:99:45 | MacroExpr | provenance |  |
-| test_logging.rs:100:11:100:18 | MacroExpr | test_logging.rs:100:5:100:9 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:118:12:118:41 | MacroExpr | test_logging.rs:118:5:118:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:118:28:118:41 | get_password(...) | test_logging.rs:118:12:118:41 | MacroExpr | provenance |  |
+| test_logging.rs:103:12:103:18 | [post] &mut m4 [&ref] | test_logging.rs:103:17:103:18 | [post] m4 | provenance |  |
+| test_logging.rs:103:17:103:18 | [post] m4 | test_logging.rs:104:11:104:18 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:103:21:103:44 | MacroExpr | test_logging.rs:103:12:103:18 | [post] &mut m4 [&ref] | provenance | MaD:19 |
+| test_logging.rs:103:37:103:44 | password | test_logging.rs:103:21:103:44 | MacroExpr | provenance |  |
+| test_logging.rs:107:14:107:20 | [post] &mut m5 [&ref] | test_logging.rs:107:19:107:20 | [post] m5 | provenance |  |
+| test_logging.rs:107:19:107:20 | [post] m5 | test_logging.rs:108:11:108:18 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:107:23:107:46 | MacroExpr | test_logging.rs:107:14:107:20 | [post] &mut m5 [&ref] | provenance | MaD:19 |
+| test_logging.rs:107:39:107:46 | password | test_logging.rs:107:23:107:46 | MacroExpr | provenance |  |
+| test_logging.rs:118:28:118:41 | get_password(...) | test_logging.rs:118:12:118:41 | MacroExpr | provenance | Sink:MaD:11 |
 | test_logging.rs:129:9:129:10 | t1 [tuple.1] | test_logging.rs:131:28:131:29 | t1 [tuple.1] | provenance |  |
 | test_logging.rs:129:14:129:33 | TupleExpr [tuple.1] | test_logging.rs:129:9:129:10 | t1 [tuple.1] | provenance |  |
 | test_logging.rs:129:25:129:32 | password | test_logging.rs:129:14:129:33 | TupleExpr [tuple.1] | provenance |  |
-| test_logging.rs:131:12:131:31 | MacroExpr | test_logging.rs:131:5:131:10 | ...::log | provenance | MaD:11 Sink:MaD:11 |
 | test_logging.rs:131:28:131:29 | t1 [tuple.1] | test_logging.rs:131:28:131:31 | t1.1 | provenance |  |
-| test_logging.rs:131:28:131:31 | t1.1 | test_logging.rs:131:12:131:31 | MacroExpr | provenance |  |
-| test_logging.rs:141:11:141:37 | MacroExpr | test_logging.rs:141:5:141:9 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:141:27:141:37 | s1.password | test_logging.rs:141:11:141:37 | MacroExpr | provenance |  |
-| test_logging.rs:151:11:151:37 | MacroExpr | test_logging.rs:151:5:151:9 | ...::log | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:151:27:151:37 | s2.password | test_logging.rs:151:11:151:37 | MacroExpr | provenance |  |
-| test_logging.rs:176:33:176:79 | &... | test_logging.rs:176:22:176:31 | log_expect | provenance | MaD:1 Sink:MaD:1 |
-| test_logging.rs:176:33:176:79 | &... [&ref] | test_logging.rs:176:22:176:31 | log_expect | provenance | MaD:1 Sink:MaD:1 |
+| test_logging.rs:131:28:131:31 | t1.1 | test_logging.rs:131:12:131:31 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:141:27:141:37 | s1.password | test_logging.rs:141:11:141:37 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:151:27:151:37 | s2.password | test_logging.rs:151:11:151:37 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:176:33:176:79 | &... | test_logging.rs:176:33:176:79 | &... | provenance | Sink:MaD:1 |
+| test_logging.rs:176:33:176:79 | &... [&ref] | test_logging.rs:176:33:176:79 | &... | provenance | Sink:MaD:1 |
 | test_logging.rs:176:34:176:79 | MacroExpr | test_logging.rs:176:33:176:79 | &... | provenance | Config |
 | test_logging.rs:176:34:176:79 | MacroExpr | test_logging.rs:176:33:176:79 | &... [&ref] | provenance |  |
 | test_logging.rs:176:42:176:78 | ...::format(...) | test_logging.rs:176:42:176:78 | { ... } | provenance |  |
 | test_logging.rs:176:42:176:78 | ...::must_use(...) | test_logging.rs:176:34:176:79 | MacroExpr | provenance |  |
-| test_logging.rs:176:42:176:78 | MacroExpr | test_logging.rs:176:42:176:78 | ...::format(...) | provenance | MaD:19 |
-| test_logging.rs:176:42:176:78 | { ... } | test_logging.rs:176:42:176:78 | ...::must_use(...) | provenance | MaD:20 |
+| test_logging.rs:176:42:176:78 | MacroExpr | test_logging.rs:176:42:176:78 | ...::format(...) | provenance | MaD:20 |
+| test_logging.rs:176:42:176:78 | { ... } | test_logging.rs:176:42:176:78 | ...::must_use(...) | provenance | MaD:21 |
 | test_logging.rs:176:70:176:78 | password2 | test_logging.rs:176:42:176:78 | MacroExpr | provenance |  |
-| test_logging.rs:180:35:180:81 | &... | test_logging.rs:180:24:180:33 | log_expect | provenance | MaD:3 Sink:MaD:3 |
-| test_logging.rs:180:35:180:81 | &... [&ref] | test_logging.rs:180:24:180:33 | log_expect | provenance | MaD:3 Sink:MaD:3 |
+| test_logging.rs:180:35:180:81 | &... | test_logging.rs:180:35:180:81 | &... | provenance | Sink:MaD:3 |
+| test_logging.rs:180:35:180:81 | &... [&ref] | test_logging.rs:180:35:180:81 | &... | provenance | Sink:MaD:3 |
 | test_logging.rs:180:36:180:81 | MacroExpr | test_logging.rs:180:35:180:81 | &... | provenance | Config |
 | test_logging.rs:180:36:180:81 | MacroExpr | test_logging.rs:180:35:180:81 | &... [&ref] | provenance |  |
 | test_logging.rs:180:44:180:80 | ...::format(...) | test_logging.rs:180:44:180:80 | { ... } | provenance |  |
 | test_logging.rs:180:44:180:80 | ...::must_use(...) | test_logging.rs:180:36:180:81 | MacroExpr | provenance |  |
-| test_logging.rs:180:44:180:80 | MacroExpr | test_logging.rs:180:44:180:80 | ...::format(...) | provenance | MaD:19 |
-| test_logging.rs:180:44:180:80 | { ... } | test_logging.rs:180:44:180:80 | ...::must_use(...) | provenance | MaD:20 |
+| test_logging.rs:180:44:180:80 | MacroExpr | test_logging.rs:180:44:180:80 | ...::format(...) | provenance | MaD:20 |
+| test_logging.rs:180:44:180:80 | { ... } | test_logging.rs:180:44:180:80 | ...::must_use(...) | provenance | MaD:21 |
 | test_logging.rs:180:72:180:80 | password2 | test_logging.rs:180:44:180:80 | MacroExpr | provenance |  |
-| test_logging.rs:183:9:183:19 | err_result2 [Err] | test_logging.rs:184:13:184:23 | err_result2 [Err] | provenance |  |
+| test_logging.rs:183:9:183:19 | err_result2 [Err] | test_logging.rs:184:13:184:23 | err_result2 | provenance | Sink:MaD:4 |
 | test_logging.rs:183:47:183:68 | Err(...) [Err] | test_logging.rs:183:9:183:19 | err_result2 [Err] | provenance |  |
-| test_logging.rs:183:51:183:59 | password2 | test_logging.rs:183:51:183:67 | password2.clone() | provenance | MaD:15 |
+| test_logging.rs:183:51:183:59 | password2 | test_logging.rs:183:51:183:67 | password2.clone() | provenance | MaD:18 |
 | test_logging.rs:183:51:183:67 | password2.clone() | test_logging.rs:183:47:183:68 | Err(...) [Err] | provenance |  |
-| test_logging.rs:184:13:184:23 | err_result2 [Err] | test_logging.rs:184:25:184:34 | log_expect | provenance | MaD:4 Sink:MaD:4 |
-| test_logging.rs:187:9:187:19 | err_result3 [Err] | test_logging.rs:188:13:188:23 | err_result3 [Err] | provenance |  |
+| test_logging.rs:187:9:187:19 | err_result3 [Err] | test_logging.rs:188:13:188:23 | err_result3 | provenance | Sink:MaD:5 |
 | test_logging.rs:187:47:187:60 | Err(...) [Err] | test_logging.rs:187:9:187:19 | err_result3 [Err] | provenance |  |
 | test_logging.rs:187:51:187:59 | password2 | test_logging.rs:187:47:187:60 | Err(...) [Err] | provenance |  |
-| test_logging.rs:188:13:188:23 | err_result3 [Err] | test_logging.rs:188:25:188:34 | log_unwrap | provenance | MaD:5 Sink:MaD:5 |
-| test_logging.rs:192:12:192:37 | MacroExpr | test_logging.rs:192:5:192:10 | ...::_print | provenance | MaD:14 Sink:MaD:14 |
-| test_logging.rs:192:30:192:37 | password | test_logging.rs:192:12:192:37 | MacroExpr | provenance |  |
-| test_logging.rs:193:14:193:37 | MacroExpr | test_logging.rs:193:5:193:12 | ...::_print | provenance | MaD:14 Sink:MaD:14 |
-| test_logging.rs:193:30:193:37 | password | test_logging.rs:193:14:193:37 | MacroExpr | provenance |  |
-| test_logging.rs:194:13:194:38 | MacroExpr | test_logging.rs:194:5:194:11 | ...::_eprint | provenance | MaD:13 Sink:MaD:13 |
-| test_logging.rs:194:31:194:38 | password | test_logging.rs:194:13:194:38 | MacroExpr | provenance |  |
-| test_logging.rs:195:15:195:38 | MacroExpr | test_logging.rs:195:5:195:13 | ...::_eprint | provenance | MaD:13 Sink:MaD:13 |
-| test_logging.rs:195:31:195:38 | password | test_logging.rs:195:15:195:38 | MacroExpr | provenance |  |
-| test_logging.rs:199:20:199:43 | MacroExpr | test_logging.rs:199:13:199:18 | ...::panic_fmt | provenance | MaD:10 Sink:MaD:10 |
-| test_logging.rs:199:36:199:43 | password | test_logging.rs:199:20:199:43 | MacroExpr | provenance |  |
-| test_logging.rs:202:19:202:42 | MacroExpr | test_logging.rs:202:13:202:17 | ...::panic_fmt | provenance | MaD:10 Sink:MaD:10 |
-| test_logging.rs:202:35:202:42 | password | test_logging.rs:202:19:202:42 | MacroExpr | provenance |  |
-| test_logging.rs:205:28:205:51 | MacroExpr | test_logging.rs:205:13:205:26 | ...::panic_fmt | provenance | MaD:10 Sink:MaD:10 |
-| test_logging.rs:205:44:205:51 | password | test_logging.rs:205:28:205:51 | MacroExpr | provenance |  |
-| test_logging.rs:208:26:208:49 | MacroExpr | test_logging.rs:208:13:208:24 | ...::panic_fmt | provenance | MaD:10 Sink:MaD:10 |
-| test_logging.rs:208:42:208:49 | password | test_logging.rs:208:26:208:49 | MacroExpr | provenance |  |
-| test_logging.rs:211:28:211:51 | MacroExpr | test_logging.rs:211:13:211:19 | ...::panic_fmt | provenance | MaD:10 Sink:MaD:10 |
-| test_logging.rs:211:44:211:51 | password | test_logging.rs:211:28:211:51 | MacroExpr | provenance |  |
-| test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | test_logging.rs:214:13:214:22 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:192:30:192:37 | password | test_logging.rs:192:12:192:37 | MacroExpr | provenance | Sink:MaD:14 |
+| test_logging.rs:193:30:193:37 | password | test_logging.rs:193:14:193:37 | MacroExpr | provenance | Sink:MaD:14 |
+| test_logging.rs:194:31:194:38 | password | test_logging.rs:194:13:194:38 | MacroExpr | provenance | Sink:MaD:13 |
+| test_logging.rs:195:31:195:38 | password | test_logging.rs:195:15:195:38 | MacroExpr | provenance | Sink:MaD:13 |
+| test_logging.rs:199:36:199:43 | password | test_logging.rs:199:20:199:43 | MacroExpr | provenance | Sink:MaD:10 |
+| test_logging.rs:202:35:202:42 | password | test_logging.rs:202:19:202:42 | MacroExpr | provenance | Sink:MaD:10 |
+| test_logging.rs:205:44:205:51 | password | test_logging.rs:205:28:205:51 | MacroExpr | provenance | Sink:MaD:10 |
+| test_logging.rs:208:42:208:49 | password | test_logging.rs:208:26:208:49 | MacroExpr | provenance | Sink:MaD:10 |
+| test_logging.rs:211:44:211:51 | password | test_logging.rs:211:28:211:51 | MacroExpr | provenance | Sink:MaD:10 |
+| test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | test_logging.rs:214:30:214:53 | ...::Some(...) | provenance | Sink:MaD:9 |
 | test_logging.rs:214:30:214:53 | MacroExpr | test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | provenance |  |
 | test_logging.rs:214:46:214:53 | password | test_logging.rs:214:30:214:53 | MacroExpr | provenance |  |
-| test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | test_logging.rs:217:13:217:22 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | test_logging.rs:217:30:217:53 | ...::Some(...) | provenance | Sink:MaD:9 |
 | test_logging.rs:217:30:217:53 | MacroExpr | test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | provenance |  |
 | test_logging.rs:217:46:217:53 | password | test_logging.rs:217:30:217:53 | MacroExpr | provenance |  |
-| test_logging.rs:220:34:220:57 | MacroExpr | test_logging.rs:220:13:220:25 | ...::panic_fmt | provenance | MaD:10 Sink:MaD:10 |
-| test_logging.rs:220:50:220:57 | password | test_logging.rs:220:34:220:57 | MacroExpr | provenance |  |
-| test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | test_logging.rs:223:13:223:28 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:220:50:220:57 | password | test_logging.rs:220:34:220:57 | MacroExpr | provenance | Sink:MaD:10 |
+| test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | test_logging.rs:223:36:223:59 | ...::Some(...) | provenance | Sink:MaD:9 |
 | test_logging.rs:223:36:223:59 | MacroExpr | test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | provenance |  |
 | test_logging.rs:223:52:223:59 | password | test_logging.rs:223:36:223:59 | MacroExpr | provenance |  |
-| test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | test_logging.rs:226:13:226:28 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | test_logging.rs:226:36:226:59 | ...::Some(...) | provenance | Sink:MaD:9 |
 | test_logging.rs:226:36:226:59 | MacroExpr | test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | provenance |  |
 | test_logging.rs:226:52:226:59 | password | test_logging.rs:226:36:226:59 | MacroExpr | provenance |  |
-| test_logging.rs:229:30:229:62 | MacroExpr | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | provenance | MaD:18 |
-| test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | test_logging.rs:229:23:229:28 | expect | provenance | MaD:2 Sink:MaD:2 |
+| test_logging.rs:229:30:229:62 | MacroExpr | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | provenance | MaD:17 |
+| test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | test_logging.rs:229:30:229:71 | ... .as_str() | provenance | Sink:MaD:2 |
 | test_logging.rs:229:38:229:61 | ...::format(...) | test_logging.rs:229:38:229:61 | { ... } | provenance |  |
 | test_logging.rs:229:38:229:61 | ...::must_use(...) | test_logging.rs:229:30:229:62 | MacroExpr | provenance |  |
-| test_logging.rs:229:38:229:61 | MacroExpr | test_logging.rs:229:38:229:61 | ...::format(...) | provenance | MaD:19 |
-| test_logging.rs:229:38:229:61 | { ... } | test_logging.rs:229:38:229:61 | ...::must_use(...) | provenance | MaD:20 |
+| test_logging.rs:229:38:229:61 | MacroExpr | test_logging.rs:229:38:229:61 | ...::format(...) | provenance | MaD:20 |
+| test_logging.rs:229:38:229:61 | { ... } | test_logging.rs:229:38:229:61 | ...::must_use(...) | provenance | MaD:21 |
 | test_logging.rs:229:54:229:61 | password | test_logging.rs:229:38:229:61 | MacroExpr | provenance |  |
-| test_logging.rs:242:16:242:50 | MacroExpr | test_logging.rs:242:16:242:61 | ... .as_bytes() [&ref, element] | provenance | MaD:17 |
-| test_logging.rs:242:16:242:61 | ... .as_bytes() [&ref, element] | test_logging.rs:242:10:242:14 | write | provenance | MaD:7 Sink:MaD:7 Sink:MaD:7 |
+| test_logging.rs:242:16:242:50 | MacroExpr | test_logging.rs:242:16:242:61 | ... .as_bytes() [&ref, element] | provenance | MaD:16 |
+| test_logging.rs:242:16:242:61 | ... .as_bytes() [&ref, element] | test_logging.rs:242:16:242:61 | ... .as_bytes() | provenance | Sink:MaD:7 Sink:MaD:7 |
 | test_logging.rs:242:24:242:49 | ...::format(...) | test_logging.rs:242:24:242:49 | { ... } | provenance |  |
 | test_logging.rs:242:24:242:49 | ...::must_use(...) | test_logging.rs:242:16:242:50 | MacroExpr | provenance |  |
-| test_logging.rs:242:24:242:49 | MacroExpr | test_logging.rs:242:24:242:49 | ...::format(...) | provenance | MaD:19 |
-| test_logging.rs:242:24:242:49 | { ... } | test_logging.rs:242:24:242:49 | ...::must_use(...) | provenance | MaD:20 |
+| test_logging.rs:242:24:242:49 | MacroExpr | test_logging.rs:242:24:242:49 | ...::format(...) | provenance | MaD:20 |
+| test_logging.rs:242:24:242:49 | { ... } | test_logging.rs:242:24:242:49 | ...::must_use(...) | provenance | MaD:21 |
 | test_logging.rs:242:42:242:49 | password | test_logging.rs:242:24:242:49 | MacroExpr | provenance |  |
-| test_logging.rs:245:20:245:54 | MacroExpr | test_logging.rs:245:20:245:65 | ... .as_bytes() [&ref, element] | provenance | MaD:17 |
-| test_logging.rs:245:20:245:65 | ... .as_bytes() [&ref, element] | test_logging.rs:245:10:245:18 | write_all | provenance | MaD:8 Sink:MaD:8 Sink:MaD:8 |
+| test_logging.rs:245:20:245:54 | MacroExpr | test_logging.rs:245:20:245:65 | ... .as_bytes() [&ref, element] | provenance | MaD:16 |
+| test_logging.rs:245:20:245:65 | ... .as_bytes() [&ref, element] | test_logging.rs:245:20:245:65 | ... .as_bytes() | provenance | Sink:MaD:8 Sink:MaD:8 |
 | test_logging.rs:245:28:245:53 | ...::format(...) | test_logging.rs:245:28:245:53 | { ... } | provenance |  |
 | test_logging.rs:245:28:245:53 | ...::must_use(...) | test_logging.rs:245:20:245:54 | MacroExpr | provenance |  |
-| test_logging.rs:245:28:245:53 | MacroExpr | test_logging.rs:245:28:245:53 | ...::format(...) | provenance | MaD:19 |
-| test_logging.rs:245:28:245:53 | { ... } | test_logging.rs:245:28:245:53 | ...::must_use(...) | provenance | MaD:20 |
+| test_logging.rs:245:28:245:53 | MacroExpr | test_logging.rs:245:28:245:53 | ...::format(...) | provenance | MaD:20 |
+| test_logging.rs:245:28:245:53 | { ... } | test_logging.rs:245:28:245:53 | ...::must_use(...) | provenance | MaD:21 |
 | test_logging.rs:245:46:245:53 | password | test_logging.rs:245:28:245:53 | MacroExpr | provenance |  |
-| test_logging.rs:248:15:248:49 | MacroExpr | test_logging.rs:248:15:248:60 | ... .as_bytes() [&ref, element] | provenance | MaD:17 |
-| test_logging.rs:248:15:248:60 | ... .as_bytes() [&ref, element] | test_logging.rs:248:9:248:13 | write | provenance | MaD:7 Sink:MaD:7 Sink:MaD:7 |
+| test_logging.rs:248:15:248:49 | MacroExpr | test_logging.rs:248:15:248:60 | ... .as_bytes() [&ref, element] | provenance | MaD:16 |
+| test_logging.rs:248:15:248:60 | ... .as_bytes() [&ref, element] | test_logging.rs:248:15:248:60 | ... .as_bytes() | provenance | Sink:MaD:7 Sink:MaD:7 |
 | test_logging.rs:248:23:248:48 | ...::format(...) | test_logging.rs:248:23:248:48 | { ... } | provenance |  |
 | test_logging.rs:248:23:248:48 | ...::must_use(...) | test_logging.rs:248:15:248:49 | MacroExpr | provenance |  |
-| test_logging.rs:248:23:248:48 | MacroExpr | test_logging.rs:248:23:248:48 | ...::format(...) | provenance | MaD:19 |
-| test_logging.rs:248:23:248:48 | { ... } | test_logging.rs:248:23:248:48 | ...::must_use(...) | provenance | MaD:20 |
+| test_logging.rs:248:23:248:48 | MacroExpr | test_logging.rs:248:23:248:48 | ...::format(...) | provenance | MaD:20 |
+| test_logging.rs:248:23:248:48 | { ... } | test_logging.rs:248:23:248:48 | ...::must_use(...) | provenance | MaD:21 |
 | test_logging.rs:248:41:248:48 | password | test_logging.rs:248:23:248:48 | MacroExpr | provenance |  |
-| test_logging.rs:251:15:251:49 | MacroExpr | test_logging.rs:251:15:251:60 | ... .as_bytes() [&ref, element] | provenance | MaD:17 |
-| test_logging.rs:251:15:251:60 | ... .as_bytes() [&ref, element] | test_logging.rs:251:9:251:13 | write | provenance | MaD:6 Sink:MaD:6 Sink:MaD:6 |
+| test_logging.rs:251:15:251:49 | MacroExpr | test_logging.rs:251:15:251:60 | ... .as_bytes() [&ref, element] | provenance | MaD:16 |
+| test_logging.rs:251:15:251:60 | ... .as_bytes() [&ref, element] | test_logging.rs:251:15:251:60 | ... .as_bytes() | provenance | Sink:MaD:6 Sink:MaD:6 |
 | test_logging.rs:251:23:251:48 | ...::format(...) | test_logging.rs:251:23:251:48 | { ... } | provenance |  |
 | test_logging.rs:251:23:251:48 | ...::must_use(...) | test_logging.rs:251:15:251:49 | MacroExpr | provenance |  |
-| test_logging.rs:251:23:251:48 | MacroExpr | test_logging.rs:251:23:251:48 | ...::format(...) | provenance | MaD:19 |
-| test_logging.rs:251:23:251:48 | { ... } | test_logging.rs:251:23:251:48 | ...::must_use(...) | provenance | MaD:20 |
+| test_logging.rs:251:23:251:48 | MacroExpr | test_logging.rs:251:23:251:48 | ...::format(...) | provenance | MaD:20 |
+| test_logging.rs:251:23:251:48 | { ... } | test_logging.rs:251:23:251:48 | ...::must_use(...) | provenance | MaD:21 |
 | test_logging.rs:251:41:251:48 | password | test_logging.rs:251:23:251:48 | MacroExpr | provenance |  |
+| test_logging.rs:289:9:289:13 | value | test_logging.rs:290:11:290:31 | MacroExpr | provenance | Sink:MaD:11 |
+| test_logging.rs:289:17:289:39 | get_password_or_error(...) | test_logging.rs:289:9:289:13 | value | provenance |  |
 models
 | 1 | Sink: <core::option::Option as log_err::LogErrOption>::log_expect; Argument[0]; log-injection |
 | 2 | Sink: <core::option::Option>::expect; Argument[0]; log-injection |
 | 3 | Sink: <core::result::Result as log_err::LogErrResult>::log_expect; Argument[0]; log-injection |
 | 4 | Sink: <core::result::Result as log_err::LogErrResult>::log_expect; Argument[self].Field[core::result::Result::Err(0)]; log-injection |
 | 5 | Sink: <core::result::Result as log_err::LogErrResult>::log_unwrap; Argument[self].Field[core::result::Result::Err(0)]; log-injection |
-| 6 | Sink: <std::io::stdio::StderrLock as std::io::Write>::write; Argument[0]; log-injection |
-| 7 | Sink: <std::io::stdio::StdoutLock as std::io::Write>::write; Argument[0]; log-injection |
-| 8 | Sink: <std::io::stdio::StdoutLock as std::io::Write>::write_all; Argument[0]; log-injection |
+| 6 | Sink: <std::io::stdio::StderrLock as core::io::write::Write>::write; Argument[0]; log-injection |
+| 7 | Sink: <std::io::stdio::StdoutLock as core::io::write::Write>::write; Argument[0]; log-injection |
+| 8 | Sink: <std::io::stdio::StdoutLock as core::io::write::Write>::write_all; Argument[0]; log-injection |
 | 9 | Sink: core::panicking::assert_failed; Argument[3].Field[core::option::Option::Some(0)]; log-injection |
 | 10 | Sink: core::panicking::panic_fmt; Argument[0]; log-injection |
 | 11 | Sink: log::__private_api::log; Argument[1]; log-injection |
 | 12 | Sink: log::__private_api::log; Argument[3]; log-injection |
 | 13 | Sink: std::io::stdio::_eprint; Argument[0]; log-injection |
 | 14 | Sink: std::io::stdio::_print; Argument[0]; log-injection |
-| 15 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
-| 16 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
-| 17 | Summary: <alloc::string::String>::as_bytes; Argument[self].Reference; ReturnValue.Reference.Element; taint |
-| 18 | Summary: <alloc::string::String>::as_str; Argument[self].Reference; ReturnValue.Reference; taint |
-| 19 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
-| 20 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
+| 15 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
+| 16 | Summary: <alloc::string::String>::as_bytes; Argument[self].Reference; ReturnValue.Reference.Element; taint |
+| 17 | Summary: <alloc::string::String>::as_str; Argument[self].Reference; ReturnValue.Reference; taint |
+| 18 | Summary: <core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 19 | Summary: <core::fmt::Write>::write_fmt; Argument[0]; Argument[self].Reference; taint |
+| 20 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
+| 21 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
-| test_logging.rs:42:5:42:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:42:12:42:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:42:28:42:35 | password | semmle.label | password |
-| test_logging.rs:43:5:43:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:43:12:43:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:43:28:43:35 | password | semmle.label | password |
-| test_logging.rs:44:5:44:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:44:11:44:34 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:44:27:44:34 | password | semmle.label | password |
-| test_logging.rs:45:5:45:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:45:12:45:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:45:28:45:35 | password | semmle.label | password |
-| test_logging.rs:46:5:46:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:46:11:46:34 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:46:27:46:34 | password | semmle.label | password |
-| test_logging.rs:47:5:47:8 | ...::log | semmle.label | ...::log |
 | test_logging.rs:47:24:47:47 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:47:40:47:47 | password | semmle.label | password |
-| test_logging.rs:52:5:52:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:52:12:52:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:52:28:52:35 | password | semmle.label | password |
-| test_logging.rs:54:5:54:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:54:12:54:48 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:54:41:54:48 | password | semmle.label | password |
-| test_logging.rs:56:5:56:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:56:12:56:46 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:56:39:56:46 | password | semmle.label | password |
-| test_logging.rs:57:5:57:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:57:12:57:33 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:57:24:57:31 | password | semmle.label | password |
-| test_logging.rs:58:5:58:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:58:12:58:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:58:24:58:31 | password | semmle.label | password |
-| test_logging.rs:60:5:60:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:60:30:60:53 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:60:46:60:53 | password | semmle.label | password |
-| test_logging.rs:61:5:61:10 | ...::log | semmle.label | ...::log |
+| test_logging.rs:61:20:61:28 | &... | semmle.label | &... |
 | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
 | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
 | test_logging.rs:61:20:61:28 | &password | semmle.label | &password |
@@ -320,13 +283,11 @@ nodes
 | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
 | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
 | test_logging.rs:61:21:61:28 | password | semmle.label | password |
-| test_logging.rs:65:5:65:8 | ...::log | semmle.label | ...::log |
 | test_logging.rs:65:24:65:47 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:65:40:65:47 | password | semmle.label | password |
-| test_logging.rs:67:5:67:8 | ...::log | semmle.label | ...::log |
 | test_logging.rs:67:42:67:65 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:67:58:67:65 | password | semmle.label | password |
-| test_logging.rs:68:5:68:8 | ...::log | semmle.label | ...::log |
+| test_logging.rs:68:18:68:26 | &... | semmle.label | &... |
 | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
 | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
 | test_logging.rs:68:18:68:26 | &password | semmle.label | &password |
@@ -334,13 +295,11 @@ nodes
 | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
 | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
 | test_logging.rs:68:19:68:26 | password | semmle.label | password |
-| test_logging.rs:72:5:72:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:72:23:72:46 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:72:39:72:46 | password | semmle.label | password |
-| test_logging.rs:74:5:74:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:74:41:74:64 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:74:57:74:64 | password | semmle.label | password |
-| test_logging.rs:75:5:75:10 | ...::log | semmle.label | ...::log |
+| test_logging.rs:75:20:75:28 | &... | semmle.label | &... |
 | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
 | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
 | test_logging.rs:75:20:75:28 | &password | semmle.label | &password |
@@ -348,16 +307,13 @@ nodes
 | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
 | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
 | test_logging.rs:75:21:75:28 | password | semmle.label | password |
-| test_logging.rs:76:5:76:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:76:23:76:46 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:76:39:76:46 | password | semmle.label | password |
-| test_logging.rs:82:5:82:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:82:20:82:43 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:82:36:82:43 | password | semmle.label | password |
-| test_logging.rs:84:5:84:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:84:38:84:61 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:84:54:84:61 | password | semmle.label | password |
-| test_logging.rs:85:5:85:10 | ...::log | semmle.label | ...::log |
+| test_logging.rs:85:20:85:28 | &... | semmle.label | &... |
 | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
 | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
 | test_logging.rs:85:20:85:28 | &password | semmle.label | &password |
@@ -365,20 +321,17 @@ nodes
 | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
 | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
 | test_logging.rs:85:21:85:28 | password | semmle.label | password |
-| test_logging.rs:86:5:86:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:86:20:86:43 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:86:36:86:43 | password | semmle.label | password |
 | test_logging.rs:93:9:93:10 | m1 | semmle.label | m1 |
 | test_logging.rs:93:14:93:22 | &password | semmle.label | &password |
 | test_logging.rs:93:15:93:22 | password | semmle.label | password |
-| test_logging.rs:94:5:94:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:94:11:94:28 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:96:9:96:10 | m2 | semmle.label | m2 |
 | test_logging.rs:96:14:96:49 | ... + ... | semmle.label | ... + ... |
 | test_logging.rs:96:41:96:49 | &password | semmle.label | &password |
 | test_logging.rs:96:41:96:49 | &password [&ref] | semmle.label | &password [&ref] |
 | test_logging.rs:96:42:96:49 | password | semmle.label | password |
-| test_logging.rs:97:5:97:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:97:11:97:18 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:99:9:99:10 | m3 | semmle.label | m3 |
 | test_logging.rs:99:22:99:45 | ...::format(...) | semmle.label | ...::format(...) |
@@ -386,25 +339,30 @@ nodes
 | test_logging.rs:99:22:99:45 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:99:22:99:45 | { ... } | semmle.label | { ... } |
 | test_logging.rs:99:38:99:45 | password | semmle.label | password |
-| test_logging.rs:100:5:100:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:100:11:100:18 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:118:5:118:10 | ...::log | semmle.label | ...::log |
+| test_logging.rs:103:12:103:18 | [post] &mut m4 [&ref] | semmle.label | [post] &mut m4 [&ref] |
+| test_logging.rs:103:17:103:18 | [post] m4 | semmle.label | [post] m4 |
+| test_logging.rs:103:21:103:44 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:103:37:103:44 | password | semmle.label | password |
+| test_logging.rs:104:11:104:18 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:107:14:107:20 | [post] &mut m5 [&ref] | semmle.label | [post] &mut m5 [&ref] |
+| test_logging.rs:107:19:107:20 | [post] m5 | semmle.label | [post] m5 |
+| test_logging.rs:107:23:107:46 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:107:39:107:46 | password | semmle.label | password |
+| test_logging.rs:108:11:108:18 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:118:12:118:41 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:118:28:118:41 | get_password(...) | semmle.label | get_password(...) |
 | test_logging.rs:129:9:129:10 | t1 [tuple.1] | semmle.label | t1 [tuple.1] |
 | test_logging.rs:129:14:129:33 | TupleExpr [tuple.1] | semmle.label | TupleExpr [tuple.1] |
 | test_logging.rs:129:25:129:32 | password | semmle.label | password |
-| test_logging.rs:131:5:131:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:131:12:131:31 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:131:28:131:29 | t1 [tuple.1] | semmle.label | t1 [tuple.1] |
 | test_logging.rs:131:28:131:31 | t1.1 | semmle.label | t1.1 |
-| test_logging.rs:141:5:141:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:141:11:141:37 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:141:27:141:37 | s1.password | semmle.label | s1.password |
-| test_logging.rs:151:5:151:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:151:11:151:37 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:151:27:151:37 | s2.password | semmle.label | s2.password |
-| test_logging.rs:176:22:176:31 | log_expect | semmle.label | log_expect |
+| test_logging.rs:176:33:176:79 | &... | semmle.label | &... |
 | test_logging.rs:176:33:176:79 | &... | semmle.label | &... |
 | test_logging.rs:176:33:176:79 | &... [&ref] | semmle.label | &... [&ref] |
 | test_logging.rs:176:34:176:79 | MacroExpr | semmle.label | MacroExpr |
@@ -413,7 +371,7 @@ nodes
 | test_logging.rs:176:42:176:78 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:176:42:176:78 | { ... } | semmle.label | { ... } |
 | test_logging.rs:176:70:176:78 | password2 | semmle.label | password2 |
-| test_logging.rs:180:24:180:33 | log_expect | semmle.label | log_expect |
+| test_logging.rs:180:35:180:81 | &... | semmle.label | &... |
 | test_logging.rs:180:35:180:81 | &... | semmle.label | &... |
 | test_logging.rs:180:35:180:81 | &... [&ref] | semmle.label | &... [&ref] |
 | test_logging.rs:180:36:180:81 | MacroExpr | semmle.label | MacroExpr |
@@ -426,97 +384,88 @@ nodes
 | test_logging.rs:183:47:183:68 | Err(...) [Err] | semmle.label | Err(...) [Err] |
 | test_logging.rs:183:51:183:59 | password2 | semmle.label | password2 |
 | test_logging.rs:183:51:183:67 | password2.clone() | semmle.label | password2.clone() |
-| test_logging.rs:184:13:184:23 | err_result2 [Err] | semmle.label | err_result2 [Err] |
-| test_logging.rs:184:25:184:34 | log_expect | semmle.label | log_expect |
+| test_logging.rs:184:13:184:23 | err_result2 | semmle.label | err_result2 |
 | test_logging.rs:187:9:187:19 | err_result3 [Err] | semmle.label | err_result3 [Err] |
 | test_logging.rs:187:47:187:60 | Err(...) [Err] | semmle.label | Err(...) [Err] |
 | test_logging.rs:187:51:187:59 | password2 | semmle.label | password2 |
-| test_logging.rs:188:13:188:23 | err_result3 [Err] | semmle.label | err_result3 [Err] |
-| test_logging.rs:188:25:188:34 | log_unwrap | semmle.label | log_unwrap |
-| test_logging.rs:192:5:192:10 | ...::_print | semmle.label | ...::_print |
+| test_logging.rs:188:13:188:23 | err_result3 | semmle.label | err_result3 |
 | test_logging.rs:192:12:192:37 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:192:30:192:37 | password | semmle.label | password |
-| test_logging.rs:193:5:193:12 | ...::_print | semmle.label | ...::_print |
 | test_logging.rs:193:14:193:37 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:193:30:193:37 | password | semmle.label | password |
-| test_logging.rs:194:5:194:11 | ...::_eprint | semmle.label | ...::_eprint |
 | test_logging.rs:194:13:194:38 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:194:31:194:38 | password | semmle.label | password |
-| test_logging.rs:195:5:195:13 | ...::_eprint | semmle.label | ...::_eprint |
 | test_logging.rs:195:15:195:38 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:195:31:195:38 | password | semmle.label | password |
-| test_logging.rs:199:13:199:18 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:199:20:199:43 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:199:36:199:43 | password | semmle.label | password |
-| test_logging.rs:202:13:202:17 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:202:19:202:42 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:202:35:202:42 | password | semmle.label | password |
-| test_logging.rs:205:13:205:26 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:205:28:205:51 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:205:44:205:51 | password | semmle.label | password |
-| test_logging.rs:208:13:208:24 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:208:26:208:49 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:208:42:208:49 | password | semmle.label | password |
-| test_logging.rs:211:13:211:19 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:211:28:211:51 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:211:44:211:51 | password | semmle.label | password |
-| test_logging.rs:214:13:214:22 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:214:30:214:53 | ...::Some(...) | semmle.label | ...::Some(...) |
 | test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
 | test_logging.rs:214:30:214:53 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:214:46:214:53 | password | semmle.label | password |
-| test_logging.rs:217:13:217:22 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:217:30:217:53 | ...::Some(...) | semmle.label | ...::Some(...) |
 | test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
 | test_logging.rs:217:30:217:53 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:217:46:217:53 | password | semmle.label | password |
-| test_logging.rs:220:13:220:25 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:220:34:220:57 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:220:50:220:57 | password | semmle.label | password |
-| test_logging.rs:223:13:223:28 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:223:36:223:59 | ...::Some(...) | semmle.label | ...::Some(...) |
 | test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
 | test_logging.rs:223:36:223:59 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:223:52:223:59 | password | semmle.label | password |
-| test_logging.rs:226:13:226:28 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:226:36:226:59 | ...::Some(...) | semmle.label | ...::Some(...) |
 | test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
 | test_logging.rs:226:36:226:59 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:226:52:226:59 | password | semmle.label | password |
-| test_logging.rs:229:23:229:28 | expect | semmle.label | expect |
 | test_logging.rs:229:30:229:62 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:229:30:229:71 | ... .as_str() | semmle.label | ... .as_str() |
 | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | semmle.label | ... .as_str() [&ref] |
 | test_logging.rs:229:38:229:61 | ...::format(...) | semmle.label | ...::format(...) |
 | test_logging.rs:229:38:229:61 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | test_logging.rs:229:38:229:61 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:229:38:229:61 | { ... } | semmle.label | { ... } |
 | test_logging.rs:229:54:229:61 | password | semmle.label | password |
-| test_logging.rs:242:10:242:14 | write | semmle.label | write |
 | test_logging.rs:242:16:242:50 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:242:16:242:61 | ... .as_bytes() | semmle.label | ... .as_bytes() |
 | test_logging.rs:242:16:242:61 | ... .as_bytes() [&ref, element] | semmle.label | ... .as_bytes() [&ref, element] |
 | test_logging.rs:242:24:242:49 | ...::format(...) | semmle.label | ...::format(...) |
 | test_logging.rs:242:24:242:49 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | test_logging.rs:242:24:242:49 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:242:24:242:49 | { ... } | semmle.label | { ... } |
 | test_logging.rs:242:42:242:49 | password | semmle.label | password |
-| test_logging.rs:245:10:245:18 | write_all | semmle.label | write_all |
 | test_logging.rs:245:20:245:54 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:245:20:245:65 | ... .as_bytes() | semmle.label | ... .as_bytes() |
 | test_logging.rs:245:20:245:65 | ... .as_bytes() [&ref, element] | semmle.label | ... .as_bytes() [&ref, element] |
 | test_logging.rs:245:28:245:53 | ...::format(...) | semmle.label | ...::format(...) |
 | test_logging.rs:245:28:245:53 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | test_logging.rs:245:28:245:53 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:245:28:245:53 | { ... } | semmle.label | { ... } |
 | test_logging.rs:245:46:245:53 | password | semmle.label | password |
-| test_logging.rs:248:9:248:13 | write | semmle.label | write |
 | test_logging.rs:248:15:248:49 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:248:15:248:60 | ... .as_bytes() | semmle.label | ... .as_bytes() |
 | test_logging.rs:248:15:248:60 | ... .as_bytes() [&ref, element] | semmle.label | ... .as_bytes() [&ref, element] |
 | test_logging.rs:248:23:248:48 | ...::format(...) | semmle.label | ...::format(...) |
 | test_logging.rs:248:23:248:48 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | test_logging.rs:248:23:248:48 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:248:23:248:48 | { ... } | semmle.label | { ... } |
 | test_logging.rs:248:41:248:48 | password | semmle.label | password |
-| test_logging.rs:251:9:251:13 | write | semmle.label | write |
 | test_logging.rs:251:15:251:49 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:251:15:251:60 | ... .as_bytes() | semmle.label | ... .as_bytes() |
 | test_logging.rs:251:15:251:60 | ... .as_bytes() [&ref, element] | semmle.label | ... .as_bytes() [&ref, element] |
 | test_logging.rs:251:23:251:48 | ...::format(...) | semmle.label | ...::format(...) |
 | test_logging.rs:251:23:251:48 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | test_logging.rs:251:23:251:48 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:251:23:251:48 | { ... } | semmle.label | { ... } |
 | test_logging.rs:251:41:251:48 | password | semmle.label | password |
+| test_logging.rs:289:9:289:13 | value | semmle.label | value |
+| test_logging.rs:289:17:289:39 | get_password_or_error(...) | semmle.label | get_password_or_error(...) |
+| test_logging.rs:290:11:290:31 | MacroExpr | semmle.label | MacroExpr |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-312/CleartextStorageDatabase.expected b/rust/ql/test/query-tests/security/CWE-312/CleartextStorageDatabase.expected
index 732b422c65f2..920ce2e00c27 100644
--- a/rust/ql/test/query-tests/security/CWE-312/CleartextStorageDatabase.expected
+++ b/rust/ql/test/query-tests/security/CWE-312/CleartextStorageDatabase.expected
@@ -1,12 +1,12 @@
 #select
-| test_storage.rs:100:13:100:23 | ...::query | test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:100:13:100:23 | ...::query | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:71:97:71:114 | get_phone_number(...) | get_phone_number(...) |
-| test_storage.rs:115:13:115:25 | ...::raw_sql | test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:115:13:115:25 | ...::raw_sql | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:71:97:71:114 | get_phone_number(...) | get_phone_number(...) |
-| test_storage.rs:119:13:119:23 | ...::query | test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:119:13:119:23 | ...::query | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:71:97:71:114 | get_phone_number(...) | get_phone_number(...) |
-| test_storage.rs:125:13:125:23 | ...::query | test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:125:13:125:23 | ...::query | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:71:97:71:114 | get_phone_number(...) | get_phone_number(...) |
-| test_storage.rs:139:13:139:23 | ...::query | test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:139:13:139:23 | ...::query | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:71:97:71:114 | get_phone_number(...) | get_phone_number(...) |
-| test_storage.rs:194:16:194:22 | execute | test_storage.rs:189:100:189:117 | get_phone_number(...) | test_storage.rs:194:16:194:22 | execute | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:189:100:189:117 | get_phone_number(...) | get_phone_number(...) |
-| test_storage.rs:196:24:196:32 | query_row | test_storage.rs:190:86:190:103 | get_phone_number(...) | test_storage.rs:196:24:196:32 | query_row | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:190:86:190:103 | get_phone_number(...) | get_phone_number(...) |
-| test_storage.rs:204:31:204:37 | prepare | test_storage.rs:190:86:190:103 | get_phone_number(...) | test_storage.rs:204:31:204:37 | prepare | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:190:86:190:103 | get_phone_number(...) | get_phone_number(...) |
+| test_storage.rs:100:25:100:46 | insert_query2.as_str() | test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:100:25:100:46 | insert_query2.as_str() | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:71:97:71:114 | get_phone_number(...) | get_phone_number(...) |
+| test_storage.rs:115:27:115:48 | insert_query2.as_str() | test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:115:27:115:48 | insert_query2.as_str() | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:71:97:71:114 | get_phone_number(...) | get_phone_number(...) |
+| test_storage.rs:119:25:119:46 | insert_query2.as_str() | test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:119:25:119:46 | insert_query2.as_str() | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:71:97:71:114 | get_phone_number(...) | get_phone_number(...) |
+| test_storage.rs:125:25:125:46 | insert_query2.as_str() | test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:125:25:125:46 | insert_query2.as_str() | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:71:97:71:114 | get_phone_number(...) | get_phone_number(...) |
+| test_storage.rs:139:25:139:46 | insert_query2.as_str() | test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:139:25:139:46 | insert_query2.as_str() | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:71:97:71:114 | get_phone_number(...) | get_phone_number(...) |
+| test_storage.rs:194:24:194:40 | &insert_query_bad | test_storage.rs:189:100:189:117 | get_phone_number(...) | test_storage.rs:194:24:194:40 | &insert_query_bad | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:189:100:189:117 | get_phone_number(...) | get_phone_number(...) |
+| test_storage.rs:196:34:196:50 | &select_query_bad | test_storage.rs:190:86:190:103 | get_phone_number(...) | test_storage.rs:196:34:196:50 | &select_query_bad | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:190:86:190:103 | get_phone_number(...) | get_phone_number(...) |
+| test_storage.rs:204:39:204:55 | &select_query_bad | test_storage.rs:190:86:190:103 | get_phone_number(...) | test_storage.rs:204:39:204:55 | &select_query_bad | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:190:86:190:103 | get_phone_number(...) | get_phone_number(...) |
 edges
 | test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:100:25:100:37 | insert_query2 | provenance |  |
 | test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:115:27:115:39 | insert_query2 | provenance |  |
@@ -20,15 +20,15 @@ edges
 | test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:71:96:71:114 | &... | provenance | Config |
 | test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:71:96:71:114 | &... [&ref] | provenance |  |
 | test_storage.rs:100:25:100:37 | insert_query2 | test_storage.rs:100:25:100:46 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
-| test_storage.rs:100:25:100:46 | insert_query2.as_str() [&ref] | test_storage.rs:100:13:100:23 | ...::query | provenance | MaD:4 Sink:MaD:4 |
+| test_storage.rs:100:25:100:46 | insert_query2.as_str() [&ref] | test_storage.rs:100:25:100:46 | insert_query2.as_str() | provenance | Sink:MaD:4 |
 | test_storage.rs:115:27:115:39 | insert_query2 | test_storage.rs:115:27:115:48 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
-| test_storage.rs:115:27:115:48 | insert_query2.as_str() [&ref] | test_storage.rs:115:13:115:25 | ...::raw_sql | provenance | MaD:5 Sink:MaD:5 |
+| test_storage.rs:115:27:115:48 | insert_query2.as_str() [&ref] | test_storage.rs:115:27:115:48 | insert_query2.as_str() | provenance | Sink:MaD:5 |
 | test_storage.rs:119:25:119:37 | insert_query2 | test_storage.rs:119:25:119:46 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
-| test_storage.rs:119:25:119:46 | insert_query2.as_str() [&ref] | test_storage.rs:119:13:119:23 | ...::query | provenance | MaD:4 Sink:MaD:4 |
+| test_storage.rs:119:25:119:46 | insert_query2.as_str() [&ref] | test_storage.rs:119:25:119:46 | insert_query2.as_str() | provenance | Sink:MaD:4 |
 | test_storage.rs:125:25:125:37 | insert_query2 | test_storage.rs:125:25:125:46 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
-| test_storage.rs:125:25:125:46 | insert_query2.as_str() [&ref] | test_storage.rs:125:13:125:23 | ...::query | provenance | MaD:4 Sink:MaD:4 |
+| test_storage.rs:125:25:125:46 | insert_query2.as_str() [&ref] | test_storage.rs:125:25:125:46 | insert_query2.as_str() | provenance | Sink:MaD:4 |
 | test_storage.rs:139:25:139:37 | insert_query2 | test_storage.rs:139:25:139:46 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
-| test_storage.rs:139:25:139:46 | insert_query2.as_str() [&ref] | test_storage.rs:139:13:139:23 | ...::query | provenance | MaD:4 Sink:MaD:4 |
+| test_storage.rs:139:25:139:46 | insert_query2.as_str() [&ref] | test_storage.rs:139:25:139:46 | insert_query2.as_str() | provenance | Sink:MaD:4 |
 | test_storage.rs:189:9:189:24 | insert_query_bad | test_storage.rs:194:25:194:40 | insert_query_bad | provenance |  |
 | test_storage.rs:189:28:189:117 | ... + ... | test_storage.rs:189:28:189:124 | ... + ... | provenance | MaD:7 |
 | test_storage.rs:189:28:189:124 | ... + ... | test_storage.rs:189:9:189:24 | insert_query_bad | provenance |  |
@@ -43,17 +43,17 @@ edges
 | test_storage.rs:190:85:190:103 | &... [&ref] | test_storage.rs:190:28:190:103 | ... + ... | provenance | MaD:6 |
 | test_storage.rs:190:86:190:103 | get_phone_number(...) | test_storage.rs:190:85:190:103 | &... | provenance | Config |
 | test_storage.rs:190:86:190:103 | get_phone_number(...) | test_storage.rs:190:85:190:103 | &... [&ref] | provenance |  |
-| test_storage.rs:194:24:194:40 | &insert_query_bad | test_storage.rs:194:16:194:22 | execute | provenance | MaD:1 Sink:MaD:1 |
-| test_storage.rs:194:24:194:40 | &insert_query_bad [&ref] | test_storage.rs:194:16:194:22 | execute | provenance | MaD:1 Sink:MaD:1 |
+| test_storage.rs:194:24:194:40 | &insert_query_bad | test_storage.rs:194:24:194:40 | &insert_query_bad | provenance | Sink:MaD:1 |
+| test_storage.rs:194:24:194:40 | &insert_query_bad [&ref] | test_storage.rs:194:24:194:40 | &insert_query_bad | provenance | Sink:MaD:1 |
 | test_storage.rs:194:25:194:40 | insert_query_bad | test_storage.rs:194:24:194:40 | &insert_query_bad | provenance | Config |
 | test_storage.rs:194:25:194:40 | insert_query_bad | test_storage.rs:194:24:194:40 | &insert_query_bad [&ref] | provenance |  |
-| test_storage.rs:196:34:196:50 | &select_query_bad | test_storage.rs:196:24:196:32 | query_row | provenance | MaD:3 Sink:MaD:3 |
-| test_storage.rs:196:34:196:50 | &select_query_bad [&ref] | test_storage.rs:196:24:196:32 | query_row | provenance | MaD:3 Sink:MaD:3 |
+| test_storage.rs:196:34:196:50 | &select_query_bad | test_storage.rs:196:34:196:50 | &select_query_bad | provenance | Sink:MaD:3 |
+| test_storage.rs:196:34:196:50 | &select_query_bad [&ref] | test_storage.rs:196:34:196:50 | &select_query_bad | provenance | Sink:MaD:3 |
 | test_storage.rs:196:35:196:50 | select_query_bad | test_storage.rs:196:34:196:50 | &select_query_bad | provenance | Config |
 | test_storage.rs:196:35:196:50 | select_query_bad | test_storage.rs:196:34:196:50 | &select_query_bad [&ref] | provenance |  |
 | test_storage.rs:196:35:196:50 | select_query_bad | test_storage.rs:204:40:204:55 | select_query_bad | provenance |  |
-| test_storage.rs:204:39:204:55 | &select_query_bad | test_storage.rs:204:31:204:37 | prepare | provenance | MaD:2 Sink:MaD:2 |
-| test_storage.rs:204:39:204:55 | &select_query_bad [&ref] | test_storage.rs:204:31:204:37 | prepare | provenance | MaD:2 Sink:MaD:2 |
+| test_storage.rs:204:39:204:55 | &select_query_bad | test_storage.rs:204:39:204:55 | &select_query_bad | provenance | Sink:MaD:2 |
+| test_storage.rs:204:39:204:55 | &select_query_bad [&ref] | test_storage.rs:204:39:204:55 | &select_query_bad | provenance | Sink:MaD:2 |
 | test_storage.rs:204:40:204:55 | select_query_bad | test_storage.rs:204:39:204:55 | &select_query_bad | provenance | Config |
 | test_storage.rs:204:40:204:55 | select_query_bad | test_storage.rs:204:39:204:55 | &select_query_bad [&ref] | provenance |  |
 models
@@ -72,20 +72,20 @@ nodes
 | test_storage.rs:71:96:71:114 | &... | semmle.label | &... |
 | test_storage.rs:71:96:71:114 | &... [&ref] | semmle.label | &... [&ref] |
 | test_storage.rs:71:97:71:114 | get_phone_number(...) | semmle.label | get_phone_number(...) |
-| test_storage.rs:100:13:100:23 | ...::query | semmle.label | ...::query |
 | test_storage.rs:100:25:100:37 | insert_query2 | semmle.label | insert_query2 |
+| test_storage.rs:100:25:100:46 | insert_query2.as_str() | semmle.label | insert_query2.as_str() |
 | test_storage.rs:100:25:100:46 | insert_query2.as_str() [&ref] | semmle.label | insert_query2.as_str() [&ref] |
-| test_storage.rs:115:13:115:25 | ...::raw_sql | semmle.label | ...::raw_sql |
 | test_storage.rs:115:27:115:39 | insert_query2 | semmle.label | insert_query2 |
+| test_storage.rs:115:27:115:48 | insert_query2.as_str() | semmle.label | insert_query2.as_str() |
 | test_storage.rs:115:27:115:48 | insert_query2.as_str() [&ref] | semmle.label | insert_query2.as_str() [&ref] |
-| test_storage.rs:119:13:119:23 | ...::query | semmle.label | ...::query |
 | test_storage.rs:119:25:119:37 | insert_query2 | semmle.label | insert_query2 |
+| test_storage.rs:119:25:119:46 | insert_query2.as_str() | semmle.label | insert_query2.as_str() |
 | test_storage.rs:119:25:119:46 | insert_query2.as_str() [&ref] | semmle.label | insert_query2.as_str() [&ref] |
-| test_storage.rs:125:13:125:23 | ...::query | semmle.label | ...::query |
 | test_storage.rs:125:25:125:37 | insert_query2 | semmle.label | insert_query2 |
+| test_storage.rs:125:25:125:46 | insert_query2.as_str() | semmle.label | insert_query2.as_str() |
 | test_storage.rs:125:25:125:46 | insert_query2.as_str() [&ref] | semmle.label | insert_query2.as_str() [&ref] |
-| test_storage.rs:139:13:139:23 | ...::query | semmle.label | ...::query |
 | test_storage.rs:139:25:139:37 | insert_query2 | semmle.label | insert_query2 |
+| test_storage.rs:139:25:139:46 | insert_query2.as_str() | semmle.label | insert_query2.as_str() |
 | test_storage.rs:139:25:139:46 | insert_query2.as_str() [&ref] | semmle.label | insert_query2.as_str() [&ref] |
 | test_storage.rs:189:9:189:24 | insert_query_bad | semmle.label | insert_query_bad |
 | test_storage.rs:189:28:189:117 | ... + ... | semmle.label | ... + ... |
@@ -99,15 +99,15 @@ nodes
 | test_storage.rs:190:85:190:103 | &... | semmle.label | &... |
 | test_storage.rs:190:85:190:103 | &... [&ref] | semmle.label | &... [&ref] |
 | test_storage.rs:190:86:190:103 | get_phone_number(...) | semmle.label | get_phone_number(...) |
-| test_storage.rs:194:16:194:22 | execute | semmle.label | execute |
+| test_storage.rs:194:24:194:40 | &insert_query_bad | semmle.label | &insert_query_bad |
 | test_storage.rs:194:24:194:40 | &insert_query_bad | semmle.label | &insert_query_bad |
 | test_storage.rs:194:24:194:40 | &insert_query_bad [&ref] | semmle.label | &insert_query_bad [&ref] |
 | test_storage.rs:194:25:194:40 | insert_query_bad | semmle.label | insert_query_bad |
-| test_storage.rs:196:24:196:32 | query_row | semmle.label | query_row |
+| test_storage.rs:196:34:196:50 | &select_query_bad | semmle.label | &select_query_bad |
 | test_storage.rs:196:34:196:50 | &select_query_bad | semmle.label | &select_query_bad |
 | test_storage.rs:196:34:196:50 | &select_query_bad [&ref] | semmle.label | &select_query_bad [&ref] |
 | test_storage.rs:196:35:196:50 | select_query_bad | semmle.label | select_query_bad |
-| test_storage.rs:204:31:204:37 | prepare | semmle.label | prepare |
+| test_storage.rs:204:39:204:55 | &select_query_bad | semmle.label | &select_query_bad |
 | test_storage.rs:204:39:204:55 | &select_query_bad | semmle.label | &select_query_bad |
 | test_storage.rs:204:39:204:55 | &select_query_bad [&ref] | semmle.label | &select_query_bad [&ref] |
 | test_storage.rs:204:40:204:55 | select_query_bad | semmle.label | select_query_bad |
diff --git a/rust/ql/test/query-tests/security/CWE-312/test_logging.rs b/rust/ql/test/query-tests/security/CWE-312/test_logging.rs
index 43bcd8894f3c..50f0bd5ef7bb 100644
--- a/rust/ql/test/query-tests/security/CWE-312/test_logging.rs
+++ b/rust/ql/test/query-tests/security/CWE-312/test_logging.rs
@@ -100,15 +100,15 @@ fn test_log(harmless: String, password: String, encrypted_password: String) {
     info!("{}", m3); // $ Alert[rust/cleartext-logging]=m3
 
     let mut m4 = String::new();
-    write!(&mut m4, "message = {}", password); // $ MISSING: Source=m4
-    info!("{}", m4); // $ MISSING: Alert[rust/cleartext-logging]=m4
+    write!(&mut m4, "message = {}", password); // $ Source[rust/cleartext-logging]=m4
+    info!("{}", m4); // $ Alert[rust/cleartext-logging]=m4
 
     let mut m5 = String::new();
-    writeln!(&mut m5, "message = {}", password); // $ MISSING: Source=m5
-    info!("{}", m5); // $ MISSING: Alert[rust/cleartext-logging]=m5
+    writeln!(&mut m5, "message = {}", password); // $ Source[rust/cleartext-logging]=m5
+    info!("{}", m5); // $ Alert[rust/cleartext-logging]=m5
 
     let mut m6 = Vec::new();
-    write!(&mut m6, "message = {}", password); // $ MISSING: Source=m6
+    write!(&mut m6, "message = {}", password); // $ MISSING: Source[rust/cleartext-logging]=m6
     info!("{}", std::str::from_utf8(&m6).unwrap()); // $ MISSING: Alert[rust/cleartext-logging]=m6
     unsafe {
         info!("{}", std::str::from_utf8_unchecked(&m6)); // $ MISSING: Alert[rust/cleartext-logging]=m6
@@ -135,7 +135,7 @@ fn test_log(harmless: String, password: String, encrypted_password: String) {
     // logging from a struct
     let s1 = MyStruct1 {
         harmless: "foo".to_string(),
-        password: "123456".to_string(), // $ MISSING: Source=s1
+        password: "123456".to_string(), // $ MISSING: Source[rust/cleartext-logging]=s1
     };
     warn!("message = {}", s1.harmless);
     warn!("message = {}", s1.password); // $ Alert[rust/cleartext-logging]
@@ -145,7 +145,7 @@ fn test_log(harmless: String, password: String, encrypted_password: String) {
 
     let s2 = MyStruct2 {
         harmless: "foo".to_string(),
-        password: "123456".to_string(), // $ MISSING: Source=s2
+        password: "123456".to_string(), // $ MISSING: Source[rust/cleartext-logging]=s2
     };
     warn!("message = {}", s2.harmless);
     warn!("message = {}", s2.password); // $ Alert[rust/cleartext-logging]
@@ -251,6 +251,50 @@ fn test_std(password: String, i: i32, opt_i: Option<i32>) {
     err.write(format!("message = {}\n", password).as_bytes()); // $ Alert[rust/cleartext-logging]
 }
 
+fn test_collections(harmless: String) {
+    // collection operations are not logging
+    let mut passwords = Vec::new();
+    passwords.insert(0, harmless.clone());
+    passwords.insert(1, harmless.clone());
+    _ = passwords.remove(1);
+    _ = passwords.swap_remove(0);
+
+    let mut password_queue = std::collections::VecDeque::new();
+    password_queue.push_back(harmless.clone());
+    password_queue.push_front(harmless.clone());
+    password_queue.insert(1, harmless.clone());
+    password_queue.append(&mut std::collections::VecDeque::from([harmless]));
+    password_queue.reserve(1);
+    password_queue.rotate_left(1);
+    password_queue.shrink_to(1);
+    _ = password_queue.remove(1);
+    password_queue.make_contiguous();
+}
+
+fn get_password_or_error() -> Result<String, std::io::Error> {
+    Ok("123456".to_string())
+}
+
+#[derive(Debug)]
+struct Outcome {
+    count: usize,
+}
+
+fn count_entries() -> Result<Outcome, std::io::Error> {
+    let _p = get_password_or_error()?;
+    Ok(Outcome { count: 1 })
+}
+
+fn test_try_operator() -> Result<(), std::io::Error> {
+    let value = get_password_or_error()?; // $ Source[rust/cleartext-logging]=try
+    info!("message = {}", value); // $ Alert[rust/cleartext-logging]=try
+
+    let outcome = count_entries()?;
+    info!("message = {:?}", outcome); // (the outcome does not contain the password)
+
+    Ok(())
+}
+
 fn main() {
     simple_logger::SimpleLogger::new().init().unwrap();
 
@@ -260,4 +304,6 @@ fn main() {
         "[encrypted]".to_string(),
     );
     test_std("123456".to_string(), 0, None);
+    test_collections("harmless".to_string());
+    _ = test_try_operator();
 }
diff --git a/rust/ql/test/query-tests/security/CWE-319/UseOfHttp.expected b/rust/ql/test/query-tests/security/CWE-319/UseOfHttp.expected
index 25890c769856..227ed7a408b3 100644
--- a/rust/ql/test/query-tests/security/CWE-319/UseOfHttp.expected
+++ b/rust/ql/test/query-tests/security/CWE-319/UseOfHttp.expected
@@ -1,15 +1,15 @@
 #select
-| main.rs:12:22:12:43 | ...::get | main.rs:12:45:12:68 | "http://example.com/api" | main.rs:12:22:12:43 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:12:45:12:68 | "http://example.com/api" | this HTTP URL |
-| main.rs:13:22:13:43 | ...::get | main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | main.rs:13:22:13:43 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | this HTTP URL |
-| main.rs:14:22:14:43 | ...::get | main.rs:14:45:14:73 | "http://api.example.com/data" | main.rs:14:22:14:43 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:14:45:14:73 | "http://api.example.com/data" | this HTTP URL |
-| main.rs:26:21:26:42 | ...::get | main.rs:23:20:23:39 | "http://example.com" | main.rs:26:21:26:42 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:23:20:23:39 | "http://example.com" | this HTTP URL |
-| main.rs:37:30:37:51 | ...::get | main.rs:34:20:34:28 | "http://" | main.rs:37:30:37:51 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:34:20:34:28 | "http://" | this HTTP URL |
-| main.rs:60:20:60:41 | ...::get | main.rs:60:43:60:65 | "http://172.32.0.0/baz" | main.rs:60:20:60:41 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:60:43:60:65 | "http://172.32.0.0/baz" | this HTTP URL |
-| main.rs:71:24:71:45 | ...::get | main.rs:68:19:68:53 | "http://example.com/sensitive-... | main.rs:71:24:71:45 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:68:19:68:53 | "http://example.com/sensitive-... | this HTTP URL |
+| main.rs:12:45:12:68 | "http://example.com/api" | main.rs:12:45:12:68 | "http://example.com/api" | main.rs:12:45:12:68 | "http://example.com/api" | This URL may be constructed with the HTTP protocol, from $@. | main.rs:12:45:12:68 | "http://example.com/api" | this HTTP URL |
+| main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | This URL may be constructed with the HTTP protocol, from $@. | main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | this HTTP URL |
+| main.rs:14:45:14:73 | "http://api.example.com/data" | main.rs:14:45:14:73 | "http://api.example.com/data" | main.rs:14:45:14:73 | "http://api.example.com/data" | This URL may be constructed with the HTTP protocol, from $@. | main.rs:14:45:14:73 | "http://api.example.com/data" | this HTTP URL |
+| main.rs:26:44:26:52 | &full_url | main.rs:23:20:23:39 | "http://example.com" | main.rs:26:44:26:52 | &full_url | This URL may be constructed with the HTTP protocol, from $@. | main.rs:23:20:23:39 | "http://example.com" | this HTTP URL |
+| main.rs:37:53:37:65 | &insecure_url | main.rs:34:20:34:28 | "http://" | main.rs:37:53:37:65 | &insecure_url | This URL may be constructed with the HTTP protocol, from $@. | main.rs:34:20:34:28 | "http://" | this HTTP URL |
+| main.rs:60:43:60:65 | "http://172.32.0.0/baz" | main.rs:60:43:60:65 | "http://172.32.0.0/baz" | main.rs:60:43:60:65 | "http://172.32.0.0/baz" | This URL may be constructed with the HTTP protocol, from $@. | main.rs:60:43:60:65 | "http://172.32.0.0/baz" | this HTTP URL |
+| main.rs:71:47:71:49 | url | main.rs:68:19:68:53 | "http://example.com/sensitive-... | main.rs:71:47:71:49 | url | This URL may be constructed with the HTTP protocol, from $@. | main.rs:68:19:68:53 | "http://example.com/sensitive-... | this HTTP URL |
 edges
-| main.rs:12:45:12:68 | "http://example.com/api" | main.rs:12:22:12:43 | ...::get | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | main.rs:13:22:13:43 | ...::get | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:14:45:14:73 | "http://api.example.com/data" | main.rs:14:22:14:43 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:12:45:12:68 | "http://example.com/api" | main.rs:12:45:12:68 | "http://example.com/api" | provenance | Sink:MaD:1 |
+| main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | provenance | Sink:MaD:1 |
+| main.rs:14:45:14:73 | "http://api.example.com/data" | main.rs:14:45:14:73 | "http://api.example.com/data" | provenance | Sink:MaD:1 |
 | main.rs:23:9:23:16 | base_url | main.rs:25:28:25:53 | MacroExpr | provenance |  |
 | main.rs:23:20:23:39 | "http://example.com" | main.rs:23:9:23:16 | base_url | provenance |  |
 | main.rs:25:9:25:16 | full_url | main.rs:26:45:26:52 | full_url | provenance |  |
@@ -17,7 +17,7 @@ edges
 | main.rs:25:28:25:53 | ...::must_use(...) | main.rs:25:9:25:16 | full_url | provenance |  |
 | main.rs:25:28:25:53 | MacroExpr | main.rs:25:28:25:53 | ...::format(...) | provenance | MaD:2 |
 | main.rs:25:28:25:53 | { ... } | main.rs:25:28:25:53 | ...::must_use(...) | provenance | MaD:3 |
-| main.rs:26:44:26:52 | &full_url [&ref] | main.rs:26:21:26:42 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:26:44:26:52 | &full_url [&ref] | main.rs:26:44:26:52 | &full_url | provenance | Sink:MaD:1 |
 | main.rs:26:45:26:52 | full_url | main.rs:26:44:26:52 | &full_url [&ref] | provenance |  |
 | main.rs:34:9:34:16 | protocol | main.rs:36:32:36:53 | MacroExpr | provenance |  |
 | main.rs:34:20:34:28 | "http://" | main.rs:34:9:34:16 | protocol | provenance |  |
@@ -26,22 +26,21 @@ edges
 | main.rs:36:32:36:53 | ...::must_use(...) | main.rs:36:9:36:20 | insecure_url | provenance |  |
 | main.rs:36:32:36:53 | MacroExpr | main.rs:36:32:36:53 | ...::format(...) | provenance | MaD:2 |
 | main.rs:36:32:36:53 | { ... } | main.rs:36:32:36:53 | ...::must_use(...) | provenance | MaD:3 |
-| main.rs:37:53:37:65 | &insecure_url [&ref] | main.rs:37:30:37:51 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:37:53:37:65 | &insecure_url [&ref] | main.rs:37:53:37:65 | &insecure_url | provenance | Sink:MaD:1 |
 | main.rs:37:54:37:65 | insecure_url | main.rs:37:53:37:65 | &insecure_url [&ref] | provenance |  |
-| main.rs:60:43:60:65 | "http://172.32.0.0/baz" | main.rs:60:20:60:41 | ...::get | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:68:13:68:15 | url | main.rs:71:47:71:49 | url | provenance |  |
+| main.rs:60:43:60:65 | "http://172.32.0.0/baz" | main.rs:60:43:60:65 | "http://172.32.0.0/baz" | provenance | Sink:MaD:1 |
+| main.rs:68:13:68:15 | url | main.rs:71:47:71:49 | url | provenance | Sink:MaD:1 |
 | main.rs:68:19:68:53 | "http://example.com/sensitive-... | main.rs:68:13:68:15 | url | provenance |  |
-| main.rs:71:47:71:49 | url | main.rs:71:24:71:45 | ...::get | provenance | MaD:1 Sink:MaD:1 |
 models
 | 1 | Sink: reqwest::blocking::get; Argument[0]; request-url |
 | 2 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
 | 3 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
-| main.rs:12:22:12:43 | ...::get | semmle.label | ...::get |
 | main.rs:12:45:12:68 | "http://example.com/api" | semmle.label | "http://example.com/api" |
-| main.rs:13:22:13:43 | ...::get | semmle.label | ...::get |
+| main.rs:12:45:12:68 | "http://example.com/api" | semmle.label | "http://example.com/api" |
+| main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | semmle.label | "HTTP://EXAMPLE.COM/API" |
 | main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | semmle.label | "HTTP://EXAMPLE.COM/API" |
-| main.rs:14:22:14:43 | ...::get | semmle.label | ...::get |
+| main.rs:14:45:14:73 | "http://api.example.com/data" | semmle.label | "http://api.example.com/data" |
 | main.rs:14:45:14:73 | "http://api.example.com/data" | semmle.label | "http://api.example.com/data" |
 | main.rs:23:9:23:16 | base_url | semmle.label | base_url |
 | main.rs:23:20:23:39 | "http://example.com" | semmle.label | "http://example.com" |
@@ -50,7 +49,7 @@ nodes
 | main.rs:25:28:25:53 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:25:28:25:53 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:25:28:25:53 | { ... } | semmle.label | { ... } |
-| main.rs:26:21:26:42 | ...::get | semmle.label | ...::get |
+| main.rs:26:44:26:52 | &full_url | semmle.label | &full_url |
 | main.rs:26:44:26:52 | &full_url [&ref] | semmle.label | &full_url [&ref] |
 | main.rs:26:45:26:52 | full_url | semmle.label | full_url |
 | main.rs:34:9:34:16 | protocol | semmle.label | protocol |
@@ -60,13 +59,12 @@ nodes
 | main.rs:36:32:36:53 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:36:32:36:53 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:36:32:36:53 | { ... } | semmle.label | { ... } |
-| main.rs:37:30:37:51 | ...::get | semmle.label | ...::get |
+| main.rs:37:53:37:65 | &insecure_url | semmle.label | &insecure_url |
 | main.rs:37:53:37:65 | &insecure_url [&ref] | semmle.label | &insecure_url [&ref] |
 | main.rs:37:54:37:65 | insecure_url | semmle.label | insecure_url |
-| main.rs:60:20:60:41 | ...::get | semmle.label | ...::get |
+| main.rs:60:43:60:65 | "http://172.32.0.0/baz" | semmle.label | "http://172.32.0.0/baz" |
 | main.rs:60:43:60:65 | "http://172.32.0.0/baz" | semmle.label | "http://172.32.0.0/baz" |
 | main.rs:68:13:68:15 | url | semmle.label | url |
 | main.rs:68:19:68:53 | "http://example.com/sensitive-... | semmle.label | "http://example.com/sensitive-... |
-| main.rs:71:24:71:45 | ...::get | semmle.label | ...::get |
 | main.rs:71:47:71:49 | url | semmle.label | url |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/CryptographicOperations.expected b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/CryptographicOperations.expected
index a190d85cce9a..268c02082bfa 100644
--- a/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/CryptographicOperations.expected
+++ b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/CryptographicOperations.expected
@@ -1,12 +1,42 @@
-| test.rs:19:9:19:34 | ...::compute(...) | HashingAlgorithm MD5 WEAK inputs:1 |
-| test.rs:20:9:20:40 | ...::compute(...) | HashingAlgorithm MD5 WEAK inputs:1 |
-| test.rs:21:9:21:34 | ...::compute(...) | HashingAlgorithm MD5 WEAK inputs:1 |
-| test.rs:22:9:22:44 | ...::compute(...) | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:13:26:13:33 | harmless | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:14:26:14:39 | credit_card_no | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:15:26:15:33 | password | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:16:26:16:43 | encrypted_password | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:19:26:19:33 | harmless | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:20:26:20:39 | credit_card_no | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:21:26:21:33 | password | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:22:26:22:43 | encrypted_password | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:25:28:25:35 | harmless | HashingAlgorithm SHA1 WEAK inputs:1 |
+| test.rs:26:28:26:41 | credit_card_no | HashingAlgorithm SHA1 WEAK inputs:1 |
+| test.rs:27:28:27:35 | password | HashingAlgorithm SHA1 WEAK inputs:1 |
+| test.rs:28:28:28:45 | encrypted_password | HashingAlgorithm SHA1 WEAK inputs:1 |
+| test.rs:31:36:31:43 | harmless | HashingAlgorithm SHA1 WEAK inputs:1 |
+| test.rs:32:36:32:49 | credit_card_no | HashingAlgorithm SHA1 WEAK inputs:1 |
+| test.rs:33:36:33:43 | password | HashingAlgorithm SHA1 WEAK inputs:1 |
+| test.rs:34:36:34:53 | encrypted_password | HashingAlgorithm SHA1 WEAK inputs:1 |
+| test.rs:37:32:37:39 | harmless | HashingAlgorithm SHA3256  inputs:1 |
+| test.rs:38:32:38:45 | credit_card_no | HashingAlgorithm SHA3256  inputs:1 |
+| test.rs:39:32:39:39 | password | HashingAlgorithm SHA3256  inputs:1 |
+| test.rs:40:32:40:49 | encrypted_password | HashingAlgorithm SHA3256  inputs:1 |
+| test.rs:59:26:59:37 | harmless_str | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:60:26:60:37 | password_str | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:61:26:61:37 | harmless_arr | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:62:26:62:37 | password_arr | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:63:26:63:37 | harmless_vec | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:64:26:64:37 | password_vec | HashingAlgorithm MD5 WEAK inputs:1 |
 | test.rs:67:26:67:40 | ...::new(...) | HashingAlgorithm MD5 WEAK  |
 | test.rs:73:9:73:23 | ...::new(...) | HashingAlgorithm MD5 WEAK  |
 | test.rs:74:9:74:23 | ...::new(...) | HashingAlgorithm MD5 WEAK  |
+| test.rs:76:35:76:42 | harmless | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:77:35:77:42 | password | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:80:26:80:40 | harmless.trim() | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:81:26:81:40 | password.trim() | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:82:26:82:44 | harmless.as_bytes() | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:83:26:83:44 | password.as_bytes() | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:84:26:84:67 | ... .unwrap() | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:85:26:85:67 | ... .unwrap() | HashingAlgorithm MD5 WEAK inputs:1 |
 | test.rs:133:26:133:40 | ...::new(...) | HashingAlgorithm MD5 WEAK  |
 | test.rs:156:26:156:40 | ...::new(...) | HashingAlgorithm MD5 WEAK  |
 | test.rs:176:13:176:24 | ...::new(...) | EncryptionAlgorithm SEED   |
 | test.rs:199:22:199:32 | ...::new(...) | HashingAlgorithm SHA1 WEAK  |
-| test.rs:211:13:211:35 | ...::compute(...) | HashingAlgorithm MD5 WEAK inputs:1 |
+| test.rs:211:30:211:34 | value | HashingAlgorithm MD5 WEAK inputs:1 |
diff --git a/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/WeakSensitiveDataHashing.expected b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/WeakSensitiveDataHashing.expected
index 89078b7c4b9d..7b9c2e0de23f 100644
--- a/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/WeakSensitiveDataHashing.expected
+++ b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/WeakSensitiveDataHashing.expected
@@ -1,22 +1,80 @@
 #select
-| test.rs:20:9:20:24 | ...::compute | test.rs:20:26:20:39 | credit_card_no | test.rs:20:9:20:24 | ...::compute | $@ is used in a hashing algorithm (MD5) that is insecure. | test.rs:20:26:20:39 | credit_card_no | Sensitive data (private) |
-| test.rs:21:9:21:24 | ...::compute | test.rs:21:26:21:33 | password | test.rs:21:9:21:24 | ...::compute | $@ is used in a hashing algorithm (MD5) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:21:26:21:33 | password | Sensitive data (password) |
-| test.rs:211:13:211:28 | ...::compute | test.rs:226:29:226:36 | password | test.rs:211:13:211:28 | ...::compute | $@ is used in a hashing algorithm (MD5) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:226:29:226:36 | password | Sensitive data (password) |
+| test.rs:14:26:14:39 | credit_card_no | test.rs:14:26:14:39 | credit_card_no | test.rs:14:26:14:39 | credit_card_no | $@ is used in a hashing algorithm (MD5) that is insecure. | test.rs:14:26:14:39 | credit_card_no | Sensitive data (private) |
+| test.rs:15:26:15:33 | password | test.rs:15:26:15:33 | password | test.rs:15:26:15:33 | password | $@ is used in a hashing algorithm (MD5) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:15:26:15:33 | password | Sensitive data (password) |
+| test.rs:20:26:20:39 | credit_card_no | test.rs:20:26:20:39 | credit_card_no | test.rs:20:26:20:39 | credit_card_no | $@ is used in a hashing algorithm (MD5) that is insecure. | test.rs:20:26:20:39 | credit_card_no | Sensitive data (private) |
+| test.rs:21:26:21:33 | password | test.rs:21:26:21:33 | password | test.rs:21:26:21:33 | password | $@ is used in a hashing algorithm (MD5) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:21:26:21:33 | password | Sensitive data (password) |
+| test.rs:26:28:26:41 | credit_card_no | test.rs:26:28:26:41 | credit_card_no | test.rs:26:28:26:41 | credit_card_no | $@ is used in a hashing algorithm (SHA1) that is insecure. | test.rs:26:28:26:41 | credit_card_no | Sensitive data (private) |
+| test.rs:27:28:27:35 | password | test.rs:27:28:27:35 | password | test.rs:27:28:27:35 | password | $@ is used in a hashing algorithm (SHA1) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:27:28:27:35 | password | Sensitive data (password) |
+| test.rs:32:36:32:49 | credit_card_no | test.rs:32:36:32:49 | credit_card_no | test.rs:32:36:32:49 | credit_card_no | $@ is used in a hashing algorithm (SHA1) that is insecure. | test.rs:32:36:32:49 | credit_card_no | Sensitive data (private) |
+| test.rs:33:36:33:43 | password | test.rs:33:36:33:43 | password | test.rs:33:36:33:43 | password | $@ is used in a hashing algorithm (SHA1) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:33:36:33:43 | password | Sensitive data (password) |
+| test.rs:39:32:39:39 | password | test.rs:39:32:39:39 | password | test.rs:39:32:39:39 | password | $@ is used in a hashing algorithm (SHA3256) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:39:32:39:39 | password | Sensitive data (password) |
+| test.rs:60:26:60:37 | password_str | test.rs:60:26:60:37 | password_str | test.rs:60:26:60:37 | password_str | $@ is used in a hashing algorithm (MD5) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:60:26:60:37 | password_str | Sensitive data (password) |
+| test.rs:62:26:62:37 | password_arr | test.rs:62:26:62:37 | password_arr | test.rs:62:26:62:37 | password_arr | $@ is used in a hashing algorithm (MD5) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:62:26:62:37 | password_arr | Sensitive data (password) |
+| test.rs:64:26:64:37 | password_vec | test.rs:64:26:64:37 | password_vec | test.rs:64:26:64:37 | password_vec | $@ is used in a hashing algorithm (MD5) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:64:26:64:37 | password_vec | Sensitive data (password) |
+| test.rs:77:35:77:42 | password | test.rs:77:35:77:42 | password | test.rs:77:35:77:42 | password | $@ is used in a hashing algorithm (MD5) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:77:35:77:42 | password | Sensitive data (password) |
+| test.rs:81:26:81:40 | password.trim() | test.rs:81:26:81:33 | password | test.rs:81:26:81:40 | password.trim() | $@ is used in a hashing algorithm (MD5) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:81:26:81:33 | password | Sensitive data (password) |
+| test.rs:83:26:83:44 | password.as_bytes() | test.rs:83:26:83:33 | password | test.rs:83:26:83:44 | password.as_bytes() | $@ is used in a hashing algorithm (MD5) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:83:26:83:33 | password | Sensitive data (password) |
+| test.rs:211:30:211:34 | value | test.rs:226:29:226:36 | password | test.rs:211:30:211:34 | value | $@ is used in a hashing algorithm (MD5) that is insecure for password hashing, since it is not a computationally expensive hash function. | test.rs:226:29:226:36 | password | Sensitive data (password) |
 edges
-| test.rs:20:26:20:39 | credit_card_no | test.rs:20:9:20:24 | ...::compute | provenance | MaD:1 Sink:MaD:1 |
-| test.rs:21:26:21:33 | password | test.rs:21:9:21:24 | ...::compute | provenance | MaD:1 Sink:MaD:1 |
-| test.rs:210:20:210:30 | ...: ... | test.rs:211:30:211:34 | value | provenance |  |
-| test.rs:211:30:211:34 | value | test.rs:211:13:211:28 | ...::compute | provenance | MaD:1 Sink:MaD:1 |
+| test.rs:14:26:14:39 | credit_card_no | test.rs:14:26:14:39 | credit_card_no | provenance | Sink:MaD:1 |
+| test.rs:15:26:15:33 | password | test.rs:15:26:15:33 | password | provenance | Sink:MaD:1 |
+| test.rs:20:26:20:39 | credit_card_no | test.rs:20:26:20:39 | credit_card_no | provenance | Sink:MaD:3 |
+| test.rs:21:26:21:33 | password | test.rs:21:26:21:33 | password | provenance | Sink:MaD:3 |
+| test.rs:26:28:26:41 | credit_card_no | test.rs:26:28:26:41 | credit_card_no | provenance | Sink:MaD:1 |
+| test.rs:27:28:27:35 | password | test.rs:27:28:27:35 | password | provenance | Sink:MaD:1 |
+| test.rs:32:36:32:49 | credit_card_no | test.rs:32:36:32:49 | credit_card_no | provenance | Sink:MaD:1 |
+| test.rs:33:36:33:43 | password | test.rs:33:36:33:43 | password | provenance | Sink:MaD:1 |
+| test.rs:39:32:39:39 | password | test.rs:39:32:39:39 | password | provenance | Sink:MaD:1 |
+| test.rs:60:26:60:37 | password_str | test.rs:60:26:60:37 | password_str | provenance | Sink:MaD:1 |
+| test.rs:62:26:62:37 | password_arr | test.rs:62:26:62:37 | password_arr | provenance | Sink:MaD:1 |
+| test.rs:64:26:64:37 | password_vec | test.rs:64:26:64:37 | password_vec | provenance | Sink:MaD:1 |
+| test.rs:77:35:77:42 | password | test.rs:77:35:77:42 | password | provenance | Sink:MaD:2 |
+| test.rs:81:26:81:33 | password | test.rs:81:26:81:40 | password.trim() [&ref] | provenance | MaD:5 |
+| test.rs:81:26:81:40 | password.trim() [&ref] | test.rs:81:26:81:40 | password.trim() | provenance | Sink:MaD:1 |
+| test.rs:83:26:83:33 | password | test.rs:83:26:83:44 | password.as_bytes() [&ref] | provenance | MaD:4 |
+| test.rs:83:26:83:44 | password.as_bytes() [&ref] | test.rs:83:26:83:44 | password.as_bytes() | provenance | Sink:MaD:1 |
+| test.rs:210:20:210:30 | ...: ... | test.rs:211:30:211:34 | value | provenance | Sink:MaD:3 |
 | test.rs:226:29:226:36 | password | test.rs:210:20:210:30 | ...: ... | provenance |  |
 models
-| 1 | Sink: md5::compute; Argument[0]; hasher-input |
+| 1 | Sink: <digest::digest::Digest>::digest; Argument[0]; hasher-input |
+| 2 | Sink: <digest::digest::Digest>::new_with_prefix; Argument[0]; hasher-input |
+| 3 | Sink: md5::compute; Argument[0]; hasher-input |
+| 4 | Summary: <core::str>::as_bytes; Argument[self].Reference; ReturnValue.Reference; taint |
+| 5 | Summary: <core::str>::trim; Argument[self].Reference; ReturnValue.Reference; taint |
 nodes
-| test.rs:20:9:20:24 | ...::compute | semmle.label | ...::compute |
+| test.rs:14:26:14:39 | credit_card_no | semmle.label | credit_card_no |
+| test.rs:14:26:14:39 | credit_card_no | semmle.label | credit_card_no |
+| test.rs:15:26:15:33 | password | semmle.label | password |
+| test.rs:15:26:15:33 | password | semmle.label | password |
 | test.rs:20:26:20:39 | credit_card_no | semmle.label | credit_card_no |
-| test.rs:21:9:21:24 | ...::compute | semmle.label | ...::compute |
+| test.rs:20:26:20:39 | credit_card_no | semmle.label | credit_card_no |
+| test.rs:21:26:21:33 | password | semmle.label | password |
 | test.rs:21:26:21:33 | password | semmle.label | password |
+| test.rs:26:28:26:41 | credit_card_no | semmle.label | credit_card_no |
+| test.rs:26:28:26:41 | credit_card_no | semmle.label | credit_card_no |
+| test.rs:27:28:27:35 | password | semmle.label | password |
+| test.rs:27:28:27:35 | password | semmle.label | password |
+| test.rs:32:36:32:49 | credit_card_no | semmle.label | credit_card_no |
+| test.rs:32:36:32:49 | credit_card_no | semmle.label | credit_card_no |
+| test.rs:33:36:33:43 | password | semmle.label | password |
+| test.rs:33:36:33:43 | password | semmle.label | password |
+| test.rs:39:32:39:39 | password | semmle.label | password |
+| test.rs:39:32:39:39 | password | semmle.label | password |
+| test.rs:60:26:60:37 | password_str | semmle.label | password_str |
+| test.rs:60:26:60:37 | password_str | semmle.label | password_str |
+| test.rs:62:26:62:37 | password_arr | semmle.label | password_arr |
+| test.rs:62:26:62:37 | password_arr | semmle.label | password_arr |
+| test.rs:64:26:64:37 | password_vec | semmle.label | password_vec |
+| test.rs:64:26:64:37 | password_vec | semmle.label | password_vec |
+| test.rs:77:35:77:42 | password | semmle.label | password |
+| test.rs:77:35:77:42 | password | semmle.label | password |
+| test.rs:81:26:81:33 | password | semmle.label | password |
+| test.rs:81:26:81:40 | password.trim() | semmle.label | password.trim() |
+| test.rs:81:26:81:40 | password.trim() [&ref] | semmle.label | password.trim() [&ref] |
+| test.rs:83:26:83:33 | password | semmle.label | password |
+| test.rs:83:26:83:44 | password.as_bytes() | semmle.label | password.as_bytes() |
+| test.rs:83:26:83:44 | password.as_bytes() [&ref] | semmle.label | password.as_bytes() [&ref] |
 | test.rs:210:20:210:30 | ...: ... | semmle.label | ...: ... |
-| test.rs:211:13:211:28 | ...::compute | semmle.label | ...::compute |
 | test.rs:211:30:211:34 | value | semmle.label | value |
 | test.rs:226:29:226:36 | password | semmle.label | password |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/test.rs b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/test.rs
index d6bdfb5bbdca..b5d9f0f8c634 100644
--- a/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/test.rs
+++ b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/test.rs
@@ -10,10 +10,10 @@ fn test_hash_algorithms(
     // test hashing with different algorithms and data
 
     // MD5
-    _ = md5::Md5::digest(harmless);
-    _ = md5::Md5::digest(credit_card_no); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
-    _ = md5::Md5::digest(password); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
-    _ = md5::Md5::digest(encrypted_password);
+    _ = md5::Md5::digest(harmless); // $ Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::digest(credit_card_no); // $ Alert[rust/weak-sensitive-data-hashing] Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::digest(password); // $ Alert[rust/weak-sensitive-data-hashing] Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::digest(encrypted_password); // $ Alert[rust/summary/cryptographic-operations]
 
     // MD5 (alternative / older library)
     _ = md5_alt::compute(harmless); // $ Alert[rust/summary/cryptographic-operations]
@@ -22,22 +22,22 @@ fn test_hash_algorithms(
     _ = md5_alt::compute(encrypted_password); // $ Alert[rust/summary/cryptographic-operations]
 
     // SHA-1
-    _ = sha1::Sha1::digest(harmless);
-    _ = sha1::Sha1::digest(credit_card_no); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
-    _ = sha1::Sha1::digest(password); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
-    _ = sha1::Sha1::digest(encrypted_password);
+    _ = sha1::Sha1::digest(harmless); // $ Alert[rust/summary/cryptographic-operations]
+    _ = sha1::Sha1::digest(credit_card_no); // $ Alert[rust/weak-sensitive-data-hashing] Alert[rust/summary/cryptographic-operations]
+    _ = sha1::Sha1::digest(password); // $ Alert[rust/weak-sensitive-data-hashing] Alert[rust/summary/cryptographic-operations]
+    _ = sha1::Sha1::digest(encrypted_password); // $ Alert[rust/summary/cryptographic-operations]
 
     // SHA-1 checked
-    _ = sha1_checked::Sha1::digest(harmless);
-    _ = sha1_checked::Sha1::digest(credit_card_no); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
-    _ = sha1_checked::Sha1::digest(password); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
-    _ = sha1_checked::Sha1::digest(encrypted_password);
+    _ = sha1_checked::Sha1::digest(harmless); // $ Alert[rust/summary/cryptographic-operations]
+    _ = sha1_checked::Sha1::digest(credit_card_no); // $ Alert[rust/weak-sensitive-data-hashing] Alert[rust/summary/cryptographic-operations]
+    _ = sha1_checked::Sha1::digest(password); // $ Alert[rust/weak-sensitive-data-hashing] Alert[rust/summary/cryptographic-operations]
+    _ = sha1_checked::Sha1::digest(encrypted_password); // $ Alert[rust/summary/cryptographic-operations]
 
     // SHA-256 (appropriate for sensitive data hashing)
-    _ = sha3::Sha3_256::digest(harmless);
-    _ = sha3::Sha3_256::digest(credit_card_no);
-    _ = sha3::Sha3_256::digest(password); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
-    _ = sha3::Sha3_256::digest(encrypted_password);
+    _ = sha3::Sha3_256::digest(harmless); // $ Alert[rust/summary/cryptographic-operations]
+    _ = sha3::Sha3_256::digest(credit_card_no); // $  Alert[rust/summary/cryptographic-operations]
+    _ = sha3::Sha3_256::digest(password); // $ Alert[rust/weak-sensitive-data-hashing] Alert[rust/summary/cryptographic-operations]
+    _ = sha3::Sha3_256::digest(encrypted_password); // $ Alert[rust/summary/cryptographic-operations]
 
     // Argon2 (appropriate for password hashing)
     let argon2_salt = argon2::password_hash::Salt::from_b64(salt).unwrap();
@@ -56,12 +56,12 @@ fn test_hash_code_patterns(
     // test hashing with different code patterns
 
     // hash different types of data
-    _ = md5::Md5::digest(harmless_str);
-    _ = md5::Md5::digest(password_str); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
-    _ = md5::Md5::digest(harmless_arr);
-    _ = md5::Md5::digest(password_arr); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
-    _ = md5::Md5::digest(harmless_vec);
-    _ = md5::Md5::digest(password_vec); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
+    _ = md5::Md5::digest(harmless_str); // $ Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::digest(password_str); // $ Alert[rust/weak-sensitive-data-hashing] Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::digest(harmless_arr); // $ Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::digest(password_arr); // $ Alert[rust/weak-sensitive-data-hashing] Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::digest(harmless_vec); // $ Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::digest(password_vec); // $ Alert[rust/weak-sensitive-data-hashing] Alert[rust/summary/cryptographic-operations]
 
     // hash through a hasher object
     let mut md5_hasher = md5::Md5::new(); // $ Alert[rust/summary/cryptographic-operations]
@@ -73,16 +73,16 @@ fn test_hash_code_patterns(
     _ = md5::Md5::new().chain_update(harmless).chain_update(harmless).chain_update(harmless).finalize(); // $ Alert[rust/summary/cryptographic-operations]
     _ = md5::Md5::new().chain_update(harmless).chain_update(password).chain_update(harmless).finalize(); // $ Alert[rust/summary/cryptographic-operations] MISSING: Alert[rust/weak-sensitive-data-hashing]
 
-    _ = md5::Md5::new_with_prefix(harmless).finalize();
-    _ = md5::Md5::new_with_prefix(password).finalize(); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
+    _ = md5::Md5::new_with_prefix(harmless).finalize(); // $ Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::new_with_prefix(password).finalize(); // $ Alert[rust/weak-sensitive-data-hashing] Alert[rust/summary/cryptographic-operations]
 
     // hash transformed data
-    _ = md5::Md5::digest(harmless.trim());
-    _ = md5::Md5::digest(password.trim()); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
-    _ = md5::Md5::digest(harmless.as_bytes());
-    _ = md5::Md5::digest(password.as_bytes()); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
-    _ = md5::Md5::digest(std::str::from_utf8(harmless_arr).unwrap());
-    _ = md5::Md5::digest(std::str::from_utf8(password_arr).unwrap()); // $ MISSING: Alert[rust/weak-sensitive-data-hashing]
+    _ = md5::Md5::digest(harmless.trim()); // $ Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::digest(password.trim()); // $ Alert[rust/weak-sensitive-data-hashing] Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::digest(harmless.as_bytes()); // $ Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::digest(password.as_bytes()); // $ Alert[rust/weak-sensitive-data-hashing] Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::digest(std::str::from_utf8(harmless_arr).unwrap()); // $ Alert[rust/summary/cryptographic-operations]
+    _ = md5::Md5::digest(std::str::from_utf8(password_arr).unwrap()); // $ Alert[rust/summary/cryptographic-operations] $ MISSING: Alert[rust/weak-sensitive-data-hashing]
 }
 
 #[derive(Serialize)]
diff --git a/rust/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.expected b/rust/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.expected
new file mode 100644
index 000000000000..95e11221ac7d
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.expected
@@ -0,0 +1,232 @@
+#select
+| main.rs:33:53:33:65 | &remote_bytes | main.rs:15:24:15:68 | ...::get(...) | main.rs:33:53:33:65 | &remote_bytes | This deserialization operation processes $@ without validation. | main.rs:15:24:15:68 | ...::get(...) | user-provided data |
+| main.rs:36:51:36:64 | &remote_string | main.rs:19:25:19:69 | ...::get(...) | main.rs:36:51:36:64 | &remote_string | This deserialization operation processes $@ without validation. | main.rs:19:25:19:69 | ...::get(...) | user-provided data |
+| main.rs:46:48:46:60 | &remote_bytes | main.rs:40:24:40:72 | ...::get(...) | main.rs:46:48:46:60 | &remote_bytes | This deserialization operation processes $@ without validation. | main.rs:40:24:40:72 | ...::get(...) | user-provided data |
+| main.rs:58:52:58:65 | &remote_string | main.rs:50:25:50:69 | ...::get(...) | main.rs:58:52:58:65 | &remote_string | This deserialization operation processes $@ without validation. | main.rs:50:25:50:69 | ...::get(...) | user-provided data |
+| main.rs:72:51:72:67 | &... | main.rs:63:24:63:72 | ...::get(...) | main.rs:72:51:72:67 | &... | This deserialization operation processes $@ without validation. | main.rs:63:24:63:72 | ...::get(...) | user-provided data |
+| main.rs:73:54:73:70 | &... | main.rs:63:24:63:72 | ...::get(...) | main.rs:73:54:73:70 | &... | This deserialization operation processes $@ without validation. | main.rs:63:24:63:72 | ...::get(...) | user-provided data |
+| main.rs:74:56:74:68 | &remote_bytes | main.rs:63:24:63:72 | ...::get(...) | main.rs:74:56:74:68 | &remote_bytes | This deserialization operation processes $@ without validation. | main.rs:63:24:63:72 | ...::get(...) | user-provided data |
+| main.rs:75:56:75:72 | &... | main.rs:63:24:63:72 | ...::get(...) | main.rs:75:56:75:72 | &... | This deserialization operation processes $@ without validation. | main.rs:63:24:63:72 | ...::get(...) | user-provided data |
+| main.rs:76:47:76:63 | &... | main.rs:63:24:63:72 | ...::get(...) | main.rs:76:47:76:63 | &... | This deserialization operation processes $@ without validation. | main.rs:63:24:63:72 | ...::get(...) | user-provided data |
+| main.rs:77:50:77:63 | &remote_string | main.rs:67:25:67:73 | ...::get(...) | main.rs:77:50:77:63 | &remote_string | This deserialization operation processes $@ without validation. | main.rs:67:25:67:73 | ...::get(...) | user-provided data |
+| main.rs:78:54:78:66 | &remote_bytes | main.rs:63:24:63:72 | ...::get(...) | main.rs:78:54:78:66 | &remote_bytes | This deserialization operation processes $@ without validation. | main.rs:63:24:63:72 | ...::get(...) | user-provided data |
+| main.rs:79:56:79:72 | &... | main.rs:63:24:63:72 | ...::get(...) | main.rs:79:56:79:72 | &... | This deserialization operation processes $@ without validation. | main.rs:63:24:63:72 | ...::get(...) | user-provided data |
+| main.rs:80:40:80:53 | &remote_string | main.rs:67:25:67:73 | ...::get(...) | main.rs:80:40:80:53 | &remote_string | This deserialization operation processes $@ without validation. | main.rs:67:25:67:73 | ...::get(...) | user-provided data |
+| main.rs:81:54:81:93 | ...::String(...) | main.rs:67:25:67:73 | ...::get(...) | main.rs:81:54:81:93 | ...::String(...) | This deserialization operation processes $@ without validation. | main.rs:67:25:67:73 | ...::get(...) | user-provided data |
+| main.rs:95:32:95:35 | body | main.rs:133:24:133:72 | ...::get(...) | main.rs:95:32:95:35 | body | This deserialization operation processes $@ without validation. | main.rs:133:24:133:72 | ...::get(...) | user-provided data |
+| main.rs:128:32:128:35 | body | main.rs:133:24:133:72 | ...::get(...) | main.rs:128:32:128:35 | body | This deserialization operation processes $@ without validation. | main.rs:133:24:133:72 | ...::get(...) | user-provided data |
+edges
+| main.rs:15:9:15:20 | remote_bytes | main.rs:33:54:33:65 | remote_bytes | provenance |  |
+| main.rs:15:24:15:68 | ...::get(...) | main.rs:15:24:15:68 | ...::get(...) [Ok] | provenance | Src:MaD:14  |
+| main.rs:15:24:15:68 | ...::get(...) [Ok] | main.rs:15:24:16:17 | ... .unwrap() | provenance | MaD:16 |
+| main.rs:15:24:16:17 | ... .unwrap() | main.rs:15:24:17:16 | ... .bytes() [Ok] | provenance | MaD:18 |
+| main.rs:15:24:17:16 | ... .bytes() [Ok] | main.rs:15:24:18:17 | ... .unwrap() | provenance | MaD:16 |
+| main.rs:15:24:18:17 | ... .unwrap() | main.rs:15:9:15:20 | remote_bytes | provenance |  |
+| main.rs:19:9:19:21 | remote_string | main.rs:36:52:36:64 | remote_string | provenance |  |
+| main.rs:19:25:19:69 | ...::get(...) | main.rs:19:25:19:69 | ...::get(...) [Ok] | provenance | Src:MaD:14  |
+| main.rs:19:25:19:69 | ...::get(...) [Ok] | main.rs:19:25:20:17 | ... .unwrap() | provenance | MaD:16 |
+| main.rs:19:25:20:17 | ... .unwrap() | main.rs:19:25:21:15 | ... .text() [Ok] | provenance | MaD:19 |
+| main.rs:19:25:21:15 | ... .text() [Ok] | main.rs:19:25:22:38 | ... .unwrap_or(...) | provenance | MaD:17 |
+| main.rs:19:25:22:38 | ... .unwrap_or(...) | main.rs:19:9:19:21 | remote_string | provenance |  |
+| main.rs:33:53:33:65 | &remote_bytes [&ref] | main.rs:33:53:33:65 | &remote_bytes | provenance | Sink:MaD:7 |
+| main.rs:33:54:33:65 | remote_bytes | main.rs:33:53:33:65 | &remote_bytes [&ref] | provenance |  |
+| main.rs:36:51:36:64 | &remote_string [&ref] | main.rs:36:51:36:64 | &remote_string | provenance | Sink:MaD:8 |
+| main.rs:36:52:36:64 | remote_string | main.rs:36:51:36:64 | &remote_string [&ref] | provenance |  |
+| main.rs:40:9:40:20 | remote_bytes | main.rs:46:49:46:60 | remote_bytes | provenance |  |
+| main.rs:40:24:40:72 | ...::get(...) | main.rs:40:24:40:72 | ...::get(...) [Ok] | provenance | Src:MaD:14  |
+| main.rs:40:24:40:72 | ...::get(...) [Ok] | main.rs:40:24:41:17 | ... .unwrap() | provenance | MaD:16 |
+| main.rs:40:24:41:17 | ... .unwrap() | main.rs:40:24:42:16 | ... .bytes() [Ok] | provenance | MaD:18 |
+| main.rs:40:24:42:16 | ... .bytes() [Ok] | main.rs:40:24:43:17 | ... .unwrap() | provenance | MaD:16 |
+| main.rs:40:24:43:17 | ... .unwrap() | main.rs:40:9:40:20 | remote_bytes | provenance |  |
+| main.rs:46:48:46:60 | &remote_bytes [&ref] | main.rs:46:48:46:60 | &remote_bytes | provenance | Sink:MaD:1 |
+| main.rs:46:49:46:60 | remote_bytes | main.rs:46:48:46:60 | &remote_bytes [&ref] | provenance |  |
+| main.rs:50:9:50:21 | remote_string | main.rs:58:53:58:65 | remote_string | provenance |  |
+| main.rs:50:25:50:69 | ...::get(...) | main.rs:50:25:50:69 | ...::get(...) [Ok] | provenance | Src:MaD:14  |
+| main.rs:50:25:50:69 | ...::get(...) [Ok] | main.rs:50:25:51:17 | ... .unwrap() | provenance | MaD:16 |
+| main.rs:50:25:51:17 | ... .unwrap() | main.rs:50:25:52:15 | ... .text() [Ok] | provenance | MaD:19 |
+| main.rs:50:25:52:15 | ... .text() [Ok] | main.rs:50:25:53:38 | ... .unwrap_or(...) | provenance | MaD:17 |
+| main.rs:50:25:53:38 | ... .unwrap_or(...) | main.rs:50:9:50:21 | remote_string | provenance |  |
+| main.rs:58:52:58:65 | &remote_string [&ref] | main.rs:58:52:58:65 | &remote_string | provenance | Sink:MaD:8 |
+| main.rs:58:53:58:65 | remote_string | main.rs:58:52:58:65 | &remote_string [&ref] | provenance |  |
+| main.rs:63:9:63:20 | remote_bytes | main.rs:72:52:72:63 | remote_bytes | provenance |  |
+| main.rs:63:9:63:20 | remote_bytes | main.rs:72:52:72:67 | remote_bytes[...] | provenance |  |
+| main.rs:63:9:63:20 | remote_bytes | main.rs:73:55:73:66 | remote_bytes | provenance |  |
+| main.rs:63:9:63:20 | remote_bytes | main.rs:73:55:73:70 | remote_bytes[...] | provenance |  |
+| main.rs:63:9:63:20 | remote_bytes | main.rs:74:57:74:68 | remote_bytes | provenance |  |
+| main.rs:63:9:63:20 | remote_bytes | main.rs:75:57:75:68 | remote_bytes | provenance |  |
+| main.rs:63:9:63:20 | remote_bytes | main.rs:75:57:75:72 | remote_bytes[...] | provenance |  |
+| main.rs:63:9:63:20 | remote_bytes | main.rs:76:48:76:59 | remote_bytes | provenance |  |
+| main.rs:63:9:63:20 | remote_bytes | main.rs:76:48:76:63 | remote_bytes[...] | provenance |  |
+| main.rs:63:9:63:20 | remote_bytes | main.rs:78:55:78:66 | remote_bytes | provenance |  |
+| main.rs:63:9:63:20 | remote_bytes | main.rs:79:57:79:68 | remote_bytes | provenance |  |
+| main.rs:63:9:63:20 | remote_bytes | main.rs:79:57:79:72 | remote_bytes[...] | provenance |  |
+| main.rs:63:24:63:72 | ...::get(...) | main.rs:63:24:63:72 | ...::get(...) [Ok] | provenance | Src:MaD:14  |
+| main.rs:63:24:63:72 | ...::get(...) [Ok] | main.rs:63:24:64:17 | ... .unwrap() | provenance | MaD:16 |
+| main.rs:63:24:64:17 | ... .unwrap() | main.rs:63:24:65:16 | ... .bytes() [Ok] | provenance | MaD:18 |
+| main.rs:63:24:65:16 | ... .bytes() [Ok] | main.rs:63:24:66:17 | ... .unwrap() | provenance | MaD:16 |
+| main.rs:63:24:66:17 | ... .unwrap() | main.rs:63:9:63:20 | remote_bytes | provenance |  |
+| main.rs:67:9:67:21 | remote_string | main.rs:77:51:77:63 | remote_string | provenance |  |
+| main.rs:67:9:67:21 | remote_string | main.rs:80:41:80:53 | remote_string | provenance |  |
+| main.rs:67:9:67:21 | remote_string | main.rs:81:80:81:92 | remote_string | provenance |  |
+| main.rs:67:25:67:73 | ...::get(...) | main.rs:67:25:67:73 | ...::get(...) [Ok] | provenance | Src:MaD:14  |
+| main.rs:67:25:67:73 | ...::get(...) [Ok] | main.rs:67:25:68:17 | ... .unwrap() | provenance | MaD:16 |
+| main.rs:67:25:68:17 | ... .unwrap() | main.rs:67:25:69:15 | ... .text() [Ok] | provenance | MaD:19 |
+| main.rs:67:25:69:15 | ... .text() [Ok] | main.rs:67:25:70:17 | ... .unwrap() | provenance | MaD:16 |
+| main.rs:67:25:70:17 | ... .unwrap() | main.rs:67:9:67:21 | remote_string | provenance |  |
+| main.rs:72:51:72:67 | &... [&ref] | main.rs:72:51:72:67 | &... | provenance | Sink:MaD:6 |
+| main.rs:72:52:72:63 | remote_bytes | main.rs:72:52:72:67 | remote_bytes[...] | provenance | MaD:15 |
+| main.rs:72:52:72:67 | remote_bytes[...] | main.rs:72:51:72:67 | &... [&ref] | provenance |  |
+| main.rs:73:54:73:70 | &... [&ref] | main.rs:73:54:73:70 | &... | provenance | Sink:MaD:2 |
+| main.rs:73:55:73:66 | remote_bytes | main.rs:73:55:73:70 | remote_bytes[...] | provenance | MaD:15 |
+| main.rs:73:55:73:70 | remote_bytes[...] | main.rs:73:54:73:70 | &... [&ref] | provenance |  |
+| main.rs:74:56:74:68 | &remote_bytes [&ref] | main.rs:74:56:74:68 | &remote_bytes | provenance | Sink:MaD:5 |
+| main.rs:74:57:74:68 | remote_bytes | main.rs:74:56:74:68 | &remote_bytes [&ref] | provenance |  |
+| main.rs:75:56:75:72 | &... [&ref] | main.rs:75:56:75:72 | &... | provenance | Sink:MaD:4 |
+| main.rs:75:57:75:68 | remote_bytes | main.rs:75:57:75:72 | remote_bytes[...] | provenance | MaD:15 |
+| main.rs:75:57:75:72 | remote_bytes[...] | main.rs:75:56:75:72 | &... [&ref] | provenance |  |
+| main.rs:76:47:76:63 | &... [&ref] | main.rs:76:47:76:63 | &... | provenance | Sink:MaD:3 |
+| main.rs:76:48:76:59 | remote_bytes | main.rs:76:48:76:63 | remote_bytes[...] | provenance | MaD:15 |
+| main.rs:76:48:76:63 | remote_bytes[...] | main.rs:76:47:76:63 | &... [&ref] | provenance |  |
+| main.rs:77:50:77:63 | &remote_string [&ref] | main.rs:77:50:77:63 | &remote_string | provenance | Sink:MaD:12 |
+| main.rs:77:51:77:63 | remote_string | main.rs:77:50:77:63 | &remote_string [&ref] | provenance |  |
+| main.rs:78:54:78:66 | &remote_bytes [&ref] | main.rs:78:54:78:66 | &remote_bytes | provenance | Sink:MaD:11 |
+| main.rs:78:55:78:66 | remote_bytes | main.rs:78:54:78:66 | &remote_bytes [&ref] | provenance |  |
+| main.rs:79:56:79:72 | &... [&ref] | main.rs:79:56:79:72 | &... | provenance | Sink:MaD:10 |
+| main.rs:79:57:79:68 | remote_bytes | main.rs:79:57:79:72 | remote_bytes[...] | provenance | MaD:15 |
+| main.rs:79:57:79:72 | remote_bytes[...] | main.rs:79:56:79:72 | &... [&ref] | provenance |  |
+| main.rs:80:40:80:53 | &remote_string [&ref] | main.rs:80:40:80:53 | &remote_string | provenance | Sink:MaD:13 |
+| main.rs:80:41:80:53 | remote_string | main.rs:80:40:80:53 | &remote_string [&ref] | provenance |  |
+| main.rs:81:54:81:93 | ...::String(...) [String] | main.rs:81:54:81:93 | ...::String(...) | provenance | Sink:MaD:9 |
+| main.rs:81:80:81:92 | remote_string | main.rs:81:54:81:93 | ...::String(...) [String] | provenance |  |
+| main.rs:93:27:93:37 | ...: ... [&ref] | main.rs:95:32:95:35 | body | provenance | Sink:MaD:7 |
+| main.rs:123:27:123:37 | ...: ... [&ref] | main.rs:128:32:128:35 | body | provenance | Sink:MaD:7 |
+| main.rs:133:9:133:20 | remote_bytes | main.rs:142:48:142:59 | remote_bytes | provenance |  |
+| main.rs:133:9:133:20 | remote_bytes | main.rs:143:49:143:60 | remote_bytes | provenance |  |
+| main.rs:133:24:133:72 | ...::get(...) | main.rs:133:24:133:72 | ...::get(...) [Ok] | provenance | Src:MaD:14  |
+| main.rs:133:24:133:72 | ...::get(...) [Ok] | main.rs:133:24:134:17 | ... .unwrap() | provenance | MaD:16 |
+| main.rs:133:24:134:17 | ... .unwrap() | main.rs:133:24:135:16 | ... .bytes() [Ok] | provenance | MaD:18 |
+| main.rs:133:24:135:16 | ... .bytes() [Ok] | main.rs:133:24:136:17 | ... .unwrap() | provenance | MaD:16 |
+| main.rs:133:24:136:17 | ... .unwrap() | main.rs:133:9:133:20 | remote_bytes | provenance |  |
+| main.rs:142:47:142:59 | &remote_bytes [&ref] | main.rs:93:27:93:37 | ...: ... [&ref] | provenance |  |
+| main.rs:142:48:142:59 | remote_bytes | main.rs:142:47:142:59 | &remote_bytes [&ref] | provenance |  |
+| main.rs:143:48:143:60 | &remote_bytes [&ref] | main.rs:123:27:123:37 | ...: ... [&ref] | provenance |  |
+| main.rs:143:49:143:60 | remote_bytes | main.rs:143:48:143:60 | &remote_bytes [&ref] | provenance |  |
+models
+| 1 | Sink: bincode::deserialize; Argument[0]; unsafe-deserialization |
+| 2 | Sink: bincode::deserialize_from; Argument[0]; unsafe-deserialization |
+| 3 | Sink: ciborium::de::from_reader; Argument[0]; unsafe-deserialization |
+| 4 | Sink: rmp_serde::decode::from_read; Argument[0]; unsafe-deserialization |
+| 5 | Sink: rmp_serde::decode::from_slice; Argument[0]; unsafe-deserialization |
+| 6 | Sink: serde_json::de::from_reader; Argument[0]; unsafe-deserialization |
+| 7 | Sink: serde_json::de::from_slice; Argument[0]; unsafe-deserialization |
+| 8 | Sink: serde_json::de::from_str; Argument[0]; unsafe-deserialization |
+| 9 | Sink: serde_json::value::from_value; Argument[0].Field[serde_json::value::Value::String(0)]; unsafe-deserialization |
+| 10 | Sink: serde_yaml::de::from_reader; Argument[0]; unsafe-deserialization |
+| 11 | Sink: serde_yaml::de::from_slice; Argument[0]; unsafe-deserialization |
+| 12 | Sink: serde_yaml::de::from_str; Argument[0]; unsafe-deserialization |
+| 13 | Sink: toml::de::from_str; Argument[0]; unsafe-deserialization |
+| 14 | Source: reqwest::blocking::get; ReturnValue.Field[core::result::Result::Ok(0)]; remote |
+| 15 | Summary: <core::ops::deref::Deref>::deref; Argument[self].Reference; ReturnValue.Reference; taint |
+| 16 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 17 | Summary: <core::result::Result>::unwrap_or; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 18 | Summary: <reqwest::blocking::response::Response>::bytes; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 19 | Summary: <reqwest::blocking::response::Response>::text; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+nodes
+| main.rs:15:9:15:20 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:15:24:15:68 | ...::get(...) | semmle.label | ...::get(...) |
+| main.rs:15:24:15:68 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| main.rs:15:24:16:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:15:24:17:16 | ... .bytes() [Ok] | semmle.label | ... .bytes() [Ok] |
+| main.rs:15:24:18:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:19:9:19:21 | remote_string | semmle.label | remote_string |
+| main.rs:19:25:19:69 | ...::get(...) | semmle.label | ...::get(...) |
+| main.rs:19:25:19:69 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| main.rs:19:25:20:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:19:25:21:15 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
+| main.rs:19:25:22:38 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| main.rs:33:53:33:65 | &remote_bytes | semmle.label | &remote_bytes |
+| main.rs:33:53:33:65 | &remote_bytes [&ref] | semmle.label | &remote_bytes [&ref] |
+| main.rs:33:54:33:65 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:36:51:36:64 | &remote_string | semmle.label | &remote_string |
+| main.rs:36:51:36:64 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
+| main.rs:36:52:36:64 | remote_string | semmle.label | remote_string |
+| main.rs:40:9:40:20 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:40:24:40:72 | ...::get(...) | semmle.label | ...::get(...) |
+| main.rs:40:24:40:72 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| main.rs:40:24:41:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:40:24:42:16 | ... .bytes() [Ok] | semmle.label | ... .bytes() [Ok] |
+| main.rs:40:24:43:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:46:48:46:60 | &remote_bytes | semmle.label | &remote_bytes |
+| main.rs:46:48:46:60 | &remote_bytes [&ref] | semmle.label | &remote_bytes [&ref] |
+| main.rs:46:49:46:60 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:50:9:50:21 | remote_string | semmle.label | remote_string |
+| main.rs:50:25:50:69 | ...::get(...) | semmle.label | ...::get(...) |
+| main.rs:50:25:50:69 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| main.rs:50:25:51:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:50:25:52:15 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
+| main.rs:50:25:53:38 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| main.rs:58:52:58:65 | &remote_string | semmle.label | &remote_string |
+| main.rs:58:52:58:65 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
+| main.rs:58:53:58:65 | remote_string | semmle.label | remote_string |
+| main.rs:63:9:63:20 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:63:24:63:72 | ...::get(...) | semmle.label | ...::get(...) |
+| main.rs:63:24:63:72 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| main.rs:63:24:64:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:63:24:65:16 | ... .bytes() [Ok] | semmle.label | ... .bytes() [Ok] |
+| main.rs:63:24:66:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:67:9:67:21 | remote_string | semmle.label | remote_string |
+| main.rs:67:25:67:73 | ...::get(...) | semmle.label | ...::get(...) |
+| main.rs:67:25:67:73 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| main.rs:67:25:68:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:67:25:69:15 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
+| main.rs:67:25:70:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:72:51:72:67 | &... | semmle.label | &... |
+| main.rs:72:51:72:67 | &... [&ref] | semmle.label | &... [&ref] |
+| main.rs:72:52:72:63 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:72:52:72:67 | remote_bytes[...] | semmle.label | remote_bytes[...] |
+| main.rs:73:54:73:70 | &... | semmle.label | &... |
+| main.rs:73:54:73:70 | &... [&ref] | semmle.label | &... [&ref] |
+| main.rs:73:55:73:66 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:73:55:73:70 | remote_bytes[...] | semmle.label | remote_bytes[...] |
+| main.rs:74:56:74:68 | &remote_bytes | semmle.label | &remote_bytes |
+| main.rs:74:56:74:68 | &remote_bytes [&ref] | semmle.label | &remote_bytes [&ref] |
+| main.rs:74:57:74:68 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:75:56:75:72 | &... | semmle.label | &... |
+| main.rs:75:56:75:72 | &... [&ref] | semmle.label | &... [&ref] |
+| main.rs:75:57:75:68 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:75:57:75:72 | remote_bytes[...] | semmle.label | remote_bytes[...] |
+| main.rs:76:47:76:63 | &... | semmle.label | &... |
+| main.rs:76:47:76:63 | &... [&ref] | semmle.label | &... [&ref] |
+| main.rs:76:48:76:59 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:76:48:76:63 | remote_bytes[...] | semmle.label | remote_bytes[...] |
+| main.rs:77:50:77:63 | &remote_string | semmle.label | &remote_string |
+| main.rs:77:50:77:63 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
+| main.rs:77:51:77:63 | remote_string | semmle.label | remote_string |
+| main.rs:78:54:78:66 | &remote_bytes | semmle.label | &remote_bytes |
+| main.rs:78:54:78:66 | &remote_bytes [&ref] | semmle.label | &remote_bytes [&ref] |
+| main.rs:78:55:78:66 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:79:56:79:72 | &... | semmle.label | &... |
+| main.rs:79:56:79:72 | &... [&ref] | semmle.label | &... [&ref] |
+| main.rs:79:57:79:68 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:79:57:79:72 | remote_bytes[...] | semmle.label | remote_bytes[...] |
+| main.rs:80:40:80:53 | &remote_string | semmle.label | &remote_string |
+| main.rs:80:40:80:53 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
+| main.rs:80:41:80:53 | remote_string | semmle.label | remote_string |
+| main.rs:81:54:81:93 | ...::String(...) | semmle.label | ...::String(...) |
+| main.rs:81:54:81:93 | ...::String(...) [String] | semmle.label | ...::String(...) [String] |
+| main.rs:81:80:81:92 | remote_string | semmle.label | remote_string |
+| main.rs:93:27:93:37 | ...: ... [&ref] | semmle.label | ...: ... [&ref] |
+| main.rs:95:32:95:35 | body | semmle.label | body |
+| main.rs:123:27:123:37 | ...: ... [&ref] | semmle.label | ...: ... [&ref] |
+| main.rs:128:32:128:35 | body | semmle.label | body |
+| main.rs:133:9:133:20 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:133:24:133:72 | ...::get(...) | semmle.label | ...::get(...) |
+| main.rs:133:24:133:72 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| main.rs:133:24:134:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:133:24:135:16 | ... .bytes() [Ok] | semmle.label | ... .bytes() [Ok] |
+| main.rs:133:24:136:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:142:47:142:59 | &remote_bytes [&ref] | semmle.label | &remote_bytes [&ref] |
+| main.rs:142:48:142:59 | remote_bytes | semmle.label | remote_bytes |
+| main.rs:143:48:143:60 | &remote_bytes [&ref] | semmle.label | &remote_bytes [&ref] |
+| main.rs:143:49:143:60 | remote_bytes | semmle.label | remote_bytes |
+subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.qlref b/rust/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.qlref
new file mode 100644
index 000000000000..26ecd83ac0b3
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.qlref
@@ -0,0 +1,4 @@
+query: queries/security/CWE-502/UnsafeDeserialization.ql
+postprocess:
+ - utils/test/PrettyPrintModels.ql
+ - utils/test/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/query-tests/security/CWE-502/main.rs b/rust/ql/test/query-tests/security/CWE-502/main.rs
new file mode 100644
index 000000000000..e5f860bccddf
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-502/main.rs
@@ -0,0 +1,144 @@
+use serde::Deserialize;
+
+#[derive(Deserialize)]
+struct UserData {
+    name: String,
+    items: Vec<String>,
+}
+
+#[derive(Deserialize)]
+struct Config {
+    setting: String,
+}
+
+fn test_serde_json_deserialization() {
+    let remote_bytes = reqwest::blocking::get("http://example.com/") // $ Source=remote1
+        .unwrap()
+        .bytes()
+        .unwrap();
+    let remote_string = reqwest::blocking::get("http://example.com/") // $ Source=remote2
+        .unwrap()
+        .text()
+        .unwrap_or(String::from("{}"));
+    let const_string = String::from(r#"{"name": "test", "items": []}"#);
+
+    // --- safe cases ---
+
+    // Constant data deserialization
+    let _safe: UserData = serde_json::from_str(&const_string).unwrap(); // safe
+
+    // --- unsafe cases ---
+
+    // Remote bytes directly deserialized
+    let _unsafe1: UserData = serde_json::from_slice(&remote_bytes).unwrap(); // $ Alert[rust/unsafe-deserialization]=remote1
+
+    // Remote string directly deserialized
+    let _unsafe2: UserData = serde_json::from_str(&remote_string).unwrap(); // $ Alert[rust/unsafe-deserialization]=remote2
+}
+
+fn test_bincode_deserialization() {
+    let remote_bytes = reqwest::blocking::get("http://example.com/data") // $ Source=remote3
+        .unwrap()
+        .bytes()
+        .unwrap();
+
+    // Unsafe: remote data deserialized with bincode
+    let _unsafe: Config = bincode::deserialize(&remote_bytes).unwrap(); // $ Alert[rust/unsafe-deserialization]=remote3
+}
+
+fn test_safe_with_validation() {
+    let remote_string = reqwest::blocking::get("http://example.com/") // $ Source=remote4
+        .unwrap()
+        .text()
+        .unwrap_or(String::from("{}"));
+
+    // Safe: size check before deserialization (still flagged as the barrier
+    // is not modeled as a data flow barrier, but demonstrates the pattern)
+    if remote_string.len() < 1024 {
+        let _data: UserData = serde_json::from_str(&remote_string).unwrap(); // $ SPURIOUS: Alert[rust/unsafe-deserialization]=remote4
+    }
+}
+
+fn test_other_deserialization_models() {
+    let remote_bytes = reqwest::blocking::get("http://example.com/data") // $ Source=remote5
+        .unwrap()
+        .bytes()
+        .unwrap();
+    let remote_string = reqwest::blocking::get("http://example.com/data") // $ Source=remote6
+        .unwrap()
+        .text()
+        .unwrap();
+
+    let _json: UserData = serde_json::from_reader(&remote_bytes[..]).unwrap(); // $ Alert[rust/unsafe-deserialization]=remote5
+    let _bincode: Config = bincode::deserialize_from(&remote_bytes[..]).unwrap(); // $ Alert[rust/unsafe-deserialization]=remote5
+    let _msgpack_slice: Config = rmp_serde::from_slice(&remote_bytes).unwrap(); // $ Alert[rust/unsafe-deserialization]=remote5
+    let _msgpack_reader: Config = rmp_serde::from_read(&remote_bytes[..]).unwrap(); // $ Alert[rust/unsafe-deserialization]=remote5
+    let _cbor: Config = ciborium::from_reader(&remote_bytes[..]).unwrap(); // $ Alert[rust/unsafe-deserialization]=remote5
+    let _yaml_str: Config = serde_yaml::from_str(&remote_string).unwrap(); // $ Alert[rust/unsafe-deserialization]=remote6
+    let _yaml_slice: Config = serde_yaml::from_slice(&remote_bytes).unwrap(); // $ Alert[rust/unsafe-deserialization]=remote5
+    let _yaml_reader: Config = serde_yaml::from_reader(&remote_bytes[..]).unwrap(); // $ Alert[rust/unsafe-deserialization]=remote5
+    let _toml: Config = toml::from_str(&remote_string).unwrap(); // $ Alert[rust/unsafe-deserialization]=remote6
+    let _json_value: String = serde_json::from_value(serde_json::Value::String(remote_string)).unwrap(); // $ Alert[rust/unsafe-deserialization]=remote6
+}
+
+mod qhelp_example_bad {
+    use serde::Deserialize;
+
+    #[derive(Deserialize)]
+    pub struct UserData {
+        name: String,
+        items: Vec<String>,
+    }
+
+    pub fn handle_request(body: &[u8]) -> UserData {
+        // BAD: deserializing user-controlled data without size validation
+        serde_json::from_slice(body).unwrap() // $ Alert[rust/unsafe-deserialization]=remote7
+    }
+}
+
+mod qhelp_example_good {
+    use serde::Deserialize;
+
+    const MAX_BODY_SIZE: usize = 1024 * 1024; // 1 MB limit
+
+    #[derive(Deserialize)]
+    #[serde(deny_unknown_fields)]
+    pub struct UserData {
+        name: String,
+        #[serde(deserialize_with = "bounded_vec")]
+        items: Vec<String>,
+    }
+
+    fn bounded_vec<'de, D>(deserializer: D) -> Result<Vec<String>, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let v = Vec::<String>::deserialize(deserializer)?;
+        if v.len() > 100 {
+            return Err(serde::de::Error::custom("too many items"));
+        }
+        Ok(v)
+    }
+
+    pub fn handle_request(body: &[u8]) -> Result<UserData, String> {
+        // GOOD: validate input size before deserialization, use bounded containers
+        if body.len() > MAX_BODY_SIZE {
+            return Err("payload too large".to_string());
+        }
+        serde_json::from_slice(body).map_err(|e| e.to_string()) // $ SPURIOUS: Alert[rust/unsafe-deserialization]=remote7
+    }
+}
+
+fn main() {
+    let remote_bytes = reqwest::blocking::get("http://example.com/data") // $ Source=remote7
+        .unwrap()
+        .bytes()
+        .unwrap();
+
+    test_serde_json_deserialization();
+    test_bincode_deserialization();
+    test_safe_with_validation();
+    test_other_deserialization_models();
+    let _ = qhelp_example_bad::handle_request(&remote_bytes);
+    let _ = qhelp_example_good::handle_request(&remote_bytes);
+}
diff --git a/rust/ql/test/query-tests/security/CWE-502/options.yml b/rust/ql/test/query-tests/security/CWE-502/options.yml
new file mode 100644
index 000000000000..bbfa47291512
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-502/options.yml
@@ -0,0 +1,10 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - reqwest = { version = "0.12.9", features = ["blocking"] }
+    - serde = { version = "1", features = ["derive"] }
+    - serde_json = { version = "1" }
+    - bincode = { version = "1" }
+    - rmp-serde = { version = "1" }
+    - ciborium = { version = "0.2" }
+    - serde_yaml = { version = "0.9" }
+    - toml = { version = "0.8" }
diff --git a/rust/ql/test/query-tests/security/CWE-614/InsecureCookie.expected b/rust/ql/test/query-tests/security/CWE-614/InsecureCookie.expected
index 7decd880f595..bd1d0fe81ae2 100644
--- a/rust/ql/test/query-tests/security/CWE-614/InsecureCookie.expected
+++ b/rust/ql/test/query-tests/security/CWE-614/InsecureCookie.expected
@@ -1,202 +1,194 @@
 #select
-| main.rs:8:66:8:70 | build | main.rs:8:19:8:50 | ...::build(...) | main.rs:8:66:8:70 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:16:52:16:56 | build | main.rs:16:19:16:31 | ...::build | main.rs:16:52:16:56 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:20:56:20:60 | build | main.rs:20:5:20:36 | ...::build(...) | main.rs:20:56:20:60 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:21:57:21:61 | build | main.rs:21:5:21:36 | ...::build(...) | main.rs:21:57:21:61 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:25:54:25:58 | build | main.rs:25:5:25:36 | ...::build(...) | main.rs:25:54:25:58 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:26:52:26:56 | build | main.rs:26:5:26:36 | ...::build(...) | main.rs:26:52:26:56 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:27:53:27:57 | build | main.rs:27:5:27:36 | ...::build(...) | main.rs:27:53:27:57 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:28:62:28:66 | build | main.rs:28:5:28:36 | ...::build(...) | main.rs:28:62:28:66 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:29:62:29:66 | build | main.rs:29:5:29:36 | ...::build(...) | main.rs:29:62:29:66 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:33:60:33:64 | build | main.rs:33:9:33:40 | ...::build(...) | main.rs:33:60:33:64 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:35:60:35:64 | build | main.rs:35:9:35:40 | ...::build(...) | main.rs:35:60:35:64 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:39:55:39:59 | build | main.rs:39:5:39:39 | ...::new(...) | main.rs:39:55:39:59 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:40:66:40:70 | build | main.rs:40:5:40:50 | ... .expires(...) | main.rs:40:66:40:70 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:41:95:41:99 | build | main.rs:41:5:41:79 | ... .max_age(...) | main.rs:41:95:41:99 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:42:74:42:78 | build | main.rs:42:5:42:58 | ... .domain(...) | main.rs:42:74:42:78 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:43:62:43:66 | build | main.rs:43:5:43:46 | ... .path(...) | main.rs:43:62:43:66 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:44:68:44:72 | build | main.rs:44:5:44:52 | ... .http_only(...) | main.rs:44:68:44:72 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:45:88:45:92 | build | main.rs:45:5:45:72 | ... .same_site(...) | main.rs:45:88:45:92 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:46:64:46:68 | build | main.rs:46:5:46:48 | ... .permanent() | main.rs:46:64:46:68 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:47:62:47:66 | build | main.rs:47:5:47:46 | ... .removal() | main.rs:47:62:47:66 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:48:52:48:57 | finish | main.rs:48:5:48:36 | ...::build(...) | main.rs:48:52:48:57 | finish | Cookie attribute 'Secure' is not set to true. |
-| main.rs:49:41:49:45 | build | main.rs:49:5:49:25 | ...::build(...) | main.rs:49:41:49:45 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:50:56:50:60 | build | main.rs:50:5:50:40 | ...::build(...) | main.rs:50:56:50:60 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:53:65:53:69 | build | main.rs:53:5:53:49 | ... .secure(...) | main.rs:53:65:53:69 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:59:9:59:11 | add | main.rs:58:17:58:27 | ...::new | main.rs:59:9:59:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:60:9:60:20 | add_original | main.rs:58:17:58:27 | ...::new | main.rs:60:9:60:20 | add_original | Cookie attribute 'Secure' is not set to true. |
-| main.rs:64:9:64:11 | add | main.rs:63:5:63:5 | [SSA] a | main.rs:64:9:64:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:64:9:64:11 | add | main.rs:63:5:63:5 | a | main.rs:64:9:64:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:69:16:69:18 | add | main.rs:68:17:68:29 | ...::named | main.rs:69:16:69:18 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:70:16:70:27 | add_original | main.rs:63:5:63:5 | [SSA] a | main.rs:70:16:70:27 | add_original | Cookie attribute 'Secure' is not set to true. |
-| main.rs:70:16:70:27 | add_original | main.rs:63:5:63:5 | a | main.rs:70:16:70:27 | add_original | Cookie attribute 'Secure' is not set to true. |
-| main.rs:72:16:72:18 | add | main.rs:71:5:71:5 | [SSA] b | main.rs:72:16:72:18 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:72:16:72:18 | add | main.rs:71:5:71:5 | b | main.rs:72:16:72:18 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:78:17:78:19 | add | main.rs:77:17:77:28 | ...::from | main.rs:78:17:78:19 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:79:17:79:28 | add_original | main.rs:63:5:63:5 | [SSA] a | main.rs:79:17:79:28 | add_original | Cookie attribute 'Secure' is not set to true. |
-| main.rs:79:17:79:28 | add_original | main.rs:63:5:63:5 | a | main.rs:79:17:79:28 | add_original | Cookie attribute 'Secure' is not set to true. |
-| main.rs:83:17:83:19 | add | main.rs:77:17:77:28 | ...::from | main.rs:83:17:83:19 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:88:9:88:11 | add | main.rs:87:17:87:28 | ...::from | main.rs:88:9:88:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:94:9:94:11 | add | main.rs:87:17:87:28 | ...::from | main.rs:94:9:94:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:123:13:123:18 | insert | main.rs:122:13:122:41 | ...::new | main.rs:123:13:123:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:131:13:131:18 | insert | main.rs:130:13:130:13 | b | main.rs:131:13:131:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:147:13:147:18 | insert | main.rs:146:13:146:13 | f | main.rs:147:13:147:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:152:13:152:18 | insert | main.rs:151:13:151:42 | ...::from | main.rs:152:13:152:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:156:13:156:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:156:13:156:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:157:13:157:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:157:13:157:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:158:13:158:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:158:13:158:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:159:13:159:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:159:13:159:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:160:13:160:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:160:13:160:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:161:13:161:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:161:13:161:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:162:13:162:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:162:13:162:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:163:13:163:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:163:13:163:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:164:13:164:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:164:13:164:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:165:13:165:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:165:13:165:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:166:13:166:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:166:13:166:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:167:13:167:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:167:13:167:18 | insert | Cookie attribute 'Secure' is not set to true. |
-| main.rs:173:61:173:65 | build | main.rs:173:22:173:34 | ...::build | main.rs:173:61:173:65 | build | Cookie attribute 'Secure' is not set to true. |
-| main.rs:197:55:197:60 | finish | main.rs:197:5:197:39 | ...::build(...) | main.rs:197:55:197:60 | finish | Cookie attribute 'Secure' is not set to true. |
-| main.rs:198:65:198:70 | finish | main.rs:198:5:198:39 | ...::build(...) | main.rs:198:65:198:70 | finish | Cookie attribute 'Secure' is not set to true. |
-| main.rs:202:9:202:11 | add | main.rs:201:5:201:11 | [SSA] cookie1 | main.rs:202:9:202:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:202:9:202:11 | add | main.rs:201:5:201:11 | cookie1 | main.rs:202:9:202:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:212:41:212:46 | finish | main.rs:212:5:212:22 | ...::build | main.rs:212:41:212:46 | finish | Cookie attribute 'Secure' is not set to true. |
-| main.rs:215:9:215:11 | add | main.rs:214:19:214:34 | ...::new | main.rs:215:9:215:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:219:9:219:11 | add | main.rs:218:5:218:11 | [SSA] cookie2 | main.rs:219:9:219:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:219:9:219:11 | add | main.rs:218:5:218:11 | cookie2 | main.rs:219:9:219:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:229:9:229:11 | add | main.rs:228:5:228:11 | [SSA] cookie1 | main.rs:229:9:229:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:229:9:229:11 | add | main.rs:228:5:228:11 | cookie1 | main.rs:229:9:229:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:242:9:242:41 | ...::new | main.rs:241:29:241:62 | ...::new(...) | main.rs:242:9:242:41 | ...::new | Cookie attribute 'Secure' is not set to true. |
-| main.rs:245:9:245:41 | ...::new | main.rs:244:30:244:63 | ...::new(...) | main.rs:245:9:245:41 | ...::new | Cookie attribute 'Secure' is not set to true. |
-| main.rs:259:59:259:64 | finish | main.rs:259:5:259:43 | ...::build(...) | main.rs:259:59:259:64 | finish | Cookie attribute 'Secure' is not set to true. |
-| main.rs:260:69:260:74 | finish | main.rs:260:5:260:43 | ...::build(...) | main.rs:260:69:260:74 | finish | Cookie attribute 'Secure' is not set to true. |
-| main.rs:264:9:264:11 | add | main.rs:263:5:263:11 | [SSA] cookie1 | main.rs:264:9:264:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:264:9:264:11 | add | main.rs:263:5:263:11 | cookie1 | main.rs:264:9:264:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:274:45:274:50 | finish | main.rs:274:5:274:26 | ...::build | main.rs:274:45:274:50 | finish | Cookie attribute 'Secure' is not set to true. |
-| main.rs:277:9:277:11 | add | main.rs:276:19:276:38 | ...::new | main.rs:277:9:277:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:281:9:281:11 | add | main.rs:280:5:280:11 | [SSA] cookie2 | main.rs:281:9:281:11 | add | Cookie attribute 'Secure' is not set to true. |
-| main.rs:281:9:281:11 | add | main.rs:280:5:280:11 | cookie2 | main.rs:281:9:281:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:8:19:8:64 | ... .secure(...) | main.rs:8:19:8:50 | ...::build(...) | main.rs:8:19:8:64 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:16:19:16:50 | ...::build(...) | main.rs:16:19:16:50 | ...::build(...) | main.rs:16:19:16:50 | ...::build(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:20:5:20:54 | ... .secure(...) | main.rs:20:5:20:36 | ...::build(...) | main.rs:20:5:20:54 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:21:5:21:55 | ... .secure(...) | main.rs:21:5:21:36 | ...::build(...) | main.rs:21:5:21:55 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:25:5:25:52 | ... .secure(...) | main.rs:25:5:25:36 | ...::build(...) | main.rs:25:5:25:52 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:26:5:26:50 | ... .secure(...) | main.rs:26:5:26:36 | ...::build(...) | main.rs:26:5:26:50 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:27:5:27:51 | ... .secure(...) | main.rs:27:5:27:36 | ...::build(...) | main.rs:27:5:27:51 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:28:5:28:60 | ... .secure(...) | main.rs:28:5:28:36 | ...::build(...) | main.rs:28:5:28:60 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:29:5:29:60 | ... .secure(...) | main.rs:29:5:29:36 | ...::build(...) | main.rs:29:5:29:60 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:33:9:33:58 | ... .secure(...) | main.rs:33:9:33:40 | ...::build(...) | main.rs:33:9:33:58 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:35:9:35:58 | ... .secure(...) | main.rs:35:9:35:40 | ...::build(...) | main.rs:35:9:35:58 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:39:5:39:53 | ... .secure(...) | main.rs:39:5:39:39 | ...::new(...) | main.rs:39:5:39:53 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:40:5:40:64 | ... .secure(...) | main.rs:40:5:40:50 | ... .expires(...) | main.rs:40:5:40:64 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:41:5:41:93 | ... .secure(...) | main.rs:41:5:41:79 | ... .max_age(...) | main.rs:41:5:41:93 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:42:5:42:72 | ... .secure(...) | main.rs:42:5:42:58 | ... .domain(...) | main.rs:42:5:42:72 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:43:5:43:60 | ... .secure(...) | main.rs:43:5:43:46 | ... .path(...) | main.rs:43:5:43:60 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:44:5:44:66 | ... .secure(...) | main.rs:44:5:44:52 | ... .http_only(...) | main.rs:44:5:44:66 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:45:5:45:86 | ... .secure(...) | main.rs:45:5:45:72 | ... .same_site(...) | main.rs:45:5:45:86 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:46:5:46:62 | ... .secure(...) | main.rs:46:5:46:48 | ... .permanent() | main.rs:46:5:46:62 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:47:5:47:60 | ... .secure(...) | main.rs:47:5:47:46 | ... .removal() | main.rs:47:5:47:60 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:48:5:48:50 | ... .secure(...) | main.rs:48:5:48:36 | ...::build(...) | main.rs:48:5:48:50 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:49:5:49:39 | ... .secure(...) | main.rs:49:5:49:25 | ...::build(...) | main.rs:49:5:49:39 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:50:5:50:54 | ... .secure(...) | main.rs:50:5:50:40 | ...::build(...) | main.rs:50:5:50:54 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:53:5:53:63 | ... .secure(...) | main.rs:53:5:53:49 | ... .secure(...) | main.rs:53:5:53:63 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:59:13:59:21 | a.clone() | main.rs:58:17:58:44 | ...::new(...) | main.rs:59:13:59:21 | a.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:60:22:60:30 | a.clone() | main.rs:58:17:58:44 | ...::new(...) | main.rs:60:22:60:30 | a.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:64:13:64:21 | a.clone() | main.rs:63:5:63:5 | [SSA] a | main.rs:64:13:64:21 | a.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:64:13:64:21 | a.clone() | main.rs:63:5:63:5 | a | main.rs:64:13:64:21 | a.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:69:20:69:28 | b.clone() | main.rs:68:17:68:37 | ...::named(...) | main.rs:69:20:69:28 | b.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:70:29:70:37 | a.clone() | main.rs:63:5:63:5 | [SSA] a | main.rs:70:29:70:37 | a.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:70:29:70:37 | a.clone() | main.rs:63:5:63:5 | a | main.rs:70:29:70:37 | a.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:72:20:72:28 | b.clone() | main.rs:71:5:71:5 | [SSA] b | main.rs:72:20:72:28 | b.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:72:20:72:28 | b.clone() | main.rs:71:5:71:5 | b | main.rs:72:20:72:28 | b.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:78:21:78:29 | c.clone() | main.rs:77:17:77:36 | ...::from(...) | main.rs:78:21:78:29 | c.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:79:30:79:38 | a.clone() | main.rs:63:5:63:5 | [SSA] a | main.rs:79:30:79:38 | a.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:79:30:79:38 | a.clone() | main.rs:63:5:63:5 | a | main.rs:79:30:79:38 | a.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:83:21:83:29 | c.clone() | main.rs:77:17:77:36 | ...::from(...) | main.rs:83:21:83:29 | c.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:88:13:88:21 | d.clone() | main.rs:87:17:87:36 | ...::from(...) | main.rs:88:13:88:21 | d.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:94:13:94:21 | d.clone() | main.rs:87:17:87:36 | ...::from(...) | main.rs:94:13:94:21 | d.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:123:20:123:28 | a.clone() | main.rs:122:13:122:58 | ...::new(...) | main.rs:123:20:123:28 | a.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:131:20:131:28 | c.clone() | main.rs:130:13:130:13 | b | main.rs:131:20:131:28 | c.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:147:20:147:28 | g.clone() | main.rs:146:13:146:13 | f | main.rs:147:20:147:28 | g.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:152:20:152:20 | h | main.rs:151:13:151:61 | ...::from(...) | main.rs:152:20:152:20 | h | Cookie attribute 'Secure' is not set to true. |
+| main.rs:156:20:156:46 | ... .set_name(...) | main.rs:155:13:155:58 | ...::new(...) | main.rs:156:20:156:46 | ... .set_name(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:157:20:157:48 | ... .set_value(...) | main.rs:155:13:155:58 | ...::new(...) | main.rs:157:20:157:48 | ... .set_value(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:158:20:158:48 | ... .set_http_only(...) | main.rs:155:13:155:58 | ...::new(...) | main.rs:158:20:158:48 | ... .set_http_only(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:159:20:159:70 | ... .set_same_site(...) | main.rs:155:13:155:58 | ...::new(...) | main.rs:159:20:159:70 | ... .set_same_site(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:160:20:160:46 | ... .set_max_age(...) | main.rs:155:13:155:58 | ...::new(...) | main.rs:160:20:160:46 | ... .set_max_age(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:161:20:161:42 | ... .set_path(...) | main.rs:155:13:155:58 | ...::new(...) | main.rs:161:20:161:42 | ... .set_path(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:162:20:162:41 | ... .unset_path() | main.rs:155:13:155:58 | ...::new(...) | main.rs:162:20:162:41 | ... .unset_path() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:163:20:163:54 | ... .set_domain(...) | main.rs:155:13:155:58 | ...::new(...) | main.rs:163:20:163:54 | ... .set_domain(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:164:20:164:43 | ... .unset_domain() | main.rs:155:13:155:58 | ...::new(...) | main.rs:164:20:164:43 | ... .unset_domain() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:165:20:165:46 | ... .set_expires(...) | main.rs:155:13:155:58 | ...::new(...) | main.rs:165:20:165:46 | ... .set_expires(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:166:20:166:44 | ... .unset_expires() | main.rs:155:13:155:58 | ...::new(...) | main.rs:166:20:166:44 | ... .unset_expires() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:167:20:167:45 | ... .make_permanent() | main.rs:155:13:155:58 | ...::new(...) | main.rs:167:20:167:45 | ... .make_permanent() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:173:22:173:59 | ...::build(...) | main.rs:173:22:173:59 | ...::build(...) | main.rs:173:22:173:59 | ...::build(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:197:5:197:53 | ... .secure(...) | main.rs:197:5:197:39 | ...::build(...) | main.rs:197:5:197:53 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:198:5:198:63 | ... .path(...) | main.rs:198:5:198:39 | ...::build(...) | main.rs:198:5:198:63 | ... .path(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:202:13:202:27 | cookie1.clone() | main.rs:201:5:201:11 | [SSA] cookie1 | main.rs:202:13:202:27 | cookie1.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:202:13:202:27 | cookie1.clone() | main.rs:201:5:201:11 | cookie1 | main.rs:202:13:202:27 | cookie1.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:212:5:212:39 | ...::build(...) | main.rs:212:5:212:39 | ...::build(...) | main.rs:212:5:212:39 | ...::build(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:215:13:215:27 | cookie3.clone() | main.rs:214:19:214:51 | ...::new(...) | main.rs:215:13:215:27 | cookie3.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:219:13:219:27 | cookie2.clone() | main.rs:218:5:218:11 | [SSA] cookie2 | main.rs:219:13:219:27 | cookie2.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:219:13:219:27 | cookie2.clone() | main.rs:218:5:218:11 | cookie2 | main.rs:219:13:219:27 | cookie2.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:229:13:229:27 | cookie1.clone() | main.rs:228:5:228:11 | [SSA] cookie1 | main.rs:229:13:229:27 | cookie1.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:229:13:229:27 | cookie1.clone() | main.rs:228:5:228:11 | cookie1 | main.rs:229:13:229:27 | cookie1.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:242:43:242:59 | cookie_config_bad | main.rs:241:29:241:62 | ...::new(...) | main.rs:242:43:242:59 | cookie_config_bad | Cookie attribute 'Secure' is not set to true. |
+| main.rs:245:43:245:60 | cookie_config_bad2 | main.rs:244:30:244:63 | ...::new(...) | main.rs:245:43:245:60 | cookie_config_bad2 | Cookie attribute 'Secure' is not set to true. |
+| main.rs:259:5:259:57 | ... .secure(...) | main.rs:259:5:259:43 | ...::build(...) | main.rs:259:5:259:57 | ... .secure(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:260:5:260:67 | ... .path(...) | main.rs:260:5:260:43 | ...::build(...) | main.rs:260:5:260:67 | ... .path(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:264:13:264:27 | cookie1.clone() | main.rs:263:5:263:11 | [SSA] cookie1 | main.rs:264:13:264:27 | cookie1.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:264:13:264:27 | cookie1.clone() | main.rs:263:5:263:11 | cookie1 | main.rs:264:13:264:27 | cookie1.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:274:5:274:43 | ...::build(...) | main.rs:274:5:274:43 | ...::build(...) | main.rs:274:5:274:43 | ...::build(...) | Cookie attribute 'Secure' is not set to true. |
+| main.rs:277:13:277:27 | cookie3.clone() | main.rs:276:19:276:55 | ...::new(...) | main.rs:277:13:277:27 | cookie3.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:281:13:281:27 | cookie2.clone() | main.rs:280:5:280:11 | [SSA] cookie2 | main.rs:281:13:281:27 | cookie2.clone() | Cookie attribute 'Secure' is not set to true. |
+| main.rs:281:13:281:27 | cookie2.clone() | main.rs:280:5:280:11 | cookie2 | main.rs:281:13:281:27 | cookie2.clone() | Cookie attribute 'Secure' is not set to true. |
 edges
-| main.rs:8:19:8:50 | ...::build(...) | main.rs:8:19:8:64 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:8:19:8:64 | ... .secure(...) | main.rs:8:66:8:70 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:16:19:16:31 | ...::build | main.rs:16:19:16:50 | ...::build(...) | provenance | Src:MaD:15 MaD:15 |
-| main.rs:16:19:16:50 | ...::build(...) | main.rs:16:52:16:56 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:20:5:20:36 | ...::build(...) | main.rs:20:5:20:54 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:20:5:20:54 | ... .secure(...) | main.rs:20:56:20:60 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:21:5:21:36 | ...::build(...) | main.rs:21:5:21:55 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:21:5:21:55 | ... .secure(...) | main.rs:21:57:21:61 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:25:5:25:36 | ...::build(...) | main.rs:25:5:25:52 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:25:5:25:52 | ... .secure(...) | main.rs:25:54:25:58 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:26:5:26:36 | ...::build(...) | main.rs:26:5:26:50 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:26:5:26:50 | ... .secure(...) | main.rs:26:52:26:56 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:27:5:27:36 | ...::build(...) | main.rs:27:5:27:51 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:27:5:27:51 | ... .secure(...) | main.rs:27:53:27:57 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:28:5:28:36 | ...::build(...) | main.rs:28:5:28:60 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:28:5:28:60 | ... .secure(...) | main.rs:28:62:28:66 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:29:5:29:36 | ...::build(...) | main.rs:29:5:29:60 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:29:5:29:60 | ... .secure(...) | main.rs:29:62:29:66 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:33:9:33:40 | ...::build(...) | main.rs:33:9:33:58 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:33:9:33:58 | ... .secure(...) | main.rs:33:60:33:64 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:35:9:35:40 | ...::build(...) | main.rs:35:9:35:58 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:35:9:35:58 | ... .secure(...) | main.rs:35:60:35:64 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:39:5:39:39 | ...::new(...) | main.rs:39:5:39:53 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:39:5:39:53 | ... .secure(...) | main.rs:39:55:39:59 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:40:5:40:50 | ... .expires(...) | main.rs:40:5:40:64 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:40:5:40:64 | ... .secure(...) | main.rs:40:66:40:70 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:41:5:41:79 | ... .max_age(...) | main.rs:41:5:41:93 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:41:5:41:93 | ... .secure(...) | main.rs:41:95:41:99 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:42:5:42:58 | ... .domain(...) | main.rs:42:5:42:72 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:42:5:42:72 | ... .secure(...) | main.rs:42:74:42:78 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:43:5:43:46 | ... .path(...) | main.rs:43:5:43:60 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:43:5:43:60 | ... .secure(...) | main.rs:43:62:43:66 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:44:5:44:52 | ... .http_only(...) | main.rs:44:5:44:66 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:44:5:44:66 | ... .secure(...) | main.rs:44:68:44:72 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:45:5:45:72 | ... .same_site(...) | main.rs:45:5:45:86 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:45:5:45:86 | ... .secure(...) | main.rs:45:88:45:92 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:46:5:46:48 | ... .permanent() | main.rs:46:5:46:62 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:46:5:46:62 | ... .secure(...) | main.rs:46:64:46:68 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:47:5:47:46 | ... .removal() | main.rs:47:5:47:60 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:47:5:47:60 | ... .secure(...) | main.rs:47:62:47:66 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:48:5:48:36 | ...::build(...) | main.rs:48:5:48:50 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:48:5:48:50 | ... .secure(...) | main.rs:48:52:48:57 | finish | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:49:5:49:25 | ...::build(...) | main.rs:49:5:49:39 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:49:5:49:39 | ... .secure(...) | main.rs:49:41:49:45 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:50:5:50:40 | ...::build(...) | main.rs:50:5:50:54 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:50:5:50:54 | ... .secure(...) | main.rs:50:56:50:60 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:53:5:53:49 | ... .secure(...) | main.rs:53:5:53:63 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:53:5:53:63 | ... .secure(...) | main.rs:53:65:53:69 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:8:19:8:50 | ...::build(...) | main.rs:8:19:8:64 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:8:19:8:64 | ... .secure(...) | main.rs:8:19:8:64 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:16:19:16:50 | ...::build(...) | main.rs:16:19:16:50 | ...::build(...) | provenance | Src:MaD:15 Sink:MaD:2 |
+| main.rs:20:5:20:36 | ...::build(...) | main.rs:20:5:20:54 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:20:5:20:54 | ... .secure(...) | main.rs:20:5:20:54 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:21:5:21:36 | ...::build(...) | main.rs:21:5:21:55 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:21:5:21:55 | ... .secure(...) | main.rs:21:5:21:55 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:25:5:25:36 | ...::build(...) | main.rs:25:5:25:52 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:25:5:25:52 | ... .secure(...) | main.rs:25:5:25:52 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:26:5:26:36 | ...::build(...) | main.rs:26:5:26:50 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:26:5:26:50 | ... .secure(...) | main.rs:26:5:26:50 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:27:5:27:36 | ...::build(...) | main.rs:27:5:27:51 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:27:5:27:51 | ... .secure(...) | main.rs:27:5:27:51 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:28:5:28:36 | ...::build(...) | main.rs:28:5:28:60 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:28:5:28:60 | ... .secure(...) | main.rs:28:5:28:60 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:29:5:29:36 | ...::build(...) | main.rs:29:5:29:60 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:29:5:29:60 | ... .secure(...) | main.rs:29:5:29:60 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:33:9:33:40 | ...::build(...) | main.rs:33:9:33:58 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:33:9:33:58 | ... .secure(...) | main.rs:33:9:33:58 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:35:9:35:40 | ...::build(...) | main.rs:35:9:35:58 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:35:9:35:58 | ... .secure(...) | main.rs:35:9:35:58 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:39:5:39:39 | ...::new(...) | main.rs:39:5:39:53 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:39:5:39:53 | ... .secure(...) | main.rs:39:5:39:53 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:40:5:40:50 | ... .expires(...) | main.rs:40:5:40:64 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:40:5:40:64 | ... .secure(...) | main.rs:40:5:40:64 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:41:5:41:79 | ... .max_age(...) | main.rs:41:5:41:93 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:41:5:41:93 | ... .secure(...) | main.rs:41:5:41:93 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:42:5:42:58 | ... .domain(...) | main.rs:42:5:42:72 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:42:5:42:72 | ... .secure(...) | main.rs:42:5:42:72 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:43:5:43:46 | ... .path(...) | main.rs:43:5:43:60 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:43:5:43:60 | ... .secure(...) | main.rs:43:5:43:60 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:44:5:44:52 | ... .http_only(...) | main.rs:44:5:44:66 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:44:5:44:66 | ... .secure(...) | main.rs:44:5:44:66 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:45:5:45:72 | ... .same_site(...) | main.rs:45:5:45:86 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:45:5:45:86 | ... .secure(...) | main.rs:45:5:45:86 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:46:5:46:48 | ... .permanent() | main.rs:46:5:46:62 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:46:5:46:62 | ... .secure(...) | main.rs:46:5:46:62 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:47:5:47:46 | ... .removal() | main.rs:47:5:47:60 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:47:5:47:60 | ... .secure(...) | main.rs:47:5:47:60 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:48:5:48:36 | ...::build(...) | main.rs:48:5:48:50 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:48:5:48:50 | ... .secure(...) | main.rs:48:5:48:50 | ... .secure(...) | provenance | Sink:MaD:3 |
+| main.rs:49:5:49:25 | ...::build(...) | main.rs:49:5:49:39 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:49:5:49:39 | ... .secure(...) | main.rs:49:5:49:39 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:50:5:50:40 | ...::build(...) | main.rs:50:5:50:54 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:50:5:50:54 | ... .secure(...) | main.rs:50:5:50:54 | ... .secure(...) | provenance | Sink:MaD:2 |
+| main.rs:53:5:53:49 | ... .secure(...) | main.rs:53:5:53:63 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:53:5:53:63 | ... .secure(...) | main.rs:53:5:53:63 | ... .secure(...) | provenance | Sink:MaD:2 |
 | main.rs:58:9:58:13 | mut a | main.rs:59:13:59:13 | a | provenance |  |
 | main.rs:58:9:58:13 | mut a | main.rs:60:22:60:22 | a | provenance |  |
-| main.rs:58:17:58:27 | ...::new | main.rs:58:17:58:44 | ...::new(...) | provenance | Src:MaD:17 MaD:17 |
-| main.rs:58:17:58:44 | ...::new(...) | main.rs:58:9:58:13 | mut a | provenance |  |
-| main.rs:59:13:59:13 | a | main.rs:59:13:59:21 | a.clone() | provenance | MaD:18 |
-| main.rs:59:13:59:21 | a.clone() | main.rs:59:9:59:11 | add | provenance | MaD:4 Sink:MaD:4 |
-| main.rs:60:22:60:22 | a | main.rs:60:22:60:30 | a.clone() | provenance | MaD:18 |
-| main.rs:60:22:60:30 | a.clone() | main.rs:60:9:60:20 | add_original | provenance | MaD:5 Sink:MaD:5 |
+| main.rs:58:17:58:44 | ...::new(...) | main.rs:58:9:58:13 | mut a | provenance | Src:MaD:17  |
+| main.rs:59:13:59:13 | a | main.rs:59:13:59:21 | a.clone() | provenance | MaD:35 |
+| main.rs:59:13:59:21 | a.clone() | main.rs:59:13:59:21 | a.clone() | provenance | Sink:MaD:4 |
+| main.rs:60:22:60:22 | a | main.rs:60:22:60:30 | a.clone() | provenance | MaD:35 |
+| main.rs:60:22:60:30 | a.clone() | main.rs:60:22:60:30 | a.clone() | provenance | Sink:MaD:5 |
 | main.rs:63:5:63:5 | [SSA] a | main.rs:64:13:64:13 | a | provenance |  |
 | main.rs:63:5:63:5 | [SSA] a | main.rs:70:29:70:29 | a | provenance |  |
 | main.rs:63:5:63:5 | [SSA] a | main.rs:79:30:79:30 | a | provenance |  |
 | main.rs:63:5:63:5 | a | main.rs:64:13:64:13 | a | provenance |  |
 | main.rs:63:5:63:5 | a | main.rs:70:29:70:29 | a | provenance |  |
 | main.rs:63:5:63:5 | a | main.rs:79:30:79:30 | a | provenance |  |
-| main.rs:64:13:64:13 | a | main.rs:64:13:64:21 | a.clone() | provenance | MaD:18 |
-| main.rs:64:13:64:21 | a.clone() | main.rs:64:9:64:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:64:13:64:13 | a | main.rs:64:13:64:21 | a.clone() | provenance | MaD:35 |
+| main.rs:64:13:64:21 | a.clone() | main.rs:64:13:64:21 | a.clone() | provenance | Sink:MaD:4 |
 | main.rs:68:9:68:13 | mut b | main.rs:69:20:69:20 | b | provenance |  |
-| main.rs:68:17:68:29 | ...::named | main.rs:68:17:68:37 | ...::named(...) | provenance | Src:MaD:16 MaD:16 |
-| main.rs:68:17:68:37 | ...::named(...) | main.rs:68:9:68:13 | mut b | provenance |  |
-| main.rs:69:20:69:20 | b | main.rs:69:20:69:28 | b.clone() | provenance | MaD:18 |
-| main.rs:69:20:69:28 | b.clone() | main.rs:69:16:69:18 | add | provenance | MaD:8 Sink:MaD:8 |
-| main.rs:70:29:70:29 | a | main.rs:70:29:70:37 | a.clone() | provenance | MaD:18 |
-| main.rs:70:29:70:37 | a.clone() | main.rs:70:16:70:27 | add_original | provenance | MaD:9 Sink:MaD:9 |
+| main.rs:68:17:68:37 | ...::named(...) | main.rs:68:9:68:13 | mut b | provenance | Src:MaD:16  |
+| main.rs:69:20:69:20 | b | main.rs:69:20:69:28 | b.clone() | provenance | MaD:35 |
+| main.rs:69:20:69:28 | b.clone() | main.rs:69:20:69:28 | b.clone() | provenance | Sink:MaD:8 |
+| main.rs:70:29:70:29 | a | main.rs:70:29:70:37 | a.clone() | provenance | MaD:35 |
+| main.rs:70:29:70:37 | a.clone() | main.rs:70:29:70:37 | a.clone() | provenance | Sink:MaD:9 |
 | main.rs:71:5:71:5 | [SSA] b | main.rs:72:20:72:20 | b | provenance |  |
 | main.rs:71:5:71:5 | b | main.rs:72:20:72:20 | b | provenance |  |
-| main.rs:72:20:72:20 | b | main.rs:72:20:72:28 | b.clone() | provenance | MaD:18 |
-| main.rs:72:20:72:28 | b.clone() | main.rs:72:16:72:18 | add | provenance | MaD:8 Sink:MaD:8 |
+| main.rs:72:20:72:20 | b | main.rs:72:20:72:28 | b.clone() | provenance | MaD:35 |
+| main.rs:72:20:72:28 | b.clone() | main.rs:72:20:72:28 | b.clone() | provenance | Sink:MaD:8 |
 | main.rs:77:9:77:13 | mut c | main.rs:78:21:78:21 | c | provenance |  |
 | main.rs:77:9:77:13 | mut c | main.rs:83:21:83:21 | c | provenance |  |
-| main.rs:77:17:77:28 | ...::from | main.rs:77:17:77:36 | ...::from(...) | provenance | Src:MaD:14 MaD:14 |
-| main.rs:77:17:77:36 | ...::from(...) | main.rs:77:9:77:13 | mut c | provenance |  |
-| main.rs:78:21:78:21 | c | main.rs:78:21:78:29 | c.clone() | provenance | MaD:18 |
-| main.rs:78:21:78:29 | c.clone() | main.rs:78:17:78:19 | add | provenance | MaD:6 Sink:MaD:6 |
-| main.rs:79:30:79:30 | a | main.rs:79:30:79:38 | a.clone() | provenance | MaD:18 |
-| main.rs:79:30:79:38 | a.clone() | main.rs:79:17:79:28 | add_original | provenance | MaD:7 Sink:MaD:7 |
-| main.rs:83:21:83:21 | c | main.rs:83:21:83:29 | c.clone() | provenance | MaD:18 |
-| main.rs:83:21:83:29 | c.clone() | main.rs:83:17:83:19 | add | provenance | MaD:6 Sink:MaD:6 |
+| main.rs:77:17:77:36 | ...::from(...) | main.rs:77:9:77:13 | mut c | provenance | Src:MaD:14  |
+| main.rs:78:21:78:21 | c | main.rs:78:21:78:29 | c.clone() | provenance | MaD:35 |
+| main.rs:78:21:78:29 | c.clone() | main.rs:78:21:78:29 | c.clone() | provenance | Sink:MaD:6 |
+| main.rs:79:30:79:30 | a | main.rs:79:30:79:38 | a.clone() | provenance | MaD:35 |
+| main.rs:79:30:79:38 | a.clone() | main.rs:79:30:79:38 | a.clone() | provenance | Sink:MaD:7 |
+| main.rs:83:21:83:21 | c | main.rs:83:21:83:29 | c.clone() | provenance | MaD:35 |
+| main.rs:83:21:83:29 | c.clone() | main.rs:83:21:83:29 | c.clone() | provenance | Sink:MaD:6 |
 | main.rs:87:9:87:13 | mut d | main.rs:88:13:88:13 | d | provenance |  |
 | main.rs:87:9:87:13 | mut d | main.rs:94:13:94:13 | d | provenance |  |
-| main.rs:87:17:87:28 | ...::from | main.rs:87:17:87:36 | ...::from(...) | provenance | Src:MaD:14 MaD:14 |
-| main.rs:87:17:87:36 | ...::from(...) | main.rs:87:9:87:13 | mut d | provenance |  |
-| main.rs:88:13:88:13 | d | main.rs:88:13:88:21 | d.clone() | provenance | MaD:18 |
-| main.rs:88:13:88:21 | d.clone() | main.rs:88:9:88:11 | add | provenance | MaD:4 Sink:MaD:4 |
-| main.rs:94:13:94:13 | d | main.rs:94:13:94:21 | d.clone() | provenance | MaD:18 |
-| main.rs:94:13:94:21 | d.clone() | main.rs:94:9:94:11 | add | provenance | MaD:4 Sink:MaD:4 |
-| main.rs:114:5:114:17 | ...::build | main.rs:114:5:114:36 | ...::build(...) | provenance | Src:MaD:15 MaD:15 |
-| main.rs:114:5:114:36 | ...::build(...) | main.rs:114:5:114:54 | ... .partitioned(...) | provenance | MaD:33 |
-| main.rs:114:5:114:54 | ... .partitioned(...) | main.rs:114:56:114:60 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:87:17:87:36 | ...::from(...) | main.rs:87:9:87:13 | mut d | provenance | Src:MaD:14  |
+| main.rs:88:13:88:13 | d | main.rs:88:13:88:21 | d.clone() | provenance | MaD:35 |
+| main.rs:88:13:88:21 | d.clone() | main.rs:88:13:88:21 | d.clone() | provenance | Sink:MaD:4 |
+| main.rs:94:13:94:13 | d | main.rs:94:13:94:21 | d.clone() | provenance | MaD:35 |
+| main.rs:94:13:94:21 | d.clone() | main.rs:94:13:94:21 | d.clone() | provenance | Sink:MaD:4 |
+| main.rs:114:5:114:36 | ...::build(...) | main.rs:114:5:114:36 | ...::build(...) | provenance | Src:MaD:15  |
+| main.rs:114:5:114:36 | ...::build(...) | main.rs:114:5:114:54 | ... .partitioned(...) | provenance | MaD:32 |
+| main.rs:114:5:114:54 | ... .partitioned(...) | main.rs:114:5:114:54 | ... .partitioned(...) | provenance | Sink:MaD:2 |
 | main.rs:122:9:122:9 | a | main.rs:123:20:123:20 | a | provenance |  |
-| main.rs:122:13:122:41 | ...::new | main.rs:122:13:122:58 | ...::new(...) | provenance | Src:MaD:13 MaD:13 |
-| main.rs:122:13:122:58 | ...::new(...) | main.rs:122:9:122:9 | a | provenance |  |
-| main.rs:123:20:123:20 | a | main.rs:123:20:123:28 | a.clone() | provenance | MaD:18 |
-| main.rs:123:20:123:28 | a.clone() | main.rs:123:13:123:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:122:13:122:58 | ...::new(...) | main.rs:122:9:122:9 | a | provenance | Src:MaD:13  |
+| main.rs:123:20:123:20 | a | main.rs:123:20:123:28 | a.clone() | provenance | MaD:35 |
+| main.rs:123:20:123:28 | a.clone() | main.rs:123:20:123:28 | a.clone() | provenance | Sink:MaD:1 |
 | main.rs:130:9:130:9 | c | main.rs:131:20:131:20 | c | provenance |  |
 | main.rs:130:9:130:9 | c | main.rs:134:13:134:13 | c | provenance |  |
-| main.rs:130:13:130:13 | b | main.rs:130:13:130:31 | b.set_secure(...) | provenance | MaD:28 |
+| main.rs:130:13:130:13 | b | main.rs:130:13:130:31 | b.set_secure(...) | provenance | MaD:27 |
 | main.rs:130:13:130:31 | b.set_secure(...) | main.rs:130:9:130:9 | c | provenance |  |
-| main.rs:131:20:131:20 | c | main.rs:131:20:131:28 | c.clone() | provenance | MaD:18 |
-| main.rs:131:20:131:28 | c.clone() | main.rs:131:13:131:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:131:20:131:20 | c | main.rs:131:20:131:28 | c.clone() | provenance | MaD:35 |
+| main.rs:131:20:131:28 | c.clone() | main.rs:131:20:131:28 | c.clone() | provenance | Sink:MaD:1 |
 | main.rs:134:9:134:9 | d | main.rs:135:20:135:20 | d | provenance |  |
-| main.rs:134:13:134:13 | c | main.rs:134:13:134:35 | c.set_partitioned(...) | provenance | MaD:25 |
+| main.rs:134:13:134:13 | c | main.rs:134:13:134:35 | c.set_partitioned(...) | provenance | MaD:24 |
 | main.rs:134:13:134:35 | c.set_partitioned(...) | main.rs:134:9:134:9 | d | provenance |  |
-| main.rs:135:20:135:20 | d | main.rs:135:20:135:28 | d.clone() | provenance | MaD:18 |
-| main.rs:135:20:135:28 | d.clone() | main.rs:135:13:135:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:135:20:135:20 | d | main.rs:135:20:135:28 | d.clone() | provenance | MaD:35 |
+| main.rs:135:20:135:28 | d.clone() | main.rs:135:20:135:28 | d.clone() | provenance | Sink:MaD:1 |
 | main.rs:146:9:146:9 | g | main.rs:147:20:147:20 | g | provenance |  |
-| main.rs:146:13:146:13 | f | main.rs:146:13:146:31 | f.set_secure(...) | provenance | MaD:28 |
+| main.rs:146:13:146:13 | f | main.rs:146:13:146:31 | f.set_secure(...) | provenance | MaD:27 |
 | main.rs:146:13:146:31 | f.set_secure(...) | main.rs:146:9:146:9 | g | provenance |  |
-| main.rs:147:20:147:20 | g | main.rs:147:20:147:28 | g.clone() | provenance | MaD:18 |
-| main.rs:147:20:147:28 | g.clone() | main.rs:147:13:147:18 | insert | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:151:9:151:9 | h | main.rs:152:20:152:20 | h | provenance |  |
-| main.rs:151:13:151:42 | ...::from | main.rs:151:13:151:61 | ...::from(...) | provenance | Src:MaD:12 MaD:12 |
-| main.rs:151:13:151:61 | ...::from(...) | main.rs:151:9:151:9 | h | provenance |  |
-| main.rs:152:20:152:20 | h | main.rs:152:13:152:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:147:20:147:20 | g | main.rs:147:20:147:28 | g.clone() | provenance | MaD:35 |
+| main.rs:147:20:147:28 | g.clone() | main.rs:147:20:147:28 | g.clone() | provenance | Sink:MaD:1 |
+| main.rs:151:9:151:9 | h | main.rs:152:20:152:20 | h | provenance | Sink:MaD:1 |
+| main.rs:151:13:151:61 | ...::from(...) | main.rs:151:9:151:9 | h | provenance | Src:MaD:12  |
 | main.rs:155:9:155:9 | i | main.rs:156:20:156:20 | i | provenance |  |
 | main.rs:155:9:155:9 | i | main.rs:157:20:157:20 | i | provenance |  |
 | main.rs:155:9:155:9 | i | main.rs:158:20:158:20 | i | provenance |  |
@@ -209,100 +201,92 @@ edges
 | main.rs:155:9:155:9 | i | main.rs:165:20:165:20 | i | provenance |  |
 | main.rs:155:9:155:9 | i | main.rs:166:20:166:20 | i | provenance |  |
 | main.rs:155:9:155:9 | i | main.rs:167:20:167:20 | i | provenance |  |
-| main.rs:155:13:155:41 | ...::new | main.rs:155:13:155:58 | ...::new(...) | provenance | Src:MaD:13 MaD:13 |
-| main.rs:155:13:155:58 | ...::new(...) | main.rs:155:9:155:9 | i | provenance |  |
-| main.rs:156:20:156:20 | i | main.rs:156:20:156:28 | i.clone() | provenance | MaD:18 |
-| main.rs:156:20:156:28 | i.clone() | main.rs:156:20:156:46 | ... .set_name(...) | provenance | MaD:24 |
-| main.rs:156:20:156:46 | ... .set_name(...) | main.rs:156:13:156:18 | insert | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:157:20:157:20 | i | main.rs:157:20:157:28 | i.clone() | provenance | MaD:18 |
-| main.rs:157:20:157:28 | i.clone() | main.rs:157:20:157:48 | ... .set_value(...) | provenance | MaD:29 |
-| main.rs:157:20:157:48 | ... .set_value(...) | main.rs:157:13:157:18 | insert | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:158:20:158:20 | i | main.rs:158:20:158:28 | i.clone() | provenance | MaD:18 |
-| main.rs:158:20:158:28 | i.clone() | main.rs:158:20:158:48 | ... .set_http_only(...) | provenance | MaD:22 |
-| main.rs:158:20:158:48 | ... .set_http_only(...) | main.rs:158:13:158:18 | insert | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:159:20:159:20 | i | main.rs:159:20:159:28 | i.clone() | provenance | MaD:18 |
-| main.rs:159:20:159:28 | i.clone() | main.rs:159:20:159:70 | ... .set_same_site(...) | provenance | MaD:27 |
-| main.rs:159:20:159:70 | ... .set_same_site(...) | main.rs:159:13:159:18 | insert | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:160:20:160:20 | i | main.rs:160:20:160:28 | i.clone() | provenance | MaD:18 |
-| main.rs:160:20:160:28 | i.clone() | main.rs:160:20:160:46 | ... .set_max_age(...) | provenance | MaD:23 |
-| main.rs:160:20:160:46 | ... .set_max_age(...) | main.rs:160:13:160:18 | insert | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:161:20:161:20 | i | main.rs:161:20:161:28 | i.clone() | provenance | MaD:18 |
-| main.rs:161:20:161:28 | i.clone() | main.rs:161:20:161:42 | ... .set_path(...) | provenance | MaD:26 |
-| main.rs:161:20:161:42 | ... .set_path(...) | main.rs:161:13:161:18 | insert | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:162:20:162:20 | i | main.rs:162:20:162:28 | i.clone() | provenance | MaD:18 |
-| main.rs:162:20:162:28 | i.clone() | main.rs:162:20:162:41 | ... .unset_path() | provenance | MaD:32 |
-| main.rs:162:20:162:41 | ... .unset_path() | main.rs:162:13:162:18 | insert | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:163:20:163:20 | i | main.rs:163:20:163:28 | i.clone() | provenance | MaD:18 |
-| main.rs:163:20:163:28 | i.clone() | main.rs:163:20:163:54 | ... .set_domain(...) | provenance | MaD:20 |
-| main.rs:163:20:163:54 | ... .set_domain(...) | main.rs:163:13:163:18 | insert | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:164:20:164:20 | i | main.rs:164:20:164:28 | i.clone() | provenance | MaD:18 |
-| main.rs:164:20:164:28 | i.clone() | main.rs:164:20:164:43 | ... .unset_domain() | provenance | MaD:30 |
-| main.rs:164:20:164:43 | ... .unset_domain() | main.rs:164:13:164:18 | insert | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:165:20:165:20 | i | main.rs:165:20:165:28 | i.clone() | provenance | MaD:18 |
-| main.rs:165:20:165:28 | i.clone() | main.rs:165:20:165:46 | ... .set_expires(...) | provenance | MaD:21 |
-| main.rs:165:20:165:46 | ... .set_expires(...) | main.rs:165:13:165:18 | insert | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:166:20:166:20 | i | main.rs:166:20:166:28 | i.clone() | provenance | MaD:18 |
-| main.rs:166:20:166:28 | i.clone() | main.rs:166:20:166:44 | ... .unset_expires() | provenance | MaD:31 |
-| main.rs:166:20:166:44 | ... .unset_expires() | main.rs:166:13:166:18 | insert | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:167:20:167:20 | i | main.rs:167:20:167:28 | i.clone() | provenance | MaD:18 |
-| main.rs:167:20:167:28 | i.clone() | main.rs:167:20:167:45 | ... .make_permanent() | provenance | MaD:19 |
-| main.rs:167:20:167:45 | ... .make_permanent() | main.rs:167:13:167:18 | insert | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:173:22:173:34 | ...::build | main.rs:173:22:173:59 | ...::build(...) | provenance | Src:MaD:15 MaD:15 |
-| main.rs:173:22:173:59 | ...::build(...) | main.rs:173:61:173:65 | build | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:197:5:197:39 | ...::build(...) | main.rs:197:5:197:53 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:197:5:197:53 | ... .secure(...) | main.rs:197:55:197:60 | finish | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:198:5:198:39 | ...::build(...) | main.rs:198:5:198:53 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:198:5:198:53 | ... .secure(...) | main.rs:198:5:198:63 | ... .path(...) | provenance | MaD:34 |
-| main.rs:198:5:198:63 | ... .path(...) | main.rs:198:65:198:70 | finish | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:155:13:155:58 | ...::new(...) | main.rs:155:9:155:9 | i | provenance | Src:MaD:13  |
+| main.rs:156:20:156:20 | i | main.rs:156:20:156:28 | i.clone() | provenance | MaD:35 |
+| main.rs:156:20:156:28 | i.clone() | main.rs:156:20:156:46 | ... .set_name(...) | provenance | MaD:23 |
+| main.rs:156:20:156:46 | ... .set_name(...) | main.rs:156:20:156:46 | ... .set_name(...) | provenance | Sink:MaD:1 |
+| main.rs:157:20:157:20 | i | main.rs:157:20:157:28 | i.clone() | provenance | MaD:35 |
+| main.rs:157:20:157:28 | i.clone() | main.rs:157:20:157:48 | ... .set_value(...) | provenance | MaD:28 |
+| main.rs:157:20:157:48 | ... .set_value(...) | main.rs:157:20:157:48 | ... .set_value(...) | provenance | Sink:MaD:1 |
+| main.rs:158:20:158:20 | i | main.rs:158:20:158:28 | i.clone() | provenance | MaD:35 |
+| main.rs:158:20:158:28 | i.clone() | main.rs:158:20:158:48 | ... .set_http_only(...) | provenance | MaD:21 |
+| main.rs:158:20:158:48 | ... .set_http_only(...) | main.rs:158:20:158:48 | ... .set_http_only(...) | provenance | Sink:MaD:1 |
+| main.rs:159:20:159:20 | i | main.rs:159:20:159:28 | i.clone() | provenance | MaD:35 |
+| main.rs:159:20:159:28 | i.clone() | main.rs:159:20:159:70 | ... .set_same_site(...) | provenance | MaD:26 |
+| main.rs:159:20:159:70 | ... .set_same_site(...) | main.rs:159:20:159:70 | ... .set_same_site(...) | provenance | Sink:MaD:1 |
+| main.rs:160:20:160:20 | i | main.rs:160:20:160:28 | i.clone() | provenance | MaD:35 |
+| main.rs:160:20:160:28 | i.clone() | main.rs:160:20:160:46 | ... .set_max_age(...) | provenance | MaD:22 |
+| main.rs:160:20:160:46 | ... .set_max_age(...) | main.rs:160:20:160:46 | ... .set_max_age(...) | provenance | Sink:MaD:1 |
+| main.rs:161:20:161:20 | i | main.rs:161:20:161:28 | i.clone() | provenance | MaD:35 |
+| main.rs:161:20:161:28 | i.clone() | main.rs:161:20:161:42 | ... .set_path(...) | provenance | MaD:25 |
+| main.rs:161:20:161:42 | ... .set_path(...) | main.rs:161:20:161:42 | ... .set_path(...) | provenance | Sink:MaD:1 |
+| main.rs:162:20:162:20 | i | main.rs:162:20:162:28 | i.clone() | provenance | MaD:35 |
+| main.rs:162:20:162:28 | i.clone() | main.rs:162:20:162:41 | ... .unset_path() | provenance | MaD:31 |
+| main.rs:162:20:162:41 | ... .unset_path() | main.rs:162:20:162:41 | ... .unset_path() | provenance | Sink:MaD:1 |
+| main.rs:163:20:163:20 | i | main.rs:163:20:163:28 | i.clone() | provenance | MaD:35 |
+| main.rs:163:20:163:28 | i.clone() | main.rs:163:20:163:54 | ... .set_domain(...) | provenance | MaD:19 |
+| main.rs:163:20:163:54 | ... .set_domain(...) | main.rs:163:20:163:54 | ... .set_domain(...) | provenance | Sink:MaD:1 |
+| main.rs:164:20:164:20 | i | main.rs:164:20:164:28 | i.clone() | provenance | MaD:35 |
+| main.rs:164:20:164:28 | i.clone() | main.rs:164:20:164:43 | ... .unset_domain() | provenance | MaD:29 |
+| main.rs:164:20:164:43 | ... .unset_domain() | main.rs:164:20:164:43 | ... .unset_domain() | provenance | Sink:MaD:1 |
+| main.rs:165:20:165:20 | i | main.rs:165:20:165:28 | i.clone() | provenance | MaD:35 |
+| main.rs:165:20:165:28 | i.clone() | main.rs:165:20:165:46 | ... .set_expires(...) | provenance | MaD:20 |
+| main.rs:165:20:165:46 | ... .set_expires(...) | main.rs:165:20:165:46 | ... .set_expires(...) | provenance | Sink:MaD:1 |
+| main.rs:166:20:166:20 | i | main.rs:166:20:166:28 | i.clone() | provenance | MaD:35 |
+| main.rs:166:20:166:28 | i.clone() | main.rs:166:20:166:44 | ... .unset_expires() | provenance | MaD:30 |
+| main.rs:166:20:166:44 | ... .unset_expires() | main.rs:166:20:166:44 | ... .unset_expires() | provenance | Sink:MaD:1 |
+| main.rs:167:20:167:20 | i | main.rs:167:20:167:28 | i.clone() | provenance | MaD:35 |
+| main.rs:167:20:167:28 | i.clone() | main.rs:167:20:167:45 | ... .make_permanent() | provenance | MaD:18 |
+| main.rs:167:20:167:45 | ... .make_permanent() | main.rs:167:20:167:45 | ... .make_permanent() | provenance | Sink:MaD:1 |
+| main.rs:173:22:173:59 | ...::build(...) | main.rs:173:22:173:59 | ...::build(...) | provenance | Src:MaD:15 Sink:MaD:2 |
+| main.rs:197:5:197:39 | ...::build(...) | main.rs:197:5:197:53 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:197:5:197:53 | ... .secure(...) | main.rs:197:5:197:53 | ... .secure(...) | provenance | Sink:MaD:3 |
+| main.rs:198:5:198:39 | ...::build(...) | main.rs:198:5:198:53 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:198:5:198:53 | ... .secure(...) | main.rs:198:5:198:63 | ... .path(...) | provenance | MaD:33 |
+| main.rs:198:5:198:63 | ... .path(...) | main.rs:198:5:198:63 | ... .path(...) | provenance | Sink:MaD:3 |
 | main.rs:201:5:201:11 | [SSA] cookie1 | main.rs:202:13:202:19 | cookie1 | provenance |  |
 | main.rs:201:5:201:11 | cookie1 | main.rs:202:13:202:19 | cookie1 | provenance |  |
-| main.rs:202:13:202:19 | cookie1 | main.rs:202:13:202:27 | cookie1.clone() | provenance | MaD:18 |
-| main.rs:202:13:202:27 | cookie1.clone() | main.rs:202:9:202:11 | add | provenance | MaD:4 Sink:MaD:4 |
-| main.rs:212:5:212:22 | ...::build | main.rs:212:5:212:39 | ...::build(...) | provenance | Src:MaD:15 MaD:15 |
-| main.rs:212:5:212:39 | ...::build(...) | main.rs:212:41:212:46 | finish | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:202:13:202:19 | cookie1 | main.rs:202:13:202:27 | cookie1.clone() | provenance | MaD:35 |
+| main.rs:202:13:202:27 | cookie1.clone() | main.rs:202:13:202:27 | cookie1.clone() | provenance | Sink:MaD:4 |
+| main.rs:212:5:212:39 | ...::build(...) | main.rs:212:5:212:39 | ...::build(...) | provenance | Src:MaD:15 Sink:MaD:3 |
 | main.rs:214:9:214:15 | cookie3 | main.rs:215:13:215:19 | cookie3 | provenance |  |
-| main.rs:214:19:214:34 | ...::new | main.rs:214:19:214:51 | ...::new(...) | provenance | Src:MaD:17 MaD:17 |
-| main.rs:214:19:214:51 | ...::new(...) | main.rs:214:9:214:15 | cookie3 | provenance |  |
-| main.rs:215:13:215:19 | cookie3 | main.rs:215:13:215:27 | cookie3.clone() | provenance | MaD:18 |
-| main.rs:215:13:215:27 | cookie3.clone() | main.rs:215:9:215:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:214:19:214:51 | ...::new(...) | main.rs:214:9:214:15 | cookie3 | provenance | Src:MaD:17  |
+| main.rs:215:13:215:19 | cookie3 | main.rs:215:13:215:27 | cookie3.clone() | provenance | MaD:35 |
+| main.rs:215:13:215:27 | cookie3.clone() | main.rs:215:13:215:27 | cookie3.clone() | provenance | Sink:MaD:4 |
 | main.rs:218:5:218:11 | [SSA] cookie2 | main.rs:219:13:219:19 | cookie2 | provenance |  |
 | main.rs:218:5:218:11 | cookie2 | main.rs:219:13:219:19 | cookie2 | provenance |  |
-| main.rs:219:13:219:19 | cookie2 | main.rs:219:13:219:27 | cookie2.clone() | provenance | MaD:18 |
-| main.rs:219:13:219:27 | cookie2.clone() | main.rs:219:9:219:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:219:13:219:19 | cookie2 | main.rs:219:13:219:27 | cookie2.clone() | provenance | MaD:35 |
+| main.rs:219:13:219:27 | cookie2.clone() | main.rs:219:13:219:27 | cookie2.clone() | provenance | Sink:MaD:4 |
 | main.rs:228:5:228:11 | [SSA] cookie1 | main.rs:229:13:229:19 | cookie1 | provenance |  |
 | main.rs:228:5:228:11 | cookie1 | main.rs:229:13:229:19 | cookie1 | provenance |  |
-| main.rs:229:13:229:19 | cookie1 | main.rs:229:13:229:27 | cookie1.clone() | provenance | MaD:18 |
-| main.rs:229:13:229:27 | cookie1.clone() | main.rs:229:9:229:11 | add | provenance | MaD:11 Sink:MaD:11 |
-| main.rs:241:9:241:25 | cookie_config_bad | main.rs:242:43:242:59 | cookie_config_bad | provenance |  |
+| main.rs:229:13:229:19 | cookie1 | main.rs:229:13:229:27 | cookie1.clone() | provenance | MaD:35 |
+| main.rs:229:13:229:27 | cookie1.clone() | main.rs:229:13:229:27 | cookie1.clone() | provenance | Sink:MaD:11 |
+| main.rs:241:9:241:25 | cookie_config_bad | main.rs:242:43:242:59 | cookie_config_bad | provenance | Sink:MaD:10 |
 | main.rs:241:29:241:62 | ...::new(...) | main.rs:241:29:241:76 | ... .secure(...) | provenance | MaD:38 |
 | main.rs:241:29:241:76 | ... .secure(...) | main.rs:241:9:241:25 | cookie_config_bad | provenance |  |
-| main.rs:242:43:242:59 | cookie_config_bad | main.rs:242:9:242:41 | ...::new | provenance | MaD:10 Sink:MaD:10 |
-| main.rs:244:9:244:26 | cookie_config_bad2 | main.rs:245:43:245:60 | cookie_config_bad2 | provenance |  |
+| main.rs:244:9:244:26 | cookie_config_bad2 | main.rs:245:43:245:60 | cookie_config_bad2 | provenance | Sink:MaD:10 |
 | main.rs:244:30:244:63 | ...::new(...) | main.rs:244:30:244:77 | ... .secure(...) | provenance | MaD:38 |
 | main.rs:244:30:244:77 | ... .secure(...) | main.rs:244:30:244:90 | ... .name(...) | provenance | MaD:36 |
 | main.rs:244:30:244:90 | ... .name(...) | main.rs:244:30:244:100 | ... .path(...) | provenance | MaD:37 |
 | main.rs:244:30:244:100 | ... .path(...) | main.rs:244:9:244:26 | cookie_config_bad2 | provenance |  |
-| main.rs:245:43:245:60 | cookie_config_bad2 | main.rs:245:9:245:41 | ...::new | provenance | MaD:10 Sink:MaD:10 |
-| main.rs:259:5:259:43 | ...::build(...) | main.rs:259:5:259:57 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:259:5:259:57 | ... .secure(...) | main.rs:259:59:259:64 | finish | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:260:5:260:43 | ...::build(...) | main.rs:260:5:260:57 | ... .secure(...) | provenance | MaD:35 |
-| main.rs:260:5:260:57 | ... .secure(...) | main.rs:260:5:260:67 | ... .path(...) | provenance | MaD:34 |
-| main.rs:260:5:260:67 | ... .path(...) | main.rs:260:69:260:74 | finish | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:259:5:259:43 | ...::build(...) | main.rs:259:5:259:57 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:259:5:259:57 | ... .secure(...) | main.rs:259:5:259:57 | ... .secure(...) | provenance | Sink:MaD:3 |
+| main.rs:260:5:260:43 | ...::build(...) | main.rs:260:5:260:57 | ... .secure(...) | provenance | MaD:34 |
+| main.rs:260:5:260:57 | ... .secure(...) | main.rs:260:5:260:67 | ... .path(...) | provenance | MaD:33 |
+| main.rs:260:5:260:67 | ... .path(...) | main.rs:260:5:260:67 | ... .path(...) | provenance | Sink:MaD:3 |
 | main.rs:263:5:263:11 | [SSA] cookie1 | main.rs:264:13:264:19 | cookie1 | provenance |  |
 | main.rs:263:5:263:11 | cookie1 | main.rs:264:13:264:19 | cookie1 | provenance |  |
-| main.rs:264:13:264:19 | cookie1 | main.rs:264:13:264:27 | cookie1.clone() | provenance | MaD:18 |
-| main.rs:264:13:264:27 | cookie1.clone() | main.rs:264:9:264:11 | add | provenance | MaD:4 Sink:MaD:4 |
-| main.rs:274:5:274:26 | ...::build | main.rs:274:5:274:43 | ...::build(...) | provenance | Src:MaD:15 MaD:15 |
-| main.rs:274:5:274:43 | ...::build(...) | main.rs:274:45:274:50 | finish | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:264:13:264:19 | cookie1 | main.rs:264:13:264:27 | cookie1.clone() | provenance | MaD:35 |
+| main.rs:264:13:264:27 | cookie1.clone() | main.rs:264:13:264:27 | cookie1.clone() | provenance | Sink:MaD:4 |
+| main.rs:274:5:274:43 | ...::build(...) | main.rs:274:5:274:43 | ...::build(...) | provenance | Src:MaD:15 Sink:MaD:3 |
 | main.rs:276:9:276:15 | cookie3 | main.rs:277:13:277:19 | cookie3 | provenance |  |
-| main.rs:276:19:276:38 | ...::new | main.rs:276:19:276:55 | ...::new(...) | provenance | Src:MaD:17 MaD:17 |
-| main.rs:276:19:276:55 | ...::new(...) | main.rs:276:9:276:15 | cookie3 | provenance |  |
-| main.rs:277:13:277:19 | cookie3 | main.rs:277:13:277:27 | cookie3.clone() | provenance | MaD:18 |
-| main.rs:277:13:277:27 | cookie3.clone() | main.rs:277:9:277:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:276:19:276:55 | ...::new(...) | main.rs:276:9:276:15 | cookie3 | provenance | Src:MaD:17  |
+| main.rs:277:13:277:19 | cookie3 | main.rs:277:13:277:27 | cookie3.clone() | provenance | MaD:35 |
+| main.rs:277:13:277:27 | cookie3.clone() | main.rs:277:13:277:27 | cookie3.clone() | provenance | Sink:MaD:4 |
 | main.rs:280:5:280:11 | [SSA] cookie2 | main.rs:281:13:281:19 | cookie2 | provenance |  |
 | main.rs:280:5:280:11 | cookie2 | main.rs:281:13:281:19 | cookie2 | provenance |  |
-| main.rs:281:13:281:19 | cookie2 | main.rs:281:13:281:27 | cookie2.clone() | provenance | MaD:18 |
-| main.rs:281:13:281:27 | cookie2.clone() | main.rs:281:9:281:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:281:13:281:19 | cookie2 | main.rs:281:13:281:27 | cookie2.clone() | provenance | MaD:35 |
+| main.rs:281:13:281:27 | cookie2.clone() | main.rs:281:13:281:27 | cookie2.clone() | provenance | Sink:MaD:4 |
 models
 | 1 | Sink: <biscotti::response_cookies::ResponseCookies>::insert; Argument[0]; cookie-use |
 | 2 | Sink: <cookie::builder::CookieBuilder>::build; Argument[self]; cookie-use |
@@ -321,303 +305,287 @@ models
 | 15 | Source: <cookie::Cookie>::build; ReturnValue; cookie-create |
 | 16 | Source: <cookie::Cookie>::named; ReturnValue; cookie-create |
 | 17 | Source: <cookie::Cookie>::new; ReturnValue; cookie-create |
-| 18 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
-| 19 | Summary: <biscotti::response_cookie::ResponseCookie>::make_permanent; Argument[self]; ReturnValue; taint |
-| 20 | Summary: <biscotti::response_cookie::ResponseCookie>::set_domain; Argument[self]; ReturnValue; taint |
-| 21 | Summary: <biscotti::response_cookie::ResponseCookie>::set_expires; Argument[self]; ReturnValue; taint |
-| 22 | Summary: <biscotti::response_cookie::ResponseCookie>::set_http_only; Argument[self]; ReturnValue; taint |
-| 23 | Summary: <biscotti::response_cookie::ResponseCookie>::set_max_age; Argument[self]; ReturnValue; taint |
-| 24 | Summary: <biscotti::response_cookie::ResponseCookie>::set_name; Argument[self]; ReturnValue; taint |
-| 25 | Summary: <biscotti::response_cookie::ResponseCookie>::set_partitioned; Argument[self].OptionalBarrier[cookie-partitioned-arg0]; ReturnValue; taint |
-| 26 | Summary: <biscotti::response_cookie::ResponseCookie>::set_path; Argument[self]; ReturnValue; taint |
-| 27 | Summary: <biscotti::response_cookie::ResponseCookie>::set_same_site; Argument[self]; ReturnValue; taint |
-| 28 | Summary: <biscotti::response_cookie::ResponseCookie>::set_secure; Argument[self].OptionalBarrier[cookie-secure-arg0]; ReturnValue; taint |
-| 29 | Summary: <biscotti::response_cookie::ResponseCookie>::set_value; Argument[self]; ReturnValue; taint |
-| 30 | Summary: <biscotti::response_cookie::ResponseCookie>::unset_domain; Argument[self]; ReturnValue; taint |
-| 31 | Summary: <biscotti::response_cookie::ResponseCookie>::unset_expires; Argument[self]; ReturnValue; taint |
-| 32 | Summary: <biscotti::response_cookie::ResponseCookie>::unset_path; Argument[self]; ReturnValue; taint |
-| 33 | Summary: <cookie::builder::CookieBuilder>::partitioned; Argument[self].OptionalBarrier[cookie-partitioned-arg0]; ReturnValue; taint |
-| 34 | Summary: <cookie::builder::CookieBuilder>::path; Argument[self]; ReturnValue; taint |
-| 35 | Summary: <cookie::builder::CookieBuilder>::secure; Argument[self].OptionalBarrier[cookie-secure-arg0]; ReturnValue; taint |
+| 18 | Summary: <biscotti::response_cookie::ResponseCookie>::make_permanent; Argument[self]; ReturnValue; taint |
+| 19 | Summary: <biscotti::response_cookie::ResponseCookie>::set_domain; Argument[self]; ReturnValue; taint |
+| 20 | Summary: <biscotti::response_cookie::ResponseCookie>::set_expires; Argument[self]; ReturnValue; taint |
+| 21 | Summary: <biscotti::response_cookie::ResponseCookie>::set_http_only; Argument[self]; ReturnValue; taint |
+| 22 | Summary: <biscotti::response_cookie::ResponseCookie>::set_max_age; Argument[self]; ReturnValue; taint |
+| 23 | Summary: <biscotti::response_cookie::ResponseCookie>::set_name; Argument[self]; ReturnValue; taint |
+| 24 | Summary: <biscotti::response_cookie::ResponseCookie>::set_partitioned; Argument[self].OptionalBarrier[cookie-partitioned-arg0]; ReturnValue; taint |
+| 25 | Summary: <biscotti::response_cookie::ResponseCookie>::set_path; Argument[self]; ReturnValue; taint |
+| 26 | Summary: <biscotti::response_cookie::ResponseCookie>::set_same_site; Argument[self]; ReturnValue; taint |
+| 27 | Summary: <biscotti::response_cookie::ResponseCookie>::set_secure; Argument[self].OptionalBarrier[cookie-secure-arg0]; ReturnValue; taint |
+| 28 | Summary: <biscotti::response_cookie::ResponseCookie>::set_value; Argument[self]; ReturnValue; taint |
+| 29 | Summary: <biscotti::response_cookie::ResponseCookie>::unset_domain; Argument[self]; ReturnValue; taint |
+| 30 | Summary: <biscotti::response_cookie::ResponseCookie>::unset_expires; Argument[self]; ReturnValue; taint |
+| 31 | Summary: <biscotti::response_cookie::ResponseCookie>::unset_path; Argument[self]; ReturnValue; taint |
+| 32 | Summary: <cookie::builder::CookieBuilder>::partitioned; Argument[self].OptionalBarrier[cookie-partitioned-arg0]; ReturnValue; taint |
+| 33 | Summary: <cookie::builder::CookieBuilder>::path; Argument[self]; ReturnValue; taint |
+| 34 | Summary: <cookie::builder::CookieBuilder>::secure; Argument[self].OptionalBarrier[cookie-secure-arg0]; ReturnValue; taint |
+| 35 | Summary: <core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
 | 36 | Summary: <poem::session::cookie_config::CookieConfig>::name; Argument[self]; ReturnValue; taint |
 | 37 | Summary: <poem::session::cookie_config::CookieConfig>::path; Argument[self]; ReturnValue; taint |
 | 38 | Summary: <poem::session::cookie_config::CookieConfig>::secure; Argument[self].OptionalBarrier[cookie-secure-arg0]; ReturnValue; taint |
 nodes
 | main.rs:8:19:8:50 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:8:19:8:64 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:8:66:8:70 | build | semmle.label | build |
-| main.rs:16:19:16:31 | ...::build | semmle.label | ...::build |
+| main.rs:8:19:8:64 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:16:19:16:50 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:16:19:16:50 | ...::build(...) | semmle.label | ...::build(...) |
-| main.rs:16:52:16:56 | build | semmle.label | build |
 | main.rs:20:5:20:36 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:20:5:20:54 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:20:56:20:60 | build | semmle.label | build |
+| main.rs:20:5:20:54 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:21:5:21:36 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:21:5:21:55 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:21:57:21:61 | build | semmle.label | build |
+| main.rs:21:5:21:55 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:25:5:25:36 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:25:5:25:52 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:25:54:25:58 | build | semmle.label | build |
+| main.rs:25:5:25:52 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:26:5:26:36 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:26:5:26:50 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:26:52:26:56 | build | semmle.label | build |
+| main.rs:26:5:26:50 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:27:5:27:36 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:27:5:27:51 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:27:53:27:57 | build | semmle.label | build |
+| main.rs:27:5:27:51 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:28:5:28:36 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:28:5:28:60 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:28:62:28:66 | build | semmle.label | build |
+| main.rs:28:5:28:60 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:29:5:29:36 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:29:5:29:60 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:29:62:29:66 | build | semmle.label | build |
+| main.rs:29:5:29:60 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:33:9:33:40 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:33:9:33:58 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:33:60:33:64 | build | semmle.label | build |
+| main.rs:33:9:33:58 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:35:9:35:40 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:35:9:35:58 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:35:60:35:64 | build | semmle.label | build |
+| main.rs:35:9:35:58 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:39:5:39:39 | ...::new(...) | semmle.label | ...::new(...) |
 | main.rs:39:5:39:53 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:39:55:39:59 | build | semmle.label | build |
+| main.rs:39:5:39:53 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:40:5:40:50 | ... .expires(...) | semmle.label | ... .expires(...) |
 | main.rs:40:5:40:64 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:40:66:40:70 | build | semmle.label | build |
+| main.rs:40:5:40:64 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:41:5:41:79 | ... .max_age(...) | semmle.label | ... .max_age(...) |
 | main.rs:41:5:41:93 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:41:95:41:99 | build | semmle.label | build |
+| main.rs:41:5:41:93 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:42:5:42:58 | ... .domain(...) | semmle.label | ... .domain(...) |
 | main.rs:42:5:42:72 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:42:74:42:78 | build | semmle.label | build |
+| main.rs:42:5:42:72 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:43:5:43:46 | ... .path(...) | semmle.label | ... .path(...) |
 | main.rs:43:5:43:60 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:43:62:43:66 | build | semmle.label | build |
+| main.rs:43:5:43:60 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:44:5:44:52 | ... .http_only(...) | semmle.label | ... .http_only(...) |
 | main.rs:44:5:44:66 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:44:68:44:72 | build | semmle.label | build |
+| main.rs:44:5:44:66 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:45:5:45:72 | ... .same_site(...) | semmle.label | ... .same_site(...) |
 | main.rs:45:5:45:86 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:45:88:45:92 | build | semmle.label | build |
+| main.rs:45:5:45:86 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:46:5:46:48 | ... .permanent() | semmle.label | ... .permanent() |
 | main.rs:46:5:46:62 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:46:64:46:68 | build | semmle.label | build |
+| main.rs:46:5:46:62 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:47:5:47:46 | ... .removal() | semmle.label | ... .removal() |
 | main.rs:47:5:47:60 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:47:62:47:66 | build | semmle.label | build |
+| main.rs:47:5:47:60 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:48:5:48:36 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:48:5:48:50 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:48:52:48:57 | finish | semmle.label | finish |
+| main.rs:48:5:48:50 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:49:5:49:25 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:49:5:49:39 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:49:41:49:45 | build | semmle.label | build |
+| main.rs:49:5:49:39 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:50:5:50:40 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:50:5:50:54 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:50:56:50:60 | build | semmle.label | build |
+| main.rs:50:5:50:54 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:53:5:53:49 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:53:5:53:63 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:53:65:53:69 | build | semmle.label | build |
+| main.rs:53:5:53:63 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:58:9:58:13 | mut a | semmle.label | mut a |
-| main.rs:58:17:58:27 | ...::new | semmle.label | ...::new |
 | main.rs:58:17:58:44 | ...::new(...) | semmle.label | ...::new(...) |
-| main.rs:59:9:59:11 | add | semmle.label | add |
 | main.rs:59:13:59:13 | a | semmle.label | a |
 | main.rs:59:13:59:21 | a.clone() | semmle.label | a.clone() |
-| main.rs:60:9:60:20 | add_original | semmle.label | add_original |
+| main.rs:59:13:59:21 | a.clone() | semmle.label | a.clone() |
 | main.rs:60:22:60:22 | a | semmle.label | a |
 | main.rs:60:22:60:30 | a.clone() | semmle.label | a.clone() |
+| main.rs:60:22:60:30 | a.clone() | semmle.label | a.clone() |
 | main.rs:63:5:63:5 | [SSA] a | semmle.label | [SSA] a |
 | main.rs:63:5:63:5 | a | semmle.label | a |
-| main.rs:64:9:64:11 | add | semmle.label | add |
 | main.rs:64:13:64:13 | a | semmle.label | a |
 | main.rs:64:13:64:21 | a.clone() | semmle.label | a.clone() |
+| main.rs:64:13:64:21 | a.clone() | semmle.label | a.clone() |
 | main.rs:68:9:68:13 | mut b | semmle.label | mut b |
-| main.rs:68:17:68:29 | ...::named | semmle.label | ...::named |
 | main.rs:68:17:68:37 | ...::named(...) | semmle.label | ...::named(...) |
-| main.rs:69:16:69:18 | add | semmle.label | add |
 | main.rs:69:20:69:20 | b | semmle.label | b |
 | main.rs:69:20:69:28 | b.clone() | semmle.label | b.clone() |
-| main.rs:70:16:70:27 | add_original | semmle.label | add_original |
+| main.rs:69:20:69:28 | b.clone() | semmle.label | b.clone() |
 | main.rs:70:29:70:29 | a | semmle.label | a |
 | main.rs:70:29:70:37 | a.clone() | semmle.label | a.clone() |
+| main.rs:70:29:70:37 | a.clone() | semmle.label | a.clone() |
 | main.rs:71:5:71:5 | [SSA] b | semmle.label | [SSA] b |
 | main.rs:71:5:71:5 | b | semmle.label | b |
-| main.rs:72:16:72:18 | add | semmle.label | add |
 | main.rs:72:20:72:20 | b | semmle.label | b |
 | main.rs:72:20:72:28 | b.clone() | semmle.label | b.clone() |
+| main.rs:72:20:72:28 | b.clone() | semmle.label | b.clone() |
 | main.rs:77:9:77:13 | mut c | semmle.label | mut c |
-| main.rs:77:17:77:28 | ...::from | semmle.label | ...::from |
 | main.rs:77:17:77:36 | ...::from(...) | semmle.label | ...::from(...) |
-| main.rs:78:17:78:19 | add | semmle.label | add |
 | main.rs:78:21:78:21 | c | semmle.label | c |
 | main.rs:78:21:78:29 | c.clone() | semmle.label | c.clone() |
-| main.rs:79:17:79:28 | add_original | semmle.label | add_original |
+| main.rs:78:21:78:29 | c.clone() | semmle.label | c.clone() |
 | main.rs:79:30:79:30 | a | semmle.label | a |
 | main.rs:79:30:79:38 | a.clone() | semmle.label | a.clone() |
-| main.rs:83:17:83:19 | add | semmle.label | add |
+| main.rs:79:30:79:38 | a.clone() | semmle.label | a.clone() |
 | main.rs:83:21:83:21 | c | semmle.label | c |
 | main.rs:83:21:83:29 | c.clone() | semmle.label | c.clone() |
+| main.rs:83:21:83:29 | c.clone() | semmle.label | c.clone() |
 | main.rs:87:9:87:13 | mut d | semmle.label | mut d |
-| main.rs:87:17:87:28 | ...::from | semmle.label | ...::from |
 | main.rs:87:17:87:36 | ...::from(...) | semmle.label | ...::from(...) |
-| main.rs:88:9:88:11 | add | semmle.label | add |
 | main.rs:88:13:88:13 | d | semmle.label | d |
 | main.rs:88:13:88:21 | d.clone() | semmle.label | d.clone() |
-| main.rs:94:9:94:11 | add | semmle.label | add |
+| main.rs:88:13:88:21 | d.clone() | semmle.label | d.clone() |
 | main.rs:94:13:94:13 | d | semmle.label | d |
 | main.rs:94:13:94:21 | d.clone() | semmle.label | d.clone() |
-| main.rs:114:5:114:17 | ...::build | semmle.label | ...::build |
+| main.rs:94:13:94:21 | d.clone() | semmle.label | d.clone() |
+| main.rs:114:5:114:36 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:114:5:114:36 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:114:5:114:54 | ... .partitioned(...) | semmle.label | ... .partitioned(...) |
-| main.rs:114:56:114:60 | build | semmle.label | build |
+| main.rs:114:5:114:54 | ... .partitioned(...) | semmle.label | ... .partitioned(...) |
 | main.rs:122:9:122:9 | a | semmle.label | a |
-| main.rs:122:13:122:41 | ...::new | semmle.label | ...::new |
 | main.rs:122:13:122:58 | ...::new(...) | semmle.label | ...::new(...) |
-| main.rs:123:13:123:18 | insert | semmle.label | insert |
 | main.rs:123:20:123:20 | a | semmle.label | a |
 | main.rs:123:20:123:28 | a.clone() | semmle.label | a.clone() |
+| main.rs:123:20:123:28 | a.clone() | semmle.label | a.clone() |
 | main.rs:130:9:130:9 | c | semmle.label | c |
 | main.rs:130:13:130:13 | b | semmle.label | b |
 | main.rs:130:13:130:31 | b.set_secure(...) | semmle.label | b.set_secure(...) |
-| main.rs:131:13:131:18 | insert | semmle.label | insert |
 | main.rs:131:20:131:20 | c | semmle.label | c |
 | main.rs:131:20:131:28 | c.clone() | semmle.label | c.clone() |
+| main.rs:131:20:131:28 | c.clone() | semmle.label | c.clone() |
 | main.rs:134:9:134:9 | d | semmle.label | d |
 | main.rs:134:13:134:13 | c | semmle.label | c |
 | main.rs:134:13:134:35 | c.set_partitioned(...) | semmle.label | c.set_partitioned(...) |
-| main.rs:135:13:135:18 | insert | semmle.label | insert |
 | main.rs:135:20:135:20 | d | semmle.label | d |
 | main.rs:135:20:135:28 | d.clone() | semmle.label | d.clone() |
+| main.rs:135:20:135:28 | d.clone() | semmle.label | d.clone() |
 | main.rs:146:9:146:9 | g | semmle.label | g |
 | main.rs:146:13:146:13 | f | semmle.label | f |
 | main.rs:146:13:146:31 | f.set_secure(...) | semmle.label | f.set_secure(...) |
-| main.rs:147:13:147:18 | insert | semmle.label | insert |
 | main.rs:147:20:147:20 | g | semmle.label | g |
 | main.rs:147:20:147:28 | g.clone() | semmle.label | g.clone() |
+| main.rs:147:20:147:28 | g.clone() | semmle.label | g.clone() |
 | main.rs:151:9:151:9 | h | semmle.label | h |
-| main.rs:151:13:151:42 | ...::from | semmle.label | ...::from |
 | main.rs:151:13:151:61 | ...::from(...) | semmle.label | ...::from(...) |
-| main.rs:152:13:152:18 | insert | semmle.label | insert |
 | main.rs:152:20:152:20 | h | semmle.label | h |
 | main.rs:155:9:155:9 | i | semmle.label | i |
-| main.rs:155:13:155:41 | ...::new | semmle.label | ...::new |
 | main.rs:155:13:155:58 | ...::new(...) | semmle.label | ...::new(...) |
-| main.rs:156:13:156:18 | insert | semmle.label | insert |
 | main.rs:156:20:156:20 | i | semmle.label | i |
 | main.rs:156:20:156:28 | i.clone() | semmle.label | i.clone() |
 | main.rs:156:20:156:46 | ... .set_name(...) | semmle.label | ... .set_name(...) |
-| main.rs:157:13:157:18 | insert | semmle.label | insert |
+| main.rs:156:20:156:46 | ... .set_name(...) | semmle.label | ... .set_name(...) |
 | main.rs:157:20:157:20 | i | semmle.label | i |
 | main.rs:157:20:157:28 | i.clone() | semmle.label | i.clone() |
 | main.rs:157:20:157:48 | ... .set_value(...) | semmle.label | ... .set_value(...) |
-| main.rs:158:13:158:18 | insert | semmle.label | insert |
+| main.rs:157:20:157:48 | ... .set_value(...) | semmle.label | ... .set_value(...) |
 | main.rs:158:20:158:20 | i | semmle.label | i |
 | main.rs:158:20:158:28 | i.clone() | semmle.label | i.clone() |
 | main.rs:158:20:158:48 | ... .set_http_only(...) | semmle.label | ... .set_http_only(...) |
-| main.rs:159:13:159:18 | insert | semmle.label | insert |
+| main.rs:158:20:158:48 | ... .set_http_only(...) | semmle.label | ... .set_http_only(...) |
 | main.rs:159:20:159:20 | i | semmle.label | i |
 | main.rs:159:20:159:28 | i.clone() | semmle.label | i.clone() |
 | main.rs:159:20:159:70 | ... .set_same_site(...) | semmle.label | ... .set_same_site(...) |
-| main.rs:160:13:160:18 | insert | semmle.label | insert |
+| main.rs:159:20:159:70 | ... .set_same_site(...) | semmle.label | ... .set_same_site(...) |
 | main.rs:160:20:160:20 | i | semmle.label | i |
 | main.rs:160:20:160:28 | i.clone() | semmle.label | i.clone() |
 | main.rs:160:20:160:46 | ... .set_max_age(...) | semmle.label | ... .set_max_age(...) |
-| main.rs:161:13:161:18 | insert | semmle.label | insert |
+| main.rs:160:20:160:46 | ... .set_max_age(...) | semmle.label | ... .set_max_age(...) |
 | main.rs:161:20:161:20 | i | semmle.label | i |
 | main.rs:161:20:161:28 | i.clone() | semmle.label | i.clone() |
 | main.rs:161:20:161:42 | ... .set_path(...) | semmle.label | ... .set_path(...) |
-| main.rs:162:13:162:18 | insert | semmle.label | insert |
+| main.rs:161:20:161:42 | ... .set_path(...) | semmle.label | ... .set_path(...) |
 | main.rs:162:20:162:20 | i | semmle.label | i |
 | main.rs:162:20:162:28 | i.clone() | semmle.label | i.clone() |
 | main.rs:162:20:162:41 | ... .unset_path() | semmle.label | ... .unset_path() |
-| main.rs:163:13:163:18 | insert | semmle.label | insert |
+| main.rs:162:20:162:41 | ... .unset_path() | semmle.label | ... .unset_path() |
 | main.rs:163:20:163:20 | i | semmle.label | i |
 | main.rs:163:20:163:28 | i.clone() | semmle.label | i.clone() |
 | main.rs:163:20:163:54 | ... .set_domain(...) | semmle.label | ... .set_domain(...) |
-| main.rs:164:13:164:18 | insert | semmle.label | insert |
+| main.rs:163:20:163:54 | ... .set_domain(...) | semmle.label | ... .set_domain(...) |
 | main.rs:164:20:164:20 | i | semmle.label | i |
 | main.rs:164:20:164:28 | i.clone() | semmle.label | i.clone() |
 | main.rs:164:20:164:43 | ... .unset_domain() | semmle.label | ... .unset_domain() |
-| main.rs:165:13:165:18 | insert | semmle.label | insert |
+| main.rs:164:20:164:43 | ... .unset_domain() | semmle.label | ... .unset_domain() |
 | main.rs:165:20:165:20 | i | semmle.label | i |
 | main.rs:165:20:165:28 | i.clone() | semmle.label | i.clone() |
 | main.rs:165:20:165:46 | ... .set_expires(...) | semmle.label | ... .set_expires(...) |
-| main.rs:166:13:166:18 | insert | semmle.label | insert |
+| main.rs:165:20:165:46 | ... .set_expires(...) | semmle.label | ... .set_expires(...) |
 | main.rs:166:20:166:20 | i | semmle.label | i |
 | main.rs:166:20:166:28 | i.clone() | semmle.label | i.clone() |
 | main.rs:166:20:166:44 | ... .unset_expires() | semmle.label | ... .unset_expires() |
-| main.rs:167:13:167:18 | insert | semmle.label | insert |
+| main.rs:166:20:166:44 | ... .unset_expires() | semmle.label | ... .unset_expires() |
 | main.rs:167:20:167:20 | i | semmle.label | i |
 | main.rs:167:20:167:28 | i.clone() | semmle.label | i.clone() |
 | main.rs:167:20:167:45 | ... .make_permanent() | semmle.label | ... .make_permanent() |
-| main.rs:173:22:173:34 | ...::build | semmle.label | ...::build |
+| main.rs:167:20:167:45 | ... .make_permanent() | semmle.label | ... .make_permanent() |
+| main.rs:173:22:173:59 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:173:22:173:59 | ...::build(...) | semmle.label | ...::build(...) |
-| main.rs:173:61:173:65 | build | semmle.label | build |
 | main.rs:197:5:197:39 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:197:5:197:53 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:197:55:197:60 | finish | semmle.label | finish |
+| main.rs:197:5:197:53 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:198:5:198:39 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:198:5:198:53 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:198:5:198:63 | ... .path(...) | semmle.label | ... .path(...) |
-| main.rs:198:65:198:70 | finish | semmle.label | finish |
+| main.rs:198:5:198:63 | ... .path(...) | semmle.label | ... .path(...) |
 | main.rs:201:5:201:11 | [SSA] cookie1 | semmle.label | [SSA] cookie1 |
 | main.rs:201:5:201:11 | cookie1 | semmle.label | cookie1 |
-| main.rs:202:9:202:11 | add | semmle.label | add |
 | main.rs:202:13:202:19 | cookie1 | semmle.label | cookie1 |
 | main.rs:202:13:202:27 | cookie1.clone() | semmle.label | cookie1.clone() |
-| main.rs:212:5:212:22 | ...::build | semmle.label | ...::build |
+| main.rs:202:13:202:27 | cookie1.clone() | semmle.label | cookie1.clone() |
+| main.rs:212:5:212:39 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:212:5:212:39 | ...::build(...) | semmle.label | ...::build(...) |
-| main.rs:212:41:212:46 | finish | semmle.label | finish |
 | main.rs:214:9:214:15 | cookie3 | semmle.label | cookie3 |
-| main.rs:214:19:214:34 | ...::new | semmle.label | ...::new |
 | main.rs:214:19:214:51 | ...::new(...) | semmle.label | ...::new(...) |
-| main.rs:215:9:215:11 | add | semmle.label | add |
 | main.rs:215:13:215:19 | cookie3 | semmle.label | cookie3 |
 | main.rs:215:13:215:27 | cookie3.clone() | semmle.label | cookie3.clone() |
+| main.rs:215:13:215:27 | cookie3.clone() | semmle.label | cookie3.clone() |
 | main.rs:218:5:218:11 | [SSA] cookie2 | semmle.label | [SSA] cookie2 |
 | main.rs:218:5:218:11 | cookie2 | semmle.label | cookie2 |
-| main.rs:219:9:219:11 | add | semmle.label | add |
 | main.rs:219:13:219:19 | cookie2 | semmle.label | cookie2 |
 | main.rs:219:13:219:27 | cookie2.clone() | semmle.label | cookie2.clone() |
+| main.rs:219:13:219:27 | cookie2.clone() | semmle.label | cookie2.clone() |
 | main.rs:228:5:228:11 | [SSA] cookie1 | semmle.label | [SSA] cookie1 |
 | main.rs:228:5:228:11 | cookie1 | semmle.label | cookie1 |
-| main.rs:229:9:229:11 | add | semmle.label | add |
 | main.rs:229:13:229:19 | cookie1 | semmle.label | cookie1 |
 | main.rs:229:13:229:27 | cookie1.clone() | semmle.label | cookie1.clone() |
+| main.rs:229:13:229:27 | cookie1.clone() | semmle.label | cookie1.clone() |
 | main.rs:241:9:241:25 | cookie_config_bad | semmle.label | cookie_config_bad |
 | main.rs:241:29:241:62 | ...::new(...) | semmle.label | ...::new(...) |
 | main.rs:241:29:241:76 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:242:9:242:41 | ...::new | semmle.label | ...::new |
 | main.rs:242:43:242:59 | cookie_config_bad | semmle.label | cookie_config_bad |
 | main.rs:244:9:244:26 | cookie_config_bad2 | semmle.label | cookie_config_bad2 |
 | main.rs:244:30:244:63 | ...::new(...) | semmle.label | ...::new(...) |
 | main.rs:244:30:244:77 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:244:30:244:90 | ... .name(...) | semmle.label | ... .name(...) |
 | main.rs:244:30:244:100 | ... .path(...) | semmle.label | ... .path(...) |
-| main.rs:245:9:245:41 | ...::new | semmle.label | ...::new |
 | main.rs:245:43:245:60 | cookie_config_bad2 | semmle.label | cookie_config_bad2 |
 | main.rs:259:5:259:43 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:259:5:259:57 | ... .secure(...) | semmle.label | ... .secure(...) |
-| main.rs:259:59:259:64 | finish | semmle.label | finish |
+| main.rs:259:5:259:57 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:260:5:260:43 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:260:5:260:57 | ... .secure(...) | semmle.label | ... .secure(...) |
 | main.rs:260:5:260:67 | ... .path(...) | semmle.label | ... .path(...) |
-| main.rs:260:69:260:74 | finish | semmle.label | finish |
+| main.rs:260:5:260:67 | ... .path(...) | semmle.label | ... .path(...) |
 | main.rs:263:5:263:11 | [SSA] cookie1 | semmle.label | [SSA] cookie1 |
 | main.rs:263:5:263:11 | cookie1 | semmle.label | cookie1 |
-| main.rs:264:9:264:11 | add | semmle.label | add |
 | main.rs:264:13:264:19 | cookie1 | semmle.label | cookie1 |
 | main.rs:264:13:264:27 | cookie1.clone() | semmle.label | cookie1.clone() |
-| main.rs:274:5:274:26 | ...::build | semmle.label | ...::build |
+| main.rs:264:13:264:27 | cookie1.clone() | semmle.label | cookie1.clone() |
+| main.rs:274:5:274:43 | ...::build(...) | semmle.label | ...::build(...) |
 | main.rs:274:5:274:43 | ...::build(...) | semmle.label | ...::build(...) |
-| main.rs:274:45:274:50 | finish | semmle.label | finish |
 | main.rs:276:9:276:15 | cookie3 | semmle.label | cookie3 |
-| main.rs:276:19:276:38 | ...::new | semmle.label | ...::new |
 | main.rs:276:19:276:55 | ...::new(...) | semmle.label | ...::new(...) |
-| main.rs:277:9:277:11 | add | semmle.label | add |
 | main.rs:277:13:277:19 | cookie3 | semmle.label | cookie3 |
 | main.rs:277:13:277:27 | cookie3.clone() | semmle.label | cookie3.clone() |
+| main.rs:277:13:277:27 | cookie3.clone() | semmle.label | cookie3.clone() |
 | main.rs:280:5:280:11 | [SSA] cookie2 | semmle.label | [SSA] cookie2 |
 | main.rs:280:5:280:11 | cookie2 | semmle.label | cookie2 |
-| main.rs:281:9:281:11 | add | semmle.label | add |
 | main.rs:281:13:281:19 | cookie2 | semmle.label | cookie2 |
 | main.rs:281:13:281:27 | cookie2.clone() | semmle.label | cookie2.clone() |
+| main.rs:281:13:281:27 | cookie2.clone() | semmle.label | cookie2.clone() |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected b/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected
index cf0f287e4f7b..7430d3bacfc3 100644
--- a/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected
+++ b/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected
@@ -22,8 +22,8 @@
 | test.rs:125:9:125:44 | ... .write_all(...) | test.rs:128:1:128:7 | Attr | test.rs:125:9:125:44 | ... .write_all(...) | Call to ... .write_all(...) from the standard library in a function with the ctor attribute. |
 | test.rs:125:9:125:44 | ... .write_all(...) | test.rs:144:1:144:7 | Attr | test.rs:125:9:125:44 | ... .write_all(...) | Call to ... .write_all(...) from the standard library in a function with the ctor attribute. |
 | test.rs:125:9:125:44 | ... .write_all(...) | test.rs:150:1:150:7 | Attr | test.rs:125:9:125:44 | ... .write_all(...) | Call to ... .write_all(...) from the standard library in a function with the ctor attribute. |
-| test.rs:168:1:168:7 | ... .write(...) | test.rs:168:1:168:7 | Attr | test.rs:168:1:168:7 | ... .write(...) | Call to ... .write(...) from the standard library in a function with the ctor attribute. |
-| test.rs:168:1:168:7 | ...::stdout(...) | test.rs:168:1:168:7 | Attr | test.rs:168:1:168:7 | ...::stdout(...) | Call to ...::stdout(...) from the standard library in a function with the ctor attribute. |
+| test.rs:168:3:168:6 | ... .write(...) | test.rs:168:1:168:7 | Attr | test.rs:168:3:168:6 | ... .write(...) | Call to ... .write(...) from the standard library in a function with the ctor attribute. |
+| test.rs:168:3:168:6 | ...::stdout(...) | test.rs:168:1:168:7 | Attr | test.rs:168:3:168:6 | ...::stdout(...) | Call to ...::stdout(...) from the standard library in a function with the ctor attribute. |
 edges
 | test.rs:28:1:28:13 | Attr | test.rs:29:4:31:1 | fn bad1_1 |
 | test.rs:29:4:31:1 | fn bad1_1 | test.rs:30:9:30:25 | ...::stdout(...) |
@@ -65,5 +65,5 @@ edges
 | test.rs:151:4:153:1 | fn bad3_4 | test.rs:152:5:152:12 | bad3_3(...) |
 | test.rs:152:5:152:12 | bad3_3(...) | test.rs:145:4:148:1 | fn bad3_3 |
 | test.rs:168:1:168:7 | Attr | test.rs:169:4:171:1 | fn bad4_1 |
-| test.rs:169:4:171:1 | fn bad4_1 | test.rs:168:1:168:7 | ... .write(...) |
-| test.rs:169:4:171:1 | fn bad4_1 | test.rs:168:1:168:7 | ...::stdout(...) |
+| test.rs:169:4:171:1 | fn bad4_1 | test.rs:168:3:168:6 | ... .write(...) |
+| test.rs:169:4:171:1 | fn bad4_1 | test.rs:168:3:168:6 | ...::stdout(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-770/Cargo.lock b/rust/ql/test/query-tests/security/CWE-770/Cargo.lock
index 444f7a92c563..0f0124e7d69f 100644
--- a/rust/ql/test/query-tests/security/CWE-770/Cargo.lock
+++ b/rust/ql/test/query-tests/security/CWE-770/Cargo.lock
@@ -2,15 +2,1030 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "actix-codec"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c13df95297bcf9014dc89162b0cc69431e192e34e3b419612fc124cfcd45dbf"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "actix-http"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b796ba3c974e5133f6ca1a2c4e97c5941ea1a46d202df83344afaa18219f1a62"
+dependencies = [
+ "actix-codec",
+ "actix-service",
+ "actix-utils",
+ "bitflags",
+ "bytes",
+ "bytestring",
+ "derive_more",
+ "encoding_rs",
+ "foldhash",
+ "futures-core",
+ "http",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "language-tags",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "actix-router"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14f8c75c51892f18d9c46150c5ac7beb81c95f78c8b83a634d49f4ca32551fe7"
+dependencies = [
+ "bytestring",
+ "cfg-if",
+ "http",
+ "regex-lite",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "actix-rt"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92589714878ca59a7626ea19734f0e07a6a875197eec751bb5d3f99e64998c63"
+dependencies = [
+ "futures-core",
+ "tokio",
+]
+
+[[package]]
+name = "actix-server"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc8dcb6fa613d47c3b764a7dc672b4b31f25751dcbcf542f7b16f3e1f700044c"
+dependencies = [
+ "actix-rt",
+ "actix-service",
+ "actix-utils",
+ "futures-core",
+ "futures-util",
+ "mio",
+ "socket2",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "actix-service"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e46f36bf0e5af44bdc4bdb36fbbd421aa98c79a9bce724e1edeb3894e10dc7f"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "actix-utils"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0128396dd7313f697ad05b21b1a7be7d4cbb81888704f55996e4a27db196bb4d"
+dependencies = [
+ "local-waker",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "actix-web"
+version = "4.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81f8da0d2ae4200dde8773d72ba47a65c220b251ba7b9248db5bd263c247e959"
+dependencies = [
+ "actix-codec",
+ "actix-http",
+ "actix-router",
+ "actix-rt",
+ "actix-server",
+ "actix-service",
+ "actix-utils",
+ "bytes",
+ "bytestring",
+ "cfg-if",
+ "derive_more",
+ "encoding_rs",
+ "foldhash",
+ "futures-core",
+ "futures-util",
+ "impl-more",
+ "itoa",
+ "language-tags",
+ "log",
+ "mime",
+ "once_cell",
+ "pin-project-lite",
+ "regex-lite",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "smallvec",
+ "socket2",
+ "time",
+ "tokio",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "bitflags"
+version = "2.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
+
+[[package]]
+name = "bytes"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
+
+[[package]]
+name = "bytestring"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86566c496f2f47d9b8147a4c8b02ffdb69c919fe0c2b2e7195d22cbba0e635c9"
+dependencies = [
+ "bytes",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600"
+
+[[package]]
+name = "convert_case"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "core_detect"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f8f80099a98041a3d1622845c271458a2d73e688351bf3cb999266764b81d48"
+
+[[package]]
+name = "deranged"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e9de72ce2ad1f90dc62fa25f0f430ef85eb4b0d8fa0be4f30373bc40a21d28e"
+
+[[package]]
+name = "derive_more"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn 2.0.119",
+ "unicode-xid",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e985e0451871ad22fb8d2b6b076e2028a502a0d3950998c2c5c0a4f9b5d9679"
+dependencies = [
+ "cfg-if",
+ "core_detect",
+ "multiversion_no_op",
+ "rustversion",
+ "scopeguard",
+ "simdutf8",
+]
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d"
+
+[[package]]
+name = "futures-task"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd"
+
+[[package]]
+name = "futures-util"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "icu_collections"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe090a42a0d3140fed8c63263ed1fecc02422cb2f4bfe55cd8de2de1b8e105dd"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "utf8_iter",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25d29b57c17c6528d0dc4c2141cfa2d08200465acb537a3909c8b9b8a4a984c0"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "404a3b8c486f205c87fe7f23ab6894d84a4ad76d6e4671ae1981ba7def87c599"
+dependencies = [
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20f0088bfb7441f7a37fa0c9e20cb1e9cba1cac6b9ce8cd2a6dc44294f8e8cbc"
+
+[[package]]
+name = "icu_properties"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ea83d991c56158f7cf898bf86436c1dfe7c07ee82fe88951f2695c9f37a379f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98f29af82d02b163fe50161388350e743bb3107cc8e8c2f7314cb505faddfcf"
+
+[[package]]
+name = "icu_provider"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413099315636c588ee8f011190b329b971a09a8fae9d157e01dcae8379468514"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "impl-more"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3a73c82a0b0747dba739b380c046a140b5ae747234bf701df3460282da7193"
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "language-tags"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
+
 [[package]]
 name = "libc"
 version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
+[[package]]
+name = "litemap"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae"
+
+[[package]]
+name = "local-waker"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
+
+[[package]]
+name = "memchr"
+version = "2.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "mio"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
+dependencies = [
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "multiversion_no_op"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d"
+
+[[package]]
+name = "num-conv"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "potential_utf"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex-lite"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
+
+[[package]]
+name = "ryu"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+
+[[package]]
+name = "serde"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.154"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
+dependencies = [
+ "errno",
+ "libc",
+]
+
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "smallvec"
+version = "1.16.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8"
+
+[[package]]
+name = "socket2"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "syn"
+version = "2.0.119"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "3.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
 [[package]]
 name = "test"
 version = "0.0.1"
 dependencies = [
+ "actix-web",
  "libc",
 ]
+
+[[package]]
+name = "time"
+version = "0.3.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134"
+dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
+ "serde_core",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
+
+[[package]]
+name = "time-macros"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abc840c238154d58f9e86b2792261edfde565a17696e1cda1a449de27979801a"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "libc",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
+dependencies = [
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "url"
+version = "2.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "writeable"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc"
+
+[[package]]
+name = "yoke"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "417ef3fcf6c300b7dbd25c85531a746931c02ad536f3cf4786ed1e88223340b3"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+ "synstructure",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+ "synstructure",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f58a2799cfe9a1670c7ea8edbd52ef8edb93cb37a7f83bf31ba9e35d9dae6a40"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
diff --git a/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected b/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected
index 477dbee0e0f4..6b6cb7066279 100644
--- a/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected
+++ b/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected
@@ -1,103 +1,96 @@
 #select
-| main.rs:18:13:18:31 | ...::realloc | main.rs:339:13:339:26 | ...::args | main.rs:18:13:18:31 | ...::realloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:21:13:21:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:21:13:21:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:22:13:22:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:22:13:22:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:23:13:23:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:23:13:23:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:24:13:24:36 | ...::alloc_zeroed | main.rs:339:13:339:26 | ...::args | main.rs:24:13:24:36 | ...::alloc_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:30:13:30:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:30:13:30:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:33:13:33:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:33:13:33:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:37:13:37:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:37:13:37:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:40:13:40:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:40:13:40:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:50:13:50:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:50:13:50:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:51:13:51:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:51:13:51:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:53:13:53:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:53:13:53:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:54:13:54:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:54:13:54:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:59:13:59:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:59:13:59:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:61:13:61:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:61:13:61:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:63:13:63:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:63:13:63:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:64:13:64:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:64:13:64:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:65:13:65:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:65:13:65:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:68:13:68:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:68:13:68:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:88:13:88:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:88:13:88:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:96:17:96:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:96:17:96:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:102:17:102:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:102:17:102:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:103:17:103:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:103:17:103:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:109:17:109:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:109:17:109:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:111:17:111:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:111:17:111:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:146:17:146:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:146:17:146:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:148:17:148:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:148:17:148:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:152:13:152:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:152:13:152:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:155:13:155:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:155:13:155:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:162:17:162:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:162:17:162:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:169:17:169:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:169:17:169:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:177:13:177:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:177:13:177:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:193:32:193:36 | alloc | main.rs:339:13:339:26 | ...::args | main.rs:193:32:193:36 | alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:194:32:194:43 | alloc_zeroed | main.rs:339:13:339:26 | ...::args | main.rs:194:32:194:43 | alloc_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:195:32:195:39 | allocate | main.rs:339:13:339:26 | ...::args | main.rs:195:32:195:39 | allocate | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:196:32:196:46 | allocate_zeroed | main.rs:339:13:339:26 | ...::args | main.rs:196:32:196:46 | allocate_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:197:32:197:39 | allocate | main.rs:339:13:339:26 | ...::args | main.rs:197:32:197:39 | allocate | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:198:32:198:46 | allocate_zeroed | main.rs:339:13:339:26 | ...::args | main.rs:198:32:198:46 | allocate_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:202:32:202:38 | realloc | main.rs:339:13:339:26 | ...::args | main.rs:202:32:202:38 | realloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:208:40:208:43 | grow | main.rs:339:13:339:26 | ...::args | main.rs:208:40:208:43 | grow | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:210:40:210:50 | grow_zeroed | main.rs:339:13:339:26 | ...::args | main.rs:210:40:210:50 | grow_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:213:36:213:41 | shrink | main.rs:339:13:339:26 | ...::args | main.rs:213:36:213:41 | shrink | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:219:13:219:24 | ...::malloc | main.rs:339:13:339:26 | ...::args | main.rs:219:13:219:24 | ...::malloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:220:13:220:31 | ...::aligned_alloc | main.rs:339:13:339:26 | ...::args | main.rs:220:13:220:31 | ...::aligned_alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:222:13:222:24 | ...::calloc | main.rs:339:13:339:26 | ...::args | main.rs:222:13:222:24 | ...::calloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:223:13:223:24 | ...::calloc | main.rs:339:13:339:26 | ...::args | main.rs:223:13:223:24 | ...::calloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:224:13:224:25 | ...::realloc | main.rs:339:13:339:26 | ...::args | main.rs:224:13:224:25 | ...::realloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:228:13:228:41 | ...::try_with_capacity | main.rs:339:13:339:26 | ...::args | main.rs:228:13:228:41 | ...::try_with_capacity | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:229:13:229:37 | ...::with_capacity | main.rs:339:13:339:26 | ...::args | main.rs:229:13:229:37 | ...::with_capacity | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:230:13:230:44 | ...::try_with_capacity_in | main.rs:339:13:339:26 | ...::args | main.rs:230:13:230:44 | ...::try_with_capacity_in | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:231:13:231:40 | ...::with_capacity_in | main.rs:339:13:339:26 | ...::args | main.rs:231:13:231:40 | ...::with_capacity_in | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
-| main.rs:287:22:287:38 | ...::alloc | main.rs:311:25:311:38 | ...::args | main.rs:287:22:287:38 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:311:25:311:38 | ...::args | user-provided value |
-| main.rs:331:13:331:24 | ...::malloc | main.rs:339:13:339:26 | ...::args | main.rs:331:13:331:24 | ...::malloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:18:41:18:41 | v | main.rs:339:13:339:28 | ...::args(...) | main.rs:18:41:18:41 | v | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:21:31:21:32 | l2 | main.rs:339:13:339:28 | ...::args(...) | main.rs:21:31:21:32 | l2 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:22:31:22:53 | ... .unwrap() | main.rs:339:13:339:28 | ...::args(...) | main.rs:22:31:22:53 | ... .unwrap() | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:23:31:23:68 | ... .pad_to_align() | main.rs:339:13:339:28 | ...::args(...) | main.rs:23:31:23:68 | ... .pad_to_align() | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:24:38:24:39 | l2 | main.rs:339:13:339:28 | ...::args(...) | main.rs:24:38:24:39 | l2 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:30:31:30:32 | l4 | main.rs:339:13:339:28 | ...::args(...) | main.rs:30:31:30:32 | l4 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:33:31:33:32 | l5 | main.rs:339:13:339:28 | ...::args(...) | main.rs:33:31:33:32 | l5 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:37:31:37:32 | l6 | main.rs:339:13:339:28 | ...::args(...) | main.rs:37:31:37:32 | l6 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:40:31:40:32 | l7 | main.rs:339:13:339:28 | ...::args(...) | main.rs:40:31:40:32 | l7 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:50:31:50:53 | ... .0 | main.rs:339:13:339:28 | ...::args(...) | main.rs:50:31:50:53 | ... .0 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:51:31:51:57 | ... .0 | main.rs:339:13:339:28 | ...::args(...) | main.rs:51:31:51:57 | ... .0 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:53:31:53:58 | ... .unwrap() | main.rs:339:13:339:28 | ...::args(...) | main.rs:53:31:53:58 | ... .unwrap() | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:54:31:54:63 | ... .unwrap() | main.rs:339:13:339:28 | ...::args(...) | main.rs:54:31:54:63 | ... .unwrap() | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:59:31:59:32 | k1 | main.rs:339:13:339:28 | ...::args(...) | main.rs:59:31:59:32 | k1 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:61:31:61:32 | k2 | main.rs:339:13:339:28 | ...::args(...) | main.rs:61:31:61:32 | k2 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:63:31:63:32 | k3 | main.rs:339:13:339:28 | ...::args(...) | main.rs:63:31:63:32 | k3 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:64:31:64:59 | ... .unwrap() | main.rs:339:13:339:28 | ...::args(...) | main.rs:64:31:64:59 | ... .unwrap() | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:65:31:65:59 | ... .unwrap() | main.rs:339:13:339:28 | ...::args(...) | main.rs:65:31:65:59 | ... .unwrap() | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:68:31:68:32 | l4 | main.rs:339:13:339:28 | ...::args(...) | main.rs:68:31:68:32 | l4 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:88:31:88:36 | layout | main.rs:339:13:339:28 | ...::args(...) | main.rs:88:31:88:36 | layout | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:96:35:96:36 | l1 | main.rs:339:13:339:28 | ...::args(...) | main.rs:96:35:96:36 | l1 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:102:35:102:36 | l1 | main.rs:339:13:339:28 | ...::args(...) | main.rs:102:35:102:36 | l1 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:103:35:103:36 | l3 | main.rs:339:13:339:28 | ...::args(...) | main.rs:103:35:103:36 | l3 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:109:35:109:36 | l1 | main.rs:339:13:339:28 | ...::args(...) | main.rs:109:35:109:36 | l1 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:111:35:111:36 | l1 | main.rs:339:13:339:28 | ...::args(...) | main.rs:111:35:111:36 | l1 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:146:35:146:36 | l1 | main.rs:339:13:339:28 | ...::args(...) | main.rs:146:35:146:36 | l1 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:148:35:148:36 | l9 | main.rs:339:13:339:28 | ...::args(...) | main.rs:148:35:148:36 | l9 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:152:31:152:33 | l10 | main.rs:339:13:339:28 | ...::args(...) | main.rs:152:31:152:33 | l10 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:155:31:155:33 | l11 | main.rs:339:13:339:28 | ...::args(...) | main.rs:155:31:155:33 | l11 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:162:35:162:37 | l13 | main.rs:339:13:339:28 | ...::args(...) | main.rs:162:35:162:37 | l13 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:169:35:169:37 | l13 | main.rs:339:13:339:28 | ...::args(...) | main.rs:169:35:169:37 | l13 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:177:31:177:32 | l1 | main.rs:339:13:339:28 | ...::args(...) | main.rs:177:31:177:32 | l1 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:193:38:193:39 | l2 | main.rs:339:13:339:28 | ...::args(...) | main.rs:193:38:193:39 | l2 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:194:45:194:46 | l2 | main.rs:339:13:339:28 | ...::args(...) | main.rs:194:45:194:46 | l2 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:195:41:195:42 | l2 | main.rs:339:13:339:28 | ...::args(...) | main.rs:195:41:195:42 | l2 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:196:48:196:49 | l2 | main.rs:339:13:339:28 | ...::args(...) | main.rs:196:48:196:49 | l2 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:197:41:197:42 | l2 | main.rs:339:13:339:28 | ...::args(...) | main.rs:197:41:197:42 | l2 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:198:48:198:49 | l2 | main.rs:339:13:339:28 | ...::args(...) | main.rs:198:48:198:49 | l2 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:202:48:202:48 | v | main.rs:339:13:339:28 | ...::args(...) | main.rs:202:48:202:48 | v | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:208:53:208:54 | l2 | main.rs:339:13:339:28 | ...::args(...) | main.rs:208:53:208:54 | l2 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:210:60:210:61 | l2 | main.rs:339:13:339:28 | ...::args(...) | main.rs:210:60:210:61 | l2 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:213:51:213:52 | l2 | main.rs:339:13:339:28 | ...::args(...) | main.rs:213:51:213:52 | l2 | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:219:26:219:26 | v | main.rs:339:13:339:28 | ...::args(...) | main.rs:219:26:219:26 | v | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:220:36:220:36 | v | main.rs:339:13:339:28 | ...::args(...) | main.rs:220:36:220:36 | v | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:222:30:222:30 | v | main.rs:339:13:339:28 | ...::args(...) | main.rs:222:30:222:30 | v | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:223:26:223:26 | v | main.rs:339:13:339:28 | ...::args(...) | main.rs:223:26:223:26 | v | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:224:31:224:31 | v | main.rs:339:13:339:28 | ...::args(...) | main.rs:224:31:224:31 | v | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:228:43:228:43 | v | main.rs:339:13:339:28 | ...::args(...) | main.rs:228:43:228:43 | v | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:229:39:229:39 | v | main.rs:339:13:339:28 | ...::args(...) | main.rs:229:39:229:39 | v | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:230:46:230:46 | v | main.rs:339:13:339:28 | ...::args(...) | main.rs:230:46:230:46 | v | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:231:42:231:42 | v | main.rs:339:13:339:28 | ...::args(...) | main.rs:231:42:231:42 | v | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
+| main.rs:287:40:287:45 | layout | main.rs:311:25:311:40 | ...::args(...) | main.rs:287:40:287:45 | layout | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:311:25:311:40 | ...::args(...) | user-provided value |
+| main.rs:331:26:331:26 | a | main.rs:339:13:339:28 | ...::args(...) | main.rs:331:26:331:26 | a | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:28 | ...::args(...) | user-provided value |
 edges
-| main.rs:12:36:12:43 | ...: usize | main.rs:18:41:18:41 | v | provenance |  |
-| main.rs:18:41:18:41 | v | main.rs:18:13:18:31 | ...::realloc | provenance | MaD:17 Sink:MaD:17 |
-| main.rs:18:41:18:41 | v | main.rs:20:50:20:50 | v | provenance |  |
-| main.rs:18:41:18:41 | v | main.rs:29:60:29:60 | v | provenance |  |
-| main.rs:18:41:18:41 | v | main.rs:32:60:32:60 | v | provenance |  |
-| main.rs:18:41:18:41 | v | main.rs:35:49:35:49 | v | provenance |  |
-| main.rs:20:9:20:10 | l2 | main.rs:21:31:21:32 | l2 | provenance |  |
+| main.rs:12:36:12:43 | ...: usize | main.rs:18:41:18:41 | v | provenance | Sink:MaD:17 |
+| main.rs:12:36:12:43 | ...: usize | main.rs:20:50:20:50 | v | provenance |  |
+| main.rs:12:36:12:43 | ...: usize | main.rs:29:60:29:60 | v | provenance |  |
+| main.rs:12:36:12:43 | ...: usize | main.rs:32:60:32:60 | v | provenance |  |
+| main.rs:12:36:12:43 | ...: usize | main.rs:35:49:35:49 | v | provenance |  |
+| main.rs:20:9:20:10 | l2 | main.rs:21:31:21:32 | l2 | provenance | Sink:MaD:15 |
+| main.rs:20:9:20:10 | l2 | main.rs:22:31:22:32 | l2 | provenance |  |
+| main.rs:20:9:20:10 | l2 | main.rs:23:31:23:32 | l2 | provenance |  |
+| main.rs:20:9:20:10 | l2 | main.rs:24:38:24:39 | l2 | provenance | Sink:MaD:16 |
 | main.rs:20:14:20:54 | ...::from_size_align(...) [Ok] | main.rs:20:14:20:63 | ... .unwrap() | provenance | MaD:41 |
 | main.rs:20:14:20:63 | ... .unwrap() | main.rs:20:9:20:10 | l2 | provenance |  |
-| main.rs:20:50:20:50 | v | main.rs:20:14:20:54 | ...::from_size_align(...) [Ok] | provenance | MaD:33 |
-| main.rs:21:31:21:32 | l2 | main.rs:21:13:21:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:21:31:21:32 | l2 | main.rs:22:31:22:32 | l2 | provenance |  |
-| main.rs:21:31:21:32 | l2 | main.rs:23:31:23:32 | l2 | provenance |  |
-| main.rs:21:31:21:32 | l2 | main.rs:24:38:24:39 | l2 | provenance |  |
-| main.rs:22:31:22:32 | l2 | main.rs:22:31:22:44 | l2.align_to(...) [Ok] | provenance | MaD:27 |
+| main.rs:20:50:20:50 | v | main.rs:20:14:20:54 | ...::from_size_align(...) [Ok] | provenance | MaD:30 |
+| main.rs:22:31:22:32 | l2 | main.rs:22:31:22:44 | l2.align_to(...) [Ok] | provenance | MaD:24 |
 | main.rs:22:31:22:44 | l2.align_to(...) [Ok] | main.rs:22:31:22:53 | ... .unwrap() | provenance | MaD:41 |
-| main.rs:22:31:22:53 | ... .unwrap() | main.rs:22:13:22:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:23:31:23:32 | l2 | main.rs:23:31:23:44 | l2.align_to(...) [Ok] | provenance | MaD:27 |
+| main.rs:22:31:22:53 | ... .unwrap() | main.rs:22:31:22:53 | ... .unwrap() | provenance | Sink:MaD:15 |
+| main.rs:23:31:23:32 | l2 | main.rs:23:31:23:44 | l2.align_to(...) [Ok] | provenance | MaD:24 |
 | main.rs:23:31:23:44 | l2.align_to(...) [Ok] | main.rs:23:31:23:53 | ... .unwrap() | provenance | MaD:41 |
-| main.rs:23:31:23:53 | ... .unwrap() | main.rs:23:31:23:68 | ... .pad_to_align() | provenance | MaD:35 |
-| main.rs:23:31:23:68 | ... .pad_to_align() | main.rs:23:13:23:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:24:38:24:39 | l2 | main.rs:24:13:24:36 | ...::alloc_zeroed | provenance | MaD:16 Sink:MaD:16 |
-| main.rs:29:9:29:10 | l4 | main.rs:30:31:30:32 | l4 | provenance |  |
+| main.rs:23:31:23:53 | ... .unwrap() | main.rs:23:31:23:68 | ... .pad_to_align() | provenance | MaD:32 |
+| main.rs:23:31:23:68 | ... .pad_to_align() | main.rs:23:31:23:68 | ... .pad_to_align() | provenance | Sink:MaD:15 |
+| main.rs:29:9:29:10 | l4 | main.rs:30:31:30:32 | l4 | provenance | Sink:MaD:15 |
 | main.rs:29:14:29:64 | ...::from_size_align_unchecked(...) | main.rs:29:9:29:10 | l4 | provenance |  |
-| main.rs:29:60:29:60 | v | main.rs:29:14:29:64 | ...::from_size_align_unchecked(...) | provenance | MaD:34 |
-| main.rs:30:31:30:32 | l4 | main.rs:30:13:30:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:32:9:32:10 | l5 | main.rs:33:31:33:32 | l5 | provenance |  |
+| main.rs:29:60:29:60 | v | main.rs:29:14:29:64 | ...::from_size_align_unchecked(...) | provenance | MaD:31 |
+| main.rs:32:9:32:10 | l5 | main.rs:33:31:33:32 | l5 | provenance | Sink:MaD:15 |
 | main.rs:32:14:32:118 | ...::from_size_align_unchecked(...) | main.rs:32:9:32:10 | l5 | provenance |  |
-| main.rs:32:60:32:60 | v | main.rs:32:60:32:89 | ... * ... | provenance | MaD:25 |
-| main.rs:32:60:32:89 | ... * ... | main.rs:32:14:32:118 | ...::from_size_align_unchecked(...) | provenance | MaD:34 |
-| main.rs:33:31:33:32 | l5 | main.rs:33:13:33:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:32:60:32:60 | v | main.rs:32:60:32:89 | ... * ... | provenance | MaD:38 |
+| main.rs:32:60:32:89 | ... * ... | main.rs:32:14:32:118 | ...::from_size_align_unchecked(...) | provenance | MaD:31 |
 | main.rs:35:9:35:10 | s6 | main.rs:36:60:36:61 | s6 | provenance |  |
 | main.rs:35:14:35:54 | ... + ... | main.rs:35:9:35:10 | s6 | provenance |  |
-| main.rs:35:15:35:49 | ... * ... | main.rs:35:14:35:54 | ... + ... | provenance | MaD:24 |
-| main.rs:35:49:35:49 | v | main.rs:35:15:35:49 | ... * ... | provenance | MaD:25 |
-| main.rs:36:9:36:10 | l6 | main.rs:37:31:37:32 | l6 | provenance |  |
+| main.rs:35:15:35:49 | ... * ... | main.rs:35:14:35:54 | ... + ... | provenance | MaD:37 |
+| main.rs:35:49:35:49 | v | main.rs:35:15:35:49 | ... * ... | provenance | MaD:38 |
+| main.rs:36:9:36:10 | l6 | main.rs:37:31:37:32 | l6 | provenance | Sink:MaD:15 |
+| main.rs:36:9:36:10 | l6 | main.rs:39:60:39:61 | l6 | provenance |  |
 | main.rs:36:14:36:65 | ...::from_size_align_unchecked(...) | main.rs:36:9:36:10 | l6 | provenance |  |
-| main.rs:36:60:36:61 | s6 | main.rs:36:14:36:65 | ...::from_size_align_unchecked(...) | provenance | MaD:34 |
-| main.rs:37:31:37:32 | l6 | main.rs:37:13:37:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:37:31:37:32 | l6 | main.rs:39:60:39:61 | l6 | provenance |  |
-| main.rs:39:9:39:10 | l7 | main.rs:40:31:40:32 | l7 | provenance |  |
+| main.rs:36:60:36:61 | s6 | main.rs:36:14:36:65 | ...::from_size_align_unchecked(...) | provenance | MaD:31 |
+| main.rs:39:9:39:10 | l7 | main.rs:40:31:40:32 | l7 | provenance | Sink:MaD:15 |
 | main.rs:39:14:39:72 | ...::from_size_align_unchecked(...) | main.rs:39:9:39:10 | l7 | provenance |  |
-| main.rs:39:60:39:61 | l6 | main.rs:39:60:39:68 | l6.size() | provenance | MaD:38 |
-| main.rs:39:60:39:68 | l6.size() | main.rs:39:14:39:72 | ...::from_size_align_unchecked(...) | provenance | MaD:34 |
-| main.rs:40:31:40:32 | l7 | main.rs:40:13:40:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:39:60:39:61 | l6 | main.rs:39:60:39:68 | l6.size() | provenance | MaD:35 |
+| main.rs:39:60:39:68 | l6.size() | main.rs:39:14:39:72 | ...::from_size_align_unchecked(...) | provenance | MaD:31 |
 | main.rs:43:44:43:51 | ...: usize | main.rs:50:41:50:41 | v | provenance |  |
 | main.rs:43:44:43:51 | ...: usize | main.rs:51:41:51:41 | v | provenance |  |
 | main.rs:43:44:43:51 | ...: usize | main.rs:53:48:53:48 | v | provenance |  |
@@ -106,59 +99,54 @@ edges
 | main.rs:43:44:43:51 | ...: usize | main.rs:67:46:67:46 | v | provenance |  |
 | main.rs:50:31:50:42 | l2.repeat(...) [Ok, tuple.0] | main.rs:50:31:50:51 | ... .unwrap() [tuple.0] | provenance | MaD:41 |
 | main.rs:50:31:50:51 | ... .unwrap() [tuple.0] | main.rs:50:31:50:53 | ... .0 | provenance |  |
-| main.rs:50:31:50:53 | ... .0 | main.rs:50:13:50:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:50:41:50:41 | v | main.rs:50:31:50:42 | l2.repeat(...) [Ok, tuple.0] | provenance | MaD:36 |
+| main.rs:50:31:50:53 | ... .0 | main.rs:50:31:50:53 | ... .0 | provenance | Sink:MaD:15 |
+| main.rs:50:41:50:41 | v | main.rs:50:31:50:42 | l2.repeat(...) [Ok, tuple.0] | provenance | MaD:33 |
 | main.rs:51:31:51:46 | l2.repeat(...) [Ok, tuple.0] | main.rs:51:31:51:55 | ... .unwrap() [tuple.0] | provenance | MaD:41 |
 | main.rs:51:31:51:55 | ... .unwrap() [tuple.0] | main.rs:51:31:51:57 | ... .0 | provenance |  |
-| main.rs:51:31:51:57 | ... .0 | main.rs:51:13:51:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:51:41:51:41 | v | main.rs:51:41:51:45 | ... + ... | provenance | MaD:24 |
-| main.rs:51:41:51:45 | ... + ... | main.rs:51:31:51:46 | l2.repeat(...) [Ok, tuple.0] | provenance | MaD:36 |
+| main.rs:51:31:51:57 | ... .0 | main.rs:51:31:51:57 | ... .0 | provenance | Sink:MaD:15 |
+| main.rs:51:41:51:41 | v | main.rs:51:41:51:45 | ... + ... | provenance | MaD:37 |
+| main.rs:51:41:51:45 | ... + ... | main.rs:51:31:51:46 | l2.repeat(...) [Ok, tuple.0] | provenance | MaD:33 |
 | main.rs:53:31:53:49 | l2.repeat_packed(...) [Ok] | main.rs:53:31:53:58 | ... .unwrap() | provenance | MaD:41 |
-| main.rs:53:31:53:58 | ... .unwrap() | main.rs:53:13:53:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:53:48:53:48 | v | main.rs:53:31:53:49 | l2.repeat_packed(...) [Ok] | provenance | MaD:37 |
+| main.rs:53:31:53:58 | ... .unwrap() | main.rs:53:31:53:58 | ... .unwrap() | provenance | Sink:MaD:15 |
+| main.rs:53:48:53:48 | v | main.rs:53:31:53:49 | l2.repeat_packed(...) [Ok] | provenance | MaD:34 |
 | main.rs:54:31:54:54 | l2.repeat_packed(...) [Ok] | main.rs:54:31:54:63 | ... .unwrap() | provenance | MaD:41 |
-| main.rs:54:31:54:63 | ... .unwrap() | main.rs:54:13:54:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:54:48:54:48 | v | main.rs:54:48:54:53 | ... * ... | provenance | MaD:25 |
-| main.rs:54:48:54:53 | ... * ... | main.rs:54:31:54:54 | l2.repeat_packed(...) [Ok] | provenance | MaD:37 |
+| main.rs:54:31:54:63 | ... .unwrap() | main.rs:54:31:54:63 | ... .unwrap() | provenance | Sink:MaD:15 |
+| main.rs:54:48:54:48 | v | main.rs:54:48:54:53 | ... * ... | provenance | MaD:38 |
+| main.rs:54:48:54:53 | ... * ... | main.rs:54:31:54:54 | l2.repeat_packed(...) [Ok] | provenance | MaD:34 |
 | main.rs:58:9:58:20 | TuplePat [tuple.0] | main.rs:58:10:58:11 | k1 | provenance |  |
-| main.rs:58:10:58:11 | k1 | main.rs:59:31:59:32 | k1 | provenance |  |
+| main.rs:58:10:58:11 | k1 | main.rs:59:31:59:32 | k1 | provenance | Sink:MaD:15 |
+| main.rs:58:10:58:11 | k1 | main.rs:60:34:60:35 | k1 | provenance |  |
+| main.rs:58:10:58:11 | k1 | main.rs:62:24:62:25 | k1 | provenance |  |
+| main.rs:58:10:58:11 | k1 | main.rs:64:48:64:49 | k1 | provenance |  |
+| main.rs:58:10:58:11 | k1 | main.rs:65:31:65:32 | k1 | provenance |  |
 | main.rs:58:24:58:35 | l3.repeat(...) [Ok, tuple.0] | main.rs:58:24:58:66 | ... .expect(...) [tuple.0] | provenance | MaD:40 |
 | main.rs:58:24:58:66 | ... .expect(...) [tuple.0] | main.rs:58:9:58:20 | TuplePat [tuple.0] | provenance |  |
-| main.rs:58:34:58:34 | v | main.rs:58:24:58:35 | l3.repeat(...) [Ok, tuple.0] | provenance | MaD:36 |
-| main.rs:59:31:59:32 | k1 | main.rs:59:13:59:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:59:31:59:32 | k1 | main.rs:60:34:60:35 | k1 | provenance |  |
-| main.rs:59:31:59:32 | k1 | main.rs:62:24:62:25 | k1 | provenance |  |
-| main.rs:59:31:59:32 | k1 | main.rs:64:48:64:49 | k1 | provenance |  |
-| main.rs:59:31:59:32 | k1 | main.rs:65:31:65:32 | k1 | provenance |  |
+| main.rs:58:34:58:34 | v | main.rs:58:24:58:35 | l3.repeat(...) [Ok, tuple.0] | provenance | MaD:33 |
 | main.rs:60:9:60:20 | TuplePat [tuple.0] | main.rs:60:10:60:11 | k2 | provenance |  |
-| main.rs:60:10:60:11 | k2 | main.rs:61:31:61:32 | k2 | provenance |  |
+| main.rs:60:10:60:11 | k2 | main.rs:61:31:61:32 | k2 | provenance | Sink:MaD:15 |
 | main.rs:60:24:60:36 | l3.extend(...) [Ok, tuple.0] | main.rs:60:24:60:45 | ... .unwrap() [tuple.0] | provenance | MaD:41 |
 | main.rs:60:24:60:45 | ... .unwrap() [tuple.0] | main.rs:60:9:60:20 | TuplePat [tuple.0] | provenance |  |
-| main.rs:60:34:60:35 | k1 | main.rs:60:24:60:36 | l3.extend(...) [Ok, tuple.0] | provenance | MaD:29 |
-| main.rs:61:31:61:32 | k2 | main.rs:61:13:61:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:60:34:60:35 | k1 | main.rs:60:24:60:36 | l3.extend(...) [Ok, tuple.0] | provenance | MaD:26 |
 | main.rs:62:9:62:20 | TuplePat [tuple.0] | main.rs:62:10:62:11 | k3 | provenance |  |
-| main.rs:62:10:62:11 | k3 | main.rs:63:31:63:32 | k3 | provenance |  |
-| main.rs:62:24:62:25 | k1 | main.rs:62:24:62:36 | k1.extend(...) [Ok, tuple.0] | provenance | MaD:30 |
+| main.rs:62:10:62:11 | k3 | main.rs:63:31:63:32 | k3 | provenance | Sink:MaD:15 |
+| main.rs:62:24:62:25 | k1 | main.rs:62:24:62:36 | k1.extend(...) [Ok, tuple.0] | provenance | MaD:27 |
 | main.rs:62:24:62:36 | k1.extend(...) [Ok, tuple.0] | main.rs:62:24:62:45 | ... .unwrap() [tuple.0] | provenance | MaD:41 |
 | main.rs:62:24:62:45 | ... .unwrap() [tuple.0] | main.rs:62:9:62:20 | TuplePat [tuple.0] | provenance |  |
-| main.rs:63:31:63:32 | k3 | main.rs:63:13:63:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:64:31:64:50 | l3.extend_packed(...) [Ok] | main.rs:64:31:64:59 | ... .unwrap() | provenance | MaD:41 |
-| main.rs:64:31:64:59 | ... .unwrap() | main.rs:64:13:64:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:64:48:64:49 | k1 | main.rs:64:31:64:50 | l3.extend_packed(...) [Ok] | provenance | MaD:31 |
-| main.rs:65:31:65:32 | k1 | main.rs:65:31:65:50 | k1.extend_packed(...) [Ok] | provenance | MaD:32 |
+| main.rs:64:31:64:59 | ... .unwrap() | main.rs:64:31:64:59 | ... .unwrap() | provenance | Sink:MaD:15 |
+| main.rs:64:48:64:49 | k1 | main.rs:64:31:64:50 | l3.extend_packed(...) [Ok] | provenance | MaD:28 |
+| main.rs:65:31:65:32 | k1 | main.rs:65:31:65:50 | k1.extend_packed(...) [Ok] | provenance | MaD:29 |
 | main.rs:65:31:65:50 | k1.extend_packed(...) [Ok] | main.rs:65:31:65:59 | ... .unwrap() | provenance | MaD:41 |
-| main.rs:65:31:65:59 | ... .unwrap() | main.rs:65:13:65:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:67:9:67:10 | l4 | main.rs:68:31:68:32 | l4 | provenance |  |
+| main.rs:65:31:65:59 | ... .unwrap() | main.rs:65:31:65:59 | ... .unwrap() | provenance | Sink:MaD:15 |
+| main.rs:67:9:67:10 | l4 | main.rs:68:31:68:32 | l4 | provenance | Sink:MaD:15 |
 | main.rs:67:14:67:47 | ...::array::<...>(...) [Ok] | main.rs:67:14:67:56 | ... .unwrap() | provenance | MaD:41 |
 | main.rs:67:14:67:56 | ... .unwrap() | main.rs:67:9:67:10 | l4 | provenance |  |
-| main.rs:67:46:67:46 | v | main.rs:67:14:67:47 | ...::array::<...>(...) [Ok] | provenance | MaD:28 |
-| main.rs:68:31:68:32 | l4 | main.rs:68:13:68:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:67:46:67:46 | v | main.rs:67:14:67:47 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
 | main.rs:86:35:86:42 | ...: usize | main.rs:87:54:87:54 | v | provenance |  |
-| main.rs:87:9:87:14 | layout | main.rs:88:31:88:36 | layout | provenance |  |
+| main.rs:87:9:87:14 | layout | main.rs:88:31:88:36 | layout | provenance | Sink:MaD:15 |
 | main.rs:87:18:87:58 | ...::from_size_align(...) [Ok] | main.rs:87:18:87:67 | ... .unwrap() | provenance | MaD:41 |
 | main.rs:87:18:87:67 | ... .unwrap() | main.rs:87:9:87:14 | layout | provenance |  |
-| main.rs:87:54:87:54 | v | main.rs:87:18:87:58 | ...::from_size_align(...) [Ok] | provenance | MaD:33 |
-| main.rs:88:31:88:36 | layout | main.rs:88:13:88:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:87:54:87:54 | v | main.rs:87:18:87:58 | ...::from_size_align(...) [Ok] | provenance | MaD:30 |
 | main.rs:91:38:91:45 | ...: usize | main.rs:92:47:92:47 | v | provenance |  |
 | main.rs:91:38:91:45 | ...: usize | main.rs:101:51:101:51 | v | provenance |  |
 | main.rs:91:38:91:45 | ...: usize | main.rs:105:33:105:33 | v | provenance |  |
@@ -166,113 +154,77 @@ edges
 | main.rs:91:38:91:45 | ...: usize | main.rs:151:62:151:62 | v | provenance |  |
 | main.rs:91:38:91:45 | ...: usize | main.rs:154:62:154:62 | v | provenance |  |
 | main.rs:91:38:91:45 | ...: usize | main.rs:161:55:161:55 | v | provenance |  |
-| main.rs:92:9:92:10 | l1 | main.rs:96:35:96:36 | l1 | provenance |  |
-| main.rs:92:9:92:10 | l1 | main.rs:102:35:102:36 | l1 | provenance |  |
+| main.rs:92:9:92:10 | l1 | main.rs:96:35:96:36 | l1 | provenance | Sink:MaD:15 |
+| main.rs:92:9:92:10 | l1 | main.rs:102:35:102:36 | l1 | provenance | Sink:MaD:15 |
+| main.rs:92:9:92:10 | l1 | main.rs:109:35:109:36 | l1 | provenance | Sink:MaD:15 |
+| main.rs:92:9:92:10 | l1 | main.rs:111:35:111:36 | l1 | provenance | Sink:MaD:15 |
+| main.rs:92:9:92:10 | l1 | main.rs:146:35:146:36 | l1 | provenance | Sink:MaD:15 |
+| main.rs:92:9:92:10 | l1 | main.rs:177:31:177:32 | l1 | provenance | Sink:MaD:15 |
 | main.rs:92:14:92:48 | ...::array::<...>(...) [Ok] | main.rs:92:14:92:57 | ... .unwrap() | provenance | MaD:41 |
 | main.rs:92:14:92:57 | ... .unwrap() | main.rs:92:9:92:10 | l1 | provenance |  |
-| main.rs:92:47:92:47 | v | main.rs:92:14:92:48 | ...::array::<...>(...) [Ok] | provenance | MaD:28 |
-| main.rs:96:35:96:36 | l1 | main.rs:96:17:96:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:96:35:96:36 | l1 | main.rs:109:35:109:36 | l1 | provenance |  |
-| main.rs:96:35:96:36 | l1 | main.rs:111:35:111:36 | l1 | provenance |  |
-| main.rs:101:13:101:14 | l3 | main.rs:103:35:103:36 | l3 | provenance |  |
+| main.rs:92:47:92:47 | v | main.rs:92:14:92:48 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
+| main.rs:101:13:101:14 | l3 | main.rs:103:35:103:36 | l3 | provenance | Sink:MaD:15 |
 | main.rs:101:18:101:52 | ...::array::<...>(...) [Ok] | main.rs:101:18:101:61 | ... .unwrap() | provenance | MaD:41 |
 | main.rs:101:18:101:61 | ... .unwrap() | main.rs:101:13:101:14 | l3 | provenance |  |
-| main.rs:101:51:101:51 | v | main.rs:101:18:101:52 | ...::array::<...>(...) [Ok] | provenance | MaD:28 |
-| main.rs:102:35:102:36 | l1 | main.rs:102:17:102:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:102:35:102:36 | l1 | main.rs:109:35:109:36 | l1 | provenance |  |
-| main.rs:102:35:102:36 | l1 | main.rs:111:35:111:36 | l1 | provenance |  |
-| main.rs:103:35:103:36 | l3 | main.rs:103:17:103:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:101:51:101:51 | v | main.rs:101:18:101:52 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
 | main.rs:105:33:105:33 | v | main.rs:86:35:86:42 | ...: usize | provenance |  |
-| main.rs:109:35:109:36 | l1 | main.rs:109:17:109:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:109:35:109:36 | l1 | main.rs:146:35:146:36 | l1 | provenance |  |
-| main.rs:111:35:111:36 | l1 | main.rs:111:17:111:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:111:35:111:36 | l1 | main.rs:146:35:146:36 | l1 | provenance |  |
-| main.rs:145:13:145:14 | l9 | main.rs:148:35:148:36 | l9 | provenance |  |
+| main.rs:145:13:145:14 | l9 | main.rs:148:35:148:36 | l9 | provenance | Sink:MaD:15 |
 | main.rs:145:18:145:52 | ...::array::<...>(...) [Ok] | main.rs:145:18:145:61 | ... .unwrap() | provenance | MaD:41 |
 | main.rs:145:18:145:61 | ... .unwrap() | main.rs:145:13:145:14 | l9 | provenance |  |
-| main.rs:145:51:145:51 | v | main.rs:145:18:145:52 | ...::array::<...>(...) [Ok] | provenance | MaD:28 |
-| main.rs:146:35:146:36 | l1 | main.rs:146:17:146:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:146:35:146:36 | l1 | main.rs:177:31:177:32 | l1 | provenance |  |
-| main.rs:148:35:148:36 | l9 | main.rs:148:17:148:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:151:9:151:11 | l10 | main.rs:152:31:152:33 | l10 | provenance |  |
+| main.rs:145:51:145:51 | v | main.rs:145:18:145:52 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
+| main.rs:151:9:151:11 | l10 | main.rs:152:31:152:33 | l10 | provenance | Sink:MaD:15 |
 | main.rs:151:15:151:69 | ...::array::<...>(...) [Ok] | main.rs:151:15:151:78 | ... .unwrap() | provenance | MaD:41 |
 | main.rs:151:15:151:78 | ... .unwrap() | main.rs:151:9:151:11 | l10 | provenance |  |
-| main.rs:151:48:151:68 | ...::min(...) | main.rs:151:15:151:69 | ...::array::<...>(...) [Ok] | provenance | MaD:28 |
+| main.rs:151:48:151:68 | ...::min(...) | main.rs:151:15:151:69 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
 | main.rs:151:62:151:62 | v | main.rs:151:48:151:68 | ...::min(...) | provenance | MaD:43 |
-| main.rs:152:31:152:33 | l10 | main.rs:152:13:152:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:154:9:154:11 | l11 | main.rs:155:31:155:33 | l11 | provenance |  |
+| main.rs:154:9:154:11 | l11 | main.rs:155:31:155:33 | l11 | provenance | Sink:MaD:15 |
 | main.rs:154:15:154:69 | ...::array::<...>(...) [Ok] | main.rs:154:15:154:78 | ... .unwrap() | provenance | MaD:41 |
 | main.rs:154:15:154:78 | ... .unwrap() | main.rs:154:9:154:11 | l11 | provenance |  |
-| main.rs:154:48:154:68 | ...::max(...) | main.rs:154:15:154:69 | ...::array::<...>(...) [Ok] | provenance | MaD:28 |
+| main.rs:154:48:154:68 | ...::max(...) | main.rs:154:15:154:69 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
 | main.rs:154:62:154:62 | v | main.rs:154:48:154:68 | ...::max(...) | provenance | MaD:42 |
-| main.rs:155:31:155:33 | l11 | main.rs:155:13:155:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:161:13:161:15 | l13 | main.rs:162:35:162:37 | l13 | provenance |  |
+| main.rs:161:13:161:15 | l13 | main.rs:162:35:162:37 | l13 | provenance | Sink:MaD:15 |
+| main.rs:161:13:161:15 | l13 | main.rs:169:35:169:37 | l13 | provenance | Sink:MaD:15 |
 | main.rs:161:19:161:59 | ...::from_size_align(...) [Ok] | main.rs:161:19:161:68 | ... .unwrap() | provenance | MaD:41 |
 | main.rs:161:19:161:68 | ... .unwrap() | main.rs:161:13:161:15 | l13 | provenance |  |
-| main.rs:161:55:161:55 | v | main.rs:161:19:161:59 | ...::from_size_align(...) [Ok] | provenance | MaD:33 |
-| main.rs:162:35:162:37 | l13 | main.rs:162:17:162:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:162:35:162:37 | l13 | main.rs:169:35:169:37 | l13 | provenance |  |
-| main.rs:169:35:169:37 | l13 | main.rs:169:17:169:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:177:31:177:32 | l1 | main.rs:177:13:177:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:161:55:161:55 | v | main.rs:161:19:161:59 | ...::from_size_align(...) [Ok] | provenance | MaD:30 |
 | main.rs:183:29:183:36 | ...: usize | main.rs:192:46:192:46 | v | provenance |  |
-| main.rs:183:29:183:36 | ...: usize | main.rs:202:48:202:48 | v | provenance |  |
-| main.rs:192:9:192:10 | l2 | main.rs:193:38:193:39 | l2 | provenance |  |
+| main.rs:183:29:183:36 | ...: usize | main.rs:202:48:202:48 | v | provenance | Sink:MaD:9 |
+| main.rs:192:9:192:10 | l2 | main.rs:193:38:193:39 | l2 | provenance | Sink:MaD:7 |
+| main.rs:192:9:192:10 | l2 | main.rs:194:45:194:46 | l2 | provenance | Sink:MaD:8 |
+| main.rs:192:9:192:10 | l2 | main.rs:195:41:195:42 | l2 | provenance | Sink:MaD:10 |
+| main.rs:192:9:192:10 | l2 | main.rs:196:48:196:49 | l2 | provenance | Sink:MaD:11 |
+| main.rs:192:9:192:10 | l2 | main.rs:197:41:197:42 | l2 | provenance | Sink:MaD:1 |
+| main.rs:192:9:192:10 | l2 | main.rs:198:48:198:49 | l2 | provenance | Sink:MaD:2 |
+| main.rs:192:9:192:10 | l2 | main.rs:208:53:208:54 | l2 | provenance | Sink:MaD:12 |
+| main.rs:192:9:192:10 | l2 | main.rs:210:60:210:61 | l2 | provenance | Sink:MaD:13 |
+| main.rs:192:9:192:10 | l2 | main.rs:213:51:213:52 | l2 | provenance | Sink:MaD:14 |
 | main.rs:192:14:192:47 | ...::array::<...>(...) [Ok] | main.rs:192:14:192:56 | ... .unwrap() | provenance | MaD:41 |
 | main.rs:192:14:192:56 | ... .unwrap() | main.rs:192:9:192:10 | l2 | provenance |  |
-| main.rs:192:46:192:46 | v | main.rs:192:14:192:47 | ...::array::<...>(...) [Ok] | provenance | MaD:28 |
-| main.rs:193:38:193:39 | l2 | main.rs:193:32:193:36 | alloc | provenance | MaD:12 Sink:MaD:12 |
-| main.rs:193:38:193:39 | l2 | main.rs:194:45:194:46 | l2 | provenance |  |
-| main.rs:194:45:194:46 | l2 | main.rs:194:32:194:43 | alloc_zeroed | provenance | MaD:13 Sink:MaD:13 |
-| main.rs:194:45:194:46 | l2 | main.rs:195:41:195:42 | l2 | provenance |  |
-| main.rs:195:41:195:42 | l2 | main.rs:195:32:195:39 | allocate | provenance | MaD:7 Sink:MaD:7 |
-| main.rs:195:41:195:42 | l2 | main.rs:196:48:196:49 | l2 | provenance |  |
-| main.rs:196:48:196:49 | l2 | main.rs:196:32:196:46 | allocate_zeroed | provenance | MaD:8 Sink:MaD:8 |
-| main.rs:196:48:196:49 | l2 | main.rs:197:41:197:42 | l2 | provenance |  |
-| main.rs:197:41:197:42 | l2 | main.rs:197:32:197:39 | allocate | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:197:41:197:42 | l2 | main.rs:198:48:198:49 | l2 | provenance |  |
-| main.rs:198:48:198:49 | l2 | main.rs:198:32:198:46 | allocate_zeroed | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:198:48:198:49 | l2 | main.rs:208:53:208:54 | l2 | provenance |  |
-| main.rs:198:48:198:49 | l2 | main.rs:210:60:210:61 | l2 | provenance |  |
-| main.rs:198:48:198:49 | l2 | main.rs:213:51:213:52 | l2 | provenance |  |
-| main.rs:202:48:202:48 | v | main.rs:202:32:202:38 | realloc | provenance | MaD:14 Sink:MaD:14 |
-| main.rs:208:53:208:54 | l2 | main.rs:208:40:208:43 | grow | provenance | MaD:9 Sink:MaD:9 |
-| main.rs:210:60:210:61 | l2 | main.rs:210:40:210:50 | grow_zeroed | provenance | MaD:10 Sink:MaD:10 |
-| main.rs:213:51:213:52 | l2 | main.rs:213:36:213:41 | shrink | provenance | MaD:11 Sink:MaD:11 |
-| main.rs:217:27:217:34 | ...: usize | main.rs:219:26:219:26 | v | provenance |  |
-| main.rs:219:26:219:26 | v | main.rs:219:13:219:24 | ...::malloc | provenance | MaD:20 Sink:MaD:20 |
-| main.rs:219:26:219:26 | v | main.rs:220:36:220:36 | v | provenance |  |
-| main.rs:220:36:220:36 | v | main.rs:220:13:220:31 | ...::aligned_alloc | provenance | MaD:18 Sink:MaD:18 |
-| main.rs:220:36:220:36 | v | main.rs:222:30:222:30 | v | provenance |  |
-| main.rs:222:30:222:30 | v | main.rs:222:13:222:24 | ...::calloc | provenance | MaD:19 Sink:MaD:19 |
-| main.rs:222:30:222:30 | v | main.rs:223:26:223:26 | v | provenance |  |
-| main.rs:223:26:223:26 | v | main.rs:223:13:223:24 | ...::calloc | provenance | MaD:19 Sink:MaD:19 |
-| main.rs:223:26:223:26 | v | main.rs:224:31:224:31 | v | provenance |  |
-| main.rs:224:31:224:31 | v | main.rs:224:13:224:25 | ...::realloc | provenance | MaD:21 Sink:MaD:21 |
-| main.rs:227:24:227:31 | ...: usize | main.rs:228:43:228:43 | v | provenance |  |
-| main.rs:228:43:228:43 | v | main.rs:228:13:228:41 | ...::try_with_capacity | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:228:43:228:43 | v | main.rs:229:39:229:39 | v | provenance |  |
-| main.rs:229:39:229:39 | v | main.rs:229:13:229:37 | ...::with_capacity | provenance | MaD:5 Sink:MaD:5 |
-| main.rs:229:39:229:39 | v | main.rs:230:46:230:46 | v | provenance |  |
-| main.rs:230:46:230:46 | v | main.rs:230:13:230:44 | ...::try_with_capacity_in | provenance | MaD:4 Sink:MaD:4 |
-| main.rs:230:46:230:46 | v | main.rs:231:42:231:42 | v | provenance |  |
-| main.rs:231:42:231:42 | v | main.rs:231:13:231:40 | ...::with_capacity_in | provenance | MaD:6 Sink:MaD:6 |
+| main.rs:192:46:192:46 | v | main.rs:192:14:192:47 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
+| main.rs:217:27:217:34 | ...: usize | main.rs:219:26:219:26 | v | provenance | Sink:MaD:20 |
+| main.rs:217:27:217:34 | ...: usize | main.rs:220:36:220:36 | v | provenance | Sink:MaD:18 |
+| main.rs:217:27:217:34 | ...: usize | main.rs:222:30:222:30 | v | provenance | Sink:MaD:19 |
+| main.rs:217:27:217:34 | ...: usize | main.rs:223:26:223:26 | v | provenance | Sink:MaD:19 |
+| main.rs:217:27:217:34 | ...: usize | main.rs:224:31:224:31 | v | provenance | Sink:MaD:21 |
+| main.rs:227:24:227:31 | ...: usize | main.rs:228:43:228:43 | v | provenance | Sink:MaD:3 |
+| main.rs:227:24:227:31 | ...: usize | main.rs:229:39:229:39 | v | provenance | Sink:MaD:5 |
+| main.rs:227:24:227:31 | ...: usize | main.rs:230:46:230:46 | v | provenance | Sink:MaD:4 |
+| main.rs:227:24:227:31 | ...: usize | main.rs:231:42:231:42 | v | provenance | Sink:MaD:6 |
 | main.rs:282:24:282:41 | ...: String | main.rs:283:21:283:30 | user_input | provenance |  |
 | main.rs:283:9:283:17 | num_bytes | main.rs:285:54:285:62 | num_bytes | provenance |  |
-| main.rs:283:21:283:30 | user_input | main.rs:283:21:283:47 | user_input.parse() [Ok] | provenance | MaD:26 |
+| main.rs:283:21:283:30 | user_input | main.rs:283:21:283:47 | user_input.parse() [Ok] | provenance | MaD:23 |
 | main.rs:283:21:283:47 | user_input.parse() [Ok] | main.rs:283:21:283:48 | TryExpr | provenance |  |
-| main.rs:283:21:283:48 | TryExpr | main.rs:283:21:283:77 | ... * ... | provenance | MaD:25 |
+| main.rs:283:21:283:48 | TryExpr | main.rs:283:21:283:77 | ... * ... | provenance | MaD:38 |
 | main.rs:283:21:283:77 | ... * ... | main.rs:283:9:283:17 | num_bytes | provenance |  |
-| main.rs:285:9:285:14 | layout | main.rs:287:40:287:45 | layout | provenance |  |
+| main.rs:285:9:285:14 | layout | main.rs:287:40:287:45 | layout | provenance | Sink:MaD:15 |
 | main.rs:285:18:285:66 | ...::from_size_align(...) [Ok] | main.rs:285:18:285:75 | ... .unwrap() | provenance | MaD:41 |
 | main.rs:285:18:285:75 | ... .unwrap() | main.rs:285:9:285:14 | layout | provenance |  |
-| main.rs:285:54:285:62 | num_bytes | main.rs:285:18:285:66 | ...::from_size_align(...) [Ok] | provenance | MaD:33 |
-| main.rs:287:40:287:45 | layout | main.rs:287:22:287:38 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:311:25:311:38 | ...::args | main.rs:311:25:311:40 | ...::args(...) [element] | provenance | Src:MaD:22  |
-| main.rs:311:25:311:40 | ...::args(...) [element] | main.rs:311:25:311:47 | ... .nth(...) [Some] | provenance | MaD:23 |
+| main.rs:285:54:285:62 | num_bytes | main.rs:285:18:285:66 | ...::from_size_align(...) [Ok] | provenance | MaD:30 |
+| main.rs:311:25:311:40 | ...::args(...) | main.rs:311:25:311:40 | ...::args(...) [element] | provenance | Src:MaD:22  |
+| main.rs:311:25:311:40 | ...::args(...) [element] | main.rs:311:25:311:47 | ... .nth(...) [Some] | provenance | MaD:36 |
 | main.rs:311:25:311:47 | ... .nth(...) [Some] | main.rs:311:25:311:74 | ... .unwrap_or(...) | provenance | MaD:39 |
 | main.rs:311:25:311:74 | ... .unwrap_or(...) | main.rs:282:24:282:41 | ...: String | provenance |  |
-| main.rs:317:26:317:33 | ...: usize | main.rs:331:26:331:26 | a | provenance |  |
-| main.rs:331:26:331:26 | a | main.rs:331:13:331:24 | ...::malloc | provenance | MaD:20 Sink:MaD:20 |
+| main.rs:317:26:317:33 | ...: usize | main.rs:331:26:331:26 | a | provenance | Sink:MaD:20 |
 | main.rs:339:9:339:9 | v | main.rs:342:34:342:34 | v | provenance |  |
 | main.rs:339:9:339:9 | v | main.rs:343:42:343:42 | v | provenance |  |
 | main.rs:339:9:339:9 | v | main.rs:344:36:344:36 | v | provenance |  |
@@ -280,10 +232,10 @@ edges
 | main.rs:339:9:339:9 | v | main.rs:346:25:346:25 | v | provenance |  |
 | main.rs:339:9:339:9 | v | main.rs:347:22:347:22 | v | provenance |  |
 | main.rs:339:9:339:9 | v | main.rs:349:24:349:24 | v | provenance |  |
-| main.rs:339:13:339:26 | ...::args | main.rs:339:13:339:28 | ...::args(...) [element] | provenance | Src:MaD:22  |
-| main.rs:339:13:339:28 | ...::args(...) [element] | main.rs:339:13:339:35 | ... .nth(...) [Some] | provenance | MaD:23 |
+| main.rs:339:13:339:28 | ...::args(...) | main.rs:339:13:339:28 | ...::args(...) [element] | provenance | Src:MaD:22  |
+| main.rs:339:13:339:28 | ...::args(...) [element] | main.rs:339:13:339:35 | ... .nth(...) [Some] | provenance | MaD:36 |
 | main.rs:339:13:339:35 | ... .nth(...) [Some] | main.rs:339:13:339:65 | ... .unwrap_or(...) | provenance | MaD:39 |
-| main.rs:339:13:339:65 | ... .unwrap_or(...) | main.rs:339:13:339:82 | ... .parse() [Ok] | provenance | MaD:26 |
+| main.rs:339:13:339:65 | ... .unwrap_or(...) | main.rs:339:13:339:82 | ... .parse() [Ok] | provenance | MaD:23 |
 | main.rs:339:13:339:82 | ... .parse() [Ok] | main.rs:339:13:339:91 | ... .unwrap() | provenance | MaD:41 |
 | main.rs:339:13:339:91 | ... .unwrap() | main.rs:339:9:339:9 | v | provenance |  |
 | main.rs:342:34:342:34 | v | main.rs:12:36:12:43 | ...: usize | provenance |  |
@@ -300,14 +252,14 @@ models
 | 4 | Sink: <alloc::vec::Vec>::try_with_capacity_in; Argument[0]; alloc-layout |
 | 5 | Sink: <alloc::vec::Vec>::with_capacity; Argument[0]; alloc-layout |
 | 6 | Sink: <alloc::vec::Vec>::with_capacity_in; Argument[0]; alloc-layout |
-| 7 | Sink: <std::alloc::System as core::alloc::Allocator>::allocate; Argument[0]; alloc-size |
-| 8 | Sink: <std::alloc::System as core::alloc::Allocator>::allocate_zeroed; Argument[0]; alloc-size |
-| 9 | Sink: <std::alloc::System as core::alloc::Allocator>::grow; Argument[2]; alloc-size |
-| 10 | Sink: <std::alloc::System as core::alloc::Allocator>::grow_zeroed; Argument[2]; alloc-size |
-| 11 | Sink: <std::alloc::System as core::alloc::Allocator>::shrink; Argument[2]; alloc-size |
-| 12 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::alloc; Argument[0]; alloc-size |
-| 13 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::alloc_zeroed; Argument[0]; alloc-size |
-| 14 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::realloc; Argument[2]; alloc-size |
+| 7 | Sink: <core::alloc::global::GlobalAlloc>::alloc; Argument[0]; alloc-layout |
+| 8 | Sink: <core::alloc::global::GlobalAlloc>::alloc_zeroed; Argument[0]; alloc-layout |
+| 9 | Sink: <core::alloc::global::GlobalAlloc>::realloc; Argument[2]; alloc-size |
+| 10 | Sink: <std::alloc::System as core::alloc::Allocator>::allocate; Argument[0]; alloc-size |
+| 11 | Sink: <std::alloc::System as core::alloc::Allocator>::allocate_zeroed; Argument[0]; alloc-size |
+| 12 | Sink: <std::alloc::System as core::alloc::Allocator>::grow; Argument[2]; alloc-size |
+| 13 | Sink: <std::alloc::System as core::alloc::Allocator>::grow_zeroed; Argument[2]; alloc-size |
+| 14 | Sink: <std::alloc::System as core::alloc::Allocator>::shrink; Argument[2]; alloc-size |
 | 15 | Sink: alloc::alloc::alloc; Argument[0]; alloc-layout |
 | 16 | Sink: alloc::alloc::alloc_zeroed; Argument[0]; alloc-layout |
 | 17 | Sink: alloc::alloc::realloc; Argument[2]; alloc-size |
@@ -316,22 +268,22 @@ models
 | 20 | Sink: libc::unix::malloc; Argument[0]; alloc-size |
 | 21 | Sink: libc::unix::realloc; Argument[1]; alloc-size |
 | 22 | Source: std::env::args; ReturnValue.Element; commandargs |
-| 23 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
-| 24 | Summary: <_ as core::ops::arith::Add>::add; Argument[self,0]; ReturnValue; taint |
-| 25 | Summary: <_ as core::ops::arith::Mul>::mul; Argument[self,0]; ReturnValue; taint |
-| 26 | Summary: <alloc::string::String as core::ops::deref::Deref>::deref; Argument[self]; ReturnValue; value |
-| 27 | Summary: <core::alloc::layout::Layout>::align_to; Argument[self].Reference; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 28 | Summary: <core::alloc::layout::Layout>::array; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 29 | Summary: <core::alloc::layout::Layout>::extend; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)].Field[0]; taint |
-| 30 | Summary: <core::alloc::layout::Layout>::extend; Argument[self].Reference; ReturnValue.Field[core::result::Result::Ok(0)].Field[0]; taint |
-| 31 | Summary: <core::alloc::layout::Layout>::extend_packed; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 32 | Summary: <core::alloc::layout::Layout>::extend_packed; Argument[self].Reference; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 33 | Summary: <core::alloc::layout::Layout>::from_size_align; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 34 | Summary: <core::alloc::layout::Layout>::from_size_align_unchecked; Argument[0]; ReturnValue; taint |
-| 35 | Summary: <core::alloc::layout::Layout>::pad_to_align; Argument[self].Reference; ReturnValue; taint |
-| 36 | Summary: <core::alloc::layout::Layout>::repeat; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)].Field[0]; taint |
-| 37 | Summary: <core::alloc::layout::Layout>::repeat_packed; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 38 | Summary: <core::alloc::layout::Layout>::size; Argument[self].Reference; ReturnValue; taint |
+| 23 | Summary: <alloc::string::String as core::ops::deref::Deref>::deref; Argument[self]; ReturnValue; value |
+| 24 | Summary: <core::alloc::layout::Layout>::align_to; Argument[self].Reference; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 25 | Summary: <core::alloc::layout::Layout>::array; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 26 | Summary: <core::alloc::layout::Layout>::extend; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)].Field[0]; taint |
+| 27 | Summary: <core::alloc::layout::Layout>::extend; Argument[self].Reference; ReturnValue.Field[core::result::Result::Ok(0)].Field[0]; taint |
+| 28 | Summary: <core::alloc::layout::Layout>::extend_packed; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 29 | Summary: <core::alloc::layout::Layout>::extend_packed; Argument[self].Reference; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 30 | Summary: <core::alloc::layout::Layout>::from_size_align; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 31 | Summary: <core::alloc::layout::Layout>::from_size_align_unchecked; Argument[0]; ReturnValue; taint |
+| 32 | Summary: <core::alloc::layout::Layout>::pad_to_align; Argument[self].Reference; ReturnValue; taint |
+| 33 | Summary: <core::alloc::layout::Layout>::repeat; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)].Field[0]; taint |
+| 34 | Summary: <core::alloc::layout::Layout>::repeat_packed; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 35 | Summary: <core::alloc::layout::Layout>::size; Argument[self].Reference; ReturnValue; taint |
+| 36 | Summary: <core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 37 | Summary: <core::ops::arith::Add>::add; Argument[self,0]; ReturnValue; taint |
+| 38 | Summary: <core::ops::arith::Mul>::mul; Argument[self,0]; ReturnValue; taint |
 | 39 | Summary: <core::option::Option>::unwrap_or; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
 | 40 | Summary: <core::result::Result>::expect; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
 | 41 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
@@ -339,35 +291,30 @@ models
 | 43 | Summary: core::cmp::min; Argument[0]; ReturnValue; value |
 nodes
 | main.rs:12:36:12:43 | ...: usize | semmle.label | ...: usize |
-| main.rs:18:13:18:31 | ...::realloc | semmle.label | ...::realloc |
 | main.rs:18:41:18:41 | v | semmle.label | v |
 | main.rs:20:9:20:10 | l2 | semmle.label | l2 |
 | main.rs:20:14:20:54 | ...::from_size_align(...) [Ok] | semmle.label | ...::from_size_align(...) [Ok] |
 | main.rs:20:14:20:63 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:20:50:20:50 | v | semmle.label | v |
-| main.rs:21:13:21:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:21:31:21:32 | l2 | semmle.label | l2 |
-| main.rs:22:13:22:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:22:31:22:32 | l2 | semmle.label | l2 |
 | main.rs:22:31:22:44 | l2.align_to(...) [Ok] | semmle.label | l2.align_to(...) [Ok] |
 | main.rs:22:31:22:53 | ... .unwrap() | semmle.label | ... .unwrap() |
-| main.rs:23:13:23:29 | ...::alloc | semmle.label | ...::alloc |
+| main.rs:22:31:22:53 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:23:31:23:32 | l2 | semmle.label | l2 |
 | main.rs:23:31:23:44 | l2.align_to(...) [Ok] | semmle.label | l2.align_to(...) [Ok] |
 | main.rs:23:31:23:53 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:23:31:23:68 | ... .pad_to_align() | semmle.label | ... .pad_to_align() |
-| main.rs:24:13:24:36 | ...::alloc_zeroed | semmle.label | ...::alloc_zeroed |
+| main.rs:23:31:23:68 | ... .pad_to_align() | semmle.label | ... .pad_to_align() |
 | main.rs:24:38:24:39 | l2 | semmle.label | l2 |
 | main.rs:29:9:29:10 | l4 | semmle.label | l4 |
 | main.rs:29:14:29:64 | ...::from_size_align_unchecked(...) | semmle.label | ...::from_size_align_unchecked(...) |
 | main.rs:29:60:29:60 | v | semmle.label | v |
-| main.rs:30:13:30:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:30:31:30:32 | l4 | semmle.label | l4 |
 | main.rs:32:9:32:10 | l5 | semmle.label | l5 |
 | main.rs:32:14:32:118 | ...::from_size_align_unchecked(...) | semmle.label | ...::from_size_align_unchecked(...) |
 | main.rs:32:60:32:60 | v | semmle.label | v |
 | main.rs:32:60:32:89 | ... * ... | semmle.label | ... * ... |
-| main.rs:33:13:33:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:33:31:33:32 | l5 | semmle.label | l5 |
 | main.rs:35:9:35:10 | s6 | semmle.label | s6 |
 | main.rs:35:14:35:54 | ... + ... | semmle.label | ... + ... |
@@ -376,33 +323,31 @@ nodes
 | main.rs:36:9:36:10 | l6 | semmle.label | l6 |
 | main.rs:36:14:36:65 | ...::from_size_align_unchecked(...) | semmle.label | ...::from_size_align_unchecked(...) |
 | main.rs:36:60:36:61 | s6 | semmle.label | s6 |
-| main.rs:37:13:37:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:37:31:37:32 | l6 | semmle.label | l6 |
 | main.rs:39:9:39:10 | l7 | semmle.label | l7 |
 | main.rs:39:14:39:72 | ...::from_size_align_unchecked(...) | semmle.label | ...::from_size_align_unchecked(...) |
 | main.rs:39:60:39:61 | l6 | semmle.label | l6 |
 | main.rs:39:60:39:68 | l6.size() | semmle.label | l6.size() |
-| main.rs:40:13:40:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:40:31:40:32 | l7 | semmle.label | l7 |
 | main.rs:43:44:43:51 | ...: usize | semmle.label | ...: usize |
-| main.rs:50:13:50:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:50:31:50:42 | l2.repeat(...) [Ok, tuple.0] | semmle.label | l2.repeat(...) [Ok, tuple.0] |
 | main.rs:50:31:50:51 | ... .unwrap() [tuple.0] | semmle.label | ... .unwrap() [tuple.0] |
 | main.rs:50:31:50:53 | ... .0 | semmle.label | ... .0 |
+| main.rs:50:31:50:53 | ... .0 | semmle.label | ... .0 |
 | main.rs:50:41:50:41 | v | semmle.label | v |
-| main.rs:51:13:51:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:51:31:51:46 | l2.repeat(...) [Ok, tuple.0] | semmle.label | l2.repeat(...) [Ok, tuple.0] |
 | main.rs:51:31:51:55 | ... .unwrap() [tuple.0] | semmle.label | ... .unwrap() [tuple.0] |
 | main.rs:51:31:51:57 | ... .0 | semmle.label | ... .0 |
+| main.rs:51:31:51:57 | ... .0 | semmle.label | ... .0 |
 | main.rs:51:41:51:41 | v | semmle.label | v |
 | main.rs:51:41:51:45 | ... + ... | semmle.label | ... + ... |
-| main.rs:53:13:53:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:53:31:53:49 | l2.repeat_packed(...) [Ok] | semmle.label | l2.repeat_packed(...) [Ok] |
 | main.rs:53:31:53:58 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:53:31:53:58 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:53:48:53:48 | v | semmle.label | v |
-| main.rs:54:13:54:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:54:31:54:54 | l2.repeat_packed(...) [Ok] | semmle.label | l2.repeat_packed(...) [Ok] |
 | main.rs:54:31:54:63 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:54:31:54:63 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:54:48:54:48 | v | semmle.label | v |
 | main.rs:54:48:54:53 | ... * ... | semmle.label | ... * ... |
 | main.rs:58:9:58:20 | TuplePat [tuple.0] | semmle.label | TuplePat [tuple.0] |
@@ -410,139 +355,103 @@ nodes
 | main.rs:58:24:58:35 | l3.repeat(...) [Ok, tuple.0] | semmle.label | l3.repeat(...) [Ok, tuple.0] |
 | main.rs:58:24:58:66 | ... .expect(...) [tuple.0] | semmle.label | ... .expect(...) [tuple.0] |
 | main.rs:58:34:58:34 | v | semmle.label | v |
-| main.rs:59:13:59:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:59:31:59:32 | k1 | semmle.label | k1 |
 | main.rs:60:9:60:20 | TuplePat [tuple.0] | semmle.label | TuplePat [tuple.0] |
 | main.rs:60:10:60:11 | k2 | semmle.label | k2 |
 | main.rs:60:24:60:36 | l3.extend(...) [Ok, tuple.0] | semmle.label | l3.extend(...) [Ok, tuple.0] |
 | main.rs:60:24:60:45 | ... .unwrap() [tuple.0] | semmle.label | ... .unwrap() [tuple.0] |
 | main.rs:60:34:60:35 | k1 | semmle.label | k1 |
-| main.rs:61:13:61:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:61:31:61:32 | k2 | semmle.label | k2 |
 | main.rs:62:9:62:20 | TuplePat [tuple.0] | semmle.label | TuplePat [tuple.0] |
 | main.rs:62:10:62:11 | k3 | semmle.label | k3 |
 | main.rs:62:24:62:25 | k1 | semmle.label | k1 |
 | main.rs:62:24:62:36 | k1.extend(...) [Ok, tuple.0] | semmle.label | k1.extend(...) [Ok, tuple.0] |
 | main.rs:62:24:62:45 | ... .unwrap() [tuple.0] | semmle.label | ... .unwrap() [tuple.0] |
-| main.rs:63:13:63:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:63:31:63:32 | k3 | semmle.label | k3 |
-| main.rs:64:13:64:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:64:31:64:50 | l3.extend_packed(...) [Ok] | semmle.label | l3.extend_packed(...) [Ok] |
 | main.rs:64:31:64:59 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:64:31:64:59 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:64:48:64:49 | k1 | semmle.label | k1 |
-| main.rs:65:13:65:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:65:31:65:32 | k1 | semmle.label | k1 |
 | main.rs:65:31:65:50 | k1.extend_packed(...) [Ok] | semmle.label | k1.extend_packed(...) [Ok] |
 | main.rs:65:31:65:59 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:65:31:65:59 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:67:9:67:10 | l4 | semmle.label | l4 |
 | main.rs:67:14:67:47 | ...::array::<...>(...) [Ok] | semmle.label | ...::array::<...>(...) [Ok] |
 | main.rs:67:14:67:56 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:67:46:67:46 | v | semmle.label | v |
-| main.rs:68:13:68:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:68:31:68:32 | l4 | semmle.label | l4 |
 | main.rs:86:35:86:42 | ...: usize | semmle.label | ...: usize |
 | main.rs:87:9:87:14 | layout | semmle.label | layout |
 | main.rs:87:18:87:58 | ...::from_size_align(...) [Ok] | semmle.label | ...::from_size_align(...) [Ok] |
 | main.rs:87:18:87:67 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:87:54:87:54 | v | semmle.label | v |
-| main.rs:88:13:88:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:88:31:88:36 | layout | semmle.label | layout |
 | main.rs:91:38:91:45 | ...: usize | semmle.label | ...: usize |
 | main.rs:92:9:92:10 | l1 | semmle.label | l1 |
 | main.rs:92:14:92:48 | ...::array::<...>(...) [Ok] | semmle.label | ...::array::<...>(...) [Ok] |
 | main.rs:92:14:92:57 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:92:47:92:47 | v | semmle.label | v |
-| main.rs:96:17:96:33 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:96:35:96:36 | l1 | semmle.label | l1 |
 | main.rs:101:13:101:14 | l3 | semmle.label | l3 |
 | main.rs:101:18:101:52 | ...::array::<...>(...) [Ok] | semmle.label | ...::array::<...>(...) [Ok] |
 | main.rs:101:18:101:61 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:101:51:101:51 | v | semmle.label | v |
-| main.rs:102:17:102:33 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:102:35:102:36 | l1 | semmle.label | l1 |
-| main.rs:103:17:103:33 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:103:35:103:36 | l3 | semmle.label | l3 |
 | main.rs:105:33:105:33 | v | semmle.label | v |
-| main.rs:109:17:109:33 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:109:35:109:36 | l1 | semmle.label | l1 |
-| main.rs:111:17:111:33 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:111:35:111:36 | l1 | semmle.label | l1 |
 | main.rs:145:13:145:14 | l9 | semmle.label | l9 |
 | main.rs:145:18:145:52 | ...::array::<...>(...) [Ok] | semmle.label | ...::array::<...>(...) [Ok] |
 | main.rs:145:18:145:61 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:145:51:145:51 | v | semmle.label | v |
-| main.rs:146:17:146:33 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:146:35:146:36 | l1 | semmle.label | l1 |
-| main.rs:148:17:148:33 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:148:35:148:36 | l9 | semmle.label | l9 |
 | main.rs:151:9:151:11 | l10 | semmle.label | l10 |
 | main.rs:151:15:151:69 | ...::array::<...>(...) [Ok] | semmle.label | ...::array::<...>(...) [Ok] |
 | main.rs:151:15:151:78 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:151:48:151:68 | ...::min(...) | semmle.label | ...::min(...) |
 | main.rs:151:62:151:62 | v | semmle.label | v |
-| main.rs:152:13:152:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:152:31:152:33 | l10 | semmle.label | l10 |
 | main.rs:154:9:154:11 | l11 | semmle.label | l11 |
 | main.rs:154:15:154:69 | ...::array::<...>(...) [Ok] | semmle.label | ...::array::<...>(...) [Ok] |
 | main.rs:154:15:154:78 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:154:48:154:68 | ...::max(...) | semmle.label | ...::max(...) |
 | main.rs:154:62:154:62 | v | semmle.label | v |
-| main.rs:155:13:155:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:155:31:155:33 | l11 | semmle.label | l11 |
 | main.rs:161:13:161:15 | l13 | semmle.label | l13 |
 | main.rs:161:19:161:59 | ...::from_size_align(...) [Ok] | semmle.label | ...::from_size_align(...) [Ok] |
 | main.rs:161:19:161:68 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:161:55:161:55 | v | semmle.label | v |
-| main.rs:162:17:162:33 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:162:35:162:37 | l13 | semmle.label | l13 |
-| main.rs:169:17:169:33 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:169:35:169:37 | l13 | semmle.label | l13 |
-| main.rs:177:13:177:29 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:177:31:177:32 | l1 | semmle.label | l1 |
 | main.rs:183:29:183:36 | ...: usize | semmle.label | ...: usize |
 | main.rs:192:9:192:10 | l2 | semmle.label | l2 |
 | main.rs:192:14:192:47 | ...::array::<...>(...) [Ok] | semmle.label | ...::array::<...>(...) [Ok] |
 | main.rs:192:14:192:56 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:192:46:192:46 | v | semmle.label | v |
-| main.rs:193:32:193:36 | alloc | semmle.label | alloc |
 | main.rs:193:38:193:39 | l2 | semmle.label | l2 |
-| main.rs:194:32:194:43 | alloc_zeroed | semmle.label | alloc_zeroed |
 | main.rs:194:45:194:46 | l2 | semmle.label | l2 |
-| main.rs:195:32:195:39 | allocate | semmle.label | allocate |
 | main.rs:195:41:195:42 | l2 | semmle.label | l2 |
-| main.rs:196:32:196:46 | allocate_zeroed | semmle.label | allocate_zeroed |
 | main.rs:196:48:196:49 | l2 | semmle.label | l2 |
-| main.rs:197:32:197:39 | allocate | semmle.label | allocate |
 | main.rs:197:41:197:42 | l2 | semmle.label | l2 |
-| main.rs:198:32:198:46 | allocate_zeroed | semmle.label | allocate_zeroed |
 | main.rs:198:48:198:49 | l2 | semmle.label | l2 |
-| main.rs:202:32:202:38 | realloc | semmle.label | realloc |
 | main.rs:202:48:202:48 | v | semmle.label | v |
-| main.rs:208:40:208:43 | grow | semmle.label | grow |
 | main.rs:208:53:208:54 | l2 | semmle.label | l2 |
-| main.rs:210:40:210:50 | grow_zeroed | semmle.label | grow_zeroed |
 | main.rs:210:60:210:61 | l2 | semmle.label | l2 |
-| main.rs:213:36:213:41 | shrink | semmle.label | shrink |
 | main.rs:213:51:213:52 | l2 | semmle.label | l2 |
 | main.rs:217:27:217:34 | ...: usize | semmle.label | ...: usize |
-| main.rs:219:13:219:24 | ...::malloc | semmle.label | ...::malloc |
 | main.rs:219:26:219:26 | v | semmle.label | v |
-| main.rs:220:13:220:31 | ...::aligned_alloc | semmle.label | ...::aligned_alloc |
 | main.rs:220:36:220:36 | v | semmle.label | v |
-| main.rs:222:13:222:24 | ...::calloc | semmle.label | ...::calloc |
 | main.rs:222:30:222:30 | v | semmle.label | v |
-| main.rs:223:13:223:24 | ...::calloc | semmle.label | ...::calloc |
 | main.rs:223:26:223:26 | v | semmle.label | v |
-| main.rs:224:13:224:25 | ...::realloc | semmle.label | ...::realloc |
 | main.rs:224:31:224:31 | v | semmle.label | v |
 | main.rs:227:24:227:31 | ...: usize | semmle.label | ...: usize |
-| main.rs:228:13:228:41 | ...::try_with_capacity | semmle.label | ...::try_with_capacity |
 | main.rs:228:43:228:43 | v | semmle.label | v |
-| main.rs:229:13:229:37 | ...::with_capacity | semmle.label | ...::with_capacity |
 | main.rs:229:39:229:39 | v | semmle.label | v |
-| main.rs:230:13:230:44 | ...::try_with_capacity_in | semmle.label | ...::try_with_capacity_in |
 | main.rs:230:46:230:46 | v | semmle.label | v |
-| main.rs:231:13:231:40 | ...::with_capacity_in | semmle.label | ...::with_capacity_in |
 | main.rs:231:42:231:42 | v | semmle.label | v |
 | main.rs:282:24:282:41 | ...: String | semmle.label | ...: String |
 | main.rs:283:9:283:17 | num_bytes | semmle.label | num_bytes |
@@ -554,17 +463,15 @@ nodes
 | main.rs:285:18:285:66 | ...::from_size_align(...) [Ok] | semmle.label | ...::from_size_align(...) [Ok] |
 | main.rs:285:18:285:75 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:285:54:285:62 | num_bytes | semmle.label | num_bytes |
-| main.rs:287:22:287:38 | ...::alloc | semmle.label | ...::alloc |
 | main.rs:287:40:287:45 | layout | semmle.label | layout |
-| main.rs:311:25:311:38 | ...::args | semmle.label | ...::args |
+| main.rs:311:25:311:40 | ...::args(...) | semmle.label | ...::args(...) |
 | main.rs:311:25:311:40 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
 | main.rs:311:25:311:47 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
 | main.rs:311:25:311:74 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
 | main.rs:317:26:317:33 | ...: usize | semmle.label | ...: usize |
-| main.rs:331:13:331:24 | ...::malloc | semmle.label | ...::malloc |
 | main.rs:331:26:331:26 | a | semmle.label | a |
 | main.rs:339:9:339:9 | v | semmle.label | v |
-| main.rs:339:13:339:26 | ...::args | semmle.label | ...::args |
+| main.rs:339:13:339:28 | ...::args(...) | semmle.label | ...::args(...) |
 | main.rs:339:13:339:28 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
 | main.rs:339:13:339:35 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
 | main.rs:339:13:339:65 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-770/main.rs b/rust/ql/test/query-tests/security/CWE-770/main.rs
index 7ab9f9445fba..4caac7033cfa 100644
--- a/rust/ql/test/query-tests/security/CWE-770/main.rs
+++ b/rust/ql/test/query-tests/security/CWE-770/main.rs
@@ -351,3 +351,23 @@ fn main() {
 
     println!("--- end ---");
 }
+
+mod actix_tests {
+    use actix_web::dev::{ConnectionInfo, Payload};
+    use actix_web::{web, App, FromRequest, HttpRequest};
+
+    async fn connection_info_handler(req: HttpRequest) -> &'static str {
+        // reading the connection info does not allocate an uncontrolled amount of memory
+        let _ = req.connection_info();
+        let _ = req.full_url();
+        let _ = req.url_for("index", ["a"]);
+        let _ = req.url_for_static("index");
+        let _ = req.resource_map().url_for(&req, "index", ["a"]);
+        let _ = ConnectionInfo::from_request(&req, &mut Payload::None);
+        ""
+    }
+
+    fn test_actix() {
+        let _ = App::new().route("/", web::get().to(connection_info_handler));
+    }
+}
diff --git a/rust/ql/test/query-tests/security/CWE-770/options.yml b/rust/ql/test/query-tests/security/CWE-770/options.yml
index 5a0244bf92b8..0a7537bd03e1 100644
--- a/rust/ql/test/query-tests/security/CWE-770/options.yml
+++ b/rust/ql/test/query-tests/security/CWE-770/options.yml
@@ -1,3 +1,4 @@
 qltest_use_nightly: true
 qltest_dependencies:
     - libc = { version = "0.2.174" }
+    - actix-web = { version = "4", default-features = false }
diff --git a/rust/ql/test/query-tests/security/CWE-798/HardcodedCryptographicValue.expected b/rust/ql/test/query-tests/security/CWE-798/HardcodedCryptographicValue.expected
index f3dfe9220a47..a7f75c9779f8 100644
--- a/rust/ql/test/query-tests/security/CWE-798/HardcodedCryptographicValue.expected
+++ b/rust/ql/test/query-tests/security/CWE-798/HardcodedCryptographicValue.expected
@@ -1,15 +1,25 @@
 #select
-| test_cipher.rs:18:29:18:36 | [0u8; 16] | test_cipher.rs:18:29:18:36 | [0u8; 16] | test_cipher.rs:19:30:19:47 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:19:30:19:47 | ...::new | a key |
-| test_cipher.rs:25:29:25:36 | [0u8; 16] | test_cipher.rs:25:29:25:36 | [0u8; 16] | test_cipher.rs:26:30:26:40 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:26:30:26:40 | ...::new | a key |
-| test_cipher.rs:29:29:29:36 | [0u8; 16] | test_cipher.rs:29:29:29:36 | [0u8; 16] | test_cipher.rs:30:30:30:40 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:30:30:30:40 | ...::new | an initialization vector |
-| test_cipher.rs:37:27:37:74 | [...] | test_cipher.rs:37:27:37:74 | [...] | test_cipher.rs:38:30:38:47 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:38:30:38:47 | ...::new | a key |
-| test_cipher.rs:41:29:41:76 | [...] | test_cipher.rs:41:29:41:76 | [...] | test_cipher.rs:42:30:42:47 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:42:30:42:47 | ...::new | a key |
-| test_cipher.rs:50:37:50:52 | ...::zeroed | test_cipher.rs:50:37:50:52 | ...::zeroed | test_cipher.rs:51:31:51:48 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:51:31:51:48 | ...::new | a key |
-| test_cipher.rs:73:19:73:26 | [0u8; 32] | test_cipher.rs:73:19:73:26 | [0u8; 32] | test_cipher.rs:74:23:74:44 | ...::new_from_slice | This hard-coded value is used as $@. | test_cipher.rs:74:23:74:44 | ...::new_from_slice | a key |
-| test_cookie.rs:17:28:17:34 | [0; 64] | test_cookie.rs:17:28:17:34 | [0; 64] | test_cookie.rs:18:16:18:24 | ...::from | This hard-coded value is used as $@. | test_cookie.rs:18:16:18:24 | ...::from | a key |
-| test_cookie.rs:21:28:21:34 | [0; 64] | test_cookie.rs:21:28:21:34 | [0; 64] | test_cookie.rs:22:16:22:24 | ...::from | This hard-coded value is used as $@. | test_cookie.rs:22:16:22:24 | ...::from | a key |
-| test_cookie.rs:38:28:38:36 | [0u8; 64] | test_cookie.rs:38:28:38:36 | [0u8; 64] | test_cookie.rs:42:14:42:32 | ...::from | This hard-coded value is used as $@. | test_cookie.rs:42:14:42:32 | ...::from | a key |
-| test_cookie.rs:49:23:49:25 | 0u8 | test_cookie.rs:49:23:49:25 | 0u8 | test_cookie.rs:53:14:53:32 | ...::from | This hard-coded value is used as $@. | test_cookie.rs:53:14:53:32 | ...::from | a key |
+| test_cipher.rs:18:29:18:36 | [0u8; 16] | test_cipher.rs:18:29:18:36 | [0u8; 16] | test_cipher.rs:19:49:19:79 | ...::from_slice(...) | This hard-coded value is used as $@. | test_cipher.rs:19:49:19:79 | ...::from_slice(...) | a key |
+| test_cipher.rs:25:29:25:36 | [0u8; 16] | test_cipher.rs:25:29:25:36 | [0u8; 16] | test_cipher.rs:26:42:26:72 | ...::from_slice(...) | This hard-coded value is used as $@. | test_cipher.rs:26:42:26:72 | ...::from_slice(...) | a key |
+| test_cipher.rs:29:29:29:36 | [0u8; 16] | test_cipher.rs:29:29:29:36 | [0u8; 16] | test_cipher.rs:30:72:30:101 | ...::from_slice(...) | This hard-coded value is used as $@. | test_cipher.rs:30:72:30:101 | ...::from_slice(...) | an initialization vector |
+| test_cipher.rs:37:27:37:74 | [...] | test_cipher.rs:37:27:37:74 | [...] | test_cipher.rs:38:49:38:80 | ...::from_slice(...) | This hard-coded value is used as $@. | test_cipher.rs:38:49:38:80 | ...::from_slice(...) | a key |
+| test_cipher.rs:41:29:41:76 | [...] | test_cipher.rs:41:29:41:76 | [...] | test_cipher.rs:42:49:42:79 | ...::from_slice(...) | This hard-coded value is used as $@. | test_cipher.rs:42:49:42:79 | ...::from_slice(...) | a key |
+| test_cipher.rs:50:37:50:54 | ...::zeroed(...) | test_cipher.rs:50:37:50:54 | ...::zeroed(...) | test_cipher.rs:51:50:51:82 | ...::from_slice(...) | This hard-coded value is used as $@. | test_cipher.rs:51:50:51:82 | ...::from_slice(...) | a key |
+| test_cipher.rs:66:19:66:26 | [0u8; 32] | test_cipher.rs:66:19:66:26 | [0u8; 32] | test_cipher.rs:67:35:67:47 | const2.into() | This hard-coded value is used as $@. | test_cipher.rs:67:35:67:47 | const2.into() | a key |
+| test_cipher.rs:73:19:73:26 | [0u8; 32] | test_cipher.rs:73:19:73:26 | [0u8; 32] | test_cipher.rs:74:46:74:51 | const2 | This hard-coded value is used as $@. | test_cipher.rs:74:46:74:51 | const2 | a key |
+| test_cipher.rs:80:19:80:26 | [0u8; 32] | test_cipher.rs:80:19:80:26 | [0u8; 32] | test_cipher.rs:81:63:81:75 | const6.into() | This hard-coded value is used as $@. | test_cipher.rs:81:63:81:75 | const6.into() | a key |
+| test_cipher.rs:84:19:84:27 | [0u8; 16] | test_cipher.rs:84:19:84:27 | [0u8; 16] | test_cipher.rs:85:75:85:87 | const7.into() | This hard-coded value is used as $@. | test_cipher.rs:85:75:85:87 | const7.into() | an initialization vector |
+| test_cipher.rs:94:23:94:40 | "1234567890123456" | test_cipher.rs:94:23:94:40 | "1234567890123456" | test_cipher.rs:95:63:95:73 | key9.into() | This hard-coded value is used as $@. | test_cipher.rs:95:63:95:73 | key9.into() | a key |
+| test_cipher.rs:124:25:124:30 | [0; 32] | test_cipher.rs:124:25:124:30 | [0; 32] | test_cipher.rs:126:34:126:45 | &... | This hard-coded value is used as $@. | test_cipher.rs:126:34:126:45 | &... | a key |
+| test_cipher.rs:125:18:125:23 | [0; 12] | test_cipher.rs:125:18:125:23 | [0; 12] | test_cipher.rs:127:29:127:42 | &... | This hard-coded value is used as $@. | test_cipher.rs:127:29:127:42 | &... | a nonce |
+| test_cipher.rs:129:33:129:41 | [0xff; 32] | test_cipher.rs:129:33:129:41 | [0xff; 32] | test_cipher.rs:132:34:132:38 | &key3 | This hard-coded value is used as $@. | test_cipher.rs:132:34:132:38 | &key3 | a key |
+| test_cipher.rs:131:27:131:35 | [0xff; 12] | test_cipher.rs:131:27:131:35 | [0xff; 12] | test_cipher.rs:133:29:133:42 | &... | This hard-coded value is used as $@. | test_cipher.rs:133:29:133:42 | &... | a nonce |
+| test_cookie.rs:17:28:17:34 | [0; 64] | test_cookie.rs:17:28:17:34 | [0; 64] | test_cookie.rs:18:26:18:32 | &array1 | This hard-coded value is used as $@. | test_cookie.rs:18:26:18:32 | &array1 | a key |
+| test_cookie.rs:21:28:21:34 | [0; 64] | test_cookie.rs:21:28:21:34 | [0; 64] | test_cookie.rs:22:26:22:32 | &array2 | This hard-coded value is used as $@. | test_cookie.rs:22:26:22:32 | &array2 | a key |
+| test_cookie.rs:25:16:29:5 | match val { ... } | test_cookie.rs:25:16:29:5 | match val { ... } | test_cookie.rs:30:26:30:40 | str3.as_bytes() | This hard-coded value is used as $@. | test_cookie.rs:30:26:30:40 | str3.as_bytes() | a key |
+| test_cookie.rs:33:27:37:5 | [...] | test_cookie.rs:33:27:37:5 | [...] | test_cookie.rs:38:26:38:32 | &array4 | This hard-coded value is used as $@. | test_cookie.rs:38:26:38:32 | &array4 | a key |
+| test_cookie.rs:54:28:54:36 | [0u8; 64] | test_cookie.rs:54:28:54:36 | [0u8; 64] | test_cookie.rs:58:34:58:39 | array2 | This hard-coded value is used as $@. | test_cookie.rs:58:34:58:39 | array2 | a key |
+| test_cookie.rs:65:23:65:25 | 0u8 | test_cookie.rs:65:23:65:25 | 0u8 | test_cookie.rs:69:34:69:39 | array3 | This hard-coded value is used as $@. | test_cookie.rs:69:34:69:39 | array3 | a key |
 | test_heuristic.rs:38:25:38:30 | 0xFFFF | test_heuristic.rs:38:25:38:30 | 0xFFFF | test_heuristic.rs:81:22:81:31 | MY_CONST_1 | This hard-coded value is used as $@. | test_heuristic.rs:81:22:81:31 | MY_CONST_1 | a salt |
 | test_heuristic.rs:39:25:39:59 | ... as u64 | test_heuristic.rs:39:25:39:59 | ... as u64 | test_heuristic.rs:82:22:82:31 | MY_CONST_2 | This hard-coded value is used as $@. | test_heuristic.rs:82:22:82:31 | MY_CONST_2 | a salt |
 | test_heuristic.rs:40:27:40:32 | 0xFFFF | test_heuristic.rs:40:27:40:32 | 0xFFFF | test_heuristic.rs:83:22:83:32 | MY_STATIC_3 | This hard-coded value is used as $@. | test_heuristic.rs:83:22:83:32 | MY_STATIC_3 | a salt |
@@ -27,58 +37,108 @@ edges
 | test_cipher.rs:18:9:18:14 | const1 [&ref] | test_cipher.rs:19:73:19:78 | const1 [&ref] | provenance |  |
 | test_cipher.rs:18:28:18:36 | &... [&ref] | test_cipher.rs:18:9:18:14 | const1 [&ref] | provenance |  |
 | test_cipher.rs:18:29:18:36 | [0u8; 16] | test_cipher.rs:18:28:18:36 | &... [&ref] | provenance |  |
-| test_cipher.rs:19:49:19:79 | ...::from_slice(...) [&ref] | test_cipher.rs:19:30:19:47 | ...::new | provenance | MaD:3 Sink:MaD:3 |
-| test_cipher.rs:19:73:19:78 | const1 [&ref] | test_cipher.rs:19:49:19:79 | ...::from_slice(...) [&ref] | provenance | MaD:13 |
+| test_cipher.rs:19:49:19:79 | ...::from_slice(...) [&ref] | test_cipher.rs:19:49:19:79 | ...::from_slice(...) | provenance | Sink:MaD:3 |
+| test_cipher.rs:19:73:19:78 | const1 [&ref] | test_cipher.rs:19:49:19:79 | ...::from_slice(...) [&ref] | provenance | MaD:20 |
 | test_cipher.rs:25:9:25:14 | const4 [&ref] | test_cipher.rs:26:66:26:71 | const4 [&ref] | provenance |  |
 | test_cipher.rs:25:28:25:36 | &... [&ref] | test_cipher.rs:25:9:25:14 | const4 [&ref] | provenance |  |
 | test_cipher.rs:25:29:25:36 | [0u8; 16] | test_cipher.rs:25:28:25:36 | &... [&ref] | provenance |  |
-| test_cipher.rs:26:42:26:72 | ...::from_slice(...) [&ref] | test_cipher.rs:26:30:26:40 | ...::new | provenance | MaD:4 Sink:MaD:4 |
-| test_cipher.rs:26:66:26:71 | const4 [&ref] | test_cipher.rs:26:42:26:72 | ...::from_slice(...) [&ref] | provenance | MaD:13 |
+| test_cipher.rs:26:42:26:72 | ...::from_slice(...) [&ref] | test_cipher.rs:26:42:26:72 | ...::from_slice(...) | provenance | Sink:MaD:4 |
+| test_cipher.rs:26:66:26:71 | const4 [&ref] | test_cipher.rs:26:42:26:72 | ...::from_slice(...) [&ref] | provenance | MaD:20 |
 | test_cipher.rs:29:9:29:14 | const5 [&ref] | test_cipher.rs:30:95:30:100 | const5 [&ref] | provenance |  |
 | test_cipher.rs:29:28:29:36 | &... [&ref] | test_cipher.rs:29:9:29:14 | const5 [&ref] | provenance |  |
 | test_cipher.rs:29:29:29:36 | [0u8; 16] | test_cipher.rs:29:28:29:36 | &... [&ref] | provenance |  |
-| test_cipher.rs:30:72:30:101 | ...::from_slice(...) [&ref] | test_cipher.rs:30:30:30:40 | ...::new | provenance | MaD:5 Sink:MaD:5 |
-| test_cipher.rs:30:95:30:100 | const5 [&ref] | test_cipher.rs:30:72:30:101 | ...::from_slice(...) [&ref] | provenance | MaD:13 |
+| test_cipher.rs:30:72:30:101 | ...::from_slice(...) [&ref] | test_cipher.rs:30:72:30:101 | ...::from_slice(...) | provenance | Sink:MaD:5 |
+| test_cipher.rs:30:95:30:100 | const5 [&ref] | test_cipher.rs:30:72:30:101 | ...::from_slice(...) [&ref] | provenance | MaD:20 |
 | test_cipher.rs:37:9:37:14 | const7 | test_cipher.rs:38:74:38:79 | const7 | provenance |  |
 | test_cipher.rs:37:27:37:74 | [...] | test_cipher.rs:37:9:37:14 | const7 | provenance |  |
-| test_cipher.rs:38:49:38:80 | ...::from_slice(...) [&ref] | test_cipher.rs:38:30:38:47 | ...::new | provenance | MaD:3 Sink:MaD:3 |
-| test_cipher.rs:38:73:38:79 | &const7 [&ref] | test_cipher.rs:38:49:38:80 | ...::from_slice(...) [&ref] | provenance | MaD:13 |
+| test_cipher.rs:38:49:38:80 | ...::from_slice(...) [&ref] | test_cipher.rs:38:49:38:80 | ...::from_slice(...) | provenance | Sink:MaD:3 |
+| test_cipher.rs:38:73:38:79 | &const7 [&ref] | test_cipher.rs:38:49:38:80 | ...::from_slice(...) [&ref] | provenance | MaD:20 |
 | test_cipher.rs:38:74:38:79 | const7 | test_cipher.rs:38:73:38:79 | &const7 [&ref] | provenance |  |
 | test_cipher.rs:41:9:41:14 | const8 [&ref] | test_cipher.rs:42:73:42:78 | const8 [&ref] | provenance |  |
 | test_cipher.rs:41:28:41:76 | &... [&ref] | test_cipher.rs:41:9:41:14 | const8 [&ref] | provenance |  |
 | test_cipher.rs:41:29:41:76 | [...] | test_cipher.rs:41:28:41:76 | &... [&ref] | provenance |  |
-| test_cipher.rs:42:49:42:79 | ...::from_slice(...) [&ref] | test_cipher.rs:42:30:42:47 | ...::new | provenance | MaD:3 Sink:MaD:3 |
-| test_cipher.rs:42:73:42:78 | const8 [&ref] | test_cipher.rs:42:49:42:79 | ...::from_slice(...) [&ref] | provenance | MaD:13 |
+| test_cipher.rs:42:49:42:79 | ...::from_slice(...) [&ref] | test_cipher.rs:42:49:42:79 | ...::from_slice(...) | provenance | Sink:MaD:3 |
+| test_cipher.rs:42:73:42:78 | const8 [&ref] | test_cipher.rs:42:49:42:79 | ...::from_slice(...) [&ref] | provenance | MaD:20 |
 | test_cipher.rs:50:9:50:15 | const10 [element] | test_cipher.rs:51:75:51:81 | const10 [element] | provenance |  |
-| test_cipher.rs:50:37:50:52 | ...::zeroed | test_cipher.rs:50:37:50:54 | ...::zeroed(...) [element] | provenance | Src:MaD:7  |
-| test_cipher.rs:50:37:50:54 | ...::zeroed(...) [element] | test_cipher.rs:50:9:50:15 | const10 [element] | provenance |  |
-| test_cipher.rs:51:50:51:82 | ...::from_slice(...) [&ref, element] | test_cipher.rs:51:31:51:48 | ...::new | provenance | MaD:3 Sink:MaD:3 Sink:MaD:3 |
-| test_cipher.rs:51:74:51:81 | &const10 [&ref, element] | test_cipher.rs:51:50:51:82 | ...::from_slice(...) [&ref, element] | provenance | MaD:13 |
+| test_cipher.rs:50:37:50:54 | ...::zeroed(...) | test_cipher.rs:50:9:50:15 | const10 [element] | provenance | Src:MaD:11  |
+| test_cipher.rs:51:50:51:82 | ...::from_slice(...) [&ref, element] | test_cipher.rs:51:50:51:82 | ...::from_slice(...) | provenance | Sink:MaD:3 Sink:MaD:3 |
+| test_cipher.rs:51:74:51:81 | &const10 [&ref, element] | test_cipher.rs:51:50:51:82 | ...::from_slice(...) [&ref, element] | provenance | MaD:20 |
 | test_cipher.rs:51:75:51:81 | const10 [element] | test_cipher.rs:51:74:51:81 | &const10 [&ref, element] | provenance |  |
-| test_cipher.rs:73:9:73:14 | const2 [&ref] | test_cipher.rs:74:46:74:51 | const2 [&ref] | provenance |  |
+| test_cipher.rs:66:9:66:14 | const2 [&ref] | test_cipher.rs:67:35:67:40 | const2 [&ref] | provenance |  |
+| test_cipher.rs:66:18:66:26 | &... [&ref] | test_cipher.rs:66:9:66:14 | const2 [&ref] | provenance |  |
+| test_cipher.rs:66:19:66:26 | [0u8; 32] | test_cipher.rs:66:18:66:26 | &... [&ref] | provenance |  |
+| test_cipher.rs:67:35:67:40 | const2 [&ref] | test_cipher.rs:67:35:67:47 | const2.into() [element] | provenance | MaD:18 |
+| test_cipher.rs:67:35:67:47 | const2.into() [element] | test_cipher.rs:67:35:67:47 | const2.into() | provenance | Sink:MaD:7 |
+| test_cipher.rs:73:9:73:14 | const2 [&ref] | test_cipher.rs:74:46:74:51 | const2 | provenance | Sink:MaD:8 |
 | test_cipher.rs:73:18:73:26 | &... [&ref] | test_cipher.rs:73:9:73:14 | const2 [&ref] | provenance |  |
 | test_cipher.rs:73:19:73:26 | [0u8; 32] | test_cipher.rs:73:18:73:26 | &... [&ref] | provenance |  |
-| test_cipher.rs:74:46:74:51 | const2 [&ref] | test_cipher.rs:74:23:74:44 | ...::new_from_slice | provenance | MaD:1 Sink:MaD:1 |
+| test_cipher.rs:80:9:80:14 | const6 [&ref] | test_cipher.rs:81:63:81:68 | const6 [&ref] | provenance |  |
+| test_cipher.rs:80:18:80:26 | &... [&ref] | test_cipher.rs:80:9:80:14 | const6 [&ref] | provenance |  |
+| test_cipher.rs:80:19:80:26 | [0u8; 32] | test_cipher.rs:80:18:80:26 | &... [&ref] | provenance |  |
+| test_cipher.rs:81:63:81:68 | const6 [&ref] | test_cipher.rs:81:63:81:75 | const6.into() [element] | provenance | MaD:18 |
+| test_cipher.rs:81:63:81:75 | const6.into() [element] | test_cipher.rs:81:63:81:75 | const6.into() | provenance | Sink:MaD:9 |
+| test_cipher.rs:84:9:84:14 | const7 [&ref] | test_cipher.rs:85:75:85:80 | const7 [&ref] | provenance |  |
+| test_cipher.rs:84:18:84:27 | &... [&ref] | test_cipher.rs:84:9:84:14 | const7 [&ref] | provenance |  |
+| test_cipher.rs:84:19:84:27 | [0u8; 16] | test_cipher.rs:84:18:84:27 | &... [&ref] | provenance |  |
+| test_cipher.rs:85:75:85:80 | const7 [&ref] | test_cipher.rs:85:75:85:87 | const7.into() [element] | provenance | MaD:18 |
+| test_cipher.rs:85:75:85:87 | const7.into() [element] | test_cipher.rs:85:75:85:87 | const7.into() | provenance | Sink:MaD:10 |
+| test_cipher.rs:94:9:94:12 | key9 [&ref] | test_cipher.rs:95:63:95:66 | key9 [&ref] | provenance |  |
+| test_cipher.rs:94:23:94:40 | "1234567890123456" | test_cipher.rs:94:23:94:51 | "1234567890123456".as_bytes() [&ref] | provenance | MaD:19 |
+| test_cipher.rs:94:23:94:51 | "1234567890123456".as_bytes() [&ref] | test_cipher.rs:94:9:94:12 | key9 [&ref] | provenance |  |
+| test_cipher.rs:95:63:95:66 | key9 [&ref] | test_cipher.rs:95:63:95:73 | key9.into() [element] | provenance | MaD:18 |
+| test_cipher.rs:95:63:95:73 | key9.into() [element] | test_cipher.rs:95:63:95:73 | key9.into() | provenance | Sink:MaD:9 |
+| test_cipher.rs:124:9:124:12 | key2 | test_cipher.rs:126:35:126:38 | key2 | provenance |  |
+| test_cipher.rs:124:25:124:30 | [0; 32] | test_cipher.rs:124:9:124:12 | key2 | provenance |  |
+| test_cipher.rs:125:9:125:14 | nonce2 | test_cipher.rs:127:30:127:35 | nonce2 | provenance |  |
+| test_cipher.rs:125:18:125:23 | [0; 12] | test_cipher.rs:125:9:125:14 | nonce2 | provenance |  |
+| test_cipher.rs:126:34:126:45 | &... [&ref, element] | test_cipher.rs:126:34:126:45 | &... | provenance | Sink:MaD:7 Sink:MaD:7 |
+| test_cipher.rs:126:35:126:38 | key2 | test_cipher.rs:126:35:126:45 | key2.into() [element] | provenance | MaD:17 |
+| test_cipher.rs:126:35:126:38 | key2 | test_cipher.rs:126:35:126:45 | key2.into() [element] | provenance | MaD:18 |
+| test_cipher.rs:126:35:126:45 | key2.into() [element] | test_cipher.rs:126:34:126:45 | &... [&ref, element] | provenance |  |
+| test_cipher.rs:127:29:127:42 | &... [&ref, element] | test_cipher.rs:127:29:127:42 | &... | provenance | Sink:MaD:1 Sink:MaD:1 |
+| test_cipher.rs:127:30:127:35 | nonce2 | test_cipher.rs:127:30:127:42 | nonce2.into() [element] | provenance | MaD:17 |
+| test_cipher.rs:127:30:127:35 | nonce2 | test_cipher.rs:127:30:127:42 | nonce2.into() [element] | provenance | MaD:18 |
+| test_cipher.rs:127:30:127:42 | nonce2.into() [element] | test_cipher.rs:127:29:127:42 | &... [&ref, element] | provenance |  |
+| test_cipher.rs:129:9:129:18 | key3_array [&ref] | test_cipher.rs:130:45:130:54 | key3_array [&ref] | provenance |  |
+| test_cipher.rs:129:32:129:41 | &... [&ref] | test_cipher.rs:129:9:129:18 | key3_array [&ref] | provenance |  |
+| test_cipher.rs:129:33:129:41 | [0xff; 32] | test_cipher.rs:129:32:129:41 | &... [&ref] | provenance |  |
+| test_cipher.rs:130:9:130:12 | key3 [&ref] | test_cipher.rs:132:35:132:38 | key3 [&ref] | provenance |  |
+| test_cipher.rs:130:16:130:55 | ...::from_slice(...) [&ref] | test_cipher.rs:130:9:130:12 | key3 [&ref] | provenance |  |
+| test_cipher.rs:130:45:130:54 | key3_array [&ref] | test_cipher.rs:130:16:130:55 | ...::from_slice(...) [&ref] | provenance | MaD:20 |
+| test_cipher.rs:131:9:131:14 | nonce3 | test_cipher.rs:133:30:133:35 | nonce3 | provenance |  |
+| test_cipher.rs:131:27:131:35 | [0xff; 12] | test_cipher.rs:131:9:131:14 | nonce3 | provenance |  |
+| test_cipher.rs:132:34:132:38 | &key3 [&ref, &ref] | test_cipher.rs:132:34:132:38 | &key3 | provenance | Sink:MaD:7 Sink:MaD:7 |
+| test_cipher.rs:132:35:132:38 | key3 [&ref] | test_cipher.rs:132:34:132:38 | &key3 [&ref, &ref] | provenance |  |
+| test_cipher.rs:133:29:133:42 | &... [&ref, element] | test_cipher.rs:133:29:133:42 | &... | provenance | Sink:MaD:1 Sink:MaD:1 |
+| test_cipher.rs:133:30:133:35 | nonce3 | test_cipher.rs:133:30:133:42 | nonce3.into() [element] | provenance | MaD:17 |
+| test_cipher.rs:133:30:133:35 | nonce3 | test_cipher.rs:133:30:133:42 | nonce3.into() [element] | provenance | MaD:18 |
+| test_cipher.rs:133:30:133:42 | nonce3.into() [element] | test_cipher.rs:133:29:133:42 | &... [&ref, element] | provenance |  |
 | test_cookie.rs:17:9:17:14 | array1 | test_cookie.rs:18:27:18:32 | array1 | provenance |  |
 | test_cookie.rs:17:28:17:34 | [0; 64] | test_cookie.rs:17:9:17:14 | array1 | provenance |  |
-| test_cookie.rs:18:26:18:32 | &array1 [&ref] | test_cookie.rs:18:16:18:24 | ...::from | provenance | MaD:6 Sink:MaD:6 |
+| test_cookie.rs:18:26:18:32 | &array1 [&ref] | test_cookie.rs:18:26:18:32 | &array1 | provenance | Sink:MaD:6 |
 | test_cookie.rs:18:27:18:32 | array1 | test_cookie.rs:18:26:18:32 | &array1 [&ref] | provenance |  |
 | test_cookie.rs:21:9:21:14 | array2 | test_cookie.rs:22:27:22:32 | array2 | provenance |  |
 | test_cookie.rs:21:28:21:34 | [0; 64] | test_cookie.rs:21:9:21:14 | array2 | provenance |  |
-| test_cookie.rs:22:26:22:32 | &array2 [&ref] | test_cookie.rs:22:16:22:24 | ...::from | provenance | MaD:6 Sink:MaD:6 |
+| test_cookie.rs:22:26:22:32 | &array2 [&ref] | test_cookie.rs:22:26:22:32 | &array2 | provenance | Sink:MaD:6 |
 | test_cookie.rs:22:27:22:32 | array2 | test_cookie.rs:22:26:22:32 | &array2 [&ref] | provenance |  |
-| test_cookie.rs:38:9:38:14 | array2 | test_cookie.rs:42:34:42:39 | array2 | provenance |  |
-| test_cookie.rs:38:18:38:37 | ...::from(...) | test_cookie.rs:38:9:38:14 | array2 | provenance |  |
-| test_cookie.rs:38:28:38:36 | [0u8; 64] | test_cookie.rs:38:18:38:37 | ...::from(...) | provenance | MaD:8 |
-| test_cookie.rs:38:28:38:36 | [0u8; 64] | test_cookie.rs:38:18:38:37 | ...::from(...) | provenance | MaD:9 |
-| test_cookie.rs:38:28:38:36 | [0u8; 64] | test_cookie.rs:38:18:38:37 | ...::from(...) | provenance | MaD:10 |
-| test_cookie.rs:38:28:38:36 | [0u8; 64] | test_cookie.rs:38:18:38:37 | ...::from(...) | provenance | MaD:11 |
-| test_cookie.rs:38:28:38:36 | [0u8; 64] | test_cookie.rs:38:18:38:37 | ...::from(...) | provenance | MaD:12 |
-| test_cookie.rs:42:34:42:39 | array2 | test_cookie.rs:42:14:42:32 | ...::from | provenance | MaD:2 Sink:MaD:2 |
-| test_cookie.rs:49:9:49:14 | array3 [element] | test_cookie.rs:53:34:53:39 | array3 [element] | provenance |  |
-| test_cookie.rs:49:23:49:25 | 0u8 | test_cookie.rs:49:23:49:29 | ...::from_elem(...) [element] | provenance | MaD:14 |
-| test_cookie.rs:49:23:49:29 | ...::from_elem(...) [element] | test_cookie.rs:49:9:49:14 | array3 [element] | provenance |  |
-| test_cookie.rs:53:34:53:39 | array3 [element] | test_cookie.rs:53:14:53:32 | ...::from | provenance | MaD:2 Sink:MaD:2 |
+| test_cookie.rs:25:9:25:12 | str3 | test_cookie.rs:30:26:30:29 | str3 | provenance |  |
+| test_cookie.rs:25:16:29:5 | match val { ... } | test_cookie.rs:25:9:25:12 | str3 | provenance |  |
+| test_cookie.rs:30:26:30:29 | str3 | test_cookie.rs:30:26:30:40 | str3.as_bytes() [&ref] | provenance | MaD:19 |
+| test_cookie.rs:30:26:30:40 | str3.as_bytes() [&ref] | test_cookie.rs:30:26:30:40 | str3.as_bytes() | provenance | Sink:MaD:6 |
+| test_cookie.rs:33:9:33:14 | array4 | test_cookie.rs:38:27:38:32 | array4 | provenance |  |
+| test_cookie.rs:33:27:37:5 | [...] | test_cookie.rs:33:9:33:14 | array4 | provenance |  |
+| test_cookie.rs:38:26:38:32 | &array4 [&ref] | test_cookie.rs:38:26:38:32 | &array4 | provenance | Sink:MaD:6 |
+| test_cookie.rs:38:27:38:32 | array4 | test_cookie.rs:38:26:38:32 | &array4 [&ref] | provenance |  |
+| test_cookie.rs:54:9:54:14 | array2 | test_cookie.rs:58:34:58:39 | array2 | provenance | Sink:MaD:2 |
+| test_cookie.rs:54:18:54:37 | ...::from(...) | test_cookie.rs:54:9:54:14 | array2 | provenance |  |
+| test_cookie.rs:54:28:54:36 | [0u8; 64] | test_cookie.rs:54:18:54:37 | ...::from(...) | provenance | MaD:12 |
+| test_cookie.rs:54:28:54:36 | [0u8; 64] | test_cookie.rs:54:18:54:37 | ...::from(...) | provenance | MaD:13 |
+| test_cookie.rs:54:28:54:36 | [0u8; 64] | test_cookie.rs:54:18:54:37 | ...::from(...) | provenance | MaD:14 |
+| test_cookie.rs:54:28:54:36 | [0u8; 64] | test_cookie.rs:54:18:54:37 | ...::from(...) | provenance | MaD:15 |
+| test_cookie.rs:54:28:54:36 | [0u8; 64] | test_cookie.rs:54:18:54:37 | ...::from(...) | provenance | MaD:16 |
+| test_cookie.rs:65:9:65:14 | array3 [element] | test_cookie.rs:69:34:69:39 | array3 | provenance | Sink:MaD:2 |
+| test_cookie.rs:65:23:65:25 | 0u8 | test_cookie.rs:65:23:65:29 | ...::from_elem(...) [element] | provenance | MaD:21 |
+| test_cookie.rs:65:23:65:29 | ...::from_elem(...) [element] | test_cookie.rs:65:9:65:14 | array3 [element] | provenance |  |
 | test_heuristic.rs:38:25:38:30 | 0xFFFF | test_heuristic.rs:81:22:81:31 | MY_CONST_1 | provenance |  |
 | test_heuristic.rs:39:25:39:59 | ... as u64 | test_heuristic.rs:82:22:82:31 | MY_CONST_2 | provenance |  |
 | test_heuristic.rs:39:62:40:33 | static MY_STATIC_3 | test_heuristic.rs:83:22:83:32 | MY_STATIC_3 | provenance |  |
@@ -91,83 +151,147 @@ edges
 | test_heuristic.rs:86:29:86:32 | 1u64 | test_heuristic.rs:87:22:87:31 | MY_CONST_5 | provenance |  |
 | test_heuristic.rs:88:29:88:33 | ... + ... | test_heuristic.rs:89:22:89:31 | MY_CONST_6 | provenance |  |
 models
-| 1 | Sink: <_ as crypto_common::KeyInit>::new_from_slice; Argument[0]; credentials-key |
+| 1 | Sink: <aead::Aead>::encrypt; Argument[0]; credentials-nonce |
 | 2 | Sink: <biscotti::crypto::master::Key>::from; Argument[0]; credentials-key |
 | 3 | Sink: <cipher::stream_wrapper::StreamCipherCoreWrapper as crypto_common::KeyInit>::new; Argument[0]; credentials-key |
 | 4 | Sink: <cipher::stream_wrapper::StreamCipherCoreWrapper as crypto_common::KeyIvInit>::new; Argument[0]; credentials-key |
 | 5 | Sink: <cipher::stream_wrapper::StreamCipherCoreWrapper as crypto_common::KeyIvInit>::new; Argument[1]; credentials-iv |
 | 6 | Sink: <cookie::secure::key::Key>::from; Argument[0].Reference; credentials-key |
-| 7 | Source: core::mem::zeroed; ReturnValue.Element; constant-source |
-| 8 | Summary: <alloc::vec::Vec as core::convert::From>::from; Argument[0].Field[alloc::borrow::Cow::Owned(0)]; ReturnValue; value |
-| 9 | Summary: <alloc::vec::Vec as core::convert::From>::from; Argument[0].Field[alloc::bstr::ByteString(0)]; ReturnValue; value |
-| 10 | Summary: <alloc::vec::Vec as core::convert::From>::from; Argument[0].Field[alloc::collections::binary_heap::BinaryHeap::data]; ReturnValue; value |
-| 11 | Summary: <alloc::vec::Vec as core::convert::From>::from; Argument[0].Field[alloc::string::String::vec]; ReturnValue; value |
-| 12 | Summary: <alloc::vec::Vec as core::convert::From>::from; Argument[0]; ReturnValue; taint |
-| 13 | Summary: <generic_array::GenericArray>::from_slice; Argument[0].Reference; ReturnValue.Reference; value |
-| 14 | Summary: alloc::vec::from_elem; Argument[0]; ReturnValue.Element; value |
+| 7 | Sink: <crypto_common::KeyInit>::new; Argument[0]; credentials-key |
+| 8 | Sink: <crypto_common::KeyInit>::new_from_slice; Argument[0]; credentials-key |
+| 9 | Sink: <crypto_common::KeyIvInit>::new; Argument[0]; credentials-key |
+| 10 | Sink: <crypto_common::KeyIvInit>::new; Argument[1]; credentials-iv |
+| 11 | Source: core::mem::zeroed; ReturnValue.Element; constant-source |
+| 12 | Summary: <alloc::vec::Vec as core::convert::From>::from; Argument[0].Field[alloc::borrow::Cow::Owned(0)]; ReturnValue; value |
+| 13 | Summary: <alloc::vec::Vec as core::convert::From>::from; Argument[0].Field[alloc::bstr::ByteString(0)]; ReturnValue; value |
+| 14 | Summary: <alloc::vec::Vec as core::convert::From>::from; Argument[0].Field[alloc::collections::binary_heap::BinaryHeap::data]; ReturnValue; value |
+| 15 | Summary: <alloc::vec::Vec as core::convert::From>::from; Argument[0].Field[alloc::string::String::vec]; ReturnValue; value |
+| 16 | Summary: <alloc::vec::Vec as core::convert::From>::from; Argument[0]; ReturnValue; taint |
+| 17 | Summary: <core::convert::Into>::into; Argument[self].Element; ReturnValue.Element; taint |
+| 18 | Summary: <core::convert::Into>::into; Argument[self].Reference.Element; ReturnValue.Element; taint |
+| 19 | Summary: <core::str>::as_bytes; Argument[self].Reference; ReturnValue.Reference; taint |
+| 20 | Summary: <generic_array::GenericArray>::from_slice; Argument[0].Reference; ReturnValue.Reference; value |
+| 21 | Summary: alloc::vec::from_elem; Argument[0]; ReturnValue.Element; value |
 nodes
 | test_cipher.rs:18:9:18:14 | const1 [&ref] | semmle.label | const1 [&ref] |
 | test_cipher.rs:18:28:18:36 | &... [&ref] | semmle.label | &... [&ref] |
 | test_cipher.rs:18:29:18:36 | [0u8; 16] | semmle.label | [0u8; 16] |
-| test_cipher.rs:19:30:19:47 | ...::new | semmle.label | ...::new |
+| test_cipher.rs:19:49:19:79 | ...::from_slice(...) | semmle.label | ...::from_slice(...) |
 | test_cipher.rs:19:49:19:79 | ...::from_slice(...) [&ref] | semmle.label | ...::from_slice(...) [&ref] |
 | test_cipher.rs:19:73:19:78 | const1 [&ref] | semmle.label | const1 [&ref] |
 | test_cipher.rs:25:9:25:14 | const4 [&ref] | semmle.label | const4 [&ref] |
 | test_cipher.rs:25:28:25:36 | &... [&ref] | semmle.label | &... [&ref] |
 | test_cipher.rs:25:29:25:36 | [0u8; 16] | semmle.label | [0u8; 16] |
-| test_cipher.rs:26:30:26:40 | ...::new | semmle.label | ...::new |
+| test_cipher.rs:26:42:26:72 | ...::from_slice(...) | semmle.label | ...::from_slice(...) |
 | test_cipher.rs:26:42:26:72 | ...::from_slice(...) [&ref] | semmle.label | ...::from_slice(...) [&ref] |
 | test_cipher.rs:26:66:26:71 | const4 [&ref] | semmle.label | const4 [&ref] |
 | test_cipher.rs:29:9:29:14 | const5 [&ref] | semmle.label | const5 [&ref] |
 | test_cipher.rs:29:28:29:36 | &... [&ref] | semmle.label | &... [&ref] |
 | test_cipher.rs:29:29:29:36 | [0u8; 16] | semmle.label | [0u8; 16] |
-| test_cipher.rs:30:30:30:40 | ...::new | semmle.label | ...::new |
+| test_cipher.rs:30:72:30:101 | ...::from_slice(...) | semmle.label | ...::from_slice(...) |
 | test_cipher.rs:30:72:30:101 | ...::from_slice(...) [&ref] | semmle.label | ...::from_slice(...) [&ref] |
 | test_cipher.rs:30:95:30:100 | const5 [&ref] | semmle.label | const5 [&ref] |
 | test_cipher.rs:37:9:37:14 | const7 | semmle.label | const7 |
 | test_cipher.rs:37:27:37:74 | [...] | semmle.label | [...] |
-| test_cipher.rs:38:30:38:47 | ...::new | semmle.label | ...::new |
+| test_cipher.rs:38:49:38:80 | ...::from_slice(...) | semmle.label | ...::from_slice(...) |
 | test_cipher.rs:38:49:38:80 | ...::from_slice(...) [&ref] | semmle.label | ...::from_slice(...) [&ref] |
 | test_cipher.rs:38:73:38:79 | &const7 [&ref] | semmle.label | &const7 [&ref] |
 | test_cipher.rs:38:74:38:79 | const7 | semmle.label | const7 |
 | test_cipher.rs:41:9:41:14 | const8 [&ref] | semmle.label | const8 [&ref] |
 | test_cipher.rs:41:28:41:76 | &... [&ref] | semmle.label | &... [&ref] |
 | test_cipher.rs:41:29:41:76 | [...] | semmle.label | [...] |
-| test_cipher.rs:42:30:42:47 | ...::new | semmle.label | ...::new |
+| test_cipher.rs:42:49:42:79 | ...::from_slice(...) | semmle.label | ...::from_slice(...) |
 | test_cipher.rs:42:49:42:79 | ...::from_slice(...) [&ref] | semmle.label | ...::from_slice(...) [&ref] |
 | test_cipher.rs:42:73:42:78 | const8 [&ref] | semmle.label | const8 [&ref] |
 | test_cipher.rs:50:9:50:15 | const10 [element] | semmle.label | const10 [element] |
-| test_cipher.rs:50:37:50:52 | ...::zeroed | semmle.label | ...::zeroed |
-| test_cipher.rs:50:37:50:54 | ...::zeroed(...) [element] | semmle.label | ...::zeroed(...) [element] |
-| test_cipher.rs:51:31:51:48 | ...::new | semmle.label | ...::new |
+| test_cipher.rs:50:37:50:54 | ...::zeroed(...) | semmle.label | ...::zeroed(...) |
+| test_cipher.rs:51:50:51:82 | ...::from_slice(...) | semmle.label | ...::from_slice(...) |
 | test_cipher.rs:51:50:51:82 | ...::from_slice(...) [&ref, element] | semmle.label | ...::from_slice(...) [&ref, element] |
 | test_cipher.rs:51:74:51:81 | &const10 [&ref, element] | semmle.label | &const10 [&ref, element] |
 | test_cipher.rs:51:75:51:81 | const10 [element] | semmle.label | const10 [element] |
+| test_cipher.rs:66:9:66:14 | const2 [&ref] | semmle.label | const2 [&ref] |
+| test_cipher.rs:66:18:66:26 | &... [&ref] | semmle.label | &... [&ref] |
+| test_cipher.rs:66:19:66:26 | [0u8; 32] | semmle.label | [0u8; 32] |
+| test_cipher.rs:67:35:67:40 | const2 [&ref] | semmle.label | const2 [&ref] |
+| test_cipher.rs:67:35:67:47 | const2.into() | semmle.label | const2.into() |
+| test_cipher.rs:67:35:67:47 | const2.into() [element] | semmle.label | const2.into() [element] |
 | test_cipher.rs:73:9:73:14 | const2 [&ref] | semmle.label | const2 [&ref] |
 | test_cipher.rs:73:18:73:26 | &... [&ref] | semmle.label | &... [&ref] |
 | test_cipher.rs:73:19:73:26 | [0u8; 32] | semmle.label | [0u8; 32] |
-| test_cipher.rs:74:23:74:44 | ...::new_from_slice | semmle.label | ...::new_from_slice |
-| test_cipher.rs:74:46:74:51 | const2 [&ref] | semmle.label | const2 [&ref] |
+| test_cipher.rs:74:46:74:51 | const2 | semmle.label | const2 |
+| test_cipher.rs:80:9:80:14 | const6 [&ref] | semmle.label | const6 [&ref] |
+| test_cipher.rs:80:18:80:26 | &... [&ref] | semmle.label | &... [&ref] |
+| test_cipher.rs:80:19:80:26 | [0u8; 32] | semmle.label | [0u8; 32] |
+| test_cipher.rs:81:63:81:68 | const6 [&ref] | semmle.label | const6 [&ref] |
+| test_cipher.rs:81:63:81:75 | const6.into() | semmle.label | const6.into() |
+| test_cipher.rs:81:63:81:75 | const6.into() [element] | semmle.label | const6.into() [element] |
+| test_cipher.rs:84:9:84:14 | const7 [&ref] | semmle.label | const7 [&ref] |
+| test_cipher.rs:84:18:84:27 | &... [&ref] | semmle.label | &... [&ref] |
+| test_cipher.rs:84:19:84:27 | [0u8; 16] | semmle.label | [0u8; 16] |
+| test_cipher.rs:85:75:85:80 | const7 [&ref] | semmle.label | const7 [&ref] |
+| test_cipher.rs:85:75:85:87 | const7.into() | semmle.label | const7.into() |
+| test_cipher.rs:85:75:85:87 | const7.into() [element] | semmle.label | const7.into() [element] |
+| test_cipher.rs:94:9:94:12 | key9 [&ref] | semmle.label | key9 [&ref] |
+| test_cipher.rs:94:23:94:40 | "1234567890123456" | semmle.label | "1234567890123456" |
+| test_cipher.rs:94:23:94:51 | "1234567890123456".as_bytes() [&ref] | semmle.label | "1234567890123456".as_bytes() [&ref] |
+| test_cipher.rs:95:63:95:66 | key9 [&ref] | semmle.label | key9 [&ref] |
+| test_cipher.rs:95:63:95:73 | key9.into() | semmle.label | key9.into() |
+| test_cipher.rs:95:63:95:73 | key9.into() [element] | semmle.label | key9.into() [element] |
+| test_cipher.rs:124:9:124:12 | key2 | semmle.label | key2 |
+| test_cipher.rs:124:25:124:30 | [0; 32] | semmle.label | [0; 32] |
+| test_cipher.rs:125:9:125:14 | nonce2 | semmle.label | nonce2 |
+| test_cipher.rs:125:18:125:23 | [0; 12] | semmle.label | [0; 12] |
+| test_cipher.rs:126:34:126:45 | &... | semmle.label | &... |
+| test_cipher.rs:126:34:126:45 | &... [&ref, element] | semmle.label | &... [&ref, element] |
+| test_cipher.rs:126:35:126:38 | key2 | semmle.label | key2 |
+| test_cipher.rs:126:35:126:45 | key2.into() [element] | semmle.label | key2.into() [element] |
+| test_cipher.rs:127:29:127:42 | &... | semmle.label | &... |
+| test_cipher.rs:127:29:127:42 | &... [&ref, element] | semmle.label | &... [&ref, element] |
+| test_cipher.rs:127:30:127:35 | nonce2 | semmle.label | nonce2 |
+| test_cipher.rs:127:30:127:42 | nonce2.into() [element] | semmle.label | nonce2.into() [element] |
+| test_cipher.rs:129:9:129:18 | key3_array [&ref] | semmle.label | key3_array [&ref] |
+| test_cipher.rs:129:32:129:41 | &... [&ref] | semmle.label | &... [&ref] |
+| test_cipher.rs:129:33:129:41 | [0xff; 32] | semmle.label | [0xff; 32] |
+| test_cipher.rs:130:9:130:12 | key3 [&ref] | semmle.label | key3 [&ref] |
+| test_cipher.rs:130:16:130:55 | ...::from_slice(...) [&ref] | semmle.label | ...::from_slice(...) [&ref] |
+| test_cipher.rs:130:45:130:54 | key3_array [&ref] | semmle.label | key3_array [&ref] |
+| test_cipher.rs:131:9:131:14 | nonce3 | semmle.label | nonce3 |
+| test_cipher.rs:131:27:131:35 | [0xff; 12] | semmle.label | [0xff; 12] |
+| test_cipher.rs:132:34:132:38 | &key3 | semmle.label | &key3 |
+| test_cipher.rs:132:34:132:38 | &key3 [&ref, &ref] | semmle.label | &key3 [&ref, &ref] |
+| test_cipher.rs:132:35:132:38 | key3 [&ref] | semmle.label | key3 [&ref] |
+| test_cipher.rs:133:29:133:42 | &... | semmle.label | &... |
+| test_cipher.rs:133:29:133:42 | &... [&ref, element] | semmle.label | &... [&ref, element] |
+| test_cipher.rs:133:30:133:35 | nonce3 | semmle.label | nonce3 |
+| test_cipher.rs:133:30:133:42 | nonce3.into() [element] | semmle.label | nonce3.into() [element] |
 | test_cookie.rs:17:9:17:14 | array1 | semmle.label | array1 |
 | test_cookie.rs:17:28:17:34 | [0; 64] | semmle.label | [0; 64] |
-| test_cookie.rs:18:16:18:24 | ...::from | semmle.label | ...::from |
+| test_cookie.rs:18:26:18:32 | &array1 | semmle.label | &array1 |
 | test_cookie.rs:18:26:18:32 | &array1 [&ref] | semmle.label | &array1 [&ref] |
 | test_cookie.rs:18:27:18:32 | array1 | semmle.label | array1 |
 | test_cookie.rs:21:9:21:14 | array2 | semmle.label | array2 |
 | test_cookie.rs:21:28:21:34 | [0; 64] | semmle.label | [0; 64] |
-| test_cookie.rs:22:16:22:24 | ...::from | semmle.label | ...::from |
+| test_cookie.rs:22:26:22:32 | &array2 | semmle.label | &array2 |
 | test_cookie.rs:22:26:22:32 | &array2 [&ref] | semmle.label | &array2 [&ref] |
 | test_cookie.rs:22:27:22:32 | array2 | semmle.label | array2 |
-| test_cookie.rs:38:9:38:14 | array2 | semmle.label | array2 |
-| test_cookie.rs:38:18:38:37 | ...::from(...) | semmle.label | ...::from(...) |
-| test_cookie.rs:38:28:38:36 | [0u8; 64] | semmle.label | [0u8; 64] |
-| test_cookie.rs:42:14:42:32 | ...::from | semmle.label | ...::from |
-| test_cookie.rs:42:34:42:39 | array2 | semmle.label | array2 |
-| test_cookie.rs:49:9:49:14 | array3 [element] | semmle.label | array3 [element] |
-| test_cookie.rs:49:23:49:25 | 0u8 | semmle.label | 0u8 |
-| test_cookie.rs:49:23:49:29 | ...::from_elem(...) [element] | semmle.label | ...::from_elem(...) [element] |
-| test_cookie.rs:53:14:53:32 | ...::from | semmle.label | ...::from |
-| test_cookie.rs:53:34:53:39 | array3 [element] | semmle.label | array3 [element] |
+| test_cookie.rs:25:9:25:12 | str3 | semmle.label | str3 |
+| test_cookie.rs:25:16:29:5 | match val { ... } | semmle.label | match val { ... } |
+| test_cookie.rs:30:26:30:29 | str3 | semmle.label | str3 |
+| test_cookie.rs:30:26:30:40 | str3.as_bytes() | semmle.label | str3.as_bytes() |
+| test_cookie.rs:30:26:30:40 | str3.as_bytes() [&ref] | semmle.label | str3.as_bytes() [&ref] |
+| test_cookie.rs:33:9:33:14 | array4 | semmle.label | array4 |
+| test_cookie.rs:33:27:37:5 | [...] | semmle.label | [...] |
+| test_cookie.rs:38:26:38:32 | &array4 | semmle.label | &array4 |
+| test_cookie.rs:38:26:38:32 | &array4 [&ref] | semmle.label | &array4 [&ref] |
+| test_cookie.rs:38:27:38:32 | array4 | semmle.label | array4 |
+| test_cookie.rs:54:9:54:14 | array2 | semmle.label | array2 |
+| test_cookie.rs:54:18:54:37 | ...::from(...) | semmle.label | ...::from(...) |
+| test_cookie.rs:54:28:54:36 | [0u8; 64] | semmle.label | [0u8; 64] |
+| test_cookie.rs:58:34:58:39 | array2 | semmle.label | array2 |
+| test_cookie.rs:65:9:65:14 | array3 [element] | semmle.label | array3 [element] |
+| test_cookie.rs:65:23:65:25 | 0u8 | semmle.label | 0u8 |
+| test_cookie.rs:65:23:65:29 | ...::from_elem(...) [element] | semmle.label | ...::from_elem(...) [element] |
+| test_cookie.rs:69:34:69:39 | array3 | semmle.label | array3 |
 | test_heuristic.rs:38:25:38:30 | 0xFFFF | semmle.label | 0xFFFF |
 | test_heuristic.rs:39:25:39:59 | ... as u64 | semmle.label | ... as u64 |
 | test_heuristic.rs:39:62:40:33 | static MY_STATIC_3 | semmle.label | static MY_STATIC_3 |
diff --git a/rust/ql/test/query-tests/security/CWE-798/test_cipher.rs b/rust/ql/test/query-tests/security/CWE-798/test_cipher.rs
index 7278f786b100..d09e00af86cb 100644
--- a/rust/ql/test/query-tests/security/CWE-798/test_cipher.rs
+++ b/rust/ql/test/query-tests/security/CWE-798/test_cipher.rs
@@ -63,8 +63,8 @@ fn test_block_cipher_aes(
     let aes_cipher1 = Aes256::new(key256.into());
     aes_cipher1.encrypt_block(block128.into());
 
-    let const2 = &[0u8;32]; // $ MISSING: Alert[rust/hard-coded-cryptographic-value]
-    let aes_cipher2 = Aes256::new(const2.into()); // $ MISSING: Sink
+    let const2 = &[0u8;32]; // $ Alert[rust/hard-coded-cryptographic-value]
+    let aes_cipher2 = Aes256::new(const2.into()); // $ Sink
     aes_cipher2.encrypt_block(block128.into());
 
     let aes_cipher3 = Aes256::new_from_slice(key256).unwrap();
@@ -77,12 +77,12 @@ fn test_block_cipher_aes(
     let aes_cipher5 = cfb_mode::Encryptor::<aes::Aes256>::new(key.into(), iv.into());
     _ = aes_cipher5.encrypt_b2b(input, output).unwrap();
 
-    let const6 = &[0u8;32]; // $ MISSING: Alert[rust/hard-coded-cryptographic-value]
-    let aes_cipher6 = cfb_mode::Encryptor::<aes::Aes256>::new(const6.into(), iv.into()); // $ MISSING: Sink
+    let const6 = &[0u8;32]; // $ Alert[rust/hard-coded-cryptographic-value]
+    let aes_cipher6 = cfb_mode::Encryptor::<aes::Aes256>::new(const6.into(), iv.into()); // $ Sink
     _ = aes_cipher6.encrypt_b2b(input, output).unwrap();
 
-    let const7 = &[0u8; 16]; // $ MISSING: Alert[rust/hard-coded-cryptographic-value]
-    let aes_cipher7 = cfb_mode::Encryptor::<aes::Aes256>::new(key.into(), const7.into()); // $ MISSING: Sink
+    let const7 = &[0u8; 16]; // $ Alert[rust/hard-coded-cryptographic-value]
+    let aes_cipher7 = cfb_mode::Encryptor::<aes::Aes256>::new(key.into(), const7.into()); // $ Sink
     _ = aes_cipher7.encrypt_b2b(input, output).unwrap();
 
     // various string conversions
@@ -91,8 +91,8 @@ fn test_block_cipher_aes(
     let aes_cipher8 = cfb_mode::Encryptor::<aes::Aes256>::new(key8.into(), iv.into());
     _ = aes_cipher8.encrypt_b2b(input, output).unwrap();
 
-    let key9: &[u8] = "1234567890123456".as_bytes(); // $ MISSING: Alert[rust/hard-coded-cryptographic-value]
-    let aes_cipher9 = cfb_mode::Encryptor::<aes::Aes256>::new(key9.into(), iv.into());
+    let key9: &[u8] = "1234567890123456".as_bytes(); // $ Alert[rust/hard-coded-cryptographic-value]
+    let aes_cipher9 = cfb_mode::Encryptor::<aes::Aes256>::new(key9.into(), iv.into()); // $ Sink
     _ = aes_cipher9.encrypt_b2b(input, output).unwrap();
 
     let key10: [u8; 32] = match base64::engine::general_purpose::STANDARD.decode(key_str) {
@@ -121,16 +121,16 @@ fn test_aes_gcm(
     let cipher1 = Aes256Gcm::new(&key1);
     let _ = cipher1.encrypt(&nonce1, b"plaintext".as_ref()).unwrap();
 
-    let key2: [u8;32] = [0;32]; // $ MISSING: Alert[rust/hard-coded-cryptographic-value]
-    let nonce2 = [0;12]; // $ MISSING: Alert[rust/hard-coded-cryptographic-value]
-    let cipher2 = Aes256Gcm::new(&key2.into()); // $ MISSING: Sink
-    let _ = cipher2.encrypt(&nonce2.into(), b"plaintext".as_ref()).unwrap(); // $ MISSING: Sink
+    let key2: [u8;32] = [0;32]; // $ Alert[rust/hard-coded-cryptographic-value]
+    let nonce2 = [0;12]; // $ Alert[rust/hard-coded-cryptographic-value]
+    let cipher2 = Aes256Gcm::new(&key2.into()); // $ Sink
+    let _ = cipher2.encrypt(&nonce2.into(), b"plaintext".as_ref()).unwrap(); // $ Sink
 
-    let key3_array: &[u8;32] = &[0xff;32]; // $ MISSING: Alert[rust/hard-coded-cryptographic-value]
+    let key3_array: &[u8;32] = &[0xff;32]; // $ Alert[rust/hard-coded-cryptographic-value]
     let key3 = Key::<Aes256Gcm>::from_slice(key3_array);
-    let nonce3: [u8;12] = [0xff;12]; // $ MISSING: Alert[rust/hard-coded-cryptographic-value]
-    let cipher3 = Aes256Gcm::new(&key3); // $ MISSING: Sink
-    let _ = cipher3.encrypt(&nonce3.into(), b"plaintext".as_ref()).unwrap(); // $ MISSING: Sink
+    let nonce3: [u8;12] = [0xff;12]; // $ Alert[rust/hard-coded-cryptographic-value]
+    let cipher3 = Aes256Gcm::new(&key3); // $ Sink
+    let _ = cipher3.encrypt(&nonce3.into(), b"plaintext".as_ref()).unwrap(); // $ Sink
 
     // with barrier
 
diff --git a/rust/ql/test/query-tests/security/CWE-798/test_cookie.rs b/rust/ql/test/query-tests/security/CWE-798/test_cookie.rs
index 10852583c678..f28491c713ee 100644
--- a/rust/ql/test/query-tests/security/CWE-798/test_cookie.rs
+++ b/rust/ql/test/query-tests/security/CWE-798/test_cookie.rs
@@ -3,7 +3,7 @@ use cookie::{CookieJar, SignedJar, PrivateJar, Key};
 
 // --- tests ---
 
-fn test_cookie_jar(array_var: &[u8]) {
+fn test_cookie_jar(array_var: &[u8], val: u64) {
     let mut jar = CookieJar::new();
 
     let key_generate = Key::generate(); // good
@@ -21,6 +21,22 @@ fn test_cookie_jar(array_var: &[u8]) {
     let array2: [u8; 64] = [0; 64]; // $ Alert[rust/hard-coded-cryptographic-value]
     let key2 = Key::from(&array2); // $ Sink
     _ = jar.private_mut(&key2);
+
+    let str3 = match(val) {
+        0 => "one",
+        1 => "two",
+        _ => "many"
+    }; // $ Alert[rust/hard-coded-cryptographic-value]
+    let key3 = Key::from(str3.as_bytes()); // $ Sink
+    _ = jar.signed_mut(&key3);
+
+    let array4: [u8; 3] = [
+        1,
+        2,
+        val as u8
+    ]; // $ Alert[rust/hard-coded-cryptographic-value]
+    let key4 = Key::from(&array4); // $ Sink
+    _ = jar.signed_mut(&key4);
 }
 
 fn test_biscotti_crypto(array_var: &[u8]) {
diff --git a/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected b/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected
index a301fad6560a..f464e133e2a4 100644
--- a/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected
+++ b/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected
@@ -16,7 +16,10 @@
 | lifetime.rs:317:13:317:18 | result | lifetime.rs:289:25:289:26 | &x | lifetime.rs:317:13:317:18 | result | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:289:17:289:17 | x | x |
 | lifetime.rs:411:16:411:17 | p1 | lifetime.rs:383:31:383:37 | &raw mut my_pair | lifetime.rs:411:16:411:17 | p1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:382:11:382:17 | my_pair | my_pair |
 | lifetime.rs:416:16:416:17 | p1 | lifetime.rs:383:31:383:37 | &raw mut my_pair | lifetime.rs:416:16:416:17 | p1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:382:11:382:17 | my_pair | my_pair |
+| lifetime.rs:421:15:421:16 | p2 | lifetime.rs:384:27:384:35 | &raw const ... | lifetime.rs:421:15:421:16 | p2 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:382:11:382:17 | my_pair | my_pair |
+| lifetime.rs:422:15:422:16 | p3 | lifetime.rs:385:31:385:39 | &raw mut ... | lifetime.rs:422:15:422:16 | p3 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:382:11:382:17 | my_pair | my_pair |
 | lifetime.rs:428:7:428:8 | p1 | lifetime.rs:383:31:383:37 | &raw mut my_pair | lifetime.rs:428:7:428:8 | p1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:382:11:382:17 | my_pair | my_pair |
+| lifetime.rs:429:6:429:7 | p3 | lifetime.rs:385:31:385:39 | &raw mut ... | lifetime.rs:429:6:429:7 | p3 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:382:11:382:17 | my_pair | my_pair |
 | lifetime.rs:433:7:433:8 | p1 | lifetime.rs:383:31:383:37 | &raw mut my_pair | lifetime.rs:433:7:433:8 | p1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:382:11:382:17 | my_pair | my_pair |
 | lifetime.rs:459:13:459:14 | p1 | lifetime.rs:442:17:442:23 | &my_val | lifetime.rs:459:13:459:14 | p1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:441:6:441:11 | my_val | my_val |
 | lifetime.rs:460:13:460:31 | get_ptr_from_ref(...) | lifetime.rs:442:17:442:23 | &my_val | lifetime.rs:460:13:460:31 | get_ptr_from_ref(...) | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:441:6:441:11 | my_val | my_val |
@@ -117,6 +120,15 @@ edges
 | lifetime.rs:383:3:383:4 | p1 | lifetime.rs:428:7:428:8 | p1 | provenance |  |
 | lifetime.rs:383:3:383:4 | p1 | lifetime.rs:433:7:433:8 | p1 | provenance |  |
 | lifetime.rs:383:31:383:37 | &raw mut my_pair | lifetime.rs:383:3:383:4 | p1 | provenance |  |
+| lifetime.rs:384:3:384:4 | p2 | lifetime.rs:394:14:394:15 | p2 | provenance |  |
+| lifetime.rs:384:3:384:4 | p2 | lifetime.rs:421:15:421:16 | p2 | provenance |  |
+| lifetime.rs:384:27:384:35 | &raw const ... | lifetime.rs:384:3:384:4 | p2 | provenance |  |
+| lifetime.rs:385:3:385:4 | p3 | lifetime.rs:395:14:395:15 | p3 | provenance |  |
+| lifetime.rs:385:3:385:4 | p3 | lifetime.rs:400:5:400:6 | p3 | provenance |  |
+| lifetime.rs:385:3:385:4 | p3 | lifetime.rs:400:5:400:6 | p3 | provenance |  |
+| lifetime.rs:385:31:385:39 | &raw mut ... | lifetime.rs:385:3:385:4 | p3 | provenance |  |
+| lifetime.rs:400:5:400:6 | p3 | lifetime.rs:422:15:422:16 | p3 | provenance |  |
+| lifetime.rs:400:5:400:6 | p3 | lifetime.rs:429:6:429:7 | p3 | provenance |  |
 | lifetime.rs:442:6:442:7 | r1 | lifetime.rs:443:42:443:43 | r1 | provenance |  |
 | lifetime.rs:442:17:442:23 | &my_val | lifetime.rs:442:6:442:7 | r1 | provenance |  |
 | lifetime.rs:443:6:443:7 | p1 | lifetime.rs:446:13:446:14 | p1 | provenance |  |
@@ -262,13 +274,24 @@ nodes
 | lifetime.rs:355:28:355:30 | ptr | semmle.label | ptr |
 | lifetime.rs:383:3:383:4 | p1 | semmle.label | p1 |
 | lifetime.rs:383:31:383:37 | &raw mut my_pair | semmle.label | &raw mut my_pair |
+| lifetime.rs:384:3:384:4 | p2 | semmle.label | p2 |
+| lifetime.rs:384:27:384:35 | &raw const ... | semmle.label | &raw const ... |
+| lifetime.rs:385:3:385:4 | p3 | semmle.label | p3 |
+| lifetime.rs:385:31:385:39 | &raw mut ... | semmle.label | &raw mut ... |
 | lifetime.rs:388:15:388:16 | p1 | semmle.label | p1 |
 | lifetime.rs:391:15:391:16 | p1 | semmle.label | p1 |
+| lifetime.rs:394:14:394:15 | p2 | semmle.label | p2 |
+| lifetime.rs:395:14:395:15 | p3 | semmle.label | p3 |
 | lifetime.rs:399:6:399:7 | p1 | semmle.label | p1 |
+| lifetime.rs:400:5:400:6 | p3 | semmle.label | p3 |
+| lifetime.rs:400:5:400:6 | p3 | semmle.label | p3 |
 | lifetime.rs:401:6:401:7 | p1 | semmle.label | p1 |
 | lifetime.rs:411:16:411:17 | p1 | semmle.label | p1 |
 | lifetime.rs:416:16:416:17 | p1 | semmle.label | p1 |
+| lifetime.rs:421:15:421:16 | p2 | semmle.label | p2 |
+| lifetime.rs:422:15:422:16 | p3 | semmle.label | p3 |
 | lifetime.rs:428:7:428:8 | p1 | semmle.label | p1 |
+| lifetime.rs:429:6:429:7 | p3 | semmle.label | p3 |
 | lifetime.rs:433:7:433:8 | p1 | semmle.label | p1 |
 | lifetime.rs:442:6:442:7 | r1 | semmle.label | r1 |
 | lifetime.rs:442:17:442:23 | &my_val | semmle.label | &my_val |
diff --git a/rust/ql/test/query-tests/security/CWE-825/AccessInvalidPointer.expected b/rust/ql/test/query-tests/security/CWE-825/AccessInvalidPointer.expected
index d3b5456063ff..f825c0ad5985 100644
--- a/rust/ql/test/query-tests/security/CWE-825/AccessInvalidPointer.expected
+++ b/rust/ql/test/query-tests/security/CWE-825/AccessInvalidPointer.expected
@@ -1,87 +1,70 @@
 #select
-| deallocation.rs:26:15:26:16 | m1 | deallocation.rs:20:3:20:21 | ...::dealloc | deallocation.rs:26:15:26:16 | m1 | This operation dereferences a pointer that may be $@. | deallocation.rs:20:3:20:21 | ...::dealloc | invalid |
-| deallocation.rs:37:14:37:33 | ...::read::<...> | deallocation.rs:20:3:20:21 | ...::dealloc | deallocation.rs:37:14:37:33 | ...::read::<...> | This operation dereferences a pointer that may be $@. | deallocation.rs:20:3:20:21 | ...::dealloc | invalid |
-| deallocation.rs:44:6:44:7 | m1 | deallocation.rs:20:3:20:21 | ...::dealloc | deallocation.rs:44:6:44:7 | m1 | This operation dereferences a pointer that may be $@. | deallocation.rs:20:3:20:21 | ...::dealloc | invalid |
-| deallocation.rs:49:5:49:25 | ...::write::<...> | deallocation.rs:20:3:20:21 | ...::dealloc | deallocation.rs:49:5:49:25 | ...::write::<...> | This operation dereferences a pointer that may be $@. | deallocation.rs:20:3:20:21 | ...::dealloc | invalid |
-| deallocation.rs:76:16:76:17 | m2 | deallocation.rs:70:3:70:21 | ...::dealloc | deallocation.rs:76:16:76:17 | m2 | This operation dereferences a pointer that may be $@. | deallocation.rs:70:3:70:21 | ...::dealloc | invalid |
-| deallocation.rs:81:16:81:17 | m2 | deallocation.rs:70:3:70:21 | ...::dealloc | deallocation.rs:81:16:81:17 | m2 | This operation dereferences a pointer that may be $@. | deallocation.rs:70:3:70:21 | ...::dealloc | invalid |
-| deallocation.rs:86:7:86:8 | m2 | deallocation.rs:70:3:70:21 | ...::dealloc | deallocation.rs:86:7:86:8 | m2 | This operation dereferences a pointer that may be $@. | deallocation.rs:70:3:70:21 | ...::dealloc | invalid |
-| deallocation.rs:90:7:90:8 | m2 | deallocation.rs:70:3:70:21 | ...::dealloc | deallocation.rs:90:7:90:8 | m2 | This operation dereferences a pointer that may be $@. | deallocation.rs:70:3:70:21 | ...::dealloc | invalid |
-| deallocation.rs:95:5:95:31 | ...::write::<...> | deallocation.rs:70:3:70:21 | ...::dealloc | deallocation.rs:95:5:95:31 | ...::write::<...> | This operation dereferences a pointer that may be $@. | deallocation.rs:70:3:70:21 | ...::dealloc | invalid |
-| deallocation.rs:115:13:115:18 | my_ptr | deallocation.rs:112:3:112:12 | ...::free | deallocation.rs:115:13:115:18 | my_ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:112:3:112:12 | ...::free | invalid |
-| deallocation.rs:130:14:130:15 | p1 | deallocation.rs:123:23:123:40 | ...::dangling | deallocation.rs:130:14:130:15 | p1 | This operation dereferences a pointer that may be $@. | deallocation.rs:123:23:123:40 | ...::dangling | invalid |
-| deallocation.rs:131:14:131:15 | p2 | deallocation.rs:124:21:124:42 | ...::dangling_mut | deallocation.rs:131:14:131:15 | p2 | This operation dereferences a pointer that may be $@. | deallocation.rs:124:21:124:42 | ...::dangling_mut | invalid |
-| deallocation.rs:132:14:132:15 | p3 | deallocation.rs:125:23:125:36 | ...::null | deallocation.rs:132:14:132:15 | p3 | This operation dereferences a pointer that may be $@. | deallocation.rs:125:23:125:36 | ...::null | invalid |
-| deallocation.rs:163:13:163:15 | ptr | deallocation.rs:159:9:159:26 | ...::null_mut | deallocation.rs:163:13:163:15 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:159:9:159:26 | ...::null_mut | invalid |
-| deallocation.rs:166:13:166:15 | ptr | deallocation.rs:159:9:159:26 | ...::null_mut | deallocation.rs:166:13:166:15 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:159:9:159:26 | ...::null_mut | invalid |
-| deallocation.rs:175:13:175:15 | ptr | deallocation.rs:171:9:171:26 | ...::null_mut | deallocation.rs:175:13:175:15 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:171:9:171:26 | ...::null_mut | invalid |
-| deallocation.rs:178:13:178:15 | ptr | deallocation.rs:171:9:171:26 | ...::null_mut | deallocation.rs:178:13:178:15 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:171:9:171:26 | ...::null_mut | invalid |
-| deallocation.rs:186:24:186:26 | ptr | deallocation.rs:183:9:183:26 | ...::null_mut | deallocation.rs:186:24:186:26 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:183:9:183:26 | ...::null_mut | invalid |
-| deallocation.rs:190:24:190:26 | ptr | deallocation.rs:183:9:183:26 | ...::null_mut | deallocation.rs:190:24:190:26 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:183:9:183:26 | ...::null_mut | invalid |
-| deallocation.rs:194:25:194:27 | ptr | deallocation.rs:183:9:183:26 | ...::null_mut | deallocation.rs:194:25:194:27 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:183:9:183:26 | ...::null_mut | invalid |
-| deallocation.rs:202:24:202:26 | ptr | deallocation.rs:183:9:183:26 | ...::null_mut | deallocation.rs:202:24:202:26 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:183:9:183:26 | ...::null_mut | invalid |
-| deallocation.rs:202:24:202:26 | ptr | deallocation.rs:199:9:199:26 | ...::null_mut | deallocation.rs:202:24:202:26 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:199:9:199:26 | ...::null_mut | invalid |
-| deallocation.rs:210:7:210:9 | ptr | deallocation.rs:183:9:183:26 | ...::null_mut | deallocation.rs:210:7:210:9 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:183:9:183:26 | ...::null_mut | invalid |
-| deallocation.rs:210:7:210:9 | ptr | deallocation.rs:199:9:199:26 | ...::null_mut | deallocation.rs:210:7:210:9 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:199:9:199:26 | ...::null_mut | invalid |
-| deallocation.rs:210:7:210:9 | ptr | deallocation.rs:207:9:207:26 | ...::null_mut | deallocation.rs:210:7:210:9 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:207:9:207:26 | ...::null_mut | invalid |
-| deallocation.rs:226:13:226:21 | const_ptr | deallocation.rs:219:15:219:32 | ...::null_mut | deallocation.rs:226:13:226:21 | const_ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:219:15:219:32 | ...::null_mut | invalid |
-| deallocation.rs:274:15:274:16 | p1 | deallocation.rs:270:3:270:25 | ...::drop_in_place | deallocation.rs:274:15:274:16 | p1 | This operation dereferences a pointer that may be $@. | deallocation.rs:270:3:270:25 | ...::drop_in_place | invalid |
-| deallocation.rs:342:18:342:20 | ptr | deallocation.rs:336:3:336:25 | ...::drop_in_place | deallocation.rs:342:18:342:20 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:336:3:336:25 | ...::drop_in_place | invalid |
+| deallocation.rs:26:15:26:16 | m1 | deallocation.rs:20:23:20:24 | m1 | deallocation.rs:26:15:26:16 | m1 | This operation dereferences a pointer that may be $@. | deallocation.rs:20:23:20:24 | m1 | invalid |
+| deallocation.rs:37:35:37:36 | m1 | deallocation.rs:20:23:20:24 | m1 | deallocation.rs:37:35:37:36 | m1 | This operation dereferences a pointer that may be $@. | deallocation.rs:20:23:20:24 | m1 | invalid |
+| deallocation.rs:44:6:44:7 | m1 | deallocation.rs:20:23:20:24 | m1 | deallocation.rs:44:6:44:7 | m1 | This operation dereferences a pointer that may be $@. | deallocation.rs:20:23:20:24 | m1 | invalid |
+| deallocation.rs:49:27:49:28 | m1 | deallocation.rs:20:23:20:24 | m1 | deallocation.rs:49:27:49:28 | m1 | This operation dereferences a pointer that may be $@. | deallocation.rs:20:23:20:24 | m1 | invalid |
+| deallocation.rs:76:16:76:17 | m2 | deallocation.rs:70:23:70:35 | m2 as ... | deallocation.rs:76:16:76:17 | m2 | This operation dereferences a pointer that may be $@. | deallocation.rs:70:23:70:35 | m2 as ... | invalid |
+| deallocation.rs:81:16:81:17 | m2 | deallocation.rs:70:23:70:35 | m2 as ... | deallocation.rs:81:16:81:17 | m2 | This operation dereferences a pointer that may be $@. | deallocation.rs:70:23:70:35 | m2 as ... | invalid |
+| deallocation.rs:86:7:86:8 | m2 | deallocation.rs:70:23:70:35 | m2 as ... | deallocation.rs:86:7:86:8 | m2 | This operation dereferences a pointer that may be $@. | deallocation.rs:70:23:70:35 | m2 as ... | invalid |
+| deallocation.rs:90:7:90:8 | m2 | deallocation.rs:70:23:70:35 | m2 as ... | deallocation.rs:90:7:90:8 | m2 | This operation dereferences a pointer that may be $@. | deallocation.rs:70:23:70:35 | m2 as ... | invalid |
+| deallocation.rs:95:33:95:34 | m2 | deallocation.rs:70:23:70:35 | m2 as ... | deallocation.rs:95:33:95:34 | m2 | This operation dereferences a pointer that may be $@. | deallocation.rs:70:23:70:35 | m2 as ... | invalid |
+| deallocation.rs:115:13:115:18 | my_ptr | deallocation.rs:112:14:112:40 | my_ptr as ... | deallocation.rs:115:13:115:18 | my_ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:112:14:112:40 | my_ptr as ... | invalid |
+| deallocation.rs:130:14:130:15 | p1 | deallocation.rs:123:23:123:42 | ...::dangling(...) | deallocation.rs:130:14:130:15 | p1 | This operation dereferences a pointer that may be $@. | deallocation.rs:123:23:123:42 | ...::dangling(...) | invalid |
+| deallocation.rs:131:14:131:15 | p2 | deallocation.rs:124:21:124:44 | ...::dangling_mut(...) | deallocation.rs:131:14:131:15 | p2 | This operation dereferences a pointer that may be $@. | deallocation.rs:124:21:124:44 | ...::dangling_mut(...) | invalid |
+| deallocation.rs:132:14:132:15 | p3 | deallocation.rs:125:23:125:38 | ...::null(...) | deallocation.rs:132:14:132:15 | p3 | This operation dereferences a pointer that may be $@. | deallocation.rs:125:23:125:38 | ...::null(...) | invalid |
+| deallocation.rs:163:13:163:15 | ptr | deallocation.rs:159:9:159:28 | ...::null_mut(...) | deallocation.rs:163:13:163:15 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:159:9:159:28 | ...::null_mut(...) | invalid |
+| deallocation.rs:166:13:166:15 | ptr | deallocation.rs:159:9:159:28 | ...::null_mut(...) | deallocation.rs:166:13:166:15 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:159:9:159:28 | ...::null_mut(...) | invalid |
+| deallocation.rs:175:13:175:15 | ptr | deallocation.rs:171:9:171:28 | ...::null_mut(...) | deallocation.rs:175:13:175:15 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:171:9:171:28 | ...::null_mut(...) | invalid |
+| deallocation.rs:178:13:178:15 | ptr | deallocation.rs:171:9:171:28 | ...::null_mut(...) | deallocation.rs:178:13:178:15 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:171:9:171:28 | ...::null_mut(...) | invalid |
+| deallocation.rs:186:24:186:26 | ptr | deallocation.rs:183:9:183:28 | ...::null_mut(...) | deallocation.rs:186:24:186:26 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:183:9:183:28 | ...::null_mut(...) | invalid |
+| deallocation.rs:190:24:190:26 | ptr | deallocation.rs:183:9:183:28 | ...::null_mut(...) | deallocation.rs:190:24:190:26 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:183:9:183:28 | ...::null_mut(...) | invalid |
+| deallocation.rs:194:25:194:27 | ptr | deallocation.rs:183:9:183:28 | ...::null_mut(...) | deallocation.rs:194:25:194:27 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:183:9:183:28 | ...::null_mut(...) | invalid |
+| deallocation.rs:202:24:202:26 | ptr | deallocation.rs:183:9:183:28 | ...::null_mut(...) | deallocation.rs:202:24:202:26 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:183:9:183:28 | ...::null_mut(...) | invalid |
+| deallocation.rs:202:24:202:26 | ptr | deallocation.rs:199:9:199:28 | ...::null_mut(...) | deallocation.rs:202:24:202:26 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:199:9:199:28 | ...::null_mut(...) | invalid |
+| deallocation.rs:210:7:210:9 | ptr | deallocation.rs:183:9:183:28 | ...::null_mut(...) | deallocation.rs:210:7:210:9 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:183:9:183:28 | ...::null_mut(...) | invalid |
+| deallocation.rs:210:7:210:9 | ptr | deallocation.rs:199:9:199:28 | ...::null_mut(...) | deallocation.rs:210:7:210:9 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:199:9:199:28 | ...::null_mut(...) | invalid |
+| deallocation.rs:210:7:210:9 | ptr | deallocation.rs:207:9:207:28 | ...::null_mut(...) | deallocation.rs:210:7:210:9 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:207:9:207:28 | ...::null_mut(...) | invalid |
+| deallocation.rs:226:13:226:21 | const_ptr | deallocation.rs:219:15:219:34 | ...::null_mut(...) | deallocation.rs:226:13:226:21 | const_ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:219:15:219:34 | ...::null_mut(...) | invalid |
+| deallocation.rs:274:15:274:16 | p1 | deallocation.rs:270:27:270:28 | p1 | deallocation.rs:274:15:274:16 | p1 | This operation dereferences a pointer that may be $@. | deallocation.rs:270:27:270:28 | p1 | invalid |
+| deallocation.rs:342:18:342:20 | ptr | deallocation.rs:336:27:336:29 | ptr | deallocation.rs:342:18:342:20 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:336:27:336:29 | ptr | invalid |
 edges
-| deallocation.rs:20:3:20:21 | ...::dealloc | deallocation.rs:20:23:20:24 | [post] m1 | provenance | Src:MaD:3 MaD:3 |
-| deallocation.rs:20:23:20:24 | [post] m1 | deallocation.rs:26:15:26:16 | m1 | provenance |  |
-| deallocation.rs:20:23:20:24 | [post] m1 | deallocation.rs:37:35:37:36 | m1 | provenance |  |
-| deallocation.rs:20:23:20:24 | [post] m1 | deallocation.rs:44:6:44:7 | m1 | provenance |  |
-| deallocation.rs:20:23:20:24 | [post] m1 | deallocation.rs:49:27:49:28 | m1 | provenance |  |
-| deallocation.rs:37:35:37:36 | m1 | deallocation.rs:37:14:37:33 | ...::read::<...> | provenance | MaD:1 Sink:MaD:1 |
-| deallocation.rs:49:27:49:28 | m1 | deallocation.rs:49:5:49:25 | ...::write::<...> | provenance | MaD:2 Sink:MaD:2 |
-| deallocation.rs:70:3:70:21 | ...::dealloc | deallocation.rs:70:23:70:35 | [post] m2 as ... | provenance | Src:MaD:3 MaD:3 |
-| deallocation.rs:70:23:70:35 | [post] m2 as ... | deallocation.rs:76:16:76:17 | m2 | provenance |  |
-| deallocation.rs:70:23:70:35 | [post] m2 as ... | deallocation.rs:81:16:81:17 | m2 | provenance |  |
-| deallocation.rs:70:23:70:35 | [post] m2 as ... | deallocation.rs:86:7:86:8 | m2 | provenance |  |
-| deallocation.rs:70:23:70:35 | [post] m2 as ... | deallocation.rs:90:7:90:8 | m2 | provenance |  |
-| deallocation.rs:70:23:70:35 | [post] m2 as ... | deallocation.rs:95:33:95:34 | m2 | provenance |  |
-| deallocation.rs:95:33:95:34 | m2 | deallocation.rs:95:5:95:31 | ...::write::<...> | provenance | MaD:2 Sink:MaD:2 |
-| deallocation.rs:112:3:112:12 | ...::free | deallocation.rs:112:14:112:40 | [post] my_ptr as ... | provenance | Src:MaD:9 MaD:9 |
-| deallocation.rs:112:14:112:40 | [post] my_ptr as ... | deallocation.rs:115:13:115:18 | my_ptr | provenance |  |
+| deallocation.rs:20:23:20:24 | m1 | deallocation.rs:26:15:26:16 | m1 | provenance | Src:MaD:3  |
+| deallocation.rs:20:23:20:24 | m1 | deallocation.rs:37:35:37:36 | m1 | provenance | Src:MaD:3 Sink:MaD:1 |
+| deallocation.rs:20:23:20:24 | m1 | deallocation.rs:44:6:44:7 | m1 | provenance | Src:MaD:3  |
+| deallocation.rs:20:23:20:24 | m1 | deallocation.rs:49:27:49:28 | m1 | provenance | Src:MaD:3 Sink:MaD:2 |
+| deallocation.rs:70:23:70:35 | m2 as ... | deallocation.rs:76:16:76:17 | m2 | provenance | Src:MaD:3  |
+| deallocation.rs:70:23:70:35 | m2 as ... | deallocation.rs:81:16:81:17 | m2 | provenance | Src:MaD:3  |
+| deallocation.rs:70:23:70:35 | m2 as ... | deallocation.rs:86:7:86:8 | m2 | provenance | Src:MaD:3  |
+| deallocation.rs:70:23:70:35 | m2 as ... | deallocation.rs:90:7:90:8 | m2 | provenance | Src:MaD:3  |
+| deallocation.rs:70:23:70:35 | m2 as ... | deallocation.rs:95:33:95:34 | m2 | provenance | Src:MaD:3 Sink:MaD:2 |
+| deallocation.rs:112:14:112:40 | my_ptr as ... | deallocation.rs:115:13:115:18 | my_ptr | provenance | Src:MaD:9  |
 | deallocation.rs:123:6:123:7 | p1 | deallocation.rs:130:14:130:15 | p1 | provenance |  |
-| deallocation.rs:123:23:123:40 | ...::dangling | deallocation.rs:123:23:123:42 | ...::dangling(...) | provenance | Src:MaD:4 MaD:4 |
-| deallocation.rs:123:23:123:42 | ...::dangling(...) | deallocation.rs:123:6:123:7 | p1 | provenance |  |
+| deallocation.rs:123:23:123:42 | ...::dangling(...) | deallocation.rs:123:6:123:7 | p1 | provenance | Src:MaD:4  |
 | deallocation.rs:124:6:124:7 | p2 | deallocation.rs:131:14:131:15 | p2 | provenance |  |
-| deallocation.rs:124:21:124:42 | ...::dangling_mut | deallocation.rs:124:21:124:44 | ...::dangling_mut(...) | provenance | Src:MaD:5 MaD:5 |
-| deallocation.rs:124:21:124:44 | ...::dangling_mut(...) | deallocation.rs:124:6:124:7 | p2 | provenance |  |
+| deallocation.rs:124:21:124:44 | ...::dangling_mut(...) | deallocation.rs:124:6:124:7 | p2 | provenance | Src:MaD:5  |
 | deallocation.rs:125:6:125:7 | p3 | deallocation.rs:132:14:132:15 | p3 | provenance |  |
-| deallocation.rs:125:23:125:36 | ...::null | deallocation.rs:125:23:125:38 | ...::null(...) | provenance | Src:MaD:7 MaD:7 |
-| deallocation.rs:125:23:125:38 | ...::null(...) | deallocation.rs:125:6:125:7 | p3 | provenance |  |
+| deallocation.rs:125:23:125:38 | ...::null(...) | deallocation.rs:125:6:125:7 | p3 | provenance | Src:MaD:7  |
 | deallocation.rs:159:3:159:5 | ptr | deallocation.rs:163:13:163:15 | ptr | provenance |  |
 | deallocation.rs:159:3:159:5 | ptr | deallocation.rs:166:13:166:15 | ptr | provenance |  |
-| deallocation.rs:159:9:159:26 | ...::null_mut | deallocation.rs:159:9:159:28 | ...::null_mut(...) | provenance | Src:MaD:8 MaD:8 |
-| deallocation.rs:159:9:159:28 | ...::null_mut(...) | deallocation.rs:159:3:159:5 | ptr | provenance |  |
+| deallocation.rs:159:9:159:28 | ...::null_mut(...) | deallocation.rs:159:3:159:5 | ptr | provenance | Src:MaD:8  |
 | deallocation.rs:171:3:171:5 | ptr | deallocation.rs:175:13:175:15 | ptr | provenance |  |
 | deallocation.rs:171:3:171:5 | ptr | deallocation.rs:178:13:178:15 | ptr | provenance |  |
-| deallocation.rs:171:9:171:26 | ...::null_mut | deallocation.rs:171:9:171:28 | ...::null_mut(...) | provenance | Src:MaD:8 MaD:8 |
-| deallocation.rs:171:9:171:28 | ...::null_mut(...) | deallocation.rs:171:3:171:5 | ptr | provenance |  |
+| deallocation.rs:171:9:171:28 | ...::null_mut(...) | deallocation.rs:171:3:171:5 | ptr | provenance | Src:MaD:8  |
 | deallocation.rs:183:3:183:5 | ptr | deallocation.rs:186:24:186:26 | ptr | provenance |  |
 | deallocation.rs:183:3:183:5 | ptr | deallocation.rs:190:24:190:26 | ptr | provenance |  |
 | deallocation.rs:183:3:183:5 | ptr | deallocation.rs:194:25:194:27 | ptr | provenance |  |
 | deallocation.rs:183:3:183:5 | ptr | deallocation.rs:202:24:202:26 | ptr | provenance |  |
 | deallocation.rs:183:3:183:5 | ptr | deallocation.rs:210:7:210:9 | ptr | provenance |  |
-| deallocation.rs:183:9:183:26 | ...::null_mut | deallocation.rs:183:9:183:28 | ...::null_mut(...) | provenance | Src:MaD:8 MaD:8 |
-| deallocation.rs:183:9:183:28 | ...::null_mut(...) | deallocation.rs:183:3:183:5 | ptr | provenance |  |
+| deallocation.rs:183:9:183:28 | ...::null_mut(...) | deallocation.rs:183:3:183:5 | ptr | provenance | Src:MaD:8  |
 | deallocation.rs:199:3:199:5 | ptr | deallocation.rs:202:24:202:26 | ptr | provenance |  |
 | deallocation.rs:199:3:199:5 | ptr | deallocation.rs:210:7:210:9 | ptr | provenance |  |
-| deallocation.rs:199:9:199:26 | ...::null_mut | deallocation.rs:199:9:199:28 | ...::null_mut(...) | provenance | Src:MaD:8 MaD:8 |
-| deallocation.rs:199:9:199:28 | ...::null_mut(...) | deallocation.rs:199:3:199:5 | ptr | provenance |  |
+| deallocation.rs:199:9:199:28 | ...::null_mut(...) | deallocation.rs:199:3:199:5 | ptr | provenance | Src:MaD:8  |
 | deallocation.rs:207:3:207:5 | ptr | deallocation.rs:210:7:210:9 | ptr | provenance |  |
-| deallocation.rs:207:9:207:26 | ...::null_mut | deallocation.rs:207:9:207:28 | ...::null_mut(...) | provenance | Src:MaD:8 MaD:8 |
-| deallocation.rs:207:9:207:28 | ...::null_mut(...) | deallocation.rs:207:3:207:5 | ptr | provenance |  |
+| deallocation.rs:207:9:207:28 | ...::null_mut(...) | deallocation.rs:207:3:207:5 | ptr | provenance | Src:MaD:8  |
 | deallocation.rs:219:3:219:11 | const_ptr | deallocation.rs:226:13:226:21 | const_ptr | provenance |  |
-| deallocation.rs:219:15:219:32 | ...::null_mut | deallocation.rs:219:15:219:34 | ...::null_mut(...) | provenance | Src:MaD:8 MaD:8 |
-| deallocation.rs:219:15:219:34 | ...::null_mut(...) | deallocation.rs:219:3:219:11 | const_ptr | provenance |  |
-| deallocation.rs:270:3:270:25 | ...::drop_in_place | deallocation.rs:270:27:270:28 | [post] p1 | provenance | Src:MaD:6 MaD:6 |
-| deallocation.rs:270:27:270:28 | [post] p1 | deallocation.rs:274:15:274:16 | p1 | provenance |  |
-| deallocation.rs:336:3:336:25 | ...::drop_in_place | deallocation.rs:336:27:336:29 | [post] ptr | provenance | Src:MaD:6 MaD:6 |
-| deallocation.rs:336:27:336:29 | [post] ptr | deallocation.rs:342:18:342:20 | ptr | provenance |  |
+| deallocation.rs:219:15:219:34 | ...::null_mut(...) | deallocation.rs:219:3:219:11 | const_ptr | provenance | Src:MaD:8  |
+| deallocation.rs:270:27:270:28 | p1 | deallocation.rs:274:15:274:16 | p1 | provenance | Src:MaD:6  |
+| deallocation.rs:336:27:336:29 | ptr | deallocation.rs:342:18:342:20 | ptr | provenance | Src:MaD:6  |
 models
 | 1 | Sink: core::ptr::read; Argument[0]; pointer-access |
 | 2 | Sink: core::ptr::write; Argument[0]; pointer-access |
@@ -93,69 +76,52 @@ models
 | 8 | Source: core::ptr::null_mut; ReturnValue; pointer-invalidate |
 | 9 | Source: libc::unix::free; Argument[0]; pointer-invalidate |
 nodes
-| deallocation.rs:20:3:20:21 | ...::dealloc | semmle.label | ...::dealloc |
-| deallocation.rs:20:23:20:24 | [post] m1 | semmle.label | [post] m1 |
+| deallocation.rs:20:23:20:24 | m1 | semmle.label | m1 |
 | deallocation.rs:26:15:26:16 | m1 | semmle.label | m1 |
-| deallocation.rs:37:14:37:33 | ...::read::<...> | semmle.label | ...::read::<...> |
 | deallocation.rs:37:35:37:36 | m1 | semmle.label | m1 |
 | deallocation.rs:44:6:44:7 | m1 | semmle.label | m1 |
-| deallocation.rs:49:5:49:25 | ...::write::<...> | semmle.label | ...::write::<...> |
 | deallocation.rs:49:27:49:28 | m1 | semmle.label | m1 |
-| deallocation.rs:70:3:70:21 | ...::dealloc | semmle.label | ...::dealloc |
-| deallocation.rs:70:23:70:35 | [post] m2 as ... | semmle.label | [post] m2 as ... |
+| deallocation.rs:70:23:70:35 | m2 as ... | semmle.label | m2 as ... |
 | deallocation.rs:76:16:76:17 | m2 | semmle.label | m2 |
 | deallocation.rs:81:16:81:17 | m2 | semmle.label | m2 |
 | deallocation.rs:86:7:86:8 | m2 | semmle.label | m2 |
 | deallocation.rs:90:7:90:8 | m2 | semmle.label | m2 |
-| deallocation.rs:95:5:95:31 | ...::write::<...> | semmle.label | ...::write::<...> |
 | deallocation.rs:95:33:95:34 | m2 | semmle.label | m2 |
-| deallocation.rs:112:3:112:12 | ...::free | semmle.label | ...::free |
-| deallocation.rs:112:14:112:40 | [post] my_ptr as ... | semmle.label | [post] my_ptr as ... |
+| deallocation.rs:112:14:112:40 | my_ptr as ... | semmle.label | my_ptr as ... |
 | deallocation.rs:115:13:115:18 | my_ptr | semmle.label | my_ptr |
 | deallocation.rs:123:6:123:7 | p1 | semmle.label | p1 |
-| deallocation.rs:123:23:123:40 | ...::dangling | semmle.label | ...::dangling |
 | deallocation.rs:123:23:123:42 | ...::dangling(...) | semmle.label | ...::dangling(...) |
 | deallocation.rs:124:6:124:7 | p2 | semmle.label | p2 |
-| deallocation.rs:124:21:124:42 | ...::dangling_mut | semmle.label | ...::dangling_mut |
 | deallocation.rs:124:21:124:44 | ...::dangling_mut(...) | semmle.label | ...::dangling_mut(...) |
 | deallocation.rs:125:6:125:7 | p3 | semmle.label | p3 |
-| deallocation.rs:125:23:125:36 | ...::null | semmle.label | ...::null |
 | deallocation.rs:125:23:125:38 | ...::null(...) | semmle.label | ...::null(...) |
 | deallocation.rs:130:14:130:15 | p1 | semmle.label | p1 |
 | deallocation.rs:131:14:131:15 | p2 | semmle.label | p2 |
 | deallocation.rs:132:14:132:15 | p3 | semmle.label | p3 |
 | deallocation.rs:159:3:159:5 | ptr | semmle.label | ptr |
-| deallocation.rs:159:9:159:26 | ...::null_mut | semmle.label | ...::null_mut |
 | deallocation.rs:159:9:159:28 | ...::null_mut(...) | semmle.label | ...::null_mut(...) |
 | deallocation.rs:163:13:163:15 | ptr | semmle.label | ptr |
 | deallocation.rs:166:13:166:15 | ptr | semmle.label | ptr |
 | deallocation.rs:171:3:171:5 | ptr | semmle.label | ptr |
-| deallocation.rs:171:9:171:26 | ...::null_mut | semmle.label | ...::null_mut |
 | deallocation.rs:171:9:171:28 | ...::null_mut(...) | semmle.label | ...::null_mut(...) |
 | deallocation.rs:175:13:175:15 | ptr | semmle.label | ptr |
 | deallocation.rs:178:13:178:15 | ptr | semmle.label | ptr |
 | deallocation.rs:183:3:183:5 | ptr | semmle.label | ptr |
-| deallocation.rs:183:9:183:26 | ...::null_mut | semmle.label | ...::null_mut |
 | deallocation.rs:183:9:183:28 | ...::null_mut(...) | semmle.label | ...::null_mut(...) |
 | deallocation.rs:186:24:186:26 | ptr | semmle.label | ptr |
 | deallocation.rs:190:24:190:26 | ptr | semmle.label | ptr |
 | deallocation.rs:194:25:194:27 | ptr | semmle.label | ptr |
 | deallocation.rs:199:3:199:5 | ptr | semmle.label | ptr |
-| deallocation.rs:199:9:199:26 | ...::null_mut | semmle.label | ...::null_mut |
 | deallocation.rs:199:9:199:28 | ...::null_mut(...) | semmle.label | ...::null_mut(...) |
 | deallocation.rs:202:24:202:26 | ptr | semmle.label | ptr |
 | deallocation.rs:207:3:207:5 | ptr | semmle.label | ptr |
-| deallocation.rs:207:9:207:26 | ...::null_mut | semmle.label | ...::null_mut |
 | deallocation.rs:207:9:207:28 | ...::null_mut(...) | semmle.label | ...::null_mut(...) |
 | deallocation.rs:210:7:210:9 | ptr | semmle.label | ptr |
 | deallocation.rs:219:3:219:11 | const_ptr | semmle.label | const_ptr |
-| deallocation.rs:219:15:219:32 | ...::null_mut | semmle.label | ...::null_mut |
 | deallocation.rs:219:15:219:34 | ...::null_mut(...) | semmle.label | ...::null_mut(...) |
 | deallocation.rs:226:13:226:21 | const_ptr | semmle.label | const_ptr |
-| deallocation.rs:270:3:270:25 | ...::drop_in_place | semmle.label | ...::drop_in_place |
-| deallocation.rs:270:27:270:28 | [post] p1 | semmle.label | [post] p1 |
+| deallocation.rs:270:27:270:28 | p1 | semmle.label | p1 |
 | deallocation.rs:274:15:274:16 | p1 | semmle.label | p1 |
-| deallocation.rs:336:3:336:25 | ...::drop_in_place | semmle.label | ...::drop_in_place |
-| deallocation.rs:336:27:336:29 | [post] ptr | semmle.label | [post] ptr |
+| deallocation.rs:336:27:336:29 | ptr | semmle.label | ptr |
 | deallocation.rs:342:18:342:20 | ptr | semmle.label | ptr |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-825/lifetime.rs b/rust/ql/test/query-tests/security/CWE-825/lifetime.rs
index 51042b56ecc0..c4af9c5d11e2 100644
--- a/rust/ql/test/query-tests/security/CWE-825/lifetime.rs
+++ b/rust/ql/test/query-tests/security/CWE-825/lifetime.rs
@@ -381,8 +381,8 @@ pub fn test_ptr_to_struct(mode: i32) {
 	{
 		let mut my_pair = MyPair { a: 1, b: 2};
 		p1 = std::ptr::addr_of_mut!(my_pair); // $ Source[rust/access-after-lifetime-ended]=my_pair
-		p2 = std::ptr::addr_of!(my_pair.a); // $ MISSING: Source[rust/access-after-lifetime-ended]=my_pair_a
-		p3 = std::ptr::addr_of_mut!(my_pair.b); // $ MISSING: Source[rust/access-after-lifetime-ended]=my_pair_b
+		p2 = std::ptr::addr_of!(my_pair.a); // $ Source[rust/access-after-lifetime-ended]=my_pair_a
+		p3 = std::ptr::addr_of_mut!(my_pair.b); // $ Source[rust/access-after-lifetime-ended]=my_pair_b
 
 		unsafe {
 			let v1 = (*p1).a; // GOOD
@@ -418,15 +418,15 @@ pub fn test_ptr_to_struct(mode: i32) {
 			},
 			221 => {
 				// more reads
-				let v7 = *p2; // $ MISSING: Alert
-				let v8 = *p3; // $ MISSING: Alert
+				let v7 = *p2; // $ Alert[rust/access-after-lifetime-ended]=my_pair_a
+				let v8 = *p3; // $ Alert[rust/access-after-lifetime-ended]=my_pair_b
 				println!("	v7 = {v7} (!)"); // dropped in practice
 				println!("	v8 = {v8} (!)"); // dropped in practice
 			},
 			222 => {
 				// writes
 				(*p1).a = 6; // $ Alert[rust/access-after-lifetime-ended]=my_pair
-				*p3 = 7; // $ MISSING: Alert
+				*p3 = 7; // $ Alert[rust/access-after-lifetime-ended]=my_pair_b
 			},
 			223 => {
 				// another write
diff --git a/rust/ql/test/query-tests/security/CWE-918/RequestForgery.expected b/rust/ql/test/query-tests/security/CWE-918/RequestForgery.expected
index 0f931ed3a0f8..cc2f47497f23 100644
--- a/rust/ql/test/query-tests/security/CWE-918/RequestForgery.expected
+++ b/rust/ql/test/query-tests/security/CWE-918/RequestForgery.expected
@@ -1,11 +1,11 @@
 #select
-| request_forgery_tests.rs:8:24:8:35 | ...::get | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:8:24:8:35 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
-| request_forgery_tests.rs:17:25:17:36 | ...::get | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:17:25:17:36 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
-| request_forgery_tests.rs:21:25:21:36 | ...::get | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:21:25:21:36 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
-| request_forgery_tests.rs:25:25:25:36 | ...::get | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:25:25:25:36 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
-| request_forgery_tests.rs:31:29:31:40 | ...::get | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:31:29:31:40 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
-| request_forgery_tests.rs:37:37:37:48 | ...::get | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:37:37:37:48 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
-| request_forgery_tests.rs:68:28:68:39 | ...::get | request_forgery_tests.rs:65:33:65:40 | and_then | request_forgery_tests.rs:68:28:68:39 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:65:33:65:40 | and_then | user-provided value |
+| request_forgery_tests.rs:8:37:8:45 | &user_url | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:8:37:8:45 | &user_url | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
+| request_forgery_tests.rs:17:38:17:41 | &url | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:17:38:17:41 | &url | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
+| request_forgery_tests.rs:21:38:21:41 | &url | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:21:38:21:41 | &url | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
+| request_forgery_tests.rs:25:38:25:41 | &url | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:25:38:25:41 | &url | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
+| request_forgery_tests.rs:31:42:31:50 | &user_url | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:31:42:31:50 | &user_url | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
+| request_forgery_tests.rs:37:50:37:58 | &user_url | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:37:50:37:58 | &user_url | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
+| request_forgery_tests.rs:68:41:68:42 | &a | request_forgery_tests.rs:65:42:73:9 | \|...\| ... | request_forgery_tests.rs:68:41:68:42 | &a | The URL of this request depends on a $@. | request_forgery_tests.rs:65:42:73:9 | \|...\| ... | user-provided value |
 edges
 | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:8:38:8:45 | user_url | provenance |  |
 | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:16:27:16:49 | MacroExpr | provenance |  |
@@ -13,45 +13,45 @@ edges
 | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:24:27:24:70 | MacroExpr | provenance |  |
 | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:31:43:31:50 | user_url | provenance |  |
 | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:37:51:37:58 | user_url | provenance |  |
-| request_forgery_tests.rs:8:37:8:45 | &user_url [&ref] | request_forgery_tests.rs:8:24:8:35 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:8:37:8:45 | &user_url [&ref] | request_forgery_tests.rs:8:37:8:45 | &user_url | provenance | Sink:MaD:1 |
 | request_forgery_tests.rs:8:38:8:45 | user_url | request_forgery_tests.rs:8:37:8:45 | &user_url [&ref] | provenance |  |
 | request_forgery_tests.rs:16:13:16:15 | url | request_forgery_tests.rs:17:39:17:41 | url | provenance |  |
 | request_forgery_tests.rs:16:27:16:49 | ...::format(...) | request_forgery_tests.rs:16:27:16:49 | { ... } | provenance |  |
 | request_forgery_tests.rs:16:27:16:49 | ...::must_use(...) | request_forgery_tests.rs:16:13:16:15 | url | provenance |  |
 | request_forgery_tests.rs:16:27:16:49 | MacroExpr | request_forgery_tests.rs:16:27:16:49 | ...::format(...) | provenance | MaD:3 |
 | request_forgery_tests.rs:16:27:16:49 | { ... } | request_forgery_tests.rs:16:27:16:49 | ...::must_use(...) | provenance | MaD:4 |
-| request_forgery_tests.rs:17:38:17:41 | &url [&ref] | request_forgery_tests.rs:17:25:17:36 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:17:38:17:41 | &url [&ref] | request_forgery_tests.rs:17:38:17:41 | &url | provenance | Sink:MaD:1 |
 | request_forgery_tests.rs:17:39:17:41 | url | request_forgery_tests.rs:17:38:17:41 | &url [&ref] | provenance |  |
 | request_forgery_tests.rs:20:13:20:15 | url | request_forgery_tests.rs:21:39:21:41 | url | provenance |  |
 | request_forgery_tests.rs:20:27:20:57 | ...::format(...) | request_forgery_tests.rs:20:27:20:57 | { ... } | provenance |  |
 | request_forgery_tests.rs:20:27:20:57 | ...::must_use(...) | request_forgery_tests.rs:20:13:20:15 | url | provenance |  |
 | request_forgery_tests.rs:20:27:20:57 | MacroExpr | request_forgery_tests.rs:20:27:20:57 | ...::format(...) | provenance | MaD:3 |
 | request_forgery_tests.rs:20:27:20:57 | { ... } | request_forgery_tests.rs:20:27:20:57 | ...::must_use(...) | provenance | MaD:4 |
-| request_forgery_tests.rs:21:38:21:41 | &url [&ref] | request_forgery_tests.rs:21:25:21:36 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:21:38:21:41 | &url [&ref] | request_forgery_tests.rs:21:38:21:41 | &url | provenance | Sink:MaD:1 |
 | request_forgery_tests.rs:21:39:21:41 | url | request_forgery_tests.rs:21:38:21:41 | &url [&ref] | provenance |  |
 | request_forgery_tests.rs:24:13:24:15 | url | request_forgery_tests.rs:25:39:25:41 | url | provenance |  |
 | request_forgery_tests.rs:24:27:24:70 | ...::format(...) | request_forgery_tests.rs:24:27:24:70 | { ... } | provenance |  |
 | request_forgery_tests.rs:24:27:24:70 | ...::must_use(...) | request_forgery_tests.rs:24:13:24:15 | url | provenance |  |
 | request_forgery_tests.rs:24:27:24:70 | MacroExpr | request_forgery_tests.rs:24:27:24:70 | ...::format(...) | provenance | MaD:3 |
 | request_forgery_tests.rs:24:27:24:70 | { ... } | request_forgery_tests.rs:24:27:24:70 | ...::must_use(...) | provenance | MaD:4 |
-| request_forgery_tests.rs:25:38:25:41 | &url [&ref] | request_forgery_tests.rs:25:25:25:36 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:25:38:25:41 | &url [&ref] | request_forgery_tests.rs:25:38:25:41 | &url | provenance | Sink:MaD:1 |
 | request_forgery_tests.rs:25:39:25:41 | url | request_forgery_tests.rs:25:38:25:41 | &url [&ref] | provenance |  |
-| request_forgery_tests.rs:31:42:31:50 | &user_url [&ref] | request_forgery_tests.rs:31:29:31:40 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:31:42:31:50 | &user_url [&ref] | request_forgery_tests.rs:31:42:31:50 | &user_url | provenance | Sink:MaD:1 |
 | request_forgery_tests.rs:31:43:31:50 | user_url | request_forgery_tests.rs:31:42:31:50 | &user_url [&ref] | provenance |  |
-| request_forgery_tests.rs:37:50:37:58 | &user_url [&ref] | request_forgery_tests.rs:37:37:37:48 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:37:50:37:58 | &user_url [&ref] | request_forgery_tests.rs:37:50:37:58 | &user_url | provenance | Sink:MaD:1 |
 | request_forgery_tests.rs:37:51:37:58 | user_url | request_forgery_tests.rs:37:50:37:58 | &user_url [&ref] | provenance |  |
-| request_forgery_tests.rs:65:33:65:40 | and_then | request_forgery_tests.rs:65:49:65:57 | ...: String | provenance | Src:MaD:2  |
+| request_forgery_tests.rs:65:42:73:9 | \|...\| ... | request_forgery_tests.rs:65:49:65:57 | ...: String | provenance | Src:MaD:2  |
 | request_forgery_tests.rs:65:49:65:57 | ...: String | request_forgery_tests.rs:68:42:68:42 | a | provenance |  |
-| request_forgery_tests.rs:68:41:68:42 | &a [&ref] | request_forgery_tests.rs:68:28:68:39 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:68:41:68:42 | &a [&ref] | request_forgery_tests.rs:68:41:68:42 | &a | provenance | Sink:MaD:1 |
 | request_forgery_tests.rs:68:42:68:42 | a | request_forgery_tests.rs:68:41:68:42 | &a [&ref] | provenance |  |
 models
 | 1 | Sink: reqwest::get; Argument[0]; request-url |
-| 2 | Source: <_ as warp::filter::Filter>::and_then; Argument[0].Parameter[0..7]; remote |
+| 2 | Source: <warp::filter::Filter>::and_then; Argument[0].Parameter[0..7]; remote |
 | 3 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
 | 4 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
 | request_forgery_tests.rs:5:29:5:36 | user_url | semmle.label | user_url |
-| request_forgery_tests.rs:8:24:8:35 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:8:37:8:45 | &user_url | semmle.label | &user_url |
 | request_forgery_tests.rs:8:37:8:45 | &user_url [&ref] | semmle.label | &user_url [&ref] |
 | request_forgery_tests.rs:8:38:8:45 | user_url | semmle.label | user_url |
 | request_forgery_tests.rs:16:13:16:15 | url | semmle.label | url |
@@ -59,7 +59,7 @@ nodes
 | request_forgery_tests.rs:16:27:16:49 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | request_forgery_tests.rs:16:27:16:49 | MacroExpr | semmle.label | MacroExpr |
 | request_forgery_tests.rs:16:27:16:49 | { ... } | semmle.label | { ... } |
-| request_forgery_tests.rs:17:25:17:36 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:17:38:17:41 | &url | semmle.label | &url |
 | request_forgery_tests.rs:17:38:17:41 | &url [&ref] | semmle.label | &url [&ref] |
 | request_forgery_tests.rs:17:39:17:41 | url | semmle.label | url |
 | request_forgery_tests.rs:20:13:20:15 | url | semmle.label | url |
@@ -67,7 +67,7 @@ nodes
 | request_forgery_tests.rs:20:27:20:57 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | request_forgery_tests.rs:20:27:20:57 | MacroExpr | semmle.label | MacroExpr |
 | request_forgery_tests.rs:20:27:20:57 | { ... } | semmle.label | { ... } |
-| request_forgery_tests.rs:21:25:21:36 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:21:38:21:41 | &url | semmle.label | &url |
 | request_forgery_tests.rs:21:38:21:41 | &url [&ref] | semmle.label | &url [&ref] |
 | request_forgery_tests.rs:21:39:21:41 | url | semmle.label | url |
 | request_forgery_tests.rs:24:13:24:15 | url | semmle.label | url |
@@ -75,18 +75,18 @@ nodes
 | request_forgery_tests.rs:24:27:24:70 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | request_forgery_tests.rs:24:27:24:70 | MacroExpr | semmle.label | MacroExpr |
 | request_forgery_tests.rs:24:27:24:70 | { ... } | semmle.label | { ... } |
-| request_forgery_tests.rs:25:25:25:36 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:25:38:25:41 | &url | semmle.label | &url |
 | request_forgery_tests.rs:25:38:25:41 | &url [&ref] | semmle.label | &url [&ref] |
 | request_forgery_tests.rs:25:39:25:41 | url | semmle.label | url |
-| request_forgery_tests.rs:31:29:31:40 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:31:42:31:50 | &user_url | semmle.label | &user_url |
 | request_forgery_tests.rs:31:42:31:50 | &user_url [&ref] | semmle.label | &user_url [&ref] |
 | request_forgery_tests.rs:31:43:31:50 | user_url | semmle.label | user_url |
-| request_forgery_tests.rs:37:37:37:48 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:37:50:37:58 | &user_url | semmle.label | &user_url |
 | request_forgery_tests.rs:37:50:37:58 | &user_url [&ref] | semmle.label | &user_url [&ref] |
 | request_forgery_tests.rs:37:51:37:58 | user_url | semmle.label | user_url |
-| request_forgery_tests.rs:65:33:65:40 | and_then | semmle.label | and_then |
+| request_forgery_tests.rs:65:42:73:9 | \|...\| ... | semmle.label | \|...\| ... |
 | request_forgery_tests.rs:65:49:65:57 | ...: String | semmle.label | ...: String |
-| request_forgery_tests.rs:68:28:68:39 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:68:41:68:42 | &a | semmle.label | &a |
 | request_forgery_tests.rs:68:41:68:42 | &a [&ref] | semmle.label | &a [&ref] |
 | request_forgery_tests.rs:68:42:68:42 | a | semmle.label | a |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-918/request_forgery_tests.rs b/rust/ql/test/query-tests/security/CWE-918/request_forgery_tests.rs
index f9abf14de4fc..2610d8d7a39d 100644
--- a/rust/ql/test/query-tests/security/CWE-918/request_forgery_tests.rs
+++ b/rust/ql/test/query-tests/security/CWE-918/request_forgery_tests.rs
@@ -62,7 +62,7 @@ mod warp_test {
     async fn test_warp() {
         // A route with parameter and `and_then`
         let map_route =
-            warp::path::param().and_then(async |a: String| // $ Source=a
+            warp::path::param().and_then(async |a: String|
             {
 
             let response = reqwest::get(&a).await; // $ Alert[rust/request-forgery]=a
@@ -70,7 +70,7 @@ mod warp_test {
                 Ok(resp) => Ok(resp.text().await.unwrap_or_default()),
                 Err(_err) => Err(warp::reject::not_found()),
             }
-        });
+        }); // $ Source=a
     }
 }
 
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index a08a05a83bde..3f89e1d79155 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -558,6 +558,14 @@ trait MyTrait {
     fn my_func2(&self, x: i32) -> i32;
 }
 
+fn unimplemented(x : i32) {
+    unimplemented!()
+}
+
+fn todo(x : i32) {
+    todo!()
+}
+
 // --- main ---
 
 fn main() {
diff --git a/rust/ql/test/query-tests/unusedentities/options.yml b/rust/ql/test/query-tests/unusedentities/options.yml
index a394083e5212..c2541fc242c2 100644
--- a/rust/ql/test/query-tests/unusedentities/options.yml
+++ b/rust/ql/test/query-tests/unusedentities/options.yml
@@ -1 +1,2 @@
 qltest_use_nightly: true
+qltest_edition: "2024"
diff --git a/rust/ql/test/rust-toolchain.toml b/rust/ql/test/rust-toolchain.toml
deleted file mode 100644
index 9343bef27c61..000000000000
--- a/rust/ql/test/rust-toolchain.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file specifies the Rust version used to test the rust extractor.
-# IMPORTANT: this can also have an impact on QL test results
-
-[toolchain]
-channel = "1.90"
-profile = "minimal"
-components = [ "rust-src" ]
diff --git a/rust/ql/test/setup.sh b/rust/ql/test/setup.sh
index 1d7feb284eda..d69b1b77143c 100755
--- a/rust/ql/test/setup.sh
+++ b/rust/ql/test/setup.sh
@@ -8,6 +8,9 @@ set -euo pipefail
 
 # no need to install rust-src explicitly, it's listed in both toolchains
 cd "$(dirname "$0")"
+# Install the fixed toolchain used by the extractor. The version here should
+# match `FIXED_RUST_TOOLCHAIN`.
+rustup toolchain install 1.99.0 --profile minimal --component rust-src
 pushd ../../extractor/src/nightly-toolchain
 rustup install
 popd
diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index 3a3382020278..62749e724963 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -2,6 +2,9 @@
 from .ast import *
 
 
+@ql.to_string_impl_from_primary_class(
+    False
+)  # Disable since we have a final manual `toStringImpl` for this class
 class LabelableExpr(Expr):
     """
     The base class for expressions that can be labeled (`LoopExpr`, `ForExpr`, `WhileExpr` or `BlockExpr`).
@@ -25,7 +28,7 @@ class _:
     """
 
     derive_macro_expansions: list[MacroItems] | child | rust.detach
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     generic_param_list: optional["GenericParamList"] | child
     name: optional["Name"] | child
     visibility: optional["Visibility"] | child
@@ -448,6 +451,7 @@ class _:
     ```
     """
 
+    attrs: qltest.skip
     path: drop
 
 
@@ -549,6 +553,41 @@ class _:
     """
 
 
+@annotate(CfgPredExpr, cfg=True)
+class _:
+    """
+    A configuration predicate expression resulting from expansion of a `cfg!` macro call.
+    It has type `bool` and evaluates to whether the configuration predicate holds.
+
+    Rust-analyzer expands `cfg!(...)` in expression position to its internal `builtin#cfg(...)`
+    syntax, as illustrated below:
+    ```rust
+    builtin#cfg(unix);
+    builtin#cfg(target_os = "windows");
+    builtin#cfg(any(unix, target_os = "windows"));
+    ```
+    """
+
+
+@annotate(CfgPredPat, cfg=True)
+class _:
+    """
+    A configuration predicate pattern resulting from expansion of a `cfg!` macro call.
+    It matches `true` when the configuration predicate holds and `false` otherwise.
+
+    Rust-analyzer expands `cfg!(...)` in pattern position to its internal `builtin#cfg(...)`
+    syntax, as illustrated below:
+    ```rust
+    match true {
+        builtin#cfg(unix) => (),
+        builtin#cfg(target_os = "windows") => (),
+        builtin#cfg(any(unix, target_os = "windows")) => (),
+        _ => (),
+    };
+    ```
+    """
+
+
 @annotate(ClosureExpr)
 class _:
     """
@@ -597,7 +636,7 @@ class ArrayExpr(Expr):
     """
 
     exprs: list[Expr] | child
-    attrs: list[Attr] | child
+    attrs: list[AnyAttr] | child
 
 
 @synth.from_class(ArrayExprInternal)
@@ -1055,6 +1094,21 @@ class _:
     """
 
 
+@annotate(DerefPat, cfg=True)
+class _:
+    """
+    A deref pattern, matching the value behind a smart pointer. This is an experimental
+    Rust feature that cannot be written directly in stable Rust; the example below uses
+    rust-analyzer's canonical `builtin#deref` syntax for such patterns:
+    ```rust
+    match x {
+        builtin#deref(y) => y,
+        _ => 0,
+    };
+    ```
+    """
+
+
 @annotate(DynTraitTypeRepr)
 class _:
     """
@@ -1280,6 +1334,13 @@ class _:
     """
 
 
+@annotate(ImplRestriction)
+class _:
+    """
+    An implementation restriction, limiting where a trait can be implemented. For example the `impl(crate)` restriction (an unstable feature).
+    """
+
+
 @annotate(ImplTraitTypeRepr)
 class _:
     """
@@ -1293,6 +1354,16 @@ class _:
     """
 
 
+@annotate(IncludeBytesExpr, cfg=True)
+class _:
+    """
+    An expression produced by the built-in `include_bytes!` macro, embedding the contents of a file as a byte array. For example:
+    ```rust
+    let data = include_bytes!("data.bin");
+    ```
+    """
+
+
 @annotate(InferTypeRepr)
 class _:
     """
@@ -1507,6 +1578,13 @@ class _:
     """
 
 
+@annotate(MutRestriction)
+class _:
+    """
+    A mutability restriction, limiting where a field can be mutated. For example the `mut(crate)` restriction (an unstable feature).
+    """
+
+
 @annotate(Name, cfg=True)
 class _:
     """
@@ -1546,15 +1624,41 @@ class _:
     """
 
 
+@annotate(DocComment)
+class _:
+    """
+    A documentation comment.
+
+    For example:
+    ```rust
+    /// Documents `documented`.
+    fn documented() {}
+    ```
+    """
+
+
 class ParamBase(AstNode):
     """
     A normal parameter, `Param`, or a self parameter `SelfParam`.
     """
 
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     type_repr: optional["TypeRepr"] | child
 
 
+@annotate(NotNull, cfg=True)
+class _:
+    """
+    The `!null` pattern used in a pattern type to denote a non-null value. Pattern types
+    are an experimental, mostly compiler-internal feature (used in the standard library for
+    types such as `NonZero` and `NonNull`) and cannot be written directly in stable Rust;
+    the example below uses rust-analyzer's canonical `builtin#pattern_type` syntax:
+    ```rust
+    type NonNull = builtin#pattern_type(*const () is !null);
+    ```
+    """
+
+
 @annotate(ParamBase, cfg=True)
 class _:
     pass
@@ -1575,31 +1679,6 @@ class _:
     type_repr: drop
 
 
-@annotate(ParenExpr)
-class _:
-    """
-    A parenthesized expression.
-
-    For example:
-    ```rust
-    (x + y)
-    ```
-    """
-
-
-@annotate(ParenPat)
-class _:
-    """
-    A parenthesized pattern.
-
-    For example:
-    ```rust
-    let (x) = 1;
-    //  ^^^
-    ```
-    """
-
-
 @annotate(ParenTypeRepr)
 class _:
     """
@@ -1642,6 +1721,18 @@ class _:
     """
 
 
+@annotate(PatternTypeRepr)
+class _:
+    """
+    A pattern type, constraining a type to values matching a pattern. Pattern types are an
+    experimental, mostly compiler-internal feature and cannot be written directly in stable
+    Rust; the example below uses rust-analyzer's canonical `builtin#pattern_type` syntax:
+    ```rust
+    type NonZero = builtin#pattern_type(u32 is 1..);
+    ```
+    """
+
+
 @annotate(PtrTypeRepr)
 class _:
     """
@@ -1936,18 +2027,6 @@ class _:
     """
 
 
-@annotate(TraitAlias)
-class _:
-    """
-    A trait alias.
-
-    For example:
-    ```rust
-    trait Foo = Bar + Baz;
-    ```
-    """
-
-
 @annotate(TryExpr, cfg=True)
 class _:
     """
@@ -2162,6 +2241,17 @@ class _:
     """
 
 
+@annotate(VisibilityInner)
+class _:
+    """
+    The parenthesized inner part of a visibility modifier or restriction, such as the `(in path)` in `pub(in path)`, or the `(crate)` in `pub(crate)`. For example the `(in foo::bar)` in:
+    ```rust
+    pub(in foo::bar) struct S;
+    //  ^^^^^^^^^^^^
+    ```
+    """
+
+
 @annotate(WhereClause)
 class _:
     """
@@ -2346,6 +2436,8 @@ class _:
     ```
     """
 
+    attrs: qltest.skip
+
 
 @annotate(MacroPat, cfg=True)
 class _:
diff --git a/rust/schema/ast.py b/rust/schema/ast.py
index 2599cd92c7b3..173b2fbbc17e 100644
--- a/rust/schema/ast.py
+++ b/rust/schema/ast.py
@@ -5,6 +5,9 @@
 class TypeItem(AstNode, ):
     pass
 
+class AnyAttr(AstNode, ):
+    pass
+
 class AsmOperand(AstNode, ):
     pass
 
@@ -14,6 +17,9 @@ class AsmPiece(AstNode, ):
 class AssocItem(AstNode, ):
     pass
 
+class CfgPredicate(AstNode, ):
+    pass
+
 class Expr(AstNode, ):
     pass
 
@@ -29,6 +35,9 @@ class GenericArg(AstNode, ):
 class GenericParam(AstNode, ):
     pass
 
+class Meta(AstNode, ):
+    pass
+
 class Pat(AstNode, ):
     pass
 
@@ -51,7 +60,7 @@ class ArgList(AstNode, ):
     args: list["Expr"] | child
 
 class ArrayExprInternal(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     exprs: list["Expr"] | child
     is_semicolon: predicate
 
@@ -60,7 +69,7 @@ class ArrayTypeRepr(TypeRepr, ):
     element_type_repr: optional["TypeRepr"] | child
 
 class AsmClobberAbi(AsmPiece, ):
-    pass
+    attrs: list["AnyAttr"] | child
 
 class AsmConst(AsmOperand, ):
     expr: optional["Expr"] | child
@@ -71,7 +80,7 @@ class AsmDirSpec(AstNode, ):
 
 class AsmExpr(Expr, Item, ):
     asm_pieces: list["AsmPiece"] | child
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     template: list["Expr"] | child
 
 class AsmLabel(AsmOperand, ):
@@ -83,6 +92,7 @@ class AsmOperandExpr(AstNode, ):
 
 class AsmOperandNamed(AsmPiece, ):
     asm_operand: optional["AsmOperand"] | child
+    attrs: list["AnyAttr"] | child
     name: optional["Name"] | child
 
 class AsmOption(AstNode, ):
@@ -90,6 +100,7 @@ class AsmOption(AstNode, ):
 
 class AsmOptionsList(AsmPiece, ):
     asm_options: list["AsmOption"] | child
+    attrs: list["AnyAttr"] | child
 
 class AsmRegOperand(AsmOperand, ):
     asm_dir_spec: optional["AsmDirSpec"] | child
@@ -104,7 +115,7 @@ class AsmSym(AsmOperand, ):
 
 class AssocItemList(AstNode, ):
     assoc_items: list["AssocItem"] | child
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
 
 class AssocTypeArg(GenericArg, ):
     const_arg: optional["ConstArg"] | child
@@ -116,54 +127,73 @@ class AssocTypeArg(GenericArg, ):
     type_repr: optional["TypeRepr"] | child
     type_bound_list: optional["TypeBoundList"] | child
 
-class Attr(AstNode, ):
+class Attr(AnyAttr, ):
     meta: optional["Meta"] | child
 
 class AwaitExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     expr: optional["Expr"] | child
 
 class BecomeExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     expr: optional["Expr"] | child
 
 class BinaryExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     lhs: optional["Expr"] | child
     operator_name: optional[string]
     rhs: optional["Expr"] | child
 
 class BlockExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     is_async: predicate
     is_const: predicate
     is_gen: predicate
     is_move: predicate
-    is_try: predicate
     is_unsafe: predicate
     label: optional["Label"] | child
     stmt_list: optional["StmtList"] | child
+    try_block_modifier: optional["TryBlockModifier"] | child
 
 class BoxPat(Pat, ):
     pat: optional["Pat"] | child
 
 class BreakExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     expr: optional["Expr"] | child
     lifetime: optional["Lifetime"] | child
 
 class CallExpr(Expr, ):
     arg_list: optional["ArgList"] | child
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     function: optional["Expr"] | child
 
 class CastExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     expr: optional["Expr"] | child
     type_repr: optional["TypeRepr"] | child
 
+class CfgAtom(CfgPredicate, ):
+    pass
+
+class CfgAttrMeta(Meta, ):
+    cfg_predicate: optional["CfgPredicate"] | child
+    metas: list["Meta"] | child
+
+class CfgComposite(CfgPredicate, ):
+    cfg_predicates: list["CfgPredicate"] | child
+
+class CfgMeta(Meta, ):
+    cfg_predicate: optional["CfgPredicate"] | child
+
+class CfgPredExpr(Expr, ):
+    cfg_predicate: optional["CfgPredicate"] | child
+
+class CfgPredPat(Pat, ):
+    cfg_predicate: optional["CfgPredicate"] | child
+
 class ClosureExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     closure_body: optional["Expr"] | child
     for_binder: optional["ForBinder"] | child
     is_async: predicate
@@ -175,7 +205,7 @@ class ClosureExpr(Expr, ):
     ret_type: optional["RetTypeRepr"] | child
 
 class Const(AssocItem, Item, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     body: optional["Expr"] | child
     generic_param_list: optional["GenericParamList"] | child
     is_const: predicate
@@ -193,21 +223,27 @@ class ConstBlockPat(Pat, ):
     is_const: predicate
 
 class ConstParam(GenericParam, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     default_val: optional["ConstArg"] | child
     is_const: predicate
     name: optional["Name"] | child
     type_repr: optional["TypeRepr"] | child
 
 class ContinueExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     lifetime: optional["Lifetime"] | child
 
+class DerefPat(Pat, ):
+    pat: optional["Pat"] | child
+
+class DocComment(AnyAttr, ):
+    pass
+
 class DynTraitTypeRepr(TypeRepr, ):
     type_bound_list: optional["TypeBoundList"] | child
 
 class Enum(TypeItem, Item, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     generic_param_list: optional["GenericParamList"] | child
     name: optional["Name"] | child
     variant_list: optional["VariantList"] | child
@@ -219,28 +255,28 @@ class ExprStmt(Stmt, ):
 
 class ExternBlock(Item, ):
     abi: optional["Abi"] | child
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     extern_item_list: optional["ExternItemList"] | child
     is_unsafe: predicate
 
 class ExternCrate(Item, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     identifier: optional["NameRef"] | child
     rename: optional["Rename"] | child
     visibility: optional["Visibility"] | child
 
 class ExternItemList(AstNode, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     extern_items: list["ExternItem"] | child
 
 class FieldExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     container: optional["Expr"] | child
     identifier: optional["NameRef"] | child
 
 class Function(AssocItem, ExternItem, Item, ):
     abi: optional["Abi"] | child
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     function_body: optional["BlockExpr"] | child
     generic_param_list: optional["GenericParamList"] | child
     is_async: predicate
@@ -266,7 +302,7 @@ class ForBinder(AstNode, ):
     generic_param_list: optional["GenericParamList"] | child
 
 class ForExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     iterable: optional["Expr"] | child
     label: optional["Label"] | child
     loop_body: optional["BlockExpr"] | child
@@ -282,7 +318,7 @@ class FormatArgsArg(AstNode, ):
 
 class FormatArgsExpr(Expr, ):
     args: list["FormatArgsArg"] | child
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     template: optional["Expr"] | child
 
 class GenericArgList(AstNode, ):
@@ -292,21 +328,21 @@ class GenericParamList(AstNode, ):
     generic_params: list["GenericParam"] | child
 
 class IdentPat(Pat, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     is_mut: predicate
     is_ref: predicate
     name: optional["Name"] | child
     pat: optional["Pat"] | child
 
 class IfExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     condition: optional["Expr"] | child
     else_: optional["Expr"] | child
     then: optional["BlockExpr"] | child
 
 class Impl(Item, ):
     assoc_item_list: optional["AssocItemList"] | child
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     generic_param_list: optional["GenericParamList"] | child
     is_const: predicate
     is_default: predicate
@@ -316,11 +352,17 @@ class Impl(Item, ):
     visibility: optional["Visibility"] | child
     where_clause: optional["WhereClause"] | child
 
+class ImplRestriction(AstNode, ):
+    visibility_inner: optional["VisibilityInner"] | child
+
 class ImplTraitTypeRepr(TypeRepr, ):
     type_bound_list: optional["TypeBoundList"] | child
 
+class IncludeBytesExpr(Expr, ):
+    pass
+
 class IndexExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     base: optional["Expr"] | child
     index: optional["Expr"] | child
 
@@ -328,9 +370,13 @@ class InferTypeRepr(TypeRepr, ):
     pass
 
 class ItemList(AstNode, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     items: list["Item"] | child
 
+class KeyValueMeta(Meta, ):
+    expr: optional["Expr"] | child
+    path: optional["Path"] | child
+
 class Label(AstNode, ):
     lifetime: optional["Lifetime"] | child
 
@@ -338,12 +384,12 @@ class LetElse(AstNode, ):
     block_expr: optional["BlockExpr"] | child
 
 class LetExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     scrutinee: optional["Expr"] | child
     pat: optional["Pat"] | child
 
 class LetStmt(Stmt, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     initializer: optional["Expr"] | child
     let_else: optional["LetElse"] | child
     pat: optional["Pat"] | child
@@ -356,35 +402,36 @@ class LifetimeArg(GenericArg, ):
     lifetime: optional["Lifetime"] | child
 
 class LifetimeParam(GenericParam, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     lifetime: optional["Lifetime"] | child
     type_bound_list: optional["TypeBoundList"] | child
 
 class LiteralExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     text_value: optional[string]
 
 class LiteralPat(Pat, ):
     literal: optional["LiteralExpr"] | child
 
 class LoopExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     label: optional["Label"] | child
     loop_body: optional["BlockExpr"] | child
 
 class MacroCall(AssocItem, ExternItem, Item, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     path: optional["Path"] | child
     token_tree: optional["TokenTree"] | child
 
 class MacroDef(Item, ):
     args: optional["TokenTree"] | child
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     body: optional["TokenTree"] | child
     name: optional["Name"] | child
     visibility: optional["Visibility"] | child
 
 class MacroExpr(Expr, ):
+    attrs: list["AnyAttr"] | child
     macro_call: optional["MacroCall"] | child
 
 class MacroItems(AstNode, ):
@@ -394,7 +441,7 @@ class MacroPat(Pat, ):
     macro_call: optional["MacroCall"] | child
 
 class MacroRules(Item, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     name: optional["Name"] | child
     token_tree: optional["TokenTree"] | child
     visibility: optional["Visibility"] | child
@@ -403,42 +450,40 @@ class MacroTypeRepr(TypeRepr, ):
     macro_call: optional["MacroCall"] | child
 
 class MatchArm(AstNode, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     expr: optional["Expr"] | child
     guard: optional["MatchGuard"] | child
     pat: optional["Pat"] | child
 
 class MatchArmList(AstNode, ):
     arms: list["MatchArm"] | child
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
 
 class MatchExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     scrutinee: optional["Expr"] | child
     match_arm_list: optional["MatchArmList"] | child
 
 class MatchGuard(AstNode, ):
     condition: optional["Expr"] | child
 
-class Meta(AstNode, ):
-    expr: optional["Expr"] | child
-    is_unsafe: predicate
-    path: optional["Path"] | child
-    token_tree: optional["TokenTree"] | child
-
 class MethodCallExpr(Expr, ):
     arg_list: optional["ArgList"] | child
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     generic_arg_list: optional["GenericArgList"] | child
     identifier: optional["NameRef"] | child
     receiver: optional["Expr"] | child
 
 class Module(Item, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     item_list: optional["ItemList"] | child
     name: optional["Name"] | child
     visibility: optional["Visibility"] | child
 
+class MutRestriction(AstNode, ):
+    is_mut: predicate
+    visibility_inner: optional["VisibilityInner"] | child
+
 class Name(AstNode, ):
     text: optional[string]
 
@@ -448,8 +493,11 @@ class NameRef(UseBoundGenericArg, ):
 class NeverTypeRepr(TypeRepr, ):
     pass
 
+class NotNull(Pat, ):
+    pass
+
 class OffsetOfExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     fields: list["NameRef"] | child
     type_repr: optional["TypeRepr"] | child
 
@@ -457,7 +505,7 @@ class OrPat(Pat, ):
     pats: list["Pat"] | child
 
 class Param(AstNode, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     pat: optional["Pat"] | child
     type_repr: optional["TypeRepr"] | child
 
@@ -465,13 +513,6 @@ class ParamList(AstNode, ):
     params: list["Param"] | child
     self_param: optional["SelfParam"] | child
 
-class ParenExpr(Expr, ):
-    attrs: list["Attr"] | child
-    expr: optional["Expr"] | child
-
-class ParenPat(Pat, ):
-    pat: optional["Pat"] | child
-
 class ParenTypeRepr(TypeRepr, ):
     type_repr: optional["TypeRepr"] | child
 
@@ -483,7 +524,10 @@ class Path(AstNode, ):
     segment: optional["PathSegment"] | child
 
 class PathExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
+    path: optional["Path"] | child
+
+class PathMeta(Meta, ):
     path: optional["Path"] | child
 
 class PathPat(Pat, ):
@@ -499,8 +543,12 @@ class PathSegment(AstNode, ):
 class PathTypeRepr(TypeRepr, ):
     path: optional["Path"] | child
 
+class PatternTypeRepr(TypeRepr, ):
+    pat: optional["Pat"] | child
+    type_repr: optional["TypeRepr"] | child
+
 class PrefixExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     expr: optional["Expr"] | child
     operator_name: optional[string]
 
@@ -510,7 +558,7 @@ class PtrTypeRepr(TypeRepr, ):
     type_repr: optional["TypeRepr"] | child
 
 class RangeExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     end: optional["Expr"] | child
     operator_name: optional[string]
     start: optional["Expr"] | child
@@ -521,23 +569,25 @@ class RangePat(Pat, ):
     start: optional["Pat"] | child
 
 class StructExpr(Expr, ):
+    attrs: list["AnyAttr"] | child
     path: optional["Path"] | child
     struct_expr_field_list: optional["StructExprFieldList"] | child
 
 class StructExprField(AstNode, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     expr: optional["Expr"] | child
     identifier: optional["NameRef"] | child
 
 class StructExprFieldList(AstNode, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     fields: list["StructExprField"] | child
     spread: optional["Expr"] | child
 
 class StructField(AstNode, ):
-    attrs: list["Attr"] | child
-    default: optional["Expr"] | child
+    attrs: list["AnyAttr"] | child
+    default_val: optional["ConstArg"] | child
     is_unsafe: predicate
+    mut_restriction: optional["MutRestriction"] | child
     name: optional["Name"] | child
     type_repr: optional["TypeRepr"] | child
     visibility: optional["Visibility"] | child
@@ -550,7 +600,7 @@ class StructPat(Pat, ):
     struct_pat_field_list: optional["StructPatFieldList"] | child
 
 class StructPatField(AstNode, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     identifier: optional["NameRef"] | child
     pat: optional["Pat"] | child
 
@@ -559,7 +609,7 @@ class StructPatFieldList(AstNode, ):
     rest_pat: optional["RestPat"] | child
 
 class RefExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     expr: optional["Expr"] | child
     is_const: predicate
     is_mut: predicate
@@ -578,20 +628,20 @@ class Rename(AstNode, ):
     name: optional["Name"] | child
 
 class RestPat(Pat, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
 
 class RetTypeRepr(AstNode, ):
     type_repr: optional["TypeRepr"] | child
 
 class ReturnExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     expr: optional["Expr"] | child
 
 class ReturnTypeSyntax(AstNode, ):
     pass
 
 class SelfParam(AstNode, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     is_ref: predicate
     is_mut: predicate
     lifetime: optional["Lifetime"] | child
@@ -605,11 +655,11 @@ class SliceTypeRepr(TypeRepr, ):
     type_repr: optional["TypeRepr"] | child
 
 class SourceFile(AstNode, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     items: list["Item"] | child
 
 class Static(ExternItem, Item, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     body: optional["Expr"] | child
     is_mut: predicate
     is_static: predicate
@@ -619,12 +669,12 @@ class Static(ExternItem, Item, ):
     visibility: optional["Visibility"] | child
 
 class StmtList(AstNode, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     statements: list["Stmt"] | child
     tail_expr: optional["Expr"] | child
 
 class Struct(TypeItem, Item, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     field_list: optional["FieldList"] | child
     generic_param_list: optional["GenericParamList"] | child
     name: optional["Name"] | child
@@ -634,10 +684,15 @@ class Struct(TypeItem, Item, ):
 class TokenTree(AstNode, ):
     pass
 
+class TokenTreeMeta(Meta, ):
+    path: optional["Path"] | child
+    token_tree: optional["TokenTree"] | child
+
 class Trait(Item, ):
     assoc_item_list: optional["AssocItemList"] | child
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     generic_param_list: optional["GenericParamList"] | child
+    impl_restriction: optional["ImplRestriction"] | child
     is_auto: predicate
     is_unsafe: predicate
     name: optional["Name"] | child
@@ -645,24 +700,21 @@ class Trait(Item, ):
     visibility: optional["Visibility"] | child
     where_clause: optional["WhereClause"] | child
 
-class TraitAlias(Item, ):
-    attrs: list["Attr"] | child
-    generic_param_list: optional["GenericParamList"] | child
-    name: optional["Name"] | child
-    type_bound_list: optional["TypeBoundList"] | child
-    visibility: optional["Visibility"] | child
-    where_clause: optional["WhereClause"] | child
+class TryBlockModifier(AstNode, ):
+    is_try: predicate
+    type_repr: optional["TypeRepr"] | child
 
 class TryExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     expr: optional["Expr"] | child
 
 class TupleExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     fields: list["Expr"] | child
 
 class TupleField(AstNode, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
+    mut_restriction: optional["MutRestriction"] | child
     type_repr: optional["TypeRepr"] | child
     visibility: optional["Visibility"] | child
 
@@ -680,7 +732,7 @@ class TupleTypeRepr(TypeRepr, ):
     fields: list["TypeRepr"] | child
 
 class TypeAlias(AssocItem, ExternItem, Item, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     generic_param_list: optional["GenericParamList"] | child
     is_default: predicate
     name: optional["Name"] | child
@@ -704,24 +756,28 @@ class TypeBoundList(AstNode, ):
     bounds: list["TypeBound"] | child
 
 class TypeParam(GenericParam, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     default_type: optional["TypeRepr"] | child
     name: optional["Name"] | child
     type_bound_list: optional["TypeBoundList"] | child
 
 class UnderscoreExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
 
 class Union(TypeItem, Item, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     generic_param_list: optional["GenericParamList"] | child
     name: optional["Name"] | child
     struct_field_list: optional["StructFieldList"] | child
     visibility: optional["Visibility"] | child
     where_clause: optional["WhereClause"] | child
 
+class UnsafeMeta(Meta, ):
+    is_unsafe: predicate
+    meta: optional["Meta"] | child
+
 class Use(Item, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     use_tree: optional["UseTree"] | child
     visibility: optional["Visibility"] | child
 
@@ -738,8 +794,8 @@ class UseTreeList(AstNode, ):
     use_trees: list["UseTree"] | child
 
 class Variant(AstNode, ):
-    attrs: list["Attr"] | child
-    discriminant: optional["Expr"] | child
+    attrs: list["AnyAttr"] | child
+    const_arg: optional["ConstArg"] | child
     field_list: optional["FieldList"] | child
     name: optional["Name"] | child
     visibility: optional["Visibility"] | child
@@ -748,6 +804,9 @@ class VariantList(AstNode, ):
     variants: list["Variant"] | child
 
 class Visibility(AstNode, ):
+    visibility_inner: optional["VisibilityInner"] | child
+
+class VisibilityInner(AstNode, ):
     path: optional["Path"] | child
 
 class WhereClause(AstNode, ):
@@ -760,7 +819,7 @@ class WherePred(AstNode, ):
     type_bound_list: optional["TypeBoundList"] | child
 
 class WhileExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     condition: optional["Expr"] | child
     label: optional["Label"] | child
     loop_body: optional["BlockExpr"] | child
@@ -769,9 +828,9 @@ class WildcardPat(Pat, ):
     pass
 
 class YeetExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     expr: optional["Expr"] | child
 
 class YieldExpr(Expr, ):
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     expr: optional["Expr"] | child
diff --git a/rust/schema/prelude.py b/rust/schema/prelude.py
index 9ca62f33acc1..07ee6a92a80f 100644
--- a/rust/schema/prelude.py
+++ b/rust/schema/prelude.py
@@ -6,6 +6,7 @@
 File = imported("File", "codeql.files.FileSystem")
 
 
+@ql.to_string_impl_from_primary_class(True)
 @qltest.skip
 class Element:
     pass
@@ -35,6 +36,7 @@ class Comment(Token):
     ```rust
     // this is a comment
     /// This is a doc comment
+    fn documented() {}
     ```
     """
     parent: AstNode
@@ -72,7 +74,7 @@ class Callable(AstNode):
     A callable. Either a `Function` or a `ClosureExpr`.
     """
     param_list: optional["ParamList"] | child
-    attrs: list["Attr"] | child
+    attrs: list["AnyAttr"] | child
     params: list["Param"] | synth
     body: optional["Expr"] | synth
 
diff --git a/rust/scripts/update_rust_analyzer.py b/rust/scripts/update_rust_analyzer.py
new file mode 100755
index 000000000000..52a0ce328c98
--- /dev/null
+++ b/rust/scripts/update_rust_analyzer.py
@@ -0,0 +1,282 @@
+#!/usr/bin/env python3
+
+import base64
+import hashlib
+import itertools
+import json
+import re
+import shlex
+import subprocess
+import sys
+import tomllib
+import urllib.request
+from pathlib import Path
+
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+MODULE_BAZEL = REPO_ROOT / "MODULE.bazel"
+RUST_EXTRACTOR_MANIFEST = REPO_ROOT / "rust/extractor/Cargo.toml"
+
+# The files that mention the fixed Rust toolchain version
+TOOLCHAIN_RS = REPO_ROOT / "rust/extractor/src/toolchain.rs"
+INTEGRATION_TEST_CONFTEST = REPO_ROOT / "rust/ql/integration-tests/conftest.py"
+QL_TEST_SETUP = REPO_ROOT / "rust/ql/test/setup.sh"
+
+
+def print_step(number: int, description: str) -> None:
+    print(f"\nStep {number}: {description}", flush=True)
+
+
+def run(*command: str) -> None:
+    print(f"+ {shlex.join(command)}", flush=True)
+    subprocess.run(command, cwd=REPO_ROOT, check=True)
+
+
+def run_codegen() -> None:
+    try:
+        run("bazel", "run", "//rust/codegen")
+    except subprocess.CalledProcessError as error:
+        print(
+            "\nCodegen failed. Carry out the instructions from step 5 in rust/updating-rust-analyzer.md manually.",
+            file=sys.stderr,
+            flush=True,
+        )
+        raise SystemExit(error.returncode) from None
+
+
+def get_min_rust_analyzer_version(manifest: str) -> str:
+    """Get the minimum version of all ra_ap dependencies from `Cargo.toml`."""
+    dependencies = tomllib.loads(manifest)["dependencies"]
+    return min(
+        (
+            version
+            for name, version in dependencies.items()
+            if name.startswith("ra_ap_")
+        ),
+        key=lambda value: tuple(map(int, value.split("."))),
+    )
+
+
+def fetch(url: str) -> bytes:
+    request = urllib.request.Request(
+        url,
+        headers={"User-Agent": "github/codeql rust-analyzer updater"},
+    )
+    with urllib.request.urlopen(request) as response:
+        return response.read()
+
+
+def get_rust_analyzer_crate_release_date(rust_analyzer_version: str) -> str:
+    """Get the creation date of a rust-analyzer crate version."""
+    crate_url = f"https://crates.io/api/v1/crates/ra_ap_syntax/{rust_analyzer_version}"
+    crate = json.loads(fetch(crate_url))
+    return crate["version"]["created_at"].split("T")[0]
+
+
+def get_rust_analyzer_release_tag(rust_analyzer_version: str) -> str:
+    """
+    Get the latest rust-analyzer release tag in the git repository before or at
+    the crate publication. The returned string has the format `YYYY-MM-DD.N`
+    where the `.N` part is optional.
+
+    Empirically, the rust-analyzer crates are published after the corresponding
+    git tag. We hence look for the latest git tag that is before or at the crate
+    publication date.
+    """
+    crate_release_date = get_rust_analyzer_crate_release_date(rust_analyzer_version)
+
+    for page in itertools.count(1):
+        tags_url = (
+            "https://api.github.com/repos/rust-lang/rust-analyzer/tags"
+            f"?per_page=100&page={page}"
+        )
+        tags = json.loads(fetch(tags_url))
+        if not tags:
+            raise RuntimeError(
+                "could not find a rust-analyzer release tag published no later than "
+                f"ra_ap_syntax {rust_analyzer_version}"
+            )
+
+        for tag in tags:
+            name = tag["name"]
+            match = re.fullmatch(r"(\d{4}-\d{2}-\d{2})(?:\.(\d+))?", name)
+            if match and match[1] <= crate_release_date:
+                return name
+
+
+def get_rust_analyzer_source_integrity(release_tag: str) -> str:
+    """Download and compute the integrity of a rust-analyzer source archive."""
+    archive_url = (
+        "https://github.com/rust-lang/rust-analyzer/archive/refs/tags/"
+        f"{release_tag}.tar.gz"
+    )
+    archive = fetch(archive_url)
+    return "sha256-" + base64.b64encode(hashlib.sha256(archive).digest()).decode()
+
+
+def update_rust_analyzer_sources(
+    rust_analyzer_release_tag: str, integrity: str
+) -> None:
+    """
+    Update the rust-analyzer source archive used by the AST generator.
+
+    Concretely, this updates `RUST_ANALYZER_SRC_TAG` and
+    `RUST_ANALYZER_SRC_INTEGRITY` in the MODULE.bazel file.
+    """
+
+    module = MODULE_BAZEL.read_text()
+    module, tag_replacements = re.subn(
+        r'RUST_ANALYZER_SRC_TAG = "[^"]+"',
+        f'RUST_ANALYZER_SRC_TAG = "{rust_analyzer_release_tag}"',
+        module,
+    )
+    if tag_replacements != 1:
+        raise RuntimeError("expected exactly one RUST_ANALYZER_SRC_TAG assignment")
+    module, integrity_replacements = re.subn(
+        r'RUST_ANALYZER_SRC_INTEGRITY = "[^"]+"',
+        f'RUST_ANALYZER_SRC_INTEGRITY = "{integrity}"',
+        module,
+    )
+    if integrity_replacements != 1:
+        raise RuntimeError(
+            "expected exactly one RUST_ANALYZER_SRC_INTEGRITY assignment"
+        )
+    MODULE_BAZEL.write_text(module)
+
+
+def get_compatible_rust_toolchain(rust_analyzer_release_tag: str) -> str:
+    """Get the latest Rust toolchain released no later than rust-analyzer."""
+    # Keep the `YYYY-MM-DD` part of the release tag, stripping off the optional
+    # incrementing suffix.
+    rust_analyzer_release = rust_analyzer_release_tag[:10]
+
+    # `manifests.txt` is a list of all toolchains. The one we're interested in looks like
+    # ```
+    # static.rust-lang.org/dist/YYYY-MM-DD/channel-rust-stable.toml
+    # ```
+    # where `YYYY-MM-DD` is no later than the rust-analyzer release date.
+    manifests = (
+        fetch("https://static.rust-lang.org/manifests.txt").decode().splitlines()
+    )
+    rust_manifest = next(
+        manifest
+        for manifest in reversed(manifests)
+        if manifest.endswith("/channel-rust-stable.toml")
+        and manifest.split("/")[2] <= rust_analyzer_release
+    )
+    manifest = tomllib.loads(fetch(f"https://{rust_manifest}").decode())
+    # The version looks like `version = "0.99.0 (797e8a9bc 2026-08-05)"` - we only want the first part.
+    return manifest["pkg"]["rust"]["version"].split()[0]
+
+
+def update_fixed_rust_toolchain_versions(version: str) -> None:
+    """Change the fixed toolchain in the places where it's hardcoded"""
+    toolchain_rs = TOOLCHAIN_RS.read_text()
+    prefix = 'const FIXED_RUST_TOOLCHAIN: &str = "'
+    old_version = toolchain_rs.split(prefix, 1)[1].split('"', 1)[0]
+    TOOLCHAIN_RS.write_text(
+        toolchain_rs.replace(
+            f'{prefix}{old_version}"',
+            f'{prefix}{version}"',
+        )
+    )
+
+    for test_setup in (INTEGRATION_TEST_CONFTEST, QL_TEST_SETUP):
+        contents = test_setup.read_text()
+        test_setup.write_text(
+            contents.replace(
+                f"rustup toolchain install {old_version} ",
+                f"rustup toolchain install {version} ",
+            )
+        )
+
+
+def align_rust_analyzer_versions(manifest: str) -> tuple[str, bool]:
+    """Align ra_ap dependency versions in a Cargo manifest.
+
+    rust-analyzer crates may be published gradually, so this selects the newest
+    version that is available for every ra_ap dependency.
+    """
+    dependencies = {
+        name: version
+        for name, version in tomllib.loads(manifest)["dependencies"].items()
+        if name.startswith("ra_ap_")
+    }
+    if len(set(dependencies.values())) == 1:
+        # All the `ra_ap_` dependencies agree
+        return manifest, False
+
+    version = get_min_rust_analyzer_version(manifest)
+
+    for name, old_version in dependencies.items():
+        manifest = manifest.replace(
+            f'{name} = "{old_version}"',
+            f'{name} = "{version}"',
+        )
+    return manifest, True
+
+
+def commit_all(title: str) -> None:
+    run("git", "add", "--all")
+    run("git", "commit", "--no-verify", "--allow-empty", "-m", title)
+
+
+def main() -> None:
+    status = subprocess.run(
+        ["git", "status", "--porcelain"],
+        cwd=REPO_ROOT,
+        check=True,
+        capture_output=True,
+        text=True,
+    ).stdout
+    if status:
+        raise RuntimeError("the working tree must be clean")
+
+    print_step(1, "Update dependencies")
+    manifest = RUST_EXTRACTOR_MANIFEST.read_text()
+    old_rust_analyzer_version = get_min_rust_analyzer_version(manifest)
+    run("cargo", "upgrade", "--incompatible", "--pinned")
+    # Re-read the (potentially) changed manifest
+    manifest = RUST_EXTRACTOR_MANIFEST.read_text()
+    new_rust_analyzer_version = get_min_rust_analyzer_version(manifest)
+    if new_rust_analyzer_version == old_rust_analyzer_version:
+        run("git", "restore", ".")
+        print("No new rust-analyzer version available.")
+        return
+
+    rust_analyzer_release_tag = get_rust_analyzer_release_tag(new_rust_analyzer_version)
+    rust_analyzer_source_integrity = get_rust_analyzer_source_integrity(
+        rust_analyzer_release_tag
+    )
+
+    aligned_manifest, manifest_changed = align_rust_analyzer_versions(manifest)
+    if manifest_changed:
+        RUST_EXTRACTOR_MANIFEST.write_text(aligned_manifest)
+        run("cargo", "update")
+    commit_all("Cargo: Upgrade dependencies")
+
+    print_step(2, "Update the rust-analyzer sources used by the AST generator")
+    update_rust_analyzer_sources(
+        rust_analyzer_release_tag, rust_analyzer_source_integrity
+    )
+    commit_all("Rust: Update rust-analyzer sources")
+
+    print_step(3, "Update the fixed Rust toolchain used by the extractor")
+    rust_toolchain = get_compatible_rust_toolchain(rust_analyzer_release_tag)
+    update_fixed_rust_toolchain_versions(rust_toolchain)
+    commit_all("Rust: Update fixed toolchain")
+
+    print_step(4, "Regenerate vendored bazel files")
+    run("misc/bazel/3rdparty/update_tree_sitter_extractors_deps.sh")
+    commit_all("Bazel: Regenerate vendored cargo dependencies")
+
+    print_step(5, "Run codegen")
+    run_codegen()
+    commit_all("Rust: Run codegen")
+
+    print_step(6, "Try compiling")
+    run("bazel", "run", "//rust:install")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/rust/tools/builtins/types.rs b/rust/tools/builtins/types.rs
index d3fd06b21683..b45c7dff0904 100644
--- a/rust/tools/builtins/types.rs
+++ b/rust/tools/builtins/types.rs
@@ -70,3 +70,12 @@ struct Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(
     T10,
     T11,
 );
+
+// model unsized coercion (https://doc.rust-lang.org/reference/type-coercions.html#r-coerce.unsize.slice)
+// as a `Deref` implementation in order to reuse type inference and data flow logic
+impl<T,const N: usize> std::ops::Deref for Array<T,N> {
+  type Target = Slice<T>;
+  fn deref(&self) -> &Slice<T> { 
+    // not a real implementation
+  }
+}
diff --git a/rust/tools/index-files.cmd b/rust/tools/index-files.cmd
index 3991f30b62f8..3ac364743c45 100644
--- a/rust/tools/index-files.cmd
+++ b/rust/tools/index-files.cmd
@@ -1,5 +1,6 @@
 @echo off
 
-type NUL && "%CODEQL_EXTRACTOR_RUST_ROOT%\tools\%CODEQL_PLATFORM%\extractor" @"%1"
+type NUL && "%CODEQL_EXTRACTOR_RUST_ROOT%\tools\%CODEQL_PLATFORM%\extractor" ^
+        --file-list "%1"
 
 exit /b %ERRORLEVEL%
diff --git a/rust/tools/index-files.sh b/rust/tools/index-files.sh
index bb8d665adfcc..e3e16846855c 100755
--- a/rust/tools/index-files.sh
+++ b/rust/tools/index-files.sh
@@ -3,4 +3,5 @@
 set -eu
 
 export RUST_BACKTRACE=1
-exec "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" @"$1"
+exec "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" \
+        --file-list "$1"
diff --git a/rust/updating-rust-analyzer.md b/rust/updating-rust-analyzer.md
new file mode 100644
index 000000000000..5a1bd8c661a2
--- /dev/null
+++ b/rust/updating-rust-analyzer.md
@@ -0,0 +1,141 @@
+# Updating rust-analyzer
+
+Here's a rundown of the typical actions to perform to do a rust-analyzer (and
+other dependencies) update. A one-time setup consists in installing
+[`cargo-edit`](https://crates.io/crates/cargo-edit) with `cargo install
+cargo-edit`. On Ubuntu that also requires `sudo apt install libssl-dev
+pkg-config`.
+
+> [!TIP]
+> All steps up to and including running `bazel run //rust:install` are (barring
+> any errors) carried out by the script `rust/scripts/update_rust_analyzer.py`.
+> Prefer using the script.
+
+1. Update dependencies.
+   1. From the root of the `codeql` repo checkout, run a Cargo upgrade:
+      ```
+      cargo upgrade --incompatible --pinned
+      ```
+   2. Look at a diff of the `Cargo.toml` files: if all `ra_ap_` prefixed
+      dependencies have been updated to the same number, go on to the next
+      step. Otherwise, it means the latest `rust-analyzer` update has not been
+      fully rolled out to all its crates in `crates.io`. _All `ra_ap_` versions
+      must agree!_
+      Downgrade by hand to the minimum one you see, and run a `cargo update`
+      after that to fix the `Cargo.lock` file.
+   3. Commit the changes, skipping `pre-commit` hooks if you have them enabled:
+      ```
+      git commit -am 'Cargo: upgrade dependencies' --no-verify
+      ```
+
+2. Update the rust-analyzer sources used by the AST generator.
+
+   In `MODULE.bazel`, update `RUST_ANALYZER_SRC_TAG` to the release date of the
+   new `ra_ap_` crates and update `RUST_ANALYZER_SRC_INTEGRITY` with the
+   integrity of the corresponding source archive.
+
+   Commit the changes:
+   `git commit -am 'Rust: Update rust-analyzer sources'`
+
+3. Update the fixed Rust toolchain used by the extractor.
+
+   The version should be updated to the latest release that precedes the new
+   rust-analyzer version.
+
+   Grepping for `FIXED_RUST_TOOLCHAIN` shows the places where this version is
+   written down.
+
+   Commit the changes: `git commit -am 'Rust: Update fixed toolchain'`
+
+4. Regenerate vendored bazel files (these allow faster builds, particularly on
+   CI where it has to start from scratch each time), commit the changes:
+   ```
+   misc/bazel/3rdparty/update_tree_sitter_extractors_deps.sh
+   git add .
+   git commit -am 'Bazel: regenerate vendored cargo dependencies' --no-verify
+   ```
+   > [!NOTE]
+   > If in step 6 you also bump `rules_rust` or the Rust toolchain used for
+   > building the extractor, those changes invalidate _all_ vendored files
+   > (including the Python ones under `misc/bazel/3rdparty/py_deps`), not just
+   > the tree-sitter ones. In that case run the umbrella script
+   > `misc/bazel/3rdparty/update_cargo_deps.sh` instead (it regenerates both
+   > `py_deps` and `tree_sitter_extractors_deps`, and runs `bazel mod tidy`),
+   > then commit all the regenerated files.
+
+5. Run codegen
+   ```
+   bazel run //rust/codegen
+   ```
+   If codegen fails, other changes might be necessary. For instance, adaptations
+   to `annotations.py`. Make these changes in separate commits.
+
+   Once codegen succeeds commit only the changes made by codegen with
+   ```
+   git commit -am 'Rust: Run codegen'
+   ```
+
+   Take note whether `rust/schema/ast.py` was changed. That might need tweaks,
+   new tests and/or downgrade/upgrade scripts down the line.
+
+
+6. Try compiling
+   ```
+   bazel run //rust:install
+   ```
+   * if it succeeds: good! You can move on to the next step.
+   * if it fails while compiling rust-analyzer dependencies, you need to update
+     the Rust toolchain. Sometimes the error will tell you so explicitly, but
+     it may happen that the error is more obscure. To update the rust
+     toolchain:
+      * you will need to open a PR on the internal repo updating `RUST_VERSION`
+        in `MODULE.bazel`. In general you can have this merged independently of
+        the changes in `codeql`.
+      * in `codeql`, update both `RUST_VERSION` in `MODULE.bazel` _and_
+        `rust-toolchain.toml` files. You may want to also update the nightly
+        toolchain in `rust/extractor/src/nightly-toolchain/rust-toolchain.toml`
+        to a more recent date while you're at it.
+      * a toolchain and/or `rules_rust` bump invalidates the vendored files, so
+       re-run `misc/bazel/3rdparty/update_cargo_deps.sh` (see the note in step
+       4) and commit the regenerated files.
+   * if it fails while compiling rust extractor code, you will need to adapt it
+     to the new library version.
+      * for example updating annotations in `annotations.py`, adding / removing
+        generated tests.
+
+   If you had to do any changes, commit them. If you updated the rust
+   toolchain, running `rust/lint.py` might reformat or apply new lints to the
+   code.
+
+7. Update `.expected` files by running:
+   ```
+   codeql test run --learn --search-path=rust/extractor-pack:. \
+     --consistency-queries=rust/ql/consistency-queries rust/ql/test
+   ```
+   The search path selects the newly built extractor from step 6.
+
+   If there are changes, commit the updated expectations:
+   ```
+   git add 'rust/ql/test/**/*.expected'
+   git commit -m 'Rust: Update test expectations'
+   ```
+
+8. Check the `.expected` files for `testFailures` and fix the underlying
+   problems.
+
+   For each separate problem address the issue, regenerate the `.expected`
+   files with the command from step 7, and create a commit.
+
+   Repeat until no rows under `testFailures` remain and the tests pass.
+
+9. If in step 5 the schema was updated, add upgrade/downgrade scripts and a
+   change note. This is best done last to reduce the chance of merge conflicts
+   (none of the other testing depends on having upgrade and downgrade scripts
+   in place). See [Upgrading a language database
+   schema](docs/prepare-db-upgrade.md).
+
+10. Create a PR with the changes thus far.
+
+11. Check with CI if everything is in order.
+
+12. Run DCA with database caching disabled. Iterate on the code if needed.
diff --git a/shared/concepts/CHANGELOG.md b/shared/concepts/CHANGELOG.md
index 772a7934b5c2..d2fedcbb7dc0 100644
--- a/shared/concepts/CHANGELOG.md
+++ b/shared/concepts/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 0.0.35
+
+No user-facing changes.
+
+## 0.0.34
+
+No user-facing changes.
+
+## 0.0.33
+
+No user-facing changes.
+
+## 0.0.32
+
+No user-facing changes.
+
+## 0.0.31
+
+No user-facing changes.
+
+## 0.0.30
+
+No user-facing changes.
+
+## 0.0.29
+
+No user-facing changes.
+
 ## 0.0.28
 
 No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.29.md b/shared/concepts/change-notes/released/0.0.29.md
new file mode 100644
index 000000000000..4428927c79d5
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.29.md
@@ -0,0 +1,3 @@
+## 0.0.29
+
+No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.30.md b/shared/concepts/change-notes/released/0.0.30.md
new file mode 100644
index 000000000000..10c7a0c5c131
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.30.md
@@ -0,0 +1,3 @@
+## 0.0.30
+
+No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.31.md b/shared/concepts/change-notes/released/0.0.31.md
new file mode 100644
index 000000000000..99e11d52c92a
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.31.md
@@ -0,0 +1,3 @@
+## 0.0.31
+
+No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.32.md b/shared/concepts/change-notes/released/0.0.32.md
new file mode 100644
index 000000000000..c390443f09a3
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.32.md
@@ -0,0 +1,3 @@
+## 0.0.32
+
+No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.33.md b/shared/concepts/change-notes/released/0.0.33.md
new file mode 100644
index 000000000000..0b46f1130fac
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.33.md
@@ -0,0 +1,3 @@
+## 0.0.33
+
+No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.34.md b/shared/concepts/change-notes/released/0.0.34.md
new file mode 100644
index 000000000000..d58affae3891
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.34.md
@@ -0,0 +1,3 @@
+## 0.0.34
+
+No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.35.md b/shared/concepts/change-notes/released/0.0.35.md
new file mode 100644
index 000000000000..1ffec5217282
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.35.md
@@ -0,0 +1,3 @@
+## 0.0.35
+
+No user-facing changes.
diff --git a/shared/concepts/codeql-pack.release.yml b/shared/concepts/codeql-pack.release.yml
index 3462db7d348f..143c97892032 100644
--- a/shared/concepts/codeql-pack.release.yml
+++ b/shared/concepts/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.28
+lastReleaseVersion: 0.0.35
diff --git a/shared/concepts/codeql/concepts/ConceptsShared.qll b/shared/concepts/codeql/concepts/ConceptsShared.qll
index c2d9b03f8f79..038edc2efe30 100644
--- a/shared/concepts/codeql/concepts/ConceptsShared.qll
+++ b/shared/concepts/codeql/concepts/ConceptsShared.qll
@@ -128,6 +128,7 @@ module ConceptsMake<LocationSig Location, DF::InputSig<Location> DataFlowLang> {
            * Gets a data flow node that contributes to the URL of the request.
            * Depending on the framework, a request may have multiple nodes which contribute to the URL.
            */
+          pragma[no_dynamic_join_order]
           abstract DataFlowNode getAUrlPart();
 
           /** Gets a string that identifies the framework used for this request. */
diff --git a/shared/concepts/codeql/concepts/internal/SensitiveDataHeuristics.qll b/shared/concepts/codeql/concepts/internal/SensitiveDataHeuristics.qll
index b2bda909e3ba..4a2b56af3ea4 100644
--- a/shared/concepts/codeql/concepts/internal/SensitiveDataHeuristics.qll
+++ b/shared/concepts/codeql/concepts/internal/SensitiveDataHeuristics.qll
@@ -57,7 +57,7 @@ module HeuristicNames {
    * or trusted data.
    */
   string maybeSecret() {
-    result = "(?is).*((?<!is|is_)secret|(?<!un|un_|is|is_)trusted(?!_iter)|confidential).*"
+    result = "(?is).*((?<!is|is_)secret|(?<!un|un_|is|is_)trusted(?!_iter|_?schema)|confidential).*"
   }
 
   /**
diff --git a/shared/concepts/qlpack.yml b/shared/concepts/qlpack.yml
index c5f8b2831ab0..facc6f8c0566 100644
--- a/shared/concepts/qlpack.yml
+++ b/shared/concepts/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/concepts
-version: 0.0.29-dev
+version: 0.0.36-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/controlflow/CHANGELOG.md b/shared/controlflow/CHANGELOG.md
index 1cd70884e88b..7c3cb2396b76 100644
--- a/shared/controlflow/CHANGELOG.md
+++ b/shared/controlflow/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 2.0.45
+
+No user-facing changes.
+
+## 2.0.44
+
+No user-facing changes.
+
+## 2.0.43
+
+No user-facing changes.
+
+## 2.0.42
+
+No user-facing changes.
+
+## 2.0.41
+
+No user-facing changes.
+
+## 2.0.40
+
+No user-facing changes.
+
+## 2.0.39
+
+No user-facing changes.
+
 ## 2.0.38
 
 No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.39.md b/shared/controlflow/change-notes/released/2.0.39.md
new file mode 100644
index 000000000000..887d030df420
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.39.md
@@ -0,0 +1,3 @@
+## 2.0.39
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.40.md b/shared/controlflow/change-notes/released/2.0.40.md
new file mode 100644
index 000000000000..889c7f385592
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.40.md
@@ -0,0 +1,3 @@
+## 2.0.40
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.41.md b/shared/controlflow/change-notes/released/2.0.41.md
new file mode 100644
index 000000000000..5b519388ce82
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.41.md
@@ -0,0 +1,3 @@
+## 2.0.41
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.42.md b/shared/controlflow/change-notes/released/2.0.42.md
new file mode 100644
index 000000000000..85ba02702b9f
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.42.md
@@ -0,0 +1,3 @@
+## 2.0.42
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.43.md b/shared/controlflow/change-notes/released/2.0.43.md
new file mode 100644
index 000000000000..69732e6e3060
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.43.md
@@ -0,0 +1,3 @@
+## 2.0.43
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.44.md b/shared/controlflow/change-notes/released/2.0.44.md
new file mode 100644
index 000000000000..47addacab148
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.44.md
@@ -0,0 +1,3 @@
+## 2.0.44
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.45.md b/shared/controlflow/change-notes/released/2.0.45.md
new file mode 100644
index 000000000000..ec5a10154c4d
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.45.md
@@ -0,0 +1,3 @@
+## 2.0.45
+
+No user-facing changes.
diff --git a/shared/controlflow/codeql-pack.release.yml b/shared/controlflow/codeql-pack.release.yml
index 4ec9eb0980cf..c36828b9af04 100644
--- a/shared/controlflow/codeql-pack.release.yml
+++ b/shared/controlflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.38
+lastReleaseVersion: 2.0.45
diff --git a/shared/controlflow/codeql/controlflow/ControlFlowGraph.qll b/shared/controlflow/codeql/controlflow/ControlFlowGraph.qll
index 2b5ae0402847..395ed815ca74 100644
--- a/shared/controlflow/codeql/controlflow/ControlFlowGraph.qll
+++ b/shared/controlflow/codeql/controlflow/ControlFlowGraph.qll
@@ -71,6 +71,12 @@ signature module AstSig<LocationSig Location> {
   /** A statement. */
   class Stmt extends AstNode;
 
+  /** A labeled statement. */
+  class LabeledStmt extends Stmt {
+    /** Gets the statement carrying the label. */
+    Stmt getStmt();
+  }
+
   /** An expression. */
   class Expr extends AstNode;
 
@@ -147,7 +153,7 @@ signature module AstSig<LocationSig Location> {
   }
 
   /** A for-loop that iterates over the elements of a collection. */
-  class ForeachStmt extends LoopStmt {
+  class ForEachStmt extends LoopStmt {
     /** Gets the variable declaration of this `foreach` loop. */
     Expr getVariable();
 
@@ -155,6 +161,9 @@ signature module AstSig<LocationSig Location> {
     Expr getCollection();
   }
 
+  /** Gets the loop guard of the given `loop`, if any. */
+  default AstNode getLoopGuard(ForEachStmt loop) { none() }
+
   /**
    * A `break` statement.
    *
@@ -284,6 +293,14 @@ signature module AstSig<LocationSig Location> {
     Stmt getStmt(int index);
   }
 
+  /**
+   * Gets the initializer of `switch` statement `switch`, if any.
+   *
+   * Only some languages (e.g. Go) support an initializer that is evaluated
+   * before the switch expression.
+   */
+  default AstNode getSwitchInit(Switch switch) { none() }
+
   /** A case in a switch. */
   class Case extends AstNode {
     /** Gets the pattern being matched by this case at the specified (zero-based) `index`. */
@@ -431,10 +448,7 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
       string toString();
     }
 
-    /**
-     * Holds if the node `n` has the label `l`. For example, a label in a goto
-     * statement or a goto target.
-     */
+    /** Holds if the node `n` directly has the label `l`. */
     default predicate hasLabel(AstNode n, Label l) { none() }
 
     /**
@@ -571,7 +585,9 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
       not n instanceof LogicalNotExpr and
       not n instanceof ConditionalExpr and
       not n instanceof Switch and
-      not n instanceof Case
+      not n instanceof Case and
+      not n instanceof BlockStmt and
+      not n instanceof TryStmt
     }
 
     /**
@@ -643,12 +659,13 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
         any(DoStmt dostmt).getCondition() = n or
         any(UntilStmt untilstmt).getCondition() = n or
         any(ForStmt forstmt).getCondition() = n or
+        getLoopGuard(_) = n or
         any(ConditionalExpr condexpr).getCondition() = n or
         any(CatchClause catch).getCondition() = n or
         any(Case case).getGuard() = n
       )
       or
-      any(ForeachStmt foreachstmt).getCollection() = n and kind.isEmptiness()
+      any(ForEachStmt foreachstmt).getCollection() = n and kind.isEmptiness()
       or
       kind.isMatching() and
       (
@@ -1086,7 +1103,7 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
     }
 
     /** The `PreControlFlowNode` at the entry point of a callable. */
-    final private class EntryNodeImpl extends NodeImpl, TEntryNode {
+    final class EntryNodeImpl extends NodeImpl, TEntryNode {
       private Callable c;
 
       EntryNodeImpl() { this = TEntryNode(c) }
@@ -1130,7 +1147,7 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
     }
 
     /** A control flow node indicating exceptional termination of a callable. */
-    final private class ExceptionalExitNodeImpl extends AnnotatedExitNodeImpl {
+    final class ExceptionalExitNodeImpl extends AnnotatedExitNodeImpl {
       ExceptionalExitNodeImpl() { this = TAnnotatedExitNode(_, false) }
     }
 
@@ -1185,9 +1202,17 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
     }
 
     signature module InputSig2 {
+      /**
+       * Holds if control flow is constructed and reachability starts at the
+       * entry of `callable` in this stage.
+       * By default, all callable entries are included. Restricting this is useful
+       * for auxiliary CFG stages that are only needed for selected callables.
+       */
+      default predicate includeCallableEntry(Callable callable) { any() }
+
       /**
        * Holds if `ast` may result in an abrupt completion `c` originating at
-       * `n`. The boolean `always`  indicates whether the abrupt completion
+       * `n`. The boolean `always` indicates whether the abrupt completion
        * always occurs or whether `n` may also terminate normally.
        *
        * This predicate is only relevant for AST constructs that are not already
@@ -1229,28 +1254,28 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
         or
         n.isIn(ast) and
         always = true and
-        (
+        exists(SuccessorType st |
           ast instanceof ReturnStmt and
-          c.getSuccessorType() instanceof ReturnSuccessor
+          st instanceof ReturnSuccessor
           or
           ast instanceof Throw and
-          c.getSuccessorType() instanceof ExceptionSuccessor
+          st instanceof ExceptionSuccessor
           or
           ast instanceof BreakStmt and
-          c.getSuccessorType() instanceof BreakSuccessor
+          st instanceof BreakSuccessor
           or
           ast instanceof ContinueStmt and
-          c.getSuccessorType() instanceof ContinueSuccessor
+          st instanceof ContinueSuccessor
           or
           ast instanceof GotoStmt and
-          c.getSuccessorType() instanceof GotoSuccessor
-        ) and
-        (
-          not Input1::hasLabel(ast, _) and not c.hasLabel(_)
+          st instanceof GotoSuccessor
+        |
+          not Input1::hasLabel(ast, _) and
+          c = TSimpleAbruptCompletion(st)
           or
           exists(Input1::Label l |
             Input1::hasLabel(ast, l) and
-            c.hasLabel(l)
+            c = TLabeledAbruptCompletion(st, l)
           )
         )
         or
@@ -1264,9 +1289,13 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
         )
       }
 
-      private Stmt getAStmtInBlock(AstNode block) {
-        result = block.(BlockStmt).getStmt(_) or
-        result = block.(Switch).getStmt(_)
+      /** Holds if `n` is marked with a `LabeledStmt` with label `l`. */
+      private predicate hasEnclosingLabel(AstNode n, Input1::Label l) {
+        exists(LabeledStmt labeled | labeled.getStmt+() = n and Input1::hasLabel(labeled, l))
+      }
+
+      private predicate callableHasParamDefault(Callable c, Expr defaultValue) {
+        exists(Parameter p | p.getDefaultValue() = defaultValue and c = getEnclosingCallable(p))
       }
 
       /**
@@ -1276,7 +1305,10 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
       private predicate endAbruptCompletion(AstNode ast, PreControlFlowNode n, AbruptCompletion c) {
         Input2::endAbruptCompletion(ast, n, c)
         or
-        exists(Callable callable | callableHasBodyPart(callable, ast) |
+        exists(Callable callable |
+          not Input2::endAbruptCompletion(ast, _, c) and
+          (callableHasBodyPart(callable, ast) or callableHasParamDefault(callable, ast))
+        |
           c.getSuccessorType() instanceof ReturnSuccessor and
           n.(NormalExitNodeImpl).getEnclosingCallable() = callable
           or
@@ -1287,20 +1319,19 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
           n.(ExceptionalExitNodeImpl).getEnclosingCallable() = callable
         )
         or
-        exists(LoopStmt loop | ast = pragma[only_bind_into](loop).getBody() |
+        exists(LoopStmt loop, SuccessorType st | ast = pragma[only_bind_into](loop).getBody() |
           (
-            c.getSuccessorType() instanceof BreakSuccessor and
+            st instanceof BreakSuccessor and
             n.isAfter(loop)
             or
-            c.getSuccessorType() instanceof ContinueSuccessor and
+            st instanceof ContinueSuccessor and
             n.isAdditional(loop, loopHeaderTag())
           ) and
           (
-            not c.hasLabel(_)
+            c = TSimpleAbruptCompletion(st)
             or
-            exists(Input1::Label l |
-              c.hasLabel(l) and
-              Input1::hasLabel(loop, l)
+            exists(Input1::Label l | c = TLabeledAbruptCompletion(st, l) |
+              Input1::hasLabel(loop, l) or hasEnclosingLabel(loop, l)
             )
           )
         )
@@ -1340,16 +1371,24 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
           or
           exists(Input1::Label l |
             c.hasLabel(l) and
-            Input1::hasLabel(switch, l)
+            (Input1::hasLabel(switch, l) or hasEnclosingLabel(switch, l))
           )
         )
         or
-        exists(AstNode block, Input1::Label l, Stmt lblstmt |
-          ast = getAStmtInBlock(block) and
-          lblstmt = getAStmtInBlock(block) and
-          not lblstmt instanceof GotoStmt and
-          Input1::hasLabel(pragma[only_bind_into](lblstmt), l) and
-          n.isBefore(lblstmt) and
+        exists(LabeledStmt target, Input1::Label l |
+          ast = target.getStmt() and
+          Input1::hasLabel(target, l) and
+          n.isAfter(target) and
+          c.getSuccessorType() instanceof BreakSuccessor and
+          c.hasLabel(l)
+        )
+        or
+        exists(AstNode parent, LabeledStmt root, LabeledStmt target, Input1::Label l |
+          ast = getChild(parent, _) and
+          root = getChild(parent, _) and
+          root.getStmt*() = target and
+          Input1::hasLabel(pragma[only_bind_into](target), l) and
+          n.isBefore(target) and
           c.getSuccessorType() instanceof GotoSuccessor and
           c.hasLabel(l)
         )
@@ -1543,8 +1582,16 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
           n1.isAfterTrue(condexpr.getCondition()) and
           n2.isBefore(condexpr.getThen())
           or
+          n1.isAfterTrue(condexpr.getCondition()) and
+          not exists(condexpr.getThen()) and
+          n2.isAfter(condexpr)
+          or
           n1.isAfterFalse(condexpr.getCondition()) and
           n2.isBefore(condexpr.getElse())
+          or
+          n1.isAfterFalse(condexpr.getCondition()) and
+          not exists(condexpr.getElse()) and
+          n2.isAfter(condexpr)
         )
         or
         exists(PatternMatchExpr pme |
@@ -1640,7 +1687,7 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
           n2.isAfter(loopstmt)
         )
         or
-        exists(ForeachStmt foreachstmt |
+        exists(ForEachStmt foreachstmt |
           n1.isBefore(foreachstmt) and
           n2.isBefore(foreachstmt.getCollection())
           or
@@ -1657,8 +1704,19 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
           n2.isBefore(foreachstmt.getVariable())
           or
           n1.isAfter(foreachstmt.getVariable()) and
+          (
+            n2.isBefore(getLoopGuard(foreachstmt))
+            or
+            not exists(getLoopGuard(foreachstmt)) and
+            n2.isBefore(foreachstmt.getBody())
+          )
+          or
+          n1.isAfterTrue(getLoopGuard(foreachstmt)) and
           n2.isBefore(foreachstmt.getBody())
           or
+          n1.isAfterFalse(getLoopGuard(foreachstmt)) and
+          n2.isAdditional(foreachstmt, loopHeaderTag())
+          or
           n1.isAfter(foreachstmt.getBody()) and
           n2.isAdditional(foreachstmt, loopHeaderTag())
           or
@@ -1737,6 +1795,10 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
               not exists(trystmt.getFinally()) and beforeFinally.isAfter(trystmt)
             )
           |
+            not exists(trystmt.getBody(_)) and
+            n1.isBefore(trystmt) and
+            n2 = beforeElse
+            or
             exists(int i |
               n1.isAfter(trystmt.getBody(i)) and
               not exists(trystmt.getBody(i + 1)) and
@@ -1806,14 +1868,30 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
         exists(Switch switch, PreControlFlowNode firstCase |
           firstCase.isBefore(getRankedCaseCfgOrder(switch, 1))
           or
-          not exists(getRankedCaseCfgOrder(switch, _)) and firstCase.isAfter(switch)
+          not exists(getRankedCaseCfgOrder(switch, _)) and
+          not simpleLeafNode(switch) and
+          firstCase.isAfter(switch)
         |
           n1.isBefore(switch) and
-          n2.isBefore(switch.getExpr())
+          (
+            n2.isBefore(getSwitchInit(switch))
+            or
+            not exists(getSwitchInit(switch)) and
+            (
+              n2.isBefore(switch.getExpr())
+              or
+              not exists(switch.getExpr()) and
+              n2 = firstCase
+            )
+          )
           or
-          n1.isBefore(switch) and
-          not exists(switch.getExpr()) and
-          n2 = firstCase
+          n1.isAfter(getSwitchInit(switch)) and
+          (
+            n2.isBefore(switch.getExpr())
+            or
+            not exists(switch.getExpr()) and
+            n2 = firstCase
+          )
           or
           n1.isAfter(switch.getExpr()) and
           n2 = firstCase
@@ -1884,6 +1962,7 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
        */
       private predicate defaultCfg(AstNode ast) {
         hasCfg(ast) and
+        Input2::includeCallableEntry(getEnclosingCallable(ast)) and
         not explicitStep(any(PreControlFlowNode n | n.isBefore(ast)), _)
       }
 
@@ -1935,7 +2014,8 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
 
       /** Holds if there is a local non-abrupt step from `n1` to `n2`. */
       private predicate step(PreControlFlowNode n1, PreControlFlowNode n2) {
-        explicitStep(n1, n2) or defaultStep(n1, n2)
+        Input2::includeCallableEntry(n1.getEnclosingCallable()) and
+        (explicitStep(n1, n2) or defaultStep(n1, n2))
       }
 
       /**
@@ -1946,8 +2026,7 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
         // Require a predecessor as a coarse approximation of reachability.
         // In particular, this prevents a catch-all catch clause preceding a
         // finally block from adding exception edges out of the finally.
-        step(_, last) and
-        beginAbruptCompletion(ast, last, c, _)
+        step(_, last) and beginAbruptCompletion(ast, last, c, _)
         or
         exists(AstNode child |
           getChild(ast, _) = child and
@@ -1970,17 +2049,20 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
       }
 
       private predicate preSucc(PreControlFlowNode n1, PreControlFlowNode n2, SuccessorType t) {
-        step(n1, n2) and n2 = TAfterValueNode(_, t)
-        or
-        step(n1, n2) and n2.(AdditionalNode).getSuccessorType() = t
-        or
-        step(n1, n2) and
-        not n2 instanceof AfterValueNode and
-        not n2 instanceof AdditionalNode and
-        t instanceof DirectSuccessor
-        or
-        exists(AstNode ast, AbruptCompletion c |
-          last(ast, n1, c) and endAbruptCompletion(ast, n2, c) and t = c.getSuccessorType()
+        Input2::includeCallableEntry(n1.getEnclosingCallable()) and
+        (
+          step(n1, n2) and n2 = TAfterValueNode(_, t)
+          or
+          step(n1, n2) and n2.(AdditionalNode).getSuccessorType() = t
+          or
+          step(n1, n2) and
+          not n2 instanceof AfterValueNode and
+          not n2 instanceof AdditionalNode and
+          t instanceof DirectSuccessor
+          or
+          exists(AstNode ast, AbruptCompletion c |
+            last(ast, n1, c) and endAbruptCompletion(ast, n2, c) and t = c.getSuccessorType()
+          )
         )
       }
 
@@ -1988,7 +2070,7 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
       cached
       private predicate reachable(PreControlFlowNode n) {
         Input1::cfgCachedStageRef() and
-        n instanceof EntryNodeImpl
+        Input2::includeCallableEntry(n.(EntryNodeImpl).getEnclosingCallable())
         or
         exists(PreControlFlowNode mid | reachable(mid) and preSucc(mid, n, _))
       }
@@ -2053,6 +2135,33 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
             result = this.getASuccessor(any(ExceptionSuccessor t))
           }
 
+          /*
+           * Note that the following 3 predicates, `isAfterValue`,
+           * `isAfterTrue`, and `isAfterFalse`, shadow their counterparts in
+           * `PreControlFlowNode`, and that their semantics are slightly
+           * different.
+           *
+           * This is because, in `PreControlFlowNode`, during CFG construction,
+           * we need to identify the control flow node that results from the
+           * evaluation of an AST node to a certain value, but that control
+           * flow node may or may not encode that fact. In contrast, in
+           * `ControlFlowNode`, we instead want to know what the node actually
+           * encodes.
+           */
+
+          /** Holds if this node indicates that `n` evaluates to the value `t`. */
+          predicate isAfterValue(AstNode n, ConditionalSuccessor t) { this = TAfterValueNode(n, t) }
+
+          /** Holds if this node indicates that `n` evaluates to the value `true`. */
+          predicate isAfterTrue(AstNode n) {
+            this = TAfterValueNode(n, any(BooleanSuccessor b | b.getValue() = true))
+          }
+
+          /** Holds if this node indicates that `n` evaluates to the value `false`. */
+          predicate isAfterFalse(AstNode n) {
+            this = TAfterValueNode(n, any(BooleanSuccessor b | b.getValue() = false))
+          }
+
           /**
            * Holds if this node dominates `that` node.
            *
@@ -2161,13 +2270,22 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
           }
         }
 
-        module Cfg = BB::Make<Location, BbInput>;
+        private module Cfg_ = BB::Make<Location, BbInput>;
+
+        /** Provides the control flow graph interfaces used by basic-block and inline CFG tests. */
+        module Cfg implements BB::CfgSig<Location>, TestCfg::CfgSig<Location> {
+          import Cfg_
 
-        private module CfgAlias = Cfg;
+          class AstNode = Ast::AstNode;
 
-        import CfgAlias
+          class Callable = Ast::Callable;
+        }
+
+        import Cfg_
       }
 
+      private import test.TestCfg as TestCfg
+
       private module Additional {
         /*
          * CFG printing
@@ -2189,6 +2307,18 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
 
         import Pp::PrintGraph<Location, PrintGraphInput>
 
+        /*
+         * CFG testing
+         */
+
+        private module TestInput implements TestCfg::InputSig<AstNode, Callable> {
+          AstNode getParent(AstNode node) { node = getChild(result, _) }
+
+          predicate getEnclosingCallable = Ast::getEnclosingCallable/1;
+        }
+
+        module TestCfgInline = TestCfg::Make<Location, Cfg, TestInput>;
+
         /** Provides a set of consistency queries. */
         module Consistency {
           /** Holds if the consistency query `query` has `results` results. */
@@ -2217,6 +2347,12 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
             query = "ambiguousAdditionalNode" and
             results = strictcount(AstNode n, string tag | ambiguousAdditionalNode(n, tag))
             or
+            query = "invalidAbruptCompletionOrigin" and
+            results =
+              strictcount(AstNode ast, PreControlFlowNode node |
+                invalidAbruptCompletionOrigin(ast, node)
+              )
+            or
             query = "missingInNodeForPostOrInOrder" and
             results = strictcount(AstNode ast | missingInNodeForPostOrInOrder(ast))
             or
@@ -2233,7 +2369,7 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
                 multipleConditionalSuccessorKinds(node, t1, t2, succ1, succ2)
               )
             or
-            query = "directAndConditionalSuccessor" and
+            query = "directAndConditionalSuccessors" and
             results =
               strictcount(ControlFlowNode node, ConditionalSuccessor t1, DirectSuccessor t2,
                 ControlFlowNode succ1, ControlFlowNode succ2 |
@@ -2242,6 +2378,19 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
             or
             query = "selfLoop" and
             results = strictcount(ControlFlowNode node, SuccessorType t | selfLoop(node, t))
+            or
+            query = "bodyPartNonOverlap" and
+            results = strictcount(Callable c | bodyPartNonOverlap(c))
+            or
+            query = "parameterNonOverlap" and
+            results = strictcount(Callable c, Parameter p | parameterNonOverlap(c, p))
+            or
+            query = "parameterEnclosingCallable" and
+            results = strictcount(Parameter p, Callable c | parameterEnclosingCallable(p, c))
+            or
+            query = "multipleDefaultCases" and
+            results =
+              strictcount(Switch s, int defaultCases | multipleDefaultCases(s, defaultCases))
           }
 
           /**
@@ -2304,6 +2453,16 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
             1 < strictcount(NormalSuccessor t | additionalNode(n, tag, t))
           }
 
+          /**
+           * Holds if the language-specific CFG input supplies an abrupt completion for `ast` whose
+           * origin `node` does not belong to `ast`.
+           */
+          query predicate invalidAbruptCompletionOrigin(AstNode ast, PreControlFlowNode node) {
+            Input2::beginAbruptCompletion(ast, node, _, _) and
+            not node.isIn(ast) and
+            not node.isAdditional(ast, _)
+          }
+
           /**
            * Holds if the "in" node is unreachable for a post-or-in-order AST node.
            *
@@ -2354,7 +2513,7 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
             // allow for loop headers in foreach loops (they're checking emptiness on the iterator, not the collection)
             not (
               t instanceof DirectSuccessor and
-              node.isAdditional(any(ForeachStmt foreach), loopHeaderTag())
+              node.isAdditional(any(ForEachStmt foreach), loopHeaderTag())
             ) and
             // allow for functions with multiple bodies
             not exists(Callable c |
@@ -2432,6 +2591,16 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
             p = callableGetParameter(c, _) and
             not c = getEnclosingCallable(p)
           }
+
+          /**
+           * Holds if a switch `s` has multiple default cases.
+           *
+           * A well-formed switch statement should have at most one default case.
+           */
+          query predicate multipleDefaultCases(Switch s, int defaultCases) {
+            defaultCases = strictcount(DefaultCase c | s.getCase(_) = c) and
+            defaultCases > 1
+          }
         }
       }
     }
diff --git a/shared/controlflow/codeql/controlflow/Guards.qll b/shared/controlflow/codeql/controlflow/Guards.qll
index e12535b4b328..d2852a4c227b 100644
--- a/shared/controlflow/codeql/controlflow/Guards.qll
+++ b/shared/controlflow/codeql/controlflow/Guards.qll
@@ -93,6 +93,19 @@ signature module InputSig<LocationSig Location, TypSig ControlFlowNode, TypSig B
     ConstantValue asConstantValue();
   }
 
+  /**
+   * Holds if taking the edge from `bb1` to `bb2` establishes whether `left` and `right` are
+   * equal.
+   *
+   * This supports implicit equality tests that do not have a corresponding source expression,
+   * such as comparisons between a switch expression and a case expression.
+   */
+  default predicate equalityBranchEdge(
+    Expr left, Expr right, BasicBlock bb1, BasicBlock bb2, boolean equal
+  ) {
+    none()
+  }
+
   class NonNullExpr extends Expr;
 
   class Case extends AstNode {
@@ -404,6 +417,24 @@ module Make<
     c.nonMatchEdge(bb1, bb2)
   }
 
+  private predicate implicitEqualityBranchEdge(
+    Expr guard, BasicBlock bb1, BasicBlock bb2, GuardValue v
+  ) {
+    exists(ConstantExpr constant, boolean equal, GuardValue constantValue |
+      (
+        equalityBranchEdge(guard, constant, bb1, bb2, equal)
+        or
+        equalityBranchEdge(constant, guard, bb1, bb2, equal)
+      ) and
+      constantHasValue(constant, constantValue) and
+      (
+        equal = true and v = constantValue
+        or
+        equal = false and v = constantValue.getDualValue()
+      )
+    )
+  }
+
   private predicate equalityTestSymmetric(Expr eqtest, Expr e1, Expr e2, boolean eqval) {
     equalityTest(eqtest, e1, e2, eqval)
     or
@@ -436,6 +467,8 @@ module Make<
       bb1.getLastNode() = this.(Expr).getControlFlowNode() and
       branchEdge(bb1, bb2, v)
       or
+      implicitEqualityBranchEdge(this, bb1, bb2, v)
+      or
       caseBranchEdge(bb1, bb2, v, this)
     }
 
@@ -562,6 +595,32 @@ module Make<
       Parameter getParameter();
     }
 
+    /**
+     * Holds if `def` supplies an implicit return value of `method`.
+     *
+     * This supports languages where a return statement can return a named result
+     * without containing a return expression.
+     */
+    default predicate implicitReturnDefinition(NonOverridableMethod method, SsaDefinition def) {
+      none()
+    }
+
+    /**
+     * Holds if `def` has the known abstract value `value`, even though it does
+     * not expose a source expression through `SsaExplicitWrite`.
+     */
+    default predicate additionalSsaDefinitionValue(SsaDefinition def, GuardValue value) { none() }
+
+    /**
+     * Holds if `def` defines the implicit return value represented by `method`, or is an SSA
+     * definition traversed while determining that value.
+     */
+    default predicate relevantImplicitReturnSsaDefinition(
+      NonOverridableMethod method, SsaDefinition def
+    ) {
+      none()
+    }
+
     /**
      * Holds if `guard` evaluating to `val` ensures that:
      * `e <= k` when `upper = true`
@@ -629,23 +688,31 @@ module Make<
       )
     }
 
+    private predicate ssaDefinitionHasValue(SsaDefinition def, GuardValue value) {
+      exists(SsaExplicitWrite write | def = write and exprHasValue(write.getValue(), value))
+      or
+      additionalSsaDefinitionValue(def, value)
+    }
+
     /**
-     * Holds if `phi` takes `input` exactly when `guard` is `v`. That is,
-     * `guard == v` directly controls `input` and `guard == v.getDualValue()`
+     * Holds if `phi` takes an input with value `inputValue` exactly when `guard`
+     * is `v`. That is, `guard == v` directly controls that input and
+     * `guard == v.getDualValue()`
      * directly controls all other inputs to `phi`.
      *
-     * This makes `phi` similar to the conditional `phi = guard==v ? input : ...`.
+     * This makes `phi` similar to the conditional
+     * `phi = guard==v ? inputValue : ...`.
      */
     private predicate guardDeterminesPhiInput(
-      Guard guard, GuardValue v, SsaPhiDefinition phi, Expr input
+      Guard guard, GuardValue v, SsaPhiDefinition phi, GuardValue inputValue
     ) {
-      exists(GuardValue dv, SsaExplicitWrite inp |
+      exists(GuardValue dv, SsaDefinition inp |
         // The `forall` below implies that there's only one `inp` guarded by
         // `guard == v`, but checking this upfront using `unique` as opposed to
         // merely stating `guardControlsPhiBranch(guard, v, phi, inp)` improves
         // performance of the `forall` check.
         inp = unique(SsaDefinition inp0 | guardControlsPhiBranch(guard, v, phi, inp0)) and
-        inp.getValue() = input and
+        ssaDefinitionHasValue(inp, inputValue) and
         dv = v.getDualValue() and
         forall(SsaDefinition other | phi.hasInputFromBlock(other, _) and other != inp |
           guardControlsPhiBranch(guard, dv, phi, other)
@@ -874,9 +941,8 @@ module Make<
       v1 = v2 and
       not trivialHasValue(g2, v2) // disregard trivial guard
       or
-      exists(Expr e, GuardValue ev |
-        guardDeterminesPhiInput(g2, v2.getDualValue(), def1, e) and
-        exprHasValue(e, ev) and
+      exists(GuardValue ev |
+        guardDeterminesPhiInput(g2, v2.getDualValue(), def1, ev) and
         disjointValues(v1, ev)
       )
     }
@@ -1169,6 +1235,25 @@ module Make<
         )
       }
 
+      /**
+       * Holds if `def` evaluating to `defVal` implies that `guard` evaluates to `guardVal`.
+       */
+      predicate ssaImpliesGuard(
+        NonOverridableMethod method, SsaDefinition def, GuardValue defVal, Guard guard,
+        GuardValue guardVal
+      ) {
+        relevantReturnValue(method, defVal) and
+        relevantImplicitReturnSsaDefinition(method, def) and
+        (
+          impliesStepSsaGuard(def, defVal, guard, guardVal)
+          or
+          exists(SsaDefinition next |
+            impliesStepSsa(def, defVal, next) and
+            ssaImpliesGuard(method, next, defVal, guard, guardVal)
+          )
+        )
+      }
+
       /**
        * Holds if a call to `m` having a return value of `retval` is reachable
        * by a chain of implications, and `ret` is a return expression in `m`
@@ -1185,6 +1270,12 @@ module Make<
 
       private predicate returnGuard(Guard guard, GuardValue val) {
         relevantReturnExprValue(_, guard, val)
+        or
+        exists(NonOverridableMethod m, SsaDefinition ret, GuardValue retval |
+          relevantReturnValue(m, retval) and
+          implicitReturnDefinition(m, ret) and
+          ssaImpliesGuard(m, ret, retval, guard, val)
+        )
       }
 
       module ReturnImplies = ImpliesTC<returnGuard/2>;
@@ -1263,6 +1354,13 @@ module Make<
       ) {
         validReturnInCustomGuardToRank(maxRank(result), result, ppos, retval, val)
         or
+        exists(SsaDefinition ret, SsaParameterInit param, Guard guard, GuardValue guardVal |
+          implicitReturnDefinition(result, ret) and
+          param.getParameter() = result.getParameter(ppos) and
+          ssaImpliesGuard(result, ret, retval, guard, guardVal) and
+          ReturnImplies::ssaControls(param, val, guard, guardVal)
+        )
+        or
         exists(SsaParameterInit param, Guard g0, GuardValue v0 |
           param.getParameter() = result.getParameter(ppos) and
           guardDirectlyControlsExit(g0, v0) and
@@ -1362,6 +1460,13 @@ module Make<
           validReturnInValidationWrapper(ret, ppos, retval, par)
         )
         or
+        exists(SsaDefinition ret, SsaParameterInit param, Guard guard, GuardValue guardVal |
+          implicitReturnDefinition(result, ret) and
+          param.getParameter() = result.getParameter(ppos) and
+          ssaImpliesGuard(result, ret, retval, guard, guardVal) and
+          guardChecksDef(guard, param, guardVal, par)
+        )
+        or
         exists(SsaParameterInit param, BasicBlock bb, Guard guard, GuardValue val |
           param.getParameter() = result.getParameter(ppos) and
           guardChecksDef(guard, param, val, par) and
diff --git a/shared/controlflow/codeql/controlflow/test/TestCfg.qll b/shared/controlflow/codeql/controlflow/test/TestCfg.qll
new file mode 100644
index 000000000000..27ed56140e2f
--- /dev/null
+++ b/shared/controlflow/codeql/controlflow/test/TestCfg.qll
@@ -0,0 +1,452 @@
+/**
+ * Provides query predicates for testing the CFG in an inline expectation qltest.
+ */
+overlay[local?]
+module;
+
+private import codeql.controlflow.SuccessorType
+private import codeql.util.Location
+
+signature module CfgSig<LocationSig Location> {
+  /** An AST node. */
+  class AstNode {
+    /** Gets a textual representation of this AST node. */
+    string toString();
+
+    /** Gets the location of this AST node. */
+    Location getLocation();
+  }
+
+  /** A callable, for example a function, method, constructor, or top-level script. */
+  class Callable;
+
+  /** A control flow node. */
+  class ControlFlowNode {
+    /** Gets a textual representation of this control flow node. */
+    string toString();
+
+    /** Gets the location of this control flow node. */
+    Location getLocation();
+
+    /** Gets the basic block containing this control flow node. */
+    BasicBlock getBasicBlock();
+
+    /**
+     * Holds if this is the unique control flow node that represents the
+     * given AST node.
+     */
+    predicate injects(AstNode n);
+
+    /** Gets the enclosing callable of this control flow node. */
+    Callable getEnclosingCallable();
+  }
+
+  /**
+   * A basic block, that is, a maximal straight-line sequence of control flow nodes
+   * without branches or joins.
+   */
+  class BasicBlock {
+    /** Gets a textual representation of this basic block. */
+    string toString();
+
+    /** Gets the location of this basic block. */
+    Location getLocation();
+
+    /** Gets the control flow node at a specific (zero-indexed) position in this basic block. */
+    ControlFlowNode getNode(int pos);
+
+    /** Gets an immediate successor of this basic block of a given type, if any. */
+    BasicBlock getASuccessor(SuccessorType t);
+
+    /** Gets the enclosing callable of this basic block. */
+    Callable getEnclosingCallable();
+  }
+}
+
+signature class TypSig;
+
+signature module InputSig<TypSig AstNode, TypSig Callable> {
+  /** Gets the parent of `node`. */
+  AstNode getParent(AstNode node);
+
+  /** Gets the immediately enclosing callable that contains `node`. */
+  Callable getEnclosingCallable(AstNode node);
+}
+
+/**
+ * Constructs several query predicates for testing the CFG in an inline expectation qltest.
+ *
+ * The output is based on basic block slices, that is, block segments cut by line boundaries.
+ * Ordinary left-to-right intra-block control flow is elided, but everything else is represented.
+ *
+ * A nested module `BlockSlices` can be imported to dump all basic block slices.
+ */
+module Make<LocationSig Location, CfgSig<Location> Cfg, InputSig<Cfg::AstNode, Cfg::Callable> Input>
+{
+  private import Cfg
+
+  /**
+   * Gets the rank of `n` within `bb` restricted to nodes that are canonical
+   * representatives of AST nodes.
+   */
+  private int bbRank(ControlFlowNode n, BasicBlock bb) {
+    n =
+      rank[result](ControlFlowNode n0, int i | n0.injects(_) and bb.getNode(i) = n0 | n0 order by i)
+  }
+
+  /** Gets the start line of `n`. */
+  private int getLine(ControlFlowNode n) { n.getLocation().getStartLine() = result }
+
+  /** Holds if `n` is the first node of a slice of `bb` at the given line. */
+  private predicate sliceStart(int line, ControlFlowNode n, BasicBlock bb) {
+    line = getLine(n) and
+    1 = bbRank(n, bb)
+    or
+    exists(ControlFlowNode n0 |
+      line = getLine(n) and
+      bbRank(n0, bb) + 1 = bbRank(n, bb) and
+      getLine(n0) != line
+    )
+  }
+
+  private newtype TSlice =
+    TMkSlice(int line, ControlFlowNode n, BasicBlock bb) { sliceStart(line, n, bb) }
+
+  /** A slice of a basic block at a specific line. */
+  private class Slice extends TSlice {
+    private int line;
+    private ControlFlowNode start;
+    private BasicBlock bb;
+
+    Slice() { this = TMkSlice(line, start, bb) }
+
+    string toString() { result = start.toString() }
+
+    int getLine() { result = line }
+
+    ControlFlowNode getNode(int i) {
+      i = 0 and result = start
+      or
+      bbRank(this.getNode(i - 1), bb) + 1 = bbRank(result, bb) and
+      not sliceStart(_, result, bb)
+    }
+
+    ControlFlowNode getLast() {
+      exists(int i | result = this.getNode(i) and not exists(this.getNode(i + 1)))
+    }
+
+    predicate step(ControlFlowNode n1, ControlFlowNode n2) {
+      exists(int i | n1 = this.getNode(i) and n2 = this.getNode(i + 1))
+    }
+  }
+
+  /**
+   * A direction in the location-induced AST restricted to a single line, that
+   * is, the tree arising from location-nesting.
+   *
+   * - `Up` and `Down` indicate location nesting.
+   * - `Right` indicates a non-overlapping location to the right.
+   * - `Id` indicates the same location.
+   * - `Other` most likely indicates a non-overlapping location to the left,
+   *    but remains a catch-all for any other case.
+   */
+  private newtype Dir =
+    Down() or
+    Up() or
+    Right() or
+    Id() or
+    Other()
+
+  /**
+   * Holds if `n1` steps to `n2` within a basic block line slice and that the
+   * corresponding AST nodes are related with one being a transitive parent of
+   * the other. The direction in the AST is given by `dir`.
+   */
+  private predicate astUpDownStep(ControlFlowNode n1, ControlFlowNode n2, Dir dir) {
+    exists(AstNode a1, AstNode a2 |
+      n1.injects(a1) and
+      n2.injects(a2) and
+      any(Slice s).step(n1, n2)
+    |
+      if Input::getParent+(a1) = a2
+      then dir = Up()
+      else
+        if Input::getParent+(a2) = a1
+        then dir = Down()
+        else none()
+    )
+  }
+
+  bindingset[l1, l2]
+  pragma[inline_late]
+  private predicate endsLessThan(Location l1, Location l2) {
+    l1.getEndLine() < l2.getEndLine()
+    or
+    l1.getEndLine() = l2.getEndLine() and
+    l1.getEndColumn() <= l2.getEndColumn()
+  }
+
+  private predicate oneline(Location l) { l.getStartLine() = l.getEndLine() }
+
+  /**
+   * Holds if `n1` steps to `n2` within a basic block line slice `slice` and
+   * that the step in locations is given by `dir`. Some identical locations may
+   * be further resolved by peeking at the AST structure.
+   */
+  private predicate singleLineBlockStep(Slice slice, ControlFlowNode n1, ControlFlowNode n2, Dir dir) {
+    slice.step(n1, n2) and
+    exists(Location l1, Location l2 | n1.getLocation() = l1 and n2.getLocation() = l2 |
+      if oneline(l1) and l1.getEndColumn() < l2.getStartColumn()
+      then dir = Right()
+      else
+        if
+          l1.getStartColumn() <= l2.getStartColumn() and
+          endsLessThan(l2, l1) and
+          l1 != l2
+        then dir = Down()
+        else
+          if
+            l2.getStartColumn() <= l1.getStartColumn() and
+            endsLessThan(l1, l2) and
+            l1 != l2
+          then dir = Up()
+          else
+            if l1 != l2
+            then dir = Other()
+            else (
+              astUpDownStep(n1, n2, dir)
+              or
+              not astUpDownStep(n1, n2, _) and dir = Id()
+            )
+    )
+  }
+
+  /**
+   * Holds if the slice `slice` is simple left-to-right evaluation order.
+   *
+   * Both pre-order and post-order traversal is allowed and allowed to be
+   * mixed. `Up` indicates the last part of a post-order traversal, and `Down`
+   * indicates the first part of a pre-order traversal, so an `Up` step
+   * followed by a `Down` step is inconsistent with simple left-to-right
+   * evaluation order.
+   */
+  private predicate simpleLeftToRightBlock(Slice slice) {
+    forall(ControlFlowNode n1, ControlFlowNode n2 | singleLineBlockStep(slice, n1, n2, _) |
+      exists(Dir dir | singleLineBlockStep(slice, n1, n2, dir) |
+        dir != Other() and
+        dir != Id() and
+        (dir = Up() implies not singleLineBlockStep(slice, n2, _, Down()))
+      )
+    )
+  }
+
+  private string outgoingArrow(ControlFlowNode n) {
+    exists(Dir dir | singleLineBlockStep(_, n, _, dir) |
+      dir = Down() and result = " -V "
+      or
+      dir = Up() and result = " -^ "
+      or
+      dir = Right() and result = " -> "
+      or
+      dir = Id() and result = " -I "
+      or
+      dir = Other() and result = " -? "
+    )
+  }
+
+  /** Provides a query for dumping every line-based slice of a basic block. */
+  module BlockSlices {
+    /**
+     * Holds if `blockSlice` is a string representation of a `line` slice of a
+     * basic block. `first` is the first node in the slice.
+     */
+    query predicate blockSlice(int line, ControlFlowNode first, string blockSlice) {
+      exists(Slice slice |
+        first = slice.getNode(0) and
+        line = slice.getLine() and
+        blockSlice =
+          "'" +
+            strictconcat(ControlFlowNode n, int i, int j, string s |
+              slice.getNode(i) = n and
+              (
+                j = 0 and s = n.toString()
+                or
+                j = 1 and s = outgoingArrow(n)
+              )
+            |
+              s order by i, j
+            ) + "'"
+      )
+    }
+  }
+
+  final private class FinalControlFlowNode = ControlFlowNode;
+
+  /** A `ControlFlowNode` with its location trimmed to a single line. */
+  class ControlFlowNode1line extends FinalControlFlowNode {
+    /**
+     * Holds if this element is at the specified location.
+     * The location spans column `sc` of line `sl` to
+     * column `ec` of line `el` in file `file`.
+     * For more information, see
+     * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+     */
+    predicate hasLocationInfo(string file, int sl, int sc, int el, int ec) {
+      exists(int el0, int ec0 |
+        super.getLocation().hasLocationInfo(file, sl, sc, el0, ec0) and
+        if el0 != sl then el = sl and ec = sc else (el = el0 and ec = ec0)
+      )
+    }
+  }
+
+  /**
+   * Holds if `blockSlice` is a string representation of a line slice of a
+   * basic block that does not follow simple left-to-right evaluation order.
+   * `first` is the first node in the slice.
+   */
+  query predicate nonSimple(ControlFlowNode1line first, string blockSlice) {
+    exists(Slice slice |
+      BlockSlices::blockSlice(_, first, blockSlice) and
+      slice.getNode(0) = first and
+      not simpleLeftToRightBlock(slice)
+    )
+  }
+
+  /**
+   * Holds if some AST node on `line` has a corresponding CFG node within the
+   * callable `c`.
+   */
+  private predicate lineHasCfg(int line, Callable c) {
+    exists(ControlFlowNode n, Location loc |
+      n.getLocation() = loc and
+      loc.getStartLine() = line and
+      oneline(loc) and
+      n.injects(_) and
+      n.getEnclosingCallable() = c
+    )
+  }
+
+  /**
+   * Holds if `n1` and `n2` are consecutive nodes in a basic block (skipping
+   * over non-AST nodes), but are located on different lines, such that `n1`
+   * and `n2` link two line slices of a basic block. Additionally, the link is
+   * required to be non-trivial in the sense that it either goes backwards (the
+   * `lineDelta` is negative) or it skips over some lines with other CFG nodes.
+   */
+  private predicate nonTrivialSliceLink(
+    int line, ControlFlowNode n1, ControlFlowNode n2, int lineDelta
+  ) {
+    line = n1.getLocation().getStartLine() and
+    exists(BasicBlock bb |
+      n1 = any(Slice slice).getLast() and
+      bbRank(n1, bb) + 1 = bbRank(n2, bb)
+    ) and
+    lineDelta = n2.getLocation().getStartLine() - n1.getLocation().getStartLine() and
+    (lineDelta < 0 or lineHasCfg([line + 1 .. line + lineDelta - 1], n1.getEnclosingCallable()))
+  }
+
+  bindingset[lineDelta]
+  private string ppDelta(int lineDelta) {
+    if lineDelta < 0
+    then result = "(" + lineDelta.toString() + ")"
+    else result = "(+" + lineDelta.toString() + ")"
+  }
+
+  /**
+   * Holds if the line slice ending at `n1` continues to another line slice via
+   * a non-trivial link. That is, it does not simply continue to the next line.
+   */
+  query predicate bbContinues(ControlFlowNode1line n1, string link) {
+    exists(ControlFlowNode n2, int lineDelta |
+      nonTrivialSliceLink(_, n1, n2, lineDelta) and
+      link = "'" + n1.toString() + " goto " + n2.toString() + ppDelta(lineDelta) + "'"
+    )
+  }
+
+  /**
+   * Holds if `bb` only includes synthetic nodes, that is, no AST nodes are
+   * canonically represented in it.
+   */
+  private predicate synthBlock(BasicBlock bb) { not exists(bbRank(_, bb)) }
+
+  /**
+   * Holds if `bb1` transitively reaches `bb2` through a sequence of basic
+   * block steps where `bb2` is the only non-`synthBlock`.
+   */
+  private predicate synthStep(BasicBlock bb1, BasicBlock bb2, string successorSuffix) {
+    bb1 = bb2 and successorSuffix = "" and not synthBlock(bb2)
+    or
+    exists(BasicBlock mid, SuccessorType t, string s |
+      synthBlock(bb1) and
+      bb1.getASuccessor(t) = mid and
+      synthStep(mid, bb2, s) and
+      if t instanceof DirectSuccessor
+      then successorSuffix = s
+      else successorSuffix = "," + t.toString() + s
+    )
+  }
+
+  /**
+   * Holds if there is a basic block step from `n1` to `n2` with successor
+   * type `t` originating at the given line.
+   */
+  private predicate bbStep(
+    int line, ControlFlowNode n1, ControlFlowNode n2, SuccessorType t, string successorSuffix,
+    int lineDelta
+  ) {
+    exists(int last, BasicBlock bb1, BasicBlock mid, BasicBlock bb2 |
+      line = n1.getLocation().getStartLine() and
+      last = bbRank(n1, bb1) and
+      not last + 1 = bbRank(_, bb1) and
+      bb1.getASuccessor(t) = mid and
+      synthStep(mid, bb2, successorSuffix) and
+      1 = bbRank(n2, bb2) and
+      lineDelta = n2.getLocation().getStartLine() - n1.getLocation().getStartLine()
+    )
+  }
+
+  /**
+   * Holds if there is a basic block step from `n1` described by `next`.
+   */
+  query predicate bbStep(ControlFlowNode1line n1, string next) {
+    exists(ControlFlowNode n2, SuccessorType t, string s, int lineDelta |
+      bbStep(_, n1, n2, t, s, lineDelta) and
+      next = "'" + n1.toString() + " : " + t + s + " -> " + n2.toString() + ppDelta(lineDelta) + "'"
+    )
+  }
+
+  /**
+   * Holds if no CFG nodes exist in `c` on `line` and `a` is an AST node on
+   * that line.
+   */
+  private predicate unreachable(int line, Callable c, AstNode a) {
+    oneline(a.getLocation()) and
+    a.getLocation().getStartLine() = line and
+    Input::getEnclosingCallable(a) = c and
+    not exists(ControlFlowNode n |
+      n.injects(_) and
+      oneline(n.getLocation()) and
+      n.getLocation().getStartLine() = line and
+      n.getEnclosingCallable() = c
+    )
+  }
+
+  /**
+   * Holds if no CFG nodes exist in `c` on `line` and `a` is the first AST
+   * node on that line.
+   */
+  private predicate firstUnreachable(int line, Callable c, AstNode a) {
+    a =
+      min(AstNode a0, Location loc |
+        unreachable(line, c, a0) and loc = a0.getLocation()
+      |
+        a0 order by loc.getStartColumn(), loc.getEndColumn()
+      )
+  }
+
+  /**
+   * Holds if no CFG nodes exist in the callable of `a` on the same line as
+   * `a`, and `a` is the first AST node on that line.
+   */
+  query predicate noCfg(AstNode a) { firstUnreachable(_, _, a) }
+}
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index e4358bf4e80d..46b8479a3155 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 2.0.39-dev
+version: 2.0.46-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/CHANGELOG.md b/shared/dataflow/CHANGELOG.md
index 957500952a2d..33e2cdaa8c48 100644
--- a/shared/dataflow/CHANGELOG.md
+++ b/shared/dataflow/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 2.1.17
+
+No user-facing changes.
+
+## 2.1.16
+
+No user-facing changes.
+
+## 2.1.15
+
+No user-facing changes.
+
+## 2.1.14
+
+No user-facing changes.
+
+## 2.1.13
+
+No user-facing changes.
+
+## 2.1.12
+
+No user-facing changes.
+
+## 2.1.11
+
+No user-facing changes.
+
 ## 2.1.10
 
 No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.1.11.md b/shared/dataflow/change-notes/released/2.1.11.md
new file mode 100644
index 000000000000..16b106c2f6c9
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.1.11.md
@@ -0,0 +1,3 @@
+## 2.1.11
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.1.12.md b/shared/dataflow/change-notes/released/2.1.12.md
new file mode 100644
index 000000000000..f3a0960a2f39
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.1.12.md
@@ -0,0 +1,3 @@
+## 2.1.12
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.1.13.md b/shared/dataflow/change-notes/released/2.1.13.md
new file mode 100644
index 000000000000..52b732297b8c
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.1.13.md
@@ -0,0 +1,3 @@
+## 2.1.13
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.1.14.md b/shared/dataflow/change-notes/released/2.1.14.md
new file mode 100644
index 000000000000..279c7d5ae20c
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.1.14.md
@@ -0,0 +1,3 @@
+## 2.1.14
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.1.15.md b/shared/dataflow/change-notes/released/2.1.15.md
new file mode 100644
index 000000000000..cfd7b37ba5c6
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.1.15.md
@@ -0,0 +1,3 @@
+## 2.1.15
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.1.16.md b/shared/dataflow/change-notes/released/2.1.16.md
new file mode 100644
index 000000000000..7f2c2e7f5eec
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.1.16.md
@@ -0,0 +1,3 @@
+## 2.1.16
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.1.17.md b/shared/dataflow/change-notes/released/2.1.17.md
new file mode 100644
index 000000000000..c8c7d684ff00
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.1.17.md
@@ -0,0 +1,3 @@
+## 2.1.17
+
+No user-facing changes.
diff --git a/shared/dataflow/codeql-pack.release.yml b/shared/dataflow/codeql-pack.release.yml
index 66c655c4b892..31e4c041c750 100644
--- a/shared/dataflow/codeql-pack.release.yml
+++ b/shared/dataflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.1.10
+lastReleaseVersion: 2.1.17
diff --git a/shared/dataflow/codeql/dataflow/VariableCapture.qll b/shared/dataflow/codeql/dataflow/VariableCapture.qll
index 0ba44be5ea1f..b53db9159916 100644
--- a/shared/dataflow/codeql/dataflow/VariableCapture.qll
+++ b/shared/dataflow/codeql/dataflow/VariableCapture.qll
@@ -214,9 +214,11 @@ module Flow<
   final private class CfgBb = Cfg::BasicBlock;
 
   private class BasicBlock extends CfgBb {
+    /** Gets the callable enclosing this basic block. */
     Callable getEnclosingCallable() { result = basicBlockGetEnclosingCallable(this) }
   }
 
+  /** Provides consistency checks for an instantiation of the variable capture library. */
   additional module ConsistencyChecks {
     final private class FinalExpr = Expr;
 
@@ -250,6 +252,10 @@ module Flow<
       }
     }
 
+    /**
+     * Holds if `n` relevant elements have either no textual representation or multiple textual
+     * representations, as described by `msg`.
+     */
     query predicate uniqueToString(string msg, int n) {
       exists(string elem |
         n = strictcount(RelevantBasicBlock bb | not exists(bb.toString())) and
@@ -282,6 +288,9 @@ module Flow<
       )
     }
 
+    /**
+     * Holds if `bb` does not have exactly one enclosing callable, as described by `msg`.
+     */
     query predicate uniqueEnclosingCallable(RelevantBasicBlock bb, string msg) {
       msg = "BasicBlock has no enclosing callable" and not exists(bb.getEnclosingCallable())
       or
@@ -289,38 +298,62 @@ module Flow<
       2 <= strictcount(bb.getEnclosingCallable())
     }
 
+    /**
+     * Holds if `bb` has multiple immediate dominators, as described by `msg`.
+     */
     query predicate uniqueDominator(RelevantBasicBlock bb, string msg) {
       msg = "BasicBlock has multiple immediate dominators" and
       2 <= strictcount(bb.getImmediateDominator())
     }
 
+    /**
+     * Holds if an immediate dominator of `bb` belongs to a different callable, as described by
+     * `msg`.
+     */
     query predicate localDominator(RelevantBasicBlock bb, string msg) {
       msg = "BasicBlock has non-local dominator" and
       bb.getEnclosingCallable() != bb.getImmediateDominator().(BasicBlock).getEnclosingCallable()
     }
 
+    /**
+     * Holds if a successor of `bb` belongs to a different callable, as described by `msg`.
+     */
     query predicate localSuccessor(RelevantBasicBlock bb, string msg) {
       msg = "BasicBlock has non-local successor" and
       bb.getEnclosingCallable() != bb.getASuccessor().(BasicBlock).getEnclosingCallable()
     }
 
+    /**
+     * Holds if captured variable `v` does not have exactly one defining callable, as described by
+     * `msg`.
+     */
     query predicate uniqueDefiningScope(CapturedVariable v, string msg) {
       msg = "CapturedVariable has no defining callable" and not exists(v.getCallable())
       or
       msg = "CapturedVariable has multiple defining callables" and 2 <= strictcount(v.getCallable())
     }
 
+    /**
+     * Holds if `v` is classified as a captured variable but has no access from a capturing
+     * callable, as described by `msg`.
+     */
     query predicate variableIsCaptured(CapturedVariable v, string msg) {
       msg = "CapturedVariable is not captured" and
       not captureAccess(v, _)
     }
 
+    /**
+     * Holds if relevant expression `e` does not have exactly one location, as described by `msg`.
+     */
     query predicate uniqueLocation(RelevantExpr e, string msg) {
       msg = "Expr has no location" and not exists(e.getLocation())
       or
       msg = "Expr has multiple locations" and 2 <= strictcount(e.getLocation())
     }
 
+    /**
+     * Holds if relevant expression `e` does not have exactly one CFG node, as described by `msg`.
+     */
     query predicate uniqueCfgNode(RelevantExpr e, string msg) {
       msg = "Expr has no cfg node" and not e.hasCfgNode(_, _)
       or
@@ -334,6 +367,10 @@ module Flow<
       msg = "VariableWrite has multiple target variables" and 2 <= strictcount(vw.getVariable())
     }
 
+    /**
+     * Holds if a captured-variable write does not have exactly one target variable, as described
+     * by `msg`.
+     */
     query predicate uniqueWriteTarget(string msg) { uniqueWriteTarget(_, msg) }
 
     private predicate uniqueWriteCfgNode(VariableWrite vw, string msg) {
@@ -343,18 +380,33 @@ module Flow<
       2 <= strictcount(BasicBlock bb, int i | vw.hasCfgNode(bb, i))
     }
 
+    /**
+     * Holds if a captured-variable write does not have exactly one CFG node, as described by
+     * `msg`.
+     */
     query predicate uniqueWriteCfgNode(string msg) { uniqueWriteCfgNode(_, msg) }
 
+    /**
+     * Holds if variable read `vr` does not have exactly one source variable, as described by
+     * `msg`.
+     */
     query predicate uniqueReadVariable(VariableRead vr, string msg) {
       msg = "VariableRead has no source variable" and not exists(vr.getVariable())
       or
       msg = "VariableRead has multiple source variables" and 2 <= strictcount(vr.getVariable())
     }
 
+    /**
+     * Holds if closure expression `ce` has no callable body, as described by `msg`.
+     */
     query predicate closureMustHaveBody(ClosureExpr ce, string msg) {
       msg = "ClosureExpr has no body" and not ce.hasBody(_)
     }
 
+    /**
+     * Holds if `access` is an alias of closure expression `ce` outside the lexical scope of `ce`,
+     * as described by `msg`.
+     */
     query predicate closureAliasMustBeInSameScope(ClosureExpr ce, Expr access, string msg) {
       exists(BasicBlock bb1, BasicBlock bb2 |
         ce.hasAliasedAccess(access) and
@@ -372,6 +424,10 @@ module Flow<
       )
     }
 
+    /**
+     * Holds if callable `c` accesses captured variable `v` but is not lexically nested in the
+     * callable that defines `v`, as described by `msg`.
+     */
     query predicate variableAccessAstNesting(CapturedVariable v, Callable c, string msg) {
       exists(BasicBlock bb, Callable parent |
         captureRead(v, bb, _, false, _) or captureWrite(v, bb, _, false, _)
@@ -383,12 +439,20 @@ module Flow<
       )
     }
 
+    /**
+     * Holds if relevant callable `c` does not have exactly one location, as described by `msg`.
+     */
     query predicate uniqueCallableLocation(RelevantCallable c, string msg) {
       msg = "Callable has no location" and not exists(c.getLocation())
       or
       msg = "Callable has multiple locations" and 2 <= strictcount(c.getLocation())
     }
 
+    import SsaFlow::DfConsistency
+
+    /**
+     * Holds if `n` elements violate a variable capture consistency check, as described by `msg`.
+     */
     query predicate consistencyOverview(string msg, int n) {
       uniqueToString(msg, n) or
       n = strictcount(BasicBlock bb | uniqueEnclosingCallable(bb, msg)) or
@@ -481,6 +545,7 @@ module Flow<
   }
 
   /** Gets the enclosing callable of `ce`. */
+  pragma[nomagic]
   private Callable closureExprGetEnclosingCallable(ClosureExpr ce) {
     exists(BasicBlock bb | ce.hasCfgNode(bb, _) and result = bb.getEnclosingCallable())
   }
@@ -494,6 +559,13 @@ module Flow<
     )
   }
 
+  /** Holds if `outer` contains or equals `inner` */
+  bindingset[outer, inner]
+  pragma[inline_late]
+  private predicate isEnclosingCallable(Callable outer, Callable inner) {
+    outer = callableGetEnclosingCallable*(inner)
+  }
+
   /**
    * Gets a callable that contains `ce`, or a reference to `ce` into which `ce` could be inlined without
    * bringing any variables out of scope.
@@ -510,7 +582,7 @@ module Flow<
       expr.hasCfgNode(bb, _) and
       result = bb.getEnclosingCallable() and
       // The reference to `ce` is allowed to occur in a more deeply nested context
-      closureExprGetEnclosingCallable(ce) = callableGetEnclosingCallable*(result)
+      isEnclosingCallable(closureExprGetEnclosingCallable(ce), result)
     )
   }
 
@@ -789,6 +861,7 @@ module Flow<
   private class TSynthesizedCaptureNode = TSynthRead or TSynthThisQualifier or TSynthSsa;
 
   class SynthesizedCaptureNode extends ClosureNode, TSynthesizedCaptureNode {
+    /** Gets the basic block containing this synthesized capture node. */
     BasicBlock getBasicBlock() {
       this = TSynthRead(_, result, _, _)
       or
@@ -810,6 +883,19 @@ module Flow<
       or
       exists(SsaFlow::SsaNode n | this = TSynthSsa(n) and n.getSourceVariable() = TThis(_))
     }
+
+    /**
+     * Holds if this is the synthesized capture node at index `i` in basic block `bb`.
+     */
+    predicate hasCfgNode(BasicBlock bb, int i) {
+      this = TSynthRead(_, bb, i, _)
+      or
+      this = TSynthThisQualifier(bb, i, _)
+      or
+      exists(SsaFlow::SsaNode n |
+        this = TSynthSsa(n) and n.getBasicBlock() = bb and n.getIndex() = i
+      )
+    }
   }
 
   class ExprNode extends ClosureNode, TExprNode {
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
index 3af6b9eab99a..e467e6caa708 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -370,6 +370,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         }
 
         class Ap {
+          /** Gets the tracked length of this access path, if any. */
+          int length();
+
           string toString();
         }
 
@@ -561,6 +564,20 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           )
         }
 
+        pragma[nomagic]
+        private int getAnApLengthLowerBound(Ap ap) {
+          accessPathLimit() != 0 and // `accessPathLimit() = 0` is already checked in `useFieldFlow`
+          result = ap.length()
+          or
+          not exists(ap.length()) and
+          exists(Ap tail |
+            fwdFlowConsCand(_, ap, _, _, tail) and
+            ap != tail and // no need to report a longer length
+            result = 1 + getAnApLengthLowerBound(tail) and
+            result <= accessPathLimit()
+          )
+        }
+
         pragma[nomagic]
         private predicate fwdFlow0(
           Nd node, Cc cc, SummaryCtx summaryCtx, Typ t, Ap ap, ApApprox apa, TypOption stored
@@ -594,7 +611,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           exists(Content c, Ap ap0 |
             fwdFlowStore(_, _, ap0, _, c, t, stored, node, cc, summaryCtx) and
             ap = apCons(c, ap0) and
-            apa = getApprox(ap)
+            apa = getApprox(ap) and
+            getAnApLengthLowerBound(ap0) < accessPathLimit()
           )
           or
           // read
@@ -1320,6 +1338,20 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           fwdFlow(node, _, _, _, ap, _)
         }
 
+        pragma[nomagic]
+        private int getAnApLengthLowerBoundRev(Ap ap) {
+          accessPathLimit() != 0 and // `accessPathLimit() = 0` is already checked in `useFieldFlow`
+          result = ap.length()
+          or
+          not exists(ap.length()) and
+          exists(Ap tail |
+            revFlowConsCand(ap, _, tail) and
+            ap != tail and // no need to report a longer length
+            result = 1 + getAnApLengthLowerBoundRev(tail) and
+            result <= accessPathLimit()
+          )
+        }
+
         pragma[nomagic]
         private predicate revFlow0(Nd node, ReturnCtx returnCtx, ApOption returnAp, Ap ap) {
           fwdFlow(node, _, any(SummaryCtx sinkCtx | sinkCtx.isASinkCtx()), _, ap, _) and
@@ -1356,7 +1388,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           // read
           exists(Nd mid, Ap ap0 |
             revFlow(mid, returnCtx, returnAp, ap0) and
-            readStepFwd(node, ap, _, mid, ap0)
+            readStepFwd(node, ap, _, mid, ap0) and
+            getAnApLengthLowerBoundRev(ap0) < accessPathLimit()
           )
           or
           // flow into a callable
@@ -2736,7 +2769,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
       class Typ = Unit;
 
-      class Ap = Boolean;
+      class Ap extends Boolean {
+        int length() { this = false and result = 0 }
+      }
 
       class ApNil extends Ap {
         ApNil() { this = false }
@@ -2825,12 +2860,19 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       Typ getTyp(Type t) { any() }
 
       bindingset[c, tail]
-      Ap apCons(Content c, Ap tail) { result.getAHead() = c and exists(tail) }
+      Ap apCons(Content c, Ap tail) {
+        exists(int length | result.getAHead(length) = c |
+          length = 1 and
+          tail instanceof ApNil
+          or
+          tail = TApproxFrontHead(_, length - 1)
+        )
+      }
 
       class ApHeadContent = ContentApprox;
 
       pragma[noinline]
-      ApHeadContent getHeadContent(Ap ap) { result = ap.getHead() }
+      ApHeadContent getHeadContent(Ap ap) { result = ap.getHead(_) }
 
       predicate projectToHeadContent = getContentApproxCached/1;
 
@@ -2876,7 +2918,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           PrevStage::revFlow(node) and
           PrevStage::readStepCand(_, c, _) and
           Stage1::expectsContentEx(node, c) and
-          c = ap.getAHead()
+          c = ap.getAHead(_)
         )
       }
 
@@ -2927,12 +2969,19 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       Typ getTyp(Type t) { any() }
 
       bindingset[c, tail]
-      Ap apCons(Content c, Ap tail) { result.getHead() = c and exists(tail) }
+      Ap apCons(Content c, Ap tail) {
+        exists(int length | result.getHead(length) = c |
+          length = 1 and
+          tail instanceof ApNil
+          or
+          tail = TFrontHead(_, length - 1)
+        )
+      }
 
       class ApHeadContent = Content;
 
       pragma[noinline]
-      ApHeadContent getHeadContent(Ap ap) { result = ap.getHead() }
+      ApHeadContent getHeadContent(Ap ap) { result = ap.getHead(_) }
 
       ApHeadContent projectToHeadContent(Content c) { result = c }
 
@@ -2978,11 +3027,11 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         // When `node` is the target of a store, we interpret `clearsContent` as
         // only pertaining to _earlier_ store steps. In this case, we need to postpone
         // checking `clearsContent` to the step creation.
-        clearContent(node, ap.getHead(), false)
+        clearContent(node, ap.getHead(_), false)
       }
 
       pragma[nomagic]
-      private predicate clearExceptStore(Nd node, Ap ap) { clearContent(node, ap.getHead(), true) }
+      private predicate clearExceptStore(Nd node, Ap ap) { clearContent(node, ap.getHead(_), true) }
 
       pragma[nomagic]
       private predicate expectsContentCand(Nd node, Ap ap) {
@@ -2990,7 +3039,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           PrevStage::revFlow(node) and
           PrevStage::readStepCand(_, c, _) and
           Stage1::expectsContentEx(node, c) and
-          c = ap.getHead()
+          c = ap.getHead(_)
         )
       }
 
@@ -3025,9 +3074,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         tails = strictcount(AccessPathFront apf | Stage4::consCand(c, apf)) and
         nodes =
           strictcount(Nd n |
-            Stage4::revFlow(n, any(AccessPathFrontHead apf | apf.getHead() = c))
+            Stage4::revFlow(n, any(AccessPathFrontHead apf | apf.getHead(_) = c))
             or
-            Stage4::nodeMayUseSummary(n, any(AccessPathFrontHead apf | apf.getHead() = c))
+            Stage4::nodeMayUseSummary(n, any(AccessPathFrontHead apf | apf.getHead(_) = c))
           ) and
         accessPathApproxCostLimits(apLimit, tupleLimit) and
         apLimit < tails and
@@ -3043,7 +3092,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         not expensiveLen2unfolding(c)
       } or
       TConsCons(Content c1, Content c2, int len) {
-        Stage4::consCand(c1, TFrontHead(c2)) and
+        Stage4::consCand(c1, TFrontHead(c2, len - 1)) and
         len in [2 .. Config::accessPathLimit()] and
         not expensiveLen2unfolding(c1)
       } or
@@ -3064,7 +3113,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
       abstract Content getHead();
 
-      abstract int len();
+      abstract int length();
 
       abstract AccessPathFront getFront();
 
@@ -3077,7 +3126,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
       override Content getHead() { none() }
 
-      override int len() { result = 0 }
+      override int length() { result = 0 }
 
       override AccessPathFront getFront() { result = TFrontNil() }
 
@@ -3095,9 +3144,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
       override Content getHead() { result = c }
 
-      override int len() { result = 1 }
+      override int length() { result = 1 }
 
-      override AccessPathFront getFront() { result = TFrontHead(c) }
+      override AccessPathFront getFront() { result = TFrontHead(c, 1) }
 
       override predicate isCons(Content head, AccessPathApprox tail) { head = c and tail = TNil() }
     }
@@ -3117,9 +3166,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
       override Content getHead() { result = c1 }
 
-      override int len() { result = len }
+      override int length() { result = len }
 
-      override AccessPathFront getFront() { result = TFrontHead(c1) }
+      override AccessPathFront getFront() { result = TFrontHead(c1, len) }
 
       override predicate isCons(Content head, AccessPathApprox tail) {
         head = c1 and
@@ -3148,14 +3197,14 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
       override Content getHead() { result = c }
 
-      override int len() { result = len }
+      override int length() { result = len }
 
-      override AccessPathFront getFront() { result = TFrontHead(c) }
+      override AccessPathFront getFront() { result = TFrontHead(c, len) }
 
       override predicate isCons(Content head, AccessPathApprox tail) {
         head = c and
         (
-          exists(Content c2 | Stage4::consCand(c, TFrontHead(c2)) |
+          exists(Content c2 | Stage4::consCand(c, TFrontHead(c2, len - 1)) |
             tail = TConsCons(c2, _, len - 1)
             or
             len = 2 and
@@ -3254,7 +3303,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
     pragma[nomagic]
     private predicate stage5ConsCand(Content c, AccessPathFront apf, int len) {
-      Stage5::consCand(c, any(AccessPathApprox ap | ap.getFront() = apf and ap.len() = len - 1))
+      Stage5::consCand(c, any(AccessPathApprox ap | ap.getFront() = apf and ap.length() = len - 1))
     }
 
     /**
@@ -3263,7 +3312,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
     private int count1to2unfold(AccessPathApproxCons1 apa) {
       exists(Content c, int len |
         c = apa.getHead() and
-        len = apa.len() and
+        len = apa.length() and
         result = strictcount(AccessPathFront apf | stage5ConsCand(c, apf, len))
       )
     }
@@ -3358,7 +3407,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         exists(AccessPathApproxCons apa, AccessPathApprox tail |
           evalUnfold(apa, false) and
           not expensiveLen1to2unfolding(apa) and
-          apa.len() = len and
+          apa.length() = len and
           hasTail(apa, tail) and
           head1 = apa.getHead() and
           head2 = tail.getHead()
@@ -3368,7 +3417,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         exists(AccessPathApproxCons apa |
           evalUnfold(apa, false) and
           expensiveLen1to2unfolding(apa) and
-          apa.len() = len and
+          apa.length() = len and
           head = apa.getHead()
         )
       }
@@ -3497,7 +3546,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
       override predicate isCons(Content head, AccessPath tail) { head = head_ and tail = tail_ }
 
-      override AccessPathFrontHead getFront() { result = TFrontHead(head_) }
+      override AccessPathFrontHead getFront() { result = TFrontHead(head_, this.length()) }
 
       override AccessPathApproxCons getApprox() {
         result = TConsNil(head_) and tail_ = TAccessPathNil()
@@ -3552,7 +3601,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         tail.length() = len - 1
       }
 
-      override AccessPathFrontHead getFront() { result = TFrontHead(head1) }
+      override AccessPathFrontHead getFront() { result = TFrontHead(head1, len) }
 
       override AccessPathApproxCons getApprox() {
         result = TConsCons(head1, head2, len) or
@@ -3584,7 +3633,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         tail.length() = len - 1
       }
 
-      override AccessPathFrontHead getFront() { result = TFrontHead(head_) }
+      override AccessPathFrontHead getFront() { result = TFrontHead(head_, len) }
 
       override AccessPathApproxCons getApprox() { result = TCons1(head_, len) }
 
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
index c64f0edb8468..8d77198e5721 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
@@ -1797,12 +1797,12 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     cached
     newtype TAccessPathFront =
       TFrontNil() or
-      TFrontHead(Content c)
+      TFrontHead(Content c, int length) { length in [1 .. accessPathLimit()] }
 
     cached
     newtype TApproxAccessPathFront =
       TApproxFrontNil() or
-      TApproxFrontHead(ContentApprox c)
+      TApproxFrontHead(ContentApprox c, int length) { length in [1 .. accessPathLimit()] }
 
     cached
     newtype TAccessPathFrontOption =
@@ -2505,31 +2505,33 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
 
     abstract boolean toBoolNonEmpty();
 
-    ContentApprox getHead() { this = TApproxFrontHead(result) }
+    abstract int length();
+
+    ContentApprox getHead(int length) { this = TApproxFrontHead(result, length) }
 
     pragma[nomagic]
-    Content getAHead() {
-      exists(ContentApprox cont |
-        this = TApproxFrontHead(cont) and
-        cont = getContentApproxCached(result)
-      )
-    }
+    Content getAHead(int length) { this.getHead(length) = getContentApproxCached(result) }
   }
 
   class ApproxAccessPathFrontNil extends ApproxAccessPathFront, TApproxFrontNil {
     override string toString() { result = "nil" }
 
     override boolean toBoolNonEmpty() { result = false }
+
+    override int length() { result = 0 }
   }
 
   class ApproxAccessPathFrontHead extends ApproxAccessPathFront, TApproxFrontHead {
     private ContentApprox c;
+    private int length;
 
-    ApproxAccessPathFrontHead() { this = TApproxFrontHead(c) }
+    ApproxAccessPathFrontHead() { this = TApproxFrontHead(c, length) }
 
-    override string toString() { result = c.toString() }
+    override string toString() { result = c + " (length: " + length + ")" }
 
     override boolean toBoolNonEmpty() { result = true }
+
+    override int length() { result = length }
   }
 
   /** An optional approximated access path front. */
@@ -2549,23 +2551,30 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
 
     abstract ApproxAccessPathFront toApprox();
 
-    Content getHead() { this = TFrontHead(result) }
+    abstract int length();
+
+    Content getHead(int length) { this = TFrontHead(result, length) }
   }
 
   class AccessPathFrontNil extends AccessPathFront, TFrontNil {
     override string toString() { result = "nil" }
 
     override ApproxAccessPathFront toApprox() { result = TApproxFrontNil() }
+
+    override int length() { result = 0 }
   }
 
   class AccessPathFrontHead extends AccessPathFront, TFrontHead {
     private Content c;
+    private int length;
+
+    AccessPathFrontHead() { this = TFrontHead(c, length) }
 
-    AccessPathFrontHead() { this = TFrontHead(c) }
+    override string toString() { result = c + " (length: " + length + ")" }
 
-    override string toString() { result = c.toString() }
+    override ApproxAccessPathFront toApprox() { result.getAHead(length) = c }
 
-    override ApproxAccessPathFront toApprox() { result.getAHead() = c }
+    override int length() { result = length }
   }
 
   /** An optional access path front. */
diff --git a/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll b/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
index b0828c3384bb..55141831f9e7 100644
--- a/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
@@ -19,30 +19,15 @@ signature module InputSig<LocationSig Location, DF::InputSig<Location> Lang> {
   class SummarizedCallableBase {
     bindingset[this]
     string toString();
+
+    bindingset[this]
+    Location getLocation();
   }
 
   /** Holds if `c` is defined in source code. */
   bindingset[c]
   predicate callableFromSource(SummarizedCallableBase c);
 
-  /**
-   * A base class of elements that are candidates for flow source modeling.
-   */
-  bindingset[this]
-  class SourceBase {
-    bindingset[this]
-    string toString();
-  }
-
-  /**
-   * A base class of elements that are candidates for flow sink modeling.
-   */
-  bindingset[this]
-  class SinkBase {
-    bindingset[this]
-    string toString();
-  }
-
   /**
    * Holds if a neutral (MaD) model exists for `c` of kind `kind`
    * with provenance `provenance` and `isExact` is true if the model
@@ -59,15 +44,15 @@ signature module InputSig<LocationSig Location, DF::InputSig<Location> Lang> {
    */
   class FlowSummaryCallBase {
     string toString();
+
+    Location getLocation();
   }
 
   /** Gets a call that targets summarized callable `sc`. */
   default FlowSummaryCallBase getASourceCall(SummarizedCallableBase sc) { none() }
 
   /** Gets the callable corresponding to summarized callable `c`. */
-  default Lang::DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
-    none()
-  }
+  Lang::DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c);
 
   /** Gets the enclosing callable of `call`. */
   default Lang::DataFlowCallable getSourceCallEnclosingCallable(FlowSummaryCallBase call) { none() }
@@ -218,10 +203,6 @@ module Make<
 
   final private class SummarizedCallableBaseFinal = SummarizedCallableBase;
 
-  final private class SourceBaseFinal = SourceBase;
-
-  final private class SinkBaseFinal = SinkBase;
-
   /** Provides classes and predicates for defining flow summaries. */
   module Public {
     private import Private
@@ -364,7 +345,7 @@ module Make<
     }
 
     /** A source element. */
-    abstract class SourceElement extends SourceBaseFinal {
+    abstract class SourceElement extends SummarizedCallableBaseFinal {
       bindingset[this]
       SourceElement() { any() }
 
@@ -373,11 +354,13 @@ module Make<
        * flows out as described by `output`.
        */
       pragma[nomagic]
-      abstract predicate isSource(string output, string kind, Provenance provenance, string model);
+      abstract predicate isSource(
+        string output, string kind, Provenance provenance, boolean isExact, string model
+      );
     }
 
     /** A sink element. */
-    abstract class SinkElement extends SinkBaseFinal {
+    abstract class SinkElement extends SummarizedCallableBaseFinal {
       bindingset[this]
       SinkElement() { any() }
 
@@ -386,11 +369,13 @@ module Make<
        * flows in as described by `input`.
        */
       pragma[nomagic]
-      abstract predicate isSink(string input, string kind, Provenance provenance, string model);
+      abstract predicate isSink(
+        string input, string kind, Provenance provenance, boolean isExact, string model
+      );
     }
 
     /** A barrier element. */
-    abstract class BarrierElement extends SourceBaseFinal {
+    abstract class BarrierElement extends SummarizedCallableBaseFinal {
       bindingset[this]
       BarrierElement() { any() }
 
@@ -399,11 +384,13 @@ module Make<
        * flows out as described by `output`.
        */
       pragma[nomagic]
-      abstract predicate isBarrier(string output, string kind, Provenance provenance, string model);
+      abstract predicate isBarrier(
+        string output, string kind, Provenance provenance, boolean isExact, string model
+      );
     }
 
     /** A barrier guard element. */
-    abstract class BarrierGuardElement extends SinkBaseFinal {
+    abstract class BarrierGuardElement extends SummarizedCallableBaseFinal {
       bindingset[this]
       BarrierGuardElement() { any() }
 
@@ -413,7 +400,8 @@ module Make<
        */
       pragma[nomagic]
       abstract predicate isBarrierGuard(
-        string input, string acceptingValue, string kind, Provenance provenance, string model
+        string input, string acceptingValue, string kind, Provenance provenance, boolean isExact,
+        string model
       );
     }
 
@@ -527,6 +515,51 @@ module Make<
   module Private {
     private import Public
 
+    private signature predicate modelSig(
+      SummarizedCallableBase c, string kind, Provenance provenance, string model, boolean isExact,
+      string modelKind
+    );
+
+    private module RelevantModel<modelSig/6 model> {
+      /**
+       * Holds if the model described by the parameters is relevant. A model may be
+       * irrelevant if a more specific model exists.
+       */
+      predicate isRelevantModel(
+        SummarizedCallableBase c, string kind, Provenance provenance, string model, boolean isExact
+      ) {
+        exists(string modelKind |
+          model(c, kind, provenance, model, isExact, modelKind) and
+          if provenance.isGenerated() or isExact = false
+          then
+            // Only apply generated models to functions in library code
+            not (provenance.isGenerated() and callableFromSource(c)) and
+            // Only apply generated or inexact models when no strictly better model exists
+            not exists(Provenance other, boolean isExactOther |
+              model(c, _, other, _, isExactOther, modelKind)
+              or
+              neutralElement(c, modelKind, other, isExactOther)
+            |
+              provenance.isGenerated() and other.isManual()
+              or
+              provenance.getVerification() = other.getVerification() and
+              isExact = false and
+              isExactOther = true
+            )
+          else any()
+        )
+      }
+    }
+
+    private predicate summaryModel(
+      SummarizedCallableBase c, string kind, Provenance p, string model, boolean isExact,
+      string modelKind
+    ) {
+      c.(SummarizedCallable).propagatesFlow(_, _, _, p, isExact, model) and
+      kind = "(unused)" and
+      modelKind = "summary"
+    }
+
     /**
      * Holds if `c` has a relevant flow summary.
      *
@@ -543,23 +576,7 @@ module Make<
       boolean isExact, string model
     ) {
       c.propagatesFlow(input, output, preservesValue, p, isExact, model) and
-      if p.isGenerated() or isExact = false
-      then
-        // Only apply generated models to functions in library code
-        not (p.isGenerated() and callableFromSource(c)) and
-        // Only apply generated or inexact models when no strictly better model exists
-        not exists(Provenance other, boolean isExactOther |
-          c.propagatesFlow(_, _, _, other, isExactOther, _)
-          or
-          neutralElement(c, "summary", other, isExactOther)
-        |
-          p.isGenerated() and other.isManual()
-          or
-          p.getVerification() = other.getVerification() and
-          isExact = false and
-          isExactOther = true
-        )
-      else any()
+      RelevantModel<summaryModel/6>::isRelevantModel(c, _, p, model, isExact)
     }
 
     /**
@@ -752,55 +769,85 @@ module Make<
       unsupportedCallable(callable, _, _, _)
     }
 
+    private predicate sourceModel(
+      SummarizedCallableBase c, string kind, Provenance p, string model, boolean isExact,
+      string modelKind
+    ) {
+      c.(SourceElement).isSource(_, kind, p, isExact, model) and
+      modelKind = "source"
+    }
+
     private predicate isRelevantSource(
       SourceElement e, string output, string kind, Provenance provenance, string model
     ) {
-      e.isSource(output, kind, provenance, model) and
-      (
-        provenance.isManual()
-        or
-        provenance.isGenerated() and
-        not exists(Provenance p | p.isManual() and e.isSource(_, kind, p, _))
+      exists(boolean isExact |
+        e.isSource(output, kind, provenance, isExact, model) and
+        RelevantModel<sourceModel/6>::isRelevantModel(e, kind, provenance, model, isExact)
       )
     }
 
+    private predicate sinkModel(
+      SummarizedCallableBase c, string kind, Provenance p, string model, boolean isExact,
+      string modelKind
+    ) {
+      c.(SinkElement).isSink(_, kind, p, isExact, model) and
+      modelKind = "sink"
+    }
+
     private predicate isRelevantSink(
       SinkElement e, string input, string kind, Provenance provenance, string model
     ) {
-      e.isSink(input, kind, provenance, model) and
-      (
-        provenance.isManual()
-        or
-        provenance.isGenerated() and
-        not exists(Provenance p | p.isManual() and e.isSink(_, kind, p, _))
+      exists(boolean isExact |
+        e.isSink(input, kind, provenance, isExact, model) and
+        RelevantModel<sinkModel/6>::isRelevantModel(e, kind, provenance, model, isExact)
       )
     }
 
+    private predicate barrierModel(
+      SummarizedCallableBase c, string kind, Provenance p, string model, boolean isExact,
+      string modelKind
+    ) {
+      c.(BarrierElement).isBarrier(_, kind, p, isExact, model) and
+      modelKind = "barrier"
+    }
+
     private predicate isRelevantBarrier(
       BarrierElement e, string output, string kind, Provenance provenance, string model
     ) {
-      e.isBarrier(output, kind, provenance, model) and
-      (
-        provenance.isManual()
-        or
-        provenance.isGenerated() and
-        not exists(Provenance p | p.isManual() and e.isBarrier(_, kind, p, _))
+      exists(boolean isExact |
+        e.isBarrier(output, kind, provenance, isExact, model) and
+        RelevantModel<barrierModel/6>::isRelevantModel(e, kind, provenance, model, isExact)
       )
     }
 
+    private predicate barrierGuardModel(
+      SummarizedCallableBase c, string kind, Provenance p, string model, boolean isExact,
+      string modelKind
+    ) {
+      c.(BarrierGuardElement).isBarrierGuard(_, _, kind, p, isExact, model) and
+      modelKind = "barrier-guard"
+    }
+
     private predicate isRelevantBarrierGuard(
       BarrierGuardElement e, string input, string acceptingValue, string kind,
       Provenance provenance, string model
     ) {
-      e.isBarrierGuard(input, acceptingValue, kind, provenance, model) and
-      (
-        provenance.isManual()
-        or
-        provenance.isGenerated() and
-        not exists(Provenance p | p.isManual() and e.isBarrierGuard(_, _, kind, p, _))
+      exists(boolean isExact |
+        e.isBarrierGuard(input, acceptingValue, kind, provenance, isExact, model) and
+        RelevantModel<barrierGuardModel/6>::isRelevantModel(e, kind, provenance, model, isExact)
       )
     }
 
+    private string sourceMarker() { result = "SOURCEMARKER" }
+
+    private string sinkMarker() { result = "SINKMARKER" }
+
+    bindingset[s]
+    private string addSourceMarker(string s) { result = sourceMarker() + "." + s }
+
+    bindingset[s]
+    private string addSinkMarker(string s) { result = sinkMarker() + "." + s }
+
     private predicate flowSpec(string spec) {
       exists(SummarizedCallable c |
         c.propagatesFlow(spec, _, _, _, _, _)
@@ -808,16 +855,126 @@ module Make<
         c.propagatesFlow(_, spec, _, _, _, _)
       )
       or
-      isRelevantSource(_, spec, _, _, _)
+      exists(string sourceSpec |
+        spec = addSourceMarker(sourceSpec) and
+        isRelevantSource(_, sourceSpec, _, _, _)
+      )
       or
       isRelevantBarrier(_, spec, _, _, _)
       or
       isRelevantBarrierGuard(_, spec, _, _, _, _)
       or
-      isRelevantSink(_, spec, _, _, _)
+      exists(string sinkSpec |
+        spec = addSinkMarker(sinkSpec) and
+        isRelevantSink(_, sinkSpec, _, _, _)
+      )
+    }
+
+    private module Ap = AccessPathSyntax::AccessPath<flowSpec/1>;
+
+    import Ap
+
+    class AccessPath extends Ap::AccessPath {
+      AccessPathToken getToken(int n) { result = super.getToken(n) }
+
+      int getNumToken() { result = super.getNumToken() }
+    }
+
+    abstract private class SourceOrSinkAccessPath extends AccessPath {
+      AccessPathToken getTokenExclMarker(int n) {
+        result = super.getToken(n + 1) and
+        n >= 0
+      }
+
+      private predicate hasContentAt(int pos) {
+        exists(External::interpretContent(this.getTokenExclMarker(pos)))
+      }
+
+      int getFirstContentToken() {
+        this.hasContentAt(result) and
+        not this.hasContentAt(result - 1)
+      }
+
+      override int getNumToken() {
+        result = super.getNumToken() - 1 // account for the marker
+      }
+    }
+
+    /**
+     * For a source access path like
+     *
+     * ```
+     * Argument[0].Parameter[1].Field[A].Field[B]
+     * ```
+     *
+     * we rewrite it into
+     *
+     * ```
+     * Parameter[1].Argument[0].Field[A].Field[B]
+     * ```
+     *
+     * which allows us to process the stack top-down, first performing a store into `B`,
+     * then a store into `A`, and finally a step from a callback argument at position 0
+     * to its parameter at position 1.
+     */
+    private class SourceAccessPath extends SourceOrSinkAccessPath, AccessPath {
+      SourceAccessPath() { AccessPath.super.getToken(0) = sourceMarker() }
+
+      override AccessPathToken getToken(int n) {
+        not exists(this.getFirstContentToken()) and
+        exists(int i |
+          i = this.getNumToken() - 1 and
+          result = this.getTokenExclMarker(i - n)
+        )
+        or
+        exists(int first | first = this.getFirstContentToken() |
+          result = this.getTokenExclMarker(n) and
+          n >= first
+          or
+          result = this.getTokenExclMarker(first - n - 1) and
+          n >= 0
+        )
+      }
     }
 
-    import AccessPathSyntax::AccessPath<flowSpec/1>
+    /**
+     * For a sink access path like
+     *
+     * ```
+     * Argument[0].ReturnValue.Field[A].Field[B]
+     * ```
+     *
+     * we rewrite it into
+     *
+     * ```
+     * Field[B].Field[A].Argument[0].ReturnValue
+     * ```
+     *
+     * which allows us to process the stack top-down, first performing a step from the
+     * returned value of a callback to the place where the callback is supplied as an
+     * argument at position 0, then a read of `A`, and finally a read of `B`.
+     */
+    private class SinkAccessPath extends SourceOrSinkAccessPath, AccessPath {
+      SinkAccessPath() { AccessPath.super.getToken(0) = sinkMarker() }
+
+      override AccessPathToken getToken(int n) {
+        not exists(this.getFirstContentToken()) and
+        result = this.getTokenExclMarker(n)
+        or
+        exists(int first, int num, int i |
+          first = this.getFirstContentToken() and
+          num = this.getNumToken()
+        |
+          result = this.getTokenExclMarker(first + i) and
+          i >= 0 and
+          n = num - first - i - 1
+          or
+          result = this.getTokenExclMarker(i) and
+          i < first and
+          n = num - first + i
+        )
+      }
+    }
 
     /** Holds if specification component `token` parses as parameter `pos`. */
     predicate parseParam(AccessPathToken token, ArgumentPosition pos) {
@@ -1175,7 +1332,7 @@ module Make<
     ) {
       exists(string outSpec |
         isRelevantSource(source, outSpec, kind, _, model) and
-        External::interpretSpec(outSpec, s)
+        External::interpretSpec(addSourceMarker(outSpec), s)
       )
     }
 
@@ -1183,22 +1340,19 @@ module Make<
     private predicate sourceOutputState(
       SourceElement source, SummaryComponentStack s, string kind, string model
     ) {
-      sourceOutputStateEntry(source, s, kind, model)
-      or
-      exists(SummaryComponentStack out |
-        sourceOutputState(source, out, kind, model) and
-        out.head() = TContentSummaryComponent(_) and
-        s = out.tail()
+      exists(SummaryComponentStack entry |
+        sourceOutputStateEntry(source, entry, kind, model) and
+        s = entry.drop(_)
       )
     }
 
     pragma[nomagic]
-    private predicate sinkInputStateExit(
+    private predicate sinkInputStateEntry(
       SinkElement sink, SummaryComponentStack s, string kind, string model
     ) {
       exists(string inSpec |
         isRelevantSink(sink, inSpec, kind, _, model) and
-        External::interpretSpec(inSpec, s)
+        External::interpretSpec(addSinkMarker(inSpec), s)
       )
     }
 
@@ -1206,12 +1360,9 @@ module Make<
     private predicate sinkInputState(
       SinkElement sink, SummaryComponentStack s, string kind, string model
     ) {
-      sinkInputStateExit(sink, s, kind, model)
-      or
-      exists(SummaryComponentStack inp |
-        sinkInputState(sink, inp, kind, model) and
-        inp.head() = TContentSummaryComponent(_) and
-        s = inp.tail()
+      exists(SummaryComponentStack entry |
+        sinkInputStateEntry(sink, entry, kind, model) and
+        s = entry.drop(_)
       )
     }
 
@@ -1297,847 +1448,1292 @@ module Make<
       }
     }
 
-    private newtype TSummaryNode =
-      TSummaryInternalNode(SummarizedCallable c, SummaryNodeState state) {
-        summaryNodeRange(c, state)
-      } or
-      TSummaryParameterNode(SummarizedCallable c, ParameterPosition pos) {
-        summaryParameterNodeRange(c, pos)
-      } or
-      TSummaryReturnArgumentNode(FlowSummaryCallBase call, ReturnKind rk) {
-        exists(SummarizedCallable sc |
-          call = getASourceCall(sc) and
-          relevantFlowSummaryPosition(sc, rk)
-        )
-      } or
-      TSourceOutputNode(SourceElement source, SummaryNodeState state, string kind, string model) {
-        state.isSourceOutputState(source, _, kind, model)
-      } or
-      TSinkInputNode(SinkElement sink, SummaryNodeState state, string kind, string model) {
-        state.isSinkInputState(sink, _, kind, model)
-      }
+    signature module InputSig2 {
+      /**
+       * An element used to represent sources and sinks.
+       *
+       * These elements will be embedded into the data flow graph and serve as the
+       * sources/sinks that the user sees in the output.
+       *
+       * For example, if we have a source access path like
+       *
+       * ```
+       * Argument[0].Parameter[1].Field[A].Field[B]
+       * ```
+       *
+       * then there should be a reporting element corresponding to the `Argument[0]` part,
+       * as well as the `Parameter[1]` part, and a flow step will be generated between them.
+       */
+      class SourceSinkReportingElement {
+        /** Gets the enclosing callable of this element. */
+        DataFlowCallable getEnclosingCallable();
+
+        /**
+         * Gets a successor element corresponding to the `sc` part of this element.
+         *
+         * For example, if `sc` is `Parameter[0]` then the result should be the
+         * parameter at position 0 of this element (this element may for example be
+         * a reference to a closure).
+         */
+        bindingset[this, sc]
+        SourceSinkReportingElement getASuccessor(SummaryComponent sc);
 
-    abstract class SummaryNode extends TSummaryNode {
-      abstract string toString();
+        /** Gets a textual representation of this element. */
+        string toString();
 
-      abstract SummarizedCallable getSummarizedCallable();
+        /** Gets the location of this element. */
+        Location getLocation();
+      }
+
+      /**
+       * Gets an element corresponding to the `sc` part of `source`.
+       *
+       * For example, if `sc` is `ReturnValue` then the result should be a
+       * call to `source`, and if `sc` is `Argument[0]` then the result
+       * should be an argument at position 0 in a call to `source`.
+       */
+      bindingset[source, sc]
+      default SourceSinkReportingElement getASourceReportingElement(
+        SummarizedCallableBase source, SummaryComponent sc
+      ) {
+        none()
+      }
 
-      abstract SourceElement getSourceElement();
+      /**
+       * Gets the source data flow node corresponding to `e` and `sc`.
+       *
+       * For example, if `sc` is `ReturnValue` then the result should be the node
+       * that corresponds directly to `e`, and if `sc` is `Argument[0]` then the
+       * result should be the post-update node whose pre-update node corresponds to
+       * `e`.
+       */
+      bindingset[e, sc]
+      default Node getSourceDataFlowNode(SourceSinkReportingElement e, SummaryComponent sc) {
+        none()
+      }
 
-      abstract SinkElement getSinkElement();
+      /**
+       * Gets an element corresponding to the `sc` part of `sink`.
+       *
+       * For example, if `sc` is `Argument[0]` then the result should be the argument
+       * at position 0 in a call to `sink`.
+       */
+      bindingset[sink, sc]
+      default SourceSinkReportingElement getASinkReportingElement(
+        SummarizedCallableBase sink, SummaryComponent sc
+      ) {
+        none()
+      }
 
-      predicate isHidden() { any() }
+      /**
+       * Gets the data flow node corresponding to `e` and `sc`.
+       *
+       * For example, if `sc` is `Argument[0]` then the result should be the node
+       * that corresponds directly to `e`.
+       */
+      bindingset[e, sc]
+      default Node getSinkDataFlowNode(SourceSinkReportingElement e, SummaryComponent sc) { none() }
     }
 
-    private class SummaryInternalNode extends SummaryNode, TSummaryInternalNode {
-      private SummarizedCallable c;
-      private SummaryNodeState state;
+    module Make2<InputSig2 Input2> {
+      private import Input2
 
-      SummaryInternalNode() { this = TSummaryInternalNode(c, state) }
+      /**
+       * For a source access path like
+       *
+       * ```
+       * Argument[0].Parameter[1].Field[A].Field[B]
+       * ```
+       *
+       * which gets rewritten into
+       *
+       * ```
+       * Parameter[1].Argument[0].Field[A].Field[B]
+       * ```
+       *
+       * we first find the entry reporting element based on `Argument[0]`. This entry
+       * reporting element will also be used for all the stores (done in
+       * `sourceOutputStoreNode`), but for `Parameter[1]`, we will use the reporting
+       * element obtained by going to the parameter at position 1 of the entry element
+       * (done in `sourceOutputStepNode`).
+       */
+      private predicate sourceOutputNodeEntryElement(
+        SourceElement source, SummaryNodeState state, SourceSinkReportingElement e, string kind,
+        string model
+      ) {
+        exists(SummaryComponentStack entry, SummaryComponentStack stack |
+          state.isSourceOutputState(source, stack, kind, model) and
+          // entry = Parameter[1].Argument[0].Field[A].Field[B]
+          sourceOutputStateEntry(source, entry, kind, model) and
+          // stack = Parameter[1].Argument[0]
+          stack =
+            min(SummaryComponentStack stack0, int i |
+              stack0 = entry.drop(i) and
+              not stack0.head() instanceof TContentSummaryComponent
+            |
+              stack0 order by i
+            ) and
+          e = getASourceReportingElement(source, stack.head())
+        )
+      }
 
-      override string toString() { result = "[summary] " + state + " in " + c }
+      private predicate sourceOutputStepNode(
+        SourceElement source, SummaryNodeState state, SourceSinkReportingElement e, string kind,
+        string model
+      ) {
+        sourceOutputNodeEntryElement(source, state, e, kind, model)
+        or
+        sourceOutputNodeStep(source, state, _, e, _, kind, model)
+      }
 
-      override SummarizedCallable getSummarizedCallable() { result = c }
+      private predicate sourceOutputNodeStep(
+        SourceElement source, SummaryNodeState state, SummaryNodeState state0,
+        SourceSinkReportingElement e, SourceSinkReportingElement e0, string kind, string model
+      ) {
+        exists(SummaryComponentStack stack, SummaryComponent head, SummaryComponentStack stack0 |
+          sourceOutputStepNode(source, state0, e0, kind, model) and
+          state0.isSourceOutputState(source, stack0, kind, model) and
+          stack = stack0.tail() and
+          state.isSourceOutputState(source, stack, kind, model) and
+          head = stack.head() and
+          e = e0.getASuccessor(head)
+        )
+      }
 
-      override SourceElement getSourceElement() { none() }
+      private predicate sourceOutputStoreNode(
+        SourceElement source, SummaryNodeState state, SourceSinkReportingElement e, string kind,
+        string model
+      ) {
+        sourceOutputNodeEntryElement(source, state, e, kind, model)
+        or
+        exists(SummaryComponentStack stack, SummaryNodeState state0 |
+          sourceOutputStoreNode(source, state0, e, kind, model) and
+          state0.isSourceOutputState(source, stack.tail(), kind, model) and
+          state.isSourceOutputState(source, stack, kind, model)
+        )
+      }
 
-      override SinkElement getSinkElement() { none() }
-    }
+      /**
+       * For a sink access path like
+       *
+       * ```
+       * Argument[0].ReturnValue.Field[A].Field[B]
+       * ```
+       *
+       * which gets rewritten into
+       *
+       * ```
+       * Field[B].Field[A].Argument[0].ReturnValue
+       * ```
+       *
+       * we first find the entry reporting element based on `Argument[0]`. This entry
+       * reporting element will also be used for all the reads (done in `sinkInputReadNode`),
+       * but for `ReturnValue`, we will use the reporting element obtained by going to a
+       * value returned by the entry element (done in `sinkInputStepNode`).
+       */
+      private predicate sinkInputNodeEntryElement(
+        SinkElement sink, SummaryNodeState state, SourceSinkReportingElement e, string kind,
+        string model
+      ) {
+        exists(SummaryComponentStack entry, SummaryComponentStack stack |
+          state.isSinkInputState(sink, stack, kind, model) and
+          // entry = Field[B].Field[A].Argument[0].ReturnValue
+          sinkInputStateEntry(sink, entry, kind, model) and
+          // stack = Field[B].Field[A].Argument[0]
+          stack =
+            max(SummaryComponentStack stack0, int i |
+              stack0 = entry.drop(i) and
+              not stack0.head() instanceof TContentSummaryComponent
+            |
+              stack0 order by i
+            ) and
+          e = getASinkReportingElement(sink, stack.head())
+        )
+      }
 
-    private class SummaryParamNode extends SummaryNode, TSummaryParameterNode {
-      private SummarizedCallable c;
-      private ParameterPosition pos;
+      private predicate sinkInputStepNode(
+        SinkElement sink, SummaryNodeState state, SourceSinkReportingElement e, string kind,
+        string model
+      ) {
+        sinkInputNodeEntryElement(sink, state, e, kind, model)
+        or
+        sinkInputNodeStep(sink, state, _, e, _, kind, model)
+      }
 
-      SummaryParamNode() { this = TSummaryParameterNode(c, pos) }
+      private predicate sinkInputNodeStep(
+        SinkElement sink, SummaryNodeState state, SummaryNodeState state0,
+        SourceSinkReportingElement e, SourceSinkReportingElement e0, string kind, string model
+      ) {
+        exists(SummaryComponentStack stack, SummaryComponent head, SummaryComponentStack stack0 |
+          sinkInputStepNode(sink, state0, e0, kind, model) and
+          state0.isSinkInputState(sink, stack0, kind, model) and
+          stack.tail() = stack0 and
+          state.isSinkInputState(sink, stack, kind, model) and
+          head = stack.head() and
+          e = e0.getASuccessor(head)
+        )
+      }
 
-      override string toString() { result = "[summary param] " + pos + " in " + c }
+      private predicate sinkInputReadNode(
+        SinkElement sink, SummaryNodeState state, SourceSinkReportingElement e, string kind,
+        string model
+      ) {
+        sinkInputNodeEntryElement(sink, state, e, kind, model)
+        or
+        exists(SummaryComponentStack stack, SummaryNodeState state0, SummaryComponentStack stack0 |
+          sinkInputReadNode(sink, state0, e, kind, model) and
+          state0.isSinkInputState(sink, stack0, kind, model) and
+          state.isSinkInputState(sink, stack, kind, model) and
+          stack = stack0.tail()
+        )
+      }
 
-      override SummarizedCallable getSummarizedCallable() { result = c }
+      private newtype TSummaryNode =
+        TSummaryInternalNode(SummarizedCallable c, SummaryNodeState state) {
+          summaryNodeRange(c, state)
+        } or
+        TSummaryParameterNode(SummarizedCallable c, ParameterPosition pos) {
+          summaryParameterNodeRange(c, pos)
+        } or
+        TSummaryReturnArgumentNode(FlowSummaryCallBase call, ReturnKind rk) {
+          exists(SummarizedCallable sc |
+            call = getASourceCall(sc) and
+            relevantFlowSummaryPosition(sc, rk)
+          )
+        } or
+        TSourceOutputNode(
+          SourceElement source, SummaryNodeState state, SourceSinkReportingElement e, string kind,
+          string model
+        ) {
+          sourceOutputStepNode(source, state, e, kind, model)
+          or
+          sourceOutputStoreNode(source, state, e, kind, model)
+        } or
+        TSinkInputNode(
+          SinkElement sink, SummaryNodeState state, SourceSinkReportingElement e, string kind,
+          string model
+        ) {
+          sinkInputStepNode(sink, state, e, kind, model)
+          or
+          sinkInputReadNode(sink, state, e, kind, model)
+        }
 
-      override SourceElement getSourceElement() { none() }
+      abstract class SummaryNode extends TSummaryNode {
+        abstract string toString();
 
-      override SinkElement getSinkElement() { none() }
-    }
+        abstract SummarizedCallable getSummarizedCallable();
 
-    private class SummaryReturnArgumentNode extends SummaryNode, TSummaryReturnArgumentNode {
-      private FlowSummaryCallBase call;
-      private ReturnKind rk;
+        abstract SourceElement getSourceElement();
 
-      SummaryReturnArgumentNode() { this = TSummaryReturnArgumentNode(call, rk) }
+        abstract SinkElement getSinkElement();
 
-      override string toString() { result = "[summary] value written to " + rk + " at " + call }
+        abstract SourceSinkReportingElement getSourceSinkReportingElement();
 
-      override SummarizedCallable getSummarizedCallable() { none() }
+        abstract DataFlowCallable getEnclosingCallable();
 
-      override SourceElement getSourceElement() { none() }
+        abstract Location getLocation();
 
-      override SinkElement getSinkElement() { none() }
-    }
+        predicate isHidden() { any() }
+      }
 
-    /**
-     * Gets the summary node that represents the argument node used to transfer
-     * flow into the caller when a value is written to the value returned by
-     * `call` with kind `rk`.
-     */
-    SummaryNode summaryArgumentNode(FlowSummaryCallBase call, ReturnKind rk) {
-      result = TSummaryReturnArgumentNode(call, rk)
-    }
+      private class SummaryInternalNode extends SummaryNode, TSummaryInternalNode {
+        private SummarizedCallable c;
+        private SummaryNodeState state;
 
-    /** Gets the enclosing callable for summary node `sn`. */
-    DataFlowCallable getEnclosingCallable(SummaryNode sn) {
-      result = getSummarizedCallableAsDataFlowCallable(sn.getSummarizedCallable())
-      or
-      exists(FlowSummaryCallBase call |
-        sn = TSummaryReturnArgumentNode(call, _) and
-        result = getSourceCallEnclosingCallable(call)
-      )
-    }
+        SummaryInternalNode() { this = TSummaryInternalNode(c, state) }
 
-    class SourceOutputNode extends SummaryNode, TSourceOutputNode {
-      private SourceElement source_;
-      private SummaryNodeState state_;
-      private string kind_;
-      private string model_;
+        override string toString() { result = "[summary] " + state + " in " + c }
 
-      SourceOutputNode() { this = TSourceOutputNode(source_, state_, kind_, model_) }
+        override SummarizedCallable getSummarizedCallable() { result = c }
 
-      /**
-       * Holds if this node is an entry node, i.e. before any stores have been performed.
-       *
-       * This node should be used as the actual source node in data flow configurations.
-       */
-      predicate isEntry(string kind, string model) {
-        model = model_ and
-        exists(SummaryComponentStack out |
-          sourceOutputStateEntry(source_, out, kind, model_) and
-          state_.isSourceOutputState(source_, out, kind, model_)
-        )
-      }
+        override SourceElement getSourceElement() { none() }
 
-      /**
-       * Holds if this node is an exit node, i.e. after all stores have been performed.
-       *
-       * A local flow step should be added from this node to a data flow node representing
-       * `s` inside `source`.
-       */
-      predicate isExit(SourceElement source, SummaryComponentStack s, string model) {
-        source = source_ and
-        model = model_ and
-        state_.isSourceOutputState(source, s, _, model)
-      }
+        override SinkElement getSinkElement() { none() }
 
-      override predicate isHidden() { not this.isEntry(_, _) }
+        override SourceSinkReportingElement getSourceSinkReportingElement() { none() }
 
-      override string toString() {
-        if this.isEntry(_, _)
-        then result = source_.toString()
-        else result = "[source] " + state_ + " at " + source_
+        override DataFlowCallable getEnclosingCallable() {
+          result = getSummarizedCallableAsDataFlowCallable(c)
+        }
+
+        override Location getLocation() { result = c.getLocation() }
       }
 
-      override SummarizedCallable getSummarizedCallable() { none() }
+      private class SummaryParamNode extends SummaryNode, TSummaryParameterNode {
+        private SummarizedCallable c;
+        private ParameterPosition pos;
 
-      override SourceElement getSourceElement() { result = source_ }
+        SummaryParamNode() { this = TSummaryParameterNode(c, pos) }
 
-      override SinkElement getSinkElement() { none() }
-    }
+        override string toString() { result = "[summary param] " + pos + " in " + c }
 
-    class SinkInputNode extends SummaryNode, TSinkInputNode {
-      private SinkElement sink_;
-      private SummaryNodeState state_;
-      private string kind_;
-      private string model_;
+        override SummarizedCallable getSummarizedCallable() { result = c }
 
-      SinkInputNode() { this = TSinkInputNode(sink_, state_, kind_, model_) }
+        override SourceElement getSourceElement() { none() }
 
-      /**
-       * Holds if this node is an entry node, i.e. before any reads have been performed.
-       *
-       * A local flow step should be added to this node from a data flow node representing
-       * `sc` inside `sink`.
-       */
-      predicate isEntry(SinkElement sink, SummaryComponent sc, string model) {
-        sink = sink_ and
-        model = model_ and
-        state_.isSinkInputState(sink, TSingletonSummaryComponentStack(sc), _, model)
-      }
+        override SinkElement getSinkElement() { none() }
 
-      /**
-       * Holds if this node is an exit node, i.e. after all reads have been performed.
-       *
-       * This node should be used as the actual sink node in data flow configurations.
-       */
-      predicate isExit(string kind, string model) {
-        kind = kind_ and
-        model = model_ and
-        exists(SummaryComponentStack inp |
-          sinkInputStateExit(sink_, inp, kind, model_) and
-          state_.isSinkInputState(sink_, inp, kind, model_)
-        )
-      }
+        override SourceSinkReportingElement getSourceSinkReportingElement() { none() }
 
-      override predicate isHidden() { not this.isExit(_, _) }
+        override DataFlowCallable getEnclosingCallable() {
+          result = getSummarizedCallableAsDataFlowCallable(c)
+        }
 
-      override string toString() {
-        if this.isExit(_, _)
-        then result = sink_.toString()
-        else result = "[sink] " + state_ + " at " + sink_
+        override Location getLocation() { result = c.getLocation() }
       }
 
-      override SummarizedCallable getSummarizedCallable() { none() }
+      private class SummaryReturnArgumentNode extends SummaryNode, TSummaryReturnArgumentNode {
+        private FlowSummaryCallBase call;
+        private ReturnKind rk;
 
-      override SourceElement getSourceElement() { none() }
+        SummaryReturnArgumentNode() { this = TSummaryReturnArgumentNode(call, rk) }
 
-      override SinkElement getSinkElement() { result = sink_ }
-    }
+        override string toString() { result = "[summary] value written to " + rk + " at " + call }
 
-    /**
-     * Holds if `state` represents having read from a parameter at position
-     * `pos` in `c`. In this case we are not synthesizing a data-flow node,
-     * but instead assume that a relevant parameter node already exists.
-     */
-    private predicate parameterReadState(
-      SummarizedCallable c, SummaryNodeState state, ParameterPosition pos
-    ) {
-      state.isInputState(c, SummaryComponentStack::argument(pos))
-      or
-      exists(ReturnKind rk |
-        relevantFlowSummaryPosition(c, rk) and
-        state.isInputState(c, SummaryComponentStack::return(rk)) and
-        pos = getFlowSummaryParameterPosition(rk)
-      )
-    }
+        override SummarizedCallable getSummarizedCallable() { none() }
 
-    /**
-     * Holds if a synthesized summary node is needed for the state `state` in summarized
-     * callable `c`.
-     */
-    private predicate summaryNodeRange(SummarizedCallable c, SummaryNodeState state) {
-      state.isInputState(c, _) and
-      not parameterReadState(c, state, _)
-      or
-      state.isOutputState(c, _)
-    }
+        override SourceElement getSourceElement() { none() }
 
-    pragma[noinline]
-    private SummaryNode summaryNodeInputState(SummarizedCallable c, SummaryComponentStack s) {
-      exists(SummaryNodeState state | state.isInputState(c, s) |
-        result = TSummaryInternalNode(c, state)
-        or
-        exists(ParameterPosition pos |
-          parameterReadState(c, state, pos) and
-          result = TSummaryParameterNode(c, pos)
-        )
-      )
-    }
+        override SinkElement getSinkElement() { none() }
 
-    pragma[noinline]
-    private SummaryNode summaryNodeOutputState(SummarizedCallable c, SummaryComponentStack s) {
-      exists(SummaryNodeState state |
-        state.isOutputState(c, s) and
-        result = TSummaryInternalNode(c, state)
-      )
-    }
+        override SourceSinkReportingElement getSourceSinkReportingElement() { none() }
 
-    pragma[noinline]
-    private SummaryNode sourceElementOutputState(SourceElement source, SummaryComponentStack s) {
-      exists(SummaryNodeState state, string kind, string model |
-        state.isSourceOutputState(source, s, kind, model) and
-        result = TSourceOutputNode(source, state, kind, model)
-      )
-    }
+        override DataFlowCallable getEnclosingCallable() {
+          result = getSourceCallEnclosingCallable(call)
+        }
 
-    pragma[noinline]
-    private SummaryNode sinkElementInputState(SinkElement sink, SummaryComponentStack s) {
-      exists(SummaryNodeState state, string kind, string model |
-        state.isSinkInputState(sink, s, kind, model) and
-        result = TSinkInputNode(sink, state, kind, model)
-      )
-    }
+        override Location getLocation() { result = call.getLocation() }
+      }
 
-    /**
-     * Holds if a write targets `post`, which is a post-update node for a
-     * parameter at position `pos` in `c`.
-     */
-    private predicate isParameterPostUpdate(
-      SummaryNode post, SummarizedCallable c, ParameterPosition pos
-    ) {
-      post = summaryNodeOutputState(c, SummaryComponentStack::argument(pos))
-    }
+      /**
+       * Gets the summary node that represents the argument node used to transfer
+       * flow into the caller when a value is written to the value returned by
+       * `call` with kind `rk`.
+       */
+      SummaryNode summaryArgumentNode(FlowSummaryCallBase call, ReturnKind rk) {
+        result = TSummaryReturnArgumentNode(call, rk)
+      }
 
-    /** Holds if a parameter node at position `pos` is required for `c`. */
-    private predicate summaryParameterNodeRange(SummarizedCallable c, ParameterPosition pos) {
-      parameterReadState(c, _, pos)
-      or
-      // Same as `isParameterPostUpdate(_, c, pos)`, but can be used in a negative context
-      any(SummaryNodeState state).isOutputState(c, SummaryComponentStack::argument(pos))
-    }
+      class SourceOutputNode extends SummaryNode, TSourceOutputNode {
+        private SourceElement source_;
+        private SummaryNodeState state_;
+        private SourceSinkReportingElement e_;
+        private string kind_;
+        private string model_;
 
-    private predicate callbackOutput(
-      SummarizedCallable c, SummaryComponentStack s, SummaryNode receiver, ReturnKind rk
-    ) {
-      any(SummaryNodeState state).isInputState(c, s) and
-      s.head() = TReturnSummaryComponent(rk) and
-      receiver = summaryNodeInputState(c, s.tail())
-    }
+        SourceOutputNode() { this = TSourceOutputNode(source_, state_, e_, kind_, model_) }
 
-    private predicate callbackInput(
-      SummarizedCallable c, SummaryComponentStack s, SummaryNode receiver, ArgumentPosition pos
-    ) {
-      any(SummaryNodeState state).isOutputState(c, s) and
-      s.head() = TParameterSummaryComponent(pos) and
-      receiver = summaryNodeInputState(c, s.tail())
-    }
+        /**
+         * Holds if this node is an entry node, i.e. before any stores or steps have been
+         * performed.
+         *
+         * This node should be used as the actual source node in data flow configurations.
+         */
+        predicate isEntry(string kind, string model) {
+          model = model_ and
+          exists(SummaryComponentStack entry |
+            state_.isSourceOutputState(source_, entry, kind, model_) and
+            sourceOutputStateEntry(source_, entry, kind, model_)
+          )
+        }
 
-    /** Holds if a call targeting `receiver` should be synthesized inside `c`. */
-    predicate summaryCallbackRange(SummarizedCallable c, SummaryNode receiver) {
-      callbackOutput(c, _, receiver, _)
-      or
-      callbackInput(c, _, receiver, _)
-    }
+        /**
+         * Holds if this node is an exit node, i.e. after all stores and steps have been
+         * performed.
+         *
+         * A flow step is added from this node to a data flow node representing
+         * `s` inside `source`, using `getSourceDataFlowNode`.
+         */
+        predicate isExit(
+          SourceElement source, SummaryComponent sc, SourceSinkReportingElement e, string model
+        ) {
+          source = source_ and
+          model = model_ and
+          state_.isSourceOutputState(source, TSingletonSummaryComponentStack(sc), _, model) and
+          e = e_
+        }
 
-    /** Holds if summary node `p` is a parameter with position `pos`. */
-    predicate summaryParameterNode(SummaryNode p, ParameterPosition pos) {
-      p = TSummaryParameterNode(_, pos)
-    }
+        override predicate isHidden() {
+          not this.isEntry(_, _) and
+          (
+            exists(SummaryComponentStack stack |
+              state_.isSourceOutputState(_, stack, _, _) and
+              stack.head() instanceof TContentSummaryComponent
+            )
+            or
+            this.isExit(_, _, _, _)
+          )
+        }
 
-    /** Holds if summary node `out` contains output of kind `rk` from a call targeting `receiver`. */
-    predicate summaryOutNode(SummaryNode receiver, SummaryNode out, ReturnKind rk) {
-      exists(SummarizedCallable callable, SummaryComponentStack s |
-        callbackOutput(callable, s, receiver, rk) and
-        out = summaryNodeInputState(callable, s)
-      )
-    }
+        override string toString() {
+          if this.isHidden()
+          then result = "[source] " + state_ + " at " + e_
+          else result = e_.toString()
+        }
 
-    /** Holds if summary node `arg` is at position `pos` in a call targeting `receiver`. */
-    predicate summaryArgumentNode(SummaryNode receiver, SummaryNode arg, ArgumentPosition pos) {
-      exists(SummarizedCallable callable, SummaryComponentStack s |
-        callbackInput(callable, s, receiver, pos) and
-        arg = summaryNodeOutputState(callable, s)
-      )
-    }
+        override SummarizedCallable getSummarizedCallable() { none() }
 
-    /** Holds if summary node `post` is a post-update node with pre-update node `pre`. */
-    predicate summaryPostUpdateNode(SummaryNode post, SummaryNode pre) {
-      exists(SummarizedCallable c, ParameterPosition pos |
-        isParameterPostUpdate(post, c, pos) and
-        pre = TSummaryParameterNode(c, pos)
-      )
-      or
-      exists(SummarizedCallable callable, SummaryComponentStack s |
-        callbackInput(callable, s, _, _) and
-        pre = summaryNodeOutputState(callable, s) and
-        post = summaryNodeInputState(callable, s)
-      )
-    }
+        override SourceElement getSourceElement() { result = source_ }
 
-    /** Holds if summary node `ret` is a return node of kind `rk`. */
-    predicate summaryReturnNode(SummaryNode ret, ReturnKind rk) {
-      exists(SummaryComponentStack s |
-        ret = summaryNodeOutputState(_, s) and
-        s = TSingletonSummaryComponentStack(TReturnSummaryComponent(rk))
-      )
-    }
+        override SinkElement getSinkElement() { none() }
 
-    /** Holds if return kind `rk` is a relevant return kind for flow summary modeling. */
-    predicate relevantFlowSummaryPosition(ReturnKind rk) { relevantFlowSummaryPosition(_, rk) }
+        override SourceSinkReportingElement getSourceSinkReportingElement() { result = e_ }
 
-    /**
-     * Holds if flow is allowed to pass from the parameter at position `pos` of `c`,
-     * to a return node, and back out to the parameter.
-     */
-    predicate summaryAllowParameterReturnInSelf(SummarizedCallable c, ParameterPosition ppos) {
-      exists(SummaryComponentStack inputContents, SummaryComponentStack outputContents |
-        summary(c, inputContents, outputContents, _, _) and
-        inputContents.bottom() = pragma[only_bind_into](TArgumentSummaryComponent(ppos)) and
-        outputContents.bottom() = pragma[only_bind_into](TArgumentSummaryComponent(ppos))
-      )
-    }
+        override DataFlowCallable getEnclosingCallable() { result = e_.getEnclosingCallable() }
 
-    /**
-     * Holds if `barrier` is a relevant barrier element with output specification `outSpec`.
-     */
-    predicate barrierSpec(
-      BarrierElement barrier, SummaryComponentStack outSpec, string kind, string model
-    ) {
-      exists(string output |
-        isRelevantBarrier(barrier, output, kind, _, model) and
-        External::interpretSpec(output, outSpec)
-      )
-    }
+        override Location getLocation() { result = e_.getLocation() }
+      }
 
-    /**
-     * Holds if `barrierGuard` is a relevant barrier guard element with input specification `inSpec`.
-     */
-    predicate barrierGuardSpec(
-      BarrierGuardElement barrierGuard, SummaryComponentStack inSpec, string acceptingValue,
-      string kind, string model
-    ) {
-      exists(string input |
-        isRelevantBarrierGuard(barrierGuard, input, acceptingValue, kind, _, model) and
-        External::interpretSpec(input, inSpec)
-      )
-    }
+      class SinkInputNode extends SummaryNode, TSinkInputNode {
+        private SinkElement sink_;
+        private SummaryNodeState state_;
+        private SourceSinkReportingElement e_;
+        private string kind_;
+        private string model_;
 
-    signature module TypesInputSig {
-      /** Gets the type of content `c`. */
-      DataFlowType getContentType(ContentSet c);
+        SinkInputNode() { this = TSinkInputNode(sink_, state_, e_, kind_, model_) }
 
-      /** Gets the type of the parameter at the given position. */
-      bindingset[c, pos]
-      DataFlowType getParameterType(SummarizedCallable c, ParameterPosition pos);
+        /**
+         * Holds if this node is an entry node, i.e. before any reads and steps have been
+         * performed.
+         *
+         * A flow step is added to this node from a data flow node representing
+         * `sc` inside `sink`, using `getSinkDataFlowNode`.
+         */
+        predicate isEntry(
+          SinkElement sink, SummaryComponent sc, SourceSinkReportingElement e, string model
+        ) {
+          sink = sink_ and
+          model = model_ and
+          e = e_ and
+          exists(SummaryComponentStack entry |
+            sinkInputStateEntry(sink, entry, kind_, model) and
+            state_.isSinkInputState(sink, entry, _, model) and
+            sc = entry.head()
+          )
+        }
 
-      /** Gets the return type of kind `rk` for callable `c`. */
-      bindingset[c, rk]
-      DataFlowType getReturnType(SummarizedCallable c, ReturnKind rk);
+        /**
+         * Holds if this node is an exit node, i.e. after all reads and steps have been
+         * performed.
+         *
+         * This node should be used as the actual sink node in data flow configurations.
+         */
+        predicate isExit(string kind, string model) {
+          kind = kind_ and
+          model = model_ and
+          state_.isSinkInputState(sink_, TSingletonSummaryComponentStack(_), kind, model_)
+        }
 
-      /**
-       * Gets the type of the `i`th parameter in a synthesized call that targets a
-       * callback of type `t`.
-       */
-      bindingset[t, pos]
-      DataFlowType getCallbackParameterType(DataFlowType t, ArgumentPosition pos);
+        override predicate isHidden() {
+          not this.isExit(_, _) and
+          (
+            exists(SummaryComponentStack stack |
+              state_.isSinkInputState(_, stack, _, _) and
+              stack.head() instanceof TContentSummaryComponent
+            )
+            or
+            this.isEntry(_, _, _, _)
+          )
+        }
 
-      /**
-       * Gets the return type of kind `rk` in a synthesized call that targets a
-       * callback of type `t`.
-       */
-      bindingset[t, rk]
-      DataFlowType getCallbackReturnType(DataFlowType t, ReturnKind rk);
+        override string toString() {
+          if this.isHidden()
+          then result = "[sink] " + state_ + " at " + e_
+          else result = e_.toString()
+        }
 
-      DataFlowType getSyntheticGlobalType(SyntheticGlobal sg);
+        override SummarizedCallable getSummarizedCallable() { none() }
 
-      DataFlowType getSourceType(SourceBase source, SummaryComponentStack sc);
+        override SourceElement getSourceElement() { none() }
 
-      DataFlowType getSinkType(SinkBase sink, SummaryComponent sc);
-    }
+        override SinkElement getSinkElement() { result = sink_ }
 
-    /**
-     * Provides the predicate `summaryNodeType` for associating types with summary nodes.
-     *
-     * Only relevant for typed languages.
-     */
-    module Types<TypesInputSig TypesInput> {
-      private import TypesInput
+        override SourceSinkReportingElement getSourceSinkReportingElement() { result = e_ }
+
+        override DataFlowCallable getEnclosingCallable() { result = e_.getEnclosingCallable() }
+
+        override Location getLocation() { result = e_.getLocation() }
+      }
 
       /**
-       * Gets the type of synthesized summary node `n`.
-       *
-       * The type is computed based on the language-specific predicates
-       * `getContentType()`, `getReturnType()`, `getCallbackParameterType()`, and
-       * `getCallbackReturnType()`.
+       * Holds if `state` represents having read from a parameter at position
+       * `pos` in `c`. In this case we are not synthesizing a data-flow node,
+       * but instead assume that a relevant parameter node already exists.
        */
-      DataFlowType summaryNodeType(SummaryNode n) {
-        exists(SummaryNode pre |
-          summaryPostUpdateNode(n, pre) and
-          result = summaryNodeType(pre)
-        )
-        or
-        exists(SummarizedCallable c, SummaryComponentStack s, SummaryComponent head |
-          head = s.head()
-        |
-          n = summaryNodeInputState(c, s) and
-          (
-            exists(ContentSet cont | result = getContentType(cont) |
-              head = TContentSummaryComponent(cont) or
-              head = TWithContentSummaryComponent(cont)
-            )
-            or
-            head = TWithoutContentSummaryComponent(_) and
-            result = summaryNodeType(summaryNodeInputState(c, s.tail()))
-            or
-            exists(ReturnKind rk |
-              head = TReturnSummaryComponent(rk) and
-              result =
-                getCallbackReturnType(summaryNodeType(summaryNodeInputState(pragma[only_bind_out](c),
-                      s.tail())), rk)
-            )
-            or
-            exists(SyntheticGlobal sg |
-              head = TSyntheticGlobalSummaryComponent(sg) and
-              result = getSyntheticGlobalType(sg)
-            )
-            or
-            exists(ParameterPosition pos |
-              head = TArgumentSummaryComponent(pos) and
-              result = getParameterType(c, pos)
-            )
-          )
-          or
-          n = summaryNodeOutputState(c, s) and
-          (
-            exists(ContentSet cont |
-              head = TContentSummaryComponent(cont) and result = getContentType(cont)
-            )
-            or
-            s.length() = 1 and
-            exists(ReturnKind rk |
-              head = TReturnSummaryComponent(rk) and
-              result = getReturnType(c, rk)
-            )
-            or
-            exists(ArgumentPosition pos | head = TParameterSummaryComponent(pos) |
-              result =
-                getCallbackParameterType(summaryNodeType(summaryNodeInputState(pragma[only_bind_out](c),
-                      s.tail())), pos)
-            )
-            or
-            exists(SyntheticGlobal sg |
-              head = TSyntheticGlobalSummaryComponent(sg) and
-              result = getSyntheticGlobalType(sg)
-            )
-          )
-        )
+      private predicate parameterReadState(
+        SummarizedCallable c, SummaryNodeState state, ParameterPosition pos
+      ) {
+        state.isInputState(c, SummaryComponentStack::argument(pos))
         or
-        exists(SourceElement source |
-          exists(SummaryComponentStack s |
-            n.(SourceOutputNode).isExit(source, s, _) and
-            result = getSourceType(source, s)
-          )
-          or
-          exists(SummaryComponentStack s, ContentSet cont |
-            n = sourceElementOutputState(source, s) and
-            s.head() = TContentSummaryComponent(cont) and
-            result = getContentType(cont)
-          )
+        exists(ReturnKind rk |
+          relevantFlowSummaryPosition(c, rk) and
+          state.isInputState(c, SummaryComponentStack::return(rk)) and
+          pos = getFlowSummaryParameterPosition(rk)
         )
+      }
+
+      /**
+       * Holds if a synthesized summary node is needed for the state `state` in summarized
+       * callable `c`.
+       */
+      private predicate summaryNodeRange(SummarizedCallable c, SummaryNodeState state) {
+        state.isInputState(c, _) and
+        not parameterReadState(c, state, _)
         or
-        exists(SinkElement sink |
-          exists(SummaryComponent sc |
-            n.(SinkInputNode).isEntry(sink, sc, _) and
-            result = getSinkType(sink, sc)
-          )
+        state.isOutputState(c, _)
+      }
+
+      pragma[noinline]
+      private SummaryNode summaryNodeInputState(SummarizedCallable c, SummaryComponentStack s) {
+        exists(SummaryNodeState state | state.isInputState(c, s) |
+          result = TSummaryInternalNode(c, state)
           or
-          exists(SummaryComponentStack s, ContentSet cont |
-            n = sinkElementInputState(sink, s) and
-            s.head() = TContentSummaryComponent(cont) and
-            result = getContentType(cont)
+          exists(ParameterPosition pos |
+            parameterReadState(c, state, pos) and
+            result = TSummaryParameterNode(c, pos)
           )
         )
       }
-    }
-
-    signature module StepsInputSig {
-      /** Gets the summary node represented by data-flow node `n`, if any. */
-      SummaryNode getSummaryNode(Node n);
-
-      /** Gets a call that targets summarized callable `sc`. */
-      DataFlowCall getACall(SummarizedCallable sc);
 
-      /** Gets the out node of kind `rk` for `call`, if any. */
-      default Node getSourceOutNode(FlowSummaryCallBase call, ReturnKind rk) { none() }
-
-      /** Gets the enclosing callable of `source`. */
-      DataFlowCallable getSourceNodeEnclosingCallable(SourceBase source);
+      pragma[noinline]
+      private SummaryNode summaryNodeOutputState(SummarizedCallable c, SummaryComponentStack s) {
+        exists(SummaryNodeState state |
+          state.isOutputState(c, s) and
+          result = TSummaryInternalNode(c, state)
+        )
+      }
 
-      /**
-       * Gets a data flow node corresponding to the `s` part of `source`.
-       *
-       * `s` is typically `ReturnValue` and the result is the node that
-       * represents the return value of `source`.
-       */
-      Node getSourceNode(SourceBase source, SummaryComponentStack s);
+      pragma[noinline]
+      private SummaryNode sourceElementOutputState(
+        SourceElement source, SourceSinkReportingElement e, SummaryComponentStack s
+      ) {
+        result = TSourceOutputNode(source, TSourceOutputState(s), e, _, _)
+      }
 
-      /**
-       * Gets a data flow node corresponding to the `sc` part of `sink`.
-       *
-       * `sc` is typically `Argument[i]` and the result is the node that
-       * represents the `i`th argument of `sink`.
-       */
-      Node getSinkNode(SinkBase sink, SummaryComponent sc);
-    }
+      pragma[noinline]
+      private SummaryNode sinkElementInputState(
+        SinkElement sink, SourceSinkReportingElement e, SummaryComponentStack s
+      ) {
+        result = TSinkInputNode(sink, TSinkInputState(s), e, _, _)
+      }
 
-    /** Provides a compilation of flow summaries to atomic data-flow steps. */
-    module Steps<StepsInputSig StepsInput> {
       /**
-       * Holds if there is a local step from `pred` to `succ`, which is synthesized
-       * from a flow summary.
+       * Holds if a write targets `post`, which is a post-update node for a
+       * parameter at position `pos` in `c`.
        */
-      private predicate summaryLocalStepImpl(
-        SummaryNode pred, SummaryNode succ, boolean preservesValue, string model
+      private predicate isParameterPostUpdate(
+        SummaryNode post, SummarizedCallable c, ParameterPosition pos
       ) {
-        exists(
-          SummarizedCallable c, SummaryComponentStack inputContents,
-          SummaryComponentStack outputContents
-        |
-          summary(c, inputContents, outputContents, preservesValue, model) and
-          pred = summaryNodeInputState(pragma[only_bind_into](c), inputContents) and
-          succ = summaryNodeOutputState(pragma[only_bind_into](c), outputContents)
-        |
-          preservesValue = true
-          or
-          preservesValue = false and not summary(c, inputContents, outputContents, true, _)
-        )
-        or
-        exists(SummarizedCallable c, SummaryComponentStack s |
-          pred = summaryNodeInputState(c, s.tail()) and
-          succ = summaryNodeInputState(c, s) and
-          s.head() = [SummaryComponent::withContent(_), SummaryComponent::withoutContent(_)] and
-          preservesValue = true and
-          model = ""
-        )
+        post = summaryNodeOutputState(c, SummaryComponentStack::argument(pos))
       }
 
-      predicate sourceStep(SourceOutputNode nodeFrom, Node nodeTo, string model, boolean local) {
-        exists(SummaryComponentStack sc, SourceElement source |
-          nodeFrom.isExit(source, sc, model) and
-          nodeTo = StepsInput::getSourceNode(source, sc) and
-          if StepsInput::getSourceNodeEnclosingCallable(source) = getNodeEnclosingCallable(nodeTo)
-          then local = true
-          else local = false
-        )
+      /** Holds if a parameter node at position `pos` is required for `c`. */
+      private predicate summaryParameterNodeRange(SummarizedCallable c, ParameterPosition pos) {
+        parameterReadState(c, _, pos)
+        or
+        // Same as `isParameterPostUpdate(_, c, pos)`, but can be used in a negative context
+        any(SummaryNodeState state).isOutputState(c, SummaryComponentStack::argument(pos))
       }
 
-      predicate sourceLocalStep(SourceOutputNode nodeFrom, Node nodeTo, string model) {
-        sourceStep(nodeFrom, nodeTo, model, true)
+      private predicate callbackOutput(
+        SummarizedCallable c, SummaryComponentStack s, SummaryNode receiver, ReturnKind rk
+      ) {
+        any(SummaryNodeState state).isInputState(c, s) and
+        s.head() = TReturnSummaryComponent(rk) and
+        receiver = summaryNodeInputState(c, s.tail())
       }
 
-      predicate sinkLocalStep(Node nodeFrom, SinkInputNode nodeTo, string model) {
-        exists(SummaryComponent sc, SinkElement sink |
-          nodeFrom = StepsInput::getSinkNode(sink, sc) and
-          nodeTo.isEntry(sink, sc, model)
-        )
+      private predicate callbackInput(
+        SummarizedCallable c, SummaryComponentStack s, SummaryNode receiver, ArgumentPosition pos
+      ) {
+        any(SummaryNodeState state).isOutputState(c, s) and
+        s.head() = TParameterSummaryComponent(pos) and
+        receiver = summaryNodeInputState(c, s.tail())
       }
 
-      /** Holds if there is a local step between data-flow nodes synthesized from a flow summary. */
-      predicate summaryLocalStep(Node pred, SummaryNode succ, boolean preservesValue, string model) {
-        exists(SummaryNode predSummary |
-          predSummary = StepsInput::getSummaryNode(pred) and
-          summaryLocalStepImpl(predSummary, succ, preservesValue, model)
-        )
+      /** Holds if a call targeting `receiver` should be synthesized inside `c`. */
+      predicate summaryCallbackRange(SummarizedCallable c, SummaryNode receiver) {
+        callbackOutput(c, _, receiver, _)
         or
-        exists(FlowSummaryCallBase summaryCall, ReturnKind rk, SummarizedCallable sc |
-          pred = StepsInput::getSourceOutNode(summaryCall, rk) and
-          summaryCall = getASourceCall(sc) and
-          summary(sc, SummaryComponentStack::return(rk), _, preservesValue, model) and
-          succ = TSummaryReturnArgumentNode(summaryCall, rk)
-        )
+        callbackInput(c, _, receiver, _)
       }
 
-      /** Holds if the value of `succ` is uniquely determined by the value of `pred`. */
-      predicate summaryLocalMustFlowStep(SummaryNode pred, SummaryNode succ) {
-        pred = unique(SummaryNode n1 | summaryLocalStepImpl(n1, succ, true, _))
+      /** Holds if summary node `p` is a parameter with position `pos`. */
+      predicate summaryParameterNode(SummaryNode p, ParameterPosition pos) {
+        p = TSummaryParameterNode(_, pos)
       }
 
-      /**
-       * Holds if there is a read step of content `c` from `pred` to `succ`, which
-       * is synthesized from a flow summary.
-       */
-      predicate summaryReadStep(SummaryNode pred, ContentSet c, SummaryNode succ) {
-        exists(SummarizedCallable sc, SummaryComponentStack s |
-          pred = summaryNodeInputState(sc, s.tail()) and
-          succ = summaryNodeInputState(sc, s) and
-          SummaryComponent::content(c) = s.head()
+      /** Holds if summary node `out` contains output of kind `rk` from a call targeting `receiver`. */
+      predicate summaryOutNode(SummaryNode receiver, SummaryNode out, ReturnKind rk) {
+        exists(SummarizedCallable callable, SummaryComponentStack s |
+          callbackOutput(callable, s, receiver, rk) and
+          out = summaryNodeInputState(callable, s)
         )
-        or
-        exists(SinkElement sink, SummaryComponentStack s |
-          pred = sinkElementInputState(sink, s.tail()) and
-          succ = sinkElementInputState(sink, s) and
-          SummaryComponent::content(c) = s.head()
+      }
+
+      /** Holds if summary node `arg` is at position `pos` in a call targeting `receiver`. */
+      predicate summaryArgumentNode(SummaryNode receiver, SummaryNode arg, ArgumentPosition pos) {
+        exists(SummarizedCallable callable, SummaryComponentStack s |
+          callbackInput(callable, s, receiver, pos) and
+          arg = summaryNodeOutputState(callable, s)
         )
       }
 
-      /**
-       * Holds if there is a store step of content `c` from `pred` to `succ`, which
-       * is synthesized from a flow summary.
-       */
-      predicate summaryStoreStep(SummaryNode pred, ContentSet c, SummaryNode succ) {
-        exists(SummarizedCallable sc, SummaryComponentStack s |
-          pred = summaryNodeOutputState(sc, s) and
-          succ = summaryNodeOutputState(sc, s.tail()) and
-          SummaryComponent::content(c) = s.head()
+      /** Holds if summary node `post` is a post-update node with pre-update node `pre`. */
+      predicate summaryPostUpdateNode(SummaryNode post, SummaryNode pre) {
+        exists(SummarizedCallable c, ParameterPosition pos |
+          isParameterPostUpdate(post, c, pos) and
+          pre = TSummaryParameterNode(c, pos)
         )
         or
-        exists(SourceElement source, SummaryComponentStack s |
-          pred = sourceElementOutputState(source, s) and
-          succ = sourceElementOutputState(source, s.tail()) and
-          SummaryComponent::content(c) = s.head()
+        exists(SummarizedCallable callable, SummaryComponentStack s |
+          callbackInput(callable, s, _, _) and
+          pre = summaryNodeOutputState(callable, s) and
+          post = summaryNodeInputState(callable, s)
         )
       }
 
-      /**
-       * Holds if there is a jump step from `pred` to `succ`, which is synthesized
-       * from a flow summary.
-       */
-      predicate summaryJumpStep(SummaryNode pred, SummaryNode succ) {
+      /** Holds if summary node `ret` is a return node of kind `rk`. */
+      predicate summaryReturnNode(SummaryNode ret, ReturnKind rk) {
         exists(SummaryComponentStack s |
-          s = SummaryComponentStack::singleton(SummaryComponent::syntheticGlobal(_)) and
-          pred = summaryNodeOutputState(_, s) and
-          succ = summaryNodeInputState(_, s)
+          ret = summaryNodeOutputState(_, s) and
+          s = TSingletonSummaryComponentStack(TReturnSummaryComponent(rk))
         )
       }
 
-      predicate sourceJumpStep(SourceOutputNode nodeFrom, Node nodeTo) {
-        sourceStep(nodeFrom, nodeTo, _, false)
-      }
+      /** Holds if return kind `rk` is a relevant return kind for flow summary modeling. */
+      predicate relevantFlowSummaryPosition(ReturnKind rk) { relevantFlowSummaryPosition(_, rk) }
 
       /**
-       * Holds if values stored inside content `c` are cleared at `n`. `n` is a
-       * synthesized summary node, so in order for values to be cleared at calls
-       * to the relevant method, it is important that flow does not pass over
-       * the argument, either via use-use flow or def-use flow.
-       *
-       * Example:
-       *
-       * ```
-       * a.b = taint;
-       * a.clearB(); // assume we have a flow summary for `clearB` that clears `b` on the qualifier
-       * sink(a.b);
-       * ```
-       *
-       * In the above, flow should not pass from `a` on the first line (or the second
-       * line) to `a` on the third line. Instead, there will be synthesized flow from
-       * `a` on line 2 to the post-update node for `a` on that line (via an intermediate
-       * node where field `b` is cleared).
+       * Holds if flow is allowed to pass from the parameter at position `pos` of `c`,
+       * to a return node, and back out to the parameter.
        */
-      predicate summaryClearsContent(SummaryNode n, ContentSet c) {
-        exists(SummarizedCallable sc, SummaryNodeState state, SummaryComponentStack stack |
-          n = TSummaryInternalNode(sc, state) and
-          state.isInputState(sc, stack) and
-          stack.head() = SummaryComponent::withoutContent(c)
+      predicate summaryAllowParameterReturnInSelf(SummarizedCallable c, ParameterPosition ppos) {
+        exists(SummaryComponentStack inputContents, SummaryComponentStack outputContents |
+          summary(c, inputContents, outputContents, _, _) and
+          inputContents.bottom() = pragma[only_bind_into](TArgumentSummaryComponent(ppos)) and
+          outputContents.bottom() = pragma[only_bind_into](TArgumentSummaryComponent(ppos))
         )
       }
 
       /**
-       * Holds if the value that is being tracked is expected to be stored inside
-       * content `c` at `n`.
+       * Holds if `barrier` is a relevant barrier element with output specification `outSpec`.
        */
-      predicate summaryExpectsContent(SummaryNode n, ContentSet c) {
-        exists(SummarizedCallable sc, SummaryNodeState state, SummaryComponentStack stack |
-          n = TSummaryInternalNode(sc, state) and
-          state.isInputState(sc, stack) and
-          stack.head() = SummaryComponent::withContent(c)
-        )
-      }
-
-      pragma[noinline]
-      private predicate viableParam(
-        DataFlowCall call, SummarizedCallable sc, ParameterPosition ppos, SummaryParamNode p
+      predicate barrierSpec(
+        BarrierElement barrier, SummaryComponentStack outSpec, string kind, string model
       ) {
-        p = TSummaryParameterNode(sc, ppos) and
-        call = StepsInput::getACall(sc)
-      }
-
-      pragma[nomagic]
-      private SummaryParamNode summaryArgParam(DataFlowCall call, ArgNode arg, SummarizedCallable sc) {
-        exists(ParameterPosition ppos |
-          argumentPositionMatch(call, arg, ppos) and
-          viableParam(call, sc, ppos, result)
+        exists(string output |
+          isRelevantBarrier(barrier, output, kind, _, model) and
+          External::interpretSpec(output, outSpec)
         )
       }
 
       /**
-       * Holds if `p` can reach `n` in a summarized callable, using only value-preserving
-       * local steps. `clearsOrExpects` records whether any node on the path from `p` to
-       * `n` either clears or expects contents.
+       * Holds if `barrierGuard` is a relevant barrier guard element with input specification `inSpec`.
        */
-      private predicate paramReachesLocal(SummaryParamNode p, SummaryNode n, boolean clearsOrExpects) {
-        viableParam(_, _, _, p) and
-        n = p and
-        clearsOrExpects = false
-        or
-        exists(SummaryNode mid, boolean clearsOrExpectsMid |
-          paramReachesLocal(p, mid, clearsOrExpectsMid) and
-          summaryLocalStepImpl(mid, n, true, _) and
-          if
-            summaryClearsContent(n, _) or
-            summaryExpectsContent(n, _)
-          then clearsOrExpects = true
-          else clearsOrExpects = clearsOrExpectsMid
+      predicate barrierGuardSpec(
+        BarrierGuardElement barrierGuard, SummaryComponentStack inSpec, string acceptingValue,
+        string kind, string model
+      ) {
+        exists(string input |
+          isRelevantBarrierGuard(barrierGuard, input, acceptingValue, kind, _, model) and
+          External::interpretSpec(input, inSpec)
         )
       }
 
-      /**
-       * Holds if use-use flow starting from `arg` should be prohibited.
-       *
-       * This is the case when `arg` is the argument of a call that targets a
-       * flow summary where the corresponding parameter either clears contents
-       * or expects contents.
-       */
-      pragma[nomagic]
-      predicate prohibitsUseUseFlow(ArgNode arg, SummarizedCallable sc) {
-        exists(SummaryParamNode p, ParameterPosition ppos, SummaryNode ret |
-          paramReachesLocal(p, ret, true) and
-          p = summaryArgParam(_, arg, sc) and
-          p = TSummaryParameterNode(_, pragma[only_bind_into](ppos)) and
-          isParameterPostUpdate(ret, _, pragma[only_bind_into](ppos))
-        )
-      }
+      signature module TypesInputSig {
+        /** Gets the type of content `c`. */
+        DataFlowType getContentType(ContentSet c);
 
-      pragma[nomagic]
-      private predicate summaryReturnNodeExt(SummaryNode ret, ReturnKindExt rk) {
-        summaryReturnNode(ret, rk.(ValueReturnKind).getKind())
-        or
-        exists(SummaryParamNode p, SummaryNode pre, ParameterPosition pos |
-          paramReachesLocal(p, pre, _) and
-          summaryPostUpdateNode(ret, pre) and
-          p = TSummaryParameterNode(_, pos) and
-          rk.(ParamUpdateReturnKind).getPosition() = pos
-        )
-      }
+        /** Gets the type of the parameter at the given position. */
+        bindingset[c, pos]
+        DataFlowType getParameterType(SummarizedCallable c, ParameterPosition pos);
 
-      bindingset[ret]
-      private SummaryParamNode summaryArgParamRetOut(
-        ArgNode arg, SummaryNode ret, OutNodeExt out, SummarizedCallable sc
-      ) {
-        exists(DataFlowCall call, ReturnKindExt rk |
-          result = summaryArgParam(call, arg, sc) and
-          summaryReturnNodeExt(ret, pragma[only_bind_into](rk)) and
-          out = getAnOutNodeExt(call, pragma[only_bind_into](rk))
-        )
+        /** Gets the return type of kind `rk` for callable `c`. */
+        bindingset[c, rk]
+        DataFlowType getReturnType(SummarizedCallable c, ReturnKind rk);
+
+        /**
+         * Gets the type of the `i`th parameter in a synthesized call that targets a
+         * callback of type `t`.
+         */
+        bindingset[t, pos]
+        DataFlowType getCallbackParameterType(DataFlowType t, ArgumentPosition pos);
+
+        /**
+         * Gets the return type of kind `rk` in a synthesized call that targets a
+         * callback of type `t`.
+         */
+        bindingset[t, rk]
+        DataFlowType getCallbackReturnType(DataFlowType t, ReturnKind rk);
+
+        DataFlowType getSyntheticGlobalType(SyntheticGlobal sg);
+
+        DataFlowType getSourceSinkType(SourceSinkReportingElement e);
       }
 
       /**
-       * Holds if `arg` flows to `out` using a simple value-preserving flow
-       * summary, that is, a flow summary without reads and stores.
+       * Provides the predicate `summaryNodeType` for associating types with summary nodes.
        *
-       * NOTE: This step should not be used in global data-flow/taint-tracking, but may
-       * be useful to include in the exposed local data-flow/taint-tracking relations.
+       * Only relevant for typed languages.
        */
-      predicate summaryThroughStepValue(ArgNode arg, Node out, SummarizedCallable sc) {
-        exists(SummaryNode ret |
-          summaryLocalStepImpl(summaryArgParamRetOut(arg, ret, out, sc), ret, true, _)
-        )
+      module Types<TypesInputSig TypesInput> {
+        private import TypesInput
+
+        /**
+         * Gets the type of synthesized summary node `n`.
+         *
+         * The type is computed based on the language-specific predicates
+         * `getContentType()`, `getReturnType()`, `getCallbackParameterType()`, and
+         * `getCallbackReturnType()`.
+         */
+        DataFlowType summaryNodeType(SummaryNode n) {
+          exists(SummaryNode pre |
+            summaryPostUpdateNode(n, pre) and
+            result = summaryNodeType(pre)
+          )
+          or
+          exists(SummarizedCallable c, SummaryComponentStack s, SummaryComponent head |
+            head = s.head()
+          |
+            n = summaryNodeInputState(c, s) and
+            (
+              exists(ContentSet cont | result = getContentType(cont) |
+                head = TContentSummaryComponent(cont) or
+                head = TWithContentSummaryComponent(cont)
+              )
+              or
+              head = TWithoutContentSummaryComponent(_) and
+              result = summaryNodeType(summaryNodeInputState(c, s.tail()))
+              or
+              exists(ReturnKind rk |
+                head = TReturnSummaryComponent(rk) and
+                result =
+                  getCallbackReturnType(summaryNodeType(summaryNodeInputState(pragma[only_bind_out](c),
+                        s.tail())), rk)
+              )
+              or
+              exists(SyntheticGlobal sg |
+                head = TSyntheticGlobalSummaryComponent(sg) and
+                result = getSyntheticGlobalType(sg)
+              )
+              or
+              exists(ParameterPosition pos |
+                head = TArgumentSummaryComponent(pos) and
+                result = getParameterType(c, pos)
+              )
+            )
+            or
+            n = summaryNodeOutputState(c, s) and
+            (
+              exists(ContentSet cont |
+                head = TContentSummaryComponent(cont) and result = getContentType(cont)
+              )
+              or
+              s.length() = 1 and
+              exists(ReturnKind rk |
+                head = TReturnSummaryComponent(rk) and
+                result = getReturnType(c, rk)
+              )
+              or
+              exists(ArgumentPosition pos | head = TParameterSummaryComponent(pos) |
+                result =
+                  getCallbackParameterType(summaryNodeType(summaryNodeInputState(pragma[only_bind_out](c),
+                        s.tail())), pos)
+              )
+              or
+              exists(SyntheticGlobal sg |
+                head = TSyntheticGlobalSummaryComponent(sg) and
+                result = getSyntheticGlobalType(sg)
+              )
+            )
+          )
+          or
+          exists(SourceElement source |
+            exists(SourceSinkReportingElement e |
+              n.(SourceOutputNode).isExit(source, _, e, _) and
+              result = getSourceSinkType(e)
+            )
+            or
+            exists(SummaryComponentStack s, ContentSet cont |
+              n = sourceElementOutputState(source, _, s) and
+              s.head() = TContentSummaryComponent(cont) and
+              result = getContentType(cont)
+            )
+          )
+          or
+          exists(SinkElement sink |
+            exists(SourceSinkReportingElement e |
+              n.(SinkInputNode).isEntry(sink, _, e, _) and
+              result = getSourceSinkType(e)
+            )
+            or
+            exists(SummaryComponentStack s, ContentSet cont |
+              n = sinkElementInputState(sink, _, s) and
+              s.head() = TContentSummaryComponent(cont) and
+              result = getContentType(cont)
+            )
+          )
+        }
       }
 
-      /**
-       * Holds if `arg` flows to `out` using a simple flow summary involving taint
-       * step, that is, a flow summary without reads and stores.
-       *
-       * NOTE: This step should not be used in global data-flow/taint-tracking, but may
-       * be useful to include in the exposed local data-flow/taint-tracking relations.
-       */
-      predicate summaryThroughStepTaint(ArgNode arg, Node out, SummarizedCallable sc) {
-        exists(SummaryNode ret |
-          summaryLocalStepImpl(summaryArgParamRetOut(arg, ret, out, sc), ret, false, _)
-        )
+      signature module StepsInputSig {
+        /** Gets the summary node represented by data-flow node `n`, if any. */
+        SummaryNode getSummaryNode(Node n);
+
+        /** Gets a call that targets summarized callable `sc`. */
+        DataFlowCall getACall(SummarizedCallable sc);
+
+        /** Gets the out node of kind `rk` for `call`, if any. */
+        default Node getSourceOutNode(FlowSummaryCallBase call, ReturnKind rk) { none() }
       }
 
-      /**
-       * Holds if there is a read(+taint) of `c` from `arg` to `out` using a
-       * flow summary.
-       *
-       * NOTE: This step should not be used in global data-flow/taint-tracking, but may
-       * be useful to include in the exposed local data-flow/taint-tracking relations.
-       */
-      predicate summaryGetterStep(ArgNode arg, ContentSet c, Node out, SummarizedCallable sc) {
-        exists(SummaryNode mid, SummaryNode ret |
-          summaryReadStep(summaryArgParamRetOut(arg, ret, out, sc), c, mid) and
-          summaryLocalStepImpl(mid, ret, _, _)
-        )
+      /** Provides a compilation of flow summaries to atomic data-flow steps. */
+      module Steps<StepsInputSig StepsInput> {
+        private predicate sourceExitStep(SourceOutputNode nodeFrom, Node nodeTo, boolean local) {
+          exists(SummaryComponent sc, SourceSinkReportingElement e, string model |
+            nodeFrom.isExit(_, sc, e, model) and
+            nodeTo = getSourceDataFlowNode(e, sc) and
+            if
+              e.getEnclosingCallable() = getNodeEnclosingCallable(nodeTo) and
+              (nodeFrom.isEntry(_, model) or summaryStoreStep(_, _, nodeFrom))
+            then local = true
+            else local = false
+          )
+        }
+
+        private predicate sinkEntryStep(Node nodeFrom, SinkInputNode nodeTo, boolean local) {
+          exists(SummaryComponent sc, SourceSinkReportingElement e, string model |
+            nodeTo.isEntry(_, sc, e, model) and
+            nodeFrom = getSinkDataFlowNode(e, sc) and
+            if
+              e.getEnclosingCallable() = getNodeEnclosingCallable(nodeFrom) and
+              (nodeTo.isExit(_, model) or summaryReadStep(nodeTo, _, _))
+            then local = true
+            else local = false
+          )
+        }
+
+        /**
+         * Holds if there is a local step from `pred` to `succ`, which is synthesized
+         * from a flow summary.
+         */
+        private predicate summaryLocalStepImpl(
+          SummaryNode pred, SummaryNode succ, boolean preservesValue, string model
+        ) {
+          exists(
+            SummarizedCallable c, SummaryComponentStack inputContents,
+            SummaryComponentStack outputContents
+          |
+            summary(c, inputContents, outputContents, preservesValue, model) and
+            pred = summaryNodeInputState(pragma[only_bind_into](c), inputContents) and
+            succ = summaryNodeOutputState(pragma[only_bind_into](c), outputContents)
+          |
+            preservesValue = true
+            or
+            preservesValue = false and not summary(c, inputContents, outputContents, true, _)
+          )
+          or
+          exists(SummarizedCallable c, SummaryComponentStack s |
+            pred = summaryNodeInputState(c, s.tail()) and
+            succ = summaryNodeInputState(c, s) and
+            s.head() = [SummaryComponent::withContent(_), SummaryComponent::withoutContent(_)] and
+            preservesValue = true and
+            model = ""
+          )
+        }
+
+        /** Holds if there is a local step between data-flow nodes synthesized from a flow summary. */
+        predicate summaryLocalStep(Node pred, Node succ, boolean preservesValue, string model) {
+          exists(SummaryNode predSummary | predSummary = StepsInput::getSummaryNode(pred) |
+            summaryLocalStepImpl(predSummary, StepsInput::getSummaryNode(succ), preservesValue,
+              model)
+            or
+            sourceExitStep(predSummary, succ, true) and
+            preservesValue = true and
+            model = ""
+          )
+          or
+          exists(SummaryNode succSummary |
+            succSummary = StepsInput::getSummaryNode(succ) and
+            sinkEntryStep(pred, succSummary, true) and
+            preservesValue = true and
+            model = ""
+          )
+          or
+          exists(FlowSummaryCallBase summaryCall, ReturnKind rk, SummarizedCallable sc |
+            pred = StepsInput::getSourceOutNode(summaryCall, rk) and
+            summaryCall = getASourceCall(sc) and
+            summary(sc, SummaryComponentStack::return(rk), _, preservesValue, model) and
+            StepsInput::getSummaryNode(succ) = TSummaryReturnArgumentNode(summaryCall, rk)
+          )
+        }
+
+        /** Holds if the value of `succ` is uniquely determined by the value of `pred`. */
+        predicate summaryLocalMustFlowStep(SummaryNode pred, SummaryNode succ) {
+          pred = unique(SummaryNode n1 | summaryLocalStepImpl(n1, succ, true, _))
+        }
+
+        /**
+         * Holds if there is a read step of content `c` from `pred` to `succ`, which
+         * is synthesized from a flow summary or a sink specification.
+         */
+        predicate summaryReadStep(SummaryNode pred, ContentSet c, SummaryNode succ) {
+          exists(SummaryComponentStack stack | SummaryComponent::content(c) = stack.head() |
+            exists(SummarizedCallable sc |
+              pred = summaryNodeInputState(sc, stack.tail()) and
+              succ = summaryNodeInputState(sc, stack)
+            )
+            or
+            exists(SinkElement sink, SourceSinkReportingElement e, SummaryComponentStack stack0 |
+              pred = sinkElementInputState(sink, e, stack0) and
+              stack = stack0.tail() and
+              succ = sinkElementInputState(sink, e, stack)
+            )
+          )
+        }
+
+        /**
+         * Holds if there is a store step of content `c` from `pred` to `succ`, which
+         * is synthesized from a flow summary or a source specification.
+         */
+        predicate summaryStoreStep(SummaryNode pred, ContentSet c, SummaryNode succ) {
+          exists(SummaryComponentStack stack | SummaryComponent::content(c) = stack.head() |
+            exists(SummarizedCallable sc |
+              pred = summaryNodeOutputState(sc, stack) and
+              succ = summaryNodeOutputState(sc, stack.tail())
+            )
+            or
+            exists(SourceElement source, SourceSinkReportingElement e |
+              pred = sourceElementOutputState(source, e, stack) and
+              succ = sourceElementOutputState(source, e, stack.tail())
+            )
+          )
+        }
+
+        /**
+         * Holds if there is a jump step from `pred` to `succ`, which is synthesized
+         * from a flow summary.
+         */
+        predicate summaryJumpStep(Node pred, Node succ) {
+          exists(SummaryNode predSummary | StepsInput::getSummaryNode(pred) = predSummary |
+            exists(SummaryNode succSummary | StepsInput::getSummaryNode(succ) = succSummary |
+              exists(SummaryComponentStack s |
+                s = SummaryComponentStack::singleton(SummaryComponent::syntheticGlobal(_)) and
+                predSummary = summaryNodeOutputState(_, s) and
+                succSummary = summaryNodeInputState(_, s)
+              )
+              or
+              // We model all non-store steps as jumps in order to ensure that they are not stepped
+              // over in the path graph.
+              exists(
+                SourceElement source, string kind, SummaryNodeState state, SummaryNodeState state0,
+                SourceSinkReportingElement e, SourceSinkReportingElement e0, string model
+              |
+                sourceOutputNodeStep(source, state, state0, e, e0, kind, model) and
+                predSummary = TSourceOutputNode(source, state0, e0, kind, model) and
+                succSummary = TSourceOutputNode(source, state, e, kind, model)
+              )
+              or
+              // We model all non-read steps as jumps in order to ensure that they are not stepped
+              // over in the path graph.
+              exists(
+                SinkElement sink, string kind, SummaryNodeState state, SummaryNodeState state0,
+                SourceSinkReportingElement e, SourceSinkReportingElement e0, string model
+              |
+                sinkInputNodeStep(sink, state, state0, e, e0, kind, model) and
+                predSummary = TSinkInputNode(sink, state, e, kind, model) and
+                succSummary = TSinkInputNode(sink, state0, e0, kind, model)
+              )
+            )
+            or
+            sourceExitStep(predSummary, succ, false)
+          )
+          or
+          sinkEntryStep(pred, StepsInput::getSummaryNode(succ), false)
+        }
+
+        /**
+         * Holds if values stored inside content `c` are cleared at `n`. `n` is a
+         * synthesized summary node, so in order for values to be cleared at calls
+         * to the relevant method, it is important that flow does not pass over
+         * the argument, either via use-use flow or def-use flow.
+         *
+         * Example:
+         *
+         * ```
+         * a.b = taint;
+         * a.clearB(); // assume we have a flow summary for `clearB` that clears `b` on the qualifier
+         * sink(a.b);
+         * ```
+         *
+         * In the above, flow should not pass from `a` on the first line (or the second
+         * line) to `a` on the third line. Instead, there will be synthesized flow from
+         * `a` on line 2 to the post-update node for `a` on that line (via an intermediate
+         * node where field `b` is cleared).
+         */
+        predicate summaryClearsContent(SummaryNode n, ContentSet c) {
+          exists(SummarizedCallable sc, SummaryNodeState state, SummaryComponentStack stack |
+            n = TSummaryInternalNode(sc, state) and
+            state.isInputState(sc, stack) and
+            stack.head() = SummaryComponent::withoutContent(c)
+          )
+        }
+
+        /**
+         * Holds if the value that is being tracked is expected to be stored inside
+         * content `c` at `n`.
+         */
+        predicate summaryExpectsContent(SummaryNode n, ContentSet c) {
+          exists(SummarizedCallable sc, SummaryNodeState state, SummaryComponentStack stack |
+            n = TSummaryInternalNode(sc, state) and
+            state.isInputState(sc, stack) and
+            stack.head() = SummaryComponent::withContent(c)
+          )
+        }
+
+        pragma[noinline]
+        private predicate viableParam(
+          DataFlowCall call, SummarizedCallable sc, ParameterPosition ppos, SummaryParamNode p
+        ) {
+          p = TSummaryParameterNode(sc, ppos) and
+          call = StepsInput::getACall(sc)
+        }
+
+        pragma[nomagic]
+        private SummaryParamNode summaryArgParam(
+          DataFlowCall call, ArgNode arg, SummarizedCallable sc
+        ) {
+          exists(ParameterPosition ppos |
+            argumentPositionMatch(call, arg, ppos) and
+            viableParam(call, sc, ppos, result)
+          )
+        }
+
+        /**
+         * Holds if `p` can reach `n` in a summarized callable, using only value-preserving
+         * local steps. `clearsOrExpects` records whether any node on the path from `p` to
+         * `n` either clears or expects contents.
+         */
+        private predicate paramReachesLocal(
+          SummaryParamNode p, SummaryNode n, boolean clearsOrExpects
+        ) {
+          viableParam(_, _, _, p) and
+          n = p and
+          clearsOrExpects = false
+          or
+          exists(SummaryNode mid, boolean clearsOrExpectsMid |
+            paramReachesLocal(p, mid, clearsOrExpectsMid) and
+            summaryLocalStepImpl(mid, n, true, _) and
+            if
+              summaryClearsContent(n, _) or
+              summaryExpectsContent(n, _)
+            then clearsOrExpects = true
+            else clearsOrExpects = clearsOrExpectsMid
+          )
+        }
+
+        /**
+         * Holds if use-use flow starting from `arg` should be prohibited.
+         *
+         * This is the case when `arg` is the argument of a call that targets a
+         * flow summary where the corresponding parameter either clears contents
+         * or expects contents.
+         */
+        pragma[nomagic]
+        predicate prohibitsUseUseFlow(ArgNode arg, SummarizedCallable sc) {
+          exists(SummaryParamNode p, ParameterPosition ppos, SummaryNode ret |
+            paramReachesLocal(p, ret, true) and
+            p = summaryArgParam(_, arg, sc) and
+            p = TSummaryParameterNode(_, pragma[only_bind_into](ppos)) and
+            isParameterPostUpdate(ret, _, pragma[only_bind_into](ppos))
+          )
+        }
+
+        pragma[nomagic]
+        private predicate summaryReturnNodeExt(SummaryNode ret, ReturnKindExt rk) {
+          summaryReturnNode(ret, rk.(ValueReturnKind).getKind())
+          or
+          exists(SummaryParamNode p, SummaryNode pre, ParameterPosition pos |
+            paramReachesLocal(p, pre, _) and
+            summaryPostUpdateNode(ret, pre) and
+            p = TSummaryParameterNode(_, pos) and
+            rk.(ParamUpdateReturnKind).getPosition() = pos
+          )
+        }
+
+        bindingset[ret]
+        private SummaryParamNode summaryArgParamRetOut(
+          ArgNode arg, SummaryNode ret, OutNodeExt out, SummarizedCallable sc
+        ) {
+          exists(DataFlowCall call, ReturnKindExt rk |
+            result = summaryArgParam(call, arg, sc) and
+            summaryReturnNodeExt(ret, pragma[only_bind_into](rk)) and
+            out = getAnOutNodeExt(call, pragma[only_bind_into](rk))
+          )
+        }
+
+        /**
+         * Holds if `arg` flows to `out` using a simple value-preserving flow
+         * summary, that is, a flow summary without reads and stores.
+         *
+         * NOTE: This step should not be used in global data-flow/taint-tracking, but may
+         * be useful to include in the exposed local data-flow/taint-tracking relations.
+         */
+        predicate summaryThroughStepValue(ArgNode arg, Node out, SummarizedCallable sc) {
+          exists(SummaryNode ret |
+            summaryLocalStepImpl(summaryArgParamRetOut(arg, ret, out, sc), ret, true, _)
+          )
+        }
+
+        /**
+         * Holds if `arg` flows to `out` using a simple flow summary involving taint
+         * step, that is, a flow summary without reads and stores.
+         *
+         * NOTE: This step should not be used in global data-flow/taint-tracking, but may
+         * be useful to include in the exposed local data-flow/taint-tracking relations.
+         */
+        predicate summaryThroughStepTaint(ArgNode arg, Node out, SummarizedCallable sc) {
+          exists(SummaryNode ret |
+            summaryLocalStepImpl(summaryArgParamRetOut(arg, ret, out, sc), ret, false, _)
+          )
+        }
+
+        /**
+         * Holds if there is a read(+taint) of `c` from `arg` to `out` using a
+         * flow summary.
+         *
+         * NOTE: This step should not be used in global data-flow/taint-tracking, but may
+         * be useful to include in the exposed local data-flow/taint-tracking relations.
+         */
+        predicate summaryGetterStep(ArgNode arg, ContentSet c, Node out, SummarizedCallable sc) {
+          exists(SummaryNode mid, SummaryNode ret |
+            summaryReadStep(summaryArgParamRetOut(arg, ret, out, sc), c, mid) and
+            summaryLocalStepImpl(mid, ret, _, _)
+          )
+        }
+
+        /**
+         * Holds if there is a (taint+)store of `arg` into content `c` of `out` using a
+         * flow summary.
+         *
+         * NOTE: This step should not be used in global data-flow/taint-tracking, but may
+         * be useful to include in the exposed local data-flow/taint-tracking relations.
+         */
+        predicate summarySetterStep(ArgNode arg, ContentSet c, Node out, SummarizedCallable sc) {
+          exists(SummaryNode mid, SummaryNode ret |
+            summaryLocalStepImpl(summaryArgParamRetOut(arg, ret, out, sc), mid, _, _) and
+            summaryStoreStep(mid, c, ret)
+          )
+        }
       }
 
       /**
-       * Holds if there is a (taint+)store of `arg` into content `c` of `out` using a
-       * flow summary.
+       * Provides query predicates for rendering the generated data flow graph for
+       * a summarized callable.
        *
-       * NOTE: This step should not be used in global data-flow/taint-tracking, but may
-       * be useful to include in the exposed local data-flow/taint-tracking relations.
+       * Import this module into a `.ql` file of `@kind graph` to render the graph.
+       * The graph is restricted to callables from `RelevantSummarizedCallable`.
        */
-      predicate summarySetterStep(ArgNode arg, ContentSet c, Node out, SummarizedCallable sc) {
-        exists(SummaryNode mid, SummaryNode ret |
-          summaryLocalStepImpl(summaryArgParamRetOut(arg, ret, out, sc), mid, _, _) and
-          summaryStoreStep(mid, c, ret)
-        )
+      module RenderSummarizedCallable<StepsInputSig StepsInput> {
+        private module PrivateSteps = Steps<StepsInput>;
+
+        /** A summarized callable to include in the graph. */
+        abstract class RelevantSummarizedCallable instanceof SummarizedCallable {
+          string toString() { result = super.toString() }
+        }
+
+        private newtype TNodeOrCall =
+          MkNode(SummaryNode n) {
+            exists(RelevantSummarizedCallable c |
+              n = TSummaryInternalNode(c, _)
+              or
+              n = TSummaryParameterNode(c, _)
+            )
+          } or
+          MkCall(SummaryNode receiver) {
+            receiver.getSummarizedCallable() instanceof RelevantSummarizedCallable and
+            (
+              callbackInput(_, _, receiver, _) or
+              callbackOutput(_, _, receiver, _)
+            )
+          }
+
+        private class NodeOrCall extends TNodeOrCall {
+          SummaryNode asNode() { this = MkNode(result) }
+
+          SummaryNode asCallReceiver() { this = MkCall(result) }
+
+          string toString() {
+            result = this.asNode().toString()
+            or
+            result = this.asCallReceiver().toString()
+          }
+
+          /**
+           * Holds if this element is at the specified location.
+           * The location spans column `startcolumn` of line `startline` to
+           * column `endcolumn` of line `endline` in file `filepath`.
+           * For more information, see
+           * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+           */
+          predicate hasLocationInfo(
+            string filepath, int startline, int startcolumn, int endline, int endcolumn
+          ) {
+            filepath = "" and
+            startline = 0 and
+            startcolumn = 0 and
+            endline = 0 and
+            endcolumn = 0
+          }
+        }
+
+        query predicate nodes(NodeOrCall n, string key, string val) {
+          key = "semmle.label" and val = n.toString()
+        }
+
+        private Node getNode(SummaryNode sn) { sn = StepsInput::getSummaryNode(result) }
+
+        private predicate edgesComponent(NodeOrCall a, NodeOrCall b, string value) {
+          exists(boolean preservesValue |
+            PrivateSteps::summaryLocalStep(getNode(a.asNode()), getNode(b.asNode()), preservesValue,
+              _) and
+            if preservesValue = true then value = "value" else value = "taint"
+          )
+          or
+          exists(ContentSet c |
+            PrivateSteps::summaryReadStep(a.asNode(), c, b.asNode()) and
+            value = "read (" + c + ")"
+            or
+            PrivateSteps::summaryStoreStep(a.asNode(), c, b.asNode()) and
+            value = "store (" + c + ")"
+            or
+            PrivateSteps::summaryClearsContent(a.asNode(), c) and
+            b = a and
+            value = "clear (" + c + ")"
+            or
+            PrivateSteps::summaryExpectsContent(a.asNode(), c) and
+            b = a and
+            value = "expect (" + c + ")"
+          )
+          or
+          summaryPostUpdateNode(b.asNode(), a.asNode()) and
+          value = "post-update"
+          or
+          b.asCallReceiver() = a.asNode() and
+          value = "receiver"
+          or
+          exists(ArgumentPosition pos |
+            summaryArgumentNode(b.asCallReceiver(), a.asNode(), pos) and
+            value = "argument (" + pos + ")"
+          )
+        }
+
+        query predicate edges(NodeOrCall a, NodeOrCall b, string key, string value) {
+          key = "semmle.label" and
+          value = strictconcat(string s | edgesComponent(a, b, s) | s, " / ")
+        }
       }
     }
 
@@ -2168,15 +2764,15 @@ module Make<
         token = encodeWithContent(result, "")
       }
 
+      ContentSet interpretContent(AccessPathToken token) {
+        result = decodeContent(token)
+        or
+        not exists(decodeContent(token)) and
+        result = decodeUnknownContent(token)
+      }
+
       private SummaryComponent interpretComponent(AccessPathToken token) {
-        exists(ContentSet c |
-          c = decodeContent(token)
-          or
-          not exists(decodeContent(token)) and
-          c = decodeUnknownContent(token)
-        |
-          result = SummaryComponent::content(c)
-        )
+        result = SummaryComponent::content(interpretContent(token))
         or
         exists(ParameterPosition pos |
           parseArg(token, pos) and
@@ -2786,111 +3382,5 @@ module Make<
         )
       }
     }
-
-    /**
-     * Provides query predicates for rendering the generated data flow graph for
-     * a summarized callable.
-     *
-     * Import this module into a `.ql` file of `@kind graph` to render the graph.
-     * The graph is restricted to callables from `RelevantSummarizedCallable`.
-     */
-    module RenderSummarizedCallable<StepsInputSig StepsInput> {
-      private module PrivateSteps = Private::Steps<StepsInput>;
-
-      /** A summarized callable to include in the graph. */
-      abstract class RelevantSummarizedCallable instanceof SummarizedCallable {
-        string toString() { result = super.toString() }
-      }
-
-      private newtype TNodeOrCall =
-        MkNode(SummaryNode n) {
-          exists(RelevantSummarizedCallable c |
-            n = TSummaryInternalNode(c, _)
-            or
-            n = TSummaryParameterNode(c, _)
-          )
-        } or
-        MkCall(SummaryNode receiver) {
-          receiver.getSummarizedCallable() instanceof RelevantSummarizedCallable and
-          (
-            callbackInput(_, _, receiver, _) or
-            callbackOutput(_, _, receiver, _)
-          )
-        }
-
-      private class NodeOrCall extends TNodeOrCall {
-        SummaryNode asNode() { this = MkNode(result) }
-
-        SummaryNode asCallReceiver() { this = MkCall(result) }
-
-        string toString() {
-          result = this.asNode().toString()
-          or
-          result = this.asCallReceiver().toString()
-        }
-
-        /**
-         * Holds if this element is at the specified location.
-         * The location spans column `startcolumn` of line `startline` to
-         * column `endcolumn` of line `endline` in file `filepath`.
-         * For more information, see
-         * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-         */
-        predicate hasLocationInfo(
-          string filepath, int startline, int startcolumn, int endline, int endcolumn
-        ) {
-          filepath = "" and
-          startline = 0 and
-          startcolumn = 0 and
-          endline = 0 and
-          endcolumn = 0
-        }
-      }
-
-      query predicate nodes(NodeOrCall n, string key, string val) {
-        key = "semmle.label" and val = n.toString()
-      }
-
-      private Node getNode(SummaryNode sn) { sn = StepsInput::getSummaryNode(result) }
-
-      private predicate edgesComponent(NodeOrCall a, NodeOrCall b, string value) {
-        exists(boolean preservesValue |
-          PrivateSteps::summaryLocalStep(getNode(a.asNode()), b.asNode(), preservesValue, _) and
-          if preservesValue = true then value = "value" else value = "taint"
-        )
-        or
-        exists(ContentSet c |
-          PrivateSteps::summaryReadStep(a.asNode(), c, b.asNode()) and
-          value = "read (" + c + ")"
-          or
-          PrivateSteps::summaryStoreStep(a.asNode(), c, b.asNode()) and
-          value = "store (" + c + ")"
-          or
-          PrivateSteps::summaryClearsContent(a.asNode(), c) and
-          b = a and
-          value = "clear (" + c + ")"
-          or
-          PrivateSteps::summaryExpectsContent(a.asNode(), c) and
-          b = a and
-          value = "expect (" + c + ")"
-        )
-        or
-        summaryPostUpdateNode(b.asNode(), a.asNode()) and
-        value = "post-update"
-        or
-        b.asCallReceiver() = a.asNode() and
-        value = "receiver"
-        or
-        exists(ArgumentPosition pos |
-          summaryArgumentNode(b.asCallReceiver(), a.asNode(), pos) and
-          value = "argument (" + pos + ")"
-        )
-      }
-
-      query predicate edges(NodeOrCall a, NodeOrCall b, string key, string value) {
-        key = "semmle.label" and
-        value = strictconcat(string s | edgesComponent(a, b, s) | s, " / ")
-      }
-    }
   }
 }
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index a9aa3a70f451..3f53049acb71 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 2.1.11-dev
+version: 2.1.18-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/mad/CHANGELOG.md b/shared/mad/CHANGELOG.md
index b1e3e366b72c..72af4a15007c 100644
--- a/shared/mad/CHANGELOG.md
+++ b/shared/mad/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.0.61
+
+No user-facing changes.
+
+## 1.0.60
+
+No user-facing changes.
+
+## 1.0.59
+
+No user-facing changes.
+
+## 1.0.58
+
+No user-facing changes.
+
+## 1.0.57
+
+No user-facing changes.
+
+## 1.0.56
+
+No user-facing changes.
+
+## 1.0.55
+
+No user-facing changes.
+
 ## 1.0.54
 
 No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.55.md b/shared/mad/change-notes/released/1.0.55.md
new file mode 100644
index 000000000000..fd53dce64a9f
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.55.md
@@ -0,0 +1,3 @@
+## 1.0.55
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.56.md b/shared/mad/change-notes/released/1.0.56.md
new file mode 100644
index 000000000000..3b784cb7d975
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.56.md
@@ -0,0 +1,3 @@
+## 1.0.56
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.57.md b/shared/mad/change-notes/released/1.0.57.md
new file mode 100644
index 000000000000..18a94c4bca4a
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.57.md
@@ -0,0 +1,3 @@
+## 1.0.57
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.58.md b/shared/mad/change-notes/released/1.0.58.md
new file mode 100644
index 000000000000..f43459b898c0
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.58.md
@@ -0,0 +1,3 @@
+## 1.0.58
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.59.md b/shared/mad/change-notes/released/1.0.59.md
new file mode 100644
index 000000000000..071c0337a4d5
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.59.md
@@ -0,0 +1,3 @@
+## 1.0.59
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.60.md b/shared/mad/change-notes/released/1.0.60.md
new file mode 100644
index 000000000000..74ecf38fafa0
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.60.md
@@ -0,0 +1,3 @@
+## 1.0.60
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.61.md b/shared/mad/change-notes/released/1.0.61.md
new file mode 100644
index 000000000000..432f5481ee83
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.61.md
@@ -0,0 +1,3 @@
+## 1.0.61
+
+No user-facing changes.
diff --git a/shared/mad/codeql-pack.release.yml b/shared/mad/codeql-pack.release.yml
index c3c3b0f4418a..1319f4fe8fde 100644
--- a/shared/mad/codeql-pack.release.yml
+++ b/shared/mad/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.54
+lastReleaseVersion: 1.0.61
diff --git a/shared/mad/codeql/mad/ModelValidation.qll b/shared/mad/codeql/mad/ModelValidation.qll
index 47a3c24adce1..a5e64c434992 100644
--- a/shared/mad/codeql/mad/ModelValidation.qll
+++ b/shared/mad/codeql/mad/ModelValidation.qll
@@ -126,7 +126,7 @@ module KindValidation<KindValidationConfigSig Config> {
         [
           // shared
           "local", "remote", "file", "commandargs", "database", "environment", "reverse-dns",
-          "stdin",
+          "stdin", "ai",
           // Java
           "android-external-storage-dir", "contentprovider",
           // C#
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index a160bab98f55..6c520e798a30 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.55-dev
+version: 1.0.62-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/namebinding/CHANGELOG.md b/shared/namebinding/CHANGELOG.md
index d7831747b120..1857b399fe88 100644
--- a/shared/namebinding/CHANGELOG.md
+++ b/shared/namebinding/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 0.0.10
+
+No user-facing changes.
+
+## 0.0.9
+
+No user-facing changes.
+
+## 0.0.8
+
+No user-facing changes.
+
+## 0.0.7
+
+No user-facing changes.
+
+## 0.0.6
+
+No user-facing changes.
+
+## 0.0.5
+
+No user-facing changes.
+
+## 0.0.4
+
+No user-facing changes.
+
 ## 0.0.3
 
 No user-facing changes.
diff --git a/shared/namebinding/change-notes/released/0.0.10.md b/shared/namebinding/change-notes/released/0.0.10.md
new file mode 100644
index 000000000000..22391080fd45
--- /dev/null
+++ b/shared/namebinding/change-notes/released/0.0.10.md
@@ -0,0 +1,3 @@
+## 0.0.10
+
+No user-facing changes.
diff --git a/shared/namebinding/change-notes/released/0.0.4.md b/shared/namebinding/change-notes/released/0.0.4.md
new file mode 100644
index 000000000000..eefe286a4d88
--- /dev/null
+++ b/shared/namebinding/change-notes/released/0.0.4.md
@@ -0,0 +1,3 @@
+## 0.0.4
+
+No user-facing changes.
diff --git a/shared/namebinding/change-notes/released/0.0.5.md b/shared/namebinding/change-notes/released/0.0.5.md
new file mode 100644
index 000000000000..766ec2723b56
--- /dev/null
+++ b/shared/namebinding/change-notes/released/0.0.5.md
@@ -0,0 +1,3 @@
+## 0.0.5
+
+No user-facing changes.
diff --git a/shared/namebinding/change-notes/released/0.0.6.md b/shared/namebinding/change-notes/released/0.0.6.md
new file mode 100644
index 000000000000..ccbce856079d
--- /dev/null
+++ b/shared/namebinding/change-notes/released/0.0.6.md
@@ -0,0 +1,3 @@
+## 0.0.6
+
+No user-facing changes.
diff --git a/shared/namebinding/change-notes/released/0.0.7.md b/shared/namebinding/change-notes/released/0.0.7.md
new file mode 100644
index 000000000000..84da6f18c42e
--- /dev/null
+++ b/shared/namebinding/change-notes/released/0.0.7.md
@@ -0,0 +1,3 @@
+## 0.0.7
+
+No user-facing changes.
diff --git a/shared/namebinding/change-notes/released/0.0.8.md b/shared/namebinding/change-notes/released/0.0.8.md
new file mode 100644
index 000000000000..6af2d954c099
--- /dev/null
+++ b/shared/namebinding/change-notes/released/0.0.8.md
@@ -0,0 +1,3 @@
+## 0.0.8
+
+No user-facing changes.
diff --git a/shared/namebinding/change-notes/released/0.0.9.md b/shared/namebinding/change-notes/released/0.0.9.md
new file mode 100644
index 000000000000..c9e17c6d6cf2
--- /dev/null
+++ b/shared/namebinding/change-notes/released/0.0.9.md
@@ -0,0 +1,3 @@
+## 0.0.9
+
+No user-facing changes.
diff --git a/shared/namebinding/codeql-pack.release.yml b/shared/namebinding/codeql-pack.release.yml
index a24b693d1e7a..b740014e5aed 100644
--- a/shared/namebinding/codeql-pack.release.yml
+++ b/shared/namebinding/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.3
+lastReleaseVersion: 0.0.10
diff --git a/shared/namebinding/codeql/namebinding/LocalNameBinding.qll b/shared/namebinding/codeql/namebinding/LocalNameBinding.qll
index 57c792027ba8..2dd12bbc8abc 100644
--- a/shared/namebinding/codeql/namebinding/LocalNameBinding.qll
+++ b/shared/namebinding/codeql/namebinding/LocalNameBinding.qll
@@ -136,6 +136,12 @@ signature module LocalNameBindingInputSig<LocationSig Location> {
    * full control of scope resolution for specific types of references.
    */
   default predicate lookupStartsAt(AstNode n, AstNode scope) { none() }
+
+  /**
+   * Holds if the set of names available in `scope` is not known ahead of time,
+   * and thus any lookup chain that goes through `scope` may need to be reconciled at a later stage.
+   */
+  default predicate uncertainScope(AstNode scope) { none() }
 }
 
 /**
@@ -154,6 +160,8 @@ module LocalNameBinding<LocationSig Location, LocalNameBindingInputSig<Location>
       implicitDeclInScope(_, this)
       or
       isTopScope(this)
+      or
+      uncertainScope(this)
     }
   }
 
@@ -329,30 +337,91 @@ module LocalNameBinding<LocationSig Location, LocalNameBindingInputSig<Location>
     )
   }
 
-  private predicate accessCandInLookupScope(AstNode n, string name, Scope lookup) {
-    accessCand(n, name) and
-    (
-      lookupStartsAt(n, lookup)
+  private predicate declInScope(string name, AstNode scope) {
+    declInScope(_, name, scope) or
+    implicitDeclInScope(name, scope)
+  }
+
+  signature predicate accessCandSig(AstNode n, string name);
+
+  /**
+   * Allows resolution of access candidates.
+   *
+   * This is instantiated once by the local name binding library itself in order to populate `LocalAccess`.
+   * It can be instantiated further by the client, to resolve additional lookups at a later evaluation stage.
+   */
+  module ResolveAccesses<accessCandSig/2 accessCandInput> {
+    private predicate accessCandInLookupScope(AstNode n, string name, Scope lookup) {
+      accessCandInput(n, name) and
+      (
+        lookupStartsAt(n, lookup)
+        or
+        not lookupStartsAt(n, _) and
+        lookup = getEnclosingScope(n)
+      )
+    }
+
+    pragma[nomagic]
+    private predicate lookupInScope(string name, Scope lookup, Scope scope) {
+      accessCandInLookupScope(_, name, lookup) and
+      scope = lookup
       or
-      not lookupStartsAt(n, _) and
-      lookup = getEnclosingScope(n)
-    )
+      exists(Scope mid |
+        lookupInScope(name, lookup, mid) and
+        not declInScope(name, mid) and
+        not isTopScope(mid) and
+        scope = getEnclosingScope(mid)
+      )
+    }
+
+    pragma[nomagic]
+    private predicate resolveInScope(string name, Scope lookup, Local l) {
+      exists(Scope scope | lookupInScope(name, lookup, scope) |
+        l = TExplicitLocal(_, name, scope) or
+        l = TImplicitLocal(name, scope)
+      )
+    }
+
+    /** Holds if `access` resolves to `l`. */
+    predicate access(AstNode access, Local l) {
+      exists(Scope lookup, string name |
+        accessCandInLookupScope(access, name, lookup) and
+        resolveInScope(name, lookup, l)
+      )
+    }
+
+    /**
+     * Holds if `name`, when resolved from `lookup`, may resolve to one of the uncertain members of `scope`.
+     */
+    pragma[nomagic]
+    private predicate lookupInUncertainScope(string name, Scope lookup, Scope scope) {
+      lookupInScope(name, lookup, scope) and
+      uncertainScope(scope) and
+      not declInScope(name, scope)
+    }
+
+    /**
+     * Gets an uncertain scope in which the `accessCand` pair may resolve.
+     */
+    AstNode getAnUncertainScope(AstNode access, string name) {
+      exists(Scope lookup |
+        accessCandInLookupScope(access, name, lookup) and
+        lookupInUncertainScope(name, lookup, result)
+      )
+    }
   }
 
-  pragma[nomagic]
-  private predicate lookupInScope(string name, Scope lookup, Scope scope) {
-    accessCandInLookupScope(_, name, lookup) and
-    scope = lookup
-    or
-    exists(Scope mid |
-      lookupInScope(name, lookup, mid) and
-      not declInScope(_, name, mid) and
-      not implicitDeclInScope(name, mid) and
-      not isTopScope(mid) and
-      scope = getEnclosingScope(mid)
-    )
+  private module DefaultAccesses = ResolveAccesses<accessCand/2>;
+
+  /** Holds if `access` resolves to `l`. */
+  cached
+  private predicate access(AstNode access, Local l) {
+    CachedStage::ref() and
+    DefaultAccesses::access(access, l)
   }
 
+  predicate getAnUncertainScope = DefaultAccesses::getAnUncertainScope/2;
+
   cached
   private newtype TLocal =
     TExplicitLocal(AstNode definingNode, string name, AstNode scope) {
@@ -415,23 +484,10 @@ module LocalNameBinding<LocationSig Location, LocalNameBindingInputSig<Location>
     override string getName() { result = name }
 
     override Location getLocation() { result = scope.getLocation() }
-  }
-
-  pragma[nomagic]
-  private predicate resolveInScope(string name, Scope lookup, Local l) {
-    exists(Scope scope | lookupInScope(name, lookup, scope) |
-      l = TExplicitLocal(_, name, scope) or
-      l = TImplicitLocal(name, scope)
-    )
-  }
 
-  cached
-  private predicate access(AstNode access, Local l) {
-    CachedStage::ref() and
-    exists(Scope lookup, string name |
-      accessCandInLookupScope(access, name, lookup) and
-      resolveInScope(name, lookup, l)
-    )
+    /** Holds if this variable has the given name and scope. */
+    pragma[nomagic]
+    predicate hasNameAndScope(string name_, AstNode scope_) { name = name_ and scope = scope_ }
   }
 
   /** A local access. */
diff --git a/shared/namebinding/qlpack.yml b/shared/namebinding/qlpack.yml
index ecb08c95dda6..57c8949a3844 100644
--- a/shared/namebinding/qlpack.yml
+++ b/shared/namebinding/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/namebinding
-version: 0.0.4-dev
+version: 0.0.11-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/quantum/CHANGELOG.md b/shared/quantum/CHANGELOG.md
index 24dc81f3aa2c..5d7fb2536b42 100644
--- a/shared/quantum/CHANGELOG.md
+++ b/shared/quantum/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 0.0.39
+
+No user-facing changes.
+
+## 0.0.38
+
+No user-facing changes.
+
+## 0.0.37
+
+No user-facing changes.
+
+## 0.0.36
+
+No user-facing changes.
+
+## 0.0.35
+
+No user-facing changes.
+
+## 0.0.34
+
+No user-facing changes.
+
+## 0.0.33
+
+No user-facing changes.
+
 ## 0.0.32
 
 No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.33.md b/shared/quantum/change-notes/released/0.0.33.md
new file mode 100644
index 000000000000..0b46f1130fac
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.33.md
@@ -0,0 +1,3 @@
+## 0.0.33
+
+No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.34.md b/shared/quantum/change-notes/released/0.0.34.md
new file mode 100644
index 000000000000..d58affae3891
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.34.md
@@ -0,0 +1,3 @@
+## 0.0.34
+
+No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.35.md b/shared/quantum/change-notes/released/0.0.35.md
new file mode 100644
index 000000000000..1ffec5217282
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.35.md
@@ -0,0 +1,3 @@
+## 0.0.35
+
+No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.36.md b/shared/quantum/change-notes/released/0.0.36.md
new file mode 100644
index 000000000000..14c56d238da9
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.36.md
@@ -0,0 +1,3 @@
+## 0.0.36
+
+No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.37.md b/shared/quantum/change-notes/released/0.0.37.md
new file mode 100644
index 000000000000..322aa16628ff
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.37.md
@@ -0,0 +1,3 @@
+## 0.0.37
+
+No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.38.md b/shared/quantum/change-notes/released/0.0.38.md
new file mode 100644
index 000000000000..6aef3fb33021
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.38.md
@@ -0,0 +1,3 @@
+## 0.0.38
+
+No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.39.md b/shared/quantum/change-notes/released/0.0.39.md
new file mode 100644
index 000000000000..b492d1378882
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.39.md
@@ -0,0 +1,3 @@
+## 0.0.39
+
+No user-facing changes.
diff --git a/shared/quantum/codeql-pack.release.yml b/shared/quantum/codeql-pack.release.yml
index 714fcfc18281..3e5b1e56a574 100644
--- a/shared/quantum/codeql-pack.release.yml
+++ b/shared/quantum/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.32
+lastReleaseVersion: 0.0.39
diff --git a/shared/quantum/qlpack.yml b/shared/quantum/qlpack.yml
index 6a7a0abe44a2..c1c0fd3b27ea 100644
--- a/shared/quantum/qlpack.yml
+++ b/shared/quantum/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/quantum
-version: 0.0.33-dev
+version: 0.0.40-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/rangeanalysis/CHANGELOG.md b/shared/rangeanalysis/CHANGELOG.md
index d3f599dc28ff..cf739503d497 100644
--- a/shared/rangeanalysis/CHANGELOG.md
+++ b/shared/rangeanalysis/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.0.61
+
+No user-facing changes.
+
+## 1.0.60
+
+No user-facing changes.
+
+## 1.0.59
+
+No user-facing changes.
+
+## 1.0.58
+
+No user-facing changes.
+
+## 1.0.57
+
+No user-facing changes.
+
+## 1.0.56
+
+No user-facing changes.
+
+## 1.0.55
+
+No user-facing changes.
+
 ## 1.0.54
 
 No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.55.md b/shared/rangeanalysis/change-notes/released/1.0.55.md
new file mode 100644
index 000000000000..fd53dce64a9f
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.55.md
@@ -0,0 +1,3 @@
+## 1.0.55
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.56.md b/shared/rangeanalysis/change-notes/released/1.0.56.md
new file mode 100644
index 000000000000..3b784cb7d975
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.56.md
@@ -0,0 +1,3 @@
+## 1.0.56
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.57.md b/shared/rangeanalysis/change-notes/released/1.0.57.md
new file mode 100644
index 000000000000..18a94c4bca4a
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.57.md
@@ -0,0 +1,3 @@
+## 1.0.57
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.58.md b/shared/rangeanalysis/change-notes/released/1.0.58.md
new file mode 100644
index 000000000000..f43459b898c0
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.58.md
@@ -0,0 +1,3 @@
+## 1.0.58
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.59.md b/shared/rangeanalysis/change-notes/released/1.0.59.md
new file mode 100644
index 000000000000..071c0337a4d5
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.59.md
@@ -0,0 +1,3 @@
+## 1.0.59
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.60.md b/shared/rangeanalysis/change-notes/released/1.0.60.md
new file mode 100644
index 000000000000..74ecf38fafa0
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.60.md
@@ -0,0 +1,3 @@
+## 1.0.60
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.61.md b/shared/rangeanalysis/change-notes/released/1.0.61.md
new file mode 100644
index 000000000000..432f5481ee83
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.61.md
@@ -0,0 +1,3 @@
+## 1.0.61
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/codeql-pack.release.yml b/shared/rangeanalysis/codeql-pack.release.yml
index c3c3b0f4418a..1319f4fe8fde 100644
--- a/shared/rangeanalysis/codeql-pack.release.yml
+++ b/shared/rangeanalysis/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.54
+lastReleaseVersion: 1.0.61
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index d37c35c424e8..bbc89be8c352 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.55-dev
+version: 1.0.62-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/CHANGELOG.md b/shared/regex/CHANGELOG.md
index 4b02993bb99f..9c25243dac7f 100644
--- a/shared/regex/CHANGELOG.md
+++ b/shared/regex/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.0.61
+
+No user-facing changes.
+
+## 1.0.60
+
+No user-facing changes.
+
+## 1.0.59
+
+No user-facing changes.
+
+## 1.0.58
+
+No user-facing changes.
+
+## 1.0.57
+
+No user-facing changes.
+
+## 1.0.56
+
+No user-facing changes.
+
+## 1.0.55
+
+No user-facing changes.
+
 ## 1.0.54
 
 No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.55.md b/shared/regex/change-notes/released/1.0.55.md
new file mode 100644
index 000000000000..fd53dce64a9f
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.55.md
@@ -0,0 +1,3 @@
+## 1.0.55
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.56.md b/shared/regex/change-notes/released/1.0.56.md
new file mode 100644
index 000000000000..3b784cb7d975
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.56.md
@@ -0,0 +1,3 @@
+## 1.0.56
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.57.md b/shared/regex/change-notes/released/1.0.57.md
new file mode 100644
index 000000000000..18a94c4bca4a
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.57.md
@@ -0,0 +1,3 @@
+## 1.0.57
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.58.md b/shared/regex/change-notes/released/1.0.58.md
new file mode 100644
index 000000000000..f43459b898c0
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.58.md
@@ -0,0 +1,3 @@
+## 1.0.58
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.59.md b/shared/regex/change-notes/released/1.0.59.md
new file mode 100644
index 000000000000..071c0337a4d5
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.59.md
@@ -0,0 +1,3 @@
+## 1.0.59
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.60.md b/shared/regex/change-notes/released/1.0.60.md
new file mode 100644
index 000000000000..74ecf38fafa0
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.60.md
@@ -0,0 +1,3 @@
+## 1.0.60
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.61.md b/shared/regex/change-notes/released/1.0.61.md
new file mode 100644
index 000000000000..432f5481ee83
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.61.md
@@ -0,0 +1,3 @@
+## 1.0.61
+
+No user-facing changes.
diff --git a/shared/regex/codeql-pack.release.yml b/shared/regex/codeql-pack.release.yml
index c3c3b0f4418a..1319f4fe8fde 100644
--- a/shared/regex/codeql-pack.release.yml
+++ b/shared/regex/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.54
+lastReleaseVersion: 1.0.61
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index eb4f9f9bff24..c44ae6403ecc 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.55-dev
+version: 1.0.62-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/CHANGELOG.md b/shared/ssa/CHANGELOG.md
index 2bc90a791ab0..f7b84cd5f1ff 100644
--- a/shared/ssa/CHANGELOG.md
+++ b/shared/ssa/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 2.0.37
+
+No user-facing changes.
+
+## 2.0.36
+
+No user-facing changes.
+
+## 2.0.35
+
+No user-facing changes.
+
+## 2.0.34
+
+No user-facing changes.
+
+## 2.0.33
+
+No user-facing changes.
+
+## 2.0.32
+
+No user-facing changes.
+
+## 2.0.31
+
+No user-facing changes.
+
 ## 2.0.30
 
 No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.31.md b/shared/ssa/change-notes/released/2.0.31.md
new file mode 100644
index 000000000000..b3cd05e3de4d
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.31.md
@@ -0,0 +1,3 @@
+## 2.0.31
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.32.md b/shared/ssa/change-notes/released/2.0.32.md
new file mode 100644
index 000000000000..0930bb07f8c4
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.32.md
@@ -0,0 +1,3 @@
+## 2.0.32
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.33.md b/shared/ssa/change-notes/released/2.0.33.md
new file mode 100644
index 000000000000..d33a61332cf3
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.33.md
@@ -0,0 +1,3 @@
+## 2.0.33
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.34.md b/shared/ssa/change-notes/released/2.0.34.md
new file mode 100644
index 000000000000..fd170d38ce6d
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.34.md
@@ -0,0 +1,3 @@
+## 2.0.34
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.35.md b/shared/ssa/change-notes/released/2.0.35.md
new file mode 100644
index 000000000000..526e1fc9f4ce
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.35.md
@@ -0,0 +1,3 @@
+## 2.0.35
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.36.md b/shared/ssa/change-notes/released/2.0.36.md
new file mode 100644
index 000000000000..8acdd12366e4
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.36.md
@@ -0,0 +1,3 @@
+## 2.0.36
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.37.md b/shared/ssa/change-notes/released/2.0.37.md
new file mode 100644
index 000000000000..7d0b67a34af0
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.37.md
@@ -0,0 +1,3 @@
+## 2.0.37
+
+No user-facing changes.
diff --git a/shared/ssa/codeql-pack.release.yml b/shared/ssa/codeql-pack.release.yml
index 19c804295854..108259a74002 100644
--- a/shared/ssa/codeql-pack.release.yml
+++ b/shared/ssa/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.30
+lastReleaseVersion: 2.0.37
diff --git a/shared/ssa/codeql/ssa/Ssa.qll b/shared/ssa/codeql/ssa/Ssa.qll
index b8fe058bc0f5..9680480b7472 100644
--- a/shared/ssa/codeql/ssa/Ssa.qll
+++ b/shared/ssa/codeql/ssa/Ssa.qll
@@ -38,8 +38,28 @@ signature module InputSig<LocationSig Location, TypSig BasicBlock> {
    * Examples of uncertain reads are pseudo-reads inserted at the end of a C# method
    * with a `ref` or `out` parameter, where it is the caller that may or may not read
    * the argument.
+   *
+   * Uncertain reads are skipped in the use-use relations and in the data flow
+   * integration.
    */
   predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain);
+
+  /**
+   * Holds if the `i1`th node of basic block `bb1` reads source variable `v`
+   * and this read has an associated post-update that occurs at the `i2`th node
+   * of basic block `bb2`.
+   *
+   * If left empty, post-updates are considered to occur at the same control
+   * flow node as the read.
+   *
+   * If specified for only some reads, the remaining reads are assumed to not
+   * have post-updates.
+   */
+  default predicate variableReadWithPostUpdate(
+    BasicBlock bb1, int i1, SourceVariable v, BasicBlock bb2, int i2
+  ) {
+    none()
+  }
 }
 
 /**
@@ -332,6 +352,10 @@ module Make<
     }
   }
 
+  private predicate postUpdate(BasicBlock bb, int i, SourceVariable v) {
+    variableReadWithPostUpdate(_, _, v, bb, i)
+  }
+
   /**
    * Liveness analysis (based on source variables) to restrict the size of the
    * SSA representation.
@@ -436,8 +460,7 @@ module Make<
   pragma[nomagic]
   private predicate inReadDominanceFrontier(BasicBlock bb, SourceVariable v) {
     exists(BasicBlock readbb | readbb.inDominanceFrontier(bb) |
-      ssaDefReachesRead(v, _, readbb, _) and
-      variableRead(readbb, _, v, true) and
+      (variableRead(readbb, _, v, true) or postUpdate(readbb, _, v)) and
       not variableWrite(readbb, _, v, _)
       or
       synthPhiRead(readbb, v) and
@@ -484,7 +507,7 @@ module Make<
      * associated with uncertain writes.
      */
     pragma[nomagic]
-    predicate ssaRef(BasicBlock bb, int i, SourceVariable v, RefKind k) {
+    private predicate ssaRef(BasicBlock bb, int i, SourceVariable v, RefKind k) {
       variableRead(bb, i, v, _) and
       k = Read()
       or
@@ -501,7 +524,7 @@ module Make<
      * Holds if the SSA definition `def` reaches rank index `rnk` in its own
      * basic block `bb`.
      */
-    predicate ssaDefReachesRank(BasicBlock bb, Definition def, int rnk, SourceVariable v) {
+    private predicate ssaDefReachesRank(BasicBlock bb, Definition def, int rnk, SourceVariable v) {
       exists(int i |
         rnk = refRank(bb, i, v, Def()) and
         def.definesAt(v, bb, i)
@@ -590,10 +613,13 @@ module Make<
      * reads.
      */
     pragma[nomagic]
-    predicate ssaRef(BasicBlock bb, int i, SourceVariable v, RefKind k) {
+    private predicate ssaRef(BasicBlock bb, int i, SourceVariable v, RefKind k) {
       variableRead(bb, i, v, true) and
       k = Read()
       or
+      postUpdate(bb, i, v) and
+      k = Read()
+      or
       variableWrite(bb, i, v, false) and
       k = Read()
       or
@@ -628,6 +654,12 @@ module Make<
       )
     }
 
+    private predicate justPostUpdate(BasicBlock bb, int i, SourceVariable v) {
+      postUpdate(bb, i, v) and
+      not variableRead(bb, i, v, true) and
+      not variableWrite(bb, i, v, _)
+    }
+
     /**
      * Holds if `v` has adjacent references at index `i1` in basic block `bb1`
      * and index `i2` in basic block `bb2`, that is, there is a path between
@@ -649,6 +681,33 @@ module Make<
       1 = refRank(bb2, i2, v, Read())
     }
 
+    private predicate closestPriorNonPostUpdateRef(
+      BasicBlock bb1, int i1, BasicBlock bb2, int i2, SourceVariable v
+    ) {
+      exists(RefKind k |
+        ssaRef(bb1, i1, v, k) and
+        bb1 = bb2 and
+        i1 = i2
+      |
+        k = Def() or not justPostUpdate(bb1, i1, v)
+      )
+      or
+      exists(BasicBlock bb0, int i0 |
+        closestPriorNonPostUpdateRef(bb1, i1, bb0, i0, v) and
+        justPostUpdate(bb2, i2, v) and
+        adjacentRefRead(bb0, i0, bb2, i2, v)
+      )
+    }
+
+    predicate adjacentRefReadSkipPostUpd(
+      BasicBlock bb1, int i1, BasicBlock bb2, int i2, SourceVariable v
+    ) {
+      exists(BasicBlock bb0, int i0 |
+        adjacentRefRead(bb0, i0, bb2, i2, v) and
+        closestPriorNonPostUpdateRef(bb1, i1, bb0, i0, v)
+      )
+    }
+
     /**
      * Holds if the phi node or phi-read for `v` in basic block `bbPhi` takes
      * input from basic block `input`, and that the reference to `v` at index
@@ -663,10 +722,19 @@ module Make<
       1 = refRank(bbPhi, -1, v, _)
     }
 
+    predicate adjacentRefPhiSkipPostUpd(
+      BasicBlock bb, int i, BasicBlock input, BasicBlock bbPhi, SourceVariable v
+    ) {
+      exists(BasicBlock bb0, int i0 |
+        adjacentRefPhi(bb0, i0, input, bbPhi, v) and
+        closestPriorNonPostUpdateRef(bb, i, bb0, i0, v)
+      )
+    }
+
     private predicate adjacentRefs(BasicBlock bb1, int i1, BasicBlock bb2, int i2, SourceVariable v) {
-      adjacentRefRead(bb1, i1, bb2, i2, v)
+      adjacentRefReadSkipPostUpd(bb1, i1, bb2, i2, v)
       or
-      adjacentRefPhi(bb1, i1, _, bb2, v) and i2 = -1
+      adjacentRefPhiSkipPostUpd(bb1, i1, _, bb2, v) and i2 = -1
     }
 
     /**
@@ -1290,7 +1358,7 @@ module Make<
     /** Holds if a certain read does not have a prior reference. */
     query predicate readWithoutPriorRef(SourceVariable v, BasicBlock bb, int i) {
       variableRead(bb, i, v, true) and
-      not AdjacentSsaRefs::adjacentRefRead(_, _, bb, i, v)
+      not AdjacentSsaRefs::adjacentRefReadSkipPostUpd(_, _, bb, i, v)
     }
 
     /**
@@ -1310,7 +1378,8 @@ module Make<
       PhiNode phi, BasicBlock bbPhi, SourceVariable v, int inputRefs
     ) {
       phi.definesAt(v, bbPhi, _) and
-      inputRefs = count(BasicBlock bb, int i | AdjacentSsaRefs::adjacentRefPhi(bb, i, _, bbPhi, v)) and
+      inputRefs =
+        count(BasicBlock bb, int i | AdjacentSsaRefs::adjacentRefPhiSkipPostUpd(bb, i, _, bbPhi, v)) and
       inputRefs < 2
     }
 
@@ -1324,6 +1393,15 @@ module Make<
       inputRefs < 2
     }
 
+    /**
+     * Holds if the supposed read at `bb` and `i` has a post-update, but no
+     * actual certain read.
+     */
+    query predicate postUpdateWithoutRead(SourceVariable v, BasicBlock bb, int i) {
+      variableReadWithPostUpdate(bb, i, v, _, _) and
+      not variableRead(bb, i, v, true)
+    }
+
     /**
      * Gets counts of inconsistencies of each type.
      */
@@ -1331,49 +1409,54 @@ module Make<
       // total results from all the SSA consistency query predicates.
       type = "Read can be reached from multiple definitions" and
       result =
-        count(Definition def, SourceVariable v, BasicBlock bb, int i | nonUniqueDef(def, v, bb, i))
+        strictcount(Definition def, SourceVariable v, BasicBlock bb, int i |
+          nonUniqueDef(def, v, bb, i)
+        )
       or
       type = "Read cannot be reached from a definition" and
-      result = count(SourceVariable v, BasicBlock bb, int i | readWithoutDef(v, bb, i))
+      result = strictcount(SourceVariable v, BasicBlock bb, int i | readWithoutDef(v, bb, i))
       or
       type = "Definition cannot reach a read" and
-      result = count(Definition def, SourceVariable v | deadDef(def, v))
+      result = strictcount(Definition def, SourceVariable v | deadDef(def, v))
       or
       type = "Read is not dominated by a definition" and
       result =
-        count(Definition def, SourceVariable v, BasicBlock bb, int i |
+        strictcount(Definition def, SourceVariable v, BasicBlock bb, int i |
           notDominatedByDef(def, v, bb, i)
         )
       or
       type = "End of a basic block can be reached by multiple definitions" and
       result =
-        count(Definition def, SourceVariable v, BasicBlock bb |
+        strictcount(Definition def, SourceVariable v, BasicBlock bb |
           nonUniqueDefReachesEndOfBlock(def, v, bb)
         )
       or
       type = "Phi node has less than two inputs" and
-      result = count(PhiNode phi, int inputs | uselessPhiNode(phi, inputs))
+      result = strictcount(PhiNode phi, int inputs | uselessPhiNode(phi, inputs))
       or
       type = "Read does not have a prior reference" and
-      result = count(SourceVariable v, BasicBlock bb, int i | readWithoutPriorRef(v, bb, i))
+      result = strictcount(SourceVariable v, BasicBlock bb, int i | readWithoutPriorRef(v, bb, i))
       or
       type = "Read has multiple prior references" and
       result =
-        count(SourceVariable v, BasicBlock bb1, int i1, BasicBlock bb2, int i2 |
+        strictcount(SourceVariable v, BasicBlock bb1, int i1, BasicBlock bb2, int i2 |
           readWithMultiplePriorRefs(v, bb1, i1, bb2, i2)
         )
       or
       type = "Phi has less than 2 immediately prior references" and
       result =
-        count(PhiNode phi, BasicBlock bbPhi, SourceVariable v, int inputRefs |
+        strictcount(PhiNode phi, BasicBlock bbPhi, SourceVariable v, int inputRefs |
           phiWithoutTwoPriorRefs(phi, bbPhi, v, inputRefs)
         )
       or
       type = "Phi read has less than 2 immediately prior references" and
       result =
-        count(BasicBlock bbPhi, SourceVariable v, int inputRefs |
+        strictcount(BasicBlock bbPhi, SourceVariable v, int inputRefs |
           phiReadWithoutTwoPriorRefs(bbPhi, v, inputRefs)
         )
+      or
+      type = "Post-update without read" and
+      result = strictcount(SourceVariable v, BasicBlock bb, int i | postUpdateWithoutRead(v, bb, i))
     }
   }
 
@@ -1554,7 +1637,8 @@ module Make<
     private predicate phiInputIsGuardEquivalentWithPreviousRef(SsaPhiExt phi, BasicBlock input) {
       exists(BasicBlock prev |
         phiInputHasRead(phi, input) and
-        AdjacentSsaRefs::adjacentRefPhi(prev, _, input, phi.getBasicBlock(), phi.getSourceVariable()) and
+        AdjacentSsaRefs::adjacentRefPhiSkipPostUpd(prev, _, input, phi.getBasicBlock(),
+          phi.getSourceVariable()) and
         prev = getGuardEquivalentImmediateDominator*(input)
       )
     }
@@ -1596,7 +1680,7 @@ module Make<
         // An equivalent, but less performant, way to express this is as follows:
         // ```
         // exists(BasicBlock prev |
-        //   AdjacentSsaRefs::adjacentRefPhi(prev, _, input, phi.getBasicBlock(),
+        //   AdjacentSsaRefs::adjacentRefPhiSkipPostUpd(prev, _, input, phi.getBasicBlock(),
         //     phi.getSourceVariable()) and
         //   prev != input and
         //   exists(DfInput::Guard g, DfInput::GuardValue val |
@@ -1618,7 +1702,7 @@ module Make<
     ) {
       exists(BasicBlock bb1, int i, SourceVariable v, BasicBlock bb2 |
         phi.definesAt(pragma[only_bind_into](v), bb1, i) and
-        AdjacentSsaRefs::adjacentRefPhi(bb1, i, input, bb2, v) and
+        AdjacentSsaRefs::adjacentRefPhiSkipPostUpd(bb1, i, input, bb2, v) and
         phi2.definesAt(pragma[only_bind_into](v), bb2, _) and
         if relevantPhiInputNode(phi2, input) then relevant = true else relevant = false
       )
@@ -1632,7 +1716,7 @@ module Make<
     private predicate phiStepsToRef(SsaPhiExt phi, BasicBlock bb, int i, boolean isUse) {
       exists(SourceVariable v, BasicBlock bb1, int i1 |
         phi.definesAt(v, bb1, i1) and
-        AdjacentSsaRefs::adjacentRefRead(bb1, i1, bb, i, v)
+        AdjacentSsaRefs::adjacentRefReadSkipPostUpd(bb1, i1, bb, i, v)
       |
         isUse = true and
         variableRead(bb, i, v, true)
@@ -1664,7 +1748,24 @@ module Make<
     cached
     private newtype TNode =
       TWriteDefSource(WriteDefinition def) { DfInput::ssaDefHasSource(def) } or
-      TExprNode(DfInput::Expr e, Boolean isPost) { e = DfInput::getARead(_) } or
+      TExprNode(DfInput::Expr e, SourceVariable v, boolean isPost) {
+        exists(BasicBlock bb, int i | e.hasCfgNode(bb, i) |
+          variableRead(bb, i, v, true) and
+          isPost = false and
+          // Only materialise if 'expr' has a reaching definition.
+          // Note that the read may correspond to a different variable than 'v', but the C++
+          // instantiation currently expects this particular behaviour.
+          DfInput::getARead(_) = e
+          or
+          not postUpdate(_, _, _) and
+          variableRead(bb, i, v, true) and
+          isPost = true and
+          DfInput::getARead(_) = e
+          or
+          postUpdate(bb, i, v) and
+          isPost = true
+        )
+      } or
       TSsaDefinitionNode(DefinitionExt def) {
         not phiHasUniqNextNode(def) and
         if DfInput::includeWriteDefsInFlowStep()
@@ -1714,18 +1815,25 @@ module Make<
     abstract private class ExprNodePreOrPostImpl extends NodeImpl, TExprNode {
       DfInput::Expr e;
       boolean isPost;
+      SourceVariable v_;
 
-      ExprNodePreOrPostImpl() { this = TExprNode(e, isPost) }
+      ExprNodePreOrPostImpl() { this = TExprNode(e, v_, isPost) }
 
       /** Gets the underlying expression. */
       DfInput::Expr getExpr() { result = e }
 
+      /** Holds if this represents the access to `var` performed at `expr`. */
+      predicate isExprAndVariable(DfInput::Expr expr, SourceVariable var) { expr = e and var = v_ }
+
       override Location getLocation() {
         exists(BasicBlock bb, int i |
           e.hasCfgNode(bb, i) and
           result = bb.getNode(i).getLocation()
         )
       }
+
+      /** Gets the variable accessed at this expression. */
+      SourceVariable getSourceVariable() { result = v_ }
     }
 
     final class ExprNodePreOrPost = ExprNodePreOrPostImpl;
@@ -1744,32 +1852,43 @@ module Make<
       ExprPostUpdateNodeImpl() { isPost = true }
 
       /** Gets the pre-update expression node. */
-      ExprNode getPreUpdateNode() { result = TExprNode(e, false) }
+      ExprNode getPreUpdateNode() {
+        not postUpdate(_, _, _) and
+        result = TExprNode(e, v_, false)
+        or
+        exists(DfInput::Expr e1, BasicBlock bb1, int i1, BasicBlock bb2, int i2 |
+          result = TExprNode(e1, v_, false) and
+          e1.hasCfgNode(bb1, i1) and
+          variableReadWithPostUpdate(bb1, i1, v_, bb2, i2) and
+          e.hasCfgNode(bb2, i2)
+        )
+      }
 
       override string toString() { result = e.toString() + " [postupdate]" }
     }
 
     final class ExprPostUpdateNode = ExprPostUpdateNodeImpl;
 
-    private class ReadNodeImpl extends ExprNodeImpl {
-      private BasicBlock bb_;
-      private int i_;
-      private SourceVariable v_;
+    pragma[nomagic]
+    private predicate exprReadAt(
+      DfInput::Expr e, BasicBlock bb, int i, SourceVariable v, boolean isPost, TExprNode node
+    ) {
+      e.hasCfgNode(bb, i) and
+      node = TExprNode(e, v, isPost)
+    }
 
-      ReadNodeImpl() {
-        variableRead(bb_, i_, v_, true) and
-        this.getExpr().hasCfgNode(bb_, i_)
-      }
+    private class ReadNodeImpl extends ExprNodeImpl {
+      ReadNodeImpl() { exprReadAt(e, _, _, _, false, this) }
 
+      /** Holds if this node reads `v` at `bb,i` */
       pragma[nomagic]
       predicate readsAt(BasicBlock bb, int i, SourceVariable v) {
-        bb = bb_ and
-        i = i_ and
-        v = v_
+        exprReadAt(e, bb, i, v, false, this)
       }
     }
 
-    final private class ReadNode = ReadNodeImpl;
+    /** A node corresponding to a `(bb,i,v)` tuple from `variableRead(bb,i,v,true)` */
+    final class ReadNode = ReadNodeImpl;
 
     /** A synthesized SSA data flow node. */
     abstract private class SsaNodeImpl extends NodeImpl {
@@ -1907,7 +2026,8 @@ module Make<
         isUseStep = false
       )
       or
-      [nodeFrom, nodeFrom.(ExprPostUpdateNode).getPreUpdateNode()].(ReadNode).readsAt(bb, i, v) and
+      exprReadAt(_, bb, i, v, _, nodeFrom) and
+      not variableWrite(bb, i, v, true) and
       isUseStep = true
     }
 
@@ -1928,6 +2048,15 @@ module Make<
         )
       )
       or
+      // Flow from definition/read via post-update node
+      exists(BasicBlock bb2, int i2 |
+        AdjacentSsaRefs::adjacentRefRead(bb1, i1, bb2, i2, v) and
+        postUpdate(bb2, i2, v) and
+        not any(ReadNode r).readsAt(bb2, i2, v) and
+        not any(UncertainWriteDefinition def2).definesAt(v, bb2, i2) and
+        flowFromRefToNode(v, bb2, i2, nodeTo)
+      )
+      or
       // Flow from definition/read to phi input
       exists(BasicBlock input, BasicBlock bbPhi, DefinitionExt phi |
         AdjacentSsaRefs::adjacentRefPhi(bb1, i1, input, bbPhi, v) and
@@ -1991,13 +2120,13 @@ module Make<
         v = def.getSourceVariable() and
         if DfInput::includeWriteDefsInFlowStep()
         then nodeTo.(SsaDefinitionNode).getDefinition() = def
-        else nodeTo.(ExprNode).getExpr() = DfInput::getARead(def)
+        else nodeTo.(ExprNode).isExprAndVariable(DfInput::getARead(def), v)
       )
       or
       // Flow from SSA definition to read
       exists(DefinitionExt def |
         nodeFrom.(SsaDefinitionExtNodeImpl).getDefExt() = def and
-        nodeTo.(ExprNode).getExpr() = DfInput::getARead(def) and
+        nodeTo.(ExprNode).isExprAndVariable(DfInput::getARead(def), v) and
         v = def.getSourceVariable()
       )
     }
@@ -2103,7 +2232,7 @@ module Make<
             e = DfInput::getARead(def) and
             e.hasCfgNode(bb, _) and
             DfInput::guardControlsBlock(g, bb, val) and
-            result.(ExprNode).getExpr() = e
+            result.(ExprNode).isExprAndVariable(e, def.getSourceVariable())
           )
           or
           // guard controls input block to a phi node
@@ -2118,6 +2247,17 @@ module Make<
         )
       }
     }
+
+    /** Provides consistency checks that depend on the DataFlowIntegration inputs. */
+    module DfConsistency {
+      /**
+       * The given `read` reads multiple variables at once. `var` is bound to one of them.
+       */
+      query predicate ambiguousReadNode(ReadNode read, SourceVariable var) {
+        strictcount(SourceVariable v | read.readsAt(_, _, v)) > 1 and
+        read.readsAt(_, _, var)
+      }
+    }
   }
 
   /**
@@ -2127,6 +2267,7 @@ module Make<
   module TestAdjacentRefs {
     private newtype TRef =
       TRefRead(BasicBlock bb, int i, SourceVariable v) { variableRead(bb, i, v, true) } or
+      TRefPostUpdate(BasicBlock bb, int i, SourceVariable v) { postUpdate(bb, i, v) } or
       TRefDef(Definition def) or
       TRefPhiRead(BasicBlock bb, SourceVariable v) { synthPhiRead(bb, v) }
 
@@ -2139,6 +2280,8 @@ module Make<
       SourceVariable getSourceVariable() {
         this = TRefRead(_, _, result)
         or
+        this = TRefPostUpdate(_, _, result)
+        or
         exists(Definition def | this = TRefDef(def) and def.getSourceVariable() = result)
         or
         this = TRefPhiRead(_, result)
@@ -2151,6 +2294,9 @@ module Make<
       string toString() {
         this = TRefRead(_, _, _) and result = "SSA read(" + this.getSourceVariable() + ")"
         or
+        this = TRefPostUpdate(_, _, _) and
+        result = "SSA post update(" + this.getSourceVariable() + ")"
+        or
         exists(Definition def | this = TRefDef(def) and result = def.toString())
         or
         this = TRefPhiRead(_, _) and result = "SSA phi read(" + this.getSourceVariable() + ")"
@@ -2158,8 +2304,8 @@ module Make<
 
       /** Gets the location of this SSA reference. */
       Location getLocation() {
-        exists(BasicBlock bb, int i |
-          this = TRefRead(bb, i, _) and bb.getNode(i).getLocation() = result
+        exists(BasicBlock bb, int i | this = TRefRead(bb, i, _) or this = TRefPostUpdate(bb, i, _) |
+          bb.getNode(i).getLocation() = result
         )
         or
         exists(Definition def | this = TRefDef(def) and def.getLocation() = result)
@@ -2171,6 +2317,8 @@ module Make<
       predicate accessAt(BasicBlock bb, int i, SourceVariable v) {
         this = TRefRead(bb, i, v)
         or
+        this = TRefPostUpdate(bb, i, v)
+        or
         exists(Definition def | this = TRefDef(def) and def.definesAt(v, bb, i))
         or
         this = TRefPhiRead(bb, v) and i = -1
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 30c04dc81b95..5acf787b4f61 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 2.0.31-dev
+version: 2.0.38-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/threat-models/CHANGELOG.md b/shared/threat-models/CHANGELOG.md
index d75ab9a9e2d7..285b5d7169f2 100644
--- a/shared/threat-models/CHANGELOG.md
+++ b/shared/threat-models/CHANGELOG.md
@@ -1,3 +1,33 @@
+## 1.1.1
+
+No user-facing changes.
+
+## 1.1.0
+
+### New Features
+
+* Added the opt-in `ai` threat model for LLM-generated data. No built-in source models are included.
+
+## 1.0.59
+
+No user-facing changes.
+
+## 1.0.58
+
+No user-facing changes.
+
+## 1.0.57
+
+No user-facing changes.
+
+## 1.0.56
+
+No user-facing changes.
+
+## 1.0.55
+
+No user-facing changes.
+
 ## 1.0.54
 
 No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.55.md b/shared/threat-models/change-notes/released/1.0.55.md
new file mode 100644
index 000000000000..fd53dce64a9f
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.55.md
@@ -0,0 +1,3 @@
+## 1.0.55
+
+No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.56.md b/shared/threat-models/change-notes/released/1.0.56.md
new file mode 100644
index 000000000000..3b784cb7d975
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.56.md
@@ -0,0 +1,3 @@
+## 1.0.56
+
+No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.57.md b/shared/threat-models/change-notes/released/1.0.57.md
new file mode 100644
index 000000000000..18a94c4bca4a
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.57.md
@@ -0,0 +1,3 @@
+## 1.0.57
+
+No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.58.md b/shared/threat-models/change-notes/released/1.0.58.md
new file mode 100644
index 000000000000..f43459b898c0
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.58.md
@@ -0,0 +1,3 @@
+## 1.0.58
+
+No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.59.md b/shared/threat-models/change-notes/released/1.0.59.md
new file mode 100644
index 000000000000..071c0337a4d5
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.59.md
@@ -0,0 +1,3 @@
+## 1.0.59
+
+No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.1.0.md b/shared/threat-models/change-notes/released/1.1.0.md
new file mode 100644
index 000000000000..ca7b7109306d
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.1.0.md
@@ -0,0 +1,5 @@
+## 1.1.0
+
+### New Features
+
+* Added the opt-in `ai` threat model for LLM-generated data. No built-in source models are included.
diff --git a/shared/threat-models/change-notes/released/1.1.1.md b/shared/threat-models/change-notes/released/1.1.1.md
new file mode 100644
index 000000000000..7fb56d366105
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.1.1.md
@@ -0,0 +1,3 @@
+## 1.1.1
+
+No user-facing changes.
diff --git a/shared/threat-models/codeql-pack.release.yml b/shared/threat-models/codeql-pack.release.yml
index c3c3b0f4418a..1a19084be3f7 100644
--- a/shared/threat-models/codeql-pack.release.yml
+++ b/shared/threat-models/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.54
+lastReleaseVersion: 1.1.1
diff --git a/shared/threat-models/ext/threat-model-grouping.model.yml b/shared/threat-models/ext/threat-model-grouping.model.yml
index 1c8229b81f6a..414cbda6fabe 100644
--- a/shared/threat-models/ext/threat-model-grouping.model.yml
+++ b/shared/threat-models/ext/threat-model-grouping.model.yml
@@ -30,3 +30,5 @@ extensions:
       - ["file-write", "all"]
       - ["reverse-dns", "all"]
       - ["view-component-input", "all"]
+      # AI threat models
+      - ["ai", "all"]
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index 785d18c741c0..23ea2cf9c981 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.55-dev
+version: 1.1.2-dev
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tree-sitter-extractor/Cargo.toml b/shared/tree-sitter-extractor/Cargo.toml
index 1ad18a6df5a5..ca745618e75e 100644
--- a/shared/tree-sitter-extractor/Cargo.toml
+++ b/shared/tree-sitter-extractor/Cargo.toml
@@ -10,19 +10,19 @@ flate2 = "1.1"
 globset = "0.4"
 tree-sitter = ">= 0.23.0"
 tracing = "0.1"
-tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
-rayon = "1.11.0"
-regex = "1.11.3"
+tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
+rayon = "1.12.0"
+regex = "1.13.1"
 encoding = "0.2"
-lazy_static = "1.5.0"
+lazy_static = "1.5.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-chrono = { version = "0.4.42", features = ["serde"] }
+chrono = { version = "0.4.45", features = ["serde"] }
 num_cpus = "1.17.0"
-zstd = "0.13.3"
+zstd = "0.14.2"
 yeast = { path = "../yeast" }
 
 [dev-dependencies]
 tree-sitter-ql = "0.23.1"
 tree-sitter-json = "0.24.8"
-rand = "0.9.2"
+rand = "0.10.3"
diff --git a/shared/tree-sitter-extractor/src/autobuilder.rs b/shared/tree-sitter-extractor/src/autobuilder.rs
index f43ead71a761..950a3b5a151a 100644
--- a/shared/tree-sitter-extractor/src/autobuilder.rs
+++ b/shared/tree-sitter-extractor/src/autobuilder.rs
@@ -76,7 +76,7 @@ impl Autobuilder {
             cmd.arg(format!("--size-limit={limit}"));
         }
 
-        cmd.arg(format!("--language={}", &self.language));
+        cmd.arg(format!("--language={}", self.language));
         cmd.arg("--working-dir=.");
         cmd.arg(&self.database);
 
diff --git a/shared/tree-sitter-extractor/src/diagnostics.rs b/shared/tree-sitter-extractor/src/diagnostics.rs
index cd6f685e639e..412647ee07a5 100644
--- a/shared/tree-sitter-extractor/src/diagnostics.rs
+++ b/shared/tree-sitter-extractor/src/diagnostics.rs
@@ -119,24 +119,24 @@ impl LogWriter {
             Some(Severity::Note) => tracing::info!("{}", full_error_message),
             None => tracing::debug!("{}", full_error_message),
         }
-        if self.inner.is_none() {
-            if let Some(path) = self.path.as_ref() {
-                match std::fs::OpenOptions::new()
-                    .create(true)
-                    .append(true)
-                    .open(path)
-                {
-                    Err(e) => {
-                        tracing::error!(
-                            "Could not open log file '{}': {}",
-                            &path.to_string_lossy(),
-                            e
-                        );
-                        self.path = None;
-                        self.inner = None
-                    }
-                    Ok(file) => self.inner = Some(std::io::BufWriter::new(file)),
+        if self.inner.is_none()
+            && let Some(path) = self.path.as_ref()
+        {
+            match std::fs::OpenOptions::new()
+                .create(true)
+                .append(true)
+                .open(path)
+            {
+                Err(e) => {
+                    tracing::error!(
+                        "Could not open log file '{}': {}",
+                        &path.to_string_lossy(),
+                        e
+                    );
+                    self.path = None;
+                    self.inner = None
                 }
+                Ok(file) => self.inner = Some(std::io::BufWriter::new(file)),
             }
         }
         if let Some(mut writer) = self.inner.as_mut() {
diff --git a/shared/tree-sitter-extractor/src/extractor/desugaring.rs b/shared/tree-sitter-extractor/src/extractor/desugaring.rs
index c52659750c77..3aa7ad36e897 100644
--- a/shared/tree-sitter-extractor/src/extractor/desugaring.rs
+++ b/shared/tree-sitter-extractor/src/extractor/desugaring.rs
@@ -63,7 +63,7 @@ impl LanguageExtractor for LanguageSpec {
         trap_writer: &mut trap::Writer,
         path: &std::path::Path,
         source: &[u8],
-    ) {
+    ) -> Result<(), String> {
         crate::extractor::extract_parsed(
             self.parser.as_ref(),
             self.prefix,
@@ -74,7 +74,7 @@ impl LanguageExtractor for LanguageSpec {
             path,
             source,
             self.desugarer.as_ref(),
-        );
+        )
     }
 }
 
diff --git a/shared/tree-sitter-extractor/src/extractor/driver.rs b/shared/tree-sitter-extractor/src/extractor/driver.rs
index d97d8f4c75c2..6e6172b7425b 100644
--- a/shared/tree-sitter-extractor/src/extractor/driver.rs
+++ b/shared/tree-sitter-extractor/src/extractor/driver.rs
@@ -27,6 +27,9 @@ pub(crate) trait LanguageExtractor: Sync {
     /// Build the TRAP node-type schema used to validate emitted tuples.
     fn build_schema(&self) -> std::io::Result<NodeTypeMap>;
     /// Extract a single file's `source` into `trap_writer`.
+    ///
+    /// A returned error is logged as a failure of this file only; the driver
+    /// archives its source, omits its TRAP, and continues.
     fn extract_file(
         &self,
         schema: &NodeTypeMap,
@@ -34,7 +37,7 @@ pub(crate) trait LanguageExtractor: Sync {
         trap_writer: &mut trap::Writer,
         path: &Path,
         source: &[u8],
-    );
+    ) -> Result<(), String>;
 }
 
 /// Drive extraction over `languages` for every file listed in `file_lists`.
@@ -171,7 +174,7 @@ pub(crate) fn run_extractor<L: LanguageExtractor>(
                             languages_processed[i] = true;
                             let lang = &languages[i];
 
-                            lang.extract_file(
+                            let result = lang.extract_file(
                                 &schemas[i],
                                 &mut diagnostics_writer,
                                 &mut trap_writer,
@@ -180,7 +183,18 @@ pub(crate) fn run_extractor<L: LanguageExtractor>(
                             );
                             std::fs::create_dir_all(src_archive_file.parent().unwrap())?;
                             std::fs::copy(&path, &src_archive_file)?;
-                            write_trap(trap_dir, &path, &trap_writer, trap_compression)?;
+                            match result {
+                                Ok(()) => {
+                                    write_trap(trap_dir, &path, &trap_writer, trap_compression)?;
+                                }
+                                Err(error) => {
+                                    tracing::error!(
+                                        file = %path.display(),
+                                        error,
+                                        "Failed to extract file"
+                                    );
+                                }
+                            }
                         }
                     }
                 }
@@ -208,3 +222,82 @@ fn write_trap(
     std::fs::create_dir_all(trap_file.parent().unwrap())?;
     trap_writer.write_to_file(&trap_file, trap_compression)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::io::Write;
+
+    struct TestLanguage {
+        file_globs: Vec<String>,
+    }
+
+    impl LanguageExtractor for TestLanguage {
+        fn file_globs(&self) -> &[String] {
+            &self.file_globs
+        }
+
+        fn build_schema(&self) -> std::io::Result<NodeTypeMap> {
+            Ok(NodeTypeMap::new())
+        }
+
+        fn extract_file(
+            &self,
+            _schema: &NodeTypeMap,
+            _diagnostics_writer: &mut diagnostics::LogWriter,
+            trap_writer: &mut trap::Writer,
+            _path: &Path,
+            source: &[u8],
+        ) -> Result<(), String> {
+            if source == b"bad" {
+                Err("invalid parser output".to_string())
+            } else {
+                trap_writer.comment("success".to_string());
+                Ok(())
+            }
+        }
+    }
+
+    #[test]
+    fn file_extraction_error_does_not_abort_other_files() {
+        let root = std::env::temp_dir().join(format!("codeql-extractor-{}", rand::random::<u64>()));
+        let source_dir = root.join("input");
+        let source_archive_dir = root.join("source-archive");
+        let trap_dir = root.join("trap");
+        std::fs::create_dir_all(&source_dir).unwrap();
+
+        let good_path = source_dir.join("good.test");
+        let bad_path = source_dir.join("bad.test");
+        std::fs::write(&good_path, b"good").unwrap();
+        std::fs::write(&bad_path, b"bad").unwrap();
+
+        let file_list = root.join("files.txt");
+        let mut file = std::fs::File::create(&file_list).unwrap();
+        writeln!(file, "{}", good_path.display()).unwrap();
+        writeln!(file, "{}", bad_path.display()).unwrap();
+
+        run_extractor(
+            "test",
+            &[TestLanguage {
+                file_globs: vec!["*.test".to_string()],
+            }],
+            &trap_dir,
+            &source_archive_dir,
+            &[file_list],
+            &Ok(trap::Compression::Gzip),
+        )
+        .unwrap();
+
+        let good_trap = file_paths::path_for(&trap_dir, &good_path, "trap.gz", None);
+        let bad_trap = file_paths::path_for(&trap_dir, &bad_path, "trap.gz", None);
+        assert!(good_trap.is_file());
+        assert!(!bad_trap.exists());
+
+        let archived_good = file_paths::path_for(&source_archive_dir, &good_path, "", None);
+        let archived_bad = file_paths::path_for(&source_archive_dir, &bad_path, "", None);
+        assert!(archived_good.is_file());
+        assert!(archived_bad.is_file());
+
+        std::fs::remove_dir_all(root).unwrap();
+    }
+}
diff --git a/shared/tree-sitter-extractor/src/extractor/mod.rs b/shared/tree-sitter-extractor/src/extractor/mod.rs
index 1a8b9e820164..47017084d2d8 100644
--- a/shared/tree-sitter-extractor/src/extractor/mod.rs
+++ b/shared/tree-sitter-extractor/src/extractor/mod.rs
@@ -66,7 +66,7 @@ impl<'a> AstNode for Node<'a> {
     }
 }
 
-impl AstNode for yeast::Node {
+impl<I: yeast::TreeId> AstNode for yeast::Node<I> {
     fn kind(&self) -> &str {
         yeast::Node::kind_name(self)
     }
@@ -419,7 +419,9 @@ fn collect_extras(node: Node<'_>, source: &[u8], out: &mut Vec<ExtraToken>) {
 /// TRAP extraction, and the `extra` tokens (comments and similar, which the
 /// desugared AST does not carry) are emitted from the side channel. Both
 /// tree-sitter grammars (via [`tree_sitter_parser`]) and custom parsers plug in
-/// here; languages that don't desugar use [`extract`] instead.
+/// here; languages that don't desugar use [`extract`] instead. Parse and
+/// desugaring errors are returned to the multi-file driver so it can skip only
+/// this file and continue extracting the rest.
 #[allow(clippy::too_many_arguments)]
 pub fn extract_parsed(
     parse: &(dyn Fn(&[u8]) -> Result<ParsedTree, String> + Send + Sync),
@@ -431,7 +433,7 @@ pub fn extract_parsed(
     path: &Path,
     source: &[u8],
     desugarer: &dyn yeast::Desugarer,
-) {
+) -> Result<(), String> {
     let path_str = file_paths::normalize_and_transform_path(path, transformer);
     let source_root = std::env::current_dir()
         .ok()
@@ -441,6 +443,11 @@ pub fn extract_parsed(
     let _enter = span.enter();
     tracing::debug!("extracting: {}", path_str);
 
+    let parsed = parse(source).map_err(|e| format!("Parsing failed: {e}"))?;
+    let ast = desugarer
+        .run_from_ast(parsed.ast)
+        .map_err(|e| format!("Desugaring failed: {e}"))?;
+
     trap_writer.comment(format!("Auto-generated TRAP file for {path_str}"));
     let file_label = populate_file(trap_writer, path, transformer);
     let mut visitor = Visitor::new(
@@ -453,16 +460,13 @@ pub fn extract_parsed(
         schema,
     );
 
-    let parsed = parse(source).unwrap_or_else(|e| panic!("Parsing failed for {path_str}: {e}"));
-    let ast = desugarer
-        .run_from_ast(parsed.ast)
-        .unwrap_or_else(|e| panic!("Desugaring failed for {path_str}: {e}"));
     traverse_yeast(&ast, &mut visitor);
     // Comments and other `extra` tokens are not part of the desugared AST; emit
     // them directly from the parser's side channel.
     for extra in &parsed.extras {
         visitor.emit_extra(extra);
     }
+    Ok(())
 }
 
 /// A lightweight [`AstNode`] over a piece of side-channel `extra` content
@@ -904,10 +908,11 @@ impl<'a> Visitor<'a> {
                 if tp == single_type {
                     return true;
                 }
-                if let EntryKind::Union { members } = &self.schema.get(single_type).unwrap().kind {
-                    if self.type_matches_set(tp, members) {
-                        return true;
-                    }
+                if let EntryKind::Union { members, .. } =
+                    &self.schema.get(single_type).unwrap().kind
+                    && self.type_matches_set(tp, members)
+                {
+                    return true;
                 }
             }
             node_types::FieldTypeInfo::Multiple { types, .. } => {
@@ -926,10 +931,10 @@ impl<'a> Visitor<'a> {
             return true;
         }
         for other in types.iter() {
-            if let EntryKind::Union { members } = &self.schema.get(other).unwrap().kind {
-                if self.type_matches_set(tp, members) {
-                    return true;
-                }
+            if let EntryKind::Union { members, .. } = &self.schema.get(other).unwrap().kind
+                && self.type_matches_set(tp, members)
+            {
+                return true;
             }
         }
         false
@@ -1038,7 +1043,7 @@ fn traverse(tree: &Tree, visitor: &mut Visitor) {
     }
 }
 
-fn traverse_yeast(tree: &yeast::Ast, visitor: &mut Visitor) {
+fn traverse_yeast(tree: &yeast::OutputAst, visitor: &mut Visitor) {
     let mut cursor = tree.walk();
     visitor.enter_node(cursor.node());
     let mut recurse = true;
diff --git a/shared/tree-sitter-extractor/src/extractor/simple.rs b/shared/tree-sitter-extractor/src/extractor/simple.rs
index 1c6691fa8cf3..329c9caddc68 100644
--- a/shared/tree-sitter-extractor/src/extractor/simple.rs
+++ b/shared/tree-sitter-extractor/src/extractor/simple.rs
@@ -32,7 +32,7 @@ impl LanguageExtractor for LanguageSpec {
         trap_writer: &mut trap::Writer,
         path: &std::path::Path,
         source: &[u8],
-    ) {
+    ) -> Result<(), String> {
         crate::extractor::extract(
             &self.ts_language,
             self.prefix,
@@ -44,6 +44,7 @@ impl LanguageExtractor for LanguageSpec {
             source,
             &[],
         );
+        Ok(())
     }
 }
 
diff --git a/shared/tree-sitter-extractor/src/generator/dbscheme.rs b/shared/tree-sitter-extractor/src/generator/dbscheme.rs
index 87a15cfbeb2a..434d28735b7f 100644
--- a/shared/tree-sitter-extractor/src/generator/dbscheme.rs
+++ b/shared/tree-sitter-extractor/src/generator/dbscheme.rs
@@ -50,7 +50,7 @@ pub enum DbColumnType {
 
 impl fmt::Display for Case<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        writeln!(f, "case @{}.{} of", &self.name, &self.column)?;
+        writeln!(f, "case @{}.{} of", self.name, self.column)?;
         let mut sep = " ";
         for (c, tp) in &self.branches {
             writeln!(f, "{sep} {c} = @{tp}")?;
diff --git a/shared/tree-sitter-extractor/src/generator/mod.rs b/shared/tree-sitter-extractor/src/generator/mod.rs
index cf445aaaac7f..81bf0955cd6e 100644
--- a/shared/tree-sitter-extractor/src/generator/mod.rs
+++ b/shared/tree-sitter-extractor/src/generator/mod.rs
@@ -65,14 +65,14 @@ pub fn generate(
 
     for language in languages {
         let prefix = node_types::to_snake_case(&language.name);
-        let ast_node_name = format!("{}_ast_node", &prefix);
-        let node_location_table_name = format!("{}_ast_node_location", &prefix);
-        let node_parent_table_name = format!("{}_ast_node_parent", &prefix);
-        let token_name = format!("{}_token", &prefix);
-        let tokeninfo_name = format!("{}_tokeninfo", &prefix);
-        let trivia_token_name = format!("{}_trivia_token", &prefix);
-        let trivia_tokeninfo_name = format!("{}_trivia_tokeninfo", &prefix);
-        let reserved_word_name = format!("{}_reserved_word", &prefix);
+        let ast_node_name = format!("{}_ast_node", prefix);
+        let node_location_table_name = format!("{}_ast_node_location", prefix);
+        let node_parent_table_name = format!("{}_ast_node_parent", prefix);
+        let token_name = format!("{}_token", prefix);
+        let tokeninfo_name = format!("{}_tokeninfo", prefix);
+        let trivia_token_name = format!("{}_trivia_token", prefix);
+        let trivia_tokeninfo_name = format!("{}_trivia_tokeninfo", prefix);
+        let reserved_word_name = format!("{}_reserved_word", prefix);
         // When a desugaring is configured, comments and other `extra` nodes are
         // preserved from the original parse tree as `TriviaToken`s.
         let has_trivia_tokens = language.desugar.is_some();
@@ -125,7 +125,7 @@ pub fn generate(
         let mut body = vec![];
 
         let facade_import_name = if use_facade_ast {
-            format!("FacadeAst::{}", &language.name)
+            format!("FacadeAst::{}", language.name)
         } else {
             language.name.clone() // If not using a facade AST, treat the module itself as the facade module.
         };
@@ -389,8 +389,8 @@ fn convert_nodes(
     let mut entries = Vec::new();
     let mut ast_node_members: Set<&str> = Set::new();
     let token_kinds: Map<&str, usize> = nodes
-        .iter()
-        .filter_map(|(_, node)| match &node.kind {
+        .values()
+        .filter_map(|node| match &node.kind {
             node_types::EntryKind::Token { kind_id } => {
                 Some((node.dbscheme_name.as_str(), *kind_id))
             }
@@ -399,7 +399,9 @@ fn convert_nodes(
         .collect();
     for node in nodes.values() {
         match &node.kind {
-            node_types::EntryKind::Union { members: n_members } => {
+            node_types::EntryKind::Union {
+                members: n_members, ..
+            } => {
                 // It's a tree-sitter supertype node, for which we create a union
                 // type.
                 let members: Set<&str> = n_members
diff --git a/shared/tree-sitter-extractor/src/generator/ql.rs b/shared/tree-sitter-extractor/src/generator/ql.rs
index f114e251af21..c780aec681cd 100644
--- a/shared/tree-sitter-extractor/src/generator/ql.rs
+++ b/shared/tree-sitter-extractor/src/generator/ql.rs
@@ -50,7 +50,7 @@ impl fmt::Display for Import<'_> {
         if self.is_private {
             write!(f, "private ")?;
         }
-        write!(f, "import {}", &self.module)?;
+        write!(f, "import {}", self.module)?;
         if let Some(name) = &self.alias {
             write!(f, " as {name}")?;
         }
@@ -82,13 +82,13 @@ impl fmt::Display for Class<'_> {
             write!(f, "private ")?;
         }
         if let Some(alias) = &self.alias {
-            write!(f, "class {} = {alias};", &self.name)?;
+            write!(f, "class {} = {alias};", self.name)?;
             return Ok(());
         }
         if self.is_abstract {
             write!(f, "abstract ")?;
         }
-        write!(f, "class {} extends ", &self.name)?;
+        write!(f, "class {} extends ", self.name)?;
         for (index, supertype) in self.supertypes.iter().enumerate() {
             if index > 0 {
                 write!(f, ", ")?;
@@ -365,7 +365,7 @@ impl fmt::Display for FormalParameter<'_> {
 /// Generates a QL library by writing the given `elements` to the `file`.
 pub fn write(file: &mut dyn std::io::Write, elements: &[TopLevel]) -> std::io::Result<()> {
     for element in elements {
-        write!(file, "{}\n\n", &element)?;
+        write!(file, "{}\n\n", element)?;
     }
     Ok(())
 }
diff --git a/shared/tree-sitter-extractor/src/generator/ql_gen.rs b/shared/tree-sitter-extractor/src/generator/ql_gen.rs
index fe6f9a2a828b..bd05de8316d8 100644
--- a/shared/tree-sitter-extractor/src/generator/ql_gen.rs
+++ b/shared/tree-sitter-extractor/src/generator/ql_gen.rs
@@ -629,30 +629,8 @@ fn create_field_getters<'a>(
     field: &'a node_types::Field,
     nodes: &'a node_types::NodeTypeMap,
 ) -> (Vec<ql::Predicate<'a>>, Option<ql::Expression<'a>>) {
-    let return_type = match &field.type_info {
-        node_types::FieldTypeInfo::Single(t) => {
-            Some(ql::Type::Facade(&nodes.get(t).unwrap().ql_class_name))
-        }
-        node_types::FieldTypeInfo::Multiple {
-            types: _,
-            dbscheme_union: _,
-            ql_class,
-        } => Some(ql::Type::Facade(ql_class)),
-        node_types::FieldTypeInfo::ReservedWordInt(_) => Some(ql::Type::String),
-    };
-    let formal_parameters = match &field.storage {
-        node_types::Storage::Column { .. } => vec![],
-        node_types::Storage::Table { has_index, .. } => {
-            if *has_index {
-                vec![ql::FormalParameter {
-                    name: "i",
-                    param_type: ql::Type::Int,
-                }]
-            } else {
-                vec![]
-            }
-        }
-    };
+    let return_type = field_getter_return_type(field, nodes);
+    let formal_parameters = field_getter_formal_parameters(field);
 
     // For the expression to get a value, what variable name should the result
     // be bound to?
@@ -742,16 +720,7 @@ fn create_field_getters<'a>(
             (get_value, Some(get_value_any_index))
         }
     };
-    let qldoc = match &field.name {
-        Some(name) => format!("Gets the node corresponding to the field `{name}`."),
-        None => {
-            if formal_parameters.is_empty() {
-                "Gets the child of this node.".to_owned()
-            } else {
-                "Gets the `i`th child of this node.".to_owned()
-            }
-        }
-    };
+    let qldoc = field_getter_qldoc(field, !formal_parameters.is_empty());
     let mut predicates = vec![ql::Predicate {
         qldoc: Some(qldoc.clone()),
         name: &field.getter_name,
@@ -766,7 +735,7 @@ fn create_field_getters<'a>(
 
     if let Some(any_getter_name) = &field.any_getter_name {
         predicates.push(ql::Predicate {
-            qldoc: Some(qldoc.clone()),
+            qldoc: Some(qldoc),
             name: any_getter_name,
             overridden: false,
             is_private: false,
@@ -788,12 +757,92 @@ fn create_field_getters<'a>(
     (predicates, optional_expr)
 }
 
+fn field_getter_return_type<'a>(
+    field: &'a node_types::Field,
+    nodes: &'a node_types::NodeTypeMap,
+) -> Option<ql::Type<'a>> {
+    match &field.type_info {
+        node_types::FieldTypeInfo::Single(t) => {
+            Some(ql::Type::Facade(&nodes.get(t).unwrap().ql_class_name))
+        }
+        node_types::FieldTypeInfo::Multiple {
+            types: _,
+            dbscheme_union: _,
+            ql_class,
+        } => Some(ql::Type::Facade(ql_class)),
+        node_types::FieldTypeInfo::ReservedWordInt(_) => Some(ql::Type::String),
+    }
+}
+
+fn field_getter_formal_parameters(field: &node_types::Field) -> Vec<ql::FormalParameter<'_>> {
+    match &field.storage {
+        node_types::Storage::Column { .. } => vec![],
+        node_types::Storage::Table { has_index, .. } => {
+            if *has_index {
+                vec![ql::FormalParameter {
+                    name: "i",
+                    param_type: ql::Type::Int,
+                }]
+            } else {
+                vec![]
+            }
+        }
+    }
+}
+
+fn field_getter_qldoc(field: &node_types::Field, has_index: bool) -> String {
+    match &field.name {
+        Some(name) => format!("Gets the node corresponding to the field `{name}`."),
+        None => {
+            if has_index {
+                "Gets the `i`th child of this node.".to_owned()
+            } else {
+                "Gets the child of this node.".to_owned()
+            }
+        }
+    }
+}
+
+fn create_supertype_field_getters<'a>(
+    field: &'a node_types::Field,
+    nodes: &'a node_types::NodeTypeMap,
+) -> Vec<ql::Predicate<'a>> {
+    let return_type = field_getter_return_type(field, nodes);
+    let formal_parameters = field_getter_formal_parameters(field);
+    let qldoc = field_getter_qldoc(field, !formal_parameters.is_empty());
+    let mut predicates = vec![ql::Predicate {
+        qldoc: Some(qldoc.clone()),
+        name: &field.getter_name,
+        overridden: false,
+        is_private: false,
+        is_final: false,
+        return_type: return_type.clone(),
+        formal_parameters,
+        body: ql::Expression::Pred("none", vec![]),
+        overlay: None,
+    }];
+    if let Some(any_getter_name) = &field.any_getter_name {
+        predicates.push(ql::Predicate {
+            qldoc: Some(qldoc),
+            name: any_getter_name,
+            overridden: false,
+            is_private: false,
+            is_final: false,
+            return_type,
+            formal_parameters: vec![],
+            body: ql::Expression::Pred("none", vec![]),
+            overlay: None,
+        });
+    }
+    predicates
+}
+
 fn compute_direct_supertypes(
     nodes: &node_types::NodeTypeMap,
 ) -> std::collections::BTreeMap<node_types::TypeName, BTreeSet<&str>> {
     let mut supertypes = std::collections::BTreeMap::new();
     for node in nodes.values() {
-        if let node_types::EntryKind::Union { members } = &node.kind {
+        if let node_types::EntryKind::Union { members, .. } = &node.kind {
             for member in members {
                 supertypes
                     .entry(member.clone())
@@ -828,16 +877,105 @@ fn class_supertypes<'a>(
     supertypes
 }
 
+#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
+struct PredicateSignature<'a> {
+    name: &'a str,
+    arity: usize,
+}
+
+fn field_predicate_signatures(field: &node_types::Field) -> Vec<PredicateSignature<'_>> {
+    let getter_arity = match field.storage {
+        node_types::Storage::Table {
+            has_index: true, ..
+        } => 1,
+        _ => 0,
+    };
+    let mut signatures = vec![PredicateSignature {
+        name: &field.getter_name,
+        arity: getter_arity,
+    }];
+    if let Some(any_getter_name) = &field.any_getter_name {
+        signatures.push(PredicateSignature {
+            name: any_getter_name,
+            arity: 0,
+        });
+    }
+    signatures
+}
+
+/// Builds an index of the field getter signatures exposed by each generated
+/// class, including getters inherited from supertypes.
+fn compute_exposed_predicate_signatures(
+    nodes: &node_types::NodeTypeMap,
+) -> std::collections::BTreeMap<node_types::TypeName, BTreeSet<PredicateSignature<'_>>> {
+    let mut exposed = nodes
+        .iter()
+        .map(|(type_name, node)| {
+            let fields = match &node.kind {
+                node_types::EntryKind::Union { fields, .. }
+                | node_types::EntryKind::Table { fields, .. } => fields.as_slice(),
+                node_types::EntryKind::Token { .. } => &[],
+            };
+            let signatures = fields.iter().flat_map(field_predicate_signatures).collect();
+            (type_name.clone(), signatures)
+        })
+        .collect::<std::collections::BTreeMap<_, BTreeSet<_>>>();
+
+    loop {
+        let mut changed = false;
+        for (supertype, node) in nodes {
+            let node_types::EntryKind::Union { members, .. } = &node.kind else {
+                continue;
+            };
+            let inherited = exposed.get(supertype).cloned().unwrap_or_default();
+            for member in members {
+                let member_signatures = exposed.entry(member.clone()).or_default();
+                let previous_len = member_signatures.len();
+                member_signatures.extend(inherited.iter().copied());
+                changed |= member_signatures.len() != previous_len;
+            }
+        }
+        if !changed {
+            break;
+        }
+    }
+
+    exposed
+}
+
+fn is_predicate_inherited(
+    type_name: &node_types::TypeName,
+    predicate: &ql::Predicate,
+    nodes: &node_types::NodeTypeMap,
+    exposed: &std::collections::BTreeMap<node_types::TypeName, BTreeSet<PredicateSignature<'_>>>,
+) -> bool {
+    let signature = PredicateSignature {
+        name: predicate.name,
+        arity: predicate.formal_parameters.len(),
+    };
+    nodes.iter().any(|(supertype, node)| {
+        matches!(
+            &node.kind,
+            node_types::EntryKind::Union { members, .. }
+                if members.contains(type_name)
+                    && exposed
+                        .get(supertype)
+                        .is_some_and(|signatures| signatures.contains(&signature))
+        )
+    })
+}
+
 /// Converts the given node types into CodeQL classes wrapping the dbscheme.
 pub fn convert_nodes(nodes: &node_types::NodeTypeMap) -> Vec<ql::TopLevel<'_>> {
     let mut classes = Vec::new();
     let mut token_kinds = BTreeSet::new();
     let direct_supertypes = compute_direct_supertypes(nodes);
+    let exposed_predicate_signatures = compute_exposed_predicate_signatures(nodes);
     for (type_name, node) in nodes {
-        if let node_types::EntryKind::Token { .. } = &node.kind {
-            if type_name.named {
-                token_kinds.insert(&type_name.kind);
-            }
+        if let node_types::EntryKind::Token { .. } = &node.kind
+            && type_name.named
+        {
+            token_kinds.insert(&type_name.kind);
         }
     }
 
@@ -863,9 +1001,22 @@ pub fn convert_nodes(nodes: &node_types::NodeTypeMap) -> Vec<ql::TopLevel<'_>> {
                     }));
                 }
             }
-            node_types::EntryKind::Union { members: _ } => {
+            node_types::EntryKind::Union { fields, .. } => {
                 // It's a tree-sitter supertype node, so we're wrapping a dbscheme
                 // union type.
+                let predicates = fields
+                    .iter()
+                    .flat_map(|field| create_supertype_field_getters(field, nodes))
+                    .map(|mut predicate| {
+                        predicate.overridden = is_predicate_inherited(
+                            type_name,
+                            &predicate,
+                            nodes,
+                            &exposed_predicate_signatures,
+                        );
+                        predicate
+                    })
+                    .collect();
                 classes.push(ql::TopLevel::Class(ql::Class {
                     qldoc: None,
                     name: &node.ql_class_name,
@@ -879,7 +1030,7 @@ pub fn convert_nodes(nodes: &node_types::NodeTypeMap) -> Vec<ql::TopLevel<'_>> {
                         &direct_supertypes,
                     ),
                     characteristic_predicate: None,
-                    predicates: vec![],
+                    predicates,
                 }));
             }
             node_types::EntryKind::Table {
@@ -923,13 +1074,21 @@ pub fn convert_nodes(nodes: &node_types::NodeTypeMap) -> Vec<ql::TopLevel<'_>> {
                 // - predicates to access the fields,
                 // - the QL expressions to access the fields that will be part of getAFieldOrChild.
                 for field in fields {
-                    let (get_preds, get_child_expr) = create_field_getters(
+                    let (mut get_preds, get_child_expr) = create_field_getters(
                         main_table_name,
                         main_table_arity,
                         &mut main_table_column_index,
                         field,
                         nodes,
                     );
+                    for predicate in &mut get_preds {
+                        predicate.overridden = is_predicate_inherited(
+                            type_name,
+                            predicate,
+                            nodes,
+                            &exposed_predicate_signatures,
+                        );
+                    }
                     main_class.predicates.extend(get_preds);
                     if let Some(get_child_expr) = get_child_expr {
                         get_child_exprs.push(get_child_expr)
@@ -1051,3 +1210,99 @@ pub fn create_print_ast_module(nodes: &node_types::NodeTypeMap) -> ql::TopLevel<
         overlay: None,
     })
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn indexes_predicate_signatures_exposed_by_classes() {
+        let yaml = r#"
+supertypes:
+  callable:
+    subtypes: [function_like]
+    fields:
+      parameter*: parameter
+      body?: block
+  function_like:
+    subtypes: [function]
+    fields:
+      name: identifier
+named:
+  function:
+    parameter*: parameter
+    body?: block
+    name: identifier
+  parameter:
+  block:
+  identifier:
+"#;
+        let json = yeast::node_types_yaml::convert(yaml).unwrap();
+        let nodes = node_types::read_node_types_str("test", &json).unwrap();
+        let signatures = compute_exposed_predicate_signatures(&nodes);
+        let function = signatures
+            .get(&node_types::TypeName {
+                kind: "function".to_owned(),
+                named: true,
+            })
+            .unwrap();
+
+        assert!(function.contains(&PredicateSignature {
+            name: "getParameter",
+            arity: 1,
+        }));
+        assert!(function.contains(&PredicateSignature {
+            name: "getAParameter",
+            arity: 0,
+        }));
+        assert!(function.contains(&PredicateSignature {
+            name: "getBody",
+            arity: 0,
+        }));
+        assert!(function.contains(&PredicateSignature {
+            name: "getName",
+            arity: 0,
+        }));
+    }
+
+    #[test]
+    fn generates_supertype_getters_and_concrete_overrides() {
+        let yaml = r#"
+supertypes:
+  callable:
+    subtypes: [function]
+    fields:
+      parameter*: parameter
+      body?: block
+named:
+  function:
+    parameter*: parameter
+    body?: block
+  parameter:
+  block:
+"#;
+        let json = yeast::node_types_yaml::convert(yaml).unwrap();
+        let nodes = node_types::read_node_types_str("test", &json).unwrap();
+        let generated = convert_nodes(&nodes)
+            .into_iter()
+            .map(|element| element.to_string())
+            .collect::<Vec<_>>()
+            .join("\n");
+
+        assert!(generated.contains("F::Parameter getParameter(int i) { none() }"));
+        assert!(generated.contains("F::Parameter getAParameter() { none() }"));
+        assert!(generated.contains("F::Block getBody() { none() }"));
+        assert!(
+            generated.contains(
+                "final override F::Parameter getParameter(int i) { test_function_parameter"
+            )
+        );
+        assert!(generated.contains(
+            "final override F::Parameter getAParameter() { result = this.getParameter(_) }"
+        ));
+        assert!(
+            generated
+                .contains("final override F::Block getBody() { test_function_body(this, result) }")
+        );
+    }
+}
diff --git a/shared/tree-sitter-extractor/src/node_types.rs b/shared/tree-sitter-extractor/src/node_types.rs
index 4c67c2e4f20e..43fc3e11683d 100644
--- a/shared/tree-sitter-extractor/src/node_types.rs
+++ b/shared/tree-sitter-extractor/src/node_types.rs
@@ -17,9 +17,17 @@ pub struct Entry {
 
 #[derive(Debug)]
 pub enum EntryKind {
-    Union { members: Set<TypeName> },
-    Table { name: String, fields: Vec<Field> },
-    Token { kind_id: usize },
+    Union {
+        members: Set<TypeName>,
+        fields: Vec<Field>,
+    },
+    Table {
+        name: String,
+        fields: Vec<Field>,
+    },
+    Token {
+        kind_id: usize,
+    },
 }
 
 #[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq)]
@@ -130,21 +138,44 @@ pub fn convert_nodes(prefix: &str, nodes: &[NodeInfo]) -> NodeTypeMap {
         let flattened_name = &node_type_name(&node.kind, node.named);
         let dbscheme_name = escape_name(flattened_name);
         let ql_class_name = dbscheme_name_to_class_name(&dbscheme_name);
-        let dbscheme_name = format!("{}_{}", prefix, &dbscheme_name);
+        let dbscheme_name = format!("{}_{}", prefix, dbscheme_name);
         let subtypes = &node.subtypes;
         if !subtypes.is_empty() {
             // It's a tree-sitter supertype node, for which we create a union
             // type.
+            let type_name = TypeName {
+                kind: node.kind.clone(),
+                named: node.named,
+            };
+            let mut fields = Vec::new();
+            for (field_name, field_info) in &node.fields {
+                add_field(
+                    prefix,
+                    &type_name,
+                    Some(field_name.to_string()),
+                    field_info,
+                    &mut fields,
+                    &token_kinds,
+                );
+            }
+            if let Some(children) = &node.children {
+                add_field(
+                    prefix,
+                    &type_name,
+                    None,
+                    children,
+                    &mut fields,
+                    &token_kinds,
+                );
+            }
             entries.insert(
-                TypeName {
-                    kind: node.kind.clone(),
-                    named: node.named,
-                },
+                type_name,
                 Entry {
                     dbscheme_name,
                     ql_class_name,
                     kind: EntryKind::Union {
                         members: convert_types(subtypes),
+                        fields,
                     },
                 },
             );
@@ -156,8 +187,8 @@ pub fn convert_nodes(prefix: &str, nodes: &[NodeInfo]) -> NodeTypeMap {
                 kind: node.kind.clone(),
                 named: node.named,
             };
-            let table_name = escape_name(&(format!("{}_def", &flattened_name)));
-            let table_name = format!("{}_{}", prefix, &table_name);
+            let table_name = escape_name(&(format!("{}_def", flattened_name)));
+            let table_name = format!("{}_{}", prefix, table_name);
 
             let mut fields = Vec::new();
 
@@ -203,13 +234,13 @@ pub fn convert_nodes(prefix: &str, nodes: &[NodeInfo]) -> NodeTypeMap {
             counter += 1;
             let unprefixed_name = node_type_name(&type_name.kind, true);
             Entry {
-                dbscheme_name: escape_name(&format!("{}_token_{}", &prefix, &unprefixed_name)),
+                dbscheme_name: escape_name(&format!("{}_token_{}", prefix, unprefixed_name)),
                 ql_class_name: dbscheme_name_to_class_name(&escape_name(&unprefixed_name)),
                 kind: EntryKind::Token { kind_id: counter },
             }
         } else {
             Entry {
-                dbscheme_name: format!("{}_reserved_word", &prefix),
+                dbscheme_name: format!("{}_reserved_word", prefix),
                 ql_class_name: "ReservedWord".to_owned(),
                 kind: EntryKind::Token { kind_id: 0 },
             }
@@ -238,9 +269,9 @@ fn add_field(
         let has_index = field_info.multiple;
         let field_table_name = escape_name(&format!(
             "{}_{}_{}",
-            &prefix,
+            prefix,
             parent_flattened_name,
-            &name_for_field_or_child(&field_name)
+            name_for_field_or_child(&field_name)
         ));
         Storage::Table {
             has_index,
@@ -261,7 +292,7 @@ fn add_field(
         let mut field_token_ints: BTreeMap<String, (usize, String)> = BTreeMap::new();
         for (counter, t) in converted_types.into_iter().enumerate() {
             let dbscheme_variant_name =
-                escape_name(&format!("{}_{}_{}", &prefix, parent_flattened_name, t.kind));
+                escape_name(&format!("{}_{}_{}", prefix, parent_flattened_name, t.kind));
             field_token_ints.insert(t.kind.to_owned(), (counter, dbscheme_variant_name));
         }
         FieldTypeInfo::ReservedWordInt(field_token_ints)
@@ -273,9 +304,9 @@ fn add_field(
             types: converted_types,
             dbscheme_union: format!(
                 "{}_{}_{}_type",
-                &prefix,
-                &parent_flattened_name,
-                &name_for_field_or_child(&field_name)
+                prefix,
+                parent_flattened_name,
+                name_for_field_or_child(&field_name)
             ),
             ql_class: "AstNode".to_owned(),
         }
@@ -355,10 +386,10 @@ fn escape_name(name: &str) -> String {
     let mut result = String::new();
 
     // If there's a leading underscore, replace it with 'underscore_'.
-    if let Some(c) = name.chars().next() {
-        if c == '_' {
-            result.push_str("underscore");
-        }
+    if let Some(c) = name.chars().next()
+        && c == '_'
+    {
+        result.push_str("underscore");
     }
     for c in name.chars() {
         match c {
@@ -386,6 +417,7 @@ fn escape_name(name: &str) -> String {
             ':' => result.push_str("colon"),
             ';' => result.push_str("semicolon"),
             '"' => result.push_str("dquote"),
+            '\'' => result.push_str("squote"),
             '*' => result.push_str("star"),
             '+' => result.push_str("plus"),
             '-' => result.push_str("minus"),
@@ -448,9 +480,61 @@ fn dbscheme_name_to_class_name(dbscheme_name: &str) -> String {
         .join("")
 }
 
+#[test]
+fn escape_name_quotes_test() {
+    assert_eq!("dquote", escape_name("\""));
+    assert_eq!("squote", escape_name("'"));
+}
+
 #[test]
 fn to_snake_case_test() {
     assert_eq!("ruby", to_snake_case("Ruby"));
     assert_eq!("erb", to_snake_case("ERB"));
     assert_eq!("embedded_template", to_snake_case("EmbeddedTemplate"));
 }
+
+#[test]
+fn supertype_fields_are_preserved() {
+    let yaml = r#"
+supertypes:
+  callable:
+    subtypes: [function]
+    fields:
+      parameter*: parameter
+      body?: block
+named:
+  function:
+  parameter:
+  block:
+"#;
+    let json = yeast::node_types_yaml::convert(yaml).unwrap();
+    let nodes = read_node_types_str("test", &json).unwrap();
+    let callable = nodes
+        .get(&TypeName {
+            kind: "callable".to_owned(),
+            named: true,
+        })
+        .unwrap();
+    let EntryKind::Union { fields, .. } = &callable.kind else {
+        panic!("callable should be a union");
+    };
+
+    assert_eq!(fields.len(), 2);
+    assert_eq!(fields[0].getter_name, "getBody");
+    assert!(matches!(
+        fields[0].storage,
+        Storage::Table {
+            has_index: false,
+            ..
+        }
+    ));
+    assert_eq!(fields[1].getter_name, "getParameter");
+    assert_eq!(fields[1].any_getter_name.as_deref(), Some("getAParameter"));
+    assert!(matches!(
+        fields[1].storage,
+        Storage::Table {
+            has_index: true,
+            ..
+        }
+    ));
+}
diff --git a/shared/tree-sitter-extractor/src/options.rs b/shared/tree-sitter-extractor/src/options.rs
index 1b43a2159943..4be253104f19 100644
--- a/shared/tree-sitter-extractor/src/options.rs
+++ b/shared/tree-sitter-extractor/src/options.rs
@@ -6,7 +6,7 @@ pub fn num_threads() -> Result<usize, String> {
     let threads_str = std::env::var("CODEQL_THREADS").unwrap_or_else(|_| "-1".into());
     let num_cpus = num_cpus::get();
     parse_codeql_threads(&threads_str, num_cpus)
-        .ok_or_else(|| format!("Unable to parse CODEQL_THREADS value '{}'", &threads_str))
+        .ok_or_else(|| format!("Unable to parse CODEQL_THREADS value '{}'", threads_str))
 }
 
 /// Parses the given string to determine the number of threads the extractor
diff --git a/shared/tree-sitter-extractor/src/trap.rs b/shared/tree-sitter-extractor/src/trap.rs
index 85b2cc9adda7..492349c6d4ab 100644
--- a/shared/tree-sitter-extractor/src/trap.rs
+++ b/shared/tree-sitter-extractor/src/trap.rs
@@ -298,7 +298,7 @@ impl Compression {
         match std::env::var(var_name) {
             Ok(method) => match Compression::from_string(&method) {
                 Some(c) => Ok(c),
-                None => Err(format!("Unknown compression method '{}'", &method)),
+                None => Err(format!("Unknown compression method '{}'", method)),
             },
             // Default compression method if the env var isn't set:
             Err(_) => Ok(Compression::Gzip),
diff --git a/shared/tutorial/CHANGELOG.md b/shared/tutorial/CHANGELOG.md
index 34f695126455..13b6e8fc68bc 100644
--- a/shared/tutorial/CHANGELOG.md
+++ b/shared/tutorial/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.0.61
+
+No user-facing changes.
+
+## 1.0.60
+
+No user-facing changes.
+
+## 1.0.59
+
+No user-facing changes.
+
+## 1.0.58
+
+No user-facing changes.
+
+## 1.0.57
+
+No user-facing changes.
+
+## 1.0.56
+
+No user-facing changes.
+
+## 1.0.55
+
+No user-facing changes.
+
 ## 1.0.54
 
 No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.55.md b/shared/tutorial/change-notes/released/1.0.55.md
new file mode 100644
index 000000000000..fd53dce64a9f
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.55.md
@@ -0,0 +1,3 @@
+## 1.0.55
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.56.md b/shared/tutorial/change-notes/released/1.0.56.md
new file mode 100644
index 000000000000..3b784cb7d975
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.56.md
@@ -0,0 +1,3 @@
+## 1.0.56
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.57.md b/shared/tutorial/change-notes/released/1.0.57.md
new file mode 100644
index 000000000000..18a94c4bca4a
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.57.md
@@ -0,0 +1,3 @@
+## 1.0.57
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.58.md b/shared/tutorial/change-notes/released/1.0.58.md
new file mode 100644
index 000000000000..f43459b898c0
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.58.md
@@ -0,0 +1,3 @@
+## 1.0.58
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.59.md b/shared/tutorial/change-notes/released/1.0.59.md
new file mode 100644
index 000000000000..071c0337a4d5
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.59.md
@@ -0,0 +1,3 @@
+## 1.0.59
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.60.md b/shared/tutorial/change-notes/released/1.0.60.md
new file mode 100644
index 000000000000..74ecf38fafa0
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.60.md
@@ -0,0 +1,3 @@
+## 1.0.60
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.61.md b/shared/tutorial/change-notes/released/1.0.61.md
new file mode 100644
index 000000000000..432f5481ee83
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.61.md
@@ -0,0 +1,3 @@
+## 1.0.61
+
+No user-facing changes.
diff --git a/shared/tutorial/codeql-pack.release.yml b/shared/tutorial/codeql-pack.release.yml
index c3c3b0f4418a..1319f4fe8fde 100644
--- a/shared/tutorial/codeql-pack.release.yml
+++ b/shared/tutorial/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.54
+lastReleaseVersion: 1.0.61
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index d8d6ee9cdaa8..5a21ea2df9d5 100644
--- a/shared/tutorial/qlpack.yml
+++ b/shared/tutorial/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/tutorial
 description: Library for the CodeQL detective tutorials, helping new users learn to
   write CodeQL queries.
-version: 1.0.55-dev
+version: 1.0.62-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/CHANGELOG.md b/shared/typeflow/CHANGELOG.md
index 906d6b96ebea..15249ce6100a 100644
--- a/shared/typeflow/CHANGELOG.md
+++ b/shared/typeflow/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.0.61
+
+No user-facing changes.
+
+## 1.0.60
+
+No user-facing changes.
+
+## 1.0.59
+
+No user-facing changes.
+
+## 1.0.58
+
+No user-facing changes.
+
+## 1.0.57
+
+No user-facing changes.
+
+## 1.0.56
+
+No user-facing changes.
+
+## 1.0.55
+
+No user-facing changes.
+
 ## 1.0.54
 
 No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.55.md b/shared/typeflow/change-notes/released/1.0.55.md
new file mode 100644
index 000000000000..fd53dce64a9f
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.55.md
@@ -0,0 +1,3 @@
+## 1.0.55
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.56.md b/shared/typeflow/change-notes/released/1.0.56.md
new file mode 100644
index 000000000000..3b784cb7d975
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.56.md
@@ -0,0 +1,3 @@
+## 1.0.56
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.57.md b/shared/typeflow/change-notes/released/1.0.57.md
new file mode 100644
index 000000000000..18a94c4bca4a
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.57.md
@@ -0,0 +1,3 @@
+## 1.0.57
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.58.md b/shared/typeflow/change-notes/released/1.0.58.md
new file mode 100644
index 000000000000..f43459b898c0
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.58.md
@@ -0,0 +1,3 @@
+## 1.0.58
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.59.md b/shared/typeflow/change-notes/released/1.0.59.md
new file mode 100644
index 000000000000..071c0337a4d5
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.59.md
@@ -0,0 +1,3 @@
+## 1.0.59
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.60.md b/shared/typeflow/change-notes/released/1.0.60.md
new file mode 100644
index 000000000000..74ecf38fafa0
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.60.md
@@ -0,0 +1,3 @@
+## 1.0.60
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.61.md b/shared/typeflow/change-notes/released/1.0.61.md
new file mode 100644
index 000000000000..432f5481ee83
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.61.md
@@ -0,0 +1,3 @@
+## 1.0.61
+
+No user-facing changes.
diff --git a/shared/typeflow/codeql-pack.release.yml b/shared/typeflow/codeql-pack.release.yml
index c3c3b0f4418a..1319f4fe8fde 100644
--- a/shared/typeflow/codeql-pack.release.yml
+++ b/shared/typeflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.54
+lastReleaseVersion: 1.0.61
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index e7d3ae0279be..d79277b95bc7 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.55-dev
+version: 1.0.62-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typeinference/CHANGELOG.md b/shared/typeinference/CHANGELOG.md
index 4916c26d385a..1d1608eb3abe 100644
--- a/shared/typeinference/CHANGELOG.md
+++ b/shared/typeinference/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 0.0.42
+
+No user-facing changes.
+
+## 0.0.41
+
+No user-facing changes.
+
+## 0.0.40
+
+No user-facing changes.
+
+## 0.0.39
+
+No user-facing changes.
+
+## 0.0.38
+
+No user-facing changes.
+
+## 0.0.37
+
+No user-facing changes.
+
+## 0.0.36
+
+No user-facing changes.
+
 ## 0.0.35
 
 No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.36.md b/shared/typeinference/change-notes/released/0.0.36.md
new file mode 100644
index 000000000000..14c56d238da9
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.36.md
@@ -0,0 +1,3 @@
+## 0.0.36
+
+No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.37.md b/shared/typeinference/change-notes/released/0.0.37.md
new file mode 100644
index 000000000000..322aa16628ff
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.37.md
@@ -0,0 +1,3 @@
+## 0.0.37
+
+No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.38.md b/shared/typeinference/change-notes/released/0.0.38.md
new file mode 100644
index 000000000000..6aef3fb33021
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.38.md
@@ -0,0 +1,3 @@
+## 0.0.38
+
+No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.39.md b/shared/typeinference/change-notes/released/0.0.39.md
new file mode 100644
index 000000000000..b492d1378882
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.39.md
@@ -0,0 +1,3 @@
+## 0.0.39
+
+No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.40.md b/shared/typeinference/change-notes/released/0.0.40.md
new file mode 100644
index 000000000000..3666b81138f9
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.40.md
@@ -0,0 +1,3 @@
+## 0.0.40
+
+No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.41.md b/shared/typeinference/change-notes/released/0.0.41.md
new file mode 100644
index 000000000000..fc403ab94721
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.41.md
@@ -0,0 +1,3 @@
+## 0.0.41
+
+No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.42.md b/shared/typeinference/change-notes/released/0.0.42.md
new file mode 100644
index 000000000000..02fe456c7ead
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.42.md
@@ -0,0 +1,3 @@
+## 0.0.42
+
+No user-facing changes.
diff --git a/shared/typeinference/codeql-pack.release.yml b/shared/typeinference/codeql-pack.release.yml
index 143c97892032..62d36523a656 100644
--- a/shared/typeinference/codeql-pack.release.yml
+++ b/shared/typeinference/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.35
+lastReleaseVersion: 0.0.42
diff --git a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
index b90c53ebdbaa..1bc9591607e8 100644
--- a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
+++ b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
@@ -1,126 +1,70 @@
 /**
  * Provides shared functionality for computing type inference in QL.
  *
- * The code examples in this file use C# syntax, but the concepts should carry
- * over to other languages as well.
+ * The library is initialized in three phases:
  *
- * The library is initialized in two phases: `Make1`, which constructs the
- * `TypePath` type, and `Make2`, which (using `TypePath` in the input signature)
- * constructs the `Matching` and `IsInstantiationOf` modules.
+ * 1. `Make1`, which takes as input a definition of atomic types (including type
+ *    parameters) and constructs the `TypePath` type used to represent paths into
+ *    compound types.
  *
- * The intended use of this library is to define a predicate
+ * 2. `Make2`, which (using the `TypePath` type) takes as input a definition of type
+ *    mentions as well as the type hierarchy and type constraints, and constructs the
+ *    `Matching` and `IsInstantiationOf` modules, which are core building blocks for
+ *    matching type instantiations against type parameters, taking the type hierarchy
+ *    and type constraints into account.
  *
- * ```ql
- * Type inferType(AstNode n, TypePath path)
- * ```
- *
- * for recursively inferring the type-path-indexed types of AST nodes. For example,
- * one may have a base case for literals like
- *
- * ```ql
- * Type inferType(AstNode n, TypePath path) {
- *   ...
- *   n instanceof IntegerLiteral and
- *   result instanceof IntType and
- *   path.isEmpty()
- *   ...
- * }
- * ```
- *
- * and recursive cases for local variables like
- *
- * ```ql
- * Type inferType(AstNode n, TypePath path) {
- *   ...
- *   exists(LocalVariable v |
- *     // propagate type information from the initializer to any access
- *     n = v.getAnAccess() and
- *     result = inferType(v.getInitializer(), path)
- *     or
- *     // propagate type information from any access back to the initializer; note
- *     // that this case may not be relevant for all languages, but e.g. in Rust
- *     // it is
- *     n = v.getInitializer() and
- *     result = inferType(v.getAnAccess(), path)
- *   )
- *   ...
- * }
- * ```
- *
- * The `Matching` module is used when an AST node references a potentially generic
- * declaration, where the type of the node depends on the type of some of its sub
- * nodes. For example, if we have a generic method like `T Identity<T>(T t)`, then
- * the type of `Identity(42)` should be `int`, while the type of `Identity("foo")`
- * should be `string`; in both cases it should _not_ be `T`.
+ * 3. `Make3`, which takes as input a definition of AST nodes, including common concepts
+ *    such as calls and callables, as well as language-specific typing rules, and
+ *    constructs the `inferType` predicate for recursively inferring the types of AST
+ *    nodes.
  *
- * In order to infer the type of method calls, one would define something like
+ * Unlike unification-based type inference, this library does directed/bottom-up type
+ * inference by default, but allowing for contextual/top-down type inference when
+ * explicitly needed.
  *
- * ```ql
- * private module MethodCallMatchingInput implements MatchingInputSig {
- *   private newtype TDeclarationPosition =
- *     TSelfDeclarationPosition() or
- *     TPositionalDeclarationPosition(int pos) { ... } or
- *     TReturnDeclarationPosition()
+ * For example, in order to infer the type of a conditional expression,
+ * `if cond { e1 } else { e2 }`, we propagate type information from either of the
+ * branches `e1` and `e2` into the conditional expression (for simplicity, we do not
+ * attempt to calculate least-upper-bound types or similar). This corresponds to the
+ * two bottom-up type inference rules:
  *
- *   // A position inside a method with a declared type.
- *   class DeclarationPosition extends TDeclarationPosition {
- *     ...
- *   }
+ * ```text
+ *             e1: T
+ * ------------------------------- (cond-then)
+ * if cond { e1 } else { e2 } : T
  *
- *   class Declaration extends MethodCall {
- *     // Gets a type parameter at `tppos` belonging to this method.
- *     //
- *     // For example, if this method is `T Identity<T>(T t)`, then `T`
- *     // is at position `0`.
- *     TypeParameter getTypeParameter(TypeParameterPosition tppos) { ... }
  *
- *     // Gets the declared type of this method at `dpos` and `path`.
- *     //
- *     // For example, if this method is `T Identity<T>(T t)`, then both the
- *     // the return type and parameter position `0` is `T` with `path.isEmpty()`.
- *     Type getDeclaredType(DeclarationPosition dpos, TypePath path) { ... }
- *   }
- *
- *   // A position inside a method call with an inferred type
- *   class AccessPosition = DeclarationPosition;
+ *             e2: T
+ * ------------------------------- (cond-else)
+ * if cond { e1 } else { e2 } : T
+ * ```
  *
- *   class Access extends MethodCall {
- *     AstNode getNodeAt(AccessPosition apos) { ... }
+ * Now, if we have a conditional expression like
  *
- *     // Gets the inferred type of the node at `apos` and `path`.
- *     //
- *     // For example, if this method call is `Identity(42)`, then the type
- *     // at argument position `0` is `int` with `path.isEmpty()"`.
- *     Type getInferredType(AccessPosition apos, TypePath path) {
- *       result = inferType(this.getNodeAt(apos), path)
- *     }
+ * ```rust
+ * if cond { 42i64 } else { Default::default() }
+ * ```
  *
- *     // Gets the method that this method call resolves to.
- *     //
- *     // This will typically be defined in mutual recursion with the `inferType`
- *     // predicate, as we need to know the type of the receiver in order to
- *     // resolve calls to instance methods.
- *     Declaration getTarget() { ... }
- *   }
+ * where the type of `Default::default()` needs to be inferred from the context, we
  *
- *   predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
- *     apos = dpos
- *   }
- * }
+ * 1. conclude that the conditional has type `i64`, using the `cond-then` rule,
+ * 2. assign `Default::default()` the special `UnknownType` (this library has built-in
+ *    logic for identifying calls where (parts of) the return type needs to be inferred
+ *    from the context), and
+ * 3. since the `else` branch has `UnknownType`, we apply the `cond-else` rule _backwards_
+ *    to infer that `Default::default()` has type `i64`.
  *
- * private module MethodCallMatching = Matching<MethodCallMatchingInput>;
+ * Note that `UnknownType` can propagate bottom-up like any other type, which is needed
+ * in cases like for example
  *
- * Type inferType(AstNode n, TypePath path) {
- *   ...
- *   exists(MethodCall mc, MethodCallMatchingInput::AccessPosition apos |
- *     // Some languages may want to restrict `apos` to be the return position, but in
- *     // e.g. Rust type information can flow out of all positions
- *     n = a.getNodeAt(apos) and
- *     result = MethodCallMatching::inferAccessType(a, apos, path)
- *   )
- *   ...
- * }
+ * ```rust
+ * let x = if cond { Default::default() } else { Default::default() };
+ * let y: i64 = x;
  * ```
+ *
+ * where the `UnknownType` will propagate upwards using two bottom-up steps, and the
+ * contextual inference will then propagate the `i64` type backwards using two
+ * reversed steps.
  */
 overlay[local?]
 module;
@@ -135,7 +79,14 @@ signature module InputSig1<LocationSig Location> {
    * For example `int` or ``IEnumerable`1``.
    */
   class Type {
-    /** Gets a type parameter of this type, if any. */
+    /** Gets the `i`th positional type parameter of this type, if any. */
+    TypeParameter getPositionalTypeParameter(int i);
+
+    /**
+     * Gets a type parameter of this type, if any.
+     *
+     * This may include non-positional type parameters as well.
+     */
     TypeParameter getATypeParameter();
 
     /** Gets a textual representation of this type. */
@@ -146,10 +97,10 @@ signature module InputSig1<LocationSig Location> {
   }
 
   /**
-   * Holds if `t` is a pseudo type. Pseudo types are skipped when checking for
-   * non-instantiations in `isNotInstantiationOf`.
+   * A pseudo type. Pseudo types are skipped when checking for non-instantiations
+   * in `isNotInstantiationOf`.
    */
-  predicate isPseudoType(Type t);
+  class PseudoType extends Type;
 
   /** A type parameter. */
   class TypeParameter extends Type;
@@ -189,35 +140,6 @@ signature module InputSig1<LocationSig Location> {
    */
   int getTypeParameterId(TypeParameter tp);
 
-  /**
-   * A type argument position, for example an integer.
-   *
-   * Type argument positions are used when type arguments are supplied explicitly,
-   * for example in a method call like `M<int>()` the type argument `int` is at
-   * position `0`.
-   */
-  bindingset[this]
-  class TypeArgumentPosition {
-    /** Gets the textual representation of this position. */
-    bindingset[this]
-    string toString();
-  }
-
-  /** A type parameter position, for example an integer. */
-  bindingset[this]
-  class TypeParameterPosition {
-    /** Gets the textual representation of this position. */
-    bindingset[this]
-    string toString();
-  }
-
-  /** Holds if `tapos` and `tppos` match. */
-  bindingset[tapos]
-  bindingset[tppos]
-  predicate typeArgumentParameterPositionMatch(
-    TypeArgumentPosition tapos, TypeParameterPosition tppos
-  );
-
   /**
    * Gets the limit on the length of type paths. Set to `none()` if there should
    * be no limit.
@@ -443,10 +365,27 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
   module Make2<HasTypeTreeSig TypeMention, InputSig2<TypeMention> Input2> {
     private import Input2
 
-    /** Gets the type at the empty path of `tm`. */
+    /**
+     * Gets the non-pseudo root type mentioned at `tm`.
+     *
+     * Type mentions are allowed to resolve to `UnknownType` (which this predicate
+     * will filter away), for example in
+     *
+     * ```rust
+     * let x: Vec<Unresolved> = Vec::new();
+     * x.push(foo());
+     * ```
+     *
+     * by resolving `Unresolved` to `UnknownType` (that is, treating it as if it was
+     * `_`), we allow for the element type to be inferred from the return type of
+     * `foo`.
+     */
     bindingset[tm]
     pragma[inline_late]
-    private Type getTypeMentionRoot(TypeMention tm) { result = tm.getTypeAt(TypePath::nil()) }
+    private Type getTypeMentionNonPseudoRoot(TypeMention tm) {
+      result = tm.getTypeAt(TypePath::nil()) and
+      not result instanceof PseudoType
+    }
 
     /** Provides the input to `IsInstantiationOf`. */
     signature module IsInstantiationOfInputSig<HasTypeTreeSig App, HasTypeTreeSig Constraint> {
@@ -647,7 +586,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
       }
 
       private Type getNonPseudoTypeAt(App app, TypePath path) {
-        result = app.getTypeAt(path) and not isPseudoType(result)
+        result = app.getTypeAt(path) and
+        not result instanceof PseudoType
       }
 
       pragma[nomagic]
@@ -721,13 +661,13 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         pragma[nomagic]
         private predicate typeCondition(Type type, TypeAbstraction abs, TypeMention condition) {
           conditionSatisfiesConstraint(abs, condition, _, _) and
-          type = getTypeMentionRoot(condition)
+          type = getTypeMentionNonPseudoRoot(condition)
         }
 
         pragma[nomagic]
         private predicate typeConstraint(Type type, TypeMention constraint) {
           conditionSatisfiesConstraint(_, _, constraint, _) and
-          type = getTypeMentionRoot(constraint)
+          type = getTypeMentionNonPseudoRoot(constraint)
         }
 
         predicate potentialInstantiationOf(
@@ -735,7 +675,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         ) {
           exists(Type type |
             typeConstraint(type, constraint) and typeCondition(type, abs, condition)
-          )
+          ) and
+          conditionSatisfiesConstraint(_, _, constraint, true)
         }
       }
 
@@ -781,8 +722,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         TypeMention constraint
       ) {
         conditionSatisfiesConstraintTypeAt(abs, condition, constraint, _, _) and
-        conditionRoot = getTypeMentionRoot(condition) and
-        constraintRoot = getTypeMentionRoot(constraint)
+        conditionRoot = getTypeMentionNonPseudoRoot(condition) and
+        constraintRoot = getTypeMentionNonPseudoRoot(constraint)
       }
 
       /**
@@ -887,8 +828,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           //
           // not exists(countConstraintImplementations(type, constraint)) and
           // conditionSatisfiesConstraintTypeAt(abs, condition, constraintMention, _, _) and
-          // getTypeMentionRoot(condition) = abs.getATypeParameter() and
-          // constraint = getTypeMentionRoot(constraintMention)
+          // getTypeMentionNonPseudoRoot(condition) = abs.getATypeParameter() and
+          // constraint = getTypeMentionNonPseudoRoot(constraintMention)
           // or
           countConstraintImplementations(type, constraintRoot) > 0 and
           rootTypesSatisfaction(type, constraintRoot, abs, condition, constraintMention) and
@@ -927,9 +868,9 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           //   or
           //   forall(TypeAbstraction abs, TypeMention condition, TypeMention constraintMention |
           //     conditionSatisfiesConstraintTypeAt(abs, condition, constraintMention, _, _) and
-          //     getTypeMentionRoot(condition) = abs.getATypeParameter()
+          //     getTypeMentionNonPseudoRoot(condition) = abs.getATypeParameter()
           //   |
-          //     not constraint = getTypeMentionRoot(constraintMention)
+          //     not constraint = getTypeMentionNonPseudoRoot(constraintMention)
           //   )
           // ) and
           (
@@ -1258,8 +1199,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         /** Gets the location of this declaration. */
         Location getLocation();
 
-        /** Gets the type parameter at position `tppos` of this declaration, if any. */
-        TypeParameter getTypeParameter(TypeParameterPosition tppos);
+        /** Gets the `i`th type parameter of this declaration, if any. */
+        TypeParameter getTypeParameter(int i);
 
         /**
          * Gets the declared type of this declaration at `path` for position `dpos`.
@@ -1309,13 +1250,12 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         Location getLocation();
 
         /**
-         * Gets the type at `path` for the type argument at position `tapos` of
-         * this access, if any.
+         * Gets the type at `path` for the `i`th type argument of this access, if any.
          *
          * For example, in a method call like `M<int>()`, `int` is an explicit
          * type argument at position `0`.
          */
-        Type getTypeArgument(TypeArgumentPosition tapos, TypePath path);
+        Type getTypeArgument(int i, TypePath path);
 
         /**
          * Gets the inferred type at `path` for the position `apos` and environment `e`
@@ -1346,12 +1286,9 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
     module MatchingWithEnvironment<MatchingWithEnvironmentInputSig Input> {
       private import Input
 
-      pragma[nomagic]
-      private TypeParameter getDeclTypeParameter(Declaration decl, TypeArgumentPosition tapos) {
-        exists(TypeParameterPosition tppos |
-          result = decl.getTypeParameter(tppos) and
-          typeArgumentParameterPositionMatch(tapos, tppos)
-        )
+      private Type getTypeArgumentNonPseudo(Access a, int pos, TypePath path) {
+        result = a.getTypeArgument(pos, path) and
+        not result instanceof PseudoType
       }
 
       /**
@@ -1359,25 +1296,48 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
        * the type parameter `tp` in `target`, if any.
        *
        * Note that this predicate crucially does not depend on type inference,
-       * and hence can appear in negated position, e.g., as in
-       * `directTypeMatch`.
+       * and hence can appear in negated position, e.g., as in `directTypeMatch`.
        */
       bindingset[a, target]
       pragma[inline_late]
       Type getTypeArgument(Access a, Declaration target, TypeParameter tp, TypePath path) {
-        exists(TypeArgumentPosition tapos |
-          result = a.getTypeArgument(tapos, path) and
-          tp = getDeclTypeParameter(target, tapos) and
-          not isPseudoType(result)
+        exists(int pos |
+          result = getTypeArgumentNonPseudo(a, pos, path) and
+          tp = target.getTypeParameter(pos)
+        )
+      }
+
+      bindingset[a, target]
+      pragma[inline_late]
+      private predicate hasNotTypeArgument0(Access a, Declaration target, TypeParameter tp) {
+        exists(int pos |
+          tp = target.getTypeParameter(pragma[only_bind_into](pos)) and
+          not exists(getTypeArgumentNonPseudo(a, pos, _))
         )
       }
 
+      bindingset[target, tp]
+      pragma[inline_late]
+      private predicate hasNotTypeArgument1(Declaration target, TypeParameter tp) {
+        not tp = target.getTypeParameter(_)
+      }
+
+      /**
+       * A join-order optimized version of `not exists(getTypeArgument(a, target, tp, _)`.
+       */
+      pragma[inline]
+      private predicate hasNotTypeArgument(Access a, Declaration target, TypeParameter tp) {
+        hasNotTypeArgument0(a, target, tp)
+        or
+        hasNotTypeArgument1(target, tp)
+      }
+
       pragma[nomagic]
       private predicate directTypeMatch0(
         Access a, DeclarationPosition dpos, AccessEnvironment e, Declaration target,
         TypePath pathToTypeParam, TypeParameter tp
       ) {
-        not exists(getTypeArgument(a, target, tp, _)) and
+        hasNotTypeArgument(a, target, tp) and
         tp = target.getDeclaredType(dpos, pathToTypeParam) and
         target = a.getTarget(e)
       }
@@ -1452,12 +1412,18 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           t = a.getInferredType(e, apos, TypePath::nil())
         }
 
+        private predicate relevantAccessTarget(
+          Access a, AccessPosition apos, AccessEnvironment e, Declaration target
+        ) {
+          exists(Type t |
+            accessTargetsWithArgRootType(a, e, target, apos, t) and
+            argRootTypeSatisfiesTargetTypeCand(t, target, apos, _, _)
+          )
+        }
+
         private newtype TRelevantAccess =
           MkRelevantAccess(Access a, AccessPosition apos, AccessEnvironment e) {
-            exists(Declaration target, Type t |
-              accessTargetsWithArgRootType(a, e, target, apos, t) and
-              argRootTypeSatisfiesTargetTypeCand(t, target, apos, _, _)
-            )
+            relevantAccessTarget(a, apos, e, _)
           }
 
         private class RelevantAccess extends MkRelevantAccess {
@@ -1467,7 +1433,12 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
 
           RelevantAccess() { this = MkRelevantAccess(a, apos, e) }
 
-          RelevantTarget getTarget() { result = MkRelevantTarget(a.getTarget(e), apos) }
+          RelevantTarget getTarget() {
+            exists(Declaration target |
+              relevantAccessTarget(a, apos, e, target) and
+              result = MkRelevantTarget(target, apos)
+            )
+          }
 
           pragma[nomagic]
           Type getTypeAt(TypePath path) { result = a.getInferredType(e, apos, path) }
@@ -1530,7 +1501,81 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
                 pragma[only_bind_into](apos), e),
               MkRelevantTarget(target, pragma[only_bind_into](apos)), pathToTp.appendInverse(path),
               t) and
-            not exists(getTypeArgument(a, target, tp, _))
+            hasNotTypeArgument(a, target, tp)
+          )
+        }
+
+        predicate baseTypeMatchAtTypeParameter(
+          Access a, AccessEnvironment e, AccessPosition apos, Declaration target, TypeParameter tp,
+          TypePath prefix, TypePath requiredPrefix
+        ) {
+          exists(
+            TypePath pathToTypeParamInConstraint, TypePath pathToTp, TypePath pathToTypeParamInSub
+          |
+            argRootTypeSatisfiesTargetTypeCand(_, target, pragma[only_bind_into](apos), tp, pathToTp) and
+            SatisfiesParameterConstraint::satisfiesConstraintAtTypeParameter(MkRelevantAccess(a,
+                pragma[only_bind_into](apos), e),
+              MkRelevantTarget(target, pragma[only_bind_into](apos)), pathToTypeParamInConstraint,
+              pathToTypeParamInSub) and
+            hasNotTypeArgument(a, target, tp)
+          |
+            /*
+             * Example:
+             *
+             * ```swift
+             * class Base<B> {
+             *   init(_ value: B) {}
+             * }
+             *
+             * class Derived<D>: Base<[D]> {
+             *   init(_ value: D) { super.init([value]) }
+             * }
+             *
+             * func foo<T>(_ value: T, _ base: Base<T>) { }
+             *
+             * foo([2], Derived(<unknown>))
+             * ```
+             *
+             * - tp = T (bound by `foo`)
+             * - prefix = pathToTypeParamInSub = "D"
+             * - requiredPrefix = "Element"
+             * - pathToTypeParamInConstraint = "B.Element"
+             * - pathToTp = "B"
+             */
+
+            pathToTypeParamInConstraint = pathToTp.appendInverse(requiredPrefix) and
+            prefix = pathToTypeParamInSub
+            or
+            /*
+             * Example:
+             *
+             * ```swift
+             * class Base<B> {
+             *   init(_ value: B) {}
+             * }
+             *
+             * class Derived<D>: Base<D> {
+             *   override init(_ value: D) { super.init(value) }
+             * }
+             *
+             * func foo<T>(_ value: T, _ base: Base<T?>) {}
+             *
+             * foo(2, Derived(Optional.none))
+             * ```
+             *
+             * - tp = T (bound by `foo`)
+             * - prefix = "D.Wrapped"
+             * - pathToTypeParamInSub = "D"
+             * - requiredPrefix = ""
+             * - pathToTypeParamInConstraint = "B"
+             * - pathToTp = "B.Wrapped"
+             */
+
+            exists(TypePath path0 |
+              pathToTp = pathToTypeParamInConstraint.appendInverse(path0) and
+              prefix = pathToTypeParamInSub.append(path0) and
+              requiredPrefix = TypePath::nil()
+            )
           )
         }
       }
@@ -1646,8 +1691,14 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
       private predicate typeParameterHasConstraint(
         Declaration target, TypeParameter constrainedTp, TypeMention constraint
       ) {
-        constrainedTp = target.getTypeParameter(_) and
-        constraint = getATypeParameterConstraint(constrainedTp, target)
+        constraint = getATypeParameterConstraint(constrainedTp, target) and
+        (
+          constrainedTp = target.getTypeParameter(_)
+          or
+          // a declaration may reference type parameters that are not declared on it,
+          // for example type parameters from the enclosing type
+          constrainedTp = target.getDeclaredType(_, _)
+        )
       }
 
       /**
@@ -1674,7 +1725,6 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         TypeParameter tp
       ) {
         typeParameterHasConstraint(target, constrainedTp, constraint) and
-        tp = target.getTypeParameter(_) and
         tp = constraint.getTypeAt(pathToTp) and
         constrainedTp != tp
       }
@@ -1683,7 +1733,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
       private predicate typeConstraintBaseTypeMatch(
         Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
       ) {
-        not exists(getTypeArgument(a, target, tp, _)) and
+        hasNotTypeArgument(a, target, tp) and
         exists(TypeMention constraint, TypeParameter constrainedTp, TypePath pathToTp |
           typeParameterConstraintHasTypeParameter(target, constrainedTp, constraint, pathToTp, tp) and
           AccessConstraint::satisfiesConstraint(a, e, target, constrainedTp, constraint,
@@ -1691,8 +1741,12 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         )
       }
 
+      /**
+       * Holds if type parameter `tp`, which is in scope in `target`, can be matched
+       * to have type `t` at `path` via the inferred argument types of `a`.
+       */
       pragma[inline]
-      private predicate typeMatch(
+      predicate typeMatch(
         Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
       ) {
         // A type given at the access corresponds directly to the type parameter
@@ -1765,6 +1819,16 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           )
         )
         or
+        exists(
+          Declaration target, TypePath prefix, TypePath requiredPrefix, TypePath suffix,
+          TypeParameter tp
+        |
+          AccessBaseType::baseTypeMatchAtTypeParameter(a, e, apos, target, tp, prefix,
+            requiredPrefix) and
+          typeMatch(a, e, target, requiredPrefix.appendInverse(suffix), result, tp) and
+          path = prefix.append(suffix)
+        )
+        or
         exists(
           Declaration target, TypePath prefix, TypeMention constraint,
           TypePath pathToTypeParamInConstraint, TypePath pathToTypeParamInSub
@@ -1805,44 +1869,86 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           )
           or
           exists(TypeParameter tp, TypePath suffix, TypePath mid, TypePath pathToTp |
+            exists(TypeParameter constrainedTp, DeclarationPosition dpos |
+              typeParameterConstraintHasTypeParameter(target, constrainedTp, constraint, pathToTp,
+                tp) and
+              accessDeclarationPositionMatch(apos, dpos) and
+              constrainedTp = target.getDeclaredType(dpos, _)
+            )
+          |
             /*
              * Example:
              *
              * ```rust
+             * struct S<T> { ... }
+             *
              * struct MyThing<A> { ... }
              *
              * trait MyTrait<B> { ... }
              *
              * impl<T> MyTrait<T> for MyThing<T> { ... }
              *
-             * fn bar<T1, T2: MyTrait<T1>>(x: T1, y: T2) {}
+             * fn bar<T1, T2: MyTrait<T1>>(x: T1, y: Option<T2>) {}
              *
-             * let x : i32 = ...;
+             * let x: S<i32> = ...;
              * let y = MyThing(Default::default());
-             * bar(x, y);
+             * bar(x, Some(y));
              * ```
              *
-             * At `term` = `bar(x, y)`, we have
+             * At `term` = `bar(x, Some(y))`, we have
              * - `constraint = MyTrait<T1>`,
-             * - `pathToTypeParamInConstraint` = `"B"`,
-             * - `pathToTypeParamInSub` = `"A"`,
-             * - `prefix` = `suffix` = `mid` = `""`,
+             * - `pathToTypeParamInConstraint` = `"MyTrait<B>"`,
+             * - `pathToTypeParamInSub` = `"MyThing<A>"`,
+             * - `prefix` = `"Option<T>"`
+             * - `mid` = `""`,
              * - `tp = T1`,
-             * - `pathToTp` = `"B"`, and
-             * - `result` = `i32`.
+             * - `pathToTp` = `"MyTrait<B>"`, and
+             *   - `suffix` = `""` and `result` = `S`, or
+             *   - `suffix` = `"S<T>"` and `result` = `i32`.
              *
-             * That is, it allows us to infer that the type of `y` is `MyThing<i32>`.
+             * That is, it allows us to infer that the type of `y` is `MyThing<S<i32>>`.
              */
 
             typeMatch(a, e, target, suffix, result, tp) and
-            exists(TypeParameter constrainedTp, DeclarationPosition dpos |
-              typeParameterConstraintHasTypeParameter(target, constrainedTp, constraint, pathToTp,
-                tp) and
-              accessDeclarationPositionMatch(apos, dpos) and
-              constrainedTp = target.getDeclaredType(dpos, _)
-            ) and
             pathToTp = pathToTypeParamInConstraint.appendInverse(mid) and
             path = prefix.append(pathToTypeParamInSub.append(mid).append(suffix))
+            or
+            /*
+             * Example:
+             *
+             * ```rust
+             * struct S<T> { ... }
+             *
+             * struct MyThing<A> { ... }
+             *
+             * trait MyTrait<B> { ... }
+             *
+             * impl<T> MyTrait<[T;1]> for MyThing<T> { ... }
+             *
+             * fn bar<T1, T2: MyTrait<T1>>(x: T1, y: Option<T2>) {}
+             *
+             * let x: S<i32> = ...;
+             * let y = MyThing(Default::default());
+             * bar([x], Some(y));
+             * ```
+             *
+             * At `term` = `bar([x], Some(y))`, we have
+             * - `constraint = MyTrait<T1>`,
+             * - `pathToTypeParamInConstraint` = `"MyTrait<B>.[;]<TArray>"`,
+             * - `pathToTypeParamInSub` = `"MyThing<A>"`,
+             * - `prefix` = `"Option<T>"`
+             * - `mid` = `"[;]<TArray>"`,
+             * - `tp = T1`,
+             * - `pathToTp` = `"MyTrait<B>"`, and
+             *   - `suffix` = `""` and `result` = `S`, or
+             *   - `suffix` = `"S<T>"` and `result` = `i32`.
+             *
+             * That is, it allows us to infer that the type of `y` is `MyThing<S<i32>>`.
+             */
+
+            pathToTypeParamInConstraint = pathToTp.appendInverse(mid) and
+            typeMatch(a, e, target, mid.appendInverse(suffix), result, tp) and
+            path = prefix.append(pathToTypeParamInSub.append(suffix))
           )
         )
       }
@@ -1869,8 +1975,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         /** Gets the location of this declaration. */
         Location getLocation();
 
-        /** Gets the type parameter at position `tppos` of this declaration, if any. */
-        TypeParameter getTypeParameter(TypeParameterPosition tppos);
+        /** Gets the `i`th type parameter of this declaration, if any. */
+        TypeParameter getTypeParameter(int i);
 
         /**
          * Gets the declared type of this declaration at `path` for position `dpos`.
@@ -1912,13 +2018,12 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         Location getLocation();
 
         /**
-         * Gets the type at `path` for the type argument at position `tapos` of
-         * this access, if any.
+         * Gets the type at `path` for the `i`th type argument of this access, if any.
          *
          * For example, in a method call like `M<int>()`, `int` is an explicit
          * type argument at position `0`.
          */
-        Type getTypeArgument(TypeArgumentPosition tapos, TypePath path);
+        Type getTypeArgument(int i, TypePath path);
 
         /**
          * Gets the inferred type at `path` for the position `apos` of this access.
@@ -1996,5 +2101,1767 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         not exists(tm.getTypeAt(TypePath::nil())) and exists(tm.getLocation())
       }
     }
+
+    private module Consistency2 = Consistency;
+
+    /**
+     * Provides the input to `Make3`.
+     */
+    signature module InputSig3 {
+      /**
+       * Reverse references to the cached predicates that reference
+       * `CachedStage::ref()`.
+       */
+      default predicate cacheRevRef() { none() }
+
+      /**
+       * This predicate must be implemented as an alias for the `inferType` predicate
+       * defined in this module, and is needed in order to provide default implementations
+       * inside this signature.
+       */
+      Type inferTypeForDefaults(AstNode n, TypePath path);
+
+      /**
+       * A special pseudo type used to represent cases where the actual type needs
+       * to be inferred using contextual information. For example, in
+       *
+       * ```rust
+       * let x = Vec::new();
+       * x.push(42);
+       * ```
+       *
+       * the element type of `x` is assigned an unknown type, which allows for type
+       * information to flow into `x` from the call to `push`.
+       */
+      class UnknownType extends PseudoType;
+
+      /** A boolean type. */
+      class BoolType extends Type;
+
+      /** An AST node. */
+      class AstNode {
+        /** Gets a textual representation of this AST node. */
+        string toString();
+
+        /** Gets the location of this AST node. */
+        Location getLocation();
+      }
+
+      /** An expression. */
+      class Expr extends AstNode;
+
+      /** A cast expression. */
+      class Cast extends Expr {
+        /** Gets the type being cast to. */
+        TypeMention getType();
+      }
+
+      /**
+       * A switch.
+       */
+      class Switch extends AstNode {
+        /**
+         * Gets the expression being switched on.
+         */
+        Expr getExpr();
+
+        /** Gets the case at the specified (zero-based) `index`. */
+        Case getCase(int index);
+      }
+
+      /** A case in a switch. */
+      class Case extends AstNode {
+        /** Gets a pattern being matched by this case. */
+        AstNode getAPattern();
+
+        /** Gets the body of this case. */
+        AstNode getBody();
+      }
+
+      /** A ternary conditional expression. */
+      class ConditionalExpr extends Expr {
+        /** Gets the condition of this expression. */
+        Expr getCondition();
+
+        /** Gets the true branch of this expression. */
+        Expr getThen();
+
+        /** Gets the false branch of this expression. */
+        Expr getElse();
+      }
+
+      /** A binary expression. */
+      class BinaryExpr extends Expr {
+        /** Gets the left operand of this binary expression. */
+        Expr getLeftOperand();
+
+        /** Gets the right operand of this binary expression. */
+        Expr getRightOperand();
+      }
+
+      /** A short-circuiting logical AND expression. */
+      class LogicalAndExpr extends BinaryExpr;
+
+      /** A short-circuiting logical OR expression. */
+      class LogicalOrExpr extends BinaryExpr;
+
+      /**
+       * An assignment expression, either compound or simple.
+       *
+       * Examples:
+       *
+       * ```
+       * x = y
+       * sum += element
+       * ```
+       */
+      class Assignment extends BinaryExpr;
+
+      /** A simple assignment expression, for example `x = y`. */
+      class AssignExpr extends Assignment;
+
+      /** A parenthesized expression. */
+      class ParenExpr extends Expr {
+        Expr getExpr();
+      }
+
+      /**
+       * A variable, or an entity that behaves like a variable with respect to
+       * type inference, for example a local variable, `const` item, or `static`
+       * item in Rust.
+       */
+      class Variable {
+        /** Gets the AST node that defines this variable, if any. */
+        AstNode getDefiningNode();
+
+        /** Gets an access to this variable. */
+        Expr getAnAccess();
+
+        /** Gets a textual representation of this variable. */
+        string toString();
+
+        /** Gets the location of this variable. */
+        Location getLocation();
+      }
+
+      /** A declaration. */
+      class Declaration {
+        /**
+         * Gets the type mention of the entity that contains this declaration, if any.
+         *
+         * For example, if this declaration is a method, then the declaring type is the
+         * type of the class that contains the method.
+         *
+         * This type will be used to match against type qualifiers at invocations:
+         *
+         * ```rust
+         * struct MyStruct<A> { ... }
+         *
+         * impl<B> MyStruct<B> {
+         * //      ^^^^^^^^^^^ declaring type of `new`
+         *   fn new() -> Self { ... }
+         * }
+         *
+         * let c = MyStruct::<C>::new();
+         * //      ^^^^^^^^^^^^^ type qualifier; `C` should be matched against `B`
+         * ```
+         *
+         * Local variable declarations will not have a declaring type (but they may have
+         * a _declared_ type).
+         */
+        TypeMention getDeclaringType();
+
+        /**
+         * Gets the declared type of this declaration, if any.
+         *
+         * This can for example be the type of a variable or field, or the return type of
+         * a function.
+         */
+        TypeMention getType();
+
+        /** Gets a textual representation of this declaration. */
+        string toString();
+
+        /** Gets the location of this declaration. */
+        Location getLocation();
+      }
+
+      /**
+       * A declaration of one or more variables, for example a `let` statement
+       * in Rust.
+       */
+      class VariableDeclaration extends Declaration {
+        /**
+         * Holds if the type of the initializer and the pattern are certainly the same.
+         *
+         * This need not be the case in for example Rust, where implicit coercions may
+         * happen.
+         */
+        predicate preservesInitializerType();
+
+        /**
+         * Gets the pattern of this declaration.
+         *
+         * Any variable declared by this declaration will have its defining node in the
+         * pattern, for example in `let Some(x) = opt`, the defining node of `x` is under
+         * the `Some` pattern.
+         */
+        AstNode getPattern();
+
+        /** Gets the initializer of this declaration, if any. */
+        AstNode getInitializer();
+      }
+
+      /** A field. */
+      class Field extends Declaration;
+
+      /** A field access expression, for example `x.f`. */
+      class FieldAccess extends Expr {
+        /* Gets the receiver of this field access. */
+        Expr getReceiver();
+
+        /** Gets the field being accessed. */
+        Field getField();
+      }
+
+      /**
+       * Gets the inferred type of the receiver of `fa` at `path`, to be used when
+       * propagating type information out of the field access via the field declaration.
+       *
+       * By default, this is the inferred type of `fa.getReceiver()`, but for example in
+       * Rust, post-processing may be needed to take implicit dereferencing into account
+       */
+      default Type inferFieldAccessReceiverType(FieldAccess fa, TypePath path) {
+        result = inferTypeForDefaults(fa.getReceiver(), path)
+      }
+
+      /**
+       * Gets the contextually inferred type of field access receiver `receiver`
+       * at `path`. The context used is the field being accessed, for example in
+       *
+       * ```rust
+       * let tuple = (Default::default(), "hello");
+       * let x: i32 = tuple.0;
+       * ```
+       *
+       * we will be able to infer that the type of `Default::default()` is `i32`.
+       *
+       * This predicate must be implemented using `inferFieldAccessReceiverTypeContextualDefault`,
+       * performing the dual post-processing of `inferFieldAccessReceiverType`.
+       *
+       * When no post-processing is needed, simply implement this predicate as
+       * `result = inferFieldAccessReceiverTypeContextualDefault(_, receiver, path)`.
+       */
+      Type inferFieldAccessReceiverTypeContextual(Expr receiver, TypePath path);
+
+      /** A node that returns a value from a callable. */
+      class Return extends AstNode {
+        /** Gets the expression evaluating to the value being returned, if any. */
+        Expr getExpr();
+      }
+
+      /** A parameter. */
+      class Parameter extends VariableDeclaration;
+
+      /**
+       * Holds if `p` is an implicit parameter declaration corresponding
+       * to variable `v`.
+       */
+      default predicate implicitParameterDecl(Parameter p, Variable v) { none() }
+
+      /** A callable. This may include for example variant constructors. */
+      class Callable extends Declaration {
+        /**
+         * Gets the `i`th type parameter of this element, if any.
+         *
+         * This should only include type parameters declared directly on the element
+         * itself; any type parameters that are in scope from the declaring element
+         * are handled via `getDeclaringType`:
+         *
+         * ```rust
+         * impl<T> MyThing<T> {
+         * //      ^^^^^^^^^^ declaring type of `foo`; `T` is in scope, but not a type parameter of `foo`
+         *     fn foo<U>(self, x: U, y: T) { ... }
+         * //         ^ `U` is the `0`th type parameter of `foo`
+         * }
+         * ```
+         */
+        TypeParameter getTypeParameter(int i);
+
+        /**
+         * Gets an additional type parameter constraint for the given type parameter,
+         * which applies to this element. For example, in Rust, a function can apply
+         * additional constraints on type parameters belonging to the `impl` block
+         * that the function is defined in:
+         *
+         * ```rust
+         * impl<T> MyThing<T> {
+         *     fn foo(self) where T: MyTrait { ... }
+         * //                        ^^^^^^^ additional constraint on `T` that applies to `foo`
+         * }
+         */
+        TypeMention getAdditionalTypeParameterConstraint(TypeParameter tp);
+
+        /**
+         * Gets the `i`th parameter of this element.
+         *
+         * This should also include (possibly implicit) `this`/`self` parameters.
+         */
+        Parameter getParameter(int i);
+
+        /** Gets the body of this callable, if any. */
+        AstNode getBody();
+      }
+
+      /** Gets the immediately enclosing callable that contains `node`, if any. */
+      Callable getEnclosingCallable(AstNode node);
+
+      /**
+       * Gets the return type of `c` at `path`.
+       *
+       * By default, this is the declared type of `c` at `path`, but in for example Rust,
+       * `async` functions must have their return type wrapped in a `Future` type.
+       */
+      default Type getCallableReturnType(Callable c, TypePath path) {
+        result = c.getType().getTypeAt(path)
+      }
+
+      /**
+       * A context needed for resolving invocations.
+       *
+       * For example, in Rust a context is needed to resolve method calls, because of
+       * implicit dereferencing and borrowing. When not needed, simply use `Unit`.
+       */
+      bindingset[this]
+      class InvocationResolutionContext {
+        /** Gets a textual representation of this context. */
+        bindingset[this]
+        string toString();
+      }
+
+      /** An invocation expression, for example a call or a variant construction. */
+      class Invocation extends Expr {
+        /**
+         * Gets the type at `path` of the explicit type qualifier for this invocation,
+         * if any.
+         *
+         * When present, this type qualifier will be matched against the declaring
+         * type of the target.
+         *
+         * Example:
+         *
+         * ```rust
+         * let opt = Option::<i32>::None;
+         * //        ^^^^^^^^^^^^^ type qualifier
+         * ```
+         */
+        Type getTypeQualifier(TypePath path);
+
+        /**
+         * Gets the explicit type argument at position `i` and `path` for this
+         * invocation, if any.
+         *
+         * This should only include type arguments that are supplied for type
+         * parameters belonging to the target of the invocation, and not type
+         * arguments that are part of a type qualifier (those should be handled via
+         * `getTypeQualifier`).
+         *
+         * Example:
+         *
+         * ```rust
+         * let x = Foo::<i32>::bar::<i64>();
+         * //      ^^^^^^^^^^ type qualifier
+         * //                        ^^^ type argument 0
+         * ```
+         */
+        Type getTypeArgument(int i, TypePath path);
+
+        /**
+         * Gets the `i`th argument of this invocation.
+         *
+         * This should include the receiver argument for method calls.
+         */
+        Expr getArgument(int i);
+
+        /**
+         * Gets the target of this invocation in the given resolution context.
+         *
+         * This predicate may depend on the `inferType` predicate, for example,
+         * in order to resolve a method call one needs to know the type of the
+         * receiver.
+         */
+        Callable getTarget(InvocationResolutionContext ctx);
+
+        /**
+         * Gets a target (candidate) of this invocation which will be used to
+         * match the type qualifier of this call against type parameters of the
+         * declaring type of the target (candidate).
+         *
+         * Unlike `getTarget`, this predicate cannot depend on the `inferType`
+         * predicate.
+         */
+        Callable getATargetForTypeQualifierMatching();
+      }
+
+      /**
+       * Gets the inferred type of the `i`th argument of `invocation` at `path` in context
+       * `ctx`, to be used when propagating type information out of the invocation via the
+       * target.
+       *
+       * By default, this is the inferred type of `invocation.getArgument(i)`, but in for
+       * example Rust, post-processing may be needed to take implicit dereferencing and
+       * borrowing into account for the receiver type of a method call.
+       */
+      bindingset[ctx]
+      default Type inferInvocationArgumentType(
+        Invocation invocation, InvocationResolutionContext ctx, int i, TypePath path
+      ) {
+        result = inferTypeForDefaults(invocation.getArgument(i), path) and
+        exists(ctx)
+      }
+
+      /**
+       * Gets the contextually inferred type of invocation argument `arg` at `path`.
+       * The context used is the target of the invocation, for example in
+       *
+       * ```rust
+       * let x = Vec::new();
+       * x.push(42);
+       * ```
+       *
+       * the `push` context allows us to infer that the type of `x` is `Vec<i32>`.
+       *
+       * This predicate must be implemented using `inferInvocationArgumentTypeContextualDefault`,
+       * performing the dual post-processing of `inferInvocationArgumentType`.
+       *
+       * When no post-processing is needed, simply implement this predicate as
+       * `result = inferInvocationArgumentTypeContextualDefault(_, _, _, arg, path)`.
+       */
+      Type inferInvocationArgumentTypeContextual(Expr arg, TypePath path);
+
+      /**
+       * Gets the inferred type of `invocation`, found by propagating type information
+       * out of the invocation via the target.
+       *
+       * When no post-processing is needed, simply implement this predicate as
+       * `result = inferInvocationTypeDefault(invocation, _, path)`.
+       */
+      Type inferInvocationType(Invocation invocation, TypePath path);
+
+      /**
+       * Gets the contextually inferred type of `invocation`, to be used when propagating
+       * type information out of the invocation via the declared type of the target.
+       *
+       * For example, in
+       *
+       * ```rust
+       * fn id<T>(x: T) -> T { x }
+       * let x = Default::default();
+       * let y: i32 = id(x);
+       * ```
+       *
+       * knowing that the return type of `id(x)` is `i32` allows us to infer that
+       * the type of `x` is also `i32`.
+       *
+       * This predicate should perform the dual post-processing of `inferInvocationType`.
+       */
+      default Type inferInvocationTypeContextual(Invocation invocation, TypePath path) {
+        result = inferTypeForDefaults(invocation, path)
+      }
+
+      /** A closure/lambda expression. */
+      class Closure extends Callable {
+        /** Gets the expression that defines this closure (typically the entity itself). */
+        Expr getDefiningExpr();
+      }
+
+      /**
+       * A special pseudo type representing a particular closure parameter without
+       * a type annotation.
+       *
+       * For such parameters, we want to infer the type based on the context in which
+       * the closure occurs, and while we could do this by assigning the parameter the
+       * pseudo type `UnknownType`, this would mean that the parameter type could also
+       * be inferred from _within_ the closure body, which we want to avoid.
+       *
+       * There are two ways for type information to flow contextually into a closure
+       * parameter: (A) either by knowing the types of arguments, or (B) by knowing the
+       * return type. Only case B makes use of `ClosureParameterPseudoType`s.
+       *
+       * ### Case A
+       *
+       * ```rust
+       * let c = |x| (x, false);
+       * let r = c(0);
+       * ```
+       *
+       * 1. `c` is assigned the type `Fn(UnknownType) -> ...`,
+       * 2. since `0` has type `i32`, we can infer the `c` has type `Fn(i32) -> ...`, and
+       * 3. using contextual inference, we conclude that `x` has type `i32`.
+       *
+       * ### Case B
+       *
+       * ```rust
+       * let c = |x| (x, false);
+       * let r: i32 = c(Default::default()).0;
+       * ```
+       *
+       * 1. `x` is assigned the pseudo type `T_x`,
+       * 2. infer that the return type of `c` is `(T_x, bool)` and hence that `c` has type
+       *    `Fn(T_x) -> (T_x, bool)`,
+       * 3. this enables us to detect that contextual inference is needed, so we also
+       *    assign `c` the type `Fn(T_x) -> (UnknownType, bool)`,
+       * 4. infer that `c(Default::default()).0` must have `UnknownType`,
+       * 5. infer, using contextual inference, that `c` has type `Fn(T_x) -> (i32, bool)`,
+       *    and finally
+       * 6. since `c` also has type `Fn(T_x) -> (T_x, bool)`, we conclude that `x` has type
+       *    `i32` and hence that `c` has type `Fn(i32) -> (i32, bool)`.
+       *
+       * Note that steps 2, 4, and 5 are standard inference steps.
+       */
+      class ClosureParameterPseudoType extends PseudoType {
+        /** Gets the closure parameter that this type represents. */
+        Parameter getParameter();
+      }
+
+      /** Gets the root type of closure `c`, for example `Fn` in Rust or `Func` in C#. */
+      bindingset[c]
+      Type getClosureType(Closure c);
+
+      /**
+       * Gets the type path corresponding to closure parameter `p`. This should be
+       * a path into the `getClosureType(c)` type, where `c` is the closure that `p`
+       * belongs to.
+       */
+      TypePath getClosureParameterTypePath(Parameter p);
+
+      /**
+       * Gets the type path corresponding to the return type of closure `c`. This should be
+       * a path into the `getClosureType(c)` type.
+       */
+      bindingset[c]
+      TypePath getClosureReturnTypePath(Closure c);
+
+      /**
+       * Holds if `n1` having type `t` at `prefix1.suffix` implies that `n2` has type
+       * `t` at `prefix2.suffix`, for any `suffix`. The converse should also hold, but
+       * only when `n1` already has an inferred type that matches `prefix1`.
+       *
+       * Use this predicate to implement any language-specific bottom-up inference logic.
+       *
+       * For example, in Rust one may implement the following two rules for the `?` operator:
+       *
+       * ```text
+       *   x : Option<T>          x : Result<T, E>
+       * -----------------      --------------------
+       *      x? : T                    x? : T
+       * ```
+       *
+       * The rules examplify how the converse only holds when `n1` already has an inferred type
+       * that matches `prefix1`; knowing that `x?` has type `i32` does not necessarily imply that
+       * `x` has type `Option<i32>` or `Result<i32, _>`, we can only conclude this if we know
+       * that `x` has root type `Option` or `Result`, respectively.
+       *
+       * When contextual type information is needed at `n1`, this predicate may be applied
+       * _reversely_ (see an example in the module documentation).
+       */
+      predicate stepLanguageSpecific(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2);
+
+      /**
+       * Like `stepLanguageSpecific`, but allows for recursion through type inference, which
+       * has the consequence that it cannot be used in the logic for inferring certain type
+       * information.
+       *
+       * Only use this predicate when using `stepLanguageSpecific` results in non-monotonicity.
+       */
+      default predicate stepLanguageSpecificExtra(
+        AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2
+      ) {
+        none()
+      }
+
+      /**
+       * Gets the inferred type of `n` at `path`.
+       *
+       * Use this predicate to implement any language-specific inference logic, but only for
+       * nodes where `stepLanguageSpecific` cannot be used, such as leaf nodes in the AST.
+       */
+      Type inferTypeLanguageSpecific(AstNode n, TypePath path);
+
+      /**
+       * Gets the inferred certain type of `n` at `path`.
+       *
+       * Use this predicate to implement any language-specific inference logic.
+       *
+       * Any tuples included in this predicate will also automatically be included
+       * in `inferTypeLanguageSpecific`; if in doubt, use `inferTypeLanguageSpecific` instead.
+       */
+      default Type inferTypeCertainLanguageSpecific(AstNode n, TypePath path) { none() }
+
+      /**
+       * Holds if contextual inference is allowed for the node `n` at the type path
+       * `path`. This has the same effect as assigning `UnknownType` to `n` at `path`,
+       * but prevents propagation of `UnknownType` from `n` to other nodes.
+       */
+      default predicate allowContextualInference(AstNode n, TypePath path) { none() }
+    }
+
+    module Make3<InputSig3 Input3> {
+      private import Input3
+
+      pragma[nomagic]
+      private predicate closureStep(AstNode pattern, TypePath prefix1, Expr c, TypePath prefix2) {
+        exists(Closure c0, Parameter p |
+          pattern = p.getPattern() and
+          p = c0.getParameter(_) and
+          prefix1.isEmpty() and
+          prefix2 = getClosureParameterTypePath(p) and
+          c = c0.getDefiningExpr()
+        )
+      }
+
+      /**
+       * Provides logic for inferring certain type information.
+       *
+       * Unlike `inferType`, which may in general infer multiple types for a given node,
+       * `inferTypeCertain` will (ideally) only infer a single type for a given node, and
+       * `inferType` will not be allowed to infer types that are in conflict with known
+       * certain type information, which helps to avoid combinatorial explosions in the
+       * numbers of types inferred.
+       */
+      private module Certain {
+        /** Gets the type of `n`, which has an explicit type annotation. */
+        pragma[nomagic]
+        private Type inferAnnotatedType(AstNode n, TypePath path) {
+          exists(TypeMention tm | result = tm.getTypeAt(path) |
+            tm = n.(Cast).getType()
+            or
+            exists(VariableDeclaration decl |
+              tm = decl.getType() and
+              n = decl.getPattern()
+            )
+            or
+            exists(Parameter p, Variable v |
+              implicitParameterDecl(p, v) and
+              tm = p.getType() and
+              n = v.getAnAccess()
+            )
+          )
+          or
+          exists(Closure c, TypePath suffix |
+            n = c.getDefiningExpr() and
+            result = getCallableReturnType(c, suffix) and
+            path = getClosureReturnTypePath(c).append(suffix)
+          )
+        }
+
+        predicate stepCertain(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
+          // language-specific inference steps are assumed to preserve certainty when
+          // they have a unique premise
+          stepLanguageSpecific(n1, prefix1, n2, prefix2) and
+          strictcount(AstNode n1_, TypePath prefix1_, TypePath prefix2_ |
+            stepLanguageSpecific(n1_, prefix1_, n2, prefix2_)
+          ) = 1
+          or
+          prefix1.isEmpty() and
+          prefix2.isEmpty() and
+          (
+            exists(Variable v | n1 = v.getDefiningNode() and n2 = v.getAnAccess())
+            or
+            exists(VariableDeclaration decl |
+              decl.preservesInitializerType() and
+              not exists(decl.getType()) and
+              n1 = decl.getInitializer() and
+              n2 = decl.getPattern()
+            )
+            or
+            n1 = n2.(ParenExpr).getExpr()
+          )
+        }
+
+        pragma[nomagic]
+        private Type inferTypeFromStepCertain(AstNode n, TypePath path) {
+          exists(TypePath prefix1, AstNode n2, TypePath prefix2, TypePath suffix |
+            result = inferTypeCertain(n2, prefix2.appendInverse(suffix)) and
+            path = prefix1.append(suffix)
+          |
+            stepCertain(n2, prefix2, n, prefix1)
+            or
+            closureStep(n2, prefix2, n, prefix1)
+          )
+        }
+
+        /**
+         * Gets the inferred certain type of `n` at `prefix`, where `prefix` is a proper
+         * prefix of a unique bottom-up inference step for `n`.
+         *
+         * For example, if we have a rule for Rust array repeat expressions like
+         *
+         * ```text
+         *       e : T
+         * --------------------
+         *    [e; n] : [T; n]
+         * ```
+         *
+         * then this predicate allows us to infer that the root type of `[e; n]` is
+         * `[...; n]`, regardless of whether we are able to infer the type of `e`.
+         */
+        pragma[nomagic]
+        private Type inferTypeFromStepPrefixCertain(AstNode n, TypePath prefix) {
+          exists(TypePath path, TypeParameter tp |
+            path.isSnoc(prefix, tp) and
+            result.getATypeParameter() = tp
+          |
+            path =
+              unique(TypePath path0 |
+                stepLanguageSpecific(_, TypePath::nil(), n, path0)
+                or
+                stepCertain(_, TypePath::nil(), n, path0)
+                or
+                closureStep(_, TypePath::nil(), n, path0)
+              )
+            or
+            exists(inferTypeFromStepPrefixCertain(n, path))
+          )
+        }
+
+        private Type inferLogicalOperationType(AstNode n, TypePath path) {
+          (
+            exists(LogicalAndExpr lae | n = [lae, lae.getLeftOperand(), lae.getRightOperand()]) or
+            exists(LogicalOrExpr loe | n = [loe, loe.getLeftOperand(), loe.getRightOperand()])
+          ) and
+          result instanceof BoolType and
+          path.isEmpty()
+        }
+
+        /** Gets the inferred certain type of `n` at `path`. */
+        cached
+        Type inferTypeCertain(AstNode n, TypePath path) {
+          (
+            CachedStage::ref() and
+            result = Input3::inferTypeCertainLanguageSpecific(n, path)
+            or
+            result = inferAnnotatedType(n, path)
+            or
+            result = inferTypeFromStepCertain(n, path)
+            or
+            result = inferTypeFromStepPrefixCertain(n, path)
+            or
+            result = inferLogicalOperationType(n, path)
+            or
+            exists(Closure c |
+              n = c.getDefiningExpr() and
+              result = getClosureType(c) and
+              path.isEmpty()
+            )
+            or
+            infersCertainTypeAt(n, path, result.getATypeParameter())
+          ) and
+          // type annotation may for example include unknown types, such as
+          // `x: Vec<_>` in Rust
+          not result instanceof PseudoType
+        }
+
+        /**
+         * Holds if `n` has complete and certain type information at `path`.
+         */
+        pragma[nomagic]
+        predicate hasInferredCertainType(AstNode n, TypePath path) {
+          exists(inferTypeCertain(n, path))
+        }
+
+        /**
+         * Holds if `n` has complete and certain type information at the type path
+         * `prefix.tp`. This entails that the type at `prefix` must be the type
+         * that declares `tp`.
+         */
+        pragma[nomagic]
+        private predicate infersCertainTypeAt(AstNode n, TypePath prefix, TypeParameter tp) {
+          exists(TypePath path |
+            hasInferredCertainType(n, path) and
+            not path.isEmpty() and // implied by `isSnoc` below, but improves performance slightly
+            path.isSnoc(prefix, tp)
+          )
+        }
+
+        /**
+         * Holds if `n` having type `t` at `path` conflicts with certain type information
+         * at `prefix`.
+         */
+        bindingset[n, prefix, path, t]
+        pragma[inline_late]
+        predicate certainTypeConflict(AstNode n, TypePath prefix, TypePath path, Type t) {
+          inferTypeCertain(n, path) != t
+          or
+          // If we infer that `n` has _some_ type at `T1.T2....Tn`, and we also
+          // know that `n` certainly has type `certainType` at `T1.T2...Ti`, `0 <= i < n`,
+          // then it must be the case that `T(i+1)` is a type parameter of `certainType`,
+          // otherwise there is a conflict.
+          //
+          // Below, `prefix` is `T1.T2...Ti` and `tp` is `T(i+1)`.
+          exists(TypePath suffix, TypeParameter tp, Type certainType |
+            path = prefix.appendInverse(suffix) and
+            tp = suffix.getHead() and
+            inferTypeCertain(n, prefix) = certainType and
+            not certainType.getATypeParameter() = tp
+          )
+        }
+      }
+
+      predicate inferTypeCertain = Certain::inferTypeCertain/2;
+
+      private predicate step(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
+        stepLanguageSpecific(n1, prefix1, n2, prefix2)
+        or
+        stepLanguageSpecificExtra(n1, prefix1, n2, prefix2)
+        or
+        Certain::stepCertain(n1, prefix1, n2, prefix2)
+        or
+        prefix1.isEmpty() and
+        prefix2.isEmpty() and
+        (
+          exists(AssignExpr ae |
+            n1 = ae.getRightOperand() and
+            n2 = ae.getLeftOperand()
+          )
+          or
+          exists(VariableDeclaration decl |
+            n1 = decl.getInitializer() and
+            n2 = decl.getPattern()
+          )
+          or
+          exists(Switch switch |
+            n1 = switch.getExpr() and
+            n2 = switch.getCase(_).getAPattern()
+          )
+          or
+          n1 = n2.(Switch).getCase(_).getBody()
+          or
+          n2 = any(ConditionalExpr ce | n1 = [ce.getThen(), ce.getElse()])
+          or
+          exists(Return ret, Callable c |
+            n1 = ret.getExpr() and
+            c = getEnclosingCallable(ret) and
+            n2 = c.getBody()
+          )
+        )
+        or
+        exists(Closure c |
+          n1 = c.getBody() and
+          n2 = c.getDefiningExpr() and
+          prefix1.isEmpty() and
+          prefix2 = getClosureReturnTypePath(c)
+        )
+      }
+
+      pragma[nomagic]
+      private Type inferTypeFromStep(AstNode n, TypePath path) {
+        exists(TypePath prefix1, AstNode n2, TypePath prefix2, TypePath suffix |
+          result = inferType(n2, prefix2.appendInverse(suffix)) and
+          path = prefix1.append(suffix)
+        |
+          step(n2, prefix2, n, prefix1)
+          or
+          closureStep(n2, prefix2, n, prefix1) and
+          // prevent closure parameter pseudo types from escaping the closure
+          not exists(Closure c |
+            n = c.getDefiningExpr() and
+            result.(ClosureParameterPseudoType).getParameter() = c.getParameter(_)
+          )
+        )
+      }
+
+      /**
+       * A matching configuration for resolving types of field accesses like `x.field`.
+       */
+      private module FieldAccessMatchingInput implements MatchingInputSig {
+        private newtype TDeclarationPosition =
+          TReceiverPosition() or
+          TFieldPosition()
+
+        class DeclarationPosition extends TDeclarationPosition {
+          predicate isReceiver() { this = TReceiverPosition() }
+
+          predicate isField() { this = TFieldPosition() }
+
+          string toString() {
+            this.isReceiver() and
+            result = "receiver"
+            or
+            this.isField() and
+            result = "field"
+          }
+        }
+
+        final private class FieldFinal = Field;
+
+        class Declaration extends FieldFinal {
+          TypeParameter getTypeParameter(int pos) { none() }
+
+          Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
+            dpos.isReceiver() and
+            result = this.getDeclaringType().getTypeAt(path)
+            or
+            dpos.isField() and
+            result = this.getType().getTypeAt(path)
+          }
+        }
+
+        class AccessPosition = DeclarationPosition;
+
+        predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
+          apos = dpos
+        }
+
+        final private class FieldAccessFinal = FieldAccess;
+
+        class Access extends FieldAccessFinal {
+          Type getTypeArgument(int pos, TypePath path) { none() }
+
+          Type getInferredType(AccessPosition apos, TypePath path) {
+            apos.isReceiver() and
+            result = inferFieldAccessReceiverType(this, path)
+            or
+            apos.isField() and
+            result = inferType(this, path)
+          }
+
+          Declaration getTarget() { result = this.getField() }
+        }
+      }
+
+      private module FieldAccessMatching = Matching<FieldAccessMatchingInput>;
+
+      pragma[nomagic]
+      private Type inferFieldAccessType(FieldAccess fa, TypePath path) {
+        exists(FieldAccessMatchingInput::DeclarationPosition pos |
+          result = FieldAccessMatching::inferAccessType(fa, pos, path) and
+          pos.isField()
+        )
+      }
+
+      /**
+       * Gets the contextually inferred type of field access receiver `receiver`
+       * at `path`. For more info, see the QL doc of
+       * `InputSig3::inferFieldAccessReceiverTypeContextual`.
+       */
+      pragma[nomagic]
+      Type inferFieldAccessReceiverTypeContextualDefault(
+        FieldAccess fa, Expr receiver, TypePath path
+      ) {
+        exists(FieldAccessMatchingInput::DeclarationPosition pos |
+          result = FieldAccessMatching::inferAccessType(fa, pos, path) and
+          pos.isReceiver() and
+          receiver = fa.getReceiver() and
+          // `inferTypeContextualCand2` performs the proper check for contextual
+          // typing, but we can already rule out cases where receivers don't have
+          // an unknown type anywhere
+          ContextualTyping::hasUnknownType(receiver)
+        )
+      }
+
+      final private class CallableFinal = Callable;
+
+      final private class InvocationFinal = Invocation;
+
+      /**
+       * A matching configuration for matching type qualifiers against type parameters
+       * of declaring types.
+       *
+       * While the type arguments of type qualifiers may often have to be matched
+       * directly against the corresponding type parameters, this need not always be the
+       * case. For example, in Rust, functions are not defined inside the type definitions,
+       * but rather inside `impl` blocks that will have their own type parameters:
+       *
+       * ```rust
+       * struct MyThing<T> { ... }
+       *
+       * impl<A> MyThing<A> {
+       *     fn foo(self) { ... }
+       * }
+       *
+       * MyThing::<i32>::foo();
+       * //        ^^^ should be matched against `A`, not `T`
+       * ```
+       */
+      private module InvocationTypeQualifierMatchingInput implements MatchingInputSig {
+        private import codeql.util.Unit
+
+        class DeclarationPosition = Unit;
+
+        class AccessPosition = Unit;
+
+        predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
+          apos = dpos
+        }
+
+        class Declaration extends CallableFinal {
+          Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
+            result = this.getDeclaringType().getTypeAt(path) and
+            exists(dpos)
+          }
+        }
+
+        bindingset[decl]
+        TypeMention getATypeParameterConstraint(TypeParameter tp, Declaration decl) {
+          result = Input2::getATypeParameterConstraint(tp) and
+          exists(decl)
+          or
+          result = decl.getAdditionalTypeParameterConstraint(tp)
+        }
+
+        class Access extends InvocationFinal {
+          Access() { exists(this.getTypeQualifier(_)) }
+
+          Type getInferredType(AccessPosition apos, TypePath path) {
+            result = this.getTypeQualifier(path) and
+            exists(apos)
+          }
+
+          Declaration getTarget() { result = this.getATargetForTypeQualifierMatching() }
+        }
+      }
+
+      private module InvocationTypeQualifierMatching =
+        Matching<InvocationTypeQualifierMatchingInput>;
+
+      /**
+       * A matching configuration for matching types of arguments against types of
+       * parameters.
+       */
+      private module InvocationMatchingInput implements MatchingWithEnvironmentInputSig {
+        import InvocationTypeQualifierMatchingInput
+
+        class DeclarationPosition = int;
+
+        class AccessPosition = DeclarationPosition;
+
+        bindingset[apos]
+        bindingset[dpos]
+        predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
+          apos = dpos
+        }
+
+        /** Gets the position used to represent the return type of an invocation. */
+        additional int getReturnPosition() {
+          result = min(int i | i = 0 or exists(any(Callable c).getParameter(i)) | i) - 1
+        }
+
+        private int getFirstTypeParameterPosition() {
+          result = min(int i | i = 0 or exists(any(Callable c).getTypeParameter(i)) | i)
+        }
+
+        private predicate typeQualifierMatch(
+          Invocation invocation, Callable target, TypePath path, Type t, TypeParameter tp, int pos
+        ) {
+          InvocationTypeQualifierMatching::typeMatch(invocation, _, target, path, t, tp) and
+          pos = getFirstTypeParameterPosition() - getRank(tp) - 2
+        }
+
+        class Declaration extends CallableFinal {
+          TypeParameter getTypeParameter(int pos) {
+            // include type parameters that are matched via a type qualifier
+            typeQualifierMatch(_, this, _, _, result, pos)
+            or
+            // blanket implementations in Rust have a declaring type that is itself a
+            // type parameter; those should be matched against the entire type qualifier
+            result = this.getDeclaringType().getTypeAt(TypePath::nil()) and
+            pos = getFirstTypeParameterPosition() - 1
+            or
+            result = super.getTypeParameter(pos)
+          }
+
+          Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
+            result = this.getParameter(dpos).getType().getTypeAt(path)
+            or
+            dpos = getReturnPosition() and
+            result = getCallableReturnType(this, path)
+          }
+        }
+
+        bindingset[decl]
+        TypeMention getATypeParameterConstraint(TypeParameter tp, Declaration decl) {
+          result = InvocationTypeQualifierMatchingInput::getATypeParameterConstraint(tp, decl)
+        }
+
+        class AccessEnvironment = InvocationResolutionContext;
+
+        class Access extends InvocationFinal {
+          Type getTypeArgument(int pos, TypePath path) {
+            // A type argument found by matching the type qualifier against the declaring
+            // type of the target
+            typeQualifierMatch(this, _, path, result, _, pos)
+            or
+            pos = getFirstTypeParameterPosition() - 1 and
+            result = this.getTypeQualifier(path)
+            or
+            result = super.getTypeArgument(pos, path)
+          }
+
+          pragma[nomagic]
+          private Type getInferredReturnType(AccessPosition apos, TypePath path) {
+            result = inferInvocationTypeContextual(this, path) and
+            apos = getReturnPosition()
+          }
+
+          bindingset[e]
+          Type getInferredType(AccessEnvironment e, AccessPosition apos, TypePath path) {
+            result = inferInvocationArgumentType(this, e, apos, path)
+            or
+            result = this.getInferredReturnType(apos, path) and
+            exists(e)
+          }
+
+          Declaration getTarget(AccessEnvironment e) { result = super.getTarget(e) }
+        }
+      }
+
+      private module InvocationMatching = MatchingWithEnvironment<InvocationMatchingInput>;
+
+      /**
+       * Gets the inferred type of `invocation`, found by propagating type information
+       * out of the invocation via the target. For more info, see the QL doc of
+       * `InputSig3::inferInvocationType`.
+       */
+      pragma[nomagic]
+      Type inferInvocationTypeDefault(
+        Invocation invocation, InvocationResolutionContext ctx, TypePath path
+      ) {
+        result =
+          InvocationMatching::inferAccessType(invocation, ctx,
+            InvocationMatchingInput::getReturnPosition(), path)
+      }
+
+      /**
+       * Gets the contextually inferred type of call argument `arg` at `path`. For more info,
+       * see the QL doc of `InputSig3::inferInvocationArgumentTypeContextual`.
+       */
+      pragma[nomagic]
+      Type inferInvocationArgumentTypeContextualDefault(
+        Invocation invocation, InvocationResolutionContext ctx, int pos, Expr arg, TypePath path
+      ) {
+        arg = invocation.getArgument(pos) and
+        result = InvocationMatching::inferAccessType(invocation, ctx, pos, path) and
+        // `inferTypeContextualCand2` performs the proper check for contextual
+        // typing, but we can already rule out cases where arguments don't have
+        // an unknown type anywhere
+        ContextualTyping::hasUnknownType(arg)
+      }
+
+      /**
+       * Provides logic related to contextual typing. By default, types are inferred
+       * bottom-up, but when AST nodes have an explicit `UnknownType`, contextual typing is
+       * allowed.
+       *
+       * This module identifies calls where the return type may need to be inferred from the
+       * context, and also implements logic for performing contextual inference.
+       */
+      module ContextualTyping {
+        /**
+         * Provides the input to `ContextualReturnType`.
+         */
+        signature module ContextualReturnTypeInputSig {
+          /** Holds if `c` has the type parameter `tp` at its return type at `path`. */
+          default predicate callableHasTypeParameterAtReturnType(
+            Callable c, TypePath path, TypeParameter tp
+          ) {
+            tp = getCallableReturnType(c, path)
+          }
+
+          /** Gets a parameter of `c`. */
+          default Parameter getACallableParameter(Callable c) { result = c.getParameter(_) }
+        }
+
+        /**
+         * Provide logic for identifying calls where the return type may need to be inferred from the context.
+         */
+        module ContextualReturnType<ContextualReturnTypeInputSig Input> {
+          pragma[nomagic]
+          private TypeParameter getAConstrained(TypeParameter tp) {
+            result = getATypeParameterConstraint(tp).getTypeAt(_)
+          }
+
+          /**
+           * Holds if callable `c` mentions type parameter `tp` at some parameter,
+           * possibly via a constraint on another mentioned type parameter.
+           */
+          pragma[nomagic]
+          private predicate mentionsTypeParameterAtParameter(Callable c, TypeParameter tp) {
+            tp = getAConstrained*(Input::getACallableParameter(c).getType().getTypeAt(_))
+          }
+
+          /**
+           * Holds if the return type of the callable `c` at `path` is type parameter
+           * `tp`, and `tp` does not appear in the type of any parameter of `c`.
+           *
+           * In this case, the context in which `p` is called may be needed to infer
+           * the instantiation of `tp`.
+           *
+           * This covers functions like `Default::default` and `Vec::new` in Rust.
+           */
+          pragma[nomagic]
+          private predicate callableReturnContextTypedAt(Callable c, TypePath path, TypeParameter tp) {
+            Input::callableHasTypeParameterAtReturnType(c, path, tp) and
+            not mentionsTypeParameterAtParameter(c, tp)
+          }
+
+          bindingset[invocation, target]
+          pragma[inline_late]
+          private predicate hasTypeArgument(Invocation invocation, Callable target, TypeParameter tp) {
+            exists(Type t |
+              InvocationTypeQualifierMatching::typeMatch(invocation, _, _, _, t, tp) and
+              not t instanceof PseudoType
+            )
+            or
+            exists(InvocationMatching::getTypeArgument(invocation, target, tp, _))
+          }
+
+          /**
+           * Holds if `invocation` resolves to some target where the return type at `path`
+           * may have to be inferred from the context.
+           */
+          pragma[nomagic]
+          predicate needsContextualTyping(Invocation invocation, TypePath path) {
+            exists(Callable target, TypeParameter tp |
+              target = invocation.getATargetForTypeQualifierMatching()
+              or
+              target = invocation.getTarget(_)
+            |
+              callableReturnContextTypedAt(target, path, tp) and
+              // check that no explicit type arguments have been supplied that bind `tp`
+              not exists(TypeParameter supplied |
+                tp = getAConstrained*(supplied) and
+                hasTypeArgument(invocation, target, supplied)
+              )
+            )
+          }
+        }
+
+        private module DefaultContextualReturnTypeInput implements ContextualReturnTypeInputSig { }
+
+        predicate needsContextualTyping =
+          ContextualReturnType<DefaultContextualReturnTypeInput>::needsContextualTyping/2;
+
+        pragma[nomagic]
+        predicate hasUnknownTypeAt(AstNode n, TypePath path) {
+          inferType(n, path) instanceof UnknownType
+          or
+          allowContextualInference(n, path)
+        }
+
+        pragma[nomagic]
+        predicate hasUnknownType(AstNode n) { hasUnknownTypeAt(n, _) }
+
+        pragma[nomagic]
+        private Type inferTypeContextualCand0(AstNode n, TypePath path) {
+          exists(Callable c |
+            n = c.getBody() and
+            result = getCallableReturnType(c, path)
+          )
+          or
+          result = inferInvocationArgumentTypeContextual(n, path)
+          or
+          result = inferFieldAccessReceiverTypeContextual(n, path)
+          or
+          // steps are reversed in contextual typing
+          exists(TypePath path1, AstNode n2, TypePath path2, TypePath suffix |
+            result = inferType(n2, path2.appendInverse(suffix)) and
+            path = path1.append(suffix) and
+            step(n, path1, n2, path2)
+          )
+        }
+
+        pragma[nomagic]
+        private Type inferTypeContextualCand1(AstNode n, TypePath prefix, TypePath path) {
+          result = inferTypeContextualCand0(n, path) and
+          hasUnknownType(n) and
+          prefix = path.getAPrefix()
+        }
+
+        pragma[nomagic]
+        private Type inferTypeContextualCand2(AstNode n, TypePath path) {
+          exists(TypePath prefix |
+            result = inferTypeContextualCand1(n, prefix, path) and
+            hasUnknownTypeAt(n, prefix)
+          )
+        }
+
+        /**
+         * Holds if `n` has `UnknownType` at some prefix of non-empty path `path`, and
+         * contextual inference is allowed at `path`. This is the case only if `path` is
+         * compatible with an already inferred type (contextually or not).
+         */
+        pragma[nomagic]
+        private predicate isValidContextualNonEmptyPath(AstNode n, TypePath path) {
+          hasUnknownType(n) and
+          exists(TypePath prefix, TypeParameter tp |
+            tp = inferType(n, prefix).getATypeParameter() and
+            path = TypePath::snoc(prefix, tp)
+          )
+        }
+
+        /**
+         * Gets the contextually inferred type of `n` at `path`, if any. This is only
+         * allowed when `n` has `UnknownType` at some prefix of `path`, and furthermore
+         * if `path` is non-empty, then it must be compatible with an already inferred
+         * type (contextually or not).
+         */
+        pragma[nomagic]
+        Type inferTypeContextual(AstNode n, TypePath path) {
+          result = inferTypeContextualCand2(n, path) and
+          (
+            path.isEmpty()
+            or
+            isValidContextualNonEmptyPath(n, path)
+          )
+        }
+      }
+
+      private module ClosureTyping {
+        /**
+         * Holds if `n` at `path` has a closure parameter pseudo type
+         * corresponding to closure parameter `p`.
+         */
+        pragma[nomagic]
+        private predicate hasClosureParameterPseudoType(AstNode n, TypePath path, Parameter p) {
+          // use `inferTypeCand` to also detect propagation into enclosing closure
+          p = inferTypeCand(n, path).(ClosureParameterPseudoType).getParameter()
+        }
+
+        pragma[nomagic]
+        private predicate hasClosureParameterPseudoType(AstNode n) {
+          hasClosureParameterPseudoType(n, _, _)
+        }
+
+        pragma[nomagic]
+        private predicate hasTypeAtPrefix(AstNode n, TypePath prefix, TypePath path) {
+          hasInferredType(n, path) and
+          hasClosureParameterPseudoType(n) and
+          prefix = path.getAPrefix()
+        }
+
+        /**
+         * Holds if `n` has a closure parameter pseudo type for the parameter
+         * with pattern `pattern` at `prefix`, where `path = prefix.suffix`.
+         *
+         * This means that the parameter pattern can be inferred to have type
+         * `t` at `suffix` when `n` also has inferred type `t` at `path`.
+         */
+        pragma[nomagic]
+        private predicate hasClosureParameterPseudoTypeAtPrefix(
+          AstNode n, TypePath path, AstNode pattern, TypePath suffix
+        ) {
+          exists(Parameter p, TypePath prefix |
+            hasClosureParameterPseudoType(n, prefix, p) and
+            hasTypeAtPrefix(n, prefix, path) and
+            path = prefix.appendInverse(suffix) and
+            pattern = p.getPattern()
+          )
+        }
+
+        pragma[nomagic]
+        private Type inferClosureParameterTypeCand(AstNode n, TypePath path) {
+          result = inferType(n, path) and
+          hasClosureParameterPseudoType(n)
+        }
+
+        private Type inferClosureParameterPseudoType(AstNode n, TypePath path) {
+          // The `step X` comments below refer to the steps for 'Case B' in the
+          // QL doc for `ClosureParameterPseudoType`.
+          exists(Closure c, Parameter p | p = c.getParameter(_) |
+            // step 1
+            n = p.getPattern() and
+            path.isEmpty() and
+            result.(ClosureParameterPseudoType).getParameter() = p
+            or
+            // step 3
+            hasClosureParameterPseudoType(n, path, p) and
+            n = c.getDefiningExpr() and
+            result instanceof UnknownType
+          )
+          or
+          // step 6
+          exists(AstNode n0, TypePath path0 |
+            hasClosureParameterPseudoTypeAtPrefix(n0, path0, n, path) and
+            result = inferClosureParameterTypeCand(n0, path0) and
+            not (path.isEmpty() and result instanceof UnknownType)
+          )
+        }
+
+        Type inferClosureType(AstNode n, TypePath path) {
+          result = inferClosureParameterPseudoType(n, path)
+          or
+          // The `step X` comments below refer to the steps for 'Case A' in the
+          // QL doc for `ClosureParameterPseudoType`.
+          exists(Closure c, Parameter p, Expr def |
+            p = c.getParameter(_) and
+            not exists(p.getType()) and
+            def = c.getDefiningExpr()
+          |
+            // step 1
+            n = def and
+            path = getClosureParameterTypePath(p) and
+            result instanceof UnknownType
+            or
+            // step 3
+            n = p.getPattern() and
+            result = inferType(def, getClosureParameterTypePath(p).appendInverse(path)) and
+            not (path.isEmpty() and result instanceof UnknownType)
+          )
+        }
+      }
+
+      /**
+       * Holds if the type of `n` at `path` is `t` and the `j`th element of `path`
+       * corresponds to the `i`th type parameter of the unknown type.
+       */
+      pragma[nomagic]
+      private predicate infersUnknownTypeArg0(AstNode n, int i, int j, TypePath path, Type t) {
+        exists(TypeParameter tp |
+          ContextualTyping::hasUnknownType(n) and
+          tp = any(UnknownType ut).getPositionalTypeParameter(i) and
+          t = inferType(n, path) and
+          not t instanceof UnknownType and
+          tp = path.getElement(j)
+        )
+      }
+
+      /**
+       * Holds if the type of `n` at `path` is `t`, where
+       * `path = prefix ++ tp_i ++ suffix` and `tp_i` is the `i`th type parameter
+       * of the unknown type.
+       */
+      pragma[nomagic]
+      private predicate infersUnknownTypeArg1(
+        AstNode n, TypePath prefix, int i, TypePath suffix, Type t
+      ) {
+        exists(TypePath path, int j, TypePath suffix0 |
+          infersUnknownTypeArg0(n, i, j, path, t) and
+          prefix = path.getProperPrefix(j) and
+          path = prefix.appendInverse(suffix0) and
+          suffix0.isCons(_, suffix)
+        )
+      }
+
+      /**
+       * Holds if `n` has unknown type at `prefix`, but is still able to
+       * infer a known type at `suffix` for the `i`th type parameter of whatever
+       * the unknown type is.
+       *
+       * For example, in
+       *
+       * ```rust
+       * let mut x: Unresolvable<i32> = ...;
+       *
+       * x = resolvable(...);
+       * ```
+       *
+       * even though the root type is unresolvable at the declaration, we are still
+       * able to infer that the first type argument is `i32`. We can then combine this
+       * information with later inferred type information.
+       */
+      pragma[nomagic]
+      private predicate infersUnknownTypeArg(
+        AstNode n, TypePath prefix, int i, TypePath suffix, Type t
+      ) {
+        ContextualTyping::hasUnknownTypeAt(n, prefix) and
+        infersUnknownTypeArg1(n, prefix, i, suffix, t)
+      }
+
+      pragma[nomagic]
+      private predicate infersKnownAndUnknownType(AstNode n, TypePath path, int i, TypeParameter tp) {
+        ContextualTyping::hasUnknownTypeAt(n, path) and
+        exists(Type t |
+          t = inferType(n, path) and
+          not t instanceof UnknownType and
+          tp = t.getPositionalTypeParameter(i)
+        )
+      }
+
+      /**
+       * Gets an inferred candidate type of `n` at `path`.
+       *
+       * The type is only a candidate because it may later be filtered away, for
+       * example if it conflicts with certain type information.
+       */
+      private Type inferTypeCand(AstNode n, TypePath path) {
+        result = Input3::inferTypeLanguageSpecific(n, path)
+        or
+        result = inferTypeFromStep(n, path)
+        or
+        result = inferInvocationType(n, path)
+        or
+        result = inferFieldAccessType(n, path)
+        or
+        result = ClosureTyping::inferClosureType(n, path)
+        or
+        (
+          ContextualTyping::needsContextualTyping(n, path)
+          or
+          exists(VariableDeclaration decl |
+            n = decl.getPattern() and
+            not exists(decl.getInitializer()) and
+            not exists(decl.getType()) and
+            not n = any(Parameter p).getPattern() and // closure parameters are handled in `ClosureTyping`
+            path.isEmpty()
+          )
+        ) and
+        result instanceof UnknownType
+        or
+        result = ContextualTyping::inferTypeContextual(n, path)
+        or
+        exists(TypePath prefix, int i, TypePath suffix, TypeParameter tp |
+          infersUnknownTypeArg(n, prefix, i, suffix, result) and
+          infersKnownAndUnknownType(n, prefix, i, tp) and
+          path = prefix.append(TypePath::cons(tp, suffix))
+        )
+      }
+
+      /**
+       * Gets the inferred type of `n` at `path`.
+       */
+      cached
+      Type inferType(AstNode n, TypePath path) {
+        CachedStage::ref() and
+        result = inferTypeCertain(n, path)
+        or
+        result = inferTypeCand(n, path) and
+        // Don't propagate type information into a node which conflicts with certain
+        // type information.
+        forall(TypePath prefix |
+          Certain::hasInferredCertainType(n, prefix) and
+          prefix.isPrefixOf(path)
+        |
+          not Certain::certainTypeConflict(n, prefix, path, result)
+          or
+          // propagate closure parameter pseudo types even when there is certain information
+          result instanceof ClosureParameterPseudoType
+        ) and
+        // prevent closure parameter pseudo types from escaping from the closure
+        not exists(Closure c |
+          n = c.getDefiningExpr() and
+          result.(ClosureParameterPseudoType).getParameter() = c.getParameter(_)
+        )
+        or
+        // If `n` has an explicitly unknown type at `prefix` and at the same time a certain
+        // type at `prefix.suffix`, then extend the unknown type information to any path
+        // extending `prefix.suffix` where there is not also certain type information
+        exists(TypePath prefix, TypePath suffix, Type certain, TypeParameter tp |
+          inferTypeCand(n, prefix) instanceof UnknownType and
+          certain = inferTypeCertain(n, prefix.appendInverse(suffix)) and
+          tp = certain.getATypeParameter() and
+          path = prefix.append(suffix).append(TypePath::singleton(tp)) and
+          not exists(inferTypeCertain(n, path)) and
+          result instanceof UnknownType
+        )
+        or
+        infersTypeAt(n, path, result.getATypeParameter())
+      }
+
+      /**
+       * Holds if `n` has type information at `path`.
+       */
+      pragma[nomagic]
+      predicate hasInferredType(AstNode n, TypePath path) { exists(inferType(n, path)) }
+
+      /**
+       * Holds if `n` has type information at the type path `prefix.tp`. This entails
+       * that the type at `prefix` must be the type that declares `tp`.
+       */
+      pragma[nomagic]
+      private predicate infersTypeAt(AstNode n, TypePath prefix, TypeParameter tp) {
+        exists(TypePath path |
+          hasInferredType(n, path) and
+          not path.isEmpty() and // implied by `isSnoc` below, but improves performance slightly
+          path.isSnoc(prefix, tp)
+        )
+      }
+
+      /**
+       * Gets the inferred root type of `n`, if any.
+       */
+      pragma[nomagic]
+      Type inferType(AstNode n) { result = inferType(n, TypePath::nil()) }
+
+      /** Gets the unique non-pseudo type inferred at `path` for `n`, if any. */
+      Type inferTypeUnique(AstNode n, TypePath path) {
+        result = unique(Type t | t = inferType(n, path) and not t instanceof PseudoType | t)
+      }
+
+      /**
+       * Gets the unique non-pseudo type inferred at the root for `n`, if any.
+       */
+      Type inferTypeUnique(AstNode n) { result = inferTypeUnique(n, TypePath::nil()) }
+
+      /**
+       * The cached stage of this module.
+       *
+       * Should not be exposed.
+       */
+      cached
+      module CachedStage {
+        /** Reference to the cached stage of this module. */
+        cached
+        predicate ref() { any() }
+
+        /** Reverse references to the predicates that reference `ref()`. */
+        cached
+        predicate revRef() {
+          any()
+          or
+          cacheRevRef()
+          or
+          (exists(inferTypeCertain(_, _)) implies any())
+          or
+          (exists(inferType(_, _)) implies any())
+        }
+      }
+
+      /**
+       * Provides consistency checks, including those from `Make2::Consistency`.
+       */
+      module Consistency {
+        import Consistency2
+
+        query predicate nonUniqueUnknownType() { strictcount(UnknownType t) > 1 }
+
+        query predicate closureParameterPseudoTypeOverlyBroad(ClosureParameterPseudoType t) {
+          t.getParameter() =
+            any(Parameter p |
+              exists(p.getType())
+              or
+              not p = any(Closure c).getParameter(_)
+            )
+        }
+
+        query predicate closureParameterPseudoTypeMissing(Closure c, Parameter p) {
+          p = c.getParameter(_) and
+          not exists(p.getType()) and
+          not p = any(ClosureParameterPseudoType t).getParameter()
+        }
+
+        query predicate nonUniqueCertainType(AstNode n, TypePath path) {
+          strictcount(inferTypeCertain(n, path)) > 1
+        }
+
+        /**
+         * Checks that `Input3::inferTypeForDefaults` is an alias for `inferType`.
+         */
+        query predicate inferTypeForDefaultsMismatch(AstNode n, TypePath path, Type t) {
+          inferType(n, path) = t and
+          not Input3::inferTypeForDefaults(n, path) = t
+          or
+          Input3::inferTypeForDefaults(n, path) = t and
+          not inferType(n, path) = t
+        }
+      }
+
+      /**
+       * Holds if the textual representation `repr` should be used for `n` in
+       * `TypeTest`.
+       */
+      signature predicate typeTestAstNodeReprSig(AstNode n, string repr);
+
+      /**
+       * Provides an inline testing configuration for type inference. Each inline
+       * expectation is optional and of the form
+       *
+       * ```
+       * {type,certainType}=<ast node representation>[@<type path>]:<type>
+       * ```
+       *
+       * Omitting `@<type path>` means the empty type path.
+       *
+       * For example, the following expectations assert that the type of `x` is `bool`
+       * and that the type of `vec` is `Vec<bool>`:
+       *
+       * ```rust
+       * let x = true; // type=x:bool
+       * let vec = Vec::new(); // type=vec@Vec<T>:bool
+       * vec.push(x);
+       * ```
+       *
+       * Note that the annotation `type=vec:Vec`, while valid, is redundant since it
+       * is implied by the annotation above.
+       */
+      module TypeTest<typeTestAstNodeReprSig/2 typeTestAstNodeRepr> {
+        string getARelevantTag() { result = ["type", "certainType"] }
+
+        predicate hasActualResult(Location location, string element, string tag, string value) {
+          none()
+        }
+
+        predicate hasOptionalResult(Location location, string element, string tag, string value) {
+          exists(AstNode n, TypePath path, Type t, string at |
+            location = n.getLocation() and
+            (if path.isEmpty() then at = "" else at = "@" + TypePath::printTypePathVerbose(path)) and
+            value = element + at + ":" + t.toString() and
+            typeTestAstNodeRepr(n, element)
+          |
+            t = inferType(n, path) and
+            tag = "type"
+            or
+            t = inferTypeCertain(n, path) and
+            tag = "certainType"
+          )
+        }
+      }
+
+      /** Provides various debugging predicates. */
+      module Debug {
+        /**
+         * Holds if `n` has reached the type path limit. This is usually indicative
+         * of an unintended type inference explosion.
+         */
+        pragma[nomagic]
+        predicate atLimit(AstNode n) {
+          exists(TypePath path0 |
+            hasInferredType(n, path0) and path0.length() >= getTypePathLimit()
+          )
+        }
+
+        Type inferTypeForNodeAtLimit(AstNode n, TypePath path) {
+          result = inferType(n, path) and
+          atLimit(n)
+        }
+
+        predicate countTypesForNodeAtLimit(AstNode n, int c) {
+          c = strictcount(Type t, TypePath path | t = inferTypeForNodeAtLimit(n, path))
+        }
+
+        pragma[nomagic]
+        private int countTypesAtPath(AstNode n, TypePath path, Type t) {
+          t = inferType(n, path) and
+          result = strictcount(Type t0 | t0 = inferType(n, path))
+        }
+
+        predicate maxTypes(AstNode n, TypePath path, Type t, int c) {
+          c = countTypesAtPath(n, path, t) and
+          c = max(countTypesAtPath(_, _, _))
+        }
+
+        pragma[nomagic]
+        private predicate typePathLength(AstNode n, TypePath path, Type t, int len) {
+          t = inferType(n, path) and
+          len = path.length()
+        }
+
+        predicate maxTypePath(AstNode n, TypePath path, Type t, int len) {
+          typePathLength(n, path, t, len) and
+          len = max(int i | typePathLength(_, _, _, i))
+        }
+
+        pragma[nomagic]
+        private int countTypePaths(AstNode n, TypePath path, Type t) {
+          t = inferType(n, path) and
+          result = strictcount(TypePath path0, Type t0 | t0 = inferType(n, path0))
+        }
+
+        predicate maxTypePaths(AstNode n, TypePath path, Type t, int c) {
+          c = countTypePaths(n, path, t) and
+          c = max(countTypePaths(_, _, _))
+        }
+      }
+    }
   }
 }
diff --git a/shared/typeinference/qlpack.yml b/shared/typeinference/qlpack.yml
index 4d48222f41aa..a55e1243d3d8 100644
--- a/shared/typeinference/qlpack.yml
+++ b/shared/typeinference/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeinference
-version: 0.0.36-dev
+version: 0.0.43-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typetracking/CHANGELOG.md b/shared/typetracking/CHANGELOG.md
index a0ddc0dabdb0..fb5e3f88f36d 100644
--- a/shared/typetracking/CHANGELOG.md
+++ b/shared/typetracking/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 2.0.45
+
+No user-facing changes.
+
+## 2.0.44
+
+No user-facing changes.
+
+## 2.0.43
+
+No user-facing changes.
+
+## 2.0.42
+
+No user-facing changes.
+
+## 2.0.41
+
+No user-facing changes.
+
+## 2.0.40
+
+No user-facing changes.
+
+## 2.0.39
+
+No user-facing changes.
+
 ## 2.0.38
 
 No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.39.md b/shared/typetracking/change-notes/released/2.0.39.md
new file mode 100644
index 000000000000..887d030df420
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.39.md
@@ -0,0 +1,3 @@
+## 2.0.39
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.40.md b/shared/typetracking/change-notes/released/2.0.40.md
new file mode 100644
index 000000000000..889c7f385592
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.40.md
@@ -0,0 +1,3 @@
+## 2.0.40
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.41.md b/shared/typetracking/change-notes/released/2.0.41.md
new file mode 100644
index 000000000000..5b519388ce82
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.41.md
@@ -0,0 +1,3 @@
+## 2.0.41
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.42.md b/shared/typetracking/change-notes/released/2.0.42.md
new file mode 100644
index 000000000000..85ba02702b9f
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.42.md
@@ -0,0 +1,3 @@
+## 2.0.42
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.43.md b/shared/typetracking/change-notes/released/2.0.43.md
new file mode 100644
index 000000000000..69732e6e3060
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.43.md
@@ -0,0 +1,3 @@
+## 2.0.43
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.44.md b/shared/typetracking/change-notes/released/2.0.44.md
new file mode 100644
index 000000000000..47addacab148
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.44.md
@@ -0,0 +1,3 @@
+## 2.0.44
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.45.md b/shared/typetracking/change-notes/released/2.0.45.md
new file mode 100644
index 000000000000..ec5a10154c4d
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.45.md
@@ -0,0 +1,3 @@
+## 2.0.45
+
+No user-facing changes.
diff --git a/shared/typetracking/codeql-pack.release.yml b/shared/typetracking/codeql-pack.release.yml
index 4ec9eb0980cf..c36828b9af04 100644
--- a/shared/typetracking/codeql-pack.release.yml
+++ b/shared/typetracking/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.38
+lastReleaseVersion: 2.0.45
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index e9fb4f6c0447..087ce38451d1 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 2.0.39-dev
+version: 2.0.46-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/CHANGELOG.md b/shared/typos/CHANGELOG.md
index 1f1760051700..9ee84a0d73da 100644
--- a/shared/typos/CHANGELOG.md
+++ b/shared/typos/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.0.61
+
+No user-facing changes.
+
+## 1.0.60
+
+No user-facing changes.
+
+## 1.0.59
+
+No user-facing changes.
+
+## 1.0.58
+
+No user-facing changes.
+
+## 1.0.57
+
+No user-facing changes.
+
+## 1.0.56
+
+No user-facing changes.
+
+## 1.0.55
+
+No user-facing changes.
+
 ## 1.0.54
 
 No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.55.md b/shared/typos/change-notes/released/1.0.55.md
new file mode 100644
index 000000000000..fd53dce64a9f
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.55.md
@@ -0,0 +1,3 @@
+## 1.0.55
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.56.md b/shared/typos/change-notes/released/1.0.56.md
new file mode 100644
index 000000000000..3b784cb7d975
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.56.md
@@ -0,0 +1,3 @@
+## 1.0.56
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.57.md b/shared/typos/change-notes/released/1.0.57.md
new file mode 100644
index 000000000000..18a94c4bca4a
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.57.md
@@ -0,0 +1,3 @@
+## 1.0.57
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.58.md b/shared/typos/change-notes/released/1.0.58.md
new file mode 100644
index 000000000000..f43459b898c0
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.58.md
@@ -0,0 +1,3 @@
+## 1.0.58
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.59.md b/shared/typos/change-notes/released/1.0.59.md
new file mode 100644
index 000000000000..071c0337a4d5
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.59.md
@@ -0,0 +1,3 @@
+## 1.0.59
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.60.md b/shared/typos/change-notes/released/1.0.60.md
new file mode 100644
index 000000000000..74ecf38fafa0
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.60.md
@@ -0,0 +1,3 @@
+## 1.0.60
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.61.md b/shared/typos/change-notes/released/1.0.61.md
new file mode 100644
index 000000000000..432f5481ee83
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.61.md
@@ -0,0 +1,3 @@
+## 1.0.61
+
+No user-facing changes.
diff --git a/shared/typos/codeql-pack.release.yml b/shared/typos/codeql-pack.release.yml
index c3c3b0f4418a..1319f4fe8fde 100644
--- a/shared/typos/codeql-pack.release.yml
+++ b/shared/typos/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.54
+lastReleaseVersion: 1.0.61
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index 9218a86a215b..e27e5c427266 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.55-dev
+version: 1.0.62-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/CHANGELOG.md b/shared/util/CHANGELOG.md
index 587c0a00aa15..8ff15c74d311 100644
--- a/shared/util/CHANGELOG.md
+++ b/shared/util/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 2.0.48
+
+No user-facing changes.
+
+## 2.0.47
+
+No user-facing changes.
+
+## 2.0.46
+
+No user-facing changes.
+
+## 2.0.45
+
+No user-facing changes.
+
+## 2.0.44
+
+No user-facing changes.
+
+## 2.0.43
+
+No user-facing changes.
+
+## 2.0.42
+
+No user-facing changes.
+
 ## 2.0.41
 
 No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.42.md b/shared/util/change-notes/released/2.0.42.md
new file mode 100644
index 000000000000..85ba02702b9f
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.42.md
@@ -0,0 +1,3 @@
+## 2.0.42
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.43.md b/shared/util/change-notes/released/2.0.43.md
new file mode 100644
index 000000000000..69732e6e3060
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.43.md
@@ -0,0 +1,3 @@
+## 2.0.43
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.44.md b/shared/util/change-notes/released/2.0.44.md
new file mode 100644
index 000000000000..47addacab148
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.44.md
@@ -0,0 +1,3 @@
+## 2.0.44
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.45.md b/shared/util/change-notes/released/2.0.45.md
new file mode 100644
index 000000000000..ec5a10154c4d
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.45.md
@@ -0,0 +1,3 @@
+## 2.0.45
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.46.md b/shared/util/change-notes/released/2.0.46.md
new file mode 100644
index 000000000000..079c1c0785a8
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.46.md
@@ -0,0 +1,3 @@
+## 2.0.46
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.47.md b/shared/util/change-notes/released/2.0.47.md
new file mode 100644
index 000000000000..83e9a785f337
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.47.md
@@ -0,0 +1,3 @@
+## 2.0.47
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.48.md b/shared/util/change-notes/released/2.0.48.md
new file mode 100644
index 000000000000..312243738221
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.48.md
@@ -0,0 +1,3 @@
+## 2.0.48
+
+No user-facing changes.
diff --git a/shared/util/codeql-pack.release.yml b/shared/util/codeql-pack.release.yml
index dcd61b02de59..7017f5f3b179 100644
--- a/shared/util/codeql-pack.release.yml
+++ b/shared/util/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.41
+lastReleaseVersion: 2.0.48
diff --git a/shared/util/codeql/util/ReportStats.qll b/shared/util/codeql/util/ReportStats.qll
index 947eff548e75..10157d95c006 100644
--- a/shared/util/codeql/util/ReportStats.qll
+++ b/shared/util/codeql/util/ReportStats.qll
@@ -29,4 +29,41 @@ module ReportStats<StatsSig Stats> {
     value = Stats::getNumberOfOk() * 100.0 / (Stats::getNumberOfOk() + Stats::getNumberOfNotOk()) and
     key = "Percentage of " + Stats::getOkText()
   }
+
+  predicate keyValuePair(string key, float value) {
+    numberOfOk(key, value) or
+    numberOfNotOk(key, value) or
+    percentageOfOk(key, value)
+  }
+}
+
+/**
+ * Stats where each Ok/NotOk occurrence has an associated entity.
+ */
+signature module EntityStatsSig {
+  class Candidate {
+    predicate isOk();
+  }
+
+  string getOkText();
+
+  string getNotOkText();
+}
+
+module EntityReportStats<EntityStatsSig Input> {
+  private import Input
+
+  private module StatsInput implements StatsSig {
+    int getNumberOfOk() { result = count(Candidate c | c.isOk()) }
+
+    int getNumberOfNotOk() { result = count(Candidate c | not c.isOk()) }
+
+    import Input
+  }
+
+  import StatsInput
+
+  private module ScalarReport = ReportStats<StatsInput>;
+
+  import ScalarReport
 }
diff --git a/shared/util/codeql/util/SemVer.qll b/shared/util/codeql/util/SemVer.qll
new file mode 100644
index 000000000000..4c063721ce00
--- /dev/null
+++ b/shared/util/codeql/util/SemVer.qll
@@ -0,0 +1,57 @@
+/**
+ * Provides logic for working SemVer (Semantic Versioning).
+ */
+overlay[local?]
+module;
+
+bindingset[str]
+private string leftPad(string str) { result = ("0000" + str).suffix(str.length()) }
+
+/**
+ * Gets the major number of a SemVer string.
+ */
+bindingset[s]
+string getMajor(string s) { result = s.regexpCapture("v?(\\d+).*", 1) }
+
+/**
+ * Gets the minor number of a SemVer string.
+ */
+bindingset[s]
+string getMinor(string s) { result = s.regexpCapture("v?(\\d+)\\.(\\d+).*", 2) }
+
+/**
+ * Gets the patch number of a SemVer string.
+ */
+bindingset[s]
+string getPatch(string s) { result = s.regexpCapture("v?(\\d+)\\.(\\d+)\\.(\\d+).*", 3) }
+
+/**
+ * Normalizes a SemVer string such that the lexicographical ordering
+ * of two normalized strings is consistent with the SemVer ordering.
+ *
+ * Pre-release information and build metadata is not yet supported.
+ */
+bindingset[orig]
+string padSemVer(string orig, string major, string minor, string patch) {
+  major = getMajor(orig) and
+  (
+    minor = getMinor(orig)
+    or
+    not exists(getMinor(orig)) and minor = "0"
+  ) and
+  (
+    patch = getPatch(orig)
+    or
+    not exists(getPatch(orig)) and patch = "0"
+  ) and
+  result = leftPad(major) + "." + leftPad(minor) + "." + leftPad(patch)
+}
+
+/**
+ * Normalizes a SemVer string such that the lexicographical ordering
+ * of two normalized strings is consistent with the SemVer ordering.
+ *
+ * Pre-release information and build metadata is not yet supported.
+ */
+bindingset[orig]
+string padSemVer(string orig) { result = padSemVer(orig, _, _, _) }
diff --git a/shared/util/codeql/util/UnboundList.qll b/shared/util/codeql/util/UnboundList.qll
index 6f05d6cddfc2..1d0ce06d7a82 100644
--- a/shared/util/codeql/util/UnboundList.qll
+++ b/shared/util/codeql/util/UnboundList.qll
@@ -52,6 +52,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
   /** Gets the rank of element `e`, which is used internally in the string encoding. */
   int getRank(Element e) { e = DenseRank<DenseRankInput>::denseRank(result) }
 
+  cached
   private string encode(Element e) { result = getRank(e).toString() }
 
   bindingset[s]
@@ -186,10 +187,15 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     UnboundList singleton(Element e) { result = encode(e) + "." }
 
     /**
-     * Gets the list obtained by appending the singleton list `e`
-     * onto `suffix`.
+     * Gets the list obtained by appending the element `e` onto `suffix`.
      */
     bindingset[suffix]
     UnboundList cons(Element e, UnboundList suffix) { result = singleton(e).append(suffix) }
+
+    /**
+     * Gets the list obtained by appending the element `e` after `prefix`.
+     */
+    bindingset[prefix]
+    UnboundList snoc(UnboundList prefix, Element e) { result = prefix.append(singleton(e)) }
   }
 }
diff --git a/shared/util/codeql/util/test/InlineExpectationsTest.qll b/shared/util/codeql/util/test/InlineExpectationsTest.qll
index 4e0b2f678449..21c8c3a39f64 100644
--- a/shared/util/codeql/util/test/InlineExpectationsTest.qll
+++ b/shared/util/codeql/util/test/InlineExpectationsTest.qll
@@ -108,6 +108,9 @@ signature module InlineExpectationsTestSig {
     );
   }
 
+  /** Gets the relative URL of the given location, if any. */
+  string getRelativeUrl(Location location);
+
   /** A comment that may contain inline expectations. */
   class ExpectationComment {
     /** Gets the contents of this comment, _excluding_ the comment indicator. */
@@ -242,9 +245,13 @@ module Make<InlineExpectationsTestSig Impl> {
       TActualResult(
         Impl::Location location, string element, string tag, string value, boolean optional
       ) {
-        TestImpl::hasActualResult(location, element, tag, value) and optional = false
-        or
-        TestImpl::hasOptionalResult(location, element, tag, value) and optional = true
+        (
+          TestImpl::hasActualResult(location, element, tag, value) and optional = false
+          or
+          TestImpl::hasOptionalResult(location, element, tag, value) and optional = true
+        ) and
+        // test expectations can only be defined in source code
+        exists(Impl::getRelativeUrl(location))
       } or
       TValidExpectation(
         Impl::ExpectationComment comment, string tag, string value, string knownFailure
@@ -633,11 +640,7 @@ module TestPostProcessing {
 
   private string getQueryKind() { queryMetadata("kind", result) }
 
-  signature module InputSig<InlineExpectationsTestSig Input> {
-    string getRelativeUrl(Input::Location location);
-  }
-
-  module Make<InlineExpectationsTestSig Input, InputSig<Input> Input2> {
+  module Make<InlineExpectationsTestSig Input> {
     private import InlineExpectationsTest as InlineExpectationsTest
 
     bindingset[loc]
@@ -655,7 +658,7 @@ module TestPostProcessing {
     private string getRelativePathTo(string absolutePath) {
       exists(Input::Location loc |
         loc.hasLocationInfo(absolutePath, _, _, _, _) and
-        parseLocationString(Input2::getRelativeUrl(loc), result, _, _, _, _)
+        parseLocationString(Input::getRelativeUrl(loc), result, _, _, _, _)
       )
     }
 
@@ -665,7 +668,7 @@ module TestPostProcessing {
         exists(string data |
           queryResults(_, _, _, data) and
           parseLocationString(data, relativePath, sl, sc, el, ec) and
-          not Input2::getRelativeUrl(_) = data // avoid duplicate locations
+          not Input::getRelativeUrl(_) = data // avoid duplicate locations
         )
       }
 
@@ -711,7 +714,7 @@ module TestPostProcessing {
 
       LocationFromInput() { this = MkInputLocation(loc) }
 
-      override string getRelativeUrl() { result = Input2::getRelativeUrl(loc) }
+      override string getRelativeUrl() { result = Input::getRelativeUrl(loc) }
 
       override predicate hasLocationInfo(string file, int sl, int sc, int el, int ec) {
         loc.hasLocationInfo(file, sl, sc, el, ec)
@@ -723,6 +726,8 @@ module TestPostProcessing {
     module TestImpl2 implements InlineExpectationsTestSig {
       final class Location = TestLocation;
 
+      string getRelativeUrl(Location location) { result = location.getRelativeUrl() }
+
       final private class ExpectationCommentFinal = Input::ExpectationComment;
 
       class ExpectationComment extends ExpectationCommentFinal {
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index 0a58c95a984d..8e1207a4eea1 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/util
-version: 2.0.42-dev
+version: 2.0.49-dev
 groups: shared
 library: true
 dependencies: null
diff --git a/shared/xml/CHANGELOG.md b/shared/xml/CHANGELOG.md
index 15640e5c1cbd..cf24e62f084a 100644
--- a/shared/xml/CHANGELOG.md
+++ b/shared/xml/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.0.61
+
+No user-facing changes.
+
+## 1.0.60
+
+No user-facing changes.
+
+## 1.0.59
+
+No user-facing changes.
+
+## 1.0.58
+
+No user-facing changes.
+
+## 1.0.57
+
+No user-facing changes.
+
+## 1.0.56
+
+No user-facing changes.
+
+## 1.0.55
+
+No user-facing changes.
+
 ## 1.0.54
 
 No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.55.md b/shared/xml/change-notes/released/1.0.55.md
new file mode 100644
index 000000000000..fd53dce64a9f
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.55.md
@@ -0,0 +1,3 @@
+## 1.0.55
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.56.md b/shared/xml/change-notes/released/1.0.56.md
new file mode 100644
index 000000000000..3b784cb7d975
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.56.md
@@ -0,0 +1,3 @@
+## 1.0.56
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.57.md b/shared/xml/change-notes/released/1.0.57.md
new file mode 100644
index 000000000000..18a94c4bca4a
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.57.md
@@ -0,0 +1,3 @@
+## 1.0.57
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.58.md b/shared/xml/change-notes/released/1.0.58.md
new file mode 100644
index 000000000000..f43459b898c0
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.58.md
@@ -0,0 +1,3 @@
+## 1.0.58
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.59.md b/shared/xml/change-notes/released/1.0.59.md
new file mode 100644
index 000000000000..071c0337a4d5
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.59.md
@@ -0,0 +1,3 @@
+## 1.0.59
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.60.md b/shared/xml/change-notes/released/1.0.60.md
new file mode 100644
index 000000000000..74ecf38fafa0
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.60.md
@@ -0,0 +1,3 @@
+## 1.0.60
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.61.md b/shared/xml/change-notes/released/1.0.61.md
new file mode 100644
index 000000000000..432f5481ee83
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.61.md
@@ -0,0 +1,3 @@
+## 1.0.61
+
+No user-facing changes.
diff --git a/shared/xml/codeql-pack.release.yml b/shared/xml/codeql-pack.release.yml
index c3c3b0f4418a..1319f4fe8fde 100644
--- a/shared/xml/codeql-pack.release.yml
+++ b/shared/xml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.54
+lastReleaseVersion: 1.0.61
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index d1c821414117..b0038ec2ddb1 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.55-dev
+version: 1.0.62-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/CHANGELOG.md b/shared/yaml/CHANGELOG.md
index e45ca7c51319..7018795e1bb7 100644
--- a/shared/yaml/CHANGELOG.md
+++ b/shared/yaml/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.0.61
+
+No user-facing changes.
+
+## 1.0.60
+
+No user-facing changes.
+
+## 1.0.59
+
+No user-facing changes.
+
+## 1.0.58
+
+No user-facing changes.
+
+## 1.0.57
+
+No user-facing changes.
+
+## 1.0.56
+
+No user-facing changes.
+
+## 1.0.55
+
+No user-facing changes.
+
 ## 1.0.54
 
 No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.55.md b/shared/yaml/change-notes/released/1.0.55.md
new file mode 100644
index 000000000000..fd53dce64a9f
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.55.md
@@ -0,0 +1,3 @@
+## 1.0.55
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.56.md b/shared/yaml/change-notes/released/1.0.56.md
new file mode 100644
index 000000000000..3b784cb7d975
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.56.md
@@ -0,0 +1,3 @@
+## 1.0.56
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.57.md b/shared/yaml/change-notes/released/1.0.57.md
new file mode 100644
index 000000000000..18a94c4bca4a
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.57.md
@@ -0,0 +1,3 @@
+## 1.0.57
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.58.md b/shared/yaml/change-notes/released/1.0.58.md
new file mode 100644
index 000000000000..f43459b898c0
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.58.md
@@ -0,0 +1,3 @@
+## 1.0.58
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.59.md b/shared/yaml/change-notes/released/1.0.59.md
new file mode 100644
index 000000000000..071c0337a4d5
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.59.md
@@ -0,0 +1,3 @@
+## 1.0.59
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.60.md b/shared/yaml/change-notes/released/1.0.60.md
new file mode 100644
index 000000000000..74ecf38fafa0
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.60.md
@@ -0,0 +1,3 @@
+## 1.0.60
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.61.md b/shared/yaml/change-notes/released/1.0.61.md
new file mode 100644
index 000000000000..432f5481ee83
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.61.md
@@ -0,0 +1,3 @@
+## 1.0.61
+
+No user-facing changes.
diff --git a/shared/yaml/codeql-pack.release.yml b/shared/yaml/codeql-pack.release.yml
index c3c3b0f4418a..1319f4fe8fde 100644
--- a/shared/yaml/codeql-pack.release.yml
+++ b/shared/yaml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.54
+lastReleaseVersion: 1.0.61
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index 272b9f20f8fc..51f5bcb56685 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.55-dev
+version: 1.0.62-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/yeast-macros/BUILD.bazel b/shared/yeast-macros/BUILD.bazel
index 71bc6eb288ad..855e3962e0cc 100644
--- a/shared/yeast-macros/BUILD.bazel
+++ b/shared/yeast-macros/BUILD.bazel
@@ -8,5 +8,7 @@ rust_proc_macro(
     srcs = glob(["src/**/*.rs"]),
     aliases = aliases(),
     visibility = ["//visibility:public"],
-    deps = all_crate_deps(),
+    deps = all_crate_deps() + [
+        "//shared/yeast-schema",
+    ],
 )
diff --git a/shared/yeast-macros/Cargo.toml b/shared/yeast-macros/Cargo.toml
index 30c82d03b6eb..1d038714bda7 100644
--- a/shared/yeast-macros/Cargo.toml
+++ b/shared/yeast-macros/Cargo.toml
@@ -9,4 +9,5 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0"
 quote = "1.0"
-syn = "2.0"
+syn = { version = "3.0", features = ["full"] }
+yeast-schema = { path = "../yeast-schema" }
diff --git a/shared/yeast-macros/src/ast.rs b/shared/yeast-macros/src/ast.rs
new file mode 100644
index 000000000000..f534fe4d83a7
--- /dev/null
+++ b/shared/yeast-macros/src/ast.rs
@@ -0,0 +1,266 @@
+use std::collections::BTreeSet;
+
+use proc_macro2::{Ident, Literal};
+
+/// A complete rewrite rule such as `(input) where guard => (output)`.
+pub(crate) struct Rule {
+    /// Input pattern before `where` or `=>`.
+    pub(crate) pattern: Pattern,
+    /// Optional Rust guard expression after `where`.
+    pub(crate) guard: Option<syn::Expr>,
+    /// Template or annotated Rust replacement after `=>`.
+    pub(crate) replacement: Replacement,
+}
+
+pub(crate) enum Replacement {
+    /// One or more output templates such as `(call ...) {extra_nodes}`.
+    Templates(Vec<Template>),
+    /// Annotated Rust body such as `expr? { ... }`.
+    Rust {
+        /// Retained in the rule AST for validation and analysis; runtime
+        /// lowering only needs the Rust body.
+        #[allow(dead_code)]
+        annotation: ReturnAnnotation,
+        body: syn::Block,
+    },
+}
+
+#[allow(dead_code)]
+pub(crate) struct ReturnAnnotation {
+    /// Declared output kind before the Rust body.
+    pub(crate) kind: Ident,
+    /// Declared output cardinality (`kind`, `kind?`, or `kind*`).
+    pub(crate) cardinality: Cardinality,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(crate) struct Cardinality {
+    pub(crate) multiple: bool,
+    pub(crate) required: bool,
+}
+
+impl Cardinality {
+    pub(crate) const SINGLE: Self = Self {
+        multiple: false,
+        required: true,
+    };
+    pub(crate) const OPTIONAL: Self = Self {
+        multiple: false,
+        required: false,
+    };
+    pub(crate) const ZERO_OR_MORE: Self = Self {
+        multiple: true,
+        required: false,
+    };
+    pub(crate) const ONE_OR_MORE: Self = Self {
+        multiple: true,
+        required: true,
+    };
+}
+
+/// An input pattern such as `(call method: (identifier) @name)`.
+pub(crate) enum Pattern {
+    /// `_` or `(_)`, distinguished by whether unnamed nodes may match.
+    Any { match_unnamed: bool },
+    /// A named node and the pattern matched against each field.
+    Node {
+        kind: String,
+        fields: Vec<(String, Pattern)>,
+    },
+    /// An unnamed token pattern such as `"+"`.
+    Unnamed(String),
+    /// A captured pattern such as `(identifier) @name` or `_ @@raw`.
+    Capture {
+        /// Capture identifier after `@` or `@@`.
+        name: Ident,
+        /// Whether `@@` keeps the captured input node untranslated.
+        raw: bool,
+        pattern: Box<Pattern>,
+        cardinality: Cardinality,
+    },
+    /// An ordered sequence of patterns within a field.
+    Sequence(Vec<Pattern>),
+    /// A repeated or optional pattern.
+    Repeated {
+        pattern: Box<Pattern>,
+        cardinality: Cardinality,
+    },
+}
+
+impl Pattern {
+    pub(crate) fn matches_single_node(&self) -> bool {
+        match self {
+            Pattern::Any { .. } | Pattern::Node { .. } | Pattern::Unnamed(_) => true,
+            Pattern::Capture { cardinality, .. } => *cardinality == Cardinality::SINGLE,
+            Pattern::Sequence(_) | Pattern::Repeated { .. } => false,
+        }
+    }
+}
+
+pub(crate) enum Template {
+    /// A parenthesized node template such as `(call method: {name})`.
+    Node(Node),
+    /// An embedded Rust block such as `{args}`.
+    Splice(syn::Block),
+    /// Ordered alternatives such as `[(identifier #{name}) (missing)]`.
+    Choice(Vec<Alternative>),
+}
+
+pub(crate) struct Alternative {
+    /// Template to construct when the guard and dependencies succeed.
+    pub(crate) template: Template,
+    /// Optional postfix guard such as `if { name.is_some() }`.
+    pub(crate) guard: Option<syn::Block>,
+}
+
+pub(crate) struct Node {
+    /// The node kind at the start of the template, such as `call` in `(call)`.
+    pub(crate) kind: Ident,
+    /// Optional leaf content such as `"foo"` or `#{name}` in
+    /// `(identifier "foo")` or `(identifier #{name})`.
+    pub(crate) content: Option<Content>,
+    /// Named fields and source-location metadata.
+    pub(crate) fields: Vec<Field>,
+}
+
+pub(crate) enum Content {
+    /// Static leaf content such as `"foo"` in `(identifier "foo")`.
+    Static(Literal),
+    /// Computed leaf content such as `#{name}` in `(identifier #{name})`.
+    Computed(syn::Block),
+    /// Value inherited from the node matched by the enclosing rule.
+    Inherited,
+}
+
+pub(crate) enum Field {
+    /// A named field such as `argument: {args}` or
+    /// `label: (identifier #{name})`.
+    Named {
+        /// The field name before `:`, such as `argument`.
+        name: Ident,
+        /// The node or Rust splice after `:`, such as `(identifier "x")` or
+        /// `{args}`.
+        value: Template,
+    },
+    /// Source-location metadata such as `location: {source}`.
+    Location {
+        /// A Rust block yielding the node or nodes whose locations should be combined.
+        block: syn::Block,
+    },
+    /// Explicitly omit source-location metadata: `location: none`.
+    LocationNone,
+}
+
+impl Rule {
+    pub(crate) fn resolve_bare_leaf_content(
+        &mut self,
+        leaf_kinds: &BTreeSet<String>,
+    ) -> syn::Result<()> {
+        let Replacement::Templates(templates) = &mut self.replacement else {
+            return Ok(());
+        };
+        for template in templates {
+            template.resolve_bare_leaf_content(leaf_kinds, true)?;
+        }
+        Ok(())
+    }
+}
+
+impl Template {
+    fn resolve_bare_leaf_content(
+        &mut self,
+        leaf_kinds: &BTreeSet<String>,
+        is_rule_result: bool,
+    ) -> syn::Result<()> {
+        let Template::Node(node) = self else {
+            return Ok(());
+        };
+
+        for field in &mut node.fields {
+            if let Field::Named { value, .. } = field {
+                value.resolve_bare_leaf_content(leaf_kinds, false)?;
+            }
+        }
+
+        if node.content.is_none()
+            && node.fields.is_empty()
+            && leaf_kinds.contains(node.kind.to_string().as_str())
+        {
+            if !is_rule_result {
+                return Err(syn::Error::new_spanned(
+                    &node.kind,
+                    format!(
+                        "bare leaf `{}` must be a top-level rule result or have explicit content",
+                        node.kind
+                    ),
+                ));
+            }
+            node.content = Some(Content::Inherited);
+        }
+
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use quote::quote;
+
+    fn output_leaf_kinds() -> BTreeSet<String> {
+        yeast_schema::node_types_yaml::leaf_kinds_from_yaml(
+            r#"
+named:
+  assignment:
+    left: identifier
+  identifier:
+"#,
+        )
+        .unwrap()
+    }
+
+    #[test]
+    fn marks_top_level_bare_leaves_as_inherited() {
+        let mut rule = crate::rule_parse::parse_rule(quote!((source) => (identifier))).unwrap();
+        rule.resolve_bare_leaf_content(&output_leaf_kinds())
+            .unwrap();
+
+        let Replacement::Templates(templates) = rule.replacement else {
+            panic!("expected template replacement");
+        };
+        let [Template::Node(node)] = templates.as_slice() else {
+            panic!("expected one output node");
+        };
+        assert!(matches!(node.content, Some(Content::Inherited)));
+    }
+
+    #[test]
+    fn rejects_nested_bare_leaves() {
+        let mut rule =
+            crate::rule_parse::parse_rule(quote!((source) => (assignment left: (identifier))))
+                .unwrap();
+        let error = rule
+            .resolve_bare_leaf_content(&output_leaf_kinds())
+            .unwrap_err();
+
+        assert_eq!(
+            error.to_string(),
+            "bare leaf `identifier` must be a top-level rule result or have explicit content"
+        );
+    }
+
+    #[test]
+    fn leaves_fieldless_structural_nodes_unchanged() {
+        let mut rule = crate::rule_parse::parse_rule(quote!((source) => (assignment))).unwrap();
+        rule.resolve_bare_leaf_content(&output_leaf_kinds())
+            .unwrap();
+
+        let Replacement::Templates(templates) = rule.replacement else {
+            panic!("expected template replacement");
+        };
+        let [Template::Node(node)] = templates.as_slice() else {
+            panic!("expected one output node");
+        };
+        assert!(node.content.is_none());
+    }
+}
diff --git a/shared/yeast-macros/src/lib.rs b/shared/yeast-macros/src/lib.rs
index 82b0e3e7b408..868ebe15cdff 100644
--- a/shared/yeast-macros/src/lib.rs
+++ b/shared/yeast-macros/src/lib.rs
@@ -1,9 +1,13 @@
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
 
+mod ast;
+mod lower;
 mod parse;
+mod rule_parse;
+mod template_parse;
 
-/// Proc macro for constructing a `QueryNode` from a tree-sitter-inspired pattern.
+/// Proc macro for constructing a tree-sitter-inspired `yeast::query::QueryNode`.
 ///
 /// # Syntax
 ///
@@ -19,11 +23,24 @@ mod parse;
 /// (pattern) @capture           - capture the matched node
 /// "literal" @capture           - capture an unnamed token
 /// _ @capture                   - capture any node
-/// (pattern)* @capture          - capture each repeated match
-/// (pattern)?                   - zero or one
+/// (kind)* @capture             - capture each repeated named-node match
+/// "literal"* @capture          - capture each repeated unnamed-token match
+/// (kind)?                      - zero or one named node
 /// ```
 ///
 /// Named fields and bare child patterns may be intermixed in any order.
+///
+/// A parenthesized query whose first element is a node kind is always parsed as
+/// that node pattern. Otherwise, two or more sibling patterns form a sequence.
+/// A sequence may be repeated, but cannot itself be captured because it does
+/// not represent one node:
+///
+/// ```text
+/// ((identifier) @items (integer) @items)*  // valid: explicit node captures
+/// ((identifier) (integer))* @items         // invalid: sequence capture
+/// ("+" ",")*                               // valid: repeated token sequence
+/// (_ ",")*                                 // valid: repeated wildcard/token sequence
+/// ```
 #[proc_macro]
 pub fn query(input: TokenStream) -> TokenStream {
     let input2: TokenStream2 = input.into();
@@ -33,55 +50,64 @@ pub fn query(input: TokenStream) -> TokenStream {
     }
 }
 
-/// Build a single AST node from a template, returning its `Id`.
+/// Build a single AST node from a template, returning its `OutputId`.
+///
+/// A top-level choice returns `Option<OutputId>`.
 ///
 /// # Template syntax
 ///
 /// ```text
 /// (kind "literal")             - leaf with static content
 /// (kind #{expr})               - leaf with computed content (expr.to_string())
-/// (kind $fresh)                - leaf with auto-generated unique name
 /// {expr}                       - embed a Rust expression, dispatched via
-///                                the `IntoFieldIds` trait: `Id` pushes a
-///                                single id; iterables (`Vec<Id>`,
-///                                `Option<Id>`, iterator chains) splice
+///                                the `IntoFieldIds` trait: `OutputId` pushes a
+///                                single id; iterables (`Vec<OutputId>`,
+///                                `Option<OutputId>`, iterator chains) splice
 ///                                their elements
 /// field: {expr}                - extend a named field with `{expr}`'s ids
-/// field: (kind ...)?           - set the field only if every `#{expr}`
-///                                beneath it has a value (see below)
+/// location: {expr}             - override this node's source range with the
+///                                span of one or more nodes; may be repeated
+/// location: none               - explicitly make this node locationless
+/// field: [(kind ...)]          - set the field only if the alternative can
+///                                be constructed (see below)
+/// field: [(a) (b)]             - use the first constructible alternative
+/// field: [(a) if {guard} (b)]  - skip an alternative when its guard is false
 /// ```
 ///
-/// # Optional fields
+/// # Template choices
 ///
-/// A `?` on a field's value makes that field fallible: if a `#{expr}`
-/// anywhere beneath it interpolates an absent value — an `Option` that is
-/// `None` — the subtree is abandoned and the field is left unset. This
-/// replaces the surrounding `Option::map` that would otherwise be needed:
+/// Brackets contain one or more ordered alternatives. For each alternative,
+/// its optional `if {guard}` is evaluated first, followed by every `#{expr}`
+/// dependency beneath it. An absent dependency — an `Option` that is `None` —
+/// skips the alternative without constructing any of its template nodes. The
+/// first alternative whose guard and dependencies succeed is constructed:
 ///
 /// ```text
 /// (break_expr label: {lbl.map(|l| tree!((identifier #{l})))})   // before
-/// (break_expr label: (identifier #{lbl})?)                      // after
+/// (break_expr label: [(identifier #{lbl})])                     // after
 /// ```
 ///
-/// The value may be nested arbitrarily deeply, and a nested `?` catches
-/// first, so an inner absent value need not discard the outer node:
+/// Dependencies may be nested arbitrarily deeply. A nested choice handles its
+/// own dependencies, so an inner absent value need not discard an outer node:
 ///
 /// ```text
-/// (parameter pattern: (name_pattern identifier: (identifier #{name}))? type: {ty})
+/// (parameter pattern: [
+///     (name_pattern identifier: [(identifier #{name})])
+/// ] type: {ty})
 /// ```
 ///
-/// Only `#{expr}` propagates absence. A `{expr}` splice is unaffected, since
-/// yielding no ids already leaves a field unset, and `?` is rejected on one.
-/// Outside a `?`, interpolating an `Option` with `#{expr}` remains a compile
-/// error, so the choice between "unset the field" and "unwrap it" stays
-/// explicit.
+/// Only `#{expr}` is treated as a dependency. A `{expr}` splice is unaffected,
+/// since yielding no ids already leaves its field unset. Outside a choice,
+/// interpolating an `Option` with `#{expr}` remains a compile error.
 ///
-/// Can be called with an explicit context or using the implicit context
-/// from an enclosing `rule!`:
+/// A choice used as a field or list item contributes zero or one node. A
+/// top-level choice passed to `tree!` returns `Option<OutputId>`; ordinary
+/// templates continue to return `OutputId`.
+///
+/// Uses the `BuildCtx` binding named `ctx` from the surrounding scope:
 ///
 /// ```text
-/// tree!(ctx, (kind ...))     // explicit BuildCtx
-/// tree!((kind ...))          // implicit context from rule!
+/// tree!((kind ...))
 /// ```
 #[proc_macro]
 pub fn tree(input: TokenStream) -> TokenStream {
@@ -92,17 +118,15 @@ pub fn tree(input: TokenStream) -> TokenStream {
     }
 }
 
-/// Build a list of AST nodes from a template, returning `Vec<Id>`.
+/// Build a list of AST nodes from a template, returning `Vec<OutputId>`.
 ///
-/// Like `tree!` but returns `Vec<Id>` and supports multiple top-level
+/// Like `tree!` but returns `Vec<OutputId>` and supports multiple top-level
 /// elements. All syntax from `tree!` is available.
 ///
-/// Can be called with an explicit context or using the implicit context
-/// from an enclosing `rule!`:
+/// Uses the `BuildCtx` binding named `ctx` from the surrounding scope:
 ///
 /// ```text
-/// trees!(ctx, (node1 ...) (node2 ...))   // explicit BuildCtx
-/// trees!((node1 ...) (node2 ...))        // implicit context from rule!
+/// trees!((node1 ...) (node2 ...))
 /// ```
 #[proc_macro]
 pub fn trees(input: TokenStream) -> TokenStream {
@@ -122,16 +146,33 @@ pub fn trees(input: TokenStream) -> TokenStream {
 ///     (output_template field: {name} {repeated})
 /// )
 ///
-/// // Shorthand: captures become fields on the output node
-/// rule!((query ...) => output_kind)
+/// // A guard filters a successful query match. Every capture is raw in the
+/// // guard because guards run before capture translation.
+/// rule!(
+///     (query_pattern field: _? @value)
+///     where value.is_none()
+///     =>
+///     (output_template)
+/// )
+///
 /// ```
 ///
 /// Captures become Rust variables automatically:
-/// - `@name` (no quantifier) → `name: Id`
-/// - `@name` (after `*`/`+`) → `name: Vec<Id>`
-/// - `@name` (after `?`) → `name: Option<Id>`
+/// - `@name` (no quantifier) → `name: OutputId`
+/// - `@name` (after `*`/`+`) → `name: Vec<OutputId>`
+/// - `@name` (after `?`) → `name: Option<OutputId>`
+///
+/// Raw `@@name` captures use the corresponding input `Id` types instead.
 ///
-/// `tree!` and `trees!` can be used without explicit context inside `{...}`.
+/// A guard is an optional Rust condition between the query and `=>`. It is
+/// evaluated after the query matches and before any `@` captures are
+/// translated. Returning false makes the driver try the next rule. All
+/// captures are therefore raw in the guard; `@` versus `@@` controls only
+/// whether the capture is translated for the transform. Both `ctx` and `ast`
+/// provide read-only access. Omitting the guard is equivalent to writing
+/// `where true`.
+///
+/// `tree!` and `trees!` use the rule transform's `ctx` binding inside `{...}`.
 #[proc_macro]
 pub fn rule(input: TokenStream) -> TokenStream {
     let input2: TokenStream2 = input.into();
@@ -149,8 +190,8 @@ pub fn rule(input: TokenStream) -> TokenStream {
 ///
 /// 1. A **bare rule body** `(query) => (template)` — the `rule!(...)`
 ///    wrapper is implicit.
-/// 2. An explicit `rule!(...)` invocation, possibly chained as
-///    `rule!(...).repeated()` or path-prefixed as `yeast::rule!(...)`.
+/// 2. An explicit `rule!(...)` invocation, possibly path-prefixed as
+///    `yeast::rule!(...)`.
 /// 3. Any other expression returning a `Rule` (helper-function calls,
 ///    conditionals).
 ///
@@ -160,8 +201,8 @@ pub fn rule(input: TokenStream) -> TokenStream {
 ///     output: "ast_types.yml",
 ///     [
 ///         (source_file (_)* @cs) => (top_level body: {..cs}),
-///         (simple_identifier) @id => (name_expr identifier: (identifier #{id})),
-///         rule!((integer_literal) @lit => (int_literal #{lit})).repeated(),
+///         (simple_identifier) @@id => (name_expr identifier: (identifier #{id})),
+///         rule!((integer_literal) @@lit => (int_literal #{lit})),
 ///         helper_fn(),
 ///     ]
 /// };
@@ -170,8 +211,18 @@ pub fn rule(input: TokenStream) -> TokenStream {
 /// Paths are resolved relative to the consuming crate's `CARGO_MANIFEST_DIR`
 /// (the same convention `include_str!` uses for relative paths). The
 /// resolved paths are also emitted as `include_str!` references so the
-/// consuming crate gets invalidated when a schema YAML changes, prepping
-/// the ground for compile-time type-checking against those schemas.
+/// consuming crate gets invalidated when a schema YAML changes.
+///
+/// A bare output leaf used as a top-level rule result inherits the matched
+/// input node's value:
+///
+/// ```text
+/// rule!((superExpr) => (super_expr))
+/// ```
+///
+/// Whether the output kind is a leaf is determined from the output schema.
+/// Nested bare leaves are rejected at compile time because they have no
+/// unambiguous input node from which to inherit a value.
 #[proc_macro]
 pub fn rules(input: TokenStream) -> TokenStream {
     let input2: TokenStream2 = input.into();
diff --git a/shared/yeast-macros/src/lower.rs b/shared/yeast-macros/src/lower.rs
new file mode 100644
index 000000000000..dcb232a38052
--- /dev/null
+++ b/shared/yeast-macros/src/lower.rs
@@ -0,0 +1,614 @@
+use proc_macro2::{Ident, Span, TokenStream};
+use quote::quote;
+use std::cell::RefCell;
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+use crate::ast::{
+    Alternative, Cardinality, Content, Field, Node, Pattern, Replacement, Rule, Template,
+};
+
+#[derive(Clone, Copy, Default)]
+struct LoweringContext<'a> {
+    choice_alternative_scope: Option<ChoiceAlternativeScope<'a>>,
+}
+
+#[derive(Clone, Copy)]
+struct ChoiceAlternativeScope<'a> {
+    interpolations: &'a RefCell<Vec<GuardingInterpolation>>,
+}
+
+/// A `#{expr}` interpolation that must succeed before constructing a choice
+/// alternative. Lowering first emits `expression`, which evaluates `expr` and
+/// returns its rendered text and optional source range. A `None` result rejects
+/// the alternative without constructing any nodes. On success, the generated
+/// bindings are reused later when constructing the interpolated leaf.
+struct GuardingInterpolation {
+    /// Generated binding for the interpolation's rendered text.
+    value: Ident,
+    /// Generated binding for the interpolation's optional source range.
+    source_range: Ident,
+    /// Generated `Option<(String, Option<Range>)>` expression that evaluates
+    /// the original interpolation exactly once.
+    expression: TokenStream,
+}
+
+fn fresh_prepared_ident(suffix: &str) -> Ident {
+    static COUNTER: AtomicUsize = AtomicUsize::new(0);
+    let n = COUNTER.fetch_add(1, Ordering::Relaxed);
+    Ident::new(&format!("__yeast_prepared_{suffix}_{n}"), Span::call_site())
+}
+
+#[derive(Clone)]
+struct CaptureBinding {
+    name: Ident,
+    raw: bool,
+    cardinality: Cardinality,
+}
+
+impl Rule {
+    pub(crate) fn lower(&self) -> TokenStream {
+        let query = self.pattern.lower();
+        let captures = self.pattern.captures();
+        let (raw_captures, translated_captures): (Vec<_>, Vec<_>) =
+            captures.iter().partition(|capture| capture.raw);
+        let raw_capture_names = raw_captures
+            .iter()
+            .map(|capture| capture.name.to_string())
+            .collect::<Vec<_>>();
+        let captures_ident = Ident::new("__captures", Span::call_site());
+        let translated_captures_ident = Ident::new("__translated_captures", Span::call_site());
+        let guard_bindings =
+            capture_bindings(captures.iter(), quote! { yeast::Id }, &captures_ident);
+        let raw_bindings = capture_bindings(
+            raw_captures.into_iter(),
+            quote! { yeast::Id },
+            &captures_ident,
+        );
+        let translated_bindings = capture_bindings(
+            translated_captures.into_iter(),
+            quote! { yeast::OutputId },
+            &translated_captures_ident,
+        );
+        let replacement = self.replacement.lower();
+        let guard = self
+            .guard
+            .clone()
+            .unwrap_or_else(|| syn::parse_quote!(true));
+        let ctx = Ident::new("ctx", Span::call_site());
+
+        quote! {
+            {
+                let __query = #query;
+                yeast::Rule::guarded(
+                    __query,
+                    Box::new(|__ast: &yeast::Ast, __captures: &yeast::captures::Captures, __user_ctx: &_| {
+                        #(#guard_bindings)*
+                        let ast = __ast;
+                        let #ctx = __user_ctx;
+                        Ok(#guard)
+                    }),
+                    Box::new(|__ast: &yeast::Ast, __output: &mut yeast::OutputAst, __captures: yeast::captures::Captures, __source_range: Option<yeast::Range>, __user_ctx: &mut _, __translator: yeast::TranslatorHandle<'_, _>| {
+                        let __skip: &[&str] = &[#(#raw_capture_names),*];
+                        let __translated_captures =
+                            __translator.translate_captures(&__captures, __ast, __output, __user_ctx, __skip)?;
+                        #(#raw_bindings)*
+                        #(#translated_bindings)*
+                        let mut #ctx = yeast::build::BuildCtx::with_translator(__ast, __output, __source_range, __user_ctx, __translator);
+                        let __result: Vec<yeast::OutputId> = { #replacement };
+                        let __result = #ctx.finish_rule(__result)?;
+                        Ok(__result)
+                    }),
+                )
+            }
+        }
+    }
+}
+
+impl Replacement {
+    fn lower(&self) -> TokenStream {
+        match self {
+            Replacement::Templates(templates) => Template::lower_list(templates),
+            Replacement::Rust { body, .. } => {
+                let body = rust_block(body);
+                quote! {
+                    let __value = ::std::iter::IntoIterator::into_iter(#body)
+                        .collect::<Vec<_>>();
+                    let mut __ids: Vec<yeast::OutputId> = Vec::new();
+                    ctx.extend_field_ids(__value, &mut __ids);
+                    __ids
+                }
+            }
+        }
+    }
+}
+
+impl Pattern {
+    pub(crate) fn lower(&self) -> TokenStream {
+        match self {
+            Pattern::Any { match_unnamed } => {
+                quote! { yeast::query::QueryNode::Any { match_unnamed: #match_unnamed } }
+            }
+            Pattern::Node { kind, fields } => {
+                let fields = fields.iter().map(|(name, pattern)| {
+                    let elements = pattern.lower_list();
+                    quote! { (#name, vec![#(#elements),*]) }
+                });
+                quote! {
+                    yeast::query::QueryNode::Node {
+                        kind: #kind,
+                        children: vec![#(#fields),*],
+                    }
+                }
+            }
+            Pattern::Unnamed(kind) => {
+                quote! { yeast::query::QueryNode::UnnamedNode { kind: #kind } }
+            }
+            Pattern::Capture {
+                name,
+                pattern,
+                cardinality,
+                ..
+            } => {
+                debug_assert_eq!(*cardinality, Cardinality::SINGLE);
+                let name = name.to_string();
+                let pattern = pattern.lower();
+                quote! {
+                    yeast::query::QueryNode::Capture {
+                        capture: #name,
+                        node: Box::new(#pattern),
+                    }
+                }
+            }
+            Pattern::Sequence(_) | Pattern::Repeated { .. } => {
+                unreachable!("sequence and repeated patterns cannot match a single node")
+            }
+        }
+    }
+
+    fn lower_list(&self) -> Vec<TokenStream> {
+        match self {
+            Pattern::Sequence(patterns) => patterns.iter().flat_map(Pattern::lower_list).collect(),
+            Pattern::Capture {
+                name,
+                pattern,
+                cardinality,
+                ..
+            } => {
+                let capture = name.to_string();
+                let pattern = pattern.lower();
+                let captured = quote! {
+                    yeast::query::QueryListElem::SingleNode(
+                        yeast::query::QueryNode::Capture {
+                            capture: #capture,
+                            node: Box::new(#pattern),
+                        }
+                    )
+                };
+                if *cardinality == Cardinality::SINGLE {
+                    vec![captured]
+                } else {
+                    let repetition = match (cardinality.multiple, cardinality.required) {
+                        (true, false) => quote! { yeast::query::Rep::ZeroOrMore },
+                        (true, true) => quote! { yeast::query::Rep::OneOrMore },
+                        (false, false) => quote! { yeast::query::Rep::ZeroOrOne },
+                        (false, true) => unreachable!("single cardinality handled above"),
+                    };
+                    vec![quote! {
+                        yeast::query::QueryListElem::Repeated {
+                            children: vec![#captured],
+                            rep: #repetition,
+                        }
+                    }]
+                }
+            }
+            Pattern::Repeated {
+                pattern,
+                cardinality,
+            } => {
+                let children = pattern.lower_list();
+                let repetition = match (cardinality.multiple, cardinality.required) {
+                    (true, false) => quote! { yeast::query::Rep::ZeroOrMore },
+                    (true, true) => quote! { yeast::query::Rep::OneOrMore },
+                    (false, false) => quote! { yeast::query::Rep::ZeroOrOne },
+                    (false, true) => unreachable!("single patterns are not wrapped as repeated"),
+                };
+                vec![quote! {
+                    yeast::query::QueryListElem::Repeated {
+                        children: vec![#(#children),*],
+                        rep: #repetition,
+                    }
+                }]
+            }
+            pattern => {
+                let pattern = pattern.lower();
+                vec![quote! { yeast::query::QueryListElem::SingleNode(#pattern) }]
+            }
+        }
+    }
+
+    fn captures(&self) -> Vec<CaptureBinding> {
+        let mut captures = Vec::new();
+        self.collect_captures(Cardinality::SINGLE, &mut captures);
+        captures
+    }
+
+    fn collect_captures(&self, cardinality: Cardinality, captures: &mut Vec<CaptureBinding>) {
+        match self {
+            Pattern::Any { .. } | Pattern::Unnamed(_) => {}
+            Pattern::Node { fields, .. } => {
+                for (_, pattern) in fields {
+                    pattern.collect_captures(cardinality, captures);
+                }
+            }
+            Pattern::Capture {
+                name,
+                raw,
+                pattern,
+                cardinality: captured,
+            } => {
+                let cardinality = combine_cardinality(cardinality, *captured);
+                pattern.collect_captures(cardinality, captures);
+                captures.push(CaptureBinding {
+                    name: name.clone(),
+                    raw: *raw,
+                    cardinality,
+                });
+            }
+            Pattern::Sequence(patterns) => {
+                for pattern in patterns {
+                    pattern.collect_captures(cardinality, captures);
+                }
+            }
+            Pattern::Repeated {
+                pattern,
+                cardinality: repeated,
+            } => {
+                pattern.collect_captures(combine_cardinality(cardinality, *repeated), captures);
+            }
+        }
+    }
+}
+
+fn combine_cardinality(parent: Cardinality, child: Cardinality) -> Cardinality {
+    Cardinality {
+        multiple: parent.multiple || child.multiple,
+        required: parent.required && child.required,
+    }
+}
+
+fn capture_bindings<'a>(
+    captures: impl Iterator<Item = &'a CaptureBinding>,
+    id_type: TokenStream,
+    captures_ident: &Ident,
+) -> Vec<TokenStream> {
+    captures
+        .map(|capture| {
+            let name_string = capture.name.to_string();
+            let name = Ident::new(&name_string, Span::call_site());
+            match (capture.cardinality.multiple, capture.cardinality.required) {
+                (true, _) => {
+                    quote! {
+                        let #name: Vec<#id_type> = #captures_ident.get_all(#name_string);
+                    }
+                }
+                (false, false) => {
+                    quote! {
+                        let #name: Option<#id_type> = #captures_ident.get_opt(#name_string);
+                    }
+                }
+                (false, true) => {
+                    quote! {
+                        let #name: #id_type = #captures_ident.get_var(#name_string).unwrap();
+                    }
+                }
+            }
+        })
+        .collect()
+}
+
+impl Template {
+    pub(crate) fn lower_root(&self) -> TokenStream {
+        match self {
+            Template::Choice(alternatives) => Self::lower_choice(alternatives),
+            _ => self.lower_single(LoweringContext::default()),
+        }
+    }
+
+    pub(crate) fn lower_list(templates: &[Self]) -> TokenStream {
+        let context = LoweringContext::default();
+        let items = templates
+            .iter()
+            .map(|template| match template {
+                Template::Node(node) => {
+                    let node = node.lower(context);
+                    quote! { __nodes.push(#node); }
+                }
+                Template::Splice(block) => {
+                    let block = rust_block(block);
+                    quote! {
+                        let __value = ::std::iter::IntoIterator::into_iter(#block)
+                            .collect::<Vec<_>>();
+                        ctx.extend_field_ids(__value, &mut __nodes);
+                    }
+                }
+                Template::Choice(alternatives) => {
+                    let pick = Self::lower_choice(alternatives);
+                    quote! {
+                        if let ::std::option::Option::Some(__id) = #pick {
+                            __nodes.push(__id);
+                        }
+                    }
+                }
+            })
+            .collect::<Vec<_>>();
+
+        quote! {
+            {
+                let mut __nodes: Vec<yeast::OutputId> = Vec::new();
+                #(#items)*
+                __nodes
+            }
+        }
+    }
+
+    fn lower_single(&self, context: LoweringContext<'_>) -> TokenStream {
+        match self {
+            Template::Node(node) => node.lower(context),
+            Template::Splice(block) => {
+                let block = rust_block(block);
+                quote! { ::std::convert::Into::<yeast::OutputId>::into(#block) }
+            }
+            Template::Choice(_) => {
+                unreachable!("choices are lowered through Template::lower_choice")
+            }
+        }
+    }
+
+    fn lower_choice(alternatives: &[Alternative]) -> TokenStream {
+        let pick = alternatives.iter().rev().fold(
+            quote! { ::std::option::Option::None },
+            |fallback, alternative| alternative.lower_candidate(fallback),
+        );
+        quote! {{ #pick }}
+    }
+}
+
+impl Alternative {
+    fn lower_candidate(&self, fallback: TokenStream) -> TokenStream {
+        let interpolations = RefCell::new(Vec::new());
+        let context = LoweringContext {
+            choice_alternative_scope: Some(ChoiceAlternativeScope {
+                interpolations: &interpolations,
+            }),
+        };
+        let value = self.template.lower_single(context);
+        let interpolations = interpolations.into_inner();
+        let prepared_values = interpolations
+            .iter()
+            .flat_map(|interpolation| {
+                [
+                    interpolation.value.clone(),
+                    interpolation.source_range.clone(),
+                ]
+            })
+            .collect::<Vec<_>>();
+        let prepared = quote! {
+            ::std::option::Option::Some((#(#prepared_values),*))
+        };
+
+        // Nest dependency matches around preparation in reverse, so they are
+        // evaluated in source order. Construction happens only after the
+        // resulting option has been matched, keeping it in a separate branch
+        // from the fallback.
+        let prepared =
+            interpolations
+                .into_iter()
+                .rev()
+                .fold(prepared, |candidate, interpolation| {
+                    let GuardingInterpolation {
+                        value,
+                        source_range,
+                        expression,
+                    } = interpolation;
+                    // Do not use `map`/`and_then` here: `candidate` may contain
+                    // embedded user Rust, and putting it in a closure would change
+                    // the target of `return` and the result type seen by `?`.
+                    quote! {
+                        match #expression {
+                            ::std::option::Option::Some((#value, #source_range)) => #candidate,
+                            ::std::option::Option::None => ::std::option::Option::None,
+                        }
+                    }
+                });
+        let prepared = if let Some(guard) = &self.guard {
+            let guard = rust_block(guard);
+            quote! {
+                if #guard {
+                    #prepared
+                } else {
+                    ::std::option::Option::None
+                }
+            }
+        } else {
+            prepared
+        };
+
+        quote! {
+            match #prepared {
+                ::std::option::Option::Some((#(#prepared_values),*)) => {
+                    ::std::option::Option::Some(#value)
+                }
+                ::std::option::Option::None => #fallback,
+            }
+        }
+    }
+}
+
+impl Node {
+    fn lower(&self, context: LoweringContext<'_>) -> TokenStream {
+        let ctx = Ident::new("ctx", Span::call_site());
+        let kind_str = self.kind.to_string();
+
+        let node_init = if let Some(content) = &self.content {
+            let node = match content {
+                Content::Static(lit) => quote! { #ctx.literal(#kind_str, #lit) },
+                Content::Computed(block) => {
+                    let block = rust_block(block);
+                    if let Some(scope) = context.choice_alternative_scope {
+                        let value = fresh_prepared_ident("value");
+                        let source_range = fresh_prepared_ident("source_range");
+                        scope
+                            .interpolations
+                            .borrow_mut()
+                            .push(GuardingInterpolation {
+                                value: value.clone(),
+                                source_range: source_range.clone(),
+                                expression: quote! {
+                                    {
+                                        let __expr = #block;
+                                        yeast::MaybeYeastValue::maybe_yeast_value(&__expr).map(
+                                            |__value_ref| {
+                                                (
+                                                    yeast::YeastDisplay::yeast_to_string(
+                                                        __value_ref,
+                                                        &#ctx,
+                                                    ),
+                                                    yeast::YeastSourceRange::yeast_source_range(
+                                                        __value_ref,
+                                                        &#ctx,
+                                                    ),
+                                                )
+                                            },
+                                        )
+                                    }
+                                },
+                            });
+                        quote! {
+                            #ctx.literal_with_source_range(
+                                #kind_str,
+                                &#value,
+                                #source_range,
+                            )
+                        }
+                    } else {
+                        quote! {
+                            {
+                                let __expr = #block;
+                                let __value =
+                                    yeast::YeastDisplay::yeast_to_string(&__expr, &#ctx);
+                                let __source_range =
+                                    yeast::YeastSourceRange::yeast_source_range(&__expr, &#ctx);
+                                #ctx.literal_with_source_range(
+                                    #kind_str,
+                                    &__value,
+                                    __source_range,
+                                )
+                            }
+                        }
+                    }
+                }
+                Content::Inherited => quote! { #ctx.inherited_literal(#kind_str) },
+            };
+            quote! { let __node: yeast::OutputId = #node; }
+        } else {
+            TokenStream::new()
+        };
+
+        let mut stmts = Vec::new();
+        let mut field_args = Vec::new();
+        let location_none = self
+            .fields
+            .iter()
+            .any(|field| matches!(field, Field::LocationNone));
+
+        for (field_counter, field) in self.fields.iter().enumerate() {
+            match field {
+                Field::Location { block } => {
+                    let block = rust_block(block);
+                    stmts.push(quote! {
+                        let __value = ::std::iter::IntoIterator::into_iter(#block)
+                            .collect::<Vec<_>>();
+                        #ctx.extend_location_ranges(__value, &mut __location_ranges);
+                    });
+                }
+                Field::LocationNone => {}
+                Field::Named { name, value } => {
+                    let field_name = name.to_string();
+                    let field_str = field_name
+                        .strip_prefix("r#")
+                        .unwrap_or(&field_name)
+                        .to_string();
+                    let temp = Ident::new(
+                        &format!("__field_{field_str}_{field_counter}"),
+                        Span::call_site(),
+                    );
+                    match value {
+                        Template::Splice(block) => {
+                            let block = rust_block(block);
+                            stmts.push(quote! {
+                                let mut #temp: Vec<yeast::OutputId> = Vec::new();
+                                let __value = ::std::iter::IntoIterator::into_iter(#block)
+                                    .collect::<Vec<_>>();
+                                #ctx.extend_field_ids(__value, &mut #temp);
+                            });
+                            field_args.push(quote! {
+                                if !#temp.is_empty() {
+                                    __fields.push((#field_str, #temp));
+                                }
+                            });
+                        }
+                        Template::Choice(alternatives) => {
+                            let pick = Template::lower_choice(alternatives);
+                            stmts.push(quote! {
+                                let #temp: ::std::option::Option<yeast::OutputId> = #pick;
+                            });
+                            field_args.push(quote! {
+                                if let ::std::option::Option::Some(__id) = #temp {
+                                    __fields.push((#field_str, vec![__id]));
+                                }
+                            });
+                        }
+                        Template::Node(child) => {
+                            let value = child.lower(context);
+                            stmts.push(quote! { let #temp: yeast::OutputId = #value; });
+                            field_args.push(quote! {
+                                __fields.push((#field_str, vec![#temp]));
+                            });
+                        }
+                    }
+                }
+            }
+        }
+
+        let build_node = if self.content.is_none() {
+            quote! {
+                let mut __fields: Vec<(&str, Vec<yeast::OutputId>)> = Vec::new();
+                #(#field_args)*
+                let __node: yeast::OutputId = #ctx.node(#kind_str, __fields);
+            }
+        } else {
+            TokenStream::new()
+        };
+
+        quote! {
+            {
+                let mut __location_ranges: Vec<yeast::Range> = Vec::new();
+                #node_init
+                #(#stmts)*
+                #build_node
+                if #location_none {
+                    #ctx.set_node_locationless(__node)
+                } else {
+                    let __source_range =
+                        __location_ranges.into_iter().reduce(yeast::Range::union);
+                    #ctx.set_node_source_range(__node, __source_range)
+                }
+            }
+        }
+    }
+}
+
+fn rust_block(block: &syn::Block) -> TokenStream {
+    let statements = &block.stmts;
+    quote!({ #(#statements)* })
+}
diff --git a/shared/yeast-macros/src/parse.rs b/shared/yeast-macros/src/parse.rs
index 34e859c912e9..ccc8b036ff4e 100644
--- a/shared/yeast-macros/src/parse.rs
+++ b/shared/yeast-macros/src/parse.rs
@@ -1,1190 +1,40 @@
-use proc_macro2::{Delimiter, Ident, Literal, Span, TokenStream, TokenTree};
+use proc_macro2::{Span, TokenStream, TokenTree};
 use quote::quote;
-use std::iter::Peekable;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use syn::Lifetime;
 
-type Tokens = Peekable<proc_macro2::token_stream::IntoIter>;
 type Result<T> = std::result::Result<T, syn::Error>;
 
-/// Mints the block label a fallible field breaks out of. Labels must be unique
-/// along a nesting chain, since a `?` nested inside another `?` has to break out
-/// of the inner field only.
-fn fresh_fallible_label() -> Lifetime {
-    static COUNTER: AtomicUsize = AtomicUsize::new(0);
-    let n = COUNTER.fetch_add(1, Ordering::Relaxed);
-    Lifetime::new(&format!("'__yeast_field_{n}"), Span::call_site())
-}
-
-/// Rejects a `?` in a position where there is no field for it to leave unset.
-///
-/// The advice depends on what precedes it: on a `{...}` splice a `?` is
-/// redundant, and anywhere else it belongs on a field's value. Other
-/// quantifiers need no handling — `*` and `+` have never been valid in a
-/// template, and the existing check for stray tokens already rejects them.
-fn reject_stray_optional(tokens: &mut Tokens, after_splice: bool) -> Result<()> {
-    let Some(TokenTree::Punct(p)) = tokens.peek() else {
-        return Ok(());
-    };
-    if p.as_char() != '?' {
-        return Ok(());
-    }
-    let msg = if after_splice {
-        "`?` is not valid on a `{...}` splice; a splice that yields no value \
-         already leaves its field unset"
-    } else {
-        "`?` is only valid on the value of a named field, as in \
-         `label: (identifier #{lbl})?`"
-    };
-    Err(syn::Error::new_spanned(p.clone(), msg))
-}
-
-// ---------------------------------------------------------------------------
-// Query parsing
-// ---------------------------------------------------------------------------
-
-/// Top-level entry: parse a single query node from the full input.
 pub fn parse_query_top(input: TokenStream) -> Result<TokenStream> {
-    let mut tokens = input.into_iter().peekable();
-    let result = parse_query_node(&mut tokens)?;
-    if let Some(tok) = tokens.next() {
-        return Err(syn::Error::new_spanned(tok, "unexpected token after query"));
-    }
-    Ok(result)
-}
-
-/// Parse a single query node (possibly with a trailing `@capture`).
-fn parse_query_node(tokens: &mut Tokens) -> Result<TokenStream> {
-    let base = parse_query_atom(tokens)?;
-    // Check for trailing @capture or @@capture
-    if peek_is_at(tokens) {
-        let capture_name = consume_capture_marker(tokens)?;
-        let name_str = capture_name.to_string();
-        Ok(quote! {
-            yeast::query::QueryNode::Capture {
-                capture: #name_str,
-                node: Box::new(#base),
-            }
-        })
-    } else {
-        Ok(base)
-    }
-}
-
-/// Parse a query atom: a parenthesized node, a bare `_` (any node), or a
-/// bare string literal (unnamed token).
-/// Does not handle `@capture` — that's handled by the caller as a postfix.
-fn parse_query_atom(tokens: &mut Tokens) -> Result<TokenStream> {
-    match tokens.peek() {
-        None => Err(syn::Error::new(
-            Span::call_site(),
-            "unexpected end of query",
-        )),
-        Some(TokenTree::Group(g)) if g.delimiter() == Delimiter::Parenthesis => {
-            let group = expect_group(tokens, Delimiter::Parenthesis)?;
-            let mut inner = group.stream().into_iter().peekable();
-            let result = parse_query_node_inner(&mut inner)?;
-            if let Some(tok) = inner.next() {
-                return Err(syn::Error::new_spanned(
-                    tok,
-                    "unexpected token in query node",
-                ));
-            }
-            Ok(result)
-        }
-        Some(TokenTree::Ident(id)) if *id == "_" => {
-            tokens.next();
-            Ok(quote! { yeast::query::QueryNode::Any { match_unnamed: true } })
-        }
-        Some(TokenTree::Literal(_)) => {
-            let lit = expect_literal(tokens)?;
-            Ok(quote! { yeast::query::QueryNode::UnnamedNode { kind: #lit } })
-        }
-        Some(tok) => Err(syn::Error::new_spanned(
-            tok.clone(),
-            "expected `(`, `_`, or string literal in query",
-        )),
-    }
-}
-
-/// Parse the inside of a parenthesized query node: `kind fields...` or `_` or `"lit"`.
-fn parse_query_node_inner(tokens: &mut Tokens) -> Result<TokenStream> {
-    match tokens.peek() {
-        None => Err(syn::Error::new(
-            Span::call_site(),
-            "empty parenthesized group in query",
-        )),
-        Some(TokenTree::Ident(id)) if *id == "_" => {
-            tokens.next();
-            Ok(quote! { yeast::query::QueryNode::Any { match_unnamed: false } })
-        }
-        Some(TokenTree::Literal(_)) => {
-            let lit = expect_literal(tokens)?;
-            Ok(quote! { yeast::query::QueryNode::UnnamedNode { kind: #lit } })
-        }
-        Some(TokenTree::Ident(_)) => {
-            let kind = expect_ident(tokens, "expected node kind")?;
-            let kind_str = kind.to_string();
-            let fields = parse_query_fields(tokens)?;
-            Ok(quote! {
-                yeast::query::QueryNode::Node {
-                    kind: #kind_str,
-                    children: vec![#(#fields),*],
-                }
-            })
-        }
-        Some(tok) => Err(syn::Error::new_spanned(
-            tok.clone(),
-            "expected node kind, `_`, or string literal",
-        )),
-    }
-}
-
-/// Parse zero or more field specifications and bare patterns.
-/// Named fields: `name: pattern`. Bare patterns (no field name) become
-/// implicit `child` field entries. Named fields and bare patterns may
-/// appear in any order; bare patterns are accumulated and emitted as a
-/// single `("child", ...)` entry.
-fn parse_query_fields(tokens: &mut Tokens) -> Result<Vec<TokenStream>> {
-    // Accumulate per-field elems in declaration order; multiple uses of the
-    // same field name extend the same list (so e.g. `cond: (foo) cond: (bar)`
-    // matches a `cond` field whose first child is `foo` and second is `bar`).
-    let mut field_order: Vec<String> = Vec::new();
-    let mut field_elems: std::collections::HashMap<String, Vec<TokenStream>> =
-        std::collections::HashMap::new();
-    let mut bare_children: Vec<TokenStream> = Vec::new();
-    let push_field_elem = |order: &mut Vec<String>,
-                           map: &mut std::collections::HashMap<String, Vec<TokenStream>>,
-                           name: String,
-                           elem: TokenStream| {
-        match map.entry(name) {
-            std::collections::hash_map::Entry::Occupied(mut entry) => {
-                entry.get_mut().push(elem);
-            }
-            std::collections::hash_map::Entry::Vacant(entry) => {
-                order.push(entry.key().clone());
-                entry.insert(vec![elem]);
-            }
-        }
-    };
-    while tokens.peek().is_some() {
-        if peek_is_field(tokens) {
-            let field_name = expect_ident(tokens, "expected field name")?;
-            let field_str = field_name.to_string();
-
-            expect_punct(tokens, ':', "expected `:` after field name")?;
-
-            // Parse the field's pattern. To support repetition like
-            // `field: (kind)* @cap`, parse the atom first, then check for
-            // a quantifier, and lastly handle a trailing `@capture`.
-            // `field: @cap` is sugar for `field: _ @cap`.
-            let atom = if peek_is_at(tokens) {
-                quote! { yeast::query::QueryNode::Any { match_unnamed: true } }
-            } else {
-                parse_query_atom(tokens)?
-            };
-            if peek_is_repetition(tokens) {
-                let rep = expect_repetition(tokens)?;
-                let elem = quote! {
-                    yeast::query::QueryListElem::Repeated {
-                        children: vec![yeast::query::QueryListElem::SingleNode(#atom)],
-                        rep: #rep,
-                    }
-                };
-                let elem = maybe_wrap_list_capture(tokens, elem)?;
-                push_field_elem(&mut field_order, &mut field_elems, field_str, elem);
-            } else {
-                let child = if peek_is_at(tokens) {
-                    let capture_name = consume_capture_marker(tokens)?;
-                    let name_str = capture_name.to_string();
-                    quote! {
-                        yeast::query::QueryNode::Capture {
-                            capture: #name_str,
-                            node: Box::new(#atom),
-                        }
-                    }
-                } else {
-                    atom
-                };
-                let elem = quote! {
-                    yeast::query::QueryListElem::SingleNode(#child)
-                };
-                push_field_elem(&mut field_order, &mut field_elems, field_str, elem);
-            }
-        } else {
-            // Bare patterns — accumulate into the implicit `child` field.
-            // We don't break here, so we can interleave with named fields.
-            let elems = parse_query_list(tokens)?;
-            if elems.is_empty() {
-                // Nothing more we can parse at this level.
-                break;
-            }
-            bare_children.extend(elems);
-        }
-    }
-    let mut fields: Vec<TokenStream> = Vec::new();
-    for name in field_order {
-        let elems = field_elems.remove(&name).unwrap();
-        fields.push(quote! {
-            (#name, vec![#(#elems),*])
-        });
-    }
-    if !bare_children.is_empty() {
-        fields.push(quote! {
-            ("child", vec![#(#bare_children),*])
-        });
-    }
-    Ok(fields)
-}
-
-/// Parse a list of query elements (bare children).
-/// Each element is a node pattern, possibly followed by `*`, `+`, `?`.
-fn parse_query_list(tokens: &mut Tokens) -> Result<Vec<TokenStream>> {
-    let mut elems = Vec::new();
-    while tokens.peek().is_some() {
-        // Check for parenthesized group
-        if peek_is_group(tokens, Delimiter::Parenthesis) {
-            let group = expect_group(tokens, Delimiter::Parenthesis)?;
-            let mut inner = group.stream().into_iter().peekable();
-
-            // Check for repetition after the group
-            if peek_is_repetition(tokens) {
-                let rep = expect_repetition(tokens)?;
-                // Determine if the group is a single node pattern or a list
-                // of patterns. If it starts with an identifier (node kind) or
-                // `_`, treat it as a single repeated node. Otherwise, parse
-                // as a repeated list of sub-patterns.
-                let is_single_node = matches!(inner.peek(), Some(TokenTree::Ident(_)));
-                if is_single_node {
-                    let node = parse_query_node_inner(&mut inner)?;
-                    let elem = quote! {
-                        yeast::query::QueryListElem::Repeated {
-                            children: vec![yeast::query::QueryListElem::SingleNode(#node)],
-                            rep: #rep,
-                        }
-                    };
-                    let elem = maybe_wrap_list_capture(tokens, elem)?;
-                    elems.push(elem);
-                } else {
-                    let sub_elems = parse_query_list(&mut inner)?;
-                    let elem = quote! {
-                        yeast::query::QueryListElem::Repeated {
-                            children: vec![#(#sub_elems),*],
-                            rep: #rep,
-                        }
-                    };
-                    let elem = maybe_wrap_list_capture(tokens, elem)?;
-                    elems.push(elem);
-                }
-            } else {
-                // Single parenthesized node, possibly followed by @capture
-                let node = parse_query_node_inner(&mut inner)?;
-                let node = maybe_wrap_capture(tokens, node)?;
-                elems.push(quote! {
-                    yeast::query::QueryListElem::SingleNode(#node)
-                });
-            }
-            continue;
-        }
-
-        // Check for string literal (unnamed node), optionally followed by @capture
-        if peek_is_literal(tokens) {
-            let lit = expect_literal(tokens)?;
-            let node = quote! { yeast::query::QueryNode::UnnamedNode { kind: #lit } };
-            let node = maybe_wrap_capture(tokens, node)?;
-            let elem = maybe_wrap_repetition(
-                tokens,
-                quote! {
-                    yeast::query::QueryListElem::SingleNode(#node)
-                },
-            )?;
-            let elem = maybe_wrap_list_capture(tokens, elem)?;
-            elems.push(elem);
-            continue;
-        }
-
-        // Check for bare `_` (any node, named or unnamed), possibly followed by @capture.
-        // Distinct from `(_)` which only matches named nodes — this matches
-        // tree-sitter query semantics.
-        if peek_is_underscore(tokens) {
-            tokens.next();
-            let node = quote! { yeast::query::QueryNode::Any { match_unnamed: true } };
-            let node = maybe_wrap_capture(tokens, node)?;
-            let elem = maybe_wrap_repetition(
-                tokens,
-                quote! {
-                    yeast::query::QueryListElem::SingleNode(#node)
-                },
-            )?;
-            let elem = maybe_wrap_list_capture(tokens, elem)?;
-            elems.push(elem);
-            continue;
-        }
-
-        break;
-    }
-    Ok(elems)
-}
-
-// ---------------------------------------------------------------------------
-// tree! / trees! parsing — direct code generation against BuildCtx
-// ---------------------------------------------------------------------------
-
-const IMPLICIT_CTX: &str = "ctx";
-
-/// Determine the context identifier: either explicit `ctx,` or the implicit
-/// `ctx` from an enclosing `rule!`.
-fn parse_ctx_or_implicit(tokens: &mut Tokens) -> Ident {
-    // Check if first token is an ident followed by a comma
-    let mut lookahead = tokens.clone();
-    let is_explicit = matches!(lookahead.next(), Some(TokenTree::Ident(_)))
-        && matches!(lookahead.next(), Some(TokenTree::Punct(p)) if p.as_char() == ',');
-
-    if is_explicit {
-        let ctx = expect_ident(tokens, "unreachable: ident was just peeked")
-            .expect("unreachable: ident was just peeked");
-        let _ = tokens.next(); // consume comma
-        ctx
-    } else {
-        Ident::new(IMPLICIT_CTX, Span::call_site())
-    }
-}
-
-/// Parse `tree!(ctx, (template))` or `tree!((template))` — returns single `Id`.
-pub fn parse_tree_top(input: TokenStream) -> Result<TokenStream> {
-    let mut tokens = input.into_iter().peekable();
-    let ctx = parse_ctx_or_implicit(&mut tokens);
-
-    let first = parse_direct_node(&mut tokens, &ctx, None)?;
-
-    reject_stray_optional(&mut tokens, false)?;
-    if let Some(tok) = tokens.next() {
-        return Err(syn::Error::new_spanned(
-            tok,
-            "unexpected tokens after tree! template; use trees! for multiple nodes",
-        ));
-    }
-
-    Ok(quote! { { #first } })
-}
-
-/// Parse `trees!(ctx, ...)` or `trees!(...)` — returns `Vec<Id>`.
-pub fn parse_trees_top(input: TokenStream) -> Result<TokenStream> {
-    let mut tokens = input.into_iter().peekable();
-    let ctx = parse_ctx_or_implicit(&mut tokens);
-    let items = parse_direct_list(&mut tokens, &ctx)?;
-    if let Some(tok) = tokens.next() {
-        return Err(syn::Error::new_spanned(
-            tok,
-            "unexpected token after trees! template",
-        ));
-    }
-    Ok(quote! {
-        {
-            let mut __nodes: Vec<yeast::Id> = Vec::new();
-            #(#items)*
-            __nodes
-        }
-    })
-}
-
-/// Parse a single node template and generate code that returns an `Id`.
-/// Handles: `(kind fields... children...)` and `{expr}`.
-///
-/// `scope` is the enclosing fallible field's label, if any: inside one, a
-/// `#{expr}` that interpolates an absent value breaks out to it, leaving that
-/// field unset. See [`parse_direct_node_inner`].
-fn parse_direct_node(
-    tokens: &mut Tokens,
-    ctx: &Ident,
-    scope: Option<&Lifetime>,
-) -> Result<TokenStream> {
-    match tokens.peek() {
-        Some(TokenTree::Group(g)) if g.delimiter() == Delimiter::Brace => {
-            let group = expect_group(tokens, Delimiter::Brace)?;
-            let expr = group.stream();
-            Ok(quote! { ::std::convert::Into::<yeast::Id>::into({ #expr }) })
-        }
-        Some(TokenTree::Group(g)) if g.delimiter() == Delimiter::Parenthesis => {
-            let group = expect_group(tokens, Delimiter::Parenthesis)?;
-            let mut inner = group.stream().into_iter().peekable();
-            parse_direct_node_inner(&mut inner, ctx, scope)
-        }
-        Some(tok) => Err(syn::Error::new_spanned(
-            tok.clone(),
-            "expected `(` or `{` in tree template",
-        )),
-        None => Err(syn::Error::new(
-            Span::call_site(),
-            "unexpected end of tree template",
-        )),
-    }
-}
-
-/// Parse the inside of a parenthesized node: `kind fields... children...`
-/// or `kind "literal"` or `kind $fresh`.
-fn parse_direct_node_inner(
-    tokens: &mut Tokens,
-    ctx: &Ident,
-    scope: Option<&Lifetime>,
-) -> Result<TokenStream> {
-    let kind = expect_ident(tokens, "expected node kind")?;
-    let kind_str = kind.to_string();
-
-    // Check for (kind "literal")
-    if peek_is_literal(tokens) {
-        let lit = expect_literal(tokens)?;
-        return Ok(quote! { #ctx.literal(#kind_str, #lit) });
-    }
-
-    // Check for (kind #{expr}) — computed literal, expr converted via YeastDisplay
-    if peek_is_hash(tokens) {
-        tokens.next(); // consume #
-        let group = expect_group(tokens, Delimiter::Brace)?;
-        let expr = group.stream();
-
-        // Inside a fallible field the value is routed through `MaybeYeastValue`,
-        // so an absent one abandons the whole surrounding node and leaves the
-        // field unset. Outside one, `YeastDisplay` is used directly, which is
-        // what makes interpolating an `Option` without a `?` a compile error.
-        if let Some(label) = scope {
-            return Ok(quote! {
-                {
-                    let __expr = { #expr };
-                    let ::std::option::Option::Some(__value_ref) =
-                        yeast::MaybeYeastValue::maybe_yeast_value(&__expr)
-                    else {
-                        break #label ::std::option::Option::None;
-                    };
-                    let __value = yeast::YeastDisplay::yeast_to_string(__value_ref, &*#ctx.ast);
-                    let __source_range =
-                        yeast::YeastSourceRange::yeast_source_range(__value_ref, &*#ctx.ast);
-                    #ctx.literal_with_source_range(#kind_str, &__value, __source_range)
-                }
-            });
-        }
-
-        return Ok(quote! {
-            {
-                let __expr = { #expr };
-                let __value = yeast::YeastDisplay::yeast_to_string(&__expr, &*#ctx.ast);
-                let __source_range = yeast::YeastSourceRange::yeast_source_range(&__expr, &*#ctx.ast);
-                #ctx.literal_with_source_range(#kind_str, &__value, __source_range)
-            }
-        });
-    }
-
-    // Check for (kind $fresh)
-    if peek_is_dollar(tokens) {
-        tokens.next();
-        let name = expect_ident(tokens, "expected fresh variable name after $")?;
-        let name_str = name.to_string();
-        return Ok(quote! { #ctx.fresh(#kind_str, #name_str) });
-    }
-
-    // Parse named fields
-    let mut stmts = Vec::new();
-    let mut field_args = Vec::new();
-    let mut field_counter = 0usize;
-
-    // Named fields — compute each value into a temp, then reference it
-    while peek_is_field(tokens) {
-        let field_name = expect_ident(tokens, "expected field name")?;
-        let field_str = field_name
-            .to_string()
-            .strip_prefix("r#")
-            .unwrap_or(&field_name.to_string())
-            .to_string();
-        expect_punct(tokens, ':', "expected `:` after field name")?;
-        let temp = Ident::new(
-            &format!("__field_{field_str}_{field_counter}"),
-            Span::call_site(),
-        );
-        field_counter += 1;
-
-        // Plain `field: {expr}` — trait-dispatched extend.
-        if peek_is_group(tokens, Delimiter::Brace) {
-            let group = expect_group(tokens, Delimiter::Brace)?;
-            reject_stray_optional(tokens, true)?;
-            let expr = group.stream();
-            stmts.push(quote! {
-                let mut #temp: Vec<yeast::Id> = Vec::new();
-                yeast::IntoFieldIds::extend_into({ #expr }, &mut #temp);
-            });
-            // An empty `{expr}` means the field is absent — skip it
-            // entirely rather than emitting an empty named field.
-            field_args.push(quote! {
-                if !#temp.is_empty() { __fields.push((#field_str, #temp)); }
-            });
-            continue;
-        }
-
-        // `field: (node)`, optionally suffixed with `?` to make the field
-        // fallible: if a `#{expr}` anywhere beneath it interpolates an absent
-        // value, the whole subtree is abandoned and the field is left unset.
-        if peek_is_group(tokens, Delimiter::Parenthesis) {
-            let group = expect_group(tokens, Delimiter::Parenthesis)?;
-            let optional = peek_is_punct(tokens, '?');
-            if optional {
-                tokens.next();
-            }
-
-            let mut inner = group.stream().into_iter().peekable();
-            if optional {
-                let label = fresh_fallible_label();
-                let value = parse_direct_node_inner(&mut inner, ctx, Some(&label))?;
-                // The label goes unused when nothing beneath the `?` can
-                // actually fail, which is not worth diagnosing: whether a given
-                // `#{expr}` is optional is a property of its type, which is not
-                // visible here.
-                stmts.push(quote! {
-                    #[allow(unused_labels)]
-                    let #temp: ::std::option::Option<yeast::Id> = #label: {
-                        ::std::option::Option::Some(#value)
-                    };
-                });
-                field_args.push(quote! {
-                    if let ::std::option::Option::Some(__id) = #temp {
-                        __fields.push((#field_str, vec![__id]));
-                    }
-                });
-            } else {
-                // No `?` of its own, so failures beneath it belong to whichever
-                // fallible field encloses this one, if any.
-                let value = parse_direct_node_inner(&mut inner, ctx, scope)?;
-                stmts.push(quote! { let #temp: yeast::Id = #value; });
-                field_args.push(quote! { __fields.push((#field_str, vec![#temp])); });
-            }
-            continue;
-        }
-
-        // Neither form matched; delegate for a consistent error message.
-        let value = parse_direct_node(tokens, ctx, scope)?;
-        stmts.push(quote! { let #temp: yeast::Id = #value; });
-        field_args.push(quote! { __fields.push((#field_str, vec![#temp])); });
-    }
-
-    // After all named fields, no other tokens are allowed.
-    // Output templates require all children to be in named fields.
-    if let Some(tok) = tokens.peek() {
-        return Err(syn::Error::new_spanned(
-            tok.clone(),
-            "expected named field (`name:`) or end of node template; \
-             output templates do not support unnamed children",
-        ));
-    }
-
+    let pattern = crate::rule_parse::parse_pattern(input)?.lower();
     Ok(quote! {
         {
-            #(#stmts)*
-            let mut __fields: Vec<(&str, Vec<yeast::Id>)> = Vec::new();
-            #(#field_args)*
-            #ctx.node(#kind_str, __fields)
+            let __pattern: yeast::query::QueryNode = #pattern;
+            __pattern
         }
     })
 }
 
-/// Parse the top-level list of a `trees!` template.
-/// Each item is a node template or `{expr}` splice.
-fn parse_direct_list(tokens: &mut Tokens, ctx: &Ident) -> Result<Vec<TokenStream>> {
-    let mut items = Vec::new();
-    while tokens.peek().is_some() {
-        if peek_is_group(tokens, Delimiter::Parenthesis) {
-            let group = expect_group(tokens, Delimiter::Parenthesis)?;
-            let mut inner = group.stream().into_iter().peekable();
-
-            // Empty `()` represents an empty sequence — emit nothing.
-            if inner.peek().is_none() {
-                continue;
-            }
-
-            // Regular node
-            let node = parse_direct_node_inner(&mut inner, ctx, None)?;
-            reject_stray_optional(tokens, false)?;
-            items.push(quote! { __nodes.push(#node); });
-            continue;
-        }
-
-        // `{expr}` — extend `__nodes` via `IntoFieldIds`, which handles
-        // single ids and iterables uniformly.
-        if peek_is_group(tokens, Delimiter::Brace) {
-            let group = expect_group(tokens, Delimiter::Brace)?;
-            reject_stray_optional(tokens, true)?;
-            let expr = group.stream();
-            items.push(quote! {
-                yeast::IntoFieldIds::extend_into({ #expr }, &mut __nodes);
-            });
-            continue;
-        }
-
-        break;
-    }
-    Ok(items)
-}
-
-// ---------------------------------------------------------------------------
-// rule! parsing
-// ---------------------------------------------------------------------------
-
-/// A captured variable from a query pattern.
-struct CaptureInfo {
-    name: String,
-    multiplicity: CaptureMultiplicity,
-    /// `true` for `@@name` captures: the auto-translate prefix skips them,
-    /// so the bound `Id` refers to the raw (input-schema) node.
-    raw: bool,
-}
-
-#[derive(Clone, Copy, PartialEq)]
-enum CaptureMultiplicity {
-    /// Exactly one match (bare pattern or after no quantifier)
-    Single,
-    /// Zero or one match (after `?`)
-    Optional,
-    /// Zero or more matches (after `*` or `+`, or inside a repeated group)
-    Repeated,
-}
-
-/// Walk a token stream and extract all `@name` captures, noting whether
-/// they appear after `*` or `+` (repeated) or not.
-fn extract_captures(stream: &TokenStream) -> Vec<CaptureInfo> {
-    let mut captures = Vec::new();
-    extract_captures_inner(
-        &mut stream.clone().into_iter().peekable(),
-        &mut captures,
-        CaptureMultiplicity::Single,
-    );
-    captures
-}
-
-fn extract_captures_inner(
-    tokens: &mut Tokens,
-    captures: &mut Vec<CaptureInfo>,
-    parent_mult: CaptureMultiplicity,
-) {
-    let mut last_mult = CaptureMultiplicity::Single;
-    while let Some(tok) = tokens.next() {
-        match tok {
-            TokenTree::Group(g) => {
-                let mut inner = g.stream().into_iter().peekable();
-                let group_mult = match tokens.peek() {
-                    Some(TokenTree::Punct(p)) if p.as_char() == '*' || p.as_char() == '+' => {
-                        CaptureMultiplicity::Repeated
-                    }
-                    Some(TokenTree::Punct(p)) if p.as_char() == '?' => {
-                        CaptureMultiplicity::Optional
-                    }
-                    _ => CaptureMultiplicity::Single,
-                };
-                last_mult = group_mult;
-                let child_mult = if parent_mult == CaptureMultiplicity::Repeated
-                    || group_mult == CaptureMultiplicity::Repeated
-                {
-                    CaptureMultiplicity::Repeated
-                } else if parent_mult == CaptureMultiplicity::Optional
-                    || group_mult == CaptureMultiplicity::Optional
-                {
-                    CaptureMultiplicity::Optional
-                } else {
-                    CaptureMultiplicity::Single
-                };
-                extract_captures_inner(&mut inner, captures, child_mult);
-            }
-            TokenTree::Punct(p) if p.as_char() == '@' => {
-                // `@@name` marks the capture as raw (skip auto-translate).
-                let raw = matches!(
-                    tokens.peek(),
-                    Some(TokenTree::Punct(p)) if p.as_char() == '@'
-                );
-                if raw {
-                    tokens.next(); // consume the second `@`
-                }
-                if let Some(TokenTree::Ident(name)) = tokens.next() {
-                    let mult = if parent_mult == CaptureMultiplicity::Repeated
-                        || last_mult == CaptureMultiplicity::Repeated
-                    {
-                        CaptureMultiplicity::Repeated
-                    } else if parent_mult == CaptureMultiplicity::Optional
-                        || last_mult == CaptureMultiplicity::Optional
-                    {
-                        CaptureMultiplicity::Optional
-                    } else {
-                        CaptureMultiplicity::Single
-                    };
-                    captures.push(CaptureInfo {
-                        name: name.to_string(),
-                        multiplicity: mult,
-                        raw,
-                    });
-                }
-                last_mult = CaptureMultiplicity::Single;
-            }
-            TokenTree::Punct(p) if p.as_char() == '*' || p.as_char() == '+' => {
-                last_mult = CaptureMultiplicity::Repeated;
-            }
-            TokenTree::Punct(p) if p.as_char() == '?' => {
-                last_mult = CaptureMultiplicity::Optional;
-            }
-            _ => {
-                last_mult = CaptureMultiplicity::Single;
-            }
-        }
-    }
-}
-
-/// A rule's return-type annotation, when the body is a Rust block. Written
-/// between `=>` and the block body using the schema's own vocabulary:
-///
-/// ```text
-///   => kind        { … }   // single node of that kind
-///   => kind?       { … }   // Option<KindId> (0 or 1)
-///   => kind*       { … }   // Vec<KindId>    (0+)
-/// ```
-///
-/// Template bodies (`=> (kind …)`) never carry an annotation — the
-/// output kind is the template root. The shorthand `=> kind` (no
-/// body) also carries no annotation. See `parse_rule_top` for dispatch.
-#[derive(Clone, Debug)]
-struct ReturnAnnotation {
-    kind: Ident,
-    multiplicity: AnnotationMultiplicity,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-enum AnnotationMultiplicity {
-    Single,
-    Optional,
-    Repeated,
+pub fn parse_tree_top(input: TokenStream) -> Result<TokenStream> {
+    let template = crate::template_parse::parse_template(input)?;
+    let template = template.lower_root();
+    Ok(quote!({ #template }))
 }
 
-/// Peek at the token stream to decide whether the transform following
-/// `=>` is a **new** annotation form (`kind [? | *] { … }`). If so,
-/// consume the annotation and return it, leaving the `{ … }` body in
-/// the stream for the caller to parse. Otherwise leave the stream
-/// untouched and return `None`.
-///
-/// The lookahead distinguishes:
-///   `kind {`   → annotation (single)
-///   `kind? {`  → annotation (optional)
-///   `kind* {`  → annotation (repeated)
-///   `kind`     → shorthand form (no `{` follows) — NOT an annotation
-///   anything else → template or bare block — NOT an annotation
-fn try_consume_return_annotation(tokens: &mut Tokens) -> Result<Option<ReturnAnnotation>> {
-    // Must start with an identifier (the kind name).
-    let mut lookahead = tokens.clone();
-    let Some(TokenTree::Ident(_)) = lookahead.next() else {
-        return Ok(None);
-    };
-    // Then optionally `?` or `*`, then a `{` group.
-    let after_suffix = match lookahead.peek() {
-        Some(TokenTree::Punct(p)) if p.as_char() == '?' || p.as_char() == '*' => {
-            lookahead.next();
-            lookahead.peek()
-        }
-        other => other,
-    };
-    if !matches!(after_suffix, Some(TokenTree::Group(g)) if g.delimiter() == Delimiter::Brace) {
-        return Ok(None);
-    }
-    // Commit: consume the ident + suffix from the real stream.
-    let kind = expect_ident(tokens, "expected output-kind name in annotation")?;
-    let multiplicity = match tokens.peek() {
-        Some(TokenTree::Punct(p)) if p.as_char() == '?' => {
-            tokens.next();
-            AnnotationMultiplicity::Optional
-        }
-        Some(TokenTree::Punct(p)) if p.as_char() == '*' => {
-            tokens.next();
-            AnnotationMultiplicity::Repeated
-        }
-        _ => AnnotationMultiplicity::Single,
-    };
-    Ok(Some(ReturnAnnotation { kind, multiplicity }))
+pub fn parse_trees_top(input: TokenStream) -> Result<TokenStream> {
+    let templates = crate::template_parse::parse_templates(input)?;
+    Ok(crate::ast::Template::lower_list(&templates))
 }
 
-/// Parse `rule!( query => transform )`.
 pub fn parse_rule_top(input: TokenStream) -> Result<TokenStream> {
-    let mut tokens = input.into_iter().peekable();
-
-    // Collect query tokens up to `=>`
-    let mut query_tokens = Vec::new();
-    loop {
-        match tokens.peek() {
-            None => return Err(syn::Error::new(Span::call_site(), "expected `=>` in rule!")),
-            Some(TokenTree::Punct(p)) if p.as_char() == '=' => {
-                let eq = tokens.next().unwrap();
-                match tokens.peek() {
-                    Some(TokenTree::Punct(p)) if p.as_char() == '>' => {
-                        tokens.next(); // consume >
-                        break;
-                    }
-                    _ => {
-                        query_tokens.push(eq);
-                        continue;
-                    }
-                }
-            }
-            _ => {
-                query_tokens.push(tokens.next().unwrap());
-            }
-        }
-    }
-
-    let query_stream: TokenStream = query_tokens.into_iter().collect();
-
-    // Extract captures from query
-    let captures = extract_captures(&query_stream);
-
-    // Parse query
-    let query_code = parse_query_top(query_stream.clone())?;
-
-    // Capture names marked `@@name` (raw) — passed to the auto-translate
-    // prefix as a skip list so those captures keep their input-schema ids.
-    let raw_capture_names: Vec<&str> = captures
-        .iter()
-        .filter(|c| c.raw)
-        .map(|c| c.name.as_str())
-        .collect();
-
-    // Generate capture bindings
-    let ctx_ident = Ident::new(IMPLICIT_CTX, Span::call_site());
-    let bindings: Vec<TokenStream> = captures
-        .iter()
-        .map(|cap| {
-            let name = Ident::new(&cap.name, Span::call_site());
-            let name_str = &cap.name;
-            match cap.multiplicity {
-                CaptureMultiplicity::Repeated => {
-                    quote! {
-                        let #name: Vec<yeast::Id> = __captures.get_all(#name_str);
-                    }
-                }
-                CaptureMultiplicity::Optional => {
-                    quote! {
-                        let #name: Option<yeast::Id> = __captures.get_opt(#name_str);
-                    }
-                }
-                CaptureMultiplicity::Single => {
-                    quote! {
-                        let #name: yeast::Id = __captures.get_var(#name_str).unwrap();
-                    }
-                }
-            }
-        })
-        .collect();
-
-    // Parse transform: the token(s) after `=>` fall into one of three
-    // shapes, dispatched in order:
-    //
-    //   1. `kind [? | *] { rust_body }` — annotated Rust body (NEW).
-    //      Static-analysis-ready: the annotation declares the output
-    //      kind and multiplicity in the schema's own vocabulary.
-    //   2. `kind` alone — shorthand: emit `(kind field: {@cap})…` from
-    //      the query's captures.
-    //   3. anything else — full template form (`(kind …)` or bare
-    //      `{ … }` splice via `parse_direct_list`).
-    let annotation = try_consume_return_annotation(&mut tokens)?;
-
-    let transform_body = if let Some(annotation) = annotation {
-        // Annotation form: `=> kind [? | *] { rust_body }`.
-        let body_group = expect_group(&mut tokens, Delimiter::Brace)?;
-        if let Some(tok) = tokens.next() {
-            return Err(syn::Error::new_spanned(
-                tok,
-                "unexpected token after annotated rule body",
-            ));
-        }
-        let body = body_group.stream();
-        // The annotation is not yet consumed by codegen — it will drive
-        // typed handles once the schema-driven codegen lands. For now,
-        // emit a self-documenting reference to the annotated kind and
-        // preserve today's `Vec<yeast::Id>` closure return so behavior
-        // is unchanged.
-        let kind_str = annotation.kind.to_string();
-        let mult_str = match annotation.multiplicity {
-            AnnotationMultiplicity::Single => "single",
-            AnnotationMultiplicity::Optional => "optional",
-            AnnotationMultiplicity::Repeated => "repeated",
-        };
-        let _ = (kind_str, mult_str); // silence unused warnings until wired
-
-        // For now, adapt the user's typed return value to the framework's
-        // `Vec<yeast::Id>` closure result. This uses `IntoFieldIds`, which
-        // already accepts a bare `Id`, an iterable of ids, or `Option<Id>`
-        // — matching the three annotation multiplicities.
-        quote! {
-            let __value = { #body };
-            let mut __ids: Vec<yeast::Id> = Vec::new();
-            yeast::IntoFieldIds::extend_into(__value, &mut __ids);
-            __ids
-        }
-    } else if peek_is_field(&mut tokens) && {
-        // Shorthand form: bare identifier = output node kind.
-        // Auto-generate template from captures.
-        let mut lookahead = tokens.clone();
-        lookahead.next(); // skip ident
-        lookahead.peek().is_none() // nothing after = shorthand
-    } {
-        let output_kind = expect_ident(&mut tokens, "expected output node kind")?;
-        let output_kind_str = output_kind.to_string();
-
-        // Generate field assignments from captures
-        let field_stmts: Vec<TokenStream> = captures
-            .iter()
-            .map(|cap| {
-                let name = Ident::new(&cap.name, Span::call_site());
-                let name_str = &cap.name;
-                match cap.multiplicity {
-                    CaptureMultiplicity::Repeated => quote! {
-                        let __field_id = #ctx_ident.ast.field_id_for_name(#name_str)
-                            .unwrap_or_else(|| panic!("field '{}' not found", #name_str));
-                        __fields.insert(
-                            __field_id,
-                            #name.into_iter()
-                                .map(::std::convert::Into::<yeast::Id>::into)
-                                .collect(),
-                        );
-                    },
-                    CaptureMultiplicity::Optional => quote! {
-                        let __field_id = #ctx_ident.ast.field_id_for_name(#name_str)
-                            .unwrap_or_else(|| panic!("field '{}' not found", #name_str));
-                        if let Some(__id) = #name {
-                            __fields.entry(__field_id).or_insert_with(Vec::new)
-                                .push(::std::convert::Into::<yeast::Id>::into(__id));
-                        }
-                    },
-                    CaptureMultiplicity::Single => quote! {
-                        let __field_id = #ctx_ident.ast.field_id_for_name(#name_str)
-                            .unwrap_or_else(|| panic!("field '{}' not found", #name_str));
-                        __fields.entry(__field_id).or_insert_with(Vec::new)
-                            .push(::std::convert::Into::<yeast::Id>::into(#name));
-                    },
-                }
-            })
-            .collect();
-
-        quote! {
-            let __kind = #ctx_ident.ast.id_for_node_kind(#output_kind_str)
-                .unwrap_or_else(|| panic!("node kind '{}' not found", #output_kind_str));
-            let mut __fields = std::collections::BTreeMap::new();
-            #(#field_stmts)*
-            let __id = #ctx_ident.ast.create_node_with_range(
-                __kind,
-                yeast::NodeContent::DynamicString(String::new()),
-                __fields,
-                true,
-                __source_range,
-            );
-            vec![__id]
-        }
-    } else {
-        // Reject bare `{ ... }` transforms — they used to be accepted
-        // as either a Rust body producing a `Vec<Id>` or a template
-        // consisting of a single `{cap}` splice. Both patterns lost
-        // static-analysis information (no visible output kind), so we
-        // now require rules with block bodies to use the annotation
-        // form `=> kind [? | *] { ... }`. Templates must start with a
-        // parenthesized node (e.g. `(if_expr ...)`).
-        if let Some(TokenTree::Group(g)) = tokens.peek() {
-            if g.delimiter() == Delimiter::Brace {
-                let span = g.span();
-                return Err(syn::Error::new(
-                    span,
-                    "bare `{...}` rule bodies are no longer accepted; \
-                     use the annotation form `=> kind [? | *] { ... }` \
-                     (where the kind names the output node's schema kind, \
-                     optionally suffixed with `?` or `*` for multiplicity)",
-                ));
-            }
-        }
-
-        // Full template form
-        let transform_items = parse_direct_list(&mut tokens, &ctx_ident)?;
-
-        if let Some(tok) = tokens.next() {
-            return Err(syn::Error::new_spanned(
-                tok,
-                "unexpected token after rule! transform",
-            ));
-        }
-
-        quote! {
-            let mut __nodes: Vec<yeast::Id> = Vec::new();
-            #(#transform_items)*
-            __nodes
-        }
-    };
-
-    Ok(quote! {
-        {
-            let __query = #query_code;
-            yeast::Rule::new(__query, Box::new(|__ast: &mut yeast::Ast, mut __captures: yeast::captures::Captures, __fresh: &yeast::tree_builder::FreshScope, __source_range: Option<yeast::Range>, __user_ctx: &mut _, __translator: yeast::TranslatorHandle<'_, _>| {
-                // Auto-translation prefix: recursively translate every
-                // captured node before invoking the user's transform body,
-                // except for `@@name` captures listed in `__skip` which the
-                // body consumes raw.
-                // For OneShot rules this preserves the legacy behaviour
-                // (input-schema captures translated to output-schema
-                // nodes); for Repeating rules it is a no-op.
-                let __skip: &[&str] = &[#(#raw_capture_names),*];
-                __translator.auto_translate_captures(&mut __captures, __ast, __user_ctx, __skip)?;
-                #(#bindings)*
-                let mut #ctx_ident = yeast::build::BuildCtx::with_translator(__ast, &__captures, __fresh, __source_range, __user_ctx, __translator);
-                let __result: Vec<yeast::Id> = { #transform_body };
-                Ok(__result)
-            }))
-        }
-    })
-}
-
-// ---------------------------------------------------------------------------
-// Token utilities
-// ---------------------------------------------------------------------------
-
-fn peek_is_at(tokens: &mut Tokens) -> bool {
-    matches!(tokens.peek(), Some(TokenTree::Punct(p)) if p.as_char() == '@')
-}
-
-/// Consume an `@` or `@@` capture marker and the following name ident.
-/// Caller has already verified `peek_is_at(tokens)`.
-fn consume_capture_marker(tokens: &mut Tokens) -> Result<Ident> {
-    tokens.next(); // consume the first `@`
-    if peek_is_at(tokens) {
-        tokens.next(); // consume the second `@` of `@@`
-    }
-    expect_ident(tokens, "expected capture name after `@` or `@@`")
-}
-
-fn peek_is_literal(tokens: &mut Tokens) -> bool {
-    matches!(tokens.peek(), Some(TokenTree::Literal(_)))
-}
-
-fn peek_is_dollar(tokens: &mut Tokens) -> bool {
-    matches!(tokens.peek(), Some(TokenTree::Punct(p)) if p.as_char() == '$')
-}
-
-fn peek_is_hash(tokens: &mut Tokens) -> bool {
-    matches!(tokens.peek(), Some(TokenTree::Punct(p)) if p.as_char() == '#')
-}
-
-fn peek_is_underscore(tokens: &mut Tokens) -> bool {
-    matches!(tokens.peek(), Some(TokenTree::Ident(id)) if *id == "_")
-}
-
-/// Check if the next tokens form a field specification (ident followed by `:` or `*:`).
-/// A bare identifier (other than `_`) at this position is always a field name, since
-/// bare child patterns must start with `(`, `@`, `"literal"`, or `_`.
-fn peek_is_field(tokens: &mut Tokens) -> bool {
-    matches!(tokens.peek(), Some(TokenTree::Ident(id)) if *id != "_")
-}
-
-fn peek_is_group(tokens: &mut Tokens, delim: Delimiter) -> bool {
-    matches!(tokens.peek(), Some(TokenTree::Group(g)) if g.delimiter() == delim)
-}
-
-fn peek_is_punct(tokens: &mut Tokens, ch: char) -> bool {
-    matches!(tokens.peek(), Some(TokenTree::Punct(p)) if p.as_char() == ch)
-}
-
-fn peek_is_repetition(tokens: &mut Tokens) -> bool {
-    matches!(tokens.peek(), Some(TokenTree::Punct(p)) if matches!(p.as_char(), '*' | '+' | '?'))
-}
-
-fn expect_ident(tokens: &mut Tokens, msg: &str) -> Result<Ident> {
-    match tokens.next() {
-        Some(TokenTree::Ident(id)) => Ok(id),
-        Some(tok) => Err(syn::Error::new_spanned(tok, msg)),
-        None => Err(syn::Error::new(Span::call_site(), msg)),
-    }
-}
-
-fn expect_literal(tokens: &mut Tokens) -> Result<Literal> {
-    match tokens.next() {
-        Some(TokenTree::Literal(lit)) => Ok(lit),
-        Some(tok) => Err(syn::Error::new_spanned(tok, "expected string literal")),
-        None => Err(syn::Error::new(
-            Span::call_site(),
-            "expected string literal",
-        )),
-    }
-}
-
-fn expect_punct(tokens: &mut Tokens, ch: char, msg: &str) -> Result<()> {
-    match tokens.next() {
-        Some(TokenTree::Punct(p)) if p.as_char() == ch => Ok(()),
-        Some(tok) => Err(syn::Error::new_spanned(tok, msg)),
-        None => Err(syn::Error::new(Span::call_site(), msg)),
-    }
+    Ok(crate::rule_parse::parse_rule(input)?.lower())
 }
 
-fn expect_group(tokens: &mut Tokens, delim: Delimiter) -> Result<proc_macro2::Group> {
-    match tokens.next() {
-        Some(TokenTree::Group(g)) if g.delimiter() == delim => Ok(g),
-        Some(tok) => Err(syn::Error::new_spanned(
-            tok,
-            format!("expected {delim:?} group"),
-        )),
-        None => Err(syn::Error::new(
-            Span::call_site(),
-            format!("expected {delim:?} group"),
-        )),
-    }
-}
-
-fn expect_repetition(tokens: &mut Tokens) -> Result<TokenStream> {
-    match tokens.next() {
-        Some(TokenTree::Punct(p)) => match p.as_char() {
-            '*' => Ok(quote! { yeast::query::Rep::ZeroOrMore }),
-            '+' => Ok(quote! { yeast::query::Rep::OneOrMore }),
-            '?' => Ok(quote! { yeast::query::Rep::ZeroOrOne }),
-            _ => Err(syn::Error::new(p.span(), "expected `*`, `+`, or `?`")),
-        },
-        Some(tok) => Err(syn::Error::new_spanned(
-            tok,
-            "expected repetition quantifier",
-        )),
-        None => Err(syn::Error::new(
-            Span::call_site(),
-            "expected repetition quantifier",
-        )),
-    }
-}
-
-// ---------------------------------------------------------------------------
-// rules! parsing — bundle a list of rules with input/output schema paths.
-//
-// The macro accepts both bare rule bodies (`(query) => (template)`) and
-// explicit `rule!(...)` invocations. The schema paths are recorded but
-// not yet consumed; a later change layers compile-time type-checking on
-// top, using these paths to load the input/output schemas.
-// ---------------------------------------------------------------------------
-
-/// Parse `rules! { input: "path", output: "path", [ items, ... ] }`.
-///
-/// Each item in the bracketed list can be:
-/// * a **bare rule body** `(query) => (template)` — wrapped implicitly
-///   in `yeast::rule! { ... }` for codegen;
-/// * an explicit `rule!(...)` (or `rule!(...).repeated()`,
-///   `yeast::rule!(...)`, etc.) — passed through verbatim;
-/// * any other expression returning a `Rule` (helper-function calls,
-///   conditionals) — passed through verbatim.
-///
-/// Returns a `Vec<Rule>` containing the items in order. The expansion
-/// also emits `include_str!` references to the resolved schema paths so
-/// Cargo treats them as inputs to the consuming crate; this validates
-/// path existence at compile time and prepares the ground for later
-/// schema-aware checks.
 pub fn parse_rules_top(input: TokenStream) -> Result<TokenStream> {
     let mut tokens = input.into_iter().peekable();
-
     let input_path = parse_named_string_arg(&mut tokens, "input")?;
     expect_punct(&mut tokens, ',', "expected `,` after input path")?;
     let output_path = parse_named_string_arg(&mut tokens, "output")?;
     expect_punct(&mut tokens, ',', "expected `,` after output path")?;
 
-    // Resolve paths relative to the consuming crate's CARGO_MANIFEST_DIR
-    // so callers can write paths like "tree-sitter-swift/node-types.yml"
-    // alongside their other workspace-relative includes (e.g. include_str!).
     let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").map_err(|_| {
         syn::Error::new(
             Span::call_site(),
@@ -1192,51 +42,63 @@ pub fn parse_rules_top(input: TokenStream) -> Result<TokenStream> {
         )
     })?;
     let resolve_path = |raw: &str| -> std::path::PathBuf {
-        let p = std::path::PathBuf::from(raw);
-        if p.is_absolute() {
-            p
+        let path = std::path::PathBuf::from(raw);
+        if path.is_absolute() {
+            path
         } else {
-            std::path::PathBuf::from(&manifest_dir).join(p)
+            std::path::PathBuf::from(&manifest_dir).join(path)
         }
     };
     let input_abs = resolve_path(&input_path.value);
     let output_abs = resolve_path(&output_path.value);
-
-    let list = expect_group(&mut tokens, Delimiter::Bracket)?;
-    if let Some(tok) = tokens.next() {
+    let output_yaml = std::fs::read_to_string(&output_abs).map_err(|error| {
+        syn::Error::new(
+            output_path.literal_span,
+            format!(
+                "rules!: failed to read output schema `{}`: {error}",
+                output_abs.display()
+            ),
+        )
+    })?;
+    let output_leaf_kinds = yeast_schema::node_types_yaml::leaf_kinds_from_yaml(&output_yaml)
+        .map_err(|error| {
+            syn::Error::new(
+                output_path.literal_span,
+                format!(
+                    "rules!: failed to parse output schema `{}`: {error}",
+                    output_abs.display()
+                ),
+            )
+        })?;
+
+    let list = expect_group(&mut tokens, proc_macro2::Delimiter::Bracket)?;
+    if let Some(token) = tokens.next() {
         return Err(syn::Error::new_spanned(
-            tok,
+            token,
             "unexpected token after `rules!` list",
         ));
     }
 
-    let items = split_top_level_commas(list.stream());
-    let emitted_items: Vec<TokenStream> = items
+    let emitted_items = split_top_level_commas(list.stream())
         .into_iter()
         .map(|item| {
-            // Bare rule body — wrap in `yeast::rule! { ... }` so the
-            // existing rule-construction macro handles codegen. Other
-            // items pass through unchanged.
-            if has_top_level_arrow(&item) {
-                quote! { yeast::rule! { #item } }
+            let rule_body = if has_top_level_arrow(&item) {
+                Some(item.clone())
             } else {
-                item
+                explicit_rule_body(&item)
+            };
+            if let Some(rule_body) = rule_body {
+                let mut rule = crate::rule_parse::parse_rule(rule_body)?;
+                rule.resolve_bare_leaf_content(&output_leaf_kinds)?;
+                Ok(rule.lower())
+            } else {
+                Ok(item)
             }
         })
-        .collect();
-
-    // Emit `include_str!` references to both schema files so Cargo
-    // treats them as inputs to the consuming crate's compilation. The
-    // `const _` bindings are unused; rustc/LLVM drop them after the
-    // file-input dependency edge is recorded. Absolute paths are used
-    // because `include_str!` resolves relative paths against the source
-    // file, while `rules!`'s own paths are relative to
-    // `CARGO_MANIFEST_DIR`.
-    let input_abs_str = input_abs.to_string_lossy().into_owned();
-    let output_abs_str = output_abs.to_string_lossy().into_owned();
-    let input_lit = proc_macro2::Literal::string(&input_abs_str);
-    let output_lit = proc_macro2::Literal::string(&output_abs_str);
+        .collect::<Result<Vec<_>>>()?;
 
+    let input_lit = proc_macro2::Literal::string(&input_abs.to_string_lossy());
+    let output_lit = proc_macro2::Literal::string(&output_abs.to_string_lossy());
     Ok(quote! {
         {
             const _: &::core::primitive::str = ::core::include_str!(#input_lit);
@@ -1246,39 +108,15 @@ pub fn parse_rules_top(input: TokenStream) -> Result<TokenStream> {
     })
 }
 
-/// True iff `item` contains a `=>` operator at the top level (not nested
-/// inside any group). Used to detect bare rule bodies inside `rules!`.
-fn has_top_level_arrow(item: &TokenStream) -> bool {
-    let toks: Vec<TokenTree> = item.clone().into_iter().collect();
-    find_top_level_arrow(&toks).is_some()
-}
-
-/// Find the index of the first token of a top-level `=>` operator (the
-/// `=`), ignoring `=>` inside any group. Returns `None` if not present.
-fn find_top_level_arrow(toks: &[TokenTree]) -> Option<usize> {
-    let mut i = 0;
-    while i + 1 < toks.len() {
-        if let (TokenTree::Punct(p1), TokenTree::Punct(p2)) = (&toks[i], &toks[i + 1]) {
-            if p1.as_char() == '='
-                && p1.spacing() == proc_macro2::Spacing::Joint
-                && p2.as_char() == '>'
-            {
-                return Some(i);
-            }
-        }
-        i += 1;
-    }
-    None
-}
-
-/// A string literal argument named `expected_name` parsed from `name: "value"`.
 struct NamedString {
     value: String,
-    #[allow(dead_code)]
-    span: Span,
+    literal_span: Span,
 }
 
-fn parse_named_string_arg(tokens: &mut Tokens, expected_name: &str) -> Result<NamedString> {
+fn parse_named_string_arg(
+    tokens: &mut std::iter::Peekable<proc_macro2::token_stream::IntoIter>,
+    expected_name: &str,
+) -> Result<NamedString> {
     let name = expect_ident(tokens, &format!("expected `{expected_name}:` argument"))?;
     if name != expected_name {
         return Err(syn::Error::new_spanned(
@@ -1291,41 +129,39 @@ fn parse_named_string_arg(tokens: &mut Tokens, expected_name: &str) -> Result<Na
         ':',
         &format!("expected `:` after `{expected_name}`"),
     )?;
-    let lit = expect_literal(tokens)?;
-    let span = lit.span();
-    let value = string_literal_value(&lit).ok_or_else(|| {
+    let literal = expect_literal(tokens)?;
+    let value = string_literal_value(&literal).ok_or_else(|| {
         syn::Error::new(
-            span,
+            literal.span(),
             format!("`{expected_name}` must be a string literal path"),
         )
     })?;
-    Ok(NamedString { value, span })
+    Ok(NamedString {
+        value,
+        literal_span: literal.span(),
+    })
 }
 
-/// Read a literal as a plain Rust string, respecting Rust's own escape
-/// rules (via `syn::LitStr`). Falls back to `None` if the literal
-/// isn't a string.
-fn string_literal_value(lit: &Literal) -> Option<String> {
-    let tokens = TokenStream::from(TokenTree::Literal(lit.clone()));
-    syn::parse2::<syn::LitStr>(tokens).ok().map(|s| s.value())
+fn string_literal_value(literal: &proc_macro2::Literal) -> Option<String> {
+    syn::parse2::<syn::LitStr>(TokenStream::from(TokenTree::Literal(literal.clone())))
+        .ok()
+        .map(|literal| literal.value())
 }
 
-/// Split a token stream into top-level comma-separated items. Commas inside
-/// any group token (parens, brackets, braces) are ignored so that things
-/// like `rule!(a, b)` aren't accidentally split.
 fn split_top_level_commas(stream: TokenStream) -> Vec<TokenStream> {
     let mut items = Vec::new();
-    let mut current: Vec<TokenTree> = Vec::new();
-    for tt in stream {
-        if let TokenTree::Punct(p) = &tt {
-            if p.as_char() == ',' && p.spacing() == proc_macro2::Spacing::Alone {
-                if !current.is_empty() {
-                    items.push(current.drain(..).collect());
-                }
-                continue;
+    let mut current = Vec::new();
+    for token in stream {
+        if matches!(&token, TokenTree::Punct(punctuation)
+            if punctuation.as_char() == ','
+                && punctuation.spacing() == proc_macro2::Spacing::Alone)
+        {
+            if !current.is_empty() {
+                items.push(current.drain(..).collect());
             }
+        } else {
+            current.push(token);
         }
-        current.push(tt);
     }
     if !current.is_empty() {
         items.push(current.into_iter().collect());
@@ -1333,106 +169,96 @@ fn split_top_level_commas(stream: TokenStream) -> Vec<TokenStream> {
     items
 }
 
-fn maybe_wrap_capture(tokens: &mut Tokens, base: TokenStream) -> Result<TokenStream> {
-    if peek_is_at(tokens) {
-        let name = consume_capture_marker(tokens)?;
-        let name_str = name.to_string();
-        Ok(quote! {
-            yeast::query::QueryNode::Capture {
-                capture: #name_str,
-                node: Box::new(#base),
-            }
-        })
-    } else {
-        Ok(base)
+fn has_top_level_arrow(stream: &TokenStream) -> bool {
+    let tokens = stream.clone().into_iter().collect::<Vec<_>>();
+    tokens.windows(2).any(|window| {
+        matches!(
+            window,
+            [TokenTree::Punct(first), TokenTree::Punct(second)]
+                if first.as_char() == '='
+                    && first.spacing() == proc_macro2::Spacing::Joint
+                    && second.as_char() == '>'
+        )
+    })
+}
+
+fn explicit_rule_body(stream: &TokenStream) -> Option<TokenStream> {
+    let expression = syn::parse2::<syn::ExprMacro>(stream.clone()).ok()?;
+    let is_rule = expression
+        .mac
+        .path
+        .segments
+        .last()
+        .is_some_and(|segment| segment.ident == "rule");
+    is_rule.then_some(expression.mac.tokens)
+}
+
+type Tokens = std::iter::Peekable<proc_macro2::token_stream::IntoIter>;
+
+fn expect_ident(tokens: &mut Tokens, message: &str) -> Result<syn::Ident> {
+    match tokens.next() {
+        Some(TokenTree::Ident(identifier)) => Ok(identifier),
+        Some(token) => Err(syn::Error::new_spanned(token, message)),
+        None => Err(syn::Error::new(Span::call_site(), message)),
     }
 }
 
-fn maybe_wrap_repetition(tokens: &mut Tokens, single: TokenStream) -> Result<TokenStream> {
-    if peek_is_repetition(tokens) {
-        let rep = expect_repetition(tokens)?;
-        Ok(quote! {
-            yeast::query::QueryListElem::Repeated {
-                children: vec![#single],
-                rep: #rep,
-            }
-        })
-    } else {
-        Ok(single)
+fn expect_literal(tokens: &mut Tokens) -> Result<proc_macro2::Literal> {
+    match tokens.next() {
+        Some(TokenTree::Literal(literal)) => Ok(literal),
+        Some(token) => Err(syn::Error::new_spanned(token, "expected string literal")),
+        None => Err(syn::Error::new(
+            Span::call_site(),
+            "expected string literal",
+        )),
     }
 }
 
-/// If `@name` (or `@@name`) follows a Repeated list element, wrap each
-/// child SingleNode inside the repetition with a Capture. This matches
-/// tree-sitter semantics where `(_)* @name` captures each matched node.
-fn maybe_wrap_list_capture(tokens: &mut Tokens, elem: TokenStream) -> Result<TokenStream> {
-    if peek_is_at(tokens) {
-        let name = consume_capture_marker(tokens)?;
-        let name_str = name.to_string();
-        // Re-parse the element isn't practical, so we generate a wrapper
-        // that creates a new Repeated with each child wrapped in a capture.
-        // The simplest approach: generate code that the runtime can interpret.
-        // Actually, the capture annotation on repeated elements is best handled
-        // by re-generating the Repeated with captures injected.
-        // For now, assume the common case: the repetition contains a single
-        // SingleNode child, and we wrap that node in a capture.
-        Ok(quote! {
-            {
-                let __rep = #elem;
-                match __rep {
-                    yeast::query::QueryListElem::Repeated { children, rep } => {
-                        yeast::query::QueryListElem::Repeated {
-                            children: children.into_iter().map(|child| {
-                                match child {
-                                    yeast::query::QueryListElem::SingleNode(node) => {
-                                        yeast::query::QueryListElem::SingleNode(
-                                            yeast::query::QueryNode::Capture {
-                                                capture: #name_str,
-                                                node: Box::new(node),
-                                            }
-                                        )
-                                    }
-                                    other => other,
-                                }
-                            }).collect(),
-                            rep,
-                        }
-                    }
-                    other => other,
-                }
-            }
-        })
-    } else {
-        Ok(elem)
+fn expect_punct(tokens: &mut Tokens, expected: char, message: &str) -> Result<()> {
+    match tokens.next() {
+        Some(TokenTree::Punct(punctuation)) if punctuation.as_char() == expected => Ok(()),
+        Some(token) => Err(syn::Error::new_spanned(token, message)),
+        None => Err(syn::Error::new(Span::call_site(), message)),
+    }
+}
+
+fn expect_group(
+    tokens: &mut Tokens,
+    delimiter: proc_macro2::Delimiter,
+) -> Result<proc_macro2::Group> {
+    match tokens.next() {
+        Some(TokenTree::Group(group)) if group.delimiter() == delimiter => Ok(group),
+        Some(token) => Err(syn::Error::new_spanned(
+            token,
+            format!("expected {delimiter:?} group"),
+        )),
+        None => Err(syn::Error::new(
+            Span::call_site(),
+            format!("expected {delimiter:?} group"),
+        )),
     }
 }
 
-// ---------------------------------------------------------------------------
-// Internal unit tests for the rules! macro shape. Type-checking tests
-// land in the follow-up that wires schema validation in.
-// ---------------------------------------------------------------------------
 #[cfg(test)]
-mod rules_tests {
+mod tests {
     use super::*;
     use quote::quote;
 
     #[test]
-    fn has_top_level_arrow_distinguishes_bare_rules() {
-        // Bare rule body: top-level `=>` is present.
-        let toks = quote! { (a) => (b) };
-        assert!(has_top_level_arrow(&toks));
-        // `rule!((a) => (b))`: the `=>` is INSIDE the macro group, so
-        // it's not at top level. Must NOT be detected as a bare body.
-        let toks = quote! { rule!((a) => (b)) };
-        assert!(!has_top_level_arrow(&toks));
-        // Helper call: no `=>` anywhere.
-        let toks = quote! { make_rule() };
-        assert!(!has_top_level_arrow(&toks));
-        // Match expressions inside a block: `=>` is inside braces.
-        let toks = quote! { { match x { 1 => 2, _ => 3 } } };
-        assert!(!has_top_level_arrow(&toks));
-        // Bare shorthand form: top-level `=>` followed by a bare ident.
-        let toks = quote! { (a) => kind };
-        assert!(has_top_level_arrow(&toks));
+    fn recognizes_only_top_level_arrows() {
+        assert!(has_top_level_arrow(&quote! { (a) => (b) }));
+        assert!(!has_top_level_arrow(&quote! { rule!((a) => (b)) }));
+        assert!(!has_top_level_arrow(&quote! { make_rule() }));
+        assert!(!has_top_level_arrow(
+            &quote! { { match x { 1 => 2, _ => 3 } } }
+        ));
+    }
+
+    #[test]
+    fn recognizes_explicit_rule_macros() {
+        assert!(explicit_rule_body(&quote! { rule!((a) => (b)) }).is_some());
+        assert!(explicit_rule_body(&quote! { yeast::rule!((a) => (b)) }).is_some());
+        assert!(explicit_rule_body(&quote! { other!((a) => (b)) }).is_none());
+        assert!(explicit_rule_body(&quote! { make_rule() }).is_none());
     }
 }
diff --git a/shared/yeast-macros/src/rule_parse.rs b/shared/yeast-macros/src/rule_parse.rs
new file mode 100644
index 000000000000..7339a431134b
--- /dev/null
+++ b/shared/yeast-macros/src/rule_parse.rs
@@ -0,0 +1,739 @@
+use proc_macro2::{Delimiter, Ident, Span, TokenStream, TokenTree};
+use std::collections::BTreeSet;
+use std::iter::Peekable;
+
+use crate::ast::{Cardinality, Pattern, Replacement, ReturnAnnotation, Rule};
+
+type Tokens = Peekable<proc_macro2::token_stream::IntoIter>;
+type Result<T> = std::result::Result<T, syn::Error>;
+
+pub(crate) fn parse_pattern(input: TokenStream) -> Result<Pattern> {
+    let mut tokens = input.into_iter().peekable();
+    let pattern = parse_pattern_with_capture(&mut tokens)?;
+    if let Some(token) = tokens.next() {
+        return Err(syn::Error::new_spanned(
+            token,
+            "unexpected token after query",
+        ));
+    }
+    validate_unique_capture_names(&pattern, &mut BTreeSet::new())?;
+    Ok(pattern)
+}
+
+fn validate_unique_capture_names(
+    pattern: &Pattern,
+    capture_names: &mut BTreeSet<String>,
+) -> Result<()> {
+    match pattern {
+        Pattern::Any { .. } | Pattern::Unnamed(_) => {}
+        Pattern::Node { fields, .. } => {
+            for (_, pattern) in fields {
+                validate_unique_capture_names(pattern, capture_names)?;
+            }
+        }
+        Pattern::Capture { name, pattern, .. } => {
+            validate_unique_capture_names(pattern, capture_names)?;
+            let name_string = name.to_string();
+            if !capture_names.insert(name_string.clone()) {
+                return Err(syn::Error::new_spanned(
+                    name,
+                    format!(
+                        "capture `{name_string}` is used more than once; \
+                         use a distinct name for each capture site"
+                    ),
+                ));
+            }
+        }
+        Pattern::Sequence(patterns) => {
+            for pattern in patterns {
+                validate_unique_capture_names(pattern, capture_names)?;
+            }
+        }
+        Pattern::Repeated { pattern, .. } => {
+            validate_unique_capture_names(pattern, capture_names)?;
+        }
+    }
+    Ok(())
+}
+
+pub(crate) fn parse_rule(input: TokenStream) -> Result<Rule> {
+    let (pattern_and_guard, replacement) = split_arrow(input)?;
+    let (pattern, guard) = split_guard(pattern_and_guard)?;
+    let pattern = parse_pattern(pattern)?;
+    if let Pattern::Capture {
+        name, raw: false, ..
+    } = &pattern
+    {
+        return Err(syn::Error::new_spanned(
+            name,
+            "a capture of the rule root must use `@@`; the matched root cannot be eagerly translated",
+        ));
+    }
+    Ok(Rule {
+        pattern,
+        guard,
+        replacement: parse_replacement(replacement)?,
+    })
+}
+
+fn parse_pattern_with_capture(tokens: &mut Tokens) -> Result<Pattern> {
+    let pattern = parse_pattern_atom(tokens)?;
+    maybe_capture(tokens, pattern, Cardinality::SINGLE)
+}
+
+fn parse_pattern_atom(tokens: &mut Tokens) -> Result<Pattern> {
+    match tokens.peek() {
+        None => Err(syn::Error::new(
+            Span::call_site(),
+            "unexpected end of query",
+        )),
+        Some(TokenTree::Group(group)) if group.delimiter() == Delimiter::Parenthesis => {
+            let group = expect_group(tokens, Delimiter::Parenthesis)?;
+            let mut inner = group.stream().into_iter().peekable();
+            parse_parenthesized_pattern(&mut inner, group.span())
+        }
+        Some(TokenTree::Ident(identifier)) if *identifier == "_" => {
+            tokens.next();
+            Ok(Pattern::Any {
+                match_unnamed: true,
+            })
+        }
+        Some(TokenTree::Literal(_)) => Ok(Pattern::Unnamed(expect_string_literal(tokens)?)),
+        Some(token) => Err(syn::Error::new_spanned(
+            token.clone(),
+            "expected `(`, `_`, or string literal in query",
+        )),
+    }
+}
+
+fn parse_parenthesized_pattern(tokens: &mut Tokens, span: Span) -> Result<Pattern> {
+    match tokens.peek() {
+        None => Err(syn::Error::new(span, "empty query groups are not allowed")),
+        Some(TokenTree::Ident(identifier)) if *identifier == "_" => {
+            tokens.next();
+            if tokens.peek().is_none() {
+                Ok(Pattern::Any {
+                    match_unnamed: false,
+                })
+            } else {
+                let mut patterns = vec![Pattern::Any {
+                    match_unnamed: true,
+                }];
+                patterns.extend(parse_pattern_list(tokens)?);
+                finish_sequence(tokens, patterns, span)
+            }
+        }
+        Some(TokenTree::Literal(_)) => {
+            let first = Pattern::Unnamed(expect_string_literal(tokens)?);
+            if tokens.peek().is_none() {
+                Ok(first)
+            } else {
+                let mut patterns = vec![first];
+                patterns.extend(parse_pattern_list(tokens)?);
+                finish_sequence(tokens, patterns, span)
+            }
+        }
+        Some(TokenTree::Ident(_)) => {
+            let kind = expect_ident(tokens, "expected node kind")?.to_string();
+            let pattern = Pattern::Node {
+                kind,
+                fields: parse_pattern_fields(tokens)?,
+            };
+            if let Some(token) = tokens.next() {
+                Err(syn::Error::new_spanned(
+                    token,
+                    "unexpected token in query node",
+                ))
+            } else {
+                Ok(pattern)
+            }
+        }
+        Some(TokenTree::Group(group)) if group.delimiter() == Delimiter::Parenthesis => {
+            let patterns = parse_pattern_list(tokens)?;
+            finish_sequence(tokens, patterns, span)
+        }
+        Some(token) => Err(syn::Error::new_spanned(
+            token.clone(),
+            "expected node kind, `_`, or string literal",
+        )),
+    }
+}
+
+fn finish_sequence(tokens: &mut Tokens, patterns: Vec<Pattern>, span: Span) -> Result<Pattern> {
+    if let Some(token) = tokens.next() {
+        return Err(syn::Error::new_spanned(
+            token,
+            "unexpected token in query sequence",
+        ));
+    }
+    match patterns.len() {
+        0 => Err(syn::Error::new(span, "empty query groups are not allowed")),
+        1 => Err(syn::Error::new(
+            span,
+            "single-pattern query groups are not allowed; remove the redundant parentheses",
+        )),
+        _ => Ok(Pattern::Sequence(patterns)),
+    }
+}
+
+fn parse_pattern_fields(tokens: &mut Tokens) -> Result<Vec<(String, Pattern)>> {
+    let mut fields = Vec::new();
+    let mut bare_children = Vec::new();
+
+    while tokens.peek().is_some() {
+        if peek_is_field(tokens) {
+            let name = expect_ident(tokens, "expected field name")?.to_string();
+            expect_punct(tokens, ':', "expected `:` after field name")?;
+            let atom = if peek_is_at(tokens) {
+                Pattern::Any {
+                    match_unnamed: true,
+                }
+            } else {
+                parse_pattern_atom(tokens)?
+            };
+            let pattern = maybe_repeat(tokens, atom)?;
+            push_field_pattern(&mut fields, name, pattern);
+        } else {
+            let patterns = parse_pattern_list(tokens)?;
+            if patterns.is_empty() {
+                break;
+            }
+            bare_children.extend(patterns);
+        }
+    }
+
+    if !bare_children.is_empty() {
+        fields.push(("child".to_string(), Pattern::Sequence(bare_children)));
+    }
+    Ok(fields)
+}
+
+fn push_field_pattern(fields: &mut Vec<(String, Pattern)>, name: String, pattern: Pattern) {
+    if let Some((_, existing)) = fields.iter_mut().find(|(existing, _)| *existing == name) {
+        let Pattern::Sequence(patterns) = existing else {
+            unreachable!("field patterns are always sequences");
+        };
+        patterns.push(pattern);
+    } else {
+        fields.push((name, Pattern::Sequence(vec![pattern])));
+    }
+}
+
+fn parse_pattern_list(tokens: &mut Tokens) -> Result<Vec<Pattern>> {
+    let mut patterns = Vec::new();
+    while tokens.peek().is_some() {
+        if peek_is_group(tokens, Delimiter::Parenthesis) {
+            let group = expect_group(tokens, Delimiter::Parenthesis)?;
+            let mut inner = group.stream().into_iter().peekable();
+            let pattern = parse_parenthesized_pattern(&mut inner, group.span())?;
+            patterns.push(maybe_repeat(tokens, pattern)?);
+            continue;
+        }
+
+        if matches!(tokens.peek(), Some(TokenTree::Literal(_))) {
+            let literal = expect_string_literal(tokens)?;
+            patterns.push(maybe_repeat(tokens, Pattern::Unnamed(literal))?);
+            continue;
+        }
+
+        if matches!(tokens.peek(), Some(TokenTree::Ident(identifier)) if *identifier == "_") {
+            tokens.next();
+            patterns.push(maybe_repeat(
+                tokens,
+                Pattern::Any {
+                    match_unnamed: true,
+                },
+            )?);
+            continue;
+        }
+
+        break;
+    }
+    Ok(patterns)
+}
+
+fn maybe_capture(
+    tokens: &mut Tokens,
+    pattern: Pattern,
+    cardinality: Cardinality,
+) -> Result<Pattern> {
+    if peek_is_at(tokens) {
+        if !pattern.matches_single_node() {
+            return Err(syn::Error::new_spanned(
+                tokens.peek().unwrap().clone(),
+                "cannot capture a query sequence; capture the desired nodes explicitly",
+            ));
+        }
+        let (name, raw) = consume_capture(tokens)?;
+        Ok(Pattern::Capture {
+            name,
+            raw,
+            pattern: Box::new(pattern),
+            cardinality,
+        })
+    } else if cardinality == Cardinality::SINGLE {
+        Ok(pattern)
+    } else {
+        Ok(Pattern::Repeated {
+            pattern: Box::new(pattern),
+            cardinality,
+        })
+    }
+}
+
+fn maybe_repeat(tokens: &mut Tokens, pattern: Pattern) -> Result<Pattern> {
+    let cardinality = if peek_is_repetition(tokens) {
+        expect_cardinality(tokens)?
+    } else {
+        Cardinality::SINGLE
+    };
+    maybe_capture(tokens, pattern, cardinality)
+}
+
+fn parse_replacement(input: TokenStream) -> Result<Replacement> {
+    let mut tokens = input.into_iter().peekable();
+    if let Some(annotation) = try_consume_return_annotation(&mut tokens)? {
+        let body = syn::parse2(TokenStream::from(TokenTree::Group(expect_group(
+            &mut tokens,
+            Delimiter::Brace,
+        )?)))?;
+        if let Some(token) = tokens.next() {
+            return Err(syn::Error::new_spanned(
+                token,
+                "unexpected token after annotated rule body",
+            ));
+        }
+        return Ok(Replacement::Rust { annotation, body });
+    }
+
+    if let Some(TokenTree::Group(group)) = tokens.peek() {
+        if group.delimiter() == Delimiter::Brace {
+            return Err(syn::Error::new(
+                group.span(),
+                "bare `{...}` rule bodies are no longer accepted; \
+                 use the annotation form `=> kind [? | *] { ... }` \
+                 (where the kind names the output node's schema kind, \
+                 optionally suffixed with `?` or `*` for cardinality)",
+            ));
+        }
+    }
+
+    let templates = crate::template_parse::parse_templates(tokens.collect())?;
+    Ok(Replacement::Templates(templates))
+}
+
+fn try_consume_return_annotation(tokens: &mut Tokens) -> Result<Option<ReturnAnnotation>> {
+    let mut lookahead = tokens.clone();
+    let Some(TokenTree::Ident(_)) = lookahead.next() else {
+        return Ok(None);
+    };
+    let after_suffix = match lookahead.peek() {
+        Some(TokenTree::Punct(punctuation))
+            if punctuation.as_char() == '?' || punctuation.as_char() == '*' =>
+        {
+            lookahead.next();
+            lookahead.peek()
+        }
+        other => other,
+    };
+    if !matches!(after_suffix, Some(TokenTree::Group(group)) if group.delimiter() == Delimiter::Brace)
+    {
+        return Ok(None);
+    }
+
+    let kind = expect_ident(tokens, "expected output-kind name in annotation")?;
+    let cardinality = match tokens.peek() {
+        Some(TokenTree::Punct(punctuation)) if punctuation.as_char() == '?' => {
+            tokens.next();
+            Cardinality::OPTIONAL
+        }
+        Some(TokenTree::Punct(punctuation)) if punctuation.as_char() == '*' => {
+            tokens.next();
+            Cardinality::ZERO_OR_MORE
+        }
+        _ => Cardinality::SINGLE,
+    };
+    Ok(Some(ReturnAnnotation { kind, cardinality }))
+}
+
+fn split_arrow(input: TokenStream) -> Result<(TokenStream, TokenStream)> {
+    let mut tokens = input.into_iter().peekable();
+    let mut before = Vec::new();
+    loop {
+        match tokens.next() {
+            None => return Err(syn::Error::new(Span::call_site(), "expected `=>` in rule!")),
+            Some(TokenTree::Punct(first)) if first.as_char() == '=' => {
+                if matches!(tokens.peek(), Some(TokenTree::Punct(second)) if second.as_char() == '>')
+                {
+                    tokens.next();
+                    return Ok((before.into_iter().collect(), tokens.collect()));
+                }
+                before.push(TokenTree::Punct(first));
+            }
+            Some(token) => before.push(token),
+        }
+    }
+}
+
+fn split_guard(input: TokenStream) -> Result<(TokenStream, Option<syn::Expr>)> {
+    let tokens = input.into_iter().collect::<Vec<_>>();
+    let guard_index = tokens
+        .iter()
+        .position(|token| matches!(token, TokenTree::Ident(identifier) if identifier == "where"));
+    let Some(guard_index) = guard_index else {
+        return Ok((tokens.into_iter().collect(), None));
+    };
+
+    let pattern = tokens[..guard_index].iter().cloned().collect();
+    let guard_tokens = tokens[guard_index + 1..]
+        .iter()
+        .cloned()
+        .collect::<TokenStream>();
+    if guard_tokens.is_empty() {
+        return Err(syn::Error::new(
+            Span::call_site(),
+            "expected guard expression after `where`",
+        ));
+    }
+    Ok((pattern, Some(syn::parse2(guard_tokens)?)))
+}
+
+fn consume_capture(tokens: &mut Tokens) -> Result<(Ident, bool)> {
+    expect_punct(tokens, '@', "expected `@`")?;
+    let raw = if peek_is_at(tokens) {
+        tokens.next();
+        true
+    } else {
+        false
+    };
+    Ok((
+        expect_ident(tokens, "expected capture name after `@` or `@@`")?,
+        raw,
+    ))
+}
+
+fn expect_cardinality(tokens: &mut Tokens) -> Result<Cardinality> {
+    match tokens.next() {
+        Some(TokenTree::Punct(punctuation)) => match punctuation.as_char() {
+            '*' => Ok(Cardinality::ZERO_OR_MORE),
+            '+' => Ok(Cardinality::ONE_OR_MORE),
+            '?' => Ok(Cardinality::OPTIONAL),
+            _ => Err(syn::Error::new(
+                punctuation.span(),
+                "expected `*`, `+`, or `?`",
+            )),
+        },
+        Some(token) => Err(syn::Error::new_spanned(
+            token,
+            "expected repetition quantifier",
+        )),
+        None => Err(syn::Error::new(
+            Span::call_site(),
+            "expected repetition quantifier",
+        )),
+    }
+}
+
+fn peek_is_at(tokens: &mut Tokens) -> bool {
+    matches!(tokens.peek(), Some(TokenTree::Punct(punctuation)) if punctuation.as_char() == '@')
+}
+
+fn peek_is_repetition(tokens: &mut Tokens) -> bool {
+    matches!(
+        tokens.peek(),
+        Some(TokenTree::Punct(punctuation))
+            if matches!(punctuation.as_char(), '*' | '+' | '?')
+    )
+}
+
+fn peek_is_field(tokens: &mut Tokens) -> bool {
+    matches!(tokens.peek(), Some(TokenTree::Ident(identifier)) if *identifier != "_")
+}
+
+fn peek_is_group(tokens: &mut Tokens, delimiter: Delimiter) -> bool {
+    matches!(tokens.peek(), Some(TokenTree::Group(group)) if group.delimiter() == delimiter)
+}
+
+fn expect_ident(tokens: &mut Tokens, message: &str) -> Result<Ident> {
+    match tokens.next() {
+        Some(TokenTree::Ident(identifier)) => Ok(identifier),
+        Some(token) => Err(syn::Error::new_spanned(token, message)),
+        None => Err(syn::Error::new(Span::call_site(), message)),
+    }
+}
+
+fn expect_literal(tokens: &mut Tokens) -> Result<proc_macro2::Literal> {
+    match tokens.next() {
+        Some(TokenTree::Literal(literal)) => Ok(literal),
+        Some(token) => Err(syn::Error::new_spanned(token, "expected string literal")),
+        None => Err(syn::Error::new(
+            Span::call_site(),
+            "expected string literal",
+        )),
+    }
+}
+
+fn expect_string_literal(tokens: &mut Tokens) -> Result<String> {
+    let literal = expect_literal(tokens)?;
+    syn::parse2::<syn::LitStr>(TokenStream::from(TokenTree::Literal(literal.clone())))
+        .map(|literal| literal.value())
+        .map_err(|_| syn::Error::new(literal.span(), "expected string literal"))
+}
+
+fn expect_punct(tokens: &mut Tokens, expected: char, message: &str) -> Result<()> {
+    match tokens.next() {
+        Some(TokenTree::Punct(punctuation)) if punctuation.as_char() == expected => Ok(()),
+        Some(token) => Err(syn::Error::new_spanned(token, message)),
+        None => Err(syn::Error::new(Span::call_site(), message)),
+    }
+}
+
+fn expect_group(tokens: &mut Tokens, delimiter: Delimiter) -> Result<proc_macro2::Group> {
+    match tokens.next() {
+        Some(TokenTree::Group(group)) if group.delimiter() == delimiter => Ok(group),
+        Some(token) => Err(syn::Error::new_spanned(
+            token,
+            format!("expected {delimiter:?} group"),
+        )),
+        None => Err(syn::Error::new(
+            Span::call_site(),
+            format!("expected {delimiter:?} group"),
+        )),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use quote::quote;
+
+    #[test]
+    fn parses_complete_rule() {
+        let rule = parse_rule(quote! {
+            (call
+                argument: (_)* @args
+                method: (identifier) @@name)
+            where !args.is_empty()
+            =>
+            call? {
+                Some(tree!((call method: {name} argument: {args})))
+            }
+        })
+        .unwrap();
+
+        assert!(rule.guard.is_some());
+        assert!(matches!(
+            rule.replacement,
+            Replacement::Rust {
+                annotation: ReturnAnnotation {
+                    cardinality: Cardinality::OPTIONAL,
+                    ..
+                },
+                ..
+            }
+        ));
+
+        let Pattern::Node { kind, fields } = rule.pattern else {
+            panic!("expected root node pattern");
+        };
+        assert_eq!(kind, "call");
+        assert_eq!(fields.len(), 2);
+        let (_, argument_pattern) = fields
+            .iter()
+            .find(|(name, _)| name == "argument")
+            .expect("argument field");
+        assert!(matches!(
+            argument_pattern,
+            Pattern::Sequence(patterns)
+                if matches!(
+                    patterns.as_slice(),
+                    [Pattern::Capture {
+                        cardinality: Cardinality::ZERO_OR_MORE,
+                        ..
+                    }]
+                )
+        ));
+    }
+
+    #[test]
+    fn parses_template_replacement() {
+        let rule = parse_rule(quote! {
+            (identifier) @@name
+            =>
+            (identifier #{name})
+        })
+        .unwrap();
+
+        assert!(rule.guard.is_none());
+        assert!(matches!(rule.replacement, Replacement::Templates(_)));
+    }
+
+    #[test]
+    fn rejects_eager_capture_of_rule_root() {
+        let result = parse_rule(quote! {
+            (identifier) @name
+            =>
+            (identifier #{name})
+        });
+        let Err(error) = result else {
+            panic!("expected eager rule-root capture to be rejected");
+        };
+        assert_eq!(
+            error.to_string(),
+            "a capture of the rule root must use `@@`; the matched root cannot be eagerly translated"
+        );
+    }
+
+    #[test]
+    fn repeated_capture_owns_its_cardinality() {
+        let pattern = parse_pattern(quote!((array (identifier)* @items))).unwrap();
+
+        let Pattern::Node { fields, .. } = pattern else {
+            panic!("expected array node pattern");
+        };
+        let Pattern::Sequence(children) = &fields[0].1 else {
+            panic!("expected child sequence");
+        };
+        let Pattern::Capture {
+            name,
+            pattern: captured,
+            cardinality,
+            ..
+        } = &children[0]
+        else {
+            panic!("expected repeated capture");
+        };
+        assert_eq!(name, "items");
+        assert_eq!(*cardinality, Cardinality::ZERO_OR_MORE);
+        assert!(matches!(captured.as_ref(), Pattern::Node { .. }));
+    }
+
+    #[test]
+    fn rejects_one_element_repeated_group() {
+        let result = parse_pattern(quote!((array ((identifier))* @items)));
+        let Err(error) = result else {
+            panic!("expected redundant query group to be rejected");
+        };
+        assert_eq!(
+            error.to_string(),
+            "single-pattern query groups are not allowed; remove the redundant parentheses"
+        );
+    }
+
+    #[test]
+    fn rejects_empty_repeated_group() {
+        let result = parse_pattern(quote!((array ()*)));
+        let Err(error) = result else {
+            panic!("expected empty query group to be rejected");
+        };
+        assert_eq!(error.to_string(), "empty query groups are not allowed");
+    }
+
+    #[test]
+    fn rejects_capture_of_query_sequence() {
+        let result = maybe_capture(
+            &mut quote!(@item).into_iter().peekable(),
+            Pattern::Sequence(vec![
+                Pattern::Node {
+                    kind: "identifier".to_string(),
+                    fields: Vec::new(),
+                },
+                Pattern::Node {
+                    kind: "integer".to_string(),
+                    fields: Vec::new(),
+                },
+            ]),
+            Cardinality::SINGLE,
+        );
+        let Err(error) = result else {
+            panic!("expected multi-node sequence capture to be rejected");
+        };
+        assert_eq!(
+            error.to_string(),
+            "cannot capture a query sequence; capture the desired nodes explicitly"
+        );
+    }
+
+    #[test]
+    fn rejects_duplicate_capture_names() {
+        let result = parse_pattern(quote! {
+            (assignment
+                left: (_) @item
+                right: (_) @item)
+        });
+        let Err(error) = result else {
+            panic!("expected duplicate capture name to be rejected");
+        };
+        assert_eq!(
+            error.to_string(),
+            "capture `item` is used more than once; use a distinct name for each capture site"
+        );
+    }
+
+    #[test]
+    fn parses_literal_led_repeated_sequence() {
+        let pattern = parse_pattern(quote!((root ("+" ",")*))).unwrap();
+        let Pattern::Node { fields, .. } = pattern else {
+            panic!("expected root node");
+        };
+        let Pattern::Sequence(children) = &fields[0].1 else {
+            panic!("expected child sequence");
+        };
+        let Pattern::Repeated {
+            pattern: repeated, ..
+        } = &children[0]
+        else {
+            panic!("expected repetition");
+        };
+        assert!(matches!(
+            repeated.as_ref(),
+            Pattern::Sequence(patterns)
+                if matches!(
+                    patterns.as_slice(),
+                    [Pattern::Unnamed(left), Pattern::Unnamed(right)]
+                        if left == "+" && right == ","
+                )
+        ));
+    }
+
+    #[test]
+    fn parses_wildcard_led_repeated_sequence() {
+        let pattern = parse_pattern(quote!((root (_ ",")*))).unwrap();
+        let Pattern::Node { fields, .. } = pattern else {
+            panic!("expected root node");
+        };
+        let Pattern::Sequence(children) = &fields[0].1 else {
+            panic!("expected child sequence");
+        };
+        let Pattern::Repeated {
+            pattern: repeated, ..
+        } = &children[0]
+        else {
+            panic!("expected repetition");
+        };
+        assert!(matches!(
+            repeated.as_ref(),
+            Pattern::Sequence(patterns)
+                if matches!(
+                    patterns.as_slice(),
+                    [
+                        Pattern::Any {
+                            match_unnamed: true
+                        },
+                        Pattern::Unnamed(comma)
+                    ] if comma == ","
+                )
+        ));
+    }
+
+    #[test]
+    fn rejects_unconsumed_node_pattern_tokens() {
+        for query in [quote!((root (foo . (bar) @x))), quote!((root(bar @ x)))] {
+            let result = parse_pattern(query);
+            let Err(error) = result else {
+                panic!("expected malformed node pattern to be rejected");
+            };
+            assert!(error.to_string().starts_with("unexpected token"));
+        }
+    }
+}
diff --git a/shared/yeast-macros/src/template_parse.rs b/shared/yeast-macros/src/template_parse.rs
new file mode 100644
index 000000000000..cce42fd0ab19
--- /dev/null
+++ b/shared/yeast-macros/src/template_parse.rs
@@ -0,0 +1,436 @@
+use proc_macro2::{Delimiter, Ident, Literal, Span, TokenStream, TokenTree};
+use std::iter::Peekable;
+
+use crate::ast::{Alternative, Content, Field, Node, Template};
+
+type Tokens = Peekable<proc_macro2::token_stream::IntoIter>;
+type Result<T> = std::result::Result<T, syn::Error>;
+
+pub(crate) fn parse_template(input: TokenStream) -> Result<Template> {
+    let mut tokens = input.into_iter().peekable();
+    let template = parse_one(&mut tokens)?;
+    if let Some(token) = tokens.next() {
+        return Err(syn::Error::new_spanned(
+            token,
+            "unexpected tokens after tree! template; use trees! for multiple nodes",
+        ));
+    }
+    Ok(template)
+}
+
+pub(crate) fn parse_templates(input: TokenStream) -> Result<Vec<Template>> {
+    let mut tokens = input.into_iter().peekable();
+    let templates = parse_list(&mut tokens)?;
+    if let Some(token) = tokens.next() {
+        return Err(syn::Error::new_spanned(
+            token,
+            "unexpected token after template",
+        ));
+    }
+    Ok(templates)
+}
+
+fn parse_one(tokens: &mut Tokens) -> Result<Template> {
+    match tokens.peek() {
+        Some(TokenTree::Group(group)) if group.delimiter() == Delimiter::Brace => {
+            let group = expect_group(tokens, Delimiter::Brace)?;
+            Ok(Template::Splice(parse_block(group)?))
+        }
+        Some(TokenTree::Group(group)) if group.delimiter() == Delimiter::Parenthesis => {
+            let group = expect_group(tokens, Delimiter::Parenthesis)?;
+            Ok(Template::Node(parse_node(group)?))
+        }
+        Some(TokenTree::Group(group)) if group.delimiter() == Delimiter::Bracket => {
+            let group = expect_group(tokens, Delimiter::Bracket)?;
+            Ok(Template::Choice(parse_alternatives(group)?))
+        }
+        Some(token) => Err(syn::Error::new_spanned(
+            token.clone(),
+            "expected `(`, `{`, or `[` in tree template",
+        )),
+        None => Err(syn::Error::new(
+            Span::call_site(),
+            "unexpected end of tree template",
+        )),
+    }
+}
+
+fn parse_node(group: proc_macro2::Group) -> Result<Node> {
+    let mut tokens = group.stream().into_iter().peekable();
+    let kind = expect_ident(&mut tokens, "expected node kind")?;
+    let content = if peek_is_literal(&mut tokens) {
+        Some(Content::Static(expect_literal(&mut tokens)?))
+    } else if peek_is_hash(&mut tokens) {
+        tokens.next();
+        Some(Content::Computed(parse_block(expect_group(
+            &mut tokens,
+            Delimiter::Brace,
+        )?)?))
+    } else {
+        None
+    };
+
+    let mut fields = Vec::new();
+    let mut has_location = false;
+    let mut has_location_none = false;
+    while peek_is_field(&mut tokens) {
+        let name = expect_ident(&mut tokens, "expected field name")?;
+        let is_location = name == "location";
+        if content.is_some() && !is_location {
+            return Err(syn::Error::new_spanned(
+                name,
+                "literal nodes can only have the special `location` field",
+            ));
+        }
+        expect_punct(&mut tokens, ':', "expected `:` after field name")?;
+        if is_location {
+            if matches!(tokens.peek(), Some(TokenTree::Ident(ident)) if ident == "none") {
+                let none = tokens.next().unwrap();
+                if has_location || has_location_none {
+                    return Err(syn::Error::new_spanned(
+                        none,
+                        "`location: none` cannot be combined with another `location` field",
+                    ));
+                }
+                has_location_none = true;
+                fields.push(Field::LocationNone);
+            } else if peek_is_group(&mut tokens, Delimiter::Brace) {
+                if has_location_none {
+                    return Err(syn::Error::new_spanned(
+                        tokens.peek().unwrap().clone(),
+                        "`location: none` cannot be combined with another `location` field",
+                    ));
+                }
+                has_location = true;
+                let block = parse_block(expect_group(&mut tokens, Delimiter::Brace)?)?;
+                fields.push(Field::Location { block });
+            } else {
+                let error = match tokens.peek() {
+                    Some(token) => syn::Error::new_spanned(
+                        token.clone(),
+                        "`location` field value must be a Rust block or `none`",
+                    ),
+                    None => syn::Error::new(
+                        Span::call_site(),
+                        "`location` field value must be a Rust block or `none`",
+                    ),
+                };
+                return Err(error);
+            }
+            if let Some(TokenTree::Punct(punctuation)) = tokens.peek() {
+                if punctuation.as_char() == '?' {
+                    return Err(syn::Error::new_spanned(
+                        punctuation.clone(),
+                        "`?` is not valid on a `location` field",
+                    ));
+                }
+            }
+            continue;
+        }
+
+        let value = parse_one(&mut tokens)?;
+        fields.push(Field::Named { name, value });
+    }
+
+    if let Some(token) = tokens.next() {
+        return Err(syn::Error::new_spanned(
+            token,
+            "expected named field (`name:`) or end of node template; \
+             output templates do not support unnamed children",
+        ));
+    }
+
+    Ok(Node {
+        kind,
+        content,
+        fields,
+    })
+}
+
+fn parse_alternatives(group: proc_macro2::Group) -> Result<Vec<Alternative>> {
+    let mut tokens = group.stream().into_iter().peekable();
+    let mut alternatives = Vec::new();
+    while tokens.peek().is_some() {
+        if peek_is_group(&mut tokens, Delimiter::Bracket) {
+            let nested = expect_group(&mut tokens, Delimiter::Bracket)?;
+            return Err(syn::Error::new(
+                nested.span(),
+                "a choice cannot be used directly as another choice's alternative; \
+                 list its alternatives directly in the enclosing choice",
+            ));
+        }
+        let template = parse_one(&mut tokens)?;
+        let guard = if peek_is_ident(&mut tokens, "if") {
+            tokens.next();
+            let group = expect_group(&mut tokens, Delimiter::Brace).map_err(|error| {
+                syn::Error::new(
+                    error.span(),
+                    "expected `{ ... }` guard condition after `if`",
+                )
+            })?;
+            Some(parse_block(group)?)
+        } else {
+            None
+        };
+        alternatives.push(Alternative { template, guard });
+    }
+    if alternatives.is_empty() {
+        return Err(syn::Error::new(
+            group.span(),
+            "template choices must contain at least one alternative",
+        ));
+    }
+    Ok(alternatives)
+}
+
+fn parse_list(tokens: &mut Tokens) -> Result<Vec<Template>> {
+    let mut templates = Vec::new();
+    while tokens.peek().is_some() {
+        if peek_is_group(tokens, Delimiter::Parenthesis) {
+            let group = expect_group(tokens, Delimiter::Parenthesis)?;
+            if group.stream().is_empty() {
+                continue;
+            }
+            templates.push(Template::Node(parse_node(group)?));
+            continue;
+        }
+
+        if peek_is_group(tokens, Delimiter::Brace) {
+            templates.push(Template::Splice(parse_block(expect_group(
+                tokens,
+                Delimiter::Brace,
+            )?)?));
+            continue;
+        }
+
+        if peek_is_group(tokens, Delimiter::Bracket) {
+            templates.push(Template::Choice(parse_alternatives(expect_group(
+                tokens,
+                Delimiter::Bracket,
+            )?)?));
+            continue;
+        }
+
+        break;
+    }
+    Ok(templates)
+}
+
+fn parse_block(group: proc_macro2::Group) -> Result<syn::Block> {
+    syn::parse2(TokenStream::from(TokenTree::Group(group)))
+}
+
+fn peek_is_literal(tokens: &mut Tokens) -> bool {
+    matches!(tokens.peek(), Some(TokenTree::Literal(_)))
+}
+
+fn peek_is_hash(tokens: &mut Tokens) -> bool {
+    matches!(tokens.peek(), Some(TokenTree::Punct(punctuation)) if punctuation.as_char() == '#')
+}
+
+fn peek_is_field(tokens: &mut Tokens) -> bool {
+    matches!(tokens.peek(), Some(TokenTree::Ident(identifier)) if *identifier != "_")
+}
+
+fn peek_is_group(tokens: &mut Tokens, delimiter: Delimiter) -> bool {
+    matches!(tokens.peek(), Some(TokenTree::Group(group)) if group.delimiter() == delimiter)
+}
+
+fn peek_is_ident(tokens: &mut Tokens, expected: &str) -> bool {
+    matches!(tokens.peek(), Some(TokenTree::Ident(identifier)) if identifier == expected)
+}
+
+fn expect_ident(tokens: &mut Tokens, message: &str) -> Result<Ident> {
+    match tokens.next() {
+        Some(TokenTree::Ident(identifier)) => Ok(identifier),
+        Some(token) => Err(syn::Error::new_spanned(token, message)),
+        None => Err(syn::Error::new(Span::call_site(), message)),
+    }
+}
+
+fn expect_literal(tokens: &mut Tokens) -> Result<Literal> {
+    match tokens.next() {
+        Some(TokenTree::Literal(literal)) => Ok(literal),
+        Some(token) => Err(syn::Error::new_spanned(token, "expected string literal")),
+        None => Err(syn::Error::new(
+            Span::call_site(),
+            "expected string literal",
+        )),
+    }
+}
+
+fn expect_punct(tokens: &mut Tokens, expected: char, message: &str) -> Result<()> {
+    match tokens.next() {
+        Some(TokenTree::Punct(punctuation)) if punctuation.as_char() == expected => Ok(()),
+        Some(token) => Err(syn::Error::new_spanned(token, message)),
+        None => Err(syn::Error::new(Span::call_site(), message)),
+    }
+}
+
+fn expect_group(tokens: &mut Tokens, delimiter: Delimiter) -> Result<proc_macro2::Group> {
+    match tokens.next() {
+        Some(TokenTree::Group(group)) if group.delimiter() == delimiter => Ok(group),
+        Some(token) => Err(syn::Error::new_spanned(
+            token,
+            format!("expected {delimiter:?} group"),
+        )),
+        None => Err(syn::Error::new(
+            Span::call_site(),
+            format!("expected {delimiter:?} group"),
+        )),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use quote::quote;
+
+    #[test]
+    fn parses_node_fields() {
+        let template = parse_template(quote! {
+            (call
+                argument: {args}
+                method: [(identifier #{name})])
+        })
+        .unwrap();
+
+        let Template::Node(node) = template else {
+            panic!("expected node template");
+        };
+        assert_eq!(node.kind, "call");
+        assert!(node.content.is_none());
+        assert_eq!(node.fields.len(), 2);
+    }
+
+    #[test]
+    fn parses_location_fields_on_literal_nodes() {
+        let template = parse_template(quote! {
+            (identifier "name" location: {source})
+        })
+        .unwrap();
+
+        let Template::Node(node) = template else {
+            panic!("expected node template");
+        };
+        assert_eq!(node.kind, "identifier");
+        assert!(node.content.is_some());
+        assert!(matches!(node.fields.as_slice(), [Field::Location { .. }]));
+    }
+
+    #[test]
+    fn parses_location_none() {
+        let template = parse_template(quote! {
+            (identifier "name" location: none)
+        })
+        .unwrap();
+
+        let Template::Node(node) = template else {
+            panic!("expected node template");
+        };
+        assert!(matches!(node.fields.as_slice(), [Field::LocationNone]));
+    }
+
+    #[test]
+    fn rejects_non_block_location_fields() {
+        let result = parse_template(quote! {
+            (identifier "name" location: (identifier "source"))
+        });
+        let Err(error) = result else {
+            panic!("expected a non-block location value to be rejected");
+        };
+        assert_eq!(
+            error.to_string(),
+            "`location` field value must be a Rust block or `none`"
+        );
+    }
+
+    #[test]
+    fn rejects_location_none_with_other_locations() {
+        let result = parse_template(quote! {
+            (identifier "name" location: none location: {source})
+        });
+        let Err(error) = result else {
+            panic!("expected mixed location metadata to be rejected");
+        };
+        assert_eq!(
+            error.to_string(),
+            "`location: none` cannot be combined with another `location` field"
+        );
+    }
+
+    #[test]
+    fn parses_choice_guards() {
+        let template = parse_template(quote! {
+            [
+                (parameter type: {ty}) if { in_function_type }
+                (argument value: {ty})
+            ]
+        })
+        .unwrap();
+
+        let Template::Choice(alternatives) = template else {
+            panic!("expected template choice");
+        };
+        assert_eq!(alternatives.len(), 2);
+        assert!(alternatives[0].guard.is_some());
+        assert!(alternatives[1].guard.is_none());
+    }
+
+    #[test]
+    fn rejects_empty_choices() {
+        let result = parse_template(quote! { [] });
+        let Err(error) = result else {
+            panic!("expected empty choice to be rejected");
+        };
+        assert_eq!(
+            error.to_string(),
+            "template choices must contain at least one alternative"
+        );
+    }
+
+    #[test]
+    fn rejects_choice_as_direct_alternative() {
+        let result = parse_template(quote! {
+            [
+                [(identifier "nested")]
+                (identifier "fallback")
+            ]
+        });
+        let Err(error) = result else {
+            panic!("expected a direct nested choice to be rejected");
+        };
+        assert_eq!(
+            error.to_string(),
+            "a choice cannot be used directly as another choice's alternative; \
+             list its alternatives directly in the enclosing choice"
+        );
+    }
+
+    #[test]
+    fn parses_lists_and_skips_empty_nodes() {
+        let templates = parse_templates(quote! {
+            (identifier "name")
+            {extra}
+            ()
+        })
+        .unwrap();
+        assert_eq!(templates.len(), 2);
+        assert!(matches!(templates[0], Template::Node(_)));
+        assert!(matches!(templates[1], Template::Splice(_)));
+    }
+
+    #[test]
+    fn rejects_named_fields_on_literal_nodes() {
+        let result = parse_template(quote! {
+            (identifier "name" child: (identifier "nested"))
+        });
+        let Err(error) = result else {
+            panic!("expected literal node fields to be rejected");
+        };
+        assert_eq!(
+            error.to_string(),
+            "literal nodes can only have the special `location` field"
+        );
+    }
+}
diff --git a/shared/yeast-schema/src/node_types_yaml.rs b/shared/yeast-schema/src/node_types_yaml.rs
index 97052f9a835b..7f2c2d6b3fe3 100644
--- a/shared/yeast-schema/src/node_types_yaml.rs
+++ b/shared/yeast-schema/src/node_types_yaml.rs
@@ -5,8 +5,11 @@
 /// ```yaml
 /// supertypes:
 ///   _expression:
-///     - assignment
-///     - binary
+///     subtypes:
+///       - assignment
+///       - binary
+///     fields:
+///       operand*: _expression
 ///
 /// named:
 ///   assignment:
@@ -31,13 +34,39 @@ use serde_json::json;
 #[derive(Deserialize, Default)]
 struct YamlNodeTypes {
     #[serde(default)]
-    supertypes: BTreeMap<String, Vec<TypeRef>>,
+    supertypes: BTreeMap<String, YamlSupertype>,
     #[serde(default)]
     named: BTreeMap<String, Option<BTreeMap<String, TypeRefOrList>>>,
     #[serde(default)]
     unnamed: Vec<String>,
 }
 
+#[derive(Deserialize)]
+#[serde(untagged)]
+enum YamlSupertype {
+    Subtypes(Vec<TypeRef>),
+    Detailed {
+        subtypes: Vec<TypeRef>,
+        #[serde(default)]
+        fields: BTreeMap<String, TypeRefOrList>,
+    },
+}
+
+impl YamlSupertype {
+    fn subtypes(&self) -> &[TypeRef] {
+        match self {
+            Self::Subtypes(subtypes) | Self::Detailed { subtypes, .. } => subtypes,
+        }
+    }
+
+    fn fields(&self) -> Option<&BTreeMap<String, TypeRefOrList>> {
+        match self {
+            Self::Subtypes(_) => None,
+            Self::Detailed { fields, .. } => Some(fields),
+        }
+    }
+}
+
 /// A reference to a node type. Can be:
 /// - a plain string (resolved by looking up named vs unnamed)
 /// - a map `{unnamed: "name"}` to force unnamed interpretation
@@ -151,16 +180,19 @@ pub fn convert(yaml_input: &str) -> Result<String, String> {
     let mut output = Vec::new();
 
     // 1. Supertypes
-    for (name, members) in &yaml.supertypes {
-        let subtypes: Vec<_> = members
+    for (name, supertype) in &yaml.supertypes {
+        let subtypes: Vec<_> = supertype
+            .subtypes()
             .iter()
             .map(|m| resolve_type_ref(m, &named_types, &unnamed_types))
             .collect();
-        output.push(json!({
+        let mut entry = json!({
             "type": name,
             "named": true,
             "subtypes": subtypes,
-        }));
+        });
+        add_fields_to_json_entry(&mut entry, supertype.fields(), &named_types, &unnamed_types);
+        output.push(entry);
     }
 
     // 2. Named nodes
@@ -186,47 +218,56 @@ pub fn convert(yaml_input: &str) -> Result<String, String> {
             Some(m) => m,
         };
 
+        let mut entry = json!({
+            "type": name,
+            "named": true,
+            "fields": {},
+        });
+        add_fields_to_json_entry(&mut entry, Some(fields_map), &named_types, &unnamed_types);
+
+        output.push(entry);
+    }
+
+    fn add_fields_to_json_entry(
+        entry: &mut serde_json::Value,
+        fields: Option<&BTreeMap<String, TypeRefOrList>>,
+        named_types: &BTreeSet<String>,
+        unnamed_types: &BTreeSet<String>,
+    ) {
         let mut json_fields = serde_json::Map::new();
-        let mut json_children: Option<serde_json::Value> = None;
+        let mut json_children = None;
 
-        for (raw_field_name, type_refs) in fields_map {
+        for (raw_field_name, type_refs) in fields.into_iter().flatten() {
             let spec = parse_field_name(raw_field_name);
             let types: Vec<_> = type_refs
                 .clone()
                 .into_vec()
                 .iter()
-                .map(|t| resolve_type_ref(t, &named_types, &unnamed_types))
+                .map(|t| resolve_type_ref(t, named_types, unnamed_types))
                 .collect();
-
-            // Cloning to make the borrow checker happy
             let field_info = json!({
                 "multiple": spec.multiple,
                 "required": spec.required,
                 "types": types,
             });
 
-            if spec.name.is_none() {
-                // $children
-                json_children = Some(field_info);
+            if let Some(name) = spec.name {
+                json_fields.insert(name, field_info);
             } else {
-                json_fields.insert(spec.name.unwrap(), field_info);
+                json_children = Some(field_info);
             }
         }
 
-        let mut entry = json!({
-            "type": name,
-            "named": true,
-            "fields": json_fields,
-        });
-
+        entry
+            .as_object_mut()
+            .unwrap()
+            .insert("fields".to_string(), json_fields.into());
         if let Some(children) = json_children {
             entry
                 .as_object_mut()
                 .unwrap()
                 .insert("children".to_string(), children);
         }
-
-        output.push(entry);
     }
 
     // 3. Unnamed tokens
@@ -265,35 +306,53 @@ pub fn extend_schema_from_yaml(
 fn record_field_order(schema: &mut crate::schema::Schema, yaml_input: &str) -> Result<(), String> {
     let value: serde_yaml::Value = serde_yaml::from_str(yaml_input)
         .map_err(|e| format!("Failed to parse YAML for field order: {e}"))?;
-    let Some(named) = value.get("named").and_then(|v| v.as_mapping()) else {
-        return Ok(());
-    };
-    for (node_name, fields) in named {
-        let Some(node_name) = node_name.as_str() else {
-            continue;
-        };
-        let Some(fields) = fields.as_mapping() else {
-            continue; // node with no fields (null)
-        };
-        let mut order = Vec::new();
-        for (raw_field_name, _) in fields {
-            let Some(raw) = raw_field_name.as_str() else {
-                continue;
-            };
-            // Skip the unnamed/`child` slot; the dump handles it separately.
-            if let Some(name) = parse_field_name(raw).name {
-                order.push(schema.register_field(&name));
-            }
+    record_field_order_for_nodes(schema, value.get("named").and_then(|v| v.as_mapping()));
+    let supertypes = value.get("supertypes").and_then(|v| v.as_mapping());
+    if let Some(supertypes) = supertypes {
+        for (node_name, declaration) in supertypes {
+            let fields = declaration
+                .as_mapping()
+                .and_then(|mapping| mapping.get("fields"));
+            record_field_order_for_node(schema, node_name, fields);
         }
-        schema.set_field_order(node_name, order);
     }
     Ok(())
 }
 
-fn apply_yaml_to_schema(
-    yaml: &YamlNodeTypes,
+fn record_field_order_for_nodes(
+    schema: &mut crate::schema::Schema,
+    nodes: Option<&serde_yaml::Mapping>,
+) {
+    for (node_name, fields) in nodes.into_iter().flatten() {
+        record_field_order_for_node(schema, node_name, Some(fields));
+    }
+}
+
+fn record_field_order_for_node(
     schema: &mut crate::schema::Schema,
+    node_name: &serde_yaml::Value,
+    fields: Option<&serde_yaml::Value>,
 ) {
+    let Some(node_name) = node_name.as_str() else {
+        return;
+    };
+    let Some(fields) = fields.and_then(|fields| fields.as_mapping()) else {
+        return;
+    };
+    let mut order = Vec::new();
+    for (raw_field_name, _) in fields {
+        let Some(raw) = raw_field_name.as_str() else {
+            continue;
+        };
+        // Skip the unnamed/`child` slot; the dump handles it separately.
+        if let Some(name) = parse_field_name(raw).name {
+            order.push(schema.register_field(&name));
+        }
+    }
+    schema.set_field_order(node_name, order);
+}
+
+fn apply_yaml_to_schema(yaml: &YamlNodeTypes, schema: &mut crate::schema::Schema) {
     // Register all supertypes as node kinds
     for name in yaml.supertypes.keys() {
         schema.register_kind(name);
@@ -302,14 +361,10 @@ fn apply_yaml_to_schema(
     // Register named node kinds and their fields
     for (name, fields_opt) in &yaml.named {
         schema.register_kind(name);
-        if let Some(fields) = fields_opt {
-            for raw_field_name in fields.keys() {
-                let spec = parse_field_name(raw_field_name);
-                if let Some(field_name) = &spec.name {
-                    schema.register_field(field_name);
-                }
-            }
-        }
+        register_fields(schema, fields_opt.as_ref());
+    }
+    for supertype in yaml.supertypes.values() {
+        register_fields(schema, supertype.fields());
     }
 
     // Register unnamed tokens as node kinds
@@ -326,8 +381,9 @@ fn apply_yaml_to_schema(
     }
     let unnamed_types: BTreeSet<String> = yaml.unnamed.iter().cloned().collect();
 
-    for (supertype, members) in &yaml.supertypes {
-        let node_types = members
+    for (supertype, declaration) in &yaml.supertypes {
+        let node_types = declaration
+            .subtypes()
             .iter()
             .map(|m| {
                 let (kind, named) = resolve_type_ref_pair(m, &named_types, &unnamed_types);
@@ -339,47 +395,96 @@ fn apply_yaml_to_schema(
 
     // Register allowed field child types for type checking.
     for (parent_kind, fields_opt) in &yaml.named {
-        let Some(fields) = fields_opt else {
-            continue;
-        };
-
-        for (raw_field_name, type_refs) in fields {
-            let spec = parse_field_name(raw_field_name);
-            let field_id = match &spec.name {
-                Some(name) => schema.register_field(name),
-                None => CHILD_FIELD,
-            };
+        apply_fields_to_schema(
+            schema,
+            parent_kind,
+            fields_opt.as_ref(),
+            &named_types,
+            &unnamed_types,
+        );
+    }
+    for (parent_kind, supertype) in &yaml.supertypes {
+        apply_fields_to_schema(
+            schema,
+            parent_kind,
+            supertype.fields(),
+            &named_types,
+            &unnamed_types,
+        );
+    }
+}
 
-            let mut node_types = type_refs
-                .clone()
-                .into_vec()
-                .into_iter()
-                .map(|type_ref| {
-                    let (kind, named) = resolve_type_ref_pair(&type_ref, &named_types, &unnamed_types);
-                    crate::schema::NodeType { kind, named }
-                })
-                .collect::<Vec<_>>();
-            node_types.sort_by(|a, b| a.kind.cmp(&b.kind).then(a.named.cmp(&b.named)));
-            node_types.dedup_by(|a, b| a.kind == b.kind && a.named == b.named);
-            schema.set_field_types(parent_kind, field_id, node_types);
-            schema.set_field_cardinality(
-                parent_kind,
-                field_id,
-                crate::schema::FieldCardinality {
-                    multiple: spec.multiple,
-                    required: spec.required,
-                },
-            );
+fn register_fields(
+    schema: &mut crate::schema::Schema,
+    fields: Option<&BTreeMap<String, TypeRefOrList>>,
+) {
+    if let Some(fields) = fields {
+        for raw_field_name in fields.keys() {
+            if let Some(field_name) = parse_field_name(raw_field_name).name {
+                schema.register_field(&field_name);
+            }
         }
     }
 }
 
+fn apply_fields_to_schema(
+    schema: &mut crate::schema::Schema,
+    parent_kind: &str,
+    fields: Option<&BTreeMap<String, TypeRefOrList>>,
+    named_types: &BTreeSet<String>,
+    unnamed_types: &BTreeSet<String>,
+) {
+    for (raw_field_name, type_refs) in fields.into_iter().flatten() {
+        let spec = parse_field_name(raw_field_name);
+        let field_id = match &spec.name {
+            Some(name) => schema.register_field(name),
+            None => CHILD_FIELD,
+        };
+        let mut node_types = type_refs
+            .clone()
+            .into_vec()
+            .into_iter()
+            .map(|type_ref| {
+                let (kind, named) = resolve_type_ref_pair(&type_ref, named_types, unnamed_types);
+                crate::schema::NodeType { kind, named }
+            })
+            .collect::<Vec<_>>();
+        node_types.sort_by(|a, b| a.kind.cmp(&b.kind).then(a.named.cmp(&b.named)));
+        node_types.dedup_by(|a, b| a.kind == b.kind && a.named == b.named);
+        schema.set_field_types(parent_kind, field_id, node_types);
+        schema.set_field_cardinality(
+            parent_kind,
+            field_id,
+            crate::schema::FieldCardinality {
+                multiple: spec.multiple,
+                required: spec.required,
+            },
+        );
+    }
+}
+
 pub fn schema_from_yaml(yaml_input: &str) -> Result<crate::schema::Schema, String> {
     let mut schema = crate::schema::Schema::new();
     extend_schema_from_yaml(&mut schema, yaml_input)?;
     Ok(schema)
 }
 
+/// Return the named node kinds that declare no fields.
+pub fn leaf_kinds_from_yaml(yaml_input: &str) -> Result<BTreeSet<String>, String> {
+    let yaml: YamlNodeTypes =
+        serde_yaml::from_str(yaml_input).map_err(|e| format!("Failed to parse YAML: {e}"))?;
+    Ok(yaml
+        .named
+        .into_iter()
+        .filter_map(|(name, fields)| {
+            fields
+                .as_ref()
+                .map_or(true, BTreeMap::is_empty)
+                .then_some(name)
+        })
+        .collect())
+}
+
 // ---------------------------------------------------------------------------
 // JSON → YAML conversion
 // ---------------------------------------------------------------------------
@@ -411,6 +516,12 @@ struct JsonFieldInfo {
     types: Vec<JsonNodeType>,
 }
 
+struct JsonSupertype {
+    subtypes: Vec<JsonNodeType>,
+    fields: BTreeMap<String, JsonFieldInfo>,
+    children: Option<JsonFieldInfo>,
+}
+
 /// Convert a tree-sitter node-types.json string to the YAML format.
 pub fn convert_from_json(json_input: &str) -> Result<String, String> {
     let nodes: Vec<JsonNodeInfo> =
@@ -427,7 +538,7 @@ pub fn convert_from_json(json_input: &str) -> Result<String, String> {
         }
     }
 
-    let mut supertypes: BTreeMap<String, Vec<JsonNodeType>> = BTreeMap::new();
+    let mut supertypes: BTreeMap<String, JsonSupertype> = BTreeMap::new();
     let mut named: BTreeMap<String, Option<BTreeMap<String, JsonFieldInfo>>> = BTreeMap::new();
     let mut unnamed: Vec<String> = Vec::new();
 
@@ -438,7 +549,14 @@ pub fn convert_from_json(json_input: &str) -> Result<String, String> {
         }
 
         if !node.subtypes.is_empty() {
-            supertypes.insert(node.kind, node.subtypes);
+            supertypes.insert(
+                node.kind,
+                JsonSupertype {
+                    subtypes: node.subtypes,
+                    fields: node.fields,
+                    children: node.children,
+                },
+            );
             continue;
         }
 
@@ -463,13 +581,35 @@ pub fn convert_from_json(json_input: &str) -> Result<String, String> {
     // Supertypes
     if !supertypes.is_empty() {
         writeln!(out, "supertypes:").unwrap();
-        for (name, members) in &supertypes {
-            writeln!(out, "  {name}:").unwrap();
-            for member in members {
+        for (name, supertype) in &supertypes {
+            if supertype.fields.is_empty() && supertype.children.is_none() {
+                writeln!(out, "  {name}:").unwrap();
+            } else {
+                writeln!(out, "  {name}:").unwrap();
+                writeln!(out, "    subtypes:").unwrap();
+            }
+            let indent = if supertype.fields.is_empty() && supertype.children.is_none() {
+                "    "
+            } else {
+                "      "
+            };
+            for member in &supertype.subtypes {
                 let ref_str = format_type_ref(&member.kind, member.named, &all_named, &all_unnamed);
-                writeln!(out, "    - {ref_str}").unwrap();
+                writeln!(out, "{indent}- {ref_str}").unwrap();
+            }
+            if !supertype.fields.is_empty() || supertype.children.is_some() {
+                writeln!(out, "    fields:").unwrap();
+                write_json_fields(
+                    &mut out,
+                    &supertype.fields,
+                    supertype.children.as_ref(),
+                    "      ",
+                    &all_named,
+                    &all_unnamed,
+                );
             }
         }
+
         writeln!(out).unwrap();
     }
 
@@ -483,31 +623,7 @@ pub fn convert_from_json(json_input: &str) -> Result<String, String> {
                 }
                 Some(fields) => {
                     writeln!(out, "  {name}:").unwrap();
-                    for (field_name, info) in fields {
-                        let suffix = field_suffix(info.multiple, info.required);
-                        let yaml_name = if field_name == "$children" {
-                            format!("$children{suffix}")
-                        } else {
-                            format!("{field_name}{suffix}")
-                        };
-
-                        let type_refs: Vec<String> = info
-                            .types
-                            .iter()
-                            .map(|t| format_type_ref(&t.kind, t.named, &all_named, &all_unnamed))
-                            .collect();
-
-                        if type_refs.len() == 1 {
-                            writeln!(out, "    {yaml_name}: {}", type_refs[0]).unwrap();
-                        } else {
-                            let list = type_refs
-                                .iter()
-                                .map(|s| s.as_str())
-                                .collect::<Vec<_>>()
-                                .join(", ");
-                            writeln!(out, "    {yaml_name}: [{list}]").unwrap();
-                        }
-                    }
+                    write_json_fields(&mut out, fields, None, "    ", &all_named, &all_unnamed);
                 }
             }
         }
@@ -525,6 +641,38 @@ pub fn convert_from_json(json_input: &str) -> Result<String, String> {
     Ok(out)
 }
 
+fn write_json_fields(
+    out: &mut String,
+    fields: &BTreeMap<String, JsonFieldInfo>,
+    children: Option<&JsonFieldInfo>,
+    indent: &str,
+    all_named: &BTreeSet<String>,
+    all_unnamed: &BTreeSet<String>,
+) {
+    for (field_name, info) in fields
+        .iter()
+        .map(|(name, info)| (Some(name.as_str()), info))
+        .chain(children.map(|info| (None, info)))
+    {
+        let suffix = field_suffix(info.multiple, info.required);
+        let yaml_name = match field_name {
+            Some(name) => format!("{name}{suffix}"),
+            None => format!("$children{suffix}"),
+        };
+        let type_refs: Vec<String> = info
+            .types
+            .iter()
+            .map(|t| format_type_ref(&t.kind, t.named, all_named, all_unnamed))
+            .collect();
+
+        if type_refs.len() == 1 {
+            writeln!(out, "{indent}{yaml_name}: {}", type_refs[0]).unwrap();
+        } else {
+            writeln!(out, "{indent}{yaml_name}: [{}]", type_refs.join(", ")).unwrap();
+        }
+    }
+}
+
 fn field_suffix(multiple: bool, required: bool) -> &'static str {
     match (multiple, required) {
         (false, true) => "",
@@ -678,6 +826,24 @@ unnamed:
         assert_eq!(end["named"], false);
     }
 
+    #[test]
+    fn test_leaf_kinds_from_yaml() {
+        let leaf_kinds = leaf_kinds_from_yaml(
+            r#"
+named:
+  identifier:
+  empty_fields: {}
+  call:
+    callee: identifier
+"#,
+        )
+        .unwrap();
+
+        assert!(leaf_kinds.contains("identifier"));
+        assert!(leaf_kinds.contains("empty_fields"));
+        assert!(!leaf_kinds.contains("call"));
+    }
+
     #[test]
     fn test_explicit_unnamed_disambiguation() {
         let yaml = r#"
@@ -724,6 +890,50 @@ named:
         assert_eq!(fields["optional_multiple"]["multiple"], true);
     }
 
+    #[test]
+    fn test_supertype_fields() {
+        let yaml = r#"
+supertypes:
+  callable:
+    subtypes:
+      - function
+      - closure
+    fields:
+      parameter*: parameter
+      body?: block
+
+named:
+  function:
+  closure:
+  parameter:
+  block:
+"#;
+
+        let json = convert(yaml).unwrap();
+        let result: Vec<serde_json::Value> = serde_json::from_str(&json).unwrap();
+        let callable = result.iter().find(|n| n["type"] == "callable").unwrap();
+        assert_eq!(callable["subtypes"].as_array().unwrap().len(), 2);
+        assert_eq!(callable["fields"]["parameter"]["multiple"], true);
+        assert_eq!(callable["fields"]["parameter"]["required"], false);
+        assert_eq!(callable["fields"]["body"]["multiple"], false);
+        assert_eq!(callable["fields"]["body"]["required"], false);
+
+        let schema = schema_from_yaml(yaml).unwrap();
+        let parameter = schema.field_id_for_name("parameter").unwrap();
+        assert!(schema.field_types("callable", parameter).is_some());
+        assert_eq!(
+            schema.field_cardinality("callable", parameter),
+            Some(crate::schema::FieldCardinality {
+                multiple: true,
+                required: false,
+            })
+        );
+        assert_eq!(
+            schema.field_order("callable"),
+            Some(&vec![parameter, schema.field_id_for_name("body").unwrap()])
+        );
+    }
+
     #[test]
     fn test_json_to_yaml() {
         let json = r#"[
@@ -794,4 +1004,30 @@ unnamed:
         let v2: serde_json::Value = serde_json::from_str(&json2).unwrap();
         assert_eq!(v1, v2);
     }
+
+    #[test]
+    fn test_supertype_fields_round_trip() {
+        let yaml = r#"
+supertypes:
+  callable:
+    subtypes: [function, closure]
+    fields:
+      parameter*: parameter
+      body?: block
+
+named:
+  function:
+  closure:
+  parameter:
+  block:
+"#;
+
+        let json = convert(yaml).unwrap();
+        let yaml_output = convert_from_json(&json).unwrap();
+        let json_output = convert(&yaml_output).unwrap();
+        assert_eq!(
+            serde_json::from_str::<serde_json::Value>(&json).unwrap(),
+            serde_json::from_str::<serde_json::Value>(&json_output).unwrap()
+        );
+    }
 }
diff --git a/shared/yeast-schema/src/schema.rs b/shared/yeast-schema/src/schema.rs
index 0675d8913422..3ac2779703d9 100644
--- a/shared/yeast-schema/src/schema.rs
+++ b/shared/yeast-schema/src/schema.rs
@@ -47,7 +47,7 @@ pub struct Schema {
     /// Per-node-kind declared field order (named fields only), as written in
     /// the source node-types YAML. Field ids are not a stable ordering key
     /// across front-ends, so this preserves the authored order for
-    /// presentation (see the AST dump).
+    /// presentation (see the AST dump) and tree traversal during extraction.
     field_order: BTreeMap<String, Vec<FieldId>>,
 }
 
@@ -193,6 +193,17 @@ impl Schema {
         for name in other.field_ids.keys() {
             self.register_field(name);
         }
+        for (kind, order) in &other.field_order {
+            let order = order
+                .iter()
+                .filter_map(|&field_id| {
+                    other
+                        .field_name_for_id(field_id)
+                        .map(|name| self.register_field(name))
+                })
+                .collect();
+            self.set_field_order(kind, order);
+        }
     }
 
     /// Track a name for a kind ID without registering it as named or
@@ -266,13 +277,8 @@ impl Schema {
             .insert((parent_kind.to_string(), field_id), node_types);
     }
 
-    pub fn field_types(
-        &self,
-        parent_kind: &str,
-        field_id: FieldId,
-    ) -> Option<&Vec<NodeType>> {
-        self.field_types
-            .get(&(parent_kind.to_string(), field_id))
+    pub fn field_types(&self, parent_kind: &str, field_id: FieldId) -> Option<&Vec<NodeType>> {
+        self.field_types.get(&(parent_kind.to_string(), field_id))
     }
 
     /// Record the declared (named) field order for a node kind, as authored in
diff --git a/shared/yeast/Cargo.toml b/shared/yeast/Cargo.toml
index 518a0d1cefc2..de01b55abf29 100644
--- a/shared/yeast/Cargo.toml
+++ b/shared/yeast/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-clap = { version = "4.4.10", features = ["derive"] }
-serde = { version = "1.0.193", features = ["derive"] }
-serde_json = "1.0.108"
+clap = { version = "4.6.7", features = ["derive"] }
+serde = { version = "1.0.229", features = ["derive"] }
+serde_json = "1.0.154"
 serde_yaml = "0.9"
 tree-sitter = ">= 0.23.0"
 yeast-macros = { path = "../yeast-macros" }
 yeast-schema = { path = "../yeast-schema" }
 
 tree-sitter-ruby = "0.23"
-tree-sitter-python = "0.23"
+tree-sitter-python = "0.25"
diff --git a/shared/yeast/doc/yeast.md b/shared/yeast/doc/yeast.md
index be3bc913c700..99d3424c1a52 100644
--- a/shared/yeast/doc/yeast.md
+++ b/shared/yeast/doc/yeast.md
@@ -53,29 +53,18 @@ A YEAST `Rule` has two parts:
    pattern language.
 2. A **transform** that produces replacement nodes from the match captures.
 
-The `Runner` applies rules by walking the tree top-down. At each node, it
-tries each rule in order. If a rule's query matches, the node is replaced by
-the transform's output, and the rules are re-applied to the result. If no
-rule matches, the node is kept and its children are processed recursively.
+The `Runner` translates the root with the first matching rule. Before the
+rule's transform runs, captured input nodes are recursively translated with
+the same rules. Every visited input node must match a rule; a missing match is
+an error.
 
 A rule can replace one node with zero nodes (deletion), one node (rewriting),
 or multiple nodes (expansion).
 
-By default a rule fires **at most once on a given node**: after firing, the
-engine will not re-try that same rule on the result root. Other rules may
-still fire on the result, and the rule may still fire on different nodes
-(including the result's children). To opt into iterative behaviour — when a
-rule's output is intentionally re-matched by the same rule — call
-`.repeated()` on the constructed `Rule`:
-
-```rust
-let r = yeast::rule!((foo ...) => (foo ...)).repeated();
-```
-
-Without `.repeated()`, a rule whose output happens to match its own query
-simply fires once and stops. With `.repeated()`, the rule is allowed to
-re-match indefinitely; the runner still enforces a global rewrite-depth
-limit (currently 100) as a safety net against accidental cycles.
+A rule's output is final for the current phase: it is not matched or traversed
+again. This allows rule queries to describe the input schema while transforms
+build nodes from a different output schema. Use another named phase when the
+output of one exhaustive translation must become the input to another.
 
 ## Query language
 
@@ -163,30 +152,53 @@ queries, are not supported.
 (_)+                   // one or more
 (_)?                   // zero or one
 (identifier)* @names   // capture each repeated match
+"+"* @operators        // repeat and capture an unnamed token
 ```
 
+When a parenthesized query starts with a node-kind identifier, it is always
+parsed as that node pattern, and every remaining token must belong to that
+node's fields or children. Otherwise, two or more sibling patterns form a
+sequence. A sequence may be repeated, but it cannot itself be captured because
+the sequence does not correspond to one AST node:
+
+```rust
+((identifier) @items (integer) @items)*  // explicit flattened captures
+((identifier) (integer))* @items         // error: sequence capture
+```
+
+Literal- and wildcard-led sequences are valid and unambiguous because neither
+can introduce node fields:
+
+```rust
+("+" ",")*  // repeat a two-token sequence
+(_ ",")*    // repeat a wildcard followed by a comma
+```
+
+Single-pattern and empty query groups are rejected as redundant or meaningless.
+This does not affect the empty output template `()`, which intentionally means
+“emit no replacement nodes.”
+
 ## Template language
 
 Templates construct new AST nodes using the `tree!` and `trees!` macros.
 All children in a template must be in named fields — output AST nodes are
 always fully fielded.
 
-When used inside a `rule!` macro, the context is implicit — no explicit
-`BuildCtx` argument is needed. When used standalone, they take a `BuildCtx`
-as the first argument:
+The macros use a `BuildCtx` binding named `ctx` from the surrounding scope.
+`rule!` provides this binding automatically; standalone uses must create it:
 
 ```rust
-// Inside rule! — implicit context, captures are Rust variables
+// Inside rule! — ctx is provided automatically, captures are Rust variables
 yeast::rule!(
     (assignment left: (_) @left right: (_) @right)
     =>
     (assignment left: {right} right: {left})
 );
 
-// Standalone — explicit context
-let fresh = yeast::tree_builder::FreshScope::new();
-let mut ctx = BuildCtx::new(ast, &captures, &fresh);
-let id = yeast::tree!(ctx,
+// Standalone — create a binding named ctx
+let mut user_ctx = ();
+let mut ctx = BuildCtx::new(ast, &captures, &mut user_ctx);
+let id = yeast::tree!(
     (assignment
         left: {ctx.capture("lhs")}
         right: {ctx.capture("rhs")}
@@ -199,7 +211,7 @@ let id = yeast::tree!(ctx,
 `tree!(...)` returns a single node `Id`:
 
 ```rust
-yeast::tree!(ctx,
+yeast::tree!(
     (assignment
         left: {ctx.capture("lhs")}
         right: {ctx.capture("rhs")}
@@ -212,7 +224,7 @@ yeast::tree!(ctx,
 `trees!(...)` returns `Vec<Id>`:
 
 ```rust
-yeast::trees!(ctx,
+yeast::trees!(
     (assignment left: {tmp} right: {right})
     {body}
 )
@@ -235,67 +247,152 @@ yeast::trees!(ctx,
 (identifier #{name})         // an identifier from a Rust variable
 ```
 
-### Optional fields (`?`)
+### Source locations
 
-A `?` on a field's value makes that field fallible. If a `#{expr}` anywhere
-beneath it interpolates an absent value — an `Option` that is `None` — the
-subtree is abandoned and the field is left unset:
+Captured nodes keep the locations assigned by their own translations. New
+nodes in an output template derive their locations from their children. A
+source-less nested node receives an empty location at the start of the matched
+input node. After the transform completes, the full matched range is added only
+to locally-created nodes returned as rule results:
 
 ```rust
-rule!((breakStmt label: _? @@lbl) => (break_expr label: (identifier #{lbl})?))
+rule!(
+    (wrapper child: (_) @child)
+    =>
+    (outer nested: (inner value: {child}))
+)
 ```
 
-Here an optional capture is being wrapped in a leaf, which without `?` needs
-an `Option::map` to build the leaf only in the `Some` case:
+Here `inner` derives its range from `child`, while the returned `outer` node
+also includes the full `wrapper` range. A nested node with no located children
+would instead receive an empty range at the start of `wrapper`. This lets
+replacement roots include elided keywords or delimiters without assigning the
+same broad range to every synthetic descendant. A transform that simply
+returns a translated capture does not widen that capture to the wrapper's
+range.
+
+The special `location` field overrides the location of the node on which it
+appears. Its value must be a Rust block and uses the same node-splicing rules
+as an ordinary field block, but is metadata and is not added to the output AST:
 
 ```rust
-// Equivalent, but the intent is buried in the closure:
-(break_expr label: {lbl.map(|l| tree!((identifier #{l})))})
+rule!(
+    (wrapper
+        first: (_) @first
+        second: (_) @second
+        child: (_) @child)
+    =>
+    (synthetic_node
+        child: {child}
+        location: {[first, second]})
+)
 ```
 
-The marker mirrors the query language, where a quantifier likewise follows the
-value it applies to (`label: _? @@lbl`). Note that the schema puts it on the
-other side of the colon — `external_name?: identifier` — because it is
-*declaring* a field's cardinality rather than supplying a value for it.
+If a `location` value yields several nodes, their locations are combined into
+the smallest range containing all of them. Multiple `location` fields on the
+same node are combined in the same way. The field can also be used on literal
+leaf nodes:
 
-Absence propagates outwards through as many levels as necessary, and a nested
-`?` catches first, so an inner absent value need not discard the outer node:
+```rust
+(identifier "synthetic" location: {source_node})
+```
+
+The override applies only to the node carrying the `location` field; nested
+nodes still derive their locations normally.
+
+As an exception to the Rust-block requirement above, use `location: none` for a
+synthetic node that intentionally has no source location. The field-combination
+rules above apply only to block-valued fields: `location: none` cannot be
+combined with any other `location` field on the same node. A locationless node
+does not contribute to its parent's derived range, and a returned rule result
+marked this way does not inherit the matched input range:
 
 ```rust
-// If `name` is absent, `pattern` is left unset — but `type` is still set.
-(parameter pattern: (name_pattern identifier: (identifier #{name}))? type: {ty})
+(metadata_node location: none)
 ```
 
-Only `#{expr}` propagates absence, because it supplies a node's *content*: with
-no value there is no leaf to build. A `{expr}` splice supplies *children*, where
-yielding nothing already leaves the field unset (see below), so `?` is rejected
-on one. Repetition has no marker at all, in templates or elsewhere: how many
-children a `{expr}` contributes is a property of the expression rather than of
-the syntax.
+For input fields whose leading or trailing syntax should never belong to rule
+results, configure them once with
+`DesugaringConfig::with_ignored_location_fields(...)`. For example, ignoring
+`trailingComma` retains the rest of each matched list element without requiring
+every rule to capture or handle the comma.
+
+For literals, `ctx.literal_at_start_of(...)` creates an empty range at another
+node's start.
+
+For reviewing locations, `DumpOptions::show_abridged_source` prints each node's
+source range with every direct child replaced by its field name in Unicode
+angle brackets. This keeps delimiters and other parent-owned syntax visible
+without repeating entire subtrees:
+
+```text
+return_expr source="return ⟨value⟩"
+  value:
+    call_expr source="⟨callee⟩(⟨argument⟩)"
+```
 
-Outside a `?`, interpolating an `Option` with `#{expr}` remains a compile error.
-That is deliberate: it keeps the choice between "leave the field unset" and
-"unwrap it" explicit at every interpolation.
+Children outside the node's source range retain their own locations and are
+annotated where they are printed rather than being treated as errors:
 
-### Fresh identifiers
+```text
+accessor_declaration source="⟨accessor_kind⟩"
+  name_node: identifier "value" source="value" (external)
+```
+
+Node and child ranges are still validated against the source text and UTF-8
+boundaries.
+
+### Template choices (`[]`)
 
-`(kind $name)` creates a leaf node with an auto-generated unique name. All
-occurrences of the same `$name` within one `BuildCtx` share the same value:
+Brackets contain one or more ordered template alternatives. For each
+alternative, Yeast evaluates its optional `if {guard}` and preflights every
+`#{expr}` beneath it. If the guard is false or an interpolation produces
+`None`, that alternative is skipped without constructing any of its template
+nodes. The first alternative that can be constructed is emitted:
 
 ```rust
-(block
-    parameters: (block_parameters
-        (identifier $tmp)         // generates e.g. "$tmp-0"
-    )
-    body: (block_body
-        (assignment
-            left: {pat}
-            right: (identifier $tmp)   // same "$tmp-0" value
-        )
-    )
-)
+rule!((breakStmt label: _? @@lbl) => (break_expr label: [(identifier #{lbl})]))
+```
+
+Here an optional capture is being wrapped in a leaf. A multi-way choice can
+provide a fallback, and alternatives can have explicit guards:
+
+```rust
+(import_declaration
+    pattern: [
+        (identifier #{last}) if { kind.is_some() }
+        (bulk_importing_pattern)
+    ])
 ```
 
+A choice may contain any nonzero number of alternatives. A single-alternative
+choice expresses an optional tree. Nested choices handle their own
+dependencies, so an inner absent value need not discard the outer node:
+
+```rust
+// If `name` is absent, `pattern` is left unset — but `type` is still set.
+(parameter
+    pattern: [
+        (name_pattern identifier: [(identifier #{name})])
+    ]
+    type: {ty})
+```
+
+Only `#{expr}` propagates absence, because it supplies a node's *content*: with
+no value there is no leaf to build. A `{expr}` splice supplies *children*, where
+yielding nothing already leaves the field unset (see below). How many children
+a `{expr}` contributes is a property of the expression rather than of the
+template syntax.
+
+Outside a choice, interpolating an `Option` with `#{expr}` remains a compile
+error. That is deliberate: it keeps the choice between rejecting an
+alternative and unwrapping the value explicit at every interpolation.
+
+Choice dependencies are evaluated before construction begins. A rejected
+alternative therefore leaves no partially constructed template nodes in the
+AST. Guards and dependencies are evaluated once, in source order. A nested
+choice is a separate dependency boundary.
+
 ### Embedded Rust expressions
 
 `{expr}` embeds a Rust expression whose value is appended to the
@@ -315,16 +412,17 @@ options uniformly:
     right: {rhs}               // a captured value (inside rule!)
 )
 
-yeast::trees!(ctx,
+yeast::trees!(
     (assignment left: {tmp} right: {right})
     {extra_nodes}              // splices a Vec<Id>
 )
 ```
 
 Because an `Option<Id>` splices as zero or one id, `field: {opt}` already
-leaves the field unset when `opt` is `None`. Use [`?`](#optional-fields-)
-instead when the optional value has to be *wrapped* in a node first, so that
-there is nothing to wrap when it is absent.
+leaves the field unset when `opt` is `None`. Use a
+[single-alternative template choice](#template-choices-) instead when the
+optional value has to be *wrapped* in a node first, so that there is nothing
+to wrap when it is absent.
 
 The contents of `{…}` are treated as a Rust block, so multi-statement
 expressions (with `let` bindings) work too:
@@ -351,10 +449,9 @@ rule!(
 
 ### Raw captures (`@@name`)
 
-The default `@name` capture marker is *auto-translated*: in OneShot
-phases the macro recursively translates the captured node before
-binding it, so `{name}` in the output template splices a node that
-already conforms to the output schema.
+The default `@name` capture marker is *auto-translated*: the macro recursively
+translates the captured node before binding it, so `{name}` in the output
+template splices a node that already conforms to the output schema.
 
 For rules that need the raw (input-schema) capture — typically to read
 its source text or to translate it explicitly with mutable context
@@ -378,51 +475,12 @@ yeast::rule!(
 );
 ```
 
-Mix `@` and `@@` freely in the same rule. In a Repeating phase both
-markers are equivalent (auto-translation is a no-op for repeating
-rules).
-
-## Complete example: for-loop desugaring
-
-This rule rewrites Ruby's `for pat in val do body end` into
-`val.each { |tmp| pat = tmp; body }`:
-
-```rust
-let for_rule = yeast::rule!(
-    (for
-        pattern: (_) @pat
-        value: (in (_) @val)
-        body: (do (_)* @body)
-    )
-    =>
-    (call
-        receiver: {val}
-        method: (identifier "each")
-        block: (block
-            parameters: (block_parameters
-                (identifier $tmp)
-            )
-            body: (block_body
-                (assignment
-                    left: {pat}
-                    right: (identifier $tmp)
-                )
-                {..body}
-            )
-        )
-    )
-);
-```
-
-Captures from the query (`@pat`, `@val`, `@body`) become Rust variables
-automatically: single captures bind as `Id`, repeated captures (after
-`*` or `+`) as `Vec<Id>`, and optional captures (after `?`) as
-`Option<Id>`.
+Mix `@` and `@@` freely in the same rule.
 
 ## The `rule!` macro
 
 `rule!` combines a query and a transform into a single declaration.
-There are three transform forms, each suited to a different level of
+There are two transform forms, each suited to a different level of
 rule complexity:
 
 ```rust
@@ -433,13 +491,7 @@ yeast::rule!(
     (output_template field: {capture})
 )
 
-// 2. Shorthand form — captures become fields on a bare output kind.
-yeast::rule!(
-    (query_pattern field: (_) @capture)
-    => output_kind
-)
-
-// 3. Annotation form — a Rust block body preceded by the output kind.
+// 2. Annotation form — a Rust block body preceded by the output kind.
 yeast::rule!(
     (query_pattern child: (_)+ @@children)
     =>
@@ -455,8 +507,48 @@ yeast::rule!(
 )
 ```
 
-The shorthand `=> kind` form auto-generates the template, mapping each
-capture name to a field of the same name on the output node.
+### Guards
+
+A rule may include a Rust guard between its query and `=>`. The guard runs
+after the query matches but before any captures are translated. If it returns
+`false`, the rule is treated as a non-match and the driver tries the next rule.
+Omitting the guard is equivalent to writing `where true`:
+
+```rust
+rule!(
+    (tupleExpr
+        elements: (labeledExpr
+            label: _? @label
+            expression: @inner)
+        elements: _* @rest)
+    where label.is_none() && rest.is_empty()
+    =>
+    expr { inner }
+)
+```
+
+Every capture is a raw input-schema id in the guard, regardless of whether it
+uses `@` or `@@`, because the guard runs before translation. The marker controls
+the transform binding only: `@inner` is translated after the guard accepts the
+rule, while a capture marked `@@` would remain raw in the transform as well.
+In this example `label` and `rest` are empty whenever the guard succeeds, so
+there is nothing to translate for those captures.
+
+Guards receive the user context as read-only `ctx` and the raw AST as `ast`.
+The transform receives a private clone of the context after the guard succeeds:
+
+```rust
+rule!(
+    (tupleExpr elements: _* @elements)
+    where ctx.in_pattern
+        && elements
+            .first()
+            .and_then(|element| ast.get_node(*element))
+            .is_some()
+    =>
+    (tuple_pattern element: {elements})
+)
+```
 
 ### Annotation form
 
@@ -489,25 +581,22 @@ having to inspect the block's expression.
 Prefer the simplest form that fits:
 
 - If the whole transform is a tree literal, use the **template form**.
-- If the transform is a template whose root matches a query capture
-  1:1, use the **shorthand form**.
 - If the transform needs Rust logic (loops, `let` bindings, calls to
   `ctx.translate`, etc.), use the **annotation form**.
 
 ## Integration with the extractor
 
-A YEAST desugaring pass is configured with a [`DesugaringConfig`], which
-carries one or more named [`Phase`]s of rules and an optional output
-node-types schema (in YAML format). Each phase is a complete traversal
-that runs to completion before the next phase starts; only the current
-phase's rules are considered during that traversal. Attach the config to
-a language spec
-to enable rewriting:
+A YEAST translation pass is configured with a [`DesugaringConfig`], which
+carries one or more named [`Phase`]s of exhaustive rules and an optional
+output node-types schema (in YAML format). Each phase translates the previous
+phase's root before the next phase starts; only the current phase's rules are
+considered during that translation. Attach the config to a language spec to
+enable rewriting:
 
 ```rust
 let desugar = yeast::DesugaringConfig::new()
-    .add_phase("cleanup", yeast::PhaseKind::Repeating, cleanup_rules())
-    .add_phase("translate", yeast::PhaseKind::OneShot, translate_rules())
+    .add_phase("normalize", normalization_rules())
+    .add_phase("translate", translation_rules())
     .with_output_node_types_yaml(include_str!("output-node-types.yml"));
 
 let lang = simple::LanguageSpec {
@@ -522,14 +611,10 @@ let lang = simple::LanguageSpec {
 A single-phase config is just `.add_phase(...)` called once. Phase names
 appear in error messages so you can tell which phase failed.
 
-There are two kinds of phases:
-- **Repeating**:
-    Each node is re-processed until none of the rules in the phase matches.
-    When a node no longer matches any rules, its children are recursively processed. In practice this is used to desugar or simplify an AST, while staying mostly within the same schema.
-- **One-shot**:
-    Each node is processed by the first matching rule, and the engine panics if no rule matches.
-    Rules are then recursively applied to every captured node.
-    In practice this is used when translating from one AST schema to another, where an exhaustive match is required.
+Every phase uses one-shot translation: each visited input node is processed by
+the first matching rule, captured nodes are recursively translated, and the
+phase errors if no rule matches. Output nodes are not reprocessed in the same
+phase.
 
 The same YAML node-types is used for both the runtime yeast `Schema` (so
 rules can refer to output-only kinds and fields) and TRAP validation (it
@@ -567,8 +652,7 @@ let translation_rules: Vec<yeast::Rule> = yeast::rules! {
 Each comma-separated item in the bracketed list may be:
 
 - A **bare rule body** `(query) => (template)` — no `rule!(...)` wrapper.
-- An explicit `rule!(...)` invocation, with optional postfix calls such
-  as `rule!(...).repeated()`.
+- An explicit `rule!(...)` invocation.
 - Any other expression returning a `Rule` (helper functions, etc.).
 
 Schema paths are resolved relative to the consuming crate's
diff --git a/shared/yeast/src/bin/main.rs b/shared/yeast/src/bin/main.rs
index 978be21cc003..c2121e1d739e 100644
--- a/shared/yeast/src/bin/main.rs
+++ b/shared/yeast/src/bin/main.rs
@@ -20,7 +20,14 @@ fn main() {
     let args = Cli::parse();
     let language = get_language(&args.language);
     let source = std::fs::read_to_string(&args.file).unwrap();
-    let runner: yeast::Runner = yeast::Runner::new(language, &[]);
-    let ast = runner.run(&source).unwrap();
+    let mut parser = tree_sitter::Parser::new();
+    parser.set_language(&language).unwrap();
+    let tree = parser.parse(&source, None).unwrap();
+    let ast = yeast::Ast::from_tree_with_schema_and_source(
+        yeast::schema::from_language(&language),
+        &tree,
+        &language,
+        source.as_bytes().to_vec(),
+    );
     println!("{}", ast.print(&source, ast.get_root()));
 }
diff --git a/shared/yeast/src/build.rs b/shared/yeast/src/build.rs
index f4f5ae5d18f3..0f659d59d285 100644
--- a/shared/yeast/src/build.rs
+++ b/shared/yeast/src/build.rs
@@ -1,15 +1,15 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, BTreeSet};
 
-use crate::captures::Captures;
-use crate::tree_builder::FreshScope;
-use crate::{Ast, FieldId, Id, NodeContent, Range, TranslatorHandle};
+use crate::{
+    Ast, ContextNodeId, FieldId, Id, IntoFieldIds, IntoLocationRanges, KindId, NodeContent,
+    OutputAst, OutputId, Range, TranslatorHandle,
+};
 
 /// Context for building new AST nodes during a transformation.
 ///
 /// Used by the `tree!` and `trees!` macros. Holds a mutable reference to the
-/// AST, a reference to the captures from a query match, a `FreshScope` for
-/// generating unique identifiers, and a mutable reference to a user-defined
-/// context of type `C`.
+/// output AST, translated captures, and a mutable user-defined context. Rule
+/// transforms additionally carry a shared immutable input AST.
 ///
 /// The user context `C` is shared across rules via the framework's driver:
 /// outer rules can write to it before recursive translation, and inner rules
@@ -20,7 +20,7 @@ use crate::{Ast, FieldId, Id, NodeContent, Range, TranslatorHandle};
 ///
 /// `BuildCtx` implements [`Deref`] and [`DerefMut`] targeting `C`, so user
 /// context fields are accessible as `ctx.my_field` directly (provided they
-/// don't collide with `BuildCtx`'s own fields like `ast`, `captures`, etc.).
+/// don't collide with `BuildCtx`'s own fields like `output`, `captures`, etc.).
 ///
 /// The default `C = ()` means rules that don't need any user context don't
 /// pay any cost.
@@ -30,172 +30,307 @@ use crate::{Ast, FieldId, Id, NodeContent, Range, TranslatorHandle};
 /// to. When constructed by hand (e.g. in tests), the translator is `None`
 /// and [`translate`] returns an error.
 pub struct BuildCtx<'a, C: 'a = ()> {
-    pub ast: &'a mut Ast,
-    pub captures: &'a Captures,
-    pub fresh: &'a FreshScope,
-    /// Source range of the matched node, inherited by synthetic nodes.
+    ast: &'a Ast,
+    pub output: &'a mut OutputAst,
+    /// Source range of the node matched by the current rule.
+    ///
+    /// The `rule!` macro applies this range to locally-created result roots
+    /// after the transform completes. Nested synthetic nodes derive their
+    /// ranges from their children, falling back to an empty range at this
+    /// range's start.
     pub source_range: Option<Range>,
     /// User-supplied context, accessible directly via `ctx.field` (via Deref).
     pub user_ctx: &'a mut C,
     /// Optional translator handle, populated when the context is built by
     /// the framework's rule driver. None when the context is built by hand.
     pub(crate) translator: Option<TranslatorHandle<'a, C>>,
+    /// First failure encountered while auto-translating an input `Id` during
+    /// template construction. Templates remain infallible expressions, so
+    /// [`finish_rule`](Self::finish_rule) returns this error at the rule boundary.
+    deferred_translation_error: Option<String>,
+    /// Nodes built directly through this context without an explicit source
+    /// range in either their content or constructor argument. Recursive
+    /// translations use their own context and therefore do not contribute to
+    /// this set. Membership checks identify result roots to widen, while
+    /// removals exclude nodes that are later assigned an explicit range.
+    created_nodes_without_source_range: BTreeSet<OutputId>,
 }
 
 impl<'a, C> BuildCtx<'a, C> {
-    pub fn new(
-        ast: &'a mut Ast,
-        captures: &'a Captures,
-        fresh: &'a FreshScope,
-        user_ctx: &'a mut C,
-    ) -> Self {
+    pub fn new(ast: &'a Ast, output: &'a mut OutputAst, user_ctx: &'a mut C) -> Self {
         Self {
             ast,
-            captures,
-            fresh,
+            output,
             source_range: None,
             user_ctx,
             translator: None,
+            deferred_translation_error: None,
+            created_nodes_without_source_range: BTreeSet::new(),
         }
     }
 
+    /// Construct a context carrying a matched input source range.
     pub fn with_source_range(
-        ast: &'a mut Ast,
-        captures: &'a Captures,
-        fresh: &'a FreshScope,
+        ast: &'a Ast,
+        output: &'a mut OutputAst,
         source_range: Option<Range>,
         user_ctx: &'a mut C,
     ) -> Self {
         Self {
             ast,
-            captures,
-            fresh,
+            output,
             source_range,
             user_ctx,
             translator: None,
+            deferred_translation_error: None,
+            created_nodes_without_source_range: BTreeSet::new(),
         }
     }
 
     /// Construct a `BuildCtx` carrying a translator handle. Used by the
     /// `rule!` macro to enable [`translate`] inside rule transforms.
     pub fn with_translator(
-        ast: &'a mut Ast,
-        captures: &'a Captures,
-        fresh: &'a FreshScope,
+        ast: &'a Ast,
+        output: &'a mut OutputAst,
         source_range: Option<Range>,
         user_ctx: &'a mut C,
         translator: TranslatorHandle<'a, C>,
     ) -> Self {
         Self {
             ast,
-            captures,
-            fresh,
+            output,
             source_range,
             user_ctx,
             translator: Some(translator),
+            deferred_translation_error: None,
+            created_nodes_without_source_range: BTreeSet::new(),
         }
     }
 
-    /// Look up a capture variable, returning its node Id.
-    pub fn capture(&self, name: &str) -> Id {
-        self.captures
-            .get_var(name)
-            .unwrap_or_else(|e| panic!("build: {e}"))
+    /// Create a node and record it as constructed by this rule invocation.
+    pub fn create_node_with_range(
+        &mut self,
+        kind: KindId,
+        content: NodeContent,
+        fields: BTreeMap<FieldId, Vec<OutputId>>,
+        is_named: bool,
+        source_range: Option<Range>,
+    ) -> OutputId {
+        let has_explicit_source_range =
+            source_range.is_some() || matches!(&content, NodeContent::Range(_));
+        let id = self
+            .output
+            .create_node_with_range(kind, content, fields, is_named, source_range);
+        if self
+            .output
+            .get_node(id)
+            .is_some_and(|node| node.source_range().is_none())
+        {
+            if let Some(source_range) = self.source_range {
+                self.output
+                    .extend_source_range(id, source_range.empty_at_start());
+            }
+        }
+        if !has_explicit_source_range {
+            self.created_nodes_without_source_range.insert(id);
+        }
+        id
     }
 
-    /// Get all values of a repeated capture variable.
-    pub fn capture_all(&self, name: &str) -> Vec<Id> {
-        self.captures.get_all(name)
+    /// Create a named token and record it as constructed by this rule invocation.
+    pub fn create_named_token_with_range(
+        &mut self,
+        kind: &'static str,
+        content: String,
+        source_range: Option<Range>,
+    ) -> OutputId {
+        let has_explicit_source_range = source_range.is_some();
+        let source_range =
+            source_range.or_else(|| self.source_range.map(|range| range.empty_at_start()));
+        let id = self
+            .output
+            .create_named_token_with_range(kind, content, source_range);
+        if !has_explicit_source_range {
+            self.created_nodes_without_source_range.insert(id);
+        }
+        id
     }
 
-    /// Read the source text of a captured (or any other) node.
-    ///
-    /// Convenience for the common `ctx.ast.source_text(id)` reach-through used
-    /// by Rust-block rules that branch on, or embed, a raw capture's spelling
-    /// (e.g. an operator or keyword token). Resolves against the stored source
-    /// bytes, so it works for both parsed nodes and synthesized ones (via their
-    /// inherited source range).
-    pub fn source_text(&self, id: Id) -> String {
-        self.ast.source_text(id)
+    /// Finish the current rule invocation by applying the matched source range
+    /// to locally-created result roots.
+    #[doc(hidden)]
+    pub fn finish_rule(self, results: Vec<OutputId>) -> Result<Vec<OutputId>, String> {
+        if let Some(error) = self.deferred_translation_error {
+            return Err(error);
+        }
+        if let Some(source_range) = self.source_range {
+            for &id in &results {
+                if self.created_nodes_without_source_range.contains(&id) {
+                    self.output.extend_source_range(id, source_range);
+                }
+            }
+        }
+        Ok(results)
+    }
+
+    /// Assign an explicit source range to a newly-built result root.
+    #[doc(hidden)]
+    pub fn set_node_source_range(
+        &mut self,
+        node: OutputId,
+        source_range: Option<Range>,
+    ) -> OutputId {
+        if let Some(source_range) = source_range {
+            self.output.set_source_range(node, source_range);
+            self.created_nodes_without_source_range.remove(&node);
+        }
+        node
+    }
+
+    /// Explicitly make a newly-built node locationless.
+    #[doc(hidden)]
+    pub fn set_node_locationless(&mut self, node: OutputId) -> OutputId {
+        self.output.clear_source_range(node);
+        self.created_nodes_without_source_range.remove(&node);
+        node
+    }
+
+    /// Return the immutable input AST. Available inside rule transforms.
+    pub fn ast(&self) -> &Ast {
+        self.ast
+    }
+
+    pub fn source_text<I: ContextNodeId>(&self, id: I) -> String {
+        id.source_text(self)
+    }
+
+    /// Return the source range of a parsed or synthetic node.
+    pub fn source_range<I: ContextNodeId>(&self, id: I) -> Option<Range> {
+        id.source_range(self)
+    }
+
+    #[doc(hidden)]
+    pub fn extend_location_ranges<V: IntoLocationRanges<C>>(&self, value: V, out: &mut Vec<Range>) {
+        value.extend_ranges(self, out);
+    }
+
+    /// Return an empty range between two non-overlapping nodes.
+    pub fn empty_source_range_between(&self, left: OutputId, right: OutputId) -> Option<Range> {
+        let left = self.source_range(left)?;
+        let right = self.source_range(right)?;
+        (left.end_byte <= right.start_byte).then(|| left.empty_at_end())
     }
 
     /// Create a named AST node with the given kind and fields.
-    pub fn node(&mut self, kind: &str, fields: Vec<(&str, Vec<Id>)>) -> Id {
+    pub fn node(&mut self, kind: &str, fields: Vec<(&str, Vec<OutputId>)>) -> OutputId {
         let kind_id = self
-            .ast
+            .output
             .id_for_node_kind(kind)
             .unwrap_or_else(|| panic!("build: node kind '{kind}' not found"));
-        let mut field_map: BTreeMap<FieldId, Vec<Id>> = BTreeMap::new();
+        let mut field_map: BTreeMap<FieldId, Vec<OutputId>> = BTreeMap::new();
         for (name, ids) in fields {
             let field_id = self
-                .ast
+                .output
                 .field_id_for_name(name)
                 .unwrap_or_else(|| panic!("build: field '{name}' not found"));
             field_map.entry(field_id).or_default().extend(ids);
         }
-        self.ast.create_node_with_range(
+        self.create_node_with_range(
             kind_id,
             NodeContent::DynamicString(String::new()),
             field_map,
             true,
-            self.source_range,
+            None,
         )
     }
 
+    /// Create a leaf whose value is inherited from the current rule's match.
+    #[doc(hidden)]
+    pub fn inherited_literal(&mut self, kind: &'static str) -> OutputId {
+        let source = self
+            .translator
+            .as_ref()
+            .expect("inherited leaf content requires a rule match")
+            .matched_root();
+        let node = self
+            .ast
+            .get_node(source)
+            .expect("rule source node must exist");
+        let stored = node.opt_string_content();
+        let has_children = node.fields.values().any(|children| !children.is_empty());
+        let content = match stored {
+            Some(value) if !value.is_empty() || !has_children => value,
+            _ => self.ast.source_text(source),
+        };
+        self.create_named_token_with_range(kind, content, None)
+    }
+
     /// Create a leaf node with a fixed string content.
-    pub fn literal(&mut self, kind: &'static str, value: &str) -> Id {
-        self.ast
-            .create_named_token_with_range(kind, value.to_string(), self.source_range)
+    pub fn literal(&mut self, kind: &'static str, value: &str) -> OutputId {
+        self.create_named_token_with_range(kind, value.to_string(), None)
     }
 
-    /// Create a leaf node with fixed content and an optional preferred source range.
-    /// If `source_range` is `None`, falls back to this context's inherited range.
+    /// Create a leaf node with fixed content and an optional source range.
     pub fn literal_with_source_range(
         &mut self,
         kind: &'static str,
         value: &str,
         source_range: Option<Range>,
-    ) -> Id {
-        self.ast.create_named_token_with_range(
-            kind,
-            value.to_string(),
-            source_range.or(self.source_range),
-        )
+    ) -> OutputId {
+        self.create_named_token_with_range(kind, value.to_string(), source_range)
     }
 
-    /// Create a leaf node with an auto-generated unique name.
-    pub fn fresh(&mut self, kind: &'static str, name: &str) -> Id {
-        let generated = self.fresh.resolve(name);
-        self.ast
-            .create_named_token_with_range(kind, generated, self.source_range)
+    /// Create a literal with an empty range at another node's start.
+    pub fn literal_at_start_of<I: ContextNodeId>(
+        &mut self,
+        kind: &'static str,
+        value: &str,
+        source: I,
+    ) -> OutputId {
+        let source_range = self.source_range(source).map(Range::empty_at_start);
+        self.literal_with_source_range(kind, value, source_range)
     }
 }
 
 impl<C: Clone> BuildCtx<'_, C> {
+    #[doc(hidden)]
+    pub fn extend_field_ids<V: IntoFieldIds<C>>(&mut self, value: V, out: &mut Vec<OutputId>) {
+        value.extend_into(self, out);
+    }
+
+    #[doc(hidden)]
+    pub fn translate_into(&mut self, id: Id, out: &mut Vec<OutputId>) {
+        if self.deferred_translation_error.is_some() {
+            return;
+        }
+        match self.translate(id) {
+            Ok(ids) => out.extend(ids),
+            Err(error) => self.deferred_translation_error = Some(error),
+        }
+    }
+
     /// Recursively translate every id in the given iterable via the
-    /// framework's rule machinery. In a OneShot phase, applies OneShot
-    /// rules to each id and returns the accumulated resulting node ids
-    /// in order. In a Repeating phase, errors (translation is not
-    /// meaningful when input and output share a schema).
+    /// framework's rule machinery and return the accumulated resulting node
+    /// ids in order.
     ///
     /// The single-`Id` case works too, because `Id: IntoIterator<Item
     /// = Id>` is a singleton iterator — so `ctx.translate(some_id)?`
-    /// returns a `Vec<Id>` containing whatever `some_id` translated to.
+    /// returns a `Vec<OutputId>` containing whatever `some_id` translated to.
     ///
     /// Errors if this `BuildCtx` was constructed by hand (without a
     /// translator handle) — for example, in unit tests that don't go
     /// through the rule driver.
-    pub fn translate<I: Into<Id>>(
+    pub fn translate(
         &mut self,
-        ids: impl IntoIterator<Item = I>,
-    ) -> Result<Vec<Id>, String> {
+        ids: impl IntoIterator<Item = Id>,
+    ) -> Result<Vec<OutputId>, String> {
         let translator = self
             .translator
             .as_ref()
             .ok_or("translate() called on a BuildCtx without a translator handle")?;
         let mut out = Vec::new();
         for id in ids {
-            let translated = translator.translate(self.ast, self.user_ctx, id.into())?;
+            let translated = translator.translate(self.ast, self.output, self.user_ctx, id)?;
             out.extend(translated);
         }
         Ok(out)
@@ -203,8 +338,9 @@ impl<C: Clone> BuildCtx<'_, C> {
 
     /// Run `f` with a temporary child [`BuildCtx`] whose `user_ctx` is
     /// a fresh clone of the current one, sharing everything else
-    /// (`ast`, `captures`, `fresh`, `source_range`, `translator`) by
-    /// re-borrow. Any mutations `f` makes to the child's `user_ctx`
+    /// (`ast`, `captures`, source ranges, `translator`) by re-borrow.
+    /// Nodes constructed through the child remain part of the current rule
+    /// invocation. Any mutations `f` makes to the child's `user_ctx`
     /// are discarded when it returns — no restore needed, because the
     /// mutations only ever happened on a local clone.
     ///
@@ -232,14 +368,24 @@ impl<C: Clone> BuildCtx<'_, C> {
     {
         let mut child_user_ctx = self.user_ctx.clone();
         let mut child = BuildCtx {
-            ast: &mut *self.ast,
-            captures: self.captures,
-            fresh: self.fresh,
+            ast: self.ast,
+            output: &mut *self.output,
             source_range: self.source_range,
             user_ctx: &mut child_user_ctx,
             translator: self.translator,
+            deferred_translation_error: None,
+            created_nodes_without_source_range: BTreeSet::new(),
         };
-        f(&mut child)
+        let result = f(&mut child);
+        let created_nodes_without_source_range =
+            std::mem::take(&mut child.created_nodes_without_source_range);
+        if self.deferred_translation_error.is_none() {
+            self.deferred_translation_error = child.deferred_translation_error.take();
+        }
+        drop(child);
+        self.created_nodes_without_source_range
+            .extend(created_nodes_without_source_range);
+        result
         // child_user_ctx dropped; the outer `self` is unaffected.
     }
 }
diff --git a/shared/yeast/src/captures.rs b/shared/yeast/src/captures.rs
index 93141ef0084e..abe56c5a1ee5 100644
--- a/shared/yeast/src/captures.rs
+++ b/shared/yeast/src/captures.rs
@@ -1,6 +1,6 @@
 use std::collections::{BTreeMap, BTreeSet};
 
-use crate::Id;
+use crate::{Id, OutputId};
 
 #[derive(Debug, Clone)]
 pub struct Captures {
@@ -54,31 +54,23 @@ impl Captures {
         self.captures.entry(key).or_default().push(id);
     }
 
-    /// Apply a fallible function to every captured id, replacing each id
-    /// with the results. A function returning an empty vector removes
-    /// the capture; returning multiple ids splices them into the
-    /// capture's value list (suitable for `*`/`+` captures). Captures
-    /// whose name appears in `skip` are left untouched. Stops and
-    /// returns the error on the first failure.
-    ///
-    /// Used by the `rule!` macro's auto-translate prefix to translate
-    /// every capture except those marked `@@name` (raw).
-    pub fn try_map_captures_except<E>(
-        &mut self,
+    pub(crate) fn try_translate_except<E>(
+        &self,
         skip: &[&str],
-        mut f: impl FnMut(Id) -> Result<Vec<Id>, E>,
-    ) -> Result<(), E> {
-        for (name, ids) in self.captures.iter_mut() {
+        mut f: impl FnMut(Id) -> Result<Vec<OutputId>, E>,
+    ) -> Result<TranslatedCaptures, E> {
+        let mut translated = TranslatedCaptures::new();
+        for (name, ids) in &self.captures {
             if skip.contains(name) {
                 continue;
             }
-            let mut new_ids = Vec::with_capacity(ids.len());
-            for &id in ids.iter() {
-                new_ids.extend(f(id)?);
+            for &id in ids {
+                for translated_id in f(id)? {
+                    translated.insert(name, translated_id);
+                }
             }
-            *ids = new_ids;
         }
-        Ok(())
+        Ok(translated)
     }
 
     pub fn merge(&mut self, other: &Captures) {
@@ -116,3 +108,46 @@ impl Captures {
         }
     }
 }
+
+/// Output ids produced by eagerly translating non-raw query captures.
+#[derive(Debug, Clone, Default)]
+pub struct TranslatedCaptures {
+    captures: BTreeMap<&'static str, Vec<OutputId>>,
+}
+
+impl TranslatedCaptures {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn get_var(&self, key: &str) -> Result<OutputId, String> {
+        let ids = self.captures.get(key);
+        if let Some(ids) = ids {
+            if ids.len() == 1 {
+                Ok(ids[0])
+            } else {
+                Err(format!(
+                    "Variable {} has {} matches, use * to allow repetition",
+                    key,
+                    ids.len()
+                ))
+            }
+        } else {
+            Err(format!("No variable named {key}"))
+        }
+    }
+
+    pub fn get_all(&self, key: &str) -> Vec<OutputId> {
+        self.captures.get(key).cloned().unwrap_or_default()
+    }
+
+    pub fn get_opt(&self, key: &str) -> Option<OutputId> {
+        self.captures
+            .get(key)
+            .and_then(|ids| if ids.len() == 1 { Some(ids[0]) } else { None })
+    }
+
+    fn insert(&mut self, key: &'static str, id: OutputId) {
+        self.captures.entry(key).or_default().push(id);
+    }
+}
diff --git a/shared/yeast/src/dump.rs b/shared/yeast/src/dump.rs
index 0e2e57e6f82a..6890a156a7f8 100644
--- a/shared/yeast/src/dump.rs
+++ b/shared/yeast/src/dump.rs
@@ -1,6 +1,6 @@
 use std::fmt::Write;
 
-use crate::{schema::Schema, Ast, Id, Node, NodeContent, CHILD_FIELD};
+use crate::{schema::Schema, Ast, Node, NodeContent, TreeId, CHILD_FIELD};
 
 #[derive(Clone, Copy)]
 struct TypeCheckContext<'a> {
@@ -15,6 +15,9 @@ pub struct DumpOptions {
     pub show_locations: bool,
     /// Whether to include source text for leaf nodes.
     pub show_content: bool,
+    /// Whether to include each node's source range with direct-child ranges
+    /// replaced by their field names in `⟨angle brackets⟩`.
+    pub show_abridged_source: bool,
 }
 
 impl Default for DumpOptions {
@@ -22,6 +25,7 @@ impl Default for DumpOptions {
         Self {
             show_locations: false,
             show_content: true,
+            show_abridged_source: false,
         }
     }
 }
@@ -41,13 +45,18 @@ impl Default for DumpOptions {
 ///         method:
 ///           identifier "foo"
 /// ```
-pub fn dump_ast(ast: &Ast, root: Id, source: &str) -> String {
+pub fn dump_ast<Id: TreeId>(ast: &Ast<Id>, root: Id, source: &str) -> String {
     dump_ast_with_options(ast, root, source, &DumpOptions::default())
 }
 
-pub fn dump_ast_with_options(ast: &Ast, root: Id, source: &str, options: &DumpOptions) -> String {
+pub fn dump_ast_with_options<Id: TreeId>(
+    ast: &Ast<Id>,
+    root: Id,
+    source: &str,
+    options: &DumpOptions,
+) -> String {
     let mut out = String::new();
-    dump_node(ast, root, source, options, 0, None, &mut out);
+    dump_node(ast, root, source, options, 0, None, false, &mut out);
     out
 }
 
@@ -55,7 +64,12 @@ pub fn dump_ast_with_options(ast: &Ast, root: Id, source: &str, options: &DumpOp
 ///
 /// Any node that does not match the expected type set for its parent field is
 /// rendered with a trailing `" <-- ERROR: ..."` annotation on the same line.
-pub fn dump_ast_with_type_errors(ast: &Ast, root: Id, source: &str, schema: &Schema) -> String {
+pub fn dump_ast_with_type_errors<Id: TreeId>(
+    ast: &Ast<Id>,
+    root: Id,
+    source: &str,
+    schema: &Schema,
+) -> String {
     dump_ast_with_type_errors_and_options(ast, root, source, schema, &DumpOptions::default())
 }
 
@@ -63,8 +77,8 @@ pub fn dump_ast_with_type_errors(ast: &Ast, root: Id, source: &str, schema: &Sch
 ///
 /// Any node that does not match the expected type set for its parent field is
 /// rendered with a trailing `" <-- ERROR: ..."` annotation on the same line.
-pub fn dump_ast_with_type_errors_and_options(
-    ast: &Ast,
+pub fn dump_ast_with_type_errors_and_options<Id: TreeId>(
+    ast: &Ast<Id>,
     root: Id,
     source: &str,
     schema: &Schema,
@@ -82,6 +96,7 @@ pub fn dump_ast_with_type_errors_and_options(
             expected: None,
             parent_field: None,
         }),
+        false,
         &mut out,
     );
     out
@@ -114,9 +129,9 @@ const EMPTY_NODE_TYPES: &[crate::schema::NodeType] = &[];
 /// # Returns
 /// `Some(error_message)` if the node violates the schema (e.g., wrong kind, missing field declaration).
 /// `None` if the node matches the expected types or if type-checking is disabled.
-fn type_error_for_node(
+fn type_error_for_node<Id: TreeId>(
     schema: &Schema,
-    node: &Node,
+    node: &Node<Id>,
     expected: Option<&[crate::schema::NodeType]>,
     parent_field: Option<(&str, &str)>,
 ) -> Option<String> {
@@ -184,13 +199,14 @@ fn expected_for_field<'a>(
         .map(|v| v.as_slice())
 }
 
-fn dump_node(
-    ast: &Ast,
+fn dump_node<Id: TreeId>(
+    ast: &Ast<Id>,
     id: Id,
     source: &str,
     options: &DumpOptions,
     indent: usize,
     type_check: Option<TypeCheckContext<'_>>,
+    external_to_parent: bool,
     out: &mut String,
 ) {
     let node = match ast.get_node(id) {
@@ -226,6 +242,13 @@ fn dump_node(
         }
     }
 
+    if options.show_abridged_source {
+        write_source_skeleton(ast, node, source, out);
+        if external_to_parent {
+            write!(out, " (external)").unwrap();
+        }
+    }
+
     if let Some(context) = type_check {
         if let Some(err) =
             type_error_for_node(context.schema, node, context.expected, context.parent_field)
@@ -292,9 +315,18 @@ fn dump_node(
             write!(out, "{prefix}  {field_name}:").unwrap();
             // Inline single child
             let child = ast.get_node(children[0]);
+            let external = child.is_some_and(|child| is_external_child(node, child));
             if child.is_some_and(is_leaf) {
                 write!(out, " ").unwrap();
-                dump_node_inline(ast, children[0], source, options, child_type_check, out);
+                dump_node_inline(
+                    ast,
+                    children[0],
+                    source,
+                    options,
+                    child_type_check,
+                    external,
+                    out,
+                );
             } else {
                 writeln!(out).unwrap();
                 dump_node(
@@ -304,12 +336,16 @@ fn dump_node(
                     options,
                     indent + 2,
                     child_type_check,
+                    external,
                     out,
                 );
             }
         } else {
             writeln!(out, "{prefix}  {field_name}:").unwrap();
             for &child_id in children {
+                let external = ast
+                    .get_node(child_id)
+                    .is_some_and(|child| is_external_child(node, child));
                 dump_node(
                     ast,
                     child_id,
@@ -317,6 +353,7 @@ fn dump_node(
                     options,
                     indent + 2,
                     child_type_check,
+                    external,
                     out,
                 );
             }
@@ -357,6 +394,7 @@ fn dump_node(
         for &child_id in children {
             if let Some(child) = ast.get_node(child_id) {
                 if child.is_named() {
+                    let external = is_external_child(node, child);
                     dump_node(
                         ast,
                         child_id,
@@ -364,6 +402,7 @@ fn dump_node(
                         options,
                         indent + 1,
                         child_type_check,
+                        external,
                         out,
                     );
                 }
@@ -373,12 +412,13 @@ fn dump_node(
 }
 
 /// Dump a leaf node inline (no newline prefix, caller provides context).
-fn dump_node_inline(
-    ast: &Ast,
+fn dump_node_inline<Id: TreeId>(
+    ast: &Ast<Id>,
     id: Id,
     source: &str,
     options: &DumpOptions,
     type_check: Option<TypeCheckContext<'_>>,
+    external_to_parent: bool,
     out: &mut String,
 ) {
     let node = match ast.get_node(id) {
@@ -409,6 +449,13 @@ fn dump_node_inline(
         }
     }
 
+    if options.show_abridged_source {
+        write_source_skeleton(ast, node, source, out);
+        if external_to_parent {
+            write!(out, " (external)").unwrap();
+        }
+    }
+
     if let Some(context) = type_check {
         if let Some(err) =
             type_error_for_node(context.schema, node, context.expected, context.parent_field)
@@ -420,11 +467,106 @@ fn dump_node_inline(
     writeln!(out).unwrap();
 }
 
-fn is_leaf(node: &Node) -> bool {
+fn is_leaf<Id: TreeId>(node: &Node<Id>) -> bool {
     node.fields.is_empty()
 }
 
-fn node_content(node: &Node, source: &str) -> String {
+enum SourceSkeleton {
+    Missing,
+    Text(String),
+    Invalid(String),
+}
+
+fn write_source_skeleton<Id: TreeId>(
+    ast: &Ast<Id>,
+    node: &Node<Id>,
+    source: &str,
+    out: &mut String,
+) {
+    match source_skeleton(ast, node, source) {
+        SourceSkeleton::Missing => write!(out, " source=<no location>").unwrap(),
+        SourceSkeleton::Text(text) => write!(out, " source={text:?}").unwrap(),
+        SourceSkeleton::Invalid(error) => write!(out, " source=<invalid: {error}>").unwrap(),
+    }
+}
+
+fn node_source_range<Id: TreeId>(node: &Node<Id>) -> Option<crate::Range> {
+    match node.content {
+        NodeContent::Range(range) => Some(range),
+        _ => node.source_range,
+    }
+}
+
+fn is_external_child<Id: TreeId>(parent: &Node<Id>, child: &Node<Id>) -> bool {
+    let (Some(parent), Some(child)) = (node_source_range(parent), node_source_range(child)) else {
+        return false;
+    };
+    child.start_byte < parent.start_byte || child.end_byte > parent.end_byte
+}
+
+fn source_skeleton<Id: TreeId>(ast: &Ast<Id>, node: &Node<Id>, source: &str) -> SourceSkeleton {
+    let Some(parent) = node_source_range(node) else {
+        return SourceSkeleton::Missing;
+    };
+    let parent = parent.start_byte..parent.end_byte;
+    if parent.start > parent.end || source.get(parent.clone()).is_none() {
+        return SourceSkeleton::Invalid(format!(
+            "node range {}..{} is outside the source or not on UTF-8 boundaries",
+            parent.start, parent.end
+        ));
+    }
+
+    let mut children = Vec::new();
+    for (field_id, child_ids) in &node.fields {
+        let field_name = if *field_id == CHILD_FIELD {
+            "child"
+        } else {
+            ast.field_name_for_id(*field_id).unwrap_or("?")
+        };
+        for child_id in child_ids {
+            let Some(child) = ast.get_node(*child_id) else {
+                continue;
+            };
+            if !child.is_named() {
+                continue;
+            }
+            let Some(child) = node_source_range(child) else {
+                continue;
+            };
+            let child = child.start_byte..child.end_byte;
+            if child.start > child.end || source.get(child.clone()).is_none() {
+                return SourceSkeleton::Invalid(format!(
+                    "child range {}..{} is outside the source or not on UTF-8 boundaries",
+                    child.start, child.end
+                ));
+            }
+            if child.start < parent.start || child.end > parent.end {
+                continue;
+            }
+            if child.start == child.end {
+                continue;
+            }
+            children.push((child, field_name));
+        }
+    }
+    children.sort_by_key(|(range, field_name)| (range.start, range.end, *field_name));
+
+    let mut result = String::new();
+    let mut cursor = parent.start;
+    for (range, field_name) in children {
+        if cursor < range.start {
+            result.push_str(source.get(cursor..range.start).unwrap());
+        }
+        result.push('⟨');
+        result.push_str(field_name);
+        result.push('⟩');
+        cursor = cursor.max(range.end);
+    }
+    result.push_str(source.get(cursor..parent.end).unwrap());
+    SourceSkeleton::Text(result)
+}
+
+fn node_content<Id: TreeId>(node: &Node<Id>, source: &str) -> String {
     match &node.content {
         NodeContent::DynamicString(s) if !s.is_empty() => s.clone(),
         _ => {
@@ -437,3 +579,169 @@ fn node_content(node: &Node, source: &str) -> String {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{NodeContent, OutputAst, Point, Range};
+    use std::collections::BTreeMap;
+
+    fn range(start: usize, end: usize) -> Range {
+        Range {
+            start_byte: start,
+            end_byte: end,
+            start_point: Point::new(0, start),
+            end_point: Point::new(0, end),
+        }
+    }
+
+    fn dump_with_children(source: &str, parent_range: Range, children: &[(&str, Range)]) -> String {
+        let mut ast = OutputAst::with_schema(crate::schema::Schema::new());
+        let parent_kind = ast.register_kind("parent");
+        let child_kind = ast.register_kind("child");
+        let mut fields = BTreeMap::new();
+        for (field_name, range) in children {
+            let field = ast.register_field(field_name);
+            let child = ast.create_node_with_range(
+                child_kind,
+                NodeContent::Range(*range),
+                BTreeMap::new(),
+                true,
+                None,
+            );
+            fields.entry(field).or_insert_with(Vec::new).push(child);
+        }
+        let parent = ast.create_node_with_range(
+            parent_kind,
+            NodeContent::Range(parent_range),
+            fields,
+            true,
+            None,
+        );
+        ast.set_root(parent);
+
+        dump_ast_with_options(
+            &ast,
+            parent,
+            source,
+            &DumpOptions {
+                show_locations: false,
+                show_content: false,
+                show_abridged_source: true,
+            },
+        )
+    }
+
+    #[test]
+    fn source_skeleton_elides_direct_children_and_ignores_empty_ranges() {
+        let source = "αbefore(child)afterω";
+        let child_start = source.find("child").unwrap();
+        let child_end = child_start + "child".len();
+        let dump = dump_with_children(
+            source,
+            range(0, source.len()),
+            &[
+                ("value", range(child_start, child_end)),
+                ("marker", range(child_start, child_start)),
+            ],
+        );
+
+        assert!(dump.starts_with("parent source=\"αbefore(⟨value⟩)afterω\"\n"));
+    }
+
+    #[test]
+    fn source_skeleton_preserves_unnamed_tokens() {
+        let source = "x = 1";
+        let language: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+        let mut parser = tree_sitter::Parser::new();
+        parser.set_language(&language).unwrap();
+        let tree = parser.parse(source, None).unwrap();
+        let ast = Ast::from_tree_with_schema_and_source(
+            crate::schema::from_language(&language),
+            &tree,
+            &language,
+            source.as_bytes().to_vec(),
+        );
+        let dump = dump_ast_with_options(
+            &ast,
+            ast.get_root(),
+            source,
+            &DumpOptions {
+                show_locations: false,
+                show_content: false,
+                show_abridged_source: true,
+            },
+        );
+
+        assert!(dump.contains("assignment source=\"⟨left⟩ = ⟨right⟩\""));
+    }
+
+    #[test]
+    fn source_skeleton_validates_empty_child_ranges() {
+        let cases = [
+            (
+                "abcdef",
+                range(0, 6),
+                range(7, 7),
+                "child range 7..7 is outside the source or not on UTF-8 boundaries",
+            ),
+            (
+                "αbc",
+                range(0, 4),
+                range(1, 1),
+                "child range 1..1 is outside the source or not on UTF-8 boundaries",
+            ),
+        ];
+
+        for (source, parent, child, error) in cases {
+            let dump = dump_with_children(source, parent, &[("marker", child)]);
+            assert!(
+                dump.starts_with(&format!("parent source=<invalid: {error}>\n")),
+                "unexpected dump: {dump}"
+            );
+        }
+
+        let dump = dump_with_children("abcdef", range(0, 3), &[("marker", range(4, 4))]);
+        assert!(dump.starts_with("parent source=\"abc\"\n"));
+        assert!(
+            dump.contains("marker: child source=\"\" (external)\n"),
+            "unexpected dump: {dump}"
+        );
+    }
+
+    #[test]
+    fn source_skeleton_keeps_adjacent_child_fields_separate() {
+        let source = "abcdef";
+        let dump = dump_with_children(
+            source,
+            range(0, source.len()),
+            &[("left", range(1, 3)), ("right", range(3, 5))],
+        );
+
+        assert!(dump.starts_with("parent source=\"a⟨left⟩⟨right⟩f\"\n"));
+    }
+
+    #[test]
+    fn source_skeleton_keeps_overlapping_child_fields_separate() {
+        let source = "abcdef";
+        let dump = dump_with_children(
+            source,
+            range(0, source.len()),
+            &[("left", range(1, 4)), ("right", range(3, 5))],
+        );
+
+        assert!(dump.starts_with("parent source=\"a⟨left⟩⟨right⟩f\"\n"));
+    }
+
+    #[test]
+    fn source_skeleton_marks_children_outside_the_parent() {
+        let source = "abcdefghi";
+        let dump = dump_with_children(source, range(0, 6), &[("child", range(7, 9))]);
+
+        assert!(dump.starts_with("parent source=\"abcdef\"\n"));
+        assert!(
+            dump.contains("  child source=\"hi\" (external)\n"),
+            "unexpected dump: {dump}"
+        );
+    }
+}
diff --git a/shared/yeast/src/lib.rs b/shared/yeast/src/lib.rs
index cf06d2d2c17b..917a39e81f5d 100644
--- a/shared/yeast/src/lib.rs
+++ b/shared/yeast/src/lib.rs
@@ -12,13 +12,12 @@ pub mod node_types_yaml;
 pub mod query;
 mod range;
 pub mod schema;
-pub mod tree_builder;
 mod visitor;
 
 pub use range::{Point, Range};
 pub use yeast_macros::{query, rule, rules, tree, trees};
 
-use captures::Captures;
+use captures::{Captures, TranslatedCaptures};
 use query::QueryNode;
 
 impl From<tree_sitter::Point> for Point {
@@ -41,22 +40,67 @@ impl From<tree_sitter::Range> for Range {
     }
 }
 
-/// Node id: an index into the [`Ast`] arena. A newtype around `usize`
+/// Node id: an index into the output [`OutputAst`] arena. A newtype around `usize`
 /// rather than a bare alias so that it can carry its own
 /// [`YeastDisplay`] / [`YeastSourceRange`] / [`IntoFieldIds`] impls
 /// without colliding with the impls for plain integers.
 ///
 /// Use `id.0` (or `id.into()`) to obtain the raw arena index.
 ///
-/// Implements [`IntoIterator`] as a singleton (`iter::once(self)`)
-/// so that a bare `Id` can be used interchangeably with `Option<Id>`
-/// / `Vec<Id>` in places that expect an iterable of ids (e.g.
-/// [`crate::build::BuildCtx::translate`] and the field-splice
-/// interpolation via [`IntoFieldIds`]).
+/// Implements [`IntoIterator`] as a singleton (`iter::once(self)`) so that a
+/// bare `OutputId` can be used interchangeably with `Option<OutputId>` / `Vec<OutputId>` in
+/// structural template interpolation.
+#[repr(transparent)]
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug, Hash, Serialize)]
+pub struct OutputId(pub usize);
+
+/// Node id in the immutable [`Ast`] consumed by a translation.
+///
+/// Keeping input and output ids distinct prevents untranslated input nodes
+/// from being inserted into the output tree without going through the active
+/// translator.
 #[repr(transparent)]
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug, Hash, Serialize)]
 pub struct Id(pub usize);
 
+#[doc(hidden)]
+pub trait TreeId: Copy + Eq + std::fmt::Debug {
+    fn from_index(index: usize) -> Self;
+    fn index(self) -> usize;
+}
+
+impl TreeId for OutputId {
+    fn from_index(index: usize) -> Self {
+        Self(index)
+    }
+
+    fn index(self) -> usize {
+        self.0
+    }
+}
+
+impl TreeId for Id {
+    fn from_index(index: usize) -> Self {
+        Self(index)
+    }
+
+    fn index(self) -> usize {
+        self.0
+    }
+}
+
+impl From<usize> for OutputId {
+    fn from(value: usize) -> Self {
+        OutputId(value)
+    }
+}
+
+impl From<OutputId> for usize {
+    fn from(value: OutputId) -> Self {
+        value.0
+    }
+}
+
 impl From<usize> for Id {
     fn from(value: usize) -> Self {
         Id(value)
@@ -69,6 +113,14 @@ impl From<Id> for usize {
     }
 }
 
+impl IntoIterator for OutputId {
+    type Item = OutputId;
+    type IntoIter = std::iter::Once<OutputId>;
+    fn into_iter(self) -> Self::IntoIter {
+        std::iter::once(self)
+    }
+}
+
 impl IntoIterator for Id {
     type Item = Id;
     type IntoIter = std::iter::Once<Id>;
@@ -86,67 +138,153 @@ type KindId = yeast_schema::KindId;
 /// single value.
 pub use yeast_schema::CHILD_FIELD;
 
-/// Trait for values that can be appended to a field's id list inside a
-/// `tree!`/`trees!`/`rule!` template (in `{expr}` placeholders).
+/// Trait for values that can be appended to a structural field inside a
+/// `tree!`/`trees!`/`rule!` template.
 ///
-/// The blanket impl for `IntoIterator<Item: Into<Id>>` handles all
-/// current shapes: `Vec<Id>`, `Option<Id>`, arbitrary iterators
-/// yielding `Id`, and a bare `Id` itself (which is `IntoIterator`
-/// via a singleton).
+#[doc(hidden)]
+pub trait IntoFieldId<C: Clone> {
+    fn extend_into(self, ctx: &mut build::BuildCtx<'_, C>, out: &mut Vec<OutputId>);
+}
+
+impl<C: Clone> IntoFieldId<C> for OutputId {
+    fn extend_into(self, _ctx: &mut build::BuildCtx<'_, C>, out: &mut Vec<OutputId>) {
+        out.push(self);
+    }
+}
+
+impl<C: Clone> IntoFieldId<C> for Id {
+    fn extend_into(self, ctx: &mut build::BuildCtx<'_, C>, out: &mut Vec<OutputId>) {
+        ctx.translate_into(self, out);
+    }
+}
+
+impl<C: Clone, T> IntoFieldId<C> for &T
+where
+    T: IntoFieldId<C> + Copy,
+{
+    fn extend_into(self, ctx: &mut build::BuildCtx<'_, C>, out: &mut Vec<OutputId>) {
+        (*self).extend_into(ctx, out);
+    }
+}
+
+/// Trait for values that can be appended to a structural field inside a
+/// `tree!`/`trees!`/`rule!` template.
 ///
-/// This lets `{expr}` interpolate any of these shapes without a
-/// dedicated splice syntax — the macro emits the same trait-dispatched
-/// call regardless of the value's type.
-pub trait IntoFieldIds {
-    fn extend_into(self, out: &mut Vec<Id>);
+/// Output IDs are appended directly. Input IDs are recursively translated
+/// under the current [`build::BuildCtx`] before being appended.
+pub trait IntoFieldIds<C: Clone> {
+    fn extend_into(self, ctx: &mut build::BuildCtx<'_, C>, out: &mut Vec<OutputId>);
+}
+
+impl<C: Clone, I, T> IntoFieldIds<C> for I
+where
+    I: IntoIterator<Item = T>,
+    T: IntoFieldId<C>,
+{
+    fn extend_into(self, ctx: &mut build::BuildCtx<'_, C>, out: &mut Vec<OutputId>) {
+        for id in self {
+            id.extend_into(ctx, out);
+        }
+    }
+}
+
+/// A node id that can be inspected through a [`build::BuildCtx`].
+pub trait ContextNodeId: Copy {
+    fn source_text<C>(self, ctx: &build::BuildCtx<'_, C>) -> String;
+    fn source_range<C>(self, ctx: &build::BuildCtx<'_, C>) -> Option<Range>;
+}
+
+impl ContextNodeId for OutputId {
+    fn source_text<C>(self, ctx: &build::BuildCtx<'_, C>) -> String {
+        ctx.output
+            .source_text_from(self, ctx.ast().source.as_slice())
+    }
+
+    fn source_range<C>(self, ctx: &build::BuildCtx<'_, C>) -> Option<Range> {
+        ctx.output.get_node(self).and_then(Node::source_range)
+    }
+}
+
+impl ContextNodeId for Id {
+    fn source_text<C>(self, ctx: &build::BuildCtx<'_, C>) -> String {
+        ctx.ast().source_text(self)
+    }
+
+    fn source_range<C>(self, ctx: &build::BuildCtx<'_, C>) -> Option<Range> {
+        ctx.ast().get_node(self).and_then(Node::source_range)
+    }
 }
 
-impl<I, T> IntoFieldIds for I
+impl<T: ContextNodeId> ContextNodeId for &T {
+    fn source_text<C>(self, ctx: &build::BuildCtx<'_, C>) -> String {
+        (*self).source_text(ctx)
+    }
+
+    fn source_range<C>(self, ctx: &build::BuildCtx<'_, C>) -> Option<Range> {
+        (*self).source_range(ctx)
+    }
+}
+
+/// Values accepted by `location: { ... }` template entries.
+pub trait IntoLocationRanges<C> {
+    fn extend_ranges(self, ctx: &build::BuildCtx<'_, C>, out: &mut Vec<Range>);
+}
+
+impl<C, I, T> IntoLocationRanges<C> for I
 where
     I: IntoIterator<Item = T>,
-    T: Into<Id>,
+    T: ContextNodeId,
 {
-    fn extend_into(self, out: &mut Vec<Id>) {
-        out.extend(self.into_iter().map(Into::into));
+    fn extend_ranges(self, ctx: &build::BuildCtx<'_, C>, out: &mut Vec<Range>) {
+        out.extend(self.into_iter().filter_map(|id| id.source_range(ctx)));
     }
 }
 
 /// Like [`std::fmt::Display`], but the formatting routine is given access to
-/// the [`Ast`] so that node references can resolve to their source text.
+/// both input and output storage through the active [`build::BuildCtx`].
 ///
 /// All standard primitive and string types implement [`YeastDisplay`] via
 /// the [`impl_yeast_display_via_display`] macro below. Coherence prevents a
 /// blanket `impl<T: Display>`, so additional types must be added explicitly.
 #[diagnostic::on_unimplemented(
     message = "`{Self}` cannot be interpolated with `#{{...}}`",
-    note = "if the value is optional, mark the enclosing field's value with `?` to leave \
-            that field unset when it is absent, as in `label: (identifier #{{lbl}})?`"
+    note = "if the value is optional, place the node in a template choice to leave \
+            that field unset when it is absent, as in `label: [(identifier #{{lbl}})]`"
 )]
 pub trait YeastDisplay {
-    fn yeast_to_string(&self, ast: &Ast) -> String;
+    fn yeast_to_string<C>(&self, ctx: &build::BuildCtx<'_, C>) -> String;
 }
 
 /// Optional source range for values used in `#{expr}` interpolations.
 ///
-/// By default this returns `None`, so synthesized leaves inherit the matched
-/// rule's source range. `Id` returns the referenced node's range, letting
-/// `(kind #{capture})` carry the captured node's location.
+/// By default this returns `None`, so synthesized leaves use the current
+/// [`crate::build::BuildCtx`] default range, if any. `OutputId` and `Id` return
+/// the referenced output or input node's range, respectively.
 pub trait YeastSourceRange {
-    fn yeast_source_range(&self, ast: &Ast) -> Option<Range>;
+    fn yeast_source_range<C>(&self, ctx: &build::BuildCtx<'_, C>) -> Option<Range>;
+}
+
+impl YeastDisplay for OutputId {
+    fn yeast_to_string<C>(&self, ctx: &build::BuildCtx<'_, C>) -> String {
+        self.source_text(ctx)
+    }
+}
+
+impl YeastSourceRange for OutputId {
+    fn yeast_source_range<C>(&self, ctx: &build::BuildCtx<'_, C>) -> Option<Range> {
+        self.source_range(ctx)
+    }
 }
 
 impl YeastDisplay for Id {
-    fn yeast_to_string(&self, ast: &Ast) -> String {
-        ast.source_text(*self)
+    fn yeast_to_string<C>(&self, ctx: &build::BuildCtx<'_, C>) -> String {
+        self.source_text(ctx)
     }
 }
 
 impl YeastSourceRange for Id {
-    fn yeast_source_range(&self, ast: &Ast) -> Option<Range> {
-        ast.get_node(*self).and_then(|n| match &n.content {
-            NodeContent::Range(r) => Some(*r),
-            _ => n.source_range,
-        })
+    fn yeast_source_range<C>(&self, ctx: &build::BuildCtx<'_, C>) -> Option<Range> {
+        self.source_range(ctx)
     }
 }
 
@@ -154,13 +292,13 @@ macro_rules! impl_yeast_display_via_display {
     ($($t:ty),* $(,)?) => {
         $(
             impl YeastDisplay for $t {
-                fn yeast_to_string(&self, _ast: &Ast) -> String {
+                fn yeast_to_string<C>(&self, _ctx: &build::BuildCtx<'_, C>) -> String {
                     ::std::string::ToString::to_string(self)
                 }
             }
 
             impl YeastSourceRange for $t {
-                fn yeast_source_range(&self, _ast: &Ast) -> Option<Range> {
+                fn yeast_source_range<C>(&self, _ctx: &build::BuildCtx<'_, C>) -> Option<Range> {
                     None
                 }
             }
@@ -177,20 +315,20 @@ impl_yeast_display_via_display! {
 }
 
 impl<T: YeastDisplay + ?Sized> YeastDisplay for &T {
-    fn yeast_to_string(&self, ast: &Ast) -> String {
-        (**self).yeast_to_string(ast)
+    fn yeast_to_string<C>(&self, ctx: &build::BuildCtx<'_, C>) -> String {
+        (**self).yeast_to_string(ctx)
     }
 }
 
 impl<T: YeastSourceRange + ?Sized> YeastSourceRange for &T {
-    fn yeast_source_range(&self, ast: &Ast) -> Option<Range> {
-        (**self).yeast_source_range(ast)
+    fn yeast_source_range<C>(&self, ctx: &build::BuildCtx<'_, C>) -> Option<Range> {
+        (**self).yeast_source_range(ctx)
     }
 }
 
 /// Normalizes a `#{expr}` interpolation to an optional value, so that a
-/// fallible field — `field: (kind #{expr})?` — can tell "there is a value to
-/// interpolate" apart from "there is none, so leave the field unset".
+/// template choice — `field: [(kind #{expr})]` — can tell "there is a value
+/// to interpolate" apart from "there is none, so try the next alternative".
 ///
 /// Implemented for every [`YeastDisplay`] type, which always yields a value,
 /// and for `Option` of the same, which yields one only when it is `Some`.
@@ -200,14 +338,15 @@ impl<T: YeastSourceRange + ?Sized> YeastSourceRange for &T {
 /// coherence cannot rule out a future `impl YeastDisplay for Option<T>`.
 /// [`YeastDisplay`] itself is enumerated for the same reason.
 ///
-/// Note that this is used *only* inside a fallible field. Elsewhere `#{expr}`
-/// still goes directly through [`YeastDisplay`], so interpolating an `Option`
-/// without a `?` remains a compile error rather than silently dropping a node.
+/// Note that this is used *only* while preparing a choice alternative.
+/// Elsewhere `#{expr}` still goes directly through [`YeastDisplay`], so
+/// interpolating an `Option` outside a choice remains a compile error rather
+/// than silently dropping a node.
 pub trait MaybeYeastValue {
     /// The interpolated value's type, which knows how to render itself.
     type Value: YeastDisplay + YeastSourceRange + ?Sized;
 
-    /// Returns the value to interpolate, or `None` to leave the field unset.
+    /// Returns the value to interpolate, or `None` to reject the alternative.
     fn maybe_yeast_value(&self) -> Option<&Self::Value>;
 }
 
@@ -232,7 +371,7 @@ macro_rules! impl_maybe_yeast_value {
 }
 
 impl_maybe_yeast_value! {
-    Id,
+    OutputId, Id,
     i8, i16, i32, i64, i128, isize,
     u8, u16, u32, u64, u128, usize,
     f32, f64,
@@ -264,15 +403,15 @@ impl<T: MaybeYeastValue + ?Sized> MaybeYeastValue for Option<&T> {
 }
 
 #[derive(Debug)]
-pub struct AstCursor<'a> {
-    ast: &'a Ast,
+pub struct AstCursor<'a, Id: TreeId = crate::Id> {
+    ast: &'a Ast<Id>,
     /// A stack of parents, along with iterators for their children.
-    parents: Vec<(Id, ChildrenIter<'a>)>,
+    parents: Vec<(Id, ChildrenIter<'a, Id>)>,
     node_id: Id,
 }
 
-impl<'a> AstCursor<'a> {
-    pub fn new(ast: &'a Ast) -> Self {
+impl<'a, Id: TreeId> AstCursor<'a, Id> {
+    pub fn new(ast: &'a Ast<Id>) -> Self {
         Self {
             ast,
             parents: vec![],
@@ -280,13 +419,13 @@ impl<'a> AstCursor<'a> {
         }
     }
 
-    /// The Id of the node currently under the cursor.
+    /// The id of the node currently under the cursor.
     pub fn node_id(&self) -> Id {
         self.node_id
     }
 
-    pub fn node(&self) -> &'a Node {
-        &self.ast.nodes[self.node_id.0]
+    pub fn node(&self) -> &'a Node<Id> {
+        &self.ast.nodes[self.node_id.index()]
     }
 
     pub fn field_id(&self) -> Option<FieldId> {
@@ -323,7 +462,7 @@ impl<'a> AstCursor<'a> {
     fn goto_first_child_opt(&mut self) -> Option<()> {
         let parent_id = self.node_id;
         let parent = self.ast.get_node(parent_id)?;
-        let mut children = ChildrenIter::new(parent);
+        let mut children = ChildrenIter::new(self.ast, parent);
         let first_child = children.next()?;
         self.node_id = first_child;
         self.parents.push((parent_id, children));
@@ -338,17 +477,37 @@ impl<'a> AstCursor<'a> {
 
 /// An iterator over the child Ids of a node.
 #[derive(Debug)]
-struct ChildrenIter<'a> {
+struct ChildrenIter<'a, Id: TreeId> {
     current_field: Option<FieldId>,
-    fields: std::collections::btree_map::Iter<'a, FieldId, Vec<Id>>,
+    fields: &'a BTreeMap<FieldId, Vec<Id>>,
+    field_order: std::vec::IntoIter<FieldId>,
     field_children: Option<std::slice::Iter<'a, Id>>,
 }
 
-impl<'a> ChildrenIter<'a> {
-    fn new(node: &'a Node) -> Self {
+impl<'a, Id: TreeId> ChildrenIter<'a, Id> {
+    fn new(ast: &'a Ast<Id>, node: &'a Node<Id>) -> Self {
+        let fields = &node.fields;
+        let present: Vec<FieldId> = fields.keys().copied().collect();
+        let field_order = match ast.schema.field_order(node.kind_name()) {
+            Some(order) => {
+                let mut fields: Vec<FieldId> = order
+                    .iter()
+                    .copied()
+                    .filter(|field| fields.contains_key(field))
+                    .collect();
+                for field in present {
+                    if !fields.contains(&field) {
+                        fields.push(field);
+                    }
+                }
+                fields.into_iter()
+            }
+            None => present.into_iter(),
+        };
         Self {
             current_field: None,
-            fields: node.fields.iter(),
+            fields,
+            field_order,
             field_children: None,
         }
     }
@@ -358,25 +517,25 @@ impl<'a> ChildrenIter<'a> {
     }
 }
 
-impl Iterator for ChildrenIter<'_> {
+impl<Id: TreeId> Iterator for ChildrenIter<'_, Id> {
     type Item = Id;
 
     fn next(&mut self) -> Option<Self::Item> {
         match self.field_children.as_mut() {
-            None => match self.fields.next() {
-                Some((field, children)) => {
-                    self.current_field = Some(*field);
-                    self.field_children = Some(children.iter());
+            None => match self.field_order.next() {
+                Some(field) => {
+                    self.current_field = Some(field);
+                    self.field_children = Some(self.fields[&field].iter());
                     self.next()
                 }
                 None => None,
             },
             Some(children) => match children.next() {
-                None => match self.fields.next() {
+                None => match self.field_order.next() {
                     None => None,
-                    Some((field, children)) => {
-                        self.current_field = Some(*field);
-                        self.field_children = Some(children.iter());
+                    Some(field) => {
+                        self.current_field = Some(field);
+                        self.field_children = Some(self.fields[&field].iter());
                         self.next()
                     }
                 },
@@ -386,17 +545,21 @@ impl Iterator for ChildrenIter<'_> {
     }
 }
 
-/// Our AST
-pub struct Ast {
+/// An AST arena whose node-id type determines whether it is translation input
+/// or output.
+pub struct Ast<Id: TreeId = crate::Id> {
     root: Id,
-    nodes: Vec<Node>,
+    nodes: Vec<Node<Id>>,
     schema: schema::Schema,
     /// Original source bytes the tree was parsed from. Used to resolve
     /// `NodeContent::Range` to text for synthesized literal nodes.
     source: Vec<u8>,
 }
 
-impl std::fmt::Debug for Ast {
+/// Output tree constructed by a translation.
+pub type OutputAst = Ast<OutputId>;
+
+impl<Id: TreeId> std::fmt::Debug for Ast<Id> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("Ast")
             .field("root", &self.root)
@@ -433,22 +596,23 @@ impl Ast {
         ast.source = source;
         ast
     }
+}
 
+impl<Id: TreeId> Ast<Id> {
     /// Construct an empty AST backed by `schema`, for building a tree
     /// programmatically from a source other than a tree-sitter parse (e.g. an
-    /// external parser's output). Populate it with [`Ast::create_node`] /
-    /// [`Ast::create_node_with_range`] and then designate the root with
-    /// [`Ast::set_root`].
+    /// external parser's output). Populate it with `create_node` /
+    /// `create_node_with_range` and then designate the root with `set_root`.
     ///
     /// Node kind and field names may be registered in `schema` up front, or on
-    /// demand while building via [`Ast::register_kind`],
-    /// [`Ast::register_unnamed_kind`], and [`Ast::register_field`] (which return
-    /// the ids to pass to [`Ast::create_node_with_range`]). Passing a fresh
+    /// demand while building via `register_kind`, `register_unnamed_kind`, and
+    /// `register_field` (which return the ids to pass to
+    /// `create_node_with_range`). Passing a fresh
     /// [`schema::Schema::new`] and registering names during construction is
     /// therefore fine — see the swift-syntax adapter for an example.
     pub fn with_schema(schema: schema::Schema) -> Self {
         Self {
-            root: Id(0),
+            root: Id::from_index(0),
             nodes: Vec::new(),
             schema,
             source: Vec::new(),
@@ -462,17 +626,25 @@ impl Ast {
         self.source = source;
     }
 
+    fn into_source(self) -> Vec<u8> {
+        self.source
+    }
+
     /// Returns the source text for `id`, resolving `NodeContent::Range`
     /// against the stored source bytes when available.
     pub fn source_text(&self, id: Id) -> String {
+        self.source_text_from(id, &self.source)
+    }
+
+    fn source_text_from(&self, id: Id, source: &[u8]) -> String {
         let Some(node) = self.get_node(id) else {
             return String::new();
         };
         let read_range = |range: &Range| {
             let start = range.start_byte;
             let end = range.end_byte;
-            if end <= self.source.len() && start <= end {
-                String::from_utf8_lossy(&self.source[start..end]).into_owned()
+            if end <= source.len() && start <= end {
+                String::from_utf8_lossy(&source[start..end]).into_owned()
             } else {
                 String::new()
             }
@@ -491,8 +663,10 @@ impl Ast {
             },
         }
     }
+}
 
-    pub fn walk(&self) -> AstCursor {
+impl<Id: TreeId> Ast<Id> {
+    pub fn walk(&self) -> AstCursor<'_, Id> {
         AstCursor::new(self)
     }
 
@@ -501,7 +675,7 @@ impl Ast {
     /// This includes nodes that are no longer reachable from `get_root()`
     /// after desugaring rewrites. Use `reachable_node_ids()` for output-level
     /// validation/traversal semantics.
-    pub fn nodes(&self) -> &[Node] {
+    pub fn nodes(&self) -> &[Node<Id>] {
         &self.nodes
     }
 
@@ -515,10 +689,10 @@ impl Ast {
         let mut seen = vec![false; self.nodes.len()];
 
         while let Some(id) = stack.pop() {
-            if id.0 >= self.nodes.len() || seen[id.0] {
+            if id.index() >= self.nodes.len() || seen[id.index()] {
                 continue;
             }
-            seen[id.0] = true;
+            seen[id.index()] = true;
             reachable.push(id);
 
             if let Some(node) = self.get_node(id) {
@@ -541,12 +715,27 @@ impl Ast {
         self.root = root;
     }
 
-    pub fn get_node(&self, id: Id) -> Option<&Node> {
-        self.nodes.get(id.0)
+    pub fn get_node(&self, id: Id) -> Option<&Node<Id>> {
+        self.nodes.get(id.index())
+    }
+
+    fn source_range_ignoring_fields(&self, id: Id, ignored_fields: &[&str]) -> Option<Range> {
+        let node = self.get_node(id)?;
+        let source_range = node.source_range()?;
+        let ignored_ranges = node
+            .fields
+            .iter()
+            .filter(|(field_id, _)| {
+                self.field_name_for_id(**field_id)
+                    .is_some_and(|name| ignored_fields.contains(&name))
+            })
+            .flat_map(|(_, children)| children)
+            .filter_map(|child| self.get_node(*child).and_then(Node::source_range));
+        Some(source_range.ignoring_boundary_ranges(ignored_ranges))
     }
 
     pub fn print(&self, source: &str, root_id: Id) -> Value {
-        let root = &self.nodes()[root_id.0];
+        let root = &self.nodes()[root_id.index()];
         self.print_node(root, source)
     }
 
@@ -571,11 +760,16 @@ impl Ast {
         let source_range = match &content {
             // Parsed nodes already carry an exact source range in their content.
             NodeContent::Range(_) => source_range,
-            // Synthesized nodes derive location from children when possible,
-            // and fall back to the inherited rule-match range otherwise.
+            // Synthesized nodes derive location from both their children and
+            // any explicitly supplied source range.
             _ => self
                 .union_source_range_of_children(&fields)
-                .or(source_range),
+                .map_or(source_range, |child_range| {
+                    Some(match source_range {
+                        Some(source_range) => child_range.union(source_range),
+                        None => child_range,
+                    })
+                }),
         };
         let id = self.nodes.len();
         self.nodes.push(Node {
@@ -589,7 +783,49 @@ impl Ast {
             is_named,
             source_range,
         });
-        Id(id)
+        Id::from_index(id)
+    }
+
+    /// Extend a synthetic node's source range to include `source_range`.
+    ///
+    /// Parsed nodes carry their exact range in [`NodeContent::Range`] and must
+    /// not be modified through this API.
+    pub fn extend_source_range(&mut self, id: Id, source_range: Range) {
+        let node = self
+            .nodes
+            .get_mut(id.index())
+            .unwrap_or_else(|| panic!("extend_source_range: invalid node id {}", id.index()));
+        if matches!(node.content, NodeContent::Range(_)) {
+            panic!("extend_source_range: cannot modify a parsed node");
+        }
+        node.source_range = Some(match node.source_range {
+            Some(existing) => existing.union(source_range),
+            None => source_range,
+        });
+    }
+
+    /// Replace a synthetic node's source range.
+    pub(crate) fn set_source_range(&mut self, id: Id, source_range: Range) {
+        let node = self
+            .nodes
+            .get_mut(id.index())
+            .unwrap_or_else(|| panic!("set_source_range: invalid node id {}", id.index()));
+        if matches!(node.content, NodeContent::Range(_)) {
+            panic!("set_source_range: cannot modify a parsed node");
+        }
+        node.source_range = Some(source_range);
+    }
+
+    /// Remove the source range from a synthetic node.
+    pub(crate) fn clear_source_range(&mut self, id: Id) {
+        let node = self
+            .nodes
+            .get_mut(id.index())
+            .unwrap_or_else(|| panic!("clear_source_range: invalid node id {}", id.index()));
+        if matches!(node.content, NodeContent::Range(_)) {
+            panic!("clear_source_range: cannot modify a parsed node");
+        }
+        node.source_range = None;
     }
 
     /// Register a named node kind, returning its id (idempotent). Lets callers
@@ -629,35 +865,30 @@ impl Ast {
                 let Some(child) = self.get_node(child_id) else {
                     continue;
                 };
-
-                let child_start_byte = child.start_byte();
-                let child_end_byte = child.end_byte();
-
-                // Skip children that carry no usable location.
-                if child_start_byte == 0 && child_end_byte == 0 {
+                let Some(child_range) = child.source_range() else {
                     continue;
-                }
+                };
 
                 match start_byte {
                     None => {
-                        start_byte = Some(child_start_byte);
-                        start_point = child.start_position();
+                        start_byte = Some(child_range.start_byte);
+                        start_point = child_range.start_point;
                     }
-                    Some(current_start) if child_start_byte < current_start => {
-                        start_byte = Some(child_start_byte);
-                        start_point = child.start_position();
+                    Some(current_start) if child_range.start_byte < current_start => {
+                        start_byte = Some(child_range.start_byte);
+                        start_point = child_range.start_point;
                     }
                     _ => {}
                 }
 
                 match end_byte {
                     None => {
-                        end_byte = Some(child_end_byte);
-                        end_point = child.end_position();
+                        end_byte = Some(child_range.end_byte);
+                        end_point = child_range.end_point;
                     }
-                    Some(current_end) if child_end_byte > current_end => {
-                        end_byte = Some(child_end_byte);
-                        end_point = child.end_position();
+                    Some(current_end) if child_range.end_byte > current_end => {
+                        end_byte = Some(child_range.end_byte);
+                        end_point = child_range.end_point;
                     }
                     _ => {}
                 }
@@ -700,7 +931,7 @@ impl Ast {
             fields: BTreeMap::new(),
             content: NodeContent::DynamicString(content),
         });
-        Id(id)
+        Id::from_index(id)
     }
 
     pub fn field_name_for_id(&self, id: FieldId) -> Option<&'static str> {
@@ -712,7 +943,7 @@ impl Ast {
     }
 
     /// Print a node for debugging
-    fn print_node(&self, node: &Node, source: &str) -> Value {
+    fn print_node(&self, node: &Node<Id>, source: &str) -> Value {
         let fields: BTreeMap<&'static str, Vec<Value>> = node
             .fields
             .iter()
@@ -768,7 +999,7 @@ impl Ast {
 
 /// A node in our AST
 #[derive(PartialEq, Eq, Debug, Clone, Serialize)]
-pub struct Node {
+pub struct Node<Id: TreeId = crate::Id> {
     kind: KindId,
     kind_name: &'static str,
     pub(crate) fields: BTreeMap<FieldId, Vec<Id>>,
@@ -783,7 +1014,7 @@ pub struct Node {
     is_error: bool,
 }
 
-impl Node {
+impl<Id: TreeId> Node<Id> {
     pub fn kind_name(&self) -> &'static str {
         self.kind_name
     }
@@ -808,36 +1039,29 @@ impl Node {
         Point { row: 0, column: 0 }
     }
 
-    pub fn start_position(&self) -> Point {
+    pub fn source_range(&self) -> Option<Range> {
         match self.content {
-            NodeContent::Range(range) => range.start_point,
-            _ => self
-                .source_range
-                .map_or_else(|| self.fake_point(), |r| r.start_point),
+            NodeContent::Range(range) => Some(range),
+            _ => self.source_range,
         }
     }
 
+    pub fn start_position(&self) -> Point {
+        self.source_range()
+            .map_or_else(|| self.fake_point(), |range| range.start_point)
+    }
+
     pub fn end_position(&self) -> Point {
-        match self.content {
-            NodeContent::Range(range) => range.end_point,
-            _ => self
-                .source_range
-                .map_or_else(|| self.fake_point(), |r| r.end_point),
-        }
+        self.source_range()
+            .map_or_else(|| self.fake_point(), |range| range.end_point)
     }
 
     pub fn start_byte(&self) -> usize {
-        match self.content {
-            NodeContent::Range(range) => range.start_byte,
-            _ => self.source_range.map_or(0, |r| r.start_byte),
-        }
+        self.source_range().map_or(0, |range| range.start_byte)
     }
 
     pub fn end_byte(&self) -> usize {
-        match self.content {
-            NodeContent::Range(range) => range.end_byte,
-            _ => self.source_range.map_or(0, |r| r.end_byte),
-        }
+        self.source_range().map_or(0, |range| range.end_byte)
     }
 
     pub fn byte_range(&self) -> std::ops::Range<usize> {
@@ -887,18 +1111,18 @@ impl From<tree_sitter::Range> for NodeContent {
 /// the framework's rule machinery. Constructed by the driver and passed as
 /// the last argument of every [`Transform`] invocation.
 ///
-/// The `rule!` macro uses [`TranslatorHandle::auto_translate_captures`] in
-/// its generated prefix to translate captures before running the user's
-/// transform body. Manually-written transforms (using [`Rule::new`]
-/// directly) can call [`TranslatorHandle::translate`] selectively on
-/// specific node ids to control when translation happens.
+/// The `rule!` macro eagerly translates `@` captures and translates raw input
+/// ids when they are returned or structurally interpolated. Manually-written
+/// transforms can call [`TranslatorHandle::translate`] directly.
 pub struct TranslatorHandle<'a, C> {
-    inner: TranslatorImpl<'a, C>,
+    index: &'a RuleIndex<'a, C>,
+    rewrite_depth: usize,
+    matched_root: Id,
 }
 
 // Manual `Copy` / `Clone` so `TranslatorHandle<'_, C>: Copy` holds
-// regardless of whether `C: Copy`. `TranslatorImpl` contains only
-// shared references, which are `Copy` unconditionally.
+// regardless of whether `C: Copy`. All fields are shared references or
+// small `Copy` scalars.
 impl<C> Copy for TranslatorHandle<'_, C> {}
 impl<C> Clone for TranslatorHandle<'_, C> {
     fn clone(&self) -> Self {
@@ -906,190 +1130,149 @@ impl<C> Clone for TranslatorHandle<'_, C> {
     }
 }
 
-/// Internal phase-specific translation state. Kept private — callers
-/// interact with [`TranslatorHandle`] only.
-enum TranslatorImpl<'a, C> {
-    /// OneShot phase translator: recursively applies OneShot rules.
-    OneShot {
-        index: &'a RuleIndex<'a, C>,
-        fresh: &'a tree_builder::FreshScope,
-        rewrite_depth: usize,
-        /// The id of the node the current rule is matching. Used by
-        /// [`auto_translate_captures`] to avoid infinite recursion when a
-        /// rule captures its own match root (e.g. via `(_) @_`).
-        matched_root: Id,
-    },
-    /// Repeating phase translator: translation is not meaningful here
-    /// (input and output schemas are the same). [`translate`] errors;
-    /// [`auto_translate_captures`] is a no-op so the macro's auto-prefix
-    /// works unchanged for Repeating rules.
-    Repeating,
-}
-
-// Manual `Copy` / `Clone` so `TranslatorImpl<'_, C>: Copy` holds
-// regardless of whether `C: Copy`. All variants hold only shared
-// references and small `Copy` scalars.
-impl<C> Copy for TranslatorImpl<'_, C> {}
-impl<C> Clone for TranslatorImpl<'_, C> {
-    fn clone(&self) -> Self {
-        *self
+impl<C> TranslatorHandle<'_, C> {
+    pub(crate) fn matched_root(&self) -> Id {
+        self.matched_root
     }
 }
 
 impl<'a, C: Clone> TranslatorHandle<'a, C> {
-    /// Recursively apply OneShot rules to `id` and return the resulting
-    /// node ids. Errors in a Repeating phase (where translation is not
-    /// meaningful).
-    pub fn translate(&self, ast: &mut Ast, user_ctx: &mut C, id: Id) -> Result<Vec<Id>, String> {
-        match &self.inner {
-            TranslatorImpl::OneShot {
-                index,
-                fresh,
-                rewrite_depth,
-                ..
-            } => apply_one_shot_rules_inner(index, ast, user_ctx, id, fresh, rewrite_depth + 1),
-            TranslatorImpl::Repeating => {
-                Err("translate() is not available in a Repeating phase".into())
-            }
-        }
+    /// Recursively apply the current phase's rules to `id` and return the
+    /// resulting node ids.
+    pub fn translate(
+        &self,
+        ast: &Ast,
+        output: &mut OutputAst,
+        user_ctx: &mut C,
+        id: Id,
+    ) -> Result<Vec<OutputId>, String> {
+        apply_rules_inner(
+            self.index,
+            ast,
+            output,
+            user_ctx,
+            id,
+            self.rewrite_depth + 1,
+        )
     }
 
-    /// Translate every captured node in `captures` in place (OneShot phase
-    /// only), except for captures whose name appears in `skip` — those are
-    /// left as raw (input-schema) ids for the rule body to consume
-    /// directly. In a Repeating phase this is a no-op — Repeating rules
-    /// receive raw captures regardless of `skip`.
-    ///
-    /// Used by the `rule!` macro's generated prefix. `skip` is populated
-    /// from the macro's `@@name` capture markers; for plain `@name`
-    /// captures (and rules with no `@@` markers) it is empty.
-    ///
-    /// To avoid infinite recursion, a capture whose id matches the rule's
-    /// matched root (e.g. from a `(_) @_` pattern) is left unchanged.
-    pub fn auto_translate_captures(
+    pub fn translate_captures(
         &self,
-        captures: &mut Captures,
-        ast: &mut Ast,
+        captures: &Captures,
+        ast: &Ast,
+        output: &mut OutputAst,
         user_ctx: &mut C,
         skip: &[&str],
-    ) -> Result<(), String> {
-        match &self.inner {
-            TranslatorImpl::OneShot { matched_root, .. } => {
-                let root = *matched_root;
-                captures.try_map_captures_except(skip, |cid| {
-                    if cid == root {
-                        Ok(vec![cid])
-                    } else {
-                        self.translate(ast, user_ctx, cid)
-                    }
-                })
+    ) -> Result<TranslatedCaptures, String> {
+        captures.try_translate_except(skip, |id| {
+            if id == self.matched_root {
+                Err("cannot eagerly translate a capture of the matched rule root".to_string())
+            } else {
+                self.translate(ast, output, user_ctx, id)
             }
-            TranslatorImpl::Repeating => Ok(()),
-        }
+        })
     }
 }
 
 /// The transform function for a rule.
 ///
-/// Takes the AST, the (raw, untranslated) captured variables, a fresh-name
-/// scope, the source range of the matched node, a mutable reference to the
-/// user context of type `C`, and a [`TranslatorHandle`] for recursively
-/// translating nodes. Returns the IDs of the replacement nodes, or an
-/// error message if the transform could not be completed.
+/// Takes the immutable input AST, mutable output AST, raw captured variables,
+/// source range of the matched node, mutable user context, and a
+/// [`TranslatorHandle`]. Returns output IDs or an error.
 ///
-/// Transforms produced by [`Rule::new`] receive **raw** captures and must
-/// translate them themselves (via the handle). Transforms produced by the
-/// `rule!` macro have an auto-translation prefix injected for backward
-/// compatibility.
+/// Transforms receive raw input captures. Macro-generated transforms eagerly
+/// translate `@` captures and translate raw ids when they are returned or
+/// structurally interpolated.
 pub type Transform<C = ()> = Box<
     dyn Fn(
-            &mut Ast,
+            &Ast,
+            &mut OutputAst,
             Captures,
-            &tree_builder::FreshScope,
             Option<Range>,
             &mut C,
             TranslatorHandle<'_, C>,
-        ) -> Result<Vec<Id>, String>
+        ) -> Result<Vec<OutputId>, String>
         + Send
         + Sync,
 >;
 
+/// Predicate evaluated after a rule's query matches and before its transform
+/// runs. Returning `false` makes the rule behave as if its query did not
+/// match, so the driver continues to the next rule. Guards have read-only
+/// access to the shared user context.
+pub type Guard<C = ()> = Box<dyn Fn(&Ast, &Captures, &C) -> Result<bool, String> + Send + Sync>;
+
 pub struct Rule<C = ()> {
     query: QueryNode,
+    guard: Option<Guard<C>>,
     transform: Transform<C>,
-    /// If true, after this rule fires on a node the engine will try to
-    /// re-apply this same rule on the result root. Defaults to false:
-    /// each rule fires at most once on a given node, which prevents
-    /// accidental loops where a rule's output matches its own query.
-    repeated: bool,
+    ignored_location_fields: Vec<&'static str>,
 }
 
 impl<C> Rule<C> {
+    /// Construct an unguarded rule from its query and transform.
     pub fn new(query: QueryNode, transform: Transform<C>) -> Self {
         Self {
             query,
+            guard: None,
             transform,
-            repeated: false,
+            ignored_location_fields: Vec::new(),
         }
     }
 
-    /// Mark this rule as allowed to fire multiple times on the same node.
-    /// Use when the rule is intentionally iterative (its output may match
-    /// its own query). Without this, a rule fires at most once per node;
-    /// other rules can still fire on the result.
-    pub fn repeated(mut self) -> Self {
-        self.repeated = true;
-        self
+    /// Construct a guarded rule. The guard sees raw captures and has read-only
+    /// access to the user context.
+    pub fn guarded(query: QueryNode, guard: Guard<C>, transform: Transform<C>) -> Self {
+        Self {
+            query,
+            guard: Some(guard),
+            transform,
+            ignored_location_fields: Vec::new(),
+        }
     }
 
-    fn try_rule(
-        &self,
-        ast: &mut Ast,
-        node: Id,
-        fresh: &tree_builder::FreshScope,
-        user_ctx: &mut C,
-        translator: TranslatorHandle<'_, C>,
-    ) -> Result<Option<Vec<Id>>, String> {
-        match self.try_match(ast, node)? {
-            Some(captures) => Ok(Some(
-                self.run_transform(ast, captures, node, fresh, user_ctx, translator)?,
-            )),
-            None => Ok(None),
-        }
+    fn set_ignored_location_fields(&mut self, fields: &[&'static str]) {
+        self.ignored_location_fields = fields.to_vec();
     }
 
-    /// Attempt to match this rule's query against `node`, returning the
-    /// resulting captures on success. Does not invoke the transform.
-    fn try_match(&self, ast: &Ast, node: Id) -> Result<Option<Captures>, String> {
+    /// Attempt to match this rule's query against `node`, returning the raw
+    /// captures on success. Does not evaluate the guard or invoke the
+    /// transform.
+    fn match_query(&self, ast: &Ast, node: Id) -> Result<Option<Captures>, String> {
         let mut captures = Captures::new();
-        if self.query.do_match(ast, node, &mut captures)? {
-            Ok(Some(captures))
+        if !self.query.do_match(ast, node, &mut captures)? {
+            return Ok(None);
+        }
+        Ok(Some(captures))
+    }
+
+    /// Evaluate this rule's guard against a successful query match. An
+    /// unguarded rule always succeeds.
+    fn guard_matches(&self, ast: &Ast, captures: &Captures, user_ctx: &C) -> Result<bool, String> {
+        if let Some(guard) = &self.guard {
+            guard(ast, captures, user_ctx)
         } else {
-            Ok(None)
+            Ok(true)
         }
     }
 
-    /// Run this rule's transform with the given captures, using `node`'s
-    /// source range as the source range of the produced nodes.
+    /// Run this rule's transform with the given captures, making `node`'s
+    /// source range available to the transform.
     fn run_transform(
         &self,
-        ast: &mut Ast,
+        ast: &Ast,
+        output: &mut OutputAst,
         captures: Captures,
         node: Id,
-        fresh: &tree_builder::FreshScope,
         user_ctx: &mut C,
         translator: TranslatorHandle<'_, C>,
-    ) -> Result<Vec<Id>, String> {
-        fresh.next_scope();
-        let source_range = ast.get_node(node).and_then(|n| match n.content {
-            NodeContent::Range(r) => Some(r),
-            _ => n.source_range,
-        });
-        (self.transform)(ast, captures, fresh, source_range, user_ctx, translator)
+    ) -> Result<Vec<OutputId>, String> {
+        let source_range = ast.source_range_ignoring_fields(node, &self.ignored_location_fields);
+        (self.transform)(ast, output, captures, source_range, user_ctx, translator)
     }
 }
 
-const MAX_REWRITE_DEPTH: usize = 100;
+const MAX_REWRITE_DEPTH: usize = 1000;
 
 /// Index of rules by their root query kind for fast lookup.
 struct RuleIndex<'a, C> {
@@ -1121,26 +1304,28 @@ impl<'a, C> RuleIndex<'a, C> {
     }
 }
 
-fn apply_repeating_rules<C: Clone>(
+/// Apply the first matching rule to each visited node. Recursion proceeds
+/// only through captured nodes (not through the input node's children
+/// directly), and an error is returned if no rule matches a visited node.
+fn apply_rules<C: Clone>(
     rules: &[Rule<C>],
-    ast: &mut Ast,
+    ast: &Ast,
+    output: &mut OutputAst,
     user_ctx: &mut C,
     id: Id,
-    fresh: &tree_builder::FreshScope,
-) -> Result<Vec<Id>, String> {
+) -> Result<Vec<OutputId>, String> {
     let index = RuleIndex::new(rules);
-    apply_repeating_rules_inner(&index, ast, user_ctx, id, fresh, 0, None)
+    apply_rules_inner(&index, ast, output, user_ctx, id, 0)
 }
 
-fn apply_repeating_rules_inner<C: Clone>(
+fn apply_rules_inner<C: Clone>(
     index: &RuleIndex<C>,
-    ast: &mut Ast,
+    ast: &Ast,
+    output: &mut OutputAst,
     user_ctx: &mut C,
     id: Id,
-    fresh: &tree_builder::FreshScope,
     rewrite_depth: usize,
-    skip_rule: Option<*const Rule<C>>,
-) -> Result<Vec<Id>, String> {
+) -> Result<Vec<OutputId>, String> {
     if rewrite_depth > MAX_REWRITE_DEPTH {
         return Err(format!(
             "Desugaring exceeded maximum rewrite depth ({MAX_REWRITE_DEPTH}). \
@@ -1149,190 +1334,46 @@ fn apply_repeating_rules_inner<C: Clone>(
     }
 
     let node_kind = ast.get_node(id).map(|n| n.kind_name()).unwrap_or("");
+
     for rule in index.rules_for_kind(node_kind) {
-        let rule_ptr = *rule as *const Rule<C>;
-        if Some(rule_ptr) == skip_rule {
+        let Some(captures) = rule.match_query(ast, id)? else {
             continue;
-        }
-        // Give each rule attempt a private clone of the user context.
-        // Any mutations the rule makes are visible to its transform and
-        // to the recursive translation of its result, but never leak
-        // back to the parent — the clone is simply dropped when we
-        // return. This is also `?`-safe: an error return drops `local`
-        // without touching the caller's `user_ctx`.
-        let mut local = user_ctx.clone();
-        // Repeating rules don't need a real translator: their captures
-        // aren't auto-translated (Repeating preserves the input schema),
-        // and `ctx.translate(id)` errors if invoked from a Repeating
-        // transform.
-        let translator = TranslatorHandle {
-            inner: TranslatorImpl::Repeating,
         };
-        let try_result = rule.try_rule(ast, id, fresh, &mut local, translator)?;
-        if let Some(result_node) = try_result {
-            // For non-repeated rules, suppress further application of *this*
-            // rule on the result root, so a rule whose output matches its own
-            // query doesn't loop. Other rules and child traversal are
-            // unaffected.
-            let next_skip = if rule.repeated { None } else { Some(rule_ptr) };
-            let mut results = Vec::new();
-            for node in result_node {
-                results.extend(apply_repeating_rules_inner(
-                    index,
-                    ast,
-                    &mut local,
-                    node,
-                    fresh,
-                    rewrite_depth + 1,
-                    next_skip,
-                )?);
-            }
-            return Ok(results);
-        }
-        // Rule didn't match; `local` is dropped as we loop to the next
-        // rule.
-    }
-
-    // Take the parent's fields by ownership: the recursion will rewrite
-    // each child Id, and we'll write the (possibly mutated) field map back
-    // when we're done. Avoids cloning the whole BTreeMap and its child
-    // Vecs on entry. Each child Vec is only re-allocated if a rewrite
-    // actually changes its contents.
-    //
-    // Child traversal does not increment rewrite depth and starts fresh
-    // (no rule is skipped on child subtrees).
-    let mut fields = std::mem::take(&mut ast.nodes[id.0].fields);
-    for children in fields.values_mut() {
-        let mut new_children: Option<Vec<Id>> = None;
-        for (i, &child_id) in children.iter().enumerate() {
-            let result = apply_repeating_rules_inner(
-                index,
-                ast,
-                user_ctx,
-                child_id,
-                fresh,
-                rewrite_depth,
-                None,
-            )?;
-            let unchanged = result.len() == 1 && result[0] == child_id;
-            match (&mut new_children, unchanged) {
-                (None, true) => {} // unchanged so far, no allocation needed
-                (None, false) => {
-                    // First divergence — copy already-processed Ids and
-                    // start collecting the rewritten sequence.
-                    let mut new = Vec::with_capacity(children.len());
-                    new.extend_from_slice(&children[..i]);
-                    new.extend(result);
-                    new_children = Some(new);
-                }
-                (Some(new), _) => {
-                    new.extend(result);
-                }
-            }
-        }
-        if let Some(new) = new_children {
-            *children = new;
-        }
-    }
-    ast.nodes[id.0].fields = fields;
-    Ok(vec![id])
-}
-
-/// Apply rules using `OneShot` semantics: the first matching rule fires on
-/// each visited node, recursion proceeds only through captured nodes (not
-/// through the input node's children directly), and an error is returned if
-/// no rule matches a visited node.
-fn apply_one_shot_rules<C: Clone>(
-    rules: &[Rule<C>],
-    ast: &mut Ast,
-    user_ctx: &mut C,
-    id: Id,
-    fresh: &tree_builder::FreshScope,
-) -> Result<Vec<Id>, String> {
-    let index = RuleIndex::new(rules);
-    apply_one_shot_rules_inner(&index, ast, user_ctx, id, fresh, 0)
-}
 
-fn apply_one_shot_rules_inner<C: Clone>(
-    index: &RuleIndex<C>,
-    ast: &mut Ast,
-    user_ctx: &mut C,
-    id: Id,
-    fresh: &tree_builder::FreshScope,
-    rewrite_depth: usize,
-) -> Result<Vec<Id>, String> {
-    if rewrite_depth > MAX_REWRITE_DEPTH {
-        return Err(format!(
-            "Desugaring exceeded maximum rewrite depth ({MAX_REWRITE_DEPTH}). \
-             This likely indicates a non-terminating rule cycle."
-        ));
-    }
-
-    let node_kind = ast.get_node(id).map(|n| n.kind_name()).unwrap_or("");
-
-    for rule in index.rules_for_kind(node_kind) {
-        if let Some(captures) = rule.try_match(ast, id)? {
-            // Give the rule a private clone of the user context. Any
-            // mutations the rule (or its transitively-translated
-            // captures) make are visible during this rule's transform,
-            // but never leak back — the clone is dropped when we
-            // return. `?`-safe: an error return drops `local` without
-            // touching the caller's `user_ctx`.
-            let mut local = user_ctx.clone();
-            // Build the translator handle the transform will use to
-            // recursively translate captures (or, for macro-generated
-            // rules, the auto-translate prefix uses it to translate every
-            // capture up front, preserving the legacy behavior).
-            let translator = TranslatorHandle {
-                inner: TranslatorImpl::OneShot {
-                    index,
-                    fresh,
-                    rewrite_depth,
-                    matched_root: id,
-                },
-            };
-            let result = rule.run_transform(ast, captures, id, fresh, &mut local, translator)?;
-            return Ok(result);
+        if !rule.guard_matches(ast, &captures, user_ctx)? {
+            continue;
         }
-    }
 
-    Err(format!(
-        "OneShot: no rule matched node of kind '{node_kind}'"
-    ))
-}
+        // The transform gets a private context clone. Its mutations are visible
+        // to transitively translated captures, but not to sibling rule attempts.
+        let mut local = user_ctx.clone();
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum PhaseKind {
-    /// A node is re-processed until none of the rules in the phase matches,
-    /// albeit a single rule cannot be applied twice in a row unless that rule is also marked as repeating.
-    /// When a node no longer matches any rules, its children are recursively processed (top down).
-    Repeating,
+        // Build the translator handle the transform will use to recursively
+        // translate captured input nodes when they are consumed.
+        let translator = TranslatorHandle {
+            index,
+            rewrite_depth,
+            matched_root: id,
+        };
+        let result = rule.run_transform(ast, output, captures, id, &mut local, translator)?;
+        return Ok(result);
+    }
 
-    /// A node is processed by the first matching rule, and the engine panics if no rule matches.
-    /// Rules are then recursively applied to every captured node.
-    /// In practice this is used when translating from one AST schema to another, where every node must be rewritten,
-    /// and it would be a type error to match the rule patterns (based on the input schema) against the output nodes (which conform to the output schema).
-    OneShot,
+    Err(format!("no rule matched node of kind '{node_kind}'"))
 }
 
-/// One phase of a desugaring pass: a named bundle of rules that runs to
-/// completion (a full traversal applying its rules) before the next phase
-/// starts. Rules within a phase compete for matches as usual; rules in
-/// different phases never compete because each traversal only considers the
-/// current phase's rules.
+/// A named bundle of exhaustive rules for the one-shot translation pass.
 pub struct Phase<C = ()> {
     /// Name used in error messages.
     pub name: String,
     pub rules: Vec<Rule<C>>,
-    pub kind: PhaseKind,
 }
 
 impl<C> Phase<C> {
-    pub fn new(name: impl Into<String>, kind: PhaseKind, rules: Vec<Rule<C>>) -> Self {
+    pub fn new(name: impl Into<String>, rules: Vec<Rule<C>>) -> Self {
         Self {
             name: name.into(),
             rules,
-            kind,
         }
     }
 }
@@ -1345,13 +1386,12 @@ impl<C> Phase<C> {
 /// is used both to validate TRAP output (via JSON conversion) and to
 /// resolve output-only node kinds and fields at runtime.
 ///
-/// Construct with `DesugaringConfig::new()` and add phases via
+/// Construct with `DesugaringConfig::new()` and add the translation phase via
 /// `add_phase`:
 ///
 /// ```ignore
 /// let config = yeast::DesugaringConfig::new()
-///     .add_phase("cleanup", PhaseKind::Repeating, cleanup_rules)
-///     .add_phase("desugar", PhaseKind::Repeating, desugar_rules)
+///     .add_phase("translate", translation_rules)
 ///     .with_output_node_types_yaml(yaml);
 /// ```
 ///
@@ -1364,6 +1404,9 @@ pub struct DesugaringConfig<C = ()> {
     /// node types are used (i.e. the desugared AST has the same node types
     /// as the tree-sitter grammar).
     pub output_node_types_yaml: Option<&'static str>,
+    /// Input field names whose boundary ranges are excluded from rule-result
+    /// locations.
+    pub ignored_location_fields: Vec<&'static str>,
 }
 
 // Manual `Default` impl so users with a custom `C` that doesn't implement
@@ -1373,25 +1416,41 @@ impl<C> Default for DesugaringConfig<C> {
         Self {
             phases: Vec::new(),
             output_node_types_yaml: None,
+            ignored_location_fields: Vec::new(),
         }
     }
 }
 
 impl<C> DesugaringConfig<C> {
-    /// Create an empty configuration. Add phases via [`add_phase`] and an
+    /// Create an empty configuration. Add a phase via [`add_phase`] and an
     /// optional output schema via [`with_output_node_types_yaml`].
     pub fn new() -> Self {
         Self::default()
     }
 
-    /// Append a new phase with the given name, kind, and rules.
-    pub fn add_phase(
+    /// Add a translation phase with the given name and exhaustive rules.
+    ///
+    /// Runners currently reject configurations containing more than one phase.
+    pub fn add_phase(mut self, name: impl Into<String>, mut rules: Vec<Rule<C>>) -> Self {
+        for rule in &mut rules {
+            rule.set_ignored_location_fields(&self.ignored_location_fields);
+        }
+        self.phases.push(Phase::new(name, rules));
+        self
+    }
+
+    /// Ignore boundary syntax stored under any of these input field names when
+    /// calculating matched locations for rule results.
+    pub fn with_ignored_location_fields(
         mut self,
-        name: impl Into<String>,
-        kind: PhaseKind,
-        rules: Vec<Rule<C>>,
+        fields: impl IntoIterator<Item = &'static str>,
     ) -> Self {
-        self.phases.push(Phase::new(name, kind, rules));
+        self.ignored_location_fields = fields.into_iter().collect();
+        for phase in &mut self.phases {
+            for rule in &mut phase.rules {
+                rule.set_ignored_location_fields(&self.ignored_location_fields);
+            }
+        }
         self
     }
 
@@ -1430,6 +1489,8 @@ pub struct Runner<'a, C = ()> {
     /// externally-built AST (`run_from_ast`), so no tree-sitter grammar is
     /// required.
     language: Option<tree_sitter::Language>,
+    /// Schema of the immutable parser input.
+    input_schema: Option<schema::Schema>,
     schema: schema::Schema,
     phases: &'a [Phase<C>],
 }
@@ -1437,10 +1498,11 @@ pub struct Runner<'a, C = ()> {
 impl<'a, C> Runner<'a, C> {
     /// Create a runner using the input grammar's schema for output.
     pub fn new(language: tree_sitter::Language, phases: &'a [Phase<C>]) -> Self {
-        let schema = schema::from_language(&language);
+        let input_schema = schema::from_language(&language);
         Self {
             language: Some(language),
-            schema,
+            schema: input_schema.clone(),
+            input_schema: Some(input_schema),
             phases,
         }
     }
@@ -1450,9 +1512,20 @@ impl<'a, C> Runner<'a, C> {
         language: tree_sitter::Language,
         schema: &schema::Schema,
         phases: &'a [Phase<C>],
+    ) -> Self {
+        let input_schema = schema::from_language(&language);
+        Self::with_schemas(language, &input_schema, schema, phases)
+    }
+
+    fn with_schemas(
+        language: tree_sitter::Language,
+        input_schema: &schema::Schema,
+        schema: &schema::Schema,
+        phases: &'a [Phase<C>],
     ) -> Self {
         Self {
             language: Some(language),
+            input_schema: Some(input_schema.clone()),
             schema: schema.clone(),
             phases,
         }
@@ -1464,6 +1537,7 @@ impl<'a, C> Runner<'a, C> {
     pub fn with_schema_no_language(schema: &schema::Schema, phases: &'a [Phase<C>]) -> Self {
         Self {
             language: None,
+            input_schema: None,
             schema: schema.clone(),
             phases,
         }
@@ -1474,9 +1548,14 @@ impl<'a, C> Runner<'a, C> {
         language: tree_sitter::Language,
         config: &'a DesugaringConfig<C>,
     ) -> Result<Self, String> {
-        let schema = config.build_schema(&language)?;
+        let input_schema = schema::from_language(&language);
+        let output_schema = config
+            .output_node_types_yaml
+            .ok_or("a desugaring config requires output_node_types_yaml")?;
+        let schema = node_types_yaml::schema_from_yaml_with_language(output_schema, &language)?;
         Ok(Self {
             language: Some(language),
+            input_schema: Some(input_schema),
             schema,
             phases: &config.phases,
         })
@@ -1484,7 +1563,7 @@ impl<'a, C> Runner<'a, C> {
 }
 
 impl<'a, C: Clone> Runner<'a, C> {
-    /// Parse `tree` against `source` and run all phases, threading
+    /// Parse `tree` against `source` and run the configured translation, threading
     /// `user_ctx` through every rule transform. The caller owns the
     /// initial context state.
     pub fn run_from_tree_with_ctx(
@@ -1492,26 +1571,35 @@ impl<'a, C: Clone> Runner<'a, C> {
         tree: &tree_sitter::Tree,
         source: &[u8],
         user_ctx: &mut C,
-    ) -> Result<Ast, String> {
-        let mut ast = Ast::from_tree_with_schema_and_source(
-            self.schema.clone(),
+    ) -> Result<OutputAst, String> {
+        let language = self
+            .language
+            .as_ref()
+            .ok_or("run_from_tree requires a tree-sitter language")?;
+        let input_schema = self
+            .input_schema
+            .as_ref()
+            .ok_or("run_from_tree requires an input schema")?;
+        let input = Ast::from_tree_with_schema_and_source(
+            input_schema.clone(),
             tree,
-            self.language
-                .as_ref()
-                .ok_or("run_from_tree requires a tree-sitter language")?,
+            language,
             source.to_vec(),
         );
-        self.run_phases(&mut ast, user_ctx)?;
-        Ok(ast)
+        self.run_once(input, user_ctx)
     }
 
-    /// Parse `input` and run all phases, threading `user_ctx` through
+    /// Parse `input` and run the configured translation, threading `user_ctx` through
     /// every rule transform. The caller owns the initial context state.
-    pub fn run_with_ctx(&self, input: &str, user_ctx: &mut C) -> Result<Ast, String> {
+    pub fn run_with_ctx(&self, input: &str, user_ctx: &mut C) -> Result<OutputAst, String> {
         let language = self
             .language
             .as_ref()
             .ok_or("run requires a tree-sitter language")?;
+        let input_schema = self
+            .input_schema
+            .as_ref()
+            .ok_or("run requires an input schema")?;
         let mut parser = tree_sitter::Parser::new();
         parser
             .set_language(language)
@@ -1519,71 +1607,59 @@ impl<'a, C: Clone> Runner<'a, C> {
         let tree = parser
             .parse(input, None)
             .ok_or_else(|| "Failed to parse input".to_string())?;
-        let mut ast = Ast::from_tree_with_schema_and_source(
-            self.schema.clone(),
+        let raw = Ast::from_tree_with_schema_and_source(
+            input_schema.clone(),
             &tree,
             language,
             input.as_bytes().to_vec(),
         );
-        self.run_phases(&mut ast, user_ctx)?;
-        Ok(ast)
-    }
-
-    /// Apply each phase in turn to the AST, threading the root through.
-    /// A single `FreshScope` is shared across phases so that fresh
-    /// identifiers generated in different phases don't collide.
-    fn run_phases(&self, ast: &mut Ast, user_ctx: &mut C) -> Result<(), String> {
-        let fresh = tree_builder::FreshScope::new();
-        let mut root = ast.get_root();
-        for phase in self.phases {
-            let res = match phase.kind {
-                PhaseKind::Repeating => {
-                    apply_repeating_rules(&phase.rules, ast, user_ctx, root, &fresh)
-                }
-                PhaseKind::OneShot => {
-                    apply_one_shot_rules(&phase.rules, ast, user_ctx, root, &fresh)
-                }
-            }
+        self.run_once(raw, user_ctx)
+    }
+
+    fn run_once(&self, ast: Ast, user_ctx: &mut C) -> Result<OutputAst, String> {
+        if self.phases.len() != 1 {
+            return Err("YEAST requires exactly one translation phase".to_string());
+        }
+        let phase = &self.phases[0];
+        let mut output = OutputAst::with_schema(self.schema.clone());
+        let res = apply_rules(&phase.rules, &ast, &mut output, user_ctx, ast.get_root())
             .map_err(|e| format!("Phase `{}`: {e}", phase.name))?;
-            if res.len() != 1 {
-                return Err(format!(
-                    "Phase `{}`: expected exactly one result node, got {}",
-                    phase.name,
-                    res.len()
-                ));
-            }
-            root = res[0];
+        if res.len() != 1 {
+            return Err(format!(
+                "Phase `{}`: expected exactly one result node, got {}",
+                phase.name,
+                res.len()
+            ));
         }
-        ast.set_root(root);
-        Ok(())
+        output.set_root(res[0]);
+        output.set_source(ast.into_source());
+        Ok(output)
     }
 }
 
 impl<'a, C: Clone + Default> Runner<'a, C> {
-    /// Parse `tree` against `source` and run all phases, using the
-    /// default context (`C::default()`) as the initial context state.
-    pub fn run_from_tree(&self, tree: &tree_sitter::Tree, source: &[u8]) -> Result<Ast, String> {
+    /// Parse `tree` against `source` and run the configured translation, using
+    /// the default context (`C::default()`) as the initial context state.
+    pub fn run_from_tree(
+        &self,
+        tree: &tree_sitter::Tree,
+        source: &[u8],
+    ) -> Result<OutputAst, String> {
         let mut user_ctx = C::default();
         self.run_from_tree_with_ctx(tree, source, &mut user_ctx)
     }
 
-    /// Parse `input` and run all phases, using the default context
-    /// (`C::default()`) as the initial context state.
-    pub fn run(&self, input: &str) -> Result<Ast, String> {
+    /// Parse `input` and run the configured translation, using the default
+    /// context (`C::default()`) as the initial context state.
+    pub fn run(&self, input: &str) -> Result<OutputAst, String> {
         let mut user_ctx = C::default();
         self.run_with_ctx(input, &mut user_ctx)
     }
 
-    /// Run all phases over an already-built `ast`, using the default context
-    /// (`C::default()`). Unlike [`run_from_tree`](Self::run_from_tree), the AST
-    /// is supplied by the caller (e.g. built from an external parser's output)
-    /// rather than constructed from a tree-sitter tree. The caller is
-    /// responsible for ensuring the AST's schema knows any output kind/field
-    /// names the rules will build (see [`Ast::register_names_from_schema`]).
-    pub fn run_from_ast(&self, mut ast: Ast) -> Result<Ast, String> {
+    /// Run the configured translation over an already-built input AST.
+    pub fn run_from_ast(&self, ast: Ast) -> Result<OutputAst, String> {
         let mut user_ctx = C::default();
-        self.run_phases(&mut ast, &mut user_ctx)?;
-        Ok(ast)
+        self.run_once(ast, &mut user_ctx)
     }
 }
 
@@ -1606,13 +1682,13 @@ pub trait Desugarer: Send + Sync {
 
     /// Parse `tree` against `source` and run the desugaring pipeline.
     /// Each call constructs a fresh default user context internally.
-    fn run_from_tree(&self, tree: &tree_sitter::Tree, source: &[u8]) -> Result<Ast, String>;
+    fn run_from_tree(&self, tree: &tree_sitter::Tree, source: &[u8]) -> Result<OutputAst, String>;
 
     /// Run the desugaring pipeline over an already-built `ast` (e.g. produced
     /// by an external parser rather than tree-sitter). The desugarer ensures
     /// the AST's schema knows its output kind/field names before running the
     /// rules. Each call constructs a fresh default user context internally.
-    fn run_from_ast(&self, ast: Ast) -> Result<Ast, String>;
+    fn run_from_ast(&self, ast: Ast) -> Result<OutputAst, String>;
 }
 
 /// A concrete [`Desugarer`] backed by a [`DesugaringConfig<C>`] for a
@@ -1624,20 +1700,29 @@ pub struct ConcreteDesugarer<C: Default + Clone + Send + Sync + 'static> {
     /// front-end that only ever desugars an externally-built AST
     /// (`run_from_ast`).
     language: Option<tree_sitter::Language>,
+    input_schema: Option<schema::Schema>,
     schema: schema::Schema,
     config: DesugaringConfig<C>,
 }
 
 impl<C: Default + Clone + Send + Sync + 'static> ConcreteDesugarer<C> {
     /// Build a desugarer for `language` from `config`. Parses the output
-    /// schema YAML once (if set) and stores it for reuse across files.
+    /// schema YAML once and stores it for reuse across files.
     pub fn new(
         language: tree_sitter::Language,
         config: DesugaringConfig<C>,
     ) -> Result<Self, String> {
-        let schema = config.build_schema(&language)?;
+        if config.phases.len() > 1 {
+            return Err("YEAST currently supports at most one translation phase".to_string());
+        }
+        let input_schema = schema::from_language(&language);
+        let output_schema = config
+            .output_node_types_yaml
+            .ok_or("a desugaring config requires output_node_types_yaml")?;
+        let schema = node_types_yaml::schema_from_yaml_with_language(output_schema, &language)?;
         Ok(Self {
             language: Some(language),
+            input_schema: Some(input_schema),
             schema,
             config,
         })
@@ -1648,9 +1733,13 @@ impl<C: Default + Clone + Send + Sync + 'static> ConcreteDesugarer<C> {
     /// [`run_from_ast`](Desugarer::run_from_ast) is supported; the schema comes
     /// from the config's `output_node_types_yaml` (which must be set).
     pub fn without_language(config: DesugaringConfig<C>) -> Result<Self, String> {
+        if config.phases.len() > 1 {
+            return Err("YEAST currently supports at most one translation phase".to_string());
+        }
         let schema = config.build_schema_no_language()?;
         Ok(Self {
             language: None,
+            input_schema: None,
             schema,
             config,
         })
@@ -1662,19 +1751,21 @@ impl<C: Default + Clone + Send + Sync + 'static> Desugarer for ConcreteDesugarer
         self.config.output_node_types_yaml
     }
 
-    fn run_from_tree(&self, tree: &tree_sitter::Tree, source: &[u8]) -> Result<Ast, String> {
+    fn run_from_tree(&self, tree: &tree_sitter::Tree, source: &[u8]) -> Result<OutputAst, String> {
         let language = self
             .language
             .clone()
             .ok_or("run_from_tree requires a tree-sitter language")?;
-        let runner = Runner::with_schema(language, &self.schema, &self.config.phases);
+        let input_schema = self
+            .input_schema
+            .as_ref()
+            .ok_or("run_from_tree requires an input schema")?;
+        let runner =
+            Runner::with_schemas(language, input_schema, &self.schema, &self.config.phases);
         runner.run_from_tree(tree, source)
     }
 
-    fn run_from_ast(&self, mut ast: Ast) -> Result<Ast, String> {
-        // The AST was built against its own (external) schema; make sure the
-        // output kind/field names the rules build are resolvable in it.
-        ast.register_names_from_schema(&self.schema);
+    fn run_from_ast(&self, ast: Ast) -> Result<OutputAst, String> {
         // `run_from_ast` never parses, so no tree-sitter language is needed.
         let runner = Runner::with_schema_no_language(&self.schema, &self.config.phases);
         runner.run_from_ast(ast)
diff --git a/shared/yeast/src/query.rs b/shared/yeast/src/query.rs
index 3e61ac60b2be..c8785ab00b27 100644
--- a/shared/yeast/src/query.rs
+++ b/shared/yeast/src/query.rs
@@ -143,7 +143,8 @@ impl QueryListElem {
         match self {
             QueryListElem::Repeated { children, rep } => {
                 if children.is_empty() {
-                    // Empty repetition always succeeds without consuming
+                    // Macro parsing rejects empty groups. Retain safe
+                    // zero-width behavior for manually constructed queries.
                     return Ok(*rep != Rep::OneOrMore);
                 }
 
diff --git a/shared/yeast/src/range.rs b/shared/yeast/src/range.rs
index e56bbcc6fb85..6b0024596bb5 100644
--- a/shared/yeast/src/range.rs
+++ b/shared/yeast/src/range.rs
@@ -30,3 +30,101 @@ pub struct Range {
     pub start_point: Point,
     pub end_point: Point,
 }
+
+impl Range {
+    /// Return the smallest range containing both ranges.
+    pub fn union(self, other: Self) -> Self {
+        let (start_byte, start_point) = if self.start_byte <= other.start_byte {
+            (self.start_byte, self.start_point)
+        } else {
+            (other.start_byte, other.start_point)
+        };
+        let (end_byte, end_point) = if self.end_byte >= other.end_byte {
+            (self.end_byte, self.end_point)
+        } else {
+            (other.end_byte, other.end_point)
+        };
+        Self {
+            start_byte,
+            end_byte,
+            start_point,
+            end_point,
+        }
+    }
+
+    /// Return an empty range anchored at this range's start.
+    pub fn empty_at_start(self) -> Self {
+        Self {
+            end_byte: self.start_byte,
+            end_point: self.start_point,
+            ..self
+        }
+    }
+
+    /// Return an empty range anchored at this range's end.
+    pub fn empty_at_end(self) -> Self {
+        Self {
+            start_byte: self.end_byte,
+            start_point: self.end_point,
+            ..self
+        }
+    }
+
+    /// Return whether this range contains no source bytes.
+    pub fn is_empty(self) -> bool {
+        self.start_byte == self.end_byte
+    }
+
+    pub(crate) fn ignoring_boundary_ranges(
+        mut self,
+        ignored: impl IntoIterator<Item = Self>,
+    ) -> Self {
+        let ignored: Vec<_> = ignored
+            .into_iter()
+            .filter(|range| !range.is_empty())
+            .collect();
+        loop {
+            let previous = self;
+            for range in &ignored {
+                if *range == self {
+                    return self.empty_at_start();
+                }
+                if range.start_byte == self.start_byte {
+                    self.start_byte = range.end_byte;
+                    self.start_point = range.end_point;
+                }
+                if range.end_byte == self.end_byte {
+                    self.end_byte = range.start_byte;
+                    self.end_point = range.start_point;
+                }
+            }
+            if self == previous {
+                return self;
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{Point, Range};
+
+    fn range(start_byte: usize, end_byte: usize) -> Range {
+        Range {
+            start_byte,
+            end_byte,
+            start_point: Point::new(0, start_byte),
+            end_point: Point::new(0, end_byte),
+        }
+    }
+
+    #[test]
+    fn empty_ignored_ranges_do_not_change_boundaries() {
+        let source = range(0, 5);
+
+        assert_eq!(
+            source.ignoring_boundary_ranges([range(0, 0), range(5, 5)]),
+            source
+        );
+    }
+}
diff --git a/shared/yeast/src/tree_builder.rs b/shared/yeast/src/tree_builder.rs
deleted file mode 100644
index c735c272d283..000000000000
--- a/shared/yeast/src/tree_builder.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use std::cell::Cell;
-use std::collections::BTreeMap;
-
-/// Tracks fresh identifier generation during a single tree-building operation.
-/// All occurrences of the same `$name` within one build share the same generated value.
-pub struct FreshScope {
-    counter: Cell<u32>,
-    resolved: std::cell::RefCell<BTreeMap<String, String>>,
-}
-
-impl Default for FreshScope {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl FreshScope {
-    pub fn new() -> Self {
-        Self {
-            counter: Cell::new(0),
-            resolved: std::cell::RefCell::new(BTreeMap::new()),
-        }
-    }
-
-    pub fn resolve(&self, name: &str) -> String {
-        self.resolved
-            .borrow_mut()
-            .entry(name.to_string())
-            .or_insert_with(|| {
-                let id = self.counter.get();
-                self.counter.set(id + 1);
-                format!("${name}-{id}")
-            })
-            .clone()
-    }
-
-    /// Clear resolved names but keep the counter. Called between rule
-    /// applications so that `$tmp` in different rules gets different values
-    /// while the counter increases monotonically.
-    pub fn next_scope(&self) {
-        self.resolved.borrow_mut().clear();
-    }
-}
diff --git a/shared/yeast/src/visitor.rs b/shared/yeast/src/visitor.rs
index bbf4308f1334..82fc00c163d8 100644
--- a/shared/yeast/src/visitor.rs
+++ b/shared/yeast/src/visitor.rs
@@ -5,7 +5,7 @@ use crate::{Ast, Id, Node, NodeContent, CHILD_FIELD};
 
 #[derive(Debug)]
 struct VisitorNode {
-    inner: Node,
+    inner: Node<Id>,
     parent: Option<Id>,
 }
 
diff --git a/shared/yeast/tests/test.rs b/shared/yeast/tests/test.rs
index bdc17c7593dc..11c1b1996ee6 100644
--- a/shared/yeast/tests/test.rs
+++ b/shared/yeast/tests/test.rs
@@ -1,5 +1,7 @@
 #![cfg(test)]
 
+use std::collections::BTreeMap;
+
 use yeast::dump::{dump_ast, dump_ast_with_type_errors};
 use yeast::*;
 
@@ -7,55 +9,134 @@ const OUTPUT_SCHEMA_YAML: &str = include_str!("node-types.yml");
 
 /// Helper: parse Ruby source with no rules, return dump.
 fn parse_and_dump(input: &str) -> String {
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run(input).unwrap();
+    let ast = parse_input(input);
     dump_ast(&ast, ast.get_root(), input)
 }
 
-/// Helper: parse Ruby source with a custom output schema and a single
-/// phase of rules, return dump.
-fn run_and_dump(input: &str, rules: Vec<Rule>) -> String {
-    run_phased_and_dump(input, vec![Phase::new("test", PhaseKind::Repeating, rules)])
+fn parse_input(input: &str) -> Ast {
+    let language: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let mut parser = tree_sitter::Parser::new();
+    parser.set_language(&language).unwrap();
+    let tree = parser.parse(input, None).unwrap();
+    Ast::from_tree_with_schema_and_source(
+        yeast::schema::from_language(&language),
+        &tree,
+        &language,
+        input.as_bytes().to_vec(),
+    )
 }
 
-/// Helper: parse Ruby source with custom rules and return the transformed AST.
-fn run_and_ast(input: &str, rules: Vec<Rule>) -> Ast {
+fn empty_output_ast(input: &str) -> OutputAst {
     let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
     let schema =
         yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
-    let phases = vec![Phase::new("test", PhaseKind::Repeating, rules)];
-    let runner: Runner = Runner::with_schema(lang, &schema, &phases);
-    runner.run(input).unwrap()
+    let mut ast = OutputAst::with_schema(schema);
+    ast.set_source(input.as_bytes().to_vec());
+    ast
+}
+
+fn with_passthrough_rules<C: Clone + 'static>(mut rules: Vec<Rule<C>>) -> Vec<Rule<C>> {
+    let program_rule = Rule::new(
+        yeast::query!((program (_)* @children)),
+        Box::new(
+            |ast, output, captures, source_range, user_ctx, translator| {
+                let mut children = Vec::new();
+                for child in captures.get_all("children") {
+                    children.extend(translator.translate(ast, output, user_ctx, child)?);
+                }
+                let kind = output
+                    .id_for_node_kind("program")
+                    .ok_or("program kind is not registered")?;
+                let fields = BTreeMap::from([(CHILD_FIELD, children)]);
+                let program = output.create_node_with_range(
+                    kind,
+                    NodeContent::DynamicString(String::new()),
+                    fields,
+                    true,
+                    source_range,
+                );
+                Ok(vec![program])
+            },
+        ),
+    );
+    let left_assignment_list_rule: Rule<C> = yeast::rule!(
+        (left_assignment_list (identifier)* @items)
+        =>
+        (left_assignment_list item: {items})
+    );
+    let assignment_rule: Rule<C> = yeast::rule!(
+        (assignment left: (_) @left right: (_) @right)
+        =>
+        (assignment left: {left} right: {right})
+    );
+    let identifier_rule: Rule<C> = yeast::rule!(
+        (identifier) @@node
+        =>
+        (identifier #{node})
+    );
+    let integer_rule: Rule<C> = yeast::rule!(
+        (integer) @@node
+        =>
+        (integer #{node})
+    );
+    rules.extend([
+        program_rule,
+        left_assignment_list_rule,
+        assignment_rule,
+        identifier_rule,
+        integer_rule,
+    ]);
+    rules
+}
+
+/// Helper: translate Ruby source with a custom output schema and rules, then
+/// return its dump. The appended pass-through rules make the small input
+/// subset used by these tests exhaustive.
+fn run_and_dump(input: &str, rules: Vec<Rule>) -> String {
+    run_phased_and_dump(
+        input,
+        vec![Phase::new("test", with_passthrough_rules(rules))],
+    )
 }
 
-/// Helper: parse Ruby source with a custom output schema and multiple
-/// rule phases, return dump.
-fn run_phased_and_dump(input: &str, phases: Vec<Phase>) -> String {
+/// Helper: translate Ruby source with custom rules and return the transformed AST.
+fn run_and_ast(input: &str, rules: Vec<Rule>) -> OutputAst {
     let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
     let schema =
         yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
+    let phases = vec![Phase::new("test", with_passthrough_rules(rules))];
     let runner: Runner = Runner::with_schema(lang, &schema, &phases);
-    let ast = runner.run(input).unwrap();
-    dump_ast(&ast, ast.get_root(), input)
+    runner.run(input).unwrap()
+}
+
+fn run_ast_with_rules(ast: Ast, rules: Vec<Rule>) -> OutputAst {
+    let schema = yeast::node_types_yaml::schema_from_yaml(OUTPUT_SCHEMA_YAML).unwrap();
+    let phases = [Phase::new("test", rules)];
+    let runner: Runner = Runner::with_schema_no_language(&schema, &phases);
+    runner.run_from_ast(ast).unwrap()
 }
 
-/// Helper: like `run_and_dump`, but returns the runner error (if any)
-/// instead of unwrapping.
-fn run_and_get_error(input: &str, rules: Vec<Rule>) -> String {
+fn synthetic_integer_ast(content: &str) -> Ast {
+    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let mut ast = Ast::with_schema(yeast::schema::from_language(&lang));
+    let root = ast.create_named_token("integer", content.to_owned());
+    ast.set_root(root);
+    ast
+}
+
+/// Helper: translate Ruby source with multiple rule phases and return its dump.
+fn run_phased_and_dump(input: &str, phases: Vec<Phase>) -> String {
     let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
     let schema =
         yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
-    let phases = vec![Phase::new("test", PhaseKind::Repeating, rules)];
     let runner: Runner = Runner::with_schema(lang, &schema, &phases);
-    runner
-        .run(input)
-        .expect_err("expected runner to return an error")
+    let ast = runner.run(input).unwrap();
+    dump_ast(&ast, ast.get_root(), input)
 }
 
 /// Helper: parse Ruby source with no rules and dump with schema type errors.
 fn parse_and_dump_typed(input: &str, schema_yaml: &str) -> String {
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run(input).unwrap();
+    let ast = parse_input(input);
     let schema = yeast::node_types_yaml::schema_from_yaml(schema_yaml).unwrap();
     dump_ast_with_type_errors(&ast, ast.get_root(), input, &schema)
 }
@@ -64,21 +145,22 @@ fn parse_and_dump_typed(input: &str, schema_yaml: &str) -> String {
 /// building schema with language IDs so field checks align with parser fields.
 fn parse_and_dump_typed_with_language(input: &str, schema_yaml: &str) -> String {
     let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
-    let runner: Runner = Runner::new(lang.clone(), &[]);
-    let ast = runner.run(input).unwrap();
+    let ast = parse_input(input);
     let schema =
         yeast::node_types_yaml::schema_from_yaml_with_language(schema_yaml, &lang).unwrap();
     dump_ast_with_type_errors(&ast, ast.get_root(), input, &schema)
 }
 
-/// Helper: parse Ruby source with custom rules and dump with schema type errors.
+/// Helper: translate Ruby source with custom rules and dump with schema type errors.
 fn run_and_dump_typed(input: &str, rules: Vec<Rule>, schema_yaml: &str) -> String {
     let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
-    let schema = yeast::node_types_yaml::schema_from_yaml(schema_yaml).unwrap();
-    let phases = vec![Phase::new("test", PhaseKind::Repeating, rules)];
-    let runner: Runner = Runner::with_schema(lang, &schema, &phases);
+    let runner_schema =
+        yeast::node_types_yaml::schema_from_yaml_with_language(schema_yaml, &lang).unwrap();
+    let validation_schema = yeast::node_types_yaml::schema_from_yaml(schema_yaml).unwrap();
+    let phases = vec![Phase::new("test", with_passthrough_rules(rules))];
+    let runner: Runner = Runner::with_schema(lang, &runner_schema, &phases);
     let ast = runner.run(input).unwrap();
-    dump_ast_with_type_errors(&ast, ast.get_root(), input, &schema)
+    dump_ast_with_type_errors(&ast, ast.get_root(), input, &validation_schema)
 }
 
 /// Assert that a dump equals the expected string, treating the expected
@@ -247,8 +329,7 @@ named:
 
 #[test]
 fn test_query_match() {
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run("x = 1").unwrap();
+    let ast = parse_input("x = 1");
 
     let query = yeast::query!(
         (program
@@ -268,8 +349,6 @@ fn test_query_match() {
 
 #[test]
 fn test_run_from_ast_desugars_hand_built_tree() {
-    use std::collections::BTreeMap;
-
     // Output schema for the desugared tree. Its kind/field names must become
     // resolvable in the hand-built AST's schema for the rule to build them.
     let schema_yaml = r#"
@@ -289,7 +368,7 @@ named:
 
     let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
     let config = DesugaringConfig::<()>::new()
-        .add_phase("test", PhaseKind::OneShot, rules)
+        .add_phase("test", rules)
         .with_output_node_types_yaml(schema_yaml);
     let desugarer = ConcreteDesugarer::new(lang, config).unwrap();
 
@@ -321,8 +400,7 @@ named:
 
 #[test]
 fn test_query_no_match() {
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run("x = 1").unwrap();
+    let ast = parse_input("x = 1");
 
     let query = yeast::query!(
         (program
@@ -346,8 +424,7 @@ fn test_query_skips_extras_in_positional_match() {
     // captured comment to nothing (a common idiom, e.g.
     // `(comment) => ()` in Swift) leaves the capture's match-list empty
     // and causes the transform to fail with "Variable X has 0 matches".
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run("[1, # comment\n2]").unwrap();
+    let ast = parse_input("[1, # comment\n2]");
 
     // Navigate to the `array` node: program -> array.
     let mut cursor = AstCursor::new(&ast);
@@ -376,14 +453,13 @@ fn test_query_skips_extras_in_positional_match() {
 }
 
 #[test]
-fn test_reachable_nodes_excludes_orphaned_rewrite_nodes() {
+fn test_output_arena_contains_only_constructed_nodes() {
     let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
     let schema =
         yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
     let phases: Vec<Phase> = vec![Phase::new(
         "test",
-        PhaseKind::Repeating,
-        vec![yeast::rule!((integer) => (identifier "replaced"))],
+        with_passthrough_rules(vec![yeast::rule!((integer) => (identifier "replaced"))]),
     )];
     let runner: Runner = Runner::with_schema(lang, &schema, &phases);
 
@@ -391,10 +467,7 @@ fn test_reachable_nodes_excludes_orphaned_rewrite_nodes() {
     let ast = runner.run(input).unwrap();
     let reachable_ids = ast.reachable_node_ids();
 
-    assert!(
-        ast.nodes().len() > reachable_ids.len(),
-        "expected rewrite to leave orphaned arena nodes"
-    );
+    assert_eq!(ast.nodes().len(), reachable_ids.len());
 
     let dump = dump_ast(&ast, ast.get_root(), input);
     assert!(dump.contains("identifier \"replaced\""));
@@ -403,8 +476,7 @@ fn test_reachable_nodes_excludes_orphaned_rewrite_nodes() {
 
 #[test]
 fn test_query_repeated_capture() {
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run("x, y, z = 1").unwrap();
+    let ast = parse_input("x, y, z = 1");
 
     let query = yeast::query!(
         (assignment
@@ -428,8 +500,7 @@ fn test_query_repeated_capture() {
 #[test]
 fn test_capture_unnamed_node_parenthesized() {
     // `("=") @op` captures the unnamed `=` token between left and right.
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run("x = 1").unwrap();
+    let ast = parse_input("x = 1");
 
     let query = yeast::query!(
         (assignment
@@ -456,8 +527,7 @@ fn test_capture_unnamed_node_parenthesized() {
 fn test_capture_bare_underscore_repeated() {
     // `_` matches named and unnamed nodes in bare-child position. On this
     // assignment shape, bare children correspond to unnamed tokens (the `=`).
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run("x = 1").unwrap();
+    let ast = parse_input("x = 1");
 
     let query = yeast::query!((assignment _* @all));
 
@@ -478,8 +548,7 @@ fn test_capture_bare_underscore_repeated() {
 #[test]
 fn test_capture_unnamed_node_bare_literal() {
     // `"=" @op` (without surrounding parens) is the same as `("=") @op`.
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run("x = 1").unwrap();
+    let ast = parse_input("x = 1");
 
     let query = yeast::query!(
         (assignment
@@ -507,8 +576,7 @@ fn test_bare_underscore_matches_unnamed() {
     // Bare `_` matches any node, including unnamed tokens, while `(_)`
     // matches only named nodes. Demonstrate by matching the unnamed `=`
     // token in the implicit `child` field of an `assignment`.
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run("x = 1").unwrap();
+    let ast = parse_input("x = 1");
 
     let mut cursor = AstCursor::new(&ast);
     cursor.goto_first_child();
@@ -546,8 +614,7 @@ fn test_bare_forms_in_field_position() {
     // field's value, not just in the bare-children position. This is
     // syntactic sugar for `(_)` / `("…")` and goes through the same
     // code paths.
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run("x = 1").unwrap();
+    let ast = parse_input("x = 1");
 
     let mut cursor = AstCursor::new(&ast);
     cursor.goto_first_child();
@@ -585,8 +652,7 @@ fn test_forward_scan_finds_unnamed_token_late() {
     // query for `("end")` skip past the first two and match the third.
     // Without forward-scan, the matcher took the first child unconditionally
     // and failed.
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run("for x in list do\n  y\nend").unwrap();
+    let ast = parse_input("for x in list do\n  y\nend");
 
     // Navigate: program > for > do (the body wrapper).
     let mut cursor = AstCursor::new(&ast);
@@ -612,8 +678,7 @@ fn test_forward_scan_preserves_order() {
     // order. A query for ("end") then ("do") should fail because `do`
     // appears before `end` in the source order; once forward-scan has
     // consumed `end`, the iterator is exhausted.
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run("for x in list do\n  y\nend").unwrap();
+    let ast = parse_input("for x in list do\n  y\nend");
 
     let mut cursor = AstCursor::new(&ast);
     cursor.goto_first_child();
@@ -632,37 +697,94 @@ fn test_forward_scan_preserves_order() {
 // ---- Tree builder tests ----
 
 #[test]
-fn test_tree_builder() {
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let mut ast = runner.run("x = 1").unwrap();
-    let input = "x = 1";
+fn test_bare_leaf_rule_result_inherits_parsed_source_text() {
+    let rules: Vec<Rule> = yeast::rules! {
+        input: "tests/input-types.yml",
+        output: "tests/node-types.yml",
+        [
+            (integer) => (identifier),
+        ]
+    };
+    let ast = run_and_ast("x = 1", rules);
+    let dump = dump_ast(&ast, ast.get_root(), "x = 1");
 
-    let query = yeast::query!(
-        (program
-            child: (assignment
-                left: (_) @left
-                right: (_) @right
-            )
-        )
+    assert_dump_eq(
+        &dump,
+        r#"
+        program
+          assignment
+            left: identifier "x"
+            right: identifier "1"
+    "#,
     );
+    assert!(ast.reachable_node_ids().into_iter().any(|id| {
+        let node = ast.get_node(id).unwrap();
+        node.kind_name() == "identifier" && node.opt_string_content().as_deref() == Some("1")
+    }));
+}
 
-    let mut captures = yeast::captures::Captures::new();
-    query.do_match(&ast, ast.get_root(), &mut captures).unwrap();
+#[test]
+fn test_bare_leaf_rule_result_inherits_synthetic_content() {
+    let ast = run_ast_with_rules(
+        synthetic_integer_ast("synthetic"),
+        yeast::rules! {
+            input: "tests/input-types.yml",
+            output: "tests/node-types.yml",
+            [
+                rule!((integer) => (identifier)),
+            ]
+        },
+    );
+    let dump = dump_ast(&ast, ast.get_root(), "");
+
+    assert_dump_eq(
+        &dump,
+        r#"
+        identifier "synthetic"
+    "#,
+    );
+}
+
+#[test]
+fn test_bare_leaf_rule_result_inherits_empty_content() {
+    let ast = run_ast_with_rules(
+        synthetic_integer_ast(""),
+        yeast::rules! {
+            input: "tests/input-types.yml",
+            output: "tests/node-types.yml",
+            [
+                (integer) => (identifier),
+            ]
+        },
+    );
+
+    assert!(ast.reachable_node_ids().into_iter().any(|id| {
+        let node = ast.get_node(id).unwrap();
+        node.kind_name() == "identifier" && node.opt_string_content().as_deref() == Some("")
+    }));
+}
+
+#[test]
+fn test_tree_builder() {
+    let input = "x = 1";
+    let input_ast = parse_input(input);
+    let mut ast = empty_output_ast(input);
 
     // Swap left and right
-    let fresh = yeast::tree_builder::FreshScope::new();
     let mut user_ctx = ();
-    let mut ctx = yeast::build::BuildCtx::new(&mut ast, &captures, &fresh, &mut user_ctx);
-    let new_id = yeast::tree!(ctx,
+    let mut ctx = yeast::build::BuildCtx::new(&input_ast, &mut ast, &mut user_ctx);
+    let left = yeast::tree!((identifier "x"));
+    let right = yeast::tree!((integer "1"));
+    let new_id = yeast::tree!(
         (program
             child: (assignment
-                left: {ctx.capture("right")}
-                right: {ctx.capture("left")}
+                left: {right}
+                right: {left}
             )
         )
     );
 
-    let dump = dump_ast(ctx.ast, new_id, input);
+    let dump = dump_ast(ctx.output, new_id, input);
     assert_dump_eq(
         &dump,
         r#"
@@ -674,37 +796,40 @@ fn test_tree_builder() {
     );
 }
 
-/// Builds `(assignment left: … right: (integer #{value})?)`, where a `None`
+/// Builds `(assignment left: … right: [(integer #{value})])`, where a `None`
 /// `value` leaves `right` unset rather than producing an `integer` with no
 /// content.
-fn build_optional_right(ast: &mut Ast, value: Option<yeast::Id>) -> (yeast::Id, yeast::Id) {
-    let captures = yeast::captures::Captures::new();
-    let fresh = yeast::tree_builder::FreshScope::new();
+fn build_choice_right(
+    input_ast: &Ast,
+    ast: &mut OutputAst,
+    value: Option<yeast::Id>,
+) -> (yeast::OutputId, yeast::OutputId) {
     let mut user_ctx = ();
-    let mut ctx = yeast::build::BuildCtx::new(ast, &captures, &fresh, &mut user_ctx);
-    let left = yeast::tree!(ctx, (identifier "x"));
-    let root = yeast::tree!(ctx,
+    let mut ctx = yeast::build::BuildCtx::new(input_ast, ast, &mut user_ctx);
+    let left = yeast::tree!((identifier "x"));
+    let root = yeast::tree!(
         (assignment
             left: {left}
-            right: (integer #{value})?
+            right: [(integer #{value})]
         )
     );
     (root, left)
 }
 
 #[test]
-fn test_optional_field_is_set_when_the_value_is_present() {
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let mut ast = runner.run("x = 1").unwrap();
+fn test_choice_is_set_when_the_value_is_present() {
+    let input = "x = 1";
+    let input_ast = parse_input(input);
+    let mut ast = empty_output_ast(input);
 
     // Any node will do as the interpolated value; `#{…}` renders its source text.
-    let mut cursor = AstCursor::new(&ast);
+    let mut cursor = AstCursor::new(&input_ast);
     cursor.goto_first_child();
     let some = cursor.node_id();
 
-    let (root, _) = build_optional_right(&mut ast, Some(some));
+    let (root, _) = build_choice_right(&input_ast, &mut ast, Some(some));
     assert_dump_eq(
-        &dump_ast(&ast, root, "x = 1"),
+        &dump_ast(&ast, root, input),
         r#"
         assignment
           left: identifier "x"
@@ -714,13 +839,14 @@ fn test_optional_field_is_set_when_the_value_is_present() {
 }
 
 #[test]
-fn test_optional_field_is_unset_when_the_value_is_absent() {
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let mut ast = runner.run("x = 1").unwrap();
+fn test_choice_is_unset_when_the_value_is_absent() {
+    let input = "x = 1";
+    let input_ast = parse_input(input);
+    let mut ast = empty_output_ast(input);
 
-    let (root, _) = build_optional_right(&mut ast, None);
+    let (root, _) = build_choice_right(&input_ast, &mut ast, None);
     assert_dump_eq(
-        &dump_ast(&ast, root, "x = 1"),
+        &dump_ast(&ast, root, input),
         r#"
         assignment
           left: identifier "x"
@@ -729,28 +855,189 @@ fn test_optional_field_is_unset_when_the_value_is_absent() {
 }
 
 #[test]
-fn test_optional_field_propagates_through_nested_nodes() {
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let mut ast = runner.run("x = 1").unwrap();
+fn test_choice_uses_first_constructible_alternative() {
+    let input = "x = 1";
+    let input_ast = parse_input(input);
+    let mut ast = empty_output_ast(input);
+
+    let mut user_ctx = ();
+    let mut ctx = yeast::build::BuildCtx::new(&input_ast, &mut ast, &mut user_ctx);
+    let absent: Option<yeast::Id> = None;
+    let root = yeast::tree!(
+        (assignment
+            left: [
+                (identifier #{absent})
+                (identifier "fallback")
+            ]
+        )
+    );
+
+    assert_dump_eq(
+        &dump_ast(ctx.output, root, input),
+        r#"
+        assignment
+          left: identifier "fallback"
+    "#,
+    );
+}
+
+#[test]
+fn test_choice_guard_skips_an_alternative() {
+    let input = "x = 1";
+    let input_ast = parse_input(input);
+    let mut ast = empty_output_ast(input);
+
+    let mut user_ctx = ();
+    let mut ctx = yeast::build::BuildCtx::new(&input_ast, &mut ast, &mut user_ctx);
+    let use_first = false;
+    let root = yeast::tree!(
+        (assignment
+            left: [
+                (identifier "first") if { use_first }
+                (identifier "fallback")
+            ]
+        )
+    );
+
+    assert_dump_eq(
+        &dump_ast(ctx.output, root, input),
+        r#"
+        assignment
+          left: identifier "fallback"
+    "#,
+    );
+}
+
+#[test]
+fn test_choice_fallback_can_reuse_consumed_splice() {
+    let input = "x = 1";
+    let input_ast = parse_input(input);
+    let mut ast = empty_output_ast(input);
+
+    let mut user_ctx = ();
+    let mut ctx = yeast::build::BuildCtx::new(&input_ast, &mut ast, &mut user_ctx);
+    let items = vec![
+        yeast::tree!((identifier "x")),
+        yeast::tree!((identifier "y")),
+    ];
+    let use_first = false;
+    let root = yeast::tree!(
+        (assignment
+            left: [
+                (left_assignment_list
+                    child: {items}
+                    child: (identifier "first")) if { use_first }
+                (left_assignment_list
+                    child: {items}
+                    child: (identifier "fallback"))
+            ]
+        )
+    );
+
+    assert_dump_eq(
+        &dump_ast(ctx.output, root, input),
+        r#"
+        assignment
+          left:
+            left_assignment_list
+              identifier "x"
+              identifier "y"
+              identifier "fallback"
+    "#,
+    );
+}
+
+#[test]
+fn test_root_choice_returns_an_optional_node() {
+    let input = "x = 1";
+    let input_ast = parse_input(input);
+    let mut ast = empty_output_ast(input);
+    let node_count = ast.nodes().len();
+
+    let mut user_ctx = ();
+    let mut ctx = yeast::build::BuildCtx::new(&input_ast, &mut ast, &mut user_ctx);
+    let absent: Option<yeast::Id> = None;
+    let missing = yeast::tree!([(identifier #{absent})]);
+    assert_eq!(missing, None);
+    assert_eq!(ctx.output.nodes().len(), node_count);
+
+    let root = yeast::tree!([
+        (identifier #{absent})
+        (identifier "fallback")
+    ])
+    .unwrap();
+    assert_dump_eq(
+        &dump_ast(ctx.output, root, input),
+        r#"
+        identifier "fallback"
+    "#,
+    );
+
+    let source = ctx.ast().get_root();
+    let located = yeast::tree!([
+        (identifier #{absent})
+        (identifier "located fallback" location: {source})
+    ])
+    .unwrap();
+    assert_eq!(
+        ctx.output.get_node(located).unwrap().source_range(),
+        ctx.ast().get_node(source).unwrap().source_range()
+    );
+}
+
+#[test]
+fn test_choice_preflights_dependencies_before_constructing() {
+    let input = "x = 1";
+    let input_ast = parse_input(input);
+    let mut ast = empty_output_ast(input);
+    let node_count = ast.nodes().len();
+
+    let mut user_ctx = ();
+    let mut ctx = yeast::build::BuildCtx::new(&input_ast, &mut ast, &mut user_ctx);
+    let absent: Option<yeast::Id> = None;
+    let root = yeast::tree!(
+        (assignment
+            left: [
+                (left_assignment_list
+                    child: (identifier "would-be-orphan")
+                    child: (identifier #{absent}))
+                (identifier "fallback")
+            ]
+        )
+    );
+
+    assert_eq!(ctx.output.nodes().len(), node_count + 2);
+    assert_dump_eq(
+        &dump_ast(ctx.output, root, input),
+        r#"
+        assignment
+          left: identifier "fallback"
+    "#,
+    );
+}
+
+#[test]
+fn test_choice_propagates_through_nested_nodes() {
+    let input = "x = 1";
+    let input_ast = parse_input(input);
+    let mut ast = empty_output_ast(input);
 
-    let captures = yeast::captures::Captures::new();
-    let fresh = yeast::tree_builder::FreshScope::new();
     let mut user_ctx = ();
-    let mut ctx = yeast::build::BuildCtx::new(&mut ast, &captures, &fresh, &mut user_ctx);
+    let mut ctx = yeast::build::BuildCtx::new(&input_ast, &mut ast, &mut user_ctx);
 
-    // The absent value sits two levels below the `?`, so the whole
+    // The absent value sits two levels below the choice, so the whole
     // `left_assignment_list` subtree is abandoned along with it.
     let absent: Option<yeast::Id> = None;
-    let right = yeast::tree!(ctx, (integer "1"));
-    let root = yeast::tree!(ctx,
+    let right = yeast::tree!((integer "1"));
+    let root = yeast::tree!(
         (assignment
-            left: (left_assignment_list child: (identifier #{absent}))?
+            left: [(left_assignment_list child: (identifier #{absent}))]
             right: {right}
         )
     );
 
     assert_dump_eq(
-        &dump_ast(&ast, root, "x = 1"),
+        &dump_ast(ctx.output, root, input),
         r#"
         assignment
           right: integer "1"
@@ -759,25 +1046,26 @@ fn test_optional_field_propagates_through_nested_nodes() {
 }
 
 #[test]
-fn test_innermost_optional_field_catches_first() {
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let mut ast = runner.run("x = 1").unwrap();
+fn test_innermost_choice_catches_first() {
+    let input = "x = 1";
+    let input_ast = parse_input(input);
+    let mut ast = empty_output_ast(input);
 
-    let captures = yeast::captures::Captures::new();
-    let fresh = yeast::tree_builder::FreshScope::new();
     let mut user_ctx = ();
-    let mut ctx = yeast::build::BuildCtx::new(&mut ast, &captures, &fresh, &mut user_ctx);
+    let mut ctx = yeast::build::BuildCtx::new(&input_ast, &mut ast, &mut user_ctx);
 
-    // The inner `?` catches, so only `child` is dropped; `left` survives.
+    // The inner choice catches, so only `child` is dropped; `left` survives.
     let absent: Option<yeast::Id> = None;
-    let root = yeast::tree!(ctx,
+    let root = yeast::tree!(
         (assignment
-            left: (left_assignment_list child: (identifier #{absent})?)?
+            left: [
+                (left_assignment_list child: [(identifier #{absent})])
+            ]
         )
     );
 
     assert_dump_eq(
-        &dump_ast(&ast, root, "x = 1"),
+        &dump_ast(ctx.output, root, input),
         r#"
         assignment
           left: left_assignment_list
@@ -800,7 +1088,7 @@ fn ruby_rules() -> Vec<Rule> {
         )
         =>
         (assignment
-            left: (identifier $tmp)
+            left: (identifier "assignment_tmp")
             right: {right}
         )
         {left.iter().enumerate().map(|(i, &lhs)|
@@ -808,7 +1096,7 @@ fn ruby_rules() -> Vec<Rule> {
                 (assignment
                     left: {lhs}
                     right: (element_reference
-                        object: (identifier $tmp)
+                        object: (identifier "assignment_tmp")
                         index: (integer #{i})
                     )
                 )
@@ -828,12 +1116,12 @@ fn ruby_rules() -> Vec<Rule> {
             method: (identifier "each")
             block: (block
                 parameters: (block_parameters
-                    parameter: (identifier $tmp)
+                    parameter: (identifier "loop_tmp")
                 )
                 body: (block_body
                     stmt: (assignment
                         left: {pat}
-                        right: (identifier $tmp)
+                        right: (identifier "loop_tmp")
                     )
                     stmt: {body}
                 )
@@ -852,19 +1140,19 @@ fn test_desugar_multiple_assignment() {
         r#"
         program
           assignment
-            left: identifier "$tmp-0"
+            left: identifier "assignment_tmp"
             right: identifier "e"
           assignment
             left: identifier "x"
             right:
               element_reference
-                object: identifier "$tmp-0"
+                object: identifier "assignment_tmp"
                 index: integer "0"
           assignment
             left: identifier "y"
             right:
               element_reference
-                object: identifier "$tmp-0"
+                object: identifier "assignment_tmp"
                 index: integer "1"
     "#,
     );
@@ -885,77 +1173,136 @@ fn test_desugar_for_loop() {
                     stmt:
                       assignment
                         left: identifier "x"
-                        right: identifier "$tmp-0"
+                        right: identifier "loop_tmp"
                       identifier "y"
                 parameters:
                   block_parameters
-                    parameter: identifier "$tmp-0"
+                    parameter: identifier "loop_tmp"
             method: identifier "each"
             receiver: identifier "list"
     "#,
     );
 }
 
+#[derive(Clone, Default)]
+struct GuardTestContext {
+    enabled: bool,
+}
+
+fn guarded_integer_rules() -> Vec<Rule<GuardTestContext>> {
+    vec![
+        yeast::rule!(
+            (integer) @@raw
+            where ctx.enabled && ast.source_text(raw) == "1"
+            =>
+            identifier {
+                assert!(ctx.enabled);
+                tree!((identifier "guarded"))
+            }
+        ),
+        yeast::rule!((integer) => (identifier "fallback")),
+    ]
+}
+
 #[test]
-fn test_shorthand_rule() {
-    let rule: Rule = yeast::rule!(
-        (assignment
-            left: (_) @method
-            right: (_) @receiver
-        )
-        => call
+fn test_rule_guard_reads_raw_capture_and_user_context() {
+    fn run(input: &str, enabled: bool) -> String {
+        let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+        let schema =
+            yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang)
+                .unwrap();
+        let phases = vec![Phase::new(
+            "test",
+            with_passthrough_rules(guarded_integer_rules()),
+        )];
+        let runner = Runner::with_schema(lang, &schema, &phases);
+        let mut user_ctx = GuardTestContext { enabled };
+        let ast = runner.run_with_ctx(input, &mut user_ctx).unwrap();
+        dump_ast(&ast, ast.get_root(), input)
+    }
+
+    assert_dump_eq(
+        &run("1", true),
+        r#"
+        program
+          identifier "guarded"
+    "#,
     );
+    assert_dump_eq(
+        &run("2", true),
+        r#"
+        program
+          identifier "fallback"
+    "#,
+    );
+    assert_dump_eq(
+        &run("1", false),
+        r#"
+        program
+          identifier "fallback"
+    "#,
+    );
+}
+
+#[test]
+fn test_rule_guard_binds_optional_and_repeated_raw_captures() {
+    fn rules() -> Vec<Rule> {
+        vec![
+            yeast::rule!(
+                (array (_)? @@first (_)* @@rest)
+                where first.is_some() && rest.is_empty()
+                =>
+                (identifier "single")
+            ),
+            yeast::rule!((array) => (identifier "multiple")),
+        ]
+    }
 
-    let dump = run_and_dump("x = 1", vec![rule]);
     assert_dump_eq(
-        &dump,
+        &run_and_dump("[1]", rules()),
         r#"
         program
-          call
-            method: identifier "x"
-            receiver: integer "1"
+          identifier "single"
+    "#,
+    );
+    assert_dump_eq(
+        &run_and_dump("[1, 2]", rules()),
+        r#"
+        program
+          identifier "multiple"
     "#,
     );
 }
 
 #[test]
-fn test_chained_rules_output_only_kind() {
-    // Exercise rule chaining where an intermediate kind exists only in the
-    // output schema (not in the input tree-sitter grammar):
-    //   assignment        → first_node          (input → output-only)
-    //   first_node        → second_node         (output-only → output-only)
-    // The matcher must look up `first_node` against the schema, which only
-    // knows about it via the YAML node-types file.
-    let assignment_to_first = yeast::rule!(
+fn test_multiple_translation_phases_are_rejected() {
+    let assignment_to_first: Rule = yeast::rule!(
         (assignment
             left: (_) @left
             right: (_) @right
         )
-        => first_node
+        => (first_node left: {left} right: {right})
     );
-    let first_to_second = yeast::rule!(
+    let first_to_second: Rule = yeast::rule!(
         (first_node
             left: (_) @left
             right: (_) @right
         )
-        => second_node
+        => (second_node left: {left} right: {right})
     );
 
-    let dump = run_and_dump("x = 1", vec![assignment_to_first, first_to_second]);
-    assert_dump_eq(
-        &dump,
-        r#"
-        program
-          second_node
-            left: identifier "x"
-            right: integer "1"
-    "#,
-    );
+    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let schema =
+        yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
+    let phases = vec![
+        Phase::new("first", with_passthrough_rules(vec![assignment_to_first])),
+        Phase::new("second", with_passthrough_rules(vec![first_to_second])),
+    ];
+    let runner: Runner = Runner::with_schema(lang, &schema, &phases);
+    let error = runner.run("x = 1").unwrap_err();
+    assert!(error.contains("requires exactly one translation phase"));
 }
 
-// A rule that swaps `assignment.left` and `assignment.right`. Each
-// application produces another `assignment` whose query the rule
-// matches again, so without the once-per-node default it would loop.
 fn swap_assignment_rule() -> Rule {
     yeast::rule!(
         (assignment
@@ -971,21 +1318,9 @@ fn swap_assignment_rule() -> Rule {
 }
 
 #[test]
-fn test_repeated_rule_hits_depth_limit() {
-    // With `.repeated()` the rule is allowed to fire on its own output,
-    // which cycles forever and trips the rewrite-depth safety net.
-    let err = run_and_get_error("x = 1", vec![swap_assignment_rule().repeated()]);
-    assert!(
-        err.contains("exceeded maximum rewrite depth"),
-        "expected depth-limit error, got: {err}"
-    );
-}
-
-#[test]
-fn test_default_rule_fires_at_most_once_per_node() {
-    // Without `.repeated()` (the default), a rule fires at most once on a
-    // given node. The swap therefore happens exactly once and the desugaring
-    // terminates cleanly.
+fn test_rule_output_is_not_reprocessed() {
+    // Translation applies a rule once to an input node and does not match
+    // rules against the output node.
     let dump = run_and_dump("x = 1", vec![swap_assignment_rule()]);
     assert_dump_eq(
         &dump,
@@ -998,101 +1333,96 @@ fn test_default_rule_fires_at_most_once_per_node() {
     );
 }
 
-// ---- Phase tests ----
+/// Helper: an exhaustive set of rules covering every node reachable via
+/// captures when translating `"x = 1"`.
+fn translation_xeq1_rules() -> Vec<Rule> {
+    vec![
+        yeast::rule!(
+            (program (_)* @stmts)
+            =>
+            (program stmt: {stmts})
+        ),
+        yeast::rule!(
+            (assignment left: (_) @left right: (_) @right)
+            =>
+            (first_node left: {left} right: {right})
+        ),
+        yeast::rule!((identifier) => (identifier "ID")),
+        yeast::rule!((integer) => (integer "INT")),
+    ]
+}
 
 #[test]
-fn test_phased_desugaring() {
-    // Two phases that could equally have been a single one with chained
-    // rules. Splitting them makes the intent (cleanup, then desugar)
-    // explicit and provides per-phase error messages.
-    let cleanup = vec![yeast::rule!(
-        (assignment
-            left: (_) @left
-            right: (_) @right
-        )
-        => first_node
-    )];
-    let desugar = vec![yeast::rule!(
-        (first_node
-            left: (_) @left
-            right: (_) @right
-        )
-        => second_node
-    )];
+fn test_translation_phase() {
+    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let schema =
+        yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
+    let phases = vec![Phase::new("translate", translation_xeq1_rules())];
+    let runner: Runner = Runner::with_schema(lang, &schema, &phases);
 
-    let dump = run_phased_and_dump(
-        "x = 1",
-        vec![
-            Phase::new("cleanup", PhaseKind::Repeating, cleanup),
-            Phase::new("desugar", PhaseKind::Repeating, desugar),
-        ],
-    );
+    let input = "x = 1";
+    let ast = runner.run(input).unwrap();
+    let dump = dump_ast(&ast, ast.get_root(), input);
     assert_dump_eq(
         &dump,
         r#"
         program
-          second_node
-            left: identifier "x"
-            right: integer "1"
+          stmt:
+            first_node
+              left: identifier "ID"
+              right: integer "INT"
     "#,
     );
 }
 
 #[test]
-fn test_phase_error_includes_phase_name() {
-    // A repeated rule that loops; the error message should identify the
-    // phase that tripped the depth limit.
+fn test_translation_phase_errors_when_no_rule_matches() {
     let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
     let schema =
         yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
-    let phases = vec![Phase::new(
-        "buggy",
-        PhaseKind::Repeating,
-        vec![swap_assignment_rule().repeated()],
-    )];
+    // Drop the `integer` rule so the recursion has no rule for `integer`.
+    let mut rules = translation_xeq1_rules();
+    rules.pop();
+    let phases = vec![Phase::new("translate", rules)];
     let runner: Runner = Runner::with_schema(lang, &schema, &phases);
+
     let err = runner
         .run("x = 1")
-        .expect_err("expected runner to return an error");
+        .expect_err("expected translation to error on unmatched node");
     assert!(
-        err.contains("Phase `buggy`"),
-        "error should mention the failing phase, got: {err}"
+        err.contains("Phase `translate`"),
+        "error should name the phase, got: {err}"
     );
     assert!(
-        err.contains("exceeded maximum rewrite depth"),
-        "error should mention the depth limit, got: {err}"
+        err.contains("no rule matched") && err.contains("integer"),
+        "error should describe the unmatched node kind, got: {err}"
     );
 }
 
-/// Helper: an exhaustive set of OneShot rules covering every node reachable
-/// (via captures) when translating `"x = 1"`.
-fn one_shot_xeq1_rules() -> Vec<Rule> {
-    vec![
+#[test]
+fn test_guard_runs_before_capture_translation() {
+    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let schema =
+        yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
+    let rules: Vec<Rule> = vec![
         yeast::rule!(
             (program (_)* @stmts)
             =>
             (program stmt: {stmts})
         ),
+        // There is deliberately no rule for `identifier`. If this
+        // rule translated `@left` before binding it raw in the guard, the run
+        // would fail instead of evaluating the guard and falling through to
+        // the next assignment rule.
         yeast::rule!(
-            (assignment left: (_) @left right: (_) @right)
+            (assignment left: (_) @left)
+            where ast.source_text(left) == "not-x"
             =>
-            (first_node left: {left} right: {right})
+            (first_node left: {left})
         ),
-        yeast::rule!((identifier) => (identifier "ID")),
-        yeast::rule!((integer) => (integer "INT")),
-    ]
-}
-
-#[test]
-fn test_one_shot_phase() {
-    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
-    let schema =
-        yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
-    let phases = vec![Phase::new(
-        "translate",
-        PhaseKind::OneShot,
-        one_shot_xeq1_rules(),
-    )];
+        yeast::rule!((assignment) => (identifier "fallback")),
+    ];
+    let phases = vec![Phase::new("translate", rules)];
     let runner: Runner = Runner::with_schema(lang, &schema, &phases);
 
     let input = "x = 1";
@@ -1102,44 +1432,56 @@ fn test_one_shot_phase() {
         &dump,
         r#"
         program
-          stmt:
-            first_node
-              left: identifier "ID"
-              right: integer "INT"
+          stmt: identifier "fallback"
     "#,
     );
 }
 
 #[test]
-fn test_one_shot_phase_errors_when_no_rule_matches() {
+fn test_transform_context_propagates_to_nested_guard_without_mutating_caller() {
     let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
     let schema =
         yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
-    // Drop the `integer` rule so the recursion has no rule for `integer`.
-    let mut rules = one_shot_xeq1_rules();
-    rules.pop();
-    let phases = vec![Phase::new("translate", PhaseKind::OneShot, rules)];
-    let runner: Runner = Runner::with_schema(lang, &schema, &phases);
+    let rules: Vec<Rule<GuardTestContext>> = vec![
+        yeast::rule!(
+            (program (_) @@stmt)
+            =>
+            program {
+                ctx.enabled = true;
+                let stmt = ctx.translate(stmt)?;
+                tree!((program stmt: {stmt}))
+            }
+        ),
+        yeast::rule!(
+            (integer)
+            where ctx.enabled
+            =>
+            (identifier "guarded")
+        ),
+    ];
+    let phases = vec![Phase::new("translate", rules)];
+    let runner = Runner::with_schema(lang, &schema, &phases);
+    let mut user_ctx = GuardTestContext { enabled: false };
 
-    let err = runner
-        .run("x = 1")
-        .expect_err("expected OneShot to error on unmatched node");
-    assert!(
-        err.contains("Phase `translate`"),
-        "error should name the phase, got: {err}"
-    );
-    assert!(
-        err.contains("no rule matched") && err.contains("integer"),
-        "error should describe the unmatched node kind, got: {err}"
+    let input = "1";
+    let ast = runner.run_with_ctx(input, &mut user_ctx).unwrap();
+    assert!(!user_ctx.enabled);
+    let dump = dump_ast(&ast, ast.get_root(), input);
+    assert_dump_eq(
+        &dump,
+        r#"
+        program
+          stmt: identifier "guarded"
+    "#,
     );
 }
 
-/// OneShot recursion must apply rules to *captured* nodes, even if the rule
+/// Translation must apply rules to *captured* nodes, even if the rule
 /// returns a captured child verbatim. A buggy implementation that only
 /// recurses into the children of the rule's output (rather than into the
 /// captures) would leave the returned capture untransformed.
 #[test]
-fn test_one_shot_recurses_into_returned_capture() {
+fn test_translation_recurses_into_returned_capture() {
     let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
     let schema =
         yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
@@ -1158,13 +1500,13 @@ fn test_one_shot_recurses_into_returned_capture() {
         yeast::rule!((identifier) => (identifier "ID")),
         yeast::rule!((integer) => (integer "INT")),
     ];
-    let phases = vec![Phase::new("translate", PhaseKind::OneShot, rules)];
+    let phases = vec![Phase::new("translate", rules)];
     let runner: Runner = Runner::with_schema(lang, &schema, &phases);
 
     let input = "x = 1";
     let ast = runner.run(input).unwrap();
     let dump = dump_ast(&ast, ast.get_root(), input);
-    // `left` is an `identifier`; OneShot must apply the identifier rule to
+    // `left` is an `identifier`; translation must apply the identifier rule to
     // it before the assignment transform returns it verbatim.
     assert_dump_eq(
         &dump,
@@ -1175,13 +1517,13 @@ fn test_one_shot_recurses_into_returned_capture() {
     );
 }
 
-/// OneShot recursion must NOT descend into the children of the rule's output.
+/// Translation must NOT descend into the children of the rule's output.
 /// A rule may legitimately wrap a captured node in fresh output-schema nodes
 /// that have no matching rule of their own (since rule patterns target the
 /// input schema). Recursing into the output would erroneously try to find
 /// rules for those wrapper kinds and fail.
 #[test]
-fn test_one_shot_does_not_recurse_into_wrapper_output() {
+fn test_translation_does_not_recurse_into_wrapper_output() {
     let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
     let schema =
         yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
@@ -1205,7 +1547,7 @@ fn test_one_shot_does_not_recurse_into_wrapper_output() {
         yeast::rule!((identifier) => (identifier "ID")),
         yeast::rule!((integer) => (integer "INT")),
     ];
-    let phases = vec![Phase::new("translate", PhaseKind::OneShot, rules)];
+    let phases = vec![Phase::new("translate", rules)];
     let runner: Runner = Runner::with_schema(lang, &schema, &phases);
 
     let input = "x = 1";
@@ -1227,7 +1569,7 @@ fn test_one_shot_does_not_recurse_into_wrapper_output() {
 }
 
 /// Verify that `@@name` capture markers skip the auto-translate prefix:
-/// the body sees the *raw* (input-schema) `Id` and can read its
+/// the body sees the *raw* (input-schema) `OutputId` and can read its
 /// source text or call `ctx.translate(...)` explicitly. Compare with
 /// the bare `@name` form, where the auto-translate prefix runs the
 /// same translation up front and the body sees the post-translate id.
@@ -1249,7 +1591,7 @@ fn test_raw_capture_marker() {
             (assignment left: (_) @@raw_lhs right: (_) @rhs)
             =>
             call {
-                let text = ctx.ast.source_text(raw_lhs);
+                let text = ctx.source_text(raw_lhs);
                 tree!((call
                     method: (identifier #{text.as_str()})
                     receiver: {rhs}))
@@ -1258,7 +1600,7 @@ fn test_raw_capture_marker() {
         yeast::rule!((identifier) => (identifier "ID")),
         yeast::rule!((integer) => (integer "INT")),
     ];
-    let phases = vec![Phase::new("translate", PhaseKind::OneShot, rules)];
+    let phases = vec![Phase::new("translate", rules)];
     let runner: Runner = Runner::with_schema(lang, &schema, &phases);
 
     let input = "x = 1";
@@ -1313,7 +1655,7 @@ fn test_raw_capture_marker_explicit_translate() {
         yeast::rule!((identifier) => (identifier "ID")),
         yeast::rule!((integer) => (integer "INT")),
     ];
-    let phases = vec![Phase::new("translate", PhaseKind::OneShot, rules)];
+    let phases = vec![Phase::new("translate", rules)];
     let runner: Runner = Runner::with_schema(lang, &schema, &phases);
 
     let input = "x = 1";
@@ -1335,8 +1677,7 @@ fn test_raw_capture_marker_explicit_translate() {
 
 #[test]
 fn test_cursor_navigation() {
-    let runner: Runner = Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
-    let ast = runner.run("x = 1").unwrap();
+    let ast = parse_input("x = 1");
     let mut cursor = AstCursor::new(&ast);
 
     // Start at root
@@ -1364,46 +1705,8 @@ fn test_cursor_navigation() {
     assert!(!cursor.goto_parent());
 }
 
-#[test]
-fn test_desugar_for_with_multiple_assignment() {
-    let dump = run_and_dump("for a, b in list do\n  x\nend", ruby_rules());
-    assert_dump_eq(
-        &dump,
-        r#"
-        program
-          call
-            block:
-              block
-                body:
-                  block_body
-                    stmt:
-                      assignment
-                        left: identifier "$tmp-1"
-                        right: identifier "$tmp-0"
-                      assignment
-                        left: identifier "a"
-                        right:
-                          element_reference
-                            object: identifier "$tmp-1"
-                            index: integer "0"
-                      assignment
-                        left: identifier "b"
-                        right:
-                          element_reference
-                            object: identifier "$tmp-1"
-                            index: integer "1"
-                      identifier "x"
-                parameters:
-                  block_parameters
-                    parameter: identifier "$tmp-0"
-            method: identifier "each"
-            receiver: identifier "list"
-    "#,
-    );
-}
-
 /// Regression test: `#{capture}` in a template must render the *source text*
-/// of the captured node, not its arena `Id`. Captures are bound as `Id`,
+/// of the captured node, not its arena `OutputId`. Captures are bound as `OutputId`,
 /// whose `YeastDisplay` impl resolves to the captured node's source text.
 #[test]
 fn test_hash_brace_renders_capture_source_text() {
@@ -1425,19 +1728,41 @@ fn test_hash_brace_renders_capture_source_text() {
         r#"
         program
           call
-            arguments: argument_list "foo.bar()"
+            arguments: argument_list
             method: identifier "bar"
             receiver: identifier "foo"
     "#,
     );
 }
 
-/// Regression test: non-`Id` values in `#{expr}` still render via their
+#[test]
+fn test_choice_accepts_optional_translated_capture() {
+    let rule: Rule = rule!(
+        (call method: (identifier) @name)
+        =>
+        (call
+            method: [(identifier #{Some(name)})]
+            arguments: (argument_list)
+        )
+    );
+    let dump = run_and_dump("foo()", vec![rule]);
+    assert_dump_eq(
+        &dump,
+        r#"
+        program
+          call
+            arguments: argument_list
+            method: identifier "foo"
+    "#,
+    );
+}
+
+/// Regression test: non-`OutputId` values in `#{expr}` still render via their
 /// `Display` impl (covered by `YeastDisplay`'s blanket impls for primitives).
 #[test]
 fn test_hash_brace_renders_integer_expression() {
     let rule: Rule = rule!(
-        (identifier) @_
+        (identifier) @@_
         =>
         (identifier #{1 + 2})
     );
@@ -1470,7 +1795,7 @@ fn test_hash_brace_uses_capture_location_for_leaf() {
 
     let ast = run_and_ast("foo.bar()", vec![rule]);
 
-    let mut bar_ids: Vec<yeast::Id> = Vec::new();
+    let mut bar_ids: Vec<yeast::OutputId> = Vec::new();
     for id in ast.reachable_node_ids() {
         let Some(node) = ast.get_node(id) else {
             continue;
@@ -1487,6 +1812,508 @@ fn test_hash_brace_uses_capture_location_for_leaf() {
     assert_eq!(bar.end_byte(), 7);
 }
 
+/// Regression test: tokens matched by a rule but elided from the output still
+/// contribute to the source location of the synthesized replacement node.
+#[test]
+fn test_elided_tokens_contribute_to_replacement_location() {
+    let rule: Rule = rule!(
+        (call
+            method: (identifier) @name
+            receiver: (identifier) @recv
+        )
+        =>
+        (call
+            method: {name}
+        )
+    );
+
+    let ast = run_and_ast("foo.bar()", vec![rule]);
+    let call_ids: Vec<yeast::OutputId> = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter(|&id| {
+            ast.get_node(id)
+                .is_some_and(|node| node.kind_name() == "call")
+        })
+        .collect();
+
+    assert_eq!(call_ids.len(), 1, "expected exactly one reachable call");
+    let call_id = call_ids[0];
+    let call = ast.get_node(call_id).unwrap();
+
+    assert_eq!(call.start_byte(), 0);
+    assert_eq!(call.end_byte(), 9);
+}
+
+/// Nested nodes constructed by a rule derive their location from their own
+/// children rather than inheriting the range of the rule's matched root.
+#[test]
+fn test_nested_synthetic_node_uses_child_location() {
+    let rule: Rule = rule!(
+        (call
+            method: (identifier) @name
+            receiver: (identifier) @recv
+        )
+        =>
+        (call
+            method: {name}
+            receiver: {recv}
+            arguments: (argument_list argument: {recv})
+        )
+    );
+
+    let ast = run_and_ast("foo.bar()", vec![rule]);
+    let call = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "call")
+        .expect("call exists");
+    assert_eq!(call.byte_range(), 0..9);
+
+    let arguments = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "argument_list")
+        .expect("argument list exists");
+    assert_eq!(arguments.byte_range(), 0..3);
+}
+
+/// A nested node with no explicit range or located children gets an empty
+/// location at the start of the rule's matched node.
+#[test]
+fn test_source_less_nested_node_uses_empty_match_start() {
+    let rule: Rule = rule!(
+        (call
+            method: (identifier) @name
+            receiver: (identifier) @recv
+        )
+        =>
+        (call
+            method: {name}
+            receiver: {recv}
+            arguments: (argument_list)
+        )
+    );
+
+    let ast = run_and_ast("foo.bar()", vec![rule]);
+    let arguments = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "argument_list")
+        .expect("argument list exists");
+    let range = arguments.source_range().unwrap();
+    assert_eq!(range.start_byte..range.end_byte, 0..0);
+}
+
+/// An explicit empty range at byte zero is a real location, not the sentinel
+/// for an absent location, and therefore contributes to parent ranges.
+#[test]
+fn test_empty_range_at_file_start_contributes_to_parent() {
+    use std::collections::BTreeMap;
+
+    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let schema =
+        yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
+    let mut ast = OutputAst::with_schema(schema);
+    let empty = Range {
+        start_byte: 0,
+        end_byte: 0,
+        start_point: Point::new(0, 0),
+        end_point: Point::new(0, 0),
+    };
+    let child =
+        ast.create_named_token_with_range("identifier", "synthetic".to_owned(), Some(empty));
+    let fields = BTreeMap::from([(ast.field_id_for_name("method").unwrap(), vec![child])]);
+    let parent = ast.create_node_with_range(
+        ast.id_for_node_kind("call").unwrap(),
+        NodeContent::DynamicString(String::new()),
+        fields,
+        true,
+        None,
+    );
+
+    assert_eq!(ast.get_node(parent).unwrap().source_range(), Some(empty));
+}
+
+/// A rule that only unwraps and returns a translated capture must not widen
+/// that capture to the wrapper's source range.
+#[test]
+fn test_returned_capture_keeps_its_location() {
+    let rule: Rule = rule!(
+        (call method: (identifier) @name)
+        =>
+        identifier { name }
+    );
+
+    let ast = run_and_ast("foo.bar()", vec![rule]);
+    let identifier = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "identifier")
+        .expect("identifier exists");
+    assert_eq!(identifier.byte_range(), 4..7);
+}
+
+#[test]
+fn test_location_field_overrides_derived_location() {
+    let rule: Rule = rule!(
+        (assignment
+            left: (identifier) @left
+            right: (integer) @right)
+        =>
+        (call
+            method: {left}
+            location: {right})
+    );
+
+    let ast = run_and_ast("x = 1", vec![rule]);
+    let call = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "call")
+        .expect("call exists");
+
+    assert_eq!(call.byte_range(), 4..5);
+}
+
+#[test]
+fn test_location_none_makes_result_root_locationless() {
+    let rule: Rule = rule!(
+        (call method: (identifier) @method)
+        =>
+        (call method: {method} location: none)
+    );
+
+    let ast = run_and_ast("foo.bar()", vec![rule]);
+    let call = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "call")
+        .expect("call exists");
+    assert_eq!(call.source_range(), None);
+}
+
+/// A nested `location: none` node stays locationless and does not widen its
+/// parent's derived range with an empty range at the match start.
+#[test]
+fn test_location_none_nested_node_does_not_widen_parent() {
+    let rule: Rule = rule!(
+        (call method: (identifier) @method)
+        =>
+        (call
+            method: (identifier "outer")
+            receiver: (call
+                method: {method}
+                arguments: (argument_list location: none)))
+    );
+
+    let ast = run_and_ast("foo.bar()", vec![rule]);
+    let nodes: Vec<_> = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .collect();
+    let arguments = nodes
+        .iter()
+        .find(|node| node.kind_name() == "argument_list")
+        .expect("argument list exists");
+    assert_eq!(arguments.source_range(), None);
+
+    let mut call_ranges: Vec<_> = nodes
+        .iter()
+        .filter(|node| node.kind_name() == "call")
+        .map(|node| node.byte_range())
+        .collect();
+    call_ranges.sort_by_key(|range| (range.start, range.end));
+    // Without `location: none`, the inner call would be widened to 0..7.
+    assert_eq!(call_ranges, [0..9, 4..7]);
+}
+
+#[test]
+fn test_multiple_location_fields_combine_iterable_locations() {
+    let rule: Rule = rule!(
+        (assignment
+            left: (identifier) @left
+            right: (integer) @right)
+        =>
+        (call
+            method: {left}
+            arguments: (argument_list
+                location: {[left]}
+                location: {[right, left]}))
+    );
+
+    let ast = run_and_ast("x = 1", vec![rule]);
+    let arguments = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "argument_list")
+        .expect("argument list exists");
+
+    assert_eq!(arguments.byte_range(), 0..5);
+}
+
+#[test]
+fn test_location_and_named_fields_are_evaluated_left_to_right() {
+    let rule: Rule = rule!(
+        (assignment
+            left: (identifier) @left
+            right: (integer) @right)
+        =>
+        call {
+            let mut order = Vec::new();
+            let call = tree!((call
+                location: {order.push("first location"); left}
+                method: {order.push("method"); left}
+                location: {order.push("second location"); right}
+                arguments: {order.push("arguments"); right}));
+            assert_eq!(
+                order,
+                ["first location", "method", "second location", "arguments"]
+            );
+            call
+        }
+    );
+
+    run_and_ast("x = 1", vec![rule]);
+}
+
+#[test]
+fn test_location_field_is_available_on_literal_nodes() {
+    let rule: Rule = rule!(
+        (assignment
+            left: (identifier) @left
+            right: (integer) @right)
+        =>
+        (identifier "synthetic" location: {right})
+    );
+
+    let ast = run_and_ast("x = 1", vec![rule]);
+    let identifier = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "identifier")
+        .expect("identifier exists");
+
+    assert_eq!(identifier.byte_range(), 4..5);
+}
+
+#[test]
+fn test_ignored_location_field_is_excluded_from_rule_result_location() {
+    let rule: Rule = rule!(
+        (assignment
+            left: (identifier) @left)
+        =>
+        (call method: {left})
+    );
+
+    let language: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let config = DesugaringConfig::new()
+        .with_ignored_location_fields(["right"])
+        .add_phase("test", with_passthrough_rules(vec![rule]))
+        .with_output_node_types_yaml(OUTPUT_SCHEMA_YAML);
+    let runner: Runner = Runner::from_config(language, &config).unwrap();
+    let ast = runner.run("x = 1").unwrap();
+    let call = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "call")
+        .expect("call exists");
+    assert_eq!(call.byte_range(), 0..4);
+}
+
+/// Nodes allocated by an explicit recursive translation belong to that nested
+/// rule invocation, even when the outer rule returns one directly.
+#[test]
+fn test_explicit_recursive_translation_keeps_nested_rule_location() {
+    let program: Rule = rule!(
+        (program (_)* @stmts)
+        =>
+        (program stmt: {stmts})
+    );
+    let unwrap: Rule = rule!(
+        (call method: (identifier) @@name)
+        =>
+        identifier {
+            ctx.translate(name)?
+                .into_iter()
+                .next()
+                .ok_or("identifier translation produced no result")?
+        }
+    );
+    let translate_identifier: Rule = rule!((identifier) @@identifier => (identifier #{identifier}));
+
+    let lang: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
+    let schema =
+        yeast::node_types_yaml::schema_from_yaml_with_language(OUTPUT_SCHEMA_YAML, &lang).unwrap();
+    let phases = vec![Phase::new(
+        "translate",
+        vec![program, unwrap, translate_identifier],
+    )];
+    let runner: Runner = Runner::with_schema(lang, &schema, &phases);
+    let ast = runner.run("foo.bar()").unwrap();
+    let identifier = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "identifier")
+        .expect("identifier exists");
+    assert_eq!(identifier.byte_range(), 4..7);
+}
+
+/// A `location` field assigns the captured node's range only to its node.
+#[test]
+fn test_location_field_assigns_capture_range_to_node_only() {
+    let rule: Rule = rule!(
+        (call
+            method: (identifier) @name
+            receiver: (identifier) @recv
+        ) @@source
+        =>
+        call {
+            let arguments = tree!((argument_list
+                argument: (integer "0")
+                location: {source}));
+            tree!((call method: {name} receiver: {recv} arguments: {arguments}))
+        }
+    );
+
+    let ast = run_and_ast("foo.bar()", vec![rule]);
+    let arguments = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "argument_list")
+        .expect("argument list exists");
+    assert_eq!(arguments.byte_range(), 0..9);
+
+    let integer = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "integer")
+        .expect("integer exists");
+    assert_eq!(integer.byte_range(), 0..0);
+}
+
+/// Multiple `location` fields assign their union only to their node.
+#[test]
+fn test_multiple_location_fields_assign_union_to_node_only() {
+    let rule: Rule = rule!(
+        (call
+            method: (identifier) @name
+            receiver: (identifier) @recv
+        )
+        =>
+        call {
+            let arguments = tree!((argument_list
+                argument: (integer "0")
+                location: {recv}
+                location: {name}));
+            tree!((call method: {name} receiver: {recv} arguments: {arguments}))
+        }
+    );
+
+    let ast = run_and_ast("foo.bar()", vec![rule]);
+    let arguments = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "argument_list")
+        .expect("argument list exists");
+    assert_eq!(arguments.byte_range(), 0..7);
+
+    let integer = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| ast.get_node(id))
+        .find(|node| node.kind_name() == "integer")
+        .expect("integer exists");
+    assert_eq!(integer.byte_range(), 0..0);
+}
+
+/// Explicit ranges on multiple results must not be widened to the range of the
+/// input node matched by the rule.
+#[test]
+fn test_explicitly_located_multiple_results_keep_their_ranges() {
+    let rule: Rule = rule!(
+        (assignment
+            left: (identifier) @@left
+            right: (integer) @@right)
+        =>
+        identifier* {
+            let left_text = ctx.source_text(left);
+            let right_text = ctx.source_text(right);
+            let left_range = ctx.source_range(left);
+            let right_range = ctx.source_range(right);
+            vec![
+                ctx.literal_with_source_range("identifier", &left_text, left_range),
+                ctx.literal_with_source_range("identifier", &right_text, right_range),
+            ]
+        }
+    );
+
+    let ast = run_and_ast("x = 1", vec![rule]);
+    let mut ranges: Vec<_> = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| {
+            let node = ast.get_node(id)?;
+            (node.kind_name() == "identifier").then(|| (ast.source_text(id), node.byte_range()))
+        })
+        .collect();
+    ranges.sort_by_key(|(_, range)| range.start);
+
+    assert_eq!(
+        ranges,
+        vec![("x".to_string(), 0..1), ("1".to_string(), 4..5)]
+    );
+}
+
+/// A range-backed node already carries an exact parsed range and must not be
+/// finalized as a synthetic result.
+#[test]
+fn test_range_backed_result_keeps_its_range() {
+    use std::collections::BTreeMap;
+
+    let rule: Rule = rule!(
+        (assignment left: (identifier) @@left)
+        =>
+        identifier {
+            let range = ctx.source_range(left).unwrap();
+            let kind = ctx.output.id_for_node_kind("identifier").unwrap();
+            ctx.create_node_with_range(
+                kind,
+                NodeContent::Range(range),
+                BTreeMap::new(),
+                true,
+                None,
+            )
+        }
+    );
+
+    let ast = run_and_ast("x = 1", vec![rule]);
+    let identifiers: Vec<_> = ast
+        .reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| {
+            let node = ast.get_node(id)?;
+            (node.kind_name() == "identifier").then(|| (ast.source_text(id), node.byte_range()))
+        })
+        .collect();
+
+    assert_eq!(identifiers, vec![("x".to_string(), 0..1)]);
+}
+
 // ---- `rules!` macro tests (compile-time type-checking) ----
 
 /// `rules!` should accept well-typed rules using the bare-rule-body
@@ -1522,29 +2349,27 @@ fn test_rules_macro_accepts_bare_rule_body() {
     );
 }
 
-/// The bare-rule-body shorthand `=> output_kind` should also be accepted.
 #[test]
-fn test_rules_macro_accepts_bare_shorthand_form() {
+fn test_rules_macro_accepts_bare_guarded_rule() {
     let rules: Vec<Rule> = yeast::rules! {
         input: "tests/input-types.yml",
         output: "tests/node-types.yml",
         [
-            (assignment
-                left: (_) @method
-                right: (_) @receiver
-            )
-            => call,
+            (integer) @@raw
+            where ast.source_text(raw) == "1"
+            =>
+            (identifier "guarded"),
+
+            (integer) => (identifier "fallback"),
         ]
     };
 
-    let dump = run_and_dump("x = 1", rules);
+    let dump = run_and_dump("1", rules);
     assert_dump_eq(
         &dump,
         r#"
         program
-          call
-            method: identifier "x"
-            receiver: integer "1"
+          identifier "guarded"
     "#,
     );
 }
@@ -1613,11 +2438,11 @@ fn test_rules_macro_mixes_bare_and_explicit_forms() {
 // interface for Rust-bodied rules: the schema-vocabulary annotation
 // declares the rule's output kind for static analysis. Today's codegen
 // does NOT yet consume the annotation (it just adapts the returned
-// value to `Vec<Id>` via `IntoFieldIds`); these tests only exercise
+// value to `Vec<OutputId>` via `IntoFieldIds`); these tests only exercise
 // the parser + the runtime-equivalence property.
 
 /// Annotation form with `*` (repeated): the rule body returns a
-/// `Vec<Id>` and the annotation says the outputs are `assignment`s.
+/// `Vec<OutputId>` and the annotation says the outputs are `assignment`s.
 #[test]
 fn test_rule_annotation_repeated() {
     // Behaviourally equivalent to a two-node splice template.
@@ -1648,17 +2473,17 @@ fn test_rule_annotation_repeated() {
 }
 
 /// Annotation form with `?` (optional): the rule body returns
-/// `Option<Id>`. This uses `None` so the rule effectively deletes the
+/// `Option<OutputId>`. This uses `None` so the rule effectively deletes the
 /// node.
 #[test]
 fn test_rule_annotation_optional_none() {
     // Delete every `integer` (returning None yields no output nodes).
     let r: Rule = rule!(
-        (integer) @lit
+        (integer) @@lit
         =>
         integer? {
             let _ = lit;
-            None::<yeast::Id>
+            None::<yeast::OutputId>
         }
     );
     let ast = run_and_ast("42", vec![r]);
@@ -1670,7 +2495,7 @@ fn test_rule_annotation_optional_none() {
     }
 }
 
-/// Annotation form (single): the rule body returns a bare `Id`.
+/// Annotation form (single): the rule body returns a bare `OutputId`.
 #[test]
 fn test_rule_annotation_single() {
     // Identity on assignment nodes, expressed with the annotation form.
@@ -1692,27 +2517,3 @@ fn test_rule_annotation_single() {
     }
     assert!(has_assignment, "expected an assignment node");
 }
-
-/// The shorthand `=> kind` form (no body, no annotation) must still be
-/// distinguished from the annotation form and continue to work.
-#[test]
-fn test_shorthand_still_works_alongside_annotation_syntax() {
-    let r: Rule = rule!(
-        (assignment left: (_) @method right: (_) @receiver)
-        =>
-        call
-    );
-    let ast = run_and_ast("x = 1", vec![r]);
-    let mut has_call = false;
-    for id in ast.reachable_node_ids() {
-        if let Some(n) = ast.get_node(id) {
-            if n.kind_name() == "call" {
-                has_call = true;
-            }
-        }
-    }
-    assert!(
-        has_call,
-        "shorthand form should still produce a `call` node"
-    );
-}
diff --git a/swift/extractor/infra/SwiftBodyEmissionStrategy.h b/swift/extractor/infra/SwiftBodyEmissionStrategy.h
index b97600cc63c8..52c8efcf0d19 100644
--- a/swift/extractor/infra/SwiftBodyEmissionStrategy.h
+++ b/swift/extractor/infra/SwiftBodyEmissionStrategy.h
@@ -13,9 +13,11 @@ class SwiftBodyEmissionStrategy {
       : currentModule(currentModule),
         currentPrimarySourceFile(currentPrimarySourceFile),
         currentLazyDeclaration(currentLazyDeclaration) {
-    llvm::SmallVector<swift::Decl*> decls;
-    currentModule.getTopLevelDecls(decls);
-    currentTopLevelDecls.insert(decls.begin(), decls.end());
+    if (!currentLazyDeclaration) {
+      llvm::SmallVector<swift::Decl*> decls;
+      currentModule.getTopLevelDecls(decls);
+      currentTopLevelDecls.insert(decls.begin(), decls.end());
+    }
   }
 
   bool shouldEmitDeclBody(const swift::Decl& decl);
diff --git a/swift/extractor/infra/SwiftLocationExtractor.h b/swift/extractor/infra/SwiftLocationExtractor.h
index 3a96cdcf6195..3f0e51773a7d 100644
--- a/swift/extractor/infra/SwiftLocationExtractor.h
+++ b/swift/extractor/infra/SwiftLocationExtractor.h
@@ -30,10 +30,11 @@ template <typename T>
 concept HasLAndRParenLoc = requires(T e) {
   e.getLParenLoc();
   e.getRParenLoc();
-} && !(HasSourceRange<T>)&&!(HasStartAndEndLoc<T>);
+} && !(HasSourceRange<T>) && !(HasStartAndEndLoc<T>);
 
 template <typename T>
-concept HasOneLoc = requires(T e) { e.getLoc(); } && !(HasSourceRange<T>)&&(!HasStartAndEndLoc<T>);
+concept HasOneLoc =
+    requires(T e) { e.getLoc(); } && !(HasSourceRange<T>) && (!HasStartAndEndLoc<T>);
 
 template <typename T>
 concept HasOneLocField = requires(T e) { e.Loc; };
diff --git a/swift/extractor/infra/file/TargetFile.cpp b/swift/extractor/infra/file/TargetFile.cpp
index 4ce4c8ae23be..84e6d44ec376 100644
--- a/swift/extractor/infra/file/TargetFile.cpp
+++ b/swift/extractor/infra/file/TargetFile.cpp
@@ -50,9 +50,10 @@ bool TargetFile::init() {
     checkOutput("open");
     return true;
   }
-  CODEQL_ASSERT(errno == EEXIST, "Unable to open {} for writing ({})", targetPath,
+  CODEQL_EXPECT(errno == EEXIST, "Unable to open {} for writing ({})", targetPath,
                 currentErrorCode());
-  // else the file already exists and we just lost the race
+  // else the file already exists and we just lost the race, or some error occurred
+  // and the file could not be created
   return false;
 }
 
diff --git a/swift/ql/integration-tests/posix/frontend-invocations/test.py b/swift/ql/integration-tests/posix/frontend-invocations/test.py
index 8378fc8846a9..1ec0ed83eb87 100644
--- a/swift/ql/integration-tests/posix/frontend-invocations/test.py
+++ b/swift/ql/integration-tests/posix/frontend-invocations/test.py
@@ -13,7 +13,7 @@ def test(codeql, swift, expected_files):
             with open(f, "rb") as module:
                 print(f.name, sha256(module.read()).hexdigest(), file=expected)
 
-    with open("hashes.actual", "w") as actual:
+    with expected_files.add("hashes.actual") as actual:
         hashes = [
             (s.name, s.resolve().name)
             for s in Path("test-db/working/swift-extraction-artifacts/store").iterdir()
@@ -21,4 +21,3 @@ def test(codeql, swift, expected_files):
         hashes.sort()
         for module, hash in hashes:
             print(module, hash, file=actual)
-    expected_files.add("hashes.expected")
diff --git a/swift/ql/lib/CHANGELOG.md b/swift/ql/lib/CHANGELOG.md
index 168e31e76c18..c62f5da194bc 100644
--- a/swift/ql/lib/CHANGELOG.md
+++ b/swift/ql/lib/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 6.8.7
+
+No user-facing changes.
+
+## 6.8.6
+
+No user-facing changes.
+
+## 6.8.5
+
+No user-facing changes.
+
+## 6.8.4
+
+No user-facing changes.
+
+## 6.8.3
+
+No user-facing changes.
+
+## 6.8.2
+
+No user-facing changes.
+
+## 6.8.1
+
+No user-facing changes.
+
 ## 6.8.0
 
 ### Major Analysis Improvements
diff --git a/swift/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md b/swift/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md
new file mode 100644
index 000000000000..a4e60caa837d
--- /dev/null
+++ b/swift/ql/lib/change-notes/2026-10-30-trusted-schema-not-sensitive.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The sensitive data heuristics treat names built on `trusted_schema`, such as SQLite's `set_trusted_schema` setting, as non-sensitive. This removes false positive results from queries that use the sensitive data library (for example `swift/cleartext-logging`).
diff --git a/swift/ql/lib/change-notes/released/6.8.1.md b/swift/ql/lib/change-notes/released/6.8.1.md
new file mode 100644
index 000000000000..eb2ce653fc0f
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/6.8.1.md
@@ -0,0 +1,3 @@
+## 6.8.1
+
+No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/6.8.2.md b/swift/ql/lib/change-notes/released/6.8.2.md
new file mode 100644
index 000000000000..89c48d9b6048
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/6.8.2.md
@@ -0,0 +1,3 @@
+## 6.8.2
+
+No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/6.8.3.md b/swift/ql/lib/change-notes/released/6.8.3.md
new file mode 100644
index 000000000000..d35c1fbb4ff4
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/6.8.3.md
@@ -0,0 +1,3 @@
+## 6.8.3
+
+No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/6.8.4.md b/swift/ql/lib/change-notes/released/6.8.4.md
new file mode 100644
index 000000000000..be181c65d52d
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/6.8.4.md
@@ -0,0 +1,3 @@
+## 6.8.4
+
+No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/6.8.5.md b/swift/ql/lib/change-notes/released/6.8.5.md
new file mode 100644
index 000000000000..909623a54ec4
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/6.8.5.md
@@ -0,0 +1,3 @@
+## 6.8.5
+
+No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/6.8.6.md b/swift/ql/lib/change-notes/released/6.8.6.md
new file mode 100644
index 000000000000..c7c378416ac4
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/6.8.6.md
@@ -0,0 +1,3 @@
+## 6.8.6
+
+No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/6.8.7.md b/swift/ql/lib/change-notes/released/6.8.7.md
new file mode 100644
index 000000000000..854acbf27edc
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/6.8.7.md
@@ -0,0 +1,3 @@
+## 6.8.7
+
+No user-facing changes.
diff --git a/swift/ql/lib/codeql-pack.release.yml b/swift/ql/lib/codeql-pack.release.yml
index 78131e1dceb7..dbafe5e5cf77 100644
--- a/swift/ql/lib/codeql-pack.release.yml
+++ b/swift/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 6.8.0
+lastReleaseVersion: 6.8.7
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
index 135924c0eb72..715743b5fe93 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
@@ -305,8 +305,7 @@ private module Cached {
     model = ""
     or
     // flow through a flow summary (extension of `SummaryModelCsv`)
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-      nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, true, model)
   }
 
   /**
@@ -497,10 +496,10 @@ class FlowSummaryNode extends NodeImpl, TFlowSummaryNode {
   }
 
   override DataFlowCallable getEnclosingCallable() {
-    result.asSummarizedCallable() = this.getSummarizedCallable()
+    result = this.getSummaryNode().getEnclosingCallable()
   }
 
-  override Location getLocationImpl() { result = this.getSummarizedCallable().getLocation() }
+  override Location getLocationImpl() { result = this.getSummaryNode().getLocation() }
 
   override string toStringImpl() { result = this.getSummaryNode().toString() }
 }
@@ -1014,8 +1013,7 @@ predicate captureValueStep(Node node1, Node node2) {
 
 predicate jumpStep(Node pred, Node succ) {
   // models-as-data summarized flow
-  FlowSummaryImpl::Private::Steps::summaryJumpStep(pred.(FlowSummaryNode).getSummaryNode(),
-    succ.(FlowSummaryNode).getSummaryNode())
+  FlowSummaryImpl::Private::Steps::summaryJumpStep(pred, succ)
 }
 
 predicate storeStep(Node node1, ContentSet c, Node node2) {
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll
index 6ca8e12ef6b6..ed7fc8d41f2c 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll
@@ -16,14 +16,16 @@ module Input implements InputSig<Location, DataFlowImplSpecific::SwiftDataFlow>
 
   class SummarizedCallableBase = Function;
 
-  class SourceBase = Void;
-
-  class SinkBase = Void;
-
-  class FlowSummaryCallBase = Void;
+  class FlowSummaryCallBase extends Void {
+    Location getLocation() { none() }
+  }
 
   predicate callableFromSource(SummarizedCallableBase c) { c.hasBody() }
 
+  DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
+    result.asSummarizedCallable() = c
+  }
+
   ArgumentPosition callbackSelfParameterPosition() { result instanceof ThisArgumentPosition }
 
   ReturnKind getStandardReturnValueKind() { result instanceof NormalReturnKind }
@@ -114,18 +116,24 @@ module Input implements InputSig<Location, DataFlowImplSpecific::SwiftDataFlow>
 
 private import Make<Location, DataFlowImplSpecific::SwiftDataFlow, Input> as Impl
 
-private module StepsInput implements Impl::Private::StepsInputSig {
-  Impl::Private::SummaryNode getSummaryNode(Node n) {
-    result = n.(FlowSummaryNode).getSummaryNode()
-  }
+private module Input2 implements Impl::Private::InputSig2 {
+  private import codeql.util.Void
 
-  DataFlowCall getACall(Public::SummarizedCallable sc) { result.asCall().getStaticTarget() = sc }
+  class SourceSinkReportingElement extends Void {
+    Location getLocation() { none() }
+
+    DataFlowCallable getEnclosingCallable() { none() }
+
+    SourceSinkReportingElement getASuccessor(Impl::Private::SummaryComponent sc) { none() }
+  }
+}
 
-  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
+private import Impl::Private::Make2<Input2> as Impl2
 
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
+private module StepsInput implements Impl2::StepsInputSig {
+  Impl2::SummaryNode getSummaryNode(Node n) { result = n.(FlowSummaryNode).getSummaryNode() }
 
-  Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
+  DataFlowCall getACall(Public::SummarizedCallable sc) { result.asCall().getStaticTarget() = sc }
 }
 
 module SourceSinkInterpretationInput implements
@@ -252,8 +260,9 @@ module SourceSinkInterpretationInput implements
 
 module Private {
   import Impl::Private
+  import Impl2
 
-  module Steps = Impl::Private::Steps<StepsInput>;
+  module Steps = Impl2::Steps<StepsInput>;
 
   module External {
     import Impl::Private::External
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPrivate.qll b/swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPrivate.qll
index 6960dcf6177f..ace77e4584b5 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPrivate.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPrivate.qll
@@ -76,8 +76,7 @@ private module Cached {
     model = ""
     or
     // flow through a flow summary (extension of `SummaryModelCsv`)
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-      nodeTo.(FlowSummaryNode).getSummaryNode(), false, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, false, model)
     or
     any(AdditionalTaintStep a).step(nodeFrom, nodeTo) and model = "AdditionalTaintStep"
   }
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index 46bbe03047d3..963bd014be13 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 6.8.1-dev
+version: 6.8.8-dev
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/lib/utils/test/InlineExpectationsTestQuery.ql b/swift/ql/lib/utils/test/InlineExpectationsTestQuery.ql
index a7c112bc00e0..e41d9310e0bf 100644
--- a/swift/ql/lib/utils/test/InlineExpectationsTestQuery.ql
+++ b/swift/ql/lib/utils/test/InlineExpectationsTestQuery.ql
@@ -6,16 +6,4 @@ private import swift
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>
diff --git a/swift/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll b/swift/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
index b96f27c42ac2..718c118ef907 100644
--- a/swift/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/swift/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
@@ -25,4 +25,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = S::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(S::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }
diff --git a/swift/ql/src/CHANGELOG.md b/swift/ql/src/CHANGELOG.md
index 0063b69f12b3..ca902a296a23 100644
--- a/swift/ql/src/CHANGELOG.md
+++ b/swift/ql/src/CHANGELOG.md
@@ -1,3 +1,33 @@
+## 1.4.0
+
+### Query Metadata Changes
+
+* The `external/cwe/cwe-730` tag has been removed from `swift/redos` and `swift/regex-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
+
+## 1.3.13
+
+No user-facing changes.
+
+## 1.3.12
+
+No user-facing changes.
+
+## 1.3.11
+
+No user-facing changes.
+
+## 1.3.10
+
+No user-facing changes.
+
+## 1.3.9
+
+No user-facing changes.
+
+## 1.3.8
+
+No user-facing changes.
+
 ## 1.3.7
 
 No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.3.10.md b/swift/ql/src/change-notes/released/1.3.10.md
new file mode 100644
index 000000000000..182c8ffe713a
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.3.10.md
@@ -0,0 +1,3 @@
+## 1.3.10
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.3.11.md b/swift/ql/src/change-notes/released/1.3.11.md
new file mode 100644
index 000000000000..975cfda3553c
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.3.11.md
@@ -0,0 +1,3 @@
+## 1.3.11
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.3.12.md b/swift/ql/src/change-notes/released/1.3.12.md
new file mode 100644
index 000000000000..02f63bc590a3
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.3.12.md
@@ -0,0 +1,3 @@
+## 1.3.12
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.3.13.md b/swift/ql/src/change-notes/released/1.3.13.md
new file mode 100644
index 000000000000..484039d3b4f1
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.3.13.md
@@ -0,0 +1,3 @@
+## 1.3.13
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.3.8.md b/swift/ql/src/change-notes/released/1.3.8.md
new file mode 100644
index 000000000000..c7f5b27e47ec
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.3.8.md
@@ -0,0 +1,3 @@
+## 1.3.8
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.3.9.md b/swift/ql/src/change-notes/released/1.3.9.md
new file mode 100644
index 000000000000..7c49d60db954
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.3.9.md
@@ -0,0 +1,3 @@
+## 1.3.9
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.4.0.md b/swift/ql/src/change-notes/released/1.4.0.md
new file mode 100644
index 000000000000..7cb90fb56e6c
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.4.0.md
@@ -0,0 +1,5 @@
+## 1.4.0
+
+### Query Metadata Changes
+
+* The `external/cwe/cwe-730` tag has been removed from `swift/redos` and `swift/regex-injection`, because MITRE has marked CWE-730 as prohibited for vulnerability mapping. The queries retain their other CWE tags.
diff --git a/swift/ql/src/codeql-pack.release.yml b/swift/ql/src/codeql-pack.release.yml
index 2f4b67be43f7..b8b2e97d5086 100644
--- a/swift/ql/src/codeql-pack.release.yml
+++ b/swift/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.3.7
+lastReleaseVersion: 1.4.0
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index a738635a8d07..a91973bbeaf1 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.3.8-dev
+version: 1.4.1-dev
 groups:
   - swift
   - queries
diff --git a/swift/ql/src/queries/Security/CWE-078/CommandInjection.qhelp b/swift/ql/src/queries/Security/CWE-078/CommandInjection.qhelp
index ed6a27a4222b..9fb39fd64a32 100644
--- a/swift/ql/src/queries/Security/CWE-078/CommandInjection.qhelp
+++ b/swift/ql/src/queries/Security/CWE-078/CommandInjection.qhelp
@@ -39,7 +39,7 @@ meanings:
 <references>
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Command_Injection">Command Injection</a>.
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
 </li>
 </references>
 </qhelp>
diff --git a/swift/ql/src/queries/Security/CWE-1333/ReDoS.ql b/swift/ql/src/queries/Security/CWE-1333/ReDoS.ql
index beaee2089153..06ac9c59baff 100644
--- a/swift/ql/src/queries/Security/CWE-1333/ReDoS.ql
+++ b/swift/ql/src/queries/Security/CWE-1333/ReDoS.ql
@@ -10,7 +10,6 @@
  * @id swift/redos
  * @tags security
  *       external/cwe/cwe-1333
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/swift/ql/src/queries/Security/CWE-312/CleartextLogging.qhelp b/swift/ql/src/queries/Security/CWE-312/CleartextLogging.qhelp
index 5959fe5ef8df..8de3f21878f0 100644
--- a/swift/ql/src/queries/Security/CWE-312/CleartextLogging.qhelp
+++ b/swift/ql/src/queries/Security/CWE-312/CleartextLogging.qhelp
@@ -40,7 +40,7 @@ Instead, you should encrypt or obfuscate the credentials, or omit them entirely:
 
 <li>M. Dowd, J. McDonald and J. Schuhm, <i>The Art of Software Security Assessment</i>, 1st Edition, Chapter 2 - 'Common Vulnerabilities of Encryption', p. 43. Addison Wesley, 2006.</li>
 <li>M. Howard and D. LeBlanc, <i>Writing Secure Code</i>, 2nd Edition, Chapter 9 - 'Protecting Secret Data', p. 299. Microsoft, 2002.</li>
-<li>OWASP: <a href="https://www.owasp.org/index.php/Password_Plaintext_Storage">Password Plaintext Storage</a>.</li>
+<li>OWASP: <a href="https://cheatsheetseries.owasp.org/cheatsheets/Logging_Cheat_Sheet.html">Logging Cheat Sheet</a>.</li>
 
 </references>
 </qhelp>
diff --git a/swift/ql/src/queries/Security/CWE-730/RegexInjection.ql b/swift/ql/src/queries/Security/CWE-730/RegexInjection.ql
index 98422c0b79d5..07a0703de838 100644
--- a/swift/ql/src/queries/Security/CWE-730/RegexInjection.ql
+++ b/swift/ql/src/queries/Security/CWE-730/RegexInjection.ql
@@ -9,7 +9,6 @@
  * @precision high
  * @id swift/regex-injection
  * @tags security
- *       external/cwe/cwe-730
  *       external/cwe/cwe-400
  */
 
diff --git a/swift/third_party/resources/resource-dir-macos.zip b/swift/third_party/resources/resource-dir-macos.zip
index 2a606b4771fe..cc53d2e44a66 100644
--- a/swift/third_party/resources/resource-dir-macos.zip
+++ b/swift/third_party/resources/resource-dir-macos.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da5cbdd44ee4728606f2dc0dd0718e3c7c8748ae1ec8d6261365282d54ba8db9
-size 548170081
+oid sha256:0589f8b61a87447d03b4b81b915f6b341ff8bcb123effda586cba46cc9487bd6
+size 433044499
diff --git a/unified/.gitignore b/unified/.gitignore
index 5878737805f2..0c99561f41e0 100644
--- a/unified/.gitignore
+++ b/unified/.gitignore
@@ -1,4 +1,5 @@
 target
+/.build
 .vscode/launch.json
 .cache
 ql/test/**/*.testproj
diff --git a/unified/.vscode/extensions.json b/unified/.vscode/extensions.json
new file mode 100644
index 000000000000..c1d687c7ab06
--- /dev/null
+++ b/unified/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "swiftlang.swift-vscode"
+  ]
+}
diff --git a/unified/.vscode/settings.json b/unified/.vscode/settings.json
new file mode 100644
index 000000000000..f19460b60d37
--- /dev/null
+++ b/unified/.vscode/settings.json
@@ -0,0 +1,9 @@
+{
+  "swift.autoGenerateLaunchConfigurations": false,
+  "swift.disableAutoResolve": true,
+  "swift.disableSwiftPackageManagerIntegration": false,
+  "[swift]": {
+    "editor.defaultFormatter": "swiftlang.swift-vscode",
+    "editor.formatOnSave": true
+  }
+}
diff --git a/unified/AGENTS.md b/unified/AGENTS.md
index 9c9bbbb534cb..72de05d120be 100644
--- a/unified/AGENTS.md
+++ b/unified/AGENTS.md
@@ -8,14 +8,18 @@ by Apple's swift-syntax rather than by tree-sitter.
 - To build the extractor, run `scripts/create-extractor-pack.sh`
 
 ## Swift Parser
-- Swift source is parsed by `swift-syntax-parse`, a small Swift/Rust binary in
-  `swift-syntax-rs` that wraps Apple's swift-syntax and emits the parse tree as
-  JSON. There is no grammar in this repository to edit.
+- Swift source is parsed by the `swift-syntax-rs` crate, which wraps Apple's
+  swift-syntax. The extractor calls `swift_syntax_rs::parse_to_json` in-process
+  to obtain the parse tree as JSON; the extractor does not invoke a separate
+  parser binary, and there is no grammar in this repository to edit.
 
 - `extractor/src/languages/swift/adapter.rs` converts that JSON into a yeast AST.
 
 - The raw parse tree's shape is described by `extractor/swift_node_types.yml`,
-  which is maintained by hand.
+  which is generated from swift-syntax by `swift-syntax-rs/schemagen`. Do not
+  edit it by hand; regenerate it with `scripts/regenerate-node-types.sh` after
+  changing the pinned swift-syntax version, then review the diff alongside the
+  mapping in `extractor/src/languages/swift/swift.rs`.
 
 ## AST Mapping
 - The target AST shape is described by `extractor/ast_types.yml`.
@@ -23,10 +27,9 @@ by Apple's swift-syntax rather than by tree-sitter.
 - The mapping from the parse tree to the target AST is found in `extractor/src/languages/swift/swift.rs`
 
 - To run tests for the parser and mapping, run `cargo test` in the `extractor`
-  directory. The tests need the `swift-syntax-parse` binary: point
-  `CODEQL_EXTRACTOR_UNIFIED_SWIFT_SYNTAX_PARSE` at it, or put it on `PATH`.
-  Corpus tests skip themselves when it cannot be found, so check for skips
-  before concluding a change is clean.
+  directory. Since the parser is linked in-process, this needs a working Swift
+  toolchain (so `swift-syntax-rs` can build). The tests can also be run under
+  Bazel via `bazel test //unified/extractor:all_tests`.
 
 - Extractor test cases are located at `extractor/tests/corpus/swift/*/*.swift`.
 
diff --git a/unified/BUILD.bazel b/unified/BUILD.bazel
index 405500d7d407..52f720f4cb12 100644
--- a/unified/BUILD.bazel
+++ b/unified/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup")
+load("//misc/bazel:os.bzl", "codeql_platform_select")
 load("//misc/bazel:pkg.bzl", "codeql_pack", "codeql_pkg_files")
-load("//misc/bazel:utils.bzl", "select_os")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -41,23 +41,21 @@ codeql_pkg_files(
 
 codeql_pkg_files(
     name = "extractor-arch",
-    exes = [
-        "//unified/extractor",
-    ],
-    prefix = "tools/{CODEQL_PLATFORM}",
+    exes = codeql_platform_select(
+        otherwise = ["//unified/extractor"],
+        win64 = ["//unified/extractor-unsupported-os:extractor"],
+    ),
+    prefix = "{CODEQL_PLATFORM}",
 )
 
-# The Swift front-end parser (wrapper + real binary + bundled Swift runtime),
-# shipped next to the extractor. Only on platforms where swift-syntax builds
-# (Linux/macOS); elsewhere the group is empty so the pack still builds (Swift
-# extraction is simply unavailable there).
 pkg_filegroup(
-    name = "swift-syntax-parse-arch",
-    srcs = select_os(
-        otherwise = [],
-        posix = ["//unified/swift-syntax-rs:swift-syntax-parse-pkg"],
-    ),
-    prefix = "tools/{CODEQL_PLATFORM}",
+    name = "tools",
+    srcs = [
+        ":extractor-arch",
+        "//unified/tools",
+        "//unified/tools/builtins",
+    ],
+    prefix = "tools",
 )
 
 codeql_pack(
@@ -65,8 +63,6 @@ codeql_pack(
     srcs = [
         ":codeql-extractor-yml",
         ":dbscheme-group",
-        ":extractor-arch",
-        ":swift-syntax-parse-arch",
-        "//unified/tools",
+        ":tools",
     ],
 )
diff --git a/unified/Package.swift b/unified/Package.swift
new file mode 100644
index 000000000000..970f0761b08a
--- /dev/null
+++ b/unified/Package.swift
@@ -0,0 +1,9 @@
+// swift-tools-version: 6.3
+
+import PackageDescription
+
+// This targetless package lets editor tooling discover the standalone Swift test fixtures.
+let package = Package(
+    name: "CodeQLSwiftFixtures",
+    targets: []
+)
diff --git a/unified/extractor-unsupported-os/BUILD.bazel b/unified/extractor-unsupported-os/BUILD.bazel
new file mode 100644
index 000000000000..63ccae37bf45
--- /dev/null
+++ b/unified/extractor-unsupported-os/BUILD.bazel
@@ -0,0 +1,8 @@
+load("//misc/bazel:rust.bzl", "codeql_rust_binary")
+
+codeql_rust_binary(
+    name = "extractor",
+    srcs = ["src/main.rs"],
+    crate_root = "src/main.rs",
+    visibility = ["//visibility:public"],
+)
diff --git a/unified/extractor-unsupported-os/Cargo.toml b/unified/extractor-unsupported-os/Cargo.toml
new file mode 100644
index 000000000000..da374ad31c6f
--- /dev/null
+++ b/unified/extractor-unsupported-os/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "codeql-extractor-unified-unsupported-os"
+description = "Fallback executable for unsupported CodeQL Unified extractor platforms"
+version = "0.1.0"
+authors = ["GitHub"]
+edition = "2024"
diff --git a/unified/extractor-unsupported-os/src/main.rs b/unified/extractor-unsupported-os/src/main.rs
new file mode 100644
index 000000000000..f8d4da14845e
--- /dev/null
+++ b/unified/extractor-unsupported-os/src/main.rs
@@ -0,0 +1,4 @@
+fn main() {
+    eprintln!("Unsupported OS. Extraction is not currently supported on this platform.");
+    std::process::exit(1);
+}
diff --git a/unified/extractor/BUILD.bazel b/unified/extractor/BUILD.bazel
index 58b32d9fc5c3..26e815d49e8a 100644
--- a/unified/extractor/BUILD.bazel
+++ b/unified/extractor/BUILD.bazel
@@ -1,5 +1,7 @@
+load("@rules_rust//rust:defs.bzl", "rust_test")
 load("//misc/bazel:rust.bzl", "codeql_rust_binary")
 load("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl", "aliases", "all_crate_deps")
+load("//unified:platforms.bzl", "UNIFIED_SUPPORTED_PLATFORMS")
 
 exports_files(["Cargo.toml"])
 
@@ -11,14 +13,70 @@ codeql_rust_binary(
         "ast_types.yml",
         "swift_node_types.yml",
     ],
+    data = ["//unified/swift-syntax-rs:swift_runtime"],
     proc_macro_deps = all_crate_deps(
         proc_macro = True,
     ),
+    target_compatible_with = UNIFIED_SUPPORTED_PLATFORMS,
     visibility = ["//visibility:public"],
     deps = all_crate_deps(
         normal = True,
     ) + [
         "//shared/tree-sitter-extractor",
         "//shared/yeast",
+        "//unified/swift-syntax-rs:swift_syntax_rs",
     ],
 )
+
+_TESTS = {
+    "corpus_tests": {
+        "data": glob(["tests/corpus/**"]),
+        "compile_data": [],
+        "size": "medium",
+    },
+    "location_tests": {
+        "data": [],
+        "compile_data": [],
+        "size": "small",
+    },
+    # `include_str!`s a checked-in `parse_to_json` dump.
+    "swift_syntax_pipeline": {
+        "data": [],
+        "compile_data": glob(["tests/fixtures/**"]),
+        "size": "small",
+    },
+}
+
+[
+    rust_test(
+        name = test_name,
+        size = spec["size"],
+        srcs = ["tests/%s.rs" % test_name] + glob(["src/**/*.rs"]),
+        aliases = aliases(),
+        compile_data = [
+            "ast_types.yml",
+            "swift_node_types.yml",
+        ] + spec["compile_data"],
+        crate_root = "tests/%s.rs" % test_name,
+        data = spec["data"] + ["//unified/swift-syntax-rs:swift_runtime"],
+        edition = "2024",
+        proc_macro_deps = all_crate_deps(
+            proc_macro = True,
+        ),
+        rustc_flags = ["--cfg=bazel"],
+        target_compatible_with = UNIFIED_SUPPORTED_PLATFORMS,
+        deps = all_crate_deps(
+            normal = True,
+        ) + [
+            "//shared/tree-sitter-extractor",
+            "//shared/yeast",
+            "//unified/swift-syntax-rs:swift_syntax_rs",
+        ],
+    )
+    for test_name, spec in _TESTS.items()
+]
+
+test_suite(
+    name = "all_tests",
+    tests = [":%s" % test_name for test_name in _TESTS],
+)
diff --git a/unified/extractor/Cargo.toml b/unified/extractor/Cargo.toml
index be333298f1ad..56b6318b9a6e 100644
--- a/unified/extractor/Cargo.toml
+++ b/unified/extractor/Cargo.toml
@@ -7,14 +7,16 @@ edition = "2024"
 
 # When updating these dependencies, run `misc/bazel/3rdparty/update_cargo_deps.sh`
 [dependencies]
-clap = { version = "4.5", features = ["derive"] }
+clap = { version = "4.6", features = ["derive"] }
 tracing = "0.1"
-tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
-rayon = "1.11.0"
-regex = "1.11.3"
+tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
+rayon = "1.12.0"
+regex = "1.13.1"
 encoding = "0.2"
-lazy_static = "1.5.0"
-serde_json = "1.0.145"
+lazy_static = "1.5.1"
+serde = "1.0.229"
+serde_json = { version = "1.0.154", features = ["unbounded_depth"] }
 
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
 yeast = { path = "../../shared/yeast" }
+swift-syntax-rs = { path = "../swift-syntax-rs" }
diff --git a/unified/extractor/ast_types.yml b/unified/extractor/ast_types.yml
index ca5f6d45edc6..fb9d88333087 100644
--- a/unified/extractor/ast_types.yml
+++ b/unified/extractor/ast_types.yml
@@ -1,15 +1,19 @@
 supertypes:
   expr:
-    - name_expr
+    - identifier
+    - named_pattern
+    - expr_pattern
     - int_literal
     - float_literal
     - boolean_literal
     - string_literal
     - regex_literal
+    - string_interpolation_expr
     - builtin_expr
     - binary_expr
     - unary_expr
     - call_expr
+    - macro_call_expr
     - member_access_expr
     - super_expr
     - function_expr
@@ -20,8 +24,6 @@ supertypes:
     - type_cast_expr
     - type_test_expr
     - if_expr
-    - assign_expr
-    - compound_assign_expr
     - pattern_guard_expr
     - empty_expr
     - block
@@ -33,27 +35,19 @@ supertypes:
     - switch_expr
     - unresolved_operator_sequence
     - unsupported_node
-  expr_or_pattern:
-    - expr
-    - pattern
-  expr_or_type:
-    - expr
-    - type_expr
+    - unhandled_node
+    - or_pattern
+    - conditional_pattern
+    - bulk_importing_pattern
+    - ignore_pattern
+    - generic_type_expr
+    - modified_type_expr
+    - inferred_type_expr
   # An element of an `unresolved_operator_sequence`: either an operand (`expr`)
   # or one of the infix operators separating the operands.
   expr_or_operator:
     - expr
     - infix_operator
-  pattern:
-    - name_pattern
-    - tuple_pattern
-    - constructor_pattern
-    - or_pattern
-    - conditional_pattern
-    - ignore_pattern
-    - expr_equality_pattern
-    - bulk_importing_pattern
-    - unsupported_node
   # A statement is anything that can appear in a block.
   # This type contains all of 'expr' and has partial overlap with 'member'.
   # For example, type_alias_declaration can appear either as a stmt or member.
@@ -72,26 +66,37 @@ supertypes:
     - for_each_stmt
     - while_stmt
     - do_while_stmt
+    - defer_stmt
     - labeled_stmt
+  callable:
+    subtypes:
+      - top_level
+      - function_expr
+      - function_declaration
+      - constructor_declaration
+      - destructor_declaration
+      - accessor_declaration
+      - initializer_declaration
+    fields:
+      parameter*: parameter
+      body?: block
+      return_type?: expr
   # A member is anything that can appear in the body of a class-like declaration
   member:
-    - constructor_declaration
-    - destructor_declaration
-    - function_declaration
-    - variable_declaration
-    - accessor_declaration
-    - initializer_declaration
-    - class_like_declaration
-    - type_alias_declaration
-    - associated_type_declaration
-    - unsupported_node
-  type_expr:
-    - named_type_expr
-    - generic_type_expr
-    - tuple_type_expr
-    - function_type_expr
-    - inferred_type_expr
-    - unsupported_node
+    subtypes:
+      - constructor_declaration
+      - destructor_declaration
+      - function_declaration
+      - variable_declaration
+      - accessor_declaration
+      - initializer_declaration
+      - class_like_declaration
+      - type_alias_declaration
+      - associated_type_declaration
+      - unsupported_node
+      - unhandled_node
+    fields:
+      name_node: identifier
   type_constraint:
     - equality_type_constraint
     - bound_type_constraint
@@ -105,9 +110,16 @@ named:
   top_level:
     body: block
 
-  # An identifier used in the context of an expression
-  name_expr:
-    identifier: identifier
+  # A pattern that binds the incoming value to a name, and then applies it to a sub-pattern.
+  named_pattern:
+    modifier*: modifier
+    name_node: identifier
+    sub_pattern: expr
+
+  # A pattern expression with modifiers, such as `let x` or `var x`.
+  expr_pattern:
+    modifier*: modifier
+    expr: expr
 
   # An integer literal
   int_literal:
@@ -130,6 +142,11 @@ named:
   # A regex literal
   regex_literal:
 
+  # A string interpolation expression. Constant parts are stored as string literals.
+  string_interpolation_expr:
+    modifier*: modifier
+    element*: expr
+
   # Application of a binary operator, such as `a + b`
   binary_expr:
     left: expr
@@ -154,43 +171,34 @@ named:
   unresolved_operator_sequence:
     element*: expr_or_operator
 
-  # Plain assignment
-  assign_expr:
-    target: expr_or_pattern
-    value: expr
-
-  # Compound assignment
-  compound_assign_expr:
-    target: expr
-    operator: infix_operator
-    value: expr
-
   # A function or method call, such as `f(x)` or `obj.m(x)`.
   #
   # Method calls are represented as a call whose `function` is a `member_access_expr`.
   #
-  # Constructor calls are marked by a language-specific modifier, and the target may be
-  # a `type_expr` if the parser can deduce that the target is a type.
+  # Constructor calls are marked by a language-specific modifier.
   call_expr:
     modifier*: modifier
-    callee: expr_or_type
+    callee: expr
+    argument*: argument
+
+  # A macro call expression, such as `#expect(x == y)` in Swift or
+  # `assert!(x == y)` in Rust.
+  macro_call_expr:
+    macro_name_node: identifier
+    type_argument*: expr
     argument*: argument
 
   argument:
     modifier*: modifier
-    name?: identifier
+    name_node?: identifier
     value: expr
 
   # Member access, such as `obj.member`.
   #
-  # The base may be a type expression when it is a static member access like `Array<Int>.method`.
-  # In ambiguous cases where the parser cannot distinguish static and instance member access, the base
-  # will be typically be an expression.
-  #
   # For `super.x` the base will be an instance of `super_expr`.
   member_access_expr:
-    base: expr_or_type
-    member: identifier
+    base: expr
+    member_name_node: identifier
 
   # A type expression that refers to a type inferred from the contextual type.
   # This is used to translate Swift's leading-dot syntax, `.foo`, which means `T.foo` where
@@ -205,8 +213,8 @@ named:
     modifier*: modifier
     capture_declaration*: variable_declaration
     parameter*: parameter
-    return_type?: type_expr
-    body: block
+    return_type?: expr
+    body?: block
 
   array_literal:
     element*: expr
@@ -222,26 +230,25 @@ named:
     key: expr
     value: expr
 
-  # A tuple expression, such as `(a, b, c)`.
+  # A tuple expression, pattern, or type, such as `(a, b, c)`.
   tuple_expr:
-    element*: expr
+    element*: argument
 
   # A parameter.
   #
   # `type` is its declared type annotation (if any)
   #
   # `pattern` binds the parameter's internal name(s). For a simple parameter this is a
-  # `name_pattern`, but may be an arbitrary pattern for languages where patterns may appear
-  # in the parameter list.
+  # `named_pattern`, but may be an arbitrary expression where languages allow destructuring.
   #
   # `external_name` is the name by which to call sites refer to the parameter, if the parameter
   # can be passed as a named parameter. For example, the Swift function `func greet(person id: String)`
-  # would have `person` as the external name and a `name_pattern` wrapping `id` is the parameter's pattern.
+  # would have `person` as the external name and a `named_pattern` wrapping `id` as the parameter's pattern.
   parameter:
     modifier*: modifier
-    external_name?: identifier
-    type?: type_expr
-    pattern?: pattern
+    external_name_node?: identifier
+    type?: expr
+    pattern?: expr
     default?: expr
 
   # An expression that does nothing. Used where the grammar permits an
@@ -273,8 +280,8 @@ named:
   # `chained_declaration` modifier so the grouping can be recovered downstream.
   variable_declaration:
     modifier*: modifier
-    pattern: pattern
-    type?: type_expr
+    pattern: expr
+    type?: expr
     value?: expr
 
   # Evaluate 'condition', and if false, execute 'else' which must break from the enclosing block scope (return, break, etc).
@@ -286,17 +293,17 @@ named:
 
   # `break` (with optional label)
   break_expr:
-    label?: identifier
+    label_name_node?: identifier
 
   # `continue` (with optional label)
   continue_expr:
-    label?: identifier
+    label_name_node?: identifier
 
   # A labeled statement, such as `outer: for ... { ... }`. The labeled
   # statement appears as the `stmt` field; `break`/`continue` may target
   # the label.
   labeled_stmt:
-    label: identifier
+    label_name_node: identifier
     stmt: stmt
 
   # `return value` or bare `return`
@@ -316,31 +323,31 @@ named:
   #
   import_declaration:
     modifier*: modifier
-    imported_expr: expr # Qualified names are encoded as a chain of member_access_expr ending with a name_expr
-    pattern?: pattern # Binds local names in scope (possibly via bulk_importing_pattern)
+    imported_expr: expr # Qualified names are encoded as a chain of member_access_expr ending with an identifier
+    pattern?: expr # Binds local names in scope (possibly via bulk_importing_pattern)
 
   # `typealias Name = Type`
   type_alias_declaration:
     modifier*: modifier
-    name: identifier
+    name_node: identifier
     type_parameter*: type_parameter
     type_constraint*: type_constraint
-    type: type_expr
+    type: expr
 
   # A top-level function declaration.
   function_declaration:
     modifier*: modifier
-    name: identifier
+    name_node: identifier
     type_parameter*: type_parameter
     type_constraint*: type_constraint
     parameter*: parameter
-    return_type?: type_expr
+    return_type?: expr
     body?: block
 
   # `for pattern in iterable [where guard] { body }`.
   for_each_stmt:
     modifier*: modifier
-    pattern: pattern
+    pattern: expr
     iterable: expr
     guard?: expr
     body?: block
@@ -357,6 +364,9 @@ named:
     body?: block
     condition: expr
 
+  defer_stmt:
+    body: expr
+
   # `do { body } catch pattern { ... } catch ...`. Swift uses `do`/`catch`
   # for error handling; for languages with `try`/`catch`, this is the same shape.
   try_expr:
@@ -366,7 +376,7 @@ named:
 
   catch_clause:
     modifier*: modifier
-    pattern?: pattern
+    pattern?: expr
     body: block
 
   # `switch value { case pattern: body case ...: default: body }`
@@ -380,7 +390,7 @@ named:
   # A `default:` entry has no pattern.
   switch_case:
     modifier*: modifier
-    pattern?: pattern
+    pattern?: expr
     body: block
 
   # Evaluate 'expr' and match its result against 'pattern', and return true if it matches.
@@ -390,7 +400,7 @@ named:
   #
   # Java: 'if (x instanceof Foo y && w ...) { ... }'
   pattern_guard_expr:
-    pattern: pattern
+    pattern: expr
     value: expr
 
   # A type cast expression, such as `x as T`, `x as? T`, or `x as! T`. The
@@ -398,48 +408,19 @@ named:
   type_cast_expr:
     expr: expr
     operator: infix_operator
-    type: type_expr
+    type: expr
 
   # A type-test expression, such as `x is T`. Yields a boolean indicating
   # whether `expr` is an instance of `type`.
   type_test_expr:
     expr: expr
-    operator: infix_operator
-    type: type_expr
-
-  # An identifier that introduces a variable.
-  #
-  # When used as a pattern, the pattern matches anything and binds its incoming value to the variable
-  name_pattern:
-    modifier*: modifier
-    identifier: identifier
-
-  # A pattern matching anything, binding no variables, usually using the syntax "_"
-  ignore_pattern:
-
-  # A pattern that matches if the incoming value is equal to the value of the given expression.
-  # Used for literal patterns in switch (e.g. `case 1:`).
-  expr_equality_pattern:
-    expr: expr
-
-  # A tuple pattern such as `(a, b)` in `let (a, b) = pair`.
-  #
-  # Elements of the tuple pattern can have names, such as Swift's `let (foo: x, bar: y) = tuple`.
-  tuple_pattern:
-    modifier*: modifier
-    element*: pattern_element
-
-  # A pattern such as `Some(x)` where `Some` is the constructor and `x` is an element.
-  # The element names are interpreted as argument labels and/or field names.
-  constructor_pattern:
-    modifier*: modifier
-    constructor: expr_or_type
-    element*: pattern_element
+    operator?: infix_operator
+    type: expr
 
   # A disjunction pattern that matches if any of its sub-patterns match.
   or_pattern:
     modifier*: modifier
-    pattern*: pattern
+    pattern*: expr
 
   # A pattern that matches against a nested pattern, and subsequently checks a condition.
   # The match is rejected if the condition does not hold.
@@ -447,34 +428,25 @@ named:
   conditional_pattern:
     modifier*: modifier
     condition: expr
-    pattern: pattern
-
-  # A pattern with an optional associated name.
-  pattern_element:
-    modifier*: modifier
-    key?: identifier
-    pattern: pattern
-
-  # A pattern that checks if the incoming value has the given type, and if so, the
-  # value is matched against the given nested pattern (and succeeds iff the nested match succeeds).
-  #
-  # In Swift: `if let y = x as? Foo` is a pattern_guard_expr containing a type_test_pattern
-  # In Java: `x instanceof Foo y` is a type_test_pattern wrapping a name_pattern
-  type_test_pattern:
-    pattern: pattern
-    type: type_expr
+    pattern: expr
 
   # A '*' pattern that imports all members of the incoming value into the local scope
   # Currently this can only appear in import declarations.
   bulk_importing_pattern:
     modifier*: modifier
 
-  # An simple unqualified identifier token
+  # A pattern that accepts any incoming value, usually written as an `_`.
+  ignore_pattern:
+
+  # A simple unqualified name token
   identifier:
 
   # A node that we don't yet translate
   unsupported_node:
 
+  # A node kind that has no explicit translation or unsupported classification
+  unhandled_node:
+
   infix_operator:
 
   prefix_operator:
@@ -487,27 +459,27 @@ named:
 
   type_parameter:
     modifier*: modifier
-    name: identifier
-    bound?: type_expr
+    name_node: identifier
+    bound?: expr
 
   # A generic constraint of the form `T == U`, requiring two types to be
   # equal. Appears in `where` clauses on generic declarations
   # (e.g. Swift `func foo<T, U>() where T == U`).
   equality_type_constraint:
-    left: type_expr
-    right: type_expr
+    left: expr
+    right: expr
 
   # A generic constraint of the form `T: Bound`, requiring a type parameter
   # to conform to (or inherit from) some other type. Appears in `where`
   # clauses on generic declarations (e.g. Swift `where T: Equatable`).
   bound_type_constraint:
-    type: type_expr
-    bound: type_expr
+    type: expr
+    bound: expr
 
   # `infix operator +++` (and the like) — a declaration of a custom operator.
   operator_syntax_declaration:
     modifier*: modifier
-    name: identifier
+    name_node: identifier
     # The fixity specifier (`prefix`, `infix`, `postfix`), when applicable.
     fixity?: fixity
     # The declared precedence level, when present (e.g. Swift's
@@ -522,7 +494,8 @@ named:
   # no `name`; the extended type appears as a `base_type`.
   class_like_declaration:
     modifier*: modifier
-    name?: identifier
+    name_node?: identifier
+    extension_target?: expr
     type_parameter*: type_parameter
     type_constraint*: type_constraint
     base_type*: base_type
@@ -534,11 +507,11 @@ named:
   # kind should be included as a modifier on this node.
   base_type:
     modifier*: modifier
-    type: type_expr
+    type: expr
 
   constructor_declaration:
     modifier*: modifier
-    name?: identifier
+    name_node?: identifier
     parameter*: parameter
     body: block
 
@@ -558,10 +531,10 @@ named:
   # (each observer also tagged with `chained_declaration`).
   accessor_declaration:
     modifier*: modifier
-    name: identifier
+    name_node: identifier
     accessor_kind: accessor_kind
     parameter*: parameter
-    type?: type_expr
+    return_type?: expr
     body?: block
 
   # "get", "set", or a language-specific kind like "didSet"
@@ -574,30 +547,18 @@ named:
 
   associated_type_declaration:
     modifier*: modifier
-    name: identifier
-    bound?: type_expr
-
-  named_type_expr:
-    qualifier?: type_expr
-    name: identifier
+    name_node: identifier
+    bound?: expr
 
   generic_type_expr:
-    base: type_expr
-    type_argument*: type_expr
+    base: expr
+    type_argument*: expr
 
-  # A tuple type such as `(Int, String)` or `(a: A, b: B)`.
-  tuple_type_expr:
-    element*: tuple_type_element
-
-  # An element of a `tuple_type_expr`, optionally carrying a label.
-  tuple_type_element:
-    name?: identifier
-    type: type_expr
-
-  # A function type such as `(Int, String) -> Bool` or `(x: Int) -> Bool`.
-  function_type_expr:
-    parameter*: parameter
-    return_type: type_expr
+  # A type with a modifier. In Swift this can be specifiers or attributes, such
+  # as `inout T`, `sending T` or `@escaping () -> Void`.
+  modified_type_expr:
+    modifier*: modifier
+    type: expr
 
   # A modifier such as 'static', 'public', or 'async'. For now this is just a leaf node with a string value.
   modifier:
diff --git a/unified/extractor/build.rs b/unified/extractor/build.rs
new file mode 100644
index 000000000000..22db82bc0ff3
--- /dev/null
+++ b/unified/extractor/build.rs
@@ -0,0 +1,12 @@
+fn main() {
+    println!("cargo:rustc-check-cfg=cfg(bazel)");
+
+    if let Ok(dir) = std::env::var("DEP_SWIFTSYNTAXFFI_LIBDIR") {
+        println!("cargo:rustc-link-search=native={dir}");
+        println!("cargo:rustc-link-lib=dylib=SwiftSyntaxFFI");
+        println!("cargo:rustc-link-arg=-Wl,-rpath,{dir}");
+    }
+    if let Ok(dir) = std::env::var("DEP_SWIFTSYNTAXFFI_RUNTIMEDIR") {
+        println!("cargo:rustc-link-arg=-Wl,-rpath,{dir}");
+    }
+}
diff --git a/unified/extractor/src/extractor.rs b/unified/extractor/src/extractor.rs
index 82bfe81219b5..8c180c854d1f 100644
--- a/unified/extractor/src/extractor.rs
+++ b/unified/extractor/src/extractor.rs
@@ -1,10 +1,10 @@
-use clap::Args;
-use std::path::PathBuf;
-
 use crate::languages;
+use clap::Args;
 use codeql_extractor::extractor::desugaring;
 use codeql_extractor::trap;
-
+use std::path::Path;
+use std::path::PathBuf;
+use std::{env, fs};
 #[derive(Args)]
 pub struct Options {
     /// Sets a custom source archive folder
@@ -31,6 +31,33 @@ pub fn run(options: Options) -> std::io::Result<()> {
         lang.prefix = "unified";
     }
 
+    let scratch_dir = std::env::var("CODEQL_EXTRACTOR_UNIFIED_SCRATCH_DIR")
+        .expect("failed to read CODEQL_EXTRACTOR_UNIFIED_SCRATCH_DIR environment variable");
+    let builtins_path = env::var("CODEQL_EXTRACTOR_UNIFIED_ROOT")
+        .map(|path| Path::new(&path).join("tools").join("builtins"))
+        .expect("failed to read CODEQL_EXTRACTOR_UNIFIED_ROOT environment variable");
+    let builtins_dir = fs::read_dir(builtins_path).expect("failed to read builtins directory");
+    let mut builtins_list = PathBuf::new();
+    builtins_list.push(scratch_dir.clone());
+    builtins_list.push("builtins");
+    builtins_list.set_extension("list");
+
+    let mut builtins_list_file = fs::OpenOptions::new()
+        .create_new(true)
+        .write(true)
+        .open(&builtins_list)
+        .expect("failed to open file list");
+    for entry in builtins_dir {
+        let entry = entry.expect("failed to read builtins directory");
+        let path = entry.path();
+        if path.extension().is_some_and(|ext| ext == "swift") {
+            use std::io::Write;
+            writeln!(builtins_list_file, "{}", path.display())
+                .expect("failed to write to file list");
+        }
+    }
+    drop(builtins_list_file);
+
     let extractor = desugaring::Extractor {
         prefix: "unified".to_string(),
         languages,
@@ -39,7 +66,7 @@ pub fn run(options: Options) -> std::io::Result<()> {
             "CODEQL_EXTRACTOR_UNIFIED_OPTION_TRAP_COMPRESSION",
         ),
         source_archive_dir: options.source_archive_dir,
-        file_lists: vec![options.file_list],
+        file_lists: vec![options.file_list, builtins_list],
     };
 
     extractor.run()
diff --git a/unified/extractor/src/languages/swift/adapter.rs b/unified/extractor/src/languages/swift/adapter.rs
index f34e5df3d00b..dd26a64195b5 100644
--- a/unified/extractor/src/languages/swift/adapter.rs
+++ b/unified/extractor/src/languages/swift/adapter.rs
@@ -23,6 +23,7 @@
 use std::collections::BTreeMap;
 
 use codeql_extractor::extractor::ExtraToken;
+use serde::Deserialize;
 use serde_json::Value;
 use yeast::{Ast, Id, NodeContent, Point, Range};
 
@@ -61,10 +62,71 @@ const VARYING_TOKEN_KINDS: &[&str] = &[
 fn is_metadata_key(key: &str) -> bool {
     matches!(
         key,
-        "kind" | "range" | "tokenKind" | "text" | "leadingTrivia" | "trailingTrivia"
+        "kind"
+            | "$pos"
+            | "$end"
+            | "$lineStarts"
+            | "tokenKind"
+            | "text"
+            | "leadingTrivia"
+            | "trailingTrivia"
     )
 }
 
+/// Converts compact UTF-8 byte offsets into tree-sitter-style points.
+struct LocationTable {
+    line_starts: Vec<usize>,
+}
+
+impl LocationTable {
+    fn from_root(root: &Value) -> Result<Self, String> {
+        let values = root
+            .get("$lineStarts")
+            .and_then(Value::as_array)
+            .ok_or("root node is missing an array `$lineStarts`")?;
+        let mut line_starts = Vec::with_capacity(values.len());
+        for (index, value) in values.iter().enumerate() {
+            let offset = value
+                .as_u64()
+                .and_then(|offset| usize::try_from(offset).ok())
+                .ok_or_else(|| format!("`$lineStarts[{index}]` is not a valid byte offset"))?;
+            line_starts.push(offset);
+        }
+        if line_starts.first() != Some(&0) {
+            return Err("`$lineStarts` must start with offset 0".to_string());
+        }
+        if line_starts.windows(2).any(|pair| pair[0] >= pair[1]) {
+            return Err("`$lineStarts` offsets must be strictly increasing".to_string());
+        }
+        Ok(Self { line_starts })
+    }
+
+    fn point(&self, offset: usize) -> Point {
+        let row = self
+            .line_starts
+            .partition_point(|line_start| *line_start <= offset)
+            - 1;
+        Point::new(row, offset - self.line_starts[row])
+    }
+
+    /// Parse a node's half-open UTF-8 byte range into a [`yeast::Range`].
+    fn range(&self, node: &Value) -> Option<Range> {
+        let offset = |key: &str| {
+            node.get(key)?
+                .as_u64()
+                .and_then(|offset| usize::try_from(offset).ok())
+        };
+        let start_byte = offset("$pos")?;
+        let end_byte = offset("$end")?;
+        Some(Range {
+            start_byte,
+            end_byte,
+            start_point: self.point(start_byte),
+            end_point: self.point(end_byte),
+        })
+    }
+}
+
 /// The classification of a JSON node into a yeast kind name and named-ness.
 struct KindInfo {
     /// The name under which the kind is registered in the schema.
@@ -141,13 +203,25 @@ fn field_entries(node: &Value) -> Vec<(&str, &Value)> {
         .unwrap_or_default()
 }
 
-/// The child node objects held by a field value, which is either a single node
-/// object or an array of them (an elided collection).
+/// The child node objects held by a field value.
+///
+/// Collection nodes are elided by the Swift serializer, so nested collections
+/// can produce nested arrays (notably inside `UnexpectedNodesSyntax`). Flatten
+/// arrays recursively to preserve the intended collection elision.
 fn children_of(value: &Value) -> Vec<&Value> {
-    match value {
-        Value::Array(items) => items.iter().collect(),
-        other => vec![other],
+    fn collect<'a>(value: &'a Value, children: &mut Vec<&'a Value>) {
+        if let Value::Array(items) = value {
+            for item in items {
+                collect(item, children);
+            }
+        } else {
+            children.push(value);
+        }
     }
+
+    let mut children = Vec::new();
+    collect(value, &mut children);
+    children
 }
 
 /// Recursively build `node` (and its descendants) into `ast`, returning its id.
@@ -158,16 +232,21 @@ fn children_of(value: &Value) -> Vec<&Value> {
 /// comment/`unexpectedText` trivia carried by a token is harvested into
 /// `extras` (as [`ExtraToken`]s) during the same pass rather than embedded in
 /// the tree.
-fn build(node: &Value, ast: &mut Ast, extras: &mut Vec<ExtraToken>) -> Result<Id, String> {
+fn build(
+    node: &Value,
+    locations: &LocationTable,
+    ast: &mut Ast,
+    extras: &mut Vec<ExtraToken>,
+) -> Result<Id, String> {
     let info = classify(node)?;
-    collect_extras(node, extras);
+    collect_extras(node, locations, extras);
 
     let mut fields: BTreeMap<u16, Vec<Id>> = BTreeMap::new();
     for (field, value) in field_entries(node) {
         let field_id = ast.register_field(field);
         let mut ids = Vec::new();
         for child in children_of(value) {
-            ids.push(build(child, ast, extras)?);
+            ids.push(build(child, locations, ast, extras)?);
         }
         fields.insert(field_id, ids);
     }
@@ -183,7 +262,7 @@ fn build(node: &Value, ast: &mut Ast, extras: &mut Vec<ExtraToken>) -> Result<Id
         NodeContent::DynamicString(info.text),
         fields,
         info.is_named,
-        parse_range(node),
+        locations.range(node),
     ))
 }
 
@@ -191,7 +270,7 @@ fn build(node: &Value, ast: &mut Ast, extras: &mut Vec<ExtraToken>) -> Result<Id
 /// filtered to comments/`unexpectedText` upstream) into `out` as
 /// [`ExtraToken`]s. Non-token nodes have no trivia keys, so this is a no-op for
 /// them.
-fn collect_extras(node: &Value, out: &mut Vec<ExtraToken>) {
+fn collect_extras(node: &Value, locations: &LocationTable, out: &mut Vec<ExtraToken>) {
     for key in ["leadingTrivia", "trailingTrivia"] {
         let Some(Value::Array(pieces)) = node.get(key) else {
             continue;
@@ -199,7 +278,7 @@ fn collect_extras(node: &Value, out: &mut Vec<ExtraToken>) {
         for piece in pieces {
             let (Some(kind), Some(range)) = (
                 piece.get("kind").and_then(Value::as_str),
-                parse_range(piece),
+                locations.range(piece),
             ) else {
                 continue;
             };
@@ -232,36 +311,9 @@ fn trivia_kind_id(kind: &str) -> usize {
     }
 }
 
-/// Parse a node's `range` into a [`yeast::Range`].
-///
-/// The JSON carries, for `start` and `end`, a 0-based UTF-8 file byte `offset`,
-/// a 1-based `line`, and a 1-based UTF-8 byte `column`. yeast (like tree-sitter)
-/// uses byte offsets with 0-based rows/columns and an exclusive end, so the
-/// line/column are shifted down by one. swift-syntax's end position is already
-/// exclusive, so the byte offsets map across directly.
-fn parse_range(node: &Value) -> Option<Range> {
-    let range = node.get("range")?;
-    let point = |key: &str| -> Option<(usize, Point)> {
-        let p = range.get(key)?;
-        let offset = p.get("offset")?.as_u64()? as usize;
-        let line = p.get("line")?.as_u64()? as usize;
-        let column = p.get("column")?.as_u64()? as usize;
-        Some((
-            offset,
-            Point::new(line.saturating_sub(1), column.saturating_sub(1)),
-        ))
-    };
-    let (start_byte, start_point) = point("start")?;
-    let (end_byte, end_point) = point("end")?;
-    Some(Range {
-        start_byte,
-        end_byte,
-        start_point,
-        end_point,
-    })
-}
-
-/// The authoritative swift-syntax input node-types schema.
+/// The authoritative swift-syntax input node-types schema, generated from
+/// swift-syntax by `swift-syntax-rs/schemagen` (run
+/// `unified/scripts/regenerate-node-types.sh` to refresh it).
 /// [`json_to_ast`] seeds every parse with the schema built from this,
 /// pre-registering every input kind and field so rule matching never references
 /// a name absent from a given file's tree.
@@ -273,11 +325,17 @@ const SWIFT_NODE_TYPES: &str = include_str!("../../../swift_node_types.yml");
 /// authoritative swift-syntax schema ([`SWIFT_NODE_TYPES`]); the adapter only
 /// ever consumes swift-syntax input, so the schema is not a parameter.
 pub fn json_to_ast(json: &str) -> Result<AdaptedTree, String> {
-    let root: Value = serde_json::from_str(json).map_err(|e| format!("invalid JSON: {e}"))?;
+    let mut deserializer = serde_json::Deserializer::from_str(json);
+    deserializer.disable_recursion_limit();
+    let root = Value::deserialize(&mut deserializer).map_err(|e| format!("invalid JSON: {e}"))?;
+    deserializer
+        .end()
+        .map_err(|e| format!("invalid JSON: {e}"))?;
+    let locations = LocationTable::from_root(&root)?;
 
     let mut ast = Ast::with_schema(yeast::node_types_yaml::schema_from_yaml(SWIFT_NODE_TYPES)?);
     let mut extras = Vec::new();
-    let root_id = build(&root, &mut ast, &mut extras)?;
+    let root_id = build(&root, &locations, &mut ast, &mut extras)?;
     ast.set_root(root_id);
 
     // Emit extras in source order (the traversal visits nodes bottom-up).
@@ -290,28 +348,41 @@ pub fn json_to_ast(json: &str) -> Result<AdaptedTree, String> {
 mod tests {
     use super::*;
 
+    fn deeply_nested_json(depth: usize) -> String {
+        let mut child = r#"{"$pos":0,"$end":0,"kind":"sourceFile"}"#.to_string();
+        for _ in 0..depth {
+            child = format!(r#"{{"$pos":0,"$end":0,"kind":"sourceFile","child":{child}}}"#);
+        }
+        format!(r#"{{"$lineStarts":[0],"$pos":0,"$end":0,"kind":"sourceFile","child":{child}}}"#)
+    }
+
     /// A hand-written JSON tree exercising layout nodes, a named (varying)
     /// token, a fixed keyword token, and an elided collection field — so the
     /// adapter is tested without needing the Swift toolchain.
     fn sample_json() -> &'static str {
         r#"{
+            "$lineStarts": [0],
+            "$pos": 0,
+            "$end": 9,
             "kind": "sourceFile",
-            "range": {"start":{"offset":0,"line":1,"column":1},"end":{"offset":9,"line":1,"column":10}},
             "statements": [
                 {
+                    "$pos": 0,
+                    "$end": 9,
                     "kind": "variableDecl",
-                    "range": {"start":{"offset":0,"line":1,"column":1},"end":{"offset":9,"line":1,"column":10}},
                     "bindingSpecifier": {
+                        "$pos": 0,
+                        "$end": 3,
                         "kind": "token",
                         "tokenKind": "keyword(SwiftSyntax.Keyword.let)",
-                        "text": "let",
-                        "range": {"start":{"offset":0,"line":1,"column":1},"end":{"offset":3,"line":1,"column":4}}
+                        "text": "let"
                     },
                     "name": {
+                        "$pos": 4,
+                        "$end": 5,
                         "kind": "token",
                         "tokenKind": "identifier(\"x\")",
-                        "text": "x",
-                        "range": {"start":{"offset":4,"line":1,"column":5},"end":{"offset":5,"line":1,"column":6}}
+                        "text": "x"
                     }
                 }
             ]
@@ -375,30 +446,113 @@ mod tests {
             .iter()
             .find(|n| n.kind_name() == "identifier")
             .expect("identifier node exists");
-        // `x` is at file offset 4..5, line 1, column 5 (1-based) in the JSON,
-        // which maps to 0-based row 0, column 4 and byte range 4..5.
+        // `x` is at UTF-8 byte range 4..5 on the first line.
         assert_eq!(ident.start_byte(), 4);
         assert_eq!(ident.end_byte(), 5);
         assert_eq!(ident.start_position(), Point::new(0, 4));
         assert_eq!(ident.end_position(), Point::new(0, 5));
     }
 
+    #[test]
+    fn maps_utf8_locations_across_swift_line_endings() {
+        // The implied source prefix is `// é😀\r\nlet `: the second line begins
+        // at UTF-8 byte 11 and `x` occupies bytes 15..16.
+        let json = r#"{
+            "$lineStarts": [0, 11, 21, 31],
+            "$pos": 0,
+            "$end": 31,
+            "kind": "sourceFile",
+            "name": {
+                "$pos": 15,
+                "$end": 16,
+                "kind": "token",
+                "tokenKind": "identifier(\"x\")",
+                "text": "x"
+            }
+        }"#;
+        let ast = json_to_ast(json).expect("adapter should succeed").ast;
+        let ident = ast
+            .nodes()
+            .iter()
+            .find(|n| n.kind_name() == "identifier")
+            .expect("identifier node exists");
+        assert_eq!(ident.start_byte(), 15);
+        assert_eq!(ident.end_byte(), 16);
+        assert_eq!(ident.start_position(), Point::new(1, 4));
+        assert_eq!(ident.end_position(), Point::new(1, 5));
+    }
+
+    #[test]
+    fn flattens_nested_elided_collections() {
+        let json = r#"{
+            "$lineStarts": [0],
+            "$pos": 0,
+            "$end": 20,
+            "kind": "sourceFile",
+            "unexpected": [
+                {
+                    "$pos": 0,
+                    "$end": 1,
+                    "kind": "token",
+                    "tokenKind": "leftBrace",
+                    "text": "{"
+                },
+                [
+                    {
+                        "$pos": 2,
+                        "$end": 20,
+                        "kind": "precedenceGroupAssociativity"
+                    }
+                ]
+            ]
+        }"#;
+        let ast = json_to_ast(json)
+            .expect("adapter should flatten nested collections")
+            .ast;
+
+        assert!(
+            ast.nodes()
+                .iter()
+                .any(|node| node.kind_name() == "precedenceGroupAssociativity")
+        );
+    }
+
+    #[test]
+    fn rejects_invalid_line_starts() {
+        let json = r#"{"$lineStarts":[1],"$pos":0,"$end":0,"kind":"sourceFile"}"#;
+        let error = match json_to_ast(json) {
+            Ok(_) => panic!("invalid line starts should fail"),
+            Err(error) => error,
+        };
+        assert!(error.contains("must start with offset 0"), "{error}");
+    }
+
+    #[test]
+    fn accepts_deeply_nested_json() {
+        let json = deeply_nested_json(256);
+        json_to_ast(&json).expect("adapter should accept JSON nested beyond serde_json's default");
+    }
+
     #[test]
     fn collects_extras_into_side_channel() {
         // A token carrying a trailing line comment in its trivia.
         let json = r#"{
+            "$lineStarts": [0],
+            "$pos": 0,
+            "$end": 14,
             "kind": "sourceFile",
-            "range": {"start":{"offset":0,"line":1,"column":1},"end":{"offset":14,"line":1,"column":15}},
             "value": {
+                "$pos": 0,
+                "$end": 1,
                 "kind": "token",
                 "tokenKind": "integerLiteral(\"1\")",
                 "text": "1",
-                "range": {"start":{"offset":0,"line":1,"column":1},"end":{"offset":1,"line":1,"column":2}},
                 "trailingTrivia": [
                     {
+                        "$pos": 2,
+                        "$end": 6,
                         "kind": "lineComment",
-                        "text": "// c",
-                        "range": {"start":{"offset":2,"line":1,"column":3},"end":{"offset":6,"line":1,"column":7}}
+                        "text": "// c"
                     }
                 ]
             }
diff --git a/unified/extractor/src/languages/swift/parse.rs b/unified/extractor/src/languages/swift/parse.rs
index c8633f1a27a5..2abc589332c8 100644
--- a/unified/extractor/src/languages/swift/parse.rs
+++ b/unified/extractor/src/languages/swift/parse.rs
@@ -1,33 +1,18 @@
-//! Swift front-end parser: shells out to the separate `swift-syntax-parse`
-//! binary (which links swift-syntax) to obtain a JSON syntax tree, then adapts
-//! that JSON into a `yeast::Ast` via the pure-Rust [`swift_adapter`] module.
-//!
-//! Running the parser in a separate process keeps the Swift toolchain out of
-//! the extractor's own build: the extractor never links Swift, so working on
-//! other (e.g. tree-sitter based) languages needs no Swift toolchain. Each call
-//! spawns the parser afresh; a longer-lived parser process could be swapped in
-//! behind this same seam later without touching the extraction pipeline.
-
-use std::io::Write;
-use std::process::{Command, Stdio};
+//! Swift front-end parser: calls into the `swift-syntax-rs` crate (which links
+//! swift-syntax) to obtain a JSON syntax tree, then adapts that JSON into a
+//! `yeast::Ast` via the pure-Rust [`swift_adapter`] module.
 
 use codeql_extractor::extractor::ParsedTree;
 
 use super::swift_adapter;
 
-/// Environment variable naming the `swift-syntax-parse` executable. When unset,
-/// the parser is resolved next to the extractor executable, then on `PATH`.
-const PARSE_BIN_ENV: &str = "CODEQL_EXTRACTOR_UNIFIED_SWIFT_SYNTAX_PARSE";
-
-/// Base name of the `swift-syntax-parse` executable as shipped / looked up.
-const PARSE_BIN_NAME: &str = "swift-syntax-parse";
-
 /// Parse Swift `source` into a [`ParsedTree`] (a raw `yeast::Ast` plus
 /// side-channel `extra` tokens), ready to be desugared via `run_from_ast`.
 pub fn parse(source: &[u8]) -> Result<ParsedTree, String> {
     let source =
         std::str::from_utf8(source).map_err(|e| format!("Swift source is not valid UTF-8: {e}"))?;
-    let json = run_parser(source)?;
+    let json =
+        swift_syntax_rs::parse_to_json(source).map_err(|e| format!("Swift parser failed: {e}"))?;
     let mut adapted = swift_adapter::json_to_ast(&json)?;
     adapted.ast.set_source(source.as_bytes().to_vec());
     Ok(ParsedTree {
@@ -35,87 +20,3 @@ pub fn parse(source: &[u8]) -> Result<ParsedTree, String> {
         extras: adapted.extras,
     })
 }
-
-/// The `swift-syntax-parse` executable to invoke, resolved in priority order:
-///
-/// 1. the `CODEQL_EXTRACTOR_UNIFIED_SWIFT_SYNTAX_PARSE` override, if set;
-/// 2. a copy shipped next to the extractor executable — this is how the CodeQL
-///    extractor pack lays it out (`tools/<platform>/{extractor,
-///    swift-syntax-parse}`), so a packaged extractor is self-contained with no
-///    environment setup;
-/// 3. a bare `swift-syntax-parse`, looked up on `PATH`.
-fn parse_bin() -> String {
-    if let Ok(bin) = std::env::var(PARSE_BIN_ENV) {
-        if !bin.is_empty() {
-            return bin;
-        }
-    }
-    if let Ok(exe) = std::env::current_exe() {
-        if let Some(sibling) = exe.parent().map(|dir| dir.join(PARSE_BIN_NAME)) {
-            if sibling.is_file() {
-                return sibling.to_string_lossy().into_owned();
-            }
-        }
-    }
-    PARSE_BIN_NAME.to_string()
-}
-
-/// Whether the `swift-syntax-parse` executable can be launched at all.
-///
-/// This reports availability of the *executable*, deliberately not whether
-/// parsing succeeds: a binary that launches but then crashes or emits invalid
-/// JSON is still "available", so callers run and surface the failure rather
-/// than silently skipping. Only a genuinely missing/unlaunchable binary (e.g.
-/// no Swift toolchain is installed) reports `false`.
-pub fn binary_available() -> bool {
-    match Command::new(parse_bin())
-        .stdin(Stdio::null())
-        .stdout(Stdio::null())
-        .stderr(Stdio::null())
-        .spawn()
-    {
-        Ok(mut child) => {
-            let _ = child.wait();
-            true
-        }
-        Err(e) if e.kind() == std::io::ErrorKind::NotFound => false,
-        // Any other spawn failure (e.g. a permissions problem) is a genuine
-        // issue worth surfacing, so treat the parser as available and let the
-        // caller fail rather than masking it as "unavailable".
-        Err(_) => true,
-    }
-}
-
-/// Run the external parser, feeding `source` on stdin and returning its JSON
-/// stdout.
-fn run_parser(source: &str) -> Result<String, String> {
-    let bin = parse_bin();
-    let mut child = Command::new(&bin)
-        .stdin(Stdio::piped())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .spawn()
-        .map_err(|e| format!("failed to spawn Swift parser `{bin}`: {e}"))?;
-
-    // The parser reads all of stdin before writing any stdout, so writing the
-    // whole source and then closing stdin (by dropping it) cannot deadlock.
-    child
-        .stdin
-        .take()
-        .expect("child stdin was piped")
-        .write_all(source.as_bytes())
-        .map_err(|e| format!("failed to write source to Swift parser `{bin}`: {e}"))?;
-
-    let output = child
-        .wait_with_output()
-        .map_err(|e| format!("failed to run Swift parser `{bin}`: {e}"))?;
-    if !output.status.success() {
-        return Err(format!(
-            "Swift parser `{bin}` failed ({}): {}",
-            output.status,
-            String::from_utf8_lossy(&output.stderr).trim()
-        ));
-    }
-    String::from_utf8(output.stdout)
-        .map_err(|e| format!("Swift parser produced non-UTF-8 output: {e}"))
-}
diff --git a/unified/extractor/src/languages/swift/swift.rs b/unified/extractor/src/languages/swift/swift.rs
index 000601b7215c..af05d93ad172 100644
--- a/unified/extractor/src/languages/swift/swift.rs
+++ b/unified/extractor/src/languages/swift/swift.rs
@@ -1,5 +1,5 @@
 use codeql_extractor::extractor::desugaring;
-use yeast::{ConcreteDesugarer, DesugaringConfig, PhaseKind, Rule, rule, tree};
+use yeast::{ConcreteDesugarer, DesugaringConfig, Rule, tree};
 
 /// User context propagated from outer rules down to the inner rules that
 /// emit the corresponding output declarations, so that each emitted node
@@ -8,20 +8,20 @@ use yeast::{ConcreteDesugarer, DesugaringConfig, PhaseKind, Rule, rule, tree};
 /// post-hoc mutation.
 #[derive(Clone, Default)]
 struct SwiftContext {
-    /// Identifier node for the property name. Set by the accessor-bearing
+    /// Name node for the property name. Set by the accessor-bearing
     /// `variableDecl` rule before translating the accessor block; read by the
     /// inner `accessorDecl` rules to name each `accessor_declaration`.
-    property_name: Option<yeast::Id>,
-    /// Translated type node for the property type. Set (for computed
-    /// properties) by the accessor-bearing `variableDecl` rule; read by the
-    /// inner `accessorDecl` rules. Left `None` for stored properties with
-    /// observers, so their `willSet`/`didSet` accessors carry no type.
-    property_type: Option<yeast::Id>,
+    property_name_node: Option<yeast::OutputId>,
+    /// Translated type node for the property type. Set by the
+    /// accessor-bearing `variableDecl` rule; read by the inner `accessorDecl`
+    /// rules for both the getter return type and its `newValue`/`oldValue`
+    /// parameter type, when available.
+    property_type: Option<yeast::OutputId>,
     /// Translated outer modifiers to attach to each child of a flattening
-    /// outer rule — e.g. the `let`/`var` binding modifier on each
-    /// `patternBinding` of a `variableDecl`, or the binding modifier on each
-    /// accessor of a property.
-    outer_modifiers: Vec<yeast::Id>,
+    /// outer rule — e.g. the `let`/`var` binding modifier, attributes and
+    /// modifiers (`static`, `public`, …) on each `patternBinding` of a
+    /// `variableDecl`, or on each accessor of a property.
+    outer_modifiers: Vec<yeast::OutputId>,
     /// True when the current child of a flattening outer rule is not
     /// the first one — its inner rule should emit a
     /// `chained_declaration` modifier so the original grouping can be
@@ -30,16 +30,13 @@ struct SwiftContext {
     /// True while translating the parameters of a `functionType`. swift-syntax
     /// models a function type's parameters with the same `tupleTypeElement`
     /// kind as a tuple type's elements, so the shared `tupleTypeElement` rule
-    /// reads this to emit a `parameter` (function-type param) rather than a
-    /// `tuple_type_element` (tuple-type element). The `tupleType` /
-    /// `functionType` rules each set it for their direct children, so nested
-    /// types are translated in the correct context.
+    /// reads this to emit a `parameter` (function-type parameter) rather than
+    /// an `argument` (tuple element). The `tupleType` / `functionType` rules
+    /// each set it for their direct children, so nested types are translated
+    /// in the correct context.
     in_function_type: bool,
-    /// True while translating the argument list of an enum-case
-    /// `constructor_pattern` (e.g. `case .foo(let x, 3)`). Read by the
-    /// `labeledExpr` rules so a bare expression argument becomes an
-    /// `expr_equality_pattern` (wrapped in a `pattern_element`) rather than a
-    /// call `argument`.
+    /// True while translating a pattern. Optional chaining in this context is
+    /// represented as an `Optional.some` call rather than being unwrapped.
     in_pattern: bool,
 }
 
@@ -63,16 +60,21 @@ impl SwiftContext {
     }
 }
 
-/// Build a freshly-created `chained_declaration` modifier node if
-/// `ctx.is_chained`, else `None`. Used by inner declaration rules to
-/// emit the chained tag for non-first children of a flattening outer
-/// rule. Returns `Option<Id>` so it splices via `{…}` to 0 or 1 ids.
-fn chained_modifier(ctx: &mut yeast::build::BuildCtx<'_, SwiftContext>) -> Option<yeast::Id> {
-    if ctx.is_chained {
-        Some(tree!((modifier "chained_declaration")))
-    } else {
-        None
-    }
+fn implicit_parameterless_initializer(
+    ctx: &mut yeast::build::BuildCtx<'_, SwiftContext>,
+    members: &[yeast::OutputId],
+) -> Option<yeast::OutputId> {
+    let has_explicit_initializer = members.iter().any(|member| {
+        ctx.output
+            .get_node(*member)
+            .is_some_and(|node| node.kind_name() == "constructor_declaration")
+    });
+    (!has_explicit_initializer).then(|| {
+        tree!((constructor_declaration
+            modifier: (modifier "generated")
+            name_node: (identifier "init")
+            body: (block)))
+    })
 }
 
 /// Combine a list of boolean sub-conditions into a single expression by
@@ -84,12 +86,14 @@ fn chained_modifier(ctx: &mut yeast::build::BuildCtx<'_, SwiftContext>) -> Optio
 /// condition.
 fn and_chain(
     ctx: &mut yeast::build::BuildCtx<'_, SwiftContext>,
-    conds: Vec<yeast::Id>,
-) -> yeast::Id {
+    conds: Vec<yeast::OutputId>,
+) -> yeast::OutputId {
     conds
         .into_iter()
         .reduce(|acc, elem| {
-            tree!((binary_expr operator: (infix_operator "&&") left: {acc} right: {elem}))
+            let operator_range = ctx.empty_source_range_between(acc, elem);
+            let operator = ctx.literal_with_source_range("infix_operator", "&&", operator_range);
+            tree!((binary_expr operator: {operator} left: {acc} right: {elem}))
         })
         .expect("control-flow statement must have at least one condition")
 }
@@ -98,8 +102,8 @@ fn and_chain(
 /// wrap the list in an `or_pattern`.
 fn make_or_pattern(
     ctx: &mut yeast::build::BuildCtx<'_, SwiftContext>,
-    items: Vec<yeast::Id>,
-) -> yeast::Id {
+    items: Vec<yeast::OutputId>,
+) -> yeast::OutputId {
     if items.len() == 1 {
         items[0]
     } else {
@@ -108,38 +112,34 @@ fn make_or_pattern(
 }
 
 /// Translate a multi-part identifier (for example `Foo.Bar.Baz`) into a
-/// `member_access_expr` chain rooted at a `name_expr` over the first
+/// `member_access_expr` chain rooted at a `name_node` for the first
 /// part. Panics on an empty input because the grammar's `_+` quantifier
 /// guarantees at least one part.
 fn member_chain(
     ctx: &mut yeast::build::BuildCtx<'_, SwiftContext>,
     parts: Vec<yeast::Id>,
-) -> yeast::Id {
+) -> yeast::OutputId {
     let mut iter = parts.into_iter();
     let first = iter
         .next()
         .expect("identifier with `part:` must have at least one part");
-    let init = tree!((name_expr identifier: (identifier #{first})));
+    let init = tree!((identifier #{first}));
     iter.fold(
         init,
-        |acc, elem| tree!((member_access_expr base: {acc} member: (identifier #{elem}))),
+        |acc, elem| tree!((member_access_expr base: {acc} member_name_node: (identifier #{elem}))),
     )
 }
 
-/// Compound-assignment operator spellings (`+=`, `<<=`, ...). Used to tell a
-/// compound assignment from an ordinary binary application, both of which
-/// arrive as a `binaryOperator`-based `infixOperatorExpr`.
-const COMPOUND_ASSIGN_OPS: &[&str] = &[
-    "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", "&=", "|=", "^=", "&+=", "&-=", "&*=",
-];
-
 fn translation_rules() -> Vec<Rule<SwiftContext>> {
-    vec![
+    yeast::rules! {
+        input: "swift_node_types.yml",
+        output: "ast_types.yml",
+        [
         // ---- Top-level ----
         // These rules translate the swift-syntax AST (camelCase kind names),
-        // produced by the sibling `adapter` module from the `swift-syntax-parse`
-        // binary's JSON. Anything unmatched falls through to the
-        // `unsupported_node` fallback at the end.
+        // produced by the sibling `adapter` module from swift-syntax JSON.
+        // Known kinds without dedicated rules become `unsupported_node`;
+        // genuinely unknown kinds become `unhandled_node`.
         //
         // `sourceFile` holds its top-level statements in an (elided)
         // `statements` collection; each element is a `codeBlockItem` wrapping
@@ -158,12 +158,42 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // swift-syntax does not distinguish the lexical integer/string forms
         // (hex/binary/octal, single- vs multi-line, raw): each is a single
         // `*LiteralExpr` kind, so one rule per literal type suffices.
-        rule!((integerLiteralExpr) => (int_literal)),
-        rule!((floatLiteralExpr) => (float_literal)),
-        rule!((booleanLiteralExpr) => (boolean_literal)),
-        rule!((nilLiteralExpr) => (builtin_expr)),
-        rule!((stringLiteralExpr) => (string_literal)),
-        rule!((regexLiteralExpr) => (regex_literal)),
+        rule!((integerLiteralExpr) @@node => expr {
+            tree!((int_literal #{node}))
+        }),
+        rule!((floatLiteralExpr) @@node => expr {
+            tree!((float_literal #{node}))
+        }),
+        rule!((booleanLiteralExpr) @@node => expr {
+            tree!((boolean_literal #{node}))
+        }),
+        rule!((nilLiteralExpr) @@node => expr {
+            tree!((builtin_expr #{node}))
+        }),
+        rule!((simpleStringLiteralExpr) @@node => (string_literal #{node})),
+        // String literal with a single constant segment (for some reason not typed as simpleStringLiteralExpr)
+        rule!(
+            (stringLiteralExpr segments: (stringSegment) segments: _* @@rest) @@node
+            where rest.is_empty()
+            =>
+            (string_literal #{node})
+        ),
+        rule!(
+            (stringLiteralExpr segments: _* @segments)
+            =>
+            (string_interpolation_expr element: {segments})
+        ),
+        rule!((stringSegment content: @@content) => (string_literal #{content})),
+        rule!(
+            (expressionSegment expressions: _* @expressions)
+            =>
+            (call_expr
+                callee: (builtin_expr "interpolation")
+                argument: {expressions})
+        ),
+        rule!((regexLiteralExpr) @@node => expr {
+            tree!((regex_literal #{node}))
+        }),
         // ---- Names ----
         // A function reference spelled with argument labels (`f(x:y:z:)`) is a
         // `declReferenceExpr` carrying `argumentNames`. Mark it unsupported for
@@ -176,15 +206,30 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
             =>
             (unsupported_node)
         ),
+        rule!((declReferenceExpr baseName: (identifier) @@name) => expr {
+            tree!((identifier #{name}))
+        }),
         // A bare name reference (`x`), and an operator used as a value (`+` in
         // `reduce(0, +)`), are both `declReferenceExpr`; its `baseName` is the
         // referenced identifier / operator symbol.
-        rule!((declReferenceExpr baseName: @name) => (name_expr identifier: (identifier #{name}))),
+        rule!((declReferenceExpr baseName: @@name) => (identifier #{name})),
         // A discard `_` used as an expression — e.g. the target of a discarding
-        // assignment `_ = x`. swift-syntax models it as a `discardAssignmentExpr`;
-        // the target AST has no expression-level discard (only `ignore_pattern`,
-        // which is a pattern), so it becomes a `name_expr` over the `_` token.
-        rule!((discardAssignmentExpr wildcard: @@w) => (name_expr identifier: (identifier #{w}))),
+        // assignment `_ = x`. swift-syntax models it as a `discardAssignmentExpr`.
+        rule!((discardAssignmentExpr wildcard: @@w) => (ignore_pattern #{w})),
+        // A generic specialization in expression position (`C<Foo>`,
+        // `Array<Int>`) is represented by swift-syntax as a
+        // `genericSpecializationExpr`. When used as a call target
+        // (`C<Foo>()`), this should become a `call_expr` whose callee is a
+        // `generic_type_expr`, so we map it directly to that shape.
+        rule!(
+            (genericSpecializationExpr
+                expression: (declReferenceExpr baseName: @@name)
+                genericArgumentClause: (genericArgumentClause arguments: (genericArgument argument: @args)*))
+            =>
+            (generic_type_expr
+                base: (identifier #{name})
+                type_argument: {args})
+        ),
         // ---- Operators ----
         // The parser front-end folds operator chains into nested
         // `infixOperatorExpr`s by precedence (see swift-syntax-rs), so
@@ -193,30 +238,22 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // A `binaryOperatorExpr` wraps the operator token; unwrap it to the
         // operator leaf. Used by `infixOperatorExpr` (folded) and `sequenceExpr`
         // (unresolved).
-        rule!((binaryOperatorExpr operator: @op) => (infix_operator #{op})),
-        // Compound assignment (`x += y`) vs. an ordinary binary application
-        // (`a + b`): both are `binaryOperator`-based `infixOperatorExpr`s,
-        // distinguishable only by the operator's spelling. The query engine
-        // can't match on token text, so a small Rust block reads the spelling
-        // and routes to `compound_assign_expr` or `binary_expr`. The operator
-        // is captured raw (`@@op`) to read its spelling.
+        rule!((binaryOperatorExpr operator: @@op) => (infix_operator #{op})),
+        // A `binaryOperator`-based `infixOperatorExpr` represents both ordinary
+        // binary applications (`a + b`) and compound assignments (`x += y`).
+        // Both have the same target AST shape; the QL library distinguishes
+        // assignments by the operator spelling.
         rule!(
             (infixOperatorExpr leftOperand: @l operator: (binaryOperatorExpr) @@op rightOperand: @r)
             =>
-            expr {
-                if COMPOUND_ASSIGN_OPS.contains(&ctx.source_text(op).as_str()) {
-                    tree!((compound_assign_expr target: {l} operator: (infix_operator #{op}) value: {r}))
-                } else {
-                    tree!((binary_expr left: {l} operator: (infix_operator #{op}) right: {r}))
-                }
-            }
+            (binary_expr left: {l} operator: (infix_operator #{op}) right: {r})
         ),
-        // Plain assignment (`x = y`). In a folded chain the `=` is an
-        // `assignmentExpr` node (distinct from other operators), matched by kind.
+        // Plain assignment (`x = y`). In a folded chain the `=` is represented
+        // by an `assignmentExpr` node rather than a `binaryOperatorExpr`.
         rule!(
-            (infixOperatorExpr leftOperand: @l operator: (assignmentExpr) rightOperand: @r)
+            (infixOperatorExpr leftOperand: @l operator: (assignmentExpr) @op rightOperand: @r)
             =>
-            (assign_expr target: {l} value: {r})
+            (binary_expr left: {l} operator: (infix_operator #{op}) right: {r})
         ),
         // In an unresolved `sequenceExpr` (below) the operator positions are not
         // only `binaryOperatorExpr`s: a plain assignment (`=`), an `as`/`is` cast
@@ -226,9 +263,9 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // to an opaque `unsupported_node`. These bare nodes only occur inside an
         // unresolved sequence — folded forms are handled by the dedicated rules
         // above (assignment) and below (`ternaryExpr`).
-        rule!((assignmentExpr) @op => (infix_operator #{op})),
-        rule!((unresolvedAsExpr) @op => (infix_operator #{op})),
-        rule!((unresolvedIsExpr) @op => (infix_operator #{op})),
+        rule!((assignmentExpr) @@op => (infix_operator #{op})),
+        rule!((unresolvedAsExpr) @@op => (infix_operator #{op})),
+        rule!((unresolvedIsExpr) @@op => (infix_operator #{op})),
         // The ternary is a three-part operator (`? thenExpr :`) that *wraps* a
         // nested expression. Splice it into `?`, the then-expression, `:` so the
         // then-expression survives as a real (traversable) operand rather than
@@ -247,17 +284,30 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // infix operators, rather than guessing a structure.
         rule!((sequenceExpr elements: _* @els) => (unresolved_operator_sequence element: {els})),
         // Prefix unary operators (`!a`, `-x`).
-        rule!((prefixOperatorExpr operator: @op expression: @operand) => (unary_expr operator: (prefix_operator #{op}) operand: {operand})),
-        // A `tupleExpr` is a tuple literal (`(a, b)`) or a parenthesised
-        // expression (`(x)`). For now it is kept as an opaque `tuple_expr` leaf
-        // (its source text); its elements are not descended into.
-        //
-        // TODO: a parenthesised single-element `tupleExpr` is really a grouping
-        // expression and should be elided (unwrapped to its inner expression)
-        // rather than modelled as a tuple.
-        rule!((tupleExpr) => (tuple_expr)),
+        rule!((prefixOperatorExpr operator: @@op expression: @operand) => (unary_expr operator: (prefix_operator #{op}) operand: {operand})),
+        // Postfix unary operators (e.g., `x!`, `x...`, `x++`).
+        rule!(
+            (postfixOperatorExpr expression: @operand operator: @@op)
+            =>
+            (unary_expr operator: (postfix_operator #{op}) operand: {operand})
+        ),
+        // In-out expressions, `&x`, are translated to unary expressions.
+        rule!(
+            (inOutExpr ampersand: @@amp expression: @operand)
+            =>
+            (unary_expr operator: (prefix_operator #{amp}) operand: {operand})
+        ),
+        // A parenthesised expression has a single tuple element; elide the
+        // grouping and preserve the expression itself. Actual tuple literals
+        // retain their translated labeled elements as `argument` children.
+        rule!((tupleExpr
+            elements: (labeledExpr label: _? @@lbl expression: @element)
+            elements: _* @@rest)
+            where rest.is_empty() && lbl.is_none() => expr { element }),
+        rule!((tupleExpr elements: _* @elements) => (tuple_expr element: {elements})),
         // A code block contains its statements directly.
         rule!((codeBlock statements: _* @stmts) => (block stmt: {stmts})),
+        rule!((accessorBlock accessors: (codeBlockItem)* @stmts) => (block stmt: {stmts})),
         // ---- Properties with accessors ----
         // A computed property with an implicit getter (`var a: T { <stmts> }`)
         // becomes a single `accessor_declaration` of kind `get`. This form is
@@ -266,18 +316,22 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // block.
         rule!(
             (variableDecl
+                attributes: _* @attrs
+                modifiers: _* @mods
                 bindingSpecifier: @@spec
                 bindings: (patternBinding
                     pattern: (identifierPattern identifier: @@name)
                     typeAnnotation: (typeAnnotation type: @ty)
-                    accessorBlock: (accessorBlock accessors: (codeBlockItem)+ @body)))
+                    accessorBlock: (accessorBlock accessors: (codeBlockItem)+) @body))
             =>
             (accessor_declaration
                 modifier: (modifier #{spec})
-                name: (identifier #{name})
-                type: {ty}
-                accessor_kind: (accessor_kind "get")
-                body: (block stmt: {body}))
+                modifier: {attrs}
+                modifier: {mods}
+                name_node: (identifier #{name})
+                return_type: {ty}
+                accessor_kind: {ctx.literal_at_start_of("accessor_kind", "get", body)}
+                body: {body})
         ),
         // A property with an explicit accessor block. swift-syntax makes both
         // shapes plain `accessorDecl`s, so they are told apart by the presence
@@ -286,16 +340,18 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         //  * With an initializer (`var x: T = e { willSet {…} didSet {…} }`) it is
         //    a *stored* property with observers: emit the backing
         //    `variable_declaration` first, then one `accessor_declaration` per
-        //    observer (observers carry no type).
+        //    observer.
         //  * Without an initializer (`var v: T { get set }`, incl. protocol
-        //    requirements) it is a *computed* property: no backing variable; the
-        //    type is published so the get/set accessors carry it.
+        //    requirements) it is a *computed* property: no backing variable.
         //
-        // In both cases the first emitted declaration is unchained and every
+        // In both cases the type is published so every accessor carries it, and
+        // the first emitted declaration is unchained and every
         // subsequent one is tagged `chained_declaration` (the `!result.is_empty()`
         // test). Must precede the plain `variableDecl` rules.
         rule!(
             (variableDecl
+                attributes: _* @attrs
+                modifiers: _* @mods
                 bindingSpecifier: @@spec
                 bindings: (patternBinding
                     pattern: (identifierPattern identifier: @@name)
@@ -304,8 +360,14 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                     accessorBlock: (accessorBlock accessors: (accessorDecl)+ @@accessors)))
             =>
             member* {
-                ctx.outer_modifiers = vec![tree!((modifier #{spec}))];
-                ctx.property_name = Some(tree!((identifier #{name})));
+                // The binding (`let`/`var`) leads, then attributes then modifiers,
+                // matching the plain `variableDecl` rule.
+                ctx.outer_modifiers = std::iter::once(tree!((modifier #{spec})))
+                    .chain(attrs)
+                    .chain(mods)
+                    .collect();
+                ctx.property_name_node = Some(tree!((identifier #{name})));
+                ctx.property_type = Some(ty);
                 let mut result = Vec::new();
                 if let Some(val) = val {
                     // Stored property with observers: the initializer is not part
@@ -317,13 +379,10 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                     result.push(tree!(
                         (variable_declaration
                             modifier: {ctx.outer_modifiers.clone()}
-                            pattern: (name_pattern identifier: (identifier #{name}))
+                            pattern: (identifier #{name})
                             type: {ty}
                             value: {val})
                     ));
-                } else {
-                    // Computed property: the accessors carry the type.
-                    ctx.property_type = Some(ty);
                 }
                 for acc in accessors.into_iter() {
                     ctx.is_chained = !result.is_empty();
@@ -333,44 +392,67 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
             }
         ),
         // Each `accessorDecl` becomes an `accessor_declaration`, reading the
-        // property name/type and the binding/chained modifiers from `ctx`. The
+        // property name/type and the modifiers from `ctx`. The
         // accessor kind comes straight from the specifier keyword
         // (`get`/`set`/`willSet`/`didSet`). The body is optional: a body-bearing
         // accessor (a computed getter/setter, or a `willSet`/`didSet` observer)
-        // carries the binding modifier and a translated body, whereas a bodyless
-        // one (a protocol requirement) carries neither. The property context is
+        // has a translated body, whereas a bodyless one (a protocol requirement)
+        // has none. The property context is
         // read out *before* translating the body, which resets `ctx` so the
         // accessor's context does not leak into the body subtree.
+        //
+        // `set` and `willSet` accessors get a parameter holding the incoming
+        // value, and `didSet` gets one holding the previous value. It is named
+        // explicitly (`set(v)`) or else implicitly `newValue`/`oldValue`.
         rule!(
-            (accessorDecl accessorSpecifier: @@spec body: _? @@body)
+            (accessorDecl
+                accessorSpecifier: @@spec
+                parameters: (accessorParameters name: @@param_name)?
+                body: _? @@body)
             =>
             accessor_declaration {
-                let binding = if body.is_some() {
-                    ctx.outer_modifiers.clone()
-                } else {
-                    Vec::new()
+                let spec_text = ctx.source_text(spec);
+                let implicit_param_name = match spec_text.as_str() {
+                    "set" | "willSet" => Some("newValue"),
+                    "didSet" => Some("oldValue"),
+                    _ => None,
                 };
-                let chained = chained_modifier(&mut ctx);
+                let param_ty = ctx.property_type;
+                let modifiers = ctx.outer_modifiers.clone();
                 let name = ctx
-                    .property_name
+                    .property_name_node
                     .ok_or("accessor outside property context")?;
-                let ty = ctx.property_type;
+                let return_ty = if spec_text == "get" {
+                    ctx.property_type
+                } else {
+                    None
+                };
                 let body = match body {
-                    Some(block) => {
+                    Some(block) => ctx.scoped(|ctx| {
                         ctx.reset();
-                        ctx.translate(block)?.into_iter().next()
-                    }
+                        ctx.translate(block)
+                    })?.into_iter().next(),
                     None => None,
                 };
-                tree!(
-                    (accessor_declaration
-                        modifier: {binding}
-                        modifier: {chained}
-                        name: {name}
-                        type: {ty}
-                        accessor_kind: (accessor_kind #{spec})
-                        body: {body})
-                )
+                tree!((accessor_declaration
+                    modifier: {modifiers}
+                    modifier: [(modifier "chained_declaration") if { ctx.is_chained }]
+                    name_node: {name}
+                    return_type: {return_ty}
+                    accessor_kind: (accessor_kind #{spec})
+                    parameter: [
+                        (parameter
+                            pattern: (identifier #{param_name})
+                            type: {param_ty})
+                        (parameter
+                            modifier: (modifier "generated")
+                            pattern: (identifier #{implicit_param_name} location: {spec})
+                            type: {param_ty}
+                            location: {spec})
+                    ]
+                    body: {body}
+                    location: {spec}
+                    location: {body}))
             }
         ),
         // ---- Variables ----
@@ -388,10 +470,10 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
             =>
             (variable_declaration
                 modifier: {ctx.outer_modifiers.clone()}
-                modifier: {chained_modifier(&mut ctx)}
+                modifier: [(modifier "chained_declaration") if { ctx.is_chained }]
                 pattern: {pattern}
                 type: {ty}
-                value: {ctx.reset(); ctx.translate(val)?})
+                value: {ctx.reset(); val})
         ),
         // A `let`/`var` declaration binds one or more comma-separated patterns
         // (`let x = 1, y = 2`). The `bindingSpecifier` (`let`/`var`) is published
@@ -425,7 +507,7 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         rule!(
             (enumCaseParameter firstName: _? @@name type: @ty)
             =>
-            (parameter pattern: (name_pattern identifier: (identifier #{name}))? type: {ty})
+            (parameter pattern: [(identifier #{name})] type: {ty})
         ),
         // An enum element with associated values (`case circle(radius: Double)`)
         // becomes a nested `class_like_declaration` whose constructor carries the
@@ -435,33 +517,42 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // `enumCaseDecl` rule below) and are tagged `enum_case`, after any
         // `chained_declaration` tag.
         rule!(
-            (enumCaseElement name: @name parameterClause: (enumCaseParameterClause parameters: _* @params))
-            =>
-            (class_like_declaration
-                modifier: {ctx.outer_modifiers.clone()}
-                modifier: {chained_modifier(&mut ctx)}
-                modifier: (modifier "enum_case")
-                name: (identifier #{name})
-                member: (constructor_declaration parameter: {params} body: (block)))
+            (enumCaseElement
+                name: @@name
+                parameterClause: (enumCaseParameterClause parameters: _* @params) @@clause)
+            =>
+            class_like_declaration {
+                let constructor = tree!((constructor_declaration
+                    parameter: {params}
+                    body: (block)
+                    location: {name}
+                    location: {clause}));
+                tree!((class_like_declaration
+                    modifier: {ctx.outer_modifiers.clone()}
+                    modifier: [(modifier "chained_declaration") if { ctx.is_chained }]
+                    modifier: (modifier "enum_case")
+                    name_node: (identifier #{name})
+                    member: {constructor}))
+            }
         ),
         rule!(
-            (enumCaseElement name: @name rawValue: (initializerClause value: @val))
+            (enumCaseElement name: @@name rawValue: (initializerClause value: @val))
             =>
             (variable_declaration
                 modifier: {ctx.outer_modifiers.clone()}
-                modifier: {chained_modifier(&mut ctx)}
+                modifier: [(modifier "chained_declaration") if { ctx.is_chained }]
                 modifier: (modifier "enum_case")
-                pattern: (name_pattern identifier: (identifier #{name}))
+                pattern: (identifier #{name})
                 value: {val})
         ),
         rule!(
-            (enumCaseElement name: @name)
+            (enumCaseElement name: @@name)
             =>
             (variable_declaration
                 modifier: {ctx.outer_modifiers.clone()}
-                modifier: {chained_modifier(&mut ctx)}
+                modifier: [(modifier "chained_declaration") if { ctx.is_chained }]
                 modifier: (modifier "enum_case")
-                pattern: (name_pattern identifier: (identifier #{name})))
+                pattern: (identifier #{name}))
         ),
         // Enum cases. A single `case` declaration may carry modifiers
         // (e.g. `indirect`) and list several comma-separated elements; each
@@ -485,81 +576,47 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         ),
         // `identifierPattern` wraps a single identifier token.
         rule!(
-            (identifierPattern identifier: @name)
+            (identifierPattern identifier: @@name)
+            =>
+            (identifier #{name})
+        ),
+        rule!(
+            (patternExpr pattern: @p)
             =>
-            (name_pattern identifier: (identifier #{name}))
+            expr { p }
         ),
         // A `let`/`var` value-binding pattern (`let x`) inside a case or `if case`
-        // introduces a new binding; it unwraps to its inner pattern (a
-        // `name_pattern`).
-        rule!((valueBindingPattern pattern: @p) => pattern { p }),
-        // An enum-case pattern with associated values (`case .foo(let x)`,
-        // `case Color.foo(let x)`) is an expression pattern wrapping a call of a
-        // member access. It becomes a `constructor_pattern`; its arguments are
-        // translated as pattern elements (see the `labeledExpr` rules, gated by
-        // `ctx.in_pattern`). Matched before the generic `expressionPattern` rule.
-        // The base is optional: a leading-dot form (`.foo`) has none, so the
-        // constructor's base is an `inferred_type_expr`.
-        rule!(
-            (expressionPattern expression: (functionCallExpr
-                calledExpression: (memberAccessExpr base: _? @base period: @dot declName: (declReferenceExpr baseName: @name))
-                arguments: _* @@args))
-            =>
-            constructor_pattern {
-                ctx.in_pattern = true;
-                let elements = ctx.translate(args)?;
-                let base = base.unwrap_or_else(|| tree!((inferred_type_expr #{dot})));
-                tree!((constructor_pattern
-                    constructor: (member_access_expr
-                        base: {base}
-                        member: (identifier #{name}))
-                    element: {elements}))
-            }
+        // preserves the binding specifier around its inner pattern.
+        rule!(
+            (valueBindingPattern bindingSpecifier: @@spec pattern: @p)
+            =>
+            (expr_pattern modifier: (modifier #{spec}) expr: {p})
         ),
         // A tuple destructuring pattern (`let (a, b) = …`). A labelled element
-        // (`let (x: a) = …`) carries its label through as the `pattern_element`
-        // key; unlabelled elements have no key.
-        rule!((tuplePattern elements: _* @els) => (tuple_pattern element: {els})),
+        // (`let (x: a) = …`) carries its label through as the `argument` name;
+        // unlabelled elements have no name.
+        rule!((tuplePattern elements: _* @els) => (tuple_expr element: {els})),
         rule!(
             (tuplePatternElement label: _? @@label pattern: @p)
             =>
-            (pattern_element key: (identifier #{label})? pattern: {p})
+            (argument name_node: [(identifier #{label})] value: {p})
         ),
         // A type-casting pattern (`case is T`). Not yet supported, so it is
         // mapped to `unsupported_node` — an explicit reminder that this needs
         // handling in the future. (Redundant with the catch-all fallback, but
-        // kept as a signpost.)
-        rule!((isTypePattern) => (unsupported_node)),
-        // A standalone wildcard pattern (`case _:`, `if case _`): swift-syntax
-        // models the bare `_` as an `expressionPattern` wrapping a
-        // `discardAssignmentExpr`. Matched before the generic `expressionPattern`
-        // rule so `_` becomes an `ignore_pattern` rather than an equality match.
-        // (Wildcards *inside* an enum-case argument list are handled by the
-        // `labeledExpr`/`discardAssignmentExpr` rules.)
-        rule!((expressionPattern expression: (discardAssignmentExpr)) => (ignore_pattern)),
+        // kept as a signpost.) Its explicit empty content preserves the
+        // existing representation instead of inheriting the matched source.
+        rule!((isTypePattern) => (unsupported_node "")),
         // A wildcard *binding* pattern (`let _ = x`, `for _ in xs`). swift-syntax
-        // models this as a `wildcardPattern` — distinct from the `_` *match*
-        // pattern above, which is an `expressionPattern` over a
-        // `discardAssignmentExpr`.
-        rule!((wildcardPattern) => (ignore_pattern)),
-        // A tuple pattern in a match position (`case (let a, 3):`) is parsed by
-        // swift-syntax as an `expressionPattern` wrapping a `tupleExpr` — unlike a
-        // binding tuple (`let (a, b)`), which is a real `tuplePattern`. Recognise
-        // it as a `tuple_pattern`; its `labeledExpr` elements translate to
-        // `pattern_element`s under `ctx.in_pattern` (a binding element becomes a
-        // `name_pattern`, any other expression an `expr_equality_pattern`).
-        rule!(
-            (expressionPattern expression: (tupleExpr elements: _* @@els))
-            =>
-            tuple_pattern {
-                ctx.in_pattern = true;
-                let elements = ctx.translate(els)?;
-                tree!((tuple_pattern element: {elements}))
-            }
-        ),
-        // A bare expression pattern (`case 1:`, `case someConstant:`) matches by
-        // equality.
-        rule!((expressionPattern expression: @e) => (expr_equality_pattern expr: {e})),
+        // models this as a `wildcardPattern`, distinct from the `_` match form
+        // handled by the context-aware `discardAssignmentExpr` rule.
+        rule!((wildcardPattern) @@wildcard => (ignore_pattern #{wildcard})),
+        // An expression pattern only establishes pattern context; its child
+        // determines the concrete pattern shape.
+        rule!((expressionPattern expression: @@e) => expr {
+            ctx.in_pattern = true;
+            e
+        }),
         // ---- Functions ----
         // A function declaration (parameters/return type/body optional). The
         // parameters and return type nest under `signature`; the body is a
@@ -567,120 +624,199 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // an empty `block`.
         rule!(
             (functionDecl
-                name: @name
+                modifiers: _* @mods
+                name: @@name
+                genericParameterClause: (genericParameterClause parameters: _* @type_params)?
                 signature: (functionSignature
                     parameterClause: (functionParameterClause parameters: _* @params)
                     returnClause: (returnClause type: @ret)?)
-                body: (codeBlock statements: _* @body))
+                body: (codeBlock) @body)
             =>
             (function_declaration
-                name: (identifier #{name})
+                modifier: {mods}
+                name_node: (identifier #{name})
+                type_parameter: {type_params}
                 parameter: {params}
                 return_type: {ret}
-                body: (block stmt: {body}))
+                body: {body})
         ),
         rule!(
             (functionDecl
-                name: @name
+                modifiers: _* @mods
+                name: @@name
+                genericParameterClause: (genericParameterClause parameters: _* @type_params)?
                 signature: (functionSignature
                     parameterClause: (functionParameterClause parameters: _* @params)
                     returnClause: (returnClause type: @ret)?))
             =>
             (function_declaration
-                name: (identifier #{name})
+                modifier: {mods}
+                name_node: (identifier #{name})
+                type_parameter: {type_params}
                 parameter: {params}
                 return_type: {ret}
                 body: (block))
         ),
         // A function parameter. With two names (`firstName`+`secondName`) the
         // first is the external argument label and the second the internal name;
-        // with one name it is just the internal name. The declared type is
-        // emitted; the default value is optional.
+        // with one name it is both the external and internal name.
         rule!(
             (functionParameter
                 firstName: @@first
-                secondName: _? @@second
+                secondName: @@second
                 type: @ty
                 defaultValue: (initializerClause value: @val)?)
             =>
-            parameter {
-                let (external, name) = match second {
-                    Some(second) => (Some(tree!((identifier #{first}))), second),
-                    None => (None, first),
-                };
-                tree!((parameter
-                    external_name: {external}
-                    pattern: (name_pattern identifier: (identifier #{name}))
-                    type: {ty}
-                    default: {val}))
+            (parameter
+                external_name_node: (identifier #{first})
+                pattern: (identifier #{second})
+                type: {ty}
+                default: {val})
+        ),
+        rule!(
+            (functionParameter
+                firstName: @@first
+                type: @ty
+                defaultValue: (initializerClause value: @val)?)
+            =>
+            (parameter
+                external_name_node: (identifier #{first}) // duplicate the parameter name
+                pattern: (identifier #{first})
+                type: {ty}
+                default: {val})
+        ),
+        // Swift's `[T](...)` array-type constructor syntax is parsed as a call
+        // whose callee is an `arrayExpr` containing `T`. For a generic `T`,
+        // translating that callee as an array literal would place a type
+        // expression in an expression-only element field. Normalize it to an
+        // `Array<T>` generic type constructor instead.
+        rule!(
+            (functionCallExpr
+                calledExpression: (arrayExpr
+                    elements: (arrayElement expression: (genericSpecializationExpr) @element)) @@array
+                arguments: _* @args
+                trailingClosure: @tc
+                additionalTrailingClosures: _* @additional)
+            =>
+            call_expr {
+                let callee = tree!((generic_type_expr
+                    base: (identifier "Array")
+                    type_argument: {element}
+                    location: {array}));
+                tree!((call_expr
+                    callee: {callee}
+                    argument: {args}
+                    argument: (argument value: {tc})
+                    argument: {additional}))
             }
         ),
-        // A function/method call (`foo(1, 2)`). `calledExpression` is the callee
-        // and `arguments` is an (elided) list of `labeledExpr`, each translated
-        // to an `argument` below. A trailing closure (`xs.map { … }`) becomes a
-        // final unlabelled argument; that variant is matched first.
         rule!(
-            (functionCallExpr calledExpression: @callee arguments: _* @args trailingClosure: @tc)
+            (functionCallExpr
+                calledExpression: (arrayExpr
+                    elements: (arrayElement expression: (genericSpecializationExpr) @element)) @@array
+                arguments: _* @args)
             =>
-            (call_expr callee: {callee} argument: {args} argument: (argument value: {tc}))
+            call_expr {
+                let callee = tree!((generic_type_expr
+                    base: (identifier "Array")
+                    type_argument: {element}
+                    location: {array}));
+                tree!((call_expr callee: {callee} argument: {args}))
+            }
         ),
+        // A function/method call (`foo(1, 2)`). `calledExpression` is the callee
+        // and `arguments` is an (elided) list of `labeledExpr`, each translated
+        // to an `argument` below. A trailing closure (`xs.map { … }`) becomes
+        // a final unlabelled argument, followed by any additional labeled
+        // trailing closures.
         rule!(
-            (functionCallExpr calledExpression: @callee arguments: _* @args)
+            (functionCallExpr
+                calledExpression: @@rawCallee
+                arguments: _* @args
+                trailingClosure: _? @trailing
+                additionalTrailingClosures: _* @additional)
             =>
-            (call_expr callee: {callee} argument: {args})
+            expr {
+                // Always translate the callee in non-pattern context.
+                let callee = ctx.scoped(|ctx| {
+                    ctx.in_pattern = false;
+                    ctx.translate(rawCallee)
+                })?;
+                tree!((call_expr
+                    callee: {callee}
+                    argument: {args}
+                    argument: {trailing.map(|trailing| tree!((argument value: {trailing})))}
+                    argument: {additional}
+                ))
+            }
         ),
-        // A call argument or an enum-case pattern argument. When translating an
-        // enum-case `constructor_pattern`'s arguments (`ctx.in_pattern`), a
-        // `patternExpr` argument (`let x`) becomes a bound `name_pattern`, a
-        // wildcard (`_`) becomes an `ignore_pattern`, and any other expression
-        // becomes an `expr_equality_pattern`; each is wrapped in a
-        // `pattern_element` carrying the optional argument label as its `key`.
-        // Otherwise the argument keeps its label as the `name` and its value.
-        // The pattern-only shapes (`patternExpr`, `discardAssignmentExpr`) are
-        // matched first; they never occur as ordinary call arguments.
+        // A call or enum-case pattern argument.
         rule!(
-            (labeledExpr label: _? @@lbl expression: (patternExpr pattern: @p))
+            (labeledExpr label: _? @@lbl expression: @val)
             =>
-            (pattern_element key: (identifier #{lbl})? pattern: {p})
+            (argument name_node: [(identifier #{lbl})] value: {val})
         ),
+        // An additional labeled trailing closure, such as the `c: { ... }` in
+        // `foo { 42 } c: { ... }`, is turned into an argument to the function.
         rule!(
-            (labeledExpr label: _? @@lbl expression: (discardAssignmentExpr) @@wildcard)
+            (multipleTrailingClosureElement label: @@label closure: @closure)
             =>
-            (pattern_element key: (identifier #{lbl})? pattern: (ignore_pattern #{wildcard}))
+            (argument name_node: (identifier #{label}) value: {closure})
         ),
         rule!(
-            (labeledExpr label: _? @@lbl expression: @val)
+            (macroExpansionExpr
+                macroName: @@name
+                genericArgumentClause: (genericArgumentClause arguments: (genericArgument argument: @type_args)*)?
+                arguments: _* @args
+                trailingClosure: _? @trailing
+                additionalTrailingClosures: _* @additional)
             =>
-            argument {
-                if ctx.in_pattern {
-                    tree!((pattern_element
-                        key: (identifier #{lbl})?
-                        pattern: (expr_equality_pattern expr: {val})))
-                } else {
-                    tree!((argument name: (identifier #{lbl})? value: {val}))
-                }
-            }
+        (macro_call_expr
+            macro_name_node: (identifier #{name})
+            type_argument: {type_args}
+            argument: {args}
+            argument: {trailing.map(|trailing| tree!((argument value: {trailing})))}
+            argument: {additional})
         ),
         // Member access (`list.append`). The `declName` is itself a
         // `declReferenceExpr`; pull its `baseName` out as the member identifier.
         // A leading-dot access (`.foo`) has no explicit base — the base is an
         // `inferred_type_expr`. The base-ful form is matched first.
+        // A bracketed generic array type used as a metatype or static-member
+        // base (`[T].self`) is parsed as an `arrayExpr`; preserve its type
+        // meaning as `Array<T>` rather than an array literal.
+        rule!(
+            (memberAccessExpr
+                base: (arrayExpr
+                    elements: (arrayElement expression: (genericSpecializationExpr) @element)) @@array
+                declName: (declReferenceExpr baseName: @@member))
+            =>
+            member_access_expr {
+                let base = tree!((generic_type_expr
+                    base: (identifier "Array")
+                    type_argument: {element}
+                    location: {array}));
+                tree!((member_access_expr
+                    base: {base}
+                    member_name_node: (identifier #{member})))
+            }
+        ),
         rule!(
-            (memberAccessExpr base: @base declName: (declReferenceExpr baseName: @member))
+            (memberAccessExpr base: @base declName: (declReferenceExpr baseName: @@member))
             =>
-            (member_access_expr base: {base} member: (identifier #{member}))
+            (member_access_expr base: {base} member_name_node: (identifier #{member}))
         ),
         rule!(
-            (memberAccessExpr declName: (declReferenceExpr baseName: @member))
+            (memberAccessExpr period: @@dot declName: (declReferenceExpr baseName: @@member))
             =>
-            (member_access_expr base: (inferred_type_expr) member: (identifier #{member}))
+            (member_access_expr base: (inferred_type_expr #{dot}) member_name_node: (identifier #{member}))
         ),
         // Control transfer, one rule per keyword. `return` carries an optional
         // value; `break` / `continue` an optional target label; `throw` its
         // thrown expression.
         rule!((returnStmt expression: _? @val) => (return_expr value: {val})),
-        rule!((breakStmt label: _? @@lbl) => (break_expr label: (identifier #{lbl})?)),
-        rule!((continueStmt label: _? @@lbl) => (continue_expr label: (identifier #{lbl})?)),
+        rule!((breakStmt label: _? @@lbl) => (break_expr label_name_node: [(identifier #{lbl})])),
+        rule!((continueStmt label: _? @@lbl) => (continue_expr label_name_node: [(identifier #{lbl})])),
         rule!((throwStmt expression: @val) => (throw_expr value: {val})),
         // ---- Closures ----
         // A closure (`{ (x: Int) -> Int in … }`) becomes a `function_expr`. The
@@ -705,10 +841,8 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                 return_type: {ret}
                 body: (block stmt: {body}))
         ),
-        // A closure capture (`[weak self]`, `[x]`, `[y = expr]`). The optional
-        // ownership specifier (`weak`/`unowned`) becomes a modifier; the
-        // captured name becomes the bound `name_pattern`; an explicit capture
-        // initializer (`[y = expr]`) becomes the bound value.
+        // A closure capture (`[weak self]`, `[x]`, `[y = expr]`).
+        // Normalize so there is always an explicit initializer, expanding `[x]` into `[x = x]`.
         rule!(
             (closureCapture
                 specifier: (closureCaptureSpecifier specifier: @@spec)?
@@ -716,25 +850,31 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                 initializer: (initializerClause value: @val)?)
             =>
             (variable_declaration
-                modifier: (modifier #{spec})?
-                pattern: (name_pattern identifier: (identifier #{name}))
-                value: {val})
+                modifier: [(modifier #{spec})]
+                pattern: (identifier #{name})
+                value: {
+                    // Expand [x] into [x = x]
+                    match val {
+                        Some(val) => val,
+                        None => tree!((identifier #{name})),
+                    }
+                })
         ),
         // A closure parameter clause (`(x: Int, y)`) unwraps to its parameters.
         rule!((closureParameterClause parameters: _* @params) => parameter* { params }),
         // A closure parameter (`x: Int`, or just `x`). Unlike a function
         // parameter it has no external label; the type is optional.
         rule!(
-            (closureParameter firstName: @name type: _? @ty)
+            (closureParameter firstName: @@name type: _? @ty)
             =>
-            (parameter pattern: (name_pattern identifier: (identifier #{name})) type: {ty})
+            (parameter pattern: (identifier #{name}) type: {ty})
         ),
         // A shorthand closure parameter (`x` in `{ x, y in … }`): a bare name
         // with no parentheses and no type.
         rule!(
-            (closureShorthandParameter name: @name)
+            (closureShorthandParameter name: @@name)
             =>
-            (parameter pattern: (name_pattern identifier: (identifier #{name})))
+            (parameter pattern: (identifier #{name}))
         ),
         // ---- Control flow ----
         // An `if`/`else` expression. Conditions are joined via `and_chain`; the
@@ -785,7 +925,13 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
             (switch_case body: (block stmt: {body}))
         ),
         // A single case item unwraps to its pattern, possibly boxed in conditional_pattern
-        rule!((switchCaseItem pattern: @p whereClause: (whereClause condition: @cond)) => (conditional_pattern pattern: { p } condition: {cond})),
+        rule!(
+            (switchCaseItem
+                pattern: @p
+                whereClause: (whereClause condition: @cond))
+            =>
+            (conditional_pattern pattern: {p} condition: {cond})
+        ),
         rule!((switchCaseItem pattern: @p) => pattern { p }),
         // A pattern-matching condition (`if case let x = e`, `if case .foo(let x)
         // = e`) becomes a `pattern_guard_expr`: the matched pattern and the
@@ -795,28 +941,38 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
             =>
             (pattern_guard_expr pattern: {pat} value: {val})
         ),
-        // Optional binding (`if let x = foo`, or shorthand `if let x`) desugars
-        // to a `pattern_guard_expr` matching `Optional.some(x)`. The initialized
-        // form is matched first.
+        // Optional binding conditions with an initializer (the `let p = y` in
+        // `if let p = y { ... }`). We translate this to a `pattern_guard_expr`
+        // matching `Optional.some(p)`.
         rule!(
             (optionalBindingCondition
-                pattern: (identifierPattern identifier: @name)
+                bindingSpecifier: @@spec
+                pattern: @pattern
                 initializer: (initializerClause value: @val))
             =>
             (pattern_guard_expr
                 value: {val}
-                pattern: (constructor_pattern
-                    constructor: (member_access_expr base: (named_type_expr name: (identifier "Optional")) member: (identifier "some"))
-                    element: (pattern_element pattern: (name_pattern identifier: (identifier #{name})))))
+                pattern: (call_expr
+                    callee: (member_access_expr base: (identifier "Optional") member_name_node: (identifier "some"))
+                    argument: (argument value: (expr_pattern
+                        modifier: (modifier #{spec})
+                        expr: {pattern}))))
         ),
+        // Optional binding conditions in shorthand form, that is, _without_ an
+        // initializer (the `let p` in `if let p { ... }`). In this case the
+        // pattern is always an identifier.
         rule!(
-            (optionalBindingCondition pattern: (identifierPattern identifier: @name))
+            (optionalBindingCondition
+                bindingSpecifier: @@spec
+                pattern: (identifierPattern identifier: @@name))
             =>
             (pattern_guard_expr
-                value: (name_expr identifier: (identifier #{name}))
-                pattern: (constructor_pattern
-                    constructor: (member_access_expr base: (named_type_expr name: (identifier "Optional")) member: (identifier "some"))
-                    element: (pattern_element pattern: (name_pattern identifier: (identifier #{name})))))
+                value: (identifier #{name})
+                pattern: (call_expr
+                    callee: (member_access_expr base: (identifier "Optional") member_name_node: (identifier "some"))
+                    argument: (argument value: (expr_pattern
+                        modifier: (modifier #{spec})
+                        expr: (identifier #{name})))))
         ),
         // A single condition in an `if`/`while`/`guard` condition list unwraps to
         // its inner expression; `and_chain` joins multiple with `&&`.
@@ -854,13 +1010,15 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
             =>
             (do_while_stmt condition: {cond} body: {body})
         ),
+        // A `defer` statement
+        rule!((deferStmt body: @body) => (defer_stmt body: {body})),
         // A labeled statement (`outer: for … { }`). swift-syntax stores the
         // label and colon as separate tokens, so the label token is already the
         // bare name (no trailing `:` to strip).
         rule!(
             (labeledStmt label: @@lbl statement: @stmt)
             =>
-            (labeled_stmt label: (identifier #{lbl}) stmt: {stmt})
+            (labeled_stmt label_name_node: (identifier #{lbl}) stmt: {stmt})
         ),
         // ---- Collections ----
         // An array literal (`[1, 2, 3]`). Each `arrayElement` unwraps to its
@@ -871,28 +1029,64 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
             (array_literal element: {els})
         ),
         rule!((arrayElement expression: @e) => expr { e }),
-        // A dictionary literal (`["a": 1]`) is kept as an opaque `map_literal`
-        // leaf (its source span).
-        rule!((dictionaryExpr) => (map_literal)),
+        // An empty dictionary literal, `[:]`.
+        rule!((dictionaryExpr content: ":") => (map_literal)),
+        // A non-empty dictionary literal, `[key: value]`.
+        rule!(
+            (dictionaryExpr content: (dictionaryElement)* @els)
+            =>
+            (map_literal element: {els})
+        ),
+        // A key-value pair, `key: value`.
+        rule!(
+            (dictionaryElement key: @key value: @value)
+            =>
+            (key_value_pair key: {key} value: {value})
+        ),
         // A subscript access (`xs[0]`) is modelled as a call. swift-syntax does
         // report a distinct `subscriptCallExpr`, so giving
         // subscripts their own shape needs only a `subscript_expr` node in
         // ast_types.yml and a remap here.
         rule!(
-            (subscriptCallExpr calledExpression: @callee arguments: _* @args)
+            (subscriptCallExpr
+                calledExpression: @callee
+                arguments: _* @args
+                trailingClosure: _? @trailing
+                additionalTrailingClosures: _* @additional)
             =>
-            (call_expr callee: {callee} argument: {args})
+            (call_expr
+                callee: {callee}
+                argument: {args}
+                argument: {trailing.map(|trailing| tree!((argument value: {trailing})))}
+                argument: {additional})
         ),
         // ---- Optionals and errors ----
         // Optional chaining — unwrap the marker
-        rule!((optionalChainingExpr expression: @inner) => expr { inner }),
+        rule!((optionalChainingExpr expression: @@inner) => expr {
+            let inner = ctx.translate(inner)?.into_iter().next().ok_or("optional chaining expression has no child")?;
+            if ctx.in_pattern {
+                tree!((call_expr
+                    callee: (member_access_expr
+                        base: (identifier "Optional")
+                        member_name_node: (identifier "some"))
+                    argument: (argument value: {inner})))
+            } else {
+                inner
+            }
+        }),
         // try/try?/try! expr → unary_expr with operator "try", "try?" or "try!"
         rule!(
-            (tryExpr questionOrExclamationMark: _? @@m expression: @e)
+            (tryExpr
+                tryKeyword: @@keyword
+                questionOrExclamationMark: _? @@m
+                expression: @e)
             =>
             expr {
                 let op = format!("try{}", m.map(|m| ctx.source_text(m)).unwrap_or_default());
-                tree!((unary_expr operator: (prefix_operator #{op}) operand: {e}))
+                let operator = tree!((prefix_operator #{op}
+                    location: {keyword}
+                    location: {m}));
+                tree!((unary_expr operator: {operator} operand: {e}))
             }
         ),
         // Do-catch → try_expr
@@ -904,7 +1098,9 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                 catch_clause: {catches})
         ),
         rule!(
-            (catchItem pattern: @pattern whereClause: (whereClause condition: @guard))
+            (catchItem
+                pattern: @pattern
+                whereClause: (whereClause condition: @guard))
             =>
             (conditional_pattern pattern: {pattern} condition: {guard})
         ),
@@ -926,23 +1122,33 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // Catch block without error binding
         rule!((catchClause body: @body) => (catch_clause body: {body})),
         // As expression (type cast) — as?, as!
-        rule!((asExpr expression: @val questionOrExclamationMark: _? @@mark type: @ty) => type_cast_expr {
+        rule!((asExpr expression: @val asKeyword: @@keyword questionOrExclamationMark: _? @@mark type: @ty) => type_cast_expr {
             let op = format!("as{}", mark.map(|m| ctx.source_text(m)).unwrap_or_default());
-            tree!((type_cast_expr expr: {val} operator: (infix_operator #{op}) type: {ty}))
+            let operator = tree!((infix_operator #{op}
+                location: {keyword}
+                location: {mark}));
+            tree!((type_cast_expr expr: {val} operator: {operator} type: {ty}))
         }),
         // Check expression (`x is T`) → type_test_expr
-        rule!((isExpr expression: @val type: @ty) => (type_test_expr expr: {val} operator: (infix_operator "is") type: {ty})),
+        rule!((isExpr expression: @val isKeyword: @@keyword type: @ty) => (type_test_expr
+            expr: {val}
+            operator: (infix_operator "is" location: {keyword})
+            type: {ty})),
         // Await expression → unary_expr with operator "await"
-        rule!((awaitExpr expression: @val) => (unary_expr operator: (prefix_operator "await") operand: {val})),
+        rule!((awaitExpr awaitKeyword: @@keyword expression: @val) => (unary_expr
+            operator: (prefix_operator "await" location: {keyword})
+            operand: {val})),
         // Force-unwrap (`x!`) → postfix unary_expr, via swift-syntax's dedicated
         // `forceUnwrapExpr` node.
-        rule!((forceUnwrapExpr expression: @e) => (unary_expr operator: (postfix_operator "!") operand: {e})),
+        rule!((forceUnwrapExpr expression: @e exclamationMark: @@mark) => (unary_expr
+            operator: (postfix_operator "!" location: {mark})
+            operand: {e})),
         // ---- Imports ----
         // An import declaration. The dotted path (a list of
-        // `importPathComponent`s) becomes a `name_expr`/`member_access_expr`
+        // `importPathComponent`s) becomes a `name_node`/`member_access_expr`
         // chain (via `member_chain`). A scoped import (`import struct Foo.Bar`)
         // has an `importKindSpecifier` and binds the last path component as a
-        // `name_pattern`; a plain import (`import Foundation`) has none and uses
+        // raw name node; a plain import (`import Foundation`) has none and uses
         // a `bulk_importing_pattern` spanning the whole declaration. Any leading
         // attributes (`@_exported`) and access modifiers (`public`) become
         // `modifier`s.
@@ -951,21 +1157,20 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                 attributes: _* @attrs
                 modifiers: _* @mods
                 importKindSpecifier: _? @@kind
-                path: (importPathComponent name: @@parts)*)
+                path: (importPathComponent name: @@parts)*) @@decl
             =>
             import_declaration {
-                let pattern = match kind {
-                    Some(_) => {
-                        let last = *parts.last().ok_or("import has no path")?;
-                        tree!((name_pattern identifier: (identifier #{last})))
-                    }
-                    None => tree!((bulk_importing_pattern)),
-                };
+                let last = *parts.last().ok_or("import has no path")?;
                 tree!((import_declaration
-                    modifier: (modifier #{kind})?
+                    modifier: [(modifier #{kind})]
                     modifier: {attrs}
                     modifier: {mods}
-                    pattern: {pattern}
+                    pattern: [
+                        (identifier #{last}) if { kind.is_some() }
+                        (named_pattern
+                            name_node: (identifier #{last})
+                            sub_pattern: (bulk_importing_pattern location: {decl}))
+                    ]
                     imported_expr: {member_chain(&mut ctx, parts)}))
             }
         ),
@@ -973,10 +1178,28 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // A leading attribute (`@objc`) or access/function/member/mutation/
         // ownership modifier (swift-syntax models each as a single `declModifier`)
         // becomes a `modifier`; its source text is the modifier spelling.
-        rule!((attribute) @m => (modifier #{m})),
-        rule!((declModifier) @m => (modifier #{m})),
-        // A `super` expression. (`self` needs no rule: swift-syntax models it as
-        // an ordinary `declReferenceExpr`, already mapped to a `name_expr`.)
+        rule!((attribute) @@m => (modifier #{m})),
+        rule!((declModifier) @@m => (modifier #{m})),
+        // Type specifiers (`inout`, `sending`, ...) are mapped to modifiers.
+        rule!((simpleTypeSpecifier) @@m => (modifier #{m})),
+        rule!((lifetimeTypeSpecifier) @@m => (modifier #{m})),
+        rule!((nonisolatedTypeSpecifier) @@m => (modifier #{m})),
+        // An attributed type is mapped to a modified type of its base type.
+        rule!(
+            (attributedType
+                specifiers: _* @specs
+                attributes: _* @attrs
+                lateSpecifiers: _* @late
+                baseType: @base)
+            =>
+            (modified_type_expr
+                modifier: {specs}
+                modifier: {attrs}
+                modifier: {late}
+                type: {base})
+        ),
+        // Preserve the `super` keyword as a dedicated expression, normally used
+        // as the base of a member access (`super.foo`).
         rule!((superExpr) => (super_expr)),
         // Type expressions. A generic type applied with explicit arguments
         // (`Set<Int>`) becomes a `generic_type_expr` whose `base` is the type
@@ -990,161 +1213,218 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                 genericArgumentClause: (genericArgumentClause arguments: (genericArgument argument: @args)*))
             =>
             (generic_type_expr
-                base: (named_type_expr name: (identifier #{name}))
+                base: (identifier #{name})
                 type_argument: {args})
         ),
         // A named type (`Int`). `identifierType.name` is the type-name token.
-        rule!((identifierType name: @@n) => (named_type_expr name: (identifier #{n}))),
+        rule!((identifierType name: @@n) => (identifier #{n})),
         // A qualified type (`Outer.Inner`, `NSString.CompareOptions`). swift-syntax
-        // nests these as `memberType` nodes; we keep the whole dotted path as the
-        // opaque `named_type_expr` name.
-        rule!((memberType) @ty => (named_type_expr name: (identifier #{ty}))),
+        // nests these as `memberType` nodes; preserve the nesting as ordinary
+        // member access, wrapped in a generic type when it has type arguments.
+        rule!(
+            (memberType
+                baseType: @base
+                name: @@name
+                genericArgumentClause: (genericArgumentClause arguments: (genericArgument argument: @args)*))
+            =>
+            (generic_type_expr
+                base: (member_access_expr base: {base} member_name_node: (identifier #{name}))
+                type_argument: {args})
+        ),
+        rule!(
+            (memberType baseType: @base name: @@name)
+            =>
+            (member_access_expr base: {base} member_name_node: (identifier #{name}))
+        ),
         // Sugared types desugar to `generic_type_expr`: `T?` -> Optional<T>,
         // `[T]` -> Array<T>, `[K: V]` -> Dictionary<K, V>.
         rule!(
             (optionalType wrappedType: @w)
             =>
-            (generic_type_expr base: (named_type_expr name: (identifier "Optional")) type_argument: {w})
+            (generic_type_expr base: (identifier "Optional") type_argument: {w})
         ),
         rule!(
             (arrayType element: @e)
             =>
-            (generic_type_expr base: (named_type_expr name: (identifier "Array")) type_argument: {e})
+            (generic_type_expr base: (identifier "Array") type_argument: {e})
         ),
         rule!(
             (dictionaryType key: @k value: @v)
             =>
-            (generic_type_expr base: (named_type_expr name: (identifier "Dictionary")) type_argument: {k} type_argument: {v})
+            (generic_type_expr base: (identifier "Dictionary") type_argument: {k} type_argument: {v})
         ),
         // A tuple type (`(Int, String)`) or function type (`(Int) -> Bool`).
         // Both hold their contents as `tupleTypeElement`s, but a tuple element
-        // maps to `tuple_type_element` while a function parameter maps to
-        // `parameter`. Each container sets `ctx.in_function_type` for its direct
-        // children (and translates them explicitly, so a nested type is
-        // translated in the right context) and the shared `tupleTypeElement`
-        // rule below reads it. An element's label (`firstName`) is optional.
+        // maps to `argument` while a function parameter maps to `parameter`.
+        // Each container sets `ctx.in_function_type` before returning its raw
+        // children, so structural interpolation translates them in the right
+        // context. The shared `tupleTypeElement` rule below reads it. An
+        // element's label (`firstName`) is optional.
         rule!(
             (tupleType elements: _* @@elems)
             =>
-            tuple_type_expr {
-                ctx.in_function_type = false;
-                let mut out = Vec::new();
-                for e in elems {
-                    out.extend(ctx.translate(e)?);
-                }
-                tree!((tuple_type_expr element: {out}))
-            }
+            (tuple_expr element: {ctx.in_function_type = false; elems})
         ),
         rule!(
             (functionType parameters: _* @@params returnClause: (returnClause type: @ret))
             =>
-            function_type_expr {
-                ctx.in_function_type = true;
-                let mut out = Vec::new();
-                for p in params {
-                    out.extend(ctx.translate(p)?);
-                }
-                tree!((function_type_expr parameter: {out} return_type: {ret}))
-            }
+            (function_expr
+                parameter: {ctx.in_function_type = true; params}
+                return_type: {ret})
         ),
         rule!(
-            (tupleTypeElement firstName: _? @@name type: @ty)
+            (tupleTypeElement
+                firstName: _? @@name
+                type: @ty)
             =>
-            tuple_type_element {
-                if ctx.in_function_type {
-                    tree!((parameter external_name: (identifier #{name})? type: {ty}))
-                } else {
-                    tree!((tuple_type_element name: (identifier #{name})? type: {ty}))
-                }
-            }
+            [
+                (parameter external_name_node: [(identifier #{name})] type: {ty})
+                    if { ctx.in_function_type }
+                (argument name_node: [(identifier #{name})] value: {ty})
+            ]
         ),
-        // Selector expression: `#selector(inner)` -- not yet supported
-        // (swift-syntax represents `#selector`/`#keyPath` and other macro
-        // expansions uniformly as a `macroExpansionExpr`).
-        rule!((macroExpansionExpr) => (unsupported_node)),
         // A nominal type's `inheritanceClause` (`: Base, Proto`) becomes a list
         // of `base_type`s, one per inherited type. Each declaration keyword
         // gets its own rule; the bodies are identical but for the keyword.
-        // Class declaration with body containing members
+        rule!(
+            (genericParameter
+                attributes: _* @attrs
+                specifier: _? @@spec
+                name: @@name
+                inheritedType: _? @bound)
+            =>
+            (type_parameter
+                modifier: {attrs}
+                modifier: [(modifier #{spec})]
+                name_node: (identifier #{name})
+                bound: {bound})
+        ),
+        rule!(
+            (genericRequirement
+                requirement: (conformanceRequirement leftType: @ty rightType: @bound))
+            =>
+            (bound_type_constraint type: {ty} bound: {bound})
+        ),
+        rule!(
+            (genericRequirement
+                requirement: (sameTypeRequirement leftType: @left rightType: @right))
+            =>
+            (equality_type_constraint left: {left} right: {right})
+        ),
+        // Class declaration with body containing members. If the class has no
+        // explicit initializer, add a (possibly dead) implicit `init`. The implicit
+        // `init` is dead when the class inherits a constructor from its base class,
+        // which we cannot check in the extractor.
         rule!(
             (classDecl
-                classKeyword: @kind
+                classKeyword: @@kind
                 modifiers: _* @mods
-                name: @name
+                name: @@name
+                genericParameterClause: (genericParameterClause
+                    parameters: _* @params
+                    genericWhereClause: (genericWhereClause requirements: _* @parameter_constraints)?)?
                 inheritanceClause: (inheritanceClause inheritedTypes: (inheritedType type: @bases)*)?
+                genericWhereClause: (genericWhereClause requirements: _* @declaration_constraints)?
                 memberBlock: (memberBlock members: _* @members))
             =>
-            (class_like_declaration
-                modifier: (modifier #{kind})
-                modifier: {mods}
-                name: (identifier #{name})
-                base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
-                member: {members})
+            class_like_declaration {
+                let implicit_initializer = implicit_parameterless_initializer(&mut ctx, &members);
+                tree!((class_like_declaration
+                    modifier: (modifier #{kind})
+                    modifier: {mods}
+                    name_node: (identifier #{name})
+                    type_parameter: {params}
+                    type_constraint: {parameter_constraints}
+                    type_constraint: {declaration_constraints}
+                    base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
+                    member: {members}
+                    member: {implicit_initializer}))
+            }
         ),
         // Enum class declaration: same as a regular class but with an enum body.
         rule!(
             (enumDecl
-                enumKeyword: @kind
+                enumKeyword: @@kind
                 modifiers: _* @mods
-                name: @name
+                name: @@name
+                genericParameterClause: (genericParameterClause
+                    parameters: _* @params
+                    genericWhereClause: (genericWhereClause requirements: _* @parameter_constraints)?)?
                 inheritanceClause: (inheritanceClause inheritedTypes: (inheritedType type: @bases)*)?
+                genericWhereClause: (genericWhereClause requirements: _* @declaration_constraints)?
                 memberBlock: (memberBlock members: _* @members))
             =>
             (class_like_declaration
                 modifier: (modifier #{kind})
                 modifier: {mods}
-                name: (identifier #{name})
+                name_node: (identifier #{name})
+                type_parameter: {params}
+                type_constraint: {parameter_constraints}
+                type_constraint: {declaration_constraints}
                 base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
                 member: {members})
         ),
-        // A `struct` declaration.
+        // A `struct` declaration, including an implicit parameter-less `init`
+        // when no explicit initializer is present.
         rule!(
             (structDecl
-                structKeyword: @kind
+                structKeyword: @@kind
                 modifiers: _* @mods
-                name: @name
+                name: @@name
+                genericParameterClause: (genericParameterClause
+                    parameters: _* @params
+                    genericWhereClause: (genericWhereClause requirements: _* @parameter_constraints)?)?
                 inheritanceClause: (inheritanceClause inheritedTypes: (inheritedType type: @bases)*)?
+                genericWhereClause: (genericWhereClause requirements: _* @declaration_constraints)?
                 memberBlock: (memberBlock members: _* @members))
             =>
-            (class_like_declaration
-                modifier: (modifier #{kind})
-                modifier: {mods}
-                name: (identifier #{name})
-                base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
-                member: {members})
+            class_like_declaration {
+                let implicit_initializer = implicit_parameterless_initializer(&mut ctx, &members);
+                tree!((class_like_declaration
+                    modifier: (modifier #{kind})
+                    modifier: {mods}
+                    name_node: (identifier #{name})
+                    type_parameter: {params}
+                    type_constraint: {parameter_constraints}
+                    type_constraint: {declaration_constraints}
+                    base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
+                    member: {members}
+                    member: {implicit_initializer}))
+            }
         ),
         // Protocol declaration
         rule!(
             (protocolDecl
-                protocolKeyword: @kind
+                protocolKeyword: @@kind
                 modifiers: _* @mods
-                name: @name
+                name: @@name
+                genericParameterClause: (genericParameterClause parameters: _* @params)?
                 inheritanceClause: (inheritanceClause inheritedTypes: (inheritedType type: @bases)*)?
+                genericWhereClause: (genericWhereClause requirements: _* @declaration_constraints)?
                 memberBlock: (memberBlock members: _* @members))
             =>
             (class_like_declaration
                 modifier: (modifier #{kind})
                 modifier: {mods}
-                name: (identifier #{name})
+                name_node: (identifier #{name})
+                type_parameter: {params}
+                type_constraint: {declaration_constraints}
                 base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
                 member: {members})
         ),
-        // An `extension Foo { … }` is likewise a `class_like_declaration`, named
-        // by the extended type. The extended type is captured opaquely (as its
-        // source text) so that qualified names (`extension String.Interpolation`,
-        // a `memberType`) name the declaration just like simple ones.
+        // An `extension Foo.Bar { … }` is likewise a `class_like_declaration`.
         rule!(
             (extensionDecl
-                extensionKeyword: @kind
+                extensionKeyword: @@kind
                 modifiers: _* @mods
-                extendedType: @@name
+                extendedType: @extendedType
                 inheritanceClause: (inheritanceClause inheritedTypes: (inheritedType type: @bases)*)?
                 memberBlock: (memberBlock members: _* @members))
             =>
             (class_like_declaration
                 modifier: (modifier #{kind})
                 modifier: {mods}
-                name: (identifier #{name})
+                extension_target: {extendedType}
                 base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
                 member: {members})
         ),
@@ -1155,36 +1435,53 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // nest under `signature` (as for `functionDecl`).
         rule!(
             (initializerDecl
+                initKeyword: @@initK
                 modifiers: _* @mods
                 signature: (functionSignature
                     parameterClause: (functionParameterClause parameters: _* @params))
-                body: (codeBlock statements: _* @body_stmts)?)
+                body: (codeBlock) @body)
             =>
             (constructor_declaration
                 modifier: {mods}
+                name_node: (identifier #{initK})
                 parameter: {params}
-                body: (block stmt: {body_stmts}))
+                body: {body})
+        ),
+        rule!(
+            (initializerDecl
+                initKeyword: @@initK
+                modifiers: _* @mods
+                signature: (functionSignature
+                    parameterClause: (functionParameterClause parameters: _* @params)))
+            =>
+            (constructor_declaration
+                modifier: {mods}
+                name_node: (identifier #{initK})
+                parameter: {params}
+                body: (block))
         ),
         // Deinit declaration → destructor_declaration. Body statements optional.
         rule!(
             (deinitializerDecl
                 modifiers: _* @mods
-                body: (codeBlock statements: _* @body_stmts))
+                body: (codeBlock) @body)
             =>
             (destructor_declaration
                 modifier: {mods}
-                body: (block stmt: {body_stmts}))
+                body: {body})
         ),
         // Typealias declaration
         rule!(
             (typeAliasDecl
                 modifiers: _* @mods
                 name: @@name
+                genericParameterClause: (genericParameterClause parameters: _* @type_params)?
                 initializer: (typeInitializerClause value: @val))
             =>
             (type_alias_declaration
                 modifier: {mods}
-                name: (identifier #{name})
+                name_node: (identifier #{name})
+                type_parameter: {type_params}
                 r#type: {val})
         ),
         // Associated type declaration (with optional bound)
@@ -1196,28 +1493,71 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
             =>
             (associated_type_declaration
                 modifier: {mods}
-                name: (identifier #{name})
+                name_node: (identifier #{name})
                 bound: {bound})
         ),
-        // ---- Fallbacks ----
-        // Bare `_` (rather than `(_)`) so this matches both named nodes
-        // and unnamed tokens. Any unnamed token that escapes the
-        // input-schema-specific rules (e.g. captured operators in
-        // `additive_expression op: @op`) has its auto-translated value
-        // replaced with an `unsupported_node` whose source range is
-        // inherited from the original token, so `#{op}` still reads the
-        // original text.
-        rule!(
-            _
-            =>
-            (unsupported_node)
+        // ---- Explicitly unsupported roots ----
+        // These kinds can reach translation independently, but we do not
+        // currently map them to the unified AST. Syntax nested inside one of
+        // these roots is discarded with its parent and needs no separate rule.
+        // Explicit empty content preserves their existing representation
+        // instead of inheriting the matched source text.
+        rule!((actorDecl) => (unsupported_node "")),
+        rule!((borrowExpr) => (unsupported_node "")),
+        rule!((classRestrictionType) => (unsupported_node "")),
+        rule!((compositionType) => (unsupported_node "")),
+        rule!((consumeExpr) => (unsupported_node "")),
+        rule!((copyExpr) => (unsupported_node "")),
+        rule!((discardStmt) => (unsupported_node "")),
+        rule!((fallThroughStmt) => (unsupported_node "")),
+        rule!((ifConfigDecl) => (unsupported_node "")),
+        rule!((implicitlyUnwrappedOptionalType) => (unsupported_node "")),
+        rule!((inlineArrayType) => (unsupported_node "")),
+        rule!((keyPathExpr) => (unsupported_node "")),
+        rule!((macroDecl) => (unsupported_node "")),
+        rule!((metatypeType) => (unsupported_node "")),
+        rule!((namedOpaqueReturnType) => (unsupported_node "")),
+        rule!((operatorDecl) => (unsupported_node "")),
+        rule!((packElementExpr) => (unsupported_node "")),
+        rule!((packElementType) => (unsupported_node "")),
+        rule!((packExpansionExpr) => (unsupported_node "")),
+        rule!((packExpansionType) => (unsupported_node "")),
+        rule!((postfixIfConfigExpr) => (unsupported_node "")),
+        rule!((poundSourceLocation) => (unsupported_node "")),
+        rule!((precedenceGroupDecl) => (unsupported_node "")),
+        rule!((someOrAnyType) => (unsupported_node "")),
+        rule!((subscriptDecl) => (unsupported_node "")),
+        rule!((suppressedType) => (unsupported_node "")),
+        rule!((typeExpr) => (unsupported_node "")),
+        rule!((unsafeExpr) => (unsupported_node "")),
+        rule!((yieldStmt) => (unsupported_node "")),
+        // Anything reaching this final generic handler has neither a
+        // dedicated rule nor an explicit unsupported entry.
+        rule!(
+            _ @@node
+            =>
+            unhandled_node {
+                let input = ctx
+                    .ast()
+                    .get_node(node)
+                    .expect("matched node must exist");
+                tracing::error!(
+                    target: "unified_extractor",
+                    node_kind = input.kind_name(),
+                    source_range = ?input.source_range(),
+                    "Unhandled Swift syntax node reached translation"
+                );
+                tree!((unhandled_node))
+            }
         ),
-    ]
+        ]
+    }
 }
 
 pub fn language_spec(desugared_ast_schema: &'static str) -> desugaring::LanguageSpec {
     let config = DesugaringConfig::<SwiftContext>::new()
-        .add_phase("translate", PhaseKind::OneShot, translation_rules())
+        .with_ignored_location_fields(["trailingComma"])
+        .add_phase("translate", translation_rules())
         .with_output_node_types_yaml(desugared_ast_schema);
     let desugarer =
         ConcreteDesugarer::without_language(config).expect("failed to build Swift desugarer");
diff --git a/unified/extractor/swift_node_types.yml b/unified/extractor/swift_node_types.yml
index c98dd1d33b23..88214ea2c0dc 100644
--- a/unified/extractor/swift_node_types.yml
+++ b/unified/extractor/swift_node_types.yml
@@ -1,3 +1,5 @@
+# GENERATED from swift-syntax by unified/swift-syntax-rs/schemagen.
+# Do not edit; run unified/scripts/regenerate-node-types.sh instead.
 supertypes:
   decl:
     - accessorDecl
@@ -271,7 +273,7 @@ named:
     endOfFileToken: _token
   accessorDecl:
     attributes*: [attribute, ifConfigDecl]
-    modifier?: declModifier
+    modifiers*: declModifier
     accessorSpecifier: _token
     parameters?: accessorParameters
     effectSpecifiers?: accessorEffectSpecifiers
diff --git a/unified/extractor/tests/corpus/swift/closures/closure-with-capture-list.output b/unified/extractor/tests/corpus/swift/closures/closure-with-capture-list.output
index 6833344de16d..573498825bc0 100644
--- a/unified/extractor/tests/corpus/swift/closures/closure-with-capture-list.output
+++ b/unified/extractor/tests/corpus/swift/closures/closure-with-capture-list.output
@@ -60,30 +60,25 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "f"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "f" source="f"
           value:
-            function_expr
+            function_expr source="{ [⟨capture_declaration⟩] in ⟨body⟩ }"
               capture_declaration:
-                variable_declaration
-                  modifier: modifier "weak"
-                  pattern:
-                    name_pattern
-                      identifier: identifier "self"
+                variable_declaration source="⟨modifier⟩ ⟨pattern⟩⟨value⟩"
+                  modifier: modifier "weak" source="weak"
+                  pattern: identifier "self" source="self"
+                  value: identifier "self" source="self"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    call_expr
+                    call_expr source="⟨callee⟩()"
                       callee:
-                        member_access_expr
-                          base:
-                            name_expr
-                              identifier: identifier "self"
-                          member: identifier "doThing"
+                        member_access_expr source="⟨base⟩?.⟨member_name_node⟩"
+                          base: identifier "self" source="self"
+                          member_name_node: identifier "doThing" source="doThing"
diff --git a/unified/extractor/tests/corpus/swift/closures/closure-with-explicit-parameters.output b/unified/extractor/tests/corpus/swift/closures/closure-with-explicit-parameters.output
index c20da77c72cb..786e7d7fb4ee 100644
--- a/unified/extractor/tests/corpus/swift/closures/closure-with-explicit-parameters.output
+++ b/unified/extractor/tests/corpus/swift/closures/closure-with-explicit-parameters.output
@@ -62,34 +62,24 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "f"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "f" source="f"
           value:
-            function_expr
+            function_expr source="{ (⟨parameter⟩) -> ⟨return_type⟩ in ⟨body⟩ }"
               parameter:
-                parameter
-                  type:
-                    named_type_expr
-                      name: identifier "Int"
-                  pattern:
-                    name_pattern
-                      identifier: identifier "x"
-              return_type:
-                named_type_expr
-                  name: identifier "Int"
+                parameter source="⟨pattern⟩: ⟨type⟩"
+                  type: identifier "Int" source="Int"
+                  pattern: identifier "x" source="x"
+              return_type: identifier "Int" source="Int"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    binary_expr
-                      left:
-                        name_expr
-                          identifier: identifier "x"
-                      operator: infix_operator "*"
-                      right: int_literal "2"
+                    binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                      left: identifier "x" source="x"
+                      operator: infix_operator "*" source="*"
+                      right: int_literal "2" source="2"
diff --git a/unified/extractor/tests/corpus/swift/closures/closure-with-shorthand-parameters.output b/unified/extractor/tests/corpus/swift/closures/closure-with-shorthand-parameters.output
index 1b07604e02c5..3e30fac78c01 100644
--- a/unified/extractor/tests/corpus/swift/closures/closure-with-shorthand-parameters.output
+++ b/unified/extractor/tests/corpus/swift/closures/closure-with-shorthand-parameters.output
@@ -39,25 +39,19 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "f"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "f" source="f"
           value:
-            function_expr
+            function_expr source="{ ⟨body⟩ }"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    binary_expr
-                      left:
-                        name_expr
-                          identifier: identifier "$0"
-                      operator: infix_operator "+"
-                      right:
-                        name_expr
-                          identifier: identifier "$1"
+                    binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                      left: identifier "$0" source="$0"
+                      operator: infix_operator "+" source="+"
+                      right: identifier "$1" source="$1"
diff --git a/unified/extractor/tests/corpus/swift/closures/multi-statement-closure.output b/unified/extractor/tests/corpus/swift/closures/multi-statement-closure.output
index 4fbc1c8f71f0..f9c054aa0b96 100644
--- a/unified/extractor/tests/corpus/swift/closures/multi-statement-closure.output
+++ b/unified/extractor/tests/corpus/swift/closures/multi-statement-closure.output
@@ -93,48 +93,34 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "f"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "f" source="f"
           value:
-            function_expr
+            function_expr source="{ (⟨parameter⟩) -> ⟨return_type⟩ in\n  ⟨body⟩\n}"
               parameter:
-                parameter
-                  type:
-                    named_type_expr
-                      name: identifier "Int"
-                  pattern:
-                    name_pattern
-                      identifier: identifier "x"
-              return_type:
-                named_type_expr
-                  name: identifier "Int"
+                parameter source="⟨pattern⟩: ⟨type⟩"
+                  type: identifier "Int" source="Int"
+                  pattern: identifier "x" source="x"
+              return_type: identifier "Int" source="Int"
               body:
-                block
+                block source="⟨stmt⟩\n  ⟨stmt⟩"
                   stmt:
-                    variable_declaration
-                      modifier: modifier "let"
-                      pattern:
-                        name_pattern
-                          identifier: identifier "y"
+                    variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+                      modifier: modifier "let" source="let"
+                      pattern: identifier "y" source="y"
                       value:
-                        binary_expr
-                          left:
-                            name_expr
-                              identifier: identifier "x"
-                          operator: infix_operator "+"
-                          right: int_literal "1"
-                    return_expr
+                        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                          left: identifier "x" source="x"
+                          operator: infix_operator "+" source="+"
+                          right: int_literal "1" source="1"
+                    return_expr source="return ⟨value⟩"
                       value:
-                        binary_expr
-                          left:
-                            name_expr
-                              identifier: identifier "y"
-                          operator: infix_operator "*"
-                          right: int_literal "2"
+                        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                          left: identifier "y" source="y"
+                          operator: infix_operator "*" source="*"
+                          right: int_literal "2" source="2"
diff --git a/unified/extractor/tests/corpus/swift/closures/nested-trailing-closure.output b/unified/extractor/tests/corpus/swift/closures/nested-trailing-closure.output
new file mode 100644
index 000000000000..a8594a175bac
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/closures/nested-trailing-closure.output
@@ -0,0 +1,76 @@
+print(xs.map { $0 * 2 })
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        functionCallExpr
+          leftParen: (
+          rightParen: )
+          arguments:
+            labeledExpr
+              expression:
+                functionCallExpr
+                  arguments:
+                  additionalTrailingClosures:
+                  calledExpression:
+                    memberAccessExpr
+                      period: .
+                      declName:
+                        declReferenceExpr
+                          baseName: identifier "map"
+                      base:
+                        declReferenceExpr
+                          baseName: identifier "xs"
+                  trailingClosure:
+                    closureExpr
+                      leftBrace: {
+                      rightBrace: }
+                      statements:
+                        codeBlockItem
+                          item:
+                            infixOperatorExpr
+                              operator:
+                                binaryOperatorExpr
+                                  operator: binaryOperator "*"
+                              leftOperand:
+                                declReferenceExpr
+                                  baseName: dollarIdentifier "$0"
+                              rightOperand:
+                                integerLiteralExpr
+                                  literal: integerLiteral "2"
+          additionalTrailingClosures:
+          calledExpression:
+            declReferenceExpr
+              baseName: identifier "print"
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩"
+      stmt:
+        call_expr source="⟨callee⟩(⟨argument⟩)"
+          callee: identifier "print" source="print"
+          argument:
+            argument source="⟨value⟩"
+              value:
+                call_expr source="⟨callee⟩ ⟨argument⟩"
+                  callee:
+                    member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                      base: identifier "xs" source="xs"
+                      member_name_node: identifier "map" source="map"
+                  argument:
+                    argument source="⟨value⟩"
+                      value:
+                        function_expr source="{ ⟨body⟩ }"
+                          body:
+                            block source="⟨stmt⟩"
+                              stmt:
+                                binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                                  left: identifier "$0" source="$0"
+                                  operator: infix_operator "*" source="*"
+                                  right: int_literal "2" source="2"
diff --git a/unified/extractor/tests/corpus/swift/closures/nested-trailing-closure.swift b/unified/extractor/tests/corpus/swift/closures/nested-trailing-closure.swift
new file mode 100644
index 000000000000..b129e1fba835
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/closures/nested-trailing-closure.swift
@@ -0,0 +1 @@
+print(xs.map { $0 * 2 })
diff --git a/unified/extractor/tests/corpus/swift/closures/trailing-closure.output b/unified/extractor/tests/corpus/swift/closures/trailing-closure.output
index 3e26ff27eb58..c50bbde02dcc 100644
--- a/unified/extractor/tests/corpus/swift/closures/trailing-closure.output
+++ b/unified/extractor/tests/corpus/swift/closures/trailing-closure.output
@@ -39,27 +39,23 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        call_expr
+        call_expr source="⟨callee⟩ ⟨argument⟩"
           callee:
-            member_access_expr
-              base:
-                name_expr
-                  identifier: identifier "xs"
-              member: identifier "map"
+            member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+              base: identifier "xs" source="xs"
+              member_name_node: identifier "map" source="map"
           argument:
-            argument
+            argument source="⟨value⟩"
               value:
-                function_expr
+                function_expr source="{ ⟨body⟩ }"
                   body:
-                    block
+                    block source="⟨stmt⟩"
                       stmt:
-                        binary_expr
-                          left:
-                            name_expr
-                              identifier: identifier "$0"
-                          operator: infix_operator "*"
-                          right: int_literal "2"
+                        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                          left: identifier "$0" source="$0"
+                          operator: infix_operator "*" source="*"
+                          right: int_literal "2" source="2"
diff --git a/unified/extractor/tests/corpus/swift/collections/array-literal.output b/unified/extractor/tests/corpus/swift/collections/array-literal.output
index c6ea2c2094fa..51c65ac2a0f0 100644
--- a/unified/extractor/tests/corpus/swift/collections/array-literal.output
+++ b/unified/extractor/tests/corpus/swift/collections/array-literal.output
@@ -41,18 +41,16 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "xs"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "xs" source="xs"
           value:
-            array_literal
+            array_literal source="[⟨element⟩, ⟨element⟩, ⟨element⟩]"
               element:
-                int_literal "1"
-                int_literal "2"
-                int_literal "3"
+                int_literal "1" source="1"
+                int_literal "2" source="2"
+                int_literal "3" source="3"
diff --git a/unified/extractor/tests/corpus/swift/collections/dictionary-literal.output b/unified/extractor/tests/corpus/swift/collections/dictionary-literal.output
index edd306a69cbd..b94bae665654 100644
--- a/unified/extractor/tests/corpus/swift/collections/dictionary-literal.output
+++ b/unified/extractor/tests/corpus/swift/collections/dictionary-literal.output
@@ -1,10 +1,51 @@
-let d = ["a": 1, "b": 2]
+let key = "a"
+let value = 1
+let d = [key: value, "b": 2]
+let empty: [String: Int] = [:]
 
 ---
 
 sourceFile
   endOfFileToken: endOfFile
   statements:
+    codeBlockItem
+      item:
+        variableDecl
+          attributes:
+          modifiers:
+          bindingSpecifier: let
+          bindings:
+            patternBinding
+              initializer:
+                initializerClause
+                  equal: =
+                  value:
+                    stringLiteralExpr
+                      closingQuote: "
+                      openingQuote: "
+                      segments:
+                        stringSegment
+                          content: stringSegment "a"
+              pattern:
+                identifierPattern
+                  identifier: identifier "key"
+    codeBlockItem
+      item:
+        variableDecl
+          attributes:
+          modifiers:
+          bindingSpecifier: let
+          bindings:
+            patternBinding
+              initializer:
+                initializerClause
+                  equal: =
+                  value:
+                    integerLiteralExpr
+                      literal: integerLiteral "1"
+              pattern:
+                identifierPattern
+                  identifier: identifier "value"
     codeBlockItem
       item:
         variableDecl
@@ -25,15 +66,11 @@ sourceFile
                           colon: :
                           trailingComma: ,
                           value:
-                            integerLiteralExpr
-                              literal: integerLiteral "1"
+                            declReferenceExpr
+                              baseName: identifier "value"
                           key:
-                            stringLiteralExpr
-                              closingQuote: "
-                              openingQuote: "
-                              segments:
-                                stringSegment
-                                  content: stringSegment "a"
+                            declReferenceExpr
+                              baseName: identifier "key"
                         dictionaryElement
                           colon: :
                           value:
@@ -49,16 +86,73 @@ sourceFile
               pattern:
                 identifierPattern
                   identifier: identifier "d"
+    codeBlockItem
+      item:
+        variableDecl
+          attributes:
+          modifiers:
+          bindingSpecifier: let
+          bindings:
+            patternBinding
+              initializer:
+                initializerClause
+                  equal: =
+                  value:
+                    dictionaryExpr
+                      leftSquare: [
+                      rightSquare: ]
+                      content: :
+              pattern:
+                identifierPattern
+                  identifier: identifier "empty"
+              typeAnnotation:
+                typeAnnotation
+                  colon: :
+                  type:
+                    dictionaryType
+                      colon: :
+                      leftSquare: [
+                      rightSquare: ]
+                      value:
+                        identifierType
+                          name: identifier "Int"
+                      key:
+                        identifierType
+                          name: identifier "String"
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩\n⟨stmt⟩\n⟨stmt⟩\n⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "d"
-          value: map_literal "[\"a\": 1, \"b\": 2]"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "key" source="key"
+          value: string_literal "\"a\"" source="\"a\""
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "value" source="value"
+          value: int_literal "1" source="1"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "d" source="d"
+          value:
+            map_literal source="[⟨element⟩, ⟨element⟩]"
+              element:
+                key_value_pair source="⟨key⟩: ⟨value⟩"
+                  key: identifier "key" source="key"
+                  value: identifier "value" source="value"
+                key_value_pair source="⟨key⟩: ⟨value⟩"
+                  key: string_literal "\"b\"" source="\"b\""
+                  value: int_literal "2" source="2"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "empty" source="empty"
+          type:
+            generic_type_expr source="[⟨type_argument⟩: ⟨type_argument⟩]"
+              base: identifier "Dictionary" source=""
+              type_argument:
+                identifier "String" source="String"
+                identifier "Int" source="Int"
+          value: map_literal "[:]" source="[:]"
diff --git a/unified/extractor/tests/corpus/swift/collections/dictionary-literal.swift b/unified/extractor/tests/corpus/swift/collections/dictionary-literal.swift
index 1b9eb5ebe2c4..7f3d9ad7daec 100644
--- a/unified/extractor/tests/corpus/swift/collections/dictionary-literal.swift
+++ b/unified/extractor/tests/corpus/swift/collections/dictionary-literal.swift
@@ -1 +1,4 @@
-let d = ["a": 1, "b": 2]
+let key = "a"
+let value = 1
+let d = [key: value, "b": 2]
+let empty: [String: Int] = [:]
diff --git a/unified/extractor/tests/corpus/swift/collections/dictionary-subscript.output b/unified/extractor/tests/corpus/swift/collections/dictionary-subscript.output
index e2f939e0683c..b7719365bbc6 100644
--- a/unified/extractor/tests/corpus/swift/collections/dictionary-subscript.output
+++ b/unified/extractor/tests/corpus/swift/collections/dictionary-subscript.output
@@ -41,20 +41,16 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "v"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "v" source="v"
           value:
-            call_expr
-              callee:
-                name_expr
-                  identifier: identifier "d"
+            call_expr source="⟨callee⟩[⟨argument⟩]"
+              callee: identifier "d" source="d"
               argument:
-                argument
-                  value: string_literal "\"key\""
+                argument source="⟨value⟩"
+                  value: string_literal "\"key\"" source="\"key\""
diff --git a/unified/extractor/tests/corpus/swift/collections/empty-array-literal-with-type.output b/unified/extractor/tests/corpus/swift/collections/empty-array-literal-with-type.output
index e9a70a43bb42..9e05ecaab626 100644
--- a/unified/extractor/tests/corpus/swift/collections/empty-array-literal-with-type.output
+++ b/unified/extractor/tests/corpus/swift/collections/empty-array-literal-with-type.output
@@ -37,21 +37,15 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "xs"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "xs" source="xs"
           type:
-            generic_type_expr
-              base:
-                named_type_expr
-                  name: identifier "Array"
-              type_argument:
-                named_type_expr
-                  name: identifier "Int"
-          value: array_literal "[]"
+            generic_type_expr source="[⟨type_argument⟩]"
+              base: identifier "Array" source=""
+              type_argument: identifier "Int" source="Int"
+          value: array_literal "[]" source="[]"
diff --git a/unified/extractor/tests/corpus/swift/collections/set-literal.output b/unified/extractor/tests/corpus/swift/collections/set-literal.output
index a06670231ebb..97cf2cf6a72a 100644
--- a/unified/extractor/tests/corpus/swift/collections/set-literal.output
+++ b/unified/extractor/tests/corpus/swift/collections/set-literal.output
@@ -56,26 +56,20 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "s"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "s" source="s"
           type:
-            generic_type_expr
-              base:
-                named_type_expr
-                  name: identifier "Set"
-              type_argument:
-                named_type_expr
-                  name: identifier "Int"
+            generic_type_expr source="⟨base⟩<⟨type_argument⟩>"
+              base: identifier "Set" source="Set"
+              type_argument: identifier "Int" source="Int"
           value:
-            array_literal
+            array_literal source="[⟨element⟩, ⟨element⟩, ⟨element⟩]"
               element:
-                int_literal "1"
-                int_literal "2"
-                int_literal "3"
+                int_literal "1" source="1"
+                int_literal "2" source="2"
+                int_literal "3" source="3"
diff --git a/unified/extractor/tests/corpus/swift/collections/subscript-access.output b/unified/extractor/tests/corpus/swift/collections/subscript-access.output
index ec24f0c1f1df..771004ff717f 100644
--- a/unified/extractor/tests/corpus/swift/collections/subscript-access.output
+++ b/unified/extractor/tests/corpus/swift/collections/subscript-access.output
@@ -38,20 +38,16 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "first"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "first" source="first"
           value:
-            call_expr
-              callee:
-                name_expr
-                  identifier: identifier "xs"
+            call_expr source="⟨callee⟩[⟨argument⟩]"
+              callee: identifier "xs" source="xs"
               argument:
-                argument
-                  value: int_literal "0"
+                argument source="⟨value⟩"
+                  value: int_literal "0" source="0"
diff --git a/unified/extractor/tests/corpus/swift/collections/tuple-literal.output b/unified/extractor/tests/corpus/swift/collections/tuple-literal.output
index facbc2fcbb45..51088efb6750 100644
--- a/unified/extractor/tests/corpus/swift/collections/tuple-literal.output
+++ b/unified/extractor/tests/corpus/swift/collections/tuple-literal.output
@@ -45,13 +45,19 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "t"
-          value: tuple_expr "(1, \"two\", 3.0)"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "t" source="t"
+          value:
+            tuple_expr source="(⟨element⟩, ⟨element⟩, ⟨element⟩)"
+              element:
+                argument source="⟨value⟩"
+                  value: int_literal "1" source="1"
+                argument source="⟨value⟩"
+                  value: string_literal "\"two\"" source="\"two\""
+                argument source="⟨value⟩"
+                  value: float_literal "3.0" source="3.0"
diff --git a/unified/extractor/tests/corpus/swift/collections/tuple-member-access.output b/unified/extractor/tests/corpus/swift/collections/tuple-member-access.output
index 6ecbd22eebe0..d5eb860a528e 100644
--- a/unified/extractor/tests/corpus/swift/collections/tuple-member-access.output
+++ b/unified/extractor/tests/corpus/swift/collections/tuple-member-access.output
@@ -31,18 +31,14 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "n"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "n" source="n"
           value:
-            member_access_expr
-              base:
-                name_expr
-                  identifier: identifier "t"
-              member: identifier "0"
+            member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+              base: identifier "t" source="t"
+              member_name_node: identifier "0" source="0"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/binding-modifier-does-not-leak-to-sibling.output b/unified/extractor/tests/corpus/swift/control-flow/binding-modifier-does-not-leak-to-sibling.output
index 800647eb7474..73c3312ea09e 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/binding-modifier-does-not-leak-to-sibling.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/binding-modifier-does-not-leak-to-sibling.output
@@ -84,38 +84,28 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩\n⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "x"
-          value: int_literal "1"
-        switch_expr
-          value:
-            name_expr
-              identifier: identifier "y"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "x" source="x"
+          value: int_literal "1" source="1"
+        switch_expr source="switch ⟨value⟩ {\n⟨case⟩\n⟨case⟩\n}"
+          value: identifier "y" source="y"
           case:
-            switch_case
-              pattern:
-                expr_equality_pattern
-                  expr:
-                    name_expr
-                      identifier: identifier "someConstant"
+            switch_case source="case ⟨pattern⟩:\n  ⟨body⟩"
+              pattern: identifier "someConstant" source="someConstant"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value: string_literal "\"matched\""
-            switch_case
+                        argument source="⟨value⟩"
+                          value: string_literal "\"matched\"" source="\"matched\""
+            switch_case source="default:\n  ⟨body⟩"
               body:
-                block
-                  stmt: break_expr "break"
+                block source="⟨stmt⟩"
+                  stmt: break_expr "break" source="break"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/defer-statement.output b/unified/extractor/tests/corpus/swift/control-flow/defer-statement.output
index 6e8ec9ae3b9a..52d2ad2696b8 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/defer-statement.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/defer-statement.output
@@ -62,8 +62,8 @@ sourceFile
                       calledExpression:
                         declReferenceExpr
                           baseName: identifier "print"
-          name: identifier "withCleanup"
           modifiers:
+          name: identifier "withCleanup"
           signature:
             functionSignature
               parameterClause:
@@ -75,20 +75,26 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "withCleanup"
+        function_declaration source="func ⟨name_node⟩() ⟨body⟩"
+          name_node: identifier "withCleanup" source="withCleanup"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n  ⟨stmt⟩\n}"
               stmt:
-                unsupported_node "defer { print(\"cleanup\") }"
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "print"
+                defer_stmt source="defer ⟨body⟩"
+                  body:
+                    block source="{ ⟨stmt⟩ }"
+                      stmt:
+                        call_expr source="⟨callee⟩(⟨argument⟩)"
+                          callee: identifier "print" source="print"
+                          argument:
+                            argument source="⟨value⟩"
+                              value: string_literal "\"cleanup\"" source="\"cleanup\""
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
                   argument:
-                    argument
-                      value: string_literal "\"work\""
+                    argument source="⟨value⟩"
+                      value: string_literal "\"work\"" source="\"work\""
diff --git a/unified/extractor/tests/corpus/swift/control-flow/discard-statement.output b/unified/extractor/tests/corpus/swift/control-flow/discard-statement.output
index 7e0eac29c0fc..50628cfc354b 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/discard-statement.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/discard-statement.output
@@ -13,6 +13,7 @@ sourceFile
       item:
         structDecl
           attributes:
+          modifiers:
           name: identifier "Resource"
           inheritanceClause:
             inheritanceClause
@@ -46,10 +47,10 @@ sourceFile
                                     declReferenceExpr
                                       baseName: self
                                   discardKeyword: discard
-                      name: identifier "close"
                       modifiers:
                         declModifier
                           name: consuming
+                      name: identifier "close"
                       signature:
                         functionSignature
                           parameterClause:
@@ -58,24 +59,28 @@ sourceFile
                               rightParen: )
                               parameters:
                       funcKeyword: func
-          modifiers:
           structKeyword: struct
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "struct"
-          name: identifier "Resource"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨base_type⟩ {\n  ⟨member⟩\n}"
+          modifier: modifier "struct" source="struct"
+          name_node: identifier "Resource" source="Resource"
           base_type:
-            base_type
-              type: unsupported_node "~Copyable"
+            base_type source="⟨type⟩"
+              type: unsupported_node "~Copyable" source="~Copyable"
           member:
-            function_declaration
-              name: identifier "close"
+            function_declaration source="⟨modifier⟩ func ⟨name_node⟩() ⟨body⟩"
+              modifier: modifier "consuming" source="consuming"
+              name_node: identifier "close" source="close"
               body:
-                block
-                  stmt: unsupported_node "discard self"
+                block source="{\n    ⟨stmt⟩\n  }"
+                  stmt: unsupported_node "discard self" source="discard self"
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/control-flow/fallthrough.output b/unified/extractor/tests/corpus/swift/control-flow/fallthrough.output
index 9cfe81048402..d66f8c856e02 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/fallthrough.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/fallthrough.output
@@ -60,8 +60,8 @@ sourceFile
                             declReferenceExpr
                               baseName: identifier "x"
                           switchKeyword: switch
-          name: identifier "classify"
           modifiers:
+          name: identifier "classify"
           signature:
             functionSignature
               parameterClause:
@@ -82,37 +82,29 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "classify"
+        function_declaration source="func ⟨name_node⟩(⟨parameter⟩) ⟨body⟩"
+          name_node: identifier "classify" source="classify"
           parameter:
-            parameter
-              external_name: identifier "_"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-              pattern:
-                name_pattern
-                  identifier: identifier "x"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type: identifier "Int" source="Int"
+              pattern: identifier "x" source="x"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                switch_expr
-                  value:
-                    name_expr
-                      identifier: identifier "x"
+                switch_expr source="switch ⟨value⟩ {\n  ⟨case⟩\n  ⟨case⟩\n  }"
+                  value: identifier "x" source="x"
                   case:
-                    switch_case
-                      pattern:
-                        expr_equality_pattern
-                          expr: int_literal "1"
+                    switch_case source="case ⟨pattern⟩:\n    ⟨body⟩"
+                      pattern: int_literal "1" source="1"
                       body:
-                        block
-                          stmt: unsupported_node "fallthrough"
-                    switch_case
+                        block source="⟨stmt⟩"
+                          stmt: unsupported_node "fallthrough" source="fallthrough"
+                    switch_case source="default:\n    ⟨body⟩"
                       body:
-                        block
-                          stmt: break_expr "break"
+                        block source="⟨stmt⟩"
+                          stmt: break_expr "break" source="break"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/guard-let-pattern.output b/unified/extractor/tests/corpus/swift/control-flow/guard-let-pattern.output
new file mode 100644
index 000000000000..16e1228cdd5f
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/control-flow/guard-let-pattern.output
@@ -0,0 +1,86 @@
+guard let (call, thread) = optional else {
+  return
+}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        guardStmt
+          body:
+            codeBlock
+              leftBrace: {
+              rightBrace: }
+              statements:
+                codeBlockItem
+                  item:
+                    returnStmt
+                      returnKeyword: return
+          conditions:
+            conditionElement
+              condition:
+                optionalBindingCondition
+                  initializer:
+                    initializerClause
+                      equal: =
+                      value:
+                        declReferenceExpr
+                          baseName: identifier "optional"
+                  pattern:
+                    expressionPattern
+                      expression:
+                        tupleExpr
+                          leftParen: (
+                          rightParen: )
+                          elements:
+                            labeledExpr
+                              expression:
+                                patternExpr
+                                  pattern:
+                                    identifierPattern
+                                      identifier: identifier "call"
+                              trailingComma: ,
+                            labeledExpr
+                              expression:
+                                patternExpr
+                                  pattern:
+                                    identifierPattern
+                                      identifier: identifier "thread"
+                  bindingSpecifier: let
+          elseKeyword: else
+          guardKeyword: guard
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩"
+      stmt:
+        guard_if_stmt source="guard ⟨condition⟩ else ⟨else⟩"
+          condition:
+            pattern_guard_expr source="⟨pattern⟩ = ⟨value⟩"
+              pattern:
+                call_expr source="⟨argument⟩"
+                  callee:
+                    member_access_expr source=""
+                      base: identifier "Optional" source=""
+                      member_name_node: identifier "some" source=""
+                  argument:
+                    argument source="⟨value⟩"
+                      value:
+                        expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                          modifier: modifier "let" source="let"
+                          expr:
+                            tuple_expr source="(⟨element⟩, ⟨element⟩)"
+                              element:
+                                argument source="⟨value⟩"
+                                  value: identifier "call" source="call"
+                                argument source="⟨value⟩"
+                                  value: identifier "thread" source="thread"
+              value: identifier "optional" source="optional"
+          else:
+            block source="{\n  ⟨stmt⟩\n}"
+              stmt: return_expr "return" source="return"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/guard-let-pattern.swift b/unified/extractor/tests/corpus/swift/control-flow/guard-let-pattern.swift
new file mode 100644
index 000000000000..adb99f174f0d
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/control-flow/guard-let-pattern.swift
@@ -0,0 +1,3 @@
+guard let (call, thread) = optional else {
+  return
+}
diff --git a/unified/extractor/tests/corpus/swift/control-flow/guard-let-shorthand.output b/unified/extractor/tests/corpus/swift/control-flow/guard-let-shorthand.output
new file mode 100644
index 000000000000..34e3dd03982a
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/control-flow/guard-let-shorthand.output
@@ -0,0 +1,55 @@
+guard let value else { return }
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        guardStmt
+          body:
+            codeBlock
+              leftBrace: {
+              rightBrace: }
+              statements:
+                codeBlockItem
+                  item:
+                    returnStmt
+                      returnKeyword: return
+          conditions:
+            conditionElement
+              condition:
+                optionalBindingCondition
+                  pattern:
+                    identifierPattern
+                      identifier: identifier "value"
+                  bindingSpecifier: let
+          elseKeyword: else
+          guardKeyword: guard
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩"
+      stmt:
+        guard_if_stmt source="guard ⟨condition⟩ else ⟨else⟩"
+          condition:
+            pattern_guard_expr source="⟨pattern⟩⟨value⟩"
+              pattern:
+                call_expr source="⟨argument⟩"
+                  callee:
+                    member_access_expr source=""
+                      base: identifier "Optional" source=""
+                      member_name_node: identifier "some" source=""
+                  argument:
+                    argument source="⟨value⟩"
+                      value:
+                        expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                          modifier: modifier "let" source="let"
+                          expr: identifier "value" source="value"
+              value: identifier "value" source="value"
+          else:
+            block source="{ ⟨stmt⟩ }"
+              stmt: return_expr "return" source="return"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/guard-let-shorthand.swift b/unified/extractor/tests/corpus/swift/control-flow/guard-let-shorthand.swift
new file mode 100644
index 000000000000..ac44daacf17e
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/control-flow/guard-let-shorthand.swift
@@ -0,0 +1 @@
+guard let value else { return }
\ No newline at end of file
diff --git a/unified/extractor/tests/corpus/swift/control-flow/guard-let.output b/unified/extractor/tests/corpus/swift/control-flow/guard-let.output
index d739eca564b5..5d12fd0a7ea4 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/guard-let.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/guard-let.output
@@ -36,29 +36,26 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        guard_if_stmt
+        guard_if_stmt source="guard ⟨condition⟩ else ⟨else⟩"
           condition:
-            pattern_guard_expr
+            pattern_guard_expr source="⟨pattern⟩ = ⟨value⟩"
               pattern:
-                constructor_pattern
-                  constructor:
-                    member_access_expr
-                      base:
-                        named_type_expr
-                          name: identifier "Optional"
-                      member: identifier "some"
-                  element:
-                    pattern_element
-                      pattern:
-                        name_pattern
-                          identifier: identifier "value"
-              value:
-                name_expr
-                  identifier: identifier "optional"
+                call_expr source="⟨argument⟩"
+                  callee:
+                    member_access_expr source=""
+                      base: identifier "Optional" source=""
+                      member_name_node: identifier "some" source=""
+                  argument:
+                    argument source="⟨value⟩"
+                      value:
+                        expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                          modifier: modifier "let" source="let"
+                          expr: identifier "value" source="value"
+              value: identifier "optional" source="optional"
           else:
-            block
-              stmt: return_expr "return"
+            block source="{ ⟨stmt⟩ }"
+              stmt: return_expr "return" source="return"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/if-case-let-with-shadowing-in-condition-value.output b/unified/extractor/tests/corpus/swift/control-flow/if-case-let-with-shadowing-in-condition-value.output
index 2a0676513f23..07ae6d16afae 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/if-case-let-with-shadowing-in-condition-value.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/if-case-let-with-shadowing-in-condition-value.output
@@ -2,6 +2,10 @@ if case let x = x + 10 {
   print(x)
 }
 
+if case var y = y + 10 {
+  y += 1
+}
+
 ---
 
 sourceFile
@@ -57,35 +61,97 @@ sourceFile
                           bindingSpecifier: let
                       caseKeyword: case
               ifKeyword: if
+    codeBlockItem
+      item:
+        expressionStmt
+          expression:
+            ifExpr
+              body:
+                codeBlock
+                  leftBrace: {
+                  rightBrace: }
+                  statements:
+                    codeBlockItem
+                      item:
+                        infixOperatorExpr
+                          operator:
+                            binaryOperatorExpr
+                              operator: binaryOperator "+="
+                          leftOperand:
+                            declReferenceExpr
+                              baseName: identifier "y"
+                          rightOperand:
+                            integerLiteralExpr
+                              literal: integerLiteral "1"
+              conditions:
+                conditionElement
+                  condition:
+                    matchingPatternCondition
+                      initializer:
+                        initializerClause
+                          equal: =
+                          value:
+                            infixOperatorExpr
+                              operator:
+                                binaryOperatorExpr
+                                  operator: binaryOperator "+"
+                              leftOperand:
+                                declReferenceExpr
+                                  baseName: identifier "y"
+                              rightOperand:
+                                integerLiteralExpr
+                                  literal: integerLiteral "10"
+                      pattern:
+                        valueBindingPattern
+                          pattern:
+                            identifierPattern
+                              identifier: identifier "y"
+                          bindingSpecifier: var
+                      caseKeyword: case
+              ifKeyword: if
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩\n\n⟨stmt⟩"
       stmt:
-        if_expr
+        if_expr source="if ⟨condition⟩ ⟨then⟩"
           condition:
-            pattern_guard_expr
+            pattern_guard_expr source="case ⟨pattern⟩ = ⟨value⟩"
               pattern:
-                name_pattern
-                  identifier: identifier "x"
+                expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                  modifier: modifier "let" source="let"
+                  expr: identifier "x" source="x"
               value:
-                binary_expr
-                  left:
-                    name_expr
-                      identifier: identifier "x"
-                  operator: infix_operator "+"
-                  right: int_literal "10"
+                binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                  left: identifier "x" source="x"
+                  operator: infix_operator "+" source="+"
+                  right: int_literal "10" source="10"
           then:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "print"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
                   argument:
-                    argument
-                      value:
-                        name_expr
-                          identifier: identifier "x"
+                    argument source="⟨value⟩"
+                      value: identifier "x" source="x"
+        if_expr source="if ⟨condition⟩ ⟨then⟩"
+          condition:
+            pattern_guard_expr source="case ⟨pattern⟩ = ⟨value⟩"
+              pattern:
+                expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                  modifier: modifier "var" source="var"
+                  expr: identifier "y" source="y"
+              value:
+                binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                  left: identifier "y" source="y"
+                  operator: infix_operator "+" source="+"
+                  right: int_literal "10" source="10"
+          then:
+            block source="{\n  ⟨stmt⟩\n}"
+              stmt:
+                binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                  left: identifier "y" source="y"
+                  operator: infix_operator "+=" source="+="
+                  right: int_literal "1" source="1"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/if-case-let-with-shadowing-in-condition-value.swift b/unified/extractor/tests/corpus/swift/control-flow/if-case-let-with-shadowing-in-condition-value.swift
index c57c8ae5b67c..0939555e91ad 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/if-case-let-with-shadowing-in-condition-value.swift
+++ b/unified/extractor/tests/corpus/swift/control-flow/if-case-let-with-shadowing-in-condition-value.swift
@@ -1,3 +1,7 @@
 if case let x = x + 10 {
   print(x)
 }
+
+if case var y = y + 10 {
+  y += 1
+}
diff --git a/unified/extractor/tests/corpus/swift/control-flow/if-else-if-chain.output b/unified/extractor/tests/corpus/swift/control-flow/if-else-if-chain.output
index 35f1c2c46d2c..b6e3c1bcd939 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/if-else-if-chain.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/if-else-if-chain.output
@@ -108,54 +108,44 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        if_expr
+        if_expr source="if ⟨condition⟩ ⟨then⟩ else ⟨else⟩"
           condition:
-            binary_expr
-              left:
-                name_expr
-                  identifier: identifier "x"
-              operator: infix_operator ">"
-              right: int_literal "0"
+            binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+              left: identifier "x" source="x"
+              operator: infix_operator ">" source=">"
+              right: int_literal "0" source="0"
           then:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "print"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
                   argument:
-                    argument
-                      value: int_literal "1"
+                    argument source="⟨value⟩"
+                      value: int_literal "1" source="1"
           else:
-            if_expr
+            if_expr source="if ⟨condition⟩ ⟨then⟩ else ⟨else⟩"
               condition:
-                binary_expr
-                  left:
-                    name_expr
-                      identifier: identifier "x"
-                  operator: infix_operator "<"
-                  right: int_literal "0"
+                binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                  left: identifier "x" source="x"
+                  operator: infix_operator "<" source="<"
+                  right: int_literal "0" source="0"
               then:
-                block
+                block source="{\n  ⟨stmt⟩\n}"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value: int_literal "2"
+                        argument source="⟨value⟩"
+                          value: int_literal "2" source="2"
               else:
-                block
+                block source="{\n  ⟨stmt⟩\n}"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value: int_literal "3"
+                        argument source="⟨value⟩"
+                          value: int_literal "3" source="3"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/if-else.output b/unified/extractor/tests/corpus/swift/control-flow/if-else.output
index 744b5c51ab24..121d7e747e89 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/if-else.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/if-else.output
@@ -73,42 +73,32 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        if_expr
+        if_expr source="if ⟨condition⟩ ⟨then⟩ else ⟨else⟩"
           condition:
-            binary_expr
-              left:
-                name_expr
-                  identifier: identifier "x"
-              operator: infix_operator ">"
-              right: int_literal "0"
+            binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+              left: identifier "x" source="x"
+              operator: infix_operator ">" source=">"
+              right: int_literal "0" source="0"
           then:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "print"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
                   argument:
-                    argument
-                      value:
-                        name_expr
-                          identifier: identifier "x"
+                    argument source="⟨value⟩"
+                      value: identifier "x" source="x"
           else:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "print"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
                   argument:
-                    argument
+                    argument source="⟨value⟩"
                       value:
-                        unary_expr
-                          operand:
-                            name_expr
-                              identifier: identifier "x"
-                          operator: prefix_operator "-"
+                        unary_expr source="⟨operator⟩⟨operand⟩"
+                          operand: identifier "x" source="x"
+                          operator: prefix_operator "-" source="-"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/if-let-optional-binding.output b/unified/extractor/tests/corpus/swift/control-flow/if-let-optional-binding.output
index d1bcf82b0faa..097e721e5d40 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/if-let-optional-binding.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/if-let-optional-binding.output
@@ -49,38 +49,31 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        if_expr
+        if_expr source="if ⟨condition⟩ ⟨then⟩"
           condition:
-            pattern_guard_expr
+            pattern_guard_expr source="⟨pattern⟩ = ⟨value⟩"
               pattern:
-                constructor_pattern
-                  constructor:
-                    member_access_expr
-                      base:
-                        named_type_expr
-                          name: identifier "Optional"
-                      member: identifier "some"
-                  element:
-                    pattern_element
-                      pattern:
-                        name_pattern
-                          identifier: identifier "value"
-              value:
-                name_expr
-                  identifier: identifier "optional"
-          then:
-            block
-              stmt:
-                call_expr
+                call_expr source="⟨argument⟩"
                   callee:
-                    name_expr
-                      identifier: identifier "print"
+                    member_access_expr source=""
+                      base: identifier "Optional" source=""
+                      member_name_node: identifier "some" source=""
                   argument:
-                    argument
+                    argument source="⟨value⟩"
                       value:
-                        name_expr
-                          identifier: identifier "value"
+                        expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                          modifier: modifier "let" source="let"
+                          expr: identifier "value" source="value"
+              value: identifier "optional" source="optional"
+          then:
+            block source="{\n  ⟨stmt⟩\n}"
+              stmt:
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
+                  argument:
+                    argument source="⟨value⟩"
+                      value: identifier "value" source="value"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/if-statement.output b/unified/extractor/tests/corpus/swift/control-flow/if-statement.output
index 77bba019ffb9..b5616ee887da 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/if-statement.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/if-statement.output
@@ -48,27 +48,21 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        if_expr
+        if_expr source="if ⟨condition⟩ ⟨then⟩"
           condition:
-            binary_expr
-              left:
-                name_expr
-                  identifier: identifier "x"
-              operator: infix_operator ">"
-              right: int_literal "0"
+            binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+              left: identifier "x" source="x"
+              operator: infix_operator ">" source=">"
+              right: int_literal "0" source="0"
           then:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "print"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
                   argument:
-                    argument
-                      value:
-                        name_expr
-                          identifier: identifier "x"
+                    argument source="⟨value⟩"
+                      value: identifier "x" source="x"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/nested-enum-case-pattern.output b/unified/extractor/tests/corpus/swift/control-flow/nested-enum-case-pattern.output
new file mode 100644
index 000000000000..ea814c00d53b
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/control-flow/nested-enum-case-pattern.output
@@ -0,0 +1,292 @@
+switch event {
+case let .received(.some(value), timestamp):
+  print(value, timestamp)
+case Type.some(let value):
+  print(value)
+case values?.map { $0 * 2 }:
+  break
+default:
+  break
+}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        expressionStmt
+          expression:
+            switchExpr
+              leftBrace: {
+              rightBrace: }
+              cases:
+                switchCase
+                  label:
+                    switchCaseLabel
+                      colon: :
+                      caseKeyword: case
+                      caseItems:
+                        switchCaseItem
+                          pattern:
+                            valueBindingPattern
+                              pattern:
+                                expressionPattern
+                                  expression:
+                                    functionCallExpr
+                                      leftParen: (
+                                      rightParen: )
+                                      arguments:
+                                        labeledExpr
+                                          expression:
+                                            functionCallExpr
+                                              leftParen: (
+                                              rightParen: )
+                                              arguments:
+                                                labeledExpr
+                                                  expression:
+                                                    patternExpr
+                                                      pattern:
+                                                        identifierPattern
+                                                          identifier: identifier "value"
+                                              additionalTrailingClosures:
+                                              calledExpression:
+                                                memberAccessExpr
+                                                  period: .
+                                                  declName:
+                                                    declReferenceExpr
+                                                      baseName: identifier "some"
+                                          trailingComma: ,
+                                        labeledExpr
+                                          expression:
+                                            patternExpr
+                                              pattern:
+                                                identifierPattern
+                                                  identifier: identifier "timestamp"
+                                      additionalTrailingClosures:
+                                      calledExpression:
+                                        memberAccessExpr
+                                          period: .
+                                          declName:
+                                            declReferenceExpr
+                                              baseName: identifier "received"
+                              bindingSpecifier: let
+                  statements:
+                    codeBlockItem
+                      item:
+                        functionCallExpr
+                          leftParen: (
+                          rightParen: )
+                          arguments:
+                            labeledExpr
+                              expression:
+                                declReferenceExpr
+                                  baseName: identifier "value"
+                              trailingComma: ,
+                            labeledExpr
+                              expression:
+                                declReferenceExpr
+                                  baseName: identifier "timestamp"
+                          additionalTrailingClosures:
+                          calledExpression:
+                            declReferenceExpr
+                              baseName: identifier "print"
+                switchCase
+                  label:
+                    switchCaseLabel
+                      colon: :
+                      caseKeyword: case
+                      caseItems:
+                        switchCaseItem
+                          pattern:
+                            expressionPattern
+                              expression:
+                                functionCallExpr
+                                  leftParen: (
+                                  rightParen: )
+                                  arguments:
+                                    labeledExpr
+                                      expression:
+                                        patternExpr
+                                          pattern:
+                                            valueBindingPattern
+                                              pattern:
+                                                identifierPattern
+                                                  identifier: identifier "value"
+                                              bindingSpecifier: let
+                                  additionalTrailingClosures:
+                                  calledExpression:
+                                    memberAccessExpr
+                                      period: .
+                                      declName:
+                                        declReferenceExpr
+                                          baseName: identifier "some"
+                                      base:
+                                        declReferenceExpr
+                                          baseName: identifier "Type"
+                  statements:
+                    codeBlockItem
+                      item:
+                        functionCallExpr
+                          leftParen: (
+                          rightParen: )
+                          arguments:
+                            labeledExpr
+                              expression:
+                                declReferenceExpr
+                                  baseName: identifier "value"
+                          additionalTrailingClosures:
+                          calledExpression:
+                            declReferenceExpr
+                              baseName: identifier "print"
+                switchCase
+                  label:
+                    switchCaseLabel
+                      colon: :
+                      caseKeyword: case
+                      caseItems:
+                        switchCaseItem
+                          pattern:
+                            expressionPattern
+                              expression:
+                                functionCallExpr
+                                  arguments:
+                                  additionalTrailingClosures:
+                                  calledExpression:
+                                    memberAccessExpr
+                                      period: .
+                                      declName:
+                                        declReferenceExpr
+                                          baseName: identifier "map"
+                                      base:
+                                        optionalChainingExpr
+                                          expression:
+                                            declReferenceExpr
+                                              baseName: identifier "values"
+                                          questionMark: ?
+                                  trailingClosure:
+                                    closureExpr
+                                      leftBrace: {
+                                      rightBrace: }
+                                      statements:
+                                        codeBlockItem
+                                          item:
+                                            infixOperatorExpr
+                                              operator:
+                                                binaryOperatorExpr
+                                                  operator: binaryOperator "*"
+                                              leftOperand:
+                                                declReferenceExpr
+                                                  baseName: dollarIdentifier "$0"
+                                              rightOperand:
+                                                integerLiteralExpr
+                                                  literal: integerLiteral "2"
+                  statements:
+                    codeBlockItem
+                      item:
+                        breakStmt
+                          breakKeyword: break
+                switchCase
+                  label:
+                    switchDefaultLabel
+                      colon: :
+                      defaultKeyword: default
+                  statements:
+                    codeBlockItem
+                      item:
+                        breakStmt
+                          breakKeyword: break
+              subject:
+                declReferenceExpr
+                  baseName: identifier "event"
+              switchKeyword: switch
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩"
+      stmt:
+        switch_expr source="switch ⟨value⟩ {\n⟨case⟩\n⟨case⟩\n⟨case⟩\n⟨case⟩\n}"
+          value: identifier "event" source="event"
+          case:
+            switch_case source="case ⟨pattern⟩:\n  ⟨body⟩"
+              pattern:
+                expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                  modifier: modifier "let" source="let"
+                  expr:
+                    call_expr source="⟨callee⟩(⟨argument⟩, ⟨argument⟩)"
+                      callee:
+                        member_access_expr source="⟨base⟩⟨member_name_node⟩"
+                          base: inferred_type_expr "." source="."
+                          member_name_node: identifier "received" source="received"
+                      argument:
+                        argument source="⟨value⟩"
+                          value:
+                            call_expr source="⟨callee⟩(⟨argument⟩)"
+                              callee:
+                                member_access_expr source="⟨base⟩⟨member_name_node⟩"
+                                  base: inferred_type_expr "." source="."
+                                  member_name_node: identifier "some" source="some"
+                              argument:
+                                argument source="⟨value⟩"
+                                  value: identifier "value" source="value"
+                        argument source="⟨value⟩"
+                          value: identifier "timestamp" source="timestamp"
+              body:
+                block source="⟨stmt⟩"
+                  stmt:
+                    call_expr source="⟨callee⟩(⟨argument⟩, ⟨argument⟩)"
+                      callee: identifier "print" source="print"
+                      argument:
+                        argument source="⟨value⟩"
+                          value: identifier "value" source="value"
+                        argument source="⟨value⟩"
+                          value: identifier "timestamp" source="timestamp"
+            switch_case source="case ⟨pattern⟩:\n  ⟨body⟩"
+              pattern:
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee:
+                    member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                      base: identifier "Type" source="Type"
+                      member_name_node: identifier "some" source="some"
+                  argument:
+                    argument source="⟨value⟩"
+                      value:
+                        expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                          modifier: modifier "let" source="let"
+                          expr: identifier "value" source="value"
+              body:
+                block source="⟨stmt⟩"
+                  stmt:
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
+                      argument:
+                        argument source="⟨value⟩"
+                          value: identifier "value" source="value"
+            switch_case source="case ⟨pattern⟩:\n  ⟨body⟩"
+              pattern:
+                call_expr source="⟨callee⟩ ⟨argument⟩"
+                  callee:
+                    member_access_expr source="⟨base⟩?.⟨member_name_node⟩"
+                      base: identifier "values" source="values"
+                      member_name_node: identifier "map" source="map"
+                  argument:
+                    argument source="⟨value⟩"
+                      value:
+                        function_expr source="{ ⟨body⟩ }"
+                          body:
+                            block source="⟨stmt⟩"
+                              stmt:
+                                binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                                  left: identifier "$0" source="$0"
+                                  operator: infix_operator "*" source="*"
+                                  right: int_literal "2" source="2"
+              body:
+                block source="⟨stmt⟩"
+                  stmt: break_expr "break" source="break"
+            switch_case source="default:\n  ⟨body⟩"
+              body:
+                block source="⟨stmt⟩"
+                  stmt: break_expr "break" source="break"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/nested-enum-case-pattern.swift b/unified/extractor/tests/corpus/swift/control-flow/nested-enum-case-pattern.swift
new file mode 100644
index 000000000000..be136fec4a6c
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/control-flow/nested-enum-case-pattern.swift
@@ -0,0 +1,10 @@
+switch event {
+case let .received(.some(value), timestamp):
+  print(value, timestamp)
+case Type.some(let value):
+  print(value)
+case values?.map { $0 * 2 }:
+  break
+default:
+  break
+}
diff --git a/unified/extractor/tests/corpus/swift/control-flow/switch-case-item-where-clauses.output b/unified/extractor/tests/corpus/swift/control-flow/switch-case-item-where-clauses.output
index 9d2041aa2ad1..ddd959679201 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/switch-case-item-where-clauses.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/switch-case-item-where-clauses.output
@@ -150,73 +150,62 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        switch_expr
-          value:
-            name_expr
-              identifier: identifier "n"
+        switch_expr source="switch ⟨value⟩ {\n⟨case⟩\n⟨case⟩\n⟨case⟩\n}"
+          value: identifier "n" source="n"
           case:
-            switch_case
+            switch_case source="case ⟨pattern⟩:\n  ⟨body⟩"
               pattern:
-                conditional_pattern
+                conditional_pattern source="⟨pattern⟩ where ⟨condition⟩"
                   condition:
-                    binary_expr
-                      left:
-                        name_expr
-                          identifier: identifier "x"
-                      operator: infix_operator ">"
-                      right: int_literal "0"
+                    binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                      left: identifier "x" source="x"
+                      operator: infix_operator ">" source=">"
+                      right: int_literal "0" source="0"
                   pattern:
-                    name_pattern
-                      identifier: identifier "x"
+                    expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                      modifier: modifier "let" source="let"
+                      expr: identifier "x" source="x"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value: string_literal "\"positive\""
-            switch_case
+                        argument source="⟨value⟩"
+                          value: string_literal "\"positive\"" source="\"positive\""
+            switch_case source="case ⟨pattern⟩:\n  ⟨body⟩"
               pattern:
-                or_pattern
+                or_pattern source="⟨pattern⟩, ⟨pattern⟩"
                   pattern:
-                    conditional_pattern
+                    conditional_pattern source="⟨pattern⟩ where ⟨condition⟩"
                       condition:
-                        binary_expr
-                          left:
-                            name_expr
-                              identifier: identifier "y"
-                          operator: infix_operator "<"
-                          right: int_literal "0"
+                        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                          left: identifier "y" source="y"
+                          operator: infix_operator "<" source="<"
+                          right: int_literal "0" source="0"
                       pattern:
-                        name_pattern
-                          identifier: identifier "y"
-                    expr_equality_pattern
-                      expr: int_literal "0"
+                        expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                          modifier: modifier "let" source="let"
+                          expr: identifier "y" source="y"
+                    int_literal "0" source="0"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value: string_literal "\"non-positive\""
-            switch_case
+                        argument source="⟨value⟩"
+                          value: string_literal "\"non-positive\"" source="\"non-positive\""
+            switch_case source="default:\n  ⟨body⟩"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value: string_literal "\"other\""
+                        argument source="⟨value⟩"
+                          value: string_literal "\"other\"" source="\"other\""
diff --git a/unified/extractor/tests/corpus/swift/control-flow/switch-expression-pattern.output b/unified/extractor/tests/corpus/swift/control-flow/switch-expression-pattern.output
new file mode 100644
index 000000000000..bd170eeb80a4
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/control-flow/switch-expression-pattern.output
@@ -0,0 +1,399 @@
+// Arbitrary expressions may appear in pattern context.
+switch subject {
+case value, value + offset, -value, lower...upper, makeValue(), makeValue().member,
+    .inferred, (value, offset), [value], [key: value], optional?, try value,
+    value!, value as Target, value is Target, await value:
+    consume(value)
+case condition ? value : fallback:
+    consume(fallback)
+default:
+    break
+}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        expressionStmt
+          expression:
+            switchExpr
+              leftBrace: {
+              rightBrace: }
+              cases:
+                switchCase
+                  label:
+                    switchCaseLabel
+                      colon: :
+                      caseKeyword: case
+                      caseItems:
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                declReferenceExpr
+                                  baseName: identifier "value"
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                infixOperatorExpr
+                                  operator:
+                                    binaryOperatorExpr
+                                      operator: binaryOperator "+"
+                                  leftOperand:
+                                    declReferenceExpr
+                                      baseName: identifier "value"
+                                  rightOperand:
+                                    declReferenceExpr
+                                      baseName: identifier "offset"
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                prefixOperatorExpr
+                                  expression:
+                                    declReferenceExpr
+                                      baseName: identifier "value"
+                                  operator: prefixOperator "-"
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                infixOperatorExpr
+                                  operator:
+                                    binaryOperatorExpr
+                                      operator: binaryOperator "..."
+                                  leftOperand:
+                                    declReferenceExpr
+                                      baseName: identifier "lower"
+                                  rightOperand:
+                                    declReferenceExpr
+                                      baseName: identifier "upper"
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                functionCallExpr
+                                  leftParen: (
+                                  rightParen: )
+                                  arguments:
+                                  additionalTrailingClosures:
+                                  calledExpression:
+                                    declReferenceExpr
+                                      baseName: identifier "makeValue"
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                memberAccessExpr
+                                  period: .
+                                  declName:
+                                    declReferenceExpr
+                                      baseName: identifier "member"
+                                  base:
+                                    functionCallExpr
+                                      leftParen: (
+                                      rightParen: )
+                                      arguments:
+                                      additionalTrailingClosures:
+                                      calledExpression:
+                                        declReferenceExpr
+                                          baseName: identifier "makeValue"
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                memberAccessExpr
+                                  period: .
+                                  declName:
+                                    declReferenceExpr
+                                      baseName: identifier "inferred"
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                tupleExpr
+                                  leftParen: (
+                                  rightParen: )
+                                  elements:
+                                    labeledExpr
+                                      expression:
+                                        declReferenceExpr
+                                          baseName: identifier "value"
+                                      trailingComma: ,
+                                    labeledExpr
+                                      expression:
+                                        declReferenceExpr
+                                          baseName: identifier "offset"
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                arrayExpr
+                                  elements:
+                                    arrayElement
+                                      expression:
+                                        declReferenceExpr
+                                          baseName: identifier "value"
+                                  leftSquare: [
+                                  rightSquare: ]
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                dictionaryExpr
+                                  leftSquare: [
+                                  rightSquare: ]
+                                  content:
+                                    dictionaryElement
+                                      colon: :
+                                      value:
+                                        declReferenceExpr
+                                          baseName: identifier "value"
+                                      key:
+                                        declReferenceExpr
+                                          baseName: identifier "key"
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                optionalChainingExpr
+                                  expression:
+                                    declReferenceExpr
+                                      baseName: identifier "optional"
+                                  questionMark: ?
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                tryExpr
+                                  expression:
+                                    declReferenceExpr
+                                      baseName: identifier "value"
+                                  tryKeyword: try
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                forceUnwrapExpr
+                                  expression:
+                                    declReferenceExpr
+                                      baseName: identifier "value"
+                                  exclamationMark: !
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                asExpr
+                                  expression:
+                                    declReferenceExpr
+                                      baseName: identifier "value"
+                                  asKeyword: as
+                                  type:
+                                    identifierType
+                                      name: identifier "Target"
+                        switchCaseItem
+                          trailingComma: ,
+                          pattern:
+                            expressionPattern
+                              expression:
+                                isExpr
+                                  expression:
+                                    declReferenceExpr
+                                      baseName: identifier "value"
+                                  type:
+                                    identifierType
+                                      name: identifier "Target"
+                                  isKeyword: is
+                        switchCaseItem
+                          pattern:
+                            expressionPattern
+                              expression:
+                                awaitExpr
+                                  expression:
+                                    declReferenceExpr
+                                      baseName: identifier "value"
+                                  awaitKeyword: await
+                  statements:
+                    codeBlockItem
+                      item:
+                        functionCallExpr
+                          leftParen: (
+                          rightParen: )
+                          arguments:
+                            labeledExpr
+                              expression:
+                                declReferenceExpr
+                                  baseName: identifier "value"
+                          additionalTrailingClosures:
+                          calledExpression:
+                            declReferenceExpr
+                              baseName: identifier "consume"
+                switchCase
+                  label:
+                    switchCaseLabel
+                      colon: :
+                      caseKeyword: case
+                      caseItems:
+                        switchCaseItem
+                          pattern:
+                            expressionPattern
+                              expression:
+                                ternaryExpr
+                                  colon: :
+                                  condition:
+                                    declReferenceExpr
+                                      baseName: identifier "condition"
+                                  questionMark: ?
+                                  elseExpression:
+                                    declReferenceExpr
+                                      baseName: identifier "fallback"
+                                  thenExpression:
+                                    declReferenceExpr
+                                      baseName: identifier "value"
+                  statements:
+                    codeBlockItem
+                      item:
+                        functionCallExpr
+                          leftParen: (
+                          rightParen: )
+                          arguments:
+                            labeledExpr
+                              expression:
+                                declReferenceExpr
+                                  baseName: identifier "fallback"
+                          additionalTrailingClosures:
+                          calledExpression:
+                            declReferenceExpr
+                              baseName: identifier "consume"
+                switchCase
+                  label:
+                    switchDefaultLabel
+                      colon: :
+                      defaultKeyword: default
+                  statements:
+                    codeBlockItem
+                      item:
+                        breakStmt
+                          breakKeyword: break
+              subject:
+                declReferenceExpr
+                  baseName: identifier "subject"
+              switchKeyword: switch
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩"
+      stmt:
+        switch_expr source="switch ⟨value⟩ {\n⟨case⟩\n⟨case⟩\n⟨case⟩\n}"
+          value: identifier "subject" source="subject"
+          case:
+            switch_case source="case ⟨pattern⟩:\n    ⟨body⟩"
+              pattern:
+                or_pattern source="⟨pattern⟩, ⟨pattern⟩, ⟨pattern⟩, ⟨pattern⟩, ⟨pattern⟩, ⟨pattern⟩,\n    ⟨pattern⟩, ⟨pattern⟩, ⟨pattern⟩, ⟨pattern⟩, ⟨pattern⟩, ⟨pattern⟩,\n    ⟨pattern⟩, ⟨pattern⟩, ⟨pattern⟩, ⟨pattern⟩"
+                  pattern:
+                    identifier "value" source="value"
+                    binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                      left: identifier "value" source="value"
+                      operator: infix_operator "+" source="+"
+                      right: identifier "offset" source="offset"
+                    unary_expr source="⟨operator⟩⟨operand⟩"
+                      operand: identifier "value" source="value"
+                      operator: prefix_operator "-" source="-"
+                    binary_expr source="⟨left⟩⟨operator⟩⟨right⟩"
+                      left: identifier "lower" source="lower"
+                      operator: infix_operator "..." source="..."
+                      right: identifier "upper" source="upper"
+                    call_expr source="⟨callee⟩()"
+                      callee: identifier "makeValue" source="makeValue"
+                    member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                      base:
+                        call_expr source="⟨callee⟩()"
+                          callee: identifier "makeValue" source="makeValue"
+                      member_name_node: identifier "member" source="member"
+                    member_access_expr source="⟨base⟩⟨member_name_node⟩"
+                      base: inferred_type_expr "." source="."
+                      member_name_node: identifier "inferred" source="inferred"
+                    tuple_expr source="(⟨element⟩, ⟨element⟩)"
+                      element:
+                        argument source="⟨value⟩"
+                          value: identifier "value" source="value"
+                        argument source="⟨value⟩"
+                          value: identifier "offset" source="offset"
+                    array_literal source="[⟨element⟩]"
+                      element: identifier "value" source="value"
+                    map_literal source="[⟨element⟩]"
+                      element:
+                        key_value_pair source="⟨key⟩: ⟨value⟩"
+                          key: identifier "key" source="key"
+                          value: identifier "value" source="value"
+                    call_expr source="⟨argument⟩?"
+                      callee:
+                        member_access_expr source=""
+                          base: identifier "Optional" source=""
+                          member_name_node: identifier "some" source=""
+                      argument:
+                        argument source="⟨value⟩"
+                          value: identifier "optional" source="optional"
+                    unary_expr source="⟨operator⟩ ⟨operand⟩"
+                      operand: identifier "value" source="value"
+                      operator: prefix_operator "try" source="try"
+                    unary_expr source="⟨operand⟩⟨operator⟩"
+                      operand: identifier "value" source="value"
+                      operator: postfix_operator "!" source="!"
+                    type_cast_expr source="⟨expr⟩ ⟨operator⟩ ⟨type⟩"
+                      expr: identifier "value" source="value"
+                      operator: infix_operator "as" source="as"
+                      type: identifier "Target" source="Target"
+                    type_test_expr source="⟨expr⟩ ⟨operator⟩ ⟨type⟩"
+                      expr: identifier "value" source="value"
+                      operator: infix_operator "is" source="is"
+                      type: identifier "Target" source="Target"
+                    unary_expr source="⟨operator⟩ ⟨operand⟩"
+                      operand: identifier "value" source="value"
+                      operator: prefix_operator "await" source="await"
+              body:
+                block source="⟨stmt⟩"
+                  stmt:
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "consume" source="consume"
+                      argument:
+                        argument source="⟨value⟩"
+                          value: identifier "value" source="value"
+            switch_case source="case ⟨pattern⟩:\n    ⟨body⟩"
+              pattern:
+                if_expr source="⟨condition⟩ ? ⟨then⟩ : ⟨else⟩"
+                  condition: identifier "condition" source="condition"
+                  then: identifier "value" source="value"
+                  else: identifier "fallback" source="fallback"
+              body:
+                block source="⟨stmt⟩"
+                  stmt:
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "consume" source="consume"
+                      argument:
+                        argument source="⟨value⟩"
+                          value: identifier "fallback" source="fallback"
+            switch_case source="default:\n    ⟨body⟩"
+              body:
+                block source="⟨stmt⟩"
+                  stmt: break_expr "break" source="break"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/switch-expression-pattern.swift b/unified/extractor/tests/corpus/swift/control-flow/switch-expression-pattern.swift
new file mode 100644
index 000000000000..02efbe6e8177
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/control-flow/switch-expression-pattern.swift
@@ -0,0 +1,11 @@
+// Arbitrary expressions may appear in pattern context.
+switch subject {
+case value, value + offset, -value, lower...upper, makeValue(), makeValue().member,
+    .inferred, (value, offset), [value], [key: value], optional?, try value,
+    value!, value as Target, value is Target, await value:
+    consume(value)
+case condition ? value : fallback:
+    consume(fallback)
+default:
+    break
+}
\ No newline at end of file
diff --git a/unified/extractor/tests/corpus/swift/control-flow/switch-statement.output b/unified/extractor/tests/corpus/swift/control-flow/switch-statement.output
index a88579852947..7ff90754ac7a 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/switch-statement.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/switch-statement.output
@@ -120,55 +120,43 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        switch_expr
-          value:
-            name_expr
-              identifier: identifier "x"
+        switch_expr source="switch ⟨value⟩ {\n⟨case⟩\n⟨case⟩\n⟨case⟩\n}"
+          value: identifier "x" source="x"
           case:
-            switch_case
-              pattern:
-                expr_equality_pattern
-                  expr: int_literal "1"
+            switch_case source="case ⟨pattern⟩:\n  ⟨body⟩"
+              pattern: int_literal "1" source="1"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value: string_literal "\"one\""
-            switch_case
+                        argument source="⟨value⟩"
+                          value: string_literal "\"one\"" source="\"one\""
+            switch_case source="case ⟨pattern⟩:\n  ⟨body⟩"
               pattern:
-                or_pattern
+                or_pattern source="⟨pattern⟩, ⟨pattern⟩"
                   pattern:
-                    expr_equality_pattern
-                      expr: int_literal "2"
-                    expr_equality_pattern
-                      expr: int_literal "3"
+                    int_literal "2" source="2"
+                    int_literal "3" source="3"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value: string_literal "\"two or three\""
-            switch_case
+                        argument source="⟨value⟩"
+                          value: string_literal "\"two or three\"" source="\"two or three\""
+            switch_case source="default:\n  ⟨body⟩"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value: string_literal "\"other\""
+                        argument source="⟨value⟩"
+                          value: string_literal "\"other\"" source="\"other\""
diff --git a/unified/extractor/tests/corpus/swift/control-flow/switch-with-binding-pattern.output b/unified/extractor/tests/corpus/swift/control-flow/switch-with-binding-pattern.output
index 90bb6b44e6e5..9d417531b74e 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/switch-with-binding-pattern.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/switch-with-binding-pattern.output
@@ -115,60 +115,52 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        switch_expr
-          value:
-            name_expr
-              identifier: identifier "shape"
+        switch_expr source="switch ⟨value⟩ {\n⟨case⟩\n⟨case⟩\n}"
+          value: identifier "shape" source="shape"
           case:
-            switch_case
+            switch_case source="case ⟨pattern⟩:\n  ⟨body⟩"
               pattern:
-                constructor_pattern
-                  constructor:
-                    member_access_expr
-                      base: inferred_type_expr "."
-                      member: identifier "circle"
-                  element:
-                    pattern_element
-                      pattern:
-                        name_pattern
-                          identifier: identifier "r"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee:
+                    member_access_expr source="⟨base⟩⟨member_name_node⟩"
+                      base: inferred_type_expr "." source="."
+                      member_name_node: identifier "circle" source="circle"
+                  argument:
+                    argument source="⟨value⟩"
+                      value:
+                        expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                          modifier: modifier "let" source="let"
+                          expr: identifier "r" source="r"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value:
-                            name_expr
-                              identifier: identifier "r"
-            switch_case
+                        argument source="⟨value⟩"
+                          value: identifier "r" source="r"
+            switch_case source="case ⟨pattern⟩:\n  ⟨body⟩"
               pattern:
-                constructor_pattern
-                  constructor:
-                    member_access_expr
-                      base: inferred_type_expr "."
-                      member: identifier "square"
-                  element:
-                    pattern_element
-                      pattern:
-                        name_pattern
-                          identifier: identifier "s"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee:
+                    member_access_expr source="⟨base⟩⟨member_name_node⟩"
+                      base: inferred_type_expr "." source="."
+                      member_name_node: identifier "square" source="square"
+                  argument:
+                    argument source="⟨value⟩"
+                      value:
+                        expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                          modifier: modifier "let" source="let"
+                          expr: identifier "s" source="s"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value:
-                            name_expr
-                              identifier: identifier "s"
+                        argument source="⟨value⟩"
+                          value: identifier "s" source="s"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/switch-with-labeled-case-pattern-arguments.output b/unified/extractor/tests/corpus/swift/control-flow/switch-with-labeled-case-pattern-arguments.output
index 20b17d160e44..623d44545d37 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/switch-with-labeled-case-pattern-arguments.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/switch-with-labeled-case-pattern-arguments.output
@@ -123,62 +123,53 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        switch_expr
-          value:
-            name_expr
-              identifier: identifier "x"
+        switch_expr source="switch ⟨value⟩ {\n⟨case⟩\n⟨case⟩\n}"
+          value: identifier "x" source="x"
           case:
-            switch_case
+            switch_case source="case ⟨pattern⟩:\n  ⟨body⟩"
               pattern:
-                constructor_pattern
-                  constructor:
-                    member_access_expr
-                      base: inferred_type_expr "."
-                      member: identifier "implicit"
-                  element:
-                    pattern_element
-                      key: identifier "isAcknowledged"
-                      pattern:
-                        expr_equality_pattern
-                          expr: boolean_literal "false"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee:
+                    member_access_expr source="⟨base⟩⟨member_name_node⟩"
+                      base: inferred_type_expr "." source="."
+                      member_name_node: identifier "implicit" source="implicit"
+                  argument:
+                    argument source="⟨name_node⟩: ⟨value⟩"
+                      name_node: identifier "isAcknowledged" source="isAcknowledged"
+                      value: boolean_literal "false" source="false"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value: string_literal "\"yes\""
-            switch_case
+                        argument source="⟨value⟩"
+                          value: string_literal "\"yes\"" source="\"yes\""
+            switch_case source="case ⟨pattern⟩:\n  ⟨body⟩"
               pattern:
-                constructor_pattern
-                  constructor:
-                    member_access_expr
-                      base: inferred_type_expr "."
-                      member: identifier "thread"
-                  element:
-                    pattern_element
-                      key: identifier "threadRowId"
-                      pattern: ignore_pattern "_"
-                    pattern_element
-                      pattern:
-                        name_pattern
-                          identifier: identifier "rowId"
+                call_expr source="⟨callee⟩(⟨argument⟩, ⟨argument⟩)"
+                  callee:
+                    member_access_expr source="⟨base⟩⟨member_name_node⟩"
+                      base: inferred_type_expr "." source="."
+                      member_name_node: identifier "thread" source="thread"
+                  argument:
+                    argument source="⟨name_node⟩: ⟨value⟩"
+                      name_node: identifier "threadRowId" source="threadRowId"
+                      value: ignore_pattern "_" source="_"
+                    argument source="⟨value⟩"
+                      value:
+                        expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                          modifier: modifier "let" source="let"
+                          expr: identifier "rowId" source="rowId"
               body:
-                block
+                block source="⟨stmt⟩"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value:
-                            name_expr
-                              identifier: identifier "rowId"
+                        argument source="⟨value⟩"
+                          value: identifier "rowId" source="rowId"
diff --git a/unified/extractor/tests/corpus/swift/control-flow/ternary-expression.output b/unified/extractor/tests/corpus/swift/control-flow/ternary-expression.output
index 88c7bc1b886c..e864a67ea560 100644
--- a/unified/extractor/tests/corpus/swift/control-flow/ternary-expression.output
+++ b/unified/extractor/tests/corpus/swift/control-flow/ternary-expression.output
@@ -46,26 +46,22 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "y"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "y" source="y"
           value:
-            if_expr
+            if_expr source="⟨condition⟩ ? ⟨then⟩ : ⟨else⟩"
               condition:
-                binary_expr
-                  left:
-                    name_expr
-                      identifier: identifier "x"
-                  operator: infix_operator ">"
-                  right: int_literal "0"
-              then: int_literal "1"
+                binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                  left: identifier "x" source="x"
+                  operator: infix_operator ">" source=">"
+                  right: int_literal "0" source="0"
+              then: int_literal "1" source="1"
               else:
-                unary_expr
-                  operand: int_literal "1"
-                  operator: prefix_operator "-"
+                unary_expr source="⟨operator⟩⟨operand⟩"
+                  operand: int_literal "1" source="1"
+                  operator: prefix_operator "-" source="-"
diff --git a/unified/extractor/tests/corpus/swift/desugar/additive-expression-is-desugared.output b/unified/extractor/tests/corpus/swift/desugar/additive-expression-is-desugared.output
index 30d9570f3bee..3ee44dd60a05 100644
--- a/unified/extractor/tests/corpus/swift/desugar/additive-expression-is-desugared.output
+++ b/unified/extractor/tests/corpus/swift/desugar/additive-expression-is-desugared.output
@@ -20,11 +20,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        binary_expr
-          left: int_literal "1"
-          operator: infix_operator "+"
-          right: int_literal "2"
+        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+          left: int_literal "1" source="1"
+          operator: infix_operator "+" source="+"
+          right: int_literal "2" source="2"
diff --git a/unified/extractor/tests/corpus/swift/desugar/another-additive-expression-is-desugared.output b/unified/extractor/tests/corpus/swift/desugar/another-additive-expression-is-desugared.output
index 982309ffa5af..e655642a6640 100644
--- a/unified/extractor/tests/corpus/swift/desugar/another-additive-expression-is-desugared.output
+++ b/unified/extractor/tests/corpus/swift/desugar/another-additive-expression-is-desugared.output
@@ -20,15 +20,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        binary_expr
-          left:
-            name_expr
-              identifier: identifier "foo"
-          operator: infix_operator "+"
-          right:
-            name_expr
-              identifier: identifier "bar"
+        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+          left: identifier "foo" source="foo"
+          operator: infix_operator "+" source="+"
+          right: identifier "bar" source="bar"
diff --git a/unified/extractor/tests/corpus/swift/desugar/import-with-deeply-nested-path-three-parts.output b/unified/extractor/tests/corpus/swift/desugar/import-with-deeply-nested-path-three-parts.output
index cacdc64a46de..a35890d96301 100644
--- a/unified/extractor/tests/corpus/swift/desugar/import-with-deeply-nested-path-three-parts.output
+++ b/unified/extractor/tests/corpus/swift/desugar/import-with-deeply-nested-path-three-parts.output
@@ -23,18 +23,19 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        import_declaration
+        import_declaration source="⟨pattern⟩⟨imported_expr⟩"
           imported_expr:
-            member_access_expr
+            member_access_expr source="⟨base⟩.⟨member_name_node⟩"
               base:
-                member_access_expr
-                  base:
-                    name_expr
-                      identifier: identifier "Foundation"
-                  member: identifier "Networking"
-              member: identifier "URLSession"
-          pattern: bulk_importing_pattern "import Foundation.Networking.URLSession"
+                member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                  base: identifier "Foundation" source="Foundation"
+                  member_name_node: identifier "Networking" source="Networking"
+              member_name_node: identifier "URLSession" source="URLSession"
+          pattern:
+            named_pattern source="⟨sub_pattern⟩⟨name_node⟩"
+              name_node: identifier "URLSession" source="URLSession"
+              sub_pattern: bulk_importing_pattern "import Foundation.Networking.URLSession" source="import Foundation.Networking.URLSession"
diff --git a/unified/extractor/tests/corpus/swift/desugar/import-with-dotted-path-two-parts.output b/unified/extractor/tests/corpus/swift/desugar/import-with-dotted-path-two-parts.output
index 4fc053a7bc53..3f069a347481 100644
--- a/unified/extractor/tests/corpus/swift/desugar/import-with-dotted-path-two-parts.output
+++ b/unified/extractor/tests/corpus/swift/desugar/import-with-dotted-path-two-parts.output
@@ -20,15 +20,16 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        import_declaration
+        import_declaration source="⟨pattern⟩⟨imported_expr⟩"
           imported_expr:
-            member_access_expr
-              base:
-                name_expr
-                  identifier: identifier "Foundation"
-              member: identifier "Networking"
-          pattern: bulk_importing_pattern "import Foundation.Networking"
+            member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+              base: identifier "Foundation" source="Foundation"
+              member_name_node: identifier "Networking" source="Networking"
+          pattern:
+            named_pattern source="⟨sub_pattern⟩⟨name_node⟩"
+              name_node: identifier "Networking" source="Networking"
+              sub_pattern: bulk_importing_pattern "import Foundation.Networking" source="import Foundation.Networking"
diff --git a/unified/extractor/tests/corpus/swift/desugar/scoped-import-uses-name-pattern.output b/unified/extractor/tests/corpus/swift/desugar/scoped-import-uses-name-pattern.output
index 93319c522981..cd7415127b7e 100644
--- a/unified/extractor/tests/corpus/swift/desugar/scoped-import-uses-name-pattern.output
+++ b/unified/extractor/tests/corpus/swift/desugar/scoped-import-uses-name-pattern.output
@@ -21,18 +21,14 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        import_declaration
-          modifier: modifier "struct"
+        import_declaration source="import ⟨modifier⟩ ⟨imported_expr⟩⟨pattern⟩"
+          modifier: modifier "struct" source="struct"
           imported_expr:
-            member_access_expr
-              base:
-                name_expr
-                  identifier: identifier "Foundation"
-              member: identifier "Date"
-          pattern:
-            name_pattern
-              identifier: identifier "Date"
+            member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+              base: identifier "Foundation" source="Foundation"
+              member_name_node: identifier "Date" source="Date"
+          pattern: identifier "Date" source="Date"
diff --git a/unified/extractor/tests/corpus/swift/desugar/simple-import-with-single-name.output b/unified/extractor/tests/corpus/swift/desugar/simple-import-with-single-name.output
index 583f33563d13..d52673da8dda 100644
--- a/unified/extractor/tests/corpus/swift/desugar/simple-import-with-single-name.output
+++ b/unified/extractor/tests/corpus/swift/desugar/simple-import-with-single-name.output
@@ -17,12 +17,13 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        import_declaration
-          imported_expr:
-            name_expr
-              identifier: identifier "Foundation"
-          pattern: bulk_importing_pattern "import Foundation"
+        import_declaration source="⟨pattern⟩⟨imported_expr⟩"
+          imported_expr: identifier "Foundation" source="Foundation"
+          pattern:
+            named_pattern source="⟨sub_pattern⟩⟨name_node⟩"
+              name_node: identifier "Foundation" source="Foundation"
+              sub_pattern: bulk_importing_pattern "import Foundation" source="import Foundation"
diff --git a/unified/extractor/tests/corpus/swift/expressions/array-type-constructor.output b/unified/extractor/tests/corpus/swift/expressions/array-type-constructor.output
new file mode 100644
index 000000000000..28c66609b41b
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/expressions/array-type-constructor.output
@@ -0,0 +1,202 @@
+let values = [Result<Void>]()
+let initialized = [Result<Void>](unsafeUninitializedCapacity: 1) { _, count in
+	count = 0
+} completion: {
+	done()
+}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        variableDecl
+          attributes:
+          modifiers:
+          bindingSpecifier: let
+          bindings:
+            patternBinding
+              initializer:
+                initializerClause
+                  equal: =
+                  value:
+                    functionCallExpr
+                      leftParen: (
+                      rightParen: )
+                      arguments:
+                      additionalTrailingClosures:
+                      calledExpression:
+                        arrayExpr
+                          elements:
+                            arrayElement
+                              expression:
+                                genericSpecializationExpr
+                                  expression:
+                                    declReferenceExpr
+                                      baseName: identifier "Result"
+                                  genericArgumentClause:
+                                    genericArgumentClause
+                                      arguments:
+                                        genericArgument
+                                          argument:
+                                            identifierType
+                                              name: identifier "Void"
+                                      leftAngle: <
+                                      rightAngle: >
+                          leftSquare: [
+                          rightSquare: ]
+              pattern:
+                identifierPattern
+                  identifier: identifier "values"
+    codeBlockItem
+      item:
+        variableDecl
+          attributes:
+          modifiers:
+          bindingSpecifier: let
+          bindings:
+            patternBinding
+              initializer:
+                initializerClause
+                  equal: =
+                  value:
+                    functionCallExpr
+                      leftParen: (
+                      rightParen: )
+                      arguments:
+                        labeledExpr
+                          colon: :
+                          label: identifier "unsafeUninitializedCapacity"
+                          expression:
+                            integerLiteralExpr
+                              literal: integerLiteral "1"
+                      additionalTrailingClosures:
+                        multipleTrailingClosureElement
+                          colon: :
+                          label: identifier "completion"
+                          closure:
+                            closureExpr
+                              leftBrace: {
+                              rightBrace: }
+                              statements:
+                                codeBlockItem
+                                  item:
+                                    functionCallExpr
+                                      leftParen: (
+                                      rightParen: )
+                                      arguments:
+                                      additionalTrailingClosures:
+                                      calledExpression:
+                                        declReferenceExpr
+                                          baseName: identifier "done"
+                      calledExpression:
+                        arrayExpr
+                          elements:
+                            arrayElement
+                              expression:
+                                genericSpecializationExpr
+                                  expression:
+                                    declReferenceExpr
+                                      baseName: identifier "Result"
+                                  genericArgumentClause:
+                                    genericArgumentClause
+                                      arguments:
+                                        genericArgument
+                                          argument:
+                                            identifierType
+                                              name: identifier "Void"
+                                      leftAngle: <
+                                      rightAngle: >
+                          leftSquare: [
+                          rightSquare: ]
+                      trailingClosure:
+                        closureExpr
+                          leftBrace: {
+                          rightBrace: }
+                          signature:
+                            closureSignature
+                              attributes:
+                              inKeyword: in
+                              parameterClause:
+                                closureShorthandParameter
+                                  name: _
+                                  trailingComma: ,
+                                closureShorthandParameter
+                                  name: identifier "count"
+                          statements:
+                            codeBlockItem
+                              item:
+                                infixOperatorExpr
+                                  operator:
+                                    assignmentExpr
+                                      equal: =
+                                  leftOperand:
+                                    declReferenceExpr
+                                      baseName: identifier "count"
+                                  rightOperand:
+                                    integerLiteralExpr
+                                      literal: integerLiteral "0"
+              pattern:
+                identifierPattern
+                  identifier: identifier "initialized"
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩\n⟨stmt⟩"
+      stmt:
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "values" source="values"
+          value:
+            call_expr source="⟨callee⟩()"
+              callee:
+                generic_type_expr source="[⟨type_argument⟩]"
+                  base: identifier "Array" source=""
+                  type_argument:
+                    generic_type_expr source="⟨base⟩<⟨type_argument⟩>"
+                      base: identifier "Result" source="Result"
+                      type_argument: identifier "Void" source="Void"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "initialized" source="initialized"
+          value:
+            call_expr source="⟨callee⟩(⟨argument⟩) ⟨argument⟩ ⟨argument⟩"
+              callee:
+                generic_type_expr source="[⟨type_argument⟩]"
+                  base: identifier "Array" source=""
+                  type_argument:
+                    generic_type_expr source="⟨base⟩<⟨type_argument⟩>"
+                      base: identifier "Result" source="Result"
+                      type_argument: identifier "Void" source="Void"
+              argument:
+                argument source="⟨name_node⟩: ⟨value⟩"
+                  name_node: identifier "unsafeUninitializedCapacity" source="unsafeUninitializedCapacity"
+                  value: int_literal "1" source="1"
+                argument source="⟨value⟩"
+                  value:
+                    function_expr source="{ ⟨parameter⟩, ⟨parameter⟩ in\n\t⟨body⟩\n}"
+                      parameter:
+                        parameter source="⟨pattern⟩"
+                          pattern: identifier "_" source="_"
+                        parameter source="⟨pattern⟩"
+                          pattern: identifier "count" source="count"
+                      body:
+                        block source="⟨stmt⟩"
+                          stmt:
+                            binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                              left: identifier "count" source="count"
+                              operator: infix_operator "=" source="="
+                              right: int_literal "0" source="0"
+                argument source="⟨name_node⟩: ⟨value⟩"
+                  name_node: identifier "completion" source="completion"
+                  value:
+                    function_expr source="{\n\t⟨body⟩\n}"
+                      body:
+                        block source="⟨stmt⟩"
+                          stmt:
+                            call_expr source="⟨callee⟩()"
+                              callee: identifier "done" source="done"
diff --git a/unified/extractor/tests/corpus/swift/expressions/array-type-constructor.swift b/unified/extractor/tests/corpus/swift/expressions/array-type-constructor.swift
new file mode 100644
index 000000000000..a4dce57c797e
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/expressions/array-type-constructor.swift
@@ -0,0 +1,6 @@
+let values = [Result<Void>]()
+let initialized = [Result<Void>](unsafeUninitializedCapacity: 1) { _, count in
+	count = 0
+} completion: {
+	done()
+}
diff --git a/unified/extractor/tests/corpus/swift/expressions/array-type-metatype.output b/unified/extractor/tests/corpus/swift/expressions/array-type-metatype.output
new file mode 100644
index 000000000000..8d0f690b12c6
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/expressions/array-type-metatype.output
@@ -0,0 +1,67 @@
+let type = [Result<Void>].self
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        variableDecl
+          attributes:
+          modifiers:
+          bindingSpecifier: let
+          bindings:
+            patternBinding
+              initializer:
+                initializerClause
+                  equal: =
+                  value:
+                    memberAccessExpr
+                      period: .
+                      declName:
+                        declReferenceExpr
+                          baseName: self
+                      base:
+                        arrayExpr
+                          elements:
+                            arrayElement
+                              expression:
+                                genericSpecializationExpr
+                                  expression:
+                                    declReferenceExpr
+                                      baseName: identifier "Result"
+                                  genericArgumentClause:
+                                    genericArgumentClause
+                                      arguments:
+                                        genericArgument
+                                          argument:
+                                            identifierType
+                                              name: identifier "Void"
+                                      leftAngle: <
+                                      rightAngle: >
+                          leftSquare: [
+                          rightSquare: ]
+              pattern:
+                identifierPattern
+                  identifier: identifier "type"
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩"
+      stmt:
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "type" source="type"
+          value:
+            member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+              base:
+                generic_type_expr source="[⟨type_argument⟩]"
+                  base: identifier "Array" source=""
+                  type_argument:
+                    generic_type_expr source="⟨base⟩<⟨type_argument⟩>"
+                      base: identifier "Result" source="Result"
+                      type_argument: identifier "Void" source="Void"
+              member_name_node: identifier "self" source="self"
diff --git a/unified/extractor/tests/corpus/swift/expressions/array-type-metatype.swift b/unified/extractor/tests/corpus/swift/expressions/array-type-metatype.swift
new file mode 100644
index 000000000000..85d770be76cb
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/expressions/array-type-metatype.swift
@@ -0,0 +1 @@
+let type = [Result<Void>].self
diff --git a/unified/extractor/tests/corpus/swift/expressions/consume-expression.output b/unified/extractor/tests/corpus/swift/expressions/consume-expression.output
index f20f89b72558..3b9f369f8ad9 100644
--- a/unified/extractor/tests/corpus/swift/expressions/consume-expression.output
+++ b/unified/extractor/tests/corpus/swift/expressions/consume-expression.output
@@ -62,24 +62,20 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩\n⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "original"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "original" source="original"
           value:
-            array_literal
+            array_literal source="[⟨element⟩, ⟨element⟩, ⟨element⟩]"
               element:
-                int_literal "1"
-                int_literal "2"
-                int_literal "3"
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "consumed"
-          value: unsupported_node "consume original"
+                int_literal "1" source="1"
+                int_literal "2" source="2"
+                int_literal "3" source="3"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "consumed" source="consumed"
+          value: unsupported_node "consume original" source="consume original"
diff --git a/unified/extractor/tests/corpus/swift/expressions/copy-expression.output b/unified/extractor/tests/corpus/swift/expressions/copy-expression.output
index 9f065b046a90..523e8c9dddec 100644
--- a/unified/extractor/tests/corpus/swift/expressions/copy-expression.output
+++ b/unified/extractor/tests/corpus/swift/expressions/copy-expression.output
@@ -62,24 +62,20 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩\n⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "original"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "original" source="original"
           value:
-            array_literal
+            array_literal source="[⟨element⟩, ⟨element⟩, ⟨element⟩]"
               element:
-                int_literal "1"
-                int_literal "2"
-                int_literal "3"
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "copied"
-          value: unsupported_node "copy original"
+                int_literal "1" source="1"
+                int_literal "2" source="2"
+                int_literal "3" source="3"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "copied" source="copied"
+          value: unsupported_node "copy original" source="copy original"
diff --git a/unified/extractor/tests/corpus/swift/expressions/freestanding-macro-expansions.output b/unified/extractor/tests/corpus/swift/expressions/freestanding-macro-expansions.output
new file mode 100644
index 000000000000..80ca79bd0e55
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/expressions/freestanding-macro-expansions.output
@@ -0,0 +1,164 @@
+#expect(value == 42)
+
+#custom<Int>(value) {
+  value
+} completion: {
+  value
+}
+
+#Preview {
+  let previewValue = 42
+  previewValue
+}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        macroExpansionExpr
+          leftParen: (
+          rightParen: )
+          arguments:
+            labeledExpr
+              expression:
+                infixOperatorExpr
+                  operator:
+                    binaryOperatorExpr
+                      operator: binaryOperator "=="
+                  leftOperand:
+                    declReferenceExpr
+                      baseName: identifier "value"
+                  rightOperand:
+                    integerLiteralExpr
+                      literal: integerLiteral "42"
+          additionalTrailingClosures:
+          macroName: identifier "expect"
+          pound: #
+    codeBlockItem
+      item:
+        macroExpansionExpr
+          leftParen: (
+          rightParen: )
+          arguments:
+            labeledExpr
+              expression:
+                declReferenceExpr
+                  baseName: identifier "value"
+          additionalTrailingClosures:
+            multipleTrailingClosureElement
+              colon: :
+              label: identifier "completion"
+              closure:
+                closureExpr
+                  leftBrace: {
+                  rightBrace: }
+                  statements:
+                    codeBlockItem
+                      item:
+                        declReferenceExpr
+                          baseName: identifier "value"
+          trailingClosure:
+            closureExpr
+              leftBrace: {
+              rightBrace: }
+              statements:
+                codeBlockItem
+                  item:
+                    declReferenceExpr
+                      baseName: identifier "value"
+          genericArgumentClause:
+            genericArgumentClause
+              arguments:
+                genericArgument
+                  argument:
+                    identifierType
+                      name: identifier "Int"
+              leftAngle: <
+              rightAngle: >
+          macroName: identifier "custom"
+          pound: #
+    codeBlockItem
+      item:
+        macroExpansionExpr
+          arguments:
+          additionalTrailingClosures:
+          trailingClosure:
+            closureExpr
+              leftBrace: {
+              rightBrace: }
+              statements:
+                codeBlockItem
+                  item:
+                    variableDecl
+                      attributes:
+                      modifiers:
+                      bindingSpecifier: let
+                      bindings:
+                        patternBinding
+                          initializer:
+                            initializerClause
+                              equal: =
+                              value:
+                                integerLiteralExpr
+                                  literal: integerLiteral "42"
+                          pattern:
+                            identifierPattern
+                              identifier: identifier "previewValue"
+                codeBlockItem
+                  item:
+                    declReferenceExpr
+                      baseName: identifier "previewValue"
+          macroName: identifier "Preview"
+          pound: #
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩\n\n⟨stmt⟩\n\n⟨stmt⟩"
+      stmt:
+        macro_call_expr source="#⟨macro_name_node⟩(⟨argument⟩)"
+          macro_name_node: identifier "expect" source="expect"
+          argument:
+            argument source="⟨value⟩"
+              value:
+                binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                  left: identifier "value" source="value"
+                  operator: infix_operator "==" source="=="
+                  right: int_literal "42" source="42"
+        macro_call_expr source="#⟨macro_name_node⟩<⟨type_argument⟩>(⟨argument⟩) ⟨argument⟩ ⟨argument⟩"
+          macro_name_node: identifier "custom" source="custom"
+          type_argument: identifier "Int" source="Int"
+          argument:
+            argument source="⟨value⟩"
+              value: identifier "value" source="value"
+            argument source="⟨value⟩"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩"
+                      stmt: identifier "value" source="value"
+            argument source="⟨name_node⟩: ⟨value⟩"
+              name_node: identifier "completion" source="completion"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩"
+                      stmt: identifier "value" source="value"
+        macro_call_expr source="#⟨macro_name_node⟩ ⟨argument⟩"
+          macro_name_node: identifier "Preview" source="Preview"
+          argument:
+            argument source="⟨value⟩"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩\n  ⟨stmt⟩"
+                      stmt:
+                        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+                          modifier: modifier "let" source="let"
+                          pattern: identifier "previewValue" source="previewValue"
+                          value: int_literal "42" source="42"
+                        identifier "previewValue" source="previewValue"
diff --git a/unified/extractor/tests/corpus/swift/expressions/freestanding-macro-expansions.swift b/unified/extractor/tests/corpus/swift/expressions/freestanding-macro-expansions.swift
new file mode 100644
index 000000000000..9257c28ae3b2
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/expressions/freestanding-macro-expansions.swift
@@ -0,0 +1,12 @@
+#expect(value == 42)
+
+#custom<Int>(value) {
+  value
+} completion: {
+  value
+}
+
+#Preview {
+  let previewValue = 42
+  previewValue
+}
diff --git a/unified/extractor/tests/corpus/swift/expressions/generic-specialization-expression.output b/unified/extractor/tests/corpus/swift/expressions/generic-specialization-expression.output
index 4f3bd0214411..f952f5a44509 100644
--- a/unified/extractor/tests/corpus/swift/expressions/generic-specialization-expression.output
+++ b/unified/extractor/tests/corpus/swift/expressions/generic-specialization-expression.output
@@ -42,15 +42,16 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "numbers"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "numbers" source="numbers"
           value:
-            call_expr
-              callee: unsupported_node "Array<Int>"
+            call_expr source="⟨callee⟩()"
+              callee:
+                generic_type_expr source="⟨base⟩<⟨type_argument⟩>"
+                  base: identifier "Array" source="Array"
+                  type_argument: identifier "Int" source="Int"
diff --git a/unified/extractor/tests/corpus/swift/expressions/key-path-expression.output b/unified/extractor/tests/corpus/swift/expressions/key-path-expression.output
index a803e9e594fd..95a2a440847f 100644
--- a/unified/extractor/tests/corpus/swift/expressions/key-path-expression.output
+++ b/unified/extractor/tests/corpus/swift/expressions/key-path-expression.output
@@ -36,13 +36,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "keyPath"
-          value: unsupported_node "\\String.count"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "keyPath" source="keyPath"
+          value: unsupported_node "\\String.count" source="\\String.count"
diff --git a/unified/extractor/tests/corpus/swift/expressions/subscript-call.output b/unified/extractor/tests/corpus/swift/expressions/subscript-call.output
new file mode 100644
index 000000000000..138caa29eb62
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/expressions/subscript-call.output
@@ -0,0 +1,137 @@
+handlers[0]
+
+handlers[0] {
+  first()
+} completion: {
+  second()
+} failure: {
+  third()
+}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        subscriptCallExpr
+          leftSquare: [
+          rightSquare: ]
+          arguments:
+            labeledExpr
+              expression:
+                integerLiteralExpr
+                  literal: integerLiteral "0"
+          additionalTrailingClosures:
+          calledExpression:
+            declReferenceExpr
+              baseName: identifier "handlers"
+    codeBlockItem
+      item:
+        subscriptCallExpr
+          leftSquare: [
+          rightSquare: ]
+          arguments:
+            labeledExpr
+              expression:
+                integerLiteralExpr
+                  literal: integerLiteral "0"
+          additionalTrailingClosures:
+            multipleTrailingClosureElement
+              colon: :
+              label: identifier "completion"
+              closure:
+                closureExpr
+                  leftBrace: {
+                  rightBrace: }
+                  statements:
+                    codeBlockItem
+                      item:
+                        functionCallExpr
+                          leftParen: (
+                          rightParen: )
+                          arguments:
+                          additionalTrailingClosures:
+                          calledExpression:
+                            declReferenceExpr
+                              baseName: identifier "second"
+            multipleTrailingClosureElement
+              colon: :
+              label: identifier "failure"
+              closure:
+                closureExpr
+                  leftBrace: {
+                  rightBrace: }
+                  statements:
+                    codeBlockItem
+                      item:
+                        functionCallExpr
+                          leftParen: (
+                          rightParen: )
+                          arguments:
+                          additionalTrailingClosures:
+                          calledExpression:
+                            declReferenceExpr
+                              baseName: identifier "third"
+          calledExpression:
+            declReferenceExpr
+              baseName: identifier "handlers"
+          trailingClosure:
+            closureExpr
+              leftBrace: {
+              rightBrace: }
+              statements:
+                codeBlockItem
+                  item:
+                    functionCallExpr
+                      leftParen: (
+                      rightParen: )
+                      arguments:
+                      additionalTrailingClosures:
+                      calledExpression:
+                        declReferenceExpr
+                          baseName: identifier "first"
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩\n\n⟨stmt⟩"
+      stmt:
+        call_expr source="⟨callee⟩[⟨argument⟩]"
+          callee: identifier "handlers" source="handlers"
+          argument:
+            argument source="⟨value⟩"
+              value: int_literal "0" source="0"
+        call_expr source="⟨callee⟩[⟨argument⟩] ⟨argument⟩ ⟨argument⟩ ⟨argument⟩"
+          callee: identifier "handlers" source="handlers"
+          argument:
+            argument source="⟨value⟩"
+              value: int_literal "0" source="0"
+            argument source="⟨value⟩"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩"
+                      stmt:
+                        call_expr source="⟨callee⟩()"
+                          callee: identifier "first" source="first"
+            argument source="⟨name_node⟩: ⟨value⟩"
+              name_node: identifier "completion" source="completion"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩"
+                      stmt:
+                        call_expr source="⟨callee⟩()"
+                          callee: identifier "second" source="second"
+            argument source="⟨name_node⟩: ⟨value⟩"
+              name_node: identifier "failure" source="failure"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩"
+                      stmt:
+                        call_expr source="⟨callee⟩()"
+                          callee: identifier "third" source="third"
diff --git a/unified/extractor/tests/corpus/swift/expressions/subscript-call.swift b/unified/extractor/tests/corpus/swift/expressions/subscript-call.swift
new file mode 100644
index 000000000000..a0e4b51700bd
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/expressions/subscript-call.swift
@@ -0,0 +1,9 @@
+handlers[0]
+
+handlers[0] {
+  first()
+} completion: {
+  second()
+} failure: {
+  third()
+}
diff --git a/unified/extractor/tests/corpus/swift/expressions/super-expression.output b/unified/extractor/tests/corpus/swift/expressions/super-expression.output
new file mode 100644
index 000000000000..2c7d9739e658
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/expressions/super-expression.output
@@ -0,0 +1,192 @@
+class Base {
+  var value = 0
+
+  func update() {}
+}
+
+class Derived: Base {
+  override func update() {
+    _ = super.value
+    super.update()
+  }
+}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        classDecl
+          attributes:
+          modifiers:
+          name: identifier "Base"
+          memberBlock:
+            memberBlock
+              leftBrace: {
+              rightBrace: }
+              members:
+                memberBlockItem
+                  decl:
+                    variableDecl
+                      attributes:
+                      modifiers:
+                      bindingSpecifier: var
+                      bindings:
+                        patternBinding
+                          initializer:
+                            initializerClause
+                              equal: =
+                              value:
+                                integerLiteralExpr
+                                  literal: integerLiteral "0"
+                          pattern:
+                            identifierPattern
+                              identifier: identifier "value"
+                memberBlockItem
+                  decl:
+                    functionDecl
+                      attributes:
+                      body:
+                        codeBlock
+                          leftBrace: {
+                          rightBrace: }
+                          statements:
+                      modifiers:
+                      name: identifier "update"
+                      signature:
+                        functionSignature
+                          parameterClause:
+                            functionParameterClause
+                              leftParen: (
+                              rightParen: )
+                              parameters:
+                      funcKeyword: func
+          classKeyword: class
+    codeBlockItem
+      item:
+        classDecl
+          attributes:
+          modifiers:
+          name: identifier "Derived"
+          inheritanceClause:
+            inheritanceClause
+              colon: :
+              inheritedTypes:
+                inheritedType
+                  type:
+                    identifierType
+                      name: identifier "Base"
+          memberBlock:
+            memberBlock
+              leftBrace: {
+              rightBrace: }
+              members:
+                memberBlockItem
+                  decl:
+                    functionDecl
+                      attributes:
+                      body:
+                        codeBlock
+                          leftBrace: {
+                          rightBrace: }
+                          statements:
+                            codeBlockItem
+                              item:
+                                infixOperatorExpr
+                                  operator:
+                                    assignmentExpr
+                                      equal: =
+                                  leftOperand:
+                                    discardAssignmentExpr
+                                      wildcard: _
+                                  rightOperand:
+                                    memberAccessExpr
+                                      period: .
+                                      declName:
+                                        declReferenceExpr
+                                          baseName: identifier "value"
+                                      base:
+                                        superExpr
+                                          superKeyword: super
+                            codeBlockItem
+                              item:
+                                functionCallExpr
+                                  leftParen: (
+                                  rightParen: )
+                                  arguments:
+                                  additionalTrailingClosures:
+                                  calledExpression:
+                                    memberAccessExpr
+                                      period: .
+                                      declName:
+                                        declReferenceExpr
+                                          baseName: identifier "update"
+                                      base:
+                                        superExpr
+                                          superKeyword: super
+                      modifiers:
+                        declModifier
+                          name: override
+                      name: identifier "update"
+                      signature:
+                        functionSignature
+                          parameterClause:
+                            functionParameterClause
+                              leftParen: (
+                              rightParen: )
+                              parameters:
+                      funcKeyword: func
+          classKeyword: class
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩\n\n⟨stmt⟩"
+      stmt:
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n\n  ⟨member⟩\n}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Base" source="Base"
+          member:
+            variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+              modifier: modifier "var" source="var"
+              pattern: identifier "value" source="value"
+              value: int_literal "0" source="0"
+            function_declaration source="func ⟨name_node⟩() ⟨body⟩"
+              name_node: identifier "update" source="update"
+              body: block "{}" source="{}"
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨base_type⟩ {\n  ⟨member⟩\n}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Derived" source="Derived"
+          base_type:
+            base_type source="⟨type⟩"
+              type: identifier "Base" source="Base"
+          member:
+            function_declaration source="⟨modifier⟩ func ⟨name_node⟩() ⟨body⟩"
+              modifier: modifier "override" source="override"
+              name_node: identifier "update" source="update"
+              body:
+                block source="{\n    ⟨stmt⟩\n    ⟨stmt⟩\n  }"
+                  stmt:
+                    binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                      left: ignore_pattern "_" source="_"
+                      operator: infix_operator "=" source="="
+                      right:
+                        member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                          base: super_expr "super" source="super"
+                          member_name_node: identifier "value" source="value"
+                    call_expr source="⟨callee⟩()"
+                      callee:
+                        member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                          base: super_expr "super" source="super"
+                          member_name_node: identifier "update" source="update"
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/expressions/super-expression.swift b/unified/extractor/tests/corpus/swift/expressions/super-expression.swift
new file mode 100644
index 000000000000..6d1c37a70d55
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/expressions/super-expression.swift
@@ -0,0 +1,12 @@
+class Base {
+  var value = 0
+
+  func update() {}
+}
+
+class Derived: Base {
+  override func update() {
+    _ = super.value
+    super.update()
+  }
+}
diff --git a/unified/extractor/tests/corpus/swift/expressions/unsafe-expression.output b/unified/extractor/tests/corpus/swift/expressions/unsafe-expression.output
index 2bdc964ddeaa..0acff823d2c8 100644
--- a/unified/extractor/tests/corpus/swift/expressions/unsafe-expression.output
+++ b/unified/extractor/tests/corpus/swift/expressions/unsafe-expression.output
@@ -15,8 +15,8 @@ sourceFile
               leftBrace: {
               rightBrace: }
               statements:
-          name: identifier "doWork"
           modifiers:
+          name: identifier "doWork"
           signature:
             functionSignature
               parameterClause:
@@ -41,11 +41,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩\n⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "doWork"
-          body: block "func doWork() {}"
-        unsupported_node "unsafe doWork()"
+        function_declaration source="func ⟨name_node⟩() ⟨body⟩"
+          name_node: identifier "doWork" source="doWork"
+          body: block "{}" source="{}"
+        unsupported_node "unsafe doWork()" source="unsafe doWork()"
diff --git a/unified/extractor/tests/corpus/swift/functions/attributed-parameter-types.output b/unified/extractor/tests/corpus/swift/functions/attributed-parameter-types.output
new file mode 100644
index 000000000000..24a1507f5295
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/functions/attributed-parameter-types.output
@@ -0,0 +1,238 @@
+func f<D, T>(
+    a: inout D,
+    b: sending T,
+    c: borrowing T,
+    d: consuming T,
+    e: @escaping (T) -> Void,
+    g: @Sendable @escaping () -> D
+) {}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        functionDecl
+          attributes:
+          body:
+            codeBlock
+              leftBrace: {
+              rightBrace: }
+              statements:
+          modifiers:
+          name: identifier "f"
+          genericParameterClause:
+            genericParameterClause
+              parameters:
+                genericParameter
+                  attributes:
+                  name: identifier "D"
+                  trailingComma: ,
+                genericParameter
+                  attributes:
+                  name: identifier "T"
+              leftAngle: <
+              rightAngle: >
+          signature:
+            functionSignature
+              parameterClause:
+                functionParameterClause
+                  leftParen: (
+                  rightParen: )
+                  parameters:
+                    functionParameter
+                      colon: :
+                      attributes:
+                      modifiers:
+                      trailingComma: ,
+                      type:
+                        attributedType
+                          attributes:
+                          baseType:
+                            identifierType
+                              name: identifier "D"
+                          lateSpecifiers:
+                          specifiers:
+                            simpleTypeSpecifier
+                              specifier: inout
+                      firstName: identifier "a"
+                    functionParameter
+                      colon: :
+                      attributes:
+                      modifiers:
+                      trailingComma: ,
+                      type:
+                        attributedType
+                          attributes:
+                          baseType:
+                            identifierType
+                              name: identifier "T"
+                          lateSpecifiers:
+                          specifiers:
+                            simpleTypeSpecifier
+                              specifier: sending
+                      firstName: identifier "b"
+                    functionParameter
+                      colon: :
+                      attributes:
+                      modifiers:
+                      trailingComma: ,
+                      type:
+                        attributedType
+                          attributes:
+                          baseType:
+                            identifierType
+                              name: identifier "T"
+                          lateSpecifiers:
+                          specifiers:
+                            simpleTypeSpecifier
+                              specifier: borrowing
+                      firstName: identifier "c"
+                    functionParameter
+                      colon: :
+                      attributes:
+                      modifiers:
+                      trailingComma: ,
+                      type:
+                        attributedType
+                          attributes:
+                          baseType:
+                            identifierType
+                              name: identifier "T"
+                          lateSpecifiers:
+                          specifiers:
+                            simpleTypeSpecifier
+                              specifier: consuming
+                      firstName: identifier "d"
+                    functionParameter
+                      colon: :
+                      attributes:
+                      modifiers:
+                      trailingComma: ,
+                      type:
+                        attributedType
+                          attributes:
+                            attribute
+                              atSign: @
+                              attributeName:
+                                identifierType
+                                  name: identifier "escaping"
+                          baseType:
+                            functionType
+                              leftParen: (
+                              rightParen: )
+                              parameters:
+                                tupleTypeElement
+                                  type:
+                                    identifierType
+                                      name: identifier "T"
+                              returnClause:
+                                returnClause
+                                  arrow: ->
+                                  type:
+                                    identifierType
+                                      name: identifier "Void"
+                          lateSpecifiers:
+                          specifiers:
+                      firstName: identifier "e"
+                    functionParameter
+                      colon: :
+                      attributes:
+                      modifiers:
+                      type:
+                        attributedType
+                          attributes:
+                            attribute
+                              atSign: @
+                              attributeName:
+                                identifierType
+                                  name: identifier "Sendable"
+                            attribute
+                              atSign: @
+                              attributeName:
+                                identifierType
+                                  name: identifier "escaping"
+                          baseType:
+                            functionType
+                              leftParen: (
+                              rightParen: )
+                              parameters:
+                              returnClause:
+                                returnClause
+                                  arrow: ->
+                                  type:
+                                    identifierType
+                                      name: identifier "D"
+                          lateSpecifiers:
+                          specifiers:
+                      firstName: identifier "g"
+          funcKeyword: func
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩"
+      stmt:
+        function_declaration source="func ⟨name_node⟩<⟨type_parameter⟩, ⟨type_parameter⟩>(\n    ⟨parameter⟩,\n    ⟨parameter⟩,\n    ⟨parameter⟩,\n    ⟨parameter⟩,\n    ⟨parameter⟩,\n    ⟨parameter⟩\n) ⟨body⟩"
+          name_node: identifier "f" source="f"
+          type_parameter:
+            type_parameter source="⟨name_node⟩"
+              name_node: identifier "D" source="D"
+            type_parameter source="⟨name_node⟩"
+              name_node: identifier "T" source="T"
+          parameter:
+            parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "a" source="a"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                  modifier: modifier "inout" source="inout"
+                  type: identifier "D" source="D"
+              pattern: identifier "a" source="a"
+            parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "b" source="b"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                  modifier: modifier "sending" source="sending"
+                  type: identifier "T" source="T"
+              pattern: identifier "b" source="b"
+            parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "c" source="c"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                  modifier: modifier "borrowing" source="borrowing"
+                  type: identifier "T" source="T"
+              pattern: identifier "c" source="c"
+            parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "d" source="d"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                  modifier: modifier "consuming" source="consuming"
+                  type: identifier "T" source="T"
+              pattern: identifier "d" source="d"
+            parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "e" source="e"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                  modifier: modifier "@escaping" source="@escaping"
+                  type:
+                    function_expr source="(⟨parameter⟩) -> ⟨return_type⟩"
+                      parameter:
+                        parameter source="⟨type⟩"
+                          type: identifier "T" source="T"
+                      return_type: identifier "Void" source="Void"
+              pattern: identifier "e" source="e"
+            parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "g" source="g"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨modifier⟩ ⟨type⟩"
+                  modifier:
+                    modifier "@Sendable" source="@Sendable"
+                    modifier "@escaping" source="@escaping"
+                  type:
+                    function_expr source="() -> ⟨return_type⟩"
+                      return_type: identifier "D" source="D"
+              pattern: identifier "g" source="g"
+          body: block "{}" source="{}"
diff --git a/unified/extractor/tests/corpus/swift/functions/attributed-parameter-types.swift b/unified/extractor/tests/corpus/swift/functions/attributed-parameter-types.swift
new file mode 100644
index 000000000000..7cb9dde87401
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/functions/attributed-parameter-types.swift
@@ -0,0 +1,8 @@
+func f<D, T>(
+    a: inout D,
+    b: sending T,
+    c: borrowing T,
+    d: consuming T,
+    e: @escaping (T) -> Void,
+    g: @Sendable @escaping () -> D
+) {}
diff --git a/unified/extractor/tests/corpus/swift/functions/call-with-inout-argument.output b/unified/extractor/tests/corpus/swift/functions/call-with-inout-argument.output
index 3dae9884c81e..380eb27b2ada 100644
--- a/unified/extractor/tests/corpus/swift/functions/call-with-inout-argument.output
+++ b/unified/extractor/tests/corpus/swift/functions/call-with-inout-argument.output
@@ -69,28 +69,28 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩\n⟨stmt⟩\n⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "var"
-          pattern:
-            name_pattern
-              identifier: identifier "a"
-          value: int_literal "1"
-        variable_declaration
-          modifier: modifier "var"
-          pattern:
-            name_pattern
-              identifier: identifier "b"
-          value: int_literal "2"
-        call_expr
-          callee:
-            name_expr
-              identifier: identifier "swap"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "var" source="var"
+          pattern: identifier "a" source="a"
+          value: int_literal "1" source="1"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "var" source="var"
+          pattern: identifier "b" source="b"
+          value: int_literal "2" source="2"
+        call_expr source="⟨callee⟩(⟨argument⟩, ⟨argument⟩)"
+          callee: identifier "swap" source="swap"
           argument:
-            argument
-              value: unsupported_node "&a"
-            argument
-              value: unsupported_node "&b"
+            argument source="⟨value⟩"
+              value:
+                unary_expr source="⟨operator⟩⟨operand⟩"
+                  operand: identifier "a" source="a"
+                  operator: prefix_operator "&" source="&"
+            argument source="⟨value⟩"
+              value:
+                unary_expr source="⟨operator⟩⟨operand⟩"
+                  operand: identifier "b" source="b"
+                  operator: prefix_operator "&" source="&"
diff --git a/unified/extractor/tests/corpus/swift/functions/constructor-call-with-type-arguments.output b/unified/extractor/tests/corpus/swift/functions/constructor-call-with-type-arguments.output
new file mode 100644
index 000000000000..afc5234b2f71
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/functions/constructor-call-with-type-arguments.output
@@ -0,0 +1,110 @@
+class Foo {}
+class C<T> {}
+let x = C<Foo>()
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        classDecl
+          attributes:
+          modifiers:
+          name: identifier "Foo"
+          memberBlock:
+            memberBlock
+              leftBrace: {
+              rightBrace: }
+              members:
+          classKeyword: class
+    codeBlockItem
+      item:
+        classDecl
+          attributes:
+          modifiers:
+          name: identifier "C"
+          genericParameterClause:
+            genericParameterClause
+              parameters:
+                genericParameter
+                  attributes:
+                  name: identifier "T"
+              leftAngle: <
+              rightAngle: >
+          memberBlock:
+            memberBlock
+              leftBrace: {
+              rightBrace: }
+              members:
+          classKeyword: class
+    codeBlockItem
+      item:
+        variableDecl
+          attributes:
+          modifiers:
+          bindingSpecifier: let
+          bindings:
+            patternBinding
+              initializer:
+                initializerClause
+                  equal: =
+                  value:
+                    functionCallExpr
+                      leftParen: (
+                      rightParen: )
+                      arguments:
+                      additionalTrailingClosures:
+                      calledExpression:
+                        genericSpecializationExpr
+                          expression:
+                            declReferenceExpr
+                              baseName: identifier "C"
+                          genericArgumentClause:
+                            genericArgumentClause
+                              arguments:
+                                genericArgument
+                                  argument:
+                                    identifierType
+                                      name: identifier "Foo"
+                              leftAngle: <
+                              rightAngle: >
+              pattern:
+                identifierPattern
+                  identifier: identifier "x"
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩\n⟨stmt⟩\n⟨stmt⟩"
+      stmt:
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Foo" source="Foo"
+          member:
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩<⟨type_parameter⟩> {}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "C" source="C"
+          type_parameter:
+            type_parameter source="⟨name_node⟩"
+              name_node: identifier "T" source="T"
+          member:
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "x" source="x"
+          value:
+            call_expr source="⟨callee⟩()"
+              callee:
+                generic_type_expr source="⟨base⟩<⟨type_argument⟩>"
+                  base: identifier "C" source="C"
+                  type_argument: identifier "Foo" source="Foo"
diff --git a/unified/extractor/tests/corpus/swift/functions/constructor-call-with-type-arguments.swift b/unified/extractor/tests/corpus/swift/functions/constructor-call-with-type-arguments.swift
new file mode 100644
index 000000000000..c5a122cb3806
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/functions/constructor-call-with-type-arguments.swift
@@ -0,0 +1,3 @@
+class Foo {}
+class C<T> {}
+let x = C<Foo>()
diff --git a/unified/extractor/tests/corpus/swift/functions/function-call-with-labelled-arguments.output b/unified/extractor/tests/corpus/swift/functions/function-call-with-labelled-arguments.output
index f885d5762f2d..48de52d425d8 100644
--- a/unified/extractor/tests/corpus/swift/functions/function-call-with-labelled-arguments.output
+++ b/unified/extractor/tests/corpus/swift/functions/function-call-with-labelled-arguments.output
@@ -28,15 +28,13 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        call_expr
-          callee:
-            name_expr
-              identifier: identifier "greet"
+        call_expr source="⟨callee⟩(⟨argument⟩)"
+          callee: identifier "greet" source="greet"
           argument:
-            argument
-              name: identifier "person"
-              value: string_literal "\"Bob\""
+            argument source="⟨name_node⟩: ⟨value⟩"
+              name_node: identifier "person" source="person"
+              value: string_literal "\"Bob\"" source="\"Bob\""
diff --git a/unified/extractor/tests/corpus/swift/functions/function-call.output b/unified/extractor/tests/corpus/swift/functions/function-call.output
index a1e2859ccd6a..79fc9e7f52e5 100644
--- a/unified/extractor/tests/corpus/swift/functions/function-call.output
+++ b/unified/extractor/tests/corpus/swift/functions/function-call.output
@@ -1,5 +1,13 @@
 foo(1, 2)
 
+handle {
+  first()
+} completion: {
+  second()
+} failure: {
+  third()
+}
+
 ---
 
 sourceFile
@@ -24,19 +32,105 @@ sourceFile
           calledExpression:
             declReferenceExpr
               baseName: identifier "foo"
+    codeBlockItem
+      item:
+        functionCallExpr
+          arguments:
+          additionalTrailingClosures:
+            multipleTrailingClosureElement
+              colon: :
+              label: identifier "completion"
+              closure:
+                closureExpr
+                  leftBrace: {
+                  rightBrace: }
+                  statements:
+                    codeBlockItem
+                      item:
+                        functionCallExpr
+                          leftParen: (
+                          rightParen: )
+                          arguments:
+                          additionalTrailingClosures:
+                          calledExpression:
+                            declReferenceExpr
+                              baseName: identifier "second"
+            multipleTrailingClosureElement
+              colon: :
+              label: identifier "failure"
+              closure:
+                closureExpr
+                  leftBrace: {
+                  rightBrace: }
+                  statements:
+                    codeBlockItem
+                      item:
+                        functionCallExpr
+                          leftParen: (
+                          rightParen: )
+                          arguments:
+                          additionalTrailingClosures:
+                          calledExpression:
+                            declReferenceExpr
+                              baseName: identifier "third"
+          calledExpression:
+            declReferenceExpr
+              baseName: identifier "handle"
+          trailingClosure:
+            closureExpr
+              leftBrace: {
+              rightBrace: }
+              statements:
+                codeBlockItem
+                  item:
+                    functionCallExpr
+                      leftParen: (
+                      rightParen: )
+                      arguments:
+                      additionalTrailingClosures:
+                      calledExpression:
+                        declReferenceExpr
+                          baseName: identifier "first"
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩\n\n⟨stmt⟩"
       stmt:
-        call_expr
-          callee:
-            name_expr
-              identifier: identifier "foo"
+        call_expr source="⟨callee⟩(⟨argument⟩, ⟨argument⟩)"
+          callee: identifier "foo" source="foo"
+          argument:
+            argument source="⟨value⟩"
+              value: int_literal "1" source="1"
+            argument source="⟨value⟩"
+              value: int_literal "2" source="2"
+        call_expr source="⟨callee⟩ ⟨argument⟩ ⟨argument⟩ ⟨argument⟩"
+          callee: identifier "handle" source="handle"
           argument:
-            argument
-              value: int_literal "1"
-            argument
-              value: int_literal "2"
+            argument source="⟨value⟩"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩"
+                      stmt:
+                        call_expr source="⟨callee⟩()"
+                          callee: identifier "first" source="first"
+            argument source="⟨name_node⟩: ⟨value⟩"
+              name_node: identifier "completion" source="completion"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩"
+                      stmt:
+                        call_expr source="⟨callee⟩()"
+                          callee: identifier "second" source="second"
+            argument source="⟨name_node⟩: ⟨value⟩"
+              name_node: identifier "failure" source="failure"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩"
+                      stmt:
+                        call_expr source="⟨callee⟩()"
+                          callee: identifier "third" source="third"
diff --git a/unified/extractor/tests/corpus/swift/functions/function-call.swift b/unified/extractor/tests/corpus/swift/functions/function-call.swift
index 22594bf8c7da..d3fc9dd70c9c 100644
--- a/unified/extractor/tests/corpus/swift/functions/function-call.swift
+++ b/unified/extractor/tests/corpus/swift/functions/function-call.swift
@@ -1 +1,9 @@
 foo(1, 2)
+
+handle {
+  first()
+} completion: {
+  second()
+} failure: {
+  third()
+}
diff --git a/unified/extractor/tests/corpus/swift/functions/function-with-default-parameter-value.output b/unified/extractor/tests/corpus/swift/functions/function-with-default-parameter-value.output
index 3495a13106fb..c1407cf91e84 100644
--- a/unified/extractor/tests/corpus/swift/functions/function-with-default-parameter-value.output
+++ b/unified/extractor/tests/corpus/swift/functions/function-with-default-parameter-value.output
@@ -30,8 +30,8 @@ sourceFile
                       calledExpression:
                         declReferenceExpr
                           baseName: identifier "print"
-          name: identifier "greet"
           modifiers:
+          name: identifier "greet"
           signature:
             functionSignature
               parameterClause:
@@ -61,30 +61,23 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "greet"
+        function_declaration source="func ⟨name_node⟩(⟨parameter⟩) ⟨body⟩"
+          name_node: identifier "greet" source="greet"
           parameter:
-            parameter
-              type:
-                named_type_expr
-                  name: identifier "String"
-              pattern:
-                name_pattern
-                  identifier: identifier "name"
-              default: string_literal "\"world\""
+            parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩ = ⟨default⟩"
+              external_name_node: identifier "name" source="name"
+              type: identifier "String" source="String"
+              pattern: identifier "name" source="name"
+              default: string_literal "\"world\"" source="\"world\""
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "print"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
                   argument:
-                    argument
-                      value:
-                        name_expr
-                          identifier: identifier "name"
+                    argument source="⟨value⟩"
+                      value: identifier "name" source="name"
diff --git a/unified/extractor/tests/corpus/swift/functions/function-with-inout-parameter.output b/unified/extractor/tests/corpus/swift/functions/function-with-inout-parameter.output
index 232fb6dc2dbc..5150a58b9ad2 100644
--- a/unified/extractor/tests/corpus/swift/functions/function-with-inout-parameter.output
+++ b/unified/extractor/tests/corpus/swift/functions/function-with-inout-parameter.output
@@ -28,8 +28,8 @@ sourceFile
                       rightOperand:
                         integerLiteralExpr
                           literal: integerLiteral "1"
-          name: identifier "increment"
           modifiers:
+          name: identifier "increment"
           signature:
             functionSignature
               parameterClause:
@@ -57,25 +57,24 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "increment"
+        function_declaration source="func ⟨name_node⟩(⟨parameter⟩) ⟨body⟩"
+          name_node: identifier "increment" source="increment"
           parameter:
-            parameter
-              external_name: identifier "_"
-              type: unsupported_node "inout Int"
-              pattern:
-                name_pattern
-                  identifier: identifier "x"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                  modifier: modifier "inout" source="inout"
+                  type: identifier "Int" source="Int"
+              pattern: identifier "x" source="x"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                compound_assign_expr
-                  target:
-                    name_expr
-                      identifier: identifier "x"
-                  operator: infix_operator "+="
-                  value: int_literal "1"
+                binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                  left: identifier "x" source="x"
+                  operator: infix_operator "+=" source="+="
+                  right: int_literal "1" source="1"
diff --git a/unified/extractor/tests/corpus/swift/functions/function-with-named-parameters.output b/unified/extractor/tests/corpus/swift/functions/function-with-named-parameters.output
index 7488edbcb231..1f9c16392d35 100644
--- a/unified/extractor/tests/corpus/swift/functions/function-with-named-parameters.output
+++ b/unified/extractor/tests/corpus/swift/functions/function-with-named-parameters.output
@@ -30,8 +30,8 @@ sourceFile
                       calledExpression:
                         declReferenceExpr
                           baseName: identifier "print"
-          name: identifier "greet"
           modifiers:
+          name: identifier "greet"
           signature:
             functionSignature
               parameterClause:
@@ -52,30 +52,22 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "greet"
+        function_declaration source="func ⟨name_node⟩(⟨parameter⟩) ⟨body⟩"
+          name_node: identifier "greet" source="greet"
           parameter:
-            parameter
-              external_name: identifier "person"
-              type:
-                named_type_expr
-                  name: identifier "String"
-              pattern:
-                name_pattern
-                  identifier: identifier "name"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "person" source="person"
+              type: identifier "String" source="String"
+              pattern: identifier "name" source="name"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "print"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
                   argument:
-                    argument
-                      value:
-                        name_expr
-                          identifier: identifier "name"
+                    argument source="⟨value⟩"
+                      value: identifier "name" source="name"
diff --git a/unified/extractor/tests/corpus/swift/functions/function-with-no-parameters.output b/unified/extractor/tests/corpus/swift/functions/function-with-no-parameters.output
index 4ddc26ae94d6..4b36436cf982 100644
--- a/unified/extractor/tests/corpus/swift/functions/function-with-no-parameters.output
+++ b/unified/extractor/tests/corpus/swift/functions/function-with-no-parameters.output
@@ -34,8 +34,8 @@ sourceFile
                       calledExpression:
                         declReferenceExpr
                           baseName: identifier "print"
-          name: identifier "greet"
           modifiers:
+          name: identifier "greet"
           signature:
             functionSignature
               parameterClause:
@@ -47,19 +47,17 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "greet"
+        function_declaration source="func ⟨name_node⟩() ⟨body⟩"
+          name_node: identifier "greet" source="greet"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "print"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
                   argument:
-                    argument
-                      value: string_literal "\"hello\""
+                    argument source="⟨value⟩"
+                      value: string_literal "\"hello\"" source="\"hello\""
diff --git a/unified/extractor/tests/corpus/swift/functions/function-with-parameters-and-return-type.output b/unified/extractor/tests/corpus/swift/functions/function-with-parameters-and-return-type.output
index e69b19307674..824f0d84eeca 100644
--- a/unified/extractor/tests/corpus/swift/functions/function-with-parameters-and-return-type.output
+++ b/unified/extractor/tests/corpus/swift/functions/function-with-parameters-and-return-type.output
@@ -31,8 +31,8 @@ sourceFile
                             declReferenceExpr
                               baseName: identifier "b"
                       returnKeyword: return
-          name: identifier "add"
           modifiers:
+          name: identifier "add"
           signature:
             functionSignature
               parameterClause:
@@ -69,42 +69,28 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "add"
+        function_declaration source="func ⟨name_node⟩(⟨parameter⟩, ⟨parameter⟩) -> ⟨return_type⟩ ⟨body⟩"
+          name_node: identifier "add" source="add"
           parameter:
-            parameter
-              external_name: identifier "_"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-              pattern:
-                name_pattern
-                  identifier: identifier "a"
-            parameter
-              external_name: identifier "_"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-              pattern:
-                name_pattern
-                  identifier: identifier "b"
-          return_type:
-            named_type_expr
-              name: identifier "Int"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type: identifier "Int" source="Int"
+              pattern: identifier "a" source="a"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type: identifier "Int" source="Int"
+              pattern: identifier "b" source="b"
+          return_type: identifier "Int" source="Int"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                return_expr
+                return_expr source="return ⟨value⟩"
                   value:
-                    binary_expr
-                      left:
-                        name_expr
-                          identifier: identifier "a"
-                      operator: infix_operator "+"
-                      right:
-                        name_expr
-                          identifier: identifier "b"
+                    binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                      left: identifier "a" source="a"
+                      operator: infix_operator "+" source="+"
+                      right: identifier "b" source="b"
diff --git a/unified/extractor/tests/corpus/swift/functions/generic-function.output b/unified/extractor/tests/corpus/swift/functions/generic-function.output
index d09aac2744a2..c8186fb6dd18 100644
--- a/unified/extractor/tests/corpus/swift/functions/generic-function.output
+++ b/unified/extractor/tests/corpus/swift/functions/generic-function.output
@@ -23,6 +23,7 @@ sourceFile
                         declReferenceExpr
                           baseName: identifier "x"
                       returnKeyword: return
+          modifiers:
           name: identifier "identity"
           genericParameterClause:
             genericParameterClause
@@ -32,7 +33,6 @@ sourceFile
                   name: identifier "T"
               leftAngle: <
               rightAngle: >
-          modifiers:
           signature:
             functionSignature
               parameterClause:
@@ -59,28 +59,23 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "identity"
+        function_declaration source="func ⟨name_node⟩<⟨type_parameter⟩>(⟨parameter⟩) -> ⟨return_type⟩ ⟨body⟩"
+          name_node: identifier "identity" source="identity"
+          type_parameter:
+            type_parameter source="⟨name_node⟩"
+              name_node: identifier "T" source="T"
           parameter:
-            parameter
-              external_name: identifier "_"
-              type:
-                named_type_expr
-                  name: identifier "T"
-              pattern:
-                name_pattern
-                  identifier: identifier "x"
-          return_type:
-            named_type_expr
-              name: identifier "T"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type: identifier "T" source="T"
+              pattern: identifier "x" source="x"
+          return_type: identifier "T" source="T"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                return_expr
-                  value:
-                    name_expr
-                      identifier: identifier "x"
+                return_expr source="return ⟨value⟩"
+                  value: identifier "x" source="x"
diff --git a/unified/extractor/tests/corpus/swift/functions/generic-type-alias.output b/unified/extractor/tests/corpus/swift/functions/generic-type-alias.output
new file mode 100644
index 000000000000..3b887f71abfc
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/functions/generic-type-alias.output
@@ -0,0 +1,71 @@
+typealias Box<T: Equatable, U> = Dictionary<T, U>
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        typeAliasDecl
+          attributes:
+          modifiers:
+          name: identifier "Box"
+          genericParameterClause:
+            genericParameterClause
+              parameters:
+                genericParameter
+                  colon: :
+                  attributes:
+                  name: identifier "T"
+                  trailingComma: ,
+                  inheritedType:
+                    identifierType
+                      name: identifier "Equatable"
+                genericParameter
+                  attributes:
+                  name: identifier "U"
+              leftAngle: <
+              rightAngle: >
+          initializer:
+            typeInitializerClause
+              equal: =
+              value:
+                identifierType
+                  name: identifier "Dictionary"
+                  genericArgumentClause:
+                    genericArgumentClause
+                      arguments:
+                        genericArgument
+                          trailingComma: ,
+                          argument:
+                            identifierType
+                              name: identifier "T"
+                        genericArgument
+                          argument:
+                            identifierType
+                              name: identifier "U"
+                      leftAngle: <
+                      rightAngle: >
+          typealiasKeyword: typealias
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩"
+      stmt:
+        type_alias_declaration source="typealias ⟨name_node⟩<⟨type_parameter⟩, ⟨type_parameter⟩> = ⟨type⟩"
+          name_node: identifier "Box" source="Box"
+          type_parameter:
+            type_parameter source="⟨name_node⟩: ⟨bound⟩"
+              name_node: identifier "T" source="T"
+              bound: identifier "Equatable" source="Equatable"
+            type_parameter source="⟨name_node⟩"
+              name_node: identifier "U" source="U"
+          type:
+            generic_type_expr source="⟨base⟩<⟨type_argument⟩, ⟨type_argument⟩>"
+              base: identifier "Dictionary" source="Dictionary"
+              type_argument:
+                identifier "T" source="T"
+                identifier "U" source="U"
diff --git a/unified/extractor/tests/corpus/swift/functions/generic-type-alias.swift b/unified/extractor/tests/corpus/swift/functions/generic-type-alias.swift
new file mode 100644
index 000000000000..831f552bab1a
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/functions/generic-type-alias.swift
@@ -0,0 +1 @@
+typealias Box<T: Equatable, U> = Dictionary<T, U>
diff --git a/unified/extractor/tests/corpus/swift/functions/leading-dot-expression-call.output b/unified/extractor/tests/corpus/swift/functions/leading-dot-expression-call.output
index d0a844d02afa..3335f2ba054b 100644
--- a/unified/extractor/tests/corpus/swift/functions/leading-dot-expression-call.output
+++ b/unified/extractor/tests/corpus/swift/functions/leading-dot-expression-call.output
@@ -38,21 +38,19 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "y"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "y" source="y"
           value:
-            call_expr
+            call_expr source="⟨callee⟩(⟨argument⟩)"
               callee:
-                member_access_expr
-                  base: inferred_type_expr ".some"
-                  member: identifier "some"
+                member_access_expr source="⟨base⟩⟨member_name_node⟩"
+                  base: inferred_type_expr "." source="."
+                  member_name_node: identifier "some" source="some"
               argument:
-                argument
-                  value: int_literal "1"
+                argument source="⟨value⟩"
+                  value: int_literal "1" source="1"
diff --git a/unified/extractor/tests/corpus/swift/functions/leading-dot-expression-value.output b/unified/extractor/tests/corpus/swift/functions/leading-dot-expression-value.output
index bec014593d91..233ba6d5c1a7 100644
--- a/unified/extractor/tests/corpus/swift/functions/leading-dot-expression-value.output
+++ b/unified/extractor/tests/corpus/swift/functions/leading-dot-expression-value.output
@@ -28,16 +28,14 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "x"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "x" source="x"
           value:
-            member_access_expr
-              base: inferred_type_expr ".foo"
-              member: identifier "foo"
+            member_access_expr source="⟨base⟩⟨member_name_node⟩"
+              base: inferred_type_expr "." source="."
+              member_name_node: identifier "foo" source="foo"
diff --git a/unified/extractor/tests/corpus/swift/functions/method-call.output b/unified/extractor/tests/corpus/swift/functions/method-call.output
index 3c0b150b8235..62c9506ef630 100644
--- a/unified/extractor/tests/corpus/swift/functions/method-call.output
+++ b/unified/extractor/tests/corpus/swift/functions/method-call.output
@@ -28,17 +28,15 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        call_expr
+        call_expr source="⟨callee⟩(⟨argument⟩)"
           callee:
-            member_access_expr
-              base:
-                name_expr
-                  identifier: identifier "list"
-              member: identifier "append"
+            member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+              base: identifier "list" source="list"
+              member_name_node: identifier "append" source="append"
           argument:
-            argument
-              value: int_literal "1"
+            argument source="⟨value⟩"
+              value: int_literal "1" source="1"
diff --git a/unified/extractor/tests/corpus/swift/functions/nested-function-type.output b/unified/extractor/tests/corpus/swift/functions/nested-function-type.output
index d9ce0cd7a976..aaad50500e43 100644
--- a/unified/extractor/tests/corpus/swift/functions/nested-function-type.output
+++ b/unified/extractor/tests/corpus/swift/functions/nested-function-type.output
@@ -11,8 +11,8 @@ sourceFile
       item:
         typeAliasDecl
           attributes:
-          name: identifier "NestedFunction"
           modifiers:
+          name: identifier "NestedFunction"
           initializer:
             typeInitializerClause
               equal: =
@@ -48,8 +48,8 @@ sourceFile
       item:
         typeAliasDecl
           attributes:
-          name: identifier "MixedParametersAndTuples"
           modifiers:
+          name: identifier "MixedParametersAndTuples"
           initializer:
             typeInitializerClause
               equal: =
@@ -100,57 +100,41 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩\n\n⟨stmt⟩"
       stmt:
-        type_alias_declaration
-          name: identifier "NestedFunction"
+        type_alias_declaration source="typealias ⟨name_node⟩ = ⟨type⟩"
+          name_node: identifier "NestedFunction" source="NestedFunction"
           type:
-            function_type_expr
+            function_expr source="(⟨parameter⟩) -> ⟨return_type⟩"
               parameter:
-                parameter
+                parameter source="⟨type⟩"
                   type:
-                    function_type_expr
+                    function_expr source="(⟨parameter⟩) -> ⟨return_type⟩"
                       parameter:
-                        parameter
-                          type:
-                            named_type_expr
-                              name: identifier "Int"
-                      return_type:
-                        named_type_expr
-                          name: identifier "Bool"
-              return_type:
-                named_type_expr
-                  name: identifier "Bool"
-        type_alias_declaration
-          name: identifier "MixedParametersAndTuples"
+                        parameter source="⟨type⟩"
+                          type: identifier "Int" source="Int"
+                      return_type: identifier "Bool" source="Bool"
+              return_type: identifier "Bool" source="Bool"
+        type_alias_declaration source="typealias ⟨name_node⟩ = ⟨type⟩"
+          name_node: identifier "MixedParametersAndTuples" source="MixedParametersAndTuples"
           type:
-            function_type_expr
+            function_expr source="(⟨parameter⟩, ⟨parameter⟩) -> ⟨return_type⟩"
               parameter:
-                parameter
+                parameter source="⟨type⟩"
                   type:
-                    function_type_expr
+                    function_expr source="(⟨parameter⟩) -> ⟨return_type⟩"
                       parameter:
-                        parameter
-                          type:
-                            named_type_expr
-                              name: identifier "Int"
-                      return_type:
-                        named_type_expr
-                          name: identifier "Bool"
-                parameter
-                  type:
-                    named_type_expr
-                      name: identifier "String"
+                        parameter source="⟨type⟩"
+                          type: identifier "Int" source="Int"
+                      return_type: identifier "Bool" source="Bool"
+                parameter source="⟨type⟩"
+                  type: identifier "String" source="String"
               return_type:
-                tuple_type_expr
+                tuple_expr source="(⟨element⟩, ⟨element⟩)"
                   element:
-                    tuple_type_element
-                      type:
-                        named_type_expr
-                          name: identifier "Bool"
-                    tuple_type_element
-                      type:
-                        named_type_expr
-                          name: identifier "Int"
+                    argument source="⟨value⟩"
+                      value: identifier "Bool" source="Bool"
+                    argument source="⟨value⟩"
+                      value: identifier "Int" source="Int"
diff --git a/unified/extractor/tests/corpus/swift/functions/variadic-function.output b/unified/extractor/tests/corpus/swift/functions/variadic-function.output
index 78c20ffc01e9..0375165f23a6 100644
--- a/unified/extractor/tests/corpus/swift/functions/variadic-function.output
+++ b/unified/extractor/tests/corpus/swift/functions/variadic-function.output
@@ -44,8 +44,8 @@ sourceFile
                                 declReferenceExpr
                                   baseName: identifier "values"
                       returnKeyword: return
-          name: identifier "sum"
           modifiers:
+          name: identifier "sum"
           signature:
             functionSignature
               parameterClause:
@@ -73,40 +73,30 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "sum"
+        function_declaration source="func ⟨name_node⟩(⟨parameter⟩) -> ⟨return_type⟩ ⟨body⟩"
+          name_node: identifier "sum" source="sum"
           parameter:
-            parameter
-              external_name: identifier "_"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-              pattern:
-                name_pattern
-                  identifier: identifier "values"
-          return_type:
-            named_type_expr
-              name: identifier "Int"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩..."
+              external_name_node: identifier "_" source="_"
+              type: identifier "Int" source="Int"
+              pattern: identifier "values" source="values"
+          return_type: identifier "Int" source="Int"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                return_expr
+                return_expr source="return ⟨value⟩"
                   value:
-                    call_expr
+                    call_expr source="⟨callee⟩(⟨argument⟩, ⟨argument⟩)"
                       callee:
-                        member_access_expr
-                          base:
-                            name_expr
-                              identifier: identifier "values"
-                          member: identifier "reduce"
+                        member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                          base: identifier "values" source="values"
+                          member_name_node: identifier "reduce" source="reduce"
                       argument:
-                        argument
-                          value: int_literal "0"
-                        argument
-                          value:
-                            name_expr
-                              identifier: identifier "+"
+                        argument source="⟨value⟩"
+                          value: int_literal "0" source="0"
+                        argument source="⟨value⟩"
+                          value: identifier "+" source="+"
diff --git a/unified/extractor/tests/corpus/swift/literals/boolean-literals.output b/unified/extractor/tests/corpus/swift/literals/boolean-literals.output
index 34b394712a35..53e784af9d5a 100644
--- a/unified/extractor/tests/corpus/swift/literals/boolean-literals.output
+++ b/unified/extractor/tests/corpus/swift/literals/boolean-literals.output
@@ -17,9 +17,9 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩\n⟨stmt⟩"
       stmt:
-        boolean_literal "true"
-        boolean_literal "false"
+        boolean_literal "true" source="true"
+        boolean_literal "false" source="false"
diff --git a/unified/extractor/tests/corpus/swift/literals/floating-point-literal.output b/unified/extractor/tests/corpus/swift/literals/floating-point-literal.output
index 19fa40aac776..879eb5b3f020 100644
--- a/unified/extractor/tests/corpus/swift/literals/floating-point-literal.output
+++ b/unified/extractor/tests/corpus/swift/literals/floating-point-literal.output
@@ -12,7 +12,7 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
-      stmt: float_literal "3.14"
+    block source="⟨stmt⟩"
+      stmt: float_literal "3.14" source="3.14"
diff --git a/unified/extractor/tests/corpus/swift/literals/integer-literal.output b/unified/extractor/tests/corpus/swift/literals/integer-literal.output
index 9df79925753c..9e86858d7bdf 100644
--- a/unified/extractor/tests/corpus/swift/literals/integer-literal.output
+++ b/unified/extractor/tests/corpus/swift/literals/integer-literal.output
@@ -12,7 +12,7 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
-      stmt: int_literal "42"
+    block source="⟨stmt⟩"
+      stmt: int_literal "42" source="42"
diff --git a/unified/extractor/tests/corpus/swift/literals/line-magic-literal.output b/unified/extractor/tests/corpus/swift/literals/line-magic-literal.output
index 1616055fc16c..45361262ecb8 100644
--- a/unified/extractor/tests/corpus/swift/literals/line-magic-literal.output
+++ b/unified/extractor/tests/corpus/swift/literals/line-magic-literal.output
@@ -28,13 +28,13 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "currentLine"
-          value: unsupported_node "#line"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "currentLine" source="currentLine"
+          value:
+            macro_call_expr source="#⟨macro_name_node⟩"
+              macro_name_node: identifier "line" source="line"
diff --git a/unified/extractor/tests/corpus/swift/literals/negative-integer-literal.output b/unified/extractor/tests/corpus/swift/literals/negative-integer-literal.output
index 907944054782..99c94b78bf86 100644
--- a/unified/extractor/tests/corpus/swift/literals/negative-integer-literal.output
+++ b/unified/extractor/tests/corpus/swift/literals/negative-integer-literal.output
@@ -15,10 +15,10 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        unary_expr
-          operand: int_literal "7"
-          operator: prefix_operator "-"
+        unary_expr source="⟨operator⟩⟨operand⟩"
+          operand: int_literal "7" source="7"
+          operator: prefix_operator "-" source="-"
diff --git a/unified/extractor/tests/corpus/swift/literals/nil-literal.output b/unified/extractor/tests/corpus/swift/literals/nil-literal.output
index c7da232131fd..a81d5a2fd1e1 100644
--- a/unified/extractor/tests/corpus/swift/literals/nil-literal.output
+++ b/unified/extractor/tests/corpus/swift/literals/nil-literal.output
@@ -12,7 +12,7 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
-      stmt: builtin_expr "nil"
+    block source="⟨stmt⟩"
+      stmt: builtin_expr "nil" source="nil"
diff --git a/unified/extractor/tests/corpus/swift/literals/string-literal.output b/unified/extractor/tests/corpus/swift/literals/string-literal.output
index 8d3ea8e796c0..f24e74608866 100644
--- a/unified/extractor/tests/corpus/swift/literals/string-literal.output
+++ b/unified/extractor/tests/corpus/swift/literals/string-literal.output
@@ -16,7 +16,7 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
-      stmt: string_literal "\"hello\""
+    block source="⟨stmt⟩"
+      stmt: string_literal "\"hello\"" source="\"hello\""
diff --git a/unified/extractor/tests/corpus/swift/literals/string-with-interpolation.output b/unified/extractor/tests/corpus/swift/literals/string-with-interpolation.output
index 5207085d174c..fab3a3eb38ed 100644
--- a/unified/extractor/tests/corpus/swift/literals/string-with-interpolation.output
+++ b/unified/extractor/tests/corpus/swift/literals/string-with-interpolation.output
@@ -1,5 +1,21 @@
+// Simple interpolation
 "hello \(name)"
 
+// Multiple interpolations
+"hello \(first) \(last)"
+
+// Interpolation with expression
+"result: \(x + y)"
+
+// Plain string before and after interpolation
+"prefix \(value) suffix"
+
+// Calls to custom DefaultStringInterpolation.appendInterpolation impls
+"foo \(x, y)"
+"foo \(x, y, z)"
+"foo \(arg: x)"
+"foo \(arg: x, arg2: y)"
+
 ---
 
 sourceFile
@@ -24,10 +40,281 @@ sourceFile
                       baseName: identifier "name"
             stringSegment
               content: stringSegment
+    codeBlockItem
+      item:
+        stringLiteralExpr
+          closingQuote: "
+          openingQuote: "
+          segments:
+            stringSegment
+              content: stringSegment "hello "
+            expressionSegment
+              leftParen: (
+              rightParen: )
+              backslash: \
+              expressions:
+                labeledExpr
+                  expression:
+                    declReferenceExpr
+                      baseName: identifier "first"
+            stringSegment
+              content: stringSegment " "
+            expressionSegment
+              leftParen: (
+              rightParen: )
+              backslash: \
+              expressions:
+                labeledExpr
+                  expression:
+                    declReferenceExpr
+                      baseName: identifier "last"
+            stringSegment
+              content: stringSegment
+    codeBlockItem
+      item:
+        stringLiteralExpr
+          closingQuote: "
+          openingQuote: "
+          segments:
+            stringSegment
+              content: stringSegment "result: "
+            expressionSegment
+              leftParen: (
+              rightParen: )
+              backslash: \
+              expressions:
+                labeledExpr
+                  expression:
+                    infixOperatorExpr
+                      operator:
+                        binaryOperatorExpr
+                          operator: binaryOperator "+"
+                      leftOperand:
+                        declReferenceExpr
+                          baseName: identifier "x"
+                      rightOperand:
+                        declReferenceExpr
+                          baseName: identifier "y"
+            stringSegment
+              content: stringSegment
+    codeBlockItem
+      item:
+        stringLiteralExpr
+          closingQuote: "
+          openingQuote: "
+          segments:
+            stringSegment
+              content: stringSegment "prefix "
+            expressionSegment
+              leftParen: (
+              rightParen: )
+              backslash: \
+              expressions:
+                labeledExpr
+                  expression:
+                    declReferenceExpr
+                      baseName: identifier "value"
+            stringSegment
+              content: stringSegment " suffix"
+    codeBlockItem
+      item:
+        stringLiteralExpr
+          closingQuote: "
+          openingQuote: "
+          segments:
+            stringSegment
+              content: stringSegment "foo "
+            expressionSegment
+              leftParen: (
+              rightParen: )
+              backslash: \
+              expressions:
+                labeledExpr
+                  expression:
+                    declReferenceExpr
+                      baseName: identifier "x"
+                  trailingComma: ,
+                labeledExpr
+                  expression:
+                    declReferenceExpr
+                      baseName: identifier "y"
+            stringSegment
+              content: stringSegment
+    codeBlockItem
+      item:
+        stringLiteralExpr
+          closingQuote: "
+          openingQuote: "
+          segments:
+            stringSegment
+              content: stringSegment "foo "
+            expressionSegment
+              leftParen: (
+              rightParen: )
+              backslash: \
+              expressions:
+                labeledExpr
+                  expression:
+                    declReferenceExpr
+                      baseName: identifier "x"
+                  trailingComma: ,
+                labeledExpr
+                  expression:
+                    declReferenceExpr
+                      baseName: identifier "y"
+                  trailingComma: ,
+                labeledExpr
+                  expression:
+                    declReferenceExpr
+                      baseName: identifier "z"
+            stringSegment
+              content: stringSegment
+    codeBlockItem
+      item:
+        stringLiteralExpr
+          closingQuote: "
+          openingQuote: "
+          segments:
+            stringSegment
+              content: stringSegment "foo "
+            expressionSegment
+              leftParen: (
+              rightParen: )
+              backslash: \
+              expressions:
+                labeledExpr
+                  colon: :
+                  label: identifier "arg"
+                  expression:
+                    declReferenceExpr
+                      baseName: identifier "x"
+            stringSegment
+              content: stringSegment
+    codeBlockItem
+      item:
+        stringLiteralExpr
+          closingQuote: "
+          openingQuote: "
+          segments:
+            stringSegment
+              content: stringSegment "foo "
+            expressionSegment
+              leftParen: (
+              rightParen: )
+              backslash: \
+              expressions:
+                labeledExpr
+                  colon: :
+                  label: identifier "arg"
+                  expression:
+                    declReferenceExpr
+                      baseName: identifier "x"
+                  trailingComma: ,
+                labeledExpr
+                  colon: :
+                  label: identifier "arg2"
+                  expression:
+                    declReferenceExpr
+                      baseName: identifier "y"
+            stringSegment
+              content: stringSegment
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
-      stmt: string_literal "\"hello \\(name)\""
+    block source="⟨stmt⟩\n\n// Multiple interpolations\n⟨stmt⟩\n\n// Interpolation with expression\n⟨stmt⟩\n\n// Plain string before and after interpolation\n⟨stmt⟩\n\n// Calls to custom DefaultStringInterpolation.appendInterpolation impls\n⟨stmt⟩\n⟨stmt⟩\n⟨stmt⟩\n⟨stmt⟩"
+      stmt:
+        string_interpolation_expr source="\"⟨element⟩⟨element⟩\""
+          element:
+            string_literal "hello " source="hello "
+            call_expr source="\\(⟨argument⟩)"
+              callee: builtin_expr "interpolation" source=""
+              argument:
+                argument source="⟨value⟩"
+                  value: identifier "name" source="name"
+            string_literal source=""
+        string_interpolation_expr source="\"⟨element⟩⟨element⟩⟨element⟩⟨element⟩\""
+          element:
+            string_literal "hello " source="hello "
+            call_expr source="\\(⟨argument⟩)"
+              callee: builtin_expr "interpolation" source=""
+              argument:
+                argument source="⟨value⟩"
+                  value: identifier "first" source="first"
+            string_literal " " source=" "
+            call_expr source="\\(⟨argument⟩)"
+              callee: builtin_expr "interpolation" source=""
+              argument:
+                argument source="⟨value⟩"
+                  value: identifier "last" source="last"
+            string_literal source=""
+        string_interpolation_expr source="\"⟨element⟩⟨element⟩\""
+          element:
+            string_literal "result: " source="result: "
+            call_expr source="\\(⟨argument⟩)"
+              callee: builtin_expr "interpolation" source=""
+              argument:
+                argument source="⟨value⟩"
+                  value:
+                    binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                      left: identifier "x" source="x"
+                      operator: infix_operator "+" source="+"
+                      right: identifier "y" source="y"
+            string_literal source=""
+        string_interpolation_expr source="\"⟨element⟩⟨element⟩⟨element⟩\""
+          element:
+            string_literal "prefix " source="prefix "
+            call_expr source="\\(⟨argument⟩)"
+              callee: builtin_expr "interpolation" source=""
+              argument:
+                argument source="⟨value⟩"
+                  value: identifier "value" source="value"
+            string_literal " suffix" source=" suffix"
+        string_interpolation_expr source="\"⟨element⟩⟨element⟩\""
+          element:
+            string_literal "foo " source="foo "
+            call_expr source="\\(⟨argument⟩, ⟨argument⟩)"
+              callee: builtin_expr "interpolation" source=""
+              argument:
+                argument source="⟨value⟩"
+                  value: identifier "x" source="x"
+                argument source="⟨value⟩"
+                  value: identifier "y" source="y"
+            string_literal source=""
+        string_interpolation_expr source="\"⟨element⟩⟨element⟩\""
+          element:
+            string_literal "foo " source="foo "
+            call_expr source="\\(⟨argument⟩, ⟨argument⟩, ⟨argument⟩)"
+              callee: builtin_expr "interpolation" source=""
+              argument:
+                argument source="⟨value⟩"
+                  value: identifier "x" source="x"
+                argument source="⟨value⟩"
+                  value: identifier "y" source="y"
+                argument source="⟨value⟩"
+                  value: identifier "z" source="z"
+            string_literal source=""
+        string_interpolation_expr source="\"⟨element⟩⟨element⟩\""
+          element:
+            string_literal "foo " source="foo "
+            call_expr source="\\(⟨argument⟩)"
+              callee: builtin_expr "interpolation" source=""
+              argument:
+                argument source="⟨name_node⟩: ⟨value⟩"
+                  name_node: identifier "arg" source="arg"
+                  value: identifier "x" source="x"
+            string_literal source=""
+        string_interpolation_expr source="\"⟨element⟩⟨element⟩\""
+          element:
+            string_literal "foo " source="foo "
+            call_expr source="\\(⟨argument⟩, ⟨argument⟩)"
+              callee: builtin_expr "interpolation" source=""
+              argument:
+                argument source="⟨name_node⟩: ⟨value⟩"
+                  name_node: identifier "arg" source="arg"
+                  value: identifier "x" source="x"
+                argument source="⟨name_node⟩: ⟨value⟩"
+                  name_node: identifier "arg2" source="arg2"
+                  value: identifier "y" source="y"
+            string_literal source=""
diff --git a/unified/extractor/tests/corpus/swift/literals/string-with-interpolation.swift b/unified/extractor/tests/corpus/swift/literals/string-with-interpolation.swift
index 4c58b37b89e7..b72a94faa00c 100644
--- a/unified/extractor/tests/corpus/swift/literals/string-with-interpolation.swift
+++ b/unified/extractor/tests/corpus/swift/literals/string-with-interpolation.swift
@@ -1 +1,17 @@
+// Simple interpolation
 "hello \(name)"
+
+// Multiple interpolations
+"hello \(first) \(last)"
+
+// Interpolation with expression
+"result: \(x + y)"
+
+// Plain string before and after interpolation
+"prefix \(value) suffix"
+
+// Calls to custom DefaultStringInterpolation.appendInterpolation impls
+"foo \(x, y)"
+"foo \(x, y, z)"
+"foo \(arg: x)"
+"foo \(arg: x, arg2: y)"
diff --git a/unified/extractor/tests/corpus/swift/loops/break-and-continue.output b/unified/extractor/tests/corpus/swift/loops/break-and-continue.output
index 7ce869998272..c24ef267ec62 100644
--- a/unified/extractor/tests/corpus/swift/loops/break-and-continue.output
+++ b/unified/extractor/tests/corpus/swift/loops/break-and-continue.output
@@ -98,48 +98,36 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        for_each_stmt
-          pattern:
-            name_pattern
-              identifier: identifier "x"
-          iterable:
-            name_expr
-              identifier: identifier "xs"
+        for_each_stmt source="for ⟨pattern⟩ in ⟨iterable⟩ ⟨body⟩"
+          pattern: identifier "x" source="x"
+          iterable: identifier "xs" source="xs"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n  ⟨stmt⟩\n  ⟨stmt⟩\n}"
               stmt:
-                if_expr
+                if_expr source="if ⟨condition⟩ ⟨then⟩"
                   condition:
-                    binary_expr
-                      left:
-                        name_expr
-                          identifier: identifier "x"
-                      operator: infix_operator "<"
-                      right: int_literal "0"
+                    binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                      left: identifier "x" source="x"
+                      operator: infix_operator "<" source="<"
+                      right: int_literal "0" source="0"
                   then:
-                    block
-                      stmt: continue_expr "continue"
-                if_expr
+                    block source="{ ⟨stmt⟩ }"
+                      stmt: continue_expr "continue" source="continue"
+                if_expr source="if ⟨condition⟩ ⟨then⟩"
                   condition:
-                    binary_expr
-                      left:
-                        name_expr
-                          identifier: identifier "x"
-                      operator: infix_operator ">"
-                      right: int_literal "100"
+                    binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                      left: identifier "x" source="x"
+                      operator: infix_operator ">" source=">"
+                      right: int_literal "100" source="100"
                   then:
-                    block
-                      stmt: break_expr "break"
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "print"
+                    block source="{ ⟨stmt⟩ }"
+                      stmt: break_expr "break" source="break"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
                   argument:
-                    argument
-                      value:
-                        name_expr
-                          identifier: identifier "x"
+                    argument source="⟨value⟩"
+                      value: identifier "x" source="x"
diff --git a/unified/extractor/tests/corpus/swift/loops/for-in-over-array-literal.output b/unified/extractor/tests/corpus/swift/loops/for-in-over-array-literal.output
index 2d8db27bfe85..4d927aad290c 100644
--- a/unified/extractor/tests/corpus/swift/loops/for-in-over-array-literal.output
+++ b/unified/extractor/tests/corpus/swift/loops/for-in-over-array-literal.output
@@ -56,29 +56,23 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        for_each_stmt
-          pattern:
-            name_pattern
-              identifier: identifier "x"
+        for_each_stmt source="for ⟨pattern⟩ in ⟨iterable⟩ ⟨body⟩"
+          pattern: identifier "x" source="x"
           iterable:
-            array_literal
+            array_literal source="[⟨element⟩, ⟨element⟩, ⟨element⟩]"
               element:
-                int_literal "1"
-                int_literal "2"
-                int_literal "3"
+                int_literal "1" source="1"
+                int_literal "2" source="2"
+                int_literal "3" source="3"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "print"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
                   argument:
-                    argument
-                      value:
-                        name_expr
-                          identifier: identifier "x"
+                    argument source="⟨value⟩"
+                      value: identifier "x" source="x"
diff --git a/unified/extractor/tests/corpus/swift/loops/for-in-over-range.output b/unified/extractor/tests/corpus/swift/loops/for-in-over-range.output
index cb8b4e67b68d..856aaf792846 100644
--- a/unified/extractor/tests/corpus/swift/loops/for-in-over-range.output
+++ b/unified/extractor/tests/corpus/swift/loops/for-in-over-range.output
@@ -48,28 +48,22 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        for_each_stmt
-          pattern:
-            name_pattern
-              identifier: identifier "i"
+        for_each_stmt source="for ⟨pattern⟩ in ⟨iterable⟩ ⟨body⟩"
+          pattern: identifier "i" source="i"
           iterable:
-            binary_expr
-              left: int_literal "0"
-              operator: infix_operator "..<"
-              right: int_literal "10"
+            binary_expr source="⟨left⟩⟨operator⟩⟨right⟩"
+              left: int_literal "0" source="0"
+              operator: infix_operator "..<" source="..<"
+              right: int_literal "10" source="10"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "print"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
                   argument:
-                    argument
-                      value:
-                        name_expr
-                          identifier: identifier "i"
+                    argument source="⟨value⟩"
+                      value: identifier "i" source="i"
diff --git a/unified/extractor/tests/corpus/swift/loops/for-in-with-where-clause.output b/unified/extractor/tests/corpus/swift/loops/for-in-with-where-clause.output
index 6659039029f3..412fc6b3672c 100644
--- a/unified/extractor/tests/corpus/swift/loops/for-in-with-where-clause.output
+++ b/unified/extractor/tests/corpus/swift/loops/for-in-with-where-clause.output
@@ -54,33 +54,23 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        for_each_stmt
-          pattern:
-            name_pattern
-              identifier: identifier "x"
-          iterable:
-            name_expr
-              identifier: identifier "xs"
+        for_each_stmt source="for ⟨pattern⟩ in ⟨iterable⟩ where ⟨guard⟩ ⟨body⟩"
+          pattern: identifier "x" source="x"
+          iterable: identifier "xs" source="xs"
           guard:
-            binary_expr
-              left:
-                name_expr
-                  identifier: identifier "x"
-              operator: infix_operator ">"
-              right: int_literal "0"
+            binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+              left: identifier "x" source="x"
+              operator: infix_operator ">" source=">"
+              right: int_literal "0" source="0"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "print"
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
                   argument:
-                    argument
-                      value:
-                        name_expr
-                          identifier: identifier "x"
+                    argument source="⟨value⟩"
+                      value: identifier "x" source="x"
diff --git a/unified/extractor/tests/corpus/swift/loops/repeat-while-loop.output b/unified/extractor/tests/corpus/swift/loops/repeat-while-loop.output
index 71c49fd2cd10..53e4be6b6e5a 100644
--- a/unified/extractor/tests/corpus/swift/loops/repeat-while-loop.output
+++ b/unified/extractor/tests/corpus/swift/loops/repeat-while-loop.output
@@ -43,24 +43,20 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        do_while_stmt
+        do_while_stmt source="repeat ⟨body⟩ while ⟨condition⟩"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                compound_assign_expr
-                  target:
-                    name_expr
-                      identifier: identifier "x"
-                  operator: infix_operator "-="
-                  value: int_literal "1"
+                binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                  left: identifier "x" source="x"
+                  operator: infix_operator "-=" source="-="
+                  right: int_literal "1" source="1"
           condition:
-            binary_expr
-              left:
-                name_expr
-                  identifier: identifier "x"
-              operator: infix_operator ">"
-              right: int_literal "0"
+            binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+              left: identifier "x" source="x"
+              operator: infix_operator ">" source=">"
+              right: int_literal "0" source="0"
diff --git a/unified/extractor/tests/corpus/swift/loops/while-loop.output b/unified/extractor/tests/corpus/swift/loops/while-loop.output
index 1132c6f9f819..e9e6d67c3bb5 100644
--- a/unified/extractor/tests/corpus/swift/loops/while-loop.output
+++ b/unified/extractor/tests/corpus/swift/loops/while-loop.output
@@ -44,24 +44,20 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        while_stmt
+        while_stmt source="while ⟨condition⟩ ⟨body⟩"
           condition:
-            binary_expr
-              left:
-                name_expr
-                  identifier: identifier "x"
-              operator: infix_operator ">"
-              right: int_literal "0"
+            binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+              left: identifier "x" source="x"
+              operator: infix_operator ">" source=">"
+              right: int_literal "0" source="0"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                compound_assign_expr
-                  target:
-                    name_expr
-                      identifier: identifier "x"
-                  operator: infix_operator "-="
-                  value: int_literal "1"
+                binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                  left: identifier "x" source="x"
+                  operator: infix_operator "-=" source="-="
+                  right: int_literal "1" source="1"
diff --git a/unified/extractor/tests/corpus/swift/operators/addition.output b/unified/extractor/tests/corpus/swift/operators/addition.output
index 9ba0f4de4770..20e75d76b371 100644
--- a/unified/extractor/tests/corpus/swift/operators/addition.output
+++ b/unified/extractor/tests/corpus/swift/operators/addition.output
@@ -20,15 +20,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        binary_expr
-          left:
-            name_expr
-              identifier: identifier "a"
-          operator: infix_operator "+"
-          right:
-            name_expr
-              identifier: identifier "b"
+        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+          left: identifier "a" source="a"
+          operator: infix_operator "+" source="+"
+          right: identifier "b" source="b"
diff --git a/unified/extractor/tests/corpus/swift/operators/comparison.output b/unified/extractor/tests/corpus/swift/operators/comparison.output
index 49bb8c996f2c..01e9bc0d8de1 100644
--- a/unified/extractor/tests/corpus/swift/operators/comparison.output
+++ b/unified/extractor/tests/corpus/swift/operators/comparison.output
@@ -20,15 +20,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        binary_expr
-          left:
-            name_expr
-              identifier: identifier "a"
-          operator: infix_operator "<"
-          right:
-            name_expr
-              identifier: identifier "b"
+        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+          left: identifier "a" source="a"
+          operator: infix_operator "<" source="<"
+          right: identifier "b" source="b"
diff --git a/unified/extractor/tests/corpus/swift/operators/custom-postfix-operator.output b/unified/extractor/tests/corpus/swift/operators/custom-postfix-operator.output
index 5067671aa997..b9e63c4a8550 100644
--- a/unified/extractor/tests/corpus/swift/operators/custom-postfix-operator.output
+++ b/unified/extractor/tests/corpus/swift/operators/custom-postfix-operator.output
@@ -35,14 +35,15 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩\n⟨stmt⟩"
       stmt:
-        unsupported_node "postfix operator ^^"
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "squared"
-          value: unsupported_node "3^^"
+        unsupported_node "postfix operator ^^" source="postfix operator ^^"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "squared" source="squared"
+          value:
+            unary_expr source="⟨operand⟩⟨operator⟩"
+              operand: int_literal "3" source="3"
+              operator: postfix_operator "^^" source="^^"
diff --git a/unified/extractor/tests/corpus/swift/operators/division.output b/unified/extractor/tests/corpus/swift/operators/division.output
index f15dce8e8ea5..5400b45146f1 100644
--- a/unified/extractor/tests/corpus/swift/operators/division.output
+++ b/unified/extractor/tests/corpus/swift/operators/division.output
@@ -20,15 +20,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        binary_expr
-          left:
-            name_expr
-              identifier: identifier "a"
-          operator: infix_operator "/"
-          right:
-            name_expr
-              identifier: identifier "b"
+        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+          left: identifier "a" source="a"
+          operator: infix_operator "/" source="/"
+          right: identifier "b" source="b"
diff --git a/unified/extractor/tests/corpus/swift/operators/equality.output b/unified/extractor/tests/corpus/swift/operators/equality.output
index 7cf139ffa18d..a6f92fa7471e 100644
--- a/unified/extractor/tests/corpus/swift/operators/equality.output
+++ b/unified/extractor/tests/corpus/swift/operators/equality.output
@@ -20,15 +20,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        binary_expr
-          left:
-            name_expr
-              identifier: identifier "a"
-          operator: infix_operator "=="
-          right:
-            name_expr
-              identifier: identifier "b"
+        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+          left: identifier "a" source="a"
+          operator: infix_operator "==" source="=="
+          right: identifier "b" source="b"
diff --git a/unified/extractor/tests/corpus/swift/operators/logical-and.output b/unified/extractor/tests/corpus/swift/operators/logical-and.output
index 32a71ed1088c..1b652d920be4 100644
--- a/unified/extractor/tests/corpus/swift/operators/logical-and.output
+++ b/unified/extractor/tests/corpus/swift/operators/logical-and.output
@@ -20,15 +20,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        binary_expr
-          left:
-            name_expr
-              identifier: identifier "a"
-          operator: infix_operator "&&"
-          right:
-            name_expr
-              identifier: identifier "b"
+        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+          left: identifier "a" source="a"
+          operator: infix_operator "&&" source="&&"
+          right: identifier "b" source="b"
diff --git a/unified/extractor/tests/corpus/swift/operators/logical-not.output b/unified/extractor/tests/corpus/swift/operators/logical-not.output
index 1e80aa2ca71e..278667af8241 100644
--- a/unified/extractor/tests/corpus/swift/operators/logical-not.output
+++ b/unified/extractor/tests/corpus/swift/operators/logical-not.output
@@ -15,12 +15,10 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        unary_expr
-          operand:
-            name_expr
-              identifier: identifier "a"
-          operator: prefix_operator "!"
+        unary_expr source="⟨operator⟩⟨operand⟩"
+          operand: identifier "a" source="a"
+          operator: prefix_operator "!" source="!"
diff --git a/unified/extractor/tests/corpus/swift/operators/logical-or.output b/unified/extractor/tests/corpus/swift/operators/logical-or.output
index b75d018dea71..a6762a959794 100644
--- a/unified/extractor/tests/corpus/swift/operators/logical-or.output
+++ b/unified/extractor/tests/corpus/swift/operators/logical-or.output
@@ -20,15 +20,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        binary_expr
-          left:
-            name_expr
-              identifier: identifier "a"
-          operator: infix_operator "||"
-          right:
-            name_expr
-              identifier: identifier "b"
+        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+          left: identifier "a" source="a"
+          operator: infix_operator "||" source="||"
+          right: identifier "b" source="b"
diff --git a/unified/extractor/tests/corpus/swift/operators/multiplication.output b/unified/extractor/tests/corpus/swift/operators/multiplication.output
index 387c16439c48..b8fd88cf5299 100644
--- a/unified/extractor/tests/corpus/swift/operators/multiplication.output
+++ b/unified/extractor/tests/corpus/swift/operators/multiplication.output
@@ -20,15 +20,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        binary_expr
-          left:
-            name_expr
-              identifier: identifier "a"
-          operator: infix_operator "*"
-          right:
-            name_expr
-              identifier: identifier "b"
+        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+          left: identifier "a" source="a"
+          operator: infix_operator "*" source="*"
+          right: identifier "b" source="b"
diff --git a/unified/extractor/tests/corpus/swift/operators/operator-precedence-addition-and-multiplication.output b/unified/extractor/tests/corpus/swift/operators/operator-precedence-addition-and-multiplication.output
index f458c3ef847c..955797c45114 100644
--- a/unified/extractor/tests/corpus/swift/operators/operator-precedence-addition-and-multiplication.output
+++ b/unified/extractor/tests/corpus/swift/operators/operator-precedence-addition-and-multiplication.output
@@ -28,21 +28,15 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        binary_expr
-          left:
-            name_expr
-              identifier: identifier "a"
-          operator: infix_operator "+"
+        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+          left: identifier "a" source="a"
+          operator: infix_operator "+" source="+"
           right:
-            binary_expr
-              left:
-                name_expr
-                  identifier: identifier "b"
-              operator: infix_operator "*"
-              right:
-                name_expr
-                  identifier: identifier "c"
+            binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+              left: identifier "b" source="b"
+              operator: infix_operator "*" source="*"
+              right: identifier "c" source="c"
diff --git a/unified/extractor/tests/corpus/swift/operators/parenthesised-expression.output b/unified/extractor/tests/corpus/swift/operators/parenthesised-expression.output
index 0324476ce994..d5d1b99069e6 100644
--- a/unified/extractor/tests/corpus/swift/operators/parenthesised-expression.output
+++ b/unified/extractor/tests/corpus/swift/operators/parenthesised-expression.output
@@ -34,13 +34,15 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        binary_expr
-          left: tuple_expr "(a + b)"
-          operator: infix_operator "*"
-          right:
-            name_expr
-              identifier: identifier "c"
+        binary_expr source="(⟨left⟩) ⟨operator⟩ ⟨right⟩"
+          left:
+            binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+              left: identifier "a" source="a"
+              operator: infix_operator "+" source="+"
+              right: identifier "b" source="b"
+          operator: infix_operator "*" source="*"
+          right: identifier "c" source="c"
diff --git a/unified/extractor/tests/corpus/swift/operators/partial-range-from.output b/unified/extractor/tests/corpus/swift/operators/partial-range-from.output
index 1b9208cedf8b..da54bf04c071 100644
--- a/unified/extractor/tests/corpus/swift/operators/partial-range-from.output
+++ b/unified/extractor/tests/corpus/swift/operators/partial-range-from.output
@@ -28,13 +28,14 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "range"
-          value: unsupported_node "3..."
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "range" source="range"
+          value:
+            unary_expr source="⟨operand⟩⟨operator⟩"
+              operand: int_literal "3" source="3"
+              operator: postfix_operator "..." source="..."
diff --git a/unified/extractor/tests/corpus/swift/operators/range-operator.output b/unified/extractor/tests/corpus/swift/operators/range-operator.output
index 55ed3ab971a7..ab5aff23c30f 100644
--- a/unified/extractor/tests/corpus/swift/operators/range-operator.output
+++ b/unified/extractor/tests/corpus/swift/operators/range-operator.output
@@ -20,11 +20,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        binary_expr
-          left: int_literal "1"
-          operator: infix_operator "..."
-          right: int_literal "10"
+        binary_expr source="⟨left⟩⟨operator⟩⟨right⟩"
+          left: int_literal "1" source="1"
+          operator: infix_operator "..." source="..."
+          right: int_literal "10" source="10"
diff --git a/unified/extractor/tests/corpus/swift/operators/subtraction.output b/unified/extractor/tests/corpus/swift/operators/subtraction.output
index 5c6fd51a2d38..210d25065f8c 100644
--- a/unified/extractor/tests/corpus/swift/operators/subtraction.output
+++ b/unified/extractor/tests/corpus/swift/operators/subtraction.output
@@ -20,15 +20,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        binary_expr
-          left:
-            name_expr
-              identifier: identifier "a"
-          operator: infix_operator "-"
-          right:
-            name_expr
-              identifier: identifier "b"
+        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+          left: identifier "a" source="a"
+          operator: infix_operator "-" source="-"
+          right: identifier "b" source="b"
diff --git a/unified/extractor/tests/corpus/swift/operators/unresolved-operator-sequence-with-casts.output b/unified/extractor/tests/corpus/swift/operators/unresolved-operator-sequence-with-casts.output
index a0563c7bc88b..ee38198c0cc7 100644
--- a/unified/extractor/tests/corpus/swift/operators/unresolved-operator-sequence-with-casts.output
+++ b/unified/extractor/tests/corpus/swift/operators/unresolved-operator-sequence-with-casts.output
@@ -57,8 +57,8 @@ sourceFile
                           operator: binaryOperator ".&"
                         declReferenceExpr
                           baseName: identifier "b"
-          name: identifier "casts"
           modifiers:
+          name: identifier "casts"
           signature:
             functionSignature
               parameterClause:
@@ -89,53 +89,39 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "casts"
+        function_declaration source="func ⟨name_node⟩(⟨parameter⟩, ⟨parameter⟩) ⟨body⟩"
+          name_node: identifier "casts" source="casts"
           parameter:
-            parameter
-              external_name: identifier "_"
-              type:
-                named_type_expr
-                  name: identifier "Any"
-              pattern:
-                name_pattern
-                  identifier: identifier "a"
-            parameter
-              external_name: identifier "_"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-              pattern:
-                name_pattern
-                  identifier: identifier "b"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type: identifier "Any" source="Any"
+              pattern: identifier "a" source="a"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type: identifier "Int" source="Int"
+              pattern: identifier "b" source="b"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n  ⟨stmt⟩\n}"
               stmt:
-                unresolved_operator_sequence
+                unresolved_operator_sequence source="⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩"
                   element:
-                    name_expr
-                      identifier: identifier "_"
-                    infix_operator "="
-                    name_expr
-                      identifier: identifier "a"
-                    infix_operator "as"
-                    unsupported_node "Int"
-                    infix_operator ".&"
-                    name_expr
-                      identifier: identifier "b"
-                unresolved_operator_sequence
+                    ignore_pattern "_" source="_"
+                    infix_operator "=" source="="
+                    identifier "a" source="a"
+                    infix_operator "as" source="as"
+                    unsupported_node "Int" source="Int"
+                    infix_operator ".&" source=".&"
+                    identifier "b" source="b"
+                unresolved_operator_sequence source="⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩"
                   element:
-                    name_expr
-                      identifier: identifier "_"
-                    infix_operator "="
-                    name_expr
-                      identifier: identifier "a"
-                    infix_operator "is"
-                    unsupported_node "Int"
-                    infix_operator ".&"
-                    name_expr
-                      identifier: identifier "b"
+                    ignore_pattern "_" source="_"
+                    infix_operator "=" source="="
+                    identifier "a" source="a"
+                    infix_operator "is" source="is"
+                    unsupported_node "Int" source="Int"
+                    infix_operator ".&" source=".&"
+                    identifier "b" source="b"
diff --git a/unified/extractor/tests/corpus/swift/operators/unresolved-operator-sequence-with-ternary.output b/unified/extractor/tests/corpus/swift/operators/unresolved-operator-sequence-with-ternary.output
index 57274c32a9c2..20235e99a073 100644
--- a/unified/extractor/tests/corpus/swift/operators/unresolved-operator-sequence-with-ternary.output
+++ b/unified/extractor/tests/corpus/swift/operators/unresolved-operator-sequence-with-ternary.output
@@ -37,8 +37,8 @@ sourceFile
                             declReferenceExpr
                               baseName: identifier "d"
                       returnKeyword: return
-          name: identifier "choose"
           modifiers:
+          name: identifier "choose"
           signature:
             functionSignature
               parameterClause:
@@ -95,63 +95,41 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "choose"
+        function_declaration source="func ⟨name_node⟩(⟨parameter⟩, ⟨parameter⟩, ⟨parameter⟩, ⟨parameter⟩) -> ⟨return_type⟩ ⟨body⟩"
+          name_node: identifier "choose" source="choose"
           parameter:
-            parameter
-              external_name: identifier "_"
-              type:
-                named_type_expr
-                  name: identifier "Bool"
-              pattern:
-                name_pattern
-                  identifier: identifier "c"
-            parameter
-              external_name: identifier "_"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-              pattern:
-                name_pattern
-                  identifier: identifier "a"
-            parameter
-              external_name: identifier "_"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-              pattern:
-                name_pattern
-                  identifier: identifier "b"
-            parameter
-              external_name: identifier "_"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-              pattern:
-                name_pattern
-                  identifier: identifier "d"
-          return_type:
-            named_type_expr
-              name: identifier "Int"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type: identifier "Bool" source="Bool"
+              pattern: identifier "c" source="c"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type: identifier "Int" source="Int"
+              pattern: identifier "a" source="a"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type: identifier "Int" source="Int"
+              pattern: identifier "b" source="b"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type: identifier "Int" source="Int"
+              pattern: identifier "d" source="d"
+          return_type: identifier "Int" source="Int"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                return_expr
+                return_expr source="return ⟨value⟩"
                   value:
-                    unresolved_operator_sequence
+                    unresolved_operator_sequence source="⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩"
                       element:
-                        name_expr
-                          identifier: identifier "c"
-                        infix_operator "?"
-                        name_expr
-                          identifier: identifier "a"
-                        infix_operator ":"
-                        name_expr
-                          identifier: identifier "b"
-                        infix_operator ".&"
-                        name_expr
-                          identifier: identifier "d"
+                        identifier "c" source="c"
+                        infix_operator "?" source="?"
+                        identifier "a" source="a"
+                        infix_operator ":" source=":"
+                        identifier "b" source="b"
+                        infix_operator ".&" source=".&"
+                        identifier "d" source="d"
diff --git a/unified/extractor/tests/corpus/swift/operators/unresolved-operator-sequence.output b/unified/extractor/tests/corpus/swift/operators/unresolved-operator-sequence.output
index 46dc8ca6ae89..401e25e6fcce 100644
--- a/unified/extractor/tests/corpus/swift/operators/unresolved-operator-sequence.output
+++ b/unified/extractor/tests/corpus/swift/operators/unresolved-operator-sequence.output
@@ -30,8 +30,8 @@ sourceFile
                           operator: binaryOperator ".&"
                         declReferenceExpr
                           baseName: identifier "b"
-          name: identifier "combine"
           modifiers:
+          name: identifier "combine"
           signature:
             functionSignature
               parameterClause:
@@ -62,39 +62,28 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "combine"
+        function_declaration source="func ⟨name_node⟩(⟨parameter⟩, ⟨parameter⟩) ⟨body⟩"
+          name_node: identifier "combine" source="combine"
           parameter:
-            parameter
-              external_name: identifier "_"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-              pattern:
-                name_pattern
-                  identifier: identifier "a"
-            parameter
-              external_name: identifier "_"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-              pattern:
-                name_pattern
-                  identifier: identifier "b"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type: identifier "Int" source="Int"
+              pattern: identifier "a" source="a"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type: identifier "Int" source="Int"
+              pattern: identifier "b" source="b"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                unresolved_operator_sequence
+                unresolved_operator_sequence source="⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩ ⟨element⟩"
                   element:
-                    name_expr
-                      identifier: identifier "_"
-                    infix_operator "="
-                    name_expr
-                      identifier: identifier "a"
-                    infix_operator ".&"
-                    name_expr
-                      identifier: identifier "b"
+                    ignore_pattern "_" source="_"
+                    infix_operator "=" source="="
+                    identifier "a" source="a"
+                    infix_operator ".&" source=".&"
+                    identifier "b" source="b"
diff --git a/unified/extractor/tests/corpus/swift/optionals-and-errors/catch-where-clauses.output b/unified/extractor/tests/corpus/swift/optionals-and-errors/catch-where-clauses.output
index 79b7879d35fa..5506b163346f 100644
--- a/unified/extractor/tests/corpus/swift/optionals-and-errors/catch-where-clauses.output
+++ b/unified/extractor/tests/corpus/swift/optionals-and-errors/catch-where-clauses.output
@@ -136,72 +136,60 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        try_expr
+        try_expr source="do ⟨body⟩ ⟨catch_clause⟩ ⟨catch_clause⟩"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                unary_expr
+                unary_expr source="⟨operator⟩ ⟨operand⟩"
                   operand:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "foo"
-                  operator: prefix_operator "try"
+                    call_expr source="⟨callee⟩()"
+                      callee: identifier "foo" source="foo"
+                  operator: prefix_operator "try" source="try"
           catch_clause:
-            catch_clause
+            catch_clause source="catch ⟨pattern⟩ ⟨body⟩"
               pattern:
-                or_pattern
+                or_pattern source="⟨pattern⟩, ⟨pattern⟩"
                   pattern:
-                    conditional_pattern
+                    conditional_pattern source="⟨pattern⟩ where ⟨condition⟩"
                       condition:
-                        call_expr
-                          callee:
-                            name_expr
-                              identifier: identifier "isNetworkError"
+                        call_expr source="⟨callee⟩(⟨argument⟩)"
+                          callee: identifier "isNetworkError" source="isNetworkError"
                           argument:
-                            argument
-                              value:
-                                name_expr
-                                  identifier: identifier "e"
+                            argument source="⟨value⟩"
+                              value: identifier "e" source="e"
                       pattern:
-                        name_pattern
-                          identifier: identifier "e"
-                    conditional_pattern
+                        expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                          modifier: modifier "let" source="let"
+                          expr: identifier "e" source="e"
+                    conditional_pattern source="⟨pattern⟩ where ⟨condition⟩"
                       condition:
-                        call_expr
-                          callee:
-                            name_expr
-                              identifier: identifier "isTimeout"
+                        call_expr source="⟨callee⟩(⟨argument⟩)"
+                          callee: identifier "isTimeout" source="isTimeout"
                           argument:
-                            argument
-                              value:
-                                name_expr
-                                  identifier: identifier "f"
+                            argument source="⟨value⟩"
+                              value: identifier "f" source="f"
                       pattern:
-                        name_pattern
-                          identifier: identifier "f"
+                        expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                          modifier: modifier "let" source="let"
+                          expr: identifier "f" source="f"
               body:
-                block
+                block source="{\n  ⟨stmt⟩\n}"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value: string_literal "\"retry\""
-            catch_clause
+                        argument source="⟨value⟩"
+                          value: string_literal "\"retry\"" source="\"retry\""
+            catch_clause source="catch ⟨body⟩"
               body:
-                block
+                block source="{\n  ⟨stmt⟩\n}"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value: string_literal "\"fallback\""
+                        argument source="⟨value⟩"
+                          value: string_literal "\"fallback\"" source="\"fallback\""
diff --git a/unified/extractor/tests/corpus/swift/optionals-and-errors/do-catch.output b/unified/extractor/tests/corpus/swift/optionals-and-errors/do-catch.output
index 81491b295fc1..b97772cd71a4 100644
--- a/unified/extractor/tests/corpus/swift/optionals-and-errors/do-catch.output
+++ b/unified/extractor/tests/corpus/swift/optionals-and-errors/do-catch.output
@@ -57,32 +57,26 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        try_expr
+        try_expr source="do ⟨body⟩ ⟨catch_clause⟩"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                unary_expr
+                unary_expr source="⟨operator⟩ ⟨operand⟩"
                   operand:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "foo"
-                  operator: prefix_operator "try"
+                    call_expr source="⟨callee⟩()"
+                      callee: identifier "foo" source="foo"
+                  operator: prefix_operator "try" source="try"
           catch_clause:
-            catch_clause
+            catch_clause source="catch ⟨body⟩"
               body:
-                block
+                block source="{\n  ⟨stmt⟩\n}"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value:
-                            name_expr
-                              identifier: identifier "error"
+                        argument source="⟨value⟩"
+                          value: identifier "error" source="error"
diff --git a/unified/extractor/tests/corpus/swift/optionals-and-errors/force-unwrap.output b/unified/extractor/tests/corpus/swift/optionals-and-errors/force-unwrap.output
index 2c6fd1a6f763..8ed940058d75 100644
--- a/unified/extractor/tests/corpus/swift/optionals-and-errors/force-unwrap.output
+++ b/unified/extractor/tests/corpus/swift/optionals-and-errors/force-unwrap.output
@@ -28,18 +28,14 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "n"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "n" source="n"
           value:
-            unary_expr
-              operand:
-                name_expr
-                  identifier: identifier "opt"
-              operator: postfix_operator "!"
+            unary_expr source="⟨operand⟩⟨operator⟩"
+              operand: identifier "opt" source="opt"
+              operator: postfix_operator "!" source="!"
diff --git a/unified/extractor/tests/corpus/swift/optionals-and-errors/nil-coalescing.output b/unified/extractor/tests/corpus/swift/optionals-and-errors/nil-coalescing.output
index 31a039ad0065..5a35a80306a5 100644
--- a/unified/extractor/tests/corpus/swift/optionals-and-errors/nil-coalescing.output
+++ b/unified/extractor/tests/corpus/swift/optionals-and-errors/nil-coalescing.output
@@ -33,19 +33,15 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "n"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "n" source="n"
           value:
-            binary_expr
-              left:
-                name_expr
-                  identifier: identifier "opt"
-              operator: infix_operator "??"
-              right: int_literal "0"
+            binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+              left: identifier "opt" source="opt"
+              operator: infix_operator "??" source="??"
+              right: int_literal "0" source="0"
diff --git a/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-chaining.output b/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-chaining.output
index b69b0ae47d50..2fb5be96bc8f 100644
--- a/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-chaining.output
+++ b/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-chaining.output
@@ -43,21 +43,17 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "n"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "n" source="n"
           value:
-            member_access_expr
+            member_access_expr source="⟨base⟩?.⟨member_name_node⟩"
               base:
-                member_access_expr
-                  base:
-                    name_expr
-                      identifier: identifier "obj"
-                  member: identifier "foo"
-              member: identifier "bar"
+                member_access_expr source="⟨base⟩?.⟨member_name_node⟩"
+                  base: identifier "obj" source="obj"
+                  member_name_node: identifier "foo" source="foo"
+              member_name_node: identifier "bar" source="bar"
diff --git a/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-enum-case-binding.output b/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-enum-case-binding.output
new file mode 100644
index 000000000000..6e2b26b9678f
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-enum-case-binding.output
@@ -0,0 +1,110 @@
+if case .some(let value)? = input {
+  print(value)
+}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        expressionStmt
+          expression:
+            ifExpr
+              body:
+                codeBlock
+                  leftBrace: {
+                  rightBrace: }
+                  statements:
+                    codeBlockItem
+                      item:
+                        functionCallExpr
+                          leftParen: (
+                          rightParen: )
+                          arguments:
+                            labeledExpr
+                              expression:
+                                declReferenceExpr
+                                  baseName: identifier "value"
+                          additionalTrailingClosures:
+                          calledExpression:
+                            declReferenceExpr
+                              baseName: identifier "print"
+              conditions:
+                conditionElement
+                  condition:
+                    matchingPatternCondition
+                      initializer:
+                        initializerClause
+                          equal: =
+                          value:
+                            declReferenceExpr
+                              baseName: identifier "input"
+                      pattern:
+                        expressionPattern
+                          expression:
+                            optionalChainingExpr
+                              expression:
+                                functionCallExpr
+                                  leftParen: (
+                                  rightParen: )
+                                  arguments:
+                                    labeledExpr
+                                      expression:
+                                        patternExpr
+                                          pattern:
+                                            valueBindingPattern
+                                              pattern:
+                                                identifierPattern
+                                                  identifier: identifier "value"
+                                              bindingSpecifier: let
+                                  additionalTrailingClosures:
+                                  calledExpression:
+                                    memberAccessExpr
+                                      period: .
+                                      declName:
+                                        declReferenceExpr
+                                          baseName: identifier "some"
+                              questionMark: ?
+                      caseKeyword: case
+              ifKeyword: if
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩"
+      stmt:
+        if_expr source="if ⟨condition⟩ ⟨then⟩"
+          condition:
+            pattern_guard_expr source="case ⟨pattern⟩ = ⟨value⟩"
+              pattern:
+                call_expr source="⟨argument⟩?"
+                  callee:
+                    member_access_expr source=""
+                      base: identifier "Optional" source=""
+                      member_name_node: identifier "some" source=""
+                  argument:
+                    argument source="⟨value⟩"
+                      value:
+                        call_expr source="⟨callee⟩(⟨argument⟩)"
+                          callee:
+                            member_access_expr source="⟨base⟩⟨member_name_node⟩"
+                              base: inferred_type_expr "." source="."
+                              member_name_node: identifier "some" source="some"
+                          argument:
+                            argument source="⟨value⟩"
+                              value:
+                                expr_pattern source="⟨modifier⟩ ⟨expr⟩"
+                                  modifier: modifier "let" source="let"
+                                  expr: identifier "value" source="value"
+              value: identifier "input" source="input"
+          then:
+            block source="{\n  ⟨stmt⟩\n}"
+              stmt:
+                call_expr source="⟨callee⟩(⟨argument⟩)"
+                  callee: identifier "print" source="print"
+                  argument:
+                    argument source="⟨value⟩"
+                      value: identifier "value" source="value"
diff --git a/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-enum-case-binding.swift b/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-enum-case-binding.swift
new file mode 100644
index 000000000000..c0e58852bef1
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-enum-case-binding.swift
@@ -0,0 +1,3 @@
+if case .some(let value)? = input {
+  print(value)
+}
diff --git a/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-type-annotation.output b/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-type-annotation.output
index 1927b494ef9a..ceb65bc91c9c 100644
--- a/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-type-annotation.output
+++ b/unified/extractor/tests/corpus/swift/optionals-and-errors/optional-type-annotation.output
@@ -34,21 +34,15 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "x"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "x" source="x"
           type:
-            generic_type_expr
-              base:
-                named_type_expr
-                  name: identifier "Optional"
-              type_argument:
-                named_type_expr
-                  name: identifier "Int"
-          value: builtin_expr "nil"
+            generic_type_expr source="⟨type_argument⟩?"
+              base: identifier "Optional" source=""
+              type_argument: identifier "Int" source="Int"
+          value: builtin_expr "nil" source="nil"
diff --git a/unified/extractor/tests/corpus/swift/optionals-and-errors/throwing-function.output b/unified/extractor/tests/corpus/swift/optionals-and-errors/throwing-function.output
index e68b4c3c57ac..02f9117db7c6 100644
--- a/unified/extractor/tests/corpus/swift/optionals-and-errors/throwing-function.output
+++ b/unified/extractor/tests/corpus/swift/optionals-and-errors/throwing-function.output
@@ -27,8 +27,8 @@ sourceFile
                             stringSegment
                               content: stringSegment
                       returnKeyword: return
-          name: identifier "read"
           modifiers:
+          name: identifier "read"
           signature:
             functionSignature
               effectSpecifiers:
@@ -51,17 +51,15 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        function_declaration
-          name: identifier "read"
-          return_type:
-            named_type_expr
-              name: identifier "String"
+        function_declaration source="func ⟨name_node⟩() throws -> ⟨return_type⟩ ⟨body⟩"
+          name_node: identifier "read" source="read"
+          return_type: identifier "String" source="String"
           body:
-            block
+            block source="{\n  ⟨stmt⟩\n}"
               stmt:
-                return_expr
-                  value: string_literal "\"\""
+                return_expr source="return ⟨value⟩"
+                  value: string_literal "\"\"" source="\"\""
diff --git a/unified/extractor/tests/corpus/swift/optionals-and-errors/try-expression-2.output b/unified/extractor/tests/corpus/swift/optionals-and-errors/try-expression-2.output
index aafc0c67c217..0949c7553141 100644
--- a/unified/extractor/tests/corpus/swift/optionals-and-errors/try-expression-2.output
+++ b/unified/extractor/tests/corpus/swift/optionals-and-errors/try-expression-2.output
@@ -35,20 +35,16 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "result"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "result" source="result"
           value:
-            unary_expr
+            unary_expr source="⟨operator⟩ ⟨operand⟩"
               operand:
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "foo"
-              operator: prefix_operator "try!"
+                call_expr source="⟨callee⟩()"
+                  callee: identifier "foo" source="foo"
+              operator: prefix_operator "try!" source="try!"
diff --git a/unified/extractor/tests/corpus/swift/optionals-and-errors/try-expression.output b/unified/extractor/tests/corpus/swift/optionals-and-errors/try-expression.output
index 5b1b0b24d0fa..a5169c10141c 100644
--- a/unified/extractor/tests/corpus/swift/optionals-and-errors/try-expression.output
+++ b/unified/extractor/tests/corpus/swift/optionals-and-errors/try-expression.output
@@ -35,20 +35,16 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "result"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "result" source="result"
           value:
-            unary_expr
+            unary_expr source="⟨operator⟩ ⟨operand⟩"
               operand:
-                call_expr
-                  callee:
-                    name_expr
-                      identifier: identifier "foo"
-              operator: prefix_operator "try?"
+                call_expr source="⟨callee⟩()"
+                  callee: identifier "foo" source="foo"
+              operator: prefix_operator "try?" source="try?"
diff --git a/unified/extractor/tests/corpus/swift/types/actor-declaration.output b/unified/extractor/tests/corpus/swift/types/actor-declaration.output
index b4fcd605b9e9..0344a5ddddb8 100644
--- a/unified/extractor/tests/corpus/swift/types/actor-declaration.output
+++ b/unified/extractor/tests/corpus/swift/types/actor-declaration.output
@@ -11,6 +11,7 @@ sourceFile
       item:
         actorDecl
           attributes:
+          modifiers:
           name: identifier "Counter"
           actorKeyword: actor
           memberBlock:
@@ -35,11 +36,10 @@ sourceFile
                           pattern:
                             identifierPattern
                               identifier: identifier "value"
-          modifiers:
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
-      stmt: unsupported_node "actor Counter {\n  var value = 0\n}"
+    block source="⟨stmt⟩"
+      stmt: unsupported_node "actor Counter {\n  var value = 0\n}" source="actor Counter {\n  var value = 0\n}"
diff --git a/unified/extractor/tests/corpus/swift/types/binding-modifier-does-not-leak-into-accessor-body.output b/unified/extractor/tests/corpus/swift/types/binding-modifier-does-not-leak-into-accessor-body.output
index c05bc7794437..24e0979bdd00 100644
--- a/unified/extractor/tests/corpus/swift/types/binding-modifier-does-not-leak-into-accessor-body.output
+++ b/unified/extractor/tests/corpus/swift/types/binding-modifier-does-not-leak-into-accessor-body.output
@@ -87,44 +87,37 @@ sourceFile
                                         declReferenceExpr
                                           baseName: identifier "y"
                                       switchKeyword: switch
+                      modifiers:
                   leftBrace: {
                   rightBrace: }
 
 ---
 
-top_level
+top_level source="var p: Int {\n  ⟨body⟩\n}"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        accessor_declaration
-          modifier: modifier "var"
-          name: identifier "p"
-          accessor_kind: accessor_kind "get"
-          type:
-            named_type_expr
-              name: identifier "Int"
+        accessor_declaration source="⟨accessor_kind⟩ ⟨body⟩"
+          modifier: modifier "var" source="var" (external)
+          name_node: identifier "p" source="p" (external)
+          accessor_kind: accessor_kind "get" source="get"
+          return_type: identifier "Int" source="Int" (external)
           body:
-            block
+            block source="{\n    ⟨stmt⟩\n  }"
               stmt:
-                switch_expr
-                  value:
-                    name_expr
-                      identifier: identifier "y"
+                switch_expr source="switch ⟨value⟩ {\n    ⟨case⟩\n    ⟨case⟩\n    }"
+                  value: identifier "y" source="y"
                   case:
-                    switch_case
-                      pattern:
-                        expr_equality_pattern
-                          expr:
-                            name_expr
-                              identifier: identifier "someConstant"
+                    switch_case source="case ⟨pattern⟩:\n      ⟨body⟩"
+                      pattern: identifier "someConstant" source="someConstant"
                       body:
-                        block
+                        block source="⟨stmt⟩"
                           stmt:
-                            return_expr
-                              value: int_literal "1"
-                    switch_case
+                            return_expr source="return ⟨value⟩"
+                              value: int_literal "1" source="1"
+                    switch_case source="default:\n      ⟨body⟩"
                       body:
-                        block
+                        block source="⟨stmt⟩"
                           stmt:
-                            return_expr
-                              value: int_literal "2"
+                            return_expr source="return ⟨value⟩"
+                              value: int_literal "2" source="2"
diff --git a/unified/extractor/tests/corpus/swift/types/class-function.output b/unified/extractor/tests/corpus/swift/types/class-function.output
new file mode 100644
index 000000000000..6f1bb29365f0
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/types/class-function.output
@@ -0,0 +1,61 @@
+class Factory {
+  class func make() {}
+}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        classDecl
+          attributes:
+          modifiers:
+          name: identifier "Factory"
+          memberBlock:
+            memberBlock
+              leftBrace: {
+              rightBrace: }
+              members:
+                memberBlockItem
+                  decl:
+                    functionDecl
+                      attributes:
+                      body:
+                        codeBlock
+                          leftBrace: {
+                          rightBrace: }
+                          statements:
+                      modifiers:
+                        declModifier
+                          name: class
+                      name: identifier "make"
+                      signature:
+                        functionSignature
+                          parameterClause:
+                            functionParameterClause
+                              leftParen: (
+                              rightParen: )
+                              parameters:
+                      funcKeyword: func
+          classKeyword: class
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩"
+      stmt:
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Factory" source="Factory"
+          member:
+            function_declaration source="⟨modifier⟩ func ⟨name_node⟩() ⟨body⟩"
+              modifier: modifier "class" source="class"
+              name_node: identifier "make" source="make"
+              body: block "{}" source="{}"
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/class-function.swift b/unified/extractor/tests/corpus/swift/types/class-function.swift
new file mode 100644
index 000000000000..d4424ab3005e
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/types/class-function.swift
@@ -0,0 +1,3 @@
+class Factory {
+  class func make() {}
+}
diff --git a/unified/extractor/tests/corpus/swift/types/class-inheritance.output b/unified/extractor/tests/corpus/swift/types/class-inheritance.output
index 12328f4acb0d..82426d8df74d 100644
--- a/unified/extractor/tests/corpus/swift/types/class-inheritance.output
+++ b/unified/extractor/tests/corpus/swift/types/class-inheritance.output
@@ -9,6 +9,7 @@ sourceFile
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "Dog"
           inheritanceClause:
             inheritanceClause
@@ -23,20 +24,22 @@ sourceFile
               leftBrace: {
               rightBrace: }
               members:
-          modifiers:
           classKeyword: class
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "class"
-          name: identifier "Dog"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨base_type⟩ {}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Dog" source="Dog"
           base_type:
-            base_type
-              type:
-                named_type_expr
-                  name: identifier "Animal"
+            base_type source="⟨type⟩"
+              type: identifier "Animal" source="Animal"
+          member:
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/class-with-initializer.output b/unified/extractor/tests/corpus/swift/types/class-with-initializer.output
index 83945d89e3a0..708558af870e 100644
--- a/unified/extractor/tests/corpus/swift/types/class-with-initializer.output
+++ b/unified/extractor/tests/corpus/swift/types/class-with-initializer.output
@@ -14,6 +14,7 @@ sourceFile
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "Point"
           memberBlock:
             memberBlock
@@ -81,46 +82,36 @@ sourceFile
                                       name: identifier "Int"
                                   firstName: identifier "x"
                       initKeyword: init
-          modifiers:
           classKeyword: class
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "class"
-          name: identifier "Point"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n  ⟨member⟩\n}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Point" source="Point"
           member:
-            variable_declaration
-              modifier: modifier "var"
-              pattern:
-                name_pattern
-                  identifier: identifier "x"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-            constructor_declaration
+            variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩"
+              modifier: modifier "var" source="var"
+              pattern: identifier "x" source="x"
+              type: identifier "Int" source="Int"
+            constructor_declaration source="⟨name_node⟩(⟨parameter⟩) ⟨body⟩"
+              name_node: identifier "init" source="init"
               parameter:
-                parameter
-                  type:
-                    named_type_expr
-                      name: identifier "Int"
-                  pattern:
-                    name_pattern
-                      identifier: identifier "x"
+                parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩"
+                  external_name_node: identifier "x" source="x"
+                  type: identifier "Int" source="Int"
+                  pattern: identifier "x" source="x"
               body:
-                block
+                block source="{\n    ⟨stmt⟩\n  }"
                   stmt:
-                    assign_expr
-                      target:
-                        member_access_expr
-                          base:
-                            name_expr
-                              identifier: identifier "self"
-                          member: identifier "x"
-                      value:
-                        name_expr
-                          identifier: identifier "x"
+                    binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                      left:
+                        member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                          base: identifier "self" source="self"
+                          member_name_node: identifier "x" source="x"
+                      operator: infix_operator "=" source="="
+                      right: identifier "x" source="x"
diff --git a/unified/extractor/tests/corpus/swift/types/class-with-method.output b/unified/extractor/tests/corpus/swift/types/class-with-method.output
index f45cb31e53ad..831912cd8437 100644
--- a/unified/extractor/tests/corpus/swift/types/class-with-method.output
+++ b/unified/extractor/tests/corpus/swift/types/class-with-method.output
@@ -14,6 +14,7 @@ sourceFile
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "Counter"
           memberBlock:
             memberBlock
@@ -58,8 +59,8 @@ sourceFile
                                   rightOperand:
                                     integerLiteralExpr
                                       literal: integerLiteral "1"
-                      name: identifier "bump"
                       modifiers:
+                      name: identifier "bump"
                       signature:
                         functionSignature
                           parameterClause:
@@ -68,33 +69,32 @@ sourceFile
                               rightParen: )
                               parameters:
                       funcKeyword: func
-          modifiers:
           classKeyword: class
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "class"
-          name: identifier "Counter"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n  ⟨member⟩\n}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Counter" source="Counter"
           member:
-            variable_declaration
-              modifier: modifier "var"
-              pattern:
-                name_pattern
-                  identifier: identifier "n"
-              value: int_literal "0"
-            function_declaration
-              name: identifier "bump"
+            variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+              modifier: modifier "var" source="var"
+              pattern: identifier "n" source="n"
+              value: int_literal "0" source="0"
+            function_declaration source="func ⟨name_node⟩() ⟨body⟩"
+              name_node: identifier "bump" source="bump"
               body:
-                block
+                block source="{\n    ⟨stmt⟩\n  }"
                   stmt:
-                    compound_assign_expr
-                      target:
-                        name_expr
-                          identifier: identifier "n"
-                      operator: infix_operator "+="
-                      value: int_literal "1"
+                    binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                      left: identifier "n" source="n"
+                      operator: infix_operator "+=" source="+="
+                      right: int_literal "1" source="1"
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/class-with-multiple-base-types.output b/unified/extractor/tests/corpus/swift/types/class-with-multiple-base-types.output
index e66b88e9be3d..3c410fb1a45a 100644
--- a/unified/extractor/tests/corpus/swift/types/class-with-multiple-base-types.output
+++ b/unified/extractor/tests/corpus/swift/types/class-with-multiple-base-types.output
@@ -9,6 +9,7 @@ sourceFile
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "Button"
           inheritanceClause:
             inheritanceClause
@@ -28,24 +29,24 @@ sourceFile
               leftBrace: {
               rightBrace: }
               members:
-          modifiers:
           classKeyword: class
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "class"
-          name: identifier "Button"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨base_type⟩, ⟨base_type⟩ {}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Button" source="Button"
           base_type:
-            base_type
-              type:
-                named_type_expr
-                  name: identifier "Control"
-            base_type
-              type:
-                named_type_expr
-                  name: identifier "Drawable"
+            base_type source="⟨type⟩"
+              type: identifier "Control" source="Control"
+            base_type source="⟨type⟩"
+              type: identifier "Drawable" source="Drawable"
+          member:
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/class-with-stored-properties.output b/unified/extractor/tests/corpus/swift/types/class-with-stored-properties.output
index e184426eb755..37df537cb74f 100644
--- a/unified/extractor/tests/corpus/swift/types/class-with-stored-properties.output
+++ b/unified/extractor/tests/corpus/swift/types/class-with-stored-properties.output
@@ -12,6 +12,7 @@ sourceFile
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "Point"
           memberBlock:
             memberBlock
@@ -52,32 +53,27 @@ sourceFile
                               type:
                                 identifierType
                                   name: identifier "Int"
-          modifiers:
           classKeyword: class
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "class"
-          name: identifier "Point"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n  ⟨member⟩\n}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Point" source="Point"
           member:
-            variable_declaration
-              modifier: modifier "var"
-              pattern:
-                name_pattern
-                  identifier: identifier "x"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-            variable_declaration
-              modifier: modifier "var"
-              pattern:
-                name_pattern
-                  identifier: identifier "y"
-              type:
-                named_type_expr
-                  name: identifier "Int"
+            variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩"
+              modifier: modifier "var" source="var"
+              pattern: identifier "x" source="x"
+              type: identifier "Int" source="Int"
+            variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩"
+              modifier: modifier "var" source="var"
+              pattern: identifier "y" source="y"
+              type: identifier "Int" source="Int"
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/computed-property.output b/unified/extractor/tests/corpus/swift/types/computed-property.output
index 24e816be0091..30a496762bd1 100644
--- a/unified/extractor/tests/corpus/swift/types/computed-property.output
+++ b/unified/extractor/tests/corpus/swift/types/computed-property.output
@@ -15,6 +15,7 @@ sourceFile
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "Rect"
           memberBlock:
             memberBlock
@@ -92,52 +93,41 @@ sourceFile
                                       returnKeyword: return
                               leftBrace: {
                               rightBrace: }
-          modifiers:
           classKeyword: class
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "class"
-          name: identifier "Rect"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n  ⟨member⟩\n  ⟨member⟩\n}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Rect" source="Rect"
           member:
-            variable_declaration
-              modifier: modifier "var"
-              pattern:
-                name_pattern
-                  identifier: identifier "w"
-              type:
-                named_type_expr
-                  name: identifier "Double"
-            variable_declaration
-              modifier: modifier "var"
-              pattern:
-                name_pattern
-                  identifier: identifier "h"
-              type:
-                named_type_expr
-                  name: identifier "Double"
-            accessor_declaration
-              modifier: modifier "var"
-              name: identifier "area"
-              accessor_kind: accessor_kind "get"
-              type:
-                named_type_expr
-                  name: identifier "Double"
+            variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩"
+              modifier: modifier "var" source="var"
+              pattern: identifier "w" source="w"
+              type: identifier "Double" source="Double"
+            variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩"
+              modifier: modifier "var" source="var"
+              pattern: identifier "h" source="h"
+              type: identifier "Double" source="Double"
+            accessor_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨return_type⟩ ⟨body⟩"
+              modifier: modifier "var" source="var"
+              name_node: identifier "area" source="area"
+              accessor_kind: accessor_kind "get" source=""
+              return_type: identifier "Double" source="Double"
               body:
-                block
+                block source="{\n    ⟨stmt⟩\n  }"
                   stmt:
-                    return_expr
+                    return_expr source="return ⟨value⟩"
                       value:
-                        binary_expr
-                          left:
-                            name_expr
-                              identifier: identifier "w"
-                          operator: infix_operator "*"
-                          right:
-                            name_expr
-                              identifier: identifier "h"
+                        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                          left: identifier "w" source="w"
+                          operator: infix_operator "*" source="*"
+                          right: identifier "h" source="h"
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/conditional-compilation-in-class-body.output b/unified/extractor/tests/corpus/swift/types/conditional-compilation-in-class-body.output
index 2c530111b9ca..4d6fdc40564a 100644
--- a/unified/extractor/tests/corpus/swift/types/conditional-compilation-in-class-body.output
+++ b/unified/extractor/tests/corpus/swift/types/conditional-compilation-in-class-body.output
@@ -18,6 +18,7 @@ sourceFile
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "C"
           memberBlock:
             memberBlock
@@ -72,16 +73,20 @@ sourceFile
                               baseName: identifier "DEBUG"
                           poundKeyword: #if
                       poundEndif: #endif
-          modifiers:
           classKeyword: class
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "class"
-          name: identifier "C"
-          member: unsupported_node "#if DEBUG\n    init(x: Int) {}\n    deinit {}\n#endif"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n⟨member⟩\n}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "C" source="C"
+          member:
+            unsupported_node "#if DEBUG\n    init(x: Int) {}\n    deinit {}\n#endif" source="#if DEBUG\n    init(x: Int) {}\n    deinit {}\n#endif"
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/constructor-with-parameters.output b/unified/extractor/tests/corpus/swift/types/constructor-with-parameters.output
index c9be21dd156a..fe8a523b72cc 100644
--- a/unified/extractor/tests/corpus/swift/types/constructor-with-parameters.output
+++ b/unified/extractor/tests/corpus/swift/types/constructor-with-parameters.output
@@ -11,6 +11,7 @@ sourceFile
       item:
         structDecl
           attributes:
+          modifiers:
           name: identifier "Size"
           memberBlock:
             memberBlock
@@ -54,35 +55,27 @@ sourceFile
                                   firstName: identifier "height"
                                   secondName: identifier "h"
                       initKeyword: init
-          modifiers:
           structKeyword: struct
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "struct"
-          name: identifier "Size"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n}"
+          modifier: modifier "struct" source="struct"
+          name_node: identifier "Size" source="Size"
           member:
-            constructor_declaration
+            constructor_declaration source="⟨name_node⟩(⟨parameter⟩, ⟨parameter⟩) ⟨body⟩"
+              name_node: identifier "init" source="init"
               parameter:
-                parameter
-                  external_name: identifier "width"
-                  type:
-                    named_type_expr
-                      name: identifier "Int"
-                  pattern:
-                    name_pattern
-                      identifier: identifier "w"
-                parameter
-                  external_name: identifier "height"
-                  type:
-                    named_type_expr
-                      name: identifier "Int"
-                  pattern:
-                    name_pattern
-                      identifier: identifier "h"
-              body: block "init(width w: Int, height h: Int) {}"
+                parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+                  external_name_node: identifier "width" source="width"
+                  type: identifier "Int" source="Int"
+                  pattern: identifier "w" source="w"
+                parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+                  external_name_node: identifier "height" source="height"
+                  type: identifier "Int" source="Int"
+                  pattern: identifier "h" source="h"
+              body: block "{}" source="{}"
diff --git a/unified/extractor/tests/corpus/swift/types/empty-class.output b/unified/extractor/tests/corpus/swift/types/empty-class.output
index 6693744c9b43..39b4708f49ea 100644
--- a/unified/extractor/tests/corpus/swift/types/empty-class.output
+++ b/unified/extractor/tests/corpus/swift/types/empty-class.output
@@ -9,21 +9,26 @@ sourceFile
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "Foo"
           memberBlock:
             memberBlock
               leftBrace: {
               rightBrace: }
               members:
-          modifiers:
           classKeyword: class
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "class"
-          name: identifier "Foo"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Foo" source="Foo"
+          member:
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/enum-with-associated-values.output b/unified/extractor/tests/corpus/swift/types/enum-with-associated-values.output
index 399239bbea30..655bc8e33040 100644
--- a/unified/extractor/tests/corpus/swift/types/enum-with-associated-values.output
+++ b/unified/extractor/tests/corpus/swift/types/enum-with-associated-values.output
@@ -12,6 +12,7 @@ sourceFile
       item:
         enumDecl
           attributes:
+          modifiers:
           name: identifier "Shape"
           memberBlock:
             memberBlock
@@ -60,44 +61,35 @@ sourceFile
                                       name: identifier "Double"
                                   firstName: identifier "side"
                       caseKeyword: case
-          modifiers:
           enumKeyword: enum
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "enum"
-          name: identifier "Shape"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  case ⟨member⟩\n  case ⟨member⟩\n}"
+          modifier: modifier "enum" source="enum"
+          name_node: identifier "Shape" source="Shape"
           member:
-            class_like_declaration
-              modifier: modifier "enum_case"
-              name: identifier "circle"
+            class_like_declaration source="⟨name_node⟩⟨member⟩"
+              modifier: modifier "enum_case" source=""
+              name_node: identifier "circle" source="circle"
               member:
-                constructor_declaration
+                constructor_declaration source="circle(⟨parameter⟩)"
                   parameter:
-                    parameter
-                      type:
-                        named_type_expr
-                          name: identifier "Double"
-                      pattern:
-                        name_pattern
-                          identifier: identifier "radius"
-                  body: block "circle(radius: Double)"
-            class_like_declaration
-              modifier: modifier "enum_case"
-              name: identifier "square"
+                    parameter source="⟨pattern⟩: ⟨type⟩"
+                      type: identifier "Double" source="Double"
+                      pattern: identifier "radius" source="radius"
+                  body: block source=""
+            class_like_declaration source="⟨name_node⟩⟨member⟩"
+              modifier: modifier "enum_case" source=""
+              name_node: identifier "square" source="square"
               member:
-                constructor_declaration
+                constructor_declaration source="square(⟨parameter⟩)"
                   parameter:
-                    parameter
-                      type:
-                        named_type_expr
-                          name: identifier "Double"
-                      pattern:
-                        name_pattern
-                          identifier: identifier "side"
-                  body: block "square(side: Double)"
+                    parameter source="⟨pattern⟩: ⟨type⟩"
+                      type: identifier "Double" source="Double"
+                      pattern: identifier "side" source="side"
+                  body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/enum-with-cases.output b/unified/extractor/tests/corpus/swift/types/enum-with-cases.output
index f081c2a82046..1be440f832f2 100644
--- a/unified/extractor/tests/corpus/swift/types/enum-with-cases.output
+++ b/unified/extractor/tests/corpus/swift/types/enum-with-cases.output
@@ -14,6 +14,7 @@ sourceFile
       item:
         enumDecl
           attributes:
+          modifiers:
           name: identifier "Direction"
           memberBlock:
             memberBlock
@@ -56,36 +57,27 @@ sourceFile
                         enumCaseElement
                           name: identifier "west"
                       caseKeyword: case
-          modifiers:
           enumKeyword: enum
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "enum"
-          name: identifier "Direction"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  case ⟨member⟩\n  case ⟨member⟩\n  case ⟨member⟩\n  case ⟨member⟩\n}"
+          modifier: modifier "enum" source="enum"
+          name_node: identifier "Direction" source="Direction"
           member:
-            variable_declaration
-              modifier: modifier "enum_case"
-              pattern:
-                name_pattern
-                  identifier: identifier "north"
-            variable_declaration
-              modifier: modifier "enum_case"
-              pattern:
-                name_pattern
-                  identifier: identifier "south"
-            variable_declaration
-              modifier: modifier "enum_case"
-              pattern:
-                name_pattern
-                  identifier: identifier "east"
-            variable_declaration
-              modifier: modifier "enum_case"
-              pattern:
-                name_pattern
-                  identifier: identifier "west"
+            variable_declaration source="⟨pattern⟩"
+              modifier: modifier "enum_case" source=""
+              pattern: identifier "north" source="north"
+            variable_declaration source="⟨pattern⟩"
+              modifier: modifier "enum_case" source=""
+              pattern: identifier "south" source="south"
+            variable_declaration source="⟨pattern⟩"
+              modifier: modifier "enum_case" source=""
+              pattern: identifier "east" source="east"
+            variable_declaration source="⟨pattern⟩"
+              modifier: modifier "enum_case" source=""
+              pattern: identifier "west" source="west"
diff --git a/unified/extractor/tests/corpus/swift/types/enum-with-comma-separated-cases-chained-declaration.output b/unified/extractor/tests/corpus/swift/types/enum-with-comma-separated-cases-chained-declaration.output
index 6a4ea95e9a62..5476a9e835bb 100644
--- a/unified/extractor/tests/corpus/swift/types/enum-with-comma-separated-cases-chained-declaration.output
+++ b/unified/extractor/tests/corpus/swift/types/enum-with-comma-separated-cases-chained-declaration.output
@@ -11,6 +11,7 @@ sourceFile
       item:
         enumDecl
           attributes:
+          modifiers:
           name: identifier "Suit"
           memberBlock:
             memberBlock
@@ -35,42 +36,33 @@ sourceFile
                         enumCaseElement
                           name: identifier "spades"
                       caseKeyword: case
-          modifiers:
           enumKeyword: enum
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "enum"
-          name: identifier "Suit"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  case ⟨member⟩, ⟨member⟩, ⟨member⟩, ⟨member⟩\n}"
+          modifier: modifier "enum" source="enum"
+          name_node: identifier "Suit" source="Suit"
           member:
-            variable_declaration
-              modifier: modifier "enum_case"
-              pattern:
-                name_pattern
-                  identifier: identifier "clubs"
-            variable_declaration
+            variable_declaration source="⟨pattern⟩"
+              modifier: modifier "enum_case" source=""
+              pattern: identifier "clubs" source="clubs"
+            variable_declaration source="⟨pattern⟩"
               modifier:
-                modifier "chained_declaration"
-                modifier "enum_case"
-              pattern:
-                name_pattern
-                  identifier: identifier "diamonds"
-            variable_declaration
+                modifier "chained_declaration" source=""
+                modifier "enum_case" source=""
+              pattern: identifier "diamonds" source="diamonds"
+            variable_declaration source="⟨pattern⟩"
               modifier:
-                modifier "chained_declaration"
-                modifier "enum_case"
-              pattern:
-                name_pattern
-                  identifier: identifier "hearts"
-            variable_declaration
+                modifier "chained_declaration" source=""
+                modifier "enum_case" source=""
+              pattern: identifier "hearts" source="hearts"
+            variable_declaration source="⟨pattern⟩"
               modifier:
-                modifier "chained_declaration"
-                modifier "enum_case"
-              pattern:
-                name_pattern
-                  identifier: identifier "spades"
+                modifier "chained_declaration" source=""
+                modifier "enum_case" source=""
+              pattern: identifier "spades" source="spades"
diff --git a/unified/extractor/tests/corpus/swift/types/extension.output b/unified/extractor/tests/corpus/swift/types/extension.output
index 1b1d02ebddad..1f5ad4bf612b 100644
--- a/unified/extractor/tests/corpus/swift/types/extension.output
+++ b/unified/extractor/tests/corpus/swift/types/extension.output
@@ -11,6 +11,7 @@ sourceFile
       item:
         extensionDecl
           attributes:
+          modifiers:
           memberBlock:
             memberBlock
               leftBrace: {
@@ -40,8 +41,8 @@ sourceFile
                                         declReferenceExpr
                                           baseName: self
                                   returnKeyword: return
-                      name: identifier "squared"
                       modifiers:
+                      name: identifier "squared"
                       signature:
                         functionSignature
                           parameterClause:
@@ -56,7 +57,6 @@ sourceFile
                                 identifierType
                                   name: identifier "Int"
                       funcKeyword: func
-          modifiers:
           extendedType:
             identifierType
               name: identifier "Int"
@@ -64,29 +64,23 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "extension"
-          name: identifier "Int"
+        class_like_declaration source="⟨modifier⟩ ⟨extension_target⟩ {\n  ⟨member⟩\n}"
+          modifier: modifier "extension" source="extension"
+          extension_target: identifier "Int" source="Int"
           member:
-            function_declaration
-              name: identifier "squared"
-              return_type:
-                named_type_expr
-                  name: identifier "Int"
+            function_declaration source="func ⟨name_node⟩() -> ⟨return_type⟩ ⟨body⟩"
+              name_node: identifier "squared" source="squared"
+              return_type: identifier "Int" source="Int"
               body:
-                block
+                block source="{ ⟨stmt⟩ }"
                   stmt:
-                    return_expr
+                    return_expr source="return ⟨value⟩"
                       value:
-                        binary_expr
-                          left:
-                            name_expr
-                              identifier: identifier "self"
-                          operator: infix_operator "*"
-                          right:
-                            name_expr
-                              identifier: identifier "self"
+                        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                          left: identifier "self" source="self"
+                          operator: infix_operator "*" source="*"
+                          right: identifier "self" source="self"
diff --git a/unified/extractor/tests/corpus/swift/types/function-type-with-convention-attribute.output b/unified/extractor/tests/corpus/swift/types/function-type-with-convention-attribute.output
index 3d484d6f65d8..4943a564e3a9 100644
--- a/unified/extractor/tests/corpus/swift/types/function-type-with-convention-attribute.output
+++ b/unified/extractor/tests/corpus/swift/types/function-type-with-convention-attribute.output
@@ -58,16 +58,19 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "callback"
-          type: unsupported_node "@convention(c) () -> Void"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "callback" source="callback"
+          type:
+            modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+              modifier: modifier "@convention(c)" source="@convention(c)"
+              type:
+                function_expr source="() -> ⟨return_type⟩"
+                  return_type: identifier "Void" source="Void"
           value:
-            function_expr
-              body: block "{}"
+            function_expr source="{}"
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/function-type-with-inout-parameter.output b/unified/extractor/tests/corpus/swift/types/function-type-with-inout-parameter.output
new file mode 100644
index 000000000000..2f9b3823f7e8
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/types/function-type-with-inout-parameter.output
@@ -0,0 +1,83 @@
+let f: (inout Int) -> Void = { _ in }
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        variableDecl
+          attributes:
+          modifiers:
+          bindingSpecifier: let
+          bindings:
+            patternBinding
+              initializer:
+                initializerClause
+                  equal: =
+                  value:
+                    closureExpr
+                      leftBrace: {
+                      rightBrace: }
+                      signature:
+                        closureSignature
+                          attributes:
+                          inKeyword: in
+                          parameterClause:
+                            closureShorthandParameter
+                              name: _
+                      statements:
+              pattern:
+                identifierPattern
+                  identifier: identifier "f"
+              typeAnnotation:
+                typeAnnotation
+                  colon: :
+                  type:
+                    functionType
+                      leftParen: (
+                      rightParen: )
+                      parameters:
+                        tupleTypeElement
+                          type:
+                            attributedType
+                              attributes:
+                              baseType:
+                                identifierType
+                                  name: identifier "Int"
+                              lateSpecifiers:
+                              specifiers:
+                                simpleTypeSpecifier
+                                  specifier: inout
+                      returnClause:
+                        returnClause
+                          arrow: ->
+                          type:
+                            identifierType
+                              name: identifier "Void"
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩"
+      stmt:
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "f" source="f"
+          type:
+            function_expr source="(⟨parameter⟩) -> ⟨return_type⟩"
+              parameter:
+                parameter source="⟨type⟩"
+                  type:
+                    modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                      modifier: modifier "inout" source="inout"
+                      type: identifier "Int" source="Int"
+              return_type: identifier "Void" source="Void"
+          value:
+            function_expr source="{ ⟨parameter⟩ in }"
+              parameter:
+                parameter source="⟨pattern⟩"
+                  pattern: identifier "_" source="_"
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/function-type-with-inout-parameter.swift b/unified/extractor/tests/corpus/swift/types/function-type-with-inout-parameter.swift
new file mode 100644
index 000000000000..5f421dcb3106
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/types/function-type-with-inout-parameter.swift
@@ -0,0 +1 @@
+let f: (inout Int) -> Void = { _ in }
diff --git a/unified/extractor/tests/corpus/swift/types/function-type-with-sendable-attribute.output b/unified/extractor/tests/corpus/swift/types/function-type-with-sendable-attribute.output
index ef9f838dadbe..931aee0e53d7 100644
--- a/unified/extractor/tests/corpus/swift/types/function-type-with-sendable-attribute.output
+++ b/unified/extractor/tests/corpus/swift/types/function-type-with-sendable-attribute.output
@@ -51,16 +51,19 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "handler"
-          type: unsupported_node "@Sendable () -> Void"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "handler" source="handler"
+          type:
+            modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+              modifier: modifier "@Sendable" source="@Sendable"
+              type:
+                function_expr source="() -> ⟨return_type⟩"
+                  return_type: identifier "Void" source="Void"
           value:
-            function_expr
-              body: block "{}"
+            function_expr source="{}"
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/generic-class-parameters-and-constraints.output b/unified/extractor/tests/corpus/swift/types/generic-class-parameters-and-constraints.output
new file mode 100644
index 000000000000..6e748ceb2467
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/types/generic-class-parameters-and-constraints.output
@@ -0,0 +1,89 @@
+class Box<T: Equatable, U> where U: Equatable, U == T {
+}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        classDecl
+          attributes:
+          modifiers:
+          name: identifier "Box"
+          genericParameterClause:
+            genericParameterClause
+              parameters:
+                genericParameter
+                  colon: :
+                  attributes:
+                  name: identifier "T"
+                  trailingComma: ,
+                  inheritedType:
+                    identifierType
+                      name: identifier "Equatable"
+                genericParameter
+                  attributes:
+                  name: identifier "U"
+              leftAngle: <
+              rightAngle: >
+          genericWhereClause:
+            genericWhereClause
+              requirements:
+                genericRequirement
+                  trailingComma: ,
+                  requirement:
+                    conformanceRequirement
+                      colon: :
+                      leftType:
+                        identifierType
+                          name: identifier "U"
+                      rightType:
+                        identifierType
+                          name: identifier "Equatable"
+                genericRequirement
+                  requirement:
+                    sameTypeRequirement
+                      equal: binaryOperator "=="
+                      leftType:
+                        identifierType
+                          name: identifier "U"
+                      rightType:
+                        identifierType
+                          name: identifier "T"
+              whereKeyword: where
+          memberBlock:
+            memberBlock
+              leftBrace: {
+              rightBrace: }
+              members:
+          classKeyword: class
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩"
+      stmt:
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩<⟨type_parameter⟩, ⟨type_parameter⟩> where ⟨type_constraint⟩, ⟨type_constraint⟩ {\n}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Box" source="Box"
+          type_parameter:
+            type_parameter source="⟨name_node⟩: ⟨bound⟩"
+              name_node: identifier "T" source="T"
+              bound: identifier "Equatable" source="Equatable"
+            type_parameter source="⟨name_node⟩"
+              name_node: identifier "U" source="U"
+          type_constraint:
+            bound_type_constraint source="⟨type⟩: ⟨bound⟩"
+              type: identifier "U" source="U"
+              bound: identifier "Equatable" source="Equatable"
+            equality_type_constraint source="⟨left⟩ == ⟨right⟩"
+              left: identifier "U" source="U"
+              right: identifier "T" source="T"
+          member:
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/generic-class-parameters-and-constraints.swift b/unified/extractor/tests/corpus/swift/types/generic-class-parameters-and-constraints.swift
new file mode 100644
index 000000000000..80c882308a51
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/types/generic-class-parameters-and-constraints.swift
@@ -0,0 +1,2 @@
+class Box<T: Equatable, U> where U: Equatable, U == T {
+}
diff --git a/unified/extractor/tests/corpus/swift/types/generic-type-arguments.output b/unified/extractor/tests/corpus/swift/types/generic-type-arguments.output
index ce12c853d9d5..402ec3f8b780 100644
--- a/unified/extractor/tests/corpus/swift/types/generic-type-arguments.output
+++ b/unified/extractor/tests/corpus/swift/types/generic-type-arguments.output
@@ -56,28 +56,19 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "cache"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "cache" source="cache"
           type:
-            generic_type_expr
-              base:
-                named_type_expr
-                  name: identifier "Dictionary"
+            generic_type_expr source="⟨base⟩<⟨type_argument⟩, ⟨type_argument⟩>"
+              base: identifier "Dictionary" source="Dictionary"
               type_argument:
-                named_type_expr
-                  name: identifier "String"
-                generic_type_expr
-                  base:
-                    named_type_expr
-                      name: identifier "Array"
-                  type_argument:
-                    named_type_expr
-                      name: identifier "Int"
-          value: map_literal "[:]"
+                identifier "String" source="String"
+                generic_type_expr source="⟨base⟩<⟨type_argument⟩>"
+                  base: identifier "Array" source="Array"
+                  type_argument: identifier "Int" source="Int"
+          value: map_literal "[:]" source="[:]"
diff --git a/unified/extractor/tests/corpus/swift/types/inline-array-type.output b/unified/extractor/tests/corpus/swift/types/inline-array-type.output
index 5f70d9d55168..39657ec20345 100644
--- a/unified/extractor/tests/corpus/swift/types/inline-array-type.output
+++ b/unified/extractor/tests/corpus/swift/types/inline-array-type.output
@@ -59,19 +59,17 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "triple"
-          type: unsupported_node "[3 of Int]"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "triple" source="triple"
+          type: unsupported_node "[3 of Int]" source="[3 of Int]"
           value:
-            array_literal
+            array_literal source="[⟨element⟩, ⟨element⟩, ⟨element⟩]"
               element:
-                int_literal "1"
-                int_literal "2"
-                int_literal "3"
+                int_literal "1" source="1"
+                int_literal "2" source="2"
+                int_literal "3" source="3"
diff --git a/unified/extractor/tests/corpus/swift/types/noncopyable-type.output b/unified/extractor/tests/corpus/swift/types/noncopyable-type.output
index 4fb13ca13ece..e2f96124a50a 100644
--- a/unified/extractor/tests/corpus/swift/types/noncopyable-type.output
+++ b/unified/extractor/tests/corpus/swift/types/noncopyable-type.output
@@ -11,6 +11,7 @@ sourceFile
       item:
         structDecl
           attributes:
+          modifiers:
           name: identifier "FileHandle"
           inheritanceClause:
             inheritanceClause
@@ -45,27 +46,26 @@ sourceFile
                               type:
                                 identifierType
                                   name: identifier "Int"
-          modifiers:
           structKeyword: struct
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "struct"
-          name: identifier "FileHandle"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨base_type⟩ {\n  ⟨member⟩\n}"
+          modifier: modifier "struct" source="struct"
+          name_node: identifier "FileHandle" source="FileHandle"
           base_type:
-            base_type
-              type: unsupported_node "~Copyable"
+            base_type source="⟨type⟩"
+              type: unsupported_node "~Copyable" source="~Copyable"
           member:
-            variable_declaration
-              modifier: modifier "let"
-              pattern:
-                name_pattern
-                  identifier: identifier "descriptor"
-              type:
-                named_type_expr
-                  name: identifier "Int"
+            variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩"
+              modifier: modifier "let" source="let"
+              pattern: identifier "descriptor" source="descriptor"
+              type: identifier "Int" source="Int"
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/property-with-getter-and-setter.output b/unified/extractor/tests/corpus/swift/types/property-with-getter-and-setter.output
index 951768cd8444..e4b3b0cd78b5 100644
--- a/unified/extractor/tests/corpus/swift/types/property-with-getter-and-setter.output
+++ b/unified/extractor/tests/corpus/swift/types/property-with-getter-and-setter.output
@@ -15,6 +15,7 @@ sourceFile
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "Box"
           memberBlock:
             memberBlock
@@ -75,6 +76,7 @@ sourceFile
                                                 declReferenceExpr
                                                   baseName: identifier "_v"
                                               returnKeyword: return
+                                  modifiers:
                                 accessorDecl
                                   accessorSpecifier: set
                                   attributes:
@@ -95,59 +97,56 @@ sourceFile
                                               rightOperand:
                                                 declReferenceExpr
                                                   baseName: identifier "newValue"
+                                  modifiers:
                               leftBrace: {
                               rightBrace: }
-          modifiers:
           classKeyword: class
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "class"
-          name: identifier "Box"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n  var v: Int {\n    ⟨member⟩\n    ⟨member⟩\n  }\n}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Box" source="Box"
           member:
-            variable_declaration
+            variable_declaration source="⟨modifier⟩ ⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
               modifier:
-                modifier "var"
-                modifier "private"
-              pattern:
-                name_pattern
-                  identifier: identifier "_v"
-              value: int_literal "0"
-            accessor_declaration
-              modifier: modifier "var"
-              name: identifier "v"
-              accessor_kind: accessor_kind "get"
-              type:
-                named_type_expr
-                  name: identifier "Int"
+                modifier "var" source="var"
+                modifier "private" source="private"
+              pattern: identifier "_v" source="_v"
+              value: int_literal "0" source="0"
+            accessor_declaration source="⟨accessor_kind⟩ ⟨body⟩"
+              modifier: modifier "var" source="var" (external)
+              name_node: identifier "v" source="v" (external)
+              accessor_kind: accessor_kind "get" source="get"
+              return_type: identifier "Int" source="Int" (external)
               body:
-                block
+                block source="{ ⟨stmt⟩ }"
                   stmt:
-                    return_expr
-                      value:
-                        name_expr
-                          identifier: identifier "_v"
-            accessor_declaration
+                    return_expr source="return ⟨value⟩"
+                      value: identifier "_v" source="_v"
+            accessor_declaration source="⟨accessor_kind⟩⟨parameter⟩ ⟨body⟩"
               modifier:
-                modifier "var"
-                modifier "chained_declaration"
-              name: identifier "v"
-              accessor_kind: accessor_kind "set"
-              type:
-                named_type_expr
-                  name: identifier "Int"
+                modifier "var" source="var" (external)
+                modifier "chained_declaration" source=""
+              name_node: identifier "v" source="v" (external)
+              accessor_kind: accessor_kind "set" source="set"
+              parameter:
+                parameter source="⟨pattern⟩"
+                  modifier: modifier "generated" source=""
+                  type: identifier "Int" source="Int" (external)
+                  pattern: identifier "newValue" source="set"
               body:
-                block
+                block source="{ ⟨stmt⟩ }"
                   stmt:
-                    assign_expr
-                      target:
-                        name_expr
-                          identifier: identifier "_v"
-                      value:
-                        name_expr
-                          identifier: identifier "newValue"
+                    binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+                      left: identifier "_v" source="_v"
+                      operator: infix_operator "=" source="="
+                      right: identifier "newValue" source="newValue"
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/protocol-declaration.output b/unified/extractor/tests/corpus/swift/types/protocol-declaration.output
index e848fb23eb3f..d54c9b25d2f4 100644
--- a/unified/extractor/tests/corpus/swift/types/protocol-declaration.output
+++ b/unified/extractor/tests/corpus/swift/types/protocol-declaration.output
@@ -1,5 +1,6 @@
 protocol Drawable {
   func draw()
+  static func make()
 }
 
 ---
@@ -11,6 +12,7 @@ sourceFile
       item:
         protocolDecl
           attributes:
+          modifiers:
           name: identifier "Drawable"
           memberBlock:
             memberBlock
@@ -21,8 +23,24 @@ sourceFile
                   decl:
                     functionDecl
                       attributes:
+                      modifiers:
                       name: identifier "draw"
+                      signature:
+                        functionSignature
+                          parameterClause:
+                            functionParameterClause
+                              leftParen: (
+                              rightParen: )
+                              parameters:
+                      funcKeyword: func
+                memberBlockItem
+                  decl:
+                    functionDecl
+                      attributes:
                       modifiers:
+                        declModifier
+                          name: static
+                      name: identifier "make"
                       signature:
                         functionSignature
                           parameterClause:
@@ -31,19 +49,22 @@ sourceFile
                               rightParen: )
                               parameters:
                       funcKeyword: func
-          modifiers:
           protocolKeyword: protocol
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "protocol"
-          name: identifier "Drawable"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n  ⟨member⟩\n}"
+          modifier: modifier "protocol" source="protocol"
+          name_node: identifier "Drawable" source="Drawable"
           member:
-            function_declaration
-              name: identifier "draw"
-              body: block "func draw()"
+            function_declaration source="func ⟨name_node⟩()"
+              name_node: identifier "draw" source="draw"
+              body: block source=""
+            function_declaration source="⟨modifier⟩ func ⟨name_node⟩()"
+              modifier: modifier "static" source="static"
+              name_node: identifier "make" source="make"
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/protocol-declaration.swift b/unified/extractor/tests/corpus/swift/types/protocol-declaration.swift
index 030b68a60c04..417886c213de 100644
--- a/unified/extractor/tests/corpus/swift/types/protocol-declaration.swift
+++ b/unified/extractor/tests/corpus/swift/types/protocol-declaration.swift
@@ -1,3 +1,4 @@
 protocol Drawable {
   func draw()
+  static func make()
 }
diff --git a/unified/extractor/tests/corpus/swift/types/protocol-with-read-only-and-read-write-property-requirements.output b/unified/extractor/tests/corpus/swift/types/protocol-with-read-only-and-read-write-property-requirements.output
index 83362740bb1e..db8a677616f8 100644
--- a/unified/extractor/tests/corpus/swift/types/protocol-with-read-only-and-read-write-property-requirements.output
+++ b/unified/extractor/tests/corpus/swift/types/protocol-with-read-only-and-read-write-property-requirements.output
@@ -1,6 +1,7 @@
 protocol P {
   var foo: Int { get }
   var bar: String { get set }
+  var count: Int { get }
 }
 
 ---
@@ -12,6 +13,7 @@ sourceFile
       item:
         protocolDecl
           attributes:
+          modifiers:
           name: identifier "P"
           memberBlock:
             memberBlock
@@ -41,6 +43,7 @@ sourceFile
                                 accessorDecl
                                   accessorSpecifier: get
                                   attributes:
+                                  modifiers:
                               leftBrace: {
                               rightBrace: }
                 memberBlockItem
@@ -66,40 +69,74 @@ sourceFile
                                 accessorDecl
                                   accessorSpecifier: get
                                   attributes:
+                                  modifiers:
                                 accessorDecl
                                   accessorSpecifier: set
                                   attributes:
+                                  modifiers:
+                              leftBrace: {
+                              rightBrace: }
+                memberBlockItem
+                  decl:
+                    variableDecl
+                      attributes:
+                      modifiers:
+                      bindingSpecifier: var
+                      bindings:
+                        patternBinding
+                          pattern:
+                            identifierPattern
+                              identifier: identifier "count"
+                          typeAnnotation:
+                            typeAnnotation
+                              colon: :
+                              type:
+                                identifierType
+                                  name: identifier "Int"
+                          accessorBlock:
+                            accessorBlock
+                              accessors:
+                                accessorDecl
+                                  accessorSpecifier: get
+                                  attributes:
+                                  modifiers:
                               leftBrace: {
                               rightBrace: }
-          modifiers:
           protocolKeyword: protocol
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "protocol"
-          name: identifier "P"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  var foo: Int { ⟨member⟩ }\n  var bar: String { ⟨member⟩ ⟨member⟩ }\n  var count: Int { ⟨member⟩ }\n}"
+          modifier: modifier "protocol" source="protocol"
+          name_node: identifier "P" source="P"
           member:
-            accessor_declaration
-              name: identifier "foo"
-              accessor_kind: accessor_kind "get"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-            accessor_declaration
-              name: identifier "bar"
-              accessor_kind: accessor_kind "get"
-              type:
-                named_type_expr
-                  name: identifier "String"
-            accessor_declaration
-              modifier: modifier "chained_declaration"
-              name: identifier "bar"
-              accessor_kind: accessor_kind "set"
-              type:
-                named_type_expr
-                  name: identifier "String"
+            accessor_declaration source="⟨accessor_kind⟩"
+              modifier: modifier "var" source="var" (external)
+              name_node: identifier "foo" source="foo" (external)
+              accessor_kind: accessor_kind "get" source="get"
+              return_type: identifier "Int" source="Int" (external)
+            accessor_declaration source="⟨accessor_kind⟩"
+              modifier: modifier "var" source="var" (external)
+              name_node: identifier "bar" source="bar" (external)
+              accessor_kind: accessor_kind "get" source="get"
+              return_type: identifier "String" source="String" (external)
+            accessor_declaration source="⟨accessor_kind⟩⟨parameter⟩"
+              modifier:
+                modifier "var" source="var" (external)
+                modifier "chained_declaration" source=""
+              name_node: identifier "bar" source="bar" (external)
+              accessor_kind: accessor_kind "set" source="set"
+              parameter:
+                parameter source="⟨pattern⟩"
+                  modifier: modifier "generated" source=""
+                  type: identifier "String" source="String" (external)
+                  pattern: identifier "newValue" source="set"
+            accessor_declaration source="⟨accessor_kind⟩"
+              modifier: modifier "var" source="var" (external)
+              name_node: identifier "count" source="count" (external)
+              accessor_kind: accessor_kind "get" source="get"
+              return_type: identifier "Int" source="Int" (external)
diff --git a/unified/extractor/tests/corpus/swift/types/protocol-with-read-only-and-read-write-property-requirements.swift b/unified/extractor/tests/corpus/swift/types/protocol-with-read-only-and-read-write-property-requirements.swift
index 44299edc15b9..24abb0e89fff 100644
--- a/unified/extractor/tests/corpus/swift/types/protocol-with-read-only-and-read-write-property-requirements.swift
+++ b/unified/extractor/tests/corpus/swift/types/protocol-with-read-only-and-read-write-property-requirements.swift
@@ -1,4 +1,5 @@
 protocol P {
   var foo: Int { get }
   var bar: String { get set }
+  var count: Int { get }
 }
diff --git a/unified/extractor/tests/corpus/swift/types/qualified-type.output b/unified/extractor/tests/corpus/swift/types/qualified-type.output
new file mode 100644
index 000000000000..9bf255e35fda
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/types/qualified-type.output
@@ -0,0 +1,420 @@
+struct Outer {
+  struct Inner {
+    struct Deep {}
+  }
+
+  struct Generic<T> {
+    struct Deep<U, V> {}
+    struct Plain {}
+  }
+}
+
+let value: Outer.Inner
+let nested: Outer.Inner.Deep
+
+func qualifiedTypes<Metadata, ErrorComponentType>(
+  _ value: Outer.Generic<Metadata>,
+  _ nested: Outer.Generic<Metadata>.Deep<ErrorComponentType, [Metadata]>,
+  _ plain: Outer.Generic<Metadata>.Plain
+) {}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        structDecl
+          attributes:
+          modifiers:
+          name: identifier "Outer"
+          memberBlock:
+            memberBlock
+              leftBrace: {
+              rightBrace: }
+              members:
+                memberBlockItem
+                  decl:
+                    structDecl
+                      attributes:
+                      modifiers:
+                      name: identifier "Inner"
+                      memberBlock:
+                        memberBlock
+                          leftBrace: {
+                          rightBrace: }
+                          members:
+                            memberBlockItem
+                              decl:
+                                structDecl
+                                  attributes:
+                                  modifiers:
+                                  name: identifier "Deep"
+                                  memberBlock:
+                                    memberBlock
+                                      leftBrace: {
+                                      rightBrace: }
+                                      members:
+                                  structKeyword: struct
+                      structKeyword: struct
+                memberBlockItem
+                  decl:
+                    structDecl
+                      attributes:
+                      modifiers:
+                      name: identifier "Generic"
+                      genericParameterClause:
+                        genericParameterClause
+                          parameters:
+                            genericParameter
+                              attributes:
+                              name: identifier "T"
+                          leftAngle: <
+                          rightAngle: >
+                      memberBlock:
+                        memberBlock
+                          leftBrace: {
+                          rightBrace: }
+                          members:
+                            memberBlockItem
+                              decl:
+                                structDecl
+                                  attributes:
+                                  modifiers:
+                                  name: identifier "Deep"
+                                  genericParameterClause:
+                                    genericParameterClause
+                                      parameters:
+                                        genericParameter
+                                          attributes:
+                                          name: identifier "U"
+                                          trailingComma: ,
+                                        genericParameter
+                                          attributes:
+                                          name: identifier "V"
+                                      leftAngle: <
+                                      rightAngle: >
+                                  memberBlock:
+                                    memberBlock
+                                      leftBrace: {
+                                      rightBrace: }
+                                      members:
+                                  structKeyword: struct
+                            memberBlockItem
+                              decl:
+                                structDecl
+                                  attributes:
+                                  modifiers:
+                                  name: identifier "Plain"
+                                  memberBlock:
+                                    memberBlock
+                                      leftBrace: {
+                                      rightBrace: }
+                                      members:
+                                  structKeyword: struct
+                      structKeyword: struct
+          structKeyword: struct
+    codeBlockItem
+      item:
+        variableDecl
+          attributes:
+          modifiers:
+          bindingSpecifier: let
+          bindings:
+            patternBinding
+              pattern:
+                identifierPattern
+                  identifier: identifier "value"
+              typeAnnotation:
+                typeAnnotation
+                  colon: :
+                  type:
+                    memberType
+                      name: identifier "Inner"
+                      baseType:
+                        identifierType
+                          name: identifier "Outer"
+                      period: .
+    codeBlockItem
+      item:
+        variableDecl
+          attributes:
+          modifiers:
+          bindingSpecifier: let
+          bindings:
+            patternBinding
+              pattern:
+                identifierPattern
+                  identifier: identifier "nested"
+              typeAnnotation:
+                typeAnnotation
+                  colon: :
+                  type:
+                    memberType
+                      name: identifier "Deep"
+                      baseType:
+                        memberType
+                          name: identifier "Inner"
+                          baseType:
+                            identifierType
+                              name: identifier "Outer"
+                          period: .
+                      period: .
+    codeBlockItem
+      item:
+        functionDecl
+          attributes:
+          body:
+            codeBlock
+              leftBrace: {
+              rightBrace: }
+              statements:
+          modifiers:
+          name: identifier "qualifiedTypes"
+          genericParameterClause:
+            genericParameterClause
+              parameters:
+                genericParameter
+                  attributes:
+                  name: identifier "Metadata"
+                  trailingComma: ,
+                genericParameter
+                  attributes:
+                  name: identifier "ErrorComponentType"
+              leftAngle: <
+              rightAngle: >
+          signature:
+            functionSignature
+              parameterClause:
+                functionParameterClause
+                  leftParen: (
+                  rightParen: )
+                  parameters:
+                    functionParameter
+                      colon: :
+                      attributes:
+                      modifiers:
+                      trailingComma: ,
+                      type:
+                        memberType
+                          name: identifier "Generic"
+                          baseType:
+                            identifierType
+                              name: identifier "Outer"
+                          period: .
+                          genericArgumentClause:
+                            genericArgumentClause
+                              arguments:
+                                genericArgument
+                                  argument:
+                                    identifierType
+                                      name: identifier "Metadata"
+                              leftAngle: <
+                              rightAngle: >
+                      firstName: _
+                      secondName: identifier "value"
+                    functionParameter
+                      colon: :
+                      attributes:
+                      modifiers:
+                      trailingComma: ,
+                      type:
+                        memberType
+                          name: identifier "Deep"
+                          baseType:
+                            memberType
+                              name: identifier "Generic"
+                              baseType:
+                                identifierType
+                                  name: identifier "Outer"
+                              period: .
+                              genericArgumentClause:
+                                genericArgumentClause
+                                  arguments:
+                                    genericArgument
+                                      argument:
+                                        identifierType
+                                          name: identifier "Metadata"
+                                  leftAngle: <
+                                  rightAngle: >
+                          period: .
+                          genericArgumentClause:
+                            genericArgumentClause
+                              arguments:
+                                genericArgument
+                                  trailingComma: ,
+                                  argument:
+                                    identifierType
+                                      name: identifier "ErrorComponentType"
+                                genericArgument
+                                  argument:
+                                    arrayType
+                                      leftSquare: [
+                                      rightSquare: ]
+                                      element:
+                                        identifierType
+                                          name: identifier "Metadata"
+                              leftAngle: <
+                              rightAngle: >
+                      firstName: _
+                      secondName: identifier "nested"
+                    functionParameter
+                      colon: :
+                      attributes:
+                      modifiers:
+                      type:
+                        memberType
+                          name: identifier "Plain"
+                          baseType:
+                            memberType
+                              name: identifier "Generic"
+                              baseType:
+                                identifierType
+                                  name: identifier "Outer"
+                              period: .
+                              genericArgumentClause:
+                                genericArgumentClause
+                                  arguments:
+                                    genericArgument
+                                      argument:
+                                        identifierType
+                                          name: identifier "Metadata"
+                                  leftAngle: <
+                                  rightAngle: >
+                          period: .
+                      firstName: _
+                      secondName: identifier "plain"
+          funcKeyword: func
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩\n\n⟨stmt⟩\n⟨stmt⟩\n\n⟨stmt⟩"
+      stmt:
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n\n  ⟨member⟩\n}"
+          modifier: modifier "struct" source="struct"
+          name_node: identifier "Outer" source="Outer"
+          member:
+            class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n    ⟨member⟩\n  }"
+              modifier: modifier "struct" source="struct"
+              name_node: identifier "Inner" source="Inner"
+              member:
+                class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {}"
+                  modifier: modifier "struct" source="struct"
+                  name_node: identifier "Deep" source="Deep"
+                  member:
+                    constructor_declaration source=""
+                      modifier: modifier "generated" source=""
+                      name_node: identifier "init" source=""
+                      body: block source=""
+                constructor_declaration source=""
+                  modifier: modifier "generated" source=""
+                  name_node: identifier "init" source=""
+                  body: block source=""
+            class_like_declaration source="⟨modifier⟩ ⟨name_node⟩<⟨type_parameter⟩> {\n    ⟨member⟩\n    ⟨member⟩\n  }"
+              modifier: modifier "struct" source="struct"
+              name_node: identifier "Generic" source="Generic"
+              type_parameter:
+                type_parameter source="⟨name_node⟩"
+                  name_node: identifier "T" source="T"
+              member:
+                class_like_declaration source="⟨modifier⟩ ⟨name_node⟩<⟨type_parameter⟩, ⟨type_parameter⟩> {}"
+                  modifier: modifier "struct" source="struct"
+                  name_node: identifier "Deep" source="Deep"
+                  type_parameter:
+                    type_parameter source="⟨name_node⟩"
+                      name_node: identifier "U" source="U"
+                    type_parameter source="⟨name_node⟩"
+                      name_node: identifier "V" source="V"
+                  member:
+                    constructor_declaration source=""
+                      modifier: modifier "generated" source=""
+                      name_node: identifier "init" source=""
+                      body: block source=""
+                class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {}"
+                  modifier: modifier "struct" source="struct"
+                  name_node: identifier "Plain" source="Plain"
+                  member:
+                    constructor_declaration source=""
+                      modifier: modifier "generated" source=""
+                      name_node: identifier "init" source=""
+                      body: block source=""
+                constructor_declaration source=""
+                  modifier: modifier "generated" source=""
+                  name_node: identifier "init" source=""
+                  body: block source=""
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "value" source="value"
+          type:
+            member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+              base: identifier "Outer" source="Outer"
+              member_name_node: identifier "Inner" source="Inner"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "nested" source="nested"
+          type:
+            member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+              base:
+                member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                  base: identifier "Outer" source="Outer"
+                  member_name_node: identifier "Inner" source="Inner"
+              member_name_node: identifier "Deep" source="Deep"
+        function_declaration source="func ⟨name_node⟩<⟨type_parameter⟩, ⟨type_parameter⟩>(\n  ⟨parameter⟩,\n  ⟨parameter⟩,\n  ⟨parameter⟩\n) ⟨body⟩"
+          name_node: identifier "qualifiedTypes" source="qualifiedTypes"
+          type_parameter:
+            type_parameter source="⟨name_node⟩"
+              name_node: identifier "Metadata" source="Metadata"
+            type_parameter source="⟨name_node⟩"
+              name_node: identifier "ErrorComponentType" source="ErrorComponentType"
+          parameter:
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type:
+                generic_type_expr source="⟨base⟩<⟨type_argument⟩>"
+                  base:
+                    member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                      base: identifier "Outer" source="Outer"
+                      member_name_node: identifier "Generic" source="Generic"
+                  type_argument: identifier "Metadata" source="Metadata"
+              pattern: identifier "value" source="value"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type:
+                generic_type_expr source="⟨base⟩<⟨type_argument⟩, ⟨type_argument⟩>"
+                  base:
+                    member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                      base:
+                        generic_type_expr source="⟨base⟩<⟨type_argument⟩>"
+                          base:
+                            member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                              base: identifier "Outer" source="Outer"
+                              member_name_node: identifier "Generic" source="Generic"
+                          type_argument: identifier "Metadata" source="Metadata"
+                      member_name_node: identifier "Deep" source="Deep"
+                  type_argument:
+                    identifier "ErrorComponentType" source="ErrorComponentType"
+                    generic_type_expr source="[⟨type_argument⟩]"
+                      base: identifier "Array" source=""
+                      type_argument: identifier "Metadata" source="Metadata"
+              pattern: identifier "nested" source="nested"
+            parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
+              external_name_node: identifier "_" source="_"
+              type:
+                member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                  base:
+                    generic_type_expr source="⟨base⟩<⟨type_argument⟩>"
+                      base:
+                        member_access_expr source="⟨base⟩.⟨member_name_node⟩"
+                          base: identifier "Outer" source="Outer"
+                          member_name_node: identifier "Generic" source="Generic"
+                      type_argument: identifier "Metadata" source="Metadata"
+                  member_name_node: identifier "Plain" source="Plain"
+              pattern: identifier "plain" source="plain"
+          body: block "{}" source="{}"
diff --git a/unified/extractor/tests/corpus/swift/types/qualified-type.swift b/unified/extractor/tests/corpus/swift/types/qualified-type.swift
new file mode 100644
index 000000000000..626a5374830a
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/types/qualified-type.swift
@@ -0,0 +1,19 @@
+struct Outer {
+  struct Inner {
+    struct Deep {}
+  }
+
+  struct Generic<T> {
+    struct Deep<U, V> {}
+    struct Plain {}
+  }
+}
+
+let value: Outer.Inner
+let nested: Outer.Inner.Deep
+
+func qualifiedTypes<Metadata, ErrorComponentType>(
+  _ value: Outer.Generic<Metadata>,
+  _ nested: Outer.Generic<Metadata>.Deep<ErrorComponentType, [Metadata]>,
+  _ plain: Outer.Generic<Metadata>.Plain
+) {}
diff --git a/unified/extractor/tests/corpus/swift/types/static-function.output b/unified/extractor/tests/corpus/swift/types/static-function.output
new file mode 100644
index 000000000000..c5ffb34f027e
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/types/static-function.output
@@ -0,0 +1,61 @@
+class Factory {
+  static func make() {}
+}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        classDecl
+          attributes:
+          modifiers:
+          name: identifier "Factory"
+          memberBlock:
+            memberBlock
+              leftBrace: {
+              rightBrace: }
+              members:
+                memberBlockItem
+                  decl:
+                    functionDecl
+                      attributes:
+                      body:
+                        codeBlock
+                          leftBrace: {
+                          rightBrace: }
+                          statements:
+                      modifiers:
+                        declModifier
+                          name: static
+                      name: identifier "make"
+                      signature:
+                        functionSignature
+                          parameterClause:
+                            functionParameterClause
+                              leftParen: (
+                              rightParen: )
+                              parameters:
+                      funcKeyword: func
+          classKeyword: class
+
+---
+
+top_level source="⟨body⟩"
+  body:
+    block source="⟨stmt⟩"
+      stmt:
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "Factory" source="Factory"
+          member:
+            function_declaration source="⟨modifier⟩ func ⟨name_node⟩() ⟨body⟩"
+              modifier: modifier "static" source="static"
+              name_node: identifier "make" source="make"
+              body: block "{}" source="{}"
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/types/static-function.swift b/unified/extractor/tests/corpus/swift/types/static-function.swift
new file mode 100644
index 000000000000..3b70d91795cb
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/types/static-function.swift
@@ -0,0 +1,3 @@
+class Factory {
+  static func make() {}
+}
diff --git a/unified/extractor/tests/corpus/swift/types/struct.output b/unified/extractor/tests/corpus/swift/types/struct.output
index 57fb25c9e193..45c841255d82 100644
--- a/unified/extractor/tests/corpus/swift/types/struct.output
+++ b/unified/extractor/tests/corpus/swift/types/struct.output
@@ -12,6 +12,7 @@ sourceFile
       item:
         structDecl
           attributes:
+          modifiers:
           name: identifier "Point"
           memberBlock:
             memberBlock
@@ -52,32 +53,27 @@ sourceFile
                               type:
                                 identifierType
                                   name: identifier "Int"
-          modifiers:
           structKeyword: struct
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "struct"
-          name: identifier "Point"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n  ⟨member⟩\n}"
+          modifier: modifier "struct" source="struct"
+          name_node: identifier "Point" source="Point"
           member:
-            variable_declaration
-              modifier: modifier "let"
-              pattern:
-                name_pattern
-                  identifier: identifier "x"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-            variable_declaration
-              modifier: modifier "let"
-              pattern:
-                name_pattern
-                  identifier: identifier "y"
-              type:
-                named_type_expr
-                  name: identifier "Int"
+            variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩"
+              modifier: modifier "let" source="let"
+              pattern: identifier "x" source="x"
+              type: identifier "Int" source="Int"
+            variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩"
+              modifier: modifier "let" source="let"
+              pattern: identifier "y" source="y"
+              type: identifier "Int" source="Int"
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/variables/assignment.output b/unified/extractor/tests/corpus/swift/variables/assignment.output
index a011eb76cafc..cdfb041a8025 100644
--- a/unified/extractor/tests/corpus/swift/variables/assignment.output
+++ b/unified/extractor/tests/corpus/swift/variables/assignment.output
@@ -20,12 +20,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        assign_expr
-          target:
-            name_expr
-              identifier: identifier "x"
-          value: int_literal "1"
+        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+          left: identifier "x" source="x"
+          operator: infix_operator "=" source="="
+          right: int_literal "1" source="1"
diff --git a/unified/extractor/tests/corpus/swift/variables/binding-modifier-does-not-leak-into-initializer.output b/unified/extractor/tests/corpus/swift/variables/binding-modifier-does-not-leak-into-initializer.output
index d159cd6b37cb..d42155011399 100644
--- a/unified/extractor/tests/corpus/swift/variables/binding-modifier-does-not-leak-into-initializer.output
+++ b/unified/extractor/tests/corpus/swift/variables/binding-modifier-does-not-leak-into-initializer.output
@@ -61,31 +61,23 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "x"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "x" source="x"
           value:
-            switch_expr
-              value:
-                name_expr
-                  identifier: identifier "y"
+            switch_expr source="switch ⟨value⟩ {\n⟨case⟩\n⟨case⟩\n}"
+              value: identifier "y" source="y"
               case:
-                switch_case
-                  pattern:
-                    expr_equality_pattern
-                      expr:
-                        name_expr
-                          identifier: identifier "someConstant"
+                switch_case source="case ⟨pattern⟩: ⟨body⟩"
+                  pattern: identifier "someConstant" source="someConstant"
                   body:
-                    block
-                      stmt: int_literal "1"
-                switch_case
+                    block source="⟨stmt⟩"
+                      stmt: int_literal "1" source="1"
+                switch_case source="default: ⟨body⟩"
                   body:
-                    block
-                      stmt: int_literal "2"
+                    block source="⟨stmt⟩"
+                      stmt: int_literal "2" source="2"
diff --git a/unified/extractor/tests/corpus/swift/variables/compound-assignment.output b/unified/extractor/tests/corpus/swift/variables/compound-assignment.output
index 485b5044ad69..300996f69952 100644
--- a/unified/extractor/tests/corpus/swift/variables/compound-assignment.output
+++ b/unified/extractor/tests/corpus/swift/variables/compound-assignment.output
@@ -20,13 +20,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        compound_assign_expr
-          target:
-            name_expr
-              identifier: identifier "x"
-          operator: infix_operator "+="
-          value: int_literal "1"
+        binary_expr source="⟨left⟩ ⟨operator⟩ ⟨right⟩"
+          left: identifier "x" source="x"
+          operator: infix_operator "+=" source="+="
+          right: int_literal "1" source="1"
diff --git a/unified/extractor/tests/corpus/swift/variables/let-binding.output b/unified/extractor/tests/corpus/swift/variables/let-binding.output
index 4774eb3eeca8..ae64722a29c5 100644
--- a/unified/extractor/tests/corpus/swift/variables/let-binding.output
+++ b/unified/extractor/tests/corpus/swift/variables/let-binding.output
@@ -25,13 +25,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "x"
-          value: int_literal "1"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "x" source="x"
+          value: int_literal "1" source="1"
diff --git a/unified/extractor/tests/corpus/swift/variables/let-with-type-annotation.output b/unified/extractor/tests/corpus/swift/variables/let-with-type-annotation.output
index a56feb445ace..2100371ba3ca 100644
--- a/unified/extractor/tests/corpus/swift/variables/let-with-type-annotation.output
+++ b/unified/extractor/tests/corpus/swift/variables/let-with-type-annotation.output
@@ -31,16 +31,12 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "x"
-          type:
-            named_type_expr
-              name: identifier "Int"
-          value: int_literal "1"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "x" source="x"
+          type: identifier "Int" source="Int"
+          value: int_literal "1" source="1"
diff --git a/unified/extractor/tests/corpus/swift/variables/multiple-bindings-on-one-line.output b/unified/extractor/tests/corpus/swift/variables/multiple-bindings-on-one-line.output
index 9470a578ad62..5a4907fed714 100644
--- a/unified/extractor/tests/corpus/swift/variables/multiple-bindings-on-one-line.output
+++ b/unified/extractor/tests/corpus/swift/variables/multiple-bindings-on-one-line.output
@@ -36,21 +36,17 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
-          pattern:
-            name_pattern
-              identifier: identifier "x"
-          value: int_literal "1"
-        variable_declaration
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
+          pattern: identifier "x" source="x"
+          value: int_literal "1" source="1"
+        variable_declaration source="⟨modifier⟩ x = 1, ⟨pattern⟩ = ⟨value⟩"
           modifier:
-            modifier "let"
-            modifier "chained_declaration"
-          pattern:
-            name_pattern
-              identifier: identifier "y"
-          value: int_literal "2"
+            modifier "let" source="let"
+            modifier "chained_declaration" source=""
+          pattern: identifier "y" source="y"
+          value: int_literal "2" source="2"
diff --git a/unified/extractor/tests/corpus/swift/variables/property-with-willset-and-didset-observers.output b/unified/extractor/tests/corpus/swift/variables/property-with-willset-and-didset-observers.output
index 8071d5d52900..12ddc3af1623 100644
--- a/unified/extractor/tests/corpus/swift/variables/property-with-willset-and-didset-observers.output
+++ b/unified/extractor/tests/corpus/swift/variables/property-with-willset-and-didset-observers.output
@@ -14,6 +14,7 @@ sourceFile
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "C"
           memberBlock:
             memberBlock
@@ -68,6 +69,7 @@ sourceFile
                                               calledExpression:
                                                 declReferenceExpr
                                                   baseName: identifier "print"
+                                  modifiers:
                                 accessorDecl
                                   accessorSpecifier: didSet
                                   attributes:
@@ -90,63 +92,65 @@ sourceFile
                                               calledExpression:
                                                 declReferenceExpr
                                                   baseName: identifier "print"
+                                  modifiers:
                               leftBrace: {
                               rightBrace: }
-          modifiers:
           classKeyword: class
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        class_like_declaration
-          modifier: modifier "class"
-          name: identifier "C"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩⟨member⟩⟨member⟩\n}"
+          modifier: modifier "class" source="class"
+          name_node: identifier "C" source="C"
           member:
-            variable_declaration
-              modifier: modifier "var"
-              pattern:
-                name_pattern
-                  identifier: identifier "x"
-              type:
-                named_type_expr
-                  name: identifier "Int"
-              value: int_literal "0"
-            accessor_declaration
+            variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩ = ⟨value⟩ {\n    willSet { print(newValue) }\n    didSet { print(oldValue) }\n  }"
+              modifier: modifier "var" source="var"
+              pattern: identifier "x" source="x"
+              type: identifier "Int" source="Int"
+              value: int_literal "0" source="0"
+            accessor_declaration source="⟨accessor_kind⟩⟨parameter⟩ ⟨body⟩"
               modifier:
-                modifier "var"
-                modifier "chained_declaration"
-              name: identifier "x"
-              accessor_kind: accessor_kind "willSet"
+                modifier "var" source="var" (external)
+                modifier "chained_declaration" source=""
+              name_node: identifier "x" source="x" (external)
+              accessor_kind: accessor_kind "willSet" source="willSet"
+              parameter:
+                parameter source="⟨pattern⟩"
+                  modifier: modifier "generated" source=""
+                  type: identifier "Int" source="Int" (external)
+                  pattern: identifier "newValue" source="willSet"
               body:
-                block
+                block source="{ ⟨stmt⟩ }"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value:
-                            name_expr
-                              identifier: identifier "newValue"
-            accessor_declaration
+                        argument source="⟨value⟩"
+                          value: identifier "newValue" source="newValue"
+            accessor_declaration source="⟨accessor_kind⟩⟨parameter⟩ ⟨body⟩"
               modifier:
-                modifier "var"
-                modifier "chained_declaration"
-              name: identifier "x"
-              accessor_kind: accessor_kind "didSet"
+                modifier "var" source="var" (external)
+                modifier "chained_declaration" source=""
+              name_node: identifier "x" source="x" (external)
+              accessor_kind: accessor_kind "didSet" source="didSet"
+              parameter:
+                parameter source="⟨pattern⟩"
+                  modifier: modifier "generated" source=""
+                  type: identifier "Int" source="Int" (external)
+                  pattern: identifier "oldValue" source="didSet"
               body:
-                block
+                block source="{ ⟨stmt⟩ }"
                   stmt:
-                    call_expr
-                      callee:
-                        name_expr
-                          identifier: identifier "print"
+                    call_expr source="⟨callee⟩(⟨argument⟩)"
+                      callee: identifier "print" source="print"
                       argument:
-                        argument
-                          value:
-                            name_expr
-                              identifier: identifier "oldValue"
+                        argument source="⟨value⟩"
+                          value: identifier "oldValue" source="oldValue"
+            constructor_declaration source=""
+              modifier: modifier "generated" source=""
+              name_node: identifier "init" source=""
+              body: block source=""
diff --git a/unified/extractor/tests/corpus/swift/variables/tuple-destructuring-binding.output b/unified/extractor/tests/corpus/swift/variables/tuple-destructuring-binding.output
index 6b6bd81115ed..54f978c8c25b 100644
--- a/unified/extractor/tests/corpus/swift/variables/tuple-destructuring-binding.output
+++ b/unified/extractor/tests/corpus/swift/variables/tuple-destructuring-binding.output
@@ -36,23 +36,17 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "let"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "let" source="let"
           pattern:
-            tuple_pattern
+            tuple_expr source="(⟨element⟩, ⟨element⟩)"
               element:
-                pattern_element
-                  pattern:
-                    name_pattern
-                      identifier: identifier "a"
-                pattern_element
-                  pattern:
-                    name_pattern
-                      identifier: identifier "b"
-          value:
-            name_expr
-              identifier: identifier "pair"
+                argument source="⟨value⟩"
+                  value: identifier "a" source="a"
+                argument source="⟨value⟩"
+                  value: identifier "b" source="b"
+          value: identifier "pair" source="pair"
diff --git a/unified/extractor/tests/corpus/swift/variables/var-binding.output b/unified/extractor/tests/corpus/swift/variables/var-binding.output
index 63498105dc75..ee5a922da8f6 100644
--- a/unified/extractor/tests/corpus/swift/variables/var-binding.output
+++ b/unified/extractor/tests/corpus/swift/variables/var-binding.output
@@ -25,13 +25,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "var"
-          pattern:
-            name_pattern
-              identifier: identifier "x"
-          value: int_literal "1"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
+          modifier: modifier "var" source="var"
+          pattern: identifier "x" source="x"
+          value: int_literal "1" source="1"
diff --git a/unified/extractor/tests/corpus/swift/variables/var-without-initialiser.output b/unified/extractor/tests/corpus/swift/variables/var-without-initialiser.output
index d841ce2bb583..4aac0af4ce32 100644
--- a/unified/extractor/tests/corpus/swift/variables/var-without-initialiser.output
+++ b/unified/extractor/tests/corpus/swift/variables/var-without-initialiser.output
@@ -25,15 +25,11 @@ sourceFile
 
 ---
 
-top_level
+top_level source="⟨body⟩"
   body:
-    block
+    block source="⟨stmt⟩"
       stmt:
-        variable_declaration
-          modifier: modifier "var"
-          pattern:
-            name_pattern
-              identifier: identifier "x"
-          type:
-            named_type_expr
-              name: identifier "Int"
+        variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩"
+          modifier: modifier "var" source="var"
+          pattern: identifier "x" source="x"
+          type: identifier "Int" source="Int"
diff --git a/unified/extractor/tests/corpus_tests.rs b/unified/extractor/tests/corpus_tests.rs
index b2700b999b7c..5a45c0f45b17 100644
--- a/unified/extractor/tests/corpus_tests.rs
+++ b/unified/extractor/tests/corpus_tests.rs
@@ -2,7 +2,8 @@ use std::fs;
 use std::path::Path;
 
 use codeql_extractor::extractor::desugaring;
-use yeast::{dump::dump_ast, dump::dump_ast_with_type_errors};
+use yeast::OutputAst as Ast;
+use yeast::dump::{DumpOptions, dump_ast, dump_ast_with_type_errors_and_options};
 
 #[path = "../src/languages/mod.rs"]
 mod languages;
@@ -20,20 +21,6 @@ fn update_mode_enabled() -> bool {
         .unwrap_or(false)
 }
 
-/// Whether the external swift-syntax parser is available. When the parser
-/// binary genuinely cannot be found/launched (e.g. no Swift toolchain, and
-/// neither `CODEQL_EXTRACTOR_UNIFIED_SWIFT_SYNTAX_PARSE` nor a `swift-syntax-parse`
-/// on `PATH`), the corpus test is skipped rather than failed — it cannot run
-/// without the Swift-backed parser.
-///
-/// Crucially this checks only that the executable *launches*: a parser that is
-/// present but crashes, emits invalid JSON, or otherwise regresses is
-/// considered available, so the suite runs and fails (rather than silently
-/// skipping the very failures CI needs to catch).
-fn parser_available() -> bool {
-    languages::swift_parse::binary_available()
-}
-
 /// Parse a corpus `.output` file. The file holds a single test case made of
 /// three sections separated by `---` delimiter lines:
 ///
@@ -75,7 +62,7 @@ fn render_corpus(case: &CorpusCase) -> String {
 
 /// Parse `input` through the language's parser and desugar it, returning the
 /// mapped AST.
-fn run_desugaring(lang: &desugaring::LanguageSpec, input: &str) -> Result<yeast::Ast, String> {
+fn run_desugaring(lang: &desugaring::LanguageSpec, input: &str) -> Result<Ast, String> {
     let parsed = (lang.parser)(input.as_bytes())?;
     lang.desugarer
         .run_from_ast(parsed.ast)
@@ -110,25 +97,34 @@ fn collect_corpus_stems(dir: &Path, out: &mut Vec<std::path::PathBuf>) {
     }
 }
 
+#[cfg(bazel)]
+fn corpus_dir() -> std::path::PathBuf {
+    let base =
+        std::path::PathBuf::from(std::env::var("RUNFILES_DIR").expect("RUNFILES_DIR not set"));
+    std::fs::read_dir(&base)
+        .expect("failed to read RUNFILES_DIR")
+        .filter_map(Result::ok)
+        .map(|entry| entry.path().join("unified/extractor/tests/corpus"))
+        .find(|path| path.exists())
+        .expect("corpus not found under any runfiles repo root")
+}
+
+#[cfg(not(bazel))]
+fn corpus_dir() -> std::path::PathBuf {
+    std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/corpus")
+}
+
 #[test]
 fn test_corpus() {
-    if !parser_available() {
-        eprintln!(
-            "skipping test_corpus: the swift-syntax parser is unavailable \
-             (set CODEQL_EXTRACTOR_UNIFIED_SWIFT_SYNTAX_PARSE or put \
-             `swift-syntax-parse` on PATH)"
-        );
-        return;
-    }
     let update_mode = update_mode_enabled();
     let all_languages = languages::all_language_specs();
-    let corpus_dir = Path::new("tests/corpus");
+    let corpus_dir = corpus_dir();
 
     for lang in all_languages {
         let output_schema = yeast::node_types_yaml::schema_from_yaml(languages::OUTPUT_AST_SCHEMA)
             .expect("Failed to parse OUTPUT_AST_SCHEMA YAML");
 
-        let lang_corpus_dir = corpus_dir.join(&lang.prefix);
+        let lang_corpus_dir = corpus_dir.join(lang.prefix);
         if !lang_corpus_dir.exists() {
             continue;
         }
@@ -228,11 +224,15 @@ fn test_corpus() {
                         ));
                     }
                     Ok(actual) => {
-                        let actual_dump = dump_ast_with_type_errors(
+                        let actual_dump = dump_ast_with_type_errors_and_options(
                             &actual,
                             actual.get_root(),
                             &case_input,
                             &output_schema,
+                            &DumpOptions {
+                                show_abridged_source: true,
+                                ..DumpOptions::default()
+                            },
                         );
                         if update_mode {
                             case.expected = actual_dump.trim().to_string();
diff --git a/unified/extractor/tests/fixtures/let_x.swiftsyntax.json b/unified/extractor/tests/fixtures/let_x.swiftsyntax.json
index 6c3d18e2fef0..a0b911813fff 100644
--- a/unified/extractor/tests/fixtures/let_x.swiftsyntax.json
+++ b/unified/extractor/tests/fixtures/let_x.swiftsyntax.json
@@ -1,196 +1,80 @@
 {
+    "$end": 10,
+    "$lineStarts": [
+        0,
+        10
+    ],
+    "$pos": 0,
     "endOfFileToken": {
+        "$end": 10,
+        "$pos": 10,
         "kind": "token",
-        "range": {
-            "end": {
-                "column": 1,
-                "line": 2,
-                "offset": 10
-            },
-            "start": {
-                "column": 1,
-                "line": 2,
-                "offset": 10
-            }
-        },
         "text": "",
         "tokenKind": "endOfFile"
     },
     "kind": "sourceFile",
-    "range": {
-        "end": {
-            "column": 1,
-            "line": 2,
-            "offset": 10
-        },
-        "start": {
-            "column": 1,
-            "line": 1,
-            "offset": 0
-        }
-    },
     "statements": [
         {
+            "$end": 9,
+            "$pos": 0,
             "item": {
+                "$end": 9,
+                "$pos": 0,
                 "attributes": [],
                 "bindings": [
                     {
+                        "$end": 9,
+                        "$pos": 4,
                         "initializer": {
+                            "$end": 9,
+                            "$pos": 6,
                             "equal": {
+                                "$end": 7,
+                                "$pos": 6,
                                 "kind": "token",
-                                "range": {
-                                    "end": {
-                                        "column": 8,
-                                        "line": 1,
-                                        "offset": 7
-                                    },
-                                    "start": {
-                                        "column": 7,
-                                        "line": 1,
-                                        "offset": 6
-                                    }
-                                },
                                 "text": "=",
                                 "tokenKind": "equal"
                             },
                             "kind": "initializerClause",
-                            "range": {
-                                "end": {
-                                    "column": 10,
-                                    "line": 1,
-                                    "offset": 9
-                                },
-                                "start": {
-                                    "column": 7,
-                                    "line": 1,
-                                    "offset": 6
-                                }
-                            },
                             "value": {
+                                "$end": 9,
+                                "$pos": 8,
                                 "kind": "integerLiteralExpr",
                                 "literal": {
+                                    "$end": 9,
+                                    "$pos": 8,
                                     "kind": "token",
-                                    "range": {
-                                        "end": {
-                                            "column": 10,
-                                            "line": 1,
-                                            "offset": 9
-                                        },
-                                        "start": {
-                                            "column": 9,
-                                            "line": 1,
-                                            "offset": 8
-                                        }
-                                    },
                                     "text": "1",
                                     "tokenKind": "integerLiteral(\"1\")"
-                                },
-                                "range": {
-                                    "end": {
-                                        "column": 10,
-                                        "line": 1,
-                                        "offset": 9
-                                    },
-                                    "start": {
-                                        "column": 9,
-                                        "line": 1,
-                                        "offset": 8
-                                    }
                                 }
                             }
                         },
                         "kind": "patternBinding",
                         "pattern": {
+                            "$end": 5,
+                            "$pos": 4,
                             "identifier": {
+                                "$end": 5,
+                                "$pos": 4,
                                 "kind": "token",
-                                "range": {
-                                    "end": {
-                                        "column": 6,
-                                        "line": 1,
-                                        "offset": 5
-                                    },
-                                    "start": {
-                                        "column": 5,
-                                        "line": 1,
-                                        "offset": 4
-                                    }
-                                },
                                 "text": "x",
                                 "tokenKind": "identifier(\"x\")"
                             },
-                            "kind": "identifierPattern",
-                            "range": {
-                                "end": {
-                                    "column": 6,
-                                    "line": 1,
-                                    "offset": 5
-                                },
-                                "start": {
-                                    "column": 5,
-                                    "line": 1,
-                                    "offset": 4
-                                }
-                            }
-                        },
-                        "range": {
-                            "end": {
-                                "column": 10,
-                                "line": 1,
-                                "offset": 9
-                            },
-                            "start": {
-                                "column": 5,
-                                "line": 1,
-                                "offset": 4
-                            }
+                            "kind": "identifierPattern"
                         }
                     }
                 ],
                 "bindingSpecifier": {
+                    "$end": 3,
+                    "$pos": 0,
                     "kind": "token",
-                    "range": {
-                        "end": {
-                            "column": 4,
-                            "line": 1,
-                            "offset": 3
-                        },
-                        "start": {
-                            "column": 1,
-                            "line": 1,
-                            "offset": 0
-                        }
-                    },
                     "text": "let",
                     "tokenKind": "keyword(SwiftSyntax.Keyword.let)"
                 },
                 "kind": "variableDecl",
-                "modifiers": [],
-                "range": {
-                    "end": {
-                        "column": 10,
-                        "line": 1,
-                        "offset": 9
-                    },
-                    "start": {
-                        "column": 1,
-                        "line": 1,
-                        "offset": 0
-                    }
-                }
+                "modifiers": []
             },
-            "kind": "codeBlockItem",
-            "range": {
-                "end": {
-                    "column": 10,
-                    "line": 1,
-                    "offset": 9
-                },
-                "start": {
-                    "column": 1,
-                    "line": 1,
-                    "offset": 0
-                }
-            }
+            "kind": "codeBlockItem"
         }
     ]
 }
diff --git a/unified/extractor/tests/location_tests.rs b/unified/extractor/tests/location_tests.rs
new file mode 100644
index 000000000000..66e24473993c
--- /dev/null
+++ b/unified/extractor/tests/location_tests.rs
@@ -0,0 +1,186 @@
+use yeast::OutputAst as Ast;
+
+#[path = "../src/languages/mod.rs"]
+mod languages;
+
+fn desugar(source: &str) -> Ast {
+    let lang = languages::all_language_specs()
+        .into_iter()
+        .find(|language| {
+            language
+                .file_globs
+                .iter()
+                .any(|glob| glob.contains("swift"))
+        })
+        .expect("Swift language spec");
+    let parsed = (lang.parser)(source.as_bytes()).expect("Swift should parse");
+    lang.desugarer
+        .run_from_ast(parsed.ast)
+        .expect("Swift should desugar")
+}
+
+fn spans(ast: &Ast, source: &str, kind: &str, content: Option<&str>) -> Vec<String> {
+    ranges(ast, kind, content)
+        .into_iter()
+        .filter_map(|range| source.get(range).map(str::to_owned))
+        .collect()
+}
+
+fn ranges(ast: &Ast, kind: &str, content: Option<&str>) -> Vec<std::ops::Range<usize>> {
+    ast.reachable_node_ids()
+        .into_iter()
+        .filter_map(|id| {
+            let node = ast.get_node(id)?;
+            if node.kind_name() != kind
+                || content
+                    .is_some_and(|content| node.opt_string_content().as_deref() != Some(content))
+            {
+                return None;
+            }
+            node.source_range()
+                .map(|range| range.start_byte..range.end_byte)
+        })
+        .collect()
+}
+
+fn assert_has_span(ast: &Ast, source: &str, kind: &str, content: Option<&str>, expected: &str) {
+    let spans = spans(ast, source, kind, content);
+    assert!(
+        spans.iter().any(|span| span == expected),
+        "expected {kind} {content:?} to span {expected:?}, got {spans:?}"
+    );
+}
+
+fn assert_has_empty_span(ast: &Ast, kind: &str, content: Option<&str>, expected_offset: usize) {
+    let ranges = ranges(ast, kind, content);
+    assert!(
+        ranges
+            .iter()
+            .any(|range| range.start == expected_offset && range.end == expected_offset),
+        "expected {kind} {content:?} to have an empty span at {expected_offset}, got {ranges:?}"
+    );
+}
+
+#[test]
+fn generic_type_children_have_local_ranges() {
+    let source = "let x = C<Foo>()";
+    let ast = desugar(source);
+
+    assert_has_span(&ast, source, "generic_type_expr", None, "C<Foo>");
+    assert_has_span(&ast, source, "identifier", Some("C"), "C");
+    assert_has_span(&ast, source, "identifier", Some("Foo"), "Foo");
+}
+
+#[test]
+fn nested_calls_include_their_delimiters() {
+    let source = r#"sink(source("first"), source("second"))"#;
+    let ast = desugar(source);
+
+    assert_has_span(&ast, source, "call_expr", None, r#"source("first")"#);
+    assert_has_span(&ast, source, "call_expr", None, r#"source("second")"#);
+}
+
+#[test]
+fn enum_case_constructors_include_their_parameter_clause() {
+    let source = "enum Result<T> { case success(T) }";
+    let ast = desugar(source);
+
+    assert_has_span(&ast, source, "constructor_declaration", None, "success(T)");
+}
+
+#[test]
+fn synthesized_condition_and_switch_nodes_use_child_ranges() {
+    let source = "if a, b { c }\nswitch x { case a, b: c }";
+    let ast = desugar(source);
+
+    assert_has_span(&ast, source, "binary_expr", None, "a, b");
+    assert_has_empty_span(
+        &ast,
+        "infix_operator",
+        Some("&&"),
+        source.find(',').unwrap(),
+    );
+    assert_has_span(&ast, source, "or_pattern", None, "a, b");
+    assert_has_span(&ast, source, "block", None, "c");
+}
+
+#[test]
+fn declaration_and_operator_tokens_keep_precise_ranges() {
+    let source = "func f() { return x }\nlet y = try? await value! as? T\nlet z = value is T";
+    let ast = desugar(source);
+
+    assert_has_span(&ast, source, "block", None, "{ return x }");
+    assert_has_span(&ast, source, "return_expr", None, "return x");
+    assert_has_span(&ast, source, "prefix_operator", Some("try?"), "try?");
+    assert_has_span(&ast, source, "prefix_operator", Some("await"), "await");
+    assert_has_span(&ast, source, "postfix_operator", Some("!"), "!");
+    assert_has_span(&ast, source, "infix_operator", Some("as?"), "as?");
+    assert_has_span(&ast, source, "infix_operator", Some("is"), "is");
+}
+
+#[test]
+fn closure_bodies_exclude_closure_delimiters() {
+    let source = "let f = { (x: Int) -> Int in x * 2 }";
+    let ast = desugar(source);
+
+    assert_has_span(&ast, source, "block", None, "x * 2");
+}
+
+#[test]
+fn synthetic_optional_binding_nodes_anchor_to_binding_keyword() {
+    let source = "if let value = optional {}";
+    let ast = desugar(source);
+    let binding_start = source.find("let").unwrap();
+
+    assert_has_empty_span(&ast, "member_access_expr", None, binding_start);
+    assert_has_empty_span(&ast, "identifier", Some("Optional"), binding_start);
+    assert_has_empty_span(&ast, "identifier", Some("some"), binding_start);
+    assert_has_span(&ast, source, "modifier", Some("let"), "let");
+}
+
+#[test]
+fn synthetic_type_and_modifier_nodes_use_empty_scope_start_ranges() {
+    let source = "let array: [T]\nlet optional: T?\nenum E { case a, b }";
+    let ast = desugar(source);
+
+    assert_has_empty_span(&ast, "identifier", Some("Array"), source.find('[').unwrap());
+    assert_has_empty_span(
+        &ast,
+        "identifier",
+        Some("Optional"),
+        source.find("T?").unwrap(),
+    );
+    let case_a = source.find("a, b").unwrap();
+    let case_b = case_a + "a, ".len();
+    assert_has_empty_span(&ast, "modifier", Some("enum_case"), case_a);
+    assert_has_empty_span(&ast, "modifier", Some("enum_case"), case_b);
+    assert_has_empty_span(&ast, "modifier", Some("chained_declaration"), case_b);
+}
+
+#[test]
+fn import_member_chain_excludes_import_keyword() {
+    let source = "import Foundation.Networking.URLSession";
+    let ast = desugar(source);
+
+    assert_has_span(
+        &ast,
+        source,
+        "member_access_expr",
+        None,
+        "Foundation.Networking",
+    );
+    assert_has_span(
+        &ast,
+        source,
+        "member_access_expr",
+        None,
+        "Foundation.Networking.URLSession",
+    );
+    assert_has_span(
+        &ast,
+        source,
+        "import_declaration",
+        None,
+        "import Foundation.Networking.URLSession",
+    );
+}
diff --git a/unified/platforms.bzl b/unified/platforms.bzl
new file mode 100644
index 000000000000..29560c75b3c4
--- /dev/null
+++ b/unified/platforms.bzl
@@ -0,0 +1,9 @@
+"""Shared platform constraint for the unified extractor."""
+
+# swift-syntax requires a Swift toolchain, which is only available
+# through rules_swift.
+UNIFIED_SUPPORTED_PLATFORMS = select({
+    "@platforms//os:linux": [],
+    "@platforms//os:macos": [],
+    "//conditions:default": ["@platforms//:incompatible"],
+})
diff --git a/unified/ql/consistency-queries/CaptureSsaConsistency.ql b/unified/ql/consistency-queries/CaptureSsaConsistency.ql
new file mode 100644
index 000000000000..19f35b7371fb
--- /dev/null
+++ b/unified/ql/consistency-queries/CaptureSsaConsistency.ql
@@ -0,0 +1,3 @@
+private import unified
+private import codeql.unified.internal.dataflow.CaptureSsa
+import CaptureSsaOutput::ConsistencyChecks
diff --git a/unified/ql/consistency-queries/CfgConsistency.ql b/unified/ql/consistency-queries/CfgConsistency.ql
new file mode 100644
index 000000000000..5bbfd7e22170
--- /dev/null
+++ b/unified/ql/consistency-queries/CfgConsistency.ql
@@ -0,0 +1,2 @@
+import unified
+import ControlFlow::Consistency
diff --git a/unified/ql/consistency-queries/DataFlowConsistency.ql b/unified/ql/consistency-queries/DataFlowConsistency.ql
new file mode 100644
index 000000000000..71cd02531030
--- /dev/null
+++ b/unified/ql/consistency-queries/DataFlowConsistency.ql
@@ -0,0 +1,29 @@
+private import unified
+private import codeql.unified.internal.dataflow.AllDataFlow
+private import codeql.dataflow.internal.DataFlowImplConsistency
+
+module ConsistencyInput implements InputSig<Location, DataFlowInput> {
+  predicate argHasPostUpdateExclude(DataFlowInput::ArgumentNode n) {
+    not exists(n.getBasicBlock()) // ignore unreachable data flow nodes
+    or
+    // The value passed into a setter call technically needs a post-update node
+    // because it's an argument to a call, but this rarely matters in practice.
+    n.(BuilderNode).isSetterValueArgument(_)
+  }
+
+  predicate reverseReadExclude(DataFlow::Node n) {
+    // When read steps are contributed by a language plugin we currently don't expect them to
+    // have post-update nodes for reverse-reads.
+    any(DataFlowPlugin p).step(n, any(Step s | s.read(_)), _)
+  }
+
+  predicate postWithInFlowExclude(DataFlow::Node n) {
+    // In summaries, 'inout' parameters result in flow directly into the post-update node for an argument
+    n instanceof TSummaryNode
+  }
+}
+
+module ConsistencyOutput =
+  MakeConsistency<Location, DataFlowInput, TaintTrackingInput, ConsistencyInput>;
+
+import ConsistencyOutput
diff --git a/unified/ql/consistency-queries/LocalSsaConsistency.ql b/unified/ql/consistency-queries/LocalSsaConsistency.ql
new file mode 100644
index 000000000000..ca0d9550ad20
--- /dev/null
+++ b/unified/ql/consistency-queries/LocalSsaConsistency.ql
@@ -0,0 +1,4 @@
+private import unified
+private import codeql.unified.internal.dataflow.LocalSsa
+import LocalSsaOutput::Consistency
+import LocalSsaDataFlowOutput::DfConsistency
diff --git a/unified/ql/consistency-queries/TypeInferenceConsistency.ql b/unified/ql/consistency-queries/TypeInferenceConsistency.ql
new file mode 100644
index 000000000000..8e5c85b8be6e
--- /dev/null
+++ b/unified/ql/consistency-queries/TypeInferenceConsistency.ql
@@ -0,0 +1,8 @@
+/**
+ * @name Type inference inconsistencies
+ * @description Lists the type inference inconsistencies in the database.  This query is intended for internal use.
+ * @kind table
+ * @id unified/diagnostics/type-inference-consistency
+ */
+
+import codeql.unified.internal.typeinference.TypeInferenceConsistency
diff --git a/unified/ql/consistency-queries/qlpack.yml b/unified/ql/consistency-queries/qlpack.yml
new file mode 100644
index 000000000000..3013f12c3257
--- /dev/null
+++ b/unified/ql/consistency-queries/qlpack.yml
@@ -0,0 +1,5 @@
+name: codeql/unified-consistency-queries
+groups: [unified, test, consistency-queries]
+dependencies:
+  codeql/unified-all: ${workspace}
+warnOnImplicitThis: true
diff --git a/unified/ql/lib/codeql/Definitions.qll b/unified/ql/lib/codeql/Definitions.qll
new file mode 100644
index 000000000000..c47a37158724
--- /dev/null
+++ b/unified/ql/lib/codeql/Definitions.qll
@@ -0,0 +1,16 @@
+/**
+ * Provides predicates related to jump-to-definition links in the code viewer.
+ */
+
+private import unified
+private import codeql.unified.internal.NameBinding
+
+/**
+ * Holds if `reference` refers to `definition`.
+ */
+cached
+predicate definitionOf(Identifier reference, NameBinding definition, string kind) {
+  definition = getStaticBindingTargetFromIdentifier(reference) and
+  not reference instanceof NameBinding and
+  kind = "name"
+}
diff --git a/unified/ql/lib/codeql/files/FileSystem.qll b/unified/ql/lib/codeql/files/FileSystem.qll
index 6cc771fad9d2..59c7900c550f 100644
--- a/unified/ql/lib/codeql/files/FileSystem.qll
+++ b/unified/ql/lib/codeql/files/FileSystem.qll
@@ -2,6 +2,7 @@
 overlay[local]
 module;
 
+private import unified
 private import codeql.Locations
 private import codeql.util.FileSystem
 
@@ -31,8 +32,29 @@ class Container = Impl::Container;
 
 class Folder = Impl::Folder;
 
+module Folder = Impl::Folder;
+
 /** A file. */
 class File extends Container, Impl::File {
   /** Holds if this file was extracted from ordinary source code. */
-  predicate fromSource() { any() }
+  predicate fromSource() { exists(this.getRelativePath()) }
+
+  /**
+   * Gets the number of lines containing code in this file. This value
+   * is approximate.
+   */
+  overlay[local?]
+  int getNumberOfLinesOfCode() {
+    result =
+      count(int line |
+        exists(AstNode node, Location loc |
+          not node instanceof Comment and
+          not node instanceof TopLevel and
+          loc = node.getLocation() and
+          this = loc.getFile() and
+          line = loc.getStartLine() and
+          not loc instanceof EmptyLocation
+        )
+      )
+  }
 }
diff --git a/unified/ql/lib/codeql/unified/internal/AnalysisQuality.qll b/unified/ql/lib/codeql/unified/internal/AnalysisQuality.qll
new file mode 100644
index 000000000000..b0b48abf6f4c
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/AnalysisQuality.qll
@@ -0,0 +1,175 @@
+private import unified
+private import codeql.util.ReportStats
+private import codeql.unified.internal.NameBinding
+private import codeql.unified.internal.dataflow.DataFlowCall
+private import codeql.unified.internal.dataflow.DataFlowCallable
+private import codeql.unified.internal.dataflow.CallGraph
+private import codeql.unified.internal.typeinference.Type as Type
+private import codeql.unified.internal.typeinference.TypeMention
+
+/** Stats about name nodes that static name binding could resolve. */
+module StaticNameResolutionStats implements EntityStatsSig {
+  /**
+   * Holds if `name` has been positively identified as referring to a value, so static name binding
+   * is not expected to resolve its members.
+   */
+  private predicate resolvesToValue(Identifier name) {
+    exists(AstNode decl |
+      decl = getStaticBindingTargetFromIdentifier(name).getDeclaration() and
+      not decl instanceof ClassLikeDeclaration and
+      not decl instanceof TypeAliasDeclaration and
+      not decl instanceof TypeParameter and
+      not decl instanceof AssociatedTypeDeclaration
+    )
+  }
+
+  /**
+   * Holds if name-binding for `expr` depends on type inference, and is thus not subject to static name binding.
+   *
+   * Usually this holds for qualified instance member accesses (`foo().x`) and leading-dot expressions (`.x`).
+   */
+  private predicate memberAccessDependsOnTypeInference(MemberAccessExpr expr) {
+    exists(Expr base | base = expr.getBase() |
+      // Base expression resolves to a value, e.g. a field, variable, or function (for languages where functions are values).
+      resolvesToValue(getIdentifierFromRef(base))
+      or
+      // Base expression is of a kind that is not subject to static name resolution, e.g. `foo().x`
+      not exists(getIdentifierFromRef(base))
+      or
+      // Base expression is a confirmed to depend on type inference
+      memberAccessDependsOnTypeInference(base)
+    )
+  }
+
+  class Candidate extends Identifier {
+    Candidate() {
+      exists(AstNode ref |
+        this = getIdentifierFromRef(ref) and
+        not memberAccessDependsOnTypeInference(ref)
+      ) and
+      not this instanceof NameBinding
+    }
+
+    NameBindingNode getTarget() {
+      result.asIdentifier() = getStaticBindingTargetFromIdentifier(this)
+      or
+      result.isModuleScopeNode(_) and
+      result.(NamespaceNode).ref().isIdentifier(this)
+      or
+      // Resolving to an implicitly-declared local such as "self" should count as
+      // as a successfully resolved name
+      exists(LocalName implicitLocal |
+        implicitLocal = this.(LocalNameAccess).getLocalName() and
+        not exists(implicitLocal.getABinding()) and
+        result.isLocalName(implicitLocal)
+      )
+    }
+
+    predicate isOk() { exists(this.getTarget()) }
+  }
+
+  string getOkText() { result = "statically resolvable names" }
+
+  string getNotOkText() { result = "statically unresolvable names" }
+}
+
+module StaticNameResolutionStatsReport = EntityReportStats<StaticNameResolutionStats>;
+
+/** Stats about which files are covered by a module manifest. */
+module FilesCoveredByModuleManifestStats implements EntityStatsSig {
+  class Candidate extends File {
+    Candidate() { this.getExtension() = "swift" }
+
+    ModuleScopeRepr getAModule() { result.getAnIncludedFile() = this }
+
+    predicate isOk() { exists(this.getAModule()) }
+  }
+
+  string getOkText() { result = "files covered by a module manifest" }
+
+  string getNotOkText() { result = "files not covered by any module manifest" }
+}
+
+module FilesCoveredByModuleManifestStatsReport =
+  EntityReportStats<FilesCoveredByModuleManifestStats>;
+
+module CallGraphStats implements EntityStatsSig {
+  class Candidate extends CallExpr {
+    Candidate() { exists(DataFlowCall c | c.asExplicitCall() = this) }
+
+    DataFlowCall getDataFlowCall() { result.asExplicitCall() = this }
+
+    DataFlowCallable getTarget() { result = viableCallable(this.getDataFlowCall()) }
+
+    predicate isOk() { exists(this.getTarget()) }
+  }
+
+  string getOkText() { result = "calls with call target" }
+
+  string getNotOkText() { result = "calls with missing call target" }
+}
+
+module CallGraphStatsReport = EntityReportStats<CallGraphStats>;
+
+module TypeMentionStats implements EntityStatsSig {
+  class Candidate extends ExprTypeMention {
+    predicate isOk() { this.getType() = any(Type::Type t | not t instanceof Type::UnknownType) }
+  }
+
+  string getOkText() { result = "resolvable type mentions" }
+
+  string getNotOkText() { result = "unresolvable type mentions" }
+}
+
+module TypeMentionStatsReport = EntityReportStats<TypeMentionStats>;
+
+module TaintReach {
+  private class Candidate extends DataFlow::Node {
+    Candidate() { exists(this.asExpr()) }
+  }
+
+  module TaintReachConfig implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node node) { Models::isSource(node, _) }
+
+    predicate isSink(DataFlow::Node node) { node instanceof Candidate }
+  }
+
+  module TaintReachFlow = TaintTracking::Global<TaintReachConfig>;
+
+  DataFlow::Node taintedNode() { TaintReachFlow::flowTo(result) }
+
+  int numberOfTaintedNodes() { result = count(taintedNode()) }
+
+  int numberOfCandidates() { result = count(Candidate c) }
+
+  int perMillionNodes() {
+    result = ((numberOfTaintedNodes() * 1000000.0) / numberOfCandidates()).floor()
+    or
+    numberOfCandidates() = 0 and result = 0
+  }
+}
+
+/**
+ * Gets summary statistics about taint.
+ */
+predicate taintStats(string key, int value) {
+  // The keys must match those in DCA summary profiles
+  key = "Taint sources - active" and value = count(DataFlow::Node n | Models::isSource(n, "remote"))
+  or
+  key = "Taint sources - disabled" and
+  value = count(DataFlow::Node n | Models::isSource(n, any(string s | s != "remote")))
+  or
+  key = "Taint sources - sensitive data" and none()
+  or
+  key = "Taint edges - number of edges" and none()
+  or
+  key = "Taint reach - nodes tainted" and value = TaintReach::numberOfTaintedNodes()
+  or
+  key = "Taint reach - total non-summary nodes" and none()
+  or
+  key = "Taint reach - per million nodes" and value = TaintReach::perMillionNodes()
+  or
+  key = "Taint sinks - query sinks" and value = count(DataFlow::Node n | Models::isSink(n, _))
+  or
+  key = "Taint sinks - cryptographic operations" and none()
+}
diff --git a/unified/ql/lib/codeql/unified/internal/Ast.qll b/unified/ql/lib/codeql/unified/internal/Ast.qll
index 20ff74e6eaf7..5f410460536e 100644
--- a/unified/ql/lib/codeql/unified/internal/Ast.qll
+++ b/unified/ql/lib/codeql/unified/internal/Ast.qll
@@ -96,7 +96,7 @@ module Unified {
   }
 
   /** A class representing `accessor_declaration` nodes. */
-  class AccessorDeclaration extends @unified_accessor_declaration, F::Member, F::Stmt {
+  class AccessorDeclaration extends @unified_accessor_declaration, F::Callable, F::Member, F::Stmt {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "AccessorDeclaration" }
 
@@ -104,7 +104,7 @@ module Unified {
     final F::AccessorKind getAccessorKind() { unified_accessor_declaration_def(this, result, _) }
 
     /** Gets the node corresponding to the field `body`. */
-    final F::Block getBody() { unified_accessor_declaration_body(this, result) }
+    final override F::Block getBody() { unified_accessor_declaration_body(this, result) }
 
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getModifier(int i) { unified_accessor_declaration_modifier(this, i, result) }
@@ -112,19 +112,21 @@ module Unified {
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
-    /** Gets the node corresponding to the field `name`. */
-    final F::Identifier getName() { unified_accessor_declaration_def(this, _, result) }
+    /** Gets the node corresponding to the field `name_node`. */
+    final override F::Identifier getNameNode() { unified_accessor_declaration_def(this, _, result) }
 
     /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getParameter(int i) {
+    final override F::Parameter getParameter(int i) {
       unified_accessor_declaration_parameter(this, i, result)
     }
 
     /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getAParameter() { result = this.getParameter(_) }
+    final override F::Parameter getAParameter() { result = this.getParameter(_) }
 
-    /** Gets the node corresponding to the field `type`. */
-    final F::TypeExpr getType() { unified_accessor_declaration_type(this, result) }
+    /** Gets the node corresponding to the field `return_type`. */
+    final override F::Expr getReturnType() {
+      unified_accessor_declaration_return_type(this, result)
+    }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -133,7 +135,7 @@ module Unified {
       unified_accessor_declaration_modifier(this, _, result) or
       unified_accessor_declaration_def(this, _, result) or
       unified_accessor_declaration_parameter(this, _, result) or
-      unified_accessor_declaration_type(this, result)
+      unified_accessor_declaration_return_type(this, result)
     }
   }
 
@@ -154,8 +156,8 @@ module Unified {
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
-    /** Gets the node corresponding to the field `name`. */
-    final F::Identifier getName() { unified_argument_name(this, result) }
+    /** Gets the node corresponding to the field `name_node`. */
+    final F::Identifier getNameNode() { unified_argument_name_node(this, result) }
 
     /** Gets the node corresponding to the field `value`. */
     final F::Expr getValue() { unified_argument_def(this, result) }
@@ -163,7 +165,7 @@ module Unified {
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
       unified_argument_modifier(this, _, result) or
-      unified_argument_name(this, result) or
+      unified_argument_name_node(this, result) or
       unified_argument_def(this, result)
     }
   }
@@ -183,30 +185,13 @@ module Unified {
     final override F::AstNode getAFieldOrChild() { unified_array_literal_element(this, _, result) }
   }
 
-  /** A class representing `assign_expr` nodes. */
-  class AssignExpr extends @unified_assign_expr, F::Expr {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "AssignExpr" }
-
-    /** Gets the node corresponding to the field `target`. */
-    final F::ExprOrPattern getTarget() { unified_assign_expr_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `value`. */
-    final F::Expr getValue() { unified_assign_expr_def(this, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override F::AstNode getAFieldOrChild() {
-      unified_assign_expr_def(this, result, _) or unified_assign_expr_def(this, _, result)
-    }
-  }
-
   /** A class representing `associated_type_declaration` nodes. */
   class AssociatedTypeDeclaration extends @unified_associated_type_declaration, F::Member {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "AssociatedTypeDeclaration" }
 
     /** Gets the node corresponding to the field `bound`. */
-    final F::TypeExpr getBound() { unified_associated_type_declaration_bound(this, result) }
+    final F::Expr getBound() { unified_associated_type_declaration_bound(this, result) }
 
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getModifier(int i) {
@@ -216,8 +201,10 @@ module Unified {
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
-    /** Gets the node corresponding to the field `name`. */
-    final F::Identifier getName() { unified_associated_type_declaration_def(this, result) }
+    /** Gets the node corresponding to the field `name_node`. */
+    final override F::Identifier getNameNode() {
+      unified_associated_type_declaration_def(this, result)
+    }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -239,7 +226,7 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `type`. */
-    final F::TypeExpr getType() { unified_base_type_def(this, result) }
+    final F::Expr getType() { unified_base_type_def(this, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -296,10 +283,10 @@ module Unified {
     final override string getAPrimaryQlClass() { result = "BoundTypeConstraint" }
 
     /** Gets the node corresponding to the field `bound`. */
-    final F::TypeExpr getBound() { unified_bound_type_constraint_def(this, result, _) }
+    final F::Expr getBound() { unified_bound_type_constraint_def(this, result, _) }
 
     /** Gets the node corresponding to the field `type`. */
-    final F::TypeExpr getType() { unified_bound_type_constraint_def(this, _, result) }
+    final F::Expr getType() { unified_bound_type_constraint_def(this, _, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -313,11 +300,13 @@ module Unified {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "BreakExpr" }
 
-    /** Gets the node corresponding to the field `label`. */
-    final F::Identifier getLabel() { unified_break_expr_label(this, result) }
+    /** Gets the node corresponding to the field `label_name_node`. */
+    final F::Identifier getLabelNameNode() { unified_break_expr_label_name_node(this, result) }
 
     /** Gets a field or child node of this node. */
-    final override F::AstNode getAFieldOrChild() { unified_break_expr_label(this, result) }
+    final override F::AstNode getAFieldOrChild() {
+      unified_break_expr_label_name_node(this, result)
+    }
   }
 
   /** A class representing `builtin_expr` tokens. */
@@ -327,7 +316,7 @@ module Unified {
   }
 
   /** A class representing `bulk_importing_pattern` nodes. */
-  class BulkImportingPattern extends @unified_bulk_importing_pattern, F::Pattern {
+  class BulkImportingPattern extends @unified_bulk_importing_pattern, F::Expr {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "BulkImportingPattern" }
 
@@ -357,7 +346,7 @@ module Unified {
     final F::Argument getAnArgument() { result = this.getArgument(_) }
 
     /** Gets the node corresponding to the field `callee`. */
-    final F::ExprOrType getCallee() { unified_call_expr_def(this, result) }
+    final F::Expr getCallee() { unified_call_expr_def(this, result) }
 
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getModifier(int i) { unified_call_expr_modifier(this, i, result) }
@@ -373,6 +362,20 @@ module Unified {
     }
   }
 
+  class Callable extends @unified_callable, F::AstNode {
+    /** Gets the node corresponding to the field `body`. */
+    F::Block getBody() { none() }
+
+    /** Gets the node corresponding to the field `parameter`. */
+    F::Parameter getParameter(int i) { none() }
+
+    /** Gets the node corresponding to the field `parameter`. */
+    F::Parameter getAParameter() { none() }
+
+    /** Gets the node corresponding to the field `return_type`. */
+    F::Expr getReturnType() { none() }
+  }
+
   /** A class representing `catch_clause` nodes. */
   class CatchClause extends @unified_catch_clause, F::AstNode {
     /** Gets the name of the primary QL class for this element. */
@@ -388,7 +391,7 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `pattern`. */
-    final F::Pattern getPattern() { unified_catch_clause_pattern(this, result) }
+    final F::Expr getPattern() { unified_catch_clause_pattern(this, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -411,6 +414,11 @@ module Unified {
     /** Gets the node corresponding to the field `base_type`. */
     final F::BaseType getABaseType() { result = this.getBaseType(_) }
 
+    /** Gets the node corresponding to the field `extension_target`. */
+    final F::Expr getExtensionTarget() {
+      unified_class_like_declaration_extension_target(this, result)
+    }
+
     /** Gets the node corresponding to the field `member`. */
     final F::Member getMember(int i) { unified_class_like_declaration_member(this, i, result) }
 
@@ -425,8 +433,10 @@ module Unified {
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
-    /** Gets the node corresponding to the field `name`. */
-    final F::Identifier getName() { unified_class_like_declaration_name(this, result) }
+    /** Gets the node corresponding to the field `name_node`. */
+    final override F::Identifier getNameNode() {
+      unified_class_like_declaration_name_node(this, result)
+    }
 
     /** Gets the node corresponding to the field `type_constraint`. */
     final F::TypeConstraint getTypeConstraint(int i) {
@@ -447,38 +457,17 @@ module Unified {
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
       unified_class_like_declaration_base_type(this, _, result) or
+      unified_class_like_declaration_extension_target(this, result) or
       unified_class_like_declaration_member(this, _, result) or
       unified_class_like_declaration_modifier(this, _, result) or
-      unified_class_like_declaration_name(this, result) or
+      unified_class_like_declaration_name_node(this, result) or
       unified_class_like_declaration_type_constraint(this, _, result) or
       unified_class_like_declaration_type_parameter(this, _, result)
     }
   }
 
-  /** A class representing `compound_assign_expr` nodes. */
-  class CompoundAssignExpr extends @unified_compound_assign_expr, F::Expr {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "CompoundAssignExpr" }
-
-    /** Gets the node corresponding to the field `operator`. */
-    final F::InfixOperator getOperator() { unified_compound_assign_expr_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `target`. */
-    final F::Expr getTarget() { unified_compound_assign_expr_def(this, _, result, _) }
-
-    /** Gets the node corresponding to the field `value`. */
-    final F::Expr getValue() { unified_compound_assign_expr_def(this, _, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override F::AstNode getAFieldOrChild() {
-      unified_compound_assign_expr_def(this, result, _, _) or
-      unified_compound_assign_expr_def(this, _, result, _) or
-      unified_compound_assign_expr_def(this, _, _, result)
-    }
-  }
-
   /** A class representing `conditional_pattern` nodes. */
-  class ConditionalPattern extends @unified_conditional_pattern, F::Pattern {
+  class ConditionalPattern extends @unified_conditional_pattern, F::Expr {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "ConditionalPattern" }
 
@@ -492,7 +481,7 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `pattern`. */
-    final F::Pattern getPattern() { unified_conditional_pattern_def(this, _, result) }
+    final F::Expr getPattern() { unified_conditional_pattern_def(this, _, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -503,12 +492,14 @@ module Unified {
   }
 
   /** A class representing `constructor_declaration` nodes. */
-  class ConstructorDeclaration extends @unified_constructor_declaration, F::Member, F::Stmt {
+  class ConstructorDeclaration extends @unified_constructor_declaration, F::Callable, F::Member,
+    F::Stmt
+  {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "ConstructorDeclaration" }
 
     /** Gets the node corresponding to the field `body`. */
-    final F::Block getBody() { unified_constructor_declaration_def(this, result) }
+    final override F::Block getBody() { unified_constructor_declaration_def(this, result) }
 
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getModifier(int i) {
@@ -518,75 +509,63 @@ module Unified {
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
-    /** Gets the node corresponding to the field `name`. */
-    final F::Identifier getName() { unified_constructor_declaration_name(this, result) }
+    /** Gets the node corresponding to the field `name_node`. */
+    final override F::Identifier getNameNode() {
+      unified_constructor_declaration_name_node(this, result)
+    }
 
     /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getParameter(int i) {
+    final override F::Parameter getParameter(int i) {
       unified_constructor_declaration_parameter(this, i, result)
     }
 
     /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getAParameter() { result = this.getParameter(_) }
+    final override F::Parameter getAParameter() { result = this.getParameter(_) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
       unified_constructor_declaration_def(this, result) or
       unified_constructor_declaration_modifier(this, _, result) or
-      unified_constructor_declaration_name(this, result) or
+      unified_constructor_declaration_name_node(this, result) or
       unified_constructor_declaration_parameter(this, _, result)
     }
   }
 
-  /** A class representing `constructor_pattern` nodes. */
-  class ConstructorPattern extends @unified_constructor_pattern, F::Pattern {
+  /** A class representing `continue_expr` nodes. */
+  class ContinueExpr extends @unified_continue_expr, F::Expr {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ConstructorPattern" }
-
-    /** Gets the node corresponding to the field `constructor`. */
-    final F::ExprOrType getConstructor() { unified_constructor_pattern_def(this, result) }
-
-    /** Gets the node corresponding to the field `element`. */
-    final F::PatternElement getElement(int i) {
-      unified_constructor_pattern_element(this, i, result)
-    }
-
-    /** Gets the node corresponding to the field `element`. */
-    final F::PatternElement getAnElement() { result = this.getElement(_) }
-
-    /** Gets the node corresponding to the field `modifier`. */
-    final F::Modifier getModifier(int i) { unified_constructor_pattern_modifier(this, i, result) }
+    final override string getAPrimaryQlClass() { result = "ContinueExpr" }
 
-    /** Gets the node corresponding to the field `modifier`. */
-    final F::Modifier getAModifier() { result = this.getModifier(_) }
+    /** Gets the node corresponding to the field `label_name_node`. */
+    final F::Identifier getLabelNameNode() { unified_continue_expr_label_name_node(this, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
-      unified_constructor_pattern_def(this, result) or
-      unified_constructor_pattern_element(this, _, result) or
-      unified_constructor_pattern_modifier(this, _, result)
+      unified_continue_expr_label_name_node(this, result)
     }
   }
 
-  /** A class representing `continue_expr` nodes. */
-  class ContinueExpr extends @unified_continue_expr, F::Expr {
+  /** A class representing `defer_stmt` nodes. */
+  class DeferStmt extends @unified_defer_stmt, F::Stmt {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ContinueExpr" }
+    final override string getAPrimaryQlClass() { result = "DeferStmt" }
 
-    /** Gets the node corresponding to the field `label`. */
-    final F::Identifier getLabel() { unified_continue_expr_label(this, result) }
+    /** Gets the node corresponding to the field `body`. */
+    final F::Expr getBody() { unified_defer_stmt_def(this, result) }
 
     /** Gets a field or child node of this node. */
-    final override F::AstNode getAFieldOrChild() { unified_continue_expr_label(this, result) }
+    final override F::AstNode getAFieldOrChild() { unified_defer_stmt_def(this, result) }
   }
 
   /** A class representing `destructor_declaration` nodes. */
-  class DestructorDeclaration extends @unified_destructor_declaration, F::Member, F::Stmt {
+  class DestructorDeclaration extends @unified_destructor_declaration, F::Callable, F::Member,
+    F::Stmt
+  {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "DestructorDeclaration" }
 
     /** Gets the node corresponding to the field `body`. */
-    final F::Block getBody() { unified_destructor_declaration_def(this, result) }
+    final override F::Block getBody() { unified_destructor_declaration_def(this, result) }
 
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getModifier(int i) {
@@ -640,10 +619,10 @@ module Unified {
     final override string getAPrimaryQlClass() { result = "EqualityTypeConstraint" }
 
     /** Gets the node corresponding to the field `left`. */
-    final F::TypeExpr getLeft() { unified_equality_type_constraint_def(this, result, _) }
+    final F::Expr getLeft() { unified_equality_type_constraint_def(this, result, _) }
 
     /** Gets the node corresponding to the field `right`. */
-    final F::TypeExpr getRight() { unified_equality_type_constraint_def(this, _, result) }
+    final F::Expr getRight() { unified_equality_type_constraint_def(this, _, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -652,25 +631,29 @@ module Unified {
     }
   }
 
-  class Expr extends @unified_expr, F::ExprOrOperator, F::ExprOrPattern, F::ExprOrType, F::Stmt { }
+  class Expr extends @unified_expr, F::ExprOrOperator, F::Stmt { }
+
+  class ExprOrOperator extends @unified_expr_or_operator, F::AstNode { }
 
-  /** A class representing `expr_equality_pattern` nodes. */
-  class ExprEqualityPattern extends @unified_expr_equality_pattern, F::Pattern {
+  /** A class representing `expr_pattern` nodes. */
+  class ExprPattern extends @unified_expr_pattern, F::Expr {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "ExprEqualityPattern" }
+    final override string getAPrimaryQlClass() { result = "ExprPattern" }
 
     /** Gets the node corresponding to the field `expr`. */
-    final F::Expr getExpr() { unified_expr_equality_pattern_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override F::AstNode getAFieldOrChild() { unified_expr_equality_pattern_def(this, result) }
-  }
+    final F::Expr getExpr() { unified_expr_pattern_def(this, result) }
 
-  class ExprOrOperator extends @unified_expr_or_operator, F::AstNode { }
+    /** Gets the node corresponding to the field `modifier`. */
+    final F::Modifier getModifier(int i) { unified_expr_pattern_modifier(this, i, result) }
 
-  class ExprOrPattern extends @unified_expr_or_pattern, F::AstNode { }
+    /** Gets the node corresponding to the field `modifier`. */
+    final F::Modifier getAModifier() { result = this.getModifier(_) }
 
-  class ExprOrType extends @unified_expr_or_type, F::AstNode { }
+    /** Gets a field or child node of this node. */
+    final override F::AstNode getAFieldOrChild() {
+      unified_expr_pattern_def(this, result) or unified_expr_pattern_modifier(this, _, result)
+    }
+  }
 
   /** A class representing `fixity` tokens. */
   class Fixity extends @unified_token_fixity, F::AstNode, F::Token {
@@ -705,7 +688,7 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `pattern`. */
-    final F::Pattern getPattern() { unified_for_each_stmt_def(this, _, result) }
+    final F::Expr getPattern() { unified_for_each_stmt_def(this, _, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -718,12 +701,12 @@ module Unified {
   }
 
   /** A class representing `function_declaration` nodes. */
-  class FunctionDeclaration extends @unified_function_declaration, F::Member, F::Stmt {
+  class FunctionDeclaration extends @unified_function_declaration, F::Callable, F::Member, F::Stmt {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "FunctionDeclaration" }
 
     /** Gets the node corresponding to the field `body`. */
-    final F::Block getBody() { unified_function_declaration_body(this, result) }
+    final override F::Block getBody() { unified_function_declaration_body(this, result) }
 
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getModifier(int i) { unified_function_declaration_modifier(this, i, result) }
@@ -731,19 +714,21 @@ module Unified {
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
-    /** Gets the node corresponding to the field `name`. */
-    final F::Identifier getName() { unified_function_declaration_def(this, result) }
+    /** Gets the node corresponding to the field `name_node`. */
+    final override F::Identifier getNameNode() { unified_function_declaration_def(this, result) }
 
     /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getParameter(int i) {
+    final override F::Parameter getParameter(int i) {
       unified_function_declaration_parameter(this, i, result)
     }
 
     /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getAParameter() { result = this.getParameter(_) }
+    final override F::Parameter getAParameter() { result = this.getParameter(_) }
 
     /** Gets the node corresponding to the field `return_type`. */
-    final F::TypeExpr getReturnType() { unified_function_declaration_return_type(this, result) }
+    final override F::Expr getReturnType() {
+      unified_function_declaration_return_type(this, result)
+    }
 
     /** Gets the node corresponding to the field `type_constraint`. */
     final F::TypeConstraint getTypeConstraint(int i) {
@@ -774,12 +759,12 @@ module Unified {
   }
 
   /** A class representing `function_expr` nodes. */
-  class FunctionExpr extends @unified_function_expr, F::Expr {
+  class FunctionExpr extends @unified_function_expr, F::Callable, F::Expr {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "FunctionExpr" }
 
     /** Gets the node corresponding to the field `body`. */
-    final F::Block getBody() { unified_function_expr_def(this, result) }
+    final override F::Block getBody() { unified_function_expr_body(this, result) }
 
     /** Gets the node corresponding to the field `capture_declaration`. */
     final F::VariableDeclaration getCaptureDeclaration(int i) {
@@ -796,17 +781,19 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getParameter(int i) { unified_function_expr_parameter(this, i, result) }
+    final override F::Parameter getParameter(int i) {
+      unified_function_expr_parameter(this, i, result)
+    }
 
     /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getAParameter() { result = this.getParameter(_) }
+    final override F::Parameter getAParameter() { result = this.getParameter(_) }
 
     /** Gets the node corresponding to the field `return_type`. */
-    final F::TypeExpr getReturnType() { unified_function_expr_return_type(this, result) }
+    final override F::Expr getReturnType() { unified_function_expr_return_type(this, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
-      unified_function_expr_def(this, result) or
+      unified_function_expr_body(this, result) or
       unified_function_expr_capture_declaration(this, _, result) or
       unified_function_expr_modifier(this, _, result) or
       unified_function_expr_parameter(this, _, result) or
@@ -814,42 +801,21 @@ module Unified {
     }
   }
 
-  /** A class representing `function_type_expr` nodes. */
-  class FunctionTypeExpr extends @unified_function_type_expr, F::TypeExpr {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "FunctionTypeExpr" }
-
-    /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getParameter(int i) { unified_function_type_expr_parameter(this, i, result) }
-
-    /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getAParameter() { result = this.getParameter(_) }
-
-    /** Gets the node corresponding to the field `return_type`. */
-    final F::TypeExpr getReturnType() { unified_function_type_expr_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override F::AstNode getAFieldOrChild() {
-      unified_function_type_expr_parameter(this, _, result) or
-      unified_function_type_expr_def(this, result)
-    }
-  }
-
   /** A class representing `generic_type_expr` nodes. */
-  class GenericTypeExpr extends @unified_generic_type_expr, F::TypeExpr {
+  class GenericTypeExpr extends @unified_generic_type_expr, F::Expr {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "GenericTypeExpr" }
 
     /** Gets the node corresponding to the field `base`. */
-    final F::TypeExpr getBase() { unified_generic_type_expr_def(this, result) }
+    final F::Expr getBase() { unified_generic_type_expr_def(this, result) }
 
     /** Gets the node corresponding to the field `type_argument`. */
-    final F::TypeExpr getTypeArgument(int i) {
+    final F::Expr getTypeArgument(int i) {
       unified_generic_type_expr_type_argument(this, i, result)
     }
 
     /** Gets the node corresponding to the field `type_argument`. */
-    final F::TypeExpr getATypeArgument() { result = this.getTypeArgument(_) }
+    final F::Expr getATypeArgument() { result = this.getTypeArgument(_) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -876,7 +842,7 @@ module Unified {
   }
 
   /** A class representing `identifier` tokens. */
-  class Identifier extends @unified_token_identifier, F::AstNode, F::Token {
+  class Identifier extends @unified_token_identifier, F::Expr, F::Token {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "Identifier" }
   }
@@ -904,7 +870,7 @@ module Unified {
   }
 
   /** A class representing `ignore_pattern` tokens. */
-  class IgnorePattern extends @unified_token_ignore_pattern, F::Pattern, F::Token {
+  class IgnorePattern extends @unified_token_ignore_pattern, F::Expr, F::Token {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "IgnorePattern" }
   }
@@ -924,7 +890,7 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `pattern`. */
-    final F::Pattern getPattern() { unified_import_declaration_pattern(this, result) }
+    final F::Expr getPattern() { unified_import_declaration_pattern(this, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -935,7 +901,7 @@ module Unified {
   }
 
   /** A class representing `inferred_type_expr` tokens. */
-  class InferredTypeExpr extends @unified_token_inferred_type_expr, F::Token, F::TypeExpr {
+  class InferredTypeExpr extends @unified_token_inferred_type_expr, F::Expr, F::Token {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "InferredTypeExpr" }
   }
@@ -949,12 +915,12 @@ module Unified {
   }
 
   /** A class representing `initializer_declaration` nodes. */
-  class InitializerDeclaration extends @unified_initializer_declaration, F::Member {
+  class InitializerDeclaration extends @unified_initializer_declaration, F::Callable, F::Member {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "InitializerDeclaration" }
 
     /** Gets the node corresponding to the field `body`. */
-    final F::Block getBody() { unified_initializer_declaration_def(this, result) }
+    final override F::Block getBody() { unified_initializer_declaration_def(this, result) }
 
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getModifier(int i) {
@@ -999,8 +965,8 @@ module Unified {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "LabeledStmt" }
 
-    /** Gets the node corresponding to the field `label`. */
-    final F::Identifier getLabel() { unified_labeled_stmt_def(this, result, _) }
+    /** Gets the node corresponding to the field `label_name_node`. */
+    final F::Identifier getLabelNameNode() { unified_labeled_stmt_def(this, result, _) }
 
     /** Gets the node corresponding to the field `stmt`. */
     final F::Stmt getStmt() { unified_labeled_stmt_def(this, _, result) }
@@ -1011,6 +977,34 @@ module Unified {
     }
   }
 
+  /** A class representing `macro_call_expr` nodes. */
+  class MacroCallExpr extends @unified_macro_call_expr, F::Expr {
+    /** Gets the name of the primary QL class for this element. */
+    final override string getAPrimaryQlClass() { result = "MacroCallExpr" }
+
+    /** Gets the node corresponding to the field `argument`. */
+    final F::Argument getArgument(int i) { unified_macro_call_expr_argument(this, i, result) }
+
+    /** Gets the node corresponding to the field `argument`. */
+    final F::Argument getAnArgument() { result = this.getArgument(_) }
+
+    /** Gets the node corresponding to the field `macro_name_node`. */
+    final F::Identifier getMacroNameNode() { unified_macro_call_expr_def(this, result) }
+
+    /** Gets the node corresponding to the field `type_argument`. */
+    final F::Expr getTypeArgument(int i) { unified_macro_call_expr_type_argument(this, i, result) }
+
+    /** Gets the node corresponding to the field `type_argument`. */
+    final F::Expr getATypeArgument() { result = this.getTypeArgument(_) }
+
+    /** Gets a field or child node of this node. */
+    final override F::AstNode getAFieldOrChild() {
+      unified_macro_call_expr_argument(this, _, result) or
+      unified_macro_call_expr_def(this, result) or
+      unified_macro_call_expr_type_argument(this, _, result)
+    }
+  }
+
   /** A class representing `map_literal` nodes. */
   class MapLiteral extends @unified_map_literal, F::Expr {
     /** Gets the name of the primary QL class for this element. */
@@ -1026,7 +1020,10 @@ module Unified {
     final override F::AstNode getAFieldOrChild() { unified_map_literal_element(this, _, result) }
   }
 
-  class Member extends @unified_member, F::AstNode { }
+  class Member extends @unified_member, F::AstNode {
+    /** Gets the node corresponding to the field `name_node`. */
+    F::Identifier getNameNode() { none() }
+  }
 
   /** A class representing `member_access_expr` nodes. */
   class MemberAccessExpr extends @unified_member_access_expr, F::Expr {
@@ -1034,10 +1031,10 @@ module Unified {
     final override string getAPrimaryQlClass() { result = "MemberAccessExpr" }
 
     /** Gets the node corresponding to the field `base`. */
-    final F::ExprOrType getBase() { unified_member_access_expr_def(this, result, _) }
+    final F::Expr getBase() { unified_member_access_expr_def(this, result, _) }
 
-    /** Gets the node corresponding to the field `member`. */
-    final F::Identifier getMember() { unified_member_access_expr_def(this, _, result) }
+    /** Gets the node corresponding to the field `member_name_node`. */
+    final F::Identifier getMemberNameNode() { unified_member_access_expr_def(this, _, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -1046,58 +1043,55 @@ module Unified {
     }
   }
 
-  /** A class representing `modifier` tokens. */
-  class Modifier extends @unified_token_modifier, F::AstNode, F::Token {
+  /** A class representing `modified_type_expr` nodes. */
+  class ModifiedTypeExpr extends @unified_modified_type_expr, F::Expr {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "Modifier" }
-  }
+    final override string getAPrimaryQlClass() { result = "ModifiedTypeExpr" }
 
-  /** A class representing `name_expr` nodes. */
-  class NameExpr extends @unified_name_expr, F::Expr {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "NameExpr" }
+    /** Gets the node corresponding to the field `modifier`. */
+    final F::Modifier getModifier(int i) { unified_modified_type_expr_modifier(this, i, result) }
+
+    /** Gets the node corresponding to the field `modifier`. */
+    final F::Modifier getAModifier() { result = this.getModifier(_) }
 
-    /** Gets the node corresponding to the field `identifier`. */
-    final F::Identifier getIdentifier() { unified_name_expr_def(this, result) }
+    /** Gets the node corresponding to the field `type`. */
+    final F::Expr getType() { unified_modified_type_expr_def(this, result) }
 
     /** Gets a field or child node of this node. */
-    final override F::AstNode getAFieldOrChild() { unified_name_expr_def(this, result) }
+    final override F::AstNode getAFieldOrChild() {
+      unified_modified_type_expr_modifier(this, _, result) or
+      unified_modified_type_expr_def(this, result)
+    }
   }
 
-  /** A class representing `name_pattern` nodes. */
-  class NamePattern extends @unified_name_pattern, F::Pattern {
+  /** A class representing `modifier` tokens. */
+  class Modifier extends @unified_token_modifier, F::AstNode, F::Token {
     /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "NamePattern" }
+    final override string getAPrimaryQlClass() { result = "Modifier" }
+  }
 
-    /** Gets the node corresponding to the field `identifier`. */
-    final F::Identifier getIdentifier() { unified_name_pattern_def(this, result) }
+  /** A class representing `named_pattern` nodes. */
+  class NamedPattern extends @unified_named_pattern, F::Expr {
+    /** Gets the name of the primary QL class for this element. */
+    final override string getAPrimaryQlClass() { result = "NamedPattern" }
 
     /** Gets the node corresponding to the field `modifier`. */
-    final F::Modifier getModifier(int i) { unified_name_pattern_modifier(this, i, result) }
+    final F::Modifier getModifier(int i) { unified_named_pattern_modifier(this, i, result) }
 
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
-    /** Gets a field or child node of this node. */
-    final override F::AstNode getAFieldOrChild() {
-      unified_name_pattern_def(this, result) or unified_name_pattern_modifier(this, _, result)
-    }
-  }
-
-  /** A class representing `named_type_expr` nodes. */
-  class NamedTypeExpr extends @unified_named_type_expr, F::TypeExpr {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "NamedTypeExpr" }
-
-    /** Gets the node corresponding to the field `name`. */
-    final F::Identifier getName() { unified_named_type_expr_def(this, result) }
+    /** Gets the node corresponding to the field `name_node`. */
+    final F::Identifier getNameNode() { unified_named_pattern_def(this, result, _) }
 
-    /** Gets the node corresponding to the field `qualifier`. */
-    final F::TypeExpr getQualifier() { unified_named_type_expr_qualifier(this, result) }
+    /** Gets the node corresponding to the field `sub_pattern`. */
+    final F::Expr getSubPattern() { unified_named_pattern_def(this, _, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
-      unified_named_type_expr_def(this, result) or unified_named_type_expr_qualifier(this, result)
+      unified_named_pattern_modifier(this, _, result) or
+      unified_named_pattern_def(this, result, _) or
+      unified_named_pattern_def(this, _, result)
     }
   }
 
@@ -1119,8 +1113,8 @@ module Unified {
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
-    /** Gets the node corresponding to the field `name`. */
-    final F::Identifier getName() { unified_operator_syntax_declaration_def(this, result) }
+    /** Gets the node corresponding to the field `name_node`. */
+    final F::Identifier getNameNode() { unified_operator_syntax_declaration_def(this, result) }
 
     /** Gets the node corresponding to the field `precedence`. */
     final F::Expr getPrecedence() { unified_operator_syntax_declaration_precedence(this, result) }
@@ -1135,7 +1129,7 @@ module Unified {
   }
 
   /** A class representing `or_pattern` nodes. */
-  class OrPattern extends @unified_or_pattern, F::Pattern {
+  class OrPattern extends @unified_or_pattern, F::Expr {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "OrPattern" }
 
@@ -1146,10 +1140,10 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `pattern`. */
-    final F::Pattern getPattern(int i) { unified_or_pattern_pattern(this, i, result) }
+    final F::Expr getPattern(int i) { unified_or_pattern_pattern(this, i, result) }
 
     /** Gets the node corresponding to the field `pattern`. */
-    final F::Pattern getAPattern() { result = this.getPattern(_) }
+    final F::Expr getAPattern() { result = this.getPattern(_) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -1165,8 +1159,8 @@ module Unified {
     /** Gets the node corresponding to the field `default`. */
     final F::Expr getDefault() { unified_parameter_default(this, result) }
 
-    /** Gets the node corresponding to the field `external_name`. */
-    final F::Identifier getExternalName() { unified_parameter_external_name(this, result) }
+    /** Gets the node corresponding to the field `external_name_node`. */
+    final F::Identifier getExternalNameNode() { unified_parameter_external_name_node(this, result) }
 
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getModifier(int i) { unified_parameter_modifier(this, i, result) }
@@ -1175,55 +1169,28 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `pattern`. */
-    final F::Pattern getPattern() { unified_parameter_pattern(this, result) }
+    final F::Expr getPattern() { unified_parameter_pattern(this, result) }
 
     /** Gets the node corresponding to the field `type`. */
-    final F::TypeExpr getType() { unified_parameter_type(this, result) }
+    final F::Expr getType() { unified_parameter_type(this, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
       unified_parameter_default(this, result) or
-      unified_parameter_external_name(this, result) or
+      unified_parameter_external_name_node(this, result) or
       unified_parameter_modifier(this, _, result) or
       unified_parameter_pattern(this, result) or
       unified_parameter_type(this, result)
     }
   }
 
-  class Pattern extends @unified_pattern, F::ExprOrPattern { }
-
-  /** A class representing `pattern_element` nodes. */
-  class PatternElement extends @unified_pattern_element, F::AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "PatternElement" }
-
-    /** Gets the node corresponding to the field `key`. */
-    final F::Identifier getKey() { unified_pattern_element_key(this, result) }
-
-    /** Gets the node corresponding to the field `modifier`. */
-    final F::Modifier getModifier(int i) { unified_pattern_element_modifier(this, i, result) }
-
-    /** Gets the node corresponding to the field `modifier`. */
-    final F::Modifier getAModifier() { result = this.getModifier(_) }
-
-    /** Gets the node corresponding to the field `pattern`. */
-    final F::Pattern getPattern() { unified_pattern_element_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override F::AstNode getAFieldOrChild() {
-      unified_pattern_element_key(this, result) or
-      unified_pattern_element_modifier(this, _, result) or
-      unified_pattern_element_def(this, result)
-    }
-  }
-
   /** A class representing `pattern_guard_expr` nodes. */
   class PatternGuardExpr extends @unified_pattern_guard_expr, F::Expr {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "PatternGuardExpr" }
 
     /** Gets the node corresponding to the field `pattern`. */
-    final F::Pattern getPattern() { unified_pattern_guard_expr_def(this, result, _) }
+    final F::Expr getPattern() { unified_pattern_guard_expr_def(this, result, _) }
 
     /** Gets the node corresponding to the field `value`. */
     final F::Expr getValue() { unified_pattern_guard_expr_def(this, _, result) }
@@ -1267,6 +1234,32 @@ module Unified {
 
   class Stmt extends @unified_stmt, F::AstNode { }
 
+  /** A class representing `string_interpolation_expr` nodes. */
+  class StringInterpolationExpr extends @unified_string_interpolation_expr, F::Expr {
+    /** Gets the name of the primary QL class for this element. */
+    final override string getAPrimaryQlClass() { result = "StringInterpolationExpr" }
+
+    /** Gets the node corresponding to the field `element`. */
+    final F::Expr getElement(int i) { unified_string_interpolation_expr_element(this, i, result) }
+
+    /** Gets the node corresponding to the field `element`. */
+    final F::Expr getAnElement() { result = this.getElement(_) }
+
+    /** Gets the node corresponding to the field `modifier`. */
+    final F::Modifier getModifier(int i) {
+      unified_string_interpolation_expr_modifier(this, i, result)
+    }
+
+    /** Gets the node corresponding to the field `modifier`. */
+    final F::Modifier getAModifier() { result = this.getModifier(_) }
+
+    /** Gets a field or child node of this node. */
+    final override F::AstNode getAFieldOrChild() {
+      unified_string_interpolation_expr_element(this, _, result) or
+      unified_string_interpolation_expr_modifier(this, _, result)
+    }
+  }
+
   /** A class representing `string_literal` tokens. */
   class StringLiteral extends @unified_token_string_literal, F::Expr, F::Token {
     /** Gets the name of the primary QL class for this element. */
@@ -1294,7 +1287,7 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `pattern`. */
-    final F::Pattern getPattern() { unified_switch_case_pattern(this, result) }
+    final F::Expr getPattern() { unified_switch_case_pattern(this, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -1345,12 +1338,12 @@ module Unified {
   }
 
   /** A class representing `top_level` nodes. */
-  class TopLevel extends @unified_top_level, F::AstNode {
+  class TopLevel extends @unified_top_level, F::Callable {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "TopLevel" }
 
     /** Gets the node corresponding to the field `body`. */
-    final F::Block getBody() { unified_top_level_def(this, result) }
+    final override F::Block getBody() { unified_top_level_def(this, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() { unified_top_level_def(this, result) }
@@ -1390,73 +1383,15 @@ module Unified {
     final override string getAPrimaryQlClass() { result = "TupleExpr" }
 
     /** Gets the node corresponding to the field `element`. */
-    final F::Expr getElement(int i) { unified_tuple_expr_element(this, i, result) }
+    final F::Argument getElement(int i) { unified_tuple_expr_element(this, i, result) }
 
     /** Gets the node corresponding to the field `element`. */
-    final F::Expr getAnElement() { result = this.getElement(_) }
+    final F::Argument getAnElement() { result = this.getElement(_) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() { unified_tuple_expr_element(this, _, result) }
   }
 
-  /** A class representing `tuple_pattern` nodes. */
-  class TuplePattern extends @unified_tuple_pattern, F::Pattern {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TuplePattern" }
-
-    /** Gets the node corresponding to the field `element`. */
-    final F::PatternElement getElement(int i) { unified_tuple_pattern_element(this, i, result) }
-
-    /** Gets the node corresponding to the field `element`. */
-    final F::PatternElement getAnElement() { result = this.getElement(_) }
-
-    /** Gets the node corresponding to the field `modifier`. */
-    final F::Modifier getModifier(int i) { unified_tuple_pattern_modifier(this, i, result) }
-
-    /** Gets the node corresponding to the field `modifier`. */
-    final F::Modifier getAModifier() { result = this.getModifier(_) }
-
-    /** Gets a field or child node of this node. */
-    final override F::AstNode getAFieldOrChild() {
-      unified_tuple_pattern_element(this, _, result) or
-      unified_tuple_pattern_modifier(this, _, result)
-    }
-  }
-
-  /** A class representing `tuple_type_element` nodes. */
-  class TupleTypeElement extends @unified_tuple_type_element, F::AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TupleTypeElement" }
-
-    /** Gets the node corresponding to the field `name`. */
-    final F::Identifier getName() { unified_tuple_type_element_name(this, result) }
-
-    /** Gets the node corresponding to the field `type`. */
-    final F::TypeExpr getType() { unified_tuple_type_element_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override F::AstNode getAFieldOrChild() {
-      unified_tuple_type_element_name(this, result) or unified_tuple_type_element_def(this, result)
-    }
-  }
-
-  /** A class representing `tuple_type_expr` nodes. */
-  class TupleTypeExpr extends @unified_tuple_type_expr, F::TypeExpr {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TupleTypeExpr" }
-
-    /** Gets the node corresponding to the field `element`. */
-    final F::TupleTypeElement getElement(int i) { unified_tuple_type_expr_element(this, i, result) }
-
-    /** Gets the node corresponding to the field `element`. */
-    final F::TupleTypeElement getAnElement() { result = this.getElement(_) }
-
-    /** Gets a field or child node of this node. */
-    final override F::AstNode getAFieldOrChild() {
-      unified_tuple_type_expr_element(this, _, result)
-    }
-  }
-
   /** A class representing `type_alias_declaration` nodes. */
   class TypeAliasDeclaration extends @unified_type_alias_declaration, F::Member, F::Stmt {
     /** Gets the name of the primary QL class for this element. */
@@ -1470,11 +1405,13 @@ module Unified {
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
-    /** Gets the node corresponding to the field `name`. */
-    final F::Identifier getName() { unified_type_alias_declaration_def(this, result, _) }
+    /** Gets the node corresponding to the field `name_node`. */
+    final override F::Identifier getNameNode() {
+      unified_type_alias_declaration_def(this, result, _)
+    }
 
     /** Gets the node corresponding to the field `type`. */
-    final F::TypeExpr getType() { unified_type_alias_declaration_def(this, _, result) }
+    final F::Expr getType() { unified_type_alias_declaration_def(this, _, result) }
 
     /** Gets the node corresponding to the field `type_constraint`. */
     final F::TypeConstraint getTypeConstraint(int i) {
@@ -1514,7 +1451,7 @@ module Unified {
     final F::InfixOperator getOperator() { unified_type_cast_expr_def(this, _, result, _) }
 
     /** Gets the node corresponding to the field `type`. */
-    final F::TypeExpr getType() { unified_type_cast_expr_def(this, _, _, result) }
+    final F::Expr getType() { unified_type_cast_expr_def(this, _, _, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -1526,15 +1463,13 @@ module Unified {
 
   class TypeConstraint extends @unified_type_constraint, F::AstNode { }
 
-  class TypeExpr extends @unified_type_expr, F::ExprOrType { }
-
   /** A class representing `type_parameter` nodes. */
   class TypeParameter extends @unified_type_parameter, F::AstNode {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "TypeParameter" }
 
     /** Gets the node corresponding to the field `bound`. */
-    final F::TypeExpr getBound() { unified_type_parameter_bound(this, result) }
+    final F::Expr getBound() { unified_type_parameter_bound(this, result) }
 
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getModifier(int i) { unified_type_parameter_modifier(this, i, result) }
@@ -1542,8 +1477,8 @@ module Unified {
     /** Gets the node corresponding to the field `modifier`. */
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
-    /** Gets the node corresponding to the field `name`. */
-    final F::Identifier getName() { unified_type_parameter_def(this, result) }
+    /** Gets the node corresponding to the field `name_node`. */
+    final F::Identifier getNameNode() { unified_type_parameter_def(this, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -1559,37 +1494,19 @@ module Unified {
     final override string getAPrimaryQlClass() { result = "TypeTestExpr" }
 
     /** Gets the node corresponding to the field `expr`. */
-    final F::Expr getExpr() { unified_type_test_expr_def(this, result, _, _) }
+    final F::Expr getExpr() { unified_type_test_expr_def(this, result, _) }
 
     /** Gets the node corresponding to the field `operator`. */
-    final F::InfixOperator getOperator() { unified_type_test_expr_def(this, _, result, _) }
+    final F::InfixOperator getOperator() { unified_type_test_expr_operator(this, result) }
 
     /** Gets the node corresponding to the field `type`. */
-    final F::TypeExpr getType() { unified_type_test_expr_def(this, _, _, result) }
+    final F::Expr getType() { unified_type_test_expr_def(this, _, result) }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
-      unified_type_test_expr_def(this, result, _, _) or
-      unified_type_test_expr_def(this, _, result, _) or
-      unified_type_test_expr_def(this, _, _, result)
-    }
-  }
-
-  /** A class representing `type_test_pattern` nodes. */
-  class TypeTestPattern extends @unified_type_test_pattern, F::AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "TypeTestPattern" }
-
-    /** Gets the node corresponding to the field `pattern`. */
-    final F::Pattern getPattern() { unified_type_test_pattern_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `type`. */
-    final F::TypeExpr getType() { unified_type_test_pattern_def(this, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override F::AstNode getAFieldOrChild() {
-      unified_type_test_pattern_def(this, result, _) or
-      unified_type_test_pattern_def(this, _, result)
+      unified_type_test_expr_def(this, result, _) or
+      unified_type_test_expr_operator(this, result) or
+      unified_type_test_expr_def(this, _, result)
     }
   }
 
@@ -1610,6 +1527,12 @@ module Unified {
     }
   }
 
+  /** A class representing `unhandled_node` tokens. */
+  class UnhandledNode extends @unified_token_unhandled_node, F::Expr, F::Member, F::Token {
+    /** Gets the name of the primary QL class for this element. */
+    final override string getAPrimaryQlClass() { result = "UnhandledNode" }
+  }
+
   /** A class representing `unresolved_operator_sequence` nodes. */
   class UnresolvedOperatorSequence extends @unified_unresolved_operator_sequence, F::Expr {
     /** Gets the name of the primary QL class for this element. */
@@ -1630,9 +1553,7 @@ module Unified {
   }
 
   /** A class representing `unsupported_node` tokens. */
-  class UnsupportedNode extends @unified_token_unsupported_node, F::Expr, F::Member, F::Pattern,
-    F::Token, F::TypeExpr
-  {
+  class UnsupportedNode extends @unified_token_unsupported_node, F::Expr, F::Member, F::Token {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "UnsupportedNode" }
   }
@@ -1649,10 +1570,10 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `pattern`. */
-    final F::Pattern getPattern() { unified_variable_declaration_def(this, result) }
+    final F::Expr getPattern() { unified_variable_declaration_def(this, result) }
 
     /** Gets the node corresponding to the field `type`. */
-    final F::TypeExpr getType() { unified_variable_declaration_type(this, result) }
+    final F::Expr getType() { unified_variable_declaration_type(this, result) }
 
     /** Gets the node corresponding to the field `value`. */
     final F::Expr getValue() { unified_variable_declaration_value(this, result) }
@@ -1701,29 +1622,25 @@ module Unified {
       or
       result = node.(AccessorDeclaration).getModifier(i) and name = "getModifier"
       or
-      result = node.(AccessorDeclaration).getName() and i = -1 and name = "getName"
+      result = node.(AccessorDeclaration).getNameNode() and i = -1 and name = "getNameNode"
       or
       result = node.(AccessorDeclaration).getParameter(i) and name = "getParameter"
       or
-      result = node.(AccessorDeclaration).getType() and i = -1 and name = "getType"
+      result = node.(AccessorDeclaration).getReturnType() and i = -1 and name = "getReturnType"
       or
       result = node.(Argument).getModifier(i) and name = "getModifier"
       or
-      result = node.(Argument).getName() and i = -1 and name = "getName"
+      result = node.(Argument).getNameNode() and i = -1 and name = "getNameNode"
       or
       result = node.(Argument).getValue() and i = -1 and name = "getValue"
       or
       result = node.(ArrayLiteral).getElement(i) and name = "getElement"
       or
-      result = node.(AssignExpr).getTarget() and i = -1 and name = "getTarget"
-      or
-      result = node.(AssignExpr).getValue() and i = -1 and name = "getValue"
-      or
       result = node.(AssociatedTypeDeclaration).getBound() and i = -1 and name = "getBound"
       or
       result = node.(AssociatedTypeDeclaration).getModifier(i) and name = "getModifier"
       or
-      result = node.(AssociatedTypeDeclaration).getName() and i = -1 and name = "getName"
+      result = node.(AssociatedTypeDeclaration).getNameNode() and i = -1 and name = "getNameNode"
       or
       result = node.(BaseType).getModifier(i) and name = "getModifier"
       or
@@ -1741,7 +1658,7 @@ module Unified {
       or
       result = node.(BoundTypeConstraint).getType() and i = -1 and name = "getType"
       or
-      result = node.(BreakExpr).getLabel() and i = -1 and name = "getLabel"
+      result = node.(BreakExpr).getLabelNameNode() and i = -1 and name = "getLabelNameNode"
       or
       result = node.(BulkImportingPattern).getModifier(i) and name = "getModifier"
       or
@@ -1759,22 +1676,20 @@ module Unified {
       or
       result = node.(ClassLikeDeclaration).getBaseType(i) and name = "getBaseType"
       or
+      result = node.(ClassLikeDeclaration).getExtensionTarget() and
+      i = -1 and
+      name = "getExtensionTarget"
+      or
       result = node.(ClassLikeDeclaration).getMember(i) and name = "getMember"
       or
       result = node.(ClassLikeDeclaration).getModifier(i) and name = "getModifier"
       or
-      result = node.(ClassLikeDeclaration).getName() and i = -1 and name = "getName"
+      result = node.(ClassLikeDeclaration).getNameNode() and i = -1 and name = "getNameNode"
       or
       result = node.(ClassLikeDeclaration).getTypeConstraint(i) and name = "getTypeConstraint"
       or
       result = node.(ClassLikeDeclaration).getTypeParameter(i) and name = "getTypeParameter"
       or
-      result = node.(CompoundAssignExpr).getOperator() and i = -1 and name = "getOperator"
-      or
-      result = node.(CompoundAssignExpr).getTarget() and i = -1 and name = "getTarget"
-      or
-      result = node.(CompoundAssignExpr).getValue() and i = -1 and name = "getValue"
-      or
       result = node.(ConditionalPattern).getCondition() and i = -1 and name = "getCondition"
       or
       result = node.(ConditionalPattern).getModifier(i) and name = "getModifier"
@@ -1785,17 +1700,13 @@ module Unified {
       or
       result = node.(ConstructorDeclaration).getModifier(i) and name = "getModifier"
       or
-      result = node.(ConstructorDeclaration).getName() and i = -1 and name = "getName"
+      result = node.(ConstructorDeclaration).getNameNode() and i = -1 and name = "getNameNode"
       or
       result = node.(ConstructorDeclaration).getParameter(i) and name = "getParameter"
       or
-      result = node.(ConstructorPattern).getConstructor() and i = -1 and name = "getConstructor"
+      result = node.(ContinueExpr).getLabelNameNode() and i = -1 and name = "getLabelNameNode"
       or
-      result = node.(ConstructorPattern).getElement(i) and name = "getElement"
-      or
-      result = node.(ConstructorPattern).getModifier(i) and name = "getModifier"
-      or
-      result = node.(ContinueExpr).getLabel() and i = -1 and name = "getLabel"
+      result = node.(DeferStmt).getBody() and i = -1 and name = "getBody"
       or
       result = node.(DestructorDeclaration).getBody() and i = -1 and name = "getBody"
       or
@@ -1811,7 +1722,9 @@ module Unified {
       or
       result = node.(EqualityTypeConstraint).getRight() and i = -1 and name = "getRight"
       or
-      result = node.(ExprEqualityPattern).getExpr() and i = -1 and name = "getExpr"
+      result = node.(ExprPattern).getExpr() and i = -1 and name = "getExpr"
+      or
+      result = node.(ExprPattern).getModifier(i) and name = "getModifier"
       or
       result = node.(ForEachStmt).getBody() and i = -1 and name = "getBody"
       or
@@ -1827,7 +1740,7 @@ module Unified {
       or
       result = node.(FunctionDeclaration).getModifier(i) and name = "getModifier"
       or
-      result = node.(FunctionDeclaration).getName() and i = -1 and name = "getName"
+      result = node.(FunctionDeclaration).getNameNode() and i = -1 and name = "getNameNode"
       or
       result = node.(FunctionDeclaration).getParameter(i) and name = "getParameter"
       or
@@ -1847,10 +1760,6 @@ module Unified {
       or
       result = node.(FunctionExpr).getReturnType() and i = -1 and name = "getReturnType"
       or
-      result = node.(FunctionTypeExpr).getParameter(i) and name = "getParameter"
-      or
-      result = node.(FunctionTypeExpr).getReturnType() and i = -1 and name = "getReturnType"
-      or
       result = node.(GenericTypeExpr).getBase() and i = -1 and name = "getBase"
       or
       result = node.(GenericTypeExpr).getTypeArgument(i) and name = "getTypeArgument"
@@ -1879,31 +1788,37 @@ module Unified {
       or
       result = node.(KeyValuePair).getValue() and i = -1 and name = "getValue"
       or
-      result = node.(LabeledStmt).getLabel() and i = -1 and name = "getLabel"
+      result = node.(LabeledStmt).getLabelNameNode() and i = -1 and name = "getLabelNameNode"
       or
       result = node.(LabeledStmt).getStmt() and i = -1 and name = "getStmt"
       or
+      result = node.(MacroCallExpr).getArgument(i) and name = "getArgument"
+      or
+      result = node.(MacroCallExpr).getMacroNameNode() and i = -1 and name = "getMacroNameNode"
+      or
+      result = node.(MacroCallExpr).getTypeArgument(i) and name = "getTypeArgument"
+      or
       result = node.(MapLiteral).getElement(i) and name = "getElement"
       or
       result = node.(MemberAccessExpr).getBase() and i = -1 and name = "getBase"
       or
-      result = node.(MemberAccessExpr).getMember() and i = -1 and name = "getMember"
+      result = node.(MemberAccessExpr).getMemberNameNode() and i = -1 and name = "getMemberNameNode"
       or
-      result = node.(NameExpr).getIdentifier() and i = -1 and name = "getIdentifier"
+      result = node.(ModifiedTypeExpr).getModifier(i) and name = "getModifier"
       or
-      result = node.(NamePattern).getIdentifier() and i = -1 and name = "getIdentifier"
+      result = node.(ModifiedTypeExpr).getType() and i = -1 and name = "getType"
       or
-      result = node.(NamePattern).getModifier(i) and name = "getModifier"
+      result = node.(NamedPattern).getModifier(i) and name = "getModifier"
       or
-      result = node.(NamedTypeExpr).getName() and i = -1 and name = "getName"
+      result = node.(NamedPattern).getNameNode() and i = -1 and name = "getNameNode"
       or
-      result = node.(NamedTypeExpr).getQualifier() and i = -1 and name = "getQualifier"
+      result = node.(NamedPattern).getSubPattern() and i = -1 and name = "getSubPattern"
       or
       result = node.(OperatorSyntaxDeclaration).getFixity() and i = -1 and name = "getFixity"
       or
       result = node.(OperatorSyntaxDeclaration).getModifier(i) and name = "getModifier"
       or
-      result = node.(OperatorSyntaxDeclaration).getName() and i = -1 and name = "getName"
+      result = node.(OperatorSyntaxDeclaration).getNameNode() and i = -1 and name = "getNameNode"
       or
       result = node.(OperatorSyntaxDeclaration).getPrecedence() and
       i = -1 and
@@ -1915,7 +1830,7 @@ module Unified {
       or
       result = node.(Parameter).getDefault() and i = -1 and name = "getDefault"
       or
-      result = node.(Parameter).getExternalName() and i = -1 and name = "getExternalName"
+      result = node.(Parameter).getExternalNameNode() and i = -1 and name = "getExternalNameNode"
       or
       result = node.(Parameter).getModifier(i) and name = "getModifier"
       or
@@ -1923,18 +1838,16 @@ module Unified {
       or
       result = node.(Parameter).getType() and i = -1 and name = "getType"
       or
-      result = node.(PatternElement).getKey() and i = -1 and name = "getKey"
-      or
-      result = node.(PatternElement).getModifier(i) and name = "getModifier"
-      or
-      result = node.(PatternElement).getPattern() and i = -1 and name = "getPattern"
-      or
       result = node.(PatternGuardExpr).getPattern() and i = -1 and name = "getPattern"
       or
       result = node.(PatternGuardExpr).getValue() and i = -1 and name = "getValue"
       or
       result = node.(ReturnExpr).getValue() and i = -1 and name = "getValue"
       or
+      result = node.(StringInterpolationExpr).getElement(i) and name = "getElement"
+      or
+      result = node.(StringInterpolationExpr).getModifier(i) and name = "getModifier"
+      or
       result = node.(SwitchCase).getBody() and i = -1 and name = "getBody"
       or
       result = node.(SwitchCase).getModifier(i) and name = "getModifier"
@@ -1959,19 +1872,9 @@ module Unified {
       or
       result = node.(TupleExpr).getElement(i) and name = "getElement"
       or
-      result = node.(TuplePattern).getElement(i) and name = "getElement"
-      or
-      result = node.(TuplePattern).getModifier(i) and name = "getModifier"
-      or
-      result = node.(TupleTypeElement).getName() and i = -1 and name = "getName"
-      or
-      result = node.(TupleTypeElement).getType() and i = -1 and name = "getType"
-      or
-      result = node.(TupleTypeExpr).getElement(i) and name = "getElement"
-      or
       result = node.(TypeAliasDeclaration).getModifier(i) and name = "getModifier"
       or
-      result = node.(TypeAliasDeclaration).getName() and i = -1 and name = "getName"
+      result = node.(TypeAliasDeclaration).getNameNode() and i = -1 and name = "getNameNode"
       or
       result = node.(TypeAliasDeclaration).getType() and i = -1 and name = "getType"
       or
@@ -1989,7 +1892,7 @@ module Unified {
       or
       result = node.(TypeParameter).getModifier(i) and name = "getModifier"
       or
-      result = node.(TypeParameter).getName() and i = -1 and name = "getName"
+      result = node.(TypeParameter).getNameNode() and i = -1 and name = "getNameNode"
       or
       result = node.(TypeTestExpr).getExpr() and i = -1 and name = "getExpr"
       or
@@ -1997,10 +1900,6 @@ module Unified {
       or
       result = node.(TypeTestExpr).getType() and i = -1 and name = "getType"
       or
-      result = node.(TypeTestPattern).getPattern() and i = -1 and name = "getPattern"
-      or
-      result = node.(TypeTestPattern).getType() and i = -1 and name = "getType"
-      or
       result = node.(UnaryExpr).getOperand() and i = -1 and name = "getOperand"
       or
       result = node.(UnaryExpr).getOperator() and i = -1 and name = "getOperator"
@@ -2042,8 +1941,6 @@ module UnifiedFinal {
 
   final class ArrayLiteral = F::ArrayLiteral;
 
-  final class AssignExpr = F::AssignExpr;
-
   final class AssociatedTypeDeclaration = F::AssociatedTypeDeclaration;
 
   final class BaseType = F::BaseType;
@@ -2064,20 +1961,20 @@ module UnifiedFinal {
 
   final class CallExpr = F::CallExpr;
 
+  final class Callable = F::Callable;
+
   final class CatchClause = F::CatchClause;
 
   final class ClassLikeDeclaration = F::ClassLikeDeclaration;
 
-  final class CompoundAssignExpr = F::CompoundAssignExpr;
-
   final class ConditionalPattern = F::ConditionalPattern;
 
   final class ConstructorDeclaration = F::ConstructorDeclaration;
 
-  final class ConstructorPattern = F::ConstructorPattern;
-
   final class ContinueExpr = F::ContinueExpr;
 
+  final class DeferStmt = F::DeferStmt;
+
   final class DestructorDeclaration = F::DestructorDeclaration;
 
   final class DoWhileStmt = F::DoWhileStmt;
@@ -2088,13 +1985,9 @@ module UnifiedFinal {
 
   final class Expr = F::Expr;
 
-  final class ExprEqualityPattern = F::ExprEqualityPattern;
-
   final class ExprOrOperator = F::ExprOrOperator;
 
-  final class ExprOrPattern = F::ExprOrPattern;
-
-  final class ExprOrType = F::ExprOrType;
+  final class ExprPattern = F::ExprPattern;
 
   final class Fixity = F::Fixity;
 
@@ -2106,8 +1999,6 @@ module UnifiedFinal {
 
   final class FunctionExpr = F::FunctionExpr;
 
-  final class FunctionTypeExpr = F::FunctionTypeExpr;
-
   final class GenericTypeExpr = F::GenericTypeExpr;
 
   final class GuardIfStmt = F::GuardIfStmt;
@@ -2132,19 +2023,19 @@ module UnifiedFinal {
 
   final class LabeledStmt = F::LabeledStmt;
 
+  final class MacroCallExpr = F::MacroCallExpr;
+
   final class MapLiteral = F::MapLiteral;
 
   final class Member = F::Member;
 
   final class MemberAccessExpr = F::MemberAccessExpr;
 
-  final class Modifier = F::Modifier;
-
-  final class NameExpr = F::NameExpr;
+  final class ModifiedTypeExpr = F::ModifiedTypeExpr;
 
-  final class NamePattern = F::NamePattern;
+  final class Modifier = F::Modifier;
 
-  final class NamedTypeExpr = F::NamedTypeExpr;
+  final class NamedPattern = F::NamedPattern;
 
   final class Operator = F::Operator;
 
@@ -2154,10 +2045,6 @@ module UnifiedFinal {
 
   final class Parameter = F::Parameter;
 
-  final class Pattern = F::Pattern;
-
-  final class PatternElement = F::PatternElement;
-
   final class PatternGuardExpr = F::PatternGuardExpr;
 
   final class PostfixOperator = F::PostfixOperator;
@@ -2170,6 +2057,8 @@ module UnifiedFinal {
 
   final class Stmt = F::Stmt;
 
+  final class StringInterpolationExpr = F::StringInterpolationExpr;
+
   final class StringLiteral = F::StringLiteral;
 
   final class SuperExpr = F::SuperExpr;
@@ -2186,28 +2075,20 @@ module UnifiedFinal {
 
   final class TupleExpr = F::TupleExpr;
 
-  final class TuplePattern = F::TuplePattern;
-
-  final class TupleTypeElement = F::TupleTypeElement;
-
-  final class TupleTypeExpr = F::TupleTypeExpr;
-
   final class TypeAliasDeclaration = F::TypeAliasDeclaration;
 
   final class TypeCastExpr = F::TypeCastExpr;
 
   final class TypeConstraint = F::TypeConstraint;
 
-  final class TypeExpr = F::TypeExpr;
-
   final class TypeParameter = F::TypeParameter;
 
   final class TypeTestExpr = F::TypeTestExpr;
 
-  final class TypeTestPattern = F::TypeTestPattern;
-
   final class UnaryExpr = F::UnaryExpr;
 
+  final class UnhandledNode = F::UnhandledNode;
+
   final class UnresolvedOperatorSequence = F::UnresolvedOperatorSequence;
 
   final class UnsupportedNode = F::UnsupportedNode;
diff --git a/unified/ql/lib/codeql/unified/internal/AstExtra.qll b/unified/ql/lib/codeql/unified/internal/AstExtra.qll
index e14043dc46d2..f2182698f6d0 100644
--- a/unified/ql/lib/codeql/unified/internal/AstExtra.qll
+++ b/unified/ql/lib/codeql/unified/internal/AstExtra.qll
@@ -1,41 +1,80 @@
 /**
  * Provides additional AST-like classes outside the generated tree-sitter classes.
  */
+overlay[local?]
+module;
 
 private import unified
+private import codeql.unified.internal.NameBindingPlugin
 
 module Public {
-  /**
-   * A logical 'and' expression with short-circuiting.
-   */
+  /** An assignment, possibly a compound assignment. */
+  abstract private class AssignmentImpl extends BinaryExpr {
+    /** Gets the target of this assignment. */
+    abstract Expr getTarget();
+
+    /** Gets the value assigned by this assignment. */
+    abstract Expr getValue();
+  }
+
+  final class Assignment = AssignmentImpl;
+
+  /** A plain assignment expression. */
+  final class AssignExpr extends BinaryExpr, AssignmentImpl {
+    AssignExpr() { this.getOperator().getValue() = "=" }
+
+    override Expr getTarget() { result = this.getLeft() }
+
+    override Expr getValue() { result = this.getRight() }
+  }
+
+  /** A compound assignment expression. */
+  final class CompoundAssignExpr extends BinaryExpr, AssignmentImpl {
+    CompoundAssignExpr() {
+      this.getOperator().getValue() =
+        [
+          "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", "&=", "|=", "^=", "&+=", "&-=", "&*=", "&&=",
+          "||=", "??="
+        ]
+    }
+
+    override Expr getTarget() { result = this.getLeft() }
+
+    override Expr getValue() { result = this.getRight() }
+  }
+
+  /** A short-circuiting logical AND expression. */
   class LogicalAndExpr extends BinaryExpr {
     LogicalAndExpr() { this.getOperator().getValue() = "&&" }
+  }
 
-    Expr getAnOperand() { result = [this.getLeft(), this.getRight()] }
+  /** A short-circuiting logical OR expression. */
+  class LogicalOrExpr extends BinaryExpr {
+    LogicalOrExpr() { this.getOperator().getValue() = "||" }
+  }
+
+  /** A short-circuiting null-coalescing expression. */
+  class NullCoalescingExpr extends BinaryExpr {
+    NullCoalescingExpr() { this.getOperator().getValue() = "??" }
+  }
+
+  /** A logical NOT expression. */
+  class LogicalNotExpr extends UnaryExpr {
+    LogicalNotExpr() { this.getOperator().(PrefixOperator).getValue() = "!" }
   }
 
   /**
    * Declaration of a local or top-level variable.
    */
   class LocalVariableDeclaration extends VariableDeclaration {
-    private Block block;
-
-    LocalVariableDeclaration() { this = block.getStmt(_) }
-
-    /** Gets the block in which this variable is declared. */
-    Block getDeclaringBlock() { result = block }
+    LocalVariableDeclaration() { not isStaticMember(this) and not isInstanceMember(this) }
   }
 
   /**
    * Declaration of a local or top-level function.
    */
   class LocalFunctionDeclaration extends FunctionDeclaration {
-    private Block block;
-
-    LocalFunctionDeclaration() { this = block.getStmt(_) }
-
-    /** Gets the block in which this function is declared. */
-    Block getDeclaringBlock() { result = block }
+    LocalFunctionDeclaration() { not isStaticMember(this) and not isInstanceMember(this) }
   }
 
   /**
@@ -52,4 +91,82 @@ module Public {
       result = this.getValue().regexpCapture("(?s)/\\*(.*)\\*/", 1)
     }
   }
+
+  /** A `Stmt` at the top-level. */
+  final class TopLevelStmt extends Stmt {
+    TopLevelStmt() { this = any(TopLevel t).getBody().getAStmt() }
+  }
+
+  /** An identifier appearing in the context of a break/continue label, argument/parameter name, or name of a member lookup. */
+  final class IdentifierLabel extends Identifier {
+    IdentifierLabel() {
+      this = any(MemberAccessExpr e).getMemberNameNode() or
+      this = any(Argument a).getNameNode() or
+      this = any(Parameter p).getExternalNameNode() or
+      this = any(LabeledStmt stmt).getLabelNameNode() or
+      this = any(BreakExpr expr).getLabelNameNode() or
+      this = any(ContinueExpr expr).getLabelNameNode()
+    }
+  }
+
+  /** An identifier appearing in the context of an expression, pattern, or type annotation. */
+  final class IdentifierExpr extends Identifier {
+    IdentifierExpr() { not this instanceof IdentifierLabel }
+  }
+
+  /**
+   * A class representing one of the branches of an algebraic data type.
+   *
+   * In Swift, a class with a single constructor is generated for each `case` with data parameters in an `enum` declaration. Example:
+   *
+   * ```swift
+   * enum E {
+   *   case foo(Int)
+   * }
+   * ```
+   *
+   * is modeled as
+   *
+   * ```swift
+   * class E {
+   *   class foo {
+   *     init(_ x : Int)
+   *   }
+   * }
+   * ```
+   */
+  final class EnumCaseClass extends ClassLikeDeclaration {
+    EnumCaseClass() { this.hasModifier("enum_case") }
+
+    /** Gets the constructor of this algebraic data type. */
+    EnumCaseConstructor getConstructor() { result = this.getAMember() }
+  }
+
+  /**
+   * The constructor of a class representing one of the branches of an algebraic data type.
+   *
+   * In Swift, a class with a single constructor is generated for each `case` with data parameters in an `enum` declaration. Example:
+   *
+   * ```swift
+   * enum E {
+   *   case foo(Int)
+   * }
+   * ```
+   *
+   * is modeled as
+   *
+   * ```swift
+   * class E {
+   *   class foo {
+   *     init(_ x : Int)
+   *   }
+   * }
+   * ```
+   */
+  final class EnumCaseConstructor extends ConstructorDeclaration {
+    EnumCaseConstructor() { this = any(EnumCaseClass cls).getAMember() }
+
+    /** Gets the class containing this constructor. */
+    EnumCaseClass getEnumCaseClass() { result.getAMember() = this }
+  }
 }
diff --git a/unified/ql/lib/codeql/unified/internal/AstPlugin.qll b/unified/ql/lib/codeql/unified/internal/AstPlugin.qll
new file mode 100644
index 000000000000..02f02f92628a
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/AstPlugin.qll
@@ -0,0 +1,78 @@
+overlay[local?]
+module;
+
+private import unified
+private import codeql.util.Unit
+
+private module Plugins {
+  private import AstPluginSwift
+}
+
+class AstPlugin extends Unit {
+  bindingset[f]
+  string getFunctionDeclarationKeyword(FunctionDeclaration f) { none() }
+
+  bindingset[c]
+  string getConstructorDeclarationKeyword(ConstructorDeclaration c) { none() }
+
+  bindingset[cls]
+  string getClassLikeDeclarationKeyword(ClassLikeDeclaration cls) { none() }
+
+  bindingset[decl]
+  string getVariableDeclarationKeyword(VariableDeclaration decl) { none() }
+
+  /**
+   * Holds if the default constructor `cd` needs a parameter at index `i` with
+   * the given name. `hasDefault` indicates whether the parameter has a default
+   * value.
+   *
+   * `i = 0` is reserved for the implicit receiver parameter.
+   */
+  bindingset[cd]
+  predicate defaultConstructorParameter(
+    ConstructorDeclaration cd, int i, string name, boolean hasDefault
+  ) {
+    none()
+  }
+
+  /**
+   * Holds if the type of the `i`th parameter of the default constructor `cd`
+   * is `type`.
+   */
+  bindingset[cd]
+  predicate defaultConstructorParameterType(ConstructorDeclaration cd, int i, AstNode type) {
+    none()
+  }
+}
+
+bindingset[f]
+string getFunctionDeclarationKeyword(FunctionDeclaration f) {
+  result = any(AstPlugin p).getFunctionDeclarationKeyword(f)
+}
+
+bindingset[c]
+string getConstructorDeclarationKeyword(ConstructorDeclaration c) {
+  result = any(AstPlugin p).getConstructorDeclarationKeyword(c)
+}
+
+bindingset[cls]
+string getClassLikeDeclarationKeyword(ClassLikeDeclaration cls) {
+  result = any(AstPlugin p).getClassLikeDeclarationKeyword(cls)
+}
+
+bindingset[decl]
+string getVariableDeclarationKeyword(VariableDeclaration decl) {
+  result = any(AstPlugin p).getVariableDeclarationKeyword(decl)
+}
+
+bindingset[cd]
+predicate defaultConstructorParameter(
+  ConstructorDeclaration cd, int i, string name, boolean hasDefault
+) {
+  any(AstPlugin p).defaultConstructorParameter(cd, i, name, hasDefault)
+}
+
+bindingset[cd]
+predicate defaultConstructorParameterType(ConstructorDeclaration cd, int i, AstNode type) {
+  any(AstPlugin p).defaultConstructorParameterType(cd, i, type)
+}
diff --git a/unified/ql/lib/codeql/unified/internal/AstPluginSwift.qll b/unified/ql/lib/codeql/unified/internal/AstPluginSwift.qll
new file mode 100644
index 000000000000..ff2d03fb9b01
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/AstPluginSwift.qll
@@ -0,0 +1,72 @@
+overlay[local?]
+module;
+
+private import unified
+private import AstPlugin
+
+private predicate structHasParameterForField(
+  ConstructorDeclaration cd, VariableDeclaration decl, int i, string name, boolean hasDefault
+) {
+  exists(ClassLikeDeclaration struct |
+    struct.hasModifier("struct") and
+    cd = struct.getAMember() and
+    decl = struct.getMember(i) and
+    not decl.hasModifier("static") and
+    name = decl.getPattern().(Identifier).getValue()
+  |
+    // if `decl` has an initializer or `Optional` type then the parameter has a default value
+    decl.hasModifier("var") and
+    if
+      exists(decl.getValue())
+      or
+      // we could make this more precise using static name binding, but for now we
+      // use a simpler approach to avoid the dependency on static name binding
+      decl.getType().(GenericTypeExpr).getBase().(Identifier).getValue() = "Optional"
+    then hasDefault = true
+    else hasDefault = false
+    or
+    decl.hasModifier("let") and
+    not exists(decl.getValue()) and
+    hasDefault = false
+  )
+}
+
+private class AstPluginSwift extends AstPlugin {
+  bindingset[f]
+  override string getFunctionDeclarationKeyword(FunctionDeclaration f) {
+    exists(f) and result = "func"
+  }
+
+  bindingset[c]
+  override string getConstructorDeclarationKeyword(ConstructorDeclaration c) {
+    c.hasModifier(result) and
+    result = "convenience"
+  }
+
+  override string getClassLikeDeclarationKeyword(ClassLikeDeclaration cls) {
+    cls.hasModifier(result) and
+    result in ["class", "struct", "enum", "actor", "extension", "protocol"]
+  }
+
+  override string getVariableDeclarationKeyword(VariableDeclaration decl) {
+    decl.hasModifier(result) and
+    result in ["var", "let"]
+  }
+
+  bindingset[cd]
+  override predicate defaultConstructorParameter(
+    ConstructorDeclaration cd, int i, string name, boolean hasDefault
+  ) {
+    name = rank[i](int j, string s | structHasParameterForField(cd, _, j, s, _) | s order by j) and
+    structHasParameterForField(cd, _, _, name, hasDefault)
+  }
+
+  bindingset[cd]
+  override predicate defaultConstructorParameterType(ConstructorDeclaration cd, int i, AstNode type) {
+    exists(VariableDeclaration decl, string name |
+      this.defaultConstructorParameter(cd, i, name, _) and
+      structHasParameterForField(cd, decl, _, name, _) and
+      type = decl.getType()
+    )
+  }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/Builtins.qll b/unified/ql/lib/codeql/unified/internal/Builtins.qll
new file mode 100644
index 000000000000..099ced74d2bb
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/Builtins.qll
@@ -0,0 +1,30 @@
+/**
+ * Provides classes for builtins.
+ */
+
+private import unified
+
+/** The folder containing builtins. */
+class BuiltinsFolder extends Folder {
+  BuiltinsFolder() {
+    not exists(this.getRelativePath()) and
+    this.getBaseName() = "builtins" and
+    this.getParentContainer().getBaseName() = "tools"
+  }
+}
+
+private class BuiltinsTypesFile extends File {
+  BuiltinsTypesFile() {
+    this.getBaseName() = "types.swift" and
+    this.getParentContainer() instanceof BuiltinsFolder
+  }
+}
+
+/**
+ * A builtin type, such as `Bool` and `String`.
+ *
+ * Builtin types are represented as class-like declarations.
+ */
+class BuiltinClassLikeDeclaration extends ClassLikeDeclaration {
+  BuiltinClassLikeDeclaration() { this.getFile() instanceof BuiltinsTypesFile }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/ControlFlowGraph.qll b/unified/ql/lib/codeql/unified/internal/ControlFlowGraph.qll
new file mode 100644
index 000000000000..374afa4a6c82
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/ControlFlowGraph.qll
@@ -0,0 +1,340 @@
+/**
+ * Provides classes representing the control flow graph within callables.
+ */
+overlay[local?]
+module;
+
+private import unified
+private import codeql.controlflow.ControlFlowGraph
+private import codeql.controlflow.SuccessorType
+private import ControlFlowGraphPlugin
+
+private module Cfg0 = Make0<Location, Ast>;
+
+private module Cfg1 = Make1<Input>;
+
+private module Cfg2 = Make2<Input>;
+
+private import Cfg0
+private import Cfg1
+import Cfg2
+
+/** Provides an implementation of the AST signature for Unified. */
+module Ast implements AstSig<Location> {
+  private import unified as U
+
+  class AstNode = U::AstNode;
+
+  private predicate skipControlFlow(AstNode e) {
+    e instanceof Modifier
+    or
+    e instanceof Identifier and not e instanceof IdentifierExpr
+    or
+    e instanceof Operator
+    or
+    not e.fromSource()
+  }
+
+  private AstNode adjustedGetChild(AstNode n, int index) { deferScope(n, index, result) }
+
+  AstNode getChild(AstNode n, int index) {
+    result.getParent() = n and
+    result.getParentIndex() = index and
+    not n instanceof Callable and
+    not skipControlFlow(n) and
+    not skipControlFlow(result) and
+    not adjustedGetChild(_, _) = result
+    or
+    adjustedGetChild(n, index) = result
+    or
+    n.(FunctionExpr).getCaptureDeclaration(index) = result
+    or
+    n.(FunctionDeclaration).getNameNode() = result and index = 0
+  }
+
+  Callable getEnclosingCallable(AstNode node) { result = node.getEnclosingCallable() }
+
+  class Callable extends U::Callable {
+    Callable() { this.fromSource() }
+  }
+
+  AstNode callableGetBody(Callable c) { result = c.getBody() }
+
+  class Parameter extends U::Parameter {
+    Expr getDefaultValue() { result = super.getDefault() }
+
+    AstNode getPattern() {
+      result = super.getPattern()
+      or
+      not exists(super.getPattern()) and result = this
+    }
+  }
+
+  Parameter callableGetParameter(Callable c, int index) {
+    result = c.(AccessorDeclaration).getParameter(index) or
+    result = c.(ConstructorDeclaration).getParameter(index) or
+    result = c.(FunctionDeclaration).getParameter(index) or
+    result = c.(FunctionExpr).getParameter(index)
+  }
+
+  class Stmt = U::Stmt;
+
+  class Expr = U::Expr;
+
+  /**
+   * Holds if `s` is the `n`th statement in the constructed `try` block of
+   * `defer`.
+   *
+   * For example, the following `defer` statements
+   * ```
+   * {
+   *   s1
+   *   defer { s5 }
+   *   s2
+   *   defer { s4 }
+   *   s3
+   * }
+   * ```
+   * are transformed into these `try`-`finally` blocks:
+   * ```
+   * {
+   *   s1
+   *   try {
+   *     s2
+   *     try {
+   *       s3
+   *     } finally {
+   *       s4
+   *     }
+   *   } finally {
+   *     s5
+   *   }
+   * }
+   * ```
+   */
+  private predicate deferScope(U::DeferStmt defer, int n, Stmt s) {
+    exists(U::Block block, int deferIdx | block.getStmt(deferIdx) = defer |
+      block.getStmt(deferIdx + 1) = s and n = 0
+      or
+      exists(Stmt mid |
+        deferScope(defer, n - 1, mid) and
+        not mid instanceof U::DeferStmt and
+        block.getStmt(deferIdx + 1 + n) = s
+      )
+    )
+  }
+
+  class BlockStmt extends Stmt instanceof U::Block {
+    Stmt getStmt(int n) { result = super.getStmt(n) and not deferScope(_, _, result) }
+
+    Stmt getLastStmt() {
+      exists(int i | result = this.getStmt(i) and not exists(this.getStmt(i + 1)))
+    }
+  }
+
+  class ExprStmt extends Stmt {
+    ExprStmt() { none() }
+
+    Expr getExpr() { none() }
+  }
+
+  class IfStmt extends Stmt instanceof U::GuardIfStmt {
+    Expr getCondition() { result = super.getCondition() }
+
+    Stmt getThen() { none() }
+
+    Stmt getElse() { result = super.getElse() }
+  }
+
+  abstract class LoopStmt extends Stmt {
+    Stmt getBody() { none() }
+  }
+
+  class WhileStmt extends LoopStmt instanceof U::WhileStmt {
+    override Stmt getBody() { result = U::WhileStmt.super.getBody() }
+
+    Expr getCondition() { result = super.getCondition() }
+  }
+
+  class DoStmt extends LoopStmt instanceof U::DoWhileStmt {
+    override Stmt getBody() { result = U::DoWhileStmt.super.getBody() }
+
+    Expr getCondition() { result = super.getCondition() }
+  }
+
+  class UntilStmt extends LoopStmt {
+    UntilStmt() { none() }
+
+    Expr getCondition() { none() }
+  }
+
+  class ForStmt extends LoopStmt {
+    ForStmt() { none() }
+
+    AstNode getInit(int index) { none() }
+
+    Expr getCondition() { none() }
+
+    AstNode getUpdate(int index) { none() }
+  }
+
+  class ForEachStmt extends LoopStmt instanceof U::ForEachStmt {
+    override Stmt getBody() { result = U::ForEachStmt.super.getBody() }
+
+    Expr getVariable() { result = super.getPattern() }
+
+    Expr getCollection() { result = super.getIterable() }
+  }
+
+  AstNode getLoopGuard(ForEachStmt foreachstmt) { result = foreachstmt.(U::ForEachStmt).getGuard() }
+
+  class BreakStmt = U::BreakExpr;
+
+  class ContinueStmt = U::ContinueExpr;
+
+  class LabeledStmt = U::LabeledStmt;
+
+  class GotoStmt extends Stmt {
+    GotoStmt() { none() }
+  }
+
+  class ReturnStmt extends U::ReturnExpr {
+    Expr getExpr() { result = super.getValue() }
+  }
+
+  class Throw extends U::ThrowExpr {
+    Expr getExpr() { result = super.getValue() }
+  }
+
+  class TryStmt extends Stmt {
+    TryStmt() { this instanceof U::TryExpr or this instanceof U::DeferStmt }
+
+    AstNode getBody(int index) {
+      index = 0 and result = this.(U::TryExpr).getBody()
+      or
+      deferScope(this, index, result)
+    }
+
+    CatchClause getCatch(int index) { result = this.(U::TryExpr).getCatchClause(index) }
+
+    Stmt getFinally() { result = this.(U::DeferStmt).getBody() }
+  }
+
+  class CatchClause extends U::CatchClause {
+    AstNode getPattern() { result = super.getPattern() }
+
+    AstNode getVariable() { none() }
+
+    Expr getCondition() { none() }
+
+    Stmt getBody() { result = super.getBody() }
+  }
+
+  class Switch extends U::SwitchExpr {
+    Expr getExpr() { result = super.getValue() }
+
+    Case getCase(int index) { result = super.getCase(index) }
+
+    Stmt getStmt(int index) { none() }
+  }
+
+  class Case extends U::SwitchCase {
+    AstNode getPattern(int index) { result = super.getPattern() and index = 0 }
+
+    Expr getGuard() { none() }
+
+    AstNode getBody() { result = super.getBody() }
+  }
+
+  class DefaultCase extends Case {
+    DefaultCase() { not exists(super.getPattern()) }
+  }
+
+  class ConditionalExpr = U::IfExpr;
+
+  // TODO: sort out the relationship between BinaryExpr and Assignment
+  class BinaryExpr extends U::BinaryExpr {
+    Expr getLeftOperand() { result = super.getLeft() }
+
+    Expr getRightOperand() { result = super.getRight() }
+  }
+
+  class LogicalAndExpr extends BinaryExpr, U::LogicalAndExpr { }
+
+  class LogicalOrExpr extends BinaryExpr, U::LogicalOrExpr { }
+
+  class NullCoalescingExpr extends BinaryExpr, U::NullCoalescingExpr { }
+
+  class UnaryExpr = U::UnaryExpr;
+
+  class LogicalNotExpr = U::LogicalNotExpr;
+
+  class Assignment extends BinaryExpr, U::Assignment { }
+
+  class AssignExpr extends Assignment, U::AssignExpr { }
+
+  class CompoundAssignment extends Assignment, U::CompoundAssignExpr { }
+
+  class AssignLogicalAndExpr extends CompoundAssignment {
+    AssignLogicalAndExpr() { this.getOperator().getValue() = "&&=" }
+  }
+
+  class AssignLogicalOrExpr extends CompoundAssignment {
+    AssignLogicalOrExpr() { this.getOperator().getValue() = "||=" }
+  }
+
+  class AssignNullCoalescingExpr extends CompoundAssignment {
+    AssignNullCoalescingExpr() { this.getOperator().getValue() = "??=" }
+  }
+
+  class BooleanLiteral extends U::BooleanLiteral {
+    boolean getValue() { result.toString() = super.getValue() }
+  }
+
+  class PatternMatchExpr extends U::PatternGuardExpr {
+    Expr getExpr() { result = super.getValue() }
+
+    AstNode getPattern() { result = super.getPattern() }
+  }
+}
+
+private predicate mayThrow(AstNode ast) { any(ControlFlowGraphPlugin p).mayThrow(ast) }
+
+private module Input implements InputSig1, InputSig2 {
+  private import codeql.util.Void
+
+  predicate cfgCachedStageRef() { CfgCachedStage::ref() }
+
+  class Label extends string {
+    Label() {
+      any(LabeledStmt l).getLabelName() = this or
+      any(BreakExpr b).getLabelName() = this or
+      any(ContinueExpr c).getLabelName() = this
+    }
+
+    string toString() { result = this }
+  }
+
+  predicate hasLabel(Ast::AstNode n, Label l) {
+    l = n.(LabeledStmt).getLabelName()
+    or
+    l = n.(BreakExpr).getLabelName()
+    or
+    l = n.(ContinueExpr).getLabelName()
+  }
+
+  class CallableContext = Void;
+
+  predicate beginAbruptCompletion(
+    AstNode ast, PreControlFlowNode n, AbruptCompletion c, boolean always
+  ) {
+    mayThrow(ast) and
+    n.isIn(ast) and
+    c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+    always = false
+  }
+
+  predicate endAbruptCompletion(AstNode ast, PreControlFlowNode n, AbruptCompletion c) { none() }
+
+  predicate step(PreControlFlowNode n1, PreControlFlowNode n2) { none() }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/ControlFlowGraphPlugin.qll b/unified/ql/lib/codeql/unified/internal/ControlFlowGraphPlugin.qll
new file mode 100644
index 000000000000..ae1f5fa25ce5
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/ControlFlowGraphPlugin.qll
@@ -0,0 +1,10 @@
+private import unified
+private import codeql.util.Unit
+
+private module Plugins {
+  private import ControlFlowGraphPluginSwift
+}
+
+class ControlFlowGraphPlugin extends Unit {
+  predicate mayThrow(AstNode ast) { none() }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/ControlFlowGraphPluginSwift.qll b/unified/ql/lib/codeql/unified/internal/ControlFlowGraphPluginSwift.qll
new file mode 100644
index 000000000000..fac0d2bacf1c
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/ControlFlowGraphPluginSwift.qll
@@ -0,0 +1,16 @@
+private import unified
+private import ControlFlowGraphPlugin
+
+private predicate inTry(AstNode ast) {
+  ast.(UnaryExpr).getOperator().(Token).getValue() = "try"
+  or
+  exists(AstNode parent |
+    parent = ast.getParent() and
+    inTry(ast.getParent()) and
+    not parent instanceof Callable
+  )
+}
+
+private class ControlFlowGraphPluginSwift extends ControlFlowGraphPlugin {
+  override predicate mayThrow(AstNode ast) { ast instanceof CallExpr and inTry(ast) }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/ExprPositions.qll b/unified/ql/lib/codeql/unified/internal/ExprPositions.qll
new file mode 100644
index 000000000000..d93205b371a1
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/ExprPositions.qll
@@ -0,0 +1,91 @@
+private import unified
+private import NameBinding as NameBinding
+private import ExprPositionsPlugin
+
+/**
+ * Holds if `expr` appears in a context where it must refer to a type.
+ */
+predicate isInTypeContext(Expr expr) {
+  expr = any(TypeCastExpr n).getType()
+  or
+  expr = any(TypeTestExpr n).getType()
+  or
+  expr = any(VariableDeclaration n).getType()
+  or
+  expr = any(FunctionDeclaration n).getReturnType()
+  or
+  expr = any(FunctionExpr n).getReturnType()
+  or
+  expr = any(AccessorDeclaration n).getReturnType()
+  or
+  expr = any(Parameter n).getType()
+  or
+  expr = any(TypeAliasDeclaration n).getType()
+  or
+  expr = any(BaseType n).getType()
+  or
+  expr = any(TypeParameter n).getBound()
+  or
+  expr = any(AssociatedTypeDeclaration n).getBound()
+  or
+  expr = any(ClassLikeDeclaration c).getExtensionTarget()
+  or
+  expr = any(GenericTypeExpr gte).getATypeArgument()
+  or
+  expr = any(ModifiedTypeExpr m).getType()
+  or
+  expr.getParent() instanceof TypeConstraint
+  or
+  exists(NameBinding::getTypeFromRef(expr))
+  or
+  any(ExprPositionsPlugin p).isInTypeContext(expr)
+  or
+  isInTypeContext(expr.getEnclosingExpr())
+}
+
+/** Holds if `e` appears in a name-binding position inside `declaration` */
+predicate isInBindingContext(Expr e, AstNode declaration) {
+  NameBinding::bindingContext(e, _, declaration)
+}
+
+/** Holds if `e` is part of the target of `assignment`. */
+predicate isInAssignmentContext(Expr e, AstNode assignment) {
+  e = assignment.(AssignExpr).getTarget()
+  or
+  e = assignment.(CompoundAssignExpr).getTarget()
+  or
+  exists(TupleExpr tuple |
+    isInAssignmentContext(tuple, assignment) and
+    e = tuple.getAnElement().getValue()
+  )
+}
+
+/**
+ * Holds if `e` receives an incoming value because it is part of a binding pattern
+ * or assignment target.
+ */
+predicate hasIncomingValue(Expr e, AstNode declarationOrAssignment) {
+  isInBindingContext(e, declarationOrAssignment)
+  or
+  isInAssignmentContext(e, declarationOrAssignment)
+}
+
+/**
+ * Holds if `e` evaluates to a result.
+ */
+predicate hasResultValue(Expr e) {
+  not isInTypeContext(e) and
+  not isInBindingContext(e, _) and
+  not isInAssignmentContext(e, any(AssignExpr n)) and // non-compound assignment target
+  not e instanceof IdentifierLabel
+}
+
+/** Holds if `e` is returned from `callable` either because it is an operand of `return` or is implicitly returned due to language-specific semantics. */
+predicate isReturnedExpr(Callable callable, Expr e) {
+  exists(ReturnExpr ret |
+    callable = ret.getEnclosingCallable() and
+    e = ret.getValue()
+  )
+  or
+  any(ExprPositionsPlugin p).isReturnedExpr(callable, e)
+}
diff --git a/unified/ql/lib/codeql/unified/internal/ExprPositionsPlugin.qll b/unified/ql/lib/codeql/unified/internal/ExprPositionsPlugin.qll
new file mode 100644
index 000000000000..e85937ef03a4
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/ExprPositionsPlugin.qll
@@ -0,0 +1,12 @@
+private import unified
+private import codeql.util.Unit
+
+private module Plugins {
+  private import ExprPositionsPluginSwift
+}
+
+class ExprPositionsPlugin extends Unit {
+  predicate isInTypeContext(Expr e) { none() }
+
+  predicate isReturnedExpr(Callable callable, Expr e) { none() }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/ExprPositionsPluginSwift.qll b/unified/ql/lib/codeql/unified/internal/ExprPositionsPluginSwift.qll
new file mode 100644
index 000000000000..65d112563525
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/ExprPositionsPluginSwift.qll
@@ -0,0 +1,26 @@
+private import unified
+private import ExprPositionsPlugin
+
+private class ExprPositionsPluginSwift extends ExprPositionsPlugin {
+  override predicate isInTypeContext(Expr e) { e = any(GenericTypeExpr g).getBase() }
+
+  override predicate isReturnedExpr(Callable callable, Expr e) {
+    // Short-hand return from a function body, e.g. `func foo() -> String { "42" }`
+    // This happens when the body contains a single expression and this expression resolves to a value.
+    // We don't detect precisely whether the expression resolves to a value, but we restrict to cases
+    // where a spurious return would be harmless in practice.
+    (
+      callable instanceof FunctionDeclaration and
+      exists(Expr ret | ret = callable.getReturnType() | not ret.(Identifier).getValue() = "Void")
+      or
+      callable instanceof GetterDeclaration
+      or
+      callable instanceof FunctionExpr // We can't tell whether closures have a return value
+    ) and
+    exists(Block body |
+      body = callable.getBody() and
+      not exists(body.getStmt(1)) and // Check that only one statement exists
+      e = body.getStmt(0)
+    )
+  }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/FacadeAst.qll b/unified/ql/lib/codeql/unified/internal/FacadeAst.qll
index a25fb3447c1e..8d40d3f6b099 100644
--- a/unified/ql/lib/codeql/unified/internal/FacadeAst.qll
+++ b/unified/ql/lib/codeql/unified/internal/FacadeAst.qll
@@ -4,12 +4,32 @@
 overlay[local?]
 module;
 
+private import unified as U
+private import AstPlugin
+private import codeql.files.FileSystem
+private import codeql.unified.internal.NameBinding as NameBinding
+
 module Unified {
   private import Ast::Unified as G
   import G
 
   /** The base class for all AST nodes. */
   class AstNode extends G::AstNode {
+    /** Gets the file containing this AST node. */
+    File getFile() { result = this.getLocation().getFile() }
+
+    private predicate isGenerated() {
+      this.hasModifier("generated")
+      or
+      this.getParent().isGenerated()
+    }
+
+    /** Holds if this AST node comes from ordinary source code. */
+    predicate fromSource() {
+      this.getFile().fromSource() and
+      not this.isGenerated()
+    }
+
     /** Holds if this AST node has a modifier with the given text. */
     predicate hasModifier(string text) {
       exists(Modifier mod |
@@ -17,15 +37,440 @@ module Unified {
         mod.getValue() = text
       )
     }
+
+    /**
+     * Gets the nearest syntactically enclosing class declaration, if any.
+     */
+    ClassLikeDeclaration getEnclosingClass() {
+      exists(AstNode parent | parent = this.getParent() |
+        result = parent
+        or
+        not parent instanceof ClassLikeDeclaration and
+        result = parent.getEnclosingClass()
+      )
+    }
+
+    private AstNode overrideEnclosingCallableParent() {
+      exists(FunctionExpr func |
+        // Capture declarations are evaluated as part of the outer context, and
+        // considered to be captured by the function expression.
+        this = func.getACaptureDeclaration() and
+        result = func.getParent()
+      )
+      or
+      exists(FunctionDeclaration func |
+        // The name of a function declaration is a variable belonging to the enclosing callable.
+        this = func.getNameNode() and
+        result = func.getParent()
+      )
+    }
+
+    /**
+     * Gets the nearest callable containing this AST node.
+     *
+     * If this node is itself a callable, this gets the outer callable, not the node itself.
+     *
+     * Note that the `TopLevel` is callable, so all nodes other than the `TopLevel` itself has an enclosing callable.
+     *
+     * In some cases this predicate skips overs the syntactically-enclosing callable in order to get the callable in which
+     * the AST is actually evaluated (such as for capture declarations in a function expression).
+     */
+    Callable getEnclosingCallable() {
+      exists(AstNode parent |
+        parent = this.overrideEnclosingCallableParent()
+        or
+        not exists(this.overrideEnclosingCallableParent()) and
+        parent = this.getParent()
+      |
+        result = parent
+        or
+        not parent instanceof Callable and
+        result = parent.getEnclosingCallable()
+      )
+    }
+
+    /** Gets the depth of this node in the AST. The root node has a depth of 0. */
+    int getDepth() {
+      not exists(this.getParent()) and result = 0
+      or
+      result = this.getParent().getDepth() + 1
+    }
+  }
+
+  /** A block statement. */
+  class Block extends G::Block {
+    /** Gets the last statement in this block. */
+    Stmt getLastStmt() {
+      exists(int i | result = this.getStmt(i) and not exists(this.getStmt(i + 1)))
+    }
+  }
+
+  /** An expression */
+  class Expr extends G::Expr {
+    /** Gets the string value of this expression, if it is a known string constant. */
+    string getStringValue() {
+      // TODO: we'll want to cook the string literals extractor-side, but for now
+      // just strip the quotes here and ignore escape sequences.
+      exists(string text | text = this.(StringLiteral).getValue() |
+        result = text.regexpCapture("\"(.*)\"", 1)
+        or
+        // Constant-segments of string interpolations are represented as string literals, but their raw text does not have quotes
+        not exists(text.regexpCapture("\"(.*)\"", 1)) and
+        result = text
+      )
+    }
+
+    /** Gets the immediately-enclosing expression, skipping over intermediate sub-nodes like `Argument`, and without crossing a function boundary. */
+    Expr getEnclosingExpr() {
+      result = this.getParent() and
+      not result instanceof Callable
+      or
+      result = this.getParent().(Argument).getParent()
+    }
+  }
+
+  class AccessorDeclaration extends G::AccessorDeclaration {
+    /** Gets the name of this accessor. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class Argument extends G::Argument {
+    /** Gets the name of this argument. */
+    string getName() { result = this.getNameNode().getValue() }
+
+    /** Holds if this is a positional argument. */
+    predicate isPositional() { not exists(this.getName()) }
+
+    /** Gets the 0-based index of this argument among the positional arguments in the surrounding call or tuple. */
+    int getPositionalIndex() {
+      this =
+        rank[result + 1](Argument a |
+          a.getParent() = this.getParent() and a.isPositional()
+        |
+          a order by a.getParentIndex()
+        )
+    }
+  }
+
+  class AssociatedTypeDeclaration extends G::AssociatedTypeDeclaration {
+    /** Gets the name of this associated type. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class BreakExpr extends G::BreakExpr {
+    /** Gets the label name targeted by this break. */
+    string getLabelName() { result = this.getLabelNameNode().getValue() }
+  }
+
+  class Member extends G::Member {
+    /** Gets the unqualified name of this member or a fallback name such as `(anonymous function)` if it has no explicit name. */
+    string getNameOrFallback() {
+      result = this.getNameNode().getValue()
+      or
+      not exists(this.getNameNode()) and
+      (
+        this instanceof ConstructorDeclaration and
+        result = "(constructor)"
+        or
+        this instanceof DestructorDeclaration and
+        result = "(destructor)"
+        or
+        this instanceof FunctionDeclaration and
+        result = "(anonymous function)"
+        or
+        this instanceof VariableDeclaration and
+        result = "(pattern assignment)" // this case is only reachable when the target is a destructuring pattern
+        or
+        this instanceof InitializerDeclaration and
+        result = "(initializer block)"
+        or
+        exists(ClassLikeDeclaration cls | this = cls |
+          result = NameBinding::getIdentifierFromRef(cls.getExtensionTarget()).getValue()
+          or
+          not exists(cls.getExtensionTarget()) and
+          result = "(anonymous class)"
+        )
+        or
+        this instanceof TypeAliasDeclaration and
+        result = "(anonymous type alias)"
+        or
+        this instanceof AssociatedTypeDeclaration and
+        result = "(anonymous associated type)"
+        or
+        this instanceof UnsupportedNode and
+        result = "(unsupported node)"
+        or
+        this instanceof UnhandledNode and
+        result = "(unhandled node)"
+      )
+    }
+
+    /**
+     * Gets the name of this member qualified by the short names of each immediately-enclosing class.
+     */
+    string getQualifiedName() { result = QualifiedName<getParentClass/1>::getQualifiedName(this) }
+  }
+
+  private signature ClassLikeDeclaration getDeclaringClassSig(Member m);
+
+  private module QualifiedName<getDeclaringClassSig/1 getDeclaringClass> {
+    string getQualifiedName(Member m) {
+      result = getQualifiedName(getDeclaringClass(m)) + "." + m.getNameOrFallback()
+      or
+      not exists(getDeclaringClass(m)) and
+      result = m.getNameOrFallback()
+    }
+  }
+
+  private ClassLikeDeclaration getParentClass(Member m) {
+    result.getAMemberIncludingExtensions() = m
   }
 
-  /** The base class for all patterns. */
-  class Pattern extends G::Pattern {
-    /** Gets the immediately-enclosing pattern in which this is a nested pattern. */
-    Pattern getEnclosingPattern() {
-      result = this.getParent()
+  private ClassLikeDeclaration getEnclosingClass(Member m) { result.getAMember() = m }
+
+  /**
+   * Similar to `Member.getQualifiedName`, but avoids a dependency on name binding, making
+   * it suitable for use in `toString` predicates.
+   */
+  private predicate getQualifiedNameForToString =
+    QualifiedName<getEnclosingClass/1>::getQualifiedName/1;
+
+  class ClassLikeDeclaration extends G::ClassLikeDeclaration {
+    /** Gets the name of this declaration. */
+    string getName() { result = this.getNameNode().getValue() }
+
+    /** Gets a direct base class of this class. */
+    ClassLikeDeclaration getABaseClass() {
+      result.getNameNode() =
+        NameBinding::getStaticBindingTargetFromRef(this.getABaseType().getType())
+    }
+
+    /**
+     * Gets the target of this extension class, or this class itself if it is not an extension.
+     */
+    ClassLikeDeclaration resolve() {
+      not exists(this.getExtensionTarget()) and
+      result = this
       or
-      result = this.getParent().(PatternElement).getParent()
+      exists(NameBinding::NamespaceNode ns |
+        ns.isStaticMemberNamespace(result) and
+        ns.getAnExtension().isStaticMemberNamespace(this)
+      )
+    }
+
+    /**
+     * Gets a member of this class, including members from extensions.
+     */
+    Member getAMemberIncludingExtensions() {
+      exists(ClassLikeDeclaration cls |
+        this = cls.resolve() and
+        result = cls.getAMember()
+      )
     }
+
+    override string toString() {
+      result =
+        concat(getClassLikeDeclarationKeyword(this) + " ") +
+          concat(getQualifiedNameForToString(this))
+    }
+  }
+
+  class ConstructorDeclaration extends G::ConstructorDeclaration {
+    /** Gets the name of this constructor. */
+    string getName() { result = this.getNameNode().getValue() }
+
+    override string toString() {
+      result =
+        concat(getConstructorDeclarationKeyword(this) + " ") +
+          concat(getQualifiedNameForToString(this))
+    }
+  }
+
+  class ContinueExpr extends G::ContinueExpr {
+    /** Gets the label name targeted by this continue. */
+    string getLabelName() { result = this.getLabelNameNode().getValue() }
+  }
+
+  class FunctionDeclaration extends G::FunctionDeclaration {
+    /** Gets the name of this function. */
+    string getName() { result = this.getNameNode().getValue() }
+
+    override string toString() {
+      result =
+        concat(getFunctionDeclarationKeyword(this) + " ") +
+          concat(getQualifiedNameForToString(this))
+    }
+  }
+
+  class VariableDeclaration extends G::VariableDeclaration {
+    /** Gets the name node of this variable declaration, if any. */
+    override Identifier getNameNode() { result = this.getPattern() }
+
+    /** Gets the name of the variable being declared, if any. */
+    string getName() { result = this.getNameNode().getValue() }
+
+    override string toString() {
+      result =
+        concat(getVariableDeclarationKeyword(this) + " ") +
+          concat(getQualifiedNameForToString(this))
+    }
+  }
+
+  class LabeledStmt extends G::LabeledStmt {
+    /** Gets the label name of this statement. */
+    string getLabelName() { result = this.getLabelNameNode().getValue() }
+  }
+
+  class MemberAccessExpr extends G::MemberAccessExpr {
+    override string toString() { result = "... ." + this.getMemberName() }
+
+    /** Gets the member name of this access. */
+    string getMemberName() { result = this.getMemberNameNode().getValue() }
+  }
+
+  class NamedPattern extends G::NamedPattern {
+    /** Gets the name bound by this pattern. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class OperatorSyntaxDeclaration extends G::OperatorSyntaxDeclaration {
+    /** Gets the name of this operator. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class Parameter extends G::Parameter {
+    /**
+     * Gets the external name of this parameter.
+     *
+     * Has no result for pseudo-names like `_` that indicate that this is actually a positional parameter.
+     */
+    string getExternalName() { result = this.getExternalNameNode().getValue() and not result = "_" }
+
+    /** Gets the callable on which this parameter appears. */
+    Callable getDeclaringCallable() { result = this.getParent() }
+
+    /** Holds if this is a positional parameter. */
+    predicate isPositional() { not exists(this.getExternalName()) }
+
+    /** Gets the 0-based index of this parameter among the positional parameters of the declaring callable. */
+    int getPositionalIndex() {
+      this =
+        rank[result + 1](Parameter p |
+          p.getDeclaringCallable() = this.getDeclaringCallable() and p.isPositional()
+        |
+          p order by p.getParentIndex()
+        )
+    }
+  }
+
+  /** A tuple expression. */
+  class TupleExpr extends G::TupleExpr {
+    /** Gets the number of elements in this tuple expression. */
+    int getNumberOfElements() { result = count(this.getAnElement()) }
+  }
+
+  class TypeAliasDeclaration extends G::TypeAliasDeclaration {
+    /** Gets the name of this type alias. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class TypeParameter extends G::TypeParameter {
+    /** Gets the name of this type parameter. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  /** A binary expression. */
+  class BinaryExpr extends G::BinaryExpr {
+    override string toString() { result = "... " + this.getOperator().getValue() + " ..." }
+
+    /** Gets an operand of this binary expression. */
+    Expr getAnOperand() { result = [this.getLeft(), this.getRight()] }
+  }
+
+  /** A unary expression. */
+  class UnaryExpr extends G::UnaryExpr {
+    override string toString() {
+      result = this.getOperator().(PrefixOperator).getValue() + " ..." or
+      result = "... " + this.getOperator().(PostfixOperator).getValue()
+    }
+  }
+
+  /** A function call */
+  class CallExpr extends G::CallExpr {
+    override string toString() {
+      exists(Expr callee | callee = this.getCallee() |
+        result = callee.(Token).getValue() + "(...)"
+        or
+        result = "... ." + callee.(MemberAccessExpr).getMemberName() + "(...)"
+        or
+        not callee instanceof Token and
+        not callee instanceof MemberAccessExpr and
+        result = "...(...)"
+      )
+    }
+
+    /** Gets the named argument with the given `name`. */
+    Expr getNamedArgument(string name) {
+      exists(Argument arg |
+        arg = this.getAnArgument() and
+        arg.getName() = name and
+        result = arg.getValue()
+      )
+    }
+
+    /** Gets the number of arguments passed to this call, not counting implicit arguments like receiver. */
+    int getNumberOfArguments() { result = count(this.getAnArgument()) }
+
+    /** Gets the number of positional arguments passed to this call. */
+    int getNumberOfPositionalArguments() {
+      result = count(Argument arg | arg = this.getAnArgument() and arg.isPositional())
+    }
+  }
+
+  /** A function expression. */
+  class FunctionExpr extends G::FunctionExpr {
+    /** Gets the number of parameters of this function. */
+    int getNumberOfParameters() { result = count(this.getAParameter()) }
+  }
+
+  class ArrayLiteral extends G::ArrayLiteral {
+    /** Gets the number of elements in this array literal. */
+    int getNumberOfElements() { result = count(this.getAnElement()) }
+  }
+
+  /**
+   * A declaration of a getter associated with a variable or field.
+   *
+   * For example, in Swift:
+   * ```swift
+   * var x: String {
+   *   get { "42" } // getter declaration
+   * }
+   * var x: String { "42" } // getter declaration
+   * ```
+   */
+  final class GetterDeclaration extends AccessorDeclaration {
+    GetterDeclaration() { this.getAccessorKind().getValue() = "get" }
+  }
+
+  /**
+   * A declaration of a setter associated with a variable or field.
+   *
+   * For example, in Swift:
+   * ```swift
+   * var x: String {
+   *   get { "42" }
+   *   set { print(newValue) } // setter declaration
+   * }
+   * ```
+   */
+  final class SetterDeclaration extends AccessorDeclaration {
+    SetterDeclaration() { this.getAccessorKind().getValue() = "set" }
+  }
+
+  /** An `if` statement or conditional expression. */
+  class IfExpr extends G::IfExpr {
+    /** Gets then `then` or `else` branch. */
+    Expr getABranch() { result = [this.getThen(), this.getElse()] }
   }
 }
diff --git a/unified/ql/lib/codeql/unified/internal/LocalNameBinding.qll b/unified/ql/lib/codeql/unified/internal/LocalNameBinding.qll
new file mode 100644
index 000000000000..7f88d1c496bf
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/LocalNameBinding.qll
@@ -0,0 +1,525 @@
+/**
+ * Provides classes for reasoning about lexically scoped names and references to these.
+ */
+overlay[local?]
+module;
+
+private import unified
+private import unified as U
+private import codeql.namebinding.LocalNameBinding
+private import codeql.unified.internal.NameBindingPlugin
+private import codeql.unified.internal.StaticNameBinding
+
+private module LocalNameBindingInput implements LocalNameBindingInputSig<Location> {
+  predicate cacheRevRef() {
+    (bindingContext(_, _, _) implies any())
+    or
+    (implicitDeclInScope(_, _, _) implies any())
+  }
+
+  class AstNode = U::AstNode;
+
+  private class LogicalAndRoot extends LogicalAndExpr {
+    LogicalAndRoot() { not this = any(LogicalAndExpr e).getAnOperand() }
+
+    private Expr getDescendant(string path) {
+      path = "" and result = this
+      or
+      exists(LogicalAndExpr mid, string midPath | mid = this.getDescendant(midPath) |
+        result = mid.getLeft() and path = midPath + "A"
+        or
+        result = mid.getRight() and path = midPath + "B"
+      )
+    }
+
+    Expr getNthLeaf(int n) {
+      result =
+        rank[n](Expr e, string path |
+          e = this.getDescendant(path) and not e instanceof LogicalAndExpr
+        |
+          e order by path
+        )
+    }
+
+    Expr getLastLeaf() { result = max(int n | | this.getNthLeaf(n) order by n) }
+  }
+
+  private class BlockWithGuardStmts extends Block {
+    BlockWithGuardStmts() { this.getStmt(_) instanceof GuardIfStmt }
+
+    AstNode getTranslatedChild(int n) {
+      result =
+        rank[n](AstNode stmt, AstNode child, int i1, int i2 |
+          stmt = this.getStmt(i1) and
+          (
+            child = stmt.(GuardIfStmt).getCondition().(LogicalAndRoot).getNthLeaf(i2)
+            or
+            child = stmt.(GuardIfStmt).getCondition() and
+            not child instanceof LogicalAndExpr and
+            i2 = 0
+            or
+            child = stmt.(GuardIfStmt).getElse() and
+            i2 = -1 // place before condition so its variables are not seen
+            or
+            not stmt instanceof GuardIfStmt and
+            child = stmt and
+            i2 = 0
+          )
+        |
+          child order by i1, i2
+        )
+    }
+  }
+
+  private AstNode getChild1(AstNode n, int index) {
+    result = n.(BlockWithGuardStmts).getTranslatedChild(index)
+    or
+    result = n.(LogicalAndRoot).getNthLeaf(index)
+    or
+    index = 0 and
+    relocatedClassMember(n, result)
+  }
+
+  /**
+   * Holds if `member` is moved onto a child of `className` instead of the class itself,
+   * so the member name is not in scope in the base types and type parameter constraints.
+   */
+  private predicate relocatedClassMember(Identifier className, Member member) {
+    exists(ClassLikeDeclaration cls |
+      className = cls.getNameNode() and
+      member = cls.getAMember()
+    )
+  }
+
+  AstNode getChild(AstNode n, int index) {
+    result = getChild1(n, index)
+    or
+    not exists(getChild1(n, _)) and
+    not n instanceof LogicalAndExpr and // also ignore intermediate nodes within a 'logical and' tree
+    not n instanceof GuardIfStmt and
+    not relocatedClassMember(_, result) and
+    index = result.getParentIndex() and
+    result = n.getAFieldOrChild()
+  }
+
+  abstract class Conditional extends AstNode {
+    /** Gets the condition of this conditional. */
+    abstract AstNode getCondition();
+
+    /** Gets the then-branch of this conditional. */
+    abstract AstNode getThen();
+
+    /** Gets the else-branch of this conditional. */
+    abstract AstNode getElse();
+  }
+
+  private class IfExprConditional extends Conditional instanceof IfExpr {
+    override AstNode getCondition() { result = IfExpr.super.getCondition() }
+
+    override AstNode getThen() { result = IfExpr.super.getThen() }
+
+    override AstNode getElse() { result = IfExpr.super.getElse() }
+  }
+
+  private class WhileStmtConditional extends Conditional instanceof WhileStmt {
+    override AstNode getCondition() { result = WhileStmt.super.getCondition() }
+
+    override AstNode getThen() { result = WhileStmt.super.getBody() }
+
+    override AstNode getElse() { none() }
+  }
+
+  abstract class SiblingShadowingDecl extends AstNode {
+    abstract AstNode getPattern();
+
+    /**
+     * Gets the right-hand side of this declaration.
+     *
+     * Any local declared in the left-hand side of this declaration is _not_ in scope
+     * in the right-hand side.
+     */
+    abstract AstNode getRhs();
+
+    /**
+     * Gets the else-branch of this declaration, if any.
+     *
+     * Any local declared in the left-hand side of this declaration is _not_ in scope
+     * in the else-branch.
+     */
+    abstract AstNode getElse();
+  }
+
+  private class LocalVariableDeclarationSiblingShadowingDecl extends SiblingShadowingDecl instanceof LocalVariableDeclaration
+  {
+    override Expr getPattern() { result = LocalVariableDeclaration.super.getPattern() }
+
+    override AstNode getRhs() { result = LocalVariableDeclaration.super.getValue() }
+
+    override AstNode getElse() { none() }
+  }
+
+  private class PatternGuardExprSiblingShadowingDecl extends SiblingShadowingDecl instanceof PatternGuardExpr
+  {
+    override Expr getPattern() { result = PatternGuardExpr.super.getPattern() }
+
+    override AstNode getRhs() { result = PatternGuardExpr.super.getValue() }
+
+    override AstNode getElse() { none() }
+  }
+
+  /** Holds if `e` cannot be a pattern even if it appears in pattern context. */
+  bindingset[e]
+  private predicate isNonPattern(Expr e) {
+    e = any(TypeTestExpr n).getType()
+    or
+    e = any(TypeCastExpr n).getType()
+    or
+    e instanceof MemberAccessExpr
+    or
+    any(NameBindingPlugin p).isNonPattern(e)
+  }
+
+  cached
+  additional predicate bindingContext(AstNode pattern, AstNode scope, AstNode declaration) {
+    LocalNameBindingOutput::CachedStage::ref() and
+    not isNonPattern(pattern) and
+    (
+      exists(SiblingShadowingDecl decl |
+        scope = decl and
+        pattern = decl.getPattern() and
+        declaration = decl
+      )
+      or
+      exists(VariableDeclaration decl |
+        not decl instanceof SiblingShadowingDecl and
+        getChild(scope, _) = decl and
+        pattern = decl.getPattern() and
+        declaration = decl
+      )
+      or
+      exists(FunctionDeclaration func |
+        getChild(scope, _) = func and
+        pattern = func.getNameNode() and
+        declaration = func
+      )
+      or
+      exists(Parameter param |
+        scope = param.getParent() and // TODO: add SourceCallable and use .getParameter() instead
+        pattern = param.getPattern() and
+        declaration = param
+      )
+      or
+      exists(CatchClause catch |
+        scope = catch and // ensure both body and pattern are in scope
+        pattern = catch.getPattern() and
+        declaration = catch
+      )
+      or
+      exists(SwitchCase case |
+        scope = case and // ensure both body and pattern are in scope
+        pattern = case.getPattern() and
+        declaration = case
+      )
+      or
+      exists(ForEachStmt stmt |
+        scope = stmt and // ensure both 'body' and 'guard' are in scope
+        pattern = stmt.getPattern() and
+        declaration = stmt
+      )
+      or
+      exists(ClassLikeDeclaration cls |
+        getChild(scope, _) = cls and
+        pattern = cls.getNameNode() and
+        not cls.hasModifier("extension") and // TODO: Fix in the AST mapping: type extensions should reference their type, not declare it
+        declaration = cls
+      )
+      or
+      exists(TypeAliasDeclaration decl |
+        getChild(scope, _) = decl and
+        pattern = decl.getNameNode() and
+        declaration = decl
+      )
+      or
+      exists(TypeParameter param |
+        scope = param.getParent() and
+        pattern = param.getNameNode() and
+        declaration = param
+      )
+      or
+      exists(AssociatedTypeDeclaration decl |
+        getChild(scope, _) = decl and
+        pattern = decl.getNameNode() and
+        declaration = decl
+      )
+      or
+      exists(AccessorDeclaration decl |
+        getChild(scope, _) = decl and
+        pattern = decl.getNameNode() and
+        declaration = decl
+      )
+      or
+      exists(ConstructorDeclaration decl |
+        getChild(scope, _) = decl and
+        pattern = decl.getNameNode() and
+        declaration = decl
+      )
+      or
+      exists(ImportDeclaration imprt |
+        getChild(scope, _) = imprt and
+        pattern = imprt.getPattern() and
+        declaration = imprt
+      )
+      or
+      exists(NamedPattern p |
+        bindingContext(p, scope, declaration) and
+        pattern = p.getNameNode()
+      )
+      or
+      bindingContext(pattern.(Expr).getEnclosingExpr(), scope, declaration)
+    )
+  }
+
+  /**
+   * Gets the nearest enclosing `OrPattern` to which variable bindings in `p` should be lifted.
+   *
+   * To ensure that `case .foo(let x), .bar(let x)` result in a single definition for
+   * the variable `x`, the `OrPattern` becomes the `definingNode` for `x`.
+   *
+   * At the moment no further checks are needed since the Swift compiler enforces that
+   * variable names bound in any branch are bound in all branches.
+   */
+  private OrPattern getEnclosingOrPattern(Expr p) {
+    p = result.getPattern(_)
+    or
+    not p instanceof OrPattern and
+    result = getEnclosingOrPattern(p.getEnclosingExpr())
+  }
+
+  private OrPattern getEnclosingOrPatternFromIdentifier(Identifier identifier) {
+    result = getEnclosingOrPattern(identifier)
+  }
+
+  predicate declInScope(AstNode definingNode, string name, AstNode scope) {
+    exists(AstNode pattern |
+      bindingContext(pattern, scope, _) and
+      pattern.(Identifier).getValue() = name and
+      (
+        definingNode = getEnclosingOrPatternFromIdentifier(pattern)
+        or
+        not exists(getEnclosingOrPatternFromIdentifier(pattern)) and
+        definingNode = pattern
+      )
+    )
+  }
+
+  cached
+  additional predicate implicitDeclInScope(string name, AstNode scope, boolean isLocalVariable) {
+    LocalNameBindingOutput::CachedStage::ref() and
+    exists(Callable callable |
+      isLocalVariable = true and
+      name = any(NameBindingPlugin p).getImplicitReceiverParameterName(callable) and
+      scope = callable
+    )
+    or
+    exists(ClassLikeDeclaration cls |
+      isLocalVariable = false and
+      name = any(NameBindingPlugin p).getStaticSelfName(cls) and
+      scope = cls
+    )
+  }
+
+  predicate implicitDeclInScope(string name, AstNode scope) { implicitDeclInScope(name, scope, _) }
+
+  predicate accessCand(AstNode n, string name) { n.(PotentialLocalNameAccess).getName() = name }
+
+  predicate uncertainScope(AstNode scope) {
+    // Classes can have uncertain members due to unqualified access to inherited members.
+    scope instanceof ClassLikeDeclaration
+    or
+    scope = any(TopLevel t).getBody() // Imported names are in scope here
+    or
+    // Scopes with a bulk-import have uncertain members
+    bindingContext(any(BulkImportingPattern b), scope, _)
+  }
+}
+
+predicate bindingContext = LocalNameBindingInput::bindingContext/3;
+
+module LocalNameBindingOutput = LocalNameBinding<Location, LocalNameBindingInput>;
+
+module Public {
+  /**
+   * A representative for a lexically scoped entity, such as a local variable, type name, or module name.
+   */
+  class LocalName instanceof LocalNameBindingOutput::Local {
+    /** Gets a textual representation of this local entity. */
+    string toString() { result = super.toString() }
+
+    /** Gets the location of this local name's first declaration */
+    Location getLocation() { result = super.getLocation() }
+
+    /** Gets the name of this local, as a string. */
+    string getName() { result = super.getName() }
+
+    /** Gets an access to this entity, through its lexically scoped name. */
+    LocalNameAccess getAnAccess() { result.getLocalName() = this }
+
+    /** Gets a name binding that declares this local name. */
+    NameBinding getABinding() { result.getLocalName() = this }
+  }
+
+  /** An identifier appearing in a name-binding position, such as the `x` in `let x = 123`. */
+  class NameBinding extends Identifier {
+    NameBinding() { bindingContext(this, _, _) }
+
+    /** Gets the statement-like node declaring this name, such as a `VariableDeclaration` or `CatchClause`. */
+    AstNode getDeclaration() { bindingContext(this, _, result) }
+
+    /** Gets the name being declared. */
+    string getName() { result = this.getValue() }
+
+    /** Gets the representative for the local name introduced by this declaration. */
+    LocalName getLocalName() { result = this.(LocalNameBindingOutput::LocalAccess).getLocal() }
+  }
+
+  final class LocalVariable = LocalVariableImpl;
+
+  /** A representative for a lexically scoped local variable. */
+  abstract private class LocalVariableImpl extends LocalName {
+    /** Gets the callable containing the declaration of this local variable. */
+    abstract Callable getDeclaringCallable();
+
+    /** Holds if this local variable is captured, that is, it is accessed from another callable than the one declaring it. */
+    predicate isCaptured() {
+      this.getAnAccess().getEnclosingCallable() != this.getDeclaringCallable()
+    }
+
+    /**
+     * Holds if this local variable represents an implicit receiver parameter of the given callable.
+     */
+    abstract predicate isImplicitReceiverParameter(Callable c);
+  }
+
+  private class ExplicitLocalVariable extends LocalVariableImpl {
+    ExplicitLocalVariable() {
+      exists(AstNode decl |
+        decl = this.getABinding().getDeclaration() and
+        not isInstanceMember(decl) and
+        not isStaticMember(decl)
+      |
+        decl instanceof VariableDeclaration or
+        decl instanceof FunctionDeclaration or // treat functions as values
+        decl instanceof AccessorDeclaration or
+        decl instanceof Parameter or
+        decl instanceof ForEachStmt or
+        decl instanceof PatternGuardExpr or
+        decl instanceof CatchClause or
+        decl instanceof SwitchCase
+      )
+    }
+
+    override Callable getDeclaringCallable() { result = this.getABinding().getEnclosingCallable() }
+
+    override predicate isImplicitReceiverParameter(Callable c) { none() }
+  }
+
+  private class ImplicitLocalVariable extends LocalVariableImpl instanceof LocalNameBindingOutput::ImplicitLocal
+  {
+    AstNode scope;
+    string name;
+
+    ImplicitLocalVariable() {
+      // For implicitly-declared locals we can't expect to find a binding. Check 'implicitDeclInScope' directly.
+      super.hasNameAndScope(name, scope) and
+      LocalNameBindingInput::implicitDeclInScope(name, scope, true)
+    }
+
+    override Callable getDeclaringCallable() {
+      result = scope
+      or
+      not scope instanceof Callable and
+      result = scope.getEnclosingCallable()
+    }
+
+    override predicate isImplicitReceiverParameter(Callable c) {
+      name = any(NameBindingPlugin p).getImplicitReceiverParameterName(scope) and
+      scope = c
+    }
+  }
+
+  private AccessorDeclaration getAnAccessor(LocalVariable v) {
+    v.getABinding() = result.getNameNode() and
+    (result instanceof GetterDeclaration or result instanceof SetterDeclaration)
+  }
+
+  /** A local variable defined by a getter/setter pair, which does not store a value on its own. */
+  final class ComputedLocalVariable extends LocalVariable {
+    ComputedLocalVariable() { exists(getAnAccessor(this)) }
+
+    /** Gets the getter or setter for this computed variable. */
+    AccessorDeclaration getAnAccessor() { result = getAnAccessor(this) }
+
+    /** Gets the getter for this computed variable. */
+    GetterDeclaration getGetterDeclaration() { result = getAnAccessor(this) }
+
+    /** Gets the setter for this computed variable. */
+    SetterDeclaration getSetterDeclaration() { result = getAnAccessor(this) }
+  }
+
+  /** An access to a locally-declared name. */
+  class LocalNameAccess extends PotentialLocalNameAccess {
+    LocalNameAccess() { not this instanceof UnqualifiedMemberAccess }
+  }
+
+  /** An access to a local variable. */
+  class LocalVariableAccess extends LocalNameAccess {
+    LocalVariableAccess() { this.getLocalName() instanceof LocalVariable }
+
+    /** Gets the local variable being accessed. Alias for `getLocalName()`. */
+    LocalVariable getLocalVariable() { result = this.getLocalName() }
+  }
+}
+
+final class PotentialLocalNameAccess = PotentialLocalNameAccessImpl;
+
+/**
+ * A name node that is possibly a reference to a local name, but could also refer to a member
+ * visible through imports or inheritance.
+ *
+ * For example, the type annotation `C` below is a potential access to `class C`, but could
+ * also refer to `B.C` if such a class exists:
+ * ```swift
+ * class C {}
+ * class A : B {
+ *   let x : C
+ * }
+ * ```
+ */
+abstract private class PotentialLocalNameAccessImpl extends AstNode {
+  /** Gets the representative for the local name being accessed. */
+  LocalName getLocalName() { result = this.(LocalNameBindingOutput::LocalAccess).getLocal() }
+
+  /** Gets the name being accessed. */
+  abstract string getName();
+
+  /** Holds if this is one of the binding sites for a name, such as the `x` in `let x = 123`. */
+  predicate isBindingSite() { this instanceof NameBinding }
+}
+
+private class IdentifierPotentialLocalNameAccess extends PotentialLocalNameAccessImpl,
+  IdentifierExpr
+{
+  override string getName() { result = this.getValue() }
+}
+
+private class SuperPotentialLocalNameAccess extends PotentialLocalNameAccessImpl, SuperExpr {
+  override string getName() { result = any(NameBindingPlugin p).getSuperLocalName(this) }
+}
+
+/** Gets the implicitly-declared variable through which the given callable refers to its receiver. */
+LocalVariable getImplicitReceiverVariable(Callable callable) {
+  exists(string name |
+    name = any(NameBindingPlugin p).getImplicitReceiverParameterName(callable) and
+    result.(LocalNameBindingOutput::ImplicitLocal).hasNameAndScope(name, callable)
+  )
+}
diff --git a/unified/ql/lib/codeql/unified/internal/NameBinding.qll b/unified/ql/lib/codeql/unified/internal/NameBinding.qll
new file mode 100644
index 000000000000..a07142de1d5f
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/NameBinding.qll
@@ -0,0 +1,15 @@
+/**
+ * Re-exports everything from the name-binding passes, while avoiding conflicts on 'Public'.
+ *
+ * TODO: move name binding passes into a subfolder.
+ */
+
+import StaticNameBinding
+import LocalNameBinding
+import NameBindingPlugin
+
+module Public {
+  // re-declare here to avoid conflicting import
+  import StaticNameBinding::Public
+  import LocalNameBinding::Public
+}
diff --git a/unified/ql/lib/codeql/unified/internal/NameBindingPlugin.qll b/unified/ql/lib/codeql/unified/internal/NameBindingPlugin.qll
new file mode 100644
index 000000000000..3c290ef637c0
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/NameBindingPlugin.qll
@@ -0,0 +1,184 @@
+overlay[local?]
+module;
+
+private import unified
+private import codeql.util.Unit
+private import codeql.util.Option
+private import StaticNameBinding
+
+private module Plugins {
+  private import codeql.unified.internal.NameBindingPluginSwift
+}
+
+/** Extension point for language-specific inputs to name binding. */
+class NameBindingPlugin extends Unit {
+  /**
+   * Holds if `e`, occurring in pattern context, should be interpreted a sub-expression
+   * whose result is to be compared to the incoming value.
+   */
+  bindingset[e]
+  predicate isNonPattern(Expr e) { none() }
+
+  /**
+   * Holds if `member` is an instance member.
+   *
+   * The caller has already restricted `member` to be a member of `cls`, and
+   * ensured that `member` is a `VariableDeclaration` or `FunctionDeclaration`.
+   */
+  bindingset[cls, member]
+  predicate isInstanceMember(ClassLikeDeclaration cls, Member member) { none() }
+
+  /**
+   * Holds if `binding`, declared by `member` is only visible in its local scope, and can thus be entirely resolved
+   * by local name-binding, suppressing any store-steps that would otherwise be induced from the member.
+   *
+   * Need only be implemented for members that occur in the context of class or top-level, as other
+   * contexts are considered local already.
+   *
+   * `binding` refers to an `Identifier` or `BulkImportingPattern` bound by the member.
+   */
+  bindingset[member, binding]
+  predicate isPrivateToLocalScope(Stmt member, AstNode binding) { none() }
+
+  /**
+   * Holds if `member` can be inherited by subclasses of `cls`.
+   *
+   * The caller has already restricted `member` to be a member of `cls`.
+   */
+  bindingset[cls, member]
+  predicate isInheritableMember(ClassLikeDeclaration cls, Member member) { none() }
+
+  /**
+   * Holds if `member` is considered invalid within the namespace `n`.
+   */
+  bindingset[n, member]
+  predicate isInvalidMember(NamespaceNode n, Member member) { none() }
+
+  /**
+   * Gets the key used to determine if `m` is shadowed by another declaration
+   * with the same name and key.
+   *
+   * Nodes without shadowing keys will not shadow inherited declarations.
+   *
+   * This means that shadowing can be completely disabled by not implementing this
+   * predicate, and completely enabled by assigning the same key to all members.
+   */
+  string getShadowingKey(Member m) { none() }
+
+  /** Gets the name of the implicit receiver parameter in `callable`, if it has one. */
+  string getImplicitReceiverParameterName(Callable callable) { none() }
+
+  /**
+   * Gets the name to be used when resolving `super`, for example `this` or `self`.
+   */
+  bindingset[se]
+  string getSuperLocalName(SuperExpr se) { none() }
+
+  /**
+   * Gets the name through which static members of the enclosing class `cls` can be
+   * accessed, for example `Self` in Swift.
+   */
+  bindingset[cls]
+  string getStaticSelfName(ClassLikeDeclaration cls) { none() }
+}
+
+/** Holds if `member` is an instance member. */
+predicate isInstanceMember(Member member) {
+  (
+    member instanceof VariableDeclaration or
+    member instanceof FunctionDeclaration or
+    member instanceof AccessorDeclaration or
+    member instanceof ConstructorDeclaration
+  ) and
+  exists(ClassLikeDeclaration cls | cls.getAMember() = member |
+    any(NameBindingPlugin p).isInstanceMember(cls, member)
+  )
+}
+
+/**
+ * Holds if `member` is a non-instance member declared in the context of a class or top-level.
+ *
+ * Instance constructors are also considered static members, in order to be able to look them
+ * up as both instance members (`self.init()`) and static members (`C1.init()`).
+ */
+predicate isStaticMember(Member member) {
+  exists(ClassLikeDeclaration cls | cls.getAMember() = member |
+    not any(NameBindingPlugin p).isInstanceMember(cls, member) or
+    member instanceof ConstructorDeclaration or
+    member instanceof TypeAliasDeclaration or
+    member instanceof ClassLikeDeclaration
+  )
+  or
+  member = any(TopLevel t).getBody().getAStmt()
+}
+
+/** Holds if `member` is an inheritable member. */
+predicate isInheritableMember(Member member) {
+  exists(ClassLikeDeclaration cls | cls.getAMember() = member |
+    any(NameBindingPlugin p).isInheritableMember(cls, member)
+  )
+}
+
+bindingset[n, member]
+predicate isInvalidMember(NamespaceNode n, Member member) {
+  any(NameBindingPlugin p).isInvalidMember(n, member)
+}
+
+private string getShadowingKey0(NameBindingNode n) {
+  result = any(NameBindingPlugin p).getShadowingKey(any(Member m | n.isMember(m)))
+}
+
+private class ShadowingKey extends string {
+  ShadowingKey() { this = getShadowingKey0(_) }
+}
+
+class ShadowingKeyOpt = Option<ShadowingKey>::Option;
+
+ShadowingKeyOpt getShadowingKey(NameBindingNode n) {
+  result.asSome() = getShadowingKey0(n)
+  or
+  not exists(getShadowingKey0(n)) and
+  result.isNone()
+}
+
+/**
+ * A representative for a module scope.
+ *
+ * Module scopes can encompass a set of files, and is the canonical representative
+ * for the top-level members collectively exported from those files.
+ */
+abstract class ModuleScopeRepr extends AstNode {
+  /**
+   * Holds if files matched by `path` should be part of this module;
+   * `path` is resolved relative to `c` and may use globs.
+   *
+   * For each file in the module:
+   * - Top-level exported members become members of this module, and
+   * - This module is implicitly imported at the top-level
+   */
+  predicate shouldInclude(Container c, string path) { none() }
+
+  /**
+   * Holds if this module scope can be referenced by the given `name`
+   * appearing as the leading name of an import path.
+   */
+  predicate hasImportableName(string name) { none() }
+
+  /** Gets one of the files included due to the `shouldInclude` predicate. */
+  final File getAnIncludedFile() {
+    exists(Container c, string path |
+      this.shouldInclude(c, path) and
+      result = FileResolver::resolve(c, path)
+    )
+  }
+}
+
+private module FileResolverInput implements Folder::ResolveSig {
+  predicate shouldResolve(Container base, string path) {
+    any(ModuleScopeRepr r).shouldInclude(base, path)
+  }
+
+  predicate allowGlobs() { any() }
+}
+
+private module FileResolver = Folder::Resolve<FileResolverInput>;
diff --git a/unified/ql/lib/codeql/unified/internal/NameBindingPluginSwift.qll b/unified/ql/lib/codeql/unified/internal/NameBindingPluginSwift.qll
new file mode 100644
index 000000000000..2e439943a1e1
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/NameBindingPluginSwift.qll
@@ -0,0 +1,206 @@
+/**
+ * Provides Swift-specific name binding rules.
+ */
+overlay[local?]
+module;
+
+private import unified
+private import codeql.unified.internal.StaticNameBinding
+private import codeql.unified.internal.NameBindingPlugin
+
+private class GeneratedConstructor extends ConstructorDeclaration {
+  GeneratedConstructor() { this.hasModifier("generated") }
+}
+
+private class ConvenienceConstructor extends ConstructorDeclaration {
+  ConvenienceConstructor() { this.hasModifier("convenience") }
+}
+
+private class DesignatedConstructor extends ConstructorDeclaration {
+  DesignatedConstructor() { not this instanceof ConvenienceConstructor }
+}
+
+class NameBindingPluginSwift extends NameBindingPlugin {
+  bindingset[e]
+  override predicate isNonPattern(Expr e) { isUnboundPattern(e.(Identifier)) }
+
+  // Note: For now we assume all code is Swift, but in the future we must restrict these rules to Swift-files
+  bindingset[cls, member]
+  override predicate isInstanceMember(ClassLikeDeclaration cls, Member member) {
+    exists(cls) and
+    not member.hasModifier(["static", "class", "enum_case"])
+  }
+
+  bindingset[member, binding]
+  override predicate isPrivateToLocalScope(Stmt member, AstNode binding) {
+    // Private top-level members
+    member = any(TopLevel top).getBody().getAStmt() and
+    member.hasModifier(["private", "fileprivate"])
+    or
+    // Imports are always file-local, except `@_exported` import which re-export everything
+    member instanceof ImportDeclaration and
+    not (
+      member.hasModifier("@_exported") and
+      binding instanceof BulkImportingPattern
+    )
+    //
+    // Note: Private class members can be seen within type-extensions in the same file,
+    // so we can't declare those private to their local scope.
+  }
+
+  bindingset[cls, member]
+  override predicate isInheritableMember(ClassLikeDeclaration cls, Member member) {
+    exists(cls) and
+    not member.hasModifier("private") and
+    not (cls.hasModifier("protocol") and member instanceof ConstructorDeclaration)
+  }
+
+  bindingset[n, member]
+  override predicate isInvalidMember(NamespaceNode n, Member member) {
+    exists(NamespaceNode parent |
+      parent = n.getAnInheritanceParent() and
+      not parent
+          .isInstanceOrStaticMemberNamespace(any(ClassLikeDeclaration p | p.hasModifier("protocol")))
+    |
+      // Remove generated constructors when there are inherited constructors available
+      // Note: If the base class only has private constructors, this class must have an
+      // explicit constructor, in which case there is no generated constructor to begin
+      // with
+      member instanceof GeneratedConstructor and
+      n.getOwnMember(_).isMember(member) and
+      parent.getMemberFull(_, _).isMember(any(ConstructorDeclaration inherited))
+      or
+      // Remove inherited designated constructors (generated or not) when there are
+      // explicit designated constructors available
+      // Note: We always inherit convenience constructors, even though it may not actually
+      // be the case in Swift; this should be OK, since there can then not exist any calls
+      // that target those constructors
+      parent.getMemberFull(_, _).isMember(member.(DesignatedConstructor)) and
+      exists(DesignatedConstructor designated |
+        n.getOwnMember(_).isMember(designated) and
+        not designated instanceof GeneratedConstructor
+      )
+    )
+  }
+
+  override string getShadowingKey(Member m) {
+    not m instanceof Callable and result = ""
+    or
+    not m instanceof GeneratedConstructor and
+    result =
+      concat(int i, Parameter p, string name |
+        p = m.(Callable).getParameter(i) and
+        (
+          name = p.getExternalNameNode().getValue()
+          or
+          not exists(p.getExternalNameNode()) and
+          name = "_"
+        )
+      |
+        name, "," order by i
+      )
+  }
+
+  override string getImplicitReceiverParameterName(Callable callable) {
+    // TODO: field initializers can also reference 'self' but are not currently wrapped in a Callable
+    callable = any(ClassLikeDeclaration cls).getAMember() and
+    result = "self"
+  }
+
+  bindingset[se]
+  override string getSuperLocalName(SuperExpr se) { exists(se) and result = "self" }
+
+  bindingset[cls]
+  override string getStaticSelfName(ClassLikeDeclaration cls) { exists(cls) and result = "Self" }
+}
+
+/** Holds if `node` is in a context where a bare name node should be seen as a reference rather than a declaration. */
+private predicate isUnboundPattern(Expr node) {
+  // 'case/catch/guard' start an unbound-pattern context, 'let/var' terminate it
+  (
+    node = any(SwitchCase c).getPattern()
+    or
+    node = any(CatchClause c).getPattern()
+    or
+    node = any(PatternGuardExpr c).getPattern()
+    or
+    isUnboundPattern(node.(Expr).getEnclosingExpr())
+  ) and
+  not node.(ExprPattern).hasModifier(["let", "var"])
+}
+
+private predicate predefinedSourceFolders(string folder, int ordering) {
+  folder = "Sources,Source,src,srcs".splitAt(",", ordering)
+}
+
+bindingset[targetKind]
+private predicate predefinedSourceFoldersByTarget(string targetKind, string folder, int ordering) {
+  predefinedSourceFolders(folder, ordering)
+  or
+  ordering = -1 and
+  (
+    targetKind = "testTarget" and
+    folder = "Tests"
+    or
+    targetKind = "plugin" and
+    folder = "Plugins"
+  )
+}
+
+/**
+ * A call to `.target()` or similar target spec, in a `Package.swift` file.
+ */
+class SwiftPackageTarget extends ModuleScopeRepr, CallExpr {
+  private string targetKind;
+
+  SwiftPackageTarget() {
+    this.getFile().getBaseName() = "Package.swift" and
+    this.getCallee().(MemberAccessExpr).getMemberName() = targetKind and
+    targetKind =
+      [
+        "target", "executableTarget", "testTarget", "systemLibrary", "binaryTarget", "plugin",
+        "macro"
+      ]
+  }
+
+  Folder getFolder() { result = this.getFile().getParentContainer() }
+
+  /** Gets the intermediate folder such as `Sources/` containing the sources, but without the target name. */
+  Folder getSourceMidFolder() {
+    result =
+      min(int i, string name, Folder subfolder |
+        predefinedSourceFoldersByTarget(targetKind, name, i) and
+        subfolder = this.getFolder().getFolder(name)
+      |
+        subfolder order by i
+      )
+  }
+
+  /** Gets the source folder to use if no explicit `path:` is given, typically `Sources/<Target>`. */
+  Folder getDefaultSourceFolder() {
+    exists(Folder subfolder | subfolder = this.getSourceMidFolder() |
+      result = subfolder.getFolder(this.getName())
+      or
+      not exists(subfolder.getFolder(this.getName())) and
+      result = subfolder
+    )
+  }
+
+  string getName() { result = this.getNamedArgument("name").getStringValue() }
+
+  string getExplicitPath() { result = this.getNamedArgument("path").getStringValue() }
+
+  override predicate shouldInclude(Container c, string path) {
+    c = this.getFolder() and
+    path = this.getExplicitPath() + "/**/*.swift"
+    or
+    not exists(this.getExplicitPath()) and
+    c = this.getDefaultSourceFolder() and
+    path = "**/*.swift"
+  }
+
+  override predicate hasImportableName(string name) {
+    targetKind = "target" and
+    name = this.getName()
+  }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/ParameterEx.qll b/unified/ql/lib/codeql/unified/internal/ParameterEx.qll
new file mode 100644
index 000000000000..0ec703cb2b66
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/ParameterEx.qll
@@ -0,0 +1,124 @@
+/**
+ * Provides logic for synthesizing parameters.
+ */
+
+private import unified
+private import AstPlugin
+private import NameBinding
+
+private newtype TParameterEx =
+  TAstParameter(Parameter p) or
+  TImplicitReceiverParameter(Callable c) {
+    exists(LocalVariable v | v.isImplicitReceiverParameter(c))
+  } or
+  TDefaultConstructorParameter(ConstructorDeclaration cd, int i, string name, boolean hasDefault) {
+    cd.hasModifier("generated") and
+    defaultConstructorParameter(cd, i, name, hasDefault)
+  }
+
+final class ParameterEx = ParameterExImpl;
+
+/**
+ * A parameter from source code or a synthesized parameter.
+ */
+abstract private class ParameterExImpl extends TParameterEx {
+  /**
+   * Gets the source code parameter that this entity represents, if any.
+   */
+  Parameter asParameter() { this = TAstParameter(result) }
+
+  /**
+   * Holds if this entity represents a regular parameter from source code.
+   */
+  predicate isParameter() { exists(this.asParameter()) }
+
+  /**
+   * Holds if this entity represents an implicit receiver parameter of `c`.
+   */
+  predicate isImplicitReceiverParameter(Callable c) { this = TImplicitReceiverParameter(c) }
+
+  /**
+   * Holds if this entity represents the `i`th parameter of the default
+   * constructor `cd` with name `name`.
+   */
+  predicate isDefaultConstructorParameter(ConstructorDeclaration cd, int i, string name) {
+    this = TDefaultConstructorParameter(cd, i, name, _)
+  }
+
+  /** Gets the callable that this parameter belongs to. */
+  Callable getCallable() {
+    this.asParameter() =
+      [
+        result.(FunctionDeclaration).getAParameter(),
+        result.(ConstructorDeclaration).getAParameter(),
+        result.(AccessorDeclaration).getAParameter(),
+        result.(FunctionExpr).getAParameter()
+      ]
+    or
+    this.isImplicitReceiverParameter(result)
+    or
+    this.isDefaultConstructorParameter(result, _, _)
+  }
+
+  /** Holds if this parameter has a default value. */
+  abstract predicate hasDefault();
+
+  /** Gets the type declaration of this parameter, if any. */
+  abstract AstNode getType();
+
+  /** Gets a textual representation of this parameter. */
+  abstract string toString();
+
+  /** Gets the location of this parameter. */
+  abstract Location getLocation();
+}
+
+private class AstParameterEx extends ParameterExImpl, TAstParameter {
+  Parameter p;
+
+  AstParameterEx() { this = TAstParameter(p) }
+
+  override predicate hasDefault() { exists(p.getDefault()) }
+
+  override AstNode getType() { result = p.getType() }
+
+  override string toString() { result = p.toString() }
+
+  override Location getLocation() { result = p.getLocation() }
+}
+
+private class ImplicitReceiverParameterEx extends ParameterExImpl, TImplicitReceiverParameter {
+  Callable c;
+
+  ImplicitReceiverParameterEx() { this = TImplicitReceiverParameter(c) }
+
+  override predicate hasDefault() { none() }
+
+  override AstNode getType() { none() }
+
+  override string toString() {
+    exists(LocalVariable v |
+      v.isImplicitReceiverParameter(c) and
+      result = v.getName()
+    )
+  }
+
+  override Location getLocation() { result = c.getLocation() }
+}
+
+private class DefaultConstructorParameterEx extends ParameterExImpl, TDefaultConstructorParameter {
+  ConstructorDeclaration cd;
+  int i;
+  string name;
+  boolean hasDefault;
+
+  DefaultConstructorParameterEx() { this = TDefaultConstructorParameter(cd, i, name, hasDefault) }
+
+  override AstNode getType() { defaultConstructorParameterType(cd, i, result) }
+
+  override predicate hasDefault() { hasDefault = true }
+
+  override string toString() { result = name + " [" + cd.getName() + " default constructor]" }
+
+  override Location getLocation() { result = cd.getLocation() }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/StaticNameBinding.qll b/unified/ql/lib/codeql/unified/internal/StaticNameBinding.qll
new file mode 100644
index 000000000000..a559dab61029
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/StaticNameBinding.qll
@@ -0,0 +1,887 @@
+/**
+ * Provides classes for reasoning about static references to the members of classes and top-levels.
+ */
+overlay[local?]
+module;
+
+private import unified
+private import codeql.unified.internal.LocalNameBinding
+private import codeql.unified.internal.NameBindingPlugin
+
+cached
+private newtype TNameBindingNode =
+  TIdentifier(Identifier n) { CachedStage::ref() } or
+  TBulkImport(BulkImportingPattern p) or
+  TLocalName(LocalName local) or
+  TStaticMemberNamespace(ClassLikeDeclaration cls) or
+  TInstanceMemberNamespace(ClassLikeDeclaration cls) or
+  TLocalNamespace(AstNode n) {
+    n = any(TopLevel t).getBody() or // Imported names come in scope here
+    n instanceof ClassLikeDeclaration
+  } or
+  TModuleScope(ModuleScopeRepr repr) or
+  TFolderScope(Folder folder) or
+  TModuleRoot()
+
+/**
+ * A node in a graph, in which name-binding rules are represented as edges between nodes.
+ */
+class NameBindingNode extends TNameBindingNode {
+  predicate isIdentifier(Identifier n) { this = TIdentifier(n) }
+
+  Identifier asIdentifier() { this.isIdentifier(result) }
+
+  predicate isMember(Member m) { this.asIdentifier() = m.getNameNode() }
+
+  predicate isBulkImport(BulkImportingPattern p) { this = TBulkImport(p) }
+
+  predicate isLocalName(LocalName local) { this = TLocalName(local) }
+
+  /** Holds if this represents the set of static members available in the given class. */
+  predicate isStaticMemberNamespace(ClassLikeDeclaration cls) { this = TStaticMemberNamespace(cls) }
+
+  /** Holds if this represents the set of instance members available in the given class. */
+  predicate isInstanceMemberNamespace(ClassLikeDeclaration cls) {
+    this = TInstanceMemberNamespace(cls)
+  }
+
+  predicate isInstanceOrStaticMemberNamespace(ClassLikeDeclaration cls) {
+    this.isInstanceMemberNamespace(cls) or this.isStaticMemberNamespace(cls)
+  }
+
+  /** Holds if this represents the set of members that can be accessed unqualified within the given scope. */
+  predicate isLocalNamespace(AstNode n) { this = TLocalNamespace(n) }
+
+  /** Holds if this represents the given module scope. */
+  predicate isModuleScopeNode(ModuleScopeRepr repr) { this = TModuleScope(repr) }
+
+  /** Holds if this represents the set of members that can be accessed unqualified within the given folder and subfolders. */
+  predicate isFolderScope(Folder folder) { this = TFolderScope(folder) }
+
+  /** Holds if this represents the root namespace in which all named modules are members. */
+  predicate isModuleRoot() { this = TModuleRoot() }
+
+  /**
+   * Gets an AST node wrapped by this name-binding node, if such a node exists.
+   *
+   * Mainly for debugging purposes.
+   */
+  AstNode getWrappedAstNode() {
+    this.isIdentifier(result)
+    or
+    this.isBulkImport(result)
+    or
+    this.isStaticMemberNamespace(result)
+    or
+    this.isInstanceMemberNamespace(result)
+    or
+    this.isLocalNamespace(result)
+    or
+    this.isModuleScopeNode(result)
+  }
+
+  string toString() {
+    exists(Identifier n | this.isIdentifier(n) and result = "Identifier(" + n + ")")
+    or
+    exists(BulkImportingPattern p | this.isBulkImport(p) and result = "BulkImport(" + p + ")")
+    or
+    exists(LocalName local | this.isLocalName(local) and result = "LocalName(" + local + ")")
+    or
+    exists(ClassLikeDeclaration cls |
+      this.isStaticMemberNamespace(cls) and result = "StaticMemberNamespace(" + cls + ")"
+    )
+    or
+    exists(ClassLikeDeclaration cls |
+      this.isInstanceMemberNamespace(cls) and result = "InstanceMemberNamespace(" + cls + ")"
+    )
+    or
+    exists(AstNode n | this.isLocalNamespace(n) and result = "LocalNamespace(" + n + ")")
+    or
+    exists(ModuleScopeRepr repr |
+      this.isModuleScopeNode(repr) and result = "ModuleScope(" + repr + ")"
+    )
+    or
+    exists(Folder folder | this.isFolderScope(folder) and result = "FolderScope(" + folder + ")")
+    or
+    this.isModuleRoot() and result = "ModuleRoot"
+  }
+
+  Location getLocation() {
+    exists(Identifier n | this.isIdentifier(n) and result = n.getLocation())
+    or
+    exists(BulkImportingPattern p | this.isBulkImport(p) and result = p.getLocation())
+    or
+    exists(LocalName local | this.isLocalName(local) and result = local.getLocation())
+    or
+    exists(ClassLikeDeclaration cls |
+      this.isStaticMemberNamespace(cls) and result = cls.getLocation()
+    )
+    or
+    exists(ClassLikeDeclaration cls |
+      this.isInstanceMemberNamespace(cls) and result = cls.getLocation()
+    )
+    or
+    exists(AstNode n | this.isLocalNamespace(n) and result = n.getLocation())
+    or
+    exists(ModuleScopeRepr repr | this.isModuleScopeNode(repr) and result = repr.getLocation())
+  }
+}
+
+Identifier getIdentifierFromRef(AstNode n) {
+  result = n.(PotentialLocalNameAccess)
+  or
+  result = getIdentifierFromRef(n.(GenericTypeExpr).getBase())
+  or
+  result = n.(MemberAccessExpr).getMemberNameNode()
+}
+
+private Identifier getImportBindingIdentifier(ImportDeclaration imprt) {
+  result = imprt.getPattern().(Identifier)
+  or
+  result = imprt.getPattern().(NamedPattern).getNameNode()
+}
+
+/** Holds if `binding` is only visible in its local scope. */
+pragma[nomagic]
+private predicate isPrivateToLocalScope(AstNode binding) {
+  exists(Stmt member |
+    bindingContext(binding, _, member) and
+    (
+      member = any(ClassLikeDeclaration cls).getAMember() or
+      member = any(TopLevel t).getBody().getAStmt()
+    ) and
+    (binding instanceof NameBinding or binding instanceof BulkImportingPattern) and
+    any(NameBindingPlugin p).isPrivateToLocalScope(member, binding)
+  )
+}
+
+NameBindingNode getNodeFromRef(AstNode n) {
+  result.isIdentifier(getIdentifierFromRef(n))
+  or
+  result.isBulkImport(n)
+}
+
+NameBindingNode getModuleNodeFromFile(File f) {
+  exists(ModuleScopeRepr mod |
+    mod.getAnIncludedFile() = f and
+    result.isModuleScopeNode(mod)
+  )
+}
+
+/** Gets the name-binding node associated with the given uncertain scope node. */
+private NameBindingNode getNodeFromUncertainScope(AstNode n) { result.isLocalNamespace(n) }
+
+predicate readStep(NameBindingNode node1, string name, NameBindingNode node2) {
+  exists(MemberAccessExpr expr |
+    node1 = getNodeFromRef(expr.getBase()) and
+    name = expr.getMemberName() and
+    node2 = getNodeFromRef(expr)
+  )
+  or
+  exists(PotentialLocalNameAccess access |
+    not access.isBindingSite() and
+    name = access.getName() and
+    node1 = getNodeFromUncertainScope(LocalNameBindingOutput::getAnUncertainScope(access, name)) and
+    node2.isIdentifier(access)
+  )
+  or
+  exists(Identifier expr |
+    isImportPrefix(expr) and
+    node1.isModuleRoot() and
+    name = expr.getValue() and
+    node2 = getNodeFromRef(expr)
+  )
+}
+
+predicate storeStep(NameBindingNode node1, string name, NameBindingNode node2) {
+  exists(ClassLikeDeclaration cls, Member member, NameBinding nameDecl |
+    member = cls.getAMember() and
+    not isPrivateToLocalScope(nameDecl) and
+    nameDecl.getDeclaration() = member and
+    node1.isIdentifier(nameDecl) and
+    name = nameDecl.getName()
+  |
+    isInstanceMember(member) and
+    node2.isInstanceMemberNamespace(cls)
+    or
+    isStaticMember(member) and
+    node2.isStaticMemberNamespace(cls)
+  )
+  or
+  exists(TopLevel top, Stmt stmt, NameBinding nameDecl |
+    stmt = top.getBody().getAStmt() and
+    not isPrivateToLocalScope(nameDecl) and
+    nameDecl.getDeclaration() = stmt and
+    node1.isIdentifier(nameDecl) and
+    name = nameDecl.getName() and
+    node2 = getModuleNodeFromFile(top.getFile())
+  )
+  or
+  exists(ModuleScopeRepr mod |
+    node1.isModuleScopeNode(mod) and
+    mod.hasImportableName(name) and
+    node2.isModuleRoot()
+  )
+  or
+  FolderHeuristic::storeStep(node1, name, node2)
+}
+
+predicate valueStep(NameBindingNode node1, NameBindingNode node2) {
+  exists(PotentialLocalNameAccess access |
+    access.isBindingSite() and
+    node1.isIdentifier(access) and
+    node2.isLocalName(access.getLocalName())
+    or
+    not access.isBindingSite() and
+    node1.isLocalName(access.getLocalName()) and
+    node2.isIdentifier(access)
+  )
+  or
+  exists(ClassLikeDeclaration cls |
+    node1.isStaticMemberNamespace(cls) and
+    node2.isIdentifier(cls.getNameNode())
+  )
+  or
+  exists(ClassLikeDeclaration cls |
+    node1.isStaticMemberNamespace(cls) and
+    node2.isLocalNamespace(cls)
+  )
+  or
+  exists(TopLevel top |
+    node1 = getModuleNodeFromFile(top.getFile()) and
+    node2.isLocalNamespace(top.getBody()) // implicitly import own module
+  )
+  or
+  exists(ImportDeclaration imprt |
+    node1 = getNodeFromRef(imprt.getImportedExpr()) and
+    node2 = getNodeFromRef(getImportBindingIdentifier(imprt))
+  )
+  or
+  exists(BulkImportingPattern p, AstNode scope, AstNode declaration |
+    bindingContext(p, scope, declaration) and
+    node1 = getNodeFromRef(p)
+  |
+    node2 = getNodeFromUncertainScope(scope)
+    or
+    // Bulk re-exporting declarations
+    exists(TopLevel top |
+      declaration = top.getBody().getAStmt() and
+      not isPrivateToLocalScope(p) and
+      node2 = getModuleNodeFromFile(top.getFile())
+    )
+  )
+  or
+  exists(NamedPattern p |
+    node1 = getNodeFromRef(p.getNameNode()) and
+    node2 = getNodeFromRef(p.getSubPattern())
+  )
+  or
+  // Extensions have access to the members of the entity they extend.
+  // TODO: The type parameters of the target type should also be in the local scope (for Swift).
+  exists(ClassLikeDeclaration extension |
+    node1 = getNodeFromRef(extension.getExtensionTarget()) and
+    node2.isLocalNamespace(extension)
+  )
+  or
+  FolderHeuristic::valueStep(node1, node2)
+  or
+  exists(ClassLikeDeclaration cls, LocalNameBindingOutput::ImplicitLocal self |
+    node1.isIdentifier(cls.getNameNode()) and
+    node2.isLocalName(self) and
+    self.hasNameAndScope(any(NameBindingPlugin p).getStaticSelfName(cls), cls)
+  )
+}
+
+private predicate isImportPrefix(Expr e) {
+  e = any(ImportDeclaration impr).getImportedExpr()
+  or
+  exists(MemberAccessExpr member |
+    isImportPrefix(member) and
+    e = member.getBase()
+  )
+}
+
+predicate inheritanceStep(NameBindingNode supertype, NameBindingNode subtype) {
+  exists(ClassLikeDeclaration cls, BaseType base |
+    base = cls.getABaseType() and
+    supertype = getNodeFromRef(base.getType()) and
+    subtype.isStaticMemberNamespace(cls)
+  )
+}
+
+predicate extensionStep(NameBindingNode extension, NameBindingNode targetClass) {
+  exists(ClassLikeDeclaration cls |
+    targetClass = getNodeFromRef(cls.getExtensionTarget()) and
+    extension.isStaticMemberNamespace(cls)
+  )
+}
+
+signature module TrackInputSig {
+  /** Holds if the forward-flow of `node` should be tracked. */
+  predicate shouldTrack(NameBindingNode node);
+
+  default NameBindingNode getMember(NamespaceNode namespace, string name) {
+    result = namespace.getMember(name)
+  }
+
+  default predicate additionalValueStep(NameBindingNode node1, NameBindingNode node2) { none() }
+}
+
+/** Creates a module for tracking flow through the name-binding graph. */
+module Track<TrackInputSig Input> {
+  private import Input
+
+  /** Gets a name-binding node to which `node` can flow. */
+  NameBindingNode track(NameBindingNode node) {
+    shouldTrack(node) and
+    result = node
+    or
+    exists(NameBindingNode prev | prev = track(node) | valueStepEx(prev, result))
+  }
+
+  pragma[nomagic]
+  private predicate derivedStoreReadStep0(
+    NamespaceNode namespace, string name, NameBindingNode node2
+  ) {
+    readStep(namespace.ref(), name, node2)
+  }
+
+  /**
+   * Holds if `node1 -> node2` is derived by combining a store and a read step, with zero or more value steps and inheritance steps in-between.
+   */
+  pragma[nomagic]
+  private predicate derivedStoreReadStep(NameBindingNode node1, NameBindingNode node2) {
+    exists(NamespaceNode namespace, string name |
+      node1 = getMember(namespace, name) and // getMember() combines a store step with subsequent inheritance steps
+      derivedStoreReadStep0(namespace, name, node2) and
+      node1 != node2
+    )
+  }
+
+  /** Holds if there is an effective value step `node1 -> node2`. */
+  pragma[inline]
+  private predicate valueStepEx(NameBindingNode node1, NameBindingNode node2) {
+    valueStep(node1, node2)
+    or
+    derivedStoreReadStep(node1, node2)
+    or
+    additionalValueStep(node1, node2)
+  }
+}
+
+/** Holds if the member represented by `node` can be inherited. */
+pragma[nomagic]
+private predicate isInheritableMemberNode(NameBindingNode node) {
+  exists(NameBinding decl |
+    node.isIdentifier(decl) and
+    isInheritableMember(decl.getDeclaration())
+  )
+}
+
+/** A name-binding node that can have members. */
+class NamespaceNode extends NameBindingNode {
+  cached
+  NamespaceNode() {
+    CachedStage::ref() and
+    storeStep(_, _, this)
+    or
+    inheritanceStep(_, this)
+    or
+    this.isInstanceMemberNamespace(_)
+    or
+    this.isStaticMemberNamespace(_)
+  }
+
+  /** Gets a name-binding node that may refer to this namespace. */
+  NameBindingNode ref() { result = TrackNamespace::track(this) }
+
+  /** Gets an own (non-inherited) member of this namespace of the given name. */
+  NameBindingNode getOwnMember(string name, ShadowingKeyOpt shadowingKey) {
+    storeStep(result, name, this) and
+    shadowingKey = getShadowingKey(result)
+  }
+
+  /** Gets an own (non-inherited) member of this namespace of the given name. */
+  NameBindingNode getOwnMember(string name) { result = this.getOwnMember(name, _) }
+
+  /** If this is the static namespace for a class, gets the corresponding instance namespace. */
+  NamespaceNode toInstanceNamespace() {
+    exists(ClassLikeDeclaration cls |
+      this.isStaticMemberNamespace(cls) and
+      result.isInstanceMemberNamespace(cls)
+    )
+  }
+
+  /** If this is the instance namespace for a class, gets the corresponding static namespace. */
+  NamespaceNode toStaticNamespace() { result.toInstanceNamespace() = this }
+
+  private NamespaceNode getAnExtension1() { extensionStep(result, this.ref()) }
+
+  /** Gets a namespace that is an extension (i.e. containing extension methods) of this node. */
+  NamespaceNode getAnExtension() {
+    result = this.getAnExtension1()
+    or
+    // `extensionStep` connects the static namespaces of classes.
+    // Add the corresponding extension relation between the instance namespaces.
+    result = this.toStaticNamespace().getAnExtension1().toInstanceNamespace()
+  }
+
+  private NamespaceNode getAnInheritanceParent1() { inheritanceStep(result.ref(), this) }
+
+  /** Gets a namespace from which this namespace inherits directly. */
+  NamespaceNode getAnInheritanceParent() {
+    result = this.getAnInheritanceParent1()
+    or
+    // `inheritanceStep` connects the static namespaces of classes.
+    // Add the corresponding inheritance relation between the instance namespaces.
+    result = this.toStaticNamespace().getAnInheritanceParent1().toInstanceNamespace()
+  }
+
+  /** Gets a namespace that directly inherits from this one. */
+  NamespaceNode getAnInheritanceChild() { result.getAnInheritanceParent() = this }
+
+  pragma[nomagic]
+  private predicate hasOwnMemberWithShadowingKey(string name, string shadowingKey) {
+    exists(this.getOwnMember(name, any(ShadowingKeyOpt opt | opt.asSome() = shadowingKey)))
+  }
+
+  /**
+   * Gets a potential member of this namespace of the given name.
+   *
+   * Unlike `getMember`, this predicate does not filter away invalid members.
+   */
+  pragma[nomagic]
+  NameBindingNode getMemberFull(string name, ShadowingKeyOpt shadowingKey) {
+    result = this.getOwnMember(name) and
+    shadowingKey = getShadowingKey(result)
+    or
+    not this.hasOwnMemberWithShadowingKey(name, shadowingKey.asSome()) and
+    result = this.getAnInheritanceParent().getMemberFull(name, shadowingKey) and
+    isInheritableMemberNode(result)
+    or
+    result = this.getAnExtension().getMemberFull(name, shadowingKey)
+  }
+
+  private NameBindingNode getMember(string name, ShadowingKeyOpt shadowingKey) {
+    CachedStage::ref() and
+    not exists(Member m | result.isMember(m) | isInvalidMember(this, m)) and
+    (
+      result = this.getOwnMember(name) and
+      shadowingKey = getShadowingKey(result)
+      or
+      result = this.getAnExtension().getMember(name, shadowingKey)
+      or
+      exists(NamespaceNode parent |
+        parent = this.getAnInheritanceParent() and
+        not this.hasOwnMemberWithShadowingKey(name, shadowingKey.asSome()) and
+        result = parent.getMember(name, shadowingKey) and
+        isInheritableMemberNode(result)
+      )
+    )
+  }
+
+  /** Gets a member of this namespace of the given name. */
+  cached
+  NameBindingNode getMember(string name) { result = this.getMember(name, _) }
+}
+
+private module TrackNamespaceInput implements TrackInputSig {
+  predicate shouldTrack(NameBindingNode node) { node instanceof NamespaceNode }
+
+  NameBindingNode getMember(NamespaceNode namespace, string name) {
+    result = namespace.getMemberFull(name, _)
+  }
+
+  predicate additionalValueStep(NameBindingNode node1, NameBindingNode node2) {
+    // Namespace-tracking goes through aliases, but declaration-tracking does not
+    exists(TypeAliasDeclaration decl |
+      node1 = getNodeFromRef(decl.getType()) and
+      node2.isIdentifier(decl.getNameNode())
+    )
+  }
+}
+
+private module TrackNamespace = Track<TrackNamespaceInput>;
+
+bindingset[node1, node2]
+pragma[inline_late]
+private predicate sameName(Identifier node1, Identifier node2) {
+  node1.getValue() = node2.getValue()
+}
+
+/**
+ * Holds if `decl` is a trivial local alias for an imported name.
+ *
+ * Declaration-tracking usually stops at type-aliases, but trivial aliases
+ * will be passed through.
+ */
+pragma[nomagic]
+predicate isTrivialNameAlias(NameBinding decl) {
+  exists(ImportDeclaration imprt |
+    decl = getImportBindingIdentifier(imprt) and
+    sameName(decl, getIdentifierFromRef(imprt.getImportedExpr()))
+  )
+}
+
+private module TrackNameBindingInput implements TrackInputSig {
+  predicate shouldTrack(NameBindingNode node) {
+    exists(NameBinding decl |
+      node.isIdentifier(decl) and
+      not isTrivialNameAlias(decl)
+    )
+  }
+}
+
+private module TrackNameBinding = Track<TrackNameBindingInput>;
+
+/** Gets a name-binding node that may refer to the given declaration. */
+private NameBindingNode trackNameBinding(NameBinding decl) {
+  exists(NameBindingNode start |
+    start.isIdentifier(decl) and
+    result = TrackNameBinding::track(start)
+  )
+}
+
+/** Holds if `node` should be included in the debug view. */
+private signature predicate relevantNodeSig(AstNode node);
+
+module DebugGraph<relevantNodeSig/1 relevantNode> {
+  private predicate relevantNameBindingNode(NameBindingNode node) {
+    relevantNode(node.getWrappedAstNode())
+    or
+    // Also consider LocalName to be relevant if any of its accesses are relevant
+    exists(LocalName name |
+      node.isLocalName(name) and
+      relevantNode(any(PotentialLocalNameAccess ac | ac.getLocalName() = name))
+    )
+    or
+    // Always include module root
+    node.isModuleRoot()
+  }
+
+  query predicate nodes(NameBindingNode node, string key, string value) {
+    relevantNameBindingNode(node) and
+    key = "semmle.label" and
+    value = node.toString()
+  }
+
+  query predicate edges(NameBindingNode node1, NameBindingNode node2, string key, string value) {
+    key = "semmle.label" and
+    relevantNameBindingNode(node1) and
+    relevantNameBindingNode(node2) and
+    (
+      valueStep(node1, node2) and value = ""
+      or
+      exists(string name |
+        readStep(node1, name, node2) and
+        value = "read(" + name + ")"
+        or
+        storeStep(node1, name, node2) and
+        value = "store(" + name + ")"
+      )
+      or
+      inheritanceStep(node1, node2) and
+      value = "inheritedBy"
+      or
+      extensionStep(node1, node2) and
+      value = "extensionOf"
+    )
+  }
+}
+
+/**
+ * Implements a folder-based heuristic for linking up top-level names
+ * between files that are not included in any module scope.
+ */
+private module FolderHeuristic {
+  private predicate topLevelNameDef(File file, string name, NameBindingNode node) {
+    exists(TopLevel top, Stmt stmt, NameBinding nameDecl |
+      top.getFile() = file and
+      stmt = top.getBody().getAStmt() and
+      not isPrivateToLocalScope(nameDecl) and
+      nameDecl.getDeclaration() = stmt and
+      name = nameDecl.getName() and
+      node.isIdentifier(nameDecl)
+    )
+  }
+
+  private predicate uniqueTopLevelName(File file, string name) {
+    file = unique(File f | topLevelNameDef(f, name, _))
+  }
+
+  /**
+   * Holds if `file` has one of the definitions of the given ambiguous name.
+   *
+   * A name is considered "ambiguous" if there is more than one file exporting it.
+   */
+  private predicate ambiguousTopLevelName(File file, string name) {
+    topLevelNameDef(file, name, _) and
+    not uniqueTopLevelName(file, name)
+  }
+
+  /** Holds if `folder` contains one or more definitions of the given ambiguous name */
+  private predicate containsDef(Folder folder, string name) {
+    exists(File f |
+      ambiguousTopLevelName(f, name) and
+      folder = f.getParentContainer+()
+    )
+  }
+
+  /**
+   * Holds if `folder` has two or more subfolders containing a definition of `name`.
+   */
+  private predicate hasConflictingDefs(Folder folder, string name) {
+    // Check for "two or more" using `exists(X) and not exists(unique(X))`
+    containsDef(folder.getAFolder(), name) and
+    not exists(unique(Folder child | child = folder.getAFolder() and containsDef(child, name)))
+  }
+
+  /**
+   * Holds if `folder` is an outermost folder containing exactly one definition of `name`.
+   *
+   * This means `folder` should act as the scope of that definition.
+   */
+  private predicate isOutermostNonConflictingScope(Folder folder, string name) {
+    containsDef(folder, name) and
+    hasConflictingDefs(folder.getParentContainer(), name) and
+    not hasConflictingDefs(folder, name)
+  }
+
+  /**
+   * Gets the scope into which a definition of `name` appearing in `folder` should target.
+   */
+  private Folder getOutermostNonConflictingScope(Folder folder, string name) {
+    isOutermostNonConflictingScope(folder, name) and
+    result = folder
+    or
+    result = getOutermostNonConflictingScope(folder.getParentContainer(), name) and
+    containsDef(folder, name) // Prune to the subfolder actually containing the definition
+  }
+
+  predicate storeStep(NameBindingNode node1, string name, NameBindingNode node2) {
+    exists(File file | topLevelNameDef(file, name, node1) |
+      node2.isFolderScope(getOutermostNonConflictingScope(file.getParentContainer(), name))
+      or
+      uniqueTopLevelName(file, name) and
+      node2.isFolderScope(any(Folder f | f.getRelativePath() = ""))
+    )
+  }
+
+  predicate valueStep(NameBindingNode node1, NameBindingNode node2) {
+    exists(TopLevel top |
+      node1.isFolderScope(top.getFile().getParentContainer()) and
+      node2.isLocalNamespace(top.getBody()) and
+      not top.getFile() = any(ModuleScopeRepr r).getAnIncludedFile()
+    )
+    or
+    exists(Folder folder |
+      node1.isFolderScope(folder.getParentContainer()) and
+      node2.isFolderScope(folder)
+    )
+  }
+}
+
+private ClassLikeDeclaration resolveExtensionTarget(ClassLikeDeclaration cls) {
+  trackNameBinding(result.getNameNode()) = getNodeFromRef(cls.getExtensionTarget())
+}
+
+private ClassLikeDeclaration tryResolveExtensionTarget(ClassLikeDeclaration cls) {
+  result = resolveExtensionTarget(cls)
+  or
+  not exists(resolveExtensionTarget(cls)) and
+  result = cls
+}
+
+/**
+ * Holds if `access` may resolve to `target` through the enclosing `accessingClass`.
+ *
+ * `instanceAccess` indicates whether this member should be accessed as an instance of `accessingClass`
+ * or as a static member.
+ */
+private predicate unqualifiedMemberAccessCand(
+  PotentialLocalNameAccess access, boolean instanceAccess, NameBinding target,
+  ClassLikeDeclaration accessingClass
+) {
+  not access instanceof NameBinding and
+  (
+    // Resolved by local scoping
+    exists(LocalName local |
+      target.getLocalName() = local and
+      access.getLocalName() = local and
+      target.getDeclaration() = accessingClass.getAMember()
+    |
+      instanceAccess = true and
+      isInstanceMember(target.getDeclaration())
+      or
+      instanceAccess = false and
+      isStaticMember(target.getDeclaration())
+    )
+    or
+    // Resolved in an uncertain scope
+    exists(NamespaceNode namespace, string name |
+      name = access.getName() and
+      accessingClass =
+        tryResolveExtensionTarget(LocalNameBindingOutput::getAnUncertainScope(access, name))
+    |
+      instanceAccess = true and
+      namespace.isInstanceMemberNamespace(accessingClass) and
+      namespace.getMember(name).isIdentifier(target)
+      or
+      instanceAccess = false and
+      namespace.isStaticMemberNamespace(accessingClass) and
+      namespace.getMember(name).isIdentifier(target)
+    )
+  )
+}
+
+private int unqualifiedMemberAccessDepth(PotentialLocalNameAccess access) {
+  result = max(AstNode scope | unqualifiedMemberAccessCand(access, _, _, scope) | scope.getDepth())
+}
+
+/**
+ * Holds if `access` is an unqualified access to `target`.
+ *
+ * `accessingClass` is the enclosing class in which the member was found, and
+ * `instanceAccess` indicates if it is an instance member or static member.
+ */
+cached
+predicate unqualifiedMemberAccess(
+  PotentialLocalNameAccess access, boolean instanceAccess, NameBinding target,
+  ClassLikeDeclaration accessingClass
+) {
+  CachedStage::ref() and
+  unqualifiedMemberAccessCand(pragma[only_bind_into](access), instanceAccess, target,
+    pragma[only_bind_into](accessingClass)) and
+  accessingClass.getDepth() = unqualifiedMemberAccessDepth(access)
+}
+
+module Public {
+  /**
+   * An expression that accesses a named member, either with an explicit base (`MemberAccessExpr`)
+   * or with an implicit base (`UnqualifiedMemberAccess`).
+   */
+  abstract private class MemberAccessImpl extends Expr {
+    /** Gets the name of the member being accessed. */
+    abstract string getMemberName();
+  }
+
+  final class MemberAccess = MemberAccessImpl;
+
+  private class MemberAccessExprImpl extends MemberAccessImpl instanceof MemberAccessExpr {
+    override string getMemberName() { result = MemberAccessExpr.super.getMemberName() }
+  }
+
+  /**
+   * A name node appearing in an unqualified position, referring to a member of an enclosing class.
+   */
+  class UnqualifiedMemberAccess extends Identifier, MemberAccessImpl {
+    private boolean instanceAccess;
+    private NameBinding target;
+    private ClassLikeDeclaration accessingClass;
+
+    UnqualifiedMemberAccess() {
+      unqualifiedMemberAccess(this, instanceAccess, target, accessingClass)
+    }
+
+    /** Gets the name binding of the member being accessed. */
+    NameBinding getTarget() { result = target }
+
+    /** Gets the enclosing class whose (possibly inherited) member is being accessed. */
+    ClassLikeDeclaration getAccessingClass() { result = accessingClass }
+
+    /** Holds if this is an instance access on the accessing class. */
+    predicate isInstanceAccess() { instanceAccess = true }
+
+    /** Gets the local variable implicitly referenced as the base of this access. */
+    cached
+    LocalVariable getImplicitQualifierVariable() {
+      ResolveImplicitReceiverAccess::access(this, result)
+    }
+
+    /** Gets the simple name of this identifier, that is, the name of the member being accessed. */
+    override string getMemberName() { result = this.getValue() }
+  }
+}
+
+/** Gets the declaration being accessed by identifier `i`, as determined by static name binding. */
+cached
+NameBinding getStaticBindingTargetFromIdentifier(Identifier i) {
+  CachedStage::ref() and
+  // For unqualified accesses, use the shadowing-aware lookup
+  result = i.(UnqualifiedMemberAccess).getTarget()
+  or
+  // For others, just follow the name binding graph
+  not i instanceof UnqualifiedMemberAccess and
+  trackNameBinding(result).asIdentifier() = i
+}
+
+/**
+ * Gets the declaration being accessed by `access`, as determined by static name binding.
+ *
+ * Unlike `getStaticBindingTargetFromIdentifier`, this works with any AST node that contains
+ * a reference to an identifier, for example `x.foo` and `foo<Int>` resolve to whatever the
+ * identifiers `foo` resolve to.
+ */
+NameBinding getStaticBindingTargetFromRef(AstNode access) {
+  result = getStaticBindingTargetFromIdentifier(getIdentifierFromRef(access))
+}
+
+/**
+ * Gets the type being accessed by `access`, if any.
+ */
+Identifier getTypeFromRef(AstNode access) {
+  result = getStaticBindingTargetFromRef(access) and
+  (
+    result = any(ClassLikeDeclaration c).getNameNode()
+    or
+    result = any(TypeAliasDeclaration t).getNameNode()
+    or
+    result = any(TypeParameter t).getNameNode()
+    or
+    result = any(AssociatedTypeDeclaration t).getNameNode()
+  )
+}
+
+/**
+ * Gets the name of the implicit receiver parameter in scope at `callable` (possibly declared by an outer callable).
+ *
+ * Note that we only propagate the name, not the LocalVariable, since capture-declarations and Swift's `guard let self` statements
+ * may re-introduce a new binding for `self`, which becomes the one referenced by subsequent unqualified member accesses.
+ */
+private string getEnclosingReceiverParameterName(Callable callable) {
+  result = any(NameBindingPlugin p).getImplicitReceiverParameterName(callable)
+  or
+  not exists(any(NameBindingPlugin p).getImplicitReceiverParameterName(callable)) and
+  result = getEnclosingReceiverParameterName(callable.getEnclosingCallable())
+}
+
+/** Holds if `access` contains a reference to the implicit receiver parameter `name`. */
+private predicate implicitReceiverAccess(AstNode access, string name) {
+  name = getEnclosingReceiverParameterName(access.(UnqualifiedMemberAccess).getEnclosingCallable())
+}
+
+private module ResolveImplicitReceiverAccess =
+  LocalNameBindingOutput::ResolveAccesses<implicitReceiverAccess/2>;
+
+cached
+private module CachedStage {
+  /** Reference to the cached stage of this module. */
+  cached
+  predicate ref() { any() }
+
+  /** Reverse references to the predicates that reference `ref()`. */
+  cached
+  predicate revRef() {
+    any()
+    or
+    (exists(NameBindingNode n) implies any())
+    or
+    (exists(any(NamespaceNode n).getMember(_)) implies any())
+    or
+    (unqualifiedMemberAccess(_, _, _, _) implies any())
+    or
+    (exists(any(UnqualifiedMemberAccess u).getImplicitQualifierVariable()) implies any())
+    or
+    (exists(getStaticBindingTargetFromIdentifier(_)) implies any())
+  }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/Variables.qll b/unified/ql/lib/codeql/unified/internal/Variables.qll
deleted file mode 100644
index 49cad56d05db..000000000000
--- a/unified/ql/lib/codeql/unified/internal/Variables.qll
+++ /dev/null
@@ -1,277 +0,0 @@
-/**
- * Provides classes for reasoning about lexically scoped variables and references to these.
- */
-
-private import unified
-private import unified as U
-private import codeql.namebinding.LocalNameBinding
-
-private module LocalNameBindingInput implements LocalNameBindingInputSig<Location> {
-  class AstNode = U::AstNode;
-
-  private class LogicalAndRoot extends LogicalAndExpr {
-    LogicalAndRoot() { not this = any(LogicalAndExpr e).getAnOperand() }
-
-    private Expr getDescendant(string path) {
-      path = "" and result = this
-      or
-      exists(LogicalAndExpr mid, string midPath | mid = this.getDescendant(midPath) |
-        result = mid.getLeft() and path = midPath + "A"
-        or
-        result = mid.getRight() and path = midPath + "B"
-      )
-    }
-
-    Expr getNthLeaf(int n) {
-      result =
-        rank[n](Expr e, string path |
-          e = this.getDescendant(path) and not e instanceof LogicalAndExpr
-        |
-          e order by path
-        )
-    }
-
-    Expr getLastLeaf() { result = max(int n | | this.getNthLeaf(n) order by n) }
-  }
-
-  private class BlockWithGuardStmts extends Block {
-    BlockWithGuardStmts() { this.getStmt(_) instanceof GuardIfStmt }
-
-    AstNode getTranslatedChild(int n) {
-      result =
-        rank[n](AstNode stmt, AstNode child, int i1, int i2 |
-          stmt = this.getStmt(i1) and
-          (
-            child = stmt.(GuardIfStmt).getCondition().(LogicalAndRoot).getNthLeaf(i2)
-            or
-            child = stmt.(GuardIfStmt).getCondition() and
-            not child instanceof LogicalAndExpr and
-            i2 = 0
-            or
-            child = stmt.(GuardIfStmt).getElse() and
-            i2 = -1 // place before condition so its variables are not seen
-            or
-            not stmt instanceof GuardIfStmt and
-            child = stmt and
-            i2 = 0
-          )
-        |
-          child order by i1, i2
-        )
-    }
-  }
-
-  private AstNode getChild1(AstNode n, int index) {
-    result = n.(Block).getStmt(index) and
-    not n instanceof BlockWithGuardStmts
-    or
-    result = n.(BlockWithGuardStmts).getTranslatedChild(index)
-    or
-    result = n.(LogicalAndRoot).getNthLeaf(index)
-    or
-    exists(PatternGuardExpr guard | n = guard |
-      index = 0 and result = guard.getPattern()
-      or
-      index = 1 and result = guard.getValue()
-    )
-    or
-    exists(IfExpr expr | n = expr |
-      index = 0 and result = expr.getCondition()
-      or
-      index = 1 and result = expr.getThen()
-      or
-      index = 2 and result = expr.getElse()
-    )
-    or
-    exists(VariableDeclaration decl | n = decl |
-      index = 0 and result = decl.getPattern()
-      or
-      index = 1 and result = decl.getType()
-      or
-      index = 2 and result = decl.getValue()
-    )
-  }
-
-  AstNode getChild(AstNode n, int index) {
-    result = getChild1(n, index)
-    or
-    not exists(getChild1(n, _)) and
-    not n instanceof LogicalAndExpr and // also ignore intermediate nodes within a 'logical and' tree
-    not n instanceof GuardIfStmt and
-    index = 0 and
-    result = n.getAFieldOrChild()
-  }
-
-  abstract class Conditional extends AstNode {
-    /** Gets the condition of this conditional. */
-    abstract AstNode getCondition();
-
-    /** Gets the then-branch of this conditional. */
-    abstract AstNode getThen();
-
-    /** Gets the else-branch of this conditional. */
-    abstract AstNode getElse();
-  }
-
-  private class IfExprConditional extends Conditional instanceof IfExpr {
-    override AstNode getCondition() { result = IfExpr.super.getCondition() }
-
-    override AstNode getThen() { result = IfExpr.super.getThen() }
-
-    override AstNode getElse() { result = IfExpr.super.getElse() }
-  }
-
-  private class WhileStmtConditional extends Conditional instanceof WhileStmt {
-    override AstNode getCondition() { result = WhileStmt.super.getCondition() }
-
-    override AstNode getThen() { result = WhileStmt.super.getBody() }
-
-    override AstNode getElse() { none() }
-  }
-
-  abstract class SiblingShadowingDecl extends AstNode {
-    /**
-     * Gets the right-hand side of this declaration.
-     *
-     * Any local declared in the left-hand side of this declaration is _not_ in scope
-     * in the right-hand side.
-     */
-    abstract AstNode getRhs();
-
-    /**
-     * Gets the else-branch of this declaration, if any.
-     *
-     * Any local declared in the left-hand side of this declaration is _not_ in scope
-     * in the else-branch.
-     */
-    abstract AstNode getElse();
-  }
-
-  private class LocalVariableDeclarationSiblingShadowingDecl extends SiblingShadowingDecl instanceof LocalVariableDeclaration
-  {
-    override AstNode getRhs() { result = LocalVariableDeclaration.super.getValue() }
-
-    override AstNode getElse() { none() }
-  }
-
-  private class PatternGuardExprSiblingShadowingDecl extends SiblingShadowingDecl instanceof PatternGuardExpr
-  {
-    override AstNode getRhs() { result = PatternGuardExpr.super.getValue() }
-
-    override AstNode getElse() { none() }
-  }
-
-  private predicate bindingContext(AstNode pattern, AstNode scope) {
-    exists(LocalVariableDeclaration decl |
-      scope = decl and // LocalVariableDeclaration is a ShadowingSiblingDecl, it must use itself as the scope
-      pattern = decl.getPattern()
-    )
-    or
-    exists(LocalFunctionDeclaration func |
-      scope = func.getDeclaringBlock() and
-      pattern = func.getName()
-    )
-    or
-    exists(Parameter param |
-      scope = param.getParent() and // TODO: add SourceCallable and use .getParameter() instead
-      pattern = param.getPattern()
-    )
-    or
-    exists(CatchClause catch |
-      scope = catch and // ensure both body and pattern are in scope
-      pattern = catch.getPattern()
-    )
-    or
-    exists(SwitchCase case |
-      scope = case and // ensure both body and pattern are in scope
-      pattern = case.getPattern()
-    )
-    or
-    exists(ForEachStmt stmt |
-      scope = stmt and // ensure both 'body' and 'guard' are in scope
-      pattern = stmt.getPattern()
-    )
-    or
-    bindingContext(pattern.(Pattern).getEnclosingPattern(), scope)
-    or
-    exists(PatternGuardExpr expr |
-      pattern = expr.getPattern() and
-      scope = expr
-    )
-  }
-
-  /**
-   * Gets the nearest enclosing `OrPattern` to which variable bindings in `p` should be lifted.
-   *
-   * To ensure that `case .foo(let x), .bar(let x)` result in a single definition for
-   * the variable `x`, the `OrPattern` becomes the `definingNode` for `x`.
-   *
-   * At the moment no further checks are needed since the Swift compiler enforces that
-   * variable names bound in any branch are bound in all branches.
-   */
-  private OrPattern getEnclosingOrPattern(Pattern p) {
-    p = result.getPattern(_)
-    or
-    not p instanceof OrPattern and
-    result = getEnclosingOrPattern(p.getEnclosingPattern())
-  }
-
-  predicate declInScope(AstNode definingNode, string name, AstNode scope) {
-    exists(AstNode pattern |
-      bindingContext(pattern, scope) and
-      (
-        pattern.(NamePattern).getIdentifier().getValue() = name
-        or
-        pattern.(Identifier).getValue() = name
-      ) and
-      (
-        definingNode = getEnclosingOrPattern(pattern)
-        or
-        not exists(getEnclosingOrPattern(pattern)) and
-        definingNode = pattern
-      )
-    )
-  }
-
-  predicate implicitDeclInScope(string name, AstNode scope) {
-    none()
-    // TODO: self
-  }
-
-  predicate accessCand(AstNode n, string name) {
-    n.(NameExpr).getIdentifier().getValue() = name
-    or
-    n.(NamePattern).getIdentifier().getValue() = name
-    or
-    n = any(LocalFunctionDeclaration f).getName() and
-    n.(Identifier).getValue() = name
-  }
-}
-
-module LocalNameBindingOutput = LocalNameBinding<Location, LocalNameBindingInput>;
-
-module Public {
-  /**
-   * A local variable.
-   */
-  class Variable extends LocalNameBindingOutput::Local {
-    VariableAccess getAnAccess() { result.getVariable() = this }
-  }
-
-  /**
-   * An AST node that is a reference to a local variable.
-   */
-  class VariableAccess extends AstNode instanceof LocalNameBindingOutput::LocalAccess {
-    Variable getVariable() { result = super.getLocal() }
-
-    Identifier getIdentifier() {
-      result = this.(NameExpr).getIdentifier()
-      or
-      result = this.(NamePattern).getIdentifier()
-      or
-      result = this
-    }
-
-    string getName() { result = this.getIdentifier().getValue() }
-  }
-}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/AllDataFlow.qll b/unified/ql/lib/codeql/unified/internal/dataflow/AllDataFlow.qll
new file mode 100644
index 000000000000..09a148da369b
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/AllDataFlow.qll
@@ -0,0 +1,19 @@
+/** Re-exports all the files in the internal dataflow folder (except DataFlowPublic). */
+
+import CallGraph
+import CaptureSsa
+import Content
+import ConstructorPatterns
+import DataFlowCall
+import DataFlowCallable
+import DataFlowGraph
+import DataFlowInstantiation
+import DataFlowNode
+import DataFlowPlugin
+import FlowSummary
+import LocalSsa
+import ParameterPositions
+import Step
+import TaintTrackingInstantiation
+import VariableRefKind
+import LocalVariableRefNode
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/CallGraph.qll b/unified/ql/lib/codeql/unified/internal/dataflow/CallGraph.qll
new file mode 100644
index 000000000000..b035a03c817a
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/CallGraph.qll
@@ -0,0 +1,15 @@
+private import unified
+private import AllDataFlow
+private import codeql.unified.internal.typeinference.TypeInference as T
+private import codeql.unified.internal.NameBinding as N
+private import codeql.unified.internal.ExprPositions
+
+DataFlowCallable viableCallable(DataFlowCall c) {
+  result.asSourceCallable() = T::resolveCallTarget(c.asExplicitCall())
+  or
+  result.asSourceCallable() = T::resolveAccessorAccess(c.asGetterCall()).(GetterDeclaration)
+  or
+  result.asSourceCallable() = T::resolveAccessorAccess(c.asSetterCall()).(SetterDeclaration)
+  or
+  result.asSummarizedCallable().matchesCall(c.asExplicitCall())
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/CaptureSsa.qll b/unified/ql/lib/codeql/unified/internal/dataflow/CaptureSsa.qll
new file mode 100644
index 000000000000..1e0103469370
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/CaptureSsa.qll
@@ -0,0 +1,182 @@
+/**
+ * SSA for captured variables.
+ */
+
+private import unified
+private import unified as U
+private import AllDataFlow
+private import codeql.dataflow.VariableCapture
+private import codeql.unified.internal.ControlFlowGraph
+private import codeql.unified.internal.ExprPositions
+
+module CaptureSsaInput implements InputSig<Location, BasicBlock> {
+  final private class FinalCallable = U::Callable;
+
+  class Callable extends FinalCallable {
+    Callable() { this.fromSource() }
+
+    predicate isConstructor() { none() } // TODO
+  }
+
+  Callable basicBlockGetEnclosingCallable(BasicBlock bb) { result = bb.getEnclosingCallable() }
+
+  class CapturedVariable extends LocalVariable {
+    CapturedVariable() { this.isCaptured() and not this instanceof ComputedLocalVariable }
+
+    Callable getCallable() { result = super.getDeclaringCallable() }
+  }
+
+  class CapturedParameter extends CapturedVariable {
+    // This class should be empty, as the capture library never gets to work with a node that corresponds to a `DataFlowInput::ParameterNode`.
+    //
+    // When a variable is mentioned in a pattern in the parameter list, the pattern itself (TValueNode) becomes the ParameterNode
+    // and the assignment to the variable is modeled as an ordinary variable-assignment at the point where the variable mention appears in the CFG.
+    // Likewise, the receiver is represented by TImplicitParameterNode and its assignment to 'self/this' is modeled as an ordinary assignment.
+    CapturedParameter() { none() }
+  }
+
+  private predicate isTopLevelCallable(BuilderNode callable) {
+    callable.isCallable(any(TopLevel t))
+  }
+
+  class Expr extends Stage2Node {
+    Expr() { not isTopLevelCallable(this) }
+
+    predicate hasCfgNode(BasicBlock bb, int i) { this.hasControlFlowPosition(bb, i) }
+  }
+
+  final private class FinalLocalVariableRefNode = LocalVariableRefNode;
+
+  class VariableWrite extends FinalLocalVariableRefNode {
+    VariableWrite() {
+      this.getRefKind().isWrite() and super.getVariable() instanceof CapturedVariable
+    }
+
+    CapturedVariable getVariable() { result = super.getVariable() }
+  }
+
+  class VariableRead extends Expr instanceof LocalVariableRefNode {
+    VariableRead() {
+      super.getVariable() instanceof CapturedVariable and
+      super.getRefKind().isRead()
+    }
+
+    CapturedVariable getVariable() { result = super.getVariable() }
+  }
+
+  /**
+   * Holds if `node` is a possible alias for `callable`.
+   */
+  private predicate callableHasLocalAlias(Callable callable, Stage2Node node) {
+    node.(BuilderNode).isCallable(callable)
+    or
+    exists(Stage2Node prev | callableHasLocalAlias(callable, prev) |
+      step(prev, any(Step s | s.value() or s.valueMustFlow() or s.callGraph()), node)
+      or
+      localSsaStep(prev, node, _)
+    )
+    or
+    exists(CapturedVariable var |
+      callableHasLocalAliasVar(callable, var) and
+      node.(BuilderNode).isLocalVariableRead(_, var)
+    )
+  }
+
+  pragma[nomagic]
+  private predicate callableHasLocalAliasVar(Callable callable, CapturedVariable var) {
+    exists(BuilderNode ref |
+      callableHasLocalAlias(callable, ref) and
+      ref.isLocalVariableWrite(_, var)
+    )
+  }
+
+  private predicate isEscape(BuilderNode node) {
+    node.isResultValue(any(Argument arg).getValue())
+    or
+    node.isSetterValueArgument(_)
+    or
+    node.isImplicitArgument(_, _, _)
+    or
+    exists(U::Expr e |
+      isReturnedExpr(_, e) and
+      node.isResultValue(e)
+    )
+    or
+    step(node, any(Step s | s.store(_)), _)
+  }
+
+  class ClosureExpr extends Expr instanceof TCallableNode {
+    // TODO: In order to support classes with captures, this needs to cover constructor calls to such classes as well.
+    private Callable callable;
+
+    ClosureExpr() { this.(BuilderNode).isCallable(callable) }
+
+    predicate hasBody(Callable body) { callable = body }
+
+    predicate hasAliasedAccess(Expr f) {
+      callableHasLocalAlias(callable, f) and
+      isEscape(f)
+    }
+  }
+}
+
+module CaptureSsaOutput = Flow<Location, Cfg, CaptureSsaInput>;
+
+Node getNodeFromCaptureSsaNode(CaptureSsaOutput::ClosureNode n) {
+  result = TCaptureSsaNode(n)
+  or
+  result = n.(CaptureSsaOutput::ExprNode).getExpr()
+  or
+  result = n.(CaptureSsaOutput::ExprPostUpdateNode).getExpr().(BuilderNode).getPostUpdateNode()
+  or
+  result = n.(CaptureSsaOutput::VariableWriteSourceNode).getVariableWrite()
+  or
+  // NOTE: This only supports lambdas at the moment. Local classes in Swift cannot capture variables.
+  result = n.(CaptureSsaOutput::MallocNode).getClosureExpr()
+  or
+  exists(CaptureSsaOutput::ThisParameterNode thisParam, Callable callable |
+    n = thisParam and
+    callable = thisParam.getCallable() and
+    result
+        .(BuilderNode)
+        .isImplicitParameter(toDataFlowCallable(callable), any(ParameterPosition p | p.isCallee()))
+  )
+}
+
+CaptureSsaOutput::ClosureNode getCaptureSsaNodeFromNode(Node n) {
+  n = getNodeFromCaptureSsaNode(result)
+}
+
+predicate captureSsaLocalFlowStep(Node node1, Node node2) {
+  CaptureSsaOutput::localFlowStep(getCaptureSsaNodeFromNode(node1), getCaptureSsaNodeFromNode(node2))
+}
+
+predicate captureSsaStoreStep(Node node1, ContentSet contents, Node node2) {
+  CaptureSsaOutput::storeStep(getCaptureSsaNodeFromNode(node1),
+    contents.asSingleton().asCapturedVariable(), getCaptureSsaNodeFromNode(node2))
+}
+
+predicate captureSsaReadStep(Node node1, ContentSet contents, Node node2) {
+  CaptureSsaOutput::readStep(getCaptureSsaNodeFromNode(node1),
+    contents.asSingleton().asCapturedVariable(), getCaptureSsaNodeFromNode(node2))
+}
+
+predicate captureSsaClearsContent(Node node, ContentSet contents) {
+  CaptureSsaOutput::clearsContent(getCaptureSsaNodeFromNode(node),
+    contents.asSingleton().asCapturedVariable())
+}
+
+Node getCaptureSsaPostUpdate(Node pre) {
+  CaptureSsaOutput::capturePostUpdateNode(getCaptureSsaNodeFromNode(result),
+    getCaptureSsaNodeFromNode(pre))
+}
+
+predicate captureSsaAllowParameterReturnInSelf(Node param) {
+  exists(Callable callable |
+    CaptureSsaOutput::heuristicAllowInstanceParameterReturnInSelf(callable) and
+    param =
+      getNodeFromCaptureSsaNode(any(CaptureSsaOutput::ThisParameterNode n |
+          n.getCallable() = callable
+        ))
+  )
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/ConstructorPatterns.qll b/unified/ql/lib/codeql/unified/internal/dataflow/ConstructorPatterns.qll
new file mode 100644
index 000000000000..a1b242f1fef3
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/ConstructorPatterns.qll
@@ -0,0 +1,75 @@
+/**
+ * Provides data-flow modelling of constructor patterns / enum-case constructors.
+ */
+
+private import unified
+private import AllDataFlow
+private import codeql.unified.internal.ExprPositions
+private import codeql.unified.internal.NameBinding as NameBinding
+private import codeql.unified.internal.typeinference.TypeInference as T
+
+/**
+ * A constructor pattern, such as `Optional.some(let x)`.
+ */
+class ConstructorPattern extends CallExpr {
+  ConstructorPattern() { isInBindingContext(this, _) }
+}
+
+/**
+ * Gets the unqualified name of the enum-case constructor that might be referenced by `call`.
+ */
+private string getShortConstructorName(CallExpr call) {
+  result = call.getCallee().(MemberAccessExpr).getMemberName()
+  // note: enum constructors can only be accessed qualified (possibly with leading-dot syntax)
+  // so do not do this for Identifiers
+}
+
+/**
+ * Holds if `call` targets a member called `name` and has the given `arity`.
+ */
+pragma[nomagic]
+private predicate callSiteHasSignature(CallExpr call, string name, int arity) {
+  name = call.getCallee().(MemberAccessExpr).getMemberName() and
+  arity = call.getNumberOfArguments()
+}
+
+/**
+ * Holds if a constructor pattern has the given short `name` and `arity`.
+ */
+pragma[nomagic]
+private predicate isSignatureUsedInConstructorPattern(string name, int arity) {
+  callSiteHasSignature(any(ConstructorPattern p), name, arity)
+}
+
+/**
+ * Holds if `call` resolves to a known enum-case constructor, or is assumed to resolve to an unseen enum-case constructor.
+ */
+pragma[nomagic]
+private predicate assumeResolvesToEnumCaseConstructor(CallExpr call) {
+  call instanceof ConstructorPattern
+  or
+  T::resolveCallTarget(call) instanceof EnumCaseConstructor
+  or
+  // If the `E` in `E.foo(...)` could not be resolved, check if the name `foo` matches a constructor pattern.
+  exists(MemberAccessExpr callee, Expr base, string name, int arity |
+    callee = call.getCallee() and
+    base = callee.getBase() and
+    not exists(NameBinding::getStaticBindingTargetFromRef(base)) and
+    not exists(T::inferType(base)) and
+    callSiteHasSignature(call, name, arity) and
+    isSignatureUsedInConstructorPattern(name, arity)
+  )
+}
+
+/**
+ * Gets the field name for the enum-case data parameter corresponding to the given argument.
+ */
+string getEnumCaseParameterFieldFromArgument(CallExpr call, Argument arg) {
+  assumeResolvesToEnumCaseConstructor(call) and
+  exists(int i |
+    // Note: The label name is optional when calling an enum-case constructor, but the arguments
+    // must occur in declaration order, so use the raw argument index to handle both the labelled and unlabelled cases.
+    arg = call.getArgument(i) and
+    result = getShortConstructorName(call) + "." + i
+  )
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/Content.qll b/unified/ql/lib/codeql/unified/internal/dataflow/Content.qll
new file mode 100644
index 000000000000..ecb69457783d
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/Content.qll
@@ -0,0 +1,64 @@
+private import unified
+private import AllDataFlow
+
+/**
+ * Holds if a MaD access path token of form `name[arg]` exists.
+ */
+predicate isAccessPathTokenPresent(string name, string arg) {
+  arg = any(FlowSummaryOutput::Private::AccessPathToken tok).getAnArgument(name)
+}
+
+private newtype TContent =
+  TArrayElement() or
+  TNamedMember(string name) {
+    name = any(Identifier id).getValue()
+    or
+    // Tuple elements can be accessed as named members, e.g. `tuple.0`, `tuple.1`, etc,
+    // so just model their elements as named members.
+    name = [0 .. 20].toString()
+    or
+    name = getEnumCaseParameterFieldFromArgument(_, _)
+    or
+    isAccessPathTokenPresent("Member", name)
+  } or
+  TCapturedVariable(CaptureSsaInput::CapturedVariable v)
+
+class Content extends TContent {
+  string asNamedMember() { this = TNamedMember(result) }
+
+  predicate isArrayElement() { this = TArrayElement() }
+
+  string toString() {
+    result = this.asNamedMember()
+    or
+    this.isArrayElement() and result = "ArrayElement"
+    or
+    result = this.asCapturedVariable().toString()
+  }
+
+  LocalVariable asCapturedVariable() { this = TCapturedVariable(result) }
+
+  Location getLocation() { result = this.asCapturedVariable().getLocation() }
+}
+
+private newtype TContentSet = TSingleton(Content content)
+
+class ContentSet extends TContentSet {
+  Content asSingleton() { this = TSingleton(result) }
+
+  string toString() { result = this.asSingleton().toString() }
+
+  Location getLocation() { result = this.asSingleton().getLocation() }
+
+  Content getAStoreContent() { result = this.asSingleton() }
+
+  Content getAReadContent() { result = this.asSingleton() }
+}
+
+module ContentSet {
+  ContentSet namedMember(string name) { result.asSingleton().asNamedMember() = name }
+
+  ContentSet arrayElement() { result.asSingleton().isArrayElement() }
+
+  ContentSet capturedVariable(LocalVariable v) { result.asSingleton().asCapturedVariable() = v }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowCall.qll b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowCall.qll
new file mode 100644
index 000000000000..3d4b32e191fc
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowCall.qll
@@ -0,0 +1,87 @@
+private import unified
+private import AllDataFlow
+private import codeql.unified.internal.ExprPositions
+private import codeql.unified.internal.NameBinding as N
+private import codeql.unified.internal.typeinference.TypeInference as T
+
+private newtype TDataFlowCall =
+  TExplicitCall(CallExpr call) {
+    not isInBindingContext(call, _) // ignore constructor patterns
+  } or
+  TGetterCall(Expr expr) {
+    hasResultValue(expr) and
+    T::resolveAccessorAccess(expr) instanceof GetterDeclaration
+  } or
+  TSetterCall(Expr expr) {
+    (
+      isInAssignmentContext(expr, _)
+      or
+      // Write back a value that was mutated in-place, such as `x.p` in `x.p.f = y`
+      hasPostUpdateAfterCallOrAssign(expr, _) and
+      mayWriteBackViaSetterCall(expr)
+    ) and
+    T::resolveAccessorAccess(expr) instanceof SetterDeclaration
+  } or
+  TSummaryCall(SummarizedCallable callable, SummaryNode callee) {
+    FlowSummaryOutput::summaryCallbackRange(callable, callee)
+  }
+
+/**
+ * A call site, covering explicit calls such as `foo(1,2)`, as well as implicit
+ * calls and calls derived from library models.
+ *
+ * Currently only explicit calls are implemented.
+ */
+class DataFlowCall extends TDataFlowCall {
+  /** Gets the `CallExpr` wrapped by this dataflow call, if any. */
+  CallExpr asExplicitCall() { this = TExplicitCall(result) }
+
+  /** Gets the member/variable access for which this represents the call to a getter. */
+  Expr asGetterCall() { this = TGetterCall(result) }
+
+  /** Gets the member/variable access for which this represents the call to a setter. */
+  Expr asSetterCall() { this = TSetterCall(result) }
+
+  /** Holds if this is a synthesized call to `callee` in `callable`. */
+  predicate isSummaryCall(SummarizedCallable callable, SummaryNode callee) {
+    this = TSummaryCall(callable, callee)
+  }
+
+  /** Gets a textual representation of this call. */
+  string toString() {
+    result = this.asExplicitCall().toString()
+    or
+    result = "[getter call] " + this.asGetterCall().toString()
+    or
+    result = "[setter call] " + this.asSetterCall().toString()
+    or
+    exists(SummarizedCallable callable, SummaryNode callee |
+      this.isSummaryCall(callable, callee) and
+      result = "[summary] call to " + callee.toString() + " in " + callable.toString()
+    )
+  }
+
+  /** Gets the location of this call, if any. */
+  Location getLocation() {
+    result = this.asExplicitCall().getLocation()
+    or
+    result = this.asGetterCall().getLocation()
+    or
+    result = this.asSetterCall().getLocation()
+    or
+    this.isSummaryCall(_, _) and result instanceof EmptyLocation
+  }
+
+  /** Gets the callable containing this call. */
+  DataFlowCallable getEnclosingCallable() {
+    result.asSourceCallable() = this.asExplicitCall().getEnclosingCallable()
+    or
+    result.asSourceCallable() = this.asGetterCall().getEnclosingCallable()
+    or
+    result.asSourceCallable() = this.asSetterCall().getEnclosingCallable()
+    or
+    this.isSummaryCall(result.asSummarizedCallable(), _)
+  }
+}
+
+DataFlowCall toDataFlowCall(CallExpr call) { result.asExplicitCall() = call }
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowCallable.qll b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowCallable.qll
new file mode 100644
index 000000000000..7b4135a1a967
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowCallable.qll
@@ -0,0 +1,36 @@
+private import unified
+private import AllDataFlow
+private import codeql.unified.internal.ExprPositions
+
+private newtype TDataFlowCallable =
+  TSourceCallable(Callable callable) { not isInTypeContext(callable) } or
+  TSummarizedCallable(SummarizedCallable callable)
+
+/**
+ * A callable entity: either a function-like entity in source code or
+ * an entity derived from a library model.
+ *
+ * Currently only callables in source code are implemented.
+ */
+class DataFlowCallable extends TDataFlowCallable {
+  /** Gets the `Callable` wrapped by this dataflow callable, if any. */
+  Callable asSourceCallable() { this = TSourceCallable(result) }
+
+  /** Gets the `SummarizedCallable` wrapped by this dataflow callable, if any. */
+  SummarizedCallable asSummarizedCallable() { this = TSummarizedCallable(result) }
+
+  /** Gets a string representation of this call. */
+  string toString() {
+    result = this.asSourceCallable().toString() or
+    result = this.asSummarizedCallable().toString()
+  }
+
+  /** Gets the location of this call, if any. */
+  Location getLocation() {
+    result = this.asSourceCallable().getLocation()
+    or
+    this instanceof TSummarizedCallable and result instanceof EmptyLocation
+  }
+}
+
+DataFlowCallable toDataFlowCallable(Callable callable) { result.asSourceCallable() = callable }
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowGraph.qll b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowGraph.qll
new file mode 100644
index 000000000000..d804e790b7a7
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowGraph.qll
@@ -0,0 +1,321 @@
+private import unified
+private import AllDataFlow
+private import codeql.unified.internal.LocalNameBinding
+private import codeql.unified.internal.ExprPositions
+
+predicate step(BuilderNode node1, Step step, BuilderNode node2) {
+  any(DataFlowPlugin p).step(node1, step, node2)
+  or
+  exists(Expr expr1, Expr expr2, boolean mustFlow |
+    any(DataFlowPlugin p).exprStep(expr1, expr2, mustFlow)
+  |
+    node1.isResultValue(expr1) and
+    (if mustFlow = true then step.valueMustFlow() else step.value()) and
+    node2.isResultValue(expr2)
+    or
+    node1.isPostUpdate(expr2) and
+    step.value() and
+    node2.isPostUpdate(expr1)
+  )
+  or
+  exists(Callable callable |
+    node1.isReceiverParameter(callable) and
+    step.value() and
+    node2.isLocalVariableWrite(callable, getImplicitReceiverVariable(callable))
+  )
+  or
+  exists(CallExpr call, Expr receiverExpr |
+    receiverExpr = call.getCallee().(MemberAccessExpr).getBase()
+  |
+    node1.isResultValue(receiverExpr) and
+    step.value() and
+    node2.isReceiverArgument(call)
+    or
+    node1.isReceiverPostUpdate(call) and
+    step.value() and
+    node2.isPostUpdate(receiverExpr)
+  )
+  or
+  exists(CallExpr call |
+    node1.isResultValue(call.getCallee()) and
+    step.value() and
+    node2.isCalleeArgument(call)
+    or
+    node1.isCalleePostUpdate(call) and
+    step.value() and
+    node2.isPostUpdate(call.getCallee())
+  )
+  or
+  exists(CallExpr call, UnqualifiedMemberAccess callee | callee = call.getCallee() |
+    node1.isLocalVariableRead(callee, callee.getImplicitQualifierVariable()) and
+    step.value() and
+    node2.isReceiverArgument(call)
+    or
+    node1.isReceiverPostUpdate(call) and
+    step.value() and
+    node2.isLocalVariablePostUpdate(callee, callee.getImplicitQualifierVariable())
+  )
+  or
+  exists(VariableDeclaration decl |
+    node1.isResultValue(decl.getValue()) and
+    step.value() and
+    node2.isIncomingValue(decl.getPattern())
+  )
+  or
+  exists(AssignExpr assign |
+    node1.isResultValue(assign.getValue()) and
+    step.value() and
+    node2.isIncomingValue(assign.getTarget())
+  )
+  or
+  // For compound assignments, the result of the expression represents the result of the operator.
+  // Make it flow to the target of the assignment.
+  exists(CompoundAssignExpr assign |
+    node1.isResultValue(assign) and
+    step.value() and
+    node2.isIncomingValue(assign.getTarget())
+  )
+  or
+  exists(LocalVariableAccess access |
+    node1.isLocalVariableRead(access, access.getLocalVariable()) and
+    step.value() and
+    node2.isResultValue(access)
+    or
+    node1.isIncomingValue(access) and
+    step.value() and
+    node2.isLocalVariableWrite(access, access.getLocalVariable())
+    or
+    node1.isPostUpdate(access) and
+    step.value() and
+    node2.isLocalVariablePostUpdate(access, access.getLocalVariable())
+  )
+  or
+  exists(UnqualifiedMemberAccess access | access.isInstanceAccess() |
+    node1.isLocalVariableRead(access, access.getImplicitQualifierVariable()) and
+    step.readName(access.getMemberName()) and
+    node2.isResultValue(access)
+    or
+    (node1.isIncomingValue(access) or node1.isPostUpdate(access)) and
+    step.storeName(access.getMemberName()) and
+    node2.isLocalVariablePostUpdate(access, access.getImplicitQualifierVariable())
+    or
+    // Pass the receiver along to the getter/setter invoked by this expression
+    exists(DataFlowCall call | access = [call.asGetterCall(), call.asSetterCall()] |
+      node1.isLocalVariableRead(access, access.getImplicitQualifierVariable()) and
+      step.value() and
+      node2.isReceiverArgumentEx(call)
+      or
+      node1.isReceiverPostUpdateEx(call) and
+      step.value() and
+      node2.isLocalVariablePostUpdate(access, access.getImplicitQualifierVariable())
+    )
+  )
+  or
+  exists(StringInterpolationExpr expr |
+    node1.isResultValue(expr.getAnElement()) and
+    step.taint() and
+    node2.isResultValue(expr)
+  )
+  or
+  exists(TupleExpr expr, int i |
+    node1.isResultValue(expr.getElement(i).getValue()) and
+    step.storeName(i.toString()) and
+    node2.isResultValue(expr)
+    or
+    node1.isIncomingValue(expr) and
+    step.readName(i.toString()) and
+    node2.isIncomingValue(expr.getElement(i).getValue())
+  )
+  or
+  exists(MemberAccessExpr expr |
+    node1.isResultValue(expr.getBase()) and
+    step.readName(expr.getMemberName()) and
+    node2.isResultValue(expr)
+    or
+    (node1.isIncomingValue(expr) or node1.isPostUpdate(expr)) and
+    step.storeName(expr.getMemberName()) and
+    node2.isPostUpdate(expr.getBase())
+    or
+    // Pass the receiver along to the getter/setter invoked by this expression
+    exists(DataFlowCall call | expr = [call.asGetterCall(), call.asSetterCall()] |
+      node1.isResultValue(expr.getBase()) and
+      step.value() and
+      node2.isReceiverArgumentEx(call)
+      or
+      node1.isReceiverPostUpdateEx(call) and
+      step.value() and
+      node2.isPostUpdate(expr.getBase())
+    )
+  )
+  or
+  // Calls and constructor-patterns targeting an enum-case constructor.
+  exists(CallExpr call, Argument arg, string field |
+    field = getEnumCaseParameterFieldFromArgument(call, arg)
+  |
+    node1.isResultValue(arg.getValue()) and
+    step.storeName(field) and
+    node2.isResultValue(call)
+    or
+    node1.isIncomingValue(call) and
+    step.readName(field) and
+    node2.isIncomingValue(arg.getValue())
+  )
+  or
+  // For local getters/setters, pass the callable into the callee argument.
+  // Capture SSA depends on this.
+  exists(ComputedLocalVariable local, AccessorDeclaration accessor, DataFlowCall call |
+    accessor = local.getAnAccessor() and
+    node1.isCallable(accessor) and
+    step.callGraph() and
+    (
+      call.asGetterCall() = local.getAnAccess() and accessor instanceof GetterDeclaration
+      or
+      call.asSetterCall() = local.getAnAccess() and accessor instanceof SetterDeclaration
+    ) and
+    node2.isImplicitArgument(call, any(ArgumentPosition pos | pos.isCallee()), false)
+  )
+  or
+  exists(SwitchExpr expr |
+    node1.isResultValue(expr.getValue()) and
+    step.value() and
+    node2.isIncomingValue(expr.getACase().getPattern())
+  )
+  or
+  exists(PatternGuardExpr expr |
+    node1.isResultValue(expr.getValue()) and
+    step.value() and
+    node2.isIncomingValue(expr.getPattern())
+  )
+  or
+  exists(ExprPattern expr |
+    node1.isIncomingValue(expr) and
+    step.value() and
+    node2.isIncomingValue(expr.getExpr())
+  )
+  or
+  exists(ArrayLiteral expr |
+    node1.isResultValue(expr.getAnElement()) and
+    step.store(ContentSet::arrayElement()) and
+    node2.isResultValue(expr)
+  )
+  or
+  exists(ForEachStmt stmt |
+    node1.isResultValue(stmt.getIterable()) and
+    step.readArrayElement() and
+    node2.isIncomingValue(stmt.getPattern())
+  )
+  or
+  exists(FunctionExpr expr |
+    node1.isCallable(expr) and
+    step.value() and
+    node2.isResultValue(expr)
+  )
+  or
+  exists(FunctionDeclaration fun |
+    node1.isCallable(fun) and
+    step.value() and
+    node2.isIncomingValue(fun.getNameNode())
+  )
+  or
+  exists(Callable callable, Expr expr |
+    isReturnedExpr(callable, expr) and
+    node1.isResultValue(expr) and
+    step.value() and
+    node2.isReturnNode(callable)
+  )
+  or
+  exists(IfExpr expr |
+    node1.isResultValue(expr.getABranch()) and
+    step.value() and
+    node2.isResultValue(expr)
+  )
+  or
+  none() // Temporarily disable compilation errors from unsatisfiable types
+}
+
+/** Holds if `node` should be included in the debug view. */
+private signature predicate relevantNodeSig(AstNode node);
+
+module DebugGraph<relevantNodeSig/1 relevantNode> {
+  private Node adjacent1(Node n) {
+    step(n, _, result)
+    or
+    localSsaStep(n, result, _)
+    or
+    captureSsaLocalFlowStep(n, result)
+    or
+    captureSsaReadStep(n, _, result)
+    or
+    captureSsaStoreStep(n, _, result)
+    or
+    result = n.getPostUpdateNode()
+  }
+
+  private Node adjacent(Node n) {
+    result = adjacent1(n)
+    or
+    n = adjacent1(result)
+  }
+
+  private predicate relevantDataFlowNode(Node node) {
+    relevantNode(node.getWrappedAstNode())
+    or
+    not exists(node.getWrappedAstNode()) and
+    relevantDataFlowNode(adjacent(node))
+  }
+
+  private string getANodeAnnotation(Node n) {
+    result =
+      " [capture-clear: " +
+        strictconcat(ContentSet c | captureSsaClearsContent(n, c) | c.toString(), ",") + "]"
+  }
+
+  query predicate nodes(Node node, string key, string value) {
+    relevantDataFlowNode(node) and
+    key = "semmle.label" and
+    value = node.toString() + concat(getANodeAnnotation(node))
+  }
+
+  private predicate isBypassedStoreReadStep(Step s) {
+    exists(ContentSet contents |
+      s.read(contents)
+      or
+      s.store(contents)
+    |
+      bypassContentSet(contents)
+    )
+  }
+
+  query predicate edges(Node node1, Node node2, string key, string value) {
+    key = "semmle.label" and
+    relevantDataFlowNode(node1) and
+    relevantDataFlowNode(node2) and
+    (
+      exists(Step step |
+        step(node1, step, node2) and
+        if isBypassedStoreReadStep(step)
+        then value = "value [bypassed " + step.toString() + "]"
+        else value = step.toString()
+      )
+      or
+      exists(boolean isUseStep |
+        localSsaStep(node1, node2, isUseStep) and
+        if isUseStep = true then value = "use-use" else value = "def-use"
+      )
+      or
+      node2 = node1.getPostUpdateNode() and
+      value = "post-update"
+      or
+      captureSsaLocalFlowStep(node1, node2) and
+      value = "value"
+      or
+      exists(ContentSet contents |
+        captureSsaReadStep(node1, contents, node2) and
+        value = "read[" + contents.toString() + "]"
+        or
+        captureSsaStoreStep(node1, contents, node2) and
+        value = "store[" + contents.toString() + "]"
+      )
+    )
+  }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowInstantiation.qll b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowInstantiation.qll
new file mode 100644
index 000000000000..1c18b907c57c
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowInstantiation.qll
@@ -0,0 +1,312 @@
+private import unified
+private import AllDataFlow
+private import AllDataFlow as D
+private import codeql.dataflow.DataFlow
+private import codeql.util.Void
+private import codeql.util.Unit
+
+module DataFlowInput implements InputSig<Location> {
+  class Node = D::Node;
+
+  //
+  // Contents
+  //
+  class Content = D::Content;
+
+  class ContentSet = D::ContentSet;
+
+  class ContentApprox = Content; // TODO
+
+  ContentApprox getContentApprox(Content c) { result = c } // TODO
+
+  //
+  // Parameter, argument, return, and out nodes and their positions/kinds
+  //
+  private predicate isReturnNode(Node n, ReturnKind kind) {
+    n.isReturnNode(_) and kind.isStandardReturnValue()
+    or
+    FlowSummaryOutput::summaryReturnNode(getSummaryNode(n), kind)
+  }
+
+  class ReturnNode extends Node {
+    ReturnNode() { isReturnNode(this, _) }
+
+    ReturnKind getKind() { isReturnNode(this, result) }
+  }
+
+  private predicate isOutNode(Node n, DataFlowCall call, ReturnKind kind) {
+    n.asExpr() = call.asExplicitCall() and kind.isStandardReturnValue()
+    or
+    exists(FlowSummaryOutput::SummaryNode callee |
+      FlowSummaryOutput::summaryOutNode(callee, getSummaryNode(n), kind) and
+      call.isSummaryCall(_, callee)
+    )
+    or
+    exists(Expr access |
+      call.asGetterCall() = access and
+      n.isResultValue(access) and
+      kind.isStandardReturnValue()
+    )
+  }
+
+  class OutNode extends Node {
+    OutNode() { isOutNode(this, _, _) }
+  }
+
+  OutNode getAnOutNode(DataFlowCall call, ReturnKind kind) { isOutNode(result, call, kind) }
+
+  class ReturnKind extends Unit {
+    /** Holds if this is the standard return value */
+    predicate isStandardReturnValue() { any() }
+  }
+
+  import ParameterPositions
+  //
+  // Calls and callables
+  //
+  import DataFlowCall
+  import DataFlowCallable
+  import CallGraph
+
+  DataFlowCallable nodeGetEnclosingCallable(Node node) { result = node.getEnclosingCallableEx() }
+
+  private predicate isParameterNodeImpl(Node p, DataFlowCallable c, ParameterPosition pos) {
+    exists(Parameter param |
+      p.asExpr() = param.getPattern() and
+      c.asSourceCallable() = param.getEnclosingCallable()
+    |
+      pos.asPositional() = param.getPositionalIndex()
+      or
+      pos.asNamed() = param.getExternalName()
+    )
+    or
+    p.(BuilderNode).isImplicitParameter(c, pos)
+    or
+    FlowSummaryOutput::summaryParameterNode(getSummaryNode(p), pos) and
+    c = p.getEnclosingCallableEx()
+  }
+
+  class ParameterNode extends Node {
+    ParameterNode() { isParameterNodeImpl(this, _, _) }
+  }
+
+  predicate isParameterNode(ParameterNode p, DataFlowCallable c, ParameterPosition pos) {
+    // This predicate is needed to implement the signature without empty recursion through ParameterNode
+    isParameterNodeImpl(p, c, pos)
+  }
+
+  private predicate isArgumentNodeImpl(Node n, DataFlowCall call, ArgumentPosition pos) {
+    exists(Argument arg |
+      n.asExpr() = arg.getValue() and
+      call.asExplicitCall().getAnArgument() = arg
+    |
+      pos.asPositional() = arg.getPositionalIndex()
+      or
+      pos.asNamed() = arg.getName()
+    )
+    or
+    n.(BuilderNode).isImplicitArgument(call, pos, false)
+    or
+    n.(BuilderNode).isSetterValueArgument(call) and
+    pos.asPositional() = 0
+    or
+    exists(FlowSummaryOutput::SummaryNode callee |
+      FlowSummaryOutput::summaryArgumentNode(callee, getSummaryNode(n), pos) and
+      call.isSummaryCall(_, callee)
+    )
+  }
+
+  class ArgumentNode extends Node {
+    ArgumentNode() { isArgumentNodeImpl(this, _, _) }
+  }
+
+  predicate isArgumentNode(ArgumentNode n, DataFlowCall call, ArgumentPosition pos) {
+    // This predicate is needed to implement the signature without empty recursion through ArgumentNode
+    isArgumentNodeImpl(n, call, pos)
+  }
+
+  //
+  // Post-update nodes
+  //
+  class PostUpdateNode extends Node {
+    PostUpdateNode() { this = any(Node n).getPostUpdateNode() }
+
+    Node getPreUpdateNode() { this = result.getPostUpdateNode() }
+  }
+
+  //
+  // Types
+  //
+  class DataFlowType extends Unit {
+    // TODO: track proper types
+    string toString() { result = "" } // do not include "unit" type in path steps
+  }
+
+  class CastNode extends Node {
+    CastNode() { none() } // TODO
+  }
+
+  DataFlowType getNodeType(Node node) { any() } // TODO
+
+  predicate compatibleTypes(DataFlowType t1, DataFlowType t2) { any() } // TODO
+
+  predicate typeStrongerThan(DataFlowType t1, DataFlowType t2) { any() } // TODO
+
+  //
+  // Steps
+  //
+  pragma[nomagic]
+  private Step valueStepEx() {
+    result.value()
+    or
+    result.valueMustFlow()
+    or
+    exists(ContentSet contents | bypassContentSet(contents) |
+      result.read(contents)
+      or
+      result.store(contents)
+    )
+  }
+
+  predicate simpleLocalFlowStep(Node node1, Node node2, string model) {
+    step(node1, valueStepEx(), node2) and model = ""
+    or
+    localSsaStep(node1, node2, _) and model = ""
+    or
+    captureSsaLocalFlowStep(node1, node2) and model = ""
+    or
+    FlowSummaryOutput::summaryLocalStep(node1, node2, true, model)
+    or
+    model = "" and
+    exists(ContentSet contents | bypassContentSet(contents) |
+      FlowSummaryOutput::summaryReadStep(getSummaryNode(node1), contents, getSummaryNode(node2))
+      or
+      FlowSummaryOutput::summaryStoreStep(getSummaryNode(node1), contents, getSummaryNode(node2))
+    )
+  }
+
+  predicate jumpStep(Node node1, Node node2) {
+    step(node1, any(Step s | s.jump()), node2) or
+    FlowSummaryOutput::summaryJumpStep(node1, node2)
+  }
+
+  predicate readStep(Node node1, ContentSet c, Node node2) {
+    (
+      step(node1, any(Step s | s.read(c)), node2)
+      or
+      captureSsaReadStep(node1, c, node2)
+      or
+      FlowSummaryOutput::summaryReadStep(getSummaryNode(node1), c, getSummaryNode(node2))
+    ) and
+    not bypassContentSet(c)
+  }
+
+  predicate storeStep(Node node1, ContentSet c, Node node2) {
+    (
+      step(node1, any(Step s | s.store(c)), node2)
+      or
+      captureSsaStoreStep(node1, c, node2)
+      or
+      FlowSummaryOutput::summaryStoreStep(getSummaryNode(node1), c, getSummaryNode(node2))
+    ) and
+    not bypassContentSet(c)
+  }
+
+  predicate clearsContent(Node n, ContentSet c) {
+    captureSsaClearsContent(n, c)
+    or
+    FlowSummaryOutput::summaryClearsContent(getSummaryNode(n), c) and
+    not bypassContentSet(c)
+  }
+
+  predicate expectsContent(Node n, ContentSet c) {
+    FlowSummaryOutput::summaryExpectsContent(getSummaryNode(n), c) and
+    not bypassContentSet(c)
+  }
+
+  predicate localMustFlowStep(Node node1, Node node2) {
+    step(node1, any(Step s | s.valueMustFlow()), node2) or
+    localSsaMustFlowStep(node1, node2) or
+    FlowSummaryOutput::summaryLocalMustFlowStep(getSummaryNode(node1), getSummaryNode(node2))
+  }
+
+  //
+  // Misc
+  //
+  additional predicate nodeIsVisible(Node node) {
+    exists(Expr e |
+      e.fromSource() and
+      node = TValueNode(e) and
+      not e instanceof ExprPattern
+    )
+    or
+    node instanceof TStrictlyIncomingValue
+    or
+    node instanceof TExprPostUpdateNode
+  }
+
+  predicate nodeIsHidden(Node node) { not nodeIsVisible(node) }
+
+  predicate neverSkipInPathGraph(Node n) {
+    n.isIncomingValue(_) or // Never skip assignment target
+    n.asExpr() instanceof LocalVariableAccess or // Never skip a variable reference
+    n.asExpr() = any(ReturnExpr e).getValue()
+  }
+
+  class DataFlowExpr = Expr;
+
+  Node exprNode(DataFlowExpr e) { none() } // TODO
+
+  predicate forceHighPrecision(Content c) { none() } // TODO
+
+  class NodeRegion extends Void {
+    NodeRegion() { none() } // TODO
+
+    predicate contains(Node n) { none() } // TODO
+
+    string toString() { none() } // TODO
+  }
+
+  predicate isUnreachableInCall(NodeRegion nr, DataFlowCall call) { none() } // TODO
+
+  predicate allowParameterReturnInSelf(ParameterNode p) {
+    p.isReceiverParameter(_)
+    or
+    captureSsaAllowParameterReturnInSelf(p)
+    or
+    exists(DataFlowCallable c, ParameterPosition pos |
+      FlowSummaryOutput::summaryAllowParameterReturnInSelf(c.asSummarizedCallable(), pos) and
+      isParameterNodeImpl(p, c, pos)
+    )
+  }
+
+  class LambdaCallKind extends Unit { }
+
+  predicate lambdaCreation(Node creation, LambdaCallKind kind, DataFlowCallable c) {
+    creation.isCallableEx(c) and
+    exists(kind)
+  }
+
+  predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node callee) {
+    callee.(BuilderNode).isImplicitArgument(call, any(ArgumentPosition p | p.isCallee()), false) and
+    exists(kind)
+    or
+    call.isSummaryCall(_, getSummaryNode(callee)) and exists(kind)
+  }
+
+  predicate additionalLambdaFlowStep(Node nodeFrom, Node nodeTo, boolean preservesValue) {
+    none() // TODO
+  }
+
+  predicate knownSourceModel(Node source, string model) { none() } // TODO
+
+  predicate knownSinkModel(Node sink, string model) { none() } // TODO
+
+  class DataFlowSecondLevelScope extends Void {
+    DataFlowSecondLevelScope() { none() } // TODO
+
+    string toString() { none() } // TODO
+  }
+}
+
+module DataFlowOutput = DataFlowMake<Location, DataFlowInput>;
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowNode.qll b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowNode.qll
new file mode 100644
index 000000000000..a520ae9e10a6
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowNode.qll
@@ -0,0 +1,624 @@
+private import unified
+private import AllDataFlow
+private import codeql.unified.internal.ExprPositions
+private import codeql.unified.internal.LocalNameBinding
+private import codeql.util.Boolean
+
+private predicate hasIncomingValueAtCfgNode(Expr expr, ControlFlowNode cfgNode) {
+  exists(AstNode declOrAssignment | hasIncomingValue(expr, declOrAssignment) |
+    // In cases where the CFG node for 'expr' appears before its actual assignment,
+    // use the CFG node from the surrounding assignment-like node
+    cfgNode.injects(declOrAssignment.(Assignment))
+    or
+    // Variable declarations are pre-order and visit the target first.
+    // Use the after node.
+    cfgNode.isAfter(declOrAssignment.(VariableDeclaration))
+    or
+    // Hoist local functions to the top of their block
+    declOrAssignment instanceof LocalFunctionDeclaration and
+    cfgNode.isBefore(declOrAssignment.getParent())
+    or
+    // In other cases, it's a binding pattern whose CFG node can be used
+    // as its assignment time
+    not declOrAssignment instanceof Assignment and
+    not declOrAssignment instanceof VariableDeclaration and
+    not declOrAssignment instanceof LocalFunctionDeclaration and
+    cfgNode.injects(expr)
+  )
+}
+
+/** Holds if `expr` has a post-update at `cfgNode` resulting from a surrounding call or assignment. */
+predicate hasPostUpdateAfterCallOrAssign(Expr expr, ControlFlowNode cfgNode) {
+  exists(MemberAccessExpr member |
+    (hasIncomingValueAtCfgNode(member, cfgNode) or hasPostUpdateAfterCallOrAssign(member, cfgNode)) and
+    expr = member.getBase()
+  )
+  or
+  exists(CallExpr call | cfgNode.isAfter(call) |
+    expr = call.getAnArgument().getValue()
+    or
+    expr = call.getCallee()
+  )
+  or
+  exists(Expr target |
+    hasPostUpdateAfterCallOrAssign(target, cfgNode) and
+    exprStep(expr, target, _)
+  )
+}
+
+/**
+ * Holds if `expr` has a post-update at `cfgNode`.
+ */
+private predicate hasPostUpdate(Expr expr, ControlFlowNode cfgNode) {
+  hasPostUpdateAfterCallOrAssign(expr, cfgNode)
+  or
+  not hasPostUpdateAfterCallOrAssign(expr, _) and
+  exists(MemberAccessExpr member |
+    // If the member access is not updated by call or assignment, it might still be a call to a getter,
+    // and thus needs a post-update. Generate a post-update for this case.
+    // In case it's a call to a getter, while also being post-updated from a call or assignment, we accept
+    // the imprecision and use the post-update position from the call or assignment.
+    expr = member.getBase() and
+    cfgNode.isAfter(member)
+  )
+}
+
+/**
+ * Holds if `repr` performs an access to `var` of the given `kind` at `cfgNode`.
+ *
+ * `repr` should be an arbitrary but unique representative for the access.
+ */
+predicate performsVariableAccess(
+  AstNode repr, LocalVariable var, VariableRefKind kind, ControlFlowNode cfgNode
+) {
+  exists(LocalVariableAccess access | var = access.getLocalVariable() and repr = access |
+    hasResultValue(access) and kind.isRead() and cfgNode.asExpr() = repr
+    or
+    hasIncomingValueAtCfgNode(access, cfgNode) and kind.isWrite()
+    or
+    hasPostUpdate(access, cfgNode) and kind.isPostUpdate()
+  )
+  or
+  exists(UnqualifiedMemberAccess access |
+    access.isInstanceAccess() and var = access.getImplicitQualifierVariable() and repr = access
+  |
+    kind.isRead() and cfgNode.isBefore(access)
+    or
+    (hasIncomingValueAtCfgNode(access, cfgNode) or hasPostUpdate(access, cfgNode)) and
+    kind.isPostUpdate()
+    or
+    // Generate a post-update for the receiver in case this is a call to a getter that mutates 'self'.
+    not (hasIncomingValueAtCfgNode(access, _) or hasPostUpdate(access, _)) and
+    cfgNode.isAfter(access) and
+    kind.isPostUpdate()
+    or
+    exists(CallExpr call |
+      access = call.getCallee() and
+      cfgNode.isAfter(call) and
+      kind.isPostUpdate()
+    )
+  )
+  or
+  exists(Callable callable |
+    repr = callable and
+    var = getImplicitReceiverVariable(callable) and
+    kind.isWrite() and
+    cfgNode.(ControlFlow::EntryNode).getEnclosingCallable() = callable
+  )
+}
+
+newtype TDataFlowNode =
+  TValueNode(Expr expr) { hasResultValue(expr) or hasIncomingValue(expr, _) } or
+  TStrictlyIncomingValue(Expr expr) { hasResultValue(expr) and hasIncomingValue(expr, _) } or
+  TExprPostUpdateNode(Expr expr) { hasPostUpdate(expr, _) } or
+  TLocalVariableRefNode(AstNode repr, LocalVariable var, VariableRefKind kind) {
+    performsVariableAccess(repr, var, kind, _)
+  } or
+  TReturnNode(DataFlowCallable callable) {
+    not exists(callable.asSummarizedCallable()) // represented by TSummaryNode
+  } or
+  TCallableNode(DataFlowCallable callable) or
+  TImplicitParameterNode(DataFlowCallable callable, ImplicitParameterPosition pos) {
+    not exists(callable.asSummarizedCallable()) // represented by TSummaryNode
+  } or
+  TImplicitArgumentNode(DataFlowCall call, ImplicitArgumentPosition pos, Boolean isPost) {
+    not call.isSummaryCall(_, _) // represented by TSummaryNode
+  } or
+  TLocalSsaNode(LocalSsaDataFlowOutput::SsaNode node) or
+  TCaptureSsaNode(CaptureSsaOutput::SynthesizedCaptureNode node) or
+  TSummaryNode(FlowSummaryOutput::SummaryNode node)
+
+class TDataFlowNodeStage1 =
+  TValueNode or TStrictlyIncomingValue or TExprPostUpdateNode or TLocalVariableRefNode or
+      TReturnNode or TCallableNode or TImplicitParameterNode or TImplicitArgumentNode;
+
+class TDataFlowNodeStage2 = TDataFlowNodeStage1 or TLocalSsaNode;
+
+/**
+ * A data-flow node used during construction of the local data flow graph.
+ *
+ * This only contains nodes that are materialised in "stage 1".
+ */
+class BuilderNode extends TDataFlowNodeStage1 {
+  /** Holds if this is the result of evaluating `expr`. */
+  pragma[nomagic]
+  predicate isResultValue(Expr expr) { hasResultValue(expr) and this = TValueNode(expr) }
+
+  /** Holds if this represents the value about to be assigned to `expr` or pattern-matched against `expr`. */
+  pragma[nomagic]
+  predicate isIncomingValue(Expr expr) {
+    // Use the TValueNode when it is not needed for representing the result value
+    hasIncomingValue(expr, _) and
+    not hasResultValue(expr) and
+    this = TValueNode(expr)
+    or
+    this = TStrictlyIncomingValue(expr)
+  }
+
+  /** Holds if this represents the reference to `v` at `repr`. */
+  predicate isLocalVariableRef(AstNode repr, LocalVariable v, VariableRefKind kind) {
+    this = TLocalVariableRefNode(repr, v, kind)
+  }
+
+  /** Holds if this represents the value read from `v` at `repr`. */
+  predicate isLocalVariableRead(AstNode repr, LocalVariable v) {
+    this.isLocalVariableRef(repr, v, TRead())
+  }
+
+  /** Holds if this represents the value written to `v` at `repr`. */
+  predicate isLocalVariableWrite(AstNode repr, LocalVariable v) {
+    this.isLocalVariableRef(repr, v, TWrite())
+  }
+
+  /** Holds if this represents the updated state of the value held in `v` after it has been mutated by the surrounding assignment or call. */
+  predicate isLocalVariablePostUpdate(AstNode repr, LocalVariable v) {
+    this.isLocalVariableRef(repr, v, TPostUpdate())
+  }
+
+  /** Holds if this represents the updated state of the value returned by `expr` after it has been mutated by the surrounding assignment or call. */
+  predicate isPostUpdate(Expr expr) { this = TExprPostUpdateNode(expr) }
+
+  /**
+   * Holds if this node represents the new value passed to the setter invoked by `call`.
+   *
+   * For a direct assignment, such as `x.p = y`, this is the incoming value of `x.p`.
+   * When the value of a computed property is mutated in place, such as `x.p.f = y`,
+   * this is the post-update node of `x.p`, as the mutated value is written back via the setter.
+   */
+  predicate isSetterValueArgument(DataFlowCall call) {
+    exists(Expr access | access = call.asSetterCall() |
+      this.isIncomingValue(access)
+      or
+      not isInAssignmentContext(access, _) and
+      this.isPostUpdate(access)
+    )
+  }
+
+  /** Holds if this node is the canonical representative for the return value of `callable`. */
+  predicate isReturnNode(Callable callable) { this.isReturnNodeEx(toDataFlowCallable(callable)) }
+
+  /**
+   * Holds if this node is the canonical representative for the return value of `callable`.
+   *
+   * Note that this does not hold for the return node in a summarized callable.
+   */
+  predicate isReturnNodeEx(DataFlowCallable callable) { this = TReturnNode(callable) }
+
+  /** Holds if this node represents an implicit parameter of `callable`. */
+  predicate isImplicitParameter(DataFlowCallable callable, ImplicitParameterPosition pos) {
+    this = TImplicitParameterNode(callable, pos)
+  }
+
+  /** Holds if this node represents an implicit argument to `call` (or its post-update). */
+  predicate isImplicitArgument(DataFlowCall call, ImplicitArgumentPosition pos, boolean isPost) {
+    this = TImplicitArgumentNode(call, pos, isPost)
+  }
+
+  /**
+   * Holds if this represents the receiver passed to the given callable.
+   *
+   * Note that for non-methods and closures that capture the receiver from the enclosing method,
+   * this node still exists but will typically not flow anywhere.
+   */
+  predicate isReceiverParameter(Callable callable) {
+    this.isImplicitParameter(toDataFlowCallable(callable), any(ParameterPosition p | p.isReceiver()))
+  }
+
+  /** Holds if this node represents the receiver argument passed to `call`. */
+  predicate isReceiverArgumentEx(DataFlowCall call) {
+    this.isImplicitArgument(call, any(ArgumentPosition p | p.isReceiver()), false)
+  }
+
+  /** Holds if this node represents the receiver argument passed to `call`. */
+  predicate isReceiverArgument(CallExpr call) { this.isReceiverArgumentEx(toDataFlowCall(call)) }
+
+  /** Holds if this node represents the updated state of the receiver of `call` after the call returns. */
+  predicate isReceiverPostUpdate(CallExpr call) {
+    this.isReceiverPostUpdateEx(toDataFlowCall(call))
+  }
+
+  /** Holds if this node represents the updated state of the receiver of `call` after the call returns. */
+  predicate isReceiverPostUpdateEx(DataFlowCall call) {
+    this.isImplicitArgument(call, any(ArgumentPosition p | p.isReceiver()), true)
+  }
+
+  /** Holds if this is the canonical representative for the given `callable`. */
+  predicate isCallableEx(DataFlowCallable callable) { this = TCallableNode(callable) }
+
+  /** Holds if this is the canonical representative for the given `callable`. */
+  predicate isCallable(Callable callable) { this = TCallableNode(toDataFlowCallable(callable)) }
+
+  /** Holds if this node represents the function being invoked at `call`. */
+  predicate isCalleeArgument(CallExpr call) {
+    this.isImplicitArgument(toDataFlowCall(call), any(ArgumentPosition p | p.isCallee()), false)
+  }
+
+  /** Holds if this node represents the updated state of the function being invoked at `call`, after the call returns. */
+  predicate isCalleePostUpdate(CallExpr call) {
+    this.isImplicitArgument(toDataFlowCall(call), any(ArgumentPosition p | p.isCallee()), true)
+  }
+
+  /**
+   * Gets the post-update node for this node, if any.
+   *
+   * The post-update node represents the updated state of the value held in this node, after it has been mutated by the surrounding assignment or call.
+   */
+  pragma[nomagic]
+  BuilderNode getPostUpdateNode() {
+    exists(Expr expr |
+      this.isResultValue(expr) and
+      result.isPostUpdate(expr)
+    )
+    or
+    exists(Expr expr, LocalVariable var |
+      this.isLocalVariableRead(expr, var) and
+      result.isLocalVariablePostUpdate(expr, var)
+    )
+    or
+    exists(DataFlowCall call, ArgumentPosition pos |
+      this.isImplicitArgument(call, pos, false) and
+      result.isImplicitArgument(call, pos, true)
+    )
+  }
+
+  /**
+   * Gets the AST node wrapped by this data flow, if any.
+   */
+  AstNode getWrappedAstNode() {
+    this = TValueNode(result) or
+    this = TStrictlyIncomingValue(result) or
+    this = TExprPostUpdateNode(result)
+  }
+
+  /** Get a string representation of this element. */
+  string toString() {
+    exists(Expr expr |
+      this = TValueNode(expr) and
+      result = expr.toString()
+      or
+      this = TStrictlyIncomingValue(expr) and
+      result = "[incoming] " + expr.toString()
+      or
+      this = TExprPostUpdateNode(expr) and
+      result = "[post] " + expr.toString()
+    )
+    or
+    exists(LocalVariable v, VariableRefKind kind |
+      this = TLocalVariableRefNode(_, v, kind) and
+      result = "[variable " + kind + "] " + v.toString()
+    )
+    or
+    exists(DataFlowCallable callable |
+      exists(ParameterPosition pos |
+        this.isImplicitParameter(callable, pos) and
+        result = "[" + pos + " param] " + callable.toString()
+      )
+      or
+      this.isCallableEx(callable) and
+      result = "[callable] " + callable.toString()
+    )
+    or
+    exists(DataFlowCallable callable |
+      this.isReturnNodeEx(callable) and
+      result = "[return] " + callable.toString()
+    )
+    or
+    exists(DataFlowCall call, ArgumentPosition pos |
+      this.isImplicitArgument(call, pos, false) and
+      result = "[" + pos + " arg] " + call.toString()
+      or
+      this.isImplicitArgument(call, pos, true) and
+      result = "[" + pos + " post] " + call.toString()
+    )
+  }
+
+  /** Gets the location of this data flow node. */
+  Location getLocation() {
+    result = this.getWrappedAstNode().getLocation()
+    or
+    exists(AstNode repr |
+      this.isLocalVariableRef(repr, _, _) and
+      result = repr.getLocation()
+    )
+    or
+    exists(DataFlowCallable callable |
+      this.isImplicitParameter(callable, _)
+      or
+      this.isCallableEx(callable)
+    |
+      result = callable.getLocation()
+    )
+    or
+    exists(DataFlowCallable callable |
+      this.isReturnNodeEx(callable) and
+      result = callable.getLocation()
+    )
+    or
+    exists(DataFlowCall call |
+      this.isImplicitArgument(call, _, _) and
+      result = call.getLocation()
+    )
+  }
+
+  /**
+   * Holds if this data flow node is associated with the `i`'th index in the given basic block.
+   *
+   * Note that some data flow nodes may have an index appearing before the first or after the
+   * last `ControlFlowNode` node in the basic block. Multiple data flow nodes may share the same control flow position.
+   *
+   * Also note that some data flow nodes have no associated control flow position, either because they are
+   * in unreachable code, or belong to a synthesized callable that has no control flow graph.
+   */
+  predicate hasControlFlowPosition(BasicBlock bb, int i) {
+    exists(ControlFlowNode cfgNode | cfgNode = bb.getNode(i) |
+      exists(Expr expr |
+        this.isResultValue(expr) and cfgNode.asExpr() = expr
+        or
+        this.isIncomingValue(expr) and hasIncomingValueAtCfgNode(expr, cfgNode)
+        or
+        this.isPostUpdate(expr) and hasPostUpdate(expr, cfgNode)
+      )
+      or
+      exists(AstNode repr, LocalVariable var, VariableRefKind kind |
+        this.isLocalVariableRef(repr, var, kind) and
+        performsVariableAccess(repr, var, kind, cfgNode)
+      )
+      or
+      exists(DataFlowCallable callable |
+        this.isImplicitParameter(callable, _) and
+        cfgNode.(ControlFlow::EntryNode).getEnclosingCallable() = callable.asSourceCallable()
+        or
+        this.isCallableEx(callable) and
+        cfgNode.injects(callable.asSourceCallable())
+      )
+      or
+      exists(DataFlowCall call, Expr access, boolean isPost |
+        this.isImplicitArgument(call, _, isPost)
+      |
+        (access = call.asExplicitCall() or access = call.asGetterCall()) and
+        (
+          isPost = false and cfgNode.injects(access)
+          or
+          isPost = true and cfgNode.isAfter(access)
+        )
+        or
+        access = call.asSetterCall() and
+        (
+          exists(Assignment assignment | isInAssignmentContext(access, assignment) |
+            isPost = false and cfgNode.injects(assignment)
+            or
+            isPost = true and cfgNode.isAfter(assignment)
+          )
+          or
+          // Setter invoked to write back a mutated value
+          not isInAssignmentContext(access, _) and
+          hasPostUpdate(access, cfgNode)
+        )
+      )
+    )
+  }
+}
+
+/** A node in stage 2, which includes stage 1 and local SSA nodes. */
+class Stage2Node extends TDataFlowNodeStage2 {
+  /** Get a string representation of this element. */
+  string toString() {
+    result = this.(BuilderNode).toString()
+    or
+    exists(LocalSsaDataFlowOutput::SsaNode node |
+      this = TLocalSsaNode(node) and
+      result = node.toString()
+    )
+  }
+
+  /** Gets the location of this data flow node. */
+  Location getLocation() {
+    result = this.(BuilderNode).getLocation()
+    or
+    exists(LocalSsaDataFlowOutput::SsaNode node |
+      this = TLocalSsaNode(node) and
+      result = node.getLocation()
+    )
+  }
+
+  predicate hasControlFlowPosition(BasicBlock bb, int i) {
+    this.(BuilderNode).hasControlFlowPosition(bb, i)
+    or
+    exists(LocalSsaDataFlowOutput::SsaNode node |
+      this = TLocalSsaNode(node) and
+      bb = node.getBasicBlock() and
+      i = node.getIndex() // TODO: why is this marked as internal in the SSA library?
+    )
+  }
+}
+
+class Node extends TDataFlowNode {
+  /** Gets the expression represented by this node. */
+  Expr asExpr() { this = TValueNode(result) }
+
+  /** Holds if this is the result of evaluating `expr`. */
+  pragma[nomagic]
+  predicate isResultValue(Expr expr) { this.(BuilderNode).isResultValue(expr) }
+
+  /** Holds if this represents the value about to be assigned to `expr` or pattern-matched against `expr`. */
+  pragma[nomagic]
+  predicate isIncomingValue(Expr expr) { this.(BuilderNode).isIncomingValue(expr) }
+
+  /** Holds if this represents the reference to `v` at `repr`. */
+  predicate isLocalVariableRef(AstNode repr, LocalVariable v, VariableRefKind kind) {
+    this.(BuilderNode).isLocalVariableRef(repr, v, kind)
+  }
+
+  /** Holds if this represents the value read from `v` at `repr`. */
+  predicate isLocalVariableRead(AstNode repr, LocalVariable v) {
+    this.(BuilderNode).isLocalVariableRead(repr, v)
+  }
+
+  /** Holds if this represents the value written to `v` at `repr`. */
+  predicate isLocalVariableWrite(AstNode repr, LocalVariable v) {
+    this.(BuilderNode).isLocalVariableWrite(repr, v)
+  }
+
+  /** Holds if this represents the updated state of the value held in `v` after it has been mutated by the surrounding assignment or call. */
+  predicate isLocalVariablePostUpdate(AstNode repr, LocalVariable v) {
+    this.(BuilderNode).isLocalVariablePostUpdate(repr, v)
+  }
+
+  /** Holds if this represents the updated state of the value returned by `expr` after it has been mutated by the surrounding assignment or call. */
+  predicate isPostUpdate(Expr expr) { this.(BuilderNode).isPostUpdate(expr) }
+
+  /**
+   * Holds if this represents the receiver passed to the given callable.
+   *
+   * Note that for non-methods and closures that capture the receiver from the enclosing method,
+   * this node still exists but will typically not flow anywhere.
+   */
+  predicate isReceiverParameter(Callable callable) {
+    this.(BuilderNode).isReceiverParameter(callable)
+  }
+
+  /** Holds if this node represents the receiver argument passed to `call`. */
+  predicate isReceiverArgument(CallExpr call) { this.(BuilderNode).isReceiverArgument(call) }
+
+  /** Holds if this node represents the updated state of the receiver of `call` after the call returns. */
+  predicate isReceiverPostUpdate(CallExpr call) { this.(BuilderNode).isReceiverPostUpdate(call) }
+
+  /** Holds if this is the canonical representative for the given `callable`. */
+  predicate isCallableEx(DataFlowCallable callable) { this.(BuilderNode).isCallableEx(callable) }
+
+  /** Holds if this is the canonical representative for the given `callable`. */
+  predicate isCallable(Callable callable) { this.(BuilderNode).isCallable(callable) }
+
+  /** Holds if this node is the canonical representative for the return value of `callable`. */
+  predicate isReturnNode(Callable callable) { this.(BuilderNode).isReturnNode(callable) }
+
+  /**
+   * Gets the AST node wrapped by this data flow, if any.
+   */
+  AstNode getWrappedAstNode() { result = this.(BuilderNode).getWrappedAstNode() }
+
+  /** Get a string representation of this element. */
+  string toString() {
+    result = this.(Stage2Node).toString()
+    or
+    exists(CaptureSsaOutput::SynthesizedCaptureNode node |
+      this = TCaptureSsaNode(node) and
+      result = "[capture] " + node.toString()
+    )
+    or
+    exists(FlowSummaryOutput::SummaryNode node |
+      this = TSummaryNode(node) and
+      result = node.toString()
+    )
+  }
+
+  /** Gets the location of this data flow node. */
+  Location getLocation() {
+    result = this.(Stage2Node).getLocation()
+    or
+    exists(CaptureSsaOutput::SynthesizedCaptureNode node |
+      this = TCaptureSsaNode(node) and
+      result = node.getLocation()
+    )
+    or
+    this instanceof TSummaryNode and
+    result instanceof EmptyLocation
+  }
+
+  /** Gets the data-flow callable containing this data flow node. */
+  DataFlowCallable getEnclosingCallableEx() {
+    result.asSourceCallable() = this.getWrappedAstNode().getEnclosingCallable()
+    or
+    exists(AstNode repr, LocalVariable var, VariableRefKind kind, ControlFlowNode cfgNode |
+      this.isLocalVariableRef(repr, var, kind) and
+      performsVariableAccess(repr, var, kind, cfgNode) and
+      result.asSourceCallable() = cfgNode.getEnclosingCallable()
+    )
+    or
+    exists(LocalSsaDataFlowOutput::SsaNode node |
+      this = TLocalSsaNode(node) and
+      result.asSourceCallable() = node.getSourceVariable().getDeclaringCallable()
+    )
+    or
+    exists(CaptureSsaOutput::SynthesizedCaptureNode node |
+      this = TCaptureSsaNode(node) and
+      result.asSourceCallable() = node.getEnclosingCallable()
+    )
+    or
+    this.(BuilderNode).isImplicitParameter(result, _)
+    or
+    exists(DataFlowCall call |
+      this.(BuilderNode).isImplicitArgument(call, _, _) and
+      result = call.getEnclosingCallable()
+    )
+    or
+    this.(BuilderNode).isReturnNodeEx(result)
+    or
+    exists(DataFlowCallable callable |
+      this.isCallableEx(callable) and
+      result.asSourceCallable() = callable.asSourceCallable().getEnclosingCallable()
+    )
+    or
+    exists(FlowSummaryOutput::SummaryNode sn |
+      this = TSummaryNode(sn) and
+      result = sn.getEnclosingCallable()
+    )
+  }
+
+  /** Gets the callable containing this data flow node. */
+  Callable getEnclosingCallable() { result = this.getEnclosingCallableEx().asSourceCallable() }
+
+  /**
+   * Holds if this data flow node is associated with the `i`'th index in the given basic block.
+   *
+   * Note that some data flow nodes may have an index appearing before the first or after the
+   * last `ControlFlowNode` node in the basic block. Multiple data flow nodes may share the same control flow position.
+   *
+   * Also note that some data flow nodes have no associated control flow position, either because they are
+   * in unreachable code, or belong to a synthesized callable that has no control flow graph.
+   */
+  predicate hasControlFlowPosition(BasicBlock bb, int i) {
+    this.(Stage2Node).hasControlFlowPosition(bb, i)
+    or
+    exists(CaptureSsaOutput::SynthesizedCaptureNode node |
+      this = TCaptureSsaNode(node) and
+      node.hasCfgNode(bb, i)
+    )
+  }
+
+  /** Gets the basic block associated with this data flow node, if any. */
+  BasicBlock getBasicBlock() { this.hasControlFlowPosition(result, _) }
+
+  /**
+   * Gets the post-update node for this node, if any.
+   *
+   * The post-update node represents the updated state of the value held in this node, after it has been mutated by the surrounding assignment or call.
+   */
+  Node getPostUpdateNode() {
+    result = this.(BuilderNode).getPostUpdateNode()
+    or
+    result = getCaptureSsaPostUpdate(this)
+    or
+    FlowSummaryOutput::summaryPostUpdateNode(getSummaryNode(result), getSummaryNode(this))
+  }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowPlugin.qll b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowPlugin.qll
new file mode 100644
index 000000000000..9b48861293e2
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowPlugin.qll
@@ -0,0 +1,60 @@
+/**
+ * Provides an interface for language-specific data flow rules.
+ */
+
+private import unified
+private import AllDataFlow
+private import codeql.util.Unit
+
+private module Plugins {
+  private import DataFlowPluginSwift
+}
+
+class DataFlowPlugin extends Unit {
+  /**
+   * Holds if there is flow from `expr1` to `expr2` and the post-updated value of `expr2` (if any) should propagate back to
+   * the post-update for `expr1`.
+   */
+  predicate exprStep(Expr expr1, Expr expr2, boolean mustFlow) { none() }
+
+  /** Holds if there is a language-specific step from `node1 -> step -> node2`. */
+  predicate step(BuilderNode node1, Step step, BuilderNode node2) { none() }
+
+  /**
+   * Holds if a read/store step with the given `contents` should be converted to a value step.
+   *
+   * This affects the steps generated by the language-agnostic code as well as steps from the plugin itself.
+   */
+  predicate bypassContentSet(ContentSet contents) { none() }
+
+  /**
+   * Holds if mutating the value of `expr` in-place, such as `expr.f = y` or `expr.mutate()`,
+   * may cause the mutated value to be written back via a setter call.
+   *
+   * `expr` is an expression in getter position, such as a member access.
+   */
+  bindingset[expr]
+  predicate mayWriteBackViaSetterCall(Expr expr) { none() }
+}
+
+/**
+ * Holds if a read/store step with the given `contents` should be converted to a value step.
+ */
+predicate bypassContentSet(ContentSet contents) { any(DataFlowPlugin p).bypassContentSet(contents) }
+
+/**
+ * Holds if there is flow from `expr1` to `expr2` and the post-updated value of `expr2` (if any) should propagate back to
+ * the post-update for `expr1`.
+ */
+predicate exprStep(Expr expr1, Expr expr2, boolean mustFlow) {
+  any(DataFlowPlugin p).exprStep(expr1, expr2, mustFlow)
+}
+
+/**
+ * Holds if mutating the value of `expr` in-place, such as `expr.f = y` or `expr.mutate()`,
+ * may cause the mutated value to be written back via a setter call.
+ */
+bindingset[expr]
+predicate mayWriteBackViaSetterCall(Expr expr) {
+  any(DataFlowPlugin p).mayWriteBackViaSetterCall(expr)
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowPluginSwift.qll b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowPluginSwift.qll
new file mode 100644
index 000000000000..f845a5f20f3c
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowPluginSwift.qll
@@ -0,0 +1,134 @@
+/**
+ * Provides Swift-specific data flow rules.
+ */
+
+private import unified
+private import AllDataFlow
+private import codeql.unified.internal.ExprPositions
+private import codeql.unified.internal.typeinference.TypeInference as T
+
+private predicate isReferenceType(T::Type t) {
+  // todo: type parameters with type constraints
+  t.asClass().hasModifier(["actor", "class"])
+}
+
+private class SwiftDataFlowPlugin extends DataFlowPlugin {
+  // Note: For now we assume all code is Swift, but in the future we must restrict these rules to Swift-files
+  override predicate bypassContentSet(ContentSet contents) {
+    contents.asSingleton().asNamedMember() = "some.0"
+  }
+
+  // Swift writes back mutated values of computed value-type properties via their setter
+  bindingset[expr]
+  override predicate mayWriteBackViaSetterCall(Expr expr) {
+    exists(boolean direct | isInWriteBackPosition(expr, direct) |
+      if direct = false then not isReferenceType(T::inferTypeUnique(expr)) else any()
+    )
+  }
+
+  override predicate exprStep(Expr expr1, Expr expr2, boolean mustFlow) {
+    mustFlow = true and
+    exists(UnaryExpr expr |
+      expr.getOperator().(PrefixOperator).getValue() = "&"
+      or
+      expr.getOperator().(PostfixOperator).getValue() = "!"
+    |
+      expr1 = expr.getOperand() and
+      expr2 = expr
+    )
+    or
+    mustFlow = true and
+    exists(TypeCastExpr expr |
+      // Type-cast operators:
+      // - "as": Safe upcast conversion
+      // - "as?": Wrap in Optional<T> if cast succeeds
+      // - "as!": Throw if cast fails
+      //
+      // Since we bypass Optional<T> content, we model all of these as must-flow steps.
+      expr.getOperator().getValue() = ["as", "as?", "as!"] and
+      expr1 = expr.getExpr() and
+      expr2 = expr
+    )
+  }
+
+  override predicate step(BuilderNode node1, Step step, BuilderNode node2) {
+    exists(BinaryExpr expr |
+      expr.getOperator().getValue() = ["+", "+="] and
+      node1.isResultValue([expr.getLeft(), expr.getRight()]) and
+      step.taint() and
+      node2.isResultValue(expr)
+    )
+    or
+    exists(CallExpr call |
+      // String interpolations in Swift currently insert a call to a built-in called "interpolation".
+      // Add taint through plain 1-argument calls to this built-in.
+      call.getCallee().(BuiltinExpr).getValue() = "interpolation" and
+      call.getNumberOfArguments() = 1 and
+      not exists(call.getArgument(0).getName()) and
+      node1.isResultValue(call.getArgument(0).getValue()) and
+      step.value() and
+      node2.isResultValue(call)
+    )
+    or
+    exists(UnaryExpr expr |
+      expr.getOperator().(PrefixOperator).getValue() = ["try", "try!", "try?", "await"] and
+      node1.isResultValue(expr.getOperand()) and
+      step.value() and
+      node2.isResultValue(expr)
+    )
+    or
+    exists(NullCoalescingExpr expr |
+      // We bypass Optional<T> content so we add value-flow out of both operands of "??"
+      node1.isResultValue(expr.getAnOperand()) and
+      step.value() and
+      node2.isResultValue(expr)
+    )
+    or
+    // Taint flow through URL(string: x). TODO: Model with MaD and flow summaries
+    exists(CallExpr call |
+      call.getCallee().(Identifier).getValue() = ["URL", "NSURL"] and
+      node1.isResultValue(call.getNamedArgument("string")) and
+      step.taint() and
+      node2.isResultValue(call)
+    )
+    or
+    // Singleton blocks propagate their value upwards, e.g. in `if expr { expr } else { expr }`
+    exists(Block block |
+      not exists(block.getStmt(1)) and
+      node1.isResultValue(block.getStmt(0)) and
+      step.value() and
+      node2.isResultValue(block)
+    )
+  }
+}
+
+/**
+ * Holds if `expr` is target of an assignment or 'inout' argument,
+ * or the base of such an expression, e.g. `x` in `x.f1.f2 = foo()`
+ */
+private predicate isInWriteBackPosition(Expr expr, boolean direct) {
+  isInAssignmentContext(expr, _) and
+  direct = false
+  or
+  // Arguments to an 'inout' parameter must be prefixed with '&'
+  exists(UnaryExpr unary |
+    unary.getOperator().(PrefixOperator).getValue() = "&" and
+    unary.getOperand() = expr
+    // TODO: support custom operators with an 'inout' parameter, which lack the '&' indicator
+  ) and
+  direct = true
+  or
+  // The receiver of a call to a 'mutating' function counts as an 'inout' argument
+  exists(CallExpr call, Callable target |
+    target = T::resolveCallTarget(call) and
+    target.hasModifier("mutating") and
+    expr = call.getCallee().(MemberAccessExpr).getBase()
+  ) and
+  direct = true
+  or
+  exists(MemberAccessExpr member |
+    isInWriteBackPosition(member, _) and
+    expr = member.getBase() and
+    direct = false
+  )
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowPublic.qll b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowPublic.qll
new file mode 100644
index 000000000000..b25ca7202505
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowPublic.qll
@@ -0,0 +1,13 @@
+private import unified
+private import AllDataFlow
+private import AllDataFlow as D
+
+module DataFlow {
+  class Node = D::Node;
+
+  import DataFlowOutput
+}
+
+module TaintTracking {
+  import TaintTrackingOutput
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/FlowSummary.qll b/unified/ql/lib/codeql/unified/internal/dataflow/FlowSummary.qll
new file mode 100644
index 000000000000..c4676aa46ea2
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/FlowSummary.qll
@@ -0,0 +1,154 @@
+private import unified
+private import AllDataFlow
+private import codeql.dataflow.internal.FlowSummaryImpl
+private import codeql.util.Void
+private import codeql.unified.internal.mad.LegacyMaD as LegacyMaD
+private import codeql.dataflow.internal.AccessPathSyntax as AccessPathSyntax
+
+module FlowSummaryInput implements InputSig<Location, DataFlowInput> {
+  class SummarizedCallableBase extends LegacyMaD::Selector {
+    SummarizedCallableBase() { LegacyMaD::normalizedSummaryModel(this, _, _, _, _) }
+
+    Location getLocation() { none() }
+  }
+
+  predicate callableFromSource(SummarizedCallableBase c) { none() }
+
+  predicate neutralElement(SummarizedCallableBase c, string kind, string provenance, boolean isExact) {
+    none()
+  }
+
+  class FlowSummaryCallBase extends Void {
+    Location getLocation() { none() }
+  }
+
+  FlowSummaryCallBase getASourceCall(SummarizedCallableBase sc) { none() }
+
+  DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
+    result.asSummarizedCallable() = c
+  }
+
+  ArgumentPosition callbackSelfParameterPosition() { result.isCallee() }
+
+  DataFlowInput::ReturnKind getStandardReturnValueKind() { result.isStandardReturnValue() }
+
+  string encodeParameterPosition(ParameterPosition pos) { result = pos.asModelOperand() }
+
+  string encodeArgumentPosition(ArgumentPosition pos) { result = pos.asModelOperand() }
+
+  string encodeContent(ContentSet c, string arg) {
+    result = "ArrayElement" and
+    c.asSingleton().isArrayElement() and
+    arg = ""
+    or
+    result = "Member" and
+    arg = c.asSingleton().asNamedMember()
+  }
+
+  string encodeReturn(DataFlowInput::ReturnKind rk, string arg) {
+    result = "ReturnValue" and
+    rk.isStandardReturnValue() and
+    arg = ""
+  }
+
+  string encodeWithoutContent(ContentSet c, string arg) {
+    result = "Without" + encodeContent(c, arg)
+  }
+
+  string encodeWithContent(ContentSet c, string arg) { result = "With" + encodeContent(c, arg) }
+
+  bindingset[token]
+  ContentSet decodeUnknownContent(AccessPathSyntax::AccessPathTokenBase token) {
+    // Adapters for the old Swift MaD models
+    token = "OptionalSome" and result = ContentSet::namedMember("some.0")
+    or
+    token = "CollectionElement" and result = ContentSet::arrayElement()
+    or
+    token.getName() = "TupleElement" and
+    result = ContentSet::namedMember(AccessPathSyntax::parseInt(token.getAnArgument()).toString())
+  }
+
+  bindingset[token]
+  ContentSet decodeUnknownWithoutContent(AccessPathSyntax::AccessPathTokenBase token) {
+    token = "WithoutOptionalSome" and result = ContentSet::namedMember("some.0")
+    or
+    token = "WithoutCollectionElement" and result = ContentSet::arrayElement()
+  }
+
+  bindingset[token]
+  ContentSet decodeUnknownWithContent(AccessPathSyntax::AccessPathTokenBase token) {
+    token = "WithOptionalSome" and result = ContentSet::namedMember("some.0")
+    or
+    token = "WithCollectionElement" and result = ContentSet::arrayElement()
+  }
+}
+
+private module FlowSummaryOutput1 = Make<Location, DataFlowInput, FlowSummaryInput>;
+
+private import FlowSummaryOutput1::Private
+private import FlowSummaryOutput1::Public
+
+private module FlowSummaryInput2 implements InputSig2 {
+  class SourceSinkReportingElement extends Void {
+    Location getLocation() { none() }
+
+    DataFlowCallable getEnclosingCallable() { none() }
+
+    SourceSinkReportingElement getASuccessor(SummaryComponent sc) { none() }
+  }
+}
+
+private module FlowSummaryOutput2 = Make2<FlowSummaryInput2>;
+
+private import FlowSummaryOutput2
+
+Node getNodeFromSummaryNode(SummaryNode node) { result = TSummaryNode(node) }
+
+SummaryNode getSummaryNode(Node n) { n = TSummaryNode(result) }
+
+private predicate getSummaryNodeAlias = getSummaryNode/1;
+
+private module StepsInput implements StepsInputSig {
+  predicate getSummaryNode = getSummaryNodeAlias/1;
+
+  DataFlowCall getACall(SummarizedCallable sc) { sc.matchesCall(result.asExplicitCall()) }
+}
+
+private import StepsInput
+
+private module StepsOutput = Steps<StepsInput>;
+
+module FlowSummaryOutput {
+  module Private = FlowSummaryOutput1::Private;
+
+  import FlowSummaryOutput1::Public
+  import FlowSummaryOutput2
+  import StepsOutput
+
+  module RenderSummarizedCallable = FlowSummaryOutput2::RenderSummarizedCallable<StepsInput>;
+}
+
+class SummaryNode = FlowSummaryOutput::SummaryNode;
+
+class SummarizedCallable = FlowSummaryOutput::SummarizedCallable;
+
+private class SummarizedCallableFromModel extends SummarizedCallable {
+  SummarizedCallableFromModel() { LegacyMaD::normalizedSummaryModel(this, _, _, _, _) }
+
+  override predicate propagatesFlow(
+    string input, string output, boolean preservesValue, Provenance p, boolean isExact, string model
+  ) {
+    isExact = true and
+    model = "" and // TODO
+    exists(string kind |
+      LegacyMaD::normalizedSummaryModel(this, input, output, kind, p) and
+      (
+        kind = "value" and
+        preservesValue = true
+        or
+        kind = "taint" and
+        preservesValue = false
+      )
+    )
+  }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/LocalSsa.qll b/unified/ql/lib/codeql/unified/internal/dataflow/LocalSsa.qll
new file mode 100644
index 000000000000..705ea43fdfdb
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/LocalSsa.qll
@@ -0,0 +1,104 @@
+/**
+ * SSA for non-captured variables.
+ */
+
+private import unified
+private import unified as U
+private import AllDataFlow
+private import codeql.ssa.Ssa
+private import codeql.util.Void
+
+module LocalSsaInput implements InputSig<Location, BasicBlock> {
+  class SourceVariable extends LocalVariable {
+    SourceVariable() { not this.isCaptured() and not this instanceof ComputedLocalVariable }
+  }
+
+  predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    certain = true and
+    (
+      performsVariableAccess(_, v, TWrite(), bb.getNode(i))
+      or
+      // Add implicit initialization of all variables at index -1 before the entry block
+      bb.(EntryBasicBlock).getEnclosingCallable() = v.getDeclaringCallable() and
+      i = -1
+    )
+  }
+
+  predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    certain = true and
+    performsVariableAccess(_, v, TRead(), bb.getNode(i))
+  }
+
+  predicate variableReadWithPostUpdate(
+    BasicBlock bb1, int i1, SourceVariable v, BasicBlock bb2, int i2
+  ) {
+    exists(U::AstNode repr |
+      performsVariableAccess(repr, v, TRead(), bb1.getNode(i1)) and
+      performsVariableAccess(repr, v, TPostUpdate(), bb2.getNode(i2))
+    )
+  }
+}
+
+module LocalSsaOutput = Make<Location, Cfg, LocalSsaInput>;
+
+private import LocalSsaOutput
+
+module LocalSsaDataFlowInput implements DataFlowIntegrationInputSig {
+  class Expr extends ControlFlowNode {
+    predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i) }
+  }
+
+  class GuardValue = Void;
+
+  class Guard extends Void {
+    string toString() { none() }
+
+    predicate hasValueBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue val) { none() }
+
+    predicate valueControlsBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue val) { none() }
+  }
+
+  predicate guardDirectlyControlsBlock(Guard guard, BasicBlock bb, GuardValue val) { none() }
+}
+
+module LocalSsaDataFlowOutput = DataFlowIntegration<LocalSsaDataFlowInput>;
+
+private module Ssa = LocalSsaDataFlowOutput;
+
+Stage2Node getNodeFromLocalSsaNode(Ssa::Node n) {
+  result = TLocalSsaNode(n)
+  or
+  exists(ControlFlowNode cfgnode, LocalVariable v, AstNode repr |
+    n.(Ssa::ExprNode).isExprAndVariable(cfgnode, v) and
+    performsVariableAccess(repr, v, TRead(), cfgnode) and
+    result.(BuilderNode).isLocalVariableRead(repr, v)
+  )
+  or
+  exists(ControlFlowNode cfgnode, LocalVariable v, AstNode repr |
+    n.(Ssa::ExprPostUpdateNode).isExprAndVariable(cfgnode, v) and
+    performsVariableAccess(repr, v, TPostUpdate(), cfgnode) and
+    result.(BuilderNode).isLocalVariablePostUpdate(repr, v)
+  )
+  or
+  exists(LocalVariable v, BasicBlock bb, int i, AstNode repr |
+    n.(Ssa::WriteDefSourceNode).getDefinition().definesAt(v, bb, i) and
+    performsVariableAccess(repr, v, TWrite(), bb.getNode(i)) and
+    result.(BuilderNode).isLocalVariableWrite(repr, v)
+  )
+}
+
+predicate localSsaStep(Stage2Node node1, Stage2Node node2, boolean isUseStep) {
+  exists(Ssa::Node ssa1, Ssa::Node ssa2 |
+    Ssa::localFlowStep(_, ssa1, ssa2, isUseStep) and
+    node1 = getNodeFromLocalSsaNode(ssa1) and
+    node2 = getNodeFromLocalSsaNode(ssa2)
+  )
+}
+
+predicate localSsaMustFlowStep(Stage2Node node1, Stage2Node node2) {
+  exists(Ssa::Node ssa1, Ssa::Node ssa2 |
+    Ssa::localMustFlowStep(_, ssa1, ssa2) and
+    node1 = getNodeFromLocalSsaNode(ssa1) and
+    node2 = getNodeFromLocalSsaNode(ssa2)
+  )
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/LocalVariableRefNode.qll b/unified/ql/lib/codeql/unified/internal/dataflow/LocalVariableRefNode.qll
new file mode 100644
index 000000000000..6d54df58f9bd
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/LocalVariableRefNode.qll
@@ -0,0 +1,25 @@
+private import unified
+private import AllDataFlow
+
+/**
+ * A reference to a local variable (read, write, or post-update).
+ *
+ * This is backed by same entity as the corresponding data-flow node, but is referenced before
+ * the full `Node` type has been materialised (during SSA construction).
+ */
+class LocalVariableRefNode extends BuilderNode, TLocalVariableRefNode {
+  private AstNode repr;
+  private LocalVariable var;
+  private VariableRefKind kind;
+
+  LocalVariableRefNode() { this = TLocalVariableRefNode(repr, var, kind) }
+
+  predicate hasCfgNode(BasicBlock bb, int i) {
+    this = TLocalVariableRefNode(repr, var, kind) and
+    performsVariableAccess(repr, var, kind, bb.getNode(i))
+  }
+
+  LocalVariable getVariable() { result = var }
+
+  VariableRefKind getRefKind() { result = kind }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/ParameterPositions.qll b/unified/ql/lib/codeql/unified/internal/dataflow/ParameterPositions.qll
new file mode 100644
index 000000000000..d8c49d12a286
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/ParameterPositions.qll
@@ -0,0 +1,50 @@
+private import unified
+
+private newtype TParameterPosition =
+  TReceiverParameter() or
+  TCalleeParameter() or
+  TPositionalParameter(int n) { n = [0 .. 20] } or
+  TNamedParameter(string name) {
+    name = any(Parameter p).getExternalName()
+    or
+    name = any(Argument arg).getName()
+  }
+
+class ParameterPosition extends TParameterPosition {
+  /** Holds if this represents the receiver passed to a call (usually called `this` or `self`). */
+  predicate isReceiver() { this = TReceiverParameter() }
+
+  /** Holds if this represents the function value being invoked in a call. */
+  predicate isCallee() { this = TCalleeParameter() }
+
+  int asPositional() { this = TPositionalParameter(result) }
+
+  string asNamed() { this = TNamedParameter(result) }
+
+  /** Gets the operand to `Parameter`/`Argument` that represents this position in a MaD model. */
+  string asModelOperand() {
+    this.isReceiver() and result = "self"
+    or
+    this.isCallee() and result = "callee"
+    or
+    result = this.asPositional().toString()
+    or
+    // Suffix with a colon to prevent a confusing name clash with "receiver". This also aligns with MaD syntax.
+    result = this.asNamed() + ":"
+  }
+
+  /** Gets a string representation of this position. */
+  string toString() { result = this.asModelOperand() }
+}
+
+class ArgumentPosition = ParameterPosition;
+
+/** A parameter position that is either `receiver` or `callee`. */
+class ImplicitParameterPosition extends ParameterPosition {
+  ImplicitParameterPosition() { this.isReceiver() or this.isCallee() }
+}
+
+/** An argument position that is either `receiver` or `callee`. */
+class ImplicitArgumentPosition = ImplicitParameterPosition;
+
+predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { apos = ppos }
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/Step.qll b/unified/ql/lib/codeql/unified/internal/dataflow/Step.qll
new file mode 100644
index 000000000000..c4f3fc10e24d
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/Step.qll
@@ -0,0 +1,71 @@
+private import unified
+private import AllDataFlow
+
+private newtype TStep =
+  TValueStep() or
+  TValueMustFlowStep() or
+  TJumpStep() or
+  TTaintStep() or
+  TReadStep(ContentSet contents) or
+  TStoreStep(ContentSet contents) or
+  TCallGraphStep()
+
+/**
+ * A type of data flow step, used during construction of the data flow graph.
+ */
+class Step extends TStep {
+  /** Holds if this represents a value-preserving step. */
+  predicate value() { this = TValueStep() }
+
+  /** Holds if this represents a value-preserving step with must-flow, meaning this step is the only way a value can reach the target node. */
+  predicate valueMustFlow() { this = TValueMustFlowStep() }
+
+  /** Holds if this represents a value-preserving jump step (propagating across unrelated call stacks). */
+  predicate jump() { this = TJumpStep() }
+
+  /** Holds if this represents a taint-preserving step. */
+  predicate taint() { this = TTaintStep() }
+
+  /** Holds if this represents a step reading `contents`. */
+  predicate read(ContentSet contents) { this = TReadStep(contents) }
+
+  /** Holds if this represents a step reading the named member `name`. */
+  pragma[nomagic]
+  predicate readName(string name) { this.read(ContentSet::namedMember(name)) }
+
+  /** Holds if this represents a step reading an element from an array. */
+  pragma[nomagic]
+  predicate readArrayElement() { this.read(ContentSet::arrayElement()) }
+
+  /** Holds if this represents a step storing into `contents`. */
+  predicate store(ContentSet contents) { this = TStoreStep(contents) }
+
+  /** Holds if this represents a step storing into the named member `name`. */
+  pragma[nomagic]
+  predicate storeName(string name) { this.store(ContentSet::namedMember(name)) }
+
+  /** Holds if this represents a step storing a value into an array. */
+  pragma[nomagic]
+  predicate storeArrayElement() { this.store(ContentSet::arrayElement()) }
+
+  /** Holds if this step can only be used for call graph construction. */
+  predicate callGraph() { this = TCallGraphStep() }
+
+  string toString() {
+    this.value() and result = "value"
+    or
+    this.valueMustFlow() and result = "value-must"
+    or
+    this.jump() and result = "jump"
+    or
+    this.taint() and result = "taint"
+    or
+    exists(ContentSet contents |
+      this.read(contents) and result = "read[" + contents + "]"
+      or
+      this.store(contents) and result = "store[" + contents + "]"
+    )
+    or
+    this.callGraph() and result = "call-graph"
+  }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/TaintTrackingInstantiation.qll b/unified/ql/lib/codeql/unified/internal/dataflow/TaintTrackingInstantiation.qll
new file mode 100644
index 000000000000..bb5d27324278
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/TaintTrackingInstantiation.qll
@@ -0,0 +1,20 @@
+private import unified
+private import AllDataFlow
+private import codeql.dataflow.TaintTracking
+
+module TaintTrackingInput implements InputSig<Location, DataFlowInput> {
+  predicate defaultTaintSanitizer(Node node) { none() } // TODO
+
+  predicate defaultAdditionalTaintStep(Node src, Node sink, string model) {
+    step(src, any(Step s | s.taint()), sink) and model = ""
+    or
+    FlowSummaryOutput::summaryLocalStep(src, sink, false, model)
+  }
+
+  bindingset[node]
+  predicate defaultImplicitTaintRead(Node node, ContentSet c) { none() } // TODO
+
+  predicate speculativeTaintStep(Node src, Node sink) { none() } // TODO
+}
+
+module TaintTrackingOutput = TaintFlowMake<Location, DataFlowInput, TaintTrackingInput>;
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/VariableRefKind.qll b/unified/ql/lib/codeql/unified/internal/dataflow/VariableRefKind.qll
new file mode 100644
index 000000000000..1ae34f665704
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/VariableRefKind.qll
@@ -0,0 +1,22 @@
+private import unified
+
+newtype TVariableRefKind =
+  TRead() or
+  TWrite() or
+  TPostUpdate()
+
+class VariableRefKind extends TVariableRefKind {
+  predicate isRead() { this = TRead() }
+
+  predicate isWrite() { this = TWrite() }
+
+  predicate isPostUpdate() { this = TPostUpdate() }
+
+  string toString() {
+    this.isRead() and result = "read"
+    or
+    this.isWrite() and result = "write"
+    or
+    this.isPostUpdate() and result = "post-update"
+  }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dev/debugAst.ql b/unified/ql/lib/codeql/unified/internal/dev/debugAst.ql
new file mode 100644
index 000000000000..bdd63a1750c4
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dev/debugAst.ql
@@ -0,0 +1,50 @@
+/**
+ * @name Pretty print AST as graph
+ * @description Debug the AST by printing it as a graph.
+ * @id unified/debug-ast
+ * @kind graph
+ */
+
+import unified
+
+private predicate skip(AstNode e) { e instanceof Modifier }
+
+AstNode getChild(AstNode n, int index) {
+  result.getParent() = n and
+  result.getParentIndex() = index and
+  not skip(n) and
+  not skip(result)
+}
+
+predicate relevant(AstNode n) {
+  n.getLocation().getFile().getBaseName() = "CLI.swift" and
+  n.getLocation().getStartLine() = [98 .. 120] and
+  not skip(n)
+}
+
+// Add additional node info here
+string tag(AstNode n) { none() }
+
+query predicate nodes(AstNode n, string key, string val) {
+  key = "semmle.label" and
+  relevant(n) and
+  val = concat(string t | t = tag(n)) + " " + n.toString()
+}
+
+// Add additional edge info here
+string etag(AstNode child, AstNode parent) {
+  exists(string name, int i, string arg |
+    PrintAst::getChild(parent, name, i) = child and
+    result = name + arg and
+    if i = -1 then arg = "()" else arg = "(" + i.toString() + ")"
+  )
+}
+
+query predicate edges(AstNode pred, AstNode succ, string attr, string val) {
+  attr = "semmle.label" and
+  relevant(succ) and
+  exists(int i |
+    pred = getChild(succ, i) and
+    val = i + " " + concat(string t | t = etag(pred, succ) | t, ", ")
+  )
+}
diff --git a/unified/ql/lib/codeql/unified/internal/dev/debugDataFlowGraph.ql b/unified/ql/lib/codeql/unified/internal/dev/debugDataFlowGraph.ql
new file mode 100644
index 000000000000..7f79b0d151e7
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dev/debugDataFlowGraph.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Debug data flow graph
+ * @description Renders the data flow graph
+ * @kind graph
+ * @id unified/debug-data-flow-graph
+ */
+
+private import unified
+private import codeql.unified.internal.dataflow.DataFlowGraph
+
+/**
+ * Holds if `node` should be shown in the graph.
+ */
+predicate relevantNode(AstNode node) {
+  // Match an ancestor node by location so its whole subtree is shown.
+  node.getParent*().getLocation().toString().matches("%test.swift@13:%")
+}
+
+import DebugGraph<relevantNode/1>
diff --git a/unified/ql/lib/codeql/unified/internal/dev/debugLocalNameBindingGraph.ql b/unified/ql/lib/codeql/unified/internal/dev/debugLocalNameBindingGraph.ql
new file mode 100644
index 000000000000..4c0db3a049df
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dev/debugLocalNameBindingGraph.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Debug local name-binding graph
+ * @description Renders the graph used to perform local name lookups
+ * @kind graph
+ * @id unified/debug-local-name-binding-graph
+ */
+
+private import unified
+private import codeql.unified.internal.NameBinding
+
+/**
+ * Holds if `node` should be shown in the graph.
+ */
+predicate relevantNode(AstNode node) {
+  // Match an ancestor node by location so its whole subtree is shown.
+  node.getParent*().getLocation().toString().matches("%test.swift@227:%")
+}
+
+import LocalNameBindingOutput::DebugScopeGraph<relevantNode/1>
diff --git a/unified/ql/lib/codeql/unified/internal/dev/debugScopeGraph.ql b/unified/ql/lib/codeql/unified/internal/dev/debugScopeGraph.ql
deleted file mode 100644
index 2f9376b1732e..000000000000
--- a/unified/ql/lib/codeql/unified/internal/dev/debugScopeGraph.ql
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @name Debug scope graph
- * @description Renders the graph used to perform local variable lookups
- * @kind graph
- * @id unified/debug-scope-graph
- */
-
-private import unified
-private import codeql.unified.internal.Variables
-
-/**
- * Holds if `node` should be shown in the graph.
- */
-predicate relevantNode(AstNode node) {
-  // Match an ancestor node by location so its whole subtree is shown.
-  node.getParent*().getLocation().toString().matches("%test.swift@227:%")
-}
-
-import LocalNameBindingOutput::DebugScopeGraph<relevantNode/1>
diff --git a/unified/ql/lib/codeql/unified/internal/dev/debugStaticNameBindingGraph.ql b/unified/ql/lib/codeql/unified/internal/dev/debugStaticNameBindingGraph.ql
new file mode 100644
index 000000000000..e8c97ce41852
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dev/debugStaticNameBindingGraph.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Debug static name-binding graph
+ * @description Renders the graph used to perform static name lookups
+ * @kind graph
+ * @id unified/debug-static-name-binding-graph
+ */
+
+private import unified
+private import codeql.unified.internal.NameBinding
+
+/**
+ * Holds if `node` should be shown in the graph.
+ */
+predicate relevantNode(AstNode node) {
+  // Match an ancestor node by location so its whole subtree is shown.
+  node.getParent*().getLocation().toString().matches("%test.swift@13:%")
+}
+
+import DebugGraph<relevantNode/1>
diff --git a/unified/ql/lib/codeql/unified/internal/dev/debugSummarizedCallable.ql b/unified/ql/lib/codeql/unified/internal/dev/debugSummarizedCallable.ql
new file mode 100644
index 000000000000..5c9097859264
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/dev/debugSummarizedCallable.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Debug summarized callable
+ * @description Renders the data flow graph for a summarized callable
+ * @kind graph
+ * @id unified/debug-summarized-callable
+ */
+
+private import unified
+private import codeql.unified.internal.dataflow.AllDataFlow
+import FlowSummaryOutput::RenderSummarizedCallable
+
+predicate showCallable(SummarizedCallable callable) { callable.getTypeString() = "TestType" }
+
+class DebugCallable extends RelevantSummarizedCallable {
+  DebugCallable() { showCallable(this) }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/mad/LegacyMaD.qll b/unified/ql/lib/codeql/unified/internal/mad/LegacyMaD.qll
new file mode 100644
index 000000000000..09da505b7d0b
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/mad/LegacyMaD.qll
@@ -0,0 +1,381 @@
+/**
+ * Provides an approximate interpreter for MaD models imported from legacy Swift.
+ */
+
+private import unified
+private import codeql.dataflow.internal.AccessPathSyntax
+
+extensible predicate legacySourceModel(
+  string namespace, string type, boolean subtypes, string name, string signature, string ext,
+  string output, string kind, string provenance
+);
+
+extensible predicate legacySinkModel(
+  string namespace, string type, boolean subtypes, string name, string signature, string ext,
+  string input, string kind, string provenance
+);
+
+extensible predicate legacySummaryModel(
+  string namespace, string type, boolean subtypes, string name, string signature, string ext,
+  string input, string output, string kind, string provenance
+);
+
+private predicate modelContainsMethodName(string name) {
+  legacySourceModel(_, _, _, name, _, _, _, _, _)
+  or
+  legacySinkModel(_, _, _, name, _, _, _, _, _)
+  or
+  legacySummaryModel(_, _, _, name, _, _, _, _, _, _)
+}
+
+private predicate parsedRawMethodName(string rawName, string name, string argLabels) {
+  // NOTE: We only support method names at the moment, not property names like `String.count`.
+  modelContainsMethodName(rawName) and
+  exists(string regex |
+    regex = "([^(]+)\\((.*)\\)" and
+    name = rawName.regexpCapture(regex, 1) and
+    argLabels = rawName.regexpCapture(regex, 2)
+  )
+}
+
+private string getSimpleNameFromExpr(Expr e) {
+  result = e.(Identifier).getValue()
+  or
+  result = e.(MemberAccessExpr).getMemberName()
+}
+
+private string getQualifiedNameFromExpr(Expr e) {
+  result = e.(Identifier).getValue()
+  or
+  exists(MemberAccessExpr access | e = access |
+    result = getQualifiedNameFromExpr(access.getBase()) + "." + access.getMemberName()
+  )
+}
+
+private string getArgLabelsFromCall(CallExpr call) {
+  result =
+    concat(Argument arg, string name, int group |
+      arg = call.getAnArgument() and
+      (
+        arg.isPositional() and
+        name = "_" and
+        group = 0
+        or
+        name = arg.getName() and
+        group = 1
+      )
+    |
+      name + ":" order by group, name
+    )
+}
+
+pragma[nomagic]
+private predicate methodCallSelector(CallExpr call, string name, string argLabels) {
+  name = getSimpleNameFromExpr(call.getCallee()) and
+  argLabels = getArgLabelsFromCall(call)
+}
+
+pragma[nomagic]
+private predicate constructorCallSelector(CallExpr call, string name, string argLabels) {
+  (
+    if call.getCallee().(MemberAccessExpr).getMemberName() = "init"
+    then name = getQualifiedNameFromExpr(call.getCallee().(MemberAccessExpr).getBase())
+    else name = getQualifiedNameFromExpr(call.getCallee())
+  ) and
+  argLabels = getArgLabelsFromCall(call)
+}
+
+private predicate isSubclassOfType(ClassLikeDeclaration cls, string typeName) {
+  typeName = any(Selector s).getTypeString() and
+  (
+    getQualifiedNameFromExpr(cls.getABaseType().getType()) = typeName
+    or
+    isSubclassOfType(cls.getABaseClass(), typeName)
+  )
+}
+
+private string getArgLabelsFromCallable(Callable callable) {
+  result =
+    concat(Parameter param, string name, int group |
+      param.getParent() = callable and
+      (
+        param.isPositional() and
+        name = "_" and
+        group = 0
+        or
+        name = param.getExternalName() and
+        group = 1
+      )
+    |
+      name + ":" order by group, name
+    )
+}
+
+pragma[nomagic]
+private predicate callableSelector(
+  FunctionDeclaration callable, string type, string name, string argLabels
+) {
+  name = callable.getName() and
+  argLabels = getArgLabelsFromCallable(callable) and
+  exists(ClassLikeDeclaration cls |
+    callable = cls.getAMemberIncludingExtensions() and
+    isSubclassOfType(cls, type)
+  )
+}
+
+private newtype TSelector =
+  MkSelector(string type, boolean subtypes, string name, string argLabels, string argTypes) {
+    exists(string rawName |
+      legacySourceModel(_, type, subtypes, rawName, argTypes, _, _, _, _)
+      or
+      legacySinkModel(_, type, subtypes, rawName, argTypes, _, _, _, _)
+      or
+      legacySummaryModel(_, type, subtypes, rawName, argTypes, _, _, _, _, _)
+    |
+      parsedRawMethodName(rawName, name, argLabels)
+    )
+  }
+
+/**
+ * A tuple from a model that identifies call sites.
+ */
+class Selector extends TSelector {
+  string getTypeString() { this = MkSelector(result, _, _, _, _) }
+
+  boolean getSubtypesFlag() { this = MkSelector(_, result, _, _, _) }
+
+  string getName() { this = MkSelector(_, _, result, _, _) }
+
+  string getArgLabels() { this = MkSelector(_, _, _, result, _) }
+
+  string getArgTypes() { this = MkSelector(_, _, _, _, result) }
+
+  private string ppSubtypes() {
+    if this.getSubtypesFlag() = true then result = "+" else result = ""
+  }
+
+  string toString() {
+    result =
+      this.getTypeString() + this.ppSubtypes() + "." + this.getName() + "(" + this.getArgLabels() +
+        ")" + this.getArgTypes()
+  }
+
+  /** Holds if `name,argLabels` should be used to join with `methodCallSelector`. */
+  pragma[nomagic]
+  private predicate matchesMethodCallSelector(string name, string argLabels) {
+    this = MkSelector(_, _, name, argLabels, _) and
+    name != "init"
+  }
+
+  /** Holds if `name,argLabels` should be used to join with `constructorCallSelector`. */
+  pragma[nomagic]
+  private predicate matchesConstructorCallSelector(string name, string argLabels) {
+    this = MkSelector(name, _, "init", argLabels, _)
+  }
+
+  predicate matchesCall(CallExpr call) {
+    exists(string name, string argLabels |
+      this.matchesMethodCallSelector(name, argLabels) and
+      methodCallSelector(call, name, argLabels)
+      or
+      this.matchesConstructorCallSelector(name, argLabels) and
+      constructorCallSelector(call, name, argLabels)
+    )
+  }
+
+  predicate matchesCallable(Callable callable) {
+    exists(string type, string name, string argLabels |
+      callableSelector(callable, type, name, argLabels) and
+      this = MkSelector(type, true, name, argLabels, _)
+    )
+  }
+
+  int getPositionalArity() { result = count(int n | this.getArgLabels().splitAt(":", n) = "_") }
+
+  string getANamedArgument() { result = this.getArgLabels().splitAt(":") and result != "_" }
+}
+
+private predicate isAccessPath(string path) {
+  legacySourceModel(_, _, _, _, _, _, path, _, _) // output
+  or
+  legacySinkModel(_, _, _, _, _, _, path, _, _) // input
+  or
+  legacySummaryModel(_, _, _, _, _, _, path, _, _, _) // input
+  or
+  legacySummaryModel(_, _, _, _, _, _, _, path, _, _) // output
+}
+
+private module AccessPathOutput = AccessPath<isAccessPath/1>;
+
+private import AccessPathOutput
+
+/**
+ * Gets the input to `call` specified by `token`. Only singleton access paths are supported.
+ */
+bindingset[call, token]
+private DataFlow::Node getSinkFromCall(CallExpr call, AccessPathToken token) {
+  token.getName() = "Argument" and
+  exists(Argument arg |
+    arg = call.getAnArgument() and
+    result.asExpr() = arg.getValue()
+  |
+    arg.getPositionalIndex() = parseIntUnbounded(token.getAnArgument())
+    or
+    arg.getName() + ":" = token.getAnArgument()
+  )
+  or
+  token.getName() = "Argument" and
+  token.getAnArgument() = "self" and
+  result.isReceiverArgument(call)
+}
+
+/**
+ * Gets the output from `call` specified by `token`. Only singleton access paths are supported.
+ */
+bindingset[call, token]
+private DataFlow::Node getSourceFromCall(CallExpr call, AccessPathToken token) {
+  token = "ReturnValue" and
+  result.asExpr() = call
+  or
+  result = getSinkFromCall(call, token).getPostUpdateNode()
+}
+
+/**
+ * Gets the sink from `callable` specified by `token`. Only singleton access paths are supported.
+ */
+bindingset[callable, token]
+private DataFlow::Node getSinkFromCallable(Callable callable, AccessPathToken token) {
+  token = "ReturnValue" and
+  result.isReturnNode(callable)
+}
+
+/**
+ * Gets the source from `callable` specified by `token`. Only singleton access paths are supported.
+ */
+bindingset[callable, token]
+private DataFlow::Node getSourceFromCallable(Callable callable, AccessPathToken token) {
+  token.getName() = "Parameter" and
+  exists(Parameter param |
+    param.getParent() = callable and
+    result.asExpr() = param.getPattern()
+  |
+    param.getPositionalIndex() = parseIntUnbounded(token.getAnArgument())
+    or
+    param.getExternalName() + ":" = token.getAnArgument()
+  )
+  or
+  token.getName() = "Parameter" and
+  token.getAnArgument() = "self" and
+  result.isReceiverParameter(callable)
+}
+
+private predicate normalizedSourceModel(
+  Selector selector, AccessPath output, string kind, string provenance
+) {
+  exists(
+    string type, boolean subtypes, string rawName, string name, string argLabels, string argTypes
+  |
+    legacySourceModel(_, type, subtypes, rawName, argTypes, _, output, kind, provenance) and
+    parsedRawMethodName(rawName, name, argLabels) and
+    selector = MkSelector(type, subtypes, name, argLabels, argTypes)
+  )
+}
+
+private predicate normalizedSinkModel(
+  Selector selector, AccessPath output, string kind, string provenance
+) {
+  exists(
+    string type, boolean subtypes, string rawName, string name, string argLabels, string argTypes
+  |
+    legacySinkModel(_, type, subtypes, rawName, argTypes, _, output, kind, provenance) and
+    parsedRawMethodName(rawName, name, argLabels) and
+    selector = MkSelector(type, subtypes, name, argLabels, argTypes)
+  )
+}
+
+predicate normalizedSummaryModel(
+  Selector selector, string input, string output, string kind, string provenance
+) {
+  exists(
+    string type, boolean subtypes, string rawName, string name, string argLabels, string argTypes
+  |
+    legacySummaryModel(_, type, subtypes, rawName, argTypes, _, input, output, kind, provenance) and
+    parsedRawMethodName(rawName, name, argLabels) and
+    selector = MkSelector(type, subtypes, name, argLabels, argTypes)
+  )
+}
+
+/**
+ * Gets a flow source with the given `kind` and `provenance`.
+ */
+DataFlow::Node getASource(string kind, string provenance) {
+  exists(Selector selector, AccessPath output |
+    normalizedSourceModel(selector, output, kind, provenance)
+  |
+    exists(CallExpr call |
+      selector.matchesCall(call) and
+      result = getSourceFromCall(call, output)
+    )
+    or
+    exists(Callable callable |
+      selector.matchesCallable(callable) and
+      result = getSourceFromCallable(callable, output)
+    )
+  )
+}
+
+/**
+ * Gets a sink with the given `kind` and `provenance`.
+ */
+DataFlow::Node getASink(string kind, string provenance) {
+  exists(Selector selector, AccessPath input |
+    normalizedSinkModel(selector, input, kind, provenance)
+  |
+    exists(CallExpr call |
+      selector.matchesCall(call) and
+      result = getSinkFromCall(call, input)
+    )
+    or
+    exists(Callable callable |
+      selector.matchesCallable(callable) and
+      result = getSinkFromCallable(callable, input)
+    )
+  )
+}
+
+module Public {
+  /** Provides access to data from library models. */
+  module Models {
+    /** Holds if `node` is a source of the given `kind`. */
+    predicate isSource(DataFlow::Node node, string kind) { node = getASource(kind, _) }
+
+    /** Holds if `node` is a sink of the given `kind`. */
+    predicate isSink(DataFlow::Node node, string kind) { node = getASink(kind, _) }
+  }
+}
+
+private module Debug {
+  query predicate invalidAccessPath(Selector selector, AccessPathToken ap) {
+    (
+      normalizedSourceModel(selector, ap, _, _)
+      or
+      normalizedSinkModel(selector, ap, _, _)
+      or
+      normalizedSummaryModel(selector, ap, _, _, _)
+      or
+      normalizedSummaryModel(selector, _, ap, _, _)
+    ) and
+    ap.getName() = ["Argument", "Parameter"] and
+    (
+      exists(int n |
+        parseInt(ap.getAnArgument()) = n and
+        not n in [0 .. selector.getPositionalArity() - 1]
+      )
+      or
+      exists(string name |
+        name = ap.getAnArgument().regexpCapture("(.*):", 1) and
+        not name = selector.getANamedArgument()
+      )
+    )
+  }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/typeinference/Type.qll b/unified/ql/lib/codeql/unified/internal/typeinference/Type.qll
new file mode 100644
index 000000000000..0395b24b028a
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/typeinference/Type.qll
@@ -0,0 +1,237 @@
+/** Provides classes representing types without type arguments. */
+overlay[local?]
+module;
+
+import unified // reexport in order to shadow e.g. the `TypeParameter` class
+private import unified as Unified
+private import TypeInference
+private import codeql.unified.internal.StaticNameBinding
+
+/**
+ * Holds if `a` is an associated type of `c`, in which case we model it
+ * as a type parameter.
+ *
+ * `inherited` indicates whether the associated type is declared in `c`
+ * or inherited from a base class.
+ */
+private predicate associatedTypeParameter(
+  ClassLikeDeclaration c, AssociatedTypeDeclaration a, boolean inherited
+) {
+  a = c.getAMember() and
+  inherited = false
+  or
+  exists(string name |
+    associatedTypeParameterInherited(c, a, _, _, name) and
+    not c.getAMember().(TypeAliasDeclaration).getName() = name and
+    inherited = true
+  )
+}
+
+pragma[nomagic]
+predicate associatedTypeParameterInherited(
+  ClassLikeDeclaration c, AssociatedTypeDeclaration a, ClassLikeDeclaration base, Expr baseRef,
+  string name
+) {
+  associatedTypeParameter(base, a, _) and
+  baseRef = c.getABaseType().getType() and
+  base.getNameNode() = getStaticBindingTargetFromRef(baseRef) and
+  name = a.getName()
+}
+
+cached
+newtype TType =
+  TClassLikeDeclarationType(ClassLikeDeclaration c) {
+    CachedStage::ref() and
+    exists(c.getNameNode())
+  } or
+  TClosureParameterPseudoType(Parameter p) {
+    exists(FunctionExpr fe |
+      p = fe.getAParameter() and
+      not exists(p.getType())
+    )
+  } or
+  TTypeParameterType(Unified::TypeParameter tp) or
+  TAssociatedTypeParameterType(
+    ClassLikeDeclaration c, AssociatedTypeDeclaration a, boolean inherited
+  ) {
+    associatedTypeParameter(c, a, inherited)
+  } or
+  TUnknownType() or
+  TUnknownTypeTypeParameter(int i) { i in [0 .. 20] }
+
+final class Type = TypeImpl;
+
+/**
+ * A type without type arguments.
+ */
+abstract private class TypeImpl extends TType {
+  /**
+   * Gets the `i`th positional type parameter of this type, if any.
+   *
+   * This excludes synthetic type parameters, such as associated types.
+   */
+  abstract TypeParameter getPositionalTypeParameter(int i);
+
+  /**
+   * Gets a type parameter of this type.
+   *
+   * This includes both positional type parameters and synthetic type parameters,
+   * such as associated types.
+   */
+  TypeParameter getATypeParameter() { result = this.getPositionalTypeParameter(_) }
+
+  /** Gets the name node of this type, if any. */
+  abstract Identifier getNameNode();
+
+  /** Gets a textual representation of this type. */
+  abstract string toString();
+
+  /** Gets the location of this type. */
+  abstract Location getLocation();
+
+  /** Gets the class whose instances are described by this type. */
+  ClassLikeDeclaration asClass() { this = TClassLikeDeclarationType(result) }
+}
+
+/**
+ * A type representing a class-like declaration.
+ */
+class ClassLikeDeclarationType extends TypeImpl, TClassLikeDeclarationType {
+  ClassLikeDeclaration c;
+
+  ClassLikeDeclarationType() { this = TClassLikeDeclarationType(c) }
+
+  ClassLikeDeclaration getClassLikeDeclaration() { result = c }
+
+  string getName() { result = c.getName() }
+
+  override Identifier getNameNode() { result = c.getNameNode() }
+
+  override TypeParameter getPositionalTypeParameter(int i) {
+    result = TTypeParameterType(c.getTypeParameter(i))
+  }
+
+  override TypeParameter getATypeParameter() {
+    result = super.getATypeParameter()
+    or
+    result = TAssociatedTypeParameterType(c, _, _)
+  }
+
+  override string toString() { result = c.getName() }
+
+  override Location getLocation() { result = c.getLocation() }
+}
+
+/**
+ * A pseudo type that does not correspond to any concrete type in the source code.
+ */
+abstract class PseudoType extends TypeImpl {
+  override Identifier getNameNode() { none() }
+}
+
+/**
+ * A type representing an unknown type.
+ */
+class UnknownType extends PseudoType, TUnknownType {
+  override TypeParameter getPositionalTypeParameter(int i) { result = TUnknownTypeTypeParameter(i) }
+
+  override string toString() { result = "(unknown type)" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
+/**
+ * A type representing a closure parameter.
+ */
+class ClosureParameterPseudoType extends PseudoType, TClosureParameterPseudoType {
+  private Parameter param;
+
+  ClosureParameterPseudoType() { this = TClosureParameterPseudoType(param) }
+
+  Parameter getParam() { result = param }
+
+  override TypeParameter getPositionalTypeParameter(int i) { none() }
+
+  override string toString() { result = "(closure parameter " + param + ")" }
+
+  override Location getLocation() { result = param.getLocation() }
+}
+
+/** A type parameter. */
+abstract class TypeParameter extends TypeImpl {
+  override TypeParameter getPositionalTypeParameter(int i) { none() }
+
+  abstract AstNode getDeclaringItem();
+}
+
+private class IdAstNode =
+  @unified_type_parameter or @unified_class_like_declaration or @unified_associated_type_declaration;
+
+private predicate id(IdAstNode x, IdAstNode y) { x = y }
+
+private predicate idOf(IdAstNode x, int y) = equivalenceRelation(id/2)(x, y)
+
+int idOfTypeParameterAstNode(AstNode node) { idOf(node, result) }
+
+/** A type parameter from source code. */
+class TypeParameterType extends TypeParameter, TTypeParameterType {
+  private Unified::TypeParameter typeParam;
+
+  TypeParameterType() { this = TTypeParameterType(typeParam) }
+
+  Unified::TypeParameter getTypeParameter() { result = typeParam }
+
+  override ClassLikeDeclaration getDeclaringItem() { typeParam = result.getATypeParameter() }
+
+  override Identifier getNameNode() { result = typeParam.getNameNode() }
+
+  override string toString() { result = typeParam.getName() }
+
+  override Location getLocation() { result = typeParam.getLocation() }
+}
+
+/**
+ * An associated type viewed as a type parameter.
+ */
+class AssociatedTypeParameterType extends TypeParameter, TAssociatedTypeParameterType {
+  private Unified::ClassLikeDeclaration c;
+  private Unified::AssociatedTypeDeclaration assocTypeDecl;
+  private boolean inherited;
+
+  AssociatedTypeParameterType() { this = TAssociatedTypeParameterType(c, assocTypeDecl, inherited) }
+
+  Unified::AssociatedTypeDeclaration getAssociatedTypeDeclaration() { result = assocTypeDecl }
+
+  override ClassLikeDeclaration getDeclaringItem() { result = c }
+
+  override Identifier getNameNode() { result = assocTypeDecl.getNameNode() }
+
+  override string toString() {
+    if inherited = true
+    then result = assocTypeDecl.getName() + " (inherited)"
+    else result = assocTypeDecl.getName()
+  }
+
+  override Location getLocation() {
+    if inherited = true then result = c.getLocation() else result = assocTypeDecl.getLocation()
+  }
+}
+
+/**
+ * A type parameter of the special `UnknownType`.
+ */
+class UnknownTypeTypeParameter extends TypeParameter, TUnknownTypeTypeParameter {
+  private int i;
+
+  UnknownTypeTypeParameter() { this = TUnknownTypeTypeParameter(i) }
+
+  override AstNode getDeclaringItem() { none() }
+
+  override Identifier getNameNode() { none() }
+
+  override TypeParameter getPositionalTypeParameter(int j) { none() }
+
+  override string toString() { result = "unknown type parameter " + i }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/typeinference/TypeAbstraction.qll b/unified/ql/lib/codeql/unified/internal/typeinference/TypeAbstraction.qll
new file mode 100644
index 000000000000..cde6a2449e2d
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/typeinference/TypeAbstraction.qll
@@ -0,0 +1,19 @@
+private import unified as Unified
+private import Type
+
+/**
+ * A type abstraction. I.e., a place in the program where type variables may
+ * be introduced.
+ */
+abstract class TypeAbstraction extends AstNode {
+  abstract TypeParameter getATypeParameter();
+}
+
+/**
+ * A class-like declaration. Unlike `ClassLikeDeclarationType`, this includes
+ * declarations that do not define a new type, such as `extension`s in Swift.
+ */
+private class ClassLikeDeclarationTypeAbstraction extends TypeAbstraction instanceof Unified::ClassLikeDeclaration
+{
+  override TypeParameter getATypeParameter() { this = result.getDeclaringItem() }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/typeinference/TypeInference.qll b/unified/ql/lib/codeql/unified/internal/typeinference/TypeInference.qll
new file mode 100644
index 000000000000..34b6c34dc47f
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/typeinference/TypeInference.qll
@@ -0,0 +1,979 @@
+/** Provides functionality for inferring types. */
+
+/*
+ * Known limitations:
+ * - Implicit constructors in classes and structs are not generated by the extractor
+ * - Pattern matching, including enum destructuring
+ * - Inferred qualifiers `.foo`
+ * - Type parameter bounds (`foo<T : Protocol>(x : T)`)
+ * - Type parameter constraints (`foo<T>(x : T) where T: Protocol`); are currently not extracted
+ * - Associated types on type parameters, e.g. `func foo<T : Protocol>(x : T) -> T.AssociatedType`
+ * - `Self` inside protocol extensions
+ * - Type parameters inherited in extensions (extractor change?)
+ * - Primary associated types
+ * - Key paths
+ * - Overloading (both arity based and type based)
+ * - Indexing expressions
+ * - Operations
+ * - Inherited constructors
+ * - Closure short-hand parameters `$0`, `$1`, etc (extractor change?)
+ */
+
+private import codeql.util.Unit
+private import codeql.typeinference.internal.TypeInference
+private import codeql.unified.internal.ParameterEx
+private import codeql.unified.internal.ExprPositions
+private import codeql.unified.internal.NameBinding
+private import utils.test.InlineExpectationsTest
+private import Type
+private import Type as T
+private import TypeAbstraction
+private import TypeAbstraction as TA
+private import TypeMention
+private import TypeInferencePlugin
+private import TypeInferencePlugin as Plugin
+
+class Type = T::Type;
+
+private module Input1 implements InputSig1<Location> {
+  private import Type as T
+
+  class Type = T::Type;
+
+  class PseudoType = T::PseudoType;
+
+  class TypeParameter = T::TypeParameter;
+
+  class TypeAbstraction = TA::TypeAbstraction;
+
+  int getTypeParameterId(TypeParameter tp) {
+    CachedStage::ref() and
+    tp =
+      rank[result](TypeParameter tp0, int kind, int id1, int id2 |
+        kind = 1 and
+        id1 = idOfTypeParameterAstNode(tp0.(TypeParameterType).getTypeParameter()) and
+        id2 = 0
+        or
+        kind = 2 and
+        exists(ClassLikeDeclaration c, AssociatedTypeDeclaration a |
+          tp0 = TAssociatedTypeParameterType(c, a, _) and
+          id1 = idOfTypeParameterAstNode(c) and
+          id2 = idOfTypeParameterAstNode(a)
+        )
+        or
+        kind = 3 and
+        tp0 = TUnknownTypeTypeParameter(id1) and
+        id2 = 0
+      |
+        tp0 order by kind, id1, id2
+      )
+  }
+}
+
+private import Input1
+
+private module M1 = Make1<Location, Input1>;
+
+import M1
+
+predicate getTypePathLimit = Input1::getTypePathLimit/0;
+
+predicate getTypeParameterId = Input1::getTypeParameterId/1;
+
+class TypePath = M1::TypePath;
+
+module TypePath = M1::TypePath;
+
+private module Input2 implements InputSig2<TypeMention> {
+  TypeMention getATypeParameterConstraint(TypeParameter tp) {
+    result = tp.(TypeParameterType).getTypeParameter().getBound()
+  }
+
+  predicate conditionSatisfiesConstraint(
+    TypeAbstraction abs, TypeMention condition, TypeMention constraint, boolean transitive
+  ) {
+    transitive = true and
+    abs =
+      any(ClassLikeDeclaration c |
+        condition = getClassLikeDeclarationTypeMention(c) and
+        constraint = c.getABaseType().getType()
+      )
+  }
+
+  predicate typeParameterIsFunctionallyDetermined(TypeParameter tp) {
+    tp instanceof AssociatedTypeParameterType
+  }
+
+  predicate typeAbstractionHasAmbiguousConstraintAt(
+    TypeAbstraction abs, Type constraint, TypePath path
+  ) {
+    none() // todo
+  }
+}
+
+private import Input2
+
+private module M2 = Make2<TypeMention, Input2>;
+
+import M2
+
+module Input3 implements InputSig3 {
+  private import unified as Unified
+
+  predicate cacheRevRef() {
+    (exists(resolveFieldAccess(_)) implies any())
+    or
+    (exists(resolveAccessorAccess(_)) implies any())
+    or
+    (exists(resolveCallTarget(_)) implies any())
+  }
+
+  predicate inferTypeForDefaults = M3::inferType/2;
+
+  class UnknownType = T::UnknownType;
+
+  class BoolType = Plugin::BoolType;
+
+  class AstNode = Unified::AstNode;
+
+  class Expr extends Unified::Expr {
+    Expr() {
+      isInAssignmentContext(this, _) or
+      hasResultValue(this) or
+      this = Construction::getSyntheticConstructionReceiver(_)
+    }
+  }
+
+  class Cast extends Expr, TypeCastExpr {
+    TypeMention getType() { result = TypeCastExpr.super.getType() }
+  }
+
+  class Switch extends Expr, SwitchExpr {
+    Expr getExpr() { result = super.getValue() }
+
+    Case getCase(int index) { result = super.getCase(index) }
+  }
+
+  class Case extends SwitchCase {
+    AstNode getAPattern() { result = super.getPattern() }
+
+    AstNode getBody() { result = super.getBody() }
+  }
+
+  class ConditionalExpr extends Expr instanceof IfExpr {
+    Expr getCondition() { result = super.getCondition() }
+
+    Expr getThen() { result = super.getThen() }
+
+    Expr getElse() { result = super.getElse() }
+  }
+
+  class BinaryExpr extends Expr, Unified::BinaryExpr {
+    Expr getLeftOperand() { result = super.getLeft() }
+
+    Expr getRightOperand() { result = super.getRight() }
+  }
+
+  class LogicalAndExpr extends BinaryExpr, Unified::LogicalAndExpr { }
+
+  class LogicalOrExpr extends BinaryExpr, Unified::LogicalOrExpr { }
+
+  class Assignment extends BinaryExpr, Unified::Assignment { }
+
+  class AssignExpr extends Assignment, Unified::AssignExpr { }
+
+  class ParenExpr extends Expr {
+    ParenExpr() { none() }
+
+    Expr getExpr() { none() }
+  }
+
+  private newtype TDeclaration =
+    TAstVariableDeclaration(Unified::VariableDeclaration decl) or
+    TCallableDeclaration(Unified::Callable c) or
+    TParameterExDeclaration(ParameterEx p)
+
+  final class Declaration = DeclarationImpl;
+
+  abstract private class DeclarationImpl extends TDeclaration {
+    abstract TypeMention getDeclaringType();
+
+    abstract TypeMention getType();
+
+    abstract Identifier getNameNode();
+
+    abstract string toString();
+
+    abstract Location getLocation();
+
+    pragma[nomagic]
+    predicate isInstanceMemberOf(ClassLikeDeclaration cls, string name) {
+      exists(NamespaceNode ns, Identifier i |
+        ns.isInstanceMemberNamespace(cls) and
+        ns.getMember(name).isIdentifier(i) and
+        i = this.getNameNode()
+      )
+    }
+
+    Unified::Callable asCallable() { this = TCallableDeclaration(result) }
+  }
+
+  class Variable extends LocalNameBindingOutput::Local {
+    Expr getAnAccess() {
+      result = super.getAnAccess() and
+      // for type inference, we want super expressions to have the type of the base class
+      not result instanceof SuperExpr
+    }
+  }
+
+  final class VariableDeclaration = VariableDeclarationImpl;
+
+  abstract private class VariableDeclarationImpl extends DeclarationImpl {
+    abstract AstNode getPattern();
+
+    abstract AstNode getInitializer();
+
+    predicate preservesInitializerType() { any() }
+  }
+
+  private class AstVariableDeclaration extends VariableDeclarationImpl, TAstVariableDeclaration {
+    Unified::VariableDeclaration decl;
+
+    AstVariableDeclaration() { this = TAstVariableDeclaration(decl) }
+
+    Unified::VariableDeclaration getDecl() { result = decl }
+
+    override TypeMention getDeclaringType() { none() }
+
+    override TypeMention getType() { result = decl.getType() }
+
+    override Identifier getNameNode() { result = decl.getPattern() }
+
+    override AstNode getPattern() { result = decl.getPattern() }
+
+    override AstNode getInitializer() { result = decl.getValue() }
+
+    override string toString() { result = decl.toString() }
+
+    override Location getLocation() { result = decl.getLocation() }
+  }
+
+  final class Field = FieldImpl;
+
+  abstract private class FieldImpl extends DeclarationImpl {
+    abstract AstNode getAstNode();
+  }
+
+  private class VariableDeclarationField extends FieldImpl, AstVariableDeclaration {
+    ClassLikeDeclaration cls;
+
+    VariableDeclarationField() { decl = cls.getAMember() }
+
+    override AstNode getAstNode() { result = this.getDecl() }
+
+    override TypeMention getDeclaringType() { result = getClassLikeDeclarationTypeMention(cls) }
+  }
+
+  private class EnumField_ extends VariableDeclarationField {
+    override EnumField decl;
+
+    override TypeMention getType() { result = decl.getEnum().getNameNode() }
+  }
+
+  private class AccessorField extends FieldImpl, Callable {
+    private AccessorDeclaration accessor;
+
+    AccessorField() { accessor = this.getCallable() }
+
+    override TypeMention getType() { result = accessor.getReturnType() }
+
+    override AstNode getAstNode() { result = accessor }
+  }
+
+  abstract class FieldAccess extends Expr {
+    abstract Expr getReceiver();
+
+    abstract Field getField();
+  }
+
+  pragma[nomagic]
+  private predicate lookupMember0(MemberAccessExpr mae, ClassLikeDeclaration cls, string name) {
+    not exists(getStaticBindingTargetFromRef(mae)) and // if a static member can be resolved, use it
+    cls = inferType(mae.getBase()).asClass() and
+    name = mae.getMemberName()
+  }
+
+  pragma[nomagic]
+  private Declaration lookupInstanceMember(MemberAccessExpr mae) {
+    exists(ClassLikeDeclaration cls, string name |
+      lookupMember0(mae, cls, name) and
+      result.isInstanceMemberOf(cls, name)
+    )
+  }
+
+  private class MemberAccessExprFieldAccess extends FieldAccess, MemberAccessExpr {
+    override Expr getReceiver() { result = this.getBase() }
+
+    pragma[nomagic]
+    private predicate isTupleProjection(TupleType tuple, string name) {
+      tuple = inferType(this.getBase()) and
+      name = this.getMemberName()
+    }
+
+    override Field getField() {
+      // mutual recursion; resolving qualified fields requires resolving types and vice versa
+      result = lookupInstanceMember(this)
+      or
+      // also mutual recursion
+      exists(TupleType tuple, string name |
+        this.isTupleProjection(tuple, name) and
+        result.getAstNode() = tuple.getField(name)
+      )
+      or
+      // no mutual recursion; can be resolved directly with static name binding
+      result.getNameNode() = getStaticBindingTargetFromRef(this)
+    }
+  }
+
+  private Type getImplicitReceiverType(UnqualifiedMemberAccess uma, TypePath path) {
+    exists(Parameter p, Unified::Callable c |
+      p.getParameterEx().isImplicitReceiverParameter(c) and
+      c = uma.getImplicitQualifierVariable().getDeclaringCallable() and
+      result = p.getType().getTypeAt(path)
+    )
+  }
+
+  private class UnqualifiedMemberAccessFieldAccess extends FieldAccess, UnqualifiedMemberAccess {
+    override Expr getReceiver() { none() }
+
+    override Field getField() { result.getNameNode() = this.getTarget() }
+  }
+
+  private class LocalAccessorFieldAccess extends FieldAccess, LocalNameAccess {
+    AccessorDeclaration target;
+
+    LocalAccessorFieldAccess() {
+      target = getStaticBindingTargetFromIdentifier(this).getDeclaration()
+    }
+
+    override Expr getReceiver() { none() }
+
+    override Field getField() { result.getAstNode() = target }
+  }
+
+  Type inferFieldAccessReceiverType(FieldAccess fa, TypePath path) {
+    // instance field with explicit receiver
+    result = inferType(fa.getReceiver(), path)
+    or
+    // static field with type qualifier
+    result = fa.(MemberAccessExpr).getBase().(TypeMention).getTypeAt(path)
+    or
+    // field with implicit receiver
+    result = getImplicitReceiverType(fa, path)
+  }
+
+  Type inferFieldAccessReceiverTypeContextual(Expr receiver, TypePath path) {
+    result = M3::inferFieldAccessReceiverTypeContextualDefault(_, receiver, path)
+  }
+
+  class Return extends ReturnExpr {
+    Expr getExpr() { result = this.getValue() }
+  }
+
+  class Parameter extends VariableDeclarationImpl, TParameterExDeclaration {
+    ParameterEx p;
+
+    Parameter() { this = TParameterExDeclaration(p) }
+
+    ParameterEx getParameterEx() { result = p }
+
+    override AstNode getPattern() { result = p.asParameter().getPattern() }
+
+    override AstNode getInitializer() { none() }
+
+    override TypeMention getDeclaringType() { none() }
+
+    override TypeMention getType() {
+      result = p.getType()
+      or
+      exists(Callable c |
+        p.isImplicitReceiverParameter(_) and
+        this = c.getParameter(_) and
+        result = c.getDeclaringType()
+      )
+    }
+
+    override Identifier getNameNode() { none() }
+
+    override string toString() { result = p.toString() }
+
+    override Location getLocation() { result = p.getLocation() }
+  }
+
+  predicate implicitParameterDecl(Parameter p, Variable v) {
+    exists(Unified::Callable c |
+      p.getParameterEx().isImplicitReceiverParameter(c) and
+      v.(LocalVariable).isImplicitReceiverParameter(c)
+    )
+  }
+
+  class Callable extends DeclarationImpl, TCallableDeclaration {
+    Unified::Callable c;
+
+    Callable() { this = TCallableDeclaration(c) }
+
+    Unified::Callable getCallable() { result = c }
+
+    override TypeMention getDeclaringType() {
+      result = c.(EnumConstructor).getEnum().getNameNode()
+      or
+      not c instanceof EnumConstructor and
+      exists(ClassLikeDeclaration cls |
+        c = cls.getAMember() and
+        result = getClassLikeDeclarationTypeMention(cls)
+      )
+    }
+
+    override TypeMention getType() { result = c.getReturnType() }
+
+    override Identifier getNameNode() {
+      result = c.(AccessorDeclaration).getNameNode()
+      or
+      result = c.(FunctionDeclaration).getNameNode()
+      or
+      result = c.(EnumConstructor).getEnclosingClass().getNameNode()
+      or
+      not c instanceof EnumConstructor and
+      result = c.(ConstructorDeclaration).getNameNode()
+    }
+
+    string getName() {
+      result = this.getNameNode().getValue()
+      or
+      c instanceof DestructorDeclaration and
+      result = "<destructor>"
+      or
+      c instanceof InitializerDeclaration and
+      result = "<initializer>"
+    }
+
+    TypeParameter getTypeParameter(int i) {
+      result = TTypeParameterType(c.(FunctionDeclaration).getTypeParameter(i))
+    }
+
+    TypeMention getAdditionalTypeParameterConstraint(TypeParameter tp) {
+      // todo: type equalities?
+      exists(BoundTypeConstraint constraint |
+        constraint = c.(FunctionDeclaration).getATypeConstraint() and
+        tp = constraint.getType().(TypeMention).getType() and
+        result = constraint.getBound()
+      )
+    }
+
+    Parameter getParameter(int i) {
+      exists(ParameterEx param | param = result.getParameterEx() |
+        param.isImplicitReceiverParameter(c) and
+        i = 0
+        or
+        param.asParameter() = c.getParameter(i - 1)
+        or
+        param.isDefaultConstructorParameter(c, i, _)
+      )
+    }
+
+    AstNode getBody() { result = c.getBody() }
+
+    override string toString() { result = c.toString() }
+
+    override Location getLocation() { result = c.getLocation() }
+  }
+
+  Callable getEnclosingCallable(AstNode node) { result.asCallable() = node.getEnclosingCallable() }
+
+  class InvocationResolutionContext = Unit;
+
+  private TypeMention getQualifierTypeMention(CallExpr ce) {
+    result = ce.getCallee()
+    or
+    not ce.getCallee() instanceof TypeMention and
+    result = ce.getCallee().(MemberAccessExpr).getBase()
+  }
+
+  class Invocation extends Expr, CallExpr {
+    Type getTypeQualifier(TypePath path) { result = getQualifierTypeMention(this).getTypeAt(path) }
+
+    Type getTypeArgument(int i, TypePath path) { none() }
+
+    Expr getArgument(int i) {
+      i = 0 and
+      (
+        result = Construction::getSyntheticConstructionReceiver(this)
+        or
+        not exists(Construction::getSyntheticConstructionReceiver(this)) and
+        exists(boolean isFunctionExprInvoke | exists(this.getTargetImpl(isFunctionExprInvoke)) |
+          if isFunctionExprInvoke = true
+          then result = CallExpr.super.getCallee()
+          else result = CallExpr.super.getCallee().(MemberAccessExpr).getBase()
+        )
+      )
+      or
+      result = CallExpr.super.getArgument(i - 1).getValue()
+    }
+
+    /** Gets the special `invoke` target when the callee evaluates to a function expression. */
+    pragma[nomagic]
+    Unified::Callable getInvokeTarget(Type t) {
+      t = inferType(this.getCallee()) and
+      result = getFunctionInvoke(t)
+    }
+
+    Callable getTargetViaStaticNameBinding() {
+      exists(NameBinding b | b = getStaticBindingTargetFromRef(this.getCallee()) |
+        // object creation (including enum constructors): `String(42)`, `Optional.Some(42)`
+        exists(ClassLikeDeclaration cls |
+          cls.getNameNode() = b and
+          result.isInstanceMemberOf(cls, _) and
+          result.asCallable() instanceof ConstructorDeclaration
+        )
+        or
+        // call without explicit receiver: `foo(42)`
+        result.getNameNode() = b
+      )
+    }
+
+    Callable getTargetImpl(boolean isFunctionExprInvoke) {
+      (
+        // mutual recursion; call with explicit receiver: `obj.foo(42)`
+        result = lookupInstanceMember(this.getCallee()) and
+        isFunctionExprInvoke = false
+        or
+        // mutual recursion; call to a function expression: `callback(42)`
+        result.asCallable() = this.getInvokeTarget(_) and
+        isFunctionExprInvoke = true
+        or
+        // no mutual recursion; can be resolved directly with static name binding
+        result = this.getTargetViaStaticNameBinding() and
+        isFunctionExprInvoke = false
+      ) and
+      // handled as a field access
+      not result.asCallable() instanceof AccessorDeclaration
+    }
+
+    Callable getTarget(InvocationResolutionContext c) {
+      result = this.getTargetImpl(_) and
+      exists(c)
+    }
+
+    Callable getATargetForTypeQualifierMatching() { result = this.getTargetViaStaticNameBinding() }
+  }
+
+  Type inferInvocationArgumentType(
+    Invocation invocation, InvocationResolutionContext ctx, int i, TypePath path
+  ) {
+    exists(ctx) and
+    (
+      // A call to a function expression
+      exists(Type t | exists(invocation.getInvokeTarget(t)) |
+        i = 0 and
+        result = inferType(invocation.(CallExpr).getCallee(), path)
+        or
+        exists(TypePath prefix, TypePath suffix, int j |
+          functionInvokeSignature(t, invocation.getNumberOfArguments(), j, i, prefix) and
+          result = inferType(invocation.getArgument(j + 1), suffix) and
+          path = prefix.append(suffix)
+        )
+      )
+      or
+      // A non-function-expression call
+      exists(invocation.getTargetImpl(false)) and
+      (
+        result = inferType(invocation.getArgument(i), path)
+        or
+        i = 0 and
+        result = getImplicitReceiverType(invocation.getCallee(), path)
+      )
+    )
+  }
+
+  Type inferInvocationArgumentTypeContextual(Expr arg, TypePath path) {
+    result = M3::inferInvocationArgumentTypeContextualDefault(_, _, _, arg, path)
+  }
+
+  Type inferInvocationType(Invocation invocation, TypePath path) {
+    result = M3::inferInvocationTypeDefault(invocation, _, path)
+  }
+
+  class Closure extends Callable {
+    private FunctionExpr fe;
+
+    Closure() { fe = this.getCallable() }
+
+    Expr getDefiningExpr() { result = fe }
+  }
+
+  class ClosureParameterPseudoType extends T::ClosureParameterPseudoType {
+    Parameter getParameter() { result.getParameterEx().asParameter() = this.getParam() }
+  }
+
+  pragma[nomagic]
+  Type getClosureType(Closure c) { result = getFunctionExprType(c.getDefiningExpr()) }
+
+  pragma[nomagic]
+  TypePath getClosureParameterTypePath(Parameter p) {
+    exists(FunctionExpr fe, Type t, int i |
+      p.getParameterEx().asParameter() = fe.getParameter(i) and
+      t = getFunctionExprType(fe) and
+      result = getFunctionExprParameterTypePath(t, fe.getNumberOfParameters(), i)
+    )
+  }
+
+  pragma[nomagic]
+  TypePath getClosureReturnTypePath(Closure c) {
+    result = getFunctionExprReturnTypePath(getClosureType(c))
+  }
+
+  predicate stepLanguageSpecific(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
+    n1 = n2.(Block).getLastStmt() and
+    prefix1.isEmpty() and
+    prefix2.isEmpty()
+    or
+    hasResultValue(n2) and
+    n1 = n2.(ArrayLiteral).getAnElement() and
+    prefix1.isEmpty() and
+    prefix2 = TypePath::singleton(getArrayElementTypeParameter())
+    or
+    hasResultValue(n2) and
+    n2 =
+      any(TupleExpr te |
+        exists(int i, int arity, TupleType tt |
+          n1 = te.getElement(i).getValue() and
+          arity = te.getNumberOfElements() and
+          tt.getArity() = arity and
+          prefix1.isEmpty() and
+          prefix2 = TypePath::singleton(tt.getPositionalTypeParameter(i))
+        )
+      )
+  }
+
+  predicate stepLanguageSpecificExtra(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
+    Construction::step(n1, prefix1, n2, prefix2)
+  }
+
+  /**
+   * Provides logic for resolving types of constructor invocations.
+   *
+   * Constructors are treated as instance methods without return types, in order
+   * to be able to handle inherited constructors similar to ordinary instance
+   * methods:
+   *
+   * ```swift
+   * class A<Ta> {
+   *   init(x : Ta) { ... }
+   * }
+   *
+   * class B<Tb> : A<Tb?> { }
+   *
+   * A.init(0);        // (1) has type `A<Int>`
+   * B.init(.some(0)); // (2) has type `B<Int>`
+   * B<Int>(.none);    // (3) has type `B<Int>`
+   * ```
+   *
+   * Because the constructor calls are treated as normal instance method calls,
+   * we use the type qualifier to represent the receiver, and then allow for
+   * contextual type information to flow into the receiver:
+   *
+   * (1) The receiver has type `A`, `Ta` is inferred to be instantiated to `Int`,
+   *     which is propagated directly back into the receiver.
+   * (2) The receiver has type `B`, `Ta` is inferred to be instantiated to `Int?`
+   *     which in turn means `Tb` is inferred to be instantiated to `Int`, which
+   *     is then propagated back into the receiver.
+   * (3) The receiver has type `B<Int>`, and no further type inference is needed.
+   */
+  private module Construction {
+    /**
+     * Gets the AST node that is used to represent the receiver in a constructor
+     * invocation without an actual receiver.
+     */
+    TypeMention getSyntheticConstructionReceiver(Invocation invocation) {
+      invocation.getTargetViaStaticNameBinding().asCallable() instanceof ConstructorDeclaration and
+      result = getQualifierTypeMention(invocation)
+    }
+
+    private predicate constructionReceiver(Invocation i, Callable constructor, Expr receiver) {
+      constructor = i.getTargetImpl(_) and
+      constructor.asCallable() instanceof ConstructorDeclaration and
+      receiver = i.getArgument(0)
+    }
+
+    /**
+     * Since we handle constructors as instance methods without return types,
+     * we need to explicitly handle constructors where (parts of) the type of
+     * the constructed object must be inferred from the context.
+     *
+     * Example:
+     *
+     * ```swift
+     * class C<T1, T2> {
+     *   init(x : T1) { ... } // `T2` must be inferred from the context
+     * }
+     * ```
+     */
+    private module ContextualConstructorReturnTypeInput implements
+      M3::ContextualTyping::ContextualReturnTypeInputSig
+    {
+      predicate callableHasTypeParameterAtReturnType(Callable c, TypePath path, TypeParameter tp) {
+        c.asCallable() instanceof ConstructorDeclaration and
+        tp = c.getDeclaringType().getTypeAt(path)
+      }
+
+      Parameter getACallableParameter(Callable c) {
+        result = c.getParameter(_) and
+        not result.getParameterEx().isImplicitReceiverParameter(_)
+      }
+    }
+
+    private module ContextualConstructorReturnType =
+      M3::ContextualTyping::ContextualReturnType<ContextualConstructorReturnTypeInput>;
+
+    private predicate needsContextualTyping(Invocation i, TypePath path) {
+      exists(Callable constructor, Expr receiver, ClassLikeDeclarationType receiverType |
+        constructionReceiver(i, constructor, receiver) and
+        receiverType = inferType(receiver)
+      |
+        ContextualConstructorReturnType::needsContextualTyping(i, path) and
+        receiverType = constructor.getDeclaringType().getType()
+        or
+        // inherited constructor
+        exists(
+          ClassLikeDeclarationType declType, TypeAbstraction abs, TypeMention constraint,
+          TypeParameter tp
+        |
+          declType = constructor.getDeclaringType().getType() and
+          BaseTypes::rootTypesSatisfaction(receiverType, declType, abs, _, constraint) and
+          path = TypePath::singleton(tp)
+        |
+          // `A<T> : B<T>`
+          exists(TypePath path0 |
+            BaseTypes::conditionSatisfiesConstraintTypeAt(abs, _, constraint, path0, tp) and
+            ContextualConstructorReturnType::needsContextualTyping(i, path0)
+          )
+          or
+          // `A<T> : B`
+          tp = receiverType.getATypeParameter() and
+          not BaseTypes::conditionSatisfiesConstraintTypeAt(abs, _, constraint, _, tp) and
+          not exists(Type t | t = i.getTypeQualifier(path) and not t instanceof PseudoType)
+        )
+      )
+    }
+
+    /**
+     * Propagate type information from the receiver of a construction to the construction
+     * itself.
+     *
+     * Note that this works both for calls with synthetic receivers, `A.init(0)` or `A(0)`,
+     * as well as calls receivers, `self.init(0)` or `super.init(0)`.
+     */
+    predicate step(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
+      constructionReceiver(n2, _, n1) and
+      prefix1.isEmpty() and
+      prefix2.isEmpty()
+    }
+
+    Type inferType(AstNode n, TypePath path) {
+      n =
+        any(TypeMention tm |
+          tm = getSyntheticConstructionReceiver(_) and
+          result = tm.getTypeAt(path)
+        )
+      or
+      needsContextualTyping(n, path) and
+      result instanceof UnknownType
+    }
+
+    predicate allowContextualInference(TypeMention tm, TypePath path) {
+      // For a construction such as `Optional.some(0)`, we need contextual inference
+      // to infer the type of the wrapped object
+      tm = getSyntheticConstructionReceiver(_) and
+      exists(TypePath prefix, Type t, TypeParameter tp |
+        t = tm.getTypeAt(prefix) and
+        not t instanceof UnknownType and
+        tp = t.getATypeParameter() and
+        path = TypePath::snoc(prefix, tp) and
+        not exists(tm.getTypeAt(path))
+      )
+    }
+  }
+
+  Type inferTypeLanguageSpecific(AstNode n, TypePath path) {
+    result = Plugin::inferType(n, path)
+    or
+    n instanceof BooleanLiteral and
+    result instanceof BoolType and
+    path.isEmpty()
+    or
+    n instanceof IntLiteral and
+    result instanceof IntType and
+    path.isEmpty()
+    or
+    n instanceof FloatLiteral and
+    result instanceof FloatType and
+    path.isEmpty()
+    or
+    n instanceof StringLiteral and
+    result instanceof StringType and
+    path.isEmpty()
+    or
+    exists(ClassLikeDeclaration c |
+      c = n.(SuperExpr).getEnclosingClass().resolve() and
+      result = c.getBaseType(0).getType().(TypeMention).getTypeAt(path)
+    )
+    or
+    // `Optional.none` has an unknown `Wrapper` type
+    exists(EnumField_ f, TypeParameter tp |
+      n.(FieldAccess).getField() = f and
+      tp = f.getType().getType().getATypeParameter() and
+      path = TypePath::singleton(tp) and
+      // `Optional<String>.none` does not have an unknown `Wrapper` type
+      not exists(n.(MemberAccessExpr).getBase().(TypeMention).getTypeAt(path))
+    ) and
+    result instanceof UnknownType
+    or
+    hasResultValue(n) and
+    n.(ArrayLiteral).getNumberOfElements() = 0 and
+    path = TypePath::singleton(getArrayElementTypeParameter()) and
+    result instanceof UnknownType
+    or
+    result = Construction::inferType(n, path)
+  }
+
+  pragma[nomagic]
+  Type inferTypeCertainLanguageSpecific(AstNode n, TypePath path) { none() }
+
+  predicate allowContextualInference(AstNode n, TypePath path) {
+    Construction::allowContextualInference(n, path)
+  }
+}
+
+private module M3 = Make3<Input3>;
+
+predicate inferType = M3::inferType/1;
+
+predicate inferType = M3::inferType/2;
+
+predicate inferTypeUnique = M3::inferTypeUnique/1;
+
+predicate inferTypeUnique = M3::inferTypeUnique/2;
+
+predicate inferTypeCertain = M3::inferTypeCertain/2;
+
+module Consistency = M3::Consistency;
+
+module CachedStage = M3::CachedStage;
+
+/**
+ * Gets the field that is accessed by the given expression.
+ *
+ * `access` is either a `MemberAccessExpr` or an `Identifier` (when
+ * the field is accessed with an implicit receiver).
+ */
+cached
+VariableDeclaration resolveFieldAccess(Expr access) {
+  CachedStage::ref() and
+  result = access.(Input3::FieldAccess).getField().getAstNode()
+}
+
+/**
+ * Gets the accessor that is accessed by the given expression.
+ *
+ * Note that we do not attempt to distinguish between different kinds of
+ * accessors; all accessors belonging to the same declaration will be
+ * returned (for example both the getter and setter of a property).
+ *
+ * `access` is either a `MemberAccessExpr` or an `Identifier` (when
+ * the field is accessed with an implicit receiver).
+ */
+cached
+AccessorDeclaration resolveAccessorAccess(Expr access) {
+  CachedStage::ref() and
+  result = access.(Input3::FieldAccess).getField().getAstNode()
+}
+
+/**
+ * Gets the static call target of the given call expression.
+ *
+ * Does not yet take overloading into account.
+ */
+cached
+Callable resolveCallTarget(CallExpr ce) {
+  CachedStage::ref() and
+  result = ce.(Input3::Invocation).getTargetImpl(_).asCallable()
+}
+
+private predicate typeTestAstNodeRepr(AstNode n, string repr) {
+  repr = [n.toString(), n.(Identifier).getValue(), "." + n.(MemberAccessExpr).getMemberName()]
+  or
+  exists(string s |
+    typeTestAstNodeRepr(n.(CallExpr).getCallee(), s) and
+    repr = s + "(...)"
+    or
+    typeTestAstNodeRepr(n.(GenericTypeExpr).getBase(), s) and
+    repr = s + "<...>"
+  )
+}
+
+module TypeTest implements TestSig {
+  private module M = M3::TypeTest<typeTestAstNodeRepr/2>;
+
+  import M
+
+  predicate hasOptionalResult = M::hasOptionalResult/4;
+}
+
+/** Provides predicates for debugging the type inference implementation. */
+private module Debug {
+  AstNode getRelevantNode() {
+    exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
+      result.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
+      filepath.matches("%/test.swift") and
+      startline = 1
+    )
+  }
+
+  Type debugInferType(AstNode n, TypePath path) {
+    n = getRelevantNode() and
+    result = inferType(n, path)
+  }
+
+  Callable debugResolveCallTarget(CallExpr ce) {
+    ce = getRelevantNode() and
+    result = resolveCallTarget(ce)
+  }
+
+  predicate debugTypeMention(TypeMention tm, TypePath path, Type type) {
+    tm = getRelevantNode() and
+    tm.getTypeAt(path) = type
+  }
+
+  predicate atLimit = M3::Debug::atLimit/1;
+
+  predicate inferTypeForNodeAtLimit = M3::Debug::inferTypeForNodeAtLimit/2;
+
+  predicate countTypesForNodeAtLimit = M3::Debug::countTypesForNodeAtLimit/2;
+
+  predicate maxTypes = M3::Debug::maxTypes/4;
+
+  predicate maxTypePath = M3::Debug::maxTypePath/4;
+
+  predicate maxTypePaths = M3::Debug::maxTypePaths/4;
+
+  Type debugInferTypeCertain(AstNode n, TypePath path) {
+    n = getRelevantNode() and
+    result = inferTypeCertain(n, path)
+  }
+
+  Type debugInferCertainNonUniqueType(AstNode n, TypePath path) {
+    n = getRelevantNode() and
+    Consistency::nonUniqueCertainType(n, path) and
+    result = inferTypeCertain(n, path)
+  }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/typeinference/TypeInferenceConsistency.qll b/unified/ql/lib/codeql/unified/internal/typeinference/TypeInferenceConsistency.qll
new file mode 100644
index 000000000000..20aa749a7216
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/typeinference/TypeInferenceConsistency.qll
@@ -0,0 +1,19 @@
+/**
+ * Provides logic for recognizing type inference inconsistencies.
+ */
+
+private import Type
+private import TypeMention
+private import TypeInference
+private import TypeInference::Consistency as Consistency
+import TypeInference::Consistency
+
+query predicate illFormedTypeMention(TypeMention tm) {
+  Consistency::illFormedTypeMention(tm) and
+  tm.fromSource()
+}
+
+query predicate nonUniqueCertainType(AstNode n, TypePath path) {
+  Consistency::nonUniqueCertainType(n, path) and
+  n.fromSource()
+}
diff --git a/unified/ql/lib/codeql/unified/internal/typeinference/TypeInferencePlugin.qll b/unified/ql/lib/codeql/unified/internal/typeinference/TypeInferencePlugin.qll
new file mode 100644
index 000000000000..0680c6914ada
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/typeinference/TypeInferencePlugin.qll
@@ -0,0 +1,168 @@
+/**
+ * Provides an interface for language-specific type inference logic.
+ */
+
+private import Type
+private import TypeInference
+private import codeql.util.Unit
+
+private module Plugins {
+  private import TypeInferencePluginSwift
+}
+
+// todo: once we support multiple languages, these predicates  will need to be
+// tagged with the language
+class TypeInferencePlugin extends Unit {
+  /** Gets the boolean type which will be assigned to boolean literals. */
+  abstract Type getBoolType();
+
+  /** Gets the integer type which will be assigned to integer literals. */
+  abstract Type getIntType();
+
+  /** Gets the floating-point type which will be assigned to floating-point literals. */
+  abstract Type getFloatType();
+
+  /** Gets the string type which will be assigned to string literals. */
+  abstract Type getStringType();
+
+  /** Gets the type parameter representing the element type of an array. */
+  abstract TypeParameter getArrayElementTypeParameter();
+
+  /**
+   * Gets the type of the given function expression.
+   *
+   * For example `Fn` in Rust (which does not depend on `fe`).
+   */
+  bindingset[fe]
+  abstract Type getFunctionExprType(FunctionExpr fe);
+
+  /**
+   * Gets the type path for the `i`th parameter of the given function type
+   * when the function type has the given arity.
+   *
+   * For example `"Args.Ti"` in Rust, where `Args` is the type argument of
+   * `Fn` and `Ti` is the `i`th type parameter of the tuple type with arity
+   * `arity`.
+   */
+  bindingset[t, arity, i]
+  abstract TypePath getFunctionExprParameterTypePath(Type t, int arity, int i);
+
+  /**
+   * Gets the type path for the return type of the given function type.
+   *
+   * For example `"Output"` in Rust, where `Output` is the associated type
+   * of `Fn`.
+   */
+  bindingset[t]
+  abstract TypePath getFunctionExprReturnTypePath(Type t);
+
+  /**
+   * Gets the `invoke` function for the given function type.
+   *
+   * For example the `call` method of the `Fn` trait in Rust.
+   */
+  abstract Callable getFunctionInvoke(Type t);
+
+  /**
+   * Holds if the `i`th syntactic argument in a call to the `invoke` function
+   * belonging to `t` should map to position `j` and type path `path`.
+   *
+   * For example, in Rust, in a call `closure(arg0, arg1)` the first argument
+   * maps to `(1, "T0")` and the second argument maps to `(1, "T1")`, where `T0`
+   * is the first type parameter of the 2-tuple type and `T1` is the second type
+   * parameter.
+   */
+  bindingset[t, arity, i]
+  abstract predicate functionInvokeSignature(Type t, int arity, int i, int j, TypePath path);
+
+  /** Gets the tuple type with the given arity. */
+  abstract Type getTupleType(int arity);
+
+  /** Holds if `field` is a field of the tuple type `tuple` with the given `name`. */
+  abstract predicate tupleField(Type tuple, string name, VariableDeclaration field);
+
+  /** Holds if `case` is an enum case constructor of `enum` with identifier `i`. */
+  abstract predicate isEnumConstructor(
+    ClassLikeDeclaration enum, ConstructorDeclaration case, Identifier i
+  );
+
+  /** Holds if `field` is an enum field of `enum`. */
+  abstract predicate isEnumField(ClassLikeDeclaration enum, VariableDeclaration field);
+
+  /** Gets the inferred type for the given AST node and type path. */
+  Type inferType(AstNode n, TypePath path) { none() }
+}
+
+class BoolType extends Type {
+  BoolType() { this = any(TypeInferencePlugin p).getBoolType() }
+}
+
+class IntType extends Type {
+  IntType() { this = any(TypeInferencePlugin p).getIntType() }
+}
+
+class FloatType extends Type {
+  FloatType() { this = any(TypeInferencePlugin p).getFloatType() }
+}
+
+class StringType extends Type {
+  StringType() { this = any(TypeInferencePlugin p).getStringType() }
+}
+
+TypeParameter getArrayElementTypeParameter() {
+  result = any(TypeInferencePlugin p).getArrayElementTypeParameter()
+}
+
+bindingset[fe]
+Type getFunctionExprType(FunctionExpr fe) {
+  result = any(TypeInferencePlugin p).getFunctionExprType(fe)
+}
+
+bindingset[t, arity, i]
+TypePath getFunctionExprParameterTypePath(Type t, int arity, int i) {
+  result = any(TypeInferencePlugin pl).getFunctionExprParameterTypePath(t, arity, i)
+}
+
+TypePath getFunctionExprReturnTypePath(Type t) {
+  result = any(TypeInferencePlugin pl).getFunctionExprReturnTypePath(t)
+}
+
+class TupleType extends Type {
+  int arity;
+
+  TupleType() { this = any(TypeInferencePlugin p).getTupleType(arity) }
+
+  int getArity() { result = arity }
+
+  VariableDeclaration getField(string name) {
+    any(TypeInferencePlugin p).tupleField(this, name, result)
+  }
+}
+
+class EnumConstructor extends ConstructorDeclaration {
+  private ClassLikeDeclaration enum;
+  private Identifier id;
+
+  EnumConstructor() { any(TypeInferencePlugin p).isEnumConstructor(enum, this, id) }
+
+  ClassLikeDeclaration getEnum() { result = enum }
+
+  Identifier getNameNode() { result = id }
+}
+
+class EnumField extends VariableDeclaration {
+  private ClassLikeDeclaration enum;
+
+  EnumField() { any(TypeInferencePlugin p).isEnumField(enum, this) }
+
+  ClassLikeDeclaration getEnum() { result = enum }
+}
+
+Type inferType(AstNode n, TypePath path) { result = any(TypeInferencePlugin p).inferType(n, path) }
+
+Callable getFunctionInvoke(Type t) { result = any(TypeInferencePlugin p).getFunctionInvoke(t) }
+
+bindingset[t, arity, i]
+predicate functionInvokeSignature(Type t, int arity, int i, int j, TypePath path) {
+  any(TypeInferencePlugin p).functionInvokeSignature(t, arity, i, j, path)
+}
diff --git a/unified/ql/lib/codeql/unified/internal/typeinference/TypeInferencePluginSwift.qll b/unified/ql/lib/codeql/unified/internal/typeinference/TypeInferencePluginSwift.qll
new file mode 100644
index 000000000000..2ea9ccd4afdc
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/typeinference/TypeInferencePluginSwift.qll
@@ -0,0 +1,192 @@
+/**
+ * Provides Swift-specific type inference logic.
+ */
+overlay[local?]
+module;
+
+private import Type
+private import TypeInference
+private import TypeInferencePlugin as Plugin
+private import codeql.unified.internal.Builtins
+
+private class StructType extends ClassLikeDeclarationType {
+  StructType() { c.getAModifier().getValue() = "struct" }
+}
+
+private class EnumType extends ClassLikeDeclarationType {
+  EnumType() { c.getAModifier().getValue() = "enum" }
+}
+
+private class BuiltinType extends ClassLikeDeclarationType {
+  BuiltinType() { this.getClassLikeDeclaration() instanceof BuiltinClassLikeDeclaration }
+}
+
+private class BuiltinStructType extends BuiltinType, StructType { }
+
+private class BuiltinEnumType extends BuiltinType, EnumType { }
+
+private class BoolType extends BuiltinStructType {
+  BoolType() { this.getName() = "Bool" }
+}
+
+private class IntType extends BuiltinStructType {
+  IntType() { this.getName() = "Int" }
+}
+
+private class DoubleType extends BuiltinStructType {
+  DoubleType() { this.getName() = "Double" }
+}
+
+private class StringType extends BuiltinStructType {
+  StringType() { this.getName() = "String" }
+}
+
+private class ArrayType extends BuiltinStructType {
+  ArrayType() { this.getName() = "Array" }
+}
+
+class FunctionType extends BuiltinStructType {
+  FunctionType() { this.getName() = "Function" }
+}
+
+class OptionalType extends BuiltinEnumType {
+  OptionalType() { this.getName() = "Optional" }
+}
+
+pragma[nomagic]
+TypeParameter getFunctionArgsTypeParameter() {
+  result = any(FunctionType t).getPositionalTypeParameter(0)
+}
+
+pragma[nomagic]
+TypeParameter getFunctionReturnTypeParameter() {
+  result = any(FunctionType t).getPositionalTypeParameter(1)
+}
+
+/** Gets the path to a closure's `index`th parameter type, where the arity is `arity`. */
+pragma[nomagic]
+private TypePath functionParameterPath(int arity, int index) {
+  result =
+    TypePath::cons(getFunctionArgsTypeParameter(),
+      TypePath::singleton(getTupleTypeParameter(arity, index)))
+}
+
+pragma[nomagic]
+private TypePath functionReturnPath() {
+  result = TypePath::singleton(getFunctionReturnTypeParameter())
+}
+
+private class TupleType extends BuiltinStructType {
+  private int arity;
+
+  TupleType() { arity = this.getName().regexpCapture("Tuple([0-9]+)", 1).toInt() }
+
+  int getArity() { result = arity }
+
+  VariableDeclaration getField(string name) {
+    result = this.getClassLikeDeclaration().getAMember() and
+    name = result.getPattern().(Identifier).getValue().regexpCapture("\\_(.+)", 1)
+  }
+}
+
+pragma[nomagic]
+TypeParameter getTupleTypeParameter(int arity, int i) {
+  result = any(TupleType t | t.getArity() = arity).getPositionalTypeParameter(i)
+}
+
+private class Enum extends ClassLikeDeclaration {
+  Enum() { this.getAModifier().getValue() = "enum" }
+}
+
+private class EnumConstructor extends EnumCaseConstructor {
+  private Enum e;
+
+  EnumConstructor() { this = e.getAMember().(EnumCaseClass).getConstructor() }
+
+  Identifier getNameNode() { result = this.getEnumCaseClass().getNameNode() }
+
+  Enum getEnum() { result = e }
+}
+
+private class EnumField extends VariableDeclaration {
+  private Enum e;
+
+  EnumField() {
+    this = e.getAMember() and
+    this.getAModifier().getValue() = "enum_case"
+  }
+
+  Enum getEnum() { result = e }
+}
+
+private predicate inferTypeAlias = inferType/2;
+
+private class SwiftTypeInferencePlugin extends Plugin::TypeInferencePlugin {
+  override Type getBoolType() { result instanceof BoolType }
+
+  override Type getIntType() { result instanceof IntType }
+
+  override Type getFloatType() { result instanceof DoubleType }
+
+  override Type getStringType() { result instanceof StringType }
+
+  override TypeParameter getArrayElementTypeParameter() {
+    result = any(ArrayType t).getPositionalTypeParameter(0)
+  }
+
+  bindingset[fe]
+  override Type getFunctionExprType(FunctionExpr fe) {
+    result instanceof FunctionType and
+    exists(fe)
+  }
+
+  bindingset[t]
+  override TypePath getFunctionExprParameterTypePath(Type t, int arity, int i) {
+    result = functionParameterPath(arity, i) and exists(t)
+  }
+
+  bindingset[t]
+  override TypePath getFunctionExprReturnTypePath(Type t) {
+    result = functionReturnPath() and exists(t)
+  }
+
+  pragma[nomagic]
+  override FunctionDeclaration getFunctionInvoke(Type t) {
+    result = t.(FunctionType).getClassLikeDeclaration().getAMember() and
+    result.getName() = "callAsFunction"
+  }
+
+  bindingset[t, arity, i]
+  override predicate functionInvokeSignature(Type t, int arity, int i, int j, TypePath path) {
+    j = 1 and
+    path = TypePath::singleton(getTupleTypeParameter(arity, i)) and
+    exists(t)
+  }
+
+  override Type getTupleType(int arity) { result.(TupleType).getArity() = arity }
+
+  override predicate tupleField(Type tuple, string name, VariableDeclaration field) {
+    field = tuple.(TupleType).getField(name)
+  }
+
+  override predicate isEnumConstructor(
+    ClassLikeDeclaration enum, ConstructorDeclaration case, Identifier i
+  ) {
+    case =
+      any(EnumConstructor ec |
+        enum = ec.getEnum() and
+        i = ec.getNameNode()
+      )
+  }
+
+  override predicate isEnumField(ClassLikeDeclaration enum, VariableDeclaration field) {
+    enum = field.(EnumField).getEnum()
+  }
+
+  override Type inferType(AstNode n, TypePath path) {
+    // todo: approximation for now
+    n instanceof BinaryExpr and
+    result = inferTypeAlias(n.(BinaryExpr).getLeft(), path) and
+    result = inferTypeAlias(n.(BinaryExpr).getRight(), path)
+  }
+}
diff --git a/unified/ql/lib/codeql/unified/internal/typeinference/TypeMention.qll b/unified/ql/lib/codeql/unified/internal/typeinference/TypeMention.qll
new file mode 100644
index 000000000000..baef8f970e26
--- /dev/null
+++ b/unified/ql/lib/codeql/unified/internal/typeinference/TypeMention.qll
@@ -0,0 +1,210 @@
+private import unified as Unified
+private import Type
+private import TypeInference
+private import TypeInferencePlugin as Plugin
+private import codeql.unified.internal.StaticNameBinding
+private import codeql.unified.internal.ExprPositions
+
+final class TypeMention = TypeMentionImpl;
+
+/** An AST node that mentions a type. */
+abstract private class TypeMentionImpl extends AstNode {
+  /**
+   * Gets the type mentioned at `path`.
+   */
+  pragma[nomagic]
+  abstract Type getTypeAt(TypePath path);
+
+  /**
+   * Gets the type mentioned at the root of this type mention.
+   */
+  final Type getType() { result = this.getTypeAt(TypePath::nil()) }
+}
+
+final class ExprTypeMention = ExprTypeMentionImpl;
+
+abstract private class ExprTypeMentionImpl extends TypeMentionImpl, Expr {
+  ExprTypeMentionImpl() {
+    isInTypeContext(this) and
+    not this instanceof GenericTypeExpr and
+    not this instanceof ModifiedTypeExpr
+  }
+
+  pragma[nomagic]
+  abstract TypePath getTypeArgumentPath(int i);
+}
+
+/**
+ * A type mention that resolves via an alias (aliases are expanded).
+ */
+private class AliasExprTypeMention extends ExprTypeMentionImpl {
+  private TypeAliasDeclaration alias;
+
+  AliasExprTypeMention() { alias.getNameNode() = getTypeFromRef(this) }
+
+  private TypeParameterType getAliasTypeParameter(int i) {
+    result.getTypeParameter() = alias.getTypeParameter(i)
+  }
+
+  override TypePath getTypeArgumentPath(int i) {
+    exists(TypeParameterType tp |
+      tp = this.getAliasTypeParameter(i) and
+      tp = alias.getType().(TypeMention).getTypeAt(result)
+    )
+  }
+
+  override Type getTypeAt(TypePath path) {
+    result = alias.getType().(TypeMention).getTypeAt(path) and
+    not result = this.getAliasTypeParameter(_)
+  }
+}
+
+/**
+ * A type mention that does not resolve via an alias.
+ */
+private class NonAliasExprTypeMention extends ExprTypeMentionImpl {
+  NonAliasExprTypeMention() { not this instanceof AliasExprTypeMention }
+
+  private Type getRootType0() {
+    exists(Identifier i | i = getTypeFromRef(this) |
+      // for now, we resolve enum cases to their enclosing class
+      exists(EnumCaseClass c |
+        i = c.getNameNode() and
+        result.getNameNode() = c.getEnclosingClass().getNameNode()
+      )
+      or
+      not i = any(EnumCaseClass c).getNameNode() and
+      result.getNameNode() = i and
+      (
+        not result instanceof AssociatedTypeParameterType
+        or
+        result = TAssociatedTypeParameterType(this.getEnclosingClass(), _, _)
+      )
+    )
+    or
+    result = Plugin::getFunctionExprType(this)
+    or
+    result.(Plugin::TupleType).getArity() = this.(TupleExpr).getNumberOfElements()
+  }
+
+  Type getRootType() {
+    result = this.getRootType0()
+    or
+    not exists(this.getRootType0()) and
+    result instanceof UnknownType
+  }
+
+  override TypePath getTypeArgumentPath(int i) {
+    result = TypePath::singleton(this.getRootType().getPositionalTypeParameter(i))
+  }
+
+  override Type getTypeAt(TypePath path) {
+    result = this.getRootType() and
+    path.isEmpty()
+    or
+    exists(
+      ClassLikeDeclaration c, AssociatedTypeDeclaration a, ClassLikeDeclaration base,
+      AssociatedTypeParameterType baseTp, string name
+    |
+      // protocol Base {
+      //   associatedtype BaseTp
+      // }
+      associatedTypeParameterInherited(c, a, base, this, name) and
+      baseTp = TAssociatedTypeParameterType(base, a, _)
+    |
+      // protocol Sub : Base {
+      //                ^^^^ // `BaseTp` is instantiated with `BaseTp (inherited)`
+      // }
+      path = TypePath::singleton(baseTp) and
+      result = TAssociatedTypeParameterType(c, a, true)
+      or
+      // struct S : Base {
+      //            ^^^^ // `BaseTp` is instantiated with `String`
+      //   typealias BaseTp = String
+      // }
+      exists(TypeAliasDeclaration alias, TypePath suffix |
+        alias = c.getAMember() and
+        alias.getName() = name and
+        path = TypePath::cons(baseTp, suffix) and
+        result = alias.getType().(TypeMention).getTypeAt(suffix)
+      )
+    )
+    or
+    exists(FunctionExpr fe, Type t, TypePath prefix, TypePath suffix |
+      this = fe and
+      t = Plugin::getFunctionExprType(fe) and
+      path = prefix.append(suffix)
+    |
+      exists(int i |
+        prefix = Plugin::getFunctionExprParameterTypePath(t, fe.getNumberOfParameters(), i) and
+        result = fe.getParameter(i).getType().(TypeMention).getTypeAt(suffix)
+      )
+      or
+      prefix = Plugin::getFunctionExprReturnTypePath(t) and
+      result = fe.getReturnType().(TypeMention).getTypeAt(suffix)
+    )
+    or
+    this =
+      any(TupleExpr te |
+        exists(Plugin::TupleType tt, int i, TypePath suffix |
+          tt.getArity() = te.getNumberOfElements() and
+          result = te.getElement(i).getValue().(TypeMention).getTypeAt(suffix) and
+          path = TypePath::cons(tt.getPositionalTypeParameter(i), suffix)
+        )
+      )
+  }
+}
+
+private class GenericTypeExprTypeMention extends TypeMentionImpl, GenericTypeExpr {
+  private ExprTypeMention base;
+
+  GenericTypeExprTypeMention() { base = this.getBase() }
+
+  pragma[nomagic]
+  private Type getTypeArgumentAt(int i, TypePath path) {
+    result = this.getTypeArgument(i).(TypeMention).getTypeAt(path)
+  }
+
+  override Type getTypeAt(TypePath path) {
+    result = base.getTypeAt(path)
+    or
+    exists(int i, TypePath prefix, TypePath suffix |
+      prefix = base.getTypeArgumentPath(i) and
+      result = this.getTypeArgumentAt(i, suffix) and
+      path = prefix.append(suffix)
+    )
+  }
+}
+
+/** A class declaration mentions itself. */
+private class ClassLikeDeclarationTypeMention extends TypeMentionImpl, Identifier {
+  private ClassLikeDeclaration c;
+
+  ClassLikeDeclarationTypeMention() { this = c.getNameNode() }
+
+  ClassLikeDeclarationType getRootType() { c = result.getClassLikeDeclaration() }
+
+  ClassLikeDeclaration getClassLikeDeclaration() { result = c }
+
+  override Type getTypeAt(TypePath path) {
+    result = this.getRootType() and
+    path.isEmpty()
+    or
+    result = this.getRootType().getATypeParameter() and
+    path = TypePath::singleton(result)
+  }
+}
+
+private class ModifiedTypeExprMention extends TypeMentionImpl instanceof ModifiedTypeExpr {
+  private TypeMention base;
+
+  ModifiedTypeExprMention() { base = ModifiedTypeExpr.super.getType() }
+
+  override Type getTypeAt(TypePath path) { result = base.getTypeAt(path) }
+}
+
+TypeMention getClassLikeDeclarationTypeMention(ClassLikeDeclaration c) {
+  result = c.getNameNode()
+  or
+  result = c.getExtensionTarget()
+}
diff --git a/unified/ql/lib/codeql/unified/printAst.qll b/unified/ql/lib/codeql/unified/printAst.qll
index 93ff11f5c8b1..06dc4de34ca1 100644
--- a/unified/ql/lib/codeql/unified/printAst.qll
+++ b/unified/ql/lib/codeql/unified/printAst.qll
@@ -49,9 +49,11 @@ private string reorderName(string name) {
 }
 
 class PrintAstNode extends AstNode {
+  PrintAstNode() { shouldPrintNode(this) }
+
   final int getOrder() {
     this =
-      rank[result](AstNode parent, AstNode child, string name, int i |
+      rank[result](PrintAstNode parent, PrintAstNode child, string name, int i |
         child = PrintAst::getChild(parent, name, i)
       |
         child order by reorderName(name), i
@@ -70,10 +72,7 @@ class PrintAstNode extends AstNode {
  * Holds if `node` belongs to the output tree, and its property `key` has the
  * given `value`.
  */
-query predicate nodes(PrintAstNode node, string key, string value) {
-  shouldPrintNode(node) and
-  value = node.getProperty(key)
-}
+query predicate nodes(PrintAstNode node, string key, string value) { value = node.getProperty(key) }
 
 /**
  * Holds if `target` is a child of `source` in the AST, and property `key` of
diff --git a/unified/ql/lib/ext/legacy-swift.model.yml b/unified/ql/lib/ext/legacy-swift.model.yml
new file mode 100644
index 000000000000..d262fadcec1d
--- /dev/null
+++ b/unified/ql/lib/ext/legacy-swift.model.yml
@@ -0,0 +1,1189 @@
+extensions:
+  - addsTo:
+      pack: codeql/unified-all
+      extensible: legacySourceModel
+    data: # namespace, type, subtypes, name, signature, ext, output, kind, provenance
+      - ["", "String", true, "count", "", "", "", "string-length", "manual"]
+      - ["", "String", true, "init(contentsOf:)", "(URL)", "", "ReturnValue", "remote", "manual"]
+      - ["", "String", true, "init(contentsOfFile:)", "(String)", "", "ReturnValue", "local", "manual"]
+      - ["", "String", true, "init(contentsOf:encoding:)", "(URL,String.Encoding)", "", "ReturnValue", "remote", "manual"]
+      - ["", "String", true, "init(contentsOfFile:encoding:)", "(String,String.Encoding)", "", "ReturnValue", "local", "manual"]
+      - ["", "String", true, "init(contentsOf:usedEncoding:)", "(URL,String.Encoding)", "", "ReturnValue", "remote", "manual"]
+      - ["", "String", true, "init(contentsOfFile:usedEncoding:)", "(String,String.Encoding)", "", "ReturnValue", "local", "manual"]
+      - ["", "", false, "SecKeyCopyExternalRepresentation(_:_:)", "", "", "ReturnValue", "sensitive-password", "manual"]
+      - ["", "URL", true, "lines", "", "", "", "remote", "manual"]
+      - ["", "URL", true, "resourceBytes", "", "", "", "remote", "manual"]
+      - ["", "UITextField", true, "text", "", "", "", "local", "manual"]
+      - ["", "UITextField", true, "attributedText", "", "", "", "local", "manual"]
+      - ["", "DataResponse", true, "value", "", "", "", "remote", "manual"]
+      - ["", "DataResponse", true, "result", "", "", "", "remote", "manual"]
+      - ["", "DataResponse", true, "data", "", "", "", "remote", "manual"]
+      - ["", "URL.AsyncBytes", true, "lines", "", "", "", "remote", "manual"]
+      - ["", "DownloadResponse", true, "value", "", "", "", "remote", "manual"]
+      - ["", "DownloadResponse", true, "result", "", "", "", "remote", "manual"]
+      - ["", "DownloadResponse", true, "data", "", "", "", "remote", "manual"]
+      - ["", "JSContext", true, "globalObject", "", "", "", "remote", "manual"]
+      - ["", "JSContext", true, "objectForKeyedSubscript(_:)", "", "", "ReturnValue", "remote", "manual"]
+      - ["", "JSContext", true, "objectAtIndexedSubscript(_:)", "", "", "ReturnValue", "remote", "manual"]
+      - ["", "UITextInput", true, "text(in:)", "", "", "ReturnValue", "local", "manual"]
+      - ["", "UITextInput", true, "shouldChangeText(in:replacementText:)", "", "", "Parameter[replacementText:]", "local", "manual"]
+      - ["", "NSData", true, "init(contentsOf:)", "", "", "ReturnValue", "remote", "manual"]
+      - ["", "NSData", true, "init(contentsOf:options:)", "", "", "ReturnValue", "remote", "manual"]
+      - ["", "NSString", true, "length", "", "", "", "nsstring-length", "manual"]
+      - ["", "NSString", true, "init(contentsOf:)", "", "", "ReturnValue", "remote", "manual"]
+      - ["", "NSString", true, "init(contentsOfFile:)", "", "", "ReturnValue", "local", "manual"]
+      - ["", "NSString", true, "string(withContentsOf:)", "", "", "ReturnValue", "remote", "manual"]
+      - ["", "NSString", true, "init(contentsOf:encoding:)", "", "", "ReturnValue", "remote", "manual"]
+      - ["", "NSString", true, "string(withContentsOfFile:)", "", "", "ReturnValue", "local", "manual"]
+      - ["", "NSString", true, "init(contentsOfFile:encoding:)", "", "", "ReturnValue", "local", "manual"]
+      - ["", "NSString", true, "init(contentsOf:usedEncoding:)", "", "", "ReturnValue", "remote", "manual"]
+      - ["", "NSString", true, "init(contentsOfFile:usedEncoding:)", "", "", "ReturnValue", "local", "manual"]
+      - ["", "FileManager", true, "contents(atPath:)", "", "", "ReturnValue", "local", "manual"]
+      - ["", "Data", true, "init(contentsOf:options:)", "", "", "ReturnValue", "remote", "manual"]
+      - ["", "Data", true, "init(contentsOf:)", "", "", "ReturnValue", "remote", "manual"]
+      - ["", "UISceneDelegate", true, "scene(_:continue:)", "", "", "Parameter[continue:]", "remote", "manual"]
+      - ["", "UISceneDelegate", true, "scene(_:didUpdate:)", "", "", "Parameter[didUpdate:]", "remote", "manual"]
+      - ["", "UISceneDelegate", true, "scene(_:openURLContexts:)", "", "", "Parameter[openURLContexts:]", "remote", "manual"]
+      - ["", "UISceneDelegate", true, "scene(_:options:willConnectTo:)", "", "", "Parameter[options:]", "remote", "manual"]
+      - ["", "UIApplicationDelegate", true, "application(_:handleOpen:)", "", "", "Parameter[handleOpen:]", "remote", "manual"]
+      - ["", "UIApplicationDelegate", true, "application(_:open:options:)", "", "", "Parameter[open:]", "remote", "manual"]
+      - ["", "UIApplicationDelegate", true, "application(_:annotation:open:sourceApplication:)", "", "", "Parameter[open:]", "remote", "manual"]
+      - ["", "WKScriptMessageHandler", true, "userContentController(_:didReceive:)", "", "", "Parameter[didReceive:]", "remote", "manual"]
+      - ["", "UITextViewDelegate", true, "textView(_:replacementText:shouldChangeTextIn:)", "", "", "Parameter[replacementText:]", "local", "manual"]
+      - ["", "UITextFieldDelegate", true, "textField(_:replacementString:shouldChangeCharactersIn:)", "", "", "Parameter[replacementString:]", "local", "manual"]
+      - ["", "NSMutableString", true, "length", "", "", "", "nsstring-length", "manual"]
+  - addsTo:
+      pack: codeql/unified-all
+      extensible: legacySinkModel
+    data: # namespace, type, subtypes, name, signature, ext, input, kind, provenance
+      - ["", "String", true, "index(_:offsetBy:)", "", "", "Argument[0,offsetBy:]", "string-length", "manual"]
+      - ["", "String", true, "init(contentsOfFile:)", "", "", "Argument[contentsOfFile:]", "path-injection", "manual"]
+      - ["", "String", true, "init(contentsOfFile:encoding:)", "", "", "Argument[contentsOfFile:]", "path-injection", "manual"]
+      - ["", "String", true, "init(contentsOfFile:usedEncoding:)", "", "", "Argument[contentsOfFile:]", "path-injection", "manual"]
+      - ["", "String", true, "index(_:limitBy:offsetBy:)", "", "", "Argument[0,offsetBy:]", "string-length", "manual"]
+      - ["", "String", true, "md5()", "", "", "Argument[self]", "weak-hash-input-MD5", "manual"]
+      - ["", "String", true, "sha1()", "", "", "Argument[self]", "weak-hash-input-SHA1", "manual"]
+      - ["", "String", true, "sha2(_:)", "", "", "Argument[self]", "weak-password-hash-input-SHA2", "manual"]
+      - ["", "String", true, "sha224()", "", "", "Argument[self]", "weak-password-hash-input-SHA224", "manual"]
+      - ["", "String", true, "sha256()", "", "", "Argument[self]", "weak-password-hash-input-SHA256", "manual"]
+      - ["", "String", true, "sha3(_:)", "", "", "Argument[self]", "weak-password-hash-input-SHA3", "manual"]
+      - ["", "String", true, "sha384()", "", "", "Argument[self]", "weak-password-hash-input-SHA384", "manual"]
+      - ["", "String", true, "sha512()", "", "", "Argument[self]", "weak-password-hash-input-SHA512", "manual"]
+      - ["", "Array", true, "md5()", "", "", "Argument[self]", "weak-hash-input-MD5", "manual"]
+      - ["", "Array", true, "sha1()", "", "", "Argument[self]", "weak-hash-input-SHA1", "manual"]
+      - ["", "Array", true, "sha2(_:)", "", "", "Argument[self]", "weak-password-hash-input-SHA2", "manual"]
+      - ["", "Array", true, "sha224()", "", "", "Argument[self]", "weak-password-hash-input-SHA224", "manual"]
+      - ["", "Array", true, "sha256()", "", "", "Argument[self]", "weak-password-hash-input-SHA256", "manual"]
+      - ["", "Array", true, "sha3(_:)", "", "", "Argument[self]", "weak-password-hash-input-SHA3", "manual"]
+      - ["", "Array", true, "sha384()", "", "", "Argument[self]", "weak-password-hash-input-SHA384", "manual"]
+      - ["", "Array", true, "sha512()", "", "", "Argument[self]", "weak-password-hash-input-SHA512", "manual"]
+      - ["", "String.Index", true, "init(encodedOffset:)", "", "", "Argument[encodedOffset:]", "string-length", "manual"]
+      - ["", "Regex", true, "init(_:)", "", "", "Argument[0]", "regex-use", "manual"]
+      - ["", "Regex", true, "init(_:as:)", "", "", "Argument[0]", "regex-use", "manual"]
+      - ["", "", false, "assert(_:_:file:line:)", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["", "", false, "precondition(_:_:file:line:)", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["", "", false, "assertionFailure(_:file:line:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "", false, "preconditionFailure(_:file:line:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "", false, "fatalError(_:file:line:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "", false, "dump(_:indent:maxDepth:maxItems:name:)", "", "", "Argument[0,name:]", "log-injection", "manual"]
+      - ["", "", false, "print(_:separator:terminator:)", "", "", "Argument[0,separator:,terminator:]", "log-injection", "manual"]
+      - ["", "", false, "debugPrint(_:separator:terminator:)", "", "", "Argument[0,separator:,terminator:]", "log-injection", "manual"]
+      - ["", "", false, "NSMakeRange(_:_:)", "", "", "Argument[0,1]", "nsstring-length", "manual"]
+      - ["", "", false, "sqlite3_key(_:_:_:)", "", "", "Argument[1]", "encryption-key", "manual"]
+      - ["", "", false, "sqlite3_key_v2(_:_:_:_:)", "", "", "Argument[2]", "encryption-key", "manual"]
+      - ["", "", false, "sqlite3_rekey(_:_:_:)", "", "", "Argument[1]", "encryption-key", "manual"]
+      - ["", "", false, "sqlite3_rekey_v2(_:_:_:_:)", "", "", "Argument[2]", "encryption-key", "manual"]
+      - ["", "", false, "NSLog(_:_:)", "", "", "Argument[0,1]", "log-injection", "manual"]
+      - ["", "", false, "NSLogv(_:_:)", "", "", "Argument[0,1]", "log-injection", "manual"]
+      - ["", "", false, "os_log(_:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "", false, "os_log(_:_:_:dso:log:)", "", "", "Argument[0,2]", "log-injection", "manual"]
+      - ["", "", false, "os_log(_:_:dso:log:type:)", "", "", "Argument[0,1]", "log-injection", "manual"]
+      - ["", "", false, "os_log(_:_:log:)", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["", "", false, "print(_:separator:terminator:toStream:)", "", "", "Argument[0,separator:,terminator:]", "log-injection", "manual"]
+      - ["", "", false, "vfprintf(_:_:_:)", "", "", "Argument[1,2]", "log-injection", "manual"]
+      - ["", "", false, "sqlite3_bind_blob(_:_:_:_:_:)", "", "", "Argument[2]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_bind_blob64(_:_:_:_:_:)", "", "", "Argument[2]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_bind_double(_:_:_:)", "", "", "Argument[2]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_bind_int(_:_:_:)", "", "", "Argument[2]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_bind_int64(_:_:_:)", "", "", "Argument[2]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_bind_pointer(_:_:_:_:)", "", "", "Argument[2]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_bind_text(_:_:_:_:_:)", "", "", "Argument[2]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_bind_text16(_:_:_:_:_:)", "", "", "Argument[2]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_bind_text64(_:_:_:_:_:_:)", "", "", "Argument[2]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_bind_value(_:_:_:)", "", "", "Argument[2]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_exec(_:_:_:_:_:)", "", "", "Argument[1]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_prepare(_:_:_:_:_:)", "", "", "Argument[1]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_prepare16(_:_:_:_:_:)", "", "", "Argument[1]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_prepare16_v2(_:_:_:_:_:)", "", "", "Argument[1]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_prepare16_v3(_:_:_:_:_:)", "", "", "Argument[1]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_prepare_v2(_:_:_:_:_:)", "", "", "Argument[1]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_prepare_v3(_:_:_:_:_:_:)", "", "", "Argument[1]", "database-store", "manual"]
+      - ["", "", false, "sqlite3_database_file_object(_:)", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["", "", false, "sqlite3_filename_database(_:)", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["", "", false, "sqlite3_filename_journal(_:)", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["", "", false, "sqlite3_filename_wal(_:)", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["", "", false, "sqlite3_free_filename(_:)", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["", "", false, "sqlite3_open(_:_:)", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["", "", false, "sqlite3_open16(_:_:)", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["", "", false, "sqlite3_open_v2(_:_:_:_:)", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["", "NSData", true, "init(contentsOf:)", "", "", "Argument[contentsOf:]", "path-injection", "manual"]
+      - ["", "NSData", true, "init(contentsOfFile:)", "", "", "Argument[contentsOfFile:]", "path-injection", "manual"]
+      - ["", "NSData", true, "init(contentsOf:options:)", "", "", "Argument[contentsOf:]", "path-injection", "manual"]
+      - ["", "NSData", true, "dataWithContentsOfMappedFile(_:)", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["", "NSData", true, "init(contentsOfFile:options:)", "", "", "Argument[contentsOfFile:]", "path-injection", "manual"]
+      - ["", "NSData", true, "init(contentsOfMappedFile:)", "", "", "Argument[contentsOfMappedFile:]", "path-injection", "manual"]
+      - ["", "NSData", true, "write(options:to:)", "", "", "Argument[to:]", "path-injection", "manual"]
+      - ["", "NSData", true, "write(atomically:to:)", "", "", "Argument[to:]", "path-injection", "manual"]
+      - ["", "NSData", true, "write(atomically:toFile:)", "", "", "Argument[toFile:]", "path-injection", "manual"]
+      - ["", "NSData", true, "write(options:toFile:)", "", "", "Argument[toFile:]", "path-injection", "manual"]
+      - ["", "NSString", true, "character(at:)", "", "", "Argument[at:]", "nsstring-length", "manual"]
+      - ["", "NSString", true, "init(contentsOfFile:encoding:)", "", "", "Argument[contentsOfFile:]", "path-injection", "manual"]
+      - ["", "NSString", true, "init(contentsOfFile:usedEncoding:)", "", "", "Argument[contentsOfFile:]", "path-injection", "manual"]
+      - ["", "NSString", true, "substring(from:)", "", "", "Argument[from:]", "nsstring-length", "manual"]
+      - ["", "NSString", true, "substring(to:)", "", "", "Argument[to:]", "nsstring-length", "manual"]
+      - ["", "NSString", true, "write(atomically:encoding:to:)", "", "", "Argument[to:]", "path-injection", "manual"]
+      - ["", "NSString", true, "write(atomically:encoding:toFile:)", "", "", "Argument[toFile:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "contents(atPath:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "unzipItem(at:pathEncoding:progress:skipCRC32:to:)", "", "", "Argument[at:]", "unsafe-unpack", "manual"]
+      - ["", "FileManager", true, "attributesOfItem(atPath:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "changeCurrentDirectoryPath(_:)", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["", "FileManager", true, "changeFileAttributes(_:atPath:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "contentsEqual(andPath:atPath:)", "", "", "Argument[atPath:,andPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "contentsOfDirectory(at:includingPropertiesForKeys:options:)", "", "", "Argument[at:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "contentsOfDirectory(atPath:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "copyItem(at:to:)", "", "", "Argument[at:,to:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "copyItem(atPath:toPath:)", "", "", "Argument[atPath:,toPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "createDirectory(at:attributes:withIntermediateDirectories:)", "", "", "Argument[at:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "createDirectory(atPath:attributes:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "createDirectory(atPath:attributes:withIntermediateDirectories:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "createFile(atPath:attributes:contents:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "createSymbolicLink(at:withDestinationURL:)", "", "", "Argument[at:,withDestinationURL:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "createSymbolicLink(atPath:pathContent:)", "", "", "Argument[atPath:,pathContent:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "createSymbolicLink(atPath:withDestinationPath:)", "", "", "Argument[atPath:,withDestinationPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "destinationOfSymbolicLink(atPath:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "directoryContents(atPath:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "enumerator(at:errorHandler:includingPropertiesForKeys:options:)", "", "", "Argument[at:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "enumerator(atPath:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "fileAttributes(atPath:traverseLink:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "fileExists(atPath:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "fileExists(atPath:isDirectory:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "linkItem(at:to:)", "", "", "Argument[at:,to:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "linkItem(atPath:toPath:)", "", "", "Argument[atPath:,toPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "moveItem(at:to:)", "", "", "Argument[at:,to:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "moveItem(atPath:toPath:)", "", "", "Argument[atPath:,toPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "pathContentOfSymbolicLink(atPath:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "removeItem(at:)", "", "", "Argument[at:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "removeItem(atPath:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "replaceItem(at:backupItemName:options:resultingItemURL:withItemAt:)", "", "", "Argument[at:,withItemAt:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "replaceItemAt(_:backupItemName:options:withItemAt:)", "", "", "Argument[0,withItemAt:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "replaceItemAtURL(backupItemName:options:originalItemURL:withItemAtURL:)", "", "", "Argument[originalItemURL:,withItemAtURL:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "setAttributes(_:ofItemAtPath:)", "", "", "Argument[ofItemAtPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "subpaths(atPath:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "subpathsOfDirectory(atPath:)", "", "", "Argument[atPath:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "trashItem(at:resultingItemURL:)", "", "", "Argument[at:]", "path-injection", "manual"]
+      - ["", "FileManager", true, "unmountVolume(at:completionHandler:options:)", "", "", "Argument[at:]", "path-injection", "manual"]
+      - ["", "Data", true, "init(contentsOf:options:)", "", "", "Argument[contentsOf:]", "path-injection", "manual"]
+      - ["", "Data", true, "md5()", "", "", "Argument[self]", "weak-hash-input-MD5", "manual"]
+      - ["", "Data", true, "sha1()", "", "", "Argument[self]", "weak-hash-input-SHA1", "manual"]
+      - ["", "Data", true, "sha2(_:)", "", "", "Argument[self]", "weak-password-hash-input-SHA2", "manual"]
+      - ["", "Data", true, "sha224()", "", "", "Argument[self]", "weak-password-hash-input-SHA224", "manual"]
+      - ["", "Data", true, "sha256()", "", "", "Argument[self]", "weak-password-hash-input-SHA256", "manual"]
+      - ["", "Data", true, "sha3(_:)", "", "", "Argument[self]", "weak-password-hash-input-SHA3", "manual"]
+      - ["", "Data", true, "sha384()", "", "", "Argument[self]", "weak-password-hash-input-SHA384", "manual"]
+      - ["", "Data", true, "sha512()", "", "", "Argument[self]", "weak-password-hash-input-SHA512", "manual"]
+      - ["", "Data", true, "write(options:to:)", "", "", "Argument[to:]", "path-injection", "manual"]
+      - ["", "NSMutableString", true, "insert(_:at:)", "", "", "Argument[at:]", "nsstring-length", "manual"]
+      - ["", "NSMutableString", true, "character(at:)", "", "", "Argument[at:]", "nsstring-length", "manual"]
+      - ["", "NSMutableString", true, "substring(from:)", "", "", "Argument[from:]", "nsstring-length", "manual"]
+      - ["", "NSMutableString", true, "substring(to:)", "", "", "Argument[to:]", "nsstring-length", "manual"]
+      - ["", "AES", true, "init(blockMode:key:)", "", "", "Argument[blockMode:]", "encryption-block-mode", "manual"]
+      - ["", "AES", true, "init(blockMode:key:padding:)", "", "", "Argument[blockMode:]", "encryption-block-mode", "manual"]
+      - ["", "NSPredicate", true, "init(_:format:)", "", "", "Argument[format:]", "predicate-injection", "manual"]
+      - ["", "NSPredicate", true, "init(arguments:format:)", "", "", "Argument[format:]", "predicate-injection", "manual"]
+      - ["", "NSPredicate", true, "init(argumentArray:format:)", "", "", "Argument[format:]", "predicate-injection", "manual"]
+      - ["", "NSPredicate", true, "init(fromMetadataQueryString:)", "", "", "Argument[fromMetadataQueryString:]", "predicate-injection", "manual"]
+      - ["", "NSRegularExpression", true, "init(options:pattern:)", "", "", "Argument[pattern:]", "regex-use", "manual"]
+      - ["", "Blowfish", true, "init(blockMode:key:padding:)", "", "", "Argument[blockMode:]", "encryption-block-mode", "manual"]
+      - ["", "URLSessionConfiguration", false, "tlsMaximumSupportedProtocol", "", "", "PostUpdate", "tls-protocol-version", "manual"]
+      - ["", "URLSessionConfiguration", false, "tlsMinimumSupportedProtocol", "", "", "PostUpdate", "tls-protocol-version", "manual"]
+      - ["", "URLSessionConfiguration", false, "tlsMaximumSupportedProtocolVersion", "", "", "PostUpdate", "tls-protocol-version", "manual"]
+      - ["", "URLSessionConfiguration", false, "tlsMinimumSupportedProtocolVersion", "", "", "PostUpdate", "tls-protocol-version", "manual"]
+      - ["", "NWConnection", true, "send(completion:content:contentContext:isComplete:)", "", "", "Argument[content:]", "transmission", "manual"]
+      - ["", "Zip", true, "unzipFile(_:destination:fileOutputHandler:overwrite:password:progress:)", "", "", "Argument[0]", "unsafe-unpack", "manual"]
+      - ["", "NSRange", true, "init(length:location:)", "", "", "Argument[location:,length:]", "nsstring-length", "manual"]
+      - ["", "NSUserScriptTask", true, "init(url:)", "", "", "Argument[url:]", "command-injection", "manual"]
+      - ["", "NSUserUnixTask", true, "execute(completionHandler:withArguments:)", "", "", "Argument[withArguments:]", "command-injection", "manual"]
+      - ["", "Process", true, "arguments", "", "", "PostUpdate", "command-injection", "manual"]
+      - ["", "Process", true, "currentDirectory", "", "", "PostUpdate", "command-injection", "manual"]
+      - ["", "Process", true, "currentDirectoryPath", "", "", "PostUpdate", "command-injection", "manual"]
+      - ["", "Process", true, "environment", "", "", "PostUpdate", "command-injection", "manual"]
+      - ["", "Process", true, "executableURL", "", "", "PostUpdate", "command-injection", "manual"]
+      - ["", "Process", true, "launchPath", "", "", "PostUpdate", "command-injection", "manual"]
+      - ["", "Process", true, "launchedProcess(arguments:launchPath:)", "", "", "Argument[launchPath:,arguments:]", "command-injection", "manual"]
+      # Calls may omit the defaulted terminationHandler argument.
+      - ["", "Process", true, "run(_:arguments:)", "", "", "Argument[0,arguments:]", "command-injection", "manual"]
+      - ["", "Process", true, "run(_:arguments:terminationHandler:)", "", "", "Argument[0,arguments:]", "command-injection", "manual"]
+      - ["", "Process", true, "standardError", "", "", "PostUpdate", "command-injection", "manual"]
+      - ["", "Process", true, "standardInput", "", "", "PostUpdate", "command-injection", "manual"]
+      - ["", "Process", true, "standardOutput", "", "", "PostUpdate", "command-injection", "manual"]
+      - ["", "Connection", true, "key(_:db:)", "", "", "Argument[0]", "encryption-key", "manual"]
+      - ["", "Connection", true, "keyAndMigrate(_:db:)", "", "", "Argument[0]", "encryption-key", "manual"]
+      - ["", "Connection", true, "rekey(_:db:)", "", "", "Argument[0]", "encryption-key", "manual"]
+      - ["", "Connection", true, "sqlcipher_export(_:key:)", "", "", "Argument[key:]", "encryption-key", "manual"]
+      - ["", "Connection", true, "execute(_:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "Connection", true, "prepare(_:_:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "Connection", true, "prepare(_:_:)", "", "", "Argument[1]", "database-store", "manual"]
+      - ["", "Connection", true, "run(_:_:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "Connection", true, "run(_:_:)", "", "", "Argument[1]", "database-store", "manual"]
+      - ["", "Connection", true, "scalar(_:_:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "Connection", true, "scalar(_:_:)", "", "", "Argument[1]", "database-store", "manual"]
+      - ["", "Connection", true, "init(_:readonly:)", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["", "Connection.Location", true, "uri(_:parameters:)", "", "", "Argument[0]", "path-injection", "manual"]
+      - ["", "Database", true, "changePassphrase(_:)", "", "", "Argument[0]", "encryption-key", "manual"]
+      - ["", "Database", true, "usePassphrase(_:)", "", "", "Argument[0]", "encryption-key", "manual"]
+      - ["", "Database", true, "allStatements(arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "Database", true, "execute(arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "Database", true, "init(configuration:description:path:)", "", "", "Argument[path:]", "path-injection", "manual"]
+      - ["", "Realm.Configuration", true, "encryptionKey", "", "", "PostUpdate", "encryption-key", "manual"]
+      - ["", "Realm.Configuration", true, "init(deleteRealmIfMigrationNeeded:encryptionKey:fileURL:inMemoryIdentifier:migrationBlock:objectTypes:readOnly:schemaVersion:shouldCompactOnLaunch:syncConfiguration:)", "", "", "Argument[fileURL:]", "path-injection", "manual"]
+      - ["", "Realm.Configuration", true, "init(deleteRealmIfMigrationNeeded:encryptionKey:fileURL:inMemoryIdentifier:migrationBlock:objectTypes:readOnly:schemaVersion:shouldCompactOnLaunch:syncConfiguration:)", "", "", "Argument[encryptionKey:]", "encryption-key", "manual"]
+      - ["", "Realm.Configuration", true, "init(deleteRealmIfMigrationNeeded:encryptionKey:fileURL:inMemoryIdentifier:migrationBlock:objectTypes:readOnly:schemaVersion:seedFilePath:shouldCompactOnLaunch:syncConfiguration:)", "", "", "Argument[fileURL:]", "path-injection", "manual"]
+      - ["", "Realm.Configuration", true, "init(deleteRealmIfMigrationNeeded:encryptionKey:fileURL:inMemoryIdentifier:migrationBlock:objectTypes:readOnly:schemaVersion:seedFilePath:shouldCompactOnLaunch:syncConfiguration:)", "", "", "Argument[encryptionKey:]", "encryption-key", "manual"]
+      - ["", "Realm.Configuration", true, "init(deleteRealmIfMigrationNeeded:encryptionKey:fileURL:inMemoryIdentifier:migrationBlock:objectTypes:readOnly:schemaVersion:seedFilePath:shouldCompactOnLaunch:syncConfiguration:)", "", "", "Argument[seedFilePath:]", "path-injection", "manual"]
+      - ["", "Realm.Configuration", true, "fileURL", "", "", "PostUpdate", "path-injection", "manual"]
+      - ["", "Realm.Configuration", true, "seedFilePath", "", "", "PostUpdate", "path-injection", "manual"]
+      - ["", "Digest", true, "md5(_:)", "", "", "Argument[0]", "weak-hash-input-MD5", "manual"]
+      - ["", "Digest", true, "sha1(_:)", "", "", "Argument[0]", "weak-hash-input-SHA1", "manual"]
+      - ["", "Digest", true, "sha2(_:variant:)", "", "", "Argument[0]", "weak-password-hash-input-SHA2", "manual"]
+      - ["", "Digest", true, "sha224(_:)", "", "", "Argument[0]", "weak-password-hash-input-SHA224", "manual"]
+      - ["", "Digest", true, "sha256(_:)", "", "", "Argument[0]", "weak-password-hash-input-SHA256", "manual"]
+      - ["", "Digest", true, "sha3(_:variant:)", "", "", "Argument[0]", "weak-password-hash-input-SHA3", "manual"]
+      - ["", "Digest", true, "sha384(_:)", "", "", "Argument[0]", "weak-password-hash-input-SHA384", "manual"]
+      - ["", "Digest", true, "sha512(_:)", "", "", "Argument[0]", "weak-password-hash-input-SHA512", "manual"]
+      - ["", "Insecure.MD5", true, "hash(bufferPointer:)", "", "", "Argument[bufferPointer:]", "weak-hash-input-MD5", "manual"]
+      - ["", "Insecure.MD5", true, "hash(data:)", "", "", "Argument[data:]", "weak-hash-input-MD5", "manual"]
+      - ["", "Insecure.MD5", true, "update(bufferPointer:)", "", "", "Argument[bufferPointer:]", "weak-hash-input-MD5", "manual"]
+      - ["", "Insecure.MD5", true, "update(data:)", "", "", "Argument[data:]", "weak-hash-input-MD5", "manual"]
+      - ["", "Insecure.SHA1", true, "hash(bufferPointer:)", "", "", "Argument[bufferPointer:]", "weak-hash-input-SHA1", "manual"]
+      - ["", "Insecure.SHA1", true, "hash(data:)", "", "", "Argument[data:]", "weak-hash-input-SHA1", "manual"]
+      - ["", "Insecure.SHA1", true, "update(bufferPointer:)", "", "", "Argument[bufferPointer:]", "weak-hash-input-SHA1", "manual"]
+      - ["", "Insecure.SHA1", true, "update(data:)", "", "", "Argument[data:]", "weak-hash-input-SHA1", "manual"]
+      - ["", "MD5", true, "callAsFunction(_:)", "", "", "Argument[0]", "weak-hash-input-MD5", "manual"]
+      - ["", "MD5", true, "calculate(for:)", "", "", "Argument[for:]", "weak-hash-input-MD5", "manual"]
+      - ["", "MD5", true, "process(block:currentHash:)", "", "", "Argument[block:]", "weak-hash-input-MD5", "manual"]
+      - ["", "MD5", true, "update(isLast:withBytes:)", "", "", "Argument[withBytes:]", "weak-hash-input-MD5", "manual"]
+      - ["", "SHA1", true, "callAsFunction(_:)", "", "", "Argument[0]", "weak-hash-input-SHA1", "manual"]
+      - ["", "SHA1", true, "calculate(for:)", "", "", "Argument[for:]", "weak-hash-input-SHA1", "manual"]
+      - ["", "SHA1", true, "process(block:currentHash:)", "", "", "Argument[block:]", "weak-hash-input-SHA1", "manual"]
+      - ["", "SHA1", true, "update(isLast:withBytes:)", "", "", "Argument[withBytes:]", "weak-hash-input-SHA1", "manual"]
+      - ["", "Logger", true, "warning(_:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "Logger", true, "error(_:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "Logger", true, "critical(_:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "Logger", true, "debug(_:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "Logger", true, "fault(_:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "Logger", true, "info(_:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "Logger", true, "log(_:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "Logger", true, "log(_:level:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "Logger", true, "notice(_:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "Logger", true, "trace(_:)", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["", "NSException", true, "init(name:reason:userInfo:)", "", "", "Argument[reason:]", "log-injection", "manual"]
+      - ["", "NSException", true, "raise(_:arguments:format:)", "", "", "Argument[format:,arguments:]", "log-injection", "manual"]
+      - ["", "SHA256", true, "hash(bufferPointer:)", "", "", "Argument[bufferPointer:]", "weak-password-hash-input-SHA256", "manual"]
+      - ["", "SHA256", true, "hash(data:)", "", "", "Argument[data:]", "weak-password-hash-input-SHA256", "manual"]
+      - ["", "SHA256", true, "update(bufferPointer:)", "", "", "Argument[bufferPointer:]", "weak-password-hash-input-SHA256", "manual"]
+      - ["", "SHA256", true, "update(data:)", "", "", "Argument[data:]", "weak-password-hash-input-SHA256", "manual"]
+      - ["", "SHA2", true, "callAsFunction(_:)", "", "", "Argument[0]", "weak-password-hash-input-SHA2", "manual"]
+      - ["", "SHA2", true, "calculate(for:)", "", "", "Argument[for:]", "weak-password-hash-input-SHA2", "manual"]
+      - ["", "SHA2", true, "update(isLast:withBytes:)", "", "", "Argument[withBytes:]", "weak-password-hash-input-SHA2", "manual"]
+      - ["", "SHA2", true, "process32(block:currentHash:)", "", "", "Argument[block:]", "weak-password-hash-input-SHA2", "manual"]
+      - ["", "SHA2", true, "process64(block:currentHash:)", "", "", "Argument[block:]", "weak-password-hash-input-SHA2", "manual"]
+      - ["", "SHA384", true, "hash(bufferPointer:)", "", "", "Argument[bufferPointer:]", "weak-password-hash-input-SHA384", "manual"]
+      - ["", "SHA384", true, "hash(data:)", "", "", "Argument[data:]", "weak-password-hash-input-SHA384", "manual"]
+      - ["", "SHA384", true, "update(bufferPointer:)", "", "", "Argument[bufferPointer:]", "weak-password-hash-input-SHA384", "manual"]
+      - ["", "SHA384", true, "update(data:)", "", "", "Argument[data:]", "weak-password-hash-input-SHA384", "manual"]
+      - ["", "SHA3", true, "callAsFunction(_:)", "", "", "Argument[0]", "weak-password-hash-input-SHA2", "manual"]
+      - ["", "SHA3", true, "calculate(for:)", "", "", "Argument[for:]", "weak-password-hash-input-SHA2", "manual"]
+      - ["", "SHA3", true, "process(block:currentHash:)", "", "", "Argument[block:]", "weak-password-hash-input-SHA2", "manual"]
+      - ["", "SHA3", true, "update(isLast:withBytes:)", "", "", "Argument[withBytes:]", "weak-password-hash-input-SHA2", "manual"]
+      - ["", "SHA512", true, "hash(bufferPointer:)", "", "", "Argument[bufferPointer:]", "weak-password-hash-input-SHA512", "manual"]
+      - ["", "SHA512", true, "hash(data:)", "", "", "Argument[data:]", "weak-password-hash-input-SHA512", "manual"]
+      - ["", "SHA512", true, "update(bufferPointer:)", "", "", "Argument[bufferPointer:]", "weak-password-hash-input-SHA512", "manual"]
+      - ["", "SHA512", true, "update(data:)", "", "", "Argument[data:]", "weak-password-hash-input-SHA512", "manual"]
+      - ["", "CommonTableExpression", true, "init(arguments:columns:named:recursive:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "DatabaseValueConvertible", true, "fetchAll(_:adapter:arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "DatabaseValueConvertible", true, "fetchCursor(_:adapter:arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "DatabaseValueConvertible", true, "fetchOne(_:adapter:arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "DatabaseValueConvertible", true, "fetchSet(_:adapter:arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "FetchableRecord", true, "fetchAll(_:adapter:arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "FetchableRecord", true, "fetchCursor(_:adapter:arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "FetchableRecord", true, "fetchOne(_:adapter:arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "FetchableRecord", true, "fetchSet(_:adapter:arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "FetchableRecord", true, "fetchAll(_:adapter:arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "FetchableRecord", true, "fetchCursor(_:adapter:arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "FetchableRecord", true, "fetchOne(_:adapter:arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "FetchableRecord", true, "fetchSet(_:adapter:arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "QueryType", true, "insert(_:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "QueryType", true, "update(_:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "QueryType", true, "insert(_:_:)", "", "", "Argument[0,1]", "database-store", "manual"]
+      - ["", "QueryType", true, "insert(_:or:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "QueryType", true, "insertMany(_:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "QueryType", true, "insertMany(_:or:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "QueryType", true, "update(_:_:)", "", "", "Argument[0,1]", "database-store", "manual"]
+      - ["", "QueryType", true, "update(_:or:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "QueryType", true, "upsert(_:onConflictOf:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "QueryType", true, "upsert(_:onConflictOf:setValues:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "QueryType", true, "upsert(_:onConflictOf:setValues:)", "", "", "Argument[setValues:]", "database-store", "manual"]
+      - ["", "Row", true, "fetchAll(_:adapter:arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "Row", true, "fetchCursor(_:adapter:arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "Row", true, "fetchOne(_:adapter:arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "Row", true, "fetchSet(_:adapter:arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "SQL", true, "append(arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "SQL", true, "init(arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "SQLRequest", true, "init(adapter:arguments:cached:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "SQLStatementCursor", true, "init(arguments:database:prepFlags:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "Statement", true, "init(_:_:)", "", "", "Argument[1]", "database-store", "manual"]
+      - ["", "Statement", true, "scalar(_:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "Statement", true, "bind(_:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "Statement", true, "execute(arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "Statement", true, "run(_:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "Statement", true, "setArguments(_:)", "", "", "Argument[0]", "database-store", "manual"]
+      - ["", "TableRecord", true, "filter(arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "TableRecord", true, "order(arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "TableRecord", true, "select(arguments:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "TableRecord", true, "select(arguments:as:sql:)", "", "", "Argument[arguments:]", "database-store", "manual"]
+      - ["", "ArchiveByteStream", true, "fileStream(automaticClose:fd:)", "", "", "Argument[fd:]", "path-injection", "manual"]
+      - ["", "ArchiveByteStream", true, "fileStream(mode:options:path:permissions:)", "", "", "Argument[path:]", "path-injection", "manual"]
+      - ["", "ArchiveByteStream", true, "withFileStream(_:automaticClose:fd:)", "", "", "Argument[fd:]", "path-injection", "manual"]
+      - ["", "ArchiveByteStream", true, "withFileStream(_:mode:options:path:permissions:)", "", "", "Argument[path:]", "path-injection", "manual"]
+      - ["", "Bundle", true, "init(url:)", "", "", "Argument[url:]", "path-injection", "manual"]
+      - ["", "Bundle", true, "init(path:)", "", "", "Argument[path:]", "path-injection", "manual"]
+      - ["", "DatabasePool", true, "init(configuration:path:)", "", "", "Argument[path:]", "path-injection", "manual"]
+      - ["", "DatabaseQueue", true, "init(configuration:path:)", "", "", "Argument[path:]", "path-injection", "manual"]
+      - ["", "DatabaseSnapshotPool", true, "init(configuration:path:)", "", "", "Argument[path:]", "path-injection", "manual"]
+      - ["", "NIOFileHandle", true, "init(path:)", "", "", "Argument[path:]", "path-injection", "manual"]
+      - ["", "NIOFileHandle", true, "init(descriptor:)", "", "", "Argument[descriptor:]", "path-injection", "manual"]
+      - ["", "NIOFileHandle", true, "init(flags:mode:path:)", "", "", "Argument[path:]", "path-injection", "manual"]
+      - ["", "NSKeyedUnarchiver", true, "unarchiveObject(withFile:)", "", "", "Argument[withFile:]", "path-injection", "manual"]
+      - ["", "SerializedDatabase", true, "init(configuration:defaultLabel:path:purpose:)", "", "", "Argument[path:]", "path-injection", "manual"]
+  - addsTo:
+      pack: codeql/unified-all
+      extensible: legacySummaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      - ["", "UnsafeMutableRawPointer", true, "init(_:)", "", "", "Argument[0].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "init(_:)", "", "", "Argument[0].OptionalSome.CollectionElement", "ReturnValue.OptionalSome.CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "init(mutating:)", "", "", "Argument[mutating:].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "init(mutating:)", "", "", "Argument[mutating:].OptionalSome.CollectionElement", "ReturnValue.OptionalSome.CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "storeBytes(as:of:toByteOffset:)", "", "", "Argument[of:]", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "withMemoryRebound(_:capacity:to:)", "", "", "Argument[self].CollectionElement", "Argument[2].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "withMemoryRebound(_:capacity:to:)", "", "", "Argument[2].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "withMemoryRebound(_:capacity:to:)", "", "", "Argument[2].Parameter[0].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "loadUnaligned(as:fromByteOffset:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "load(as:fromByteOffset:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "assumingMemoryBound(to:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "bindMemory(capacity:to:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "alignedDown(toMultipleOf:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "alignedUp(toMultipleOf:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "alignedDown(for:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "alignedUp(for:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "moveInitializeMemory(as:count:from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "moveInitializeMemory(as:count:from:)", "", "", "Argument[from:].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "initializeMemory(as:count:from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "initializeMemory(as:count:from:)", "", "", "Argument[from:].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "initializeMemory(as:count:repeating:)", "", "", "Argument[repeating:]", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "initializeMemory(as:count:repeating:)", "", "", "Argument[repeating:]", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "initializeMemory(as:to:)", "", "", "Argument[to:]", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "initializeMemory(as:to:)", "", "", "Argument[to:]", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "initializeMemory(as:from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "initializeMemory(as:from:)", "", "", "Argument[from:].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "copyBytes(count:from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "copyMemory(count:from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "initializeMemory(as:at:count:to:)", "", "", "Argument[to:]", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawPointer", true, "initializeMemory(as:at:count:to:)", "", "", "Argument[to:]", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsignedInteger", true, "init(exactly:)", "", "", "Argument[exactly:]", "ReturnValue.OptionalSome", "value", "manual"]
+      - ["", "UnsignedInteger", true, "init(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "init(littleEndian:)", "", "", "Argument[littleEndian:]", "ReturnValue", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "init(bigEndian:)", "", "", "Argument[bigEndian:]", "ReturnValue", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "dividingFullWidth(_:)", "", "", "Argument[self]", "ReturnValue.TupleElement[0,1]", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "dividingFullWidth(_:)", "", "", "Argument[1].TupleElement[0,1]", "ReturnValue.TupleElement[0,1]", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "multipliedFullWidth(by:)", "", "", "Argument[self,by:]", "ReturnValue.TupleElement[0,1]", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "init(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "remainderReportingOverflow(dividingBy:)", "", "", "Argument[self,dividingBy:]", "ReturnValue.TupleElement[0]", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "dividedReportingOverflow(by:)", "", "", "Argument[self,by:]", "ReturnValue.TupleElement[0]", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "multipliedReportingOverflow(by:)", "", "", "Argument[self,by:]", "ReturnValue.TupleElement[0]", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "subtractingReportingOverflow(_:)", "", "", "Argument[self,0]", "ReturnValue.TupleElement[0]", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "addingReportingOverflow(_:)", "", "", "Argument[self,0]", "ReturnValue.TupleElement[0]", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "init(bitPattern:)", "", "", "Argument[bitPattern:]", "ReturnValue", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "init(clamping:)", "", "", "Argument[clamping:]", "ReturnValue", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "init(truncatingIfNeeded:)", "", "", "Argument[truncatingIfNeeded:]", "ReturnValue", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "init(_:radix:)", "", "", "Argument[0]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "FixedWidthInteger", true, "init(truncating:)", "", "", "Argument[truncating:]", "ReturnValue", "taint", "manual"]
+      - ["", "Numeric", true, "init(exactly:)", "", "", "Argument[exactly:]", "ReturnValue.OptionalSome", "value", "manual"]
+      - ["", "Numeric", true, "init(bitPattern:)", "", "", "Argument[bitPattern:]", "ReturnValue", "taint", "manual"]
+      - ["", "Numeric", true, "init(truncating:)", "", "", "Argument[truncating:]", "ReturnValue", "taint", "manual"]
+      - ["", "BinaryInteger", true, "quotientAndRemainder(dividingBy:)", "", "", "Argument[self,dividingBy:]", "ReturnValue.TupleElement[0,1]", "taint", "manual"]
+      - ["", "BinaryInteger", true, "init(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "BinaryInteger", true, "init(clamping:)", "", "", "Argument[clamping:]", "ReturnValue", "taint", "manual"]
+      - ["", "BinaryInteger", true, "init(truncatingIfNeeded:)", "", "", "Argument[truncatingIfNeeded:]", "ReturnValue", "taint", "manual"]
+      - ["", "BinaryInteger", true, "advanced(by:)", "", "", "Argument[self,by:]", "ReturnValue", "taint", "manual"]
+      - ["", "BinaryInteger", true, "distance(to:)", "", "", "Argument[self,to:]", "ReturnValue", "taint", "manual"]
+      - ["", "BinaryInteger", true, "formatted()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "BinaryInteger", true, "formatted(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "BinaryInteger", true, "init(_:format:lenient:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "BinaryInteger", true, "init(_:strategy:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "withContiguousStorageIfAvailable(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "Sequence", true, "withContiguousStorageIfAvailable(_:)", "", "", "Argument[self].CollectionElement", "Argument[0].Parameter[0].CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "withContiguousStorageIfAvailable(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue.OptionalSome", "value", "manual"]
+      - ["", "Sequence", true, "makeIterator()", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "suffix(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "suffix(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "dropLast(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "dropLast(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "split(maxSplits:omittingEmptySubsequences:whereSeparator:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "split(maxSplits:omittingEmptySubsequences:whereSeparator:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "prefix(while:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "prefix(while:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "prefix(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "prefix(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "drop(while:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "drop(while:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "dropFirst(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "dropFirst(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "split(maxSplits:omittingEmptySubsequences:separator:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "split(maxSplits:omittingEmptySubsequences:separator:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "shuffled()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "shuffled()", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "shuffled(using:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "shuffled(using:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "forEach(_:)", "", "", "Argument[self].CollectionElement", "Argument[0].Parameter[0]", "value", "manual"]
+      - ["", "Sequence", true, "joined()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "joined()", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "joined()", "", "", "Argument[self].CollectionElement.CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "joined(separator:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "joined(separator:)", "", "", "Argument[self].CollectionElement.CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "joined(separator:)", "", "", "Argument[separator:,self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "reversed()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "reversed()", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "first(where:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "value", "manual"]
+      - ["", "Sequence", true, "enumerated()", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement.TupleElement[1]", "value", "manual"]
+      - ["", "Sequence", true, "max(by:)", "", "", "Argument[self].CollectionElement", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "Sequence", true, "min(by:)", "", "", "Argument[self].CollectionElement", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "Sequence", true, "max()", "", "", "Argument[self].CollectionElement", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "Sequence", true, "min()", "", "", "Argument[self].CollectionElement", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "Sequence", true, "sorted()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "sorted()", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "sorted(by:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Sequence", true, "sorted(by:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Sequence", true, "formatted()", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "UnsafeBufferPointer", true, "init(_:)", "", "", "Argument[0].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafeBufferPointer", true, "init(count:start:)", "", "", "Argument[start:].OptionalSome.CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeBufferPointer", true, "withMemoryRebound(_:to:)", "", "", "Argument[self].CollectionElement", "Argument[1].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeBufferPointer", true, "withMemoryRebound(_:to:)", "", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "UnsafeBufferPointer", true, "init(rebasing:)", "", "", "Argument[rebasing:].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafePointer", true, "withMemoryRebound(_:capacity:to:)", "", "", "Argument[self].CollectionElement", "Argument[2].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "UnsafePointer", true, "withMemoryRebound(_:capacity:to:)", "", "", "Argument[2].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "init(_:)", "", "", "Argument[0].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "init(_:)", "", "", "Argument[0].OptionalSome.CollectionElement", "ReturnValue.OptionalSome.CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "init(mutating:)", "", "", "Argument[mutating:].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "init(mutating:)", "", "", "Argument[mutating:].OptionalSome.CollectionElement", "ReturnValue.OptionalSome.CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "withMemoryRebound(_:capacity:to:)", "", "", "Argument[self].CollectionElement", "Argument[2].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutablePointer", true, "withMemoryRebound(_:capacity:to:)", "", "", "Argument[2].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "withMemoryRebound(_:capacity:to:)", "", "", "Argument[2].Parameter[0].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutablePointer", true, "initialize(count:repeating:)", "", "", "Argument[repeating:]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "initialize(to:)", "", "", "Argument[to:]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "move()", "", "", "Argument[self].CollectionElement", "ReturnValue", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "assign(count:repeating:)", "", "", "Argument[repeating:]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "update(count:repeating:)", "", "", "Argument[repeating:]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "assign(count:from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "update(count:from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "moveInitialize(count:from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "initialize(count:from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "moveUpdate(count:from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "moveAssign(count:from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "initialize(from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutablePointer", true, "initialize(count:to:)", "", "", "Argument[to:]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "init(count:start:)", "", "", "Argument[start:].OptionalSome.CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "init(mutating:)", "", "", "Argument[mutating:].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "update(repeating:)", "", "", "Argument[repeating:]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "withMemoryRebound(_:to:)", "", "", "Argument[self].CollectionElement", "Argument[1].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "withMemoryRebound(_:to:)", "", "", "Argument[1].Parameter[0].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "withMemoryRebound(_:to:)", "", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "moveElement(from:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "value", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "initializeElement(at:to:)", "", "", "Argument[to:]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "moveUpdate(fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "moveInitialize(fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "update(fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "update(from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "update(from:)", "", "", "Argument[from:].CollectionElement", "ReturnValue.TupleElement[0].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "initialize(fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "initialize(from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "initialize(from:)", "", "", "Argument[from:].CollectionElement", "ReturnValue.TupleElement[0].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "initialize(repeating:)", "", "", "Argument[repeating:]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "init(rebasing:)", "", "", "Argument[rebasing:].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableBufferPointer", true, "assign(repeating:)", "", "", "Argument[repeating:]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "ContiguousArray", true, "withUnsafeMutableBufferPointer(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "ContiguousArray", true, "withUnsafeMutableBufferPointer(_:)", "", "", "Argument[self].CollectionElement", "Argument[0].Parameter[0].CollectionElement", "value", "manual"]
+      - ["", "ContiguousArray", true, "withUnsafeMutableBufferPointer(_:)", "", "", "Argument[0].Parameter[0].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "ContiguousArray", true, "withUnsafeMutableBufferPointer(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "ContiguousArray", true, "withUnsafeBufferPointer(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "ContiguousArray", true, "withUnsafeBufferPointer(_:)", "", "", "Argument[self].CollectionElement", "Argument[0].Parameter[0].CollectionElement", "value", "manual"]
+      - ["", "ContiguousArray", true, "withUnsafeBufferPointer(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "ContiguousArray", true, "withUnsafeMutableBytes(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "ContiguousArray", true, "withUnsafeMutableBytes(_:)", "", "", "Argument[self].CollectionElement", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "ContiguousArray", true, "withUnsafeMutableBytes(_:)", "", "", "Argument[0].Parameter[0].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "ContiguousArray", true, "withUnsafeMutableBytes(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "Collection", true, "makeIterator()", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Collection", true, "removeFirst()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "suffix(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "suffix(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Collection", true, "dropLast(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "dropLast(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Collection", true, "randomElement()", "", "", "Argument[self].CollectionElement", "ReturnValue.OptionalSome", "value", "manual"]
+      - ["", "Collection", true, "randomElement(using:)", "", "", "Argument[self].CollectionElement", "ReturnValue.OptionalSome", "value", "manual"]
+      - ["", "Collection", true, "popFirst()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "split(maxSplits:omittingEmptySubsequences:whereSeparator:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "prefix(through:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "prefix(through:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Collection", true, "suffix(from:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "prefix(upTo:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "prefix(upTo:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Collection", true, "prefix(while:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "prefix(while:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Collection", true, "prefix(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "prefix(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Collection", true, "dropFirst(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "dropFirst(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Collection", true, "split(maxSplits:omittingEmptySubsequences:separator:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "flatMap(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "flatMap(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Collection", true, "trimmingPrefix(while:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "trimmingPrefix(while:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Collection", true, "trimmingPrefix(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Collection", true, "trimmingPrefix(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafeRawPointer", true, "init(_:)", "", "", "Argument[0].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafeRawPointer", true, "init(_:)", "", "", "Argument[0].OptionalSome.CollectionElement", "ReturnValue.OptionalSome.CollectionElement", "value", "manual"]
+      - ["", "UnsafeRawPointer", true, "withMemoryRebound(_:capacity:to:)", "", "", "Argument[self].CollectionElement", "Argument[2].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeRawPointer", true, "withMemoryRebound(_:capacity:to:)", "", "", "Argument[2].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "UnsafeRawPointer", true, "loadUnaligned(as:fromByteOffset:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "UnsafeRawPointer", true, "load(as:fromByteOffset:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "UnsafeRawPointer", true, "assumingMemoryBound(to:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeRawPointer", true, "bindMemory(capacity:to:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeRawPointer", true, "alignedDown(toMultipleOf:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeRawPointer", true, "alignedUp(toMultipleOf:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeRawPointer", true, "alignedDown(for:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeRawPointer", true, "alignedUp(for:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "init(base:bounds:)", "", "", "Argument[base:].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Slice", true, "remove(at:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "value", "manual"]
+      - ["", "Slice", true, "insert(_:at:)", "", "", "Argument[0]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Slice", true, "insert(at:contentsOf:)", "", "", "Argument[contentsOf:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Slice", true, "replaceSubrange(_:with:)", "", "", "Argument[with:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Slice", true, "storeBytes(as:of:toByteOffset:)", "", "", "Argument[of:]", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "update(repeating:)", "", "", "Argument[repeating:]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Slice", true, "loadUnaligned(as:fromByteOffset:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "Slice", true, "load(as:fromByteOffset:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "Slice", true, "assumingMemoryBound(to:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "withMemoryRebound(_:to:)", "", "", "Argument[self].CollectionElement", "Argument[1].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "withMemoryRebound(_:to:)", "", "", "Argument[1].Parameter[0].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "withMemoryRebound(_:to:)", "", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "Slice", true, "bindMemory(to:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "moveInitializeMemory(as:fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "moveInitializeMemory(as:fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "initializeMemory(as:fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "initializeMemory(as:fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "initializeMemory(as:from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "initializeMemory(as:from:)", "", "", "Argument[from:].CollectionElement", "ReturnValue.TupleElement[0,1].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "initializeMemory(as:repeating:)", "", "", "Argument[repeating:]", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "initializeMemory(as:repeating:)", "", "", "Argument[repeating:]", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "copyBytes(from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "moveElement(from:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "value", "manual"]
+      - ["", "Slice", true, "initializeElement(at:to:)", "", "", "Argument[to:]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Slice", true, "moveUpdate(fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Slice", true, "moveInitialize(fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Slice", true, "update(fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Slice", true, "update(from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Slice", true, "update(from:)", "", "", "Argument[from:].CollectionElement", "ReturnValue.TupleElement[0].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "initialize(fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "initialize(from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "initialize(from:)", "", "", "Argument[from:].CollectionElement", "ReturnValue.TupleElement[0,1].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "initialize(repeating:)", "", "", "Argument[repeating:]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Slice", true, "withContiguousMutableStorageIfAvailable(_:to:)", "", "", "Argument[self].CollectionElement", "Argument[to:].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "withContiguousMutableStorageIfAvailable(_:to:)", "", "", "Argument[to:].Parameter[0].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "Slice", true, "withContiguousMutableStorageIfAvailable(_:to:)", "", "", "Argument[to:].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "SignedInteger", true, "init(exactly:)", "", "", "Argument[exactly:]", "ReturnValue.OptionalSome", "value", "manual"]
+      - ["", "SignedInteger", true, "init(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "BidirectionalCollection", true, "popLast()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "BidirectionalCollection", true, "suffix(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "BidirectionalCollection", true, "suffix(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "BidirectionalCollection", true, "dropLast(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "BidirectionalCollection", true, "dropLast(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "BidirectionalCollection", true, "suffix(from:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "BidirectionalCollection", true, "last(where:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "BidirectionalCollection", true, "joined(separator:)", "", "", "Argument[self,separator:]", "ReturnValue", "taint", "manual"]
+      - ["", "BidirectionalCollection", true, "joined(separator:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "BidirectionalCollection", true, "joined(separator:)", "", "", "Argument[self].CollectionElement.CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "BidirectionalCollection", true, "reversed()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "BidirectionalCollection", true, "reversed()", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "String", true, "init(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(_:)", "", "", "Argument[0]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "init(count:repeating:)", "", "", "Argument[repeating:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "insert(at:contentsOf:)", "", "", "Argument[contentsOf:]", "Argument[self]", "taint", "manual"]
+      - ["", "String", true, "init(extendedGraphemeClusterLiteral:)", "", "", "Argument[extendedGraphemeClusterLiteral:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(unicodeScalarLiteral:)", "", "", "Argument[unicodeScalarLiteral:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "encode(to:)", "", "", "Argument[self]", "Argument[to:]", "taint", "manual"]
+      - ["", "String", true, "init(from:)", "", "", "Argument[from:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(from:)", "", "", "Argument[from:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "randomElement()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "randomElement(using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "split(maxSplits:omittingEmptySubsequences:whereSeparator:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(stringLiteral:)", "", "", "Argument[stringLiteral:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(stringInterpolation:)", "", "", "Argument[stringInterpolation:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "decodeCString(_:as:repairingInvalidCodeUnits:)", "", "", "Argument[0]", "ReturnValue.TupleElement[0]", "taint", "manual"]
+      - ["", "String", true, "decodeCString(_:as:repairingInvalidCodeUnits:)", "", "", "Argument[0].CollectionElement", "ReturnValue.TupleElement[0]", "taint", "manual"]
+      - ["", "String", true, "init(validatingUTF8:)", "", "", "Argument[validatingUTF8:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "init(validatingUTF8:)", "", "", "Argument[validatingUTF8:].CollectionElement", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "enumerated()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "max(by:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "min(by:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "max()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "min()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "withUTF8(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "String", true, "withUTF8(_:)", "", "", "Argument[0].Parameter[0].CollectionElement", "Argument[self]", "taint", "manual"]
+      - ["", "String", true, "withUTF8(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "String", true, "init(initializingUTF8With:unsafeUninitializedCapacity:)", "", "", "Argument[initializingUTF8With:].Parameter[0].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(_:radix:uppercase:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(validating:)", "", "", "Argument[validating:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "init(describing:)", "", "", "Argument[describing:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(contentsOf:)", "", "", "Argument[contentsOf:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(contentsOfFile:)", "", "", "Argument[contentsOfFile:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(contentsOf:encoding:)", "", "", "Argument[contentsOf:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(contentsOfFile:encoding:)", "", "", "Argument[contentsOfFile:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(contentsOfFile:usedEncoding:)", "", "", "Argument[contentsOfFile:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(platformString:)", "", "", "Argument[platformString:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(platformString:)", "", "", "Argument[platformString:].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "withPlatformString(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "String", true, "withPlatformString(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "String", true, "init(bytesNoCopy:encoding:freeWhenDone:length:)", "", "", "Argument[bytesNoCopy:].CollectionElement", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "init(cString:encoding:)", "", "", "Argument[cString:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "init(cString:encoding:)", "", "", "Argument[cString:].CollectionElement", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "init(data:encoding:)", "", "", "Argument[data:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "init(_:format:)", "", "", "Argument[format:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(_:format:)", "", "", "Argument[1].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(arguments:format:)", "", "", "Argument[format:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(arguments:format:)", "", "", "Argument[arguments:].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(_:format:locale:)", "", "", "Argument[format:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(_:format:locale:)", "", "", "Argument[2].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(arguments:format:locale:)", "", "", "Argument[format:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(arguments:format:locale:)", "", "", "Argument[arguments:].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(utf8String:)", "", "", "Argument[utf8String:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "init(utf8String:)", "", "", "Argument[utf8String:].CollectionElement", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "localizedStringWithFormat(_:_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "localizedStringWithFormat(_:_:)", "", "", "Argument[1].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(bytes:encoding:)", "", "", "Argument[bytes:].CollectionElement", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "init(contendsOf:usedEncoding:)", "", "", "Argument[contendsOf:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(decoding:)", "", "", "Argument[decoding:]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(count:utf16CodeUnits:)", "", "", "Argument[utf16CodeUnits:].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(count:freeWhenDone:utf16CodeUnitsNoCopy:)", "", "", "Argument[utf16CodeUnitsNoCopy:].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "init(validatingPlatformString:)", "", "", "Argument[validatingPlatformString:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "init(validatingPlatformString:)", "", "", "Argument[validatingPlatformString:].CollectionElement", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "String", true, "subscript(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "String", true, "withMutableCharacters(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0]", "value", "manual"]
+      - ["", "String", true, "withMutableCharacters(_:)", "", "", "Argument[0].Parameter[0]", "Argument[self]", "value", "manual"]
+      - ["", "String", true, "withMutableCharacters(_:)", "", "", "Argument[0].Parameter[0].CollectionElement", "Argument[self]", "taint", "manual"]
+      - ["", "String", true, "withMutableCharacters(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "BinaryFloatingPoint", true, "init(exponentBitPattern:sign:significandBitPattern:)", "", "", "Argument[sign:,exponentBitPattern:,significandBitPattern:]", "ReturnValue", "taint", "manual"]
+      - ["", "BinaryFloatingPoint", true, "formatted()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "BinaryFloatingPoint", true, "formatted(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "BinaryFloatingPoint", true, "init(_:format:lenient:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "BinaryFloatingPoint", true, "init(_:strategy:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "UnsafeRawBufferPointer", true, "init(_:)", "", "", "Argument[0].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafeRawBufferPointer", true, "init(count:start:)", "", "", "Argument[start:].OptionalSome.CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeRawBufferPointer", true, "loadUnaligned(as:fromByteOffset:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "UnsafeRawBufferPointer", true, "load(as:fromByteOffset:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "UnsafeRawBufferPointer", true, "assumingMemoryBound(to:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeRawBufferPointer", true, "withMemoryRebound(_:to:)", "", "", "Argument[self].CollectionElement", "Argument[1].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeRawBufferPointer", true, "withMemoryRebound(_:to:)", "", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "UnsafeRawBufferPointer", true, "bindMemory(to:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeRawBufferPointer", true, "init(rebasing:)", "", "", "Argument[rebasing:].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Array", true, "withUnsafeMutableBufferPointer(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "Array", true, "withUnsafeMutableBufferPointer(_:)", "", "", "Argument[self].CollectionElement", "Argument[0].Parameter[0].CollectionElement", "value", "manual"]
+      - ["", "Array", true, "withUnsafeMutableBufferPointer(_:)", "", "", "Argument[0].Parameter[0].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Array", true, "withUnsafeMutableBufferPointer(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "Array", true, "withUnsafeBufferPointer(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "Array", true, "withUnsafeBufferPointer(_:)", "", "", "Argument[self].CollectionElement", "Argument[0].Parameter[0].CollectionElement", "value", "manual"]
+      - ["", "Array", true, "withUnsafeBufferPointer(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "Array", true, "makeIterator()", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Array", true, "insert(_:at:)", "", "", "Argument[0]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Array", true, "insert(_:at:)", "", "", "Argument[at:]", "Argument[self]", "taint", "manual"]
+      - ["", "Array", true, "init(arrayLiteral:)", "", "", "Argument[arrayLiteral:].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Array", true, "withUnsafeBytes(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "Array", true, "withUnsafeBytes(_:)", "", "", "Argument[self].CollectionElement", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "Array", true, "withUnsafeBytes(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "Array", true, "withUnsafeMutableBytes(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "Array", true, "withUnsafeMutableBytes(_:)", "", "", "Argument[self].CollectionElement", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "Array", true, "withUnsafeMutableBytes(_:)", "", "", "Argument[0].Parameter[0].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "Array", true, "withUnsafeMutableBytes(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "MutableCollection", true, "withContiguousMutableStorageIfAvailable(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "MutableCollection", true, "withContiguousMutableStorageIfAvailable(_:)", "", "", "Argument[self].CollectionElement", "Argument[0].Parameter[0].CollectionElement", "value", "manual"]
+      - ["", "MutableCollection", true, "withContiguousMutableStorageIfAvailable(_:)", "", "", "Argument[0].Parameter[0].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "MutableCollection", true, "withContiguousMutableStorageIfAvailable(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue.OptionalSome", "value", "manual"]
+      - ["", "RangeReplaceableCollection", true, "init(_:)", "", "", "Argument[0]", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "RangeReplaceableCollection", true, "init(_:)", "", "", "Argument[0].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "RangeReplaceableCollection", true, "append(_:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "RangeReplaceableCollection", true, "remove(at:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "RangeReplaceableCollection", true, "insert(_:at:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "RangeReplaceableCollection", true, "append(contentsOf:)", "", "", "Argument[contentsOf:]", "Argument[self]", "taint", "manual"]
+      - ["", "RangeReplaceableCollection", true, "init(count:repeating:)", "", "", "Argument[repeating:]", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "RangeReplaceableCollection", true, "removeFirst()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "RangeReplaceableCollection", true, "replaceSubrange(_:with:)", "", "", "Argument[with:]", "Argument[self]", "taint", "manual"]
+      - ["", "RangeReplaceableCollection", true, "replaceSubrange(_:with:)", "", "", "Argument[with:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "RangeReplaceableCollection", true, "removeLast()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "IteratorProtocol", true, "next()", "", "", "Argument[self].CollectionElement", "ReturnValue.OptionalSome", "value", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "init(_:)", "", "", "Argument[0].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "init(count:start:)", "", "", "Argument[start:].OptionalSome.CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "init(mutating:)", "", "", "Argument[mutating:].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "storeBytes(as:of:toByteOffset:)", "", "", "Argument[of:]", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "loadUnaligned(as:fromByteOffset:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "load(as:fromByteOffset:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "assumingMemoryBound(to:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "withMemoryRebound(_:to:)", "", "", "Argument[self].CollectionElement", "Argument[1].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "withMemoryRebound(_:to:)", "", "", "Argument[1].Parameter[0].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "withMemoryRebound(_:to:)", "", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "bindMemory(to:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "moveInitializeMemory(as:fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "moveInitializeMemory(as:fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "initializeMemory(as:fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "initializeMemory(as:fromContentsOf:)", "", "", "Argument[fromContentsOf:].CollectionElement", "ReturnValue.TupleElement[0,1].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "initializeMemory(as:from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "initializeMemory(as:from:)", "", "", "Argument[from:].CollectionElement", "ReturnValue.TupleElement[0,1].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "initializeMemory(as:repeating:)", "", "", "Argument[repeating:]", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "initializeMemory(as:repeating:)", "", "", "Argument[repeating:]", "ReturnValue.TupleElement[0,1].CollectionElement", "taint", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "copyBytes(from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "init(rebasing:)", "", "", "Argument[rebasing:].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "UnsafeMutableRawBufferPointer", true, "copyMemory(from:)", "", "", "Argument[from:].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "LosslessStringConvertible", true, "init(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "RawRepresentable", true, "init(rawValue:)", "", "", "Argument[rawValue:]", "ReturnValue", "taint", "manual"]
+      - ["", "Dictionary", true, "makeIterator()", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Dictionary", true, "updateValue(_:forKey:)", "", "", "Argument[0]", "Argument[self].CollectionElement.TupleElement[1]", "value", "manual"]
+      - ["", "Dictionary", true, "updateValue(_:forKey:)", "", "", "Argument[forKey:]", "Argument[self].CollectionElement.TupleElement[0]", "value", "manual"]
+      - ["", "Dictionary", true, "updateValue(_:forKey:)", "", "", "Argument[self].CollectionElement.TupleElement[1]", "ReturnValue.OptionalSome", "value", "manual"]
+      - ["", "Set", true, "init(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "Set", true, "init(_:)", "", "", "Argument[0].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Set", true, "remove(at:)", "", "", "Argument[self].CollectionElement", "ReturnValue", "value", "manual"]
+      - ["", "Set", true, "removeFirst()", "", "", "Argument[self].CollectionElement", "ReturnValue", "value", "manual"]
+      - ["", "Set", true, "filter(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "Set", true, "insert(_:)", "", "", "Argument[0]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Set", true, "insert(_:)", "", "", "Argument[0]", "ReturnValue.TupleElement[1]", "taint", "manual"]
+      - ["", "Set", true, "intersection(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "Set", true, "subtracting(_:)", "", "", "Argument[self].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "Set", true, "symmetricDifference(_:)", "", "", "Argument[self,0].CollectionElement", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "Set", true, "union(_:)", "", "", "Argument[self,0].CollectionElement", "ReturnValue.CollectionElement", "value", "manual"]
+      - ["", "Set", true, "update(with:)", "", "", "Argument[with:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "Set", true, "update(with:)", "", "", "Argument[with:]", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "Set", true, "remove(_:)", "", "", "Argument[0]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "Set", true, "formSymmetricDifference(_:)", "", "", "Argument[0].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "Set", true, "formUnion(_:)", "", "", "Argument[0].CollectionElement", "Argument[self].CollectionElement", "value", "manual"]
+      - ["", "TextOutputStreamable", true, "write(to:)", "", "", "Argument[self]", "Argument[to:]", "taint", "manual"]
+      - ["", "TextOutputStream", true, "write(_:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "Substring", true, "withUTF8(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "Substring", true, "withUTF8(_:)", "", "", "Argument[0].Parameter[0].CollectionElement", "Argument[self]", "taint", "manual"]
+      - ["", "Substring", true, "withUTF8(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "StringProtocol", true, "withCString(_:encodedAs:)", "", "", "Argument[self]", "Argument[1].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "StringProtocol", true, "withCString(_:encodedAs:)", "", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "StringProtocol", true, "withCString(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "StringProtocol", true, "withCString(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "StringProtocol", true, "init(as:decodingCString:)", "", "", "Argument[decodingCString:].OptionalSome.CollectionElement", "ReturnValue.OptionalSome.TupleElement[0]", "taint", "manual"]
+      - ["", "StringProtocol", true, "init(cString:)", "", "", "Argument[cString:]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "init(cString:)", "", "", "Argument[cString:].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "init(as:decoding:)", "", "", "Argument[decoding:]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "uppercased()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "lowercased()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "getBytes(_:encoding:maxLength:options:range:remaining:usedLength:)", "", "", "Argument[self]", "Argument[0].CollectionElement", "taint", "manual"]
+      - ["", "StringProtocol", true, "getCString(_:encoding:maxLength:)", "", "", "Argument[self]", "Argument[0].CollectionElement", "taint", "manual"]
+      - ["", "StringProtocol", true, "appending(_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "addingPercentEscapes(using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "appendingFormat(_:_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "appendingFormat(_:_:)", "", "", "Argument[1].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "applyingTransform(_:reverse:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "cString(using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "capitalized(with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "completePath(caseSensitive:filterTypes:into:matchesInto:)", "", "", "Argument[self]", "Argument[into:].CollectionElement", "taint", "manual"]
+      - ["", "StringProtocol", true, "completePath(caseSensitive:filterTypes:into:matchesInto:)", "", "", "Argument[self]", "Argument[matchesInto:].CollectionElement.CollectionElement", "taint", "manual"]
+      - ["", "StringProtocol", true, "components(separatedBy:)", "", "", "Argument[self]", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "StringProtocol", true, "data(allowLossyConversion:using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "folding(locale:options:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "lowercased(with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "padding(startingAt:toLength:withPad:)", "", "", "Argument[withPad:]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "padding(startingAt:toLength:withPad:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "propertyList()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "propertyListFromStringsFileFormat()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "replacingCharacters(in:with:)", "", "", "Argument[with:]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "replacingCharacters(in:with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "replacingOccurrences(of:options:range:with:)", "", "", "Argument[with:]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "replacingOccurrences(of:options:range:with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "replacingPercentEscapes(using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "substring(from:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "substring(with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "trimmingCharacters(in:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "uppercased(with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "StringProtocol", true, "addingPercentEncoding(withAllowedCharacter:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Strideable", true, "advanced(by:)", "", "", "Argument[self,by:]", "ReturnValue", "taint", "manual"]
+      - ["", "Strideable", true, "distance(to:)", "", "", "Argument[self,to:]", "ReturnValue", "taint", "manual"]
+      - ["", "FloatingPoint", true, "init(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "FloatingPoint", true, "rounded(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "FloatingPoint", true, "maximumMagnitude(_:_:)", "", "", "Argument[0,1]", "ReturnValue", "taint", "manual"]
+      - ["", "FloatingPoint", true, "minimumMagnitude(_:_:)", "", "", "Argument[0,1]", "ReturnValue", "taint", "manual"]
+      - ["", "FloatingPoint", true, "maximum(_:_:)", "", "", "Argument[0,1]", "ReturnValue", "taint", "manual"]
+      - ["", "FloatingPoint", true, "minimum(_:_:)", "", "", "Argument[0,1]", "ReturnValue", "taint", "manual"]
+      - ["", "FloatingPoint", true, "addProduct(_:_:)", "", "", "Argument[self,0,1]", "Argument[self]", "taint", "manual"]
+      - ["", "FloatingPoint", true, "addingProduct(_:_:)", "", "", "Argument[self,0,1]", "ReturnValue", "taint", "manual"]
+      - ["", "FloatingPoint", true, "squareRoot()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "FloatingPoint", true, "formTruncatingRemainder(dividingBy:)", "", "", "Argument[self,dividingBy:]", "Argument[self]", "taint", "manual"]
+      - ["", "FloatingPoint", true, "truncatingRemainder(dividingBy:)", "", "", "Argument[self,dividingBy:]", "ReturnValue", "taint", "manual"]
+      - ["", "FloatingPoint", true, "formRemainder(dividingBy:)", "", "", "Argument[self,dividingBy:]", "Argument[self]", "taint", "manual"]
+      - ["", "FloatingPoint", true, "remainder(dividingBy:)", "", "", "Argument[self,dividingBy:]", "ReturnValue", "taint", "manual"]
+      - ["", "FloatingPoint", true, "init(magnitudeOf:signOf:)", "", "", "Argument[magnitudeOf:]", "ReturnValue", "taint", "manual"]
+      - ["", "FloatingPoint", true, "init(exponent:sign:significand:)", "", "", "Argument[exponent:,significand:]", "ReturnValue", "taint", "manual"]
+      - ["", "FloatingPoint", true, "rounded()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "OptionSet", true, "init(rawValue:)", "", "", "Argument[rawValue:]", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "min(_:_:)", "", "", "Argument[0,1]", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "min(_:_:_:_:)", "", "", "Argument[0,1,2]", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "min(_:_:_:_:)", "", "", "Argument[3].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "max(_:_:)", "", "", "Argument[0,1]", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "max(_:_:_:_:)", "", "", "Argument[0,1,2]", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "max(_:_:_:_:)", "", "", "Argument[3].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "unsafeBitCast(_:to:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "unsafeDowncast(_:to:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "dump(_:indent:maxDepth:maxItems:name:to:)", "", "", "Argument[0,name:]", "Argument[to:]", "taint", "manual"]
+      - ["", "", false, "abs(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "numericCast(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "withExtendedLifetime(_:_:)", "", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "", false, "withUnsafeMutablePointer(_:to:)", "", "", "Argument[to:]", "Argument[1].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "", false, "withUnsafeMutablePointer(_:to:)", "", "", "Argument[1].Parameter[0].CollectionElement", "Argument[to:]", "value", "manual"]
+      - ["", "", false, "withUnsafeMutablePointer(_:to:)", "", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "", false, "withUnsafePointer(_:to:)", "", "", "Argument[to:]", "Argument[1].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "", false, "withUnsafePointer(_:to:)", "", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "", false, "swap(_:_:)", "", "", "Argument[0]", "Argument[1]", "value", "manual"]
+      - ["", "", false, "swap(_:_:)", "", "", "Argument[1]", "Argument[0]", "value", "manual"]
+      - ["", "", false, "print(_:separator:terminator:to:)", "", "", "Argument[0].CollectionElement", "Argument[to:]", "taint", "manual"]
+      - ["", "", false, "print(_:separator:terminator:to:)", "", "", "Argument[separator:,terminator:]", "Argument[to:]", "taint", "manual"]
+      - ["", "", false, "debugPrint(_:separator:terminator:to:)", "", "", "Argument[0].CollectionElement", "Argument[to:]", "taint", "manual"]
+      - ["", "", false, "debugPrint(_:separator:terminator:to:)", "", "", "Argument[separator:,terminator:]", "Argument[to:]", "taint", "manual"]
+      - ["", "", false, "withUnsafeTemporaryAllocation(_:alignment:byteCount:)", "", "", "Argument[2].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "", false, "withUnsafeTemporaryAllocation(_:capacity:of:)", "", "", "Argument[2].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "", false, "withVaList(_:_:)", "", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "manual"]
+      - ["", "", false, "getVaList(_:)", "", "", "Argument[0].CollectionElement", "ReturnValue", "value", "manual"]
+      - ["", "", false, "withUnsafeMutableBytes(_:of:)", "", "", "Argument[of:]", "Argument[1].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "", false, "withUnsafeMutableBytes(_:of:)", "", "", "Argument[1].Parameter[0].CollectionElement", "Argument[of:]", "taint", "manual"]
+      - ["", "", false, "withUnsafeMutableBytes(_:of:)", "", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "", false, "withUnsafeBytes(_:of:)", "", "", "Argument[of:]", "Argument[1].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "", false, "withUnsafeBytes(_:of:)", "", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "", false, "<-(_:_:)", "", "", "Argument[0,1]", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "JSStringRetain(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "JSStringCreateWithUTF8CString(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "", false, "JSStringCreateWithCharacters(_:_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(_:)", "", "", "Argument[0]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "URL", true, "init(fileReferenceLiteralResourceName:)", "", "", "Argument[fileReferenceLiteralResourceName:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(string:)", "(String)", "", "Argument[string:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "URL", true, "appendingPathExtension(for:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "appendingPathComponent(_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "appendingPathExtension(_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "appendingPathComponent(_:isDirectory:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "appendingPathComponent(_:conformingTo:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "formatted()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "formatted(_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(_:strategy:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "append(component:directoryHint:)", "", "", "Argument[self,component:]", "Argument[self]", "taint", "manual"]
+      - ["", "URL", true, "append(components:directoryHint:)", "", "", "Argument[self,components:]", "Argument[self]", "taint", "manual"]
+      - ["", "URL", true, "append(directoryHint:path:)", "", "", "Argument[self,path:]", "Argument[self]", "taint", "manual"]
+      - ["", "URL", true, "append(queryItems:)", "", "", "Argument[self,queryItems:]", "Argument[self]", "taint", "manual"]
+      - ["", "URL", true, "appendPathComponent(_:)", "", "", "Argument[self,0]", "Argument[self]", "taint", "manual"]
+      - ["", "URL", true, "appendPathComponent(_:conformingTo:)", "", "", "Argument[self,0]", "Argument[self]", "taint", "manual"]
+      - ["", "URL", true, "appendPathComponent(_:isDirectory:)", "", "", "Argument[self,0]", "Argument[self]", "taint", "manual"]
+      - ["", "URL", true, "appendPathExtension(_:)", "", "", "Argument[self,0]", "Argument[self]", "taint", "manual"]
+      - ["", "URL", true, "appending(component:directoryHint:)", "", "", "Argument[self,component:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "appending(components:directoryHint:)", "", "", "Argument[self,components:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "appending(directoryHint:path:)", "", "", "Argument[self,path:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "appending(queryItems:)", "", "", "Argument[self,queryItems:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "bookmarkData(includingResourceValuesForKeys:options:relativeTo:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "bookmarkData(includingResourceValuesForKeys:options:relativeTo:)", "", "", "Argument[includingResourceValuesForKeys:].OptionalSome.CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "bookmarkData(includingResourceValuesForKeys:options:relativeTo:)", "", "", "Argument[relativeTo:].OptionalSome", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "bookmarkData(withContentsOf:)", "", "", "Argument[withContentsOf:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "deletingLastPathComponent()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "deletingPathExtension()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "fragment(percentEncoded:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "homeDirectory(forUser:)", "", "", "Argument[forUser:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "host(percentEncoded:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(_:isDirectory:)", "", "", "Argument[0]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "URL", true, "init(dataRepresentation:isAbsolute:relativeTo:)", "", "", "Argument[dataRepresentation:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(dataRepresentation:isAbsolute:relativeTo:)", "", "", "Argument[relativeTo:].OptionalSome", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(filePath:)", "", "", "Argument[filePath:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "URL", true, "init(directoryHint:filePath:)", "", "", "Argument[filePath:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "URL", true, "init(directoryHint:filePath:relativeTo:)", "", "", "Argument[filePath:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(directoryHint:filePath:relativeTo:)", "", "", "Argument[relativeTo:].OptionalSome", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(filePath:isDirectory:)", "", "", "Argument[filePath:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "URL", true, "init(fileURLWithFileSystemRepresentation:isDirectory:relativeTo:)", "", "", "Argument[fileURLWithFileSystemRepresentation:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(fileURLWithFileSystemRepresentation:isDirectory:relativeTo:)", "", "", "Argument[relativeTo:].OptionalSome", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(fileURLWithPath:)", "", "", "Argument[fileURLWithPath:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(fileURLWithPath:isDirectory:)", "", "", "Argument[fileURLWithPath:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(fileURLWithPath:isDirectory:relativeTo:)", "", "", "Argument[fileURLWithPath:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(fileURLWithPath:isDirectory:relativeTo:)", "", "", "Argument[relativeTo:].OptionalSome", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(fileURLWithPath:relativeTo:)", "", "", "Argument[fileURLWithPath:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(fileURLWithPath:relativeTo:)", "", "", "Argument[relativeTo:].OptionalSome", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(appropriateFor:create:for:in:)", "", "", "Argument[for:,in:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(appropriateFor:create:for:in:)", "", "", "Argument[appropriateFor:].OptionalSome", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(options:resolvingAliasFileAt:)", "", "", "Argument[resolvingAliasFileAt:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(bookmarkDataIsStale:options:relativeTo:resolvingBookmarkData:)", "", "", "Argument[resolvingBookmarkData:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(bookmarkDataIsStale:options:relativeTo:resolvingBookmarkData:)", "", "", "Argument[relativeTo:].OptionalSome", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(resource:)", "", "", "Argument[resource:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "init(encodingInvalidCharacters:string:)", "", "", "Argument[string:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "URL", true, "init(relativeTo:string:)", "(String,URL?)", "", "Argument[string:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "URL", true, "init(relativeTo:string:)", "(String,URL?)", "", "Argument[relativeTo:].OptionalSome", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "URL", true, "password(percentEncoded:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "path(percentEncoded:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "promisedItemResourceValues(forKeys:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "query(percentEncoded:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "resolvingSymlinksInPath()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "resourceValues(forKeys:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "resourceValues(forKeys:fromBookmarkData:)", "", "", "Argument[fromBookmarkData:]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "setResourceValues(_:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "URL", true, "setTemporaryResourceValue(_:forKey:)", "", "", "Argument[self,0]", "Argument[self]", "taint", "manual"]
+      - ["", "URL", true, "user(percentEncoded:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URL", true, "withUnsafeFileSystemRepresentation(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].OptionalSome.CollectionElement", "taint", "manual"]
+      - ["", "URL", true, "withUnsafeFileSystemRepresentation(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "init(contentsOf:)", "", "", "Argument[contentsOf:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "init(contentsOfFile:)", "", "", "Argument[contentsOfFile:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "init(contentsOf:options:)", "", "", "Argument[contentsOf:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "init(data:)", "", "", "Argument[data:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "init(bytes:length:)", "", "", "Argument[bytes:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "base64EncodedData(options:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "base64EncodedString(options:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "base64Encoding()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "compressed(using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "dataWithContentsOfMappedFile(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "decompressed(using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "enumerateBytes(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0]", "taint", "manual"]
+      - ["", "NSData", true, "getBytes(_:)", "", "", "Argument[self]", "Argument[0]", "taint", "manual"]
+      - ["", "NSData", true, "getBytes(_:length:)", "", "", "Argument[self]", "Argument[0]", "taint", "manual"]
+      - ["", "NSData", true, "getBytes(_:range:)", "", "", "Argument[self]", "Argument[0]", "taint", "manual"]
+      - ["", "NSData", true, "init(base64Encoded:options:)", "", "", "Argument[base64Encoded:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "init(base64Encoding:)", "", "", "Argument[base64Encoding:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "init(bytesNoCopy:length:)", "", "", "Argument[bytesNoCopy:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "init(bytesNoCopy:deallocator:length:)", "", "", "Argument[bytesNoCopy:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "init(bytesNoCopy:freeWhenDone:length:)", "", "", "Argument[bytesNoCopy:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "init(contentsOfFile:options:)", "", "", "Argument[contentsOfFile:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "init(contentsOfMappedFile:)", "", "", "Argument[contentsOfMappedFile:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSData", true, "subdata(with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(coder:)", "", "", "Argument[coder:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(cString:)", "", "", "Argument[cString:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "getBytes(_:encoding:maxLength:options:range:remaining:usedLength:)", "", "", "Argument[self]", "Argument[0]", "taint", "manual"]
+      - ["", "NSString", true, "getCharacters(_:range:)", "", "", "Argument[self]", "Argument[0]", "taint", "manual"]
+      - ["", "NSString", true, "character(at:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "getCString(_:encoding:maxLength:)", "", "", "Argument[self]", "Argument[0]", "taint", "manual"]
+      - ["", "NSString", true, "init(string:)", "", "", "Argument[string:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "appending(_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(contentsOf:)", "", "", "Argument[contentsOf:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(contentsOfFile:)", "", "", "Argument[contentsOfFile:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "string(withContentsOf:)", "", "", "Argument[withContentsOf:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(contentsOf:encoding:)", "", "", "Argument[contentsOf:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "string(withContentsOfFile:)", "", "", "Argument[withContentsOfFile:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(contentsOfFile:encoding:)", "", "", "Argument[contentsOfFile:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(contentsOf:usedEncoding:)", "", "", "Argument[contentsOf:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(contentsOfFile:usedEncoding:)", "", "", "Argument[contentsOfFile:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "appendingPathComponent(_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "appendingPathExtension(_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "appendingPathComponent(_:conformingTo:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "addingPercentEncoding(withAllowedCharacters:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "addingPercentEscapes(using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "appendingFormat(_:_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "appendingFormat(_:_:)", "", "", "Argument[1].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "applyTransform(_:range:reverse:updatedRange:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "applyingTransform(_:reverse:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "cString()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "cString(using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "capitalized(with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "completePath(caseSensitive:filterTypes:into:matchesInto:)", "", "", "Argument[self]", "Argument[into:].CollectionElement", "taint", "manual"]
+      - ["", "NSString", true, "completePath(caseSensitive:filterTypes:into:matchesInto:)", "", "", "Argument[self]", "Argument[matchesInto:].CollectionElement.CollectionElement", "taint", "manual"]
+      - ["", "NSString", true, "components(separatedBy:)", "", "", "Argument[self]", "ReturnValue.CollectionElement", "taint", "manual"]
+      - ["", "NSString", true, "data(using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "data(allowLossyConversion:using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "enumerateLines(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0]", "taint", "manual"]
+      - ["", "NSString", true, "enumerateLinguisticTags(in:options:orthography:scheme:using:)", "", "", "Argument[self]", "Argument[using:].Parameter[0].OptionalSome", "taint", "manual"]
+      - ["", "NSString", true, "enumerateSubstrings(in:options:using:)", "", "", "Argument[self]", "Argument[using:].Parameter[0].OptionalSome", "taint", "manual"]
+      - ["", "NSString", true, "enumerateSubstrings(in:options:using:)", "", "", "Argument[using:].Parameter[0].OptionalSome", "Argument[self]", "taint", "manual"]
+      - ["", "NSString", true, "folding(locale:options:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "getCString(_:)", "", "", "Argument[self]", "Argument[0]", "taint", "manual"]
+      - ["", "NSString", true, "getCString(_:maxLength:)", "", "", "Argument[self]", "Argument[0]", "taint", "manual"]
+      - ["", "NSString", true, "getCString(_:maxLength:range:remaining:)", "", "", "Argument[self]", "Argument[0]", "taint", "manual"]
+      - ["", "NSString", true, "getCharacters(_:)", "", "", "Argument[self]", "Argument[0]", "taint", "manual"]
+      - ["", "NSString", true, "getFileSystemRepresentation(_:maxLength:)", "", "", "Argument[self]", "Argument[0]", "taint", "manual"]
+      - ["", "NSString", true, "init(bytes:encoding:length:)", "", "", "Argument[bytes:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(bytesNoCopy:deallocator:encoding:length:)", "", "", "Argument[bytesNoCopy:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(bytesNoCopy:encoding:freeWhenDone:length:)", "", "", "Argument[bytesNoCopy:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(cString:encoding:)", "", "", "Argument[cString:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(cString:length:)", "", "", "Argument[cString:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(cStringNoCopy:freeWhenDone:length:)", "", "", "Argument[cStringNoCopy:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(characters:length:)", "", "", "Argument[characters:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(charactersNoCopy:dellocator:length:)", "", "", "Argument[charactersNoCopy:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(charactersNoCopy:freeWhenDone:length:)", "", "", "Argument[charactersNoCopy:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(data:encoding:)", "", "", "Argument[data:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(_:format:)", "", "", "Argument[format:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(_:format:)", "", "", "Argument[1].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(arguments:format:)", "", "", "Argument[format:,arguments:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(_:format:locale:)", "", "", "Argument[format:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(_:format:locale:)", "", "", "Argument[2].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(arguments:format:locale:)", "", "", "Argument[format:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(arguments:format:locale:)", "", "", "Argument[arguments:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "init(utf8String:)", "", "", "Argument[utf8String:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "localizedStringWithFormat(_:_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "localizedStringWithFormat(_:_:)", "", "", "Argument[1].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "lossyCString()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "lowercased(with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "padding(startingAt:toLength:withPad:)", "", "", "Argument[withPad:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "padding(startingAt:toLength:withPad:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "path(withComponents:)", "", "", "Argument[withComponents:].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "propertyList()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "propertyListFromStringsFileFormat()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "replacingCharacters(in:with:)", "", "", "Argument[with:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "replacingCharacters(in:with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "replacingOccurrences(of:with:)", "", "", "Argument[with:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "replacingOccurrences(of:with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "replacingOccurrences(of:options:range:with:)", "", "", "Argument[with:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "replacingOccurrences(of:options:range:with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "replacingPercentEscapes(using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "string(withCString:)", "", "", "Argument[withCString:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "string(length:withCString:)", "", "", "Argument[withCString:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "stringEncoding(convertedString:encodingOptions:for:usedLossyCompression:)", "", "", "Argument[for:]", "Argument[convertedString:]", "taint", "manual"]
+      - ["", "NSString", true, "strings(byAppendingPaths:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "strings(byAppendingPaths:)", "", "", "Argument[byAppendingPaths:].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "substring(from:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "substring(to:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "substring(with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "trimmingCharacters(in:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "uppercased(with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSString", true, "variantFittingPresentationWidth(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "init(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "append(_:count:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "Data", true, "insert(at:contentsOf:)", "", "", "Argument[contentsOf:]", "Argument[self]", "taint", "manual"]
+      - ["", "Data", true, "replaceSubrange(_:with:)", "", "", "Argument[with:]", "Argument[self]", "taint", "manual"]
+      - ["", "Data", true, "withUnsafeMutableBytes(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "Data", true, "withUnsafeMutableBytes(_:)", "", "", "Argument[self].CollectionElement", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "Data", true, "withUnsafeMutableBytes(_:)", "", "", "Argument[0].Parameter[0].CollectionElement", "Argument[self].CollectionElement", "taint", "manual"]
+      - ["", "Data", true, "withUnsafeMutableBytes(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "Data", true, "map(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "shuffled()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "shuffled(using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "compactMap(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "flatMap(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "reduce(_:into:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "sorted()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "sorted(by:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "replace(_:maxReplacements:with:)", "", "", "Argument[with:]", "Argument[self]", "taint", "manual"]
+      - ["", "Data", true, "replacing(_:maxReplacements:with:)", "", "", "Argument[with:]", "Argument[self]", "taint", "manual"]
+      - ["", "Data", true, "replacing(_:maxReplacements:subrange:with:)", "", "", "Argument[with:]", "Argument[self]", "taint", "manual"]
+      - ["", "Data", true, "trimmingPrefix(while:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "trimmingPrefix(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "init(contentsOf:options:)", "", "", "Argument[contentsOf:]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "base64EncodedData(options:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "base64EncodedString(options:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "init(base64Encoded:options:)", "", "", "Argument[base64Encoded:]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "init(buffer:)", "", "", "Argument[buffer:]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "init(bytes:count:)", "", "", "Argument[bytes:]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "init(bytesNoCopy:count:deallocator:)", "", "", "Argument[bytesNoCopy:]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "init(referencing:)", "", "", "Argument[referencing:]", "ReturnValue", "taint", "manual"]
+      - ["", "Data", true, "replaceSubrange(_:count:with:)", "", "", "Argument[with:]", "Argument[self]", "taint", "manual"]
+      - ["", "Data", true, "sorted(using:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSObject", true, "copy()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSObject", true, "mutableCopy()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "Blob", true, "init(bytes:)", "", "", "Argument[bytes:]", "ReturnValue", "taint", "manual"]
+      - ["", "Blob", true, "init(bytes:length:)", "", "", "Argument[bytes:]", "ReturnValue", "taint", "manual"]
+      - ["", "Expression", true, "init(_:_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "Expression", true, "init(_:_:)", "", "", "Argument[1].CollectionElement", "ReturnValue", "taint", "manual"]
+      - ["", "NSCopying", true, "copy(with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "ExpressionType", true, "init(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "ExpressionType", true, "replace(_:with:)", "", "", "Argument[with:]", "ReturnValue", "taint", "manual"]
+      - ["", "InputStream", true, "init(data:)", "", "", "Argument[data:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSMutableData", true, "append(_:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "NSMutableData", true, "setData(_:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "NSMutableData", true, "append(_:length:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "NSMutableData", true, "replaceBytes(in:withBytes:)", "", "", "Argument[withBytes:]", "Argument[self]", "taint", "manual"]
+      - ["", "NSMutableData", true, "replaceBytes(in:length:withBytes:)", "", "", "Argument[withBytes:]", "Argument[self]", "taint", "manual"]
+      - ["", "NSURL", true, "init(string:)", "(String)", "", "Argument[string:]", "ReturnValue.OptionalSome", "taint", "manual"]
+      - ["", "NSURL", true, "appendingPathExtension(for:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "NSURL", true, "appendingPathComponent(_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "NSURL", true, "appendingPathExtension(_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "NSURL", true, "appendingPathComponent(_:isDirectory:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "NSURL", true, "appendingPathComponent(_:conformingTo:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "NSMutableCopying", true, "mutableCopy(with:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "URLSession", true, "dataTask(completionHandler:with:)", "", "", "Argument[with:]", "Argument[completionHandler:].Parameter[0]", "taint", "manual"]
+      - ["", "WKUserScript", true, "init(forMainFrameOnly:injectionTime:source:)", "", "", "Argument[source:]", "ReturnValue", "taint", "manual"]
+      - ["", "WKUserScript", true, "init(forMainFrameOnly:in:injectionTime:source:)", "", "", "Argument[source:]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "atIndex(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "defineProperty(_:descriptor:)", "", "", "Argument[descriptor:]", "Argument[self]", "taint", "manual"]
+      - ["", "JSValue", true, "forProperty(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "init(bool:in:)", "", "", "Argument[bool:]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "init(double:in:)", "", "", "Argument[double:]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "init(in:int32:)", "", "", "Argument[int32:]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "init(in:object:)", "", "", "Argument[object:]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "init(in:point:)", "", "", "Argument[point:]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "init(in:range:)", "", "", "Argument[range:]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "init(in:rect:)", "", "", "Argument[rect:]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "init(in:size:)", "", "", "Argument[size:]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "init(in:uInt32:)", "", "", "Argument[uInt32:]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "setValue(_:at:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "JSValue", true, "setValue(_:forProperty:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "JSValue", true, "toArray()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toBool()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toDate()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toDictionary()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toDouble()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toInt32()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toNumber()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toObject()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toObjectOf(_:)", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toPoint()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toRange()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toRect()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toSize()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toString()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "JSValue", true, "toUInt32()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath.Component", true, "init(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath.Component", true, "init(platformString:)", "", "", "Argument[platformString:]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath.Component", true, "withPlatformString(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0]", "taint", "manual"]
+      - ["", "FilePath.Root", true, "init(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath.Root", true, "init(platformString:)", "", "", "Argument[platformString:]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath.Root", true, "withPlatformString(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0]", "taint", "manual"]
+      - ["", "FilePath", true, "init(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "append(_:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "FilePath", true, "init(extendedGraphemeClusterLiteral:)", "", "", "Argument[extendedGraphemeClusterLiteral:]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "init(unicodeScalarLiteral:)", "", "", "Argument[unicodeScalarLiteral:]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "encode(to:)", "", "", "Argument[self]", "Argument[to:]", "taint", "manual"]
+      - ["", "FilePath", true, "init(from:)", "", "", "Argument[from:]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "init(stringLiteral:)", "(String)", "", "Argument[stringLiteral:]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "withCString(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "FilePath", true, "withCString(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "init(cString:)", "", "", "Argument[cString:]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "push(_:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "FilePath", true, "appending(_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "init(platformString:)", "", "", "Argument[platformString:]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "withPlatformString(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "FilePath", true, "withPlatformString(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "init(_:root:)", "", "", "Argument[root:,0]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "init(components:root:)", "", "", "Argument[root:,components:]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "lexicallyNormalized()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "lexicallyResolving(_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "pushing(_:)", "", "", "Argument[self,0]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "removingLastComponent()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "FilePath", true, "removingRoot()", "", "", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["", "DataProtocol", true, "copyBytes(to:)", "", "", "Argument[self]", "Argument[to:]", "taint", "manual"]
+      - ["", "DataProtocol", true, "copyBytes(count:to:)", "", "", "Argument[self]", "Argument[to:]", "taint", "manual"]
+      - ["", "DataProtocol", true, "copyBytes(from:to:)", "", "", "Argument[self]", "Argument[to:]", "taint", "manual"]
+      - ["", "ContiguousBytes", true, "withUnsafeBytes(_:)", "", "", "Argument[self]", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "ContiguousBytes", true, "withUnsafeBytes(_:)", "", "", "Argument[self].CollectionElement", "Argument[0].Parameter[0].CollectionElement", "taint", "manual"]
+      - ["", "ContiguousBytes", true, "withUnsafeBytes(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "URLResource", true, "init(bundle:locale:name:subdirectory:)", "", "", "Argument[name:,subdirectory:]", "ReturnValue", "taint", "manual"]
+      - ["", "NSMutableString", true, "append(_:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "NSMutableString", true, "insert(_:at:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "NSMutableString", true, "appendFormat(_:_:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
+      - ["", "NSMutableString", true, "appendFormat(_:_:)", "", "", "Argument[1].CollectionElement", "Argument[self]", "taint", "manual"]
+      - ["", "NSMutableString", true, "replaceCharacters(in:with:)", "", "", "Argument[with:]", "Argument[self]", "taint", "manual"]
+      - ["", "NSMutableString", true, "replaceOccurrences(of:options:range:with:)", "", "", "Argument[with:]", "Argument[self]", "taint", "manual"]
+      - ["", "NSMutableString", true, "setString(_:)", "", "", "Argument[0]", "Argument[self]", "taint", "manual"]
diff --git a/unified/ql/lib/ide-contextual-queries/definitions.ql b/unified/ql/lib/ide-contextual-queries/definitions.ql
new file mode 100644
index 000000000000..0d2477a83b57
--- /dev/null
+++ b/unified/ql/lib/ide-contextual-queries/definitions.ql
@@ -0,0 +1,20 @@
+/**
+ * @name Jump-to-definition links
+ * @description Generates use-definition pairs that provide the data
+ *              for jump-to-definition in the code viewer.
+ * @kind definitions
+ * @id unified/ide-jump-to-definition
+ * @tags ide-contextual-queries/local-definitions
+ */
+
+import codeql.Definitions
+import codeql.IDEContextual
+import unified
+
+external string selectedSourceFile();
+
+from Identifier reference, NameBinding definition, string kind
+where
+  definitionOf(reference, definition, kind) and
+  reference.getLocation().getFile() = getFileBySourceArchiveName(selectedSourceFile())
+select reference, definition, kind
diff --git a/unified/ql/lib/ide-contextual-queries/printCfg.ql b/unified/ql/lib/ide-contextual-queries/printCfg.ql
new file mode 100644
index 000000000000..aab7918d487e
--- /dev/null
+++ b/unified/ql/lib/ide-contextual-queries/printCfg.ql
@@ -0,0 +1,41 @@
+/**
+ * @name Print CFG
+ * @description Produces a representation of a file's Control Flow Graph.
+ *              This query is used by the VS Code extension.
+ * @id unified/print-cfg
+ * @kind graph
+ * @tags ide-contextual-queries/print-cfg
+ */
+
+private import unified
+private import codeql.unified.internal.ControlFlowGraph
+private import codeql.Locations
+
+external string selectedSourceFile();
+
+private predicate selectedSourceFileAlias = selectedSourceFile/0;
+
+external int selectedSourceLine();
+
+private predicate selectedSourceLineAlias = selectedSourceLine/0;
+
+external int selectedSourceColumn();
+
+private predicate selectedSourceColumnAlias = selectedSourceColumn/0;
+
+module ViewCfgQueryInput implements ControlFlow::ViewCfgQueryInputSig<File> {
+  predicate selectedSourceFile = selectedSourceFileAlias/0;
+
+  predicate selectedSourceLine = selectedSourceLineAlias/0;
+
+  predicate selectedSourceColumn = selectedSourceColumnAlias/0;
+
+  predicate cfgScopeSpan(
+    Ast::Callable scope, File file, int startLine, int startColumn, int endLine, int endColumn
+  ) {
+    file = scope.getFile() and
+    scope.getLocation().hasLocationInfo(_, startLine, startColumn, endLine, endColumn)
+  }
+}
+
+import ControlFlow::ViewCfgQuery<File, ViewCfgQueryInput>
diff --git a/unified/ql/lib/qlpack.yml b/unified/ql/lib/qlpack.yml
index d67af16271b6..19a6bc29e4c6 100644
--- a/unified/ql/lib/qlpack.yml
+++ b/unified/ql/lib/qlpack.yml
@@ -6,7 +6,14 @@ extractor: unified
 library: true
 upgrades: upgrades
 dependencies:
-  codeql/util: ${workspace}
+  codeql/concepts: ${workspace}
+  codeql/controlflow: ${workspace}
+  codeql/ssa: ${workspace}
+  codeql/dataflow: ${workspace}
   codeql/namebinding: ${workspace}
+  codeql/typeinference: ${workspace}
+  codeql/util: ${workspace}
+dataExtensions:
+  - ext/*.model.yml
 warnOnImplicitThis: true
 compileForOverlayEval: true
diff --git a/unified/ql/lib/unified.dbscheme b/unified/ql/lib/unified.dbscheme
index 8306c3fcf0c7..54ede4d9d45c 100644
--- a/unified/ql/lib/unified.dbscheme
+++ b/unified/ql/lib/unified.dbscheme
@@ -155,15 +155,15 @@ unified_accessor_declaration_parameter(
   unique int parameter: @unified_parameter ref
 );
 
-unified_accessor_declaration_type(
+unified_accessor_declaration_return_type(
   unique int unified_accessor_declaration: @unified_accessor_declaration ref,
-  unique int type__: @unified_type_expr ref
+  unique int return_type: @unified_expr ref
 );
 
 unified_accessor_declaration_def(
   unique int id: @unified_accessor_declaration,
   int accessor_kind: @unified_token_accessor_kind ref,
-  int name: @unified_token_identifier ref
+  int name_node: @unified_token_identifier ref
 );
 
 #keyset[unified_argument, index]
@@ -173,9 +173,9 @@ unified_argument_modifier(
   unique int modifier: @unified_token_modifier ref
 );
 
-unified_argument_name(
+unified_argument_name_node(
   unique int unified_argument: @unified_argument ref,
-  unique int name: @unified_token_identifier ref
+  unique int name_node: @unified_token_identifier ref
 );
 
 unified_argument_def(
@@ -194,15 +194,9 @@ unified_array_literal_def(
   unique int id: @unified_array_literal
 );
 
-unified_assign_expr_def(
-  unique int id: @unified_assign_expr,
-  int target: @unified_expr_or_pattern ref,
-  int value: @unified_expr ref
-);
-
 unified_associated_type_declaration_bound(
   unique int unified_associated_type_declaration: @unified_associated_type_declaration ref,
-  unique int bound: @unified_type_expr ref
+  unique int bound: @unified_expr ref
 );
 
 #keyset[unified_associated_type_declaration, index]
@@ -214,7 +208,7 @@ unified_associated_type_declaration_modifier(
 
 unified_associated_type_declaration_def(
   unique int id: @unified_associated_type_declaration,
-  int name: @unified_token_identifier ref
+  int name_node: @unified_token_identifier ref
 );
 
 #keyset[unified_base_type, index]
@@ -226,7 +220,7 @@ unified_base_type_modifier(
 
 unified_base_type_def(
   unique int id: @unified_base_type,
-  int type__: @unified_type_expr ref
+  int type__: @unified_expr ref
 );
 
 unified_binary_expr_def(
@@ -249,13 +243,13 @@ unified_block_def(
 
 unified_bound_type_constraint_def(
   unique int id: @unified_bound_type_constraint,
-  int bound: @unified_type_expr ref,
-  int type__: @unified_type_expr ref
+  int bound: @unified_expr ref,
+  int type__: @unified_expr ref
 );
 
-unified_break_expr_label(
+unified_break_expr_label_name_node(
   unique int unified_break_expr: @unified_break_expr ref,
-  unique int label: @unified_token_identifier ref
+  unique int label_name_node: @unified_token_identifier ref
 );
 
 unified_break_expr_def(
@@ -289,9 +283,11 @@ unified_call_expr_modifier(
 
 unified_call_expr_def(
   unique int id: @unified_call_expr,
-  int callee: @unified_expr_or_type ref
+  int callee: @unified_expr ref
 );
 
+@unified_callable = @unified_accessor_declaration | @unified_constructor_declaration | @unified_destructor_declaration | @unified_function_declaration | @unified_function_expr | @unified_initializer_declaration | @unified_top_level
+
 #keyset[unified_catch_clause, index]
 unified_catch_clause_modifier(
   int unified_catch_clause: @unified_catch_clause ref,
@@ -301,7 +297,7 @@ unified_catch_clause_modifier(
 
 unified_catch_clause_pattern(
   unique int unified_catch_clause: @unified_catch_clause ref,
-  unique int pattern: @unified_pattern ref
+  unique int pattern: @unified_expr ref
 );
 
 unified_catch_clause_def(
@@ -316,6 +312,11 @@ unified_class_like_declaration_base_type(
   unique int base_type: @unified_base_type ref
 );
 
+unified_class_like_declaration_extension_target(
+  unique int unified_class_like_declaration: @unified_class_like_declaration ref,
+  unique int extension_target: @unified_expr ref
+);
+
 #keyset[unified_class_like_declaration, index]
 unified_class_like_declaration_member(
   int unified_class_like_declaration: @unified_class_like_declaration ref,
@@ -330,9 +331,9 @@ unified_class_like_declaration_modifier(
   unique int modifier: @unified_token_modifier ref
 );
 
-unified_class_like_declaration_name(
+unified_class_like_declaration_name_node(
   unique int unified_class_like_declaration: @unified_class_like_declaration ref,
-  unique int name: @unified_token_identifier ref
+  unique int name_node: @unified_token_identifier ref
 );
 
 #keyset[unified_class_like_declaration, index]
@@ -353,13 +354,6 @@ unified_class_like_declaration_def(
   unique int id: @unified_class_like_declaration
 );
 
-unified_compound_assign_expr_def(
-  unique int id: @unified_compound_assign_expr,
-  int operator: @unified_token_infix_operator ref,
-  int target: @unified_expr ref,
-  int value: @unified_expr ref
-);
-
 #keyset[unified_conditional_pattern, index]
 unified_conditional_pattern_modifier(
   int unified_conditional_pattern: @unified_conditional_pattern ref,
@@ -370,7 +364,7 @@ unified_conditional_pattern_modifier(
 unified_conditional_pattern_def(
   unique int id: @unified_conditional_pattern,
   int condition: @unified_expr ref,
-  int pattern: @unified_pattern ref
+  int pattern: @unified_expr ref
 );
 
 #keyset[unified_constructor_declaration, index]
@@ -380,9 +374,9 @@ unified_constructor_declaration_modifier(
   unique int modifier: @unified_token_modifier ref
 );
 
-unified_constructor_declaration_name(
+unified_constructor_declaration_name_node(
   unique int unified_constructor_declaration: @unified_constructor_declaration ref,
-  unique int name: @unified_token_identifier ref
+  unique int name_node: @unified_token_identifier ref
 );
 
 #keyset[unified_constructor_declaration, index]
@@ -397,34 +391,20 @@ unified_constructor_declaration_def(
   int body: @unified_block ref
 );
 
-#keyset[unified_constructor_pattern, index]
-unified_constructor_pattern_element(
-  int unified_constructor_pattern: @unified_constructor_pattern ref,
-  int index: int ref,
-  unique int element: @unified_pattern_element ref
-);
-
-#keyset[unified_constructor_pattern, index]
-unified_constructor_pattern_modifier(
-  int unified_constructor_pattern: @unified_constructor_pattern ref,
-  int index: int ref,
-  unique int modifier: @unified_token_modifier ref
-);
-
-unified_constructor_pattern_def(
-  unique int id: @unified_constructor_pattern,
-  int constructor: @unified_expr_or_type ref
-);
-
-unified_continue_expr_label(
+unified_continue_expr_label_name_node(
   unique int unified_continue_expr: @unified_continue_expr ref,
-  unique int label: @unified_token_identifier ref
+  unique int label_name_node: @unified_token_identifier ref
 );
 
 unified_continue_expr_def(
   unique int id: @unified_continue_expr
 );
 
+unified_defer_stmt_def(
+  unique int id: @unified_defer_stmt,
+  int body: @unified_expr ref
+);
+
 #keyset[unified_destructor_declaration, index]
 unified_destructor_declaration_modifier(
   int unified_destructor_declaration: @unified_destructor_declaration ref,
@@ -456,22 +436,25 @@ unified_do_while_stmt_def(
 
 unified_equality_type_constraint_def(
   unique int id: @unified_equality_type_constraint,
-  int left: @unified_type_expr ref,
-  int right: @unified_type_expr ref
+  int left: @unified_expr ref,
+  int right: @unified_expr ref
 );
 
-@unified_expr = @unified_array_literal | @unified_assign_expr | @unified_binary_expr | @unified_block | @unified_break_expr | @unified_call_expr | @unified_compound_assign_expr | @unified_continue_expr | @unified_function_expr | @unified_if_expr | @unified_key_value_pair | @unified_map_literal | @unified_member_access_expr | @unified_name_expr | @unified_pattern_guard_expr | @unified_return_expr | @unified_switch_expr | @unified_throw_expr | @unified_token_boolean_literal | @unified_token_builtin_expr | @unified_token_empty_expr | @unified_token_float_literal | @unified_token_int_literal | @unified_token_regex_literal | @unified_token_string_literal | @unified_token_super_expr | @unified_token_unsupported_node | @unified_try_expr | @unified_tuple_expr | @unified_type_cast_expr | @unified_type_test_expr | @unified_unary_expr | @unified_unresolved_operator_sequence
-
-unified_expr_equality_pattern_def(
-  unique int id: @unified_expr_equality_pattern,
-  int expr: @unified_expr ref
-);
+@unified_expr = @unified_array_literal | @unified_binary_expr | @unified_block | @unified_break_expr | @unified_bulk_importing_pattern | @unified_call_expr | @unified_conditional_pattern | @unified_continue_expr | @unified_expr_pattern | @unified_function_expr | @unified_generic_type_expr | @unified_if_expr | @unified_key_value_pair | @unified_macro_call_expr | @unified_map_literal | @unified_member_access_expr | @unified_modified_type_expr | @unified_named_pattern | @unified_or_pattern | @unified_pattern_guard_expr | @unified_return_expr | @unified_string_interpolation_expr | @unified_switch_expr | @unified_throw_expr | @unified_token_boolean_literal | @unified_token_builtin_expr | @unified_token_empty_expr | @unified_token_float_literal | @unified_token_identifier | @unified_token_ignore_pattern | @unified_token_inferred_type_expr | @unified_token_int_literal | @unified_token_regex_literal | @unified_token_string_literal | @unified_token_super_expr | @unified_token_unhandled_node | @unified_token_unsupported_node | @unified_try_expr | @unified_tuple_expr | @unified_type_cast_expr | @unified_type_test_expr | @unified_unary_expr | @unified_unresolved_operator_sequence
 
 @unified_expr_or_operator = @unified_expr | @unified_token_infix_operator
 
-@unified_expr_or_pattern = @unified_expr | @unified_pattern
+#keyset[unified_expr_pattern, index]
+unified_expr_pattern_modifier(
+  int unified_expr_pattern: @unified_expr_pattern ref,
+  int index: int ref,
+  unique int modifier: @unified_token_modifier ref
+);
 
-@unified_expr_or_type = @unified_expr | @unified_type_expr
+unified_expr_pattern_def(
+  unique int id: @unified_expr_pattern,
+  int expr: @unified_expr ref
+);
 
 unified_for_each_stmt_body(
   unique int unified_for_each_stmt: @unified_for_each_stmt ref,
@@ -493,7 +476,7 @@ unified_for_each_stmt_modifier(
 unified_for_each_stmt_def(
   unique int id: @unified_for_each_stmt,
   int iterable: @unified_expr ref,
-  int pattern: @unified_pattern ref
+  int pattern: @unified_expr ref
 );
 
 unified_function_declaration_body(
@@ -517,7 +500,7 @@ unified_function_declaration_parameter(
 
 unified_function_declaration_return_type(
   unique int unified_function_declaration: @unified_function_declaration ref,
-  unique int return_type: @unified_type_expr ref
+  unique int return_type: @unified_expr ref
 );
 
 #keyset[unified_function_declaration, index]
@@ -536,7 +519,12 @@ unified_function_declaration_type_parameter(
 
 unified_function_declaration_def(
   unique int id: @unified_function_declaration,
-  int name: @unified_token_identifier ref
+  int name_node: @unified_token_identifier ref
+);
+
+unified_function_expr_body(
+  unique int unified_function_expr: @unified_function_expr ref,
+  unique int body: @unified_block ref
 );
 
 #keyset[unified_function_expr, index]
@@ -562,36 +550,23 @@ unified_function_expr_parameter(
 
 unified_function_expr_return_type(
   unique int unified_function_expr: @unified_function_expr ref,
-  unique int return_type: @unified_type_expr ref
+  unique int return_type: @unified_expr ref
 );
 
 unified_function_expr_def(
-  unique int id: @unified_function_expr,
-  int body: @unified_block ref
-);
-
-#keyset[unified_function_type_expr, index]
-unified_function_type_expr_parameter(
-  int unified_function_type_expr: @unified_function_type_expr ref,
-  int index: int ref,
-  unique int parameter: @unified_parameter ref
-);
-
-unified_function_type_expr_def(
-  unique int id: @unified_function_type_expr,
-  int return_type: @unified_type_expr ref
+  unique int id: @unified_function_expr
 );
 
 #keyset[unified_generic_type_expr, index]
 unified_generic_type_expr_type_argument(
   int unified_generic_type_expr: @unified_generic_type_expr ref,
   int index: int ref,
-  unique int type_argument: @unified_type_expr ref
+  unique int type_argument: @unified_expr ref
 );
 
 unified_generic_type_expr_def(
   unique int id: @unified_generic_type_expr,
-  int base: @unified_type_expr ref
+  int base: @unified_expr ref
 );
 
 unified_guard_if_stmt_def(
@@ -624,7 +599,7 @@ unified_import_declaration_modifier(
 
 unified_import_declaration_pattern(
   unique int unified_import_declaration: @unified_import_declaration ref,
-  unique int pattern: @unified_pattern ref
+  unique int pattern: @unified_expr ref
 );
 
 unified_import_declaration_def(
@@ -652,10 +627,29 @@ unified_key_value_pair_def(
 
 unified_labeled_stmt_def(
   unique int id: @unified_labeled_stmt,
-  int label: @unified_token_identifier ref,
+  int label_name_node: @unified_token_identifier ref,
   int stmt: @unified_stmt ref
 );
 
+#keyset[unified_macro_call_expr, index]
+unified_macro_call_expr_argument(
+  int unified_macro_call_expr: @unified_macro_call_expr ref,
+  int index: int ref,
+  unique int argument: @unified_argument ref
+);
+
+#keyset[unified_macro_call_expr, index]
+unified_macro_call_expr_type_argument(
+  int unified_macro_call_expr: @unified_macro_call_expr ref,
+  int index: int ref,
+  unique int type_argument: @unified_expr ref
+);
+
+unified_macro_call_expr_def(
+  unique int id: @unified_macro_call_expr,
+  int macro_name_node: @unified_token_identifier ref
+);
+
 #keyset[unified_map_literal, index]
 unified_map_literal_element(
   int unified_map_literal: @unified_map_literal ref,
@@ -667,39 +661,37 @@ unified_map_literal_def(
   unique int id: @unified_map_literal
 );
 
-@unified_member = @unified_accessor_declaration | @unified_associated_type_declaration | @unified_class_like_declaration | @unified_constructor_declaration | @unified_destructor_declaration | @unified_function_declaration | @unified_initializer_declaration | @unified_token_unsupported_node | @unified_type_alias_declaration | @unified_variable_declaration
+@unified_member = @unified_accessor_declaration | @unified_associated_type_declaration | @unified_class_like_declaration | @unified_constructor_declaration | @unified_destructor_declaration | @unified_function_declaration | @unified_initializer_declaration | @unified_token_unhandled_node | @unified_token_unsupported_node | @unified_type_alias_declaration | @unified_variable_declaration
 
 unified_member_access_expr_def(
   unique int id: @unified_member_access_expr,
-  int base: @unified_expr_or_type ref,
-  int member: @unified_token_identifier ref
-);
-
-unified_name_expr_def(
-  unique int id: @unified_name_expr,
-  int identifier: @unified_token_identifier ref
+  int base: @unified_expr ref,
+  int member_name_node: @unified_token_identifier ref
 );
 
-#keyset[unified_name_pattern, index]
-unified_name_pattern_modifier(
-  int unified_name_pattern: @unified_name_pattern ref,
+#keyset[unified_modified_type_expr, index]
+unified_modified_type_expr_modifier(
+  int unified_modified_type_expr: @unified_modified_type_expr ref,
   int index: int ref,
   unique int modifier: @unified_token_modifier ref
 );
 
-unified_name_pattern_def(
-  unique int id: @unified_name_pattern,
-  int identifier: @unified_token_identifier ref
+unified_modified_type_expr_def(
+  unique int id: @unified_modified_type_expr,
+  int type__: @unified_expr ref
 );
 
-unified_named_type_expr_qualifier(
-  unique int unified_named_type_expr: @unified_named_type_expr ref,
-  unique int qualifier: @unified_type_expr ref
+#keyset[unified_named_pattern, index]
+unified_named_pattern_modifier(
+  int unified_named_pattern: @unified_named_pattern ref,
+  int index: int ref,
+  unique int modifier: @unified_token_modifier ref
 );
 
-unified_named_type_expr_def(
-  unique int id: @unified_named_type_expr,
-  int name: @unified_token_identifier ref
+unified_named_pattern_def(
+  unique int id: @unified_named_pattern,
+  int name_node: @unified_token_identifier ref,
+  int sub_pattern: @unified_expr ref
 );
 
 @unified_operator = @unified_token_infix_operator | @unified_token_postfix_operator | @unified_token_prefix_operator
@@ -723,7 +715,7 @@ unified_operator_syntax_declaration_precedence(
 
 unified_operator_syntax_declaration_def(
   unique int id: @unified_operator_syntax_declaration,
-  int name: @unified_token_identifier ref
+  int name_node: @unified_token_identifier ref
 );
 
 #keyset[unified_or_pattern, index]
@@ -737,7 +729,7 @@ unified_or_pattern_modifier(
 unified_or_pattern_pattern(
   int unified_or_pattern: @unified_or_pattern ref,
   int index: int ref,
-  unique int pattern: @unified_pattern ref
+  unique int pattern: @unified_expr ref
 );
 
 unified_or_pattern_def(
@@ -749,9 +741,9 @@ unified_parameter_default(
   unique int default: @unified_expr ref
 );
 
-unified_parameter_external_name(
+unified_parameter_external_name_node(
   unique int unified_parameter: @unified_parameter ref,
-  unique int external_name: @unified_token_identifier ref
+  unique int external_name_node: @unified_token_identifier ref
 );
 
 #keyset[unified_parameter, index]
@@ -763,40 +755,21 @@ unified_parameter_modifier(
 
 unified_parameter_pattern(
   unique int unified_parameter: @unified_parameter ref,
-  unique int pattern: @unified_pattern ref
+  unique int pattern: @unified_expr ref
 );
 
 unified_parameter_type(
   unique int unified_parameter: @unified_parameter ref,
-  unique int type__: @unified_type_expr ref
+  unique int type__: @unified_expr ref
 );
 
 unified_parameter_def(
   unique int id: @unified_parameter
 );
 
-@unified_pattern = @unified_bulk_importing_pattern | @unified_conditional_pattern | @unified_constructor_pattern | @unified_expr_equality_pattern | @unified_name_pattern | @unified_or_pattern | @unified_token_ignore_pattern | @unified_token_unsupported_node | @unified_tuple_pattern
-
-unified_pattern_element_key(
-  unique int unified_pattern_element: @unified_pattern_element ref,
-  unique int key__: @unified_token_identifier ref
-);
-
-#keyset[unified_pattern_element, index]
-unified_pattern_element_modifier(
-  int unified_pattern_element: @unified_pattern_element ref,
-  int index: int ref,
-  unique int modifier: @unified_token_modifier ref
-);
-
-unified_pattern_element_def(
-  unique int id: @unified_pattern_element,
-  int pattern: @unified_pattern ref
-);
-
 unified_pattern_guard_expr_def(
   unique int id: @unified_pattern_guard_expr,
-  int pattern: @unified_pattern ref,
+  int pattern: @unified_expr ref,
   int value: @unified_expr ref
 );
 
@@ -809,7 +782,25 @@ unified_return_expr_def(
   unique int id: @unified_return_expr
 );
 
-@unified_stmt = @unified_accessor_declaration | @unified_class_like_declaration | @unified_constructor_declaration | @unified_destructor_declaration | @unified_do_while_stmt | @unified_expr | @unified_for_each_stmt | @unified_function_declaration | @unified_guard_if_stmt | @unified_import_declaration | @unified_labeled_stmt | @unified_operator_syntax_declaration | @unified_type_alias_declaration | @unified_variable_declaration | @unified_while_stmt
+@unified_stmt = @unified_accessor_declaration | @unified_class_like_declaration | @unified_constructor_declaration | @unified_defer_stmt | @unified_destructor_declaration | @unified_do_while_stmt | @unified_expr | @unified_for_each_stmt | @unified_function_declaration | @unified_guard_if_stmt | @unified_import_declaration | @unified_labeled_stmt | @unified_operator_syntax_declaration | @unified_type_alias_declaration | @unified_variable_declaration | @unified_while_stmt
+
+#keyset[unified_string_interpolation_expr, index]
+unified_string_interpolation_expr_element(
+  int unified_string_interpolation_expr: @unified_string_interpolation_expr ref,
+  int index: int ref,
+  unique int element: @unified_expr ref
+);
+
+#keyset[unified_string_interpolation_expr, index]
+unified_string_interpolation_expr_modifier(
+  int unified_string_interpolation_expr: @unified_string_interpolation_expr ref,
+  int index: int ref,
+  unique int modifier: @unified_token_modifier ref
+);
+
+unified_string_interpolation_expr_def(
+  unique int id: @unified_string_interpolation_expr
+);
 
 #keyset[unified_switch_case, index]
 unified_switch_case_modifier(
@@ -820,7 +811,7 @@ unified_switch_case_modifier(
 
 unified_switch_case_pattern(
   unique int unified_switch_case: @unified_switch_case ref,
-  unique int pattern: @unified_pattern ref
+  unique int pattern: @unified_expr ref
 );
 
 unified_switch_case_def(
@@ -884,52 +875,13 @@ unified_try_expr_def(
 unified_tuple_expr_element(
   int unified_tuple_expr: @unified_tuple_expr ref,
   int index: int ref,
-  unique int element: @unified_expr ref
+  unique int element: @unified_argument ref
 );
 
 unified_tuple_expr_def(
   unique int id: @unified_tuple_expr
 );
 
-#keyset[unified_tuple_pattern, index]
-unified_tuple_pattern_element(
-  int unified_tuple_pattern: @unified_tuple_pattern ref,
-  int index: int ref,
-  unique int element: @unified_pattern_element ref
-);
-
-#keyset[unified_tuple_pattern, index]
-unified_tuple_pattern_modifier(
-  int unified_tuple_pattern: @unified_tuple_pattern ref,
-  int index: int ref,
-  unique int modifier: @unified_token_modifier ref
-);
-
-unified_tuple_pattern_def(
-  unique int id: @unified_tuple_pattern
-);
-
-unified_tuple_type_element_name(
-  unique int unified_tuple_type_element: @unified_tuple_type_element ref,
-  unique int name: @unified_token_identifier ref
-);
-
-unified_tuple_type_element_def(
-  unique int id: @unified_tuple_type_element,
-  int type__: @unified_type_expr ref
-);
-
-#keyset[unified_tuple_type_expr, index]
-unified_tuple_type_expr_element(
-  int unified_tuple_type_expr: @unified_tuple_type_expr ref,
-  int index: int ref,
-  unique int element: @unified_tuple_type_element ref
-);
-
-unified_tuple_type_expr_def(
-  unique int id: @unified_tuple_type_expr
-);
-
 #keyset[unified_type_alias_declaration, index]
 unified_type_alias_declaration_modifier(
   int unified_type_alias_declaration: @unified_type_alias_declaration ref,
@@ -953,24 +905,22 @@ unified_type_alias_declaration_type_parameter(
 
 unified_type_alias_declaration_def(
   unique int id: @unified_type_alias_declaration,
-  int name: @unified_token_identifier ref,
-  int type__: @unified_type_expr ref
+  int name_node: @unified_token_identifier ref,
+  int type__: @unified_expr ref
 );
 
 unified_type_cast_expr_def(
   unique int id: @unified_type_cast_expr,
   int expr: @unified_expr ref,
   int operator: @unified_token_infix_operator ref,
-  int type__: @unified_type_expr ref
+  int type__: @unified_expr ref
 );
 
 @unified_type_constraint = @unified_bound_type_constraint | @unified_equality_type_constraint
 
-@unified_type_expr = @unified_function_type_expr | @unified_generic_type_expr | @unified_named_type_expr | @unified_token_inferred_type_expr | @unified_token_unsupported_node | @unified_tuple_type_expr
-
 unified_type_parameter_bound(
   unique int unified_type_parameter: @unified_type_parameter ref,
-  unique int bound: @unified_type_expr ref
+  unique int bound: @unified_expr ref
 );
 
 #keyset[unified_type_parameter, index]
@@ -982,20 +932,18 @@ unified_type_parameter_modifier(
 
 unified_type_parameter_def(
   unique int id: @unified_type_parameter,
-  int name: @unified_token_identifier ref
+  int name_node: @unified_token_identifier ref
+);
+
+unified_type_test_expr_operator(
+  unique int unified_type_test_expr: @unified_type_test_expr ref,
+  unique int operator: @unified_token_infix_operator ref
 );
 
 unified_type_test_expr_def(
   unique int id: @unified_type_test_expr,
   int expr: @unified_expr ref,
-  int operator: @unified_token_infix_operator ref,
-  int type__: @unified_type_expr ref
-);
-
-unified_type_test_pattern_def(
-  unique int id: @unified_type_test_pattern,
-  int pattern: @unified_pattern ref,
-  int type__: @unified_type_expr ref
+  int type__: @unified_expr ref
 );
 
 unified_unary_expr_def(
@@ -1024,7 +972,7 @@ unified_variable_declaration_modifier(
 
 unified_variable_declaration_type(
   unique int unified_variable_declaration: @unified_variable_declaration ref,
-  unique int type__: @unified_type_expr ref
+  unique int type__: @unified_expr ref
 );
 
 unified_variable_declaration_value(
@@ -1034,7 +982,7 @@ unified_variable_declaration_value(
 
 unified_variable_declaration_def(
   unique int id: @unified_variable_declaration,
-  int pattern: @unified_pattern ref
+  int pattern: @unified_expr ref
 );
 
 unified_while_stmt_body(
@@ -1078,7 +1026,8 @@ case @unified_token.kind of
 | 15 = @unified_token_regex_literal
 | 16 = @unified_token_string_literal
 | 17 = @unified_token_super_expr
-| 18 = @unified_token_unsupported_node
+| 18 = @unified_token_unhandled_node
+| 19 = @unified_token_unsupported_node
 ;
 
 
@@ -1088,7 +1037,7 @@ unified_trivia_tokeninfo(
   string value: string ref
 );
 
-@unified_ast_node = @unified_accessor_declaration | @unified_argument | @unified_array_literal | @unified_assign_expr | @unified_associated_type_declaration | @unified_base_type | @unified_binary_expr | @unified_block | @unified_bound_type_constraint | @unified_break_expr | @unified_bulk_importing_pattern | @unified_call_expr | @unified_catch_clause | @unified_class_like_declaration | @unified_compound_assign_expr | @unified_conditional_pattern | @unified_constructor_declaration | @unified_constructor_pattern | @unified_continue_expr | @unified_destructor_declaration | @unified_do_while_stmt | @unified_equality_type_constraint | @unified_expr_equality_pattern | @unified_for_each_stmt | @unified_function_declaration | @unified_function_expr | @unified_function_type_expr | @unified_generic_type_expr | @unified_guard_if_stmt | @unified_if_expr | @unified_import_declaration | @unified_initializer_declaration | @unified_key_value_pair | @unified_labeled_stmt | @unified_map_literal | @unified_member_access_expr | @unified_name_expr | @unified_name_pattern | @unified_named_type_expr | @unified_operator_syntax_declaration | @unified_or_pattern | @unified_parameter | @unified_pattern_element | @unified_pattern_guard_expr | @unified_return_expr | @unified_switch_case | @unified_switch_expr | @unified_throw_expr | @unified_token | @unified_top_level | @unified_trivia_token | @unified_try_expr | @unified_tuple_expr | @unified_tuple_pattern | @unified_tuple_type_element | @unified_tuple_type_expr | @unified_type_alias_declaration | @unified_type_cast_expr | @unified_type_parameter | @unified_type_test_expr | @unified_type_test_pattern | @unified_unary_expr | @unified_unresolved_operator_sequence | @unified_variable_declaration | @unified_while_stmt
+@unified_ast_node = @unified_accessor_declaration | @unified_argument | @unified_array_literal | @unified_associated_type_declaration | @unified_base_type | @unified_binary_expr | @unified_block | @unified_bound_type_constraint | @unified_break_expr | @unified_bulk_importing_pattern | @unified_call_expr | @unified_catch_clause | @unified_class_like_declaration | @unified_conditional_pattern | @unified_constructor_declaration | @unified_continue_expr | @unified_defer_stmt | @unified_destructor_declaration | @unified_do_while_stmt | @unified_equality_type_constraint | @unified_expr_pattern | @unified_for_each_stmt | @unified_function_declaration | @unified_function_expr | @unified_generic_type_expr | @unified_guard_if_stmt | @unified_if_expr | @unified_import_declaration | @unified_initializer_declaration | @unified_key_value_pair | @unified_labeled_stmt | @unified_macro_call_expr | @unified_map_literal | @unified_member_access_expr | @unified_modified_type_expr | @unified_named_pattern | @unified_operator_syntax_declaration | @unified_or_pattern | @unified_parameter | @unified_pattern_guard_expr | @unified_return_expr | @unified_string_interpolation_expr | @unified_switch_case | @unified_switch_expr | @unified_throw_expr | @unified_token | @unified_top_level | @unified_trivia_token | @unified_try_expr | @unified_tuple_expr | @unified_type_alias_declaration | @unified_type_cast_expr | @unified_type_parameter | @unified_type_test_expr | @unified_unary_expr | @unified_unresolved_operator_sequence | @unified_variable_declaration | @unified_while_stmt
 
 unified_ast_node_location(
   unique int node: @unified_ast_node ref,
diff --git a/unified/ql/lib/unified.qll b/unified/ql/lib/unified.qll
index fad4b3ef9e67..7aed5441f0f7 100644
--- a/unified/ql/lib/unified.qll
+++ b/unified/ql/lib/unified.qll
@@ -6,4 +6,7 @@ import codeql.Locations
 import codeql.files.FileSystem
 import codeql.unified.internal.Ast::UnifiedFinal
 import codeql.unified.internal.AstExtra::Public
-import codeql.unified.internal.Variables::Public
+import codeql.unified.internal.ControlFlowGraph::Public
+import codeql.unified.internal.NameBinding::Public
+import codeql.unified.internal.dataflow.DataFlowPublic
+import codeql.unified.internal.mad.LegacyMaD::Public
diff --git a/unified/ql/lib/utils/test/CommentUtil.qll b/unified/ql/lib/utils/test/CommentUtil.qll
new file mode 100644
index 000000000000..932be8671a86
--- /dev/null
+++ b/unified/ql/lib/utils/test/CommentUtil.qll
@@ -0,0 +1,20 @@
+private import unified
+
+/** Holds if a comment with `text` appears at `filepath:line`, excluding the text in a `$` section. */
+predicate plainCommentAt(string filepath, int line, string text) {
+  exists(Comment comment |
+    comment.getLocation().hasLocationInfo(filepath, line, _, _, _) and
+    text = comment.getCommentText().regexpReplaceAll("\\$([^/]|/[^/])*", "")
+  )
+}
+
+/** Holds if a `key=value` comment appears on `filepath:line` (not in the `$` section). */
+predicate keyValueCommentAt(string filepath, int line, string key, string value) {
+  exists(string text, string regexp, string match |
+    plainCommentAt(filepath, line, text) and
+    regexp = "([\\w.-]+)=([\\w.0-9]+)" and
+    match = text.regexpFind(regexp, _, _) and
+    key = match.regexpCapture(regexp, 1) and
+    value = match.regexpCapture(regexp, 2)
+  )
+}
diff --git a/unified/ql/lib/utils/test/ExternalLocationPostProcessing.ql b/unified/ql/lib/utils/test/ExternalLocationPostProcessing.ql
new file mode 100644
index 000000000000..bf2d21d9b65c
--- /dev/null
+++ b/unified/ql/lib/utils/test/ExternalLocationPostProcessing.ql
@@ -0,0 +1,9 @@
+/**
+ * @kind test-postprocess
+ */
+
+private import unified
+private import codeql.util.test.ExternalLocationPostProcessing
+import Make<getSourceLocationPrefix/0>
+
+private string getSourceLocationPrefix() { sourceLocationPrefix(result) }
diff --git a/unified/ql/lib/utils/test/InlineExpectationsTestQuery.ql b/unified/ql/lib/utils/test/InlineExpectationsTestQuery.ql
index 039194bc2e38..96e655dbecfb 100644
--- a/unified/ql/lib/utils/test/InlineExpectationsTestQuery.ql
+++ b/unified/ql/lib/utils/test/InlineExpectationsTestQuery.ql
@@ -6,16 +6,4 @@ private import unified
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>
diff --git a/unified/ql/lib/utils/test/InlineFlowTest.qll b/unified/ql/lib/utils/test/InlineFlowTest.qll
new file mode 100644
index 000000000000..967a2446c32c
--- /dev/null
+++ b/unified/ql/lib/utils/test/InlineFlowTest.qll
@@ -0,0 +1,38 @@
+/**
+ * Inline flow tests for the unified language.
+ * See `shared/util/codeql/dataflow/test/InlineFlowTest.qll`
+ */
+
+private import unified
+private import codeql.dataflow.test.InlineFlowTest
+private import codeql.unified.internal.dataflow.AllDataFlow
+private import internal.InlineExpectationsTestImpl as InlineExpectationsTestImpl
+
+private string getCalleeName(CallExpr call) { result = call.getCallee().(Identifier).getValue() }
+
+private module FlowTestImpl implements InputSig<Location, DataFlowInput> {
+  predicate defaultSource(DataFlow::Node source) { getCalleeName(source.asExpr()) = "source" }
+
+  predicate defaultSink(DataFlow::Node sink) {
+    any(CallExpr call | getCalleeName(call) = "sink").getAnArgument().getValue() = sink.asExpr()
+  }
+
+  private string getSourceArgString(DataFlow::Node src) {
+    defaultSource(src) and
+    result = src.asExpr().(CallExpr).getArgument(0).getValue().getStringValue()
+  }
+
+  bindingset[src, sink]
+  string getArgString(DataFlow::Node src, DataFlow::Node sink) {
+    (
+      result = getSourceArgString(src)
+      or
+      not exists(getSourceArgString(src)) and result = ""
+    ) and
+    exists(sink)
+  }
+
+  predicate interpretModelForTest(QlBuiltins::ExtensionId madId, string model) { none() }
+}
+
+import InlineFlowTestMake<Location, DataFlowInput, TaintTrackingInput, InlineExpectationsTestImpl::Impl, FlowTestImpl>
diff --git a/unified/ql/lib/utils/test/TestUtils.qll b/unified/ql/lib/utils/test/TestUtils.qll
new file mode 100644
index 000000000000..2b50c033878e
--- /dev/null
+++ b/unified/ql/lib/utils/test/TestUtils.qll
@@ -0,0 +1,58 @@
+private import unified
+private import CommentUtil
+private import codeql.unified.internal.NameBinding
+private import codeql.unified.internal.typeinference.TypeInference as TypeInference
+private import codeql.unified.internal.typeinference.TypeInferencePlugin
+
+private string getTupleFieldName(NameBinding decl) {
+  decl = any(TupleType tt).getField(result).getPattern()
+}
+
+private string defaultName(NameBinding decl) {
+  exists(string name |
+    name = getTupleFieldName(decl)
+    or
+    not exists(getTupleFieldName(decl)) and name = decl.getName()
+  |
+    exists(ClassLikeDeclaration cls |
+      decl.getDeclaration() = cls.getAMemberIncludingExtensions() and
+      result = cls.getQualifiedName() + "." + name
+    )
+    or
+    not decl.getDeclaration() = any(ClassLikeDeclaration cls).getAMemberIncludingExtensions() and
+    result = name
+  )
+}
+
+private predicate declAt(NameBinding v, string filepath, int line) {
+  v.getLocation().hasLocationInfo(filepath, line, _, _, _)
+}
+
+/** Holds if the name-binding `v` has been assigned the given `alias` by a comment in the test code. */
+predicate nameBinding(NameBinding v, string alias) {
+  exists(string filepath, int line | declAt(v, filepath, line) |
+    keyValueCommentAt(filepath, line, "name", alias)
+    or
+    not keyValueCommentAt(filepath, line, "name", _) and
+    alias = defaultName(v)
+  )
+}
+
+private predicate callableAt(Callable c, string filepath, int line) {
+  c.getLocation().hasLocationInfo(filepath, line, _, _, _)
+}
+
+/** Holds if the callable `c` has been assigned the given `alias` by a comment in the test code. */
+predicate callableName(Callable c, string alias) {
+  exists(string filepath, int line | callableAt(c, filepath, line) |
+    keyValueCommentAt(filepath, line, "name", alias)
+    or
+    not keyValueCommentAt(filepath, line, "name", _) and
+    (
+      not c instanceof EnumCaseConstructor and
+      alias = c.(Member).getQualifiedName()
+      or
+      alias = c.(EnumCaseConstructor).getEnumCaseClass().getQualifiedName()
+    )
+  )
+}
diff --git a/unified/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll b/unified/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
index b73301687412..7379e1b94e66 100644
--- a/unified/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/unified/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
@@ -9,4 +9,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = U::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }
diff --git a/unified/ql/src/diagnostic/CallGraph.ql b/unified/ql/src/diagnostic/CallGraph.ql
new file mode 100644
index 000000000000..96477bffe193
--- /dev/null
+++ b/unified/ql/src/diagnostic/CallGraph.ql
@@ -0,0 +1,17 @@
+/**
+ * @name Call graph
+ * @description Calls that could be resolved to a target callable
+ * @kind problem
+ * @problem.severity recommendation
+ * @id unified/diagnostic/call-graph
+ * @tags meta
+ * @precision very-low
+ */
+
+import unified
+import codeql.unified.internal.dataflow.DataFlowCallable
+import codeql.unified.internal.AnalysisQuality
+
+from CallGraphStats::Candidate c, DataFlowCallable target
+where target = c.getTarget()
+select c, "Call to $@.", target, target.toString()
diff --git a/unified/ql/src/diagnostic/ExtractorInformation.ql b/unified/ql/src/diagnostic/ExtractorInformation.ql
new file mode 100644
index 000000000000..ddf225db6fd8
--- /dev/null
+++ b/unified/ql/src/diagnostic/ExtractorInformation.ql
@@ -0,0 +1,54 @@
+/**
+ * @name Unified extractor/analysis information
+ * @description Information about the extraction and analysis for a database
+ * @kind metric
+ * @tags summary telemetry
+ * @id unified/telemetry/extraction-information
+ */
+
+private import unified
+private import codeql.unified.internal.AnalysisQuality
+
+predicate fileCount(string key, int value) {
+  key = "Number of files" and
+  value = strictcount(File f)
+}
+
+predicate fileCountByExtension(string key, int value) {
+  exists(string extension |
+    key = "Number of files with extension " + extension and
+    value = strictcount(File f | f.getExtension() = extension)
+  )
+}
+
+predicate numberOfLinesOfCode(string key, int value) {
+  key = "Number of lines of code" and
+  value = strictsum(File f | any() | f.getNumberOfLinesOfCode())
+}
+
+predicate numberOfLinesOfCodeByExtension(string key, int value) {
+  exists(string extension |
+    key = "Number of lines of code with extension " + extension and
+    value = strictsum(File f | f.getExtension() = extension | f.getNumberOfLinesOfCode())
+  )
+}
+
+from string key, float value
+where
+  (
+    fileCount(key, value) or
+    fileCountByExtension(key, value) or
+    numberOfLinesOfCode(key, value) or
+    numberOfLinesOfCodeByExtension(key, value) or
+    StaticNameResolutionStatsReport::keyValuePair(key, value) or
+    FilesCoveredByModuleManifestStatsReport::keyValuePair(key, value) or
+    CallGraphStatsReport::keyValuePair(key, value) or
+    TypeMentionStatsReport::keyValuePair(key, value)
+  ) and
+  /* Infinity */
+  value != 1.0 / 0.0 and
+  /* -Infinity */
+  value != -1.0 / 0.0 and
+  /* NaN */
+  value != 0.0 / 0.0
+select key, value
diff --git a/unified/ql/src/diagnostic/FilesCoveredByModuleManifest.ql b/unified/ql/src/diagnostic/FilesCoveredByModuleManifest.ql
new file mode 100644
index 000000000000..ca226bedc005
--- /dev/null
+++ b/unified/ql/src/diagnostic/FilesCoveredByModuleManifest.ql
@@ -0,0 +1,18 @@
+/**
+ * @name Files covered by module manifest
+ * @description Files that are included from a module manifest
+ * @kind problem
+ * @problem.severity recommendation
+ * @id unified/diagnostic/files-covered-by-module-manifest
+ * @tags meta
+ * @precision very-low
+ */
+
+import unified
+import codeql.unified.internal.NameBinding
+import codeql.unified.internal.NameBindingPlugin
+import codeql.unified.internal.AnalysisQuality
+
+from FilesCoveredByModuleManifestStats::Candidate c, ModuleScopeRepr mod
+where c.isOk() and mod = c.getAModule()
+select c, "File included in $@.", mod, mod.toString()
diff --git a/unified/ql/src/diagnostic/StaticNameResolution.ql b/unified/ql/src/diagnostic/StaticNameResolution.ql
new file mode 100644
index 000000000000..b15516a3b7b8
--- /dev/null
+++ b/unified/ql/src/diagnostic/StaticNameResolution.ql
@@ -0,0 +1,17 @@
+/**
+ * @name Static name resolution
+ * @description Static name references that could be resolved to a target
+ * @kind problem
+ * @problem.severity recommendation
+ * @id unified/diagnostic/static-name-resolution
+ * @tags meta
+ * @precision very-low
+ */
+
+import unified
+import codeql.unified.internal.NameBinding
+import codeql.unified.internal.AnalysisQuality
+
+from StaticNameResolutionStats::Candidate c, NameBindingNode target
+where target = c.getTarget()
+select c, "Resolved to $@.", target, target.toString()
diff --git a/unified/ql/src/diagnostic/TaintSinks.ql b/unified/ql/src/diagnostic/TaintSinks.ql
new file mode 100644
index 000000000000..5709909010a9
--- /dev/null
+++ b/unified/ql/src/diagnostic/TaintSinks.ql
@@ -0,0 +1,15 @@
+/**
+ * @name Taint sinks
+ * @description Taint sinks
+ * @kind problem
+ * @problem.severity recommendation
+ * @id unified/diagnostic/taint-sinks
+ * @tags meta
+ * @precision very-low
+ */
+
+import unified
+
+from DataFlow::Node node, string kind
+where Models::isSink(node, kind)
+select node, "Sink of kind '" + kind + "'"
diff --git a/unified/ql/src/diagnostic/TaintSources.ql b/unified/ql/src/diagnostic/TaintSources.ql
new file mode 100644
index 000000000000..95695f45d284
--- /dev/null
+++ b/unified/ql/src/diagnostic/TaintSources.ql
@@ -0,0 +1,15 @@
+/**
+ * @name Taint sources
+ * @description Taint sources
+ * @kind problem
+ * @problem.severity recommendation
+ * @id unified/diagnostic/taint-sources
+ * @tags meta
+ * @precision very-low
+ */
+
+import unified
+
+from DataFlow::Node node, string kind
+where Models::isSource(node, kind)
+select node, "Source of kind '" + kind + "'"
diff --git a/unified/ql/src/queries/security/CWE-022/PathInjection.qhelp b/unified/ql/src/queries/security/CWE-022/PathInjection.qhelp
new file mode 100644
index 000000000000..a4ec83290a19
--- /dev/null
+++ b/unified/ql/src/queries/security/CWE-022/PathInjection.qhelp
@@ -0,0 +1,58 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>Accessing paths controlled by users can expose resources to attackers.</p>
+
+<p>Paths that are naively constructed from data controlled by a user may contain unexpected special characters,
+such as <code>..</code>. Such a path could point to any directory on the file system.</p>
+</overview>
+
+<recommendation>
+
+<p>Validate user input before using it to construct a file path. Ideally, follow these rules:</p>
+
+<ul>
+<li>Do not allow more than a single <code>.</code> character.</li>
+<li>Do not allow directory separators such as <code>/</code> or <code>\</code> (depending on the file system).</li>
+<li>Do not rely on simply replacing problematic sequences such as <code>../</code>. For example, after applying this filter to
+<code>.../...//</code> the resulting string would still be <code>../</code>.</li>
+<li>Use a whitelist of known good patterns.</li>
+</ul>
+
+</recommendation>
+
+<example>
+<p>
+The following code shows two bad examples. 
+</p>
+
+<sample src="PathInjectionBad.swift" />
+
+<p>
+In the first, a file name is read from an HTTP request and then used to access a file. In this case, a malicious response could include a file name that is an absolute path, such as
+<code>"/Applications/(current_application)/Documents/sensitive.data"</code>.
+</p>
+
+<p>
+In the second bad example, it appears that the user is restricted to opening a file within the
+<code>"/Library/Caches"</code> home directory. In this case, a malicious response could contain a file name containing
+special characters. For example, the string <code>"../../Documents/sensitive.data"</code> will result in the code
+reading the file located at <code>"/Applications/(current_application)/Library/Caches/../../Documents/sensitive.data"</code>, 
+which contains users' sensitive data. This file may then be made accessible to an attacker, giving them access to all this data.
+</p>
+
+<p>
+In the following (good) example, the path used to access the file system is normalized <em>before</em> being checked against a
+known prefix. This ensures that regardless of the user input, the resulting path is safe.
+</p>
+
+<sample src="PathInjectionGood.swift" />
+</example>
+
+<references>
+<li>OWASP: <a href="https://owasp.org/www-community/attacks/Path_Traversal">Path Traversal</a>.</li>
+</references>
+</qhelp>
diff --git a/unified/ql/src/queries/security/CWE-022/PathInjection.ql b/unified/ql/src/queries/security/CWE-022/PathInjection.ql
new file mode 100644
index 000000000000..20779510fc1b
--- /dev/null
+++ b/unified/ql/src/queries/security/CWE-022/PathInjection.ql
@@ -0,0 +1,70 @@
+/**
+ * @name Uncontrolled data used in path expression
+ * @description Accessing paths influenced by users can allow an attacker to access unexpected resources.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 7.5
+ * @precision high
+ * @id unified/swift/path-injection
+ * @tags security
+ *       external/cwe/cwe-022
+ *       external/cwe/cwe-023
+ *       external/cwe/cwe-036
+ *       external/cwe/cwe-073
+ *       external/cwe/cwe-099
+ */
+
+import unified
+
+/**
+ * A string that might be a label for a path argument.
+ */
+pragma[inline]
+private predicate pathLikeHeuristic(string label) {
+  label =
+    [
+      "atFile", "atPath", "atDirectory", "toFile", "toPath", "toDirectory", "inFile", "inPath",
+      "inDirectory", "contentsOfFile", "contentsOfPath", "contentsOfDirectory", "filePath",
+      "directory", "directoryPath"
+    ]
+}
+
+predicate heuristicSink(DataFlow::Node node) {
+  node.isIncomingValue(any(Identifier id | id.getValue() = "sqlite3_temp_directory"))
+  or
+  exists(Argument arg |
+    pathLikeHeuristic(arg.getName()) and
+    node.asExpr() = arg.getValue()
+  )
+}
+
+module PathInjectionConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node node) { Models::isSource(node, _) }
+
+  predicate isSink(DataFlow::Node node) {
+    Models::isSink(node, "path-injection") or
+    heuristicSink(node)
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    exists(MemberAccessExpr expr |
+      expr.getMemberName() = "path" and
+      node1.isResultValue(expr.getBase()) and
+      node2.isResultValue(expr)
+    )
+  }
+
+  predicate isBarrier(DataFlow::Node node) {
+    // TODO: add barriers
+    none()
+  }
+}
+
+module PathInjectionFlow = TaintTracking::Global<PathInjectionConfig>;
+
+import PathInjectionFlow::PathGraph
+
+from PathInjectionFlow::PathNode source, PathInjectionFlow::PathNode sink
+where PathInjectionFlow::flowPath(source, sink)
+select sink.getNode(), source, sink, "This path depends on a $@.", source.getNode(),
+  "user-provided value"
diff --git a/unified/ql/src/queries/security/CWE-022/PathInjectionBad.swift b/unified/ql/src/queries/security/CWE-022/PathInjectionBad.swift
new file mode 100644
index 000000000000..9ce9d0f42e8b
--- /dev/null
+++ b/unified/ql/src/queries/security/CWE-022/PathInjectionBad.swift
@@ -0,0 +1,10 @@
+let fm = FileManager.default
+let path = try String(contentsOf: URL(string: "http://example.com/")!)
+
+// BAD
+return fm.contents(atPath: path)
+
+// BAD
+if (path.hasPrefix(NSHomeDirectory() + "/Library/Caches")) {
+    return fm.contents(atPath: path)
+}
diff --git a/unified/ql/src/queries/security/CWE-022/PathInjectionGood.swift b/unified/ql/src/queries/security/CWE-022/PathInjectionGood.swift
new file mode 100644
index 000000000000..8e0799fc4862
--- /dev/null
+++ b/unified/ql/src/queries/security/CWE-022/PathInjectionGood.swift
@@ -0,0 +1,8 @@
+let fm = FileManager.default
+let path = try String(contentsOf: URL(string: "http://example.com/")!)
+
+// GOOD
+let filePath = FilePath(stringLiteral: path)
+if (filePath.lexicallyNormalized().starts(with: FilePath(stringLiteral: NSHomeDirectory() + "/Library/Caches"))) {
+    return fm.contents(atPath: path)
+}
diff --git a/unified/ql/src/queries/security/CWE-078/CommandInjection.qhelp b/unified/ql/src/queries/security/CWE-078/CommandInjection.qhelp
new file mode 100644
index 000000000000..9fb39fd64a32
--- /dev/null
+++ b/unified/ql/src/queries/security/CWE-078/CommandInjection.qhelp
@@ -0,0 +1,45 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>
+Constructing a system command with unsanitized user input is dangerous,
+since a malicious user may be able to craft input that executes arbitrary code.
+</p>
+</overview>
+
+<recommendation>
+<p>
+If possible, use hard-coded string literals to specify the command to run. Instead of interpreting
+user input directly as command names, examine the input and then choose among hard-coded string
+literals.
+</p>
+<p>
+If this is not possible, then add sanitization code to verify that the user input is safe before
+using it.
+</p>
+</recommendation>
+
+<example>
+<p>
+The following example executes code from user input without
+sanitizing it first:
+</p>
+<sample src="CommandInjectionBad.swift" />
+<p>
+If user input is used to construct a command it should be checked
+first. This ensures that the user cannot insert characters that have special
+meanings:
+</p>
+<sample src="CommandInjectionGood.swift" />
+</example>
+
+<references>
+<li>
+OWASP:
+<a href="https://community.owasp.org/attacks/Command_Injection">Command Injection</a>.
+</li>
+</references>
+</qhelp>
diff --git a/unified/ql/src/queries/security/CWE-078/CommandInjection.ql b/unified/ql/src/queries/security/CWE-078/CommandInjection.ql
new file mode 100644
index 000000000000..c1268d2bde21
--- /dev/null
+++ b/unified/ql/src/queries/security/CWE-078/CommandInjection.ql
@@ -0,0 +1,43 @@
+/**
+ * @name System command built from user-controlled sources
+ * @description Building a system command from user-controlled sources may allow a malicious
+ *              user to change the meaning of the command.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 9.8
+ * @precision high
+ * @id unified/swift/command-line-injection
+ * @tags security
+ *       external/cwe/cwe-078
+ *       external/cwe/cwe-088
+ */
+
+import unified
+
+/**
+ * A taint configuration for tainted data that reaches a command injection sink.
+ */
+module CommandInjectionConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node node) { Models::isSource(node, _) }
+
+  predicate isSink(DataFlow::Node node) {
+    // TODO: Support Process property-write sinks from original Swift's CommandInjectionExtensions.qll.
+    Models::isSink(node, "command-injection")
+  }
+
+  predicate isBarrier(DataFlow::Node node) {
+    // TODO: Port the numeric-type barrier from original Swift's CommandInjectionExtensions.qll.
+    none()
+  }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+}
+
+module CommandInjectionFlow = TaintTracking::Global<CommandInjectionConfig>;
+
+import CommandInjectionFlow::PathGraph
+
+from CommandInjectionFlow::PathNode source, CommandInjectionFlow::PathNode sink
+where CommandInjectionFlow::flowPath(source, sink)
+select sink.getNode(), source, sink, "This command depends on a $@.", source.getNode(),
+  "user-provided value"
diff --git a/unified/ql/src/queries/security/CWE-078/CommandInjectionBad.swift b/unified/ql/src/queries/security/CWE-078/CommandInjectionBad.swift
new file mode 100644
index 000000000000..ffdaaf907caa
--- /dev/null
+++ b/unified/ql/src/queries/security/CWE-078/CommandInjectionBad.swift
@@ -0,0 +1,5 @@
+var task = Process()
+task.launchPath = "/bin/bash"
+task.arguments = ["-c", userControlledString] // BAD
+
+task.launch()
\ No newline at end of file
diff --git a/unified/ql/src/queries/security/CWE-078/CommandInjectionGood.swift b/unified/ql/src/queries/security/CWE-078/CommandInjectionGood.swift
new file mode 100644
index 000000000000..1773d5b187ba
--- /dev/null
+++ b/unified/ql/src/queries/security/CWE-078/CommandInjectionGood.swift
@@ -0,0 +1,15 @@
+func validateCommand(_ command: String) -> String? {
+    let allowedCommands = ["ls -l", "pwd", "echo"]
+    if allowedCommands.contains(command) {
+        return command
+    }
+    return nil
+}
+
+if let validatedString = validateCommand(userControlledString) {
+    var task = Process()
+    task.launchPath = "/bin/bash"
+    task.arguments = ["-c", validatedString] // GOOD
+
+    task.launch()
+}
diff --git a/unified/ql/src/queries/security/CWE-312/CleartextLogging.qhelp b/unified/ql/src/queries/security/CWE-312/CleartextLogging.qhelp
new file mode 100644
index 000000000000..8de3f21878f0
--- /dev/null
+++ b/unified/ql/src/queries/security/CWE-312/CleartextLogging.qhelp
@@ -0,0 +1,46 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>
+Attackers could gain access to sensitive information that is logged unencrypted.
+</p>
+</overview>
+
+<recommendation>
+<p>
+Always make sure to encrypt or obfuscate sensitive information before you log it.
+</p>
+
+<p>
+Generally, you should decrypt sensitive information only at the point where it is necessary for it to be used in cleartext.
+</p>
+
+<p>
+Be aware that external processes often store the standard output and
+standard error streams of the application. This will include logged sensitive information.
+</p>
+</recommendation>
+
+<example>
+<p>
+The following example code logs user credentials (in this case, their password)
+in plaintext:
+</p>
+<sample src="CleartextLoggingBad.swift"/>
+<p>
+Instead, you should encrypt or obfuscate the credentials, or omit them entirely:
+</p>
+<sample src="CleartextLoggingGood.swift"/>
+</example>
+
+<references>
+
+<li>M. Dowd, J. McDonald and J. Schuhm, <i>The Art of Software Security Assessment</i>, 1st Edition, Chapter 2 - 'Common Vulnerabilities of Encryption', p. 43. Addison Wesley, 2006.</li>
+<li>M. Howard and D. LeBlanc, <i>Writing Secure Code</i>, 2nd Edition, Chapter 9 - 'Protecting Secret Data', p. 299. Microsoft, 2002.</li>
+<li>OWASP: <a href="https://cheatsheetseries.owasp.org/cheatsheets/Logging_Cheat_Sheet.html">Logging Cheat Sheet</a>.</li>
+
+</references>
+</qhelp>
diff --git a/unified/ql/src/queries/security/CWE-312/CleartextLogging.ql b/unified/ql/src/queries/security/CWE-312/CleartextLogging.ql
new file mode 100644
index 000000000000..4aa751a1e91a
--- /dev/null
+++ b/unified/ql/src/queries/security/CWE-312/CleartextLogging.ql
@@ -0,0 +1,52 @@
+/**
+ * @name Cleartext logging of sensitive information
+ * @description Logging sensitive information in plaintext can
+ *              expose it to an attacker.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 7.5
+ * @precision high
+ * @id unified/swift/cleartext-logging
+ * @tags security
+ *       external/cwe/cwe-312
+ *       external/cwe/cwe-359
+ *       external/cwe/cwe-532
+ */
+
+//
+// FIXME: This is a deliberately dumb and noisy version of the query used to exercise data flow early on.
+//
+import unified
+import codeql.concepts.internal.SensitiveDataHeuristics
+
+private string getNameFromExpr(Expr e) {
+  result = e.(IdentifierExpr).getValue()
+  or
+  result = e.(MemberAccessExpr).getMemberName()
+}
+
+module DummyConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node node) {
+    exists(string name |
+      name = getNameFromExpr(node.asExpr()) and
+      HeuristicNames::nameIndicatesSensitiveData(name)
+    )
+  }
+
+  predicate isSink(DataFlow::Node node) {
+    exists(CallExpr call |
+      getNameFromExpr(call.getCallee()).regexpMatch("(?i)(ns)?(log|warn(ing)?|error|print).*") and
+      node.asExpr() = call.getAnArgument().getValue()
+    )
+  }
+
+  predicate isBarrierIn(DataFlow::Node node) { isSource(node) }
+}
+
+module DummyFlow = TaintTracking::Global<DummyConfig>;
+
+import DummyFlow::PathGraph
+
+from DummyFlow::PathNode source, DummyFlow::PathNode sink
+where DummyFlow::flowPath(source, sink)
+select sink.getNode(), source, sink, "Logging of $@", source.getNode(), "sensitive data"
diff --git a/unified/ql/src/queries/security/CWE-312/CleartextLoggingBad.swift b/unified/ql/src/queries/security/CWE-312/CleartextLoggingBad.swift
new file mode 100644
index 000000000000..036001e87179
--- /dev/null
+++ b/unified/ql/src/queries/security/CWE-312/CleartextLoggingBad.swift
@@ -0,0 +1,2 @@
+let password = "P@ssw0rd"
+NSLog("User password changed to \(password)")
diff --git a/unified/ql/src/queries/security/CWE-312/CleartextLoggingGood.swift b/unified/ql/src/queries/security/CWE-312/CleartextLoggingGood.swift
new file mode 100644
index 000000000000..1d90ac5e5656
--- /dev/null
+++ b/unified/ql/src/queries/security/CWE-312/CleartextLoggingGood.swift
@@ -0,0 +1,2 @@
+let password = "P@ssw0rd"
+NSLog("User password changed")
diff --git a/unified/ql/src/queries/unusedentities/UnusedVariable.ql b/unified/ql/src/queries/unusedentities/UnusedVariable.ql
new file mode 100644
index 000000000000..d5747df44863
--- /dev/null
+++ b/unified/ql/src/queries/unusedentities/UnusedVariable.ql
@@ -0,0 +1,40 @@
+/**
+ * @name Unused variable
+ * @description Unused variables may be an indication that the code is incomplete or has a typo.
+ * @kind problem
+ * @problem.severity recommendation
+ * @id unified/unused-variable
+ * @precision high
+ */
+
+private import unified
+
+private predicate isUnusedLocal(LocalName local) {
+  local.getABinding().fromSource() and // ignore unused implicit locals, and ignore locals in built-ins
+  not ignoreDeclaration(local.getABinding().getDeclaration()) and // ignore fields, method, etc
+  not local.getName().regexpMatch("_.*") and
+  not exists(LocalNameAccess access |
+    access = local.getAnAccess() and
+    not access instanceof NameBinding
+  ) and
+  not local = any(UnqualifiedMemberAccess access).getImplicitQualifierVariable()
+}
+
+private predicate ignoreDeclaration(AstNode n) {
+  // ignore fields and methods etc
+  n = any(ClassLikeDeclaration cls).getAMember()
+  or
+  // ignore top-level statements, which are often exported
+  n = any(TopLevel t).getBody().getAStmt()
+  or
+  // Parameters are often needed to satisfy an interface
+  n instanceof Parameter
+}
+
+string getKind(LocalName local) {
+  if local instanceof LocalVariable then result = "local variable" else result = "declaration"
+}
+
+from LocalName local
+where isUnusedLocal(local)
+select local, "Unused " + getKind(local) + " '" + local.getName() + "'"
diff --git a/unified/ql/src/summary/SummaryStats.ql b/unified/ql/src/summary/SummaryStats.ql
new file mode 100644
index 000000000000..916d3388baff
--- /dev/null
+++ b/unified/ql/src/summary/SummaryStats.ql
@@ -0,0 +1,14 @@
+/**
+ * @name Summary Statistics
+ * @description A table of summary statistics about a database.
+ * @kind metric
+ * @id unified/summary/summary-statistics
+ * @tags summary telemetry
+ */
+
+import unified
+import codeql.unified.internal.AnalysisQuality
+
+from string key, int value
+where taintStats(key, value)
+select key, value order by key
diff --git a/unified/ql/test/library-tests/BasicTest/strings.swift b/unified/ql/test/library-tests/BasicTest/strings.swift
new file mode 100644
index 000000000000..0015521eae05
--- /dev/null
+++ b/unified/ql/test/library-tests/BasicTest/strings.swift
@@ -0,0 +1,4 @@
+let x1 = "hello"
+let x2 = "hello \(123) world"
+let x3 = "hello \(arg: 123) world"
+let x4 = "hello \(1, 2, 3) world"
diff --git a/unified/ql/test/library-tests/BasicTest/test.expected b/unified/ql/test/library-tests/BasicTest/test.expected
index b9f4eafe8653..95d54935f8ee 100644
--- a/unified/ql/test/library-tests/BasicTest/test.expected
+++ b/unified/ql/test/library-tests/BasicTest/test.expected
@@ -1,37 +1,185 @@
-nameExpr
-| name_expr.swift:1:9:1:9 | NameExpr | y |
-| test.swift:1:8:1:17 | NameExpr | Foundation |
-| test.swift:8:9:8:13 | NameExpr | items |
-| test.swift:8:22:8:25 | NameExpr | item |
-| test.swift:12:16:12:20 | NameExpr | items |
-| test.swift:12:31:12:34 | NameExpr | item |
-| test.swift:25:18:25:22 | NameExpr | Array |
-| test.swift:25:24:25:28 | NameExpr | first |
-| test.swift:26:17:26:22 | NameExpr | second |
-| test.swift:27:13:27:18 | NameExpr | result |
-| test.swift:27:29:27:32 | NameExpr | item |
-| test.swift:28:13:28:18 | NameExpr | result |
-| test.swift:28:27:28:30 | NameExpr | item |
-| test.swift:31:12:31:17 | NameExpr | result |
-| test.swift:40:16:40:19 | NameExpr | data |
-| test.swift:44:9:44:12 | NameExpr | data |
-| test.swift:48:15:48:19 | NameExpr | index |
-| test.swift:48:29:48:33 | NameExpr | index |
-| test.swift:48:37:48:40 | NameExpr | data |
-| test.swift:49:16:49:19 | NameExpr | data |
-| test.swift:49:21:49:25 | NameExpr | index |
-| test.swift:53:9:53:12 | NameExpr | data |
-| test.swift:53:21:53:24 | NameExpr | item |
-| test.swift:63:16:63:19 | NameExpr | self |
-| test.swift:65:29:65:37 | NameExpr | transform |
-| test.swift:65:39:65:43 | NameExpr | value |
-| test.swift:67:29:67:33 | NameExpr | error |
-| test.swift:76:16:76:19 | NameExpr | self |
-| test.swift:76:21:76:21 | NameExpr | i |
-| test.swift:76:26:76:29 | NameExpr | self |
-| test.swift:76:31:76:31 | NameExpr | i |
-| test.swift:86:12:86:17 | NameExpr | values |
-| test.swift:87:12:87:17 | NameExpr | values |
-| test.swift:87:38:87:43 | NameExpr | values |
-| test.swift:87:49:87:57 | NameExpr | transform |
+identifier
+| name_expr.swift:1:5:1:5 | x | x |
+| name_expr.swift:1:9:1:9 | y | y |
+| strings.swift:1:5:1:6 | x1 | x1 |
+| strings.swift:2:5:2:6 | x2 | x2 |
+| strings.swift:3:5:3:6 | x3 | x3 |
+| strings.swift:3:19:3:21 | arg | arg |
+| strings.swift:4:5:4:6 | x4 | x4 |
+| test.swift:1:8:1:17 | Foundation | Foundation |
+| test.swift:1:8:1:17 | Foundation | Foundation |
+| test.swift:4:8:4:16 | Container | Container |
+| test.swift:4:18:4:18 | T | T |
+| test.swift:4:21:4:29 | Equatable | Equatable |
+| test.swift:5:9:5:13 | items | items |
+| test.swift:5:16:5:15 | Array | Array |
+| test.swift:5:17:5:17 | T | T |
+| test.swift:7:19:7:21 | add | add |
+| test.swift:7:23:7:23 | _ | _ |
+| test.swift:7:25:7:28 | item | item |
+| test.swift:7:31:7:31 | T | T |
+| test.swift:8:9:8:13 | items | items |
+| test.swift:8:15:8:20 | append | append |
+| test.swift:8:22:8:25 | item | item |
+| test.swift:11:10:11:17 | contains | contains |
+| test.swift:11:19:11:19 | _ | _ |
+| test.swift:11:21:11:24 | item | item |
+| test.swift:11:27:11:27 | T | T |
+| test.swift:11:33:11:36 | Bool | Bool |
+| test.swift:12:16:12:20 | items | items |
+| test.swift:12:22:12:29 | contains | contains |
+| test.swift:12:31:12:34 | item | item |
+| test.swift:17:10:17:19 | DataSource | DataSource |
+| test.swift:18:20:18:26 | Element | Element |
+| test.swift:19:9:19:13 | count | count |
+| test.swift:19:16:19:18 | Int | Int |
+| test.swift:20:10:20:13 | item | item |
+| test.swift:20:15:20:16 | at | at |
+| test.swift:20:18:20:22 | index | index |
+| test.swift:20:25:20:27 | Int | Int |
+| test.swift:20:33:20:32 | Optional | Optional |
+| test.swift:20:33:20:39 | Element | Element |
+| test.swift:24:6:24:10 | merge | merge |
+| test.swift:24:12:24:12 | T | T |
+| test.swift:24:15:24:24 | Collection | Collection |
+| test.swift:24:27:24:27 | _ | _ |
+| test.swift:24:29:24:33 | first | first |
+| test.swift:24:36:24:36 | T | T |
+| test.swift:24:39:24:39 | _ | _ |
+| test.swift:24:41:24:46 | second | second |
+| test.swift:24:49:24:49 | T | T |
+| test.swift:24:55:24:54 | Array | Array |
+| test.swift:24:56:24:56 | T | T |
+| test.swift:24:58:24:64 | Element | Element |
+| test.swift:25:9:25:14 | result | result |
+| test.swift:25:18:25:22 | Array | Array |
+| test.swift:25:24:25:28 | first | first |
+| test.swift:26:9:26:12 | item | item |
+| test.swift:26:17:26:22 | second | second |
+| test.swift:27:13:27:18 | result | result |
+| test.swift:27:20:27:27 | contains | contains |
+| test.swift:27:29:27:32 | item | item |
+| test.swift:28:13:28:18 | result | result |
+| test.swift:28:20:28:25 | append | append |
+| test.swift:28:27:28:30 | item | item |
+| test.swift:31:12:31:17 | result | result |
+| test.swift:35:7:35:17 | DataManager | DataManager |
+| test.swift:35:19:35:19 | T | T |
+| test.swift:35:23:35:32 | DataSource | DataSource |
+| test.swift:36:15:36:21 | Element | Element |
+| test.swift:36:25:36:25 | T | T |
+| test.swift:37:17:37:20 | data | data |
+| test.swift:37:23:37:22 | Array | Array |
+| test.swift:37:24:37:24 | T | T |
+| test.swift:39:9:39:13 | count | count |
+| test.swift:39:16:39:18 | Int | Int |
+| test.swift:40:16:40:19 | data | data |
+| test.swift:40:21:40:25 | count | count |
+| test.swift:43:9:43:15 | isEmpty | isEmpty |
+| test.swift:43:18:43:21 | Bool | Bool |
+| test.swift:44:9:44:12 | data | data |
+| test.swift:44:14:44:20 | isEmpty | isEmpty |
+| test.swift:47:10:47:13 | item | item |
+| test.swift:47:15:47:16 | at | at |
+| test.swift:47:18:47:22 | index | index |
+| test.swift:47:25:47:27 | Int | Int |
+| test.swift:47:33:47:32 | Optional | Optional |
+| test.swift:47:33:47:33 | T | T |
+| test.swift:48:15:48:19 | index | index |
+| test.swift:48:29:48:33 | index | index |
+| test.swift:48:37:48:40 | data | data |
+| test.swift:48:42:48:46 | count | count |
+| test.swift:49:16:49:19 | data | data |
+| test.swift:49:21:49:25 | index | index |
+| test.swift:52:10:52:12 | add | add |
+| test.swift:52:14:52:14 | _ | _ |
+| test.swift:52:16:52:19 | item | item |
+| test.swift:52:22:52:22 | T | T |
+| test.swift:53:9:53:12 | data | data |
+| test.swift:53:14:53:19 | append | append |
+| test.swift:53:21:53:24 | item | item |
+| test.swift:58:6:58:11 | Result | Result |
+| test.swift:58:13:58:19 | Success | Success |
+| test.swift:58:22:58:28 | Failure | Failure |
+| test.swift:58:31:58:35 | Error | Error |
+| test.swift:59:10:59:16 | success | success |
+| test.swift:59:18:59:24 | Success | Success |
+| test.swift:60:10:60:16 | failure | failure |
+| test.swift:60:18:60:24 | Failure | Failure |
+| test.swift:62:10:62:12 | map | map |
+| test.swift:62:14:62:14 | U | U |
+| test.swift:62:17:62:17 | _ | _ |
+| test.swift:62:19:62:27 | transform | transform |
+| test.swift:62:31:62:37 | Success | Success |
+| test.swift:62:43:62:43 | U | U |
+| test.swift:62:49:62:54 | Result | Result |
+| test.swift:62:56:62:56 | U | U |
+| test.swift:62:59:62:65 | Failure | Failure |
+| test.swift:63:16:63:19 | self | self |
+| test.swift:64:15:64:21 | success | success |
+| test.swift:64:27:64:31 | value | value |
+| test.swift:65:21:65:27 | success | success |
+| test.swift:65:29:65:37 | transform | transform |
+| test.swift:65:39:65:43 | value | value |
+| test.swift:66:15:66:21 | failure | failure |
+| test.swift:66:27:66:31 | error | error |
+| test.swift:67:21:67:27 | failure | failure |
+| test.swift:67:29:67:33 | error | error |
+| test.swift:73:11:73:15 | Array | Array |
+| test.swift:74:10:74:17 | isSorted | isSorted |
+| test.swift:74:24:74:27 | Bool | Bool |
+| test.swift:75:13:75:13 | i | i |
+| test.swift:75:23:75:27 | count | count |
+| test.swift:76:16:76:19 | self | self |
+| test.swift:76:21:76:21 | i | i |
+| test.swift:76:26:76:29 | self | self |
+| test.swift:76:31:76:31 | i | i |
+| test.swift:85:6:85:12 | combine | combine |
+| test.swift:85:14:85:14 | T | T |
+| test.swift:85:17:85:17 | _ | _ |
+| test.swift:85:19:85:24 | values | values |
+| test.swift:85:27:85:26 | Array | Array |
+| test.swift:85:28:85:28 | T | T |
+| test.swift:85:32:85:40 | transform | transform |
+| test.swift:85:32:85:40 | transform | transform |
+| test.swift:85:44:85:44 | T | T |
+| test.swift:85:47:85:47 | T | T |
+| test.swift:85:53:85:53 | T | T |
+| test.swift:85:59:85:58 | Optional | Optional |
+| test.swift:85:59:85:59 | T | T |
+| test.swift:86:12:86:17 | values | values |
+| test.swift:86:19:86:25 | isEmpty | isEmpty |
+| test.swift:87:12:87:17 | values | values |
+| test.swift:87:19:87:27 | dropFirst | dropFirst |
+| test.swift:87:31:87:36 | reduce | reduce |
+| test.swift:87:38:87:43 | values | values |
+| test.swift:87:49:87:57 | transform | transform |
+| test.swift:90:5:90:9 | tuple | tuple |
+| test.swift:91:5:91:10 | unary1 | unary1 |
+| test.swift:92:5:92:10 | unary2 | unary2 |
+namedPattern
+| test.swift:1:1:1:17 | NamedPattern | Foundation |
 unsupported
+rawStringValue
+| strings.swift:1:10:1:16 | "hello" | "hello" |
+| strings.swift:2:11:2:16 | hello  | hello  |
+| strings.swift:2:23:2:28 |  world |  world |
+| strings.swift:3:11:3:16 | hello  | hello  |
+| strings.swift:3:28:3:33 |  world |  world |
+| strings.swift:4:11:4:16 | hello  | hello  |
+| strings.swift:4:27:4:32 |  world |  world |
+| test.swift:90:17:90:23 | "hello" | "hello" |
+| test.swift:91:15:91:29 | "parenthesized" | "parenthesized" |
+| test.swift:92:16:92:37 | "double-parenthesized" | "double-parenthesized" |
+exprStringValue
+| strings.swift:1:10:1:16 | "hello" | hello |
+| strings.swift:2:11:2:16 | hello  | hello  |
+| strings.swift:2:23:2:28 |  world |  world |
+| strings.swift:3:11:3:16 | hello  | hello  |
+| strings.swift:3:28:3:33 |  world |  world |
+| strings.swift:4:11:4:16 | hello  | hello  |
+| strings.swift:4:27:4:32 |  world |  world |
+| test.swift:90:17:90:23 | "hello" | hello |
+| test.swift:91:15:91:29 | "parenthesized" | parenthesized |
+| test.swift:92:16:92:37 | "double-parenthesized" | double-parenthesized |
+unexpectedUnaryTuple
diff --git a/unified/ql/test/library-tests/BasicTest/test.ql b/unified/ql/test/library-tests/BasicTest/test.ql
index 5e70f9303687..a3f7947eea98 100644
--- a/unified/ql/test/library-tests/BasicTest/test.ql
+++ b/unified/ql/test/library-tests/BasicTest/test.ql
@@ -1,5 +1,19 @@
 import unified
 
-query predicate nameExpr(NameExpr node, string value) { value = node.getIdentifier().getValue() }
+query predicate identifier(Identifier node, string value) {
+  node.fromSource() and value = node.getValue()
+}
+
+query predicate namedPattern(NamedPattern node, string value) { value = node.getName() }
 
 query predicate unsupported(UnsupportedNode node, string value) { value = node.getValue() }
+
+query predicate rawStringValue(StringLiteral e, string value) {
+  e.fromSource() and value = e.getValue()
+}
+
+query predicate exprStringValue(Expr e, string value) {
+  e.fromSource() and value = e.getStringValue()
+}
+
+query predicate unexpectedUnaryTuple(TupleExpr tuple) { count(tuple.getAnElement()) = 1 }
diff --git a/unified/ql/test/library-tests/BasicTest/test.swift b/unified/ql/test/library-tests/BasicTest/test.swift
index 158ef26f598b..77e95074b383 100644
--- a/unified/ql/test/library-tests/BasicTest/test.swift
+++ b/unified/ql/test/library-tests/BasicTest/test.swift
@@ -86,3 +86,7 @@ func combine<T>(_ values: [T], transform: (T, T) -> T) -> T? {
     guard !values.isEmpty else { return nil }
     return values.dropFirst().reduce(values[0], transform)
 }
+
+let tuple = (1, "hello", true)
+let unary1 = ("parenthesized")
+let unary2 = (("double-parenthesized"))
diff --git a/unified/ql/test/library-tests/comments/comments.ql b/unified/ql/test/library-tests/comments/comments.ql
index db64ff737a71..a17b318cff6e 100644
--- a/unified/ql/test/library-tests/comments/comments.ql
+++ b/unified/ql/test/library-tests/comments/comments.ql
@@ -1,3 +1,3 @@
 import unified
 
-query predicate comments(Comment c, string text) { text = c.getCommentText() }
+query predicate comments(Comment c, string text) { c.fromSource() and text = c.getCommentText() }
diff --git a/unified/ql/test/library-tests/constructors/constructors.swift b/unified/ql/test/library-tests/constructors/constructors.swift
new file mode 100644
index 000000000000..2e03b1092fcf
--- /dev/null
+++ b/unified/ql/test/library-tests/constructors/constructors.swift
@@ -0,0 +1,62 @@
+class C1 {}  // implicit parameterless `init`
+
+class C2: C1 {}  // inherits `init`
+
+class C3 {
+    init() {}
+}
+
+class C4: C3 {
+    init(_ x: Int) {
+        super.init()
+    }
+
+    override convenience init() {
+        self.init(0)
+    }
+}
+
+class C5: C4 {}  // inherits `init` and `convenience init`
+
+class C6<T1, T2> {
+    init(x: T1, y: T2) {}
+
+    private init(s: String) {}
+
+    convenience init(x: T1) {
+        fatalError("Convenience initializer not implemented")
+    }
+}
+
+class C7<T3, T4>: C6<T4, T3> {}  // inherits `init(x: T4, y: T3)` and `convenience init(x: T4)`
+
+class C8: C7<Int, String> {  // inherits `init(x: String, y: Int)`
+    convenience init(x: String) {
+        self.init(x: x, y: 0)
+    }
+}
+
+struct S1 {  // implicit `init(f1: Int = 0, f2: String, f4: Double, f6: Double, f7: Double = 0, f8: Int? = nil)`
+    var f1 = 0
+    var f2: String
+    let f3: Bool = false
+    let f4: Double
+    static var f5: Float = 0.0
+    var f6: Double {  // todo: unlike `f7`, this is not extracted as a `VariableDeclaration`
+        willSet {
+            print("Changing from \(f6) to \(newValue)")
+        }
+        didSet {
+            print("Changed from \(oldValue) to \(f6)")
+        }
+    }
+    var f7: Double = 0.0 {
+        willSet {
+            print("Changing from \(f7) to \(newValue)")
+        }
+        didSet {
+            print("Changed from \(oldValue) to \(f7)")
+        }
+    }
+    var f8: Int?
+}
diff --git a/unified/ql/test/library-tests/constructors/test.expected b/unified/ql/test/library-tests/constructors/test.expected
new file mode 100644
index 000000000000..b08af30bc754
--- /dev/null
+++ b/unified/ql/test/library-tests/constructors/test.expected
@@ -0,0 +1,34 @@
+generatedConstructor
+| constructors.swift:1:1:1:0 | C1.init |
+| constructors.swift:3:1:3:0 | C2.init |
+| constructors.swift:19:1:19:0 | C5.init |
+| constructors.swift:31:1:31:0 | C7.init |
+| constructors.swift:39:1:39:0 | S1.init |
+implicitReceiverParameter
+| constructors.swift:1:1:1:0 | self | constructors.swift:1:1:1:0 | C1.init |
+| constructors.swift:3:1:3:0 | self | constructors.swift:3:1:3:0 | C2.init |
+| constructors.swift:6:5:6:13 | self | constructors.swift:6:5:6:13 | C3.init |
+| constructors.swift:10:5:12:5 | self | constructors.swift:10:5:12:5 | C4.init |
+| constructors.swift:14:5:16:5 | self | constructors.swift:14:5:16:5 | convenience C4.init |
+| constructors.swift:19:1:19:0 | self | constructors.swift:19:1:19:0 | C5.init |
+| constructors.swift:22:5:22:25 | self | constructors.swift:22:5:22:25 | C6.init |
+| constructors.swift:24:5:24:30 | self | constructors.swift:24:5:24:30 | C6.init |
+| constructors.swift:26:5:28:5 | self | constructors.swift:26:5:28:5 | convenience C6.init |
+| constructors.swift:31:1:31:0 | self | constructors.swift:31:1:31:0 | C7.init |
+| constructors.swift:34:5:36:5 | self | constructors.swift:34:5:36:5 | convenience C8.init |
+| constructors.swift:39:1:39:0 | self | constructors.swift:39:1:39:0 | S1.init |
+| constructors.swift:46:9:48:9 | self | constructors.swift:46:9:48:9 | AccessorDeclaration |
+| constructors.swift:49:9:51:9 | self | constructors.swift:49:9:51:9 | AccessorDeclaration |
+| constructors.swift:54:9:56:9 | self | constructors.swift:54:9:56:9 | AccessorDeclaration |
+| constructors.swift:57:9:59:9 | self | constructors.swift:57:9:59:9 | AccessorDeclaration |
+defaultConstructorParameter
+| constructors.swift:39:1:39:0 | S1.init | 1 | constructors.swift:39:1:39:0 | f1 [init default constructor] | f1 | true |
+| constructors.swift:39:1:39:0 | S1.init | 2 | constructors.swift:39:1:39:0 | f2 [init default constructor] | f2 | false |
+| constructors.swift:39:1:39:0 | S1.init | 3 | constructors.swift:39:1:39:0 | f4 [init default constructor] | f4 | false |
+| constructors.swift:39:1:39:0 | S1.init | 4 | constructors.swift:39:1:39:0 | f7 [init default constructor] | f7 | true |
+| constructors.swift:39:1:39:0 | S1.init | 5 | constructors.swift:39:1:39:0 | f8 [init default constructor] | f8 | true |
+defaultConstructorParameterType
+| constructors.swift:39:1:39:0 | S1.init | 2 | constructors.swift:39:1:39:0 | f2 [init default constructor] | f2 | constructors.swift:41:13:41:18 | String |
+| constructors.swift:39:1:39:0 | S1.init | 3 | constructors.swift:39:1:39:0 | f4 [init default constructor] | f4 | constructors.swift:43:13:43:18 | Double |
+| constructors.swift:39:1:39:0 | S1.init | 4 | constructors.swift:39:1:39:0 | f7 [init default constructor] | f7 | constructors.swift:53:13:53:18 | Double |
+| constructors.swift:39:1:39:0 | S1.init | 5 | constructors.swift:39:1:39:0 | f8 [init default constructor] | f8 | constructors.swift:61:13:61:16 | GenericTypeExpr |
diff --git a/unified/ql/test/library-tests/constructors/test.ql b/unified/ql/test/library-tests/constructors/test.ql
new file mode 100644
index 000000000000..268b69cb474a
--- /dev/null
+++ b/unified/ql/test/library-tests/constructors/test.ql
@@ -0,0 +1,27 @@
+import unified
+import codeql.unified.internal.ParameterEx
+
+query predicate generatedConstructor(ConstructorDeclaration c) {
+  c = any(ClassLikeDeclaration cls | cls.fromSource()).getAMember() and
+  c.hasModifier("generated")
+}
+
+query predicate implicitReceiverParameter(ParameterEx p, Callable c) {
+  p.isImplicitReceiverParameter(c) and
+  c.getFile().fromSource()
+}
+
+query predicate defaultConstructorParameter(
+  ConstructorDeclaration cd, int i, ParameterEx p, string name, boolean hasDefault
+) {
+  p.isDefaultConstructorParameter(cd, i, name) and
+  cd.getFile().fromSource() and
+  if p.hasDefault() then hasDefault = true else hasDefault = false
+}
+
+query predicate defaultConstructorParameterType(
+  ConstructorDeclaration cd, int i, ParameterEx p, string name, AstNode type
+) {
+  defaultConstructorParameter(cd, i, p, name, _) and
+  type = p.getType()
+}
diff --git a/unified/ql/test/library-tests/controlflow/basicblock-slices.expected b/unified/ql/test/library-tests/controlflow/basicblock-slices.expected
new file mode 100644
index 000000000000..75209a2d826b
--- /dev/null
+++ b/unified/ql/test/library-tests/controlflow/basicblock-slices.expected
@@ -0,0 +1,496 @@
+| 1 | cfg.swift:1:1:613:1 | Block | 'Block -V var topLevelDecl -V topLevelDecl -> Int -> 0' |
+| 2 | cfg.swift:2:1:2:1 | 0 | '0' |
+| 3 | cfg.swift:3:1:3:12 | topLevelDecl | 'topLevelDecl -> 1 -^ ... + ...' |
+| 5 | cfg.swift:5:1:5:37 | func returnZero | 'func returnZero -V returnZero' |
+| 5 | cfg.swift:5:26:5:37 | Block | 'Block -V 0 -^ ReturnExpr' |
+| 7 | cfg.swift:7:1:7:10 | returnZero | 'returnZero -^ returnZero(...)' |
+| 8 | cfg.swift:8:1:8:6 | Double | 'Double -> Argument -V topLevelDecl -^ Double(...)' |
+| 10 | cfg.swift:10:1:13:1 | enum MyError | 'enum MyError -V MyError -> BaseType -V Error' |
+| 11 | cfg.swift:11:10:11:15 | MyError.error1 | 'MyError.error1 -V error1 -> MyError.error2 -V error2' |
+| 12 | cfg.swift:12:10:12:31 | MyError.error3 | 'MyError.error3 -V error3 -^ MyError.error3.(constructor)' |
+| 12 | cfg.swift:12:17:12:25 | withParam | 'withParam -? Block' |
+| 15 | cfg.swift:15:1:17:1 | func isZero | 'func isZero -V isZero' |
+| 15 | cfg.swift:15:13:15:13 | x | 'x -> Block' |
+| 16 | cfg.swift:16:10:16:10 | x | 'x -> 0 -^ ... == ... -^ ReturnExpr' |
+| 19 | cfg.swift:19:1:26:1 | func mightThrow | 'func mightThrow -V mightThrow' |
+| 19 | cfg.swift:19:17:19:17 | x | 'x -> Block' |
+| 20 | cfg.swift:20:3:22:3 | GuardIfStmt | 'GuardIfStmt -V x -> 0 -^ ... >= ...' |
+| 20 | cfg.swift:20:21:22:3 | Block | 'Block' |
+| 21 | cfg.swift:21:11:21:17 | MyError | 'MyError -^ ... .error1 -^ ThrowExpr' |
+| 23 | cfg.swift:23:3:25:3 | GuardIfStmt | 'GuardIfStmt -V x -> 0 -^ ... <= ...' |
+| 23 | cfg.swift:23:21:25:3 | Block | 'Block' |
+| 24 | cfg.swift:24:11:24:17 | MyError | 'MyError -^ ... .error3 -> Argument -V x -> 1 -^ ... + ... -^ ... .error3(...) -^ ThrowExpr' |
+| 28 | cfg.swift:28:1:45:1 | func tryCatch | 'func tryCatch -V tryCatch' |
+| 28 | cfg.swift:28:15:28:15 | x | 'x -> Block' |
+| 29 | cfg.swift:29:3:43:3 | TryExpr | 'TryExpr -V Block' |
+| 30 | cfg.swift:30:5:30:24 | try ... | 'try ...' |
+| 30 | cfg.swift:30:9:30:18 | mightThrow | 'mightThrow -> Argument -V 0 -^ mightThrow(...)' |
+| 31 | cfg.swift:31:5:31:9 | print | 'print -> Argument -V "Did not throw." -^ print(...)' |
+| 32 | cfg.swift:32:10:32:19 | mightThrow | 'mightThrow -> Argument -V 0 -^ mightThrow(...) -^ try! ...' |
+| 33 | cfg.swift:33:5:33:9 | print | 'print -> Argument -V "Still did not throw." -^ print(...)' |
+| 35 | cfg.swift:35:5:37:3 | CatchClause | 'CatchClause -V MyError -^ ... .error1 -> isZero -> Argument -V x -^ isZero(...) -? MyError -^ ... .error2 -^ ConditionalPattern -^ OrPattern' |
+| 35 | cfg.swift:35:62:37:3 | Block | 'Block' |
+| 36 | cfg.swift:36:12:36:12 | 0 | '0 -^ ReturnExpr' |
+| 37 | cfg.swift:37:5:39:3 | CatchClause | 'CatchClause -V MyError -^ ... .error3 -> Argument -V withParam -^ ExprPattern -^ ... .error3(...)' |
+| 37 | cfg.swift:37:41:39:3 | Block | 'Block' |
+| 38 | cfg.swift:38:12:38:20 | withParam | 'withParam -^ ReturnExpr' |
+| 39 | cfg.swift:39:5:41:3 | CatchClause | 'CatchClause -V ' |
+| 39 | cfg.swift:39:22:41:3 | Block | 'Block' |
+| 40 | cfg.swift:40:5:40:9 | print | 'print -> Argument -V "MyError" -^ print(...)' |
+| 41 | cfg.swift:41:5:43:3 | CatchClause | 'CatchClause -V Block' |
+| 42 | cfg.swift:42:5:42:9 | print | 'print -> Argument -V Unknown error  -> interpolation -> Argument -V error -^ interpolation(...) ->  -^ StringInterpolationExpr -^ print(...)' |
+| 44 | cfg.swift:44:10:44:10 | 0 | '0 -^ ReturnExpr' |
+| 47 | cfg.swift:47:1:51:1 | func createClosure1 | 'func createClosure1 -V createClosure1' |
+| 47 | cfg.swift:47:21:47:21 | s | 's -> Block' |
+| 48 | cfg.swift:48:10:50:3 | FunctionExpr | 'FunctionExpr -^ ReturnExpr' |
+| 49 | cfg.swift:49:5:49:17 | Block | 'Block -V s -> "" -^ ... + ... -^ ReturnExpr' |
+| 53 | cfg.swift:53:1:58:1 | func createClosure2 | 'func createClosure2 -V createClosure2' |
+| 53 | cfg.swift:53:21:53:21 | x | 'x -> Block' |
+| 54 | cfg.swift:54:3:56:3 | func f | 'func f -V f' |
+| 54 | cfg.swift:54:10:54:10 | y | 'y -> Block' |
+| 55 | cfg.swift:55:12:55:12 | x | 'x -> y -^ ... + ... -^ ReturnExpr' |
+| 57 | cfg.swift:57:10:57:10 | f | 'f -^ ReturnExpr' |
+| 60 | cfg.swift:60:1:64:1 | func createClosure3 | 'func createClosure3 -V createClosure3' |
+| 60 | cfg.swift:60:21:60:21 | x | 'x -> Block' |
+| 61 | cfg.swift:61:10:63:3 | FunctionExpr | 'FunctionExpr -^ ReturnExpr' |
+| 62 | cfg.swift:62:6:62:6 | y | 'y -> Block -V x -> y -^ ... + ...' |
+| 66 | cfg.swift:66:1:70:1 | func callClosures | 'func callClosures -V callClosures' |
+| 66 | cfg.swift:66:21:70:1 | Block | 'Block' |
+| 67 | cfg.swift:67:3:67:34 | var x1 | 'var x1 -V x1 -> createClosure1 -> Argument -V "" -^ createClosure1(...) -^ ...(...)' |
+| 68 | cfg.swift:68:3:68:35 | var x2 | 'var x2 -V x2 -> createClosure2 -> Argument -V 0 -^ createClosure2(...) -> Argument -V 10 -^ ...(...)' |
+| 69 | cfg.swift:69:3:69:35 | var x3 | 'var x3 -V x3 -> createClosure3 -> Argument -V 0 -^ createClosure3(...) -> Argument -V 10 -^ ...(...)' |
+| 72 | cfg.swift:72:1:75:1 | func maybeParseInt | 'func maybeParseInt -V maybeParseInt' |
+| 72 | cfg.swift:72:20:72:20 | s | 's -> Block' |
+| 73 | cfg.swift:73:3:73:23 | var n | 'var n -V n -> Optional -> Int -^ GenericTypeExpr -> Int -> Argument -V s -^ Int(...)' |
+| 74 | cfg.swift:74:10:74:10 | n | 'n -^ ReturnExpr' |
+| 77 | cfg.swift:77:1:81:1 | func forceAndBackToOptional | 'func forceAndBackToOptional -V forceAndBackToOptional' |
+| 77 | cfg.swift:77:39:81:1 | Block | 'Block' |
+| 78 | cfg.swift:78:3:78:36 | var nBang | 'var nBang -V nBang -> maybeParseInt -> Argument -V "42" -^ maybeParseInt(...) -^ ... !' |
+| 79 | cfg.swift:79:3:79:31 | var n | 'var n -V n -> maybeParseInt -> Argument -V "42" -^ maybeParseInt(...)' |
+| 80 | cfg.swift:80:10:80:14 | nBang | 'nBang -> n -^ ... ! -^ ... + ... -^ ReturnExpr' |
+| 83 | cfg.swift:83:1:98:1 | func testInOut | 'func testInOut -V testInOut' |
+| 83 | cfg.swift:83:25:98:1 | Block | 'Block' |
+| 84 | cfg.swift:84:3:84:15 | var temp | 'var temp -V temp -> 10' |
+| 86 | cfg.swift:86:3:88:3 | func add | 'func add -V add' |
+| 86 | cfg.swift:86:12:86:12 | a | 'a -> Block' |
+| 87 | cfg.swift:87:5:87:5 | a | 'a -> a -> 1 -^ ... + ... -^ ... = ...' |
+| 90 | cfg.swift:90:3:92:3 | func addOptional | 'func addOptional -V addOptional' |
+| 90 | cfg.swift:90:20:90:20 | a | 'a -> Block' |
+| 91 | cfg.swift:91:5:91:5 | a | 'a -> nil -^ ... = ...' |
+| 94 | cfg.swift:94:3:94:5 | add | 'add -> Argument -V temp -^ & ... -^ add(...)' |
+| 95 | cfg.swift:95:3:95:30 | var tempOptional | 'var tempOptional -V tempOptional -> Optional -> Int -^ GenericTypeExpr -> 10' |
+| 96 | cfg.swift:96:3:96:13 | addOptional | 'addOptional -> Argument -V tempOptional -^ & ... -^ addOptional(...)' |
+| 97 | cfg.swift:97:10:97:13 | temp | 'temp -> tempOptional -^ ... ! -^ ... + ... -^ ReturnExpr' |
+| 100 | cfg.swift:100:1:109:1 | class C | 'class C -V C' |
+| 101 | cfg.swift:101:3:101:16 | let C.myInt | 'let C.myInt -V myInt -> Int' |
+| 102 | cfg.swift:102:3:104:3 | C.init | 'C.init' |
+| 102 | cfg.swift:102:8:102:8 | n | 'n -> Block' |
+| 103 | cfg.swift:103:5:103:9 | myInt | 'myInt -> n -^ ... = ...' |
+| 106 | cfg.swift:106:3:108:3 | func C.getMyInt | 'func C.getMyInt -V getMyInt' |
+| 106 | cfg.swift:106:26:108:3 | Block | 'Block' |
+| 107 | cfg.swift:107:12:107:16 | myInt | 'myInt -^ ReturnExpr' |
+| 111 | cfg.swift:111:1:137:1 | func testMemberRef | 'func testMemberRef -V testMemberRef' |
+| 111 | cfg.swift:111:20:111:24 | param | 'param -> inoutParam -> opt -> Block' |
+| 112 | cfg.swift:112:3:112:18 | let c | 'let c -V c -> C -> Argument -V 42 -^ C(...)' |
+| 113 | cfg.swift:113:3:113:18 | let n1 | 'let n1 -V n1 -> c -^ ... .myInt' |
+| 114 | cfg.swift:114:3:114:23 | let n2 | 'let n2 -V n2 -> c -^ ... .self -^ ... .myInt' |
+| 115 | cfg.swift:115:3:115:23 | let n3 | 'let n3 -V n3 -> c -^ ... .getMyInt -^ ... .getMyInt(...)' |
+| 116 | cfg.swift:116:3:116:28 | let n4 | 'let n4 -V n4 -> c -^ ... .self -^ ... .getMyInt -^ ... .getMyInt(...)' |
+| 117 | cfg.swift:117:3:117:22 | let n5 | 'let n5 -V n5 -> param -^ ... .myInt' |
+| 118 | cfg.swift:118:3:118:27 | let n6 | 'let n6 -V n6 -> param -^ ... .self -^ ... .myInt' |
+| 120 | cfg.swift:120:3:120:32 | let n8 | 'let n8 -V n8 -> param -^ ... .self -^ ... .getMyInt -^ ... .getMyInt(...)' |
+| 122 | cfg.swift:122:3:122:27 | let n9 | 'let n9 -V n9 -> inoutParam -^ ... .myInt' |
+| 123 | cfg.swift:123:3:123:27 | let n7 | 'let n7 -V n7 -> param -^ ... .getMyInt -^ ... .getMyInt(...)' |
+| 124 | cfg.swift:124:3:124:33 | let n10 | 'let n10 -V n10 -> inoutParam -^ ... .self -^ ... .myInt' |
+| 125 | cfg.swift:125:3:125:33 | let n11 | 'let n11 -V n11 -> inoutParam -^ ... .getMyInt -^ ... .getMyInt(...)' |
+| 126 | cfg.swift:126:3:126:38 | let n12 | 'let n12 -V n12 -> inoutParam -^ ... .self -^ ... .getMyInt -^ ... .getMyInt(...)' |
+| 128 | cfg.swift:128:3:128:22 | let n13 | 'let n13 -V n13 -> opt -^ ... ! -^ ... .myInt' |
+| 129 | cfg.swift:129:3:129:27 | let n14 | 'let n14 -V n14 -> opt -^ ... ! -^ ... .self -^ ... .myInt' |
+| 130 | cfg.swift:130:3:130:27 | let n15 | 'let n15 -V n15 -> opt -^ ... ! -^ ... .getMyInt -^ ... .getMyInt(...)' |
+| 131 | cfg.swift:131:3:131:32 | let n16 | 'let n16 -V n16 -> opt -^ ... ! -^ ... .self -^ ... .getMyInt -^ ... .getMyInt(...)' |
+| 133 | cfg.swift:133:3:133:22 | let n17 | 'let n17 -V n17 -> opt -^ ... .myInt' |
+| 134 | cfg.swift:134:3:134:27 | let n18 | 'let n18 -V n18 -> opt -^ ... .self -^ ... .myInt' |
+| 135 | cfg.swift:135:3:135:27 | let n19 | 'let n19 -V n19 -> opt -^ ... .getMyInt -^ ... .getMyInt(...)' |
+| 136 | cfg.swift:136:3:136:32 | let n20 | 'let n20 -V n20 -> opt -^ ... .self -^ ... .getMyInt -^ ... .getMyInt(...)' |
+| 139 | cfg.swift:139:1:173:1 | func patterns | 'func patterns -V patterns' |
+| 139 | cfg.swift:139:15:139:15 | x | 'x -> Block' |
+| 140 | cfg.swift:140:3:141:12 | ForEachStmt | 'ForEachStmt -V 0 -> 10 -^ ... ... ...' |
+| 140 | cfg.swift:140:7:140:7 | _ | '_' |
+| 141 | cfg.swift:141:9:141:12 | Block | 'Block' |
+| 143 | cfg.swift:143:3:145:3 | ForEachStmt | 'ForEachStmt -V 0 -> 10 -^ ... ... ...' |
+| 143 | cfg.swift:143:7:143:7 | y | 'y -> y -> 5 -^ ... != ...' |
+| 143 | cfg.swift:143:32:145:3 | Block | 'Block' |
+| 144 | cfg.swift:144:5:144:9 | print | 'print -> Argument -V y -^ print(...)' |
+| 147 | cfg.swift:147:3:160:3 | SwitchExpr | 'SwitchExpr -V x' |
+| 148 | cfg.swift:148:5:150:17 | SwitchCase | 'SwitchCase -V 0 -> 1 -^ OrPattern' |
+| 149 | cfg.swift:149:7:150:17 | Block | 'Block -V true -^ ReturnExpr' |
+| 151 | cfg.swift:151:5:154:17 | SwitchCase | 'SwitchCase' |
+| 151 | cfg.swift:151:10:151:10 | x | 'x -^ ConditionalPattern' |
+| 152 | cfg.swift:152:9:153:17 | ... && ... | '... && ... -V x -> 2 -^ ... >= ...' |
+| 153 | cfg.swift:153:13:153:13 | x | 'x -> 5 -^ ... < ...' |
+| 154 | cfg.swift:154:7:154:17 | Block | 'Block -V true -^ ReturnExpr' |
+| 155 | cfg.swift:155:5:157:17 | SwitchCase | 'SwitchCase -V 42' |
+| 156 | cfg.swift:156:7:157:17 | Block | 'Block -V print -> Argument -V "42!" -^ print(...)' |
+| 157 | cfg.swift:157:7:157:17 |  | '' |
+| 158 | cfg.swift:158:5:159:34 | SwitchCase | 'SwitchCase' |
+| 159 | cfg.swift:159:7:159:34 | Block | 'Block -V IfExpr -V x -> 10 -^ ... > ...' |
+| 159 | cfg.swift:159:19:159:34 | Block | 'Block -V false -^ ReturnExpr' |
+| 162 | cfg.swift:162:3:162:31 | var obj | 'var obj -V obj -> AnyObject -> C -> Argument -V x -^ C(...)' |
+| 163 | cfg.swift:163:3:165:3 | IfExpr | 'IfExpr -V obj -> C -^ TypeTestExpr' |
+| 163 | cfg.swift:163:15:165:3 | Block | 'Block' |
+| 164 | cfg.swift:164:12:164:15 | true | 'true -^ ReturnExpr' |
+| 167 | cfg.swift:167:3:167:25 | let xOptional | 'let xOptional -V xOptional -> Optional -> Int -^ GenericTypeExpr -> x' |
+| 168 | cfg.swift:168:3:172:3 | IfExpr | 'IfExpr -V xOptional -^ PatternGuardExpr' |
+| 168 | cfg.swift:168:11:168:11 | . | '. -^ ... .some -> Argument -V x -^ ExprPattern -^ ... .some(...) -> Block' |
+| 169 | cfg.swift:169:12:169:12 | x | 'x -> 0 -^ ... == ... -^ ReturnExpr' |
+| 170 | cfg.swift:170:10:172:3 | Block | 'Block' |
+| 171 | cfg.swift:171:12:171:16 | false | 'false -^ ReturnExpr' |
+| 175 | cfg.swift:175:1:193:1 | func testDefer | 'func testDefer -V testDefer' |
+| 175 | cfg.swift:175:16:175:16 | x | 'x -> Block' |
+| 177 | cfg.swift:177:3:179:3 | DeferStmt | 'DeferStmt' |
+| 177 | cfg.swift:177:9:179:3 | Block | 'Block' |
+| 178 | cfg.swift:178:5:178:9 | print | 'print -> Argument -V "6" -^ print(...)' |
+| 180 | cfg.swift:180:3:180:7 | print | 'print -> Argument -V "1" -^ print(...)' |
+| 181 | cfg.swift:181:3:181:7 | print | 'print -> Argument -V "2" -^ print(...)' |
+| 183 | cfg.swift:183:3:185:3 | DeferStmt | 'DeferStmt' |
+| 183 | cfg.swift:183:9:185:3 | Block | 'Block' |
+| 184 | cfg.swift:184:5:184:9 | print | 'print -> Argument -V "5" -^ print(...)' |
+| 187 | cfg.swift:187:3:192:3 | DeferStmt | 'DeferStmt -V Block' |
+| 188 | cfg.swift:188:5:188:9 | print | 'print -> Argument -V "3" -^ print(...)' |
+| 189 | cfg.swift:189:5:191:5 | DeferStmt | 'DeferStmt -V Block' |
+| 190 | cfg.swift:190:7:190:11 | print | 'print -> Argument -V "4" -^ print(...)' |
+| 195 | cfg.swift:195:1:207:1 | func m1 | 'func m1 -V m1' |
+| 195 | cfg.swift:195:9:195:9 | x | 'x -> Block' |
+| 196 | cfg.swift:196:3:206:3 | IfExpr | 'IfExpr -V x -> 2 -^ ... > ...' |
+| 196 | cfg.swift:196:12:198:3 | Block | 'Block' |
+| 197 | cfg.swift:197:5:197:9 | print | 'print -> Argument -V "x is greater than 2" -^ print(...)' |
+| 199 | cfg.swift:199:8:206:3 | IfExpr | 'IfExpr -V ... && ... -V ... && ... -V x -> 2 -^ ... <= ...' |
+| 200 | cfg.swift:200:13:200:13 | x | 'x -> 0 -^ ... > ...' |
+| 201 | cfg.swift:201:13:201:21 | ! ... | '! ... -V x -> 5 -^ ... == ...' |
+| 201 | cfg.swift:201:23:203:3 | Block | 'Block' |
+| 202 | cfg.swift:202:5:202:9 | print | 'print -> Argument -V "x is 1" -^ print(...)' |
+| 204 | cfg.swift:204:8:206:3 | Block | 'Block' |
+| 205 | cfg.swift:205:5:205:9 | print | 'print -> Argument -V "I can't guess the number" -^ print(...)' |
+| 209 | cfg.swift:209:1:214:1 | func m2 | 'func m2 -V m2' |
+| 209 | cfg.swift:209:9:209:9 | b | 'b' |
+| 209 | cfg.swift:209:20:209:24 | false | 'false' |
+| 209 | cfg.swift:209:34:214:1 | Block | 'Block' |
+| 210 | cfg.swift:210:3:212:3 | IfExpr | 'IfExpr -V b' |
+| 210 | cfg.swift:210:8:212:3 | Block | 'Block' |
+| 211 | cfg.swift:211:12:211:12 | 0 | '0 -^ ReturnExpr' |
+| 213 | cfg.swift:213:10:213:10 | 1 | '1 -^ ReturnExpr' |
+| 216 | cfg.swift:216:1:224:1 | func m3 | 'func m3 -V m3' |
+| 216 | cfg.swift:216:9:216:9 | x | 'x -> Block' |
+| 217 | cfg.swift:217:3:222:3 | IfExpr | 'IfExpr -V x -> 0 -^ ... < ...' |
+| 217 | cfg.swift:217:12:222:3 | Block | 'Block' |
+| 218 | cfg.swift:218:5:218:5 | x | 'x -> x -^ - ... -^ ... = ...' |
+| 219 | cfg.swift:219:5:221:5 | IfExpr | 'IfExpr -V x -> 10 -^ ... > ...' |
+| 219 | cfg.swift:219:15:221:5 | Block | 'Block' |
+| 220 | cfg.swift:220:7:220:7 | x | 'x -> x -> 1 -^ ... - ... -^ ... = ...' |
+| 223 | cfg.swift:223:10:223:10 | x | 'x -^ ReturnExpr' |
+| 226 | cfg.swift:226:1:232:1 | func m4 | 'func m4 -V m4' |
+| 226 | cfg.swift:226:10:226:11 | b1 | 'b1 -> b2 -> b3 -> Block' |
+| 227 | cfg.swift:227:3:231:20 | ReturnExpr | 'ReturnExpr' |
+| 227 | cfg.swift:227:10:231:20 | IfExpr | 'IfExpr -V IfExpr -V b1' |
+| 228 | cfg.swift:228:13:228:14 | b2 | 'b2' |
+| 229 | cfg.swift:229:13:229:14 | b3 | 'b3' |
+| 230 | cfg.swift:230:9:230:18 | "b2 \|\| b3" | '"b2 \|\| b3"' |
+| 231 | cfg.swift:231:9:231:20 | "!b2 \|\| !b3" | '"!b2 \|\| !b3"' |
+| 234 | cfg.swift:234:1:243:1 | func conversionsInSplitEntry | 'func conversionsInSplitEntry -V conversionsInSplitEntry' |
+| 234 | cfg.swift:234:31:234:31 | b | 'b -> Block' |
+| 235 | cfg.swift:235:3:242:3 | IfExpr | 'IfExpr -V IfExpr -V b' |
+| 236 | cfg.swift:236:8:236:11 | true | 'true' |
+| 237 | cfg.swift:237:7:237:10 | Bool | 'Bool -> Argument -V false -^ Bool(...)' |
+| 237 | cfg.swift:237:19:239:3 | Block | 'Block' |
+| 238 | cfg.swift:238:12:238:14 | "b" | '"b" -^ ReturnExpr' |
+| 240 | cfg.swift:240:8:242:3 | Block | 'Block' |
+| 241 | cfg.swift:241:12:241:15 | "!b" | '"!b" -^ ReturnExpr' |
+| 245 | cfg.swift:245:1:249:1 | func constant_condition | 'func constant_condition -V constant_condition' |
+| 245 | cfg.swift:245:27:249:1 | Block | 'Block' |
+| 246 | cfg.swift:246:3:248:3 | IfExpr | 'IfExpr -V ! ... -V true' |
+| 251 | cfg.swift:251:1:257:1 | func empty_else | 'func empty_else -V empty_else' |
+| 251 | cfg.swift:251:17:251:17 | b | 'b -> Block' |
+| 252 | cfg.swift:252:3:255:9 | IfExpr | 'IfExpr -V b' |
+| 252 | cfg.swift:252:8:254:3 | Block | 'Block' |
+| 253 | cfg.swift:253:5:253:9 | print | 'print -> Argument -V "true" -^ print(...)' |
+| 255 | cfg.swift:255:8:255:9 | Block | 'Block' |
+| 256 | cfg.swift:256:3:256:7 | print | 'print -> Argument -V "done" -^ print(...)' |
+| 259 | cfg.swift:259:1:263:1 | func disjunct | 'func disjunct -V disjunct' |
+| 259 | cfg.swift:259:16:259:17 | b1 | 'b1 -> b2 -> Block' |
+| 260 | cfg.swift:260:3:262:3 | IfExpr | 'IfExpr -V ... \|\| ... -V b1' |
+| 260 | cfg.swift:260:13:260:14 | b2 | 'b2' |
+| 260 | cfg.swift:260:17:262:3 | Block | 'Block' |
+| 261 | cfg.swift:261:5:261:9 | print | 'print -> Argument -V "b1 or b2" -^ print(...)' |
+| 265 | cfg.swift:265:1:282:1 | func binaryExprs | 'func binaryExprs -V binaryExprs' |
+| 265 | cfg.swift:265:18:265:18 | a | 'a -> b -> Block' |
+| 266 | cfg.swift:266:3:266:15 | let c | 'let c -V c -> a -> b -^ ... + ...' |
+| 267 | cfg.swift:267:3:267:15 | let d | 'let d -V d -> a -> b -^ ... - ...' |
+| 268 | cfg.swift:268:3:268:15 | let e | 'let e -V e -> a -> b -^ ... * ...' |
+| 269 | cfg.swift:269:3:269:15 | let f | 'let f -V f -> a -> b -^ ... / ...' |
+| 270 | cfg.swift:270:3:270:15 | let g | 'let g -V g -> a -> b -^ ... % ...' |
+| 271 | cfg.swift:271:3:271:15 | let h | 'let h -V h -> a -> b -^ ... & ...' |
+| 272 | cfg.swift:272:3:272:15 | let i | 'let i -V i -> a -> b -^ ... \| ...' |
+| 273 | cfg.swift:273:3:273:15 | let j | 'let j -V j -> a -> b -^ ... ^ ...' |
+| 274 | cfg.swift:274:3:274:16 | let k | 'let k -V k -> a -> b -^ ... << ...' |
+| 275 | cfg.swift:275:3:275:16 | let l | 'let l -V l -> a -> b -^ ... >> ...' |
+| 276 | cfg.swift:276:3:276:16 | let o | 'let o -V o -> a -> b -^ ... == ...' |
+| 277 | cfg.swift:277:3:277:16 | let p | 'let p -V p -> a -> b -^ ... != ...' |
+| 278 | cfg.swift:278:3:278:15 | let q | 'let q -V q -> a -> b -^ ... < ...' |
+| 279 | cfg.swift:279:3:279:16 | let r | 'let r -V r -> a -> b -^ ... <= ...' |
+| 280 | cfg.swift:280:3:280:15 | let s | 'let s -V s -> a -> b -^ ... > ...' |
+| 281 | cfg.swift:281:3:281:16 | let t | 'let t -V t -> a -> b -^ ... >= ...' |
+| 284 | cfg.swift:284:1:286:1 | func interpolatedString | 'func interpolatedString -V interpolatedString' |
+| 284 | cfg.swift:284:25:284:25 | x | 'x -> y -> Block' |
+| 285 | cfg.swift:285:11:285:10 |  | ' -> interpolation -> Argument -V x -^ interpolation(...) ->  +  -> interpolation -> Argument -V y -^ interpolation(...) ->  is equal to  -> interpolation -> Argument -V x -> y -^ ... + ... -^ interpolation(...) ->  and here is a zero:  -> interpolation -> Argument -V returnZero -^ returnZero(...) -^ interpolation(...) ->  -^ StringInterpolationExpr -^ ReturnExpr' |
+| 288 | cfg.swift:288:1:319:1 | func testSubscriptExpr | 'func testSubscriptExpr -V testSubscriptExpr' |
+| 288 | cfg.swift:288:55:319:1 | Block | 'Block' |
+| 289 | cfg.swift:289:3:289:44 | var a | 'var a -V a -> 0 -> 1 -> 2 -> 3 -> 4 -> 5 -> 6 -> 7 -> 8 -> 9 -> 10 -^ ArrayLiteral' |
+| 290 | cfg.swift:290:3:290:3 | a | 'a -> Argument -V 0 -^ a(...) -> 0 -^ ... = ...' |
+| 291 | cfg.swift:291:3:291:3 | a | 'a -> Argument -V 1 -^ a(...) -> 1 -^ ... += ...' |
+| 292 | cfg.swift:292:3:292:3 | a | 'a -> Argument -V 2 -^ a(...) -> 1 -^ ... -= ...' |
+| 293 | cfg.swift:293:3:293:3 | a | 'a -> Argument -V 3 -^ a(...) -> 1 -^ ... *= ...' |
+| 294 | cfg.swift:294:3:294:3 | a | 'a -> Argument -V 4 -^ a(...) -> 1 -^ ... /= ...' |
+| 295 | cfg.swift:295:3:295:3 | a | 'a -> Argument -V 5 -^ a(...) -> 1 -^ ... %= ...' |
+| 296 | cfg.swift:296:3:296:3 | a | 'a -> Argument -V 6 -^ a(...) -> 1 -^ ... &= ...' |
+| 297 | cfg.swift:297:3:297:3 | a | 'a -> Argument -V 7 -^ a(...) -> 1 -^ ... \|= ...' |
+| 298 | cfg.swift:298:3:298:3 | a | 'a -> Argument -V 8 -^ a(...) -> 1 -^ ... ^= ...' |
+| 299 | cfg.swift:299:3:299:3 | a | 'a -> Argument -V 9 -^ a(...) -> 1 -^ ... <<= ...' |
+| 300 | cfg.swift:300:3:300:3 | a | 'a -> Argument -V 10 -^ a(...) -> 1 -^ ... >>= ...' |
+| 302 | cfg.swift:302:3:302:49 | var tupleWithA | 'var tupleWithA -V tupleWithA -> Argument -V a -> Argument -V 0 -^ a(...) -> Argument -V a -> Argument -V 1 -^ a(...) -> Argument -V a -> Argument -V 2 -^ a(...) -> Argument -V a -> Argument -V 3 -^ a(...) -> Argument -V a -> Argument -V 4 -^ a(...) -^ TupleExpr' |
+| 304 | cfg.swift:304:3:304:48 | var b | 'var b -V b -> 0 -> 1 -> 2 -> 3 -> 4 -> 5 -> 6 -> 7 -> 8 -> 9 -> 10 -> 11 -^ ArrayLiteral' |
+| 305 | cfg.swift:305:3:305:3 | b | 'b -> Argument -V 0 -^ b(...) -> a -> Argument -V 10 -^ a(...) -^ ... = ...' |
+| 306 | cfg.swift:306:3:306:3 | b | 'b -> Argument -V 1 -^ b(...) -> b -> Argument -V 0 -^ b(...) -> 1 -^ ... + ... -^ ... = ...' |
+| 307 | cfg.swift:307:3:307:3 | b | 'b -> Argument -V 2 -^ b(...) -> b -> Argument -V 1 -^ b(...) -> 1 -^ ... - ... -^ ... = ...' |
+| 308 | cfg.swift:308:3:308:3 | b | 'b -> Argument -V 3 -^ b(...) -> b -> Argument -V 2 -^ b(...) -> 1 -^ ... * ... -^ ... = ...' |
+| 309 | cfg.swift:309:3:309:3 | b | 'b -> Argument -V 4 -^ b(...) -> b -> Argument -V 3 -^ b(...) -> 1 -^ ... / ... -^ ... = ...' |
+| 310 | cfg.swift:310:3:310:3 | b | 'b -> Argument -V 5 -^ b(...) -> b -> Argument -V 4 -^ b(...) -> 1 -^ ... % ... -^ ... = ...' |
+| 311 | cfg.swift:311:3:311:3 | b | 'b -> Argument -V 6 -^ b(...) -> b -> Argument -V 5 -^ b(...) -> 1 -^ ... & ... -^ ... = ...' |
+| 312 | cfg.swift:312:3:312:3 | b | 'b -> Argument -V 7 -^ b(...) -> b -> Argument -V 6 -^ b(...) -> 1 -^ ... \| ... -^ ... = ...' |
+| 313 | cfg.swift:313:3:313:3 | b | 'b -> Argument -V 8 -^ b(...) -> b -> Argument -V 7 -^ b(...) -> 1 -^ ... ^ ... -^ ... = ...' |
+| 314 | cfg.swift:314:3:314:3 | b | 'b -> Argument -V 9 -^ b(...) -> b -> Argument -V 8 -^ b(...) -> 1 -^ ... << ... -^ ... = ...' |
+| 315 | cfg.swift:315:3:315:3 | b | 'b -> Argument -V 10 -^ b(...) -> b -> Argument -V 9 -^ b(...) -> 1 -^ ... >> ... -^ ... = ...' |
+| 317 | cfg.swift:317:3:317:39 | let (pattern assignment) | 'let (pattern assignment) -V Argument -V a1 -> Argument -V a2 -> Argument -V a3 -> Argument -V a4 -> Argument -V a5 -^ TupleExpr -> tupleWithA' |
+| 318 | cfg.swift:318:11:318:19 | Argument | 'Argument -V a1 -> b -> Argument -V 0 -^ b(...) -^ ... + ... -> Argument -V a2 -> b -> Argument -V 1 -^ b(...) -^ ... + ... -> Argument -V a3 -> b -> Argument -V 2 -^ b(...) -^ ... + ... -> Argument -V a4 -> b -> Argument -V 3 -^ b(...) -^ ... + ... -> Argument -V a5 -> b -> Argument -V 4 -^ b(...) -^ ... + ... -^ TupleExpr -^ ReturnExpr' |
+| 321 | cfg.swift:321:1:326:1 | func loop1 | 'func loop1 -V loop1' |
+| 321 | cfg.swift:321:12:321:12 | x | 'x -> Block' |
+| 322 | cfg.swift:322:3:325:3 | WhileStmt | 'WhileStmt' |
+| 322 | cfg.swift:322:9:322:9 | x | 'x -> 0 -^ ... >= ...' |
+| 322 | cfg.swift:322:16:325:3 | Block | 'Block' |
+| 323 | cfg.swift:323:5:323:9 | print | 'print -> Argument -V x -^ print(...)' |
+| 324 | cfg.swift:324:5:324:5 | x | 'x -> 1 -^ ... -= ...' |
+| 328 | cfg.swift:328:1:341:1 | func loop2 | 'func loop2 -V loop2' |
+| 328 | cfg.swift:328:12:328:12 | x | 'x -> Block' |
+| 329 | cfg.swift:329:3:339:3 | WhileStmt | 'WhileStmt' |
+| 329 | cfg.swift:329:9:329:9 | x | 'x -> 0 -^ ... >= ...' |
+| 329 | cfg.swift:329:16:339:3 | Block | 'Block' |
+| 330 | cfg.swift:330:5:330:9 | print | 'print -> Argument -V x -^ print(...)' |
+| 331 | cfg.swift:331:5:331:5 | x | 'x -> 1 -^ ... -= ...' |
+| 332 | cfg.swift:332:5:337:5 | IfExpr | 'IfExpr -V x -> 100 -^ ... > ...' |
+| 332 | cfg.swift:332:16:334:5 | Block | 'Block' |
+| 333 | cfg.swift:333:7:333:11 | BreakExpr | 'BreakExpr' |
+| 335 | cfg.swift:335:10:337:5 | IfExpr | 'IfExpr -V x -> 50 -^ ... > ...' |
+| 335 | cfg.swift:335:20:337:5 | Block | 'Block' |
+| 336 | cfg.swift:336:7:336:14 | ContinueExpr | 'ContinueExpr' |
+| 338 | cfg.swift:338:5:338:9 | print | 'print -> Argument -V "Iter" -^ print(...)' |
+| 340 | cfg.swift:340:3:340:7 | print | 'print -> Argument -V "Done" -^ print(...)' |
+| 343 | cfg.swift:343:1:358:1 | func labeledLoop | 'func labeledLoop -V labeledLoop' |
+| 343 | cfg.swift:343:18:343:18 | x | 'x -> Block' |
+| 344 | cfg.swift:344:3:357:3 | LabeledStmt | 'LabeledStmt -V WhileStmt' |
+| 344 | cfg.swift:344:16:344:16 | x | 'x -> 0 -^ ... >= ...' |
+| 344 | cfg.swift:344:23:357:3 | Block | 'Block' |
+| 345 | cfg.swift:345:5:355:5 | LabeledStmt | 'LabeledStmt -V WhileStmt' |
+| 345 | cfg.swift:345:18:345:18 | x | 'x -> 0 -^ ... >= ...' |
+| 345 | cfg.swift:345:25:355:5 | Block | 'Block' |
+| 346 | cfg.swift:346:7:346:11 | print | 'print -> Argument -V x -^ print(...)' |
+| 347 | cfg.swift:347:7:347:7 | x | 'x -> 1 -^ ... -= ...' |
+| 348 | cfg.swift:348:7:353:7 | IfExpr | 'IfExpr -V x -> 100 -^ ... > ...' |
+| 348 | cfg.swift:348:18:350:7 | Block | 'Block' |
+| 349 | cfg.swift:349:9:349:19 | BreakExpr | 'BreakExpr' |
+| 351 | cfg.swift:351:12:353:7 | IfExpr | 'IfExpr -V x -> 50 -^ ... > ...' |
+| 351 | cfg.swift:351:22:353:7 | Block | 'Block' |
+| 352 | cfg.swift:352:9:352:22 | ContinueExpr | 'ContinueExpr' |
+| 354 | cfg.swift:354:7:354:11 | print | 'print -> Argument -V "Iter" -^ print(...)' |
+| 356 | cfg.swift:356:5:356:9 | print | 'print -> Argument -V "Done" -^ print(...)' |
+| 360 | cfg.swift:360:1:365:1 | func testRepeat | 'func testRepeat -V testRepeat' |
+| 360 | cfg.swift:360:17:360:17 | x | 'x -> Block' |
+| 361 | cfg.swift:361:3:364:16 | DoWhileStmt | 'DoWhileStmt' |
+| 361 | cfg.swift:361:10:364:3 | Block | 'Block' |
+| 362 | cfg.swift:362:5:362:9 | print | 'print -> Argument -V x -^ print(...)' |
+| 363 | cfg.swift:363:5:363:5 | x | 'x -> 1 -^ ... -= ...' |
+| 364 | cfg.swift:364:11:364:11 | x | 'x -> 0 -^ ... >= ...' |
+| 367 | cfg.swift:367:1:372:1 | func loop_with_identity_expr | 'func loop_with_identity_expr -V loop_with_identity_expr' |
+| 367 | cfg.swift:367:32:372:1 | Block | 'Block' |
+| 368 | cfg.swift:368:3:368:11 | var x | 'var x -V x -> 0' |
+| 369 | cfg.swift:369:3:371:3 | WhileStmt | 'WhileStmt' |
+| 369 | cfg.swift:369:9:369:9 | x | 'x -> 10 -^ ... < ...' |
+| 369 | cfg.swift:369:17:371:3 | Block | 'Block' |
+| 370 | cfg.swift:370:5:370:5 | x | 'x -> 1 -^ ... += ...' |
+| 374 | cfg.swift:374:1:383:1 | class OptionalC | 'class OptionalC -V OptionalC' |
+| 375 | cfg.swift:375:3:375:11 | let OptionalC.c | 'let OptionalC.c -V c -> Optional -> C -^ GenericTypeExpr' |
+| 376 | cfg.swift:376:3:378:3 | OptionalC.init | 'OptionalC.init' |
+| 376 | cfg.swift:376:8:376:10 | arg | 'arg -> Block' |
+| 377 | cfg.swift:377:5:377:5 | c | 'c -> arg -^ ... = ...' |
+| 380 | cfg.swift:380:3:382:3 | func OptionalC.getOptional | 'func OptionalC.getOptional -V getOptional' |
+| 380 | cfg.swift:380:28:382:3 | Block | 'Block' |
+| 381 | cfg.swift:381:12:381:12 | c | 'c -^ ReturnExpr' |
+| 385 | cfg.swift:385:1:387:1 | func testOptional | 'func testOptional -V testOptional' |
+| 385 | cfg.swift:385:19:385:19 | c | 'c -> Block' |
+| 386 | cfg.swift:386:10:386:10 | c | 'c -^ ... .getOptional -^ ... .getOptional(...) -^ ... .getMyInt -^ ... .getMyInt(...) -^ ReturnExpr' |
+| 389 | cfg.swift:389:1:393:1 | func testCapture | 'func testCapture -V testCapture' |
+| 389 | cfg.swift:389:18:389:18 | x | 'x -> y -> Block' |
+| 390 | cfg.swift:390:13:390:21 | z | 'z -V z -> x -> y -^ ... + ... -> t -V t -> "literal" -^ FunctionExpr -^ ReturnExpr' |
+| 391 | cfg.swift:391:5:391:12 | Block | 'Block -V z -^ ReturnExpr' |
+| 395 | cfg.swift:395:1:397:1 | func testTupleElement | 'func testTupleElement -V testTupleElement' |
+| 395 | cfg.swift:395:23:395:23 | t | 't -> Block' |
+| 396 | cfg.swift:396:10:396:10 | t | 't -^ ... .a -> t -^ ... .1 -^ ... + ... -> t -^ ... .c -^ ... + ... -> Argument -V 1 -> Argument -V 2 -> Argument -V 3 -^ TupleExpr -^ ... .0 -^ ... + ... -^ ReturnExpr' |
+| 399 | cfg.swift:399:1:403:1 | class Derived | 'class Derived -V Derived -> BaseType -V C' |
+| 400 | cfg.swift:400:3:402:3 | Derived.init | 'Derived.init' |
+| 400 | cfg.swift:400:10:402:3 | Block | 'Block' |
+| 401 | cfg.swift:401:5:401:9 | super | 'super -^ ... .init -> Argument -V 0 -^ ... .init(...)' |
+| 405 | cfg.swift:405:1:413:1 | func doWithoutCatch | 'func doWithoutCatch -V doWithoutCatch' |
+| 405 | cfg.swift:405:21:405:21 | x | 'x -> Block' |
+| 406 | cfg.swift:406:3:411:3 | TryExpr | 'TryExpr -V Block' |
+| 407 | cfg.swift:407:5:407:24 | try ... | 'try ...' |
+| 407 | cfg.swift:407:9:407:18 | mightThrow | 'mightThrow -> Argument -V 0 -^ mightThrow(...)' |
+| 408 | cfg.swift:408:5:408:9 | print | 'print -> Argument -V "Did not throw." -^ print(...)' |
+| 409 | cfg.swift:409:10:409:19 | mightThrow | 'mightThrow -> Argument -V 0 -^ mightThrow(...) -^ try! ...' |
+| 410 | cfg.swift:410:5:410:9 | print | 'print -> Argument -V "Still did not throw." -^ print(...)' |
+| 412 | cfg.swift:412:10:412:10 | 0 | '0 -^ ReturnExpr' |
+| 415 | cfg.swift:415:1:424:1 | class Structors | 'class Structors -V Structors' |
+| 416 | cfg.swift:416:3:416:16 | var Structors.field | 'var Structors.field -V field -> Int' |
+| 417 | cfg.swift:417:3:419:3 | Structors.init | 'Structors.init' |
+| 417 | cfg.swift:417:10:419:3 | Block | 'Block' |
+| 418 | cfg.swift:418:5:418:9 | field | 'field -> 10 -^ ... = ...' |
+| 421 | cfg.swift:421:3:423:3 | DestructorDeclaration | 'DestructorDeclaration' |
+| 421 | cfg.swift:421:10:423:3 | Block | 'Block' |
+| 422 | cfg.swift:422:5:422:9 | field | 'field -> 0 -^ ... = ...' |
+| 426 | cfg.swift:426:1:428:1 | func dictionaryLiteral | 'func dictionaryLiteral -V dictionaryLiteral' |
+| 426 | cfg.swift:426:24:426:24 | x | 'x -> y -> Block' |
+| 427 | cfg.swift:427:11:427:13 | "x" | '"x" -> x -^ KeyValuePair -> "y" -> y -^ KeyValuePair -^ MapLiteral -^ ReturnExpr' |
+| 430 | cfg.swift:430:1:453:1 | func localDeclarations | 'func localDeclarations -V localDeclarations' |
+| 430 | cfg.swift:430:33:453:1 | Block | 'Block' |
+| 431 | cfg.swift:431:3:436:3 | class MyLocalClass | 'class MyLocalClass -V MyLocalClass' |
+| 432 | cfg.swift:432:5:432:14 | var MyLocalClass.x | 'var MyLocalClass.x -V x -> Int' |
+| 433 | cfg.swift:433:5:435:5 | MyLocalClass.init | 'MyLocalClass.init' |
+| 433 | cfg.swift:433:12:435:5 | Block | 'Block' |
+| 434 | cfg.swift:434:7:434:7 | x | 'x -> 10 -^ ... = ...' |
+| 438 | cfg.swift:438:3:443:3 | struct MyLocalStruct | 'struct MyLocalStruct -V MyLocalStruct' |
+| 439 | cfg.swift:439:5:439:14 | var MyLocalStruct.x | 'var MyLocalStruct.x -V x -> Int' |
+| 440 | cfg.swift:440:5:442:5 | MyLocalStruct.init | 'MyLocalStruct.init' |
+| 440 | cfg.swift:440:12:442:5 | Block | 'Block' |
+| 441 | cfg.swift:441:7:441:7 | x | 'x -> 10 -^ ... = ...' |
+| 445 | cfg.swift:445:3:448:3 | enum MyLocalEnum | 'enum MyLocalEnum -V MyLocalEnum' |
+| 446 | cfg.swift:446:10:446:10 | MyLocalEnum.A | 'MyLocalEnum.A -V A' |
+| 447 | cfg.swift:447:10:447:10 | MyLocalEnum.B | 'MyLocalEnum.B -V B' |
+| 450 | cfg.swift:450:3:450:22 | var myLocalVar | 'var myLocalVar -V myLocalVar -> Int' |
+| 452 | cfg.swift:452:10:452:10 | 0 | '0 -^ ReturnExpr' |
+| 455 | cfg.swift:455:1:457:1 | struct B | 'struct B -V B' |
+| 456 | cfg.swift:456:3:456:13 | var B.x | 'var B.x -V x -> Int' |
+| 459 | cfg.swift:459:1:463:1 | struct A | 'struct A -V A' |
+| 460 | cfg.swift:460:3:460:11 | var A.b | 'var A.b -V b -> B' |
+| 461 | cfg.swift:461:3:461:14 | var A.bs | 'var A.bs -V bs -> Array -> B -^ GenericTypeExpr' |
+| 462 | cfg.swift:462:3:462:15 | var A.mayB | 'var A.mayB -V mayB -> Optional -> B -^ GenericTypeExpr' |
+| 465 | cfg.swift:465:1:475:1 | func test | 'func test -V test' |
+| 465 | cfg.swift:465:11:465:11 | a | 'a -> Block' |
+| 466 | cfg.swift:466:3:466:24 | var kpGet_b_x | 'var kpGet_b_x -V kpGet_b_x -> ' |
+| 467 | cfg.swift:467:3:467:31 | var kpGet_bs_0_x | 'var kpGet_bs_0_x -V kpGet_bs_0_x -> ' |
+| 468 | cfg.swift:468:3:468:37 | var kpGet_mayB_force_x | 'var kpGet_mayB_force_x -V kpGet_mayB_force_x -> ' |
+| 469 | cfg.swift:469:3:469:31 | var kpGet_mayB_x | 'var kpGet_mayB_x -V kpGet_mayB_x -> ' |
+| 471 | cfg.swift:471:3:471:45 | var apply_kpGet_b_x | 'var apply_kpGet_b_x -V apply_kpGet_b_x -> a -> Argument -V kpGet_b_x -^ a(...)' |
+| 472 | cfg.swift:472:3:472:51 | var apply_kpGet_bs_0_x | 'var apply_kpGet_bs_0_x -V apply_kpGet_bs_0_x -> a -> Argument -V kpGet_bs_0_x -^ a(...)' |
+| 473 | cfg.swift:473:3:473:63 | var apply_kpGet_mayB_force_x | 'var apply_kpGet_mayB_force_x -V apply_kpGet_mayB_force_x -> a -> Argument -V kpGet_mayB_force_x -^ a(...)' |
+| 474 | cfg.swift:474:3:474:51 | var apply_kpGet_mayB_x | 'var apply_kpGet_mayB_x -V apply_kpGet_mayB_x -> a -> Argument -V kpGet_mayB_x -^ a(...)' |
+| 477 | cfg.swift:477:1:504:1 | func testIfConfig | 'func testIfConfig -V testIfConfig' |
+| 477 | cfg.swift:477:21:504:1 | Block | 'Block' |
+| 478 | cfg.swift:478:1:484:6 |  | '' |
+| 486 | cfg.swift:486:3:486:3 | 5 | '5' |
+| 488 | cfg.swift:488:1:491:6 |  | '' |
+| 493 | cfg.swift:493:3:493:3 | 8 | '8' |
+| 495 | cfg.swift:495:1:501:6 |  | '' |
+| 503 | cfg.swift:503:3:503:4 | 13 | '13' |
+| 506 | cfg.swift:506:1:531:1 | func testAvailable | 'func testAvailable -V testAvailable' |
+| 506 | cfg.swift:506:29:531:1 | Block | 'Block' |
+| 507 | cfg.swift:507:3:507:11 | var x | 'var x -V x -> 0' |
+| 509 | cfg.swift:509:3:511:3 | IfExpr | 'IfExpr -V ' |
+| 509 | cfg.swift:509:30:511:3 | Block | 'Block' |
+| 510 | cfg.swift:510:5:510:5 | x | 'x -> 1 -^ ... += ...' |
+| 513 | cfg.swift:513:3:515:3 | IfExpr | 'IfExpr -V ' |
+| 513 | cfg.swift:513:33:515:3 | Block | 'Block' |
+| 514 | cfg.swift:514:5:514:5 | x | 'x -> 1 -^ ... += ...' |
+| 517 | cfg.swift:517:3:519:3 | IfExpr | 'IfExpr -V ' |
+| 517 | cfg.swift:517:49:519:3 | Block | 'Block' |
+| 518 | cfg.swift:518:5:518:5 | x | 'x -> 1 -^ ... += ...' |
+| 521 | cfg.swift:521:3:523:3 | GuardIfStmt | 'GuardIfStmt -V ' |
+| 521 | cfg.swift:521:38:523:3 | Block | 'Block' |
+| 522 | cfg.swift:522:5:522:5 | x | 'x -> 1 -^ ... += ...' |
+| 525 | cfg.swift:525:3:528:3 | IfExpr | 'IfExpr -V ... && ... -V ' |
+| 526 | cfg.swift:526:7:526:27 |  | '' |
+| 526 | cfg.swift:526:29:528:3 | Block | 'Block' |
+| 527 | cfg.swift:527:5:527:5 | x | 'x -> 1 -^ ... += ...' |
+| 530 | cfg.swift:530:10:530:10 | x | 'x -^ ReturnExpr' |
+| 533 | cfg.swift:533:1:547:1 | func testAsyncFor | 'func testAsyncFor -V testAsyncFor' |
+| 533 | cfg.swift:533:28:547:1 | Block | 'Block' |
+| 534 | cfg.swift:534:5:542:6 | var stream | 'var stream -V stream -> AsyncStream -> Argument -V Int -^ ... .self -> Argument -V . -^ ... .bufferingNewest -> Argument -V 5 -^ ... .bufferingNewest(...) -> Argument -V FunctionExpr -^ AsyncStream(...)' |
+| 535 | cfg.swift:535:9:535:20 | continuation | 'continuation' |
+| 536 | cfg.swift:536:13:541:13 | Block | 'Block -V Task -^ ... .detached -> Argument -V FunctionExpr -^ ... .detached(...)' |
+| 537 | cfg.swift:537:17:540:37 | Block | 'Block -V ForEachStmt -V 1 -> 100 -^ ... ... ...' |
+| 537 | cfg.swift:537:21:537:21 | i | 'i -> Block' |
+| 538 | cfg.swift:538:21:538:32 | continuation | 'continuation -^ ... .yield -> Argument -V i -^ ... .yield(...)' |
+| 540 | cfg.swift:540:17:540:28 | continuation | 'continuation -^ ... .finish -^ ... .finish(...)' |
+| 544 | cfg.swift:544:5:546:5 | ForEachStmt | 'ForEachStmt -V stream' |
+| 544 | cfg.swift:544:19:544:19 | i | 'i -> Block' |
+| 545 | cfg.swift:545:9:545:13 | print | 'print -> Argument -V i -^ print(...)' |
+| 549 | cfg.swift:549:1:553:1 | func testNilCoalescing | 'func testNilCoalescing -V testNilCoalescing' |
+| 549 | cfg.swift:549:24:549:24 | x | 'x -> Block' |
+| 550 | cfg.swift:550:3:552:9 | ReturnExpr | 'ReturnExpr' |
+| 551 | cfg.swift:551:5:552:9 | ... ?? ... | '... ?? ... -V x' |
+| 552 | cfg.swift:552:9:552:9 | 0 | '0' |
+| 555 | cfg.swift:555:1:562:1 | func testNilCoalescing2 | 'func testNilCoalescing2 -V testNilCoalescing2' |
+| 555 | cfg.swift:555:25:555:25 | x | 'x -> Block' |
+| 556 | cfg.swift:556:3:561:3 | IfExpr | 'IfExpr -V ... ?? ... -V x' |
+| 557 | cfg.swift:557:7:557:11 | false | 'false' |
+| 557 | cfg.swift:557:13:559:3 | Block | 'Block' |
+| 558 | cfg.swift:558:12:558:12 | 1 | '1 -^ ReturnExpr' |
+| 559 | cfg.swift:559:10:561:3 | Block | 'Block' |
+| 560 | cfg.swift:560:12:560:12 | 0 | '0 -^ ReturnExpr' |
+| 564 | cfg.swift:564:1:566:1 | func usesAutoclosure | 'func usesAutoclosure -V usesAutoclosure' |
+| 564 | cfg.swift:564:24:564:27 | expr | 'expr -> Block' |
+| 565 | cfg.swift:565:10:565:13 | expr | 'expr -^ expr(...) -^ ReturnExpr' |
+| 568 | cfg.swift:568:1:570:1 | func autoclosureTest | 'func autoclosureTest -V autoclosureTest' |
+| 568 | cfg.swift:568:24:570:1 | Block | 'Block' |
+| 569 | cfg.swift:569:3:569:17 | usesAutoclosure | 'usesAutoclosure -> Argument -V 1 -^ usesAutoclosure(...)' |
+| 574 | cfg.swift:574:1:576:1 | protocol MyProtocol | 'protocol MyProtocol -V MyProtocol' |
+| 575 | cfg.swift:575:2:575:1 | Block | 'Block' |
+| 575 | cfg.swift:575:2:575:21 | func MyProtocol.source | 'func MyProtocol.source -V source' |
+| 578 | cfg.swift:578:1:580:1 | class MyProcotolImpl | 'class MyProcotolImpl -V MyProcotolImpl -> BaseType -V MyProtocol' |
+| 579 | cfg.swift:579:2:579:34 | func MyProcotolImpl.source | 'func MyProcotolImpl.source -V source' |
+| 579 | cfg.swift:579:23:579:34 | Block | 'Block -V 0 -^ ReturnExpr' |
+| 582 | cfg.swift:582:1:582:62 | func getMyProtocol | 'func getMyProtocol -V getMyProtocol' |
+| 582 | cfg.swift:582:36:582:62 | Block | 'Block -V MyProcotolImpl -^ MyProcotolImpl(...) -^ ReturnExpr' |
+| 583 | cfg.swift:583:1:583:70 | func getMyProtocolImpl | 'func getMyProtocolImpl -V getMyProtocolImpl' |
+| 583 | cfg.swift:583:44:583:70 | Block | 'Block -V MyProcotolImpl -^ MyProcotolImpl(...) -^ ReturnExpr' |
+| 585 | cfg.swift:585:1:585:23 | func sink | 'func sink -V sink' |
+| 585 | cfg.swift:585:11:585:13 | arg | 'arg -> Block' |
+| 587 | cfg.swift:587:1:592:1 | func testOpenExistentialExpr | 'func testOpenExistentialExpr -V testOpenExistentialExpr' |
+| 587 | cfg.swift:587:30:587:30 | x | 'x -> y -> Block' |
+| 588 | cfg.swift:588:2:588:5 | sink | 'sink -> Argument -V x -^ ... .source -^ ... .source(...) -^ sink(...)' |
+| 589 | cfg.swift:589:2:589:5 | sink | 'sink -> Argument -V y -^ ... .source -^ ... .source(...) -^ sink(...)' |
+| 590 | cfg.swift:590:2:590:5 | sink | 'sink -> Argument -V getMyProtocol -^ getMyProtocol(...) -^ ... .source -^ ... .source(...) -^ sink(...)' |
+| 591 | cfg.swift:591:2:591:5 | sink | 'sink -> Argument -V getMyProtocolImpl -^ getMyProtocolImpl(...) -^ ... .source -^ ... .source(...) -^ sink(...)' |
+| 594 | cfg.swift:594:1:602:1 | func singleStmtExpr | 'func singleStmtExpr -V singleStmtExpr' |
+| 594 | cfg.swift:594:23:594:23 | x | 'x -> Block' |
+| 595 | cfg.swift:595:3:598:3 | let a | 'let a -V a -> SwitchExpr -V x' |
+| 596 | cfg.swift:596:5:596:17 | SwitchCase | 'SwitchCase -V 0 -> 5 -^ ... ..< ...' |
+| 596 | cfg.swift:596:17:596:17 | Block | 'Block -V 1' |
+| 597 | cfg.swift:597:5:597:14 | SwitchCase | 'SwitchCase -V Block -V 2' |
+| 599 | cfg.swift:599:3:601:18 | let b | 'let b -V b' |
+| 600 | cfg.swift:600:9:601:18 | IfExpr | 'IfExpr -V x -> 42 -^ ... < ...' |
+| 600 | cfg.swift:600:21:600:25 | Block | 'Block -V 1' |
+| 601 | cfg.swift:601:14:601:18 | Block | 'Block -V 2' |
+| 605 | cfg.swift:605:1:607:1 | struct ValueGenericsStruct | 'struct ValueGenericsStruct -V ValueGenericsStruct -> TypeParameter -V N -> Int' |
+| 606 | cfg.swift:606:5:606:13 | var ValueGenericsStruct.x | 'var ValueGenericsStruct.x -V x -> N' |
+| 609 | cfg.swift:609:1:613:1 | func valueGenericsFn | 'func valueGenericsFn -V valueGenericsFn' |
+| 609 | cfg.swift:609:36:609:40 | value | 'value -> Block' |
+| 610 | cfg.swift:610:5:610:13 | var x | 'var x -V x -> N' |
+| 611 | cfg.swift:611:5:611:9 | print | 'print -> Argument -V x -^ print(...)' |
+| 612 | cfg.swift:612:5:612:5 | _ | '_ -> value -^ ... = ...' |
diff --git a/unified/ql/test/library-tests/controlflow/basicblock-slices.ql b/unified/ql/test/library-tests/controlflow/basicblock-slices.ql
new file mode 100644
index 000000000000..1b57b4b5d5e2
--- /dev/null
+++ b/unified/ql/test/library-tests/controlflow/basicblock-slices.ql
@@ -0,0 +1,2 @@
+import unified
+import ControlFlow::TestCfgInline::BlockSlices
diff --git a/unified/ql/test/library-tests/controlflow/cfg.expected b/unified/ql/test/library-tests/controlflow/cfg.expected
new file mode 100644
index 000000000000..a2f876ffabff
--- /dev/null
+++ b/unified/ql/test/library-tests/controlflow/cfg.expected
@@ -0,0 +1,174 @@
+bbContinues
+| cfg.swift:177:3:177:3 | DeferStmt | 'DeferStmt goto print(+3)' |
+| cfg.swift:183:3:183:3 | DeferStmt | 'DeferStmt goto DeferStmt(+4)' |
+| cfg.swift:184:5:184:14 | print(...) | 'print(...) goto Block(-7)' |
+| cfg.swift:190:7:190:16 | print(...) | 'print(...) goto Block(-7)' |
+bbStep
+| cfg.swift:20:9:20:14 | ... >= ... | '... >= ... : false -> Block(+0)' |
+| cfg.swift:20:9:20:14 | ... >= ... | '... >= ... : true -> GuardIfStmt(+3)' |
+| cfg.swift:23:9:23:14 | ... <= ... | '... <= ... : false -> Block(+0)' |
+| cfg.swift:30:9:30:24 | mightThrow(...) | 'mightThrow(...) : exception -> CatchClause(+5)' |
+| cfg.swift:30:9:30:24 | mightThrow(...) | 'mightThrow(...) : successor -> try ...(+0)' |
+| cfg.swift:33:5:33:33 | print(...) | 'print(...) : successor -> 0(+11)' |
+| cfg.swift:35:11:35:60 | OrPattern | 'OrPattern : match -> Block(+0)' |
+| cfg.swift:35:11:35:60 | OrPattern | 'OrPattern : no-match -> CatchClause(+2)' |
+| cfg.swift:37:11:37:39 | ... .error3(...) | '... .error3(...) : match -> Block(+0)' |
+| cfg.swift:37:11:37:39 | ... .error3(...) | '... .error3(...) : no-match -> CatchClause(+2)' |
+| cfg.swift:39:11:39:20 |  | ' : match -> Block(+0)' |
+| cfg.swift:39:11:39:20 |  | ' : no-match -> CatchClause(+2)' |
+| cfg.swift:40:5:40:20 | print(...) | 'print(...) : successor -> 0(+4)' |
+| cfg.swift:42:5:42:35 | print(...) | 'print(...) : successor -> 0(+2)' |
+| cfg.swift:140:12:140:17 | ... ... ... | '... ... ... : empty -> ForEachStmt(+3)' |
+| cfg.swift:140:12:140:17 | ... ... ... | '... ... ... : non-empty -> _(+0)' |
+| cfg.swift:141:9:141:12 | Block | 'Block : successor -> ForEachStmt(+2)' |
+| cfg.swift:141:9:141:12 | Block | 'Block : successor -> _(-1)' |
+| cfg.swift:143:12:143:17 | ... ... ... | '... ... ... : empty -> SwitchExpr(+4)' |
+| cfg.swift:143:12:143:17 | ... ... ... | '... ... ... : non-empty -> y(+0)' |
+| cfg.swift:143:25:143:30 | ... != ... | '... != ... : false -> SwitchExpr(+4)' |
+| cfg.swift:143:25:143:30 | ... != ... | '... != ... : false -> y(+0)' |
+| cfg.swift:143:25:143:30 | ... != ... | '... != ... : true -> Block(+0)' |
+| cfg.swift:144:5:144:12 | print(...) | 'print(...) : successor -> SwitchExpr(+3)' |
+| cfg.swift:144:5:144:12 | print(...) | 'print(...) : successor -> y(-1)' |
+| cfg.swift:148:10:148:13 | OrPattern | 'OrPattern : match -> Block(+1)' |
+| cfg.swift:148:10:148:13 | OrPattern | 'OrPattern : no-match -> SwitchCase(+3)' |
+| cfg.swift:151:10:151:10 | ConditionalPattern | 'ConditionalPattern : match -> Block(+3)' |
+| cfg.swift:151:10:151:10 | ConditionalPattern | 'ConditionalPattern : no-match -> SwitchCase(+4)' |
+| cfg.swift:152:10:152:15 | ... >= ... | '... >= ... : false -> x(-1)' |
+| cfg.swift:152:10:152:15 | ... >= ... | '... >= ... : true -> x(+1)' |
+| cfg.swift:153:13:153:17 | ... < ... | '... < ... : successor -> x(-2)' |
+| cfg.swift:155:10:155:11 | 42 | '42 : match -> Block(+1)' |
+| cfg.swift:155:10:155:11 | 42 | '42 : no-match -> SwitchCase(+3)' |
+| cfg.swift:157:7:157:17 |  | ' : successor -> var obj(+5)' |
+| cfg.swift:159:11:159:16 | ... > ... | '... > ... : false -> var obj(+3)' |
+| cfg.swift:159:11:159:16 | ... > ... | '... > ... : true -> Block(+0)' |
+| cfg.swift:163:6:163:13 | TypeTestExpr | 'TypeTestExpr : false -> let xOptional(+4)' |
+| cfg.swift:163:6:163:13 | TypeTestExpr | 'TypeTestExpr : true -> Block(+0)' |
+| cfg.swift:168:6:168:34 | PatternGuardExpr | 'PatternGuardExpr : false -> Block(+2)' |
+| cfg.swift:168:6:168:34 | PatternGuardExpr | 'PatternGuardExpr : true -> .(+0)' |
+| cfg.swift:196:6:196:10 | ... > ... | '... > ... : false -> IfExpr(+3)' |
+| cfg.swift:196:6:196:10 | ... > ... | '... > ... : true -> Block(+0)' |
+| cfg.swift:199:11:199:16 | ... <= ... | '... <= ... : false,false,false -> Block(+5)' |
+| cfg.swift:199:11:199:16 | ... <= ... | '... <= ... : true -> x(+1)' |
+| cfg.swift:200:13:200:17 | ... > ... | '... > ... : false,false,false -> Block(+4)' |
+| cfg.swift:200:13:200:17 | ... > ... | '... > ... : true -> ! ...(+1)' |
+| cfg.swift:201:15:201:20 | ... == ... | '... == ... : false -> Block(+0)' |
+| cfg.swift:201:15:201:20 | ... == ... | '... == ... : true,false -> Block(+3)' |
+| cfg.swift:209:9:209:9 | b | 'b : match -> Block(+0)' |
+| cfg.swift:209:9:209:9 | b | 'b : no-match -> false(+0)' |
+| cfg.swift:209:20:209:24 | false | 'false : successor -> Block(+0)' |
+| cfg.swift:210:6:210:6 | b | 'b : false -> 1(+3)' |
+| cfg.swift:210:6:210:6 | b | 'b : true -> Block(+0)' |
+| cfg.swift:217:6:217:10 | ... < ... | '... < ... : false -> x(+6)' |
+| cfg.swift:217:6:217:10 | ... < ... | '... < ... : true -> Block(+0)' |
+| cfg.swift:219:8:219:13 | ... > ... | '... > ... : false -> x(+4)' |
+| cfg.swift:219:8:219:13 | ... > ... | '... > ... : true -> Block(+0)' |
+| cfg.swift:220:7:220:15 | ... = ... | '... = ... : successor -> x(+3)' |
+| cfg.swift:227:11:227:12 | b1 | 'b1 : false -> b3(+2)' |
+| cfg.swift:227:11:227:12 | b1 | 'b1 : true -> b2(+1)' |
+| cfg.swift:228:13:228:14 | b2 | 'b2 : false,false -> "!b2 \|\| !b3"(+3)' |
+| cfg.swift:228:13:228:14 | b2 | 'b2 : true,true -> "b2 \|\| b3"(+2)' |
+| cfg.swift:229:13:229:14 | b3 | 'b3 : false,false -> "!b2 \|\| !b3"(+2)' |
+| cfg.swift:229:13:229:14 | b3 | 'b3 : true,true -> "b2 \|\| b3"(+1)' |
+| cfg.swift:230:9:230:18 | "b2 \|\| b3" | '"b2 \|\| b3" : successor -> ReturnExpr(-3)' |
+| cfg.swift:231:9:231:20 | "!b2 \|\| !b3" | '"!b2 \|\| !b3" : successor -> ReturnExpr(-4)' |
+| cfg.swift:235:6:235:6 | b | 'b : false -> Bool(+2)' |
+| cfg.swift:235:6:235:6 | b | 'b : true -> true(+1)' |
+| cfg.swift:236:8:236:11 | true | 'true : true -> Block(+1)' |
+| cfg.swift:237:7:237:17 | Bool(...) | 'Bool(...) : false -> Block(+3)' |
+| cfg.swift:237:7:237:17 | Bool(...) | 'Bool(...) : true,true -> Block(+0)' |
+| cfg.swift:252:6:252:6 | b | 'b : false -> Block(+3)' |
+| cfg.swift:252:6:252:6 | b | 'b : true -> Block(+0)' |
+| cfg.swift:253:5:253:17 | print(...) | 'print(...) : successor -> print(+3)' |
+| cfg.swift:255:8:255:9 | Block | 'Block : successor -> print(+1)' |
+| cfg.swift:260:7:260:8 | b1 | 'b1 : false -> b2(+0)' |
+| cfg.swift:260:7:260:8 | b1 | 'b1 : true,true -> Block(+0)' |
+| cfg.swift:260:13:260:14 | b2 | 'b2 : true,true -> Block(+0)' |
+| cfg.swift:322:3:322:3 | WhileStmt | 'WhileStmt : successor -> x(+0)' |
+| cfg.swift:322:9:322:14 | ... >= ... | '... >= ... : true -> Block(+0)' |
+| cfg.swift:324:5:324:10 | ... -= ... | '... -= ... : successor -> x(-2)' |
+| cfg.swift:329:3:329:3 | WhileStmt | 'WhileStmt : successor -> x(+0)' |
+| cfg.swift:329:9:329:14 | ... >= ... | '... >= ... : false -> print(+11)' |
+| cfg.swift:329:9:329:14 | ... >= ... | '... >= ... : true -> Block(+0)' |
+| cfg.swift:332:8:332:14 | ... > ... | '... > ... : false -> IfExpr(+3)' |
+| cfg.swift:332:8:332:14 | ... > ... | '... > ... : true -> Block(+0)' |
+| cfg.swift:333:7:333:11 | BreakExpr | 'BreakExpr : break -> print(+7)' |
+| cfg.swift:335:13:335:18 | ... > ... | '... > ... : false -> print(+3)' |
+| cfg.swift:335:13:335:18 | ... > ... | '... > ... : true -> Block(+0)' |
+| cfg.swift:336:7:336:14 | ContinueExpr | 'ContinueExpr : continue -> x(-7)' |
+| cfg.swift:338:5:338:17 | print(...) | 'print(...) : successor -> x(-9)' |
+| cfg.swift:344:10:344:10 | WhileStmt | 'WhileStmt : successor -> x(+0)' |
+| cfg.swift:344:16:344:21 | ... >= ... | '... >= ... : true -> Block(+0)' |
+| cfg.swift:345:12:345:12 | WhileStmt | 'WhileStmt : successor -> x(+0)' |
+| cfg.swift:345:18:345:23 | ... >= ... | '... >= ... : false -> print(+11)' |
+| cfg.swift:345:18:345:23 | ... >= ... | '... >= ... : true -> Block(+0)' |
+| cfg.swift:348:10:348:16 | ... > ... | '... > ... : false -> IfExpr(+3)' |
+| cfg.swift:348:10:348:16 | ... > ... | '... > ... : true -> Block(+0)' |
+| cfg.swift:351:15:351:20 | ... > ... | '... > ... : false -> print(+3)' |
+| cfg.swift:351:15:351:20 | ... > ... | '... > ... : true -> Block(+0)' |
+| cfg.swift:352:9:352:22 | ContinueExpr | 'ContinueExpr : continue -> x(-7)' |
+| cfg.swift:354:7:354:19 | print(...) | 'print(...) : successor -> x(-9)' |
+| cfg.swift:356:5:356:17 | print(...) | 'print(...) : successor -> x(-12)' |
+| cfg.swift:361:3:361:3 | DoWhileStmt | 'DoWhileStmt : successor -> Block(+0)' |
+| cfg.swift:364:11:364:16 | ... >= ... | '... >= ... : true -> Block(-3)' |
+| cfg.swift:369:3:369:3 | WhileStmt | 'WhileStmt : successor -> x(+0)' |
+| cfg.swift:369:9:369:14 | ... < ... | '... < ... : true -> Block(+0)' |
+| cfg.swift:370:5:370:10 | ... += ... | '... += ... : successor -> x(-1)' |
+| cfg.swift:407:9:407:24 | mightThrow(...) | 'mightThrow(...) : successor -> try ...(+0)' |
+| cfg.swift:509:6:509:28 |  | ' : false -> IfExpr(+4)' |
+| cfg.swift:509:6:509:28 |  | ' : true -> Block(+0)' |
+| cfg.swift:510:5:510:10 | ... += ... | '... += ... : successor -> IfExpr(+3)' |
+| cfg.swift:513:6:513:31 |  | ' : false -> IfExpr(+4)' |
+| cfg.swift:513:6:513:31 |  | ' : true -> Block(+0)' |
+| cfg.swift:514:5:514:10 | ... += ... | '... += ... : successor -> IfExpr(+3)' |
+| cfg.swift:517:6:517:47 |  | ' : false -> GuardIfStmt(+4)' |
+| cfg.swift:517:6:517:47 |  | ' : true -> Block(+0)' |
+| cfg.swift:518:5:518:10 | ... += ... | '... += ... : successor -> GuardIfStmt(+3)' |
+| cfg.swift:521:9:521:31 |  | ' : false -> Block(+0)' |
+| cfg.swift:521:9:521:31 |  | ' : true -> IfExpr(+4)' |
+| cfg.swift:522:5:522:10 | ... += ... | '... += ... : successor -> IfExpr(+3)' |
+| cfg.swift:525:6:525:28 |  | ' : false,false -> x(+5)' |
+| cfg.swift:525:6:525:28 |  | ' : true -> (+1)' |
+| cfg.swift:526:7:526:27 |  | ' : false,false -> x(+4)' |
+| cfg.swift:526:7:526:27 |  | ' : true -> Block(+0)' |
+| cfg.swift:527:5:527:10 | ... += ... | '... += ... : successor -> x(+3)' |
+| cfg.swift:537:26:537:32 | ... ... ... | '... ... ... : empty -> continuation(+3)' |
+| cfg.swift:537:26:537:32 | ... ... ... | '... ... ... : non-empty -> i(+0)' |
+| cfg.swift:538:21:538:41 | ... .yield(...) | '... .yield(...) : successor -> continuation(+2)' |
+| cfg.swift:538:21:538:41 | ... .yield(...) | '... .yield(...) : successor -> i(-1)' |
+| cfg.swift:544:24:544:29 | stream | 'stream : non-empty -> i(+0)' |
+| cfg.swift:545:9:545:16 | print(...) | 'print(...) : successor -> i(-1)' |
+| cfg.swift:551:5:551:5 | x | 'x : non-null -> ReturnExpr(-1)' |
+| cfg.swift:551:5:551:5 | x | 'x : null -> 0(+1)' |
+| cfg.swift:552:9:552:9 | 0 | '0 : successor -> ReturnExpr(-2)' |
+| cfg.swift:556:6:556:6 | x | 'x : non-null,false -> Block(+3)' |
+| cfg.swift:556:6:556:6 | x | 'x : non-null,true -> Block(+1)' |
+| cfg.swift:556:6:556:6 | x | 'x : null -> false(+1)' |
+| cfg.swift:557:7:557:11 | false | 'false : false -> Block(+2)' |
+| cfg.swift:596:10:596:14 | ... ..< ... | '... ..< ... : match -> Block(+0)' |
+| cfg.swift:596:10:596:14 | ... ..< ... | '... ..< ... : no-match -> SwitchCase(+1)' |
+| cfg.swift:596:17:596:17 | 1 | '1 : successor -> let b(+3)' |
+| cfg.swift:597:14:597:14 | 2 | '2 : successor -> let b(+2)' |
+| cfg.swift:600:13:600:18 | ... < ... | '... < ... : false -> Block(+1)' |
+| cfg.swift:600:13:600:18 | ... < ... | '... < ... : true -> Block(+0)' |
+noCfg
+| cfg.swift:47:42:47:47 | String |
+| cfg.swift:53:34:53:34 | _ |
+| cfg.swift:60:34:60:34 | _ |
+| cfg.swift:77:34:77:33 | Optional |
+| cfg.swift:83:21:83:23 | Int |
+| cfg.swift:106:22:106:24 | Int |
+| cfg.swift:150:7:150:17 | ReturnExpr |
+| cfg.swift:247:5:247:9 | print |
+| cfg.swift:288:29:288:53 | TupleExpr |
+| cfg.swift:380:25:380:24 | Optional |
+| cfg.swift:389:45:389:47 | Int |
+| cfg.swift:400:3:400:6 | init |
+| cfg.swift:417:3:417:6 | init |
+| cfg.swift:430:29:430:31 | Int |
+| cfg.swift:433:5:433:8 | init |
+| cfg.swift:440:5:440:8 | init |
+| cfg.swift:506:25:506:27 | Int |
+| cfg.swift:564:49:564:51 | Int |
+nonSimple
+| cfg.swift:12:17:12:25 | withParam | 'withParam -? Block' |
+| cfg.swift:35:5:35:5 | CatchClause | 'CatchClause -V MyError -^ ... .error1 -> isZero -> Argument -V x -^ isZero(...) -? MyError -^ ... .error2 -^ ConditionalPattern -^ OrPattern' |
diff --git a/unified/ql/test/library-tests/controlflow/cfg.ql b/unified/ql/test/library-tests/controlflow/cfg.ql
new file mode 100644
index 000000000000..e86a681954e8
--- /dev/null
+++ b/unified/ql/test/library-tests/controlflow/cfg.ql
@@ -0,0 +1,2 @@
+import unified
+import ControlFlow::TestCfgInline
diff --git a/unified/ql/test/library-tests/controlflow/cfg.qlref b/unified/ql/test/library-tests/controlflow/cfg.qlref
new file mode 100644
index 000000000000..d1b031838715
--- /dev/null
+++ b/unified/ql/test/library-tests/controlflow/cfg.qlref
@@ -0,0 +1,2 @@
+query: cfg.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/unified/ql/test/library-tests/controlflow/cfg.swift b/unified/ql/test/library-tests/controlflow/cfg.swift
new file mode 100644
index 000000000000..cbd54f5bdc4f
--- /dev/null
+++ b/unified/ql/test/library-tests/controlflow/cfg.swift
@@ -0,0 +1,613 @@
+var topLevelDecl : Int = 0
+0
+topLevelDecl + 1
+
+func returnZero() -> Int { return 0 }
+
+returnZero()
+Double(topLevelDecl)
+
+enum MyError: Error {
+    case error1, error2
+    case error3(withParam: Int) // $ nonSimple='withParam -? Block'
+}
+
+func isZero(x : Int) -> Bool {
+  return x == 0
+}
+
+func mightThrow(x : Int) throws -> Void {
+  guard x >= 0 else { // $ bbStep='... >= ... : false -> Block(+0)' bbStep='... >= ... : true -> GuardIfStmt(+3)'
+    throw MyError.error1
+  }
+  guard x <= 0 else { // $ bbStep='... <= ... : false -> Block(+0)'
+    throw MyError.error3(withParam: x + 1)
+  }
+}
+
+func tryCatch(x : Int) -> Int {
+  do {
+    try mightThrow(x: 0) // $ bbStep='mightThrow(...) : exception -> CatchClause(+5)' bbStep='mightThrow(...) : successor -> try ...(+0)'
+    print("Did not throw.")
+    try! mightThrow(x: 0)
+    print("Still did not throw.") // $ bbStep='print(...) : successor -> 0(+11)'
+
+  } catch MyError.error1 , MyError.error2 where isZero(x: x) { // $ bbStep='OrPattern : match -> Block(+0)' bbStep='OrPattern : no-match -> CatchClause(+2)' nonSimple='CatchClause -V MyError -^ ... .error1 -> isZero -> Argument -V x -^ isZero(...) -? MyError -^ ... .error2 -^ ConditionalPattern -^ OrPattern'
+    return 0
+  } catch MyError.error3(let withParam) { // $ bbStep='... .error3(...) : match -> Block(+0)' bbStep='... .error3(...) : no-match -> CatchClause(+2)'
+    return withParam
+  } catch is MyError { // $ bbStep=' : match -> Block(+0)' bbStep=' : no-match -> CatchClause(+2)'
+    print("MyError") // $ bbStep='print(...) : successor -> 0(+4)'
+  } catch {
+    print("Unknown error \(error)") // $ bbStep='print(...) : successor -> 0(+2)'
+  }
+  return 0
+}
+
+func createClosure1(s : String) -> () -> String { // $ noCfg
+  return {
+    return s + ""
+  }
+}
+
+func createClosure2(x : Int) -> (_ : Int) -> Int { // $ noCfg
+  func f(y : Int) -> Int {
+    return x + y
+  }
+  return f
+}
+
+func createClosure3(x : Int) -> (_ : Int) -> Int { // $ noCfg
+  return {
+    (y) -> Int in x + y
+  }
+}
+
+func callClosures() {
+  var x1 = createClosure1(s: "")()
+  var x2 = createClosure2(x: 0)(10)
+  var x3 = createClosure3(x: 0)(10)
+}
+
+func maybeParseInt(s : String) -> Int? {
+  var n : Int? = Int(s)
+  return n
+}
+
+func forceAndBackToOptional() -> Int? { // $ noCfg
+  var nBang = maybeParseInt(s:"42")!
+  var n = maybeParseInt(s:"42")
+  return nBang + n!
+}
+
+func testInOut() -> Int { // $ noCfg
+  var temp = 10
+
+  func add(a: inout Int) {
+    a = a + 1
+  }
+
+  func addOptional(a: inout Int?) {
+    a = nil
+  }
+
+  add(a:&temp)
+  var tempOptional : Int? = 10
+  addOptional(a:&tempOptional)
+  return temp + tempOptional!
+}
+
+class C {
+  let myInt: Int
+  init(n: Int) {
+    myInt = n
+  }
+
+  func getMyInt() -> Int { // $ noCfg
+    return myInt
+  }
+}
+
+func testMemberRef(param : C, inoutParam : inout C, opt : C?) {
+  let c = C(n: 42)
+  let n1 = c.myInt
+  let n2 = c.self.myInt
+  let n3 = c.getMyInt()
+  let n4 = c.self.getMyInt()
+  let n5 = param.myInt
+  let n6 = param.self.myInt
+
+  let n8 = param.self.getMyInt()
+
+  let n9 = inoutParam.myInt
+  let n7 = param.getMyInt()
+  let n10 = inoutParam.self.myInt
+  let n11 = inoutParam.getMyInt()
+  let n12 = inoutParam.self.getMyInt()
+
+  let n13 = opt!.myInt
+  let n14 = opt!.self.myInt
+  let n15 = opt!.getMyInt()
+  let n16 = opt!.self.getMyInt()
+
+  let n17 = opt?.myInt
+  let n18 = opt?.self.myInt
+  let n19 = opt?.getMyInt()
+  let n20 = opt?.self.getMyInt()
+}
+
+func patterns(x : Int) -> Bool {
+  for _ in 0...10 // $ bbStep='... ... ... : empty -> ForEachStmt(+3)' bbStep='... ... ... : non-empty -> _(+0)'
+        {  } // $ bbStep='Block : successor -> _(-1)' bbStep='Block : successor -> ForEachStmt(+2)'
+
+  for y in 0...10 where y != 5 { // $ bbStep='... ... ... : empty -> SwitchExpr(+4)' bbStep='... ... ... : non-empty -> y(+0)' bbStep='... != ... : false -> SwitchExpr(+4)' bbStep='... != ... : false -> y(+0)' bbStep='... != ... : true -> Block(+0)'
+    print(y) // $ bbStep='print(...) : successor -> SwitchExpr(+3)' bbStep='print(...) : successor -> y(-1)'
+  }
+
+  switch x {
+    case 0, 1: // $ bbStep='OrPattern : match -> Block(+1)' bbStep='OrPattern : no-match -> SwitchCase(+3)'
+      return true
+      return true // $ noCfg
+    case x where // $ bbStep='ConditionalPattern : match -> Block(+3)' bbStep='ConditionalPattern : no-match -> SwitchCase(+4)'
+        (x >= 2) && // $ bbStep='... >= ... : false -> x(-1)' bbStep='... >= ... : true -> x(+1)'
+            x < 5: // $ bbStep='... < ... : successor -> x(-2)'
+      return true
+    case 42: // $ bbStep='42 : match -> Block(+1)' bbStep='42 : no-match -> SwitchCase(+3)'
+      print("42!")
+      fallthrough // $ bbStep=' : successor -> var obj(+5)'
+    default:
+      if (x > 10) { return false } // $ bbStep='... > ... : false -> var obj(+3)' bbStep='... > ... : true -> Block(+0)'
+  }
+
+  var obj : AnyObject = C(n: x)
+  if obj is C { // $ bbStep='TypeTestExpr : false -> let xOptional(+4)' bbStep='TypeTestExpr : true -> Block(+0)'
+    return true
+  }
+
+  let xOptional: Int? = x
+  if case .some(let x) = xOptional { // $ bbStep='PatternGuardExpr : false -> Block(+2)' bbStep='PatternGuardExpr : true -> .(+0)'
+    return x == 0
+  } else {
+    return false
+  }
+}
+
+func testDefer(x : inout Int) {
+  // Will print 1, 2, 3, 4, 5, 6
+  defer { // $ bbContinues='DeferStmt goto print(+3)'
+    print("6")
+  }
+  print("1")
+  print("2")
+
+  defer { // $ bbContinues='DeferStmt goto DeferStmt(+4)'
+    print("5") // $ bbContinues='print(...) goto Block(-7)'
+  }
+
+  defer {
+    print("3")
+    defer {
+      print("4") // $ bbContinues='print(...) goto Block(-7)'
+    }
+  }
+}
+
+func m1(x : Int) {
+  if x > 2 { // $ bbStep='... > ... : false -> IfExpr(+3)' bbStep='... > ... : true -> Block(+0)'
+    print("x is greater than 2")
+  }
+  else if x <= 2 && // $ bbStep='... <= ... : false,false,false -> Block(+5)' bbStep='... <= ... : true -> x(+1)'
+            x > 0 && // $ bbStep='... > ... : false,false,false -> Block(+4)' bbStep='... > ... : true -> ! ...(+1)'
+            !(x == 5) { // $ bbStep='... == ... : false -> Block(+0)' bbStep='... == ... : true,false -> Block(+3)'
+    print("x is 1")
+  }
+  else {
+    print("I can't guess the number")
+  }
+}
+
+func m2(b : Bool = false) -> Int { // $ bbStep='b : match -> Block(+0)' bbStep='b : no-match -> false(+0)' bbStep='false : successor -> Block(+0)'
+  if b { // $ bbStep='b : false -> 1(+3)' bbStep='b : true -> Block(+0)'
+    return 0
+  }
+  return 1
+}
+
+func m3(x : inout Int) -> Int {
+  if x < 0 { // $ bbStep='... < ... : false -> x(+6)' bbStep='... < ... : true -> Block(+0)'
+    x = -x
+    if x > 10 { // $ bbStep='... > ... : false -> x(+4)' bbStep='... > ... : true -> Block(+0)'
+      x = x - 1 // $ bbStep='... = ... : successor -> x(+3)'
+    }
+  }
+  return x
+}
+
+func m4 (b1 : Bool, b2 : Bool, b3 : Bool) -> String {
+  return (b1 ? // $ bbStep='b1 : false -> b3(+2)' bbStep='b1 : true -> b2(+1)'
+            b2 : // $ bbStep='b2 : false,false -> "!b2 \|\| !b3"(+3)' bbStep='b2 : true,true -> "b2 \|\| b3"(+2)'
+            b3) ? // $ bbStep='b3 : false,false -> "!b2 \|\| !b3"(+2)' bbStep='b3 : true,true -> "b2 \|\| b3"(+1)'
+        "b2 || b3" : // $ bbStep='"b2 \|\| b3" : successor -> ReturnExpr(-3)'
+        "!b2 || !b3" // $ bbStep='"!b2 \|\| !b3" : successor -> ReturnExpr(-4)'
+}
+
+func conversionsInSplitEntry (b : Bool) -> String {
+  if b ? // $ bbStep='b : false -> Bool(+2)' bbStep='b : true -> true(+1)'
+      (true) : // $ bbStep='true : true -> Block(+1)'
+      Bool(false) { // $ bbStep='Bool(...) : false -> Block(+3)' bbStep='Bool(...) : true,true -> Block(+0)'
+    return "b"
+  }
+  else {
+    return "!b"
+  }
+}
+
+func constant_condition() {
+  if !true {
+    print("Impossible") // $ noCfg
+  }
+}
+
+func empty_else(b : Bool) {
+  if b { // $ bbStep='b : false -> Block(+3)' bbStep='b : true -> Block(+0)'
+    print("true") // $ bbStep='print(...) : successor -> print(+3)'
+  }
+  else {} // $ bbStep='Block : successor -> print(+1)'
+  print("done")
+}
+
+func disjunct (b1 : Bool, b2 : Bool) {
+  if (b1 || b2) { // $ bbStep='b1 : false -> b2(+0)' bbStep='b1 : true,true -> Block(+0)' bbStep='b2 : true,true -> Block(+0)'
+    print("b1 or b2")
+  }
+}
+
+func binaryExprs(a : Int, b : Int) {
+  let c = a + b
+  let d = a - b
+  let e = a * b
+  let f = a / b
+  let g = a % b
+  let h = a & b
+  let i = a | b
+  let j = a ^ b
+  let k = a << b
+  let l = a >> b
+  let o = a == b
+  let p = a != b
+  let q = a < b
+  let r = a <= b
+  let s = a > b
+  let t = a >= b
+}
+
+func interpolatedString(x : Int, y : Int) -> String {
+  return "\(x) + \(y) is equal to \(x + y) and here is a zero: \(returnZero())"
+}
+
+func testSubscriptExpr() -> (Int, Int, Int, Int, Int) { // $ noCfg
+  var a = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+  a[0] = 0
+  a[1] += 1
+  a[2] -= 1
+  a[3] *= 1
+  a[4] /= 1
+  a[5] %= 1
+  a[6] &= 1
+  a[7] |= 1
+  a[8] ^= 1
+  a[9] <<= 1
+  a[10] >>= 1
+
+  var tupleWithA = (a[0], a[1], a[2], a[3], a[4])
+
+  var b = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
+  b[0] = a[10]
+  b[1] = b[0] + 1
+  b[2] = b[1] - 1
+  b[3] = b[2] * 1
+  b[4] = b[3] / 1
+  b[5] = b[4] % 1
+  b[6] = b[5] & 1
+  b[7] = b[6] | 1
+  b[8] = b[7] ^ 1
+  b[9] = b[8] << 1
+  b[10] = b[9] >> 1
+
+  let (a1, a2, a3, a4, a5) = tupleWithA
+  return (a1 + b[0], a2 + b[1], a3 + b[2], a4 + b[3], a5 + b[4])
+}
+
+func loop1(x : inout Int) {
+  while x >= 0 { // $ bbStep='WhileStmt : successor -> x(+0)' bbStep='... >= ... : true -> Block(+0)'
+    print(x)
+    x -= 1 // $ bbStep='... -= ... : successor -> x(-2)'
+  }
+}
+
+func loop2(x : inout Int) {
+  while x >= 0 { // $ bbStep='WhileStmt : successor -> x(+0)' bbStep='... >= ... : false -> print(+11)' bbStep='... >= ... : true -> Block(+0)'
+    print(x)
+    x -= 1
+    if x > 100 { // $ bbStep='... > ... : false -> IfExpr(+3)' bbStep='... > ... : true -> Block(+0)'
+      break // $ bbStep='BreakExpr : break -> print(+7)'
+    }
+    else if x > 50 { // $ bbStep='... > ... : false -> print(+3)' bbStep='... > ... : true -> Block(+0)'
+      continue // $ bbStep='ContinueExpr : continue -> x(-7)'
+    }
+    print("Iter") // $ bbStep='print(...) : successor -> x(-9)'
+  }
+  print("Done")
+}
+
+func labeledLoop(x : inout Int) {
+  outer: while x >= 0 { // $ bbStep='WhileStmt : successor -> x(+0)' bbStep='... >= ... : true -> Block(+0)'
+    inner: while x >= 0 { // $ bbStep='WhileStmt : successor -> x(+0)' bbStep='... >= ... : false -> print(+11)' bbStep='... >= ... : true -> Block(+0)'
+      print(x)
+      x -= 1
+      if x > 100 { // $ bbStep='... > ... : false -> IfExpr(+3)' bbStep='... > ... : true -> Block(+0)'
+        break outer
+      }
+      else if x > 50 { // $ bbStep='... > ... : false -> print(+3)' bbStep='... > ... : true -> Block(+0)'
+        continue inner // $ bbStep='ContinueExpr : continue -> x(-7)'
+      }
+      print("Iter") // $ bbStep='print(...) : successor -> x(-9)'
+    }
+    print("Done") // $ bbStep='print(...) : successor -> x(-12)'
+  }
+}
+
+func testRepeat(x : inout Int) {
+  repeat { // $ bbStep='DoWhileStmt : successor -> Block(+0)'
+    print(x)
+    x -= 1
+  } while x >= 0 // $ bbStep='... >= ... : true -> Block(-3)'
+}
+
+func loop_with_identity_expr() {
+  var x = 0
+  while(x < 10) { // $ bbStep='WhileStmt : successor -> x(+0)' bbStep='... < ... : true -> Block(+0)'
+    x += 1 // $ bbStep='... += ... : successor -> x(-1)'
+  }
+}
+
+class OptionalC {
+  let c: C?
+  init(arg: C?) {
+    c = arg
+  }
+
+  func getOptional() -> C? { // $ noCfg
+    return c
+  }
+}
+
+func testOptional(c : OptionalC?) -> Int? {
+  return c?.getOptional()?.getMyInt()
+}
+
+func testCapture(x : Int, y : Int) -> () -> Int { // $ noCfg
+  return { [z = x + y, t = "literal"] in
+    return z
+  }
+}
+
+func testTupleElement(t : (a: Int, Int, c: Int)) -> Int {
+  return t.a + t.1 + t.c + (1, 2, 3).0
+}
+
+class Derived : C {
+  init() { // $ noCfg
+    super.init(n: 0)
+  }
+}
+
+func doWithoutCatch(x : Int) throws -> Int {
+  do {
+    try mightThrow(x: 0) // $ bbStep='mightThrow(...) : successor -> try ...(+0)'
+    print("Did not throw.")
+    try! mightThrow(x: 0)
+    print("Still did not throw.")
+  }
+  return 0
+}
+
+class Structors {
+  var field: Int
+  init() { // $ noCfg
+    field = 10
+  }
+
+  deinit {
+    field = 0
+  }
+}
+
+func dictionaryLiteral(x: Int, y: Int) -> [String: Int] {
+  return ["x": x, "y": y]
+}
+
+func localDeclarations() -> Int { // $ noCfg
+  class MyLocalClass {
+    var x: Int
+    init() { // $ noCfg
+      x = 10
+    }
+  }
+
+  struct MyLocalStruct {
+    var x: Int
+    init() { // $ noCfg
+      x = 10
+    }
+  }
+
+  enum MyLocalEnum {
+    case A
+    case B
+  }
+
+  var myLocalVar : Int;
+
+  return 0
+}
+
+struct B {
+  var x : Int
+}
+
+struct A {
+  var b : B
+  var bs : [B]
+  var mayB : B?
+}
+
+func test(a : A) {
+  var kpGet_b_x = \A.b.x
+  var kpGet_bs_0_x = \A.bs[0].x
+  var kpGet_mayB_force_x = \A.mayB!.x
+  var kpGet_mayB_x = \A.mayB?.x
+
+  var apply_kpGet_b_x = a[keyPath: kpGet_b_x]
+  var apply_kpGet_bs_0_x = a[keyPath: kpGet_bs_0_x]
+  var apply_kpGet_mayB_force_x = a[keyPath: kpGet_mayB_force_x]
+  var apply_kpGet_mayB_x = a[keyPath: kpGet_mayB_x]
+}
+
+func testIfConfig() {
+#if FOO
+  1
+  2
+#else
+  3
+  4
+#endif
+
+  5
+
+#if BAR
+  6
+  7
+#endif
+
+  8
+
+#if FOO
+  9
+  10
+#elseif true
+  11
+  12
+#endif
+
+  13
+}
+
+func testAvailable() -> Int { // $ noCfg
+  var x = 0;
+
+  if #available(macOS 10, *) { // $ bbStep=' : false -> IfExpr(+4)' bbStep=' : true -> Block(+0)'
+    x += 1 // $ bbStep='... += ... : successor -> IfExpr(+3)'
+  }
+
+  if #available(macOS 10.13, *) { // $ bbStep=' : false -> IfExpr(+4)' bbStep=' : true -> Block(+0)'
+    x += 1 // $ bbStep='... += ... : successor -> IfExpr(+3)'
+  }
+
+  if #unavailable(iOS 10, watchOS 10, macOS 10) { // $ bbStep=' : false -> GuardIfStmt(+4)' bbStep=' : true -> Block(+0)'
+    x += 1 // $ bbStep='... += ... : successor -> GuardIfStmt(+3)'
+  }
+
+  guard #available(macOS 12, *) else { // $ bbStep=' : false -> Block(+0)' bbStep=' : true -> IfExpr(+4)'
+    x += 1 // $ bbStep='... += ... : successor -> IfExpr(+3)'
+  }
+
+  if #available(macOS 12, *), // $ bbStep=' : true -> (+1)' bbStep=' : false,false -> x(+5)'
+      #available(iOS 12, *) { // $ bbStep=' : false,false -> x(+4)' bbStep=' : true -> Block(+0)'
+    x += 1 // $ bbStep='... += ... : successor -> x(+3)'
+  }
+
+  return x
+}
+
+func testAsyncFor () async {
+    var stream = AsyncStream(Int.self, bufferingPolicy: .bufferingNewest(5), {
+        continuation in
+            Task.detached {
+                for i in 1...100 { // $ bbStep='... ... ... : empty -> continuation(+3)' bbStep='... ... ... : non-empty -> i(+0)'
+                    continuation.yield(i) // $ bbStep='... .yield(...) : successor -> continuation(+2)' bbStep='... .yield(...) : successor -> i(-1)'
+                }
+                continuation.finish()
+            }
+    })
+
+    for try await i in stream { // $ bbStep='stream : non-empty -> i(+0)'
+        print(i) // $ bbStep='print(...) : successor -> i(-1)'
+    }
+}
+
+func testNilCoalescing(x: Int?) -> Int {
+  return
+    x ?? // $ bbStep='x : non-null -> ReturnExpr(-1)' bbStep='x : null -> 0(+1)'
+        0 // $ bbStep='0 : successor -> ReturnExpr(-2)'
+}
+
+func testNilCoalescing2(x: Bool?) -> Int {
+  if x ?? // $ bbStep='x : non-null,false -> Block(+3)' bbStep='x : non-null,true -> Block(+1)' bbStep='x : null -> false(+1)'
+      false { // $ bbStep='false : false -> Block(+2)'
+    return 1
+  } else {
+    return 0
+  }
+}
+
+func usesAutoclosure(_ expr: @autoclosure () -> Int) -> Int { // $ noCfg
+  return expr()
+}
+
+func autoclosureTest() {
+  usesAutoclosure(1)
+}
+
+// ---
+
+protocol MyProtocol {
+	func source() -> Int
+}
+
+class MyProcotolImpl : MyProtocol {
+	func source() -> Int { return 0 }
+}
+
+func getMyProtocol() -> MyProtocol { return MyProcotolImpl() }
+func getMyProtocolImpl() -> MyProcotolImpl { return MyProcotolImpl() }
+
+func sink(arg: Int) { }
+
+func testOpenExistentialExpr(x: MyProtocol, y: MyProcotolImpl) {
+	sink(arg: x.source())
+	sink(arg: y.source())
+	sink(arg: getMyProtocol().source())
+	sink(arg: getMyProtocolImpl().source())
+}
+
+func singleStmtExpr(_ x: Int) {
+  let a = switch x {
+    case 0..<5: 1 // $ bbStep='1 : successor -> let b(+3)' bbStep='... ..< ... : match -> Block(+0)' bbStep='... ..< ... : no-match -> SwitchCase(+1)'
+    default: 2 // $ bbStep='2 : successor -> let b(+2)'
+  }
+  let b =
+        if (x < 42) { 1 } // $ bbStep='... < ... : false -> Block(+1)' bbStep='... < ... : true -> Block(+0)'
+        else { 2 }
+}
+// ---
+
+struct ValueGenericsStruct<let N: Int> {
+    var x = N;
+}
+
+func valueGenericsFn<let N: Int>(_ value: ValueGenericsStruct<N>) {
+    var x = N;
+    print(x);
+    _ = value;
+}
diff --git a/unified/ql/test/library-tests/dataflow/accessors_instance.swift b/unified/ql/test/library-tests/dataflow/accessors_instance.swift
new file mode 100644
index 000000000000..d81d54dd0d9c
--- /dev/null
+++ b/unified/ql/test/library-tests/dataflow/accessors_instance.swift
@@ -0,0 +1,179 @@
+func source(_ s: String) -> String { return s }
+
+@discardableResult
+func sink(_ s: Any) -> String { return "" }
+
+func t1() {
+    class C {
+        var x: String { source("t1.1") }
+    }
+    sink(C().x)  // $ hasValueFlow=t1.1
+}
+
+func t2() {
+    // Note: swift-format will try to remove the explicit 'get' below
+    // swift-format-ignore
+    class C {
+        var x: String {
+            get { source("t2.1") }
+        }
+    }
+    sink(C().x)  // $ hasValueFlow=t2.1
+}
+
+func t3() {
+    class C {
+        var x: String {
+            get { source("t3.1") }
+            set {}
+        }
+    }
+    sink(C().x)  // $ hasValueFlow=t3.1
+}
+
+func t4() {
+    class C {
+        var x: String {
+            get {}
+            set { sink(newValue) }  // $ hasValueFlow=t4.1
+        }
+    }
+    C().x = source("t4.1")
+}
+
+func t4a() {
+    class C {
+        var x: String {
+            get {}
+            set(v) { sink(v) }  // $ hasValueFlow=t4a.1
+        }
+    }
+    C().x = source("t4a.1")
+}
+
+func t5() {
+    class C {
+        var x: String {
+            get { source("t5.1") }
+            set { sink(newValue) }  // $ hasValueFlow=t5.1
+        }
+    }
+    let c = C()
+    c.x = c.x
+}
+
+func t6() {
+    class C {
+        var x: String { source("t6.1") }
+
+        func method() {
+            sink(self.x)  // $ hasValueFlow=t6.1
+            sink(x)  // $ hasValueFlow=t6.1
+        }
+    }
+}
+
+func t7() {
+    class C {
+        var field: String = "safe"
+        var x: String { self.field }
+    }
+    var c = C()
+    sink(c.x)  // no flow
+    c.field = source("t7.1")
+    sink(c.x)  // $ hasValueFlow=t7.1
+}
+
+func t8() {
+    class C {
+        var field: String = "safe"
+        var otherField: String = "safe"
+        var x: String {
+            get {}
+            set { otherField = field + newValue }
+        }
+    }
+    var c = C()
+    c.field = source("t8.1")
+    c.x = "safe"  // trigger the setter
+    sink(c.otherField)  // $ hasTaintFlow=t8.1
+}
+
+func t9() {
+    class C {
+        var field: String = "safe"
+        var x: String {
+            field = source("t9.1")
+            return ""
+        }
+    }
+    let c = C()
+    let ignored = c.x
+    sink(c.field)  // $ hasValueFlow=t9.1
+}
+
+func t10() {
+    class C {
+        var field: String = "safe"
+        var x: String {
+            field = source("t10.1")
+            return ""
+        }
+
+        func method() {
+            let ignored = x
+            sink(field)  // $ hasValueFlow=t10.1
+        }
+    }
+}
+
+func t11() {
+    class C {
+        var p: (String, String) {
+            get { ("safe", "safe") }
+            set { sink(newValue.0) }  // $ hasValueFlow=t11.1 hasValueFlow=t11.2
+        }
+        var q: C {
+            get { C() }
+            set { sink(newValue.p.0) }
+        }
+    }
+    let c = C()
+    // `p` has value type, so this calls `p`'s setter
+    c.p.0 = source("t11.1")
+    // `q` has reference type, so this calls `q`'s getter followed by `p`'s setter
+    c.q.p = (source("t11.2"), source("t11.3"))
+}
+
+func t12() {
+    struct S {
+        var field: String = "safe"
+        mutating func update() { field = source("t12.1") }
+    }
+    class C {
+        var s: S {
+            get { S() }
+            set { sink(newValue.field) }  // $ hasValueFlow=t12.1
+        }
+    }
+    let c = C()
+    c.s.update()
+}
+
+func t13() {
+    class C1 {
+        var x: String = "safe"
+    }
+    class C2: C1 {
+        func updateX(newValue: String) {
+            super.x = newValue
+        }
+
+        func getX() -> String {
+            return super.x
+        }
+    }
+    var c2 = C2()
+    c2.updateX(newValue: source("t13.1"))
+    sink(c2.getX())  // $ hasValueFlow=t13.1
+}
diff --git a/unified/ql/test/library-tests/dataflow/accessors_local.swift b/unified/ql/test/library-tests/dataflow/accessors_local.swift
new file mode 100644
index 000000000000..0cfa68c3abce
--- /dev/null
+++ b/unified/ql/test/library-tests/dataflow/accessors_local.swift
@@ -0,0 +1,106 @@
+func source(_ s: String) -> String { return s }
+
+@discardableResult
+func sink(_ s: Any) -> String { return "" }
+
+func t1() {
+    var x: String { source("t1.1") }
+    sink(x)  // $ hasValueFlow=t1.1
+}
+
+func t2() {
+    // Note: swift-format will try to remove the explicit 'get' below
+    // swift-format-ignore
+    var x: String {
+        get { source("t2.1") }
+    }
+    sink(x)  // $ hasValueFlow=t2.1
+}
+
+func t3() {
+    var x: String {
+        get { source("t3.1") }
+        set {}
+    }
+    sink(x)  // $ hasValueFlow=t3.1
+}
+
+func t4() {
+    var x: String {
+        get {}
+        set { sink(newValue) }  // $ hasValueFlow=t4.1
+    }
+    x = source("t4.1")
+}
+
+func t5() {
+    var x: String {
+        get { source("t5.1") }
+        set { sink(newValue) }  // $ hasValueFlow=t5.1
+    }
+    x = x
+}
+
+func t6() {
+    var y: String = source("t6.1")
+    var x: String { y }
+    sink(x)  // $ hasValueFlow=t6.1
+}
+
+func t7() {
+    var y: String = "safe"
+    var x: String { y }
+    sink(x)  // no flow
+    y = source("t7.1")
+    sink(x)  // $ hasValueFlow=t7.1
+}
+
+func t8() {
+    var x: String { source("t8.1") }
+    let closure = {
+        sink(x)  // $ hasValueFlow=t8.1
+    }
+    closure()
+}
+
+func t9() {
+    var y: String = "safe"
+    var x: String { y }
+    let closure = {
+        sink(x)  // $ hasValueFlow=t9.1
+    }
+    y = source("t9.1")
+    closure()
+}
+
+func t10() {
+    var y: String = "safe"
+    var x1: String { y }
+    var x2: String { x1 }
+    var x3: String { x2 }
+    let closure = {
+        sink(x3)  // $ hasValueFlow=t9.1
+    }
+    y = source("t9.1")
+    closure()
+}
+
+func t11() {
+    var p: (String, String) {
+        get { ("safe", "safe") }
+        set { sink(newValue.0) }  // $ hasValueFlow=t11.1
+    }
+    p.0 = source("t11.1")
+}
+
+func t12() {
+    struct S {
+        var field: String = "safe"
+        mutating func mutate() { field = source("t12.1") }
+    }
+    var p: S {
+        get { S() }
+        set { sink(newValue.field) }  // $ hasValueFlow=t12.1
+    }
+    p.mutate()
+}
diff --git a/unified/ql/test/library-tests/dataflow/accessors_static.swift b/unified/ql/test/library-tests/dataflow/accessors_static.swift
new file mode 100644
index 000000000000..42a9299164b8
--- /dev/null
+++ b/unified/ql/test/library-tests/dataflow/accessors_static.swift
@@ -0,0 +1,67 @@
+func source(_ s: String) -> String { return s }
+
+@discardableResult
+func sink(_ s: Any) -> String { return "" }
+
+func t1() {
+    class C {
+        static var x: String { source("t1.1") }
+    }
+    sink(C.x)  // $ hasValueFlow=t1.1
+}
+
+func t2() {
+    // Note: swift-format will try to remove the explicit 'get' below
+    // swift-format-ignore
+    class C {
+        static var x: String {
+            get { source("t2.1") }
+        }
+    }
+    sink(C.x)  // $ hasValueFlow=t2.1
+}
+
+func t3() {
+    class C {
+        static var x: String {
+            get { source("t3.1") }
+            set {}
+        }
+    }
+    sink(C.x)  // $ hasValueFlow=t3.1
+}
+
+func t4() {
+    class C {
+        static var x: String {
+            get {}
+            set { sink(newValue) }  // $ hasValueFlow=t4.1
+        }
+    }
+    C.x = source("t4.1")
+}
+
+func t5() {
+    class C {
+        static var x: String {
+            get { source("t5.1") }
+            set { sink(newValue) }  // $ hasValueFlow=t5.1
+        }
+    }
+    C.x = C.x
+}
+
+func t6() {
+    class C {
+        static var x: String { source("t6.1") }
+
+        func method() {
+            sink(Self.x)  // $ hasValueFlow=t6.1
+        }
+
+        static func staticMethod() {
+            sink(Self.x)  // $ hasValueFlow=t6.1
+            sink(x)  // $ hasValueFlow=t6.1
+        }
+    }
+}
diff --git a/unified/ql/test/library-tests/dataflow/calls.swift b/unified/ql/test/library-tests/dataflow/calls.swift
new file mode 100644
index 000000000000..1735fc4d6d45
--- /dev/null
+++ b/unified/ql/test/library-tests/dataflow/calls.swift
@@ -0,0 +1,126 @@
+func source(_ s: String) -> String { return s }
+
+@discardableResult
+func sink(_ s: String) -> String { return "" }
+
+func t1() {
+    func target(_ x: String) {
+        sink(x)  // $ hasValueFlow=t1.1
+    }
+    target(source("t1.1"))
+}
+
+func t2() {
+    func target() -> String {
+        return source("t2.1")
+    }
+    sink(target())  // $ hasValueFlow=t2.1
+}
+
+func t3() {
+    func target(x: String) {
+        sink(x)  // $ hasValueFlow=t3.1
+    }
+    target(x: source("t3.1"))
+}
+
+func t4() {
+    func target(_ x: String) -> String {
+        return x + "foo"
+    }
+    sink(target(source("t4.1")))  // $ hasTaintFlow=t4.1
+    sink(target(source("t4.2")))  // $ hasTaintFlow=t4.2
+    sink(target("safe"))
+}
+
+func t5() {
+    func target1(name x: String) {
+        sink(x)  // $ hasValueFlow=t5.1
+    }
+    target1(name: source("t5.1"))
+
+    func target2(name: String) {
+        sink(name)  // $ hasValueFlow=t5.2
+    }
+    target2(name: source("t5.2"))
+}
+
+func t6() {
+    func target(_ x: String, _ y: String) {
+        sink(x)  // $ hasValueFlow=t6.1
+        sink(y)  // $ hasValueFlow=t6.2
+    }
+    target(source("t6.1"), source("t6.2"))
+}
+
+class Box {
+    var field: String = ""
+}
+
+func t7() {
+    func target(_ x: Box) {
+        x.field = source("t7.1")
+    }
+    let b = Box()
+    sink(b.field)  // no flow
+    target(b)
+    sink(b.field)  // $ hasValueFlow=t7.1
+}
+
+func t8() {
+    class C {
+        var field: String = ""
+
+        func store() {
+            field = source("t8.1")
+        }
+
+        func read1() {
+            sink(field)  // no flow
+            store()
+            sink(field)  // $ hasValueFlow=t8.1
+        }
+
+        func read2() {
+            sink(field)  // no flow
+            store()
+            sink(self.field)  // $ hasValueFlow=t8.1
+        }
+
+        func read3() {
+            sink(field)  // no flow
+            self.store()
+            sink(field)  // $ hasValueFlow=t8.1
+        }
+
+        func read4() {
+            sink(field)  // no flow
+            self.store()
+            sink(self.field)  // $ hasValueFlow=t8.1
+        }
+
+        func read5() {
+            sink(self.field)  // no flow
+            store()
+            sink(field)  // $ hasValueFlow=t8.1
+        }
+
+        func read6() {
+            sink(self.field)  // no flow
+            store()
+            sink(self.field)  // $ hasValueFlow=t8.1
+        }
+
+        func read7() {
+            sink(self.field)  // no flow
+            self.store()
+            sink(field)  // $ hasValueFlow=t8.1
+        }
+
+        func read8() {
+            sink(self.field)  // no flow
+            self.store()
+            sink(self.field)  // $ hasValueFlow=t8.1
+        }
+    }
+}
diff --git a/unified/ql/test/library-tests/dataflow/capture.swift b/unified/ql/test/library-tests/dataflow/capture.swift
new file mode 100644
index 000000000000..75b583ee109d
--- /dev/null
+++ b/unified/ql/test/library-tests/dataflow/capture.swift
@@ -0,0 +1,190 @@
+func source(_ s: String) -> String { return s }
+
+@discardableResult
+func sink(_ s: String) -> String {
+    print(s)
+    return ""
+}
+
+func t1() {
+    let x = source("t1.1")
+    let closure = { (_: Int) in
+        sink(x)  // $ hasValueFlow=t1.1
+    }
+    closure(123)
+}
+
+func t2() {
+    var x = "safe"
+    let closure = { (arg: Int) in
+        x = source("t2.1")
+    }
+    sink(x)  // no flow
+    closure(123)
+    sink(x)  // $ hasValueFlow=t2.1
+}
+
+func t3() {
+    let x = source("t3.1")
+    var y1 = "safe"
+    var y2 = "safe"
+    let closure = { (arg: Int) in
+        y1 = x
+        y2 = x + "blah"
+    }
+    sink(y1)  // no flow
+    sink(y2)  // no flow
+    closure(123)
+    sink(y1)  // $ hasValueFlow=t3.1
+    sink(y2)  // $ hasTaintFlow=t3.1
+}
+
+func t4() {
+    let x = source("t4.1")
+    var y = "safe"
+    let closure = { (arg: String) in
+        y = arg
+    }
+    sink(y)  // no flow
+    closure(x)
+    sink(y)  // $ hasValueFlow=t4.1
+}
+
+func t5() {
+    let x = source("t5.1")
+    var y = ("safe", "safe")
+    let closure = { (arg: String) in
+        y.0 = arg
+    }
+    sink(y.0)  // no flow
+    closure(x)
+    sink(y.0)  // $ hasValueFlow=t5.1
+}
+
+func t6() {
+    var x = "safe"
+    let closure = { (_: Int) in
+        sink(x)  // $ hasValueFlow=t6.1
+    }
+    x = source("t6.1")
+    closure(123)
+}
+
+func t7() {
+    let x = source("t7.1")
+    func local(_: Int) {
+        sink(x)  // $ hasValueFlow=t7.1
+    }
+    local(123)
+}
+
+func t8() {
+    var x = "safe"
+    func local(arg: Int) {
+        x = source("t8.1")
+    }
+    sink(x)  // no flow
+    local(arg: 123)
+    sink(x)  // $ hasValueFlow=t8.1
+}
+
+func t9() {
+    // Use of a local function before its declaration
+    let x = source("t9.1")
+    let y = local()
+    sink(y)  // $ hasValueFlow=t9.1
+
+    func local() -> String {
+        sink(x)  // $ hasValueFlow=t9.1
+        return x
+    }
+}
+
+func t10() {
+    let x = source("t10.1")
+    let closure1 = { [x1 = x] in
+        sink(x1)  // $ hasValueFlow=t10.1
+    }
+    let closure2 = { [x] in
+        sink(x)  // $ hasValueFlow=t10.1
+    }
+    closure1()
+    closure2()
+}
+
+func t11() {
+    let x = source("t11.1")
+    let closure = { [x = x, blah = x] in
+        sink(x)  // $ hasValueFlow=t11.1
+        sink(blah)  // $ hasValueFlow=t11.1
+    }
+    closure()
+}
+
+func t12() {
+    class Box {
+        var value: String
+        init(_ x: String) { self.value = x }
+    }
+    let x = Box(source("t12.1"))
+    let closure = { [weak x] in
+        guard let x else { return }
+        sink(x.value)  // $ MISSING: hasValueFlow=t12.1
+    }
+    closure()
+}
+
+func t13() {
+    var x = "safe"
+    let closure1 = { [x] in
+        sink(x)  // no flow
+    }
+    let closure2 = {
+        sink(x)  // $ hasValueFlow=t13.1
+    }
+    closure1()
+    closure2()
+    x = source("t13.1")
+    closure1()
+    closure2()
+}
+
+class C {
+    var x: String
+
+    func capture_self_by_ref() {
+        x = source("C.1")
+        let closure = {
+            sink(self.x)  // $ hasValueFlow=C.1
+        }
+        closure()
+    }
+
+    func capture_self() {
+        x = source("C.2")
+        let closure = { [self] in
+            sink(self.x)  // $ hasValueFlow=C.2
+            sink(x)  // $ hasValueFlow=C.2
+        }
+        closure()
+    }
+
+    func capture_weak_self() {
+        x = source("C.3")
+        let closure = { [weak self] in
+            guard let self else { return }
+            sink(self.x)  // $ hasValueFlow=C.3
+            sink(x)  // $ hasValueFlow=C.3
+        }
+        closure()
+    }
+
+    func capture_unowned_self() {
+        x = source("C.4")
+        let closure = { [unowned self] in
+            sink(self.x)  // $ hasValueFlow=C.4
+            sink(x)  // $ hasValueFlow=C.4
+        }
+        closure()
+    }
+}
diff --git a/unified/ql/test/library-tests/dataflow/enums.swift b/unified/ql/test/library-tests/dataflow/enums.swift
new file mode 100644
index 000000000000..25fd568748c2
--- /dev/null
+++ b/unified/ql/test/library-tests/dataflow/enums.swift
@@ -0,0 +1,88 @@
+func source(_ s: String) -> String { return s }
+
+@discardableResult
+func sink(_ s: Any) -> String { return "" }
+
+enum E {
+    case case1(String)
+    case case2(String)
+}
+
+func t1() {
+    let e = E.case1(source("t1.1"))
+    sink(e)  // no flow
+    switch e {
+    case E.case1(let x):
+        sink(x)  // $ hasValueFlow=t1.1
+    default:
+        break
+    }
+}
+
+func t2() {
+    let e = E.case1(source("t2.1"))
+    sink(e)  // no flow
+    switch e {
+    case .case1(let x):  // use leading-dot syntax
+        sink(x)  // $ hasValueFlow=t2.1
+    default:
+        break
+    }
+}
+
+func t3() {
+    let e = E.case1(source("t3.1"))
+    guard case E.case1(let x) = e else { return }
+    sink(x)  // $ hasValueFlow=t3.1
+}
+
+func t4() {
+    let e = E.case2(source("t4.1"))
+    switch e {
+    case E.case1(let x):
+        sink(x)  // no flow
+    case E.case2(let x):
+        sink(x)  // $ hasValueFlow=t4.1
+    }
+    // same but in opposite match order
+    switch e {
+    case E.case2(let x):
+        sink(x)  // $ hasValueFlow=t4.1
+    case E.case1(let x):
+        sink(x)  // no flow
+    }
+}
+
+func t5() {
+    let opt_x = Optional.some(source("t5.1"))
+    guard let x = opt_x else { return }
+    sink(x)  // $ hasValueFlow=t5.1
+}
+
+func t6() {
+    let opt_x = Optional.some(source("t6.1"))
+    guard let opt_x else { return }
+    sink(opt_x)  // $ hasValueFlow=t6.1
+}
+
+enum OptionalLabel {
+    case foo(x: String)
+}
+
+func t7() {
+    let e = OptionalLabel.foo(x: source("t7.1"))
+    switch e {
+    case .foo(let x):
+        sink(x)  // $ hasValueFlow=t7.1
+    default:
+        break
+    }
+    // Note: swift-format will try to remove the 'x:' label in the call below
+    // swift-format-ignore
+    switch e {
+    case .foo(x: let x):
+        sink(x)  // $ hasValueFlow=t7.1
+    default:
+        break
+    }
+}
diff --git a/unified/ql/test/library-tests/dataflow/flow-summaries.swift b/unified/ql/test/library-tests/dataflow/flow-summaries.swift
new file mode 100644
index 000000000000..aad7961b1caf
--- /dev/null
+++ b/unified/ql/test/library-tests/dataflow/flow-summaries.swift
@@ -0,0 +1,78 @@
+func t1() {
+    let x = source("t1.1")
+    let y = TestType.identityFlow(x)
+    sink(y)  // $ hasValueFlow=t1.1
+}
+
+func t2() {
+    let x = source("t2.1")
+    let array = TestType.storeArray(x)
+    for let y in array {
+        sink(y)  // $ hasValueFlow=t2.1
+    }
+}
+
+func t3() {
+    let array = [source("t3.1"), source("t3.2")]
+    let y = TestType.readArray(array)
+    sink(y)  // $ hasValueFlow=t3.1 hasValueFlow=t3.2
+}
+
+func t4() {
+    class Box {
+        var outputField: String = ""
+    }
+    let x = source("t4.1")
+    let box = Box()
+    sink(box.outputField)
+    let y = TestType.postUpdateArg(x, output: box)
+    sink(box.outputField)  // $ hasValueFlow=t4.1
+}
+
+func t5() {
+    let x = source("t5.1")
+    let y = TestType.storeUnusualName(x)
+    let z = TestType.readUnusualName(y)
+    sink(z)  // $ hasValueFlow=t5.1
+}
+
+func t6() {
+    let x = source("t6.1")
+    TestType.intoCallback(x) { y in
+        sink(y)  // $ hasValueFlow=t6.1
+    }
+}
+
+func t7() {
+    let y = TestType.outOfCallback {
+        return source("t7.1")
+    }
+    sink(y)  // $ hasValueFlow=t7.1
+}
+
+func t8() {
+    sink(TestType.throughCallback(source("t8.1")) { y in return y })  // $ hasValueFlow=t8.1
+    sink(TestType.throughCallback(source("t8.2")) { y in return y + "x" })  // $ hasTaintFlow=t8.2
+    sink(TestType.throughCallback("safe") { y in return y })  // no flow
+    sink(TestType.throughCallback(source("t8.3")) { y in return "safe" })  // no flow
+}
+
+func t9() {
+    sink(TestType.taintFlow(source("t9.1")))  // $ hasTaintFlow=t9.1
+}
+
+func t10() {
+    var x = source("t10.1")
+    var y = source("t10.2")
+    sink(x)  // $ hasValueFlow=t10.1
+    sink(y)  // $ hasValueFlow=t10.2
+    TestType.swap(&x, &y)
+    sink(x)  // $ hasValueFlow=t10.2 SPURIOUS: hasValueFlow=t10.1
+    sink(y)  // $ hasValueFlow=t10.1 SPURIOUS: hasValueFlow=t10.2
+}
+
+func t11() {
+    let t = TestType()
+    t.setField(source("t11.1"))
+    sink(t.getField())  // $ hasValueFlow=t11.1
+}
diff --git a/unified/ql/test/library-tests/dataflow/implicit-self.swift b/unified/ql/test/library-tests/dataflow/implicit-self.swift
new file mode 100644
index 000000000000..87d9dc172524
--- /dev/null
+++ b/unified/ql/test/library-tests/dataflow/implicit-self.swift
@@ -0,0 +1,89 @@
+func source(_ s: String) -> String { return s }
+
+@discardableResult
+func sink(_ s: String) -> String { return "" }
+
+class Box {
+    var x: String = ""
+}
+
+class C {
+    var x: String = ""
+    var box = Box()
+
+    func t1() {
+        sink(self.x)  // no flow
+        self.x = source("t1.1")
+        sink(self.x)  // $ hasValueFlow=t1.1
+    }
+
+    func t2() {
+        sink(x)  // no flow
+        x = source("t2.1")
+        sink(x)  // $ hasValueFlow=t2.1
+    }
+
+    func t3() {
+        sink(self.x)  // no flow
+        x = source("t3.1")
+        sink(self.x)  // $ hasValueFlow=t3.1
+    }
+
+    func t4() {
+        sink(x)  // no flow
+        self.x = source("t4.1")
+        sink(x)  // $ hasValueFlow=t4.1
+    }
+
+    func t5() {
+        sink(self.box.x)  // no flow
+        self.box.x = source("t5.1")
+        sink(self.box.x)  // $ hasValueFlow=t5.1
+    }
+
+    func t6() {
+        sink(box.x)  // no flow
+        box.x = source("t6.1")
+        sink(box.x)  // $ hasValueFlow=t6.1
+    }
+
+    func t7() {
+        sink(self.box.x)  // no flow
+        box.x = source("t7.1")
+        sink(self.box.x)  // $ hasValueFlow=t7.1
+    }
+
+    func t8() {
+        sink(box.x)  // no flow
+        self.box.x = source("t8.1")
+        sink(box.x)  // $ hasValueFlow=t8.1
+    }
+
+    func t9() {
+        x = "safe"
+        x += sink(x) + source("t9.1")
+        sink(x)  // $ hasTaintFlow=t9.1
+        sink(self.x)  // $ hasTaintFlow=t9.1
+    }
+
+    func t10() {
+        x = "safe"
+        self.x += sink(x) + source("t10.1")
+        sink(x)  // $ hasTaintFlow=t10.1
+        sink(self.x)  // $ hasTaintFlow=t10.1
+    }
+
+    func t11() {
+        self.x = "safe"
+        x += sink(x) + source("t11.1")
+        sink(x)  // $ hasTaintFlow=t11.1
+        sink(self.x)  // $ hasTaintFlow=t11.1
+    }
+
+    func t12() {
+        self.x = "safe"
+        self.x += sink(x) + source("t12.1")
+        sink(x)  // $ hasTaintFlow=t12.1
+        sink(self.x)  // $ hasTaintFlow=t12.1
+    }
+}
diff --git a/unified/ql/test/library-tests/dataflow/short-return.swift b/unified/ql/test/library-tests/dataflow/short-return.swift
new file mode 100644
index 000000000000..901c481bd75b
--- /dev/null
+++ b/unified/ql/test/library-tests/dataflow/short-return.swift
@@ -0,0 +1,9 @@
+func source(_ s: String) -> String { return s }
+
+@discardableResult
+func sink(_ s: Any) -> String { return "" }
+
+func t1() {
+    func getValue() -> String { source("t1.1") }
+    sink(getValue())  // $ hasValueFlow=t1.1
+}
diff --git a/unified/ql/test/library-tests/dataflow/test.expected b/unified/ql/test/library-tests/dataflow/test.expected
new file mode 100644
index 000000000000..a479255f6d23
--- /dev/null
+++ b/unified/ql/test/library-tests/dataflow/test.expected
@@ -0,0 +1,1398 @@
+models
+edges
+| accessors_instance.swift:8:25:8:38 | source(...) | accessors_instance.swift:10:10:10:14 | ... .x | provenance |  |
+| accessors_instance.swift:18:19:18:32 | source(...) | accessors_instance.swift:21:10:21:14 | ... .x | provenance |  |
+| accessors_instance.swift:27:19:27:32 | source(...) | accessors_instance.swift:31:10:31:14 | ... .x | provenance |  |
+| accessors_instance.swift:41:5:41:9 | ... .x | accessors_instance.swift:38:24:38:31 | newValue | provenance |  |
+| accessors_instance.swift:41:13:41:26 | source(...) | accessors_instance.swift:41:5:41:9 | ... .x | provenance |  |
+| accessors_instance.swift:48:17:48:17 | v | accessors_instance.swift:48:27:48:27 | v | provenance |  |
+| accessors_instance.swift:51:5:51:9 | ... .x | accessors_instance.swift:48:17:48:17 | v | provenance |  |
+| accessors_instance.swift:51:13:51:27 | source(...) | accessors_instance.swift:51:5:51:9 | ... .x | provenance |  |
+| accessors_instance.swift:57:19:57:32 | source(...) | accessors_instance.swift:62:11:62:13 | ... .x | provenance |  |
+| accessors_instance.swift:62:5:62:7 | ... .x | accessors_instance.swift:58:24:58:31 | newValue | provenance |  |
+| accessors_instance.swift:62:11:62:13 | ... .x | accessors_instance.swift:62:5:62:7 | ... .x | provenance |  |
+| accessors_instance.swift:67:25:67:38 | source(...) | accessors_instance.swift:70:18:70:23 | ... .x | provenance |  |
+| accessors_instance.swift:67:25:67:38 | source(...) | accessors_instance.swift:71:18:71:18 | x | provenance |  |
+| accessors_instance.swift:79:25:79:28 | self [field] | accessors_instance.swift:79:25:79:34 | ... .field | provenance |  |
+| accessors_instance.swift:83:5:83:5 | [post] c [field] | accessors_instance.swift:84:10:84:10 | c [field] | provenance |  |
+| accessors_instance.swift:83:5:83:11 | ... .field | accessors_instance.swift:83:5:83:5 | [post] c [field] | provenance |  |
+| accessors_instance.swift:83:15:83:28 | source(...) | accessors_instance.swift:83:5:83:11 | ... .field | provenance |  |
+| accessors_instance.swift:84:10:84:10 | c [field] | accessors_instance.swift:79:25:79:28 | self [field] | provenance |  |
+| accessors_instance.swift:84:10:84:10 | c [field] | accessors_instance.swift:84:10:84:12 | ... .x | provenance |  |
+| accessors_instance.swift:93:32:93:36 | field | accessors_instance.swift:93:19:93:28 | otherField | provenance |  |
+| accessors_instance.swift:97:5:97:5 | [post] c [field] | accessors_instance.swift:98:5:98:5 | c [field] | provenance |  |
+| accessors_instance.swift:97:5:97:11 | ... .field | accessors_instance.swift:97:5:97:5 | [post] c [field] | provenance |  |
+| accessors_instance.swift:97:15:97:28 | source(...) | accessors_instance.swift:97:5:97:11 | ... .field | provenance |  |
+| accessors_instance.swift:98:5:98:5 | c [field] | accessors_instance.swift:93:32:93:36 | field | provenance |  |
+| accessors_instance.swift:98:5:98:5 | c [field] | accessors_instance.swift:99:10:99:10 | c [otherField] | provenance |  |
+| accessors_instance.swift:99:10:99:10 | c [otherField] | accessors_instance.swift:99:10:99:21 | ... .otherField | provenance |  |
+| accessors_instance.swift:106:13:106:17 | field | accessors_instance.swift:112:10:112:10 | c [field] | provenance |  |
+| accessors_instance.swift:106:21:106:34 | source(...) | accessors_instance.swift:106:13:106:17 | field | provenance |  |
+| accessors_instance.swift:112:10:112:10 | c [field] | accessors_instance.swift:112:10:112:16 | ... .field | provenance |  |
+| accessors_instance.swift:119:13:119:17 | field | accessors_instance.swift:125:18:125:22 | field | provenance |  |
+| accessors_instance.swift:119:21:119:35 | source(...) | accessors_instance.swift:119:13:119:17 | field | provenance |  |
+| accessors_instance.swift:134:24:134:31 | newValue [0] | accessors_instance.swift:134:24:134:33 | ... .0 | provenance |  |
+| accessors_instance.swift:143:5:143:7 | [post] ... .p [0] | accessors_instance.swift:134:24:134:31 | newValue [0] | provenance |  |
+| accessors_instance.swift:143:5:143:9 | ... .0 | accessors_instance.swift:143:5:143:7 | [post] ... .p [0] | provenance |  |
+| accessors_instance.swift:143:13:143:27 | source(...) | accessors_instance.swift:143:5:143:9 | ... .0 | provenance |  |
+| accessors_instance.swift:145:5:145:9 | ... .p [0] | accessors_instance.swift:134:24:134:31 | newValue [0] | provenance |  |
+| accessors_instance.swift:145:13:145:46 | TupleExpr [0] | accessors_instance.swift:145:5:145:9 | ... .p [0] | provenance |  |
+| accessors_instance.swift:145:14:145:28 | source(...) | accessors_instance.swift:145:13:145:46 | TupleExpr [0] | provenance |  |
+| accessors_instance.swift:151:34:151:38 | field | accessors_instance.swift:160:5:160:7 | [post] ... .s [field] | provenance |  |
+| accessors_instance.swift:151:42:151:56 | source(...) | accessors_instance.swift:151:34:151:38 | field | provenance |  |
+| accessors_instance.swift:156:24:156:31 | newValue [field] | accessors_instance.swift:156:24:156:37 | ... .field | provenance |  |
+| accessors_instance.swift:160:5:160:7 | [post] ... .s [field] | accessors_instance.swift:156:24:156:31 | newValue [field] | provenance |  |
+| accessors_instance.swift:168:22:168:29 | newValue | accessors_instance.swift:169:23:169:30 | newValue | provenance |  |
+| accessors_instance.swift:169:13:169:19 | ... .x | accessors_instance.swift:169:13:169:17 | [post] super [x] | provenance |  |
+| accessors_instance.swift:169:23:169:30 | newValue | accessors_instance.swift:169:13:169:19 | ... .x | provenance |  |
+| accessors_instance.swift:173:20:173:24 | super [x] | accessors_instance.swift:173:20:173:26 | ... .x | provenance |  |
+| accessors_instance.swift:177:26:177:40 | source(...) | accessors_instance.swift:168:22:168:29 | newValue | provenance |  |
+| accessors_instance.swift:177:26:177:40 | source(...) | accessors_instance.swift:178:10:178:11 | c2 [x] | provenance |  |
+| accessors_instance.swift:178:10:178:11 | c2 [x] | accessors_instance.swift:173:20:173:24 | super [x] | provenance |  |
+| accessors_instance.swift:178:10:178:11 | c2 [x] | accessors_instance.swift:178:10:178:18 | ... .getX(...) | provenance |  |
+| accessors_local.swift:7:21:7:34 | source(...) | accessors_local.swift:8:10:8:10 | x | provenance |  |
+| accessors_local.swift:15:15:15:28 | source(...) | accessors_local.swift:17:10:17:10 | x | provenance |  |
+| accessors_local.swift:22:15:22:28 | source(...) | accessors_local.swift:25:10:25:10 | x | provenance |  |
+| accessors_local.swift:33:5:33:5 | x | accessors_local.swift:31:20:31:27 | newValue | provenance |  |
+| accessors_local.swift:33:9:33:22 | source(...) | accessors_local.swift:33:5:33:5 | x | provenance |  |
+| accessors_local.swift:38:15:38:28 | source(...) | accessors_local.swift:41:9:41:9 | x | provenance |  |
+| accessors_local.swift:41:5:41:5 | x | accessors_local.swift:39:20:39:27 | newValue | provenance |  |
+| accessors_local.swift:41:9:41:9 | x | accessors_local.swift:41:5:41:5 | x | provenance |  |
+| accessors_local.swift:45:9:45:9 | y | accessors_local.swift:46:21:46:21 | y | provenance |  |
+| accessors_local.swift:45:9:45:9 | y | accessors_local.swift:47:10:47:10 | x | provenance |  |
+| accessors_local.swift:45:21:45:34 | source(...) | accessors_local.swift:45:9:45:9 | y | provenance |  |
+| accessors_local.swift:54:5:54:5 | y | accessors_local.swift:52:21:52:21 | y | provenance |  |
+| accessors_local.swift:54:5:54:5 | y | accessors_local.swift:55:10:55:10 | x | provenance |  |
+| accessors_local.swift:54:9:54:22 | source(...) | accessors_local.swift:54:5:54:5 | y | provenance |  |
+| accessors_local.swift:59:21:59:34 | source(...) | accessors_local.swift:61:14:61:14 | x | provenance |  |
+| accessors_local.swift:72:5:72:5 | y | accessors_local.swift:70:14:70:14 | x | provenance |  |
+| accessors_local.swift:72:9:72:22 | source(...) | accessors_local.swift:72:5:72:5 | y | provenance |  |
+| accessors_local.swift:84:5:84:5 | y | accessors_local.swift:82:14:82:15 | x3 | provenance |  |
+| accessors_local.swift:84:9:84:22 | source(...) | accessors_local.swift:84:5:84:5 | y | provenance |  |
+| accessors_local.swift:91:20:91:27 | newValue [0] | accessors_local.swift:91:20:91:29 | ... .0 | provenance |  |
+| accessors_local.swift:93:5:93:5 | [post] p [0] | accessors_local.swift:91:20:91:27 | newValue [0] | provenance |  |
+| accessors_local.swift:93:5:93:7 | ... .0 | accessors_local.swift:93:5:93:5 | [post] p [0] | provenance |  |
+| accessors_local.swift:93:11:93:25 | source(...) | accessors_local.swift:93:5:93:7 | ... .0 | provenance |  |
+| accessors_local.swift:99:34:99:38 | field | accessors_local.swift:105:5:105:5 | [post] p [field] | provenance |  |
+| accessors_local.swift:99:42:99:56 | source(...) | accessors_local.swift:99:34:99:38 | field | provenance |  |
+| accessors_local.swift:103:20:103:27 | newValue [field] | accessors_local.swift:103:20:103:33 | ... .field | provenance |  |
+| accessors_local.swift:105:5:105:5 | [post] p [field] | accessors_local.swift:103:20:103:27 | newValue [field] | provenance |  |
+| accessors_static.swift:8:32:8:45 | source(...) | accessors_static.swift:10:10:10:12 | ... .x | provenance |  |
+| accessors_static.swift:18:19:18:32 | source(...) | accessors_static.swift:21:10:21:12 | ... .x | provenance |  |
+| accessors_static.swift:27:19:27:32 | source(...) | accessors_static.swift:31:10:31:12 | ... .x | provenance |  |
+| accessors_static.swift:41:5:41:7 | ... .x | accessors_static.swift:38:24:38:31 | newValue | provenance |  |
+| accessors_static.swift:41:11:41:24 | source(...) | accessors_static.swift:41:5:41:7 | ... .x | provenance |  |
+| accessors_static.swift:47:19:47:32 | source(...) | accessors_static.swift:51:11:51:13 | ... .x | provenance |  |
+| accessors_static.swift:51:5:51:7 | ... .x | accessors_static.swift:48:24:48:31 | newValue | provenance |  |
+| accessors_static.swift:51:11:51:13 | ... .x | accessors_static.swift:51:5:51:7 | ... .x | provenance |  |
+| accessors_static.swift:56:32:56:45 | source(...) | accessors_static.swift:59:18:59:23 | ... .x | provenance |  |
+| accessors_static.swift:56:32:56:45 | source(...) | accessors_static.swift:63:18:63:23 | ... .x | provenance |  |
+| accessors_static.swift:56:32:56:45 | source(...) | accessors_static.swift:64:18:64:18 | x | provenance |  |
+| calls.swift:7:19:7:19 | x | calls.swift:8:14:8:14 | x | provenance |  |
+| calls.swift:10:12:10:25 | source(...) | calls.swift:7:19:7:19 | x | provenance |  |
+| calls.swift:15:16:15:29 | source(...) | calls.swift:17:10:17:17 | target(...) | provenance |  |
+| calls.swift:21:17:21:17 | x | calls.swift:22:14:22:14 | x | provenance |  |
+| calls.swift:24:15:24:28 | source(...) | calls.swift:21:17:21:17 | x | provenance |  |
+| calls.swift:28:19:28:19 | x | calls.swift:29:16:29:16 | x | provenance |  |
+| calls.swift:29:16:29:16 | x | calls.swift:29:16:29:24 | ... + ... | provenance |  |
+| calls.swift:31:17:31:30 | source(...) | calls.swift:28:19:28:19 | x | provenance |  |
+| calls.swift:31:17:31:30 | source(...) | calls.swift:31:10:31:31 | target(...) | provenance |  |
+| calls.swift:32:17:32:30 | source(...) | calls.swift:28:19:28:19 | x | provenance |  |
+| calls.swift:32:17:32:30 | source(...) | calls.swift:32:10:32:31 | target(...) | provenance |  |
+| calls.swift:37:23:37:23 | x | calls.swift:38:14:38:14 | x | provenance |  |
+| calls.swift:40:19:40:32 | source(...) | calls.swift:37:23:37:23 | x | provenance |  |
+| calls.swift:42:18:42:21 | name | calls.swift:43:14:43:17 | name | provenance |  |
+| calls.swift:45:19:45:32 | source(...) | calls.swift:42:18:42:21 | name | provenance |  |
+| calls.swift:49:19:49:19 | x | calls.swift:50:14:50:14 | x | provenance |  |
+| calls.swift:49:32:49:32 | y | calls.swift:51:14:51:14 | y | provenance |  |
+| calls.swift:53:12:53:25 | source(...) | calls.swift:49:19:49:19 | x | provenance |  |
+| calls.swift:53:28:53:41 | source(...) | calls.swift:49:32:49:32 | y | provenance |  |
+| calls.swift:61:19:61:19 | x [Return] [field] | calls.swift:66:12:66:12 | [post] b [field] | provenance |  |
+| calls.swift:62:9:62:9 | [post] x [field] | calls.swift:61:19:61:19 | x [Return] [field] | provenance |  |
+| calls.swift:62:9:62:15 | ... .field | calls.swift:62:9:62:9 | [post] x [field] | provenance |  |
+| calls.swift:62:19:62:32 | source(...) | calls.swift:62:9:62:15 | ... .field | provenance |  |
+| calls.swift:66:12:66:12 | [post] b [field] | calls.swift:67:10:67:10 | b [field] | provenance |  |
+| calls.swift:67:10:67:10 | b [field] | calls.swift:67:10:67:16 | ... .field | provenance |  |
+| calls.swift:75:13:75:17 | field | calls.swift:81:18:81:22 | field | provenance |  |
+| calls.swift:75:13:75:17 | field | calls.swift:87:18:87:21 | self [field] | provenance |  |
+| calls.swift:75:13:75:17 | field | calls.swift:93:18:93:22 | field | provenance |  |
+| calls.swift:75:13:75:17 | field | calls.swift:99:18:99:21 | self [field] | provenance |  |
+| calls.swift:75:13:75:17 | field | calls.swift:105:18:105:22 | field | provenance |  |
+| calls.swift:75:13:75:17 | field | calls.swift:111:18:111:21 | self [field] | provenance |  |
+| calls.swift:75:13:75:17 | field | calls.swift:117:18:117:22 | field | provenance |  |
+| calls.swift:75:13:75:17 | field | calls.swift:123:18:123:21 | self [field] | provenance |  |
+| calls.swift:75:21:75:34 | source(...) | calls.swift:75:13:75:17 | field | provenance |  |
+| calls.swift:87:18:87:21 | self [field] | calls.swift:87:18:87:27 | ... .field | provenance |  |
+| calls.swift:99:18:99:21 | self [field] | calls.swift:99:18:99:27 | ... .field | provenance |  |
+| calls.swift:111:18:111:21 | self [field] | calls.swift:111:18:111:27 | ... .field | provenance |  |
+| calls.swift:123:18:123:21 | self [field] | calls.swift:123:18:123:27 | ... .field | provenance |  |
+| capture.swift:10:9:10:9 | x | capture.swift:12:14:12:14 | x | provenance |  |
+| capture.swift:10:13:10:26 | source(...) | capture.swift:10:9:10:9 | x | provenance |  |
+| capture.swift:20:9:20:9 | x | capture.swift:24:10:24:10 | x | provenance |  |
+| capture.swift:20:13:20:26 | source(...) | capture.swift:20:9:20:9 | x | provenance |  |
+| capture.swift:28:9:28:9 | x | capture.swift:32:14:32:14 | x | provenance |  |
+| capture.swift:28:9:28:9 | x | capture.swift:33:14:33:14 | x | provenance |  |
+| capture.swift:28:9:28:9 | x | capture.swift:38:10:38:11 | y1 | provenance |  |
+| capture.swift:28:9:28:9 | x | capture.swift:39:10:39:11 | y2 | provenance |  |
+| capture.swift:28:13:28:26 | source(...) | capture.swift:28:9:28:9 | x | provenance |  |
+| capture.swift:32:14:32:14 | x | capture.swift:32:9:32:10 | y1 | provenance |  |
+| capture.swift:33:14:33:14 | x | capture.swift:33:9:33:10 | y2 | provenance |  |
+| capture.swift:43:9:43:9 | x | capture.swift:49:13:49:13 | x | provenance |  |
+| capture.swift:43:13:43:26 | source(...) | capture.swift:43:9:43:9 | x | provenance |  |
+| capture.swift:45:22:45:24 | arg | capture.swift:46:13:46:15 | arg | provenance |  |
+| capture.swift:46:13:46:15 | arg | capture.swift:46:9:46:9 | y | provenance |  |
+| capture.swift:49:13:49:13 | x | capture.swift:45:22:45:24 | arg | provenance |  |
+| capture.swift:49:13:49:13 | x | capture.swift:50:10:50:10 | y | provenance |  |
+| capture.swift:54:9:54:9 | x | capture.swift:60:13:60:13 | x | provenance |  |
+| capture.swift:54:13:54:26 | source(...) | capture.swift:54:9:54:9 | x | provenance |  |
+| capture.swift:56:22:56:24 | arg | capture.swift:57:15:57:17 | arg | provenance |  |
+| capture.swift:57:9:57:11 | ... .0 | capture.swift:57:9:57:9 | [post] y [0] | provenance |  |
+| capture.swift:57:15:57:17 | arg | capture.swift:57:9:57:11 | ... .0 | provenance |  |
+| capture.swift:60:13:60:13 | x | capture.swift:56:22:56:24 | arg | provenance |  |
+| capture.swift:60:13:60:13 | x | capture.swift:61:10:61:10 | y [0] | provenance |  |
+| capture.swift:61:10:61:10 | y [0] | capture.swift:61:10:61:12 | ... .0 | provenance |  |
+| capture.swift:69:5:69:5 | x | capture.swift:67:14:67:14 | x | provenance |  |
+| capture.swift:69:9:69:22 | source(...) | capture.swift:69:5:69:5 | x | provenance |  |
+| capture.swift:74:9:74:9 | x | capture.swift:76:14:76:14 | x | provenance |  |
+| capture.swift:74:13:74:26 | source(...) | capture.swift:74:9:74:9 | x | provenance |  |
+| capture.swift:84:9:84:9 | x | capture.swift:88:10:88:10 | x | provenance |  |
+| capture.swift:84:13:84:26 | source(...) | capture.swift:84:9:84:9 | x | provenance |  |
+| capture.swift:93:9:93:9 | x | capture.swift:94:13:94:19 | local(...) | provenance |  |
+| capture.swift:93:9:93:9 | x | capture.swift:98:14:98:14 | x | provenance |  |
+| capture.swift:93:9:93:9 | x | capture.swift:99:16:99:16 | x | provenance |  |
+| capture.swift:93:13:93:26 | source(...) | capture.swift:93:9:93:9 | x | provenance |  |
+| capture.swift:94:9:94:9 | y | capture.swift:95:10:95:10 | y | provenance |  |
+| capture.swift:94:13:94:19 | local(...) | capture.swift:94:9:94:9 | y | provenance |  |
+| capture.swift:104:9:104:9 | x | capture.swift:105:28:105:28 | x | provenance |  |
+| capture.swift:104:9:104:9 | x | capture.swift:108:23:108:23 | x | provenance |  |
+| capture.swift:104:13:104:27 | source(...) | capture.swift:104:9:104:9 | x | provenance |  |
+| capture.swift:105:23:105:24 | x1 | capture.swift:106:14:106:15 | x1 | provenance |  |
+| capture.swift:105:28:105:28 | x | capture.swift:105:23:105:24 | x1 | provenance |  |
+| capture.swift:108:23:108:23 | x | capture.swift:108:23:108:23 | x | provenance |  |
+| capture.swift:108:23:108:23 | x | capture.swift:109:14:109:14 | x | provenance |  |
+| capture.swift:116:9:116:9 | x | capture.swift:117:26:117:26 | x | provenance |  |
+| capture.swift:116:13:116:27 | source(...) | capture.swift:116:9:116:9 | x | provenance |  |
+| capture.swift:117:22:117:22 | x | capture.swift:117:36:117:36 | x | provenance |  |
+| capture.swift:117:22:117:22 | x | capture.swift:118:14:118:14 | x | provenance |  |
+| capture.swift:117:26:117:26 | x | capture.swift:117:22:117:22 | x | provenance |  |
+| capture.swift:117:29:117:32 | blah | capture.swift:119:14:119:17 | blah | provenance |  |
+| capture.swift:117:36:117:36 | x | capture.swift:117:29:117:32 | blah | provenance |  |
+| capture.swift:147:5:147:5 | x | capture.swift:143:14:143:14 | x | provenance |  |
+| capture.swift:147:9:147:23 | source(...) | capture.swift:147:5:147:5 | x | provenance |  |
+| capture.swift:156:9:156:9 | x | capture.swift:158:18:158:21 | self [x] | provenance |  |
+| capture.swift:156:13:156:25 | source(...) | capture.swift:156:9:156:9 | x | provenance |  |
+| capture.swift:158:18:158:21 | self [x] | capture.swift:158:18:158:23 | ... .x | provenance |  |
+| capture.swift:164:9:164:9 | x | capture.swift:165:26:165:29 | self [x] | provenance |  |
+| capture.swift:164:13:164:25 | source(...) | capture.swift:164:9:164:9 | x | provenance |  |
+| capture.swift:165:26:165:29 | self [x] | capture.swift:165:26:165:29 | self [x] | provenance |  |
+| capture.swift:165:26:165:29 | self [x] | capture.swift:166:18:166:21 | self [x] | provenance |  |
+| capture.swift:165:26:165:29 | self [x] | capture.swift:167:18:167:18 | x | provenance |  |
+| capture.swift:166:18:166:21 | self [x] | capture.swift:166:18:166:23 | ... .x | provenance |  |
+| capture.swift:173:9:173:9 | x | capture.swift:174:31:174:34 | self [x] | provenance |  |
+| capture.swift:173:13:173:25 | source(...) | capture.swift:173:9:173:9 | x | provenance |  |
+| capture.swift:174:31:174:34 | self [x] | capture.swift:174:31:174:34 | self [x] | provenance |  |
+| capture.swift:174:31:174:34 | self [x] | capture.swift:175:23:175:26 | self [x] | provenance |  |
+| capture.swift:175:19:175:26 | ... .some(...) [x] | capture.swift:175:23:175:26 | self [x] | provenance |  |
+| capture.swift:175:23:175:26 | self [x] | capture.swift:175:19:175:26 | ... .some(...) [x] | provenance |  |
+| capture.swift:175:23:175:26 | self [x] | capture.swift:176:18:176:21 | self [x] | provenance |  |
+| capture.swift:175:23:175:26 | self [x] | capture.swift:177:18:177:18 | x | provenance |  |
+| capture.swift:176:18:176:21 | self [x] | capture.swift:176:18:176:23 | ... .x | provenance |  |
+| capture.swift:183:9:183:9 | x | capture.swift:184:34:184:37 | self [x] | provenance |  |
+| capture.swift:183:13:183:25 | source(...) | capture.swift:183:9:183:9 | x | provenance |  |
+| capture.swift:184:34:184:37 | self [x] | capture.swift:184:34:184:37 | self [x] | provenance |  |
+| capture.swift:184:34:184:37 | self [x] | capture.swift:185:18:185:21 | self [x] | provenance |  |
+| capture.swift:184:34:184:37 | self [x] | capture.swift:186:18:186:18 | x | provenance |  |
+| capture.swift:185:18:185:21 | self [x] | capture.swift:185:18:185:23 | ... .x | provenance |  |
+| enums.swift:12:9:12:9 | e [case1.0] | enums.swift:14:12:14:12 | e [case1.0] | provenance |  |
+| enums.swift:12:13:12:35 | ... .case1(...) [case1.0] | enums.swift:12:9:12:9 | e [case1.0] | provenance |  |
+| enums.swift:12:21:12:34 | source(...) | enums.swift:12:13:12:35 | ... .case1(...) [case1.0] | provenance |  |
+| enums.swift:14:12:14:12 | e [case1.0] | enums.swift:15:10:15:23 | ... .case1(...) [case1.0] | provenance |  |
+| enums.swift:15:10:15:23 | ... .case1(...) [case1.0] | enums.swift:15:22:15:22 | x | provenance |  |
+| enums.swift:15:22:15:22 | x | enums.swift:16:14:16:14 | x | provenance |  |
+| enums.swift:23:9:23:9 | e [case1.0] | enums.swift:25:12:25:12 | e [case1.0] | provenance |  |
+| enums.swift:23:13:23:35 | ... .case1(...) [case1.0] | enums.swift:23:9:23:9 | e [case1.0] | provenance |  |
+| enums.swift:23:21:23:34 | source(...) | enums.swift:23:13:23:35 | ... .case1(...) [case1.0] | provenance |  |
+| enums.swift:25:12:25:12 | e [case1.0] | enums.swift:26:10:26:22 | ... .case1(...) [case1.0] | provenance |  |
+| enums.swift:26:10:26:22 | ... .case1(...) [case1.0] | enums.swift:26:21:26:21 | x | provenance |  |
+| enums.swift:26:21:26:21 | x | enums.swift:27:14:27:14 | x | provenance |  |
+| enums.swift:34:9:34:9 | e [case1.0] | enums.swift:35:33:35:33 | e [case1.0] | provenance |  |
+| enums.swift:34:13:34:35 | ... .case1(...) [case1.0] | enums.swift:34:9:34:9 | e [case1.0] | provenance |  |
+| enums.swift:34:21:34:34 | source(...) | enums.swift:34:13:34:35 | ... .case1(...) [case1.0] | provenance |  |
+| enums.swift:35:16:35:29 | ... .case1(...) [case1.0] | enums.swift:35:28:35:28 | x | provenance |  |
+| enums.swift:35:28:35:28 | x | enums.swift:36:10:36:10 | x | provenance |  |
+| enums.swift:35:33:35:33 | e [case1.0] | enums.swift:35:16:35:29 | ... .case1(...) [case1.0] | provenance |  |
+| enums.swift:40:9:40:9 | e [case2.0] | enums.swift:41:12:41:12 | e [case2.0] | provenance |  |
+| enums.swift:40:9:40:9 | e [case2.0] | enums.swift:48:12:48:12 | e [case2.0] | provenance |  |
+| enums.swift:40:13:40:35 | ... .case2(...) [case2.0] | enums.swift:40:9:40:9 | e [case2.0] | provenance |  |
+| enums.swift:40:21:40:34 | source(...) | enums.swift:40:13:40:35 | ... .case2(...) [case2.0] | provenance |  |
+| enums.swift:41:12:41:12 | e [case2.0] | enums.swift:44:10:44:23 | ... .case2(...) [case2.0] | provenance |  |
+| enums.swift:44:10:44:23 | ... .case2(...) [case2.0] | enums.swift:44:22:44:22 | x | provenance |  |
+| enums.swift:44:22:44:22 | x | enums.swift:45:14:45:14 | x | provenance |  |
+| enums.swift:48:12:48:12 | e [case2.0] | enums.swift:49:10:49:23 | ... .case2(...) [case2.0] | provenance |  |
+| enums.swift:49:10:49:23 | ... .case2(...) [case2.0] | enums.swift:49:22:49:22 | x | provenance |  |
+| enums.swift:49:22:49:22 | x | enums.swift:50:14:50:14 | x | provenance |  |
+| enums.swift:57:9:57:13 | opt_x | enums.swift:58:19:58:23 | opt_x | provenance |  |
+| enums.swift:57:31:57:44 | source(...) | enums.swift:57:9:57:13 | opt_x | provenance |  |
+| enums.swift:58:11:58:15 | ... .some(...) | enums.swift:58:15:58:15 | x | provenance |  |
+| enums.swift:58:15:58:15 | x | enums.swift:59:10:59:10 | x | provenance |  |
+| enums.swift:58:19:58:23 | opt_x | enums.swift:58:11:58:15 | ... .some(...) | provenance |  |
+| enums.swift:63:9:63:13 | opt_x | enums.swift:64:15:64:19 | opt_x | provenance |  |
+| enums.swift:63:31:63:44 | source(...) | enums.swift:63:9:63:13 | opt_x | provenance |  |
+| enums.swift:64:11:64:19 | ... .some(...) | enums.swift:64:15:64:19 | opt_x | provenance |  |
+| enums.swift:64:15:64:19 | opt_x | enums.swift:64:11:64:19 | ... .some(...) | provenance |  |
+| enums.swift:64:15:64:19 | opt_x | enums.swift:65:10:65:14 | opt_x | provenance |  |
+| enums.swift:73:9:73:9 | e [foo.0] | enums.swift:74:12:74:12 | e [foo.0] | provenance |  |
+| enums.swift:73:9:73:9 | e [foo.0] | enums.swift:82:12:82:12 | e [foo.0] | provenance |  |
+| enums.swift:73:13:73:48 | ... .foo(...) [foo.0] | enums.swift:73:9:73:9 | e [foo.0] | provenance |  |
+| enums.swift:73:34:73:47 | source(...) | enums.swift:73:13:73:48 | ... .foo(...) [foo.0] | provenance |  |
+| enums.swift:74:12:74:12 | e [foo.0] | enums.swift:75:10:75:20 | ... .foo(...) [foo.0] | provenance |  |
+| enums.swift:75:10:75:20 | ... .foo(...) [foo.0] | enums.swift:75:19:75:19 | x | provenance |  |
+| enums.swift:75:19:75:19 | x | enums.swift:76:14:76:14 | x | provenance |  |
+| enums.swift:82:12:82:12 | e [foo.0] | enums.swift:83:10:83:23 | ... .foo(...) [foo.0] | provenance |  |
+| enums.swift:83:10:83:23 | ... .foo(...) [foo.0] | enums.swift:83:22:83:22 | x | provenance |  |
+| enums.swift:83:22:83:22 | x | enums.swift:84:14:84:14 | x | provenance |  |
+| flow-summaries.swift:2:9:2:9 | x | flow-summaries.swift:3:35:3:35 | x | provenance |  |
+| flow-summaries.swift:2:13:2:26 | source(...) | flow-summaries.swift:2:9:2:9 | x | provenance |  |
+| flow-summaries.swift:3:9:3:9 | y | flow-summaries.swift:4:10:4:10 | y | provenance |  |
+| flow-summaries.swift:3:13:3:36 | ... .identityFlow(...) | flow-summaries.swift:3:9:3:9 | y | provenance |  |
+| flow-summaries.swift:3:35:3:35 | x | flow-summaries.swift:3:13:3:36 | ... .identityFlow(...) | provenance |  |
+| flow-summaries.swift:8:9:8:9 | x | flow-summaries.swift:9:37:9:37 | x | provenance |  |
+| flow-summaries.swift:8:13:8:26 | source(...) | flow-summaries.swift:8:9:8:9 | x | provenance |  |
+| flow-summaries.swift:9:9:9:13 | array [ArrayElement] | flow-summaries.swift:10:18:10:22 | array [ArrayElement] | provenance |  |
+| flow-summaries.swift:9:17:9:38 | ... .storeArray(...) [ArrayElement] | flow-summaries.swift:9:9:9:13 | array [ArrayElement] | provenance |  |
+| flow-summaries.swift:9:37:9:37 | x | flow-summaries.swift:9:17:9:38 | ... .storeArray(...) [ArrayElement] | provenance |  |
+| flow-summaries.swift:10:13:10:13 | y | flow-summaries.swift:11:14:11:14 | y | provenance |  |
+| flow-summaries.swift:10:18:10:22 | array [ArrayElement] | flow-summaries.swift:10:13:10:13 | y | provenance |  |
+| flow-summaries.swift:16:9:16:13 | array [ArrayElement] | flow-summaries.swift:17:32:17:36 | array [ArrayElement] | provenance |  |
+| flow-summaries.swift:16:17:16:48 | ArrayLiteral [ArrayElement] | flow-summaries.swift:16:9:16:13 | array [ArrayElement] | provenance |  |
+| flow-summaries.swift:16:18:16:31 | source(...) | flow-summaries.swift:16:17:16:48 | ArrayLiteral [ArrayElement] | provenance |  |
+| flow-summaries.swift:16:34:16:47 | source(...) | flow-summaries.swift:16:17:16:48 | ArrayLiteral [ArrayElement] | provenance |  |
+| flow-summaries.swift:17:9:17:9 | y | flow-summaries.swift:18:10:18:10 | y | provenance |  |
+| flow-summaries.swift:17:13:17:37 | ... .readArray(...) | flow-summaries.swift:17:9:17:9 | y | provenance |  |
+| flow-summaries.swift:17:32:17:36 | array [ArrayElement] | flow-summaries.swift:17:13:17:37 | ... .readArray(...) | provenance |  |
+| flow-summaries.swift:25:9:25:9 | x | flow-summaries.swift:28:36:28:36 | x | provenance |  |
+| flow-summaries.swift:25:13:25:26 | source(...) | flow-summaries.swift:25:9:25:9 | x | provenance |  |
+| flow-summaries.swift:28:36:28:36 | x | flow-summaries.swift:28:47:28:49 | [post] box [outputField] | provenance |  |
+| flow-summaries.swift:28:47:28:49 | [post] box [outputField] | flow-summaries.swift:29:10:29:12 | box [outputField] | provenance |  |
+| flow-summaries.swift:29:10:29:12 | box [outputField] | flow-summaries.swift:29:10:29:24 | ... .outputField | provenance |  |
+| flow-summaries.swift:33:9:33:9 | x | flow-summaries.swift:34:39:34:39 | x | provenance |  |
+| flow-summaries.swift:33:13:33:26 | source(...) | flow-summaries.swift:33:9:33:9 | x | provenance |  |
+| flow-summaries.swift:34:9:34:9 | y [unusualNameNotAppearingInSourceCode] | flow-summaries.swift:35:38:35:38 | y [unusualNameNotAppearingInSourceCode] | provenance |  |
+| flow-summaries.swift:34:13:34:40 | ... .storeUnusualName(...) [unusualNameNotAppearingInSourceCode] | flow-summaries.swift:34:9:34:9 | y [unusualNameNotAppearingInSourceCode] | provenance |  |
+| flow-summaries.swift:34:39:34:39 | x | flow-summaries.swift:34:13:34:40 | ... .storeUnusualName(...) [unusualNameNotAppearingInSourceCode] | provenance |  |
+| flow-summaries.swift:35:9:35:9 | z | flow-summaries.swift:36:10:36:10 | z | provenance |  |
+| flow-summaries.swift:35:13:35:39 | ... .readUnusualName(...) | flow-summaries.swift:35:9:35:9 | z | provenance |  |
+| flow-summaries.swift:35:38:35:38 | y [unusualNameNotAppearingInSourceCode] | flow-summaries.swift:35:13:35:39 | ... .readUnusualName(...) | provenance |  |
+| flow-summaries.swift:40:9:40:9 | x | flow-summaries.swift:41:27:41:27 | x | provenance |  |
+| flow-summaries.swift:40:13:40:26 | source(...) | flow-summaries.swift:40:9:40:9 | x | provenance |  |
+| flow-summaries.swift:41:27:41:27 | x | flow-summaries.swift:41:32:41:32 | y | provenance |  |
+| flow-summaries.swift:41:32:41:32 | y | flow-summaries.swift:42:14:42:14 | y | provenance |  |
+| flow-summaries.swift:47:9:47:9 | y | flow-summaries.swift:50:10:50:10 | y | provenance |  |
+| flow-summaries.swift:47:13:49:5 | ... .outOfCallback(...) | flow-summaries.swift:47:9:47:9 | y | provenance |  |
+| flow-summaries.swift:48:16:48:29 | source(...) | flow-summaries.swift:47:13:49:5 | ... .outOfCallback(...) | provenance |  |
+| flow-summaries.swift:54:35:54:48 | source(...) | flow-summaries.swift:54:10:54:67 | ... .throughCallback(...) | provenance |  |
+| flow-summaries.swift:54:35:54:48 | source(...) | flow-summaries.swift:54:53:54:53 | y | provenance |  |
+| flow-summaries.swift:54:53:54:53 | y | flow-summaries.swift:54:65:54:65 | y | provenance |  |
+| flow-summaries.swift:55:35:55:48 | source(...) | flow-summaries.swift:55:10:55:73 | ... .throughCallback(...) | provenance |  |
+| flow-summaries.swift:55:35:55:48 | source(...) | flow-summaries.swift:55:53:55:53 | y | provenance |  |
+| flow-summaries.swift:55:53:55:53 | y | flow-summaries.swift:55:65:55:65 | y | provenance |  |
+| flow-summaries.swift:55:65:55:65 | y | flow-summaries.swift:55:65:55:71 | ... + ... | provenance |  |
+| flow-summaries.swift:61:29:61:42 | source(...) | flow-summaries.swift:61:10:61:43 | ... .taintFlow(...) | provenance |  |
+| flow-summaries.swift:65:9:65:9 | x | flow-summaries.swift:67:10:67:10 | x | provenance |  |
+| flow-summaries.swift:65:9:65:9 | x | flow-summaries.swift:69:20:69:20 | x | provenance |  |
+| flow-summaries.swift:65:9:65:9 | x | flow-summaries.swift:70:10:70:10 | x | provenance |  |
+| flow-summaries.swift:65:13:65:27 | source(...) | flow-summaries.swift:65:9:65:9 | x | provenance |  |
+| flow-summaries.swift:66:9:66:9 | y | flow-summaries.swift:68:10:68:10 | y | provenance |  |
+| flow-summaries.swift:66:9:66:9 | y | flow-summaries.swift:69:24:69:24 | y | provenance |  |
+| flow-summaries.swift:66:9:66:9 | y | flow-summaries.swift:71:10:71:10 | y | provenance |  |
+| flow-summaries.swift:66:13:66:27 | source(...) | flow-summaries.swift:66:9:66:9 | y | provenance |  |
+| flow-summaries.swift:69:19:69:20 | & ... | flow-summaries.swift:69:23:69:24 | [post] & ... | provenance |  |
+| flow-summaries.swift:69:19:69:20 | [post] & ... | flow-summaries.swift:70:10:70:10 | x | provenance |  |
+| flow-summaries.swift:69:20:69:20 | x | flow-summaries.swift:69:19:69:20 | & ... | provenance |  |
+| flow-summaries.swift:69:23:69:24 | & ... | flow-summaries.swift:69:19:69:20 | [post] & ... | provenance |  |
+| flow-summaries.swift:69:23:69:24 | [post] & ... | flow-summaries.swift:71:10:71:10 | y | provenance |  |
+| flow-summaries.swift:69:24:69:24 | y | flow-summaries.swift:69:23:69:24 | & ... | provenance |  |
+| flow-summaries.swift:76:16:76:30 | source(...) | flow-summaries.swift:77:10:77:10 | t [field] | provenance |  |
+| flow-summaries.swift:77:10:77:10 | t [field] | flow-summaries.swift:77:10:77:21 | ... .getField(...) | provenance |  |
+| implicit-self.swift:16:9:16:12 | [post] self [x] | implicit-self.swift:17:14:17:17 | self [x] | provenance |  |
+| implicit-self.swift:16:9:16:14 | ... .x | implicit-self.swift:16:9:16:12 | [post] self [x] | provenance |  |
+| implicit-self.swift:16:18:16:31 | source(...) | implicit-self.swift:16:9:16:14 | ... .x | provenance |  |
+| implicit-self.swift:17:14:17:17 | self [x] | implicit-self.swift:17:14:17:19 | ... .x | provenance |  |
+| implicit-self.swift:22:9:22:9 | x | implicit-self.swift:23:14:23:14 | x | provenance |  |
+| implicit-self.swift:22:13:22:26 | source(...) | implicit-self.swift:22:9:22:9 | x | provenance |  |
+| implicit-self.swift:28:9:28:9 | x | implicit-self.swift:29:14:29:17 | self [x] | provenance |  |
+| implicit-self.swift:28:13:28:26 | source(...) | implicit-self.swift:28:9:28:9 | x | provenance |  |
+| implicit-self.swift:29:14:29:17 | self [x] | implicit-self.swift:29:14:29:19 | ... .x | provenance |  |
+| implicit-self.swift:34:9:34:12 | [post] self [x] | implicit-self.swift:35:14:35:14 | x | provenance |  |
+| implicit-self.swift:34:9:34:14 | ... .x | implicit-self.swift:34:9:34:12 | [post] self [x] | provenance |  |
+| implicit-self.swift:34:18:34:31 | source(...) | implicit-self.swift:34:9:34:14 | ... .x | provenance |  |
+| implicit-self.swift:40:9:40:12 | [post] self [box, x] | implicit-self.swift:41:14:41:17 | self [box, x] | provenance |  |
+| implicit-self.swift:40:9:40:16 | [post] ... .box [x] | implicit-self.swift:40:9:40:12 | [post] self [box, x] | provenance |  |
+| implicit-self.swift:40:9:40:18 | ... .x | implicit-self.swift:40:9:40:16 | [post] ... .box [x] | provenance |  |
+| implicit-self.swift:40:22:40:35 | source(...) | implicit-self.swift:40:9:40:18 | ... .x | provenance |  |
+| implicit-self.swift:41:14:41:17 | self [box, x] | implicit-self.swift:41:14:41:21 | ... .box [x] | provenance |  |
+| implicit-self.swift:41:14:41:21 | ... .box [x] | implicit-self.swift:41:14:41:23 | ... .x | provenance |  |
+| implicit-self.swift:46:9:46:11 | [post] box [x] | implicit-self.swift:47:14:47:16 | box [x] | provenance |  |
+| implicit-self.swift:46:9:46:13 | ... .x | implicit-self.swift:46:9:46:11 | [post] box [x] | provenance |  |
+| implicit-self.swift:46:17:46:30 | source(...) | implicit-self.swift:46:9:46:13 | ... .x | provenance |  |
+| implicit-self.swift:47:14:47:16 | box [x] | implicit-self.swift:47:14:47:18 | ... .x | provenance |  |
+| implicit-self.swift:52:9:52:11 | [post] box [x] | implicit-self.swift:53:14:53:17 | self [box, x] | provenance |  |
+| implicit-self.swift:52:9:52:13 | ... .x | implicit-self.swift:52:9:52:11 | [post] box [x] | provenance |  |
+| implicit-self.swift:52:17:52:30 | source(...) | implicit-self.swift:52:9:52:13 | ... .x | provenance |  |
+| implicit-self.swift:53:14:53:17 | self [box, x] | implicit-self.swift:53:14:53:21 | ... .box [x] | provenance |  |
+| implicit-self.swift:53:14:53:21 | ... .box [x] | implicit-self.swift:53:14:53:23 | ... .x | provenance |  |
+| implicit-self.swift:58:9:58:12 | [post] self [box, x] | implicit-self.swift:59:14:59:16 | box [x] | provenance |  |
+| implicit-self.swift:58:9:58:16 | [post] ... .box [x] | implicit-self.swift:58:9:58:12 | [post] self [box, x] | provenance |  |
+| implicit-self.swift:58:9:58:18 | ... .x | implicit-self.swift:58:9:58:16 | [post] ... .box [x] | provenance |  |
+| implicit-self.swift:58:22:58:35 | source(...) | implicit-self.swift:58:9:58:18 | ... .x | provenance |  |
+| implicit-self.swift:59:14:59:16 | box [x] | implicit-self.swift:59:14:59:18 | ... .x | provenance |  |
+| implicit-self.swift:64:9:64:9 | [incoming] x | implicit-self.swift:65:14:65:14 | x | provenance |  |
+| implicit-self.swift:64:9:64:9 | [incoming] x | implicit-self.swift:66:14:66:17 | self [x] | provenance |  |
+| implicit-self.swift:64:24:64:37 | source(...) | implicit-self.swift:64:9:64:9 | [incoming] x | provenance |  |
+| implicit-self.swift:66:14:66:17 | self [x] | implicit-self.swift:66:14:66:19 | ... .x | provenance |  |
+| implicit-self.swift:71:9:71:12 | [post] self [x] | implicit-self.swift:72:14:72:14 | x | provenance |  |
+| implicit-self.swift:71:9:71:12 | [post] self [x] | implicit-self.swift:73:14:73:17 | self [x] | provenance |  |
+| implicit-self.swift:71:9:71:14 | [incoming] ... .x | implicit-self.swift:71:9:71:12 | [post] self [x] | provenance |  |
+| implicit-self.swift:71:29:71:43 | source(...) | implicit-self.swift:71:9:71:14 | [incoming] ... .x | provenance |  |
+| implicit-self.swift:73:14:73:17 | self [x] | implicit-self.swift:73:14:73:19 | ... .x | provenance |  |
+| implicit-self.swift:78:9:78:9 | [incoming] x | implicit-self.swift:79:14:79:14 | x | provenance |  |
+| implicit-self.swift:78:9:78:9 | [incoming] x | implicit-self.swift:80:14:80:17 | self [x] | provenance |  |
+| implicit-self.swift:78:24:78:38 | source(...) | implicit-self.swift:78:9:78:9 | [incoming] x | provenance |  |
+| implicit-self.swift:80:14:80:17 | self [x] | implicit-self.swift:80:14:80:19 | ... .x | provenance |  |
+| implicit-self.swift:85:9:85:12 | [post] self [x] | implicit-self.swift:86:14:86:14 | x | provenance |  |
+| implicit-self.swift:85:9:85:12 | [post] self [x] | implicit-self.swift:87:14:87:17 | self [x] | provenance |  |
+| implicit-self.swift:85:9:85:14 | [incoming] ... .x | implicit-self.swift:85:9:85:12 | [post] self [x] | provenance |  |
+| implicit-self.swift:85:29:85:43 | source(...) | implicit-self.swift:85:9:85:14 | [incoming] ... .x | provenance |  |
+| implicit-self.swift:87:14:87:17 | self [x] | implicit-self.swift:87:14:87:19 | ... .x | provenance |  |
+| short-return.swift:7:33:7:46 | source(...) | short-return.swift:8:10:8:19 | getValue(...) | provenance |  |
+| test.swift:17:10:17:23 | source(...) | test.swift:17:10:17:32 | ... + ... | provenance |  |
+| test.swift:18:19:18:32 | source(...) | test.swift:18:10:18:32 | ... + ... | provenance |  |
+| test.swift:20:13:20:26 | source(...) | test.swift:20:10:20:33 | StringInterpolationExpr | provenance |  |
+| test.swift:21:18:21:31 | source(...) | test.swift:21:10:21:33 | StringInterpolationExpr | provenance |  |
+| test.swift:22:18:22:31 | source(...) | test.swift:22:10:22:38 | StringInterpolationExpr | provenance |  |
+| test.swift:27:10:27:33 | TupleExpr [0] | test.swift:27:10:27:35 | ... .0 | provenance |  |
+| test.swift:27:11:27:24 | source(...) | test.swift:27:10:27:33 | TupleExpr [0] | provenance |  |
+| test.swift:30:10:30:33 | TupleExpr [1] | test.swift:30:10:30:35 | ... .1 | provenance |  |
+| test.swift:30:19:30:32 | source(...) | test.swift:30:10:30:33 | TupleExpr [1] | provenance |  |
+| test.swift:34:9:34:9 | a | test.swift:35:10:35:10 | a | provenance |  |
+| test.swift:34:13:34:26 | source(...) | test.swift:34:9:34:9 | a | provenance |  |
+| test.swift:39:9:39:14 | TupleExpr [0] | test.swift:39:10:39:10 | a | provenance |  |
+| test.swift:39:10:39:10 | a | test.swift:40:10:40:10 | a | provenance |  |
+| test.swift:39:18:39:41 | TupleExpr [0] | test.swift:39:9:39:14 | TupleExpr [0] | provenance |  |
+| test.swift:39:19:39:32 | source(...) | test.swift:39:18:39:41 | TupleExpr [0] | provenance |  |
+| test.swift:43:9:43:14 | TupleExpr [1] | test.swift:43:13:43:13 | d | provenance |  |
+| test.swift:43:13:43:13 | d | test.swift:45:10:45:10 | d | provenance |  |
+| test.swift:43:18:43:41 | TupleExpr [1] | test.swift:43:9:43:14 | TupleExpr [1] | provenance |  |
+| test.swift:43:27:43:40 | source(...) | test.swift:43:18:43:41 | TupleExpr [1] | provenance |  |
+| test.swift:49:9:49:9 | a | test.swift:50:10:50:10 | a | provenance |  |
+| test.swift:49:13:49:26 | source(...) | test.swift:49:9:49:9 | a | provenance |  |
+| test.swift:57:5:57:9 | [post] tuple [0] | test.swift:58:10:58:14 | tuple [0] | provenance |  |
+| test.swift:57:5:57:11 | ... .0 | test.swift:57:5:57:9 | [post] tuple [0] | provenance |  |
+| test.swift:57:15:57:28 | source(...) | test.swift:57:5:57:11 | ... .0 | provenance |  |
+| test.swift:58:10:58:14 | tuple [0] | test.swift:58:10:58:16 | ... .0 | provenance |  |
+| test.swift:64:5:64:14 | [post] deep_tuple [1, 0] | test.swift:69:10:69:19 | deep_tuple [1, 0] | provenance |  |
+| test.swift:64:5:64:16 | [post] ... .1 [0] | test.swift:64:5:64:14 | [post] deep_tuple [1, 0] | provenance |  |
+| test.swift:64:5:64:18 | ... .0 | test.swift:64:5:64:16 | [post] ... .1 [0] | provenance |  |
+| test.swift:64:22:64:35 | source(...) | test.swift:64:5:64:18 | ... .0 | provenance |  |
+| test.swift:69:10:69:19 | deep_tuple [1, 0] | test.swift:69:10:69:21 | ... .1 [0] | provenance |  |
+| test.swift:69:10:69:21 | ... .1 [0] | test.swift:69:10:69:23 | ... .0 | provenance |  |
+| test.swift:75:5:75:16 | TupleExpr [0] | test.swift:75:6:75:12 | ... .1 | provenance |  |
+| test.swift:75:6:75:10 | [post] tuple [1] | test.swift:77:10:77:14 | tuple [1] | provenance |  |
+| test.swift:75:6:75:12 | ... .1 | test.swift:75:6:75:10 | [post] tuple [1] | provenance |  |
+| test.swift:75:20:75:51 | TupleExpr [0] | test.swift:75:5:75:16 | TupleExpr [0] | provenance |  |
+| test.swift:75:21:75:34 | source(...) | test.swift:75:20:75:51 | TupleExpr [0] | provenance |  |
+| test.swift:77:10:77:14 | tuple [1] | test.swift:77:10:77:16 | ... .1 | provenance |  |
+| test.swift:85:5:85:9 | [post] tuple [0] | test.swift:86:10:86:14 | tuple [0] | provenance |  |
+| test.swift:85:5:85:11 | ... .0 | test.swift:85:5:85:9 | [post] tuple [0] | provenance |  |
+| test.swift:85:15:85:29 | source(...) | test.swift:85:5:85:11 | ... .0 | provenance |  |
+| test.swift:86:10:86:14 | tuple [0] | test.swift:86:10:86:16 | ... .0 | provenance |  |
+| test.swift:97:9:97:9 | x | test.swift:101:10:101:10 | x | provenance |  |
+| test.swift:97:9:97:9 | x | test.swift:110:14:110:14 | x | provenance |  |
+| test.swift:97:13:97:27 | source(...) | test.swift:97:9:97:9 | x | provenance |  |
+| test.swift:105:9:105:9 | y | test.swift:107:10:107:10 | y | provenance |  |
+| test.swift:105:9:105:9 | y | test.swift:111:14:111:14 | y | provenance |  |
+| test.swift:105:13:105:27 | source(...) | test.swift:105:9:105:9 | y | provenance |  |
+| test.swift:118:9:118:13 | [post] tuple [0] | test.swift:123:10:123:14 | tuple [0] | provenance |  |
+| test.swift:118:9:118:15 | ... .0 | test.swift:118:9:118:13 | [post] tuple [0] | provenance |  |
+| test.swift:118:19:118:33 | source(...) | test.swift:118:9:118:15 | ... .0 | provenance |  |
+| test.swift:123:10:123:14 | tuple [0] | test.swift:123:10:123:16 | ... .0 | provenance |  |
+| test.swift:128:9:128:13 | tuple [0] | test.swift:131:18:131:22 | tuple [0] | provenance |  |
+| test.swift:128:9:128:13 | tuple [1] | test.swift:131:18:131:22 | tuple [1] | provenance |  |
+| test.swift:128:17:128:50 | TupleExpr [0] | test.swift:128:9:128:13 | tuple [0] | provenance |  |
+| test.swift:128:17:128:50 | TupleExpr [1] | test.swift:128:9:128:13 | tuple [1] | provenance |  |
+| test.swift:128:18:128:32 | source(...) | test.swift:128:17:128:50 | TupleExpr [0] | provenance |  |
+| test.swift:128:35:128:49 | source(...) | test.swift:128:17:128:50 | TupleExpr [1] | provenance |  |
+| test.swift:131:9:131:14 | TupleExpr [0] | test.swift:131:10:131:10 | a | provenance |  |
+| test.swift:131:9:131:14 | TupleExpr [1] | test.swift:131:13:131:13 | b | provenance |  |
+| test.swift:131:10:131:10 | a | test.swift:136:10:136:10 | a | provenance |  |
+| test.swift:131:13:131:13 | b | test.swift:137:10:137:10 | b | provenance |  |
+| test.swift:131:18:131:22 | tuple [0] | test.swift:131:9:131:14 | TupleExpr [0] | provenance |  |
+| test.swift:131:18:131:22 | tuple [1] | test.swift:131:9:131:14 | TupleExpr [1] | provenance |  |
+| test.swift:142:5:142:5 | a | test.swift:143:10:143:10 | a | provenance |  |
+| test.swift:142:19:142:33 | source(...) | test.swift:142:5:142:5 | a | provenance |  |
+| test.swift:148:5:148:5 | [incoming] a | test.swift:149:10:149:10 | a | provenance |  |
+| test.swift:148:10:148:24 | source(...) | test.swift:148:5:148:5 | [incoming] a | provenance |  |
+| test.swift:154:5:154:5 | [incoming] a | test.swift:155:10:155:10 | a | provenance |  |
+| test.swift:154:20:154:34 | source(...) | test.swift:154:5:154:5 | [incoming] a | provenance |  |
+| test.swift:160:5:160:5 | [post] a [0] | test.swift:161:10:161:10 | a [0] | provenance |  |
+| test.swift:160:5:160:7 | ... .0 | test.swift:160:5:160:5 | [post] a [0] | provenance |  |
+| test.swift:160:23:160:37 | source(...) | test.swift:160:5:160:7 | ... .0 | provenance |  |
+| test.swift:161:10:161:10 | a [0] | test.swift:161:10:161:12 | ... .0 | provenance |  |
+| test.swift:167:5:167:12 | TupleExpr [0] | test.swift:167:6:167:8 | ... .0 | provenance |  |
+| test.swift:167:6:167:6 | [post] a [0] | test.swift:168:10:168:10 | a [0] | provenance |  |
+| test.swift:167:6:167:8 | ... .0 | test.swift:167:6:167:6 | [post] a [0] | provenance |  |
+| test.swift:167:16:167:61 | TupleExpr [0] | test.swift:167:5:167:12 | TupleExpr [0] | provenance |  |
+| test.swift:167:17:167:43 | ... + ... | test.swift:167:16:167:61 | TupleExpr [0] | provenance |  |
+| test.swift:167:29:167:43 | source(...) | test.swift:167:17:167:43 | ... + ... | provenance |  |
+| test.swift:168:10:168:10 | a [0] | test.swift:168:10:168:12 | ... .0 | provenance |  |
+| test.swift:175:5:175:10 | TupleExpr [0] | test.swift:175:6:175:6 | a | provenance |  |
+| test.swift:175:5:175:10 | TupleExpr [1] | test.swift:175:9:175:9 | b | provenance |  |
+| test.swift:175:6:175:6 | a | test.swift:176:10:176:10 | a | provenance |  |
+| test.swift:175:9:175:9 | b | test.swift:177:10:177:10 | b | provenance |  |
+| test.swift:175:14:175:67 | TupleExpr [0] | test.swift:175:5:175:10 | TupleExpr [0] | provenance |  |
+| test.swift:175:14:175:67 | TupleExpr [1] | test.swift:175:5:175:10 | TupleExpr [1] | provenance |  |
+| test.swift:175:15:175:39 | ... + ... | test.swift:175:14:175:67 | TupleExpr [0] | provenance |  |
+| test.swift:175:25:175:39 | source(...) | test.swift:175:15:175:39 | ... + ... | provenance |  |
+| test.swift:175:42:175:66 | ... + ... | test.swift:175:14:175:67 | TupleExpr [1] | provenance |  |
+| test.swift:175:52:175:66 | source(...) | test.swift:175:42:175:66 | ... + ... | provenance |  |
+| test.swift:182:9:182:9 | x | test.swift:185:10:185:10 | x | provenance |  |
+| test.swift:182:13:182:27 | source(...) | test.swift:182:9:182:9 | x | provenance |  |
+| test.swift:183:9:183:9 | y | test.swift:186:10:186:10 | y | provenance |  |
+| test.swift:183:13:183:27 | source(...) | test.swift:183:9:183:9 | y | provenance |  |
+| test.swift:189:22:189:22 | s | test.swift:189:58:189:58 | s | provenance |  |
+| test.swift:191:25:191:25 | s | test.swift:191:62:191:62 | s | provenance |  |
+| test.swift:193:30:193:30 | s | test.swift:193:73:193:73 | s | provenance |  |
+| test.swift:196:16:196:45 | asyncIdentity(...) | test.swift:196:10:196:45 | await ... | provenance |  |
+| test.swift:196:30:196:44 | source(...) | test.swift:189:22:189:22 | s | provenance |  |
+| test.swift:196:30:196:44 | source(...) | test.swift:196:16:196:45 | asyncIdentity(...) | provenance |  |
+| test.swift:200:14:200:46 | throwingIdentity(...) | test.swift:200:10:200:46 | try ... | provenance |  |
+| test.swift:200:31:200:45 | source(...) | test.swift:191:25:191:25 | s | provenance |  |
+| test.swift:200:31:200:45 | source(...) | test.swift:200:14:200:46 | throwingIdentity(...) | provenance |  |
+| test.swift:201:9:201:11 | opt | test.swift:202:12:202:14 | opt | provenance |  |
+| test.swift:201:20:201:52 | throwingIdentity(...) | test.swift:201:9:201:11 | opt | provenance |  |
+| test.swift:201:37:201:51 | source(...) | test.swift:191:25:191:25 | s | provenance |  |
+| test.swift:201:37:201:51 | source(...) | test.swift:201:20:201:52 | throwingIdentity(...) | provenance |  |
+| test.swift:202:8:202:14 | ... .some(...) | test.swift:202:12:202:14 | opt | provenance |  |
+| test.swift:202:12:202:14 | opt | test.swift:202:8:202:14 | ... .some(...) | provenance |  |
+| test.swift:202:12:202:14 | opt | test.swift:203:14:203:16 | opt | provenance |  |
+| test.swift:205:15:205:47 | throwingIdentity(...) | test.swift:205:10:205:47 | try! ... | provenance |  |
+| test.swift:205:32:205:46 | source(...) | test.swift:191:25:191:25 | s | provenance |  |
+| test.swift:205:32:205:46 | source(...) | test.swift:205:15:205:47 | throwingIdentity(...) | provenance |  |
+| test.swift:209:20:209:57 | asyncThrowingIdentity(...) | test.swift:209:10:209:57 | try ... | provenance |  |
+| test.swift:209:42:209:56 | source(...) | test.swift:193:30:193:30 | s | provenance |  |
+| test.swift:209:42:209:56 | source(...) | test.swift:209:20:209:57 | asyncThrowingIdentity(...) | provenance |  |
+| test.swift:210:9:210:11 | opt | test.swift:211:12:211:14 | opt | provenance |  |
+| test.swift:210:26:210:63 | asyncThrowingIdentity(...) | test.swift:210:9:210:11 | opt | provenance |  |
+| test.swift:210:48:210:62 | source(...) | test.swift:193:30:193:30 | s | provenance |  |
+| test.swift:210:48:210:62 | source(...) | test.swift:210:26:210:63 | asyncThrowingIdentity(...) | provenance |  |
+| test.swift:211:8:211:14 | ... .some(...) | test.swift:211:12:211:14 | opt | provenance |  |
+| test.swift:211:12:211:14 | opt | test.swift:211:8:211:14 | ... .some(...) | provenance |  |
+| test.swift:211:12:211:14 | opt | test.swift:212:14:212:16 | opt | provenance |  |
+| test.swift:214:21:214:58 | asyncThrowingIdentity(...) | test.swift:214:10:214:58 | try! ... | provenance |  |
+| test.swift:214:43:214:57 | source(...) | test.swift:193:30:193:30 | s | provenance |  |
+| test.swift:214:43:214:57 | source(...) | test.swift:214:21:214:58 | asyncThrowingIdentity(...) | provenance |  |
+| test.swift:218:9:218:9 | x | test.swift:219:10:219:10 | x | provenance |  |
+| test.swift:218:9:218:9 | x | test.swift:220:10:220:10 | x | provenance |  |
+| test.swift:218:9:218:9 | x | test.swift:221:16:221:16 | x | provenance |  |
+| test.swift:218:13:218:27 | source(...) | test.swift:218:9:218:9 | x | provenance |  |
+| test.swift:219:10:219:10 | x | test.swift:219:10:219:20 | TypeCastExpr | provenance |  |
+| test.swift:220:10:220:10 | x | test.swift:220:10:220:21 | TypeCastExpr | provenance |  |
+| test.swift:221:8:221:12 | ... .some(...) | test.swift:221:12:221:12 | y | provenance |  |
+| test.swift:221:12:221:12 | y | test.swift:222:14:222:14 | y | provenance |  |
+| test.swift:221:16:221:16 | x | test.swift:221:8:221:12 | ... .some(...) | provenance |  |
+| test.swift:227:9:227:9 | x [ArrayElement] | test.swift:228:20:228:20 | x [ArrayElement] | provenance |  |
+| test.swift:227:13:227:46 | ArrayLiteral [ArrayElement] | test.swift:227:9:227:9 | x [ArrayElement] | provenance |  |
+| test.swift:227:14:227:28 | source(...) | test.swift:227:13:227:46 | ArrayLiteral [ArrayElement] | provenance |  |
+| test.swift:227:31:227:45 | source(...) | test.swift:227:13:227:46 | ArrayLiteral [ArrayElement] | provenance |  |
+| test.swift:228:9:228:15 | element | test.swift:229:14:229:20 | element | provenance |  |
+| test.swift:228:20:228:20 | x [ArrayElement] | test.swift:228:9:228:15 | element | provenance |  |
+| test.swift:236:5:236:8 | [post] ... ! [0] | test.swift:237:10:237:12 | opt [0] | provenance |  |
+| test.swift:236:5:236:10 | ... .0 | test.swift:236:5:236:8 | [post] ... ! [0] | provenance |  |
+| test.swift:236:14:236:28 | source(...) | test.swift:236:5:236:10 | ... .0 | provenance |  |
+| test.swift:237:10:237:12 | opt [0] | test.swift:237:10:237:13 | ... ! [0] | provenance |  |
+| test.swift:237:10:237:13 | ... ! [0] | test.swift:237:10:237:15 | ... .0 | provenance |  |
+| test.swift:242:16:242:45 | ... .some(...) | test.swift:245:18:245:30 | getOptional(...) | provenance |  |
+| test.swift:242:30:242:44 | source(...) | test.swift:242:16:242:45 | ... .some(...) | provenance |  |
+| test.swift:245:9:245:9 | x | test.swift:246:12:246:12 | x | provenance |  |
+| test.swift:245:18:245:30 | getOptional(...) | test.swift:245:9:245:9 | x | provenance |  |
+| test.swift:246:8:246:12 | ... .some(...) | test.swift:246:12:246:12 | x | provenance |  |
+| test.swift:246:12:246:12 | x | test.swift:246:8:246:12 | ... .some(...) | provenance |  |
+| test.swift:246:12:246:12 | x | test.swift:247:14:247:14 | x | provenance |  |
+| test.swift:253:16:253:45 | ... .some(...) | test.swift:255:10:255:22 | getOptional(...) | provenance |  |
+| test.swift:253:16:253:45 | ... .some(...) | test.swift:256:20:256:32 | getOptional(...) | provenance |  |
+| test.swift:253:30:253:44 | source(...) | test.swift:253:16:253:45 | ... .some(...) | provenance |  |
+| test.swift:255:10:255:22 | getOptional(...) | test.swift:255:10:255:35 | ... ?? ... | provenance |  |
+| test.swift:256:20:256:32 | getOptional(...) | test.swift:256:10:256:32 | ... ?? ... | provenance |  |
+| test.swift:264:5:264:23 | ... .field | test.swift:264:6:264:16 | [post] TypeCastExpr [field] | provenance |  |
+| test.swift:264:6:264:16 | [post] TypeCastExpr [field] | test.swift:265:10:265:12 | box [field] | provenance |  |
+| test.swift:264:27:264:41 | source(...) | test.swift:264:5:264:23 | ... .field | provenance |  |
+| test.swift:265:10:265:12 | box [field] | test.swift:265:10:265:18 | ... .field | provenance |  |
+| test.swift:269:14:269:29 | source(...) | test.swift:269:10:269:39 | IfExpr | provenance |  |
+| test.swift:270:24:270:39 | source(...) | test.swift:270:10:270:39 | IfExpr | provenance |  |
+| test.swift:271:9:271:9 | x | test.swift:272:10:272:10 | x | provenance |  |
+| test.swift:271:20:271:35 | source(...) | test.swift:271:9:271:9 | x | provenance |  |
+| test.swift:273:30:273:45 | source(...) | test.swift:274:10:274:12 | f(...) | provenance |  |
+nodes
+| accessors_instance.swift:8:25:8:38 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:10:10:10:14 | ... .x | semmle.label | ... .x |
+| accessors_instance.swift:18:19:18:32 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:21:10:21:14 | ... .x | semmle.label | ... .x |
+| accessors_instance.swift:27:19:27:32 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:31:10:31:14 | ... .x | semmle.label | ... .x |
+| accessors_instance.swift:38:24:38:31 | newValue | semmle.label | newValue |
+| accessors_instance.swift:41:5:41:9 | ... .x | semmle.label | ... .x |
+| accessors_instance.swift:41:13:41:26 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:48:17:48:17 | v | semmle.label | v |
+| accessors_instance.swift:48:27:48:27 | v | semmle.label | v |
+| accessors_instance.swift:51:5:51:9 | ... .x | semmle.label | ... .x |
+| accessors_instance.swift:51:13:51:27 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:57:19:57:32 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:58:24:58:31 | newValue | semmle.label | newValue |
+| accessors_instance.swift:62:5:62:7 | ... .x | semmle.label | ... .x |
+| accessors_instance.swift:62:11:62:13 | ... .x | semmle.label | ... .x |
+| accessors_instance.swift:67:25:67:38 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:70:18:70:23 | ... .x | semmle.label | ... .x |
+| accessors_instance.swift:71:18:71:18 | x | semmle.label | x |
+| accessors_instance.swift:79:25:79:28 | self [field] | semmle.label | self [field] |
+| accessors_instance.swift:79:25:79:34 | ... .field | semmle.label | ... .field |
+| accessors_instance.swift:83:5:83:5 | [post] c [field] | semmle.label | [post] c [field] |
+| accessors_instance.swift:83:5:83:11 | ... .field | semmle.label | ... .field |
+| accessors_instance.swift:83:15:83:28 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:84:10:84:10 | c [field] | semmle.label | c [field] |
+| accessors_instance.swift:84:10:84:12 | ... .x | semmle.label | ... .x |
+| accessors_instance.swift:93:19:93:28 | otherField | semmle.label | otherField |
+| accessors_instance.swift:93:32:93:36 | field | semmle.label | field |
+| accessors_instance.swift:97:5:97:5 | [post] c [field] | semmle.label | [post] c [field] |
+| accessors_instance.swift:97:5:97:11 | ... .field | semmle.label | ... .field |
+| accessors_instance.swift:97:15:97:28 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:98:5:98:5 | c [field] | semmle.label | c [field] |
+| accessors_instance.swift:99:10:99:10 | c [otherField] | semmle.label | c [otherField] |
+| accessors_instance.swift:99:10:99:21 | ... .otherField | semmle.label | ... .otherField |
+| accessors_instance.swift:106:13:106:17 | field | semmle.label | field |
+| accessors_instance.swift:106:21:106:34 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:112:10:112:10 | c [field] | semmle.label | c [field] |
+| accessors_instance.swift:112:10:112:16 | ... .field | semmle.label | ... .field |
+| accessors_instance.swift:119:13:119:17 | field | semmle.label | field |
+| accessors_instance.swift:119:21:119:35 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:125:18:125:22 | field | semmle.label | field |
+| accessors_instance.swift:134:24:134:31 | newValue [0] | semmle.label | newValue [0] |
+| accessors_instance.swift:134:24:134:33 | ... .0 | semmle.label | ... .0 |
+| accessors_instance.swift:143:5:143:7 | [post] ... .p [0] | semmle.label | [post] ... .p [0] |
+| accessors_instance.swift:143:5:143:9 | ... .0 | semmle.label | ... .0 |
+| accessors_instance.swift:143:13:143:27 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:145:5:145:9 | ... .p [0] | semmle.label | ... .p [0] |
+| accessors_instance.swift:145:13:145:46 | TupleExpr [0] | semmle.label | TupleExpr [0] |
+| accessors_instance.swift:145:14:145:28 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:151:34:151:38 | field | semmle.label | field |
+| accessors_instance.swift:151:42:151:56 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:156:24:156:31 | newValue [field] | semmle.label | newValue [field] |
+| accessors_instance.swift:156:24:156:37 | ... .field | semmle.label | ... .field |
+| accessors_instance.swift:160:5:160:7 | [post] ... .s [field] | semmle.label | [post] ... .s [field] |
+| accessors_instance.swift:168:22:168:29 | newValue | semmle.label | newValue |
+| accessors_instance.swift:169:13:169:17 | [post] super [x] | semmle.label | [post] super [x] |
+| accessors_instance.swift:169:13:169:19 | ... .x | semmle.label | ... .x |
+| accessors_instance.swift:169:23:169:30 | newValue | semmle.label | newValue |
+| accessors_instance.swift:173:20:173:24 | super [x] | semmle.label | super [x] |
+| accessors_instance.swift:173:20:173:26 | ... .x | semmle.label | ... .x |
+| accessors_instance.swift:177:26:177:40 | source(...) | semmle.label | source(...) |
+| accessors_instance.swift:178:10:178:11 | c2 [x] | semmle.label | c2 [x] |
+| accessors_instance.swift:178:10:178:18 | ... .getX(...) | semmle.label | ... .getX(...) |
+| accessors_local.swift:7:21:7:34 | source(...) | semmle.label | source(...) |
+| accessors_local.swift:8:10:8:10 | x | semmle.label | x |
+| accessors_local.swift:15:15:15:28 | source(...) | semmle.label | source(...) |
+| accessors_local.swift:17:10:17:10 | x | semmle.label | x |
+| accessors_local.swift:22:15:22:28 | source(...) | semmle.label | source(...) |
+| accessors_local.swift:25:10:25:10 | x | semmle.label | x |
+| accessors_local.swift:31:20:31:27 | newValue | semmle.label | newValue |
+| accessors_local.swift:33:5:33:5 | x | semmle.label | x |
+| accessors_local.swift:33:9:33:22 | source(...) | semmle.label | source(...) |
+| accessors_local.swift:38:15:38:28 | source(...) | semmle.label | source(...) |
+| accessors_local.swift:39:20:39:27 | newValue | semmle.label | newValue |
+| accessors_local.swift:41:5:41:5 | x | semmle.label | x |
+| accessors_local.swift:41:9:41:9 | x | semmle.label | x |
+| accessors_local.swift:45:9:45:9 | y | semmle.label | y |
+| accessors_local.swift:45:21:45:34 | source(...) | semmle.label | source(...) |
+| accessors_local.swift:46:21:46:21 | y | semmle.label | y |
+| accessors_local.swift:47:10:47:10 | x | semmle.label | x |
+| accessors_local.swift:52:21:52:21 | y | semmle.label | y |
+| accessors_local.swift:54:5:54:5 | y | semmle.label | y |
+| accessors_local.swift:54:9:54:22 | source(...) | semmle.label | source(...) |
+| accessors_local.swift:55:10:55:10 | x | semmle.label | x |
+| accessors_local.swift:59:21:59:34 | source(...) | semmle.label | source(...) |
+| accessors_local.swift:61:14:61:14 | x | semmle.label | x |
+| accessors_local.swift:70:14:70:14 | x | semmle.label | x |
+| accessors_local.swift:72:5:72:5 | y | semmle.label | y |
+| accessors_local.swift:72:9:72:22 | source(...) | semmle.label | source(...) |
+| accessors_local.swift:82:14:82:15 | x3 | semmle.label | x3 |
+| accessors_local.swift:84:5:84:5 | y | semmle.label | y |
+| accessors_local.swift:84:9:84:22 | source(...) | semmle.label | source(...) |
+| accessors_local.swift:91:20:91:27 | newValue [0] | semmle.label | newValue [0] |
+| accessors_local.swift:91:20:91:29 | ... .0 | semmle.label | ... .0 |
+| accessors_local.swift:93:5:93:5 | [post] p [0] | semmle.label | [post] p [0] |
+| accessors_local.swift:93:5:93:7 | ... .0 | semmle.label | ... .0 |
+| accessors_local.swift:93:11:93:25 | source(...) | semmle.label | source(...) |
+| accessors_local.swift:99:34:99:38 | field | semmle.label | field |
+| accessors_local.swift:99:42:99:56 | source(...) | semmle.label | source(...) |
+| accessors_local.swift:103:20:103:27 | newValue [field] | semmle.label | newValue [field] |
+| accessors_local.swift:103:20:103:33 | ... .field | semmle.label | ... .field |
+| accessors_local.swift:105:5:105:5 | [post] p [field] | semmle.label | [post] p [field] |
+| accessors_static.swift:8:32:8:45 | source(...) | semmle.label | source(...) |
+| accessors_static.swift:10:10:10:12 | ... .x | semmle.label | ... .x |
+| accessors_static.swift:18:19:18:32 | source(...) | semmle.label | source(...) |
+| accessors_static.swift:21:10:21:12 | ... .x | semmle.label | ... .x |
+| accessors_static.swift:27:19:27:32 | source(...) | semmle.label | source(...) |
+| accessors_static.swift:31:10:31:12 | ... .x | semmle.label | ... .x |
+| accessors_static.swift:38:24:38:31 | newValue | semmle.label | newValue |
+| accessors_static.swift:41:5:41:7 | ... .x | semmle.label | ... .x |
+| accessors_static.swift:41:11:41:24 | source(...) | semmle.label | source(...) |
+| accessors_static.swift:47:19:47:32 | source(...) | semmle.label | source(...) |
+| accessors_static.swift:48:24:48:31 | newValue | semmle.label | newValue |
+| accessors_static.swift:51:5:51:7 | ... .x | semmle.label | ... .x |
+| accessors_static.swift:51:11:51:13 | ... .x | semmle.label | ... .x |
+| accessors_static.swift:56:32:56:45 | source(...) | semmle.label | source(...) |
+| accessors_static.swift:59:18:59:23 | ... .x | semmle.label | ... .x |
+| accessors_static.swift:63:18:63:23 | ... .x | semmle.label | ... .x |
+| accessors_static.swift:64:18:64:18 | x | semmle.label | x |
+| calls.swift:7:19:7:19 | x | semmle.label | x |
+| calls.swift:8:14:8:14 | x | semmle.label | x |
+| calls.swift:10:12:10:25 | source(...) | semmle.label | source(...) |
+| calls.swift:15:16:15:29 | source(...) | semmle.label | source(...) |
+| calls.swift:17:10:17:17 | target(...) | semmle.label | target(...) |
+| calls.swift:21:17:21:17 | x | semmle.label | x |
+| calls.swift:22:14:22:14 | x | semmle.label | x |
+| calls.swift:24:15:24:28 | source(...) | semmle.label | source(...) |
+| calls.swift:28:19:28:19 | x | semmle.label | x |
+| calls.swift:29:16:29:16 | x | semmle.label | x |
+| calls.swift:29:16:29:24 | ... + ... | semmle.label | ... + ... |
+| calls.swift:31:10:31:31 | target(...) | semmle.label | target(...) |
+| calls.swift:31:17:31:30 | source(...) | semmle.label | source(...) |
+| calls.swift:32:10:32:31 | target(...) | semmle.label | target(...) |
+| calls.swift:32:17:32:30 | source(...) | semmle.label | source(...) |
+| calls.swift:37:23:37:23 | x | semmle.label | x |
+| calls.swift:38:14:38:14 | x | semmle.label | x |
+| calls.swift:40:19:40:32 | source(...) | semmle.label | source(...) |
+| calls.swift:42:18:42:21 | name | semmle.label | name |
+| calls.swift:43:14:43:17 | name | semmle.label | name |
+| calls.swift:45:19:45:32 | source(...) | semmle.label | source(...) |
+| calls.swift:49:19:49:19 | x | semmle.label | x |
+| calls.swift:49:32:49:32 | y | semmle.label | y |
+| calls.swift:50:14:50:14 | x | semmle.label | x |
+| calls.swift:51:14:51:14 | y | semmle.label | y |
+| calls.swift:53:12:53:25 | source(...) | semmle.label | source(...) |
+| calls.swift:53:28:53:41 | source(...) | semmle.label | source(...) |
+| calls.swift:61:19:61:19 | x [Return] [field] | semmle.label | x [Return] [field] |
+| calls.swift:62:9:62:9 | [post] x [field] | semmle.label | [post] x [field] |
+| calls.swift:62:9:62:15 | ... .field | semmle.label | ... .field |
+| calls.swift:62:19:62:32 | source(...) | semmle.label | source(...) |
+| calls.swift:66:12:66:12 | [post] b [field] | semmle.label | [post] b [field] |
+| calls.swift:67:10:67:10 | b [field] | semmle.label | b [field] |
+| calls.swift:67:10:67:16 | ... .field | semmle.label | ... .field |
+| calls.swift:75:13:75:17 | field | semmle.label | field |
+| calls.swift:75:21:75:34 | source(...) | semmle.label | source(...) |
+| calls.swift:81:18:81:22 | field | semmle.label | field |
+| calls.swift:87:18:87:21 | self [field] | semmle.label | self [field] |
+| calls.swift:87:18:87:27 | ... .field | semmle.label | ... .field |
+| calls.swift:93:18:93:22 | field | semmle.label | field |
+| calls.swift:99:18:99:21 | self [field] | semmle.label | self [field] |
+| calls.swift:99:18:99:27 | ... .field | semmle.label | ... .field |
+| calls.swift:105:18:105:22 | field | semmle.label | field |
+| calls.swift:111:18:111:21 | self [field] | semmle.label | self [field] |
+| calls.swift:111:18:111:27 | ... .field | semmle.label | ... .field |
+| calls.swift:117:18:117:22 | field | semmle.label | field |
+| calls.swift:123:18:123:21 | self [field] | semmle.label | self [field] |
+| calls.swift:123:18:123:27 | ... .field | semmle.label | ... .field |
+| capture.swift:10:9:10:9 | x | semmle.label | x |
+| capture.swift:10:13:10:26 | source(...) | semmle.label | source(...) |
+| capture.swift:12:14:12:14 | x | semmle.label | x |
+| capture.swift:20:9:20:9 | x | semmle.label | x |
+| capture.swift:20:13:20:26 | source(...) | semmle.label | source(...) |
+| capture.swift:24:10:24:10 | x | semmle.label | x |
+| capture.swift:28:9:28:9 | x | semmle.label | x |
+| capture.swift:28:13:28:26 | source(...) | semmle.label | source(...) |
+| capture.swift:32:9:32:10 | y1 | semmle.label | y1 |
+| capture.swift:32:14:32:14 | x | semmle.label | x |
+| capture.swift:33:9:33:10 | y2 | semmle.label | y2 |
+| capture.swift:33:14:33:14 | x | semmle.label | x |
+| capture.swift:38:10:38:11 | y1 | semmle.label | y1 |
+| capture.swift:39:10:39:11 | y2 | semmle.label | y2 |
+| capture.swift:43:9:43:9 | x | semmle.label | x |
+| capture.swift:43:13:43:26 | source(...) | semmle.label | source(...) |
+| capture.swift:45:22:45:24 | arg | semmle.label | arg |
+| capture.swift:46:9:46:9 | y | semmle.label | y |
+| capture.swift:46:13:46:15 | arg | semmle.label | arg |
+| capture.swift:49:13:49:13 | x | semmle.label | x |
+| capture.swift:50:10:50:10 | y | semmle.label | y |
+| capture.swift:54:9:54:9 | x | semmle.label | x |
+| capture.swift:54:13:54:26 | source(...) | semmle.label | source(...) |
+| capture.swift:56:22:56:24 | arg | semmle.label | arg |
+| capture.swift:57:9:57:9 | [post] y [0] | semmle.label | [post] y [0] |
+| capture.swift:57:9:57:11 | ... .0 | semmle.label | ... .0 |
+| capture.swift:57:15:57:17 | arg | semmle.label | arg |
+| capture.swift:60:13:60:13 | x | semmle.label | x |
+| capture.swift:61:10:61:10 | y [0] | semmle.label | y [0] |
+| capture.swift:61:10:61:12 | ... .0 | semmle.label | ... .0 |
+| capture.swift:67:14:67:14 | x | semmle.label | x |
+| capture.swift:69:5:69:5 | x | semmle.label | x |
+| capture.swift:69:9:69:22 | source(...) | semmle.label | source(...) |
+| capture.swift:74:9:74:9 | x | semmle.label | x |
+| capture.swift:74:13:74:26 | source(...) | semmle.label | source(...) |
+| capture.swift:76:14:76:14 | x | semmle.label | x |
+| capture.swift:84:9:84:9 | x | semmle.label | x |
+| capture.swift:84:13:84:26 | source(...) | semmle.label | source(...) |
+| capture.swift:88:10:88:10 | x | semmle.label | x |
+| capture.swift:93:9:93:9 | x | semmle.label | x |
+| capture.swift:93:13:93:26 | source(...) | semmle.label | source(...) |
+| capture.swift:94:9:94:9 | y | semmle.label | y |
+| capture.swift:94:13:94:19 | local(...) | semmle.label | local(...) |
+| capture.swift:95:10:95:10 | y | semmle.label | y |
+| capture.swift:98:14:98:14 | x | semmle.label | x |
+| capture.swift:99:16:99:16 | x | semmle.label | x |
+| capture.swift:104:9:104:9 | x | semmle.label | x |
+| capture.swift:104:13:104:27 | source(...) | semmle.label | source(...) |
+| capture.swift:105:23:105:24 | x1 | semmle.label | x1 |
+| capture.swift:105:28:105:28 | x | semmle.label | x |
+| capture.swift:106:14:106:15 | x1 | semmle.label | x1 |
+| capture.swift:108:23:108:23 | x | semmle.label | x |
+| capture.swift:108:23:108:23 | x | semmle.label | x |
+| capture.swift:109:14:109:14 | x | semmle.label | x |
+| capture.swift:116:9:116:9 | x | semmle.label | x |
+| capture.swift:116:13:116:27 | source(...) | semmle.label | source(...) |
+| capture.swift:117:22:117:22 | x | semmle.label | x |
+| capture.swift:117:26:117:26 | x | semmle.label | x |
+| capture.swift:117:29:117:32 | blah | semmle.label | blah |
+| capture.swift:117:36:117:36 | x | semmle.label | x |
+| capture.swift:118:14:118:14 | x | semmle.label | x |
+| capture.swift:119:14:119:17 | blah | semmle.label | blah |
+| capture.swift:143:14:143:14 | x | semmle.label | x |
+| capture.swift:147:5:147:5 | x | semmle.label | x |
+| capture.swift:147:9:147:23 | source(...) | semmle.label | source(...) |
+| capture.swift:156:9:156:9 | x | semmle.label | x |
+| capture.swift:156:13:156:25 | source(...) | semmle.label | source(...) |
+| capture.swift:158:18:158:21 | self [x] | semmle.label | self [x] |
+| capture.swift:158:18:158:23 | ... .x | semmle.label | ... .x |
+| capture.swift:164:9:164:9 | x | semmle.label | x |
+| capture.swift:164:13:164:25 | source(...) | semmle.label | source(...) |
+| capture.swift:165:26:165:29 | self [x] | semmle.label | self [x] |
+| capture.swift:165:26:165:29 | self [x] | semmle.label | self [x] |
+| capture.swift:166:18:166:21 | self [x] | semmle.label | self [x] |
+| capture.swift:166:18:166:23 | ... .x | semmle.label | ... .x |
+| capture.swift:167:18:167:18 | x | semmle.label | x |
+| capture.swift:173:9:173:9 | x | semmle.label | x |
+| capture.swift:173:13:173:25 | source(...) | semmle.label | source(...) |
+| capture.swift:174:31:174:34 | self [x] | semmle.label | self [x] |
+| capture.swift:174:31:174:34 | self [x] | semmle.label | self [x] |
+| capture.swift:175:19:175:26 | ... .some(...) [x] | semmle.label | ... .some(...) [x] |
+| capture.swift:175:23:175:26 | self [x] | semmle.label | self [x] |
+| capture.swift:175:23:175:26 | self [x] | semmle.label | self [x] |
+| capture.swift:176:18:176:21 | self [x] | semmle.label | self [x] |
+| capture.swift:176:18:176:23 | ... .x | semmle.label | ... .x |
+| capture.swift:177:18:177:18 | x | semmle.label | x |
+| capture.swift:183:9:183:9 | x | semmle.label | x |
+| capture.swift:183:13:183:25 | source(...) | semmle.label | source(...) |
+| capture.swift:184:34:184:37 | self [x] | semmle.label | self [x] |
+| capture.swift:184:34:184:37 | self [x] | semmle.label | self [x] |
+| capture.swift:185:18:185:21 | self [x] | semmle.label | self [x] |
+| capture.swift:185:18:185:23 | ... .x | semmle.label | ... .x |
+| capture.swift:186:18:186:18 | x | semmle.label | x |
+| enums.swift:12:9:12:9 | e [case1.0] | semmle.label | e [case1.0] |
+| enums.swift:12:13:12:35 | ... .case1(...) [case1.0] | semmle.label | ... .case1(...) [case1.0] |
+| enums.swift:12:21:12:34 | source(...) | semmle.label | source(...) |
+| enums.swift:14:12:14:12 | e [case1.0] | semmle.label | e [case1.0] |
+| enums.swift:15:10:15:23 | ... .case1(...) [case1.0] | semmle.label | ... .case1(...) [case1.0] |
+| enums.swift:15:22:15:22 | x | semmle.label | x |
+| enums.swift:16:14:16:14 | x | semmle.label | x |
+| enums.swift:23:9:23:9 | e [case1.0] | semmle.label | e [case1.0] |
+| enums.swift:23:13:23:35 | ... .case1(...) [case1.0] | semmle.label | ... .case1(...) [case1.0] |
+| enums.swift:23:21:23:34 | source(...) | semmle.label | source(...) |
+| enums.swift:25:12:25:12 | e [case1.0] | semmle.label | e [case1.0] |
+| enums.swift:26:10:26:22 | ... .case1(...) [case1.0] | semmle.label | ... .case1(...) [case1.0] |
+| enums.swift:26:21:26:21 | x | semmle.label | x |
+| enums.swift:27:14:27:14 | x | semmle.label | x |
+| enums.swift:34:9:34:9 | e [case1.0] | semmle.label | e [case1.0] |
+| enums.swift:34:13:34:35 | ... .case1(...) [case1.0] | semmle.label | ... .case1(...) [case1.0] |
+| enums.swift:34:21:34:34 | source(...) | semmle.label | source(...) |
+| enums.swift:35:16:35:29 | ... .case1(...) [case1.0] | semmle.label | ... .case1(...) [case1.0] |
+| enums.swift:35:28:35:28 | x | semmle.label | x |
+| enums.swift:35:33:35:33 | e [case1.0] | semmle.label | e [case1.0] |
+| enums.swift:36:10:36:10 | x | semmle.label | x |
+| enums.swift:40:9:40:9 | e [case2.0] | semmle.label | e [case2.0] |
+| enums.swift:40:13:40:35 | ... .case2(...) [case2.0] | semmle.label | ... .case2(...) [case2.0] |
+| enums.swift:40:21:40:34 | source(...) | semmle.label | source(...) |
+| enums.swift:41:12:41:12 | e [case2.0] | semmle.label | e [case2.0] |
+| enums.swift:44:10:44:23 | ... .case2(...) [case2.0] | semmle.label | ... .case2(...) [case2.0] |
+| enums.swift:44:22:44:22 | x | semmle.label | x |
+| enums.swift:45:14:45:14 | x | semmle.label | x |
+| enums.swift:48:12:48:12 | e [case2.0] | semmle.label | e [case2.0] |
+| enums.swift:49:10:49:23 | ... .case2(...) [case2.0] | semmle.label | ... .case2(...) [case2.0] |
+| enums.swift:49:22:49:22 | x | semmle.label | x |
+| enums.swift:50:14:50:14 | x | semmle.label | x |
+| enums.swift:57:9:57:13 | opt_x | semmle.label | opt_x |
+| enums.swift:57:31:57:44 | source(...) | semmle.label | source(...) |
+| enums.swift:58:11:58:15 | ... .some(...) | semmle.label | ... .some(...) |
+| enums.swift:58:15:58:15 | x | semmle.label | x |
+| enums.swift:58:19:58:23 | opt_x | semmle.label | opt_x |
+| enums.swift:59:10:59:10 | x | semmle.label | x |
+| enums.swift:63:9:63:13 | opt_x | semmle.label | opt_x |
+| enums.swift:63:31:63:44 | source(...) | semmle.label | source(...) |
+| enums.swift:64:11:64:19 | ... .some(...) | semmle.label | ... .some(...) |
+| enums.swift:64:15:64:19 | opt_x | semmle.label | opt_x |
+| enums.swift:64:15:64:19 | opt_x | semmle.label | opt_x |
+| enums.swift:65:10:65:14 | opt_x | semmle.label | opt_x |
+| enums.swift:73:9:73:9 | e [foo.0] | semmle.label | e [foo.0] |
+| enums.swift:73:13:73:48 | ... .foo(...) [foo.0] | semmle.label | ... .foo(...) [foo.0] |
+| enums.swift:73:34:73:47 | source(...) | semmle.label | source(...) |
+| enums.swift:74:12:74:12 | e [foo.0] | semmle.label | e [foo.0] |
+| enums.swift:75:10:75:20 | ... .foo(...) [foo.0] | semmle.label | ... .foo(...) [foo.0] |
+| enums.swift:75:19:75:19 | x | semmle.label | x |
+| enums.swift:76:14:76:14 | x | semmle.label | x |
+| enums.swift:82:12:82:12 | e [foo.0] | semmle.label | e [foo.0] |
+| enums.swift:83:10:83:23 | ... .foo(...) [foo.0] | semmle.label | ... .foo(...) [foo.0] |
+| enums.swift:83:22:83:22 | x | semmle.label | x |
+| enums.swift:84:14:84:14 | x | semmle.label | x |
+| flow-summaries.swift:2:9:2:9 | x | semmle.label | x |
+| flow-summaries.swift:2:13:2:26 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:3:9:3:9 | y | semmle.label | y |
+| flow-summaries.swift:3:13:3:36 | ... .identityFlow(...) | semmle.label | ... .identityFlow(...) |
+| flow-summaries.swift:3:35:3:35 | x | semmle.label | x |
+| flow-summaries.swift:4:10:4:10 | y | semmle.label | y |
+| flow-summaries.swift:8:9:8:9 | x | semmle.label | x |
+| flow-summaries.swift:8:13:8:26 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:9:9:9:13 | array [ArrayElement] | semmle.label | array [ArrayElement] |
+| flow-summaries.swift:9:17:9:38 | ... .storeArray(...) [ArrayElement] | semmle.label | ... .storeArray(...) [ArrayElement] |
+| flow-summaries.swift:9:37:9:37 | x | semmle.label | x |
+| flow-summaries.swift:10:13:10:13 | y | semmle.label | y |
+| flow-summaries.swift:10:18:10:22 | array [ArrayElement] | semmle.label | array [ArrayElement] |
+| flow-summaries.swift:11:14:11:14 | y | semmle.label | y |
+| flow-summaries.swift:16:9:16:13 | array [ArrayElement] | semmle.label | array [ArrayElement] |
+| flow-summaries.swift:16:17:16:48 | ArrayLiteral [ArrayElement] | semmle.label | ArrayLiteral [ArrayElement] |
+| flow-summaries.swift:16:18:16:31 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:16:34:16:47 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:17:9:17:9 | y | semmle.label | y |
+| flow-summaries.swift:17:13:17:37 | ... .readArray(...) | semmle.label | ... .readArray(...) |
+| flow-summaries.swift:17:32:17:36 | array [ArrayElement] | semmle.label | array [ArrayElement] |
+| flow-summaries.swift:18:10:18:10 | y | semmle.label | y |
+| flow-summaries.swift:25:9:25:9 | x | semmle.label | x |
+| flow-summaries.swift:25:13:25:26 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:28:36:28:36 | x | semmle.label | x |
+| flow-summaries.swift:28:47:28:49 | [post] box [outputField] | semmle.label | [post] box [outputField] |
+| flow-summaries.swift:29:10:29:12 | box [outputField] | semmle.label | box [outputField] |
+| flow-summaries.swift:29:10:29:24 | ... .outputField | semmle.label | ... .outputField |
+| flow-summaries.swift:33:9:33:9 | x | semmle.label | x |
+| flow-summaries.swift:33:13:33:26 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:34:9:34:9 | y [unusualNameNotAppearingInSourceCode] | semmle.label | y [unusualNameNotAppearingInSourceCode] |
+| flow-summaries.swift:34:13:34:40 | ... .storeUnusualName(...) [unusualNameNotAppearingInSourceCode] | semmle.label | ... .storeUnusualName(...) [unusualNameNotAppearingInSourceCode] |
+| flow-summaries.swift:34:39:34:39 | x | semmle.label | x |
+| flow-summaries.swift:35:9:35:9 | z | semmle.label | z |
+| flow-summaries.swift:35:13:35:39 | ... .readUnusualName(...) | semmle.label | ... .readUnusualName(...) |
+| flow-summaries.swift:35:38:35:38 | y [unusualNameNotAppearingInSourceCode] | semmle.label | y [unusualNameNotAppearingInSourceCode] |
+| flow-summaries.swift:36:10:36:10 | z | semmle.label | z |
+| flow-summaries.swift:40:9:40:9 | x | semmle.label | x |
+| flow-summaries.swift:40:13:40:26 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:41:27:41:27 | x | semmle.label | x |
+| flow-summaries.swift:41:32:41:32 | y | semmle.label | y |
+| flow-summaries.swift:42:14:42:14 | y | semmle.label | y |
+| flow-summaries.swift:47:9:47:9 | y | semmle.label | y |
+| flow-summaries.swift:47:13:49:5 | ... .outOfCallback(...) | semmle.label | ... .outOfCallback(...) |
+| flow-summaries.swift:48:16:48:29 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:50:10:50:10 | y | semmle.label | y |
+| flow-summaries.swift:54:10:54:67 | ... .throughCallback(...) | semmle.label | ... .throughCallback(...) |
+| flow-summaries.swift:54:35:54:48 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:54:53:54:53 | y | semmle.label | y |
+| flow-summaries.swift:54:65:54:65 | y | semmle.label | y |
+| flow-summaries.swift:55:10:55:73 | ... .throughCallback(...) | semmle.label | ... .throughCallback(...) |
+| flow-summaries.swift:55:35:55:48 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:55:53:55:53 | y | semmle.label | y |
+| flow-summaries.swift:55:65:55:65 | y | semmle.label | y |
+| flow-summaries.swift:55:65:55:71 | ... + ... | semmle.label | ... + ... |
+| flow-summaries.swift:61:10:61:43 | ... .taintFlow(...) | semmle.label | ... .taintFlow(...) |
+| flow-summaries.swift:61:29:61:42 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:65:9:65:9 | x | semmle.label | x |
+| flow-summaries.swift:65:13:65:27 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:66:9:66:9 | y | semmle.label | y |
+| flow-summaries.swift:66:13:66:27 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:67:10:67:10 | x | semmle.label | x |
+| flow-summaries.swift:68:10:68:10 | y | semmle.label | y |
+| flow-summaries.swift:69:19:69:20 | & ... | semmle.label | & ... |
+| flow-summaries.swift:69:19:69:20 | [post] & ... | semmle.label | [post] & ... |
+| flow-summaries.swift:69:20:69:20 | x | semmle.label | x |
+| flow-summaries.swift:69:23:69:24 | & ... | semmle.label | & ... |
+| flow-summaries.swift:69:23:69:24 | [post] & ... | semmle.label | [post] & ... |
+| flow-summaries.swift:69:24:69:24 | y | semmle.label | y |
+| flow-summaries.swift:70:10:70:10 | x | semmle.label | x |
+| flow-summaries.swift:71:10:71:10 | y | semmle.label | y |
+| flow-summaries.swift:76:16:76:30 | source(...) | semmle.label | source(...) |
+| flow-summaries.swift:77:10:77:10 | t [field] | semmle.label | t [field] |
+| flow-summaries.swift:77:10:77:21 | ... .getField(...) | semmle.label | ... .getField(...) |
+| implicit-self.swift:16:9:16:12 | [post] self [x] | semmle.label | [post] self [x] |
+| implicit-self.swift:16:9:16:14 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:16:18:16:31 | source(...) | semmle.label | source(...) |
+| implicit-self.swift:17:14:17:17 | self [x] | semmle.label | self [x] |
+| implicit-self.swift:17:14:17:19 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:22:9:22:9 | x | semmle.label | x |
+| implicit-self.swift:22:13:22:26 | source(...) | semmle.label | source(...) |
+| implicit-self.swift:23:14:23:14 | x | semmle.label | x |
+| implicit-self.swift:28:9:28:9 | x | semmle.label | x |
+| implicit-self.swift:28:13:28:26 | source(...) | semmle.label | source(...) |
+| implicit-self.swift:29:14:29:17 | self [x] | semmle.label | self [x] |
+| implicit-self.swift:29:14:29:19 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:34:9:34:12 | [post] self [x] | semmle.label | [post] self [x] |
+| implicit-self.swift:34:9:34:14 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:34:18:34:31 | source(...) | semmle.label | source(...) |
+| implicit-self.swift:35:14:35:14 | x | semmle.label | x |
+| implicit-self.swift:40:9:40:12 | [post] self [box, x] | semmle.label | [post] self [box, x] |
+| implicit-self.swift:40:9:40:16 | [post] ... .box [x] | semmle.label | [post] ... .box [x] |
+| implicit-self.swift:40:9:40:18 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:40:22:40:35 | source(...) | semmle.label | source(...) |
+| implicit-self.swift:41:14:41:17 | self [box, x] | semmle.label | self [box, x] |
+| implicit-self.swift:41:14:41:21 | ... .box [x] | semmle.label | ... .box [x] |
+| implicit-self.swift:41:14:41:23 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:46:9:46:11 | [post] box [x] | semmle.label | [post] box [x] |
+| implicit-self.swift:46:9:46:13 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:46:17:46:30 | source(...) | semmle.label | source(...) |
+| implicit-self.swift:47:14:47:16 | box [x] | semmle.label | box [x] |
+| implicit-self.swift:47:14:47:18 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:52:9:52:11 | [post] box [x] | semmle.label | [post] box [x] |
+| implicit-self.swift:52:9:52:13 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:52:17:52:30 | source(...) | semmle.label | source(...) |
+| implicit-self.swift:53:14:53:17 | self [box, x] | semmle.label | self [box, x] |
+| implicit-self.swift:53:14:53:21 | ... .box [x] | semmle.label | ... .box [x] |
+| implicit-self.swift:53:14:53:23 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:58:9:58:12 | [post] self [box, x] | semmle.label | [post] self [box, x] |
+| implicit-self.swift:58:9:58:16 | [post] ... .box [x] | semmle.label | [post] ... .box [x] |
+| implicit-self.swift:58:9:58:18 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:58:22:58:35 | source(...) | semmle.label | source(...) |
+| implicit-self.swift:59:14:59:16 | box [x] | semmle.label | box [x] |
+| implicit-self.swift:59:14:59:18 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:64:9:64:9 | [incoming] x | semmle.label | [incoming] x |
+| implicit-self.swift:64:24:64:37 | source(...) | semmle.label | source(...) |
+| implicit-self.swift:65:14:65:14 | x | semmle.label | x |
+| implicit-self.swift:66:14:66:17 | self [x] | semmle.label | self [x] |
+| implicit-self.swift:66:14:66:19 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:71:9:71:12 | [post] self [x] | semmle.label | [post] self [x] |
+| implicit-self.swift:71:9:71:14 | [incoming] ... .x | semmle.label | [incoming] ... .x |
+| implicit-self.swift:71:29:71:43 | source(...) | semmle.label | source(...) |
+| implicit-self.swift:72:14:72:14 | x | semmle.label | x |
+| implicit-self.swift:73:14:73:17 | self [x] | semmle.label | self [x] |
+| implicit-self.swift:73:14:73:19 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:78:9:78:9 | [incoming] x | semmle.label | [incoming] x |
+| implicit-self.swift:78:24:78:38 | source(...) | semmle.label | source(...) |
+| implicit-self.swift:79:14:79:14 | x | semmle.label | x |
+| implicit-self.swift:80:14:80:17 | self [x] | semmle.label | self [x] |
+| implicit-self.swift:80:14:80:19 | ... .x | semmle.label | ... .x |
+| implicit-self.swift:85:9:85:12 | [post] self [x] | semmle.label | [post] self [x] |
+| implicit-self.swift:85:9:85:14 | [incoming] ... .x | semmle.label | [incoming] ... .x |
+| implicit-self.swift:85:29:85:43 | source(...) | semmle.label | source(...) |
+| implicit-self.swift:86:14:86:14 | x | semmle.label | x |
+| implicit-self.swift:87:14:87:17 | self [x] | semmle.label | self [x] |
+| implicit-self.swift:87:14:87:19 | ... .x | semmle.label | ... .x |
+| short-return.swift:7:33:7:46 | source(...) | semmle.label | source(...) |
+| short-return.swift:8:10:8:19 | getValue(...) | semmle.label | getValue(...) |
+| test.swift:9:10:9:21 | source(...) | semmle.label | source(...) |
+| test.swift:17:10:17:23 | source(...) | semmle.label | source(...) |
+| test.swift:17:10:17:32 | ... + ... | semmle.label | ... + ... |
+| test.swift:18:10:18:32 | ... + ... | semmle.label | ... + ... |
+| test.swift:18:19:18:32 | source(...) | semmle.label | source(...) |
+| test.swift:20:10:20:33 | StringInterpolationExpr | semmle.label | StringInterpolationExpr |
+| test.swift:20:13:20:26 | source(...) | semmle.label | source(...) |
+| test.swift:21:10:21:33 | StringInterpolationExpr | semmle.label | StringInterpolationExpr |
+| test.swift:21:18:21:31 | source(...) | semmle.label | source(...) |
+| test.swift:22:10:22:38 | StringInterpolationExpr | semmle.label | StringInterpolationExpr |
+| test.swift:22:18:22:31 | source(...) | semmle.label | source(...) |
+| test.swift:27:10:27:33 | TupleExpr [0] | semmle.label | TupleExpr [0] |
+| test.swift:27:10:27:35 | ... .0 | semmle.label | ... .0 |
+| test.swift:27:11:27:24 | source(...) | semmle.label | source(...) |
+| test.swift:30:10:30:33 | TupleExpr [1] | semmle.label | TupleExpr [1] |
+| test.swift:30:10:30:35 | ... .1 | semmle.label | ... .1 |
+| test.swift:30:19:30:32 | source(...) | semmle.label | source(...) |
+| test.swift:34:9:34:9 | a | semmle.label | a |
+| test.swift:34:13:34:26 | source(...) | semmle.label | source(...) |
+| test.swift:35:10:35:10 | a | semmle.label | a |
+| test.swift:39:9:39:14 | TupleExpr [0] | semmle.label | TupleExpr [0] |
+| test.swift:39:10:39:10 | a | semmle.label | a |
+| test.swift:39:18:39:41 | TupleExpr [0] | semmle.label | TupleExpr [0] |
+| test.swift:39:19:39:32 | source(...) | semmle.label | source(...) |
+| test.swift:40:10:40:10 | a | semmle.label | a |
+| test.swift:43:9:43:14 | TupleExpr [1] | semmle.label | TupleExpr [1] |
+| test.swift:43:13:43:13 | d | semmle.label | d |
+| test.swift:43:18:43:41 | TupleExpr [1] | semmle.label | TupleExpr [1] |
+| test.swift:43:27:43:40 | source(...) | semmle.label | source(...) |
+| test.swift:45:10:45:10 | d | semmle.label | d |
+| test.swift:49:9:49:9 | a | semmle.label | a |
+| test.swift:49:13:49:26 | source(...) | semmle.label | source(...) |
+| test.swift:50:10:50:10 | a | semmle.label | a |
+| test.swift:57:5:57:9 | [post] tuple [0] | semmle.label | [post] tuple [0] |
+| test.swift:57:5:57:11 | ... .0 | semmle.label | ... .0 |
+| test.swift:57:15:57:28 | source(...) | semmle.label | source(...) |
+| test.swift:58:10:58:14 | tuple [0] | semmle.label | tuple [0] |
+| test.swift:58:10:58:16 | ... .0 | semmle.label | ... .0 |
+| test.swift:64:5:64:14 | [post] deep_tuple [1, 0] | semmle.label | [post] deep_tuple [1, 0] |
+| test.swift:64:5:64:16 | [post] ... .1 [0] | semmle.label | [post] ... .1 [0] |
+| test.swift:64:5:64:18 | ... .0 | semmle.label | ... .0 |
+| test.swift:64:22:64:35 | source(...) | semmle.label | source(...) |
+| test.swift:69:10:69:19 | deep_tuple [1, 0] | semmle.label | deep_tuple [1, 0] |
+| test.swift:69:10:69:21 | ... .1 [0] | semmle.label | ... .1 [0] |
+| test.swift:69:10:69:23 | ... .0 | semmle.label | ... .0 |
+| test.swift:75:5:75:16 | TupleExpr [0] | semmle.label | TupleExpr [0] |
+| test.swift:75:6:75:10 | [post] tuple [1] | semmle.label | [post] tuple [1] |
+| test.swift:75:6:75:12 | ... .1 | semmle.label | ... .1 |
+| test.swift:75:20:75:51 | TupleExpr [0] | semmle.label | TupleExpr [0] |
+| test.swift:75:21:75:34 | source(...) | semmle.label | source(...) |
+| test.swift:77:10:77:14 | tuple [1] | semmle.label | tuple [1] |
+| test.swift:77:10:77:16 | ... .1 | semmle.label | ... .1 |
+| test.swift:85:5:85:9 | [post] tuple [0] | semmle.label | [post] tuple [0] |
+| test.swift:85:5:85:11 | ... .0 | semmle.label | ... .0 |
+| test.swift:85:15:85:29 | source(...) | semmle.label | source(...) |
+| test.swift:86:10:86:14 | tuple [0] | semmle.label | tuple [0] |
+| test.swift:86:10:86:16 | ... .0 | semmle.label | ... .0 |
+| test.swift:97:9:97:9 | x | semmle.label | x |
+| test.swift:97:13:97:27 | source(...) | semmle.label | source(...) |
+| test.swift:101:10:101:10 | x | semmle.label | x |
+| test.swift:105:9:105:9 | y | semmle.label | y |
+| test.swift:105:13:105:27 | source(...) | semmle.label | source(...) |
+| test.swift:107:10:107:10 | y | semmle.label | y |
+| test.swift:110:14:110:14 | x | semmle.label | x |
+| test.swift:111:14:111:14 | y | semmle.label | y |
+| test.swift:118:9:118:13 | [post] tuple [0] | semmle.label | [post] tuple [0] |
+| test.swift:118:9:118:15 | ... .0 | semmle.label | ... .0 |
+| test.swift:118:19:118:33 | source(...) | semmle.label | source(...) |
+| test.swift:123:10:123:14 | tuple [0] | semmle.label | tuple [0] |
+| test.swift:123:10:123:16 | ... .0 | semmle.label | ... .0 |
+| test.swift:128:9:128:13 | tuple [0] | semmle.label | tuple [0] |
+| test.swift:128:9:128:13 | tuple [1] | semmle.label | tuple [1] |
+| test.swift:128:17:128:50 | TupleExpr [0] | semmle.label | TupleExpr [0] |
+| test.swift:128:17:128:50 | TupleExpr [1] | semmle.label | TupleExpr [1] |
+| test.swift:128:18:128:32 | source(...) | semmle.label | source(...) |
+| test.swift:128:35:128:49 | source(...) | semmle.label | source(...) |
+| test.swift:131:9:131:14 | TupleExpr [0] | semmle.label | TupleExpr [0] |
+| test.swift:131:9:131:14 | TupleExpr [1] | semmle.label | TupleExpr [1] |
+| test.swift:131:10:131:10 | a | semmle.label | a |
+| test.swift:131:13:131:13 | b | semmle.label | b |
+| test.swift:131:18:131:22 | tuple [0] | semmle.label | tuple [0] |
+| test.swift:131:18:131:22 | tuple [1] | semmle.label | tuple [1] |
+| test.swift:136:10:136:10 | a | semmle.label | a |
+| test.swift:137:10:137:10 | b | semmle.label | b |
+| test.swift:142:5:142:5 | a | semmle.label | a |
+| test.swift:142:19:142:33 | source(...) | semmle.label | source(...) |
+| test.swift:143:10:143:10 | a | semmle.label | a |
+| test.swift:148:5:148:5 | [incoming] a | semmle.label | [incoming] a |
+| test.swift:148:10:148:24 | source(...) | semmle.label | source(...) |
+| test.swift:149:10:149:10 | a | semmle.label | a |
+| test.swift:154:5:154:5 | [incoming] a | semmle.label | [incoming] a |
+| test.swift:154:20:154:34 | source(...) | semmle.label | source(...) |
+| test.swift:155:10:155:10 | a | semmle.label | a |
+| test.swift:160:5:160:5 | [post] a [0] | semmle.label | [post] a [0] |
+| test.swift:160:5:160:7 | ... .0 | semmle.label | ... .0 |
+| test.swift:160:23:160:37 | source(...) | semmle.label | source(...) |
+| test.swift:161:10:161:10 | a [0] | semmle.label | a [0] |
+| test.swift:161:10:161:12 | ... .0 | semmle.label | ... .0 |
+| test.swift:167:5:167:12 | TupleExpr [0] | semmle.label | TupleExpr [0] |
+| test.swift:167:6:167:6 | [post] a [0] | semmle.label | [post] a [0] |
+| test.swift:167:6:167:8 | ... .0 | semmle.label | ... .0 |
+| test.swift:167:16:167:61 | TupleExpr [0] | semmle.label | TupleExpr [0] |
+| test.swift:167:17:167:43 | ... + ... | semmle.label | ... + ... |
+| test.swift:167:29:167:43 | source(...) | semmle.label | source(...) |
+| test.swift:168:10:168:10 | a [0] | semmle.label | a [0] |
+| test.swift:168:10:168:12 | ... .0 | semmle.label | ... .0 |
+| test.swift:175:5:175:10 | TupleExpr [0] | semmle.label | TupleExpr [0] |
+| test.swift:175:5:175:10 | TupleExpr [1] | semmle.label | TupleExpr [1] |
+| test.swift:175:6:175:6 | a | semmle.label | a |
+| test.swift:175:9:175:9 | b | semmle.label | b |
+| test.swift:175:14:175:67 | TupleExpr [0] | semmle.label | TupleExpr [0] |
+| test.swift:175:14:175:67 | TupleExpr [1] | semmle.label | TupleExpr [1] |
+| test.swift:175:15:175:39 | ... + ... | semmle.label | ... + ... |
+| test.swift:175:25:175:39 | source(...) | semmle.label | source(...) |
+| test.swift:175:42:175:66 | ... + ... | semmle.label | ... + ... |
+| test.swift:175:52:175:66 | source(...) | semmle.label | source(...) |
+| test.swift:176:10:176:10 | a | semmle.label | a |
+| test.swift:177:10:177:10 | b | semmle.label | b |
+| test.swift:182:9:182:9 | x | semmle.label | x |
+| test.swift:182:13:182:27 | source(...) | semmle.label | source(...) |
+| test.swift:183:9:183:9 | y | semmle.label | y |
+| test.swift:183:13:183:27 | source(...) | semmle.label | source(...) |
+| test.swift:185:10:185:10 | x | semmle.label | x |
+| test.swift:186:10:186:10 | y | semmle.label | y |
+| test.swift:189:22:189:22 | s | semmle.label | s |
+| test.swift:189:58:189:58 | s | semmle.label | s |
+| test.swift:191:25:191:25 | s | semmle.label | s |
+| test.swift:191:62:191:62 | s | semmle.label | s |
+| test.swift:193:30:193:30 | s | semmle.label | s |
+| test.swift:193:73:193:73 | s | semmle.label | s |
+| test.swift:196:10:196:45 | await ... | semmle.label | await ... |
+| test.swift:196:16:196:45 | asyncIdentity(...) | semmle.label | asyncIdentity(...) |
+| test.swift:196:30:196:44 | source(...) | semmle.label | source(...) |
+| test.swift:200:10:200:46 | try ... | semmle.label | try ... |
+| test.swift:200:14:200:46 | throwingIdentity(...) | semmle.label | throwingIdentity(...) |
+| test.swift:200:31:200:45 | source(...) | semmle.label | source(...) |
+| test.swift:201:9:201:11 | opt | semmle.label | opt |
+| test.swift:201:20:201:52 | throwingIdentity(...) | semmle.label | throwingIdentity(...) |
+| test.swift:201:37:201:51 | source(...) | semmle.label | source(...) |
+| test.swift:202:8:202:14 | ... .some(...) | semmle.label | ... .some(...) |
+| test.swift:202:12:202:14 | opt | semmle.label | opt |
+| test.swift:202:12:202:14 | opt | semmle.label | opt |
+| test.swift:203:14:203:16 | opt | semmle.label | opt |
+| test.swift:205:10:205:47 | try! ... | semmle.label | try! ... |
+| test.swift:205:15:205:47 | throwingIdentity(...) | semmle.label | throwingIdentity(...) |
+| test.swift:205:32:205:46 | source(...) | semmle.label | source(...) |
+| test.swift:209:10:209:57 | try ... | semmle.label | try ... |
+| test.swift:209:20:209:57 | asyncThrowingIdentity(...) | semmle.label | asyncThrowingIdentity(...) |
+| test.swift:209:42:209:56 | source(...) | semmle.label | source(...) |
+| test.swift:210:9:210:11 | opt | semmle.label | opt |
+| test.swift:210:26:210:63 | asyncThrowingIdentity(...) | semmle.label | asyncThrowingIdentity(...) |
+| test.swift:210:48:210:62 | source(...) | semmle.label | source(...) |
+| test.swift:211:8:211:14 | ... .some(...) | semmle.label | ... .some(...) |
+| test.swift:211:12:211:14 | opt | semmle.label | opt |
+| test.swift:211:12:211:14 | opt | semmle.label | opt |
+| test.swift:212:14:212:16 | opt | semmle.label | opt |
+| test.swift:214:10:214:58 | try! ... | semmle.label | try! ... |
+| test.swift:214:21:214:58 | asyncThrowingIdentity(...) | semmle.label | asyncThrowingIdentity(...) |
+| test.swift:214:43:214:57 | source(...) | semmle.label | source(...) |
+| test.swift:218:9:218:9 | x | semmle.label | x |
+| test.swift:218:13:218:27 | source(...) | semmle.label | source(...) |
+| test.swift:219:10:219:10 | x | semmle.label | x |
+| test.swift:219:10:219:20 | TypeCastExpr | semmle.label | TypeCastExpr |
+| test.swift:220:10:220:10 | x | semmle.label | x |
+| test.swift:220:10:220:21 | TypeCastExpr | semmle.label | TypeCastExpr |
+| test.swift:221:8:221:12 | ... .some(...) | semmle.label | ... .some(...) |
+| test.swift:221:12:221:12 | y | semmle.label | y |
+| test.swift:221:16:221:16 | x | semmle.label | x |
+| test.swift:222:14:222:14 | y | semmle.label | y |
+| test.swift:227:9:227:9 | x [ArrayElement] | semmle.label | x [ArrayElement] |
+| test.swift:227:13:227:46 | ArrayLiteral [ArrayElement] | semmle.label | ArrayLiteral [ArrayElement] |
+| test.swift:227:14:227:28 | source(...) | semmle.label | source(...) |
+| test.swift:227:31:227:45 | source(...) | semmle.label | source(...) |
+| test.swift:228:9:228:15 | element | semmle.label | element |
+| test.swift:228:20:228:20 | x [ArrayElement] | semmle.label | x [ArrayElement] |
+| test.swift:229:14:229:20 | element | semmle.label | element |
+| test.swift:236:5:236:8 | [post] ... ! [0] | semmle.label | [post] ... ! [0] |
+| test.swift:236:5:236:10 | ... .0 | semmle.label | ... .0 |
+| test.swift:236:14:236:28 | source(...) | semmle.label | source(...) |
+| test.swift:237:10:237:12 | opt [0] | semmle.label | opt [0] |
+| test.swift:237:10:237:13 | ... ! [0] | semmle.label | ... ! [0] |
+| test.swift:237:10:237:15 | ... .0 | semmle.label | ... .0 |
+| test.swift:242:16:242:45 | ... .some(...) | semmle.label | ... .some(...) |
+| test.swift:242:30:242:44 | source(...) | semmle.label | source(...) |
+| test.swift:245:9:245:9 | x | semmle.label | x |
+| test.swift:245:18:245:30 | getOptional(...) | semmle.label | getOptional(...) |
+| test.swift:246:8:246:12 | ... .some(...) | semmle.label | ... .some(...) |
+| test.swift:246:12:246:12 | x | semmle.label | x |
+| test.swift:246:12:246:12 | x | semmle.label | x |
+| test.swift:247:14:247:14 | x | semmle.label | x |
+| test.swift:253:16:253:45 | ... .some(...) | semmle.label | ... .some(...) |
+| test.swift:253:30:253:44 | source(...) | semmle.label | source(...) |
+| test.swift:255:10:255:22 | getOptional(...) | semmle.label | getOptional(...) |
+| test.swift:255:10:255:35 | ... ?? ... | semmle.label | ... ?? ... |
+| test.swift:256:10:256:32 | ... ?? ... | semmle.label | ... ?? ... |
+| test.swift:256:20:256:32 | getOptional(...) | semmle.label | getOptional(...) |
+| test.swift:264:5:264:23 | ... .field | semmle.label | ... .field |
+| test.swift:264:6:264:16 | [post] TypeCastExpr [field] | semmle.label | [post] TypeCastExpr [field] |
+| test.swift:264:27:264:41 | source(...) | semmle.label | source(...) |
+| test.swift:265:10:265:12 | box [field] | semmle.label | box [field] |
+| test.swift:265:10:265:18 | ... .field | semmle.label | ... .field |
+| test.swift:269:10:269:39 | IfExpr | semmle.label | IfExpr |
+| test.swift:269:14:269:29 | source(...) | semmle.label | source(...) |
+| test.swift:270:10:270:39 | IfExpr | semmle.label | IfExpr |
+| test.swift:270:24:270:39 | source(...) | semmle.label | source(...) |
+| test.swift:271:9:271:9 | x | semmle.label | x |
+| test.swift:271:20:271:35 | source(...) | semmle.label | source(...) |
+| test.swift:272:10:272:10 | x | semmle.label | x |
+| test.swift:273:30:273:45 | source(...) | semmle.label | source(...) |
+| test.swift:274:10:274:12 | f(...) | semmle.label | f(...) |
+subpaths
+| accessors_instance.swift:84:10:84:10 | c [field] | accessors_instance.swift:79:25:79:28 | self [field] | accessors_instance.swift:79:25:79:34 | ... .field | accessors_instance.swift:84:10:84:12 | ... .x |
+| accessors_instance.swift:98:5:98:5 | c [field] | accessors_instance.swift:93:32:93:36 | field | accessors_instance.swift:93:19:93:28 | otherField | accessors_instance.swift:99:10:99:10 | c [otherField] |
+| accessors_instance.swift:177:26:177:40 | source(...) | accessors_instance.swift:168:22:168:29 | newValue | accessors_instance.swift:169:13:169:17 | [post] super [x] | accessors_instance.swift:178:10:178:11 | c2 [x] |
+| accessors_instance.swift:178:10:178:11 | c2 [x] | accessors_instance.swift:173:20:173:24 | super [x] | accessors_instance.swift:173:20:173:26 | ... .x | accessors_instance.swift:178:10:178:18 | ... .getX(...) |
+| accessors_local.swift:45:9:45:9 | y | accessors_local.swift:46:21:46:21 | y | accessors_local.swift:46:21:46:21 | y | accessors_local.swift:47:10:47:10 | x |
+| accessors_local.swift:54:5:54:5 | y | accessors_local.swift:52:21:52:21 | y | accessors_local.swift:52:21:52:21 | y | accessors_local.swift:55:10:55:10 | x |
+| calls.swift:31:17:31:30 | source(...) | calls.swift:28:19:28:19 | x | calls.swift:29:16:29:24 | ... + ... | calls.swift:31:10:31:31 | target(...) |
+| calls.swift:32:17:32:30 | source(...) | calls.swift:28:19:28:19 | x | calls.swift:29:16:29:24 | ... + ... | calls.swift:32:10:32:31 | target(...) |
+| capture.swift:28:9:28:9 | x | capture.swift:32:14:32:14 | x | capture.swift:32:9:32:10 | y1 | capture.swift:38:10:38:11 | y1 |
+| capture.swift:28:9:28:9 | x | capture.swift:33:14:33:14 | x | capture.swift:33:9:33:10 | y2 | capture.swift:39:10:39:11 | y2 |
+| capture.swift:49:13:49:13 | x | capture.swift:45:22:45:24 | arg | capture.swift:46:9:46:9 | y | capture.swift:50:10:50:10 | y |
+| capture.swift:60:13:60:13 | x | capture.swift:56:22:56:24 | arg | capture.swift:57:9:57:9 | [post] y [0] | capture.swift:61:10:61:10 | y [0] |
+| capture.swift:93:9:93:9 | x | capture.swift:99:16:99:16 | x | capture.swift:99:16:99:16 | x | capture.swift:94:13:94:19 | local(...) |
+| flow-summaries.swift:54:35:54:48 | source(...) | flow-summaries.swift:54:53:54:53 | y | flow-summaries.swift:54:65:54:65 | y | flow-summaries.swift:54:10:54:67 | ... .throughCallback(...) |
+| flow-summaries.swift:55:35:55:48 | source(...) | flow-summaries.swift:55:53:55:53 | y | flow-summaries.swift:55:65:55:71 | ... + ... | flow-summaries.swift:55:10:55:73 | ... .throughCallback(...) |
+| test.swift:196:30:196:44 | source(...) | test.swift:189:22:189:22 | s | test.swift:189:58:189:58 | s | test.swift:196:16:196:45 | asyncIdentity(...) |
+| test.swift:200:31:200:45 | source(...) | test.swift:191:25:191:25 | s | test.swift:191:62:191:62 | s | test.swift:200:14:200:46 | throwingIdentity(...) |
+| test.swift:201:37:201:51 | source(...) | test.swift:191:25:191:25 | s | test.swift:191:62:191:62 | s | test.swift:201:20:201:52 | throwingIdentity(...) |
+| test.swift:205:32:205:46 | source(...) | test.swift:191:25:191:25 | s | test.swift:191:62:191:62 | s | test.swift:205:15:205:47 | throwingIdentity(...) |
+| test.swift:209:42:209:56 | source(...) | test.swift:193:30:193:30 | s | test.swift:193:73:193:73 | s | test.swift:209:20:209:57 | asyncThrowingIdentity(...) |
+| test.swift:210:48:210:62 | source(...) | test.swift:193:30:193:30 | s | test.swift:193:73:193:73 | s | test.swift:210:26:210:63 | asyncThrowingIdentity(...) |
+| test.swift:214:43:214:57 | source(...) | test.swift:193:30:193:30 | s | test.swift:193:73:193:73 | s | test.swift:214:21:214:58 | asyncThrowingIdentity(...) |
+testFailures
+#select
+| accessors_instance.swift:10:10:10:14 | ... .x | accessors_instance.swift:8:25:8:38 | source(...) | accessors_instance.swift:10:10:10:14 | ... .x | $@ | accessors_instance.swift:8:25:8:38 | source(...) | source(...) |
+| accessors_instance.swift:21:10:21:14 | ... .x | accessors_instance.swift:18:19:18:32 | source(...) | accessors_instance.swift:21:10:21:14 | ... .x | $@ | accessors_instance.swift:18:19:18:32 | source(...) | source(...) |
+| accessors_instance.swift:31:10:31:14 | ... .x | accessors_instance.swift:27:19:27:32 | source(...) | accessors_instance.swift:31:10:31:14 | ... .x | $@ | accessors_instance.swift:27:19:27:32 | source(...) | source(...) |
+| accessors_instance.swift:38:24:38:31 | newValue | accessors_instance.swift:41:13:41:26 | source(...) | accessors_instance.swift:38:24:38:31 | newValue | $@ | accessors_instance.swift:41:13:41:26 | source(...) | source(...) |
+| accessors_instance.swift:48:27:48:27 | v | accessors_instance.swift:51:13:51:27 | source(...) | accessors_instance.swift:48:27:48:27 | v | $@ | accessors_instance.swift:51:13:51:27 | source(...) | source(...) |
+| accessors_instance.swift:58:24:58:31 | newValue | accessors_instance.swift:57:19:57:32 | source(...) | accessors_instance.swift:58:24:58:31 | newValue | $@ | accessors_instance.swift:57:19:57:32 | source(...) | source(...) |
+| accessors_instance.swift:70:18:70:23 | ... .x | accessors_instance.swift:67:25:67:38 | source(...) | accessors_instance.swift:70:18:70:23 | ... .x | $@ | accessors_instance.swift:67:25:67:38 | source(...) | source(...) |
+| accessors_instance.swift:71:18:71:18 | x | accessors_instance.swift:67:25:67:38 | source(...) | accessors_instance.swift:71:18:71:18 | x | $@ | accessors_instance.swift:67:25:67:38 | source(...) | source(...) |
+| accessors_instance.swift:84:10:84:12 | ... .x | accessors_instance.swift:83:15:83:28 | source(...) | accessors_instance.swift:84:10:84:12 | ... .x | $@ | accessors_instance.swift:83:15:83:28 | source(...) | source(...) |
+| accessors_instance.swift:99:10:99:21 | ... .otherField | accessors_instance.swift:97:15:97:28 | source(...) | accessors_instance.swift:99:10:99:21 | ... .otherField | $@ | accessors_instance.swift:97:15:97:28 | source(...) | source(...) |
+| accessors_instance.swift:112:10:112:16 | ... .field | accessors_instance.swift:106:21:106:34 | source(...) | accessors_instance.swift:112:10:112:16 | ... .field | $@ | accessors_instance.swift:106:21:106:34 | source(...) | source(...) |
+| accessors_instance.swift:125:18:125:22 | field | accessors_instance.swift:119:21:119:35 | source(...) | accessors_instance.swift:125:18:125:22 | field | $@ | accessors_instance.swift:119:21:119:35 | source(...) | source(...) |
+| accessors_instance.swift:134:24:134:33 | ... .0 | accessors_instance.swift:143:13:143:27 | source(...) | accessors_instance.swift:134:24:134:33 | ... .0 | $@ | accessors_instance.swift:143:13:143:27 | source(...) | source(...) |
+| accessors_instance.swift:134:24:134:33 | ... .0 | accessors_instance.swift:145:14:145:28 | source(...) | accessors_instance.swift:134:24:134:33 | ... .0 | $@ | accessors_instance.swift:145:14:145:28 | source(...) | source(...) |
+| accessors_instance.swift:156:24:156:37 | ... .field | accessors_instance.swift:151:42:151:56 | source(...) | accessors_instance.swift:156:24:156:37 | ... .field | $@ | accessors_instance.swift:151:42:151:56 | source(...) | source(...) |
+| accessors_instance.swift:178:10:178:18 | ... .getX(...) | accessors_instance.swift:177:26:177:40 | source(...) | accessors_instance.swift:178:10:178:18 | ... .getX(...) | $@ | accessors_instance.swift:177:26:177:40 | source(...) | source(...) |
+| accessors_local.swift:8:10:8:10 | x | accessors_local.swift:7:21:7:34 | source(...) | accessors_local.swift:8:10:8:10 | x | $@ | accessors_local.swift:7:21:7:34 | source(...) | source(...) |
+| accessors_local.swift:17:10:17:10 | x | accessors_local.swift:15:15:15:28 | source(...) | accessors_local.swift:17:10:17:10 | x | $@ | accessors_local.swift:15:15:15:28 | source(...) | source(...) |
+| accessors_local.swift:25:10:25:10 | x | accessors_local.swift:22:15:22:28 | source(...) | accessors_local.swift:25:10:25:10 | x | $@ | accessors_local.swift:22:15:22:28 | source(...) | source(...) |
+| accessors_local.swift:31:20:31:27 | newValue | accessors_local.swift:33:9:33:22 | source(...) | accessors_local.swift:31:20:31:27 | newValue | $@ | accessors_local.swift:33:9:33:22 | source(...) | source(...) |
+| accessors_local.swift:39:20:39:27 | newValue | accessors_local.swift:38:15:38:28 | source(...) | accessors_local.swift:39:20:39:27 | newValue | $@ | accessors_local.swift:38:15:38:28 | source(...) | source(...) |
+| accessors_local.swift:47:10:47:10 | x | accessors_local.swift:45:21:45:34 | source(...) | accessors_local.swift:47:10:47:10 | x | $@ | accessors_local.swift:45:21:45:34 | source(...) | source(...) |
+| accessors_local.swift:55:10:55:10 | x | accessors_local.swift:54:9:54:22 | source(...) | accessors_local.swift:55:10:55:10 | x | $@ | accessors_local.swift:54:9:54:22 | source(...) | source(...) |
+| accessors_local.swift:61:14:61:14 | x | accessors_local.swift:59:21:59:34 | source(...) | accessors_local.swift:61:14:61:14 | x | $@ | accessors_local.swift:59:21:59:34 | source(...) | source(...) |
+| accessors_local.swift:70:14:70:14 | x | accessors_local.swift:72:9:72:22 | source(...) | accessors_local.swift:70:14:70:14 | x | $@ | accessors_local.swift:72:9:72:22 | source(...) | source(...) |
+| accessors_local.swift:82:14:82:15 | x3 | accessors_local.swift:84:9:84:22 | source(...) | accessors_local.swift:82:14:82:15 | x3 | $@ | accessors_local.swift:84:9:84:22 | source(...) | source(...) |
+| accessors_local.swift:91:20:91:29 | ... .0 | accessors_local.swift:93:11:93:25 | source(...) | accessors_local.swift:91:20:91:29 | ... .0 | $@ | accessors_local.swift:93:11:93:25 | source(...) | source(...) |
+| accessors_local.swift:103:20:103:33 | ... .field | accessors_local.swift:99:42:99:56 | source(...) | accessors_local.swift:103:20:103:33 | ... .field | $@ | accessors_local.swift:99:42:99:56 | source(...) | source(...) |
+| accessors_static.swift:10:10:10:12 | ... .x | accessors_static.swift:8:32:8:45 | source(...) | accessors_static.swift:10:10:10:12 | ... .x | $@ | accessors_static.swift:8:32:8:45 | source(...) | source(...) |
+| accessors_static.swift:21:10:21:12 | ... .x | accessors_static.swift:18:19:18:32 | source(...) | accessors_static.swift:21:10:21:12 | ... .x | $@ | accessors_static.swift:18:19:18:32 | source(...) | source(...) |
+| accessors_static.swift:31:10:31:12 | ... .x | accessors_static.swift:27:19:27:32 | source(...) | accessors_static.swift:31:10:31:12 | ... .x | $@ | accessors_static.swift:27:19:27:32 | source(...) | source(...) |
+| accessors_static.swift:38:24:38:31 | newValue | accessors_static.swift:41:11:41:24 | source(...) | accessors_static.swift:38:24:38:31 | newValue | $@ | accessors_static.swift:41:11:41:24 | source(...) | source(...) |
+| accessors_static.swift:48:24:48:31 | newValue | accessors_static.swift:47:19:47:32 | source(...) | accessors_static.swift:48:24:48:31 | newValue | $@ | accessors_static.swift:47:19:47:32 | source(...) | source(...) |
+| accessors_static.swift:59:18:59:23 | ... .x | accessors_static.swift:56:32:56:45 | source(...) | accessors_static.swift:59:18:59:23 | ... .x | $@ | accessors_static.swift:56:32:56:45 | source(...) | source(...) |
+| accessors_static.swift:63:18:63:23 | ... .x | accessors_static.swift:56:32:56:45 | source(...) | accessors_static.swift:63:18:63:23 | ... .x | $@ | accessors_static.swift:56:32:56:45 | source(...) | source(...) |
+| accessors_static.swift:64:18:64:18 | x | accessors_static.swift:56:32:56:45 | source(...) | accessors_static.swift:64:18:64:18 | x | $@ | accessors_static.swift:56:32:56:45 | source(...) | source(...) |
+| calls.swift:8:14:8:14 | x | calls.swift:10:12:10:25 | source(...) | calls.swift:8:14:8:14 | x | $@ | calls.swift:10:12:10:25 | source(...) | source(...) |
+| calls.swift:17:10:17:17 | target(...) | calls.swift:15:16:15:29 | source(...) | calls.swift:17:10:17:17 | target(...) | $@ | calls.swift:15:16:15:29 | source(...) | source(...) |
+| calls.swift:22:14:22:14 | x | calls.swift:24:15:24:28 | source(...) | calls.swift:22:14:22:14 | x | $@ | calls.swift:24:15:24:28 | source(...) | source(...) |
+| calls.swift:31:10:31:31 | target(...) | calls.swift:31:17:31:30 | source(...) | calls.swift:31:10:31:31 | target(...) | $@ | calls.swift:31:17:31:30 | source(...) | source(...) |
+| calls.swift:32:10:32:31 | target(...) | calls.swift:32:17:32:30 | source(...) | calls.swift:32:10:32:31 | target(...) | $@ | calls.swift:32:17:32:30 | source(...) | source(...) |
+| calls.swift:38:14:38:14 | x | calls.swift:40:19:40:32 | source(...) | calls.swift:38:14:38:14 | x | $@ | calls.swift:40:19:40:32 | source(...) | source(...) |
+| calls.swift:43:14:43:17 | name | calls.swift:45:19:45:32 | source(...) | calls.swift:43:14:43:17 | name | $@ | calls.swift:45:19:45:32 | source(...) | source(...) |
+| calls.swift:50:14:50:14 | x | calls.swift:53:12:53:25 | source(...) | calls.swift:50:14:50:14 | x | $@ | calls.swift:53:12:53:25 | source(...) | source(...) |
+| calls.swift:51:14:51:14 | y | calls.swift:53:28:53:41 | source(...) | calls.swift:51:14:51:14 | y | $@ | calls.swift:53:28:53:41 | source(...) | source(...) |
+| calls.swift:67:10:67:16 | ... .field | calls.swift:62:19:62:32 | source(...) | calls.swift:67:10:67:16 | ... .field | $@ | calls.swift:62:19:62:32 | source(...) | source(...) |
+| calls.swift:81:18:81:22 | field | calls.swift:75:21:75:34 | source(...) | calls.swift:81:18:81:22 | field | $@ | calls.swift:75:21:75:34 | source(...) | source(...) |
+| calls.swift:87:18:87:27 | ... .field | calls.swift:75:21:75:34 | source(...) | calls.swift:87:18:87:27 | ... .field | $@ | calls.swift:75:21:75:34 | source(...) | source(...) |
+| calls.swift:93:18:93:22 | field | calls.swift:75:21:75:34 | source(...) | calls.swift:93:18:93:22 | field | $@ | calls.swift:75:21:75:34 | source(...) | source(...) |
+| calls.swift:99:18:99:27 | ... .field | calls.swift:75:21:75:34 | source(...) | calls.swift:99:18:99:27 | ... .field | $@ | calls.swift:75:21:75:34 | source(...) | source(...) |
+| calls.swift:105:18:105:22 | field | calls.swift:75:21:75:34 | source(...) | calls.swift:105:18:105:22 | field | $@ | calls.swift:75:21:75:34 | source(...) | source(...) |
+| calls.swift:111:18:111:27 | ... .field | calls.swift:75:21:75:34 | source(...) | calls.swift:111:18:111:27 | ... .field | $@ | calls.swift:75:21:75:34 | source(...) | source(...) |
+| calls.swift:117:18:117:22 | field | calls.swift:75:21:75:34 | source(...) | calls.swift:117:18:117:22 | field | $@ | calls.swift:75:21:75:34 | source(...) | source(...) |
+| calls.swift:123:18:123:27 | ... .field | calls.swift:75:21:75:34 | source(...) | calls.swift:123:18:123:27 | ... .field | $@ | calls.swift:75:21:75:34 | source(...) | source(...) |
+| capture.swift:12:14:12:14 | x | capture.swift:10:13:10:26 | source(...) | capture.swift:12:14:12:14 | x | $@ | capture.swift:10:13:10:26 | source(...) | source(...) |
+| capture.swift:24:10:24:10 | x | capture.swift:20:13:20:26 | source(...) | capture.swift:24:10:24:10 | x | $@ | capture.swift:20:13:20:26 | source(...) | source(...) |
+| capture.swift:38:10:38:11 | y1 | capture.swift:28:13:28:26 | source(...) | capture.swift:38:10:38:11 | y1 | $@ | capture.swift:28:13:28:26 | source(...) | source(...) |
+| capture.swift:39:10:39:11 | y2 | capture.swift:28:13:28:26 | source(...) | capture.swift:39:10:39:11 | y2 | $@ | capture.swift:28:13:28:26 | source(...) | source(...) |
+| capture.swift:50:10:50:10 | y | capture.swift:43:13:43:26 | source(...) | capture.swift:50:10:50:10 | y | $@ | capture.swift:43:13:43:26 | source(...) | source(...) |
+| capture.swift:61:10:61:12 | ... .0 | capture.swift:54:13:54:26 | source(...) | capture.swift:61:10:61:12 | ... .0 | $@ | capture.swift:54:13:54:26 | source(...) | source(...) |
+| capture.swift:67:14:67:14 | x | capture.swift:69:9:69:22 | source(...) | capture.swift:67:14:67:14 | x | $@ | capture.swift:69:9:69:22 | source(...) | source(...) |
+| capture.swift:76:14:76:14 | x | capture.swift:74:13:74:26 | source(...) | capture.swift:76:14:76:14 | x | $@ | capture.swift:74:13:74:26 | source(...) | source(...) |
+| capture.swift:88:10:88:10 | x | capture.swift:84:13:84:26 | source(...) | capture.swift:88:10:88:10 | x | $@ | capture.swift:84:13:84:26 | source(...) | source(...) |
+| capture.swift:95:10:95:10 | y | capture.swift:93:13:93:26 | source(...) | capture.swift:95:10:95:10 | y | $@ | capture.swift:93:13:93:26 | source(...) | source(...) |
+| capture.swift:98:14:98:14 | x | capture.swift:93:13:93:26 | source(...) | capture.swift:98:14:98:14 | x | $@ | capture.swift:93:13:93:26 | source(...) | source(...) |
+| capture.swift:106:14:106:15 | x1 | capture.swift:104:13:104:27 | source(...) | capture.swift:106:14:106:15 | x1 | $@ | capture.swift:104:13:104:27 | source(...) | source(...) |
+| capture.swift:109:14:109:14 | x | capture.swift:104:13:104:27 | source(...) | capture.swift:109:14:109:14 | x | $@ | capture.swift:104:13:104:27 | source(...) | source(...) |
+| capture.swift:118:14:118:14 | x | capture.swift:116:13:116:27 | source(...) | capture.swift:118:14:118:14 | x | $@ | capture.swift:116:13:116:27 | source(...) | source(...) |
+| capture.swift:119:14:119:17 | blah | capture.swift:116:13:116:27 | source(...) | capture.swift:119:14:119:17 | blah | $@ | capture.swift:116:13:116:27 | source(...) | source(...) |
+| capture.swift:143:14:143:14 | x | capture.swift:147:9:147:23 | source(...) | capture.swift:143:14:143:14 | x | $@ | capture.swift:147:9:147:23 | source(...) | source(...) |
+| capture.swift:158:18:158:23 | ... .x | capture.swift:156:13:156:25 | source(...) | capture.swift:158:18:158:23 | ... .x | $@ | capture.swift:156:13:156:25 | source(...) | source(...) |
+| capture.swift:166:18:166:23 | ... .x | capture.swift:164:13:164:25 | source(...) | capture.swift:166:18:166:23 | ... .x | $@ | capture.swift:164:13:164:25 | source(...) | source(...) |
+| capture.swift:167:18:167:18 | x | capture.swift:164:13:164:25 | source(...) | capture.swift:167:18:167:18 | x | $@ | capture.swift:164:13:164:25 | source(...) | source(...) |
+| capture.swift:176:18:176:23 | ... .x | capture.swift:173:13:173:25 | source(...) | capture.swift:176:18:176:23 | ... .x | $@ | capture.swift:173:13:173:25 | source(...) | source(...) |
+| capture.swift:177:18:177:18 | x | capture.swift:173:13:173:25 | source(...) | capture.swift:177:18:177:18 | x | $@ | capture.swift:173:13:173:25 | source(...) | source(...) |
+| capture.swift:185:18:185:23 | ... .x | capture.swift:183:13:183:25 | source(...) | capture.swift:185:18:185:23 | ... .x | $@ | capture.swift:183:13:183:25 | source(...) | source(...) |
+| capture.swift:186:18:186:18 | x | capture.swift:183:13:183:25 | source(...) | capture.swift:186:18:186:18 | x | $@ | capture.swift:183:13:183:25 | source(...) | source(...) |
+| enums.swift:16:14:16:14 | x | enums.swift:12:21:12:34 | source(...) | enums.swift:16:14:16:14 | x | $@ | enums.swift:12:21:12:34 | source(...) | source(...) |
+| enums.swift:27:14:27:14 | x | enums.swift:23:21:23:34 | source(...) | enums.swift:27:14:27:14 | x | $@ | enums.swift:23:21:23:34 | source(...) | source(...) |
+| enums.swift:36:10:36:10 | x | enums.swift:34:21:34:34 | source(...) | enums.swift:36:10:36:10 | x | $@ | enums.swift:34:21:34:34 | source(...) | source(...) |
+| enums.swift:45:14:45:14 | x | enums.swift:40:21:40:34 | source(...) | enums.swift:45:14:45:14 | x | $@ | enums.swift:40:21:40:34 | source(...) | source(...) |
+| enums.swift:50:14:50:14 | x | enums.swift:40:21:40:34 | source(...) | enums.swift:50:14:50:14 | x | $@ | enums.swift:40:21:40:34 | source(...) | source(...) |
+| enums.swift:59:10:59:10 | x | enums.swift:57:31:57:44 | source(...) | enums.swift:59:10:59:10 | x | $@ | enums.swift:57:31:57:44 | source(...) | source(...) |
+| enums.swift:65:10:65:14 | opt_x | enums.swift:63:31:63:44 | source(...) | enums.swift:65:10:65:14 | opt_x | $@ | enums.swift:63:31:63:44 | source(...) | source(...) |
+| enums.swift:76:14:76:14 | x | enums.swift:73:34:73:47 | source(...) | enums.swift:76:14:76:14 | x | $@ | enums.swift:73:34:73:47 | source(...) | source(...) |
+| enums.swift:84:14:84:14 | x | enums.swift:73:34:73:47 | source(...) | enums.swift:84:14:84:14 | x | $@ | enums.swift:73:34:73:47 | source(...) | source(...) |
+| flow-summaries.swift:4:10:4:10 | y | flow-summaries.swift:2:13:2:26 | source(...) | flow-summaries.swift:4:10:4:10 | y | $@ | flow-summaries.swift:2:13:2:26 | source(...) | source(...) |
+| flow-summaries.swift:11:14:11:14 | y | flow-summaries.swift:8:13:8:26 | source(...) | flow-summaries.swift:11:14:11:14 | y | $@ | flow-summaries.swift:8:13:8:26 | source(...) | source(...) |
+| flow-summaries.swift:18:10:18:10 | y | flow-summaries.swift:16:18:16:31 | source(...) | flow-summaries.swift:18:10:18:10 | y | $@ | flow-summaries.swift:16:18:16:31 | source(...) | source(...) |
+| flow-summaries.swift:18:10:18:10 | y | flow-summaries.swift:16:34:16:47 | source(...) | flow-summaries.swift:18:10:18:10 | y | $@ | flow-summaries.swift:16:34:16:47 | source(...) | source(...) |
+| flow-summaries.swift:29:10:29:24 | ... .outputField | flow-summaries.swift:25:13:25:26 | source(...) | flow-summaries.swift:29:10:29:24 | ... .outputField | $@ | flow-summaries.swift:25:13:25:26 | source(...) | source(...) |
+| flow-summaries.swift:36:10:36:10 | z | flow-summaries.swift:33:13:33:26 | source(...) | flow-summaries.swift:36:10:36:10 | z | $@ | flow-summaries.swift:33:13:33:26 | source(...) | source(...) |
+| flow-summaries.swift:42:14:42:14 | y | flow-summaries.swift:40:13:40:26 | source(...) | flow-summaries.swift:42:14:42:14 | y | $@ | flow-summaries.swift:40:13:40:26 | source(...) | source(...) |
+| flow-summaries.swift:50:10:50:10 | y | flow-summaries.swift:48:16:48:29 | source(...) | flow-summaries.swift:50:10:50:10 | y | $@ | flow-summaries.swift:48:16:48:29 | source(...) | source(...) |
+| flow-summaries.swift:54:10:54:67 | ... .throughCallback(...) | flow-summaries.swift:54:35:54:48 | source(...) | flow-summaries.swift:54:10:54:67 | ... .throughCallback(...) | $@ | flow-summaries.swift:54:35:54:48 | source(...) | source(...) |
+| flow-summaries.swift:55:10:55:73 | ... .throughCallback(...) | flow-summaries.swift:55:35:55:48 | source(...) | flow-summaries.swift:55:10:55:73 | ... .throughCallback(...) | $@ | flow-summaries.swift:55:35:55:48 | source(...) | source(...) |
+| flow-summaries.swift:61:10:61:43 | ... .taintFlow(...) | flow-summaries.swift:61:29:61:42 | source(...) | flow-summaries.swift:61:10:61:43 | ... .taintFlow(...) | $@ | flow-summaries.swift:61:29:61:42 | source(...) | source(...) |
+| flow-summaries.swift:67:10:67:10 | x | flow-summaries.swift:65:13:65:27 | source(...) | flow-summaries.swift:67:10:67:10 | x | $@ | flow-summaries.swift:65:13:65:27 | source(...) | source(...) |
+| flow-summaries.swift:68:10:68:10 | y | flow-summaries.swift:66:13:66:27 | source(...) | flow-summaries.swift:68:10:68:10 | y | $@ | flow-summaries.swift:66:13:66:27 | source(...) | source(...) |
+| flow-summaries.swift:70:10:70:10 | x | flow-summaries.swift:65:13:65:27 | source(...) | flow-summaries.swift:70:10:70:10 | x | $@ | flow-summaries.swift:65:13:65:27 | source(...) | source(...) |
+| flow-summaries.swift:70:10:70:10 | x | flow-summaries.swift:66:13:66:27 | source(...) | flow-summaries.swift:70:10:70:10 | x | $@ | flow-summaries.swift:66:13:66:27 | source(...) | source(...) |
+| flow-summaries.swift:71:10:71:10 | y | flow-summaries.swift:65:13:65:27 | source(...) | flow-summaries.swift:71:10:71:10 | y | $@ | flow-summaries.swift:65:13:65:27 | source(...) | source(...) |
+| flow-summaries.swift:71:10:71:10 | y | flow-summaries.swift:66:13:66:27 | source(...) | flow-summaries.swift:71:10:71:10 | y | $@ | flow-summaries.swift:66:13:66:27 | source(...) | source(...) |
+| flow-summaries.swift:77:10:77:21 | ... .getField(...) | flow-summaries.swift:76:16:76:30 | source(...) | flow-summaries.swift:77:10:77:21 | ... .getField(...) | $@ | flow-summaries.swift:76:16:76:30 | source(...) | source(...) |
+| implicit-self.swift:17:14:17:19 | ... .x | implicit-self.swift:16:18:16:31 | source(...) | implicit-self.swift:17:14:17:19 | ... .x | $@ | implicit-self.swift:16:18:16:31 | source(...) | source(...) |
+| implicit-self.swift:23:14:23:14 | x | implicit-self.swift:22:13:22:26 | source(...) | implicit-self.swift:23:14:23:14 | x | $@ | implicit-self.swift:22:13:22:26 | source(...) | source(...) |
+| implicit-self.swift:29:14:29:19 | ... .x | implicit-self.swift:28:13:28:26 | source(...) | implicit-self.swift:29:14:29:19 | ... .x | $@ | implicit-self.swift:28:13:28:26 | source(...) | source(...) |
+| implicit-self.swift:35:14:35:14 | x | implicit-self.swift:34:18:34:31 | source(...) | implicit-self.swift:35:14:35:14 | x | $@ | implicit-self.swift:34:18:34:31 | source(...) | source(...) |
+| implicit-self.swift:41:14:41:23 | ... .x | implicit-self.swift:40:22:40:35 | source(...) | implicit-self.swift:41:14:41:23 | ... .x | $@ | implicit-self.swift:40:22:40:35 | source(...) | source(...) |
+| implicit-self.swift:47:14:47:18 | ... .x | implicit-self.swift:46:17:46:30 | source(...) | implicit-self.swift:47:14:47:18 | ... .x | $@ | implicit-self.swift:46:17:46:30 | source(...) | source(...) |
+| implicit-self.swift:53:14:53:23 | ... .x | implicit-self.swift:52:17:52:30 | source(...) | implicit-self.swift:53:14:53:23 | ... .x | $@ | implicit-self.swift:52:17:52:30 | source(...) | source(...) |
+| implicit-self.swift:59:14:59:18 | ... .x | implicit-self.swift:58:22:58:35 | source(...) | implicit-self.swift:59:14:59:18 | ... .x | $@ | implicit-self.swift:58:22:58:35 | source(...) | source(...) |
+| implicit-self.swift:65:14:65:14 | x | implicit-self.swift:64:24:64:37 | source(...) | implicit-self.swift:65:14:65:14 | x | $@ | implicit-self.swift:64:24:64:37 | source(...) | source(...) |
+| implicit-self.swift:66:14:66:19 | ... .x | implicit-self.swift:64:24:64:37 | source(...) | implicit-self.swift:66:14:66:19 | ... .x | $@ | implicit-self.swift:64:24:64:37 | source(...) | source(...) |
+| implicit-self.swift:72:14:72:14 | x | implicit-self.swift:71:29:71:43 | source(...) | implicit-self.swift:72:14:72:14 | x | $@ | implicit-self.swift:71:29:71:43 | source(...) | source(...) |
+| implicit-self.swift:73:14:73:19 | ... .x | implicit-self.swift:71:29:71:43 | source(...) | implicit-self.swift:73:14:73:19 | ... .x | $@ | implicit-self.swift:71:29:71:43 | source(...) | source(...) |
+| implicit-self.swift:79:14:79:14 | x | implicit-self.swift:78:24:78:38 | source(...) | implicit-self.swift:79:14:79:14 | x | $@ | implicit-self.swift:78:24:78:38 | source(...) | source(...) |
+| implicit-self.swift:80:14:80:19 | ... .x | implicit-self.swift:78:24:78:38 | source(...) | implicit-self.swift:80:14:80:19 | ... .x | $@ | implicit-self.swift:78:24:78:38 | source(...) | source(...) |
+| implicit-self.swift:86:14:86:14 | x | implicit-self.swift:85:29:85:43 | source(...) | implicit-self.swift:86:14:86:14 | x | $@ | implicit-self.swift:85:29:85:43 | source(...) | source(...) |
+| implicit-self.swift:87:14:87:19 | ... .x | implicit-self.swift:85:29:85:43 | source(...) | implicit-self.swift:87:14:87:19 | ... .x | $@ | implicit-self.swift:85:29:85:43 | source(...) | source(...) |
+| short-return.swift:8:10:8:19 | getValue(...) | short-return.swift:7:33:7:46 | source(...) | short-return.swift:8:10:8:19 | getValue(...) | $@ | short-return.swift:7:33:7:46 | source(...) | source(...) |
+| test.swift:9:10:9:21 | source(...) | test.swift:9:10:9:21 | source(...) | test.swift:9:10:9:21 | source(...) | $@ | test.swift:9:10:9:21 | source(...) | source(...) |
+| test.swift:17:10:17:32 | ... + ... | test.swift:17:10:17:23 | source(...) | test.swift:17:10:17:32 | ... + ... | $@ | test.swift:17:10:17:23 | source(...) | source(...) |
+| test.swift:18:10:18:32 | ... + ... | test.swift:18:19:18:32 | source(...) | test.swift:18:10:18:32 | ... + ... | $@ | test.swift:18:19:18:32 | source(...) | source(...) |
+| test.swift:20:10:20:33 | StringInterpolationExpr | test.swift:20:13:20:26 | source(...) | test.swift:20:10:20:33 | StringInterpolationExpr | $@ | test.swift:20:13:20:26 | source(...) | source(...) |
+| test.swift:21:10:21:33 | StringInterpolationExpr | test.swift:21:18:21:31 | source(...) | test.swift:21:10:21:33 | StringInterpolationExpr | $@ | test.swift:21:18:21:31 | source(...) | source(...) |
+| test.swift:22:10:22:38 | StringInterpolationExpr | test.swift:22:18:22:31 | source(...) | test.swift:22:10:22:38 | StringInterpolationExpr | $@ | test.swift:22:18:22:31 | source(...) | source(...) |
+| test.swift:27:10:27:35 | ... .0 | test.swift:27:11:27:24 | source(...) | test.swift:27:10:27:35 | ... .0 | $@ | test.swift:27:11:27:24 | source(...) | source(...) |
+| test.swift:30:10:30:35 | ... .1 | test.swift:30:19:30:32 | source(...) | test.swift:30:10:30:35 | ... .1 | $@ | test.swift:30:19:30:32 | source(...) | source(...) |
+| test.swift:35:10:35:10 | a | test.swift:34:13:34:26 | source(...) | test.swift:35:10:35:10 | a | $@ | test.swift:34:13:34:26 | source(...) | source(...) |
+| test.swift:40:10:40:10 | a | test.swift:39:19:39:32 | source(...) | test.swift:40:10:40:10 | a | $@ | test.swift:39:19:39:32 | source(...) | source(...) |
+| test.swift:45:10:45:10 | d | test.swift:43:27:43:40 | source(...) | test.swift:45:10:45:10 | d | $@ | test.swift:43:27:43:40 | source(...) | source(...) |
+| test.swift:50:10:50:10 | a | test.swift:49:13:49:26 | source(...) | test.swift:50:10:50:10 | a | $@ | test.swift:49:13:49:26 | source(...) | source(...) |
+| test.swift:58:10:58:16 | ... .0 | test.swift:57:15:57:28 | source(...) | test.swift:58:10:58:16 | ... .0 | $@ | test.swift:57:15:57:28 | source(...) | source(...) |
+| test.swift:69:10:69:23 | ... .0 | test.swift:64:22:64:35 | source(...) | test.swift:69:10:69:23 | ... .0 | $@ | test.swift:64:22:64:35 | source(...) | source(...) |
+| test.swift:77:10:77:16 | ... .1 | test.swift:75:21:75:34 | source(...) | test.swift:77:10:77:16 | ... .1 | $@ | test.swift:75:21:75:34 | source(...) | source(...) |
+| test.swift:86:10:86:16 | ... .0 | test.swift:85:15:85:29 | source(...) | test.swift:86:10:86:16 | ... .0 | $@ | test.swift:85:15:85:29 | source(...) | source(...) |
+| test.swift:101:10:101:10 | x | test.swift:97:13:97:27 | source(...) | test.swift:101:10:101:10 | x | $@ | test.swift:97:13:97:27 | source(...) | source(...) |
+| test.swift:107:10:107:10 | y | test.swift:105:13:105:27 | source(...) | test.swift:107:10:107:10 | y | $@ | test.swift:105:13:105:27 | source(...) | source(...) |
+| test.swift:110:14:110:14 | x | test.swift:97:13:97:27 | source(...) | test.swift:110:14:110:14 | x | $@ | test.swift:97:13:97:27 | source(...) | source(...) |
+| test.swift:111:14:111:14 | y | test.swift:105:13:105:27 | source(...) | test.swift:111:14:111:14 | y | $@ | test.swift:105:13:105:27 | source(...) | source(...) |
+| test.swift:123:10:123:16 | ... .0 | test.swift:118:19:118:33 | source(...) | test.swift:123:10:123:16 | ... .0 | $@ | test.swift:118:19:118:33 | source(...) | source(...) |
+| test.swift:136:10:136:10 | a | test.swift:128:18:128:32 | source(...) | test.swift:136:10:136:10 | a | $@ | test.swift:128:18:128:32 | source(...) | source(...) |
+| test.swift:137:10:137:10 | b | test.swift:128:35:128:49 | source(...) | test.swift:137:10:137:10 | b | $@ | test.swift:128:35:128:49 | source(...) | source(...) |
+| test.swift:143:10:143:10 | a | test.swift:142:19:142:33 | source(...) | test.swift:143:10:143:10 | a | $@ | test.swift:142:19:142:33 | source(...) | source(...) |
+| test.swift:149:10:149:10 | a | test.swift:148:10:148:24 | source(...) | test.swift:149:10:149:10 | a | $@ | test.swift:148:10:148:24 | source(...) | source(...) |
+| test.swift:155:10:155:10 | a | test.swift:154:20:154:34 | source(...) | test.swift:155:10:155:10 | a | $@ | test.swift:154:20:154:34 | source(...) | source(...) |
+| test.swift:161:10:161:12 | ... .0 | test.swift:160:23:160:37 | source(...) | test.swift:161:10:161:12 | ... .0 | $@ | test.swift:160:23:160:37 | source(...) | source(...) |
+| test.swift:168:10:168:12 | ... .0 | test.swift:167:29:167:43 | source(...) | test.swift:168:10:168:12 | ... .0 | $@ | test.swift:167:29:167:43 | source(...) | source(...) |
+| test.swift:176:10:176:10 | a | test.swift:175:25:175:39 | source(...) | test.swift:176:10:176:10 | a | $@ | test.swift:175:25:175:39 | source(...) | source(...) |
+| test.swift:177:10:177:10 | b | test.swift:175:52:175:66 | source(...) | test.swift:177:10:177:10 | b | $@ | test.swift:175:52:175:66 | source(...) | source(...) |
+| test.swift:185:10:185:10 | x | test.swift:182:13:182:27 | source(...) | test.swift:185:10:185:10 | x | $@ | test.swift:182:13:182:27 | source(...) | source(...) |
+| test.swift:186:10:186:10 | y | test.swift:183:13:183:27 | source(...) | test.swift:186:10:186:10 | y | $@ | test.swift:183:13:183:27 | source(...) | source(...) |
+| test.swift:196:10:196:45 | await ... | test.swift:196:30:196:44 | source(...) | test.swift:196:10:196:45 | await ... | $@ | test.swift:196:30:196:44 | source(...) | source(...) |
+| test.swift:200:10:200:46 | try ... | test.swift:200:31:200:45 | source(...) | test.swift:200:10:200:46 | try ... | $@ | test.swift:200:31:200:45 | source(...) | source(...) |
+| test.swift:203:14:203:16 | opt | test.swift:201:37:201:51 | source(...) | test.swift:203:14:203:16 | opt | $@ | test.swift:201:37:201:51 | source(...) | source(...) |
+| test.swift:205:10:205:47 | try! ... | test.swift:205:32:205:46 | source(...) | test.swift:205:10:205:47 | try! ... | $@ | test.swift:205:32:205:46 | source(...) | source(...) |
+| test.swift:209:10:209:57 | try ... | test.swift:209:42:209:56 | source(...) | test.swift:209:10:209:57 | try ... | $@ | test.swift:209:42:209:56 | source(...) | source(...) |
+| test.swift:212:14:212:16 | opt | test.swift:210:48:210:62 | source(...) | test.swift:212:14:212:16 | opt | $@ | test.swift:210:48:210:62 | source(...) | source(...) |
+| test.swift:214:10:214:58 | try! ... | test.swift:214:43:214:57 | source(...) | test.swift:214:10:214:58 | try! ... | $@ | test.swift:214:43:214:57 | source(...) | source(...) |
+| test.swift:219:10:219:20 | TypeCastExpr | test.swift:218:13:218:27 | source(...) | test.swift:219:10:219:20 | TypeCastExpr | $@ | test.swift:218:13:218:27 | source(...) | source(...) |
+| test.swift:220:10:220:21 | TypeCastExpr | test.swift:218:13:218:27 | source(...) | test.swift:220:10:220:21 | TypeCastExpr | $@ | test.swift:218:13:218:27 | source(...) | source(...) |
+| test.swift:222:14:222:14 | y | test.swift:218:13:218:27 | source(...) | test.swift:222:14:222:14 | y | $@ | test.swift:218:13:218:27 | source(...) | source(...) |
+| test.swift:229:14:229:20 | element | test.swift:227:14:227:28 | source(...) | test.swift:229:14:229:20 | element | $@ | test.swift:227:14:227:28 | source(...) | source(...) |
+| test.swift:229:14:229:20 | element | test.swift:227:31:227:45 | source(...) | test.swift:229:14:229:20 | element | $@ | test.swift:227:31:227:45 | source(...) | source(...) |
+| test.swift:237:10:237:15 | ... .0 | test.swift:236:14:236:28 | source(...) | test.swift:237:10:237:15 | ... .0 | $@ | test.swift:236:14:236:28 | source(...) | source(...) |
+| test.swift:247:14:247:14 | x | test.swift:242:30:242:44 | source(...) | test.swift:247:14:247:14 | x | $@ | test.swift:242:30:242:44 | source(...) | source(...) |
+| test.swift:255:10:255:35 | ... ?? ... | test.swift:253:30:253:44 | source(...) | test.swift:255:10:255:35 | ... ?? ... | $@ | test.swift:253:30:253:44 | source(...) | source(...) |
+| test.swift:256:10:256:32 | ... ?? ... | test.swift:253:30:253:44 | source(...) | test.swift:256:10:256:32 | ... ?? ... | $@ | test.swift:253:30:253:44 | source(...) | source(...) |
+| test.swift:265:10:265:18 | ... .field | test.swift:264:27:264:41 | source(...) | test.swift:265:10:265:18 | ... .field | $@ | test.swift:264:27:264:41 | source(...) | source(...) |
+| test.swift:269:10:269:39 | IfExpr | test.swift:269:14:269:29 | source(...) | test.swift:269:10:269:39 | IfExpr | $@ | test.swift:269:14:269:29 | source(...) | source(...) |
+| test.swift:270:10:270:39 | IfExpr | test.swift:270:24:270:39 | source(...) | test.swift:270:10:270:39 | IfExpr | $@ | test.swift:270:24:270:39 | source(...) | source(...) |
+| test.swift:272:10:272:10 | x | test.swift:271:20:271:35 | source(...) | test.swift:272:10:272:10 | x | $@ | test.swift:271:20:271:35 | source(...) | source(...) |
+| test.swift:274:10:274:12 | f(...) | test.swift:273:30:273:45 | source(...) | test.swift:274:10:274:12 | f(...) | $@ | test.swift:273:30:273:45 | source(...) | source(...) |
diff --git a/unified/ql/test/library-tests/dataflow/test.ext.yml b/unified/ql/test/library-tests/dataflow/test.ext.yml
new file mode 100644
index 000000000000..352ac28dad95
--- /dev/null
+++ b/unified/ql/test/library-tests/dataflow/test.ext.yml
@@ -0,0 +1,20 @@
+extensions:
+  - addsTo:
+      pack: codeql/unified-all
+      extensible: legacySummaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      - ["", "TestType", true, "identityFlow(_:)", "", "", "Argument[0]", "ReturnValue", "value", "manual"]
+      - ["", "TestType", true, "storeArray(_:)", "", "", "Argument[0]", "ReturnValue.ArrayElement", "value", "manual"]
+      - ["", "TestType", true, "readArray(_:)", "", "", "Argument[0].ArrayElement", "ReturnValue", "value", "manual"]
+      - ["", "TestType", true, "postUpdateArg(_:output:)", "", "", "Argument[0]", "Argument[output:].Member[outputField]", "value", "manual"]
+      - ["", "TestType", true, "storeUnusualName(_:)", "", "", "Argument[0]", "ReturnValue.Member[unusualNameNotAppearingInSourceCode]", "value", "manual"]
+      - ["", "TestType", true, "readUnusualName(_:)", "", "", "Argument[0].Member[unusualNameNotAppearingInSourceCode]", "ReturnValue", "value", "manual"]
+      - ["", "TestType", true, "intoCallback(_:_:)", "", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "manual"]
+      - ["", "TestType", true, "outOfCallback(_:)", "", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "TestType", true, "throughCallback(_:_:)", "", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "manual"]
+      - ["", "TestType", true, "throughCallback(_:_:)", "", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
+      - ["", "TestType", true, "taintFlow(_:)", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "TestType", true, "swap(_:_:)", "", "", "Argument[0]", "Argument[1]", "value", "manual"]
+      - ["", "TestType", true, "swap(_:_:)", "", "", "Argument[1]", "Argument[0]", "value", "manual"]
+      - ["", "TestType", true, "getField()", "", "", "Argument[self].Member[field]", "ReturnValue", "value", "manual"]
+      - ["", "TestType", true, "setField(_:)", "", "", "Argument[0]", "Argument[self].Member[field]", "value", "manual"]
diff --git a/unified/ql/test/library-tests/dataflow/test.ql b/unified/ql/test/library-tests/dataflow/test.ql
new file mode 100644
index 000000000000..eccf3ccfd79d
--- /dev/null
+++ b/unified/ql/test/library-tests/dataflow/test.ql
@@ -0,0 +1,15 @@
+/**
+ * @kind path-problem
+ * @id unified/test/library-tests/dataflow
+ * @severity info
+ * @precision low
+ */
+
+private import unified
+private import utils.test.InlineFlowTest
+import DefaultFlowTest
+import TaintFlow::PathGraph
+
+from TaintFlow::PathNode source, TaintFlow::PathNode sink
+where TaintFlow::flowPath(source, sink)
+select sink, source, sink, "$@", source, source.toString()
diff --git a/unified/ql/test/library-tests/dataflow/test.swift b/unified/ql/test/library-tests/dataflow/test.swift
new file mode 100644
index 000000000000..943c8d0f0e05
--- /dev/null
+++ b/unified/ql/test/library-tests/dataflow/test.swift
@@ -0,0 +1,275 @@
+func source(_ s: String) -> String { return s }
+
+@discardableResult
+func sink(_ s: Any) -> String { return "" }
+
+func foo() -> Bool { return 5 > 5 }
+
+func t1() {
+    sink(source("t1"))  // $ hasValueFlow=t1
+}
+
+extension DefaultStringInterpolation {
+    mutating func appendInterpolation(escape value: String) {}
+}
+
+func t2() {
+    sink(source("t2.1") + "blah")  // $ hasTaintFlow=t2.1
+    sink("blah" + source("t2.2"))  // $ hasTaintFlow=t2.2
+
+    sink("\(source("t2.3")) blah")  // $ hasTaintFlow=t2.3
+    sink("blah \(source("t2.4"))")  // $ hasTaintFlow=t2.4
+    sink("blah \(source("t2.5")) blah")  // $ hasTaintFlow=t2.5
+    sink("blah \(escape: source("t2.6")) blah")  // no flow
+}
+
+func t3() {
+    sink((source("t3.1"), "safe").0)  // $ hasValueFlow=t3.1
+    sink((source("t3.2"), "safe").1)  // no flow
+    sink(("safe", source("t3.3")).0)  // no flow
+    sink(("safe", source("t3.4")).1)  // $ hasValueFlow=t3.4
+}
+
+func t4() {
+    let a = source("t4.1")
+    sink(a)  // $ hasValueFlow=t4.1
+}
+
+func t5() {
+    let (a, b) = (source("t5.1"), "safe")
+    sink(a)  // $ hasValueFlow=t5.1
+    sink(b)  // no flow
+
+    let (c, d) = ("safe", source("t5.2"))
+    sink(c)  // no flow
+    sink(d)  // $ hasValueFlow=t5.2
+}
+
+func t6() {
+    var a = source("t6.1")
+    sink(a)  // $ hasValueFlow=t6.1
+    a = "safe"
+    sink(a)
+}
+
+func t7() {
+    var tuple = ("safe", "safe")
+    tuple.0 = source("t7.1")
+    sink(tuple.0)  // $ hasValueFlow=t7.1
+    sink(tuple.1)  // no flow
+}
+
+func t8() {
+    var deep_tuple = (("safe", "safe"), ("safe", "safe"))
+    deep_tuple.1.0 = source("t8.1")
+    sink(deep_tuple)  // no flow
+    sink(deep_tuple.0)  // no flow
+    sink(deep_tuple.1)  // no flow
+    sink(deep_tuple.0.1)  // no flow
+    sink(deep_tuple.1.0)  // $ hasValueFlow=t8.1
+    sink(deep_tuple.1.1)  // no flow
+}
+
+func t9() {
+    var tuple = ("safe", "safe")
+    (tuple.1, _) = (source("t9.1"), source("t9.2"))
+    sink(tuple.0)  // no flow
+    sink(tuple.1)  // $ hasValueFlow=t9.1
+}
+
+func t10() {
+    var tuple = ("safe", "safe")
+    sink(tuple.0)  // no flow
+    sink(tuple.1)  // no flow
+
+    tuple.0 = source("t10.1")
+    sink(tuple.0)  // $ hasValueFlow=t10.1
+    sink(tuple.1)  // no flow
+
+    tuple = ("safe", "safe")
+    sink(tuple.0)  // no flow
+    sink(tuple.1)  // no flow
+}
+
+func t11() {
+    var x = "safe"
+    if foo() {
+        x = source("t11.1")
+    } else {
+        sink(x)  // no flow
+    }
+    sink(x)  // $ hasValueFlow=t11.1
+
+    var y = "safe"
+    if foo() {
+        y = source("t11.2")
+    }
+    sink(y)  // $ hasValueFlow=t11.2
+
+    if foo() {
+        sink(x)  // $ hasValueFlow=t11.1
+        sink(y)  // $ hasValueFlow=t11.2
+    }
+}
+
+func t12() {
+    var tuple = ("safe", "safe")
+    if foo() {
+        tuple.0 = source("t12.1")
+    } else {
+        sink(tuple.0)  // no flow
+        sink(tuple.1)  // no flow
+    }
+    sink(tuple.0)  // $ hasValueFlow=t12.1
+    sink(tuple.1)  // no flow
+}
+
+func t13() {
+    let tuple = (source("t13.1"), source("t13.2"))
+    var (a, b) = ("safe", "safe")
+    if foo() {
+        (a, b) = tuple
+    } else {
+        sink(a)  // no flow
+        sink(b)  // no flow
+    }
+    sink(a)  // $ hasValueFlow=t13.1
+    sink(b)  // $ hasValueFlow=t13.2
+}
+
+func t14() {
+    var a = "safe"
+    a = sink(a) + source("t14.1")
+    sink(a)  // $ hasTaintFlow=t14.1
+}
+
+func t15() {
+    var a = "safe"
+    a += source("t15.1")
+    sink(a)  // $ hasTaintFlow=t15.1
+}
+
+func t16() {
+    var a = "safe"
+    a += sink(a) + source("t16.1")
+    sink(a)  // $ hasTaintFlow=t16.1
+}
+
+func t17() {
+    var a = ("safe", "safe")
+    a.0 = sink(a.0) + source("t17.1")
+    sink(a.0)  // $ hasTaintFlow=t17.1
+    sink(a.1)  // no flow
+}
+
+func t18() {
+    var a = ("safe", "safe")
+    (a.0, _) = (sink(a.0) + source("t18.1"), source("t18.2"))
+    sink(a.0)  // $ hasTaintFlow=t18.1
+    sink(a.1)  // no flow
+}
+
+func t19() {
+    var a = "safe"
+    var b = "safe"
+    (a, b) = (sink(a) + source("t19.1"), sink(b) + source("t19.2"))
+    sink(a)  // $ hasTaintFlow=t19.1
+    sink(b)  // $ hasTaintFlow=t19.2
+}
+
+func t20() {
+    func foo(x: String, y: String) -> String { return x }
+    var x = source("t20.1")
+    var y = source("t20.2")
+    foo(x: x, y: y)
+    sink(x)  // $ hasValueFlow=t20.1
+    sink(y)  // $ hasValueFlow=t20.2
+}
+
+func asyncIdentity(_ s: String) async -> String { return s }
+
+func throwingIdentity(_ s: String) throws -> String { return s }
+
+func asyncThrowingIdentity(_ s: String) async throws -> String { return s }
+
+func t21() async {
+    sink(await asyncIdentity(source("t21.1")))  // $ hasValueFlow=t21.1
+}
+
+func t22() throws {
+    sink(try throwingIdentity(source("t22.1")))  // $ hasValueFlow=t22.1
+    let opt = try? throwingIdentity(source("t22.2"))
+    if let opt {
+        sink(opt)  // $ hasValueFlow=t22.2
+    }
+    sink(try! throwingIdentity(source("t22.3")))  // $ hasValueFlow=t22.3
+}
+
+func t23() async throws {
+    sink(try await asyncThrowingIdentity(source("t23.1")))  // $ hasValueFlow=t23.1
+    let opt = try? await asyncThrowingIdentity(source("t23.2"))
+    if let opt {
+        sink(opt)  // $ hasValueFlow=t23.2
+    }
+    sink(try! await asyncThrowingIdentity(source("t23.3")))  // $ hasValueFlow=t23.3
+}
+
+func t24() {
+    let x = source("t24.1")
+    sink(x as String)  // $ hasValueFlow=t24.1
+    sink(x as! String)  // $ hasValueFlow=t24.1
+    if let y = x as? String {
+        sink(y)  // $ hasValueFlow=t24.1
+    }
+}
+
+func t25() {
+    let x = [source("t25.1"), source("t25.2")]
+    for element in x {
+        sink(element)  // $ hasValueFlow=t25.1 hasValueFlow=t25.2
+    }
+
+}
+
+func t26() {
+    var opt = Optional.some(("x", "y"))
+    opt!.0 = source("t26.1")
+    sink(opt!.0)  // $ hasValueFlow=t26.1
+}
+
+func t27() {
+    func getOptional() throws -> String? {
+        return Optional.some(source("t27.1"))
+    }
+    // try? should not double-wrap in Optional
+    let x = try? getOptional()
+    if let x {
+        sink(x)  // $ hasValueFlow=t27.1
+    }
+}
+
+func t28() {
+    func getOptional() -> String? {
+        return Optional.some(source("t28.1"))
+    }
+    sink(getOptional() ?? "default")  // $ hasValueFlow=t28.1
+    sink("safe" ?? getOptional())  // $ hasValueFlow=t28.1
+}
+
+func t29() {
+    class Box {
+        var field: String = ""
+    }
+    let box = Box()
+    (box as! Box).field = source("t29.1")
+    sink(box.field)  // $ hasValueFlow=t29.1
+}
+
+func conditional(_ b: Bool) {
+    sink(b ? source("cond.1") : "clean")  // $ hasValueFlow=cond.1
+    sink(b ? "clean" : source("cond.2"))  // $ hasValueFlow=cond.2
+    let x = if b { source("cond.3") } else { "clean" }
+    sink(x)  // $ hasValueFlow=cond.3
+    func f() -> String { b ? source("cond.4") : "clean" }
+    sink(f())  // $ hasValueFlow=cond.4
+}
diff --git a/unified/ql/test/library-tests/definitions/test.expected b/unified/ql/test/library-tests/definitions/test.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/unified/ql/test/library-tests/definitions/test.ql b/unified/ql/test/library-tests/definitions/test.ql
new file mode 100644
index 000000000000..9479e756bc94
--- /dev/null
+++ b/unified/ql/test/library-tests/definitions/test.ql
@@ -0,0 +1,20 @@
+import unified
+import utils.test.InlineExpectationsTest
+import utils.test.TestUtils
+import codeql.Definitions
+
+module DefinitionsTest implements TestSig {
+  string getARelevantTag() { result = "definition" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(Identifier reference, NameBinding definition |
+      definitionOf(reference, definition, "name") and
+      location = reference.getLocation() and
+      element = reference.toString() and
+      nameBinding(definition, value) and
+      tag = "definition"
+    )
+  }
+}
+
+import MakeTest<DefinitionsTest>
diff --git a/unified/ql/test/library-tests/definitions/test.swift b/unified/ql/test/library-tests/definitions/test.swift
new file mode 100644
index 000000000000..d2597898f4f2
--- /dev/null
+++ b/unified/ql/test/library-tests/definitions/test.swift
@@ -0,0 +1,18 @@
+class Base {
+    class Nested {}
+    static let member = 1
+}
+
+class Derived : Base {} // $ definition=Base
+
+func test() {
+    let local = 1 // name=local1
+    local // $ definition=local1
+    let local = 2 // name=local2
+    local // $ definition=local2
+    Derived.member // $ definition=Derived definition=Base.member
+    let _: Derived.Nested? // $ definition=Derived definition=Base.Nested definition=Optional
+}
+
+typealias Alias = Derived // $ definition=Derived
+let _: Alias.Nested? // $ definition=Alias definition=Base.Nested definition=Optional
diff --git a/unified/ql/test/library-tests/local-name-binding/class_scope.swift b/unified/ql/test/library-tests/local-name-binding/class_scope.swift
new file mode 100644
index 000000000000..5c20bc19cbc1
--- /dev/null
+++ b/unified/ql/test/library-tests/local-name-binding/class_scope.swift
@@ -0,0 +1,82 @@
+class A {
+    static func static_before() {
+        print(staticVar) // $ access=staticVar
+        B(); // $ access=A.B
+        let b: B = nil // $ access=A.B
+        let c: C = nil // $ access=A.C
+    }
+    func instance_before() { // implicit-self=instance_before.self
+        print(instanceVar) // $ access=instanceVar implicit-qualifier=instance_before.self
+        B(); // $ access=A.B
+        let b: B = nil // $ access=A.B
+        let c: C = nil // $ access=A.C
+    }
+
+    private static let staticVar = 123
+    private let instanceVar = 456
+
+    class B {} // name=A.B
+    typealias C = B // $ access=A.B // name=A.C
+
+    static func static_after() {
+        print(staticVar) // $ access=staticVar
+        B(); // $ access=A.B
+        let b: B = nil // $ access=A.B
+        let c: C = nil // $ access=A.C
+
+    }
+    func instance_after() { // implicit-self=instance_after.self
+        print(instanceVar) // $ access=instanceVar implicit-qualifier=instance_after.self
+        B(); // $ access=A.B
+        let b: B = nil // $ access=A.B
+        let c: C = nil // $ access=A.C
+    }
+}
+
+class Base {} // name=top.Base
+
+// Base types and type parameter bounds can't see members in the class body
+class C : Base { // $ access=top.Base
+    class Base {} // name=C.Base
+}
+
+class D<T : Base> { // $ access=top.Base
+    class Base {} // name=D.Base
+}
+
+class E<T> where T : Base { // $ access=T access=top.Base
+    class Base {} // name=E.Base
+}
+
+// Base types and type parameter bounds can see type parameters
+class F<TypeParamF> :
+    D<TypeParamF> { // $ access=D access=TypeParamF
+}
+
+class G<TypeParamG :
+    D<TypeParamG>> { // $ access=D access=TypeParamG
+}
+
+class H<TypeParamH> where
+    TypeParamH : Base { // $ access=TypeParamH access=top.Base
+}
+
+// Type parameter bounds can see other type parameters, even if declared later
+class I<
+    T1 : D<T2>, // $ access=D access=I.T2
+    T2> { // name=I.T2
+}
+
+// Members can see type parameters.
+class J<TypeParamI> {
+    let x: TypeParamI; // $ access=TypeParamI
+}
+
+typealias Alias<TypeParamAlias> =
+    D<TypeParamAlias>; // $ access=D access=TypeParamAlias
+
+func foo<FooT>(x: FooT) // $ access=FooT
+    -> D<FooT> { // $ access=D access=FooT
+    let x: FooT = nil // $ access=FooT
+    return D<FooT>() // $ access=D access=FooT
+}
diff --git a/unified/ql/test/library-tests/local-name-binding/expr_patterns.swift b/unified/ql/test/library-tests/local-name-binding/expr_patterns.swift
new file mode 100644
index 000000000000..6bc6cf99686a
--- /dev/null
+++ b/unified/ql/test/library-tests/local-name-binding/expr_patterns.swift
@@ -0,0 +1,40 @@
+func t1() {
+    let a = 0 // name=a1
+    let b = 1 // name=b1
+    switch 1 {
+        case a + b: // $ access=a1 access=b1
+            a; // $ access=a1
+            b; // $ access=b1
+            break
+        default:
+            break
+    }
+}
+
+func t2() {
+    let b = 1 // name=b1
+    class M {
+        static let b = 1
+    }
+    switch 1 {
+        case let M.b: // $ access=M
+            b; // $ access=b1
+            break
+        default:
+            break
+    }
+}
+
+func t3() {
+    let b = 1 // name=b1
+    class M {
+        static let b = 1
+    }
+    switch 1 {
+        case let true ? M.b : M.b: // $ access=M
+            b; // $ access=b1
+            break
+        default:
+            break
+    }
+}
diff --git a/unified/ql/test/library-tests/local-name-binding/self_access.swift b/unified/ql/test/library-tests/local-name-binding/self_access.swift
new file mode 100644
index 000000000000..e3050195e4ce
--- /dev/null
+++ b/unified/ql/test/library-tests/local-name-binding/self_access.swift
@@ -0,0 +1,46 @@
+class C {
+    func t1() {  // implicit-self=t1.self
+        print(self)  // $ access=t1.self
+    }
+
+    var instanceField = 123
+
+    func t2() {  // implicit-self=t2.self
+        print(instanceField)  // $ access=instanceField implicit-qualifier=t2.self
+    }
+
+    func t3() {  // implicit-self=t3.self
+        foo(123) { [self] in  // $ captured=closure.self access=t3.self // name=closure.self
+            print(self)  // $ access=closure.self
+            print(instanceField)  // $ access=instanceField implicit-qualifier=closure.self
+        }
+    }
+
+    func t4() {  // implicit-self=t4.self
+        foo(123) { [weak self] in  // $ captured=weak.self access=t4.self // name=weak.self
+            // Here, 'self' is an Option<C> referring to .some(<outer self>) if it
+            // has not been GC'ed yet. Swift does not allow unqualified self access here.
+
+            print(self)  // $ access=weak.self
+
+            // Unwrap the 'self' optional to get a strong reference.
+            guard let self else { return }  // $ access=weak.self // name=guarded.self
+
+            print(self)  // $ access=guarded.self
+            print(instanceField)  // $ access=instanceField implicit-qualifier=guarded.self
+        }
+    }
+
+    func t5() {  // implicit-self=t5.self
+        foo(123) { [unowned self] in  // $ captured=unowned.self access=t5.self // name=unowned.self
+            print(self)  // $ access=unowned.self
+            print(instanceField)  // $ access=instanceField implicit-qualifier=unowned.self
+        }
+    }
+}
+
+class Sub: C {  // $ access=C
+    func t6() {  // implicit-self=t6.self
+        super.t1()  // $ access=t6.self (we treat `super` as an alias for `self`)
+    }
+}
diff --git a/unified/ql/test/library-tests/variables/variables.expected b/unified/ql/test/library-tests/local-name-binding/test.expected
similarity index 100%
rename from unified/ql/test/library-tests/variables/variables.expected
rename to unified/ql/test/library-tests/local-name-binding/test.expected
diff --git a/unified/ql/test/library-tests/local-name-binding/test.ql b/unified/ql/test/library-tests/local-name-binding/test.ql
new file mode 100644
index 000000000000..974322851944
--- /dev/null
+++ b/unified/ql/test/library-tests/local-name-binding/test.ql
@@ -0,0 +1,75 @@
+import unified
+import utils.test.InlineExpectationsTest
+import utils.test.CommentUtil
+import codeql.unified.internal.NameBinding
+
+module VariableAccessTest implements TestSig {
+  string getARelevantTag() { result = ["access", "implicit-qualifier", "captured"] }
+
+  additional predicate declAt(LocalName v, string filepath, int line) {
+    v.getLocation().hasLocationInfo(filepath, line, _, _, _)
+  }
+
+  private predicate decl(LocalName v, string alias) {
+    exists(string filepath, int line, string tag |
+      declAt(v, filepath, line) and
+      if exists(v.getABinding())
+      then
+        // explicit declarations must be annotated with 'name'
+        tag = "name"
+      else (
+        // implicit declarations have their own tags
+        v.getName() = "self" and tag = "implicit-self"
+      )
+    |
+      keyValueCommentAt(filepath, line, tag, alias)
+      or
+      not keyValueCommentAt(filepath, line, tag, _) and
+      alias = v.getName()
+    )
+  }
+
+  private PotentialLocalNameAccess getUniqueDeclarationSite(LocalName name) {
+    result = unique(PotentialLocalNameAccess ac | ac.isBindingSite() and ac.getLocalName() = name)
+  }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(PotentialLocalNameAccess va, LocalName v |
+      v = va.getLocalName() and
+      not va = getUniqueDeclarationSite(v) and // no need to annotate declaration site, if there is only one
+      location = va.getLocation() and
+      element = va.toString() and
+      decl(v, value) and
+      tag = "access"
+    )
+    or
+    exists(UnqualifiedMemberAccess access, LocalName v |
+      v = access.getImplicitQualifierVariable() and
+      location = access.getLocation() and
+      element = access.toString() and
+      decl(v, value) and
+      access.isInstanceAccess() and // For now, don't annotate receiver access in static methods. It technically exists, it's just not important yet.
+      tag = "implicit-qualifier"
+    )
+    or
+    exists(LocalVariable v |
+      v.isCaptured() and
+      location = v.getLocation() and
+      element = v.toString() and
+      decl(v, value) and
+      tag = "captured"
+    )
+  }
+}
+
+import MakeTest<VariableAccessTest>
+
+private LocalName getVariableAt(string name, string filepath, int line) {
+  VariableAccessTest::declAt(result, filepath, line) and
+  result.getName() = name
+}
+
+query predicate ambiguousVariable(LocalName v, string name, string filepath, int line) {
+  v = getVariableAt(name, filepath, line) and
+  strictcount(getVariableAt(name, filepath, line)) >= 2
+}
diff --git a/unified/ql/test/library-tests/local-name-binding/test.swift b/unified/ql/test/library-tests/local-name-binding/test.swift
new file mode 100644
index 000000000000..6de3cab47e3a
--- /dev/null
+++ b/unified/ql/test/library-tests/local-name-binding/test.swift
@@ -0,0 +1,364 @@
+func t1() -> Int {
+    let x = 42 // name=x1
+    return x // $ access=x1
+}
+
+func t2() -> Int {
+    let x = 42 // name=x1
+
+    if case let x = x + 10 { // $ access=x1 // name=x2
+        print(x) // $ access=x2
+    }
+    print(x) // $ access=x1
+}
+
+func t3() -> Int {
+    guard let x = foo() else { // name=x1
+        return 0
+    }
+    print(x) // $ access=x1
+}
+
+// Function parameters
+func t4(x: Int) -> Int { // name=x1
+    return x // $ access=x1
+}
+
+// Multiple parameters
+func t5(x: Int, // name=x1
+        y: Int) -> Int { // name=y1
+    let z = x + // $ access=x1 // name=z1
+            y // $ access=y1
+    return z // $ access=z1
+}
+
+// Parameter shadowed by local variable
+func t6(x: Int) -> Int { // name=x1
+    let x = x * 2 // $ access=x1 // name=x2
+    return x // $ access=x2
+}
+
+// Nested blocks
+func t7() {
+    let x = 1; // name=x1
+    do {
+        print(x) // $ access=x1
+        let x = 2 // name=x2
+        print(x) // $ access=x2
+    }
+    print(x) // $ access=x1
+}
+
+// For-in loop
+func t8() {
+    let array = [1, 2, 3] // name=array1
+    for x in array { // $ access=array1 // name=x1
+        print(x) // $ access=x1
+    }
+}
+
+// For-in loop with shadowing
+func t9() {
+    let x = 0 // name=x1
+    let array = [1, 2, 3] // name=array1
+    for x in array { // $ access=array1 // name=x2
+        print(x) // $ access=x2
+    }
+    print(x) // $ access=x1
+}
+
+// Switch statement with case bindings
+func t10(value: Int) { // name=value1
+    switch value { // $ access=value1
+    case let x: // name=x1
+        print(x) // $ access=x1
+    default:
+        break
+    }
+}
+
+// Switch with multiple cases
+func t11(value: Int) { // name=value1
+    switch value { // $ access=value1
+    case let x where x > 0: // $ access=x1 // name=x1
+        print(x) // $ access=x1
+    case let x: // name=x2
+        print(x) // $ access=x2
+    }
+}
+
+// Tuple unpacking
+func t12() {
+    let tuple = (1, 2) // name=tuple1
+    let (x, // name=x1
+         y) = tuple // $ access=tuple1 // name=y1
+    print(x) // $ access=x1
+    print(y) // $ access=y1
+}
+
+// Tuple unpacking with underscore
+func t13() {
+    let tuple = (1, 2, 3) // name=tuple1
+    let (x, // name=x1
+         _,
+         y) = tuple // $ access=tuple1 // name=y1
+    print(x) // $ access=x1
+    print(y) // $ access=y1
+}
+
+// Optional binding (if let)
+func t14(optional: Int?) { // name=optional1
+    if let x = optional { // $ access=optional1 // name=x1
+        print(x) // $ access=x1
+    }
+}
+
+// Multiple optional bindings
+func t15(opt1: Int?, // name=opt11
+         opt2: String?) { // name=opt21
+    if let x = opt1, // $ access=opt11 // name=x1
+       let y = opt2 { // $ access=opt21 // name=y1
+        print(x) // $ access=x1
+        print(y) // $ access=y1
+    }
+}
+
+// Do-catch blocks
+func t16() throws {
+    do {
+        let x = try foo() // name=x1
+        print(x) // $ access=x1
+    } catch let error { // name=error1
+        print(error) // $ access=error1
+    }
+}
+
+// Closure captures
+func t17() {
+    let x = 1 // $ captured=x1 // name=x1
+    let closure = { // name=closure1
+        print(x) // $ access=x1
+    }
+    closure() // $ access=closure1
+}
+
+// Closure with parameter shadowing
+func t18() {
+    let x = 1 // name=x1
+    let closure =
+        { (x: Int) -> Void in // name=x2
+            print(x) // $ access=x2
+        }
+    closure(2) // $ access=closure
+    print(x) // $ access=x1
+}
+
+// While loop
+func t19() {
+    var x = 0 // name=x1
+    while x < 10 { // $ access=x1
+        x = x + 1 // $ access=x1
+        print(x) // $ access=x1
+    }
+}
+
+// Repeat-while loop
+func t20() {
+    var x = 0 // name=x1
+    repeat {
+        x = x + 1 // $ access=x1
+        print(x) // $ access=x1
+    } while x < 10 // $ access=x1
+}
+
+// Property shadowing (var)
+func t21() {
+    var x = 1 // name=x1
+    var x = 2 // name=x2
+    print(x) // $ access=x2
+}
+
+// Nested functions
+func t22() {
+    let x = 1 // name=x1
+    func inner() { // name=inner1
+        let x = 2 // name=x2
+        print(x) // $ access=x2
+    }
+    inner() // $ access=inner1
+    print(x) // $ access=x1
+    let inner = 2 // name=inner2
+    print(inner) // $ access=inner2
+}
+
+// Three levels of shadowing
+func t23() {
+    let x = 1 // name=x1
+    {
+        let x = 2 // name=x2
+        {
+            let x = 3 // name=x3
+            print(x) // $ access=x3
+        }
+        print(x) // $ access=x2
+    }
+    print(x) // $ access=x1
+}
+
+// If-let followed by regular if
+func t24(optional: Int?) { // name=optional1
+    if let x = optional { // $ access=optional1 // name=x1
+        print(x) // $ access=x1
+    }
+    if true {
+        let x = 5 // name=x2
+        print(x) // $ access=x2
+    }
+}
+
+// Switch with variable shadowed within body of case
+func t25(value: Int) { // name=value1
+    switch value { // $ access=value1
+    case let x: // name=x1
+        print(x) // $ access=x1
+        let x = 10 // name=x2
+        print(x) // $ access=x2
+    }
+}
+
+func t26() -> Int {
+    let x = 42 // name=x1
+    guard let x = foo() else { // name=x2
+        return x // $ access=x1
+    }
+    print(x) // $ access=x2
+}
+
+// if with multiple conditions, mixing boolean and optional binding
+func t27(opt: Int?) { // name=opt1
+    if opt != nil, // $ access=opt1
+       let x = opt { // $ access=opt1
+        print(x) // $ access=x
+    }
+}
+
+// if with multiple let bindings and a boolean condition
+func t28(a: Int?, b: Int?) {
+    if let x = a, // $ access=a
+       let y = b, // $ access=b
+       x < y { // $ access=x access=y
+        print(x) // $ access=x
+        print(y) // $ access=y
+    }
+}
+
+// if with multiple conditions where a later binding shadows an outer variable
+func t29(opt: Int?) { // name=opt1
+    let x = 0 // name=x1
+    if opt != nil, // $ access=opt1
+       let x = opt { // $ access=opt1
+        print(x) // $ access=x
+    }
+    print(x) // $ access=x1
+}
+
+// guard with multiple conditions, mixing boolean and optional binding
+func t30(opt: Int?) { // name=opt1
+    guard opt != nil, // $ access=opt1
+          let x = opt else { // $ access=opt1
+        return
+    }
+    print(x) // $ access=x
+}
+
+// guard with multiple let bindings and a boolean condition
+func t31(a: Int?, b: Int?) {
+    guard let x = a, // $ access=a
+          let y = b, // $ access=b
+          x < y else { // $ access=x access=y
+        return
+    }
+    print(x) // $ access=x
+    print(y) // $ access=y
+}
+
+// guard with multiple conditions where bound variable is used in later condition
+func t32(opt: Int?) { // name=opt1
+    guard let x = opt, // $ access=opt1
+          x > 0 else { // $ access=x
+        return
+    }
+    print(x) // $ access=x
+}
+
+func t33() {
+    let x = 1 // name=x1
+    guard x > 0, // $ access=x1
+          let x = x, // $ access=x1 // name=x2
+          x > 0 else { // $ access=x2
+        return
+    }
+    print(x) // $ access=x2
+}
+
+func t34() {
+    let x = 1 // name=x1
+    if x > 0, // $ access=x1
+       let x = x, // $ access=x1 // name=x2
+       x > 0 { // $ access=x2
+        print(x) // $ access=x2
+    }
+}
+
+// While-let optional binding
+func t35(optional: Int?) { // name=optional1
+    while let x = optional { // $ access=optional1 // name=x1
+        print(x) // $ access=x1
+    }
+}
+
+// While with a sequence of variable bindings in the condition
+func t36(a: Int?, b: Int?) {
+    while let x = a, // $ access=a
+          let y = b, // $ access=b
+          x < y { // $ access=x access=y
+        print(x) // $ access=x
+        print(y) // $ access=y
+    }
+}
+
+// While-let with a sequence of shadowing variable declarations
+func t37() {
+    let x = 1 // name=x1
+    while let x = x, // $ access=x1 // name=x2
+          let x = x, // $ access=x2 // name=x3
+          x > 0 { // $ access=x3
+        print(x) // $ access=x3
+    }
+}
+
+enum E38 {
+    case a(Int)
+    case b(Int)
+}
+
+// Switch with a multi-pattern case that binds 'x' in each pattern
+func t38(value: E38) { // $ access=E38
+    switch value { // $ access=value
+    case .a(let x), // $ access=x1 // name=x1
+         .b(let x): // $ access=x1
+        print(x) // $ access=x1
+
+    case .a(let y) where y < 1, // $ access=y1 // name=y1
+         .b(let y): // $ access=y1
+        print(y) // $ access=y1
+    }
+}
+
+// A non-binding pattern in a guard refers to an existing variable
+func t39(value: Int) {
+    let x = 1 // name=x1
+    guard case x = value else { // $ access=value access=x1
+        return
+    }
+}
diff --git a/unified/ql/test/library-tests/local-name-binding/top_level.swift b/unified/ql/test/library-tests/local-name-binding/top_level.swift
new file mode 100644
index 000000000000..a7ea16ef10b8
--- /dev/null
+++ b/unified/ql/test/library-tests/local-name-binding/top_level.swift
@@ -0,0 +1,17 @@
+func use_before() {
+    print(x) // $ access=top.x
+    B(); // $ access=top.B
+    let b: B = nil // $ access=top.B
+    let c: C = nil // $ access=top.C
+}
+
+let x = 123 // name=top.x
+class B {} // name=top.B
+typealias C = B // $ access=top.B // name=top.C
+
+func use_after() {
+    print(x) // $ access=top.x
+    B(); // $ access=top.B
+    let b: B = nil // $ access=top.B
+    let c: C = nil // $ access=top.C
+}
diff --git a/unified/ql/test/library-tests/mad/test.expected b/unified/ql/test/library-tests/mad/test.expected
new file mode 100644
index 000000000000..aaa07763e1e3
--- /dev/null
+++ b/unified/ql/test/library-tests/mad/test.expected
@@ -0,0 +1,31 @@
+isSink
+| test.swift:9:28:9:33 | string | path-injection |
+| test.swift:11:25:11:30 | string | path-injection |
+| test.swift:14:25:14:30 | string | path-injection |
+| test.swift:18:17:18:22 | string | path-injection |
+| test.swift:21:5:21:16 | [self arg] ... .md5(...) | weak-hash-input-MD5 |
+| test.swift:23:20:23:25 | string | regex-use |
+| test.swift:24:20:24:25 | string | regex-use |
+| test.swift:71:37:71:49 | encodedOffset | string-length |
+| test.swift:72:42:72:54 | encodedOffset | string-length |
+| test.swift:76:24:76:36 | encryptionKey | encryption-key |
+| test.swift:77:18:77:24 | fileURL | path-injection |
+| test.swift:88:24:88:36 | encryptionKey | encryption-key |
+| test.swift:89:18:89:24 | fileURL | path-injection |
+| test.swift:100:24:100:36 | encryptionKey | encryption-key |
+| test.swift:101:18:101:24 | fileURL | path-injection |
+| test.swift:107:23:107:34 | seedFilePath | path-injection |
+| test.swift:119:29:119:34 | string | path-injection |
+| test.swift:137:5:139:5 | [self arg] ... .sinkArgs(...) | shorthand-sink |
+| test.swift:138:9:138:14 | string | shorthand-sink |
+isSource
+| test.swift:4:5:4:27 | String(...) | remote |
+| test.swift:5:5:5:44 | String(...) | remote |
+| test.swift:6:5:6:48 | String(...) | remote |
+| test.swift:7:5:7:32 | ... .init(...) | remote |
+| test.swift:9:5:9:34 | String(...) | local |
+| test.swift:10:5:12:24 | String(...) | local |
+| test.swift:13:5:15:28 | String(...) | local |
+| test.swift:29:29:29:32 | text | local |
+| test.swift:129:5:133:5 | [self param] func ShorthandTestSub.sourceParams | shorthand-source |
+| test.swift:130:11:130:11 | x | shorthand-source |
diff --git a/unified/ql/test/library-tests/mad/test.ext.yml b/unified/ql/test/library-tests/mad/test.ext.yml
new file mode 100644
index 000000000000..ff54290568d7
--- /dev/null
+++ b/unified/ql/test/library-tests/mad/test.ext.yml
@@ -0,0 +1,11 @@
+extensions:
+  - addsTo:
+      pack: codeql/unified-all
+      extensible: legacySourceModel
+    data: # namespace, type, subtypes, name, signature, ext, output, kind, provenance
+      - ["", "ShorthandTest", true, "sourceParams(_:)", "", "", "Parameter[self,0]", "shorthand-source", "manual"]
+  - addsTo:
+      pack: codeql/unified-all
+      extensible: legacySinkModel
+    data: # namespace, type, subtypes, name, signature, ext, input, kind, provenance
+      - ["", "ShorthandTest", true, "sinkArgs(_:)", "", "", "Argument[self,0]", "shorthand-sink", "manual"]
diff --git a/unified/ql/test/library-tests/mad/test.ql b/unified/ql/test/library-tests/mad/test.ql
new file mode 100644
index 000000000000..970aaa22e27f
--- /dev/null
+++ b/unified/ql/test/library-tests/mad/test.ql
@@ -0,0 +1,5 @@
+private import unified
+
+query predicate isSource = Models::isSource/2;
+
+query predicate isSink = Models::isSink/2;
diff --git a/unified/ql/test/library-tests/mad/test.qlref b/unified/ql/test/library-tests/mad/test.qlref
new file mode 100644
index 000000000000..ab6773f15f90
--- /dev/null
+++ b/unified/ql/test/library-tests/mad/test.qlref
@@ -0,0 +1,2 @@
+query: test.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/unified/ql/test/library-tests/mad/test.swift b/unified/ql/test/library-tests/mad/test.swift
new file mode 100644
index 000000000000..ff6c6975bfac
--- /dev/null
+++ b/unified/ql/test/library-tests/mad/test.swift
@@ -0,0 +1,140 @@
+func test(url: URL, string: String) {
+    String(url)  // not a source
+
+    String(contentsOf: url)  // $ isSource=remote
+    String(contentsOf: url, encoding: .utf8)  // $ isSource=remote
+    String(contentsOf: url, usedEncoding: .utf8)  // $ isSource=remote
+    String.init(contentsOf: url)  // $ isSource=remote
+
+    String(contentsOfFile: string)  // $ isSource=local isSink=path-injection
+    String(
+        contentsOfFile: string,  // $ isSink=path-injection
+        encoding: .utf8)  // $ isSource=local
+    String(
+        contentsOfFile: string,  // $ isSink=path-injection
+        usedEncoding: .utf8)  // $ isSource=local
+
+    FileManager.default.createDirectory(
+        atPath: string,  // $ isSink=path-injection
+        withIntermediateDirectories: true, attributes: nil)
+
+    string.md5()  // $ isSink=weak-hash-input-MD5
+
+    _ = try! Regex(string)  // $ isSink=regex-use
+    _ = try! Regex(string, as: Substring.self)  // $ isSink=regex-use
+
+    class TestTextInput: UITextInput {
+        func shouldChangeText(
+            in range: UITextRange,
+            replacementText text: String  // $ isSource=local // parameters not detected yet
+        ) -> Bool {
+            return true
+        }
+    }
+}
+
+class UITextField {
+    var text: String = ""
+}
+
+class URLSessionConfiguration {
+    var tlsMaximumSupportedProtocol: Int = 0
+    var tlsMinimumSupportedProtocol: Int = 0
+    var tlsMaximumSupportedProtocolVersion: Int = 0
+    var tlsMinimumSupportedProtocolVersion: Int = 0
+}
+
+func testProperties(
+    string: String,
+    textField: UITextField,
+    configuration: URLSessionConfiguration
+) {
+    _ = string.count  // $ MISSING: isSource=string-length
+    _ = textField.text  // $ MISSING: isSource=local
+
+    configuration.tlsMaximumSupportedProtocol = 0  // $ MISSING: isSink=tls-protocol-version
+    configuration.tlsMinimumSupportedProtocol = 0  // $ MISSING: isSink=tls-protocol-version
+    configuration.tlsMaximumSupportedProtocolVersion = 0  // $ MISSING: isSink=tls-protocol-version
+    configuration.tlsMinimumSupportedProtocolVersion = 0  // $ MISSING: isSink=tls-protocol-version
+}
+
+class Realm {
+    struct Configuration {}
+}
+
+func testQualifiedConstructors(
+    encodedOffset: Int,
+    encryptionKey: String,
+    fileURL: String,
+    seedFilePath: String
+) {
+    _ = String.Index(encodedOffset: encodedOffset)  // $ isSink=string-length
+    _ = String.Index.init(encodedOffset: encodedOffset)  // $ isSink=string-length
+
+    _ = Realm.Configuration(
+        deleteRealmIfMigrationNeeded: false,
+        encryptionKey: encryptionKey,  // $ isSink=encryption-key
+        fileURL: fileURL,  // $ isSink=path-injection
+        inMemoryIdentifier: nil,
+        migrationBlock: nil,
+        objectTypes: nil,
+        readOnly: false,
+        schemaVersion: 0,
+        shouldCompactOnLaunch: nil,
+        syncConfiguration: nil)
+
+    _ = Realm.Configuration.init(
+        deleteRealmIfMigrationNeeded: false,
+        encryptionKey: encryptionKey,  // $ isSink=encryption-key
+        fileURL: fileURL,  // $ isSink=path-injection
+        inMemoryIdentifier: nil,
+        migrationBlock: nil,
+        objectTypes: nil,
+        readOnly: false,
+        schemaVersion: 0,
+        shouldCompactOnLaunch: nil,
+        syncConfiguration: nil)
+
+    _ = Realm.Configuration(
+        deleteRealmIfMigrationNeeded: false,
+        encryptionKey: encryptionKey,  // $ isSink=encryption-key
+        fileURL: fileURL,  // $ isSink=path-injection
+        inMemoryIdentifier: nil,
+        migrationBlock: nil,
+        objectTypes: nil,
+        readOnly: false,
+        schemaVersion: 0,
+        seedFilePath: seedFilePath,  // $ isSink=path-injection
+        shouldCompactOnLaunch: nil,
+        syncConfiguration: nil)
+}
+
+class Connection {
+    enum Location {
+        static func uri(_ path: String, parameters: String) {}
+    }
+}
+
+func testConnectionLocation(string: String) {
+    Connection.Location.uri(string, parameters: "")  // $ isSink=path-injection
+}
+
+class ShorthandTest {
+    func sourceParams(_ x: String) {}
+
+    func sinkArgs(_ x: String) {}
+}
+
+class ShorthandTestSub: ShorthandTest {
+    override func sourceParams(
+        _ x: String  // $ isSource=shorthand-source
+    ) {
+        _ = self
+    }  // $ isSource=shorthand-source
+}
+
+func testShorthandTokens(obj: ShorthandTest, string: String) {
+    obj.sinkArgs(
+        string  // $ isSink=shorthand-sink
+    )  // $ isSink=shorthand-sink
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/explicit-instance-field-access.swift b/unified/ql/test/library-tests/static-name-binding/explicit-instance-field-access.swift
new file mode 100644
index 000000000000..a24ed7466903
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/explicit-instance-field-access.swift
@@ -0,0 +1,55 @@
+private class A {
+    let x = 123 // name=A.instance.x
+
+    func getX() {
+        return self.x // not handled by static name binding
+    }
+
+    static let y = 456 // name=A.type.y
+
+    func getY1() {
+        return Self.y // $ access=A access=A.type.y
+    }
+
+    static func getY2() {
+        return self.y // $ not handled by static name binding
+    }
+
+    class func z() -> Int { // $ access=Int // name=A.type.z
+        return 789
+    }
+
+    class func getZ() {
+        return self.z // $ not handled by static name binding
+    }
+}
+
+private class B : A { // $ access=A
+    func getX2() {
+        return self.x // not handled by static name binding
+    }
+
+    func getY3() {
+        return Self.y // $ access=B access=A.type.y
+    }
+
+    static func getY4() {
+        return self.y // $ not handled by static name binding
+    }
+
+    class func z() -> Int { // $ access=Int // name=B.type.z
+        return 789
+    }
+
+    class func getZ2() {
+        return self.z // $ not handled by static name binding
+    }
+}
+
+private class C {
+    static let x = 1
+    class D {
+        static let x = 2
+        static let foo = Self.x // $ access=C.D access=C.D.x
+    }
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/extensions.swift b/unified/ql/test/library-tests/static-name-binding/extensions.swift
new file mode 100644
index 000000000000..35c65dcb9a89
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/extensions.swift
@@ -0,0 +1,79 @@
+class A {
+    func ownMethod() {
+        ownMethod() // $ access=A.ownMethod
+        extensionMethod1() // $ access=A.extensionMethod1
+        extensionMethod2() // $ access=A.extensionMethod2
+    }
+}
+
+extension A { // $ access=A
+    func extensionMethod1() { // name=A.extensionMethod1
+        ownMethod() // $ access=A.ownMethod
+        extensionMethod1() // $ access=A.extensionMethod1
+        extensionMethod2() // $ access=A.extensionMethod2
+    }
+}
+
+extension A { // $ access=A
+    func extensionMethod2() { // name=A.extensionMethod2
+        ownMethod() // $ access=A.ownMethod
+        extensionMethod1() // $ access=A.extensionMethod1
+        extensionMethod2() // $ access=A.extensionMethod2
+    }
+}
+
+class B {
+}
+
+extension B { // $ access=B
+    class C { // name=B.C
+        class D {} // name=B.C.D
+    }
+}
+extension B { // $ access=B
+    class Nested : C { // $ access=B.C
+        let x : D // $ access=B.C.D
+    }
+}
+
+// Protocol conformance through extension
+protocol Base {
+    func baseMethod();
+    func baseMethodNoImpl();
+    func baseMethodDefaultImpl();
+}
+extension Base { // $ access=Base
+    func baseMethodExt() {} // name=BaseImpl.baseMethodExt
+    func baseMethodDefaultImpl() {} // name=BaseImpl.baseMethodDefaultImpl
+}
+class X {
+    func xMethod() {
+        baseMethod() // $ access=X.baseMethod
+        baseMethodNoImpl() // $ access=Base.baseMethodNoImpl // with no visible implementation, just resolve to the signature
+        baseMethodExt() // $ access=BaseImpl.baseMethodExt
+
+        // Static name binding may find multiple targets. Type inference should disambiguate.
+        baseMethodDefaultImpl() // $ access=Base.baseMethodDefaultImpl access=BaseImpl.baseMethodDefaultImpl
+    }
+}
+
+extension X : Base { // $ access=X access=Base
+    func baseMethod() {} // name=X.baseMethod
+}
+
+class Y {
+    func yMethod() {
+        baseMethod() // $ access=Y.baseMethod
+        baseMethodDefaultImpl() // $ access=Y.baseMethodDefaultImpl
+    }
+}
+extension Y : Base { // $ access=Y access=Base
+    func baseMethod() {} // name=Y.baseMethod
+    func baseMethodDefaultImpl() {} // name=Y.baseMethodDefaultImpl
+}
+
+// Type parameters of the extended type should be in scope in the extension.
+class GenericExtensionTarget<ExtensionTypeParameter> {}
+extension GenericExtensionTarget { // $ access=GenericExtensionTarget
+    func useTypeParameter(_: ExtensionTypeParameter) {} // $ MISSING: access=ExtensionTypeParameter
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/generics.swift b/unified/ql/test/library-tests/static-name-binding/generics.swift
new file mode 100644
index 000000000000..767cd5b2017b
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/generics.swift
@@ -0,0 +1,9 @@
+enum GenericEnum<T> {
+    case novalue
+    case value(T)  // $ access=T
+}
+
+func testGenericEnum() {
+    let intValue = GenericEnum.value(42)  // $ access=GenericEnum access=GenericEnum.value
+    let stringValue = GenericEnum<String>.novalue  // $ access=GenericEnum access=String access=GenericEnum.novalue
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/implicit-instance-field-access.swift b/unified/ql/test/library-tests/static-name-binding/implicit-instance-field-access.swift
new file mode 100644
index 000000000000..6bdf2c0669aa
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/implicit-instance-field-access.swift
@@ -0,0 +1,13 @@
+private class A {
+    let x = 123 // name=A.instance.x
+
+    func getX() {
+        return x // $ access=A.instance.x
+    }
+}
+
+private class B : A { // $ access=A
+    func getX2() {
+        return x // $ access=A.instance.x
+    }
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/inheritance.swift b/unified/ql/test/library-tests/static-name-binding/inheritance.swift
new file mode 100644
index 000000000000..c9dcd3bdf240
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/inheritance.swift
@@ -0,0 +1,114 @@
+class A {
+    class B {
+        class C {}
+    }
+
+    static func f() {}
+}
+
+class D: A {  // $ access=A
+    static func f(x: Int) {}  // $ access=Int
+}
+class E: D.B {  // $ access=D access=A.B
+    override init() {}
+}
+
+class F {
+    private init() {}
+}
+
+class G: F {  // $ access=F
+    public init() {}
+}
+
+class H: G {  // $ access=G
+    public init(x: String) {}  // $ access=String
+}
+
+class I: H {}  // $ access=H
+
+class J: I {  // $ access=I
+    convenience init() {
+        self.init(x: "")
+    }
+}
+
+protocol P {
+    init()
+}
+
+final class K: P {}  // $ access=P
+
+struct S: P {}  // $ access=P
+
+class L {
+    init(x: Int) {}  // $ access=Int // name=L.init1
+
+    init(x: Int, y: Int) {}  // $ access=Int // name=L.init2
+
+    convenience init() { self.init(x: 0) }  // name=L.init_conv
+}
+
+class M: L {  // $ access=L
+    override init(x: Int) { super.init(x: 0) }  // $ access=Int
+
+    override init(x: Int, y: Int) { super.init(x: 0, y: 0) }  // $ access=Int
+}
+
+class N: L {  // $ access=L
+    override init(x: Int) { super.init(x: 0) }  // $ access=Int
+
+    convenience init  // name=N.init_conv
+        (a: Int, b: Int, c: Int)  // $ access=Int
+    {
+        self.init(x: a + b + c)  // $ access=a access=b access=c
+    }
+}
+
+class O: N {  // $ access=N
+    override init(x: Int) {  // $ access=Int
+        super.init(x: x)  // $ access=x
+    }
+}
+
+// Members of base classes can be accessed through derived classes
+func t1() {
+    let x1: D = D()  // $ access=D
+    let x2: D.B = D.B()  // $ access=D access=A.B
+    let x3: D.B.C = D.B.C()  // $ access=D access=A.B access=A.B.C
+
+    // The base class of 'E' is itself resolved through inheritance
+    let x4: E = E()  // $ access=E
+    let x5: E.C = E.C()  // $ access=E access=A.B.C
+
+    let x6 = A.init()  // $ access=A access=A.init
+    let x7 = D.init()  // $ access=D access=A.init
+
+    let x8 = A.f()  // $ access=A access=A.f
+    let x9 = D.f()  // $ access=D access=A.f access=D.f -- type inference should filter away the `D.f` target
+    let x10 = D.f(x: 0)  // $ access=D access=A.f access=D.f -- type inference should filter away the `A.f` target
+
+    let x11 = E.init()  // $ access=E access=E.init
+
+    let x12 = G.init()  // $ access=G access=G.init
+
+    let x13 = H.init(x: "String")  // $ access=H access=H.init
+
+    let x14 = I.init(x: "String")  // $ access=I access=H.init
+
+    let x15 = J.init()  // $ access=J access=J.init access=H.init -- type inference should filter away the `H.init` target
+
+    let x16 = K.init()  // $ access=K access=K.init
+
+    let x17 = S.init()  // $ access=S access=S.init
+
+    let x18 = M.init(x: 0)  // $ access=M access=M.init access=L.init_conv -- type inference should filter away the `L.init_conv` target
+
+    let x19 = M.init()  // $ access=M access=M.init access=L.init_conv -- type inference should filter away the `M.init` target
+
+    let x20 = N.init(x: 0)  // $ access=N access=N.init access=N.init_conv access=L.init_conv -- type inference should filter away the `N.init_conv` and `L.init_conv` targets
+
+    let x21 = O.init(x: 0)  // $ access=O access=O.init access=N.init_conv access=L.init_conv -- type inference should filter away the `N.init_conv` and `L.init_conv` targets
+
+    let x22 = O.init(a: 1, b: 2, c: 3)  // $ access=O access=O.init access=N.init_conv access=L.init_conv -- type inference should filter away the `O.init` and `L.init_conv` targets
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/not-a-package/Main/Drivers/Driver.swift b/unified/ql/test/library-tests/static-name-binding/not-a-package/Main/Drivers/Driver.swift
new file mode 100644
index 000000000000..4b41a6324afb
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/not-a-package/Main/Drivers/Driver.swift
@@ -0,0 +1,5 @@
+class Driver { // name=Main.Driver
+    class Nested {} // name=Main.Driver.Nested
+}
+
+class UniqueToMain {}
diff --git a/unified/ql/test/library-tests/static-name-binding/not-a-package/Main/Runner.swift b/unified/ql/test/library-tests/static-name-binding/not-a-package/Main/Runner.swift
new file mode 100644
index 000000000000..894e6257dbb1
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/not-a-package/Main/Runner.swift
@@ -0,0 +1,10 @@
+func main() {
+    Driver(); // $ access=Main.Driver
+    Driver.Nested(); // $ access=Main.Driver access=Main.Driver.Nested
+    UniqueToMain(); // $ access=UniqueToMain
+    UniqueToMock(); // $ access=UniqueToMock
+}
+
+class MyDriver: Driver { // $ access=Main.Driver
+    class B: Nested {} // $ access=Main.Driver.Nested
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/not-a-package/Main/Util/Util.swift b/unified/ql/test/library-tests/static-name-binding/not-a-package/Main/Util/Util.swift
new file mode 100644
index 000000000000..adc7a3004127
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/not-a-package/Main/Util/Util.swift
@@ -0,0 +1,3 @@
+func getDriver() -> Driver { // $ access=Main.Driver
+    return Driver() // $ access=Main.Driver
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/not-a-package/Mock/Drivers/Driver.swift b/unified/ql/test/library-tests/static-name-binding/not-a-package/Mock/Drivers/Driver.swift
new file mode 100644
index 000000000000..75d9e81affe5
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/not-a-package/Mock/Drivers/Driver.swift
@@ -0,0 +1,5 @@
+class Driver { // name=Mock.Driver
+    class Nested {} // name=Mock.Driver.Nested
+}
+
+class UniqueToMock {}
diff --git a/unified/ql/test/library-tests/static-name-binding/not-a-package/Mock/Runner.swift b/unified/ql/test/library-tests/static-name-binding/not-a-package/Mock/Runner.swift
new file mode 100644
index 000000000000..930301ab9015
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/not-a-package/Mock/Runner.swift
@@ -0,0 +1,10 @@
+func main() {
+    Driver(); // $ access=Mock.Driver
+    Driver.Nested(); // $ access=Mock.Driver access=Mock.Driver.Nested
+    UniqueToMain(); // $ access=UniqueToMain
+    UniqueToMock(); // $ access=UniqueToMock
+}
+
+class MyDriver: Driver { // $ access=Mock.Driver
+    class B: Nested {} // $ access=Mock.Driver.Nested
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/not-a-package/Mock/Util/Util.swift b/unified/ql/test/library-tests/static-name-binding/not-a-package/Mock/Util/Util.swift
new file mode 100644
index 000000000000..1d83c82c4f9d
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/not-a-package/Mock/Util/Util.swift
@@ -0,0 +1,3 @@
+func getDriver() -> Driver { // $ access=Mock.Driver
+    return Driver() // $ access=Mock.Driver
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/Def1.swift b/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/Def1.swift
new file mode 100644
index 000000000000..6edb39c550d7
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/Def1.swift
@@ -0,0 +1,3 @@
+class DeclaredTwiceInSameFolder {} // name=Def1.DeclaredTwiceInSameFolder
+
+class OnlyInDef1 {}
diff --git a/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/Def2.swift b/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/Def2.swift
new file mode 100644
index 000000000000..f41e33bc34bb
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/Def2.swift
@@ -0,0 +1,3 @@
+class DeclaredTwiceInSameFolder {} // name=Def2.DeclaredTwiceInSameFolder
+
+class OnlyInDef2 {}
diff --git a/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/SubFolder1/Def.swift b/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/SubFolder1/Def.swift
new file mode 100644
index 000000000000..3e5ce0ba952f
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/SubFolder1/Def.swift
@@ -0,0 +1,3 @@
+class DeclaredTwiceInSubFolder {} // name=Subfolder1.DeclaredTwiceInSubFolder
+
+class OnlyInSubFolder2 {}
diff --git a/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/SubFolder1/Use.swift b/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/SubFolder1/Use.swift
new file mode 100644
index 000000000000..ac4305b455fc
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/SubFolder1/Use.swift
@@ -0,0 +1,5 @@
+private protocol P {
+    let x4: DeclaredTwiceInSubFolder; // $ access=Subfolder1.DeclaredTwiceInSubFolder
+    let x5: OnlyInSubFolder1; // $ access=OnlyInSubFolder1
+    let x6: OnlyInSubFolder2; // $ access=OnlyInSubFolder2
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/SubFolder2/Def.swift b/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/SubFolder2/Def.swift
new file mode 100644
index 000000000000..b82b472f39f6
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/SubFolder2/Def.swift
@@ -0,0 +1,3 @@
+class DeclaredTwiceInSubFolder {} // name=Subfolder2.DeclaredTwiceInSubFolder
+
+class OnlyInSubFolder1 {}
diff --git a/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/Use.swift b/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/Use.swift
new file mode 100644
index 000000000000..897386e9e93e
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/not-a-package/SiblingFiles/Use.swift
@@ -0,0 +1,9 @@
+private protocol P {
+    let x1: DeclaredTwiceInSameFolder; // unresolved; ambiguous reference
+    let x2: OnlyInDef1; // $ access=OnlyInDef1
+    let x3: OnlyInDef2; // $ access=OnlyInDef2
+
+    let x4: DeclaredTwiceInSubFolder; // unresolved; ambiguous reference
+    let x5: OnlyInSubFolder1; // $ access=OnlyInSubFolder1
+    let x6: OnlyInSubFolder2; // $ access=OnlyInSubFolder2
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/package1/Package.swift b/unified/ql/test/library-tests/static-name-binding/package1/Package.swift
new file mode 100644
index 000000000000..0c046ec542c7
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/package1/Package.swift
@@ -0,0 +1,13 @@
+// swift-tools-version: 5.9
+
+import PackageDescription
+
+let package = Package(
+    name: "Package1",
+    targets: [
+        .target(name: "Target1"),
+        .target(name: "Target2"),
+        .target(name: "Target3"),
+        .target(name: "Target4"),
+    ]
+)
diff --git a/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target1/File1.swift b/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target1/File1.swift
new file mode 100644
index 000000000000..c2a289cc989a
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target1/File1.swift
@@ -0,0 +1,8 @@
+let x: A; // $ access=Target1.A
+let y: Target2.A; // not a valid reference
+
+public class ScopedExtensionTarget {
+    func useExtensionFromUnimportedModule() {
+        target2ExtensionMethod() // $ SPURIOUS: access=Target1.ScopedExtensionTarget.target2ExtensionMethod
+    }
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target1/File2.swift b/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target1/File2.swift
new file mode 100644
index 000000000000..62dbfcbf5c04
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target1/File2.swift
@@ -0,0 +1,5 @@
+class A {} // name=Target1.A
+
+private import class Target2.B // $ access=Target2.B
+
+private let x: B.C; // $ access=Target2.B access=Target2.B.C
diff --git a/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target1/File3.swift b/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target1/File3.swift
new file mode 100644
index 000000000000..7d06b0852ef8
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target1/File3.swift
@@ -0,0 +1,4 @@
+import Target2
+
+private let x1: B.C; // $ access=Target2.B access=Target2.B.C
+private let x2: Target2.B.C; // $ access=Target2.B access=Target2.B.C
diff --git a/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target2/File3.swift b/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target2/File3.swift
new file mode 100644
index 000000000000..1247d900be40
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target2/File3.swift
@@ -0,0 +1,11 @@
+import Target1
+
+public class A {} // name=Target2.A
+
+public class B { // name=Target2.B
+    public class C {} // name=Target2.B.C
+}
+
+extension ScopedExtensionTarget { // $ access=ScopedExtensionTarget
+    func target2ExtensionMethod() {} // name=Target1.ScopedExtensionTarget.target2ExtensionMethod
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target3/ReExport.swift b/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target3/ReExport.swift
new file mode 100644
index 000000000000..f802bbe9d308
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target3/ReExport.swift
@@ -0,0 +1,3 @@
+@_exported import Target2
+
+public class C {} // name=Target3.C
diff --git a/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target4/UseReExport.swift b/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target4/UseReExport.swift
new file mode 100644
index 000000000000..677cd6a67299
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/package1/Sources/Target4/UseReExport.swift
@@ -0,0 +1,14 @@
+import Target3 // re-exports Target2
+
+private protocol P {
+    let x1: A; // $ access=Target2.A
+    let x2: B.C; // $ access=Target2.B access=Target2.B.C
+    let x3: C; // $ access=Target3.C
+
+    let x4: Target3.A; // $ access=Target2.A
+    let x5: Target3.B.C; // $ access=Target2.B access=Target2.B.C
+    let x6: Target3.C; // $ access=Target3.C
+
+    // `@_exported import Target2` should not re-export the local 'Target2' name, only its contents
+    let x7: Target3.Target2.A; // should not resolve
+}
diff --git a/unified/ql/test/library-tests/static-name-binding/test.expected b/unified/ql/test/library-tests/static-name-binding/test.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/unified/ql/test/library-tests/static-name-binding/test.ql b/unified/ql/test/library-tests/static-name-binding/test.ql
new file mode 100644
index 000000000000..3f9936d79efd
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/test.ql
@@ -0,0 +1,21 @@
+import unified
+import utils.test.InlineExpectationsTest
+import utils.test.TestUtils
+import codeql.unified.internal.NameBinding
+
+module StaticDeclAccess implements TestSig {
+  string getARelevantTag() { result = "access" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(NameBinding decl, Identifier access |
+      decl = getStaticBindingTargetFromIdentifier(access) and
+      not access instanceof NameBinding and
+      location = access.getLocation() and
+      element = access.toString() and
+      nameBinding(decl, value) and
+      tag = "access"
+    )
+  }
+}
+
+import MakeTest<StaticDeclAccess>
diff --git a/unified/ql/test/library-tests/static-name-binding/test.swift b/unified/ql/test/library-tests/static-name-binding/test.swift
new file mode 100644
index 000000000000..cfbefe3ac851
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/test.swift
@@ -0,0 +1,85 @@
+class B {}  // name=top.B
+
+class A {
+    class B {
+        class C {}
+    }
+
+    typealias BAlias = B  // $ access=A.B
+
+    enum Enum { case empty }
+}
+
+let x1: B = nil  // $ access=top.B
+let x2: A.B = nil  // $ access=A access=A.B
+let x3: A.B.C = nil  // $ access=A access=A.B access=A.B.C
+let x4: A.BAlias.C = nil  // $ access=A access=A.BAlias access=A.B.C
+let x5 = A.Enum.empty  // $ access=A access=A.Enum access=A.Enum.empty
+
+class D {
+    let x1: B = nil  // $ access=top.B
+    let x2: A.B = nil  // $ access=A access=A.B
+    let x3: A.B.C = nil  // $ access=A access=A.B access=A.B.C
+
+    func member() {
+        let x1: B = nil  // $ access=top.B
+        let x2: A.B = nil  // $ access=A access=A.B
+        let x3: A.B.C = nil  // $ access=A access=A.B access=A.B.C
+    }
+}
+
+class E {
+    class A {
+        class B {
+        }
+    }
+
+    let x1: A = nil  // $ access=E.A
+    let x2: A.B = nil  // $ access=E.A access=E.A.B
+}
+
+class F {
+    static let field = 1
+    static let (a, b) = (1, 2)
+
+    static func foo() {
+        F.field  // $ access=F access=F.field
+        F.a  // $ access=F access=F.a
+        F.b  // $ access=F access=F.b
+    }
+}
+
+typealias G = A  // $ access=A
+
+// Members can be accessed through aliases, but references to the alias itself do not bypass the alias.
+class H {  // name=H1
+    let x1: G = nil  // $ access=G
+    let x2: G.B = nil  // $ access=G access=A.B
+    let x3: G.B.C = nil  // $ access=G access=A.B access=A.B.C
+}
+
+enum I {
+    case one = 1
+    case two = 2
+    case three = 3
+}
+
+func useI() {
+    I.one  // $ access=I access=I.one
+    I.two  // $ access=I access=I.two
+    I.three  // $ access=I access=I.three
+}
+
+protocol P {}
+
+extension H  // $ access=H1
+    : P  // $ access=P
+{}
+
+extension A.B.C  // $ access=A access=A.B access=A.B.C
+    : P  // $ access=P
+{}
+
+A()  // $ access=A
+
+A.init()  // $ access=A access=A.init
diff --git a/unified/ql/test/library-tests/static-name-binding/unqualified-access.swift b/unified/ql/test/library-tests/static-name-binding/unqualified-access.swift
new file mode 100644
index 000000000000..732e65563b3b
--- /dev/null
+++ b/unified/ql/test/library-tests/static-name-binding/unqualified-access.swift
@@ -0,0 +1,20 @@
+class A {
+    class B {
+        class C {}
+    }
+}
+
+class ASub : A { // $ access=A
+    let x1: B = nil; // $ access=A.B
+    let x2: B.C = nil; // $ access=A.B access=A.B.C
+
+    class BSub : B { // $ access=A.B
+        let x3: B = nil; // $ access=A.B
+        let x4: C = nil; // $ access=A.B.C
+    }
+
+    class BSub2 : B { // $ access=A.B
+        class C {} // shadow the inherited C
+        let x5: C = nil; // $ access=ASub.BSub2.C
+    }
+}
diff --git a/unified/ql/test/library-tests/type-inference/accessors.swift b/unified/ql/test/library-tests/type-inference/accessors.swift
new file mode 100644
index 000000000000..eee4b8e14207
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/accessors.swift
@@ -0,0 +1,192 @@
+// --- Computed properties ---
+
+class AccessorContainer {
+  var stored: Int = 0
+
+  var implicitGetter: Int {
+    return stored  // $ type=stored:Int field=AccessorContainer.stored
+  }
+
+  var explicitGetter: String {
+    let value = "accessor"  // $ type=value:String
+    return value  // $ type=value:String
+  }
+
+  var writable: Int {
+    get {
+      return stored  // $ type=stored:Int field=AccessorContainer.stored
+    }
+    set {
+      stored = newValue  // $ field=AccessorContainer.stored type=newValue:Int
+    }
+  }
+
+  var namedSetter: Int {
+    get {
+      return stored  // $ type=stored:Int field=AccessorContainer.stored
+    }
+    set(value) {
+      stored = value  // $ field=AccessorContainer.stored type=value:Int
+    }
+  }
+}
+
+func testComputedProperties() {
+  let container = AccessorContainer()  // $ target=AccessorContainer.init
+  let implicitValue = container.implicitGetter  // $ type=implicitValue:Int accessor=AccessorContainer.implicitGetter
+  let explicitValue = container.explicitGetter  // $ type=explicitValue:String accessor=AccessorContainer.explicitGetter
+  let writableValue = container.writable  // $ type=writableValue:Int accessor=AccessorContainer.writable
+  container.writable = 42  // $ accessor=AccessorContainer.writable
+  container.writable += 0  // $ accessor=AccessorContainer.writable accessor=AccessorContainer.writable
+  let namedValue = container.namedSetter  // $ type=namedValue:Int accessor=AccessorContainer.namedSetter
+  container.namedSetter = 43  // $ accessor=AccessorContainer.namedSetter
+}
+
+// --- Stored properties with observers ---
+
+class ObservedProperties {
+  var observed: Int = 0 {
+    willSet {
+      let current = observed  // $ type=current:Int field=ObservedProperties.observed accessor=ObservedProperties.observed
+      let incoming = newValue  // $ type=incoming:Int
+    }
+    didSet {
+      let current = observed  // $ type=current:Int field=ObservedProperties.observed accessor=ObservedProperties.observed
+      let previous = oldValue  // $ type=previous:Int
+    }
+  }
+
+  var namedObservers: String = "" {
+    willSet(incoming) {
+      let value = incoming  // $ type=value:String
+    }
+    didSet(previous) {
+      let value = previous  // $ type=value:String
+    }
+  }
+}
+
+func testObservedProperties() {
+  let container = ObservedProperties()  // $ target=ObservedProperties.init
+  let observed = container.observed  // $ type=observed:Int accessor=ObservedProperties.observed field=ObservedProperties.observed
+  container.observed = 42  // $ accessor=ObservedProperties.observed field=ObservedProperties.observed
+  let named = container.namedObservers  // $ type=named:String accessor=ObservedProperties.namedObservers field=ObservedProperties.namedObservers
+  container.namedObservers = "updated"  // $ accessor=ObservedProperties.namedObservers field=ObservedProperties.namedObservers
+}
+
+// --- Generic and inherited accessors ---
+
+class GenericAccessors<T> {
+  var stored: T
+
+  init(value: T) {
+    stored = value  // $ type=value:T field=GenericAccessors.stored
+  }
+
+  var value: T {
+    get {
+      return stored  // $ type=stored:T field=GenericAccessors.stored
+    }
+    set {
+      stored = newValue  // $ field=GenericAccessors.stored type=newValue:T
+    }
+  }
+
+  var observed: Int = 0 {
+    didSet {
+      let current = observed  // $ type=current:Int field=GenericAccessors.observed accessor=GenericAccessors.observed
+      let previous = oldValue  // $ type=previous:Int
+    }
+  }
+}
+
+class InheritedAccessors: GenericAccessors<Int> {
+  override var observed: Int {
+    didSet {
+      let current = observed  // $ accessor=InheritedAccessors.observed $ MISSING: type=current:Int field=GenericAccessors.observed -- static name binding is currently unable to resolve the access to the backing field
+      let current2 = self.observed  // $ accessor=InheritedAccessors.observed type=current2:Int field=GenericAccessors.observed
+      let previous = oldValue  // $ type=previous:Int
+    }
+  }
+}
+
+extension GenericAccessors {
+  var extensionValue: T {
+    return stored  // $ field=GenericAccessors.stored $ MISSING: type=stored:T
+  }
+}
+
+func testGenericAccessors() {
+  let container = GenericAccessors(value: "value")  // $ target=GenericAccessors.init
+  let value = container.value  // $ type=value:String accessor=GenericAccessors.value
+  let extensionValue = container.extensionValue  // $ accessor=GenericAccessors.extensionValue $ MISSING: type=extensionValue:String
+  let inherited = InheritedAccessors(value: 42)  // $ target=GenericAccessors.init
+  let inheritedValue = inherited.value  // $ type=inheritedValue:Int accessor=GenericAccessors.value
+  let inheritedObserver = inherited.observed  // $ type=inheritedObserver:Int field=GenericAccessors.observed accessor=InheritedAccessors.observed
+}
+
+// --- Protocol accessor requirements ---
+
+protocol AccessorRequirements {
+  var readOnly: Int { get }
+  var readWrite: String { get set }
+}
+
+func testAccessorRequirements(_ value: inout AccessorRequirements) {
+  let readOnly = value.readOnly  // $ type=readOnly:Int accessor=AccessorRequirements.readOnly
+  let readWrite = value.readWrite  // $ type=readWrite:String accessor=AccessorRequirements.readWrite
+  value.readWrite = "updated"  // $ accessor=AccessorRequirements.readWrite
+}
+
+// --- Function-valued properties ---
+class C {
+  var callback: () -> String { { "x" } }
+
+  func f() {
+    let result = callback()  // $ type=result:String accessor=C.callback target=Function.callAsFunction
+    let result2 = self.callback()  // $ type=result2:String accessor=C.callback target=Function.callAsFunction
+  }
+}
+
+// --- Static and class accessors ---
+
+class StaticAccessors {
+  static var stored: Int = 0
+
+  static var value: Int {
+    get {
+      return stored  // $ type=stored:Int field=StaticAccessors.stored
+    }
+    set {
+      stored = newValue  // $ field=StaticAccessors.stored type=newValue:Int
+    }
+  }
+}
+
+func testStaticAccessors() {
+  let value = StaticAccessors.value  // $ type=value:Int accessor=StaticAccessors.value
+  StaticAccessors.value = 42  // $ accessor=StaticAccessors.value
+}
+
+class ClassAccessors {
+  static var stored: Int = 0
+
+  class var value: Int {
+    get {
+      return stored  // $ type=stored:Int field=ClassAccessors.stored
+    }
+    set {
+      stored = newValue  // $ field=ClassAccessors.stored type=newValue:Int
+    }
+  }
+}
+
+func testClassAccessors() {
+  let value = ClassAccessors.value  // $ type=value:Int accessor=ClassAccessors.value
+  ClassAccessors.value = 42  // $ accessor=ClassAccessors.value
+}
+
+// --- Top-level accessors ---
+
+var answer: Int { 42 }
+let x = answer  // $ type=x:Int accessor=answer
diff --git a/unified/ql/test/library-tests/type-inference/basics.swift b/unified/ql/test/library-tests/type-inference/basics.swift
new file mode 100644
index 000000000000..029aa728fa53
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/basics.swift
@@ -0,0 +1,63 @@
+var topLevelDecl: Int = 0
+0
+topLevelDecl + 1  // $ type=topLevelDecl:Int
+
+class C {
+  var myInt: Int
+  init(n: Int) {
+    myInt = n  // $ type=n:Int field=C.myInt
+  }
+
+  func getMyInt() -> Int {
+    return myInt  // $ type=myInt:Int field=C.myInt
+  }
+}
+
+class Derived: C {
+  init() {
+    super.init(n: 0)  // $ type=super:C target=C.init
+  }
+
+  func callGetMyInt() -> Int {
+    let x = getMyInt()  // $ type=x:Int target=C.getMyInt
+    return x
+  }
+}
+
+class Generic<T> {
+  var value: T
+  init(v: T) {
+    value = v  // $ type=v:T field=Generic.value
+  }
+
+  func getValue() -> T {
+    return value  // $ type=value:T field=Generic.value
+  }
+}
+
+class GenericDerived: Generic<Int> {
+  init() {
+    super.init(v: 0)  // $ type=super@Generic<T>:Int target=Generic.init
+  }
+}
+
+func testGeneric() {
+  let g = Generic(v: 42)  // $ type=g@Generic<T>:Int target=Generic.init
+  let x = g.getValue()  // $ type=x:Int target=Generic.getValue
+
+  let gd = GenericDerived()  // $ type=gd:GenericDerived target=GenericDerived.init
+  let y = gd.getValue()  // $ type=y:Int target=Generic.getValue
+}
+
+// --- Extensions ---
+
+extension C {
+  func doubled() -> Int {
+    return myInt * 2  // $ type=myInt:Int field=C.myInt
+  }
+}
+
+func testExtension() {
+  let obj = C(n: 10)  // $ target=C.init
+  let d = obj.doubled()  // $ type=d:Int target=C.doubled
+}
diff --git a/unified/ql/test/library-tests/type-inference/classes.swift b/unified/ql/test/library-tests/type-inference/classes.swift
new file mode 100644
index 000000000000..018314791416
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/classes.swift
@@ -0,0 +1,199 @@
+// --- Static methods ---
+
+class MathUtils {
+  static func square(x: Int) -> Int {
+    return x * x  // $ type=x:Int
+  }
+
+  class func cube(x: Int) -> Int {
+    return x * x * x  // $ type=x:Int
+  }
+}
+
+func testStaticMethods() {
+  let s = MathUtils.square(x: 4)  // $ type=s:Int target=MathUtils.square
+  let cu = MathUtils.cube(x: 3)  // $ type=cu:Int target=MathUtils.cube
+}
+
+// --- Simple overloading ---
+
+class Overloaded {
+  func process(_ x: Int) -> Int {  // name=process1
+    return x + 1  // $ type=x:Int
+  }
+
+  func process(_ s: String) -> String {  // name=process2
+    return s  // $ type=s:String
+  }
+}
+
+func testOverloading() {
+  let o = Overloaded()  // $ target=Overloaded.init
+  let r1 = o.process(42)  // $ type=r1:Int target=process1 $ SPURIOUS: target=process2
+  let r2 = o.process("hello")  // $ type=r2:String target=process2 $ SPURIOUS: target=process1
+}
+
+// --- Structs and methods ---
+
+struct Matrix {
+  var data: [[Int]]
+
+  init(data: [[Int]]) {
+    self.data = data  // $ field=Matrix.data
+  }
+
+  func rowCount() -> Int {
+    return data.count  // $ field=Matrix.data
+  }
+}
+
+func testSubscripts() {
+  let m = Matrix(data: [[1, 2], [3, 4]])  // $ target=Matrix.init
+  let rc = m.rowCount()  // $ type=rc:Int target=Matrix.rowCount
+}
+
+// --- Nested types ---
+
+class Outer {
+  class Inner {
+    var value: Int
+
+    init(value: Int) {
+      self.value = value  // $ type=value:Int field=Outer.Inner.value
+    }
+
+    func getValue() -> Int {
+      return self.value  // $ type=.value:Int field=Outer.Inner.value
+    }
+  }
+}
+
+func testNestedTypes() {
+  let inner = Outer.Inner(value: 99)  // $ type=inner:Inner target=Outer.Inner.init
+  let v = inner.getValue()  // $ type=v:Int target=Outer.Inner.getValue
+}
+
+// --- Method chaining ---
+
+class Builder {
+  var value: Int = 0
+
+  func set(_ v: Int) -> Builder {
+    value = v  // $ type=v:Int field=Builder.value
+    return self
+  }
+
+  func add(_ v: Int) -> Builder {
+    value += v  // $ type=v:Int field=Builder.value
+    return self
+  }
+
+  func build() -> Int {
+    return value  // $ type=value:Int field=Builder.value
+  }
+}
+
+func testChaining() {
+  let b = Builder()  // $ type=b:Builder target=Builder.init
+  let result = b.set(10).add(5).build()  // $ type=result:Int target=Builder.set target=Builder.add target=Builder.build
+}
+
+// --- Default parameter values ---
+
+class Config {
+  func setup(retries: Int = 3, timeout: Double = 30.0) -> Int {
+    return retries  // $ type=retries:Int
+  }
+}
+
+func testDefaultParams() {
+  let cfg = Config()  // $ type=cfg:Config target=Config.init
+  let r1 = cfg.setup()  // $ type=r1:Int target=Config.setup
+  let r2 = cfg.setup(retries: 5)  // $ type=r2:Int target=Config.setup
+  let r3 = cfg.setup(retries: 2, timeout: 60.0)  // $ type=r3:Int target=Config.setup
+}
+
+// --- Computed properties accessed via methods ---
+
+class Temperature {
+  var celsius: Double
+
+  init(celsius: Double) {
+    self.celsius = celsius  // $ type=celsius:Double field=Temperature.celsius
+  }
+
+  func toCelsius() -> Double {
+    return celsius  // $ type=celsius:Double field=Temperature.celsius
+  }
+
+  func toFahrenheit() -> Double {
+    return celsius * 9.0 / 5.0 + 32.0  // $ type=celsius:Double field=Temperature.celsius
+  }
+}
+
+func testTemperature() {
+  let t = Temperature(celsius: 100.0)  // $ type=t:Temperature target=Temperature.init
+  let c = t.toCelsius()  // $ type=c:Double target=Temperature.toCelsius
+  let f = t.toFahrenheit()  // $ type=f:Double target=Temperature.toFahrenheit
+}
+
+// --- Inheritance with overriding ---
+
+class Animal {
+  func speak() -> String {
+    return "..."
+  }
+}
+
+class Dog: Animal {
+  override init() {
+    super.init()  // $ target=Animal.init
+  }
+
+  override func speak() -> String {
+    return "Woof"
+  }
+
+  func fetch() -> String {
+    return "ball"
+  }
+}
+
+class Cat: Animal {
+  override init() {
+    super.init()  // $ target=Animal.init
+  }
+
+  override func speak() -> String {
+    return "Meow"
+  }
+}
+
+func testOverriding() {
+  let d = Dog()  // $ type=d:Dog target=Dog.init
+  let ds = d.speak()  // $ type=ds:String target=Dog.speak
+  let df = d.fetch()  // $ type=df:String target=Dog.fetch
+
+  let ct = Cat()  // $ type=ct:Cat target=Cat.init
+  let cs = ct.speak()  // $ type=cs:String target=Cat.speak
+}
+
+// --- Mutating methods on structs ---
+
+struct Counter {
+  var count: Int = 0
+
+  mutating func increment() {
+    count += 1  // $ type=count:Int field=Counter.count
+  }
+
+  func getCount() -> Int {
+    return count  // $ type=count:Int field=Counter.count
+  }
+}
+
+func testMutating() {
+  var ctr = Counter()  // $ type=ctr:Counter target=Counter.init
+  ctr.increment()  // $ target=Counter.increment
+  let val = ctr.getCount()  // $ type=val:Int target=Counter.getCount
+}
diff --git a/unified/ql/test/library-tests/type-inference/closures.swift b/unified/ql/test/library-tests/type-inference/closures.swift
new file mode 100644
index 000000000000..b9f681bf1713
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/closures.swift
@@ -0,0 +1,70 @@
+func testExplicitClosureCall() {
+    let addOne = { value in  // $ type=value:Int
+        value + 1
+    }
+    let result = addOne(41)  // $ target=Function.callAsFunction
+    _ = result  // $ type=result:Int
+}
+
+func callWithIntCallback(_ callback: (Int) -> String) -> String {
+    callback(42)  // $ target=Function.callAsFunction
+}
+
+func callWithGenericCallback<T1>(_ callback: (T1) -> Void, _ arg: T1) -> T1 {
+    callback(arg)  // $ target=Function.callAsFunction
+    return arg
+}
+
+func testImplicitClosureCall() {
+    let result = callWithIntCallback { value in
+        String(value)  // $ type=value:Int target=String.init
+    }  // $ target=callWithIntCallback
+    _ = result  // $ type=result:String
+
+    let genericResult = callWithGenericCallback(
+        { value in  // $ type=value:Bool
+            // do nothing
+        }, false)  // $ target=callWithGenericCallback
+    _ = genericResult  // $ type=genericResult:Bool
+}
+
+class ClosureField {
+    var f: (Int) -> Int  // name=f_closure
+
+    func f(_ value: Int) -> Int {  // name=f_method
+        return 0
+    }
+
+    var f2: (Int) -> Int  // name=f2_closure
+
+    init(f: @escaping (Int) -> Int) {
+        self.f = f  // $ field=f_closure
+        self.f2 = f  // $ field=f2_closure
+    }
+
+    func callsMethod(_ value: Int) -> Int {
+        // when both a method and a closure have the same name, the method takes precedence
+        self.f(value)  // $ target=f_method $ SPURIOUS: field=f_closure target=Function.callAsFunction
+        return self.f2(value)  // $ field=f2_closure target=Function.callAsFunction
+    }
+}
+
+func foo() {
+    let numbers = [1, 2, 3]  // $ type=numbers@Array<Element>:Int
+
+    let strings = numbers.map { x in  // $ type=x:Int
+        String(x)  // $ target=String.init
+    }  // $ target=Array.map
+}
+
+func apply<T1, T2>(_ callback: (T1) -> T2, _ arg: T1) -> T2 {
+    callback(arg)  // $ target=Function.callAsFunction
+}
+
+func testApply() {
+    let result = apply(
+        { value in  // $ type=value:Int
+            String(value)  // $ target=String.init
+        }, 42)  // $ target=apply
+    _ = result  // $ type=result:String
+}
diff --git a/unified/ql/test/library-tests/type-inference/constructors.swift b/unified/ql/test/library-tests/type-inference/constructors.swift
new file mode 100644
index 000000000000..42d366f6399b
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/constructors.swift
@@ -0,0 +1,89 @@
+class C1 {
+    init(_ x: Int) {}  // name=C1.init
+
+    convenience init() {  // name=C1.init_conv
+        self.init(0)  // $ target=C1.init $ SPURIOUS: target=C1.init_conv
+    }
+}
+
+var c11 = C1()  // $ type=c11:C1 target=C1.init_conv $ SPURIOUS: target=C1.init
+var c12 = C1.init()  // $ type=c12:C1 target=C1.init_conv $ SPURIOUS: target=C1.init
+
+class C2: C1 {}  // inherits `init`
+
+var c21 = C2()  // $ type=c21:C2 target=C1.init_conv $ SPURIOUS: target=C1.init
+var c22 = C2.init()  // $ target=C1.init_conv type=c22:C2 $ SPURIOUS: target=C1.init
+
+class C3 {
+    init() {}
+}
+
+var c3 = C3()  // $ type=c3:C3 target=C3.init
+
+class C4: C3 {
+    init(_ x: Int) {
+        super.init()  // $ target=C3.init
+    }
+
+    override convenience init() {  // name=C4.init_conv
+        self.init(0)  // $ target=C4.init $ SPURIOUS: target=C4.init_conv
+    }
+}
+
+class C5: C4 {}  // inherits `init` and `convenience init`
+
+var c51 = C5()  // $ type=c51:C5 target=C4.init_conv $ SPURIOUS: target=C4.init
+var c52 = C5(0)  // $ type=c52:C5 target=C4.init $ SPURIOUS: target=C4.init_conv
+
+class C6<T1, T2> {
+    init(x: T1, y: T2) {}
+
+    private init(s: String) {}  // name=C6.init_private
+
+    convenience init(x: T1) {  // name=C6.init_conv
+        fatalError("Convenience initializer not implemented")
+    }
+}
+
+class C7<T3, T4>: C6<T4, T3> {}  // inherits `init(x: T4, y: T3)` and `convenience init(x: T4)`
+
+var c71 = C7(x: "string", y: true)  // $ type=c71@C7<T3>:Bool type=c71@C7<T4>:String target=C6.init $ SPURIOUS: target=C6.init_conv
+var c72 = C7<Bool, _>(x: 0)  // $ type=c72@C7<T3>:Bool type=c72@C7<T4>:Int target=C6.init_conv $ SPURIOUS: target=C6.init
+
+class C8: C7<Int, String> {  // inherits `init(x: String, y: Int)`
+    convenience init(x: String) {  // name=C8.init_conv
+        self.init(x: x, y: 0)  // $ target=C6.init $ SPURIOUS: target=C8.init_conv
+    }
+}
+
+class C9<T9>: C8 {}
+
+let c91: C9<Int> = C9(x: "")  // $ type=C9(...)@C9<T9>:Int target=C8.init_conv $ SPURIOUS: target=C6.init
+let c92 = C9<Int>(x: "")  // $ type=C9<...>(...)@C9<T9>:Int target=C8.init_conv $ SPURIOUS: target=C6.init
+
+class C10<T10a, T10b>: C6<T10a, [T10b]> {}
+
+let c10: C10<_, Int> = C10(x: "")  // $ target=C6.init_conv $ SPURIOUS: target=C6.init $ MISSING: type=C10(...)@C10<T10b>:Int -- we currently incorrectly conclude that a type argument has been supplied for `C6.T2`, which means contextual inference is disabled
+
+struct S1<T> {  // implicit `init(f1: T, f2: String = "default", f3: (T) -> T = { $0 })`
+    var f1: T
+    var f2: String = "default"
+    var f3: (T) -> T = { $0 }
+}
+
+var s11 = S1(f1: 0)  // $ target=S1.init type=s11@S1<T>:Int
+var s12 = S1(f1: true, f2: "")  // $ target=S1.init type=s12@S1<T>:Bool
+S1(f1: 0, f2: "", f3: { x in x })  // $ target=S1.init type=x:Int
+S1(f1: 0, f3: { x in x })  // $ target=S1.init $ MISSING: type=x:Int (optional parameters are not handled)
+
+enum E1 {
+    case a(Int)
+
+    static func foo() {
+        let e1 = a(0)  // $ target=E1.a type=e1:E1
+    }
+}
+
+enum E2<A, B> { case a(A) }
+
+let e2: E2<_, String> = E2.a(1)  // $ target=E2.a type=.a(...)@E2<B>:String
diff --git a/unified/ql/test/library-tests/type-inference/fields.swift b/unified/ql/test/library-tests/type-inference/fields.swift
new file mode 100644
index 000000000000..c45395e07a90
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/fields.swift
@@ -0,0 +1,43 @@
+class FieldBase {
+  var inheritedField: Int = 0
+}
+
+class FieldContainer<T>: FieldBase {
+  var storedField: String = "stored"
+  var genericField: T
+
+  init(genericField: T) {
+    self.genericField = genericField  // $ type=.genericField:T field=FieldContainer.genericField
+  }
+
+  func getStoredField() -> String {
+    return storedField  // $ type=storedField:String field=FieldContainer.storedField
+  }
+
+  func getGenericField() -> T {
+    return self.genericField  // $ type=.genericField:T field=FieldContainer.genericField
+  }
+}
+
+struct StaticFieldContainer {
+  static var staticField: Bool = true
+}
+
+struct NestedField {
+  var value: Double
+}
+
+struct OuterField {
+  var nested: NestedField
+}
+
+func testFieldAccesses() {
+  let container = FieldContainer(genericField: 42)  // $ target=FieldContainer.init
+  let stored = container.storedField  // $ type=.storedField:String field=FieldContainer.storedField
+  let generic = container.genericField  // $ type=.genericField:Int field=FieldContainer.genericField
+  let inherited = container.inheritedField  // $ type=.inheritedField:Int field=FieldBase.inheritedField
+  let staticValue = StaticFieldContainer.staticField  // $ type=.staticField:Bool field=StaticFieldContainer.staticField
+
+  let outer = OuterField(nested: NestedField(value: 1.0))  // $ target=OuterField.init target=NestedField.init
+  let nestedValue = outer.nested.value  // $ type=.nested:NestedField field=OuterField.nested type=.value:Double field=NestedField.value
+}
diff --git a/unified/ql/test/library-tests/type-inference/generics.swift b/unified/ql/test/library-tests/type-inference/generics.swift
new file mode 100644
index 000000000000..99269646e864
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/generics.swift
@@ -0,0 +1,317 @@
+// --- Generic functions ---
+
+func identity<T>(_ x: T) -> T {
+  return x  // $ type=x:T
+}
+
+func makePair<A, B>(_ a: A, _ b: B) -> (A, B) {
+  return (a, b)  // $ type=a:A
+}
+
+func testGenericFunctions() {
+  let i = identity(42)  // $ type=i:Int target=identity
+  let s = identity("hello")  // $ type=s:String target=identity
+  let p = makePair(1, "two")  // $ target=makePair
+}
+
+// --- Generic structs ---
+
+struct Pair<A, B> {
+  var first: A
+  var second: B
+
+  init(first: A, second: B) {
+    self.first = first  // $ type=first:A field=Pair.first
+    self.second = second  // $ type=second:B field=Pair.second
+  }
+
+  func getFirst() -> A {
+    return first  // $ type=first:A field=Pair.first
+  }
+
+  func getSecond() -> B {
+    return second  // $ type=second:B field=Pair.second
+  }
+}
+
+func testGenericStruct() {
+  let p = Pair(first: 1, second: "x")  // $ target=Pair.init type=p@Pair<A>:Int type=p@Pair<B>:String
+  let f = p.getFirst()  // $ type=f:Int target=Pair.getFirst
+  let sc = p.getSecond()  // $ type=sc:String target=Pair.getSecond
+}
+
+// --- Enums with associated values ---
+
+enum Result<T> {
+  case success(T)
+  case failure(String)
+
+  func getValue() -> T? {
+    switch self {
+    case .success(let v):  // $ MISSING: target=Result.success
+      return v  // $ MISSING: type=v:T
+    case .failure:  // $ MISSING: target=Result.failure
+      return nil
+    }
+  }
+}
+
+func testEnum() {
+  let r = Result.success(42)  // $ type=r@Result<T>:Int target=Result.success
+  let v = r.getValue()  // $ target=Result.getValue
+
+  let r2: Result<Int> = .success(42)  // $ type=r2@Result<T>:Int $ MISSING: target=Result.success
+  let v2 = r2.getValue()  // $ target=Result.getValue
+}
+
+// --- Closures and type inference ---
+
+func applyTransform<T, U>(_ value: T, _ transform: (T) -> U) -> U {
+  let result = transform(value)  // $ type=result:U target=Function.callAsFunction
+  return result
+}
+
+func testClosures() {
+  let result = applyTransform(5, { x in x * 2 })  // $ target=applyTransform type=result:Int
+  let strings = applyTransform(  // $ type=strings:String
+    10,
+    {
+      x in String(x)  // $ type=x:Int target=String.init
+    })  // $ target=applyTransform
+}
+
+// --- Generic class with constraints ---
+
+protocol MyProtocol {
+  associatedtype MyType
+
+  func foo() -> Self
+
+  func bar() -> MyType
+}
+
+class Wrapper<T: MyProtocol> {
+  var inner: T
+
+  init(_ inner: T) {
+    self.inner = inner  // $ type=inner:T field=Wrapper.inner
+  }
+
+  func get() -> T {
+    return inner  // $ type=inner:T field=Wrapper.inner
+  }
+
+  func callFoo() -> T {
+    let x = inner.foo()  // $ field=Wrapper.inner $ MISSING:  type=x:T target=MyProtocol.foo
+    return x
+  }
+
+  func callBar() -> T.MyType {
+    let x = inner.bar()  // $ field=Wrapper.inner $ MISSING: type=x:MyType target=MyProtocol.bar
+    return x
+  }
+}
+
+extension Int: MyProtocol {
+  typealias MyType = String
+
+  func foo() -> Int {
+    return self * 2  // $ type=self:Int
+  }
+
+  func bar() -> String {
+    return "number"
+  }
+}
+
+func testConstrainedGeneric() {
+  let w = Wrapper(42)  // $ type=w@Wrapper<T>:Int target=Wrapper.init
+  let v = w.get()  // $ type=v:Int target=Wrapper.get
+  let z = w.callFoo()  // $ type=z:Int target=Wrapper.callFoo
+  let x = w.callBar()  // $ target=Wrapper.callBar $ MISSING: type=x:String
+}
+
+// --- Generics and inheritance ---
+
+class Base<T1, T2> {
+  var value1: T1
+  var value2: T2
+
+  init(_ v1: T1, _ v2: T2) {
+    self.value1 = v1  // $ type=v1:T1 field=Base.value1
+    self.value2 = v2  // $ type=v2:T2 field=Base.value2
+  }
+
+  func getValue1() -> T1 {
+    return value1  // $ type=value1:T1 field=Base.value1
+  }
+
+  func getValue2() -> T2 {
+    return value2  // $ type=value2:T2 field=Base.value2
+  }
+}
+
+class Derived<T1, T2>: Base<T2, T1> {
+  init(_ v1: T1, _ v2: T2) {
+    super.init(v2, v1)  // $ type=v2:T2 type=v1:T1 target=Base.init
+  }
+
+  convenience init(_ v1: T1) {
+    fatalError()
+  }
+}
+
+class DerivedDerived<D>: Derived<[D], Bool> {
+  init(_ v: [D]) {
+    super.init(v, true)  // $ type=v@Array<Element>:D target=Derived.init
+  }
+
+  convenience init() {
+    fatalError()
+  }
+}
+
+func foo<T1, T2, T3: Base<T1, T2>>(_ value1: T1, _ value2: T2, _ base: T3) -> T3 {
+  return base
+}
+
+func foo2<T1, T2>(_ value1: T1, _ value2: T2, _ base: Base<T1, T2>) {
+
+}
+
+func bar<A, B, C: Base<A, [B]>>(_ value1: A, _ value2: B, _ base: C) -> C {
+  return base
+
+}
+
+func bar2<A, B>(_ value1: A, _ value2: B, _ base: Base<A, [B]>) {}
+
+func baz<A, B, C: Base<A, B?>>(_ value1: A, _ value2: B, _ base: C) -> C {
+  return base
+
+}
+
+func baz2<A, B>(_ value1: A, _ value2: B, _ base: Base<A, B?>) {}
+
+func testDerived() {
+  let d = Derived(1, "x")  // $ type=d@Derived<T1>:Int type=d@Derived<T2>:String target=Derived.init
+  let v1 = d.getValue1()  // $ type=v1:String target=Base.getValue1
+  let v2 = d.getValue2()  // $ type=v2:Int target=Base.getValue2
+
+  let dd = DerivedDerived(["hello"])  // $ type=dd@DerivedDerived<D>:String target=DerivedDerived.init
+  let vv1 = dd.getValue1()  // $ type=vv1:Bool target=Base.getValue1
+  let vv2 = dd.getValue2()  // $ type=vv2@Array<Element>:String target=Base.getValue2
+
+  let x = foo(false, [2], DerivedDerived([]))  // $ target=foo target=DerivedDerived.init type=x@DerivedDerived<D>:Int
+
+  foo2(false, [2], DerivedDerived([]))  // $ target=foo2 target=DerivedDerived.init type=DerivedDerived(...)@DerivedDerived<D>:Int
+
+  let y = bar(false, 2, DerivedDerived([]))  // $ type=y@DerivedDerived<D>:Int target=bar target=DerivedDerived.init
+
+  bar2(false, 2, DerivedDerived([]))  // $ target=bar2 target=DerivedDerived.init type=DerivedDerived(...)@DerivedDerived<D>:Int
+
+  let w = baz(false, 2, Derived(Optional.none))  // $ type=w@Derived<T1>.Optional<Wrapped>:Int target=baz target=Derived.init field=Optional.none
+
+  baz2(false, 2, Derived(Optional.none))  // $ target=baz2 target=Derived.init field=Optional.none type=Derived(...)@Derived<T1>.Optional<Wrapped>:Int
+}
+
+// --- Generics and protocols ---
+
+protocol MyProtocol2 {
+  associatedtype MyType
+
+  func baz() -> MyType
+}
+
+extension MyProtocol2 {
+  func foo() -> Self {
+    return self  // $ MISSING: type=self:Self
+  }
+}
+
+class MyClass<T> {
+  var value: T
+
+  init(_ value: T) {
+    self.value = value  // $ type=value:T field=MyClass.value
+  }
+}
+
+extension MyClass: MyProtocol2 {
+  typealias MyType = T
+
+  func baz() -> T {
+    return value  // $ field=MyClass.value $ MISSING: type=value:T
+  }
+}
+
+func callFoo<T: MyProtocol2>(_ c: T) -> T {
+  return c.foo()  // $ MISSING: target=MyProtocol2.foo
+}
+
+func callBaz<T: MyProtocol2>(_ c: T) -> T.MyType {
+  return c.baz()  // $ MISSING: target=MyProtocol2.baz
+}
+
+func testProtocolExtension() {
+  let c = MyClass(42)  // $ type=c@MyClass<T>:Int target=MyClass.init
+  let s = c.foo()  // $ target=MyProtocol2.foo $ MISSING: type=s@MyClass<T>:Int
+  let v = c.baz()  // $ target=MyClass.baz $ MISSING: type=v:Int
+  let v2 = callBaz(c)  // $ target=callBaz $ MISSING: type=v2:Int
+}
+
+// --- Inherited associated types ---
+
+protocol BaseAssociatedTypeProtocol {
+  associatedtype Value
+
+  func baseValue() -> Value
+}
+
+protocol SubAssociatedTypeProtocol: BaseAssociatedTypeProtocol {
+  func subValue() -> Value
+}
+
+struct StringAssociatedType: SubAssociatedTypeProtocol {
+  typealias Value = String
+
+  func baseValue() -> String {
+    return "base"
+  }
+
+  func subValue() -> String {
+    return "sub"
+  }
+}
+
+func getInheritedAssociatedType<T: SubAssociatedTypeProtocol>(_ value: T) -> T.Value {
+  return value.subValue()  // $ MISSING: target=SubAssociatedTypeProtocol.subValue
+}
+
+func testInheritedAssociatedType() {
+  let value = getInheritedAssociatedType(StringAssociatedType())  // $ target=getInheritedAssociatedType target=StringAssociatedType.init $ MISSING: type=value:String
+}
+
+// --- Primary associated types ---
+
+protocol PrimaryAssociatedTypeProtocol<Element> {
+  associatedtype Element
+
+  func element() -> Element
+}
+
+struct IntPrimaryAssociatedType: PrimaryAssociatedTypeProtocol {
+  typealias Element = Int
+
+  func element() -> Int {
+    return 42
+  }
+}
+
+func getPrimaryAssociatedType(_ value: some PrimaryAssociatedTypeProtocol<Int>) -> Int {
+  return value.element()  // $ MISSING: target=PrimaryAssociatedTypeProtocol.element
+}
+
+func testPrimaryAssociatedType() {
+  let value = getPrimaryAssociatedType(IntPrimaryAssociatedType())  // $ type=value:Int target=getPrimaryAssociatedType target=IntPrimaryAssociatedType.init
+}
diff --git a/unified/ql/test/library-tests/type-inference/key_paths.swift b/unified/ql/test/library-tests/type-inference/key_paths.swift
new file mode 100644
index 000000000000..b900888f095d
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/key_paths.swift
@@ -0,0 +1,210 @@
+// --- Key-path expressions: basic property access ---
+
+struct Point {
+  var x: Double
+  var y: Double
+
+  init(x: Double, y: Double) {
+    self.x = x  // $ type=x:Double field=Point.x
+    self.y = y  // $ type=y:Double field=Point.y
+  }
+
+  func distanceFromOrigin() -> Double {
+    return (x * x + y * y).squareRoot()  // $ field=Point.x field=Point.x field=Point.y field=Point.y
+  }
+}
+
+struct Line {
+  var start: Point
+  var end: Point
+
+  init(start: Point, end: Point) {
+    self.start = start  // $ field=Line.start
+    self.end = end  // $ field=Line.end
+  }
+}
+
+func testBasicKeyPaths() {
+  let kpX = \Point.x
+  let kpY = \Point.y
+
+  let p = Point(x: 3.0, y: 4.0)  // $ type=p:Point target=Point.init
+  let xVal = p[keyPath: kpX]  // $ MISSING: type=xVal:Double
+  let yVal = p[keyPath: kpY]  // $ MISSING: type=yVal:Double
+}
+
+// --- Key-path expressions: nested property access ---
+
+func testNestedKeyPaths() {
+  let kpStartX = \Line.start.x
+  let kpEndY = \Line.end.y
+
+  let s = Point(x: 0.0, y: 0.0)  // $ target=Point.init
+  let e = Point(x: 1.0, y: 1.0)  // $ target=Point.init
+  let line = Line(start: s, end: e)  // $ target=Line.init
+  let startX = line[keyPath: kpStartX]  // $ MISSING: type=startX:Double
+  let endY = line[keyPath: kpEndY]  // $ MISSING: type=endY:Double
+}
+
+// --- Key-path expressions: identity (\.self) ---
+
+func testSelfKeyPath() {
+  let kpSelf = \Int.self
+  let val = 42[keyPath: kpSelf]  // $ MISSING: type=val:Int
+}
+
+// --- Key-path expressions: optional chaining ---
+
+struct Person {
+  var name: String
+  var address: Address?
+
+  init(name: String, address: Address?) {
+    self.name = name  // $ type=name:String field=Person.name
+    self.address = address  // $ field=Person.address
+  }
+}
+
+struct Address {
+  var city: String
+  var zip: String
+
+  init(city: String, zip: String) {
+    self.city = city  // $ type=city:String field=Address.city
+    self.zip = zip  // $ type=zip:String field=Address.zip
+  }
+}
+
+func testOptionalChainingKeyPaths() {
+  let kpCity = \Person.address?.city
+  let addr = Address(city: "NYC", zip: "10001")  // $ target=Address.init
+  let person = Person(name: "Alice", address: addr)  // $ target=Person.init
+
+  let city = person[keyPath: kpCity]  // $ MISSING: type=city@Optional<Wrapped>:String
+}
+
+// --- Key-path expressions: used as function arguments ---
+
+struct Employee {
+  var name: String
+  var salary: Int
+
+  init(name: String, salary: Int) {
+    self.name = name  // $ type=name:String field=Employee.name
+    self.salary = salary  // $ type=salary:Int field=Employee.salary
+  }
+}
+
+func extractField<T, V>(_ items: [T], keyPath: KeyPath<T, V>) -> [V] {
+  return items.map { $0[keyPath: keyPath] }  // $ target=Array.map
+}
+
+func testKeyPathAsArgument() {
+  let e1 = Employee(name: "Alice", salary: 100)  // $ target=Employee.init
+  let e2 = Employee(name: "Bob", salary: 200)  // $ target=Employee.init
+  let employees = [e1, e2]
+  let names = extractField(employees, keyPath: \.name)  // $ target=extractField $ MISSING: target=extractField(_:keyPath:)
+  let name = names[0]  // $ MISSING: type=name:String
+  let salaries = extractField(employees, keyPath: \.salary)  // $ target=extractField $ MISSING: target=extractField(_:keyPath:)
+  let salary = salaries[0]  // $ MISSING: type=salary:Int
+}
+
+// --- Key-path expressions: with generics ---
+
+class KPContainer<T> {
+  var item: T
+
+  init(item: T) {
+    self.item = item  // $ type=item:T field=KPContainer.item
+  }
+}
+
+func testGenericKeyPaths() {
+  let kp = \KPContainer<Int>.item
+  let c = KPContainer(item: 42)  // $ target=KPContainer.init
+  let v = c[keyPath: kp]  // $ MISSING: type=v:Int
+}
+
+// --- Key-path expressions: writable key paths and mutation ---
+
+func testWritableKeyPaths() {
+  var p = Point(x: 1.0, y: 2.0)  // $ type=p:Point target=Point.init
+  let kpX = \Point.x
+  p[keyPath: kpX] = 10.0
+  let newX = p[keyPath: kpX]  // $ MISSING: type=newX:Double
+}
+
+// --- Key-path expressions: appending key paths ---
+
+func testKeyPathAppending() {
+  let kpStart = \Line.start
+  let kpX = \Point.x
+  let kpStartX = kpStart.appending(path: kpX)
+
+  let s = Point(x: 5.0, y: 6.0)  // $ target=Point.init
+  let e = Point(x: 7.0, y: 8.0)  // $ target=Point.init
+  let line = Line(start: s, end: e)  // $ target=Line.init
+  let val = line[keyPath: kpStartX]  // $ MISSING: type=val:Double
+}
+
+// --- Key-path expressions: shorthand in higher-order functions ---
+
+func testKeyPathInMap() {
+  let e1 = Employee(name: "Alice", salary: 100)  // $ target=Employee.init
+  let e2 = Employee(name: "Bob", salary: 200)  // $ target=Employee.init
+  let employees = [e1, e2]
+  let names = employees.map(\.name)  // $ target=Array.map
+  let name = names[0]  // $ MISSING: type=name:String
+  let salaries = employees.map(\.salary)  // $ target=Array.map
+  let salary = salaries[0]  // $ MISSING: type=salary:Int
+}
+
+// --- Key-path expressions: class hierarchy ---
+
+class Shape2 {
+  var color: String
+
+  init(color: String) {
+    self.color = color  // $ type=color:String field=Shape2.color
+  }
+}
+
+class Circle2: Shape2 {
+  var radius: Double
+
+  init(color: String, radius: Double) {
+    self.radius = radius  // $ type=radius:Double field=Circle2.radius
+    super.init(color: color)  // $ target=Shape2.init
+  }
+}
+
+func testInheritedKeyPaths() {
+  let kpColor = \Circle2.color
+  let kpRadius = \Circle2.radius
+
+  let c = Circle2(color: "red", radius: 5.0)  // $ type=c:Circle2 target=Circle2.init
+  let col = c[keyPath: kpColor]  // $ MISSING: type=col:String
+  let rad = c[keyPath: kpRadius]  // $ MISSING: type=rad:Double
+}
+
+// --- Key-path expressions: tuple element access ---
+
+func testTupleKeyPath() {
+  let kp0 = \(Int, String).0
+  let kp1 = \(Int, String).1
+  let tuple = (42, "hello")
+  let first = tuple[keyPath: kp0]  // $ MISSING: type=first:Int
+  let second = tuple[keyPath: kp1]  // $ MISSING: type=second:String
+}
+
+// --- Key-path expressions: array/dictionary subscript ---
+
+func testSubscriptKeyPaths() {
+  let kpFirst = \[Int][0]
+  let arr = [10, 20, 30]
+  let first = arr[keyPath: kpFirst]  // $ MISSING: type=first:Int
+
+  let kpKey = \[String: Int]["x"]
+  let dict = ["x": 1, "y": 2]
+  let val = dict[keyPath: kpKey]  // $ MISSING: type=val:Int?
+}
diff --git a/unified/ql/test/library-tests/type-inference/lub.swift b/unified/ql/test/library-tests/type-inference/lub.swift
new file mode 100644
index 000000000000..066d654a1a93
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/lub.swift
@@ -0,0 +1,15 @@
+class A {
+  public init() {}
+}
+
+class B: A {
+  public override init() {}
+}
+
+class C: A {}
+
+func foo() {
+  let b = B()  // $ type=b:B target=B.init
+  let c = C()  // $ type=c:C target=A.init
+  let x = 2 > 3 ? b : c  // $ MISSING: type=x:A
+}
diff --git a/unified/ql/test/library-tests/type-inference/overload_resolution.swift b/unified/ql/test/library-tests/type-inference/overload_resolution.swift
new file mode 100644
index 000000000000..5c72e1483af9
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/overload_resolution.swift
@@ -0,0 +1,427 @@
+// --- Overload by parameter type ---
+
+class OverloadByType {
+  func handle(_ x: Int) -> String {  // name=OverloadByType.handle1
+    return "int"
+  }
+
+  func handle(_ x: Double) -> String {  // name=OverloadByType.handle2
+    return "double"
+  }
+
+  func handle(_ x: String) -> String {  // name=OverloadByType.handle3
+    return "string"
+  }
+
+  func handle(_ x: Bool) -> String {  // name=OverloadByType.handle4
+    return "bool"
+  }
+}
+
+func testOverloadByType() {
+  let o = OverloadByType()  // $ target=OverloadByType.init
+  let r1 = o.handle(42)  // $ type=r1:String target=OverloadByType.handle1 $ SPURIOUS: target=OverloadByType.handle2 target=OverloadByType.handle3 target=OverloadByType.handle4
+  let r2 = o.handle(3.14)  // $ type=r2:String target=OverloadByType.handle2 $ SPURIOUS: target=OverloadByType.handle1 target=OverloadByType.handle3 target=OverloadByType.handle4
+  let r3 = o.handle("hi")  // $ type=r3:String target=OverloadByType.handle3 $ SPURIOUS: target=OverloadByType.handle1 target=OverloadByType.handle2 target=OverloadByType.handle4
+  let r4 = o.handle(true)  // $ type=r4:String target=OverloadByType.handle4 $ SPURIOUS: target=OverloadByType.handle1 target=OverloadByType.handle2 target=OverloadByType.handle3
+}
+
+// --- Overload by argument label ---
+
+class OverloadByLabel {
+  func configure(width: Int) -> String {  // name=OverloadByLabel.configure1
+    return "width"
+  }
+
+  func configure(height: Int) -> String {  // name=OverloadByLabel.configure2
+    return "height"
+  }
+
+  func configure(width: Int, height: Int) -> String {  // name=OverloadByLabel.configure3
+    return "both"
+  }
+
+  func configure(size: Int) -> String {  // name=OverloadByLabel.configure4
+    return "size"
+  }
+}
+
+func testOverloadByLabel() {
+  let o = OverloadByLabel()  // $ target=OverloadByLabel.init
+  let r1 = o.configure(width: 10)  // $ type=r1:String target=OverloadByLabel.configure1 $ SPURIOUS: target=OverloadByLabel.configure2 target=OverloadByLabel.configure3 target=OverloadByLabel.configure4
+  let r2 = o.configure(height: 20)  // $ type=r2:String target=OverloadByLabel.configure2 $ SPURIOUS: target=OverloadByLabel.configure1 target=OverloadByLabel.configure3 target=OverloadByLabel.configure4
+  let r3 = o.configure(width: 10, height: 20)  // $ type=r3:String target=OverloadByLabel.configure3 $ SPURIOUS: target=OverloadByLabel.configure1 target=OverloadByLabel.configure2 target=OverloadByLabel.configure4
+  let r4 = o.configure(size: 30)  // $ type=r4:String target=OverloadByLabel.configure4 $ SPURIOUS: target=OverloadByLabel.configure1 target=OverloadByLabel.configure2 target=OverloadByLabel.configure3
+}
+
+// --- Overload by arity (number of parameters) ---
+
+class OverloadByArity {
+  func compute() -> Int {  // name=OverloadByArity.compute1
+    return 0
+  }
+
+  func compute(_ x: Int) -> Int {  // name=OverloadByArity.compute2
+    return x
+  }
+
+  func compute(_ x: Int, _ y: Int) -> Int {  // name=OverloadByArity.compute3
+    return x + y
+  }
+
+  func compute(_ x: Int, _ y: Int, _ z: Int) -> Int {  // name=OverloadByArity.compute4
+    return x + y + z
+  }
+}
+
+func testOverloadByArity() {
+  let o = OverloadByArity()  // $ target=OverloadByArity.init
+  let r0 = o.compute()  // $ type=r0:Int target=OverloadByArity.compute1 $ SPURIOUS: target=OverloadByArity.compute2 target=OverloadByArity.compute3 target=OverloadByArity.compute4
+  let r1 = o.compute(1)  // $ type=r1:Int target=OverloadByArity.compute2 $ SPURIOUS: target=OverloadByArity.compute1 target=OverloadByArity.compute3 target=OverloadByArity.compute4
+  let r2 = o.compute(1, 2)  // $ type=r2:Int target=OverloadByArity.compute3 $ SPURIOUS: target=OverloadByArity.compute1 target=OverloadByArity.compute2 target=OverloadByArity.compute4
+  let r3 = o.compute(1, 2, 3)  // $ type=r3:Int target=OverloadByArity.compute4 $ SPURIOUS: target=OverloadByArity.compute1 target=OverloadByArity.compute2 target=OverloadByArity.compute3
+}
+
+// --- Overload by return type (contextual type) ---
+
+class OverloadByReturn {
+  func create() -> Int {  // name=OverloadByReturn.create1
+    return 0
+  }
+
+  func create() -> String {  // name=OverloadByReturn.create2
+    return ""
+  }
+
+  func create() -> Double {  // name=OverloadByReturn.create3
+    return 0.0
+  }
+}
+
+func testOverloadByReturn() {
+  let o = OverloadByReturn()  // $ target=OverloadByReturn.init
+  let r1: Int = o.create()  // $ type=r1:Int target=OverloadByReturn.create1 $ SPURIOUS: target=OverloadByReturn.create2 target=OverloadByReturn.create3
+  let r2: String = o.create()  // $ type=r2:String target=OverloadByReturn.create2 $ SPURIOUS: target=OverloadByReturn.create1 target=OverloadByReturn.create3
+  let r3: Double = o.create()  // $ type=r3:Double target=OverloadByReturn.create3 $ SPURIOUS: target=OverloadByReturn.create1 target=OverloadByReturn.create2
+}
+
+// --- Overload: generic vs non-generic (non-generic preferred) ---
+
+class OverloadGenericVsConcrete {
+  func process(_ x: Int) -> String {  // name=OverloadGenericVsConcrete.process1
+    return "concrete"
+  }
+
+  func process<T>(_ x: T) -> String {  // name=OverloadGenericVsConcrete.process2
+    return "generic"
+  }
+}
+
+func testOverloadGenericVsConcrete() {
+  let o = OverloadGenericVsConcrete()  // $ target=OverloadGenericVsConcrete.init
+  let r1 = o.process(42)  // $ type=r1:String target=OverloadGenericVsConcrete.process1 $ SPURIOUS: target=OverloadGenericVsConcrete.process2
+  let r2 = o.process("hello")  // $ type=r2:String target=OverloadGenericVsConcrete.process2 $ SPURIOUS: target=OverloadGenericVsConcrete.process1
+  let r3 = o.process(true)  // $ type=r3:String target=OverloadGenericVsConcrete.process2 $ SPURIOUS: target=OverloadGenericVsConcrete.process1
+}
+
+// --- Overload: free functions by parameter type ---
+
+func freeOverload(_ x: Int) -> String {  // name=freeOverload1
+  return "int"
+}
+
+func freeOverload(_ x: String) -> String {  // name=freeOverload2
+  return "string"
+}
+
+func freeOverload(_ x: Double) -> String {  // name=freeOverload3
+  return "double"
+}
+
+func testFreeOverload() {
+  let r1 = freeOverload(42)  // $ type=r1:String target=freeOverload1 $ SPURIOUS: target=freeOverload2 target=freeOverload3
+  let r2 = freeOverload("hi")  // $ type=r2:String target=freeOverload2 $ SPURIOUS: target=freeOverload1 target=freeOverload3
+  let r3 = freeOverload(1.5)  // $ type=r3:String target=freeOverload3 $ SPURIOUS: target=freeOverload1 target=freeOverload2
+}
+
+// --- Overload: init overloading ---
+
+class MultiInit {
+  var value: String
+
+  init() {  // name=MultiInit.init1
+    value = "default"  // $ field=MultiInit.value
+  }
+
+  init(int: Int) {  // name=MultiInit.init2
+    value = "int"  // $ field=MultiInit.value
+  }
+
+  init(str: String) {  // name=MultiInit.init3
+    value = str  // $ type=str:String $ field=MultiInit.value
+  }
+
+  init(x: Int, y: Int) {  // name=MultiInit.init4
+    value = "pair"  // $ field=MultiInit.value
+  }
+
+  func getValue() -> String {
+    return value  // $ type=value:String $ field=MultiInit.value
+  }
+}
+
+func testInitOverloading() {
+  let m1 = MultiInit()  // $ type=m1:MultiInit target=MultiInit.init1 $ SPURIOUS: target=MultiInit.init2 target=MultiInit.init3 target=MultiInit.init4
+  let m2 = MultiInit(int: 5)  // $ type=m2:MultiInit target=MultiInit.init2 $ SPURIOUS: target=MultiInit.init1 target=MultiInit.init3 target=MultiInit.init4
+  let m3 = MultiInit(str: "x")  // $ type=m3:MultiInit target=MultiInit.init3 $ SPURIOUS: target=MultiInit.init1 target=MultiInit.init2 target=MultiInit.init4
+  let m4 = MultiInit(x: 1, y: 2)  // $ type=m4:MultiInit target=MultiInit.init4 $ SPURIOUS: target=MultiInit.init1 target=MultiInit.init2 target=MultiInit.init3
+  let v = m1.getValue()  // $ type=v:String target=MultiInit.getValue
+}
+
+// --- Overload: static vs instance method ---
+
+class StaticVsInstance {
+  func action() -> String {  // name=StaticVsInstance.action1
+    return "instance"
+  }
+
+  static func action() -> String {  // name=StaticVsInstance.action2
+    return "static"
+  }
+}
+
+func testStaticVsInstance() {
+  let o = StaticVsInstance()  // $ target=StaticVsInstance.init
+  let r1 = o.action()  // $ type=r1:String target=StaticVsInstance.action1
+  let r2 = StaticVsInstance.action()  // $ type=r2:String target=StaticVsInstance.action2
+}
+
+// --- Overload: protocol extension default vs concrete implementation ---
+
+protocol Describable {
+  func describe() -> String  // name=Describable.describe
+}
+
+extension Describable {
+  func describe() -> String {  // name=Describable.describe_default
+    return "default"
+  }
+
+  func extra() -> String {
+    return "extra"
+  }
+}
+
+class DescribableImpl: Describable {
+  init() {}  // name=DescribableImpl.init
+
+  func describe() -> String {  // name=DescribableImpl.describe
+    return "concrete"
+  }
+}
+
+func testProtocolExtensionOverload() {
+  let d = DescribableImpl()  // $ target=DescribableImpl.init
+  let r1 = d.describe()  // $ type=r1:String target=DescribableImpl.describe
+  let r2 = d.extra()  // $ type=r2:String target=Describable.extra
+}
+
+// --- Overload: subclass override resolution ---
+
+class Base {
+  init() {}
+
+  func action() -> String {
+    return "base"
+  }
+
+  func baseOnly() -> String {
+    return "baseOnly"
+  }
+}
+
+class Sub: Base {
+  override init() {
+    super.init()  // $ target=Base.init
+  }
+
+  override func action() -> String {
+    return "sub"
+  }
+
+  func subOnly() -> String {
+    return "subOnly"
+  }
+}
+
+class SubSub: Sub {
+  override init() {
+    super.init()  // $ target=Sub.init
+  }
+
+  override func action() -> String {
+    return "subsub"
+  }
+}
+
+func testOverrideResolution() {
+  let b = Base()  // $ target=Base.init
+  let rb = b.action()  // $ type=rb:String target=Base.action
+
+  let s = Sub()  // $ target=Sub.init
+  let rs = s.action()  // $ type=rs:String target=Sub.action
+  let rbo = s.baseOnly()  // $ type=rbo:String target=Base.baseOnly
+  let rso = s.subOnly()  // $ type=rso:String target=Sub.subOnly
+
+  let ss = SubSub()  // $ target=SubSub.init
+  let rss = ss.action()  // $ type=rss:String target=SubSub.action
+  let rbo2 = ss.baseOnly()  // $ type=rbo2:String target=Base.baseOnly
+  let rso2 = ss.subOnly()  // $ type=rso2:String target=Sub.subOnly
+}
+
+// --- Overload: by external vs internal parameter names ---
+
+class LabelVariants {
+  func send(to target: String) -> String {  // name=LabelVariants.send1
+    return target  // $ type=target:String
+  }
+
+  func send(from source: String) -> String {  // name=LabelVariants.send2
+    return source  // $ type=source:String
+  }
+
+  func send(to target: String, from source: String) -> String {  // name=LabelVariants.send3
+    return target + source
+  }
+}
+
+func testLabelVariants() {
+  let o = LabelVariants()  // $ target=LabelVariants.init
+  let r1 = o.send(to: "x")  // $ type=r1:String target=LabelVariants.send1 $ SPURIOUS: target=LabelVariants.send2 target=LabelVariants.send3
+  let r2 = o.send(from: "y")  // $ type=r2:String target=LabelVariants.send2 $ SPURIOUS: target=LabelVariants.send1 target=LabelVariants.send3
+  let r3 = o.send(to: "x", from: "y")  // $ type=r3:String target=LabelVariants.send3 $ SPURIOUS: target=LabelVariants.send1 target=LabelVariants.send2
+}
+
+// --- Overload: generic function with different constraint satisfaction ---
+
+protocol Numeric2: Equatable {
+  static func zero() -> Self
+}
+
+extension Int: Numeric2 {
+  static func zero() -> Int { return 0 }
+}
+
+extension Double: Numeric2 {
+  static func zero() -> Double { return 0.0 }
+}
+
+func constrainedId<T: Numeric2>(_ x: T) -> T {  // name=constrainedId1
+  return x
+}
+
+func constrainedId<T: Equatable>(_ x: T) -> T {  // name=constrainedId2
+  return x
+}
+
+func testConstrainedOverload() {
+  let r1 = constrainedId(42)  // $ type=r1:Int target=constrainedId1 $ SPURIOUS: target=constrainedId2
+  let r2 = constrainedId("hello")  // $ type=r2:String target=constrainedId2 $ SPURIOUS: target=constrainedId1
+}
+
+// --- Overload: methods on generic type specialized differently ---
+
+class Box<T> {
+  var item: T
+
+  init(_ item: T) {
+    self.item = item  // $ type=item:T field=Box.item
+  }
+
+  func get() -> T {
+    return item  // $ type=item:T field=Box.item
+  }
+
+  func replace(_ newItem: T) {
+    item = newItem  // $ type=newItem:T field=Box.item
+  }
+}
+
+func testGenericMethodResolution() {
+  let intBox = Box(10)  // $ type=intBox@Box<T>:Int target=Box.init
+  let strBox = Box("hi")  // $ type=strBox@Box<T>:String target=Box.init
+  let v1 = intBox.get()  // $ type=v1:Int target=Box.get
+  let v2 = strBox.get()  // $ type=v2:String target=Box.get
+  intBox.replace(20)  // $ target=Box.replace
+  strBox.replace("bye")  // $ target=Box.replace
+}
+
+// --- Overload: convenience init vs designated init ---
+
+class Widget {
+  var name: String
+  var size: Int
+
+  init(name: String, size: Int) {  // name=Widget.init1
+    self.name = name  // $ type=name:String field=Widget.name
+    self.size = size  // $ type=size:Int field=Widget.size
+  }
+
+  convenience init(name: String) {  // name=Widget.init2
+    self.init(name: name, size: 1)  // $ target=Widget.init1 $ SPURIOUS: target=Widget.init2 target=Widget.init3
+  }
+
+  convenience init(size: Int) {  // name=Widget.init3
+    self.init(name: "default", size: size)  // $ target=Widget.init1 $ SPURIOUS: target=Widget.init2 target=Widget.init3
+  }
+}
+
+func testConvenienceInit() {
+  let w1 = Widget(name: "a", size: 5)  // $ type=w1:Widget target=Widget.init1 $ SPURIOUS: target=Widget.init2 target=Widget.init3
+  let w2 = Widget(name: "b")  // $ type=w2:Widget target=Widget.init2 $ SPURIOUS: target=Widget.init1 target=Widget.init3
+  let w3 = Widget(size: 10)  // $ type=w3:Widget target=Widget.init3 $ SPURIOUS: target=Widget.init1 target=Widget.init2
+}
+
+// --- Overload: methods with closure parameters of different signatures ---
+
+class Processor {
+  func apply(_ f: (Int) -> Int) -> Int {  // name=Processor.apply1
+    return f(0)  // $ target=Function.callAsFunction
+  }
+
+  func apply(_ f: (String) -> String) -> String {  // name=Processor.apply2
+    return f("")  // $ target=Function.callAsFunction
+  }
+
+  func apply(_ f: (Int, Int) -> Int) -> Int {  // name=Processor.apply3
+    return f(0, 0)  // $ target=Function.callAsFunction
+  }
+}
+
+func testClosureOverload() {
+  let p = Processor()  // $ target=Processor.init
+  let r1 = p.apply({ x in x + 1 })  // $ type=r1:Int target=Processor.apply1 $ SPURIOUS: target=Processor.apply2 target=Processor.apply3
+  let r2 = p.apply({ s in s + "!" })  // $ type=r2:String target=Processor.apply2 $ SPURIOUS: target=Processor.apply1 target=Processor.apply3
+  let r3 = p.apply({ x, y in x + y })  // $ type=r3:Int target=Processor.apply3 $ SPURIOUS: target=Processor.apply1 target=Processor.apply2
+}
+
+// --- Overload: subscript-like method overloading ---
+
+class MultiSubscript {
+  var data: [Int] = [1, 2, 3]
+  var dict: [String: Int] = ["a": 1]
+
+  func get(_ index: Int) -> Int {  // name=MultiSubscript.get1
+    return data[index]  // $ field=MultiSubscript.data
+  }
+
+  func get(_ key: String) -> Int {  // name=MultiSubscript.get2
+    return dict[key] ?? 0  // $ field=MultiSubscript.dict
+  }
+}
+
+func testMethodSubscriptLike() {
+  let ms = MultiSubscript()  // $ target=MultiSubscript.init
+  let r1 = ms.get(0)  // $ type=r1:Int target=MultiSubscript.get1 $ SPURIOUS: target=MultiSubscript.get2
+  let r2 = ms.get("a")  // $ type=r2:Int target=MultiSubscript.get2 $ SPURIOUS: target=MultiSubscript.get1
+}
diff --git a/unified/ql/test/library-tests/type-inference/pattern_matching.swift b/unified/ql/test/library-tests/type-inference/pattern_matching.swift
new file mode 100644
index 000000000000..f8c149d7cdf3
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/pattern_matching.swift
@@ -0,0 +1,37 @@
+func testSimplePattern(_ pair: (Int, String)) {
+  let (number, text) = pair
+  _ = number  // $ MISSING: type=number:Int
+  _ = text  // $ MISSING: type=text:String
+}
+
+enum PatternMatch<T> {
+  case novalue
+  case value(T)
+  case nested((T, (Int, String?)))
+}
+
+func testComplexPattern<T>(_ input: PatternMatch<T>) {
+  switch input {
+  case .novalue:
+    break
+  case .value(let value):
+    _ = value  // $ MISSING: type=value:T
+  case .nested((let value, (let count, let label?))):
+    _ = value  // $ MISSING: type=value:T
+    _ = count  // $ MISSING: type=count:Int
+    _ = label  // $ MISSING: type=label:String
+  case .nested((let value, (let count, nil))):
+    _ = value  // $ MISSING: type=value:T
+    _ = count  // $ MISSING: type=count:Int
+  }
+}
+
+func createValue() -> PatternMatch<Bool> {
+  var x = PatternMatch.value(42)  // $ type=x@PatternMatch<T>:Int target=PatternMatch.value
+  var y = PatternMatch<String>.novalue  // $ type=y@PatternMatch<T>:String field=PatternMatch.novalue
+  return PatternMatch.novalue  // $ type=.novalue@PatternMatch<T>:Bool field=PatternMatch.novalue
+}
+
+func createValueShorthand() -> PatternMatch<Bool> {
+  PatternMatch.novalue  // $ type=.novalue@PatternMatch<T>:Bool field=PatternMatch.novalue
+}
diff --git a/unified/ql/test/library-tests/type-inference/protocols.swift b/unified/ql/test/library-tests/type-inference/protocols.swift
new file mode 100644
index 000000000000..71d284d96816
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/protocols.swift
@@ -0,0 +1,104 @@
+// --- Protocols and protocol conformance ---
+
+protocol Shape {
+  func area() -> Double
+}
+
+struct Circle: Shape {
+  var radius: Double
+
+  init(radius: Double) {
+    self.radius = radius  // $ type=radius:Double field=Circle.radius
+  }
+
+  func area() -> Double {
+    return 3.14159 * radius * radius  // $ type=radius:Double field=Circle.radius
+  }
+}
+
+struct Rectangle: Shape {
+  var width: Double
+  var height: Double
+
+  init(width: Double, height: Double) {
+    self.width = width  // $ type=width:Double field=Rectangle.width
+    self.height = height  // $ type=height:Double field=Rectangle.height
+  }
+
+  func area() -> Double {
+    return width * height  // $ type=width:Double field=Rectangle.width field=Rectangle.height
+  }
+}
+
+func testProtocol() {
+  let c = Circle(radius: 5.0)  // $ type=c:Circle target=Circle.init
+  let a1 = c.area()  // $ type=a1:Double target=Circle.area
+
+  let r = Rectangle(width: 3.0, height: 4.0)  // $ type=r:Rectangle target=Rectangle.init
+  let a2 = r.area()  // $ type=a2:Double target=Rectangle.area
+}
+
+// --- Protocol with associated types ---
+
+protocol Container {
+  associatedtype Item
+  func getItem() -> Item
+  func count() -> Int
+}
+
+struct IntContainer: Container {
+  typealias Item = Int
+  var items: [Int]
+
+  init(items: [Int]) {
+    self.items = items  // $ field=IntContainer.items
+  }
+
+  func getItem() -> Int {
+    return items[0]  // $ field=IntContainer.items
+  }
+
+  func count() -> Int {
+    return items.count  // $ field=IntContainer.items
+  }
+}
+
+func testAssociatedTypes() {
+  let ic = IntContainer(items: [1, 2, 3])  // $ type=ic:IntContainer target=IntContainer.init
+  let item = ic.getItem()  // $ type=item:Int target=IntContainer.getItem
+  let cnt = ic.count()  // $ type=cnt:Int target=IntContainer.count
+}
+
+// --- Multiple protocol conformance ---
+
+protocol Printable {
+  func display() -> String
+}
+
+protocol Identifiable {
+  func id() -> Int
+}
+
+class Entity: Printable, Identifiable {
+  var name: String
+  var entityId: Int
+
+  init(name: String, entityId: Int) {
+    self.name = name  // $ type=name:String field=Entity.name
+    self.entityId = entityId  // $ type=entityId:Int field=Entity.entityId
+  }
+
+  func display() -> String {
+    return name  // $ type=name:String field=Entity.name
+  }
+
+  func id() -> Int {
+    return entityId  // $ type=entityId:Int field=Entity.entityId
+  }
+}
+
+func testMultipleProtocols() {
+  let e = Entity(name: "test", entityId: 42)  // $ type=e:Entity target=Entity.init
+  let d = e.display()  // $ type=d:String target=Entity.display
+  let eid = e.id()  // $ type=eid:Int target=Entity.id
+}
diff --git a/unified/ql/test/library-tests/type-inference/tuples.swift b/unified/ql/test/library-tests/type-inference/tuples.swift
new file mode 100644
index 000000000000..aeb949c7264e
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/tuples.swift
@@ -0,0 +1,5 @@
+let tuple = (1, "hello", true)
+
+let a = tuple.0  // $ type=a:Int field=Tuple3.0
+let b = tuple.1  // $ type=b:String field=Tuple3.1
+let c = tuple.2  // $ type=c:Bool field=Tuple3.2
diff --git a/unified/ql/test/library-tests/type-inference/type-inference.expected b/unified/ql/test/library-tests/type-inference/type-inference.expected
new file mode 100644
index 000000000000..4a87e1942d3b
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/type-inference.expected
@@ -0,0 +1,3472 @@
+inferCertainType
+| accessors.swift:4:7:4:12 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:7:12:7:17 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:17:14:17:19 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:20:7:20:12 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:20:16:20:23 | newValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:26:14:26:19 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:28:9:28:13 | value |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:29:7:29:12 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:29:16:29:20 | value |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:48:7:48:14 | observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:50:11:50:17 | current |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:50:21:50:28 | observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:51:11:51:18 | incoming |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:51:22:51:29 | newValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:54:11:54:17 | current |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:54:21:54:28 | observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:55:11:55:18 | previous |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:55:22:55:29 | oldValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:59:7:59:20 | namedObservers |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:60:13:60:20 | incoming |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:61:11:61:15 | value |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:61:19:61:26 | incoming |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:63:12:63:19 | previous |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:64:11:64:15 | value |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:64:19:64:26 | previous |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:80:7:80:12 | stored |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:82:8:82:12 | value |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:83:5:83:10 | stored |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:83:14:83:18 | value |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:88:14:88:19 | stored |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:91:7:91:12 | stored |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:91:16:91:23 | newValue |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:95:7:95:14 | observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:97:11:97:17 | current |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:97:21:97:28 | observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:98:11:98:18 | previous |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:98:22:98:29 | oldValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:107:22:107:25 | self |  | accessors.swift:103:1:111:1 | InheritedAccessors |
+| accessors.swift:108:11:108:18 | previous |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:108:22:108:29 | oldValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:135:33:135:37 | value |  | accessors.swift:130:1:133:1 | AccessorRequirements |
+| accessors.swift:136:18:136:22 | value |  | accessors.swift:130:1:133:1 | AccessorRequirements |
+| accessors.swift:137:19:137:23 | value |  | accessors.swift:130:1:133:1 | AccessorRequirements |
+| accessors.swift:138:3:138:7 | value |  | accessors.swift:130:1:133:1 | AccessorRequirements |
+| accessors.swift:143:30:143:40 | Block |  | {EXTERNAL LOCATION} | Function |
+| accessors.swift:143:32:143:38 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| accessors.swift:147:19:147:22 | self |  | accessors.swift:142:1:149:1 | C |
+| accessors.swift:154:14:154:19 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:158:14:158:19 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:161:7:161:12 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:161:16:161:23 | newValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:172:14:172:19 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:176:14:176:19 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:179:7:179:12 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:179:16:179:23 | newValue |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:1:5:1:16 | topLevelDecl |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:3:1:3:12 | topLevelDecl |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:6:7:6:11 | myInt |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:7:8:7:8 | n |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:8:5:8:9 | myInt |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:8:13:8:13 | n |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:12:12:12:16 | myInt |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:28:7:28:11 | value |  | basics.swift:27:15:27:15 | T |
+| basics.swift:29:8:29:8 | v |  | basics.swift:27:15:27:15 | T |
+| basics.swift:30:5:30:9 | value |  | basics.swift:27:15:27:15 | T |
+| basics.swift:30:13:30:13 | v |  | basics.swift:27:15:27:15 | T |
+| basics.swift:34:12:34:16 | value |  | basics.swift:27:15:27:15 | T |
+| classes.swift:4:22:4:22 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:5:12:5:12 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:5:16:5:16 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:8:19:8:19 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:9:12:9:12 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:9:16:9:16 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:9:20:9:20 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:21:18:21:18 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:22:12:22:12 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:25:18:25:18 | s |  | {EXTERNAL LOCATION} | String |
+| classes.swift:26:12:26:12 | s |  | {EXTERNAL LOCATION} | String |
+| classes.swift:39:7:39:10 | data |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:39:7:39:10 | data | Element | {EXTERNAL LOCATION} | Array |
+| classes.swift:39:7:39:10 | data | Element.Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:41:8:41:11 | data |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:41:8:41:11 | data | Element | {EXTERNAL LOCATION} | Array |
+| classes.swift:41:8:41:11 | data | Element.Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:42:5:42:8 | self |  | classes.swift:38:1:48:1 | Matrix |
+| classes.swift:42:17:42:20 | data |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:42:17:42:20 | data | Element | {EXTERNAL LOCATION} | Array |
+| classes.swift:42:17:42:20 | data | Element.Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:46:12:46:15 | data |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:46:12:46:15 | data | Element | {EXTERNAL LOCATION} | Array |
+| classes.swift:46:12:46:15 | data | Element.Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:51:24:51:39 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:51:25:51:30 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:51:33:51:38 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:59:9:59:13 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:61:10:61:14 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:62:7:62:10 | self |  | classes.swift:58:3:68:3 | Inner |
+| classes.swift:62:20:62:24 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:66:14:66:17 | self |  | classes.swift:58:3:68:3 | Inner |
+| classes.swift:79:7:79:11 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:81:14:81:14 | v |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:82:5:82:9 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:82:13:82:13 | v |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:83:12:83:15 | self |  | classes.swift:78:1:94:1 | Builder |
+| classes.swift:86:14:86:14 | v |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:87:5:87:9 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:87:14:87:14 | v |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:88:12:88:15 | self |  | classes.swift:78:1:94:1 | Builder |
+| classes.swift:92:12:92:16 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:104:14:104:20 | retries |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:104:32:104:38 | timeout |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:105:12:105:18 | retries |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:119:7:119:13 | celsius |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:121:8:121:14 | celsius |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:122:5:122:8 | self |  | classes.swift:118:1:132:1 | Temperature |
+| classes.swift:122:20:122:26 | celsius |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:126:12:126:18 | celsius |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:130:12:130:18 | celsius |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:184:7:184:11 | count |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:187:5:187:9 | count |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:191:12:191:16 | count |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:2:9:2:14 | addOne |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:2:9:2:14 | addOne | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:2:18:4:5 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:2:18:4:5 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:5:18:5:23 | addOne |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:5:18:5:23 | addOne | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:9:28:9:35 | callback |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:9:28:9:35 | callback | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:9:28:9:35 | callback | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:9:28:9:35 | callback | Return | {EXTERNAL LOCATION} | String |
+| closures.swift:10:5:10:12 | callback |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:10:5:10:12 | callback | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:10:5:10:12 | callback | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:10:5:10:12 | callback | Return | {EXTERNAL LOCATION} | String |
+| closures.swift:13:36:13:43 | callback |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:13:36:13:43 | callback | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:13:36:13:43 | callback | Args.T0 | closures.swift:13:30:13:31 | T1 |
+| closures.swift:13:36:13:43 | callback | Return | {EXTERNAL LOCATION} | Tuple0 |
+| closures.swift:13:62:13:64 | arg |  | closures.swift:13:30:13:31 | T1 |
+| closures.swift:14:5:14:12 | callback |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:14:5:14:12 | callback | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:14:5:14:12 | callback | Args.T0 | closures.swift:13:30:13:31 | T1 |
+| closures.swift:14:5:14:12 | callback | Return | {EXTERNAL LOCATION} | Tuple0 |
+| closures.swift:14:14:14:16 | arg |  | closures.swift:13:30:13:31 | T1 |
+| closures.swift:15:12:15:14 | arg |  | closures.swift:13:30:13:31 | T1 |
+| closures.swift:19:38:21:5 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:19:38:21:5 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:25:9:27:9 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:25:9:27:9 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:32:9:32:9 | f |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:32:9:32:9 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:32:9:32:9 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:32:9:32:9 | f | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:34:14:34:18 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:38:9:38:10 | f2 |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:38:9:38:10 | f2 | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:38:9:38:10 | f2 | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:38:9:38:10 | f2 | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:40:10:40:10 | f |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:40:10:40:10 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:40:10:40:10 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:40:10:40:10 | f | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:41:9:41:12 | self |  | closures.swift:31:1:50:1 | ClosureField |
+| closures.swift:41:18:41:18 | f |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:41:18:41:18 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:41:18:41:18 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:41:18:41:18 | f | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:42:9:42:12 | self |  | closures.swift:31:1:50:1 | ClosureField |
+| closures.swift:42:19:42:19 | f |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:42:19:42:19 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:42:19:42:19 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:42:19:42:19 | f | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:45:24:45:28 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:47:9:47:12 | self |  | closures.swift:31:1:50:1 | ClosureField |
+| closures.swift:47:16:47:20 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:48:16:48:19 | self |  | closures.swift:31:1:50:1 | ClosureField |
+| closures.swift:48:24:48:28 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:53:9:53:15 | numbers |  | {EXTERNAL LOCATION} | Array |
+| closures.swift:53:19:53:27 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| closures.swift:55:19:55:25 | numbers |  | {EXTERNAL LOCATION} | Array |
+| closures.swift:55:31:57:5 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:55:31:57:5 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:60:22:60:29 | callback |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:60:22:60:29 | callback | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:60:22:60:29 | callback | Args.T0 | closures.swift:60:12:60:13 | T1 |
+| closures.swift:60:22:60:29 | callback | Return | closures.swift:60:16:60:17 | T2 |
+| closures.swift:60:46:60:48 | arg |  | closures.swift:60:12:60:13 | T1 |
+| closures.swift:61:5:61:12 | callback |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:61:5:61:12 | callback | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:61:5:61:12 | callback | Args.T0 | closures.swift:60:12:60:13 | T1 |
+| closures.swift:61:5:61:12 | callback | Return | closures.swift:60:16:60:17 | T2 |
+| closures.swift:61:14:61:16 | arg |  | closures.swift:60:12:60:13 | T1 |
+| closures.swift:66:9:68:9 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:66:9:68:9 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| constructors.swift:2:12:2:12 | x |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:5:9:5:12 | self |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:24:12:24:12 | x |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:29:9:29:12 | self |  | constructors.swift:23:1:31:1 | C4 |
+| constructors.swift:39:10:39:10 | x |  | constructors.swift:38:10:38:11 | T1 |
+| constructors.swift:39:17:39:17 | y |  | constructors.swift:38:14:38:15 | T2 |
+| constructors.swift:41:18:41:18 | s |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:43:22:43:22 | x |  | constructors.swift:38:10:38:11 | T1 |
+| constructors.swift:54:22:54:22 | x |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:55:9:55:12 | self |  | constructors.swift:53:1:57:1 | C8 |
+| constructors.swift:55:22:55:22 | x |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:61:5:61:7 | c91 |  | constructors.swift:59:1:59:19 | C9 |
+| constructors.swift:61:5:61:7 | c91 | T9 | {EXTERNAL LOCATION} | Int |
+| constructors.swift:66:5:66:7 | c10 |  | constructors.swift:64:1:64:42 | C10 |
+| constructors.swift:66:5:66:7 | c10 | T10b | {EXTERNAL LOCATION} | Int |
+| constructors.swift:69:9:69:10 | f1 |  | constructors.swift:68:11:68:11 | T |
+| constructors.swift:70:9:70:10 | f2 |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:71:9:71:10 | f3 |  | {EXTERNAL LOCATION} | Function |
+| constructors.swift:71:9:71:10 | f3 | Args | {EXTERNAL LOCATION} | Tuple1 |
+| constructors.swift:71:9:71:10 | f3 | Args.T0 | constructors.swift:68:11:68:11 | T |
+| constructors.swift:71:9:71:10 | f3 | Return | constructors.swift:68:11:68:11 | T |
+| constructors.swift:71:24:71:29 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| constructors.swift:76:23:76:32 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| constructors.swift:76:23:76:32 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| constructors.swift:77:15:77:24 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| constructors.swift:77:15:77:24 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| constructors.swift:89:5:89:6 | e2 |  | constructors.swift:87:1:87:27 | E2 |
+| constructors.swift:89:5:89:6 | e2 | B | {EXTERNAL LOCATION} | String |
+| fields.swift:2:7:2:20 | inheritedField |  | {EXTERNAL LOCATION} | Int |
+| fields.swift:6:7:6:17 | storedField |  | {EXTERNAL LOCATION} | String |
+| fields.swift:7:7:7:18 | genericField |  | fields.swift:5:22:5:22 | T |
+| fields.swift:9:8:9:19 | genericField |  | fields.swift:5:22:5:22 | T |
+| fields.swift:10:5:10:8 | self |  | fields.swift:5:1:20:1 | FieldContainer |
+| fields.swift:10:5:10:8 | self | T | fields.swift:5:22:5:22 | T |
+| fields.swift:10:25:10:36 | genericField |  | fields.swift:5:22:5:22 | T |
+| fields.swift:14:12:14:22 | storedField |  | {EXTERNAL LOCATION} | String |
+| fields.swift:18:12:18:15 | self |  | fields.swift:5:1:20:1 | FieldContainer |
+| fields.swift:18:12:18:15 | self | T | fields.swift:5:22:5:22 | T |
+| fields.swift:23:14:23:24 | staticField |  | {EXTERNAL LOCATION} | Bool |
+| fields.swift:27:7:27:11 | value |  | {EXTERNAL LOCATION} | Double |
+| fields.swift:31:7:31:12 | nested |  | fields.swift:26:1:28:1 | NestedField |
+| generics.swift:3:20:3:20 | x |  | generics.swift:3:15:3:15 | T |
+| generics.swift:4:10:4:10 | x |  | generics.swift:3:15:3:15 | T |
+| generics.swift:7:23:7:23 | a |  | generics.swift:7:15:7:15 | A |
+| generics.swift:7:31:7:31 | b |  | generics.swift:7:18:7:18 | B |
+| generics.swift:8:11:8:11 | a |  | generics.swift:7:15:7:15 | A |
+| generics.swift:8:14:8:14 | b |  | generics.swift:7:18:7:18 | B |
+| generics.swift:20:7:20:11 | first |  | generics.swift:19:13:19:13 | A |
+| generics.swift:21:7:21:12 | second |  | generics.swift:19:16:19:16 | B |
+| generics.swift:23:8:23:12 | first |  | generics.swift:19:13:19:13 | A |
+| generics.swift:23:18:23:23 | second |  | generics.swift:19:16:19:16 | B |
+| generics.swift:24:5:24:8 | self |  | generics.swift:19:1:35:1 | Pair |
+| generics.swift:24:5:24:8 | self | A | generics.swift:19:13:19:13 | A |
+| generics.swift:24:5:24:8 | self | B | generics.swift:19:16:19:16 | B |
+| generics.swift:24:18:24:22 | first |  | generics.swift:19:13:19:13 | A |
+| generics.swift:25:5:25:8 | self |  | generics.swift:19:1:35:1 | Pair |
+| generics.swift:25:5:25:8 | self | A | generics.swift:19:13:19:13 | A |
+| generics.swift:25:5:25:8 | self | B | generics.swift:19:16:19:16 | B |
+| generics.swift:25:19:25:24 | second |  | generics.swift:19:16:19:16 | B |
+| generics.swift:29:12:29:16 | first |  | generics.swift:19:13:19:13 | A |
+| generics.swift:33:12:33:17 | second |  | generics.swift:19:16:19:16 | B |
+| generics.swift:50:12:50:15 | self |  | generics.swift:45:1:57:1 | Result |
+| generics.swift:50:12:50:15 | self | T | generics.swift:45:13:45:13 | T |
+| generics.swift:63:7:63:8 | r2 |  | generics.swift:45:1:57:1 | Result |
+| generics.swift:63:7:63:8 | r2 | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:64:12:64:13 | r2 |  | generics.swift:45:1:57:1 | Result |
+| generics.swift:64:12:64:13 | r2 | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:69:29:69:33 | value |  | generics.swift:69:21:69:21 | T |
+| generics.swift:69:41:69:49 | transform |  | {EXTERNAL LOCATION} | Function |
+| generics.swift:69:41:69:49 | transform | Args | {EXTERNAL LOCATION} | Tuple1 |
+| generics.swift:69:41:69:49 | transform | Args.T0 | generics.swift:69:21:69:21 | T |
+| generics.swift:69:41:69:49 | transform | Return | generics.swift:69:24:69:24 | U |
+| generics.swift:70:16:70:24 | transform |  | {EXTERNAL LOCATION} | Function |
+| generics.swift:70:16:70:24 | transform | Args | {EXTERNAL LOCATION} | Tuple1 |
+| generics.swift:70:16:70:24 | transform | Args.T0 | generics.swift:69:21:69:21 | T |
+| generics.swift:70:16:70:24 | transform | Return | generics.swift:69:24:69:24 | U |
+| generics.swift:70:26:70:30 | value |  | generics.swift:69:21:69:21 | T |
+| generics.swift:75:34:75:47 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| generics.swift:75:34:75:47 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| generics.swift:78:5:80:5 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| generics.swift:78:5:80:5 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| generics.swift:94:7:94:11 | inner |  | generics.swift:93:15:93:27 | T |
+| generics.swift:96:10:96:14 | inner |  | generics.swift:93:15:93:27 | T |
+| generics.swift:97:5:97:8 | self |  | generics.swift:93:1:113:1 | Wrapper |
+| generics.swift:97:5:97:8 | self | T | generics.swift:93:15:93:27 | T |
+| generics.swift:97:18:97:22 | inner |  | generics.swift:93:15:93:27 | T |
+| generics.swift:101:12:101:16 | inner |  | generics.swift:93:15:93:27 | T |
+| generics.swift:105:13:105:17 | inner |  | generics.swift:93:15:93:27 | T |
+| generics.swift:110:13:110:17 | inner |  | generics.swift:93:15:93:27 | T |
+| generics.swift:119:12:119:15 | self |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:137:7:137:12 | value1 |  | generics.swift:136:12:136:13 | T1 |
+| generics.swift:138:7:138:12 | value2 |  | generics.swift:136:16:136:17 | T2 |
+| generics.swift:140:10:140:11 | v1 |  | generics.swift:136:12:136:13 | T1 |
+| generics.swift:140:20:140:21 | v2 |  | generics.swift:136:16:136:17 | T2 |
+| generics.swift:141:5:141:8 | self |  | generics.swift:136:1:152:1 | Base |
+| generics.swift:141:5:141:8 | self | T1 | generics.swift:136:12:136:13 | T1 |
+| generics.swift:141:5:141:8 | self | T2 | generics.swift:136:16:136:17 | T2 |
+| generics.swift:141:19:141:20 | v1 |  | generics.swift:136:12:136:13 | T1 |
+| generics.swift:142:5:142:8 | self |  | generics.swift:136:1:152:1 | Base |
+| generics.swift:142:5:142:8 | self | T1 | generics.swift:136:12:136:13 | T1 |
+| generics.swift:142:5:142:8 | self | T2 | generics.swift:136:16:136:17 | T2 |
+| generics.swift:142:19:142:20 | v2 |  | generics.swift:136:16:136:17 | T2 |
+| generics.swift:146:12:146:17 | value1 |  | generics.swift:136:12:136:13 | T1 |
+| generics.swift:150:12:150:17 | value2 |  | generics.swift:136:16:136:17 | T2 |
+| generics.swift:155:10:155:11 | v1 |  | generics.swift:154:15:154:16 | T1 |
+| generics.swift:155:20:155:21 | v2 |  | generics.swift:154:19:154:20 | T2 |
+| generics.swift:156:16:156:17 | v2 |  | generics.swift:154:19:154:20 | T2 |
+| generics.swift:156:20:156:21 | v1 |  | generics.swift:154:15:154:16 | T1 |
+| generics.swift:159:22:159:23 | v1 |  | generics.swift:154:15:154:16 | T1 |
+| generics.swift:165:10:165:10 | v |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:165:10:165:10 | v | Element | generics.swift:164:22:164:22 | D |
+| generics.swift:166:16:166:16 | v |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:166:16:166:16 | v | Element | generics.swift:164:22:164:22 | D |
+| generics.swift:174:38:174:43 | value1 |  | generics.swift:174:10:174:11 | T1 |
+| generics.swift:174:52:174:57 | value2 |  | generics.swift:174:14:174:15 | T2 |
+| generics.swift:174:66:174:69 | base |  | generics.swift:174:18:174:33 | T3 |
+| generics.swift:175:10:175:13 | base |  | generics.swift:174:18:174:33 | T3 |
+| generics.swift:178:21:178:26 | value1 |  | generics.swift:178:11:178:12 | T1 |
+| generics.swift:178:35:178:40 | value2 |  | generics.swift:178:15:178:16 | T2 |
+| generics.swift:178:49:178:52 | base |  | generics.swift:136:1:152:1 | Base |
+| generics.swift:178:49:178:52 | base | T1 | generics.swift:178:11:178:12 | T1 |
+| generics.swift:178:49:178:52 | base | T2 | generics.swift:178:15:178:16 | T2 |
+| generics.swift:182:35:182:40 | value1 |  | generics.swift:182:10:182:10 | A |
+| generics.swift:182:48:182:53 | value2 |  | generics.swift:182:13:182:13 | B |
+| generics.swift:182:61:182:64 | base |  | generics.swift:182:16:182:30 | C |
+| generics.swift:183:10:183:13 | base |  | generics.swift:182:16:182:30 | C |
+| generics.swift:187:19:187:24 | value1 |  | generics.swift:187:11:187:11 | A |
+| generics.swift:187:32:187:37 | value2 |  | generics.swift:187:14:187:14 | B |
+| generics.swift:187:45:187:48 | base |  | generics.swift:136:1:152:1 | Base |
+| generics.swift:187:45:187:48 | base | T1 | generics.swift:187:11:187:11 | A |
+| generics.swift:187:45:187:48 | base | T2 | {EXTERNAL LOCATION} | Array |
+| generics.swift:187:45:187:48 | base | T2.Element | generics.swift:187:14:187:14 | B |
+| generics.swift:189:34:189:39 | value1 |  | generics.swift:189:10:189:10 | A |
+| generics.swift:189:47:189:52 | value2 |  | generics.swift:189:13:189:13 | B |
+| generics.swift:189:60:189:63 | base |  | generics.swift:189:16:189:29 | C |
+| generics.swift:190:10:190:13 | base |  | generics.swift:189:16:189:29 | C |
+| generics.swift:194:19:194:24 | value1 |  | generics.swift:194:11:194:11 | A |
+| generics.swift:194:32:194:37 | value2 |  | generics.swift:194:14:194:14 | B |
+| generics.swift:194:45:194:48 | base |  | generics.swift:136:1:152:1 | Base |
+| generics.swift:194:45:194:48 | base | T1 | generics.swift:194:11:194:11 | A |
+| generics.swift:194:45:194:48 | base | T2 | {EXTERNAL LOCATION} | Optional |
+| generics.swift:194:45:194:48 | base | T2.Wrapped | generics.swift:194:14:194:14 | B |
+| generics.swift:201:27:201:35 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:205:22:205:24 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:207:15:207:17 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:228:12:228:15 | self |  | generics.swift:220:1:224:1 | MyProtocol2 |
+| generics.swift:233:7:233:11 | value |  | generics.swift:232:15:232:15 | T |
+| generics.swift:235:10:235:14 | value |  | generics.swift:232:15:232:15 | T |
+| generics.swift:236:5:236:8 | self |  | generics.swift:232:1:238:1 | MyClass |
+| generics.swift:236:5:236:8 | self | T | generics.swift:232:15:232:15 | T |
+| generics.swift:236:18:236:22 | value |  | generics.swift:232:15:232:15 | T |
+| generics.swift:248:32:248:32 | c |  | generics.swift:248:14:248:27 | T |
+| generics.swift:249:10:249:10 | c |  | generics.swift:248:14:248:27 | T |
+| generics.swift:252:32:252:32 | c |  | generics.swift:252:14:252:27 | T |
+| generics.swift:253:10:253:10 | c |  | generics.swift:252:14:252:27 | T |
+| generics.swift:287:65:287:69 | value |  | generics.swift:287:33:287:60 | T |
+| generics.swift:288:10:288:14 | value |  | generics.swift:287:33:287:60 | T |
+| key_paths.swift:4:7:4:7 | x |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:5:7:5:7 | y |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:7:8:7:8 | x |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:7:19:7:19 | y |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:8:5:8:8 | self |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:8:14:8:14 | x |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:9:5:9:8 | self |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:9:14:9:14 | y |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:13:13:13:13 | x |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:13:17:13:17 | x |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:13:21:13:21 | y |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:13:25:13:25 | y |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:18:7:18:11 | start |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:19:7:19:9 | end |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:21:8:21:12 | start |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:21:22:21:24 | end |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:22:5:22:8 | self |  | key_paths.swift:17:1:25:1 | Line |
+| key_paths.swift:22:18:22:22 | start |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:23:5:23:8 | self |  | key_paths.swift:17:1:25:1 | Line |
+| key_paths.swift:23:16:23:18 | end |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:59:7:59:10 | name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:60:7:60:13 | address |  | {EXTERNAL LOCATION} | Optional |
+| key_paths.swift:60:7:60:13 | address | Wrapped | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:62:8:62:11 | name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:62:22:62:28 | address |  | {EXTERNAL LOCATION} | Optional |
+| key_paths.swift:62:22:62:28 | address | Wrapped | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:63:5:63:8 | self |  | key_paths.swift:58:1:66:1 | Person |
+| key_paths.swift:63:17:63:20 | name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:64:5:64:8 | self |  | key_paths.swift:58:1:66:1 | Person |
+| key_paths.swift:64:20:64:26 | address |  | {EXTERNAL LOCATION} | Optional |
+| key_paths.swift:64:20:64:26 | address | Wrapped | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:69:7:69:10 | city |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:70:7:70:9 | zip |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:72:8:72:11 | city |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:72:22:72:24 | zip |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:73:5:73:8 | self |  | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:73:17:73:20 | city |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:74:5:74:8 | self |  | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:74:16:74:18 | zip |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:89:7:89:10 | name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:90:7:90:12 | salary |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:92:8:92:11 | name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:92:22:92:27 | salary |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:93:5:93:8 | self |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:93:17:93:20 | name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:94:5:94:8 | self |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:94:19:94:24 | salary |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:98:27:98:31 | items |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:98:27:98:31 | items | Element | key_paths.swift:98:19:98:19 | T |
+| key_paths.swift:98:39:98:45 | keyPath | unknown type parameter 0 | key_paths.swift:98:19:98:19 | T |
+| key_paths.swift:98:39:98:45 | keyPath | unknown type parameter 1 | key_paths.swift:98:22:98:22 | V |
+| key_paths.swift:99:10:99:14 | items |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:99:10:99:14 | items | Element | key_paths.swift:98:19:98:19 | T |
+| key_paths.swift:99:20:99:43 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| key_paths.swift:99:34:99:40 | keyPath | unknown type parameter 0 | key_paths.swift:98:19:98:19 | T |
+| key_paths.swift:99:34:99:40 | keyPath | unknown type parameter 1 | key_paths.swift:98:22:98:22 | V |
+| key_paths.swift:105:7:105:15 | employees |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:105:19:105:26 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:106:28:106:36 | employees |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:108:31:108:39 | employees |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:115:7:115:10 | item |  | key_paths.swift:114:19:114:19 | T |
+| key_paths.swift:117:8:117:11 | item |  | key_paths.swift:114:19:114:19 | T |
+| key_paths.swift:118:5:118:8 | self |  | key_paths.swift:114:1:120:1 | KPContainer |
+| key_paths.swift:118:5:118:8 | self | T | key_paths.swift:114:19:114:19 | T |
+| key_paths.swift:118:17:118:20 | item |  | key_paths.swift:114:19:114:19 | T |
+| key_paths.swift:155:7:155:15 | employees |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:155:19:155:26 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:156:15:156:23 | employees |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:158:18:158:26 | employees |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:165:7:165:11 | color |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:167:8:167:12 | color |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:168:5:168:8 | self |  | key_paths.swift:164:1:170:1 | Shape2 |
+| key_paths.swift:168:18:168:22 | color |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:173:7:173:12 | radius |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:175:8:175:12 | color |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:175:23:175:28 | radius |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:176:5:176:8 | self |  | key_paths.swift:172:1:179:1 | Circle2 |
+| key_paths.swift:176:19:176:24 | radius |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:177:23:177:27 | color |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:204:7:204:9 | arr |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:204:13:204:24 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:205:15:205:17 | arr |  | {EXTERNAL LOCATION} | Array |
+| overload_resolution.swift:4:17:4:17 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:8:17:8:17 | x |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:12:17:12:17 | x |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:16:17:16:17 | x |  | {EXTERNAL LOCATION} | Bool |
+| overload_resolution.swift:32:18:32:22 | width |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:36:18:36:23 | height |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:40:18:40:22 | width |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:40:30:40:35 | height |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:44:18:44:21 | size |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:64:18:64:18 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:65:12:65:12 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:68:18:68:18 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:68:28:68:28 | y |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:69:12:69:12 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:69:16:69:16 | y |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:72:18:72:18 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:72:28:72:28 | y |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:72:38:72:38 | z |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:73:12:73:12 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:73:16:73:16 | y |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:73:20:73:20 | z |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:103:7:103:8 | r1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:104:7:104:8 | r2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:105:7:105:8 | r3 |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:111:18:111:18 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:115:21:115:21 | x |  | overload_resolution.swift:115:16:115:16 | T |
+| overload_resolution.swift:129:21:129:21 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:133:21:133:21 | x |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:137:21:137:21 | x |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:150:7:150:11 | value |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:153:5:153:9 | value |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:156:8:156:10 | int |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:157:5:157:9 | value |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:160:8:160:10 | str |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:161:5:161:9 | value |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:161:13:161:15 | str |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:164:8:164:8 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:164:16:164:16 | y |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:165:5:165:9 | value |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:169:12:169:16 | value |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:285:16:285:21 | target |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:286:12:286:17 | target |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:289:18:289:23 | source |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:290:12:290:17 | source |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:293:16:293:21 | target |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:293:37:293:42 | source |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:294:12:294:17 | target |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:294:21:294:26 | source |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:319:35:319:35 | x |  | overload_resolution.swift:319:20:319:30 | T |
+| overload_resolution.swift:320:10:320:10 | x |  | overload_resolution.swift:319:20:319:30 | T |
+| overload_resolution.swift:323:36:323:36 | x |  | overload_resolution.swift:323:20:323:31 | T |
+| overload_resolution.swift:324:10:324:10 | x |  | overload_resolution.swift:323:20:323:31 | T |
+| overload_resolution.swift:335:7:335:10 | item |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:337:10:337:13 | item |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:338:5:338:8 | self |  | overload_resolution.swift:334:1:348:1 | Box |
+| overload_resolution.swift:338:5:338:8 | self | T | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:338:17:338:20 | item |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:342:12:342:15 | item |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:345:18:345:24 | newItem |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:346:5:346:8 | item |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:346:12:346:18 | newItem |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:362:7:362:10 | name |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:363:7:363:10 | size |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:365:8:365:11 | name |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:365:22:365:25 | size |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:366:5:366:8 | self |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:366:17:366:20 | name |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:367:5:367:8 | self |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:367:17:367:20 | size |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:370:20:370:23 | name |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:371:5:371:8 | self |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:371:21:371:24 | name |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:374:20:374:23 | size |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:375:5:375:8 | self |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:375:38:375:41 | size |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:388:16:388:16 | f |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:388:16:388:16 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| overload_resolution.swift:388:16:388:16 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:388:16:388:16 | f | Return | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:389:12:389:12 | f |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:389:12:389:12 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| overload_resolution.swift:389:12:389:12 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:389:12:389:12 | f | Return | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:392:16:392:16 | f |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:392:16:392:16 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| overload_resolution.swift:392:16:392:16 | f | Args.T0 | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:392:16:392:16 | f | Return | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:393:12:393:12 | f |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:393:12:393:12 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| overload_resolution.swift:393:12:393:12 | f | Args.T0 | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:393:12:393:12 | f | Return | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:396:16:396:16 | f |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:396:16:396:16 | f | Args | {EXTERNAL LOCATION} | Tuple2 |
+| overload_resolution.swift:396:16:396:16 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:396:16:396:16 | f | Args.T1 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:396:16:396:16 | f | Return | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:397:12:397:12 | f |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:397:12:397:12 | f | Args | {EXTERNAL LOCATION} | Tuple2 |
+| overload_resolution.swift:397:12:397:12 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:397:12:397:12 | f | Args.T1 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:397:12:397:12 | f | Return | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:403:20:403:33 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:403:20:403:33 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| overload_resolution.swift:404:20:404:35 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:404:20:404:35 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| overload_resolution.swift:405:20:405:36 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:411:7:411:10 | data |  | {EXTERNAL LOCATION} | Array |
+| overload_resolution.swift:411:7:411:10 | data | Element | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:411:21:411:29 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| overload_resolution.swift:412:7:412:10 | dict |  | {EXTERNAL LOCATION} | Dictionary |
+| overload_resolution.swift:412:7:412:10 | dict | Key | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:412:7:412:10 | dict | Value | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:414:14:414:18 | index |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:415:12:415:15 | data |  | {EXTERNAL LOCATION} | Array |
+| overload_resolution.swift:415:12:415:15 | data | Element | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:415:17:415:21 | index |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:418:14:418:16 | key |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:419:12:419:15 | dict |  | {EXTERNAL LOCATION} | Dictionary |
+| overload_resolution.swift:419:12:419:15 | dict | Key | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:419:12:419:15 | dict | Value | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:419:17:419:19 | key |  | {EXTERNAL LOCATION} | String |
+| pattern_matching.swift:1:26:1:29 | pair |  | {EXTERNAL LOCATION} | Tuple2 |
+| pattern_matching.swift:1:26:1:29 | pair | T0 | {EXTERNAL LOCATION} | Int |
+| pattern_matching.swift:1:26:1:29 | pair | T1 | {EXTERNAL LOCATION} | String |
+| pattern_matching.swift:2:7:2:20 | TupleExpr |  | {EXTERNAL LOCATION} | Tuple2 |
+| pattern_matching.swift:2:7:2:20 | TupleExpr | T0 | {EXTERNAL LOCATION} | Int |
+| pattern_matching.swift:2:7:2:20 | TupleExpr | T1 | {EXTERNAL LOCATION} | String |
+| pattern_matching.swift:2:24:2:27 | pair |  | {EXTERNAL LOCATION} | Tuple2 |
+| pattern_matching.swift:2:24:2:27 | pair | T0 | {EXTERNAL LOCATION} | Int |
+| pattern_matching.swift:2:24:2:27 | pair | T1 | {EXTERNAL LOCATION} | String |
+| pattern_matching.swift:8:8:8:14 | novalue |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:8:8:8:14 | novalue | T | pattern_matching.swift:7:19:7:19 | T |
+| pattern_matching.swift:13:30:13:34 | input |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:13:30:13:34 | input | T | pattern_matching.swift:13:25:13:25 | T |
+| pattern_matching.swift:14:10:14:14 | input |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:14:10:14:14 | input | T | pattern_matching.swift:13:25:13:25 | T |
+| protocols.swift:8:7:8:12 | radius |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:10:8:10:13 | radius |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:11:5:11:8 | self |  | protocols.swift:7:1:17:1 | Circle |
+| protocols.swift:11:19:11:24 | radius |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:15:22:15:27 | radius |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:15:31:15:36 | radius |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:20:7:20:11 | width |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:21:7:21:12 | height |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:23:8:23:12 | width |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:23:23:23:28 | height |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:24:5:24:8 | self |  | protocols.swift:19:1:31:1 | Rectangle |
+| protocols.swift:24:18:24:22 | width |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:25:5:25:8 | self |  | protocols.swift:19:1:31:1 | Rectangle |
+| protocols.swift:25:19:25:24 | height |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:29:12:29:16 | width |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:29:20:29:25 | height |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:51:7:51:11 | items |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:51:7:51:11 | items | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:53:8:53:12 | items |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:53:8:53:12 | items | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:54:5:54:8 | self |  | protocols.swift:49:1:64:1 | IntContainer |
+| protocols.swift:54:18:54:22 | items |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:54:18:54:22 | items | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:58:12:58:16 | items |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:58:12:58:16 | items | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:62:12:62:16 | items |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:62:12:62:16 | items | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:67:32:67:40 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:83:7:83:10 | name |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:84:7:84:14 | entityId |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:86:8:86:11 | name |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:86:22:86:29 | entityId |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:87:5:87:8 | self |  | protocols.swift:82:1:98:1 | Entity |
+| protocols.swift:87:17:87:20 | name |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:88:5:88:8 | self |  | protocols.swift:82:1:98:1 | Entity |
+| protocols.swift:88:21:88:28 | entityId |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:92:12:92:15 | name |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:96:12:96:19 | entityId |  | {EXTERNAL LOCATION} | Int |
+| type_alias.swift:2:9:2:13 | value |  | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:3:10:3:14 | value |  | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:4:9:4:12 | self |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:4:9:4:12 | self | T | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:4:22:4:26 | value |  | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:7:16:7:19 | self |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:7:16:7:19 | self | T | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:17:13:17:14 | a1 |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:17:13:17:14 | a1 | T | {EXTERNAL LOCATION} | Int |
+| type_alias.swift:17:27:17:28 | a2 |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:17:27:17:28 | a2 | T | {EXTERNAL LOCATION} | Tuple2 |
+| type_alias.swift:17:27:17:28 | a2 | T.T0 | {EXTERNAL LOCATION} | Bool |
+| type_alias.swift:17:27:17:28 | a2 | T.T1 | {EXTERNAL LOCATION} | Bool |
+| type_alias.swift:17:47:17:48 | a3 |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:17:47:17:48 | a3 | T | {EXTERNAL LOCATION} | Tuple2 |
+| type_alias.swift:17:47:17:48 | a3 | T.T0 | {EXTERNAL LOCATION} | Optional |
+| type_alias.swift:17:47:17:48 | a3 | T.T0.Wrapped | {EXTERNAL LOCATION} | String |
+| type_alias.swift:17:47:17:48 | a3 | T.T1 | {EXTERNAL LOCATION} | Optional |
+| type_alias.swift:17:47:17:48 | a3 | T.T1.Wrapped | {EXTERNAL LOCATION} | String |
+| type_alias.swift:18:14:18:15 | a1 |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:18:14:18:15 | a1 | T | {EXTERNAL LOCATION} | Int |
+| type_alias.swift:19:14:19:15 | a2 |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:19:14:19:15 | a2 | T | {EXTERNAL LOCATION} | Tuple2 |
+| type_alias.swift:19:14:19:15 | a2 | T.T0 | {EXTERNAL LOCATION} | Bool |
+| type_alias.swift:19:14:19:15 | a2 | T.T1 | {EXTERNAL LOCATION} | Bool |
+| type_alias.swift:20:14:20:15 | a3 |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:20:14:20:15 | a3 | T | {EXTERNAL LOCATION} | Tuple2 |
+| type_alias.swift:20:14:20:15 | a3 | T.T0 | {EXTERNAL LOCATION} | Optional |
+| type_alias.swift:20:14:20:15 | a3 | T.T0.Wrapped | {EXTERNAL LOCATION} | String |
+| type_alias.swift:20:14:20:15 | a3 | T.T1 | {EXTERNAL LOCATION} | Optional |
+| type_alias.swift:20:14:20:15 | a3 | T.T1.Wrapped | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:3:29:3:29 | a |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:3:37:3:37 | b |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:4:6:4:6 | a |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:4:10:4:10 | b |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:4:21:4:21 | a |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:4:39:4:39 | b |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:7:17:7:17 | a |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:7:25:7:25 | b |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:8:6:8:6 | a |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:8:10:8:10 | b |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:8:21:8:21 | a |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:8:39:8:39 | b |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:29:7:29:9 | tag |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:30:7:30:14 | priority |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:32:8:32:10 | tag |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:32:21:32:28 | priority |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:33:5:33:8 | self |  | type_constraints.swift:28:1:44:1 | TaggedItem |
+| type_constraints.swift:33:16:33:18 | tag |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:34:5:34:8 | self |  | type_constraints.swift:28:1:44:1 | TaggedItem |
+| type_constraints.swift:34:21:34:28 | priority |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:38:12:38:14 | tag |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:42:12:42:19 | priority |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:46:48:46:51 | item |  | type_constraints.swift:46:18:46:43 | T |
+| type_constraints.swift:47:10:47:13 | item |  | type_constraints.swift:46:18:46:43 | T |
+| type_constraints.swift:50:30:50:30 | a |  | type_constraints.swift:50:25:50:25 | T |
+| type_constraints.swift:50:38:50:38 | b |  | type_constraints.swift:50:25:50:25 | T |
+| type_constraints.swift:52:10:52:10 | a |  | type_constraints.swift:50:25:50:25 | T |
+| type_constraints.swift:52:15:52:15 | b |  | type_constraints.swift:50:25:50:25 | T |
+| type_constraints.swift:64:7:64:11 | first |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:65:7:65:12 | second |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:67:8:67:12 | first |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:67:18:67:23 | second |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:68:5:68:8 | self |  | type_constraints.swift:63:1:79:1 | SortedPair |
+| type_constraints.swift:68:5:68:8 | self | T | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:68:5:68:8 | self | U | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:68:18:68:22 | first |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:69:5:69:8 | self |  | type_constraints.swift:63:1:79:1 | SortedPair |
+| type_constraints.swift:69:5:69:8 | self | T | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:69:5:69:8 | self | U | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:69:19:69:24 | second |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:72:28:72:32 | other |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:73:12:73:16 | first |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:73:20:73:24 | other |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:76:29:76:33 | other |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:77:12:77:17 | second |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:77:21:77:25 | other |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:96:7:96:11 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:96:7:96:11 | items | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:98:8:98:12 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:98:8:98:12 | items | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:99:5:99:8 | self |  | type_constraints.swift:94:1:105:1 | IntArray |
+| type_constraints.swift:99:18:99:22 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:99:18:99:22 | items | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:103:12:103:16 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:103:12:103:16 | items | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:109:7:109:11 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:109:7:109:11 | items | Element | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:111:8:111:12 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:111:8:111:12 | items | Element | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:112:5:112:8 | self |  | type_constraints.swift:107:1:118:1 | StringArray |
+| type_constraints.swift:112:18:112:22 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:112:18:112:22 | items | Element | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:116:12:116:16 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:116:12:116:16 | items | Element | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:120:45:120:53 | container |  | type_constraints.swift:120:19:120:37 | C |
+| type_constraints.swift:121:10:121:18 | container |  | type_constraints.swift:120:19:120:37 | C |
+| type_constraints.swift:124:45:124:53 | container |  | type_constraints.swift:124:19:124:37 | C |
+| type_constraints.swift:125:10:125:18 | container |  | type_constraints.swift:124:19:124:37 | C |
+| type_constraints.swift:129:28:129:35 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:130:31:130:45 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:138:7:138:11 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:140:8:140:12 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:141:5:141:8 | self |  | type_constraints.swift:137:1:147:1 | Vehicle |
+| type_constraints.swift:141:18:141:22 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:150:17:150:21 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:151:23:151:27 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:164:17:164:21 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:165:23:165:27 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:177:36:177:36 | v |  | type_constraints.swift:177:22:177:31 | T |
+| type_constraints.swift:178:10:178:10 | v |  | type_constraints.swift:177:22:177:31 | T |
+| type_constraints.swift:193:18:193:20 | lhs |  | type_constraints.swift:192:1:194:1 | Summable |
+| type_constraints.swift:193:29:193:31 | rhs |  | type_constraints.swift:192:1:194:1 | Summable |
+| type_constraints.swift:201:7:201:12 | values |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:201:7:201:12 | values | Element | type_constraints.swift:200:20:200:20 | T |
+| type_constraints.swift:203:8:203:13 | values |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:203:8:203:13 | values | Element | type_constraints.swift:200:20:200:20 | T |
+| type_constraints.swift:204:5:204:8 | self |  | type_constraints.swift:200:1:210:1 | Accumulator |
+| type_constraints.swift:204:5:204:8 | self | T | type_constraints.swift:200:20:200:20 | T |
+| type_constraints.swift:204:19:204:24 | values |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:204:19:204:24 | values | Element | type_constraints.swift:200:20:200:20 | T |
+| type_constraints.swift:208:12:208:17 | values |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:208:12:208:17 | values | Element | type_constraints.swift:200:20:200:20 | T |
+| type_constraints.swift:220:35:222:5 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| type_constraints.swift:227:36:227:44 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:236:33:236:37 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:236:33:236:37 | items | Element | type_constraints.swift:236:18:236:28 | T |
+| type_constraints.swift:237:12:237:16 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:237:12:237:16 | items | Element | type_constraints.swift:236:18:236:28 | T |
+| type_constraints.swift:237:23:237:27 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:237:23:237:27 | items | Element | type_constraints.swift:236:18:236:28 | T |
+| type_constraints.swift:240:44:240:44 | a |  | type_constraints.swift:240:14:240:25 | A |
+| type_constraints.swift:240:52:240:52 | b |  | type_constraints.swift:240:28:240:39 | B |
+| type_constraints.swift:247:24:247:32 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:248:24:248:38 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:254:29:254:33 | value |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:254:43:254:47 | lower |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:254:57:254:61 | upper |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:255:6:255:10 | value |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:255:14:255:18 | lower |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:255:29:255:33 | lower |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:256:6:256:10 | value |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:256:14:256:18 | upper |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:256:29:256:33 | upper |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:257:10:257:14 | value |  | type_constraints.swift:254:12:254:24 | T |
+| variance.swift:7:18:7:18 | f |  | {EXTERNAL LOCATION} | Function |
+| variance.swift:7:18:7:18 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| variance.swift:7:18:7:18 | f | Args.T0 | variance.swift:5:1:5:21 | B |
+| variance.swift:7:18:7:18 | f | Args.T0.Tb | variance.swift:7:10:7:11 | T1 |
+| variance.swift:7:18:7:18 | f | Return | variance.swift:3:1:3:14 | A |
+| variance.swift:7:18:7:18 | f | Return.Ta | variance.swift:7:14:7:15 | T2 |
+| variance.swift:11:5:11:7 | lam |  | {EXTERNAL LOCATION} | Function |
+| variance.swift:11:5:11:7 | lam | Args | {EXTERNAL LOCATION} | Tuple1 |
+| variance.swift:11:5:11:7 | lam | Args.T0 | variance.swift:3:1:3:14 | A |
+| variance.swift:11:5:11:7 | lam | Args.T0.Ta | {EXTERNAL LOCATION} | Int |
+| variance.swift:11:5:11:7 | lam | Return | variance.swift:5:1:5:21 | B |
+| variance.swift:11:5:11:7 | lam | Return.Tb | {EXTERNAL LOCATION} | String |
+| variance.swift:11:11:11:53 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| variance.swift:11:11:11:53 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| variance.swift:11:11:11:53 | FunctionExpr | Args.T0 | variance.swift:3:1:3:14 | A |
+| variance.swift:11:11:11:53 | FunctionExpr | Args.T0.Ta | {EXTERNAL LOCATION} | Int |
+| variance.swift:11:11:11:53 | FunctionExpr | Return | variance.swift:5:1:5:21 | B |
+| variance.swift:11:11:11:53 | FunctionExpr | Return.Tb | {EXTERNAL LOCATION} | String |
+| variance.swift:11:14:11:14 | a |  | variance.swift:3:1:3:14 | A |
+| variance.swift:11:14:11:14 | a | Ta | {EXTERNAL LOCATION} | Int |
+| variance.swift:13:16:13:18 | lam |  | {EXTERNAL LOCATION} | Function |
+| variance.swift:13:16:13:18 | lam | Args | {EXTERNAL LOCATION} | Tuple1 |
+| variance.swift:13:16:13:18 | lam | Args.T0 | variance.swift:3:1:3:14 | A |
+| variance.swift:13:16:13:18 | lam | Args.T0.Ta | {EXTERNAL LOCATION} | Int |
+| variance.swift:13:16:13:18 | lam | Return | variance.swift:5:1:5:21 | B |
+| variance.swift:13:16:13:18 | lam | Return.Tb | {EXTERNAL LOCATION} | String |
+| variance.swift:18:7:18:7 | x |  | variance.swift:3:1:3:14 | A |
+| variance.swift:18:7:18:7 | x | Ta | {EXTERNAL LOCATION} | Int |
+inferType
+| accessors.swift:4:7:4:12 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:4:21:4:21 | 0 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:6:27:8:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:7:12:7:17 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:10:30:13:3 | Block |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:11:9:11:13 | value |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:11:17:11:26 | "accessor" |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:12:12:12:16 | value |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:16:9:18:5 | Block |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:17:14:17:19 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:19:9:21:5 | Block |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:20:7:20:12 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:20:7:20:23 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:20:16:20:23 | newValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:25:9:27:5 | Block |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:26:14:26:19 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:28:9:28:13 | value |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:28:16:30:5 | Block |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:29:7:29:12 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:29:7:29:20 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:29:16:29:20 | value |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:34:31:43:1 | Block |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:35:7:35:15 | container |  | accessors.swift:3:1:32:1 | AccessorContainer |
+| accessors.swift:35:19:35:35 | AccessorContainer |  | accessors.swift:3:1:32:1 | AccessorContainer |
+| accessors.swift:35:19:35:37 | AccessorContainer(...) |  | accessors.swift:3:1:32:1 | AccessorContainer |
+| accessors.swift:36:7:36:19 | implicitValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:36:23:36:31 | container |  | accessors.swift:3:1:32:1 | AccessorContainer |
+| accessors.swift:36:23:36:46 | ... .implicitGetter |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:37:7:37:19 | explicitValue |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:37:23:37:31 | container |  | accessors.swift:3:1:32:1 | AccessorContainer |
+| accessors.swift:37:23:37:46 | ... .explicitGetter |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:38:7:38:19 | writableValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:38:23:38:31 | container |  | accessors.swift:3:1:32:1 | AccessorContainer |
+| accessors.swift:38:23:38:40 | ... .writable |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:39:3:39:11 | container |  | accessors.swift:3:1:32:1 | AccessorContainer |
+| accessors.swift:39:3:39:20 | ... .writable |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:39:3:39:25 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:39:24:39:25 | 42 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:40:3:40:11 | container |  | accessors.swift:3:1:32:1 | AccessorContainer |
+| accessors.swift:40:3:40:20 | ... .writable |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:40:3:40:25 | ... += ... |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:40:25:40:25 | 0 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:41:7:41:16 | namedValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:41:20:41:28 | container |  | accessors.swift:3:1:32:1 | AccessorContainer |
+| accessors.swift:41:20:41:40 | ... .namedSetter |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:42:3:42:11 | container |  | accessors.swift:3:1:32:1 | AccessorContainer |
+| accessors.swift:42:3:42:23 | ... .namedSetter |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:42:3:42:28 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:42:27:42:28 | 43 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:48:7:48:14 | observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:48:23:48:23 | 0 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:50:11:50:17 | current |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:50:21:50:28 | observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:51:11:51:18 | incoming |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:51:22:51:29 | newValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:54:11:54:17 | current |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:54:21:54:28 | observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:55:11:55:18 | previous |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:55:22:55:29 | oldValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:59:7:59:20 | namedObservers |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:59:32:59:33 | "" |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:60:13:60:20 | incoming |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:61:11:61:15 | value |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:61:19:61:26 | incoming |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:63:12:63:19 | previous |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:64:11:64:15 | value |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:64:19:64:26 | previous |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:69:31:75:1 | Block |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:70:7:70:15 | container |  | accessors.swift:47:1:67:1 | ObservedProperties |
+| accessors.swift:70:19:70:36 | ObservedProperties |  | accessors.swift:47:1:67:1 | ObservedProperties |
+| accessors.swift:70:19:70:38 | ObservedProperties(...) |  | accessors.swift:47:1:67:1 | ObservedProperties |
+| accessors.swift:71:7:71:14 | observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:71:18:71:26 | container |  | accessors.swift:47:1:67:1 | ObservedProperties |
+| accessors.swift:71:18:71:35 | ... .observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:72:3:72:11 | container |  | accessors.swift:47:1:67:1 | ObservedProperties |
+| accessors.swift:72:3:72:20 | ... .observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:72:3:72:25 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:72:24:72:25 | 42 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:73:7:73:11 | named |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:73:15:73:23 | container |  | accessors.swift:47:1:67:1 | ObservedProperties |
+| accessors.swift:73:15:73:38 | ... .namedObservers |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:74:3:74:11 | container |  | accessors.swift:47:1:67:1 | ObservedProperties |
+| accessors.swift:74:3:74:26 | ... .namedObservers |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:74:3:74:38 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:74:30:74:38 | "updated" |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:80:7:80:12 | stored |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:82:8:82:12 | value |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:82:18:84:3 | Block |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:83:5:83:10 | stored |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:83:5:83:18 | ... = ... |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:83:14:83:18 | value |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:87:9:89:5 | Block |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:88:14:88:19 | stored |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:90:9:92:5 | Block |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:91:7:91:12 | stored |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:91:7:91:23 | ... = ... |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:91:16:91:23 | newValue |  | accessors.swift:79:24:79:24 | T |
+| accessors.swift:95:7:95:14 | observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:95:23:95:23 | 0 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:97:11:97:17 | current |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:97:21:97:28 | observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:98:11:98:18 | previous |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:98:22:98:29 | oldValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:107:11:107:18 | current2 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:107:22:107:25 | self |  | accessors.swift:103:1:111:1 | InheritedAccessors |
+| accessors.swift:107:22:107:34 | ... .observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:108:11:108:18 | previous |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:108:22:108:29 | oldValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:120:7:120:15 | container |  | accessors.swift:79:1:101:1 | GenericAccessors |
+| accessors.swift:120:7:120:15 | container | T | {EXTERNAL LOCATION} | String |
+| accessors.swift:120:19:120:34 | GenericAccessors |  | accessors.swift:79:1:101:1 | GenericAccessors |
+| accessors.swift:120:19:120:34 | GenericAccessors | T | {EXTERNAL LOCATION} | String |
+| accessors.swift:120:19:120:50 | GenericAccessors(...) |  | accessors.swift:79:1:101:1 | GenericAccessors |
+| accessors.swift:120:19:120:50 | GenericAccessors(...) | T | {EXTERNAL LOCATION} | String |
+| accessors.swift:120:43:120:49 | "value" |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:121:7:121:11 | value |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:121:15:121:23 | container |  | accessors.swift:79:1:101:1 | GenericAccessors |
+| accessors.swift:121:15:121:23 | container | T | {EXTERNAL LOCATION} | String |
+| accessors.swift:121:15:121:29 | ... .value |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:122:24:122:32 | container |  | accessors.swift:79:1:101:1 | GenericAccessors |
+| accessors.swift:122:24:122:32 | container | T | {EXTERNAL LOCATION} | String |
+| accessors.swift:123:7:123:15 | inherited |  | accessors.swift:103:1:111:1 | InheritedAccessors |
+| accessors.swift:123:19:123:36 | InheritedAccessors |  | accessors.swift:103:1:111:1 | InheritedAccessors |
+| accessors.swift:123:19:123:47 | InheritedAccessors(...) |  | accessors.swift:103:1:111:1 | InheritedAccessors |
+| accessors.swift:123:45:123:46 | 42 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:124:7:124:20 | inheritedValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:124:24:124:32 | inherited |  | accessors.swift:103:1:111:1 | InheritedAccessors |
+| accessors.swift:124:24:124:38 | ... .value |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:125:7:125:23 | inheritedObserver |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:125:27:125:35 | inherited |  | accessors.swift:103:1:111:1 | InheritedAccessors |
+| accessors.swift:125:27:125:44 | ... .observed |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:135:33:135:37 | value |  | accessors.swift:130:1:133:1 | AccessorRequirements |
+| accessors.swift:135:68:139:1 | Block |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:136:7:136:14 | readOnly |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:136:18:136:22 | value |  | accessors.swift:130:1:133:1 | AccessorRequirements |
+| accessors.swift:136:18:136:31 | ... .readOnly |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:137:7:137:15 | readWrite |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:137:19:137:23 | value |  | accessors.swift:130:1:133:1 | AccessorRequirements |
+| accessors.swift:137:19:137:33 | ... .readWrite |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:138:3:138:7 | value |  | accessors.swift:130:1:133:1 | AccessorRequirements |
+| accessors.swift:138:3:138:17 | ... .readWrite |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:138:3:138:29 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:138:21:138:29 | "updated" |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:143:30:143:40 | Block |  | {EXTERNAL LOCATION} | Function |
+| accessors.swift:143:30:143:40 | Block | Return | {EXTERNAL LOCATION} | String |
+| accessors.swift:143:32:143:38 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| accessors.swift:143:32:143:38 | FunctionExpr | Return | {EXTERNAL LOCATION} | String |
+| accessors.swift:143:34:143:36 | "x" |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:143:34:143:36 | Block |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:146:9:146:14 | result |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:146:18:146:25 | callback |  | {EXTERNAL LOCATION} | Function |
+| accessors.swift:146:18:146:25 | callback | Return | {EXTERNAL LOCATION} | String |
+| accessors.swift:146:18:146:27 | callback(...) |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:147:9:147:15 | result2 |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:147:19:147:22 | self |  | accessors.swift:142:1:149:1 | C |
+| accessors.swift:147:19:147:31 | ... .callback |  | {EXTERNAL LOCATION} | Function |
+| accessors.swift:147:19:147:31 | ... .callback | Return | {EXTERNAL LOCATION} | String |
+| accessors.swift:147:19:147:33 | ... .callback(...) |  | {EXTERNAL LOCATION} | String |
+| accessors.swift:154:14:154:19 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:154:28:154:28 | 0 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:157:9:159:5 | Block |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:158:14:158:19 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:160:9:162:5 | Block |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:161:7:161:12 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:161:7:161:23 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:161:16:161:23 | newValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:166:28:169:1 | Block |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:167:7:167:11 | value |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:167:15:167:35 | ... .value |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:168:3:168:23 | ... .value |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:168:3:168:28 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:168:27:168:28 | 42 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:172:14:172:19 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:172:28:172:28 | 0 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:175:9:177:5 | Block |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:176:14:176:19 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:178:9:180:5 | Block |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:179:7:179:12 | stored |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:179:7:179:23 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:179:16:179:23 | newValue |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:184:27:187:1 | Block |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:185:7:185:11 | value |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:185:15:185:34 | ... .value |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:186:3:186:22 | ... .value |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:186:3:186:27 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:186:26:186:27 | 42 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:191:17:191:22 | Block |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:191:19:191:20 | 42 |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:192:5:192:5 | x |  | {EXTERNAL LOCATION} | Int |
+| accessors.swift:192:9:192:14 | answer |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:1:5:1:16 | topLevelDecl |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:1:25:1:25 | 0 |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:2:1:2:1 | 0 |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:3:1:3:12 | topLevelDecl |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:3:1:3:16 | ... + ... |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:3:16:3:16 | 1 |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:6:7:6:11 | myInt |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:7:8:7:8 | n |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:7:16:9:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:8:5:8:9 | myInt |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:8:5:8:13 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:8:13:8:13 | n |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:11:26:13:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:12:12:12:16 | myInt |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:17:10:19:3 | Block |  | basics.swift:5:1:14:1 | C |
+| basics.swift:18:5:18:9 | super |  | basics.swift:5:1:14:1 | C |
+| basics.swift:18:5:18:20 | ... .init(...) |  | basics.swift:5:1:14:1 | C |
+| basics.swift:18:19:18:19 | 0 |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:21:30:24:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:22:9:22:9 | x |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:22:13:22:22 | getMyInt(...) |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:23:12:23:12 | x |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:28:7:28:11 | value |  | basics.swift:27:15:27:15 | T |
+| basics.swift:29:8:29:8 | v |  | basics.swift:27:15:27:15 | T |
+| basics.swift:29:14:31:3 | Block |  | basics.swift:27:15:27:15 | T |
+| basics.swift:30:5:30:9 | value |  | basics.swift:27:15:27:15 | T |
+| basics.swift:30:5:30:13 | ... = ... |  | basics.swift:27:15:27:15 | T |
+| basics.swift:30:13:30:13 | v |  | basics.swift:27:15:27:15 | T |
+| basics.swift:33:24:35:3 | Block |  | basics.swift:27:15:27:15 | T |
+| basics.swift:34:12:34:16 | value |  | basics.swift:27:15:27:15 | T |
+| basics.swift:39:10:41:3 | Block |  | basics.swift:27:1:36:1 | Generic |
+| basics.swift:39:10:41:3 | Block | T | {EXTERNAL LOCATION} | Int |
+| basics.swift:40:5:40:9 | super |  | basics.swift:27:1:36:1 | Generic |
+| basics.swift:40:5:40:9 | super | T | {EXTERNAL LOCATION} | Int |
+| basics.swift:40:5:40:20 | ... .init(...) |  | basics.swift:27:1:36:1 | Generic |
+| basics.swift:40:5:40:20 | ... .init(...) | T | {EXTERNAL LOCATION} | Int |
+| basics.swift:40:19:40:19 | 0 |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:45:7:45:7 | g |  | basics.swift:27:1:36:1 | Generic |
+| basics.swift:45:7:45:7 | g | T | {EXTERNAL LOCATION} | Int |
+| basics.swift:45:11:45:17 | Generic |  | basics.swift:27:1:36:1 | Generic |
+| basics.swift:45:11:45:17 | Generic | T | {EXTERNAL LOCATION} | Int |
+| basics.swift:45:11:45:24 | Generic(...) |  | basics.swift:27:1:36:1 | Generic |
+| basics.swift:45:11:45:24 | Generic(...) | T | {EXTERNAL LOCATION} | Int |
+| basics.swift:45:22:45:23 | 42 |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:46:7:46:7 | x |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:46:11:46:11 | g |  | basics.swift:27:1:36:1 | Generic |
+| basics.swift:46:11:46:11 | g | T | {EXTERNAL LOCATION} | Int |
+| basics.swift:46:11:46:22 | ... .getValue(...) |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:48:7:48:8 | gd |  | basics.swift:38:1:42:1 | GenericDerived |
+| basics.swift:48:12:48:25 | GenericDerived |  | basics.swift:38:1:42:1 | GenericDerived |
+| basics.swift:48:12:48:27 | GenericDerived(...) |  | basics.swift:38:1:42:1 | GenericDerived |
+| basics.swift:49:7:49:7 | y |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:49:11:49:12 | gd |  | basics.swift:38:1:42:1 | GenericDerived |
+| basics.swift:49:11:49:23 | ... .getValue(...) |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:55:25:57:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:56:12:56:16 | myInt |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:56:12:56:20 | ... * ... |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:56:20:56:20 | 2 |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:61:7:61:9 | obj |  | basics.swift:5:1:14:1 | C |
+| basics.swift:61:13:61:13 | C |  | basics.swift:5:1:14:1 | C |
+| basics.swift:61:13:61:20 | C(...) |  | basics.swift:5:1:14:1 | C |
+| basics.swift:61:18:61:19 | 10 |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:62:7:62:7 | d |  | {EXTERNAL LOCATION} | Int |
+| basics.swift:62:11:62:13 | obj |  | basics.swift:5:1:14:1 | C |
+| basics.swift:62:11:62:23 | ... .doubled(...) |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:4:22:4:22 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:4:37:6:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:5:12:5:12 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:5:12:5:16 | ... * ... |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:5:16:5:16 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:8:19:8:19 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:8:34:10:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:9:12:9:12 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:9:12:9:16 | ... * ... |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:9:12:9:20 | ... * ... |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:9:16:9:16 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:9:20:9:20 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:14:7:14:7 | s |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:14:11:14:32 | ... .square(...) |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:14:31:14:31 | 4 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:15:7:15:8 | cu |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:15:12:15:31 | ... .cube(...) |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:15:30:15:30 | 3 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:21:18:21:18 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:21:33:23:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:22:12:22:12 | x |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:22:12:22:16 | ... + ... |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:22:16:22:16 | 1 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:25:18:25:18 | s |  | {EXTERNAL LOCATION} | String |
+| classes.swift:25:39:27:3 | Block |  | {EXTERNAL LOCATION} | String |
+| classes.swift:26:12:26:12 | s |  | {EXTERNAL LOCATION} | String |
+| classes.swift:31:7:31:7 | o |  | classes.swift:20:1:28:1 | Overloaded |
+| classes.swift:31:11:31:20 | Overloaded |  | classes.swift:20:1:28:1 | Overloaded |
+| classes.swift:31:11:31:22 | Overloaded(...) |  | classes.swift:20:1:28:1 | Overloaded |
+| classes.swift:32:7:32:8 | r1 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:32:7:32:8 | r1 |  | {EXTERNAL LOCATION} | String |
+| classes.swift:32:12:32:12 | o |  | classes.swift:20:1:28:1 | Overloaded |
+| classes.swift:32:12:32:24 | ... .process(...) |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:32:12:32:24 | ... .process(...) |  | {EXTERNAL LOCATION} | String |
+| classes.swift:32:22:32:23 | 42 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:33:7:33:8 | r2 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:33:7:33:8 | r2 |  | {EXTERNAL LOCATION} | String |
+| classes.swift:33:12:33:12 | o |  | classes.swift:20:1:28:1 | Overloaded |
+| classes.swift:33:12:33:29 | ... .process(...) |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:33:12:33:29 | ... .process(...) |  | {EXTERNAL LOCATION} | String |
+| classes.swift:33:22:33:28 | "hello" |  | {EXTERNAL LOCATION} | String |
+| classes.swift:39:7:39:10 | data |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:39:7:39:10 | data | Element | {EXTERNAL LOCATION} | Array |
+| classes.swift:39:7:39:10 | data | Element.Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:41:8:41:11 | data |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:41:8:41:11 | data | Element | {EXTERNAL LOCATION} | Array |
+| classes.swift:41:8:41:11 | data | Element.Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:41:23:43:3 | Block |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:41:23:43:3 | Block | Element | {EXTERNAL LOCATION} | Array |
+| classes.swift:41:23:43:3 | Block | Element.Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:42:5:42:8 | self |  | classes.swift:38:1:48:1 | Matrix |
+| classes.swift:42:5:42:13 | ... .data |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:42:5:42:13 | ... .data | Element | {EXTERNAL LOCATION} | Array |
+| classes.swift:42:5:42:13 | ... .data | Element.Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:42:5:42:20 | ... = ... |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:42:5:42:20 | ... = ... | Element | {EXTERNAL LOCATION} | Array |
+| classes.swift:42:5:42:20 | ... = ... | Element.Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:42:17:42:20 | data |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:42:17:42:20 | data | Element | {EXTERNAL LOCATION} | Array |
+| classes.swift:42:17:42:20 | data | Element.Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:46:12:46:15 | data |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:46:12:46:15 | data | Element | {EXTERNAL LOCATION} | Array |
+| classes.swift:46:12:46:15 | data | Element.Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:51:7:51:7 | m |  | classes.swift:38:1:48:1 | Matrix |
+| classes.swift:51:11:51:16 | Matrix |  | classes.swift:38:1:48:1 | Matrix |
+| classes.swift:51:11:51:40 | Matrix(...) |  | classes.swift:38:1:48:1 | Matrix |
+| classes.swift:51:24:51:39 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:51:24:51:39 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Array |
+| classes.swift:51:24:51:39 | ArrayLiteral | Element.Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:51:25:51:30 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:51:25:51:30 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:51:26:51:26 | 1 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:51:29:51:29 | 2 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:51:33:51:38 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| classes.swift:51:33:51:38 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| classes.swift:51:34:51:34 | 3 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:51:37:51:37 | 4 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:52:7:52:8 | rc |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:52:12:52:12 | m |  | classes.swift:38:1:48:1 | Matrix |
+| classes.swift:52:12:52:23 | ... .rowCount(...) |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:59:9:59:13 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:61:10:61:14 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:61:22:63:5 | Block |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:62:7:62:10 | self |  | classes.swift:58:3:68:3 | Inner |
+| classes.swift:62:7:62:16 | ... .value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:62:7:62:24 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:62:20:62:24 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:65:28:67:5 | Block |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:66:14:66:17 | self |  | classes.swift:58:3:68:3 | Inner |
+| classes.swift:66:14:66:23 | ... .value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:72:7:72:11 | inner |  | classes.swift:58:3:68:3 | Inner |
+| classes.swift:72:15:72:25 | ... .Inner |  | classes.swift:58:3:68:3 | Inner |
+| classes.swift:72:15:72:36 | ... .Inner(...) |  | classes.swift:58:3:68:3 | Inner |
+| classes.swift:72:34:72:35 | 99 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:73:7:73:7 | v |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:73:11:73:15 | inner |  | classes.swift:58:3:68:3 | Inner |
+| classes.swift:73:11:73:26 | ... .getValue(...) |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:79:7:79:11 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:79:20:79:20 | 0 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:81:14:81:14 | v |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:81:33:84:3 | Block |  | classes.swift:78:1:94:1 | Builder |
+| classes.swift:82:5:82:9 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:82:5:82:13 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:82:13:82:13 | v |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:83:12:83:15 | self |  | classes.swift:78:1:94:1 | Builder |
+| classes.swift:86:14:86:14 | v |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:86:33:89:3 | Block |  | classes.swift:78:1:94:1 | Builder |
+| classes.swift:87:5:87:9 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:87:5:87:14 | ... += ... |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:87:14:87:14 | v |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:88:12:88:15 | self |  | classes.swift:78:1:94:1 | Builder |
+| classes.swift:91:23:93:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:92:12:92:16 | value |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:97:7:97:7 | b |  | classes.swift:78:1:94:1 | Builder |
+| classes.swift:97:11:97:17 | Builder |  | classes.swift:78:1:94:1 | Builder |
+| classes.swift:97:11:97:19 | Builder(...) |  | classes.swift:78:1:94:1 | Builder |
+| classes.swift:98:7:98:12 | result |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:98:16:98:16 | b |  | classes.swift:78:1:94:1 | Builder |
+| classes.swift:98:16:98:24 | ... .set(...) |  | classes.swift:78:1:94:1 | Builder |
+| classes.swift:98:16:98:31 | ... .add(...) |  | classes.swift:78:1:94:1 | Builder |
+| classes.swift:98:16:98:39 | ... .build(...) |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:98:22:98:23 | 10 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:98:30:98:30 | 5 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:104:14:104:20 | retries |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:104:29:104:29 | 3 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:104:32:104:38 | timeout |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:104:50:104:53 | 30.0 |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:104:63:106:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:105:12:105:18 | retries |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:110:7:110:9 | cfg |  | classes.swift:103:1:107:1 | Config |
+| classes.swift:110:13:110:18 | Config |  | classes.swift:103:1:107:1 | Config |
+| classes.swift:110:13:110:20 | Config(...) |  | classes.swift:103:1:107:1 | Config |
+| classes.swift:111:7:111:8 | r1 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:111:12:111:14 | cfg |  | classes.swift:103:1:107:1 | Config |
+| classes.swift:111:12:111:22 | ... .setup(...) |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:112:7:112:8 | r2 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:112:12:112:14 | cfg |  | classes.swift:103:1:107:1 | Config |
+| classes.swift:112:12:112:32 | ... .setup(...) |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:112:31:112:31 | 5 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:113:7:113:8 | r3 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:113:12:113:14 | cfg |  | classes.swift:103:1:107:1 | Config |
+| classes.swift:113:12:113:47 | ... .setup(...) |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:113:31:113:31 | 2 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:113:43:113:46 | 60.0 |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:119:7:119:13 | celsius |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:121:8:121:14 | celsius |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:121:25:123:3 | Block |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:122:5:122:8 | self |  | classes.swift:118:1:132:1 | Temperature |
+| classes.swift:122:5:122:16 | ... .celsius |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:122:5:122:26 | ... = ... |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:122:20:122:26 | celsius |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:125:30:127:3 | Block |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:126:12:126:18 | celsius |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:129:33:131:3 | Block |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:130:12:130:18 | celsius |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:130:12:130:24 | ... * ... |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:130:12:130:30 | ... / ... |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:130:12:130:37 | ... + ... |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:130:22:130:24 | 9.0 |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:130:28:130:30 | 5.0 |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:130:34:130:37 | 32.0 |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:135:7:135:7 | t |  | classes.swift:118:1:132:1 | Temperature |
+| classes.swift:135:11:135:21 | Temperature |  | classes.swift:118:1:132:1 | Temperature |
+| classes.swift:135:11:135:37 | Temperature(...) |  | classes.swift:118:1:132:1 | Temperature |
+| classes.swift:135:32:135:36 | 100.0 |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:136:7:136:7 | c |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:136:11:136:11 | t |  | classes.swift:118:1:132:1 | Temperature |
+| classes.swift:136:11:136:23 | ... .toCelsius(...) |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:137:7:137:7 | f |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:137:11:137:11 | t |  | classes.swift:118:1:132:1 | Temperature |
+| classes.swift:137:11:137:26 | ... .toFahrenheit(...) |  | {EXTERNAL LOCATION} | Double |
+| classes.swift:143:26:145:3 | Block |  | {EXTERNAL LOCATION} | String |
+| classes.swift:144:12:144:16 | "..." |  | {EXTERNAL LOCATION} | String |
+| classes.swift:149:19:151:3 | Block |  | classes.swift:142:1:146:1 | Animal |
+| classes.swift:150:5:150:9 | super |  | classes.swift:142:1:146:1 | Animal |
+| classes.swift:150:5:150:16 | ... .init(...) |  | classes.swift:142:1:146:1 | Animal |
+| classes.swift:153:35:155:3 | Block |  | {EXTERNAL LOCATION} | String |
+| classes.swift:154:12:154:17 | "Woof" |  | {EXTERNAL LOCATION} | String |
+| classes.swift:157:26:159:3 | Block |  | {EXTERNAL LOCATION} | String |
+| classes.swift:158:12:158:17 | "ball" |  | {EXTERNAL LOCATION} | String |
+| classes.swift:163:19:165:3 | Block |  | classes.swift:142:1:146:1 | Animal |
+| classes.swift:164:5:164:9 | super |  | classes.swift:142:1:146:1 | Animal |
+| classes.swift:164:5:164:16 | ... .init(...) |  | classes.swift:142:1:146:1 | Animal |
+| classes.swift:167:35:169:3 | Block |  | {EXTERNAL LOCATION} | String |
+| classes.swift:168:12:168:17 | "Meow" |  | {EXTERNAL LOCATION} | String |
+| classes.swift:173:7:173:7 | d |  | classes.swift:148:1:160:1 | Dog |
+| classes.swift:173:11:173:13 | Dog |  | classes.swift:148:1:160:1 | Dog |
+| classes.swift:173:11:173:15 | Dog(...) |  | classes.swift:148:1:160:1 | Dog |
+| classes.swift:174:7:174:8 | ds |  | {EXTERNAL LOCATION} | String |
+| classes.swift:174:12:174:12 | d |  | classes.swift:148:1:160:1 | Dog |
+| classes.swift:174:12:174:20 | ... .speak(...) |  | {EXTERNAL LOCATION} | String |
+| classes.swift:175:7:175:8 | df |  | {EXTERNAL LOCATION} | String |
+| classes.swift:175:12:175:12 | d |  | classes.swift:148:1:160:1 | Dog |
+| classes.swift:175:12:175:20 | ... .fetch(...) |  | {EXTERNAL LOCATION} | String |
+| classes.swift:177:7:177:8 | ct |  | classes.swift:162:1:170:1 | Cat |
+| classes.swift:177:12:177:14 | Cat |  | classes.swift:162:1:170:1 | Cat |
+| classes.swift:177:12:177:16 | Cat(...) |  | classes.swift:162:1:170:1 | Cat |
+| classes.swift:178:7:178:8 | cs |  | {EXTERNAL LOCATION} | String |
+| classes.swift:178:12:178:13 | ct |  | classes.swift:162:1:170:1 | Cat |
+| classes.swift:178:12:178:21 | ... .speak(...) |  | {EXTERNAL LOCATION} | String |
+| classes.swift:184:7:184:11 | count |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:184:20:184:20 | 0 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:186:29:188:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:187:5:187:9 | count |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:187:5:187:14 | ... += ... |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:187:14:187:14 | 1 |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:190:26:192:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:191:12:191:16 | count |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:196:7:196:9 | ctr |  | classes.swift:183:1:193:1 | Counter |
+| classes.swift:196:13:196:19 | Counter |  | classes.swift:183:1:193:1 | Counter |
+| classes.swift:196:13:196:21 | Counter(...) |  | classes.swift:183:1:193:1 | Counter |
+| classes.swift:197:3:197:5 | ctr |  | classes.swift:183:1:193:1 | Counter |
+| classes.swift:198:7:198:9 | val |  | {EXTERNAL LOCATION} | Int |
+| classes.swift:198:13:198:15 | ctr |  | classes.swift:183:1:193:1 | Counter |
+| classes.swift:198:13:198:26 | ... .getCount(...) |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:1:32:7:1 | Block |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:2:9:2:14 | addOne |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:2:9:2:14 | addOne | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:2:9:2:14 | addOne | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:2:9:2:14 | addOne | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:2:18:4:5 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:2:18:4:5 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:2:18:4:5 | FunctionExpr | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:2:18:4:5 | FunctionExpr | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:2:20:2:24 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:3:9:3:13 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:3:9:3:17 | ... + ... |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:3:9:3:17 | Block |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:3:17:3:17 | 1 |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:5:9:5:14 | result |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:5:18:5:23 | addOne |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:5:18:5:23 | addOne | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:5:18:5:23 | addOne | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:5:18:5:23 | addOne | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:5:18:5:27 | addOne(...) |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:5:25:5:26 | 41 |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:6:5:6:5 | _ |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:6:5:6:14 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:6:9:6:14 | result |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:9:28:9:35 | callback |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:9:28:9:35 | callback | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:9:28:9:35 | callback | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:9:28:9:35 | callback | Return | {EXTERNAL LOCATION} | String |
+| closures.swift:9:65:11:1 | Block |  | {EXTERNAL LOCATION} | String |
+| closures.swift:10:5:10:12 | callback |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:10:5:10:12 | callback | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:10:5:10:12 | callback | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:10:5:10:12 | callback | Return | {EXTERNAL LOCATION} | String |
+| closures.swift:10:5:10:16 | callback(...) |  | {EXTERNAL LOCATION} | String |
+| closures.swift:10:14:10:15 | 42 |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:13:36:13:43 | callback |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:13:36:13:43 | callback | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:13:36:13:43 | callback | Args.T0 | closures.swift:13:30:13:31 | T1 |
+| closures.swift:13:36:13:43 | callback | Return | {EXTERNAL LOCATION} | Tuple0 |
+| closures.swift:13:62:13:64 | arg |  | closures.swift:13:30:13:31 | T1 |
+| closures.swift:13:77:16:1 | Block |  | closures.swift:13:30:13:31 | T1 |
+| closures.swift:14:5:14:12 | callback |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:14:5:14:12 | callback | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:14:5:14:12 | callback | Args.T0 | closures.swift:13:30:13:31 | T1 |
+| closures.swift:14:5:14:12 | callback | Return | {EXTERNAL LOCATION} | Tuple0 |
+| closures.swift:14:5:14:17 | callback(...) |  | {EXTERNAL LOCATION} | Tuple0 |
+| closures.swift:14:14:14:16 | arg |  | closures.swift:13:30:13:31 | T1 |
+| closures.swift:15:12:15:14 | arg |  | closures.swift:13:30:13:31 | T1 |
+| closures.swift:18:32:29:1 | Block |  | {EXTERNAL LOCATION} | Bool |
+| closures.swift:19:9:19:14 | result |  | {EXTERNAL LOCATION} | String |
+| closures.swift:19:18:21:5 | callWithIntCallback(...) |  | {EXTERNAL LOCATION} | String |
+| closures.swift:19:38:21:5 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:19:38:21:5 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:19:38:21:5 | FunctionExpr | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:19:38:21:5 | FunctionExpr | Return | {EXTERNAL LOCATION} | String |
+| closures.swift:19:40:19:44 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:20:9:20:14 | String |  | {EXTERNAL LOCATION} | String |
+| closures.swift:20:9:20:21 | Block |  | {EXTERNAL LOCATION} | String |
+| closures.swift:20:9:20:21 | String(...) |  | {EXTERNAL LOCATION} | String |
+| closures.swift:20:16:20:20 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:22:5:22:5 | _ |  | {EXTERNAL LOCATION} | String |
+| closures.swift:22:5:22:14 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| closures.swift:22:9:22:14 | result |  | {EXTERNAL LOCATION} | String |
+| closures.swift:24:9:24:21 | genericResult |  | {EXTERNAL LOCATION} | Bool |
+| closures.swift:24:25:27:17 | callWithGenericCallback(...) |  | {EXTERNAL LOCATION} | Bool |
+| closures.swift:25:9:27:9 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:25:9:27:9 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:25:9:27:9 | FunctionExpr | Args.T0 | {EXTERNAL LOCATION} | Bool |
+| closures.swift:25:11:25:15 | value |  | {EXTERNAL LOCATION} | Bool |
+| closures.swift:27:12:27:16 | false |  | {EXTERNAL LOCATION} | Bool |
+| closures.swift:28:5:28:5 | _ |  | {EXTERNAL LOCATION} | Bool |
+| closures.swift:28:5:28:21 | ... = ... |  | {EXTERNAL LOCATION} | Bool |
+| closures.swift:28:9:28:21 | genericResult |  | {EXTERNAL LOCATION} | Bool |
+| closures.swift:32:9:32:9 | f |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:32:9:32:9 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:32:9:32:9 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:32:9:32:9 | f | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:34:14:34:18 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:34:33:36:5 | Block |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:35:16:35:16 | 0 |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:38:9:38:10 | f2 |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:38:9:38:10 | f2 | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:38:9:38:10 | f2 | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:38:9:38:10 | f2 | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:40:10:40:10 | f |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:40:10:40:10 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:40:10:40:10 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:40:10:40:10 | f | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:40:37:43:5 | Block |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:40:37:43:5 | Block | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:40:37:43:5 | Block | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:40:37:43:5 | Block | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:41:9:41:12 | self |  | closures.swift:31:1:50:1 | ClosureField |
+| closures.swift:41:9:41:14 | ... .f |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:41:9:41:14 | ... .f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:41:9:41:14 | ... .f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:41:9:41:14 | ... .f | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:41:9:41:18 | ... = ... |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:41:9:41:18 | ... = ... | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:41:9:41:18 | ... = ... | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:41:9:41:18 | ... = ... | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:41:18:41:18 | f |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:41:18:41:18 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:41:18:41:18 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:41:18:41:18 | f | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:42:9:42:12 | self |  | closures.swift:31:1:50:1 | ClosureField |
+| closures.swift:42:9:42:15 | ... .f2 |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:42:9:42:15 | ... .f2 | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:42:9:42:15 | ... .f2 | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:42:9:42:15 | ... .f2 | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:42:9:42:19 | ... = ... |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:42:9:42:19 | ... = ... | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:42:9:42:19 | ... = ... | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:42:9:42:19 | ... = ... | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:42:19:42:19 | f |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:42:19:42:19 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:42:19:42:19 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:42:19:42:19 | f | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:45:24:45:28 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:45:43:49:5 | Block |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:47:9:47:12 | self |  | closures.swift:31:1:50:1 | ClosureField |
+| closures.swift:47:9:47:14 | ... .f |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:47:9:47:14 | ... .f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:47:9:47:14 | ... .f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:47:9:47:14 | ... .f | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:47:9:47:21 | ... .f(...) |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:47:16:47:20 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:48:16:48:19 | self |  | closures.swift:31:1:50:1 | ClosureField |
+| closures.swift:48:16:48:22 | ... .f2 |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:48:16:48:22 | ... .f2 | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:48:16:48:22 | ... .f2 | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:48:16:48:22 | ... .f2 | Return | {EXTERNAL LOCATION} | Int |
+| closures.swift:48:16:48:29 | ... .f2(...) |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:48:24:48:28 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:53:9:53:15 | numbers |  | {EXTERNAL LOCATION} | Array |
+| closures.swift:53:9:53:15 | numbers | Element | {EXTERNAL LOCATION} | Int |
+| closures.swift:53:19:53:27 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| closures.swift:53:19:53:27 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| closures.swift:53:20:53:20 | 1 |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:53:23:53:23 | 2 |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:53:26:53:26 | 3 |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:55:9:55:15 | strings |  | {EXTERNAL LOCATION} | Array |
+| closures.swift:55:9:55:15 | strings | Element | {EXTERNAL LOCATION} | String |
+| closures.swift:55:19:55:25 | numbers |  | {EXTERNAL LOCATION} | Array |
+| closures.swift:55:19:55:25 | numbers | Element | {EXTERNAL LOCATION} | Int |
+| closures.swift:55:19:57:5 | ... .map(...) |  | {EXTERNAL LOCATION} | Array |
+| closures.swift:55:19:57:5 | ... .map(...) | Element | {EXTERNAL LOCATION} | String |
+| closures.swift:55:31:57:5 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:55:31:57:5 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:55:31:57:5 | FunctionExpr | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:55:31:57:5 | FunctionExpr | Return | {EXTERNAL LOCATION} | String |
+| closures.swift:55:33:55:33 | x |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:56:9:56:14 | String |  | {EXTERNAL LOCATION} | String |
+| closures.swift:56:9:56:17 | Block |  | {EXTERNAL LOCATION} | String |
+| closures.swift:56:9:56:17 | String(...) |  | {EXTERNAL LOCATION} | String |
+| closures.swift:56:16:56:16 | x |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:60:22:60:29 | callback |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:60:22:60:29 | callback | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:60:22:60:29 | callback | Args.T0 | closures.swift:60:12:60:13 | T1 |
+| closures.swift:60:22:60:29 | callback | Return | closures.swift:60:16:60:17 | T2 |
+| closures.swift:60:46:60:48 | arg |  | closures.swift:60:12:60:13 | T1 |
+| closures.swift:60:61:62:1 | Block |  | closures.swift:60:16:60:17 | T2 |
+| closures.swift:61:5:61:12 | callback |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:61:5:61:12 | callback | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:61:5:61:12 | callback | Args.T0 | closures.swift:60:12:60:13 | T1 |
+| closures.swift:61:5:61:12 | callback | Return | closures.swift:60:16:60:17 | T2 |
+| closures.swift:61:5:61:17 | callback(...) |  | closures.swift:60:16:60:17 | T2 |
+| closures.swift:61:14:61:16 | arg |  | closures.swift:60:12:60:13 | T1 |
+| closures.swift:64:18:70:1 | Block |  | {EXTERNAL LOCATION} | String |
+| closures.swift:65:9:65:14 | result |  | {EXTERNAL LOCATION} | String |
+| closures.swift:65:18:68:14 | apply(...) |  | {EXTERNAL LOCATION} | String |
+| closures.swift:66:9:68:9 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| closures.swift:66:9:68:9 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| closures.swift:66:9:68:9 | FunctionExpr | Args.T0 | {EXTERNAL LOCATION} | Int |
+| closures.swift:66:9:68:9 | FunctionExpr | Return | {EXTERNAL LOCATION} | String |
+| closures.swift:66:11:66:15 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:67:13:67:18 | String |  | {EXTERNAL LOCATION} | String |
+| closures.swift:67:13:67:25 | Block |  | {EXTERNAL LOCATION} | String |
+| closures.swift:67:13:67:25 | String(...) |  | {EXTERNAL LOCATION} | String |
+| closures.swift:67:20:67:24 | value |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:68:12:68:13 | 42 |  | {EXTERNAL LOCATION} | Int |
+| closures.swift:69:5:69:5 | _ |  | {EXTERNAL LOCATION} | String |
+| closures.swift:69:5:69:14 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| closures.swift:69:9:69:14 | result |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:2:12:2:12 | x |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:4:24:6:5 | Block |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:5:9:5:12 | self |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:5:9:5:20 | ... .init(...) |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:5:19:5:19 | 0 |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:9:5:9:7 | c11 |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:9:11:9:12 | C1 |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:9:11:9:14 | C1(...) |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:10:5:10:7 | c12 |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:10:11:10:12 | C1 |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:10:11:10:19 | ... .init(...) |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:14:5:14:7 | c21 |  | constructors.swift:12:1:12:15 | C2 |
+| constructors.swift:14:11:14:12 | C2 |  | constructors.swift:12:1:12:15 | C2 |
+| constructors.swift:14:11:14:14 | C2(...) |  | constructors.swift:12:1:12:15 | C2 |
+| constructors.swift:15:5:15:7 | c22 |  | constructors.swift:12:1:12:15 | C2 |
+| constructors.swift:15:11:15:12 | C2 |  | constructors.swift:12:1:12:15 | C2 |
+| constructors.swift:15:11:15:19 | ... .init(...) |  | constructors.swift:12:1:12:15 | C2 |
+| constructors.swift:21:5:21:6 | c3 |  | constructors.swift:17:1:19:1 | C3 |
+| constructors.swift:21:10:21:11 | C3 |  | constructors.swift:17:1:19:1 | C3 |
+| constructors.swift:21:10:21:13 | C3(...) |  | constructors.swift:17:1:19:1 | C3 |
+| constructors.swift:24:12:24:12 | x |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:24:20:26:5 | Block |  | constructors.swift:17:1:19:1 | C3 |
+| constructors.swift:25:9:25:13 | super |  | constructors.swift:17:1:19:1 | C3 |
+| constructors.swift:25:9:25:20 | ... .init(...) |  | constructors.swift:17:1:19:1 | C3 |
+| constructors.swift:28:33:30:5 | Block |  | constructors.swift:23:1:31:1 | C4 |
+| constructors.swift:29:9:29:12 | self |  | constructors.swift:23:1:31:1 | C4 |
+| constructors.swift:29:9:29:20 | ... .init(...) |  | constructors.swift:23:1:31:1 | C4 |
+| constructors.swift:29:19:29:19 | 0 |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:35:5:35:7 | c51 |  | constructors.swift:33:1:33:15 | C5 |
+| constructors.swift:35:11:35:12 | C5 |  | constructors.swift:33:1:33:15 | C5 |
+| constructors.swift:35:11:35:14 | C5(...) |  | constructors.swift:33:1:33:15 | C5 |
+| constructors.swift:36:5:36:7 | c52 |  | constructors.swift:33:1:33:15 | C5 |
+| constructors.swift:36:11:36:12 | C5 |  | constructors.swift:33:1:33:15 | C5 |
+| constructors.swift:36:11:36:15 | C5(...) |  | constructors.swift:33:1:33:15 | C5 |
+| constructors.swift:36:14:36:14 | 0 |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:39:10:39:10 | x |  | constructors.swift:38:10:38:11 | T1 |
+| constructors.swift:39:17:39:17 | y |  | constructors.swift:38:14:38:15 | T2 |
+| constructors.swift:41:18:41:18 | s |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:43:22:43:22 | x |  | constructors.swift:38:10:38:11 | T1 |
+| constructors.swift:44:20:44:60 | "Convenience initializer not implemented" |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:50:5:50:7 | c71 |  | constructors.swift:48:1:48:31 | C7 |
+| constructors.swift:50:5:50:7 | c71 | T3 | {EXTERNAL LOCATION} | Bool |
+| constructors.swift:50:5:50:7 | c71 | T4 | {EXTERNAL LOCATION} | String |
+| constructors.swift:50:11:50:12 | C7 |  | constructors.swift:48:1:48:31 | C7 |
+| constructors.swift:50:11:50:12 | C7 | T3 | {EXTERNAL LOCATION} | Bool |
+| constructors.swift:50:11:50:12 | C7 | T4 | {EXTERNAL LOCATION} | String |
+| constructors.swift:50:11:50:34 | C7(...) |  | constructors.swift:48:1:48:31 | C7 |
+| constructors.swift:50:11:50:34 | C7(...) | T3 | {EXTERNAL LOCATION} | Bool |
+| constructors.swift:50:11:50:34 | C7(...) | T4 | {EXTERNAL LOCATION} | String |
+| constructors.swift:50:17:50:24 | "string" |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:50:30:50:33 | true |  | {EXTERNAL LOCATION} | Bool |
+| constructors.swift:51:5:51:7 | c72 |  | constructors.swift:48:1:48:31 | C7 |
+| constructors.swift:51:5:51:7 | c72 | T3 | {EXTERNAL LOCATION} | Bool |
+| constructors.swift:51:5:51:7 | c72 | T4 | {EXTERNAL LOCATION} | Int |
+| constructors.swift:51:11:51:21 | GenericTypeExpr |  | constructors.swift:48:1:48:31 | C7 |
+| constructors.swift:51:11:51:21 | GenericTypeExpr | T3 | {EXTERNAL LOCATION} | Bool |
+| constructors.swift:51:11:51:21 | GenericTypeExpr | T4 | {EXTERNAL LOCATION} | Int |
+| constructors.swift:51:11:51:27 | ...(...) |  | constructors.swift:48:1:48:31 | C7 |
+| constructors.swift:51:11:51:27 | ...(...) | T3 | {EXTERNAL LOCATION} | Bool |
+| constructors.swift:51:11:51:27 | ...(...) | T4 | {EXTERNAL LOCATION} | Int |
+| constructors.swift:51:26:51:26 | 0 |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:54:22:54:22 | x |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:54:33:56:5 | Block |  | constructors.swift:53:1:57:1 | C8 |
+| constructors.swift:55:9:55:12 | self |  | constructors.swift:53:1:57:1 | C8 |
+| constructors.swift:55:9:55:29 | ... .init(...) |  | constructors.swift:53:1:57:1 | C8 |
+| constructors.swift:55:22:55:22 | x |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:55:28:55:28 | 0 |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:61:5:61:7 | c91 |  | constructors.swift:59:1:59:19 | C9 |
+| constructors.swift:61:5:61:7 | c91 | T9 | {EXTERNAL LOCATION} | Int |
+| constructors.swift:61:20:61:21 | C9 |  | constructors.swift:59:1:59:19 | C9 |
+| constructors.swift:61:20:61:21 | C9 | T9 | {EXTERNAL LOCATION} | Int |
+| constructors.swift:61:20:61:28 | C9(...) |  | constructors.swift:59:1:59:19 | C9 |
+| constructors.swift:61:20:61:28 | C9(...) | T9 | {EXTERNAL LOCATION} | Int |
+| constructors.swift:61:26:61:27 | "" |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:62:5:62:7 | c92 |  | constructors.swift:59:1:59:19 | C9 |
+| constructors.swift:62:5:62:7 | c92 | T9 | {EXTERNAL LOCATION} | Int |
+| constructors.swift:62:11:62:17 | GenericTypeExpr |  | constructors.swift:59:1:59:19 | C9 |
+| constructors.swift:62:11:62:17 | GenericTypeExpr | T9 | {EXTERNAL LOCATION} | Int |
+| constructors.swift:62:11:62:24 | ...(...) |  | constructors.swift:59:1:59:19 | C9 |
+| constructors.swift:62:11:62:24 | ...(...) | T9 | {EXTERNAL LOCATION} | Int |
+| constructors.swift:62:22:62:23 | "" |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:66:5:66:7 | c10 |  | constructors.swift:64:1:64:42 | C10 |
+| constructors.swift:66:5:66:7 | c10 | T10a | {EXTERNAL LOCATION} | String |
+| constructors.swift:66:5:66:7 | c10 | T10b | {EXTERNAL LOCATION} | Int |
+| constructors.swift:66:24:66:26 | C10 |  | constructors.swift:64:1:64:42 | C10 |
+| constructors.swift:66:24:66:26 | C10 | T10a | {EXTERNAL LOCATION} | String |
+| constructors.swift:66:24:66:33 | C10(...) |  | constructors.swift:64:1:64:42 | C10 |
+| constructors.swift:66:24:66:33 | C10(...) | T10a | {EXTERNAL LOCATION} | String |
+| constructors.swift:66:31:66:32 | "" |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:69:9:69:10 | f1 |  | constructors.swift:68:11:68:11 | T |
+| constructors.swift:70:9:70:10 | f2 |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:70:22:70:30 | "default" |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:71:9:71:10 | f3 |  | {EXTERNAL LOCATION} | Function |
+| constructors.swift:71:9:71:10 | f3 | Args | {EXTERNAL LOCATION} | Tuple1 |
+| constructors.swift:71:9:71:10 | f3 | Args.T0 | constructors.swift:68:11:68:11 | T |
+| constructors.swift:71:9:71:10 | f3 | Return | constructors.swift:68:11:68:11 | T |
+| constructors.swift:71:24:71:29 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| constructors.swift:74:5:74:7 | s11 |  | constructors.swift:68:1:72:1 | S1 |
+| constructors.swift:74:5:74:7 | s11 | T | {EXTERNAL LOCATION} | Int |
+| constructors.swift:74:11:74:12 | S1 |  | constructors.swift:68:1:72:1 | S1 |
+| constructors.swift:74:11:74:12 | S1 | T | {EXTERNAL LOCATION} | Int |
+| constructors.swift:74:11:74:19 | S1(...) |  | constructors.swift:68:1:72:1 | S1 |
+| constructors.swift:74:11:74:19 | S1(...) | T | {EXTERNAL LOCATION} | Int |
+| constructors.swift:74:18:74:18 | 0 |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:75:5:75:7 | s12 |  | constructors.swift:68:1:72:1 | S1 |
+| constructors.swift:75:5:75:7 | s12 | T | {EXTERNAL LOCATION} | Bool |
+| constructors.swift:75:11:75:12 | S1 |  | constructors.swift:68:1:72:1 | S1 |
+| constructors.swift:75:11:75:12 | S1 | T | {EXTERNAL LOCATION} | Bool |
+| constructors.swift:75:11:75:30 | S1(...) |  | constructors.swift:68:1:72:1 | S1 |
+| constructors.swift:75:11:75:30 | S1(...) | T | {EXTERNAL LOCATION} | Bool |
+| constructors.swift:75:18:75:21 | true |  | {EXTERNAL LOCATION} | Bool |
+| constructors.swift:75:28:75:29 | "" |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:76:1:76:2 | S1 |  | constructors.swift:68:1:72:1 | S1 |
+| constructors.swift:76:1:76:2 | S1 | T | {EXTERNAL LOCATION} | Int |
+| constructors.swift:76:1:76:33 | S1(...) |  | constructors.swift:68:1:72:1 | S1 |
+| constructors.swift:76:1:76:33 | S1(...) | T | {EXTERNAL LOCATION} | Int |
+| constructors.swift:76:8:76:8 | 0 |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:76:15:76:16 | "" |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:76:23:76:32 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| constructors.swift:76:23:76:32 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| constructors.swift:76:23:76:32 | FunctionExpr | Args.T0 | {EXTERNAL LOCATION} | Int |
+| constructors.swift:76:23:76:32 | FunctionExpr | Return | {EXTERNAL LOCATION} | Int |
+| constructors.swift:76:25:76:25 | x |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:76:30:76:30 | Block |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:76:30:76:30 | x |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:77:1:77:2 | S1 |  | constructors.swift:68:1:72:1 | S1 |
+| constructors.swift:77:1:77:2 | S1 | T | {EXTERNAL LOCATION} | Int |
+| constructors.swift:77:1:77:25 | S1(...) |  | constructors.swift:68:1:72:1 | S1 |
+| constructors.swift:77:1:77:25 | S1(...) | T | {EXTERNAL LOCATION} | Int |
+| constructors.swift:77:8:77:8 | 0 |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:77:15:77:24 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| constructors.swift:77:15:77:24 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| constructors.swift:83:13:83:14 | e1 |  | constructors.swift:79:1:85:1 | E1 |
+| constructors.swift:83:18:83:18 | a |  | constructors.swift:79:1:85:1 | E1 |
+| constructors.swift:83:18:83:21 | a(...) |  | constructors.swift:79:1:85:1 | E1 |
+| constructors.swift:83:20:83:20 | 0 |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:89:5:89:6 | e2 |  | constructors.swift:87:1:87:27 | E2 |
+| constructors.swift:89:5:89:6 | e2 | A | {EXTERNAL LOCATION} | Int |
+| constructors.swift:89:5:89:6 | e2 | B | {EXTERNAL LOCATION} | String |
+| constructors.swift:89:25:89:28 | ... .a |  | constructors.swift:87:1:87:27 | E2 |
+| constructors.swift:89:25:89:28 | ... .a | A | {EXTERNAL LOCATION} | Int |
+| constructors.swift:89:25:89:28 | ... .a | B | {EXTERNAL LOCATION} | String |
+| constructors.swift:89:25:89:31 | ... .a(...) |  | constructors.swift:87:1:87:27 | E2 |
+| constructors.swift:89:25:89:31 | ... .a(...) | A | {EXTERNAL LOCATION} | Int |
+| constructors.swift:89:25:89:31 | ... .a(...) | B | {EXTERNAL LOCATION} | String |
+| constructors.swift:89:30:89:30 | 1 |  | {EXTERNAL LOCATION} | Int |
+| fields.swift:2:7:2:20 | inheritedField |  | {EXTERNAL LOCATION} | Int |
+| fields.swift:2:29:2:29 | 0 |  | {EXTERNAL LOCATION} | Int |
+| fields.swift:6:7:6:17 | storedField |  | {EXTERNAL LOCATION} | String |
+| fields.swift:6:29:6:36 | "stored" |  | {EXTERNAL LOCATION} | String |
+| fields.swift:7:7:7:18 | genericField |  | fields.swift:5:22:5:22 | T |
+| fields.swift:9:8:9:19 | genericField |  | fields.swift:5:22:5:22 | T |
+| fields.swift:9:25:11:3 | Block |  | fields.swift:5:22:5:22 | T |
+| fields.swift:10:5:10:8 | self |  | fields.swift:5:1:20:1 | FieldContainer |
+| fields.swift:10:5:10:8 | self | T | fields.swift:5:22:5:22 | T |
+| fields.swift:10:5:10:21 | ... .genericField |  | fields.swift:5:22:5:22 | T |
+| fields.swift:10:5:10:36 | ... = ... |  | fields.swift:5:22:5:22 | T |
+| fields.swift:10:25:10:36 | genericField |  | fields.swift:5:22:5:22 | T |
+| fields.swift:13:35:15:3 | Block |  | {EXTERNAL LOCATION} | String |
+| fields.swift:14:12:14:22 | storedField |  | {EXTERNAL LOCATION} | String |
+| fields.swift:17:31:19:3 | Block |  | fields.swift:5:22:5:22 | T |
+| fields.swift:18:12:18:15 | self |  | fields.swift:5:1:20:1 | FieldContainer |
+| fields.swift:18:12:18:15 | self | T | fields.swift:5:22:5:22 | T |
+| fields.swift:18:12:18:28 | ... .genericField |  | fields.swift:5:22:5:22 | T |
+| fields.swift:23:14:23:24 | staticField |  | {EXTERNAL LOCATION} | Bool |
+| fields.swift:23:34:23:37 | true |  | {EXTERNAL LOCATION} | Bool |
+| fields.swift:27:7:27:11 | value |  | {EXTERNAL LOCATION} | Double |
+| fields.swift:31:7:31:12 | nested |  | fields.swift:26:1:28:1 | NestedField |
+| fields.swift:35:7:35:15 | container |  | fields.swift:5:1:20:1 | FieldContainer |
+| fields.swift:35:7:35:15 | container | T | {EXTERNAL LOCATION} | Int |
+| fields.swift:35:19:35:32 | FieldContainer |  | fields.swift:5:1:20:1 | FieldContainer |
+| fields.swift:35:19:35:32 | FieldContainer | T | {EXTERNAL LOCATION} | Int |
+| fields.swift:35:19:35:50 | FieldContainer(...) |  | fields.swift:5:1:20:1 | FieldContainer |
+| fields.swift:35:19:35:50 | FieldContainer(...) | T | {EXTERNAL LOCATION} | Int |
+| fields.swift:35:48:35:49 | 42 |  | {EXTERNAL LOCATION} | Int |
+| fields.swift:36:7:36:12 | stored |  | {EXTERNAL LOCATION} | String |
+| fields.swift:36:16:36:24 | container |  | fields.swift:5:1:20:1 | FieldContainer |
+| fields.swift:36:16:36:24 | container | T | {EXTERNAL LOCATION} | Int |
+| fields.swift:36:16:36:36 | ... .storedField |  | {EXTERNAL LOCATION} | String |
+| fields.swift:37:7:37:13 | generic |  | {EXTERNAL LOCATION} | Int |
+| fields.swift:37:17:37:25 | container |  | fields.swift:5:1:20:1 | FieldContainer |
+| fields.swift:37:17:37:25 | container | T | {EXTERNAL LOCATION} | Int |
+| fields.swift:37:17:37:38 | ... .genericField |  | {EXTERNAL LOCATION} | Int |
+| fields.swift:38:7:38:15 | inherited |  | {EXTERNAL LOCATION} | Int |
+| fields.swift:38:19:38:27 | container |  | fields.swift:5:1:20:1 | FieldContainer |
+| fields.swift:38:19:38:27 | container | T | {EXTERNAL LOCATION} | Int |
+| fields.swift:38:19:38:42 | ... .inheritedField |  | {EXTERNAL LOCATION} | Int |
+| fields.swift:39:7:39:17 | staticValue |  | {EXTERNAL LOCATION} | Bool |
+| fields.swift:39:21:39:52 | ... .staticField |  | {EXTERNAL LOCATION} | Bool |
+| fields.swift:41:7:41:11 | outer |  | fields.swift:30:1:32:1 | OuterField |
+| fields.swift:41:15:41:24 | OuterField |  | fields.swift:30:1:32:1 | OuterField |
+| fields.swift:41:15:41:57 | OuterField(...) |  | fields.swift:30:1:32:1 | OuterField |
+| fields.swift:41:34:41:44 | NestedField |  | fields.swift:26:1:28:1 | NestedField |
+| fields.swift:41:34:41:56 | NestedField(...) |  | fields.swift:26:1:28:1 | NestedField |
+| fields.swift:41:53:41:55 | 1.0 |  | {EXTERNAL LOCATION} | Double |
+| fields.swift:42:7:42:17 | nestedValue |  | {EXTERNAL LOCATION} | Double |
+| fields.swift:42:21:42:25 | outer |  | fields.swift:30:1:32:1 | OuterField |
+| fields.swift:42:21:42:32 | ... .nested |  | fields.swift:26:1:28:1 | NestedField |
+| fields.swift:42:21:42:38 | ... .value |  | {EXTERNAL LOCATION} | Double |
+| generics.swift:3:20:3:20 | x |  | generics.swift:3:15:3:15 | T |
+| generics.swift:3:31:5:1 | Block |  | generics.swift:3:15:3:15 | T |
+| generics.swift:4:10:4:10 | x |  | generics.swift:3:15:3:15 | T |
+| generics.swift:7:23:7:23 | a |  | generics.swift:7:15:7:15 | A |
+| generics.swift:7:31:7:31 | b |  | generics.swift:7:18:7:18 | B |
+| generics.swift:7:47:9:1 | Block |  | {EXTERNAL LOCATION} | Tuple2 |
+| generics.swift:7:47:9:1 | Block | T0 | generics.swift:7:15:7:15 | A |
+| generics.swift:7:47:9:1 | Block | T1 | generics.swift:7:18:7:18 | B |
+| generics.swift:8:10:8:15 | TupleExpr |  | {EXTERNAL LOCATION} | Tuple2 |
+| generics.swift:8:10:8:15 | TupleExpr | T0 | generics.swift:7:15:7:15 | A |
+| generics.swift:8:10:8:15 | TupleExpr | T1 | generics.swift:7:18:7:18 | B |
+| generics.swift:8:11:8:11 | a |  | generics.swift:7:15:7:15 | A |
+| generics.swift:8:14:8:14 | b |  | generics.swift:7:18:7:18 | B |
+| generics.swift:12:7:12:7 | i |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:12:11:12:22 | identity(...) |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:12:20:12:21 | 42 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:13:7:13:7 | s |  | {EXTERNAL LOCATION} | String |
+| generics.swift:13:11:13:27 | identity(...) |  | {EXTERNAL LOCATION} | String |
+| generics.swift:13:20:13:26 | "hello" |  | {EXTERNAL LOCATION} | String |
+| generics.swift:14:7:14:7 | p |  | {EXTERNAL LOCATION} | Tuple2 |
+| generics.swift:14:7:14:7 | p | T0 | {EXTERNAL LOCATION} | Int |
+| generics.swift:14:7:14:7 | p | T1 | {EXTERNAL LOCATION} | String |
+| generics.swift:14:11:14:28 | makePair(...) |  | {EXTERNAL LOCATION} | Tuple2 |
+| generics.swift:14:11:14:28 | makePair(...) | T0 | {EXTERNAL LOCATION} | Int |
+| generics.swift:14:11:14:28 | makePair(...) | T1 | {EXTERNAL LOCATION} | String |
+| generics.swift:14:20:14:20 | 1 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:14:23:14:27 | "two" |  | {EXTERNAL LOCATION} | String |
+| generics.swift:20:7:20:11 | first |  | generics.swift:19:13:19:13 | A |
+| generics.swift:21:7:21:12 | second |  | generics.swift:19:16:19:16 | B |
+| generics.swift:23:8:23:12 | first |  | generics.swift:19:13:19:13 | A |
+| generics.swift:23:18:23:23 | second |  | generics.swift:19:16:19:16 | B |
+| generics.swift:23:29:26:3 | Block |  | generics.swift:19:16:19:16 | B |
+| generics.swift:24:5:24:8 | self |  | generics.swift:19:1:35:1 | Pair |
+| generics.swift:24:5:24:8 | self | A | generics.swift:19:13:19:13 | A |
+| generics.swift:24:5:24:8 | self | B | generics.swift:19:16:19:16 | B |
+| generics.swift:24:5:24:14 | ... .first |  | generics.swift:19:13:19:13 | A |
+| generics.swift:24:5:24:22 | ... = ... |  | generics.swift:19:13:19:13 | A |
+| generics.swift:24:18:24:22 | first |  | generics.swift:19:13:19:13 | A |
+| generics.swift:25:5:25:8 | self |  | generics.swift:19:1:35:1 | Pair |
+| generics.swift:25:5:25:8 | self | A | generics.swift:19:13:19:13 | A |
+| generics.swift:25:5:25:8 | self | B | generics.swift:19:16:19:16 | B |
+| generics.swift:25:5:25:15 | ... .second |  | generics.swift:19:16:19:16 | B |
+| generics.swift:25:5:25:24 | ... = ... |  | generics.swift:19:16:19:16 | B |
+| generics.swift:25:19:25:24 | second |  | generics.swift:19:16:19:16 | B |
+| generics.swift:28:24:30:3 | Block |  | generics.swift:19:13:19:13 | A |
+| generics.swift:29:12:29:16 | first |  | generics.swift:19:13:19:13 | A |
+| generics.swift:32:25:34:3 | Block |  | generics.swift:19:16:19:16 | B |
+| generics.swift:33:12:33:17 | second |  | generics.swift:19:16:19:16 | B |
+| generics.swift:38:7:38:7 | p |  | generics.swift:19:1:35:1 | Pair |
+| generics.swift:38:7:38:7 | p | A | {EXTERNAL LOCATION} | Int |
+| generics.swift:38:7:38:7 | p | B | {EXTERNAL LOCATION} | String |
+| generics.swift:38:11:38:14 | Pair |  | generics.swift:19:1:35:1 | Pair |
+| generics.swift:38:11:38:14 | Pair | A | {EXTERNAL LOCATION} | Int |
+| generics.swift:38:11:38:14 | Pair | B | {EXTERNAL LOCATION} | String |
+| generics.swift:38:11:38:37 | Pair(...) |  | generics.swift:19:1:35:1 | Pair |
+| generics.swift:38:11:38:37 | Pair(...) | A | {EXTERNAL LOCATION} | Int |
+| generics.swift:38:11:38:37 | Pair(...) | B | {EXTERNAL LOCATION} | String |
+| generics.swift:38:23:38:23 | 1 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:38:34:38:36 | "x" |  | {EXTERNAL LOCATION} | String |
+| generics.swift:39:7:39:7 | f |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:39:11:39:11 | p |  | generics.swift:19:1:35:1 | Pair |
+| generics.swift:39:11:39:11 | p | A | {EXTERNAL LOCATION} | Int |
+| generics.swift:39:11:39:11 | p | B | {EXTERNAL LOCATION} | String |
+| generics.swift:39:11:39:22 | ... .getFirst(...) |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:40:7:40:8 | sc |  | {EXTERNAL LOCATION} | String |
+| generics.swift:40:12:40:12 | p |  | generics.swift:19:1:35:1 | Pair |
+| generics.swift:40:12:40:12 | p | A | {EXTERNAL LOCATION} | Int |
+| generics.swift:40:12:40:12 | p | B | {EXTERNAL LOCATION} | String |
+| generics.swift:40:12:40:24 | ... .getSecond(...) |  | {EXTERNAL LOCATION} | String |
+| generics.swift:50:12:50:15 | self |  | generics.swift:45:1:57:1 | Result |
+| generics.swift:50:12:50:15 | self | T | generics.swift:45:13:45:13 | T |
+| generics.swift:51:10:51:24 | ... .success(...) |  | generics.swift:45:1:57:1 | Result |
+| generics.swift:51:10:51:24 | ... .success(...) | T | generics.swift:45:13:45:13 | T |
+| generics.swift:53:10:53:17 | ... .failure |  | generics.swift:45:1:57:1 | Result |
+| generics.swift:53:10:53:17 | ... .failure | T | generics.swift:45:13:45:13 | T |
+| generics.swift:60:7:60:7 | r |  | generics.swift:45:1:57:1 | Result |
+| generics.swift:60:7:60:7 | r | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:60:11:60:24 | ... .success |  | generics.swift:45:1:57:1 | Result |
+| generics.swift:60:11:60:24 | ... .success | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:60:11:60:28 | ... .success(...) |  | generics.swift:45:1:57:1 | Result |
+| generics.swift:60:11:60:28 | ... .success(...) | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:60:26:60:27 | 42 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:61:7:61:7 | v |  | {EXTERNAL LOCATION} | Optional |
+| generics.swift:61:7:61:7 | v | Wrapped | {EXTERNAL LOCATION} | Int |
+| generics.swift:61:11:61:11 | r |  | generics.swift:45:1:57:1 | Result |
+| generics.swift:61:11:61:11 | r | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:61:11:61:22 | ... .getValue(...) |  | {EXTERNAL LOCATION} | Optional |
+| generics.swift:61:11:61:22 | ... .getValue(...) | Wrapped | {EXTERNAL LOCATION} | Int |
+| generics.swift:63:7:63:8 | r2 |  | generics.swift:45:1:57:1 | Result |
+| generics.swift:63:7:63:8 | r2 | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:63:34:63:35 | 42 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:64:7:64:8 | v2 |  | {EXTERNAL LOCATION} | Optional |
+| generics.swift:64:7:64:8 | v2 | Wrapped | {EXTERNAL LOCATION} | Int |
+| generics.swift:64:12:64:13 | r2 |  | generics.swift:45:1:57:1 | Result |
+| generics.swift:64:12:64:13 | r2 | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:64:12:64:24 | ... .getValue(...) |  | {EXTERNAL LOCATION} | Optional |
+| generics.swift:64:12:64:24 | ... .getValue(...) | Wrapped | {EXTERNAL LOCATION} | Int |
+| generics.swift:69:29:69:33 | value |  | generics.swift:69:21:69:21 | T |
+| generics.swift:69:41:69:49 | transform |  | {EXTERNAL LOCATION} | Function |
+| generics.swift:69:41:69:49 | transform | Args | {EXTERNAL LOCATION} | Tuple1 |
+| generics.swift:69:41:69:49 | transform | Args.T0 | generics.swift:69:21:69:21 | T |
+| generics.swift:69:41:69:49 | transform | Return | generics.swift:69:24:69:24 | U |
+| generics.swift:69:67:72:1 | Block |  | generics.swift:69:24:69:24 | U |
+| generics.swift:70:7:70:12 | result |  | generics.swift:69:24:69:24 | U |
+| generics.swift:70:16:70:24 | transform |  | {EXTERNAL LOCATION} | Function |
+| generics.swift:70:16:70:24 | transform | Args | {EXTERNAL LOCATION} | Tuple1 |
+| generics.swift:70:16:70:24 | transform | Args.T0 | generics.swift:69:21:69:21 | T |
+| generics.swift:70:16:70:24 | transform | Return | generics.swift:69:24:69:24 | U |
+| generics.swift:70:16:70:31 | transform(...) |  | generics.swift:69:24:69:24 | U |
+| generics.swift:70:26:70:30 | value |  | generics.swift:69:21:69:21 | T |
+| generics.swift:71:10:71:15 | result |  | generics.swift:69:24:69:24 | U |
+| generics.swift:75:7:75:12 | result |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:75:16:75:48 | applyTransform(...) |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:75:31:75:31 | 5 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:75:34:75:47 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| generics.swift:75:34:75:47 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| generics.swift:75:34:75:47 | FunctionExpr | Args.T0 | {EXTERNAL LOCATION} | Int |
+| generics.swift:75:34:75:47 | FunctionExpr | Return | {EXTERNAL LOCATION} | Int |
+| generics.swift:75:36:75:36 | x |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:75:41:75:41 | x |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:75:41:75:45 | ... * ... |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:75:41:75:45 | Block |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:75:45:75:45 | 2 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:76:7:76:13 | strings |  | {EXTERNAL LOCATION} | String |
+| generics.swift:76:17:80:6 | applyTransform(...) |  | {EXTERNAL LOCATION} | String |
+| generics.swift:77:5:77:6 | 10 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:78:5:80:5 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| generics.swift:78:5:80:5 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| generics.swift:78:5:80:5 | FunctionExpr | Args.T0 | {EXTERNAL LOCATION} | Int |
+| generics.swift:78:5:80:5 | FunctionExpr | Return | {EXTERNAL LOCATION} | String |
+| generics.swift:79:7:79:7 | x |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:79:12:79:17 | String |  | {EXTERNAL LOCATION} | String |
+| generics.swift:79:12:79:20 | Block |  | {EXTERNAL LOCATION} | String |
+| generics.swift:79:12:79:20 | String(...) |  | {EXTERNAL LOCATION} | String |
+| generics.swift:79:19:79:19 | x |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:94:7:94:11 | inner |  | generics.swift:93:15:93:27 | T |
+| generics.swift:96:10:96:14 | inner |  | generics.swift:93:15:93:27 | T |
+| generics.swift:96:20:98:3 | Block |  | generics.swift:93:15:93:27 | T |
+| generics.swift:97:5:97:8 | self |  | generics.swift:93:1:113:1 | Wrapper |
+| generics.swift:97:5:97:8 | self | T | generics.swift:93:15:93:27 | T |
+| generics.swift:97:5:97:14 | ... .inner |  | generics.swift:93:15:93:27 | T |
+| generics.swift:97:5:97:22 | ... = ... |  | generics.swift:93:15:93:27 | T |
+| generics.swift:97:18:97:22 | inner |  | generics.swift:93:15:93:27 | T |
+| generics.swift:100:19:102:3 | Block |  | generics.swift:93:15:93:27 | T |
+| generics.swift:101:12:101:16 | inner |  | generics.swift:93:15:93:27 | T |
+| generics.swift:105:13:105:17 | inner |  | generics.swift:93:15:93:27 | T |
+| generics.swift:110:13:110:17 | inner |  | generics.swift:93:15:93:27 | T |
+| generics.swift:118:21:120:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:119:12:119:15 | self |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:119:12:119:19 | ... * ... |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:119:19:119:19 | 2 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:122:24:124:3 | Block |  | {EXTERNAL LOCATION} | String |
+| generics.swift:123:12:123:19 | "number" |  | {EXTERNAL LOCATION} | String |
+| generics.swift:128:7:128:7 | w |  | generics.swift:93:1:113:1 | Wrapper |
+| generics.swift:128:7:128:7 | w | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:128:11:128:17 | Wrapper |  | generics.swift:93:1:113:1 | Wrapper |
+| generics.swift:128:11:128:17 | Wrapper | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:128:11:128:21 | Wrapper(...) |  | generics.swift:93:1:113:1 | Wrapper |
+| generics.swift:128:11:128:21 | Wrapper(...) | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:128:19:128:20 | 42 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:129:7:129:7 | v |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:129:11:129:11 | w |  | generics.swift:93:1:113:1 | Wrapper |
+| generics.swift:129:11:129:11 | w | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:129:11:129:17 | ... .get(...) |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:130:7:130:7 | z |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:130:11:130:11 | w |  | generics.swift:93:1:113:1 | Wrapper |
+| generics.swift:130:11:130:11 | w | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:130:11:130:21 | ... .callFoo(...) |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:131:11:131:11 | w |  | generics.swift:93:1:113:1 | Wrapper |
+| generics.swift:131:11:131:11 | w | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:137:7:137:12 | value1 |  | generics.swift:136:12:136:13 | T1 |
+| generics.swift:138:7:138:12 | value2 |  | generics.swift:136:16:136:17 | T2 |
+| generics.swift:140:10:140:11 | v1 |  | generics.swift:136:12:136:13 | T1 |
+| generics.swift:140:20:140:21 | v2 |  | generics.swift:136:16:136:17 | T2 |
+| generics.swift:140:28:143:3 | Block |  | generics.swift:136:16:136:17 | T2 |
+| generics.swift:141:5:141:8 | self |  | generics.swift:136:1:152:1 | Base |
+| generics.swift:141:5:141:8 | self | T1 | generics.swift:136:12:136:13 | T1 |
+| generics.swift:141:5:141:8 | self | T2 | generics.swift:136:16:136:17 | T2 |
+| generics.swift:141:5:141:15 | ... .value1 |  | generics.swift:136:12:136:13 | T1 |
+| generics.swift:141:5:141:20 | ... = ... |  | generics.swift:136:12:136:13 | T1 |
+| generics.swift:141:19:141:20 | v1 |  | generics.swift:136:12:136:13 | T1 |
+| generics.swift:142:5:142:8 | self |  | generics.swift:136:1:152:1 | Base |
+| generics.swift:142:5:142:8 | self | T1 | generics.swift:136:12:136:13 | T1 |
+| generics.swift:142:5:142:8 | self | T2 | generics.swift:136:16:136:17 | T2 |
+| generics.swift:142:5:142:15 | ... .value2 |  | generics.swift:136:16:136:17 | T2 |
+| generics.swift:142:5:142:20 | ... = ... |  | generics.swift:136:16:136:17 | T2 |
+| generics.swift:142:19:142:20 | v2 |  | generics.swift:136:16:136:17 | T2 |
+| generics.swift:145:26:147:3 | Block |  | generics.swift:136:12:136:13 | T1 |
+| generics.swift:146:12:146:17 | value1 |  | generics.swift:136:12:136:13 | T1 |
+| generics.swift:149:26:151:3 | Block |  | generics.swift:136:16:136:17 | T2 |
+| generics.swift:150:12:150:17 | value2 |  | generics.swift:136:16:136:17 | T2 |
+| generics.swift:155:10:155:11 | v1 |  | generics.swift:154:15:154:16 | T1 |
+| generics.swift:155:20:155:21 | v2 |  | generics.swift:154:19:154:20 | T2 |
+| generics.swift:155:28:157:3 | Block |  | generics.swift:136:1:152:1 | Base |
+| generics.swift:155:28:157:3 | Block | T1 | generics.swift:154:19:154:20 | T2 |
+| generics.swift:155:28:157:3 | Block | T2 | generics.swift:154:15:154:16 | T1 |
+| generics.swift:156:5:156:9 | super |  | generics.swift:136:1:152:1 | Base |
+| generics.swift:156:5:156:9 | super | T1 | generics.swift:154:19:154:20 | T2 |
+| generics.swift:156:5:156:9 | super | T2 | generics.swift:154:15:154:16 | T1 |
+| generics.swift:156:5:156:22 | ... .init(...) |  | generics.swift:136:1:152:1 | Base |
+| generics.swift:156:5:156:22 | ... .init(...) | T1 | generics.swift:154:19:154:20 | T2 |
+| generics.swift:156:5:156:22 | ... .init(...) | T2 | generics.swift:154:15:154:16 | T1 |
+| generics.swift:156:16:156:17 | v2 |  | generics.swift:154:19:154:20 | T2 |
+| generics.swift:156:20:156:21 | v1 |  | generics.swift:154:15:154:16 | T1 |
+| generics.swift:159:22:159:23 | v1 |  | generics.swift:154:15:154:16 | T1 |
+| generics.swift:165:10:165:10 | v |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:165:10:165:10 | v | Element | generics.swift:164:22:164:22 | D |
+| generics.swift:165:18:167:3 | Block |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:165:18:167:3 | Block | T1 | {EXTERNAL LOCATION} | Array |
+| generics.swift:165:18:167:3 | Block | T1.Element | generics.swift:164:22:164:22 | D |
+| generics.swift:165:18:167:3 | Block | T2 | {EXTERNAL LOCATION} | Bool |
+| generics.swift:166:5:166:9 | super |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:166:5:166:9 | super | T1 | {EXTERNAL LOCATION} | Array |
+| generics.swift:166:5:166:9 | super | T1.Element | generics.swift:164:22:164:22 | D |
+| generics.swift:166:5:166:9 | super | T2 | {EXTERNAL LOCATION} | Bool |
+| generics.swift:166:5:166:23 | ... .init(...) |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:166:5:166:23 | ... .init(...) | T1 | {EXTERNAL LOCATION} | Array |
+| generics.swift:166:5:166:23 | ... .init(...) | T1.Element | generics.swift:164:22:164:22 | D |
+| generics.swift:166:5:166:23 | ... .init(...) | T2 | {EXTERNAL LOCATION} | Bool |
+| generics.swift:166:16:166:16 | v |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:166:16:166:16 | v | Element | generics.swift:164:22:164:22 | D |
+| generics.swift:166:19:166:22 | true |  | {EXTERNAL LOCATION} | Bool |
+| generics.swift:174:38:174:43 | value1 |  | generics.swift:174:10:174:11 | T1 |
+| generics.swift:174:52:174:57 | value2 |  | generics.swift:174:14:174:15 | T2 |
+| generics.swift:174:66:174:69 | base |  | generics.swift:174:18:174:33 | T3 |
+| generics.swift:174:82:176:1 | Block |  | generics.swift:174:18:174:33 | T3 |
+| generics.swift:175:10:175:13 | base |  | generics.swift:174:18:174:33 | T3 |
+| generics.swift:178:21:178:26 | value1 |  | generics.swift:178:11:178:12 | T1 |
+| generics.swift:178:35:178:40 | value2 |  | generics.swift:178:15:178:16 | T2 |
+| generics.swift:178:49:178:52 | base |  | generics.swift:136:1:152:1 | Base |
+| generics.swift:178:49:178:52 | base | T1 | generics.swift:178:11:178:12 | T1 |
+| generics.swift:178:49:178:52 | base | T2 | generics.swift:178:15:178:16 | T2 |
+| generics.swift:182:35:182:40 | value1 |  | generics.swift:182:10:182:10 | A |
+| generics.swift:182:48:182:53 | value2 |  | generics.swift:182:13:182:13 | B |
+| generics.swift:182:61:182:64 | base |  | generics.swift:182:16:182:30 | C |
+| generics.swift:182:75:185:1 | Block |  | generics.swift:182:16:182:30 | C |
+| generics.swift:183:10:183:13 | base |  | generics.swift:182:16:182:30 | C |
+| generics.swift:187:19:187:24 | value1 |  | generics.swift:187:11:187:11 | A |
+| generics.swift:187:32:187:37 | value2 |  | generics.swift:187:14:187:14 | B |
+| generics.swift:187:45:187:48 | base |  | generics.swift:136:1:152:1 | Base |
+| generics.swift:187:45:187:48 | base | T1 | generics.swift:187:11:187:11 | A |
+| generics.swift:187:45:187:48 | base | T2 | {EXTERNAL LOCATION} | Array |
+| generics.swift:187:45:187:48 | base | T2.Element | generics.swift:187:14:187:14 | B |
+| generics.swift:189:34:189:39 | value1 |  | generics.swift:189:10:189:10 | A |
+| generics.swift:189:47:189:52 | value2 |  | generics.swift:189:13:189:13 | B |
+| generics.swift:189:60:189:63 | base |  | generics.swift:189:16:189:29 | C |
+| generics.swift:189:74:192:1 | Block |  | generics.swift:189:16:189:29 | C |
+| generics.swift:190:10:190:13 | base |  | generics.swift:189:16:189:29 | C |
+| generics.swift:194:19:194:24 | value1 |  | generics.swift:194:11:194:11 | A |
+| generics.swift:194:32:194:37 | value2 |  | generics.swift:194:14:194:14 | B |
+| generics.swift:194:45:194:48 | base |  | generics.swift:136:1:152:1 | Base |
+| generics.swift:194:45:194:48 | base | T1 | generics.swift:194:11:194:11 | A |
+| generics.swift:194:45:194:48 | base | T2 | {EXTERNAL LOCATION} | Optional |
+| generics.swift:194:45:194:48 | base | T2.Wrapped | generics.swift:194:14:194:14 | B |
+| generics.swift:197:7:197:7 | d |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:197:7:197:7 | d | T1 | {EXTERNAL LOCATION} | Int |
+| generics.swift:197:7:197:7 | d | T2 | {EXTERNAL LOCATION} | String |
+| generics.swift:197:11:197:17 | Derived |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:197:11:197:17 | Derived | T1 | {EXTERNAL LOCATION} | Int |
+| generics.swift:197:11:197:17 | Derived | T2 | {EXTERNAL LOCATION} | String |
+| generics.swift:197:11:197:25 | Derived(...) |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:197:11:197:25 | Derived(...) | T1 | {EXTERNAL LOCATION} | Int |
+| generics.swift:197:11:197:25 | Derived(...) | T2 | {EXTERNAL LOCATION} | String |
+| generics.swift:197:19:197:19 | 1 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:197:22:197:24 | "x" |  | {EXTERNAL LOCATION} | String |
+| generics.swift:198:7:198:8 | v1 |  | {EXTERNAL LOCATION} | String |
+| generics.swift:198:12:198:12 | d |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:198:12:198:12 | d | T1 | {EXTERNAL LOCATION} | Int |
+| generics.swift:198:12:198:12 | d | T2 | {EXTERNAL LOCATION} | String |
+| generics.swift:198:12:198:24 | ... .getValue1(...) |  | {EXTERNAL LOCATION} | String |
+| generics.swift:199:7:199:8 | v2 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:199:12:199:12 | d |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:199:12:199:12 | d | T1 | {EXTERNAL LOCATION} | Int |
+| generics.swift:199:12:199:12 | d | T2 | {EXTERNAL LOCATION} | String |
+| generics.swift:199:12:199:24 | ... .getValue2(...) |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:201:7:201:8 | dd |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:201:7:201:8 | dd | D | {EXTERNAL LOCATION} | String |
+| generics.swift:201:12:201:25 | DerivedDerived |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:201:12:201:25 | DerivedDerived | D | {EXTERNAL LOCATION} | String |
+| generics.swift:201:12:201:36 | DerivedDerived(...) |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:201:12:201:36 | DerivedDerived(...) | D | {EXTERNAL LOCATION} | String |
+| generics.swift:201:27:201:35 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:201:27:201:35 | ArrayLiteral | Element | {EXTERNAL LOCATION} | String |
+| generics.swift:201:28:201:34 | "hello" |  | {EXTERNAL LOCATION} | String |
+| generics.swift:202:7:202:9 | vv1 |  | {EXTERNAL LOCATION} | Bool |
+| generics.swift:202:13:202:14 | dd |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:202:13:202:14 | dd | D | {EXTERNAL LOCATION} | String |
+| generics.swift:202:13:202:26 | ... .getValue1(...) |  | {EXTERNAL LOCATION} | Bool |
+| generics.swift:203:7:203:9 | vv2 |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:203:7:203:9 | vv2 | Element | {EXTERNAL LOCATION} | String |
+| generics.swift:203:13:203:14 | dd |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:203:13:203:14 | dd | D | {EXTERNAL LOCATION} | String |
+| generics.swift:203:13:203:26 | ... .getValue2(...) |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:203:13:203:26 | ... .getValue2(...) | Element | {EXTERNAL LOCATION} | String |
+| generics.swift:205:7:205:7 | x |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:205:7:205:7 | x | D | {EXTERNAL LOCATION} | Int |
+| generics.swift:205:11:205:45 | foo(...) |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:205:11:205:45 | foo(...) | D | {EXTERNAL LOCATION} | Int |
+| generics.swift:205:15:205:19 | false |  | {EXTERNAL LOCATION} | Bool |
+| generics.swift:205:22:205:24 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:205:22:205:24 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| generics.swift:205:23:205:23 | 2 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:205:27:205:40 | DerivedDerived |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:205:27:205:40 | DerivedDerived | D | {EXTERNAL LOCATION} | Int |
+| generics.swift:205:27:205:44 | DerivedDerived(...) |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:205:27:205:44 | DerivedDerived(...) | D | {EXTERNAL LOCATION} | Int |
+| generics.swift:205:42:205:43 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:205:42:205:43 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| generics.swift:207:8:207:12 | false |  | {EXTERNAL LOCATION} | Bool |
+| generics.swift:207:15:207:17 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:207:15:207:17 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| generics.swift:207:16:207:16 | 2 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:207:20:207:33 | DerivedDerived |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:207:20:207:33 | DerivedDerived | D | {EXTERNAL LOCATION} | Int |
+| generics.swift:207:20:207:37 | DerivedDerived(...) |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:207:20:207:37 | DerivedDerived(...) | D | {EXTERNAL LOCATION} | Int |
+| generics.swift:207:35:207:36 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:207:35:207:36 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| generics.swift:209:7:209:7 | y |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:209:7:209:7 | y | D | {EXTERNAL LOCATION} | Int |
+| generics.swift:209:11:209:43 | bar(...) |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:209:11:209:43 | bar(...) | D | {EXTERNAL LOCATION} | Int |
+| generics.swift:209:15:209:19 | false |  | {EXTERNAL LOCATION} | Bool |
+| generics.swift:209:22:209:22 | 2 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:209:25:209:38 | DerivedDerived |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:209:25:209:38 | DerivedDerived | D | {EXTERNAL LOCATION} | Int |
+| generics.swift:209:25:209:42 | DerivedDerived(...) |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:209:25:209:42 | DerivedDerived(...) | D | {EXTERNAL LOCATION} | Int |
+| generics.swift:209:40:209:41 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:209:40:209:41 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| generics.swift:211:8:211:12 | false |  | {EXTERNAL LOCATION} | Bool |
+| generics.swift:211:15:211:15 | 2 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:211:18:211:31 | DerivedDerived |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:211:18:211:31 | DerivedDerived | D | {EXTERNAL LOCATION} | Int |
+| generics.swift:211:18:211:35 | DerivedDerived(...) |  | generics.swift:164:1:172:1 | DerivedDerived |
+| generics.swift:211:18:211:35 | DerivedDerived(...) | D | {EXTERNAL LOCATION} | Int |
+| generics.swift:211:33:211:34 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| generics.swift:211:33:211:34 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| generics.swift:213:7:213:7 | w |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:213:7:213:7 | w | T1 | {EXTERNAL LOCATION} | Optional |
+| generics.swift:213:7:213:7 | w | T1.Wrapped | {EXTERNAL LOCATION} | Int |
+| generics.swift:213:7:213:7 | w | T2 | {EXTERNAL LOCATION} | Bool |
+| generics.swift:213:11:213:47 | baz(...) |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:213:11:213:47 | baz(...) | T1 | {EXTERNAL LOCATION} | Optional |
+| generics.swift:213:11:213:47 | baz(...) | T1.Wrapped | {EXTERNAL LOCATION} | Int |
+| generics.swift:213:11:213:47 | baz(...) | T2 | {EXTERNAL LOCATION} | Bool |
+| generics.swift:213:15:213:19 | false |  | {EXTERNAL LOCATION} | Bool |
+| generics.swift:213:22:213:22 | 2 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:213:25:213:31 | Derived |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:213:25:213:31 | Derived | T1 | {EXTERNAL LOCATION} | Optional |
+| generics.swift:213:25:213:31 | Derived | T1.Wrapped | {EXTERNAL LOCATION} | Int |
+| generics.swift:213:25:213:31 | Derived | T2 | {EXTERNAL LOCATION} | Bool |
+| generics.swift:213:25:213:46 | Derived(...) |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:213:25:213:46 | Derived(...) | T1 | {EXTERNAL LOCATION} | Optional |
+| generics.swift:213:25:213:46 | Derived(...) | T1.Wrapped | {EXTERNAL LOCATION} | Int |
+| generics.swift:213:25:213:46 | Derived(...) | T2 | {EXTERNAL LOCATION} | Bool |
+| generics.swift:213:33:213:45 | ... .none |  | {EXTERNAL LOCATION} | Optional |
+| generics.swift:213:33:213:45 | ... .none | Wrapped | {EXTERNAL LOCATION} | Int |
+| generics.swift:215:8:215:12 | false |  | {EXTERNAL LOCATION} | Bool |
+| generics.swift:215:15:215:15 | 2 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:215:18:215:24 | Derived |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:215:18:215:24 | Derived | T1 | {EXTERNAL LOCATION} | Optional |
+| generics.swift:215:18:215:24 | Derived | T1.Wrapped | {EXTERNAL LOCATION} | Int |
+| generics.swift:215:18:215:24 | Derived | T2 | {EXTERNAL LOCATION} | Bool |
+| generics.swift:215:18:215:39 | Derived(...) |  | generics.swift:154:1:162:1 | Derived |
+| generics.swift:215:18:215:39 | Derived(...) | T1 | {EXTERNAL LOCATION} | Optional |
+| generics.swift:215:18:215:39 | Derived(...) | T1.Wrapped | {EXTERNAL LOCATION} | Int |
+| generics.swift:215:18:215:39 | Derived(...) | T2 | {EXTERNAL LOCATION} | Bool |
+| generics.swift:215:26:215:38 | ... .none |  | {EXTERNAL LOCATION} | Optional |
+| generics.swift:215:26:215:38 | ... .none | Wrapped | {EXTERNAL LOCATION} | Int |
+| generics.swift:227:22:229:3 | Block |  | generics.swift:220:1:224:1 | MyProtocol2 |
+| generics.swift:228:12:228:15 | self |  | generics.swift:220:1:224:1 | MyProtocol2 |
+| generics.swift:233:7:233:11 | value |  | generics.swift:232:15:232:15 | T |
+| generics.swift:235:10:235:14 | value |  | generics.swift:232:15:232:15 | T |
+| generics.swift:235:20:237:3 | Block |  | generics.swift:232:15:232:15 | T |
+| generics.swift:236:5:236:8 | self |  | generics.swift:232:1:238:1 | MyClass |
+| generics.swift:236:5:236:8 | self | T | generics.swift:232:15:232:15 | T |
+| generics.swift:236:5:236:14 | ... .value |  | generics.swift:232:15:232:15 | T |
+| generics.swift:236:5:236:22 | ... = ... |  | generics.swift:232:15:232:15 | T |
+| generics.swift:236:18:236:22 | value |  | generics.swift:232:15:232:15 | T |
+| generics.swift:248:32:248:32 | c |  | generics.swift:248:14:248:27 | T |
+| generics.swift:249:10:249:10 | c |  | generics.swift:248:14:248:27 | T |
+| generics.swift:252:32:252:32 | c |  | generics.swift:252:14:252:27 | T |
+| generics.swift:253:10:253:10 | c |  | generics.swift:252:14:252:27 | T |
+| generics.swift:257:7:257:7 | c |  | generics.swift:232:1:238:1 | MyClass |
+| generics.swift:257:7:257:7 | c | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:257:11:257:17 | MyClass |  | generics.swift:232:1:238:1 | MyClass |
+| generics.swift:257:11:257:17 | MyClass | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:257:11:257:21 | MyClass(...) |  | generics.swift:232:1:238:1 | MyClass |
+| generics.swift:257:11:257:21 | MyClass(...) | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:257:19:257:20 | 42 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:258:11:258:11 | c |  | generics.swift:232:1:238:1 | MyClass |
+| generics.swift:258:11:258:11 | c | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:259:11:259:11 | c |  | generics.swift:232:1:238:1 | MyClass |
+| generics.swift:259:11:259:11 | c | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:260:20:260:20 | c |  | generics.swift:232:1:238:1 | MyClass |
+| generics.swift:260:20:260:20 | c | T | {EXTERNAL LOCATION} | Int |
+| generics.swift:278:30:280:3 | Block |  | {EXTERNAL LOCATION} | String |
+| generics.swift:279:12:279:17 | "base" |  | {EXTERNAL LOCATION} | String |
+| generics.swift:282:29:284:3 | Block |  | {EXTERNAL LOCATION} | String |
+| generics.swift:283:12:283:16 | "sub" |  | {EXTERNAL LOCATION} | String |
+| generics.swift:287:65:287:69 | value |  | generics.swift:287:33:287:60 | T |
+| generics.swift:288:10:288:14 | value |  | generics.swift:287:33:287:60 | T |
+| generics.swift:292:42:292:61 | StringAssociatedType |  | generics.swift:275:1:285:1 | StringAssociatedType |
+| generics.swift:292:42:292:63 | StringAssociatedType(...) |  | generics.swift:275:1:285:1 | StringAssociatedType |
+| generics.swift:306:25:308:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:307:12:307:13 | 42 |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:316:7:316:11 | value |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:316:15:316:66 | getPrimaryAssociatedType(...) |  | {EXTERNAL LOCATION} | Int |
+| generics.swift:316:40:316:63 | IntPrimaryAssociatedType |  | generics.swift:303:1:309:1 | IntPrimaryAssociatedType |
+| generics.swift:316:40:316:65 | IntPrimaryAssociatedType(...) |  | generics.swift:303:1:309:1 | IntPrimaryAssociatedType |
+| key_paths.swift:4:7:4:7 | x |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:5:7:5:7 | y |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:7:8:7:8 | x |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:7:19:7:19 | y |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:7:30:10:3 | Block |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:8:5:8:8 | self |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:8:5:8:10 | ... .x |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:8:5:8:14 | ... = ... |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:8:14:8:14 | x |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:9:5:9:8 | self |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:9:5:9:10 | ... .y |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:9:5:9:14 | ... = ... |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:9:14:9:14 | y |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:13:13:13:13 | x |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:13:13:13:17 | ... * ... |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:13:13:13:25 | ... + ... |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:13:17:13:17 | x |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:13:21:13:21 | y |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:13:21:13:25 | ... * ... |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:13:25:13:25 | y |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:18:7:18:11 | start |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:19:7:19:9 | end |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:21:8:21:12 | start |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:21:22:21:24 | end |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:21:34:24:3 | Block |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:22:5:22:8 | self |  | key_paths.swift:17:1:25:1 | Line |
+| key_paths.swift:22:5:22:14 | ... .start |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:22:5:22:22 | ... = ... |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:22:18:22:22 | start |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:23:5:23:8 | self |  | key_paths.swift:17:1:25:1 | Line |
+| key_paths.swift:23:5:23:12 | ... .end |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:23:5:23:18 | ... = ... |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:23:16:23:18 | end |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:31:7:31:7 | p |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:31:11:31:15 | Point |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:31:11:31:31 | Point(...) |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:31:20:31:22 | 3.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:31:28:31:30 | 4.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:32:14:32:14 | p |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:33:14:33:14 | p |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:42:7:42:7 | s |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:42:11:42:15 | Point |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:42:11:42:31 | Point(...) |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:42:20:42:22 | 0.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:42:28:42:30 | 0.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:43:7:43:7 | e |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:43:11:43:15 | Point |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:43:11:43:31 | Point(...) |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:43:20:43:22 | 1.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:43:28:43:30 | 1.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:44:7:44:10 | line |  | key_paths.swift:17:1:25:1 | Line |
+| key_paths.swift:44:14:44:17 | Line |  | key_paths.swift:17:1:25:1 | Line |
+| key_paths.swift:44:14:44:35 | Line(...) |  | key_paths.swift:17:1:25:1 | Line |
+| key_paths.swift:44:26:44:26 | s |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:44:34:44:34 | e |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:45:16:45:19 | line |  | key_paths.swift:17:1:25:1 | Line |
+| key_paths.swift:46:14:46:17 | line |  | key_paths.swift:17:1:25:1 | Line |
+| key_paths.swift:53:13:53:14 | 42 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:59:7:59:10 | name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:60:7:60:13 | address |  | {EXTERNAL LOCATION} | Optional |
+| key_paths.swift:60:7:60:13 | address | Wrapped | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:62:8:62:11 | name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:62:22:62:28 | address |  | {EXTERNAL LOCATION} | Optional |
+| key_paths.swift:62:22:62:28 | address | Wrapped | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:62:41:65:3 | Block |  | {EXTERNAL LOCATION} | Optional |
+| key_paths.swift:62:41:65:3 | Block | Wrapped | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:63:5:63:8 | self |  | key_paths.swift:58:1:66:1 | Person |
+| key_paths.swift:63:5:63:13 | ... .name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:63:5:63:20 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:63:17:63:20 | name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:64:5:64:8 | self |  | key_paths.swift:58:1:66:1 | Person |
+| key_paths.swift:64:5:64:16 | ... .address |  | {EXTERNAL LOCATION} | Optional |
+| key_paths.swift:64:5:64:16 | ... .address | Wrapped | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:64:5:64:26 | ... = ... |  | {EXTERNAL LOCATION} | Optional |
+| key_paths.swift:64:5:64:26 | ... = ... | Wrapped | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:64:20:64:26 | address |  | {EXTERNAL LOCATION} | Optional |
+| key_paths.swift:64:20:64:26 | address | Wrapped | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:69:7:69:10 | city |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:70:7:70:9 | zip |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:72:8:72:11 | city |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:72:22:72:24 | zip |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:72:35:75:3 | Block |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:73:5:73:8 | self |  | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:73:5:73:13 | ... .city |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:73:5:73:20 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:73:17:73:20 | city |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:74:5:74:8 | self |  | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:74:5:74:12 | ... .zip |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:74:5:74:18 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:74:16:74:18 | zip |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:80:7:80:10 | addr |  | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:80:14:80:20 | Address |  | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:80:14:80:47 | Address(...) |  | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:80:28:80:32 | "NYC" |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:80:40:80:46 | "10001" |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:81:7:81:12 | person |  | key_paths.swift:58:1:66:1 | Person |
+| key_paths.swift:81:16:81:21 | Person |  | key_paths.swift:58:1:66:1 | Person |
+| key_paths.swift:81:16:81:51 | Person(...) |  | key_paths.swift:58:1:66:1 | Person |
+| key_paths.swift:81:29:81:35 | "Alice" |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:81:47:81:50 | addr |  | key_paths.swift:68:1:76:1 | Address |
+| key_paths.swift:83:14:83:19 | person |  | key_paths.swift:58:1:66:1 | Person |
+| key_paths.swift:89:7:89:10 | name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:90:7:90:12 | salary |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:92:8:92:11 | name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:92:22:92:27 | salary |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:92:35:95:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:93:5:93:8 | self |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:93:5:93:13 | ... .name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:93:5:93:20 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:93:17:93:20 | name |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:94:5:94:8 | self |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:94:5:94:15 | ... .salary |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:94:5:94:24 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:94:19:94:24 | salary |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:98:27:98:31 | items |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:98:27:98:31 | items | Element | key_paths.swift:98:19:98:19 | T |
+| key_paths.swift:98:39:98:45 | keyPath | unknown type parameter 0 | key_paths.swift:98:19:98:19 | T |
+| key_paths.swift:98:39:98:45 | keyPath | unknown type parameter 1 | key_paths.swift:98:22:98:22 | V |
+| key_paths.swift:98:70:100:1 | Block |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:99:10:99:14 | items |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:99:10:99:14 | items | Element | key_paths.swift:98:19:98:19 | T |
+| key_paths.swift:99:10:99:43 | ... .map(...) |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:99:20:99:43 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| key_paths.swift:99:34:99:40 | keyPath | unknown type parameter 0 | key_paths.swift:98:19:98:19 | T |
+| key_paths.swift:99:34:99:40 | keyPath | unknown type parameter 1 | key_paths.swift:98:22:98:22 | V |
+| key_paths.swift:103:7:103:8 | e1 |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:103:12:103:19 | Employee |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:103:12:103:47 | Employee(...) |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:103:27:103:33 | "Alice" |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:103:44:103:46 | 100 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:104:7:104:8 | e2 |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:104:12:104:19 | Employee |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:104:12:104:45 | Employee(...) |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:104:27:104:31 | "Bob" |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:104:42:104:44 | 200 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:105:7:105:15 | employees |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:105:7:105:15 | employees | Element | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:105:19:105:26 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:105:19:105:26 | ArrayLiteral | Element | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:105:20:105:21 | e1 |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:105:24:105:25 | e2 |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:106:7:106:11 | names |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:106:15:106:54 | extractField(...) |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:106:28:106:36 | employees |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:106:28:106:36 | employees | Element | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:107:14:107:18 | names |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:107:20:107:20 | 0 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:108:7:108:14 | salaries |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:108:18:108:59 | extractField(...) |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:108:31:108:39 | employees |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:108:31:108:39 | employees | Element | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:109:16:109:23 | salaries |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:109:25:109:25 | 0 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:115:7:115:10 | item |  | key_paths.swift:114:19:114:19 | T |
+| key_paths.swift:117:8:117:11 | item |  | key_paths.swift:114:19:114:19 | T |
+| key_paths.swift:117:17:119:3 | Block |  | key_paths.swift:114:19:114:19 | T |
+| key_paths.swift:118:5:118:8 | self |  | key_paths.swift:114:1:120:1 | KPContainer |
+| key_paths.swift:118:5:118:8 | self | T | key_paths.swift:114:19:114:19 | T |
+| key_paths.swift:118:5:118:13 | ... .item |  | key_paths.swift:114:19:114:19 | T |
+| key_paths.swift:118:5:118:20 | ... = ... |  | key_paths.swift:114:19:114:19 | T |
+| key_paths.swift:118:17:118:20 | item |  | key_paths.swift:114:19:114:19 | T |
+| key_paths.swift:124:7:124:7 | c |  | key_paths.swift:114:1:120:1 | KPContainer |
+| key_paths.swift:124:7:124:7 | c | T | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:124:11:124:21 | KPContainer |  | key_paths.swift:114:1:120:1 | KPContainer |
+| key_paths.swift:124:11:124:21 | KPContainer | T | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:124:11:124:31 | KPContainer(...) |  | key_paths.swift:114:1:120:1 | KPContainer |
+| key_paths.swift:124:11:124:31 | KPContainer(...) | T | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:124:29:124:30 | 42 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:125:11:125:11 | c |  | key_paths.swift:114:1:120:1 | KPContainer |
+| key_paths.swift:125:11:125:11 | c | T | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:131:7:131:7 | p |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:131:11:131:15 | Point |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:131:11:131:31 | Point(...) |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:131:20:131:22 | 1.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:131:28:131:30 | 2.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:133:3:133:3 | p |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:133:3:133:17 | p(...) |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:133:3:133:24 | ... = ... |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:133:21:133:24 | 10.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:134:14:134:14 | p |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:144:7:144:7 | s |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:144:11:144:15 | Point |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:144:11:144:31 | Point(...) |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:144:20:144:22 | 5.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:144:28:144:30 | 6.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:145:7:145:7 | e |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:145:11:145:15 | Point |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:145:11:145:31 | Point(...) |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:145:20:145:22 | 7.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:145:28:145:30 | 8.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:146:7:146:10 | line |  | key_paths.swift:17:1:25:1 | Line |
+| key_paths.swift:146:14:146:17 | Line |  | key_paths.swift:17:1:25:1 | Line |
+| key_paths.swift:146:14:146:35 | Line(...) |  | key_paths.swift:17:1:25:1 | Line |
+| key_paths.swift:146:26:146:26 | s |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:146:34:146:34 | e |  | key_paths.swift:3:1:15:1 | Point |
+| key_paths.swift:147:13:147:16 | line |  | key_paths.swift:17:1:25:1 | Line |
+| key_paths.swift:153:7:153:8 | e1 |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:153:12:153:19 | Employee |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:153:12:153:47 | Employee(...) |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:153:27:153:33 | "Alice" |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:153:44:153:46 | 100 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:154:7:154:8 | e2 |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:154:12:154:19 | Employee |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:154:12:154:45 | Employee(...) |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:154:27:154:31 | "Bob" |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:154:42:154:44 | 200 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:155:7:155:15 | employees |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:155:7:155:15 | employees | Element | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:155:19:155:26 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:155:19:155:26 | ArrayLiteral | Element | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:155:20:155:21 | e1 |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:155:24:155:25 | e2 |  | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:156:7:156:11 | names |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:156:15:156:23 | employees |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:156:15:156:23 | employees | Element | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:156:15:156:35 | ... .map(...) |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:157:14:157:18 | names |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:157:20:157:20 | 0 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:158:7:158:14 | salaries |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:158:18:158:26 | employees |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:158:18:158:26 | employees | Element | key_paths.swift:88:1:96:1 | Employee |
+| key_paths.swift:158:18:158:40 | ... .map(...) |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:159:16:159:23 | salaries |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:159:25:159:25 | 0 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:165:7:165:11 | color |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:167:8:167:12 | color |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:167:23:169:3 | Block |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:168:5:168:8 | self |  | key_paths.swift:164:1:170:1 | Shape2 |
+| key_paths.swift:168:5:168:14 | ... .color |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:168:5:168:22 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:168:18:168:22 | color |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:173:7:173:12 | radius |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:175:8:175:12 | color |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:175:23:175:28 | radius |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:175:39:178:3 | Block |  | key_paths.swift:164:1:170:1 | Shape2 |
+| key_paths.swift:176:5:176:8 | self |  | key_paths.swift:172:1:179:1 | Circle2 |
+| key_paths.swift:176:5:176:15 | ... .radius |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:176:5:176:24 | ... = ... |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:176:19:176:24 | radius |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:177:5:177:9 | super |  | key_paths.swift:164:1:170:1 | Shape2 |
+| key_paths.swift:177:5:177:28 | ... .init(...) |  | key_paths.swift:164:1:170:1 | Shape2 |
+| key_paths.swift:177:23:177:27 | color |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:185:7:185:7 | c |  | key_paths.swift:172:1:179:1 | Circle2 |
+| key_paths.swift:185:11:185:17 | Circle2 |  | key_paths.swift:172:1:179:1 | Circle2 |
+| key_paths.swift:185:11:185:44 | Circle2(...) |  | key_paths.swift:172:1:179:1 | Circle2 |
+| key_paths.swift:185:26:185:30 | "red" |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:185:41:185:43 | 5.0 |  | {EXTERNAL LOCATION} | Double |
+| key_paths.swift:186:13:186:13 | c |  | key_paths.swift:172:1:179:1 | Circle2 |
+| key_paths.swift:187:13:187:13 | c |  | key_paths.swift:172:1:179:1 | Circle2 |
+| key_paths.swift:195:7:195:11 | tuple |  | {EXTERNAL LOCATION} | Tuple2 |
+| key_paths.swift:195:7:195:11 | tuple | T0 | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:195:7:195:11 | tuple | T1 | {EXTERNAL LOCATION} | String |
+| key_paths.swift:195:15:195:27 | TupleExpr |  | {EXTERNAL LOCATION} | Tuple2 |
+| key_paths.swift:195:15:195:27 | TupleExpr | T0 | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:195:15:195:27 | TupleExpr | T1 | {EXTERNAL LOCATION} | String |
+| key_paths.swift:195:16:195:17 | 42 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:195:20:195:26 | "hello" |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:196:15:196:19 | tuple |  | {EXTERNAL LOCATION} | Tuple2 |
+| key_paths.swift:196:15:196:19 | tuple | T0 | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:196:15:196:19 | tuple | T1 | {EXTERNAL LOCATION} | String |
+| key_paths.swift:197:16:197:20 | tuple |  | {EXTERNAL LOCATION} | Tuple2 |
+| key_paths.swift:197:16:197:20 | tuple | T0 | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:197:16:197:20 | tuple | T1 | {EXTERNAL LOCATION} | String |
+| key_paths.swift:204:7:204:9 | arr |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:204:7:204:9 | arr | Element | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:204:13:204:24 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:204:13:204:24 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:204:14:204:15 | 10 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:204:18:204:19 | 20 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:204:22:204:23 | 30 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:205:15:205:17 | arr |  | {EXTERNAL LOCATION} | Array |
+| key_paths.swift:205:15:205:17 | arr | Element | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:208:15:208:17 | "x" |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:208:20:208:20 | 1 |  | {EXTERNAL LOCATION} | Int |
+| key_paths.swift:208:23:208:25 | "y" |  | {EXTERNAL LOCATION} | String |
+| key_paths.swift:208:28:208:28 | 2 |  | {EXTERNAL LOCATION} | Int |
+| lub.swift:12:7:12:7 | b |  | lub.swift:5:1:7:1 | B |
+| lub.swift:12:11:12:11 | B |  | lub.swift:5:1:7:1 | B |
+| lub.swift:12:11:12:13 | B(...) |  | lub.swift:5:1:7:1 | B |
+| lub.swift:13:7:13:7 | c |  | lub.swift:9:1:9:13 | C |
+| lub.swift:13:11:13:11 | C |  | lub.swift:9:1:9:13 | C |
+| lub.swift:13:11:13:13 | C(...) |  | lub.swift:9:1:9:13 | C |
+| lub.swift:14:7:14:7 | x |  | lub.swift:5:1:7:1 | B |
+| lub.swift:14:7:14:7 | x |  | lub.swift:9:1:9:13 | C |
+| lub.swift:14:11:14:11 | 2 |  | {EXTERNAL LOCATION} | Int |
+| lub.swift:14:11:14:15 | ... > ... |  | {EXTERNAL LOCATION} | Int |
+| lub.swift:14:11:14:23 | IfExpr |  | lub.swift:5:1:7:1 | B |
+| lub.swift:14:11:14:23 | IfExpr |  | lub.swift:9:1:9:13 | C |
+| lub.swift:14:15:14:15 | 3 |  | {EXTERNAL LOCATION} | Int |
+| lub.swift:14:19:14:19 | b |  | lub.swift:5:1:7:1 | B |
+| lub.swift:14:23:14:23 | c |  | lub.swift:9:1:9:13 | C |
+| overload_resolution.swift:4:17:4:17 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:4:35:6:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:5:12:5:16 | "int" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:8:17:8:17 | x |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:8:38:10:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:9:12:9:19 | "double" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:12:17:12:17 | x |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:12:38:14:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:13:12:13:19 | "string" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:16:17:16:17 | x |  | {EXTERNAL LOCATION} | Bool |
+| overload_resolution.swift:16:36:18:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:17:12:17:17 | "bool" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:22:7:22:7 | o |  | overload_resolution.swift:3:1:19:1 | OverloadByType |
+| overload_resolution.swift:22:11:22:24 | OverloadByType |  | overload_resolution.swift:3:1:19:1 | OverloadByType |
+| overload_resolution.swift:22:11:22:26 | OverloadByType(...) |  | overload_resolution.swift:3:1:19:1 | OverloadByType |
+| overload_resolution.swift:23:7:23:8 | r1 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:23:12:23:12 | o |  | overload_resolution.swift:3:1:19:1 | OverloadByType |
+| overload_resolution.swift:23:12:23:23 | ... .handle(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:23:21:23:22 | 42 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:24:7:24:8 | r2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:24:12:24:12 | o |  | overload_resolution.swift:3:1:19:1 | OverloadByType |
+| overload_resolution.swift:24:12:24:25 | ... .handle(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:24:21:24:24 | 3.14 |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:25:7:25:8 | r3 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:25:12:25:12 | o |  | overload_resolution.swift:3:1:19:1 | OverloadByType |
+| overload_resolution.swift:25:12:25:25 | ... .handle(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:25:21:25:24 | "hi" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:26:7:26:8 | r4 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:26:12:26:12 | o |  | overload_resolution.swift:3:1:19:1 | OverloadByType |
+| overload_resolution.swift:26:12:26:25 | ... .handle(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:26:21:26:24 | true |  | {EXTERNAL LOCATION} | Bool |
+| overload_resolution.swift:32:18:32:22 | width |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:32:40:34:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:33:12:33:18 | "width" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:36:18:36:23 | height |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:36:41:38:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:37:12:37:19 | "height" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:40:18:40:22 | width |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:40:30:40:35 | height |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:40:53:42:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:41:12:41:17 | "both" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:44:18:44:21 | size |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:44:39:46:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:45:12:45:17 | "size" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:50:7:50:7 | o |  | overload_resolution.swift:31:1:47:1 | OverloadByLabel |
+| overload_resolution.swift:50:11:50:25 | OverloadByLabel |  | overload_resolution.swift:31:1:47:1 | OverloadByLabel |
+| overload_resolution.swift:50:11:50:27 | OverloadByLabel(...) |  | overload_resolution.swift:31:1:47:1 | OverloadByLabel |
+| overload_resolution.swift:51:7:51:8 | r1 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:51:12:51:12 | o |  | overload_resolution.swift:31:1:47:1 | OverloadByLabel |
+| overload_resolution.swift:51:12:51:33 | ... .configure(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:51:31:51:32 | 10 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:52:7:52:8 | r2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:52:12:52:12 | o |  | overload_resolution.swift:31:1:47:1 | OverloadByLabel |
+| overload_resolution.swift:52:12:52:34 | ... .configure(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:52:32:52:33 | 20 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:53:7:53:8 | r3 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:53:12:53:12 | o |  | overload_resolution.swift:31:1:47:1 | OverloadByLabel |
+| overload_resolution.swift:53:12:53:45 | ... .configure(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:53:31:53:32 | 10 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:53:43:53:44 | 20 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:54:7:54:8 | r4 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:54:12:54:12 | o |  | overload_resolution.swift:31:1:47:1 | OverloadByLabel |
+| overload_resolution.swift:54:12:54:32 | ... .configure(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:54:30:54:31 | 30 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:60:25:62:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:61:12:61:12 | 0 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:64:18:64:18 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:64:33:66:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:65:12:65:12 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:68:18:68:18 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:68:28:68:28 | y |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:68:43:70:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:69:12:69:12 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:69:12:69:16 | ... + ... |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:69:16:69:16 | y |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:72:18:72:18 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:72:28:72:28 | y |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:72:38:72:38 | z |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:72:53:74:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:73:12:73:12 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:73:12:73:16 | ... + ... |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:73:12:73:20 | ... + ... |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:73:16:73:16 | y |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:73:20:73:20 | z |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:78:7:78:7 | o |  | overload_resolution.swift:59:1:75:1 | OverloadByArity |
+| overload_resolution.swift:78:11:78:25 | OverloadByArity |  | overload_resolution.swift:59:1:75:1 | OverloadByArity |
+| overload_resolution.swift:78:11:78:27 | OverloadByArity(...) |  | overload_resolution.swift:59:1:75:1 | OverloadByArity |
+| overload_resolution.swift:79:7:79:8 | r0 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:79:12:79:12 | o |  | overload_resolution.swift:59:1:75:1 | OverloadByArity |
+| overload_resolution.swift:79:12:79:22 | ... .compute(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:80:7:80:8 | r1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:80:12:80:12 | o |  | overload_resolution.swift:59:1:75:1 | OverloadByArity |
+| overload_resolution.swift:80:12:80:23 | ... .compute(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:80:22:80:22 | 1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:81:7:81:8 | r2 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:81:12:81:12 | o |  | overload_resolution.swift:59:1:75:1 | OverloadByArity |
+| overload_resolution.swift:81:12:81:26 | ... .compute(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:81:22:81:22 | 1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:81:25:81:25 | 2 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:82:7:82:8 | r3 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:82:12:82:12 | o |  | overload_resolution.swift:59:1:75:1 | OverloadByArity |
+| overload_resolution.swift:82:12:82:29 | ... .compute(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:82:22:82:22 | 1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:82:25:82:25 | 2 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:82:28:82:28 | 3 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:88:24:90:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:89:12:89:12 | 0 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:92:27:94:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:93:12:93:13 | "" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:96:27:98:3 | Block |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:97:12:97:14 | 0.0 |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:102:7:102:7 | o |  | overload_resolution.swift:87:1:99:1 | OverloadByReturn |
+| overload_resolution.swift:102:11:102:26 | OverloadByReturn |  | overload_resolution.swift:87:1:99:1 | OverloadByReturn |
+| overload_resolution.swift:102:11:102:28 | OverloadByReturn(...) |  | overload_resolution.swift:87:1:99:1 | OverloadByReturn |
+| overload_resolution.swift:103:7:103:8 | r1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:103:17:103:17 | o |  | overload_resolution.swift:87:1:99:1 | OverloadByReturn |
+| overload_resolution.swift:103:17:103:26 | ... .create(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:103:17:103:26 | ... .create(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:103:17:103:26 | ... .create(...) |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:104:7:104:8 | r2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:104:20:104:20 | o |  | overload_resolution.swift:87:1:99:1 | OverloadByReturn |
+| overload_resolution.swift:104:20:104:29 | ... .create(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:104:20:104:29 | ... .create(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:104:20:104:29 | ... .create(...) |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:105:7:105:8 | r3 |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:105:20:105:20 | o |  | overload_resolution.swift:87:1:99:1 | OverloadByReturn |
+| overload_resolution.swift:105:20:105:29 | ... .create(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:105:20:105:29 | ... .create(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:105:20:105:29 | ... .create(...) |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:111:18:111:18 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:111:36:113:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:112:12:112:21 | "concrete" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:115:21:115:21 | x |  | overload_resolution.swift:115:16:115:16 | T |
+| overload_resolution.swift:115:37:117:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:116:12:116:20 | "generic" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:121:7:121:7 | o |  | overload_resolution.swift:110:1:118:1 | OverloadGenericVsConcrete |
+| overload_resolution.swift:121:11:121:35 | OverloadGenericVsConcrete |  | overload_resolution.swift:110:1:118:1 | OverloadGenericVsConcrete |
+| overload_resolution.swift:121:11:121:37 | OverloadGenericVsConcrete(...) |  | overload_resolution.swift:110:1:118:1 | OverloadGenericVsConcrete |
+| overload_resolution.swift:122:7:122:8 | r1 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:122:12:122:12 | o |  | overload_resolution.swift:110:1:118:1 | OverloadGenericVsConcrete |
+| overload_resolution.swift:122:12:122:24 | ... .process(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:122:22:122:23 | 42 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:123:7:123:8 | r2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:123:12:123:12 | o |  | overload_resolution.swift:110:1:118:1 | OverloadGenericVsConcrete |
+| overload_resolution.swift:123:12:123:29 | ... .process(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:123:22:123:28 | "hello" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:124:7:124:8 | r3 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:124:12:124:12 | o |  | overload_resolution.swift:110:1:118:1 | OverloadGenericVsConcrete |
+| overload_resolution.swift:124:12:124:26 | ... .process(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:124:22:124:25 | true |  | {EXTERNAL LOCATION} | Bool |
+| overload_resolution.swift:129:21:129:21 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:129:39:131:1 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:130:10:130:14 | "int" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:133:21:133:21 | x |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:133:42:135:1 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:134:10:134:17 | "string" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:137:21:137:21 | x |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:137:42:139:1 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:138:10:138:17 | "double" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:142:7:142:8 | r1 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:142:12:142:27 | freeOverload(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:142:25:142:26 | 42 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:143:7:143:8 | r2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:143:12:143:29 | freeOverload(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:143:25:143:28 | "hi" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:144:7:144:8 | r3 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:144:12:144:28 | freeOverload(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:144:25:144:27 | 1.5 |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:150:7:150:11 | value |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:152:10:154:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:153:5:153:9 | value |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:153:5:153:21 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:153:13:153:21 | "default" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:156:8:156:10 | int |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:156:18:158:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:157:5:157:9 | value |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:157:5:157:17 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:157:13:157:17 | "int" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:160:8:160:10 | str |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:160:21:162:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:161:5:161:9 | value |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:161:5:161:15 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:161:13:161:15 | str |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:164:8:164:8 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:164:16:164:16 | y |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:164:24:166:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:165:5:165:9 | value |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:165:5:165:18 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:165:13:165:18 | "pair" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:168:29:170:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:169:12:169:16 | value |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:174:7:174:8 | m1 |  | overload_resolution.swift:149:1:171:1 | MultiInit |
+| overload_resolution.swift:174:12:174:20 | MultiInit |  | overload_resolution.swift:149:1:171:1 | MultiInit |
+| overload_resolution.swift:174:12:174:22 | MultiInit(...) |  | overload_resolution.swift:149:1:171:1 | MultiInit |
+| overload_resolution.swift:175:7:175:8 | m2 |  | overload_resolution.swift:149:1:171:1 | MultiInit |
+| overload_resolution.swift:175:12:175:20 | MultiInit |  | overload_resolution.swift:149:1:171:1 | MultiInit |
+| overload_resolution.swift:175:12:175:28 | MultiInit(...) |  | overload_resolution.swift:149:1:171:1 | MultiInit |
+| overload_resolution.swift:175:27:175:27 | 5 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:176:7:176:8 | m3 |  | overload_resolution.swift:149:1:171:1 | MultiInit |
+| overload_resolution.swift:176:12:176:20 | MultiInit |  | overload_resolution.swift:149:1:171:1 | MultiInit |
+| overload_resolution.swift:176:12:176:30 | MultiInit(...) |  | overload_resolution.swift:149:1:171:1 | MultiInit |
+| overload_resolution.swift:176:27:176:29 | "x" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:177:7:177:8 | m4 |  | overload_resolution.swift:149:1:171:1 | MultiInit |
+| overload_resolution.swift:177:12:177:20 | MultiInit |  | overload_resolution.swift:149:1:171:1 | MultiInit |
+| overload_resolution.swift:177:12:177:32 | MultiInit(...) |  | overload_resolution.swift:149:1:171:1 | MultiInit |
+| overload_resolution.swift:177:25:177:25 | 1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:177:31:177:31 | 2 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:178:7:178:7 | v |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:178:11:178:12 | m1 |  | overload_resolution.swift:149:1:171:1 | MultiInit |
+| overload_resolution.swift:178:11:178:23 | ... .getValue(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:184:27:186:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:185:12:185:21 | "instance" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:188:34:190:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:189:12:189:19 | "static" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:194:7:194:7 | o |  | overload_resolution.swift:183:1:191:1 | StaticVsInstance |
+| overload_resolution.swift:194:11:194:26 | StaticVsInstance |  | overload_resolution.swift:183:1:191:1 | StaticVsInstance |
+| overload_resolution.swift:194:11:194:28 | StaticVsInstance(...) |  | overload_resolution.swift:183:1:191:1 | StaticVsInstance |
+| overload_resolution.swift:195:7:195:8 | r1 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:195:12:195:12 | o |  | overload_resolution.swift:183:1:191:1 | StaticVsInstance |
+| overload_resolution.swift:195:12:195:21 | ... .action(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:196:7:196:8 | r2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:196:12:196:36 | ... .action(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:206:29:208:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:207:12:207:20 | "default" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:210:26:212:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:211:12:211:18 | "extra" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:218:29:220:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:219:12:219:21 | "concrete" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:224:7:224:7 | d |  | overload_resolution.swift:215:1:221:1 | DescribableImpl |
+| overload_resolution.swift:224:11:224:25 | DescribableImpl |  | overload_resolution.swift:215:1:221:1 | DescribableImpl |
+| overload_resolution.swift:224:11:224:27 | DescribableImpl(...) |  | overload_resolution.swift:215:1:221:1 | DescribableImpl |
+| overload_resolution.swift:225:7:225:8 | r1 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:225:12:225:12 | d |  | overload_resolution.swift:215:1:221:1 | DescribableImpl |
+| overload_resolution.swift:225:12:225:23 | ... .describe(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:226:7:226:8 | r2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:226:12:226:12 | d |  | overload_resolution.swift:215:1:221:1 | DescribableImpl |
+| overload_resolution.swift:226:12:226:20 | ... .extra(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:234:27:236:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:235:12:235:17 | "base" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:238:29:240:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:239:12:239:21 | "baseOnly" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:244:19:246:3 | Block |  | overload_resolution.swift:231:1:241:1 | Base |
+| overload_resolution.swift:245:5:245:9 | super |  | overload_resolution.swift:231:1:241:1 | Base |
+| overload_resolution.swift:245:5:245:16 | ... .init(...) |  | overload_resolution.swift:231:1:241:1 | Base |
+| overload_resolution.swift:248:36:250:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:249:12:249:16 | "sub" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:252:28:254:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:253:12:253:20 | "subOnly" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:258:19:260:3 | Block |  | overload_resolution.swift:243:1:255:1 | Sub |
+| overload_resolution.swift:259:5:259:9 | super |  | overload_resolution.swift:243:1:255:1 | Sub |
+| overload_resolution.swift:259:5:259:16 | ... .init(...) |  | overload_resolution.swift:243:1:255:1 | Sub |
+| overload_resolution.swift:262:36:264:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:263:12:263:19 | "subsub" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:268:7:268:7 | b |  | overload_resolution.swift:231:1:241:1 | Base |
+| overload_resolution.swift:268:11:268:14 | Base |  | overload_resolution.swift:231:1:241:1 | Base |
+| overload_resolution.swift:268:11:268:16 | Base(...) |  | overload_resolution.swift:231:1:241:1 | Base |
+| overload_resolution.swift:269:7:269:8 | rb |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:269:12:269:12 | b |  | overload_resolution.swift:231:1:241:1 | Base |
+| overload_resolution.swift:269:12:269:21 | ... .action(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:271:7:271:7 | s |  | overload_resolution.swift:243:1:255:1 | Sub |
+| overload_resolution.swift:271:11:271:13 | Sub |  | overload_resolution.swift:243:1:255:1 | Sub |
+| overload_resolution.swift:271:11:271:15 | Sub(...) |  | overload_resolution.swift:243:1:255:1 | Sub |
+| overload_resolution.swift:272:7:272:8 | rs |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:272:12:272:12 | s |  | overload_resolution.swift:243:1:255:1 | Sub |
+| overload_resolution.swift:272:12:272:21 | ... .action(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:273:7:273:9 | rbo |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:273:13:273:13 | s |  | overload_resolution.swift:243:1:255:1 | Sub |
+| overload_resolution.swift:273:13:273:24 | ... .baseOnly(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:274:7:274:9 | rso |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:274:13:274:13 | s |  | overload_resolution.swift:243:1:255:1 | Sub |
+| overload_resolution.swift:274:13:274:23 | ... .subOnly(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:276:7:276:8 | ss |  | overload_resolution.swift:257:1:265:1 | SubSub |
+| overload_resolution.swift:276:12:276:17 | SubSub |  | overload_resolution.swift:257:1:265:1 | SubSub |
+| overload_resolution.swift:276:12:276:19 | SubSub(...) |  | overload_resolution.swift:257:1:265:1 | SubSub |
+| overload_resolution.swift:277:7:277:9 | rss |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:277:13:277:14 | ss |  | overload_resolution.swift:257:1:265:1 | SubSub |
+| overload_resolution.swift:277:13:277:23 | ... .action(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:278:7:278:10 | rbo2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:278:14:278:15 | ss |  | overload_resolution.swift:257:1:265:1 | SubSub |
+| overload_resolution.swift:278:14:278:26 | ... .baseOnly(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:279:7:279:10 | rso2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:279:14:279:15 | ss |  | overload_resolution.swift:257:1:265:1 | SubSub |
+| overload_resolution.swift:279:14:279:25 | ... .subOnly(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:285:16:285:21 | target |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:285:42:287:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:286:12:286:17 | target |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:289:18:289:23 | source |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:289:44:291:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:290:12:290:17 | source |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:293:16:293:21 | target |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:293:37:293:42 | source |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:293:63:295:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:294:12:294:17 | target |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:294:12:294:26 | ... + ... |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:294:21:294:26 | source |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:299:7:299:7 | o |  | overload_resolution.swift:284:1:296:1 | LabelVariants |
+| overload_resolution.swift:299:11:299:23 | LabelVariants |  | overload_resolution.swift:284:1:296:1 | LabelVariants |
+| overload_resolution.swift:299:11:299:25 | LabelVariants(...) |  | overload_resolution.swift:284:1:296:1 | LabelVariants |
+| overload_resolution.swift:300:7:300:8 | r1 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:300:12:300:12 | o |  | overload_resolution.swift:284:1:296:1 | LabelVariants |
+| overload_resolution.swift:300:12:300:26 | ... .send(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:300:23:300:25 | "x" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:301:7:301:8 | r2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:301:12:301:12 | o |  | overload_resolution.swift:284:1:296:1 | LabelVariants |
+| overload_resolution.swift:301:12:301:28 | ... .send(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:301:25:301:27 | "y" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:302:7:302:8 | r3 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:302:12:302:12 | o |  | overload_resolution.swift:284:1:296:1 | LabelVariants |
+| overload_resolution.swift:302:12:302:37 | ... .send(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:302:23:302:25 | "x" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:302:34:302:36 | "y" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:312:29:312:40 | Block |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:312:38:312:38 | 0 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:316:32:316:45 | Block |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:316:41:316:43 | 0.0 |  | {EXTERNAL LOCATION} | Double |
+| overload_resolution.swift:319:35:319:35 | x |  | overload_resolution.swift:319:20:319:30 | T |
+| overload_resolution.swift:319:46:321:1 | Block |  | overload_resolution.swift:319:20:319:30 | T |
+| overload_resolution.swift:320:10:320:10 | x |  | overload_resolution.swift:319:20:319:30 | T |
+| overload_resolution.swift:323:36:323:36 | x |  | overload_resolution.swift:323:20:323:31 | T |
+| overload_resolution.swift:323:47:325:1 | Block |  | overload_resolution.swift:323:20:323:31 | T |
+| overload_resolution.swift:324:10:324:10 | x |  | overload_resolution.swift:323:20:323:31 | T |
+| overload_resolution.swift:328:7:328:8 | r1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:328:12:328:28 | constrainedId(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:328:26:328:27 | 42 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:329:7:329:8 | r2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:329:12:329:33 | constrainedId(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:329:26:329:32 | "hello" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:335:7:335:10 | item |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:337:10:337:13 | item |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:337:19:339:3 | Block |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:338:5:338:8 | self |  | overload_resolution.swift:334:1:348:1 | Box |
+| overload_resolution.swift:338:5:338:8 | self | T | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:338:5:338:13 | ... .item |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:338:5:338:20 | ... = ... |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:338:17:338:20 | item |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:341:19:343:3 | Block |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:342:12:342:15 | item |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:345:18:345:24 | newItem |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:345:30:347:3 | Block |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:346:5:346:8 | item |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:346:5:346:18 | ... = ... |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:346:12:346:18 | newItem |  | overload_resolution.swift:334:11:334:11 | T |
+| overload_resolution.swift:351:7:351:12 | intBox |  | overload_resolution.swift:334:1:348:1 | Box |
+| overload_resolution.swift:351:7:351:12 | intBox | T | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:351:16:351:18 | Box |  | overload_resolution.swift:334:1:348:1 | Box |
+| overload_resolution.swift:351:16:351:18 | Box | T | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:351:16:351:22 | Box(...) |  | overload_resolution.swift:334:1:348:1 | Box |
+| overload_resolution.swift:351:16:351:22 | Box(...) | T | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:351:20:351:21 | 10 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:352:7:352:12 | strBox |  | overload_resolution.swift:334:1:348:1 | Box |
+| overload_resolution.swift:352:7:352:12 | strBox | T | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:352:16:352:18 | Box |  | overload_resolution.swift:334:1:348:1 | Box |
+| overload_resolution.swift:352:16:352:18 | Box | T | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:352:16:352:24 | Box(...) |  | overload_resolution.swift:334:1:348:1 | Box |
+| overload_resolution.swift:352:16:352:24 | Box(...) | T | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:352:20:352:23 | "hi" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:353:7:353:8 | v1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:353:12:353:17 | intBox |  | overload_resolution.swift:334:1:348:1 | Box |
+| overload_resolution.swift:353:12:353:17 | intBox | T | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:353:12:353:23 | ... .get(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:354:7:354:8 | v2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:354:12:354:17 | strBox |  | overload_resolution.swift:334:1:348:1 | Box |
+| overload_resolution.swift:354:12:354:17 | strBox | T | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:354:12:354:23 | ... .get(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:355:3:355:8 | intBox |  | overload_resolution.swift:334:1:348:1 | Box |
+| overload_resolution.swift:355:3:355:8 | intBox | T | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:355:18:355:19 | 20 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:356:3:356:8 | strBox |  | overload_resolution.swift:334:1:348:1 | Box |
+| overload_resolution.swift:356:3:356:8 | strBox | T | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:356:18:356:22 | "bye" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:362:7:362:10 | name |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:363:7:363:10 | size |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:365:8:365:11 | name |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:365:22:365:25 | size |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:365:33:368:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:366:5:366:8 | self |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:366:5:366:13 | ... .name |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:366:5:366:20 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:366:17:366:20 | name |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:367:5:367:8 | self |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:367:5:367:13 | ... .size |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:367:5:367:20 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:367:17:367:20 | size |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:370:20:370:23 | name |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:370:34:372:3 | Block |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:371:5:371:8 | self |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:371:5:371:34 | ... .init(...) |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:371:21:371:24 | name |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:371:33:371:33 | 1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:374:20:374:23 | size |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:374:31:376:3 | Block |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:375:5:375:8 | self |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:375:5:375:42 | ... .init(...) |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:375:21:375:29 | "default" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:375:38:375:41 | size |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:380:7:380:8 | w1 |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:380:12:380:17 | Widget |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:380:12:380:37 | Widget(...) |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:380:25:380:27 | "a" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:380:36:380:36 | 5 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:381:7:381:8 | w2 |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:381:12:381:17 | Widget |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:381:12:381:28 | Widget(...) |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:381:25:381:27 | "b" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:382:7:382:8 | w3 |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:382:12:382:17 | Widget |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:382:12:382:27 | Widget(...) |  | overload_resolution.swift:361:1:377:1 | Widget |
+| overload_resolution.swift:382:25:382:26 | 10 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:388:16:388:16 | f |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:388:16:388:16 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| overload_resolution.swift:388:16:388:16 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:388:16:388:16 | f | Return | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:388:40:390:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:389:12:389:12 | f |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:389:12:389:12 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| overload_resolution.swift:389:12:389:12 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:389:12:389:12 | f | Return | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:389:12:389:15 | f(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:389:14:389:14 | 0 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:392:16:392:16 | f |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:392:16:392:16 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| overload_resolution.swift:392:16:392:16 | f | Args.T0 | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:392:16:392:16 | f | Return | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:392:49:394:3 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:393:12:393:12 | f |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:393:12:393:12 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| overload_resolution.swift:393:12:393:12 | f | Args.T0 | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:393:12:393:12 | f | Return | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:393:12:393:16 | f(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:393:14:393:15 | "" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:396:16:396:16 | f |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:396:16:396:16 | f | Args | {EXTERNAL LOCATION} | Tuple2 |
+| overload_resolution.swift:396:16:396:16 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:396:16:396:16 | f | Args.T1 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:396:16:396:16 | f | Return | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:396:45:398:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:397:12:397:12 | f |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:397:12:397:12 | f | Args | {EXTERNAL LOCATION} | Tuple2 |
+| overload_resolution.swift:397:12:397:12 | f | Args.T0 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:397:12:397:12 | f | Args.T1 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:397:12:397:12 | f | Return | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:397:12:397:18 | f(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:397:14:397:14 | 0 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:397:17:397:17 | 0 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:402:7:402:7 | p |  | overload_resolution.swift:387:1:399:1 | Processor |
+| overload_resolution.swift:402:11:402:19 | Processor |  | overload_resolution.swift:387:1:399:1 | Processor |
+| overload_resolution.swift:402:11:402:21 | Processor(...) |  | overload_resolution.swift:387:1:399:1 | Processor |
+| overload_resolution.swift:403:7:403:8 | r1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:403:7:403:8 | r1 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:403:12:403:12 | p |  | overload_resolution.swift:387:1:399:1 | Processor |
+| overload_resolution.swift:403:12:403:34 | ... .apply(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:403:12:403:34 | ... .apply(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:403:20:403:33 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:403:20:403:33 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| overload_resolution.swift:403:20:403:33 | FunctionExpr | Args.T0 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:403:20:403:33 | FunctionExpr | Args.T0 | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:403:20:403:33 | FunctionExpr | Return | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:403:22:403:22 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:403:22:403:22 | x |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:403:27:403:27 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:403:27:403:27 | x |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:403:27:403:31 | ... + ... |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:403:27:403:31 | Block |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:403:31:403:31 | 1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:404:7:404:8 | r2 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:404:7:404:8 | r2 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:404:12:404:12 | p |  | overload_resolution.swift:387:1:399:1 | Processor |
+| overload_resolution.swift:404:12:404:36 | ... .apply(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:404:12:404:36 | ... .apply(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:404:20:404:35 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:404:20:404:35 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| overload_resolution.swift:404:20:404:35 | FunctionExpr | Args.T0 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:404:20:404:35 | FunctionExpr | Args.T0 | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:404:20:404:35 | FunctionExpr | Return | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:404:22:404:22 | s |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:404:22:404:22 | s |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:404:27:404:27 | s |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:404:27:404:27 | s |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:404:27:404:33 | ... + ... |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:404:27:404:33 | Block |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:404:31:404:33 | "!" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:405:7:405:8 | r3 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:405:7:405:8 | r3 |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:405:12:405:12 | p |  | overload_resolution.swift:387:1:399:1 | Processor |
+| overload_resolution.swift:405:12:405:37 | ... .apply(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:405:12:405:37 | ... .apply(...) |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:405:20:405:36 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| overload_resolution.swift:405:20:405:36 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple2 |
+| overload_resolution.swift:405:20:405:36 | FunctionExpr | Args.T0 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:405:20:405:36 | FunctionExpr | Args.T1 | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:405:20:405:36 | FunctionExpr | Return | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:405:22:405:22 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:405:25:405:25 | y |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:405:30:405:30 | x |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:405:30:405:34 | ... + ... |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:405:30:405:34 | Block |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:405:34:405:34 | y |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:411:7:411:10 | data |  | {EXTERNAL LOCATION} | Array |
+| overload_resolution.swift:411:7:411:10 | data | Element | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:411:21:411:29 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| overload_resolution.swift:411:21:411:29 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:411:22:411:22 | 1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:411:25:411:25 | 2 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:411:28:411:28 | 3 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:412:7:412:10 | dict |  | {EXTERNAL LOCATION} | Dictionary |
+| overload_resolution.swift:412:7:412:10 | dict | Key | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:412:7:412:10 | dict | Value | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:412:30:412:32 | "a" |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:412:35:412:35 | 1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:414:14:414:18 | index |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:415:12:415:15 | data |  | {EXTERNAL LOCATION} | Array |
+| overload_resolution.swift:415:12:415:15 | data | Element | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:415:17:415:21 | index |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:418:14:418:16 | key |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:419:12:419:15 | dict |  | {EXTERNAL LOCATION} | Dictionary |
+| overload_resolution.swift:419:12:419:15 | dict | Key | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:419:12:419:15 | dict | Value | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:419:17:419:19 | key |  | {EXTERNAL LOCATION} | String |
+| overload_resolution.swift:419:25:419:25 | 0 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:424:7:424:8 | ms |  | overload_resolution.swift:410:1:421:1 | MultiSubscript |
+| overload_resolution.swift:424:12:424:25 | MultiSubscript |  | overload_resolution.swift:410:1:421:1 | MultiSubscript |
+| overload_resolution.swift:424:12:424:27 | MultiSubscript(...) |  | overload_resolution.swift:410:1:421:1 | MultiSubscript |
+| overload_resolution.swift:425:7:425:8 | r1 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:425:12:425:13 | ms |  | overload_resolution.swift:410:1:421:1 | MultiSubscript |
+| overload_resolution.swift:425:12:425:20 | ... .get(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:425:19:425:19 | 0 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:426:7:426:8 | r2 |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:426:12:426:13 | ms |  | overload_resolution.swift:410:1:421:1 | MultiSubscript |
+| overload_resolution.swift:426:12:426:22 | ... .get(...) |  | {EXTERNAL LOCATION} | Int |
+| overload_resolution.swift:426:19:426:21 | "a" |  | {EXTERNAL LOCATION} | String |
+| pattern_matching.swift:1:26:1:29 | pair |  | {EXTERNAL LOCATION} | Tuple2 |
+| pattern_matching.swift:1:26:1:29 | pair | T0 | {EXTERNAL LOCATION} | Int |
+| pattern_matching.swift:1:26:1:29 | pair | T1 | {EXTERNAL LOCATION} | String |
+| pattern_matching.swift:2:7:2:20 | TupleExpr |  | {EXTERNAL LOCATION} | Tuple2 |
+| pattern_matching.swift:2:7:2:20 | TupleExpr | T0 | {EXTERNAL LOCATION} | Int |
+| pattern_matching.swift:2:7:2:20 | TupleExpr | T1 | {EXTERNAL LOCATION} | String |
+| pattern_matching.swift:2:24:2:27 | pair |  | {EXTERNAL LOCATION} | Tuple2 |
+| pattern_matching.swift:2:24:2:27 | pair | T0 | {EXTERNAL LOCATION} | Int |
+| pattern_matching.swift:2:24:2:27 | pair | T1 | {EXTERNAL LOCATION} | String |
+| pattern_matching.swift:8:8:8:14 | novalue |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:8:8:8:14 | novalue | T | pattern_matching.swift:7:19:7:19 | T |
+| pattern_matching.swift:13:30:13:34 | input |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:13:30:13:34 | input | T | pattern_matching.swift:13:25:13:25 | T |
+| pattern_matching.swift:14:10:14:14 | input |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:14:10:14:14 | input | T | pattern_matching.swift:13:25:13:25 | T |
+| pattern_matching.swift:15:8:15:15 | ... .novalue |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:15:8:15:15 | ... .novalue | T | pattern_matching.swift:13:25:13:25 | T |
+| pattern_matching.swift:17:8:17:24 | ... .value(...) |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:17:8:17:24 | ... .value(...) | T | pattern_matching.swift:13:25:13:25 | T |
+| pattern_matching.swift:19:8:19:52 | ... .nested(...) |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:19:8:19:52 | ... .nested(...) | T | pattern_matching.swift:13:25:13:25 | T |
+| pattern_matching.swift:23:8:23:45 | ... .nested(...) |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:23:8:23:45 | ... .nested(...) | T | pattern_matching.swift:13:25:13:25 | T |
+| pattern_matching.swift:29:42:33:1 | Block |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:29:42:33:1 | Block | T | {EXTERNAL LOCATION} | Bool |
+| pattern_matching.swift:30:7:30:7 | x |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:30:7:30:7 | x | T | {EXTERNAL LOCATION} | Int |
+| pattern_matching.swift:30:11:30:28 | ... .value |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:30:11:30:28 | ... .value | T | {EXTERNAL LOCATION} | Int |
+| pattern_matching.swift:30:11:30:32 | ... .value(...) |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:30:11:30:32 | ... .value(...) | T | {EXTERNAL LOCATION} | Int |
+| pattern_matching.swift:30:30:30:31 | 42 |  | {EXTERNAL LOCATION} | Int |
+| pattern_matching.swift:31:7:31:7 | y |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:31:7:31:7 | y | T | {EXTERNAL LOCATION} | String |
+| pattern_matching.swift:31:11:31:38 | ... .novalue |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:31:11:31:38 | ... .novalue | T | {EXTERNAL LOCATION} | String |
+| pattern_matching.swift:32:10:32:29 | ... .novalue |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:32:10:32:29 | ... .novalue | T | {EXTERNAL LOCATION} | Bool |
+| pattern_matching.swift:35:51:37:1 | Block |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:35:51:37:1 | Block | T | {EXTERNAL LOCATION} | Bool |
+| pattern_matching.swift:36:3:36:22 | ... .novalue |  | pattern_matching.swift:7:1:11:1 | PatternMatch |
+| pattern_matching.swift:36:3:36:22 | ... .novalue | T | {EXTERNAL LOCATION} | Bool |
+| protocols.swift:8:7:8:12 | radius |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:10:8:10:13 | radius |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:10:24:12:3 | Block |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:11:5:11:8 | self |  | protocols.swift:7:1:17:1 | Circle |
+| protocols.swift:11:5:11:15 | ... .radius |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:11:5:11:24 | ... = ... |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:11:19:11:24 | radius |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:14:25:16:3 | Block |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:15:12:15:18 | 3.14159 |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:15:12:15:27 | ... * ... |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:15:12:15:36 | ... * ... |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:15:22:15:27 | radius |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:15:31:15:36 | radius |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:20:7:20:11 | width |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:21:7:21:12 | height |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:23:8:23:12 | width |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:23:23:23:28 | height |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:23:39:26:3 | Block |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:24:5:24:8 | self |  | protocols.swift:19:1:31:1 | Rectangle |
+| protocols.swift:24:5:24:14 | ... .width |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:24:5:24:22 | ... = ... |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:24:18:24:22 | width |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:25:5:25:8 | self |  | protocols.swift:19:1:31:1 | Rectangle |
+| protocols.swift:25:5:25:15 | ... .height |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:25:5:25:24 | ... = ... |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:25:19:25:24 | height |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:28:25:30:3 | Block |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:29:12:29:16 | width |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:29:12:29:25 | ... * ... |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:29:20:29:25 | height |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:34:7:34:7 | c |  | protocols.swift:7:1:17:1 | Circle |
+| protocols.swift:34:11:34:16 | Circle |  | protocols.swift:7:1:17:1 | Circle |
+| protocols.swift:34:11:34:29 | Circle(...) |  | protocols.swift:7:1:17:1 | Circle |
+| protocols.swift:34:26:34:28 | 5.0 |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:35:7:35:8 | a1 |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:35:12:35:12 | c |  | protocols.swift:7:1:17:1 | Circle |
+| protocols.swift:35:12:35:19 | ... .area(...) |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:37:7:37:7 | r |  | protocols.swift:19:1:31:1 | Rectangle |
+| protocols.swift:37:11:37:19 | Rectangle |  | protocols.swift:19:1:31:1 | Rectangle |
+| protocols.swift:37:11:37:44 | Rectangle(...) |  | protocols.swift:19:1:31:1 | Rectangle |
+| protocols.swift:37:28:37:30 | 3.0 |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:37:41:37:43 | 4.0 |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:38:7:38:8 | a2 |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:38:12:38:12 | r |  | protocols.swift:19:1:31:1 | Rectangle |
+| protocols.swift:38:12:38:19 | ... .area(...) |  | {EXTERNAL LOCATION} | Double |
+| protocols.swift:51:7:51:11 | items |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:51:7:51:11 | items | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:53:8:53:12 | items |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:53:8:53:12 | items | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:53:22:55:3 | Block |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:53:22:55:3 | Block | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:54:5:54:8 | self |  | protocols.swift:49:1:64:1 | IntContainer |
+| protocols.swift:54:5:54:14 | ... .items |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:54:5:54:14 | ... .items | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:54:5:54:22 | ... = ... |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:54:5:54:22 | ... = ... | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:54:18:54:22 | items |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:54:18:54:22 | items | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:58:12:58:16 | items |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:58:12:58:16 | items | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:58:18:58:18 | 0 |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:62:12:62:16 | items |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:62:12:62:16 | items | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:67:7:67:8 | ic |  | protocols.swift:49:1:64:1 | IntContainer |
+| protocols.swift:67:12:67:23 | IntContainer |  | protocols.swift:49:1:64:1 | IntContainer |
+| protocols.swift:67:12:67:41 | IntContainer(...) |  | protocols.swift:49:1:64:1 | IntContainer |
+| protocols.swift:67:32:67:40 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| protocols.swift:67:32:67:40 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| protocols.swift:67:33:67:33 | 1 |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:67:36:67:36 | 2 |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:67:39:67:39 | 3 |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:68:7:68:10 | item |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:68:14:68:15 | ic |  | protocols.swift:49:1:64:1 | IntContainer |
+| protocols.swift:68:14:68:25 | ... .getItem(...) |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:69:7:69:9 | cnt |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:69:13:69:14 | ic |  | protocols.swift:49:1:64:1 | IntContainer |
+| protocols.swift:69:13:69:22 | ... .count(...) |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:83:7:83:10 | name |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:84:7:84:14 | entityId |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:86:8:86:11 | name |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:86:22:86:29 | entityId |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:86:37:89:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:87:5:87:8 | self |  | protocols.swift:82:1:98:1 | Entity |
+| protocols.swift:87:5:87:13 | ... .name |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:87:5:87:20 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:87:17:87:20 | name |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:88:5:88:8 | self |  | protocols.swift:82:1:98:1 | Entity |
+| protocols.swift:88:5:88:17 | ... .entityId |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:88:5:88:28 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:88:21:88:28 | entityId |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:91:28:93:3 | Block |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:92:12:92:15 | name |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:95:20:97:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:96:12:96:19 | entityId |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:101:7:101:7 | e |  | protocols.swift:82:1:98:1 | Entity |
+| protocols.swift:101:11:101:16 | Entity |  | protocols.swift:82:1:98:1 | Entity |
+| protocols.swift:101:11:101:44 | Entity(...) |  | protocols.swift:82:1:98:1 | Entity |
+| protocols.swift:101:24:101:29 | "test" |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:101:42:101:43 | 42 |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:102:7:102:7 | d |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:102:11:102:11 | e |  | protocols.swift:82:1:98:1 | Entity |
+| protocols.swift:102:11:102:21 | ... .display(...) |  | {EXTERNAL LOCATION} | String |
+| protocols.swift:103:7:103:9 | eid |  | {EXTERNAL LOCATION} | Int |
+| protocols.swift:103:13:103:13 | e |  | protocols.swift:82:1:98:1 | Entity |
+| protocols.swift:103:13:103:18 | ... .id(...) |  | {EXTERNAL LOCATION} | Int |
+| tuples.swift:1:5:1:9 | tuple |  | {EXTERNAL LOCATION} | Tuple3 |
+| tuples.swift:1:5:1:9 | tuple | T0 | {EXTERNAL LOCATION} | Int |
+| tuples.swift:1:5:1:9 | tuple | T1 | {EXTERNAL LOCATION} | String |
+| tuples.swift:1:5:1:9 | tuple | T2 | {EXTERNAL LOCATION} | Bool |
+| tuples.swift:1:13:1:30 | TupleExpr |  | {EXTERNAL LOCATION} | Tuple3 |
+| tuples.swift:1:13:1:30 | TupleExpr | T0 | {EXTERNAL LOCATION} | Int |
+| tuples.swift:1:13:1:30 | TupleExpr | T1 | {EXTERNAL LOCATION} | String |
+| tuples.swift:1:13:1:30 | TupleExpr | T2 | {EXTERNAL LOCATION} | Bool |
+| tuples.swift:1:14:1:14 | 1 |  | {EXTERNAL LOCATION} | Int |
+| tuples.swift:1:17:1:23 | "hello" |  | {EXTERNAL LOCATION} | String |
+| tuples.swift:1:26:1:29 | true |  | {EXTERNAL LOCATION} | Bool |
+| tuples.swift:3:5:3:5 | a |  | {EXTERNAL LOCATION} | Int |
+| tuples.swift:3:9:3:13 | tuple |  | {EXTERNAL LOCATION} | Tuple3 |
+| tuples.swift:3:9:3:13 | tuple | T0 | {EXTERNAL LOCATION} | Int |
+| tuples.swift:3:9:3:13 | tuple | T1 | {EXTERNAL LOCATION} | String |
+| tuples.swift:3:9:3:13 | tuple | T2 | {EXTERNAL LOCATION} | Bool |
+| tuples.swift:3:9:3:15 | ... .0 |  | {EXTERNAL LOCATION} | Int |
+| tuples.swift:4:5:4:5 | b |  | {EXTERNAL LOCATION} | String |
+| tuples.swift:4:9:4:13 | tuple |  | {EXTERNAL LOCATION} | Tuple3 |
+| tuples.swift:4:9:4:13 | tuple | T0 | {EXTERNAL LOCATION} | Int |
+| tuples.swift:4:9:4:13 | tuple | T1 | {EXTERNAL LOCATION} | String |
+| tuples.swift:4:9:4:13 | tuple | T2 | {EXTERNAL LOCATION} | Bool |
+| tuples.swift:4:9:4:15 | ... .1 |  | {EXTERNAL LOCATION} | String |
+| tuples.swift:5:5:5:5 | c |  | {EXTERNAL LOCATION} | Bool |
+| tuples.swift:5:9:5:13 | tuple |  | {EXTERNAL LOCATION} | Tuple3 |
+| tuples.swift:5:9:5:13 | tuple | T0 | {EXTERNAL LOCATION} | Int |
+| tuples.swift:5:9:5:13 | tuple | T1 | {EXTERNAL LOCATION} | String |
+| tuples.swift:5:9:5:13 | tuple | T2 | {EXTERNAL LOCATION} | Bool |
+| tuples.swift:5:9:5:15 | ... .2 |  | {EXTERNAL LOCATION} | Bool |
+| type_alias.swift:2:9:2:13 | value |  | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:3:10:3:14 | value |  | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:3:20:5:5 | Block |  | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:4:9:4:12 | self |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:4:9:4:12 | self | T | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:4:9:4:18 | ... .value |  | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:4:9:4:26 | ... = ... |  | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:4:22:4:26 | value |  | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:6:26:8:5 | Block |  | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:7:16:7:19 | self |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:7:16:7:19 | self | T | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:7:16:7:25 | ... .value |  | type_alias.swift:1:15:1:15 | T |
+| type_alias.swift:17:13:17:14 | a1 |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:17:13:17:14 | a1 | T | {EXTERNAL LOCATION} | Int |
+| type_alias.swift:17:27:17:28 | a2 |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:17:27:17:28 | a2 | T | {EXTERNAL LOCATION} | Tuple2 |
+| type_alias.swift:17:27:17:28 | a2 | T.T0 | {EXTERNAL LOCATION} | Bool |
+| type_alias.swift:17:27:17:28 | a2 | T.T1 | {EXTERNAL LOCATION} | Bool |
+| type_alias.swift:17:47:17:48 | a3 |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:17:47:17:48 | a3 | T | {EXTERNAL LOCATION} | Tuple2 |
+| type_alias.swift:17:47:17:48 | a3 | T.T0 | {EXTERNAL LOCATION} | Optional |
+| type_alias.swift:17:47:17:48 | a3 | T.T0.Wrapped | {EXTERNAL LOCATION} | String |
+| type_alias.swift:17:47:17:48 | a3 | T.T1 | {EXTERNAL LOCATION} | Optional |
+| type_alias.swift:17:47:17:48 | a3 | T.T1.Wrapped | {EXTERNAL LOCATION} | String |
+| type_alias.swift:18:9:18:10 | v1 |  | {EXTERNAL LOCATION} | Int |
+| type_alias.swift:18:14:18:15 | a1 |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:18:14:18:15 | a1 | T | {EXTERNAL LOCATION} | Int |
+| type_alias.swift:18:14:18:26 | ... .getValue(...) |  | {EXTERNAL LOCATION} | Int |
+| type_alias.swift:19:9:19:10 | v2 |  | {EXTERNAL LOCATION} | Tuple2 |
+| type_alias.swift:19:9:19:10 | v2 | T0 | {EXTERNAL LOCATION} | Bool |
+| type_alias.swift:19:9:19:10 | v2 | T1 | {EXTERNAL LOCATION} | Bool |
+| type_alias.swift:19:14:19:15 | a2 |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:19:14:19:15 | a2 | T | {EXTERNAL LOCATION} | Tuple2 |
+| type_alias.swift:19:14:19:15 | a2 | T.T0 | {EXTERNAL LOCATION} | Bool |
+| type_alias.swift:19:14:19:15 | a2 | T.T1 | {EXTERNAL LOCATION} | Bool |
+| type_alias.swift:19:14:19:26 | ... .getValue(...) |  | {EXTERNAL LOCATION} | Tuple2 |
+| type_alias.swift:19:14:19:26 | ... .getValue(...) | T0 | {EXTERNAL LOCATION} | Bool |
+| type_alias.swift:19:14:19:26 | ... .getValue(...) | T1 | {EXTERNAL LOCATION} | Bool |
+| type_alias.swift:20:9:20:10 | v3 |  | {EXTERNAL LOCATION} | Tuple2 |
+| type_alias.swift:20:9:20:10 | v3 | T0 | {EXTERNAL LOCATION} | Optional |
+| type_alias.swift:20:9:20:10 | v3 | T0.Wrapped | {EXTERNAL LOCATION} | String |
+| type_alias.swift:20:9:20:10 | v3 | T1 | {EXTERNAL LOCATION} | Optional |
+| type_alias.swift:20:9:20:10 | v3 | T1.Wrapped | {EXTERNAL LOCATION} | String |
+| type_alias.swift:20:14:20:15 | a3 |  | type_alias.swift:1:1:9:1 | MyClass |
+| type_alias.swift:20:14:20:15 | a3 | T | {EXTERNAL LOCATION} | Tuple2 |
+| type_alias.swift:20:14:20:15 | a3 | T.T0 | {EXTERNAL LOCATION} | Optional |
+| type_alias.swift:20:14:20:15 | a3 | T.T0.Wrapped | {EXTERNAL LOCATION} | String |
+| type_alias.swift:20:14:20:15 | a3 | T.T1 | {EXTERNAL LOCATION} | Optional |
+| type_alias.swift:20:14:20:15 | a3 | T.T1.Wrapped | {EXTERNAL LOCATION} | String |
+| type_alias.swift:20:14:20:26 | ... .getValue(...) |  | {EXTERNAL LOCATION} | Tuple2 |
+| type_alias.swift:20:14:20:26 | ... .getValue(...) | T0 | {EXTERNAL LOCATION} | Optional |
+| type_alias.swift:20:14:20:26 | ... .getValue(...) | T0.Wrapped | {EXTERNAL LOCATION} | String |
+| type_alias.swift:20:14:20:26 | ... .getValue(...) | T1 | {EXTERNAL LOCATION} | Optional |
+| type_alias.swift:20:14:20:26 | ... .getValue(...) | T1.Wrapped | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:3:29:3:29 | a |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:3:37:3:37 | b |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:3:48:5:1 | Block |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:4:6:4:6 | a |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:4:6:4:10 | ... < ... |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:4:10:4:10 | b |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:4:21:4:21 | a |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:4:39:4:39 | b |  | type_constraints.swift:3:12:3:24 | T |
+| type_constraints.swift:7:17:7:17 | a |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:7:25:7:25 | b |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:7:56:9:1 | Block |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:8:6:8:6 | a |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:8:6:8:10 | ... > ... |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:8:10:8:10 | b |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:8:21:8:21 | a |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:8:39:8:39 | b |  | type_constraints.swift:7:12:7:12 | T |
+| type_constraints.swift:12:7:12:8 | m1 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:12:12:12:22 | minOf(...) |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:12:18:12:18 | 3 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:12:21:12:21 | 7 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:13:7:13:8 | m2 |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:13:12:13:26 | minOf(...) |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:13:18:13:20 | "a" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:13:23:13:25 | "z" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:14:7:14:8 | m3 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:14:12:14:22 | maxOf(...) |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:14:18:14:18 | 3 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:14:21:14:21 | 7 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:15:7:15:8 | m4 |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:15:12:15:26 | maxOf(...) |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:15:18:15:20 | "a" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:15:23:15:25 | "z" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:29:7:29:9 | tag |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:30:7:30:14 | priority |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:32:8:32:10 | tag |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:32:21:32:28 | priority |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:32:36:35:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:33:5:33:8 | self |  | type_constraints.swift:28:1:44:1 | TaggedItem |
+| type_constraints.swift:33:5:33:12 | ... .tag |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:33:5:33:18 | ... = ... |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:33:16:33:18 | tag |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:34:5:34:8 | self |  | type_constraints.swift:28:1:44:1 | TaggedItem |
+| type_constraints.swift:34:5:34:17 | ... .priority |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:34:5:34:28 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:34:21:34:28 | priority |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:37:28:39:3 | Block |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:38:12:38:14 | tag |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:41:25:43:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:42:12:42:19 | priority |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:46:48:46:51 | item |  | type_constraints.swift:46:18:46:43 | T |
+| type_constraints.swift:47:10:47:13 | item |  | type_constraints.swift:46:18:46:43 | T |
+| type_constraints.swift:50:30:50:30 | a |  | type_constraints.swift:50:25:50:25 | T |
+| type_constraints.swift:50:38:50:38 | b |  | type_constraints.swift:50:25:50:25 | T |
+| type_constraints.swift:51:50:53:1 | Block |  | type_constraints.swift:50:25:50:25 | T |
+| type_constraints.swift:52:10:52:10 | a |  | type_constraints.swift:50:25:50:25 | T |
+| type_constraints.swift:52:10:52:15 | ... == ... |  | type_constraints.swift:50:25:50:25 | T |
+| type_constraints.swift:52:15:52:15 | b |  | type_constraints.swift:50:25:50:25 | T |
+| type_constraints.swift:56:7:56:10 | item |  | type_constraints.swift:28:1:44:1 | TaggedItem |
+| type_constraints.swift:56:14:56:23 | TaggedItem |  | type_constraints.swift:28:1:44:1 | TaggedItem |
+| type_constraints.swift:56:14:56:46 | TaggedItem(...) |  | type_constraints.swift:28:1:44:1 | TaggedItem |
+| type_constraints.swift:56:30:56:32 | "x" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:56:45:56:45 | 1 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:57:7:57:7 | s |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:57:11:57:27 | showAndSort(...) |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:57:23:57:26 | item |  | type_constraints.swift:28:1:44:1 | TaggedItem |
+| type_constraints.swift:58:7:58:8 | eq |  | {EXTERNAL LOCATION} | Bool |
+| type_constraints.swift:58:12:58:41 | showSortAndCompare(...) |  | {EXTERNAL LOCATION} | Bool |
+| type_constraints.swift:58:31:58:34 | item |  | type_constraints.swift:28:1:44:1 | TaggedItem |
+| type_constraints.swift:58:37:58:40 | item |  | type_constraints.swift:28:1:44:1 | TaggedItem |
+| type_constraints.swift:64:7:64:11 | first |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:65:7:65:12 | second |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:67:8:67:12 | first |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:67:18:67:23 | second |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:67:29:70:3 | Block |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:68:5:68:8 | self |  | type_constraints.swift:63:1:79:1 | SortedPair |
+| type_constraints.swift:68:5:68:8 | self | T | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:68:5:68:8 | self | U | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:68:5:68:14 | ... .first |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:68:5:68:22 | ... = ... |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:68:18:68:22 | first |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:69:5:69:8 | self |  | type_constraints.swift:63:1:79:1 | SortedPair |
+| type_constraints.swift:69:5:69:8 | self | T | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:69:5:69:8 | self | U | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:69:5:69:15 | ... .second |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:69:5:69:24 | ... = ... |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:69:19:69:24 | second |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:72:28:72:32 | other |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:72:46:74:3 | Block |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:73:12:73:16 | first |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:73:12:73:24 | ... < ... |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:73:20:73:24 | other |  | type_constraints.swift:63:18:63:30 | T |
+| type_constraints.swift:76:29:76:33 | other |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:76:47:78:3 | Block |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:77:12:77:17 | second |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:77:12:77:25 | ... < ... |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:77:21:77:25 | other |  | type_constraints.swift:63:33:63:45 | U |
+| type_constraints.swift:82:7:82:8 | sp |  | type_constraints.swift:63:1:79:1 | SortedPair |
+| type_constraints.swift:82:7:82:8 | sp | T | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:82:7:82:8 | sp | U | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:82:12:82:21 | SortedPair |  | type_constraints.swift:63:1:79:1 | SortedPair |
+| type_constraints.swift:82:12:82:21 | SortedPair | T | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:82:12:82:21 | SortedPair | U | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:82:12:82:44 | SortedPair(...) |  | type_constraints.swift:63:1:79:1 | SortedPair |
+| type_constraints.swift:82:12:82:44 | SortedPair(...) | T | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:82:12:82:44 | SortedPair(...) | U | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:82:30:82:30 | 3 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:82:41:82:43 | "b" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:83:7:83:8 | r1 |  | {EXTERNAL LOCATION} | Bool |
+| type_constraints.swift:83:12:83:13 | sp |  | type_constraints.swift:63:1:79:1 | SortedPair |
+| type_constraints.swift:83:12:83:13 | sp | T | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:83:12:83:13 | sp | U | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:83:12:83:37 | ... .isFirstSmaller(...) |  | {EXTERNAL LOCATION} | Bool |
+| type_constraints.swift:83:36:83:36 | 5 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:84:7:84:8 | r2 |  | {EXTERNAL LOCATION} | Bool |
+| type_constraints.swift:84:12:84:13 | sp |  | type_constraints.swift:63:1:79:1 | SortedPair |
+| type_constraints.swift:84:12:84:13 | sp | T | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:84:12:84:13 | sp | U | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:84:12:84:40 | ... .isSecondSmaller(...) |  | {EXTERNAL LOCATION} | Bool |
+| type_constraints.swift:84:37:84:39 | "z" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:96:7:96:11 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:96:7:96:11 | items | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:98:8:98:12 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:98:8:98:12 | items | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:98:22:100:3 | Block |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:98:22:100:3 | Block | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:99:5:99:8 | self |  | type_constraints.swift:94:1:105:1 | IntArray |
+| type_constraints.swift:99:5:99:14 | ... .items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:99:5:99:14 | ... .items | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:99:5:99:22 | ... = ... |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:99:5:99:22 | ... = ... | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:99:18:99:22 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:99:18:99:22 | items | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:103:12:103:16 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:103:12:103:16 | items | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:103:18:103:18 | 0 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:109:7:109:11 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:109:7:109:11 | items | Element | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:111:8:111:12 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:111:8:111:12 | items | Element | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:111:25:113:3 | Block |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:111:25:113:3 | Block | Element | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:112:5:112:8 | self |  | type_constraints.swift:107:1:118:1 | StringArray |
+| type_constraints.swift:112:5:112:14 | ... .items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:112:5:112:14 | ... .items | Element | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:112:5:112:22 | ... = ... |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:112:5:112:22 | ... = ... | Element | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:112:18:112:22 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:112:18:112:22 | items | Element | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:116:12:116:16 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:116:12:116:16 | items | Element | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:116:18:116:18 | 0 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:120:45:120:53 | container |  | type_constraints.swift:120:19:120:37 | C |
+| type_constraints.swift:121:10:121:18 | container |  | type_constraints.swift:120:19:120:37 | C |
+| type_constraints.swift:124:45:124:53 | container |  | type_constraints.swift:124:19:124:37 | C |
+| type_constraints.swift:125:10:125:18 | container |  | type_constraints.swift:124:19:124:37 | C |
+| type_constraints.swift:129:7:129:8 | ia |  | type_constraints.swift:94:1:105:1 | IntArray |
+| type_constraints.swift:129:12:129:19 | IntArray |  | type_constraints.swift:94:1:105:1 | IntArray |
+| type_constraints.swift:129:12:129:36 | IntArray(...) |  | type_constraints.swift:94:1:105:1 | IntArray |
+| type_constraints.swift:129:28:129:35 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:129:28:129:35 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:129:29:129:30 | 10 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:129:33:129:34 | 20 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:130:7:130:8 | sa |  | type_constraints.swift:107:1:118:1 | StringArray |
+| type_constraints.swift:130:12:130:22 | StringArray |  | type_constraints.swift:107:1:118:1 | StringArray |
+| type_constraints.swift:130:12:130:46 | StringArray(...) |  | type_constraints.swift:107:1:118:1 | StringArray |
+| type_constraints.swift:130:31:130:45 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:130:31:130:45 | ArrayLiteral | Element | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:130:32:130:35 | "hi" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:130:38:130:44 | "there" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:131:31:131:32 | ia |  | type_constraints.swift:94:1:105:1 | IntArray |
+| type_constraints.swift:132:31:132:32 | sa |  | type_constraints.swift:107:1:118:1 | StringArray |
+| type_constraints.swift:138:7:138:11 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:140:8:140:12 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:140:20:142:3 | Block |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:141:5:141:8 | self |  | type_constraints.swift:137:1:147:1 | Vehicle |
+| type_constraints.swift:141:5:141:14 | ... .speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:141:5:141:22 | ... = ... |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:141:18:141:22 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:144:29:146:3 | Block |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:145:12:145:20 | "vehicle" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:150:17:150:21 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:150:29:152:3 | Block |  | type_constraints.swift:137:1:147:1 | Vehicle |
+| type_constraints.swift:151:5:151:9 | super |  | type_constraints.swift:137:1:147:1 | Vehicle |
+| type_constraints.swift:151:5:151:28 | ... .init(...) |  | type_constraints.swift:137:1:147:1 | Vehicle |
+| type_constraints.swift:151:23:151:27 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:154:38:156:3 | Block |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:155:12:155:16 | "car" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:158:25:160:3 | Block |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:159:12:159:17 | "beep" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:164:17:164:21 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:164:29:166:3 | Block |  | type_constraints.swift:137:1:147:1 | Vehicle |
+| type_constraints.swift:165:5:165:9 | super |  | type_constraints.swift:137:1:147:1 | Vehicle |
+| type_constraints.swift:165:5:165:28 | ... .init(...) |  | type_constraints.swift:137:1:147:1 | Vehicle |
+| type_constraints.swift:165:23:165:27 | speed |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:168:38:170:3 | Block |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:169:12:169:18 | "truck" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:172:25:174:3 | Block |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:173:12:173:20 | "hauling" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:177:36:177:36 | v |  | type_constraints.swift:177:22:177:31 | T |
+| type_constraints.swift:178:10:178:10 | v |  | type_constraints.swift:177:22:177:31 | T |
+| type_constraints.swift:182:7:182:9 | car |  | type_constraints.swift:149:1:161:1 | Car |
+| type_constraints.swift:182:13:182:15 | Car |  | type_constraints.swift:149:1:161:1 | Car |
+| type_constraints.swift:182:13:182:27 | Car(...) |  | type_constraints.swift:149:1:161:1 | Car |
+| type_constraints.swift:182:24:182:26 | 100 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:183:7:183:11 | truck |  | type_constraints.swift:163:1:175:1 | Truck |
+| type_constraints.swift:183:15:183:19 | Truck |  | type_constraints.swift:163:1:175:1 | Truck |
+| type_constraints.swift:183:15:183:30 | Truck(...) |  | type_constraints.swift:163:1:175:1 | Truck |
+| type_constraints.swift:183:28:183:29 | 60 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:184:7:184:8 | d1 |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:184:12:184:31 | describeVehicle(...) |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:184:28:184:30 | car |  | type_constraints.swift:149:1:161:1 | Car |
+| type_constraints.swift:185:7:185:8 | d2 |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:185:12:185:33 | describeVehicle(...) |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:185:28:185:32 | truck |  | type_constraints.swift:163:1:175:1 | Truck |
+| type_constraints.swift:186:7:186:7 | h |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:186:11:186:13 | car |  | type_constraints.swift:149:1:161:1 | Car |
+| type_constraints.swift:186:11:186:20 | ... .honk(...) |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:187:7:187:8 | hl |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:187:12:187:16 | truck |  | type_constraints.swift:163:1:175:1 | Truck |
+| type_constraints.swift:187:12:187:23 | ... .haul(...) |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:193:18:193:20 | lhs |  | type_constraints.swift:192:1:194:1 | Summable |
+| type_constraints.swift:193:29:193:31 | rhs |  | type_constraints.swift:192:1:194:1 | Summable |
+| type_constraints.swift:201:7:201:12 | values |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:201:7:201:12 | values | Element | type_constraints.swift:200:20:200:20 | T |
+| type_constraints.swift:203:8:203:13 | values |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:203:8:203:13 | values | Element | type_constraints.swift:200:20:200:20 | T |
+| type_constraints.swift:203:21:205:3 | Block |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:203:21:205:3 | Block | Element | type_constraints.swift:200:20:200:20 | T |
+| type_constraints.swift:204:5:204:8 | self |  | type_constraints.swift:200:1:210:1 | Accumulator |
+| type_constraints.swift:204:5:204:8 | self | T | type_constraints.swift:200:20:200:20 | T |
+| type_constraints.swift:204:5:204:15 | ... .values |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:204:5:204:15 | ... .values | Element | type_constraints.swift:200:20:200:20 | T |
+| type_constraints.swift:204:5:204:24 | ... = ... |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:204:5:204:24 | ... = ... | Element | type_constraints.swift:200:20:200:20 | T |
+| type_constraints.swift:204:19:204:24 | values |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:204:19:204:24 | values | Element | type_constraints.swift:200:20:200:20 | T |
+| type_constraints.swift:208:12:208:17 | values |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:208:12:208:17 | values | Element | type_constraints.swift:200:20:200:20 | T |
+| type_constraints.swift:214:12:214:17 | values |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:214:19:214:19 | 0 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:214:24:214:29 | values |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:214:31:214:31 | 1 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:220:12:220:17 | values |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:220:35:222:5 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| type_constraints.swift:227:7:227:12 | intAcc |  | type_constraints.swift:200:1:210:1 | Accumulator |
+| type_constraints.swift:227:7:227:12 | intAcc | T | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:227:16:227:26 | Accumulator |  | type_constraints.swift:200:1:210:1 | Accumulator |
+| type_constraints.swift:227:16:227:26 | Accumulator | T | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:227:16:227:45 | Accumulator(...) |  | type_constraints.swift:200:1:210:1 | Accumulator |
+| type_constraints.swift:227:16:227:45 | Accumulator(...) | T | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:227:36:227:44 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:227:36:227:44 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:227:37:227:37 | 1 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:227:40:227:40 | 2 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:227:43:227:43 | 3 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:228:7:228:9 | cnt |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:228:13:228:18 | intAcc |  | type_constraints.swift:200:1:210:1 | Accumulator |
+| type_constraints.swift:228:13:228:18 | intAcc | T | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:228:13:228:26 | ... .count(...) |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:229:13:229:18 | intAcc |  | type_constraints.swift:200:1:210:1 | Accumulator |
+| type_constraints.swift:229:13:229:18 | intAcc | T | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:230:7:230:9 | has |  | {EXTERNAL LOCATION} | Bool |
+| type_constraints.swift:230:13:230:18 | intAcc |  | type_constraints.swift:200:1:210:1 | Accumulator |
+| type_constraints.swift:230:13:230:18 | intAcc | T | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:230:13:230:30 | ... .contains(...) |  | {EXTERNAL LOCATION} | Bool |
+| type_constraints.swift:230:29:230:29 | 2 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:236:33:236:37 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:236:33:236:37 | items | Element | type_constraints.swift:236:18:236:28 | T |
+| type_constraints.swift:237:12:237:16 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:237:12:237:16 | items | Element | type_constraints.swift:236:18:236:28 | T |
+| type_constraints.swift:237:18:237:18 | 0 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:237:23:237:27 | items |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:237:23:237:27 | items | Element | type_constraints.swift:236:18:236:28 | T |
+| type_constraints.swift:237:29:237:29 | 1 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:240:44:240:44 | a |  | type_constraints.swift:240:14:240:25 | A |
+| type_constraints.swift:240:52:240:52 | b |  | type_constraints.swift:240:28:240:39 | B |
+| type_constraints.swift:240:66:242:3 | Block |  | {EXTERNAL LOCATION} | Bool |
+| type_constraints.swift:241:12:241:15 | true |  | {EXTERNAL LOCATION} | Bool |
+| type_constraints.swift:246:7:246:7 | t |  | type_constraints.swift:235:1:243:1 | Transformer |
+| type_constraints.swift:246:11:246:21 | Transformer |  | type_constraints.swift:235:1:243:1 | Transformer |
+| type_constraints.swift:246:11:246:23 | Transformer(...) |  | type_constraints.swift:235:1:243:1 | Transformer |
+| type_constraints.swift:247:7:247:8 | r1 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:247:12:247:12 | t |  | type_constraints.swift:235:1:243:1 | Transformer |
+| type_constraints.swift:247:12:247:33 | ... .transform(...) |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:247:24:247:32 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:247:24:247:32 | ArrayLiteral | Element | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:247:25:247:25 | 3 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:247:28:247:28 | 1 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:247:31:247:31 | 2 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:248:7:248:8 | r2 |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:248:12:248:12 | t |  | type_constraints.swift:235:1:243:1 | Transformer |
+| type_constraints.swift:248:12:248:39 | ... .transform(...) |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:248:24:248:38 | ArrayLiteral |  | {EXTERNAL LOCATION} | Array |
+| type_constraints.swift:248:24:248:38 | ArrayLiteral | Element | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:248:25:248:27 | "c" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:248:30:248:32 | "a" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:248:35:248:37 | "b" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:249:7:249:8 | r3 |  | {EXTERNAL LOCATION} | Bool |
+| type_constraints.swift:249:12:249:12 | t |  | type_constraints.swift:235:1:243:1 | Transformer |
+| type_constraints.swift:249:12:249:26 | ... .merge(...) |  | {EXTERNAL LOCATION} | Bool |
+| type_constraints.swift:249:20:249:20 | 1 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:249:23:249:25 | "x" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:254:29:254:33 | value |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:254:43:254:47 | lower |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:254:57:254:61 | upper |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:254:72:258:1 | Block |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:255:6:255:10 | value |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:255:6:255:18 | ... < ... |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:255:14:255:18 | lower |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:255:29:255:33 | lower |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:256:6:256:10 | value |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:256:6:256:18 | ... > ... |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:256:14:256:18 | upper |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:256:29:256:33 | upper |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:257:10:257:14 | value |  | type_constraints.swift:254:12:254:24 | T |
+| type_constraints.swift:261:7:261:8 | r1 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:261:12:261:36 | clamp(...) |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:261:18:261:18 | 5 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:261:26:261:26 | 0 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:261:34:261:35 | 10 |  | {EXTERNAL LOCATION} | Int |
+| type_constraints.swift:262:7:262:8 | r2 |  | {EXTERNAL LOCATION} | Double |
+| type_constraints.swift:262:12:262:41 | clamp(...) |  | {EXTERNAL LOCATION} | Double |
+| type_constraints.swift:262:18:262:20 | 3.5 |  | {EXTERNAL LOCATION} | Double |
+| type_constraints.swift:262:28:262:30 | 1.0 |  | {EXTERNAL LOCATION} | Double |
+| type_constraints.swift:262:38:262:40 | 2.0 |  | {EXTERNAL LOCATION} | Double |
+| type_constraints.swift:263:7:263:8 | r3 |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:263:12:263:41 | clamp(...) |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:263:18:263:20 | "m" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:263:28:263:30 | "a" |  | {EXTERNAL LOCATION} | String |
+| type_constraints.swift:263:38:263:40 | "z" |  | {EXTERNAL LOCATION} | String |
+| variance.swift:7:18:7:18 | f |  | {EXTERNAL LOCATION} | Function |
+| variance.swift:7:18:7:18 | f | Args | {EXTERNAL LOCATION} | Tuple1 |
+| variance.swift:7:18:7:18 | f | Args.T0 | variance.swift:5:1:5:21 | B |
+| variance.swift:7:18:7:18 | f | Args.T0.Tb | variance.swift:7:10:7:11 | T1 |
+| variance.swift:7:18:7:18 | f | Return | variance.swift:3:1:3:14 | A |
+| variance.swift:7:18:7:18 | f | Return.Ta | variance.swift:7:14:7:15 | T2 |
+| variance.swift:11:5:11:7 | lam |  | {EXTERNAL LOCATION} | Function |
+| variance.swift:11:5:11:7 | lam | Args | {EXTERNAL LOCATION} | Tuple1 |
+| variance.swift:11:5:11:7 | lam | Args.T0 | variance.swift:3:1:3:14 | A |
+| variance.swift:11:5:11:7 | lam | Args.T0.Ta | {EXTERNAL LOCATION} | Int |
+| variance.swift:11:5:11:7 | lam | Return | variance.swift:5:1:5:21 | B |
+| variance.swift:11:5:11:7 | lam | Return.Tb | {EXTERNAL LOCATION} | String |
+| variance.swift:11:11:11:53 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
+| variance.swift:11:11:11:53 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| variance.swift:11:11:11:53 | FunctionExpr | Args.T0 | variance.swift:3:1:3:14 | A |
+| variance.swift:11:11:11:53 | FunctionExpr | Args.T0.Ta | {EXTERNAL LOCATION} | Int |
+| variance.swift:11:11:11:53 | FunctionExpr | Return | variance.swift:5:1:5:21 | B |
+| variance.swift:11:11:11:53 | FunctionExpr | Return.Tb | {EXTERNAL LOCATION} | String |
+| variance.swift:11:14:11:14 | a |  | variance.swift:3:1:3:14 | A |
+| variance.swift:11:14:11:14 | a | Ta | {EXTERNAL LOCATION} | Int |
+| variance.swift:11:41:11:49 | GenericTypeExpr |  | variance.swift:5:1:5:21 | B |
+| variance.swift:11:41:11:49 | GenericTypeExpr | Tb | {EXTERNAL LOCATION} | String |
+| variance.swift:11:41:11:51 | ...(...) |  | variance.swift:5:1:5:21 | B |
+| variance.swift:11:41:11:51 | ...(...) | Tb | {EXTERNAL LOCATION} | String |
+| variance.swift:11:41:11:51 | Block |  | variance.swift:5:1:5:21 | B |
+| variance.swift:11:41:11:51 | Block | Tb | {EXTERNAL LOCATION} | String |
+| variance.swift:13:5:13:5 | x |  | {EXTERNAL LOCATION} | Tuple2 |
+| variance.swift:13:9:13:19 | foo(...) |  | {EXTERNAL LOCATION} | Tuple2 |
+| variance.swift:13:16:13:18 | lam |  | {EXTERNAL LOCATION} | Function |
+| variance.swift:13:16:13:18 | lam | Args | {EXTERNAL LOCATION} | Tuple1 |
+| variance.swift:13:16:13:18 | lam | Args.T0 | variance.swift:3:1:3:14 | A |
+| variance.swift:13:16:13:18 | lam | Args.T0.Ta | {EXTERNAL LOCATION} | Int |
+| variance.swift:13:16:13:18 | lam | Return | variance.swift:5:1:5:21 | B |
+| variance.swift:13:16:13:18 | lam | Return.Tb | {EXTERNAL LOCATION} | String |
+| variance.swift:15:23:15:29 | Block |  | variance.swift:5:1:5:21 | B |
+| variance.swift:15:23:15:29 | Block | Tb | variance.swift:15:10:15:10 | T |
+| variance.swift:15:25:15:25 | B |  | variance.swift:5:1:5:21 | B |
+| variance.swift:15:25:15:25 | B | Tb | variance.swift:15:10:15:10 | T |
+| variance.swift:15:25:15:27 | B(...) |  | variance.swift:5:1:5:21 | B |
+| variance.swift:15:25:15:27 | B(...) | Tb | variance.swift:15:10:15:10 | T |
+| variance.swift:18:7:18:7 | x |  | variance.swift:3:1:3:14 | A |
+| variance.swift:18:7:18:7 | x | Ta | {EXTERNAL LOCATION} | Int |
+| variance.swift:18:19:18:23 | bar(...) |  | variance.swift:5:1:5:21 | B |
+testFailures
diff --git a/unified/ql/test/library-tests/type-inference/type-inference.ql b/unified/ql/test/library-tests/type-inference/type-inference.ql
new file mode 100644
index 000000000000..75eab8be8b30
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/type-inference.ql
@@ -0,0 +1,52 @@
+import utils.test.InlineExpectationsTest
+import utils.test.TestUtils
+import codeql.unified.internal.typeinference.Type
+import codeql.unified.internal.typeinference.TypeInference as TypeInference
+import codeql.unified.internal.StaticNameBinding
+import TypeInference
+
+private predicate relevantNode(AstNode n) { n.fromSource() }
+
+query predicate inferCertainType(AstNode n, TypePath path, Type t) {
+  t = TypeInference::inferTypeCertain(n, path) and
+  not t instanceof PseudoType and
+  relevantNode(n)
+}
+
+query predicate inferType(AstNode n, TypePath path, Type t) {
+  t = TypeInference::inferType(n, path) and
+  not t instanceof PseudoType and
+  relevantNode(n)
+}
+
+module ResolveTest implements TestSig {
+  string getARelevantTag() { result = ["target", "field", "accessor"] }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(Callable c, CallExpr ce |
+      c = resolveCallTarget(ce) and
+      location = ce.getLocation() and
+      element = ce.toString() and
+      callableName(c, value) and
+      tag = "target"
+    )
+    or
+    exists(VariableDeclaration field, Expr access |
+      field = resolveFieldAccess(access) and
+      location = access.getLocation() and
+      element = access.toString() and
+      nameBinding(field.getPattern(), value) and
+      tag = "field"
+    )
+    or
+    exists(AccessorDeclaration accessor, Expr access |
+      accessor = resolveAccessorAccess(access) and
+      location = access.getLocation() and
+      element = access.toString() and
+      callableName(accessor, value) and
+      tag = "accessor"
+    )
+  }
+}
+
+import MakeTest<MergeTests<ResolveTest, TypeInference::TypeTest>>
diff --git a/unified/ql/test/library-tests/type-inference/type-inference.qlref b/unified/ql/test/library-tests/type-inference/type-inference.qlref
new file mode 100644
index 000000000000..03d8a9288aab
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/type-inference.qlref
@@ -0,0 +1,2 @@
+query: type-inference.ql
+postprocess: utils/test/ExternalLocationPostProcessing.ql
\ No newline at end of file
diff --git a/unified/ql/test/library-tests/type-inference/type_alias.swift b/unified/ql/test/library-tests/type-inference/type_alias.swift
new file mode 100644
index 000000000000..fc6cce56b7a6
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/type_alias.swift
@@ -0,0 +1,21 @@
+class MyClass<T> {
+    let value: T
+    init(value: T) {
+        self.value = value  // $ field=MyClass.value
+    }
+    func getValue() -> T {
+        return self.value  // $ field=MyClass.value
+    }
+}
+
+typealias Alias1 = MyClass<Int>
+
+typealias Alias2<T2> = MyClass<(T2, T2)>
+
+typealias Alias3<T3> = Alias2<T3?>
+
+func test(_ a1: Alias1, _ a2: Alias2<Bool>, _ a3: Alias3<String>) {
+    let v1 = a1.getValue()  // $ target=MyClass.getValue type=v1:Int
+    let v2 = a2.getValue()  // $ target=MyClass.getValue type=v2@Tuple2<T0>:Bool
+    let v3 = a3.getValue()  // $ target=MyClass.getValue type=v3@Tuple2<T0>.Optional<Wrapped>:String
+}
diff --git a/unified/ql/test/library-tests/type-inference/type_constraints.swift b/unified/ql/test/library-tests/type-inference/type_constraints.swift
new file mode 100644
index 000000000000..fd8f912870c2
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/type_constraints.swift
@@ -0,0 +1,264 @@
+// --- where clause on generic function ---
+
+func minOf<T: Comparable>(_ a: T, _ b: T) -> T {
+  if a < b { return a } else { return b }
+}
+
+func maxOf<T>(_ a: T, _ b: T) -> T where T: Comparable {
+  if a > b { return a } else { return b }
+}
+
+func testWhereClause() {
+  let m1 = minOf(3, 7)  // $ type=m1:Int target=minOf
+  let m2 = minOf("a", "z")  // $ type=m2:String target=minOf
+  let m3 = maxOf(3, 7)  // $ type=m3:Int target=maxOf
+  let m4 = maxOf("a", "z")  // $ type=m4:String target=maxOf
+}
+
+// --- Multiple constraints on a single type parameter ---
+
+protocol Displayable2 {
+  func display() -> String
+}
+
+protocol Sortable {
+  func sortKey() -> Int
+}
+
+struct TaggedItem: Displayable2, Sortable, Equatable {
+  var tag: String
+  var priority: Int
+
+  init(tag: String, priority: Int) {
+    self.tag = tag  // $ type=tag:String field=TaggedItem.tag
+    self.priority = priority  // $ type=priority:Int field=TaggedItem.priority
+  }
+
+  func display() -> String {
+    return tag  // $ type=tag:String field=TaggedItem.tag
+  }
+
+  func sortKey() -> Int {
+    return priority  // $ type=priority:Int field=TaggedItem.priority
+  }
+}
+
+func showAndSort<T: Displayable2 & Sortable>(_ item: T) -> String {
+  return item.display()  // $ MISSING: target=Displayable2.display
+}
+
+func showSortAndCompare<T>(_ a: T, _ b: T) -> Bool
+where T: Displayable2, T: Sortable, T: Equatable {
+  return a == b
+}
+
+func testMultipleConstraints() {
+  let item = TaggedItem(tag: "x", priority: 1)  // $ target=TaggedItem.init
+  let s = showAndSort(item)  // $ type=s:String target=showAndSort
+  let eq = showSortAndCompare(item, item)  // $ type=eq:Bool target=showSortAndCompare
+}
+
+// --- Generic class with multiple constrained type parameters ---
+
+class SortedPair<T: Comparable, U: Comparable> {
+  var first: T
+  var second: U
+
+  init(first: T, second: U) {
+    self.first = first  // $ type=first:T field=SortedPair.first
+    self.second = second  // $ type=second:U field=SortedPair.second
+  }
+
+  func isFirstSmaller(than other: T) -> Bool {
+    return first < other  // $ type=other:T field=SortedPair.first
+  }
+
+  func isSecondSmaller(than other: U) -> Bool {
+    return second < other  // $ type=other:U field=SortedPair.second
+  }
+}
+
+func testMultiConstrainedParams() {
+  let sp = SortedPair(first: 3, second: "b")  // $ target=SortedPair.init
+  let r1 = sp.isFirstSmaller(than: 5)  // $ type=r1:Bool target=SortedPair.isFirstSmaller
+  let r2 = sp.isSecondSmaller(than: "z")  // $ type=r2:Bool target=SortedPair.isSecondSmaller
+}
+
+// --- Associated type constraints (same-type constraint) ---
+
+protocol ElementContainer {
+  associatedtype Element
+  func first() -> Element
+}
+
+struct IntArray: ElementContainer {
+  typealias Element = Int
+  var items: [Int]
+
+  init(items: [Int]) {
+    self.items = items  // $ field=IntArray.items
+  }
+
+  func first() -> Int {
+    return items[0]  // $ field=IntArray.items
+  }
+}
+
+struct StringArray: ElementContainer {
+  typealias Element = String
+  var items: [String]
+
+  init(items: [String]) {
+    self.items = items  // $ field=StringArray.items
+  }
+
+  func first() -> String {
+    return items[0]  // $ field=StringArray.items
+  }
+}
+
+func extractFirst<C: ElementContainer>(from container: C) -> C.Element where C.Element == Int {  // name=extractFirst1
+  return container.first()  // $ MISSING: target=ElementContainer.first
+}
+
+func extractFirst<C: ElementContainer>(from container: C) -> C.Element where C.Element == String {  // name=extractFirst2
+  return container.first()  // $ MISSING: target=ElementContainer.first
+}
+
+func testSameTypeConstraint() {
+  let ia = IntArray(items: [10, 20])  // $ target=IntArray.init
+  let sa = StringArray(items: ["hi", "there"])  // $ target=StringArray.init
+  let r1 = extractFirst(from: ia)  // $ target=extractFirst1 $ MISSING: type=r1:Int $ SPURIOUS: target=extractFirst2
+  let r2 = extractFirst(from: sa)  // $ target=extractFirst2 $ MISSING: type=r2:String $ SPURIOUS: target=extractFirst1
+}
+
+// --- Superclass constraint on type parameter ---
+
+class Vehicle {
+  var speed: Int
+
+  init(speed: Int) {
+    self.speed = speed  // $ type=speed:Int field=Vehicle.speed
+  }
+
+  func describe() -> String {
+    return "vehicle"
+  }
+}
+
+class Car: Vehicle {
+  override init(speed: Int) {
+    super.init(speed: speed)  // $ target=Vehicle.init
+  }
+
+  override func describe() -> String {
+    return "car"
+  }
+
+  func honk() -> String {
+    return "beep"
+  }
+}
+
+class Truck: Vehicle {
+  override init(speed: Int) {
+    super.init(speed: speed)  // $ target=Vehicle.init
+  }
+
+  override func describe() -> String {
+    return "truck"
+  }
+
+  func haul() -> String {
+    return "hauling"
+  }
+}
+
+func describeVehicle<T: Vehicle>(_ v: T) -> String {
+  return v.describe()  // $ MISSING: target=Vehicle.describe
+}
+
+func testSuperclassConstraint() {
+  let car = Car(speed: 100)  // $ type=car:Car target=Car.init
+  let truck = Truck(speed: 60)  // $ type=truck:Truck target=Truck.init
+  let d1 = describeVehicle(car)  // $ type=d1:String target=describeVehicle
+  let d2 = describeVehicle(truck)  // $ type=d2:String target=describeVehicle
+  let h = car.honk()  // $ type=h:String target=Car.honk
+  let hl = truck.haul()  // $ type=hl:String target=Truck.haul
+}
+
+// --- Constrained extension methods ---
+
+protocol Summable {
+  static func + (lhs: Self, rhs: Self) -> Self
+}
+
+extension Int: Summable {}
+extension Double: Summable {}
+extension String: Summable {}
+
+struct Accumulator<T> {
+  var values: [T]
+
+  init(values: [T]) {
+    self.values = values  // $ field=Accumulator.values
+  }
+
+  func count() -> Int {
+    return values.count  // $ field=Accumulator.values
+  }
+}
+
+extension Accumulator where T: Summable {
+  func total() -> T {
+    return values[0] + values[1]  // $ field=Accumulator.values $ MISSING: target=Summable.+
+  }
+}
+
+extension Accumulator where T: Equatable {
+  func contains(_ item: T) -> Bool {
+    return values.contains(where: {  // $ field=Accumulator.values
+      $0 == item  //  $ MISSING: target=Equatable.==
+    })
+  }
+}
+
+func testConstrainedExtensions() {
+  let intAcc = Accumulator(values: [1, 2, 3])  // $ target=Accumulator.init
+  let cnt = intAcc.count()  // $ type=cnt:Int target=Accumulator.count
+  let tot = intAcc.total()  // $ target=Accumulator.total $ MISSING: type=tot:Int
+  let has = intAcc.contains(2)  // $ type=has:Bool target=Accumulator.contains
+}
+
+// --- Generic method with its own constrained type parameter ---
+
+class Transformer {
+  func transform<T: Summable>(_ items: [T]) -> T {
+    return items[0] + items[1]  // $ MISSING: target=Summable.+
+  }
+
+  func merge<A: Equatable, B: Equatable>(_ a: A, _ b: B) -> Bool {
+    return true
+  }
+}
+
+func testMethodTypeParams() {
+  let t = Transformer()  // $ target=Transformer.init
+  let r1 = t.transform([3, 1, 2])  // $ type=r1:Int target=Transformer.transform
+  let r2 = t.transform(["c", "a", "b"])  // $ type=r2:String target=Transformer.transform
+  let r3 = t.merge(1, "x")  // $ type=r3:Bool target=Transformer.merge
+}
+
+// --- Recursive constraint (Comparable requiring Equatable) ---
+
+func clamp<T: Comparable>(_ value: T, min lower: T, max upper: T) -> T {
+  if value < lower { return lower }
+  if value > upper { return upper }
+  return value
+}
+
+func testRecursiveConstraint() {
+  let r1 = clamp(5, min: 0, max: 10)  // $ type=r1:Int target=clamp
+  let r2 = clamp(3.5, min: 1.0, max: 2.0)  // $ type=r2:Double target=clamp
+  let r3 = clamp("m", min: "a", max: "z")  // $ type=r3:String target=clamp
+}
diff --git a/unified/ql/test/library-tests/type-inference/variance.swift b/unified/ql/test/library-tests/type-inference/variance.swift
new file mode 100644
index 000000000000..11d19d3b6054
--- /dev/null
+++ b/unified/ql/test/library-tests/type-inference/variance.swift
@@ -0,0 +1,19 @@
+// variance is not currently supported
+
+class A<Ta> {}
+
+class B<Tb>: A<Tb> {}
+
+func foo<T1, T2>(f: (B<T1>) -> A<T2>) -> (T1, T2) {
+  fatalError()  // placeholder implementation
+}
+
+let lam = { (a: A<Int>) -> B<String> in B<String>() }  // $ target=A.init
+
+let x = foo(f: lam)  // $ target=foo $ MISSING: type=x@Tuple2<T0>:Int type=x@Tuple2<T1>:String
+
+func bar<T>() -> B<T> { B() }  // $ target=A.init
+
+func baz() {
+  let x: A<Int> = bar()  // $ target=bar $ MISSING: type=bar(...)@B<Tb>:Int
+}
diff --git a/unified/ql/test/library-tests/variables/test.swift b/unified/ql/test/library-tests/variables/test.swift
deleted file mode 100644
index e4280dc5b408..000000000000
--- a/unified/ql/test/library-tests/variables/test.swift
+++ /dev/null
@@ -1,356 +0,0 @@
-func t1() -> Int {
-    let x = 42 // name=x1
-    return x // $ access=x1
-}
-
-func t2() -> Int {
-    let x = 42 // name=x1
-
-    if case let x = x + 10 { // $ access=x1 // name=x2
-        print(x) // $ access=x2
-    }
-    print(x) // $ access=x1
-}
-
-func t3() -> Int {
-    guard let x = foo() else { // name=x1
-        return 0
-    }
-    print(x) // $ access=x1
-}
-
-// Function parameters
-func t4(x: Int) -> Int { // name=x1
-    return x // $ access=x1
-}
-
-// Multiple parameters
-func t5(x: Int, // name=x1
-        y: Int) -> Int { // name=y1
-    let z = x + // $ access=x1 // name=z1
-            y // $ access=y1
-    return z // $ access=z1
-}
-
-// Parameter shadowed by local variable
-func t6(x: Int) -> Int { // name=x1
-    let x = x * 2 // $ access=x1 // name=x2
-    return x // $ access=x2
-}
-
-// Nested blocks
-func t7() {
-    let x = 1; // name=x1
-    do {
-        print(x) // $ access=x1
-        let x = 2 // name=x2
-        print(x) // $ access=x2
-    }
-    print(x) // $ access=x1
-}
-
-// For-in loop
-func t8() {
-    let array = [1, 2, 3] // name=array1
-    for x in array { // $ access=array1 // name=x1
-        print(x) // $ access=x1
-    }
-}
-
-// For-in loop with shadowing
-func t9() {
-    let x = 0 // name=x1
-    let array = [1, 2, 3] // name=array1
-    for x in array { // $ access=array1 // name=x2
-        print(x) // $ access=x2
-    }
-    print(x) // $ access=x1
-}
-
-// Switch statement with case bindings
-func t10(value: Int) { // name=value1
-    switch value { // $ access=value1
-    case let x: // name=x1
-        print(x) // $ access=x1
-    default:
-        break
-    }
-}
-
-// Switch with multiple cases
-func t11(value: Int) { // name=value1
-    switch value { // $ access=value1
-    case let x where x > 0: // $ access=x1 // name=x1
-        print(x) // $ access=x1
-    case let x: // name=x2
-        print(x) // $ access=x2
-    }
-}
-
-// Tuple unpacking
-func t12() {
-    let tuple = (1, 2) // name=tuple1
-    let (x, // name=x1
-         y) = tuple // $ access=tuple1 // name=y1
-    print(x) // $ access=x1
-    print(y) // $ access=y1
-}
-
-// Tuple unpacking with underscore
-func t13() {
-    let tuple = (1, 2, 3) // name=tuple1
-    let (x, // name=x1
-         _,
-         y) = tuple // $ access=tuple1 // name=y1
-    print(x) // $ access=x1
-    print(y) // $ access=y1
-}
-
-// Optional binding (if let)
-func t14(optional: Int?) { // name=optional1
-    if let x = optional { // $ access=optional1 // name=x1
-        print(x) // $ access=x1
-    }
-}
-
-// Multiple optional bindings
-func t15(opt1: Int?, // name=opt11
-         opt2: String?) { // name=opt21
-    if let x = opt1, // $ access=opt11 // name=x1
-       let y = opt2 { // $ access=opt21 // name=y1
-        print(x) // $ access=x1
-        print(y) // $ access=y1
-    }
-}
-
-// Do-catch blocks
-func t16() throws {
-    do {
-        let x = try foo() // name=x1
-        print(x) // $ access=x1
-    } catch let error { // name=error1
-        print(error) // $ access=error1
-    }
-}
-
-// Closure captures
-func t17() {
-    let x = 1 // name=x1
-    let closure = { // name=closure1
-        print(x) // $ access=x1
-    }
-    closure() // $ access=closure1
-}
-
-// Closure with parameter shadowing
-func t18() {
-    let x = 1 // name=x1
-    let closure =
-        { (x: Int) -> Void in // name=x2
-            print(x) // $ access=x2
-        }
-    closure(2) // $ access=closure
-    print(x) // $ access=x1
-}
-
-// While loop
-func t19() {
-    var x = 0 // name=x1
-    while x < 10 { // $ access=x1
-        x = x + 1 // $ access=x1
-        print(x) // $ access=x1
-    }
-}
-
-// Repeat-while loop
-func t20() {
-    var x = 0 // name=x1
-    repeat {
-        x = x + 1 // $ access=x1
-        print(x) // $ access=x1
-    } while x < 10 // $ access=x1
-}
-
-// Property shadowing (var)
-func t21() {
-    var x = 1 // name=x1
-    var x = 2 // name=x2
-    print(x) // $ access=x2
-}
-
-// Nested functions
-func t22() {
-    let x = 1 // name=x1
-    func inner() { // name=inner1
-        let x = 2 // name=x2
-        print(x) // $ access=x2
-    }
-    inner() // $ access=inner1
-    print(x) // $ access=x1
-    let inner = 2 // name=inner2
-    print(inner) // $ access=inner2
-}
-
-// Three levels of shadowing
-func t23() {
-    let x = 1 // name=x1
-    {
-        let x = 2 // name=x2
-        {
-            let x = 3 // name=x3
-            print(x) // $ access=x3
-        }
-        print(x) // $ access=x2
-    }
-    print(x) // $ access=x1
-}
-
-// If-let followed by regular if
-func t24(optional: Int?) { // name=optional1
-    if let x = optional { // $ access=optional1 // name=x1
-        print(x) // $ access=x1
-    }
-    if true {
-        let x = 5 // name=x2
-        print(x) // $ access=x2
-    }
-}
-
-// Switch with variable shadowed within body of case
-func t25(value: Int) { // name=value1
-    switch value { // $ access=value1
-    case let x: // name=x1
-        print(x) // $ access=x1
-        let x = 10 // name=x2
-        print(x) // $ access=x2
-    }
-}
-
-func t26() -> Int {
-    let x = 42 // name=x1
-    guard let x = foo() else { // name=x2
-        return x // $ access=x1
-    }
-    print(x) // $ access=x2
-}
-
-// if with multiple conditions, mixing boolean and optional binding
-func t27(opt: Int?) { // name=opt1
-    if opt != nil, // $ access=opt1
-       let x = opt { // $ access=opt1
-        print(x) // $ access=x
-    }
-}
-
-// if with multiple let bindings and a boolean condition
-func t28(a: Int?, b: Int?) {
-    if let x = a, // $ access=a
-       let y = b, // $ access=b
-       x < y { // $ access=x access=y
-        print(x) // $ access=x
-        print(y) // $ access=y
-    }
-}
-
-// if with multiple conditions where a later binding shadows an outer variable
-func t29(opt: Int?) { // name=opt1
-    let x = 0 // name=x1
-    if opt != nil, // $ access=opt1
-       let x = opt { // $ access=opt1
-        print(x) // $ access=x
-    }
-    print(x) // $ access=x1
-}
-
-// guard with multiple conditions, mixing boolean and optional binding
-func t30(opt: Int?) { // name=opt1
-    guard opt != nil, // $ access=opt1
-          let x = opt else { // $ access=opt1
-        return
-    }
-    print(x) // $ access=x
-}
-
-// guard with multiple let bindings and a boolean condition
-func t31(a: Int?, b: Int?) {
-    guard let x = a, // $ access=a
-          let y = b, // $ access=b
-          x < y else { // $ access=x access=y
-        return
-    }
-    print(x) // $ access=x
-    print(y) // $ access=y
-}
-
-// guard with multiple conditions where bound variable is used in later condition
-func t32(opt: Int?) { // name=opt1
-    guard let x = opt, // $ access=opt1
-          x > 0 else { // $ access=x
-        return
-    }
-    print(x) // $ access=x
-}
-
-func t33() {
-    let x = 1 // name=x1
-    guard x > 0, // $ access=x1
-          let x = x, // $ access=x1 // name=x2
-          x > 0 else { // $ access=x2
-        return
-    }
-    print(x) // $ access=x2
-}
-
-func t34() {
-    let x = 1 // name=x1
-    if x > 0, // $ access=x1
-       let x = x, // $ access=x1 // name=x2
-       x > 0 { // $ access=x2
-        print(x) // $ access=x2
-    }
-}
-
-// While-let optional binding
-func t35(optional: Int?) { // name=optional1
-    while let x = optional { // $ access=optional1 // name=x1
-        print(x) // $ access=x1
-    }
-}
-
-// While with a sequence of variable bindings in the condition
-func t36(a: Int?, b: Int?) {
-    while let x = a, // $ access=a
-          let y = b, // $ access=b
-          x < y { // $ access=x access=y
-        print(x) // $ access=x
-        print(y) // $ access=y
-    }
-}
-
-// While-let with a sequence of shadowing variable declarations
-func t37() {
-    let x = 1 // name=x1
-    while let x = x, // $ access=x1 // name=x2
-          let x = x, // $ access=x2 // name=x3
-          x > 0 { // $ access=x3
-        print(x) // $ access=x3
-    }
-}
-
-enum E38 {
-    case a(Int)
-    case b(Int)
-}
-
-// Switch with a multi-pattern case that binds 'x' in each pattern
-func t38(value: E38) {
-    switch value { // $ access=value
-    case .a(let x), // $ access=x1 // name=x1
-         .b(let x): // $ access=x1
-        print(x) // $ access=x1
-
-    case .a(let y) where y < 1, // $ access=y1 // name=y1
-         .b(let y): // $ access=y1
-        print(y) // $ access=y1
-    }
-}
diff --git a/unified/ql/test/library-tests/variables/variables.ql b/unified/ql/test/library-tests/variables/variables.ql
deleted file mode 100644
index cf653afebd9d..000000000000
--- a/unified/ql/test/library-tests/variables/variables.ql
+++ /dev/null
@@ -1,61 +0,0 @@
-import unified
-import utils.test.InlineExpectationsTest
-
-/** Holds if a comment with `text` appears at `filepath:line`, excluding the text in a `$` section. */
-predicate plainCommentAt(string filepath, int line, string text) {
-  exists(Comment comment |
-    comment.getLocation().hasLocationInfo(filepath, line, _, _, _) and
-    text = comment.getCommentText().regexpReplaceAll("\\$([^/]|/[^/])*", "")
-  )
-}
-
-/** Holds if a `key=value` comment appears on `filepath:line` (not in the `$` section). */
-predicate keyValueCommentAt(string filepath, int line, string key, string value) {
-  exists(string text, string regexp, string match |
-    plainCommentAt(filepath, line, text) and
-    regexp = "(\\w+)=(\\w+)" and
-    match = text.regexpFind(regexp, _, _) and
-    key = match.regexpCapture(regexp, 1) and
-    value = match.regexpCapture(regexp, 2)
-  )
-}
-
-module VariableAccessTest implements TestSig {
-  string getARelevantTag() { result = "access" }
-
-  additional predicate declAt(Variable v, string filepath, int line) {
-    v.getLocation().hasLocationInfo(filepath, line, _, _, _)
-  }
-
-  private predicate decl(Variable v, string alias) {
-    exists(string filepath, int line | declAt(v, filepath, line) |
-      keyValueCommentAt(filepath, line, "name", alias)
-      or
-      not keyValueCommentAt(filepath, line, "name", _) and
-      alias = v.getName()
-    )
-  }
-
-  predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(VariableAccess va, Variable v |
-      v = va.getVariable() and
-      not va = v.getDefiningNode() and
-      location = va.getLocation() and
-      element = va.toString() and
-      decl(v, value) and
-      tag = "access"
-    )
-  }
-}
-
-import MakeTest<VariableAccessTest>
-
-private Variable getVariableAt(string name, string filepath, int line) {
-  VariableAccessTest::declAt(result, filepath, line) and
-  result.getName() = name
-}
-
-query predicate ambiguousVariable(Variable v, string name, string filepath, int line) {
-  v = getVariableAt(name, filepath, line) and
-  strictcount(getVariableAt(name, filepath, line)) >= 2
-}
diff --git a/unified/ql/test/query-tests/security/CWE-022/PathInjection/PathInjectionTest.expected b/unified/ql/test/query-tests/security/CWE-022/PathInjection/PathInjectionTest.expected
new file mode 100644
index 000000000000..74768a2a4957
--- /dev/null
+++ b/unified/ql/test/query-tests/security/CWE-022/PathInjection/PathInjectionTest.expected
@@ -0,0 +1,361 @@
+#select
+| testPathInjection.swift:346:24:346:32 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:346:24:346:32 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:349:30:349:38 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:349:30:349:38 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:350:22:350:30 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:350:22:350:30 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:351:34:351:45 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:351:34:351:45 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:352:26:352:37 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:352:26:352:37 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:355:40:355:48 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:355:40:355:48 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:356:44:356:55 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:356:44:356:55 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:358:13:358:21 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:358:13:358:21 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:359:35:359:46 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:359:35:359:46 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:360:44:360:55 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:360:44:360:55 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:361:33:361:44 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:361:33:361:44 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:362:28:362:36 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:362:28:362:36 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:363:40:363:51 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:363:40:363:51 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:364:35:364:46 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:364:35:364:46 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:365:23:365:31 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:365:23:365:31 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:366:27:366:38 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:366:27:366:38 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:367:22:367:30 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:367:22:367:30 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:368:30:368:38 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:368:30:368:38 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:369:51:369:59 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:369:51:369:59 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:371:13:371:21 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:371:13:371:21 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:374:34:374:42 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:374:34:374:42 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:376:21:376:29 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:376:21:376:29 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:377:34:377:42 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:377:34:377:42 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:378:25:378:36 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:378:25:378:36 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:379:37:379:48 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:379:37:379:48 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:380:21:380:29 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:380:21:380:29 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:381:34:381:42 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:381:34:381:42 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:382:25:382:36 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:382:25:382:36 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:383:37:383:48 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:383:37:383:48 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:384:31:384:39 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:384:31:384:39 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:385:60:385:68 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:385:60:385:68 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:386:35:386:46 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:386:35:386:46 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:387:60:387:71 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:387:60:387:71 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:388:21:388:29 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:388:21:388:29 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:389:34:389:42 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:389:34:389:42 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:390:25:390:36 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:390:25:390:36 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:391:37:391:48 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:391:37:391:48 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:392:50:392:61 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:392:50:392:61 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:393:35:393:46 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:393:35:393:46 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:395:17:395:28 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:395:17:395:28 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:396:41:396:52 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:396:41:396:52 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:397:33:397:44 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:397:33:397:44 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:398:38:398:49 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:398:38:398:49 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:399:51:399:62 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:399:51:399:62 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:400:43:400:54 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:400:43:400:54 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:401:34:401:42 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:401:34:401:42 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:403:50:403:61 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:403:50:403:61 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:404:42:404:53 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:404:42:404:53 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:405:40:405:51 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:405:40:405:51 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:406:43:406:54 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:406:43:406:54 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:407:60:407:71 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:407:60:407:71 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:408:50:408:61 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:408:50:408:61 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:410:26:410:36 | remoteNsUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:410:26:410:36 | remoteNsUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:412:52:412:62 | remoteNsUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:412:52:412:62 | remoteNsUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:415:41:415:52 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:415:41:415:52 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:416:41:416:52 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:416:41:416:52 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:417:41:417:52 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:417:41:417:52 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:419:43:419:54 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:419:43:419:54 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:420:43:420:54 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:420:43:420:54 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:421:26:421:34 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:421:26:421:34 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:422:30:422:41 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:422:30:422:41 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:424:59:424:70 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:424:59:424:70 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:425:46:425:76 | TypeCastExpr | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:425:46:425:76 | TypeCastExpr | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:426:42:426:72 | TypeCastExpr | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:426:42:426:72 | TypeCastExpr | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:430:15:430:51 | FilePath(...) | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:430:15:430:51 | FilePath(...) | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:433:15:433:51 | FilePath(...) | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:433:15:433:51 | FilePath(...) | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:436:25:436:33 | remoteUrl | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:436:25:436:33 | remoteUrl | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:437:26:437:37 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:437:26:437:37 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:441:28:441:39 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:441:28:441:39 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:443:32:443:43 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:443:32:443:43 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:445:33:445:44 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:445:33:445:44 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:447:40:447:51 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:447:40:447:51 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:456:15:456:26 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:456:15:456:26 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:482:22:482:33 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:482:22:482:33 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:484:24:484:30 | buffer2 | testPathInjection.swift:477:22:477:87 | Data(...) | testPathInjection.swift:484:24:484:30 | buffer2 | This path depends on a $@. | testPathInjection.swift:477:22:477:87 | Data(...) | user-provided value |
+| testPathInjection.swift:486:25:486:36 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:486:25:486:36 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:498:49:498:60 | remoteString | testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:498:49:498:60 | remoteString | This path depends on a $@. | testPathInjection.swift:340:24:340:78 | String(...) | user-provided value |
+| testPathInjection.swift:502:26:502:36 | remoteData2 | testPathInjection.swift:501:23:501:75 | Data(...) | testPathInjection.swift:502:26:502:36 | remoteData2 | This path depends on a $@. | testPathInjection.swift:501:23:501:75 | Data(...) | user-provided value |
+| testPathInjection.swift:512:37:512:48 | remoteString | testPathInjection.swift:506:24:506:78 | String(...) | testPathInjection.swift:512:37:512:48 | remoteString | This path depends on a $@. | testPathInjection.swift:506:24:506:78 | String(...) | user-provided value |
+| testPathInjection.swift:514:33:514:44 | remoteString | testPathInjection.swift:506:24:506:78 | String(...) | testPathInjection.swift:514:33:514:44 | remoteString | This path depends on a $@. | testPathInjection.swift:506:24:506:78 | String(...) | user-provided value |
+| testPathInjection.swift:526:28:526:66 | ... .appendingPathComponent(...) | testPathInjection.swift:521:24:521:78 | String(...) | testPathInjection.swift:526:28:526:66 | ... .appendingPathComponent(...) | This path depends on a $@. | testPathInjection.swift:521:24:521:78 | String(...) | user-provided value |
+| testPathInjection.swift:527:28:527:93 | ... .appendingPathComponent(...) | testPathInjection.swift:521:24:521:78 | String(...) | testPathInjection.swift:527:28:527:93 | ... .appendingPathComponent(...) | This path depends on a $@. | testPathInjection.swift:521:24:521:78 | String(...) | user-provided value |
+| testPathInjection.swift:529:28:529:29 | u1 | testPathInjection.swift:521:24:521:78 | String(...) | testPathInjection.swift:529:28:529:29 | u1 | This path depends on a $@. | testPathInjection.swift:521:24:521:78 | String(...) | user-provided value |
+| testPathInjection.swift:531:28:531:39 | remoteString | testPathInjection.swift:521:24:521:78 | String(...) | testPathInjection.swift:531:28:531:39 | remoteString | This path depends on a $@. | testPathInjection.swift:521:24:521:78 | String(...) | user-provided value |
+| testPathInjection.swift:537:24:537:63 | ... ! | testPathInjection.swift:521:24:521:78 | String(...) | testPathInjection.swift:537:24:537:63 | ... ! | This path depends on a $@. | testPathInjection.swift:521:24:521:78 | String(...) | user-provided value |
+| testPathInjection.swift:541:24:541:53 | ... ! | testPathInjection.swift:521:24:521:78 | String(...) | testPathInjection.swift:541:24:541:53 | ... ! | This path depends on a $@. | testPathInjection.swift:521:24:521:78 | String(...) | user-provided value |
+| testPathInjection.swift:543:32:543:43 | remoteString | testPathInjection.swift:521:24:521:78 | String(...) | testPathInjection.swift:543:32:543:43 | remoteString | This path depends on a $@. | testPathInjection.swift:521:24:521:78 | String(...) | user-provided value |
+| testPathInjection.swift:544:38:544:49 | remoteString | testPathInjection.swift:521:24:521:78 | String(...) | testPathInjection.swift:544:38:544:49 | remoteString | This path depends on a $@. | testPathInjection.swift:521:24:521:78 | String(...) | user-provided value |
+| testPathInjection.swift:545:45:545:56 | remoteString | testPathInjection.swift:521:24:521:78 | String(...) | testPathInjection.swift:545:45:545:56 | remoteString | This path depends on a $@. | testPathInjection.swift:521:24:521:78 | String(...) | user-provided value |
+| testPathInjection.swift:549:32:549:41 | ... .pointee | testPathInjection.swift:521:24:521:78 | String(...) | testPathInjection.swift:549:32:549:41 | ... .pointee | This path depends on a $@. | testPathInjection.swift:521:24:521:78 | String(...) | user-provided value |
+| testPathInjection.swift:561:35:561:46 | remoteString | testPathInjection.swift:521:24:521:78 | String(...) | testPathInjection.swift:561:35:561:46 | remoteString | This path depends on a $@. | testPathInjection.swift:521:24:521:78 | String(...) | user-provided value |
+| testPathInjection.swift:562:41:562:52 | remoteString | testPathInjection.swift:521:24:521:78 | String(...) | testPathInjection.swift:562:41:562:52 | remoteString | This path depends on a $@. | testPathInjection.swift:521:24:521:78 | String(...) | user-provided value |
+| testPathInjection.swift:584:25:584:36 | remoteString | testPathInjection.swift:582:24:582:78 | String(...) | testPathInjection.swift:584:25:584:36 | remoteString | This path depends on a $@. | testPathInjection.swift:582:24:582:78 | String(...) | user-provided value |
+| testPathInjection.swift:586:41:586:52 | remoteString | testPathInjection.swift:582:24:582:78 | String(...) | testPathInjection.swift:586:41:586:52 | remoteString | This path depends on a $@. | testPathInjection.swift:582:24:582:78 | String(...) | user-provided value |
+| testPathInjection.swift:588:38:588:49 | remoteString | testPathInjection.swift:582:24:582:78 | String(...) | testPathInjection.swift:588:38:588:49 | remoteString | This path depends on a $@. | testPathInjection.swift:582:24:582:78 | String(...) | user-provided value |
+| testPathInjection.swift:590:22:590:33 | remoteString | testPathInjection.swift:582:24:582:78 | String(...) | testPathInjection.swift:590:22:590:33 | remoteString | This path depends on a $@. | testPathInjection.swift:582:24:582:78 | String(...) | user-provided value |
+edges
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:341:33:341:44 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:342:37:342:48 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:351:34:351:45 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:352:26:352:37 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:356:44:356:55 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:359:35:359:46 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:360:44:360:55 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:361:33:361:44 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:363:40:363:51 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:364:35:364:46 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:366:27:366:38 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:378:25:378:36 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:379:37:379:48 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:382:25:382:36 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:383:37:383:48 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:386:35:386:46 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:387:60:387:71 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:390:25:390:36 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:391:37:391:48 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:392:50:392:61 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:393:35:393:46 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:395:17:395:28 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:396:41:396:52 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:397:33:397:44 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:398:38:398:49 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:399:51:399:62 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:400:43:400:54 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:403:50:403:61 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:404:42:404:53 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:405:40:405:51 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:406:43:406:54 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:407:60:407:71 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:408:50:408:61 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:415:41:415:52 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:416:41:416:52 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:417:41:417:52 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:419:43:419:54 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:420:43:420:54 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:422:30:422:41 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:424:59:424:70 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:425:46:425:57 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:426:42:426:53 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:430:39:430:50 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:433:39:433:50 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:437:26:437:37 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:441:28:441:39 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:443:32:443:43 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:445:33:445:44 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:447:40:447:51 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:456:15:456:26 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:482:22:482:33 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:486:25:486:36 | remoteString | provenance |  |
+| testPathInjection.swift:340:9:340:20 | remoteString | testPathInjection.swift:498:49:498:60 | remoteString | provenance |  |
+| testPathInjection.swift:340:24:340:78 | String(...) | testPathInjection.swift:340:9:340:20 | remoteString | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:346:24:346:32 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:349:30:349:38 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:350:22:350:30 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:355:40:355:48 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:358:13:358:21 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:362:28:362:36 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:365:23:365:31 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:367:22:367:30 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:368:30:368:38 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:369:51:369:59 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:371:13:371:21 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:374:34:374:42 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:376:21:376:29 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:377:34:377:42 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:380:21:380:29 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:381:34:381:42 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:384:31:384:39 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:385:60:385:68 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:388:21:388:29 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:389:34:389:42 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:401:34:401:42 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:421:26:421:34 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | testPathInjection.swift:436:25:436:33 | remoteUrl | provenance |  |
+| testPathInjection.swift:341:33:341:44 | remoteString | testPathInjection.swift:341:9:341:17 | remoteUrl | provenance |  |
+| testPathInjection.swift:342:9:342:19 | remoteNsUrl | testPathInjection.swift:410:26:410:36 | remoteNsUrl | provenance |  |
+| testPathInjection.swift:342:9:342:19 | remoteNsUrl | testPathInjection.swift:412:52:412:62 | remoteNsUrl | provenance |  |
+| testPathInjection.swift:342:37:342:48 | remoteString | testPathInjection.swift:342:9:342:19 | remoteNsUrl | provenance |  |
+| testPathInjection.swift:425:46:425:57 | remoteString | testPathInjection.swift:425:46:425:76 | TypeCastExpr | provenance |  |
+| testPathInjection.swift:426:42:426:53 | remoteString | testPathInjection.swift:426:42:426:72 | TypeCastExpr | provenance |  |
+| testPathInjection.swift:430:39:430:50 | remoteString | testPathInjection.swift:430:15:430:51 | FilePath(...) | provenance |  |
+| testPathInjection.swift:433:39:433:50 | remoteString | testPathInjection.swift:433:15:433:51 | FilePath(...) | provenance |  |
+| testPathInjection.swift:477:9:477:18 | remoteData | testPathInjection.swift:479:5:479:14 | remoteData | provenance |  |
+| testPathInjection.swift:477:22:477:87 | Data(...) | testPathInjection.swift:477:9:477:18 | remoteData | provenance |  |
+| testPathInjection.swift:479:5:479:14 | remoteData | testPathInjection.swift:479:30:479:36 | [post] buffer2 | provenance |  |
+| testPathInjection.swift:479:30:479:36 | [post] buffer2 | testPathInjection.swift:484:24:484:30 | buffer2 | provenance |  |
+| testPathInjection.swift:501:9:501:19 | remoteData2 | testPathInjection.swift:502:26:502:36 | remoteData2 | provenance |  |
+| testPathInjection.swift:501:23:501:75 | Data(...) | testPathInjection.swift:501:9:501:19 | remoteData2 | provenance |  |
+| testPathInjection.swift:506:9:506:20 | remoteString | testPathInjection.swift:512:37:512:48 | remoteString | provenance |  |
+| testPathInjection.swift:506:9:506:20 | remoteString | testPathInjection.swift:514:33:514:44 | remoteString | provenance |  |
+| testPathInjection.swift:506:24:506:78 | String(...) | testPathInjection.swift:506:9:506:20 | remoteString | provenance |  |
+| testPathInjection.swift:521:9:521:20 | remoteString | testPathInjection.swift:526:54:526:65 | remoteString | provenance |  |
+| testPathInjection.swift:521:9:521:20 | remoteString | testPathInjection.swift:527:54:527:65 | remoteString | provenance |  |
+| testPathInjection.swift:521:9:521:20 | remoteString | testPathInjection.swift:528:28:528:39 | remoteString | provenance |  |
+| testPathInjection.swift:521:9:521:20 | remoteString | testPathInjection.swift:531:28:531:39 | remoteString | provenance |  |
+| testPathInjection.swift:521:9:521:20 | remoteString | testPathInjection.swift:537:50:537:61 | remoteString | provenance |  |
+| testPathInjection.swift:521:9:521:20 | remoteString | testPathInjection.swift:539:28:539:39 | remoteString | provenance |  |
+| testPathInjection.swift:521:9:521:20 | remoteString | testPathInjection.swift:543:32:543:43 | remoteString | provenance |  |
+| testPathInjection.swift:521:9:521:20 | remoteString | testPathInjection.swift:544:38:544:49 | remoteString | provenance |  |
+| testPathInjection.swift:521:9:521:20 | remoteString | testPathInjection.swift:545:45:545:56 | remoteString | provenance |  |
+| testPathInjection.swift:521:9:521:20 | remoteString | testPathInjection.swift:548:18:548:29 | remoteString | provenance |  |
+| testPathInjection.swift:521:9:521:20 | remoteString | testPathInjection.swift:561:35:561:46 | remoteString | provenance |  |
+| testPathInjection.swift:521:9:521:20 | remoteString | testPathInjection.swift:562:41:562:52 | remoteString | provenance |  |
+| testPathInjection.swift:521:24:521:78 | String(...) | testPathInjection.swift:521:9:521:20 | remoteString | provenance |  |
+| testPathInjection.swift:526:54:526:65 | remoteString | testPathInjection.swift:526:28:526:66 | ... .appendingPathComponent(...) | provenance |  |
+| testPathInjection.swift:527:28:527:66 | ... .appendingPathComponent(...) | testPathInjection.swift:16:74:16:77 | self | provenance |  |
+| testPathInjection.swift:527:28:527:66 | ... .appendingPathComponent(...) | testPathInjection.swift:527:28:527:93 | ... .appendingPathComponent(...) | provenance |  |
+| testPathInjection.swift:527:54:527:65 | remoteString | testPathInjection.swift:527:28:527:66 | ... .appendingPathComponent(...) | provenance |  |
+| testPathInjection.swift:528:28:528:39 | remoteString | testPathInjection.swift:529:28:529:29 | u1 | provenance |  |
+| testPathInjection.swift:537:24:537:62 | ... .appendingPathComponent(...) | testPathInjection.swift:537:24:537:63 | ... ! | provenance |  |
+| testPathInjection.swift:537:50:537:61 | remoteString | testPathInjection.swift:537:24:537:62 | ... .appendingPathComponent(...) | provenance |  |
+| testPathInjection.swift:539:9:539:10 | u4 | testPathInjection.swift:541:24:541:25 | u4 | provenance |  |
+| testPathInjection.swift:539:28:539:39 | remoteString | testPathInjection.swift:539:9:539:10 | u4 | provenance |  |
+| testPathInjection.swift:541:24:541:25 | u4 | testPathInjection.swift:541:24:541:52 | ... .appendingPathComponent(...) | provenance |  |
+| testPathInjection.swift:541:24:541:52 | ... .appendingPathComponent(...) | testPathInjection.swift:541:24:541:53 | ... ! | provenance |  |
+| testPathInjection.swift:548:5:548:6 | [post] s1 [pointee] | testPathInjection.swift:549:32:549:33 | s1 [pointee] | provenance |  |
+| testPathInjection.swift:548:5:548:14 | ... .pointee | testPathInjection.swift:548:5:548:6 | [post] s1 [pointee] | provenance |  |
+| testPathInjection.swift:548:18:548:29 | remoteString | testPathInjection.swift:548:5:548:14 | ... .pointee | provenance |  |
+| testPathInjection.swift:549:32:549:33 | s1 [pointee] | testPathInjection.swift:549:32:549:41 | ... .pointee | provenance |  |
+| testPathInjection.swift:582:9:582:20 | remoteString | testPathInjection.swift:584:25:584:36 | remoteString | provenance |  |
+| testPathInjection.swift:582:9:582:20 | remoteString | testPathInjection.swift:586:41:586:52 | remoteString | provenance |  |
+| testPathInjection.swift:582:9:582:20 | remoteString | testPathInjection.swift:588:38:588:49 | remoteString | provenance |  |
+| testPathInjection.swift:582:9:582:20 | remoteString | testPathInjection.swift:590:22:590:33 | remoteString | provenance |  |
+| testPathInjection.swift:582:24:582:78 | String(...) | testPathInjection.swift:582:9:582:20 | remoteString | provenance |  |
+nodes
+| testPathInjection.swift:16:74:16:77 | self | semmle.label | self |
+| testPathInjection.swift:340:9:340:20 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:340:24:340:78 | String(...) | semmle.label | String(...) |
+| testPathInjection.swift:341:9:341:17 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:341:33:341:44 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:342:9:342:19 | remoteNsUrl | semmle.label | remoteNsUrl |
+| testPathInjection.swift:342:37:342:48 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:346:24:346:32 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:349:30:349:38 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:350:22:350:30 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:351:34:351:45 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:352:26:352:37 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:355:40:355:48 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:356:44:356:55 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:358:13:358:21 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:359:35:359:46 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:360:44:360:55 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:361:33:361:44 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:362:28:362:36 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:363:40:363:51 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:364:35:364:46 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:365:23:365:31 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:366:27:366:38 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:367:22:367:30 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:368:30:368:38 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:369:51:369:59 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:371:13:371:21 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:374:34:374:42 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:376:21:376:29 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:377:34:377:42 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:378:25:378:36 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:379:37:379:48 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:380:21:380:29 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:381:34:381:42 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:382:25:382:36 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:383:37:383:48 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:384:31:384:39 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:385:60:385:68 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:386:35:386:46 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:387:60:387:71 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:388:21:388:29 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:389:34:389:42 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:390:25:390:36 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:391:37:391:48 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:392:50:392:61 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:393:35:393:46 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:395:17:395:28 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:396:41:396:52 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:397:33:397:44 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:398:38:398:49 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:399:51:399:62 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:400:43:400:54 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:401:34:401:42 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:403:50:403:61 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:404:42:404:53 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:405:40:405:51 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:406:43:406:54 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:407:60:407:71 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:408:50:408:61 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:410:26:410:36 | remoteNsUrl | semmle.label | remoteNsUrl |
+| testPathInjection.swift:412:52:412:62 | remoteNsUrl | semmle.label | remoteNsUrl |
+| testPathInjection.swift:415:41:415:52 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:416:41:416:52 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:417:41:417:52 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:419:43:419:54 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:420:43:420:54 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:421:26:421:34 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:422:30:422:41 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:424:59:424:70 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:425:46:425:57 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:425:46:425:76 | TypeCastExpr | semmle.label | TypeCastExpr |
+| testPathInjection.swift:426:42:426:53 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:426:42:426:72 | TypeCastExpr | semmle.label | TypeCastExpr |
+| testPathInjection.swift:430:15:430:51 | FilePath(...) | semmle.label | FilePath(...) |
+| testPathInjection.swift:430:39:430:50 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:433:15:433:51 | FilePath(...) | semmle.label | FilePath(...) |
+| testPathInjection.swift:433:39:433:50 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:436:25:436:33 | remoteUrl | semmle.label | remoteUrl |
+| testPathInjection.swift:437:26:437:37 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:441:28:441:39 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:443:32:443:43 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:445:33:445:44 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:447:40:447:51 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:456:15:456:26 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:477:9:477:18 | remoteData | semmle.label | remoteData |
+| testPathInjection.swift:477:22:477:87 | Data(...) | semmle.label | Data(...) |
+| testPathInjection.swift:479:5:479:14 | remoteData | semmle.label | remoteData |
+| testPathInjection.swift:479:30:479:36 | [post] buffer2 | semmle.label | [post] buffer2 |
+| testPathInjection.swift:482:22:482:33 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:484:24:484:30 | buffer2 | semmle.label | buffer2 |
+| testPathInjection.swift:486:25:486:36 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:498:49:498:60 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:501:9:501:19 | remoteData2 | semmle.label | remoteData2 |
+| testPathInjection.swift:501:23:501:75 | Data(...) | semmle.label | Data(...) |
+| testPathInjection.swift:502:26:502:36 | remoteData2 | semmle.label | remoteData2 |
+| testPathInjection.swift:506:9:506:20 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:506:24:506:78 | String(...) | semmle.label | String(...) |
+| testPathInjection.swift:512:37:512:48 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:514:33:514:44 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:521:9:521:20 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:521:24:521:78 | String(...) | semmle.label | String(...) |
+| testPathInjection.swift:526:28:526:66 | ... .appendingPathComponent(...) | semmle.label | ... .appendingPathComponent(...) |
+| testPathInjection.swift:526:54:526:65 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:527:28:527:66 | ... .appendingPathComponent(...) | semmle.label | ... .appendingPathComponent(...) |
+| testPathInjection.swift:527:28:527:93 | ... .appendingPathComponent(...) | semmle.label | ... .appendingPathComponent(...) |
+| testPathInjection.swift:527:54:527:65 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:528:28:528:39 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:529:28:529:29 | u1 | semmle.label | u1 |
+| testPathInjection.swift:531:28:531:39 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:537:24:537:62 | ... .appendingPathComponent(...) | semmle.label | ... .appendingPathComponent(...) |
+| testPathInjection.swift:537:24:537:63 | ... ! | semmle.label | ... ! |
+| testPathInjection.swift:537:50:537:61 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:539:9:539:10 | u4 | semmle.label | u4 |
+| testPathInjection.swift:539:28:539:39 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:541:24:541:25 | u4 | semmle.label | u4 |
+| testPathInjection.swift:541:24:541:52 | ... .appendingPathComponent(...) | semmle.label | ... .appendingPathComponent(...) |
+| testPathInjection.swift:541:24:541:53 | ... ! | semmle.label | ... ! |
+| testPathInjection.swift:543:32:543:43 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:544:38:544:49 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:545:45:545:56 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:548:5:548:6 | [post] s1 [pointee] | semmle.label | [post] s1 [pointee] |
+| testPathInjection.swift:548:5:548:14 | ... .pointee | semmle.label | ... .pointee |
+| testPathInjection.swift:548:18:548:29 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:549:32:549:33 | s1 [pointee] | semmle.label | s1 [pointee] |
+| testPathInjection.swift:549:32:549:41 | ... .pointee | semmle.label | ... .pointee |
+| testPathInjection.swift:561:35:561:46 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:562:41:562:52 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:582:9:582:20 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:582:24:582:78 | String(...) | semmle.label | String(...) |
+| testPathInjection.swift:584:25:584:36 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:586:41:586:52 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:588:38:588:49 | remoteString | semmle.label | remoteString |
+| testPathInjection.swift:590:22:590:33 | remoteString | semmle.label | remoteString |
+subpaths
+| testPathInjection.swift:527:28:527:66 | ... .appendingPathComponent(...) | testPathInjection.swift:16:74:16:77 | self | testPathInjection.swift:16:74:16:77 | self | testPathInjection.swift:527:28:527:93 | ... .appendingPathComponent(...) |
diff --git a/unified/ql/test/query-tests/security/CWE-022/PathInjection/PathInjectionTest.qlref b/unified/ql/test/query-tests/security/CWE-022/PathInjection/PathInjectionTest.qlref
new file mode 100644
index 000000000000..1fab38d532b7
--- /dev/null
+++ b/unified/ql/test/query-tests/security/CWE-022/PathInjection/PathInjectionTest.qlref
@@ -0,0 +1,3 @@
+query: queries/security/CWE-022/PathInjection.ql
+postprocess:
+  - utils/test/InlineExpectationsTestQuery.ql
diff --git a/unified/ql/test/query-tests/security/CWE-022/PathInjection/testPathInjection.swift b/unified/ql/test/query-tests/security/CWE-022/PathInjection/testPathInjection.swift
new file mode 100644
index 000000000000..d9cb5ecaaa30
--- /dev/null
+++ b/unified/ql/test/query-tests/security/CWE-022/PathInjection/testPathInjection.swift
@@ -0,0 +1,597 @@
+// --- stubs ---
+
+struct URL {
+    enum DirectoryHint {
+        case inferFromPath
+    }
+
+    init?(string: String) {}
+    init(fileURLWithPath path: String, isDirectory: Bool) {}
+    init(
+        filePath path: String, directoryHint: URL.DirectoryHint = .inferFromPath,
+        relativeTo base: URL? = nil
+    ) {}
+
+    mutating func appendPathComponent(_ pathComponent: String) {}
+    func appendingPathComponent(_ pathComponent: String) -> URL { return self }
+}
+
+class NSURL {
+    init?(string: String) {}
+
+    func appendingPathComponent(_ pathComponent: String) -> URL? { return nil }
+
+    var filePathURL: URL? { URL(string: "") }
+}
+
+extension StringProtocol {
+    func completePath(
+        into outputName: UnsafeMutablePointer<String>? = nil,
+        caseSensitive: Bool,
+        matchesInto outputArray: UnsafeMutablePointer<[String]>? = nil,
+        filterTypes: [String]? = nil
+    ) -> Int { 0 }
+}
+
+extension String {
+    struct Encoding {
+        static let utf8 = Encoding()
+    }
+
+    init(contentsOf: URL) {
+        let data = ""
+        self.init(data)
+    }
+
+    init(contentsOfFile path: String) throws {
+        self.init("")
+    }
+
+    init(contentsOfFile path: String, encoding enc: String.Encoding) throws {
+        self.init("")
+    }
+
+    init(contentsOfFile path: String, usedEncoding: inout String.Encoding) throws {
+        self.init("")
+    }
+}
+
+class NSString {
+    init() {}
+    init(string aString: String) {}
+    convenience init(contentsOfFile path: String, encoding enc: UInt) throws { self.init() }
+    convenience init(contentsOfFile path: String, usedEncoding enc: UnsafeMutablePointer<UInt>?)
+        throws
+    { self.init() }
+
+    func write(toFile: String, atomically: Bool, encoding: UInt) {}
+    func write(to: URL, atomically: Bool, encoding: UInt) {}
+
+    var utf8String: UnsafePointer<CChar>? { return nil }
+}
+protocol DataProtocol {}
+class Data: DataProtocol {
+    struct ReadingOptions: OptionSet { let rawValue: Int }
+    struct WritingOptions: OptionSet { let rawValue: Int }
+
+    init<S>(_ elements: S) { count = 0 }
+    init(contentsOf: URL, options: ReadingOptions) { count = 0 }
+
+    func copyBytes(to: UnsafeMutablePointer<UInt8>, count: Int) {}
+
+    func write(to: URL, options: Data.WritingOptions = []) {}
+
+    var count: Int
+}
+
+class NSData {
+    init() {}
+    init?(contentsOfFile path: String) {}
+    init?(contentsOfMappedFile path: String) {}
+    init?(contentsOf url: URL) {}
+    class func dataWithContentsOfMappedFile(_ path: String) -> Any? { return nil }
+
+    struct WritingOptions: OptionSet { let rawValue: Int }
+    func write(to: URL, atomically: Bool) -> Bool { return false }
+    func write(to: URL, options: NSData.WritingOptions) {}
+    func write(toFile: String, atomically: Bool) -> Bool { return false }
+    func write(toFile: String, options: NSData.WritingOptions) {}
+}
+
+class NSKeyedUnarchiver {
+    func unarchiveObject(withFile: String) -> Any? { return nil }
+}
+
+struct URLResourceKey {}
+
+struct FileAttributeKey: Hashable {}
+
+struct ObjCBool {}
+
+struct AutoreleasingUnsafeMutablePointer<Pointee> {}
+
+struct FilePath: ExpressibleByStringLiteral {
+    typealias StringLiteralType = String
+    init(stringLiteral: String) {}
+    func lexicallyNormalized() -> FilePath { return "" }
+    func starts(with: FilePath) -> Bool { return false }
+}
+
+class FileManager {
+    class DirectoryEnumerator {}
+    struct DirectoryEnumerationOptions: OptionSet { let rawValue: Int }
+    struct ItemReplacementOptions: OptionSet { let rawValue: Int }
+    struct UnmountOptions: OptionSet { let rawValue: Int }
+    struct SearchPathDomainMask {}
+    enum SearchPathDirectory: UInt { case none }
+    enum URLRelationship: Int { case none }
+
+    func contentsOfDirectory(
+        at: URL, includingPropertiesForKeys: [URLResourceKey]?,
+        options: FileManager.DirectoryEnumerationOptions
+    ) -> [URL] { return [] }
+    func contentsOfDirectory(atPath: String) -> [String] { return [] }
+    func enumerator(
+        at: URL, includingPropertiesForKeys: [URLResourceKey]?,
+        options: FileManager.DirectoryEnumerationOptions, errorHandler: ((URL, Error) -> Bool)?
+    ) -> FileManager.DirectoryEnumerator? { return nil }
+    func enumerator(atPath: String) -> FileManager.DirectoryEnumerator? { return nil }
+    func subpathsOfDirectory(atPath: String) -> [String] { return [] }
+    func subpaths(atPath: String) -> [String]? { return nil }
+    func createDirectory(
+        at: URL, withIntermediateDirectories: Bool, attributes: [FileAttributeKey: Any]?
+    ) {}
+    func createDirectory(
+        atPath: String, withIntermediateDirectories: Bool, attributes: [FileAttributeKey: Any]?
+    ) {}
+    func createFile(atPath: String, contents: Data?, attributes: [FileAttributeKey: Any]?) -> Bool {
+        return false
+    }
+    func removeItem(at: URL) {}
+    func removeItem(atPath: String) {}
+    func trashItem(at: URL, resultingItemURL: AutoreleasingUnsafeMutablePointer<NSURL?>?) {}
+    func replaceItemAt(
+        _: URL, withItemAt: URL, backupItemName: String?,
+        options: FileManager.ItemReplacementOptions
+    ) -> URL? { return nil }
+    func replaceItem(
+        at: URL, withItemAt: URL, backupItemName: String?,
+        options: FileManager.ItemReplacementOptions,
+        resultingItemURL: AutoreleasingUnsafeMutablePointer<NSURL?>?
+    ) {}
+    func copyItem(at: URL, to: URL) {}
+    func copyItem(atPath: String, toPath: String) {}
+    func moveItem(at: URL, to: URL) {}
+    func moveItem(atPath: String, toPath: String) {}
+    func createSymbolicLink(at: URL, withDestinationURL: URL) {}
+    func createSymbolicLink(atPath: String, withDestinationPath: String) {}
+    func linkItem(at: URL, to: URL) {}
+    func linkItem(atPath: String, toPath: String) {}
+    func destinationOfSymbolicLink(atPath: String) -> String { return "" }
+    func fileExists(atPath: String) -> Bool { return false }
+    func fileExists(atPath: String, isDirectory: UnsafeMutablePointer<ObjCBool>?) -> Bool {
+        return false
+    }
+    func setAttributes(_: [FileAttributeKey: Any], ofItemAtPath: String) {}
+    func contents(atPath: String) -> Data? { return nil }
+    func contentsEqual(atPath: String, andPath: String) -> Bool { return false }
+    func changeCurrentDirectoryPath(_: String) -> Bool { return false }
+    func unmountVolume(
+        at: URL, options: FileManager.UnmountOptions, completionHandler: (Error?) -> Void
+    ) {}
+    // Deprecated methods
+    func fileAttributes(atPath path: String, traverseLink yorn: Bool) -> [AnyHashable: Any]? { nil }
+    func changeFileAttributes(_: [AnyHashable: Any], atPath: String) -> Bool { return false }
+    func attributesOfItem(atPath path: String) throws -> [FileAttributeKey: Any] { return [:] }
+    func directoryContents(atPath: String) -> [Any]? { return nil }
+    func createDirectory(atPath: String, attributes: [AnyHashable: Any]) -> Bool { return false }
+    func createSymbolicLink(atPath: String, pathContent: String) -> Bool { return false }
+    func pathContentOfSymbolicLink(atPath: String) -> String? { return nil }
+    func replaceItemAtURL(
+        originalItemURL: NSURL, withItemAtURL: NSURL, backupItemName: String?,
+        options: FileManager.ItemReplacementOptions
+    ) -> NSURL? { return nil }
+}
+
+struct FileDescriptor {
+    struct AccessMode: RawRepresentable {
+        static let readOnly = AccessMode(rawValue: 0)
+        let rawValue: UInt8
+        init(rawValue: UInt8) { self.rawValue = rawValue }
+    }
+
+    struct OpenOptions: RawRepresentable {
+        static let append = OpenOptions(rawValue: 0)
+        let rawValue: UInt8
+        init(rawValue: UInt8) { self.rawValue = rawValue }
+    }
+}
+
+struct FilePermissions: RawRepresentable {
+    static let ownerRead = FilePermissions(rawValue: 0)
+    let rawValue: UInt8
+    init(rawValue: UInt8) { self.rawValue = rawValue }
+}
+
+class ArchiveByteStream {
+    static func fileStream(fd: FileDescriptor, automaticClose: Bool = true) -> ArchiveByteStream? {
+        return nil
+    }
+    static func withFileStream<E>(
+        fd: FileDescriptor, automaticClose: Bool = true, _ body: (ArchiveByteStream) -> E
+    ) -> E { return body(ArchiveByteStream()) }
+    static func fileStream(
+        path: FilePath, mode: FileDescriptor.AccessMode, options: FileDescriptor.OpenOptions,
+        permissions: FilePermissions
+    ) -> ArchiveByteStream? { return nil }
+    static func withFileStream<E>(
+        path: FilePath, mode: FileDescriptor.AccessMode, options: FileDescriptor.OpenOptions,
+        permissions: FilePermissions, _ body: (ArchiveByteStream) -> E
+    ) -> E { return body(ArchiveByteStream()) }
+}
+
+class Bundle {
+    init?(url: URL) {}
+    init?(path: String) {}
+}
+
+class KeyPath<Root, Value> {
+}
+
+class NSSortDescriptor {
+    init(key: String?, ascending: Bool) {}
+    convenience init<Root, Value>(keyPath: KeyPath<Root, Value>, ascending: Bool) {
+        self.init(key: nil, ascending: ascending)
+    }
+}
+
+// GRDB
+
+struct Configuration {}
+
+class Database {
+    init(path: String, description: String, configuration: Configuration) {}
+}
+
+class DatabasePool {
+    init(path: String, configuration: Configuration) {}
+}
+
+class DatabaseQueue {
+    init(path: String, configuration: Configuration) {}
+}
+
+class DatabaseSnapshotPool {
+    init(path: String, configuration: Configuration) {}
+}
+
+class SerializedDatabase {
+    init(
+        path: String, configuration: Configuration = Configuration(), defaultLabel: String,
+        purpose: String? = nil
+    ) {}
+}
+
+// Realm
+
+class Realm {
+}
+
+extension Realm {
+    struct Configuration {
+        init(
+            fileURL: URL? = URL(fileURLWithPath: "defaultFile", isDirectory: false),
+            inMemoryIdentifier: String? = nil,
+            syncConfiguration: Int = 0,
+            encryptionKey: Data? = nil,
+            readOnly: Bool = false,
+            schemaVersion: UInt64 = 0,
+            migrationBlock: Int = 0,
+            deleteRealmIfMigrationNeeded: Bool = false,
+            shouldCompactOnLaunch: Bool = false,
+            objectTypes: Int = 0,
+            seedFilePath: URL? = nil
+        ) {}
+
+        var fileURL: URL?
+        var seedFilePath: URL?
+    }
+}
+
+// sqlite3
+
+func sqlite3_open(
+    _ filename: UnsafePointer<CChar>?,
+    _ ppDb: UnsafeMutablePointer<OpaquePointer?>?
+) -> Int32 { return 0 }
+
+func sqlite3_open16(
+    _ filename: UnsafeRawPointer?,
+    _ ppDb: UnsafeMutablePointer<OpaquePointer?>?
+) -> Int32 { return 0 }
+
+func sqlite3_open_v2(
+    _ filename: UnsafePointer<CChar>?,
+    _ ppDb: UnsafeMutablePointer<OpaquePointer?>?,
+    _ flags: Int32,
+    _ zVfs: UnsafePointer<CChar>?
+) -> Int32 { return 0 }
+
+var sqlite3_temp_directory: UnsafeMutablePointer<CChar>?
+
+// SQLite.swift
+
+enum URIQueryParameter {
+}
+
+class Connection {
+    enum Location {
+        case inMemory
+        case uri(String, parameters: [URIQueryParameter] = [])
+    }
+
+    init(_ location: Location = .inMemory, readonly: Bool = false) throws {}
+    convenience init(_ filename: String, readonly: Bool = false) throws { try self.init() }
+}
+
+// --- tests ---
+
+func test(buffer1: UnsafeMutablePointer<UInt8>, buffer2: UnsafeMutablePointer<UInt8>) {
+    let remoteString = String(contentsOf: URL(string: "http://example.com/")!)  // $ Source
+    let remoteUrl = URL(string: remoteString)!
+    let remoteNsUrl = NSURL(string: remoteString)!
+    let safeUrl = URL(string: "")!
+    let safeNsUrl = NSURL(string: "")!
+
+    Data("").write(to: remoteUrl, options: [])  // $ Alert
+
+    let nsData = NSData()
+    let _ = nsData.write(to: remoteUrl, atomically: false)  // $ Alert
+    nsData.write(to: remoteUrl, options: [])  // $ Alert
+    let _ = nsData.write(toFile: remoteString, atomically: false)  // $ Alert
+    nsData.write(toFile: remoteString, options: [])  // $ Alert
+
+    let fm = FileManager()
+    let _ = fm.contentsOfDirectory(at: remoteUrl, includingPropertiesForKeys: [], options: [])  // $ Alert
+    let _ = fm.contentsOfDirectory(atPath: remoteString)  // $ Alert
+    let _ = fm.enumerator(
+        at: remoteUrl, includingPropertiesForKeys: [], options: [], errorHandler: nil)  // $ Alert
+    let _ = fm.enumerator(atPath: remoteString)  // $ Alert
+    let _ = fm.subpathsOfDirectory(atPath: remoteString)  // $ Alert
+    let _ = fm.subpaths(atPath: remoteString)  // $ Alert
+    fm.createDirectory(at: remoteUrl, withIntermediateDirectories: false, attributes: [:])  // $ Alert
+    let _ = fm.createDirectory(atPath: remoteString, attributes: [:])  // $ Alert
+    let _ = fm.createFile(atPath: remoteString, contents: nil, attributes: [:])  // $ Alert
+    fm.removeItem(at: remoteUrl)  // $ Alert
+    fm.removeItem(atPath: remoteString)  // $ Alert
+    fm.trashItem(at: remoteUrl, resultingItemURL: AutoreleasingUnsafeMutablePointer<NSURL?>())  // $ Alert
+    let _ = fm.replaceItemAt(remoteUrl, withItemAt: safeUrl, backupItemName: nil, options: [])  // $ Alert
+    let _ = fm.replaceItemAt(safeUrl, withItemAt: remoteUrl, backupItemName: nil, options: [])  // $ Alert
+    fm.replaceItem(
+        at: remoteUrl, withItemAt: safeUrl, backupItemName: nil, options: [], // $ Alert
+        resultingItemURL: AutoreleasingUnsafeMutablePointer<NSURL?>())  // $ MISSING: Alert // reported on a different line
+    fm.replaceItem(
+        at: safeUrl, withItemAt: remoteUrl, backupItemName: nil, options: [], // $ Alert
+        resultingItemURL: AutoreleasingUnsafeMutablePointer<NSURL?>())  // $ MISSING: Alert // reported on a different line
+    fm.copyItem(at: remoteUrl, to: safeUrl)  // $ Alert
+    fm.copyItem(at: safeUrl, to: remoteUrl)  // $ Alert
+    fm.copyItem(atPath: remoteString, toPath: "")  // $ Alert
+    fm.copyItem(atPath: "", toPath: remoteString)  // $ Alert
+    fm.moveItem(at: remoteUrl, to: safeUrl)  // $ Alert
+    fm.moveItem(at: safeUrl, to: remoteUrl)  // $ Alert
+    fm.moveItem(atPath: remoteString, toPath: "")  // $ Alert
+    fm.moveItem(atPath: "", toPath: remoteString)  // $ Alert
+    fm.createSymbolicLink(at: remoteUrl, withDestinationURL: safeUrl)  // $ Alert
+    fm.createSymbolicLink(at: safeUrl, withDestinationURL: remoteUrl)  // $ Alert
+    fm.createSymbolicLink(atPath: remoteString, withDestinationPath: "")  // $ Alert
+    fm.createSymbolicLink(atPath: "", withDestinationPath: remoteString)  // $ Alert
+    fm.linkItem(at: remoteUrl, to: safeUrl)  // $ Alert
+    fm.linkItem(at: safeUrl, to: remoteUrl)  // $ Alert
+    fm.linkItem(atPath: remoteString, toPath: "")  // $ Alert
+    fm.linkItem(atPath: "", toPath: remoteString)  // $ Alert
+    let _ = fm.destinationOfSymbolicLink(atPath: remoteString)  // $ Alert
+    let _ = fm.fileExists(atPath: remoteString)  // $ Alert
+    let _ = fm.fileExists(
+        atPath: remoteString, isDirectory: UnsafeMutablePointer<ObjCBool>.init(bitPattern: 0))  // $ Alert
+    fm.setAttributes([:], ofItemAtPath: remoteString)  // $ Alert
+    let _ = fm.contents(atPath: remoteString)  // $ Alert
+    let _ = fm.contentsEqual(atPath: remoteString, andPath: "")  // $ Alert
+    let _ = fm.contentsEqual(atPath: "", andPath: remoteString)  // $ Alert
+    let _ = fm.changeCurrentDirectoryPath(remoteString)  // $ Alert
+    let _ = fm.unmountVolume(at: remoteUrl, options: [], completionHandler: { _ in })  // $ Alert
+    // Deprecated methods
+    let _ = fm.changeFileAttributes([:], atPath: remoteString)  // $ Alert
+    let _ = fm.directoryContents(atPath: remoteString)  // $ Alert
+    let _ = fm.createDirectory(atPath: remoteString, attributes: [:])  // $ Alert
+    let _ = fm.createSymbolicLink(atPath: remoteString, pathContent: "")  // $ Alert
+    let _ = fm.createSymbolicLink(atPath: "", pathContent: remoteString)  // $ Alert
+    let _ = fm.pathContentOfSymbolicLink(atPath: remoteString)  // $ Alert
+    let _ = fm.replaceItemAtURL(
+        originalItemURL: remoteNsUrl, withItemAtURL: safeNsUrl, backupItemName: nil, options: [])  // $ Alert
+    let _ = fm.replaceItemAtURL(
+        originalItemURL: safeNsUrl, withItemAtURL: remoteNsUrl, backupItemName: nil, options: [])  // $ Alert
+
+    var encoding = String.Encoding.utf8
+    let _ = try! String(contentsOfFile: remoteString)  // $ Alert
+    let _ = try! String(contentsOfFile: remoteString, encoding: String.Encoding.utf8)  // $ Alert
+    let _ = try! String(contentsOfFile: remoteString, usedEncoding: &encoding)  // $ Alert
+
+    let _ = try! NSString(contentsOfFile: remoteString, encoding: 0)  // $ Alert
+    let _ = try! NSString(contentsOfFile: remoteString, usedEncoding: nil)  // $ Alert
+    NSString().write(to: remoteUrl, atomically: true, encoding: 0)  // $ Alert
+    NSString().write(toFile: remoteString, atomically: true, encoding: 0)  // $ Alert
+
+    let _ = NSKeyedUnarchiver().unarchiveObject(withFile: remoteString)  // $ Alert
+    let _ = ArchiveByteStream.fileStream(fd: remoteString as! FileDescriptor, automaticClose: true)  // $ Alert
+    ArchiveByteStream.withFileStream(fd: remoteString as! FileDescriptor, automaticClose: true) { // $ Alert
+        _ in
+    }
+    let _ = ArchiveByteStream.fileStream(
+        path: FilePath(stringLiteral: remoteString), mode: .readOnly, options: .append, // $ Alert
+        permissions: .ownerRead)  // $ MISSING: Alert // reported on a different line
+    ArchiveByteStream.withFileStream(
+        path: FilePath(stringLiteral: remoteString), mode: .readOnly, options: .append, // $ Alert
+        permissions: .ownerRead
+    ) { _ in }  // $ MISSING: Alert // reported on a different line
+    let _ = Bundle(url: remoteUrl)  // $ Alert
+    let _ = Bundle(path: remoteString)  // $ Alert
+
+    // GRDB
+
+    let _ = Database(path: remoteString, description: "", configuration: Configuration())  // $ Alert
+    let _ = Database(path: "", description: "", configuration: Configuration())  // Safe
+    let _ = DatabasePool(path: remoteString, configuration: Configuration())  // $ Alert
+    let _ = DatabasePool(path: "", configuration: Configuration())  // Safe
+    let _ = DatabaseQueue(path: remoteString, configuration: Configuration())  // $ Alert
+    let _ = DatabaseQueue(path: "", configuration: Configuration())  // Safe
+    let _ = DatabaseSnapshotPool(path: remoteString, configuration: Configuration())  // $ Alert
+    let _ = DatabaseSnapshotPool(path: "", configuration: Configuration())  // Safe
+    let _ = SerializedDatabase(path: remoteString, defaultLabel: "")  // $ MISSING: Alert
+    let _ = SerializedDatabase(path: "", defaultLabel: "")  // Safe
+    let _ = SerializedDatabase(path: remoteString, defaultLabel: "", purpose: nil)  // $ MISSING: Alert
+    let _ = SerializedDatabase(path: "", defaultLabel: "", purpose: nil)  // Safe
+    let _ = SerializedDatabase(path: remoteString, configuration: Configuration(), defaultLabel: "")  // $ MISSING: Alert
+    let _ = SerializedDatabase(path: "", configuration: Configuration(), defaultLabel: "")  // Safe
+    let _ = SerializedDatabase(
+        path: remoteString, configuration: Configuration(), defaultLabel: "", purpose: nil)  // $ Alert
+    let _ = SerializedDatabase(
+        path: "", configuration: Configuration(), defaultLabel: "", purpose: nil)  // Safe
+
+    // Realm
+
+    _ = Realm.Configuration(fileURL: safeUrl)  // GOOD
+    _ = Realm.Configuration(fileURL: remoteUrl)  // $ MISSING: Alert
+    _ = Realm.Configuration(seedFilePath: safeUrl)  // GOOD
+    _ = Realm.Configuration(seedFilePath: remoteUrl)  // $ MISSING: Alert
+
+    var config = Realm.Configuration()  // GOOD
+    config.fileURL = safeUrl  // GOOD
+    config.fileURL = remoteUrl  // $ MISSING: Alert
+    config.seedFilePath = safeUrl  // GOOD
+    config.seedFilePath = remoteUrl  // $ MISSING: Alert
+
+    // sqlite3
+
+    var db: OpaquePointer?
+    let localData = Data(0)
+    let remoteData = Data(contentsOf: URL(string: "http://example.com/")!, options: [])  // $ Source
+    localData.copyBytes(to: buffer1, count: localData.count)
+    remoteData.copyBytes(to: buffer2, count: remoteData.count)
+
+    _ = sqlite3_open("myFile.sqlite3", &db)  // GOOD
+    _ = sqlite3_open(remoteString, &db)  // $ Alert
+    _ = sqlite3_open16(buffer1, &db)  // GOOD
+    _ = sqlite3_open16(buffer2, &db)  // $ Alert
+    _ = sqlite3_open_v2("myFile.sqlite3", &db, 0, nil)  // GOOD
+    _ = sqlite3_open_v2(remoteString, &db, 0, nil)  // $ Alert
+
+    sqlite3_temp_directory = UnsafeMutablePointer<CChar>(
+        mutating: NSString(string: "myFile.sqlite3").utf8String)  // GOOD
+    sqlite3_temp_directory = UnsafeMutablePointer<CChar>(
+        mutating: NSString(string: remoteString).utf8String)  // $ MISSING: Alert // Originally missing
+
+    // SQLite.swift
+
+    try! _ = Connection()
+    try! _ = Connection(Connection.Location.uri("myFile.sqlite3"))  // GOOD
+    try! _ = Connection(Connection.Location.uri(remoteString))  // $ MISSING: Alert
+    try! _ = Connection(Connection.Location.uri(remoteString, parameters: []))  // $ Alert
+    try! _ = Connection("myFile.sqlite3")  // GOOD
+    try! _ = Connection(remoteString)  // $ MISSING: Alert
+    let remoteData2 = Data(contentsOf: URL(string: "http://example.com/")!)  // $ Source
+    nsData.write(toFile: remoteData2, options: [])  // $ Alert
+}
+
+func testBarriers() {
+    let remoteString = String(contentsOf: URL(string: "http://example.com/")!)  // $ Source
+
+    let fm = FileManager()
+
+    let filePath = FilePath(stringLiteral: remoteString)
+    if filePath.lexicallyNormalized().starts(with: "/safe") {
+        let _ = fm.contents(atPath: remoteString)  // $ SPURIOUS: Alert // Safe
+    }
+    let _ = fm.contents(atPath: remoteString)  // $ Alert
+}
+
+func testPathInjection2(
+    s1: UnsafeMutablePointer<String>, s2: UnsafeMutablePointer<String>,
+    s3: UnsafeMutablePointer<String>, fm: FileManager
+) throws {
+    let remoteString = String(contentsOf: URL(string: "http://example.com/")!)  // $ Source
+
+    var u1 = URL(filePath: "")
+    _ = NSData(contentsOf: u1)
+    _ = NSData(contentsOf: u1.appendingPathComponent(""))
+    _ = NSData(contentsOf: u1.appendingPathComponent(remoteString))  // $ Alert
+    _ = NSData(contentsOf: u1.appendingPathComponent(remoteString).appendingPathComponent(""))  // $ Alert
+    u1.appendPathComponent(remoteString)
+    _ = NSData(contentsOf: u1)  // $ Alert
+
+    let u2 = URL(filePath: remoteString)  // $ Alert
+    _ = NSData(contentsOf: u2)  // $ MISSING: Alert
+
+    let u3 = NSURL(string: "")!
+    Data("").write(to: u3.filePathURL!, options: [])
+    Data("").write(to: u3.appendingPathComponent("")!, options: [])
+    Data("").write(to: u3.appendingPathComponent(remoteString)!, options: [])  // $ Alert
+
+    let u4 = NSURL(string: remoteString)!
+    Data("").write(to: u4.filePathURL!, options: [])  // $ MISSING: Alert
+    Data("").write(to: u4.appendingPathComponent("")!, options: [])  // $ Alert
+
+    _ = NSData(contentsOfFile: remoteString)!  // $ Alert
+    _ = NSData(contentsOfMappedFile: remoteString)!  // $ Alert
+    _ = NSData.dataWithContentsOfMappedFile(remoteString)!  // $ Alert
+
+    _ = NSData().write(toFile: s1.pointee, atomically: true)
+    s1.pointee = remoteString
+    _ = NSData().write(toFile: s1.pointee, atomically: true)  // $ Alert
+    _ = NSData().write(toFile: s1[0], atomically: true)  // $ MISSING: Alert // Originally missing
+
+    _ = "".completePath(into: s2, caseSensitive: false, matchesInto: nil, filterTypes: nil)
+    _ = NSData().write(toFile: s2.pointee, atomically: true)
+    _ = NSData().write(toFile: s2[0], atomically: true)
+
+    _ = remoteString.completePath(
+        into: s3, caseSensitive: false, matchesInto: nil, filterTypes: nil)
+    _ = NSData().write(toFile: s3.pointee, atomically: true)  // $ MISSING: Alert // Originally missing
+    _ = NSData().write(toFile: s3[0], atomically: true)  // $ MISSING: Alert
+
+    _ = fm.fileAttributes(atPath: remoteString, traverseLink: true)  // $ Alert
+    _ = try fm.attributesOfItem(atPath: remoteString)  // $ Alert
+}
+
+// ---
+
+func myOpenFile1(atPath path: String) {}
+func myOpenFile2(_ filePath: String) {}
+func myFindFiles(ofType type: Int, inDirectory dir: String) {}
+
+class MyClass {
+    init(contentsOfFile: String) {}
+    func doSomething(keyPath: String) {}
+    func write(toFile: String) {}
+}
+
+class MyFile {
+    init(path: String) {}
+}
+
+func testPathInjectionHeuristics() {
+    let remoteString = String(contentsOf: URL(string: "http://example.com/")!)  // $ Source
+
+    myOpenFile1(atPath: remoteString)  // $ Alert
+    myOpenFile2(remoteString)  // $ MISSING: Alert
+    myFindFiles(ofType: 0, inDirectory: remoteString)  // $ Alert
+
+    let mc = MyClass(contentsOfFile: remoteString)  // $ Alert
+    mc.doSomething(keyPath: remoteString)  // good - not a path
+    mc.write(toFile: remoteString)  // $ Alert
+
+    let mf1 = MyFile(path: "")
+    let mf2 = MyFile(path: remoteString)  // $ MISSING: Alert // Originally missing
+
+    _ = NSSortDescriptor(key: remoteString, ascending: true)  // good - not a path
+    _ = NSSortDescriptor(keyPath: remoteString as! KeyPath<Int, Int>, ascending: true)  // good - not a path
+}
diff --git a/unified/ql/test/query-tests/security/CWE-078/CommandInjection/CommandInjection.expected b/unified/ql/test/query-tests/security/CWE-078/CommandInjection/CommandInjection.expected
new file mode 100644
index 000000000000..f5936ac854f1
--- /dev/null
+++ b/unified/ql/test/query-tests/security/CWE-078/CommandInjection/CommandInjection.expected
@@ -0,0 +1,36 @@
+#select
+| CommandInjection.swift:150:42:150:61 | userControlledString | CommandInjection.swift:105:40:105:94 | String(...) | CommandInjection.swift:150:42:150:61 | userControlledString | This command depends on a $@. | CommandInjection.swift:105:40:105:94 | String(...) | user-provided value |
+| CommandInjection.swift:154:23:154:56 | ... ! | CommandInjection.swift:105:40:105:94 | String(...) | CommandInjection.swift:154:23:154:56 | ... ! | This command depends on a $@. | CommandInjection.swift:105:40:105:94 | String(...) | user-provided value |
+| CommandInjection.swift:158:23:158:56 | ... ! | CommandInjection.swift:105:40:105:94 | String(...) | CommandInjection.swift:158:23:158:56 | ... ! | This command depends on a $@. | CommandInjection.swift:105:40:105:94 | String(...) | user-provided value |
+| CommandInjection.swift:163:41:163:74 | ... ! | CommandInjection.swift:105:40:105:94 | String(...) | CommandInjection.swift:163:41:163:74 | ... ! | This command depends on a $@. | CommandInjection.swift:105:40:105:94 | String(...) | user-provided value |
+edges
+| CommandInjection.swift:105:8:105:31 | ... .some(...) | CommandInjection.swift:105:12:105:31 | userControlledString | provenance |  |
+| CommandInjection.swift:105:12:105:31 | userControlledString | CommandInjection.swift:150:42:150:61 | userControlledString | provenance |  |
+| CommandInjection.swift:105:12:105:31 | userControlledString | CommandInjection.swift:154:35:154:54 | userControlledString | provenance |  |
+| CommandInjection.swift:105:12:105:31 | userControlledString | CommandInjection.swift:158:35:158:54 | userControlledString | provenance |  |
+| CommandInjection.swift:105:12:105:31 | userControlledString | CommandInjection.swift:163:53:163:72 | userControlledString | provenance |  |
+| CommandInjection.swift:105:40:105:94 | String(...) | CommandInjection.swift:105:8:105:31 | ... .some(...) | provenance |  |
+| CommandInjection.swift:154:23:154:55 | URL(...) | CommandInjection.swift:154:23:154:56 | ... ! | provenance |  |
+| CommandInjection.swift:154:35:154:54 | userControlledString | CommandInjection.swift:154:23:154:55 | URL(...) | provenance |  |
+| CommandInjection.swift:154:35:154:54 | userControlledString | CommandInjection.swift:154:23:154:56 | ... ! | provenance |  |
+| CommandInjection.swift:158:23:158:55 | URL(...) | CommandInjection.swift:158:23:158:56 | ... ! | provenance |  |
+| CommandInjection.swift:158:35:158:54 | userControlledString | CommandInjection.swift:158:23:158:55 | URL(...) | provenance |  |
+| CommandInjection.swift:158:35:158:54 | userControlledString | CommandInjection.swift:158:23:158:56 | ... ! | provenance |  |
+| CommandInjection.swift:163:41:163:73 | URL(...) | CommandInjection.swift:163:41:163:74 | ... ! | provenance |  |
+| CommandInjection.swift:163:53:163:72 | userControlledString | CommandInjection.swift:163:41:163:73 | URL(...) | provenance |  |
+| CommandInjection.swift:163:53:163:72 | userControlledString | CommandInjection.swift:163:41:163:74 | ... ! | provenance |  |
+nodes
+| CommandInjection.swift:105:8:105:31 | ... .some(...) | semmle.label | ... .some(...) |
+| CommandInjection.swift:105:12:105:31 | userControlledString | semmle.label | userControlledString |
+| CommandInjection.swift:105:40:105:94 | String(...) | semmle.label | String(...) |
+| CommandInjection.swift:150:42:150:61 | userControlledString | semmle.label | userControlledString |
+| CommandInjection.swift:154:23:154:55 | URL(...) | semmle.label | URL(...) |
+| CommandInjection.swift:154:23:154:56 | ... ! | semmle.label | ... ! |
+| CommandInjection.swift:154:35:154:54 | userControlledString | semmle.label | userControlledString |
+| CommandInjection.swift:158:23:158:55 | URL(...) | semmle.label | URL(...) |
+| CommandInjection.swift:158:23:158:56 | ... ! | semmle.label | ... ! |
+| CommandInjection.swift:158:35:158:54 | userControlledString | semmle.label | userControlledString |
+| CommandInjection.swift:163:41:163:73 | URL(...) | semmle.label | URL(...) |
+| CommandInjection.swift:163:41:163:74 | ... ! | semmle.label | ... ! |
+| CommandInjection.swift:163:53:163:72 | userControlledString | semmle.label | userControlledString |
+subpaths
diff --git a/unified/ql/test/query-tests/security/CWE-078/CommandInjection/CommandInjection.qlref b/unified/ql/test/query-tests/security/CWE-078/CommandInjection/CommandInjection.qlref
new file mode 100644
index 000000000000..330ea2d5bede
--- /dev/null
+++ b/unified/ql/test/query-tests/security/CWE-078/CommandInjection/CommandInjection.qlref
@@ -0,0 +1,3 @@
+query: queries/security/CWE-078/CommandInjection.ql
+postprocess:
+  - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/unified/ql/test/query-tests/security/CWE-078/CommandInjection/CommandInjection.swift b/unified/ql/test/query-tests/security/CWE-078/CommandInjection/CommandInjection.swift
new file mode 100644
index 000000000000..b822e8a258a8
--- /dev/null
+++ b/unified/ql/test/query-tests/security/CWE-078/CommandInjection/CommandInjection.swift
@@ -0,0 +1,222 @@
+
+// --- stubs ---
+
+struct URL
+{
+	init?(string: String) {}
+	init(fileURLWithPath: String) {}
+}
+
+class NSObject {
+}
+
+class Process : NSObject {
+	var launchPath: String? { get { nil } set {} }
+	var arguments: [String]? { get { nil } set {} }
+	func launch() {}
+
+	var executableURL: URL? { get { nil } set {} }
+	func run() throws {}
+
+	class func launchedProcess(launchPath path: String, arguments: [String]) -> Process {
+		return Process()
+	}
+
+	class func run(_ url: URL, arguments: [String], terminationHandler: (@Sendable (Process) -> Void)? = nil) throws -> Process {
+		return Process()
+	}
+}
+
+extension String {
+    init(contentsOf url: URL) throws {
+        self.init("")
+    }
+}
+
+class NSUserScriptTask : NSObject {
+	typealias CompletionHandler = @Sendable (Error?) -> Void
+
+	init(url: URL) throws {}
+	func execute(completionHandler handler: NSUserScriptTask.CompletionHandler? = nil) { }
+}
+
+class NSUserUnixTask : NSUserScriptTask {
+	func execute(withArguments arguments: [String]?, completionHandler handler: NSUserScriptTask.CompletionHandler? = nil) { }
+}
+
+protocol NSSecureCoding {
+}
+
+class NSUserAutomatorTask : NSUserScriptTask {
+	func execute(withInput input: NSSecureCoding?, completionHandler handler: NSUserScriptTask.CompletionHandler? = nil) { }
+
+	var variables: [String: Any]? { get { return nil } set { } }
+}
+
+class FileManager : NSObject {
+	class var `default`: FileManager { get { return 0 as! FileManager } }
+
+	func contentsOfDirectory(atPath path: String) throws -> [String] { [] }
+}
+
+// --- tests ---
+
+func validateCommand(_ command: String) -> String? {
+    let allowedCommands = ["ls -l", "pwd", "echo"]
+
+    if allowedCommands.contains(command) {
+        return command
+    }
+
+    return nil
+}
+
+func testCommandInjectionQhelpExamples() {
+	guard let userControlledString = try? String(contentsOf: URL(string: "http://example.com/")!) else { // $ MISSING: Source
+		return
+	}
+
+	let task1 = Process()
+	task1.launchPath = "/bin/bash" // GOOD
+	task1.arguments = ["-c", userControlledString] // $ MISSING: Alert
+	task1.launch()
+
+	if let validatedString = validateCommand(userControlledString) {
+    	let task2 = Process()
+    	task2.launchPath = "/bin/bash" // GOOD
+		task2.arguments = ["-c", validatedString] // GOOD (original Swift false positive)
+	    task2.launch()
+	}
+}
+
+func mkProcess() -> Process? {
+	return Process()
+}
+
+class MyProcess : Process {
+	var harmlessField: String?
+
+	func setArguments(_ arguments: [String]) {
+		self.arguments = arguments // $ MISSING: Alert
+	}
+}
+
+func testCommandInjectionMore(mySafeString: String) {
+	guard let userControlledString = try? String(contentsOf: URL(string: "http://example.com/")!) else { // $ Source
+		return
+	}
+
+	let task1 = Process()
+	task1.executableURL = URL(string: mySafeString)! // GOOD
+	task1.arguments = ["abc"] // GOOD
+	try! task1.run()
+
+	let task2 = Process()
+	task2.executableURL = URL(fileURLWithPath: mySafeString) // GOOD
+	task2.arguments = ["abc", "def"] // GOOD
+	try! task2.run()
+
+	let task3 = Process()
+	task3.executableURL = URL(string: userControlledString)! // $ MISSING: Alert
+	task3.arguments = ["abc", userControlledString] // $ MISSING: Alert
+	try! task3.run()
+
+	let task4 = Process()
+	task4.executableURL = URL(fileURLWithPath: userControlledString) // $ MISSING: Alert
+	task4.executableURL = URL(string: userControlledString)! // $ MISSING: Alert
+	task4.arguments = ["abc", "def" + userControlledString] // $ MISSING: Alert
+	try! task4.run()
+
+	let task5 = mkProcess()
+	task5?.executableURL = URL(fileURLWithPath: userControlledString) // $ MISSING: Alert
+	task5?.arguments = [userControlledString] // $ MISSING: Alert
+	try! task5?.run()
+
+	let task6 = MyProcess()
+	task6.executableURL = URL(fileURLWithPath: userControlledString) // $ MISSING: Alert
+	task6.executableURL = URL(string: userControlledString)! // $ MISSING: Alert
+	task6.arguments = [userControlledString] // $ MISSING: Alert
+	task6.setArguments([userControlledString]) // BAD (expected inside setArguments; currently missing)
+	task6.harmlessField = userControlledString // GOOD
+	try! task6.run()
+
+	let task7 = Process()
+	task7.executableURL = URL(fileURLWithPath: mySafeString) // GOOD
+	task7.arguments = ["abc", "def"]
+	task7.arguments?.append(userControlledString) // $ MISSING: Alert // Originally missing
+	try! task7.run()
+
+	_ = Process.launchedProcess(launchPath: mySafeString, arguments: ["abc", mySafeString]) // GOOD
+	_ = Process.launchedProcess(launchPath: userControlledString, arguments: ["abc", mySafeString]) // $ Alert
+	_ = Process.launchedProcess(launchPath: mySafeString, arguments: ["abc", userControlledString]) // $ MISSING: Alert
+
+	_ = try? Process.run(URL(string: mySafeString)!, arguments: ["abc", mySafeString]) // GOOD
+	_ = try? Process.run(URL(string: userControlledString)!, arguments: ["abc", mySafeString]) // $ Alert
+	_ = try? Process.run(URL(string: mySafeString)!, arguments: ["abc", userControlledString]) // $ MISSING: Alert
+
+	_ = try? Process.run(URL(string: mySafeString)!, arguments: [], terminationHandler: nil) // GOOD
+	_ = try? Process.run(URL(string: userControlledString)!, arguments: [], terminationHandler: nil) // $ Alert
+
+	let task8 = try! NSUserScriptTask(url: URL(string: mySafeString)!) // GOOD
+	task8.execute()
+
+	let task9 = try! NSUserScriptTask(url: URL(string: userControlledString)!) // $ Alert
+	task9.execute()
+
+	let task10 = try! NSUserUnixTask(url: URL(string: userControlledString)!) // $ MISSING: Alert
+	task10.execute(withArguments: [userControlledString]) // $ MISSING: Alert
+
+	let task11 = try! NSUserAutomatorTask(url: URL(string: userControlledString)!) // $ MISSING: Alert
+	task11.variables = ["abc": userControlledString] // $ MISSING: Alert // Originally missing
+	task11.execute(withInput: nil)
+
+	let files = try! FileManager.default.contentsOfDirectory(atPath: "some/directory")
+	for file in files {
+		let task12 = Process()
+		task12.launchPath = "/bin/rm" // GOOD
+		task12.arguments = [file] // GOOD (cases like this vary, but our analysis doesn't work well on them)
+		task12.launch()
+		task12.arguments = files // GOOD (similar to previous)
+		task12.launch()
+		task12.arguments = [files[0]] // GOOD (similar to previous)
+		task12.launch()
+	}
+
+}
+
+struct MyClass {
+	let p1 : Process
+	let p2 : Process?
+	let p3 : Process!
+
+	var myValue: [String]? {
+		get {
+			return nil
+		}
+		set {
+			p1.arguments = newValue // $ MISSING: Alert
+			p2!.arguments = newValue // $ MISSING: Alert
+			p3.arguments = newValue // $ MISSING: Alert
+		}
+	}
+
+	mutating func myFunc() {
+		guard let userControlledString = try? String(contentsOf: URL(string: "http://example.com/")!) else { // $ MISSING: Source
+			return
+		}
+
+		let tainted1 = [userControlledString]
+
+		p1.arguments = tainted1 // $ MISSING: Alert
+		p2!.arguments = tainted1 // $ MISSING: Alert
+		p3.arguments = tainted1 // $ MISSING: Alert
+
+		let tainted2 : [String]? = [userControlledString]
+
+		p1.arguments = tainted2 // $ MISSING: Alert
+		p2!.arguments = tainted2 // $ MISSING: Alert
+		p3.arguments = tainted2 // $ MISSING: Alert
+
+		myValue = tainted2
+	}
+}
diff --git a/unified/ql/test/query-tests/security/CWE-312/CleartextLogging/CleartextLogging.expected b/unified/ql/test/query-tests/security/CWE-312/CleartextLogging/CleartextLogging.expected
new file mode 100644
index 000000000000..cb3f1cb61f2f
--- /dev/null
+++ b/unified/ql/test/query-tests/security/CWE-312/CleartextLogging/CleartextLogging.expected
@@ -0,0 +1,8 @@
+#select
+| CleartextLoggingBad.swift:2:7:2:44 | StringInterpolationExpr | CleartextLoggingBad.swift:2:35:2:42 | password | CleartextLoggingBad.swift:2:7:2:44 | StringInterpolationExpr | Logging of $@ | CleartextLoggingBad.swift:2:35:2:42 | password | sensitive data |
+edges
+| CleartextLoggingBad.swift:2:35:2:42 | password | CleartextLoggingBad.swift:2:7:2:44 | StringInterpolationExpr | provenance |  |
+nodes
+| CleartextLoggingBad.swift:2:7:2:44 | StringInterpolationExpr | semmle.label | StringInterpolationExpr |
+| CleartextLoggingBad.swift:2:35:2:42 | password | semmle.label | password |
+subpaths
diff --git a/unified/ql/test/query-tests/security/CWE-312/CleartextLogging/CleartextLogging.qlref b/unified/ql/test/query-tests/security/CWE-312/CleartextLogging/CleartextLogging.qlref
new file mode 100644
index 000000000000..53e950061f85
--- /dev/null
+++ b/unified/ql/test/query-tests/security/CWE-312/CleartextLogging/CleartextLogging.qlref
@@ -0,0 +1,2 @@
+query: queries/security/CWE-312/CleartextLogging.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/unified/ql/test/query-tests/security/CWE-312/CleartextLogging/CleartextLoggingBad.swift b/unified/ql/test/query-tests/security/CWE-312/CleartextLogging/CleartextLoggingBad.swift
new file mode 100644
index 000000000000..bb6e84d1892b
--- /dev/null
+++ b/unified/ql/test/query-tests/security/CWE-312/CleartextLogging/CleartextLoggingBad.swift
@@ -0,0 +1,2 @@
+let password = "P@ssw0rd"
+NSLog("User password changed to \(password)") // $ Alert
diff --git a/unified/ql/test/query-tests/security/CWE-312/CleartextLogging/CleartextLoggingGood.swift b/unified/ql/test/query-tests/security/CWE-312/CleartextLogging/CleartextLoggingGood.swift
new file mode 100644
index 000000000000..1d90ac5e5656
--- /dev/null
+++ b/unified/ql/test/query-tests/security/CWE-312/CleartextLogging/CleartextLoggingGood.swift
@@ -0,0 +1,2 @@
+let password = "P@ssw0rd"
+NSLog("User password changed")
diff --git a/unified/ql/test/query-tests/unusedentities/UnusedVariable.expected b/unified/ql/test/query-tests/unusedentities/UnusedVariable.expected
new file mode 100644
index 000000000000..41b89fbc987d
--- /dev/null
+++ b/unified/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -0,0 +1,2 @@
+| test.swift:2:9:2:9 | a | Unused local variable 'a' |
+| test.swift:16:17:16:17 | b | Unused local variable 'b' |
diff --git a/unified/ql/test/query-tests/unusedentities/UnusedVariable.qlref b/unified/ql/test/query-tests/unusedentities/UnusedVariable.qlref
new file mode 100644
index 000000000000..67f81cd140b8
--- /dev/null
+++ b/unified/ql/test/query-tests/unusedentities/UnusedVariable.qlref
@@ -0,0 +1,2 @@
+query: queries/unusedentities/UnusedVariable.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/unified/ql/test/query-tests/unusedentities/test.swift b/unified/ql/test/query-tests/unusedentities/test.swift
new file mode 100644
index 000000000000..117168664652
--- /dev/null
+++ b/unified/ql/test/query-tests/unusedentities/test.swift
@@ -0,0 +1,18 @@
+func t1() -> Int {
+    let a = 1  // $ Alert[unified/unused-variable]
+    let b = 2
+    return b
+}
+
+func t2() -> Int {
+    func foo(callback: (Int) -> Void) -> String {
+        callback()
+        return "df"
+    }
+    let a = 1
+    print(
+        foo { _ in
+            print(a)
+            let b = 2  // $ Alert[unified/unused-variable]
+        })
+}
diff --git a/unified/scripts/regenerate-node-types.sh b/unified/scripts/regenerate-node-types.sh
new file mode 100755
index 000000000000..26cb1472f795
--- /dev/null
+++ b/unified/scripts/regenerate-node-types.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+# Regenerate `extractor/swift_node_types.yml`, the schema describing the shape
+# of the trees produced by `swift_syntax_rs::parse_to_json`, from swift-syntax
+# itself.
+#
+# Run this after changing the pinned swift-syntax version, and review the diff:
+# a new or renamed node kind generally means the mapping in
+# `extractor/src/languages/swift/swift.rs` needs attention too.
+#
+# This needs a local Swift toolchain (see `swift-syntax-rs/.swift-version` for
+# the pinned version). The schema it derives from lives in `SyntaxSupport`, a
+# target of swift-syntax's separate `CodeGeneration` package: it is not a
+# product of swift-syntax, and Bazel's swift-syntax module does not export its
+# sources, so there is no way to depend on it directly.
+set -euo pipefail
+IFS=$'\n\t'
+
+root=$(cd "$(dirname "$0")/.." && pwd)
+swift_syntax_rs_dir="$root/swift-syntax-rs"
+schemagen_dir="$swift_syntax_rs_dir/schemagen"
+output="$root/extractor/swift_node_types.yml"
+
+if ! command -v swift >/dev/null 2>&1; then
+    echo "error: Swift is required; install the version pinned in $swift_syntax_rs_dir/.swift-version." >&2
+    exit 1
+fi
+
+# Codespaces sets `safe.bareRepository=explicit` through environment-based Git
+# configuration, which prevents SwiftPM from using its cached bare dependency
+# repositories. Relax only that injected setting, and only for Swift
+# subprocesses, as `swift-syntax-rs/build.rs` does for local Cargo builds.
+run_swift() {
+    if [[ ${GIT_CONFIG_KEY_0:-} == "safe.bareRepository" ]]; then
+        GIT_CONFIG_VALUE_0=all swift "$@"
+    else
+        swift "$@"
+    fi
+}
+
+echo "Resolving swift-syntax..." >&2
+(
+    cd "$schemagen_dir"
+    run_swift package resolve >&2
+)
+checkout="$schemagen_dir/.build/checkouts/swift-syntax"
+syntax_support="$checkout/CodeGeneration/Sources/SyntaxSupport"
+if [[ ! -d $syntax_support ]]; then
+    echo "error: $syntax_support not found after resolving swift-syntax." >&2
+    exit 1
+fi
+
+# Refresh rather than merge, so that sources deleted upstream do not linger.
+rm -rf "$schemagen_dir/Sources/SyntaxSupport"
+cp -R "$syntax_support" "$schemagen_dir/Sources/SyntaxSupport"
+
+echo "Generating $output..." >&2
+# Generate to a temporary file first: redirecting straight into `$output` would
+# truncate the existing schema before the build has even run, leaving nothing
+# behind if it fails.
+tmp=$(mktemp)
+trap 'rm -f "$tmp"' EXIT
+(
+    cd "$schemagen_dir"
+    run_swift run schemagen
+) > "$tmp"
+if [[ ! -s $tmp ]]; then
+    echo "error: schemagen produced no output; $output left unchanged." >&2
+    exit 1
+fi
+mv "$tmp" "$output"
+chmod 644 "$output"
+echo "Regenerated $output" >&2
diff --git a/unified/swift-syntax-rs/.swift-version b/unified/swift-syntax-rs/.swift-version
index 91e4a9f26224..7849b73dc743 100644
--- a/unified/swift-syntax-rs/.swift-version
+++ b/unified/swift-syntax-rs/.swift-version
@@ -1 +1 @@
-6.3.2
+6.3.3
diff --git a/unified/swift-syntax-rs/BUILD.bazel b/unified/swift-syntax-rs/BUILD.bazel
index db451e5b7b9a..1eda8db26c1f 100644
--- a/unified/swift-syntax-rs/BUILD.bazel
+++ b/unified/swift-syntax-rs/BUILD.bazel
@@ -1,33 +1,60 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", "rust_test")
-load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
-load("//misc/bazel:pkg.bzl", "codeql_pkg_runfiles")
-load(":swift_runtime.bzl", "swift_runtime_libs")
-load(":xcode_transition.bzl", "xcode_transition_swift_library")
+load("@rules_swift//swift:swift.bzl", "swift_library")
+load("@rules_swift//swift/toolchains:swift_toolchain.bzl", "swift_runtime")
+load("//unified:platforms.bzl", "UNIFIED_SUPPORTED_PLATFORMS")
 
 package(default_visibility = ["//visibility:public"])
 
-swift_runtime_libs(
-    name = "swift_runtime_libs",
-    toolchain = "@swift_toolchain_ubuntu22.04//:files",
+config_setting(
+    name = "static_linux_runtime",
+    constraint_values = [
+        "@platforms//os:linux",
+        "//:static_swift_runtime",
+    ],
 )
 
-# Targets in this package require a Swift toolchain (Linux or macOS).
-# `select()` gives us OR-of-OSes; other platforms get marked incompatible
-# so `bazel build/test //...` skips them cleanly.
-#
-_SWIFT_SUPPORTED_PLATFORMS = select({
-    "@platforms//os:linux": [],
-    "@platforms//os:macos": [],
-    "//conditions:default": ["@platforms//:incompatible"],
-})
+swift_runtime(
+    name = "_swift_runtime",
+)
+
+filegroup(
+    name = "swift_runtime",
+    srcs = select({
+        ":static_linux_runtime": [],
+        "@platforms//os:linux": [":_swift_runtime"],
+        "//conditions:default": [],
+    }),
+)
 
-# Swift FFI shim: wraps swift-syntax and exposes a small C ABI. The Rust
-# targets below link against its `CcInfo`.
-xcode_transition_swift_library(
+cc_library(
+    name = "static_runtime_group_start",
+    linkopts = ["-Wl,--start-group"],
+    target_compatible_with = ["@platforms//os:linux"],
+)
+
+cc_library(
+    name = "static_runtime_group_end",
+    linkopts = [
+        "-lBlocksRuntime",
+        "-lc",
+        "-ldispatch",
+        "-ldl",
+        "-lm",
+        "-lpthread",
+        "-lrt",
+        "-lutil",
+        "-Wl,--end-group",
+    ],
+    target_compatible_with = ["@platforms//os:linux"],
+)
+
+# Swift FFI shim: wraps swift-syntax and exposes a small C ABI.
+swift_library(
     name = "swift_syntax_ffi",
     srcs = ["swift/Sources/SwiftSyntaxFFI/SwiftSyntaxFFI.swift"],
     module_name = "SwiftSyntaxFFI",
-    target_compatible_with = _SWIFT_SUPPORTED_PLATFORMS,
+    target_compatible_with = UNIFIED_SUPPORTED_PLATFORMS,
     deps = [
         "@swift-syntax//:SwiftOperators",
         "@swift-syntax//:SwiftParser",
@@ -36,7 +63,7 @@ xcode_transition_swift_library(
 )
 
 # Safe Rust bindings on top of the C ABI. Under Bazel the Swift side comes
-# from `:swift_syntax_ffi`; `build.rs` is only used by the `cargo` workflow.
+# from `:swift_syntax_ffi`.
 rust_library(
     name = "swift_syntax_rs",
     srcs = glob(
@@ -44,64 +71,41 @@ rust_library(
         exclude = ["src/main.rs"],
     ),
     edition = "2024",
-    target_compatible_with = _SWIFT_SUPPORTED_PLATFORMS,
-    deps = [
-        ":swift_syntax_ffi",
-    ],
+    link_deps = select({
+        ":static_linux_runtime": [
+            # Keep these in linker order; sorting them produces an invalid group.
+            ":static_runtime_group_start",
+            ":swift_syntax_ffi",
+            ":static_runtime_group_end",
+        ],
+        "@platforms//os:linux": [
+            ":_swift_runtime",
+            ":swift_syntax_ffi",
+        ],
+        "//conditions:default": [
+            ":swift_syntax_ffi",
+        ],
+    }),
+    target_compatible_with = UNIFIED_SUPPORTED_PLATFORMS,
 )
 
-# The Swift front-end parser. We ship it like `//swift/extractor`: a small shell
-# wrapper (`swift-syntax-parse`) sets `LD_LIBRARY_PATH`/`DYLD_LIBRARY_PATH` to its
-# own directory and execs the real binary (`swift-syntax-parse.real`); the Swift
-# runtime shared libraries are packaged alongside them. `parse.rs` resolves the
-# wrapper as a sibling of the extractor executable.
+# A debugging aid, for looking at the raw swift-syntax JSON for some input:
+#
+#     echo 'let x = 1' | bazel run //unified/swift-syntax-rs:swift-syntax-parse
 rust_binary(
-    name = "swift-syntax-parse.real",
+    name = "swift-syntax-parse",
     srcs = ["src/main.rs"],
-    # Target name carries `.real` (invalid in a crate name), so set it explicitly.
-    crate_name = "swift_syntax_parse",
-    # On Linux, carry the toolchain's runtime shared libraries as runfiles so
-    # they get packaged next to the binary. On macOS the OS provides the Swift
-    # runtime, so nothing extra is bundled.
-    data = select({
-        "@platforms//os:macos": [],
-        "@platforms//os:linux": [":swift_runtime_libs"],
-    }),
+    data = [":swift_runtime"],
     edition = "2024",
-    target_compatible_with = _SWIFT_SUPPORTED_PLATFORMS,
+    target_compatible_with = UNIFIED_SUPPORTED_PLATFORMS,
     deps = [":swift_syntax_rs"],
 )
 
-# `swift-syntax-parse` wrapper (see `swift-syntax-parse.sh`). Its runfiles carry
-# the real binary and the runtime libraries; packaging flattens them into one
-# directory.
-sh_binary(
-    name = "swift-syntax-parse",
-    srcs = ["swift-syntax-parse.sh"],
-    data = [":swift-syntax-parse.real"],
-    target_compatible_with = _SWIFT_SUPPORTED_PLATFORMS,
-)
-
-# Packaged form for the extractor pack: the wrapper (as `swift-syntax-parse`),
-# the real binary, and the runtime libraries, flattened into one directory.
-codeql_pkg_runfiles(
-    name = "swift-syntax-parse-pkg",
-    # The `.sh` source is shipped as `swift-syntax-parse` (the wrapper); drop the
-    # original filename.
-    excludes = ["swift-syntax-parse.sh"],
-    exes = [":swift-syntax-parse"],
-    target_compatible_with = _SWIFT_SUPPORTED_PLATFORMS,
-    visibility = ["//unified:__pkg__"],
-)
-
 rust_test(
     name = "swift_syntax_rs_test",
     size = "small",
     crate = ":swift_syntax_rs",
-    data = select({
-        "@platforms//os:macos": [],
-        "@platforms//os:linux": [":swift_runtime_libs"],
-    }),
+    data = [":swift_runtime"],
     edition = "2024",
-    target_compatible_with = _SWIFT_SUPPORTED_PLATFORMS,
+    target_compatible_with = UNIFIED_SUPPORTED_PLATFORMS,
 )
diff --git a/unified/swift-syntax-rs/Cargo.toml b/unified/swift-syntax-rs/Cargo.toml
index 6957fb0e50e9..38470341060a 100644
--- a/unified/swift-syntax-rs/Cargo.toml
+++ b/unified/swift-syntax-rs/Cargo.toml
@@ -4,6 +4,7 @@ description = "Rust wrapper around the swift-syntax package for parsing Swift so
 version = "0.1.0"
 authors = ["GitHub"]
 edition = "2024"
+links = "SwiftSyntaxFFI"
 
 [lib]
 name = "swift_syntax_rs"
diff --git a/unified/swift-syntax-rs/README.md b/unified/swift-syntax-rs/README.md
index 7d15c6f2c23e..587802f73bd1 100644
--- a/unified/swift-syntax-rs/README.md
+++ b/unified/swift-syntax-rs/README.md
@@ -10,69 +10,83 @@ builds that shim (via `build.rs`) and provides safe bindings on top of it.
 ## Output format
 
 The emitted JSON tree preserves the AST's named structure. Every node has a
-`kind` and a `range` with `start`/`end` positions (UTF-8 `offset` plus 1-based
-`line`/`column`). Beyond that:
+`kind` and a half-open UTF-8 byte range encoded as 0-based `$pos`/`$end`
+offsets. The root also has a `$lineStarts` array containing the UTF-8 byte
+offset of every physical source line, so line/column positions can be
+reconstructed without repeating them on every node. Beyond that:
 
 - **Tokens** carry `text`, `tokenKind`, and — only when non-empty —
-  `leadingTrivia`/`trailingTrivia` arrays of `{ kind, text }` pieces.
+  `leadingTrivia`/`trailingTrivia` arrays of `{ kind, text, $pos, $end }`
+  pieces.
 - **Layout nodes** (e.g. `functionDecl`) embed their children directly as
   members keyed by the child's name in the parent (`name`, `signature`,
-  `body`, …), alongside `kind`/`range`. Absent optional children are omitted.
+  `body`, …), alongside `kind`/`$pos`/`$end`. Absent optional children are
+  omitted.
 - **Collection nodes** (e.g. `codeBlockItemList`) are elided: a list-valued
   field is simply a JSON array of its elements (e.g. `parameters`, `statements`).
-  This drops the collection node's own `kind`/`range`.
+  This drops the collection node's own `kind`/location.
 
 Only meaningful trivia is kept — the four comment kinds (`lineComment`,
 `blockComment`, `docLineComment`, `docBlockComment`) and `unexpectedText`
-(source the parser skipped). Whitespace trivia is dropped, since node ranges
+(source the parser skipped). Whitespace trivia is dropped, since node offsets
 already encode positions.
 
 ### Example
 
-Parsing `let x = 1 // c` produces the following (each `range` object is
+Parsing `let x = 1 // c` produces the following (location offsets are
 abbreviated here as `…`):
 
 ```jsonc
 {
+  "$pos": 0,
+  "$end": …,
+  "$lineStarts": [0],
   "kind": "sourceFile",
-  "range": …,
   "statements": [                       // collection node elided to an array
     {
+      "$pos": 0,
+      "$end": …,
       "kind": "codeBlockItem",
-      "range": …,
       "item": {
+        "$pos": 0,
+        "$end": …,
         "kind": "variableDecl",
-        "range": …,
         "attributes": [],               // empty collection → empty array
         "modifiers": [],
         "bindingSpecifier": {           // a token
+          "$pos": 0,
+          "$end": 3,
           "kind": "token",
           "text": "let",
-          "tokenKind": "keyword(SwiftSyntax.Keyword.let)",
-          "range": …
+          "tokenKind": "keyword(SwiftSyntax.Keyword.let)"
         },
         "bindings": [
           {
+            "$pos": …,
+            "$end": …,
             "kind": "patternBinding",
-            "range": …,
             "pattern": {
+              "$pos": …,
+              "$end": …,
               "kind": "identifierPattern",
-              "range": …,
-              "identifier": { "kind": "token", "text": "x", "tokenKind": "identifier(\"x\")", "range": … }
+              "identifier": { "$pos": …, "$end": …, "kind": "token", "text": "x", "tokenKind": "identifier(\"x\")" }
             },
             "initializer": {
+              "$pos": …,
+              "$end": …,
               "kind": "initializerClause",
-              "range": …,
-              "equal": { "kind": "token", "text": "=", "tokenKind": "equal", "range": … },
+              "equal": { "$pos": …, "$end": …, "kind": "token", "text": "=", "tokenKind": "equal" },
               "value": {
+                "$pos": …,
+                "$end": …,
                 "kind": "integerLiteralExpr",
-                "range": …,
                 "literal": {
+                  "$pos": …,
+                  "$end": …,
                   "kind": "token",
                   "text": "1",
                   "tokenKind": "integerLiteral(\"1\")",
-                  "range": …,
-                  "trailingTrivia": [ { "kind": "lineComment", "text": "// c" } ]
+                  "trailingTrivia": [ { "$pos": …, "$end": …, "kind": "lineComment", "text": "// c" } ]
                 }
               }
             }
@@ -81,7 +95,7 @@ abbreviated here as `…`):
       }
     }
   ],
-  "endOfFileToken": { "kind": "token", "text": "", "tokenKind": "endOfFile", "range": … }
+  "endOfFileToken": { "$pos": …, "$end": …, "kind": "token", "text": "", "tokenKind": "endOfFile" }
 }
 ```
 
@@ -129,31 +143,40 @@ The build does not depend on any particular version manager. You need:
 - **Rust** — pinned to `1.88` by the repo-root [`rust-toolchain.toml`](../../rust-toolchain.toml),
   which `rustup` picks up automatically.
 - **Swift** — pinned to the version in [`.swift-version`](.swift-version)
-  (currently `6.3.2`), used to build `swift-syntax` `603.0.2`. Install it any way
+  (currently `6.3.3`), used to build `swift-syntax` `604.0.0`. Install it any way
   you like — [swift.org](https://www.swift.org/install/) or
   [swiftly](https://www.swift.org/swiftly/) (which reads `.swift-version`), or a
-  system package. Just make sure `swift` is on your `PATH` (or point `build.rs`
-  at it with the `SWIFT` environment variable).
+  system package. Just make sure `swift` (and `swiftc`) are on your `PATH` —
+  `build.rs` invokes them directly and does not read any environment variable
+  to locate them.
 
 On Debian/Ubuntu the Swift runtime also needs `libncurses6` (and related libs)
 available on the system.
 
 ## Building & testing
 
-With `cargo` and `swift` on `PATH`:
+With `cargo` and `swift`/`swiftc` on `PATH`:
 
 ```sh
 cargo build
 cargo test
 ```
 
-If your `swift`/`swiftc` are not on `PATH`, point the build at them explicitly:
+The first build compiles `swift-syntax` and can take several minutes.
+
+## Regenerating the extractor node types
+
+After updating the pinned swift-syntax version, regenerate the unified
+extractor's input schema:
 
 ```sh
-SWIFT=/path/to/swift SWIFTC=/path/to/swiftc cargo build
+../scripts/regenerate-node-types.sh
 ```
 
-The first build compiles `swift-syntax` and can take several minutes.
+The script uses swift-syntax's authoritative `SyntaxSupport` definitions and
+requires the local Swift toolchain pinned by [`.swift-version`](.swift-version).
+Review the resulting `extractor/swift_node_types.yml` diff alongside the Swift
+mapping rules. See [`schemagen/README.md`](schemagen/README.md) for details.
 
 ## Building with Bazel (CI)
 
@@ -170,31 +193,32 @@ bazel test  //unified/swift-syntax-rs:swift_syntax_rs_test
 bazel run   //unified/swift-syntax-rs:swift-syntax-parse < some.swift
 ```
 
+The `swift-syntax-parse` binary is a debugging aid for looking at the raw
+swift-syntax JSON for some input; it is not shipped as part of the extractor
+pack, which links `swift-syntax-rs` directly instead.
+
 Requirements:
 
 - **`clang`** must be installed on the runner. `rules_swift` requires the Bazel
   CC toolchain to use clang; the repo's `.bazelrc` already sets
   `--repo_env=CC=clang`, so no extra flags are needed.
-- The registered Swift toolchains cover **ubuntu24.04 / x86_64** and
-  **macOS / `xcode`** (Apple Silicon and Intel). Bazel selects the toolchain
-  matching the host. Targets are marked `target_compatible_with` these two
-  OSes, so on Windows Bazel skips them cleanly.
-- **macOS only:** the Swift toolchain comes from the host Xcode installation
-  (`rules_swift` auto-registers `xcode_swift_toolchain`), which also needs
-  Xcode's CC toolchain and xcode_config; these are applied to the Swift
-  target via an incoming-edge Starlark transition (see
-  [`xcode_transition.bzl`](xcode_transition.bzl)), so other targets on macOS
-  keep using Bazel's default CC toolchain.
-
-The Swift compiler version is kept in sync across three places: the
+- The registered Swift toolchains cover **ubuntu22.04 / x86_64** and
+  **macOS** (Apple Silicon and Intel). Bazel selects the toolchain matching the
+  host. Targets are marked `target_compatible_with` these two OSes, so on
+  Windows Bazel skips them cleanly.
+- **macOS only:** `rules_swift` downloads the pinned Swift toolchain from
+  swift.org. The Bazel C++ toolchain must still provide the macOS SDK, but a
+  full Xcode installation is not required.
+
+The Swift compiler version is kept in sync between the
 [`.swift-version`](.swift-version) file (read by the local `cargo`/`swift build`
-and by [swiftly](https://www.swift.org/swiftly/)), the literal `swift_version`
-pinned on `swift.toolchain(...)` in the root `MODULE.bazel` (the hermetic
-swift.org **Linux** Bazel toolchain), and the `swift-syntax` release in
-`swift/Package.swift`. On **macOS** the version is *not* pinned by the Bazel
-build: `rules_swift` auto-registers the host `xcode_swift_toolchain`, which uses
-whichever Swift ships with the installed Xcode. So the pin governs Linux (and
-local) builds, while the macOS compiler version depends on the host Xcode.
+and by [swiftly](https://www.swift.org/swiftly/)) and the literal
+`swift_version` pinned on `swift.toolchain(...)` in the root `MODULE.bazel`
+(the hermetic swift.org Bazel toolchain).
+
+The swift-syntax version is independently pinned in the root `MODULE.bazel`,
+[`swift/Package.swift`](swift/Package.swift), and
+[`schemagen/Package.swift`](schemagen/Package.swift). Update all three together.
 
 (The Bazel toolchain pins a literal rather than reading `.swift-version` via
 `swift_version_file`, because the latter makes the module extension read a
@@ -221,9 +245,9 @@ echo 'let x = 1' | cargo run --bin swift-syntax-parse
 The JSON tree is consumed by the CodeQL extractor, which converts it into a
 [`yeast::Ast`](../../shared/yeast) — the in-memory format its rewrite rules
 operate on. That adapter is a pure-Rust module living in the extractor
-(`unified/extractor/src/languages/swift/adapter.rs`), so the extractor never
-needs the Swift toolchain: it consumes the JSON produced out-of-process by this
-crate's `parse_to_json` / the `swift-syntax-parse` binary.
+(`unified/extractor/src/languages/swift/adapter.rs`). The extractor links
+`swift-syntax-rs` directly and consumes the JSON produced in-process by this
+crate's `parse_to_json`.
 
 ## Layout
 
diff --git a/unified/swift-syntax-rs/build.rs b/unified/swift-syntax-rs/build.rs
index 6a58ddb4d8da..f1fc4b3df7cd 100644
--- a/unified/swift-syntax-rs/build.rs
+++ b/unified/swift-syntax-rs/build.rs
@@ -20,8 +20,6 @@ fn main() {
     ] {
         println!("cargo:rerun-if-changed={}", input.display());
     }
-    println!("cargo:rerun-if-env-changed=SWIFT");
-    println!("cargo:rerun-if-env-changed=SWIFTC");
 
     // Build the Swift FFI package as a release dynamic library.
     //
@@ -33,7 +31,7 @@ fn main() {
     // then fail — at link time, which is fair: they genuinely need Swift (and CI
     // builds go through Bazel anyway). A Swift toolchain that *is* present but
     // whose build fails is still surfaced as a hard error below.
-    let mut command = Command::new(swift_bin());
+    let mut command = Command::new("swift");
     command
         .args(["build", "-c", "release"])
         .current_dir(&swift_dir);
@@ -42,12 +40,11 @@ fn main() {
         Ok(status) => status,
         Err(e) => {
             println!(
-                "cargo:warning=skipping the Swift FFI build: failed to run `{swift} build`: {e}. \
-                 Install a Swift toolchain (see https://www.swift.org/install/, e.g. via swiftly) \
-                 and ensure `swift` is on PATH, or set the `SWIFT` environment variable, to build \
-                 or test this crate. `cargo check`/`fmt`/`clippy` work without it. The pinned \
-                 version is in `.swift-version`.",
-                swift = swift_bin(),
+                "cargo:warning=skipping the Swift FFI build: failed to run `swift build`: {e}. \
+                 Install a Swift toolchain (see https://www.swift.org/install/, e.g. via \
+                 swiftly) and ensure `swift` is on PATH to build or test this crate. \
+                 `cargo check`/`fmt`/`clippy` work without it. The pinned version is in \
+                 `.swift-version`."
             );
             return;
         }
@@ -59,18 +56,20 @@ fn main() {
     println!("cargo:rustc-link-search=native={}", build_dir.display());
     println!("cargo:rustc-link-lib=dylib=SwiftSyntaxFFI");
     println!("cargo:rustc-link-arg=-Wl,-rpath,{}", build_dir.display());
+    println!("cargo:libdir={}", build_dir.display());
 
     // The executable also needs to find the Swift runtime libraries at run time.
     if let Some(runtime) = swift_runtime_dir() {
         println!("cargo:rustc-link-search=native={}", runtime.display());
         println!("cargo:rustc-link-arg=-Wl,-rpath,{}", runtime.display());
+        println!("cargo:runtimedir={}", runtime.display());
     }
 }
 
 /// Query the active Swift toolchain for the directory containing its runtime
 /// shared libraries (e.g. `libswiftCore.so`).
 fn swift_runtime_dir() -> Option<PathBuf> {
-    let output = Command::new(swiftc_bin())
+    let output = Command::new("swiftc")
         .arg("-print-target-info")
         .output()
         .ok()?;
@@ -94,19 +93,6 @@ fn swift_runtime_dir() -> Option<PathBuf> {
     Some(PathBuf::from(resource_path).join(if cfg!(target_os = "macos") { "macosx" } else { "linux" }))
 }
 
-/// The `swift` driver to invoke: `$SWIFT` if set, otherwise `swift` from `PATH`.
-/// This keeps the build tool-agnostic — any Swift install works; no particular
-/// version manager is required.
-fn swift_bin() -> String {
-    env::var("SWIFT").unwrap_or_else(|_| "swift".to_string())
-}
-
-/// The `swiftc` compiler to invoke: `$SWIFTC` if set, otherwise `swiftc` from
-/// `PATH`.
-fn swiftc_bin() -> String {
-    env::var("SWIFTC").unwrap_or_else(|_| "swiftc".to_string())
-}
-
 /// Some environments (notably GitHub Codespaces) inject
 /// `GIT_CONFIG_KEY_0=safe.bareRepository` / `GIT_CONFIG_VALUE_0=explicit`, which
 /// breaks the cached bare git repositories `swift build` uses. When exactly that
diff --git a/unified/swift-syntax-rs/schemagen/.gitignore b/unified/swift-syntax-rs/schemagen/.gitignore
new file mode 100644
index 000000000000..e6ee67bbf52c
--- /dev/null
+++ b/unified/swift-syntax-rs/schemagen/.gitignore
@@ -0,0 +1,4 @@
+/.build
+# Copied from swift-syntax's CodeGeneration package by
+# `unified/scripts/regenerate-node-types.sh`; not ours to vendor.
+/Sources/SyntaxSupport
diff --git a/unified/swift-syntax-rs/schemagen/Package.resolved b/unified/swift-syntax-rs/schemagen/Package.resolved
new file mode 100644
index 000000000000..9b31241a6e02
--- /dev/null
+++ b/unified/swift-syntax-rs/schemagen/Package.resolved
@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/swiftlang/swift-syntax.git",
+      "state" : {
+        "revision" : "050f1a346fbbac0ca2cfb15a95274f7bd1cf0ccf",
+        "version" : "604.0.0"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/unified/swift-syntax-rs/schemagen/Package.swift b/unified/swift-syntax-rs/schemagen/Package.swift
new file mode 100644
index 000000000000..8d7316d1d694
--- /dev/null
+++ b/unified/swift-syntax-rs/schemagen/Package.swift
@@ -0,0 +1,42 @@
+// swift-tools-version:5.9
+import PackageDescription
+
+// `schemagen` regenerates `unified/extractor/swift_node_types.yml`, the input
+// schema describing the shape of the trees produced by
+// `swift_syntax_rs::parse_to_json`. Run it through
+// `unified/scripts/regenerate-node-types.sh`, which stages the sources this
+// package needs; see `README.md` for the details.
+//
+// The tools version is deliberately older than the FFI package's: it selects
+// the Swift 5 language mode, and `SyntaxSupport` (see below) is not clean under
+// Swift 6 strict concurrency because its node tables are non-Sendable globals.
+let package = Package(
+    name: "schemagen",
+    platforms: [
+        // Matches the FFI package: swift-syntax 604 requires macOS 10.15.
+        .macOS(.v10_15),
+    ],
+    dependencies: [
+        // Keep this independent pin synchronized with the swift-syntax pins in
+        // `../swift/Package.swift` and the repository's `MODULE.bazel`.
+        .package(
+            url: "https://github.com/swiftlang/swift-syntax.git",
+            exact: "604.0.0"
+        ),
+    ],
+    targets: [
+        // `SyntaxSupport` is a target of swift-syntax's separate
+        // `CodeGeneration` package, not a product of swift-syntax itself, so it
+        // cannot be depended on directly. The regeneration script copies its
+        // sources here (the directory is git-ignored) and this target builds
+        // them as if they were our own.
+        .target(
+            name: "SyntaxSupport",
+            dependencies: [
+                .product(name: "SwiftSyntax", package: "swift-syntax"),
+                .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
+            ]
+        ),
+        .executableTarget(name: "schemagen", dependencies: ["SyntaxSupport"]),
+    ]
+)
diff --git a/unified/swift-syntax-rs/schemagen/README.md b/unified/swift-syntax-rs/schemagen/README.md
new file mode 100644
index 000000000000..fc9ea0947f29
--- /dev/null
+++ b/unified/swift-syntax-rs/schemagen/README.md
@@ -0,0 +1,72 @@
+# schemagen
+
+Generates [`unified/extractor/swift_node_types.yml`][schema], the schema that
+describes the shape of the trees produced by `swift_syntax_rs::parse_to_json`.
+The extractor seeds every parse with it, so rule matching never refers to a
+node kind or field that swift-syntax can produce but the schema does not know.
+
+Run it through the script, which stages the sources described below:
+
+```console
+$ unified/scripts/regenerate-node-types.sh
+```
+
+Do this after changing the pinned swift-syntax version, and read the resulting
+diff: a new or renamed node kind usually means the mapping in
+[`swift.rs`][mapping] needs attention too.
+
+This requires the local Swift toolchain pinned by
+[`.swift-version`](../.swift-version).
+
+## Why the sources are copied in
+
+The schema is derived from `SyntaxSupport`, the module that describes
+swift-syntax's own syntax tree. This is the same description swift-syntax
+generates itself from, and is therefore authoritative in a way that observing
+parser output never would be. The runtime `SwiftSyntax` module is not a
+substitute: its `SyntaxNodeStructure` exposes layout as key paths, without the
+field names, optionality, and base-kind relationships this schema records.
+
+`SyntaxSupport` is awkward to depend on, though. It is a target of
+`CodeGeneration`, a package inside the swift-syntax repository that is
+separate from swift-syntax itself, and it is not one of that package's
+products. SwiftPM can only depend on products, and Bazel's swift-syntax module
+does not export the `CodeGeneration` sources, so neither build system can
+reach it directly.
+
+The regeneration script therefore resolves this package's swift-syntax
+dependency and copies its `CodeGeneration/Sources/SyntaxSupport` sources into
+`Sources/SyntaxSupport`, where this package builds them as its own. That
+directory is git-ignored and refreshed on every run, so it always matches
+schemagen's pin rather than drifting as a stale vendored copy would.
+
+Schemagen has its own exact swift-syntax pin in `Package.swift`. Keep it
+synchronized with the SwiftPM parser pin in `../swift/Package.swift` and the
+Bazel pin in the repository's `MODULE.bazel`. The build systems resolve these
+independently, so regeneration does not itself guarantee that all three pins
+match.
+
+## What is filtered out
+
+The schema describes the JSON the extractor's adapter receives, not
+swift-syntax's tree verbatim, so `main.swift` mirrors what
+[`adapter.rs`][adapter] does:
+
+- Abstract base kinds become `supertypes:` entries rather than node kinds.
+- Collection nodes are dropped, and a collection-typed child is recorded as
+  its element kinds, because the adapter elides collections into JSON arrays.
+- `unexpectedBeforeX`, `unexpectedBetweenXAndY`, and `unexpectedAfterX`
+  error-recovery children are dropped; no rule matches them. This filters on
+  the child name: `unexpectedCodeDecl` is a real node kind and is retained.
+- Token-typed children become the synthetic `_token` kind. Only the varying
+  token kinds whose `TokenSpec` is `.other` and has no fixed text are emitted
+  as kinds of their own. These are derived from `Token.allCases` and should match
+  `VARYING_TOKEN_KINDS` in `adapter.rs`. Fixed tokens are anonymous and keyed
+  by their text, so no rule can name them.
+
+Setting `EMIT_SUPERTYPES=0` omits the `supertypes:` section, which can be useful
+when diffing two versions for kind and field changes alone.
+
+[schema]: ../../extractor/swift_node_types.yml
+[mapping]: ../../extractor/src/languages/swift/swift.rs
+[adapter]: ../../extractor/src/languages/swift/adapter.rs
diff --git a/unified/swift-syntax-rs/schemagen/Sources/schemagen/main.swift b/unified/swift-syntax-rs/schemagen/Sources/schemagen/main.swift
new file mode 100644
index 000000000000..0fcb53035349
--- /dev/null
+++ b/unified/swift-syntax-rs/schemagen/Sources/schemagen/main.swift
@@ -0,0 +1,100 @@
+import Foundation
+import SyntaxSupport
+
+// Named-leaf ("varying") token kinds, mirroring the extractor adapter's
+// VARYING_TOKEN_KINDS. Fixed tokens are anonymous (keyed by text) and are not
+// matched by any rule, so they are not emitted here.
+let varyingTokens = Token.allCases.compactMap { token -> String? in
+    let spec = token.spec
+    guard spec.text == nil else { return nil }
+    // The generic `keyword` token has no `TokenSpec.text`, but each concrete
+    // keyword has a fixed spelling carried by its associated value.
+    guard case .other = spec.kind else { return nil }
+    return spec.identifier.text
+}
+
+// The yeast type references that a child maps to. A collection wrapper is
+// elided by the adapter, so a collection child maps to its element kinds.
+func typeRefs(_ child: Child) -> [String] {
+    switch child.kind {
+    case .node(let kind):
+        return [kind.rawValue]
+    case .nodeChoices(let choices, _):
+        return choices.flatMap { typeRefs($0) }
+    case .collection(let kind, _, _, _, _):
+        if let collection = SYNTAX_NODES.first(where: { $0.kind == kind })?.collectionNode {
+            let elements = collection.elementChoices.map { $0.rawValue }
+            return elements.isEmpty ? [kind.rawValue] : elements
+        }
+        return [kind.rawValue]
+    case .token:
+        return ["_token"]
+    }
+}
+
+func isMultiple(_ child: Child) -> Bool {
+    if case .collection = child.kind {
+        return true
+    }
+    return false
+}
+
+var supertypes: [String: [String]] = [:]
+var named: [(String, [Child])] = []
+
+for node in SYNTAX_NODES {
+    if node.kind.isBase {
+        continue
+    }
+    if node.base == .syntaxCollection {
+        continue
+    }
+    supertypes[node.base.rawValue, default: []].append(node.kind.rawValue)
+    named.append((node.kind.rawValue, node.layoutNode?.children ?? []))
+}
+
+var output = ""
+output += "# GENERATED from swift-syntax by unified/swift-syntax-rs/schemagen.\n"
+output += "# Do not edit; run unified/scripts/regenerate-node-types.sh instead.\n"
+let emitSupertypes = ProcessInfo.processInfo.environment["EMIT_SUPERTYPES"] != "0"
+if emitSupertypes {
+    output += "supertypes:\n"
+    for base in supertypes.keys.sorted() {
+        output += "  \(base):\n"
+        for member in supertypes[base]!.sorted() {
+            output += "    - \(member)\n"
+        }
+    }
+}
+output += "named:\n"
+for (kind, children) in named.sorted(by: { $0.0 < $1.0 }) {
+    output += "  \(kind):\n"
+    for child in children {
+        // swift-syntax error-recovery slots (`unexpectedBeforeX`,
+        // `unexpectedBetweenXAndY`, and `unexpectedAfterX`) are never matched
+        // by rules.
+        if child.name.hasPrefix("unexpected") {
+            continue
+        }
+        var key = child.name
+        if isMultiple(child) {
+            key += "*"
+        } else if child.isOptional {
+            key += "?"
+        }
+        let refs = typeRefs(child)
+        let value = refs.count == 1 ? refs[0] : "[" + refs.joined(separator: ", ") + "]"
+        output += "    \(key): \(value)\n"
+    }
+}
+
+// Synthetic leaf for token-typed fields, plus the named ("varying") token
+// kinds that are not already emitted as layout nodes (`stringSegment`, for
+// example, is both a node and a token kind and must only be emitted once).
+let namedKinds = Set(named.map { $0.0 })
+output += "  _token:\n"
+for token in varyingTokens.sorted() where !namedKinds.contains(token) {
+    output += "  \(token):\n"
+}
+
+print(output, terminator: "")
diff --git a/unified/swift-syntax-rs/src/lib.rs b/unified/swift-syntax-rs/src/lib.rs
index 5f558d942fc8..db494f36a4fb 100644
--- a/unified/swift-syntax-rs/src/lib.rs
+++ b/unified/swift-syntax-rs/src/lib.rs
@@ -10,15 +10,15 @@
 //! by the extractor's own pure-Rust adapter module, keeping the Swift toolchain
 //! out of the extractor's build.
 
-use std::ffi::{CStr, CString};
+use std::ffi::CStr;
 use std::os::raw::c_char;
 
 // C ABI exported by the `SwiftSyntaxFFI` dynamic library.
 unsafe extern "C" {
-    /// Parse a NUL-terminated Swift source string, returning a heap-allocated
+    /// Parse a UTF-8 Swift source buffer, returning a heap-allocated
     /// NUL-terminated JSON string (or null on failure). The caller owns the
     /// returned pointer and must release it with `ssr_string_free`.
-    fn ssr_parse_json(source: *const c_char) -> *mut c_char;
+    fn ssr_parse_json(source: *const u8, source_len: usize) -> *mut c_char;
 
     /// Free a string previously returned by `ssr_parse_json`.
     fn ssr_string_free(ptr: *mut c_char);
@@ -27,8 +27,6 @@ unsafe extern "C" {
 /// Errors that can occur while parsing Swift source.
 #[derive(Debug)]
 pub enum ParseError {
-    /// The provided source contained an interior NUL byte.
-    NulByte,
     /// The Swift shim returned no result. `SwiftParser` recovers from invalid
     /// syntax (it always produces a tree, possibly with error nodes), so this
     /// does *not* indicate a syntax error in the source — it means the shim
@@ -39,7 +37,6 @@ pub enum ParseError {
 impl std::fmt::Display for ParseError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            ParseError::NulByte => write!(f, "source contained an interior NUL byte"),
             ParseError::SwiftFailure => {
                 write!(f, "the swift-syntax shim failed to produce a JSON result")
             }
@@ -58,13 +55,11 @@ impl std::error::Error for ParseError {}
 /// println!("{json}");
 /// ```
 pub fn parse_to_json(source: &str) -> Result<String, ParseError> {
-    let c_source = CString::new(source).map_err(|_| ParseError::NulByte)?;
-
-    // SAFETY: `c_source` is a valid NUL-terminated string for the duration of
-    // the call. The returned pointer, if non-null, is owned by us and freed via
-    // `ssr_string_free` before returning.
+    // SAFETY: `source` is valid UTF-8 and its buffer remains alive for the
+    // duration of the call. The returned pointer, if non-null, is owned by us
+    // and freed via `ssr_string_free` before returning.
     unsafe {
-        let ptr = ssr_parse_json(c_source.as_ptr());
+        let ptr = ssr_parse_json(source.as_ptr(), source.len());
         if ptr.is_null() {
             return Err(ParseError::SwiftFailure);
         }
@@ -86,12 +81,18 @@ mod tests {
             "unexpected tree: {json}"
         );
         assert!(json.contains("\"text\":\"x\""), "unexpected tree: {json}");
-        // Source ranges are emitted for every node.
-        assert!(json.contains("\"range\""), "missing ranges: {json}");
+        // Compact UTF-8 source ranges are emitted for every node, with one
+        // source-wide line-start table.
         assert!(
-            json.contains("\"line\"") && json.contains("\"column\"") && json.contains("\"offset\""),
+            json.contains("\"$pos\"")
+                && json.contains("\"$end\"")
+                && json.contains("\"$lineStarts\""),
             "missing location fields: {json}"
         );
+        assert!(
+            !json.contains("\"range\""),
+            "unexpected verbose range: {json}"
+        );
     }
 
     #[test]
@@ -120,6 +121,66 @@ mod tests {
             json.contains("\"kind\":\"sourceFile\""),
             "unexpected tree: {json}"
         );
+        assert!(
+            json.contains("\"statements\":[]"),
+            "empty collections should be serialized as JSON arrays: {json}"
+        );
+    }
+
+    #[test]
+    fn parses_source_with_interior_nul() {
+        let json = parse_to_json("let x =\0 1").expect("parsing interior NUL should succeed");
+        assert!(
+            json.contains(r#"\u0000"#),
+            "interior NUL should be preserved in the JSON tree: {json}"
+        );
+    }
+
+    #[test]
+    fn rejects_excessively_deep_syntax_tree() {
+        let source = format!("let x = a{}\n", ".a".repeat(2100));
+        assert!(
+            matches!(parse_to_json(&source), Err(ParseError::SwiftFailure)),
+            "serialization should reject syntax trees beyond the supported depth"
+        );
+    }
+
+    #[test]
+    fn serializes_json_strings_and_keys_deterministically() {
+        let source = "/* quote \" slash / backslash \\ tab \t newline\n emoji 😀 combining e\u{301} control \u{1} */\nlet x = 1";
+        let json = parse_to_json(source).expect("parsing should succeed");
+
+        assert!(
+            json.contains(
+                r#""text":"\/* quote \" slash \/ backslash \\ tab \t newline\n emoji 😀 combining é control \u0001 *\/""#
+            ),
+            "JSON string was not escaped correctly: {json}"
+        );
+        assert!(
+            json.starts_with(r#"{"$end":"#) && json.contains(r#","$lineStarts":[0,"#),
+            "JSON object keys were not sorted: {json}"
+        );
+    }
+
+    #[test]
+    fn emits_utf8_offsets_with_swift_syntax_line_boundaries() {
+        let source = "// é😀\r\nlet x = 1\rlet y = 2\n";
+        let json = parse_to_json(source).expect("parsing should succeed");
+
+        // SwiftSyntax recognizes LF, CR, and CRLF as physical line breaks. The
+        // offsets are UTF-8 bytes, so the first CRLF ends at byte 11.
+        assert!(
+            json.contains(r#""$lineStarts":[0,11,21,31]"#),
+            "unexpected line starts: {json}"
+        );
+        assert!(
+            json.contains(r#""$end":16,"$pos":15,"kind":"token","text":"x""#),
+            "unexpected UTF-8 token range: {json}"
+        );
+        assert!(
+            json.contains(r#""$end":26,"$pos":25,"kind":"token","text":"y""#),
+            "unexpected UTF-8 token range: {json}"
+        );
     }
 
     #[test]
diff --git a/unified/swift-syntax-rs/swift-syntax-parse.sh b/unified/swift-syntax-rs/swift-syntax-parse.sh
deleted file mode 100755
index 811697c820c6..000000000000
--- a/unified/swift-syntax-rs/swift-syntax-parse.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Wrapper that lets the shipped `swift-syntax-parse` find its Swift runtime
-# libraries, which are packaged in the same directory as this script (and the
-# real binary). Mirrors `swift/extractor/extractor.sh`.
-if [[ "$(uname)" == Darwin ]]; then
-  export DYLD_LIBRARY_PATH=$(dirname "$0")
-else
-  export LD_LIBRARY_PATH=$(dirname "$0")
-fi
-
-exec -a "$0" "$0.real" "$@"
diff --git a/unified/swift-syntax-rs/swift/Package.resolved b/unified/swift-syntax-rs/swift/Package.resolved
index dafd46e961b5..357db158caf6 100644
--- a/unified/swift-syntax-rs/swift/Package.resolved
+++ b/unified/swift-syntax-rs/swift/Package.resolved
@@ -1,13 +1,13 @@
 {
-  "originHash" : "169957f8fbd882866f8f9f1c68cde813dca3560577939a8ffec366e3d77548e4",
+  "originHash" : "cc354a422516b407a489ae3174bf8c758860e35262515ab13a4c5afaee01a3da",
   "pins" : [
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swiftlang/swift-syntax.git",
       "state" : {
-        "revision" : "79e4b74a295b6eb74a8b585e3a39d29e70c1dbd1",
-        "version" : "603.0.2"
+        "revision" : "050f1a346fbbac0ca2cfb15a95274f7bd1cf0ccf",
+        "version" : "604.0.0"
       }
     }
   ],
diff --git a/unified/swift-syntax-rs/swift/Package.swift b/unified/swift-syntax-rs/swift/Package.swift
index 37fa5a1eed7b..b7a645c95f37 100644
--- a/unified/swift-syntax-rs/swift/Package.swift
+++ b/unified/swift-syntax-rs/swift/Package.swift
@@ -4,7 +4,7 @@ import PackageDescription
 let package = Package(
     name: "SwiftSyntaxFFI",
     platforms: [
-        // swift-syntax 603 requires macOS 10.15; declare it explicitly
+        // swift-syntax 604 requires macOS 10.15; declare it explicitly
         // rather than relying on the swift-tools-version default (10.13).
         .macOS(.v10_15),
     ],
@@ -20,7 +20,7 @@ let package = Package(
     dependencies: [
         .package(
             url: "https://github.com/swiftlang/swift-syntax.git",
-            exact: "603.0.2"
+            exact: "604.0.0"
         )
     ],
     targets: [
diff --git a/unified/swift-syntax-rs/swift/Sources/SwiftSyntaxFFI/SwiftSyntaxFFI.swift b/unified/swift-syntax-rs/swift/Sources/SwiftSyntaxFFI/SwiftSyntaxFFI.swift
index 9471c2ea143d..f62fffbaf28c 100644
--- a/unified/swift-syntax-rs/swift/Sources/SwiftSyntaxFFI/SwiftSyntaxFFI.swift
+++ b/unified/swift-syntax-rs/swift/Sources/SwiftSyntaxFFI/SwiftSyntaxFFI.swift
@@ -1,4 +1,3 @@
-import Foundation
 import SwiftOperators
 import SwiftParser
 
@@ -12,25 +11,24 @@ import SwiftParser
     import Darwin
 #endif
 
-/// Convert an absolute position into an `{ offset, line, column }` dictionary.
+/// Return the UTF-8 byte offset of the start of every physical source line.
 ///
-/// `offset` is a UTF-8 byte offset; `line`/`column` are 1-based.
-private func location(
-    _ position: AbsolutePosition,
-    _ converter: SourceLocationConverter
-) -> [String: Any] {
-    let loc = converter.location(for: position)
-    return [
-        "offset": position.utf8Offset,
-        "line": loc.line,
-        "column": loc.column,
-    ]
+/// Deriving this from `SourceLocationConverter.sourceLines` keeps newline
+/// handling exactly aligned with swift-syntax (`\n`, `\r`, and `\r\n`).
+private func lineStarts(_ converter: SourceLocationConverter) -> [Any] {
+    var result: [Any] = []
+    var offset = 0
+    for line in converter.sourceLines {
+        result.append(offset)
+        offset += line.utf8.count
+    }
+    return result
 }
 
 /// Trivia kinds worth preserving in the serialized tree. Comments carry
 /// developer intent (including doc comments), and `unexpectedText` flags source
 /// the parser had to skip. Whitespace and multi-line-string escape markers are
-/// dropped: node ranges already encode positions, so they would only bloat the
+/// dropped: node offsets already encode positions, so they would only bloat the
 /// output.
 private let keptTriviaKinds: Set<String> = [
     "lineComment",
@@ -40,7 +38,7 @@ private let keptTriviaKinds: Set<String> = [
     "unexpectedText",
 ]
 
-/// Serialize a trivia collection into an array of `{ kind, text, range }`
+/// Serialize a trivia collection into an array of `{ kind, text, $pos, $end }`
 /// pieces, keeping only the kinds in `keptTriviaKinds`.
 ///
 /// `start` is the absolute position of the first piece (a token's leading
@@ -49,8 +47,7 @@ private let keptTriviaKinds: Set<String> = [
 /// accumulating piece lengths, so kept pieces carry an exact source location.
 private func serializeTrivia(
     _ trivia: Trivia,
-    startingAt start: AbsolutePosition,
-    _ converter: SourceLocationConverter
+    startingAt start: AbsolutePosition
 ) -> [Any] {
     var result: [Any] = []
     var offset = start.utf8Offset
@@ -62,12 +59,10 @@ private func serializeTrivia(
         let kind = Mirror(reflecting: piece).children.first?.label ?? "\(piece)"
         if keptTriviaKinds.contains(kind) {
             result.append([
+                "$pos": offset,
+                "$end": offset + length,
                 "kind": kind,
                 "text": Trivia(pieces: [piece]).description,
-                "range": [
-                    "start": location(AbsolutePosition(utf8Offset: offset), converter),
-                    "end": location(AbsolutePosition(utf8Offset: offset + length), converter),
-                ],
             ])
         }
         offset += length
@@ -77,55 +72,62 @@ private func serializeTrivia(
 
 /// Recursively convert a SwiftSyntax node into a JSON-serializable value.
 ///
-///   * Tokens carry `kind`, `tokenKind`, `text`, and `range`, plus
+///   * Tokens carry `kind`, `tokenKind`, `text`, `$pos`, and `$end`, plus
 ///     `leadingTrivia`/`trailingTrivia` — but only when non-empty (after
 ///     filtering, most tokens have no trivia, so the keys are simply absent).
-///   * Layout nodes (e.g. `functionDecl`) carry `kind` and source `range`, and
-///     additionally embed their children directly as members keyed by the
+///   * Layout nodes (e.g. `functionDecl`) carry `kind`, `$pos`, and `$end`,
+///     and additionally embed their children directly as members keyed by the
 ///     child's name in the parent (e.g. `name`, `signature`, `body`); absent
-///     optional children are omitted. Field names never collide with
-///     `kind`/`range`.
+///     optional children are omitted.
 ///   * Collection nodes (e.g. `codeBlockItemList`) are *elided*: they become a
 ///     plain array of their serialized elements, taking the place of the
 ///     collection node itself. A list-valued layout field (e.g. `parameters`) is
 ///     therefore simply a JSON array. This drops the collection node's own
-///     `kind`/`range`, which are unnamed and largely recoverable from the
+///     `kind`/location, which are unnamed and largely recoverable from the
 ///     elements.
-private func serialize(
-    _ node: Syntax,
-    _ converter: SourceLocationConverter
-) -> Any {
+private let maximumSerializationDepth = 2048
+
+private struct SerializationDepthError: Error, CustomStringConvertible {
+    var description: String {
+        "syntax tree exceeds maximum serialization depth (\(maximumSerializationDepth))"
+    }
+}
+
+private func serialize(_ node: Syntax, depth: Int = 1) throws -> Any {
+    if depth > maximumSerializationDepth {
+        throw SerializationDepthError()
+    }
+
     if node.kind.isSyntaxCollection {
-        return node.children(viewMode: .sourceAccurate).map {
-            serialize($0, converter)
+        return try node.children(viewMode: .sourceAccurate).map {
+            try serialize($0, depth: depth + 1)
         }
     }
 
-    // Source range covering the node's content, excluding surrounding trivia.
-    let range: [String: Any] = [
-        "start": location(node.positionAfterSkippingLeadingTrivia, converter),
-        "end": location(node.endPositionBeforeTrailingTrivia, converter),
-    ]
+    // Half-open UTF-8 byte range covering the node's content, excluding
+    // surrounding trivia.
+    let start = node.positionAfterSkippingLeadingTrivia.utf8Offset
+    let end = node.endPositionBeforeTrailingTrivia.utf8Offset
 
     if let token = node.as(TokenSyntax.self) {
         var result: [String: Any] = [
+            "$pos": start,
+            "$end": end,
             "kind": "token",
             "tokenKind": "\(token.tokenKind)",
             "text": token.text,
-            "range": range,
         ]
         // Only emit trivia when present; after filtering, most tokens have none.
         // Leading trivia starts at the token's own position; trailing trivia
         // starts just after the token's content.
         let leading = serializeTrivia(
-            token.leadingTrivia, startingAt: token.position, converter)
+            token.leadingTrivia, startingAt: token.position)
         if !leading.isEmpty {
             result["leadingTrivia"] = leading
         }
         let trailing = serializeTrivia(
             token.trailingTrivia,
-            startingAt: token.endPositionBeforeTrailingTrivia,
-            converter)
+            startingAt: token.endPositionBeforeTrailingTrivia)
         if !trailing.isEmpty {
             result["trailingTrivia"] = trailing
         }
@@ -133,8 +135,9 @@ private func serialize(
     }
 
     var result: [String: Any] = [
+        "$pos": start,
+        "$end": end,
         "kind": "\(node.kind)",
-        "range": range,
     ]
     var unnamed = 0
     for child in node.children(viewMode: .sourceAccurate) {
@@ -142,10 +145,10 @@ private func serialize(
         // parent (the same mechanism SwiftSyntax uses for its debug dump). A
         // child that is a collection serializes to an array (see above).
         if let keyPath = child.keyPathInParent, let name = childName(keyPath) {
-            result[name] = serialize(child, converter)
+            result[name] = try serialize(child, depth: depth + 1)
         } else {
             // Defensive fallback for any unnamed layout child.
-            result["child\(unnamed)"] = serialize(child, converter)
+            result["child\(unnamed)"] = try serialize(child, depth: depth + 1)
             unnamed += 1
         }
     }
@@ -214,30 +217,132 @@ private final class PerSequenceFolder: SyntaxRewriter {
     }
 }
 
-/// Parse the given NUL-terminated Swift source string and return a
-/// heap-allocated, NUL-terminated JSON representation of the syntax tree.
+/// Write directly to stderr without Foundation, whose output APIs would pull ICU into static builds.
+private func writeToStandardError(_ message: String) {
+    message.withCString { start in
+        var pointer = UnsafeRawPointer(start)
+        let end = pointer.advanced(by: strlen(start))
+        while pointer != end {
+            let written = write(STDERR_FILENO, pointer, end - pointer)
+            if written <= 0 {
+                return
+            }
+            pointer = pointer.advanced(by: written)
+        }
+    }
+}
+
+private struct JSONEncodingError: Error, CustomStringConvertible {
+    let type: Any.Type
+
+    var description: String {
+        "unsupported JSON value of type \(String(reflecting: type))"
+    }
+}
+
+private let hexDigits = Array("0123456789abcdef".utf8)
+
+private func appendJSONString(_ string: String, to output: inout [UInt8]) {
+    output.append(UInt8(ascii: "\""))
+    for scalar in string.unicodeScalars {
+        switch scalar.value {
+        case 0x08:
+            output.append(contentsOf: "\\b".utf8)
+        case 0x09:
+            output.append(contentsOf: "\\t".utf8)
+        case 0x0a:
+            output.append(contentsOf: "\\n".utf8)
+        case 0x0c:
+            output.append(contentsOf: "\\f".utf8)
+        case 0x0d:
+            output.append(contentsOf: "\\r".utf8)
+        case 0x22:
+            output.append(contentsOf: "\\\"".utf8)
+        case 0x2f:
+            output.append(contentsOf: "\\/".utf8)
+        case 0x5c:
+            output.append(contentsOf: "\\\\".utf8)
+        case 0x00...0x1f:
+            output.append(contentsOf: "\\u00".utf8)
+            output.append(hexDigits[Int(scalar.value >> 4)])
+            output.append(hexDigits[Int(scalar.value & 0x0f)])
+        default:
+            output.append(contentsOf: String(scalar).utf8)
+        }
+    }
+    output.append(UInt8(ascii: "\""))
+}
+
+private func appendJSON(_ value: Any, to output: inout [UInt8]) throws {
+    switch value {
+    case let string as String:
+        appendJSONString(string, to: &output)
+    case let integer as Int:
+        output.append(contentsOf: String(integer).utf8)
+    case let array as [Any]:
+        output.append(UInt8(ascii: "["))
+        for (index, element) in array.enumerated() {
+            if index != 0 {
+                output.append(UInt8(ascii: ","))
+            }
+            try appendJSON(element, to: &output)
+        }
+        output.append(UInt8(ascii: "]"))
+    case let object as [String: Any]:
+        output.append(UInt8(ascii: "{"))
+        for (index, key) in object.keys.sorted().enumerated() {
+            if index != 0 {
+                output.append(UInt8(ascii: ","))
+            }
+            appendJSONString(key, to: &output)
+            output.append(UInt8(ascii: ":"))
+            try appendJSON(object[key]!, to: &output)
+        }
+        output.append(UInt8(ascii: "}"))
+    default:
+        throw JSONEncodingError(type: type(of: value))
+    }
+}
+
+/// Parse the given UTF-8 Swift source buffer and return a heap-allocated,
+/// NUL-terminated JSON representation of the syntax tree.
 ///
 /// The returned pointer is owned by the caller and MUST be released with
 /// `ssr_string_free`. Returns `nil` on failure.
 @_cdecl("ssr_parse_json")
-public func ssr_parse_json(_ source: UnsafePointer<CChar>?) -> UnsafeMutablePointer<CChar>? {
-    guard let source = source else { return nil }
-    let code = String(cString: source)
+public func ssr_parse_json(
+    _ source: UnsafePointer<UInt8>?,
+    _ sourceLength: Int
+) -> UnsafeMutablePointer<CChar>? {
+    guard sourceLength >= 0, source != nil || sourceLength == 0 else { return nil }
+    let sourceBytes = UnsafeBufferPointer(start: source, count: sourceLength)
+    let code = String(decoding: sourceBytes, as: UTF8.self)
     let tree = Parser.parse(source: code)
     // Fold operator sequences before serializing. Source positions are
     // preserved by folding (the same tokens, in the same places), so a
     // converter built from the original tree maps the folded tree correctly.
     let folded = foldOperators(in: tree)
     let converter = SourceLocationConverter(fileName: "<input>", tree: tree)
-    let json = serialize(folded, converter)
+    let serialized: Any
+    do {
+        serialized = try serialize(folded)
+    } catch {
+        writeToStandardError("SwiftSyntaxFFI: JSON serialization failed: \(error)\n")
+        return nil
+    }
+    guard var json = serialized as? [String: Any] else {
+        return nil
+    }
+    json["$lineStarts"] = lineStarts(converter)
 
-    guard
-        let data = try? JSONSerialization.data(
-            withJSONObject: json, options: [.sortedKeys]),
-        let string = String(data: data, encoding: .utf8)
-    else {
+    var bytes: [UInt8] = []
+    do {
+        try appendJSON(json, to: &bytes)
+    } catch {
+        writeToStandardError("SwiftSyntaxFFI: JSON serialization failed: \(error)\n")
         return nil
     }
+    let string = String(decoding: bytes, as: UTF8.self)
     return strdup(string)
 }
 
diff --git a/unified/swift-syntax-rs/swift_runtime.bzl b/unified/swift-syntax-rs/swift_runtime.bzl
deleted file mode 100644
index 899d97d71162..000000000000
--- a/unified/swift-syntax-rs/swift_runtime.bzl
+++ /dev/null
@@ -1,19 +0,0 @@
-"""Filter the Swift toolchain down to just its Linux runtime shared objects.
-
-The standalone toolchain's `:files` bundles the compiler, host libraries, clang
-runtime, plugins, etc. For running a Swift-linked binary we only need the
-runtime shared objects in `usr/lib/swift/linux/`.
-"""
-
-def _swift_runtime_libs_impl(ctx):
-    libs = [
-        f
-        for f in ctx.files.toolchain
-        if "/usr/lib/swift/linux/" in f.path and f.path.endswith(".so")
-    ]
-    return [DefaultInfo(files = depset(libs))]
-
-swift_runtime_libs = rule(
-    implementation = _swift_runtime_libs_impl,
-    attrs = {"toolchain": attr.label(allow_files = True)},
-)
diff --git a/unified/swift-syntax-rs/xcode_transition.bzl b/unified/swift-syntax-rs/xcode_transition.bzl
deleted file mode 100644
index 9783c0fc8719..000000000000
--- a/unified/swift-syntax-rs/xcode_transition.bzl
+++ /dev/null
@@ -1,92 +0,0 @@
-"""Per-target Xcode configuration for `//unified/swift-syntax-rs` on macOS.
-
-`rules_swift`'s auto-registered `xcode_swift_toolchain` reads
-`cc_toolchain.target_gnu_system_name`, which is literally "local" on
-Bazel's built-in `local_config_cc`. To make it usable we need:
-
-- `--xcode_version_config=@local_config_xcode//:host_xcodes` — selects
-  `apple_support`'s xcode_config (matches `rules_swift`'s `system_sdk` keys).
-- `--extra_toolchains=@local_config_apple_cc_toolchains//:all` — forces
-  `apple_support`'s CC toolchain ahead of `local_config_cc`.
-
-Applied via an incoming-edge Starlark transition on the `swift_library`
-target only (via the `xcode_transition_swift_library` macro), so downstream
-Rust targets and the rest of the repo stay on the default CC toolchain and
-the `@local_config_*` repos are not materialized otherwise. No-op off macOS.
-"""
-
-load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
-load("@rules_swift//swift:swift.bzl", "swift_library")
-load("//misc/bazel:os.bzl", "os_select")
-
-_XCODE_VERSION_CONFIG = "//command_line_option:xcode_version_config"
-_EXTRA_TOOLCHAINS = "//command_line_option:extra_toolchains"
-
-def _transition_impl(settings, attr):
-    if attr.os != "macos":
-        return {}
-    else:
-        return {
-            _XCODE_VERSION_CONFIG: "@local_config_xcode//:host_xcodes",
-            _EXTRA_TOOLCHAINS: (
-                list(settings[_EXTRA_TOOLCHAINS]) +
-                ["@local_config_apple_cc_toolchains//:all"]
-            ),
-        }
-
-_xcode_transition = transition(
-    implementation = _transition_impl,
-    inputs = [_EXTRA_TOOLCHAINS],
-    outputs = [_XCODE_VERSION_CONFIG, _EXTRA_TOOLCHAINS],
-)
-
-def _wrapper_impl(ctx):
-    src = ctx.attr.actual[0]
-
-    # Forward the providers a downstream `rust_*` target reads from `deps`:
-    # `DefaultInfo`, `CcInfo` (linking info), and `OutputGroupInfo`.
-    providers = [src[DefaultInfo]]
-    for p in (CcInfo, OutputGroupInfo):
-        if p in src:
-            providers.append(src[p])
-    return providers
-
-_xcode_transition_swift_library_rule = rule(
-    implementation = _wrapper_impl,
-    attrs = {
-        "actual": attr.label(
-            mandatory = True,
-            cfg = _xcode_transition,
-            providers = [CcInfo],
-        ),
-        "os": attr.string(mandatory = True),
-        "_allowlist_function_transition": attr.label(
-            default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
-        ),
-    },
-)
-
-def xcode_transition_swift_library(name, visibility = None, tags = None, target_compatible_with = None, **kwargs):
-    """`swift_library` wrapped in the macOS Xcode-config transition.
-
-    Emits a private inner `_impl_<name>` `swift_library` (tagged `manual`)
-    and a public `name` that applies the transition on macOS and forwards
-    the inner target's providers. Downstream `rust_*` targets depend on
-    `name` as usual; only the `swift_library` sub-graph flips toolchain.
-    """
-    inner_name = "_impl_%s" % name
-    swift_library(
-        name = inner_name,
-        visibility = ["//visibility:private"],
-        tags = (tags or []) + ["manual"],
-        target_compatible_with = target_compatible_with,
-        **kwargs
-    )
-    _xcode_transition_swift_library_rule(
-        name = name,
-        visibility = visibility,
-        tags = tags,
-        target_compatible_with = target_compatible_with,
-        actual = ":" + inner_name,
-        os = os_select(linux = "linux", macos = "macos", default = "other"),
-    )
diff --git a/unified/tools/BUILD.bazel b/unified/tools/BUILD.bazel
index a4b4baed225c..103ded415c2d 100644
--- a/unified/tools/BUILD.bazel
+++ b/unified/tools/BUILD.bazel
@@ -6,6 +6,5 @@ codeql_pkg_files(
         "BUILD.bazel",
     ],
     exes = glob(["**/*"]),
-    prefix = "tools",
     visibility = ["//unified:__pkg__"],
 )
diff --git a/unified/tools/builtins/BUILD.bazel b/unified/tools/builtins/BUILD.bazel
new file mode 100644
index 000000000000..666db59c0c12
--- /dev/null
+++ b/unified/tools/builtins/BUILD.bazel
@@ -0,0 +1,8 @@
+load("//misc/bazel:pkg.bzl", "codeql_pkg_files")
+
+codeql_pkg_files(
+    name = "builtins",
+    srcs = glob(["*.swift"]),
+    prefix = "builtins",
+    visibility = ["//unified:__subpackages__"],
+)
diff --git a/unified/tools/builtins/types.swift b/unified/tools/builtins/types.swift
new file mode 100644
index 000000000000..5cdac835971a
--- /dev/null
+++ b/unified/tools/builtins/types.swift
@@ -0,0 +1,220 @@
+// Provides built-in Swift types
+
+struct Bool {}
+
+struct Int {}
+
+struct String {
+    public init<T>(_ value: T) where T: LosslessStringConvertible {
+        fatalError("Dummy implementation.")
+    }
+}
+
+struct Character {}
+
+struct Substring {}
+
+struct Int8 {}
+
+struct Int16 {}
+
+struct Int32 {}
+
+struct Int64 {}
+
+struct UInt {}
+
+struct UInt8 {}
+
+struct UInt16 {}
+
+struct UInt32 {}
+
+struct UInt64 {}
+
+struct Float16 {}
+
+struct Float {}
+
+struct Double {}
+
+struct Float80 {}
+
+struct Array<Element> {
+    public func map<T, E>(_ transform: (Element) throws(E) -> T) throws(E) -> [T]
+    where E: Error {
+        fatalError("Dummy implementation.")
+    }
+}
+
+struct Dictionary<Key, Value> {}
+
+struct Set<Element> {}
+
+enum Optional<Wrapped> {
+    case none
+    case some(Wrapped)
+}
+
+enum Result<Success, Failure> {
+    case success(Success)
+    case failure(Failure)
+}
+
+struct Range<Bound> {}
+
+struct ClosedRange<Bound> {}
+
+struct PartialRangeFrom<Bound> {}
+
+struct PartialRangeThrough<Bound> {}
+
+struct PartialRangeUpTo<Bound> {}
+
+enum Never {}
+
+struct UnsafePointer<Pointee> {}
+
+struct UnsafeMutablePointer<Pointee> {}
+
+struct UnsafeRawPointer {}
+
+struct UnsafeMutableRawPointer {}
+
+struct UnsafeBufferPointer<Element> {}
+
+struct UnsafeMutableBufferPointer<Element> {}
+
+struct UnsafeRawBufferPointer {}
+
+struct UnsafeMutableRawBufferPointer {}
+
+struct AutoreleasingUnsafeMutablePointer<Pointee> {}
+
+struct OpaquePointer {}
+
+struct Unmanaged<Instance> {}
+
+struct Function<Args, Return> {  // `Args` is always instantiated as a tuple type
+    public func callAsFunction(args: Args) -> Return {
+        fatalError("Dummy implementation.")
+    }
+}
+
+typealias Void = Tuple0
+
+struct Tuple0 {}
+
+struct Tuple1<T0> {
+    var _0: T0
+}
+
+struct Tuple2<T0, T1> {
+    var _0: T0
+    var _1: T1
+}
+
+struct Tuple3<T0, T1, T2> {
+    var _0: T0
+    var _1: T1
+    var _2: T2
+}
+
+struct Tuple4<T0, T1, T2, T3> {
+    var _0: T0
+    var _1: T1
+    var _2: T2
+    var _3: T3
+}
+
+struct Tuple5<T0, T1, T2, T3, T4> {
+    var _0: T0
+    var _1: T1
+    var _2: T2
+    var _3: T3
+    var _4: T4
+}
+
+struct Tuple6<T0, T1, T2, T3, T4, T5> {
+    var _0: T0
+    var _1: T1
+    var _2: T2
+    var _3: T3
+    var _4: T4
+    var _5: T5
+}
+
+struct Tuple7<T0, T1, T2, T3, T4, T5, T6> {
+    var _0: T0
+    var _1: T1
+    var _2: T2
+    var _3: T3
+    var _4: T4
+    var _5: T5
+    var _6: T6
+}
+
+struct Tuple8<T0, T1, T2, T3, T4, T5, T6, T7> {
+    var _0: T0
+    var _1: T1
+    var _2: T2
+    var _3: T3
+    var _4: T4
+    var _5: T5
+    var _6: T6
+    var _7: T7
+}
+
+struct Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
+    var _0: T0
+    var _1: T1
+    var _2: T2
+    var _3: T3
+    var _4: T4
+    var _5: T5
+    var _6: T6
+    var _7: T7
+    var _8: T8
+}
+
+struct Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
+    var _0: T0
+    var _1: T1
+    var _2: T2
+    var _3: T3
+    var _4: T4
+    var _5: T5
+    var _6: T6
+    var _7: T7
+    var _8: T8
+    var _9: T9
+}
+
+struct Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
+    var _0: T0
+    var _1: T1
+    var _2: T2
+    var _3: T3
+    var _4: T4
+    var _5: T5
+    var _6: T6
+    var _7: T7
+    var _8: T8
+    var _9: T9
+    var _10: T10
+}
+
+struct Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
+    var _0: T0
+    var _1: T1
+    var _2: T2
+    var _3: T3
+    var _4: T4
+    var _5: T5
+    var _6: T6
+    var _7: T7
+    var _8: T8
+    var _9: T9
+    var _10: T10
+    var _11: T11
+}